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/1224] 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 8a0dc774bc8782874a0b3f6600e3c4a949004128 Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <frank@owncloud.org>
Date: Sat, 19 May 2012 18:20:23 +0200
Subject: [PATCH 0002/1224] 4

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

diff --git a/lib/util.php b/lib/util.php
index d8f440c1d2..6e57fc7f8a 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -82,7 +82,7 @@ class OC_Util {
 	 * @return string
 	 */
 	public static function getVersionString(){
-		return '4 RC2';
+		return '4';
 	}
 
         /**

From d7c09d8bb5abe5b67c95333f1e69490b74db039e Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <frank@owncloud.org>
Date: Sun, 20 May 2012 10:59:37 +0200
Subject: [PATCH 0003/1224] add a 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 3b4c47c52e1d8d45949806fd7d248ade7592e6d1 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sun, 20 May 2012 18:49:13 +0200
Subject: [PATCH 0004/1224] 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 3775c0d8b222d1f53ec7759d32fc63f20e99d1e1 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sun, 20 May 2012 18:51:45 +0200
Subject: [PATCH 0005/1224] 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 54a371700554ed21a5cb7db03126b6c95ae4cbd3 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Mon, 21 May 2012 21:49:35 +0200
Subject: [PATCH 0006/1224] Contacts: Backport XSS fix.

---
 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 647888eea27442111b12c5f655b0895f8a83dc01 Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <frank@owncloud.org>
Date: Tue, 22 May 2012 12:35:28 +0200
Subject: [PATCH 0007/1224] add a ldap encryption 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 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 20e9903396a945676e2107d3497bd152be0f2691 Mon Sep 17 00:00:00 2001
From: Brice Maron <brice@bmaron.net>
Date: Wed, 23 May 2012 21:02:34 +0000
Subject: [PATCH 0008/1224] 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 f97f1b4266b92bb0efae7436d7ede1f03a4dbdaf Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <frank@owncloud.org>
Date: Thu, 24 May 2012 00:47:03 +0200
Subject: [PATCH 0009/1224] use UTC instead of Berlin as default

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

diff --git a/lib/base.php b/lib/base.php
index fb2d978f44..f6c29a51dd 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -321,7 +321,7 @@ class OC{
 			ini_set('display_errors', 1);
 		}
 
-		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 d8ca4f78cf6c09562a46b3b5341e828e1e61b318 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <GapczynskiM@gmail.com>
Date: Wed, 23 May 2012 19:35:29 -0400
Subject: [PATCH 0010/1224] 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 2774ff1ad8fac22a0bededeb641fa4c2e3f15186 Mon Sep 17 00:00:00 2001
From: Brice Maron <brice@bmaron.net>
Date: Thu, 24 May 2012 22:48:10 +0000
Subject: [PATCH 0011/1224] 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 1645f77aadc0c2f3271175516b2615aab89bea56 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Sat, 26 May 2012 15:23:46 +0200
Subject: [PATCH 0012/1224] 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 f50d0bd009..f24bd4dd92 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 54c421f384cc53ea9f10ee2eea255b6bfdfcc835 Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <frank@owncloud.org>
Date: Sat, 26 May 2012 20:40:12 +0200
Subject: [PATCH 0013/1224] check during ownCloud upgrade if all the installed
 apps are compatible with the new ownCloud version. Disable them if not

---
 lib/app.php         | 37 ++++++++++++++++++++++++++++++++++---
 settings/js/apps.js |  4 ++--
 2 files changed, 36 insertions(+), 5 deletions(-)

diff --git a/lib/app.php b/lib/app.php
index 8ec042ddd6..78de0fa21b 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
@@ -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;
 
@@ -186,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 "'.$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' );
+				return true;
+			}
 		}else{
 			return false;
 		}
@@ -514,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 3db5fb891cd38736bcb15e859374f0ff81a8c32b Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sat, 26 May 2012 21:50:36 +0200
Subject: [PATCH 0014/1224] 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 5b7ef90d3a219cdc2e1c4c3fd52a86df9678c742 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Mon, 28 May 2012 10:49:27 +0200
Subject: [PATCH 0015/1224] 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 f24bd4dd92..7bf0623d48 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 8bd6d862b8bcdafa136ed944ccc85b565cffdee7 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Mon, 28 May 2012 12:52:18 +0200
Subject: [PATCH 0016/1224] Please don't tell me I did that :-P

---
 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 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[] = "";

From 53da328aa18038d24738adb28d88ff0e63f2bc20 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Mon, 28 May 2012 12:56:56 +0200
Subject: [PATCH 0017/1224] Contacts: Double check XSS.

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

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 cf113409adf82d0834181dbdf4586fd2ad262898 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Mon, 28 May 2012 14:41:48 +0200
Subject: [PATCH 0018/1224] 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 2f8412defc6e6adb3dee4ea81f450176a36527b2 Mon Sep 17 00:00:00 2001
From: Brice Maron <brice@bmaron.net>
Date: Mon, 28 May 2012 20:56:21 +0000
Subject: [PATCH 0019/1224] 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 8c2d523121..8137eb720e 100644
--- a/lib/setup.php
+++ b/lib/setup.php
@@ -145,7 +145,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 d1f0261b5da3179acb0bc67c1fdd479b3deb37bc Mon Sep 17 00:00:00 2001
From: Brice Maron <brice@bmaron.net>
Date: Mon, 28 May 2012 20:41:39 +0000
Subject: [PATCH 0020/1224] 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 1c1ed52867123f682c17265ae62958c7d908d325 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Tue, 29 May 2012 13:12:37 +0200
Subject: [PATCH 0021/1224] 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 6515c5c1e77e4abd8e9d504c1cec6455946bf52c Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Tue, 29 May 2012 16:45:52 +0200
Subject: [PATCH 0022/1224] Contacts: NOTE wasn't saved properly.

---
 apps/contacts/ajax/saveproperty.php | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/apps/contacts/ajax/saveproperty.php b/apps/contacts/ajax/saveproperty.php
index 1af05682b6..6509ac21f2 100644
--- a/apps/contacts/ajax/saveproperty.php
+++ b/apps/contacts/ajax/saveproperty.php
@@ -96,12 +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 1d983c28aa2c9494420a06fdd1ce2b7d0a56e050 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <GapczynskiM@gmail.com>
Date: Tue, 29 May 2012 12:31:47 -0400
Subject: [PATCH 0023/1224] 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 f6c29a51dd..30d302b391 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -430,7 +430,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 c1f7d320e8c8b344d48745314614dac8968a79b2 Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <frank@owncloud.org>
Date: Tue, 29 May 2012 22:18:07 +0200
Subject: [PATCH 0024/1224] mark as 4.0.1 pre

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

diff --git a/lib/util.php b/lib/util.php
index 6e57fc7f8a..e2ca9d0fc1 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -82,7 +82,7 @@ class OC_Util {
 	 * @return string
 	 */
 	public static function getVersionString(){
-		return '4';
+		return '4.0.1 pre';
 	}
 
         /**

From 4dc7ed139bdc809d468d4d055a86221c8e3b6dd0 Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <frank@owncloud.org>
Date: Wed, 30 May 2012 14:18:47 +0200
Subject: [PATCH 0025/1224] =?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 31819d2e3f..6a2b3a6897 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 93849916bbcc121196702015d7788d6ec226784c Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Sat, 26 May 2012 16:38:37 +0200
Subject: [PATCH 0026/1224] 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 449b9b92f026b967f261b6c46a99647bfb2b11bd Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Wed, 30 May 2012 22:34:51 +0200
Subject: [PATCH 0027/1224] 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 f4577bf00cf24698d63be7312f1330194f98daa5 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Wed, 30 May 2012 23:55:27 +0200
Subject: [PATCH 0028/1224] 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 7ec3e37199c28cd289699e226254b571ca5c5938 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Thu, 31 May 2012 13:06:27 +0200
Subject: [PATCH 0029/1224] 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 00595351400523168e18a08e3ffa5c3b1e7c1f6e Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Thu, 31 May 2012 20:00:46 +0200
Subject: [PATCH 0030/1224] 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 5d425a9f799bf385d686d4f08f571509123899f6 Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <frank@owncloud.org>
Date: Thu, 31 May 2012 20:16:44 +0200
Subject: [PATCH 0031/1224] use our own serverHost call so that ownCloud works
 with reverse proxy servers

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

diff --git a/apps/files_sharing/ajax/email.php b/apps/files_sharing/ajax/email.php
index 163683cd0e..bdfa369418 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']);
-OC_Mail::send($_POST['toaddress'], $_POST['toaddress'], $subject, $text, $fromaddress, $user);
+$fromaddress = OCP\Config::getUserValue($user, 'settings', 'email', 'sharing-noreply@'.OCP\Util::getServerHost());
+OCP\Util::sendMail($_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 2b87a1eb11..db9f842380 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@' . OC_Helper::serverHost();
 			$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/base.php b/lib/base.php
index 30d302b391..b2ec38ffdb 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -211,9 +211,11 @@ class OC{
 		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'];
-				header("Location: $url");
-				exit();
+				if(!isset($_SERVER['HTTP_X_FORWARDED_PROTO']) or $_SERVER['HTTP_X_FORWARDED_PROTO']=='http') {
+					$url = "https://". $_SERVER['SERVER_NAME'] . $_SERVER['REQUEST_URI'];
+					header("Location: $url");
+					exit();
+				}
 			}
 		}
 	}
diff --git a/lib/ocs.php b/lib/ocs.php
index 536ee754e8..aba29275a9 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(OC_Helper::serverHost().$_SERVER['SCRIPT_NAME'],0,-11).'';
 
     $xml['version']='1.5';
     $xml['website']='ownCloud';
-    $xml['host']=$_SERVER['HTTP_HOST'];
+    $xml['host']=OC_Helper::serverHost();
     $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 e1d6ef7ee1..0dad624058 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(OC_Helper::serverHost().$_SERVER['REQUEST_URI'],0,-17).'ocs/v1.php/';
 
 echo('
 <providers>

From d56966f14fc80a477371e7eaaf690881e13be5b7 Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <frank@owncloud.org>
Date: Thu, 31 May 2012 20:45:39 +0200
Subject: [PATCH 0032/1224] someone broke this completely. Hope it works again.
 Please check your apache error log and turn php notices on if you work on
 ajax call

---
 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 8a88808f54..3decffe949 100644
--- a/apps/files_versions/versions.php
+++ b/apps/files_versions/versions.php
@@ -96,7 +96,7 @@ 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;
 			}
 
@@ -117,7 +117,7 @@ class Storage {
 			@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);

From c3ccdbaa791ed20ed0c21718b11ffe110a0a1e6e Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <frank@owncloud.org>
Date: Thu, 31 May 2012 21:14:46 +0200
Subject: [PATCH 0033/1224] more fixes

---
 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 3decffe949..c8fc26dfb9 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;
 			}
 
@@ -103,7 +103,7 @@ class Storage {
 
 			// 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);	
+			@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 3a6341c8804a6100d0274287ed53c9c0ef61981e Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <frank@owncloud.org>
Date: Thu, 31 May 2012 21:27:46 +0200
Subject: [PATCH 0034/1224] 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 670022cc8af93f685892d73ac53e8d62a6c6dbf5 Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <frank@owncloud.org>
Date: Thu, 31 May 2012 21:43:07 +0200
Subject: [PATCH 0035/1224] 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 0d2d613f596ad8bbff36c851c9f0232cd17c2348 Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <frank@owncloud.org>
Date: Fri, 1 Jun 2012 11:06:49 +0200
Subject: [PATCH 0036/1224] 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        | 16 +++++++---------
 lib/helper.php      | 24 +++++++++++++++++++++---
 lib/public/util.php | 12 ++++++++++++
 3 files changed, 40 insertions(+), 12 deletions(-)

diff --git a/lib/base.php b/lib/base.php
index b2ec38ffdb..96215410ad 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -210,12 +210,10 @@ 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') {
-				if(!isset($_SERVER['HTTP_X_FORWARDED_PROTO']) or $_SERVER['HTTP_X_FORWARDED_PROTO']=='http') {
-					$url = "https://". $_SERVER['SERVER_NAME'] . $_SERVER['REQUEST_URI'];
-					header("Location: $url");
-					exit();
-				}
+			if(OC_Helper::serverProtocol()<>'https') {
+				$url = "https://". OC_Helper::serverHost() . $_SERVER['REQUEST_URI'];
+				header("Location: $url");
+				exit();
 			}
 		}
 	}
@@ -373,10 +371,10 @@ 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://';
-                $server=$protocol.$_SERVER['SERVER_NAME'];
+                $protocol=OC_Helper::serverProtocol().'://'; 
+		$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 6a2b3a6897..3de7b3fdc1 100644
--- a/lib/helper.php
+++ b/lib/helper.php
@@ -89,6 +89,26 @@ 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 +119,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 3d20c5a463..2abffba4c4 100644
--- a/lib/public/util.php
+++ b/lib/public/util.php
@@ -168,6 +168,18 @@ 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 8ed13e627eab45c895c0bfc6312d5297b3aebeac Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <frank@owncloud.org>
Date: Fri, 1 Jun 2012 11:08:40 +0200
Subject: [PATCH 0037/1224] =?UTF-8?q?don=C2=B4t=20do=20warnings.=20Not=20s?=
 =?UTF-8?q?ure=20if=20this=20start=5Fsession=20call=20is=20really=20needed?=
 =?UTF-8?q?=20here.?=
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..268ae59483 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 e44f9ab46e37ccfa5c21fd42b450d09fc0ffa1f4 Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <frank@owncloud.org>
Date: Fri, 1 Jun 2012 11:47:14 +0200
Subject: [PATCH 0038/1224] 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 1b34bda76b659a3105c58ba4d344cfbaceb24e58 Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <frank@owncloud.org>
Date: Fri, 1 Jun 2012 12:16:04 +0200
Subject: [PATCH 0039/1224] fix oc-874

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

diff --git a/lib/vcategories.php b/lib/vcategories.php
index d6351e2858..64c99b1bad 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 0468f53f7311291ce78125d684184c1c7ae0756f Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <frank@owncloud.org>
Date: Fri, 1 Jun 2012 12:42:50 +0200
Subject: [PATCH 0040/1224] switch magic quotes off. they are evil and
 deprecated

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

diff --git a/lib/base.php b/lib/base.php
index 96215410ad..8647705de8 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -324,6 +324,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 86279bc192d72318540e312e637f9ecceb339a77 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Fri, 1 Jun 2012 13:49:11 +0200
Subject: [PATCH 0041/1224] 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 aa88ec81c792830d91771512d719dfc5f1a2893e Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <frank@owncloud.org>
Date: Fri, 1 Jun 2012 14:21:24 +0200
Subject: [PATCH 0042/1224] 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 1e0216a932..91772d510f 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 056d130754..a62b0f9683 100644
--- a/lib/user.php
+++ b/lib/user.php
@@ -336,6 +336,7 @@ class OC_User {
 				}
 			}
 		}
+		asort($users);
 		return $users;
 	}
 

From 34464b1f8b691a2b2cb9f2d2fb14731712d204b1 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Fri, 1 Jun 2012 16:02:04 +0200
Subject: [PATCH 0043/1224] 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 aa9824d35b6e50a1deb4523b252733dad556a193 Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <frank@owncloud.org>
Date: Fri, 1 Jun 2012 16:33:24 +0200
Subject: [PATCH 0044/1224] fix proper error reporting

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

diff --git a/lib/setup.php b/lib/setup.php
index 8137eb720e..4c8c567048 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 60b8e172d5971004ff4180e4d0dd4ca21fe5de2b Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <frank@owncloud.org>
Date: Fri, 1 Jun 2012 16:49:14 +0200
Subject: [PATCH 0045/1224] prevent 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 3ef944521e22848066577f031bba886728557d3d Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <frank@owncloud.org>
Date: Fri, 1 Jun 2012 19:52:45 +0200
Subject: [PATCH 0046/1224] add check if apps folder is writable. needed to
 install 3rd party apps

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

diff --git a/lib/util.php b/lib/util.php
index e2ca9d0fc1..13ca23d065 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -12,8 +12,8 @@ class OC_Util {
 	private static $fsSetup=false;
 
 	// Can be set up
-	public static function setupFS( $user = "", $root = "files" ){// configure the initial filesystem based on the configuration
-		if(self::$fsSetup){//setting up the filesystem twice can only lead to trouble
+	public static function setupFS( $user = "", $root = "files" ){ // configure the initial filesystem based on the configuration
+		if(self::$fsSetup){ //setting up the filesystem twice can only lead to trouble
 			return false;
 		}
 
@@ -27,6 +27,15 @@ class OC_Util {
 			$tmpl->printPage();
 			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)){

From 52b3305892ff2100431cdd898914284edc861fd3 Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <frank@owncloud.org>
Date: Fri, 1 Jun 2012 20:01:23 +0200
Subject: [PATCH 0047/1224] add a pdo check

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

diff --git a/lib/util.php b/lib/util.php
index 13ca23d065..8f91a9e830 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -265,6 +265,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 4db5481ad53d37c8b82aeac926a0278a0c5c9e69 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <GapczynskiM@gmail.com>
Date: Fri, 1 Jun 2012 14:38:25 -0400
Subject: [PATCH 0048/1224] 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 0145c65bf3e90f17d0bda6d466922c6ef14c4918 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <GapczynskiM@gmail.com>
Date: Sat, 2 Jun 2012 20:06:52 -0400
Subject: [PATCH 0049/1224] 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 a62b0f9683..99c6add9bb 100644
--- a/lib/user.php
+++ b/lib/user.php
@@ -240,7 +240,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 300f6894e0a7a77300c049dcbc574a5ea97f92aa Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <frank@owncloud.org>
Date: Sun, 3 Jun 2012 21:06:07 +0200
Subject: [PATCH 0050/1224] 4.0.1

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

diff --git a/lib/util.php b/lib/util.php
index 8f91a9e830..6707139957 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,00,0);
+		return array(4,00,1);
 	}
 
 	/**
@@ -91,7 +91,7 @@ class OC_Util {
 	 * @return string
 	 */
 	public static function getVersionString(){
-		return '4.0.1 pre';
+		return '4.0.1';
 	}
 
         /**

From 64fe06710aba6a512e19a3a8a896278e503389b0 Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <frank@owncloud.org>
Date: Mon, 4 Jun 2012 12:49:33 +0200
Subject: [PATCH 0051/1224] 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 1a46180bb9..0df665f9bc 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 b48228ae3d27b277003b7baee39ca7711d4a5f7f Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Mon, 4 Jun 2012 13:04:18 +0200
Subject: [PATCH 0052/1224] 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 74ac2ac63ac08d71178ac9184a07fa7ba41e04f7 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Mon, 4 Jun 2012 13:13:43 +0200
Subject: [PATCH 0053/1224] 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 34afdcc4e4..452ad2b361 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -162,6 +162,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 8983c6dd6b13c6de5859a29c1effb32ed3f5cb7f Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Mon, 4 Jun 2012 13:27:55 +0200
Subject: [PATCH 0054/1224] 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 c8f670dfab1a3f34349f197b16d25f04d26dbb4f Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Mon, 4 Jun 2012 10:42:09 +0200
Subject: [PATCH 0055/1224] 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 68268a7d3a..085f53945a 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 35d80b3cff..40d5be2214 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 e0c78d22c2..77f6d7f3d6 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 7fbe306990ce8afd89d5ac7cc1a921c0adda887a Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Mon, 4 Jun 2012 11:04:05 +0200
Subject: [PATCH 0056/1224] 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 77f6d7f3d6..bb128a8e44 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 ca64a4080f48c0656c0be7aadd6fe91d43e40f83 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Mon, 4 Jun 2012 18:03:16 +0200
Subject: [PATCH 0057/1224] 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 d5566d026745da8fbfc6648184b5b7890956faf9 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Mon, 4 Jun 2012 16:20:03 +0200
Subject: [PATCH 0058/1224] 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 4bc88ef59d0f57b850c88c17469547ec66f76e79 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Mon, 4 Jun 2012 16:22:25 +0200
Subject: [PATCH 0059/1224] 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 b117a1e3ec4bee5365db2a2363b21013e9b027e0 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Mon, 4 Jun 2012 17:59:21 +0200
Subject: [PATCH 0060/1224] 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 a94349e19c..cef1ea0472 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 daa4d2cd84faa515a2f84c5638ed8bfe28ce4c79 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 0061/1224] 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 773f3cf97377b2e6cad9ba68fb4461005e5d8ff6 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Mon, 4 Jun 2012 21:30:58 +0200
Subject: [PATCH 0062/1224] make it possible to load apps seperately. needed to
 fix oc-910 without breaking oc-863

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

diff --git a/lib/app.php b/lib/app.php
index 78de0fa21b..e4ec0fe588 100644
--- 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 $apps = array();
 	static private $activeapp = '';
 	static private $navigation = array();
@@ -36,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
@@ -49,15 +49,11 @@ 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;
-		}
-
 		// Our very own core apps are hardcoded
 		foreach( array( 'settings') as $app ){
-			if(is_null($types)){
+			if(is_null($types) && !in_array($app, self::$loadedApps)){
 				require( $app.'/appinfo/app.php' );
+				self::$loadedApps[] = $app;
 			}
 		}
 
@@ -66,14 +62,13 @@ class OC_App{
 		// 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;
 	}
@@ -129,7 +124,7 @@ class OC_App{
 	 */
 	public static function setAppTypes($app){
 		$appData=self::getAppInfo($app);
-		
+
 		if(isset($appData['types'])){
 			$appTypes=implode(',',$appData['types']);
 		}else{
@@ -191,7 +186,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;
@@ -525,13 +520,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'])){
@@ -539,12 +534,12 @@ class OC_App{
 				OC_App::disable( $app );
 			}
 
-	
-			
+
+
 		}
-		
-		
-		
+
+
+
 	}
 
 	/**

From 454f81fb1576e12a707fa772355f362f426da066 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Mon, 4 Jun 2012 21:31:35 +0200
Subject: [PATCH 0063/1224] 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 99c6add9bb..37e6dcd143 100644
--- a/lib/user.php
+++ b/lib/user.php
@@ -127,7 +127,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');
@@ -240,12 +240,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 e817504569dce49fd7a677fa510e500394af0c48 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Tue, 5 Jun 2012 10:46:28 +0200
Subject: [PATCH 0064/1224] 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 44260a552cd4ee50ee11eee45164c725f56f7027 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Tue, 5 Jun 2012 10:37:22 +0200
Subject: [PATCH 0065/1224] 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 d3bb01b5983a8778e2fa844fda0a5a4f71659f47 Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <frank@owncloud.org>
Date: Tue, 5 Jun 2012 12:53:48 +0200
Subject: [PATCH 0066/1224] more reliable host detection for reverse proxy
 scenarios

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

diff --git a/lib/base.php b/lib/base.php
index 8647705de8..9fc7d0dae8 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -376,13 +376,18 @@ class OC{
 
                 // CSRF protection
                 if(isset($_SERVER['HTTP_REFERER'])) $referer=$_SERVER['HTTP_REFERER']; else $referer='';
-                $protocol=OC_Helper::serverProtocol().'://'; 
-		$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'; 
-                        header("Location: $url");
-                        exit();
-                } 
+                $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){
+                        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();

From 5c9325bbe0e6a79be302f96076c5ee77df09ac70 Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <frank@owncloud.org>
Date: Tue, 5 Jun 2012 14:10:50 +0200
Subject: [PATCH 0067/1224] CLI is no availabe in stable4

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

diff --git a/lib/base.php b/lib/base.php
index 9fc7d0dae8..2052be6825 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -381,13 +381,11 @@ class OC{
                 $server=OC_Helper::serverHost();
                 $serverhost=parse_url($server);
                 if(isset($serverhost['host'])) $serverhost=$serverhost['host']; else $serverhost='';
-                if(!self::$CLI){
-                        if(($_SERVER['REQUEST_METHOD']=='POST') and ($refererhost<>$serverhost)) {
-                                $url = OC_Helper::serverProtocol().'://'.$server.OC::$WEBROOT.'/index.php';
-                                header("Location: $url");
-                                exit();
-                        }
-                }
+		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();

From 769d94ab262d7f5c3477e77a4ae103e6184e43b3 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Thu, 31 May 2012 19:46:32 +0200
Subject: [PATCH 0068/1224] 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 085f53945a..0c672cd670 100644
--- a/apps/files/js/fileactions.js
+++ b/apps/files/js/fileactions.js
@@ -163,7 +163,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 4bc7387d7cca89b2545cdda516ccbebfe49d242f Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <frank@owncloud.org>
Date: Tue, 5 Jun 2012 15:28:00 +0200
Subject: [PATCH 0069/1224] fi login for hosts running n port 80

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

diff --git a/lib/base.php b/lib/base.php
index 2052be6825..cfcfb94af8 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -379,8 +379,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(($_SERVER['REQUEST_METHOD']=='POST') and ($refererhost<>$serverhost)) {
 			$url = OC_Helper::serverProtocol().'://'.$server.OC::$WEBROOT.'/index.php';
 			header("Location: $url");

From 3a5076d6462376082d4b7f05cbdfb741f0479238 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Tue, 5 Jun 2012 16:36:05 +0200
Subject: [PATCH 0070/1224] 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 063c9accb6772001ade8bea1251cd0d9bd000e15 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Wed, 6 Jun 2012 00:02:13 +0200
Subject: [PATCH 0071/1224] 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 40d5be2214..db29b22275 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -448,6 +448,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 f1b10fcc93dad0667cf50f0e3d9d423705a4ed8a Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Wed, 6 Jun 2012 00:29:28 +0200
Subject: [PATCH 0072/1224] 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 826a439c15b17cca02eca1fbca66ca3d823d5c44 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <GapczynskiM@gmail.com>
Date: Tue, 5 Jun 2012 17:44:07 -0400
Subject: [PATCH 0073/1224] 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 517bd28940ec94036651baf1f811d22dd4c46295 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Wed, 6 Jun 2012 11:46:11 +0200
Subject: [PATCH 0074/1224] 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 48ccfa42d39836fb3fdcd212a7d71a08b65f6c41 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Wed, 6 Jun 2012 12:29:48 +0200
Subject: [PATCH 0075/1224] 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 bb07c20bf4051dd4ede65d19b6d95b285d4aaa8e Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Wed, 6 Jun 2012 18:08:51 +0200
Subject: [PATCH 0076/1224] 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 3d48bf18d3c82d6d8ca9a746e7c48d8d86180f88 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Thu, 7 Jun 2012 10:54:25 +0200
Subject: [PATCH 0077/1224] 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 452ad2b361..e753cab2d9 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -1284,7 +1284,7 @@ Contacts={
 					$('#dialog_holder').load(OC.filePath('contacts', 'ajax', 'chooseaddressbook.php'), function(jsondata){
 						if(jsondata.status != 'error'){
 							$('#chooseaddressbook_dialog').dialog({
-								width : 600,
+								minWidthwidth : 600,
 								close : function(event, ui) {
 									$(this).dialog('destroy').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 de6d550ccea966b3e28ec2ddac34c16f79de77eb Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Thu, 7 Jun 2012 12:21:24 +0200
Subject: [PATCH 0078/1224] 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 9266f4da99c01baae4ec15b5228a9122eb29cfb3 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Thu, 7 Jun 2012 13:08:42 +0200
Subject: [PATCH 0079/1224] 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 691f00eb3976f6ccf4a2c1a20e1264190d64e142 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Thu, 7 Jun 2012 12:44:59 +0200
Subject: [PATCH 0080/1224] 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 f3f3c791bae3fa9836cf2951ed1cd33a1e7767d1 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Thu, 7 Jun 2012 13:36:34 +0200
Subject: [PATCH 0081/1224] 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 d28e0f4d5b0086bf4877e4259b58f6cb4a3e3e30 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <GapczynskiM@gmail.com>
Date: Thu, 7 Jun 2012 09:25:50 -0400
Subject: [PATCH 0082/1224] Remove old internal mail call for password reset,
 fixes bug oc-934

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

diff --git a/core/lostpassword/index.php b/core/lostpassword/index.php
index db9f842380..fff7e99a59 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@' . OC_Helper::serverHost();
-			$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 4beabe23e7d6f5bf3d65d8b593e0e22dac1f8cb3 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Thu, 7 Jun 2012 18:13:41 +0200
Subject: [PATCH 0083/1224] 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 753243f2c4..45be86aff8 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 0f682769213e8dbb841fa817b085169aceb90961 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Thu, 7 Jun 2012 18:55:32 +0200
Subject: [PATCH 0084/1224] 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 4a15cf28a98994275f5efa08720cb6dfeeef6040 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Fri, 8 Jun 2012 11:37:04 +0200
Subject: [PATCH 0085/1224] fixed broken lines in user table

Conflicts:

	settings/css/settings.css
---
 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 36d9b8d26f..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:relative }
+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 8c7fa15aaf98e31646e4306e7819d1d2b725a7e1 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Fri, 8 Jun 2012 11:55:16 +0200
Subject: [PATCH 0086/1224] 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 a7a861b2c6fc855abc0741691bebf975e255767c Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <frank@owncloud.org>
Date: Fri, 8 Jun 2012 12:42:35 +0200
Subject: [PATCH 0087/1224] backport the password salting fix. a salt is
 generated during setup and used to salt the user password hases in the
 database backend

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

diff --git a/config/config.sample.php b/config/config.sample.php
index e86dc05cb0..3648bdebda 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -29,6 +29,7 @@ $CONFIG = array(
 "log_type" => "",
 "logfile" => "",
 "loglevel" => "",
+"passwordsalt" => "",
 // "datadirectory" => ""
 );
 ?>
diff --git a/lib/setup.php b/lib/setup.php
index 4c8c567048..e1c1a110b3 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 894ccffb79..a9b01957d4 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 0dc371f579db4c782d8213424094251b4b7c7bda Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Fri, 8 Jun 2012 14:57:01 +0200
Subject: [PATCH 0088/1224] 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 0722ff6e325873585f4746d9019bbf32776399c6 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Fri, 8 Jun 2012 16:24:31 +0200
Subject: [PATCH 0089/1224] fix for bug #872: Folders not holding any images
 are ignored, even if they hold subfolders with images

---
 apps/gallery/lib/scanner.php | 54 ++++++++++++++++++++----------------
 1 file changed, 30 insertions(+), 24 deletions(-)

diff --git a/apps/gallery/lib/scanner.php b/apps/gallery/lib/scanner.php
index 7a137cb3f5..b7e3321b80 100644
--- a/apps/gallery/lib/scanner.php
+++ b/apps/gallery/lib/scanner.php
@@ -97,18 +97,18 @@ class OC_Gallery_Scanner {
 					foreach ($a as $e) {
 						$p .= ($p == '/'?'':'/').$e;
 						OC_Gallery_Album::create(OCP\USER::getUser(), $e, $p);
-            $arr = OC_FileCache::searchByMime('image','', OC_Filesystem::getRoot().$p);
-            $step = floor(count($arr)/10);
-            if ($step == 0) $step = 1;
-            $na = array();
-            for ($j = 0; $j < count($arr); $j+=$step) {
-              $na[] = $p.$arr[$j];
-            }
-            if (count($na))
-              self::createThumbnails($e, $na);
+						$arr = OC_FileCache::searchByMime('image','', OC_Filesystem::getRoot().$p);
+						$step = floor(count($arr)/10);
+						if ($step == 0) $step = 1;
+						$na = array();
+						for ($j = 0; $j < count($arr); $j+=$step) {
+							$na[] = $p.$arr[$j];
+						}
+						if (count($na))
+							self::createThumbnails($e, $na);
 					}
 				}
-			}
+			} 
 		}
 	}
 
@@ -126,19 +126,25 @@ class OC_Gallery_Scanner {
 		return $new;
 	}
 
-	public static function findPaths() {
-		$images=OC_FileCache::searchByMime('image','', self::getScanningRoot());
-		$paths=array();
-		foreach($images as $image){
-			$path=dirname($image);
-			$path = self::getGalleryRoot().($path=='.'?'':$path);
-			if ($path !== '/') $path=rtrim($path,'/');
-			if(array_search($path,$paths)===false){
-				$paths[]=$path;
-			}
-		}
-		sort($paths);
-		return $paths;
+	public static function findPaths() {
+		$images=OC_FileCache::searchByMime('image','', self::getScanningRoot());
+		$paths=array();
+		foreach($images as $image){
+			$path=dirname($image);
+			$path = self::getGalleryRoot().($path=='.'?'':$path);
+			if ($path !== '/') $path=rtrim($path,'/');
+			if(array_search($path,$paths)===false){
+				$paths[]=$path;
+			}
+			// add sub path also if they don't contain images
+			while ( ($path = dirname($path)) != '/') {
+				if(array_search($path,$paths)===false){
+					$paths[]=$path;
+				}
+			}
+			$subs = dirname($path);
+		}
+		sort($paths);
+		return $paths;
 	}
 }
-

From eb192ff4f3b201c9560543ae5f845a6391ffc834 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Fri, 8 Jun 2012 16:31:12 +0200
Subject: [PATCH 0090/1224] code cleanup from previous commit

---
 apps/gallery/lib/scanner.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/apps/gallery/lib/scanner.php b/apps/gallery/lib/scanner.php
index b7e3321b80..b6c402022b 100644
--- a/apps/gallery/lib/scanner.php
+++ b/apps/gallery/lib/scanner.php
@@ -142,7 +142,6 @@ class OC_Gallery_Scanner {
 					$paths[]=$path;
 				}
 			}
-			$subs = dirname($path);
 		}
 		sort($paths);
 		return $paths;

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

Conflicts:

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

diff --git a/apps/contacts/ajax/uploadphoto.php b/apps/contacts/ajax/uploadphoto.php
index dca8ede6d6..49c03dc44c 100644
--- a/apps/contacts/ajax/uploadphoto.php
+++ b/apps/contacts/ajax/uploadphoto.php
@@ -65,6 +65,7 @@ if ($fn) {
 		}
 	} else {
 		bailOut('Couldn\'t load temporary image: '.$file['tmp_name']);
+		bailOut(OC_Contacts_App::$l10n->t('Couldn\'t load temporary image: ').$tmpkey);
 	}
 }
 

From 23533a763a4ba2ead321309ce6d6571e7bfb5a25 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Fri, 8 Jun 2012 20:44:58 +0200
Subject: [PATCH 0092/1224] Don't fix bugs not present in this branch ;-)

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

diff --git a/apps/contacts/ajax/uploadphoto.php b/apps/contacts/ajax/uploadphoto.php
index 49c03dc44c..dca8ede6d6 100644
--- a/apps/contacts/ajax/uploadphoto.php
+++ b/apps/contacts/ajax/uploadphoto.php
@@ -65,7 +65,6 @@ if ($fn) {
 		}
 	} else {
 		bailOut('Couldn\'t load temporary image: '.$file['tmp_name']);
-		bailOut(OC_Contacts_App::$l10n->t('Couldn\'t load temporary image: ').$tmpkey);
 	}
 }
 

From cf1c3635ff80910c88ccdbd096158a2881b7be40 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Fri, 8 Jun 2012 22:30:02 +0200
Subject: [PATCH 0093/1224] 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 cfcfb94af8..3062c9b23d 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -438,7 +438,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 6e1ca36207b3df6e895267848a3c3e04b9a971c1 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sat, 9 Jun 2012 14:37:52 +0200
Subject: [PATCH 0094/1224] 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 3062c9b23d..71e2ed6388 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -128,7 +128,7 @@ class OC{
 		// calculate the documentroot
 		OC::$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 59d16c5f9abe6f0fa6d4d73984470f63c1b84e4b Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sat, 9 Jun 2012 15:00:18 +0200
Subject: [PATCH 0095/1224] 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 46fd8252d4..98ff06ebe7 100644
--- a/apps/contacts/ajax/deletecard.php
+++ b/apps/contacts/ajax/deletecard.php
@@ -32,7 +32,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 9bb1208cdd..a137287034 100644
--- a/apps/contacts/ajax/deleteproperty.php
+++ b/apps/contacts/ajax/deleteproperty.php
@@ -27,8 +27,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 e753cab2d9..9308e0227e 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -355,7 +355,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+'"]');
@@ -711,7 +711,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 0f454215e785fa258cf506a1937ca8135a2b31c8 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sat, 9 Jun 2012 14:53:35 +0200
Subject: [PATCH 0096/1224] Code cleanup.

---
 apps/contacts/ajax/addproperty.php | 33 ++++++++++++++++++++----------
 1 file changed, 22 insertions(+), 11 deletions(-)

diff --git a/apps/contacts/ajax/addproperty.php b/apps/contacts/ajax/addproperty.php
index bf23df6758..6da8689671 100644
--- a/apps/contacts/ajax/addproperty.php
+++ b/apps/contacts/ajax/addproperty.php
@@ -27,6 +27,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;
@@ -34,11 +40,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', 'NICKNAME', 'NOTE'))) {
-		OCP\JSON::error(array('data' => array('message' => OC_Contacts_App::$l10n->t('Cannot add empty property.'))));
-		exit();
+	if(!$value && in_array($name, array('TEL', 'EMAIL', 'ORG', 'BDAY', 'URL', 'NICKNAME', 'NOTE'))) {
+		bailOut(OC_Contacts_App::$l10n->t('Cannot add empty property.'));
 	}
 } elseif($name === 'ADR') { // only add if non-empty elements.
 	$empty = true;
@@ -49,8 +65,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.'));
 	}
 }
 
@@ -59,9 +74,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));
 	}
 }
 
@@ -117,9 +130,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 8f616ecf76aac4a8b554fbf5a90b1645d0f25438 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sat, 9 Jun 2012 15:07:09 +0200
Subject: [PATCH 0097/1224] 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 815eb2591ab1f095b76946993ee90454f9f2a11f Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sat, 9 Jun 2012 15:33:38 +0200
Subject: [PATCH 0098/1224] 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 009fbd89b46ef5b6a77fde9a49b9a0109157b886 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Sat, 9 Jun 2012 15:13:09 +0200
Subject: [PATCH 0099/1224] 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 ff4b1756229e3e6c7c89891562b6a1136057da1d Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Sat, 9 Jun 2012 15:38:03 +0200
Subject: [PATCH 0100/1224] 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 7bf0623d48..6e0ff580b1 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 f955f6a6857754826af8903475688ba54f72c1bb Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Sat, 9 Jun 2012 16:34:43 +0200
Subject: [PATCH 0101/1224] 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 642e7ce110cb8c320072532c29abe003385d50f5 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Sat, 9 Jun 2012 16:44:48 +0200
Subject: [PATCH 0102/1224] 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 e93ea1af4c..3850ddde56 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 061938cbb52215bca59b90350fdecc4cecf07a3c Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <frank@owncloud.org>
Date: Sat, 9 Jun 2012 17:56:23 +0200
Subject: [PATCH 0103/1224] finally fix the updater. next is an automatic
 updater. but this is a bit more tricky.

---
 config/config.sample.php |  1 +
 lib/updater.php          | 18 ++++++++++++------
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/config/config.sample.php b/config/config.sample.php
index 3648bdebda..2205ee1b47 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -30,6 +30,7 @@ $CONFIG = array(
 "logfile" => "",
 "loglevel" => "",
 "passwordsalt" => "",
+"updatechecker" => true,
 // "datadirectory" => ""
 );
 ?>
diff --git a/lib/updater.php b/lib/updater.php
index deb0f05945..07904ef5f1 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,15 +58,20 @@ 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);
 	}
 
+
 	/**
 	 * do ownCloud update
 	 */

From 689c8f5f0926a58b57146562c23b0a63de2d9747 Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <frank@owncloud.org>
Date: Sat, 9 Jun 2012 22:02:29 +0200
Subject: [PATCH 0104/1224] paging not yet implemented. increasing pagesize to
 100 as a temporary 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 aef51f38fb..d0d27263ba 100644
--- a/lib/ocsclient.php
+++ b/lib/ocsclient.php
@@ -95,7 +95,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());
 		}
@@ -105,7 +105,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 028f00c249..341d9381dc 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 be6848a549d9d5c5fdc224dfd1e22a416d8048a7 Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <frank@owncloud.org>
Date: Sat, 9 Jun 2012 23:18:56 +0200
Subject: [PATCH 0105/1224] =?UTF-8?q?let=C2=B4s=20put=20the=20files=5Fodfv?=
 =?UTF-8?q?iewer=20application=20into=20the=20stable4=20branch=20for=20con?=
 =?UTF-8?q?vinience.=20We=20release=20it=20as=20part=20of=20ownCloud=204.0?=
 =?UTF-8?q?.x=20anyways.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/files_odfviewer/appinfo/app.php          |     5 +
 apps/files_odfviewer/appinfo/info.xml         |    12 +
 apps/files_odfviewer/css/odfviewer.css        |    20 +
 apps/files_odfviewer/css/webodf.css           |   196 +
 apps/files_odfviewer/js/viewer.js             |    60 +
 apps/files_odfviewer/js/webodf-debug.js       |  7124 ++++++
 apps/files_odfviewer/js/webodf.js             |   343 +
 apps/files_odfviewer/src/.gitignore           |     1 +
 apps/files_odfviewer/src/update.sh            |     9 +
 apps/files_odfviewer/src/webodf/.gitignore    |    17 +
 apps/files_odfviewer/src/webodf/.gitmodules   |     9 +
 .../files_odfviewer/src/webodf/CMakeLists.txt |   160 +
 .../src/webodf/JSCoverage.patch               |    13 +
 apps/files_odfviewer/src/webodf/packwebodf.js |    93 +
 .../src/webodf/programs/CMakeLists.txt        |    30 +
 .../programs/android/AndroidManifest.xml      |    42 +
 .../webodf/programs/android/CMakeLists.txt    |    41 +
 .../programs/android/assets/www/config.xml    |    25 +
 .../programs/android/assets/www/icon.png      |   Bin 0 -> 3793 bytes
 .../programs/android/assets/www/index.html    |    46 +
 .../android/assets/www/phonegap-1.4.1.js      |  4586 ++++
 .../programs/android/assets/www/scripts.js    |  4123 ++++
 .../programs/android/libs/phonegap-1.4.1.jar  |   Bin 0 -> 155233 bytes
 .../android/res/drawable-hdpi/ic_launcher.png |   Bin 0 -> 4147 bytes
 .../android/res/drawable-ldpi/ic_launcher.png |   Bin 0 -> 1723 bytes
 .../android/res/drawable-mdpi/ic_launcher.png |   Bin 0 -> 2574 bytes
 .../programs/android/res/drawable/icon.png    |   Bin 0 -> 3535 bytes
 .../programs/android/res/layout/listitem.xml  |     7 +
 .../programs/android/res/layout/main.xml      |    12 +
 .../programs/android/res/layout/selector.xml  |    17 +
 .../programs/android/res/values/strings.xml   |     7 +
 .../programs/android/res/xml/phonegap.xml     |     5 +
 .../programs/android/res/xml/plugins.xml      |    19 +
 .../src/org/webodf/WebODFActivity.java        |    33 +
 .../webodf/programs/android/updateWebODF.sh   |     3 +
 .../webodf/programs/docnosis/CMakeLists.txt   |     0
 .../OpenDocument-manifest-schema-v1.0-os.rng  |   111 +
 .../OpenDocument-manifest-schema-v1.1.rng     |   111 +
 .../docnosis/OpenDocument-schema-v1.0-os.rng  | 17666 +++++++++++++++
 .../docnosis/OpenDocument-schema-v1.1.rng     | 17891 +++++++++++++++
 .../OpenDocument-strict-schema-v1.0-os.rng    |    61 +
 .../OpenDocument-strict-schema-v1.1.rng       |    61 +
 .../OpenDocument-v1.2-cos01-dsig-schema.rng   |    84 +
 ...penDocument-v1.2-cos01-manifest-schema.rng |   224 +
 .../OpenDocument-v1.2-cos01-schema.rng        | 18127 ++++++++++++++++
 ...on-vnd.oasis.opendocument.presentation.png |   Bin 0 -> 6617 bytes
 ...ion-vnd.oasis.opendocument.spreadsheet.png |   Bin 0 -> 7002 bytes
 ...pplication-vnd.oasis.opendocument.text.png |   Bin 0 -> 6723 bytes
 .../src/webodf/programs/docnosis/docnosis.js  |   779 +
 .../src/webodf/programs/docnosis/index.html   |    27 +
 .../programs/firefoxextension/CMakeLists.txt  |    35 +
 .../programs/firefoxextension/bootstrap.js    |    36 +
 .../programs/firefoxextension/chrome.manifest |    13 +
 .../components/odfContentHandler.js           |   196 +
 .../firefoxextension/content/odf.html         |    89 +
 .../programs/firefoxextension/install.rdf.in  |    34 +
 .../firefoxextension/packextension.js         |    77 +
 .../firefoxextension/skin/default/icon.png    |   Bin 0 -> 44606 bytes
 .../programs/ios/Default-Landscape~ipad.png   |   Bin 0 -> 52135 bytes
 .../programs/ios/Default-Portrait~ipad.png    |   Bin 0 -> 51794 bytes
 .../ios/WebODF.xcodeproj/project.pbxproj      |   512 +
 .../programs/ios/WebODF/Classes/AppDelegate.h |    52 +
 .../programs/ios/WebODF/Classes/AppDelegate.m |   202 +
 .../ios/WebODF/Classes/MainViewController.h   |    17 +
 .../ios/WebODF/Classes/MainViewController.m   |    47 +
 .../ios/WebODF/Classes/MainViewController.xib |   118 +
 .../ios/WebODF/Classes/NSData+Base64.h        |    33 +
 .../ios/WebODF/Classes/NSData+Base64.m        |   299 +
 .../programs/ios/WebODF/Classes/NativeZip.h   |    13 +
 .../programs/ios/WebODF/Classes/NativeZip.m   |    79 +
 .../ios/WebODF/Classes/WebViewCache.h         |    15 +
 .../ios/WebODF/Classes/WebViewCache.m         |    72 +
 .../ios/WebODF/Classes/minizip/crypt.h        |   132 +
 .../ios/WebODF/Classes/minizip/ioapi.c        |   177 +
 .../ios/WebODF/Classes/minizip/ioapi.h        |    75 +
 .../ios/WebODF/Classes/minizip/mztools.c      |    28 +
 .../ios/WebODF/Classes/minizip/mztools.h      |    31 +
 .../ios/WebODF/Classes/minizip/unzip.c        |  1597 ++
 .../ios/WebODF/Classes/minizip/unzip.h        |   354 +
 .../webodf/programs/ios/WebODF/Classes/zip.h  |    15 +
 .../webodf/programs/ios/WebODF/PhoneGap.plist |    57 +
 .../Resources/en.lproj/Localizable.strings    |    25 +
 .../ios/WebODF/Resources/icons/icon-72.png    |   Bin 0 -> 8844 bytes
 .../ios/WebODF/Resources/icons/icon.png       |   Bin 0 -> 6106 bytes
 .../ios/WebODF/Resources/icons/icon@2x.png    |   Bin 0 -> 19269 bytes
 .../splash/Default-Landscape~ipad.png         |   Bin 0 -> 52135 bytes
 .../splash/Default-Portrait~ipad.png          |   Bin 0 -> 51794 bytes
 .../ios/WebODF/Resources/splash/Default.png   |   Bin 0 -> 46308 bytes
 .../WebODF/Resources/splash/Default@2x.png    |   Bin 0 -> 50982 bytes
 .../programs/ios/WebODF/WebODF-Info.plist     |   122 +
 .../programs/ios/WebODF/WebODF-Prefix.pch     |     7 +
 .../ios/WebODF/en.lproj/InfoPlist.strings     |     2 +
 .../src/webodf/programs/ios/WebODF/main.m     |    32 +
 .../src/webodf/programs/ios/www/index.html    |    52 +
 .../src/webodf/programs/ios/www/nativezip.js  |    84 +
 .../webodf/programs/ios/www/phonegap-1.4.1.js |  4123 ++++
 .../programs/nativeQtClient/CMakeLists.txt    |    39 +
 .../src/webodf/programs/nativeQtClient/README |     1 +
 .../programs/nativeQtClient/application.qrc   |    18 +
 .../webodf/programs/nativeQtClient/main.cpp   |    10 +
 .../programs/nativeQtClient/mainwindow.cpp    |   173 +
 .../programs/nativeQtClient/mainwindow.h      |    46 +
 .../programs/nativeQtClient/mainwindow.ui     |    46 +
 .../programs/nativeQtClient/odfpage.cpp       |     1 +
 .../webodf/programs/nativeQtClient/odfpage.h  |    15 +
 .../programs/nativeQtClient/odfview.cpp       |    83 +
 .../webodf/programs/nativeQtClient/odfview.h  |    29 +
 .../webodf/programs/nativeQtClient/scripts.js |    93 +
 .../webodf/programs/playbook/CMakeLists.txt   |     0
 .../webodf/programs/playbook/build_sign.bat   |    23 +
 .../src/webodf/programs/playbook/config.xml   |    26 +
 .../js/common/custom_filereader_dispatcher.js |    17 +
 .../js/common/custom_filereader_ns.js         |     8 +
 .../blackberry.custom.filereader/library.xml  |    22 +
 .../custom/filereader/CustomFileReader.as     |    34 +
 .../src/webodf/programs/playbook/icon.png     |   Bin 0 -> 19269 bytes
 .../src/webodf/programs/playbook/index.html   |    28 +
 .../src/webodf/programs/playbook/scripts.js   |   146 +
 .../programs/qtjsruntime/CMakeLists.txt       |     4 +
 .../src/webodf/programs/qtjsruntime/nam.h     |    48 +
 .../webodf/programs/qtjsruntime/nativeio.cpp  |   106 +
 .../webodf/programs/qtjsruntime/nativeio.h    |    41 +
 .../programs/qtjsruntime/pagerunner.cpp       |   191 +
 .../webodf/programs/qtjsruntime/pagerunner.h  |    68 +
 .../programs/qtjsruntime/qtjsruntime.cpp      |    20 +
 .../webodf/programs/touchui/CMakeLists.txt    |     7 +
 .../src/webodf/programs/touchui/ZoomIn.png    |   Bin 0 -> 670 bytes
 .../src/webodf/programs/touchui/ZoomOut.png   |   Bin 0 -> 607 bytes
 .../src/webodf/programs/touchui/app/app.js    |    40 +
 .../programs/touchui/app/controller/Files.js  |    82 +
 .../programs/touchui/app/model/FileSystem.js  |   265 +
 .../programs/touchui/app/store/FileStore.js   |    30 +
 .../programs/touchui/app/views/FileDetail.js  |   122 +
 .../programs/touchui/app/views/FilesList.js   |    47 +
 .../programs/touchui/app/views/OdfView.js     |   170 +
 .../programs/touchui/app/views/Viewport.js    |    54 +
 .../src/webodf/programs/touchui/go-next.png   |   Bin 0 -> 1473 bytes
 .../webodf/programs/touchui/go-previous.png   |   Bin 0 -> 1536 bytes
 .../src/webodf/programs/touchui/index.html    |    22 +
 .../src/webodf/programs/touchui/scripts.js    |   130 +
 .../webodf/programs/touchui/sencha-touch.css  |     1 +
 .../webodf/programs/touchui/sencha-touch.js   |    15 +
 .../src/webodf/programs/touchui/welcome.odt   |   Bin 0 -> 62780 bytes
 .../webodf/programs/touchui/zoom-fit-best.png |   Bin 0 -> 932 bytes
 .../programs/touchui/zoom-fit-height.png      |   Bin 0 -> 947 bytes
 .../programs/touchui/zoom-fit-width.png       |   Bin 0 -> 934 bytes
 .../simplerevisionserver/webdavserver.py      |    77 +
 .../src/webodf/webodf/APPNOTE.txt             |  3218 +++
 .../src/webodf/webodf/CMakeLists.txt          |   201 +
 apps/files_odfviewer/src/webodf/webodf/README |    43 +
 .../src/webodf/webodf/compare.html            |    34 +
 .../src/webodf/webodf/compare.js              |    45 +
 .../src/webodf/webodf/deflateinmozilla.txt    |    69 +
 .../src/webodf/webodf/embedodf.html           |     2 +
 .../src/webodf/webodf/filelist.js             |    66 +
 .../src/webodf/webodf/filelister.html         |    42 +
 .../src/webodf/webodf/filelister.js           |   200 +
 .../src/webodf/webodf/flashput/Makefile       |     2 +
 .../src/webodf/webodf/flashput/PUT.as         |    18 +
 .../src/webodf/webodf/flashput/PUT.swf        |   Bin 0 -> 18031 bytes
 .../src/webodf/webodf/flashput/Request.as     |    83 +
 .../src/webodf/webodf/flashput/test.html      |    96 +
 apps/files_odfviewer/src/webodf/webodf/gui.js |   263 +
 .../src/webodf/webodf/httpserver.js           |   213 +
 .../src/webodf/webodf/index.html              |    17 +
 .../src/webodf/webodf/lib/core/Async.js       |    65 +
 .../src/webodf/webodf/lib/core/Base64.js      |   362 +
 .../src/webodf/webodf/lib/core/ByteArray.js   |    68 +
 .../webodf/webodf/lib/core/ByteArrayWriter.js |   101 +
 .../src/webodf/webodf/lib/core/Cursor.js      |   213 +
 .../src/webodf/webodf/lib/core/JSLint.js      |  6403 ++++++
 .../src/webodf/webodf/lib/core/PointWalker.js |   197 +
 .../src/webodf/webodf/lib/core/RawDeflate.js  |  1833 ++
 .../src/webodf/webodf/lib/core/RawInflate.js  |   790 +
 .../src/webodf/webodf/lib/core/UnitTester.js  |   255 +
 .../src/webodf/webodf/lib/core/Zip.js         |   600 +
 .../webodf/webodf/lib/core/dummyxmlmodel.js_  |    21 +
 .../src/webodf/webodf/lib/export.js           |    39 +
 .../src/webodf/webodf/lib/gui/Caret.js        |    65 +
 .../src/webodf/webodf/lib/gui/PresenterUI.js  |   246 +
 .../webodf/webodf/lib/gui/SelectionMover.js   |   217 +
 .../src/webodf/webodf/lib/gui/XMLEdit.js      |   330 +
 .../src/webodf/webodf/lib/manifest.js         |    34 +
 .../src/webodf/webodf/lib/odf/FontLoader.js   |   135 +
 .../src/webodf/webodf/lib/odf/Formatting.js   |   153 +
 .../src/webodf/webodf/lib/odf/OdfCanvas.js    |   912 +
 .../src/webodf/webodf/lib/odf/OdfContainer.js |   672 +
 .../src/webodf/webodf/lib/odf/Style2CSS.js    |   632 +
 .../src/webodf/webodf/lib/odf/StyleInfo.js    |   424 +
 .../src/webodf/webodf/lib/packages.js         |    48 +
 .../src/webodf/webodf/lib/runtime.js          |  1117 +
 .../webodf/webodf/lib/xmldom/LSSerializer.js  |   197 +
 .../webodf/lib/xmldom/LSSerializerFilter.js   |    40 +
 .../lib/xmldom/OperationalTransformDOM.js     |   115 +
 .../xmldom/OperationalTransformInterface.js   |    97 +
 .../src/webodf/webodf/lib/xmldom/RelaxNG.js   |   691 +
 .../src/webodf/webodf/lib/xmldom/RelaxNG2.js  |   416 +
 .../webodf/webodf/lib/xmldom/RelaxNGParser.js |   452 +
 .../src/webodf/webodf/lib/xmldom/XPath.js     |   383 +
 .../webodf/webodf/misctests/carettest.html    |   135 +
 .../webodf/webodf/misctests/selection.html    |    27 +
 .../webodf/misctests/testselection.html       |    61 +
 .../src/webodf/webodf/misctests/testzip.js    |   181 +
 .../src/webodf/webodf/misctests/writetest.zip |   Bin 0 -> 153 bytes
 apps/files_odfviewer/src/webodf/webodf/notes  |   137 +
 .../src/webodf/webodf/odf.html                |    44 +
 .../src/webodf/webodf/odfedit.html            |    27 +
 .../src/webodf/webodf/odfedit.js              |   314 +
 .../src/webodf/webodf/relaxngToCPP.js         |   463 +
 .../src/webodf/webodf/relaxngtests/test01.rng |    36 +
 .../src/webodf/webodf/relaxngtests/test01.xml |     8 +
 .../src/webodf/webodf/relaxngtests/test02.rng |    80 +
 .../src/webodf/webodf/relaxngtests/test02.xml |    12 +
 .../src/webodf/webodf/relaxngtests/test03.rng |    16 +
 .../src/webodf/webodf/relaxngtests/test03.xml |     6 +
 .../src/webodf/webodf/relaxngtests/test04.rng |    18 +
 .../src/webodf/webodf/relaxngtests/test04.xml |     5 +
 .../src/webodf/webodf/relaxngtests/test05.rng |    42 +
 .../src/webodf/webodf/relaxngtests/test05.xml |     9 +
 .../src/webodf/webodf/relaxngtests/test06.rng |    11 +
 .../src/webodf/webodf/relaxngtests/test06.xml |     4 +
 .../src/webodf/webodf/relaxngtests/test07.rng |    52 +
 .../src/webodf/webodf/relaxngtests/test07.xml |    14 +
 .../src/webodf/webodf/relaxngtests/test08.rng |    52 +
 .../src/webodf/webodf/relaxngtests/test08.xml |    14 +
 .../src/webodf/webodf/relaxngtests/test09.rng |    30 +
 .../src/webodf/webodf/relaxngtests/test09.xml |    14 +
 .../src/webodf/webodf/relaxngtests/test10.rng |    50 +
 .../src/webodf/webodf/relaxngtests/test10.xml |    13 +
 .../src/webodf/webodf/relaxngtests/test11.rng |    75 +
 .../src/webodf/webodf/relaxngtests/test11.xml |    12 +
 .../src/webodf/webodf/relaxngtests/test12.rng |    97 +
 .../src/webodf/webodf/relaxngtests/test12.xml |    15 +
 .../src/webodf/webodf/relaxngtests/test13.rng |    71 +
 .../src/webodf/webodf/relaxngtests/test13.xml |    17 +
 .../src/webodf/webodf/relaxngtests/test14.rng |    45 +
 .../src/webodf/webodf/relaxngtests/test14.xml |    12 +
 .../src/webodf/webodf/relaxngtests/test15.rng |    47 +
 .../src/webodf/webodf/relaxngtests/test15.xml |    18 +
 .../src/webodf/webodf/relaxngtests/test16.rng |    46 +
 .../src/webodf/webodf/relaxngtests/test16.xml |    18 +
 .../src/webodf/webodf/relaxngtests/test17.rng |    51 +
 .../src/webodf/webodf/relaxngtests/test17.xml |    17 +
 .../src/webodf/webodf/relaxngtests/test18.rng |    25 +
 .../src/webodf/webodf/relaxngtests/test18.xml |     6 +
 .../src/webodf/webodf/relaxngtests/test19.rng |    43 +
 .../src/webodf/webodf/relaxngtests/test19.xml |    11 +
 .../src/webodf/webodf/relaxngtests/test20.rng |    32 +
 .../src/webodf/webodf/relaxngtests/test20.xml |    11 +
 .../src/webodf/webodf/relaxngtests/test21.rng |    47 +
 .../src/webodf/webodf/relaxngtests/test21.xml |    11 +
 .../src/webodf/webodf/relaxngtests/test22.rng |    32 +
 .../src/webodf/webodf/relaxngtests/test22.xml |    11 +
 .../src/webodf/webodf/relaxngtests/test23.rng |    33 +
 .../src/webodf/webodf/relaxngtests/test23.xml |     4 +
 .../src/webodf/webodf/roundtripodf.js         |    71 +
 .../src/webodf/webodf/roundtripzip.js         |    64 +
 .../src/webodf/webodf/styleNameRef            |   272 +
 .../src/webodf/webodf/styleNameRefs           |    57 +
 .../src/webodf/webodf/testrelaxng.js          |    91 +
 .../webodf/webodf/tests/core/Base64Tests.js   |   105 +
 .../webodf/webodf/tests/core/CursorTests.js   |   238 +
 .../webodf/tests/core/PointWalkerTests.js     |   135 +
 .../webodf/webodf/tests/core/RuntimeTests.js  |   119 +
 .../src/webodf/webodf/tests/core/ZipTests.js  |   141 +
 .../webodf/tests/core/hi-compressed.zip       |   Bin 0 -> 172 bytes
 .../webodf/tests/core/hi-uncompressed.zip     |   Bin 0 -> 176 bytes
 .../src/webodf/webodf/tests/gui/CaretTests.js |    82 +
 .../webodf/tests/gui/SelectionMoverTests.js   |   109 +
 .../webodf/webodf/tests/gui/XMLEditTests.js   |   156 +
 .../src/webodf/webodf/tests/manifest.js       |    16 +
 .../webodf/tests/resources/js-test-style.css  |    12 +
 .../src/webodf/webodf/tests/tests.html        |    22 +
 .../src/webodf/webodf/tests/tests.js          |    94 +
 .../xmldom/OperationalTransformDOMTests.js    |    79 +
 .../webodf/webodf/tests/xmldom/XPathTests.js  |   112 +
 .../webodf/tools/clippingTestImage.html       |    39 +
 .../src/webodf/webodf/tools/externs.js        |   348 +
 .../src/webodf/webodf/tools/extjsexterns.js   |   171 +
 .../src/webodf/webodf/tools/fixLicenses.py    |    81 +
 .../webodf/tools/refcheck/bootstrap.xsl       |   193 +
 .../webodf/webodf/tools/refcheck/odfkeys.xml  |   455 +
 .../src/webodf/webodf/tools/runjslint.js      |    98 +
 .../src/webodf/webodf/webodf.css              |   200 +
 .../src/webodf/webodf/xmledit/gui.js          |   119 +
 .../src/webodf/webodf/xmledit/index.html      |    16 +
 .../webodf/webodf/xmledit/requirements.dtd    |    12 +
 .../webodf/webodf/xmledit/requirements.xml    |    22 +
 .../src/webodf/webodf/xmledit/test.xml        |    22 +
 289 files changed, 112818 insertions(+)
 create mode 100644 apps/files_odfviewer/appinfo/app.php
 create mode 100644 apps/files_odfviewer/appinfo/info.xml
 create mode 100644 apps/files_odfviewer/css/odfviewer.css
 create mode 100644 apps/files_odfviewer/css/webodf.css
 create mode 100644 apps/files_odfviewer/js/viewer.js
 create mode 100644 apps/files_odfviewer/js/webodf-debug.js
 create mode 100644 apps/files_odfviewer/js/webodf.js
 create mode 100644 apps/files_odfviewer/src/.gitignore
 create mode 100755 apps/files_odfviewer/src/update.sh
 create mode 100644 apps/files_odfviewer/src/webodf/.gitignore
 create mode 100644 apps/files_odfviewer/src/webodf/.gitmodules
 create mode 100644 apps/files_odfviewer/src/webodf/CMakeLists.txt
 create mode 100644 apps/files_odfviewer/src/webodf/JSCoverage.patch
 create mode 100644 apps/files_odfviewer/src/webodf/packwebodf.js
 create mode 100644 apps/files_odfviewer/src/webodf/programs/CMakeLists.txt
 create mode 100644 apps/files_odfviewer/src/webodf/programs/android/AndroidManifest.xml
 create mode 100644 apps/files_odfviewer/src/webodf/programs/android/CMakeLists.txt
 create mode 100644 apps/files_odfviewer/src/webodf/programs/android/assets/www/config.xml
 create mode 100644 apps/files_odfviewer/src/webodf/programs/android/assets/www/icon.png
 create mode 100644 apps/files_odfviewer/src/webodf/programs/android/assets/www/index.html
 create mode 100644 apps/files_odfviewer/src/webodf/programs/android/assets/www/phonegap-1.4.1.js
 create mode 100644 apps/files_odfviewer/src/webodf/programs/android/assets/www/scripts.js
 create mode 100644 apps/files_odfviewer/src/webodf/programs/android/libs/phonegap-1.4.1.jar
 create mode 100644 apps/files_odfviewer/src/webodf/programs/android/res/drawable-hdpi/ic_launcher.png
 create mode 100644 apps/files_odfviewer/src/webodf/programs/android/res/drawable-ldpi/ic_launcher.png
 create mode 100644 apps/files_odfviewer/src/webodf/programs/android/res/drawable-mdpi/ic_launcher.png
 create mode 100644 apps/files_odfviewer/src/webodf/programs/android/res/drawable/icon.png
 create mode 100644 apps/files_odfviewer/src/webodf/programs/android/res/layout/listitem.xml
 create mode 100644 apps/files_odfviewer/src/webodf/programs/android/res/layout/main.xml
 create mode 100644 apps/files_odfviewer/src/webodf/programs/android/res/layout/selector.xml
 create mode 100644 apps/files_odfviewer/src/webodf/programs/android/res/values/strings.xml
 create mode 100755 apps/files_odfviewer/src/webodf/programs/android/res/xml/phonegap.xml
 create mode 100644 apps/files_odfviewer/src/webodf/programs/android/res/xml/plugins.xml
 create mode 100644 apps/files_odfviewer/src/webodf/programs/android/src/org/webodf/WebODFActivity.java
 create mode 100755 apps/files_odfviewer/src/webodf/programs/android/updateWebODF.sh
 create mode 100644 apps/files_odfviewer/src/webodf/programs/docnosis/CMakeLists.txt
 create mode 100644 apps/files_odfviewer/src/webodf/programs/docnosis/OpenDocument-manifest-schema-v1.0-os.rng
 create mode 100644 apps/files_odfviewer/src/webodf/programs/docnosis/OpenDocument-manifest-schema-v1.1.rng
 create mode 100644 apps/files_odfviewer/src/webodf/programs/docnosis/OpenDocument-schema-v1.0-os.rng
 create mode 100644 apps/files_odfviewer/src/webodf/programs/docnosis/OpenDocument-schema-v1.1.rng
 create mode 100644 apps/files_odfviewer/src/webodf/programs/docnosis/OpenDocument-strict-schema-v1.0-os.rng
 create mode 100644 apps/files_odfviewer/src/webodf/programs/docnosis/OpenDocument-strict-schema-v1.1.rng
 create mode 100644 apps/files_odfviewer/src/webodf/programs/docnosis/OpenDocument-v1.2-cos01-dsig-schema.rng
 create mode 100644 apps/files_odfviewer/src/webodf/programs/docnosis/OpenDocument-v1.2-cos01-manifest-schema.rng
 create mode 100644 apps/files_odfviewer/src/webodf/programs/docnosis/OpenDocument-v1.2-cos01-schema.rng
 create mode 100644 apps/files_odfviewer/src/webodf/programs/docnosis/application-vnd.oasis.opendocument.presentation.png
 create mode 100644 apps/files_odfviewer/src/webodf/programs/docnosis/application-vnd.oasis.opendocument.spreadsheet.png
 create mode 100644 apps/files_odfviewer/src/webodf/programs/docnosis/application-vnd.oasis.opendocument.text.png
 create mode 100644 apps/files_odfviewer/src/webodf/programs/docnosis/docnosis.js
 create mode 100644 apps/files_odfviewer/src/webodf/programs/docnosis/index.html
 create mode 100644 apps/files_odfviewer/src/webodf/programs/firefoxextension/CMakeLists.txt
 create mode 100644 apps/files_odfviewer/src/webodf/programs/firefoxextension/bootstrap.js
 create mode 100644 apps/files_odfviewer/src/webodf/programs/firefoxextension/chrome.manifest
 create mode 100644 apps/files_odfviewer/src/webodf/programs/firefoxextension/components/odfContentHandler.js
 create mode 100644 apps/files_odfviewer/src/webodf/programs/firefoxextension/content/odf.html
 create mode 100644 apps/files_odfviewer/src/webodf/programs/firefoxextension/install.rdf.in
 create mode 100644 apps/files_odfviewer/src/webodf/programs/firefoxextension/packextension.js
 create mode 100644 apps/files_odfviewer/src/webodf/programs/firefoxextension/skin/default/icon.png
 create mode 100644 apps/files_odfviewer/src/webodf/programs/ios/Default-Landscape~ipad.png
 create mode 100644 apps/files_odfviewer/src/webodf/programs/ios/Default-Portrait~ipad.png
 create mode 100644 apps/files_odfviewer/src/webodf/programs/ios/WebODF.xcodeproj/project.pbxproj
 create mode 100644 apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/AppDelegate.h
 create mode 100644 apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/AppDelegate.m
 create mode 100644 apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/MainViewController.h
 create mode 100644 apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/MainViewController.m
 create mode 100644 apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/MainViewController.xib
 create mode 100644 apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/NSData+Base64.h
 create mode 100644 apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/NSData+Base64.m
 create mode 100644 apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/NativeZip.h
 create mode 100644 apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/NativeZip.m
 create mode 100644 apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/WebViewCache.h
 create mode 100644 apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/WebViewCache.m
 create mode 100644 apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/minizip/crypt.h
 create mode 100644 apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/minizip/ioapi.c
 create mode 100644 apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/minizip/ioapi.h
 create mode 100644 apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/minizip/mztools.c
 create mode 100644 apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/minizip/mztools.h
 create mode 100644 apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/minizip/unzip.c
 create mode 100644 apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/minizip/unzip.h
 create mode 100644 apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/zip.h
 create mode 100644 apps/files_odfviewer/src/webodf/programs/ios/WebODF/PhoneGap.plist
 create mode 100644 apps/files_odfviewer/src/webodf/programs/ios/WebODF/Resources/en.lproj/Localizable.strings
 create mode 100644 apps/files_odfviewer/src/webodf/programs/ios/WebODF/Resources/icons/icon-72.png
 create mode 100644 apps/files_odfviewer/src/webodf/programs/ios/WebODF/Resources/icons/icon.png
 create mode 100644 apps/files_odfviewer/src/webodf/programs/ios/WebODF/Resources/icons/icon@2x.png
 create mode 100644 apps/files_odfviewer/src/webodf/programs/ios/WebODF/Resources/splash/Default-Landscape~ipad.png
 create mode 100644 apps/files_odfviewer/src/webodf/programs/ios/WebODF/Resources/splash/Default-Portrait~ipad.png
 create mode 100755 apps/files_odfviewer/src/webodf/programs/ios/WebODF/Resources/splash/Default.png
 create mode 100755 apps/files_odfviewer/src/webodf/programs/ios/WebODF/Resources/splash/Default@2x.png
 create mode 100644 apps/files_odfviewer/src/webodf/programs/ios/WebODF/WebODF-Info.plist
 create mode 100644 apps/files_odfviewer/src/webodf/programs/ios/WebODF/WebODF-Prefix.pch
 create mode 100644 apps/files_odfviewer/src/webodf/programs/ios/WebODF/en.lproj/InfoPlist.strings
 create mode 100644 apps/files_odfviewer/src/webodf/programs/ios/WebODF/main.m
 create mode 100644 apps/files_odfviewer/src/webodf/programs/ios/www/index.html
 create mode 100644 apps/files_odfviewer/src/webodf/programs/ios/www/nativezip.js
 create mode 100644 apps/files_odfviewer/src/webodf/programs/ios/www/phonegap-1.4.1.js
 create mode 100644 apps/files_odfviewer/src/webodf/programs/nativeQtClient/CMakeLists.txt
 create mode 100644 apps/files_odfviewer/src/webodf/programs/nativeQtClient/README
 create mode 100644 apps/files_odfviewer/src/webodf/programs/nativeQtClient/application.qrc
 create mode 100644 apps/files_odfviewer/src/webodf/programs/nativeQtClient/main.cpp
 create mode 100644 apps/files_odfviewer/src/webodf/programs/nativeQtClient/mainwindow.cpp
 create mode 100644 apps/files_odfviewer/src/webodf/programs/nativeQtClient/mainwindow.h
 create mode 100644 apps/files_odfviewer/src/webodf/programs/nativeQtClient/mainwindow.ui
 create mode 100644 apps/files_odfviewer/src/webodf/programs/nativeQtClient/odfpage.cpp
 create mode 100644 apps/files_odfviewer/src/webodf/programs/nativeQtClient/odfpage.h
 create mode 100644 apps/files_odfviewer/src/webodf/programs/nativeQtClient/odfview.cpp
 create mode 100644 apps/files_odfviewer/src/webodf/programs/nativeQtClient/odfview.h
 create mode 100644 apps/files_odfviewer/src/webodf/programs/nativeQtClient/scripts.js
 create mode 100644 apps/files_odfviewer/src/webodf/programs/playbook/CMakeLists.txt
 create mode 100644 apps/files_odfviewer/src/webodf/programs/playbook/build_sign.bat
 create mode 100644 apps/files_odfviewer/src/webodf/programs/playbook/config.xml
 create mode 100644 apps/files_odfviewer/src/webodf/programs/playbook/ext/blackberry.custom.filereader/js/common/custom_filereader_dispatcher.js
 create mode 100644 apps/files_odfviewer/src/webodf/programs/playbook/ext/blackberry.custom.filereader/js/common/custom_filereader_ns.js
 create mode 100644 apps/files_odfviewer/src/webodf/programs/playbook/ext/blackberry.custom.filereader/library.xml
 create mode 100644 apps/files_odfviewer/src/webodf/programs/playbook/ext/blackberry.custom.filereader/src/AIR/CustomFileReader/src/blackberry/custom/filereader/CustomFileReader.as
 create mode 100644 apps/files_odfviewer/src/webodf/programs/playbook/icon.png
 create mode 100644 apps/files_odfviewer/src/webodf/programs/playbook/index.html
 create mode 100644 apps/files_odfviewer/src/webodf/programs/playbook/scripts.js
 create mode 100644 apps/files_odfviewer/src/webodf/programs/qtjsruntime/CMakeLists.txt
 create mode 100644 apps/files_odfviewer/src/webodf/programs/qtjsruntime/nam.h
 create mode 100644 apps/files_odfviewer/src/webodf/programs/qtjsruntime/nativeio.cpp
 create mode 100644 apps/files_odfviewer/src/webodf/programs/qtjsruntime/nativeio.h
 create mode 100644 apps/files_odfviewer/src/webodf/programs/qtjsruntime/pagerunner.cpp
 create mode 100644 apps/files_odfviewer/src/webodf/programs/qtjsruntime/pagerunner.h
 create mode 100644 apps/files_odfviewer/src/webodf/programs/qtjsruntime/qtjsruntime.cpp
 create mode 100644 apps/files_odfviewer/src/webodf/programs/touchui/CMakeLists.txt
 create mode 100644 apps/files_odfviewer/src/webodf/programs/touchui/ZoomIn.png
 create mode 100644 apps/files_odfviewer/src/webodf/programs/touchui/ZoomOut.png
 create mode 100644 apps/files_odfviewer/src/webodf/programs/touchui/app/app.js
 create mode 100644 apps/files_odfviewer/src/webodf/programs/touchui/app/controller/Files.js
 create mode 100644 apps/files_odfviewer/src/webodf/programs/touchui/app/model/FileSystem.js
 create mode 100644 apps/files_odfviewer/src/webodf/programs/touchui/app/store/FileStore.js
 create mode 100644 apps/files_odfviewer/src/webodf/programs/touchui/app/views/FileDetail.js
 create mode 100644 apps/files_odfviewer/src/webodf/programs/touchui/app/views/FilesList.js
 create mode 100644 apps/files_odfviewer/src/webodf/programs/touchui/app/views/OdfView.js
 create mode 100644 apps/files_odfviewer/src/webodf/programs/touchui/app/views/Viewport.js
 create mode 100644 apps/files_odfviewer/src/webodf/programs/touchui/go-next.png
 create mode 100644 apps/files_odfviewer/src/webodf/programs/touchui/go-previous.png
 create mode 100644 apps/files_odfviewer/src/webodf/programs/touchui/index.html
 create mode 100644 apps/files_odfviewer/src/webodf/programs/touchui/scripts.js
 create mode 100644 apps/files_odfviewer/src/webodf/programs/touchui/sencha-touch.css
 create mode 100644 apps/files_odfviewer/src/webodf/programs/touchui/sencha-touch.js
 create mode 100644 apps/files_odfviewer/src/webodf/programs/touchui/welcome.odt
 create mode 100644 apps/files_odfviewer/src/webodf/programs/touchui/zoom-fit-best.png
 create mode 100644 apps/files_odfviewer/src/webodf/programs/touchui/zoom-fit-height.png
 create mode 100644 apps/files_odfviewer/src/webodf/programs/touchui/zoom-fit-width.png
 create mode 100755 apps/files_odfviewer/src/webodf/simplerevisionserver/webdavserver.py
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/APPNOTE.txt
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/CMakeLists.txt
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/README
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/compare.html
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/compare.js
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/deflateinmozilla.txt
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/embedodf.html
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/filelist.js
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/filelister.html
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/filelister.js
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/flashput/Makefile
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/flashput/PUT.as
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/flashput/PUT.swf
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/flashput/Request.as
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/flashput/test.html
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/gui.js
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/httpserver.js
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/index.html
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/lib/core/Async.js
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/lib/core/Base64.js
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/lib/core/ByteArray.js
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/lib/core/ByteArrayWriter.js
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/lib/core/Cursor.js
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/lib/core/JSLint.js
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/lib/core/PointWalker.js
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/lib/core/RawDeflate.js
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/lib/core/RawInflate.js
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/lib/core/UnitTester.js
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/lib/core/Zip.js
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/lib/core/dummyxmlmodel.js_
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/lib/export.js
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/lib/gui/Caret.js
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/lib/gui/PresenterUI.js
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/lib/gui/SelectionMover.js
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/lib/gui/XMLEdit.js
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/lib/manifest.js
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/lib/odf/FontLoader.js
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/lib/odf/Formatting.js
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/lib/odf/OdfCanvas.js
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/lib/odf/OdfContainer.js
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/lib/odf/Style2CSS.js
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/lib/odf/StyleInfo.js
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/lib/packages.js
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/lib/runtime.js
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/lib/xmldom/LSSerializer.js
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/lib/xmldom/LSSerializerFilter.js
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/lib/xmldom/OperationalTransformDOM.js
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/lib/xmldom/OperationalTransformInterface.js
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/lib/xmldom/RelaxNG.js
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/lib/xmldom/RelaxNG2.js
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/lib/xmldom/RelaxNGParser.js
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/lib/xmldom/XPath.js
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/misctests/carettest.html
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/misctests/selection.html
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/misctests/testselection.html
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/misctests/testzip.js
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/misctests/writetest.zip
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/notes
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/odf.html
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/odfedit.html
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/odfedit.js
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/relaxngToCPP.js
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/relaxngtests/test01.rng
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/relaxngtests/test01.xml
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/relaxngtests/test02.rng
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/relaxngtests/test02.xml
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/relaxngtests/test03.rng
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/relaxngtests/test03.xml
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/relaxngtests/test04.rng
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/relaxngtests/test04.xml
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/relaxngtests/test05.rng
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/relaxngtests/test05.xml
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/relaxngtests/test06.rng
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/relaxngtests/test06.xml
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/relaxngtests/test07.rng
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/relaxngtests/test07.xml
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/relaxngtests/test08.rng
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/relaxngtests/test08.xml
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/relaxngtests/test09.rng
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/relaxngtests/test09.xml
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/relaxngtests/test10.rng
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/relaxngtests/test10.xml
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/relaxngtests/test11.rng
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/relaxngtests/test11.xml
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/relaxngtests/test12.rng
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/relaxngtests/test12.xml
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/relaxngtests/test13.rng
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/relaxngtests/test13.xml
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/relaxngtests/test14.rng
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/relaxngtests/test14.xml
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/relaxngtests/test15.rng
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/relaxngtests/test15.xml
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/relaxngtests/test16.rng
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/relaxngtests/test16.xml
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/relaxngtests/test17.rng
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/relaxngtests/test17.xml
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/relaxngtests/test18.rng
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/relaxngtests/test18.xml
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/relaxngtests/test19.rng
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/relaxngtests/test19.xml
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/relaxngtests/test20.rng
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/relaxngtests/test20.xml
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/relaxngtests/test21.rng
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/relaxngtests/test21.xml
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/relaxngtests/test22.rng
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/relaxngtests/test22.xml
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/relaxngtests/test23.rng
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/relaxngtests/test23.xml
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/roundtripodf.js
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/roundtripzip.js
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/styleNameRef
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/styleNameRefs
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/testrelaxng.js
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/tests/core/Base64Tests.js
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/tests/core/CursorTests.js
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/tests/core/PointWalkerTests.js
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/tests/core/RuntimeTests.js
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/tests/core/ZipTests.js
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/tests/core/hi-compressed.zip
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/tests/core/hi-uncompressed.zip
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/tests/gui/CaretTests.js
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/tests/gui/SelectionMoverTests.js
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/tests/gui/XMLEditTests.js
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/tests/manifest.js
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/tests/resources/js-test-style.css
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/tests/tests.html
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/tests/tests.js
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/tests/xmldom/OperationalTransformDOMTests.js
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/tests/xmldom/XPathTests.js
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/tools/clippingTestImage.html
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/tools/externs.js
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/tools/extjsexterns.js
 create mode 100755 apps/files_odfviewer/src/webodf/webodf/tools/fixLicenses.py
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/tools/refcheck/bootstrap.xsl
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/tools/refcheck/odfkeys.xml
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/tools/runjslint.js
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/webodf.css
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/xmledit/gui.js
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/xmledit/index.html
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/xmledit/requirements.dtd
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/xmledit/requirements.xml
 create mode 100644 apps/files_odfviewer/src/webodf/webodf/xmledit/test.xml

diff --git a/apps/files_odfviewer/appinfo/app.php b/apps/files_odfviewer/appinfo/app.php
new file mode 100644
index 0000000000..f5fe338c0e
--- /dev/null
+++ b/apps/files_odfviewer/appinfo/app.php
@@ -0,0 +1,5 @@
+<?php
+OCP\Util::addStyle( 'files_odfviewer', 'webodf' );
+OCP\Util::addStyle( 'files_odfviewer', 'odfviewer' );
+OCP\Util::addScript('files_odfviewer', 'viewer' );
+OCP\Util::addScript('files_odfviewer', 'webodf');
diff --git a/apps/files_odfviewer/appinfo/info.xml b/apps/files_odfviewer/appinfo/info.xml
new file mode 100644
index 0000000000..5d93058eeb
--- /dev/null
+++ b/apps/files_odfviewer/appinfo/info.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<info>
+	<id>files_odfviewer</id>
+	<name>ODF Viewer</name>
+	<description>Simple ODF viewer for owncloud</description>
+	<version>0.1</version>
+	<licence>AGPL</licence>
+	<author>Thomas Müller</author>
+	<require>4</require>
+	<shipped>true</shipped>
+	<default_enable/>
+</info>
diff --git a/apps/files_odfviewer/css/odfviewer.css b/apps/files_odfviewer/css/odfviewer.css
new file mode 100644
index 0000000000..097276a00f
--- /dev/null
+++ b/apps/files_odfviewer/css/odfviewer.css
@@ -0,0 +1,20 @@
+#odf-canvas{
+  position: relative;
+  top: 37px;
+  left: 1px;
+  border:1px solid darkgray; 
+  box-shadow: 0px 4px 10px #000;
+  -moz-box-shadow: 0px 4px 10px #000;
+  -webkit-box-shadow: 0px 4px 10px #000;
+}
+
+#odf_close{
+	margin-left: auto;
+	margin-right: 167px;	
+	float: right;
+}
+
+#odf-toolbar{
+    padding: 0 0 0 1em
+}
+
diff --git a/apps/files_odfviewer/css/webodf.css b/apps/files_odfviewer/css/webodf.css
new file mode 100644
index 0000000000..0ceca2f851
--- /dev/null
+++ b/apps/files_odfviewer/css/webodf.css
@@ -0,0 +1,196 @@
+@namespace draw url(urn:oasis:names:tc:opendocument:xmlns:drawing:1.0);
+@namespace fo url(urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0);
+@namespace office url(urn:oasis:names:tc:opendocument:xmlns:office:1.0);
+@namespace presentation url(urn:oasis:names:tc:opendocument:xmlns:presentation:1.0);
+@namespace style url(urn:oasis:names:tc:opendocument:xmlns:style:1.0);
+@namespace svg url(urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0);
+@namespace table url(urn:oasis:names:tc:opendocument:xmlns:table:1.0);
+@namespace text url(urn:oasis:names:tc:opendocument:xmlns:text:1.0);
+@namespace runtimens url(urn:webodf); /* namespace for runtime only */
+
+office|document > *, office|document-content > * {
+  display: none;
+}
+office|body, office|document {
+  display: inline-block;
+  position: relative;
+}
+
+text|p, text|h {
+  display: block;
+  padding: 3px 3px 3px 3px;
+  margin: 5px 5px 5px 5px;
+}
+text|h {
+  font-weight: bold;
+}
+*[runtimens|containsparagraphanchor] {
+  position: relative;
+}
+text|s:before { /* this needs to be the number of spaces given by text:c */
+  content: ' ';
+}
+text|tab:before {
+  display: inline;
+  content: '        ';
+}
+text|line-break {
+  content: " ";
+  display: block;
+}
+text|tracked-changes {
+  /*Consumers that do not support change tracking, should ignore changes.*/
+  display: none;
+}
+office|binary-data {
+  display: none;
+}
+office|text {
+  display: block;
+  width: 216mm; /* default to A4 width */
+  min-height: 279mm;
+  padding-left: 32mm;
+  padding-right: 32mm;
+  padding-top: 25mm;
+  padding-bottom: 13mm;
+  margin: 2px;
+  text-align: left;
+  overflow: hidden;
+}
+office|spreadsheet {
+  display: block;
+  border-collapse: collapse;
+  empty-cells: show;
+  font-family: sans-serif;
+  font-size: 10pt;
+  text-align: left;
+  page-break-inside: avoid;
+  overflow: hidden;
+}
+office|presentation {
+  display: inline-block;
+  text-align: left;
+}
+draw|page {
+  display: block;
+  height: 21cm;
+  width: 28cm;
+  margin: 3px;
+  position: relative;
+  overflow: hidden;
+}
+presentation|notes {
+    display: none;
+}
+@media print {
+  draw|page {
+    border: 1pt solid black;
+    page-break-inside: avoid;
+  }
+  presentation|notes {
+    /*TODO*/
+  }
+}
+office|spreadsheet text|p {
+  border: 0px;
+  padding: 1px;
+  margin: 0px;
+}
+office|spreadsheet table|table {
+  margin: 3px;
+}
+office|spreadsheet table|table:after {
+  /* show sheet name the end of the sheet */
+  /*content: attr(table|name);*/ /* gives parsing error in opera */
+}
+office|spreadsheet table|table-row {
+  counter-increment: row;
+}
+office|spreadsheet table|table-row:before {
+  width: 3em;
+  background: #cccccc;
+  border: 1px solid black;
+  text-align: center;
+  content: counter(row);
+}
+office|spreadsheet table|table-cell {
+  border: 1px solid #cccccc;
+}
+table|table {
+  display: table;
+}
+draw|frame table|table {
+  width: 100%;
+  height: 100%;
+  background: white;
+}
+table|table-row {
+  display: table-row;
+}
+table|table-column {
+  display: table-column;
+}
+table|table-cell {
+  display: table-cell;
+}
+draw|frame {
+  display: block;
+}
+draw|image {
+  display: block;
+  width: 100%;
+  height: 100%;
+  top: 0px;
+  left: 0px;
+  background-repeat: no-repeat;
+  background-size: 100% 100%;
+  -moz-background-size: 100% 100%;
+}
+/* only show the first image in frame */
+draw|frame > draw|image:nth-of-type(n+2) {
+  display: none;
+}
+text|list {
+    display: block;
+    padding-left: 1.5em;
+    counter-reset: list;
+}
+text|list-item {
+    display: block;
+}
+text|list-item:before {
+    display: inline-block;
+    content: '•';
+    counter-increment: list;
+    width: 0.5em;
+    margin-left: -0.5em;
+    padding: 0px;
+    border: 0px;
+}
+text|list-item > *:first-child {
+    display: inline-block;
+}
+text|a {
+    color: blue;
+    text-decoration: underline;
+}
+text|note-citation {
+    vertical-align: super;
+    font-size: smaller;
+}
+text|note-body {
+    display: none;
+}
+text|note:hover text|note-citation {
+    background: #dddddd;
+}
+text|note:hover text|note-body {
+    display: block;
+    left:1em;
+    max-width: 80%;
+    position: absolute;
+    background: #ffffaa;
+}
+svg|title, svg|desc {
+    display: none;
+}
diff --git a/apps/files_odfviewer/js/viewer.js b/apps/files_odfviewer/js/viewer.js
new file mode 100644
index 0000000000..586da12687
--- /dev/null
+++ b/apps/files_odfviewer/js/viewer.js
@@ -0,0 +1,60 @@
+function viewOdf(dir, file) {
+	var location=OC.filePath('files','ajax','download.php')+'?files='+file+'&dir='+dir;
+
+	// fade out files menu and add odf menu
+	$('.actions,#file_action_panel').fadeOut('slow').promise().done(function() {
+		// odf action toolbar
+		var odfToolbarHtml = 
+			'<div id="odf-toolbar">' +
+			'<input type="button" id="odf_close" value="Close">' +
+			'</div>';
+		$('#controls').append(odfToolbarHtml);
+
+	});
+
+	// fade out file list and show pdf canvas
+	$('table').fadeOut('slow').promise().done(function(){;
+		var canvashtml = '<div id="odf-canvas"></div>';
+		$('table').after(canvashtml);
+
+		var odfelement = document.getElementById("odf-canvas");
+		var odfcanvas = new odf.OdfCanvas(odfelement);
+		odfcanvas.load(location);
+	});
+}
+
+function closeOdfViewer(){
+	// Fade out odf-toolbar
+	$('#odf-toolbar').fadeOut('slow');
+	// Fade out editor
+	$('#odf-canvas').fadeOut('slow', function(){
+		$('#odf-toolbar').remove();
+		$('#odf-canvas').remove();
+		$('.actions,#file_access_panel').fadeIn('slow');
+		$('table').fadeIn('slow');	
+	});
+	is_editor_shown = false;
+}
+
+$(document).ready(function() {
+	if(typeof FileActions!=='undefined'){
+
+		var supportedMimes = new Array(
+			'application/vnd.oasis.opendocument.text', 
+			'application/vnd.oasis.opendocument.spreadsheet',
+			'application/vnd.oasis.opendocument.graphics',
+			'application/vnd.oasis.opendocument.presentation');
+		for (var i = 0; i < supportedMimes.length; ++i){
+			var mime = supportedMimes[i];
+			FileActions.register(mime,'View','',function(filename){
+				viewOdf($('#dir').val(),filename);
+			});
+			FileActions.setDefault(mime,'View');
+		}
+	}
+	
+	$('#odf_close').live('click',function() {
+		closeOdfViewer();	
+	});
+});
+
diff --git a/apps/files_odfviewer/js/webodf-debug.js b/apps/files_odfviewer/js/webodf-debug.js
new file mode 100644
index 0000000000..6c7c7e1d6f
--- /dev/null
+++ b/apps/files_odfviewer/js/webodf-debug.js
@@ -0,0 +1,7124 @@
+/*
+
+ @licstart
+ The JavaScript code in this page is free software: you can redistribute it
+ and/or modify it under the terms of the GNU Affero General Public License
+ (GNU AGPL) as published by the Free Software Foundation, either version 3 of
+ the License, or (at your option) any later version.  The code is distributed
+ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
+
+ As additional permission under GNU AGPL version 3 section 7, you
+ may distribute non-source (e.g., minimized or compacted) forms of
+ that code without the copy of the GNU GPL normally required by
+ section 4, provided you include this license notice and a URL
+ through which recipients can access the Corresponding Source.
+
+ As a special exception to the AGPL, any HTML file which merely makes function
+ calls to this code, and for that purpose includes it by reference shall be
+ deemed a separate work for copyright law purposes. In addition, the copyright
+ holders of this code give you permission to combine this code with free
+ software libraries that are released under the GNU LGPL. You may copy and
+ distribute such a system following the terms of the GNU AGPL for this code
+ and the LGPL for the libraries. If you modify this code, you may extend this
+ exception to your version of the code, but you are not obligated to do so.
+ If you do not wish to do so, delete this exception statement from your
+ version.
+
+ This license applies to this entire compilation.
+ @licend
+ @source: http://www.webodf.org/
+ @source: http://gitorious.org/odfkit/webodf/
+*/
+var core = {};
+var gui = {};
+var xmldom = {};
+var odf = {};
+function Runtime() {
+}
+Runtime.ByteArray = function(size) {
+};
+Runtime.ByteArray.prototype.slice = function(start, end) {
+};
+Runtime.prototype.byteArrayFromArray = function(array) {
+};
+Runtime.prototype.byteArrayFromString = function(string, encoding) {
+};
+Runtime.prototype.byteArrayToString = function(bytearray, encoding) {
+};
+Runtime.prototype.concatByteArrays = function(bytearray1, bytearray2) {
+};
+Runtime.prototype.read = function(path, offset, length, callback) {
+};
+Runtime.prototype.readFile = function(path, encoding, callback) {
+};
+Runtime.prototype.readFileSync = function(path, encoding) {
+};
+Runtime.prototype.loadXML = function(path, callback) {
+};
+Runtime.prototype.writeFile = function(path, data, callback) {
+};
+Runtime.prototype.isFile = function(path, callback) {
+};
+Runtime.prototype.getFileSize = function(path, callback) {
+};
+Runtime.prototype.deleteFile = function(path, callback) {
+};
+Runtime.prototype.log = function(msgOrCategory, msg) {
+};
+Runtime.prototype.setTimeout = function(callback, milliseconds) {
+};
+Runtime.prototype.libraryPaths = function() {
+};
+Runtime.prototype.type = function() {
+};
+Runtime.prototype.getDOMImplementation = function() {
+};
+Runtime.prototype.getWindow = function() {
+};
+var IS_COMPILED_CODE = false;
+Runtime.byteArrayToString = function(bytearray, encoding) {
+  function byteArrayToString(bytearray) {
+    var s = "", i, l = bytearray.length;
+    for(i = 0;i < l;i += 1) {
+      s += String.fromCharCode(bytearray[i] & 255)
+    }
+    return s
+  }
+  function utf8ByteArrayToString(bytearray) {
+    var s = "", i, l = bytearray.length, c0, c1, c2;
+    for(i = 0;i < l;i += 1) {
+      c0 = bytearray[i];
+      if(c0 < 128) {
+        s += String.fromCharCode(c0)
+      }else {
+        i += 1;
+        c1 = bytearray[i];
+        if(c0 < 224) {
+          s += String.fromCharCode((c0 & 31) << 6 | c1 & 63)
+        }else {
+          i += 1;
+          c2 = bytearray[i];
+          s += String.fromCharCode((c0 & 15) << 12 | (c1 & 63) << 6 | c2 & 63)
+        }
+      }
+    }
+    return s
+  }
+  var result;
+  if(encoding === "utf8") {
+    result = utf8ByteArrayToString(bytearray)
+  }else {
+    if(encoding !== "binary") {
+      this.log("Unsupported encoding: " + encoding)
+    }
+    result = byteArrayToString(bytearray)
+  }
+  return result
+};
+Runtime.getFunctionName = function getFunctionName(f) {
+  var m;
+  if(f.name === undefined) {
+    m = (new RegExp("function\\s+(\\w+)")).exec(f);
+    return m && m[1]
+  }
+  return f.name
+};
+function BrowserRuntime(logoutput) {
+  var self = this, cache = {}, useNativeArray = window.ArrayBuffer && window.Uint8Array;
+  this.ByteArray = useNativeArray ? function ByteArray(size) {
+    Uint8Array.prototype.slice = function(begin, end) {
+      if(end === undefined) {
+        if(begin === undefined) {
+          begin = 0
+        }
+        end = this.length
+      }
+      var view = this.subarray(begin, end), array, i;
+      end -= begin;
+      array = new Uint8Array(new ArrayBuffer(end));
+      for(i = 0;i < end;i += 1) {
+        array[i] = view[i]
+      }
+      return array
+    };
+    return new Uint8Array(new ArrayBuffer(size))
+  } : function ByteArray(size) {
+    var a = [];
+    a.length = size;
+    return a
+  };
+  this.concatByteArrays = useNativeArray ? function(bytearray1, bytearray2) {
+    var i, l1 = bytearray1.length, l2 = bytearray2.length, a = new this.ByteArray(l1 + l2);
+    for(i = 0;i < l1;i += 1) {
+      a[i] = bytearray1[i]
+    }
+    for(i = 0;i < l2;i += 1) {
+      a[i + l1] = bytearray2[i]
+    }
+    return a
+  } : function(bytearray1, bytearray2) {
+    return bytearray1.concat(bytearray2)
+  };
+  function utf8ByteArrayFromString(string) {
+    var l = string.length, bytearray, i, n, j = 0;
+    for(i = 0;i < l;i += 1) {
+      n = string.charCodeAt(i);
+      j += 1 + (n > 128) + (n > 2048)
+    }
+    bytearray = new self.ByteArray(j);
+    j = 0;
+    for(i = 0;i < l;i += 1) {
+      n = string.charCodeAt(i);
+      if(n < 128) {
+        bytearray[j] = n;
+        j += 1
+      }else {
+        if(n < 2048) {
+          bytearray[j] = 192 | n >>> 6;
+          bytearray[j + 1] = 128 | n & 63;
+          j += 2
+        }else {
+          bytearray[j] = 224 | n >>> 12 & 15;
+          bytearray[j + 1] = 128 | n >>> 6 & 63;
+          bytearray[j + 2] = 128 | n & 63;
+          j += 3
+        }
+      }
+    }
+    return bytearray
+  }
+  function byteArrayFromString(string) {
+    var l = string.length, a = new self.ByteArray(l), i;
+    for(i = 0;i < l;i += 1) {
+      a[i] = string.charCodeAt(i) & 255
+    }
+    return a
+  }
+  this.byteArrayFromArray = function(array) {
+    return array.slice()
+  };
+  this.byteArrayFromString = function(string, encoding) {
+    var result;
+    if(encoding === "utf8") {
+      result = utf8ByteArrayFromString(string)
+    }else {
+      if(encoding !== "binary") {
+        self.log("unknown encoding: " + encoding)
+      }
+      result = byteArrayFromString(string)
+    }
+    return result
+  };
+  this.byteArrayToString = Runtime.byteArrayToString;
+  function log(msgOrCategory, msg) {
+    var node, doc, category;
+    if(msg) {
+      category = msgOrCategory
+    }else {
+      msg = msgOrCategory
+    }
+    if(logoutput) {
+      doc = logoutput.ownerDocument;
+      if(category) {
+        node = doc.createElement("span");
+        node.className = category;
+        node.appendChild(doc.createTextNode(category));
+        logoutput.appendChild(node);
+        logoutput.appendChild(doc.createTextNode(" "))
+      }
+      node = doc.createElement("span");
+      node.appendChild(doc.createTextNode(msg));
+      logoutput.appendChild(node);
+      logoutput.appendChild(doc.createElement("br"))
+    }else {
+      if(console) {
+        console.log(msg)
+      }
+    }
+  }
+  function readFile(path, encoding, callback) {
+    if(cache.hasOwnProperty(path)) {
+      callback(null, cache[path]);
+      return
+    }
+    var xhr = new XMLHttpRequest;
+    function handleResult() {
+      var data;
+      if(xhr.readyState === 4) {
+        if(xhr.status === 0 && !xhr.responseText) {
+          callback("File " + path + " is empty.")
+        }else {
+          if(xhr.status === 200 || xhr.status === 0) {
+            if(encoding === "binary") {
+              if(typeof VBArray !== "undefined") {
+                data = (new VBArray(xhr.responseBody)).toArray()
+              }else {
+                data = self.byteArrayFromString(xhr.responseText, "binary")
+              }
+            }else {
+              data = xhr.responseText
+            }
+            cache[path] = data;
+            callback(null, data)
+          }else {
+            callback(xhr.responseText || xhr.statusText)
+          }
+        }
+      }
+    }
+    xhr.open("GET", path, true);
+    xhr.onreadystatechange = handleResult;
+    if(xhr.overrideMimeType) {
+      if(encoding !== "binary") {
+        xhr.overrideMimeType("text/plain; charset=" + encoding)
+      }else {
+        xhr.overrideMimeType("text/plain; charset=x-user-defined")
+      }
+    }
+    try {
+      xhr.send(null)
+    }catch(e) {
+      callback(e.message)
+    }
+  }
+  function read(path, offset, length, callback) {
+    if(cache.hasOwnProperty(path)) {
+      callback(null, cache[path].slice(offset, offset + length));
+      return
+    }
+    var xhr = new XMLHttpRequest;
+    function handleResult() {
+      var data;
+      if(xhr.readyState === 4) {
+        if(xhr.status === 0 && !xhr.responseText) {
+          callback("File " + path + " is empty.")
+        }else {
+          if(xhr.status === 200 || xhr.status === 0) {
+            if(typeof VBArray !== "undefined") {
+              data = (new VBArray(xhr.responseBody)).toArray()
+            }else {
+              data = self.byteArrayFromString(xhr.responseText, "binary")
+            }
+            cache[path] = data;
+            callback(null, data.slice(offset, offset + length))
+          }else {
+            callback(xhr.responseText || xhr.statusText)
+          }
+        }
+      }
+    }
+    xhr.open("GET", path, true);
+    xhr.onreadystatechange = handleResult;
+    if(xhr.overrideMimeType) {
+      xhr.overrideMimeType("text/plain; charset=x-user-defined")
+    }
+    try {
+      xhr.send(null)
+    }catch(e) {
+      callback(e.message)
+    }
+  }
+  function readFileSync(path, encoding) {
+    var xhr = new XMLHttpRequest, result;
+    xhr.open("GET", path, false);
+    if(xhr.overrideMimeType) {
+      if(encoding !== "binary") {
+        xhr.overrideMimeType("text/plain; charset=" + encoding)
+      }else {
+        xhr.overrideMimeType("text/plain; charset=x-user-defined")
+      }
+    }
+    try {
+      xhr.send(null);
+      if(xhr.status === 200 || xhr.status === 0) {
+        result = xhr.responseText
+      }
+    }catch(e) {
+    }
+    return result
+  }
+  function writeFile(path, data, callback) {
+    cache[path] = data;
+    var xhr = new XMLHttpRequest;
+    function handleResult() {
+      if(xhr.readyState === 4) {
+        if(xhr.status === 0 && !xhr.responseText) {
+          callback("File " + path + " is empty.")
+        }else {
+          if(xhr.status >= 200 && xhr.status < 300 || xhr.status === 0) {
+            callback(null)
+          }else {
+            callback("Status " + String(xhr.status) + ": " + xhr.responseText || xhr.statusText)
+          }
+        }
+      }
+    }
+    xhr.open("PUT", path, true);
+    xhr.onreadystatechange = handleResult;
+    if(data.buffer && !xhr.sendAsBinary) {
+      data = data.buffer
+    }else {
+      data = self.byteArrayToString(data, "binary")
+    }
+    try {
+      if(xhr.sendAsBinary) {
+        xhr.sendAsBinary(data)
+      }else {
+        xhr.send(data)
+      }
+    }catch(e) {
+      self.log("HUH? " + e + " " + data);
+      callback(e.message)
+    }
+  }
+  function deleteFile(path, callback) {
+    var xhr = new XMLHttpRequest;
+    xhr.open("DELETE", path, true);
+    xhr.onreadystatechange = function() {
+      if(xhr.readyState === 4) {
+        if(xhr.status < 200 && xhr.status >= 300) {
+          callback(xhr.responseText)
+        }else {
+          callback(null)
+        }
+      }
+    };
+    xhr.send(null)
+  }
+  function loadXML(path, callback) {
+    var xhr = new XMLHttpRequest;
+    function handleResult() {
+      if(xhr.readyState === 4) {
+        if(xhr.status === 0 && !xhr.responseText) {
+          callback("File " + path + " is empty.")
+        }else {
+          if(xhr.status === 200 || xhr.status === 0) {
+            callback(null, xhr.responseXML)
+          }else {
+            callback(xhr.responseText)
+          }
+        }
+      }
+    }
+    xhr.open("GET", path, true);
+    if(xhr.overrideMimeType) {
+      xhr.overrideMimeType("text/xml")
+    }
+    xhr.onreadystatechange = handleResult;
+    try {
+      xhr.send(null)
+    }catch(e) {
+      callback(e.message)
+    }
+  }
+  function isFile(path, callback) {
+    self.getFileSize(path, function(size) {
+      callback(size !== -1)
+    })
+  }
+  function getFileSize(path, callback) {
+    var xhr = new XMLHttpRequest;
+    xhr.open("HEAD", path, true);
+    xhr.onreadystatechange = function() {
+      if(xhr.readyState !== 4) {
+        return
+      }
+      var cl = xhr.getResponseHeader("Content-Length");
+      if(cl) {
+        callback(parseInt(cl, 10))
+      }else {
+        callback(-1)
+      }
+    };
+    xhr.send(null)
+  }
+  function wrap(nativeFunction, nargs) {
+    if(!nativeFunction) {
+      return null
+    }
+    return function() {
+      cache = {};
+      var callback = arguments[nargs], args = Array.prototype.slice.call(arguments, 0, nargs), callbackname = "callback" + String(Math.random()).substring(2);
+      window[callbackname] = function() {
+        delete window[callbackname];
+        callback.apply(this, arguments)
+      };
+      args.push(callbackname);
+      nativeFunction.apply(this, args)
+    }
+  }
+  this.readFile = readFile;
+  this.read = read;
+  this.readFileSync = readFileSync;
+  this.writeFile = writeFile;
+  this.deleteFile = deleteFile;
+  this.loadXML = loadXML;
+  this.isFile = isFile;
+  this.getFileSize = getFileSize;
+  this.log = log;
+  this.setTimeout = function(f, msec) {
+    setTimeout(function() {
+      f()
+    }, msec)
+  };
+  this.libraryPaths = function() {
+    return["lib"]
+  };
+  this.setCurrentDirectory = function(dir) {
+  };
+  this.type = function() {
+    return"BrowserRuntime"
+  };
+  this.getDOMImplementation = function() {
+    return window.document.implementation
+  };
+  this.exit = function(exitCode) {
+    log("Calling exit with code " + String(exitCode) + ", but exit() is not implemented.")
+  };
+  this.getWindow = function() {
+    return window
+  }
+}
+function NodeJSRuntime() {
+  var self = this, fs = require("fs"), currentDirectory = "";
+  this.ByteArray = function(size) {
+    return new Buffer(size)
+  };
+  this.byteArrayFromArray = function(array) {
+    var ba = new Buffer(array.length), i, l = array.length;
+    for(i = 0;i < l;i += 1) {
+      ba[i] = array[i]
+    }
+    return ba
+  };
+  this.concatByteArrays = function(a, b) {
+    var ba = new Buffer(a.length + b.length);
+    a.copy(ba, 0, 0);
+    b.copy(ba, a.length, 0);
+    return ba
+  };
+  this.byteArrayFromString = function(string, encoding) {
+    return new Buffer(string, encoding)
+  };
+  this.byteArrayToString = function(bytearray, encoding) {
+    return bytearray.toString(encoding)
+  };
+  function isFile(path, callback) {
+    if(currentDirectory) {
+      path = currentDirectory + "/" + path
+    }
+    fs.stat(path, function(err, stats) {
+      callback(!err && stats.isFile())
+    })
+  }
+  function loadXML(path, callback) {
+    throw"Not implemented.";
+  }
+  this.readFile = function(path, encoding, callback) {
+    if(encoding !== "binary") {
+      fs.readFile(path, encoding, callback)
+    }else {
+      fs.readFile(path, null, callback)
+    }
+  };
+  this.writeFile = function(path, data, callback) {
+    fs.writeFile(path, data, "binary", function(err) {
+      callback(err || null)
+    })
+  };
+  this.deleteFile = fs.unlink;
+  this.read = function(path, offset, length, callback) {
+    if(currentDirectory) {
+      path = currentDirectory + "/" + path
+    }
+    fs.open(path, "r+", 666, function(err, fd) {
+      if(err) {
+        callback(err);
+        return
+      }
+      var buffer = new Buffer(length);
+      fs.read(fd, buffer, 0, length, offset, function(err, bytesRead) {
+        fs.close(fd);
+        callback(err, buffer)
+      })
+    })
+  };
+  this.readFileSync = function(path, encoding) {
+    if(!encoding) {
+      return""
+    }
+    return fs.readFileSync(path, encoding)
+  };
+  this.loadXML = loadXML;
+  this.isFile = isFile;
+  this.getFileSize = function(path, callback) {
+    if(currentDirectory) {
+      path = currentDirectory + "/" + path
+    }
+    fs.stat(path, function(err, stats) {
+      if(err) {
+        callback(-1)
+      }else {
+        callback(stats.size)
+      }
+    })
+  };
+  this.log = function(msg) {
+    process.stderr.write(msg + "\n")
+  };
+  this.setTimeout = function(f, msec) {
+    setTimeout(function() {
+      f()
+    }, msec)
+  };
+  this.libraryPaths = function() {
+    return[__dirname]
+  };
+  this.setCurrentDirectory = function(dir) {
+    currentDirectory = dir
+  };
+  this.currentDirectory = function() {
+    return currentDirectory
+  };
+  this.type = function() {
+    return"NodeJSRuntime"
+  };
+  this.getDOMImplementation = function() {
+    return null
+  };
+  this.exit = process.exit;
+  this.getWindow = function() {
+    return null
+  }
+}
+function RhinoRuntime() {
+  var self = this, dom = Packages.javax.xml.parsers.DocumentBuilderFactory.newInstance(), builder, entityresolver, currentDirectory = "";
+  dom.setValidating(false);
+  dom.setNamespaceAware(true);
+  dom.setExpandEntityReferences(false);
+  dom.setSchema(null);
+  entityresolver = Packages.org.xml.sax.EntityResolver({resolveEntity:function(publicId, systemId) {
+    var file, open = function(path) {
+      var reader = new Packages.java.io.FileReader(path), source = new Packages.org.xml.sax.InputSource(reader);
+      return source
+    };
+    file = systemId;
+    return open(file)
+  }});
+  builder = dom.newDocumentBuilder();
+  builder.setEntityResolver(entityresolver);
+  this.ByteArray = function ByteArray(size) {
+    return[size]
+  };
+  this.byteArrayFromArray = function(array) {
+    return array
+  };
+  this.byteArrayFromString = function(string, encoding) {
+    var a = [], i, l = string.length;
+    for(i = 0;i < l;i += 1) {
+      a[i] = string.charCodeAt(i) & 255
+    }
+    return a
+  };
+  this.byteArrayToString = Runtime.byteArrayToString;
+  this.concatByteArrays = function(bytearray1, bytearray2) {
+    return bytearray1.concat(bytearray2)
+  };
+  function loadXML(path, callback) {
+    var file = new Packages.java.io.File(path), document;
+    try {
+      document = builder.parse(file)
+    }catch(err) {
+      print(err);
+      callback(err);
+      return
+    }
+    callback(null, document)
+  }
+  function runtimeReadFile(path, encoding, callback) {
+    var file = new Packages.java.io.File(path), data, rhinoencoding = encoding === "binary" ? "latin1" : encoding;
+    if(!file.isFile()) {
+      callback(path + " is not a file.")
+    }else {
+      data = readFile(path, rhinoencoding);
+      if(encoding === "binary") {
+        data = self.byteArrayFromString(data, "binary")
+      }
+      callback(null, data)
+    }
+  }
+  function runtimeReadFileSync(path, encoding) {
+    var file = new Packages.java.io.File(path), data, i;
+    if(!file.isFile()) {
+      return null
+    }
+    if(encoding === "binary") {
+      encoding = "latin1"
+    }
+    return readFile(path, encoding)
+  }
+  function isFile(path, callback) {
+    if(currentDirectory) {
+      path = currentDirectory + "/" + path
+    }
+    var file = new Packages.java.io.File(path);
+    callback(file.isFile())
+  }
+  this.loadXML = loadXML;
+  this.readFile = runtimeReadFile;
+  this.writeFile = function(path, data, callback) {
+    var out = new Packages.java.io.FileOutputStream(path), i, l = data.length;
+    for(i = 0;i < l;i += 1) {
+      out.write(data[i])
+    }
+    out.close();
+    callback(null)
+  };
+  this.deleteFile = function(path, callback) {
+    var file = new Packages.java.io.File(path);
+    if(file["delete"]()) {
+      callback(null)
+    }else {
+      callback("Could not delete " + path)
+    }
+  };
+  this.read = function(path, offset, length, callback) {
+    if(currentDirectory) {
+      path = currentDirectory + "/" + path
+    }
+    var data = runtimeReadFileSync(path, "binary");
+    if(data) {
+      callback(null, this.byteArrayFromString(data.substring(offset, offset + length), "binary"))
+    }else {
+      callback("Cannot read " + path)
+    }
+  };
+  this.readFileSync = function(path, encoding) {
+    if(!encoding) {
+      return""
+    }
+    return readFile(path, encoding)
+  };
+  this.isFile = isFile;
+  this.getFileSize = function(path, callback) {
+    if(currentDirectory) {
+      path = currentDirectory + "/" + path
+    }
+    var file = new Packages.java.io.File(path);
+    callback(file.length())
+  };
+  this.log = print;
+  this.setTimeout = function(f, msec) {
+    f()
+  };
+  this.libraryPaths = function() {
+    return["lib"]
+  };
+  this.setCurrentDirectory = function(dir) {
+    currentDirectory = dir
+  };
+  this.currentDirectory = function() {
+    return currentDirectory
+  };
+  this.type = function() {
+    return"RhinoRuntime"
+  };
+  this.getDOMImplementation = function() {
+    return builder.getDOMImplementation()
+  };
+  this.exit = quit;
+  this.getWindow = function() {
+    return null
+  }
+}
+var runtime = function() {
+  var result;
+  if(typeof window !== "undefined") {
+    result = new BrowserRuntime(window.document.getElementById("logoutput"))
+  }else {
+    if(typeof require !== "undefined") {
+      result = new NodeJSRuntime
+    }else {
+      result = new RhinoRuntime
+    }
+  }
+  return result
+}();
+(function() {
+  var cache = {}, dircontents = {};
+  function getOrDefinePackage(packageNameComponents) {
+    var topname = packageNameComponents[0], i, pkg;
+    pkg = eval("if (typeof " + topname + " === 'undefined') {" + "eval('" + topname + " = {};');}" + topname);
+    for(i = 1;i < packageNameComponents.length - 1;i += 1) {
+      if(!pkg.hasOwnProperty(packageNameComponents[i])) {
+        pkg = pkg[packageNameComponents[i]] = {}
+      }
+    }
+    return pkg[packageNameComponents[packageNameComponents.length - 1]]
+  }
+  runtime.loadClass = function(classpath) {
+    if(IS_COMPILED_CODE) {
+      return
+    }
+    if(cache.hasOwnProperty(classpath)) {
+      return
+    }
+    var names = classpath.split("."), impl;
+    impl = getOrDefinePackage(names);
+    if(impl) {
+      cache[classpath] = true;
+      return
+    }
+    function getPathFromManifests(classpath) {
+      var path = classpath.replace(".", "/") + ".js", dirs = runtime.libraryPaths(), i, dir, code;
+      if(runtime.currentDirectory) {
+        dirs.push(runtime.currentDirectory())
+      }
+      for(i = 0;i < dirs.length;i += 1) {
+        dir = dirs[i];
+        if(!dircontents.hasOwnProperty(dir)) {
+          code = runtime.readFileSync(dirs[i] + "/manifest.js", "utf8");
+          if(code && code.length) {
+            try {
+              dircontents[dir] = eval(code)
+            }catch(e1) {
+              dircontents[dir] = null;
+              runtime.log("Cannot load manifest for " + dir + ".")
+            }
+          }else {
+            dircontents[dir] = null
+          }
+        }
+        code = null;
+        dir = dircontents[dir];
+        if(dir && dir.indexOf && dir.indexOf(path) !== -1) {
+          return dirs[i] + "/" + path
+        }
+      }
+      return null
+    }
+    function load(classpath) {
+      var code, path;
+      path = getPathFromManifests(classpath);
+      if(!path) {
+        throw classpath + " is not listed in any manifest.js.";
+      }
+      try {
+        code = runtime.readFileSync(path, "utf8")
+      }catch(e2) {
+        runtime.log("Error loading " + classpath + " " + e2);
+        throw e2;
+      }
+      if(code === undefined) {
+        throw"Cannot load class " + classpath;
+      }
+      try {
+        code = eval(classpath + " = eval(code);")
+      }catch(e4) {
+        runtime.log("Error loading " + classpath + " " + e4);
+        throw e4;
+      }
+      return code
+    }
+    impl = load(classpath);
+    if(!impl || Runtime.getFunctionName(impl) !== names[names.length - 1]) {
+      runtime.log("Loaded code is not for " + names[names.length - 1]);
+      throw"Loaded code is not for " + names[names.length - 1];
+    }
+    cache[classpath] = true
+  }
+})();
+(function(args) {
+  args = Array.prototype.slice.call(args);
+  function run(argv) {
+    if(!argv.length) {
+      return
+    }
+    var script = argv[0];
+    runtime.readFile(script, "utf8", function(err, code) {
+      var path = "", paths = runtime.libraryPaths();
+      if(script.indexOf("/") !== -1) {
+        path = script.substring(0, script.indexOf("/"))
+      }
+      runtime.setCurrentDirectory(path);
+      function run() {
+        var script, path, paths, args, argv, result;
+        result = eval(code);
+        if(result) {
+          runtime.exit(result)
+        }
+        return
+      }
+      if(err) {
+        runtime.log(err);
+        runtime.exit(1)
+      }else {
+        run.apply(null, argv)
+      }
+    })
+  }
+  if(runtime.type() === "NodeJSRuntime") {
+    run(process.argv.slice(2))
+  }else {
+    if(runtime.type() === "RhinoRuntime") {
+      run(args)
+    }else {
+      run(args.slice(1))
+    }
+  }
+})(typeof arguments !== "undefined" && arguments);
+core.Base64 = function() {
+  var b64chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/", b64charcodes = function() {
+    var a = [], i, codeA = "A".charCodeAt(0), codea = "a".charCodeAt(0), code0 = "0".charCodeAt(0);
+    for(i = 0;i < 26;i += 1) {
+      a.push(codeA + i)
+    }
+    for(i = 0;i < 26;i += 1) {
+      a.push(codea + i)
+    }
+    for(i = 0;i < 10;i += 1) {
+      a.push(code0 + i)
+    }
+    a.push("+".charCodeAt(0));
+    a.push("/".charCodeAt(0));
+    return a
+  }(), b64tab = function(bin) {
+    var t = {}, i, l;
+    for(i = 0, l = bin.length;i < l;i += 1) {
+      t[bin.charAt(i)] = i
+    }
+    return t
+  }(b64chars), convertUTF16StringToBase64, convertBase64ToUTF16String, btoa, atob;
+  function stringToArray(s) {
+    var a = [], i, l = s.length;
+    for(i = 0;i < l;i += 1) {
+      a[i] = s.charCodeAt(i) & 255
+    }
+    return a
+  }
+  function convertUTF8ArrayToBase64(bin) {
+    var n, b64 = "", i, l = bin.length - 2;
+    for(i = 0;i < l;i += 3) {
+      n = bin[i] << 16 | bin[i + 1] << 8 | bin[i + 2];
+      b64 += b64chars[n >>> 18];
+      b64 += b64chars[n >>> 12 & 63];
+      b64 += b64chars[n >>> 6 & 63];
+      b64 += b64chars[n & 63]
+    }
+    if(i === l + 1) {
+      n = bin[i] << 4;
+      b64 += b64chars[n >>> 6];
+      b64 += b64chars[n & 63];
+      b64 += "=="
+    }else {
+      if(i === l) {
+        n = bin[i] << 10 | bin[i + 1] << 2;
+        b64 += b64chars[n >>> 12];
+        b64 += b64chars[n >>> 6 & 63];
+        b64 += b64chars[n & 63];
+        b64 += "="
+      }
+    }
+    return b64
+  }
+  function convertBase64ToUTF8Array(b64) {
+    b64 = b64.replace(/[^A-Za-z0-9+\/]+/g, "");
+    var bin = [], padlen = b64.length % 4, i, l = b64.length, n;
+    for(i = 0;i < l;i += 4) {
+      n = (b64tab[b64.charAt(i)] || 0) << 18 | (b64tab[b64.charAt(i + 1)] || 0) << 12 | (b64tab[b64.charAt(i + 2)] || 0) << 6 | (b64tab[b64.charAt(i + 3)] || 0);
+      bin.push(n >> 16, n >> 8 & 255, n & 255)
+    }
+    bin.length -= [0, 0, 2, 1][padlen];
+    return bin
+  }
+  function convertUTF16ArrayToUTF8Array(uni) {
+    var bin = [], i, l = uni.length, n;
+    for(i = 0;i < l;i += 1) {
+      n = uni[i];
+      if(n < 128) {
+        bin.push(n)
+      }else {
+        if(n < 2048) {
+          bin.push(192 | n >>> 6, 128 | n & 63)
+        }else {
+          bin.push(224 | n >>> 12 & 15, 128 | n >>> 6 & 63, 128 | n & 63)
+        }
+      }
+    }
+    return bin
+  }
+  function convertUTF8ArrayToUTF16Array(bin) {
+    var uni = [], i, l = bin.length, c0, c1, c2;
+    for(i = 0;i < l;i += 1) {
+      c0 = bin[i];
+      if(c0 < 128) {
+        uni.push(c0)
+      }else {
+        i += 1;
+        c1 = bin[i];
+        if(c0 < 224) {
+          uni.push((c0 & 31) << 6 | c1 & 63)
+        }else {
+          i += 1;
+          c2 = bin[i];
+          uni.push((c0 & 15) << 12 | (c1 & 63) << 6 | c2 & 63)
+        }
+      }
+    }
+    return uni
+  }
+  function convertUTF8StringToBase64(bin) {
+    return convertUTF8ArrayToBase64(stringToArray(bin))
+  }
+  function convertBase64ToUTF8String(b64) {
+    return String.fromCharCode.apply(String, convertBase64ToUTF8Array(b64))
+  }
+  function convertUTF8StringToUTF16Array(bin) {
+    return convertUTF8ArrayToUTF16Array(stringToArray(bin))
+  }
+  function convertUTF8ArrayToUTF16String(bin) {
+    var b = convertUTF8ArrayToUTF16Array(bin), r = "", i = 0, chunksize = 45E3;
+    while(i < b.length) {
+      r += String.fromCharCode.apply(String, b.slice(i, i + chunksize));
+      i += chunksize
+    }
+    return r
+  }
+  function convertUTF8StringToUTF16String_internal(bin, i, end) {
+    var str = "", c0, c1, c2, j;
+    for(j = i;j < end;j += 1) {
+      c0 = bin.charCodeAt(j) & 255;
+      if(c0 < 128) {
+        str += String.fromCharCode(c0)
+      }else {
+        j += 1;
+        c1 = bin.charCodeAt(j) & 255;
+        if(c0 < 224) {
+          str += String.fromCharCode((c0 & 31) << 6 | c1 & 63)
+        }else {
+          j += 1;
+          c2 = bin.charCodeAt(j) & 255;
+          str += String.fromCharCode((c0 & 15) << 12 | (c1 & 63) << 6 | c2 & 63)
+        }
+      }
+    }
+    return str
+  }
+  function convertUTF8StringToUTF16String(bin, callback) {
+    var partsize = 1E5, numparts = bin.length / partsize, str = "", pos = 0;
+    if(bin.length < partsize) {
+      callback(convertUTF8StringToUTF16String_internal(bin, 0, bin.length), true);
+      return
+    }
+    if(typeof bin !== "string") {
+      bin = bin.slice()
+    }
+    function f() {
+      var end = pos + partsize;
+      if(end > bin.length) {
+        end = bin.length
+      }
+      str += convertUTF8StringToUTF16String_internal(bin, pos, end);
+      pos = end;
+      end = pos === bin.length;
+      if(callback(str, end) && !end) {
+        runtime.setTimeout(f, 0)
+      }
+    }
+    f()
+  }
+  function convertUTF16StringToUTF8Array(uni) {
+    return convertUTF16ArrayToUTF8Array(stringToArray(uni))
+  }
+  function convertUTF16ArrayToUTF8String(uni) {
+    return String.fromCharCode.apply(String, convertUTF16ArrayToUTF8Array(uni))
+  }
+  function convertUTF16StringToUTF8String(uni) {
+    return String.fromCharCode.apply(String, convertUTF16ArrayToUTF8Array(stringToArray(uni)))
+  }
+  btoa = runtime.getWindow() && runtime.getWindow().btoa;
+  if(btoa) {
+    convertUTF16StringToBase64 = function(uni) {
+      return btoa(convertUTF16StringToUTF8String(uni))
+    }
+  }else {
+    btoa = convertUTF8StringToBase64;
+    convertUTF16StringToBase64 = function(uni) {
+      return convertUTF8ArrayToBase64(convertUTF16StringToUTF8Array(uni))
+    }
+  }
+  atob = runtime.getWindow() && runtime.getWindow().atob;
+  if(atob) {
+    convertBase64ToUTF16String = function(b64) {
+      var b = atob(b64);
+      return convertUTF8StringToUTF16String_internal(b, 0, b.length)
+    }
+  }else {
+    atob = convertBase64ToUTF8String;
+    convertBase64ToUTF16String = function(b64) {
+      return convertUTF8ArrayToUTF16String(convertBase64ToUTF8Array(b64))
+    }
+  }
+  function Base64() {
+    this.convertUTF8ArrayToBase64 = convertUTF8ArrayToBase64;
+    this.convertByteArrayToBase64 = convertUTF8ArrayToBase64;
+    this.convertBase64ToUTF8Array = convertBase64ToUTF8Array;
+    this.convertBase64ToByteArray = convertBase64ToUTF8Array;
+    this.convertUTF16ArrayToUTF8Array = convertUTF16ArrayToUTF8Array;
+    this.convertUTF16ArrayToByteArray = convertUTF16ArrayToUTF8Array;
+    this.convertUTF8ArrayToUTF16Array = convertUTF8ArrayToUTF16Array;
+    this.convertByteArrayToUTF16Array = convertUTF8ArrayToUTF16Array;
+    this.convertUTF8StringToBase64 = convertUTF8StringToBase64;
+    this.convertBase64ToUTF8String = convertBase64ToUTF8String;
+    this.convertUTF8StringToUTF16Array = convertUTF8StringToUTF16Array;
+    this.convertUTF8ArrayToUTF16String = convertUTF8ArrayToUTF16String;
+    this.convertByteArrayToUTF16String = convertUTF8ArrayToUTF16String;
+    this.convertUTF8StringToUTF16String = convertUTF8StringToUTF16String;
+    this.convertUTF16StringToUTF8Array = convertUTF16StringToUTF8Array;
+    this.convertUTF16StringToByteArray = convertUTF16StringToUTF8Array;
+    this.convertUTF16ArrayToUTF8String = convertUTF16ArrayToUTF8String;
+    this.convertUTF16StringToUTF8String = convertUTF16StringToUTF8String;
+    this.convertUTF16StringToBase64 = convertUTF16StringToBase64;
+    this.convertBase64ToUTF16String = convertBase64ToUTF16String;
+    this.fromBase64 = convertBase64ToUTF8String;
+    this.toBase64 = convertUTF8StringToBase64;
+    this.atob = atob;
+    this.btoa = btoa;
+    this.utob = convertUTF16StringToUTF8String;
+    this.btou = convertUTF8StringToUTF16String;
+    this.encode = convertUTF16StringToBase64;
+    this.encodeURI = function(u) {
+      return convertUTF16StringToBase64(u).replace(/[+\/]/g, function(m0) {
+        return m0 === "+" ? "-" : "_"
+      }).replace(/\\=+$/, "")
+    };
+    this.decode = function(a) {
+      return convertBase64ToUTF16String(a.replace(/[\-_]/g, function(m0) {
+        return m0 === "-" ? "+" : "/"
+      }))
+    }
+  }
+  return Base64
+}();
+core.RawDeflate = function() {
+  var zip_WSIZE = 32768, zip_STORED_BLOCK = 0, zip_STATIC_TREES = 1, zip_DYN_TREES = 2, zip_DEFAULT_LEVEL = 6, zip_FULL_SEARCH = true, zip_INBUFSIZ = 32768, zip_INBUF_EXTRA = 64, zip_OUTBUFSIZ = 1024 * 8, zip_window_size = 2 * zip_WSIZE, zip_MIN_MATCH = 3, zip_MAX_MATCH = 258, zip_BITS = 16, zip_LIT_BUFSIZE = 8192, zip_HASH_BITS = 13, zip_DIST_BUFSIZE = zip_LIT_BUFSIZE, zip_HASH_SIZE = 1 << zip_HASH_BITS, zip_HASH_MASK = zip_HASH_SIZE - 1, zip_WMASK = zip_WSIZE - 1, zip_NIL = 0, zip_TOO_FAR = 4096, 
+  zip_MIN_LOOKAHEAD = zip_MAX_MATCH + zip_MIN_MATCH + 1, zip_MAX_DIST = zip_WSIZE - zip_MIN_LOOKAHEAD, zip_SMALLEST = 1, zip_MAX_BITS = 15, zip_MAX_BL_BITS = 7, zip_LENGTH_CODES = 29, zip_LITERALS = 256, zip_END_BLOCK = 256, zip_L_CODES = zip_LITERALS + 1 + zip_LENGTH_CODES, zip_D_CODES = 30, zip_BL_CODES = 19, zip_REP_3_6 = 16, zip_REPZ_3_10 = 17, zip_REPZ_11_138 = 18, zip_HEAP_SIZE = 2 * zip_L_CODES + 1, zip_H_SHIFT = parseInt((zip_HASH_BITS + zip_MIN_MATCH - 1) / zip_MIN_MATCH, 10), zip_free_queue, 
+  zip_qhead, zip_qtail, zip_initflag, zip_outbuf = null, zip_outcnt, zip_outoff, zip_complete, zip_window, zip_d_buf, zip_l_buf, zip_prev, zip_bi_buf, zip_bi_valid, zip_block_start, zip_ins_h, zip_hash_head, zip_prev_match, zip_match_available, zip_match_length, zip_prev_length, zip_strstart, zip_match_start, zip_eofile, zip_lookahead, zip_max_chain_length, zip_max_lazy_match, zip_compr_level, zip_good_match, zip_nice_match, zip_dyn_ltree, zip_dyn_dtree, zip_static_ltree, zip_static_dtree, zip_bl_tree, 
+  zip_l_desc, zip_d_desc, zip_bl_desc, zip_bl_count, zip_heap, zip_heap_len, zip_heap_max, zip_depth, zip_length_code, zip_dist_code, zip_base_length, zip_base_dist, zip_flag_buf, zip_last_lit, zip_last_dist, zip_last_flags, zip_flags, zip_flag_bit, zip_opt_len, zip_static_len, zip_deflate_data, zip_deflate_pos, zip_extra_lbits = [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5, 0], zip_extra_dbits = [0, 0, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 
+  9, 10, 10, 11, 11, 12, 12, 13, 13], zip_extra_blbits = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 3, 7], zip_bl_order = [16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15], zip_configuration_table;
+  if(zip_LIT_BUFSIZE > zip_INBUFSIZ) {
+    runtime.log("error: zip_INBUFSIZ is too small")
+  }
+  if(zip_WSIZE << 1 > 1 << zip_BITS) {
+    runtime.log("error: zip_WSIZE is too large")
+  }
+  if(zip_HASH_BITS > zip_BITS - 1) {
+    runtime.log("error: zip_HASH_BITS is too large")
+  }
+  if(zip_HASH_BITS < 8 || zip_MAX_MATCH !== 258) {
+    runtime.log("error: Code too clever")
+  }
+  function Zip_DeflateCT() {
+    this.fc = 0;
+    this.dl = 0
+  }
+  function Zip_DeflateTreeDesc() {
+    this.dyn_tree = null;
+    this.static_tree = null;
+    this.extra_bits = null;
+    this.extra_base = 0;
+    this.elems = 0;
+    this.max_length = 0;
+    this.max_code = 0
+  }
+  function Zip_DeflateConfiguration(a, b, c, d) {
+    this.good_length = a;
+    this.max_lazy = b;
+    this.nice_length = c;
+    this.max_chain = d
+  }
+  function Zip_DeflateBuffer() {
+    this.next = null;
+    this.len = 0;
+    this.ptr = [];
+    this.ptr.length = zip_OUTBUFSIZ;
+    this.off = 0
+  }
+  zip_configuration_table = [new Zip_DeflateConfiguration(0, 0, 0, 0), new Zip_DeflateConfiguration(4, 4, 8, 4), new Zip_DeflateConfiguration(4, 5, 16, 8), new Zip_DeflateConfiguration(4, 6, 32, 32), new Zip_DeflateConfiguration(4, 4, 16, 16), new Zip_DeflateConfiguration(8, 16, 32, 32), new Zip_DeflateConfiguration(8, 16, 128, 128), new Zip_DeflateConfiguration(8, 32, 128, 256), new Zip_DeflateConfiguration(32, 128, 258, 1024), new Zip_DeflateConfiguration(32, 258, 258, 4096)];
+  function zip_deflate_start(level) {
+    var i;
+    if(!level) {
+      level = zip_DEFAULT_LEVEL
+    }else {
+      if(level < 1) {
+        level = 1
+      }else {
+        if(level > 9) {
+          level = 9
+        }
+      }
+    }
+    zip_compr_level = level;
+    zip_initflag = false;
+    zip_eofile = false;
+    if(zip_outbuf !== null) {
+      return
+    }
+    zip_free_queue = zip_qhead = zip_qtail = null;
+    zip_outbuf = [];
+    zip_outbuf.length = zip_OUTBUFSIZ;
+    zip_window = [];
+    zip_window.length = zip_window_size;
+    zip_d_buf = [];
+    zip_d_buf.length = zip_DIST_BUFSIZE;
+    zip_l_buf = [];
+    zip_l_buf.length = zip_INBUFSIZ + zip_INBUF_EXTRA;
+    zip_prev = [];
+    zip_prev.length = 1 << zip_BITS;
+    zip_dyn_ltree = [];
+    zip_dyn_ltree.length = zip_HEAP_SIZE;
+    for(i = 0;i < zip_HEAP_SIZE;i++) {
+      zip_dyn_ltree[i] = new Zip_DeflateCT
+    }
+    zip_dyn_dtree = [];
+    zip_dyn_dtree.length = 2 * zip_D_CODES + 1;
+    for(i = 0;i < 2 * zip_D_CODES + 1;i++) {
+      zip_dyn_dtree[i] = new Zip_DeflateCT
+    }
+    zip_static_ltree = [];
+    zip_static_ltree.length = zip_L_CODES + 2;
+    for(i = 0;i < zip_L_CODES + 2;i++) {
+      zip_static_ltree[i] = new Zip_DeflateCT
+    }
+    zip_static_dtree = [];
+    zip_static_dtree.length = zip_D_CODES;
+    for(i = 0;i < zip_D_CODES;i++) {
+      zip_static_dtree[i] = new Zip_DeflateCT
+    }
+    zip_bl_tree = [];
+    zip_bl_tree.length = 2 * zip_BL_CODES + 1;
+    for(i = 0;i < 2 * zip_BL_CODES + 1;i++) {
+      zip_bl_tree[i] = new Zip_DeflateCT
+    }
+    zip_l_desc = new Zip_DeflateTreeDesc;
+    zip_d_desc = new Zip_DeflateTreeDesc;
+    zip_bl_desc = new Zip_DeflateTreeDesc;
+    zip_bl_count = [];
+    zip_bl_count.length = zip_MAX_BITS + 1;
+    zip_heap = [];
+    zip_heap.length = 2 * zip_L_CODES + 1;
+    zip_depth = [];
+    zip_depth.length = 2 * zip_L_CODES + 1;
+    zip_length_code = [];
+    zip_length_code.length = zip_MAX_MATCH - zip_MIN_MATCH + 1;
+    zip_dist_code = [];
+    zip_dist_code.length = 512;
+    zip_base_length = [];
+    zip_base_length.length = zip_LENGTH_CODES;
+    zip_base_dist = [];
+    zip_base_dist.length = zip_D_CODES;
+    zip_flag_buf = [];
+    zip_flag_buf.length = parseInt(zip_LIT_BUFSIZE / 8, 10)
+  }
+  var zip_deflate_end = function() {
+    zip_free_queue = zip_qhead = zip_qtail = null;
+    zip_outbuf = null;
+    zip_window = null;
+    zip_d_buf = null;
+    zip_l_buf = null;
+    zip_prev = null;
+    zip_dyn_ltree = null;
+    zip_dyn_dtree = null;
+    zip_static_ltree = null;
+    zip_static_dtree = null;
+    zip_bl_tree = null;
+    zip_l_desc = null;
+    zip_d_desc = null;
+    zip_bl_desc = null;
+    zip_bl_count = null;
+    zip_heap = null;
+    zip_depth = null;
+    zip_length_code = null;
+    zip_dist_code = null;
+    zip_base_length = null;
+    zip_base_dist = null;
+    zip_flag_buf = null
+  };
+  var zip_reuse_queue = function(p) {
+    p.next = zip_free_queue;
+    zip_free_queue = p
+  };
+  var zip_new_queue = function() {
+    var p;
+    if(zip_free_queue !== null) {
+      p = zip_free_queue;
+      zip_free_queue = zip_free_queue.next
+    }else {
+      p = new Zip_DeflateBuffer
+    }
+    p.next = null;
+    p.len = p.off = 0;
+    return p
+  };
+  var zip_head1 = function(i) {
+    return zip_prev[zip_WSIZE + i]
+  };
+  var zip_head2 = function(i, val) {
+    zip_prev[zip_WSIZE + i] = val;
+    return val
+  };
+  var zip_qoutbuf = function() {
+    var q, i;
+    if(zip_outcnt !== 0) {
+      q = zip_new_queue();
+      if(zip_qhead === null) {
+        zip_qhead = zip_qtail = q
+      }else {
+        zip_qtail = zip_qtail.next = q
+      }
+      q.len = zip_outcnt - zip_outoff;
+      for(i = 0;i < q.len;i++) {
+        q.ptr[i] = zip_outbuf[zip_outoff + i]
+      }
+      zip_outcnt = zip_outoff = 0
+    }
+  };
+  var zip_put_byte = function(c) {
+    zip_outbuf[zip_outoff + zip_outcnt++] = c;
+    if(zip_outoff + zip_outcnt === zip_OUTBUFSIZ) {
+      zip_qoutbuf()
+    }
+  };
+  var zip_put_short = function(w) {
+    w &= 65535;
+    if(zip_outoff + zip_outcnt < zip_OUTBUFSIZ - 2) {
+      zip_outbuf[zip_outoff + zip_outcnt++] = w & 255;
+      zip_outbuf[zip_outoff + zip_outcnt++] = w >>> 8
+    }else {
+      zip_put_byte(w & 255);
+      zip_put_byte(w >>> 8)
+    }
+  };
+  var zip_INSERT_STRING = function() {
+    zip_ins_h = (zip_ins_h << zip_H_SHIFT ^ zip_window[zip_strstart + zip_MIN_MATCH - 1] & 255) & zip_HASH_MASK;
+    zip_hash_head = zip_head1(zip_ins_h);
+    zip_prev[zip_strstart & zip_WMASK] = zip_hash_head;
+    zip_head2(zip_ins_h, zip_strstart)
+  };
+  var zip_Buf_size = 16;
+  var zip_send_bits = function(value, length) {
+    if(zip_bi_valid > zip_Buf_size - length) {
+      zip_bi_buf |= value << zip_bi_valid;
+      zip_put_short(zip_bi_buf);
+      zip_bi_buf = value >> zip_Buf_size - zip_bi_valid;
+      zip_bi_valid += length - zip_Buf_size
+    }else {
+      zip_bi_buf |= value << zip_bi_valid;
+      zip_bi_valid += length
+    }
+  };
+  var zip_SEND_CODE = function(c, tree) {
+    zip_send_bits(tree[c].fc, tree[c].dl)
+  };
+  var zip_D_CODE = function(dist) {
+    return(dist < 256 ? zip_dist_code[dist] : zip_dist_code[256 + (dist >> 7)]) & 255
+  };
+  var zip_SMALLER = function(tree, n, m) {
+    return tree[n].fc < tree[m].fc || tree[n].fc === tree[m].fc && zip_depth[n] <= zip_depth[m]
+  };
+  var zip_read_buff = function(buff, offset, n) {
+    var i;
+    for(i = 0;i < n && zip_deflate_pos < zip_deflate_data.length;i++) {
+      buff[offset + i] = zip_deflate_data.charCodeAt(zip_deflate_pos++) & 255
+    }
+    return i
+  };
+  var zip_fill_window = function() {
+    var n, m;
+    var more = zip_window_size - zip_lookahead - zip_strstart;
+    if(more === -1) {
+      more--
+    }else {
+      if(zip_strstart >= zip_WSIZE + zip_MAX_DIST) {
+        for(n = 0;n < zip_WSIZE;n++) {
+          zip_window[n] = zip_window[n + zip_WSIZE]
+        }
+        zip_match_start -= zip_WSIZE;
+        zip_strstart -= zip_WSIZE;
+        zip_block_start -= zip_WSIZE;
+        for(n = 0;n < zip_HASH_SIZE;n++) {
+          m = zip_head1(n);
+          zip_head2(n, m >= zip_WSIZE ? m - zip_WSIZE : zip_NIL)
+        }
+        for(n = 0;n < zip_WSIZE;n++) {
+          m = zip_prev[n];
+          zip_prev[n] = m >= zip_WSIZE ? m - zip_WSIZE : zip_NIL
+        }
+        more += zip_WSIZE
+      }
+    }
+    if(!zip_eofile) {
+      n = zip_read_buff(zip_window, zip_strstart + zip_lookahead, more);
+      if(n <= 0) {
+        zip_eofile = true
+      }else {
+        zip_lookahead += n
+      }
+    }
+  };
+  var zip_lm_init = function() {
+    var j;
+    for(j = 0;j < zip_HASH_SIZE;j++) {
+      zip_prev[zip_WSIZE + j] = 0
+    }
+    zip_max_lazy_match = zip_configuration_table[zip_compr_level].max_lazy;
+    zip_good_match = zip_configuration_table[zip_compr_level].good_length;
+    if(!zip_FULL_SEARCH) {
+      zip_nice_match = zip_configuration_table[zip_compr_level].nice_length
+    }
+    zip_max_chain_length = zip_configuration_table[zip_compr_level].max_chain;
+    zip_strstart = 0;
+    zip_block_start = 0;
+    zip_lookahead = zip_read_buff(zip_window, 0, 2 * zip_WSIZE);
+    if(zip_lookahead <= 0) {
+      zip_eofile = true;
+      zip_lookahead = 0;
+      return
+    }
+    zip_eofile = false;
+    while(zip_lookahead < zip_MIN_LOOKAHEAD && !zip_eofile) {
+      zip_fill_window()
+    }
+    zip_ins_h = 0;
+    for(j = 0;j < zip_MIN_MATCH - 1;j++) {
+      zip_ins_h = (zip_ins_h << zip_H_SHIFT ^ zip_window[j] & 255) & zip_HASH_MASK
+    }
+  };
+  var zip_longest_match = function(cur_match) {
+    var chain_length = zip_max_chain_length;
+    var scanp = zip_strstart;
+    var matchp;
+    var len;
+    var best_len = zip_prev_length;
+    var limit = zip_strstart > zip_MAX_DIST ? zip_strstart - zip_MAX_DIST : zip_NIL;
+    var strendp = zip_strstart + zip_MAX_MATCH;
+    var scan_end1 = zip_window[scanp + best_len - 1];
+    var scan_end = zip_window[scanp + best_len];
+    if(zip_prev_length >= zip_good_match) {
+      chain_length >>= 2
+    }
+    do {
+      matchp = cur_match;
+      if(zip_window[matchp + best_len] !== scan_end || zip_window[matchp + best_len - 1] !== scan_end1 || zip_window[matchp] !== zip_window[scanp] || zip_window[++matchp] !== zip_window[scanp + 1]) {
+        continue
+      }
+      scanp += 2;
+      matchp++;
+      do {
+        ++scanp
+      }while(zip_window[scanp] === zip_window[++matchp] && zip_window[++scanp] === zip_window[++matchp] && zip_window[++scanp] === zip_window[++matchp] && zip_window[++scanp] === zip_window[++matchp] && zip_window[++scanp] === zip_window[++matchp] && zip_window[++scanp] === zip_window[++matchp] && zip_window[++scanp] === zip_window[++matchp] && zip_window[++scanp] === zip_window[++matchp] && scanp < strendp);
+      len = zip_MAX_MATCH - (strendp - scanp);
+      scanp = strendp - zip_MAX_MATCH;
+      if(len > best_len) {
+        zip_match_start = cur_match;
+        best_len = len;
+        if(zip_FULL_SEARCH) {
+          if(len >= zip_MAX_MATCH) {
+            break
+          }
+        }else {
+          if(len >= zip_nice_match) {
+            break
+          }
+        }
+        scan_end1 = zip_window[scanp + best_len - 1];
+        scan_end = zip_window[scanp + best_len]
+      }
+    }while((cur_match = zip_prev[cur_match & zip_WMASK]) > limit && --chain_length !== 0);
+    return best_len
+  };
+  var zip_ct_tally = function(dist, lc) {
+    zip_l_buf[zip_last_lit++] = lc;
+    if(dist === 0) {
+      zip_dyn_ltree[lc].fc++
+    }else {
+      dist--;
+      zip_dyn_ltree[zip_length_code[lc] + zip_LITERALS + 1].fc++;
+      zip_dyn_dtree[zip_D_CODE(dist)].fc++;
+      zip_d_buf[zip_last_dist++] = dist;
+      zip_flags |= zip_flag_bit
+    }
+    zip_flag_bit <<= 1;
+    if((zip_last_lit & 7) === 0) {
+      zip_flag_buf[zip_last_flags++] = zip_flags;
+      zip_flags = 0;
+      zip_flag_bit = 1
+    }
+    if(zip_compr_level > 2 && (zip_last_lit & 4095) === 0) {
+      var out_length = zip_last_lit * 8;
+      var in_length = zip_strstart - zip_block_start;
+      var dcode;
+      for(dcode = 0;dcode < zip_D_CODES;dcode++) {
+        out_length += zip_dyn_dtree[dcode].fc * (5 + zip_extra_dbits[dcode])
+      }
+      out_length >>= 3;
+      if(zip_last_dist < parseInt(zip_last_lit / 2, 10) && out_length < parseInt(in_length / 2, 10)) {
+        return true
+      }
+    }
+    return zip_last_lit === zip_LIT_BUFSIZE - 1 || zip_last_dist === zip_DIST_BUFSIZE
+  };
+  var zip_pqdownheap = function(tree, k) {
+    var v = zip_heap[k];
+    var j = k << 1;
+    while(j <= zip_heap_len) {
+      if(j < zip_heap_len && zip_SMALLER(tree, zip_heap[j + 1], zip_heap[j])) {
+        j++
+      }
+      if(zip_SMALLER(tree, v, zip_heap[j])) {
+        break
+      }
+      zip_heap[k] = zip_heap[j];
+      k = j;
+      j <<= 1
+    }
+    zip_heap[k] = v
+  };
+  var zip_gen_bitlen = function(desc) {
+    var tree = desc.dyn_tree;
+    var extra = desc.extra_bits;
+    var base = desc.extra_base;
+    var max_code = desc.max_code;
+    var max_length = desc.max_length;
+    var stree = desc.static_tree;
+    var h;
+    var n, m;
+    var bits;
+    var xbits;
+    var f;
+    var overflow = 0;
+    for(bits = 0;bits <= zip_MAX_BITS;bits++) {
+      zip_bl_count[bits] = 0
+    }
+    tree[zip_heap[zip_heap_max]].dl = 0;
+    for(h = zip_heap_max + 1;h < zip_HEAP_SIZE;h++) {
+      n = zip_heap[h];
+      bits = tree[tree[n].dl].dl + 1;
+      if(bits > max_length) {
+        bits = max_length;
+        overflow++
+      }
+      tree[n].dl = bits;
+      if(n > max_code) {
+        continue
+      }
+      zip_bl_count[bits]++;
+      xbits = 0;
+      if(n >= base) {
+        xbits = extra[n - base]
+      }
+      f = tree[n].fc;
+      zip_opt_len += f * (bits + xbits);
+      if(stree !== null) {
+        zip_static_len += f * (stree[n].dl + xbits)
+      }
+    }
+    if(overflow === 0) {
+      return
+    }
+    do {
+      bits = max_length - 1;
+      while(zip_bl_count[bits] === 0) {
+        bits--
+      }
+      zip_bl_count[bits]--;
+      zip_bl_count[bits + 1] += 2;
+      zip_bl_count[max_length]--;
+      overflow -= 2
+    }while(overflow > 0);
+    for(bits = max_length;bits !== 0;bits--) {
+      n = zip_bl_count[bits];
+      while(n !== 0) {
+        m = zip_heap[--h];
+        if(m > max_code) {
+          continue
+        }
+        if(tree[m].dl !== bits) {
+          zip_opt_len += (bits - tree[m].dl) * tree[m].fc;
+          tree[m].fc = bits
+        }
+        n--
+      }
+    }
+  };
+  var zip_bi_reverse = function(code, len) {
+    var res = 0;
+    do {
+      res |= code & 1;
+      code >>= 1;
+      res <<= 1
+    }while(--len > 0);
+    return res >> 1
+  };
+  var zip_gen_codes = function(tree, max_code) {
+    var next_code = [];
+    next_code.length = zip_MAX_BITS + 1;
+    var code = 0;
+    var bits;
+    var n;
+    for(bits = 1;bits <= zip_MAX_BITS;bits++) {
+      code = code + zip_bl_count[bits - 1] << 1;
+      next_code[bits] = code
+    }
+    for(n = 0;n <= max_code;n++) {
+      var len = tree[n].dl;
+      if(len === 0) {
+        continue
+      }
+      tree[n].fc = zip_bi_reverse(next_code[len]++, len)
+    }
+  };
+  var zip_build_tree = function(desc) {
+    var tree = desc.dyn_tree;
+    var stree = desc.static_tree;
+    var elems = desc.elems;
+    var n, m;
+    var max_code = -1;
+    var node = elems;
+    zip_heap_len = 0;
+    zip_heap_max = zip_HEAP_SIZE;
+    for(n = 0;n < elems;n++) {
+      if(tree[n].fc !== 0) {
+        zip_heap[++zip_heap_len] = max_code = n;
+        zip_depth[n] = 0
+      }else {
+        tree[n].dl = 0
+      }
+    }
+    while(zip_heap_len < 2) {
+      var xnew = zip_heap[++zip_heap_len] = max_code < 2 ? ++max_code : 0;
+      tree[xnew].fc = 1;
+      zip_depth[xnew] = 0;
+      zip_opt_len--;
+      if(stree !== null) {
+        zip_static_len -= stree[xnew].dl
+      }
+    }
+    desc.max_code = max_code;
+    for(n = zip_heap_len >> 1;n >= 1;n--) {
+      zip_pqdownheap(tree, n)
+    }
+    do {
+      n = zip_heap[zip_SMALLEST];
+      zip_heap[zip_SMALLEST] = zip_heap[zip_heap_len--];
+      zip_pqdownheap(tree, zip_SMALLEST);
+      m = zip_heap[zip_SMALLEST];
+      zip_heap[--zip_heap_max] = n;
+      zip_heap[--zip_heap_max] = m;
+      tree[node].fc = tree[n].fc + tree[m].fc;
+      if(zip_depth[n] > zip_depth[m] + 1) {
+        zip_depth[node] = zip_depth[n]
+      }else {
+        zip_depth[node] = zip_depth[m] + 1
+      }
+      tree[n].dl = tree[m].dl = node;
+      zip_heap[zip_SMALLEST] = node++;
+      zip_pqdownheap(tree, zip_SMALLEST)
+    }while(zip_heap_len >= 2);
+    zip_heap[--zip_heap_max] = zip_heap[zip_SMALLEST];
+    zip_gen_bitlen(desc);
+    zip_gen_codes(tree, max_code)
+  };
+  var zip_scan_tree = function(tree, max_code) {
+    var n;
+    var prevlen = -1;
+    var curlen;
+    var nextlen = tree[0].dl;
+    var count = 0;
+    var max_count = 7;
+    var min_count = 4;
+    if(nextlen === 0) {
+      max_count = 138;
+      min_count = 3
+    }
+    tree[max_code + 1].dl = 65535;
+    for(n = 0;n <= max_code;n++) {
+      curlen = nextlen;
+      nextlen = tree[n + 1].dl;
+      if(++count < max_count && curlen === nextlen) {
+        continue
+      }else {
+        if(count < min_count) {
+          zip_bl_tree[curlen].fc += count
+        }else {
+          if(curlen !== 0) {
+            if(curlen !== prevlen) {
+              zip_bl_tree[curlen].fc++
+            }
+            zip_bl_tree[zip_REP_3_6].fc++
+          }else {
+            if(count <= 10) {
+              zip_bl_tree[zip_REPZ_3_10].fc++
+            }else {
+              zip_bl_tree[zip_REPZ_11_138].fc++
+            }
+          }
+        }
+      }
+      count = 0;
+      prevlen = curlen;
+      if(nextlen === 0) {
+        max_count = 138;
+        min_count = 3
+      }else {
+        if(curlen === nextlen) {
+          max_count = 6;
+          min_count = 3
+        }else {
+          max_count = 7;
+          min_count = 4
+        }
+      }
+    }
+  };
+  var zip_build_bl_tree = function() {
+    var max_blindex;
+    zip_scan_tree(zip_dyn_ltree, zip_l_desc.max_code);
+    zip_scan_tree(zip_dyn_dtree, zip_d_desc.max_code);
+    zip_build_tree(zip_bl_desc);
+    for(max_blindex = zip_BL_CODES - 1;max_blindex >= 3;max_blindex--) {
+      if(zip_bl_tree[zip_bl_order[max_blindex]].dl !== 0) {
+        break
+      }
+    }
+    zip_opt_len += 3 * (max_blindex + 1) + 5 + 5 + 4;
+    return max_blindex
+  };
+  var zip_bi_windup = function() {
+    if(zip_bi_valid > 8) {
+      zip_put_short(zip_bi_buf)
+    }else {
+      if(zip_bi_valid > 0) {
+        zip_put_byte(zip_bi_buf)
+      }
+    }
+    zip_bi_buf = 0;
+    zip_bi_valid = 0
+  };
+  var zip_compress_block = function(ltree, dtree) {
+    var dist;
+    var lc;
+    var lx = 0;
+    var dx = 0;
+    var fx = 0;
+    var flag = 0;
+    var code;
+    var extra;
+    if(zip_last_lit !== 0) {
+      do {
+        if((lx & 7) === 0) {
+          flag = zip_flag_buf[fx++]
+        }
+        lc = zip_l_buf[lx++] & 255;
+        if((flag & 1) === 0) {
+          zip_SEND_CODE(lc, ltree)
+        }else {
+          code = zip_length_code[lc];
+          zip_SEND_CODE(code + zip_LITERALS + 1, ltree);
+          extra = zip_extra_lbits[code];
+          if(extra !== 0) {
+            lc -= zip_base_length[code];
+            zip_send_bits(lc, extra)
+          }
+          dist = zip_d_buf[dx++];
+          code = zip_D_CODE(dist);
+          zip_SEND_CODE(code, dtree);
+          extra = zip_extra_dbits[code];
+          if(extra !== 0) {
+            dist -= zip_base_dist[code];
+            zip_send_bits(dist, extra)
+          }
+        }
+        flag >>= 1
+      }while(lx < zip_last_lit)
+    }
+    zip_SEND_CODE(zip_END_BLOCK, ltree)
+  };
+  var zip_send_tree = function(tree, max_code) {
+    var n;
+    var prevlen = -1;
+    var curlen;
+    var nextlen = tree[0].dl;
+    var count = 0;
+    var max_count = 7;
+    var min_count = 4;
+    if(nextlen === 0) {
+      max_count = 138;
+      min_count = 3
+    }
+    for(n = 0;n <= max_code;n++) {
+      curlen = nextlen;
+      nextlen = tree[n + 1].dl;
+      if(++count < max_count && curlen === nextlen) {
+        continue
+      }else {
+        if(count < min_count) {
+          do {
+            zip_SEND_CODE(curlen, zip_bl_tree)
+          }while(--count !== 0)
+        }else {
+          if(curlen !== 0) {
+            if(curlen !== prevlen) {
+              zip_SEND_CODE(curlen, zip_bl_tree);
+              count--
+            }
+            zip_SEND_CODE(zip_REP_3_6, zip_bl_tree);
+            zip_send_bits(count - 3, 2)
+          }else {
+            if(count <= 10) {
+              zip_SEND_CODE(zip_REPZ_3_10, zip_bl_tree);
+              zip_send_bits(count - 3, 3)
+            }else {
+              zip_SEND_CODE(zip_REPZ_11_138, zip_bl_tree);
+              zip_send_bits(count - 11, 7)
+            }
+          }
+        }
+      }
+      count = 0;
+      prevlen = curlen;
+      if(nextlen === 0) {
+        max_count = 138;
+        min_count = 3
+      }else {
+        if(curlen === nextlen) {
+          max_count = 6;
+          min_count = 3
+        }else {
+          max_count = 7;
+          min_count = 4
+        }
+      }
+    }
+  };
+  var zip_send_all_trees = function(lcodes, dcodes, blcodes) {
+    var rank;
+    zip_send_bits(lcodes - 257, 5);
+    zip_send_bits(dcodes - 1, 5);
+    zip_send_bits(blcodes - 4, 4);
+    for(rank = 0;rank < blcodes;rank++) {
+      zip_send_bits(zip_bl_tree[zip_bl_order[rank]].dl, 3)
+    }
+    zip_send_tree(zip_dyn_ltree, lcodes - 1);
+    zip_send_tree(zip_dyn_dtree, dcodes - 1)
+  };
+  var zip_init_block = function() {
+    var n;
+    for(n = 0;n < zip_L_CODES;n++) {
+      zip_dyn_ltree[n].fc = 0
+    }
+    for(n = 0;n < zip_D_CODES;n++) {
+      zip_dyn_dtree[n].fc = 0
+    }
+    for(n = 0;n < zip_BL_CODES;n++) {
+      zip_bl_tree[n].fc = 0
+    }
+    zip_dyn_ltree[zip_END_BLOCK].fc = 1;
+    zip_opt_len = zip_static_len = 0;
+    zip_last_lit = zip_last_dist = zip_last_flags = 0;
+    zip_flags = 0;
+    zip_flag_bit = 1
+  };
+  var zip_flush_block = function(eof) {
+    var opt_lenb, static_lenb;
+    var max_blindex;
+    var stored_len;
+    stored_len = zip_strstart - zip_block_start;
+    zip_flag_buf[zip_last_flags] = zip_flags;
+    zip_build_tree(zip_l_desc);
+    zip_build_tree(zip_d_desc);
+    max_blindex = zip_build_bl_tree();
+    opt_lenb = zip_opt_len + 3 + 7 >> 3;
+    static_lenb = zip_static_len + 3 + 7 >> 3;
+    if(static_lenb <= opt_lenb) {
+      opt_lenb = static_lenb
+    }
+    if(stored_len + 4 <= opt_lenb && zip_block_start >= 0) {
+      var i;
+      zip_send_bits((zip_STORED_BLOCK << 1) + eof, 3);
+      zip_bi_windup();
+      zip_put_short(stored_len);
+      zip_put_short(~stored_len);
+      for(i = 0;i < stored_len;i++) {
+        zip_put_byte(zip_window[zip_block_start + i])
+      }
+    }else {
+      if(static_lenb === opt_lenb) {
+        zip_send_bits((zip_STATIC_TREES << 1) + eof, 3);
+        zip_compress_block(zip_static_ltree, zip_static_dtree)
+      }else {
+        zip_send_bits((zip_DYN_TREES << 1) + eof, 3);
+        zip_send_all_trees(zip_l_desc.max_code + 1, zip_d_desc.max_code + 1, max_blindex + 1);
+        zip_compress_block(zip_dyn_ltree, zip_dyn_dtree)
+      }
+    }
+    zip_init_block();
+    if(eof !== 0) {
+      zip_bi_windup()
+    }
+  };
+  var zip_deflate_fast = function() {
+    while(zip_lookahead !== 0 && zip_qhead === null) {
+      var flush;
+      zip_INSERT_STRING();
+      if(zip_hash_head !== zip_NIL && zip_strstart - zip_hash_head <= zip_MAX_DIST) {
+        zip_match_length = zip_longest_match(zip_hash_head);
+        if(zip_match_length > zip_lookahead) {
+          zip_match_length = zip_lookahead
+        }
+      }
+      if(zip_match_length >= zip_MIN_MATCH) {
+        flush = zip_ct_tally(zip_strstart - zip_match_start, zip_match_length - zip_MIN_MATCH);
+        zip_lookahead -= zip_match_length;
+        if(zip_match_length <= zip_max_lazy_match) {
+          zip_match_length--;
+          do {
+            zip_strstart++;
+            zip_INSERT_STRING()
+          }while(--zip_match_length !== 0);
+          zip_strstart++
+        }else {
+          zip_strstart += zip_match_length;
+          zip_match_length = 0;
+          zip_ins_h = zip_window[zip_strstart] & 255;
+          zip_ins_h = (zip_ins_h << zip_H_SHIFT ^ zip_window[zip_strstart + 1] & 255) & zip_HASH_MASK
+        }
+      }else {
+        flush = zip_ct_tally(0, zip_window[zip_strstart] & 255);
+        zip_lookahead--;
+        zip_strstart++
+      }
+      if(flush) {
+        zip_flush_block(0);
+        zip_block_start = zip_strstart
+      }
+      while(zip_lookahead < zip_MIN_LOOKAHEAD && !zip_eofile) {
+        zip_fill_window()
+      }
+    }
+  };
+  var zip_deflate_better = function() {
+    while(zip_lookahead !== 0 && zip_qhead === null) {
+      zip_INSERT_STRING();
+      zip_prev_length = zip_match_length;
+      zip_prev_match = zip_match_start;
+      zip_match_length = zip_MIN_MATCH - 1;
+      if(zip_hash_head !== zip_NIL && zip_prev_length < zip_max_lazy_match && zip_strstart - zip_hash_head <= zip_MAX_DIST) {
+        zip_match_length = zip_longest_match(zip_hash_head);
+        if(zip_match_length > zip_lookahead) {
+          zip_match_length = zip_lookahead
+        }
+        if(zip_match_length === zip_MIN_MATCH && zip_strstart - zip_match_start > zip_TOO_FAR) {
+          zip_match_length--
+        }
+      }
+      if(zip_prev_length >= zip_MIN_MATCH && zip_match_length <= zip_prev_length) {
+        var flush;
+        flush = zip_ct_tally(zip_strstart - 1 - zip_prev_match, zip_prev_length - zip_MIN_MATCH);
+        zip_lookahead -= zip_prev_length - 1;
+        zip_prev_length -= 2;
+        do {
+          zip_strstart++;
+          zip_INSERT_STRING()
+        }while(--zip_prev_length !== 0);
+        zip_match_available = 0;
+        zip_match_length = zip_MIN_MATCH - 1;
+        zip_strstart++;
+        if(flush) {
+          zip_flush_block(0);
+          zip_block_start = zip_strstart
+        }
+      }else {
+        if(zip_match_available !== 0) {
+          if(zip_ct_tally(0, zip_window[zip_strstart - 1] & 255)) {
+            zip_flush_block(0);
+            zip_block_start = zip_strstart
+          }
+          zip_strstart++;
+          zip_lookahead--
+        }else {
+          zip_match_available = 1;
+          zip_strstart++;
+          zip_lookahead--
+        }
+      }
+      while(zip_lookahead < zip_MIN_LOOKAHEAD && !zip_eofile) {
+        zip_fill_window()
+      }
+    }
+  };
+  var zip_ct_init = function() {
+    var n;
+    var bits;
+    var length;
+    var code;
+    var dist;
+    if(zip_static_dtree[0].dl !== 0) {
+      return
+    }
+    zip_l_desc.dyn_tree = zip_dyn_ltree;
+    zip_l_desc.static_tree = zip_static_ltree;
+    zip_l_desc.extra_bits = zip_extra_lbits;
+    zip_l_desc.extra_base = zip_LITERALS + 1;
+    zip_l_desc.elems = zip_L_CODES;
+    zip_l_desc.max_length = zip_MAX_BITS;
+    zip_l_desc.max_code = 0;
+    zip_d_desc.dyn_tree = zip_dyn_dtree;
+    zip_d_desc.static_tree = zip_static_dtree;
+    zip_d_desc.extra_bits = zip_extra_dbits;
+    zip_d_desc.extra_base = 0;
+    zip_d_desc.elems = zip_D_CODES;
+    zip_d_desc.max_length = zip_MAX_BITS;
+    zip_d_desc.max_code = 0;
+    zip_bl_desc.dyn_tree = zip_bl_tree;
+    zip_bl_desc.static_tree = null;
+    zip_bl_desc.extra_bits = zip_extra_blbits;
+    zip_bl_desc.extra_base = 0;
+    zip_bl_desc.elems = zip_BL_CODES;
+    zip_bl_desc.max_length = zip_MAX_BL_BITS;
+    zip_bl_desc.max_code = 0;
+    length = 0;
+    for(code = 0;code < zip_LENGTH_CODES - 1;code++) {
+      zip_base_length[code] = length;
+      for(n = 0;n < 1 << zip_extra_lbits[code];n++) {
+        zip_length_code[length++] = code
+      }
+    }
+    zip_length_code[length - 1] = code;
+    dist = 0;
+    for(code = 0;code < 16;code++) {
+      zip_base_dist[code] = dist;
+      for(n = 0;n < 1 << zip_extra_dbits[code];n++) {
+        zip_dist_code[dist++] = code
+      }
+    }
+    dist >>= 7;
+    n = code;
+    for(code = n;code < zip_D_CODES;code++) {
+      zip_base_dist[code] = dist << 7;
+      for(n = 0;n < 1 << zip_extra_dbits[code] - 7;n++) {
+        zip_dist_code[256 + dist++] = code
+      }
+    }
+    for(bits = 0;bits <= zip_MAX_BITS;bits++) {
+      zip_bl_count[bits] = 0
+    }
+    n = 0;
+    while(n <= 143) {
+      zip_static_ltree[n++].dl = 8;
+      zip_bl_count[8]++
+    }
+    while(n <= 255) {
+      zip_static_ltree[n++].dl = 9;
+      zip_bl_count[9]++
+    }
+    while(n <= 279) {
+      zip_static_ltree[n++].dl = 7;
+      zip_bl_count[7]++
+    }
+    while(n <= 287) {
+      zip_static_ltree[n++].dl = 8;
+      zip_bl_count[8]++
+    }
+    zip_gen_codes(zip_static_ltree, zip_L_CODES + 1);
+    for(n = 0;n < zip_D_CODES;n++) {
+      zip_static_dtree[n].dl = 5;
+      zip_static_dtree[n].fc = zip_bi_reverse(n, 5)
+    }
+    zip_init_block()
+  };
+  var zip_init_deflate = function() {
+    if(zip_eofile) {
+      return
+    }
+    zip_bi_buf = 0;
+    zip_bi_valid = 0;
+    zip_ct_init();
+    zip_lm_init();
+    zip_qhead = null;
+    zip_outcnt = 0;
+    zip_outoff = 0;
+    if(zip_compr_level <= 3) {
+      zip_prev_length = zip_MIN_MATCH - 1;
+      zip_match_length = 0
+    }else {
+      zip_match_length = zip_MIN_MATCH - 1;
+      zip_match_available = 0
+    }
+    zip_complete = false
+  };
+  var zip_qcopy = function(buff, off, buff_size) {
+    var n, i, j;
+    n = 0;
+    while(zip_qhead !== null && n < buff_size) {
+      i = buff_size - n;
+      if(i > zip_qhead.len) {
+        i = zip_qhead.len
+      }
+      for(j = 0;j < i;j++) {
+        buff[off + n + j] = zip_qhead.ptr[zip_qhead.off + j]
+      }
+      zip_qhead.off += i;
+      zip_qhead.len -= i;
+      n += i;
+      if(zip_qhead.len === 0) {
+        var p;
+        p = zip_qhead;
+        zip_qhead = zip_qhead.next;
+        zip_reuse_queue(p)
+      }
+    }
+    if(n === buff_size) {
+      return n
+    }
+    if(zip_outoff < zip_outcnt) {
+      i = buff_size - n;
+      if(i > zip_outcnt - zip_outoff) {
+        i = zip_outcnt - zip_outoff
+      }
+      for(j = 0;j < i;j++) {
+        buff[off + n + j] = zip_outbuf[zip_outoff + j]
+      }
+      zip_outoff += i;
+      n += i;
+      if(zip_outcnt === zip_outoff) {
+        zip_outcnt = zip_outoff = 0
+      }
+    }
+    return n
+  };
+  var zip_deflate_internal = function(buff, off, buff_size) {
+    var n;
+    if(!zip_initflag) {
+      zip_init_deflate();
+      zip_initflag = true;
+      if(zip_lookahead === 0) {
+        zip_complete = true;
+        return 0
+      }
+    }
+    if((n = zip_qcopy(buff, off, buff_size)) === buff_size) {
+      return buff_size
+    }
+    if(zip_complete) {
+      return n
+    }
+    if(zip_compr_level <= 3) {
+      zip_deflate_fast()
+    }else {
+      zip_deflate_better()
+    }
+    if(zip_lookahead === 0) {
+      if(zip_match_available !== 0) {
+        zip_ct_tally(0, zip_window[zip_strstart - 1] & 255)
+      }
+      zip_flush_block(1);
+      zip_complete = true
+    }
+    return n + zip_qcopy(buff, n + off, buff_size - n)
+  };
+  var zip_deflate = function(str, level) {
+    var i, j;
+    zip_deflate_data = str;
+    zip_deflate_pos = 0;
+    if(typeof level === "undefined") {
+      level = zip_DEFAULT_LEVEL
+    }
+    zip_deflate_start(level);
+    var buff = new Array(1024);
+    var aout = [];
+    while((i = zip_deflate_internal(buff, 0, buff.length)) > 0) {
+      var cbuf = [];
+      cbuf.length = i;
+      for(j = 0;j < i;j++) {
+        cbuf[j] = String.fromCharCode(buff[j])
+      }
+      aout[aout.length] = cbuf.join("")
+    }
+    zip_deflate_data = null;
+    return aout.join("")
+  };
+  this.deflate = zip_deflate
+};
+core.ByteArray = function ByteArray(data) {
+  this.pos = 0;
+  this.data = data;
+  this.readUInt32LE = function() {
+    var data = this.data, pos = this.pos += 4;
+    return data[--pos] << 24 | data[--pos] << 16 | data[--pos] << 8 | data[--pos]
+  };
+  this.readUInt16LE = function() {
+    var data = this.data, pos = this.pos += 2;
+    return data[--pos] << 8 | data[--pos]
+  }
+};
+core.ByteArrayWriter = function ByteArrayWriter(encoding) {
+  var self = this, data = new runtime.ByteArray(0);
+  this.appendByteArrayWriter = function(writer) {
+    data = runtime.concatByteArrays(data, writer.getByteArray())
+  };
+  this.appendByteArray = function(array) {
+    data = runtime.concatByteArrays(data, array)
+  };
+  this.appendArray = function(array) {
+    data = runtime.concatByteArrays(data, runtime.byteArrayFromArray(array))
+  };
+  this.appendUInt16LE = function(value) {
+    self.appendArray([value & 255, value >> 8 & 255])
+  };
+  this.appendUInt32LE = function(value) {
+    self.appendArray([value & 255, value >> 8 & 255, value >> 16 & 255, value >> 24 & 255])
+  };
+  this.appendString = function(string) {
+    data = runtime.concatByteArrays(data, runtime.byteArrayFromString(string, encoding))
+  };
+  this.getLength = function() {
+    return data.length
+  };
+  this.getByteArray = function() {
+    return data
+  }
+};
+core.RawInflate = function RawInflate() {
+  var zip_WSIZE = 32768;
+  var zip_STORED_BLOCK = 0;
+  var zip_STATIC_TREES = 1;
+  var zip_DYN_TREES = 2;
+  var zip_lbits = 9;
+  var zip_dbits = 6;
+  var zip_INBUFSIZ = 32768;
+  var zip_INBUF_EXTRA = 64;
+  var zip_slide;
+  var zip_wp;
+  var zip_fixed_tl = null;
+  var zip_fixed_td;
+  var zip_fixed_bl, fixed_bd;
+  var zip_bit_buf;
+  var zip_bit_len;
+  var zip_method;
+  var zip_eof;
+  var zip_copy_leng;
+  var zip_copy_dist;
+  var zip_tl, zip_td;
+  var zip_bl, zip_bd;
+  var zip_inflate_data;
+  var zip_inflate_pos;
+  var zip_MASK_BITS = new Array(0, 1, 3, 7, 15, 31, 63, 127, 255, 511, 1023, 2047, 4095, 8191, 16383, 32767, 65535);
+  var zip_cplens = new Array(3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31, 35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0);
+  var zip_cplext = new Array(0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5, 0, 99, 99);
+  var zip_cpdist = new Array(1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193, 257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145, 8193, 12289, 16385, 24577);
+  var zip_cpdext = new Array(0, 0, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9, 10, 10, 11, 11, 12, 12, 13, 13);
+  var zip_border = new Array(16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15);
+  var zip_HuftList = function() {
+    this.next = null;
+    this.list = null
+  };
+  var zip_HuftNode = function() {
+    this.e = 0;
+    this.b = 0;
+    this.n = 0;
+    this.t = null
+  };
+  var zip_HuftBuild = function(b, n, s, d, e, mm) {
+    this.BMAX = 16;
+    this.N_MAX = 288;
+    this.status = 0;
+    this.root = null;
+    this.m = 0;
+    var a;
+    var c = new Array(this.BMAX + 1);
+    var el;
+    var f;
+    var g;
+    var h;
+    var i;
+    var j;
+    var k;
+    var lx = new Array(this.BMAX + 1);
+    var p;
+    var pidx;
+    var q;
+    var r = new zip_HuftNode;
+    var u = new Array(this.BMAX);
+    var v = new Array(this.N_MAX);
+    var w;
+    var x = new Array(this.BMAX + 1);
+    var xp;
+    var y;
+    var z;
+    var o;
+    var tail;
+    tail = this.root = null;
+    for(i = 0;i < c.length;i++) {
+      c[i] = 0
+    }
+    for(i = 0;i < lx.length;i++) {
+      lx[i] = 0
+    }
+    for(i = 0;i < u.length;i++) {
+      u[i] = null
+    }
+    for(i = 0;i < v.length;i++) {
+      v[i] = 0
+    }
+    for(i = 0;i < x.length;i++) {
+      x[i] = 0
+    }
+    el = n > 256 ? b[256] : this.BMAX;
+    p = b;
+    pidx = 0;
+    i = n;
+    do {
+      c[p[pidx]]++;
+      pidx++
+    }while(--i > 0);
+    if(c[0] == n) {
+      this.root = null;
+      this.m = 0;
+      this.status = 0;
+      return
+    }
+    for(j = 1;j <= this.BMAX;j++) {
+      if(c[j] != 0) {
+        break
+      }
+    }
+    k = j;
+    if(mm < j) {
+      mm = j
+    }
+    for(i = this.BMAX;i != 0;i--) {
+      if(c[i] != 0) {
+        break
+      }
+    }
+    g = i;
+    if(mm > i) {
+      mm = i
+    }
+    for(y = 1 << j;j < i;j++, y <<= 1) {
+      if((y -= c[j]) < 0) {
+        this.status = 2;
+        this.m = mm;
+        return
+      }
+    }
+    if((y -= c[i]) < 0) {
+      this.status = 2;
+      this.m = mm;
+      return
+    }
+    c[i] += y;
+    x[1] = j = 0;
+    p = c;
+    pidx = 1;
+    xp = 2;
+    while(--i > 0) {
+      x[xp++] = j += p[pidx++]
+    }
+    p = b;
+    pidx = 0;
+    i = 0;
+    do {
+      if((j = p[pidx++]) != 0) {
+        v[x[j]++] = i
+      }
+    }while(++i < n);
+    n = x[g];
+    x[0] = i = 0;
+    p = v;
+    pidx = 0;
+    h = -1;
+    w = lx[0] = 0;
+    q = null;
+    z = 0;
+    for(;k <= g;k++) {
+      a = c[k];
+      while(a-- > 0) {
+        while(k > w + lx[1 + h]) {
+          w += lx[1 + h];
+          h++;
+          z = (z = g - w) > mm ? mm : z;
+          if((f = 1 << (j = k - w)) > a + 1) {
+            f -= a + 1;
+            xp = k;
+            while(++j < z) {
+              if((f <<= 1) <= c[++xp]) {
+                break
+              }
+              f -= c[xp]
+            }
+          }
+          if(w + j > el && w < el) {
+            j = el - w
+          }
+          z = 1 << j;
+          lx[1 + h] = j;
+          q = new Array(z);
+          for(o = 0;o < z;o++) {
+            q[o] = new zip_HuftNode
+          }
+          if(tail == null) {
+            tail = this.root = new zip_HuftList
+          }else {
+            tail = tail.next = new zip_HuftList
+          }
+          tail.next = null;
+          tail.list = q;
+          u[h] = q;
+          if(h > 0) {
+            x[h] = i;
+            r.b = lx[h];
+            r.e = 16 + j;
+            r.t = q;
+            j = (i & (1 << w) - 1) >> w - lx[h];
+            u[h - 1][j].e = r.e;
+            u[h - 1][j].b = r.b;
+            u[h - 1][j].n = r.n;
+            u[h - 1][j].t = r.t
+          }
+        }
+        r.b = k - w;
+        if(pidx >= n) {
+          r.e = 99
+        }else {
+          if(p[pidx] < s) {
+            r.e = p[pidx] < 256 ? 16 : 15;
+            r.n = p[pidx++]
+          }else {
+            r.e = e[p[pidx] - s];
+            r.n = d[p[pidx++] - s]
+          }
+        }
+        f = 1 << k - w;
+        for(j = i >> w;j < z;j += f) {
+          q[j].e = r.e;
+          q[j].b = r.b;
+          q[j].n = r.n;
+          q[j].t = r.t
+        }
+        for(j = 1 << k - 1;(i & j) != 0;j >>= 1) {
+          i ^= j
+        }
+        i ^= j;
+        while((i & (1 << w) - 1) != x[h]) {
+          w -= lx[h];
+          h--
+        }
+      }
+    }
+    this.m = lx[1];
+    this.status = y != 0 && g != 1 ? 1 : 0
+  };
+  var zip_GET_BYTE = function() {
+    if(zip_inflate_data.length == zip_inflate_pos) {
+      return-1
+    }
+    return zip_inflate_data[zip_inflate_pos++]
+  };
+  var zip_NEEDBITS = function(n) {
+    while(zip_bit_len < n) {
+      zip_bit_buf |= zip_GET_BYTE() << zip_bit_len;
+      zip_bit_len += 8
+    }
+  };
+  var zip_GETBITS = function(n) {
+    return zip_bit_buf & zip_MASK_BITS[n]
+  };
+  var zip_DUMPBITS = function(n) {
+    zip_bit_buf >>= n;
+    zip_bit_len -= n
+  };
+  var zip_inflate_codes = function(buff, off, size) {
+    var e;
+    var t;
+    var n;
+    if(size == 0) {
+      return 0
+    }
+    n = 0;
+    for(;;) {
+      zip_NEEDBITS(zip_bl);
+      t = zip_tl.list[zip_GETBITS(zip_bl)];
+      e = t.e;
+      while(e > 16) {
+        if(e == 99) {
+          return-1
+        }
+        zip_DUMPBITS(t.b);
+        e -= 16;
+        zip_NEEDBITS(e);
+        t = t.t[zip_GETBITS(e)];
+        e = t.e
+      }
+      zip_DUMPBITS(t.b);
+      if(e == 16) {
+        zip_wp &= zip_WSIZE - 1;
+        buff[off + n++] = zip_slide[zip_wp++] = t.n;
+        if(n == size) {
+          return size
+        }
+        continue
+      }
+      if(e == 15) {
+        break
+      }
+      zip_NEEDBITS(e);
+      zip_copy_leng = t.n + zip_GETBITS(e);
+      zip_DUMPBITS(e);
+      zip_NEEDBITS(zip_bd);
+      t = zip_td.list[zip_GETBITS(zip_bd)];
+      e = t.e;
+      while(e > 16) {
+        if(e == 99) {
+          return-1
+        }
+        zip_DUMPBITS(t.b);
+        e -= 16;
+        zip_NEEDBITS(e);
+        t = t.t[zip_GETBITS(e)];
+        e = t.e
+      }
+      zip_DUMPBITS(t.b);
+      zip_NEEDBITS(e);
+      zip_copy_dist = zip_wp - t.n - zip_GETBITS(e);
+      zip_DUMPBITS(e);
+      while(zip_copy_leng > 0 && n < size) {
+        zip_copy_leng--;
+        zip_copy_dist &= zip_WSIZE - 1;
+        zip_wp &= zip_WSIZE - 1;
+        buff[off + n++] = zip_slide[zip_wp++] = zip_slide[zip_copy_dist++]
+      }
+      if(n == size) {
+        return size
+      }
+    }
+    zip_method = -1;
+    return n
+  };
+  var zip_inflate_stored = function(buff, off, size) {
+    var n;
+    n = zip_bit_len & 7;
+    zip_DUMPBITS(n);
+    zip_NEEDBITS(16);
+    n = zip_GETBITS(16);
+    zip_DUMPBITS(16);
+    zip_NEEDBITS(16);
+    if(n != (~zip_bit_buf & 65535)) {
+      return-1
+    }
+    zip_DUMPBITS(16);
+    zip_copy_leng = n;
+    n = 0;
+    while(zip_copy_leng > 0 && n < size) {
+      zip_copy_leng--;
+      zip_wp &= zip_WSIZE - 1;
+      zip_NEEDBITS(8);
+      buff[off + n++] = zip_slide[zip_wp++] = zip_GETBITS(8);
+      zip_DUMPBITS(8)
+    }
+    if(zip_copy_leng == 0) {
+      zip_method = -1
+    }
+    return n
+  };
+  var zip_fixed_bd;
+  var zip_inflate_fixed = function(buff, off, size) {
+    if(zip_fixed_tl == null) {
+      var i;
+      var l = new Array(288);
+      var h;
+      for(i = 0;i < 144;i++) {
+        l[i] = 8
+      }
+      for(;i < 256;i++) {
+        l[i] = 9
+      }
+      for(;i < 280;i++) {
+        l[i] = 7
+      }
+      for(;i < 288;i++) {
+        l[i] = 8
+      }
+      zip_fixed_bl = 7;
+      h = new zip_HuftBuild(l, 288, 257, zip_cplens, zip_cplext, zip_fixed_bl);
+      if(h.status != 0) {
+        alert("HufBuild error: " + h.status);
+        return-1
+      }
+      zip_fixed_tl = h.root;
+      zip_fixed_bl = h.m;
+      for(i = 0;i < 30;i++) {
+        l[i] = 5
+      }
+      zip_fixed_bd = 5;
+      h = new zip_HuftBuild(l, 30, 0, zip_cpdist, zip_cpdext, zip_fixed_bd);
+      if(h.status > 1) {
+        zip_fixed_tl = null;
+        alert("HufBuild error: " + h.status);
+        return-1
+      }
+      zip_fixed_td = h.root;
+      zip_fixed_bd = h.m
+    }
+    zip_tl = zip_fixed_tl;
+    zip_td = zip_fixed_td;
+    zip_bl = zip_fixed_bl;
+    zip_bd = zip_fixed_bd;
+    return zip_inflate_codes(buff, off, size)
+  };
+  var zip_inflate_dynamic = function(buff, off, size) {
+    var i;
+    var j;
+    var l;
+    var n;
+    var t;
+    var nb;
+    var nl;
+    var nd;
+    var ll = new Array(286 + 30);
+    var h;
+    for(i = 0;i < ll.length;i++) {
+      ll[i] = 0
+    }
+    zip_NEEDBITS(5);
+    nl = 257 + zip_GETBITS(5);
+    zip_DUMPBITS(5);
+    zip_NEEDBITS(5);
+    nd = 1 + zip_GETBITS(5);
+    zip_DUMPBITS(5);
+    zip_NEEDBITS(4);
+    nb = 4 + zip_GETBITS(4);
+    zip_DUMPBITS(4);
+    if(nl > 286 || nd > 30) {
+      return-1
+    }
+    for(j = 0;j < nb;j++) {
+      zip_NEEDBITS(3);
+      ll[zip_border[j]] = zip_GETBITS(3);
+      zip_DUMPBITS(3)
+    }
+    for(;j < 19;j++) {
+      ll[zip_border[j]] = 0
+    }
+    zip_bl = 7;
+    h = new zip_HuftBuild(ll, 19, 19, null, null, zip_bl);
+    if(h.status != 0) {
+      return-1
+    }
+    zip_tl = h.root;
+    zip_bl = h.m;
+    n = nl + nd;
+    i = l = 0;
+    while(i < n) {
+      zip_NEEDBITS(zip_bl);
+      t = zip_tl.list[zip_GETBITS(zip_bl)];
+      j = t.b;
+      zip_DUMPBITS(j);
+      j = t.n;
+      if(j < 16) {
+        ll[i++] = l = j
+      }else {
+        if(j == 16) {
+          zip_NEEDBITS(2);
+          j = 3 + zip_GETBITS(2);
+          zip_DUMPBITS(2);
+          if(i + j > n) {
+            return-1
+          }
+          while(j-- > 0) {
+            ll[i++] = l
+          }
+        }else {
+          if(j == 17) {
+            zip_NEEDBITS(3);
+            j = 3 + zip_GETBITS(3);
+            zip_DUMPBITS(3);
+            if(i + j > n) {
+              return-1
+            }
+            while(j-- > 0) {
+              ll[i++] = 0
+            }
+            l = 0
+          }else {
+            zip_NEEDBITS(7);
+            j = 11 + zip_GETBITS(7);
+            zip_DUMPBITS(7);
+            if(i + j > n) {
+              return-1
+            }
+            while(j-- > 0) {
+              ll[i++] = 0
+            }
+            l = 0
+          }
+        }
+      }
+    }
+    zip_bl = zip_lbits;
+    h = new zip_HuftBuild(ll, nl, 257, zip_cplens, zip_cplext, zip_bl);
+    if(zip_bl == 0) {
+      h.status = 1
+    }
+    if(h.status != 0) {
+      return-1
+    }
+    zip_tl = h.root;
+    zip_bl = h.m;
+    for(i = 0;i < nd;i++) {
+      ll[i] = ll[i + nl]
+    }
+    zip_bd = zip_dbits;
+    h = new zip_HuftBuild(ll, nd, 0, zip_cpdist, zip_cpdext, zip_bd);
+    zip_td = h.root;
+    zip_bd = h.m;
+    if(zip_bd == 0 && nl > 257) {
+      return-1
+    }
+    if(h.status != 0) {
+      return-1
+    }
+    return zip_inflate_codes(buff, off, size)
+  };
+  var zip_inflate_start = function() {
+    var i;
+    if(zip_slide == null) {
+      zip_slide = new Array(2 * zip_WSIZE)
+    }
+    zip_wp = 0;
+    zip_bit_buf = 0;
+    zip_bit_len = 0;
+    zip_method = -1;
+    zip_eof = false;
+    zip_copy_leng = zip_copy_dist = 0;
+    zip_tl = null
+  };
+  var zip_inflate_internal = function(buff, off, size) {
+    var n, i;
+    n = 0;
+    while(n < size) {
+      if(zip_eof && zip_method == -1) {
+        return n
+      }
+      if(zip_copy_leng > 0) {
+        if(zip_method != zip_STORED_BLOCK) {
+          while(zip_copy_leng > 0 && n < size) {
+            zip_copy_leng--;
+            zip_copy_dist &= zip_WSIZE - 1;
+            zip_wp &= zip_WSIZE - 1;
+            buff[off + n++] = zip_slide[zip_wp++] = zip_slide[zip_copy_dist++]
+          }
+        }else {
+          while(zip_copy_leng > 0 && n < size) {
+            zip_copy_leng--;
+            zip_wp &= zip_WSIZE - 1;
+            zip_NEEDBITS(8);
+            buff[off + n++] = zip_slide[zip_wp++] = zip_GETBITS(8);
+            zip_DUMPBITS(8)
+          }
+          if(zip_copy_leng == 0) {
+            zip_method = -1
+          }
+        }
+        if(n == size) {
+          return n
+        }
+      }
+      if(zip_method == -1) {
+        if(zip_eof) {
+          break
+        }
+        zip_NEEDBITS(1);
+        if(zip_GETBITS(1) != 0) {
+          zip_eof = true
+        }
+        zip_DUMPBITS(1);
+        zip_NEEDBITS(2);
+        zip_method = zip_GETBITS(2);
+        zip_DUMPBITS(2);
+        zip_tl = null;
+        zip_copy_leng = 0
+      }
+      switch(zip_method) {
+        case 0:
+          i = zip_inflate_stored(buff, off + n, size - n);
+          break;
+        case 1:
+          if(zip_tl != null) {
+            i = zip_inflate_codes(buff, off + n, size - n)
+          }else {
+            i = zip_inflate_fixed(buff, off + n, size - n)
+          }
+          break;
+        case 2:
+          if(zip_tl != null) {
+            i = zip_inflate_codes(buff, off + n, size - n)
+          }else {
+            i = zip_inflate_dynamic(buff, off + n, size - n)
+          }
+          break;
+        default:
+          i = -1;
+          break
+      }
+      if(i == -1) {
+        if(zip_eof) {
+          return 0
+        }
+        return-1
+      }
+      n += i
+    }
+    return n
+  };
+  var zip_inflate = function(data, size) {
+    var i, j;
+    zip_inflate_start();
+    zip_inflate_data = data;
+    zip_inflate_pos = 0;
+    var buff = new runtime.ByteArray(size);
+    zip_inflate_internal(buff, 0, size);
+    zip_inflate_data = null;
+    return buff
+  };
+  this.inflate = zip_inflate
+};
+core.Cursor = function Cursor(selection, document) {
+  var cursorns, cursorNode;
+  cursorns = "urn:webodf:names:cursor";
+  cursorNode = document.createElementNS(cursorns, "cursor");
+  function putCursorIntoTextNode(container, offset) {
+    var len, ref, textnode, parent;
+    parent = container.parentNode;
+    if(offset === 0) {
+      parent.insertBefore(cursorNode, container)
+    }else {
+      if(offset === container.length) {
+        parent.appendChild(cursorNode)
+      }else {
+        len = container.length;
+        ref = container.nextSibling;
+        textnode = document.createTextNode(container.substringData(offset, len));
+        container.deleteData(offset, len);
+        if(ref) {
+          parent.insertBefore(textnode, ref)
+        }else {
+          parent.appendChild(textnode)
+        }
+        parent.insertBefore(cursorNode, textnode)
+      }
+    }
+  }
+  function putCursorIntoContainer(container, offset) {
+    var node;
+    node = container.firstChild;
+    while(node && offset) {
+      node = node.nextSibling;
+      offset -= 1
+    }
+    container.insertBefore(cursorNode, node)
+  }
+  function getPotentialParentOrNode(parent, node) {
+    var n = node;
+    while(n && n !== parent) {
+      n = n.parentNode
+    }
+    return n || node
+  }
+  function removeCursorFromSelectionRange(range, cursorpos) {
+    var cursorParent, start, end;
+    cursorParent = cursorNode.parentNode;
+    start = getPotentialParentOrNode(cursorNode, range.startContainer);
+    end = getPotentialParentOrNode(cursorNode, range.endContainer);
+    if(start === cursorNode) {
+      range.setStart(cursorParent, cursorpos)
+    }else {
+      if(start === cursorParent && range.startOffset > cursorpos) {
+        range.setStart(cursorParent, range.startOffset - 1)
+      }
+    }
+    if(range.endContainer === cursorNode) {
+      range.setEnd(cursorParent, cursorpos)
+    }else {
+      if(range.endContainer === cursorParent && range.endOffset > cursorpos) {
+        range.setEnd(cursorParent, range.endOffset - 1)
+      }
+    }
+  }
+  function adaptRangeToMergedText(range, prev, textnodetomerge, cursorpos) {
+    var diff = prev.length - textnodetomerge.length;
+    if(range.startContainer === textnodetomerge) {
+      range.setStart(prev, diff + range.startOffset)
+    }else {
+      if(range.startContainer === prev.parentNode && range.startOffset === cursorpos) {
+        range.setStart(prev, diff)
+      }
+    }
+    if(range.endContainer === textnodetomerge) {
+      range.setEnd(prev, diff + range.endOffset)
+    }else {
+      if(range.endContainer === prev.parentNode && range.endOffset === cursorpos) {
+        range.setEnd(prev, diff)
+      }
+    }
+  }
+  function removeCursor() {
+    var i, cursorpos, node, textnodetoremove, range;
+    if(!cursorNode.parentNode) {
+      return
+    }
+    cursorpos = 0;
+    node = cursorNode.parentNode.firstChild;
+    while(node && node !== cursorNode) {
+      cursorpos += 1;
+      node = node.nextSibling
+    }
+    if(cursorNode.previousSibling && cursorNode.previousSibling.nodeType === 3 && cursorNode.nextSibling && cursorNode.nextSibling.nodeType === 3) {
+      textnodetoremove = cursorNode.nextSibling;
+      cursorNode.previousSibling.appendData(textnodetoremove.nodeValue)
+    }
+    for(i = 0;i < selection.rangeCount;i += 1) {
+      removeCursorFromSelectionRange(selection.getRangeAt(i), cursorpos)
+    }
+    if(textnodetoremove) {
+      for(i = 0;i < selection.rangeCount;i += 1) {
+        adaptRangeToMergedText(selection.getRangeAt(i), cursorNode.previousSibling, textnodetoremove, cursorpos)
+      }
+      textnodetoremove.parentNode.removeChild(textnodetoremove)
+    }
+    cursorNode.parentNode.removeChild(cursorNode)
+  }
+  function putCursor(container, offset) {
+    if(container.nodeType === 3) {
+      putCursorIntoTextNode(container, offset)
+    }else {
+      if(container.nodeType !== 9) {
+        putCursorIntoContainer(container, offset)
+      }
+    }
+  }
+  this.getNode = function() {
+    return cursorNode
+  };
+  this.updateToSelection = function() {
+    var range;
+    removeCursor();
+    if(selection.focusNode) {
+      putCursor(selection.focusNode, selection.focusOffset)
+    }
+  };
+  this.remove = function() {
+    removeCursor()
+  }
+};
+core.UnitTest = function UnitTest() {
+};
+core.UnitTest.prototype.setUp = function() {
+};
+core.UnitTest.prototype.tearDown = function() {
+};
+core.UnitTest.prototype.description = function() {
+};
+core.UnitTest.prototype.tests = function() {
+};
+core.UnitTest.prototype.asyncTests = function() {
+};
+core.UnitTestRunner = function UnitTestRunner() {
+  var failedTests = 0;
+  function debug(msg) {
+    runtime.log(msg)
+  }
+  function testFailed(msg) {
+    failedTests += 1;
+    runtime.log("fail", msg)
+  }
+  function testPassed(msg) {
+    runtime.log("pass", msg)
+  }
+  function areArraysEqual(a, b) {
+    var i;
+    try {
+      if(a.length !== b.length) {
+        return false
+      }
+      for(i = 0;i < a.length;i += 1) {
+        if(a[i] !== b[i]) {
+          return false
+        }
+      }
+    }catch(ex) {
+      return false
+    }
+    return true
+  }
+  function isResultCorrect(actual, expected) {
+    if(expected === 0) {
+      return actual === expected && 1 / actual === 1 / expected
+    }
+    if(actual === expected) {
+      return true
+    }
+    if(typeof expected === "number" && isNaN(expected)) {
+      return typeof actual === "number" && isNaN(actual)
+    }
+    if(Object.prototype.toString.call(expected) === Object.prototype.toString.call([])) {
+      return areArraysEqual(actual, expected)
+    }
+    return false
+  }
+  function stringify(v) {
+    if(v === 0 && 1 / v < 0) {
+      return"-0"
+    }
+    return String(v)
+  }
+  function shouldBe(t, a, b) {
+    if(typeof a !== "string" || typeof b !== "string") {
+      debug("WARN: shouldBe() expects string arguments")
+    }
+    var exception, av, bv;
+    try {
+      av = eval(a)
+    }catch(e) {
+      exception = e
+    }
+    bv = eval(b);
+    if(exception) {
+      testFailed(a + " should be " + bv + ". Threw exception " + exception)
+    }else {
+      if(isResultCorrect(av, bv)) {
+        testPassed(a + " is " + b)
+      }else {
+        if(typeof av === typeof bv) {
+          testFailed(a + " should be " + bv + ". Was " + stringify(av) + ".")
+        }else {
+          testFailed(a + " should be " + bv + " (of type " + typeof bv + "). Was " + av + " (of type " + typeof av + ").")
+        }
+      }
+    }
+  }
+  function shouldBeNonNull(t, a) {
+    var exception, av;
+    try {
+      av = eval(a)
+    }catch(e) {
+      exception = e
+    }
+    if(exception) {
+      testFailed(a + " should be non-null. Threw exception " + exception)
+    }else {
+      if(av !== null) {
+        testPassed(a + " is non-null.")
+      }else {
+        testFailed(a + " should be non-null. Was " + av)
+      }
+    }
+  }
+  function shouldBeNull(t, a) {
+    shouldBe(t, a, "null")
+  }
+  this.shouldBeNull = shouldBeNull;
+  this.shouldBeNonNull = shouldBeNonNull;
+  this.shouldBe = shouldBe;
+  this.countFailedTests = function() {
+    return failedTests
+  }
+};
+core.UnitTester = function UnitTester() {
+  var failedTests = 0, results = {};
+  this.runTests = function(TestClass, callback) {
+    var testName = Runtime.getFunctionName(TestClass), tname, runner = new core.UnitTestRunner, test = new TestClass(runner), testResults = {}, i, t, tests, lastFailCount;
+    if(testName.hasOwnProperty(results)) {
+      runtime.log("Test " + testName + " has already run.");
+      return
+    }
+    runtime.log("Running " + testName + ": " + test.description());
+    tests = test.tests();
+    for(i = 0;i < tests.length;i += 1) {
+      t = tests[i];
+      tname = Runtime.getFunctionName(t);
+      runtime.log("Running " + tname);
+      lastFailCount = runner.countFailedTests();
+      test.setUp();
+      t();
+      test.tearDown();
+      testResults[tname] = lastFailCount === runner.countFailedTests()
+    }
+    function runAsyncTests(todo) {
+      if(todo.length === 0) {
+        results[testName] = testResults;
+        failedTests += runner.countFailedTests();
+        callback();
+        return
+      }
+      t = todo[0];
+      var tname = Runtime.getFunctionName(t);
+      runtime.log("Running " + tname);
+      lastFailCount = runner.countFailedTests();
+      test.setUp();
+      t(function() {
+        test.tearDown();
+        testResults[tname] = lastFailCount === runner.countFailedTests();
+        runAsyncTests(todo.slice(1))
+      })
+    }
+    runAsyncTests(test.asyncTests())
+  };
+  this.countFailedTests = function() {
+    return failedTests
+  };
+  this.results = function() {
+    return results
+  }
+};
+core.PointWalker = function PointWalker(node) {
+  var currentNode = node, before = null, after = node && node.firstChild, root = node, pos = 0;
+  function getPosition(node) {
+    var p = -1, n = node;
+    while(n) {
+      n = n.previousSibling;
+      p += 1
+    }
+    return p
+  }
+  this.setPoint = function(node, position) {
+    currentNode = node;
+    pos = position;
+    if(currentNode.nodeType === 3) {
+      after = null;
+      before = null
+    }else {
+      after = currentNode.firstChild;
+      while(position) {
+        position -= 1;
+        after = after.nextSibling
+      }
+      if(after) {
+        before = after.previousSibling
+      }else {
+        before = currentNode.lastChild
+      }
+    }
+  };
+  this.stepForward = function() {
+    var len;
+    if(currentNode.nodeType === 3) {
+      if(typeof currentNode.nodeValue.length === "number") {
+        len = currentNode.nodeValue.length
+      }else {
+        len = currentNode.nodeValue.length()
+      }
+      if(pos < len) {
+        pos += 1;
+        return true
+      }
+    }
+    if(after) {
+      if(after.nodeType === 1) {
+        currentNode = after;
+        before = null;
+        after = currentNode.firstChild;
+        pos = 0
+      }else {
+        if(after.nodeType === 3) {
+          currentNode = after;
+          before = null;
+          after = null;
+          pos = 0
+        }else {
+          before = after;
+          after = after.nextSibling;
+          pos += 1
+        }
+      }
+      return true
+    }
+    if(currentNode !== root) {
+      before = currentNode;
+      after = before.nextSibling;
+      currentNode = currentNode.parentNode;
+      pos = getPosition(before) + 1;
+      return true
+    }
+    return false
+  };
+  this.stepBackward = function() {
+    if(currentNode.nodeType === 3) {
+      if(pos > 0) {
+        pos -= 1;
+        return true
+      }
+    }
+    if(before) {
+      if(before.nodeType === 1) {
+        currentNode = before;
+        before = currentNode.lastChild;
+        after = null;
+        pos = getPosition(before) + 1
+      }else {
+        if(before.nodeType === 3) {
+          currentNode = before;
+          before = null;
+          after = null;
+          if(typeof currentNode.nodeValue.length === "number") {
+            pos = currentNode.nodeValue.length
+          }else {
+            pos = currentNode.nodeValue.length()
+          }
+        }else {
+          after = before;
+          before = before.previousSibling;
+          pos -= 1
+        }
+      }
+      return true
+    }
+    if(currentNode !== root) {
+      after = currentNode;
+      before = after.previousSibling;
+      currentNode = currentNode.parentNode;
+      pos = getPosition(after);
+      return true
+    }
+    return false
+  };
+  this.node = function() {
+    return currentNode
+  };
+  this.position = function() {
+    return pos
+  };
+  this.precedingSibling = function() {
+    return before
+  };
+  this.followingSibling = function() {
+    return after
+  }
+};
+core.Async = function Async() {
+  this.forEach = function(items, f, callback) {
+    var i, l = items.length, itemsDone = 0;
+    function end(err) {
+      if(itemsDone !== l) {
+        if(err) {
+          itemsDone = l;
+          callback(err)
+        }else {
+          itemsDone += 1;
+          if(itemsDone === l) {
+            callback(null)
+          }
+        }
+      }
+    }
+    for(i = 0;i < l;i += 1) {
+      f(items[i], end)
+    }
+  }
+};
+runtime.loadClass("core.RawInflate");
+runtime.loadClass("core.ByteArray");
+runtime.loadClass("core.ByteArrayWriter");
+runtime.loadClass("core.Base64");
+core.Zip = function Zip(url, entriesReadCallback) {
+  var entries, filesize, nEntries, inflate = (new core.RawInflate).inflate, zip = this, base64 = new core.Base64;
+  function crc32(data) {
+    var table = [0, 1996959894, 3993919788, 2567524794, 124634137, 1886057615, 3915621685, 2657392035, 249268274, 2044508324, 3772115230, 2547177864, 162941995, 2125561021, 3887607047, 2428444049, 498536548, 1789927666, 4089016648, 2227061214, 450548861, 1843258603, 4107580753, 2211677639, 325883990, 1684777152, 4251122042, 2321926636, 335633487, 1661365465, 4195302755, 2366115317, 997073096, 1281953886, 3579855332, 2724688242, 1006888145, 1258607687, 3524101629, 2768942443, 901097722, 1119000684, 
+    3686517206, 2898065728, 853044451, 1172266101, 3705015759, 2882616665, 651767980, 1373503546, 3369554304, 3218104598, 565507253, 1454621731, 3485111705, 3099436303, 671266974, 1594198024, 3322730930, 2970347812, 795835527, 1483230225, 3244367275, 3060149565, 1994146192, 31158534, 2563907772, 4023717930, 1907459465, 112637215, 2680153253, 3904427059, 2013776290, 251722036, 2517215374, 3775830040, 2137656763, 141376813, 2439277719, 3865271297, 1802195444, 476864866, 2238001368, 4066508878, 1812370925, 
+    453092731, 2181625025, 4111451223, 1706088902, 314042704, 2344532202, 4240017532, 1658658271, 366619977, 2362670323, 4224994405, 1303535960, 984961486, 2747007092, 3569037538, 1256170817, 1037604311, 2765210733, 3554079995, 1131014506, 879679996, 2909243462, 3663771856, 1141124467, 855842277, 2852801631, 3708648649, 1342533948, 654459306, 3188396048, 3373015174, 1466479909, 544179635, 3110523913, 3462522015, 1591671054, 702138776, 2966460450, 3352799412, 1504918807, 783551873, 3082640443, 3233442989, 
+    3988292384, 2596254646, 62317068, 1957810842, 3939845945, 2647816111, 81470997, 1943803523, 3814918930, 2489596804, 225274430, 2053790376, 3826175755, 2466906013, 167816743, 2097651377, 4027552580, 2265490386, 503444072, 1762050814, 4150417245, 2154129355, 426522225, 1852507879, 4275313526, 2312317920, 282753626, 1742555852, 4189708143, 2394877945, 397917763, 1622183637, 3604390888, 2714866558, 953729732, 1340076626, 3518719985, 2797360999, 1068828381, 1219638859, 3624741850, 2936675148, 906185462, 
+    1090812512, 3747672003, 2825379669, 829329135, 1181335161, 3412177804, 3160834842, 628085408, 1382605366, 3423369109, 3138078467, 570562233, 1426400815, 3317316542, 2998733608, 733239954, 1555261956, 3268935591, 3050360625, 752459403, 1541320221, 2607071920, 3965973030, 1969922972, 40735498, 2617837225, 3943577151, 1913087877, 83908371, 2512341634, 3803740692, 2075208622, 213261112, 2463272603, 3855990285, 2094854071, 198958881, 2262029012, 4057260610, 1759359992, 534414190, 2176718541, 4139329115, 
+    1873836001, 414664567, 2282248934, 4279200368, 1711684554, 285281116, 2405801727, 4167216745, 1634467795, 376229701, 2685067896, 3608007406, 1308918612, 956543938, 2808555105, 3495958263, 1231636301, 1047427035, 2932959818, 3654703836, 1088359270, 936918E3, 2847714899, 3736837829, 1202900863, 817233897, 3183342108, 3401237130, 1404277552, 615818150, 3134207493, 3453421203, 1423857449, 601450431, 3009837614, 3294710456, 1567103746, 711928724, 3020668471, 3272380065, 1510334235, 755167117], crc = 
+    0, i, iTop = data.length, x = 0, y = 0;
+    crc = crc ^ -1;
+    for(i = 0;i < iTop;i += 1) {
+      y = (crc ^ data[i]) & 255;
+      x = table[y];
+      crc = crc >>> 8 ^ x
+    }
+    return crc ^ -1
+  }
+  function dosTime2Date(dostime) {
+    var year = (dostime >> 25 & 127) + 1980, month = (dostime >> 21 & 15) - 1, mday = dostime >> 16 & 31, hour = dostime >> 11 & 15, min = dostime >> 5 & 63, sec = (dostime & 31) << 1, d = new Date(year, month, mday, hour, min, sec);
+    return d
+  }
+  function date2DosTime(date) {
+    var y = date.getFullYear();
+    return y < 1980 ? 0 : y - 1980 << 25 | date.getMonth() + 1 << 21 | date.getDate() << 16 | date.getHours() << 11 | date.getMinutes() << 5 | date.getSeconds() >> 1
+  }
+  function ZipEntry(url, stream) {
+    var sig, namelen, extralen, commentlen, compressionMethod, compressedSize, uncompressedSize, offset, crc, entry = this;
+    function handleEntryData(data, callback) {
+      var stream = new core.ByteArray(data), sig = stream.readUInt32LE(), filenamelen, extralen;
+      if(sig !== 67324752) {
+        callback("File entry signature is wrong." + sig.toString() + " " + data.length.toString(), null);
+        return
+      }
+      stream.pos += 22;
+      filenamelen = stream.readUInt16LE();
+      extralen = stream.readUInt16LE();
+      stream.pos += filenamelen + extralen;
+      if(compressionMethod) {
+        data = data.slice(stream.pos, stream.pos + compressedSize);
+        if(compressedSize !== data.length) {
+          callback("The amount of compressed bytes read was " + data.length.toString() + " instead of " + compressedSize.toString() + " for " + entry.filename + " in " + url + ".", null);
+          return
+        }
+        data = inflate(data, uncompressedSize)
+      }else {
+        data = data.slice(stream.pos, stream.pos + uncompressedSize)
+      }
+      if(uncompressedSize !== data.length) {
+        callback("The amount of bytes read was " + data.length.toString() + " instead of " + uncompressedSize.toString() + " for " + entry.filename + " in " + url + ".", null);
+        return
+      }
+      entry.data = data;
+      callback(null, data)
+    }
+    function load(callback) {
+      if(entry.data !== undefined) {
+        callback(null, entry.data);
+        return
+      }
+      var size = compressedSize + 34 + namelen + extralen + 256;
+      if(size + offset > filesize) {
+        size = filesize - offset
+      }
+      runtime.read(url, offset, size, function(err, data) {
+        if(err) {
+          callback(err, data)
+        }else {
+          handleEntryData(data, callback)
+        }
+      })
+    }
+    this.load = load;
+    function set(filename, data, compressed, date) {
+      entry.filename = filename;
+      entry.data = data;
+      entry.compressed = compressed;
+      entry.date = date
+    }
+    this.set = set;
+    this.error = null;
+    if(!stream) {
+      return
+    }
+    sig = stream.readUInt32LE();
+    if(sig !== 33639248) {
+      this.error = "Central directory entry has wrong signature at position " + (stream.pos - 4).toString() + ' for file "' + url + '": ' + stream.data.length.toString();
+      return
+    }
+    stream.pos += 6;
+    compressionMethod = stream.readUInt16LE();
+    this.date = dosTime2Date(stream.readUInt32LE());
+    crc = stream.readUInt32LE();
+    compressedSize = stream.readUInt32LE();
+    uncompressedSize = stream.readUInt32LE();
+    namelen = stream.readUInt16LE();
+    extralen = stream.readUInt16LE();
+    commentlen = stream.readUInt16LE();
+    stream.pos += 8;
+    offset = stream.readUInt32LE();
+    this.filename = runtime.byteArrayToString(stream.data.slice(stream.pos, stream.pos + namelen), "utf8");
+    stream.pos += namelen + extralen + commentlen
+  }
+  function handleCentralDirectory(data, callback) {
+    var stream = new core.ByteArray(data), i, e;
+    entries = [];
+    for(i = 0;i < nEntries;i += 1) {
+      e = new ZipEntry(url, stream);
+      if(e.error) {
+        callback(e.error, zip);
+        return
+      }
+      entries[entries.length] = e
+    }
+    callback(null, zip)
+  }
+  function handleCentralDirectoryEnd(data, callback) {
+    if(data.length !== 22) {
+      callback("Central directory length should be 22.", zip);
+      return
+    }
+    var stream = new core.ByteArray(data), sig, disk, cddisk, diskNEntries, cdsSize, cdsOffset;
+    sig = stream.readUInt32LE();
+    if(sig !== 101010256) {
+      callback("Central directory signature is wrong: " + sig.toString(), zip);
+      return
+    }
+    disk = stream.readUInt16LE();
+    if(disk !== 0) {
+      callback("Zip files with non-zero disk numbers are not supported.", zip);
+      return
+    }
+    cddisk = stream.readUInt16LE();
+    if(cddisk !== 0) {
+      callback("Zip files with non-zero disk numbers are not supported.", zip);
+      return
+    }
+    diskNEntries = stream.readUInt16LE();
+    nEntries = stream.readUInt16LE();
+    if(diskNEntries !== nEntries) {
+      callback("Number of entries is inconsistent.", zip);
+      return
+    }
+    cdsSize = stream.readUInt32LE();
+    cdsOffset = stream.readUInt16LE();
+    cdsOffset = filesize - 22 - cdsSize;
+    runtime.read(url, cdsOffset, filesize - cdsOffset, function(err, data) {
+      handleCentralDirectory(data, callback)
+    })
+  }
+  function load(filename, callback) {
+    var entry = null, end = filesize, e, i;
+    for(i = 0;i < entries.length;i += 1) {
+      e = entries[i];
+      if(e.filename === filename) {
+        entry = e;
+        break
+      }
+    }
+    if(entry) {
+      if(entry.data) {
+        callback(null, entry.data)
+      }else {
+        entry.load(callback)
+      }
+    }else {
+      callback(filename + " not found.", null)
+    }
+  }
+  function loadAsString(filename, callback) {
+    load(filename, function(err, data) {
+      if(err) {
+        return callback(err, null)
+      }
+      data = runtime.byteArrayToString(data, "utf8");
+      callback(null, data)
+    })
+  }
+  function loadContentXmlAsFragments(filename, handler) {
+    loadAsString(filename, function(err, data) {
+      if(err) {
+        return handler.rootElementReady(err)
+      }
+      handler.rootElementReady(null, data, true)
+    })
+  }
+  function loadAsDataURL(filename, mimetype, callback) {
+    load(filename, function(err, data) {
+      if(err) {
+        return callback(err, null)
+      }
+      var p = data, chunksize = 45E3, i = 0, url;
+      if(!mimetype) {
+        if(p[1] === 80 && p[2] === 78 && p[3] === 71) {
+          mimetype = "image/png"
+        }else {
+          if(p[0] === 255 && p[1] === 216 && p[2] === 255) {
+            mimetype = "image/jpeg"
+          }else {
+            if(p[0] === 71 && p[1] === 73 && p[2] === 70) {
+              mimetype = "image/gif"
+            }else {
+              mimetype = ""
+            }
+          }
+        }
+      }
+      url = "data:" + mimetype + ";base64,";
+      while(i < data.length) {
+        url += base64.convertUTF8ArrayToBase64(p.slice(i, Math.min(i + chunksize, p.length)));
+        i += chunksize
+      }
+      callback(null, url)
+    })
+  }
+  function loadAsDOM(filename, callback) {
+    loadAsString(filename, function(err, xmldata) {
+      if(err) {
+        callback(err, null);
+        return
+      }
+      var parser = new DOMParser;
+      xmldata = parser.parseFromString(xmldata, "text/xml");
+      callback(null, xmldata)
+    })
+  }
+  function save(filename, data, compressed, date) {
+    var i, entry;
+    for(i = 0;i < entries.length;i += 1) {
+      entry = entries[i];
+      if(entry.filename === filename) {
+        entry.set(filename, data, compressed, date);
+        return
+      }
+    }
+    entry = new ZipEntry(url);
+    entry.set(filename, data, compressed, date);
+    entries.push(entry)
+  }
+  function writeEntry(entry) {
+    var data = new core.ByteArrayWriter("utf8"), length = 0;
+    data.appendArray([80, 75, 3, 4, 20, 0, 0, 0, 0, 0]);
+    if(entry.data) {
+      length = entry.data.length
+    }
+    data.appendUInt32LE(date2DosTime(entry.date));
+    data.appendUInt32LE(crc32(entry.data));
+    data.appendUInt32LE(length);
+    data.appendUInt32LE(length);
+    data.appendUInt16LE(entry.filename.length);
+    data.appendUInt16LE(0);
+    data.appendString(entry.filename);
+    if(entry.data) {
+      data.appendByteArray(entry.data)
+    }
+    return data
+  }
+  function writeCODEntry(entry, offset) {
+    var data = new core.ByteArrayWriter("utf8"), length = 0;
+    data.appendArray([80, 75, 1, 2, 20, 0, 20, 0, 0, 0, 0, 0]);
+    if(entry.data) {
+      length = entry.data.length
+    }
+    data.appendUInt32LE(date2DosTime(entry.date));
+    data.appendUInt32LE(crc32(entry.data));
+    data.appendUInt32LE(length);
+    data.appendUInt32LE(length);
+    data.appendUInt16LE(entry.filename.length);
+    data.appendArray([0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]);
+    data.appendUInt32LE(offset);
+    data.appendString(entry.filename);
+    return data
+  }
+  function loadAllEntries(position, callback) {
+    if(position === entries.length) {
+      callback(null);
+      return
+    }
+    var entry = entries[position];
+    if(entry.data !== undefined) {
+      loadAllEntries(position + 1, callback);
+      return
+    }
+    entry.load(function(err) {
+      if(err) {
+        callback(err);
+        return
+      }
+      loadAllEntries(position + 1, callback)
+    })
+  }
+  function write(callback) {
+    loadAllEntries(0, function(err) {
+      if(err) {
+        callback(err);
+        return
+      }
+      var data = new core.ByteArrayWriter("utf8"), i, e, codoffset, codsize, offsets = [0];
+      for(i = 0;i < entries.length;i += 1) {
+        data.appendByteArrayWriter(writeEntry(entries[i]));
+        offsets.push(data.getLength())
+      }
+      codoffset = data.getLength();
+      for(i = 0;i < entries.length;i += 1) {
+        e = entries[i];
+        data.appendByteArrayWriter(writeCODEntry(e, offsets[i]))
+      }
+      codsize = data.getLength() - codoffset;
+      data.appendArray([80, 75, 5, 6, 0, 0, 0, 0]);
+      data.appendUInt16LE(entries.length);
+      data.appendUInt16LE(entries.length);
+      data.appendUInt32LE(codsize);
+      data.appendUInt32LE(codoffset);
+      data.appendArray([0, 0]);
+      runtime.writeFile(url, data.getByteArray(), callback)
+    })
+  }
+  this.load = load;
+  this.save = save;
+  this.write = write;
+  this.loadContentXmlAsFragments = loadContentXmlAsFragments;
+  this.loadAsString = loadAsString;
+  this.loadAsDOM = loadAsDOM;
+  this.loadAsDataURL = loadAsDataURL;
+  this.getEntries = function() {
+    return entries.slice()
+  };
+  filesize = -1;
+  if(entriesReadCallback === null) {
+    entries = [];
+    return
+  }
+  runtime.getFileSize(url, function(size) {
+    filesize = size;
+    if(filesize < 0) {
+      entriesReadCallback("File '" + url + "' cannot be read.", zip)
+    }else {
+      runtime.read(url, filesize - 22, 22, function(err, data) {
+        if(err || entriesReadCallback === null) {
+          entriesReadCallback(err, zip)
+        }else {
+          handleCentralDirectoryEnd(data, entriesReadCallback)
+        }
+      })
+    }
+  })
+};
+xmldom.LSSerializerFilter = function LSSerializerFilter() {
+};
+if(typeof Object.create !== "function") {
+  Object["create"] = function(o) {
+    var F = function() {
+    };
+    F.prototype = o;
+    return new F
+  }
+}
+xmldom.LSSerializer = function LSSerializer() {
+  var self = this;
+  function serializeAttribute(prefix, attr) {
+    var s = prefix + attr.localName + '="' + attr.nodeValue + '"';
+    return s
+  }
+  function attributePrefix(nsmap, prefix, ns) {
+    if(nsmap.hasOwnProperty(ns)) {
+      return nsmap[ns] + ":"
+    }
+    if(nsmap[ns] !== prefix) {
+      nsmap[ns] = prefix
+    }
+    return prefix + ":"
+  }
+  function startNode(nsmap, node) {
+    var s = "", atts = node.attributes, length, i, attr, attstr = "", accept, prefix;
+    if(atts) {
+      if(nsmap[node.namespaceURI] !== node.prefix) {
+        nsmap[node.namespaceURI] = node.prefix
+      }
+      s += "<" + node.nodeName;
+      length = atts.length;
+      for(i = 0;i < length;i += 1) {
+        attr = atts.item(i);
+        if(attr.namespaceURI !== "http://www.w3.org/2000/xmlns/") {
+          accept = self.filter ? self.filter.acceptNode(attr) : 1;
+          if(accept === 1) {
+            if(attr.namespaceURI) {
+              prefix = attributePrefix(nsmap, attr.prefix, attr.namespaceURI)
+            }else {
+              prefix = ""
+            }
+            attstr += " " + serializeAttribute(prefix, attr)
+          }
+        }
+      }
+      for(i in nsmap) {
+        if(nsmap.hasOwnProperty(i)) {
+          prefix = nsmap[i];
+          if(!prefix) {
+            s += ' xmlns="' + i + '"'
+          }else {
+            if(prefix !== "xmlns") {
+              s += " xmlns:" + nsmap[i] + '="' + i + '"'
+            }
+          }
+        }
+      }
+      s += attstr + ">"
+    }
+    return s
+  }
+  function endNode(node) {
+    var s = "";
+    if(node.nodeType === 1) {
+      s += "</" + node.nodeName + ">"
+    }
+    return s
+  }
+  function serializeNode(parentnsmap, node) {
+    var s = "", nsmap = Object.create(parentnsmap), accept = self.filter ? self.filter.acceptNode(node) : 1, child;
+    if(accept === 1) {
+      s += startNode(nsmap, node)
+    }
+    if(accept === 1 || accept === 3) {
+      child = node.firstChild;
+      while(child) {
+        s += serializeNode(nsmap, child);
+        child = child.nextSibling
+      }
+      if(node.nodeValue) {
+        s += node.nodeValue
+      }
+    }
+    if(accept === 1) {
+      s += endNode(node)
+    }
+    return s
+  }
+  function invertMap(map) {
+    var m = {}, i;
+    for(i in map) {
+      if(map.hasOwnProperty(i)) {
+        m[map[i]] = i
+      }
+    }
+    return m
+  }
+  this.filter = null;
+  this.writeToString = function(node, nsmap) {
+    if(!node) {
+      return""
+    }
+    nsmap = nsmap ? invertMap(nsmap) : {};
+    return serializeNode(nsmap, node)
+  }
+};
+xmldom.RelaxNGParser = function RelaxNGParser() {
+  var self = this, rngns = "http://relaxng.org/ns/structure/1.0", xmlnsns = "http://www.w3.org/2000/xmlns/", start, nsmap = {"http://www.w3.org/XML/1998/namespace":"xml"}, parse;
+  function RelaxNGParseError(error, context) {
+    this.message = function() {
+      if(context) {
+        error += context.nodeType === 1 ? " Element " : " Node ";
+        error += context.nodeName;
+        if(context.nodeValue) {
+          error += " with value '" + context.nodeValue + "'"
+        }
+        error += "."
+      }
+      return error
+    }
+  }
+  function splitToDuos(e) {
+    if(e.e.length <= 2) {
+      return e
+    }
+    var o = {name:e.name, e:e.e.slice(0, 2)};
+    return splitToDuos({name:e.name, e:[o].concat(e.e.slice(2))})
+  }
+  function splitQName(name) {
+    var r = name.split(":", 2), prefix = "", i;
+    if(r.length === 1) {
+      r = ["", r[0]]
+    }else {
+      prefix = r[0]
+    }
+    for(i in nsmap) {
+      if(nsmap[i] === prefix) {
+        r[0] = i
+      }
+    }
+    return r
+  }
+  function splitQNames(def) {
+    var i, l = def.names ? def.names.length : 0, name, localnames = def.localnames = [l], namespaces = def.namespaces = [l];
+    for(i = 0;i < l;i += 1) {
+      name = splitQName(def.names[i]);
+      namespaces[i] = name[0];
+      localnames[i] = name[1]
+    }
+  }
+  function trim(str) {
+    str = str.replace(/^\s\s*/, "");
+    var ws = /\s/, i = str.length - 1;
+    while(ws.test(str.charAt(i))) {
+      i -= 1
+    }
+    return str.slice(0, i + 1)
+  }
+  function copyAttributes(atts, name, names) {
+    var a = {}, i, att;
+    for(i = 0;i < atts.length;i += 1) {
+      att = atts.item(i);
+      if(!att.namespaceURI) {
+        if(att.localName === "name" && (name === "element" || name === "attribute")) {
+          names.push(att.value)
+        }
+        if(att.localName === "name" || att.localName === "combine" || att.localName === "type") {
+          att.value = trim(att.value)
+        }
+        a[att.localName] = att.value
+      }else {
+        if(att.namespaceURI === xmlnsns) {
+          nsmap[att.value] = att.localName
+        }
+      }
+    }
+    return a
+  }
+  function parseChildren(c, e, elements, names) {
+    var text = "", ce;
+    while(c) {
+      if(c.nodeType === 1 && c.namespaceURI === rngns) {
+        ce = parse(c, elements, e);
+        if(ce) {
+          if(ce.name === "name") {
+            names.push(nsmap[ce.a.ns] + ":" + ce.text);
+            e.push(ce)
+          }else {
+            if(ce.name === "choice" && ce.names && ce.names.length) {
+              names = names.concat(ce.names);
+              delete ce.names;
+              e.push(ce)
+            }else {
+              e.push(ce)
+            }
+          }
+        }
+      }else {
+        if(c.nodeType === 3) {
+          text += c.nodeValue
+        }
+      }
+      c = c.nextSibling
+    }
+    return text
+  }
+  function combineDefines(combine, name, e, siblings) {
+    var i, ce;
+    for(i = 0;siblings && i < siblings.length;i += 1) {
+      ce = siblings[i];
+      if(ce.name === "define" && ce.a && ce.a.name === name) {
+        ce.e = [{name:combine, e:ce.e.concat(e)}];
+        return ce
+      }
+    }
+    return null
+  }
+  parse = function parse(element, elements, siblings) {
+    var e = [], a, ce, i, text, name = element.localName, names = [];
+    a = copyAttributes(element.attributes, name, names);
+    a.combine = a.combine || undefined;
+    text = parseChildren(element.firstChild, e, elements, names);
+    if(name !== "value" && name !== "param") {
+      text = /^\s*([\s\S]*\S)?\s*$/.exec(text)[1]
+    }
+    if(name === "value" && a.type === undefined) {
+      a.type = "token";
+      a.datatypeLibrary = ""
+    }
+    if((name === "attribute" || name === "element") && a.name !== undefined) {
+      i = splitQName(a.name);
+      e = [{name:"name", text:i[1], a:{ns:i[0]}}].concat(e);
+      delete a.name
+    }
+    if(name === "name" || name === "nsName" || name === "value") {
+      if(a.ns === undefined) {
+        a.ns = ""
+      }
+    }else {
+      delete a.ns
+    }
+    if(name === "name") {
+      i = splitQName(text);
+      a.ns = i[0];
+      text = i[1]
+    }
+    if(e.length > 1 && (name === "define" || name === "oneOrMore" || name === "zeroOrMore" || name === "optional" || name === "list" || name === "mixed")) {
+      e = [{name:"group", e:splitToDuos({name:"group", e:e}).e}]
+    }
+    if(e.length > 2 && name === "element") {
+      e = [e[0]].concat({name:"group", e:splitToDuos({name:"group", e:e.slice(1)}).e})
+    }
+    if(e.length === 1 && name === "attribute") {
+      e.push({name:"text", text:text})
+    }
+    if(e.length === 1 && (name === "choice" || name === "group" || name === "interleave")) {
+      name = e[0].name;
+      names = e[0].names;
+      a = e[0].a;
+      text = e[0].text;
+      e = e[0].e
+    }else {
+      if(e.length > 2 && (name === "choice" || name === "group" || name === "interleave")) {
+        e = splitToDuos({name:name, e:e}).e
+      }
+    }
+    if(name === "mixed") {
+      name = "interleave";
+      e = [e[0], {name:"text"}]
+    }
+    if(name === "optional") {
+      name = "choice";
+      e = [e[0], {name:"empty"}]
+    }
+    if(name === "zeroOrMore") {
+      name = "choice";
+      e = [{name:"oneOrMore", e:[e[0]]}, {name:"empty"}]
+    }
+    if(name === "define" && a.combine) {
+      ce = combineDefines(a.combine, a.name, e, siblings);
+      if(ce) {
+        return
+      }
+    }
+    ce = {name:name};
+    if(e && e.length > 0) {
+      ce.e = e
+    }
+    for(i in a) {
+      if(a.hasOwnProperty(i)) {
+        ce.a = a;
+        break
+      }
+    }
+    if(text !== undefined) {
+      ce.text = text
+    }
+    if(names && names.length > 0) {
+      ce.names = names
+    }
+    if(name === "element") {
+      ce.id = elements.length;
+      elements.push(ce);
+      ce = {name:"elementref", id:ce.id}
+    }
+    return ce
+  };
+  function resolveDefines(def, defines) {
+    var i = 0, e, defs, end, name = def.name;
+    while(def.e && i < def.e.length) {
+      e = def.e[i];
+      if(e.name === "ref") {
+        defs = defines[e.a.name];
+        if(!defs) {
+          throw e.a.name + " was not defined.";
+        }
+        end = def.e.slice(i + 1);
+        def.e = def.e.slice(0, i);
+        def.e = def.e.concat(defs.e);
+        def.e = def.e.concat(end)
+      }else {
+        i += 1;
+        resolveDefines(e, defines)
+      }
+    }
+    e = def.e;
+    if(name === "choice") {
+      if(!e || !e[1] || e[1].name === "empty") {
+        if(!e || !e[0] || e[0].name === "empty") {
+          delete def.e;
+          def.name = "empty"
+        }else {
+          e[1] = e[0];
+          e[0] = {name:"empty"}
+        }
+      }
+    }
+    if(name === "group" || name === "interleave") {
+      if(e[0].name === "empty") {
+        if(e[1].name === "empty") {
+          delete def.e;
+          def.name = "empty"
+        }else {
+          name = def.name = e[1].name;
+          def.names = e[1].names;
+          e = def.e = e[1].e
+        }
+      }else {
+        if(e[1].name === "empty") {
+          name = def.name = e[0].name;
+          def.names = e[0].names;
+          e = def.e = e[0].e
+        }
+      }
+    }
+    if(name === "oneOrMore" && e[0].name === "empty") {
+      delete def.e;
+      def.name = "empty"
+    }
+    if(name === "attribute") {
+      splitQNames(def)
+    }
+    if(name === "interleave") {
+      if(e[0].name === "interleave") {
+        if(e[1].name === "interleave") {
+          e = def.e = e[0].e.concat(e[1].e)
+        }else {
+          e = def.e = [e[1]].concat(e[0].e)
+        }
+      }else {
+        if(e[1].name === "interleave") {
+          e = def.e = [e[0]].concat(e[1].e)
+        }
+      }
+    }
+  }
+  function resolveElements(def, elements) {
+    var i = 0, e, name;
+    while(def.e && i < def.e.length) {
+      e = def.e[i];
+      if(e.name === "elementref") {
+        e.id = e.id || 0;
+        def.e[i] = elements[e.id]
+      }else {
+        if(e.name !== "element") {
+          resolveElements(e, elements)
+        }
+      }
+      i += 1
+    }
+  }
+  function main(dom, callback) {
+    var elements = [], grammar = parse(dom && dom.documentElement, elements, undefined), i, e, defines = {};
+    for(i = 0;i < grammar.e.length;i += 1) {
+      e = grammar.e[i];
+      if(e.name === "define") {
+        defines[e.a.name] = e
+      }else {
+        if(e.name === "start") {
+          start = e
+        }
+      }
+    }
+    if(!start) {
+      return[new RelaxNGParseError("No Relax NG start element was found.")]
+    }
+    resolveDefines(start, defines);
+    for(i in defines) {
+      if(defines.hasOwnProperty(i)) {
+        resolveDefines(defines[i], defines)
+      }
+    }
+    for(i = 0;i < elements.length;i += 1) {
+      resolveDefines(elements[i], defines)
+    }
+    if(callback) {
+      self.rootPattern = callback(start.e[0], elements)
+    }
+    resolveElements(start, elements);
+    for(i = 0;i < elements.length;i += 1) {
+      resolveElements(elements[i], elements)
+    }
+    self.start = start;
+    self.elements = elements;
+    self.nsmap = nsmap;
+    return null
+  }
+  this.parseRelaxNGDOM = main
+};
+runtime.loadClass("xmldom.RelaxNGParser");
+xmldom.RelaxNG = function RelaxNG() {
+  var xmlnsns = "http://www.w3.org/2000/xmlns/", createChoice, createInterleave, createGroup, createAfter, createOneOrMore, createValue, createAttribute, createNameClass, createData, makePattern, notAllowed = {type:"notAllowed", nullable:false, hash:"notAllowed", textDeriv:function() {
+    return notAllowed
+  }, startTagOpenDeriv:function() {
+    return notAllowed
+  }, attDeriv:function() {
+    return notAllowed
+  }, startTagCloseDeriv:function() {
+    return notAllowed
+  }, endTagDeriv:function() {
+    return notAllowed
+  }}, empty = {type:"empty", nullable:true, hash:"empty", textDeriv:function() {
+    return notAllowed
+  }, startTagOpenDeriv:function() {
+    return notAllowed
+  }, attDeriv:function(context, attribute) {
+    return notAllowed
+  }, startTagCloseDeriv:function() {
+    return empty
+  }, endTagDeriv:function() {
+    return notAllowed
+  }}, text = {type:"text", nullable:true, hash:"text", textDeriv:function() {
+    return text
+  }, startTagOpenDeriv:function() {
+    return notAllowed
+  }, attDeriv:function() {
+    return notAllowed
+  }, startTagCloseDeriv:function() {
+    return text
+  }, endTagDeriv:function() {
+    return notAllowed
+  }}, applyAfter, childDeriv, rootPattern;
+  function memoize0arg(func) {
+    return function() {
+      var cache;
+      return function() {
+        if(cache === undefined) {
+          cache = func()
+        }
+        return cache
+      }
+    }()
+  }
+  function memoize1arg(type, func) {
+    return function() {
+      var cache = {}, cachecount = 0;
+      return function(a) {
+        var ahash = a.hash || a.toString(), v;
+        v = cache[ahash];
+        if(v !== undefined) {
+          return v
+        }
+        cache[ahash] = v = func(a);
+        v.hash = type + cachecount.toString();
+        cachecount += 1;
+        return v
+      }
+    }()
+  }
+  function memoizeNode(func) {
+    return function() {
+      var cache = {};
+      return function(node) {
+        var v, m;
+        m = cache[node.localName];
+        if(m === undefined) {
+          cache[node.localName] = m = {}
+        }else {
+          v = m[node.namespaceURI];
+          if(v !== undefined) {
+            return v
+          }
+        }
+        m[node.namespaceURI] = v = func(node);
+        return v
+      }
+    }()
+  }
+  function memoize2arg(type, fastfunc, func) {
+    return function() {
+      var cache = {}, cachecount = 0;
+      return function(a, b) {
+        var v = fastfunc && fastfunc(a, b), ahash, bhash, m;
+        if(v !== undefined) {
+          return v
+        }
+        ahash = a.hash || a.toString();
+        bhash = b.hash || b.toString();
+        m = cache[ahash];
+        if(m === undefined) {
+          cache[ahash] = m = {}
+        }else {
+          v = m[bhash];
+          if(v !== undefined) {
+            return v
+          }
+        }
+        m[bhash] = v = func(a, b);
+        v.hash = type + cachecount.toString();
+        cachecount += 1;
+        return v
+      }
+    }()
+  }
+  function unorderedMemoize2arg(type, fastfunc, func) {
+    return function() {
+      var cache = {}, cachecount = 0;
+      return function(a, b) {
+        var v = fastfunc && fastfunc(a, b), ahash, bhash, m;
+        if(v !== undefined) {
+          return v
+        }
+        ahash = a.hash || a.toString();
+        bhash = b.hash || b.toString();
+        if(ahash < bhash) {
+          m = ahash;
+          ahash = bhash;
+          bhash = m;
+          m = a;
+          a = b;
+          b = m
+        }
+        m = cache[ahash];
+        if(m === undefined) {
+          cache[ahash] = m = {}
+        }else {
+          v = m[bhash];
+          if(v !== undefined) {
+            return v
+          }
+        }
+        m[bhash] = v = func(a, b);
+        v.hash = type + cachecount.toString();
+        cachecount += 1;
+        return v
+      }
+    }()
+  }
+  function getUniqueLeaves(leaves, pattern) {
+    if(pattern.p1.type === "choice") {
+      getUniqueLeaves(leaves, pattern.p1)
+    }else {
+      leaves[pattern.p1.hash] = pattern.p1
+    }
+    if(pattern.p2.type === "choice") {
+      getUniqueLeaves(leaves, pattern.p2)
+    }else {
+      leaves[pattern.p2.hash] = pattern.p2
+    }
+  }
+  createChoice = memoize2arg("choice", function(p1, p2) {
+    if(p1 === notAllowed) {
+      return p2
+    }
+    if(p2 === notAllowed) {
+      return p1
+    }
+    if(p1 === p2) {
+      return p1
+    }
+  }, function(p1, p2) {
+    function makeChoice(p1, p2) {
+      return{type:"choice", p1:p1, p2:p2, nullable:p1.nullable || p2.nullable, textDeriv:function(context, text) {
+        return createChoice(p1.textDeriv(context, text), p2.textDeriv(context, text))
+      }, startTagOpenDeriv:memoizeNode(function(node) {
+        return createChoice(p1.startTagOpenDeriv(node), p2.startTagOpenDeriv(node))
+      }), attDeriv:function(context, attribute) {
+        return createChoice(p1.attDeriv(context, attribute), p2.attDeriv(context, attribute))
+      }, startTagCloseDeriv:memoize0arg(function() {
+        return createChoice(p1.startTagCloseDeriv(), p2.startTagCloseDeriv())
+      }), endTagDeriv:memoize0arg(function() {
+        return createChoice(p1.endTagDeriv(), p2.endTagDeriv())
+      })}
+    }
+    var leaves = {}, i;
+    getUniqueLeaves(leaves, {p1:p1, p2:p2});
+    p1 = undefined;
+    p2 = undefined;
+    for(i in leaves) {
+      if(leaves.hasOwnProperty(i)) {
+        if(p1 === undefined) {
+          p1 = leaves[i]
+        }else {
+          if(p2 === undefined) {
+            p2 = leaves[i]
+          }else {
+            p2 = createChoice(p2, leaves[i])
+          }
+        }
+      }
+    }
+    return makeChoice(p1, p2)
+  });
+  createInterleave = unorderedMemoize2arg("interleave", function(p1, p2) {
+    if(p1 === notAllowed || p2 === notAllowed) {
+      return notAllowed
+    }
+    if(p1 === empty) {
+      return p2
+    }
+    if(p2 === empty) {
+      return p1
+    }
+  }, function(p1, p2) {
+    return{type:"interleave", p1:p1, p2:p2, nullable:p1.nullable && p2.nullable, textDeriv:function(context, text) {
+      return createChoice(createInterleave(p1.textDeriv(context, text), p2), createInterleave(p1, p2.textDeriv(context, text)))
+    }, startTagOpenDeriv:memoizeNode(function(node) {
+      return createChoice(applyAfter(function(p) {
+        return createInterleave(p, p2)
+      }, p1.startTagOpenDeriv(node)), applyAfter(function(p) {
+        return createInterleave(p1, p)
+      }, p2.startTagOpenDeriv(node)))
+    }), attDeriv:function(context, attribute) {
+      return createChoice(createInterleave(p1.attDeriv(context, attribute), p2), createInterleave(p1, p2.attDeriv(context, attribute)))
+    }, startTagCloseDeriv:memoize0arg(function() {
+      return createInterleave(p1.startTagCloseDeriv(), p2.startTagCloseDeriv())
+    })}
+  });
+  createGroup = memoize2arg("group", function(p1, p2) {
+    if(p1 === notAllowed || p2 === notAllowed) {
+      return notAllowed
+    }
+    if(p1 === empty) {
+      return p2
+    }
+    if(p2 === empty) {
+      return p1
+    }
+  }, function(p1, p2) {
+    return{type:"group", p1:p1, p2:p2, nullable:p1.nullable && p2.nullable, textDeriv:function(context, text) {
+      var p = createGroup(p1.textDeriv(context, text), p2);
+      if(p1.nullable) {
+        return createChoice(p, p2.textDeriv(context, text))
+      }
+      return p
+    }, startTagOpenDeriv:function(node) {
+      var x = applyAfter(function(p) {
+        return createGroup(p, p2)
+      }, p1.startTagOpenDeriv(node));
+      if(p1.nullable) {
+        return createChoice(x, p2.startTagOpenDeriv(node))
+      }
+      return x
+    }, attDeriv:function(context, attribute) {
+      return createChoice(createGroup(p1.attDeriv(context, attribute), p2), createGroup(p1, p2.attDeriv(context, attribute)))
+    }, startTagCloseDeriv:memoize0arg(function() {
+      return createGroup(p1.startTagCloseDeriv(), p2.startTagCloseDeriv())
+    })}
+  });
+  createAfter = memoize2arg("after", function(p1, p2) {
+    if(p1 === notAllowed || p2 === notAllowed) {
+      return notAllowed
+    }
+  }, function(p1, p2) {
+    return{type:"after", p1:p1, p2:p2, nullable:false, textDeriv:function(context, text) {
+      return createAfter(p1.textDeriv(context, text), p2)
+    }, startTagOpenDeriv:memoizeNode(function(node) {
+      return applyAfter(function(p) {
+        return createAfter(p, p2)
+      }, p1.startTagOpenDeriv(node))
+    }), attDeriv:function(context, attribute) {
+      return createAfter(p1.attDeriv(context, attribute), p2)
+    }, startTagCloseDeriv:memoize0arg(function() {
+      return createAfter(p1.startTagCloseDeriv(), p2)
+    }), endTagDeriv:memoize0arg(function() {
+      return p1.nullable ? p2 : notAllowed
+    })}
+  });
+  createOneOrMore = memoize1arg("oneormore", function(p) {
+    if(p === notAllowed) {
+      return notAllowed
+    }
+    return{type:"oneOrMore", p:p, nullable:p.nullable, textDeriv:function(context, text) {
+      return createGroup(p.textDeriv(context, text), createChoice(this, empty))
+    }, startTagOpenDeriv:function(node) {
+      var oneOrMore = this;
+      return applyAfter(function(pf) {
+        return createGroup(pf, createChoice(oneOrMore, empty))
+      }, p.startTagOpenDeriv(node))
+    }, attDeriv:function(context, attribute) {
+      var oneOrMore = this;
+      return createGroup(p.attDeriv(context, attribute), createChoice(oneOrMore, empty))
+    }, startTagCloseDeriv:memoize0arg(function() {
+      return createOneOrMore(p.startTagCloseDeriv())
+    })}
+  });
+  function createElement(nc, p) {
+    return{type:"element", nc:nc, nullable:false, textDeriv:function() {
+      return notAllowed
+    }, startTagOpenDeriv:function(node) {
+      if(nc.contains(node)) {
+        return createAfter(p, empty)
+      }
+      return notAllowed
+    }, attDeriv:function(context, attribute) {
+      return notAllowed
+    }, startTagCloseDeriv:function() {
+      return this
+    }}
+  }
+  function valueMatch(context, pattern, text) {
+    return pattern.nullable && /^\s+$/.test(text) || pattern.textDeriv(context, text).nullable
+  }
+  createAttribute = memoize2arg("attribute", undefined, function(nc, p) {
+    return{type:"attribute", nullable:false, nc:nc, p:p, attDeriv:function(context, attribute) {
+      if(nc.contains(attribute) && valueMatch(context, p, attribute.nodeValue)) {
+        return empty
+      }
+      return notAllowed
+    }, startTagCloseDeriv:function() {
+      return notAllowed
+    }}
+  });
+  function createList() {
+    return{type:"list", nullable:false, hash:"list", textDeriv:function(context, text) {
+      return empty
+    }}
+  }
+  createValue = memoize1arg("value", function(value) {
+    return{type:"value", nullable:false, value:value, textDeriv:function(context, text) {
+      return text === value ? empty : notAllowed
+    }, attDeriv:function() {
+      return notAllowed
+    }, startTagCloseDeriv:function() {
+      return this
+    }}
+  });
+  createData = memoize1arg("data", function(type) {
+    return{type:"data", nullable:false, dataType:type, textDeriv:function() {
+      return empty
+    }, attDeriv:function() {
+      return notAllowed
+    }, startTagCloseDeriv:function() {
+      return this
+    }}
+  });
+  function createDataExcept() {
+    return{type:"dataExcept", nullable:false, hash:"dataExcept"}
+  }
+  applyAfter = function applyAfter(f, p) {
+    var result;
+    if(p.type === "after") {
+      result = createAfter(p.p1, f(p.p2))
+    }else {
+      if(p.type === "choice") {
+        result = createChoice(applyAfter(f, p.p1), applyAfter(f, p.p2))
+      }else {
+        result = p
+      }
+    }
+    return result
+  };
+  function attsDeriv(context, pattern, attributes, position) {
+    if(pattern === notAllowed) {
+      return notAllowed
+    }
+    if(position >= attributes.length) {
+      return pattern
+    }
+    if(position === 0) {
+      position = 0
+    }
+    var a = attributes.item(position);
+    while(a.namespaceURI === xmlnsns) {
+      position += 1;
+      if(position >= attributes.length) {
+        return pattern
+      }
+      a = attributes.item(position)
+    }
+    a = attsDeriv(context, pattern.attDeriv(context, attributes.item(position)), attributes, position + 1);
+    return a
+  }
+  function childrenDeriv(context, pattern, walker) {
+    var element = walker.currentNode, childNode = walker.firstChild(), numberOfTextNodes = 0, childNodes = [], i, p;
+    while(childNode) {
+      if(childNode.nodeType === 1) {
+        childNodes.push(childNode)
+      }else {
+        if(childNode.nodeType === 3 && !/^\s*$/.test(childNode.nodeValue)) {
+          childNodes.push(childNode.nodeValue);
+          numberOfTextNodes += 1
+        }
+      }
+      childNode = walker.nextSibling()
+    }
+    if(childNodes.length === 0) {
+      childNodes = [""]
+    }
+    p = pattern;
+    for(i = 0;p !== notAllowed && i < childNodes.length;i += 1) {
+      childNode = childNodes[i];
+      if(typeof childNode === "string") {
+        if(/^\s*$/.test(childNode)) {
+          p = createChoice(p, p.textDeriv(context, childNode))
+        }else {
+          p = p.textDeriv(context, childNode)
+        }
+      }else {
+        walker.currentNode = childNode;
+        p = childDeriv(context, p, walker)
+      }
+    }
+    walker.currentNode = element;
+    return p
+  }
+  childDeriv = function childDeriv(context, pattern, walker) {
+    var childNode = walker.currentNode, p;
+    p = pattern.startTagOpenDeriv(childNode);
+    p = attsDeriv(context, p, childNode.attributes, 0);
+    p = p.startTagCloseDeriv();
+    p = childrenDeriv(context, p, walker);
+    p = p.endTagDeriv();
+    return p
+  };
+  function addNames(name, ns, pattern) {
+    if(pattern.e[0].a) {
+      name.push(pattern.e[0].text);
+      ns.push(pattern.e[0].a.ns)
+    }else {
+      addNames(name, ns, pattern.e[0])
+    }
+    if(pattern.e[1].a) {
+      name.push(pattern.e[1].text);
+      ns.push(pattern.e[1].a.ns)
+    }else {
+      addNames(name, ns, pattern.e[1])
+    }
+  }
+  createNameClass = function createNameClass(pattern) {
+    var name, ns, hash, i, result;
+    if(pattern.name === "name") {
+      name = pattern.text;
+      ns = pattern.a.ns;
+      result = {name:name, ns:ns, hash:"{" + ns + "}" + name, contains:function(node) {
+        return node.namespaceURI === ns && node.localName === name
+      }}
+    }else {
+      if(pattern.name === "choice") {
+        name = [];
+        ns = [];
+        addNames(name, ns, pattern);
+        hash = "";
+        for(i = 0;i < name.length;i += 1) {
+          hash += "{" + ns[i] + "}" + name[i] + ","
+        }
+        result = {hash:hash, contains:function(node) {
+          var i;
+          for(i = 0;i < name.length;i += 1) {
+            if(name[i] === node.localName && ns[i] === node.namespaceURI) {
+              return true
+            }
+          }
+          return false
+        }}
+      }else {
+        result = {hash:"anyName", contains:function() {
+          return true
+        }}
+      }
+    }
+    return result
+  };
+  function resolveElement(pattern, elements) {
+    var element, p, i, hash;
+    hash = "element" + pattern.id.toString();
+    p = elements[pattern.id] = {hash:hash};
+    element = createElement(createNameClass(pattern.e[0]), makePattern(pattern.e[1], elements));
+    for(i in element) {
+      if(element.hasOwnProperty(i)) {
+        p[i] = element[i]
+      }
+    }
+    return p
+  }
+  makePattern = function makePattern(pattern, elements) {
+    var p, i;
+    if(pattern.name === "elementref") {
+      p = pattern.id || 0;
+      pattern = elements[p];
+      if(pattern.name !== undefined) {
+        return resolveElement(pattern, elements)
+      }
+      return pattern
+    }
+    switch(pattern.name) {
+      case "empty":
+        return empty;
+      case "notAllowed":
+        return notAllowed;
+      case "text":
+        return text;
+      case "choice":
+        return createChoice(makePattern(pattern.e[0], elements), makePattern(pattern.e[1], elements));
+      case "interleave":
+        p = makePattern(pattern.e[0], elements);
+        for(i = 1;i < pattern.e.length;i += 1) {
+          p = createInterleave(p, makePattern(pattern.e[i], elements))
+        }
+        return p;
+      case "group":
+        return createGroup(makePattern(pattern.e[0], elements), makePattern(pattern.e[1], elements));
+      case "oneOrMore":
+        return createOneOrMore(makePattern(pattern.e[0], elements));
+      case "attribute":
+        return createAttribute(createNameClass(pattern.e[0]), makePattern(pattern.e[1], elements));
+      case "value":
+        return createValue(pattern.text);
+      case "data":
+        p = pattern.a && pattern.a.type;
+        if(p === undefined) {
+          p = ""
+        }
+        return createData(p);
+      case "list":
+        return createList()
+    }
+    throw"No support for " + pattern.name;
+  };
+  this.makePattern = function(pattern, elements) {
+    var copy = {}, i;
+    for(i in elements) {
+      if(elements.hasOwnProperty(i)) {
+        copy[i] = elements[i]
+      }
+    }
+    i = makePattern(pattern, copy);
+    return i
+  };
+  this.validate = function validate(walker, callback) {
+    var errors;
+    walker.currentNode = walker.root;
+    errors = childDeriv(null, rootPattern, walker);
+    if(!errors.nullable) {
+      runtime.log("Error in Relax NG validation: " + errors);
+      callback(["Error in Relax NG validation: " + errors])
+    }else {
+      callback(null)
+    }
+  };
+  this.init = function init(rootPattern1) {
+    rootPattern = rootPattern1
+  }
+};
+runtime.loadClass("xmldom.RelaxNGParser");
+xmldom.RelaxNG2 = function RelaxNG2() {
+  var start, validateNonEmptyPattern, nsmap, depth = 0, p = "                                                                ";
+  function RelaxNGParseError(error, context) {
+    this.message = function() {
+      if(context) {
+        error += context.nodeType === 1 ? " Element " : " Node ";
+        error += context.nodeName;
+        if(context.nodeValue) {
+          error += " with value '" + context.nodeValue + "'"
+        }
+        error += "."
+      }
+      return error
+    }
+  }
+  function validateOneOrMore(elementdef, walker, element) {
+    var node, i = 0, err;
+    do {
+      node = walker.currentNode;
+      err = validateNonEmptyPattern(elementdef.e[0], walker, element);
+      i += 1
+    }while(!err && node !== walker.currentNode);
+    if(i > 1) {
+      walker.currentNode = node;
+      return null
+    }
+    return err
+  }
+  function qName(node) {
+    return nsmap[node.namespaceURI] + ":" + node.localName
+  }
+  function isWhitespace(node) {
+    return node && node.nodeType === 3 && /^\s+$/.test(node.nodeValue)
+  }
+  function validatePattern(elementdef, walker, element, data) {
+    if(elementdef.name === "empty") {
+      return null
+    }
+    return validateNonEmptyPattern(elementdef, walker, element, data)
+  }
+  function validateAttribute(elementdef, walker, element) {
+    if(elementdef.e.length !== 2) {
+      throw"Attribute with wrong # of elements: " + elementdef.e.length;
+    }
+    var att, a, l = elementdef.localnames.length, i;
+    for(i = 0;i < l;i += 1) {
+      a = element.getAttributeNS(elementdef.namespaces[i], elementdef.localnames[i]);
+      if(a === "" && !element.hasAttributeNS(elementdef.namespaces[i], elementdef.localnames[i])) {
+        a = undefined
+      }
+      if(att !== undefined && a !== undefined) {
+        return[new RelaxNGParseError("Attribute defined too often.", element)]
+      }
+      att = a
+    }
+    if(att === undefined) {
+      return[new RelaxNGParseError("Attribute not found: " + elementdef.names, element)]
+    }
+    return validatePattern(elementdef.e[1], walker, element, att)
+  }
+  function validateTop(elementdef, walker, element) {
+    return validatePattern(elementdef, walker, element)
+  }
+  function validateElement(elementdef, walker, element) {
+    if(elementdef.e.length !== 2) {
+      throw"Element with wrong # of elements: " + elementdef.e.length;
+    }
+    depth += 1;
+    var node = walker.currentNode, type = node ? node.nodeType : 0, error = null;
+    while(type > 1) {
+      if(type !== 8 && (type !== 3 || !/^\s+$/.test(walker.currentNode.nodeValue))) {
+        depth -= 1;
+        return[new RelaxNGParseError("Not allowed node of type " + type + ".")]
+      }
+      node = walker.nextSibling();
+      type = node ? node.nodeType : 0
+    }
+    if(!node) {
+      depth -= 1;
+      return[new RelaxNGParseError("Missing element " + elementdef.names)]
+    }
+    if(elementdef.names && elementdef.names.indexOf(qName(node)) === -1) {
+      depth -= 1;
+      return[new RelaxNGParseError("Found " + node.nodeName + " instead of " + elementdef.names + ".", node)]
+    }
+    if(walker.firstChild()) {
+      error = validateTop(elementdef.e[1], walker, node);
+      while(walker.nextSibling()) {
+        type = walker.currentNode.nodeType;
+        if(!isWhitespace(walker.currentNode) && type !== 8) {
+          depth -= 1;
+          return[new RelaxNGParseError("Spurious content.", walker.currentNode)]
+        }
+      }
+      if(walker.parentNode() !== node) {
+        depth -= 1;
+        return[new RelaxNGParseError("Implementation error.")]
+      }
+    }else {
+      error = validateTop(elementdef.e[1], walker, node)
+    }
+    depth -= 1;
+    node = walker.nextSibling();
+    return error
+  }
+  function validateChoice(elementdef, walker, element, data) {
+    if(elementdef.e.length !== 2) {
+      throw"Choice with wrong # of options: " + elementdef.e.length;
+    }
+    var node = walker.currentNode, err;
+    if(elementdef.e[0].name === "empty") {
+      err = validateNonEmptyPattern(elementdef.e[1], walker, element, data);
+      if(err) {
+        walker.currentNode = node
+      }
+      return null
+    }
+    err = validatePattern(elementdef.e[0], walker, element, data);
+    if(err) {
+      walker.currentNode = node;
+      err = validateNonEmptyPattern(elementdef.e[1], walker, element, data)
+    }
+    return err
+  }
+  function validateInterleave(elementdef, walker, element) {
+    var l = elementdef.e.length, n = [l], err, i, todo = l, donethisround, node, subnode, e;
+    while(todo > 0) {
+      donethisround = 0;
+      node = walker.currentNode;
+      for(i = 0;i < l;i += 1) {
+        subnode = walker.currentNode;
+        if(n[i] !== true && n[i] !== subnode) {
+          e = elementdef.e[i];
+          err = validateNonEmptyPattern(e, walker, element);
+          if(err) {
+            walker.currentNode = subnode;
+            if(n[i] === undefined) {
+              n[i] = false
+            }
+          }else {
+            if(subnode === walker.currentNode || e.name === "oneOrMore" || e.name === "choice" && (e.e[0].name === "oneOrMore" || e.e[1].name === "oneOrMore")) {
+              donethisround += 1;
+              n[i] = subnode
+            }else {
+              donethisround += 1;
+              n[i] = true
+            }
+          }
+        }
+      }
+      if(node === walker.currentNode && donethisround === todo) {
+        return null
+      }
+      if(donethisround === 0) {
+        for(i = 0;i < l;i += 1) {
+          if(n[i] === false) {
+            return[new RelaxNGParseError("Interleave does not match.", element)]
+          }
+        }
+        return null
+      }
+      todo = 0;
+      for(i = 0;i < l;i += 1) {
+        if(n[i] !== true) {
+          todo += 1
+        }
+      }
+    }
+    return null
+  }
+  function validateGroup(elementdef, walker, element) {
+    if(elementdef.e.length !== 2) {
+      throw"Group with wrong # of members: " + elementdef.e.length;
+    }
+    return validateNonEmptyPattern(elementdef.e[0], walker, element) || validateNonEmptyPattern(elementdef.e[1], walker, element)
+  }
+  function validateText(elementdef, walker, element) {
+    var node = walker.currentNode, type = node ? node.nodeType : 0, error = null;
+    while(node !== element && type !== 3) {
+      if(type === 1) {
+        return[new RelaxNGParseError("Element not allowed here.", node)]
+      }
+      node = walker.nextSibling();
+      type = node ? node.nodeType : 0
+    }
+    walker.nextSibling();
+    return null
+  }
+  validateNonEmptyPattern = function validateNonEmptyPattern(elementdef, walker, element, data) {
+    var name = elementdef.name, err = null;
+    if(name === "text") {
+      err = validateText(elementdef, walker, element)
+    }else {
+      if(name === "data") {
+        err = null
+      }else {
+        if(name === "value") {
+          if(data !== elementdef.text) {
+            err = [new RelaxNGParseError("Wrong value, should be '" + elementdef.text + "', not '" + data + "'", element)]
+          }
+        }else {
+          if(name === "list") {
+            err = null
+          }else {
+            if(name === "attribute") {
+              err = validateAttribute(elementdef, walker, element)
+            }else {
+              if(name === "element") {
+                err = validateElement(elementdef, walker, element)
+              }else {
+                if(name === "oneOrMore") {
+                  err = validateOneOrMore(elementdef, walker, element)
+                }else {
+                  if(name === "choice") {
+                    err = validateChoice(elementdef, walker, element, data)
+                  }else {
+                    if(name === "group") {
+                      err = validateGroup(elementdef, walker, element)
+                    }else {
+                      if(name === "interleave") {
+                        err = validateInterleave(elementdef, walker, element)
+                      }else {
+                        throw name + " not allowed in nonEmptyPattern.";
+                      }
+                    }
+                  }
+                }
+              }
+            }
+          }
+        }
+      }
+    }
+    return err
+  };
+  this.validate = function validate(walker, callback) {
+    walker.currentNode = walker.root;
+    var errors = validatePattern(start.e[0], walker, walker.root);
+    callback(errors)
+  };
+  this.init = function init(start1, nsmap1) {
+    start = start1;
+    nsmap = nsmap1
+  }
+};
+xmldom.OperationalTransformInterface = function() {
+};
+xmldom.OperationalTransformInterface.prototype.retain = function(amount) {
+};
+xmldom.OperationalTransformInterface.prototype.insertCharacters = function(chars) {
+};
+xmldom.OperationalTransformInterface.prototype.insertElementStart = function(tagname, attributes) {
+};
+xmldom.OperationalTransformInterface.prototype.insertElementEnd = function() {
+};
+xmldom.OperationalTransformInterface.prototype.deleteCharacters = function(amount) {
+};
+xmldom.OperationalTransformInterface.prototype.deleteElementStart = function() {
+};
+xmldom.OperationalTransformInterface.prototype.deleteElementEnd = function() {
+};
+xmldom.OperationalTransformInterface.prototype.replaceAttributes = function(atts) {
+};
+xmldom.OperationalTransformInterface.prototype.updateAttributes = function(atts) {
+};
+xmldom.OperationalTransformDOM = function OperationalTransformDOM(root, serializer) {
+  var pos, length;
+  function retain(amount) {
+  }
+  function insertCharacters(chars) {
+  }
+  function insertElementStart(tagname, attributes) {
+  }
+  function insertElementEnd() {
+  }
+  function deleteCharacters(amount) {
+  }
+  function deleteElementStart() {
+  }
+  function deleteElementEnd() {
+  }
+  function replaceAttributes(atts) {
+  }
+  function updateAttributes(atts) {
+  }
+  function atEnd() {
+    return pos === length
+  }
+  this.retain = retain;
+  this.insertCharacters = insertCharacters;
+  this.insertElementStart = insertElementStart;
+  this.insertElementEnd = insertElementEnd;
+  this.deleteCharacters = deleteCharacters;
+  this.deleteElementStart = deleteElementStart;
+  this.deleteElementEnd = deleteElementEnd;
+  this.replaceAttributes = replaceAttributes;
+  this.updateAttributes = updateAttributes;
+  this.atEnd = atEnd
+};
+xmldom.XPath = function() {
+  var createXPathPathIterator, parsePredicates;
+  function isSmallestPositive(a, b, c) {
+    return a !== -1 && (a < b || b === -1) && (a < c || c === -1)
+  }
+  function parseXPathStep(xpath, pos, end, steps) {
+    var location = "", predicates = [], value, brapos = xpath.indexOf("[", pos), slapos = xpath.indexOf("/", pos), eqpos = xpath.indexOf("=", pos), depth = 0, start = 0;
+    if(isSmallestPositive(slapos, brapos, eqpos)) {
+      location = xpath.substring(pos, slapos);
+      pos = slapos + 1
+    }else {
+      if(isSmallestPositive(brapos, slapos, eqpos)) {
+        location = xpath.substring(pos, brapos);
+        pos = parsePredicates(xpath, brapos, predicates)
+      }else {
+        if(isSmallestPositive(eqpos, slapos, brapos)) {
+          location = xpath.substring(pos, eqpos);
+          pos = eqpos
+        }else {
+          location = xpath.substring(pos, end);
+          pos = end
+        }
+      }
+    }
+    steps.push({location:location, predicates:predicates});
+    return pos
+  }
+  function parseXPath(xpath) {
+    var steps = [], p = 0, end = xpath.length, value;
+    while(p < end) {
+      p = parseXPathStep(xpath, p, end, steps);
+      if(p < end && xpath[p] === "=") {
+        value = xpath.substring(p + 1, end);
+        if(value.length > 2 && (value[0] === "'" || value[0] === '"')) {
+          value = value.slice(1, value.length - 1)
+        }else {
+          try {
+            value = parseInt(value, 10)
+          }catch(e) {
+          }
+        }
+        p = end
+      }
+    }
+    return{steps:steps, value:value}
+  }
+  parsePredicates = function parsePredicates(xpath, start, predicates) {
+    var pos = start, l = xpath.length, selector, depth = 0;
+    while(pos < l) {
+      if(xpath[pos] === "]") {
+        depth -= 1;
+        if(depth <= 0) {
+          predicates.push(parseXPath(xpath.substring(start, pos)))
+        }
+      }else {
+        if(xpath[pos] === "[") {
+          if(depth <= 0) {
+            start = pos + 1
+          }
+          depth += 1
+        }
+      }
+      pos += 1
+    }
+    return pos
+  };
+  function XPathIterator() {
+  }
+  XPathIterator.prototype.next = function() {
+  };
+  XPathIterator.prototype.reset = function() {
+  };
+  function NodeIterator() {
+    var node, done = false;
+    this.setNode = function setNode(n) {
+      node = n
+    };
+    this.reset = function() {
+      done = false
+    };
+    this.next = function next() {
+      var val = done ? null : node;
+      done = true;
+      return val
+    }
+  }
+  function AttributeIterator(it, namespace, localName) {
+    this.reset = function reset() {
+      it.reset()
+    };
+    this.next = function next() {
+      var node = it.next(), attr;
+      while(node) {
+        node = node.getAttributeNodeNS(namespace, localName);
+        if(node) {
+          return node
+        }
+        node = it.next()
+      }
+      return node
+    }
+  }
+  function AllChildElementIterator(it, recurse) {
+    var root = it.next(), node = null;
+    this.reset = function reset() {
+      it.reset();
+      root = it.next();
+      node = null
+    };
+    this.next = function next() {
+      while(root) {
+        if(node) {
+          if(recurse && node.firstChild) {
+            node = node.firstChild
+          }else {
+            while(!node.nextSibling && node !== root) {
+              node = node.parentNode
+            }
+            if(node === root) {
+              root = it.next()
+            }else {
+              node = node.nextSibling
+            }
+          }
+        }else {
+          do {
+            node = root.firstChild;
+            if(!node) {
+              root = it.next()
+            }
+          }while(root && !node)
+        }
+        if(node && node.nodeType === 1) {
+          return node
+        }
+      }
+      return null
+    }
+  }
+  function ConditionIterator(it, condition) {
+    this.reset = function reset() {
+      it.reset()
+    };
+    this.next = function next() {
+      var n = it.next();
+      while(n && !condition(n)) {
+        n = it.next()
+      }
+      return n
+    }
+  }
+  function createNodenameFilter(it, name, namespaceResolver) {
+    var s = name.split(":", 2), namespace = namespaceResolver(s[0]), localName = s[1];
+    return new ConditionIterator(it, function(node) {
+      return node.localName === localName && node.namespaceURI === namespace
+    })
+  }
+  function createPredicateFilteredIterator(it, p, namespaceResolver) {
+    var nit = new NodeIterator, pit = createXPathPathIterator(nit, p, namespaceResolver), value = p.value;
+    if(value === undefined) {
+      return new ConditionIterator(it, function(node) {
+        nit.setNode(node);
+        pit.reset();
+        return pit.next()
+      })
+    }
+    return new ConditionIterator(it, function(node) {
+      nit.setNode(node);
+      pit.reset();
+      var n = pit.next();
+      return n && n.nodeValue === value
+    })
+  }
+  createXPathPathIterator = function createXPathPathIterator(it, xpath, namespaceResolver) {
+    var i, j, step, location, namespace, localName, prefix, p;
+    for(i = 0;i < xpath.steps.length;i += 1) {
+      step = xpath.steps[i];
+      location = step.location;
+      if(location === "") {
+        it = new AllChildElementIterator(it, false)
+      }else {
+        if(location[0] === "@") {
+          p = location.slice(1).split(":", 2);
+          it = new AttributeIterator(it, namespaceResolver(p[0]), p[1])
+        }else {
+          if(location !== ".") {
+            it = new AllChildElementIterator(it, false);
+            if(location.indexOf(":") !== -1) {
+              it = createNodenameFilter(it, location, namespaceResolver)
+            }
+          }
+        }
+      }
+      for(j = 0;j < step.predicates.length;j += 1) {
+        p = step.predicates[j];
+        it = createPredicateFilteredIterator(it, p, namespaceResolver)
+      }
+    }
+    return it
+  };
+  function fallback(node, xpath, namespaceResolver) {
+    var it = new NodeIterator, i, nodelist, parsedXPath, pos;
+    it.setNode(node);
+    parsedXPath = parseXPath(xpath);
+    it = createXPathPathIterator(it, parsedXPath, namespaceResolver);
+    nodelist = [];
+    i = it.next();
+    while(i) {
+      nodelist.push(i);
+      i = it.next()
+    }
+    return nodelist
+  }
+  function getODFElementsWithXPath(node, xpath, namespaceResolver) {
+    var doc = node.ownerDocument, nodes, elements = [], n = null;
+    if(!doc || !doc.evaluate || !n) {
+      elements = fallback(node, xpath, namespaceResolver)
+    }else {
+      nodes = doc.evaluate(xpath, node, namespaceResolver, XPathResult.UNORDERED_NODE_ITERATOR_TYPE, null);
+      n = nodes.iterateNext();
+      while(n !== null) {
+        if(n.nodeType === 1) {
+          elements.push(n)
+        }
+        n = nodes.iterateNext()
+      }
+    }
+    return elements
+  }
+  xmldom.XPath = function XPath() {
+    this.getODFElementsWithXPath = getODFElementsWithXPath
+  };
+  return xmldom.XPath
+}();
+odf.StyleInfo = function StyleInfo() {
+  var chartns = "urn:oasis:names:tc:opendocument:xmlns:chart:1.0", dbns = "urn:oasis:names:tc:opendocument:xmlns:database:1.0", dr3dns = "urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0", drawns = "urn:oasis:names:tc:opendocument:xmlns:drawing:1.0", fons = "urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0", formns = "urn:oasis:names:tc:opendocument:xmlns:form:1.0", numberns = "urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0", officens = "urn:oasis:names:tc:opendocument:xmlns:office:1.0", 
+  presentationns = "urn:oasis:names:tc:opendocument:xmlns:presentation:1.0", stylens = "urn:oasis:names:tc:opendocument:xmlns:style:1.0", svgns = "urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0", tablens = "urn:oasis:names:tc:opendocument:xmlns:table:1.0", textns = "urn:oasis:names:tc:opendocument:xmlns:text:1.0", elementstyles = {"text":[{ens:stylens, en:"tab-stop", ans:stylens, a:"leader-text-style"}, {ens:stylens, en:"drop-cap", ans:stylens, a:"style-name"}, {ens:textns, en:"notes-configuration", 
+  ans:textns, a:"citation-body-style-name"}, {ens:textns, en:"notes-configuration", ans:textns, a:"citation-style-name"}, {ens:textns, en:"a", ans:textns, a:"style-name"}, {ens:textns, en:"alphabetical-index", ans:textns, a:"style-name"}, {ens:textns, en:"linenumbering-configuration", ans:textns, a:"style-name"}, {ens:textns, en:"list-level-style-number", ans:textns, a:"style-name"}, {ens:textns, en:"ruby-text", ans:textns, a:"style-name"}, {ens:textns, en:"span", ans:textns, a:"style-name"}, {ens:textns, 
+  en:"a", ans:textns, a:"visited-style-name"}, {ens:stylens, en:"text-properties", ans:stylens, a:"text-line-through-text-style"}, {ens:textns, en:"alphabetical-index-source", ans:textns, a:"main-entry-style-name"}, {ens:textns, en:"index-entry-bibliography", ans:textns, a:"style-name"}, {ens:textns, en:"index-entry-chapter", ans:textns, a:"style-name"}, {ens:textns, en:"index-entry-link-end", ans:textns, a:"style-name"}, {ens:textns, en:"index-entry-link-start", ans:textns, a:"style-name"}, {ens:textns, 
+  en:"index-entry-page-number", ans:textns, a:"style-name"}, {ens:textns, en:"index-entry-span", ans:textns, a:"style-name"}, {ens:textns, en:"index-entry-tab-stop", ans:textns, a:"style-name"}, {ens:textns, en:"index-entry-text", ans:textns, a:"style-name"}, {ens:textns, en:"index-title-template", ans:textns, a:"style-name"}, {ens:textns, en:"list-level-style-bullet", ans:textns, a:"style-name"}, {ens:textns, en:"outline-level-style", ans:textns, a:"style-name"}], "paragraph":[{ens:drawns, en:"caption", 
+  ans:drawns, a:"text-style-name"}, {ens:drawns, en:"circle", ans:drawns, a:"text-style-name"}, {ens:drawns, en:"connector", ans:drawns, a:"text-style-name"}, {ens:drawns, en:"control", ans:drawns, a:"text-style-name"}, {ens:drawns, en:"custom-shape", ans:drawns, a:"text-style-name"}, {ens:drawns, en:"ellipse", ans:drawns, a:"text-style-name"}, {ens:drawns, en:"frame", ans:drawns, a:"text-style-name"}, {ens:drawns, en:"line", ans:drawns, a:"text-style-name"}, {ens:drawns, en:"measure", ans:drawns, 
+  a:"text-style-name"}, {ens:drawns, en:"path", ans:drawns, a:"text-style-name"}, {ens:drawns, en:"polygon", ans:drawns, a:"text-style-name"}, {ens:drawns, en:"polyline", ans:drawns, a:"text-style-name"}, {ens:drawns, en:"rect", ans:drawns, a:"text-style-name"}, {ens:drawns, en:"regular-polygon", ans:drawns, a:"text-style-name"}, {ens:officens, en:"annotation", ans:drawns, a:"text-style-name"}, {ens:formns, en:"column", ans:formns, a:"text-style-name"}, {ens:stylens, en:"style", ans:stylens, a:"next-style-name"}, 
+  {ens:tablens, en:"body", ans:tablens, a:"paragraph-style-name"}, {ens:tablens, en:"even-columns", ans:tablens, a:"paragraph-style-name"}, {ens:tablens, en:"even-rows", ans:tablens, a:"paragraph-style-name"}, {ens:tablens, en:"first-column", ans:tablens, a:"paragraph-style-name"}, {ens:tablens, en:"first-row", ans:tablens, a:"paragraph-style-name"}, {ens:tablens, en:"last-column", ans:tablens, a:"paragraph-style-name"}, {ens:tablens, en:"last-row", ans:tablens, a:"paragraph-style-name"}, {ens:tablens, 
+  en:"odd-columns", ans:tablens, a:"paragraph-style-name"}, {ens:tablens, en:"odd-rows", ans:tablens, a:"paragraph-style-name"}, {ens:textns, en:"notes-configuration", ans:textns, a:"default-style-name"}, {ens:textns, en:"alphabetical-index-entry-template", ans:textns, a:"style-name"}, {ens:textns, en:"bibliography-entry-template", ans:textns, a:"style-name"}, {ens:textns, en:"h", ans:textns, a:"style-name"}, {ens:textns, en:"illustration-index-entry-template", ans:textns, a:"style-name"}, {ens:textns, 
+  en:"index-source-style", ans:textns, a:"style-name"}, {ens:textns, en:"object-index-entry-template", ans:textns, a:"style-name"}, {ens:textns, en:"p", ans:textns, a:"style-name"}, {ens:textns, en:"table-index-entry-template", ans:textns, a:"style-name"}, {ens:textns, en:"table-of-content-entry-template", ans:textns, a:"style-name"}, {ens:textns, en:"table-index-entry-template", ans:textns, a:"style-name"}, {ens:textns, en:"user-index-entry-template", ans:textns, a:"style-name"}, {ens:stylens, en:"page-layout-properties", 
+  ans:stylens, a:"register-truth-ref-style-name"}], "chart":[{ens:chartns, en:"axis", ans:chartns, a:"style-name"}, {ens:chartns, en:"chart", ans:chartns, a:"style-name"}, {ens:chartns, en:"data-label", ans:chartns, a:"style-name"}, {ens:chartns, en:"data-point", ans:chartns, a:"style-name"}, {ens:chartns, en:"equation", ans:chartns, a:"style-name"}, {ens:chartns, en:"error-indicator", ans:chartns, a:"style-name"}, {ens:chartns, en:"floor", ans:chartns, a:"style-name"}, {ens:chartns, en:"footer", 
+  ans:chartns, a:"style-name"}, {ens:chartns, en:"grid", ans:chartns, a:"style-name"}, {ens:chartns, en:"legend", ans:chartns, a:"style-name"}, {ens:chartns, en:"mean-value", ans:chartns, a:"style-name"}, {ens:chartns, en:"plot-area", ans:chartns, a:"style-name"}, {ens:chartns, en:"regression-curve", ans:chartns, a:"style-name"}, {ens:chartns, en:"series", ans:chartns, a:"style-name"}, {ens:chartns, en:"stock-gain-marker", ans:chartns, a:"style-name"}, {ens:chartns, en:"stock-loss-marker", ans:chartns, 
+  a:"style-name"}, {ens:chartns, en:"stock-range-line", ans:chartns, a:"style-name"}, {ens:chartns, en:"subtitle", ans:chartns, a:"style-name"}, {ens:chartns, en:"title", ans:chartns, a:"style-name"}, {ens:chartns, en:"wall", ans:chartns, a:"style-name"}], "section":[{ens:textns, en:"alphabetical-index", ans:textns, a:"style-name"}, {ens:textns, en:"bibliography", ans:textns, a:"style-name"}, {ens:textns, en:"illustration-index", ans:textns, a:"style-name"}, {ens:textns, en:"index-title", ans:textns, 
+  a:"style-name"}, {ens:textns, en:"object-index", ans:textns, a:"style-name"}, {ens:textns, en:"section", ans:textns, a:"style-name"}, {ens:textns, en:"table-of-content", ans:textns, a:"style-name"}, {ens:textns, en:"table-index", ans:textns, a:"style-name"}, {ens:textns, en:"user-index", ans:textns, a:"style-name"}], "ruby":[{ens:textns, en:"ruby", ans:textns, a:"style-name"}], "table":[{ens:dbns, en:"query", ans:dbns, a:"style-name"}, {ens:dbns, en:"table-representation", ans:dbns, a:"style-name"}, 
+  {ens:tablens, en:"background", ans:tablens, a:"style-name"}, {ens:tablens, en:"table", ans:tablens, a:"style-name"}], "table-column":[{ens:dbns, en:"column", ans:dbns, a:"style-name"}, {ens:tablens, en:"table-column", ans:tablens, a:"style-name"}], "table-row":[{ens:dbns, en:"query", ans:dbns, a:"default-row-style-name"}, {ens:dbns, en:"table-representation", ans:dbns, a:"default-row-style-name"}, {ens:tablens, en:"table-row", ans:tablens, a:"style-name"}], "table-cell":[{ens:dbns, en:"column", 
+  ans:dbns, a:"default-cell-style-name"}, {ens:tablens, en:"table-column", ans:tablens, a:"default-cell-style-name"}, {ens:tablens, en:"table-row", ans:tablens, a:"default-cell-style-name"}, {ens:tablens, en:"body", ans:tablens, a:"style-name"}, {ens:tablens, en:"covered-table-cell", ans:tablens, a:"style-name"}, {ens:tablens, en:"even-columns", ans:tablens, a:"style-name"}, {ens:tablens, en:"covered-table-cell", ans:tablens, a:"style-name"}, {ens:tablens, en:"even-columns", ans:tablens, a:"style-name"}, 
+  {ens:tablens, en:"even-rows", ans:tablens, a:"style-name"}, {ens:tablens, en:"first-column", ans:tablens, a:"style-name"}, {ens:tablens, en:"first-row", ans:tablens, a:"style-name"}, {ens:tablens, en:"last-column", ans:tablens, a:"style-name"}, {ens:tablens, en:"last-row", ans:tablens, a:"style-name"}, {ens:tablens, en:"odd-columns", ans:tablens, a:"style-name"}, {ens:tablens, en:"odd-rows", ans:tablens, a:"style-name"}, {ens:tablens, en:"table-cell", ans:tablens, a:"style-name"}], "graphic":[{ens:dr3dns, 
+  en:"cube", ans:drawns, a:"style-name"}, {ens:dr3dns, en:"extrude", ans:drawns, a:"style-name"}, {ens:dr3dns, en:"rotate", ans:drawns, a:"style-name"}, {ens:dr3dns, en:"scene", ans:drawns, a:"style-name"}, {ens:dr3dns, en:"sphere", ans:drawns, a:"style-name"}, {ens:drawns, en:"caption", ans:drawns, a:"style-name"}, {ens:drawns, en:"circle", ans:drawns, a:"style-name"}, {ens:drawns, en:"connector", ans:drawns, a:"style-name"}, {ens:drawns, en:"control", ans:drawns, a:"style-name"}, {ens:drawns, en:"custom-shape", 
+  ans:drawns, a:"style-name"}, {ens:drawns, en:"ellipse", ans:drawns, a:"style-name"}, {ens:drawns, en:"frame", ans:drawns, a:"style-name"}, {ens:drawns, en:"g", ans:drawns, a:"style-name"}, {ens:drawns, en:"line", ans:drawns, a:"style-name"}, {ens:drawns, en:"measure", ans:drawns, a:"style-name"}, {ens:drawns, en:"page-thumbnail", ans:drawns, a:"style-name"}, {ens:drawns, en:"path", ans:drawns, a:"style-name"}, {ens:drawns, en:"polygon", ans:drawns, a:"style-name"}, {ens:drawns, en:"polyline", ans:drawns, 
+  a:"style-name"}, {ens:drawns, en:"rect", ans:drawns, a:"style-name"}, {ens:drawns, en:"regular-polygon", ans:drawns, a:"style-name"}, {ens:officens, en:"annotation", ans:drawns, a:"style-name"}], "presentation":[{ens:dr3dns, en:"cube", ans:presentationns, a:"style-name"}, {ens:dr3dns, en:"extrude", ans:presentationns, a:"style-name"}, {ens:dr3dns, en:"rotate", ans:presentationns, a:"style-name"}, {ens:dr3dns, en:"scene", ans:presentationns, a:"style-name"}, {ens:dr3dns, en:"sphere", ans:presentationns, 
+  a:"style-name"}, {ens:drawns, en:"caption", ans:presentationns, a:"style-name"}, {ens:drawns, en:"circle", ans:presentationns, a:"style-name"}, {ens:drawns, en:"connector", ans:presentationns, a:"style-name"}, {ens:drawns, en:"control", ans:presentationns, a:"style-name"}, {ens:drawns, en:"custom-shape", ans:presentationns, a:"style-name"}, {ens:drawns, en:"ellipse", ans:presentationns, a:"style-name"}, {ens:drawns, en:"frame", ans:presentationns, a:"style-name"}, {ens:drawns, en:"g", ans:presentationns, 
+  a:"style-name"}, {ens:drawns, en:"line", ans:presentationns, a:"style-name"}, {ens:drawns, en:"measure", ans:presentationns, a:"style-name"}, {ens:drawns, en:"page-thumbnail", ans:presentationns, a:"style-name"}, {ens:drawns, en:"path", ans:presentationns, a:"style-name"}, {ens:drawns, en:"polygon", ans:presentationns, a:"style-name"}, {ens:drawns, en:"polyline", ans:presentationns, a:"style-name"}, {ens:drawns, en:"rect", ans:presentationns, a:"style-name"}, {ens:drawns, en:"regular-polygon", 
+  ans:presentationns, a:"style-name"}, {ens:officens, en:"annotation", ans:presentationns, a:"style-name"}], "drawing-page":[{ens:drawns, en:"page", ans:drawns, a:"style-name"}, {ens:presentationns, en:"notes", ans:drawns, a:"style-name"}, {ens:stylens, en:"handout-master", ans:drawns, a:"style-name"}, {ens:stylens, en:"master-page", ans:drawns, a:"style-name"}], "list-style":[{ens:textns, en:"list", ans:textns, a:"style-name"}, {ens:textns, en:"numbered-paragraph", ans:textns, a:"style-name"}, {ens:textns, 
+  en:"list-item", ans:textns, a:"style-override"}, {ens:stylens, en:"style", ans:stylens, a:"list-style-name"}, {ens:stylens, en:"style", ans:stylens, a:"data-style-name"}, {ens:stylens, en:"style", ans:stylens, a:"percentage-data-style-name"}, {ens:presentationns, en:"date-time-decl", ans:stylens, a:"data-style-name"}, {ens:textns, en:"creation-date", ans:stylens, a:"data-style-name"}, {ens:textns, en:"creation-time", ans:stylens, a:"data-style-name"}, {ens:textns, en:"database-display", ans:stylens, 
+  a:"data-style-name"}, {ens:textns, en:"date", ans:stylens, a:"data-style-name"}, {ens:textns, en:"editing-duration", ans:stylens, a:"data-style-name"}, {ens:textns, en:"expression", ans:stylens, a:"data-style-name"}, {ens:textns, en:"meta-field", ans:stylens, a:"data-style-name"}, {ens:textns, en:"modification-date", ans:stylens, a:"data-style-name"}, {ens:textns, en:"modification-time", ans:stylens, a:"data-style-name"}, {ens:textns, en:"print-date", ans:stylens, a:"data-style-name"}, {ens:textns, 
+  en:"print-time", ans:stylens, a:"data-style-name"}, {ens:textns, en:"table-formula", ans:stylens, a:"data-style-name"}, {ens:textns, en:"time", ans:stylens, a:"data-style-name"}, {ens:textns, en:"user-defined", ans:stylens, a:"data-style-name"}, {ens:textns, en:"user-field-get", ans:stylens, a:"data-style-name"}, {ens:textns, en:"user-field-input", ans:stylens, a:"data-style-name"}, {ens:textns, en:"variable-get", ans:stylens, a:"data-style-name"}, {ens:textns, en:"variable-input", ans:stylens, 
+  a:"data-style-name"}, {ens:textns, en:"variable-set", ans:stylens, a:"data-style-name"}], "data":[{ens:stylens, en:"style", ans:stylens, a:"data-style-name"}, {ens:stylens, en:"style", ans:stylens, a:"percentage-data-style-name"}, {ens:presentationns, en:"date-time-decl", ans:stylens, a:"data-style-name"}, {ens:textns, en:"creation-date", ans:stylens, a:"data-style-name"}, {ens:textns, en:"creation-time", ans:stylens, a:"data-style-name"}, {ens:textns, en:"database-display", ans:stylens, a:"data-style-name"}, 
+  {ens:textns, en:"date", ans:stylens, a:"data-style-name"}, {ens:textns, en:"editing-duration", ans:stylens, a:"data-style-name"}, {ens:textns, en:"expression", ans:stylens, a:"data-style-name"}, {ens:textns, en:"meta-field", ans:stylens, a:"data-style-name"}, {ens:textns, en:"modification-date", ans:stylens, a:"data-style-name"}, {ens:textns, en:"modification-time", ans:stylens, a:"data-style-name"}, {ens:textns, en:"print-date", ans:stylens, a:"data-style-name"}, {ens:textns, en:"print-time", 
+  ans:stylens, a:"data-style-name"}, {ens:textns, en:"table-formula", ans:stylens, a:"data-style-name"}, {ens:textns, en:"time", ans:stylens, a:"data-style-name"}, {ens:textns, en:"user-defined", ans:stylens, a:"data-style-name"}, {ens:textns, en:"user-field-get", ans:stylens, a:"data-style-name"}, {ens:textns, en:"user-field-input", ans:stylens, a:"data-style-name"}, {ens:textns, en:"variable-get", ans:stylens, a:"data-style-name"}, {ens:textns, en:"variable-input", ans:stylens, a:"data-style-name"}, 
+  {ens:textns, en:"variable-set", ans:stylens, a:"data-style-name"}], "page-layout":[{ens:presentationns, en:"notes", ans:stylens, a:"page-layout-name"}, {ens:stylens, en:"handout-master", ans:stylens, a:"page-layout-name"}, {ens:stylens, en:"master-page", ans:stylens, a:"page-layout-name"}]}, elements;
+  function canElementHaveStyle(family, element) {
+    var elname = elements[element.localName], elns = elname && elname[element.namespaceURI], length = elns ? elns.length : 0, i;
+    return elns && elns.length > 0
+  }
+  function getStyleRef(family, element) {
+    var elname = elements[element.localName], elns = elname && elname[element.namespaceURI], length = elns ? elns.length : 0, i, attr;
+    for(i = 0;i < length;i += 1) {
+      attr = element.getAttributeNS(elns[i].ns, elns[i].localname)
+    }
+    return null
+  }
+  function getUsedStylesForAutomatic(element, keys) {
+    var elname = elements[element.localName], elns = elname && elname[element.namespaceURI], length = elns ? elns.length : 0, i, attr, group, map, e;
+    for(i = 0;i < length;i += 1) {
+      attr = element.getAttributeNS(elns[i].ns, elns[i].localname);
+      if(attr) {
+        group = elns[i].keygroup;
+        map = keys[group];
+        if(!map) {
+          map = keys[group] = {}
+        }
+        map[attr] = 1
+      }
+    }
+    i = element.firstChild;
+    while(i) {
+      if(i.nodeType === 1) {
+        e = i;
+        getUsedStylesForAutomatic(e, keys)
+      }
+      i = i.nextSibling
+    }
+  }
+  function inverse(elementstyles) {
+    var keyname, i, list, item, l, elements = {}, map, array;
+    for(keyname in elementstyles) {
+      if(elementstyles.hasOwnProperty(keyname)) {
+        list = elementstyles[keyname];
+        l = list.length;
+        for(i = 0;i < l;i += 1) {
+          item = list[i];
+          map = elements[item.en] = elements[item.en] || {};
+          array = map[item.ens] = map[item.ens] || [];
+          array.push({ns:item.ans, localname:item.a, keygroup:keyname})
+        }
+      }
+    }
+    return elements
+  }
+  this.UsedKeysList = function(element) {
+    var usedKeys = {};
+    this.uses = function(element) {
+      var localName = element.localName, name = element.getAttributeNS(drawns, "name") || element.getAttributeNS(stylens, "name"), keyName, map;
+      if(localName === "style") {
+        keyName = element.getAttributeNS(stylens, "family")
+      }else {
+        if(element.namespaceURI === numberns) {
+          keyName = "data"
+        }else {
+          keyName = localName
+        }
+      }
+      map = usedKeys[keyName];
+      return map ? map[name] > 0 : false
+    };
+    getUsedStylesForAutomatic(element, usedKeys)
+  };
+  this.canElementHaveStyle = canElementHaveStyle;
+  elements = inverse(elementstyles)
+};
+odf.Style2CSS = function Style2CSS() {
+  var xlinkns = "http://www.w3.org/1999/xlink", drawns = "urn:oasis:names:tc:opendocument:xmlns:drawing:1.0", fons = "urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0", officens = "urn:oasis:names:tc:opendocument:xmlns:office:1.0", presentationns = "urn:oasis:names:tc:opendocument:xmlns:presentation:1.0", stylens = "urn:oasis:names:tc:opendocument:xmlns:style:1.0", svgns = "urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0", tablens = "urn:oasis:names:tc:opendocument:xmlns:table:1.0", 
+  textns = "urn:oasis:names:tc:opendocument:xmlns:text:1.0", namespaces = {"draw":drawns, "fo":fons, "office":officens, "presentation":presentationns, "style":stylens, "svg":svgns, "table":tablens, "text":textns, "xlink":xlinkns}, familynamespaceprefixes = {"graphic":"draw", "paragraph":"text", "presentation":"presentation", "ruby":"text", "section":"text", "table":"table", "table-cell":"table", "table-column":"table", "table-row":"table", "text":"text", "list":"text"}, familytagnames = {"graphic":["circle", 
+  "connected", "control", "custom-shape", "ellipse", "frame", "g", "line", "measure", "page", "page-thumbnail", "path", "polygon", "polyline", "rect", "regular-polygon"], "paragraph":["alphabetical-index-entry-template", "h", "illustration-index-entry-template", "index-source-style", "object-index-entry-template", "p", "table-index-entry-template", "table-of-content-entry-template", "user-index-entry-template"], "presentation":["caption", "circle", "connector", "control", "custom-shape", "ellipse", 
+  "frame", "g", "line", "measure", "page-thumbnail", "path", "polygon", "polyline", "rect", "regular-polygon"], "ruby":["ruby", "ruby-text"], "section":["alphabetical-index", "bibliography", "illustration-index", "index-title", "object-index", "section", "table-of-content", "table-index", "user-index"], "table":["background", "table"], "table-cell":["body", "covered-table-cell", "even-columns", "even-rows", "first-column", "first-row", "last-column", "last-row", "odd-columns", "odd-rows", "table-cell"], 
+  "table-column":["table-column"], "table-row":["table-row"], "text":["a", "index-entry-chapter", "index-entry-link-end", "index-entry-link-start", "index-entry-page-number", "index-entry-span", "index-entry-tab-stop", "index-entry-text", "index-title-template", "linenumbering-configuration", "list-level-style-number", "list-level-style-bullet", "outline-level-style", "span"], "list":["list-item"]}, textPropertySimpleMapping = [[fons, "color", "color"], [fons, "background-color", "background-color"], 
+  [fons, "font-weight", "font-weight"], [fons, "font-style", "font-style"], [fons, "font-size", "font-size"]], bgImageSimpleMapping = [[stylens, "repeat", "background-repeat"]], paragraphPropertySimpleMapping = [[fons, "background-color", "background-color"], [fons, "text-align", "text-align"], [fons, "padding-left", "padding-left"], [fons, "padding-right", "padding-right"], [fons, "padding-top", "padding-top"], [fons, "padding-bottom", "padding-bottom"], [fons, "border-left", "border-left"], [fons, 
+  "border-right", "border-right"], [fons, "border-top", "border-top"], [fons, "border-bottom", "border-bottom"], [fons, "margin-left", "margin-left"], [fons, "margin-right", "margin-right"], [fons, "margin-top", "margin-top"], [fons, "margin-bottom", "margin-bottom"], [fons, "border", "border"]], graphicPropertySimpleMapping = [[drawns, "fill-color", "background-color"], [drawns, "fill", "background"], [fons, "min-height", "min-height"], [drawns, "stroke", "border"], [svgns, "stroke-color", "border-color"]], 
+  tablecellPropertySimpleMapping = [[fons, "background-color", "background-color"], [fons, "border-left", "border-left"], [fons, "border-right", "border-right"], [fons, "border-top", "border-top"], [fons, "border-bottom", "border-bottom"]];
+  function namespaceResolver(prefix) {
+    return namespaces[prefix] || null
+  }
+  function getStyleMap(doc, stylesnode) {
+    var stylemap = {}, node, name, family, map;
+    if(!stylesnode) {
+      return stylemap
+    }
+    node = stylesnode.firstChild;
+    while(node) {
+      if(node.namespaceURI === stylens && node.localName === "style") {
+        family = node.getAttributeNS(stylens, "family")
+      }else {
+        if(node.namespaceURI === textns && node.localName === "list-style") {
+          family = "list"
+        }
+      }
+      name = family && node.getAttributeNS && node.getAttributeNS(stylens, "name");
+      if(name) {
+        if(!stylemap[family]) {
+          stylemap[family] = {}
+        }
+        stylemap[family][name] = node
+      }
+      node = node.nextSibling
+    }
+    return stylemap
+  }
+  function findStyle(stylestree, name) {
+    if(!name || !stylestree) {
+      return null
+    }
+    if(stylestree[name]) {
+      return stylestree[name]
+    }
+    var derivedStyles = stylestree.derivedStyles, n, style;
+    for(n in stylestree) {
+      if(stylestree.hasOwnProperty(n)) {
+        style = findStyle(stylestree[n].derivedStyles, name);
+        if(style) {
+          return style
+        }
+      }
+    }
+    return null
+  }
+  function addStyleToStyleTree(stylename, stylesmap, stylestree) {
+    var style = stylesmap[stylename], parentname, parentstyle;
+    if(!style) {
+      return
+    }
+    parentname = style.getAttributeNS(stylens, "parent-style-name");
+    parentstyle = null;
+    if(parentname) {
+      parentstyle = findStyle(stylestree, parentname);
+      if(!parentstyle && stylesmap[parentname]) {
+        addStyleToStyleTree(parentname, stylesmap, stylestree);
+        parentstyle = stylesmap[parentname];
+        stylesmap[parentname] = null
+      }
+    }
+    if(parentstyle) {
+      if(!parentstyle.derivedStyles) {
+        parentstyle.derivedStyles = {}
+      }
+      parentstyle.derivedStyles[stylename] = style
+    }else {
+      stylestree[stylename] = style
+    }
+  }
+  function addStyleMapToStyleTree(stylesmap, stylestree) {
+    var name;
+    for(name in stylesmap) {
+      if(stylesmap.hasOwnProperty(name)) {
+        addStyleToStyleTree(name, stylesmap, stylestree);
+        stylesmap[name] = null
+      }
+    }
+  }
+  function createSelector(family, name) {
+    var prefix = familynamespaceprefixes[family], namepart, selector = "", first = true;
+    if(prefix === null) {
+      return null
+    }
+    namepart = "[" + prefix + '|style-name="' + name + '"]';
+    if(prefix === "presentation") {
+      prefix = "draw";
+      namepart = '[presentation|style-name="' + name + '"]'
+    }
+    return prefix + "|" + familytagnames[family].join(namepart + "," + prefix + "|") + namepart
+  }
+  function getSelectors(family, name, node) {
+    var selectors = [], n, ss, s;
+    selectors.push(createSelector(family, name));
+    for(n in node.derivedStyles) {
+      if(node.derivedStyles.hasOwnProperty(n)) {
+        ss = getSelectors(family, n, node.derivedStyles[n]);
+        for(s in ss) {
+          if(ss.hasOwnProperty(s)) {
+            selectors.push(ss[s])
+          }
+        }
+      }
+    }
+    return selectors
+  }
+  function getDirectChild(node, ns, name) {
+    if(!node) {
+      return null
+    }
+    var c = node.firstChild, e;
+    while(c) {
+      if(c.namespaceURI === ns && c.localName === name) {
+        e = c;
+        return e
+      }
+      c = c.nextSibling
+    }
+    return null
+  }
+  function applySimpleMapping(props, mapping) {
+    var rule = "", r, value;
+    for(r in mapping) {
+      if(mapping.hasOwnProperty(r)) {
+        r = mapping[r];
+        value = props.getAttributeNS(r[0], r[1]);
+        if(value) {
+          rule += r[2] + ":" + value + ";"
+        }
+      }
+    }
+    return rule
+  }
+  function getFontDeclaration(name) {
+    return'"' + name + '"'
+  }
+  function getTextProperties(props) {
+    var rule = "", value;
+    rule += applySimpleMapping(props, textPropertySimpleMapping);
+    value = props.getAttributeNS(stylens, "text-underline-style");
+    if(value === "solid") {
+      rule += "text-decoration: underline;"
+    }
+    value = props.getAttributeNS(stylens, "font-name");
+    if(value) {
+      value = getFontDeclaration(value);
+      if(value) {
+        rule += "font-family: " + value + ";"
+      }
+    }
+    return rule
+  }
+  function getParagraphProperties(props) {
+    var rule = "", imageProps, url, element;
+    rule += applySimpleMapping(props, paragraphPropertySimpleMapping);
+    imageProps = props.getElementsByTagNameNS(stylens, "background-image");
+    if(imageProps.length > 0) {
+      url = imageProps.item(0).getAttributeNS(xlinkns, "href");
+      if(url) {
+        rule += "background-image: url('odfkit:" + url + "');";
+        element = imageProps.item(0);
+        rule += applySimpleMapping(element, bgImageSimpleMapping)
+      }
+    }
+    return rule
+  }
+  function getGraphicProperties(props) {
+    var rule = "";
+    rule += applySimpleMapping(props, graphicPropertySimpleMapping);
+    return rule
+  }
+  function getTableCellProperties(props) {
+    var rule = "";
+    rule += applySimpleMapping(props, tablecellPropertySimpleMapping);
+    return rule
+  }
+  function addStyleRule(sheet, family, name, node) {
+    var selectors = getSelectors(family, name, node), selector = selectors.join(","), rule = "", properties = getDirectChild(node, stylens, "text-properties");
+    if(properties) {
+      rule += getTextProperties(properties)
+    }
+    properties = getDirectChild(node, stylens, "paragraph-properties");
+    if(properties) {
+      rule += getParagraphProperties(properties)
+    }
+    properties = getDirectChild(node, stylens, "graphic-properties");
+    if(properties) {
+      rule += getGraphicProperties(properties)
+    }
+    properties = getDirectChild(node, stylens, "table-cell-properties");
+    if(properties) {
+      rule += getTableCellProperties(properties)
+    }
+    if(rule.length === 0) {
+      return
+    }
+    rule = selector + "{" + rule + "}";
+    try {
+      sheet.insertRule(rule, sheet.cssRules.length)
+    }catch(e) {
+      throw e;
+    }
+  }
+  function getNumberRule(node) {
+    var style = node.getAttributeNS(stylens, "num-format"), suffix = node.getAttributeNS(stylens, "num-suffix"), prefix = node.getAttributeNS(stylens, "num-prefix"), rule = "", stylemap = {1:"decimal", "a":"lower-latin", "A":"upper-latin", "i":"lower-roman", "I":"upper-roman"}, content = "";
+    content = prefix || "";
+    if(stylemap.hasOwnProperty(style)) {
+      content += " counter(list, " + stylemap[style] + ")"
+    }else {
+      if(style) {
+        content += "'" + style + "';"
+      }else {
+        content += " ''"
+      }
+    }
+    if(suffix) {
+      content += " '" + suffix + "'"
+    }
+    rule = "content: " + content + ";";
+    return rule
+  }
+  function getImageRule(node) {
+    var rule = "content: none;";
+    return rule
+  }
+  function getBulletRule(node) {
+    var rule = "", bulletChar = node.getAttributeNS(textns, "bullet-char");
+    return"content: '" + bulletChar + "';"
+  }
+  function addListStyleRule(sheet, name, node, itemrule) {
+    var selector = 'text|list[text|style-name="' + name + '"]', level = node.getAttributeNS(textns, "level"), rule = "";
+    level = level && parseInt(level, 10);
+    while(level > 1) {
+      selector += " > text|list-item > text|list";
+      level -= 1
+    }
+    selector += " > list-item:before";
+    rule = itemrule;
+    rule = selector + "{" + rule + "}";
+    try {
+      sheet.insertRule(rule, sheet.cssRules.length)
+    }catch(e) {
+      throw e;
+    }
+  }
+  function addListStyleRules(sheet, name, node) {
+    var n = node.firstChild, e, itemrule;
+    while(n) {
+      if(n.namespaceURI === textns) {
+        e = n;
+        if(n.localName === "list-level-style-number") {
+          itemrule = getNumberRule(e);
+          addListStyleRule(sheet, name, e, itemrule)
+        }else {
+          if(n.localName === "list-level-style-image") {
+            itemrule = getImageRule(e);
+            addListStyleRule(sheet, name, e, itemrule)
+          }else {
+            if(n.localName === "list-level-style-bullet") {
+              itemrule = getBulletRule(e);
+              addListStyleRule(sheet, name, e, itemrule)
+            }
+          }
+        }
+      }
+      n = n.nextSibling
+    }
+  }
+  function addRule(sheet, family, name, node) {
+    if(family === "list") {
+      addListStyleRules(sheet, name, node)
+    }else {
+      addStyleRule(sheet, family, name, node)
+    }
+  }
+  function addRules(sheet, family, name, node) {
+    addRule(sheet, family, name, node);
+    var n;
+    for(n in node.derivedStyles) {
+      if(node.derivedStyles.hasOwnProperty(n)) {
+        addRules(sheet, family, n, node.derivedStyles[n])
+      }
+    }
+  }
+  this.namespaces = namespaces;
+  this.namespaceResolver = namespaceResolver;
+  this.namespaceResolver.lookupNamespaceURI = this.namespaceResolver;
+  this.style2css = function(stylesheet, styles, autostyles) {
+    var doc, prefix, styletree, tree, name, rule, family, stylenodes, styleautonodes;
+    while(stylesheet.cssRules.length) {
+      stylesheet.deleteRule(stylesheet.cssRules.length - 1)
+    }
+    doc = null;
+    if(styles) {
+      doc = styles.ownerDocument
+    }
+    if(autostyles) {
+      doc = autostyles.ownerDocument
+    }
+    if(!doc) {
+      return
+    }
+    for(prefix in namespaces) {
+      if(namespaces.hasOwnProperty(prefix)) {
+        rule = "@namespace " + prefix + " url(" + namespaces[prefix] + ");";
+        try {
+          stylesheet.insertRule(rule, stylesheet.cssRules.length)
+        }catch(e) {
+        }
+      }
+    }
+    stylenodes = getStyleMap(doc, styles);
+    styleautonodes = getStyleMap(doc, autostyles);
+    styletree = {};
+    for(family in familynamespaceprefixes) {
+      if(familynamespaceprefixes.hasOwnProperty(family)) {
+        tree = styletree[family] = {};
+        addStyleMapToStyleTree(stylenodes[family], tree);
+        addStyleMapToStyleTree(styleautonodes[family], tree);
+        for(name in tree) {
+          if(tree.hasOwnProperty(name)) {
+            addRules(stylesheet, family, name, tree[name])
+          }
+        }
+      }
+    }
+  }
+};
+runtime.loadClass("core.Base64");
+runtime.loadClass("xmldom.XPath");
+runtime.loadClass("odf.Style2CSS");
+odf.FontLoader = function() {
+  var style2CSS = new odf.Style2CSS, xpath = new xmldom.XPath, base64 = new core.Base64;
+  function getEmbeddedFontDeclarations(fontFaceDecls) {
+    var decls = {}, fonts, i, font, name, uris, href;
+    if(!fontFaceDecls) {
+      return decls
+    }
+    fonts = xpath.getODFElementsWithXPath(fontFaceDecls, "style:font-face[svg:font-face-src]", style2CSS.namespaceResolver);
+    for(i = 0;i < fonts.length;i += 1) {
+      font = fonts[i];
+      name = font.getAttributeNS(style2CSS.namespaces["style"], "name");
+      uris = xpath.getODFElementsWithXPath(font, "svg:font-face-src/svg:font-face-uri", style2CSS.namespaceResolver);
+      if(uris.length > 0) {
+        href = uris[0].getAttributeNS(style2CSS.namespaces["xlink"], "href");
+        decls[name] = {href:href}
+      }
+    }
+    return decls
+  }
+  function addFontToCSS(name, font, fontdata, stylesheet) {
+    stylesheet = document.styleSheets[0];
+    var rule = '@font-face { font-family: "' + name + '"; src: ' + "url(data:application/x-font-ttf;charset=binary;base64," + base64.convertUTF8ArrayToBase64(fontdata) + ') format("truetype"); }';
+    try {
+      stylesheet.insertRule(rule, stylesheet.cssRules.length)
+    }catch(e) {
+      runtime.log("Problem inserting rule in CSS: " + rule)
+    }
+  }
+  function loadFontIntoCSS(embeddedFontDeclarations, zip, pos, stylesheet, callback) {
+    var name, i = 0, n;
+    for(n in embeddedFontDeclarations) {
+      if(embeddedFontDeclarations.hasOwnProperty(n)) {
+        if(i === pos) {
+          name = n
+        }
+        i += 1
+      }
+    }
+    if(!name) {
+      return callback()
+    }
+    zip.load(embeddedFontDeclarations[name].href, function(err, fontdata) {
+      if(err) {
+        runtime.log(err)
+      }else {
+        addFontToCSS(name, embeddedFontDeclarations[name], fontdata, stylesheet)
+      }
+      return loadFontIntoCSS(embeddedFontDeclarations, zip, pos + 1, stylesheet, callback)
+    })
+  }
+  function loadFontsIntoCSS(embeddedFontDeclarations, zip, stylesheet) {
+    loadFontIntoCSS(embeddedFontDeclarations, zip, 0, stylesheet, function() {
+    })
+  }
+  odf.FontLoader = function FontLoader() {
+    var self = this;
+    this.loadFonts = function(fontFaceDecls, zip, stylesheet) {
+      var embeddedFontDeclarations = getEmbeddedFontDeclarations(fontFaceDecls);
+      loadFontsIntoCSS(embeddedFontDeclarations, zip, stylesheet)
+    }
+  };
+  return odf.FontLoader
+}();
+runtime.loadClass("core.Base64");
+runtime.loadClass("core.Zip");
+runtime.loadClass("xmldom.LSSerializer");
+runtime.loadClass("odf.StyleInfo");
+runtime.loadClass("odf.Style2CSS");
+runtime.loadClass("odf.FontLoader");
+odf.OdfContainer = function() {
+  var styleInfo = new odf.StyleInfo, style2CSS = new odf.Style2CSS, namespaces = style2CSS.namespaces, officens = "urn:oasis:names:tc:opendocument:xmlns:office:1.0", manifestns = "urn:oasis:names:tc:opendocument:xmlns:manifest:1.0", nodeorder = ["meta", "settings", "scripts", "font-face-decls", "styles", "automatic-styles", "master-styles", "body"], base64 = new core.Base64, fontLoader = new odf.FontLoader, partMimetypes = {};
+  function getDirectChild(node, ns, name) {
+    node = node ? node.firstChild : null;
+    while(node) {
+      if(node.localName === name && node.namespaceURI === ns) {
+        return node
+      }
+      node = node.nextSibling
+    }
+    return null
+  }
+  function getNodePosition(child) {
+    var childpos = 0, i, l = nodeorder.length;
+    for(i = 0;i < l;i += 1) {
+      if(child.namespaceURI === officens && child.localName === nodeorder[i]) {
+        return i
+      }
+    }
+    return-1
+  }
+  function OdfNodeFilter(odfroot, usedStylesElement) {
+    var automaticStyles = odfroot.automaticStyles, usedKeysList;
+    if(usedStylesElement) {
+      usedKeysList = new styleInfo.UsedKeysList(usedStylesElement)
+    }
+    this.acceptNode = function(node) {
+      var styleName, styleFamily, result;
+      if(node.namespaceURI === "http://www.w3.org/1999/xhtml") {
+        result = 3
+      }else {
+        if(usedKeysList && node.parentNode === automaticStyles && node.nodeType === 1) {
+          if(usedKeysList.uses(node)) {
+            result = 1
+          }else {
+            result = 2
+          }
+        }else {
+          result = 1
+        }
+      }
+      return result
+    }
+  }
+  function setChild(node, child) {
+    if(!child) {
+      return
+    }
+    var childpos = getNodePosition(child), pos, c = node.firstChild;
+    if(childpos === -1) {
+      return
+    }
+    while(c) {
+      pos = getNodePosition(c);
+      if(pos !== -1 && pos > childpos) {
+        break
+      }
+      c = c.nextSibling
+    }
+    node.insertBefore(child, c)
+  }
+  function ODFElement() {
+  }
+  function ODFDocumentElement(odfcontainer) {
+    this.OdfContainer = odfcontainer
+  }
+  ODFDocumentElement.prototype = new ODFElement;
+  ODFDocumentElement.prototype.constructor = ODFDocumentElement;
+  ODFDocumentElement.namespaceURI = officens;
+  ODFDocumentElement.localName = "document";
+  function OdfPart(name, container, zip) {
+    var self = this, privatedata;
+    this.size = 0;
+    this.type = null;
+    this.name = name;
+    this.container = container;
+    this.url = null;
+    this.mimetype = null;
+    this.document = null;
+    this.onreadystatechange = null;
+    this.onchange = null;
+    this.EMPTY = 0;
+    this.LOADING = 1;
+    this.DONE = 2;
+    this.state = this.EMPTY;
+    this.load = function() {
+      var mimetype = partMimetypes[name];
+      this.mimetype = mimetype;
+      zip.loadAsDataURL(name, mimetype, function(err, url) {
+        self.url = url;
+        if(self.onchange) {
+          self.onchange(self)
+        }
+        if(self.onstatereadychange) {
+          self.onstatereadychange(self)
+        }
+      })
+    };
+    this.abort = function() {
+    }
+  }
+  OdfPart.prototype.load = function() {
+  };
+  OdfPart.prototype.getUrl = function() {
+    if(this.data) {
+      return"data:;base64," + base64.toBase64(this.data)
+    }
+    return null
+  };
+  function OdfPartList(odfcontainer) {
+    var self = this;
+    this.length = 0;
+    this.item = function(index) {
+    }
+  }
+  odf.OdfContainer = function OdfContainer(url, onstatereadychange) {
+    var self = this, zip = null, contentXmlCompletelyLoaded = false;
+    this.onstatereadychange = onstatereadychange;
+    this.onchange = null;
+    this.state = null;
+    this.rootElement = null;
+    this.parts = null;
+    function removeProcessingInstructions(element) {
+      var n = element.firstChild, next, e;
+      while(n) {
+        next = n.nextSibling;
+        if(n.nodeType === 1) {
+          e = n;
+          removeProcessingInstructions(e)
+        }else {
+          if(n.nodeType === 7) {
+            element.removeChild(n)
+          }
+        }
+        n = next
+      }
+    }
+    function importRootNode(xmldoc) {
+      var doc = self.rootElement.ownerDocument, node;
+      if(xmldoc) {
+        removeProcessingInstructions(xmldoc.documentElement);
+        try {
+          node = doc.importNode(xmldoc.documentElement, true)
+        }catch(e) {
+        }
+      }
+      return node
+    }
+    function setState(state) {
+      self.state = state;
+      if(self.onchange) {
+        self.onchange(self)
+      }
+      if(self.onstatereadychange) {
+        self.onstatereadychange(self)
+      }
+    }
+    function handleFlatXml(xmldoc) {
+      var root = importRootNode(xmldoc);
+      if(!root || root.localName !== "document" || root.namespaceURI !== officens) {
+        setState(OdfContainer.INVALID);
+        return
+      }
+      self.rootElement = root;
+      root.fontFaceDecls = getDirectChild(root, officens, "font-face-decls");
+      root.styles = getDirectChild(root, officens, "styles");
+      root.automaticStyles = getDirectChild(root, officens, "automatic-styles");
+      root.masterStyles = getDirectChild(root, officens, "master-styles");
+      root.body = getDirectChild(root, officens, "body");
+      root.meta = getDirectChild(root, officens, "meta");
+      setState(OdfContainer.DONE)
+    }
+    function handleStylesXml(xmldoc) {
+      var node = importRootNode(xmldoc), root = self.rootElement;
+      if(!node || node.localName !== "document-styles" || node.namespaceURI !== officens) {
+        setState(OdfContainer.INVALID);
+        return
+      }
+      root.fontFaceDecls = getDirectChild(node, officens, "font-face-decls");
+      setChild(root, root.fontFaceDecls);
+      root.styles = getDirectChild(node, officens, "styles");
+      setChild(root, root.styles);
+      root.automaticStyles = getDirectChild(node, officens, "automatic-styles");
+      setChild(root, root.automaticStyles);
+      root.masterStyles = getDirectChild(node, officens, "master-styles");
+      setChild(root, root.masterStyles);
+      fontLoader.loadFonts(root.fontFaceDecls, zip, null)
+    }
+    function handleContentXml(xmldoc) {
+      var node = importRootNode(xmldoc), root, automaticStyles, fontFaceDecls, c;
+      if(!node || node.localName !== "document-content" || node.namespaceURI !== officens) {
+        setState(OdfContainer.INVALID);
+        return
+      }
+      root = self.rootElement;
+      fontFaceDecls = getDirectChild(node, officens, "font-face-decls");
+      if(root.fontFaceDecls && fontFaceDecls) {
+        c = fontFaceDecls.firstChild;
+        while(c) {
+          root.fontFaceDecls.appendChild(c);
+          c = fontFaceDecls.firstChild
+        }
+      }else {
+        if(fontFaceDecls) {
+          root.fontFaceDecls = fontFaceDecls;
+          setChild(root, fontFaceDecls)
+        }
+      }
+      automaticStyles = getDirectChild(node, officens, "automatic-styles");
+      if(root.automaticStyles && automaticStyles) {
+        c = automaticStyles.firstChild;
+        while(c) {
+          root.automaticStyles.appendChild(c);
+          c = automaticStyles.firstChild
+        }
+      }else {
+        if(automaticStyles) {
+          root.automaticStyles = automaticStyles;
+          setChild(root, automaticStyles)
+        }
+      }
+      root.body = getDirectChild(node, officens, "body");
+      setChild(root, root.body)
+    }
+    function handleMetaXml(xmldoc) {
+      var node = importRootNode(xmldoc), root;
+      if(!node || node.localName !== "document-meta" || node.namespaceURI !== officens) {
+        return
+      }
+      root = self.rootElement;
+      root.meta = getDirectChild(node, officens, "meta");
+      setChild(root, root.meta)
+    }
+    function handleSettingsXml(xmldoc) {
+      var node = importRootNode(xmldoc), root;
+      if(!node || node.localName !== "document-settings" || node.namespaceURI !== officens) {
+        return
+      }
+      root = self.rootElement;
+      root.settings = getDirectChild(node, officens, "settings");
+      setChild(root, root.settings)
+    }
+    function handleManifestXml(xmldoc) {
+      var node = importRootNode(xmldoc), root, n;
+      if(!node || node.localName !== "manifest" || node.namespaceURI !== manifestns) {
+        return
+      }
+      root = self.rootElement;
+      root.manifest = node;
+      n = root.manifest.firstChild;
+      while(n) {
+        if(n.nodeType === 1 && n.localName === "file-entry" && n.namespaceURI === manifestns) {
+          partMimetypes[n.getAttributeNS(manifestns, "full-path")] = n.getAttributeNS(manifestns, "media-type")
+        }
+        n = n.nextSibling
+      }
+    }
+    function getContentXmlNode(callback) {
+      var handler = {rootElementReady:function(err, rootxml, done) {
+        contentXmlCompletelyLoaded = err || done;
+        if(err) {
+          return callback(err, null)
+        }
+        var parser = new DOMParser;
+        rootxml = parser.parseFromString(rootxml, "text/xml");
+        callback(null, rootxml)
+      }, bodyChildElementsReady:function(err, nodes, done) {
+      }};
+      zip.loadContentXmlAsFragments("content.xml", handler)
+    }
+    function getXmlNode(filepath, callback) {
+      zip.loadAsDOM(filepath, callback)
+    }
+    function loadComponents() {
+      getXmlNode("styles.xml", function(err, xmldoc) {
+        handleStylesXml(xmldoc);
+        if(self.state === OdfContainer.INVALID) {
+          return
+        }
+        getXmlNode("content.xml", function(err, xmldoc) {
+          handleContentXml(xmldoc);
+          if(self.state === OdfContainer.INVALID) {
+            return
+          }
+          getXmlNode("meta.xml", function(err, xmldoc) {
+            handleMetaXml(xmldoc);
+            if(self.state === OdfContainer.INVALID) {
+              return
+            }
+            getXmlNode("settings.xml", function(err, xmldoc) {
+              if(xmldoc) {
+                handleSettingsXml(xmldoc)
+              }
+              getXmlNode("META-INF/manifest.xml", function(err, xmldoc) {
+                if(xmldoc) {
+                  handleManifestXml(xmldoc)
+                }
+                if(self.state !== OdfContainer.INVALID) {
+                  setState(OdfContainer.DONE)
+                }
+              })
+            })
+          })
+        })
+      })
+    }
+    function documentElement(name, map) {
+      var s = "", i;
+      for(i in map) {
+        if(map.hasOwnProperty(i)) {
+          s += " xmlns:" + i + '="' + map[i] + '"'
+        }
+      }
+      return'<?xml version="1.0" encoding="UTF-8"?><office:' + name + " " + s + ' office:version="1.2">'
+    }
+    function serializeMetaXml() {
+      var nsmap = style2CSS.namespaces, serializer = new xmldom.LSSerializer, s = documentElement("document-meta", nsmap);
+      serializer.filter = new OdfNodeFilter(self.rootElement);
+      s += serializer.writeToString(self.rootElement.meta, nsmap);
+      s += "</office:document-meta>";
+      return s
+    }
+    function serializeSettingsXml() {
+      var nsmap = style2CSS.namespaces, serializer = new xmldom.LSSerializer, s = documentElement("document-settings", nsmap);
+      serializer.filter = new OdfNodeFilter(self.rootElement);
+      s += serializer.writeToString(self.rootElement.settings, nsmap);
+      s += "</office:document-settings>";
+      return s
+    }
+    function serializeStylesXml() {
+      var nsmap = style2CSS.namespaces, serializer = new xmldom.LSSerializer, s = documentElement("document-styles", nsmap);
+      serializer.filter = new OdfNodeFilter(self.rootElement, self.rootElement.masterStyles);
+      s += serializer.writeToString(self.rootElement.fontFaceDecls, nsmap);
+      s += serializer.writeToString(self.rootElement.styles, nsmap);
+      s += serializer.writeToString(self.rootElement.automaticStyles, nsmap);
+      s += serializer.writeToString(self.rootElement.masterStyles, nsmap);
+      s += "</office:document-styles>";
+      return s
+    }
+    function serializeContentXml() {
+      var nsmap = style2CSS.namespaces, serializer = new xmldom.LSSerializer, s = documentElement("document-content", nsmap);
+      serializer.filter = new OdfNodeFilter(self.rootElement, self.rootElement.body);
+      s += serializer.writeToString(self.rootElement.automaticStyles, nsmap);
+      s += serializer.writeToString(self.rootElement.body, nsmap);
+      s += "</office:document-content>";
+      return s
+    }
+    function createElement(Type) {
+      var original = document.createElementNS(Type.namespaceURI, Type.localName), method, iface = new Type;
+      for(method in iface) {
+        if(iface.hasOwnProperty(method)) {
+          original[method] = iface[method]
+        }
+      }
+      return original
+    }
+    function loadFromXML(url, callback) {
+      runtime.loadXML(url, function(err, dom) {
+        if(err) {
+          callback(err)
+        }else {
+          handleFlatXml(dom)
+        }
+      })
+    }
+    this.getPart = function(partname) {
+      return new OdfPart(partname, self, zip)
+    };
+    this.save = function(callback) {
+      var data;
+      data = runtime.byteArrayFromString(serializeSettingsXml(), "utf8");
+      zip.save("settings.xml", data, true, new Date);
+      data = runtime.byteArrayFromString(serializeMetaXml(), "utf8");
+      zip.save("meta.xml", data, true, new Date);
+      data = runtime.byteArrayFromString(serializeStylesXml(), "utf8");
+      zip.save("styles.xml", data, true, new Date);
+      data = runtime.byteArrayFromString(serializeContentXml(), "utf8");
+      zip.save("content.xml", data, true, new Date);
+      zip.write(function(err) {
+        callback(err)
+      })
+    };
+    this.state = OdfContainer.LOADING;
+    this.rootElement = createElement(ODFDocumentElement);
+    this.parts = new OdfPartList(this);
+    zip = new core.Zip(url, function(err, zipobject) {
+      zip = zipobject;
+      if(err) {
+        loadFromXML(url, function(xmlerr) {
+          if(err) {
+            zip.error = err + "\n" + xmlerr;
+            setState(OdfContainer.INVALID)
+          }
+        })
+      }else {
+        loadComponents()
+      }
+    })
+  };
+  odf.OdfContainer.EMPTY = 0;
+  odf.OdfContainer.LOADING = 1;
+  odf.OdfContainer.DONE = 2;
+  odf.OdfContainer.INVALID = 3;
+  odf.OdfContainer.SAVING = 4;
+  odf.OdfContainer.MODIFIED = 5;
+  odf.OdfContainer.getContainer = function(url) {
+    return new odf.OdfContainer(url, null)
+  };
+  return odf.OdfContainer
+}();
+odf.Formatting = function Formatting() {
+  var odfContainer, styleInfo = new odf.StyleInfo;
+  function RangeElementIterator(range) {
+    function getNthChild(parent, n) {
+      var c = parent && parent.firstChild;
+      while(c && n) {
+        c = c.nextSibling;
+        n -= 1
+      }
+      return c
+    }
+    var start = getNthChild(range.startContainer, range.startOffset), end = getNthChild(range.endContainer, range.endOffset), current = start;
+    this.next = function() {
+      var c = current;
+      if(c === null) {
+        return c
+      }
+      return null
+    }
+  }
+  function getParentStyle(element) {
+    var n = element.firstChild, e;
+    if(n.nodeType === 1) {
+      e = n;
+      return e
+    }
+    return null
+  }
+  function getParagraphStyles(range) {
+    var iter = new RangeElementIterator(range), e, styles = [];
+    e = iter.next();
+    while(e) {
+      if(styleInfo.canElementHaveStyle("paragraph", e)) {
+        styles.push(e)
+      }
+    }
+    return styles
+  }
+  this.setOdfContainer = function(odfcontainer) {
+    odfContainer = odfcontainer
+  };
+  this.isCompletelyBold = function(selection) {
+    return false
+  };
+  this.getAlignment = function(selection) {
+    var styles = this.getParagraphStyles(selection), i, l = styles.length;
+    return undefined
+  };
+  this.getParagraphStyles = function(selection) {
+    var i, j, s, styles = [];
+    for(i = 0;i < selection.length;i += 0) {
+      s = getParagraphStyles(selection[i]);
+      for(j = 0;j < s.length;j += 1) {
+        if(styles.indexOf(s[j]) === -1) {
+          styles.push(s[j])
+        }
+      }
+    }
+    return styles
+  };
+  this.getTextStyles = function(selection) {
+    return[]
+  }
+};
+runtime.loadClass("odf.OdfContainer");
+runtime.loadClass("odf.Formatting");
+runtime.loadClass("xmldom.XPath");
+odf.OdfCanvas = function() {
+  function LoadingQueue() {
+    var queue = [], taskRunning = false;
+    function run(task) {
+      taskRunning = true;
+      runtime.setTimeout(function() {
+        try {
+          task()
+        }catch(e) {
+          runtime.log(e)
+        }
+        taskRunning = false;
+        if(queue.length > 0) {
+          run(queue.pop())
+        }
+      }, 10)
+    }
+    this.clearQueue = function() {
+      queue.length = 0
+    };
+    this.addToQueue = function(loadingTask) {
+      if(queue.length === 0 && !taskRunning) {
+        return run(loadingTask)
+      }
+      queue.push(loadingTask)
+    }
+  }
+  function PageSwitcher(css) {
+    var sheet = css.sheet, position = 1;
+    function updateCSS() {
+      while(sheet.cssRules.length > 0) {
+        sheet.deleteRule(0)
+      }
+      sheet.insertRule("office|presentation draw|page {display:none;}", 0);
+      sheet.insertRule("office|presentation draw|page:nth-child(" + position + ") {display:block;}", 1)
+    }
+    this.showNextPage = function() {
+      position += 1;
+      updateCSS()
+    };
+    this.showPreviousPage = function() {
+      if(position > 1) {
+        position -= 1;
+        updateCSS()
+      }
+    };
+    this.css = css
+  }
+  function listenEvent(eventTarget, eventType, eventHandler) {
+    if(eventTarget.addEventListener) {
+      eventTarget.addEventListener(eventType, eventHandler, false)
+    }else {
+      if(eventTarget.attachEvent) {
+        eventType = "on" + eventType;
+        eventTarget.attachEvent(eventType, eventHandler)
+      }else {
+        eventTarget["on" + eventType] = eventHandler
+      }
+    }
+  }
+  function SelectionWatcher(element) {
+    var selection = [], count = 0, listeners = [];
+    function isAncestorOf(ancestor, descendant) {
+      while(descendant) {
+        if(descendant === ancestor) {
+          return true
+        }
+        descendant = descendant.parentNode
+      }
+      return false
+    }
+    function fallsWithin(element, range) {
+      return isAncestorOf(element, range.startContainer) && isAncestorOf(element, range.endContainer)
+    }
+    function getCurrentSelection() {
+      var s = [], selection = runtime.getWindow().getSelection(), i, r;
+      for(i = 0;i < selection.rangeCount;i += 1) {
+        r = selection.getRangeAt(i);
+        if(r !== null && fallsWithin(element, r)) {
+          s.push(r)
+        }
+      }
+      return s
+    }
+    function rangesNotEqual(rangeA, rangeB) {
+      if(rangeA === rangeB) {
+        return false
+      }
+      if(rangeA === null || rangeB === null) {
+        return true
+      }
+      return rangeA.startContainer !== rangeB.startContainer || rangeA.startOffset !== rangeB.startOffset || rangeA.endContainer !== rangeB.endContainer || rangeA.endOffset !== rangeB.endOffset
+    }
+    function emitNewSelection() {
+      var i, l = listeners.length;
+      for(i = 0;i < l;i += 1) {
+        listeners[i](element, selection)
+      }
+    }
+    function copySelection(selection) {
+      var s = [selection.length], i, oldr, r, doc = element.ownerDocument;
+      for(i = 0;i < selection.length;i += 1) {
+        oldr = selection[i];
+        r = doc.createRange();
+        r.setStart(oldr.startContainer, oldr.startOffset);
+        r.setEnd(oldr.endContainer, oldr.endOffset);
+        s[i] = r
+      }
+      return s
+    }
+    function checkSelection() {
+      var s = getCurrentSelection(), i;
+      if(s.length === selection.length) {
+        for(i = 0;i < s.length;i += 1) {
+          if(rangesNotEqual(s[i], selection[i])) {
+            break
+          }
+        }
+        if(i === s.length) {
+          return
+        }
+      }
+      selection = s;
+      selection = copySelection(s);
+      emitNewSelection()
+    }
+    this.addListener = function(eventName, handler) {
+      var i, l = listeners.length;
+      for(i = 0;i < l;i += 1) {
+        if(listeners[i] === handler) {
+          return
+        }
+      }
+      listeners.push(handler)
+    };
+    listenEvent(element, "mouseup", checkSelection);
+    listenEvent(element, "keyup", checkSelection);
+    listenEvent(element, "keydown", checkSelection)
+  }
+  var style2CSS = new odf.Style2CSS, namespaces = style2CSS.namespaces, drawns = namespaces.draw, fons = namespaces.fo, officens = namespaces.office, svgns = namespaces.svg, textns = namespaces.text, xlinkns = namespaces.xlink, window = runtime.getWindow(), xpath = new xmldom.XPath, eventHandlers = {}, editparagraph, loadingQueue = new LoadingQueue;
+  function addEventListener(eventType, eventHandler) {
+    var handlers = eventHandlers[eventType];
+    if(handlers === undefined) {
+      handlers = eventHandlers[eventType] = []
+    }
+    if(eventHandler && handlers.indexOf(eventHandler) === -1) {
+      handlers.push(eventHandler)
+    }
+  }
+  function fireEvent(eventType, args) {
+    if(!eventHandlers.hasOwnProperty(eventType)) {
+      return
+    }
+    var handlers = eventHandlers[eventType], i;
+    for(i = 0;i < handlers.length;i += 1) {
+      handlers[i](args)
+    }
+  }
+  function clear(element) {
+    while(element.firstChild) {
+      element.removeChild(element.firstChild)
+    }
+  }
+  function handleStyles(odfelement, stylesxmlcss) {
+    var style2css = new odf.Style2CSS;
+    style2css.style2css(stylesxmlcss.sheet, odfelement.styles, odfelement.automaticStyles)
+  }
+  function setFramePosition(id, frame, stylesheet) {
+    frame.setAttribute("styleid", id);
+    var rule, anchor = frame.getAttributeNS(textns, "anchor-type"), x = frame.getAttributeNS(svgns, "x"), y = frame.getAttributeNS(svgns, "y"), width = frame.getAttributeNS(svgns, "width"), height = frame.getAttributeNS(svgns, "height"), minheight = frame.getAttributeNS(fons, "min-height"), minwidth = frame.getAttributeNS(fons, "min-width");
+    if(anchor === "as-char") {
+      rule = "display: inline-block;"
+    }else {
+      if(anchor || x || y) {
+        rule = "position: absolute;"
+      }else {
+        if(width || height || minheight || minwidth) {
+          rule = "display: block;"
+        }
+      }
+    }
+    if(x) {
+      rule += "left: " + x + ";"
+    }
+    if(y) {
+      rule += "top: " + y + ";"
+    }
+    if(width) {
+      rule += "width: " + width + ";"
+    }
+    if(height) {
+      rule += "height: " + height + ";"
+    }
+    if(minheight) {
+      rule += "min-height: " + minheight + ";"
+    }
+    if(minwidth) {
+      rule += "min-width: " + minwidth + ";"
+    }
+    if(rule) {
+      rule = "draw|" + frame.localName + '[styleid="' + id + '"] {' + rule + "}";
+      stylesheet.insertRule(rule, stylesheet.cssRules.length)
+    }
+  }
+  function getUrlFromBinaryDataElement(image) {
+    var node = image.firstChild;
+    while(node) {
+      if(node.namespaceURI === officens && node.localName === "binary-data") {
+        return"data:image/png;base64," + node.textContent
+      }
+      node = node.nextSibling
+    }
+    return""
+  }
+  function setImage(id, container, image, stylesheet) {
+    image.setAttribute("styleid", id);
+    var url = image.getAttributeNS(xlinkns, "href"), part, node;
+    function callback(url) {
+      var rule = "background-image: url(" + url + ");";
+      rule = 'draw|image[styleid="' + id + '"] {' + rule + "}";
+      stylesheet.insertRule(rule, stylesheet.cssRules.length)
+    }
+    if(url) {
+      try {
+        if(container.getPartUrl) {
+          url = container.getPartUrl(url);
+          callback(url)
+        }else {
+          part = container.getPart(url);
+          part.onchange = function(part) {
+            callback(part.url)
+          };
+          part.load()
+        }
+      }catch(e) {
+        runtime.log("slight problem: " + e)
+      }
+    }else {
+      url = getUrlFromBinaryDataElement(image);
+      callback(url)
+    }
+  }
+  function formatParagraphAnchors(odfbody) {
+    var runtimens = "urn:webodf", n, i, nodes = xpath.getODFElementsWithXPath(odfbody, ".//*[*[@text:anchor-type='paragraph']]", style2CSS.namespaceResolver);
+    for(i = 0;i < nodes.length;i += 1) {
+      n = nodes[i];
+      if(n.setAttributeNS) {
+        n.setAttributeNS(runtimens, "containsparagraphanchor", true)
+      }
+    }
+  }
+  function modifyImages(container, odfbody, stylesheet) {
+    var node, frames, i, images;
+    function namespaceResolver(prefix) {
+      return namespaces[prefix]
+    }
+    frames = [];
+    node = odfbody.firstChild;
+    while(node && node !== odfbody) {
+      if(node.namespaceURI === drawns) {
+        frames[frames.length] = node
+      }
+      if(node.firstChild) {
+        node = node.firstChild
+      }else {
+        while(node && node !== odfbody && !node.nextSibling) {
+          node = node.parentNode
+        }
+        if(node && node.nextSibling) {
+          node = node.nextSibling
+        }
+      }
+    }
+    for(i = 0;i < frames.length;i += 1) {
+      node = frames[i];
+      setFramePosition("frame" + String(i), node, stylesheet)
+    }
+    formatParagraphAnchors(odfbody)
+  }
+  function loadImages(container, odffragment, stylesheet) {
+    var i, images, node;
+    function loadImage(name, container, node, stylesheet) {
+      loadingQueue.addToQueue(function() {
+        setImage(name, container, node, stylesheet)
+      })
+    }
+    images = odffragment.getElementsByTagNameNS(drawns, "image");
+    for(i = 0;i < images.length;i += 1) {
+      node = images.item(i);
+      loadImage("image" + String(i), container, node, stylesheet)
+    }
+  }
+  function setVideo(id, container, plugin, stylesheet) {
+    var video, source, url, videoType, doc = plugin.ownerDocument, part, node;
+    url = plugin.getAttributeNS(xlinkns, "href");
+    function callback(url, mimetype) {
+      if(mimetype.substr(0, 6) === "video/") {
+        video = doc.createElementNS(doc.documentElement.namespaceURI, "video");
+        video.setAttribute("controls", "controls");
+        source = doc.createElement("source");
+        source.setAttribute("src", url);
+        source.setAttribute("type", mimetype);
+        video.appendChild(source);
+        plugin.parentNode.appendChild(video)
+      }else {
+        plugin.innerHtml = "Unrecognised Plugin"
+      }
+    }
+    if(url) {
+      try {
+        if(container.getPartUrl) {
+          url = container.getPartUrl(url);
+          callback(url, "video/mp4")
+        }else {
+          part = container.getPart(url);
+          part.onchange = function(part) {
+            callback(part.url, part.mimetype)
+          };
+          part.load()
+        }
+      }catch(e) {
+        runtime.log("slight problem: " + e)
+      }
+    }else {
+      runtime.log("using MP4 data fallback");
+      url = getUrlFromBinaryDataElement(plugin);
+      callback(url, "video/mp4")
+    }
+  }
+  function loadVideos(container, odffragment, stylesheet) {
+    var i, plugins, node;
+    function loadVideo(name, container, node, stylesheet) {
+      loadingQueue.addToQueue(function() {
+        setVideo(name, container, node, stylesheet)
+      })
+    }
+    plugins = odffragment.getElementsByTagNameNS(drawns, "plugin");
+    runtime.log("Loading Videos:");
+    for(i = 0;i < plugins.length;i += 1) {
+      runtime.log("...Found a video.");
+      node = plugins.item(i);
+      loadVideo("video" + String(i), container, node, stylesheet)
+    }
+  }
+  function addStyleSheet(document) {
+    var styles = document.getElementsByTagName("style"), head = document.getElementsByTagName("head")[0], text = "", prefix, a = "", b;
+    if(styles && styles.length > 0) {
+      styles = styles[0].cloneNode(false)
+    }else {
+      styles = document.createElement("style")
+    }
+    for(prefix in namespaces) {
+      if(namespaces.hasOwnProperty(prefix) && prefix) {
+        text += "@namespace " + prefix + " url(" + namespaces[prefix] + ");\n"
+      }
+    }
+    styles.appendChild(document.createTextNode(text));
+    head.appendChild(styles);
+    return styles
+  }
+  odf.OdfCanvas = function OdfCanvas(element) {
+    var self = this, document = element.ownerDocument, odfcontainer, formatting = new odf.Formatting, selectionWatcher = new SelectionWatcher(element), slidecssindex = 0, pageSwitcher = new PageSwitcher(addStyleSheet(document)), stylesxmlcss = addStyleSheet(document), positioncss = addStyleSheet(document), editable = false, zoomLevel = 1;
+    function fixContainerSize() {
+      var sizer = element.firstChild, odfdoc = sizer.firstChild;
+      if(!odfdoc) {
+        return
+      }
+      element.style.WebkitTransform = "scale(" + zoomLevel + ")";
+      element.style.WebkitTransformOrigin = "left top";
+      element.style.width = Math.round(zoomLevel * odfdoc.offsetWidth) + "px";
+      element.style.height = Math.round(zoomLevel * odfdoc.offsetHeight) + "px"
+    }
+    function handleContent(container, odfnode) {
+      var css = positioncss.sheet, sizer;
+      modifyImages(container, odfnode.body, css);
+      css.insertRule("draw|page { background-color:#fff; }", css.cssRules.length);
+      clear(element);
+      sizer = document.createElement("div");
+      sizer.style.display = "inline-block";
+      sizer.style.background = "white";
+      sizer.appendChild(odfnode);
+      element.appendChild(sizer);
+      loadImages(container, odfnode.body, css);
+      loadVideos(container, odfnode.body, css);
+      fixContainerSize()
+    }
+    function refreshOdf(container) {
+      if(odfcontainer !== container) {
+        return
+      }
+      function callback() {
+        clear(element);
+        element.style.display = "inline-block";
+        var odfnode = container.rootElement;
+        element.ownerDocument.importNode(odfnode, true);
+        formatting.setOdfContainer(container);
+        handleStyles(odfnode, stylesxmlcss);
+        handleContent(container, odfnode);
+        fireEvent("statereadychange")
+      }
+      if(odfcontainer.state === odf.OdfContainer.DONE) {
+        callback()
+      }else {
+        odfcontainer.onchange = callback
+      }
+    }
+    this.odfContainer = function() {
+      return odfcontainer
+    };
+    this.slidevisibilitycss = function() {
+      return pageSwitcher.css
+    };
+    this["load"] = this.load = function(url) {
+      loadingQueue.clearQueue();
+      element.innerHTML = "loading " + url;
+      odfcontainer = new odf.OdfContainer(url, function(container) {
+        odfcontainer = container;
+        refreshOdf(container)
+      });
+      odfcontainer.onstatereadychange = refreshOdf
+    };
+    function stopEditing() {
+      if(!editparagraph) {
+        return
+      }
+      var fragment = editparagraph.ownerDocument.createDocumentFragment();
+      while(editparagraph.firstChild) {
+        fragment.insertBefore(editparagraph.firstChild, null)
+      }
+      editparagraph.parentNode.replaceChild(fragment, editparagraph)
+    }
+    this.save = function(callback) {
+      stopEditing();
+      odfcontainer.save(callback)
+    };
+    function cancelPropagation(event) {
+      if(event.stopPropagation) {
+        event.stopPropagation()
+      }else {
+        event.cancelBubble = true
+      }
+    }
+    function cancelEvent(event) {
+      if(event.preventDefault) {
+        event.preventDefault();
+        event.stopPropagation()
+      }else {
+        event.returnValue = false;
+        event.cancelBubble = true
+      }
+    }
+    this.setEditable = function(iseditable) {
+      editable = iseditable;
+      if(!editable) {
+        stopEditing()
+      }
+    };
+    function processClick(evt) {
+      evt = evt || window.event;
+      var e = evt.target, selection = window.getSelection(), range = selection.rangeCount > 0 ? selection.getRangeAt(0) : null, startContainer = range && range.startContainer, startOffset = range && range.startOffset, endContainer = range && range.endContainer, endOffset = range && range.endOffset;
+      while(e && !((e.localName === "p" || e.localName === "h") && e.namespaceURI === textns)) {
+        e = e.parentNode
+      }
+      if(!editable) {
+        return
+      }
+      if(!e || e.parentNode === editparagraph) {
+        return
+      }
+      if(!editparagraph) {
+        editparagraph = e.ownerDocument.createElement("p");
+        if(!editparagraph.style) {
+          editparagraph = e.ownerDocument.createElementNS("http://www.w3.org/1999/xhtml", "p")
+        }
+        editparagraph.style.margin = "0px";
+        editparagraph.style.padding = "0px";
+        editparagraph.style.border = "0px";
+        editparagraph.setAttribute("contenteditable", true)
+      }else {
+        if(editparagraph.parentNode) {
+          stopEditing()
+        }
+      }
+      e.parentNode.replaceChild(editparagraph, e);
+      editparagraph.appendChild(e);
+      editparagraph.focus();
+      if(range) {
+        selection.removeAllRanges();
+        range = e.ownerDocument.createRange();
+        range.setStart(startContainer, startOffset);
+        range.setEnd(endContainer, endOffset);
+        selection.addRange(range)
+      }
+      cancelEvent(evt)
+    }
+    this.addListener = function(eventName, handler) {
+      if(eventName === "selectionchange") {
+        selectionWatcher.addListener(eventName, handler)
+      }else {
+        addEventListener(eventName, handler)
+      }
+    };
+    this.getFormatting = function() {
+      return formatting
+    };
+    this.setZoomLevel = function(zoom) {
+      zoomLevel = zoom;
+      fixContainerSize()
+    };
+    this.getZoomLevel = function() {
+      return zoomLevel
+    };
+    this.fitToContainingElement = function(width, height) {
+      var realWidth = element.offsetWidth / zoomLevel, realHeight = element.offsetHeight / zoomLevel;
+      zoomLevel = width / realWidth;
+      if(height / realHeight < zoomLevel) {
+        zoomLevel = height / realHeight
+      }
+      fixContainerSize()
+    };
+    this.fitToWidth = function(width) {
+      var realWidth = element.offsetWidth / zoomLevel;
+      zoomLevel = width / realWidth;
+      fixContainerSize()
+    };
+    this.fitToHeight = function(height) {
+      var realHeight = element.offsetHeight / zoomLevel;
+      zoomLevel = height / realHeight;
+      fixContainerSize()
+    };
+    this.showNextPage = function() {
+      pageSwitcher.showNextPage()
+    };
+    this.showPreviousPage = function() {
+      pageSwitcher.showPreviousPage()
+    };
+    this.showAllPages = function() {
+    };
+    listenEvent(element, "click", processClick)
+  };
+  return odf.OdfCanvas
+}();
+runtime.loadClass("xmldom.XPath");
+runtime.loadClass("odf.Style2CSS");
+gui.PresenterUI = function() {
+  var s2css = new odf.Style2CSS, xpath = new xmldom.XPath, nsResolver = s2css.namespaceResolver;
+  return function PresenterUI(odf_element) {
+    var self = this;
+    self.setInitialSlideMode = function() {
+      self.startSlideMode("single")
+    };
+    self.keyDownHandler = function(ev) {
+      if(ev.target.isContentEditable) {
+        return
+      }
+      if(ev.target.nodeName === "input") {
+        return
+      }
+      switch(ev.keyCode) {
+        case 84:
+          self.toggleToolbar();
+          break;
+        case 37:
+        ;
+        case 8:
+          self.prevSlide();
+          break;
+        case 39:
+        ;
+        case 32:
+          self.nextSlide();
+          break;
+        case 36:
+          self.firstSlide();
+          break;
+        case 35:
+          self.lastSlide();
+          break
+      }
+    };
+    self.root = function() {
+      return self.odf_canvas.odfContainer().rootElement
+    };
+    self.firstSlide = function() {
+      self.slideChange(function(old, pc) {
+        return 0
+      })
+    };
+    self.lastSlide = function() {
+      self.slideChange(function(old, pc) {
+        return pc - 1
+      })
+    };
+    self.nextSlide = function() {
+      self.slideChange(function(old, pc) {
+        return old + 1 < pc ? old + 1 : -1
+      })
+    };
+    self.prevSlide = function() {
+      self.slideChange(function(old, pc) {
+        return old < 1 ? -1 : old - 1
+      })
+    };
+    self.slideChange = function(indexChanger) {
+      var pages = self.getPages(self.odf_canvas.odfContainer().rootElement), last = -1, i = 0, newidx, pagelist;
+      pages.forEach(function(tuple) {
+        var name = tuple[0], node = tuple[1];
+        if(node.hasAttribute("slide_current")) {
+          last = i;
+          node.removeAttribute("slide_current")
+        }
+        i += 1
+      });
+      newidx = indexChanger(last, pages.length);
+      if(newidx === -1) {
+        newidx = last
+      }
+      pages[newidx][1].setAttribute("slide_current", "1");
+      pagelist = document.getElementById("pagelist");
+      pagelist.selectedIndex = newidx;
+      if(self.slide_mode === "cont") {
+        window.scrollBy(0, pages[newidx][1].getBoundingClientRect().top - 30)
+      }
+    };
+    self.selectSlide = function(idx) {
+      self.slideChange(function(old, pc) {
+        if(idx >= pc) {
+          return-1
+        }
+        if(idx < 0) {
+          return-1
+        }
+        return idx
+      })
+    };
+    self.scrollIntoContView = function(idx) {
+      var pages = self.getPages(self.odf_canvas.odfContainer().rootElement);
+      if(pages.length === 0) {
+        return
+      }
+      window.scrollBy(0, pages[idx][1].getBoundingClientRect().top - 30)
+    };
+    self.getPages = function(root) {
+      var pagenodes = root.getElementsByTagNameNS(nsResolver("draw"), "page"), pages = [], i;
+      for(i = 0;i < pagenodes.length;i += 1) {
+        pages.push([pagenodes[i].getAttribute("draw:name"), pagenodes[i]])
+      }
+      return pages
+    };
+    self.fillPageList = function(odfdom_root, html_select) {
+      var pages = self.getPages(odfdom_root), i, html_option, res, page_denom;
+      while(html_select.firstChild) {
+        html_select.removeChild(html_select.firstChild)
+      }
+      for(i = 0;i < pages.length;i += 1) {
+        html_option = document.createElement("option");
+        res = xpath.getODFElementsWithXPath(pages[i][1], './draw:frame[@presentation:class="title"]//draw:text-box/text:p', xmldom.XPath);
+        page_denom = res.length > 0 ? res[0].textContent : pages[i][0];
+        html_option.textContent = i + 1 + ": " + page_denom;
+        html_select.appendChild(html_option)
+      }
+    };
+    self.startSlideMode = function(mode) {
+      var pagelist = document.getElementById("pagelist"), css = self.odf_canvas.slidevisibilitycss().sheet;
+      self.slide_mode = mode;
+      while(css.cssRules.length > 0) {
+        css.deleteRule(0)
+      }
+      self.selectSlide(0);
+      if(self.slide_mode === "single") {
+        css.insertRule("draw|page { position:fixed; left:0px;top:30px; z-index:1; }", 0);
+        css.insertRule("draw|page[slide_current]  { z-index:2;}", 1);
+        css.insertRule("draw|page  { -webkit-transform: scale(1);}", 2);
+        self.fitToWindow();
+        window.addEventListener("resize", self.fitToWindow, false)
+      }else {
+        if(self.slide_mode === "cont") {
+          window.removeEventListener("resize", self.fitToWindow, false)
+        }
+      }
+      self.fillPageList(self.odf_canvas.odfContainer().rootElement, pagelist)
+    };
+    self.toggleToolbar = function() {
+      var css, found, i;
+      css = self.odf_canvas.slidevisibilitycss().sheet;
+      found = -1;
+      for(i = 0;i < css.cssRules.length;i += 1) {
+        if(css.cssRules[i].cssText.substring(0, 8) === ".toolbar") {
+          found = i;
+          break
+        }
+      }
+      if(found > -1) {
+        css.deleteRule(found)
+      }else {
+        css.insertRule(".toolbar { position:fixed; left:0px;top:-200px; z-index:0; }", 0)
+      }
+    };
+    self.fitToWindow = function() {
+      function ruleByFactor(f) {
+        return"draw|page { \n" + "-moz-transform: scale(" + f + "); \n" + "-moz-transform-origin: 0% 0%; " + "-webkit-transform-origin: 0% 0%; -webkit-transform: scale(" + f + "); " + "-o-transform-origin: 0% 0%; -o-transform: scale(" + f + "); " + "-ms-transform-origin: 0% 0%; -ms-transform: scale(" + f + "); " + "}"
+      }
+      var pages = self.getPages(self.root()), factorVert = (window.innerHeight - 40) / pages[0][1].clientHeight, factorHoriz = (window.innerWidth - 10) / pages[0][1].clientWidth, factor = factorVert < factorHoriz ? factorVert : factorHoriz, css = self.odf_canvas.slidevisibilitycss().sheet;
+      css.deleteRule(2);
+      css.insertRule(ruleByFactor(factor), 2)
+    };
+    self.load = function(url) {
+      self.odf_canvas.load(url)
+    };
+    self.odf_element = odf_element;
+    self.odf_canvas = new odf.OdfCanvas(self.odf_element);
+    self.odf_canvas.addListener("statereadychange", self.setInitialSlideMode);
+    self.slide_mode = "undefined";
+    document.addEventListener("keydown", self.keyDownHandler, false)
+  }
+}();
+gui.Caret = function Caret(selection, rootNode) {
+  var document = rootNode.ownerDocument, cursorns, cursorNode;
+  cursorns = "urn:webodf:names:cursor";
+  cursorNode = document.createElementNS(cursorns, "cursor");
+  this.updateToSelection = function() {
+    var range;
+    if(selection.rangeCount === 1) {
+      range = selection.getRangeAt(0)
+    }
+  }
+};
+runtime.loadClass("core.Cursor");
+gui.SelectionMover = function SelectionMover(selection, pointWalker) {
+  var doc = pointWalker.node().ownerDocument, cursor = new core.Cursor(selection, doc);
+  function getActiveRange(node) {
+    var range;
+    if(selection.rangeCount === 0) {
+      selection.addRange(node.ownerDocument.createRange())
+    }
+    return selection.getRangeAt(selection.rangeCount - 1)
+  }
+  function setStart(node, offset) {
+    var ranges = [], i, range;
+    for(i = 0;i < selection.rangeCount;i += 1) {
+      ranges[i] = selection.getRangeAt(i)
+    }
+    selection.removeAllRanges();
+    if(ranges.length === 0) {
+      ranges[0] = node.ownerDocument.createRange()
+    }
+    ranges[ranges.length - 1].setStart(pointWalker.node(), pointWalker.position());
+    for(i = 0;i < ranges.length;i += 1) {
+      selection.addRange(ranges[i])
+    }
+  }
+  function doMove(extend, move) {
+    if(selection.rangeCount === 0) {
+      return
+    }
+    var range = selection.getRangeAt(0), element;
+    if(!range.startContainer || range.startContainer.nodeType !== 1) {
+      return
+    }
+    element = range.startContainer;
+    pointWalker.setPoint(element, range.startOffset);
+    move();
+    setStart(pointWalker.node(), pointWalker.position())
+  }
+  function doMoveForward(extend, move) {
+    if(selection.rangeCount === 0) {
+      return
+    }
+    move();
+    var range = selection.getRangeAt(0), element;
+    if(!range.startContainer || range.startContainer.nodeType !== 1) {
+      return
+    }
+    element = range.startContainer;
+    pointWalker.setPoint(element, range.startOffset)
+  }
+  function moveCursor(node, offset, selectMode) {
+    if(selectMode) {
+      selection.extend(node, offset)
+    }else {
+      selection.collapse(node, offset)
+    }
+    cursor.updateToSelection()
+  }
+  function moveCursorLeft() {
+    var element;
+    if(!selection.focusNode || selection.focusNode.nodeType !== 1) {
+      return
+    }
+    element = selection.focusNode;
+    pointWalker.setPoint(element, selection.focusOffset);
+    pointWalker.stepBackward();
+    moveCursor(pointWalker.node(), pointWalker.position(), false)
+  }
+  function moveCursorRight() {
+    cursor.remove();
+    var element;
+    if(!selection.focusNode || selection.focusNode.nodeType !== 1) {
+      return
+    }
+    element = selection.focusNode;
+    pointWalker.setPoint(element, selection.focusOffset);
+    pointWalker.stepForward();
+    moveCursor(pointWalker.node(), pointWalker.position(), false)
+  }
+  function moveCursorUp() {
+    var rect = cursor.getNode().getBoundingClientRect(), x = rect.left, y = rect.top, arrived = false, left = 200;
+    while(!arrived && left) {
+      left -= 1;
+      moveCursorLeft();
+      rect = cursor.getNode().getBoundingClientRect();
+      arrived = rect.top !== y && rect.left < x
+    }
+  }
+  function moveCursorDown() {
+    cursor.updateToSelection();
+    var rect = cursor.getNode().getBoundingClientRect(), x = rect.left, y = rect.top, arrived = false, left = 200;
+    while(!arrived) {
+      left -= 1;
+      moveCursorRight();
+      rect = cursor.getNode().getBoundingClientRect();
+      arrived = rect.top !== y && rect.left > x
+    }
+  }
+  this.movePointForward = function(extend) {
+    doMove(extend, pointWalker.stepForward)
+  };
+  this.movePointBackward = function(extend) {
+    doMove(extend, pointWalker.stepBackward)
+  };
+  this.moveLineForward = function(extend) {
+    if(selection.modify) {
+      selection.modify(extend ? "extend" : "move", "forward", "line")
+    }else {
+      doMove(extend, moveCursorDown)
+    }
+  };
+  this.moveLineBackward = function(extend) {
+    if(selection.modify) {
+      selection.modify(extend ? "extend" : "move", "backward", "line")
+    }else {
+      doMove(extend, function() {
+      })
+    }
+  };
+  return this
+};
+runtime.loadClass("core.PointWalker");
+runtime.loadClass("core.Cursor");
+gui.XMLEdit = function XMLEdit(element, stylesheet) {
+  var simplecss, cssprefix, documentElement, customNS = "customns", walker = null;
+  if(!element.id) {
+    element.id = "xml" + String(Math.random()).substring(2)
+  }
+  cssprefix = "#" + element.id + " ";
+  function installHandlers() {
+  }
+  simplecss = cssprefix + "*," + cssprefix + ":visited, " + cssprefix + ":link {display:block; margin: 0px; margin-left: 10px; font-size: medium; color: black; background: white; font-variant: normal; font-weight: normal; font-style: normal; font-family: sans-serif; text-decoration: none; white-space: pre-wrap; height: auto; width: auto}\n" + cssprefix + ":before {color: blue; content: '<' attr(customns_name) attr(customns_atts) '>';}\n" + cssprefix + ":after {color: blue; content: '</' attr(customns_name) '>';}\n" + 
+  cssprefix + "{overflow: auto;}\n";
+  function listenEvent(eventTarget, eventType, eventHandler) {
+    if(eventTarget.addEventListener) {
+      eventTarget.addEventListener(eventType, eventHandler, false)
+    }else {
+      if(eventTarget.attachEvent) {
+        eventType = "on" + eventType;
+        eventTarget.attachEvent(eventType, eventHandler)
+      }else {
+        eventTarget["on" + eventType] = eventHandler
+      }
+    }
+  }
+  function cancelEvent(event) {
+    if(event.preventDefault) {
+      event.preventDefault()
+    }else {
+      event.returnValue = false
+    }
+  }
+  function isCaretMoveCommand(charCode) {
+    if(charCode >= 16 && charCode <= 20) {
+      return true
+    }
+    if(charCode >= 33 && charCode <= 40) {
+      return true
+    }
+    return false
+  }
+  function syncSelectionWithWalker() {
+    var sel = element.ownerDocument.defaultView.getSelection(), r;
+    if(!sel || sel.rangeCount <= 0 || !walker) {
+      return
+    }
+    r = sel.getRangeAt(0);
+    walker.setPoint(r.startContainer, r.startOffset)
+  }
+  function syncWalkerWithSelection() {
+    var sel = element.ownerDocument.defaultView.getSelection(), n, r;
+    sel.removeAllRanges();
+    if(!walker || !walker.node()) {
+      return
+    }
+    n = walker.node();
+    r = n.ownerDocument.createRange();
+    r.setStart(n, walker.position());
+    r.collapse(true);
+    sel.addRange(r)
+  }
+  function handleKeyDown(event) {
+    var charCode = event.charCode || event.keyCode;
+    walker = null;
+    if(walker && charCode === 39) {
+      syncSelectionWithWalker();
+      walker.stepForward();
+      syncWalkerWithSelection()
+    }else {
+      if(walker && charCode === 37) {
+        syncSelectionWithWalker();
+        walker.stepBackward();
+        syncWalkerWithSelection()
+      }else {
+        if(isCaretMoveCommand(charCode)) {
+          return
+        }
+      }
+    }
+    cancelEvent(event)
+  }
+  function handleKeyPress(event) {
+  }
+  function handleClick(event) {
+    var sel = element.ownerDocument.defaultView.getSelection(), r = sel.getRangeAt(0), n = r.startContainer;
+    cancelEvent(event)
+  }
+  function initElement(element) {
+    listenEvent(element, "click", handleClick);
+    listenEvent(element, "keydown", handleKeyDown);
+    listenEvent(element, "keypress", handleKeyPress);
+    listenEvent(element, "drop", cancelEvent);
+    listenEvent(element, "dragend", cancelEvent);
+    listenEvent(element, "beforepaste", cancelEvent);
+    listenEvent(element, "paste", cancelEvent)
+  }
+  function cleanWhitespace(node) {
+    var n = node.firstChild, p, re = /^\s*$/;
+    while(n && n !== node) {
+      p = n;
+      n = n.nextSibling || n.parentNode;
+      if(p.nodeType === 3 && re.test(p.nodeValue)) {
+        p.parentNode.removeChild(p)
+      }
+    }
+  }
+  function setCssHelperAttributes(node) {
+    var atts, attsv, a, i;
+    atts = node.attributes;
+    attsv = "";
+    for(i = atts.length - 1;i >= 0;i -= 1) {
+      a = atts.item(i);
+      attsv = attsv + " " + a.nodeName + '="' + a.nodeValue + '"'
+    }
+    node.setAttribute("customns_name", node.nodeName);
+    node.setAttribute("customns_atts", attsv)
+  }
+  function addExplicitAttributes(node) {
+    var n = node.firstChild;
+    while(n && n !== node) {
+      if(n.nodeType === 1) {
+        addExplicitAttributes(n)
+      }
+      n = n.nextSibling || n.parentNode
+    }
+    setCssHelperAttributes(node);
+    cleanWhitespace(node)
+  }
+  function getNamespacePrefixes(node, prefixes) {
+    var n = node.firstChild, atts, att, i;
+    while(n && n !== node) {
+      if(n.nodeType === 1) {
+        getNamespacePrefixes(n, prefixes);
+        atts = n.attributes;
+        for(i = atts.length - 1;i >= 0;i -= 1) {
+          att = atts.item(i);
+          if(att.namespaceURI === "http://www.w3.org/2000/xmlns/") {
+            if(!prefixes[att.nodeValue]) {
+              prefixes[att.nodeValue] = att.localName
+            }
+          }
+        }
+      }
+      n = n.nextSibling || n.parentNode
+    }
+  }
+  function generateUniquePrefixes(prefixes) {
+    var taken = {}, ns, p, n = 0;
+    for(ns in prefixes) {
+      if(prefixes.hasOwnProperty(ns) && ns) {
+        p = prefixes[ns];
+        if(!p || taken.hasOwnProperty(p) || p === "xmlns") {
+          do {
+            p = "ns" + n;
+            n += 1
+          }while(taken.hasOwnProperty(p));
+          prefixes[ns] = p
+        }
+        taken[p] = true
+      }
+    }
+  }
+  function createCssFromXmlInstance(node) {
+    var prefixes = {}, css = "@namespace customns url(customns);\n", name, pre, ns, names, csssel;
+    getNamespacePrefixes(node, prefixes);
+    generateUniquePrefixes(prefixes);
+    return css
+  }
+  function updateCSS() {
+    var css = element.ownerDocument.createElement("style"), text = createCssFromXmlInstance(element);
+    css.type = "text/css";
+    text = text + simplecss;
+    css.appendChild(element.ownerDocument.createTextNode(text));
+    stylesheet = stylesheet.parentNode.replaceChild(css, stylesheet)
+  }
+  function getXML() {
+    return documentElement
+  }
+  function setXML(xml) {
+    var node = xml.documentElement || xml;
+    node = element.ownerDocument.importNode(node, true);
+    documentElement = node;
+    addExplicitAttributes(node);
+    while(element.lastChild) {
+      element.removeChild(element.lastChild)
+    }
+    element.appendChild(node);
+    updateCSS();
+    walker = new core.PointWalker(node)
+  }
+  initElement(element);
+  this.updateCSS = updateCSS;
+  this.setXML = setXML;
+  this.getXML = getXML
+};
+(function() {
+  return["core/Async.js", "core/Base64.js", "core/ByteArray.js", "core/ByteArrayWriter.js", "core/Cursor.js", "core/JSLint.js", "core/PointWalker.js", "core/RawDeflate.js", "core/RawInflate.js", "core/UnitTester.js", "core/Zip.js", "gui/Caret.js", "gui/SelectionMover.js", "gui/XMLEdit.js", "gui/PresenterUI.js", "odf/FontLoader.js", "odf/Formatting.js", "odf/OdfCanvas.js", "odf/OdfContainer.js", "odf/Style2CSS.js", "odf/StyleInfo.js", "xmldom/LSSerializer.js", "xmldom/LSSerializerFilter.js", "xmldom/OperationalTransformDOM.js", 
+  "xmldom/OperationalTransformInterface.js", "xmldom/RelaxNG.js", "xmldom/RelaxNG2.js", "xmldom/RelaxNGParser.js", "xmldom/XPath.js"]
+})();
+
diff --git a/apps/files_odfviewer/js/webodf.js b/apps/files_odfviewer/js/webodf.js
new file mode 100644
index 0000000000..1b85527260
--- /dev/null
+++ b/apps/files_odfviewer/js/webodf.js
@@ -0,0 +1,343 @@
+// Input 0
+/*
+
+ @licstart
+ The JavaScript code in this page is free software: you can redistribute it
+ and/or modify it under the terms of the GNU Affero General Public License
+ (GNU AGPL) as published by the Free Software Foundation, either version 3 of
+ the License, or (at your option) any later version.  The code is distributed
+ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
+
+ As additional permission under GNU AGPL version 3 section 7, you
+ may distribute non-source (e.g., minimized or compacted) forms of
+ that code without the copy of the GNU GPL normally required by
+ section 4, provided you include this license notice and a URL
+ through which recipients can access the Corresponding Source.
+
+ As a special exception to the AGPL, any HTML file which merely makes function
+ calls to this code, and for that purpose includes it by reference shall be
+ deemed a separate work for copyright law purposes. In addition, the copyright
+ holders of this code give you permission to combine this code with free
+ software libraries that are released under the GNU LGPL. You may copy and
+ distribute such a system following the terms of the GNU AGPL for this code
+ and the LGPL for the libraries. If you modify this code, you may extend this
+ exception to your version of the code, but you are not obligated to do so.
+ If you do not wish to do so, delete this exception statement from your
+ version.
+
+ This license applies to this entire compilation.
+ @licend
+ @source: http://www.webodf.org/
+ @source: http://gitorious.org/odfkit/webodf/
+*/
+var core={},gui={},xmldom={},odf={};
+// Input 1
+function Runtime(){}Runtime.ByteArray=function(){};Runtime.ByteArray.prototype.slice=function(){};Runtime.prototype.byteArrayFromArray=function(){};Runtime.prototype.byteArrayFromString=function(){};Runtime.prototype.byteArrayToString=function(){};Runtime.prototype.concatByteArrays=function(){};Runtime.prototype.read=function(){};Runtime.prototype.readFile=function(){};Runtime.prototype.readFileSync=function(){};Runtime.prototype.loadXML=function(){};Runtime.prototype.writeFile=function(){};
+Runtime.prototype.isFile=function(){};Runtime.prototype.getFileSize=function(){};Runtime.prototype.deleteFile=function(){};Runtime.prototype.log=function(){};Runtime.prototype.setTimeout=function(){};Runtime.prototype.libraryPaths=function(){};Runtime.prototype.type=function(){};Runtime.prototype.getDOMImplementation=function(){};Runtime.prototype.getWindow=function(){};var IS_COMPILED_CODE=!0;
+Runtime.byteArrayToString=function(j,l){function f(c){var b="",d,a=c.length;for(d=0;d<a;d+=1)b+=String.fromCharCode(c[d]&255);return b}function g(c){var b="",d,a=c.length,e,i,h;for(d=0;d<a;d+=1)e=c[d],128>e?b+=String.fromCharCode(e):(d+=1,i=c[d],224>e?b+=String.fromCharCode((e&31)<<6|i&63):(d+=1,h=c[d],b+=String.fromCharCode((e&15)<<12|(i&63)<<6|h&63)));return b}var a;"utf8"===l?a=g(j):("binary"!==l&&this.log("Unsupported encoding: "+l),a=f(j));return a};
+Runtime.getFunctionName=function(j){return void 0===j.name?(j=/function\s+(\w+)/.exec(j))&&j[1]:j.name};
+function BrowserRuntime(j){function l(c,b){var d,a,e;b?e=c:b=c;j?(a=j.ownerDocument,e&&(d=a.createElement("span"),d.className=e,d.appendChild(a.createTextNode(e)),j.appendChild(d),j.appendChild(a.createTextNode(" "))),d=a.createElement("span"),d.appendChild(a.createTextNode(b)),j.appendChild(d),j.appendChild(a.createElement("br"))):console&&console.log(b)}var f=this,g={},a=window.ArrayBuffer&&window.Uint8Array;this.ByteArray=a?function(c){Uint8Array.prototype.slice=function(b,c){void 0===c&&(void 0===
+b&&(b=0),c=this.length);var a=this.subarray(b,c),e,i,c=c-b;e=new Uint8Array(new ArrayBuffer(c));for(i=0;i<c;i+=1)e[i]=a[i];return e};return new Uint8Array(new ArrayBuffer(c))}:function(c){var b=[];b.length=c;return b};this.concatByteArrays=a?function(c,b){var d,a=c.length,e=b.length,i=new this.ByteArray(a+e);for(d=0;d<a;d+=1)i[d]=c[d];for(d=0;d<e;d+=1)i[d+a]=b[d];return i}:function(c,b){return c.concat(b)};this.byteArrayFromArray=function(c){return c.slice()};this.byteArrayFromString=function(c,b){var d;
+if("utf8"===b){d=c.length;var a,e,i,h=0;for(e=0;e<d;e+=1)i=c.charCodeAt(e),h+=1+(128<i)+(2048<i);a=new f.ByteArray(h);for(e=h=0;e<d;e+=1)i=c.charCodeAt(e),128>i?(a[h]=i,h+=1):2048>i?(a[h]=192|i>>>6,a[h+1]=128|i&63,h+=2):(a[h]=224|i>>>12&15,a[h+1]=128|i>>>6&63,a[h+2]=128|i&63,h+=3)}else{"binary"!==b&&f.log("unknown encoding: "+b);d=c.length;a=new f.ByteArray(d);for(e=0;e<d;e+=1)a[e]=c.charCodeAt(e)&255}return d=a};this.byteArrayToString=Runtime.byteArrayToString;this.readFile=function(c,b,d){if(g.hasOwnProperty(c))d(null,
+g[c]);else{var a=new XMLHttpRequest;a.open("GET",c,!0);a.onreadystatechange=function(){var e;4===a.readyState&&(0===a.status&&!a.responseText?d("File "+c+" is empty."):200===a.status||0===a.status?(e="binary"===b?"undefined"!==typeof VBArray?(new VBArray(a.responseBody)).toArray():f.byteArrayFromString(a.responseText,"binary"):a.responseText,g[c]=e,d(null,e)):d(a.responseText||a.statusText))};a.overrideMimeType&&("binary"!==b?a.overrideMimeType("text/plain; charset="+b):a.overrideMimeType("text/plain; charset=x-user-defined"));
+try{a.send(null)}catch(e){d(e.message)}}};this.read=function(c,b,a,k){if(g.hasOwnProperty(c))k(null,g[c].slice(b,b+a));else{var e=new XMLHttpRequest;e.open("GET",c,!0);e.onreadystatechange=function(){var i;4===e.readyState&&(0===e.status&&!e.responseText?k("File "+c+" is empty."):200===e.status||0===e.status?(i="undefined"!==typeof VBArray?(new VBArray(e.responseBody)).toArray():f.byteArrayFromString(e.responseText,"binary"),g[c]=i,k(null,i.slice(b,b+a))):k(e.responseText||e.statusText))};e.overrideMimeType&&
+e.overrideMimeType("text/plain; charset=x-user-defined");try{e.send(null)}catch(i){k(i.message)}}};this.readFileSync=function(c,b){var a=new XMLHttpRequest,k;a.open("GET",c,!1);a.overrideMimeType&&("binary"!==b?a.overrideMimeType("text/plain; charset="+b):a.overrideMimeType("text/plain; charset=x-user-defined"));try{if(a.send(null),200===a.status||0===a.status)k=a.responseText}catch(e){}return k};this.writeFile=function(c,b,a){g[c]=b;var k=new XMLHttpRequest;k.open("PUT",c,!0);k.onreadystatechange=
+function(){4===k.readyState&&(0===k.status&&!k.responseText?a("File "+c+" is empty."):200<=k.status&&300>k.status||0===k.status?a(null):a("Status "+k.status+": "+k.responseText||k.statusText))};b=b.buffer&&!k.sendAsBinary?b.buffer:f.byteArrayToString(b,"binary");try{k.sendAsBinary?k.sendAsBinary(b):k.send(b)}catch(e){f.log("HUH? "+e+" "+b),a(e.message)}};this.deleteFile=function(a,b){var d=new XMLHttpRequest;d.open("DELETE",a,!0);d.onreadystatechange=function(){4===d.readyState&&(200>d.status&&300<=
+d.status?b(d.responseText):b(null))};d.send(null)};this.loadXML=function(a,b){var d=new XMLHttpRequest;d.open("GET",a,!0);d.overrideMimeType&&d.overrideMimeType("text/xml");d.onreadystatechange=function(){4===d.readyState&&(0===d.status&&!d.responseText?b("File "+a+" is empty."):200===d.status||0===d.status?b(null,d.responseXML):b(d.responseText))};try{d.send(null)}catch(k){b(k.message)}};this.isFile=function(a,b){f.getFileSize(a,function(a){b(-1!==a)})};this.getFileSize=function(a,b){var d=new XMLHttpRequest;
+d.open("HEAD",a,!0);d.onreadystatechange=function(){if(4===d.readyState){var a=d.getResponseHeader("Content-Length");a?b(parseInt(a,10)):b(-1)}};d.send(null)};this.log=l;this.setTimeout=function(a,b){setTimeout(function(){a()},b)};this.libraryPaths=function(){return["lib"]};this.setCurrentDirectory=function(){};this.type=function(){return"BrowserRuntime"};this.getDOMImplementation=function(){return window.document.implementation};this.exit=function(a){l("Calling exit with code "+a+", but exit() is not implemented.")};
+this.getWindow=function(){return window}}
+function NodeJSRuntime(){var j=require("fs"),l="";this.ByteArray=function(f){return new Buffer(f)};this.byteArrayFromArray=function(f){var g=new Buffer(f.length),a,c=f.length;for(a=0;a<c;a+=1)g[a]=f[a];return g};this.concatByteArrays=function(f,g){var a=new Buffer(f.length+g.length);f.copy(a,0,0);g.copy(a,f.length,0);return a};this.byteArrayFromString=function(f,g){return new Buffer(f,g)};this.byteArrayToString=function(f,g){return f.toString(g)};this.readFile=function(f,g,a){"binary"!==g?j.readFile(f,
+g,a):j.readFile(f,null,a)};this.writeFile=function(f,g,a){j.writeFile(f,g,"binary",function(c){a(c||null)})};this.deleteFile=j.unlink;this.read=function(f,g,a,c){l&&(f=l+"/"+f);j.open(f,"r+",666,function(b,d){if(b)c(b);else{var k=new Buffer(a);j.read(d,k,0,a,g,function(a){j.close(d);c(a,k)})}})};this.readFileSync=function(f,g){return!g?"":j.readFileSync(f,g)};this.loadXML=function(){throw"Not implemented.";};this.isFile=function(f,g){l&&(f=l+"/"+f);j.stat(f,function(a,c){g(!a&&c.isFile())})};this.getFileSize=
+function(f,g){l&&(f=l+"/"+f);j.stat(f,function(a,c){a?g(-1):g(c.size)})};this.log=function(f){process.stderr.write(f+"\n")};this.setTimeout=function(f,g){setTimeout(function(){f()},g)};this.libraryPaths=function(){return[__dirname]};this.setCurrentDirectory=function(f){l=f};this.currentDirectory=function(){return l};this.type=function(){return"NodeJSRuntime"};this.getDOMImplementation=function(){return null};this.exit=process.exit;this.getWindow=function(){return null}}
+function RhinoRuntime(){var j=this,l=Packages.javax.xml.parsers.DocumentBuilderFactory.newInstance(),f,g,a="";l.setValidating(!1);l.setNamespaceAware(!0);l.setExpandEntityReferences(!1);l.setSchema(null);g=Packages.org.xml.sax.EntityResolver({resolveEntity:function(a,b){var d=new Packages.java.io.FileReader(b);return new Packages.org.xml.sax.InputSource(d)}});f=l.newDocumentBuilder();f.setEntityResolver(g);this.ByteArray=function(a){return[a]};this.byteArrayFromArray=function(a){return a};this.byteArrayFromString=
+function(a){var b=[],d,k=a.length;for(d=0;d<k;d+=1)b[d]=a.charCodeAt(d)&255;return b};this.byteArrayToString=Runtime.byteArrayToString;this.concatByteArrays=function(a,b){return a.concat(b)};this.loadXML=function(a,b){var d=new Packages.java.io.File(a),k;try{k=f.parse(d)}catch(e){print(e);b(e);return}b(null,k)};this.readFile=function(a,b,d){var k=new Packages.java.io.File(a),e="binary"===b?"latin1":b;k.isFile()?(a=readFile(a,e),"binary"===b&&(a=j.byteArrayFromString(a,"binary")),d(null,a)):d(a+" is not a file.")};
+this.writeFile=function(a,b,d){var a=new Packages.java.io.FileOutputStream(a),k,e=b.length;for(k=0;k<e;k+=1)a.write(b[k]);a.close();d(null)};this.deleteFile=function(a,b){(new Packages.java.io.File(a))["delete"]()?b(null):b("Could not delete "+a)};this.read=function(c,b,d,k){a&&(c=a+"/"+c);var e;e=c;var i="binary";(new Packages.java.io.File(e)).isFile()?("binary"===i&&(i="latin1"),e=readFile(e,i)):e=null;e?k(null,this.byteArrayFromString(e.substring(b,b+d),"binary")):k("Cannot read "+c)};this.readFileSync=
+function(a,b){return!b?"":readFile(a,b)};this.isFile=function(c,b){a&&(c=a+"/"+c);var d=new Packages.java.io.File(c);b(d.isFile())};this.getFileSize=function(c,b){a&&(c=a+"/"+c);var d=new Packages.java.io.File(c);b(d.length())};this.log=print;this.setTimeout=function(a){a()};this.libraryPaths=function(){return["lib"]};this.setCurrentDirectory=function(c){a=c};this.currentDirectory=function(){return a};this.type=function(){return"RhinoRuntime"};this.getDOMImplementation=function(){return f.getDOMImplementation()};
+this.exit=quit;this.getWindow=function(){return null}}var runtime=function(){return"undefined"!==typeof window?new BrowserRuntime(window.document.getElementById("logoutput")):"undefined"!==typeof require?new NodeJSRuntime:new RhinoRuntime}();
+(function(){function j(f){var a=f[0],c;c=eval("if (typeof "+a+" === 'undefined') {eval('"+a+" = {};');}"+a);for(a=1;a<f.length-1;a+=1)c.hasOwnProperty(f[a])||(c=c[f[a]]={});return c[f[f.length-1]]}var l={},f={};runtime.loadClass=function(g){function a(a){var a=a.replace(".","/")+".js",b=runtime.libraryPaths(),e,c,h;runtime.currentDirectory&&b.push(runtime.currentDirectory());for(e=0;e<b.length;e+=1){c=b[e];if(!f.hasOwnProperty(c))if((h=runtime.readFileSync(b[e]+"/manifest.js","utf8"))&&h.length)try{f[c]=
+eval(h)}catch(n){f[c]=null,runtime.log("Cannot load manifest for "+c+".")}else f[c]=null;if((c=f[c])&&c.indexOf&&-1!==c.indexOf(a))return b[e]+"/"+a}return null}if(!IS_COMPILED_CODE&&!l.hasOwnProperty(g)){var c=g.split("."),b;b=j(c);if(!b&&(b=function(b){var c,e;e=a(b);if(!e)throw b+" is not listed in any manifest.js.";try{c=runtime.readFileSync(e,"utf8")}catch(i){throw runtime.log("Error loading "+b+" "+i),i;}if(void 0===c)throw"Cannot load class "+b;try{c=eval(b+" = eval(code);")}catch(h){throw runtime.log("Error loading "+
+b+" "+h),h;}return c}(g),!b||Runtime.getFunctionName(b)!==c[c.length-1]))throw runtime.log("Loaded code is not for "+c[c.length-1]),"Loaded code is not for "+c[c.length-1];l[g]=!0}}})();
+(function(j){function l(f){if(f.length){var g=f[0];runtime.readFile(g,"utf8",function(a,c){function b(){var a;(a=eval(c))&&runtime.exit(a)}var d="";runtime.libraryPaths();-1!==g.indexOf("/")&&(d=g.substring(0,g.indexOf("/")));runtime.setCurrentDirectory(d);a?(runtime.log(a),runtime.exit(1)):b.apply(null,f)})}}j=Array.prototype.slice.call(j);"NodeJSRuntime"===runtime.type()?l(process.argv.slice(2)):"RhinoRuntime"===runtime.type()?l(j):l(j.slice(1))})("undefined"!==typeof arguments&&arguments);
+// Input 2
+core.Base64=function(){function j(a){var b=[],c,e=a.length;for(c=0;c<e;c+=1)b[c]=a.charCodeAt(c)&255;return b}function l(a){var b,c="",e,d=a.length-2;for(e=0;e<d;e+=3)b=a[e]<<16|a[e+1]<<8|a[e+2],c+=u[b>>>18],c+=u[b>>>12&63],c+=u[b>>>6&63],c+=u[b&63];e===d+1?(b=a[e]<<4,c+=u[b>>>6],c+=u[b&63],c+="=="):e===d&&(b=a[e]<<10|a[e+1]<<2,c+=u[b>>>12],c+=u[b>>>6&63],c+=u[b&63],c+="=");return c}function f(a){var a=a.replace(/[^A-Za-z0-9+\/]+/g,""),b=[],c=a.length%4,e,d=a.length,i;for(e=0;e<d;e+=4)i=(s[a.charAt(e)]||
+0)<<18|(s[a.charAt(e+1)]||0)<<12|(s[a.charAt(e+2)]||0)<<6|(s[a.charAt(e+3)]||0),b.push(i>>16,i>>8&255,i&255);b.length-=[0,0,2,1][c];return b}function g(a){var b=[],c,e=a.length,d;for(c=0;c<e;c+=1)d=a[c],128>d?b.push(d):2048>d?b.push(192|d>>>6,128|d&63):b.push(224|d>>>12&15,128|d>>>6&63,128|d&63);return b}function a(a){var b=[],c,e=a.length,d,i,m;for(c=0;c<e;c+=1)d=a[c],128>d?b.push(d):(c+=1,i=a[c],224>d?b.push((d&31)<<6|i&63):(c+=1,m=a[c],b.push((d&15)<<12|(i&63)<<6|m&63)));return b}function c(a){return l(j(a))}
+function b(a){return String.fromCharCode.apply(String,f(a))}function d(b){return a(j(b))}function k(b){for(var b=a(b),c="",e=0;e<b.length;)c+=String.fromCharCode.apply(String,b.slice(e,e+45E3)),e+=45E3;return c}function e(a,b,c){var e="",d,i,m;for(m=b;m<c;m+=1)b=a.charCodeAt(m)&255,128>b?e+=String.fromCharCode(b):(m+=1,d=a.charCodeAt(m)&255,224>b?e+=String.fromCharCode((b&31)<<6|d&63):(m+=1,i=a.charCodeAt(m)&255,e+=String.fromCharCode((b&15)<<12|(d&63)<<6|i&63)));return e}function i(a,b){function c(){var m=
+n+d;m>a.length&&(m=a.length);i+=e(a,n,m);n=m;m=n===a.length;b(i,m)&&!m&&runtime.setTimeout(c,0)}var d=1E5,i="",n=0;a.length<d?b(e(a,0,a.length),!0):("string"!==typeof a&&(a=a.slice()),c())}function h(a){return g(j(a))}function n(a){return String.fromCharCode.apply(String,g(a))}function o(a){return String.fromCharCode.apply(String,g(j(a)))}var u="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";(function(){var a=[],b;for(b=0;26>b;b+=1)a.push(65+b);for(b=0;26>b;b+=1)a.push(97+b);for(b=
+0;10>b;b+=1)a.push(48+b);a.push(43);a.push(47);return a})();var s=function(a){var b={},c,e;c=0;for(e=a.length;c<e;c+=1)b[a.charAt(c)]=c;return b}(u),p,w,B,A;(B=runtime.getWindow()&&runtime.getWindow().btoa)?p=function(a){return B(o(a))}:(B=c,p=function(a){return l(h(a))});(A=runtime.getWindow()&&runtime.getWindow().atob)?w=function(a){a=A(a);return e(a,0,a.length)}:(A=b,w=function(a){return k(f(a))});return function(){this.convertByteArrayToBase64=this.convertUTF8ArrayToBase64=l;this.convertBase64ToByteArray=
+this.convertBase64ToUTF8Array=f;this.convertUTF16ArrayToByteArray=this.convertUTF16ArrayToUTF8Array=g;this.convertByteArrayToUTF16Array=this.convertUTF8ArrayToUTF16Array=a;this.convertUTF8StringToBase64=c;this.convertBase64ToUTF8String=b;this.convertUTF8StringToUTF16Array=d;this.convertByteArrayToUTF16String=this.convertUTF8ArrayToUTF16String=k;this.convertUTF8StringToUTF16String=i;this.convertUTF16StringToByteArray=this.convertUTF16StringToUTF8Array=h;this.convertUTF16ArrayToUTF8String=n;this.convertUTF16StringToUTF8String=
+o;this.convertUTF16StringToBase64=p;this.convertBase64ToUTF16String=w;this.fromBase64=b;this.toBase64=c;this.atob=A;this.btoa=B;this.utob=o;this.btou=i;this.encode=p;this.encodeURI=function(a){return p(a).replace(/[+\/]/g,function(a){return a==="+"?"-":"_"}).replace(/\\=+$/,"")};this.decode=function(a){return w(a.replace(/[\-_]/g,function(a){return a==="-"?"+":"/"}))}}}();
+// Input 3
+core.RawDeflate=function(){function j(){this.dl=this.fc=0}function l(){this.extra_bits=this.static_tree=this.dyn_tree=null;this.max_code=this.max_length=this.elems=this.extra_base=0}function f(a,b,c,e){this.good_length=a;this.max_lazy=b;this.nice_length=c;this.max_chain=e}function g(){this.next=null;this.len=0;this.ptr=[];this.ptr.length=a;this.off=0}var a=8192,c,b,d,k,e=null,i,h,n,o,u,s,p,w,B,A,q,x,E,C,z,F,m,t,r,y,L,T,O,N,v,J,G,R,K,H,D,U,M,I,V,Z,S,$,Y,ha,ca,da,P,ia,pa,aa,ea,W,ba,ja,qa,ra=[0,0,0,
+0,0,0,0,0,1,1,1,1,2,2,2,2,3,3,3,3,4,4,4,4,5,5,5,5,0],fa=[0,0,0,0,1,1,2,2,3,3,4,4,5,5,6,6,7,7,8,8,9,9,10,10,11,11,12,12,13,13],Ha=[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,3,7],va=[16,17,18,0,8,7,9,6,10,5,11,4,12,3,13,2,14,1,15],ka;ka=[new f(0,0,0,0),new f(4,4,8,4),new f(4,5,16,8),new f(4,6,32,32),new f(4,4,16,16),new f(8,16,32,32),new f(8,16,128,128),new f(8,32,128,256),new f(32,128,258,1024),new f(32,258,258,4096)];var la=function(m){e[h+i++]=m;if(h+i===a){var r;if(0!==i){null!==c?(m=c,c=c.next):m=new g;
+m.next=null;m.len=m.off=0;null===b?b=d=m:d=d.next=m;m.len=i-h;for(r=0;r<m.len;r++)m.ptr[r]=e[h+r];i=h=0}}},ma=function(b){b&=65535;h+i<a-2?(e[h+i++]=b&255,e[h+i++]=b>>>8):(la(b&255),la(b>>>8))},na=function(){q=(q<<5^o[m+3-1]&255)&8191;x=p[32768+q];p[m&32767]=x;p[32768+q]=m},Q=function(a,b){B>16-b?(w|=a<<B,ma(w),w=a>>16-B,B+=b-16):(w|=a<<B,B+=b)},X=function(a,b){Q(b[a].fc,b[a].dl)},wa=function(a,b,c){return a[b].fc<a[c].fc||a[b].fc===a[c].fc&&S[b]<=S[c]},xa=function(a,b,c){var e;for(e=0;e<c&&qa<ja.length;e++)a[b+
+e]=ja.charCodeAt(qa++)&255;return e},sa=function(){var a,b,c=65536-y-m;if(-1===c)c--;else if(65274<=m){for(a=0;32768>a;a++)o[a]=o[a+32768];t-=32768;m-=32768;A-=32768;for(a=0;8192>a;a++)b=p[32768+a],p[32768+a]=32768<=b?b-32768:0;for(a=0;32768>a;a++)b=p[a],p[a]=32768<=b?b-32768:0;c+=32768}r||(a=xa(o,m+y,c),0>=a?r=!0:y+=a)},ya=function(a){var b=L,c=m,e,d=F,i=32506<m?m-32506:0,r=m+258,n=o[c+d-1],h=o[c+d];F>=N&&(b>>=2);do if(e=a,!(o[e+d]!==h||o[e+d-1]!==n||o[e]!==o[c]||o[++e]!==o[c+1])){c+=2;e++;do++c;
+while(o[c]===o[++e]&&o[++c]===o[++e]&&o[++c]===o[++e]&&o[++c]===o[++e]&&o[++c]===o[++e]&&o[++c]===o[++e]&&o[++c]===o[++e]&&o[++c]===o[++e]&&c<r);e=258-(r-c);c=r-258;if(e>d){t=a;d=e;if(258<=e)break;n=o[c+d-1];h=o[c+d]}}while((a=p[a&32767])>i&&0!==--b);return d},ga=function(a,b){s[P++]=b;0===a?v[b].fc++:(a--,v[$[b]+256+1].fc++,J[(256>a?Y[a]:Y[256+(a>>7)])&255].fc++,u[ia++]=a,aa|=ea);ea<<=1;0===(P&7)&&(da[pa++]=aa,aa=0,ea=1);if(2<O&&0===(P&4095)){var c=8*P,e=m-A,d;for(d=0;30>d;d++)c+=J[d].fc*(5+fa[d]);
+c>>=3;if(ia<parseInt(P/2,10)&&c<parseInt(e/2,10))return!0}return 8191===P||8192===ia},ta=function(a,b){for(var c=I[b],e=b<<1;e<=V;){e<V&&wa(a,I[e+1],I[e])&&e++;if(wa(a,c,I[e]))break;I[b]=I[e];b=e;e<<=1}I[b]=c},za=function(a,b){var c=0;do c|=a&1,a>>=1,c<<=1;while(0<--b);return c>>1},Aa=function(a,b){var c=[];c.length=16;var e=0,d;for(d=1;15>=d;d++)e=e+M[d-1]<<1,c[d]=e;for(e=0;e<=b;e++)d=a[e].dl,0!==d&&(a[e].fc=za(c[d]++,d))},ua=function(a){var b=a.dyn_tree,c=a.static_tree,e=a.elems,d,m=-1,i=e;V=0;
+Z=573;for(d=0;d<e;d++)0!==b[d].fc?(I[++V]=m=d,S[d]=0):b[d].dl=0;for(;2>V;)d=I[++V]=2>m?++m:0,b[d].fc=1,S[d]=0,W--,null!==c&&(ba-=c[d].dl);a.max_code=m;for(d=V>>1;1<=d;d--)ta(b,d);do d=I[1],I[1]=I[V--],ta(b,1),c=I[1],I[--Z]=d,I[--Z]=c,b[i].fc=b[d].fc+b[c].fc,S[i]=S[d]>S[c]+1?S[d]:S[c]+1,b[d].dl=b[c].dl=i,I[1]=i++,ta(b,1);while(2<=V);I[--Z]=I[1];i=a.dyn_tree;d=a.extra_bits;var e=a.extra_base,c=a.max_code,r=a.max_length,n=a.static_tree,t,h,f,k,q=0;for(h=0;15>=h;h++)M[h]=0;i[I[Z]].dl=0;for(a=Z+1;573>
+a;a++)if(t=I[a],h=i[i[t].dl].dl+1,h>r&&(h=r,q++),i[t].dl=h,!(t>c))M[h]++,f=0,t>=e&&(f=d[t-e]),k=i[t].fc,W+=k*(h+f),null!==n&&(ba+=k*(n[t].dl+f));if(0!==q){do{for(h=r-1;0===M[h];)h--;M[h]--;M[h+1]+=2;M[r]--;q-=2}while(0<q);for(h=r;0!==h;h--)for(t=M[h];0!==t;)d=I[--a],d>c||(i[d].dl!==h&&(W+=(h-i[d].dl)*i[d].fc,i[d].fc=h),t--)}Aa(b,m)},Ba=function(a,b){var c,e=-1,d,m=a[0].dl,i=0,h=7,r=4;0===m&&(h=138,r=3);a[b+1].dl=65535;for(c=0;c<=b;c++)if(d=m,m=a[c+1].dl,!(++i<h&&d===m))(i<r?K[d].fc+=i:0!==d?(d!==
+e&&K[d].fc++,K[16].fc++):10>=i?K[17].fc++:K[18].fc++,i=0,e=d,0===m)?(h=138,r=3):d===m?(h=6,r=3):(h=7,r=4)},Ca=function(){8<B?ma(w):0<B&&la(w);B=w=0},Da=function(a,b){var c,e=0,d=0,m=0,i=0,h,r;if(0!==P){do{0===(e&7)&&(i=da[m++]);c=s[e++]&255;if(0===(i&1))X(c,a);else if(h=$[c],X(h+256+1,a),r=ra[h],0!==r&&(c-=ha[h],Q(c,r)),c=u[d++],h=(256>c?Y[c]:Y[256+(c>>7)])&255,X(h,b),r=fa[h],0!==r)c-=ca[h],Q(c,r);i>>=1}while(e<P)}X(256,a)},Ea=function(a,b){var c,e=-1,d,m=a[0].dl,i=0,h=7,r=4;0===m&&(h=138,r=3);for(c=
+0;c<=b;c++)if(d=m,m=a[c+1].dl,!(++i<h&&d===m)){if(i<r){do X(d,K);while(0!==--i)}else 0!==d?(d!==e&&(X(d,K),i--),X(16,K),Q(i-3,2)):10>=i?(X(17,K),Q(i-3,3)):(X(18,K),Q(i-11,7));i=0;e=d;0===m?(h=138,r=3):d===m?(h=6,r=3):(h=7,r=4)}},Fa=function(){var a;for(a=0;286>a;a++)v[a].fc=0;for(a=0;30>a;a++)J[a].fc=0;for(a=0;19>a;a++)K[a].fc=0;v[256].fc=1;aa=P=ia=pa=W=ba=0;ea=1},oa=function(a){var b,c,e,d;d=m-A;da[pa]=aa;ua(H);ua(D);Ba(v,H.max_code);Ba(J,D.max_code);ua(U);for(e=18;3<=e&&0===K[va[e]].dl;e--);W+=
+3*(e+1)+14;b=W+3+7>>3;c=ba+3+7>>3;c<=b&&(b=c);if(d+4<=b&&0<=A){Q(0+a,3);Ca();ma(d);ma(~d);for(e=0;e<d;e++)la(o[A+e])}else if(c===b)Q(2+a,3),Da(G,R);else{Q(4+a,3);d=H.max_code+1;b=D.max_code+1;e+=1;Q(d-257,5);Q(b-1,5);Q(e-4,4);for(c=0;c<e;c++)Q(K[va[c]].dl,3);Ea(v,d-1);Ea(J,b-1);Da(v,J)}Fa();0!==a&&Ca()},Ga=function(a,d,m){var r,t,n;for(r=0;null!==b&&r<m;){t=m-r;t>b.len&&(t=b.len);for(n=0;n<t;n++)a[d+r+n]=b.ptr[b.off+n];b.off+=t;b.len-=t;r+=t;0===b.len&&(t=b,b=b.next,t.next=c,c=t)}if(r===m)return r;
+if(h<i){t=m-r;t>i-h&&(t=i-h);for(n=0;n<t;n++)a[d+r+n]=e[h+n];h+=t;r+=t;i===h&&(i=h=0)}return r},Ia=function(a,c,e){var d;if(!k){if(!r){B=w=0;var f,g;if(0===R[0].dl){H.dyn_tree=v;H.static_tree=G;H.extra_bits=ra;H.extra_base=257;H.elems=286;H.max_length=15;H.max_code=0;D.dyn_tree=J;D.static_tree=R;D.extra_bits=fa;D.extra_base=0;D.elems=30;D.max_length=15;D.max_code=0;U.dyn_tree=K;U.static_tree=null;U.extra_bits=Ha;U.extra_base=0;U.elems=19;U.max_length=7;for(g=f=U.max_code=0;28>g;g++){ha[g]=f;for(d=
+0;d<1<<ra[g];d++)$[f++]=g}$[f-1]=g;for(g=f=0;16>g;g++){ca[g]=f;for(d=0;d<1<<fa[g];d++)Y[f++]=g}for(f>>=7;30>g;g++){ca[g]=f<<7;for(d=0;d<1<<fa[g]-7;d++)Y[256+f++]=g}for(d=0;15>=d;d++)M[d]=0;for(d=0;143>=d;)G[d++].dl=8,M[8]++;for(;255>=d;)G[d++].dl=9,M[9]++;for(;279>=d;)G[d++].dl=7,M[7]++;for(;287>=d;)G[d++].dl=8,M[8]++;Aa(G,287);for(d=0;30>d;d++)R[d].dl=5,R[d].fc=za(d,5);Fa()}for(d=0;8192>d;d++)p[32768+d]=0;T=ka[O].max_lazy;N=ka[O].good_length;L=ka[O].max_chain;A=m=0;y=xa(o,0,65536);if(0>=y)r=!0,y=
+0;else{for(r=!1;262>y&&!r;)sa();for(d=q=0;2>d;d++)q=(q<<5^o[d]&255)&8191}b=null;h=i=0;3>=O?(F=2,z=0):(z=2,C=0);n=!1}k=!0;if(0===y)return n=!0,0}if((d=Ga(a,c,e))===e)return e;if(n)return d;if(3>=O)for(;0!==y&&null===b;){na();0!==x&&32506>=m-x&&(z=ya(x),z>y&&(z=y));if(3<=z)if(g=ga(m-t,z-3),y-=z,z<=T){z--;do m++,na();while(0!==--z);m++}else m+=z,z=0,q=o[m]&255,q=(q<<5^o[m+1]&255)&8191;else g=ga(0,o[m]&255),y--,m++;g&&(oa(0),A=m);for(;262>y&&!r;)sa()}else for(;0!==y&&null===b;){na();F=z;E=t;z=2;0!==x&&
+F<T&&32506>=m-x&&(z=ya(x),z>y&&(z=y),3===z&&4096<m-t&&z--);if(3<=F&&z<=F){g=ga(m-1-E,F-3);y-=F-1;F-=2;do m++,na();while(0!==--F);C=0;z=2;m++;g&&(oa(0),A=m)}else 0!==C?ga(0,o[m-1]&255)&&(oa(0),A=m):C=1,m++,y--;for(;262>y&&!r;)sa()}0===y&&(0!==C&&ga(0,o[m-1]&255),oa(1),n=!0);return d+Ga(a,d+c,e-d)};this.deflate=function(m,i){var h,t;ja=m;qa=0;"undefined"===typeof i&&(i=6);(h=i)?1>h?h=1:9<h&&(h=9):h=6;O=h;r=k=!1;if(null===e){c=b=d=null;e=[];e.length=a;o=[];o.length=65536;u=[];u.length=8192;s=[];s.length=
+32832;p=[];p.length=65536;v=[];v.length=573;for(h=0;573>h;h++)v[h]=new j;J=[];J.length=61;for(h=0;61>h;h++)J[h]=new j;G=[];G.length=288;for(h=0;288>h;h++)G[h]=new j;R=[];R.length=30;for(h=0;30>h;h++)R[h]=new j;K=[];K.length=39;for(h=0;39>h;h++)K[h]=new j;H=new l;D=new l;U=new l;M=[];M.length=16;I=[];I.length=573;S=[];S.length=573;$=[];$.length=256;Y=[];Y.length=512;ha=[];ha.length=29;ca=[];ca.length=30;da=[];da.length=1024}for(var n=Array(1024),f=[];0<(h=Ia(n,0,n.length));){var g=[];g.length=h;for(t=
+0;t<h;t++)g[t]=String.fromCharCode(n[t]);f[f.length]=g.join("")}ja=null;return f.join("")}};
+// Input 4
+core.ByteArray=function(j){this.pos=0;this.data=j;this.readUInt32LE=function(){var j=this.data,f=this.pos+=4;return j[--f]<<24|j[--f]<<16|j[--f]<<8|j[--f]};this.readUInt16LE=function(){var j=this.data,f=this.pos+=2;return j[--f]<<8|j[--f]}};
+// Input 5
+core.ByteArrayWriter=function(j){var l=this,f=new runtime.ByteArray(0);this.appendByteArrayWriter=function(g){f=runtime.concatByteArrays(f,g.getByteArray())};this.appendByteArray=function(g){f=runtime.concatByteArrays(f,g)};this.appendArray=function(g){f=runtime.concatByteArrays(f,runtime.byteArrayFromArray(g))};this.appendUInt16LE=function(f){l.appendArray([f&255,f>>8&255])};this.appendUInt32LE=function(f){l.appendArray([f&255,f>>8&255,f>>16&255,f>>24&255])};this.appendString=function(g){f=runtime.concatByteArrays(f,
+runtime.byteArrayFromString(g,j))};this.getLength=function(){return f.length};this.getByteArray=function(){return f}};
+// Input 6
+core.RawInflate=function(){var j,l,f=null,g,a,c,b,d,k,e,i,h,n,o,u,s,p,w=[0,1,3,7,15,31,63,127,255,511,1023,2047,4095,8191,16383,32767,65535],B=[3,4,5,6,7,8,9,10,11,13,15,17,19,23,27,31,35,43,51,59,67,83,99,115,131,163,195,227,258,0,0],A=[0,0,0,0,0,0,0,0,1,1,1,1,2,2,2,2,3,3,3,3,4,4,4,4,5,5,5,5,0,99,99],q=[1,2,3,4,5,7,9,13,17,25,33,49,65,97,129,193,257,385,513,769,1025,1537,2049,3073,4097,6145,8193,12289,16385,24577],x=[0,0,0,0,1,1,2,2,3,3,4,4,5,5,6,6,7,7,8,8,9,9,10,10,11,11,12,12,13,13],E=[16,17,18,
+0,8,7,9,6,10,5,11,4,12,3,13,2,14,1,15],C=function(){this.list=this.next=null},z=function(){this.n=this.b=this.e=0;this.t=null},F=function(a,b,c,d,e,m){this.BMAX=16;this.N_MAX=288;this.status=0;this.root=null;this.m=0;var h=Array(this.BMAX+1),i,r,t,n,f,k,g,q=Array(this.BMAX+1),o,j,p,y=new z,x=Array(this.BMAX);n=Array(this.N_MAX);var E,s=Array(this.BMAX+1),B,A,u;u=this.root=null;for(f=0;f<h.length;f++)h[f]=0;for(f=0;f<q.length;f++)q[f]=0;for(f=0;f<x.length;f++)x[f]=null;for(f=0;f<n.length;f++)n[f]=
+0;for(f=0;f<s.length;f++)s[f]=0;i=256<b?a[256]:this.BMAX;o=a;j=0;f=b;do h[o[j]]++,j++;while(0<--f);if(h[0]==b)this.root=null,this.status=this.m=0;else{for(k=1;k<=this.BMAX&&0==h[k];k++);g=k;m<k&&(m=k);for(f=this.BMAX;0!=f&&0==h[f];f--);t=f;m>f&&(m=f);for(B=1<<k;k<f;k++,B<<=1)if(0>(B-=h[k])){this.status=2;this.m=m;return}if(0>(B-=h[f]))this.status=2,this.m=m;else{h[f]+=B;s[1]=k=0;o=h;j=1;for(p=2;0<--f;)s[p++]=k+=o[j++];o=a;f=j=0;do if(0!=(k=o[j++]))n[s[k]++]=f;while(++f<b);b=s[t];s[0]=f=0;o=n;j=0;
+n=-1;E=q[0]=0;p=null;for(A=0;g<=t;g++)for(a=h[g];0<a--;){for(;g>E+q[1+n];){E+=q[1+n];n++;A=(A=t-E)>m?m:A;if((r=1<<(k=g-E))>a+1){r-=a+1;for(p=g;++k<A&&!((r<<=1)<=h[++p]);)r-=h[p]}E+k>i&&E<i&&(k=i-E);A=1<<k;q[1+n]=k;p=Array(A);for(r=0;r<A;r++)p[r]=new z;u=null==u?this.root=new C:u.next=new C;u.next=null;u.list=p;x[n]=p;0<n&&(s[n]=f,y.b=q[n],y.e=16+k,y.t=p,k=(f&(1<<E)-1)>>E-q[n],x[n-1][k].e=y.e,x[n-1][k].b=y.b,x[n-1][k].n=y.n,x[n-1][k].t=y.t)}y.b=g-E;j>=b?y.e=99:o[j]<c?(y.e=256>o[j]?16:15,y.n=o[j++]):
+(y.e=e[o[j]-c],y.n=d[o[j++]-c]);r=1<<g-E;for(k=f>>E;k<A;k+=r)p[k].e=y.e,p[k].b=y.b,p[k].n=y.n,p[k].t=y.t;for(k=1<<g-1;0!=(f&k);k>>=1)f^=k;for(f^=k;(f&(1<<E)-1)!=s[n];)E-=q[n],n--}this.m=q[1];this.status=0!=B&&1!=t?1:0}}},m=function(a){for(;b<a;)c|=(s.length==p?-1:s[p++])<<b,b+=8},t=function(a){return c&w[a]},r=function(a){c>>=a;b-=a},y=function(a,b,c){var f,k,g;if(0==c)return 0;for(g=0;;){m(o);k=h.list[t(o)];for(f=k.e;16<f;){if(99==f)return-1;r(k.b);f-=16;m(f);k=k.t[t(f)];f=k.e}r(k.b);if(16==f)l&=
+32767,a[b+g++]=j[l++]=k.n;else{if(15==f)break;m(f);e=k.n+t(f);r(f);m(u);k=n.list[t(u)];for(f=k.e;16<f;){if(99==f)return-1;r(k.b);f-=16;m(f);k=k.t[t(f)];f=k.e}r(k.b);m(f);i=l-k.n-t(f);for(r(f);0<e&&g<c;)e--,i&=32767,l&=32767,a[b+g++]=j[l++]=j[i++]}if(g==c)return c}d=-1;return g},L,T=function(a,b,c){var d,e,f,i,k,g,j,p=Array(316);for(d=0;d<p.length;d++)p[d]=0;m(5);g=257+t(5);r(5);m(5);j=1+t(5);r(5);m(4);d=4+t(4);r(4);if(286<g||30<j)return-1;for(e=0;e<d;e++)m(3),p[E[e]]=t(3),r(3);for(;19>e;e++)p[E[e]]=
+0;o=7;e=new F(p,19,19,null,null,o);if(0!=e.status)return-1;h=e.root;o=e.m;i=g+j;for(d=f=0;d<i;)if(m(o),k=h.list[t(o)],e=k.b,r(e),e=k.n,16>e)p[d++]=f=e;else if(16==e){m(2);e=3+t(2);r(2);if(d+e>i)return-1;for(;0<e--;)p[d++]=f}else{17==e?(m(3),e=3+t(3),r(3)):(m(7),e=11+t(7),r(7));if(d+e>i)return-1;for(;0<e--;)p[d++]=0;f=0}o=9;e=new F(p,g,257,B,A,o);0==o&&(e.status=1);if(0!=e.status)return-1;h=e.root;o=e.m;for(d=0;d<j;d++)p[d]=p[d+g];u=6;e=new F(p,j,0,q,x,u);n=e.root;u=e.m;return 0==u&&257<g||0!=e.status?
+-1:y(a,b,c)};this.inflate=function(E,C){null==j&&(j=Array(65536));b=c=l=0;d=-1;k=!1;e=i=0;h=null;s=E;p=0;var z=new runtime.ByteArray(C);a:{var w,G;for(w=0;w<C&&!(k&&-1==d);){if(0<e){if(0!=d)for(;0<e&&w<C;)e--,i&=32767,l&=32767,z[0+w++]=j[l++]=j[i++];else{for(;0<e&&w<C;)e--,l&=32767,m(8),z[0+w++]=j[l++]=t(8),r(8);0==e&&(d=-1)}if(w==C)break}if(-1==d){if(k)break;m(1);0!=t(1)&&(k=!0);r(1);m(2);d=t(2);r(2);h=null;e=0}switch(d){case 0:G=z;var R=0+w,K=C-w,H=void 0,H=b&7;r(H);m(16);H=t(16);r(16);m(16);if(H!=
+(~c&65535))G=-1;else{r(16);e=H;for(H=0;0<e&&H<K;)e--,l&=32767,m(8),G[R+H++]=j[l++]=t(8),r(8);0==e&&(d=-1);G=H}break;case 1:if(null!=h)G=y(z,0+w,C-w);else b:{G=z;R=0+w;K=C-w;if(null==f){for(var D=void 0,H=Array(288),D=void 0,D=0;144>D;D++)H[D]=8;for(;256>D;D++)H[D]=9;for(;280>D;D++)H[D]=7;for(;288>D;D++)H[D]=8;a=7;D=new F(H,288,257,B,A,a);if(0!=D.status){alert("HufBuild error: "+D.status);G=-1;break b}f=D.root;a=D.m;for(D=0;30>D;D++)H[D]=5;L=5;D=new F(H,30,0,q,x,L);if(1<D.status){f=null;alert("HufBuild error: "+
+D.status);G=-1;break b}g=D.root;L=D.m}h=f;n=g;o=a;u=L;G=y(G,R,K)}break;case 2:G=null!=h?y(z,0+w,C-w):T(z,0+w,C-w);break;default:G=-1}if(-1==G)break a;w+=G}}s=null;return z}};
+// Input 7
+core.Cursor=function(j,l){function f(a,b){for(var d=b;d&&d!==a;)d=d.parentNode;return d||b}function g(){var c,b,d;if(a.parentNode){b=0;for(c=a.parentNode.firstChild;c&&c!==a;)b+=1,c=c.nextSibling;a.previousSibling&&3===a.previousSibling.nodeType&&a.nextSibling&&3===a.nextSibling.nodeType&&(d=a.nextSibling,a.previousSibling.appendData(d.nodeValue));for(c=0;c<j.rangeCount;c+=1){var k=j.getRangeAt(c),e=b,i=void 0,h=void 0,i=a.parentNode,h=f(a,k.startContainer);f(a,k.endContainer);h===a?k.setStart(i,
+e):h===i&&k.startOffset>e&&k.setStart(i,k.startOffset-1);k.endContainer===a?k.setEnd(i,e):k.endContainer===i&&k.endOffset>e&&k.setEnd(i,k.endOffset-1)}if(d){for(c=0;c<j.rangeCount;c+=1){var k=j.getRangeAt(c),e=a.previousSibling,i=d,h=b,n=e.length-i.length;k.startContainer===i?k.setStart(e,n+k.startOffset):k.startContainer===e.parentNode&&k.startOffset===h&&k.setStart(e,n);k.endContainer===i?k.setEnd(e,n+k.endOffset):k.endContainer===e.parentNode&&k.endOffset===h&&k.setEnd(e,n)}d.parentNode.removeChild(d)}a.parentNode.removeChild(a)}}
+var a;a=l.createElementNS("urn:webodf:names:cursor","cursor");this.getNode=function(){return a};this.updateToSelection=function(){g();if(j.focusNode){var c=j.focusNode,b=j.focusOffset;if(3===c.nodeType){var d,f,e,i;i=c.parentNode;0===b?i.insertBefore(a,c):b===c.length?i.appendChild(a):(d=c.length,f=c.nextSibling,e=l.createTextNode(c.substringData(b,d)),c.deleteData(b,d),f?i.insertBefore(e,f):i.appendChild(e),i.insertBefore(a,e))}else if(9!==c.nodeType){for(d=c.firstChild;d&&b;)d=d.nextSibling,b-=
+1;c.insertBefore(a,d)}}};this.remove=function(){g()}};
+// Input 8
+core.UnitTest=function(){};core.UnitTest.prototype.setUp=function(){};core.UnitTest.prototype.tearDown=function(){};core.UnitTest.prototype.description=function(){};core.UnitTest.prototype.tests=function(){};core.UnitTest.prototype.asyncTests=function(){};
+core.UnitTestRunner=function(){function j(a){g+=1;runtime.log("fail",a)}function l(a,c){var b;try{if(a.length!==c.length)return!1;for(b=0;b<a.length;b+=1)if(a[b]!==c[b])return!1}catch(d){return!1}return!0}function f(a,c,b){("string"!==typeof c||"string"!==typeof b)&&runtime.log("WARN: shouldBe() expects string arguments");var d,f;try{f=eval(c)}catch(e){d=e}a=eval(b);d?j(c+" should be "+a+". Threw exception "+d):(0===a?f===a&&1/f===1/a:f===a||("number"===typeof a&&isNaN(a)?"number"===typeof f&&isNaN(f):
+Object.prototype.toString.call(a)===Object.prototype.toString.call([])&&l(f,a)))?runtime.log("pass",c+" is "+b):typeof f===typeof a?j(c+" should be "+a+". Was "+(0===f&&0>1/f?"-0":""+f)+"."):j(c+" should be "+a+" (of type "+typeof a+"). Was "+f+" (of type "+typeof f+").")}var g=0;this.shouldBeNull=function(a,c){f(a,c,"null")};this.shouldBeNonNull=function(a,c){var b,d;try{d=eval(c)}catch(f){b=f}b?j(c+" should be non-null. Threw exception "+b):null!==d?runtime.log("pass",c+" is non-null."):j(c+" should be non-null. Was "+
+d)};this.shouldBe=f;this.countFailedTests=function(){return g}};
+core.UnitTester=function(){var j=0,l={};this.runTests=function(f,g){function a(b){if(0===b.length)l[c]=e,j+=d.countFailedTests(),g();else{h=b[0];var f=Runtime.getFunctionName(h);runtime.log("Running "+f);o=d.countFailedTests();k.setUp();h(function(){k.tearDown();e[f]=o===d.countFailedTests();a(b.slice(1))})}}var c=Runtime.getFunctionName(f),b,d=new core.UnitTestRunner,k=new f(d),e={},i,h,n,o;if(c.hasOwnProperty(l))runtime.log("Test "+c+" has already run.");else{runtime.log("Running "+c+": "+k.description());
+n=k.tests();for(i=0;i<n.length;i+=1)h=n[i],b=Runtime.getFunctionName(h),runtime.log("Running "+b),o=d.countFailedTests(),k.setUp(),h(),k.tearDown(),e[b]=o===d.countFailedTests();a(k.asyncTests())}};this.countFailedTests=function(){return j};this.results=function(){return l}};
+// Input 9
+core.PointWalker=function(j){function l(a){for(var c=-1;a;)a=a.previousSibling,c+=1;return c}var f=j,g=null,a=j&&j.firstChild,c=0;this.setPoint=function(b,d){f=b;c=d;if(3===f.nodeType)g=a=null;else{for(a=f.firstChild;d;)d-=1,a=a.nextSibling;g=a?a.previousSibling:f.lastChild}};this.stepForward=function(){var b;return 3===f.nodeType&&(b="number"===typeof f.nodeValue.length?f.nodeValue.length:f.nodeValue.length(),c<b)?(c+=1,!0):a?(1===a.nodeType?(f=a,g=null,a=f.firstChild,c=0):3===a.nodeType?(f=a,a=
+g=null,c=0):(g=a,a=a.nextSibling,c+=1),!0):f!==j?(g=f,a=g.nextSibling,f=f.parentNode,c=l(g)+1,!0):!1};this.stepBackward=function(){return 3===f.nodeType&&0<c?(c-=1,!0):g?(1===g.nodeType?(f=g,g=f.lastChild,a=null,c=l(g)+1):3===g.nodeType?(f=g,a=g=null,c="number"===typeof f.nodeValue.length?f.nodeValue.length:f.nodeValue.length()):(a=g,g=g.previousSibling,c-=1),!0):f!==j?(a=f,g=a.previousSibling,f=f.parentNode,c=l(a),!0):!1};this.node=function(){return f};this.position=function(){return c};this.precedingSibling=
+function(){return g};this.followingSibling=function(){return a}};
+// Input 10
+core.Async=function(){this.forEach=function(j,l,f){function g(a){b!==c&&(a?(b=c,f(a)):(b+=1,b===c&&f(null)))}var a,c=j.length,b=0;for(a=0;a<c;a+=1)l(j[a],g)}};
+// Input 11
+runtime.loadClass("core.RawInflate");runtime.loadClass("core.ByteArray");runtime.loadClass("core.ByteArrayWriter");runtime.loadClass("core.Base64");
+core.Zip=function(j,l){function f(a){var b=[0,1996959894,3993919788,2567524794,124634137,1886057615,3915621685,2657392035,249268274,2044508324,3772115230,2547177864,162941995,2125561021,3887607047,2428444049,498536548,1789927666,4089016648,2227061214,450548861,1843258603,4107580753,2211677639,325883990,1684777152,4251122042,2321926636,335633487,1661365465,4195302755,2366115317,997073096,1281953886,3579855332,2724688242,1006888145,1258607687,3524101629,2768942443,901097722,1119000684,3686517206,2898065728,
+853044451,1172266101,3705015759,2882616665,651767980,1373503546,3369554304,3218104598,565507253,1454621731,3485111705,3099436303,671266974,1594198024,3322730930,2970347812,795835527,1483230225,3244367275,3060149565,1994146192,31158534,2563907772,4023717930,1907459465,112637215,2680153253,3904427059,2013776290,251722036,2517215374,3775830040,2137656763,141376813,2439277719,3865271297,1802195444,476864866,2238001368,4066508878,1812370925,453092731,2181625025,4111451223,1706088902,314042704,2344532202,
+4240017532,1658658271,366619977,2362670323,4224994405,1303535960,984961486,2747007092,3569037538,1256170817,1037604311,2765210733,3554079995,1131014506,879679996,2909243462,3663771856,1141124467,855842277,2852801631,3708648649,1342533948,654459306,3188396048,3373015174,1466479909,544179635,3110523913,3462522015,1591671054,702138776,2966460450,3352799412,1504918807,783551873,3082640443,3233442989,3988292384,2596254646,62317068,1957810842,3939845945,2647816111,81470997,1943803523,3814918930,2489596804,
+225274430,2053790376,3826175755,2466906013,167816743,2097651377,4027552580,2265490386,503444072,1762050814,4150417245,2154129355,426522225,1852507879,4275313526,2312317920,282753626,1742555852,4189708143,2394877945,397917763,1622183637,3604390888,2714866558,953729732,1340076626,3518719985,2797360999,1068828381,1219638859,3624741850,2936675148,906185462,1090812512,3747672003,2825379669,829329135,1181335161,3412177804,3160834842,628085408,1382605366,3423369109,3138078467,570562233,1426400815,3317316542,
+2998733608,733239954,1555261956,3268935591,3050360625,752459403,1541320221,2607071920,3965973030,1969922972,40735498,2617837225,3943577151,1913087877,83908371,2512341634,3803740692,2075208622,213261112,2463272603,3855990285,2094854071,198958881,2262029012,4057260610,1759359992,534414190,2176718541,4139329115,1873836001,414664567,2282248934,4279200368,1711684554,285281116,2405801727,4167216745,1634467795,376229701,2685067896,3608007406,1308918612,956543938,2808555105,3495958263,1231636301,1047427035,
+2932959818,3654703836,1088359270,936918E3,2847714899,3736837829,1202900863,817233897,3183342108,3401237130,1404277552,615818150,3134207493,3453421203,1423857449,601450431,3009837614,3294710456,1567103746,711928724,3020668471,3272380065,1510334235,755167117],c,e,d=a.length,f=0,f=0;c=-1;for(e=0;e<d;e+=1)f=(c^a[e])&255,f=b[f],c=c>>>8^f;return c^-1}function g(a){return new Date((a>>25&127)+1980,(a>>21&15)-1,a>>16&31,a>>11&15,a>>5&63,(a&31)<<1)}function a(a){var b=a.getFullYear();return 1980>b?0:b-1980<<
+25|a.getMonth()+1<<21|a.getDate()<<16|a.getHours()<<11|a.getMinutes()<<5|a.getSeconds()>>1}function c(a,b){var c,e,d,f,h,i,m,n=this;this.load=function(b){if(void 0!==n.data)b(null,n.data);else{var d=h+34+c+e+256;d+m>o&&(d=o-m);runtime.read(a,m,d,function(c,e){if(c)b(c,e);else a:{var d=e,m=new core.ByteArray(d),k=m.readUInt32LE(),g;if(67324752!==k)b("File entry signature is wrong."+k.toString()+" "+d.length.toString(),null);else{m.pos+=22;k=m.readUInt16LE();g=m.readUInt16LE();m.pos+=k+g;if(f){d=d.slice(m.pos,
+m.pos+h);if(h!==d.length){b("The amount of compressed bytes read was "+d.length.toString()+" instead of "+h.toString()+" for "+n.filename+" in "+a+".",null);break a}d=s(d,i)}else d=d.slice(m.pos,m.pos+i);i!==d.length?b("The amount of bytes read was "+d.length.toString()+" instead of "+i.toString()+" for "+n.filename+" in "+a+".",null):(n.data=d,b(null,d))}}})}};this.set=function(a,b,c,e){n.filename=a;n.data=b;n.compressed=c;n.date=e};this.error=null;b&&(33639248!==b.readUInt32LE()?this.error="Central directory entry has wrong signature at position "+
+(b.pos-4).toString()+' for file "'+a+'": '+b.data.length.toString():(b.pos+=6,f=b.readUInt16LE(),this.date=g(b.readUInt32LE()),b.readUInt32LE(),h=b.readUInt32LE(),i=b.readUInt32LE(),c=b.readUInt16LE(),e=b.readUInt16LE(),d=b.readUInt16LE(),b.pos+=8,m=b.readUInt32LE(),this.filename=runtime.byteArrayToString(b.data.slice(b.pos,b.pos+c),"utf8"),b.pos+=c+e+d))}function b(a,b){if(22!==a.length)b("Central directory length should be 22.",p);else{var e=new core.ByteArray(a),d;d=e.readUInt32LE();101010256!==
+d?b("Central directory signature is wrong: "+d.toString(),p):0!==e.readUInt16LE()?b("Zip files with non-zero disk numbers are not supported.",p):0!==e.readUInt16LE()?b("Zip files with non-zero disk numbers are not supported.",p):(d=e.readUInt16LE(),u=e.readUInt16LE(),d!==u?b("Number of entries is inconsistent.",p):(d=e.readUInt32LE(),e=e.readUInt16LE(),e=o-22-d,runtime.read(j,e,o-e,function(a,e){a:{var d=new core.ByteArray(e),f,m;n=[];for(f=0;f<u;f+=1){m=new c(j,d);if(m.error){b(m.error,p);break a}n[n.length]=
+m}b(null,p)}})))}}function d(a,b){var c=null,e,d;for(d=0;d<n.length;d+=1)if(e=n[d],e.filename===a){c=e;break}c?c.data?b(null,c.data):c.load(b):b(a+" not found.",null)}function k(a,b){d(a,function(a,c){if(a)return b(a,null);c=runtime.byteArrayToString(c,"utf8");b(null,c)})}function e(b){var c=new core.ByteArrayWriter("utf8"),e=0;c.appendArray([80,75,3,4,20,0,0,0,0,0]);b.data&&(e=b.data.length);c.appendUInt32LE(a(b.date));c.appendUInt32LE(f(b.data));c.appendUInt32LE(e);c.appendUInt32LE(e);c.appendUInt16LE(b.filename.length);
+c.appendUInt16LE(0);c.appendString(b.filename);b.data&&c.appendByteArray(b.data);return c}function i(b,c){var e=new core.ByteArrayWriter("utf8"),d=0;e.appendArray([80,75,1,2,20,0,20,0,0,0,0,0]);b.data&&(d=b.data.length);e.appendUInt32LE(a(b.date));e.appendUInt32LE(f(b.data));e.appendUInt32LE(d);e.appendUInt32LE(d);e.appendUInt16LE(b.filename.length);e.appendArray([0,0,0,0,0,0,0,0,0,0,0,0]);e.appendUInt32LE(c);e.appendString(b.filename);return e}function h(a,b){if(a===n.length)b(null);else{var c=n[a];
+void 0!==c.data?h(a+1,b):c.load(function(c){c?b(c):h(a+1,b)})}}var n,o,u,s=(new core.RawInflate).inflate,p=this,w=new core.Base64;this.load=d;this.save=function(a,b,e,d){var f,h;for(f=0;f<n.length;f+=1)if(h=n[f],h.filename===a){h.set(a,b,e,d);return}h=new c(j);h.set(a,b,e,d);n.push(h)};this.write=function(a){h(0,function(b){if(b)a(b);else{var b=new core.ByteArrayWriter("utf8"),c,d,f,h=[0];for(c=0;c<n.length;c+=1)b.appendByteArrayWriter(e(n[c])),h.push(b.getLength());f=b.getLength();for(c=0;c<n.length;c+=
+1)d=n[c],b.appendByteArrayWriter(i(d,h[c]));c=b.getLength()-f;b.appendArray([80,75,5,6,0,0,0,0]);b.appendUInt16LE(n.length);b.appendUInt16LE(n.length);b.appendUInt32LE(c);b.appendUInt32LE(f);b.appendArray([0,0]);runtime.writeFile(j,b.getByteArray(),a)}})};this.loadContentXmlAsFragments=function(a,b){k(a,function(a,c){if(a)return b.rootElementReady(a);b.rootElementReady(null,c,!0)})};this.loadAsString=k;this.loadAsDOM=function(a,b){k(a,function(a,c){a?b(a,null):(c=(new DOMParser).parseFromString(c,
+"text/xml"),b(null,c))})};this.loadAsDataURL=function(a,b,c){d(a,function(a,e){if(a)return c(a,null);var d=0,f;b||(b=80===e[1]&&78===e[2]&&71===e[3]?"image/png":255===e[0]&&216===e[1]&&255===e[2]?"image/jpeg":71===e[0]&&73===e[1]&&70===e[2]?"image/gif":"");for(f="data:"+b+";base64,";d<e.length;)f+=w.convertUTF8ArrayToBase64(e.slice(d,Math.min(d+45E3,e.length))),d+=45E3;c(null,f)})};this.getEntries=function(){return n.slice()};o=-1;null===l?n=[]:runtime.getFileSize(j,function(a){o=a;0>o?l("File '"+
+j+"' cannot be read.",p):runtime.read(j,o-22,22,function(a,c){a||null===l?l(a,p):b(c,l)})})};
+// Input 12
+xmldom.LSSerializerFilter=function(){};
+// Input 13
+"function"!==typeof Object.create&&(Object.create=function(j){var l=function(){};l.prototype=j;return new l});
+xmldom.LSSerializer=function(){function j(f,g){var a="",c=Object.create(f),b=l.filter?l.filter.acceptNode(g):1,d;if(1===b){d="";var k=g.attributes,e,i,h,n="",o;if(k){c[g.namespaceURI]!==g.prefix&&(c[g.namespaceURI]=g.prefix);d+="<"+g.nodeName;e=k.length;for(i=0;i<e;i+=1)if(h=k.item(i),"http://www.w3.org/2000/xmlns/"!==h.namespaceURI&&(o=l.filter?l.filter.acceptNode(h):1,1===o)){if(h.namespaceURI){o=h.prefix;var u=h.namespaceURI;c.hasOwnProperty(u)?o=c[u]+":":(c[u]!==o&&(c[u]=o),o+=":")}else o="";
+n+=" "+(o+h.localName+'="'+h.nodeValue+'"')}for(i in c)c.hasOwnProperty(i)&&((o=c[i])?"xmlns"!==o&&(d+=" xmlns:"+c[i]+'="'+i+'"'):d+=' xmlns="'+i+'"');d+=n+">"}a+=d}if(1===b||3===b){for(d=g.firstChild;d;)a+=j(c,d),d=d.nextSibling;g.nodeValue&&(a+=g.nodeValue)}1===b&&(c="",1===g.nodeType&&(c+="</"+g.nodeName+">"),a+=c);return a}var l=this;this.filter=null;this.writeToString=function(f,g){if(!f)return"";var a;if(g){a=g;var c={},b;for(b in a)a.hasOwnProperty(b)&&(c[a[b]]=b);a=c}else a={};return j(a,
+f)}};
+// Input 14
+xmldom.RelaxNGParser=function(){function j(a,b){this.message=function(){b&&(a+=1===b.nodeType?" Element ":" Node ",a+=b.nodeName,b.nodeValue&&(a+=" with value '"+b.nodeValue+"'"),a+=".");return a}}function l(a){if(2>=a.e.length)return a;var b={name:a.name,e:a.e.slice(0,2)};return l({name:a.name,e:[b].concat(a.e.slice(2))})}function f(a){var a=a.split(":",2),b="",c;1===a.length?a=["",a[0]]:b=a[0];for(c in d)d[c]===b&&(a[0]=c);return a}function g(a,b){for(var c=0,d,k,j=a.name;a.e&&c<a.e.length;)if(d=
+a.e[c],"ref"===d.name){k=b[d.a.name];if(!k)throw d.a.name+" was not defined.";d=a.e.slice(c+1);a.e=a.e.slice(0,c);a.e=a.e.concat(k.e);a.e=a.e.concat(d)}else c+=1,g(d,b);d=a.e;if("choice"===j&&(!d||!d[1]||"empty"===d[1].name))!d||!d[0]||"empty"===d[0].name?(delete a.e,a.name="empty"):(d[1]=d[0],d[0]={name:"empty"});if("group"===j||"interleave"===j)"empty"===d[0].name?"empty"===d[1].name?(delete a.e,a.name="empty"):(j=a.name=d[1].name,a.names=d[1].names,d=a.e=d[1].e):"empty"===d[1].name&&(j=a.name=
+d[0].name,a.names=d[0].names,d=a.e=d[0].e);"oneOrMore"===j&&"empty"===d[0].name&&(delete a.e,a.name="empty");if("attribute"===j){k=a.names?a.names.length:0;for(var s,p=a.localnames=[k],w=a.namespaces=[k],c=0;c<k;c+=1)s=f(a.names[c]),w[c]=s[0],p[c]=s[1]}"interleave"===j&&("interleave"===d[0].name?"interleave"===d[1].name?a.e=d[0].e.concat(d[1].e):a.e=[d[1]].concat(d[0].e):"interleave"===d[1].name&&(a.e=[d[0]].concat(d[1].e)))}function a(b,c){for(var d=0,f;b.e&&d<b.e.length;)f=b.e[d],"elementref"===
+f.name?(f.id=f.id||0,b.e[d]=c[f.id]):"element"!==f.name&&a(f,c),d+=1}var c=this,b,d={"http://www.w3.org/XML/1998/namespace":"xml"},k;k=function(a,b,c){var g=[],j,u,s=a.localName,p=[];j=a.attributes;var w=s,B=p,A={},q,x;for(q=0;q<j.length;q+=1)if(x=j.item(q),x.namespaceURI)"http://www.w3.org/2000/xmlns/"===x.namespaceURI&&(d[x.value]=x.localName);else{"name"===x.localName&&("element"===w||"attribute"===w)&&B.push(x.value);if("name"===x.localName||"combine"===x.localName||"type"===x.localName){var E=
+x,C;C=x.value;C=C.replace(/^\s\s*/,"");for(var z=/\s/,F=C.length-1;z.test(C.charAt(F));)F-=1;C=C.slice(0,F+1);E.value=C}A[x.localName]=x.value}j=A;j.combine=j.combine||void 0;a=a.firstChild;w=g;B=p;for(A="";a;){if(1===a.nodeType&&"http://relaxng.org/ns/structure/1.0"===a.namespaceURI){if(q=k(a,b,w))"name"===q.name?B.push(d[q.a.ns]+":"+q.text):"choice"===q.name&&q.names&&q.names.length&&(B=B.concat(q.names),delete q.names),w.push(q)}else 3===a.nodeType&&(A+=a.nodeValue);a=a.nextSibling}a=A;"value"!==
+s&&"param"!==s&&(a=/^\s*([\s\S]*\S)?\s*$/.exec(a)[1]);"value"===s&&void 0===j.type&&(j.type="token",j.datatypeLibrary="");if(("attribute"===s||"element"===s)&&void 0!==j.name)u=f(j.name),g=[{name:"name",text:u[1],a:{ns:u[0]}}].concat(g),delete j.name;"name"===s||"nsName"===s||"value"===s?void 0===j.ns&&(j.ns=""):delete j.ns;"name"===s&&(u=f(a),j.ns=u[0],a=u[1]);if(1<g.length&&("define"===s||"oneOrMore"===s||"zeroOrMore"===s||"optional"===s||"list"===s||"mixed"===s))g=[{name:"group",e:l({name:"group",
+e:g}).e}];2<g.length&&"element"===s&&(g=[g[0]].concat({name:"group",e:l({name:"group",e:g.slice(1)}).e}));1===g.length&&"attribute"===s&&g.push({name:"text",text:a});if(1===g.length&&("choice"===s||"group"===s||"interleave"===s))s=g[0].name,p=g[0].names,j=g[0].a,a=g[0].text,g=g[0].e;else if(2<g.length&&("choice"===s||"group"===s||"interleave"===s))g=l({name:s,e:g}).e;"mixed"===s&&(s="interleave",g=[g[0],{name:"text"}]);"optional"===s&&(s="choice",g=[g[0],{name:"empty"}]);"zeroOrMore"===s&&(s="choice",
+g=[{name:"oneOrMore",e:[g[0]]},{name:"empty"}]);if("define"===s&&j.combine){a:{w=j.combine;B=j.name;A=g;for(q=0;c&&q<c.length;q+=1)if(x=c[q],"define"===x.name&&x.a&&x.a.name===B){x.e=[{name:w,e:x.e.concat(A)}];c=x;break a}c=null}if(c)return}c={name:s};g&&0<g.length&&(c.e=g);for(u in j)if(j.hasOwnProperty(u)){c.a=j;break}void 0!==a&&(c.text=a);p&&0<p.length&&(c.names=p);"element"===s&&(c.id=b.length,b.push(c),c={name:"elementref",id:c.id});return c};this.parseRelaxNGDOM=function(e,f){var h=[],n=k(e&&
+e.documentElement,h,void 0),o,l,s={};for(o=0;o<n.e.length;o+=1)l=n.e[o],"define"===l.name?s[l.a.name]=l:"start"===l.name&&(b=l);if(!b)return[new j("No Relax NG start element was found.")];g(b,s);for(o in s)s.hasOwnProperty(o)&&g(s[o],s);for(o=0;o<h.length;o+=1)g(h[o],s);f&&(c.rootPattern=f(b.e[0],h));a(b,h);for(o=0;o<h.length;o+=1)a(h[o],h);c.start=b;c.elements=h;c.nsmap=d;return null}};
+// Input 15
+runtime.loadClass("xmldom.RelaxNGParser");
+xmldom.RelaxNG=function(){function j(a){return function(){var b;return function(){void 0===b&&(b=a());return b}}()}function l(a,b){return function(){var c={},d=0;return function(e){var f=e.hash||e.toString(),h;h=c[f];if(void 0!==h)return h;c[f]=h=b(e);h.hash=a+d.toString();d+=1;return h}}()}function f(a){return function(){var b={};return function(c){var d,e;e=b[c.localName];if(void 0===e)b[c.localName]=e={};else if(d=e[c.namespaceURI],void 0!==d)return d;return e[c.namespaceURI]=d=a(c)}}()}function g(a,
+b,c){return function(){var d={},e=0;return function(f,h){var i=b&&b(f,h),g,k;if(void 0!==i)return i;i=f.hash||f.toString();g=h.hash||h.toString();k=d[i];if(void 0===k)d[i]=k={};else if(i=k[g],void 0!==i)return i;k[g]=i=c(f,h);i.hash=a+e.toString();e+=1;return i}}()}function a(b,c){"choice"===c.p1.type?a(b,c.p1):b[c.p1.hash]=c.p1;"choice"===c.p2.type?a(b,c.p2):b[c.p2.hash]=c.p2}function c(a,b){return{type:"element",nc:a,nullable:!1,textDeriv:function(){return q},startTagOpenDeriv:function(c){return a.contains(c)?
+o(b,x):q},attDeriv:function(){return q},startTagCloseDeriv:function(){return this}}}function b(){return{type:"list",nullable:!1,hash:"list",textDeriv:function(){return x}}}function d(a,b,c,f){if(b===q)return q;if(f>=c.length)return b;0===f&&(f=0);for(var h=c.item(f);h.namespaceURI===e;){f+=1;if(f>=c.length)return b;h=c.item(f)}return h=d(a,b.attDeriv(a,c.item(f)),c,f+1)}function k(a,b,c){c.e[0].a?(a.push(c.e[0].text),b.push(c.e[0].a.ns)):k(a,b,c.e[0]);c.e[1].a?(a.push(c.e[1].text),b.push(c.e[1].a.ns)):
+k(a,b,c.e[1])}var e="http://www.w3.org/2000/xmlns/",i,h,n,o,u,s,p,w,B,A,q={type:"notAllowed",nullable:!1,hash:"notAllowed",textDeriv:function(){return q},startTagOpenDeriv:function(){return q},attDeriv:function(){return q},startTagCloseDeriv:function(){return q},endTagDeriv:function(){return q}},x={type:"empty",nullable:!0,hash:"empty",textDeriv:function(){return q},startTagOpenDeriv:function(){return q},attDeriv:function(){return q},startTagCloseDeriv:function(){return x},endTagDeriv:function(){return q}},
+E={type:"text",nullable:!0,hash:"text",textDeriv:function(){return E},startTagOpenDeriv:function(){return q},attDeriv:function(){return q},startTagCloseDeriv:function(){return E},endTagDeriv:function(){return q}},C,z,F;i=g("choice",function(a,b){if(a===q)return b;if(b===q||a===b)return a},function(b,c){var d={},e;a(d,{p1:b,p2:c});c=b=void 0;for(e in d)d.hasOwnProperty(e)&&(void 0===b?b=d[e]:c=void 0===c?d[e]:i(c,d[e]));return function(a,b){return{type:"choice",p1:a,p2:b,nullable:a.nullable||b.nullable,
+textDeriv:function(c,d){return i(a.textDeriv(c,d),b.textDeriv(c,d))},startTagOpenDeriv:f(function(c){return i(a.startTagOpenDeriv(c),b.startTagOpenDeriv(c))}),attDeriv:function(c,d){return i(a.attDeriv(c,d),b.attDeriv(c,d))},startTagCloseDeriv:j(function(){return i(a.startTagCloseDeriv(),b.startTagCloseDeriv())}),endTagDeriv:j(function(){return i(a.endTagDeriv(),b.endTagDeriv())})}}(b,c)});h=function(a,b,c){return function(){var d={},e=0;return function(f,h){var i=b&&b(f,h),k,g;if(void 0!==i)return i;
+i=f.hash||f.toString();k=h.hash||h.toString();i<k&&(g=i,i=k,k=g,g=f,f=h,h=g);g=d[i];if(void 0===g)d[i]=g={};else if(i=g[k],void 0!==i)return i;g[k]=i=c(f,h);i.hash=a+e.toString();e+=1;return i}}()}("interleave",function(a,b){if(a===q||b===q)return q;if(a===x)return b;if(b===x)return a},function(a,b){return{type:"interleave",p1:a,p2:b,nullable:a.nullable&&b.nullable,textDeriv:function(c,d){return i(h(a.textDeriv(c,d),b),h(a,b.textDeriv(c,d)))},startTagOpenDeriv:f(function(c){return i(C(function(a){return h(a,
+b)},a.startTagOpenDeriv(c)),C(function(b){return h(a,b)},b.startTagOpenDeriv(c)))}),attDeriv:function(c,d){return i(h(a.attDeriv(c,d),b),h(a,b.attDeriv(c,d)))},startTagCloseDeriv:j(function(){return h(a.startTagCloseDeriv(),b.startTagCloseDeriv())})}});n=g("group",function(a,b){if(a===q||b===q)return q;if(a===x)return b;if(b===x)return a},function(a,b){return{type:"group",p1:a,p2:b,nullable:a.nullable&&b.nullable,textDeriv:function(c,d){var e=n(a.textDeriv(c,d),b);return a.nullable?i(e,b.textDeriv(c,
+d)):e},startTagOpenDeriv:function(c){var d=C(function(a){return n(a,b)},a.startTagOpenDeriv(c));return a.nullable?i(d,b.startTagOpenDeriv(c)):d},attDeriv:function(c,d){return i(n(a.attDeriv(c,d),b),n(a,b.attDeriv(c,d)))},startTagCloseDeriv:j(function(){return n(a.startTagCloseDeriv(),b.startTagCloseDeriv())})}});o=g("after",function(a,b){if(a===q||b===q)return q},function(a,b){return{type:"after",p1:a,p2:b,nullable:!1,textDeriv:function(c,d){return o(a.textDeriv(c,d),b)},startTagOpenDeriv:f(function(c){return C(function(a){return o(a,
+b)},a.startTagOpenDeriv(c))}),attDeriv:function(c,d){return o(a.attDeriv(c,d),b)},startTagCloseDeriv:j(function(){return o(a.startTagCloseDeriv(),b)}),endTagDeriv:j(function(){return a.nullable?b:q})}});u=l("oneormore",function(a){return a===q?q:{type:"oneOrMore",p:a,nullable:a.nullable,textDeriv:function(b,c){return n(a.textDeriv(b,c),i(this,x))},startTagOpenDeriv:function(b){var c=this;return C(function(a){return n(a,i(c,x))},a.startTagOpenDeriv(b))},attDeriv:function(b,c){return n(a.attDeriv(b,
+c),i(this,x))},startTagCloseDeriv:j(function(){return u(a.startTagCloseDeriv())})}});p=g("attribute",void 0,function(a,b){return{type:"attribute",nullable:!1,nc:a,p:b,attDeriv:function(c,d){return a.contains(d)&&(b.nullable&&/^\s+$/.test(d.nodeValue)||b.textDeriv(c,d.nodeValue).nullable)?x:q},startTagCloseDeriv:function(){return q}}});s=l("value",function(a){return{type:"value",nullable:!1,value:a,textDeriv:function(b,c){return c===a?x:q},attDeriv:function(){return q},startTagCloseDeriv:function(){return this}}});
+B=l("data",function(a){return{type:"data",nullable:!1,dataType:a,textDeriv:function(){return x},attDeriv:function(){return q},startTagCloseDeriv:function(){return this}}});C=function t(a,b){return"after"===b.type?o(b.p1,a(b.p2)):"choice"===b.type?i(t(a,b.p1),t(a,b.p2)):b};z=function(a,b,c){for(var e=c.currentNode,b=b.startTagOpenDeriv(e),b=d(a,b,e.attributes,0),f=b=b.startTagCloseDeriv(),e=c.currentNode,b=c.firstChild(),h=[],g;b;)1===b.nodeType?h.push(b):3===b.nodeType&&!/^\s*$/.test(b.nodeValue)&&
+h.push(b.nodeValue),b=c.nextSibling();0===h.length&&(h=[""]);g=f;for(f=0;g!==q&&f<h.length;f+=1)b=h[f],"string"===typeof b?g=/^\s*$/.test(b)?i(g,g.textDeriv(a,b)):g.textDeriv(a,b):(c.currentNode=b,g=z(a,g,c));c.currentNode=e;return b=g.endTagDeriv()};w=function(a){var b,c,d;if("name"===a.name)b=a.text,c=a.a.ns,a={name:b,ns:c,hash:"{"+c+"}"+b,contains:function(a){return a.namespaceURI===c&&a.localName===b}};else if("choice"===a.name){b=[];c=[];k(b,c,a);a="";for(d=0;d<b.length;d+=1)a+="{"+c[d]+"}"+
+b[d]+",";a={hash:a,contains:function(a){var d;for(d=0;d<b.length;d+=1)if(b[d]===a.localName&&c[d]===a.namespaceURI)return!0;return!1}}}else a={hash:"anyName",contains:function(){return!0}};return a};A=function r(a,d){var e,f;if("elementref"===a.name){e=a.id||0;a=d[e];if(void 0!==a.name){var g=a;e=d[g.id]={hash:"element"+g.id.toString()};g=c(w(g.e[0]),A(g.e[1],d));for(f in g)g.hasOwnProperty(f)&&(e[f]=g[f]);f=e}else f=a;return f}switch(a.name){case "empty":return x;case "notAllowed":return q;case "text":return E;
+case "choice":return i(r(a.e[0],d),r(a.e[1],d));case "interleave":e=r(a.e[0],d);for(f=1;f<a.e.length;f+=1)e=h(e,r(a.e[f],d));return e;case "group":return n(r(a.e[0],d),r(a.e[1],d));case "oneOrMore":return u(r(a.e[0],d));case "attribute":return p(w(a.e[0]),r(a.e[1],d));case "value":return s(a.text);case "data":return e=a.a&&a.a.type,void 0===e&&(e=""),B(e);case "list":return b()}throw"No support for "+a.name;};this.makePattern=function(a,b){var c={},d;for(d in b)b.hasOwnProperty(d)&&(c[d]=b[d]);return d=
+A(a,c)};this.validate=function(a,b){var c;a.currentNode=a.root;c=z(null,F,a);c.nullable?b(null):(runtime.log("Error in Relax NG validation: "+c),b(["Error in Relax NG validation: "+c]))};this.init=function(a){F=a}};
+// Input 16
+runtime.loadClass("xmldom.RelaxNGParser");
+xmldom.RelaxNG2=function(){function j(a,c){this.message=function(){c&&(a+=1===c.nodeType?" Element ":" Node ",a+=c.nodeName,c.nodeValue&&(a+=" with value '"+c.nodeValue+"'"),a+=".");return a}}function l(b,c,f,e){return"empty"===b.name?null:a(b,c,f,e)}function f(a,d){if(2!==a.e.length)throw"Element with wrong # of elements: "+a.e.length;for(var f=d.currentNode,e=f?f.nodeType:0,g=null;1<e;){if(8!==e&&(3!==e||!/^\s+$/.test(d.currentNode.nodeValue)))return[new j("Not allowed node of type "+e+".")];e=
+(f=d.nextSibling())?f.nodeType:0}if(!f)return[new j("Missing element "+a.names)];if(a.names&&-1===a.names.indexOf(c[f.namespaceURI]+":"+f.localName))return[new j("Found "+f.nodeName+" instead of "+a.names+".",f)];if(d.firstChild()){for(g=l(a.e[1],d,f);d.nextSibling();)if(e=d.currentNode.nodeType,(!d.currentNode||!(3===d.currentNode.nodeType&&/^\s+$/.test(d.currentNode.nodeValue)))&&8!==e)return[new j("Spurious content.",d.currentNode)];if(d.parentNode()!==f)return[new j("Implementation error.")]}else g=
+l(a.e[1],d,f);d.nextSibling();return g}var g,a,c;a=function(b,c,g,e){var i=b.name,h=null;if("text"===i)a:{for(var n=(b=c.currentNode)?b.nodeType:0;b!==g&&3!==n;){if(1===n){h=[new j("Element not allowed here.",b)];break a}n=(b=c.nextSibling())?b.nodeType:0}c.nextSibling();h=null}else if("data"===i)h=null;else if("value"===i)e!==b.text&&(h=[new j("Wrong value, should be '"+b.text+"', not '"+e+"'",g)]);else if("list"===i)h=null;else if("attribute"===i)a:{if(2!==b.e.length)throw"Attribute with wrong # of elements: "+
+b.e.length;i=b.localnames.length;for(h=0;h<i;h+=1){e=g.getAttributeNS(b.namespaces[h],b.localnames[h]);""===e&&!g.hasAttributeNS(b.namespaces[h],b.localnames[h])&&(e=void 0);if(void 0!==n&&void 0!==e){h=[new j("Attribute defined too often.",g)];break a}n=e}h=void 0===n?[new j("Attribute not found: "+b.names,g)]:l(b.e[1],c,g,n)}else if("element"===i)h=f(b,c,g);else if("oneOrMore"===i){e=0;do n=c.currentNode,i=a(b.e[0],c,g),e+=1;while(!i&&n!==c.currentNode);1<e?(c.currentNode=n,h=null):h=i}else if("choice"===
+i){if(2!==b.e.length)throw"Choice with wrong # of options: "+b.e.length;n=c.currentNode;if("empty"===b.e[0].name){if(i=a(b.e[1],c,g,e))c.currentNode=n;h=null}else{if(i=l(b.e[0],c,g,e))c.currentNode=n,i=a(b.e[1],c,g,e);h=i}}else if("group"===i){if(2!==b.e.length)throw"Group with wrong # of members: "+b.e.length;h=a(b.e[0],c,g)||a(b.e[1],c,g)}else if("interleave"===i)a:{for(var n=b.e.length,e=[n],o=n,u,s,p,w;0<o;){u=0;s=c.currentNode;for(h=0;h<n;h+=1)p=c.currentNode,!0!==e[h]&&e[h]!==p&&(w=b.e[h],(i=
+a(w,c,g))?(c.currentNode=p,void 0===e[h]&&(e[h]=!1)):p===c.currentNode||"oneOrMore"===w.name||"choice"===w.name&&("oneOrMore"===w.e[0].name||"oneOrMore"===w.e[1].name)?(u+=1,e[h]=p):(u+=1,e[h]=!0));if(s===c.currentNode&&u===o)break;if(0===u){for(h=0;h<n;h+=1)if(!1===e[h]){h=[new j("Interleave does not match.",g)];break a}break}for(h=o=0;h<n;h+=1)!0!==e[h]&&(o+=1)}h=null}else throw i+" not allowed in nonEmptyPattern.";return h};this.validate=function(a,c){a.currentNode=a.root;var f=l(g.e[0],a,a.root);
+c(f)};this.init=function(a,d){g=a;c=d}};
+// Input 17
+xmldom.OperationalTransformInterface=function(){};xmldom.OperationalTransformInterface.prototype.retain=function(){};xmldom.OperationalTransformInterface.prototype.insertCharacters=function(){};xmldom.OperationalTransformInterface.prototype.insertElementStart=function(){};xmldom.OperationalTransformInterface.prototype.insertElementEnd=function(){};xmldom.OperationalTransformInterface.prototype.deleteCharacters=function(){};xmldom.OperationalTransformInterface.prototype.deleteElementStart=function(){};
+xmldom.OperationalTransformInterface.prototype.deleteElementEnd=function(){};xmldom.OperationalTransformInterface.prototype.replaceAttributes=function(){};xmldom.OperationalTransformInterface.prototype.updateAttributes=function(){};
+// Input 18
+xmldom.OperationalTransformDOM=function(){this.retain=function(){};this.insertCharacters=function(){};this.insertElementStart=function(){};this.insertElementEnd=function(){};this.deleteCharacters=function(){};this.deleteElementStart=function(){};this.deleteElementEnd=function(){};this.replaceAttributes=function(){};this.updateAttributes=function(){};this.atEnd=function(){return!0}};
+// Input 19
+xmldom.XPath=function(){function j(a,b,c){return-1!==a&&(a<b||-1===b)&&(a<c||-1===c)}function l(a){for(var b=[],c=0,d=a.length,e;c<d;){var f=a,g=d,i=b,k="",l=[],E=f.indexOf("[",c),C=f.indexOf("/",c),z=f.indexOf("=",c);j(C,E,z)?(k=f.substring(c,C),c=C+1):j(E,C,z)?(k=f.substring(c,E),c=h(f,E,l)):j(z,C,E)?(k=f.substring(c,z),c=z):(k=f.substring(c,g),c=g);i.push({location:k,predicates:l});if(c<d&&"="===a[c]){e=a.substring(c+1,d);if(2<e.length&&("'"===e[0]||'"'===e[0]))e=e.slice(1,e.length-1);else try{e=
+parseInt(e,10)}catch(F){}c=d}}return{steps:b,value:e}}function f(){}function g(){var a,c=!1;this.setNode=function(c){a=c};this.reset=function(){c=!1};this.next=function(){var b=c?null:a;c=!0;return b}}function a(a,c,b){this.reset=function(){a.reset()};this.next=function(){for(var d=a.next();d&&!(d=d.getAttributeNodeNS(c,b));)d=a.next();return d}}function c(a,c){var b=a.next(),d=null;this.reset=function(){a.reset();b=a.next();d=null};this.next=function(){for(;b;){if(d)if(c&&d.firstChild)d=d.firstChild;
+else{for(;!d.nextSibling&&d!==b;)d=d.parentNode;d===b?b=a.next():d=d.nextSibling}else{do(d=b.firstChild)||(b=a.next());while(b&&!d)}if(d&&1===d.nodeType)return d}return null}}function b(a,c){this.reset=function(){a.reset()};this.next=function(){for(var b=a.next();b&&!c(b);)b=a.next();return b}}function d(a,c,d){var c=c.split(":",2),e=d(c[0]),f=c[1];return new b(a,function(a){return a.localName===f&&a.namespaceURI===e})}function k(a,c,d){var e=new g,f=i(e,c,d),h=c.value;return void 0===h?new b(a,function(a){e.setNode(a);
+f.reset();return f.next()}):new b(a,function(a){e.setNode(a);f.reset();return(a=f.next())&&a.nodeValue===h})}function e(a,c,b){var d=a.ownerDocument,e=[],e=new g;e.setNode(a);a=l(c);e=i(e,a,b);a=[];for(b=e.next();b;)a.push(b),b=e.next();return e=a}var i,h;h=function(a,c,b){for(var d=c,e=a.length,f=0;d<e;)"]"===a[d]?(f-=1,0>=f&&b.push(l(a.substring(c,d)))):"["===a[d]&&(0>=f&&(c=d+1),f+=1),d+=1;return d};f.prototype.next=function(){};f.prototype.reset=function(){};i=function(b,e,f){var g,h,i,j;for(g=
+0;g<e.steps.length;g+=1){i=e.steps[g];h=i.location;""===h?b=new c(b,!1):"@"===h[0]?(j=h.slice(1).split(":",2),b=new a(b,f(j[0]),j[1])):"."!==h&&(b=new c(b,!1),-1!==h.indexOf(":")&&(b=d(b,h,f)));for(h=0;h<i.predicates.length;h+=1)j=i.predicates[h],b=k(b,j,f)}return b};xmldom.XPath=function(){this.getODFElementsWithXPath=e};return xmldom.XPath}();
+// Input 20
+odf.StyleInfo=function(){function j(f,g){for(var a=l[f.localName],c=a&&a[f.namespaceURI],b=c?c.length:0,d,k,e,a=0;a<b;a+=1)if(d=f.getAttributeNS(c[a].ns,c[a].localname))k=c[a].keygroup,(e=g[k])||(e=g[k]={}),e[d]=1;for(a=f.firstChild;a;)1===a.nodeType&&(c=a,j(c,g)),a=a.nextSibling}var l;this.UsedKeysList=function(f){var g={};this.uses=function(a){var c=a.localName,b=a.getAttributeNS("urn:oasis:names:tc:opendocument:xmlns:drawing:1.0","name")||a.getAttributeNS("urn:oasis:names:tc:opendocument:xmlns:style:1.0",
+"name"),a="style"===c?a.getAttributeNS("urn:oasis:names:tc:opendocument:xmlns:style:1.0","family"):"urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0"===a.namespaceURI?"data":c;return(a=g[a])?0<a[b]:!1};j(f,g)};this.canElementHaveStyle=function(f,g){var a=l[g.localName];return(a=a&&a[g.namespaceURI])&&0<a.length};l=function(f){var g,a,c,b,d,j={},e;for(g in f)if(f.hasOwnProperty(g)){c=f[g];d=c.length;for(a=0;a<d;a+=1)b=c[a],e=j[b.en]=j[b.en]||{},e=e[b.ens]=e[b.ens]||[],e.push({ns:b.ans,localname:b.a,
+keygroup:g})}return j}({text:[{ens:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",en:"tab-stop",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"leader-text-style"},{ens:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",en:"drop-cap",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"notes-configuration",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",a:"citation-body-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",
+en:"notes-configuration",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",a:"citation-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"a",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"alphabetical-index",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"linenumbering-configuration",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",
+a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"list-level-style-number",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"ruby-text",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"span",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"a",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",
+a:"visited-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",en:"text-properties",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"text-line-through-text-style"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"alphabetical-index-source",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",a:"main-entry-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"index-entry-bibliography",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",a:"style-name"},
+{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"index-entry-chapter",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"index-entry-link-end",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"index-entry-link-start",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",
+en:"index-entry-page-number",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"index-entry-span",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"index-entry-tab-stop",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"index-entry-text",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",
+a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"index-title-template",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"list-level-style-bullet",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"outline-level-style",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",a:"style-name"}],paragraph:[{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",
+en:"caption",ans:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",a:"text-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",en:"circle",ans:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",a:"text-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",en:"connector",ans:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",a:"text-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",en:"control",ans:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",
+a:"text-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",en:"custom-shape",ans:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",a:"text-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",en:"ellipse",ans:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",a:"text-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",en:"frame",ans:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",a:"text-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",
+en:"line",ans:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",a:"text-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",en:"measure",ans:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",a:"text-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",en:"path",ans:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",a:"text-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",en:"polygon",ans:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",
+a:"text-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",en:"polyline",ans:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",a:"text-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",en:"rect",ans:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",a:"text-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",en:"regular-polygon",ans:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",a:"text-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:office:1.0",
+en:"annotation",ans:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",a:"text-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:form:1.0",en:"column",ans:"urn:oasis:names:tc:opendocument:xmlns:form:1.0",a:"text-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",en:"style",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"next-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",en:"body",ans:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",a:"paragraph-style-name"},
+{ens:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",en:"even-columns",ans:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",a:"paragraph-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",en:"even-rows",ans:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",a:"paragraph-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",en:"first-column",ans:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",a:"paragraph-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",
+en:"first-row",ans:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",a:"paragraph-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",en:"last-column",ans:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",a:"paragraph-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",en:"last-row",ans:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",a:"paragraph-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",en:"odd-columns",ans:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",
+a:"paragraph-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",en:"odd-rows",ans:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",a:"paragraph-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"notes-configuration",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",a:"default-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"alphabetical-index-entry-template",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",
+en:"bibliography-entry-template",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"h",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"illustration-index-entry-template",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"index-source-style",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",
+a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"object-index-entry-template",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"p",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"table-index-entry-template",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",
+en:"table-of-content-entry-template",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"table-index-entry-template",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"user-index-entry-template",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",en:"page-layout-properties",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",
+a:"register-truth-ref-style-name"}],chart:[{ens:"urn:oasis:names:tc:opendocument:xmlns:chart:1.0",en:"axis",ans:"urn:oasis:names:tc:opendocument:xmlns:chart:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:chart:1.0",en:"chart",ans:"urn:oasis:names:tc:opendocument:xmlns:chart:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:chart:1.0",en:"data-label",ans:"urn:oasis:names:tc:opendocument:xmlns:chart:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:chart:1.0",
+en:"data-point",ans:"urn:oasis:names:tc:opendocument:xmlns:chart:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:chart:1.0",en:"equation",ans:"urn:oasis:names:tc:opendocument:xmlns:chart:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:chart:1.0",en:"error-indicator",ans:"urn:oasis:names:tc:opendocument:xmlns:chart:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:chart:1.0",en:"floor",ans:"urn:oasis:names:tc:opendocument:xmlns:chart:1.0",a:"style-name"},
+{ens:"urn:oasis:names:tc:opendocument:xmlns:chart:1.0",en:"footer",ans:"urn:oasis:names:tc:opendocument:xmlns:chart:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:chart:1.0",en:"grid",ans:"urn:oasis:names:tc:opendocument:xmlns:chart:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:chart:1.0",en:"legend",ans:"urn:oasis:names:tc:opendocument:xmlns:chart:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:chart:1.0",en:"mean-value",ans:"urn:oasis:names:tc:opendocument:xmlns:chart:1.0",
+a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:chart:1.0",en:"plot-area",ans:"urn:oasis:names:tc:opendocument:xmlns:chart:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:chart:1.0",en:"regression-curve",ans:"urn:oasis:names:tc:opendocument:xmlns:chart:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:chart:1.0",en:"series",ans:"urn:oasis:names:tc:opendocument:xmlns:chart:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:chart:1.0",en:"stock-gain-marker",
+ans:"urn:oasis:names:tc:opendocument:xmlns:chart:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:chart:1.0",en:"stock-loss-marker",ans:"urn:oasis:names:tc:opendocument:xmlns:chart:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:chart:1.0",en:"stock-range-line",ans:"urn:oasis:names:tc:opendocument:xmlns:chart:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:chart:1.0",en:"subtitle",ans:"urn:oasis:names:tc:opendocument:xmlns:chart:1.0",a:"style-name"},
+{ens:"urn:oasis:names:tc:opendocument:xmlns:chart:1.0",en:"title",ans:"urn:oasis:names:tc:opendocument:xmlns:chart:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:chart:1.0",en:"wall",ans:"urn:oasis:names:tc:opendocument:xmlns:chart:1.0",a:"style-name"}],section:[{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"alphabetical-index",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"bibliography",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",
+a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"illustration-index",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"index-title",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"object-index",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"section",
+ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"table-of-content",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"table-index",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"user-index",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",a:"style-name"}],ruby:[{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",
+en:"ruby",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",a:"style-name"}],table:[{ens:"urn:oasis:names:tc:opendocument:xmlns:database:1.0",en:"query",ans:"urn:oasis:names:tc:opendocument:xmlns:database:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:database:1.0",en:"table-representation",ans:"urn:oasis:names:tc:opendocument:xmlns:database:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",en:"background",ans:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",
+a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",en:"table",ans:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",a:"style-name"}],"table-column":[{ens:"urn:oasis:names:tc:opendocument:xmlns:database:1.0",en:"column",ans:"urn:oasis:names:tc:opendocument:xmlns:database:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",en:"table-column",ans:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",a:"style-name"}],"table-row":[{ens:"urn:oasis:names:tc:opendocument:xmlns:database:1.0",
+en:"query",ans:"urn:oasis:names:tc:opendocument:xmlns:database:1.0",a:"default-row-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:database:1.0",en:"table-representation",ans:"urn:oasis:names:tc:opendocument:xmlns:database:1.0",a:"default-row-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",en:"table-row",ans:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",a:"style-name"}],"table-cell":[{ens:"urn:oasis:names:tc:opendocument:xmlns:database:1.0",en:"column",ans:"urn:oasis:names:tc:opendocument:xmlns:database:1.0",
+a:"default-cell-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",en:"table-column",ans:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",a:"default-cell-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",en:"table-row",ans:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",a:"default-cell-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",en:"body",ans:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",
+en:"covered-table-cell",ans:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",en:"even-columns",ans:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",en:"covered-table-cell",ans:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",en:"even-columns",ans:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",
+a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",en:"even-rows",ans:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",en:"first-column",ans:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",en:"first-row",ans:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",en:"last-column",
+ans:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",en:"last-row",ans:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",en:"odd-columns",ans:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",en:"odd-rows",ans:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",
+en:"table-cell",ans:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",a:"style-name"}],graphic:[{ens:"urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0",en:"cube",ans:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0",en:"extrude",ans:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0",en:"rotate",ans:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",a:"style-name"},
+{ens:"urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0",en:"scene",ans:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0",en:"sphere",ans:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",en:"caption",ans:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",en:"circle",ans:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",
+a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",en:"connector",ans:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",en:"control",ans:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",en:"custom-shape",ans:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",
+en:"ellipse",ans:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",en:"frame",ans:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",en:"g",ans:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",en:"line",ans:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",
+en:"measure",ans:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",en:"page-thumbnail",ans:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",en:"path",ans:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",en:"polygon",ans:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",a:"style-name"},
+{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",en:"polyline",ans:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",en:"rect",ans:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",en:"regular-polygon",ans:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:office:1.0",en:"annotation",
+ans:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",a:"style-name"}],presentation:[{ens:"urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0",en:"cube",ans:"urn:oasis:names:tc:opendocument:xmlns:presentation:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0",en:"extrude",ans:"urn:oasis:names:tc:opendocument:xmlns:presentation:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0",en:"rotate",ans:"urn:oasis:names:tc:opendocument:xmlns:presentation:1.0",a:"style-name"},
+{ens:"urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0",en:"scene",ans:"urn:oasis:names:tc:opendocument:xmlns:presentation:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0",en:"sphere",ans:"urn:oasis:names:tc:opendocument:xmlns:presentation:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",en:"caption",ans:"urn:oasis:names:tc:opendocument:xmlns:presentation:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",en:"circle",
+ans:"urn:oasis:names:tc:opendocument:xmlns:presentation:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",en:"connector",ans:"urn:oasis:names:tc:opendocument:xmlns:presentation:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",en:"control",ans:"urn:oasis:names:tc:opendocument:xmlns:presentation:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",en:"custom-shape",ans:"urn:oasis:names:tc:opendocument:xmlns:presentation:1.0",
+a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",en:"ellipse",ans:"urn:oasis:names:tc:opendocument:xmlns:presentation:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",en:"frame",ans:"urn:oasis:names:tc:opendocument:xmlns:presentation:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",en:"g",ans:"urn:oasis:names:tc:opendocument:xmlns:presentation:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",
+en:"line",ans:"urn:oasis:names:tc:opendocument:xmlns:presentation:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",en:"measure",ans:"urn:oasis:names:tc:opendocument:xmlns:presentation:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",en:"page-thumbnail",ans:"urn:oasis:names:tc:opendocument:xmlns:presentation:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",en:"path",ans:"urn:oasis:names:tc:opendocument:xmlns:presentation:1.0",
+a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",en:"polygon",ans:"urn:oasis:names:tc:opendocument:xmlns:presentation:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",en:"polyline",ans:"urn:oasis:names:tc:opendocument:xmlns:presentation:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",en:"rect",ans:"urn:oasis:names:tc:opendocument:xmlns:presentation:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",
+en:"regular-polygon",ans:"urn:oasis:names:tc:opendocument:xmlns:presentation:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:office:1.0",en:"annotation",ans:"urn:oasis:names:tc:opendocument:xmlns:presentation:1.0",a:"style-name"}],"drawing-page":[{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",en:"page",ans:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:presentation:1.0",en:"notes",ans:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",
+a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",en:"handout-master",ans:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",en:"master-page",ans:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",a:"style-name"}],"list-style":[{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"list",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",
+en:"numbered-paragraph",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"list-item",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",a:"style-override"},{ens:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",en:"style",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"list-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",en:"style",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"data-style-name"},
+{ens:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",en:"style",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"percentage-data-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:presentation:1.0",en:"date-time-decl",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"data-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"creation-date",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"data-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",
+en:"creation-time",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"data-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"database-display",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"data-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"date",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"data-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"editing-duration",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",
+a:"data-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"expression",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"data-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"meta-field",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"data-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"modification-date",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"data-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",
+en:"modification-time",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"data-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"print-date",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"data-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"print-time",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"data-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"table-formula",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",
+a:"data-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"time",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"data-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"user-defined",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"data-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"user-field-get",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"data-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",
+en:"user-field-input",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"data-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"variable-get",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"data-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"variable-input",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"data-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"variable-set",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",
+a:"data-style-name"}],data:[{ens:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",en:"style",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"data-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",en:"style",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"percentage-data-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:presentation:1.0",en:"date-time-decl",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"data-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",
+en:"creation-date",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"data-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"creation-time",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"data-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"database-display",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"data-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"date",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",
+a:"data-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"editing-duration",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"data-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"expression",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"data-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"meta-field",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"data-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",
+en:"modification-date",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"data-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"modification-time",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"data-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"print-date",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"data-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"print-time",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",
+a:"data-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"table-formula",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"data-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"time",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"data-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"user-defined",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"data-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",
+en:"user-field-get",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"data-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"user-field-input",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"data-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"variable-get",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"data-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"variable-input",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",
+a:"data-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"variable-set",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"data-style-name"}],"page-layout":[{ens:"urn:oasis:names:tc:opendocument:xmlns:presentation:1.0",en:"notes",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"page-layout-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",en:"handout-master",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"page-layout-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",
+en:"master-page",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"page-layout-name"}]})};
+// Input 21
+odf.Style2CSS=function(){function j(a,b){var c={},d,e,f;if(!b)return c;for(d=b.firstChild;d;){d.namespaceURI===h&&"style"===d.localName?f=d.getAttributeNS(h,"family"):d.namespaceURI===n&&"list-style"===d.localName&&(f="list");if(e=f&&d.getAttributeNS&&d.getAttributeNS(h,"name"))c[f]||(c[f]={}),c[f][e]=d;d=d.nextSibling}return c}function l(a,c){if(!c||!a)return null;if(a[c])return a[c];var b,d;for(b in a)if(a.hasOwnProperty(b)&&(d=l(a[b].derivedStyles,c)))return d;return null}function f(a,c,b){var d=
+c[a],e,g;d&&((e=d.getAttributeNS(h,"parent-style-name"),g=null,e&&(g=l(b,e),!g&&c[e]&&(f(e,c,b),g=c[e],c[e]=null)),g)?(g.derivedStyles||(g.derivedStyles={}),g.derivedStyles[a]=d):b[a]=d)}function g(a,c){for(var b in a)a.hasOwnProperty(b)&&(f(b,a,c),a[b]=null)}function a(a,c){var b=u[a],d;if(null===b)return null;d="["+b+'|style-name="'+c+'"]';"presentation"===b&&(b="draw",d='[presentation|style-name="'+c+'"]');return b+"|"+s[a].join(d+","+b+"|")+d}function c(b,d,e){var f=[],g,h;f.push(a(b,d));for(g in e.derivedStyles)if(e.derivedStyles.hasOwnProperty(g))for(h in d=
+c(b,g,e.derivedStyles[g]),d)d.hasOwnProperty(h)&&f.push(d[h]);return f}function b(a,b,c){if(!a)return null;for(a=a.firstChild;a;){if(a.namespaceURI===b&&a.localName===c)return b=a;a=a.nextSibling}return null}function d(a,b){var c="",d,e;for(d in b)b.hasOwnProperty(d)&&(d=b[d],(e=a.getAttributeNS(d[0],d[1]))&&(c+=d[2]+":"+e+";"));return c}function k(a,b,c,d){b='text|list[text|style-name="'+b+'"]';for(c=(c=c.getAttributeNS(n,"level"))&&parseInt(c,10);1<c;)b+=" > text|list-item > text|list",c-=1;try{a.insertRule(b+
+" > list-item:before{"+d+"}",a.cssRules.length)}catch(e){throw e;}}function e(a,f,g,j){if("list"===f)for(var l=j.firstChild,m,t;l;){if(l.namespaceURI===n)if(m=l,"list-level-style-number"===l.localName){t=m;var r=t.getAttributeNS(h,"num-format"),o=t.getAttributeNS(h,"num-suffix"),s="",s={1:"decimal",a:"lower-latin",A:"upper-latin",i:"lower-roman",I:"upper-roman"},u="",u=t.getAttributeNS(h,"num-prefix")||"",u=s.hasOwnProperty(r)?u+(" counter(list, "+s[r]+")"):r?u+("'"+r+"';"):u+" ''";o&&(u+=" '"+o+
+"'");t=s="content: "+u+";";k(a,g,m,t)}else"list-level-style-image"===l.localName?(t="content: none;",k(a,g,m,t)):"list-level-style-bullet"===l.localName&&(t="content: '"+m.getAttributeNS(n,"bullet-char")+"';",k(a,g,m,t));l=l.nextSibling}else{g=c(f,g,j).join(",");l="";if(m=b(j,h,"text-properties")){t=""+d(m,p);r=m.getAttributeNS(h,"text-underline-style");"solid"===r&&(t+="text-decoration: underline;");if(r=m.getAttributeNS(h,"font-name"))(r='"'+r+'"')&&(t+="font-family: "+r+";");l+=t}if(m=b(j,h,"paragraph-properties")){t=
+m;m=""+d(t,B);t=t.getElementsByTagNameNS(h,"background-image");if(0<t.length&&(r=t.item(0).getAttributeNS(i,"href")))m+="background-image: url('odfkit:"+r+"');",t=t.item(0),m+=d(t,w);l+=m}if(m=b(j,h,"graphic-properties"))m=""+d(m,A),l+=m;if(m=b(j,h,"table-cell-properties"))m=""+d(m,q),l+=m;if(0!==l.length)try{a.insertRule(g+"{"+l+"}",a.cssRules.length)}catch(O){throw O;}}for(var N in j.derivedStyles)j.derivedStyles.hasOwnProperty(N)&&e(a,f,N,j.derivedStyles[N])}var i="http://www.w3.org/1999/xlink",
+h="urn:oasis:names:tc:opendocument:xmlns:style:1.0",n="urn:oasis:names:tc:opendocument:xmlns:text:1.0",o={draw:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",fo:"urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0",office:"urn:oasis:names:tc:opendocument:xmlns:office:1.0",presentation:"urn:oasis:names:tc:opendocument:xmlns:presentation:1.0",style:h,svg:"urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0",table:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",text:n,xlink:i},u=
+{graphic:"draw",paragraph:"text",presentation:"presentation",ruby:"text",section:"text",table:"table","table-cell":"table","table-column":"table","table-row":"table",text:"text",list:"text"},s={graphic:"circle,connected,control,custom-shape,ellipse,frame,g,line,measure,page,page-thumbnail,path,polygon,polyline,rect,regular-polygon".split(","),paragraph:"alphabetical-index-entry-template,h,illustration-index-entry-template,index-source-style,object-index-entry-template,p,table-index-entry-template,table-of-content-entry-template,user-index-entry-template".split(","),
+presentation:"caption,circle,connector,control,custom-shape,ellipse,frame,g,line,measure,page-thumbnail,path,polygon,polyline,rect,regular-polygon".split(","),ruby:["ruby","ruby-text"],section:"alphabetical-index,bibliography,illustration-index,index-title,object-index,section,table-of-content,table-index,user-index".split(","),table:["background","table"],"table-cell":"body,covered-table-cell,even-columns,even-rows,first-column,first-row,last-column,last-row,odd-columns,odd-rows,table-cell".split(","),
+"table-column":["table-column"],"table-row":["table-row"],text:"a,index-entry-chapter,index-entry-link-end,index-entry-link-start,index-entry-page-number,index-entry-span,index-entry-tab-stop,index-entry-text,index-title-template,linenumbering-configuration,list-level-style-number,list-level-style-bullet,outline-level-style,span".split(","),list:["list-item"]},p=[["urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0","color","color"],["urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0",
+"background-color","background-color"],["urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0","font-weight","font-weight"],["urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0","font-style","font-style"],["urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0","font-size","font-size"]],w=[[h,"repeat","background-repeat"]],B=[["urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0","background-color","background-color"],["urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0",
+"text-align","text-align"],["urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0","padding-left","padding-left"],["urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0","padding-right","padding-right"],["urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0","padding-top","padding-top"],["urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0","padding-bottom","padding-bottom"],["urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0","border-left","border-left"],["urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0",
+"border-right","border-right"],["urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0","border-top","border-top"],["urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0","border-bottom","border-bottom"],["urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0","margin-left","margin-left"],["urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0","margin-right","margin-right"],["urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0","margin-top","margin-top"],["urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0",
+"margin-bottom","margin-bottom"],["urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0","border","border"]],A=[["urn:oasis:names:tc:opendocument:xmlns:drawing:1.0","fill-color","background-color"],["urn:oasis:names:tc:opendocument:xmlns:drawing:1.0","fill","background"],["urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0","min-height","min-height"],["urn:oasis:names:tc:opendocument:xmlns:drawing:1.0","stroke","border"],["urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0",
+"stroke-color","border-color"]],q=[["urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0","background-color","background-color"],["urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0","border-left","border-left"],["urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0","border-right","border-right"],["urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0","border-top","border-top"],["urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0","border-bottom","border-bottom"]];
+this.namespaces=o;this.namespaceResolver=function(a){return o[a]||null};this.namespaceResolver.lookupNamespaceURI=this.namespaceResolver;this.style2css=function(a,b,c){for(var d,f,h,i,k;a.cssRules.length;)a.deleteRule(a.cssRules.length-1);d=null;b&&(d=b.ownerDocument);c&&(d=c.ownerDocument);if(d){for(f in o)if(o.hasOwnProperty(f)){i="@namespace "+f+" url("+o[f]+");";try{a.insertRule(i,a.cssRules.length)}catch(p){}}b=j(d,b);f=j(d,c);c={};for(k in u)if(u.hasOwnProperty(k))for(h in d=c[k]={},g(b[k],
+d),g(f[k],d),d)d.hasOwnProperty(h)&&e(a,k,h,d[h])}}};
+// Input 22
+runtime.loadClass("core.Base64");runtime.loadClass("xmldom.XPath");runtime.loadClass("odf.Style2CSS");
+odf.FontLoader=function(){function j(c,b,d,f,e){var g,h=0,l;for(l in c)c.hasOwnProperty(l)&&(h===d&&(g=l),h+=1);if(!g)return e();b.load(c[g].href,function(h,l){if(h)runtime.log(h);else{var n=f,n=document.styleSheets[0],p='@font-face { font-family: "'+g+'"; src: url(data:application/x-font-ttf;charset=binary;base64,'+a.convertUTF8ArrayToBase64(l)+') format("truetype"); }';try{n.insertRule(p,n.cssRules.length)}catch(w){runtime.log("Problem inserting rule in CSS: "+p)}}return j(c,b,d+1,f,e)})}function l(a,
+b,d){j(a,b,0,d,function(){})}var f=new odf.Style2CSS,g=new xmldom.XPath,a=new core.Base64;odf.FontLoader=function(){this.loadFonts=function(a,b,d){var j={},e,i,h;if(a){a=g.getODFElementsWithXPath(a,"style:font-face[svg:font-face-src]",f.namespaceResolver);for(e=0;e<a.length;e+=1)i=a[e],h=i.getAttributeNS(f.namespaces.style,"name"),i=g.getODFElementsWithXPath(i,"svg:font-face-src/svg:font-face-uri",f.namespaceResolver),0<i.length&&(i=i[0].getAttributeNS(f.namespaces.xlink,"href"),j[h]={href:i})}l(j,
+b,d)}};return odf.FontLoader}();
+// Input 23
+runtime.loadClass("core.Base64");runtime.loadClass("core.Zip");runtime.loadClass("xmldom.LSSerializer");runtime.loadClass("odf.StyleInfo");runtime.loadClass("odf.Style2CSS");runtime.loadClass("odf.FontLoader");
+odf.OdfContainer=function(){function j(a,b,c){for(a=a?a.firstChild:null;a;){if(a.localName===c&&a.namespaceURI===b)return a;a=a.nextSibling}return null}function l(a){var b,c=h.length;for(b=0;b<c;b+=1)if(a.namespaceURI===e&&a.localName===h[b])return b;return-1}function f(a,b){var c=a.automaticStyles,e;b&&(e=new d.UsedKeysList(b));this.acceptNode=function(a){return"http://www.w3.org/1999/xhtml"===a.namespaceURI?3:e&&a.parentNode===c&&1===a.nodeType?e.uses(a)?1:2:1}}function g(a,b){if(b){var c=l(b),
+d,e=a.firstChild;if(-1!==c){for(;e;){d=l(e);if(-1!==d&&d>c)break;e=e.nextSibling}a.insertBefore(b,e)}}}function a(a){this.OdfContainer=a}function c(a,b,c){var d=this;this.size=0;this.type=null;this.name=a;this.container=b;this.onchange=this.onreadystatechange=this.document=this.mimetype=this.url=null;this.EMPTY=0;this.LOADING=1;this.DONE=2;this.state=this.EMPTY;this.load=function(){var b=u[a];this.mimetype=b;c.loadAsDataURL(a,b,function(a,b){d.url=b;if(d.onchange)d.onchange(d);if(d.onstatereadychange)d.onstatereadychange(d)})};
+this.abort=function(){}}function b(){this.length=0;this.item=function(){}}var d=new odf.StyleInfo,k=new odf.Style2CSS,e="urn:oasis:names:tc:opendocument:xmlns:office:1.0",i="urn:oasis:names:tc:opendocument:xmlns:manifest:1.0",h="meta,settings,scripts,font-face-decls,styles,automatic-styles,master-styles,body".split(","),n=new core.Base64,o=new odf.FontLoader,u={};a.prototype=new function(){};a.prototype.constructor=a;a.namespaceURI=e;a.localName="document";c.prototype.load=function(){};c.prototype.getUrl=
+function(){return this.data?"data:;base64,"+n.toBase64(this.data):null};odf.OdfContainer=function p(d,h){function l(a){for(var b=a.firstChild,c;b;)c=b.nextSibling,1===b.nodeType?l(b):7===b.nodeType&&a.removeChild(b),b=c}function n(a){var b=v.rootElement.ownerDocument,c;if(a){l(a.documentElement);try{c=b.importNode(a.documentElement,!0)}catch(d){}}return c}function x(a){v.state=a;if(v.onchange)v.onchange(v);if(v.onstatereadychange)v.onstatereadychange(v)}function E(a){var a=n(a),b=v.rootElement;!a||
+"document-styles"!==a.localName||a.namespaceURI!==e?x(p.INVALID):(b.fontFaceDecls=j(a,e,"font-face-decls"),g(b,b.fontFaceDecls),b.styles=j(a,e,"styles"),g(b,b.styles),b.automaticStyles=j(a,e,"automatic-styles"),g(b,b.automaticStyles),b.masterStyles=j(a,e,"master-styles"),g(b,b.masterStyles),o.loadFonts(b.fontFaceDecls,J,null))}function C(a){var a=n(a),b,c,d;if(!a||"document-content"!==a.localName||a.namespaceURI!==e)x(p.INVALID);else{b=v.rootElement;c=j(a,e,"font-face-decls");if(b.fontFaceDecls&&
+c)for(d=c.firstChild;d;)b.fontFaceDecls.appendChild(d),d=c.firstChild;else c&&(b.fontFaceDecls=c,g(b,c));c=j(a,e,"automatic-styles");if(b.automaticStyles&&c)for(d=c.firstChild;d;)b.automaticStyles.appendChild(d),d=c.firstChild;else c&&(b.automaticStyles=c,g(b,c));b.body=j(a,e,"body");g(b,b.body)}}function z(a){var a=n(a),b;if(a&&!("document-meta"!==a.localName||a.namespaceURI!==e))b=v.rootElement,b.meta=j(a,e,"meta"),g(b,b.meta)}function F(a){var a=n(a),b;if(a&&!("document-settings"!==a.localName||
+a.namespaceURI!==e))b=v.rootElement,b.settings=j(a,e,"settings"),g(b,b.settings)}function m(a,b){J.loadAsDOM(a,b)}function t(){m("styles.xml",function(a,b){E(b);v.state!==p.INVALID&&m("content.xml",function(a,b){C(b);v.state!==p.INVALID&&m("meta.xml",function(a,b){z(b);v.state!==p.INVALID&&m("settings.xml",function(a,b){b&&F(b);m("META-INF/manifest.xml",function(a,b){if(b){var c=n(b),d;if(c&&!("manifest"!==c.localName||c.namespaceURI!==i)){d=v.rootElement;d.manifest=c;for(c=d.manifest.firstChild;c;)1===
+c.nodeType&&"file-entry"===c.localName&&c.namespaceURI===i&&(u[c.getAttributeNS(i,"full-path")]=c.getAttributeNS(i,"media-type")),c=c.nextSibling}}v.state!==p.INVALID&&x(p.DONE)})})})})})}function r(a,b){var c="",d;for(d in b)b.hasOwnProperty(d)&&(c+=" xmlns:"+d+'="'+b[d]+'"');return'<?xml version="1.0" encoding="UTF-8"?><office:'+a+" "+c+' office:version="1.2">'}function y(){var a=k.namespaces,b=new xmldom.LSSerializer,c=r("document-meta",a);b.filter=new f(v.rootElement);c+=b.writeToString(v.rootElement.meta,
+a);return c+"</office:document-meta>"}function L(){var a=k.namespaces,b=new xmldom.LSSerializer,c=r("document-settings",a);b.filter=new f(v.rootElement);c+=b.writeToString(v.rootElement.settings,a);return c+"</office:document-settings>"}function T(){var a=k.namespaces,b=new xmldom.LSSerializer,c=r("document-styles",a);b.filter=new f(v.rootElement,v.rootElement.masterStyles);c+=b.writeToString(v.rootElement.fontFaceDecls,a);c+=b.writeToString(v.rootElement.styles,a);c+=b.writeToString(v.rootElement.automaticStyles,
+a);c+=b.writeToString(v.rootElement.masterStyles,a);return c+"</office:document-styles>"}function O(){var a=k.namespaces,b=new xmldom.LSSerializer,c=r("document-content",a);b.filter=new f(v.rootElement,v.rootElement.body);c+=b.writeToString(v.rootElement.automaticStyles,a);c+=b.writeToString(v.rootElement.body,a);return c+"</office:document-content>"}function N(a,b){runtime.loadXML(a,function(a,c){if(a)b(a);else{var d=n(c);!d||"document"!==d.localName||d.namespaceURI!==e?x(p.INVALID):(v.rootElement=
+d,d.fontFaceDecls=j(d,e,"font-face-decls"),d.styles=j(d,e,"styles"),d.automaticStyles=j(d,e,"automatic-styles"),d.masterStyles=j(d,e,"master-styles"),d.body=j(d,e,"body"),d.meta=j(d,e,"meta"),x(p.DONE))}})}var v=this,J=null;this.onstatereadychange=h;this.parts=this.rootElement=this.state=this.onchange=null;this.getPart=function(a){return new c(a,v,J)};this.save=function(a){var b;b=runtime.byteArrayFromString(L(),"utf8");J.save("settings.xml",b,!0,new Date);b=runtime.byteArrayFromString(y(),"utf8");
+J.save("meta.xml",b,!0,new Date);b=runtime.byteArrayFromString(T(),"utf8");J.save("styles.xml",b,!0,new Date);b=runtime.byteArrayFromString(O(),"utf8");J.save("content.xml",b,!0,new Date);J.write(function(b){a(b)})};this.state=p.LOADING;this.rootElement=function(a){var b=document.createElementNS(a.namespaceURI,a.localName),c,a=new a;for(c in a)a.hasOwnProperty(c)&&(b[c]=a[c]);return b}(a);this.parts=new b(this);J=new core.Zip(d,function(a,b){J=b;a?N(d,function(b){a&&(J.error=a+"\n"+b,x(p.INVALID))}):
+t()})};odf.OdfContainer.EMPTY=0;odf.OdfContainer.LOADING=1;odf.OdfContainer.DONE=2;odf.OdfContainer.INVALID=3;odf.OdfContainer.SAVING=4;odf.OdfContainer.MODIFIED=5;odf.OdfContainer.getContainer=function(a){return new odf.OdfContainer(a,null)};return odf.OdfContainer}();
+// Input 24
+odf.Formatting=function(){function j(f){function g(a,b){for(var d=a&&a.firstChild;d&&b;)d=d.nextSibling,b-=1;return d}var a=g(f.startContainer,f.startOffset);g(f.endContainer,f.endOffset);this.next=function(){return null===a?a:null}}var l=new odf.StyleInfo;this.setOdfContainer=function(){};this.isCompletelyBold=function(){return!1};this.getAlignment=function(f){this.getParagraphStyles(f)};this.getParagraphStyles=function(f){var g,a,c,b=[];for(g=0;g<f.length;g+=0){a=void 0;c=[];for(a=(new j(f[g])).next();a;)l.canElementHaveStyle("paragraph",
+a)&&c.push(a);for(a=0;a<c.length;a+=1)-1===b.indexOf(c[a])&&b.push(c[a])}return b};this.getTextStyles=function(){return[]}};
+// Input 25
+runtime.loadClass("odf.OdfContainer");runtime.loadClass("odf.Formatting");runtime.loadClass("xmldom.XPath");
+odf.OdfCanvas=function(){function j(a){function b(){for(;0<c.cssRules.length;)c.deleteRule(0);c.insertRule("office|presentation draw|page {display:none;}",0);c.insertRule("office|presentation draw|page:nth-child("+d+") {display:block;}",1)}var c=a.sheet,d=1;this.showNextPage=function(){d+=1;b()};this.showPreviousPage=function(){1<d&&(d-=1,b())};this.css=a}function l(a,b,c){a.addEventListener?a.addEventListener(b,c,!1):a.attachEvent?a.attachEvent("on"+b,c):a["on"+b]=c}function f(a){function b(a,c){for(;c;){if(c===
+a)return!0;c=c.parentNode}return!1}function c(){var f=[],g=runtime.getWindow().getSelection(),h,i;for(h=0;h<g.rangeCount;h+=1)i=g.getRangeAt(h),null!==i&&b(a,i.startContainer)&&b(a,i.endContainer)&&f.push(i);if(f.length===d.length){for(g=0;g<f.length&&!(f[g]===d[g]?0:null===f[g]||null===d[g]||f[g].startContainer!==d[g].startContainer||f[g].startOffset!==d[g].startOffset||f[g].endContainer!==d[g].endContainer||f[g].endOffset!==d[g].endOffset);g+=1);if(g===f.length)return}d=f;var g=[f.length],j,k=a.ownerDocument;
+for(h=0;h<f.length;h+=1)i=f[h],j=k.createRange(),j.setStart(i.startContainer,i.startOffset),j.setEnd(i.endContainer,i.endOffset),g[h]=j;d=g;g=e.length;for(f=0;f<g;f+=1)e[f](a,d)}var d=[],e=[];this.addListener=function(a,b){var c,d=e.length;for(c=0;c<d;c+=1)if(e[c]===b)return;e.push(b)};l(a,"mouseup",c);l(a,"keyup",c);l(a,"keydown",c)}function g(a){for(a=a.firstChild;a;){if(a.namespaceURI===o&&"binary-data"===a.localName)return"data:image/png;base64,"+a.textContent;a=a.nextSibling}return""}function a(a,
+b,c,d){function e(b){b='draw|image[styleid="'+a+'"] {'+("background-image: url("+b+");")+"}";d.insertRule(b,d.cssRules.length)}c.setAttribute("styleid",a);var f=c.getAttributeNS(p,"href"),h;if(f)try{b.getPartUrl?(f=b.getPartUrl(f),e(f)):(h=b.getPart(f),h.onchange=function(a){e(a.url)},h.load())}catch(i){runtime.log("slight problem: "+i)}else f=g(c),e(f)}function c(b,c,d){function e(b,c,d,f){x.addToQueue(function(){a(b,c,d,f)})}var f,g;f=c.getElementsByTagNameNS(h,"image");for(c=0;c<f.length;c+=1)g=
+f.item(c),e("image"+c,b,g,d)}function b(a,b,c){function d(a,b){"video/"===b.substr(0,6)?(e=h.createElementNS(h.documentElement.namespaceURI,"video"),e.setAttribute("controls","controls"),f=h.createElement("source"),f.setAttribute("src",a),f.setAttribute("type",b),e.appendChild(f),c.parentNode.appendChild(e)):c.innerHtml="Unrecognised Plugin"}var e,f,h=c.ownerDocument,i;if(a=c.getAttributeNS(p,"href"))try{b.getPartUrl?(a=b.getPartUrl(a),d(a,"video/mp4")):(i=b.getPart(a),i.onchange=function(a){d(a.url,
+a.mimetype)},i.load())}catch(j){runtime.log("slight problem: "+j)}else runtime.log("using MP4 data fallback"),a=g(c),d(a,"video/mp4")}function d(a,c,d){function e(a,c,d,f){x.addToQueue(function(){b(a,c,d,f)})}var f,g;f=c.getElementsByTagNameNS(h,"plugin");runtime.log("Loading Videos:");for(c=0;c<f.length;c+=1)runtime.log("...Found a video."),g=f.item(c),e("video"+c,a,g,d)}function k(a){var b=a.getElementsByTagName("style"),c=a.getElementsByTagName("head")[0],d="",e,b=b&&0<b.length?b[0].cloneNode(!1):
+a.createElement("style");for(e in i)i.hasOwnProperty(e)&&e&&(d+="@namespace "+e+" url("+i[e]+");\n");b.appendChild(a.createTextNode(d));c.appendChild(b);return b}var e=new odf.Style2CSS,i=e.namespaces,h=i.draw,n=i.fo,o=i.office,u=i.svg,s=i.text,p=i.xlink,w=runtime.getWindow(),B=new xmldom.XPath,A={},q,x=new function(){function a(d){c=!0;runtime.setTimeout(function(){try{d()}catch(e){runtime.log(e)}c=!1;0<b.length&&a(b.pop())},10)}var b=[],c=!1;this.clearQueue=function(){b.length=0};this.addToQueue=
+function(d){if(0===b.length&&!c)return a(d);b.push(d)}};odf.OdfCanvas=function(a){function b(){var c=a.firstChild.firstChild;c&&(a.style.WebkitTransform="scale("+v+")",a.style.WebkitTransformOrigin="left top",a.style.width=Math.round(v*c.offsetWidth)+"px",a.style.height=Math.round(v*c.offsetHeight)+"px")}function g(f){function i(){for(var g=a;g.firstChild;)g.removeChild(g.firstChild);a.style.display="inline-block";g=f.rootElement;a.ownerDocument.importNode(g,!0);o.setOdfContainer(f);var j=T;(new odf.Style2CSS).style2css(j.sheet,
+g.styles,g.automaticStyles);var j=f,k=O.sheet,l;l=g.body;var p,q,w;q=[];for(p=l.firstChild;p&&p!==l;)if(p.namespaceURI===h&&(q[q.length]=p),p.firstChild)p=p.firstChild;else{for(;p&&p!==l&&!p.nextSibling;)p=p.parentNode;p&&p.nextSibling&&(p=p.nextSibling)}for(w=0;w<q.length;w+=1){p=q[w];var t="frame"+w,x=k;p.setAttribute("styleid",t);var v=void 0,y=p.getAttributeNS(s,"anchor-type"),G=p.getAttributeNS(u,"x"),z=p.getAttributeNS(u,"y"),F=p.getAttributeNS(u,"width"),L=p.getAttributeNS(u,"height"),P=p.getAttributeNS(n,
+"min-height"),N=p.getAttributeNS(n,"min-width");if("as-char"===y)v="display: inline-block;";else if(y||G||z)v="position: absolute;";else if(F||L||P||N)v="display: block;";G&&(v+="left: "+G+";");z&&(v+="top: "+z+";");F&&(v+="width: "+F+";");L&&(v+="height: "+L+";");P&&(v+="min-height: "+P+";");N&&(v+="min-width: "+N+";");v&&(v="draw|"+p.localName+'[styleid="'+t+'"] {'+v+"}",x.insertRule(v,x.cssRules.length))}w=B.getODFElementsWithXPath(l,".//*[*[@text:anchor-type='paragraph']]",e.namespaceResolver);
+for(q=0;q<w.length;q+=1)l=w[q],l.setAttributeNS&&l.setAttributeNS("urn:webodf","containsparagraphanchor",!0);k.insertRule("draw|page { background-color:#fff; }",k.cssRules.length);for(l=a;l.firstChild;)l.removeChild(l.firstChild);l=m.createElement("div");l.style.display="inline-block";l.style.background="white";l.appendChild(g);a.appendChild(l);c(j,g.body,k);d(j,g.body,k);b();if(A.hasOwnProperty("statereadychange")){g=A.statereadychange;for(j=0;j<g.length;j+=1)g[j](void 0)}}p===f&&(p.state===odf.OdfContainer.DONE?
+i():p.onchange=i)}function i(){if(q){for(var a=q.ownerDocument.createDocumentFragment();q.firstChild;)a.insertBefore(q.firstChild,null);q.parentNode.replaceChild(a,q)}}var m=a.ownerDocument,p,o=new odf.Formatting,y=new f(a),L=new j(k(m)),T=k(m),O=k(m),N=!1,v=1;this.odfContainer=function(){return p};this.slidevisibilitycss=function(){return L.css};this.load=this.load=function(b){x.clearQueue();a.innerHTML="loading "+b;p=new odf.OdfContainer(b,function(a){p=a;g(a)});p.onstatereadychange=g};this.save=
+function(a){i();p.save(a)};this.setEditable=function(a){(N=a)||i()};this.addListener=function(a,b){if("selectionchange"===a)y.addListener(a,b);else{var c=A[a];void 0===c&&(c=A[a]=[]);b&&-1===c.indexOf(b)&&c.push(b)}};this.getFormatting=function(){return o};this.setZoomLevel=function(a){v=a;b()};this.getZoomLevel=function(){return v};this.fitToContainingElement=function(c,d){var e=a.offsetHeight/v;v=c/(a.offsetWidth/v);d/e<v&&(v=d/e);b()};this.fitToWidth=function(c){v=c/(a.offsetWidth/v);b()};this.fitToHeight=
+function(c){v=c/(a.offsetHeight/v);b()};this.showNextPage=function(){L.showNextPage()};this.showPreviousPage=function(){L.showPreviousPage()};this.showAllPages=function(){};l(a,"click",function(a){for(var a=a||w.event,b=a.target,c=w.getSelection(),d=0<c.rangeCount?c.getRangeAt(0):null,e=d&&d.startContainer,f=d&&d.startOffset,g=d&&d.endContainer,h=d&&d.endOffset;b&&!(("p"===b.localName||"h"===b.localName)&&b.namespaceURI===s);)b=b.parentNode;N&&b&&b.parentNode!==q&&((q?q.parentNode&&i():(q=b.ownerDocument.createElement("p"),
+q.style||(q=b.ownerDocument.createElementNS("http://www.w3.org/1999/xhtml","p")),q.style.margin="0px",q.style.padding="0px",q.style.border="0px",q.setAttribute("contenteditable",!0)),b.parentNode.replaceChild(q,b),q.appendChild(b),q.focus(),d&&(c.removeAllRanges(),d=b.ownerDocument.createRange(),d.setStart(e,f),d.setEnd(g,h),c.addRange(d)),a.preventDefault)?(a.preventDefault(),a.stopPropagation()):(a.returnValue=!1,a.cancelBubble=!0))})};return odf.OdfCanvas}();
+// Input 26
+runtime.loadClass("xmldom.XPath");runtime.loadClass("odf.Style2CSS");
+gui.PresenterUI=function(){var j=new odf.Style2CSS,l=new xmldom.XPath,f=j.namespaceResolver;return function(g){var a=this;a.setInitialSlideMode=function(){a.startSlideMode("single")};a.keyDownHandler=function(c){if(!(c.target.isContentEditable||"input"===c.target.nodeName))switch(c.keyCode){case 84:a.toggleToolbar();break;case 37:case 8:a.prevSlide();break;case 39:case 32:a.nextSlide();break;case 36:a.firstSlide();break;case 35:a.lastSlide()}};a.root=function(){return a.odf_canvas.odfContainer().rootElement};
+a.firstSlide=function(){a.slideChange(function(){return 0})};a.lastSlide=function(){a.slideChange(function(a,b){return b-1})};a.nextSlide=function(){a.slideChange(function(a,b){return a+1<b?a+1:-1})};a.prevSlide=function(){a.slideChange(function(a){return 1>a?-1:a-1})};a.slideChange=function(c){var b=a.getPages(a.odf_canvas.odfContainer().rootElement),d=-1,f=0;b.forEach(function(a){a=a[1];a.hasAttribute("slide_current")&&(d=f,a.removeAttribute("slide_current"));f+=1});c=c(d,b.length);-1===c&&(c=d);
+b[c][1].setAttribute("slide_current","1");document.getElementById("pagelist").selectedIndex=c;"cont"===a.slide_mode&&window.scrollBy(0,b[c][1].getBoundingClientRect().top-30)};a.selectSlide=function(c){a.slideChange(function(a,d){return c>=d||0>c?-1:c})};a.scrollIntoContView=function(c){var b=a.getPages(a.odf_canvas.odfContainer().rootElement);0!==b.length&&window.scrollBy(0,b[c][1].getBoundingClientRect().top-30)};a.getPages=function(a){var a=a.getElementsByTagNameNS(f("draw"),"page"),b=[],d;for(d=
+0;d<a.length;d+=1)b.push([a[d].getAttribute("draw:name"),a[d]]);return b};a.fillPageList=function(c,b){for(var d=a.getPages(c),f,e,g;b.firstChild;)b.removeChild(b.firstChild);for(f=0;f<d.length;f+=1)e=document.createElement("option"),g=l.getODFElementsWithXPath(d[f][1],'./draw:frame[@presentation:class="title"]//draw:text-box/text:p',xmldom.XPath),g=0<g.length?g[0].textContent:d[f][0],e.textContent=f+1+": "+g,b.appendChild(e)};a.startSlideMode=function(c){var b=document.getElementById("pagelist"),
+d=a.odf_canvas.slidevisibilitycss().sheet;for(a.slide_mode=c;0<d.cssRules.length;)d.deleteRule(0);a.selectSlide(0);"single"===a.slide_mode?(d.insertRule("draw|page { position:fixed; left:0px;top:30px; z-index:1; }",0),d.insertRule("draw|page[slide_current]  { z-index:2;}",1),d.insertRule("draw|page  { -webkit-transform: scale(1);}",2),a.fitToWindow(),window.addEventListener("resize",a.fitToWindow,!1)):"cont"===a.slide_mode&&window.removeEventListener("resize",a.fitToWindow,!1);a.fillPageList(a.odf_canvas.odfContainer().rootElement,
+b)};a.toggleToolbar=function(){var c,b,d;c=a.odf_canvas.slidevisibilitycss().sheet;b=-1;for(d=0;d<c.cssRules.length;d+=1)if(".toolbar"===c.cssRules[d].cssText.substring(0,8)){b=d;break}-1<b?c.deleteRule(b):c.insertRule(".toolbar { position:fixed; left:0px;top:-200px; z-index:0; }",0)};a.fitToWindow=function(){var c=a.getPages(a.root()),b=(window.innerHeight-40)/c[0][1].clientHeight,c=(window.innerWidth-10)/c[0][1].clientWidth,b=b<c?b:c,c=a.odf_canvas.slidevisibilitycss().sheet;c.deleteRule(2);c.insertRule("draw|page { \n-moz-transform: scale("+
+b+"); \n-moz-transform-origin: 0% 0%; -webkit-transform-origin: 0% 0%; -webkit-transform: scale("+b+"); -o-transform-origin: 0% 0%; -o-transform: scale("+b+"); -ms-transform-origin: 0% 0%; -ms-transform: scale("+b+"); }",2)};a.load=function(c){a.odf_canvas.load(c)};a.odf_element=g;a.odf_canvas=new odf.OdfCanvas(a.odf_element);a.odf_canvas.addListener("statereadychange",a.setInitialSlideMode);a.slide_mode="undefined";document.addEventListener("keydown",a.keyDownHandler,!1)}}();
+// Input 27
+gui.Caret=function(j,l){l.ownerDocument.createElementNS("urn:webodf:names:cursor","cursor");this.updateToSelection=function(){1===j.rangeCount&&j.getRangeAt(0)}};
+// Input 28
+runtime.loadClass("core.Cursor");
+gui.SelectionMover=function(j,l){function f(a,c){if(0!==j.rangeCount){var f=j.getRangeAt(0);if(f.startContainer&&1===f.startContainer.nodeType){l.setPoint(f.startContainer,f.startOffset);c();f=l.node();l.position();var e=[],g;for(g=0;g<j.rangeCount;g+=1)e[g]=j.getRangeAt(g);j.removeAllRanges();0===e.length&&(e[0]=f.ownerDocument.createRange());e[e.length-1].setStart(l.node(),l.position());for(g=0;g<e.length;g+=1)j.addRange(e[g])}}}function g(){c.updateToSelection();for(var a=c.getNode().getBoundingClientRect(),
+d=a.left,f=a.top,a=!1;!a;){c.remove();if(j.focusNode&&1===j.focusNode.nodeType){l.setPoint(j.focusNode,j.focusOffset);l.stepForward();var a=l.node(),e=l.position();j.collapse(a,e);c.updateToSelection()}a=c.getNode().getBoundingClientRect();a=a.top!==f&&a.left>d}}var a=l.node().ownerDocument,c=new core.Cursor(j,a);this.movePointForward=function(a){f(a,l.stepForward)};this.movePointBackward=function(a){f(a,l.stepBackward)};this.moveLineForward=function(a){j.modify?j.modify(a?"extend":"move","forward",
+"line"):f(a,g)};this.moveLineBackward=function(a){j.modify?j.modify(a?"extend":"move","backward","line"):f(a,function(){})};return this};
+// Input 29
+runtime.loadClass("core.PointWalker");runtime.loadClass("core.Cursor");
+gui.XMLEdit=function(j,l){function f(a,b,c){a.addEventListener?a.addEventListener(b,c,!1):a.attachEvent?a.attachEvent("on"+b,c):a["on"+b]=c}function g(a){a.preventDefault?a.preventDefault():a.returnValue=!1}function a(){var a=j.ownerDocument.defaultView.getSelection();a&&!(0>=a.rangeCount)&&s&&(a=a.getRangeAt(0),s.setPoint(a.startContainer,a.startOffset))}function c(){var a=j.ownerDocument.defaultView.getSelection(),b,c;a.removeAllRanges();s&&s.node()&&(b=s.node(),c=b.ownerDocument.createRange(),
+c.setStart(b,s.position()),c.collapse(!0),a.addRange(c))}function b(b){var d=b.charCode||b.keyCode;if(s=null,s&&37===d)a(),s.stepBackward(),c();else if(16<=d&&20>=d||33<=d&&40>=d)return;g(b)}function d(){}function k(a){j.ownerDocument.defaultView.getSelection().getRangeAt(0);g(a)}function e(a){for(var b=a.firstChild;b&&b!==a;)1===b.nodeType&&e(b),b=b.nextSibling||b.parentNode;var c,d,f,b=a.attributes;c="";for(f=b.length-1;0<=f;f-=1)d=b.item(f),c=c+" "+d.nodeName+'="'+d.nodeValue+'"';a.setAttribute("customns_name",
+a.nodeName);a.setAttribute("customns_atts",c);b=a.firstChild;for(d=/^\s*$/;b&&b!==a;)c=b,b=b.nextSibling||b.parentNode,3===c.nodeType&&d.test(c.nodeValue)&&c.parentNode.removeChild(c)}function i(a,b){for(var c=a.firstChild,d,e,f;c&&c!==a;){if(1===c.nodeType){i(c,b);d=c.attributes;for(f=d.length-1;0<=f;f-=1)e=d.item(f),"http://www.w3.org/2000/xmlns/"===e.namespaceURI&&!b[e.nodeValue]&&(b[e.nodeValue]=e.localName)}c=c.nextSibling||c.parentNode}}function h(){var a=j.ownerDocument.createElement("style"),
+b;b={};i(j,b);var c={},d,e,f=0;for(d in b)if(b.hasOwnProperty(d)&&d){e=b[d];if(!e||c.hasOwnProperty(e)||"xmlns"===e){do e="ns"+f,f+=1;while(c.hasOwnProperty(e));b[d]=e}c[e]=!0}a.type="text/css";b="@namespace customns url(customns);\n"+n;a.appendChild(j.ownerDocument.createTextNode(b));l=l.parentNode.replaceChild(a,l)}var n,o,u,s=null;j.id||(j.id="xml"+(""+Math.random()).substring(2));o="#"+j.id+" ";n=o+"*,"+o+":visited, "+o+":link {display:block; margin: 0px; margin-left: 10px; font-size: medium; color: black; background: white; font-variant: normal; font-weight: normal; font-style: normal; font-family: sans-serif; text-decoration: none; white-space: pre-wrap; height: auto; width: auto}\n"+
+o+":before {color: blue; content: '<' attr(customns_name) attr(customns_atts) '>';}\n"+o+":after {color: blue; content: '</' attr(customns_name) '>';}\n"+o+"{overflow: auto;}\n";(function(a){f(a,"click",k);f(a,"keydown",b);f(a,"keypress",d);f(a,"drop",g);f(a,"dragend",g);f(a,"beforepaste",g);f(a,"paste",g)})(j);this.updateCSS=h;this.setXML=function(a){a=a.documentElement||a;u=a=j.ownerDocument.importNode(a,true);for(e(a);j.lastChild;)j.removeChild(j.lastChild);j.appendChild(a);h();s=new core.PointWalker(a)};
+this.getXML=function(){return u}};
+// Input 30
+(function(){return"core/Async.js,core/Base64.js,core/ByteArray.js,core/ByteArrayWriter.js,core/Cursor.js,core/JSLint.js,core/PointWalker.js,core/RawDeflate.js,core/RawInflate.js,core/UnitTester.js,core/Zip.js,gui/Caret.js,gui/SelectionMover.js,gui/XMLEdit.js,gui/PresenterUI.js,odf/FontLoader.js,odf/Formatting.js,odf/OdfCanvas.js,odf/OdfContainer.js,odf/Style2CSS.js,odf/StyleInfo.js,xmldom/LSSerializer.js,xmldom/LSSerializerFilter.js,xmldom/OperationalTransformDOM.js,xmldom/OperationalTransformInterface.js,xmldom/RelaxNG.js,xmldom/RelaxNG2.js,xmldom/RelaxNGParser.js,xmldom/XPath.js".split(",")})();
diff --git a/apps/files_odfviewer/src/.gitignore b/apps/files_odfviewer/src/.gitignore
new file mode 100644
index 0000000000..378eac25d3
--- /dev/null
+++ b/apps/files_odfviewer/src/.gitignore
@@ -0,0 +1 @@
+build
diff --git a/apps/files_odfviewer/src/update.sh b/apps/files_odfviewer/src/update.sh
new file mode 100755
index 0000000000..dad9bf35fb
--- /dev/null
+++ b/apps/files_odfviewer/src/update.sh
@@ -0,0 +1,9 @@
+cd webodf
+git pull
+cd ..
+rm -Rf build
+mkdir build
+cd build
+cmake ../webodf
+make webodf.js webodf-debug.js
+cp webodf/webodf*.js ../../js/
diff --git a/apps/files_odfviewer/src/webodf/.gitignore b/apps/files_odfviewer/src/webodf/.gitignore
new file mode 100644
index 0000000000..5f9afa1071
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/.gitignore
@@ -0,0 +1,17 @@
+#android/bin
+#android/gen
+nativeQtClient/nativeQtClient.pro.user
+programs/firefoxextension/content/webodf.js
+programs/firefoxextension/content/webodf.css
+programs/firefoxextension/install.rdf
+programs/ios/WebODF.xcodeproj/project.xcworkspace
+programs/ios/WebODF.xcodeproj/xcuserdata
+programs/ios/www/ZoomIn.png
+programs/ios/www/ZoomOut.png
+programs/ios/www/app/
+programs/ios/www/sencha-touch.css
+programs/ios/www/sencha-touch.js
+programs/ios/www/webodf.css
+programs/ios/www/webodf.js
+.DS_Store
+programs/ios/build/
diff --git a/apps/files_odfviewer/src/webodf/.gitmodules b/apps/files_odfviewer/src/webodf/.gitmodules
new file mode 100644
index 0000000000..0d440b2a36
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/.gitmodules
@@ -0,0 +1,9 @@
+[submodule "webodf/extjs"]
+	path = webodf/extjs
+	url = git://github.com/probonogeek/extjs.git
+[submodule "simplerevisionserver/pywebdav"]
+	path = simplerevisionserver/pywebdav
+	url = ssh://vandenoever@heap.kogmbh.net/srv/git/pywebdav
+[submodule "extjs"]
+	path = extjs
+	url = git://github.com/probonogeek/extjs.git
diff --git a/apps/files_odfviewer/src/webodf/CMakeLists.txt b/apps/files_odfviewer/src/webodf/CMakeLists.txt
new file mode 100644
index 0000000000..dfac345df1
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/CMakeLists.txt
@@ -0,0 +1,160 @@
+# WebODF is mostly a JavaScript project. CMake needs to know about the C++ parts
+project (WebODF C CXX)
+# version 2.8.2 is needed to have support for zip files in external projects
+cmake_minimum_required(VERSION 2.8.2)
+
+# At this point, the version number that is used throughout is defined
+set(WEBODF_VERSION 0.3.0)
+
+# This makefile 'compiles' WebODF using various tools, instruments the code and
+# builds and packages programs that use WebODF.
+
+# Find installed dependencies
+find_package(Qt4 4.7.0 COMPONENTS QtCore QtGui QtXml QtNetwork QtWebKit)
+if (NOT QT4_FOUND)
+  message(WARNING "Qt4 with modules QtCore QtGui QtXml QtNetwork QtWebKit was not found. qtjsruntime will no be built.")
+endif (NOT QT4_FOUND)
+
+# java runtime is needed for Closure Compiler
+find_package(Java COMPONENTS Runtime)
+
+if (CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR)
+  message(FATAL_ERROR "Compiling in the source directortory is not supported. Use for example 'mkdir build; cd build; cmake ..'.")
+endif (CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR)
+
+# Tools must be obtained to work with:
+include (ExternalProject)
+
+if(Java_JAVA_EXECUTABLE)
+    # Closure Compiler
+    ExternalProject_Add(
+        ClosureCompiler
+        URL "http://closure-compiler.googlecode.com/files/compiler-20120305.tar.gz"
+        URL_MD5 513344df6f18bfa00b17f034cabf897d
+        CONFIGURE_COMMAND ""
+        BUILD_COMMAND ""
+        INSTALL_COMMAND ""
+    )
+    set(CLOSURE_JAR ${CMAKE_BINARY_DIR}/ClosureCompiler-prefix/src/ClosureCompiler/compiler.jar)
+endif(Java_JAVA_EXECUTABLE)
+
+# Rhino
+if(Java_JAVA_EXECUTABLE)
+    ExternalProject_Add(
+        Rhino
+        URL "http://ftp.mozilla.org/pub/js/rhino1_7R3.zip"
+        URL_MD5 99d94103662a8d0b571e247a77432ac5
+        CONFIGURE_COMMAND ""
+        BUILD_COMMAND ""
+        INSTALL_COMMAND ""
+    )
+    set(RHINO ${CMAKE_BINARY_DIR}/Rhino-prefix/src/Rhino/js.jar)
+endif(Java_JAVA_EXECUTABLE)
+
+# JSDoc
+ExternalProject_Add(
+    JsDoc
+    URL "http://jsdoc-toolkit.googlecode.com/files/jsdoc_toolkit-2.4.0.zip"
+    URL_MD5 a8f78f5ecd24b54501147b2af341a231
+    CONFIGURE_COMMAND ""
+    BUILD_COMMAND ""
+    INSTALL_COMMAND ""
+)
+set(JSDOCDIR ${CMAKE_BINARY_DIR}/JsDoc-prefix/src/JsDoc/jsdoc-toolkit)
+
+# Node.JS
+ExternalProject_Add(
+    NodeJS
+    URL "http://nodejs.org/dist/v0.6.15/node-v0.6.15.tar.gz"
+    URL_MD5 852cfb1ed8125a4cdba456446d869d19
+    CONFIGURE_COMMAND "./configure"
+    BUILD_IN_SOURCE 1
+    INSTALL_COMMAND ""
+)
+set(NODE ${CMAKE_BINARY_DIR}/NodeJS-prefix/src/NodeJS/out/Release/node)
+
+# JSCoverage
+ExternalProject_Add(
+    JSCoverage
+    URL "http://siliconforks.com/jscoverage/download/jscoverage-0.5.1.tar.bz2"
+    URL_MD5 a70d79a6759367fbcc0bcc18d6866ff3
+    PATCH_COMMAND patch -p0 < ${CMAKE_CURRENT_SOURCE_DIR}/JSCoverage.patch
+    CONFIGURE_COMMAND "./configure"
+    BUILD_IN_SOURCE 1
+    INSTALL_COMMAND ""
+)
+set(JSCOVERAGE ${CMAKE_BINARY_DIR}/JSCoverage-prefix/src/JSCoverage/jscoverage)
+
+# Android
+if (NOT ANDROID_SDK_DIR)
+  find_path(ANDROID_SDK_DIR platform-tools/aapt)
+endif(NOT ANDROID_SDK_DIR)
+if (NOT ANT)
+  find_file(ANT NAMES ant ant.exe /usr/bin /usr/local/bin)
+endif(NOT ANT)
+
+
+
+set(LIBJSFILES lib/packages.js lib/runtime.js lib/core/Base64.js
+    lib/core/RawDeflate.js lib/core/ByteArray.js
+    lib/core/ByteArrayWriter.js lib/core/RawInflate.js
+    lib/core/Cursor.js lib/core/UnitTester.js
+    lib/core/PointWalker.js lib/core/Async.js
+    lib/core/Zip.js
+
+    lib/xmldom/LSSerializerFilter.js lib/xmldom/LSSerializer.js
+    lib/xmldom/RelaxNGParser.js lib/xmldom/RelaxNG.js
+    lib/xmldom/RelaxNG2.js lib/xmldom/OperationalTransformInterface.js
+    lib/xmldom/OperationalTransformDOM.js
+    lib/xmldom/XPath.js
+
+    lib/odf/StyleInfo.js lib/odf/Style2CSS.js
+    lib/odf/FontLoader.js lib/odf/OdfContainer.js
+    lib/odf/Formatting.js lib/odf/OdfCanvas.js
+
+    lib/gui/PresenterUI.js lib/gui/Caret.js
+    lib/gui/SelectionMover.js lib/gui/XMLEdit.js
+
+    lib/manifest.js
+)
+
+set(HTML5UIFILES
+  app/app.js app/controller/Files.js app/model/FileSystem.js
+  app/views/FileDetail.js app/views/FilesList.js app/views/OdfView.js
+  app/views/Viewport.js sencha-touch.css sencha-touch.js
+  app/store/FileStore.js
+  ZoomOut.png ZoomIn.png go-previous.png go-next.png
+  zoom-fit-width.png zoom-fit-best.png zoom-fit-height.png
+)
+
+add_subdirectory(webodf)
+add_subdirectory(programs)
+
+# package webodf
+set(WEBODFZIP webodf-${WEBODF_VERSION}.zip)
+set(WEBODFZIP_FILES
+  ${CMAKE_BINARY_DIR}/webodf/webodf-debug.js
+  ${CMAKE_BINARY_DIR}/webodf/webodf.js
+  ${CMAKE_SOURCE_DIR}/webodf/webodf.css
+)
+add_custom_command(
+    OUTPUT ${WEBODFZIP}
+    # zip using javascript code running in node.js
+    COMMAND ${NODE} ARGS webodf/lib/runtime.js packwebodf.js
+        ${CMAKE_BINARY_DIR}/${WEBODFZIP}
+#input files
+        ${WEBODFZIP_FILES}
+#output files
+        webodf-debug.js
+        webodf.js
+        webodf.css
+    DEPENDS NodeJS
+        packwebodf.js
+        ${WEBODFZIP_FILES}
+        webodf-debug.js
+        webodf.js
+    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+)
+add_custom_target(zip ALL DEPENDS ${WEBODFZIP})
+
+# vim:expandtab
diff --git a/apps/files_odfviewer/src/webodf/JSCoverage.patch b/apps/files_odfviewer/src/webodf/JSCoverage.patch
new file mode 100644
index 0000000000..b769f40b9d
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/JSCoverage.patch
@@ -0,0 +1,13 @@
+--- ./util.c_	2011-04-20 11:22:46.558521731 +0200
++++ ./util.c	2011-04-20 11:23:23.999880771 +0200
+@@ -478,6 +478,10 @@
+         p->next = head;
+         head = p;
+       }
++    else if (S_ISDIR(buf.st_mode)) {
++      head = recursive_dir_list(root, entry_wrt_root, head);
++      free(entry_wrt_root);
++    }
+       else {
+         fatal("refusing to follow symbolic link: %s", entry);
+       }
diff --git a/apps/files_odfviewer/src/webodf/packwebodf.js b/apps/files_odfviewer/src/webodf/packwebodf.js
new file mode 100644
index 0000000000..3a0d76c692
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/packwebodf.js
@@ -0,0 +1,93 @@
+/**
+ * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
+ * @licstart
+ * The JavaScript code in this page is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU Affero General Public License
+ * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.  The code is distributed
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
+ *
+ * As additional permission under GNU AGPL version 3 section 7, you
+ * may distribute non-source (e.g., minimized or compacted) forms of
+ * that code without the copy of the GNU GPL normally required by
+ * section 4, provided you include this license notice and a URL
+ * through which recipients can access the Corresponding Source.
+ *
+ * As a special exception to the AGPL, any HTML file which merely makes function
+ * calls to this code, and for that purpose includes it by reference shall be
+ * deemed a separate work for copyright law purposes. In addition, the copyright
+ * holders of this code give you permission to combine this code with free
+ * software libraries that are released under the GNU LGPL. You may copy and
+ * distribute such a system following the terms of the GNU AGPL for this code
+ * and the LGPL for the libraries. If you modify this code, you may extend this
+ * exception to your version of the code, but you are not obligated to do so.
+ * If you do not wish to do so, delete this exception statement from your
+ * version.
+ *
+ * This license applies to this entire compilation.
+ * @licend
+ * @source: http://www.webodf.org/
+ * @source: http://gitorious.org/odfkit/webodf/
+ */
+/*global runtime: true, core: true*/
+runtime.loadClass("core.Zip");
+runtime.loadClass("core.Base64");
+
+function addFiles(zip, pos, inputfiles, zipfiles, callback) {
+    "use strict";
+    if (inputfiles.length !== zipfiles.length) {
+        return callback(
+                "Arrays inputfiles and zipfiles should have the same length.");
+    }
+    if (pos >= inputfiles.length) {
+        zip.write(function (err) {
+            return callback(err);
+        });
+        return;
+    }
+    var inputfile = inputfiles[pos],
+        zipmemberpath = zipfiles[pos];
+    runtime.readFile(inputfile, "binary", function (err, data) {
+        var base64;
+        if (err) {
+            return callback(err);
+        }
+        zip.save(zipmemberpath, data, false, new Date());
+        addFiles(zip, pos + 1, inputfiles, zipfiles, callback);
+    });
+}
+
+function usage() {
+    "use strict";
+    runtime.log("Usage:");
+}
+
+/**
+ * This script takes 1+2n arguments
+ * First argument is the name of the target zip file.
+ * The next n arguments are the input files. The last n arguments are the
+ * names of the files in the zip file.
+ */
+if (arguments.length % 2 !== 0) {
+    runtime.log("Wrong number of arguments.");
+    usage();
+    runtime.exit(1);
+}
+var args = arguments,
+    n = (args.length - 2) / 2,
+    zipfilename = args[1],
+    inputmembers = [],
+    zipmembers = [],
+    i,
+    zip = new core.Zip(zipfilename, null);
+for (i = 0; i < n; i += 1) {
+    inputmembers[i] = args[2 + i];
+    zipmembers[i] = args[2 + n + i];
+}
+addFiles(zip, 0, inputmembers, zipmembers, function (err) {
+    "use strict";
+    if (err) {
+        runtime.log(err);
+    }
+});
diff --git a/apps/files_odfviewer/src/webodf/programs/CMakeLists.txt b/apps/files_odfviewer/src/webodf/programs/CMakeLists.txt
new file mode 100644
index 0000000000..4621a25d67
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/programs/CMakeLists.txt
@@ -0,0 +1,30 @@
+macro(COPY_FILES _varname _srcdir _tgtdir)
+  foreach(_file ${ARGN})
+    GET_FILENAME_COMPONENT(_subdir ${_file} PATH)
+    FILE(MAKE_DIRECTORY ${_tgtdir}/${_subdir})
+    add_custom_command(
+      OUTPUT ${_tgtdir}/${_file}
+      COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different
+        ${_srcdir}/${_file}
+        ${_tgtdir}/${_file}
+      DEPENDS
+        ${_srcdir}/${_file}
+    )
+    set(${_varname} ${${_varname}} ${_tgtdir}/${_file})
+  endforeach(_file)
+endmacro(COPY_FILES _directory _files)
+
+if(QT4_FOUND)
+  add_subdirectory(qtjsruntime)
+  add_subdirectory(nativeQtClient)
+  add_subdirectory(docnosis)
+endif(QT4_FOUND)
+
+if(ANDROID_SDK_DIR AND ANT)
+  add_subdirectory(android)
+endif(ANDROID_SDK_DIR AND ANT)
+
+add_subdirectory(firefoxextension)
+
+add_subdirectory(touchui)
+add_subdirectory(playbook)
diff --git a/apps/files_odfviewer/src/webodf/programs/android/AndroidManifest.xml b/apps/files_odfviewer/src/webodf/programs/android/AndroidManifest.xml
new file mode 100644
index 0000000000..491bbb80a2
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/programs/android/AndroidManifest.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+	package="org.webodf" android:versionCode="1" android:versionName="1.0">
+	<supports-screens android:largeScreens="true"
+		android:normalScreens="true" android:smallScreens="true"
+		android:resizeable="true" android:anyDensity="true" />
+	<uses-sdk android:minSdkVersion="4" android:targetSdkVersion="4" />
+	<application android:icon="@drawable/icon"
+		android:label="@string/app_name">
+		<activity android:label="@string/app_name" android:name=".WebODFActivity"
+			android:configChanges="orientation|keyboardHidden">
+			<intent-filter>
+				<action android:name="android.intent.action.MAIN" />
+				<category android:name="android.intent.category.LAUNCHER" />
+			</intent-filter>
+			<intent-filter>
+				<action android:name="android.intent.action.VIEW" />
+				<category android:name="android.intent.category.DEFAULT" />
+				<category android:name="android.intent.category.BROWSABLE" />
+				<data android:mimeType="application/vnd.oasis.opendocument.text" />
+			</intent-filter>
+			<intent-filter>
+				<action android:name="android.intent.action.VIEW" />
+				<category android:name="android.intent.category.DEFAULT" />
+				<category android:name="android.intent.category.BROWSABLE" />
+				<data android:mimeType="application/vnd.oasis.opendocument.presentation" />
+			</intent-filter>
+			<intent-filter>
+				<action android:name="android.intent.action.VIEW" />
+				<category android:name="android.intent.category.DEFAULT" />
+				<category android:name="android.intent.category.BROWSABLE" />
+				<data android:mimeType="application/vnd.oasis.opendocument.spreadsheet" />
+			</intent-filter>
+		</activity>
+		<activity android:name="com.phonegap.DroidGap" android:label="@string/app_name"
+			android:configChanges="orientation|keyboardHidden">
+			<intent-filter>
+			</intent-filter>
+		</activity>
+	</application>
+
+</manifest>
diff --git a/apps/files_odfviewer/src/webodf/programs/android/CMakeLists.txt b/apps/files_odfviewer/src/webodf/programs/android/CMakeLists.txt
new file mode 100644
index 0000000000..b16c5a2f69
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/programs/android/CMakeLists.txt
@@ -0,0 +1,41 @@
+set(ANDROID_JAR ${ANDROID_SDK_DIR}/platforms/android-8/android.jar)
+
+COPY_FILES(APKDEPS ${CMAKE_SOURCE_DIR}/programs/touchui
+    ${CMAKE_CURRENT_BINARY_DIR}/assets/www ${HTML5UIFILES})
+COPY_FILES(APKDEPS ${CMAKE_CURRENT_SOURCE_DIR}/assets/www
+    ${CMAKE_CURRENT_BINARY_DIR}/assets/www
+    index.html icon.png phonegap-1.4.1.js)
+COPY_FILES(APKDEPS ${CMAKE_CURRENT_SOURCE_DIR}/res
+    ${CMAKE_CURRENT_BINARY_DIR}/res
+    drawable-hdpi/ic_launcher.png drawable-ldpi/ic_launcher.png
+    drawable/icon.png drawable-mdpi/ic_launcher.png values/strings.xml
+    xml/phonegap.xml xml/plugins.xml layout/selector.xml
+    layout/main.xml layout/listitem.xml)
+COPY_FILES(APKDEPS ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}
+    src/org/webodf/WebODFActivity.java libs/phonegap-1.4.1.jar
+    AndroidManifest.xml)
+COPY_FILES(APKDEPS ${CMAKE_SOURCE_DIR}/webodf
+    ${CMAKE_CURRENT_BINARY_DIR}/assets/www webodf.css)
+COPY_FILES(APKDEPS ${CMAKE_BINARY_DIR}/webodf
+    ${CMAKE_CURRENT_BINARY_DIR}/assets/www webodf.js)
+
+set(WEBODFAPK ${CMAKE_CURRENT_BINARY_DIR}/bin/WebODF-debug.apk)
+add_custom_command(
+    OUTPUT ${WEBODFAPK}
+    COMMAND ${ANDROID_SDK_DIR}/tools/android
+        ARGS update project --path . --target android-7 --name WebODF
+    COMMAND ${ANT}
+        ARGS -lib ${CMAKE_CURRENT_SOURCE_DIR}/libs/phonegap-1.4.1.jar debug
+    DEPENDS ${APKDEPS}
+    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+)
+add_custom_target(apk ALL DEPENDS ${WEBODFAPK})
+set(WEBODFRELEASEAPK ${CMAKE_CURRENT_BINARY_DIR}/bin/WebODF-release.apk)
+add_custom_command(
+    OUTPUT ${WEBODFRELEASEAPK}
+    COMMAND ${ANT}
+        ARGS -lib ${CMAKE_CURRENT_SOURCE_DIR}/libs/phonegap-1.4.1.jar release
+    DEPENDS ${WEBODFAPK} webodf.js
+    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
+)
+add_custom_target(releaseapk ALL DEPENDS ${WEBODFRELEASEAPK})
diff --git a/apps/files_odfviewer/src/webodf/programs/android/assets/www/config.xml b/apps/files_odfviewer/src/webodf/programs/android/assets/www/config.xml
new file mode 100644
index 0000000000..21b5ca9ecc
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/programs/android/assets/www/config.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<widget xmlns		= "http://www.w3.org/ns/widgets"
+	xmlns:gap	= "http://phonegap.com/ns/1.0"
+	id		= "org.webodf.phonegap.one"
+	version 	= "1.0.0">
+
+	<name>WebODF: online/offline office</name>
+	<description>
+		A viewer for ODF files.
+	</description>
+	<author href="http://webodf.org/"
+		email="jos.van.den.oever@kogmbh.com">
+		Jos van den Oever
+	</author>
+	<gap:platforms>
+		<gap:platform name="android" minVersion="2.1" />
+		<gap:platform name="webos" />
+		<gap:platform name="symbian.wrt" />
+		<gap:platform name="blackberry" project="widgets"/>
+	</gap:platforms>
+	<icon src="icon.png" gap:role="default" />
+    <feature name="http://api.phonegap.com/1.0/file"/>
+	<preference name="autorotate" value="false" readonly="true"/>
+	<preference name="orientation" value="default"/>
+</widget>
diff --git a/apps/files_odfviewer/src/webodf/programs/android/assets/www/icon.png b/apps/files_odfviewer/src/webodf/programs/android/assets/www/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..2993aa9f146d3aa5775b1d80bae7109f8cc93fb6
GIT binary patch
literal 3793
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
Hu0mjf{LD+l

literal 0
HcmV?d00001

diff --git a/apps/files_odfviewer/src/webodf/programs/android/assets/www/index.html b/apps/files_odfviewer/src/webodf/programs/android/assets/www/index.html
new file mode 100644
index 0000000000..d9a299d24d
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/programs/android/assets/www/index.html
@@ -0,0 +1,46 @@
+<!DOCTYPE html>
+<html>
+ <head>
+  <title>WebODF</title>
+  <link href="sencha-touch.css" rel="stylesheet" type="text/css" />
+  <link href="webodf.css" rel="stylesheet" type="text/css" />
+  <script type="text/javascript" src="phonegap-1.4.1.js"></script>
+  <script type="text/javascript" src="sencha-touch.js"></script>
+  <script type="text/javascript" src="webodf.js"></script>
+  <script type="text/javascript" src="app/app.js"></script>
+  <script type="text/javascript" src="app/controller/Files.js"></script>
+  <script type="text/javascript" src="app/model/FileSystem.js"></script>
+  <script type="text/javascript" src="app/store/FileStore.js"></script>
+  <script type="text/javascript" src="app/views/FileDetail.js"></script>
+  <script type="text/javascript" src="app/views/FilesList.js"></script>
+  <script type="text/javascript" src="app/views/OdfView.js"></script>
+  <script type="text/javascript" src="app/views/Viewport.js"></script>
+  <script type="text/javascript">
+var applicationReady = false,
+    deviceReady = false,
+    startScanningDirectories;
+document.addEventListener("deviceready", function () {
+    deviceReady = true;
+    if (applicationReady) {
+        startScanningDirectories();
+    }
+}, false);
+/**
+ * Override this function so it waits until the device is ready.
+ */
+onApplicationLaunch = function (app) {
+    "use strict";
+    applicationReady = true;
+    startScanningDirectories = function () {
+        if (typeof invokeString !== "undefined" && invokeString) {
+            app.openUrl(invokeString);
+        }
+        app.startScanningDirectories();
+    };
+    if (deviceReady) {
+        startScanningDirectories();
+    }
+};
+  </script>
+ </head><body></body>
+</html>
diff --git a/apps/files_odfviewer/src/webodf/programs/android/assets/www/phonegap-1.4.1.js b/apps/files_odfviewer/src/webodf/programs/android/assets/www/phonegap-1.4.1.js
new file mode 100644
index 0000000000..908b8a8a21
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/programs/android/assets/www/phonegap-1.4.1.js
@@ -0,0 +1,4586 @@
+/*
+ *     Licensed to the Apache Software Foundation (ASF) under one
+ *     or more contributor license agreements.  See the NOTICE file
+ *     distributed with this work for additional information
+ *     regarding copyright ownership.  The ASF licenses this file
+ *     to you 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.
+ */
+
+// Version 1.2.0
+
+if (typeof PhoneGap === "undefined") {
+
+/**
+ * The order of events during page load and PhoneGap startup is as follows:
+ *
+ * onDOMContentLoaded         Internal event that is received when the web page is loaded and parsed.
+ * window.onload              Body onload event.
+ * onNativeReady              Internal event that indicates the PhoneGap native side is ready.
+ * onPhoneGapInit             Internal event that kicks off creation of all PhoneGap JavaScript objects (runs constructors).
+ * onPhoneGapReady            Internal event fired when all PhoneGap JavaScript objects have been created
+ * onPhoneGapInfoReady        Internal event fired when device properties are available
+ * onDeviceReady              User event fired to indicate that PhoneGap is ready
+ * onResume                   User event fired to indicate a start/resume lifecycle event
+ * onPause                    User event fired to indicate a pause lifecycle event
+ * onDestroy                  Internal event fired when app is being destroyed (User should use window.onunload event, not this one).
+ *
+ * The only PhoneGap events that user code should register for are:
+ *      deviceready           PhoneGap native code is initialized and PhoneGap APIs can be called from JavaScript
+ *      pause                 App has moved to background
+ *      resume                App has returned to foreground
+ *
+ * Listeners can be registered as:
+ *      document.addEventListener("deviceready", myDeviceReadyListener, false);
+ *      document.addEventListener("resume", myResumeListener, false);
+ *      document.addEventListener("pause", myPauseListener, false);
+ *
+ * The DOM lifecycle events should be used for saving and restoring state
+ *      window.onload
+ *      window.onunload
+ */
+
+/**
+ * This represents the PhoneGap API itself, and provides a global namespace for accessing
+ * information about the state of PhoneGap.
+ * @class
+ */
+var PhoneGap = {
+    documentEventHandler: {},   // Collection of custom document event handlers
+    windowEventHandler: {}      // Collection of custom window event handlers
+};
+
+/**
+ * List of resource files loaded by PhoneGap.
+ * This is used to ensure JS and other files are loaded only once.
+ */
+PhoneGap.resources = {base: true};
+
+/**
+ * Determine if resource has been loaded by PhoneGap
+ *
+ * @param name
+ * @return
+ */
+PhoneGap.hasResource = function(name) {
+    return PhoneGap.resources[name];
+};
+
+/**
+ * Add a resource to list of loaded resources by PhoneGap
+ *
+ * @param name
+ */
+PhoneGap.addResource = function(name) {
+    PhoneGap.resources[name] = true;
+};
+
+/**
+ * Custom pub-sub channel that can have functions subscribed to it
+ * @constructor
+ */
+PhoneGap.Channel = function (type)
+{
+    this.type = type;
+    this.handlers = {};
+    this.guid = 0;
+    this.fired = false;
+    this.enabled = true;
+};
+
+/**
+ * Subscribes the given function to the channel. Any time that
+ * Channel.fire is called so too will the function.
+ * Optionally specify an execution context for the function
+ * and a guid that can be used to stop subscribing to the channel.
+ * Returns the guid.
+ */
+PhoneGap.Channel.prototype.subscribe = function(f, c, g) {
+    // need a function to call
+    if (f === null) { return; }
+
+    var func = f;
+    if (typeof c === "object" && typeof f === "function") { func = PhoneGap.close(c, f); }
+
+    g = g || func.observer_guid || f.observer_guid || this.guid++;
+    func.observer_guid = g;
+    f.observer_guid = g;
+    this.handlers[g] = func;
+    return g;
+};
+
+/**
+ * Like subscribe but the function is only called once and then it
+ * auto-unsubscribes itself.
+ */
+PhoneGap.Channel.prototype.subscribeOnce = function(f, c) {
+    var g = null;
+    var _this = this;
+    var m = function() {
+        f.apply(c || null, arguments);
+        _this.unsubscribe(g);
+    };
+    if (this.fired) {
+        if (typeof c === "object" && typeof f === "function") { f = PhoneGap.close(c, f); }
+        f.apply(this, this.fireArgs);
+    } else {
+        g = this.subscribe(m);
+    }
+    return g;
+};
+
+/**
+ * Unsubscribes the function with the given guid from the channel.
+ */
+PhoneGap.Channel.prototype.unsubscribe = function(g) {
+    if (typeof g === "function") { g = g.observer_guid; }
+    this.handlers[g] = null;
+    delete this.handlers[g];
+};
+
+/**
+ * Calls all functions subscribed to this channel.
+ */
+PhoneGap.Channel.prototype.fire = function(e) {
+    if (this.enabled) {
+        var fail = false;
+        var item, handler, rv;
+        for (item in this.handlers) {
+            if (this.handlers.hasOwnProperty(item)) {
+                handler = this.handlers[item];
+                if (typeof handler === "function") {
+                    rv = (handler.apply(this, arguments) === false);
+                    fail = fail || rv;
+                }
+            }
+        }
+        this.fired = true;
+        this.fireArgs = arguments;
+        return !fail;
+    }
+    return true;
+};
+
+/**
+ * Calls the provided function only after all of the channels specified
+ * have been fired.
+ */
+PhoneGap.Channel.join = function(h, c) {
+    var i = c.length;
+    var f = function() {
+        if (!(--i)) {
+            h();
+        }
+    };
+    var len = i;
+    var j;
+    for (j=0; j<len; j++) {
+        if (!c[j].fired) {
+            c[j].subscribeOnce(f);
+        }
+        else {
+            i--;
+        }
+    }
+    if (!i) {
+        h();
+    }
+};
+
+/**
+ * Add an initialization function to a queue that ensures it will run and initialize
+ * application constructors only once PhoneGap has been initialized.
+ * @param {Function} func The function callback you want run once PhoneGap is initialized
+ */
+PhoneGap.addConstructor = function(func) {
+    PhoneGap.onPhoneGapInit.subscribeOnce(function() {
+        try {
+            func();
+        } catch(e) {
+            console.log("Failed to run constructor: " + e);
+        }
+    });
+};
+
+/**
+ * Plugins object
+ */
+if (!window.plugins) {
+    window.plugins = {};
+}
+
+/**
+ * Adds a plugin object to window.plugins.
+ * The plugin is accessed using window.plugins.<name>
+ *
+ * @param name          The plugin name
+ * @param obj           The plugin object
+ */
+PhoneGap.addPlugin = function(name, obj) {
+    if (!window.plugins[name]) {
+        window.plugins[name] = obj;
+    }
+    else {
+        console.log("Error: Plugin "+name+" already exists.");
+    }
+};
+
+/**
+ * onDOMContentLoaded channel is fired when the DOM content
+ * of the page has been parsed.
+ */
+PhoneGap.onDOMContentLoaded = new PhoneGap.Channel('onDOMContentLoaded');
+
+/**
+ * onNativeReady channel is fired when the PhoneGap native code
+ * has been initialized.
+ */
+PhoneGap.onNativeReady = new PhoneGap.Channel('onNativeReady');
+
+/**
+ * onPhoneGapInit channel is fired when the web page is fully loaded and
+ * PhoneGap native code has been initialized.
+ */
+PhoneGap.onPhoneGapInit = new PhoneGap.Channel('onPhoneGapInit');
+
+/**
+ * onPhoneGapReady channel is fired when the JS PhoneGap objects have been created.
+ */
+PhoneGap.onPhoneGapReady = new PhoneGap.Channel('onPhoneGapReady');
+
+/**
+ * onPhoneGapInfoReady channel is fired when the PhoneGap device properties
+ * has been set.
+ */
+PhoneGap.onPhoneGapInfoReady = new PhoneGap.Channel('onPhoneGapInfoReady');
+
+/**
+ * onPhoneGapConnectionReady channel is fired when the PhoneGap connection properties
+ * has been set.
+ */
+PhoneGap.onPhoneGapConnectionReady = new PhoneGap.Channel('onPhoneGapConnectionReady');
+
+/**
+ * onDestroy channel is fired when the PhoneGap native code
+ * is destroyed.  It is used internally.
+ * Window.onunload should be used by the user.
+ */
+PhoneGap.onDestroy = new PhoneGap.Channel('onDestroy');
+PhoneGap.onDestroy.subscribeOnce(function() {
+    PhoneGap.shuttingDown = true;
+});
+PhoneGap.shuttingDown = false;
+
+// _nativeReady is global variable that the native side can set
+// to signify that the native code is ready. It is a global since
+// it may be called before any PhoneGap JS is ready.
+if (typeof _nativeReady !== 'undefined') { PhoneGap.onNativeReady.fire(); }
+
+/**
+ * onDeviceReady is fired only after all PhoneGap objects are created and
+ * the device properties are set.
+ */
+PhoneGap.onDeviceReady = new PhoneGap.Channel('onDeviceReady');
+
+
+// Array of channels that must fire before "deviceready" is fired
+PhoneGap.deviceReadyChannelsArray = [ PhoneGap.onPhoneGapReady, PhoneGap.onPhoneGapInfoReady, PhoneGap.onPhoneGapConnectionReady];
+
+// Hashtable of user defined channels that must also fire before "deviceready" is fired
+PhoneGap.deviceReadyChannelsMap = {};
+
+/**
+ * Indicate that a feature needs to be initialized before it is ready to be used.
+ * This holds up PhoneGap's "deviceready" event until the feature has been initialized
+ * and PhoneGap.initComplete(feature) is called.
+ *
+ * @param feature {String}     The unique feature name
+ */
+PhoneGap.waitForInitialization = function(feature) {
+    if (feature) {
+        var channel = new PhoneGap.Channel(feature);
+        PhoneGap.deviceReadyChannelsMap[feature] = channel;
+        PhoneGap.deviceReadyChannelsArray.push(channel);
+    }
+};
+
+/**
+ * Indicate that initialization code has completed and the feature is ready to be used.
+ *
+ * @param feature {String}     The unique feature name
+ */
+PhoneGap.initializationComplete = function(feature) {
+    var channel = PhoneGap.deviceReadyChannelsMap[feature];
+    if (channel) {
+        channel.fire();
+    }
+};
+
+/**
+ * Create all PhoneGap objects once page has fully loaded and native side is ready.
+ */
+PhoneGap.Channel.join(function() {
+
+    // Start listening for XHR callbacks
+    setTimeout(function() {
+            if (PhoneGap.UsePolling) {
+                PhoneGap.JSCallbackPolling();
+            }
+            else {
+                var polling = prompt("usePolling", "gap_callbackServer:");
+                PhoneGap.UsePolling = polling;
+                if (polling == "true") {
+                    PhoneGap.UsePolling = true;
+                    PhoneGap.JSCallbackPolling();
+                }
+                else {
+                    PhoneGap.UsePolling = false;
+                    PhoneGap.JSCallback();
+                }
+            }
+        }, 1);
+
+    // Run PhoneGap constructors
+    PhoneGap.onPhoneGapInit.fire();
+
+    // Fire event to notify that all objects are created
+    PhoneGap.onPhoneGapReady.fire();
+
+    // Fire onDeviceReady event once all constructors have run and PhoneGap info has been
+    // received from native side, and any user defined initialization channels.
+    PhoneGap.Channel.join(function() {
+        // Let native code know we are inited on JS side
+        prompt("", "gap_init:");
+
+        PhoneGap.onDeviceReady.fire();
+    }, PhoneGap.deviceReadyChannelsArray);
+
+}, [ PhoneGap.onDOMContentLoaded, PhoneGap.onNativeReady ]);
+
+// Listen for DOMContentLoaded and notify our channel subscribers
+document.addEventListener('DOMContentLoaded', function() {
+    PhoneGap.onDOMContentLoaded.fire();
+}, false);
+
+// Intercept calls to document.addEventListener and watch for deviceready
+PhoneGap.m_document_addEventListener = document.addEventListener;
+
+// Intercept calls to window.addEventListener
+PhoneGap.m_window_addEventListener = window.addEventListener;
+
+/**
+ * Add a custom window event handler.
+ *
+ * @param {String} event            The event name that callback handles
+ * @param {Function} callback       The event handler
+ */
+PhoneGap.addWindowEventHandler = function(event, callback) {
+    PhoneGap.windowEventHandler[event] = callback;
+};
+
+/**
+ * Add a custom document event handler.
+ *
+ * @param {String} event            The event name that callback handles
+ * @param {Function} callback       The event handler
+ */
+PhoneGap.addDocumentEventHandler = function(event, callback) {
+    PhoneGap.documentEventHandler[event] = callback;
+};
+
+/**
+ * Intercept adding document event listeners and handle our own
+ *
+ * @param {Object} evt
+ * @param {Function} handler
+ * @param capture
+ */
+document.addEventListener = function(evt, handler, capture) {
+    var e = evt.toLowerCase();
+    if (e === 'deviceready') {
+        PhoneGap.onDeviceReady.subscribeOnce(handler);
+    }
+    else {
+        // If subscribing to Android backbutton
+        if (e === 'backbutton') {
+            PhoneGap.exec(null, null, "App", "overrideBackbutton", [true]);
+        }
+        
+        // If subscribing to an event that is handled by a plugin
+        else if (typeof PhoneGap.documentEventHandler[e] !== "undefined") {
+            if (PhoneGap.documentEventHandler[e](e, handler, true)) {
+                return; // Stop default behavior
+            }
+        }
+        
+        PhoneGap.m_document_addEventListener.call(document, evt, handler, capture);
+    }
+};
+
+/**
+ * Intercept adding window event listeners and handle our own
+ *
+ * @param {Object} evt
+ * @param {Function} handler
+ * @param capture
+ */
+window.addEventListener = function(evt, handler, capture) {
+    var e = evt.toLowerCase();
+        
+    // If subscribing to an event that is handled by a plugin
+    if (typeof PhoneGap.windowEventHandler[e] !== "undefined") {
+        if (PhoneGap.windowEventHandler[e](e, handler, true)) {
+            return; // Stop default behavior
+        }
+    }
+        
+    PhoneGap.m_window_addEventListener.call(window, evt, handler, capture);
+};
+
+// Intercept calls to document.removeEventListener and watch for events that
+// are generated by PhoneGap native code
+PhoneGap.m_document_removeEventListener = document.removeEventListener;
+
+// Intercept calls to window.removeEventListener
+PhoneGap.m_window_removeEventListener = window.removeEventListener;
+
+/**
+ * Intercept removing document event listeners and handle our own
+ *
+ * @param {Object} evt
+ * @param {Function} handler
+ * @param capture
+ */
+document.removeEventListener = function(evt, handler, capture) {
+    var e = evt.toLowerCase();
+
+    // If unsubscribing to Android backbutton
+    if (e === 'backbutton') {
+        PhoneGap.exec(null, null, "App", "overrideBackbutton", [false]);
+    }
+
+    // If unsubcribing from an event that is handled by a plugin
+    if (typeof PhoneGap.documentEventHandler[e] !== "undefined") {
+        if (PhoneGap.documentEventHandler[e](e, handler, false)) {
+            return; // Stop default behavior
+        }
+    }
+
+    PhoneGap.m_document_removeEventListener.call(document, evt, handler, capture);
+};
+
+/**
+ * Intercept removing window event listeners and handle our own
+ *
+ * @param {Object} evt
+ * @param {Function} handler
+ * @param capture
+ */
+window.removeEventListener = function(evt, handler, capture) {
+    var e = evt.toLowerCase();
+
+    // If unsubcribing from an event that is handled by a plugin
+    if (typeof PhoneGap.windowEventHandler[e] !== "undefined") {
+        if (PhoneGap.windowEventHandler[e](e, handler, false)) {
+            return; // Stop default behavior
+        }
+    }
+
+    PhoneGap.m_window_removeEventListener.call(window, evt, handler, capture);
+};
+
+/**
+ * Method to fire document event
+ *
+ * @param {String} type             The event type to fire
+ * @param {Object} data             Data to send with event
+ */
+PhoneGap.fireDocumentEvent = function(type, data) {
+    var e = document.createEvent('Events');
+    e.initEvent(type);
+    if (data) {
+        for (var i in data) {
+            e[i] = data[i];
+        }
+    }
+    document.dispatchEvent(e);
+};
+
+/**
+ * Method to fire window event
+ *
+ * @param {String} type             The event type to fire
+ * @param {Object} data             Data to send with event
+ */
+PhoneGap.fireWindowEvent = function(type, data) {
+    var e = document.createEvent('Events');
+    e.initEvent(type);
+    if (data) {
+        for (var i in data) {
+            e[i] = data[i];
+        }
+    }
+    window.dispatchEvent(e);
+};
+
+/**
+ * Does a deep clone of the object.
+ *
+ * @param obj
+ * @return {Object}
+ */
+PhoneGap.clone = function(obj) {
+    var i, retVal;
+    if(!obj) { 
+        return obj;
+    }
+    
+    if(obj instanceof Array){
+        retVal = [];
+        for(i = 0; i < obj.length; ++i){
+            retVal.push(PhoneGap.clone(obj[i]));
+        }
+        return retVal;
+    }
+    
+    if (typeof obj === "function") {
+        return obj;
+    }
+    
+    if(!(obj instanceof Object)){
+        return obj;
+    }
+    
+    if (obj instanceof Date) {
+        return obj;
+    }
+    
+    retVal = {};
+    for(i in obj){
+        if(!(i in retVal) || retVal[i] !== obj[i]) {
+            retVal[i] = PhoneGap.clone(obj[i]);
+        }
+    }
+    return retVal;
+};
+
+PhoneGap.callbackId = 0;
+PhoneGap.callbacks = {};
+PhoneGap.callbackStatus = {
+    NO_RESULT: 0,
+    OK: 1,
+    CLASS_NOT_FOUND_EXCEPTION: 2,
+    ILLEGAL_ACCESS_EXCEPTION: 3,
+    INSTANTIATION_EXCEPTION: 4,
+    MALFORMED_URL_EXCEPTION: 5,
+    IO_EXCEPTION: 6,
+    INVALID_ACTION: 7,
+    JSON_EXCEPTION: 8,
+    ERROR: 9
+    };
+
+
+/**
+ * Execute a PhoneGap command.  It is up to the native side whether this action is synch or async.
+ * The native side can return:
+ *      Synchronous: PluginResult object as a JSON string
+ *      Asynchrounous: Empty string ""
+ * If async, the native side will PhoneGap.callbackSuccess or PhoneGap.callbackError,
+ * depending upon the result of the action.
+ *
+ * @param {Function} success    The success callback
+ * @param {Function} fail       The fail callback
+ * @param {String} service      The name of the service to use
+ * @param {String} action       Action to be run in PhoneGap
+ * @param {Array.<String>} [args]     Zero or more arguments to pass to the method
+ */
+PhoneGap.exec = function(success, fail, service, action, args) {
+    try {
+        var callbackId = service + PhoneGap.callbackId++;
+        if (success || fail) {
+            PhoneGap.callbacks[callbackId] = {success:success, fail:fail};
+        }
+
+        var r = prompt(JSON.stringify(args), "gap:"+JSON.stringify([service, action, callbackId, true]));
+
+        // If a result was returned
+        if (r.length > 0) {
+            eval("var v="+r+";");
+
+            // If status is OK, then return value back to caller
+            if (v.status === PhoneGap.callbackStatus.OK) {
+
+                // If there is a success callback, then call it now with
+                // returned value
+                if (success) {
+                    try {
+                        success(v.message);
+                    } catch (e) {
+                        console.log("Error in success callback: " + callbackId  + " = " + e);
+                    }
+
+                    // Clear callback if not expecting any more results
+                    if (!v.keepCallback) {
+                        delete PhoneGap.callbacks[callbackId];
+                    }
+                }
+                return v.message;
+            }
+
+            // If no result
+            else if (v.status === PhoneGap.callbackStatus.NO_RESULT) {
+
+                // Clear callback if not expecting any more results
+                if (!v.keepCallback) {
+                    delete PhoneGap.callbacks[callbackId];
+                }
+            }
+
+            // If error, then display error
+            else {
+                console.log("Error: Status="+v.status+" Message="+v.message);
+
+                // If there is a fail callback, then call it now with returned value
+                if (fail) {
+                    try {
+                        fail(v.message);
+                    }
+                    catch (e1) {
+                        console.log("Error in error callback: "+callbackId+" = "+e1);
+                    }
+
+                    // Clear callback if not expecting any more results
+                    if (!v.keepCallback) {
+                        delete PhoneGap.callbacks[callbackId];
+                    }
+                }
+                return null;
+            }
+        }
+    } catch (e2) {
+        console.log("Error: "+e2);
+    }
+};
+
+/**
+ * Called by native code when returning successful result from an action.
+ *
+ * @param callbackId
+ * @param args
+ */
+PhoneGap.callbackSuccess = function(callbackId, args) {
+    if (PhoneGap.callbacks[callbackId]) {
+
+        // If result is to be sent to callback
+        if (args.status === PhoneGap.callbackStatus.OK) {
+            try {
+                if (PhoneGap.callbacks[callbackId].success) {
+                    PhoneGap.callbacks[callbackId].success(args.message);
+                }
+            }
+            catch (e) {
+                console.log("Error in success callback: "+callbackId+" = "+e);
+            }
+        }
+
+        // Clear callback if not expecting any more results
+        if (!args.keepCallback) {
+            delete PhoneGap.callbacks[callbackId];
+        }
+    }
+};
+
+/**
+ * Called by native code when returning error result from an action.
+ *
+ * @param callbackId
+ * @param args
+ */
+PhoneGap.callbackError = function(callbackId, args) {
+    if (PhoneGap.callbacks[callbackId]) {
+        try {
+            if (PhoneGap.callbacks[callbackId].fail) {
+                PhoneGap.callbacks[callbackId].fail(args.message);
+            }
+        }
+        catch (e) {
+            console.log("Error in error callback: "+callbackId+" = "+e);
+        }
+
+        // Clear callback if not expecting any more results
+        if (!args.keepCallback) {
+            delete PhoneGap.callbacks[callbackId];
+        }
+    }
+};
+
+PhoneGap.JSCallbackPort = null;
+PhoneGap.JSCallbackToken = null;
+
+/**
+ * This is only for Android.
+ *
+ * Internal function that uses XHR to call into PhoneGap Java code and retrieve
+ * any JavaScript code that needs to be run.  This is used for callbacks from
+ * Java to JavaScript.
+ */
+PhoneGap.JSCallback = function() {
+
+    // Exit if shutting down app
+    if (PhoneGap.shuttingDown) {
+        return;
+    }
+
+    // If polling flag was changed, start using polling from now on
+    if (PhoneGap.UsePolling) {
+        PhoneGap.JSCallbackPolling();
+        return;
+    }
+
+    var xmlhttp = new XMLHttpRequest();
+
+    // Callback function when XMLHttpRequest is ready
+    xmlhttp.onreadystatechange=function(){
+        if(xmlhttp.readyState === 4){
+
+            // Exit if shutting down app
+            if (PhoneGap.shuttingDown) {
+                return;
+            }
+
+            // If callback has JavaScript statement to execute
+            if (xmlhttp.status === 200) {
+
+                // Need to url decode the response
+                var msg = decodeURIComponent(xmlhttp.responseText);
+                setTimeout(function() {
+                    try {
+                        var t = eval(msg);
+                    }
+                    catch (e) {
+                        // If we're getting an error here, seeing the message will help in debugging
+                        console.log("JSCallback: Message from Server: " + msg);
+                        console.log("JSCallback Error: "+e);
+                    }
+                }, 1);
+                setTimeout(PhoneGap.JSCallback, 1);
+            }
+
+            // If callback ping (used to keep XHR request from timing out)
+            else if (xmlhttp.status === 404) {
+                setTimeout(PhoneGap.JSCallback, 10);
+            }
+
+            // If security error
+            else if (xmlhttp.status === 403) {
+                console.log("JSCallback Error: Invalid token.  Stopping callbacks.");
+            }
+
+            // If server is stopping
+            else if (xmlhttp.status === 503) {
+                console.log("JSCallback Server Closed: Stopping callbacks.");
+            }
+
+            // If request wasn't GET
+            else if (xmlhttp.status === 400) {
+                console.log("JSCallback Error: Bad request.  Stopping callbacks.");
+            }
+
+            // If error, revert to polling
+            else {
+                console.log("JSCallback Error: Request failed.");
+                PhoneGap.UsePolling = true;
+                PhoneGap.JSCallbackPolling();
+            }
+        }
+    };
+
+    if (PhoneGap.JSCallbackPort === null) {
+        PhoneGap.JSCallbackPort = prompt("getPort", "gap_callbackServer:");
+    }
+    if (PhoneGap.JSCallbackToken === null) {
+        PhoneGap.JSCallbackToken = prompt("getToken", "gap_callbackServer:");
+    }
+    xmlhttp.open("GET", "http://127.0.0.1:"+PhoneGap.JSCallbackPort+"/"+PhoneGap.JSCallbackToken , true);
+    xmlhttp.send();
+};
+
+/**
+ * The polling period to use with JSCallbackPolling.
+ * This can be changed by the application.  The default is 50ms.
+ */
+PhoneGap.JSCallbackPollingPeriod = 50;
+
+/**
+ * Flag that can be set by the user to force polling to be used or force XHR to be used.
+ */
+PhoneGap.UsePolling = false;    // T=use polling, F=use XHR
+
+/**
+ * This is only for Android.
+ *
+ * Internal function that uses polling to call into PhoneGap Java code and retrieve
+ * any JavaScript code that needs to be run.  This is used for callbacks from
+ * Java to JavaScript.
+ */
+PhoneGap.JSCallbackPolling = function() {
+
+    // Exit if shutting down app
+    if (PhoneGap.shuttingDown) {
+        return;
+    }
+
+    // If polling flag was changed, stop using polling from now on
+    if (!PhoneGap.UsePolling) {
+        PhoneGap.JSCallback();
+        return;
+    }
+
+    var msg = prompt("", "gap_poll:");
+    if (msg) {
+        setTimeout(function() {
+            try {
+                var t = eval(""+msg);
+            }
+            catch (e) {
+                console.log("JSCallbackPolling: Message from Server: " + msg);
+                console.log("JSCallbackPolling Error: "+e);
+            }
+        }, 1);
+        setTimeout(PhoneGap.JSCallbackPolling, 1);
+    }
+    else {
+        setTimeout(PhoneGap.JSCallbackPolling, PhoneGap.JSCallbackPollingPeriod);
+    }
+};
+
+/**
+ * Create a UUID
+ *
+ * @return {String}
+ */
+PhoneGap.createUUID = function() {
+    return PhoneGap.UUIDcreatePart(4) + '-' +
+        PhoneGap.UUIDcreatePart(2) + '-' +
+        PhoneGap.UUIDcreatePart(2) + '-' +
+        PhoneGap.UUIDcreatePart(2) + '-' +
+        PhoneGap.UUIDcreatePart(6);
+};
+
+PhoneGap.UUIDcreatePart = function(length) {
+    var uuidpart = "";
+    var i, uuidchar;
+    for (i=0; i<length; i++) {
+        uuidchar = parseInt((Math.random() * 256),0).toString(16);
+        if (uuidchar.length === 1) {
+            uuidchar = "0" + uuidchar;
+        }
+        uuidpart += uuidchar;
+    }
+    return uuidpart;
+};
+
+PhoneGap.close = function(context, func, params) {
+    if (typeof params === 'undefined') {
+        return function() {
+            return func.apply(context, arguments);
+        };
+    } else {
+        return function() {
+            return func.apply(context, params);
+        };
+    }
+};
+
+/**
+ * Load a JavaScript file after page has loaded.
+ *
+ * @param {String} jsfile               The url of the JavaScript file to load.
+ * @param {Function} successCallback    The callback to call when the file has been loaded.
+ */
+PhoneGap.includeJavascript = function(jsfile, successCallback) {
+    var id = document.getElementsByTagName("head")[0];
+    var el = document.createElement('script');
+    el.type = 'text/javascript';
+    if (typeof successCallback === 'function') {
+        el.onload = successCallback;
+    }
+    el.src = jsfile;
+    id.appendChild(el);
+};
+
+}
+/*
+ *     Licensed to the Apache Software Foundation (ASF) under one
+ *     or more contributor license agreements.  See the NOTICE file
+ *     distributed with this work for additional information
+ *     regarding copyright ownership.  The ASF licenses this file
+ *     to you 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.
+ */
+
+if (!PhoneGap.hasResource("device")) {
+PhoneGap.addResource("device");
+
+/**
+ * This represents the mobile device, and provides properties for inspecting the model, version, UUID of the
+ * phone, etc.
+ * @constructor
+ */
+var Device = function() {
+    this.available = PhoneGap.available;
+    this.platform = null;
+    this.version = null;
+    this.name = null;
+    this.uuid = null;
+    this.phonegap = null;
+
+    var me = this;
+    this.getInfo(
+        function(info) {
+            me.available = true;
+            me.platform = info.platform;
+            me.version = info.version;
+            me.name = info.name;
+            me.uuid = info.uuid;
+            me.phonegap = info.phonegap;
+            PhoneGap.onPhoneGapInfoReady.fire();
+        },
+        function(e) {
+            me.available = false;
+            console.log("Error initializing PhoneGap: " + e);
+            alert("Error initializing PhoneGap: "+e);
+        });
+};
+
+/**
+ * Get device info
+ *
+ * @param {Function} successCallback The function to call when the heading data is available
+ * @param {Function} errorCallback The function to call when there is an error getting the heading data. (OPTIONAL)
+ */
+Device.prototype.getInfo = function(successCallback, errorCallback) {
+
+    // successCallback required
+    if (typeof successCallback !== "function") {
+        console.log("Device Error: successCallback is not a function");
+        return;
+    }
+
+    // errorCallback optional
+    if (errorCallback && (typeof errorCallback !== "function")) {
+        console.log("Device Error: errorCallback is not a function");
+        return;
+    }
+
+    // Get info
+    PhoneGap.exec(successCallback, errorCallback, "Device", "getDeviceInfo", []);
+};
+
+PhoneGap.addConstructor(function() {
+    if (typeof navigator.device === "undefined") {
+        navigator.device = window.device = new Device();
+    }
+});
+}
+/*
+ *     Licensed to the Apache Software Foundation (ASF) under one
+ *     or more contributor license agreements.  See the NOTICE file
+ *     distributed with this work for additional information
+ *     regarding copyright ownership.  The ASF licenses this file
+ *     to you 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.
+ */
+
+if (!PhoneGap.hasResource("accelerometer")) {
+PhoneGap.addResource("accelerometer");
+
+/** @constructor */
+var Acceleration = function(x, y, z) {
+  this.x = x;
+  this.y = y;
+  this.z = z;
+  this.timestamp = new Date().getTime();
+};
+
+/**
+ * This class provides access to device accelerometer data.
+ * @constructor
+ */
+var Accelerometer = function() {
+
+    /**
+     * The last known acceleration.  type=Acceleration()
+     */
+    this.lastAcceleration = null;
+
+    /**
+     * List of accelerometer watch timers
+     */
+    this.timers = {};
+};
+
+Accelerometer.ERROR_MSG = ["Not running", "Starting", "", "Failed to start"];
+
+/**
+ * Asynchronously aquires the current acceleration.
+ *
+ * @param {Function} successCallback    The function to call when the acceleration data is available
+ * @param {Function} errorCallback      The function to call when there is an error getting the acceleration data. (OPTIONAL)
+ * @param {AccelerationOptions} options The options for getting the accelerometer data such as timeout. (OPTIONAL)
+ */
+Accelerometer.prototype.getCurrentAcceleration = function(successCallback, errorCallback, options) {
+
+    // successCallback required
+    if (typeof successCallback !== "function") {
+        console.log("Accelerometer Error: successCallback is not a function");
+        return;
+    }
+
+    // errorCallback optional
+    if (errorCallback && (typeof errorCallback !== "function")) {
+        console.log("Accelerometer Error: errorCallback is not a function");
+        return;
+    }
+
+    // Get acceleration
+    PhoneGap.exec(successCallback, errorCallback, "Accelerometer", "getAcceleration", []);
+};
+
+/**
+ * Asynchronously aquires the acceleration repeatedly at a given interval.
+ *
+ * @param {Function} successCallback    The function to call each time the acceleration data is available
+ * @param {Function} errorCallback      The function to call when there is an error getting the acceleration data. (OPTIONAL)
+ * @param {AccelerationOptions} options The options for getting the accelerometer data such as timeout. (OPTIONAL)
+ * @return String                       The watch id that must be passed to #clearWatch to stop watching.
+ */
+Accelerometer.prototype.watchAcceleration = function(successCallback, errorCallback, options) {
+
+    // Default interval (10 sec)
+    var frequency = (options !== undefined)? options.frequency : 10000;
+
+    // successCallback required
+    if (typeof successCallback !== "function") {
+        console.log("Accelerometer Error: successCallback is not a function");
+        return;
+    }
+
+    // errorCallback optional
+    if (errorCallback && (typeof errorCallback !== "function")) {
+        console.log("Accelerometer Error: errorCallback is not a function");
+        return;
+    }
+
+    // Make sure accelerometer timeout > frequency + 10 sec
+    PhoneGap.exec(
+        function(timeout) {
+            if (timeout < (frequency + 10000)) {
+                PhoneGap.exec(null, null, "Accelerometer", "setTimeout", [frequency + 10000]);
+            }
+        },
+        function(e) { }, "Accelerometer", "getTimeout", []);
+
+    // Start watch timer
+    var id = PhoneGap.createUUID();
+    navigator.accelerometer.timers[id] = setInterval(function() {
+        PhoneGap.exec(successCallback, errorCallback, "Accelerometer", "getAcceleration", []);
+    }, (frequency ? frequency : 1));
+
+    return id;
+};
+
+/**
+ * Clears the specified accelerometer watch.
+ *
+ * @param {String} id       The id of the watch returned from #watchAcceleration.
+ */
+Accelerometer.prototype.clearWatch = function(id) {
+
+    // Stop javascript timer & remove from timer list
+    if (id && navigator.accelerometer.timers[id] !== undefined) {
+        clearInterval(navigator.accelerometer.timers[id]);
+        delete navigator.accelerometer.timers[id];
+    }
+};
+
+PhoneGap.addConstructor(function() {
+    if (typeof navigator.accelerometer === "undefined") {
+        navigator.accelerometer = new Accelerometer();
+    }
+});
+}
+/*
+ *     Licensed to the Apache Software Foundation (ASF) under one
+ *     or more contributor license agreements.  See the NOTICE file
+ *     distributed with this work for additional information
+ *     regarding copyright ownership.  The ASF licenses this file
+ *     to you 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.
+ */
+
+if (!PhoneGap.hasResource("app")) {
+PhoneGap.addResource("app");
+(function() {
+
+/**
+ * Constructor
+ * @constructor
+ */
+var App = function() {};
+
+/**
+ * Clear the resource cache.
+ */
+App.prototype.clearCache = function() {
+    PhoneGap.exec(null, null, "App", "clearCache", []);
+};
+
+/**
+ * Load the url into the webview or into new browser instance.
+ *
+ * @param url           The URL to load
+ * @param props         Properties that can be passed in to the activity:
+ *      wait: int                           => wait msec before loading URL
+ *      loadingDialog: "Title,Message"      => display a native loading dialog
+ *      loadUrlTimeoutValue: int            => time in msec to wait before triggering a timeout error
+ *      clearHistory: boolean              => clear webview history (default=false)
+ *      openExternal: boolean              => open in a new browser (default=false)
+ *
+ * Example:
+ *      navigator.app.loadUrl("http://server/myapp/index.html", {wait:2000, loadingDialog:"Wait,Loading App", loadUrlTimeoutValue: 60000});
+ */
+App.prototype.loadUrl = function(url, props) {
+    PhoneGap.exec(null, null, "App", "loadUrl", [url, props]);
+};
+
+/**
+ * Cancel loadUrl that is waiting to be loaded.
+ */
+App.prototype.cancelLoadUrl = function() {
+    PhoneGap.exec(null, null, "App", "cancelLoadUrl", []);
+};
+
+/**
+ * Clear web history in this web view.
+ * Instead of BACK button loading the previous web page, it will exit the app.
+ */
+App.prototype.clearHistory = function() {
+    PhoneGap.exec(null, null, "App", "clearHistory", []);
+};
+
+/**
+ * Go to previous page displayed.
+ * This is the same as pressing the backbutton on Android device.
+ */
+App.prototype.backHistory = function() {
+    PhoneGap.exec(null, null, "App", "backHistory", []);
+};
+
+/**
+ * Exit and terminate the application.
+ */
+App.prototype.exitApp = function() {
+	return PhoneGap.exec(null, null, "App", "exitApp", []);
+};
+
+PhoneGap.addConstructor(function() {
+    navigator.app = new App();
+});
+}());
+}
+/*
+ *     Licensed to the Apache Software Foundation (ASF) under one
+ *     or more contributor license agreements.  See the NOTICE file
+ *     distributed with this work for additional information
+ *     regarding copyright ownership.  The ASF licenses this file
+ *     to you 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.
+ */
+
+if (!PhoneGap.hasResource("battery")) {
+PhoneGap.addResource("battery");
+
+/**
+ * This class contains information about the current battery status.
+ * @constructor
+ */
+var Battery = function() {
+    this._level = null;
+    this._isPlugged = null;
+    this._batteryListener = [];
+    this._lowListener = [];
+    this._criticalListener = [];
+};
+
+/**
+ * Registers as an event producer for battery events.
+ * 
+ * @param {Object} eventType
+ * @param {Object} handler
+ * @param {Object} add
+ */
+Battery.prototype.eventHandler = function(eventType, handler, add) {
+    var me = navigator.battery;
+    if (add) {
+        // If there are no current registered event listeners start the battery listener on native side.
+        if (me._batteryListener.length === 0 && me._lowListener.length === 0 && me._criticalListener.length === 0) {
+            PhoneGap.exec(me._status, me._error, "Battery", "start", []);
+        }
+        
+        // Register the event listener in the proper array
+        if (eventType === "batterystatus") {
+            if (me._batteryListener.indexOf(handler) === -1) {
+                me._batteryListener.push(handler);
+            }
+        } else if (eventType === "batterylow") {
+            if (me._lowListener.indexOf(handler) === -1) {
+                me._lowListener.push(handler);
+            }
+        } else if (eventType === "batterycritical") {
+            if (me._criticalListener.indexOf(handler) === -1) {
+                me._criticalListener.push(handler);
+            }
+        }
+    } else {
+        var pos = -1;
+        // Remove the event listener from the proper array
+        if (eventType === "batterystatus") {
+            pos = me._batteryListener.indexOf(handler);
+            if (pos > -1) {
+                me._batteryListener.splice(pos, 1);        
+            }
+        } else if (eventType === "batterylow") {
+            pos = me._lowListener.indexOf(handler);
+            if (pos > -1) {
+                me._lowListener.splice(pos, 1);        
+            }
+        } else if (eventType === "batterycritical") {
+            pos = me._criticalListener.indexOf(handler);
+            if (pos > -1) {
+                me._criticalListener.splice(pos, 1);        
+            }
+        }
+        
+        // If there are no more registered event listeners stop the battery listener on native side.
+        if (me._batteryListener.length === 0 && me._lowListener.length === 0 && me._criticalListener.length === 0) {
+            PhoneGap.exec(null, null, "Battery", "stop", []);
+        }
+    }
+};
+
+/**
+ * Callback for battery status
+ * 
+ * @param {Object} info			keys: level, isPlugged
+ */
+Battery.prototype._status = function(info) {
+	if (info) {
+		var me = this;
+        var level = info.level;
+		if (me._level !== level || me._isPlugged !== info.isPlugged) {
+			// Fire batterystatus event
+			PhoneGap.fireWindowEvent("batterystatus", info);
+
+			// Fire low battery event
+			if (level === 20 || level === 5) {
+				if (level === 20) {
+					PhoneGap.fireWindowEvent("batterylow", info);
+				}
+				else {
+					PhoneGap.fireWindowEvent("batterycritical", info);
+				}
+			}
+		}
+		me._level = level;
+		me._isPlugged = info.isPlugged;	
+	}
+};
+
+/**
+ * Error callback for battery start
+ */
+Battery.prototype._error = function(e) {
+    console.log("Error initializing Battery: " + e);
+};
+
+PhoneGap.addConstructor(function() {
+    if (typeof navigator.battery === "undefined") {
+        navigator.battery = new Battery();
+        PhoneGap.addWindowEventHandler("batterystatus", navigator.battery.eventHandler);
+        PhoneGap.addWindowEventHandler("batterylow", navigator.battery.eventHandler);
+        PhoneGap.addWindowEventHandler("batterycritical", navigator.battery.eventHandler);
+    }
+});
+}
+/*
+ *     Licensed to the Apache Software Foundation (ASF) under one
+ *     or more contributor license agreements.  See the NOTICE file
+ *     distributed with this work for additional information
+ *     regarding copyright ownership.  The ASF licenses this file
+ *     to you 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.
+ */
+
+if (!PhoneGap.hasResource("camera")) {
+PhoneGap.addResource("camera");
+
+/**
+ * This class provides access to the device camera.
+ *
+ * @constructor
+ */
+var Camera = function() {
+    this.successCallback = null;
+    this.errorCallback = null;
+    this.options = null;
+};
+
+/**
+ * Format of image that returned from getPicture.
+ *
+ * Example: navigator.camera.getPicture(success, fail,
+ *              { quality: 80,
+ *                destinationType: Camera.DestinationType.DATA_URL,
+ *                sourceType: Camera.PictureSourceType.PHOTOLIBRARY})
+ */
+Camera.DestinationType = {
+    DATA_URL: 0,                // Return base64 encoded string
+    FILE_URI: 1                 // Return file uri (content://media/external/images/media/2 for Android)
+};
+Camera.prototype.DestinationType = Camera.DestinationType;
+
+/**
+ * Encoding of image returned from getPicture.
+ *
+ * Example: navigator.camera.getPicture(success, fail,
+ *              { quality: 80,
+ *                destinationType: Camera.DestinationType.DATA_URL,
+ *                sourceType: Camera.PictureSourceType.CAMERA,
+ *                encodingType: Camera.EncodingType.PNG})
+*/
+Camera.EncodingType = {
+    JPEG: 0,                    // Return JPEG encoded image
+    PNG: 1                      // Return PNG encoded image
+};
+Camera.prototype.EncodingType = Camera.EncodingType;
+
+/**
+ * Type of pictures to select from.  Only applicable when
+ *      PictureSourceType is PHOTOLIBRARY or SAVEDPHOTOALBUM
+ *
+ * Example: navigator.camera.getPicture(success, fail,
+ *              { quality: 80,
+ *                destinationType: Camera.DestinationType.DATA_URL,
+ *                sourceType: Camera.PictureSourceType.PHOTOLIBRARY,
+ *                mediaType: Camera.MediaType.PICTURE})
+ */
+Camera.MediaType = {
+       PICTURE: 0,      // allow selection of still pictures only. DEFAULT. Will return format specified via DestinationType
+       VIDEO: 1,        // allow selection of video only, ONLY RETURNS URL
+       ALLMEDIA : 2     // allow selection from all media types
+};
+Camera.prototype.MediaType = Camera.MediaType;
+
+
+/**
+ * Source to getPicture from.
+ *
+ * Example: navigator.camera.getPicture(success, fail,
+ *              { quality: 80,
+ *                destinationType: Camera.DestinationType.DATA_URL,
+ *                sourceType: Camera.PictureSourceType.PHOTOLIBRARY})
+ */
+Camera.PictureSourceType = {
+    PHOTOLIBRARY : 0,           // Choose image from picture library (same as SAVEDPHOTOALBUM for Android)
+    CAMERA : 1,                 // Take picture from camera
+    SAVEDPHOTOALBUM : 2         // Choose image from picture library (same as PHOTOLIBRARY for Android)
+};
+Camera.prototype.PictureSourceType = Camera.PictureSourceType;
+
+/**
+ * Gets a picture from source defined by "options.sourceType", and returns the
+ * image as defined by the "options.destinationType" option.
+
+ * The defaults are sourceType=CAMERA and destinationType=DATA_URL.
+ *
+ * @param {Function} successCallback
+ * @param {Function} errorCallback
+ * @param {Object} options
+ */
+Camera.prototype.getPicture = function(successCallback, errorCallback, options) {
+
+    // successCallback required
+    if (typeof successCallback !== "function") {
+        console.log("Camera Error: successCallback is not a function");
+        return;
+    }
+
+    // errorCallback optional
+    if (errorCallback && (typeof errorCallback !== "function")) {
+        console.log("Camera Error: errorCallback is not a function");
+        return;
+    }
+    
+    if (options === null || typeof options === "undefined") {
+        options = {};
+    }
+    if (options.quality === null || typeof options.quality === "undefined") {
+        options.quality = 80;
+    }
+    if (options.maxResolution === null || typeof options.maxResolution === "undefined") {
+        options.maxResolution = 0;
+    }
+    if (options.destinationType === null || typeof options.destinationType === "undefined") {
+        options.destinationType = Camera.DestinationType.FILE_URI;
+    }
+    if (options.sourceType === null || typeof options.sourceType === "undefined") {
+        options.sourceType = Camera.PictureSourceType.CAMERA;
+    }
+    if (options.encodingType === null || typeof options.encodingType === "undefined") {
+        options.encodingType = Camera.EncodingType.JPEG;
+    }
+    if (options.mediaType === null || typeof options.mediaType === "undefined") {
+        options.mediaType = Camera.MediaType.PICTURE;
+    }
+    if (options.targetWidth === null || typeof options.targetWidth === "undefined") {
+        options.targetWidth = -1;
+    } 
+    else if (typeof options.targetWidth === "string") {
+        var width = new Number(options.targetWidth);
+        if (isNaN(width) === false) {
+            options.targetWidth = width.valueOf();
+        }
+    }
+    if (options.targetHeight === null || typeof options.targetHeight === "undefined") {
+        options.targetHeight = -1;
+    } 
+    else if (typeof options.targetHeight === "string") {
+        var height = new Number(options.targetHeight);
+        if (isNaN(height) === false) {
+            options.targetHeight = height.valueOf();
+        }
+    }
+    
+    PhoneGap.exec(successCallback, errorCallback, "Camera", "takePicture", [options]);
+};
+
+PhoneGap.addConstructor(function() {
+    if (typeof navigator.camera === "undefined") {
+        navigator.camera = new Camera();
+    }
+});
+}
+/*
+ *     Licensed to the Apache Software Foundation (ASF) under one
+ *     or more contributor license agreements.  See the NOTICE file
+ *     distributed with this work for additional information
+ *     regarding copyright ownership.  The ASF licenses this file
+ *     to you 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.
+ */
+
+if (!PhoneGap.hasResource("capture")) {
+PhoneGap.addResource("capture");
+	
+/**
+ * Represents a single file.
+ *
+ * name {DOMString} name of the file, without path information
+ * fullPath {DOMString} the full path of the file, including the name
+ * type {DOMString} mime type
+ * lastModifiedDate {Date} last modified date
+ * size {Number} size of the file in bytes
+ */
+var MediaFile = function(name, fullPath, type, lastModifiedDate, size){
+	this.name = name || null;
+	this.fullPath = fullPath || null;
+	this.type = type || null;
+	this.lastModifiedDate = lastModifiedDate || null;
+	this.size = size || 0;
+};
+
+/**
+ * Launch device camera application for recording video(s).
+ *
+ * @param {Function} successCB
+ * @param {Function} errorCB
+ */
+MediaFile.prototype.getFormatData = function(successCallback, errorCallback){
+	PhoneGap.exec(successCallback, errorCallback, "Capture", "getFormatData", [this.fullPath, this.type]);
+};
+
+/**
+ * MediaFileData encapsulates format information of a media file.
+ *
+ * @param {DOMString} codecs
+ * @param {long} bitrate
+ * @param {long} height
+ * @param {long} width
+ * @param {float} duration
+ */
+var MediaFileData = function(codecs, bitrate, height, width, duration){
+	this.codecs = codecs || null;
+	this.bitrate = bitrate || 0;
+	this.height = height || 0;
+	this.width = width || 0;
+	this.duration = duration || 0;
+};
+
+/**
+ * The CaptureError interface encapsulates all errors in the Capture API.
+ */
+var CaptureError = function(){
+	this.code = null;
+};
+
+// Capture error codes
+CaptureError.CAPTURE_INTERNAL_ERR = 0;
+CaptureError.CAPTURE_APPLICATION_BUSY = 1;
+CaptureError.CAPTURE_INVALID_ARGUMENT = 2;
+CaptureError.CAPTURE_NO_MEDIA_FILES = 3;
+CaptureError.CAPTURE_NOT_SUPPORTED = 20;
+
+/**
+ * The Capture interface exposes an interface to the camera and microphone of the hosting device.
+ */
+var Capture = function(){
+	this.supportedAudioModes = [];
+	this.supportedImageModes = [];
+	this.supportedVideoModes = [];
+};
+
+/**
+ * Launch audio recorder application for recording audio clip(s).
+ *
+ * @param {Function} successCB
+ * @param {Function} errorCB
+ * @param {CaptureAudioOptions} options
+ */
+Capture.prototype.captureAudio = function(successCallback, errorCallback, options){
+	PhoneGap.exec(successCallback, errorCallback, "Capture", "captureAudio", [options]);
+};
+
+/**
+ * Launch camera application for taking image(s).
+ *
+ * @param {Function} successCB
+ * @param {Function} errorCB
+ * @param {CaptureImageOptions} options
+ */
+Capture.prototype.captureImage = function(successCallback, errorCallback, options){
+	PhoneGap.exec(successCallback, errorCallback, "Capture", "captureImage", [options]);
+};
+
+/**
+ * Launch camera application for taking image(s).
+ *
+ * @param {Function} successCB
+ * @param {Function} errorCB
+ * @param {CaptureImageOptions} options
+ */
+Capture.prototype._castMediaFile = function(pluginResult){
+	var mediaFiles = [];
+	var i;
+	for (i = 0; i < pluginResult.message.length; i++) {
+		var mediaFile = new MediaFile();
+		mediaFile.name = pluginResult.message[i].name;
+		mediaFile.fullPath = pluginResult.message[i].fullPath;
+		mediaFile.type = pluginResult.message[i].type;
+		mediaFile.lastModifiedDate = pluginResult.message[i].lastModifiedDate;
+		mediaFile.size = pluginResult.message[i].size;
+		mediaFiles.push(mediaFile);
+	}
+	pluginResult.message = mediaFiles;
+	return pluginResult;
+};
+
+/**
+ * Launch device camera application for recording video(s).
+ *
+ * @param {Function} successCB
+ * @param {Function} errorCB
+ * @param {CaptureVideoOptions} options
+ */
+Capture.prototype.captureVideo = function(successCallback, errorCallback, options){
+	PhoneGap.exec(successCallback, errorCallback, "Capture", "captureVideo", [options]);
+};
+
+/**
+ * Encapsulates a set of parameters that the capture device supports.
+ */
+var ConfigurationData = function(){
+	// The ASCII-encoded string in lower case representing the media type. 
+	this.type = null;
+	// The height attribute represents height of the image or video in pixels. 
+	// In the case of a sound clip this attribute has value 0. 
+	this.height = 0;
+	// The width attribute represents width of the image or video in pixels. 
+	// In the case of a sound clip this attribute has value 0
+	this.width = 0;
+};
+
+/**
+ * Encapsulates all image capture operation configuration options.
+ */
+var CaptureImageOptions = function(){
+	// Upper limit of images user can take. Value must be equal or greater than 1.
+	this.limit = 1;
+	// The selected image mode. Must match with one of the elements in supportedImageModes array.
+	this.mode = null;
+};
+
+/**
+ * Encapsulates all video capture operation configuration options.
+ */
+var CaptureVideoOptions = function(){
+	// Upper limit of videos user can record. Value must be equal or greater than 1.
+	this.limit = 1;
+	// Maximum duration of a single video clip in seconds.
+	this.duration = 0;
+	// The selected video mode. Must match with one of the elements in supportedVideoModes array.
+	this.mode = null;
+};
+
+/**
+ * Encapsulates all audio capture operation configuration options.
+ */
+var CaptureAudioOptions = function(){
+	// Upper limit of sound clips user can record. Value must be equal or greater than 1.
+	this.limit = 1;
+	// Maximum duration of a single sound clip in seconds.
+	this.duration = 0;
+	// The selected audio mode. Must match with one of the elements in supportedAudioModes array.
+	this.mode = null;
+};
+
+PhoneGap.addConstructor(function(){
+	if (typeof navigator.device.capture === "undefined") {
+		navigator.device.capture = window.device.capture = new Capture();
+	}
+});
+}
+/*
+ *     Licensed to the Apache Software Foundation (ASF) under one
+ *     or more contributor license agreements.  See the NOTICE file
+ *     distributed with this work for additional information
+ *     regarding copyright ownership.  The ASF licenses this file
+ *     to you 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.
+ */
+
+if (!PhoneGap.hasResource("compass")) {
+PhoneGap.addResource("compass");
+
+var CompassError = function(){
+    this.code = null;
+};
+
+// Capture error codes
+CompassError.COMPASS_INTERNAL_ERR = 0;
+CompassError.COMPASS_NOT_SUPPORTED = 20;
+
+var CompassHeading = function() {
+    this.magneticHeading = null;
+    this.trueHeading = null;
+    this.headingAccuracy = null;
+    this.timestamp = null;
+};
+
+/**
+ * This class provides access to device Compass data.
+ * @constructor
+ */
+var Compass = function() {
+    /**
+     * The last known Compass position.
+     */
+    this.lastHeading = null;
+
+    /**
+     * List of compass watch timers
+     */
+    this.timers = {};
+};
+
+Compass.ERROR_MSG = ["Not running", "Starting", "", "Failed to start"];
+
+/**
+ * Asynchronously aquires the current heading.
+ *
+ * @param {Function} successCallback The function to call when the heading data is available
+ * @param {Function} errorCallback The function to call when there is an error getting the heading data. (OPTIONAL)
+ * @param {PositionOptions} options The options for getting the heading data such as timeout. (OPTIONAL)
+ */
+Compass.prototype.getCurrentHeading = function(successCallback, errorCallback, options) {
+
+    // successCallback required
+    if (typeof successCallback !== "function") {
+        console.log("Compass Error: successCallback is not a function");
+        return;
+    }
+
+    // errorCallback optional
+    if (errorCallback && (typeof errorCallback !== "function")) {
+        console.log("Compass Error: errorCallback is not a function");
+        return;
+    }
+
+    // Get heading
+    PhoneGap.exec(successCallback, errorCallback, "Compass", "getHeading", []);
+};
+
+/**
+ * Asynchronously aquires the heading repeatedly at a given interval.
+ *
+ * @param {Function} successCallback    The function to call each time the heading data is available
+ * @param {Function} errorCallback      The function to call when there is an error getting the heading data. (OPTIONAL)
+ * @param {HeadingOptions} options      The options for getting the heading data such as timeout and the frequency of the watch. (OPTIONAL)
+ * @return String                       The watch id that must be passed to #clearWatch to stop watching.
+ */
+Compass.prototype.watchHeading= function(successCallback, errorCallback, options) {
+
+    // Default interval (100 msec)
+    var frequency = (options !== undefined) ? options.frequency : 100;
+
+    // successCallback required
+    if (typeof successCallback !== "function") {
+        console.log("Compass Error: successCallback is not a function");
+        return;
+    }
+
+    // errorCallback optional
+    if (errorCallback && (typeof errorCallback !== "function")) {
+        console.log("Compass Error: errorCallback is not a function");
+        return;
+    }
+
+    // Make sure compass timeout > frequency + 10 sec
+    PhoneGap.exec(
+        function(timeout) {
+            if (timeout < (frequency + 10000)) {
+                PhoneGap.exec(null, null, "Compass", "setTimeout", [frequency + 10000]);
+            }
+        },
+        function(e) { }, "Compass", "getTimeout", []);
+
+    // Start watch timer to get headings
+    var id = PhoneGap.createUUID();
+    navigator.compass.timers[id] = setInterval(
+        function() {
+            PhoneGap.exec(successCallback, errorCallback, "Compass", "getHeading", []);
+        }, (frequency ? frequency : 1));
+
+    return id;
+};
+
+
+/**
+ * Clears the specified heading watch.
+ *
+ * @param {String} id       The ID of the watch returned from #watchHeading.
+ */
+Compass.prototype.clearWatch = function(id) {
+
+    // Stop javascript timer & remove from timer list
+    if (id && navigator.compass.timers[id]) {
+        clearInterval(navigator.compass.timers[id]);
+        delete navigator.compass.timers[id];
+    }
+};
+
+Compass.prototype._castDate = function(pluginResult) {
+    if (pluginResult.message.timestamp) {
+        var timestamp = new Date(pluginResult.message.timestamp);
+        pluginResult.message.timestamp = timestamp;
+    }
+    return pluginResult;
+};
+
+PhoneGap.addConstructor(function() {
+    if (typeof navigator.compass === "undefined") {
+        navigator.compass = new Compass();
+    }
+});
+}
+/*
+ *     Licensed to the Apache Software Foundation (ASF) under one
+ *     or more contributor license agreements.  See the NOTICE file
+ *     distributed with this work for additional information
+ *     regarding copyright ownership.  The ASF licenses this file
+ *     to you 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.
+ */
+
+if (!PhoneGap.hasResource("contact")) {
+PhoneGap.addResource("contact");
+
+/**
+* Contains information about a single contact.
+* @constructor
+* @param {DOMString} id unique identifier
+* @param {DOMString} displayName
+* @param {ContactName} name
+* @param {DOMString} nickname
+* @param {Array.<ContactField>} phoneNumbers array of phone numbers
+* @param {Array.<ContactField>} emails array of email addresses
+* @param {Array.<ContactAddress>} addresses array of addresses
+* @param {Array.<ContactField>} ims instant messaging user ids
+* @param {Array.<ContactOrganization>} organizations
+* @param {DOMString} birthday contact's birthday
+* @param {DOMString} note user notes about contact
+* @param {Array.<ContactField>} photos
+* @param {Array.<ContactField>} categories
+* @param {Array.<ContactField>} urls contact's web sites
+*/
+var Contact = function (id, displayName, name, nickname, phoneNumbers, emails, addresses,
+    ims, organizations, birthday, note, photos, categories, urls) {
+    this.id = id || null;
+    this.rawId = null;
+    this.displayName = displayName || null;
+    this.name = name || null; // ContactName
+    this.nickname = nickname || null;
+    this.phoneNumbers = phoneNumbers || null; // ContactField[]
+    this.emails = emails || null; // ContactField[]
+    this.addresses = addresses || null; // ContactAddress[]
+    this.ims = ims || null; // ContactField[]
+    this.organizations = organizations || null; // ContactOrganization[]
+    this.birthday = birthday || null;
+    this.note = note || null;
+    this.photos = photos || null; // ContactField[]
+    this.categories = categories || null; // ContactField[]
+    this.urls = urls || null; // ContactField[]
+};
+
+/**
+ *  ContactError.
+ *  An error code assigned by an implementation when an error has occurreds
+ * @constructor
+ */
+var ContactError = function() {
+    this.code=null;
+};
+
+/**
+ * Error codes
+ */
+ContactError.UNKNOWN_ERROR = 0;
+ContactError.INVALID_ARGUMENT_ERROR = 1;
+ContactError.TIMEOUT_ERROR = 2;
+ContactError.PENDING_OPERATION_ERROR = 3;
+ContactError.IO_ERROR = 4;
+ContactError.NOT_SUPPORTED_ERROR = 5;
+ContactError.PERMISSION_DENIED_ERROR = 20;
+
+/**
+* Removes contact from device storage.
+* @param successCB success callback
+* @param errorCB error callback
+*/
+Contact.prototype.remove = function(successCB, errorCB) {
+    if (this.id === null) {
+        var errorObj = new ContactError();
+        errorObj.code = ContactError.UNKNOWN_ERROR;
+        errorCB(errorObj);
+    }
+    else {
+        PhoneGap.exec(successCB, errorCB, "Contacts", "remove", [this.id]);
+    }
+};
+
+/**
+* Creates a deep copy of this Contact.
+* With the contact ID set to null.
+* @return copy of this Contact
+*/
+Contact.prototype.clone = function() {
+    var clonedContact = PhoneGap.clone(this);
+    var i;
+    clonedContact.id = null;
+    clonedContact.rawId = null;
+    // Loop through and clear out any id's in phones, emails, etc.
+    if (clonedContact.phoneNumbers) {
+        for (i = 0; i < clonedContact.phoneNumbers.length; i++) {
+            clonedContact.phoneNumbers[i].id = null;
+        }
+    }
+    if (clonedContact.emails) {
+        for (i = 0; i < clonedContact.emails.length; i++) {
+            clonedContact.emails[i].id = null;
+        }
+    }
+    if (clonedContact.addresses) {
+        for (i = 0; i < clonedContact.addresses.length; i++) {
+            clonedContact.addresses[i].id = null;
+        }
+    }
+    if (clonedContact.ims) {
+        for (i = 0; i < clonedContact.ims.length; i++) {
+            clonedContact.ims[i].id = null;
+        }
+    }
+    if (clonedContact.organizations) {
+        for (i = 0; i < clonedContact.organizations.length; i++) {
+            clonedContact.organizations[i].id = null;
+        }
+    }
+    if (clonedContact.tags) {
+        for (i = 0; i < clonedContact.tags.length; i++) {
+            clonedContact.tags[i].id = null;
+        }
+    }
+    if (clonedContact.photos) {
+        for (i = 0; i < clonedContact.photos.length; i++) {
+            clonedContact.photos[i].id = null;
+        }
+    }
+    if (clonedContact.urls) {
+        for (i = 0; i < clonedContact.urls.length; i++) {
+            clonedContact.urls[i].id = null;
+        }
+    }
+    return clonedContact;
+};
+
+/**
+* Persists contact to device storage.
+* @param successCB success callback
+* @param errorCB error callback
+*/
+Contact.prototype.save = function(successCB, errorCB) {
+    PhoneGap.exec(successCB, errorCB, "Contacts", "save", [this]);
+};
+
+/**
+* Contact name.
+* @constructor
+* @param formatted
+* @param familyName
+* @param givenName
+* @param middle
+* @param prefix
+* @param suffix
+*/
+var ContactName = function(formatted, familyName, givenName, middle, prefix, suffix) {
+    this.formatted = formatted || null;
+    this.familyName = familyName || null;
+    this.givenName = givenName || null;
+    this.middleName = middle || null;
+    this.honorificPrefix = prefix || null;
+    this.honorificSuffix = suffix || null;
+};
+
+/**
+* Generic contact field.
+* @constructor
+* @param {DOMString} id unique identifier, should only be set by native code
+* @param type
+* @param value
+* @param pref
+*/
+var ContactField = function(type, value, pref) {
+	this.id = null;
+    this.type = type || null;
+    this.value = value || null;
+    this.pref = pref || null;
+};
+
+/**
+* Contact address.
+* @constructor
+* @param {DOMString} id unique identifier, should only be set by native code
+* @param formatted
+* @param streetAddress
+* @param locality
+* @param region
+* @param postalCode
+* @param country
+*/
+var ContactAddress = function(pref, type, formatted, streetAddress, locality, region, postalCode, country) {
+	this.id = null;
+    this.pref = pref || null;
+    this.type = type || null;
+    this.formatted = formatted || null;
+    this.streetAddress = streetAddress || null;
+    this.locality = locality || null;
+    this.region = region || null;
+    this.postalCode = postalCode || null;
+    this.country = country || null;
+};
+
+/**
+* Contact organization.
+* @constructor
+* @param {DOMString} id unique identifier, should only be set by native code
+* @param name
+* @param dept
+* @param title
+* @param startDate
+* @param endDate
+* @param location
+* @param desc
+*/
+var ContactOrganization = function(pref, type, name, dept, title) {
+	this.id = null;
+    this.pref = pref || null;
+    this.type = type || null;
+    this.name = name || null;
+    this.department = dept || null;
+    this.title = title || null;
+};
+
+/**
+* Represents a group of Contacts.
+* @constructor
+*/
+var Contacts = function() {
+    this.inProgress = false;
+    this.records = [];
+};
+/**
+* Returns an array of Contacts matching the search criteria.
+* @param fields that should be searched
+* @param successCB success callback
+* @param errorCB error callback
+* @param {ContactFindOptions} options that can be applied to contact searching
+* @return array of Contacts matching search criteria
+*/
+Contacts.prototype.find = function(fields, successCB, errorCB, options) {
+    if (successCB === null) {
+        throw new TypeError("You must specify a success callback for the find command.");
+    }
+    if (fields === null || fields === "undefined" || fields.length === "undefined" || fields.length <= 0) {
+        if (typeof errorCB === "function") {
+            errorCB({"code": ContactError.INVALID_ARGUMENT_ERROR});
+        }
+    } else {
+        PhoneGap.exec(successCB, errorCB, "Contacts", "search", [fields, options]);        
+    }
+};
+
+/**
+* This function creates a new contact, but it does not persist the contact
+* to device storage. To persist the contact to device storage, invoke
+* contact.save().
+* @param properties an object who's properties will be examined to create a new Contact
+* @returns new Contact object
+*/
+Contacts.prototype.create = function(properties) {
+    var i;
+	var contact = new Contact();
+    for (i in properties) {
+        if (contact[i] !== 'undefined') {
+            contact[i] = properties[i];
+        }
+    }
+    return contact;
+};
+
+/**
+* This function returns and array of contacts.  It is required as we need to convert raw
+* JSON objects into concrete Contact objects.  Currently this method is called after
+* navigator.contacts.find but before the find methods success call back.
+*
+* @param jsonArray an array of JSON Objects that need to be converted to Contact objects.
+* @returns an array of Contact objects
+*/
+Contacts.prototype.cast = function(pluginResult) {
+	var contacts = [];
+	var i;
+	for (i=0; i<pluginResult.message.length; i++) {
+		contacts.push(navigator.contacts.create(pluginResult.message[i]));
+	}
+	pluginResult.message = contacts;
+	return pluginResult;
+};
+
+/**
+ * ContactFindOptions.
+ * @constructor
+ * @param filter used to match contacts against
+ * @param multiple boolean used to determine if more than one contact should be returned
+ */
+var ContactFindOptions = function(filter, multiple) {
+    this.filter = filter || '';
+    this.multiple = multiple || false;
+};
+
+/**
+ * Add the contact interface into the browser.
+ */
+PhoneGap.addConstructor(function() {
+    if(typeof navigator.contacts === "undefined") {
+        navigator.contacts = new Contacts();
+    }
+});
+}
+/*
+ *     Licensed to the Apache Software Foundation (ASF) under one
+ *     or more contributor license agreements.  See the NOTICE file
+ *     distributed with this work for additional information
+ *     regarding copyright ownership.  The ASF licenses this file
+ *     to you 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.
+ */
+
+// TODO: Needs to be commented
+
+if (!PhoneGap.hasResource("crypto")) {
+PhoneGap.addResource("crypto");
+
+/**
+* @constructor
+*/
+var Crypto = function() {
+};
+
+Crypto.prototype.encrypt = function(seed, string, callback) {
+    this.encryptWin = callback;
+    PhoneGap.exec(null, null, "Crypto", "encrypt", [seed, string]);
+};
+
+Crypto.prototype.decrypt = function(seed, string, callback) {
+    this.decryptWin = callback;
+    PhoneGap.exec(null, null, "Crypto", "decrypt", [seed, string]);
+};
+
+Crypto.prototype.gotCryptedString = function(string) {
+    this.encryptWin(string);
+};
+
+Crypto.prototype.getPlainString = function(string) {
+    this.decryptWin(string);
+};
+
+PhoneGap.addConstructor(function() {
+    if (typeof navigator.Crypto === "undefined") {
+        navigator.Crypto = new Crypto();
+    }
+});
+}
+/*
+ *     Licensed to the Apache Software Foundation (ASF) under one
+ *     or more contributor license agreements.  See the NOTICE file
+ *     distributed with this work for additional information
+ *     regarding copyright ownership.  The ASF licenses this file
+ *     to you 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.
+ */
+
+if (!PhoneGap.hasResource("file")) {
+PhoneGap.addResource("file");
+
+/**
+ * This class provides some useful information about a file.
+ * @constructor
+ */
+var FileProperties = function(filePath) {
+    this.filePath = filePath;
+    this.size = 0;
+    this.lastModifiedDate = null;
+};
+
+/**
+ * Represents a single file.
+ *
+ * @constructor
+ * @param name {DOMString} name of the file, without path information
+ * @param fullPath {DOMString} the full path of the file, including the name
+ * @param type {DOMString} mime type
+ * @param lastModifiedDate {Date} last modified date
+ * @param size {Number} size of the file in bytes
+ */
+var File = function(name, fullPath, type, lastModifiedDate, size) {
+    this.name = name || null;
+    this.fullPath = fullPath || null;
+    this.type = type || null;
+    this.lastModifiedDate = lastModifiedDate || null;
+    this.size = size || 0;
+};
+
+/** @constructor */
+var FileError = function() {
+   this.code = null;
+};
+
+// File error codes
+// Found in DOMException
+FileError.NOT_FOUND_ERR = 1;
+FileError.SECURITY_ERR = 2;
+FileError.ABORT_ERR = 3;
+
+// Added by this specification
+FileError.NOT_READABLE_ERR = 4;
+FileError.ENCODING_ERR = 5;
+FileError.NO_MODIFICATION_ALLOWED_ERR = 6;
+FileError.INVALID_STATE_ERR = 7;
+FileError.SYNTAX_ERR = 8;
+FileError.INVALID_MODIFICATION_ERR = 9;
+FileError.QUOTA_EXCEEDED_ERR = 10;
+FileError.TYPE_MISMATCH_ERR = 11;
+FileError.PATH_EXISTS_ERR = 12;
+
+//-----------------------------------------------------------------------------
+// File Reader
+//-----------------------------------------------------------------------------
+
+/**
+ * This class reads the mobile device file system.
+ *
+ * For Android:
+ *      The root directory is the root of the file system.
+ *      To read from the SD card, the file name is "sdcard/my_file.txt"
+ * @constructor
+ */
+var FileReader = function() {
+    this.fileName = "";
+
+    this.readyState = 0;
+
+    // File data
+    this.result = null;
+
+    // Error
+    this.error = null;
+
+    // Event handlers
+    this.onloadstart = null;    // When the read starts.
+    this.onprogress = null;     // While reading (and decoding) file or fileBlob data, and reporting partial file data (progess.loaded/progress.total)
+    this.onload = null;         // When the read has successfully completed.
+    this.onerror = null;        // When the read has failed (see errors).
+    this.onloadend = null;      // When the request has completed (either in success or failure).
+    this.onabort = null;        // When the read has been aborted. For instance, by invoking the abort() method.
+};
+
+// States
+FileReader.EMPTY = 0;
+FileReader.LOADING = 1;
+FileReader.DONE = 2;
+
+/**
+ * Abort reading file.
+ */
+FileReader.prototype.abort = function() {
+    var evt;
+    this.readyState = FileReader.DONE;
+    this.result = null;
+
+    // set error
+    var error = new FileError();
+    error.code = error.ABORT_ERR;
+    this.error = error;
+
+    // If error callback
+    if (typeof this.onerror === "function") {
+        this.onerror({"type":"error", "target":this});
+    }
+    // If abort callback
+    if (typeof this.onabort === "function") {
+        this.onabort({"type":"abort", "target":this});
+    }
+    // If load end callback
+    if (typeof this.onloadend === "function") {
+        this.onloadend({"type":"loadend", "target":this});
+    }
+};
+
+/**
+ * Read text file.
+ *
+ * @param file          {File} File object containing file properties
+ * @param encoding      [Optional] (see http://www.iana.org/assignments/character-sets)
+ */
+FileReader.prototype.readAsText = function(file, encoding) {
+    this.fileName = "";
+    if (typeof file.fullPath === "undefined") {
+        this.fileName = file;
+    } else {
+        this.fileName = file.fullPath;
+    }
+
+    // LOADING state
+    this.readyState = FileReader.LOADING;
+
+    // If loadstart callback
+    if (typeof this.onloadstart === "function") {
+        this.onloadstart({"type":"loadstart", "target":this});
+    }
+
+    // Default encoding is UTF-8
+    var enc = encoding ? encoding : "UTF-8";
+
+    var me = this;
+
+    // Read file
+    PhoneGap.exec(
+        // Success callback
+        function(r) {
+            var evt;
+
+            // If DONE (cancelled), then don't do anything
+            if (me.readyState === FileReader.DONE) {
+                return;
+            }
+
+            // Save result
+            me.result = r;
+
+            // If onload callback
+            if (typeof me.onload === "function") {
+                me.onload({"type":"load", "target":me});
+            }
+
+            // DONE state
+            me.readyState = FileReader.DONE;
+
+            // If onloadend callback
+            if (typeof me.onloadend === "function") {
+                me.onloadend({"type":"loadend", "target":me});
+            }
+        },
+        // Error callback
+        function(e) {
+            var evt;
+            // If DONE (cancelled), then don't do anything
+            if (me.readyState === FileReader.DONE) {
+                return;
+            }
+
+            // Save error
+            me.error = e;
+
+            // If onerror callback
+            if (typeof me.onerror === "function") {
+                me.onerror({"type":"error", "target":me});
+            }
+
+            // DONE state
+            me.readyState = FileReader.DONE;
+
+            // If onloadend callback
+            if (typeof me.onloadend === "function") {
+                me.onloadend({"type":"loadend", "target":me});
+            }
+        }, "File", "readAsText", [this.fileName, enc]);
+};
+
+
+/**
+ * Read file and return data as a base64 encoded data url.
+ * A data url is of the form:
+ *      data:[<mediatype>][;base64],<data>
+ *
+ * @param file          {File} File object containing file properties
+ */
+FileReader.prototype.readAsDataURL = function(file) {
+    this.fileName = "";
+    if (typeof file.fullPath === "undefined") {
+        this.fileName = file;
+    } else {
+        this.fileName = file.fullPath;
+    }
+
+    // LOADING state
+    this.readyState = FileReader.LOADING;
+
+    // If loadstart callback
+    if (typeof this.onloadstart === "function") {
+        this.onloadstart({"type":"loadstart", "target":this});
+    }
+
+    var me = this;
+
+    // Read file
+    PhoneGap.exec(
+        // Success callback
+        function(r) {
+            var evt;
+
+            // If DONE (cancelled), then don't do anything
+            if (me.readyState === FileReader.DONE) {
+                return;
+            }
+
+            // Save result
+            me.result = r;
+
+            // If onload callback
+            if (typeof me.onload === "function") {
+                me.onload({"type":"load", "target":me});
+            }
+
+            // DONE state
+            me.readyState = FileReader.DONE;
+
+            // If onloadend callback
+            if (typeof me.onloadend === "function") {
+                me.onloadend({"type":"loadend", "target":me});
+            }
+        },
+        // Error callback
+        function(e) {
+            var evt;
+            // If DONE (cancelled), then don't do anything
+            if (me.readyState === FileReader.DONE) {
+                return;
+            }
+
+            // Save error
+            me.error = e;
+
+            // If onerror callback
+            if (typeof me.onerror === "function") {
+                me.onerror({"type":"error", "target":me});
+            }
+
+            // DONE state
+            me.readyState = FileReader.DONE;
+
+            // If onloadend callback
+            if (typeof me.onloadend === "function") {
+                me.onloadend({"type":"loadend", "target":me});
+            }
+        }, "File", "readAsDataURL", [this.fileName]);
+};
+
+/**
+ * Read file and return data as a binary data.
+ *
+ * @param file          {File} File object containing file properties
+ */
+FileReader.prototype.readAsBinaryString = function(file) {
+    // TODO - Can't return binary data to browser.
+    this.fileName = file;
+};
+
+/**
+ * Read file and return data as a binary data.
+ *
+ * @param file          {File} File object containing file properties
+ */
+FileReader.prototype.readAsArrayBuffer = function(file) {
+    // TODO - Can't return binary data to browser.
+    this.fileName = file;
+};
+
+//-----------------------------------------------------------------------------
+// File Writer
+//-----------------------------------------------------------------------------
+
+/**
+ * This class writes to the mobile device file system.
+ *
+ * For Android:
+ *      The root directory is the root of the file system.
+ *      To write to the SD card, the file name is "sdcard/my_file.txt"
+ *
+ * @constructor
+ * @param file {File} File object containing file properties
+ * @param append if true write to the end of the file, otherwise overwrite the file
+ */
+var FileWriter = function(file) {
+    this.fileName = "";
+    this.length = 0;
+    if (file) {
+        this.fileName = file.fullPath || file;
+        this.length = file.size || 0;
+    }
+    // default is to write at the beginning of the file
+    this.position = 0;
+
+    this.readyState = 0; // EMPTY
+
+    this.result = null;
+
+    // Error
+    this.error = null;
+
+    // Event handlers
+    this.onwritestart = null;   // When writing starts
+    this.onprogress = null;     // While writing the file, and reporting partial file data
+    this.onwrite = null;        // When the write has successfully completed.
+    this.onwriteend = null;     // When the request has completed (either in success or failure).
+    this.onabort = null;        // When the write has been aborted. For instance, by invoking the abort() method.
+    this.onerror = null;        // When the write has failed (see errors).
+};
+
+// States
+FileWriter.INIT = 0;
+FileWriter.WRITING = 1;
+FileWriter.DONE = 2;
+
+/**
+ * Abort writing file.
+ */
+FileWriter.prototype.abort = function() {
+    // check for invalid state
+    if (this.readyState === FileWriter.DONE || this.readyState === FileWriter.INIT) {
+        throw FileError.INVALID_STATE_ERR;
+    }
+
+    // set error
+    var error = new FileError(), evt;
+    error.code = error.ABORT_ERR;
+    this.error = error;
+
+    // If error callback
+    if (typeof this.onerror === "function") {
+        this.onerror({"type":"error", "target":this});
+    }
+    // If abort callback
+    if (typeof this.onabort === "function") {
+        this.onabort({"type":"abort", "target":this});
+    }
+
+    this.readyState = FileWriter.DONE;
+
+    // If write end callback
+    if (typeof this.onwriteend === "function") {
+        this.onwriteend({"type":"writeend", "target":this});
+    }
+};
+
+/**
+ * Writes data to the file
+ *
+ * @param text to be written
+ */
+FileWriter.prototype.write = function(text) {
+    // Throw an exception if we are already writing a file
+    if (this.readyState === FileWriter.WRITING) {
+        throw FileError.INVALID_STATE_ERR;
+    }
+
+    // WRITING state
+    this.readyState = FileWriter.WRITING;
+
+    var me = this;
+
+    // If onwritestart callback
+    if (typeof me.onwritestart === "function") {
+        me.onwritestart({"type":"writestart", "target":me});
+    }
+
+    // Write file
+    PhoneGap.exec(
+        // Success callback
+        function(r) {
+            var evt;
+            // If DONE (cancelled), then don't do anything
+            if (me.readyState === FileWriter.DONE) {
+                return;
+            }
+
+            // position always increases by bytes written because file would be extended
+            me.position += r;
+            // The length of the file is now where we are done writing.
+            me.length = me.position;
+
+            // If onwrite callback
+            if (typeof me.onwrite === "function") {
+                me.onwrite({"type":"write", "target":me});
+            }
+
+            // DONE state
+            me.readyState = FileWriter.DONE;
+
+            // If onwriteend callback
+            if (typeof me.onwriteend === "function") {
+                me.onwriteend({"type":"writeend", "target":me});
+            }
+        },
+        // Error callback
+        function(e) {
+            var evt;
+
+            // If DONE (cancelled), then don't do anything
+            if (me.readyState === FileWriter.DONE) {
+                return;
+            }
+
+            // Save error
+            me.error = e;
+
+            // If onerror callback
+            if (typeof me.onerror === "function") {
+                me.onerror({"type":"error", "target":me});
+            }
+
+            // DONE state
+            me.readyState = FileWriter.DONE;
+
+            // If onwriteend callback
+            if (typeof me.onwriteend === "function") {
+                me.onwriteend({"type":"writeend", "target":me});
+            }
+        }, "File", "write", [this.fileName, text, this.position]);
+};
+
+/**
+ * Moves the file pointer to the location specified.
+ *
+ * If the offset is a negative number the position of the file
+ * pointer is rewound.  If the offset is greater than the file
+ * size the position is set to the end of the file.
+ *
+ * @param offset is the location to move the file pointer to.
+ */
+FileWriter.prototype.seek = function(offset) {
+    // Throw an exception if we are already writing a file
+    if (this.readyState === FileWriter.WRITING) {
+        throw FileError.INVALID_STATE_ERR;
+    }
+
+    if (!offset) {
+        return;
+    }
+
+    // See back from end of file.
+    if (offset < 0) {
+        this.position = Math.max(offset + this.length, 0);
+    }
+    // Offset is bigger then file size so set position
+    // to the end of the file.
+    else if (offset > this.length) {
+        this.position = this.length;
+    }
+    // Offset is between 0 and file size so set the position
+    // to start writing.
+    else {
+        this.position = offset;
+    }
+};
+
+/**
+ * Truncates the file to the size specified.
+ *
+ * @param size to chop the file at.
+ */
+FileWriter.prototype.truncate = function(size) {
+    // Throw an exception if we are already writing a file
+    if (this.readyState === FileWriter.WRITING) {
+        throw FileError.INVALID_STATE_ERR;
+    }
+
+    // WRITING state
+    this.readyState = FileWriter.WRITING;
+
+    var me = this;
+
+    // If onwritestart callback
+    if (typeof me.onwritestart === "function") {
+        me.onwritestart({"type":"writestart", "target":this});
+    }
+
+    // Write file
+    PhoneGap.exec(
+        // Success callback
+        function(r) {
+            var evt;
+            // If DONE (cancelled), then don't do anything
+            if (me.readyState === FileWriter.DONE) {
+                return;
+            }
+
+            // Update the length of the file
+            me.length = r;
+            me.position = Math.min(me.position, r);
+
+            // If onwrite callback
+            if (typeof me.onwrite === "function") {
+                me.onwrite({"type":"write", "target":me});
+            }
+
+            // DONE state
+            me.readyState = FileWriter.DONE;
+
+            // If onwriteend callback
+            if (typeof me.onwriteend === "function") {
+                me.onwriteend({"type":"writeend", "target":me});
+            }
+        },
+        // Error callback
+        function(e) {
+            var evt;
+            // If DONE (cancelled), then don't do anything
+            if (me.readyState === FileWriter.DONE) {
+                return;
+            }
+
+            // Save error
+            me.error = e;
+
+            // If onerror callback
+            if (typeof me.onerror === "function") {
+                me.onerror({"type":"error", "target":me});
+            }
+
+            // DONE state
+            me.readyState = FileWriter.DONE;
+
+            // If onwriteend callback
+            if (typeof me.onwriteend === "function") {
+                me.onwriteend({"type":"writeend", "target":me});
+            }
+        }, "File", "truncate", [this.fileName, size]);
+};
+
+/**
+ * Information about the state of the file or directory
+ *
+ * @constructor
+ * {Date} modificationTime (readonly)
+ */
+var Metadata = function() {
+    this.modificationTime=null;
+};
+
+/**
+ * Supplies arguments to methods that lookup or create files and directories
+ *
+ * @constructor
+ * @param {boolean} create file or directory if it doesn't exist
+ * @param {boolean} exclusive if true the command will fail if the file or directory exists
+ */
+var Flags = function(create, exclusive) {
+    this.create = create || false;
+    this.exclusive = exclusive || false;
+};
+
+/**
+ * An interface representing a file system
+ *
+ * @constructor
+ * {DOMString} name the unique name of the file system (readonly)
+ * {DirectoryEntry} root directory of the file system (readonly)
+ */
+var FileSystem = function() {
+    this.name = null;
+    this.root = null;
+};
+
+/**
+ * An interface that lists the files and directories in a directory.
+ * @constructor
+ */
+var DirectoryReader = function(fullPath){
+    this.fullPath = fullPath || null;
+};
+
+/**
+ * Returns a list of entries from a directory.
+ *
+ * @param {Function} successCallback is called with a list of entries
+ * @param {Function} errorCallback is called with a FileError
+ */
+DirectoryReader.prototype.readEntries = function(successCallback, errorCallback) {
+    PhoneGap.exec(successCallback, errorCallback, "File", "readEntries", [this.fullPath]);
+};
+
+/**
+ * An interface representing a directory on the file system.
+ *
+ * @constructor
+ * {boolean} isFile always false (readonly)
+ * {boolean} isDirectory always true (readonly)
+ * {DOMString} name of the directory, excluding the path leading to it (readonly)
+ * {DOMString} fullPath the absolute full path to the directory (readonly)
+ * {FileSystem} filesystem on which the directory resides (readonly)
+ */
+var DirectoryEntry = function() {
+    this.isFile = false;
+    this.isDirectory = true;
+    this.name = null;
+    this.fullPath = null;
+    this.filesystem = null;
+};
+
+/**
+ * Copies a directory to a new location
+ *
+ * @param {DirectoryEntry} parent the directory to which to copy the entry
+ * @param {DOMString} newName the new name of the entry, defaults to the current name
+ * @param {Function} successCallback is called with the new entry
+ * @param {Function} errorCallback is called with a FileError
+ */
+DirectoryEntry.prototype.copyTo = function(parent, newName, successCallback, errorCallback) {
+    PhoneGap.exec(successCallback, errorCallback, "File", "copyTo", [this.fullPath, parent, newName]);
+};
+
+/**
+ * Looks up the metadata of the entry
+ *
+ * @param {Function} successCallback is called with a Metadata object
+ * @param {Function} errorCallback is called with a FileError
+ */
+DirectoryEntry.prototype.getMetadata = function(successCallback, errorCallback) {
+    PhoneGap.exec(successCallback, errorCallback, "File", "getMetadata", [this.fullPath]);
+};
+
+/**
+ * Gets the parent of the entry
+ *
+ * @param {Function} successCallback is called with a parent entry
+ * @param {Function} errorCallback is called with a FileError
+ */
+DirectoryEntry.prototype.getParent = function(successCallback, errorCallback) {
+    PhoneGap.exec(successCallback, errorCallback, "File", "getParent", [this.fullPath]);
+};
+
+/**
+ * Moves a directory to a new location
+ *
+ * @param {DirectoryEntry} parent the directory to which to move the entry
+ * @param {DOMString} newName the new name of the entry, defaults to the current name
+ * @param {Function} successCallback is called with the new entry
+ * @param {Function} errorCallback is called with a FileError
+ */
+DirectoryEntry.prototype.moveTo = function(parent, newName, successCallback, errorCallback) {
+    PhoneGap.exec(successCallback, errorCallback, "File", "moveTo", [this.fullPath, parent, newName]);
+};
+
+/**
+ * Removes the entry
+ *
+ * @param {Function} successCallback is called with no parameters
+ * @param {Function} errorCallback is called with a FileError
+ */
+DirectoryEntry.prototype.remove = function(successCallback, errorCallback) {
+    PhoneGap.exec(successCallback, errorCallback, "File", "remove", [this.fullPath]);
+};
+
+/**
+ * Returns a URI that can be used to identify this entry.
+ *
+ * @param {DOMString} mimeType for a FileEntry, the mime type to be used to interpret the file, when loaded through this URI.
+ * @return uri
+ */
+DirectoryEntry.prototype.toURI = function(mimeType) {
+    return "file://" + this.fullPath;
+};
+
+/**
+ * Creates a new DirectoryReader to read entries from this directory
+ */
+DirectoryEntry.prototype.createReader = function(successCallback, errorCallback) {
+    return new DirectoryReader(this.fullPath);
+};
+
+/**
+ * Creates or looks up a directory
+ *
+ * @param {DOMString} path either a relative or absolute path from this directory in which to look up or create a directory
+ * @param {Flags} options to create or excluively create the directory
+ * @param {Function} successCallback is called with the new entry
+ * @param {Function} errorCallback is called with a FileError
+ */
+DirectoryEntry.prototype.getDirectory = function(path, options, successCallback, errorCallback) {
+    PhoneGap.exec(successCallback, errorCallback, "File", "getDirectory", [this.fullPath, path, options]);
+};
+
+/**
+ * Creates or looks up a file
+ *
+ * @param {DOMString} path either a relative or absolute path from this directory in which to look up or create a file
+ * @param {Flags} options to create or excluively create the file
+ * @param {Function} successCallback is called with the new entry
+ * @param {Function} errorCallback is called with a FileError
+ */
+DirectoryEntry.prototype.getFile = function(path, options, successCallback, errorCallback) {
+    PhoneGap.exec(successCallback, errorCallback, "File", "getFile", [this.fullPath, path, options]);
+};
+
+/**
+ * Deletes a directory and all of it's contents
+ *
+ * @param {Function} successCallback is called with no parameters
+ * @param {Function} errorCallback is called with a FileError
+ */
+DirectoryEntry.prototype.removeRecursively = function(successCallback, errorCallback) {
+    PhoneGap.exec(successCallback, errorCallback, "File", "removeRecursively", [this.fullPath]);
+};
+
+/**
+ * An interface representing a directory on the file system.
+ *
+ * @constructor
+ * {boolean} isFile always true (readonly)
+ * {boolean} isDirectory always false (readonly)
+ * {DOMString} name of the file, excluding the path leading to it (readonly)
+ * {DOMString} fullPath the absolute full path to the file (readonly)
+ * {FileSystem} filesystem on which the directory resides (readonly)
+ */
+var FileEntry = function() {
+    this.isFile = true;
+    this.isDirectory = false;
+    this.name = null;
+    this.fullPath = null;
+    this.filesystem = null;
+};
+
+/**
+ * Copies a file to a new location
+ *
+ * @param {DirectoryEntry} parent the directory to which to copy the entry
+ * @param {DOMString} newName the new name of the entry, defaults to the current name
+ * @param {Function} successCallback is called with the new entry
+ * @param {Function} errorCallback is called with a FileError
+ */
+FileEntry.prototype.copyTo = function(parent, newName, successCallback, errorCallback) {
+    PhoneGap.exec(successCallback, errorCallback, "File", "copyTo", [this.fullPath, parent, newName]);
+};
+
+/**
+ * Looks up the metadata of the entry
+ *
+ * @param {Function} successCallback is called with a Metadata object
+ * @param {Function} errorCallback is called with a FileError
+ */
+FileEntry.prototype.getMetadata = function(successCallback, errorCallback) {
+    PhoneGap.exec(successCallback, errorCallback, "File", "getMetadata", [this.fullPath]);
+};
+
+/**
+ * Gets the parent of the entry
+ *
+ * @param {Function} successCallback is called with a parent entry
+ * @param {Function} errorCallback is called with a FileError
+ */
+FileEntry.prototype.getParent = function(successCallback, errorCallback) {
+    PhoneGap.exec(successCallback, errorCallback, "File", "getParent", [this.fullPath]);
+};
+
+/**
+ * Moves a directory to a new location
+ *
+ * @param {DirectoryEntry} parent the directory to which to move the entry
+ * @param {DOMString} newName the new name of the entry, defaults to the current name
+ * @param {Function} successCallback is called with the new entry
+ * @param {Function} errorCallback is called with a FileError
+ */
+FileEntry.prototype.moveTo = function(parent, newName, successCallback, errorCallback) {
+    PhoneGap.exec(successCallback, errorCallback, "File", "moveTo", [this.fullPath, parent, newName]);
+};
+
+/**
+ * Removes the entry
+ *
+ * @param {Function} successCallback is called with no parameters
+ * @param {Function} errorCallback is called with a FileError
+ */
+FileEntry.prototype.remove = function(successCallback, errorCallback) {
+    PhoneGap.exec(successCallback, errorCallback, "File", "remove", [this.fullPath]);
+};
+
+/**
+ * Returns a URI that can be used to identify this entry.
+ *
+ * @param {DOMString} mimeType for a FileEntry, the mime type to be used to interpret the file, when loaded through this URI.
+ * @return uri
+ */
+FileEntry.prototype.toURI = function(mimeType) {
+    return "file://" + this.fullPath;
+};
+
+/**
+ * Creates a new FileWriter associated with the file that this FileEntry represents.
+ *
+ * @param {Function} successCallback is called with the new FileWriter
+ * @param {Function} errorCallback is called with a FileError
+ */
+FileEntry.prototype.createWriter = function(successCallback, errorCallback) {
+    this.file(function(filePointer) {
+        var writer = new FileWriter(filePointer);
+    
+        if (writer.fileName === null || writer.fileName === "") {
+            if (typeof errorCallback === "function") {
+                errorCallback({
+                    "code": FileError.INVALID_STATE_ERR
+                });
+            }
+        }
+    
+        if (typeof successCallback === "function") {
+            successCallback(writer);
+        }       
+    }, errorCallback);
+};
+
+/**
+ * Returns a File that represents the current state of the file that this FileEntry represents.
+ *
+ * @param {Function} successCallback is called with the new File object
+ * @param {Function} errorCallback is called with a FileError
+ */
+FileEntry.prototype.file = function(successCallback, errorCallback) {
+    PhoneGap.exec(successCallback, errorCallback, "File", "getFileMetadata", [this.fullPath]);
+};
+
+/** @constructor */
+var LocalFileSystem = function() {
+};
+
+// File error codes
+LocalFileSystem.TEMPORARY = 0;
+LocalFileSystem.PERSISTENT = 1;
+LocalFileSystem.RESOURCE = 2;
+LocalFileSystem.APPLICATION = 3;
+
+/**
+ * Requests a filesystem in which to store application data.
+ *
+ * @param {int} type of file system being requested
+ * @param {Function} successCallback is called with the new FileSystem
+ * @param {Function} errorCallback is called with a FileError
+ */
+LocalFileSystem.prototype.requestFileSystem = function(type, size, successCallback, errorCallback) {
+    if (type < 0 || type > 3) {
+        if (typeof errorCallback === "function") {
+            errorCallback({
+                "code": FileError.SYNTAX_ERR
+            });
+        }
+    }
+    else {
+        PhoneGap.exec(successCallback, errorCallback, "File", "requestFileSystem", [type, size]);
+    }
+};
+
+/**
+ *
+ * @param {DOMString} uri referring to a local file in a filesystem
+ * @param {Function} successCallback is called with the new entry
+ * @param {Function} errorCallback is called with a FileError
+ */
+LocalFileSystem.prototype.resolveLocalFileSystemURI = function(uri, successCallback, errorCallback) {
+    PhoneGap.exec(successCallback, errorCallback, "File", "resolveLocalFileSystemURI", [uri]);
+};
+
+/**
+* This function returns and array of contacts.  It is required as we need to convert raw
+* JSON objects into concrete Contact objects.  Currently this method is called after
+* navigator.service.contacts.find but before the find methods success call back.
+*
+* @param a JSON Objects that need to be converted to DirectoryEntry or FileEntry objects.
+* @returns an entry
+*/
+LocalFileSystem.prototype._castFS = function(pluginResult) {
+    var entry = null;
+    entry = new DirectoryEntry();
+    entry.isDirectory = pluginResult.message.root.isDirectory;
+    entry.isFile = pluginResult.message.root.isFile;
+    entry.name = pluginResult.message.root.name;
+    entry.fullPath = pluginResult.message.root.fullPath;
+    pluginResult.message.root = entry;
+    return pluginResult;
+};
+
+LocalFileSystem.prototype._castEntry = function(pluginResult) {
+    var entry = null;
+    if (pluginResult.message.isDirectory) {
+        entry = new DirectoryEntry();
+    }
+    else if (pluginResult.message.isFile) {
+        entry = new FileEntry();
+    }
+    entry.isDirectory = pluginResult.message.isDirectory;
+    entry.isFile = pluginResult.message.isFile;
+    entry.name = pluginResult.message.name;
+    entry.fullPath = pluginResult.message.fullPath;
+    pluginResult.message = entry;
+    return pluginResult;
+};
+
+LocalFileSystem.prototype._castEntries = function(pluginResult) {
+    var entries = pluginResult.message;
+    var retVal = [];
+    for (var i=0; i<entries.length; i++) {
+        retVal.push(window.localFileSystem._createEntry(entries[i]));
+    }
+    pluginResult.message = retVal;
+    return pluginResult;
+};
+
+LocalFileSystem.prototype._createEntry = function(castMe) {
+    var entry = null;
+    if (castMe.isDirectory) {
+        entry = new DirectoryEntry();
+    }
+    else if (castMe.isFile) {
+        entry = new FileEntry();
+    }
+    entry.isDirectory = castMe.isDirectory;
+    entry.isFile = castMe.isFile;
+    entry.name = castMe.name;
+    entry.fullPath = castMe.fullPath;
+    return entry;
+};
+
+LocalFileSystem.prototype._castDate = function(pluginResult) {
+    if (pluginResult.message.modificationTime) {
+        var modTime = new Date(pluginResult.message.modificationTime);
+        pluginResult.message.modificationTime = modTime;
+    }
+    else if (pluginResult.message.lastModifiedDate) {
+        var file = new File();
+        file.size = pluginResult.message.size;
+        file.type = pluginResult.message.type;
+        file.name = pluginResult.message.name;
+        file.fullPath = pluginResult.message.fullPath;
+        file.lastModifiedDate = new Date(pluginResult.message.lastModifiedDate);
+        pluginResult.message = file;
+    }
+    return pluginResult;
+};
+
+/**
+ * Add the FileSystem interface into the browser.
+ */
+PhoneGap.addConstructor(function() {
+    var pgLocalFileSystem = new LocalFileSystem();
+    // Needed for cast methods
+    if (typeof window.localFileSystem === "undefined") {
+        window.localFileSystem = pgLocalFileSystem;
+    }
+    if (typeof window.requestFileSystem === "undefined") {
+        window.requestFileSystem = pgLocalFileSystem.requestFileSystem;
+    }
+    if (typeof window.resolveLocalFileSystemURI === "undefined") {
+        window.resolveLocalFileSystemURI = pgLocalFileSystem.resolveLocalFileSystemURI;
+    }
+});
+}/*
+ *     Licensed to the Apache Software Foundation (ASF) under one
+ *     or more contributor license agreements.  See the NOTICE file
+ *     distributed with this work for additional information
+ *     regarding copyright ownership.  The ASF licenses this file
+ *     to you 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.
+ */
+
+if (!PhoneGap.hasResource("filetransfer")) {
+PhoneGap.addResource("filetransfer");
+
+/**
+ * FileTransfer uploads a file to a remote server.
+ * @constructor
+ */
+var FileTransfer = function() {};
+
+/**
+ * FileUploadResult
+ * @constructor
+ */
+var FileUploadResult = function() {
+    this.bytesSent = 0;
+    this.responseCode = null;
+    this.response = null;
+};
+
+/**
+ * FileTransferError
+ * @constructor
+ */
+var FileTransferError = function() {
+    this.code = null;
+};
+
+FileTransferError.FILE_NOT_FOUND_ERR = 1;
+FileTransferError.INVALID_URL_ERR = 2;
+FileTransferError.CONNECTION_ERR = 3;
+
+/**
+* Given an absolute file path, uploads a file on the device to a remote server
+* using a multipart HTTP request.
+* @param filePath {String}           Full path of the file on the device
+* @param server {String}             URL of the server to receive the file
+* @param successCallback (Function}  Callback to be invoked when upload has completed
+* @param errorCallback {Function}    Callback to be invoked upon error
+* @param options {FileUploadOptions} Optional parameters such as file name and mimetype
+*/
+FileTransfer.prototype.upload = function(filePath, server, successCallback, errorCallback, options, debug) {
+
+    // check for options
+    var fileKey = null;
+    var fileName = null;
+    var mimeType = null;
+    var params = null;
+    var chunkedMode = true;
+    if (options) {
+        fileKey = options.fileKey;
+        fileName = options.fileName;
+        mimeType = options.mimeType;
+        if (options.chunkedMode !== null || typeof options.chunkedMode !== "undefined") {
+            chunkedMode = options.chunkedMode;
+        }
+        if (options.params) {
+            params = options.params;
+        }
+        else {
+            params = {};
+        }
+    }
+
+    PhoneGap.exec(successCallback, errorCallback, 'FileTransfer', 'upload', [filePath, server, fileKey, fileName, mimeType, params, debug, chunkedMode]);
+};
+
+/**
+ * Downloads a file form a given URL and saves it to the specified directory.
+ * @param source {String}          URL of the server to receive the file
+ * @param target {String}         Full path of the file on the device
+ * @param successCallback (Function}  Callback to be invoked when upload has completed
+ * @param errorCallback {Function}    Callback to be invoked upon error
+ */
+FileTransfer.prototype.download = function(source, target, successCallback, errorCallback) {
+    PhoneGap.exec(successCallback, errorCallback, 'FileTransfer', 'download', [source, target]);
+};
+
+/**
+ * Options to customize the HTTP request used to upload files.
+ * @constructor
+ * @param fileKey {String}   Name of file request parameter.
+ * @param fileName {String}  Filename to be used by the server. Defaults to image.jpg.
+ * @param mimeType {String}  Mimetype of the uploaded file. Defaults to image/jpeg.
+ * @param params {Object}    Object with key: value params to send to the server.
+ */
+var FileUploadOptions = function(fileKey, fileName, mimeType, params) {
+    this.fileKey = fileKey || null;
+    this.fileName = fileName || null;
+    this.mimeType = mimeType || null;
+    this.params = params || null;
+};
+}
+/*
+ *     Licensed to the Apache Software Foundation (ASF) under one
+ *     or more contributor license agreements.  See the NOTICE file
+ *     distributed with this work for additional information
+ *     regarding copyright ownership.  The ASF licenses this file
+ *     to you 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.
+ */
+
+if (!PhoneGap.hasResource("geolocation")) {
+PhoneGap.addResource("geolocation");
+
+/**
+ * This class provides access to device GPS data.
+ * @constructor
+ */
+var Geolocation = function() {
+
+    // The last known GPS position.
+    this.lastPosition = null;
+
+    // Geolocation listeners
+    this.listeners = {};
+};
+
+/**
+ * Position error object
+ *
+ * @constructor
+ * @param code
+ * @param message
+ */
+var PositionError = function(code, message) {
+    this.code = code;
+    this.message = message;
+};
+
+PositionError.PERMISSION_DENIED = 1;
+PositionError.POSITION_UNAVAILABLE = 2;
+PositionError.TIMEOUT = 3;
+
+/**
+ * Asynchronously aquires the current position.
+ *
+ * @param {Function} successCallback    The function to call when the position data is available
+ * @param {Function} errorCallback      The function to call when there is an error getting the heading position. (OPTIONAL)
+ * @param {PositionOptions} options     The options for getting the position data. (OPTIONAL)
+ */
+Geolocation.prototype.getCurrentPosition = function(successCallback, errorCallback, options) {
+    if (navigator._geo.listeners.global) {
+        console.log("Geolocation Error: Still waiting for previous getCurrentPosition() request.");
+        try {
+            errorCallback(new PositionError(PositionError.TIMEOUT, "Geolocation Error: Still waiting for previous getCurrentPosition() request."));
+        } catch (e) {
+        }
+        return;
+    }
+    var maximumAge = 10000;
+    var enableHighAccuracy = false;
+    var timeout = 10000;
+    if (typeof options !== "undefined") {
+        if (typeof options.maximumAge !== "undefined") {
+            maximumAge = options.maximumAge;
+        }
+        if (typeof options.enableHighAccuracy !== "undefined") {
+            enableHighAccuracy = options.enableHighAccuracy;
+        }
+        if (typeof options.timeout !== "undefined") {
+            timeout = options.timeout;
+        }
+    }
+    navigator._geo.listeners.global = {"success" : successCallback, "fail" : errorCallback };
+    PhoneGap.exec(null, null, "Geolocation", "getCurrentLocation", [enableHighAccuracy, timeout, maximumAge]);
+};
+
+/**
+ * Asynchronously watches the geolocation for changes to geolocation.  When a change occurs,
+ * the successCallback is called with the new location.
+ *
+ * @param {Function} successCallback    The function to call each time the location data is available
+ * @param {Function} errorCallback      The function to call when there is an error getting the location data. (OPTIONAL)
+ * @param {PositionOptions} options     The options for getting the location data such as frequency. (OPTIONAL)
+ * @return String                       The watch id that must be passed to #clearWatch to stop watching.
+ */
+Geolocation.prototype.watchPosition = function(successCallback, errorCallback, options) {
+    var maximumAge = 10000;
+    var enableHighAccuracy = false;
+    var timeout = 10000;
+    if (typeof options !== "undefined") {
+        if (typeof options.frequency  !== "undefined") {
+            maximumAge = options.frequency;
+        }
+        if (typeof options.maximumAge !== "undefined") {
+            maximumAge = options.maximumAge;
+        }
+        if (typeof options.enableHighAccuracy !== "undefined") {
+            enableHighAccuracy = options.enableHighAccuracy;
+        }
+        if (typeof options.timeout !== "undefined") {
+            timeout = options.timeout;
+        }
+    }
+    var id = PhoneGap.createUUID();
+    navigator._geo.listeners[id] = {"success" : successCallback, "fail" : errorCallback };
+    PhoneGap.exec(null, null, "Geolocation", "start", [id, enableHighAccuracy, timeout, maximumAge]);
+    return id;
+};
+
+/*
+ * Native callback when watch position has a new position.
+ * PRIVATE METHOD
+ *
+ * @param {String} id
+ * @param {Number} lat
+ * @param {Number} lng
+ * @param {Number} alt
+ * @param {Number} altacc
+ * @param {Number} head
+ * @param {Number} vel
+ * @param {Number} stamp
+ */
+Geolocation.prototype.success = function(id, lat, lng, alt, altacc, head, vel, stamp) {
+    var coords = new Coordinates(lat, lng, alt, altacc, head, vel);
+    var loc = new Position(coords, stamp);
+    try {
+        if (lat === "undefined" || lng === "undefined") {
+            navigator._geo.listeners[id].fail(new PositionError(PositionError.POSITION_UNAVAILABLE, "Lat/Lng are undefined."));
+        }
+        else {
+            navigator._geo.lastPosition = loc;
+            navigator._geo.listeners[id].success(loc);
+        }
+    }
+    catch (e) {
+        console.log("Geolocation Error: Error calling success callback function.");
+    }
+
+    if (id === "global") {
+        delete navigator._geo.listeners.global;
+    }
+};
+
+/**
+ * Native callback when watch position has an error.
+ * PRIVATE METHOD
+ *
+ * @param {String} id       The ID of the watch
+ * @param {Number} code     The error code
+ * @param {String} msg      The error message
+ */
+Geolocation.prototype.fail = function(id, code, msg) {
+    try {
+        navigator._geo.listeners[id].fail(new PositionError(code, msg));
+    }
+    catch (e) {
+        console.log("Geolocation Error: Error calling error callback function.");
+    }
+};
+
+/**
+ * Clears the specified heading watch.
+ *
+ * @param {String} id       The ID of the watch returned from #watchPosition
+ */
+Geolocation.prototype.clearWatch = function(id) {
+    PhoneGap.exec(null, null, "Geolocation", "stop", [id]);
+    delete navigator._geo.listeners[id];
+};
+
+/**
+ * Force the PhoneGap geolocation to be used instead of built-in.
+ */
+Geolocation.usingPhoneGap = false;
+Geolocation.usePhoneGap = function() {
+    if (Geolocation.usingPhoneGap) {
+        return;
+    }
+    Geolocation.usingPhoneGap = true;
+
+    // Set built-in geolocation methods to our own implementations
+    // (Cannot replace entire geolocation, but can replace individual methods)
+    navigator.geolocation.setLocation = navigator._geo.setLocation;
+    navigator.geolocation.getCurrentPosition = navigator._geo.getCurrentPosition;
+    navigator.geolocation.watchPosition = navigator._geo.watchPosition;
+    navigator.geolocation.clearWatch = navigator._geo.clearWatch;
+    navigator.geolocation.start = navigator._geo.start;
+    navigator.geolocation.stop = navigator._geo.stop;
+};
+
+PhoneGap.addConstructor(function() {
+    navigator._geo = new Geolocation();
+
+    // No native geolocation object for Android 1.x, so use PhoneGap geolocation
+    if (typeof navigator.geolocation === 'undefined') {
+        navigator.geolocation = navigator._geo;
+        Geolocation.usingPhoneGap = true;
+    }
+});
+}
+/*
+ *     Licensed to the Apache Software Foundation (ASF) under one
+ *     or more contributor license agreements.  See the NOTICE file
+ *     distributed with this work for additional information
+ *     regarding copyright ownership.  The ASF licenses this file
+ *     to you 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.
+ */
+
+if (!PhoneGap.hasResource("media")) {
+PhoneGap.addResource("media");
+
+/**
+ * This class provides access to the device media, interfaces to both sound and video
+ *
+ * @constructor
+ * @param src                   The file name or url to play
+ * @param successCallback       The callback to be called when the file is done playing or recording.
+ *                                  successCallback() - OPTIONAL
+ * @param errorCallback         The callback to be called if there is an error.
+ *                                  errorCallback(int errorCode) - OPTIONAL
+ * @param statusCallback        The callback to be called when media status has changed.
+ *                                  statusCallback(int statusCode) - OPTIONAL
+ * @param positionCallback      The callback to be called when media position has changed.
+ *                                  positionCallback(long position) - OPTIONAL
+ */
+var Media = function(src, successCallback, errorCallback, statusCallback, positionCallback) {
+
+    // successCallback optional
+    if (successCallback && (typeof successCallback !== "function")) {
+        console.log("Media Error: successCallback is not a function");
+        return;
+    }
+
+    // errorCallback optional
+    if (errorCallback && (typeof errorCallback !== "function")) {
+        console.log("Media Error: errorCallback is not a function");
+        return;
+    }
+
+    // statusCallback optional
+    if (statusCallback && (typeof statusCallback !== "function")) {
+        console.log("Media Error: statusCallback is not a function");
+        return;
+    }
+
+    // statusCallback optional
+    if (positionCallback && (typeof positionCallback !== "function")) {
+        console.log("Media Error: positionCallback is not a function");
+        return;
+    }
+
+    this.id = PhoneGap.createUUID();
+    PhoneGap.mediaObjects[this.id] = this;
+    this.src = src;
+    this.successCallback = successCallback;
+    this.errorCallback = errorCallback;
+    this.statusCallback = statusCallback;
+    this.positionCallback = positionCallback;
+    this._duration = -1;
+    this._position = -1;
+};
+
+// Media messages
+Media.MEDIA_STATE = 1;
+Media.MEDIA_DURATION = 2;
+Media.MEDIA_POSITION = 3;
+Media.MEDIA_ERROR = 9;
+
+// Media states
+Media.MEDIA_NONE = 0;
+Media.MEDIA_STARTING = 1;
+Media.MEDIA_RUNNING = 2;
+Media.MEDIA_PAUSED = 3;
+Media.MEDIA_STOPPED = 4;
+Media.MEDIA_MSG = ["None", "Starting", "Running", "Paused", "Stopped"];
+
+// TODO: Will MediaError be used?
+/**
+ * This class contains information about any Media errors.
+ * @constructor
+ */
+var MediaError = function() {
+    this.code = null;
+    this.message = "";
+};
+
+MediaError.MEDIA_ERR_NONE_ACTIVE    = 0;
+MediaError.MEDIA_ERR_ABORTED        = 1;
+MediaError.MEDIA_ERR_NETWORK        = 2;
+MediaError.MEDIA_ERR_DECODE         = 3;
+MediaError.MEDIA_ERR_NONE_SUPPORTED = 4;
+
+/**
+ * Start or resume playing audio file.
+ */
+Media.prototype.play = function() {
+    PhoneGap.exec(null, null, "Media", "startPlayingAudio", [this.id, this.src]);
+};
+
+/**
+ * Stop playing audio file.
+ */
+Media.prototype.stop = function() {
+    return PhoneGap.exec(null, null, "Media", "stopPlayingAudio", [this.id]);
+};
+
+/**
+ * Seek or jump to a new time in the track..
+ */
+Media.prototype.seekTo = function(milliseconds) {
+    PhoneGap.exec(null, null, "Media", "seekToAudio", [this.id, milliseconds]);
+};
+
+/**
+ * Pause playing audio file.
+ */
+Media.prototype.pause = function() {
+    PhoneGap.exec(null, null, "Media", "pausePlayingAudio", [this.id]);
+};
+
+/**
+ * Get duration of an audio file.
+ * The duration is only set for audio that is playing, paused or stopped.
+ *
+ * @return      duration or -1 if not known.
+ */
+Media.prototype.getDuration = function() {
+    return this._duration;
+};
+
+/**
+ * Get position of audio.
+ */
+Media.prototype.getCurrentPosition = function(success, fail) {
+    PhoneGap.exec(success, fail, "Media", "getCurrentPositionAudio", [this.id]);
+};
+
+/**
+ * Start recording audio file.
+ */
+Media.prototype.startRecord = function() {
+    PhoneGap.exec(null, null, "Media", "startRecordingAudio", [this.id, this.src]);
+};
+
+/**
+ * Stop recording audio file.
+ */
+Media.prototype.stopRecord = function() {
+    PhoneGap.exec(null, null, "Media", "stopRecordingAudio", [this.id]);
+};
+
+/**
+ * Release the resources.
+ */
+Media.prototype.release = function() {
+    PhoneGap.exec(null, null, "Media", "release", [this.id]);
+};
+
+/**
+ * Adjust the volume.
+ */
+Media.prototype.setVolume = function(volume) {
+    PhoneGap.exec(null, null, "Media", "setVolume", [this.id, volume]);
+};
+
+/**
+ * List of media objects.
+ * PRIVATE
+ */
+PhoneGap.mediaObjects = {};
+
+/**
+ * Object that receives native callbacks.
+ * PRIVATE
+ * @constructor
+ */
+PhoneGap.Media = function() {};
+
+/**
+ * Get the media object.
+ * PRIVATE
+ *
+ * @param id            The media object id (string)
+ */
+PhoneGap.Media.getMediaObject = function(id) {
+    return PhoneGap.mediaObjects[id];
+};
+
+/**
+ * Audio has status update.
+ * PRIVATE
+ *
+ * @param id            The media object id (string)
+ * @param status        The status code (int)
+ * @param msg           The status message (string)
+ */
+PhoneGap.Media.onStatus = function(id, msg, value) {
+    var media = PhoneGap.mediaObjects[id];
+    // If state update
+    if (msg === Media.MEDIA_STATE) {
+        if (value === Media.MEDIA_STOPPED) {
+            if (media.successCallback) {
+                media.successCallback();
+            }
+        }
+        if (media.statusCallback) {
+            media.statusCallback(value);
+        }
+    }
+    else if (msg === Media.MEDIA_DURATION) {
+        media._duration = value;
+    }
+    else if (msg === Media.MEDIA_ERROR) {
+        if (media.errorCallback) {
+            media.errorCallback({"code":value});
+        }
+    }
+    else if (msg === Media.MEDIA_POSITION) {
+        media._position = value;
+    }
+};
+}
+/*
+ *     Licensed to the Apache Software Foundation (ASF) under one
+ *     or more contributor license agreements.  See the NOTICE file
+ *     distributed with this work for additional information
+ *     regarding copyright ownership.  The ASF licenses this file
+ *     to you 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.
+ */
+
+
+if (!PhoneGap.hasResource("network")) {
+PhoneGap.addResource("network");
+
+/**
+ * This class contains information about the current network Connection.
+ * @constructor
+ */
+var Connection = function() {
+    this.type = null;
+    this._firstRun = true;
+    this._timer = null;
+    this.timeout = 500;
+
+    var me = this;
+    this.getInfo(
+        function(type) {
+            // Need to send events if we are on or offline
+            if (type === "none") {
+                // set a timer if still offline at the end of timer send the offline event
+                me._timer = setTimeout(function(){
+                    me.type = type;
+                    PhoneGap.fireDocumentEvent('offline');
+                    me._timer = null;
+                    }, me.timeout);
+            } else {
+                // If there is a current offline event pending clear it
+                if (me._timer !== null) {
+                    clearTimeout(me._timer);
+                    me._timer = null;
+                }
+                me.type = type;
+                PhoneGap.fireDocumentEvent('online');
+            }
+            
+            // should only fire this once
+            if (me._firstRun) {
+                me._firstRun = false;
+                PhoneGap.onPhoneGapConnectionReady.fire();
+            }            
+        },
+        function(e) {
+            // If we can't get the network info we should still tell PhoneGap
+            // to fire the deviceready event.
+            if (me._firstRun) {
+                me._firstRun = false;
+                PhoneGap.onPhoneGapConnectionReady.fire();
+            }            
+            console.log("Error initializing Network Connection: " + e);
+        });
+};
+
+Connection.UNKNOWN = "unknown";
+Connection.ETHERNET = "ethernet";
+Connection.WIFI = "wifi";
+Connection.CELL_2G = "2g";
+Connection.CELL_3G = "3g";
+Connection.CELL_4G = "4g";
+Connection.NONE = "none";
+
+/**
+ * Get connection info
+ *
+ * @param {Function} successCallback The function to call when the Connection data is available
+ * @param {Function} errorCallback The function to call when there is an error getting the Connection data. (OPTIONAL)
+ */
+Connection.prototype.getInfo = function(successCallback, errorCallback) {
+    // Get info
+    PhoneGap.exec(successCallback, errorCallback, "Network Status", "getConnectionInfo", []);
+};
+
+
+PhoneGap.addConstructor(function() {
+    if (typeof navigator.network === "undefined") {
+        navigator.network = {};
+    }
+    if (typeof navigator.network.connection === "undefined") {
+        navigator.network.connection = new Connection();
+    }
+});
+}
+/*
+ *     Licensed to the Apache Software Foundation (ASF) under one
+ *     or more contributor license agreements.  See the NOTICE file
+ *     distributed with this work for additional information
+ *     regarding copyright ownership.  The ASF licenses this file
+ *     to you 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.
+ */
+
+if (!PhoneGap.hasResource("notification")) {
+PhoneGap.addResource("notification");
+
+/**
+ * This class provides access to notifications on the device.
+ * @constructor
+ */
+var Notification = function() {
+};
+
+/**
+ * Open a native alert dialog, with a customizable title and button text.
+ *
+ * @param {String} message              Message to print in the body of the alert
+ * @param {Function} completeCallback   The callback that is called when user clicks on a button.
+ * @param {String} title                Title of the alert dialog (default: Alert)
+ * @param {String} buttonLabel          Label of the close button (default: OK)
+ */
+Notification.prototype.alert = function(message, completeCallback, title, buttonLabel) {
+    var _title = (title || "Alert");
+    var _buttonLabel = (buttonLabel || "OK");
+    PhoneGap.exec(completeCallback, null, "Notification", "alert", [message,_title,_buttonLabel]);
+};
+
+/**
+ * Open a native confirm dialog, with a customizable title and button text.
+ * The result that the user selects is returned to the result callback.
+ *
+ * @param {String} message              Message to print in the body of the alert
+ * @param {Function} resultCallback     The callback that is called when user clicks on a button.
+ * @param {String} title                Title of the alert dialog (default: Confirm)
+ * @param {String} buttonLabels         Comma separated list of the labels of the buttons (default: 'OK,Cancel')
+ */
+Notification.prototype.confirm = function(message, resultCallback, title, buttonLabels) {
+    var _title = (title || "Confirm");
+    var _buttonLabels = (buttonLabels || "OK,Cancel");
+    PhoneGap.exec(resultCallback, null, "Notification", "confirm", [message,_title,_buttonLabels]);
+};
+
+/**
+ * Start spinning the activity indicator on the statusbar
+ */
+Notification.prototype.activityStart = function() {
+    PhoneGap.exec(null, null, "Notification", "activityStart", ["Busy","Please wait..."]);
+};
+
+/**
+ * Stop spinning the activity indicator on the statusbar, if it's currently spinning
+ */
+Notification.prototype.activityStop = function() {
+    PhoneGap.exec(null, null, "Notification", "activityStop", []);
+};
+
+/**
+ * Display a progress dialog with progress bar that goes from 0 to 100.
+ *
+ * @param {String} title        Title of the progress dialog.
+ * @param {String} message      Message to display in the dialog.
+ */
+Notification.prototype.progressStart = function(title, message) {
+    PhoneGap.exec(null, null, "Notification", "progressStart", [title, message]);
+};
+
+/**
+ * Set the progress dialog value.
+ *
+ * @param {Number} value         0-100
+ */
+Notification.prototype.progressValue = function(value) {
+    PhoneGap.exec(null, null, "Notification", "progressValue", [value]);
+};
+
+/**
+ * Close the progress dialog.
+ */
+Notification.prototype.progressStop = function() {
+    PhoneGap.exec(null, null, "Notification", "progressStop", []);
+};
+
+/**
+ * Causes the device to blink a status LED.
+ *
+ * @param {Integer} count       The number of blinks.
+ * @param {String} colour       The colour of the light.
+ */
+Notification.prototype.blink = function(count, colour) {
+    // NOT IMPLEMENTED
+};
+
+/**
+ * Causes the device to vibrate.
+ *
+ * @param {Integer} mills       The number of milliseconds to vibrate for.
+ */
+Notification.prototype.vibrate = function(mills) {
+    PhoneGap.exec(null, null, "Notification", "vibrate", [mills]);
+};
+
+/**
+ * Causes the device to beep.
+ * On Android, the default notification ringtone is played "count" times.
+ *
+ * @param {Integer} count       The number of beeps.
+ */
+Notification.prototype.beep = function(count) {
+    PhoneGap.exec(null, null, "Notification", "beep", [count]);
+};
+
+PhoneGap.addConstructor(function() {
+    if (typeof navigator.notification === "undefined") {
+        navigator.notification = new Notification();
+    }
+});
+}
+/*
+ *     Licensed to the Apache Software Foundation (ASF) under one
+ *     or more contributor license agreements.  See the NOTICE file
+ *     distributed with this work for additional information
+ *     regarding copyright ownership.  The ASF licenses this file
+ *     to you 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.
+ */
+
+if (!PhoneGap.hasResource("position")) {
+PhoneGap.addResource("position");
+
+/**
+ * This class contains position information.
+ * @param {Object} lat
+ * @param {Object} lng
+ * @param {Object} acc
+ * @param {Object} alt
+ * @param {Object} altacc
+ * @param {Object} head
+ * @param {Object} vel
+ * @constructor
+ */
+var Position = function(coords, timestamp) {
+	this.coords = coords;
+	this.timestamp = (timestamp !== 'undefined') ? timestamp : new Date().getTime();
+};
+
+/** @constructor */
+var Coordinates = function(lat, lng, alt, acc, head, vel, altacc) {
+	/**
+	 * The latitude of the position.
+	 */
+	this.latitude = lat;
+	/**
+	 * The longitude of the position,
+	 */
+	this.longitude = lng;
+	/**
+	 * The accuracy of the position.
+	 */
+	this.accuracy = acc;
+	/**
+	 * The altitude of the position.
+	 */
+	this.altitude = alt;
+	/**
+	 * The direction the device is moving at the position.
+	 */
+	this.heading = head;
+	/**
+	 * The velocity with which the device is moving at the position.
+	 */
+	this.speed = vel;
+	/**
+	 * The altitude accuracy of the position.
+	 */
+	this.altitudeAccuracy = (altacc !== 'undefined') ? altacc : null;
+};
+
+/**
+ * This class specifies the options for requesting position data.
+ * @constructor
+ */
+var PositionOptions = function() {
+	/**
+	 * Specifies the desired position accuracy.
+	 */
+	this.enableHighAccuracy = true;
+	/**
+	 * The timeout after which if position data cannot be obtained the errorCallback
+	 * is called.
+	 */
+	this.timeout = 10000;
+};
+
+/**
+ * This class contains information about any GSP errors.
+ * @constructor
+ */
+var PositionError = function() {
+	this.code = null;
+	this.message = "";
+};
+
+PositionError.UNKNOWN_ERROR = 0;
+PositionError.PERMISSION_DENIED = 1;
+PositionError.POSITION_UNAVAILABLE = 2;
+PositionError.TIMEOUT = 3;
+}
+/*
+ *     Licensed to the Apache Software Foundation (ASF) under one
+ *     or more contributor license agreements.  See the NOTICE file
+ *     distributed with this work for additional information
+ *     regarding copyright ownership.  The ASF licenses this file
+ *     to you 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 is purely for the Android 1.5/1.6 HTML 5 Storage
+ * I was hoping that Android 2.0 would deprecate this, but given the fact that
+ * most manufacturers ship with Android 1.5 and do not do OTA Updates, this is required
+ */
+
+if (!PhoneGap.hasResource("storage")) {
+PhoneGap.addResource("storage");
+
+/**
+ * SQL result set object
+ * PRIVATE METHOD
+ * @constructor
+ */
+var DroidDB_Rows = function() {
+    this.resultSet = [];    // results array
+    this.length = 0;        // number of rows
+};
+
+/**
+ * Get item from SQL result set
+ *
+ * @param row           The row number to return
+ * @return              The row object
+ */
+DroidDB_Rows.prototype.item = function(row) {
+    return this.resultSet[row];
+};
+
+/**
+ * SQL result set that is returned to user.
+ * PRIVATE METHOD
+ * @constructor
+ */
+var DroidDB_Result = function() {
+    this.rows = new DroidDB_Rows();
+};
+
+/**
+ * Storage object that is called by native code when performing queries.
+ * PRIVATE METHOD
+ * @constructor
+ */
+var DroidDB = function() {
+    this.queryQueue = {};
+};
+
+/**
+ * Callback from native code when query is complete.
+ * PRIVATE METHOD
+ *
+ * @param id                Query id
+ */
+DroidDB.prototype.completeQuery = function(id, data) {
+    var query = this.queryQueue[id];
+    if (query) {
+        try {
+            delete this.queryQueue[id];
+
+            // Get transaction
+            var tx = query.tx;
+
+            // If transaction hasn't failed
+            // Note: We ignore all query results if previous query
+            //       in the same transaction failed.
+            if (tx && tx.queryList[id]) {
+
+                // Save query results
+                var r = new DroidDB_Result();
+                r.rows.resultSet = data;
+                r.rows.length = data.length;
+                try {
+                    if (typeof query.successCallback === 'function') {
+                        query.successCallback(query.tx, r);
+                    }
+                } catch (ex) {
+                    console.log("executeSql error calling user success callback: "+ex);
+                }
+
+                tx.queryComplete(id);
+            }
+        } catch (e) {
+            console.log("executeSql error: "+e);
+        }
+    }
+};
+
+/**
+ * Callback from native code when query fails
+ * PRIVATE METHOD
+ *
+ * @param reason            Error message
+ * @param id                Query id
+ */
+DroidDB.prototype.fail = function(reason, id) {
+    var query = this.queryQueue[id];
+    if (query) {
+        try {
+            delete this.queryQueue[id];
+
+            // Get transaction
+            var tx = query.tx;
+
+            // If transaction hasn't failed
+            // Note: We ignore all query results if previous query
+            //       in the same transaction failed.
+            if (tx && tx.queryList[id]) {
+                tx.queryList = {};
+
+                try {
+                    if (typeof query.errorCallback === 'function') {
+                        query.errorCallback(query.tx, reason);
+                    }
+                } catch (ex) {
+                    console.log("executeSql error calling user error callback: "+ex);
+                }
+
+                tx.queryFailed(id, reason);
+            }
+
+        } catch (e) {
+            console.log("executeSql error: "+e);
+        }
+    }
+};
+
+/**
+ * SQL query object
+ * PRIVATE METHOD
+ *
+ * @constructor
+ * @param tx                The transaction object that this query belongs to
+ */
+var DroidDB_Query = function(tx) {
+
+    // Set the id of the query
+    this.id = PhoneGap.createUUID();
+
+    // Add this query to the queue
+    droiddb.queryQueue[this.id] = this;
+
+    // Init result
+    this.resultSet = [];
+
+    // Set transaction that this query belongs to
+    this.tx = tx;
+
+    // Add this query to transaction list
+    this.tx.queryList[this.id] = this;
+
+    // Callbacks
+    this.successCallback = null;
+    this.errorCallback = null;
+
+};
+
+/**
+ * Transaction object
+ * PRIVATE METHOD
+ * @constructor
+ */
+var DroidDB_Tx = function() {
+
+    // Set the id of the transaction
+    this.id = PhoneGap.createUUID();
+
+    // Callbacks
+    this.successCallback = null;
+    this.errorCallback = null;
+
+    // Query list
+    this.queryList = {};
+};
+
+/**
+ * Mark query in transaction as complete.
+ * If all queries are complete, call the user's transaction success callback.
+ *
+ * @param id                Query id
+ */
+DroidDB_Tx.prototype.queryComplete = function(id) {
+    delete this.queryList[id];
+
+    // If no more outstanding queries, then fire transaction success
+    if (this.successCallback) {
+        var count = 0;
+        var i;
+        for (i in this.queryList) {
+            if (this.queryList.hasOwnProperty(i)) {
+                count++;
+            }
+        }
+        if (count === 0) {
+            try {
+                this.successCallback();
+            } catch(e) {
+                console.log("Transaction error calling user success callback: " + e);
+            }
+        }
+    }
+};
+
+/**
+ * Mark query in transaction as failed.
+ *
+ * @param id                Query id
+ * @param reason            Error message
+ */
+DroidDB_Tx.prototype.queryFailed = function(id, reason) {
+
+    // The sql queries in this transaction have already been run, since
+    // we really don't have a real transaction implemented in native code.
+    // However, the user callbacks for the remaining sql queries in transaction
+    // will not be called.
+    this.queryList = {};
+
+    if (this.errorCallback) {
+        try {
+            this.errorCallback(reason);
+        } catch(e) {
+            console.log("Transaction error calling user error callback: " + e);
+        }
+    }
+};
+
+/**
+ * Execute SQL statement
+ *
+ * @param sql                   SQL statement to execute
+ * @param params                Statement parameters
+ * @param successCallback       Success callback
+ * @param errorCallback         Error callback
+ */
+DroidDB_Tx.prototype.executeSql = function(sql, params, successCallback, errorCallback) {
+
+    // Init params array
+    if (typeof params === 'undefined') {
+        params = [];
+    }
+
+    // Create query and add to queue
+    var query = new DroidDB_Query(this);
+    droiddb.queryQueue[query.id] = query;
+
+    // Save callbacks
+    query.successCallback = successCallback;
+    query.errorCallback = errorCallback;
+
+    // Call native code
+    PhoneGap.exec(null, null, "Storage", "executeSql", [sql, params, query.id]);
+};
+
+var DatabaseShell = function() {
+};
+
+/**
+ * Start a transaction.
+ * Does not support rollback in event of failure.
+ *
+ * @param process {Function}            The transaction function
+ * @param successCallback {Function}
+ * @param errorCallback {Function}
+ */
+DatabaseShell.prototype.transaction = function(process, errorCallback, successCallback) {
+    var tx = new DroidDB_Tx();
+    tx.successCallback = successCallback;
+    tx.errorCallback = errorCallback;
+    try {
+        process(tx);
+    } catch (e) {
+        console.log("Transaction error: "+e);
+        if (tx.errorCallback) {
+            try {
+                tx.errorCallback(e);
+            } catch (ex) {
+                console.log("Transaction error calling user error callback: "+e);
+            }
+        }
+    }
+};
+
+/**
+ * Open database
+ *
+ * @param name              Database name
+ * @param version           Database version
+ * @param display_name      Database display name
+ * @param size              Database size in bytes
+ * @return                  Database object
+ */
+var DroidDB_openDatabase = function(name, version, display_name, size) {
+    PhoneGap.exec(null, null, "Storage", "openDatabase", [name, version, display_name, size]);
+    var db = new DatabaseShell();
+    return db;
+};
+
+/**
+ * For browsers with no localStorage we emulate it with SQLite. Follows the w3c api.
+ * TODO: Do similar for sessionStorage.
+ */
+
+/**
+ * @constructor
+ */
+var CupcakeLocalStorage = function() {
+    try {
+
+      this.db = openDatabase('localStorage', '1.0', 'localStorage', 2621440);
+      var storage = {};
+      this.length = 0;
+      function setLength (length) {
+        this.length = length;
+        localStorage.length = length;
+      }
+      this.db.transaction(
+        function (transaction) {
+            var i;
+          transaction.executeSql('CREATE TABLE IF NOT EXISTS storage (id NVARCHAR(40) PRIMARY KEY, body NVARCHAR(255))');
+          transaction.executeSql('SELECT * FROM storage', [], function(tx, result) {
+            for(var i = 0; i < result.rows.length; i++) {
+              storage[result.rows.item(i)['id']] =  result.rows.item(i)['body'];
+            }
+            setLength(result.rows.length);
+            PhoneGap.initializationComplete("cupcakeStorage");
+          });
+
+        },
+        function (err) {
+          alert(err.message);
+        }
+      );
+      this.setItem = function(key, val) {
+        if (typeof(storage[key])=='undefined') {
+          this.length++;
+        }
+        storage[key] = val;
+        this.db.transaction(
+          function (transaction) {
+            transaction.executeSql('CREATE TABLE IF NOT EXISTS storage (id NVARCHAR(40) PRIMARY KEY, body NVARCHAR(255))');
+            transaction.executeSql('REPLACE INTO storage (id, body) values(?,?)', [key,val]);
+          }
+        );
+      };
+      this.getItem = function(key) {
+        return storage[key];
+      };
+      this.removeItem = function(key) {
+        delete storage[key];
+        this.length--;
+        this.db.transaction(
+          function (transaction) {
+            transaction.executeSql('CREATE TABLE IF NOT EXISTS storage (id NVARCHAR(40) PRIMARY KEY, body NVARCHAR(255))');
+            transaction.executeSql('DELETE FROM storage where id=?', [key]);
+          }
+        );
+      };
+      this.clear = function() {
+        storage = {};
+        this.length = 0;
+        this.db.transaction(
+          function (transaction) {
+            transaction.executeSql('CREATE TABLE IF NOT EXISTS storage (id NVARCHAR(40) PRIMARY KEY, body NVARCHAR(255))');
+            transaction.executeSql('DELETE FROM storage', []);
+          }
+        );
+      };
+      this.key = function(index) {
+        var i = 0;
+        for (var j in storage) {
+          if (i==index) {
+            return j;
+          } else {
+            i++;
+          }
+        }
+        return null;
+      };
+
+    } catch(e) {
+      alert("Database error "+e+".");
+        return;
+    }
+};
+
+PhoneGap.addConstructor(function() {
+    var setupDroidDB = function() {
+        navigator.openDatabase = window.openDatabase = DroidDB_openDatabase;
+        window.droiddb = new DroidDB();
+    }
+    if (typeof window.openDatabase === "undefined") {
+        setupDroidDB();
+    } else {
+        window.openDatabase_orig = window.openDatabase;
+        window.openDatabase = function(name, version, desc, size){
+            // Some versions of Android will throw a SECURITY_ERR so we need 
+            // to catch the exception and seutp our own DB handling.
+            var db = null;
+            try {
+                db = window.openDatabase_orig(name, version, desc, size);
+            } 
+            catch (ex) {
+                db = null;
+            }
+
+            if (db == null) {
+                setupDroidDB();
+                return DroidDB_openDatabase(name, version, desc, size);
+            }
+            else {
+                return db;
+            }
+        };
+    }
+    
+    if ((typeof window.localStorage == "undefined") || (window.localStorage == null)) {
+        navigator.localStorage = window.localStorage = new CupcakeLocalStorage();
+        PhoneGap.waitForInitialization("cupcakeStorage");
+    }
+});
+}
diff --git a/apps/files_odfviewer/src/webodf/programs/android/assets/www/scripts.js b/apps/files_odfviewer/src/webodf/programs/android/assets/www/scripts.js
new file mode 100644
index 0000000000..dd3b76fb99
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/programs/android/assets/www/scripts.js
@@ -0,0 +1,4123 @@
+/*     PhoneGap v1.4.0 */
+/*
+       Licensed to the Apache Software Foundation (ASF) under one
+       or more contributor license agreements.  See the NOTICE file
+       distributed with this work for additional information
+       regarding copyright ownership.  The ASF licenses this file
+       to you 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.
+*/
+
+
+/*
+ * Some base contributions
+ * Copyright (c) 2011, Proyectos Equis Ka, S.L.
+ */
+
+if (typeof PhoneGap === "undefined") {
+
+if (typeof(DeviceInfo) !== 'object'){
+    DeviceInfo = {};
+}
+/**
+ * This represents the PhoneGap API itself, and provides a global namespace for accessing
+ * information about the state of PhoneGap.
+ * @class
+ */
+PhoneGap = {
+    // This queue holds the currently executing command and all pending
+    // commands executed with PhoneGap.exec().
+    commandQueue: [],
+    // Indicates if we're currently in the middle of flushing the command
+    // queue on the native side.
+    commandQueueFlushing: false,
+    _constructors: [],
+    documentEventHandler: {},   // Collection of custom document event handlers
+    windowEventHandler: {} 
+};
+
+/**
+ * List of resource files loaded by PhoneGap.
+ * This is used to ensure JS and other files are loaded only once.
+ */
+PhoneGap.resources = {base: true};
+
+/**
+ * Determine if resource has been loaded by PhoneGap
+ *
+ * @param name
+ * @return
+ */
+PhoneGap.hasResource = function(name) {
+    return PhoneGap.resources[name];
+};
+
+/**
+ * Add a resource to list of loaded resources by PhoneGap
+ *
+ * @param name
+ */
+PhoneGap.addResource = function(name) {
+    PhoneGap.resources[name] = true;
+};
+
+/**
+ * Boolean flag indicating if the PhoneGap API is available and initialized.
+ */ // TODO: Remove this, it is unused here ... -jm
+PhoneGap.available = DeviceInfo.uuid != undefined;
+
+/**
+ * Add an initialization function to a queue that ensures it will run and initialize
+ * application constructors only once PhoneGap has been initialized.
+ * @param {Function} func The function callback you want run once PhoneGap is initialized
+ */
+PhoneGap.addConstructor = function(func) {
+    var state = document.readyState;
+    if ( ( state == 'loaded' || state == 'complete' ) && DeviceInfo.uuid != null )
+    {
+        func();
+    }
+    else
+    {
+        PhoneGap._constructors.push(func);
+    }
+};
+
+(function() 
+ {
+    var timer = setInterval(function()
+    {
+                            
+        var state = document.readyState;
+                            
+        if ( ( state == 'loaded' || state == 'complete' ) && DeviceInfo.uuid != null )
+        {
+            clearInterval(timer); // stop looking
+            // run our constructors list
+            while (PhoneGap._constructors.length > 0) 
+            {
+                var constructor = PhoneGap._constructors.shift();
+                try 
+                {
+                    constructor();
+                } 
+                catch(e) 
+                {
+                    if (typeof(console['log']) == 'function')
+                    {
+                        console.log("Failed to run constructor: " + console.processMessage(e));
+                    }
+                    else
+                    {
+                        alert("Failed to run constructor: " + e.message);
+                    }
+                }
+            }
+            // all constructors run, now fire the deviceready event
+            var e = document.createEvent('Events'); 
+            e.initEvent('deviceready');
+            document.dispatchEvent(e);
+        }
+    }, 1);
+})();
+
+// session id for calls
+PhoneGap.sessionKey = 0;
+
+// centralized callbacks
+PhoneGap.callbackId = 0;
+PhoneGap.callbacks = {};
+PhoneGap.callbackStatus = {
+    NO_RESULT: 0,
+    OK: 1,
+    CLASS_NOT_FOUND_EXCEPTION: 2,
+    ILLEGAL_ACCESS_EXCEPTION: 3,
+    INSTANTIATION_EXCEPTION: 4,
+    MALFORMED_URL_EXCEPTION: 5,
+    IO_EXCEPTION: 6,
+    INVALID_ACTION: 7,
+    JSON_EXCEPTION: 8,
+    ERROR: 9
+    };
+
+/**
+ * Creates a gap bridge iframe used to notify the native code about queued
+ * commands.
+ *
+ * @private
+ */
+PhoneGap.createGapBridge = function() {
+    gapBridge = document.createElement("iframe");
+    gapBridge.setAttribute("style", "display:none;");
+    gapBridge.setAttribute("height","0px");
+    gapBridge.setAttribute("width","0px");
+    gapBridge.setAttribute("frameborder","0");
+    document.documentElement.appendChild(gapBridge);
+    return gapBridge;
+}
+
+/** 
+ * Execute a PhoneGap command by queuing it and letting the native side know
+ * there are queued commands. The native side will then request all of the
+ * queued commands and execute them.
+ *
+ * Arguments may be in one of two formats:
+ *
+ * FORMAT ONE (preferable)
+ * The native side will call PhoneGap.callbackSuccess or
+ * PhoneGap.callbackError, depending upon the result of the action.
+ *
+ * @param {Function} success    The success callback
+ * @param {Function} fail       The fail callback
+ * @param {String} service      The name of the service to use
+ * @param {String} action       The name of the action to use
+ * @param {String[]} [args]     Zero or more arguments to pass to the method
+ *      
+ * FORMAT TWO
+ * @param {String} command    Command to be run in PhoneGap, e.g.
+ *                            "ClassName.method"
+ * @param {String[]} [args]   Zero or more arguments to pass to the method
+ *                            object parameters are passed as an array object
+ *                            [object1, object2] each object will be passed as
+ *                            JSON strings 
+ */
+PhoneGap.exec = function() { 
+    if (!PhoneGap.available) {
+        alert("ERROR: Attempting to call PhoneGap.exec()"
+              +" before 'deviceready'. Ignoring.");
+        return;
+    }
+
+    var successCallback, failCallback, service, action, actionArgs;
+    var callbackId = null;
+    if (typeof arguments[0] !== "string") {
+        // FORMAT ONE
+        successCallback = arguments[0];
+        failCallback = arguments[1];
+        service = arguments[2];
+        action = arguments[3];
+        actionArgs = arguments[4];
+
+        // Since we need to maintain backwards compatibility, we have to pass
+        // an invalid callbackId even if no callback was provided since plugins
+        // will be expecting it. The PhoneGap.exec() implementation allocates
+        // an invalid callbackId and passes it even if no callbacks were given.
+        callbackId = 'INVALID';
+    } else {
+        // FORMAT TWO
+        splitCommand = arguments[0].split(".");
+        action = splitCommand.pop();
+        service = splitCommand.join(".");
+        actionArgs = Array.prototype.splice.call(arguments, 1);
+    }
+    
+    // Start building the command object.
+    var command = {
+        className: service,
+        methodName: action,
+        arguments: []
+    };
+
+    // Register the callbacks and add the callbackId to the positional
+    // arguments if given.
+    if (successCallback || failCallback) {
+        callbackId = service + PhoneGap.callbackId++;
+        PhoneGap.callbacks[callbackId] = 
+            {success:successCallback, fail:failCallback};
+    }
+    if (callbackId != null) {
+        command.arguments.push(callbackId);
+    }
+
+    for (var i = 0; i < actionArgs.length; ++i) {
+        var arg = actionArgs[i];
+        if (arg == undefined || arg == null) {
+            continue;
+        } else if (typeof(arg) == 'object') {
+            command.options = arg;
+        } else {
+            command.arguments.push(arg);
+        }
+    }
+
+    // Stringify and queue the command. We stringify to command now to
+    // effectively clone the command arguments in case they are mutated before
+    // the command is executed.
+    PhoneGap.commandQueue.push(JSON.stringify(command));
+
+    // If the queue length is 1, then that means it was empty before we queued
+    // the given command, so let the native side know that we have some
+    // commands to execute, unless the queue is currently being flushed, in
+    // which case the command will be picked up without notification.
+    if (PhoneGap.commandQueue.length == 1 && !PhoneGap.commandQueueFlushing) {
+        if (!PhoneGap.gapBridge) {
+            PhoneGap.gapBridge = PhoneGap.createGapBridge();
+        }
+
+        PhoneGap.gapBridge.src = "gap://ready";
+    }
+}
+
+/**
+ * Called by native code to retrieve all queued commands and clear the queue.
+ */
+PhoneGap.getAndClearQueuedCommands = function() {
+  json = JSON.stringify(PhoneGap.commandQueue);
+  PhoneGap.commandQueue = [];
+  return json;
+}
+
+/**
+ * Called by native code when returning successful result from an action.
+ *
+ * @param callbackId
+ * @param args
+ *        args.status - PhoneGap.callbackStatus
+ *        args.message - return value
+ *        args.keepCallback - 0 to remove callback, 1 to keep callback in PhoneGap.callbacks[]
+ */
+PhoneGap.callbackSuccess = function(callbackId, args) {
+    if (PhoneGap.callbacks[callbackId]) {
+
+        // If result is to be sent to callback
+        if (args.status == PhoneGap.callbackStatus.OK) {
+            try {
+                if (PhoneGap.callbacks[callbackId].success) {
+                       PhoneGap.callbacks[callbackId].success(args.message);
+                }
+            }
+            catch (e) {
+                console.log("Error in success callback: "+callbackId+" = "+e);
+            }
+        }
+    
+        // Clear callback if not expecting any more results
+        if (!args.keepCallback) {
+            delete PhoneGap.callbacks[callbackId];
+        }
+    }
+};
+
+/**
+ * Called by native code when returning error result from an action.
+ *
+ * @param callbackId
+ * @param args
+ */
+PhoneGap.callbackError = function(callbackId, args) {
+    if (PhoneGap.callbacks[callbackId]) {
+        try {
+            if (PhoneGap.callbacks[callbackId].fail) {
+                PhoneGap.callbacks[callbackId].fail(args.message);
+            }
+        }
+        catch (e) {
+            console.log("Error in error callback: "+callbackId+" = "+e);
+        }
+        
+        // Clear callback if not expecting any more results
+        if (!args.keepCallback) {
+            delete PhoneGap.callbacks[callbackId];
+        }
+    }
+};
+
+
+/**
+ * Does a deep clone of the object.
+ *
+ * @param obj
+ * @return
+ */
+PhoneGap.clone = function(obj) {
+    if(!obj) { 
+        return obj;
+    }
+
+    if(obj instanceof Array){
+        var retVal = new Array();
+        for(var i = 0; i < obj.length; ++i){
+            retVal.push(PhoneGap.clone(obj[i]));
+        }
+        return retVal;
+    }
+
+    if (obj instanceof Function) {
+        return obj;
+    }
+
+    if(!(obj instanceof Object)){
+        return obj;
+    }
+    
+    if (obj instanceof Date) {
+        return obj;
+    }
+
+    retVal = new Object();
+    for(i in obj){
+        if(!(i in retVal) || retVal[i] != obj[i]) {
+            retVal[i] = PhoneGap.clone(obj[i]);
+        }
+    }
+    return retVal;
+};
+
+// Intercept calls to document.addEventListener 
+PhoneGap.m_document_addEventListener = document.addEventListener;
+
+// Intercept calls to window.addEventListener
+PhoneGap.m_window_addEventListener = window.addEventListener;
+
+/**
+ * Add a custom window event handler.
+ *
+ * @param {String} event            The event name that callback handles
+ * @param {Function} callback       The event handler
+ */
+PhoneGap.addWindowEventHandler = function(event, callback) {
+    PhoneGap.windowEventHandler[event] = callback;
+}
+
+/**
+ * Add a custom document event handler.
+ *
+ * @param {String} event            The event name that callback handles
+ * @param {Function} callback       The event handler
+ */
+PhoneGap.addDocumentEventHandler = function(event, callback) {
+    PhoneGap.documentEventHandler[event] = callback;
+}
+
+/**
+ * Intercept adding document event listeners and handle our own
+ *
+ * @param {Object} evt
+ * @param {Function} handler
+ * @param capture
+ */
+document.addEventListener = function(evt, handler, capture) {
+    var e = evt.toLowerCase();
+           
+    // If subscribing to an event that is handled by a plugin
+    if (typeof PhoneGap.documentEventHandler[e] !== "undefined") {
+        if (PhoneGap.documentEventHandler[e](e, handler, true)) {
+            return; // Stop default behavior
+        }
+    }
+    
+    PhoneGap.m_document_addEventListener.call(document, evt, handler, capture); 
+};
+
+/**
+ * Intercept adding window event listeners and handle our own
+ *
+ * @param {Object} evt
+ * @param {Function} handler
+ * @param capture
+ */
+window.addEventListener = function(evt, handler, capture) {
+    var e = evt.toLowerCase();
+        
+    // If subscribing to an event that is handled by a plugin
+    if (typeof PhoneGap.windowEventHandler[e] !== "undefined") {
+        if (PhoneGap.windowEventHandler[e](e, handler, true)) {
+            return; // Stop default behavior
+        }
+    }
+        
+    PhoneGap.m_window_addEventListener.call(window, evt, handler, capture);
+};
+
+// Intercept calls to document.removeEventListener and watch for events that
+// are generated by PhoneGap native code
+PhoneGap.m_document_removeEventListener = document.removeEventListener;
+
+// Intercept calls to window.removeEventListener
+PhoneGap.m_window_removeEventListener = window.removeEventListener;
+
+/**
+ * Intercept removing document event listeners and handle our own
+ *
+ * @param {Object} evt
+ * @param {Function} handler
+ * @param capture
+ */
+document.removeEventListener = function(evt, handler, capture) {
+    var e = evt.toLowerCase();
+
+    // If unsubcribing from an event that is handled by a plugin
+    if (typeof PhoneGap.documentEventHandler[e] !== "undefined") {
+        if (PhoneGap.documentEventHandler[e](e, handler, false)) {
+            return; // Stop default behavior
+        }
+    }
+
+    PhoneGap.m_document_removeEventListener.call(document, evt, handler, capture);
+};
+
+/**
+ * Intercept removing window event listeners and handle our own
+ *
+ * @param {Object} evt
+ * @param {Function} handler
+ * @param capture
+ */
+window.removeEventListener = function(evt, handler, capture) {
+    var e = evt.toLowerCase();
+
+    // If unsubcribing from an event that is handled by a plugin
+    if (typeof PhoneGap.windowEventHandler[e] !== "undefined") {
+        if (PhoneGap.windowEventHandler[e](e, handler, false)) {
+            return; // Stop default behavior
+        }
+    }
+
+    PhoneGap.m_window_removeEventListener.call(window, evt, handler, capture);
+};
+
+/**
+ * Method to fire document event
+ *
+ * @param {String} type             The event type to fire
+ * @param {Object} data             Data to send with event
+ */
+PhoneGap.fireDocumentEvent = function(type, data) {
+    var e = document.createEvent('Events');
+    e.initEvent(type);
+    if (data) {
+        for (var i in data) {
+            e[i] = data[i];
+        }
+    }
+    document.dispatchEvent(e);
+};
+
+/**
+ * Method to fire window event
+ *
+ * @param {String} type             The event type to fire
+ * @param {Object} data             Data to send with event
+ */
+PhoneGap.fireWindowEvent = function(type, data) {
+    var e = document.createEvent('Events');
+    e.initEvent(type);
+    if (data) {
+        for (var i in data) {
+            e[i] = data[i];
+        }
+    }
+    window.dispatchEvent(e);
+};
+
+/**
+ * Method to fire event from native code
+ * Leaving this generic version to handle problems with iOS 3.x. Is currently used by orientation and battery events
+ * Remove when iOS 3.x no longer supported and call fireWindowEvent or fireDocumentEvent directly
+ */
+PhoneGap.fireEvent = function(type, target, data) {
+    var e = document.createEvent('Events');
+    e.initEvent(type);
+    if (data) {
+        for (var i in data) {
+            e[i] = data[i];
+        }
+    }
+    target = target || document;
+    if (target.dispatchEvent === undefined) { // ie window.dispatchEvent is undefined in iOS 3.x
+        target = document;
+    } 
+
+    target.dispatchEvent(e);
+};
+/**
+ * Create a UUID
+ *
+ * @return
+ */
+PhoneGap.createUUID = function() {
+    return PhoneGap.UUIDcreatePart(4) + '-' +
+        PhoneGap.UUIDcreatePart(2) + '-' +
+        PhoneGap.UUIDcreatePart(2) + '-' +
+        PhoneGap.UUIDcreatePart(2) + '-' +
+        PhoneGap.UUIDcreatePart(6);
+};
+
+PhoneGap.UUIDcreatePart = function(length) {
+    var uuidpart = "";
+    for (var i=0; i<length; i++) {
+        var uuidchar = parseInt((Math.random() * 256)).toString(16);
+        if (uuidchar.length == 1) {
+            uuidchar = "0" + uuidchar;
+        }
+        uuidpart += uuidchar;
+    }
+    return uuidpart;
+};
+};
+
+
+if (!PhoneGap.hasResource("debugconsole")) {
+	PhoneGap.addResource("debugconsole");
+	
+/**
+ * This class provides access to the debugging console.
+ * @constructor
+ */
+var DebugConsole = function() {
+    this.winConsole = window.console;
+    this.logLevel = DebugConsole.INFO_LEVEL;
+}
+
+// from most verbose, to least verbose
+DebugConsole.ALL_LEVEL    = 1; // same as first level
+DebugConsole.INFO_LEVEL   = 1;
+DebugConsole.WARN_LEVEL   = 2;
+DebugConsole.ERROR_LEVEL  = 4;
+DebugConsole.NONE_LEVEL   = 8;
+													
+DebugConsole.prototype.setLevel = function(level) {
+    this.logLevel = level;
+};
+
+/**
+ * Utility function for rendering and indenting strings, or serializing
+ * objects to a string capable of being printed to the console.
+ * @param {Object|String} message The string or object to convert to an indented string
+ * @private
+ */
+DebugConsole.prototype.processMessage = function(message, maxDepth) {
+	if (maxDepth === undefined) maxDepth = 0;
+    if (typeof(message) != 'object') {
+        return (this.isDeprecated ? "WARNING: debug object is deprecated, please use console object \n" + message : message);
+    } else {
+        /**
+         * @function
+         * @ignore
+         */
+        function indent(str) {
+            return str.replace(/^/mg, "    ");
+        }
+        /**
+         * @function
+         * @ignore
+         */
+        function makeStructured(obj, depth) {
+            var str = "";
+            for (var i in obj) {
+                try {
+                    if (typeof(obj[i]) == 'object' && depth < maxDepth) {
+                        str += i + ":\n" + indent(makeStructured(obj[i])) + "\n";
+                    } else {
+                        str += i + " = " + indent(String(obj[i])).replace(/^    /, "") + "\n";
+                    }
+                } catch(e) {
+                    str += i + " = EXCEPTION: " + e.message + "\n";
+                }
+            }
+            return str;
+        }
+        
+        return ("Object:\n" + makeStructured(message, maxDepth));
+    }
+};
+
+/**
+ * Print a normal log message to the console
+ * @param {Object|String} message Message or object to print to the console
+ */
+DebugConsole.prototype.log = function(message, maxDepth) {
+    if (PhoneGap.available && this.logLevel <= DebugConsole.INFO_LEVEL)
+        PhoneGap.exec(null, null, 'com.phonegap.debugconsole', 'log',
+            [ this.processMessage(message, maxDepth), { logLevel: 'INFO' } ]
+        );
+    else
+        this.winConsole.log(message);
+};
+
+/**
+ * Print a warning message to the console
+ * @param {Object|String} message Message or object to print to the console
+ */
+DebugConsole.prototype.warn = function(message, maxDepth) {
+    if (PhoneGap.available && this.logLevel <= DebugConsole.WARN_LEVEL)
+    	PhoneGap.exec(null, null, 'com.phonegap.debugconsole', 'log',
+            [ this.processMessage(message, maxDepth), { logLevel: 'WARN' } ]
+        );
+    else
+        this.winConsole.error(message);
+};
+
+/**
+ * Print an error message to the console
+ * @param {Object|String} message Message or object to print to the console
+ */
+DebugConsole.prototype.error = function(message, maxDepth) {
+    if (PhoneGap.available && this.logLevel <= DebugConsole.ERROR_LEVEL)
+		PhoneGap.exec(null, null, 'com.phonegap.debugconsole', 'log',
+            [ this.processMessage(message, maxDepth), { logLevel: 'ERROR' } ]
+        );
+    else
+        this.winConsole.error(message);
+};
+
+PhoneGap.addConstructor(function() {
+    window.console = new DebugConsole();
+});
+};
+if (!PhoneGap.hasResource("position")) {
+	PhoneGap.addResource("position");
+
+/**
+ * This class contains position information.
+ * @param {Object} lat
+ * @param {Object} lng
+ * @param {Object} acc
+ * @param {Object} alt
+ * @param {Object} altAcc
+ * @param {Object} head
+ * @param {Object} vel
+ * @constructor
+ */
+Position = function(coords, timestamp) {
+	this.coords = Coordinates.cloneFrom(coords);
+    this.timestamp = timestamp || new Date().getTime();
+};
+
+Position.prototype.equals = function(other) {
+    return (this.coords && other && other.coords &&
+            this.coords.latitude == other.coords.latitude &&
+            this.coords.longitude == other.coords.longitude);
+};
+
+Position.prototype.clone = function()
+{
+    return new Position(
+        this.coords? this.coords.clone() : null,
+        this.timestamp? this.timestamp : new Date().getTime()
+    );
+}
+
+Coordinates = function(lat, lng, alt, acc, head, vel, altAcc) {
+	/**
+	 * The latitude of the position.
+	 */
+	this.latitude = lat;
+	/**
+	 * The longitude of the position,
+	 */
+	this.longitude = lng;
+	/**
+	 * The altitude of the position.
+	 */
+	this.altitude = alt;
+	/**
+	 * The accuracy of the position.
+	 */
+	this.accuracy = acc;
+	/**
+	 * The direction the device is moving at the position.
+	 */
+	this.heading = head;
+	/**
+	 * The velocity with which the device is moving at the position.
+	 */
+	this.speed = vel;
+	/**
+	 * The altitude accuracy of the position.
+	 */
+	this.altitudeAccuracy = (altAcc != 'undefined') ? altAcc : null; 
+};
+
+Coordinates.prototype.clone = function()
+{
+    return new Coordinates(
+        this.latitude,
+        this.longitude,
+        this.altitude,
+        this.accuracy,
+        this.heading,
+        this.speed,
+        this.altitudeAccuracy
+    );
+};
+
+Coordinates.cloneFrom = function(obj)
+{
+    return new Coordinates(
+        obj.latitude,
+        obj.longitude,
+        obj.altitude,
+        obj.accuracy,
+        obj.heading,
+        obj.speed,
+        obj.altitudeAccuracy
+    );
+};
+
+/**
+ * This class specifies the options for requesting position data.
+ * @constructor
+ */
+PositionOptions = function(enableHighAccuracy, timeout, maximumAge) {
+	/**
+	 * Specifies the desired position accuracy.
+	 */
+	this.enableHighAccuracy = enableHighAccuracy || false;
+	/**
+	 * The timeout after which if position data cannot be obtained the errorCallback
+	 * is called.
+	 */
+	this.timeout = timeout || 10000;
+	/**
+     * The age of a cached position whose age is no greater than the specified time 
+     * in milliseconds. 
+     */
+	this.maximumAge = maximumAge || 0;
+	
+	if (this.maximumAge < 0) {
+		this.maximumAge = 0;
+	}
+};
+
+/**
+ * This class contains information about any GPS errors.
+ * @constructor
+ */
+PositionError = function(code, message) {
+	this.code = code || 0;
+	this.message = message || "";
+};
+
+PositionError.UNKNOWN_ERROR = 0;
+PositionError.PERMISSION_DENIED = 1;
+PositionError.POSITION_UNAVAILABLE = 2;
+PositionError.TIMEOUT = 3;
+
+};if (!PhoneGap.hasResource("acceleration")) {
+	PhoneGap.addResource("acceleration");
+ 	
+
+/**
+ * This class contains acceleration information
+ * @constructor
+ * @param {Number} x The force applied by the device in the x-axis.
+ * @param {Number} y The force applied by the device in the y-axis.
+ * @param {Number} z The force applied by the device in the z-axis.
+ */
+Acceleration = function(x, y, z) {
+	/**
+	 * The force applied by the device in the x-axis.
+	 */
+	this.x = x;
+	/**
+	 * The force applied by the device in the y-axis.
+	 */
+	this.y = y;
+	/**
+	 * The force applied by the device in the z-axis.
+	 */
+	this.z = z;
+	/**
+	 * The time that the acceleration was obtained.
+	 */
+	this.timestamp = new Date().getTime();
+}
+
+/**
+ * This class specifies the options for requesting acceleration data.
+ * @constructor
+ */
+AccelerationOptions = function() {
+	/**
+	 * The timeout after which if acceleration data cannot be obtained the errorCallback
+	 * is called.
+	 */
+	this.timeout = 10000;
+}
+};if (!PhoneGap.hasResource("accelerometer")) {
+	PhoneGap.addResource("accelerometer");
+
+/**
+ * This class provides access to device accelerometer data.
+ * @constructor
+ */
+Accelerometer = function() 
+{
+	/**
+	 * The last known acceleration.
+	 */
+	this.lastAcceleration = new Acceleration(0,0,0);
+}
+
+/**
+ * Asynchronously aquires the current acceleration.
+ * @param {Function} successCallback The function to call when the acceleration
+ * data is available
+ * @param {Function} errorCallback The function to call when there is an error 
+ * getting the acceleration data.
+ * @param {AccelerationOptions} options The options for getting the accelerometer data
+ * such as timeout.
+ */
+Accelerometer.prototype.getCurrentAcceleration = function(successCallback, errorCallback, options) {
+	// If the acceleration is available then call success
+	// If the acceleration is not available then call error
+	
+	// Created for iPhone, Iphone passes back _accel obj litteral
+	if (typeof successCallback == "function") {
+		successCallback(this.lastAcceleration);
+	}
+};
+
+// private callback called from Obj-C by name
+Accelerometer.prototype._onAccelUpdate = function(x,y,z)
+{
+   this.lastAcceleration = new Acceleration(x,y,z);
+};
+
+/**
+ * Asynchronously aquires the acceleration repeatedly at a given interval.
+ * @param {Function} successCallback The function to call each time the acceleration
+ * data is available
+ * @param {Function} errorCallback The function to call when there is an error 
+ * getting the acceleration data.
+ * @param {AccelerationOptions} options The options for getting the accelerometer data
+ * such as timeout.
+ */
+
+Accelerometer.prototype.watchAcceleration = function(successCallback, errorCallback, options) {
+	//this.getCurrentAcceleration(successCallback, errorCallback, options);
+	// TODO: add the interval id to a list so we can clear all watches
+ 	var frequency = (options != undefined && options.frequency != undefined) ? options.frequency : 10000;
+	var updatedOptions = {
+		desiredFrequency:frequency 
+	}
+	PhoneGap.exec(null, null, "com.phonegap.accelerometer", "start", [options]);
+
+	return setInterval(function() {
+		navigator.accelerometer.getCurrentAcceleration(successCallback, errorCallback, options);
+	}, frequency);
+};
+
+/**
+ * Clears the specified accelerometer watch.
+ * @param {String} watchId The ID of the watch returned from #watchAcceleration.
+ */
+Accelerometer.prototype.clearWatch = function(watchId) {
+	PhoneGap.exec(null, null, "com.phonegap.accelerometer", "stop", []);
+	clearInterval(watchId);
+};
+
+Accelerometer.install = function()
+{
+    if (typeof navigator.accelerometer == "undefined") {
+		navigator.accelerometer = new Accelerometer();
+	}
+};
+
+Accelerometer.installDeviceMotionHandler = function()
+{
+	if (!(window.DeviceMotionEvent == undefined)) {
+		// supported natively, so we don't have to add support
+		return;
+	}	
+	
+	var self = this;
+	var devicemotionEvent = 'devicemotion';
+	self.deviceMotionWatchId = null;
+	self.deviceMotionListenerCount = 0;
+	self.deviceMotionLastEventTimestamp = 0;
+	
+	// backup original `window.addEventListener`, `window.removeEventListener`
+    var _addEventListener = window.addEventListener;
+    var _removeEventListener = window.removeEventListener;
+													
+	var windowDispatchAvailable = !(window.dispatchEvent === undefined); // undefined in iOS 3.x
+													
+	var accelWin = function(acceleration) {
+		var evt = document.createEvent('Events');
+	    evt.initEvent(devicemotionEvent);
+	
+		evt.acceleration = null; // not all devices have gyroscope, don't care for now if we actually have it.
+		evt.rotationRate = null; // not all devices have gyroscope, don't care for now if we actually have it:
+		evt.accelerationIncludingGravity = acceleration; // accelerometer, all iOS devices have it
+		
+		var currentTime = new Date().getTime();
+		evt.interval =  (self.deviceMotionLastEventTimestamp == 0) ? 0 : (currentTime - self.deviceMotionLastEventTimestamp);
+		self.deviceMotionLastEventTimestamp = currentTime;
+		
+		if (windowDispatchAvailable) {
+			window.dispatchEvent(evt);
+		} else {
+			document.dispatchEvent(evt);
+		}
+	};
+	
+	var accelFail = function() {
+		
+	};
+													
+    // override `window.addEventListener`
+    window.addEventListener = function() {
+        if (arguments[0] === devicemotionEvent) {
+            ++(self.deviceMotionListenerCount);
+			if (self.deviceMotionListenerCount == 1) { // start
+				self.deviceMotionWatchId = navigator.accelerometer.watchAcceleration(accelWin, accelFail, { frequency:500});
+			}
+		} 
+													
+		if (!windowDispatchAvailable) {
+			return document.addEventListener.apply(this, arguments);
+		} else {
+			return _addEventListener.apply(this, arguments);
+		}
+    };	
+
+    // override `window.removeEventListener'
+    window.removeEventListener = function() {
+        if (arguments[0] === devicemotionEvent) {
+            --(self.deviceMotionListenerCount);
+			if (self.deviceMotionListenerCount == 0) { // stop
+				navigator.accelerometer.clearWatch(self.deviceMotionWatchId);
+			}
+		} 
+		
+		if (!windowDispatchAvailable) {
+			return document.removeEventListener.apply(this, arguments);
+		} else {
+			return _removeEventListener.apply(this, arguments);
+		}
+    };	
+};
+
+
+PhoneGap.addConstructor(Accelerometer.install);
+PhoneGap.addConstructor(Accelerometer.installDeviceMotionHandler);
+
+};
+if (!PhoneGap.hasResource("battery")) {
+PhoneGap.addResource("battery");
+
+/**
+ * This class contains information about the current battery status.
+ * @constructor
+ */
+var Battery = function() {
+    this._level = null;
+    this._isPlugged = null;
+    this._batteryListener = [];
+    this._lowListener = [];
+    this._criticalListener = [];
+};
+
+/**
+ * Registers as an event producer for battery events.
+ * 
+ * @param {Object} eventType
+ * @param {Object} handler
+ * @param {Object} add
+ */
+Battery.prototype.eventHandler = function(eventType, handler, add) {
+    var me = navigator.battery;
+    if (add) {
+        // If there are no current registered event listeners start the battery listener on native side.
+        if (me._batteryListener.length === 0 && me._lowListener.length === 0 && me._criticalListener.length === 0) {
+            PhoneGap.exec(me._status, me._error, "com.phonegap.battery", "start", []);
+        }
+        
+        // Register the event listener in the proper array
+        if (eventType === "batterystatus") {
+            var pos = me._batteryListener.indexOf(handler);
+            if (pos === -1) {
+            	me._batteryListener.push(handler);
+            }
+        } else if (eventType === "batterylow") {
+            var pos = me._lowListener.indexOf(handler);
+            if (pos === -1) {
+            	me._lowListener.push(handler);
+            }
+        } else if (eventType === "batterycritical") {
+            var pos = me._criticalListener.indexOf(handler);
+            if (pos === -1) {
+            	me._criticalListener.push(handler);
+            }
+        }
+    } else {
+        // Remove the event listener from the proper array
+        if (eventType === "batterystatus") {
+            var pos = me._batteryListener.indexOf(handler);
+            if (pos > -1) {
+                me._batteryListener.splice(pos, 1);        
+            }
+        } else if (eventType === "batterylow") {
+            var pos = me._lowListener.indexOf(handler);
+            if (pos > -1) {
+                me._lowListener.splice(pos, 1);        
+            }
+        } else if (eventType === "batterycritical") {
+            var pos = me._criticalListener.indexOf(handler);
+            if (pos > -1) {
+                me._criticalListener.splice(pos, 1);        
+            }
+        }
+        
+        // If there are no more registered event listeners stop the battery listener on native side.
+        if (me._batteryListener.length === 0 && me._lowListener.length === 0 && me._criticalListener.length === 0) {
+            PhoneGap.exec(null, null, "com.phonegap.battery", "stop", []);
+        }
+    }
+};
+
+/**
+ * Callback for battery status
+ * 
+ * @param {Object} info			keys: level, isPlugged
+ */
+Battery.prototype._status = function(info) {
+	if (info) {
+		var me = this;
+		if (me._level != info.level || me._isPlugged != info.isPlugged) {
+			// Fire batterystatus event
+			//PhoneGap.fireWindowEvent("batterystatus", info);
+			// use this workaround since iOS 3.x does have window.dispatchEvent
+			PhoneGap.fireEvent("batterystatus", window, info);	
+
+			// Fire low battery event
+			if (info.level == 20 || info.level == 5) {
+				if (info.level == 20) {
+					//PhoneGap.fireWindowEvent("batterylow", info);
+					// use this workaround since iOS 3.x does not have window.dispatchEvent
+					PhoneGap.fireEvent("batterylow", window, info);
+				}
+				else {
+					//PhoneGap.fireWindowEvent("batterycritical", info);
+					// use this workaround since iOS 3.x does not have window.dispatchEvent
+					PhoneGap.fireEvent("batterycritical", window, info);
+				}
+			}
+		}
+		me._level = info.level;
+		me._isPlugged = info.isPlugged;	
+	}
+};
+
+/**
+ * Error callback for battery start
+ */
+Battery.prototype._error = function(e) {
+    console.log("Error initializing Battery: " + e);
+};
+
+PhoneGap.addConstructor(function() {
+    if (typeof navigator.battery === "undefined") {
+        navigator.battery = new Battery();
+        PhoneGap.addWindowEventHandler("batterystatus", navigator.battery.eventHandler);
+        PhoneGap.addWindowEventHandler("batterylow", navigator.battery.eventHandler);
+        PhoneGap.addWindowEventHandler("batterycritical", navigator.battery.eventHandler);
+    }
+});
+}if (!PhoneGap.hasResource("camera")) {
+	PhoneGap.addResource("camera");
+	
+
+/**
+ * This class provides access to the device camera.
+ * @constructor
+ */
+Camera = function() {
+	
+}
+/**
+ *  Available Camera Options
+ *  {boolean} allowEdit - true to allow editing image, default = false
+ *	{number} quality 0-100 (low to high) default =  100
+ *  {Camera.DestinationType} destinationType default = DATA_URL
+ *	{Camera.PictureSourceType} sourceType default = CAMERA
+ *	{number} targetWidth - width in pixels to scale image default = 0 (no scaling)
+ *  {number} targetHeight - height in pixels to scale image default = 0 (no scaling)
+ *  {Camera.EncodingType} - encodingType default = JPEG
+ *  {boolean} correctOrientation - Rotate the image to correct for the orientation of the device during capture (iOS only)
+ *  {boolean} saveToPhotoAlbum - Save the image to the photo album on the device after capture (iOS only)
+ */
+/**
+ * Format of image that is returned from getPicture.
+ *
+ * Example: navigator.camera.getPicture(success, fail,
+ *              { quality: 80,
+ *                destinationType: Camera.DestinationType.DATA_URL,
+ *                sourceType: Camera.PictureSourceType.PHOTOLIBRARY})
+ */
+Camera.DestinationType = {
+    DATA_URL: 0,                // Return base64 encoded string
+    FILE_URI: 1                 // Return file uri 
+};
+Camera.prototype.DestinationType = Camera.DestinationType;
+
+/**
+ * Source to getPicture from.
+ *
+ * Example: navigator.camera.getPicture(success, fail,
+ *              { quality: 80,
+ *                destinationType: Camera.DestinationType.DATA_URL,
+ *                sourceType: Camera.PictureSourceType.PHOTOLIBRARY})
+ */
+Camera.PictureSourceType = {
+    PHOTOLIBRARY : 0,           // Choose image from picture library 
+    CAMERA : 1,                 // Take picture from camera
+    SAVEDPHOTOALBUM : 2         // Choose image from picture library 
+};
+Camera.prototype.PictureSourceType = Camera.PictureSourceType;
+
+/** 
+ * Encoding of image returned from getPicture. 
+ * 
+ * Example: navigator.camera.getPicture(success, fail, 
+ *              { quality: 80, 
+ *                destinationType: Camera.DestinationType.DATA_URL, 
+ *                sourceType: Camera.PictureSourceType.CAMERA, 
+ *                encodingType: Camera.EncodingType.PNG}) 
+ */ 
+Camera.EncodingType = { 
+	JPEG: 0,                    // Return JPEG encoded image 
+	PNG: 1                      // Return PNG encoded image 
+};
+Camera.prototype.EncodingType = Camera.EncodingType;
+
+/** 
+ * Type of pictures to select from.  Only applicable when
+ *	PictureSourceType is PHOTOLIBRARY or SAVEDPHOTOALBUM 
+ * 
+ * Example: navigator.camera.getPicture(success, fail, 
+ *              { quality: 80, 
+ *                destinationType: Camera.DestinationType.DATA_URL, 
+ *                sourceType: Camera.PictureSourceType.PHOTOLIBRARY, 
+ *                mediaType: Camera.MediaType.PICTURE}) 
+ */ 
+Camera.MediaType = { 
+	PICTURE: 0,             // allow selection of still pictures only. DEFAULT. Will return format specified via DestinationType
+	VIDEO: 1,                // allow selection of video only, ONLY RETURNS URL
+	ALLMEDIA : 2			// allow selection from all media types
+};
+Camera.prototype.MediaType = Camera.MediaType;
+
+/**
+ * Gets a picture from source defined by "options.sourceType", and returns the
+ * image as defined by the "options.destinationType" option.
+
+ * The defaults are sourceType=CAMERA and destinationType=DATA_URL.
+ *
+ * @param {Function} successCallback
+ * @param {Function} errorCallback
+ * @param {Object} options
+ */
+Camera.prototype.getPicture = function(successCallback, errorCallback, options) {
+	// successCallback required
+	if (typeof successCallback != "function") {
+        console.log("Camera Error: successCallback is not a function");
+        return;
+    }
+
+    // errorCallback optional
+    if (errorCallback && (typeof errorCallback != "function")) {
+        console.log("Camera Error: errorCallback is not a function");
+        return;
+    }
+	
+	PhoneGap.exec(successCallback, errorCallback, "com.phonegap.camera","getPicture",[options]);
+};
+
+
+
+PhoneGap.addConstructor(function() {
+    if (typeof navigator.camera == "undefined") navigator.camera = new Camera();
+});
+};
+
+if (!PhoneGap.hasResource("device")) {
+	PhoneGap.addResource("device");
+
+/**
+ * this represents the mobile device, and provides properties for inspecting the model, version, UUID of the
+ * phone, etc.
+ * @constructor
+ */
+Device = function() 
+{
+    this.platform = null;
+    this.version  = null;
+    this.name     = null;
+    this.phonegap      = null;
+    this.uuid     = null;
+    try 
+	{      
+		this.platform = DeviceInfo.platform;
+		this.version  = DeviceInfo.version;
+		this.name     = DeviceInfo.name;
+		this.phonegap = DeviceInfo.gap;
+		this.uuid     = DeviceInfo.uuid;
+
+    } 
+	catch(e) 
+	{
+        // TODO: 
+    }
+	this.available = PhoneGap.available = this.uuid != null;
+}
+
+PhoneGap.addConstructor(function() {
+	if (typeof navigator.device === "undefined") {
+    	navigator.device = window.device = new Device();
+	}
+});
+};
+if (!PhoneGap.hasResource("capture")) {
+	PhoneGap.addResource("capture");
+/**
+ * The CaptureError interface encapsulates all errors in the Capture API.
+ */
+function CaptureError() {
+   this.code = null;
+};
+
+// Capture error codes
+CaptureError.CAPTURE_INTERNAL_ERR = 0;
+CaptureError.CAPTURE_APPLICATION_BUSY = 1;
+CaptureError.CAPTURE_INVALID_ARGUMENT = 2;
+CaptureError.CAPTURE_NO_MEDIA_FILES = 3;
+CaptureError.CAPTURE_NOT_SUPPORTED = 20;
+
+/**
+ * The Capture interface exposes an interface to the camera and microphone of the hosting device.
+ */
+function Capture() {
+	this.supportedAudioModes = [];
+	this.supportedImageModes = [];
+	this.supportedVideoModes = [];
+};
+
+/**
+ * Launch audio recorder application for recording audio clip(s).
+ * 
+ * @param {Function} successCB
+ * @param {Function} errorCB
+ * @param {CaptureAudioOptions} options
+ *
+ * No audio recorder to launch for iOS - return CAPTURE_NOT_SUPPORTED
+ */
+Capture.prototype.captureAudio = function(successCallback, errorCallback, options) {
+	/*if (errorCallback && typeof errorCallback === "function") {
+		errorCallback({
+				"code": CaptureError.CAPTURE_NOT_SUPPORTED
+			});
+	}*/
+    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.mediacapture", "captureAudio", [options]);
+};
+
+/**
+ * Launch camera application for taking image(s).
+ * 
+ * @param {Function} successCB
+ * @param {Function} errorCB
+ * @param {CaptureImageOptions} options
+ */
+Capture.prototype.captureImage = function(successCallback, errorCallback, options) {
+    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.mediacapture", "captureImage", [options]);
+};
+
+/**
+ * Casts a PluginResult message property  (array of objects) to an array of MediaFile objects
+ * (used in Objective-C)
+ *
+ * @param {PluginResult} pluginResult
+ */
+Capture.prototype._castMediaFile = function(pluginResult) {
+    var mediaFiles = [];
+    var i;
+    for (i=0; i<pluginResult.message.length; i++) {
+        var mediaFile = new MediaFile();
+	    mediaFile.name = pluginResult.message[i].name;
+	    mediaFile.fullPath = pluginResult.message[i].fullPath;
+	    mediaFile.type = pluginResult.message[i].type;
+	    mediaFile.lastModifiedDate = pluginResult.message[i].lastModifiedDate;
+	    mediaFile.size = pluginResult.message[i].size;
+        mediaFiles.push(mediaFile);
+    }
+    pluginResult.message = mediaFiles;
+    return pluginResult;
+};
+
+/**
+ * Launch device camera application for recording video(s).
+ * 
+ * @param {Function} successCB
+ * @param {Function} errorCB
+ * @param {CaptureVideoOptions} options
+ */
+Capture.prototype.captureVideo = function(successCallback, errorCallback, options) {
+    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.mediacapture", "captureVideo", [options]);
+};
+
+/**
+ * Encapsulates a set of parameters that the capture device supports.
+ */
+function ConfigurationData() {
+    // The ASCII-encoded string in lower case representing the media type. 
+    this.type; 
+    // The height attribute represents height of the image or video in pixels. 
+    // In the case of a sound clip this attribute has value 0. 
+    this.height = 0;
+    // The width attribute represents width of the image or video in pixels. 
+    // In the case of a sound clip this attribute has value 0
+    this.width = 0;
+};
+
+/**
+ * Encapsulates all image capture operation configuration options.
+ */
+var CaptureImageOptions = function() {
+    // Upper limit of images user can take. Value must be equal or greater than 1.
+    this.limit = 1; 
+    // The selected image mode. Must match with one of the elements in supportedImageModes array.
+    this.mode = null; 
+};
+
+/**
+ * Encapsulates all video capture operation configuration options.
+ */
+var CaptureVideoOptions = function() {
+    // Upper limit of videos user can record. Value must be equal or greater than 1.
+    this.limit = 1;
+    // Maximum duration of a single video clip in seconds.
+    this.duration = 0;
+    // The selected video mode. Must match with one of the elements in supportedVideoModes array.
+    this.mode = null;
+};
+
+/**
+ * Encapsulates all audio capture operation configuration options.
+ */
+var CaptureAudioOptions = function() {
+    // Upper limit of sound clips user can record. Value must be equal or greater than 1.
+    this.limit = 1;
+    // Maximum duration of a single sound clip in seconds.
+    this.duration = 0;
+    // The selected audio mode. Must match with one of the elements in supportedAudioModes array.
+    this.mode = null;
+};
+
+/**
+ * Represents a single file.
+ * 
+ * name {DOMString} name of the file, without path information
+ * fullPath {DOMString} the full path of the file, including the name
+ * type {DOMString} mime type
+ * lastModifiedDate {Date} last modified date
+ * size {Number} size of the file in bytes
+ */
+function MediaFile(name, fullPath, type, lastModifiedDate, size) {
+    this.name = name || null;
+    this.fullPath = fullPath || null;
+    this.type = type || null;
+    this.lastModifiedDate = lastModifiedDate || null;
+    this.size = size || 0;
+}
+
+/**
+ * Request capture format data for a specific file and type
+ * 
+ * @param {Function} successCB
+ * @param {Function} errorCB
+ */
+MediaFile.prototype.getFormatData = function(successCallback, errorCallback) {
+	if (typeof this.fullPath === "undefined" || this.fullPath === null) {
+		errorCallback({
+				"code": CaptureError.CAPTURE_INVALID_ARGUMENT
+			});
+	} else {
+    	PhoneGap.exec(successCallback, errorCallback, "com.phonegap.mediacapture", "getFormatData", [this.fullPath, this.type]);
+	}	
+};
+
+/**
+ * MediaFileData encapsulates format information of a media file.
+ * 
+ * @param {DOMString} codecs
+ * @param {long} bitrate
+ * @param {long} height
+ * @param {long} width
+ * @param {float} duration
+ */
+function MediaFileData(codecs, bitrate, height, width, duration) {
+    this.codecs = codecs || null;
+    this.bitrate = bitrate || 0;
+    this.height = height || 0;
+    this.width = width || 0;
+    this.duration = duration || 0;
+}
+
+PhoneGap.addConstructor(function() {
+    if (typeof navigator.device === "undefined") {
+        navigator.device = window.device = new Device();
+    }
+    if (typeof navigator.device.capture === "undefined") {
+        navigator.device.capture = window.device.capture = new Capture();
+    }
+});
+};
+if (!PhoneGap.hasResource("contact")) {
+	PhoneGap.addResource("contact");
+
+
+/**
+* Contains information about a single contact.
+* @param {DOMString} id unique identifier
+* @param {DOMString} displayName
+* @param {ContactName} name
+* @param {DOMString} nickname
+* @param {ContactField[]} phoneNumbers array of phone numbers
+* @param {ContactField[]} emails array of email addresses
+* @param {ContactAddress[]} addresses array of addresses
+* @param {ContactField[]} ims instant messaging user ids
+* @param {ContactOrganization[]} organizations
+* @param {DOMString} birthday contact's birthday
+* @param {DOMString} note user notes about contact
+* @param {ContactField[]} photos
+* @param {Array.<ContactField>} categories
+* @param {ContactField[]} urls contact's web sites
+*/
+var Contact = function(id, displayName, name, nickname, phoneNumbers, emails, addresses,
+    ims, organizations, birthday, note, photos, categories, urls) {
+    this.id = id || null;
+    this.displayName = displayName || null;
+    this.name = name || null; // ContactName
+    this.nickname = nickname || null;
+    this.phoneNumbers = phoneNumbers || null; // ContactField[]
+    this.emails = emails || null; // ContactField[]
+    this.addresses = addresses || null; // ContactAddress[]
+    this.ims = ims || null; // ContactField[]
+    this.organizations = organizations || null; // ContactOrganization[]
+    this.birthday = birthday || null; // JS Date
+    this.note = note || null;
+    this.photos = photos || null; // ContactField[]
+    this.categories = categories || null; 
+    this.urls = urls || null; // ContactField[]
+};
+
+/**
+* Converts Dates to milliseconds before sending to iOS
+*/
+Contact.prototype.convertDatesOut = function()
+{
+	var dates = new Array("birthday");
+	for (var i=0; i<dates.length; i++){
+		var value = this[dates[i]];
+		if (value){
+			if (!value instanceof Date){
+				try {
+					value = new Date(value);
+				} catch(exception){
+					value = null;
+				}
+			}
+			if (value instanceof Date){
+				value = value.valueOf();
+			}
+			this[dates[i]] = value;
+		}
+	}
+	
+};
+/**
+* Converts milliseconds to JS Date when returning from iOS
+*/
+Contact.prototype.convertDatesIn = function()
+{
+	var dates = new Array("birthday");
+	for (var i=0; i<dates.length; i++){
+		var value = this[dates[i]];
+		if (value){
+			try {
+				this[dates[i]] = new Date(parseFloat(value));
+			} catch (exception){
+				console.log("exception creating date");
+			}
+		}
+	}
+};
+/**
+* Removes contact from device storage.
+* @param successCB success callback
+* @param errorCB error callback (optional)
+*/
+Contact.prototype.remove = function(successCB, errorCB) {
+	if (this.id == null) {
+        var errorObj = new ContactError();
+        errorObj.code = ContactError.UNKNOWN_ERROR;
+        errorCB(errorObj);
+    }
+    else {
+        PhoneGap.exec(successCB, errorCB, "com.phonegap.contacts", "remove", [{ "contact": this}]);
+    }
+};
+/**
+* iOS ONLY
+* displays contact via iOS UI
+*	NOT part of W3C spec so no official documentation
+*
+* @param errorCB error callback
+* @param options object
+*	allowsEditing: boolean AS STRING
+*		"true" to allow editing the contact
+*		"false" (default) display contact
+*/
+Contact.prototype.display = function(errorCB, options) { 
+	if (this.id == null) {
+        if (typeof errorCB == "function") {
+        	var errorObj = new ContactError();
+        	errorObj.code = ContactError.UNKNOWN_ERROR;
+        	errorCB(errorObj);
+		}
+    }
+    else {
+        PhoneGap.exec(null, errorCB, "com.phonegap.contacts","displayContact", [this.id, options]);
+    }
+};
+
+/**
+* Creates a deep copy of this Contact.
+* With the contact ID set to null.
+* @return copy of this Contact
+*/
+Contact.prototype.clone = function() {
+    var clonedContact = PhoneGap.clone(this);
+    clonedContact.id = null;
+    // Loop through and clear out any id's in phones, emails, etc.
+    if (clonedContact.phoneNumbers) {
+    	for (i=0; i<clonedContact.phoneNumbers.length; i++) {
+    		clonedContact.phoneNumbers[i].id = null;
+    	}
+    }
+    if (clonedContact.emails) {
+    	for (i=0; i<clonedContact.emails.length; i++) {
+    		clonedContact.emails[i].id = null;
+    	}
+    }
+    if (clonedContact.addresses) {
+    	for (i=0; i<clonedContact.addresses.length; i++) {
+    		clonedContact.addresses[i].id = null;
+    	}
+    }
+    if (clonedContact.ims) {
+    	for (i=0; i<clonedContact.ims.length; i++) {
+    		clonedContact.ims[i].id = null;
+    	}
+    }
+    if (clonedContact.organizations) {
+    	for (i=0; i<clonedContact.organizations.length; i++) {
+    		clonedContact.organizations[i].id = null;
+    	}
+    }
+    if (clonedContact.photos) {
+    	for (i=0; i<clonedContact.photos.length; i++) {
+    		clonedContact.photos[i].id = null;
+    	}
+    }
+    if (clonedContact.urls) {
+    	for (i=0; i<clonedContact.urls.length; i++) {
+    		clonedContact.urls[i].id = null;
+    	}
+    }
+    return clonedContact;
+};
+
+/**
+* Persists contact to device storage.
+* @param successCB success callback
+* @param errorCB error callback - optional
+*/
+Contact.prototype.save = function(successCB, errorCB) {
+	// don't modify the original contact
+	var cloned = PhoneGap.clone(this);
+	cloned.convertDatesOut(); 
+	PhoneGap.exec(successCB, errorCB, "com.phonegap.contacts","save", [{"contact": cloned}]);
+};
+
+/**
+* Contact name.
+* @param formatted
+* @param familyName
+* @param givenName
+* @param middle
+* @param prefix
+* @param suffix
+*/
+var ContactName = function(formatted, familyName, givenName, middle, prefix, suffix) {
+    this.formatted = formatted != "undefined" ? formatted : null;
+    this.familyName = familyName != "undefined" ? familyName : null;
+    this.givenName = givenName != "undefined" ? givenName : null;
+    this.middleName = middle != "undefined" ? middle : null;
+    this.honorificPrefix = prefix != "undefined" ? prefix : null;
+    this.honorificSuffix = suffix != "undefined" ? suffix : null;
+};
+
+/**
+* Generic contact field.
+* @param type
+* @param value
+* @param pref
+* @param id
+*/
+var ContactField = function(type, value, pref, id) {
+    this.type = type != "undefined" ? type : null;
+    this.value = value != "undefined" ? value : null;
+    this.pref = pref != "undefined" ? pref : null;
+    this.id = id != "undefined" ? id : null;
+};
+
+/**
+* Contact address.
+* @param pref - boolean is primary / preferred address
+* @param type - string - work, home…..
+* @param formatted
+* @param streetAddress
+* @param locality
+* @param region
+* @param postalCode
+* @param country
+*/
+var ContactAddress = function(pref, type, formatted, streetAddress, locality, region, postalCode, country, id) {
+	this.pref = pref != "undefined" ? pref : null;
+	this.type = type != "undefined" ? type : null;
+    this.formatted = formatted != "undefined" ? formatted : null;
+    this.streetAddress = streetAddress != "undefined" ? streetAddress : null;
+    this.locality = locality != "undefined" ? locality : null;
+    this.region = region != "undefined" ? region : null;
+    this.postalCode = postalCode != "undefined" ? postalCode : null;
+    this.country = country != "undefined" ? country : null;
+    this.id = id != "undefined" ? id : null;
+};
+
+/**
+* Contact organization.
+* @param pref - boolean is primary / preferred address
+* @param type - string - work, home…..
+* @param name
+* @param dept
+* @param title
+*/
+var ContactOrganization = function(pref, type, name, dept, title) {
+	this.pref = pref != "undefined" ? pref : null;
+	this.type = type != "undefined" ? type : null;
+    this.name = name != "undefined" ? name : null;
+    this.department = dept != "undefined" ? dept : null;
+    this.title = title != "undefined" ? title : null;
+};
+
+/**
+* Contact account.
+* @param domain
+* @param username
+* @param userid
+*/
+/*var ContactAccount = function(domain, username, userid) {
+    this.domain = domain != "undefined" ? domain : null;
+    this.username = username != "undefined" ? username : null;
+    this.userid = userid != "undefined" ? userid : null;
+}*/
+
+/**
+* Represents a group of Contacts.
+*/
+var Contacts = function() {
+    this.inProgress = false;
+    this.records = new Array();
+};
+/**
+* Returns an array of Contacts matching the search criteria.
+* @param fields that should be searched
+* @param successCB success callback
+* @param errorCB error callback (optional)
+* @param {ContactFindOptions} options that can be applied to contact searching
+* @return array of Contacts matching search criteria
+*/
+Contacts.prototype.find = function(fields, successCB, errorCB, options) {
+	if (successCB === null) {
+        throw new TypeError("You must specify a success callback for the find command.");
+    }
+    if (fields === null || fields === "undefined" || fields.length === "undefined" || fields.length <= 0) {
+    	if (typeof errorCB === "function") {
+			errorCB({"code": ContactError.INVALID_ARGUMENT_ERROR});
+    	}
+    } else {
+		PhoneGap.exec(successCB, errorCB, "com.phonegap.contacts","search", [{"fields":fields, "findOptions":options}]);
+    }
+};
+/**
+* need to turn the array of JSON strings representing contact objects into actual objects
+* @param array of JSON strings with contact data
+* @return call results callback with array of Contact objects
+*  This function is called from objective C Contacts.search() method.
+*/
+Contacts.prototype._findCallback = function(pluginResult) {
+	var contacts = new Array();
+	try {
+		for (var i=0; i<pluginResult.message.length; i++) {
+			var newContact = navigator.contacts.create(pluginResult.message[i]); 
+			newContact.convertDatesIn();
+			contacts.push(newContact);
+		}
+		pluginResult.message = contacts;
+	} catch(e){
+			console.log("Error parsing contacts: " +e);
+	}
+	return pluginResult;
+}
+
+/**
+* need to turn the JSON string representing contact object into actual object
+* @param JSON string with contact data
+* Call stored results function with  Contact object
+*  This function is called from objective C Contacts remove and save methods
+*/
+Contacts.prototype._contactCallback = function(pluginResult)
+{
+	var newContact = null;
+	if (pluginResult.message){
+		try {
+			newContact = navigator.contacts.create(pluginResult.message);
+			newContact.convertDatesIn();
+		} catch(e){
+			console.log("Error parsing contact");
+		}
+	}
+	pluginResult.message = newContact;
+	return pluginResult;
+	
+};
+/** 
+* Need to return an error object rather than just a single error code
+* @param error code
+* Call optional error callback if found.
+* Called from objective c find, remove, and save methods on error.
+*/
+Contacts.prototype._errCallback = function(pluginResult)
+{
+	var errorObj = new ContactError();
+   	errorObj.code = pluginResult.message;
+	pluginResult.message = errorObj;
+	return pluginResult;
+};
+// iPhone only api to create a new contact via the GUI
+Contacts.prototype.newContactUI = function(successCallback) { 
+    PhoneGap.exec(successCallback, null, "com.phonegap.contacts","newContact", []);
+};
+// iPhone only api to select a contact via the GUI
+Contacts.prototype.chooseContact = function(successCallback, options) {
+    PhoneGap.exec(successCallback, null, "com.phonegap.contacts","chooseContact", options);
+};
+
+
+/**
+* This function creates a new contact, but it does not persist the contact
+* to device storage. To persist the contact to device storage, invoke
+* contact.save().
+* @param properties an object who's properties will be examined to create a new Contact
+* @returns new Contact object
+*/
+Contacts.prototype.create = function(properties) {
+    var i;
+    var contact = new Contact();
+    for (i in properties) {
+        if (contact[i] !== 'undefined') {
+            contact[i] = properties[i];
+        }
+    }
+    return contact;
+};
+
+/**
+ * ContactFindOptions.
+ * @param filter used to match contacts against
+ * @param multiple boolean used to determine if more than one contact should be returned
+ */
+var ContactFindOptions = function(filter, multiple, updatedSince) {
+    this.filter = filter || '';
+    this.multiple = multiple || false;
+};
+
+/**
+ *  ContactError.
+ *  An error code assigned by an implementation when an error has occurred
+ */
+var ContactError = function() {
+    this.code=null;
+};
+
+/**
+ * Error codes
+ */
+ContactError.UNKNOWN_ERROR = 0;
+ContactError.INVALID_ARGUMENT_ERROR = 1;
+ContactError.TIMEOUT_ERROR = 2;
+ContactError.PENDING_OPERATION_ERROR = 3;
+ContactError.IO_ERROR = 4;
+ContactError.NOT_SUPPORTED_ERROR = 5;
+ContactError.PERMISSION_DENIED_ERROR = 20;
+
+/**
+ * Add the contact interface into the browser.
+ */
+PhoneGap.addConstructor(function() { 
+    if(typeof navigator.contacts == "undefined") {
+    	navigator.contacts = new Contacts();
+    }
+});
+};
+if (!PhoneGap.hasResource("file")) {
+	PhoneGap.addResource("file");
+
+/**
+ * This class provides generic read and write access to the mobile device file system.
+ * They are not used to read files from a server.
+ */
+
+/**
+ * This class provides some useful information about a file.
+ * This is the fields returned when navigator.fileMgr.getFileProperties() 
+ * is called.
+ */
+FileProperties = function(filePath) {
+    this.filePath = filePath;
+    this.size = 0;
+    this.lastModifiedDate = null;
+}
+/**
+ * Represents a single file.
+ * 
+ * name {DOMString} name of the file, without path information
+ * fullPath {DOMString} the full path of the file, including the name
+ * type {DOMString} mime type
+ * lastModifiedDate {Date} last modified date
+ * size {Number} size of the file in bytes
+ */
+File = function(name, fullPath, type, lastModifiedDate, size) {
+	this.name = name || null;
+    this.fullPath = fullPath || null;
+	this.type = type || null;
+    this.lastModifiedDate = lastModifiedDate || null;
+    this.size = size || 0;
+}
+/**
+ * Create an event object since we can't set target on DOM event.
+ *
+ * @param type
+ * @param target
+ *
+ */
+File._createEvent = function(type, target) {
+    // Can't create event object, since we can't set target (its readonly)
+    //var evt = document.createEvent('Events');
+    //evt.initEvent("onload", false, false);
+    var evt = {"type": type};
+    evt.target = target;
+    return evt;
+};
+
+FileError = function() {
+   this.code = null;
+}
+
+// File error codes
+// Found in DOMException
+FileError.NOT_FOUND_ERR = 1;
+FileError.SECURITY_ERR = 2;
+FileError.ABORT_ERR = 3;
+
+// Added by this specification
+FileError.NOT_READABLE_ERR = 4;
+FileError.ENCODING_ERR = 5;
+FileError.NO_MODIFICATION_ALLOWED_ERR = 6;
+FileError.INVALID_STATE_ERR = 7;
+FileError.SYNTAX_ERR = 8;
+FileError.INVALID_MODIFICATION_ERR = 9;
+FileError.QUOTA_EXCEEDED_ERR = 10;
+FileError.TYPE_MISMATCH_ERR = 11;
+FileError.PATH_EXISTS_ERR = 12;
+
+//-----------------------------------------------------------------------------
+// File manager
+//-----------------------------------------------------------------------------
+
+FileMgr = function() {
+}
+
+FileMgr.prototype.testFileExists = function(fileName, successCallback, errorCallback) {
+    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "testFileExists", [fileName]);
+};
+
+FileMgr.prototype.testDirectoryExists = function(dirName, successCallback, errorCallback) {
+    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "testDirectoryExists", [dirName]);
+};
+
+FileMgr.prototype.getFreeDiskSpace = function(successCallback, errorCallback) {
+    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "getFreeDiskSpace", []);
+};
+
+FileMgr.prototype.write = function(fileName, data, position, successCallback, errorCallback) {
+    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "write", [fileName, data, position]);
+};
+
+FileMgr.prototype.truncate = function(fileName, size, successCallback, errorCallback) {
+    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "truncateFile", [fileName, size]);
+};
+
+FileMgr.prototype.readAsText = function(fileName, encoding, successCallback, errorCallback) {
+    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "readFile", [fileName, encoding]);
+};
+
+FileMgr.prototype.readAsDataURL = function(fileName, successCallback, errorCallback) {
+	PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "readAsDataURL", [fileName]);
+};
+
+PhoneGap.addConstructor(function() {
+    if (typeof navigator.fileMgr === "undefined") {
+        navigator.fileMgr = new FileMgr();
+    }
+});
+
+
+//-----------------------------------------------------------------------------
+// File Reader
+//-----------------------------------------------------------------------------
+
+/**
+ * This class reads the mobile device file system.
+ *
+ */
+FileReader = function() {
+    this.fileName = "";
+
+    this.readyState = 0;
+
+    // File data
+    this.result = null;
+
+    // Error
+    this.error = null;
+
+    // Event handlers
+    this.onloadstart = null;    // When the read starts.
+    this.onprogress = null;     // While reading (and decoding) file or fileBlob data, and reporting partial file data (progess.loaded/progress.total)
+    this.onload = null;         // When the read has successfully completed.
+    this.onerror = null;        // When the read has failed (see errors).
+    this.onloadend = null;      // When the request has completed (either in success or failure).
+    this.onabort = null;        // When the read has been aborted. For instance, by invoking the abort() method.
+}
+
+// States
+FileReader.EMPTY = 0;
+FileReader.LOADING = 1;
+FileReader.DONE = 2;
+
+/**
+ * Abort reading file.
+ */
+FileReader.prototype.abort = function() {
+    var evt;
+    this.readyState = FileReader.DONE;
+    this.result = null;
+
+    // set error
+    var error = new FileError();
+    error.code = error.ABORT_ERR;
+    this.error = error;
+   
+    // If error callback
+    if (typeof this.onerror === "function") {
+        evt = File._createEvent("error", this);
+        this.onerror(evt);
+    }
+    // If abort callback
+    if (typeof this.onabort === "function") {
+        evt = File._createEvent("abort", this);
+        this.onabort(evt);
+    }
+    // If load end callback
+    if (typeof this.onloadend === "function") {
+        evt = File._createEvent("loadend", this);
+        this.onloadend(evt);
+    }
+};
+
+/**
+ * Read text file.
+ *
+ * @param file          The name of the file
+ * @param encoding      [Optional] (see http://www.iana.org/assignments/character-sets)
+ */
+FileReader.prototype.readAsText = function(file, encoding) {
+    this.fileName = "";
+	if (typeof file.fullPath === "undefined") {
+		this.fileName = file;
+	} else {
+		this.fileName = file.fullPath;
+	}
+
+    // LOADING state
+    this.readyState = FileReader.LOADING;
+
+    // If loadstart callback
+    if (typeof this.onloadstart === "function") {
+        var evt = File._createEvent("loadstart", this);
+        this.onloadstart(evt);
+    }
+
+    // Default encoding is UTF-8
+    var enc = encoding ? encoding : "UTF-8";
+
+    var me = this;
+
+    // Read file
+    navigator.fileMgr.readAsText(this.fileName, enc,
+
+        // Success callback
+        function(r) {
+            var evt;
+
+            // If DONE (cancelled), then don't do anything
+            if (me.readyState === FileReader.DONE) {
+                return;
+            }
+
+            // Save result
+            me.result = decodeURIComponent(r);
+
+            // If onload callback
+            if (typeof me.onload === "function") {
+                evt = File._createEvent("load", me);
+                me.onload(evt);
+            }
+
+            // DONE state
+            me.readyState = FileReader.DONE;
+
+            // If onloadend callback
+            if (typeof me.onloadend === "function") {
+                evt = File._createEvent("loadend", me);
+                me.onloadend(evt);
+            }
+        },
+
+        // Error callback
+        function(e) {
+            var evt;
+            // If DONE (cancelled), then don't do anything
+            if (me.readyState === FileReader.DONE) {
+                return;
+            }
+
+            // Save error
+            me.error = e;
+
+            // If onerror callback
+            if (typeof me.onerror === "function") {
+                evt = File._createEvent("error", me);
+                me.onerror(evt);
+            }
+
+            // DONE state
+            me.readyState = FileReader.DONE;
+
+            // If onloadend callback
+            if (typeof me.onloadend === "function") {
+                evt = File._createEvent("loadend", me);
+                me.onloadend(evt);
+            }
+        }
+        );
+};
+
+
+/**
+ * Read file and return data as a base64 encoded data url.
+ * A data url is of the form:
+ *      data:[<mediatype>][;base64],<data>
+ *
+ * @param file          {File} File object containing file properties
+ */
+FileReader.prototype.readAsDataURL = function(file) {
+    this.fileName = "";
+    
+    if (typeof file.fullPath === "undefined") {
+        this.fileName = file;
+    } else {
+        this.fileName = file.fullPath;
+    }
+
+    // LOADING state
+    this.readyState = FileReader.LOADING;
+
+    // If loadstart callback
+    if (typeof this.onloadstart === "function") {
+        var evt = File._createEvent("loadstart", this);
+        this.onloadstart(evt);
+    }
+
+    var me = this;
+
+    // Read file
+    navigator.fileMgr.readAsDataURL(this.fileName,
+
+        // Success callback
+        function(r) {
+            var evt;
+
+            // If DONE (cancelled), then don't do anything
+            if (me.readyState === FileReader.DONE) {
+                return;
+            }
+
+            // Save result
+            me.result = r;
+
+            // If onload callback
+            if (typeof me.onload === "function") {
+                evt = File._createEvent("load", me);
+                me.onload(evt);
+            }
+
+            // DONE state
+            me.readyState = FileReader.DONE;
+
+            // If onloadend callback
+            if (typeof me.onloadend === "function") {
+                evt = File._createEvent("loadend", me);
+                me.onloadend(evt);
+            }
+        },
+
+        // Error callback
+        function(e) {
+            var evt;
+            // If DONE (cancelled), then don't do anything
+            if (me.readyState === FileReader.DONE) {
+                return;
+            }
+
+            // Save error
+            me.error = e;
+
+            // If onerror callback
+            if (typeof me.onerror === "function") {
+                evt = File._createEvent("error", me);
+                me.onerror(evt);
+            }
+
+            // DONE state
+            me.readyState = FileReader.DONE;
+
+            // If onloadend callback
+            if (typeof me.onloadend === "function") {
+                evt = File._createEvent("loadend", me);
+                me.onloadend(evt);
+            }
+        }
+        );
+};
+
+/**
+ * Read file and return data as a binary data.
+ *
+ * @param file          The name of the file
+ */
+FileReader.prototype.readAsBinaryString = function(file) {
+    // TODO - Can't return binary data to browser.
+    this.fileName = file;
+};
+
+/**
+ * Read file and return data as a binary data.
+ *
+ * @param file          The name of the file
+ */
+FileReader.prototype.readAsArrayBuffer = function(file) {
+    // TODO - Can't return binary data to browser.
+    this.fileName = file;
+};
+
+//-----------------------------------------------------------------------------
+// File Writer
+//-----------------------------------------------------------------------------
+
+/**
+ * This class writes to the mobile device file system.
+ *
+  @param file {File} a File object representing a file on the file system
+*/
+FileWriter = function(file) {
+    this.fileName = "";
+    this.length = 0;
+	if (file) {
+	    this.fileName = file.fullPath || file;
+	    this.length = file.size || 0;
+	}
+	
+	// default is to write at the beginning of the file
+    this.position = 0;
+    
+    this.readyState = 0; // EMPTY
+
+    this.result = null;
+
+    // Error
+    this.error = null;
+
+    // Event handlers
+    this.onwritestart = null;	// When writing starts
+    this.onprogress = null;		// While writing the file, and reporting partial file data
+    this.onwrite = null;		// When the write has successfully completed.
+    this.onwriteend = null;		// When the request has completed (either in success or failure).
+    this.onabort = null;		// When the write has been aborted. For instance, by invoking the abort() method.
+    this.onerror = null;		// When the write has failed (see errors).
+}
+
+// States
+FileWriter.INIT = 0;
+FileWriter.WRITING = 1;
+FileWriter.DONE = 2;
+
+/**
+ * Abort writing file.
+ */
+FileWriter.prototype.abort = function() {
+    // check for invalid state
+	if (this.readyState === FileWriter.DONE || this.readyState === FileWriter.INIT) {
+		throw FileError.INVALID_STATE_ERR;
+	} 
+
+    // set error
+    var error = new FileError(), evt;
+    error.code = error.ABORT_ERR;
+    this.error = error;
+    
+    // If error callback
+    if (typeof this.onerror === "function") {
+        evt = File._createEvent("error", this);
+        this.onerror(evt);
+    }
+    // If abort callback
+    if (typeof this.onabort === "function") {
+        evt = File._createEvent("abort", this);
+        this.onabort(evt);
+    }
+    
+    this.readyState = FileWriter.DONE;
+
+    // If write end callback
+    if (typeof this.onwriteend == "function") {
+        evt = File._createEvent("writeend", this);
+        this.onwriteend(evt);
+    }
+};
+
+/**
+ * @Deprecated: use write instead
+ * 
+ * @param file to write the data to
+ * @param text to be written
+ * @param bAppend if true write to end of file, otherwise overwrite the file
+ */
+FileWriter.prototype.writeAsText = function(file, text, bAppend) {
+	// Throw an exception if we are already writing a file
+	if (this.readyState === FileWriter.WRITING) {
+		throw FileError.INVALID_STATE_ERR;
+	}
+
+	if (bAppend !== true) {
+        bAppend = false; // for null values
+    }
+
+    this.fileName = file;
+
+    // WRITING state
+    this.readyState = FileWriter.WRITING;
+
+    var me = this;
+
+    // If onwritestart callback
+    if (typeof me.onwritestart === "function") {
+        var evt = File._createEvent("writestart", me);
+        me.onwritestart(evt);
+    }
+	
+	
+    // Write file 
+	navigator.fileMgr.writeAsText(file, text, bAppend,
+        // Success callback
+        function(r) {
+            var evt;
+
+            // If DONE (cancelled), then don't do anything
+            if (me.readyState === FileWriter.DONE) {
+                return;
+            }
+
+            // Save result
+            me.result = r;
+
+            // If onwrite callback
+            if (typeof me.onwrite === "function") {
+                evt = File._createEvent("write", me);
+                me.onwrite(evt);
+            }
+
+            // DONE state
+            me.readyState = FileWriter.DONE;
+
+            // If onwriteend callback
+            if (typeof me.onwriteend === "function") {
+                evt = File._createEvent("writeend", me);
+                me.onwriteend(evt);
+            }
+        },
+
+        // Error callback
+        function(e) {
+            var evt;
+
+            // If DONE (cancelled), then don't do anything
+            if (me.readyState === FileWriter.DONE) {
+                return;
+            }
+
+            // Save error
+            me.error = e;
+
+            // If onerror callback
+            if (typeof me.onerror === "function") {
+                evt = File._createEvent("error", me);
+                me.onerror(evt);
+            }
+
+            // DONE state
+            me.readyState = FileWriter.DONE;
+
+            // If onwriteend callback
+            if (typeof me.onwriteend === "function") {
+                evt = File._createEvent("writeend", me);
+                me.onwriteend(evt);
+            }
+        }
+    );
+};
+
+/**
+ * Writes data to the file
+ *  
+ * @param text to be written
+ */
+FileWriter.prototype.write = function(text) {
+	// Throw an exception if we are already writing a file
+	if (this.readyState === FileWriter.WRITING) {
+		throw FileError.INVALID_STATE_ERR;
+	}
+
+    // WRITING state
+    this.readyState = FileWriter.WRITING;
+
+    var me = this;
+
+    // If onwritestart callback
+    if (typeof me.onwritestart === "function") {
+        var evt = File._createEvent("writestart", me);
+        me.onwritestart(evt);
+    }
+
+    // Write file
+    navigator.fileMgr.write(this.fileName, text, this.position,
+
+        // Success callback
+        function(r) {
+            var evt;
+            // If DONE (cancelled), then don't do anything
+            if (me.readyState === FileWriter.DONE) {
+                return;
+            }
+
+            
+            // position always increases by bytes written because file would be extended
+            me.position += r;
+			// The length of the file is now where we are done writing.
+			me.length = me.position;
+            
+            // If onwrite callback
+            if (typeof me.onwrite === "function") {
+                evt = File._createEvent("write", me);
+                me.onwrite(evt);
+            }
+
+            // DONE state
+            me.readyState = FileWriter.DONE;
+
+            // If onwriteend callback
+            if (typeof me.onwriteend === "function") {
+                evt = File._createEvent("writeend", me);
+                me.onwriteend(evt);
+            }
+        },
+
+        // Error callback
+        function(e) {
+            var evt;
+
+            // If DONE (cancelled), then don't do anything
+            if (me.readyState === FileWriter.DONE) {
+                return;
+            }
+
+            // Save error
+            me.error = e;
+
+            // If onerror callback
+            if (typeof me.onerror === "function") {
+                evt = File._createEvent("error", me);
+                me.onerror(evt);
+            }
+
+            // DONE state
+            me.readyState = FileWriter.DONE;
+
+            // If onwriteend callback
+            if (typeof me.onwriteend === "function") {
+                evt = File._createEvent("writeend", me);
+                me.onwriteend(evt);
+            }
+        }
+        );
+
+};
+
+/** 
+ * Moves the file pointer to the location specified.
+ * 
+ * If the offset is a negative number the position of the file 
+ * pointer is rewound.  If the offset is greater than the file 
+ * size the position is set to the end of the file.  
+ * 
+ * @param offset is the location to move the file pointer to.
+ */
+FileWriter.prototype.seek = function(offset) {
+    // Throw an exception if we are already writing a file
+    if (this.readyState === FileWriter.WRITING) {
+        throw FileError.INVALID_STATE_ERR;
+    }
+
+    if (!offset) {
+        return;
+    }
+    
+    // See back from end of file.
+    if (offset < 0) {
+		this.position = Math.max(offset + this.length, 0);
+	}
+    // Offset is bigger then file size so set position 
+    // to the end of the file.
+	else if (offset > this.length) {
+		this.position = this.length;
+	}
+    // Offset is between 0 and file size so set the position
+    // to start writing.
+	else {
+		this.position = offset;
+	}	
+};
+
+/** 
+ * Truncates the file to the size specified.
+ * 
+ * @param size to chop the file at.
+ */
+FileWriter.prototype.truncate = function(size) {
+	// Throw an exception if we are already writing a file
+	if (this.readyState === FileWriter.WRITING) {
+		throw FileError.INVALID_STATE_ERR;
+	}
+	// what if no size specified? 
+
+    // WRITING state
+    this.readyState = FileWriter.WRITING;
+
+    var me = this;
+
+    // If onwritestart callback
+    if (typeof me.onwritestart === "function") {
+        var evt = File._createEvent("writestart", me);
+        me.onwritestart(evt);
+    }
+
+    // Write file
+    navigator.fileMgr.truncate(this.fileName, size,
+
+        // Success callback
+        function(r) {
+            var evt;
+            // If DONE (cancelled), then don't do anything
+            if (me.readyState === FileWriter.DONE) {
+                return;
+            }
+
+            // Update the length of the file
+            me.length = r;
+            me.position = Math.min(me.position, r);
+
+            // If onwrite callback
+            if (typeof me.onwrite === "function") {
+                evt = File._createEvent("write", me);
+                me.onwrite(evt);
+            }
+
+            // DONE state
+            me.readyState = FileWriter.DONE;
+
+            // If onwriteend callback
+            if (typeof me.onwriteend === "function") {
+                evt = File._createEvent("writeend", me);
+                me.onwriteend(evt);
+            }
+        },
+
+        // Error callback
+        function(e) {
+            var evt;
+            // If DONE (cancelled), then don't do anything
+            if (me.readyState === FileWriter.DONE) {
+                return;
+            }
+
+            // Save error
+            me.error = e;
+
+            // If onerror callback
+            if (typeof me.onerror === "function") {
+                evt = File._createEvent("error", me);
+                me.onerror(evt);
+            }
+
+            // DONE state
+            me.readyState = FileWriter.DONE;
+
+            // If onwriteend callback
+            if (typeof me.onwriteend === "function") {
+                evt = File._createEvent("writeend", me);
+                me.onwriteend(evt);
+            }
+        }
+    );
+};
+
+LocalFileSystem = function() {
+};
+
+// File error codes
+LocalFileSystem.TEMPORARY = 0;
+LocalFileSystem.PERSISTENT = 1;
+LocalFileSystem.RESOURCE = 2;
+LocalFileSystem.APPLICATION = 3;
+
+/**
+ * Requests a filesystem in which to store application data.
+ * 
+ * @param {int} type of file system being requested
+ * @param {Function} successCallback is called with the new FileSystem
+ * @param {Function} errorCallback is called with a FileError
+ */
+LocalFileSystem.prototype.requestFileSystem = function(type, size, successCallback, errorCallback) {
+	if (type < 0 || type > 3) {
+		if (typeof errorCallback == "function") {
+			errorCallback({
+				"code": FileError.SYNTAX_ERR
+			});
+		}
+	}
+	else {
+		PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "requestFileSystem", [type, size]);
+	}
+};
+
+/**
+ * 
+ * @param {DOMString} uri referring to a local file in a filesystem
+ * @param {Function} successCallback is called with the new entry
+ * @param {Function} errorCallback is called with a FileError
+ */
+LocalFileSystem.prototype.resolveLocalFileSystemURI = function(uri, successCallback, errorCallback) {
+    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "resolveLocalFileSystemURI", [uri]);
+};
+
+/**
+* This function  is required as we need to convert raw 
+* JSON objects into concrete File and Directory objects.  
+* 
+* @param a JSON Objects that need to be converted to DirectoryEntry or FileEntry objects.
+* @returns an entry 
+*/
+LocalFileSystem.prototype._castFS = function(pluginResult) {
+    var entry = null;
+    entry = new DirectoryEntry();
+    entry.isDirectory = pluginResult.message.root.isDirectory;
+    entry.isFile = pluginResult.message.root.isFile;
+    entry.name = pluginResult.message.root.name;
+    entry.fullPath = pluginResult.message.root.fullPath;
+    pluginResult.message.root = entry;
+    return pluginResult;    
+}
+
+LocalFileSystem.prototype._castEntry = function(pluginResult) {
+    var entry = null;
+    if (pluginResult.message.isDirectory) {
+        entry = new DirectoryEntry();
+    }
+    else if (pluginResult.message.isFile) {
+		entry = new FileEntry();
+    }
+    entry.isDirectory = pluginResult.message.isDirectory;
+    entry.isFile = pluginResult.message.isFile;
+    entry.name = pluginResult.message.name;
+    entry.fullPath = pluginResult.message.fullPath;
+    pluginResult.message = entry;
+    return pluginResult;    
+}
+
+LocalFileSystem.prototype._castEntries = function(pluginResult) {
+    var entries = pluginResult.message;
+	var retVal = []; 
+	for (i=0; i<entries.length; i++) {
+		retVal.push(window.localFileSystem._createEntry(entries[i]));
+	}
+    pluginResult.message = retVal;
+    return pluginResult;    
+}
+
+LocalFileSystem.prototype._createEntry = function(castMe) {
+	var entry = null;
+    if (castMe.isDirectory) {
+        entry = new DirectoryEntry();
+    }
+    else if (castMe.isFile) {
+        entry = new FileEntry();
+    }
+    entry.isDirectory = castMe.isDirectory;
+    entry.isFile = castMe.isFile;
+    entry.name = castMe.name;
+    entry.fullPath = castMe.fullPath;
+    return entry;    
+
+}
+
+LocalFileSystem.prototype._castDate = function(pluginResult) {
+	if (pluginResult.message.modificationTime) {
+		var metadataObj = new Metadata();
+		
+	    metadataObj.modificationTime = new Date(pluginResult.message.modificationTime);
+	    pluginResult.message = metadataObj;
+	}
+	else if (pluginResult.message.lastModifiedDate) {
+		var file = new File();
+        file.size = pluginResult.message.size;
+        file.type = pluginResult.message.type;
+        file.name = pluginResult.message.name;
+        file.fullPath = pluginResult.message.fullPath;
+		file.lastModifiedDate = new Date(pluginResult.message.lastModifiedDate);
+	    pluginResult.message = file;		
+	}
+
+    return pluginResult;	
+}
+LocalFileSystem.prototype._castError = function(pluginResult) {
+	var fileError = new FileError();
+	fileError.code = pluginResult.message;
+	pluginResult.message = fileError;
+	return pluginResult;
+}
+
+/**
+ * Information about the state of the file or directory
+ * 
+ * {Date} modificationTime (readonly)
+ */
+Metadata = function() {
+    this.modificationTime=null;
+};
+
+/**
+ * Supplies arguments to methods that lookup or create files and directories
+ * 
+ * @param {boolean} create file or directory if it doesn't exist 
+ * @param {boolean} exclusive if true the command will fail if the file or directory exists
+ */
+Flags = function(create, exclusive) {
+    this.create = create || false;
+    this.exclusive = exclusive || false;
+};
+
+/**
+ * An interface representing a file system
+ * 
+ * {DOMString} name the unique name of the file system (readonly)
+ * {DirectoryEntry} root directory of the file system (readonly)
+ */
+FileSystem = function() {
+    this.name = null;
+    this.root = null;
+};
+
+/**
+ * An interface representing a directory on the file system.
+ * 
+ * {boolean} isFile always false (readonly)
+ * {boolean} isDirectory always true (readonly)
+ * {DOMString} name of the directory, excluding the path leading to it (readonly)
+ * {DOMString} fullPath the absolute full path to the directory (readonly)
+ * {FileSystem} filesystem on which the directory resides (readonly)
+ */
+DirectoryEntry = function() {
+    this.isFile = false;
+    this.isDirectory = true;
+    this.name = null;
+    this.fullPath = null;
+    this.filesystem = null;
+};
+
+/**
+ * Copies a directory to a new location
+ * 
+ * @param {DirectoryEntry} parent the directory to which to copy the entry
+ * @param {DOMString} newName the new name of the entry, defaults to the current name
+ * @param {Function} successCallback is called with the new entry
+ * @param {Function} errorCallback is called with a FileError
+ */
+DirectoryEntry.prototype.copyTo = function(parent, newName, successCallback, errorCallback) {
+    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "copyTo", [this.fullPath, parent, newName]);
+};
+
+/**
+ * Looks up the metadata of the entry
+ * 
+ * @param {Function} successCallback is called with a Metadata object
+ * @param {Function} errorCallback is called with a FileError
+ */
+DirectoryEntry.prototype.getMetadata = function(successCallback, errorCallback) {
+    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "getMetadata", [this.fullPath]);
+};
+
+/**
+ * Gets the parent of the entry
+ * 
+ * @param {Function} successCallback is called with a parent entry
+ * @param {Function} errorCallback is called with a FileError
+ */
+DirectoryEntry.prototype.getParent = function(successCallback, errorCallback) {
+    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "getParent", [this.fullPath]);
+};
+
+/**
+ * Moves a directory to a new location
+ * 
+ * @param {DirectoryEntry} parent the directory to which to move the entry
+ * @param {DOMString} newName the new name of the entry, defaults to the current name
+ * @param {Function} successCallback is called with the new entry
+ * @param {Function} errorCallback is called with a FileError
+ */
+DirectoryEntry.prototype.moveTo = function(parent, newName, successCallback, errorCallback) {
+    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "moveTo", [this.fullPath, parent, newName]);
+};
+
+/**
+ * Removes the entry
+ * 
+ * @param {Function} successCallback is called with no parameters
+ * @param {Function} errorCallback is called with a FileError
+ */
+DirectoryEntry.prototype.remove = function(successCallback, errorCallback) {
+    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "remove", [this.fullPath]);
+};
+
+/**
+ * Returns a URI that can be used to identify this entry.
+ * 
+ * @param {DOMString} mimeType for a FileEntry, the mime type to be used to interpret the file, when loaded through this URI.
+ * @param {Function} successCallback is called with the new entry
+ * @param {Function} errorCallback is called with a FileError
+ */
+DirectoryEntry.prototype.toURI = function(mimeType, successCallback, errorCallback) {
+    return "file://localhost" + this.fullPath;
+    //PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "toURI", [this.fullPath, mimeType]);
+};
+
+/**
+ * Creates a new DirectoryReader to read entries from this directory
+ */
+DirectoryEntry.prototype.createReader = function(successCallback, errorCallback) {
+    return new DirectoryReader(this.fullPath);
+};
+
+/**
+ * Creates or looks up a directory
+ * 
+ * @param {DOMString} path either a relative or absolute path from this directory in which to look up or create a directory
+ * @param {Flags} options to create or excluively create the directory
+ * @param {Function} successCallback is called with the new entry
+ * @param {Function} errorCallback is called with a FileError
+ */
+DirectoryEntry.prototype.getDirectory = function(path, options, successCallback, errorCallback) {
+    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "getDirectory", [this.fullPath, path, options]);
+};
+
+/**
+ * Creates or looks up a file
+ * 
+ * @param {DOMString} path either a relative or absolute path from this directory in which to look up or create a file
+ * @param {Flags} options to create or excluively create the file
+ * @param {Function} successCallback is called with the new entry
+ * @param {Function} errorCallback is called with a FileError
+ */
+DirectoryEntry.prototype.getFile = function(path, options, successCallback, errorCallback) {
+    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "getFile", [this.fullPath, path, options]);
+};
+
+/**
+ * Deletes a directory and all of it's contents
+ * 
+ * @param {Function} successCallback is called with no parameters
+ * @param {Function} errorCallback is called with a FileError
+ */
+DirectoryEntry.prototype.removeRecursively = function(successCallback, errorCallback) {
+    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "removeRecursively", [this.fullPath]);
+};
+
+/**
+ * An interface that lists the files and directories in a directory.
+ */
+DirectoryReader = function(fullPath){
+	this.fullPath = fullPath || null;    
+};
+
+/**
+ * Returns a list of entries from a directory.
+ * 
+ * @param {Function} successCallback is called with a list of entries
+ * @param {Function} errorCallback is called with a FileError
+ */
+DirectoryReader.prototype.readEntries = function(successCallback, errorCallback) {
+    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "readEntries", [this.fullPath]);
+}
+ 
+/**
+ * An interface representing a directory on the file system.
+ * 
+ * {boolean} isFile always true (readonly)
+ * {boolean} isDirectory always false (readonly)
+ * {DOMString} name of the file, excluding the path leading to it (readonly)
+ * {DOMString} fullPath the absolute full path to the file (readonly)
+ * {FileSystem} filesystem on which the directory resides (readonly)
+ */
+FileEntry = function() {
+    this.isFile = true;
+    this.isDirectory = false;
+    this.name = null;
+    this.fullPath = null;
+    this.filesystem = null;
+};
+
+/**
+ * Copies a file to a new location
+ * 
+ * @param {DirectoryEntry} parent the directory to which to copy the entry
+ * @param {DOMString} newName the new name of the entry, defaults to the current name
+ * @param {Function} successCallback is called with the new entry
+ * @param {Function} errorCallback is called with a FileError
+ */
+FileEntry.prototype.copyTo = function(parent, newName, successCallback, errorCallback) {
+    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "copyTo", [this.fullPath, parent, newName]);
+};
+
+/**
+ * Looks up the metadata of the entry
+ * 
+ * @param {Function} successCallback is called with a Metadata object
+ * @param {Function} errorCallback is called with a FileError
+ */
+FileEntry.prototype.getMetadata = function(successCallback, errorCallback) {
+    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "getMetadata", [this.fullPath]);
+};
+
+/**
+ * Gets the parent of the entry
+ * 
+ * @param {Function} successCallback is called with a parent entry
+ * @param {Function} errorCallback is called with a FileError
+ */
+FileEntry.prototype.getParent = function(successCallback, errorCallback) {
+    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "getParent", [this.fullPath]);
+};
+
+/**
+ * Moves a directory to a new location
+ * 
+ * @param {DirectoryEntry} parent the directory to which to move the entry
+ * @param {DOMString} newName the new name of the entry, defaults to the current name
+ * @param {Function} successCallback is called with the new entry
+ * @param {Function} errorCallback is called with a FileError
+ */
+FileEntry.prototype.moveTo = function(parent, newName, successCallback, errorCallback) {
+    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "moveTo", [this.fullPath, parent, newName]);
+};
+
+/**
+ * Removes the entry
+ * 
+ * @param {Function} successCallback is called with no parameters
+ * @param {Function} errorCallback is called with a FileError
+ */
+FileEntry.prototype.remove = function(successCallback, errorCallback) {
+    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "remove", [this.fullPath]);
+};
+
+/**
+ * Returns a URI that can be used to identify this entry.
+ * 
+ * @param {DOMString} mimeType for a FileEntry, the mime type to be used to interpret the file, when loaded through this URI.
+ * @param {Function} successCallback is called with the new entry
+ * @param {Function} errorCallback is called with a FileError
+ */
+FileEntry.prototype.toURI = function(mimeType, successCallback, errorCallback) {
+    return "file://localhost" + this.fullPath;
+    //PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "toURI", [this.fullPath, mimeType]);
+};
+
+/**
+ * Creates a new FileWriter associated with the file that this FileEntry represents.
+ * 
+ * @param {Function} successCallback is called with the new FileWriter
+ * @param {Function} errorCallback is called with a FileError
+ */
+FileEntry.prototype.createWriter = function(successCallback, errorCallback) {
+	this.file(function(filePointer) {	
+		var writer = new FileWriter(filePointer);
+		if (writer.fileName == null || writer.fileName == "") {
+			if (typeof errorCallback == "function") {
+				errorCallback({
+					"code": FileError.INVALID_STATE_ERR
+				});
+		}
+		}
+		if (typeof successCallback == "function") {
+			successCallback(writer);
+		}       
+	}, errorCallback);
+};
+
+/**
+ * Returns a File that represents the current state of the file that this FileEntry represents.
+ * 
+ * @param {Function} successCallback is called with the new File object
+ * @param {Function} errorCallback is called with a FileError
+ */
+FileEntry.prototype.file = function(successCallback, errorCallback) {
+    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "getFileMetadata", [this.fullPath]);
+};
+
+/**
+ * Add the FileSystem interface into the browser.
+ */
+PhoneGap.addConstructor(function() {
+	var pgLocalFileSystem = new LocalFileSystem();
+	// Needed for cast methods
+    if(typeof window.localFileSystem == "undefined") window.localFileSystem  = pgLocalFileSystem;
+    if(typeof window.requestFileSystem == "undefined") window.requestFileSystem  = pgLocalFileSystem.requestFileSystem;
+    if(typeof window.resolveLocalFileSystemURI == "undefined") window.resolveLocalFileSystemURI = pgLocalFileSystem.resolveLocalFileSystemURI;
+});
+};
+
+
+
+
+/*
+ * Copyright (c) 2011, Matt Kane
+ */
+
+if (!PhoneGap.hasResource("filetransfer")) {
+	PhoneGap.addResource("filetransfer");
+
+/**
+ * FileTransfer uploads a file to a remote server.
+ */
+FileTransfer = function() {}
+
+/**
+ * FileUploadResult
+ */
+FileUploadResult = function() {
+    this.bytesSent = 0;
+    this.responseCode = null;
+    this.response = null;
+}
+
+/**
+ * FileTransferError
+ */
+FileTransferError = function(errorCode) {
+    this.code = errorCode || null;
+}
+
+FileTransferError.FILE_NOT_FOUND_ERR = 1;
+FileTransferError.INVALID_URL_ERR = 2;
+FileTransferError.CONNECTION_ERR = 3;
+
+/**
+* Given an absolute file path, uploads a file on the device to a remote server 
+* using a multipart HTTP request.
+* @param filePath {String}           Full path of the file on the device
+* @param server {String}             URL of the server to receive the file
+* @param successCallback (Function}  Callback to be invoked when upload has completed
+* @param errorCallback {Function}    Callback to be invoked upon error
+* @param options {FileUploadOptions} Optional parameters such as file name and mimetype           
+*/
+FileTransfer.prototype.upload = function(filePath, server, successCallback, errorCallback, options) {
+	if(!options.params) {
+		options.params = {};
+	}
+	options.filePath = filePath;
+	options.server = server;
+	if(!options.fileKey) {
+		options.fileKey = 'file';
+	}
+	if(!options.fileName) {
+		options.fileName = 'image.jpg';
+	}
+	if(!options.mimeType) {
+		options.mimeType = 'image/jpeg';
+	}
+	
+	// successCallback required
+	if (typeof successCallback != "function") {
+        console.log("FileTransfer Error: successCallback is not a function");
+        return;
+    }
+
+
+    // errorCallback optional
+    if (errorCallback && (typeof errorCallback != "function")) {
+        console.log("FileTransfer Error: errorCallback is not a function");
+        return;
+    }
+	
+    PhoneGap.exec(successCallback, errorCallback, 'com.phonegap.filetransfer', 'upload', [options]);
+};
+
+FileTransfer.prototype._castTransferError = function(pluginResult) {
+	var fileError = new FileTransferError(pluginResult.message);
+	//fileError.code = pluginResult.message;
+	pluginResult.message = fileError;
+	return pluginResult;
+}
+
+FileTransfer.prototype._castUploadResult = function(pluginResult) {
+	var result = new FileUploadResult();
+	result.bytesSent = pluginResult.message.bytesSent;
+	result.responseCode = pluginResult.message.responseCode;
+	result.response = decodeURIComponent(pluginResult.message.response);
+	pluginResult.message = result;
+	return pluginResult;
+}
+
+/**
+ * Downloads a file form a given URL and saves it to the specified directory.
+ * @param source {String}          URL of the server to receive the file
+ * @param target {String}         Full path of the file on the device
+ * @param successCallback (Function}  Callback to be invoked when upload has completed
+ * @param errorCallback {Function}    Callback to be invoked upon error
+ */
+FileTransfer.prototype.download = function(source, target, successCallback, errorCallback) {
+	PhoneGap.exec(successCallback, errorCallback, 'com.phonegap.filetransfer', 'download', [source, target]);
+};
+
+/**
+ * Options to customize the HTTP request used to upload files.
+ * @param fileKey {String}   Name of file request parameter.
+ * @param fileName {String}  Filename to be used by the server. Defaults to image.jpg.
+ * @param mimeType {String}  Mimetype of the uploaded file. Defaults to image/jpeg.
+ * @param params {Object}    Object with key: value params to send to the server.
+ */
+FileUploadOptions = function(fileKey, fileName, mimeType, params) {
+    this.fileKey = fileKey || null;
+    this.fileName = fileName || null;
+    this.mimeType = mimeType || null;
+    this.params = params || null;
+}
+
+
+PhoneGap.addConstructor(function() {
+    if (typeof navigator.fileTransfer == "undefined") navigator.fileTransfer = new FileTransfer();
+});
+};
+if (!PhoneGap.hasResource("geolocation")) {
+	PhoneGap.addResource("geolocation");
+
+/**
+ * This class provides access to device GPS data.
+ * @constructor
+ */
+Geolocation = function() {
+    // The last known GPS position.
+    this.lastPosition = null;
+    this.listener = null;
+    this.timeoutTimerId = 0;
+
+};
+
+
+/**
+ * Asynchronously aquires the current position.
+ * @param {Function} successCallback The function to call when the position
+ * data is available
+ * @param {Function} errorCallback The function to call when there is an error 
+ * getting the position data.
+ * @param {PositionOptions} options The options for getting the position data
+ * such as timeout.
+ * PositionOptions.forcePrompt:Bool default false, 
+ * - tells iPhone to prompt the user to turn on location services.
+ * - may cause your app to exit while the user is sent to the Settings app
+ * PositionOptions.distanceFilter:double aka Number
+ * - used to represent a distance in meters.
+PositionOptions
+{
+   desiredAccuracy:Number
+   - a distance in meters 
+		< 10   = best accuracy  ( Default value )
+		< 100  = Nearest Ten Meters
+		< 1000 = Nearest Hundred Meters
+		< 3000 = Accuracy Kilometers
+		3000+  = Accuracy 3 Kilometers
+		
+	forcePrompt:Boolean default false ( iPhone Only! )
+    - tells iPhone to prompt the user to turn on location services.
+	- may cause your app to exit while the user is sent to the Settings app
+	
+	distanceFilter:Number
+	- The minimum distance (measured in meters) a device must move laterally before an update event is generated.
+	- measured relative to the previously delivered location
+	- default value: null ( all movements will be reported )
+	
+}
+
+ */
+ 
+Geolocation.prototype.getCurrentPosition = function(successCallback, errorCallback, options) 
+{
+    // create an always valid local success callback
+    var win = successCallback;
+    if (!win || typeof(win) != 'function')
+    {
+        win = function(position) {};
+    }
+    
+    // create an always valid local error callback
+    var fail = errorCallback;
+    if (!fail || typeof(fail) != 'function')
+    {
+        fail = function(positionError) {};
+    }	
+
+    var self = this;
+    var totalTime = 0;
+	var timeoutTimerId;
+	
+	// set params to our default values
+	var params = new PositionOptions();
+	
+    if (options) 
+    {
+        if (options.maximumAge) 
+        {
+            // special case here if we have a cached value that is younger than maximumAge
+            if(this.lastPosition)
+            {
+                var now = new Date().getTime();
+                if((now - this.lastPosition.timestamp) < options.maximumAge)
+                {
+                    win(this.lastPosition); // send cached position immediately 
+                    return;                 // Note, execution stops here -jm
+                }
+            }
+            params.maximumAge = options.maximumAge;
+        }
+        if (options.enableHighAccuracy) 
+        {
+            params.enableHighAccuracy = (options.enableHighAccuracy == true); // make sure it's truthy
+        }
+        if (options.timeout) 
+        {
+            params.timeout = options.timeout;
+        }
+    }
+
+    var successListener = win;
+    var failListener = fail;
+    if (!this.locationRunning)
+    {
+        successListener = function(position)
+        { 
+            win(position);
+            self.stop();
+        };
+        errorListener = function(positionError)
+        { 
+            fail(positionError);
+            self.stop();
+        };
+    }
+    
+    this.listener = {"success":successListener,"fail":failListener};
+    this.start(params);
+	
+	var onTimeout = function()
+	{
+	    self.setError(new PositionError(PositionError.TIMEOUT,"Geolocation Error: Timeout."));
+	};
+
+    clearTimeout(this.timeoutTimerId);
+    this.timeoutTimerId = setTimeout(onTimeout, params.timeout); 
+};
+
+/**
+ * Asynchronously aquires the position repeatedly at a given interval.
+ * @param {Function} successCallback The function to call each time the position
+ * data is available
+ * @param {Function} errorCallback The function to call when there is an error 
+ * getting the position data.
+ * @param {PositionOptions} options The options for getting the position data
+ * such as timeout and the frequency of the watch.
+ */
+Geolocation.prototype.watchPosition = function(successCallback, errorCallback, options) {
+	// Invoke the appropriate callback with a new Position object every time the implementation 
+	// determines that the position of the hosting device has changed. 
+
+	var self = this; // those == this & that
+	
+	var params = new PositionOptions();
+
+    if(options)
+    {
+        if (options.maximumAge) {
+            params.maximumAge = options.maximumAge;
+        }
+        if (options.enableHighAccuracy) {
+            params.enableHighAccuracy = options.enableHighAccuracy;
+        }
+        if (options.timeout) {
+            params.timeout = options.timeout;
+        }
+    }
+
+	var that = this;
+    var lastPos = that.lastPosition? that.lastPosition.clone() : null;
+    
+	var intervalFunction = function() {
+        
+		var filterFun = function(position) {
+            if (lastPos == null || !position.equals(lastPos)) {
+                // only call the success callback when there is a change in position, per W3C
+                successCallback(position);
+            }
+            
+            // clone the new position, save it as our last position (internal var)
+            lastPos = position.clone();
+        };
+		
+		that.getCurrentPosition(filterFun, errorCallback, params);
+	};
+	
+    // Retrieve location immediately and schedule next retrieval afterwards
+	intervalFunction();
+	
+	return setInterval(intervalFunction, params.timeout);
+};
+
+
+/**
+ * Clears the specified position watch.
+ * @param {String} watchId The ID of the watch returned from #watchPosition.
+ */
+Geolocation.prototype.clearWatch = function(watchId) {
+	clearInterval(watchId);
+};
+
+/**
+ * Called by the geolocation framework when the current location is found.
+ * @param {PositionOptions} position The current position.
+ */
+Geolocation.prototype.setLocation = function(position) 
+{
+    var _position = new Position(position.coords, position.timestamp);
+
+    if(this.timeoutTimerId)
+    {
+        clearTimeout(this.timeoutTimerId);
+        this.timeoutTimerId = 0;
+    }
+    
+	this.lastError = null;
+    this.lastPosition = _position;
+    
+    if(this.listener && typeof(this.listener.success) == 'function')
+    {
+        this.listener.success(_position);
+    }
+    
+    this.listener = null;
+};
+
+/**
+ * Called by the geolocation framework when an error occurs while looking up the current position.
+ * @param {String} message The text of the error message.
+ */
+Geolocation.prototype.setError = function(error) 
+{
+	var _error = new PositionError(error.code, error.message);
+
+    this.locationRunning = false
+	
+    if(this.timeoutTimerId)
+    {
+        clearTimeout(this.timeoutTimerId);
+        this.timeoutTimerId = 0;
+    }
+    
+    this.lastError = _error;
+    // call error handlers directly
+    if(this.listener && typeof(this.listener.fail) == 'function')
+    {
+        this.listener.fail(_error);
+    }
+    this.listener = null;
+
+};
+
+Geolocation.prototype.start = function(positionOptions) 
+{
+    PhoneGap.exec(null, null, "com.phonegap.geolocation", "startLocation", [positionOptions]);
+    this.locationRunning = true
+
+};
+
+Geolocation.prototype.stop = function() 
+{
+    PhoneGap.exec(null, null, "com.phonegap.geolocation", "stopLocation", []);
+    this.locationRunning = false
+};
+
+
+PhoneGap.addConstructor(function() 
+{
+    if (typeof navigator._geo == "undefined") 
+    {
+        // replace origObj's functions ( listed in funkList ) with the same method name on proxyObj
+        // this is a workaround to prevent UIWebView/MobileSafari default implementation of GeoLocation
+        // because it includes the full page path as the title of the alert prompt
+        var __proxyObj = function (origObj,proxyObj,funkList)
+        {
+            var replaceFunk = function(org,proxy,fName)
+            { 
+                org[fName] = function()
+                { 
+                   return proxy[fName].apply(proxy,arguments); 
+                }; 
+            };
+
+            for(var v in funkList) { replaceFunk(origObj,proxyObj,funkList[v]);}
+        }
+        navigator._geo = new Geolocation();
+        __proxyObj(navigator.geolocation, navigator._geo,
+                 ["setLocation","getCurrentPosition","watchPosition",
+                  "clearWatch","setError","start","stop"]);
+
+    }
+
+});
+};
+if (!PhoneGap.hasResource("compass")) {
+	PhoneGap.addResource("compass");
+
+CompassError = function(){
+   this.code = null;
+};
+
+// Capture error codes
+CompassError.COMPASS_INTERNAL_ERR = 0;
+CompassError.COMPASS_NOT_SUPPORTED = 20;
+
+CompassHeading = function() {
+	this.magneticHeading = null;
+	this.trueHeading = null;
+	this.headingAccuracy = null;
+	this.timestamp = null;
+}	
+/**
+ * This class provides access to device Compass data.
+ * @constructor
+ */
+Compass = function() {
+    /**
+     * List of compass watch timers
+     */
+    this.timers = {};
+};
+
+/**
+ * Asynchronously acquires the current heading.
+ * @param {Function} successCallback The function to call when the heading
+ * data is available
+ * @param {Function} errorCallback The function to call when there is an error 
+ * getting the heading data.
+ * @param {PositionOptions} options The options for getting the heading data (not used).
+ */
+Compass.prototype.getCurrentHeading = function(successCallback, errorCallback, options) {
+ 	// successCallback required
+    if (typeof successCallback !== "function") {
+        console.log("Compass Error: successCallback is not a function");
+        return;
+    }
+
+    // errorCallback optional
+    if (errorCallback && (typeof errorCallback !== "function")) {
+        console.log("Compass Error: errorCallback is not a function");
+        return;
+    }
+
+    // Get heading
+    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.geolocation", "getCurrentHeading", []);
+};
+
+/**
+ * Asynchronously acquires the heading repeatedly at a given interval.
+ * @param {Function} successCallback The function to call each time the heading
+ * data is available
+ * @param {Function} errorCallback The function to call when there is an error 
+ * getting the heading data.
+ * @param {HeadingOptions} options The options for getting the heading data
+ * such as timeout and the frequency of the watch.
+ */
+Compass.prototype.watchHeading= function(successCallback, errorCallback, options) 
+{
+	// Default interval (100 msec)
+    var frequency = (options !== undefined) ? options.frequency : 100;
+
+    // successCallback required
+    if (typeof successCallback !== "function") {
+        console.log("Compass Error: successCallback is not a function");
+        return;
+    }
+
+    // errorCallback optional
+    if (errorCallback && (typeof errorCallback !== "function")) {
+        console.log("Compass Error: errorCallback is not a function");
+        return;
+    }
+
+    // Start watch timer to get headings
+    var id = PhoneGap.createUUID();
+    navigator.compass.timers[id] = setInterval(
+        function() {
+            PhoneGap.exec(successCallback, errorCallback, "com.phonegap.geolocation", "getCurrentHeading", [{repeats: 1}]);
+        }, frequency);
+
+    return id;
+};
+
+
+/**
+ * Clears the specified heading watch.
+ * @param {String} watchId The ID of the watch returned from #watchHeading.
+ */
+Compass.prototype.clearWatch = function(id) 
+{
+	// Stop javascript timer & remove from timer list
+    if (id && navigator.compass.timers[id]) {
+        clearInterval(navigator.compass.timers[id]);
+        delete navigator.compass.timers[id];
+    }
+    if (navigator.compass.timers.length == 0) {
+    	// stop the 
+    	PhoneGap.exec(null, null, "com.phonegap.geolocation", "stopHeading", []);
+    }
+};
+
+/** iOS only
+ * Asynchronously fires when the heading changes from the last reading.  The amount of distance 
+ * required to trigger the event is specified in the filter paramter.
+ * @param {Function} successCallback The function to call each time the heading
+ * data is available
+ * @param {Function} errorCallback The function to call when there is an error 
+ * getting the heading data.
+ * @param {HeadingOptions} options The options for getting the heading data
+ * 			@param {filter} number of degrees change to trigger a callback with heading data (float)
+ *
+ * In iOS this function is more efficient than calling watchHeading  with a frequency for updates.
+ * Only one watchHeadingFilter can be in effect at one time.  If a watchHeadingFilter is in effect, calling
+ * getCurrentHeading or watchHeading will use the existing filter value for specifying heading change. 
+  */
+Compass.prototype.watchHeadingFilter = function(successCallback, errorCallback, options) 
+{
+ 
+ 	if (options === undefined || options.filter === undefined) {
+ 		console.log("Compass Error:  options.filter not specified");
+ 		return;
+ 	}
+
+    // successCallback required
+    if (typeof successCallback !== "function") {
+        console.log("Compass Error: successCallback is not a function");
+        return;
+    }
+
+    // errorCallback optional
+    if (errorCallback && (typeof errorCallback !== "function")) {
+        console.log("Compass Error: errorCallback is not a function");
+        return;
+    }
+    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.geolocation", "watchHeadingFilter", [options]);
+}
+Compass.prototype.clearWatchFilter = function() 
+{
+    	PhoneGap.exec(null, null, "com.phonegap.geolocation", "stopHeading", []);
+};
+
+PhoneGap.addConstructor(function() 
+{
+    if (typeof navigator.compass == "undefined") 
+    {
+        navigator.compass = new Compass();
+    }
+});
+};
+
+if (!PhoneGap.hasResource("media")) {
+	PhoneGap.addResource("media");
+
+/**
+ * List of media objects.
+ * PRIVATE
+ */
+PhoneGap.mediaObjects = {};
+
+/**
+ * Object that receives native callbacks.
+ * PRIVATE
+ */
+PhoneGap.Media = function() {};
+
+
+/**
+ * Get the media object.
+ * PRIVATE
+ *
+ * @param id            The media object id (string)
+ */
+PhoneGap.Media.getMediaObject = function(id) {
+    return PhoneGap.mediaObjects[id];
+};
+
+/**
+ * Audio has status update.
+ * PRIVATE
+ *
+ * @param id            The media object id (string)
+ * @param msg           The status message (int)
+ * @param value        The status code (int)
+ */
+PhoneGap.Media.onStatus = function(id, msg, value) {
+    var media = PhoneGap.mediaObjects[id];
+
+    // If state update
+    if (msg == Media.MEDIA_STATE) {
+        if (value == Media.MEDIA_STOPPED) {
+            if (media.successCallback) {
+                media.successCallback();
+            }
+        }
+        if (media.statusCallback) {
+            media.statusCallback(value);
+        }
+    }
+    else if (msg == Media.MEDIA_DURATION) {
+        media._duration = value;
+    }
+    else if (msg == Media.MEDIA_ERROR) {
+        if (media.errorCallback) {
+            media.errorCallback(value);
+        }
+    }
+    else if (msg == Media.MEDIA_POSITION) {
+    	media._position = value;
+    }
+};
+
+/**
+ * This class provides access to the device media, interfaces to both sound and video
+ *
+ * @param src                   The file name or url to play
+ * @param successCallback       The callback to be called when the file is done playing or recording.
+ *                                  successCallback() - OPTIONAL
+ * @param errorCallback         The callback to be called if there is an error.
+ *                                  errorCallback(int errorCode) - OPTIONAL
+ * @param statusCallback        The callback to be called when media status has changed.
+ *                                  statusCallback(int statusCode) - OPTIONAL
+ * @param positionCallback      The callback to be called when media position has changed.
+ *                                  positionCallback(long position) - OPTIONAL
+ */
+Media = function(src, successCallback, errorCallback, statusCallback, positionCallback) {
+
+    // successCallback optional
+    if (successCallback && (typeof successCallback != "function")) {
+        console.log("Media Error: successCallback is not a function");
+        return;
+    }
+
+    // errorCallback optional
+    if (errorCallback && (typeof errorCallback != "function")) {
+        console.log("Media Error: errorCallback is not a function");
+        return;
+    }
+
+    // statusCallback optional
+    if (statusCallback && (typeof statusCallback != "function")) {
+        console.log("Media Error: statusCallback is not a function");
+        return;
+    }
+
+    // positionCallback optional -- NOT SUPPORTED
+    if (positionCallback && (typeof positionCallback != "function")) {
+        console.log("Media Error: positionCallback is not a function");
+        return;
+    }
+
+    this.id = PhoneGap.createUUID();
+    PhoneGap.mediaObjects[this.id] = this;
+    this.src = src;
+    this.successCallback = successCallback;
+    this.errorCallback = errorCallback;
+    this.statusCallback = statusCallback;
+    this.positionCallback = positionCallback;
+    this._duration = -1;
+    this._position = -1;
+};
+
+// Media messages
+Media.MEDIA_STATE = 1;
+Media.MEDIA_DURATION = 2;
+Media.MEDIA_POSITION = 3;
+Media.MEDIA_ERROR = 9;
+
+// Media states
+Media.MEDIA_NONE = 0;
+Media.MEDIA_STARTING = 1;
+Media.MEDIA_RUNNING = 2;
+Media.MEDIA_PAUSED = 3;
+Media.MEDIA_STOPPED = 4;
+Media.MEDIA_MSG = ["None", "Starting", "Running", "Paused", "Stopped"];
+
+// TODO: Will MediaError be used?
+/**
+ * This class contains information about any Media errors.
+ * @constructor
+ */
+
+MediaError = function() {
+	this.code = null,
+	this.message = "";
+}
+
+MediaError.MEDIA_ERR_ABORTED        = 1;
+MediaError.MEDIA_ERR_NETWORK        = 2;
+MediaError.MEDIA_ERR_DECODE         = 3;
+MediaError.MEDIA_ERR_NONE_SUPPORTED = 4;
+
+/**
+ * Start or resume playing audio file.
+ */
+Media.prototype.play = function(options) {
+    PhoneGap.exec(null, null, "com.phonegap.media", "play", [this.id, this.src, options]);
+};
+
+/**
+ * Stop playing audio file.
+ */
+Media.prototype.stop = function() {
+    PhoneGap.exec(null, null, "com.phonegap.media","stop", [this.id, this.src]);
+};
+
+/**
+ * Pause playing audio file.
+ */
+Media.prototype.pause = function() {
+    PhoneGap.exec(null, null, "com.phonegap.media","pause", [this.id, this.src]);
+};
+
+/**
+ * Seek or jump to a new time in the track..
+ */
+Media.prototype.seekTo = function(milliseconds) {
+    PhoneGap.exec(null, null, "com.phonegap.media", "seekTo", [this.id, this.src, milliseconds]);
+};
+
+/**
+ * Get duration of an audio file.
+ * The duration is only set for audio that is playing, paused or stopped.
+ *
+ * @return      duration or -1 if not known.
+ */
+Media.prototype.getDuration = function() {
+    return this._duration;
+};
+
+/**
+ * Get position of audio.
+ *
+ * @return
+ */
+Media.prototype.getCurrentPosition = function(successCB, errorCB) {
+	var errCallback = (errorCB == undefined || errorCB == null) ? null : errorCB;
+    PhoneGap.exec(successCB, errorCB, "com.phonegap.media", "getCurrentPosition", [this.id, this.src]);
+};
+
+// iOS only.  prepare/load the audio in preparation for playing
+Media.prototype.prepare = function(successCB, errorCB) {
+	PhoneGap.exec(successCB, errorCB, "com.phonegap.media", "prepare", [this.id, this.src]);
+}
+
+/**
+ * Start recording audio file.
+ */
+Media.prototype.startRecord = function() {
+    PhoneGap.exec(null, null, "com.phonegap.media","startAudioRecord", [this.id, this.src]);
+};
+
+/**
+ * Stop recording audio file.
+ */
+Media.prototype.stopRecord = function() {
+    PhoneGap.exec(null, null, "com.phonegap.media","stopAudioRecord", [this.id, this.src]);
+};
+
+/**
+ * Release the resources.
+ */
+Media.prototype.release = function() {
+    PhoneGap.exec(null, null, "com.phonegap.media","release", [this.id, this.src]);
+};
+
+};
+if (!PhoneGap.hasResource("notification")) {
+	PhoneGap.addResource("notification");
+
+/**
+ * This class provides access to notifications on the device.
+ */
+Notification = function() {
+};
+
+/**
+ * Open a native alert dialog, with a customizable title and button text.
+ *
+ * @param {String} message              Message to print in the body of the alert
+ * @param {Function} completeCallback   The callback that is called when user clicks on a button.
+ * @param {String} title                Title of the alert dialog (default: Alert)
+ * @param {String} buttonLabel          Label of the close button (default: OK)
+ */
+Notification.prototype.alert = function(message, completeCallback, title, buttonLabel) {
+    var _title = title;
+    if (title == null || typeof title === 'undefined') {
+        _title = "Alert";
+    }
+    var _buttonLabel = (buttonLabel || "OK");
+    PhoneGap.exec(completeCallback, null, "com.phonegap.notification", "alert", [message,{ "title": _title, "buttonLabel": _buttonLabel}]);
+};
+
+/**
+ * Open a native confirm dialog, with a customizable title and button text.
+ * The result that the user selects is returned to the result callback.
+ *
+ * @param {String} message              Message to print in the body of the alert
+ * @param {Function} resultCallback     The callback that is called when user clicks on a button.
+ * @param {String} title                Title of the alert dialog (default: Confirm)
+ * @param {String} buttonLabels         Comma separated list of the labels of the buttons (default: 'OK,Cancel')
+ */
+Notification.prototype.confirm = function(message, resultCallback, title, buttonLabels) {
+    var _title = (title || "Confirm");
+    var _buttonLabels = (buttonLabels || "OK,Cancel");
+    this.alert(message, resultCallback, _title, _buttonLabels);
+};
+
+/**
+ * Causes the device to blink a status LED.
+ * @param {Integer} count The number of blinks.
+ * @param {String} colour The colour of the light.
+ */
+Notification.prototype.blink = function(count, colour) {
+// NOT IMPLEMENTED	
+};
+
+Notification.prototype.vibrate = function(mills) {
+	PhoneGap.exec(null, null, "com.phonegap.notification", "vibrate", []);
+};
+
+Notification.prototype.beep = function(count, volume) {
+	// No Volume yet for the iphone interface
+	// We can use a canned beep sound and call that
+	new Media('beep.wav').play();
+};
+
+PhoneGap.addConstructor(function() {
+    if (typeof navigator.notification == "undefined") navigator.notification = new Notification();
+});
+};
+if (!PhoneGap.hasResource("orientation")) {
+	PhoneGap.addResource("orientation");
+
+/**
+ * This class provides access to the device orientation.
+ * @constructor
+ */
+Orientation  = function() {
+	/**
+	 * The current orientation, or null if the orientation hasn't changed yet.
+	 */
+	this.currentOrientation = null;
+}
+
+/**
+ * Set the current orientation of the phone.  This is called from the device automatically.
+ * 
+ * When the orientation is changed, the DOMEvent \c orientationChanged is dispatched against
+ * the document element.  The event has the property \c orientation which can be used to retrieve
+ * the device's current orientation, in addition to the \c Orientation.currentOrientation class property.
+ *
+ * @param {Number} orientation The orientation to be set
+ */
+Orientation.prototype.setOrientation = function(orientation) {
+    Orientation.currentOrientation = orientation;
+    var e = document.createEvent('Events');
+    e.initEvent('orientationChanged', 'false', 'false');
+    e.orientation = orientation;
+    document.dispatchEvent(e);
+};
+
+/**
+ * Asynchronously aquires the current orientation.
+ * @param {Function} successCallback The function to call when the orientation
+ * is known.
+ * @param {Function} errorCallback The function to call when there is an error 
+ * getting the orientation.
+ */
+Orientation.prototype.getCurrentOrientation = function(successCallback, errorCallback) {
+	// If the position is available then call success
+	// If the position is not available then call error
+};
+
+/**
+ * Asynchronously aquires the orientation repeatedly at a given interval.
+ * @param {Function} successCallback The function to call each time the orientation
+ * data is available.
+ * @param {Function} errorCallback The function to call when there is an error 
+ * getting the orientation data.
+ */
+Orientation.prototype.watchOrientation = function(successCallback, errorCallback) {
+	// Invoke the appropriate callback with a new Position object every time the implementation 
+	// determines that the position of the hosting device has changed. 
+	this.getCurrentPosition(successCallback, errorCallback);
+	return setInterval(function() {
+		navigator.orientation.getCurrentOrientation(successCallback, errorCallback);
+	}, 10000);
+};
+
+/**
+ * Clears the specified orientation watch.
+ * @param {String} watchId The ID of the watch returned from #watchOrientation.
+ */
+Orientation.prototype.clearWatch = function(watchId) {
+	clearInterval(watchId);
+};
+
+Orientation.install = function()
+{
+    if (typeof navigator.orientation == "undefined") { 
+		navigator.orientation = new Orientation();
+	}
+	
+	var windowDispatchAvailable = !(window.dispatchEvent === undefined); // undefined in iOS 3.x
+	if (windowDispatchAvailable) {
+		return;
+	} 
+	
+	// the code below is to capture window.add/remove eventListener calls on window
+	// this is for iOS 3.x where listening on 'orientationchange' events don't work on document/window (don't know why)
+	// however, window.onorientationchange DOES handle the 'orientationchange' event (sent through document), so...
+	// then we multiplex the window.onorientationchange event (consequently - people shouldn't overwrite this)
+	
+	var self = this;
+	var orientationchangeEvent = 'orientationchange';
+	var newOrientationchangeEvent = 'orientationchange_pg';
+	
+	// backup original `window.addEventListener`, `window.removeEventListener`
+    var _addEventListener = window.addEventListener;
+    var _removeEventListener = window.removeEventListener;
+
+	window.onorientationchange = function() {
+		PhoneGap.fireEvent(newOrientationchangeEvent, window);
+	}
+	
+    // override `window.addEventListener`
+    window.addEventListener = function() {
+        if (arguments[0] === orientationchangeEvent) {
+			arguments[0] = newOrientationchangeEvent; 
+		} 
+													
+		if (!windowDispatchAvailable) {
+			return document.addEventListener.apply(this, arguments);
+		} else {
+			return _addEventListener.apply(this, arguments);
+		}
+    };	
+
+    // override `window.removeEventListener'
+    window.removeEventListener = function() {
+        if (arguments[0] === orientationchangeEvent) {
+			arguments[0] = newOrientationchangeEvent; 
+		} 
+		
+		if (!windowDispatchAvailable) {
+			return document.removeEventListener.apply(this, arguments);
+		} else {
+			return _removeEventListener.apply(this, arguments);
+		}
+    };	
+};
+
+PhoneGap.addConstructor(Orientation.install);
+
+};
+if (!PhoneGap.hasResource("sms")) {
+	PhoneGap.addResource("sms");
+
+/**
+ * This class provides access to the device SMS functionality.
+ * @constructor
+ */
+Sms = function() {
+
+}
+
+/**
+ * Sends an SMS message.
+ * @param {Integer} number The phone number to send the message to.
+ * @param {String} message The contents of the SMS message to send.
+ * @param {Function} successCallback The function to call when the SMS message is sent.
+ * @param {Function} errorCallback The function to call when there is an error sending the SMS message.
+ * @param {PositionOptions} options The options for accessing the GPS location such as timeout and accuracy.
+ */
+Sms.prototype.send = function(number, message, successCallback, errorCallback, options) {
+	// not sure why this is here when it does nothing????
+};
+
+PhoneGap.addConstructor(function() {
+    if (typeof navigator.sms == "undefined") navigator.sms = new Sms();
+});
+};
+if (!PhoneGap.hasResource("telephony")) {
+	PhoneGap.addResource("telephony");
+
+/**
+ * This class provides access to the telephony features of the device.
+ * @constructor
+ */
+Telephony = function() {
+	
+}
+
+/**
+ * Calls the specifed number.
+ * @param {Integer} number The number to be called.
+ */
+Telephony.prototype.call = function(number) {
+	// not sure why this is here when it does nothing????
+};
+
+PhoneGap.addConstructor(function() {
+    if (typeof navigator.telephony == "undefined") navigator.telephony = new Telephony();
+});
+};if (!PhoneGap.hasResource("network")) {
+	PhoneGap.addResource("network");
+
+// //////////////////////////////////////////////////////////////////
+
+Connection = function() {
+	/*
+	 * One of the connection constants below.
+	 */
+	this.type = Connection.UNKNOWN;
+
+	/* initialize from the extended DeviceInfo properties */
+    try {      
+		this.type	= DeviceInfo.connection.type;
+    } 
+	catch(e) {
+    }
+};
+
+Connection.UNKNOWN = "unknown"; // Unknown connection type
+Connection.ETHERNET = "ethernet";
+Connection.WIFI = "wifi";
+Connection.CELL_2G = "2g"; // the default for iOS, for any cellular connection
+Connection.CELL_3G = "3g";
+Connection.CELL_4G = "4g";
+Connection.NONE = "none"; // NO connectivity
+
+
+PhoneGap.addConstructor(function() {
+    if (typeof navigator.network == "undefined") navigator.network = {};
+    if (typeof navigator.network.connection == "undefined") navigator.network.connection = new Connection();
+});
+
+};if (!PhoneGap.hasResource("splashscreen")) {
+	PhoneGap.addResource("splashscreen");
+
+/**
+ * This class provides access to the splashscreen
+ */
+SplashScreen = function() {
+};
+
+SplashScreen.prototype.show = function() {
+    PhoneGap.exec(null, null, "com.phonegap.splashscreen", "show", []);
+};
+
+SplashScreen.prototype.hide = function() {
+    PhoneGap.exec(null, null, "com.phonegap.splashscreen", "hide", []);
+};
+
+PhoneGap.addConstructor(function() {
+    if (typeof navigator.splashscreen == "undefined") navigator.splashscreen = new SplashScreen();
+});
+
+};
diff --git a/apps/files_odfviewer/src/webodf/programs/android/libs/phonegap-1.4.1.jar b/apps/files_odfviewer/src/webodf/programs/android/libs/phonegap-1.4.1.jar
new file mode 100644
index 0000000000000000000000000000000000000000..a30e0218e2b672d8aecb49513a2f7d243a01e276
GIT binary patch
literal 155233
zcmagFbC54xmn__;`?PJ_wr$(CZQHhO+qQpg+uf(F)7JNVbLXA7^UjTXD{B9jQIWOR
zj*84$xfG;9enSBPK>z`zY6=Me{cjf}&~G4FQ58X2NjWk4?<pW4h5v*?0Hyo`g;VNb
z)&B=>{m(-AXZ;scR!~k-OjKEgPFCzu7BDR%O-r``D@{u^3z%zGVpwM0KXC#GBRSGY
z$jnNp0!95IrTrV@(U}vige<M3?2=0*cro)A<}jAVH5mrhRTd`31s2vfRyG!Z%7Oz8
z<)nnl^O*F+;@RoZ`Co*9{)5o}M*Sb=KtRU!w)Fp^{6F6g_CFC07WQ_g=7tXc7bxPt
zLk%4)|1WT)e}|h{+L-<q9^yatxjriz`r)5#mqr5uBKUW_ps}&3jf|zUi>aNd6P>Y*
zp|f+WI=D~D3Fc3Kr>_qQLfS8pd5Pp`gx}@^BN#}qVZW0FNYw6+9x`$8+|OVoETpSD
z6m%%mYC$)vG(=5F4O^D!F6*jW+uYW*YTY(W-LHQ<Z>LRliC#W-9_!5e=U#Wsf81Xw
z0+d%Y_%9s#n@_){4~9cuivq5J-5}N}_oadRuE<}b2>AC$(fIL3gz>JDlEZypQTi@M
ziS=xrjufxZ0OLF!+wqYeL(#HLyGNsDm@i(9@)6I_90Ud06W%)W{BzPxE7tY%r{jV+
z5Bm-H<VO+s`on7{pB3PHcf}Yl-i<nA<h>dPqS5H+(-+x9FWP$B=i}}7xcq(5<suI+
zJRVviyhr1h9EXF=O&+uH&5k3{wn6tj2z><mqQCZDjA`_+g46G#0@QguWJ7)g+WaZ@
zUGe=w*grL5@TafH@p{e&<#}H-gUTyA4L6!DMxm<I2Dg@VHr92t{rTXr(%055H%czX
z#=^!_SyNkGSEAKf*=rUhMl9-dwRReEm{o`U$$xY|?G^4wg{^Bv7Im<Xyds0LA5EwV
z6R_EkC#MYNrAV?Oix}7pMUfU>m6(m%v>ih;UCl~p@nBn1-7@amp3JtXY_TF56O7i%
z+)<#!gvipo6)BLU(x^G2qSPrks*7w<($&$UG@dG3t7|=)JGlV4pIsL7F!c;agqmB~
zvnJvZn{xHgVryw*Tt$f0J29zIy9ZqgM3$m0MBgE)HBn+oYUWCYZVLt`%xF})X7p6S
zlk;5)P1c1LhY)1vmC13xvdgq`)fiGs#Hgb$Rx>UEiw&5T^tMuC!imqJt_vRC=UE~w
zN?j$Dg?&tT?A>T^<5aUmlsQ)LqFA*eR5>LmsE2z<doRdqi!~lRsM1=tE4hNyX)vP1
zK~nYJ$4<qRn>>~cV6fF|8iIx#)<DHA&DKTtt!7RH<wsyka7a#|^>Z*&Qa9!qqCNP`
zyR#pe88aX~=z10&t(ZMcZ8O37$?D0tzGAi^?CPT!G8#IwcstCYmQ0bQ9lHhRg(Ax8
zB<q4p&D-LR)WrN)nt+LT@k~fMF<+ia;)Kc*7-lDwvC?y;Nres-qsS|Ac(}nj4SkF>
zm_c0@qn`9=Wu!@pM_V73ApzOZ83T1y@Yd!{lsI~<#3nVP#oPwwDeKJ=nN$ms*rWp{
zYZ1DY%NhwK@%HJY%AuGA#q$a`>J4}LB#9Yc!4sM)M6vJZU*3NSsAK3C<PT{UqrA~U
zhu!i%vWqG`=BpsjYw%L4okwHA=)eV$vtVh^8-xU+1EL!j1$ePweDGc{EX2dX`x)-g
z{3M0N>czqMBBfzJp|DZCfp^*Ntb2?NsOw7C#9`?d&U8Vt9clw-7|tEEYF63~%SQSF
z)fCT(e#HX&1;>J=6%Gc!!1ToLDRnL&uMXTAc-?t}_z&R2>I9`iAvcxO1j65u|MEvG
z{XQJjhy8@b_quZj`5EAc-Hz-=k$cT3VY{QhA3DDBwB6q;`exgvW%?%G?+5-i-zO$Z
zQwp0Zq)rj$L@kTicL7N^OfA%zvZaWB@Jg8*K-;*7KF4?%SWc8?dy8`*h6*hXwdM~V
zGOok`q{P$S(ELsU(lr6Nq3NSTX?2C0Q0{$cX98z0IS^vPjGE$UtCs>Cj3hjpCQEog
zn_MetSmnvn6}K9y-VduTOlMkQpMsBB-A8DfWvO)5n~aiTr9%kl#aKy1gVouZBQ%0t
zm)n~78V5$sRU~gp3mr7DXdkonA>%TRy$GU_(a_`PEt?4GF(ErYF=FSW=$=pD?b&@p
zX|8`HYos>bRrP-KWI3!BrThUg<TT!it(gt`C#$RV6*bkmJylIqzM!2%?)$kom%bNC
zU3VJS_;oOq(ea5|4&zbsF5k=NW$c7U>4CoV?ssu64f9}NvBAs3KAD}Pj*iv34~)C{
zsj9{7WdQOm3fY9t#QZ22b6ua9n$e5%V#B5}NpWLm^Q=1NVahk)$<7k6=GRg^@X*pv
zxfe<FL+c@OQ@wcf4dY_G)E4@$T@AZ<>Z`_4yp5^9>s9xJtoaP$T`79aen_WD$lZho
zR&_%T4qyPdze1o7&Rqu(G3Q~*0n!27`<G$l4e+~qug_L~f<wp$q&(nqfMEQS31Lut
z;<F;4)QrH#SA;4dY{nQCca09At$}YVX}f}BoH%4)(%w68sfY2u10G1m-HBWDWa$zG
z(K;@Qe7Gbu<mHn#X-v?Du$fdklFls7<78B)<vrZbg!O<-{yKna5`Q1~+l!G>0XXuk
z1ODJhD(I}_jh@V=auPqMGmGh;1;=-ad~wio5OFX6s$G68jsVLK24C<RmV1&HKAe8!
zBT#pIGY7&y$c{sqc`O$-xg4HN<L+y2fQ+lm2;^F3P&|=?y7*nHN7Pp@2JbcTdgw7<
z;m+T1hsZk=TtSDay$~s#(A#gMCKo-W;N>k2jN#Dgdq#BVH+`a%=y`YmYsqW{fi1aG
z*vD4bXgSBf27`h*ZfV>MqdUP%;Om-V&a*Vcg7CAOp`1-L()8#zLorF8qL|~k&S}>j
zlqPz8<7mehqM(^2*A$ndo!%IT@cW27Vack6RO+Z4!tqZ&2k#C^U1`RIQ%@R!s9rXM
zu3kNObLaP-tg2$HvX(rmg{zm1%C?JV=kuP3&=BfOE?SdsN?~)R9C4Tm6YKfI1eyXh
zP+$w7FvVPBrqIKGoWka@z!YJu7a}1@^+K}|$G;>LE>WItN=`5Dey<(@o%OB<6#EqL
z$H#i0=8tB-;_MEuydtbofb)YqR=lxn7eF;?&Wy@lux!gjw^vAQ7g;$}cOht7zS&w~
z+Nn=FhFhJyEBV>$2HH}^bgPoz6pFr7T{`B&eeGb#W5Zaj0kPBm$>tTLCXQH~#c1X&
zd$BVk(-Zx8+bz#!)H*1GJL+5mXp$}w3srBY&^D8p8$L*%FI_T{^^#LAr(5LI7Vk*S
zaV?NqPHcePaPBK<|2d15;m+?$%+rvMMd@{H&ArYiY%96W>Em(XbbldL%*z$wW|U(?
zf6C={gQsMNUmOUp*c_%|jc)+(L}hy5jI#9q_6A=L<ILP-7+2Fg$dZ}VE?6`0G?sfw
z$Lc5J6@i9>uh6NJIXN8fn%PG^gs>AQdmA@%+M;gW`Q15-r?Q&L6WS~dcfb>Roq<l_
zh$Ey5mp5`~rvfb(P>{8uzBB~P9SyoFcdttm!FBGNg=@;$68DSJ$|LKPe^}}Rc;^90
z>YnNHj{1tEzDc=f?885}!ye8-Jlu9TvSQFR#xfM!=3|kY-74H>mcs(Ga^$(vvbu+x
zL5zAU_%Zw`(B~c42l(xt?d(>e+8x}(-fGO7oe^(oo4SQ{`_lYybpqdFDD!+6088~Y
zv33U4&d?y*s_mFPbJgIBT1yJ<AP8@j%e}vCUEQl(wwa#?6rav<Dyg5G>72*Hp4oXS
z8GeLYrc2A(HL)r4XT2@ATJRTBzF6RG4x`V^-9gZ#idB@8QJ7PqL?@%ZXM@C>Lh0*-
zit*e26t)9oEoQWqBlpcb-Ch=C<)Vzt<_qrtqm|UE$8k4+jIP~z8kZyT+FL@TIukIX
z34-Eij^cQ!MG*AHG+h*NbWa$CVy;LczB@CFlDQgdDU8aQ8U?@?M0_(jh{k&{3%YZm
z1;w~shp%_$H|u;h?(*i3+pDg<jqgPoQkLKfkD4Jp`e<3FZ#axF7`@;@%;#(0|M{14
z|6gW<ULBbI;~$SQ^^X?+M>7A1w*N2XF6iL!FO?kaue^f$vr9J9D@&)K1Z4*C+hm<B
z^kSKaQg~CTKtUTURfrv&{hYLybOv@(7Jn8U&Q<sx)J}MmGJ9HO42Tdkb7EwCEbr!I
z*ZKD48UCvI+S_h1rK~Y&?kvyQum6#||IyoL?k!j6^LF|SNGICAb0KQSv;*~p;<Y3w
z0b9CpJhrt%U2r}2!=c}TkCY={je+957s@U2`xmHik-x%V1HvYGL^#Se-Fvtx&*7L1
zPu0GhAU|2e7ZY4WFCO}c`P9UBP0U;;qx_Yd!Wgn0&43-KeAG83Xt>BvOVC{OHzs@D
zs3E4l198BPoe$z%q;7x70E&p#V0!5N9P}Y5D1Fp-1h)R5BBnm-7hdCCM$8eD9K<^*
zCi%`QgB&CXQ_%)>7Pts=(SA!1v(a?=v_w8CpnlRrbc_?S?nDgGpeEs<qH3SEZ^P#8
z0=cvqld+q30e>DTM~gx_zGW8H`p1mc5Q1ymMXOg#2@pE--Q`h_xkRkhQ^$yBpFnUa
z?8RZKXl1RcozGUVBHF4^VwarCV3Zif#*A2bDV^2W<(kd4iH!_t+hJIw^5ik9wOz4=
zAS)WPF2<V~rL`>zb$@v}?pudZ-(pHpGfq1kqX;Ms9hJ!7GDPkwBqee&7Go?X={R?1
zDG7CNdsa|fT&z)18mq>!ZyHBhUe%D1XAy5TQ6lfOaH>W(ONXpRViUGOTxk_)M!PA+
zc3NKcvXc}cUGA~p=MwVuTDL;Tq{f{uqV(+v@3bUyFXsagV18<y(^GDq_lq>Knw>|A
zP}!aHrjN}eBDtlEA)DnuQ$^d!`37eR(yK7njcbKfP?R~QT5-3oN@$q{Wp^KH30;<_
zMP0Q~PDiZPt|axcTLaTEj~`ic@I^J6B9Eq{Lr(uLSC3de@jd8M9@3(z5#JIkzC`4l
z$v$HR#{eo8w<lsxX`%^4GgobgsAb|3XO2D25D-t>DIUK%TCxq^ZHVx<>z$M#9eTGC
zel197715|L!d<QAh`&ZEIK1?b6@|Do)ls<T+EutG+f_moi;of{?2u*=E_ws&t2DxB
zuk65em&jnI92sFlSKX#Ws~c{&aJx?~JltBR6X`2H?0&^#=8?Ou3bFiKv+yT&_}Nm;
za6MZ|tVLX&VQpv-$F5q%2j3pqveoDg1g=W;6M;YJ-WZjCkQ=E?exf2Kzv>m!ukH~2
zwKPiqV2zXGoRg#S6?PX@(Zd}@qjv*P`AX|Ye)K~19l$R|LC>N%ntyk;Kx^xlZ0Y1{
zgCjq{Uqr5w@fsb{nVb)e>W>=uh5b$EG;Bg)9Jsl<($U!4>MJ`>Z*XYe<anrGdOM$i
z=AXP<4U6$R%zr*Y?2B;6{*<s~<o5Pz<*SgV>+?MTulXT~J0@h8SznZXSMeU+rRtS@
zb?IQJI^EI>-bO;hgA+YDBnghn?Yvt_OC{&MDl%N!V2As@Ekyxsq1I-9bZGU$Xzdz>
z*)Dbmzo$J^=RSK>*7ePYlXA^=FDl)&e^b2ufGIS38LuvnDrRG~skGBn*xXvYJLF<o
zg&d80Xf+|EI*MijF}6k$B#hN&t(;?U_PwcNB9)&pqSJXzfq*|NNAehT8b@|6rmAQo
zlW}mjEsm9EgyrVK=&8bDpDL;(*_EX1DH@owxvI;f(pB_HW8|XMUU`)gy?G8q188u;
zmO>$K)WVv?jO?!&ZDoHrh2l{GUE1jjq&=R;NhnWP9M%<<{L5JAtXY&1ro7_S7!hVB
zkGQdGi&ZYfZVSitA?2a$eCGU+%T)3eD|q+cc`(`{bbmA#cl64t=Vk(vvfm9nA!`)-
z4Eb{_Y7zO^NfeScTM{dc=7vI+GY}<5I4S#PZFJe3_}2)c(`W+VYz^smh&BMawC6#{
z%pPWP1tb?Q+`+|wwM@Zt!47LChtfv&{Zv~oG1*#TkkYhfQ_PN~2=Jb~o|3Gw=Ky!9
zyu7TjumE?hJUV$}(*f?Cvht0r9!!-IL<kS_b$}F<>T36_(WzQ~^CD}I<~Z;!^%Z5N
za^F=*y~}TW4z!k0x&0|b0H>Jy^c_Z=0o(JDX!jggLAJe5L7E+X*$C_1!)+M++C8a1
z@0J(MnQ<@XG)5Q!TjD!L{-NP^2!&dc5Q`zZ`RzEBm2PZ#1K1qHyEw*6aZC@yg&0MS
zdS_emARiRG-Jn?<20*7^v;tcDYCnHaO-scno=++-*e&-sZ!0r^2`5-gkCIgQt%q*<
zWJTE-$$8FL5A3_~s>@bY_o`hd$xxne*e6yY$V%#_Kr6Kd?Dn%+qrvsJx+l8X-5?PE
zEfHHQrp|TkAwlrPQiWrU!!kGSQ>i&(fsO6F>IWH}l9{7|+cI@(RJ?_T69zF~rxGDf
zkZB*2eQs_UWh)=>Q5LEt4#Djv44(^vvhA+x(=5vk(c`-#V3Fnh>Ht=-eeNqwK)Zb|
zSI`$U&CKCQP~}ypk17A7halaxw2_A$8;2hoFgrUl!?xahQrrw{<Q7j<`m@G#W=T`E
zft8|Po#|{Jws{O~=@EqY%r{qU*%91yXD3Rx8z^ONS~-_GC_8?Tz_SQri8jn3-L-h5
zyU1ht3-PF7$q^qOE2CQ!#s^gxKOl~@=3Uyb;Fqt(h+G-vRLB$a5~Gr1$*V#Sw&Yc4
z==hrxkH|7_xcojT9~%7~<}2IHA+sg>cdYjv{#A-pgSyj!;AF7xq6-hn%y4nbzM&-{
zUSd_FKGb0VZ0J_Tjqth{v>O7R?lLB!#8kwwbISyQ74}=$H8GZH9WAMqdla>R6^1CS
z_yUa;=S6udX+;v%>lD);TLG%_>s*m*BugmXKP6$MNyw01hehO?6lR>1PGA#`NzB=M
z`y}gnni1FJ>-?H1Tis-eOBxlYn$O|URhU!Nkf+NPo~*LEp<a1sQ|NRH#ivhqzWGZ_
zf|7*V2e!|3T(N06T^r>MUNSo>V2CnIKcA0MT&C4InYwBHY*Y}za$6MN_7jx-g#&BJ
z8onj_P5z}7`R;N^b*!OweY4-OL{?G|Vhg*n2By&SwJq;Q)V@F9|6MMPH7<d4!T<qn
zVgUi+{|~w3YGP?GVQ6P!^Iv}#H6cAzR#3m~&6u?D5W+|hAP`7GNRne!Wr&a<r3oMd
z8z8LCi64_-WXuj}AXZmPSG(GaYJ)Uvsmo|nfTw<swnlfiw5m0_HM`zgRj<-X{Cw;J
zrU51accwSpFWb&@esi2JN1gKcelP<tjRT?44Qp|}bS8%N$moY3ZddMvTN<AOk<*R?
zfx&RwheL!s`$NGTSBG+dK<yLvfxxZfmk5yd>6!53LqqVJl)YlOtCT%)ob{ujVh<TQ
zy!InVaJR|xWVg@x(8<?CknWTBaky=oe*VOP^5eS}+_?@0+&L-1yyS$l(h~aPeNmk0
zLHT=T&d=?*be)Pp`s3YcxX;BvbsP`Xpg3;M9x~MTRGq$?f%=of44qH0S-muKKkD$k
z$%7ZCBUsLl;G8c-IQyvsTFxHYaQ7P7^k1vv^}mlFbS*1ha5~09U+&4dzpsR-zYj<B
z@7ck>Z-&5M!$Urm5B)60#p!Cs^uYPj_WUOgkioxcEkDQOem3v<e@$PEkpkbO&0MIp
zj@5&8S#uE)>KAnD4eXw&w_6uB3}6^@W8J@5r&S%~skO#`%);rr3&e^DX9*lB#Do>H
zXmbVkvikB42CUXTuds;q_8D}~7W?s?$6hHH8_sldU|6M70KZ9!U<(tvdPmda5FW<J
z+=VS6x3j(i_f7av>8SOo4RkU5Aq`ig?F(2%yWS}YRjbba%xV#7P=2ac73S-V1F22K
z!=GUw1c@%S8n`5f&ywCMa}^^N(brECd@`u$Hgo2{sL)((ERs#{@}p4mqylf9Q(wA?
zcl!XYZgE(qcWwXOHDM^Vs3`2CRjVFLv$<ONB<eE=#3+jHAN{s9vIq9<VW(4tG5LqB
zRe83e2J51%$upA#&0&G-Th{6<&5V97g!r%jdK_|&`yc0DrJM-!LeO7U95s%bUS6qE
zF~&*(32+63z6WvFfwOpE0${>v%BbcH^Ch9gh5K%SHmY5M2A`E*^a&@_iCC~<vd$vV
zm5Bx0#EojSIBMON`RAED>=2rbmd&e}mFd4yPKv+P>ai4+?d5SowL)0>%fcjGU}{mK
zY8JVI3F#r(upaUPRfV)Mt9AK!nT8V$^tn=F&<-;fxa2E;2<+rEmfC9I#?(PE<=Cc+
zrRwKyUqUA-_Dg?6m@CiOnNzjuP{>hP+O(r-V#0*92o~{RK1?`r<z&Xp=;T>M&m#qw
z4L3u>ABVI=_*;mu&ZEV$T59{`JT<3XSZxGxrNk$IEU)1pQCjbs!h-nhW$RC$D#c=2
zs(y9pfeGoki+RalummOpR>8g&^k|#U(Jpz~#~5*7bH6?M99@4G7s}Z--V85Hau#bL
zDb9!5*}+KWL$Mt;!{otK$_bM9K=F;D0yi9$2+>1!Pbh_mYM^ch)l+n!a-(dIWlo^6
zfwmu6L*1k_<gOc{yNPl*qzCbK=o>s>Iz<NQc1Rl>THZ1~A;^JtJGKX9JGSa{9VZAo
zo6d4ZDa_YKAa)2H#;S}^BwC{vqaL6cUlGY8z7+`|8jo_6)hg@SilRti9hE}nBI<SU
z6+5k$%D;|lHdI%WV{8{iKz7I@igpMiB8MuBka&(=6ceK`W`-e-B5{f4ltxtIP$)$b
zl|?Fv%A|LjCdqT&D2jyUc#4z~Rapor(pp^=sUb3t$dDB(gJ%$#MQ*q;iX%FYZqQ^<
zCMHlOO;1ImhYAfU=-y`yqzT+D3N#`vjOzJzZ_=Go9^z1H=l;FJ8$`g%#!EjF_w}nE
zThC9Por5?nlyT`X8txg5vOqYaGV0@q_aw{=3W~nR3>;EM6Pa>~@<61(loK_G(rwJa
zB+@0`Wx7tPxPUJ=O%<^-^K^i()q#QEz4;yLQx+kE8z0Lt6Bv;w>~Ss*dr0#Pu4>ou
zzO0}TO;0ryroQ!en?dIo7OB%OV<I#8r-DzelBW9aMFN%cx`bs!Y&4xlM}@EJV-#E9
zgCP?`Q`SZNloDTE4NqkV9nAZemU)l&#Pn}-yuYKDH8NQznV0q66e(+M;;`+OTSQ*(
zrP8&(d=u5x@)}pYX6y=*Mbpo4yV_MZVq-0ImzTFY99Od1+D_S?yU<pq7i&q<S?H24
zNu^1n^+ldQho)JPS`#p^Gi4UiB(d0-dIxKdb+p~G!Wf$`X}l)0(gRl*GUH`z*(&^`
zwg}d|&>1SMlyJ+L!_pjfK&K-zRH`8_V{DK!vIwINqs77o)bvH3W0YqjOk99*w}ugG
z+l8SqL)%%Dml7n+(U&%;$i#`cQ&`zAVFjE{=OLB<6tviVY92tZwqU=IlvMUUMJi=O
zrPUL3J}8^2yCY#+XDZ&W^zqRScvNu(H&C8u0B{lwh_Fk+Tt8{b?o!<l_h!&IOzT4b
z`4$5KQ<-b7k0ja#bgu57=FI#a#}iU}AlU+uslW)R;E1Yu0%^brOI@;&vkf=oufYH7
z=rTOz2shq|5!%d%_t=n$FiH?ed-q5^9~~gbSDoJB7IXnWsA%rWec8lorw+r(ov5y8
z87WxV;uK*h!Y}8sP5hLrI3@>E{C;0Io}2y4*M&dMbNl9RE+gad(~)32H-D;vApgyM
z$9Ng=_|p+se76EP8mS_G&^@EfA94HKT6|u-7ZF@zpTqSM&$i->p1ygmRknab5WE)@
zUw@}4AM;XTSy?isfTYg*FP|HEZUX>xGq{3R!K|7^bfHWTT%ivTDtJPyw*wG-K?I*)
z>dvSO&RMpOpL_(-n`yODSv@SfZmdxpv}au;dD^_KG$ZP?Lga~y1~t|~n5u>OaZSlE
z7s5&O4^_=5tVVeK5wO#ifFFADQ78xC7IADPIi?C7Lwy`m(Vn4*&p;;E;KkV3p9PE8
zh=@%&h;|61zrqw~qT!D)+#HDDtPM}?K2iwB2La=eB&eYX$0I?ylg$ZTFe#pdlN+Tc
zv~L^iR%L#Uu2=@>h7lcKI5mcW93!$iQkpEFx}q0x106B@6(ilju+3F}NIOUCInz*g
zAeq3Iobx!r43Ccd3c3pp6f8DGBnJ}-(r2MZc<Zh8PFwk&;E(^Da0QCRLAg{z{OnPQ
z);{ENi`tmNmj44Uh^^Rr?>o|t8*Q!!Zk1#2Y)^(sbf-J)OA|xT%e9t|X1_J-scv^%
zM;As>28U82F5Zib?lksJ^8}+gI?BtH6z*aQjiI)xj*z^n&=8k3Vfz`*(6;vhS)DH3
zoF4hO=NGyD#W>FkCm3mEHE$SK^29m{5mDItcd|XU1Z;4Y+S0&2^Kc}02EAM1FLy=(
zcV>j!vf&$JuT5d}-8qF%xIHp&S85tlFw26QMJTlt!!SEg=zAMS4SKRM!{uF<6*#4Z
z;P7T_$7DP>_Ur>kOm(DwnXD1y;m+;^+YNMmK>BXf+?+P~ju|dY`aP2bqkwGOJUM(Z
zg193Zo**S2Yp+;W8IGwVCsZagtUT1)Yt*zO>q+`9z3fCI@@lZSVsqaRa{#C<R|{3x
zn5!zv(Pyxw5|1!t-U+E!Uf?@0XMcnxN13#up#p0u1#7KhRJ~K$C~{{PPZQ7`E=Kw|
ze*1KZiLwe`s7{l<MV5&I+|fgi5T+h!?@<p={Q`D9xu#JP<#0&{3=}b+VdR#Kv<`N=
zh$zxoTU9yZv&w3PeEV2-$tPN=NA{(=LePss+)HweqM?+Mp;j@G9c<_#Y0aRygHGAZ
zb|N{nl8F~oTvZW9)}sAgc*z6en}3XtPtr*Hz_GT$1Fb<-ukhI=)7!44m!a`C^qZw#
zgYvbfrH!O4qK%0N+CvEI<lP(Dme10i+|nI)_^6E{7c=MsV;;3wQl|Gh!0kQ{8_;zK
zh+52`G--SFdPy4ads+Ol<RKT}n{?JRfqH|$Kh`vPpkeYn&Ej!qF2~@pj}lk2%|g#*
zipqM)r|QcBKbb$0RuSqubrxlX8lgdn-l#xuPWsfbo>I1c?_7<kM_QWOGl*m*=?*+A
zA#0xW%=Gqzp_MOabrpK<#Za`IoQ*21#Xlm~cq(1dIK>%)a`%Rz2Ipm#yltEvhG+z`
zTZkZPL{Jt%<}rdai##QXo?#=+iS@?xxB08-*cWMkj`qRE+(4*q-{T=ComM?Md}E3l
znwY90M``Bv+*i}GOrfTfpvs~MJ{HM}VnSOM^(49CqNNjoSW}kNT2tno@fVq_@y}RJ
z=4nk%RT2i*yQ0Wfyb){m66;MXV-4|C7Y3aKV?<s`Nczp<pE|m!g<wo0=cH=0tgsBr
zE-SM4jZ_Ks)G^%?157EEH%Try1Lt~wAZ!x)!pElbJFC2py4fG^E1YBhVF)+G<oh?!
z(0_M5Q0QVEaqvJu{)9k4c>hP&qhMp``7hJcssWjydgAHVzj2d0ZP*QS8K5VS1KU|c
z7x9My8U~K}2mn+>gm=RWgMKrnyUr3BX|ZXwI8xTuVYC>wOaTdu9xJ^pwiHHECfi&g
zYhx?B=)!2(?6%Oe$9b0536ef2p8vq}Xn*$eWAD9p`$MPi{UJREtU>YtGO@2h>vnLt
z=_8zNujc!vCLm64{YY#3EtcKCa=Nwonaj3!f6)CaX0#HhFZ>p~0j2)WUsZm+rSDtU
zIrx@0Lm=w=uDEZ)fm3|f_prEc$^fvQgK_?kdov*Zq4=-YNc^87ZvQIv&uaXivSk04
zBYt2HX#U58Gq2+mwx7xwf6GT`TffSg`j)p=_<l%&n7#MAy<ap#_Fu2~_}}WNpZxs0
ztKYagFI=h!uOh%2v$9Hpy(Np}s#SZGUmCU4tedYDVXv+#)v^Qh#=u4s8n$CAhqRdZ
z36M;T1cI3;30#>t36xB#*_N9!Yr@QbclFPEpSa#z_029GX!>)?+w=8T`tS=jkQPri
z{4$HDoxhv{XU|mokG>zLL#f&Z>0?#r1mmxg$aWTMKD0lX^vTiROat|Yx>^*@qFq`v
zvPm~-o+g>{b*_@7eVVq(ssBXW?5=2oX{$pA?QjEj%sA}G!iPXQWoS5EIt^^JsWN9W
zC%3_v^V)w0y5e5z)@plsd2{_<B*i$Rfq`jzhIf0q%W9kz`gza8^S0x7>|1>T!M)x+
z3mn|-<I9b|pM`hxXm72*wa2}>xV}ew_X6+A0d@Bm_xHE&H)vvSR^43OWLs|ye38M?
zv)5hO;;%@OTJ_=rV}E|ur_EsKS>0V&-I^_4lIwOd@YT=v4z};kj2WwqDd^))k_uVc
zQkJxykO|j*T+pzJeN2?Ajt~W1anX*$t7d&NHm8|w<j<PR=+vN++;erxY9y+ZQK8RS
znOVwIp}~^VSjfQCE4S_c$W(uKRwKIBIh6i8I^!FMW(voN?`a~#Wn4NFvyvTiTikQ`
zo0ZyVQp2v)!0?FTJs&c-3^u5$O(kV$+<iPrO`flDWeO%sTQ%3foyus8JtH$?c4xF|
z`&mPcp*RLZo?m}?>XeD{LT#f0X>7qTGsl>@l&K^3L=_P#L-(PQ8t?4s{@0WH_-;h1
z8ocs=iMc!t>dghMZvE!zZ{oyFTTZ%ETa?@DRn|~HwsfiVDrKUkzg)ws+A~e<sy4=V
z**y~?N|QOMfKX;Nw(YDLEzaKFohdP<Mi;u&#uJUz*})WdK~>{)ElU!kdk-4vw@C_J
z%aR$N)d#j%#gm@QM5(q?r1OpwgUg;V#ehP0@bDTPZNB6}Bi~9J0Ou%04XGH>8_XI7
zVOr@NEwkgZ27;2YhjKUgMN>D#UjeF(vw+0DN@~u<R2&K{iTmwyX;N;cOq4-fteJ>9
zI#fMVvoJKy9iy@2SzHH>GyI3Jo;1y>v^}<x!?zHl=0;^-h32i?4|S14I(lG`N*}Vr
zAR{429rOxKu$#ePuxG>mK<?H~Xm1!F7<~4-@Yj$)`HR1HpNWC;2l23<cz$~W_y+L?
z7w2-Csqv$e*7-Fo$5NeB32K_A64@4MP-jTzGKj9wNav(sE_c*+ijnvR#JN?Y;I8k$
zaTrZn<@v+GFk+EoLD5oXgj<!<!nS5jgy>Fn@S{nEEd60fCeOh6HH;Z^kpbtvQ)??`
zUV+#5pp_+EO!>Ap1?<?T;V?cTtrp0qb5OZ>1AcK?bT5+agqIExk(MbYW)ksMJJquJ
zY-{@ogkLN|V9ODYbAmR)V6IywOxtJxYGY^X9E!LbXjtyl5XzITu~ey#;SGxsfXHxI
zO*$;tw+=da>cOW)T`R8Cco$upuJwf2ipRU=fz3Wi9>cMg>j+ubZ}#fo`s7R4PC@xN
z_-^s`j4Z(+z73m+STB?4ZIcK}ZC@lt5~?)$HcTdxEng&Nlkls*lG_O(^Olr33?#KP
ztxeMdOCDklrkKo9$(qK>5tY1lqQXAy9OZ`HGafWpP5Esngu+Z5L>3qgNec;>RKTPu
z^5Sp2EwrhSCvDn=C9UKooU;Srxcersla;zB$LVFA&Qs&IP`#<9Gk1$eo%Wn@^?#1?
zrc2YqF~54Q$go_pRygq%I<69X!R%BWnf3;fy^88s1Uo#d6Zf)Vd?YsBimsR)y5nx<
zPm8@gHaGA@PO}Xwp6qrEMV*2`%|ij8y`-4^+-WD+#qP_g`fOcES6hcr_+^`K#k$%u
z%fsctCurGX-NSC9cf0rIH8PZWa;C$$lRJ$vRGIt6BY;7`P9wXyY0}h(${0@5rZEX}
zI1LIJ3tR5DRQy@sYOUt!L(Yo%Y1<O`s4Ow{1{QNJnVjUVQ~WZfv|Uu2bbU(mNV%|~
zXoX2lhpE|9EX8Kx-00!K4a!SGm<0uKQH%ng4D;K1JdyXi<}^!fy2Y#(o~sq4H=((`
zqaNdX7<BKO4p;uAj46`YtY%}o3kfl0_Z<#*&v+%>PSpaX0kapGZ0=vq*ee`Bh8O+i
zYDs1Tn6ghDmN=M5{)yEpm)dM+*A5_4)HNv2&rO%HgMMaolByr34=wiLGhMJ!cNL@V
zrgp=3asomK6$GQfcFHb>Qo*YEtyc48_}IzO0EmjXvp1-d_)>!z7y6|$c~ye0jXP~?
zytjF-Gm?==M;(#NRtxP$b$~rjle!Dv^JKZ%r|2Qd+ZT4?40>w&U?uw!Kq6UU0F`SE
zFPTIn&K0>&J(YC4gWd{z>qL#n;&Qqfv*f{dc;P7Lm_GSrw`F!Dqq|^B8qQMIj5X)x
zaIMvS;T&a4s&{5FQr)&kD5U$uZai5dR%PP9<;Kixa6P3x83FQM$rd+Fx<^_}{01Oq
zORL7_)+{q(b0Z9vGD#H1TVep|ZUhhN1)^d=Zq<qt`q?`*YwsVu=HGwDZ}|w|lXUa1
z-tu3+=0ALH@BI4J-oJBw>+li3=^L8X>NYpEdUNZtcI$Lj6MmgX+PLGtsB3O$^HLML
zv9=KAeMfHdlhRynVMzL6oh2`ng)cq|slql5slp0gEngrO&S(3%xy+`XCs5FN@_USB
zj{jHj8)eLn3(`^Ez$-8r3IijCiShu+4Zl@1&x9KzOj~e;5cgOC2=aU+rADxq3t>n#
zBm9oVm{&;SFX=`^-ww2w2ayRyn3n^;0lZ3(5xh!hDh@v&_^vP>les|GnQ_GrB(%nA
z9~@VB!y4u+9|+_p<zLDcr_0G1r+_l<Fx>E4QW+~cgD^PgigsFjHltsv;C4aqWT<;l
zoDl_(XlO>*X@=Zt1Yy+;Ak~e@rzAEYFye%3K!s7^IHo6Cacib^#Wv;+W)7>!9QMTJ
z#ya_6bM)&_*cYn^+2f4e0i1)K&v(GMv(7oX1EJyfSyf-EK2pKTqa7@FabmH!>D5pc
zi+xQ2X6^P1dH&zPr`%xr$1c!+a=5t8{&c;8((u6aKS%F%>)Eo{PJS?6Q-C-G5O$=$
z&VMgy9ETl?$(UxFOSl>H+&83&^n{UY3jk-4=*Ns~i7s9fAHXG;xHt7?A9G0<?MN%_
zi1YA{tjHs)<`WjdB}>>R@bHh4o4~nSL1ag6e!RXgxT`v($MFp#3agKhiu;?9gDvdQ
z(qS=Iv@LM|P}1y_`0+)WUS3HqfTJ%Bp^Z!VQST?k4jW*b=lA9Vc>&RiyfR>)dfQ~&
zO0mA4G%xEe{BXv@x;x6zHqQTYi=GAx2Z4Dk6@_z<^3WL*a97Trj(_NZhi&ohtey^)
zF)5(IFO@0Du}pE|gMI|VIj9q_+%t{=pxfe>-^oN@7xy<5_Rj}@6N}EN@Wf)>1oT{3
zl+Ekk_Z85)bCWoE@;xQIhNDZ|QNtPIKsF|^>sQLOLkelvb6E)YrwyxJTSIAx*0*$K
z238jAbQT;jG|>*u0;}PV9Hv3axLUJJ#&E{f0k5JtuwpLm6noQC8Q}hSy{>5s>=^<U
zSC|mh6Hi2RmjEo=b3NV|^3?Zq{<kCDqq5$5z&6|=T;fv!)Az&c7&)3fzVn^AorZAr
z9{w??I`qvX$A*87GNzv)js8e7JxQBfG<V?5F~{}=aOe@m{Y3Tfiu(EGPJDskSJ@+R
z(kEN)5q0$i1NTLn-|^P@<iq%a+8?s^1mjD<`cWL+b;*ojGePqgj<B1u`H?){8E*jI
zWIdw!-TlefkItO9{RrWY(jTDwjE!9>G2dbK^5!<_C#N$)=8$JndHRRO>YYAS<B#gS
zaQtIB+&SFf9cyqd-S^G-d7eOP$cxx>w*0Z9zpML+J#3o-WQln+0Kb(hNblHqU*N`)
zm6SytVpY6sie2c5{~kfpK&Xt<dwK3dG>0)UUXuc$gRCKfB+HKvJl*1gu;;`D7J)KP
zxKCjG9vKk9jP}Y5kTxMwVyZk&l=03ytSJ9LuDkh|<~eaC&VN8uv-$RKHsZQ40i&%L
z=i!8}b>e$Qq#sthda3ci8P}n%b7F4XQ+0iv4Tx<ddoAfC$@8Pn^Xqn4^1vI1d}#~U
z1=!LZC9}rK+v(iz2CDmi7`v`NtV_I38fEqVW;Uf{n_#j@lIC?aKZHth?zjCkn|n=$
z$t||)xBg5?E6^NR^)_tzO^kyh;<{3t8XxC#SAr{eUQokIdXsV3X&fa!NS-N_^Won4
zGUtq!oMrGgLRicf*eZ@iedEOHR~qlrNUk`aAlu^O8d5qtLV7l%Xd6=#Vu(qF$S05d
z|9>m%*_?ZNt1r*|lW_pQp<T@!Wzhzl%iZ%>*@UsMZRMV1HJ^lVihz-T^dDy;KPx?E
zGfMM`$m~X$b;2T^b{Rq!<$)@q%cH*QC)9zWcdIrZRNyE}z<gAS^-qpVA=r5c`l0E&
z-FhVI?MKIrFo3!%TxW{r%q$MdjU%MTvbpX&eC#+npGuge8H^A95oDS8(jb60$ix|v
zD|<J36C340C(%Lw^M~`WZ3vHdE)nbjl)e?;0i=4)$@ELO!^Va72(MJkYC~sEUwJqX
zdNXv67-svdQ7NuKwod`6!cBhK?IS%`=$if>RlT@@7raWfSX@4OeliI{)f>?(k-pm5
zBh@;tsNRhZRW>ItG*7seN54pBK$$F{{^9F%&arP{6yOt13#p;!34^LSKCk8r<H|bD
zu;C7)%o*>@H}W<H**eaUoo%;&2&yCF#5gK@UfdQ&<<B`;f2!K3^|!f={ngtMIPK2-
zVzh>p-Y}{&1@*@Ccn|7(zY7@Mkknmw5??n<^JlZ|$l570xA<xNU8=LCERBCded^@u
z@v6R}@(cIB_b*wZYGIvz0Repi0|Al!PbcqUVQS}MX>90XX>X@uZ*6M#zv5q^iCa>`
z0tjJ0*MyQw6{=faVDRj<M!{=Q1VQSepztqS9WB+iN>1}@N(#T}eSq+#a&(2MS&0HS
zawmW0e3E^9`g%duhqGdd(4;90BtuP+smatZYe<j|DDfe}I-hC#&+PI)bYF<zO80ik
zUxe{Q;RQX04R9p%$HHOW#2&K>9dNc2tjlP99kXD#h<c85`)-gudi-aED<4`kBD|T5
z)@{582XLQ(^<CcPd8H2X?u^gxHNd`29msvMG;g9_twL07S(*o?7UUIc@3o5wRI48s
zz^0gIuc8Scc^!#R_l&@#q+4ASg02Sw&If`f8@~6zU{V>UHP6&M7}@@0qo0c(|0z^^
zH#={JC?iv#Q9fOqRB`=4y^@^9i3+2`$|(Bd1I-YN$z_RQ=AW6L=$*r$&NSnkAwLtI
z6}!B}O+OJUzSY$wlZU!f_+2Z-U6H*h4qImybWAST#w2L9LGUJ-p!?AB4b-TV(Dh8?
z^XtD?ji3<0_vW9fm4N^Ok^FnrgbZC=Or1RcHP%AH_@6aX)|E#VMBx>dmR@635djsY
zQEF8=5*muGWK0x;Z766A85uX^vJ9tTp1DdHm}6S7@VNtjEsk*yBNLOj9G>lUegR}U
z^PjHW;`9Hq*_Zt10iqdWUl8v9%##E&S;3I5seAh78ginZl3@OgP2=U0XzOrZ%qypI
zSCZZ$I+iX?^&V|l%z)A5Hlb*fRc8W}NlkwpOeVH~e^L}r=ve)pgX>iF<A*})g#cq1
z*~+5W#GG@MOxzsFzQ87_Hu@`0S;9q{HzPLXx`wqP8?q4MD7m%8yw>$#%$-5dMnfk6
z6Ky=F{7of-fi~vID1yt}BGjkKSN$gKl#l<YEXV3uENbRd>g~PwB-<X7iUHq<RUG0J
zgSl+XGh}=*alBoLnC@z$Ious|W~YKU-M|tVqLgl~1cO`owJg!wM{?Aa?vg|5Tf4lj
z=ahq;d*!lw+uxR!-(FX=`fZDZUvVtVc13w1%?I$&go4#SjesU}#%goLYDfRUEV};^
ziY4>R3d>Th?lU=-U0@G}nvoaTCA;<|vEuuJTKx>GocrY*yNYBO;2vQa8;pOzRh0+J
z&cJT8PU;e9Q~Cyawc(EPjU*E26<)UmOVSFxA2ISzq7^@ax+8Qe@Q)lvZ-8i%sF%+R
z19pbR-7x0oznzz$j6?T+a3COY1Rx-y|HpaxSHKfe9eWM+TMQx=A-K`h7#kUxVFc9(
zu@1K!?CLiIVH7Aw0AWI#O9I(LKt`gu*zd&_xtyEI<T^<m_Vcu5+a=KMND1NWn{&=D
zMc%Jni*?X2XOG9z-fo|l?w3CH_uC)7cZ>nbPwtSV49Ei*vuTd$2*WxU5C)SB!ru(o
zB5FMKk%Le}aD#$!V?797bP=HlR1FkIZwPP@2lP>A&`f<OLa24n&h%k-NOlnS>7iHZ
zBX=tVePlfTx?}7@6{9sCZ)FK@X$gL!W9`8mm?PDMEc>kpeZjY2_q_;x@%Rw;_+a;5
z2=)=@*-Un!^JF1%N8&@zwu~Q*G3_Qjw1RRlPx7&DFVYa?X3L(eX^OEfHY1HL#5<IQ
zMQbcJ;;cE0tjS9xziDYJ&mXf$3keIcD5sZ|8%r!XvJOVPXq071RktvoLoD_OS}r)U
zTGy-1n3k-Z*z%GP{w%`obP^PjEV7Ud?pc>vbTJiTZyMOyX*G+joX3zMWJ<C!muYo*
zyr6x}s_vvIWJ_c@H(seO%`aN9tt#Io&D#<=;!bY{r2#mXGa_u_X$-Z_*JEt48p*}O
zz`ALrb+5MRR$4Y9vsR4LnLAtTV65Hfj^?9_x(oU1%y9-Kui4}dv7bYI+=BZ;z;7=J
z3dnGGSTNeHN-<vwjV4G#lCa-Q$8vILkH~Z4JDk1Zuu00;i#OZG){?uu?Pw|>fzrZT
z0W5S@ZN{0=NL4hpvpH*R4RnG;JF3_oSK1O*nt}OY&!w#6$`ROeSx82Sxa&l>*+Dp2
zc?(HFF~!+y>{|61daSfG5DU0A%@=@k%wNqN@gSWxQm!qs64q{FQ}3`FS&3bTR+1HQ
zD6QP*Xk9m2%4V#z-J9^oHc4d5CQ8lMW6#fSkY_~QYtMEXKG4@j9HPm@X0uXOH9SRJ
zEu&)D5{W@`2aix(3#A1h=BPekXDFX2>7+Otn^3%*yvazId`_bc&KotBoLW_O6xEtl
z5(476LHP$~P=0~#Bq>ebG~#33P=1lzNO8AXR#1MVI;-9YmrQtLT&%{HR#uI(Q<z|c
zEsz!cX?Fv5v}6Z__T9DfnYN+dmY3&vxYyWu85h1q-VOb?ML~P}yw8_*BJ4?`5as=<
zcif+PWB4dE2X#T-9W-e_75lzE11+0znW_vybdccDB>ICWeFX&cEot|Jp;0UlAH&Z4
z1z1*EB2G<nO)}MV<{DaB0!W?}k5fH%PdI3RAIRH@SBXIiH3>hl>@_B)@0xx3SB=4c
z;xNy3cF<ExSn}YU+8L3x{n8vdJ*6lyhB_i|@Sr~<{SqH`Dvfk*6OAEby*Ml|{Cpg%
zxe@v~7dN=E@UT(I^x3Ayk`}a1e(bi|4^%0*I4*!8q)Wag-2|kM_PT{^H`;Quh+?Z^
z_ImH^^`cVW;bGxnBralaZq8@}Gyk;8N|ko^B6Za0Xr`x^bALkRBp0+1)E?ZZ7or@%
zWn2gL#Vxgnn3}bX$F-lo*+*gfSJ2*9pY`S&0v$F^7S;`RXA(y0e2ci0=zeP3sm`X0
z-#hWm!3B2L2z}U-nI`=4u^zA^ywk1%2v69CpNWYo`PrXLjUkg*7u1i0bz9TFRi=F8
zeA-;uhgU6!CK43o`m-NsIMSsWi1dzy`bjg299k~k;nOu4cgJ!==+9akqsyTFO}WnX
zjF9Fx##I*X1$p>o=C2#NLB<{!=7a}`eQ)y<iSEhVXQHF#3En;J9C>Hj_-mdj#Y|l=
z`YP{0q(*mpuBdblFvD|=sm8xeKQVU0G4Mh;wsl!~!tD4+{}!|xC^b=HA8$VJrntST
zBV=fV;lQ0Lt^$5|gm6n|4jy<?v@_!R;*;bX{6SHXUmECjI%B@17u1S027gtBas#gf
z-VO4=DbD}k<HXk$SOqD-BNL~`MVwp+;E9hzlU1cV)(F?7eR(dcOiRxkfa~zXsvvf?
zw!9fkGF@y-KvO-bXd*3H`MXx$^`pHrz&TzCP`+`E&0}?7ncl@S9MkELxcf@%JMQXz
z^^}1zgqJr+)L!az4s!3K#vHNo#BOEmmk*Nc9*GYZ*X<Cn&UK>!FH;o9`b`8e#mg~z
z56u*1jNX$VMsASSr6SDnzW2&x#UIeV^Gu^gs;N7BWyu$6QWfdVnM|-I6=k&%2AAeZ
z=XZqgg0P>9OynW|^$TLImN|1As*U5WkPpFDXZ}ziY$k`EwEafN$Lg0BW{N}54?gQz
zjkQlZ!jYcZ-(|hYst`<jvg{6kQ*Hwr_e9rsEX>so9{X4hex~~s9mI1>>RdpIV+kiN
z^<XhY%(aVTX9w5*`ufafa`@M|*!2^R3Vb-W)^kJ)v@4Ai3%V#Yb-N967h30w$x!EP
z7xtzv!tLAWYGj(OhXS{~IOi^pj6b9yt>#hYuEhG$kSBO<u}t0v-z&kJ_n+9&!l`M?
zho+x)vQzS$`Wi>UpR9AIxfXdJ2v4wla)iObNTC;;my3)sdDyn5ee0rHBl39p`VUT-
z-GDXBQ*4e1c1M(U53_AO=qm#34@$K{h^vvT7i0y@xZ~Nf#1MP`1ke&s4z6v1z<>y8
ztryfgmenK3ea$%|AWQnZ>bjmd!k2{mMt>@XR}EJG&2ImHZ`T#IEx=a)6H;VF2Lk%1
zWB1=@I)n{vY>W(zt(8rk-2T<Ei`9Vi&{6#-rpUx>|M1@AlGTz~CR?ts$&$<>$xdhs
zBHJ~eMAj->QAi+TrnhKG&TN>rh$gD3Bj6@TOJPteQUJB$rWDz>ZY3&Wswg7ps4wta
zWxMqItas7`sm$;6<FxK9?=k-*&sjgu<8q-GC~H{<H~TJ=s0aC@^sR>FMVh(fz?n<u
zc^AZvr=l1Z{yYa~{@&9^Pz+xBF#-W+`A!tq^fgHaZt_n<SWBD}jI^`Jc=~+>3o+AI
zR9L+gN7WGq-jZTy{dq>*5tiJ<)S4?`h~4C*1bffr$Pw|AmOU@wdux%0a>hNU;rlc-
z5^Qhfj+Z^p>ButhZ%mlEE6V}%qR(C|{=}g(6Q<))xE;^!SiHzoe5t2k7P{zeG?rgc
zF(^N39DU>ifAZ-WmLK64J?p2`xYfaCn7;HQwjn1?@m|+G_qjj)%rwyr>c&SfcD>bW
zao8G5PhCN)dtGmf^@$d!{Kxaatbi~H!nOT+PE2_5*ECAhmeGO;6N0QBMns7W`>w)#
zC=FsvICwIY^0jcK3CH3*Ufd0X@b!U65_mLQ_(yS|36&ky@+qm-x0@#|&mWAK(MgS3
zWd<ZOpK{FGO*D3p!h4`=)}(IWK@$)1(28i3oYMgVCw9Uzq|-4C5}`aDnK8EvMWwKz
zuLF~y;FALjj*TJ(4dx#qD4Xa|kG_-%K-{tbJt&wLaoI#PC`ckS$bAEVIXdpRjlmOO
z13w0a1=c=VWae+sP)Lgq`4=pRn@u}F6dJKmLGjUzRMgCn3Xd?M!!j8WV!`^$%&EAP
z=S*d9#xp&(x5vzn?^dSB`cP7v!WWf&d<Oc65>NHFZlbftQ(XaP2F!R7kA6dL6^7&E
z1B$%ev7%hL%?!CD{8*79GsPJS*%pc-^F{+F+P0zA_iig~UnCvkVCu6U$Lf66#U=BR
z*~BiQ`>4|7Ac|^EUa2Ok1Q=JXsuVK_NQskjvLF~<p*5yUh=V9WPRj|U%yghZWj3f%
zqG?YZv${HOVhn6tmKb!RDNoxL+xzJq-o4GxMO0@4ANf$U#Zn2Uffy&9WX6KRP1$q|
zSnVH9?)c)z4!(R#=%B4XrEK3rp9>(NCR1(fEB_x`?--m}*lr2O9ox2T+qRuNv2EM7
zZQD*db~?6gbTIwaeDl?uGw1L9XV+b|uU&hsYoUD4cQbNTmD6~0(b6+J3$P+<@rI&S
zR9`{nKKs{SF_w9npwfy5{P{*c3rxMCHFc4FT=~ABlbp8QX!32qfRGmUsc=^i5m%2~
zuAUX+5IM}TkJoTd?~Lez-^s?#g7MD$b9CVOZ0)Wru%8%USk8zmxGV^{4Glnf42by5
z4s<_M2K64~F-YX#4!OF8_y*oM&xiO9^~ZUOzw?JF&zOApMdzCUS7E^}dCeEwE<vRx
zI98>I{VVv##nG0s+zBetjFLkcx*&P2?uJ=4anaHuzmS}2SaGy!M6tALS}{2_oP5^V
zHS+wkt}Yf%4kpVd8VBPqH@9!Kx?3&nYP2hXg6S(dJNpMWLjnMlBXYvB+_A5)tip-A
ztJ_-cYaPOF)E3$tuuf~KdxXLh7F<@(BMrYFK{_1MQH4tx?PG0xzvDn@D$df);_Qaw
zTN{{QpX^&$>nox*Uu{MGRb3W&Sa#Ie6IPYtTMsrED~V~<RfUZK)<zwcRXB-SHNMKD
zoH#M2$(hA^$Te+NWhF9$%+Jr3o%TdmQQzyLKl9mjOh+@zXMahi(bxW7#X@hV$-b#*
zUcoX-;0)`7oR5r?E7ln+2ZKSU-}HoMp5NTmYP)j5)-v!@0e%?Z_F`ua4*+24Y@|eq
zUr#DC-|yup>9|OsR0>f=n_09T;ZSFzKzF4=AnOeMwk@aPtf5N=T~Opjhu3m9HsNiH
zuB;Eqv`bybkQ7Tg9VZ=@pW@?%o}L7W%W_@B;x$4O>y}N8(L24lajk|VlV@rK_CCO>
z)zSj_ef2vdcCu=#2-KHfnzODTMP9S%{zO-3kf)z-Zu@9|GOGutNaX#GdKtA=Rceyw
zjV&6!$ri;jg}vN2p3zZS2&p|3d}c&)phHS!Gxb`F?Iy_mj1x?e(9%O33lnCd`#_J+
z&Xi7kG;-yR=vV@pi#$Izh8P%eB$SZRcmdfe5t>>~w|+o3NN_N%J@oUt;%7W}i2)J<
z#f*BlIOkvDN-)p`teBA!zjXMdj29za_fb%xx{jho(+>Og=TEGN-%GYZAXp*Oae;~x
zeh`3vq=+>EI+?~u%!|xtcTmgqWC>nlO{F#`HnY3y%R0<u$Y|H+YL?QHn->{V_S~tQ
z?4N9<k$?7$F0Q@=g)b1B{dn-0$LN}O^>59q8YY;em1bCNU;8oyGcR?PmsCdQH`}A|
zs3hb`Hyn)*#R(+FayQJXRYy$l*3fVzN|NxHoK_NtXIK#)*jJ%wkqlcl);1x|h?<B`
znF(`fPxYkJ%#uH|dc!BtcoBk8NH8|yC+U>U0luf_V($t?i?>wLBK<I>>@}?9aD^X`
zG0BJOuw2xK2TUF^O4ID%6f)g$G>TDrte2@7;jabox1+>82&a2rpLd;E1{`ZfeEb3M
zJ`+KFD`9DYbj29}{?Nf15Nk;i)h@w`=W-=x^6rpH;P!de_C?nA<GbZ%-e=l5Li)Ko
zn}(ADH2A_j!L-~d?X7GRCG*uHN74seH+kM3hTDD8>&KVj(s)_UPsN>Kp62@{DKWsD
z^<O720AEbW@9=#h4h3wLG1^0-O3vL#R&tY!K_}AiPL8S1DB4E=mZ?};?s(@P_D2&_
zPY^pFzHlX_w1qk)aqu;zGg5lGlmRMSAy0*UMr!uu)lw!kkXy*IQYFufKv&36Z?uk^
zYs|r?JS5fU<#HwyOqMCDFs1D)%t2bMdpHxf=A}!?!x*=@%o+MiLVUnh*;gKyWlk$b
z{)6{P8B@L1qm_i->%NHoOk=_moAC+j$*ovbTlu<gj>@=xRyFQ&gB|3}Nl~Fnz1KEH
z7-OZD`Rz*l`j(E3@^*8<I$H=J4<bsgxN-g3HDB}@GRwmg-Am7s_MwX}I^GaU!jcy4
z0C|q5WQo^&bDL|1zFtK#yLXl~O{!TpMT_Zal}gycTsGg@^NEno2ZKNMt72Tj5eQ+a
z3E?ndMPx?l(Ie6(o;O0fZMU>EzsNn$Y+e9{An&l$J1_l4!eTTYi;jWu&cJl_jjDM`
zW*VyB5c3<G;}GEFADX0JTC+xZ4aYl>{=rCaCh=bM4PmgPaDbXu6r8UD%}@dIsm67O
zFv`Ka+X~NL%-Ux~agTJoui~7QHF>(h%0ECI*(g1uqOUd_u7{_Qt=fu47aSAucl~w@
ze{9-$#EY!){(O4sFFrX`Y{l+~nk-uA$T#xR=t_$iMcyD=N1FD_o?}^@-A=NdPdt<;
zy$jTC7J(@-l_Fcob}WL7XjSNXL=QjC253u`=pF55>(ce*(vn}!KZ;yox0~ZlVHuA{
zvWYos(Rw=pOWi)(n;TqYCR7{)vkDzB8SkVPZq-V7$~-+8)kj3*rS#JGs2;mbsh5<Z
z4I8eV^g8QLnr$nqJgHXKaEBkn6Prq7_NIV)c9&lvU}l?!%=VUT{LJ-gP+JgyPRySk
zF*ju<5$w&;R3nvFGZEE8m0f)EJ3=>$<bnR;M&LeT8hXjX7uFW1iN~(GYT0pfOm$)@
zdBL>MqUD2}w#^G?6U&8nncG-LfkGcBenU{ktw7whNWT|F&PoN{nys}f^M<~GdWLdU
zr)kB=9pdt8BM%N;UB66CXJioG(Jq&>y*RD{UOObUg4hvlU0u%MMt!IgbMyjv$djY2
zN@iar{TMZ6eLaYI6J*3a+egPSo^jdjfgA(3o)2o~M@|-d(26{QZJgH}d47W~i6P?j
zv#Dt+tkF(HNM>JIB9xHVpWtO#oe`_X;G)JM4V)h?cRTN^0?@vgr`JNj@`r7s+4+TK
zP*-t~bWy*7AeQBJ>}Vr%$Vepj2a+3FTk^0QW7Ji6u@eA!><ZxbE}8oz)kTX-yTr9R
zTW)=k8f5fJ%k((cl-me#vT}ply3h`r`^6-u7vFgS(REIuSz|Zi<cdPC(f*+G#I9Rw
zH{N;yzg2KEf_HJ)A+a6mdtv93)`C#!ec#Z9V4&vaXj534rZRLrEiC`$xpr&F7=;pl
zD1V7YRvfRzo;OwB8h?l)sygh`n(h*MWwbKb?HT<>XYLJ@f133<*Cux{y#YVf_bl;h
z6xn}8yRdV+u4%BZ$%<8PP<mb1>AX5AT|Y^y8Rls`v?Q~Qkd9ph#V>)v3)JtGP=!#a
zhS#vHCEF<Gv%i(BR76)Tnhma}_3yb%S3}TS(SOIN3Nu2)cKUum{wpzl#+<;Z|IfA#
zP5VD09b15tk*txcor%T&k94$Qd{myF1y0$2_e#|(f`H4wpo&rkA}ftxp`McnHZW|0
z5L-e0E`=+RlC(o|;dbPIaX`q;28rqjcb%0Jl)U`o{aEXK=90a1zO`)2eagQ5vUdKx
z>zv$TnT^ix_qn}$`03a0+;{pe<M~;9`yCL0PF3Dz!J*)=n0&SBQIu?VD20vZoR}{I
zVART@TFjx9%Vbs2)15`bR&c&|$t!d$75~NBWl;Q!mAmF%7Q@0!$~kJX`Pg)eDfCp5
zMI(zk^|Z4hh_8v=01^Y$nT;W(xtBV>?4B57=3ohM3>(Xa!EnL?FpE^oA)6W3^<n?3
zs(*3d{H7b5-f01xUw-eDYOPx5x^T`bbjba_Dsz}_78;HIyRzBTwsfqz1ZUo(b?nr7
ztH7~%OpbZ2#xdH5L9tUUq2Z;avm<v+vROULmD=E}=<&GX`Jq=b3vOt2l)f*7L9J87
z&DO;+fuoai#0Y6T!K|4zm)gD4qW3D^qDQPtC-)C#D%>{pIBT4Bj>A2>{G^YxiOM1V
zdY7Igz4HV74pols%>m8ZA$?y`Ju*H&(acKFIyBJ^8R=TbTe45><XR`?D1L1H+8acy
zz;Tf}maq2VT*aprhTdSgwNLR_KFY%!jH!X*do=w9nJR~+PxF{TQnx*ltFKm8y`*z>
zwEf}s;#DG_H(Q@xUB8IrYo$+lbl(I@$@=X-TXuEO*&6G2m&Fgx(7`tKYn2Z|vbw>N
z{!(LEYhWa(EXB&G2^9+_%Nj&6pE%NVs$etm{N67)!LjL*_8KcYdppSGw$+w8bEoAM
z)(;))jIs8Wn&&m0Xg0W3YwS>6BV`>B*K2F-FWHyYKreq5_!>(Ki>I|;4dZQHqy0&h
z6{S$N_tO5}<3O$5MlufG^Ehy0+`YDD%*dCzlSimYS4>q;)<sHB*jXBGEo*y_wSR;1
z3|WnDMl8)3*DW(HiH(|JWX;8^V<gSfp}Hj98<sSaV;JQuAjgJ&dyrnmVwGX2bck~p
z7kXf7wB5>LcC>CnN(5#0(V)hNbAXHJfEwxIUY^_iTYm`d=Sb2T(+5+kJ+2DZb$MWp
z9O4i&6<3yfCnwq<*hOIztKt5tfg>kjo|WI2u7jM-SVfF-_eRmX&se~c^|%b$7H9s0
zcoiAi6+_yg9E&GjF+LLZtVS|u89~9*tD}6M;qI#AtRlyZwbkiDy3$kV4u*ncFVj-a
zf^5yE%%`McCq*WLrPSJx$jqY0md8la09UqH_{wU(VH{$LLy>8Q`|2>JMS;LK*iT}r
z8E&$U1S^FQA*j<~qfAsN2!X@qtxWBY^2J__kPB|iM52WOSEdXR<~()+a5KxsO=}^i
z4PLhr%r;X%*4?NE0bVGfu{0!33mim>%oLwS#c~oyiPBNo33wj#blb8V%Nzp?#E<mS
z5G#Sgpa@HmSYW#jhHMcgXH-K^<H(l}%7Yr`aZbf#2&?A=Env1HHS=T`YU{E&c$+h4
zoCN`Uu~;kKTF`KEnCY%!gY_wj@WpWF#kiP_$H}c1PsKG0T*}G2IM<oxCg-|K3A8IB
z$FB(HZtlm{YDJU-FE1pZG(>xikg!>h;&0mx6q&^p)J^&5G?U7VUOWKXL}k+)@HIO0
zX;F>Amw9^5Hjt-XNRb{$EkSZn?3oI4jKH_ce9HV@FW#~Tmt-O!gKzo`O3V715s8m7
zYX;WcXvN|t$_`T_60;EhTTPtRsL_DCfnz>rF1SsrL<km>uu*f4f=V8Hb09PmioGs|
z$o!Y4<PEHg`|28Vss`MK7^ejU2e?XDdmTk)6bxuGlD@Ex#z^urU!(;o7|M)xe(mG~
z5E*hBB7iG^4tE{a6PL)^xvw{dcMYzHv_SaNddCJ2s$`5T={_M*8tzSN6myI=kkvG@
z*d_oot^=H&TSpns@tm`rG-ejQlY1A|$~`L#jXI2~*u$9-8Ly+GMG&^tW?oX5QA4MP
z0&CLie5A0@qws2}GXBH0FFntUI5%#-m)k%3cIh1Gdga{D5<lUjfpxdAm)c+F^!DzH
zlN*3Xha`3k%1v-2GJ%S0O~N#V+)U)IL!Nx@5|g)Z4(<i<&0;3I^bYKW?Q?IG8}Fd)
z<*R7FZ&B^sfA>>x<&n>?_}<M;aD027Qr7!N^^a7h82|%ao66CMT%Q4!b+zWneR-ut
z@*>S!Vex$J2`9C`{t@9Vockxjzh+5@yW~;ft(^Kt_B8y>XynRgPVF5jm*9B3#55uV
z-A>A7QYzj&JW`Xwj$m1n5E~qFA?u&+mxB{0A=+}%p>_2|w8$uuTm^)Q(~VU3e6H+O
zI&edy@)6~;gjM1E)7ej(8fmx&w*hs98odWU*MD%FaSI;`$FW|b3MrvB6=`~mgr#a)
zlkN93u3~0NqKLFrTGvULo4-o;?A(N7>M-OeFwf!dT$pT~PdT<$IKSL{w63Im<MU4$
zKl$TR*Kf3^vHr9Zj!%#gT(UoeWggBG5B7y5eoC@?WZ$`y^=F^IzDa0prZuY`tv|aa
z?aw|bzMCig7vAOkWXdtl$#QLN*3SE%h-NWa%%r){&e^${fk#sZ)ju^)`yURu`{~pl
zIQ+sbZ=fJ-L{kglqpl1vVrJNA7-Ym{ix*=wuz6%juwcY#=$dO~Gw(_3^eP^9UBAP(
zJ`}iFozg8z2I$G_1u|nOXhhVhF?gCvDr)LtM#C4??a)8bFKS@6ZXdj<e`Lz_zvE|r
z#&4@X1809q{Za*%-$}mn>kuatSza%ricrs^;H;zcG;o*WDOCv-22^00K=3I{83(0l
zO$W4wm^Ba%<40$tH6@9yGR9;zWln%nxPC`8^8JJuGcZdZIf=kRkSX*5jwIAIdrPSE
z*P@3Gc=eRf;QC59opBN5bSN)2Vk(S0hY@!sf0YlDbkbf#gt(5DqFzST0Tny?NNSAH
zkX11YX>3i3>SdC?{Dde&llOEnYh@PEP|yH8(e)VV&L&k$b=9a{09nj<_u`qrQq2hm
zZa@jxA)*@8Nc5?h(nx>siq#2jf`S9HEMFp1N+msJPD$pll0cP*oz&Wn^4yV>uO=Qa
z<2jcvf=jtZ60w^d7XAglvDT%6s0R5CqDGn*HCJ{Puk5y!72*NZRwB_hlC;OmVIO^l
zC6@vDips{iq%blHcL_sS-aa6DXDAeH6v0HIsgA_*;Xgy%{xaSLolqZ`rLw<OH(ec+
zm%O@!I_`(_f|Vo54!1L<4b4{Ot$g(Z$BQ8jA8r|wE2J)<dzYMe4yf#95JLr3@dG_6
zVm*{lLuHri%TWU;c_vcV3vxYmi9=v{^OMZ%Vulzr@))QJ!UX@3#1bZR)JWm0WY3AD
zSCCXSOqju&Ku1zQo!e*fur)1U$DN9LY8^d0z?bw-ANe|vvq9whkmShXv^IK5dvLtc
zp$)2&3j>-{Sy*$jLS<D!yj2bNvcT;Hdn?6O>yfc+>!<dPjJS1EtH2ItSHq1o_zF;2
z)e=K#d}OynU3G>{a(TZZ8cg(f04WzdhghAj`a22~H?SPG55#b%7IWCWQ3zo4*q3Tm
z=5a71%<yF<sA);1JJc83Y3}fz_k$=^;*%_&S{2mgjB3XfcV`Jjbmz7yM_UjutY+r=
zq|LQhn6fv4#&hx!6I|!m5{*kef5k@v8%@<6-NgGM)k29UVh*>$2+_hle;IpnbyQUW
z!GNNP(Ei}D`l8ONgVF7VAP<G{b~{PrtE=4=G?LOb?N}y%Vzm9$$+p6FBCG$5viOPu
z;bE`6<IFid>}iK7WU~~VwzANVqz2j%pqf{W2t*dLw}4`?r+o|SB{_{De!c3l84XC-
zz+)|?#balxN{8K~P9)dxV_eC*YZEj|D^<-<wE#cCk0P#^hzEKnjAE!`B2o5=_|=9z
zSRs0aHW7>-Pz_Ca^R`}T*fR~m;gAXiM4`3vY6zyN!dI98K74S93RPSJf<|R-E*UrL
zFLW)N2{EF<E%Gp|dlDYy#w&wOvQY7f9<6QIY8t#^0s!rPCV^RcNp!H`Oq6vM7B%^D
zIlPFo=h!%e8&oax3CtVULSoriioHWj+wCPyICfIEEW9EYkUQzE-nUbqRj=J0$l}0|
z?|vUQZI4(GZ_4AQy+4s&ZETPQOE!)ukIQ8H)w_eleq=e|;s&h4i&Rp&O2d8#S`R`c
ze)@Y(*13cdo;;}H2r0Cy`>-)ZW5{Ttn+h3*+}+E%Fqkab*`JKjNkn2LO#2e3+r`k+
z&EMMEnWitShe8$bvNuOzVoJ(OH%3^L>4I}jUi6za^<`e)xJ&PQR@mLJhr!;5V(f2t
z?Jk?mSGDJ1z0v2h(bF!bxc@8T$Bxm{D{S!(`8E&Zi_vFo&pmU@?Gz5f_}ixEA>sEA
z{A}{~*ZOVX)hi)hQy+rqcz7+tRJ_9~r)_LB(~`uO1;NM}tPhq!cX|9<f!K>)3%yU|
zYC`PlqEeE<11<3fzV9yg!>^~|Y2Z&_3*8LwYeXvk?CuHkS5*R{O`mo?xw!480Ncpn
zHqmEPJfiA_5=ZI7hm;oF!UJ$I%SB)9%oj$s6w90BMOM2=(A@h)CBC!N0*da1Ttip3
z^RC)Dl`fRpI+?EI8av0z;kJBf-qNa5My@5*4Vh$_!I<V{qg{p3JY|W>tg_z{mXjYM
zE=~lg?>PW@ovgAnE`$lw%-ZQ4iQ`{Bam*4~Wq`A?;2R)AED40AW>um1d6rcU&_8Od
zptgvJw!{>nf~}cliWDttVoQ|5%@!~-rL`>qMJ*9s=d@8GYfx3iw#$N2g1JSpra?vF
zZHN7OE?C===}R*%;5H}H7I)MZuU0_)(SG7<doR|Ge_fw&^%NN9;nI?j=W8{m;tR}w
z+4ZLT#pFeK^UDbo<|l=1%U}6HUOTITaNz^vsivz{KjF99$a%#t9Ht@ln5`=yk$Q*b
z6_gj+QS?go59Hvbj0XshCH2KN;_Y%H$XbpCt5St=JW|eR-}0Bnn{jwjf1Ii2*KY8Y
zPp>LCFR8Z9nmotN^H%&mtfa4`-L=@vD0>ff<HWl{0pf&`=K_yo$D2J46v+*|wBF|=
zemR(K1r=Tf&ge};bWNk7{L>lW2bCDz@T2OL=Lb%N`cB3^^|6gPl@HMAX!Jpl<C2D1
zg^~DDz1IIDu`{O6U5yLDX1d=pJ@i!EV)3QK?dwaByRV;9#xk|kLMmteyfE(9u{XfT
z1#jX4mN2}y7sRp`Vs6+9l@pDdiiHnxWYO3m!3+_4S5xpa1hjQ~h?}^H8uIt-ioAW!
z9Mrjv&qcY_+cIlbYfT2m6eLHX!Y!YM<p#iy<0E9Y4|!O%eX7+wB}T_)S*53OT_>aR
z)fK}ZmqbuEFG2HR3Fx#nk&@CFb@+NSJOe9UFr?>(H6xZa#pVM~@rR$z5AzwfplYZG
z|DXx*AYrr*N2SV`FSwZo&Xk+-Sij)2K9>(3Hgzc<PW6N7-E8<K?oEjmh;F(!$M9I4
z6)UFC&M#Awv9SP^xk7VKaNfW(&G#=bCg@zi(NMCwrEV2Ve^v&HzOnpkvDKoiqfyD{
zWye5Q*<rK+ci)Ux+J+;2eP%&nO~GTgo!)O<B)jd#gLdjRQ=b9BqR&@xg~mGgfWy-Z
zzq%7p{srZEE{8d&qxi5}5w!!%_yfjx8}uR)@PI_buvj{cY82Y$h;(hb0#bnn#0oOG
zyD+8rrp*nm|Hgbmcn4(BefIi9z1OfbevW`{K`$CFP^1yk-5!|S3uMV`Jau^%xz-09
zNBee#OyI)!t?Vf!wT!NBJj@YT-@9zKIoAjc5NO9MeKazH;|~{I;$tnJPGozlVHmjB
zj<qm+v9wA`Sf{12v>G(m7tq^N@vdAf4{Vq@ou+@+1=KN*oV@sHABs3g2<l&|$Xt6{
z1hHwJQe70oc%Lg);z9WADrv{#FeHiY@9gz)%B9~8D21ObGSkW7@tZT`o;Y^~-^hKT
zVr#-8(8@odnJgrTy`HeT;!iI^66hI9@`)nJqNR5(wg7TlbXbTL=$%uzSQf>Xmg$Jc
zcr#lHCQdk;z|#_ik%#`Wzf^vuJpB;`>0?h8myPfK<^Iy7)fny)@7>LI_SC`9%$=UL
zK`OL<1*EHJU{!cLQAn0K-I`tYk2k|~vSzRb*<NH;L#LG`lYuVFyydnWNQdb2I&Tj$
z$#V19;yHHm8UlGIy3g}nrparGf5G6kE;(SBque>=mDZ?XaDG`B2QFbpp4j^00(N40
zl)l1%oO3Y<Ez9RmEUT`4%S4$m{*!F<mW4a4A~76DZa)82B6jlBQIEzqJdu5-Tym;D
zvKNk6&rVF=3qAfv^7x6~UXa%-o*{)nVA}p+bGfP`bu*P`Upr04If-6eM;cq944J<8
zx32s#Z?4%RY}Q;V>R#sZi1Yps4CRCx>Vc;N0D;VtUvCuV+-szA?%~`8C10rfowh64
z*9C#0G}s3o?*#CKSYIUZ&g+$vzQj~ls^Ll2JLdWXv9`2%^(&rcVE<ir1n%lYJa34O
zH<w`#d}}h=gRUOrHMR%88N(6BAZ9^)XCQr||K~t%Yful<esoD-7UFh~t_P+Uhij1I
zp1m(MxhKEfnZaO8;Djb%AoUa0V3gsG;tj1Y%K-E_{|$T3iLZYq|H%DK+b_QU5P|VK
zLZJB1oA~HVzDC(2Mhcftvhpwo4csRg0Ccy==BS<$Vz<iWULU}*Temg)H<jld{+NEJ
zd~3#?`qjusz+cWY!#j2S4gZ+xyX=8?x4dWKRcHUUUp4HYGUYqwU_6pps=S{tp-a&)
zwb;iKCh!i<w4i@+lhPNz{5``Pr~0*E<Oe6H2EukXX+1jOqP%}epn*FZgXFC*+QEye
zsUk!^m0|EZ{G89}j-^BCgw=06YZ!0R1=V0RM_B~t%wR%Dz7+U<om-)Es^~9=+t#H1
zCHt?t923VXX^R<ftEcbe-*#tT`DhiT>A&r=9&%Fu+Nc)s0?_Q-YWfujOdoyu-coxw
zT^Y~T`{Kd$j{53iGnZVx3_+SGI~nSo^0SVG5(UJ}6h0B%rPPqyb7|0YR9e-Vi9iWa
z|6HG@NwYDr=r-nSH#mVVbzNA!x*{x=qh5Wt1RWf+Sbo%$MAgs)7qf1kedBI*Eaz1Q
zeVjjn64gu->G~OM8{Rh{4j>5#LkmEo@rob5LuHL940ZYmvAkod31LmWYhCOaD97Zt
zk7$9XrJI~epbO%$@`H9nFeM-yKK0w|FT<^ao27OIB!Xm&FNtRa4NO0juhXLb3~D)z
zZ4^I=ML4M(e%b)(1iZCo&yJj)lwJ6JB+aGKMA;3BP+$aK1p`O;y1lG-RHp07;lHLM
z`E=YDd|C@Z7tHSd^YPu^8Zy_<qki+L-Bq(j{|K&pN>uHyRpc3zr+z{VP3kNU_!o-%
zC2zddw?Gt9g$sjM;8h?;-L+**VSBMxjY-K@Guwyo8mA~L*Wn48*|sUqBi88Z(vp>a
zLa|2+2Lqf$lbeEk0p9_-?eN~%5B(OzKbr>tC$qT$ykw7@=P*T&o@WL;8AWJhkCugG
z%8`6+{V@ibW<qDIprxsVZdl;T+@Ic_tDpa-!liKOQ9wrl0&=7P0{Ryh_TObV4lb@v
zfd8$&E!Fb$K|Ox=&ofQVq(wna14AJ}1S5L&BD7LuB?U%z$^-?A=Um4dIxutJ&J~;Y
zLaRMcvj@|WsYORnEol<Ew`f(nT+yyt*;w7sw&t_0ZL{*X?Vp>zY6^k7JHL(hojdi+
z|Ld9W{?h3$@W6?LH)zm#4)IYFP**-z`X0{uqk0CzalAfdFnLCkdgHca`jIaED*fY6
z&39bpzvSQW`>5<P6K$4iPuH!}68DrUhXF;5yh^$otVpm_qtw0nsq4uEOc*6XICOln
zGQUzcBrjSGzr0D}_?|j_Lbx)U;!cP<ol5tn3>%milTSm^IU<|lfi#t(S{EwMBMR5A
zVp63vzwE(?TEYDhw$90!ZB0_8+95aFY{}fBLq7|`vS$&Oeg+Aepz=WpdQSD-f}{10
z)*>k0@v+e-XEGLg&h7EuCuq`nt0h4}^_`T1<6bw=27LlORR_SVpqatItxXuKa2!f}
zORQz5(y=W!C7K5Rv_&PCp1`?2v%OX9P@nCxej_p$4b#vuGE;u19GYI~Q<bf7xCFR|
zP5rCJuQIz_iiJq%5B%#7qEULcXM)BA<=IK9Pg(^tX-ilMRJSF)glb%sPunCDl6l&s
z<GEZa%3^)e$v-`sl4t9rwWvDm92y|M{9#R%-@uIlQRW|OA;#SKM~;j$onQIf#OUG@
zx?b%K`EAnJK*rkqN9nP<D}&dT=2@+aqa^%SFP|ALCVtM0>K|OFaXCI4`c)AqP)s>r
zx<1sf&9xoY{#Jh@jZ2?En~RI<OS|iK!i+!ZF!^OMa4_2FTqX+#g6Pf}DQ&awU%hgi
zHKegi3!59;3(Kp!8{0FgX=Mv5D<{@=7tgM4PjlCoT3L<9mzrD4C)Vfo7kRsDI~xmA
ztVFFV3+uZ(8wb`G`KQ*_*GNU3vZdYb-haJ6y1KZ#y>)a<o57Gjo)s+wU-OS)7>`4P
zM1)Y1=uDMCBQxwENQ`8420W)DD1^;$bK1p>gLhKzCI56cls6Ysp)aio##=c^60m+4
z3za$AdT}B~gMsce7<n~@Tz?)0?-y`|Q?*xlF(p@XAqO-?Zv+_?lQ6Lwj(9x>CJ?bl
z1r(2Z(Na2_F97NwgC0WI{Y@uu^pK!%g1weEYb0hwrw8_<8aM7JWCiJKH#W!C-?nk8
zyyk|VE#^1Tq+ub3x6}3tl5nszp=@tFbx#MRhZ(wIF96;*t#vOrN=k(j^?z*vT~B`q
zO_hjO;l*)HvU&^-LW9G&7?5!mXVABoGtJCVSfdr!Gu6_6iHN7$)eSgMa+*HXMF#o8
zvHBQ`Wsl^1T`Y3hvr@l<3OP&0GpCm088eniXn=h=-s)Pz2;Q`$6+}Dk6;L5TilhGm
z6(2D>903KGtXue`Z2STv(Kj$JlY3ByLen(F@`w$4VuO%XN<49$fCO{3?{3jsC0Ata
zzji@S9)J#$Be97(R?+;9Xgzw?(u0U9)j|wSl`DvoV_`#Rn+VXcVL7g{N))7u3(4N&
zst!8A-o(ftSAX{@PHZ-&F+8Um*PKz!E$r@d;6;iRH!edui@|ntFs~X0)WFkYm|X8i
z*J|n-h7_f}y;qY;jg1;fFwfh(s-wrsw2+db9f{U-$VF~sG8RLjh_gNs4a7uZnS*Y$
zBnNKFGs&CXfsV1#UPlLIR8_r5(-dRznsepY<@gF))1pVN^T@KP^?@QFr|%w!Vlf{$
zPPx<_dohCPXaM3tD)`qT21B>_5=E!&|JYc|XIUY3Ve?6DvUWw=EuPtRNfdiq!Z_{h
zKuH(>J@boYIJUR=2Wji>x%-6oY1sOr>Q~>ezstlG7UK6|{!ZgS8&u!J`H)OJ$Tf((
zT$S9<uupi!x<Pr@OFwddX&>q|4B~i@EWObZ4-=?k4i2J~jkQ0t?`@odfhH-Vj__^4
z44p<pe>ngnC)m^YWRLCc%K<sI47topdQZ!Ni2z56*5YMWE{a-J@fIo{-acGo`^VoZ
zzRAb-&t(^yUryfF#b5_B$`4PT6^yyxZ)5X`%o%H>V?N`vVa8fLf%Hb8(d^Wsl?~I5
zThzqhltERcs<&uJ>(`{bRmNx%Q~Sh^y*{9a-Y&iQ`3WA@egYYrF5?#72lvPw5(tKV
zCJfl8lT%3^Hk%UR9^WBFodNF;A1oYzLQLTwM}V6b6JbX~3fBx87mmjaEOhB)^K|Qc
zcys^d)*h+ZGtF?P{A?JDzmqQ$QJFx0gnJoXHq_vjuLL?aH=_t8Sb1ae!$rz|F{8vW
z7XZeQs3}l?3&;M6$X|Y=`fe0Qm|tC>TqnyEkvh!3Tf+Vd-9bU{6hAZ<Q)3zWsM;%l
zcf<x6t18&Fa7Z!{={JbaKCdC9{Zu_Xee>j8q_l)-@?hya!4M^3hzis{$fx>j8tXsO
zK$QMFZ6OQpr1TQa16{6Q@kwo~_NIZ|KUN=n2s+&?yOjNW2iyFRqd6bqE<qi;QicR`
zNi+_6h={GfU2s=FIwN!nr*tey+v(9{$mB`qU)AzV1`hz20{8+rn<#9KA0&x!E#}Wa
zKNO4m7b&oR!u+f6Zdt$i`b+N#-r}MAYwz<#Rc`0mLw{=SyP4l%hBa@a(FGFD!&~6$
zvQlZ^sDKXrNKC;P@z;=H0}z^#%c8<ymokDn;4Vex&m?@pQ^+C}B`1+%1x|QaziIr5
z17ickoGcp-)$cbPYwvg8RH)!;7fU%w?U10r(tpJQT|nf#xqr*TK64o!3_8Qz)6#y5
z=$4Y|;BhSmyHTj98dR(@Kk93x+PCP4KzFxEVq#eerwsv&*rYE(0$N0o)h)B(DoU}z
z-R~y=qS$sad|(>1GosRZ0+hzkiu|PkGNGfix4D*odzi|eGrBT?B0rY}A47-5Yp_0I
zWl)b?=z~~px^-RQGi_57et~gagl2_nC{gT)t^D#x*hAezTi)JSS_?~8LR$PwJRHH!
zQ;%C&ou<XXrku76>RoN2I(1Wiw4=bpYlQGk=J}i{#B_p*S<9yvtS~1`T8;PkY_SY^
zxS;MYh&fwJ-P(^O^)4x;wptvmlF0}R-)oB`c;KnP0)O>;9~6oa-2gd7yMPtP-C;$l
zxCioNKPh5lb+1W$Kj2`HzNl%6^P~8nK&kBtQOgjGZdFA!V{{U^+kq;ieWG}{Zdcq0
zf3{fEL|ipJg=oxLN+4z2*evyy3OckBJY2ADS5%3gEt-KRS+y1ctLz_8lSkut&dAI<
z^v&=hnVv*u;O8+ki+^#ui?r}YPoW#kFj_CxLm<gLq^AoM?HyBO?KSBqzN~H%fK<<3
z?|lXGg@Q$krTjQfix3O5>CaGZJ*BDgs;2-MKsv9jR!U%IGcV2>iWuqD<DSM(vWLf_
zxPC5Bfq*+j;_suz8LYBd=lUy={F#7+kNV~Mtq|$7Y>#zNd>^tKpANG${guNv37qxi
z_Yj)v4r>NnS!J`prx>I{xSt|vk;*x~T-Ce64r0+ZWN=ky&|CSj(%tQsYsQyyxKx8y
zF_Cvb?SM`iq_VKZAGHaXpL(#s<+D#|$vg0gwZ6GJv%NmMzP%KW%IF~=UJVcEKw_c8
zz>#tgP&l@sS8Ylk+~7VgHu^Bx$G<|8a6mETudV&-WZx;_8LB`aMzEBnRJt#R-`>wd
z)EleouudReExvRXfkKM;H4DA81uFgsIMuC7OtRs*L-VIZ=BTMp`)2cV+?{r^lG|bh
zN?|!`|LWMBudQ;%e~2ob2iJ<}_({oSTR_`T0(-e)q;8>p+jdk%1t)wHw_U_pI$lhC
zS`5s>^nPHo0isW1%#C-=q<QfiRa@~c6O<V@QbCw}ZHbyzUG5Q%f1db-v3!{J&@x@L
z-UW|g#t?}fr@nlIrTk3ud3@8p!!L~ec?B9#HvjAbiWFNMd@kPg?>8l_{)83g@fqte
zGh;W2NdWf|u7!!OAMMc|Fx?;fZj1GJYuHBx+K>Hs8#mDJ3-<jgzPFpm)Q|FbYd+0!
z=#DX)e!uM!zp^W%Q}fN=wR>^TD_#$LDzp*y@+-r0f#sto%jn=2T|@Z%$v<sC%eD{@
z5Sitlk5i*xd^RMH+BGL8wjE`DJjcr&?J9ONf3A<J)}=gU!m0dus9ZaxlyUTq>&h#O
z%C?TF94LMV4SP)gA+-dme?}#@yn?8zM>;Fw#>g_FwwvCRI!v=8QSjVhjNQ%3N`qet
zscp>*rbXrWL%%7zWW{%U{yvypS+c5PG&8=u%qv=F#62>W3%NDc^T4Z^p_<o@W;{(H
z0A4YI<c%dKxCz^+Jt0@CD*9M(3Vw%7AXgshLP}S}wG3QCuPsag+MJ!Hf{-g0eXd)h
zD=Tvjo#TX;3$d94ADsuaeaY!PpbX%s44^KNfW!tl!SqVOABLoMS*9r-rxQqAKpB{A
z6gS?~y>n#wLhPWg!I+OfliE9(kl-38#QT%D)OJ<!n^6!T(Q6K^>UEanHK$shfAVCK
z^UXN-L^`9X{K{(S${ez|yn&~>a#Oh@#m4#XR_P^P?_`xmzdX~IJ>h@-5nr_8lOR2x
zfK$~}(Gif9aJ4C`;+~VWwxmsS3O~1~NnQ3d<7%s@bzip*jipy;J;mgz)vqZS+T|#%
zofkS>fdBV#9i6wu8m&k=P!%J`6RI`}WNTRPoWFlZErV%rLSpr2(i5{TER}Is<<4=#
zYVqeH-iMZXWGPJFbSygCB*T`z^oIEwS$IYF!Y;-Y+&0pp#5goR(`rGcGB=^mKq<^M
z;kn>dDTqH54R_6}#AMeVu04l*&>Y|hzVd=}gi#~ZvuQV;<R+E#GtT-HjkbVioIERk
z!kyrYSHpM_Wn!3*h9~JCiWA)~%4NlQ;nFXvW|yK!8LmEE_8gP+FLGdU1XT-A$jm=t
zq&_6aiiUeI3^to8G7bje&XX_cg#Qb7Cnp?66>y41RGcE1oH{|dR8Tscs1zpw!G-i*
z0@XS4t4*|p%dq<Q;=N272E8;)Cnenxv4kYnSBxLL613nW-~$|N2G#xFdL}o9Es$Yb
zicW^Fc9^vu?%(v3p~LqWx{qPYJe(eoKyFGn4w#^epxB6p!*Pgyko5+cI3HOzJAbBf
z>NCbS$G!f(=ds*ZCTa{u_uL4p?Co7$Qfd$8PF`*;5r^13H_ZlL!>7fy$vmb)6mAMW
zl?}gT9Y`1#W;QBcBu_CLzidzuN;X_xbC8bn0d~jaL5t~JbaD@FgpaoH)kp6%7;~%_
zywPBROf6e6u+jt1Srw!ov!A!O5$?1PwB?B7`AEo-`}7$Ve;Ca5#?~t+Ba}l>u}}I)
zo1m47W)REwKCES}9Fv-Dy3t~mEjLU^E-B3pB<0H7t#z<H_{eR6<@c(3t4Nl|ogvQm
zkZ(?wPLjvy=M`~FT8_Ut!gDD*^2UP%jeS3U$L}Z21>&HFpJ!*Dd`xcXQCgRk;HbJg
zLgS&#*wM}0p|z$RIMHg-O1^}GTT)CKLf{TKMx<J-NISJHws0)am0MhwDTz%L`R({`
z+J($It92Va<w-458NK3av5x&0VeQJ(MRBCG>0oOcu{LB8G>&YG!oU5q6n5RREsu$C
zEYpHLH~Sp2tgIgRPRlwtF9a3GpeH@!$oGrghZgY5gto-H_X2{KWo{i2mA?2H+PyZF
zb^}jQdSj>W;EliaOjBPI9{3BqJ|H=+D3-<ZK^|qcvJ8mYe_*)21YGD&7a`mhu5%>Z
zn}ntCB@mjWc{&5~j+k1aqtDe=&)DcoI6P_3&;zZYd<RQ&=1@Ff(;b=8A3gXnn<IH+
zDID1p_Dwvf=T3(`0;&g0_<nVU%^hgRIpO7pzk_cLSid{yk4rpw<^9g~L>Krye(%hi
zZE(c($(%o8?||YzTgyeSpTd&1=~UH8V^0363G4wk)D$6KuuCk`g}8or?*2qxvJ<)W
zPAN{E3lHU|U~lxQeI~o;i%%bcagOjL5ptN@vAGLTCv32X|B1p{_Mp`vPTJh%f!9>y
z%N)dxc7*x0UiAy`L@&;@IsyNR`(8g>i4^Bz6(W~(l4BtYyR^39z6N`G*w!yt734J+
zim7jk1}W9WDP{0lGy2t+$Xj_%w(2SX`Z`ydXHR<G1gENc+o@X>fYo6_KIxIhhacXE
z8@4gT?}cZkL3%C?TR(L7uTqM<9S?U+(^Uw|>f!mk%Mjj0+J_tM5leLplr{Bhd4Q$@
zPTvi>UepUxDTTxZc-#VS{9K$re6<-0L0hc-KFbBK0k~fkuYoF;ltYVq^bi8wb9ZtK
zP(h&VI`HeMFgd+`O!tYyv%RlR%V<q`ZFRlqgsm&5sSNgaFX^M#-lNeZ4AGDnq7j|i
z-6(4!gH$s+l5bS&Z_8D35>eVE<EKWIBHW{fu?L2zVeM=+c;r;hMjh?wp>_DpOSfH2
zyTJWwOJ0LyN13#e%GCK?ho-Hhd~Htu)5`?{=<%siN1tt}<4@;ril3m#PMl)BGf>DX
z4h8C;|Et*ZKdq<^`CQR$|B5{?(f$WdyNJE5!@n}m|C536zge|Z4JaR60NRiL@0-~h
zw~dlbR#vK(QdC*DO>#}kb0HZ?Wl728jF2>^m2)%6HXFC$D;o>N8cATK1QAiYs-Szy
zKQvIbovNrp$Lc*u;HaWKccKG7*||1#axs7ZUc2{r?*84m_rIOty}v082g0rY6k0xX
zW5_Y+Vh-TmA{x$R-a<QSkm2ON9ZwbV0XA56Xy@&u2*CIG9nUYok3EupkGB6=MZg32
z&LYs5>d_hQ6+%7a7pO}VF-SLxhxI;w<9}7Zwj{cCceg+|0Qz8q1#^Uj0PP^~7W*S4
z03X>f?5B$}0_vd{f$;9wJB=`vEMfW<7G@8jMD@%2j;@dwdxX`;8@n%f-1Mz3Z2Y*7
zBIL7|@Shca;zeqmAMHQcZf$c`9`q5e9ozAz$3X;>ClY==d*ktdcN76X>c=_OPu*b#
z)=y<2Yg=n8ySiE>MOWzW)wZg%wyrUi_k!b?F>!OY?zYm>O2E`dRae+X7M-n}4lcP<
z%ZhD<Eq5@DTK%5PdRVS};+7@$b))F7-<N10ZZ%Ujt+91>p;(S201dHXGwKy_>Ux%<
zg%*IQH(FWwv?#TuEhDmcxFr>>1tapcI`gXjf~Dp)23DHZ0(X)L8^gt<BC0gGF?qVZ
z94%7w8ud|ns=ex+D#fO!vycd_5qnv8Tb6ouBb&T*1rZk80S+7uxp(?mBaaEIrM?L3
zy4u2arfdeDxVxBZQ}w1~DYh}yrYvU_m`a&muI!%^H=X^CriCkU_nM;hZB?;rO@-+j
zJ-V(ViR)|VaoND^v8>G*i;Xh*>?!OvEIx6uElC&EmJM{h-Yz0bS5+GsG8DAuTDe%Y
zG{93G{+wFgVVOr4Nty+d%6Z3(j%tj*N{@g~N1U0Kde<iVrggi-j2%y!EF{fWos>he
z<wnf`w6nN1Q_{M*D1b~KzZ|XCMicMJNr|53Oec)2ZzV!sajkA&Y|_d#uxyR&?8_>M
z8sOx;b+k%1iHicD4HtYisa)L=ZAnI)+h2NUj@U6R8k1dDPl9|#-b=gQi^x2PWch#&
z&2+ZpL9a*TRrI;HAbfU12&7^TbDs&R(4&!;T9-PRo;EF-luNphw=!>|!Bu15|IIy^
z%5Z!lCd8arXdaKxx4*D~&tk;W@RZerx~woMee06(qR1Geo6nx|=Cbf1tK0$yJffn`
z&=g81LxKY%LC8iss&azK*etU6TdJvMnq+cP;;`8AlAVRx>WHG<&IFRe<H7(Xwi}J`
zPnN8XlC!UDkrFF;bh@;IOHTBoiw`0lH~Zv#030`eFpg`>@bVoE9>e~c%goWJ)VNtr
z=^+Q9O~F0@uYOMrk6;uYkLNh3x-r-&2erOv(%!Wt3Pg^Xb?T1i>B3?J0<Qkt18+?!
z^*4*!_^o4J7>A1wItSIX9422Q{II;XOflBqbi2qV>NU(ZDvocV;cV`ITdDI7^tJO2
zd=AL>Ip)vMKeM^}+~3q*xzX(|pK$(bcL;bts3t$5{wz)?oHFC<oD$=kZ}DO7E<H3F
zw#eoE<IAej8lKb!5;(Jp8L1>~A@1o5iHz5p%ixi5)_0bAo+%neS+=D!v>wn~d8{eY
zLr2cpD$-fWh^(O`6xEL{ra=)@v{|%jVc@h`(vik#-*a&TlO(^_WCpK-)D>v0xML|K
zW(ddu&cyZSF3^}$Q$t4j8SDp@OwaRt<j;&b)vd>rP4eiMu5vn7b2W9gcGcEaxUL2|
z<)a>wQnA_O(Yit$x9P-)y#=xRg;b@*b&2j_Zw(mP<rQMHQ3=Ch%WSND&xj!|jv~sq
zB(9Zy7bo=?iPhy*0Qpd}2z-)l4Sq34Cyy?};X#AorBXAculrc5F^i~{oIj&azWfR>
zU>8ot<@3xuq{yodyj2wT)a$P$QeCTB#rJ1>S-t`5R!TuGF>s9@x;vx7=OZ3)ljRkG
zoTn4NIWs}|#Chp%Q9R9?!;jr%ilI*>YqBCYl;}^oe!@HXIauOOXngrl<-_9wT*&?0
z!Ah_=os)Suc$$;&Pkb_4xV<IuTu)-@eUo|e&w1yP<BqSilDW{8L3D`5>9$%4^Jxs_
zJrJpNLwfu?h64ROhX3y2gtV<C-Vw!(CNLBw?+Jkm$gL{Ra^nUj8zoekn;Oy-#f4o}
z)P0gq&K>g7;9`Xc;6i~zAo_qUeH0=@=LwO|gX?n>iBe$By3R6bl+?^h{0gOZAx=Ze
zTN_0Y+R<o2SkmwmW>NPfDGUNe-3hYX2cF(q4o@d3Ob~%gVys4(lMoi0^<#f+PX7!4
zPwpCN&Q8Z?tU$^-?%6`(1C*lag&~{Rw8gR6j^ONWRK|EaoVW$)jTEO{2+%ye9cmoa
z-W%g#s@J3$0&xzFc{MTG^=7DrPMJRv^S$jQ#BGmDaH^5~O(}RvfZ?@EI9VauSu85#
z;rI>Y;a`IANK!Zo-<a{2j7GOK+E)Y4xRRz|geM}3uiA&K4;VMUbN?$?vn{-yl4H+o
zYfNDc$SP%wVL`hjXMIe_oIhkd_Z^DeC3Dy8ZwePmmV$9%FfD@;8eyEUs1nt^Gb|D+
z`8YF#HCeFgR0apLs5!IbDU;|aizNHOnHUCuv_g#ISyCw(#_<=eUst&U!s4HqxdV}o
zjCOypxqalG2s|H@56qpBQXk)rn5-*RVBI>iJ?LNP7%0{>@4MnQe<^=Q!+6L9xaSRL
zhpa|Z@2m+=?T)yRc0MQx6TNr6rx;=dp=w|#qa4>LFSE~Sl}b&8YoIapdqutkP#@Kz
z+bh2@wodPTAUnYbro#eHUas?j6@Xv}b}LejjEc-Xx|<{QBl^Xysodja$Z`}xav0(B
zhl6*Z9lI!pl);$~CfT6VI;yFw8d8R)b9plYpzilept&V(%fMe_CY0>iCEh15pgod!
zhc@%Tzn^I9zM3{>geaQ$=MlLgP*86~0h~$xh*OVukm^r|qMrCC4#b)2cF?==YG0Z&
z(9HR0CGnl7B{9jg2SGj({S77bFH0^-gQkN<SzkcKe+lJBMMRf|MVE?~?;4TnEZm<B
zB2*%hWGn~A^){JPrf|)#rn$>A%SUb&W5oKpHL*q4forfd_JyB<JxC(TJN&}5`FMt$
zOSR_o<Y~=H>YZzdY&9e1jQj?<ItU*bari=Mpj3`)N;spf@(2F;x@bIl?=-~W_ewq|
zH)3#l_r<<6W%OiN@Sh&~H;(p<Iv2#leei`4{KoFOL)f0tR;M*8U#wj&FKIXIW9BQF
zt5wLB9#xhFNp4CKBjh#A3zZT_({Q>I#rslGG<=lY5$c`1qxr!iKsCL0F@5@mqj&L$
zB<3dfC8B7|>5d~7`|f<)%9$X|L+_}6AVc1o%HDIh2_f!uD6AFrR|)5Oi{Xrm;yEZ4
z`jDEVOp|sn@;2j>8l$EQiOEnXiEFcN@g7P~Cc9>0UnYk&+dUB}I7EfjVos>mU<<rd
zNL5*k^`_(-@*XRZzkzec`cBpn*F}W<$bTMeYTcruxUv0OA;m5<X%zvKD#w~-=q8=e
zCZXC{p##vf%1B}hsdYtuxO2!Z%_OgBHW0ac9iSPR{RI4Te$%fv5|#D>CpWG`tT~)U
zaY*=jvIz8rdpdYOTVdC6;ixdaO!VBHNB#fR;AE5*>bLzb`3ndP2#DeT*&*B8xfq$a
z{HN94+1cKSRO6q`383KcpYS&4|1Z`lS<ZgxUvS&5D>4O>j^t*EPwJvDv>UZiLPsFA
zT4F*1u@|KkLJqsxafkF;;`PujNF=lpks$87QUum`3t0xF)=utvuIK6c{m1y+5(5za
zpmkB0>o0cpKV8Ga+uZDz9TbY*Jd2U&n%KBi9FqhzC?DQh$eDMMf-JjRQbVeS?`m2h
zxv@npe-#aF5l1AxO;K_1sv>ve<;sF=C?H+3#-JqlV`WopVQe}cMS6V$tpxn!6g40c
z7Z~E=!?-;w!wzv-;FmoN$dLYy8mAJ09RV-h$Tv~4U-5H@Q+zc_tH|A~ZdGkZcZzOG
zy1Fr5%Z`8j-JAXcIVZePr?HCru4B3}h}K>bT0=T4aKK%sv0-h_z%LK-MSH-~ZVrDJ
zfI><yBu%^5CyECbNuI;43w+x@M?cTa(96TSEJUv8h~?~>2f2E#zV5P1-O$0Vg`WOP
zo34zwU;Gw?KDduYE8cRqX#LzaSMZ5{$SeP}#iE4@f^(2Kmbo2|wort{6-fgo^jdh(
zEOgSdExF#W$g8|_Xp*%`(J=ZQjBm}McmBaSAJdya(USx8;T=Ts8ukdnE-g^iT&PcZ
zw%tF#A-Lm?+AcNVKL_annwnGNn--^J=jq}YQv?4EAE66TvMK+|{JMnyAMw$Dc~kyR
z=9i8Qt_Ie3oclGF!dNBW%ZAhj1V@O6ZzgR5dB`8v%M!~A7hfVb+oZ6t_3h;CMsss^
zmS#6RuVD1E*t8UOTWJ`njt)XnO6Bbc$pC6cBwoV%fDsgA1l~JTsQUmgw4coFd(s!u
zrkdRMIrr}$f&azUIR#f1HG6y}nIse2wr$(CZQGjg#LkIr8xu}!+c~i&_5?Ry-MSB7
z)vfBiR(I8YSZ}@d?(X0J^F8MCdX6ywdRO(iAy@#5#bxS5+#o14_(yF%av3?=(7KXR
zFg1ZI%MrR3)kHl6fV7pCWqQ=f+>6BzTOAvg1;d<=!c=-#8{07Hrai$&q(2$va!?f}
zcQ_5*4`OE2OQT;C{Q?Pa@n^-%ProY<6>nz3OSnH8#USY#9@4#aP+vg#Mt<bcirZ#m
zliv(Gcf^|7oH8yulYqNF-~2cRg47h-gPHZPvs53?%!*q~q{sLlYq<I$+}N#DN&jpH
z`$h11dRUBdg_*={&u^nw*})yHT;>;&0ib%gcy1Qw`y|~=B)*9?4vYN)p@mejucg#J
zahXt*<3uJ0VI9zQGl#<k1M`u~dmxipPqq5oXr3{{?BUUFo7$3weB?;HD2bTVpY$sJ
z;BNB{FAYIi?g~p#m0jP!NUCh5Q$w_}$J(5Lt!qAA8T*1?m}BaW+y@Bn(#RhUnDqSp
zbNI|7|2}_TYqK6o+{~fgrvgPMz^J>mAS=T?WZHOsozEP@exR<S*vdq7+fJ>`NoPV`
zzKZEotrAFFX%_VluKTolAA{93*VHmjK|UtFy|#gE6&DxPV%{+&K+o(0vSA?p&|Are
z#H~!;0iDVp-?<W-g45?<7<@(L;6r&{bKe9@&vj7DA@2CS@8Q*Fzk?WbaD=7OK!bG<
zb*|QauKJywVR2)K7329;Ygyc6#_F~mbR-M+G%T@C5oNOfJ0rWUZMd&wPQ*wurs!sy
zsw(3yxR8;zKUpmsl7`rPyrRSV;}^9|x2e3~B?bx2qY0s?t^W)xr}~A2#L$FSSb@Dh
zin<@_aewT&tWbXyO;6a0T36hinzuj7e-v98nCxiM4Te~N!?7%yHyAxNd-h$TWA)Ja
zY-<()Jrb3DKPu$$LFA0MrQ%{u%2e%L97L!V8M*XmWCI*CI1j%@xfdQ}Axx#q-Te~J
zDrv>Cq)M)k3J&1&F!5Ioa-*(xm2u#2Vhi><+o?cFQ2;0H{-;pM9ZZ`l4Ec=O7LWjy
zPpax_z%N3THuo%pHcUIWh0O-9f=<bwkL6m!;^<d<lERZ!8U<Mw7o|}rJ!M&-INd45
zqzHu?^dC#pHDn&!UL#~tCczgSJsKu50WFJ*dh}}#yy2G+%qh!hY~m|>9&?Nkd~A-H
zr`h#Qs;6_S0XF*4k$ia-I3(H?T(GBh)K)u@3n@+ak=v`>dF5(jL+{Km94E~pE0yQI
zO{Gqf#FE2QNfOG<iagti*AnpSMCS>lqMY3@4#9G1dX~zYk|891f0=W7DeT)a!{yzc
zT(gG12EZeIKvBY{yv8(GkxzD`(c5ze`u7D(k~;>_ZV?6F!xiT%gFce(`5&zdlUGAJ
zPw5v3VsU)}!Zn_dpo*SKdl0RZtl+OmZw!dq^K!GK@#~YtJcaxIJ=4`J;_xCEF)8t&
zl_OQY?K0)N<_AKI85TL~ec~4nvXJ>h$O}Tppz5ISfoCkrK|;s+vsZLT2*X1m{5&(*
zl-!)M>idb1^j4q_JGlMc?8#OC_<i2_2jViF^abg(L~ybuG5+VbTP*Cw?5>E3_egZA
z^-}b5%<I=*%Sm0qQ?%{&9zwRUqpcB(B#rzeyd*5>i8;t?=!v={F1BJ0(W4upE*V>S
zt7&rNVKr%MA0KK-cK9nTK=e)L@AfO&os&FnHSD39^oGNqZZ-6w8zj$!9i?IQ7=3~B
zEssbJ@w>Dg%gFus$bQl*D#Y1QyO?e@tf9Q5s|zi)NS9H&$sMiap>1N<#`+sL{ko)H
zZMF8WAbaG^65BSY>!b6+C%Yv2!22w7E2t!$0S%ZfkAf4^CUC(bo5VHtN5)sm0*ydI
z$Qov`SSLbbQYlsQzXjtsr9L<%KAEL9JmO1ik`HR+2iAB)(Qe;!Br(#M!t+c}G;g@)
zUEu-;(LSO8H=dKbI0EsXyIjfFKW&GkTXPs%39?Omjq8mMv@jqZnYbp3M(I*kwI>@a
znP#R7Cbxs9w#CD`0jw9A*Q-~cre33<clhXwymYgbYclU^u78}lR#tyhg?HeJpa~nd
zgxkojU3pAX=;TopVYRc+^_LRhI-|;&W1t$I9lNXg4JwJ18RZiW$X+yYkpgQUP)gUl
zJ{=355UcaEDsOA^0j;+1nhha37yCc176pXk(JwlJbG12oV(>{YAN=X%eT5B32=ot1
zgBlwEw@O)D{%rWa(ySg>yq{nOITc`zt%|#4{2Wn^y>Sd2l@1txFt=yfZOG2M2U2^2
z&@w1;D~wd+77Qt{!bYf6(W=Ob?55_gO;Q^6`~LkPAl^>y6Ekg3PGH=fBf=>QKE^D7
zN{%kbgZ%sLI`F^mZj#q@)8Sm-zRCIiKdfER|GvAan%T1dZ&se_hVoNazvU8eowmO^
zEbS)SEs|bJkVwW5%1rqNEk#8_)kB8pm2PosMWca+d$Qgau2onIA&$bdEI!my)BV&^
z=dZ7=pYl2R`-%M)>||x;^G;XrYFqVaG9!c4a(Xfw_wjUxzzgde<S4!Y9=RU@9(Ch$
zqJ1Qu_v?1IFa2B}>`P%0rpq8P@H(q78MCW@B!2qs#02CFH@Aeg)x~zJ6yWw0MNn8K
zd5_X9KR1E`@HP(O$|n2`JUK`ACfPxQFgT&}qb^iJyD1_Rd@YOkZbFm>$(&32%)E*s
zD#yGC>mNFUGVsiwO$fLyT16xE@(HsnCYQMRCspdf7LRWVlHTNB?mxt+Z5-r+&1)F+
zg55d1EP7_{LqVlyj*L#GS2h7z>t&lnR$%0g4_O1LTCUL;fZ8S<VP&q);pB0x*Zi`R
z&DZ|2DY_;YoHMP1c(Rk`EO8Cj;IflV*K(I!%P4o<3B(v)L(Y3%s&r<~*+!AydTF1P
z$0jv1NUS2o4a$+CRR>X!8wXVa@<!>GfaMKhHRNaQ5`}^TXb%SEB@g-73XNjmj0UDr
zKcmfoTGRaC^bP$ewAvc)+H_UV&Mb&e&QH{DTuUfb^v;>&3YOYA#?aAoIo6R)bk42h
z%UXMQ4qPk!y7UdpD974+ezJN-k+Ag6iR8=LCf(!=t%Kyi=V)?<mTL)EPF=6$u&?DS
z+@DL!+Jj-#lYCP>lz|PriKx=zuYK&dXh<i-?J_B9AMVGfYuC^liDxiy?rskv%;MXV
zXviSs)ZVi=3cB7NzoL-c9Hw$S9>ITmuA;uY@8^){kl#E+_Ke;(aE@O!iS+G$PHCS(
z(S7k3WbK?nnbNav81yhm$KQPZCVQ@?+Ux^@##rFEAxb0I8yVmmAdR_FCU{CG|FDS6
z*?ev%&)t1W2CfcWmC@aJ%JSJmtF&8Y%nxn8W|QZ(4GLl{!2-SJP#AAKyw=d_yg=ZR
z+y?AJwg%6XvS-vc9n{;`{bkcIy{G7ok!|j~pXT43{_$?IMaW)d?(sAF(PE_U`7`<{
z4pbzfU5f$_B>5%;>2Dgy1(=7*44yNF?wXz_(eiwa5jAgzFyEf%Q9k#6_w0?Vygi2#
z?%eM42Kddy6Y}lt>`4y45z4*|j(Y0u^-dnn0H23YKAQ#!WZ!Hecjy{cl8mIAi|dP<
zi!G$LlETU5Wp#k}TJyGJXtL`-xfZib@&)+}(9m{Q*#OHzl7Os*Hp@m5H}Jw}EDp#w
zm=qxE(P(BV>(OAQDeKX6PyoDe7$X2)SdSS1FYLzzfP9lFfGieF;u^OLW>`zPTmjqH
z{@Wx|N}^q~(8U|~mROLGy_Z71k2X?Yt`bkH*?NBlDuq0k1!S<}`uv|;q24p0zk30P
zpm3$Xd&ob1)Wxmy35d5&^)L|BpNb&QZc+dkE0FyYI6oJ52e%XLnOp3+lbo<fMOzB4
z6MurcltI{3;hc%6zia%URe%foHwCXT2@Rnc6VVEFcK$E61`YrO^jAsT=Y-_P)>Xl<
zm=~-Ytu<yw84XkmiMuCYS5(2N%|Nq-wqJ7CfXE9ZLUR{r&TU?o7%Qsa84wnqNFzhR
zQ$Y=>seQx49pSf?s8Fcd>n@qtpoB*&kpwY#5x~J9vSDnWkmw;w=-lsxGaQU3-E}R^
z4M&-m`^E-%_#kysl#NnNI(Ut6$$NQ7X;@4%5tI&!>T0-UfT(*5-$J2MeMc15go40k
zwQ9nTgk(33A9bSV)kdQ5^q%hJ6lkT|vPjim*fo$6KP+N=iH*Phd*hi<dZo7W1V8s|
z`=Ihq-=QQUQ70cW0bd7`mf}{9Ri+-E*;TA!n~#8%0?#)s5&N*pVMg10gdc%wN9sXN
z`6RPg7sqbQw5bT0C>T;*!$7DERmE}|83YX!4a}}YO%`EujU~y&(suf)e=C>H?(R!{
zLNzK^29acB*rQ6;(ILiZpUzb>l}N8gtq>O*(`S)L@YfRT!RW+|3dk9a6htvI^wNzs
ze_@*N?eE3N<vQk(wE7%7YddWGs@HUJ^*|ch01@^+rpRQr2A27BnR4)!f@E-pp<E$#
zb<x>5Ska0fn8EBpO6=%n<>9#)_I<-jTwo}*Mg8+;bYHq!ZwAw<w7{^+uM<dxq_Ly$
zn*aWHqS?s)kDrIZYsY+qm>wDm7tFY1Rbr@7JUSTO4*D_2Jo}6|eUnUdW3D}FGel|f
zlUDHb-wAR5<7TmppAqcKr=hOz2Ayb4&mL3Zx5F{{f1k=Ww}V9X8gO%uDn}`QJ?v^0
z@fJj4$1^KF8sMY7q1Yj-B9;1uqj2bX{k89sbI$#fjqN4%Swv!8Bmdn5g;%;f>7A#i
zy!5!qnGHK$7NtSpM&x|_hU(lX1mmR9_jMfEFRHYq)tfBUB}ZO_v<Y^o@>I^JQ0uOY
z(J41|w(_oDruMZJQCD9QE=y97RarsOL95K3L()Uj!QN3(=#0|ki$24#0RuTD!0ATW
z{?Svj5#NGt*&QE$JyD^486upghFQK*wkmG4yOh#bk4RLC-5?QR_XF}AG4z+}x|hPQ
z{GQrhPdo3+Ba-k>kVvp%EgH260R=SSiuheuo|em{RFd4RV`&kn0n}U=DIyz<zZIxX
zYF1WP>uTUSkO8F8S3xjrZ1)l;e1W|}OMUCxbc8;mnL}h_1b>6mAZ@^-Q?;8(^qb)v
z=CuDv*#miURBX>GMWQvt?U(w=ES+4=-H~b?R0`6^i+|wCt)<cIXT$XWp;D}N=v%LE
z#JbO&Q)=TABU(6LYfUzJ@EEBNRu98DuL7?fj^6!dGKyd8=Wp^c`*_XsjWipg_Ao@J
z`-O@#)y0L{Ma)$@3F~KOuHJ$OJItRYC3ZRMC>LZJjS5oTNkYIZxs0&BX>UefW``3~
zK=Qq<s8Py7!^6W;fsA?#A@TVcbel$1`m)WrSD;o)!8mFTMit2-l7Y(5bo?BWnE>)I
z1*b0*t&2H=s%T4WU-<RrD3ESa-libg5iv^lh&=35U#vNL!^Mi07<JDzY5{e!O!nVu
z#FCuz87dy>!LkLH4^q`lt0Fn0I{FB=>^gBq^7zDsvaJ9sR{nz`>`EB;(!L2i&Ia}N
zK#Q_1cICOIif%8R99M8qCUSK};$tLn<B~flvRS@r4^zP5;Qrae78%|NLohtlQd1?j
zhYn8=zH^He3`CBKduEdoBzx&WS*Faek9<#7QNqnMZZ(}f9A23_JKvx!{Rd>Eoz1Ja
z9tU+VX&+J67+_JK*w3buu=xTtPXv|X$@BZ9i{Dyzaj}7UMtb<Q0p=HA*88A3z<#y?
zC=HV3x>PrhYt?U0Dt7b5=YrDKd)sI8st8)-SU#_;S}=;OuJ&kxWJz=1)-`CWE?^lQ
z7eR1Iis*@;u6It7YBMJwu%GbDj{8RARZF3`283vw1&TKk;;Z|Q{<c0hr4_ZE_;C3}
z4>c~_$|oYV4n8*EqKg0&wbKKf%X2RR2M(N6<LVEoHYH>l7%#OJJDAkWCrGhhthmFm
z;@Le3bp^IlOzpW9;>uikn2(4*w^Ah6T!OQ$CZzl856wW#=8^PeqZO^$5_<b<?Zd+o
z#bI*s13Z=gPA<(T*LhsX!ufQ8<1D%gX{@7Ra)r&Ue3^%-62iOvUXT{!0j+dp88;$b
z5s8x|6TMxnm80s@BqI&9Bn#RLGiy~mxDY58cHASw@?P*FPmhr0Mb@C(pyEVl0rjHT
zw!fa~JR?@=v7Rh?J05c@>`C1;Ziu|>yFLW7o!#GWrYmA`v0GJr>kDvjuPh=ShYI5A
zJ$^^v+XGsmP##d(S>(xp^n8YSkNKqM7-Ue~7qtUIy3?s6L~dI%D52+eU5IT-9G#st
z%#B-i+=>V+hYcLlNq5q-Q24L2k14QJA5*alGuGs)lnGIfEr-sxUb+k^l&dU6v{pOh
zh{4kKuGlj-rPa;mso7HSfDINZ%$w<woN$Qy^Q`t3nQ<#bGji?(`z{>LYwqJ$4Os1a
z=1eC(0`qb5R=BYevxp-6;*7-G)yATqZ3U0m%+7_?t>&=_t<{J8C`lJ`o_PYvMh7Aa
z`&JKVfNNkyTNpi`8FppxLr}Pryq!Db0xuqnrliLda;ud2s2WRopV5V0TP1fMI!v7l
zD4a&ON9*NVr7;!&MP?(1uF?jtwvp`s)z!(kTz_rnFU~;^AmK-(kw3R@Z0oG|Z8e#4
zJiW>)OpaK8+=D_@mA>7CgfygW27THDda0iEg!-+SYHmLm_Y$z`(7KdwYuM8{o1Ts=
zPy`Y@wv|sbR~ilTFrIqcP$|VQ#c`r(6)gF0HMNeOW?MUt)kG7y_U|t~Id0w`N>UFM
zc|DQiT@#Mo<I#XpzLk{YwOc>$?|@_lr22#zT3rJw#wgo;h_*wX-?@`SDqbtxr5r`s
zOR;8c60xm^L$@d_rTgbVbxrrO*v*{jnoET6-ceb5?~JZ&j->#9CtU;Lx`T(_C_>F9
zx3Nse1k6>JqGJE-96J*dT4#lpt&WwB@I+u=eqtn%f=#SC;FX8sQQXzJIz$5Z;$QJ4
z582~zk{jSkQlqlc4n8?P#O@8ISHn6yEOugaLSJhKsS<k7&50>`f1N{5Z2s3;HMp|u
zAr6_Y0c9Pf>1M#F@dWMx#qD;W=Hi!kXrVLm&XdM*IsBP<OQE|>=h$#q(>Mlfi@a|)
zmd4*0m5_0>wfFAq8kkZ?^&V<{tLj<+dX9BkV=_Pk&ZAGK0vNmhdPyz<pGN7CEr)Yh
zrz2YqyR{U1g6YJr+m_ZZ-KVMJ4fjSk0{Y@-UT&}j1rA39Uv3!RR#TqVo>?854mG%`
z=30|LO^5GEn*{dK_*bD8;Y>DXG%0nZHRZNkiK?CVXFXK)Nl|b|XeB;p4|v0_&DaM0
zj@sC}*+?~B{`ns2p7Z-U2*S8k&xebAFpI*4oIff>-0fIHmV_(I$}33jeATCN`cSRx
z;3_tlry0sqShZ)*qJ+p3t-=SYIsgOeG>l7FwN;U9>gp{wBQoF*)phh@7H?z1Ngz#S
zJrU|H>xc<;ZX#!BS|~CB+teDJ_2Sw`>$rnDzZ(OUIhUvHnYGVE8x6OK5!4mt<&K%P
zz37KQg^U<2(}V1>IQF4Dwv2|O6YYKIC9$y^^7M2PNe=)S$8cV>cBKC0sTJ=saq!~A
zrBd<yyO8FugTlXvKMFptrsnEB;tpv=yDj26bnh3J0Hojl82^RJjWkXcp8IQpKu>)Q
zvZ7ToB&@E9GADYBCjv4w_PZzkZgNeAvND6(>_pK)POZoU72ictM{%tmeUiM~nQ?}!
zjnzs+*Wo@V?ozSUR2fXWoQeNvA>H~p`%~3{vO+xnOus-9Sdq8`uXf^}BEw-dO>6#k
z->8i`Zb6^TpUlW<efe7<cq<Mq$In~AVW$}TP83lHz2>j9f{uqb9X;+?F-6~M>tX&c
zlX+|3&$Wge1_eLWY{9Bpx^|Z8=HpeVRsHVj($?bEsMsO^4v9@-rjy{{)0W*SO8<w{
za-`B}>XN%3ImxM;@TffG(sT)qJT@$~b(U)nk$2|0$^pYZeqR4r1dj__N(OT<B|Yr5
zI4Hu5dIMY;r4tg7eVR<J0Foo%_uoR9S-VscViTEknpi7FXAcGH3}_zpRhkai!f^R2
z(y_Qr!Bl%)3wrBv-M+Lrnt^#z&)yYj1(bT`$_;5$_8%sk6eoUwO|p*T1Jtc7vGB;9
zP3N@ap4J*SJ_cwup7qkDO3lK8$f)jJBKb7mG3>ImvnI6P=`DBl#W-nZ9E$smQBqNr
zq7KrXW7Ir)ILG0u^ER;s$r}`ng+K3-5(4dfX@H(a(dgDhV<S<yHc?rdjviK53dChy
z__|`H;kyeONT;StYe?05UwNSw(pqMRL;k@2VnGZBFWx3x#umXk+AdIoCY;|!XybRa
zvM(vMDeZvs&yC(Q<4z_HpN)mozs~`+$q3eUjJL*85#ZU=H?VvG()k71F=F+tEae=%
z(%UMBC~=-C<VEQ5ShL7bS*P-q!5UPri5j4wR0|6uaXD=j6r0~r=jGQBHcmqquQU%q
zGoh`vo0k<`y}s0lRq+#}%uv?3pMTgoT$EPR@!p&`DCG3LFOK{SP+*eRh6F`OP`m+z
zDW{gSj-AJaS+VjScrC7lnd2ilJyL6JURy4zM5K?N?d0DYUj(J1j=9!V3ooO&YNM)s
zieBYRJ~871rLysp>6f_NafJjd9x9!?7?I<)Ke-7ytIvI}(<rsa<qPYbFzkDb%z7#H
z2!`<2#ymU$<$lA+nHj=7>#K!Caxx+gV}wbHbje83&!<ebN@-3Omv7GG<JxnYY~^+h
z8!P}-=%oo9X&35g@w}>EI<+0^MOIxw?_C1Y56olUDw0r=U=Y8@;AC%UIT#V+V$Rby
z2()M*RBjl|@<MbZDWB6Ztkg7r9rg_=&{?Y`vKs}#38srOWY|+F7iMX+k*qQa{At7i
z4svo!IhKrkmlwSMlgI`0jm)i|)R~Pat|0RlV}$_5i1_)Fl0P4T_ye@wNTd^1DkaFw
z2dFf`7o2#nFk}0Dl6Do6gfS3z)EE64&F599=$OVQ7mk1nVt!XGTZVos$CwLVcFA-7
zR4aVpySg<bfxH#6rO9vBSS~m?sgfQ-Kb;Ik!a{4&`(R3Am!KId$foLg?CRLv8}ISV
zd|6tr;})T)nFTlw_tnZ-xC(QKo@NUv!ouSd+`idxEBOQ!JGLO<f!o_G;-=Nn2}Zl`
zh7B2>f)N&@9f*xB03yrWdv~g*tf|>VLcsIe)NIA7P1rP>e40u8&iZ$KWDX%t!PIwP
z-2lP~g%K3qc>E>U5yxNu_#mGI(&MLDIR5DF2JG1@^T}<hqm(YZDaU73oqWxPzin*^
zauR>ks6yZpWC~>qQ2A#_UvdyB^u8IiM-+D;xES%f1w|K7>dBDS{<?7@mkY15x?pGX
z0iVqG<kmxU-PPbiZ~zc(N@HD8p4dClvx&mm0RRQ)9&>kj*Ia(Eish*~imR62cImR^
ztAuQk^qUBs5T?~_AHfMi;%NM$N0MHp3NH+~2r*|nd_k^!2=P!k7TsW&d(ffeKhK$d
zssC^n2xW?h{zJl}@Mow!wAl>vz%;_ATTGINp=2AaP+~8VEh~13%@8VcqEAC~H9N6|
z4W$9$T>4In-H<X{&e1x%-oHBseTq@DpTRy%pg9VVivEh=7{2-2JFFT?C--OtM(d-)
z&@sGco#Oh{{R>W~>jZm+-2%rC&HpEQHiO~}!cmBz3j%x>ALZTG39U=f<Wni~N(vBB
zJ}YxWwr$AfkZ&SCd%{O9CB5HC_1!vjsBCo!y_2Jl*PlJ#7`(-5F-bUv!(`Q1Q!r>S
zReTVCe<6zf_4J;Uo%7WEw;hJB4sjj~#L%{stW2?yBuqu3h)!_=0kxSJOhy=QJ`%|1
zM!KNr%><Cws=YI<vn0QF+28-nuT-tvO;uaFkRI?8x9=V`toTfa^?v84>{~8h?@HcY
z+k3?aTVRLaK;9Y{xR>?^U8OV*_Yvd?86Z8N&XGuw&x#>6ZuhHtn0A7PCrNpANG!Gv
zd5t=$bcT;{u1-q&uK$Jgg3T=O0yjfGxaM2mC&kK#o}o-ngei5+bxZ+IK2<c2AkAo^
z(33+dB1JMKL9&KpUJgnZLfR)m+9yTg5XCzbx+jT%MvjO?jz9}fKM*1kmWvZg5hI$%
zHi-)U^#pBF8O%jD!#NdnBC;uGJK>4CDfy=adAAYENt<QY^{1DQ*(G-3Z&t6%qMYBf
z&?cq9SQbd(E|>#!-?NNVavfV)Ezsndc-MY(TR-Emcd6z&)`H88Cu^Rp=<H%y!WcHp
zaL!!WhMT_k{ACJcs4`fnljPRv#O`RV^9vhy`NwY;F_WU*C_0E_3bo66!@C~6lT7~{
z<Z;?dj2}>}|BQ;gw>1m(0V{sZ3KwQ*1owt0V}v*vYG^F*26-Sa438p_a*esTE5Qar
zXx?>@3;Ub?oza-1E0+73dFqzkBQ)<CX*D{axgOQR#L~xOpmr73*TnHc^z&h0z=`X~
z7#hQf8zbrE0#N1rt#&}zixgql*NN(qECSQ{M?i4V^$wR#I+w=5uGbtUWkdm&wA>Ji
za+vCn3>|u4-{~F(pN`#-%MH>risK&M4fu32<aC<0SMbHJkqJ?!f{T#U#&4JteeGfj
zBR1T)wkb=#XpINN36%)&gt{dW??ottu;ns#=b<zW<SF@M+U+sbMUcSkpoxm&5c)C@
z3=MVygRB!dJ{bil_g7W<R4{`}abq&U2`Ln4%<ZRlfz%O*dJzaFYL3X4iU^M-x>#GP
zLX$G;#uqDN&6M2Eog;I~WcU_ksYDH4IT-Ink;+o!u~N_!UR}NaJx9E^$vM{4-C96@
z?P){TxR38PD2|kKpvbMkwBYL5LQCrej|<{(%1HzSe8Wc)Vu`F#VxG}l15<Y!wBjWi
z{TQ(7CAiVYNSx^Zi$=%?!+kMG=aQXnp~b?<Vsxb%u!Xq?EbT^AcBaOJC8bg@Lo-{h
zBn8LBC?p~F`GqeX177<LF;@gIRUrfxyzPa9Cqah+T4TbS3A*uOpc`sI8ot|g>q1)I
z<5`V4FMwu@<lS_LCva%1Ld8>$eE%j4+Z5>+LZh=u!UZuy?1uvf@X?dSdN|R(jHxb3
zL|A-ro8;c>`4xb<Cmu&wjv&q0QdgqC{p2Gxrg;=6=UL3tqoi#izx3B{hiYZ?JTaU(
zuI33hF&u?KB?Q~L97Lk~Bo#t~pdv9SDls_lA0rElHfccyRyC!E@r1SDJ3^v560ej%
z^X%Hs!e0>;e54|DcN$S`!<&vqr^h_?&$Xi;f!>wAj)|t5k4zYP`24MUP=gDKPzB6D
z?4s7~DG`7jALUas@1aJ%>`@?7MuY4e*`lxd73imGZNRIW*mJ5!wrr7{t;{vj5c|HO
zvO%wT)u7u*r=5*&a#qz89Sr#x1i&sjBDFp9LBt)BL-0kWOxBH@b{g)WERD#_5B$sT
z<8*^!i;B<ykdFV30apJqwBH4c3@{##7zI>YvCh}sSZDtbUAy|Dl!-P_z7u3@rUGXg
z02Mwb%^dTIk2Op_q;$*6B&QH%ym$47iI_Uvx)*$4u^7wZ4FPW9#h(a1^#V=hZN;-G
zJ1tLCH;|mSq$kK`Hr@aD3HRoXa(etuM@OBtdM}(p+Bn<MiZ#3Id-w&R{D%E3naA8N
z$maUs9Z?{ie~wH8rK3^syM9GTEn@-h17*HyX9@HUiJR%i54R$GH%yd{n?SG*XM~Q#
z(Aon<p)wA2R6qF>iVx@$3a*n{O1Fit_f+xS7NED_!W{ZPp>x)KZRPCNU0DgUDe$u?
zzE;BQFV@N*>Y-9RlS3^xv%C)M+jk3N1pMYI^bc~^9FLkaNU58wo`rVn*f4ot!`t(i
zip(~aoWEuB77VQiNQ!Zi>YM|_0nroO1W=kUIEb;Y=@Q!0;ZSIKSjjQe%7Ou;IgP&*
zgTewSd#|uhVi<)O{h(p4&9Or3X1(8OxJ4X=*n6Zc?{%GMd%!(Go%QfLAu~7N&lrNC
zThGYeJA}z2UyP}>JQMZ+g@zYQH<rLi&wb5y_})^~cigwQkB!)!eS<e)xIw}pr?+^l
zXu(LP56$dg!RV$N%()of(c=$wK4P|;uGyigek4L@RX-Ayp(hggH#(MLw2Vff=L4)n
z`mzYTH7cIbr9GtI8qbH|g-w2PZizEd4!7*i<wwZ;&2V$7=X5@{{$hlGv7Fmml@4rV
z#d9$*UUZVF7B4Zx*AeCnH>e@41S5sl>-K(bp@_QWVO1(34Ln#EYUR;NoPB4O>D7x_
zu0uAx*Buh`k4`WCR82WCjG}%G9Axvaqhg1QIvsXm9>AhiiIp~qV-}xeDUDnk=3|~I
zM;gItG3ja0p<|jx9l=ghdY5qyZje^P@r<A;68{lPdHP<hW!FU~G7hB!Ua@DX9ggXW
zMkJ61JNBaYt(1A{AzF^~C%9Uc`6dLQG70dW7Evcg&Z#U;K0@CTb9}?-Mg1a^F^uYk
zoyvA%*G!|S&Pg*0>dwYfTWAky-i7H(awFZV<RPt#itCD!fcZFBnTn__C3yUUFy*Nt
z33x`BNpq_#zY|-zv;!+r+orxEbD<Mir9R{FFa^kk_MuD=OIH7i+e14c(-5|FW^qHW
zD$-t<{xM_MG~j8qh|jlZu6#XmP}^pg&@{rZ>%$qOqO*&eo_EE|&-{zwI!E|ENBXMi
zww#mU)gh<}{}=mWz;sVhxaxkrKkiJ)aLYf)lT-5^@8*nn`h#x6dU59-oaqP`1F-^}
z2-nEFyNHFmg824tacGz#zuSKTBi!qC^uR159-K<su^0+xQ^*q~vvZ)SWl-oYAC#r5
zM{KFn54fj?&eb$ju1B70<>EZdZ#M~nW8MgVUdC2?^XdOV^uSi!6#C<?DDS`e<1&^G
z%Rbt_!Ll3pFp>Bp5ky8cr|;<^;Yt^;BuUkgCK@P`bO(ubM2h*4M!K=;(KrNCIJ5Fm
zW$q$7!}8HMgjo*SE8hs<P;MU=?)fv&Y*SuCYIbFj?4k4j%zPw>i;YN&=%thJ)6Qm6
zcVJR(h<XrvLC00=<*Rk5{G+}9XYCeOQAD%%kU#}*Xsw5KZ{Q%*!G6bqzd(1Vtn*s>
z1m!RNre}2q)AD9n=O0h=f+jaj?m5e#D;vr)x@&u<!YQyF3CeLY{wT3DX&~Ca{rr<8
z0@-D-!S3c_-7$_$L_oAXlN#Fq*&LYb5V#Vtjx~VqXV#!-b2j1t?;i4Vo)=unGw!+x
z<x#{)LzWj9BBr8A;Eg99nFk1Yj~b6YH!eIAe=eT0^6edT(l<qe&WaW=oTWx%f#Mg$
zS*13q=Y{H6kOYl>&9^O6I^R!fau#e#dL}}ysehtn=dyIzdg37F$;m-*;Lt^}R%+WR
zUgu7>PH#}C{N0ccnQ6_13cyWf6aWR{(VPYEqY&<u3l2zqoVIQDGys^~K>p2nGK%v`
z4t>Xf{>T3_%F`&(3sV8*iuOB!Fi9pZdOr!xmO`T7RqpV~rFG0@F6vEPE!SmC1h|3o
zkn+QE)PDG*efU7{z>{&8>(KGwQ`+EDZ^TvImqlJ(MO-<4*_TuFX#B+jDUWi|LO*o+
zzJ2K8_4KKV_aTCJNsJIkju1$S@FemZjR~-tPK!)a{DzOWz3<X~_(_gX0uPi6sb#@`
z9fhL;W(*p0IG>OrG(`+#@AQGX830cp4bO$(tUJ9k7cGtSm;sTr0g)Z;9{Eit!p&8f
ztYh@%Kk`#fcOLB}T18x-<-fCP)tIlf#<1SHWHY78?fK5_`OJA?2zjnX289zuoyd7x
zkuwB?mWotK-A2_H@Tz8nd+eA;V*^G#e0adoo~WHMv)W-1gzfl^h&yT{Q`S_s^sCpz
zE*se*7Ok`KU$PT;dB`;NVa3GK2pi4--#z^kvk9kfhO7>N4Owcijv}~dcCuCi3aEO~
z0z5Clw-zncE8ge_isy75hwvvD?uF}XBubcZX3l}1y@{sqbdS&cKTbNUurIg2@weY<
z?(k35n}eHG!9Y*%o7|SCpE&on!pb22y4>CYILP6;i94Sl`~nSi`Az3<j!=0B+ZYIh
z8M@gxZY3RaZr;A@65YoB(LPuS<_pGfWhx#gP9O$|0Pzq4wBh&<eo`eA8Rhe#l#b6K
zrI_aH#Dz(4BLG!5DqO&_sVVy<xS=o8k_*&<e|8Sgyn@$r6V0!Kvk?qOv9FW)Z~{_U
zm6H#x#!u5}zNX!|33(?VRwZ+hemDQBNQg%?qO~vTV}d3e1V}AK8{-K~5<|rV&prQy
z!l`G5X`_Jg3_!aqq}s%soeJ~Cj?!=EG^&Sv;(&7lNd*;J9)06%u{AdILn9<zk{#N9
z=ER{T2KU`naA&YI=Jd;+F~1NZK9@ez!+68Ai!&)jEav6~^SaeB-stKA+d*z7pr74@
zqZhrGl1Kv{3#|6wdpr{mRn4FICV1-Gvhoei@y240+ghPJQJjHH799VAMd#%Gy9%)*
zxR1EpE}dEM6CKY2DSzPYNlQKW`VFksSm$I(HvCJC89aaD!B4wsLr@r5+DzP2bmp19
zDHG$V-9y-L<i$S>;GJ&>;#GOCP#Dn(v?(?v^(=l_$c~$Mx84MCa%q1iB(F-*xBA`r
z#oGgVr^GF+)mSeMc(*A*-ju$7UOuL-u`CfYK{t}by{lOxD}xM)oxANCUctqWWU5EB
z<8y5TwH97c<00Jf51uq|``=e)zm@6ajyyD_Z030sz>{}ark7Y2HOsqYc|Pa5lAS3U
zC&rm24wKr;2eUNl&`dE0zuY6`&G7p9z;M;ICO=j0EoAMhYvxXtQI4G7W+WXeIzN+5
z?>&<VkKAO)_{CWat7H_XP~}xbm7}GV2VM+Vo_)MDXUxnY3#g(z%ZXthF5rR|Wc_+}
zuTSZBLw6KP%)P4dl9H19ZI(S*fv?@%)C_qZ1oY!VnqeM&_Q(R#j(g8?qyi(%rq)p~
z8zp-~R!>Y0d^?8%Q*FR1OtC6V=ZAhPcYe(k@v1bZhdrwYmD-P?8VNBV2IH4vml$xI
z1h-6V8Q8Pzb*8g#Z5vxw&7NDk>{a;{M2+)7WCe5r%yUIp0>=`)Wxkg&dsf27gyWeU
zuXcq<w*@?w9jw+)s@_QnLw0n!VrHWxdUpu&D;%AY-9giZxDBaRPAp8!UAneA$I_O&
zS+JzWCh6)=EV(`*oBDKNDO!;ZvtjIqmSdro*~RA7vj=o6KaUmOHb_&FPmEB!bnT6P
zrReG#g^{?qZP_X5L;bqP+??dIaZ395MWHbO8A{s|%Nw@y?HJLEoW&7KI<Wa<dqSzX
ztflFR<+1l^UK=c#)R&Ro_^O0_$G0M}I}K;e*G)>!)gvYGKq>vqNYjJIqcTN2);(Ze
zx#Y6Ed6kMzf$@5&{_CSsCL5a@yK7J;`;;5ImW%c7EhCQ0Kfo}XtLaVKd2f=$S;6wf
zocTCI+1Y}6n{@-(a`|KE)O5Z~axf!<XnOKsZ!#i+HDvIml6HDcj-UQBnTdjD#8yI%
zhjrq3?j?tH=E(=P3v^P4y!Nl_fH~0|<N2s@l;u4`u^-$ef^p<{MvbI%A}?d#RUDWq
z=|`Jre(ZdMBYv7S#Qkycg)}GmgYbdi40a&|mOX%SzUwO+-P-+k#yZ@y@b(Oev98bl
zAa!bTQW>tDO9vlL`Q}-QZ$X<+0A;3=j=(-*<~?)fiNI22n{rYT-BP((DEh8IFuDk$
z)(#M#4a2<kgP#<MkP<L@WB-jmPw?`tpJ{QHjFA?%x8L!!Te3?86d3-jl~pYt2KN`s
zKQe&C?1VNJTY}pRt8)@}lzo~huz{eJAO!B*`&|DV{Q1`o!S_$MS}d}i%wN^yb&q5x
zBm+!xxiSUgHdKja%2pmci=*tbL^H&Wk9=I3xrmtKu)8qc$eTnfeN!&{oAiu9e{UJD
z6S~km#wI}G-Vj|Bb)kp{OV=fv-*(1hubaB!x;AjfzKWduE~pmcS<JfIQTk@6j|pwY
ziCy^7hxlG8U8u4L`dq5pu_F_{P7RyE6NlYiiJMVb2OM3}4kL=tAG9w&0%$$=o^GAr
zv<1R^4;Dm{XMV=}X}BfKMCRUlD-#(afgeN{YW0v&jHeB`y+m;t^w9L*x;y9ksp?Vf
zAkUz_(cZ$|biB!RQ43-cj@J#2+~VG(zG?U|_M-NVU6p8l5H%gf&oh3K`i|$BC2rCK
z#y`hZUYhiX0uw36KgW^}3A}sW)D7qZljU(nHRMMD?E1Kry+tjj<?>4|%_=n^9J=Sl
z_(kq>3bP$H!ZlgT`S_JNrS2=!3qCgI%?9hKI*#^D%aZ@9JklT2J=!0GfmPjg4@*6B
zx9$b#XC2Fib+a9(vdwd^k?U0561*ygrLhZ|Hj<~7R;c%`&5^Gq>tydf_Kg8q9OAvQ
zS(Ti&3-`U&C9kYH86Q9n{Z9qn_1R{ZfyE;%)#k`yxSDyY6|iBuntm<?T{F6Q4BYb;
zo_(5{?RE{`F)uydwbhawn>SHi`>w(q3%~Ll2fvye<BR2KmPaegtd7><$;D}AUhCsb
z|CW{`tG|9tdY!Y`MKzq9R%IESRx9aQE$~NE>k@Yge|=oDJVIW6wT^Apyf3|pcTS+J
zZviW|OwDa|t1s8PHF7=j*yTERa7yf(C~T&d<!Xj9>+IVwta+<>YL<9(eMfmTeHYgi
zObM2An+O(i8$4`gbY`qR>vLBOTDO<B8w6$z8U*GIT6&fYnjWp{bbVVq`9ypNimV-d
zSX$cnwwl}c`J12k0oH_GE-mp~{V15q-wePtK@5JGg~_fUwp9E3et0A`?qRf5gax(j
zxo}M5gmI42%J_NijdY13&pp;R5T?(`6CK1~jOkDoKZLw8ryi`!!N6-uBQG?&VN5K-
z$MCXjSmL)_qa{nW!d3i48lU-}3MwTLU^q7<GqiS|p_*N%ao6Ly^}?}I$p(0(^V_YH
z!z6x@r>KG`Xz@~WGF!;h>#0gL62-P<eIw5-u~JLZA#K;_N20pH`4X!>vAq4uS^AYM
z_veu`3Uno>ZOH0%^AT?Ed})<xrmegrON(2`+QTbs!KmyR!wxt%II-8*b)BRvlUZBH
z*vn#AB@%A+9Ro`=8HwhHeLj9U5@xysyKsKsJE3?JuuoMD0=8wm%a;B>^egT$%)Hsu
zeX;~O9}mO}HE6gAIb2W8QrY(A_i3^w$vJHv+y)OrwE+ydY<^ITCFL!HuSh#3$P^a3
z_=^Bpj7#R|uZ`fQfmzvq`JhDqJ?YLkuSaFOOu(WsR(#LdFJ7~+T}Chbs>v-@zfi@0
zH^sqW!2J1pOQQeq$27oy`L6z(;NX5A=KJ7G!2v0{;3uk}M=xP-`kt#obnK|-G^=5v
zUAW@c|1ACf;AhkxqSNnzj`ya#jM1Y1Afs9c_dni@#n?93L?Xe|rOh`@b_gqb;tK<V
zZlK=<_?Z%uKbaDHMH(0or4IO^$Zngc66F~Z5C5TX8x!`MOnVAvU+E(q`(R$|dtZrm
z<-)K&WOMCJ6b+_HMlxz{Fy}tsatsC%kbhvOJ){3a5p*EjGySe5toNplgc*Q7C~gSh
z+@~q5ccEUdc+$cc0_b<)XN>DZSBBIS!`1`oO%5@)7s7`a;%S9RTuFxIZs)<AN+!Ud
z6DoyW^5nz#dmE8Rei)O)laQ3*C5#6C=Mj(G6nczJ9u>XQ^BIk0kR{_fJEi%|z}xOO
z`%%g){7T1zW-)-|AHb%oSY9NC5R1aChV3H!<B0Z-et#5yJ$$q7+Lkk3Fsio+(*5O;
z`sFz<b)1x6v}N-0I)5k-b_pyGGb>=hQL6XGiPeue{wluHeYO!aF;N$i4R&_24rk~-
z+mVZkRmuL>KgW@+m%%FBv5?bohkU#1eRorbZJ;-2q77RKVW-j)!td%Rm{NqIf#8R%
zA)J9fbnzMS=yIBfWj7Awf;G2HU6}N%G?TpJFYH$ssuf&gAVGMTTJ3C_a7hoI%|oh;
z*_Ui4CdD47+qTp#>F|CVS7!Qjc;YiY^!Tr7Cam5OLaE;t710TSsCp$d@2f|9mx5<*
z`_Y{(&&eGqYq6j1njaKTMe#Q;J%mdms%tMBAi>05K9ab=^`xr}d4AlNkiAcugh`EO
zZvyET%pT_F9iYbQK#QTNwey2;L;!}@ebX4a7I@CRYk`oVtO-}V+EahIMsd)qXG%nI
zU;aMhv*3gE=rh&nzH|KRmyp&Dd_#HQ&<-9w6RZ>*nG1GYz~T9dn!+>o4mbo2C0<$K
zi(OP8?eZNrYuC!yrLJFUPdXI2-6XMskj?dZBVTXr{2vDkam@-t%Qlt6O06%K+Mrf%
zIyDx$wH|st%6+Gc?g!<7h*>#Z?KIlK7_mfLfx!Jy@A0fF9A^*v-CO34ov@y%65or!
zNU{W-sLcT{wn~T~<)|uQNTuTdHlQyrga!{|zg|b_8q*#DffeY_c9(NeH1_+3&)u+4
zfYK6=B5<M9$qNfm22s*M>@Ap-=+R`Y(UUB%ihbJk9OJe!7}I?8)S6$~*nK70*zGVp
zmV9NFt=7uPD6p}?&b(3eqN<~$nX&kU%2MI|qQD_(evW9{RH~Z8{xEFrdYfYxH@??~
zuXF|{6*(hwP5C(2rDfn}P;F~sAa_^Rl3(DWa3$%YP}iY09cS?4-j?-Lu0*RLTgv9`
z!umx)L98Ut>hV6?ZJM=WZNX)JYmL?GF$RNerC8EJG5&z4o{JwCGMfqVS6JrrgD?Ka
zdhqApoQ;H{vk&V1Q8B`?sldG@m&Pon^~<XDO_^(d0jFKKE)jTZza`p<*&m0=5t7kA
z$Xb%T93h*VHLG%0Ic5$4L2$?@E0OZ|A95bREh5n))dW6p0i~-bss8UP$=KlUG>!PU
z1#JPOYq3*Kp#i9P6+3WQ5C3*C{9)NnpZYQUaqX6L^VN3{;?H<@x!=EgsXB%sR=j0=
zVEI)Df*GF1_s75P*JpXG8Tez`ysD;GeByVWDVh?}9G^29C4TTdu6za!+^0E*e$d3N
z7!HiRo^$C2f`h+iVHLXMd<bxyT$yMEA}THk_AfldJJ)<b8x#jd;oi?&W4ya|MUU$~
zIM!=_!nB<m?iam2wX1$|3KV@tFrIw&c|PP_!}@auC?0OT);&jm2yPZ#A>+JURzSk!
z5f2&-(8jT;40;V<M90`6v+zVD$HbZZc8=iMxQ>pFRoJ7UF|>5U%!+X^X>u-aA2=az
z#pxdMC_;q56W?Pk>V00uA_`!GlwpG$Q``TUA$mA1(Qsh_m%J4VVp+kWzKfl631yau
zV;>$@F-^)gj!9#UEjkdP(ZoVEOJ!EhHIuW@jnyS0gfaRJ<L<@<W}{AJo8Wt)ObkT8
zb7~wg?pHXe0b>I1aRFxn?^KEOr+}4jTN(UtsEhng)39+|@H^W8cEF)7tnI7pi;iP>
z@#y2^OGY%zSU!m057YA%IxCVrqhqQ@nkKO|jQ^EK&mt8rmn%W}M~H3Gwvolq+1Y)X
z^cm;Qh%brlQrcl27%ih-dC&1_=sM<ff7Rcg*lSrZzkk+~Bg?D)e3D2><0u(Yv&W21
zbXKoht?|7uh;+~iohY+e^P>n%EP8mW3QR0sYG{Z?h%Dz1F^!NMGO?WU_d@#Ce$%f2
zJ+F@kov3uoj|zEI*mE)7<>)g)QIR;*t@r+Chk$k6Dj}9-0p~5$@KicW<-~)LjePzX
zZxNv5mOr+r&v7#9j^9@t@!Y@x?Js38I|{`M_S=ki2O;jH)5j)3{0x(%c|p!jOhw|A
zOcN8m#!^KlK^2bLRD`;GrNwY1hPr=bxAt6RVqZwp{@G?8s^*hYx2WEh>_eRM16m~^
zie_8IWqehcO1G*Wf9zS#{@JP86^iCevCm3-NBr5=-kG+VAX{y&{KHqnw?&(z9)HLg
zzv;yUZ|9)K`FE<qrAjdCAH)M%KLkvn@oYl#0nQ|7*h{lJ<zdPa_%R%#r0h8PlRpRi
zOtJAStACXY%ak)KgeS+U8nrawFfb{ExDR93&vBvFvQCHd#;`l3IWzDXRfhp$?m*W2
zU|!ShKet(y`#Oh*u1lPu{p|H%da=^_>W0xz*lP#X_H8cA?Ecgav!`3?MTZSP9Q1Gg
zDvH5%j%vV`jm^5z+Q-l{VjF6PjgJq|cIskE^^neHtS<NP-u$)8eMwyJ$h%YEcH`>w
zktQ$5qhLh-u28na^P2PHjS=}<_Iba)La*&fTSfq3hke^Z{MH)A>&<825$e4!Fo1F4
ziXO$s8Z}!qQ>t!3O7OHL*e%oGp?KmRCXryiDp)PU;LaNTls!5n-k_w|^*&RoQmk&S
zSoj`CB1*LGyY_0dfp;;-{h9c>NF75l+5I^2R=y@q1y#4){Kb55`iMX6eaT@DW@SuG
z{a`zx0-0j{v{ewKDHI(i!7ugUkmeM`KI~!A`e84$Wt_ke*w~!<Z7(ne^3NNXed<-C
zH~d=m+#vbkCa2^ZJ~r&n{E`6VOAdoz-&jqftQ#6TP6Gf`EaxurKK-h77rY|Q)%<O*
z<izLqE-SyEby%OFoH6kr`+Zffoo6@!mY!dVv5X+teOr~tt39}pHsyhv8Xcuj@_G%g
z)OWNu$LEgLGv=qAQz}l0LqTYBdpk*=!oQ;m&G^=l%LUzAETNyV2>X^u!;D5)pCNRn
zhzD4`!iuJh_Z-NO>0po<I5EubSeBVgTg|&xtmNJu!%J%4B_-L}$qOr-%Bm_*_2u#Z
z+Ry+-yVbOQF#WM7JhIZklx%asvzKvIvonNH%1h1Q7PFTeWk(G1YeKze<sA@eqJ?Ab
z>~m`3jbZUcg6alQ-Cc8yQ%X?hoiKdK14lE2;_F9DY=&V~--+BSCUgO*y!{0WHFjPy
z-i6b_|1d#`0J(p<O!mz#;E4<(k}4xoD#yo=Iyt5M=~JFVh>BW{i+a@4Y<}0Ddvq6{
zU^chh4SWh-$4e~bZrs$2pmAWQ6v1?5apRQDPvb^M;4Bl)<;IVi%y4FVh@W5FLD%uT
zB_$D&wWnn(s+mnHw+(h^Ltgho!Qs|8awcoum$srzm<1zimO;@$|I*47hNXA!71_U!
zmP5<*Co0Gh6R{;L2$TM5SGJ;+vZ73$)gUaMrAwrk*Eci{3WoG+M)#eu?Gw-~2>Sfx
zlK<5(!zb6T_ps8g?d4U?vB^oNGuFQus$;lg?%cv>=&cvq3yNQY@w45x3G10KMNJth
zxQ~_jV~DoHPEk;0=(qA5TKfUr@*SEL@m?QI6Zb%uP?NXcQ(Diy{%U^p2RSqqU~q<?
zxxm&+#9k{HE__6JFY9j>c9ongmik2&>Un13EIWzHelrmb{%@hvxw!*Tpr~Xzguf97
zTqrja<dFzA9yqKKLC)C7JU4$Ho6C3mtbHR?JVeg{5vwrN-7BPDEBRmor3-IR4~j}Z
znBg&uF|}g6>wf@5ep3EX$%dxfgI0=dQ3@$jNp}%g1f?p)bBcm*!^S@U43+-Js^uw8
zp+VzYH2{VehW-X{+aq}6<=*Z#YrumJa7OROEf3)AUJ3sE1pn_zMjrt%wob@z-+=J{
zpUm$6PBO|HI~ZI3pUiHK=7uZo680y)?)F#XAs*UDT>Fm_W+LvsDB0v-yd<htCX&Vj
zsatq3i|+Mt+lfvSPjkvmM(f{c|Hx-uY>7)|m)nUvGlQTAjKZ<gK`o!cJD^k$FYOp`
zzlCxED#x|w%I|4|!2fO`u;<$>0G;r0UyWA6xeU{@#RSIFm-rtOytvpl6mnUY(#wY~
zBaFf1brFThax^z#Yr)9?pBpkHrt)oHysu6JV(HK5D-OeP0XLJrXmN(eW<*OTM#IZH
zPypZVP)PPUF(bhjkd*6Ix#xcvdj}^;xNY0Fy1LM1+cvYzt}ffQZL_<SW!tuG+qP|W
z*{}9FXTNvvckheX5%~vXWc+fjF~?kMOrFC5^~h&DNS`Tl{3EW+?IH?c9<p6?pvzZ0
zsCtcIXs$-0KJ&Q@^`KWii{Y__0KG88;?^S|c;s$ciJq;0TXu33#vz~bEKqEbjkV+F
zl6AlSO07-Q$Uv>cwb`i<HE(8Ws44Ra>~~2P#qI9t6tReb*pQwQH4`%@j?7VIswX;<
zMlA!5OnmE~Y)noO{fhn}^V3Qmq?sWH$S3ow&H#V*7#)9JSZ;-rbtM-kBhrkK0m!9F
z4P5b*9U-<cVc0>%kij!}h@I*}%LgRjp`2TI4?u5!B;g^yu&m_oTfN2M{z>jAi5{hc
zy%ZZO{8BW&r$`-Ur32i4b@>?hLP(y6hVm#IlN68*g4sMdaJby~IA*Q(L}{Gm0Pv1e
z(tGASOh(77K#Re`o2PM*E3JV!velrY_Ew*pXf-i?(z>EFGM{k<H9J>V+MB|?Uan_0
z`<FD?LYOc}48Dan4Lo))PY<=o*qB}b3{=@yyHSWo@TlC;BpSK3GWEOgN^SG5Wm98U
z+o%XN_?$p=Xt_Ka+C6%NsK?Mt_QT&NvEZHN08^%~$5#*O0T_0FtS-;cZgK;Xu9<II
znk8i@<Bg%d(!nGqc@nrsjE>7rs{Lw9Ae{T)H4YR;7_C_e=I`{RrqY0k2oLu%V7I4!
zBG$da?IQOV_;(gTb|F1+#tS?oJI?7SH^6|kYjWj@#BVXzqEdDUpQJk;cg$c-7K>Is
zm)QYL*I(&g*Yu{IQANTD(#9gaSvMF+SCUU4M`Ukk1ffr90m5EF6FFlr8Ul@Qbxmye
z<vPNRR`ffDp>bpka_JwD2xL6rzr~&?64PNPaBx4N63NmB#?oJOk@+gH->~}7H1EDs
zZS>m%FC|NmM(th#f}xe$w4}xRtBHrkG?=z{(WkCOipnc9m~V`D5+eXsUCkxMgT)Tg
zYuHQYSf_AFhp<~R8H&`36L-z)<h^P2id~vnRr(fAY4)$srMy~IqmgpU)=xH7uR4tl
z2BhZEfS@LoR;0KzrU+rak(WLwVB+dBA98EGiZg5Gl$^bM2L9Z<Fkj@U3bKVv9m(DT
z4qqhdD@&gahB7Om$ahnLx@Xi=7;AD<G=?OJ7-e{yfb31h#IQwS^$JaK^?O@fH<o(J
zzi@i0$GfmgkcMgUwKx=`m2mN8EA0+tgT@@#4(}k%5K9}0cb^H>()=u_?Ts3kr<;L-
zY0G;G$!oz)hx<2xw=+Z+%Q9($1&Q(d&Giw%)7<P&g$-wCYn&x^v@FcvsQvV3#7-gm
zbobYR?~tCyGmTj~$Q5S0hN&`1B!1uTj!*Uwu<A+v=<WcOpO(M~to|S%y`@1siTK%C
z{K*4*WbY1w>TLPO_v?BF;tBH|^OJs->nEm9-;-dmDfl@`kWsV>!3Ci|uaQH#j6%YX
zCcR<znvGB)<)3lVY799ZNi(STPic8{W7kib)QFQrgSoxn!ErR#B7uLlZSPgKaf<pF
z-W0&C_l|a=LO&k<sP#Pjd9u}F^ZE8MVtoGN2hFkC=`$*Kmx$>UxRcCmOPEia3gQzi
z_v14|)pn@k@geDJ8cnl9SCL;C_3{MT3&nSQ1&4cRKgriOPux*|=TTji>Li?7w93Qc
zKXL-DO0dDYIUR#k4jV`I8+@Ov@Mo7?XANjtt~Lqf#^5;x&YP@`SBvh5Xv5sTo)qQo
z7&-z|$ifw2e!qjeUT>h!vfq`x&d#@XAWc7GF6<sGMDT^97t?|nBnF&d@#6dGM}J1!
z^u_1lP?7{u^0O=0?B4wu-X<kCr!#;x4&Q^4iUzLTuw7<f-BZ!-$#_M!U6Z}bK1Y5?
zc_Dy*3gdtJhZ5xMP>eGpIT{JXI2&YM1YRojs@KOvvd!B0Z7OLid5Oac5<agT$LG!+
zHIMg%<eMVQDxHIhpY{JJB2jO{)$v`Ds>pmg$)7`gizlLzo}`j&Hu1;{iXl1UH8Wm{
zmW8B*klu%?THqcAOm`)dzi{sjE!Tj!-$L?4EoS{=htGHbBnAN}2nfel{u1T?nZM*<
zWb2|YXy#yRZ7gVIZfxU3%Jko__yZL!ZRZ$Kc`sWF>3kD!mIp02hO^J`^$BLCNtJ$D
zBv>O0g5OL?cMNJ;$jY>S(33(S6Fhx;qwII)VuE5LQ}DXt?d0QITKc$u9g+oETdveY
zhvTMImG6~6lilG|bG{xIh|BR9G@J@H!YzUg`=<Im@1Q#?_#;H>-R3V}+NwTfL5x&8
z1}u$0vFL|+egfuS#jc8ppIJ99Mt5TMhEz(4?-JB0m(1sEw{uk+&J{y)R%gC?#o!7d
z?>EH^<B*$CP$@7@!+ZGbvx69VGo?l#{%i6Q$u8q@LWsKuqt}h%O?ha-J5YTVw^ikG
zW%0;w?6E^0%Q@Y+H*)7r<(;#Hf>?=;w^$|=F|Z^Mi#c)p^M)v)uCu2)&A+A>nfUjV
zo;A@1xneAuDQ3kGaO<_o4f}-A*tO#2?Y}0iJ&7;`Y4h1{5?H5+>rpM(FOctsNQLml
zO+GSEn>}}KpefV!jQN-R`7uqrg2H7sf4R_sZ?Y4=*FNR%JQbu|{3JtyN^)MRepPmG
zWnr15HVWJ><;&HTjFOm(z)EsD=LsMb3pI@j<mh~bKt&foOq0+|U+t1lY!Y9Q4FHTR
zEAAbu7Y8|^E3T5CW62iH>REnb+*_sGTQ*0uRVO{*U+PXfjcBAgoY6pU$+c_gPO!m>
zjp_`}Bp+(qsoCPgVA*1YxkZn-Cs+6c3>k&F`H`&?*+y2YOYuWa)u@!d{R1*_(3owc
zFUUy$Q^=VA4cVH_SGpH(TE0CpEEKrM&SE{LSeydJrkp%DGhqWWDk~-7Cffts%I>*}
zCB-{EDKs*I7YIQhW*bsMb`0GLz|-aMX?*;$YKz|o)D5;NlyhC0pN2Jlrd%J*68%!$
zj+RHSSlVqL6DcY$K!4?knneS68FKtPF{BNHz({iq_P~hJ&@@bc0^x3$7vF*m;%)i9
z9_l{8Q!r1oH!NRH{SHuKRNGfQH;Rz;ymXH*I5L-`SNy6F(zGY9oBY^LfW&-t_D7W0
z#;7&ZuRw|HJLb7|LBI_${*WIcg(~niz)7|KZ!@%z5LQK3D`*9BsGY6^{z(r#-8d0~
zP+=9W31Odw4Tp1E*$_Emm2s)_2`EyUs8?^vsw#D`6Yauwgcy*ke!8|MvM~aiex*3u
zqEBR~7Z@RWJT3RP%+M@<-==?|d*g~Ags`T1q&k6QZ6&L*KZ)rAMo{QeaDwL>ta8P}
zE=COF{%@;y?mL9st+-vIHGYg0X;|lNVxvRf=YBb>0z>t5q+UJwjG)<YOce)e(YQ+K
zl*!n@UwJVuc!ZK9*=5SvOM}L%9ltgeH84gN*D@5V9|ozQFRmzkMnKQ*q|N`hni-jw
z=ng4siFzp6>gh||rdvs9ng15v!I3z6Zh++{q}m8K+@ZA@jqwOm%RMJftV>U87H$k!
zYxcL?pFm*?svGL{=Al*n1o_`pyDU_mfXo+GLH{XMfPZ6kA%h}-$~%`>SrMjvlb20N
zph9<GDDRVkjI78+r6MjAqi0aNfw$^=0h^*N;f6!-ho3w*g#QbzQ8!a_Mk1EBk;(NG
z&#M&2%k}5m$0b{kscMDpA0`vm#lbw(!aRd0FtT(?bn}>@-VEht_;`U#eL`b#zAD6a
zQSPrl`!7ZA`0N+3{@SYwB^U!&601Be^;N|;Z{Rn8v%aUE5tS;un?Jyl#P3R@iFFLs
z$_j%Jc%5z1h?eBOnNl_c>|aHCSXc79T|~PKYK%ViTFb)J;aeTTN<uI$OH;Mj1n8jJ
zua@M`7MCMlA(3reqW~99!KrjdlGiV3b^=T1@&h+-y>x7KgzmukU8t-(Z0E->V&4d%
zOp?U|^{e5ZMq0!cNg>v=8RLVx=Mt<-NG@)ddVk<|{Ti9=TzV`vI-5mMCN(;ui)y2;
zuGTX|l4J{Qw%NmmX0vKWPqel`O|oI@5Q2^T<|-)bvOe*^_h<++g@vwYq{1extw~Hw
zu>_l!v^Zxj3P6ot57q%{#dRoltOK&#Jkw5<Y~PET&@5+t7AB{C^2)|kq?Zzc0;a8F
zdU<m^VHK%TnWU@eWh=~x_BaYRK_-;EJW{Y;tixj;A=DYnG74Ih()hoZ(WMh9zJ{DP
zkyZ=k`F`W;6`u{)?v-8#p4@RabN_*&<Pxm|n0p6mzebKD?AI2x%)zAB^mhsNyFeWQ
zjJ?GfEsxy4OBp6GWv1`xfj%O)!e1K3nwi`X_IL(Ur8<&2LNp<t!|r7MMn7cCVtD&U
zCz*t?R*(P1B-ek+B+I{<T=^<>sJw9#;ud0*lA4W$WPvQ&Qe--Ea=Nf$CBJCoQ4wuX
zJX594#+4f5t~JF_N%5aR_@M2Fpp^VX8uweq(pwxanfZTve}2<L@Fd%p2aIW8ftM%U
z{BVZBLC4oLV~ii-DGnmW250J%2%_PipLHeAbtN}EBJ@bJYQTiP`6+T=1bc=ji;!{a
ztCBl4g{K<SiSOu&c$#DPol42ihbSTZ5$gfx<hrHF#s$lv@&R11fFywf7tWK|YsmAP
zJ39C3o<LI2?DAI#PxaSvx}hQwVAGu^7G0Dnk@peqrl}Egkilfd@-h3jJ``%ZJ)UR!
zoegUT>QSi7`U&l=f2=w&)O1)DVit$7noapbE$WwSdm`}hFIs?$>~pf>VO2cFu~_K`
z4iZAWZH~Di%o^LMTD82;2rvQ<ri~5vT+V+MU|gKKEz_;M#d(?m&CvL>!&yP0m_T}L
zE(XauEPDC<sH8x9sycf?VBf--xR0nWXt3-1wa#6uf|N#vWbBZ=7+Uivz}1b9+2|`J
zP12EY-sTD+WFdZBK952vyQMa|L`8bxTkJfjhshUpT6r61`Mea|lC`tztss^*x`cCY
z!1E(8wVZ{3Zz9FyL*Y6-aO-|pYirE_7{{Np0aR>VgturdW48zUy-@Pc@%_cp_H~#d
zn!OIlO~GjE(#PwPGFwC6V>x;Hscm8##X5NkvjQoWY2$tV!C2OE`4q_)W1RmfWB-%9
z6sY)5#s>by7=hbQ0dFY60%)b&uj7<_k|lF7rNoND{pYpp|3_I!F<6Avh+`6`<I%dY
z&-=#>N;m$4#BiQTVgoa@8pGZ<+<#G~Q4IK^%<dObgkQ3LL7y`JeC?Ht(3R5QrNABe
ziUl*Ofv(7;A@Dx3DCjb!DgpBv&{WXZiGQ0&aGGNVu22m2E=7%X1vp=t+i|qrIA`A1
zXl1~p#w+PRo2jPgZEDAeHm%9y#dmV2jNo<r?}}$#AhZnah6?qUql6`$qJM2Rl=doK
zKkp+cu}E18<gsPn7r%bwM^p<%>Q_48v}`-9Wr-W`tv@Mqs(V%GnS>Xb_eKGGb1VsQ
zm3PNbCZ$VGC!3@MqDtuetTPZ8L1(o_Y1kuzM25rWLVLbyS0e}~F%_R<;n()1NFS?R
ziQAV!?-!-TdpOe*i%3XT(TQqarxYdIGW7+@{EG_~YG8w4ug*T<ySZo1B$&)y=*92{
zh?KXPr`C6#yQ3@8(CH?8<!*T@d5{>(3rQofJF-C|5(1?fEJER<^Wmpy#-?repf7aD
zE~r-2V-p4!In@kbaZ?6ejk-v?p)1H?uaOq^lV@m}fjEqco+wRU_wmJ283zVcjXH^3
z?K{)8o<fSfWDLI2Thw9m==3>5H2a}#D4Z@yi>`L@M{q9<(U!zDNp<n(rg}-N&?SEV
z<AA-qf_y;z0*&lH1&!_B#Z3FZngg4*!V6Hk?+-motw`CHL(DqS)6)T{KUd?KLUR1v
z98s$7#V)AC+f2cJ{|NEz|IYu1Ah3Con!Kk}sP^jqrh{VWakb0m^9gDjX`R}{Zb)kE
zzoZ*@8TzG$9qqblafJJRKQWdtRbT9sGNvU~D@E?3K;h+=T3%Z<pe*{H!jT4B=93+C
zdGnKI=4hz0XiqMxg+2IQ&MgL&I?RVUL8=L>QS*66@w0W&n9`jK71mjo`o@CgJmd-P
zN;qKrnQL1<X=t{bLT{w_tDtq{#Rqo;Q-l!qk0k8ykZ+(>@Kk~#$%~v-RsJlCCtg2_
z6>aSj410=(B%V`+2Sn?Wv8R`MXN%es>PX}{-+&_Fh<c5m)H5g{o(PqGWQsxlmv#ew
zX*UyVCAkLuJVX7BK|!Zts^=m@GfW5e-O{Ve$4H@Qjb**%@tBKqS&7}TfCpiz|Iu!B
z8W-f5DnZQn%<Y!%YY$DiO9{J1WBf_((Su6<VbLY3hrEI{#@Ka?WC0rJQX1{)j!rBm
z8}TR1>Xa<lh36pZr{6j%K;dwb%pRHDWzDonHEmsGdREVhDC@iOp2%Rz=d8^BM14uO
z!Kyvz%AWOwv*fI49umu7nu{t*FToR@uEd=zvC*S&!w*`UUj24(S_Ky*N%cv%byCe<
zy7fWjzlT54dR9z#@bTlz{z;ZaYr&e*7g@poDOv3QCTrtg((R*=PMhjWx<Sgt6O=U`
zn94JR``Z1Nbo&|*Z8*7_K{f)6T&Z@zrNYTO{Sdk%Ld<pp5w-=frf8+5e@xia0vr$1
zZzmozIB$=xs<uGzcW)>~s`Y?v;QR8_+xVB7ZhARZIiqsNH`%D6$Be;Pg*aNzIf<Q~
zq#CcxE?+-&h-Cy3fvb^{hOwHNTk9FVQ$4b^&-S9z@fm)V^RErGhM&+0LRFGvdvL%A
z2al&|MH*?Kmh`J%&T_OwJJ)%m&=ar;bT!4yEDBN@U&8Q_-4Xb&?x0nHxE!1(6zn2i
z!8|_mOTJa;1b>ywzklMtikZ!0%D%77(#Q|j7K+7F|KLniQThVwhw#)<&)6%99@yIw
zM%cwp4nCBT)Bc~BsK61TYbRsw7sk7OM{_V)?QA3Cs7H<jD@AwT$b5?~RD01^^h7IK
z!vT?RhHUiu^FX+z-csp^-Pwu4q~IQ=ZJTc8wGEpKD2B%CV13T7JGyK04MZdkq0#zp
z>AXoUEPcr;n)1?R+E^}Fn+a2{6Phy?3I&VUpHP?mL?vBjre;Gk2gYNCSL9y;?!ZIK
zomekf8YzO)!^Qnn7zS&I2^`X_@N{l&eA?D9y*<hNKK`6`V&HU_O3nEMHRV*+sEf>3
z7#j}u`kPFw$)d1U4{NeYS0s)%W>&5v3pZd<b$Q`x`0XdXXDm0?wiM|{l+ZcKj#pth
z1C+@<ZB>-HN?fwUq&;Iq8k9C<6QdwYU313vMi1=-XDnw_8I%jqZi){EjrLIVpG%G1
z%K1HWzsU3l{|^ljj{hbzLg`EfMIP}3o^GSDT&|k3cz7VUKnuM+SGZkC%7Pk`C^`Ab
zu+7s9!RnEvP4l`z3Jm4<mw*eC&+6td)g-FfUd?wjG3iRVoiKhptD4dUq1`cu7GIYm
zuIiV<rb3-f9!Q@(oKyRgqc7hV3)F-y@tzxjYFdHD6rm}!^i)_L^sTn!VO+FAvbuQ`
zh!Ifah<b(HqoCB;K=Hll{e3VZ0&tsnPt2<h$)<l>C+<@kh=t2jPol3%k<KIK)x1nA
z;OcQ7L0X5Kq3K2Iq3&z*VtJDSBITPjV(pTdI|6+}?Vdf#<PSCz)t!d{N->EiR%w}X
zE<;$V!i;|e7~1F`B_dB=OFy(o$JT2tlAT6sA217VhxTbtAix+iq2^*5n6Wk^&2J3U
zZzPv<lJuF8r=~sSFjO*p6R=|GvOK>z3nbK9UZw#JTUiYO*8!R&RvwCtJYoD8rIj&?
zKNyM$PsdX&IcJNqlX!|HHT&@JT<v9tK$y8+vd=hzeDM6$7VUJ0zN0#qZ|4A&@uIGi
z$?-REfa6d@5vTM`pm4I7;la6%I2S;b0NJP(QLi>06!|4ZK>n*KJ7(&0*W)2vl?{xK
z-1+6+Z+GIxYdS&NDiiOUaNfcWqPmKRL(|CHk`o|dLpsZ>5#gFDvk{cb==9Ksc;ICY
z+trV%9>(;mNLAb+5(q!2m(KiSaB-5vk>Y!h<9s+M*;T9;!u#pph=KuJva8f9_FQ#=
zD}vR%>qH*Vw?V;Zd_*5aLZ;&6Kj6Ij7{z(#>ze<_7bo2y)4MvX47Kp(9{uPL6)TU!
zPUH7;i7g{wiros?KnQ)oI;5@N<Kj$k0XNL>tTad`el4zql2WjORn)Jv9G<}%VyQF?
zs3-bMHuF(nkJ5xvvh}|=&(v|DN<?3r>;9(|nDc))SNvZ+nFAI20&{yJX@<fmWkd!l
zu@cY<N@!$T9M7+iLl=@Y@lKc!zy9w8-B*NeLgQS%5`P#I+Z|Wx>P%fs_<nz#?A`P(
zV`@J)Xv@%0YgBr8InWpB)|;mFs>ykrh>-y0PAz{)=)7I2Uy7LR5q9&$5JX2{kfQqX
z2jrwcvA7Yi7F#p%Tl0R>Fm01GRgmb)x^WXWn*}KpqrQt#r|_68+Zy!&E;o;vP*+zm
zU>7QtcAwprF=iw;5k~5k7w{20d141MxnY1bU!^xvf!HF5CsI09h8)W@YWcsq73Okw
zpP1Wvi67gSlK7_rLE*=6U)_q~6WaUySaoWMsai6`EDWYvP>w_SPz*(;M4#sgLx79S
zQ-I>3Y&^!PT4@g;25hxyy1pia4hK!ETK?AxFv1#!n@!6~F{SpaTS?ir8D8k-J<s~V
zQ1cVb1)yLDZ#p%Xz+@d3y!^gXVyZ1$VtHRT3!681rF|{&FY8Zp!!dG5TnOR%cV>8|
z$3(Pk@+jRWide#Z^Ist`lGq#S;<<FRk|WxE3syy>KcopkCQPDT5n=V7A@#hqx1?ng
z6M*W&MJ$I2gyAk}Uu6wx%xxHp6Q(>>dn{FbjTh|7sXp9j7JZ2c*WnJ)oi{JCj%ynE
z=fuI{DZ5)tkv87~78@vbdzu1AZeDN5F;bZ3Ff=V9>liPXWN&nQy*#y#e^`G$GQ#xp
zUsKiZ1pn8J*#E;{{%^<%)S$djm)t*ppEKpn5cWfZSsEc$FNX!xv$6G}cmC9)RVVbN
zm(=6V+YrE3yPyTs?V7EVTCZwVIC4UoYc!P@Vh7>Nj6-YI7^ct5;2zn`rdu0uCpmJP
zV^dhqUUjHfR3@lnpFE~Lc06`I;(b1PZ+Y5geQc0KeQS=5w8R_;Qu1mBC2^zdH~g^$
z7QCqr?mi<!>87?9Bie7OFd!=QTKvR=o=wOCPOu;saci&-1x_$0x97@Nxvk4O|B^v5
za71<U91to??WQ4!Hwp7i?wShD(yP%F)k~v~D_!*(3yvvW^+p{otM7;=`2xo8C3kSX
z3+hyI_x5X@7yW7#<x{CyS0RyaRoE1J|52L3#&5GHSue@HrkirVBNnTHTk1{{lg_do
z&!^5%f?_wV0T^hX;vEq$F)ts|LLb`Vtl%kG<u|GDH?4uN-1k7B?rxXTn}pMc=0H_o
za}vuNL>C&wM^xyi@-;WyE11pewWmvDHlq1)o-i~x3#^=6LG&;E2vh~uQbOs1QHl02
zrv&smx6<8-95QU>IRz#>qz&vFb(IiEvzA{C&=rJW9!*!|LR<(qdm_ZvMk2_(nTEz9
zjY!lFR$Uj9-rm|BYf$q&<>FTy`ogBO_>xAV7vY=+Mkw5PYZ4c1wc`YxlcQ>zZ~?7u
zMKR(bAwsj0ZYG10^&t<<P1c6|M9U^cQoXS<G=`TG5pZcTRZQt@foLwXVvjhHWG{g|
z+3XfA0nT*`jVm&v`0T49c%I`{Un@%e>4NEtlR9buc$W|LCvE|2g>XD3@B}sO{eL*u
zZBvFCCx&wRhtnJIE`8=E3RYT(*j&>G5LM{&|LBi%nr}`p%{fOPxiFp&F90gCXp%7s
zW=Y!3L?<PRq=K@WOqmPk64|ttjGPwHzuu=<{qks;W1f8wE3ftwR)Pk>j1o))h)fGr
zrOk}h9-b2bMX`Q7r<!c%Hx~kIzES~2X6w#j)B4l0@Y!NTR}}-IcQS`bIj@tGmi3vz
ziyHy49OtVkLZY%uo7zKhCMvWW<jZ(N90F==X~u1sXxE&e1*{m=VFPL@RyGeRY9&Z>
zlIIfYI#mQ>9-}-)jGkRFlQr^0Lp-a_0k^%AKm5nzQ&!F02CH{cUmY4vDNzqtW6#G5
zVP(%ZKioJeU7VcamlN@)TsUkD0A!=}3V=f<&f$=FYPIRiUD9fJb!MYj&Y>L}U(=cs
zk44NXnR_*gl_=_{pgHf#6l%s}QPUMIY9Wc$UteDw*R(Q&?NJKcy**&);x;INK%-R+
z!)<MCg=uM$Q@qZbLe<w@Wn6_+u#B2h^ts(Tt1kFpHD#kP<M1!ZZpoU{AnlUz=ml0o
z)H74=G&Ng61!8W1cEN*PWacchq2jOnHvP345nA})tm^UJ0|U?o^B$yP?3%eIm9+Bs
zX@Lz~R;7Ci({!hlsuwbzLP3FjT#<jmX8*<(Xb)jBLu-%z)X5&Lb~AF;khbJt*l(A)
zuNNt5sE-urlmm~_7XQO&-yy@)+MbS<<{YYM$eFHsQXhiMr7fU(TA!kppg;@6(D8QW
zl+tu+E#;}x9MxYPCCA@=w~{7BZPh5Eo6nt7*`#d+RxXq%J2lNXb7{+Z9Yd%~mC3Nr
zN~eF`hGlQB(pPWfDB>vA$GMz10WMUI(KG7G1#>i=PxJ8tR%ew}ig<}#sMV%2)VVWE
zj6F*vb8IpmW_*4{BqxXN;8$K2&W+lqI8N9c9^P$ZbFv#2?gBlERfk~aDT;kEAOgAv
zwCZ{LZoJgFe8}f%v?AK9;c45&mZ+T4whvxIM*BJ*kN|mmss<JH3R<GeqXOwlW@1I(
zo#cwv0;7esn`)V0;@vVXv$>r;z_AXjW?4b!b{sgW(9*qf;iM0gExq4CO-0_zSJySV
zh?I5t>pWgb>R=i%_hz{x?3S+e0VBpV1-C2iVmU||A|u2sA-o3XXQqpfhv`<{7mAP}
zh$VCSyP--QJ=PT%7;HHyL)t_v6?<3Le1U^b?XeFqH&{##U6Bae;WBK-Q1=+Ufz=)#
zJ<M?eIe7tNqugGo_R40R&ATH_{>_yAH0YEzxP6r;Xb5rEfHR-9;+?x>QAZQ<5mQ;L
zB*p~cdyP!W*{~EVfSdkm*YV)4;DJ~(k<U)rbuYWpgJTH|^Kb)?<@$QeEl-*y_f>Cf
zC2W-p{z<)7Cudk)6T>Fo72ieL+$7#nbPS83BYHxh031&DS^k+K4BDuD^aLInTfAX!
zxv=qy9G!LZ0uPgQH;3&=Igz_;TlE7L&8PyN3>WzjwZ5{KfQt!CtJnRtt0jZ&-JQ*Z
zghN+&C?Z<IEM9fHJl~+Cmh^sxCTcR@^Gh`|)veo74!GO%tg>~>I47fpd*NNAr6h;7
ziAaFgB*tN}onxPkfVXvfhqqw~yHRpnpIDpY-BW@1YCVsRhrW2*i?BX>NA8@|RrNEm
zDI=u-djDT^(>cygnF}W7^osVt`?|V;VU3W>6x?!)`!UCAv)ks8z}JUbn~Q^R*aWBN
z*(C3b>q4@kOB%`A_5l6u(}gq4T_k1J*KK2c$I||CbCt$Z<3cQ9kw$+yr?^Nm{NS<O
z0@tLz#c?|`mW0&`cfmQ%ZX^~`9}3EE{oxuXD~jA5PN|alnd@kQ36En#F4iYQWx58h
zbW7Ncvx%;~QAm+F66}^CM}RCs^=IUSqfW75a7oXusiQFK6ndE5hOB6Y0|$lAhp^HO
zN1aRz52d;g?oVCQJ{~6JIZCHhP#<Hhc4y(1;t<#Ib!MgsAG)+8feh`o=bOQp84Z<L
zTuOP|evyghgy4-cME{058WAFViT$Z{_TvNN6yhx-6_a#^I4=sy8Y45YY9WmFXhgPn
z=Wp`Cf>ib~khEQJ3=cf}=k3LUR)YZBZ$9M%KSaKPRg1Obr)ZGkN7o)S5jRnbwSzx<
z#(TPo$!y00q2vUOX4Jv36N%i=cYuRKIq88f*;;4UP3XHp`{-aZU~m&^p%uZq*v$?y
z623v{Pc<neOyPC#y-c_a#~$$dACR$e#h6xZKTg5w7v)&y<3$gCvY^h~s*PJSMp4gb
zGl!h^0L|<`C2xbThe<8oK5BUq$9yWbbYq4jE{~8Bwj?3^OhZN3t4q3NXb0(O`zDI}
z=+vTItOPKk?ryq#zhfTSDsVaY+ZxQokjiY6auXKw8~nr&KTVJVCw0d7NdBfC?$Zwa
zyB7rMqyG3>5<JKehNImgv(LFxFzE$eR7KVxf?pwPNaN%$S67!0v|sYp)-^LCOI~c3
zI@@1L!EHt`dckcbFp3(SszH#C^t?msc0=2v6i<`xXqw*t^~0zUu+#7aAOLoI%eg^>
zp@VDmrV%F{*gt#9HHmNEAnv+b@dQ%Oti+4<Q3d$Z?HueVa^S=9L9vf6vjDI9cFY*F
z_iLznr&+UleZ@&3@&xc(3_w*IspZL{hYnR(OTmOSk(7VsF62sZM3re!duywTE|>``
zS!(E{3?-`YVuw2PH>4l(%I8_&FQt<Unnl7)oaOZlHz=si>#nB`v8kYjQX9Zoqovy-
zrP~@zo{=6|5-&ATOUK|CQLu&JKvLK#?!WLfVhEoP=g~!FRE(O}vkSY3PoD0cPZZfJ
zD;hQ7YU|*39N?}F_$5fkz;ia_b2y*X3%hky7ptq)$IzX|r(1eW@`g|92prA~$S=@6
zJI=_JF#{N}z_60zmQ^v=ro?J_BIFIVJi)x&@8E?N{)DS33t15i5$y5$`e4<S2Csa>
z--}r@8ZTugU-%`3%ykXlo<<WykS4ng{lV8Qe<xtojn#ic=*SZwkbV$9?g*E*jmb4M
z^T>EPNYefwufrSixJ}ZG5w+vZF{LGY{W)|k?u9$GP2~lX)qT7E%9L41%_B&2Z63N)
zHy<!H6Y&JP;m4rB&?y9YZQS}@mjqJxD?0+tgRWEDbx+*`Co|9UhG!${YC7mfn=9yQ
zM)c;p2Q<U9>9wE-I>Ri(jpYlR&MwPS#dy+?eBXo4M2b@~O?jZS8=fMXl_zYKse~cI
z=`}=qjN^^XWDxsJ@}y3{HO7;q4%2YKiA{ToX(r`3^?4stmO&V^8_eeDd`G#kQSxZw
z#ZJ06_u2M%>ZoENwEL(Mk!%X}K9%AlBU=2tHZ4N{$a^M}H;F0tP6mfErPh||1y>U!
zCp>6O&vhOqHtalba_8rio?V62uZB>wsU1D*;FjLUc8r_VX%*?pX5QnfX=vJ+P>l=y
zb);@{B@voM35ORg^`Q@cr+&AlRC6jeMX<IKh>dz!Uetka8e~kHQ(kE`sq&Izxjxlu
z8SoOi;tIc&i)A2hbPi#}PODO&#ZPUM6-b>KJ`!t4Zn(vJETiQ0tPtb))=xY)`tg@C
z`e>H-M0O+u4YlXM!p+ah0^l{mxHN+9>vc3%x5ubfG2*y?#=dy2Q(T1YygR4{fIni;
z9v@&aeVyG=I~2z1us{Cd#==FQh-IYYu}&h@AR$>K+e1{*T4;~hefsnG^Zx;W!@XOj
zbmzC`*w2BDOGor{_i>>1YyEB{l%iAnrCG4=@mpHnf%T(iTbA_$>XWwO1A}TupdGjt
zr`EfixmQ;JdX<~t=GqL3FirME*tBr{X#s6*ol`+mZwY<T`U{7q-aF8x+t%!Ri<5e@
zADhEkw>3)B#7^ixZ`@8ivZ_FQ*$<Q7K|pB!f9@Tr8XKsX8@vAd;?cja9z`hpw*!F_
z#9<Ey7uZOZ1Z<>|RxHM$yaw4N(^8`PV<zvW!(C<+)@HdP1Cteq8u~8_B8YIC1hGzB
z?q}${+TZi@uVo>1fZL15q$-e8H@TnqOL(Z&T7SYEzOjFe@~Ibbm8vhJUFHUX5v37d
z*6nJ7c!5pcAP9u3EEN*_uS`;6eKlK%m*KEhjS%>#c3|Y%OL7;Qk7Q_^2xXuI&3#b+
z-!BJ(&!kwTD0JD1$q1*F4$~w}Atb4TM7Q6znE;u2Y5p66CQsraA81{n3^2m{7?Mog
zUN)vYRcX@qa=_P(9BytlKl?(^XS^i2i28>!vGP%%SX=9b0TLMoAlX@-Wfk3KrTM}D
zCo=*s>BW0!P#dGI`Dm9<V!pNn+K4hWTxVE$$n$_8l&~NuD(5{@p)aUPy64d~oO|EL
z#lM)7#*|C`%<qo3Z}-zn)_`tp%3TQe76lHLEsD6WPtL+&fvwq<_|291UIdHMO}{p9
z$BTG2Q7WH7FvTakMfGtU%rsUkb%ICCSqLVh=)SPV4=v1uqy7o&C9GNO7}vbbi9J|x
z?FCHbHGF)?cZw{Q^Y6FLJ!Wy&Z0_VC(D9eKdQsS_k+tQ~20k?c6@nGMN%f-P2w%lz
z!&R7Sv5#zI9|Nqej~s@mV>(*6_Nr~_4E0)_JW9D%*pog6ex8qiOsZaYFMg?f;UxFv
zW>NiTIQ`qU)s+3$KmmxZ(nvE89p6R>o<vNm+-~4iV#Zj8DG(ktw;|5mJkGX8cOB(L
z-XqC!1NpRX%Q!=EPk}i_%c@5@EA4VPzT((<JJE7pq<h5=N~zz1gQdlyuV0EXV(7&t
z-|fUs&S<zD3-!G*L>(1w9IM$%Z?hXzP*p1~qL;WY{w#1!rURW?{=m5iSH!2eFDq=c
z5Vh^#Co~#E+%sN@kyn!bpiQ5TOB|6lym!y^nFJX=dlL=u>UP2(7Ebm%x9Sm+k|{c4
zjX8Y~|Ax}|;L&fkEMVq^vIwe_NIgpPU)!6xSV+2|T*I#HD7H&a%S+XS<m>QZej87r
z+^YdYwZ`wOvD|k%=fQw7zjUTCor2H~!1V=7Pf3uLer^3R)JGzN;XQ7M9;o)EL9a9z
z>1EZTn6<W}kFP(1`_4|c-fIoK`9vv{Xz(44=JiuAvw~tM3@0ebWJ};0f7&lGgXPWf
z=q-yUBEw<b0gSKFtNNfyY^|UrBr&^a;ExT>cHoP~m*zu7#;g<z`=JP#k|5^FpfwR#
zgvDcAG3|d={^iBn`BtSEbI$e>f&EkPJ}bD#E>Xi!nm6t@=DzjgRsbTXv=k5`1h>0Z
zU0V~o2;QTPLv$5aT+(R~yN=@#yZi|q?=@t?U88Ln;>nLsqe6&nCQ9JA5Wm+BMu0ej
zF#MkA9zJ8>d-ZoG?>{$w)06E2k2Luk@BQA0Bw+SG_&|6!b*YBgXFszUwwOY*#H+v6
zVikA?s9dlwLZ=an$Kectug*Dji0_M!#?bpOZtdE=!u{`7>%}NEZzwDX$RIWd2*rN_
z=YOM_q3Z6XrHu9=!yNa>>@A&^BQ4Heh?9{Y7yeW7B%m>%awa;FTpEt}iTO5_hbx7>
z(_LH>G4xO94|+;7dBmmGY^#fU1p(n6ZvoV|mMh5(G*z(o%d`=rwE7<Y!%ptU%=@;Z
zbkEDA%-_dIAg1D$KeU@Wuru7+us7u+{F_MvTz9p(E@5}*zc#mTaBZUaMLq(r`Py|S
z_z;O#AX#x|Z;0Rs;PuIEmTr*l--{zXe--x(%@e>A40Ui_&e?ZGLOSsj?^Q>VNZ9GX
zi7wbljl2g$207uX&hnR#RP5=qdJ7E|IeBRena1l!QJ+pxZ)7R<8FJyPLi1I9co79K
z>`GcZIsDM=Q5Af`?yO9I1@3zN8e&JgjXRxca`Mu&<}U;mvG7#va1)gexeBTUU6t&-
zhMq$by&>`|)c!8tqrmpT?wz`JEV#z7xJj~jO2GE10B!}?fp%34UR}Q;e*EF5UidwG
zZ3_2$=2}(2SoI8Dp!przaX7qaLQ1!N&hbJ@H%#vZf+FsAJbcNz5RxvIyu;g%^FrK|
zF!REdStTna!qy3oyJ28Fwv+t8N=&n`ZDG<qvQ3vT=||~g6QHq4hLN2M%22S0u)0TF
zzAxN`+t3*n{!YUtX(g>OUSDQb$~CR>>x9MluG5u)LW@OX=f78&PUM)hux734$)0ab
zvo}*Z=lDLU$JJmx?4ZqUeBm^A5t))3<X33cmLg8Yz3W-A$=is*z}zGikSFkLV9Ens
zFpjJ{dy}+l{SkB;@KBLly^(r%PPDeRwd0nS(IaIs*O{MiZ$%*(IV!M(KA-5uoQSb?
zvbqk{=`gLpVPQgjpuyRymBG5<+bA`<D<FmwgPGfqcY$>j#K22e?8?kto^OnxUQ&^n
zWQ}+C;;I&(nFmOcjqGi{*I%sAlGU`qiXYt`oLhK-f%O|M5t=RV5miTXq66@DR~?<#
zF#8P{B52+qs&SiBqqd<&gsM^0ZJgI}@y^|s$Lrm~aBL$RXIYxOUKr8)<Xpg^?kTQW
z!>{m25pz=Ep=4+K07&?js_we7LGrL~1`7>T`Q^pr|AxohuI;zN$F%Dy%vdY(CR#{_
zP#bO5$0ta(HWI}7P20@L#90-EW?TnfPHMFlcY2Nr0LB%eQ)lcqr}h}+pF}1u86nG|
z%!wISnX$$;qS+id!$PV}euWxC?ygPj<L~~CN!dB3r=uw;kV1@PkC8V;TTgdIwuI7X
z%$B1<Rx*NAlIAMVrlZcOTWK7(5v{Jr^|oY7qZet+B^E56!*YrXr&azq9aC;Kaqfqp
z9{@nm_l&`|qw->Zm~3A?1p$9!KVf`SP!}c0n7J)>|DNA!{c9XP(AqqsRqQrlqJTBm
zUQ^Maec~q5cMI_`ric^+El5p9XqN0SLjod<;g%7OFaZO3;UuvTicN4RHp-?<DFO>6
zfhI3wR~S+$-r&mzHB-blCN5>+;JQ|*9lqm7s{`(tKwD@TAOg!c$~(Ya)@*G&KY&;>
z4*><*;;YpgZEk?ctZgyR*cY9W3;5}gG5^s3nn9XW)<V>PT*xh$qU1OeTNr;a2npdJ
zozJw-lEP{rDv!ioEP`CxeQkzv(@a!1Q=zno#SHn$w(rEFY9NV0U-?7QLx@w?c33N=
zXv9kpJ=kXW7x)+!P>3{tgjf*0Os^RN5>_45k8k4K8KOgop=Z-@SV7%nIAs``UO`lD
z_#@!xvWvP_TUlLaVnU|SU!KG0LJw_qt9{L-!c1^%A$;8E_q;{(>EH2T8zbv}N63oA
zGB|a5`JV9`<?t5!(KC+|bx_9cd;z!!V0ktqavZsIDqKhzKSM9T?_uYV2x*6r8fq|M
zL?|CbE0)#fqE^djPb^09x9g?Zk!g6vnnzW2Y$mxWmP2E@;jo0d@o)?D(3w#K(GgYh
zlGv{}biv7_hSYL^5ifJ9*3V_Ml{33Mz57q~bg(d)kQhCm=TYu<ZLIq<vlWvtRU<au
zWmD5olVSr7;Pm+F%|#xSniqOzy5Gs3(P)EeUEaZ3amt>m`j*4#=;TFh$A|dS@ocy~
z9&%mug<K?>y*g(kGh9MqU3)~~P;DJCmwuc6FDiOg=Q;0N;2Bm`;IUEt=p?m@D|z$p
z_ar9ESU*wL)+5;O%rsmv(WrIgxWcb&jaOr1l&Se>b;`HR*6d-L^%cH&M$R_X?5av!
zX_5!^i^6N8w#VLyuJ$>i3w8dRh2EKxR!h<osUtfoL-P&%WBw5tcX|}e52>7Ewi=^@
zh#MK^N6lSjTMy+fe2PkOg(bD8fDC@JzM%)xNu7K0o0<v|Y~vS&o<%B9=0JFM2Wsp@
z_tYAIX-i<G(EHkCp*e#jl;ZRL1$)nMtIVuI^?X7VbNg+aA-+4S@Kfvgx3DFczAOY7
zKn9L0L}2gfQP-&tbZ+5XvkkZDW9^!f`@rk~fD6DC7?c6(HE9OU4FO1*l?QtdD6se9
zDfCo#=caQNdv4N8KW19%cij|kH0NwHnsPQfVIhAK<1NNx5**0YMQtFuw@^t@VP~rd
zMLn$$OGZ%)jYvumh_#U!GqzqpclCgm^km^WSnL{%3YDL*ycqsfQqB-2Bh}!rah|J)
zT;ng_!qiw{jG{aE*jUR&;nE)_D?PxtoWb_$fYRrq)fXjvEQIk#VthcxNw7NXlbX?=
z<kjr=WMQgqglE$30WQN{m$g>awyVgVyqMtuk`hZLhu`R{H*ky-h_vknKZIFYgUqTH
zsA^YG*$six@rPg00uxD$SQ$~r-A{`PoX(mje6;UJ|KA_@LJK*e>NR%C_^Sf-ctM*e
zm3*OcqKfC3g$MfQ3jNaVQv9S{S3jmWB2#!p<#FJT?6IF^VWxJwFIL|6<y~PN;YSQ>
zu21s%7i5VqE9G|&GlkaWXnAa*cN-&+**{5l6Nh?XyzH|uktjlbS{=Udpl9Nw<CQn#
z%o%Fno05VCRZ|yEz#k$JePbmrJ%yUj4N$4#jcmEsaI0Z3H&JvG?<kBTiz;YK1y*FI
z&YgbmEA@6v>m8ei4(T;LtnupiYIl!+p3%R>Ay1C_P-~8nxaxjW+rd=bN8%2~z7OJ&
zCYd`FG~>iFP-B!ZZZD3tNR8YP_Vq+GI<D+>4`;+-uZF4UVd4oXlIt6qt#H8UqM-Ie
z<644=dDc!Jv;S^U6PRwT7K)Jv#gG#YFJV4}t<}$XrB{EM-A})tj9F!1vEI$$jW@R^
zB67}~z9m^|82>~`)iv(s6MOTDn)hNZ^0zLXKgwsuE^yx9r^yW(GXeY-nR*BjMHwS0
z-7*b^L6%jIPYb5%sByDMW&gJp{H0N8w}$ml9J6<42ky$GAdcUd>|;@OVd>qP2UzXW
znSIu10`2~p8#?k4O{%nm-0!e$L78+1Q@u8Y_t=xK(^Kk|^)80y7c;Y~bA6WemQe4V
zpvv_&d=Jx(5q#~fKSgCL1yU`)y#NBf86oBe_O(yJj^zp83*(LN?N}X+3nZ#nnpEY-
zLr-dJs8CX~$F_!U1^>RI{+N^iJM)jqV^f)0=F@~b+OKi&N@$5<D1t107D)Fc;e$AX
zc92jeXD&|yAo%;hg-(Ci7!#O!CWyu}!@O2!A(1sBtD;r32Fy!H27hZWW$IR7&+QsK
z`knk5RXyrGy0oE|O@9KP;1m?fSGH1S$LcQ3s}Sb#A=wdn`*SaJSw3A7mKwhII^pF$
zA^8q>@U)vIQqP&zO9$WbQt$a*kp{_TWbbX4C#qp}BiRx6%p=m!8v*7HTy$o&N2#^C
z+XWE@CLafX=x&!bD#9Xhs1WIB@wurR1L^=JInow+n?k)a%f!tqOZXj9DltnB;3JXr
zAr$>FSpCWUeU||2R@dol1sM~1)e`F`bm@08HTZZvPC4knGdpjjaPAV;VOvQz5jV$$
zzU5g(&QHunmj|#^F3+zuMU#eRIR0WiFBoN0Ui?lv%)4S4$YflHBP>D%5cY$Pzj`};
zX<#fQOd8_HE%XOX-{vfOEJI^v{gz%XgFP<LrQfA@8h=^#1Uv|3Gq#8g*m!57FCEV0
zK>yXZg3)nA<QiLgcy%9^7PY@2!i1{e=*k-H6>?#Pkwt-1-17TAkt_mvDo5vtnAoC5
zd3!tz+HXXZYJ{XRnxaN0SuK*d1FC+>-RLh;u~V@T#BP`GPKKc=N#DqfW%HnIH9+S^
zqFsJi(mCSF6wa|3-h`ML$aAB4qmn5GzIo{Hfn)PGuF6kCX8V3$<4SVypU*B*eV8`O
zzHFPnUk|2n{@Kn58M~Mp8vnmmjq-*giZbfw2AdPRzPTV_eX&>=+AJcnoKTG#thEG*
zxx$=UjnDkrgmrE5<>H1la2X@(4c9pUGN`ND6t5%_f$wFzYp-pug*~k>(b&$!k$>`e
z<MxL8X!GrU>gqR0bASkHo|`;;k|AcFB$HOp7?)1S4z<n#6W!y|{<Q`wpt*9-8Sfd>
zMo(oZJ@OaqZ8McJ3|A=EX7rdQmjo9&YdotGX0G*S>iT)|hc@s?qOdMy&4R1Z?79MX
ztJXoXhuro>W$iEb9IT+v++T7AX3|fXEEMZ8RAjq}TDspreJ-@nCjy;96-?qf8EwY!
zcv{W)CibO3&Al_aSW=0|5lx!)hJ8Ln5hEp7J;u;Ry7d+GM;?LLnQBaO2KjXPp-N~)
zHES*(PUT&f4d-%?Nhd4aWgi=rN!RxiQB+~p63jd>yJy_T7T7a*+gq)$wTSiFD-9Qa
zFEf)R=)RF5F2X@tGJQ<XbO3O<w(cU;U^8|F|FSS90Y4<y&$<yeiiiGd<>)*sEtVUK
z@^{%itnU;z@xF@17HVvAeVVW+zDZU~wuvZLkr~<=#qltfV+~#v+4=+BYt0jO!?!IA
zu<icJ->-Ig;jVC=Kon7(*?$1@SZ9z!cWx|dyyE!aEFt*72GH+4xrha0e`NukzmuOr
z1k~4Exf%QT<S4WV%b6PHop2CfEk{T1@a1!;Qp>eewC)pOX{`D9d9rNU;pwoq96_SF
zVnqg~lZDl~dTw%g-|0y#z6!ayQ%(S{Z$pKFdnF~+D!~NtNdCKf)|<KH(uEHh#pPQ_
z<o8R|{+s(c0*%Yx#PpPY0Y@BNaX_Yk-}*qg<|GSMb7gE8ZiH=afd(aZZ7LJ4X$Ew~
z^aW4DX!Ocr<Fr6WqDw(gVrGiWCwRF$Th7cbN}i}(_uLD7dm6~z&9l-cpAsw5@VPZE
z5!;KOJoHykKLOg<R5@EzJdy~b<{H`s?}QU1C$|VavnfHCVxOTsS*UjDgG8X9Sq6S0
zf)%265L1GkVy5==jJNDqA=B+~&nOw=^u!^8ZI~W^CZv9?1%7}yHv}g#yoD#vhLgcl
zgm2lAzQaHu_l3l0_y6vPEs44;LGiw4D&Uho-IK^5b*`=A6FBu5R<#QloI)Hrihso*
zeML6+68_}Y-Q(&MK-w~Z+L|%`#Ft+8_kVo?<1a>?iy!1riRq2sHKq_#shs7g`mrnk
zfq`nPegFsxV-X$xfJx3*4wuV2h5Z2k-z|#=tz*GVNDz=lL=X_H|NDRZfBZAmXHA?V
zBp(dY3Q}}`W5}R%7b!e=$OU?7L%R$;Ib16&Mo`@IMxz*Xck3FOt4d0Vv^>$-SDVyA
z@vA!*g>V!*!8G!Yv$yGw*$+<d7oRp7-+}?QslFz_>qI+XYupP^X8GxPW(@*)t%D0G
zA0E?6Nl7C!ie64qtN@Fm7QVYDPdgw#7{|<qB#II$kBdAdD{>Pb?a37y6fg^r=b?F$
z6}~a=`7JVNy0;v7)c?0Vd<v?43g!^T;5E$N3raWfCV}G;Em;?Bs%qrP1K0BguI5>~
z#)~G@cIXDQ6QwWgsZvcRbjQ<8owlm~#{2CjEr0l~sQjDSpsdlG(yzV!Z6>IYJ9lS!
zX>=u$tZ|M+n|(-97K9YwMKKUifi9teS|wpdl?i~Ot3oeg9b1$Z{8g_em*GCA5sgTl
zaF-r%5vejApymE+%;F{2M0`0-B_iGUw8dzV1$V+OR+LV0!dQ8&<j0KOeznc<Bof!c
z3afNG5uj+sM1#G4X0|uoM7q=wT-wdjWTCg-;>7P!7nttYO1IPKw5TPfvMvR08Rnrv
z;<CP&PNeTS5>s7u>p|5}Oflqb!gzKZ)~bk)NY7%DLALWgQ9w4l8k<PR>1143$CqwC
zH%c+JRv5#RiG_n#PusvF$FP8=S0XohHW*-%1PxyymdLT^tY_$W)KK0gy4IxIm83Ch
zAsm!~yrWzfnN}BVae!5tA;8C^5N@q6Gogd2&rCuKQe-stgmn@wDJdrcD_94FF15Ba
zdfZq(ftQu$&};d6>#;EzA92o!Pe!PuZA#iNWvEt%H%6-{qBLOSEl<^|DG_xFE?WIK
zzpy-9=$(qd5WnHXcED=duF=5F-R2jnTR0uBIR!<eqx#_G9($mUSiR|(7F{>4MRgWl
z3L_<~II{<vq}a@xSOVHF<yrHK-H`_1mD`HZ<cLwZmOhVB54h7aQv2n9n=h7e<}fk?
zGcrn^5s5#E{zij3l}tucc5~f}a)o^dO$HuxqYwU$DaRO~4=$^x(nEAd#X-X66G;Vi
zeePjFGT2VFhXL&qqAR|PB<Bh36S2i;(m4lx2!1GdY*-O8M>DLiatF;H4$VjUaM`K9
z@k5j$<bV~*x<|NT+gS=KW{X;EM;>bon%+>jSDT$09Ln?ULZ`~lqa$pF`vbGa6cFbh
zM+L5W4I#;po#KRxh`yy%9m)!>dczH|Hk7vD$h?U5_RV(eDbLSUNNGzrE1aL|DNOH!
zI=PGLiTfjGJByfd=X-~D2P9^@0D?afJR`OK5_->WLus(n`Y5jvctl3@w1(zw|IGix
z*E>dM0yS%!>8OJzwryJ-+qP}n9ou&D#5Ov%ZQJZP9Zt@gcfPgGnK|=+|Galq?W%oW
zMW4DDsOwDiaZOBbYFs}!!GpNCb$--(swf_)WiQYQrGi1{xvTc${0*kL6}o9{@j$rz
zb}XS@5n8tuiX!=W(*;ncoeYqkxM07qDO7gc-t_r|hGk+)!+Gd%F|Y<e{pR1da|AXo
zd%HiWb#^#9U#%N?_gd!(Z%d0U(t7NG<ve1u34t-!NUrK87%}KBI%lR#TEq@0tm0wG
zX-lIRk5L!_V_utmsy=0!Uj!F83=o^t9AtPrn~E?z1P3TaLX|D`)@~!}_sR<-<+ij6
zV$T*uhUpkRgEA$Gm4h-+8IU`8NtAa6)}%IDcxv078>*SJtZ;nOm5eZ(?6L4K_reYY
z{W?PDViEG=@IHbLvHubp0pAj1BjB(25dO%A7xXrVG-M;`#KrS`$35`Djuk>zX?x&a
zL)1Ovimio9Ppt5&d~%RSaQ42WF`_upF_d|9oJ*t@oR8hjwWhG~GqsR9BDs|b7^5KN
zYy{&JwM#)tBxuu=@`E76kej>)Id+`qUnLAz)9Vy<!sjsLxladq;+Du4Y0l=@k_<M=
zkAx=)peMwhstu29!}mI<*M}!GQXi+E`Zo_}8)~!Uqpp{kmI%$_%MNc1@?k5p-J1kR
zn=scp1G*C~%%Pg74nM=rA)e3hE(BSf@%HLtmG?>GxFUI&LVYpK7v*mAQ8uRxkW0(C
zgr`^-9hP}t!GX!Lj$fR_J{!R(5=r}lm3x#ZjWaRc8KcH_b>oBA#(w<{7KV|15e4Cv
z-LT4ctoYB3%=_lWe~_ykPL&RdGf`)hx#SmKOKe!xr#Rk@{~c-5W%>2kBwuqlaD3sY
zInIdX9?%OVgkx}^#q5)?hch4%oM^Vw{5sVg>6+ZTc9A!lp}s~bqv%+vcQ5h&!sgaU
zLF3`A^w>FrlXh<_@QM`l$u#$b<Oy%X`F5ps?rUvd6}+Vu%8Y6H1h=>|o)VbGL@4`2
zOFnj<xynNaYtT)o;vhY5Rc6T{SEPQSsBRhi<!c9*R<5SCeNl5S@J_G^ddBSe_$sGs
z`;?hEg}pOY3c@!paW|o#&g!T>L*?}gnLy}1`c)~PJZHU!zd#W=Y3{`7Aga0ZF7qsU
zxx>;<jbtM9pO=rci&a0j^p3x2oCMZAtr&kqX?<;jN<Y_6tJg#NR;{Z3iZ{!6T<-q}
zi~QOG$EfTN*>dY;FrZbTdGq675>O`ggs_cx))(Aw$SQ#Am7{h`VAc^Pe*<$M*dwol
z%@AMzcd_&4{llI~{pvmEi}*8o^?zC$u9<hlt-oyz_s}39B>%6ZZs}xd>|*ca`QJE4
zzG}ArRlxhT$R@Gc=t~$&QO%+wEue-AAf>z}b`!;;lQz$S?z=VGwo1AUm?^_hQwEM>
zm>)(dyF3{8j7IxW;bnZ!%L*4yY`!-~2$?zEY&*~Jo^Z`@om_u@%;fq1;EW7I!tE7D
z>WqvsG$Bdv9YK=WR|3Ckqur<S%tT*HVXPV7&kW~>KJXgo`D6%|C$R`2ABYBcfpzMG
z7%^c468&sOG$T1hbjM3i+G_|u8DJ#Q5a5droD@aUB3dO%Mh#{@k=M_Y$Wud{qP2+9
zs>s)LF0Z;sU*4pGkQHuGbz_^zS%g6&iN=8m1S>IZzo9CVe~_bw0<3Wf3rY_+Mc+y}
z4m*%HWdssE+33>9SjAFV>ti~cOf>}7MB8B~7kh3nA2%skt-1iVnsc;`GmEFN;PE&*
z#MbcGV24K&HQhW9QwGg^x)z!=<~Kdh)!k)z$igfLO|Uo^JhTNNchxL}kX)r{ki{>u
z_hPw2nQT(;*Ah!$n+9EOG{vfBaJ)XFkFaBl(NI~Zm8R4c+XyPF!<qv1s4QwMwKsYT
zy#%spEG8_}rt7D4#_654oy8{xS2>mI9(|TO>A>%rG!auFMJ3uC3kWOeu!V{|JmnxF
z%t@_0JtUl+H2K@g=rf$C+eb1*<P5*i%UXK>By@yoPK$s1!!#z>MiHx5nNUty9f;6U
zak<7$&B9Lf9P_oi`x;WI?U07yZs8RPYZrS(6KQZ8nu7}vw&F+~L8`9?Vo0J1W2*f|
z#6>f0BT`YJ-7kqG+f-tTT%fiy))+Ex8%m^HNAnslf6;N<fr!$Oq+0z$#bNXgi{|d2
zK9t7n12JFFEs+%X6hj2BHYqesnCShYHRS8KmM!(x;+$DoEaZ{DkAomR4$D@&uO0A~
z6I}mXEZYavb@%Wy3&=w4QmKTA!ZX+`vj~ZiRcYR1Q+$Vj6sr<lsIMkwDa=pGAkeIM
z5=yl@1s*5VAZJNYT&~Y_4I^u-3C{kVX!C8fHO!j~ZBwSJr`w2Zjg^Y&dptH2&o+cr
zNZ(!+MPkoCNM*>_R?Sb53Qf6}a_?YY%~lAsLt0=l?ND%xp>BAxtw`s3p1trKX1Ug7
z=b^+*v`OMNqC9pkQ5Hj}{Rh@Lh;}(_%{ltdwdOqDfQ?3J6Zef$($OrUkmw)kI6>|>
zQLLc+YR~}gH)SzaK~v5C@02p{d-(c~=?Jz(x<U%9YJJgNCb#MW!^>Ifz%jPqVT4-Z
zUv+_@uL09LR!`4Jp`7*w&Ft$NLB<bm+3`E1tF6C!J|5OW&8~4z%6WAj@5^(&9ytYh
z1ygz@&x5|W^-Jy^Hu$>3__`Odu~}lyx-EiVQs<<6Dp%_v*}4K(uT9J5O3sN<h3}KD
zDcI8AkdD(!5(Jf)h1v?i?}*wRLvdq~jv)}NIEW-UZx91JIp3hfI1!XCP$4boh%o{Y
zDrI5_Pio99a)@tuSbQtP`6Qfeyd9Vk5nQsE1|u&RfqJM57K3O)ZIPTco_0yOolyYj
zpE1cjaR{eHA@;XTC+u=(gn6KU=~)N_VtHJ%4-SuX=FQ1)SCfl550wp4OEG4He>o;2
z1}Ve-DNc<5c^3PHTCYV;>?FL*jP#e1doE2!)CY@hW|nX18MR|rtxi8TufX`6%FVfz
zWqmL}$EC(7&I0$<7YxZgJ*C6NCGN<fM{H1z`}A2V#4f!sXj^;|+DwX>=<d8GvXS#-
z;5Fn#<O`TcgvN(7qSt$%I<EJlISy>j_51w^r(*_TDCJEWv^N6fyzU<{u<bgzr1X_r
zNg%OLLVh4lenLU~o`LpI8OE<C8UP@3x&|GNQ02b&as43p?+>uG#a==G?<Nc9ca!DY
zIssyAZ_D6dVQ*(@Zs@=u;$&}WB5vqF%JhF4Eh;-oII5UmIb^0pw6cKYe$;bd6CAWj
zM2m_=b+u)rWtv!0yw;=H8m{5S)LKqs$1dy({<f!X81NuudX<M@VB~NAEe~`^Ut%mz
z;|b5sSI^1YeV)EQn8GkeVR~;Ocj`jAh$SjZomhQfgAo7htsypd4b3>5YgLIO3PJhC
zI@Iz)TgV2?KM!#C<Z}wk%^_aAyz{ctwi(98lNVS!Vls?+JkA`tv(`>}gv9iKCCtzR
zT?Q@6i!$clePz&nrbF()aPcDB4#5=|cd$P9?Adk(u-eAGVAvz=BF_yJJ)bZ`dVYn9
zmQ^ze)j)Xj(be4DxTI_LG&=JQ3aM#$oe_JUdF2-*reaW|Hr7$Indf*J@ElLm+=N6+
ze&;9L3HQNRRTQQ)W@zK>a=(*1#wSog>NB%=i8TJd$w{{>Pf}8GMwKut2*mQ2Hg_Hz
zr<fYOXkZKJY>XjMkjJR6AUNE7EDFlWVIG4H|E}!dR;BEf$N0r`M@}HS6_Oz{0W`Hi
z8XVfqQ&zr}rfN7bUdG!x?B(=)qQ=+vS1lvYG~MDK3v<j4XxfnL9{mbdS56CXWrj6Q
zX2StkC}jIianjB^5tAY!5f^uquk5$dkliB6Bg$a<d)8K0y|2tB^79q;{3Q2_l_*Li
zNWh)SC@`B@hqC$$>V(EO3AjHF<Uxl0{A?w*Bl3$Hmpu3(3FG`KyfeY`D2^;{n<sQ<
zZG-$bU*>JD6advT%o1C1mt@bVihr9?)f68<C4jQIGv+Xm6Kcu3fP6N;`P#P3k+)os
zr3A!nwEwW2HhZ@5l6y>VqKE38T(p?kuVRQ*2@H63KUP>Hl_im9_+*=?QY66IHqphK
zDM1A`=D_jYduaZ`pqJ57Not~?7nm?xS^$BX=P58Pnd1+e81zlEvkpc;nnaCc=!0ow
zC_wWYo{h@QmpoyF7SbO4wFT!Y4tcZZTgE0*dowzz&$+@v0waIL4-@kJNuvnf;rdM&
zfT8~po-nmvS-b<iJ|rBCdoO-g^6~r8Sm+hen7?l{<}2`iWN;Fi=gpmdV`Q64<Qn3i
zjAG)#p(l2lmjapjJpHw}em|yYPjGTeG<0<^S2aMnk+HUVH_{ESave^kN%hyf9k8<c
zu_2py%d^27ZN=+fWT8)3{Eez95=0=C)`939^kF!A&?m>-&o9vbes}RXG*HdH>ntP~
z5D>io{qFv!fubhqfTE7*`z8G}YSamhW87<iJ2IMRyQT?c$V6nO93K-D6EQX{fqfWo
z8_kTJLG}izIhLz{Teg{PT~U_}qgp;r6adqT`{yuS8@_;Al1!C!3tMqj3}}?r@%DV<
z*W>U0h5zMpzi|Ts*!6*HuS=869y9*_9@>q4DMl<|l0F8N^dT6%e@h5&5bZvKh6@lH
z;v+|qfv<mshDZ`*-DgaqSUV~Q$u;{j2lZh8{S%ZEIXILw2{nloC5JASSwO5$1@Vdz
z6&Dr=Hj<I<bJ+wc9Z*e3qrh93k+aY)AWdv4KhmJwQf%I2V^eC3bH=OX7WKQI+;apK
ziY(TWMQd`gO2%f=6+k1rv2>lBaB)dtSZRoLo!_g_2C7E(h*!3S0{ThBBkQ<C0gxsb
zlc#Vs*OAWT7B?(qbry04=%pq5#R`FdT5UGCn2#<xapka9A0b@f=Fj@dZ4+Z3A5@Im
zXrUlFCh88DDwt}`95n%?OR9^hm;;VgwjEt2WaIbqjbm{Z+H>3?K!Z&^>sjgAW&;wJ
zrIQP-&xR~<8O|*@IL%ISlDjtyg4eYTpX$lT4AWAWuW%t4t2&h3wECQ>aSv4<h=IT?
zNmO3y*E-3NsLn{NRJq-vNM+9IT~9QIT~P>za*qsmy}nA&N{nJN36`m%RBpZ!9+vh2
zsNgT`q?Oyy-gVJot>y5T%zx2_aMtL>qkD}zCf=a@L5(h9O5<+WnU>}%ogu9d*wW*Q
zPPgpfYNWru2{ty%tV)^It7`iCd4cXKol%X{+XHXZ(|cg#1Qjn(1eGt~S>-KgQX5>o
zb3W9wb*yt$Uot}{xJMZIPZs4M^`q|ocj>u6?6B)98V(UI@QRExSBXuhD`;VU!PLFG
zoEnR@D)V~g0!>S?@SNGC5jYMv3Hdwt$FMvCjOK_`DMe+sr{{$zZPl{^rgOT9A1%=;
zO%Foj9ifs$ijQYyuVmERzp`dzp<U=Yf2SpDgTSh)%-^l#k7O{rPOVuV>TGb4DWqvF
zI)mCqbTpCn5Q#tEDP-xc`hZ?VbhJ|ZgAb)KZH>0KtS33bW(oBk&ywIeXwu8ZU?st3
zX}?%<SgdbsKbUuAPoZ+iNKDHD!b!Wjs4KTJ(--S9RW<oJeJMr~;+`~GJN+}MF=-~o
zjY|`?flphh{8QD3k|=edK+N&plYaK<dYqWBqE=9D(K5VNK&E4dh#qD;&7(slIB#AN
z)tw4z_=1h?k^5uNvIxzSp_b^Z7J;eZJIBQ@`|ZmnoZ^ZUnZq;B^Ze8|!T+p{S_TuT
z?Ar<6aUd9@p0McuScUpj_!TURpQ;l_{ThN9t`pc9TtNfXpd!H5XrJ#vD=?`pFjbJK
z*~iimY^pxnH*Z>&bYGS;(2%(8T$UwzKrGtTYSk9#nyY<a0-d<_OUT(GUDS50;`b4;
zVr2er@~^aS>WU_+h1)c+rp=0~2FP#ZZE@sK=1Qv7TM=~{%l?2`=T+FV=8r_DsNdN0
zn{8mutmjMOhb>7XRJ^N8Fp`%Sti}c2AG;0HCV8>tN#l=EQx}=1>4V&<Pqn+NPCSaO
zgYAt7zM#kC-W?=Vj#<jjL8)5~_HchjLOY|V7YxUWZNsyH<f=fDN=Lcn-Oj2Z2+gos
z6J8kR;2TpEzjzu4)t22%o1qyew3>;f7txx&+6Fid6Q0j}qYpBkka$Byl8zy#KcY=z
z)j(l8ln<vmjZ-kFUGC+5Lz@!xKT<xhY>9(x)bDDEK04=0I6C<=z3lVQio#PI68K8A
z6gyWQ;CyppR}Els$dL%bLmk(H^!t9VUseeCq*Nm9^d9_I_-_dRJwVqdzQyeQ_%5uz
z3#|V=K>r6q=c*)Y{|%w@b(7h|3@bviO}tYj6xdH~KMIX(OGXg=rsg0{TYIOpadr&5
zt?z^^g6{XCMG%CfO9u59)E{QFHrnq@PG8>ee<SEt2jn2w?dtzr89=yGw*|<CP3p2g
z+ibSZ)!+6C{1YL~iC~?@4ffhEHLgCCDEf?&8JV+AxJD_)9Pu<y>uuB+8gd5n-Xc3B
z+uNS~?V3*_rHnHu)tw^;n$d+JD3mZP5Jrp@NqhYG%fe9(jB)oVC2>uV_)bTu$k#J+
z8il$kSr%=LzSKGPffe?sGJUDy%YtWQUqk_kK{fsKms%l51Lno(urNm4tn1!>1#Fls
znk)vd2Ym~s?E%xHg`^#rEBX^kf!L>^1MNWIbu&~~7PYHmZL>658BiqZR5<lPwIHni
z7hByn9xZrmWOU@#&Ha>3LJ3ClvOrll*}F29PbBPDA;2R{%kZ|S43-#RDmSoEd}~Xa
zrDY#3>qSkocm*@*m4gEk@4hxr)Dvmlq)qaWyi9h-W`BVj+Ug6x@D@6shE*@uA|sLx
ztp?o@eWn3sy=z!g$d$%LI^%77131R2(s#i09YS;4QPhKCH$YNxkcm;fXVEfy`UZ^A
z>j_!A0b}6q(0T8(+T=!wQe)PhG5)(Yyq>aa;lFjk@}0o{cWwNKB<HK5DUYIv`g!eA
zq)-w#dfgu`I)O?VNz+yz!4^b{D!Ev?afSvNmT~Mx-9~}^73}}p98S~-Nd9WDAIF@_
zW1s^<aJ_b|+3h@&@$d6sfC8j6zET*BR+KsNfoeWa02wUO<N#BKFjm=B;=m<vG(K^9
zao+~_1er4q)=?+gIKAMB=vk?tgBDXGwm__0%Ca%XfJ<8o;8Wi#y#|fdHbkX|Z5U3I
z7Wsggc}eyeZ_azoU~*sJ@&VCa1C6oeWECGQU2_wvj!8c6eK>w)xRcT1o-0Uz5D8w@
z=jQ8J*`R~y6pQhzzyKWn`S_1ZO1JGI8UT_JlWPaVY4hNyflzwnT2xs$n3tS}Z?1`Y
zgfima&%|s37%G}#1yl-kJVltT-qLsxzA_1M9e35a!&)0K>exED*I10?@*qnjddMM8
zF@R3LDVVJVy90<UBs_IFL^b64ob4`54KwbCzb4p9@&)BEAlkUUmsAUDSPV7*P@Z}Q
z(dnV>b(ZUNQ^$4wa}OAQe5JXevv+i=ggO=2Mj&BWF($2Cm8wG(2?mJip_xHV4MrJu
z-0DTOn-#mfwPXFgBiM+xvx6-#QFHx3zHwSsZ?KI<1E@aB0h<v;(ciO^p!HR@{N5r6
zeNW_$KPh=#cH-9d{ZnRJN`j<A`hGW-Wc+CHOi-(@yNlia87^unMvjT~3$0(;ZaJ5T
zg@ze$6X;TUl>2c*qU4tT5JGPGy-9?Fy<!e*(DD_j6e8RsYrbI4Qv9c<dm^jgE8l*O
zS_zC9UX4)WYh}15o)=pCBmUdA7*kmIvI3w920qD#GJ_enVEtT}GxYi@dS{eD?3evk
zeUHX6chd?^*_e;6@RiH4^^W<zn;BTM3yQY*77nfgGM+C=1RJiZR#jxXdzn4+L!88R
z1pR&1>Q^fA#UgdHcq!R_ehc@RdlQ5s$RoHTTKf}}<Q3C;llkdl?r!`Os_we;gB62=
zo_9p$I?be2ZK0Z0p$6VaLS*K+JqMbw{NgKgHfhZQe+`B%DcNWxQAKp#f4@ja+P@1Q
zzJqMm|8J1}Klr=<P$k+N6S+x?IAB6r3@kFyH>EoBiAj?|DoiMq6m~eK6K#$zwX9pe
zLPUc9%hDlEWQHP4uuhrU$>MGHG&y<u`ka^71A=?t2_fxaktVL1T&LRycG<S-db=7j
zqtL!z&yNnkF)SJpWS*A-cp|&Rqy{1U;wnhCAyxhg&t6d)yM!BXw3fTW_4vx}J3IZ6
zQXZxhA)j{8&8Y9ePhNy|9zJriDbX<_II{c=gmSM)X3R-1EhjX&e?tD0wrZ+U4XczG
z1o+V$S{Vch7O9e}pu3R8J^oE*Kc<NrY$~5OfMLF*moYDUdMJ(<^tQyQ`lx*057c+e
zyvT_(%8_Dwr))^TZ}T`dM4&@ZRr!^C)e!BAV2c~S>Ktldq0vrwY=xQq$RLvZhtq^p
zYc|I}RUUsldA}cVPS)aTxq{R&Q-a2c;egzD)jDKF_JLWLC1+El%4aB5*ZSYBUCq(5
zKb>bHcwP)Xc0x%b<yc#n0s7^vDcxL}yP^eal@rKXMKk4W2Oti}cBePjEzz>gm;SpM
zfr7HhKmWxx(<4kx8tjDr{BT1!ITBLMfMJ<>*(tL%**1da8}?ZTooyXh0mn&0$y2GE
z_^4?lXVm3tgD8viTw>1dm{%ptzlNT9$Of(5f9ZG&E-#(Z^WWtXuba^FUpblg|5q;m
zA=$b92STFV!6cglTU<=H0{R0N1M1gb@CP!~vSjo{>G;<cN40tya}KSIy+T9@2{?&g
ze}DL(8ZE=YC?QMdX5{elIh(nCyv=-*c5)59p&>Szk6W0uMLFA)2jMnd9cBcl`g}wC
z<42mi4K(Z_Dt0h~r6TbOSoN&YTzBsJU?Eoof|sT8PQNjCuESxSNX~24xW(Lwy#1*2
zj8azeR32Dklv{=tUd~V_#ibe-wvZj=?W8sHkwu)NuXqJ<o)qX}Aut}B$K1>pj`Qr)
zm;#y4MX2pq_oPV4YuUO@PuWG<+({<9$~7KE%y{7(35GNuLA*@!5`#4Wqm=k2--OVL
zi`{^zu)jLV3NG~~lgv68rZ#P51EmGiR1*q0O>f=K<blarnMLp{R18{LSz`i5$-hto
z!b5=_*0G^|_fI9}oZb}^l4X3ps5uCo;$%Md*sfk)2@~^_cAW>3ZSvwO_Qp~4iNg0?
z;FVfzbYO?&7n^C5*su?&ibN_YKs>FDL-mg<r1UR~V2H0<sMIg8r&e6w44Z)2I)392
zqm@C8AvB#3t_fG0=s$XfOgoh?CxcG#6Af$bv~m`aC2b!Nrf(PiDk)4UAyc@Xa4TaQ
z4-}h&TAyfJ+J`gx|6Lp9t|P03-|n81Z+FlCo|FFrpNmnk{x3%l?*jc+3w@J{-Vlb>
zlC3AIPrj0fr*?Vb@5R&Bt81vBjjgF`^!^#<0)zi@^b|(BOTi7N29tL=-(;|y@R_aa
z_w;;$GX}+gzbeL?>10A%k|&KCQ2)RiA}wJ;84*T{OO!B>${cb06=AH_E`Q*WO1kZg
z=1eU`eT-%FGc>2tIdm`bY&mK>_u{Ya08PzHP2DnF?O=Q&YShmXhE9bxc;S);dt6M>
z4F|WVjRJ;jUErhSy1DQw>h%k|WSBScsB97o11=Ih<K-y^=^v<TiG_&6O2Bx7wIXbJ
zq{B;xSl95!v)I&egTe~yWyKyWR;!@s@(>7Q^(E(~eoGADZm>y5T0&OwHP9~zJMNrW
z*J;D{g<Ky+srs40Rw`9Yw2Hgr3Q}cV8~^%GY9t0W`d=ks^dM}=BCP(pP$WySgoVE_
zQPiodw8kL?{&V*>hS*N?#+BVSuPz*4?p=$BEknL=l^Vw3(PseKT0^{As`brTg<%|S
zH$fi2nRDONIv<BH_7Ydql0$Z*BAlCQKDn-WRF)2|L!~aTCXK;cyJF8%wGRPHj5^d<
za&Dif))&d}7OZv*FY{U9886elcc21FBnDs0L!`Alt=J-3<c~3v%(-rZo50l%C7{P?
zt{?!+iy{FtlMHl*J$5~3+Evm4>rlBnlIgX}>~v2zBvEdn6=YUwrl2{tX{Blqso;jP
z2I-C4lLqx!qKI)DoJNKfiAshYiOwX2Jh`9BtGi`-lMttnMIqKP$w&6J$Qjn1Fz;RW
za6Qs>KFPbdpNV)Ry!e1Zp*Sz%OJM(iDiKvg-hr$zfk;2Wk0Ar)!Bh#gct-h&2u5-?
zS$UFb=TlPGsx)?AFUpqy!9w-ao-%IZkSt;;Zu#VYyhb+D>pDok)jjkb`TqA-FUSAW
z>J3revP1rMtU<QW@<$PB)hp1cR-h)MRX+iT2Nl>zEf`q4{@ShL8J;ssyJ0Mf-!jQm
zh%xwpFhpbLjd(yZ>S^?ovz)m1+)rh&===MBg64;8p~|StOBk^PNw;MSL8^Ay7CS<y
z%Pz{;WR<ay0s{b*bSNvBy#}ty$buUOhLl2~%{2!IS987Uz!~u;zg_8PBm!0U=hK-E
zrLj}|0WVv_<tL(`xhLJe_;0UTZgdzg(ys&FxL+YPHx4)PKb1C|OAG!nCSwSyX{)S1
zsBR=pONUl#rO~L1+m5IwC?s?-{5g5%F#%_2BYEP^6zR|L!eUQ5W~u7LmN4(_<p!LU
zesVet3YU+We%)E%-$IwN@G8Wfgeg4|L|N>1pw|>y62&N^J6UAb(QVG=qT6Y;h2WvI
z(rpSRad-Un0eHsPdFwo01#Krd5JP%HU!3<<k?3M6X@C!2@yk03N``tcsx_^+l(MI)
z0IxfkamVBBsJQm@R6A2e;(1HSt(_&XhLY^#v^u<ueiM--d+$UXiip`O6zs{)GnVw;
zd2Y#Oo?%ww-W~GFuEVdbC)IFl2QBdvKiOp}=kp43F?R0(&Qh15_h{7$M&58Eoxuf}
z<r+3$f;ojhFfTEOwN1>|$A6N33Zfez9=el86O7{UD>D1Z?$NM>b9F9H8{29%L?c&Y
z4y}|@VmKre2{Jf<Y0gWbju|{<IA;LU*1sQ)|HB+<HImV)@GY)|?^(kC9zOp=SS(i6
zc3x0J{6x*uXi+2t7h(){U|CG~fmB0QqO%V!;V2;`v{@uiao2}VnV4{h`U&A5lEM8=
znCWH~cw2v3acQT?3jM(f7i9Kub)C_br+aqA-}4D+0LpL56bv2e3^>7}XVfuiOCG@2
zS#~4~1CV2l1Jtp)7aZxre(0F*K@P}<QsJTDEpVH$7I745Yp7$3RkZZjHD`90VmFw|
z{_Ixnq0=^n<7uZhq{J!WQ1K<@C_0j=HKY>@IAD_?o1jiW`BM~c>{pE^+FeRC5a@L-
zg59JViO!Z&=a8CS8G9nK!pa&2?U)qHAJLtYv~+6<2i#ww>d{plQGQ;(u%^~Xw6@bp
zw3l|*goK~y67DOv`VDEke6OP5Xo^YAJ?78X*l&6+Ol_e&S56!zy|fhy>05Et=89&)
zsg<IalR~#<rOBa-CbAIg@*!4GD)jV6v<GkXJaqsI(CO|QdQmWF{%hk=xWZgcRJNz)
zAT?m4&3G5_2@BH<v(FFAGZYN)lgY{eAd1(B4gV$Yv;4l@tE&Px$+S7}D<w<8)-do9
z1MvQv3=E;pCLfa8n^aJLV0XEBvX)ngeQI!adG4d-#FdBtT@%3t!Ii@1&)u2~;>+U9
z*uMH?zl0D2Yc%>-2gSxS@sX%n$k{^KWau9SQRf@?f_Fohlo9~?Qc}yEjVk`mu&Mdz
zl9IbQWO%g%vr7jZC8~Psfg!7*rv*CK%GRN403^8+`=Ux`Jhz%f>~UA*#cEuooW#+s
zMSFy+&wP{}d?P71LUA<=!M}C2Jxd-1W*{>HI?9ryY_RN?Io`usT{mMCf*EfgsQBr^
zpRiPKhWVhNP96|Nt-SPO?+1andHkUV#EXKsZ6;ju3z9*)_$m}$%T(^!NoBl;j8Yzn
z49~d$#`_Pvhpd4!`1xb$QwF2A!eGmWFpn7HL7d40(%6NGyli`gOHcpUPtNTa_0g*I
zp8OlKh9zXCa@j+x$#B`rvJ?qcqxvs2NHxm&Y1zw)6n3W3x{emKXUvZugxkG{_Dr<f
zhBEK5fiGYfLwV__{(J2&Jkyr?9Ci#8U>J<C$fha%<*O@}*+kR^d$e+ceh`mMZzg}~
zWK7Oh7JRP{#A!<!|L15x>uOh}?Y}&r>i=JVr~fn7`@aVR&EC)+Dobd8|2%h(dCTY#
z%198B1{e~M6a7Gq{|!Y-`vaL6T3Vn_@=ijGoW;>hNMKOSvDS5`SIseI8EyzbNv}df
zy=>LoLSNmire#~Xv~G3rn&-Tem6l;bKK%9N$M3Y``<&x_&2^IdxP5!d5y$rfWMQy2
zdvYo#sBWw%_u9nRBX#^IPhVf7g-7^!V@`esgK)W{Vv_I_qm`3t?ny8ad9Q<&m_m~L
zl!O(`U~3!dBaEuvVK5T;DW#Q|@<EAN^zaDx9t>YB$gnbt;1S9hR|Iz4I0cVkAlH&~
z5xR1%$boWpXL1_Sma?TsW|I8Lh~>LS%uGHs%b72_FBehL%<+*NU)W6Xu}I2{b3d&g
z@?OTxA?%Bg6}5`qS@0hp=q}n~PgOb2$uvtqDg6nJMUmD48@2vfuxMwhS)NRn>LRVG
zXAVm0t(I50`adfQm3uZ;bGn$S!jgc@$3+{5JLQ-1MH}2fj@yN@lfsgOO!Ca-D#w8_
zj(c<p`y)SWzMM?DMQ|u_oH;DgS;T~SIb(B+sz|YZ?8=hr2t*kbV>WDU$pbv>9jS)v
z#TWJzdx{^qk~chMT+&B8IkSC@Wn9_^{P`ycY<{uhGp_yc-BFC$;#2>ydwQW)ZedmZ
z5>Tf1Fe=}XDK7W<mHrjWaprxcXHG!fIRVdMh=+u`Xv*Eu9&1XDvAw#~j#iLPADfam
z;>+ACed17R_BbluDViqbRsE7s>~=X8{4R@+(XH%?kJ&R_d7yXUV|FAZYD?4TDSD!I
zWNZ0JetVxj;-7Cx>)#X}`^E4J%=kWB34;2DgFIQk8^*XV?D`SYh;@N2;*y?<XTK}@
zNgTu>1;nBBreOOA4nC81;V!?-uzjLJKUt=H2_4KJCVZdL{KS3CrN}R&_7^<pA<f6g
zc~^fYOX;}`E_^rg`o|{NDU{q<al11+VU7J&J?vk4yJGnOXSF?fXn)JW_Jr>H#asRP
zGo|M$nByOP%GVrp&&f^MyS$u7R*y8I|MH7B_S^6Fk?ePd_gZX!{R0BTAO3~UJ?3}*
ze-YR|6NW!Uw*0Lwb%kD;rd~u2zUDE3FUh-KvQz%7pBcmSORF*1JSDd?s-OB4K7C)}
zX3r2rFG@%HTzfd5&Eq|e%)9#5@7f}i0w^*ln`2HP0^%g7vYf051<)zoR+*SZ(52+e
zss+}>QJpiSpg7r7q2V@Gp%wk2jn3Id>7!)7Z?WH^M}PfxLh{6Z3(Os0dnzUuD<jrN
zBf$!Pg^<Q<Q_H^IIH!Sq38XW1ovY(tWey8Cx3<?m;NZrJ*4Tq(4-@`8ZjdW<jN;d7
zS+*!*fJ$DnbfW?FBf&Ifq=qZ|herW8w|NwgLHmRPJ;|JK6Zr^efY|%qUkQgIlhZ?X
z8s!!Y2dS*wHz|t=z@Zy%Y0%PVwF(Y$KHhuidqPI*E>RmyNCN3z#IUS>Y9`U}+?o61
zdlb*uz=#Ti$>$75h6_XVQ<V4eHA_3%VhzTB_HT&#OG_AcIEuJ&8OiG8?`rXeOrHRO
z!dgq|9HeclU`r?Evg)cXHdIzEpDR-|$vnxHtAJQ^|GIUIhi1f19<1$^YlceM;Cw3C
zZi6Hw4Wv7^TKJ!TdFQVYAY&YgcQBxu87Z62hNkE$;li}~#Ym0(hR%RN<W#F-m;l*$
zd0kX!;os0*BT5p{gN3g_pJhb`r-6~L6>O@Ha9QW)7*!Ru6@sqDs(^;8Th&Tyt3!vG
zS)i*bxk+j*)%nhOoZZL}ur0}|kikfz)AN?0GFn2M5E}zOD8aW_#WWK7Y+OFKd6RKn
z-4#4Yg8f>)H(9HzXR3G0m@yc!CD`&OjZgsMbuXj7coW*=>ds-*t8m}zEIJ9M<g)R6
zQCTgM!LHSWa!l!bJ!vGygRbznN?g-VM9Cs58%#l!a}%eP7f?LP{7Je9TGN)Wm?^PU
zft>K!V~T2JYyV0XpprYH@8C|;I23zQyXj=HY<8H|UPdQmGmv;O8WunVS9@k*&D#Gs
z2+tLVX!V4xzbb#ToR4h#c#t@dlvYK$q)lASz+fbz>@c1`e!sPU`n~@N3CKk;<i~{h
zwgpQFR!!uj7+bdo+f=Y09MdwZMnX0u%?k!JC#*bfE=q_bvEsYWnuQ2a{+(aftWXC!
zM#eLCzZ!}knM@}FCl*2)(MH@|E#|Dsh)gDKsHrLkW6;!W#&5alHfZL*6Is()HIGa2
z9ID5#9$7JO^`fn%sDl;b#2y*v@>8;3H<tK0L1bkC1?#-3wrFdLj}@WG?%^<;35TLa
z7M`w=_pD#xiz#e%+M*#o+Tsx@0G5_R;R5z;9T1Hxk&hjN(~TYeHnWMUE&URzfvDPN
zF&dpP8Q0f2h3cC}r8@r`ia(Mxdf5_ttPXrsb(u1fm}EV2V>KH$_2LNA&s7SpjyQ{6
zKh>xVHpH=zdCYjt-l7%L?M{J4sBh{sHMVXs6((6ADqxl3X|$0FH5%x_m?}1&_?xUT
zD3DT`YusQH<d|@;Y*?*n5OcvUxNt)m){IxN4BVF#vukbjQn=K{lX=<h=XKGkwUKzA
z@g~A^T-SH*V}`dz-^YyPlqthUr2x#vDj!M(*Dx;zyshwyrX<lMG>#uuvr!-$C;W(l
zYaOazLPecACy6ac=zf>Q#`L$ITmv)y8L*^Kx4eQ>u!{n-jG3dV#DIzVu*7hmWSQUx
zYa_x<c{WQam*fP1fuM<zV8tb-vlm~{iSdLb=iM1w8XsPWA$OL%7Oz$xogtmr0To=h
zW8+YMI<hA=BQ~q`^X92$2r`aQQ86zLa76QE&{X8ZrpJ21_8*M9(?SG<0_Oq5ha4#E
zYq`Q$R^Y~$%<rLnn>(>Wn5abZo8%CQSe9_EK-kKZOHXCnuUAxPI>%85Ax8qw;T&CA
z%J%fc4AG6uXtxO^*Ujx+plveG+w6{MQ<89U5e0;6asb+@x&KbpS|YtEV>8&H>2IhA
z<1Hx%ro<2`9q|uEpptD=rFaP(qEJ|3gi~CUF!hp?vA1a%i^RHC3hvS031GF7_MB+B
zcJ!6m=K*8OxGr`sWF|8XkgR)rUtx8UjR~}b4GN2Zd0-d|uk7HMTh2R;xPsDvaUqGX
z_6nmqa$(&^CD<e^5H@jMpH}dfs_KVkIg5?iN+N0Xm|Vj>mA7=#Z;VIb@+P0gsy;%g
z<1LdHCL&E#cxAt<K3UBCC~T8i)TFvevjJApWc2yYwG#xwbii&Vc#`hcxOr9c_|HSQ
zg%`a^XP}~%3{#6@E=%%VKoMm)V?mw%-C48?D|^_wkKY}1EC@BC5=(l&Cne^p9k95w
z7rU2ESX`ZiE31hZ)sAXo8QtOr3Vggpjz)V0y=;j7nC>(e8E&mY@V%g+A|>JglmaDJ
z#SkZ9?>L0JUp6!%-pamwr(^*q^3%b#GgS{YT1hD(i!fo(wc!IPxdBeLhRO6UcsMz)
z#Y-GvIrZGTnIZBFK7nFga&rKgu)?7P0R{hEBh{$wt1vLzW4v>owb_bfH6fW-`k+Kn
z^3ObZ&q>isw1^=t0OwR7Dd8wIaG57@QOz8D)-%CHtVAQ2a56+8+SWHa8cwL70@}KL
z^rc+6R7$0Mf)?wsMfU1Pp4jeo(=HYD=gZ_7Ya{8_<RbfctE_NWZq%PvO$qLcq8hrV
zq^RjgdHUi%+#Ay^XEyLzm5uOfwT;|rae;D<PlYT9S<&rl6jrBI!LoB}tn9kx-vv~_
z)UqZQPFQXUhCX-J$naTJ;M58e*1$G#i-x)MS##u+yw*z1hHFbS-HImLk0pi1L|Jo?
zc1l#yc1$v{i+;LcMhAcOjMAujqiFhJq#%+7^+WDTQ;LgAJmg^wBjOQs4IN9~BvmFo
z43t$_Zn4j)_H;_}^8Ui8v3_YkL_E>=CV_}h9)K=t6tb=iQgJ&ain1z`EXKl+V+E%k
z2Fsv~?j$k`Q-B1J>Q<nVzKJU`poZxXmP6fWX)#!2IReE+Z5VOQMmIT%t391Y!S>fj
zc2o=pL9<##!LwI2&_P%5EES39o#NamH@!9r!l;0rTBMj7{mh67+84T-br2oaGQ*r1
z53ZQ@C-jO^PK-H<i=rq?l6%FshTv@<RhvSEZ9_G=&y6xPrVV7M+lsJJ6rE=^(?wnC
z15Fg@tX%37b84fs92=<B&VaFE=b|yxY8OV;8l_Q?^?DdM7B8q)a%ebn8vCks)a+;b
ztb59$h4h&sjr4#fg!&9Z?J~<^)AxNBU7Nm8S(Bu1Pwea(+NG3k)0`b7Qm}5nU+|AR
z7oHW`718hyl&%yy_R8c(nehC}2JaKiGCiO!hIx1$J#ip%-gZfM-2j0F`(Nj<)kyeG
z8H^mz4{br804H~GPKW*A@D1*c0eU0JGx1^hLRlfc)+m-SlI)NpK^Si7O_WTE3!^Yj
z8am)vu!Z^h%*fnHW6~-ctPM85G6p|kC9IM&JxtbBf9?yB<`q{{>B;;By`$c|k1{6r
z1u4JVkB<1s_xH9usVW0k#~;$42CDY$ZSj{3KT0)&&i08N>*?u{_<_etR(>*5rraGN
z5;_v}7e&Ez!vbA}sUGC@wohR(;|j_@(J+`rA7!jcoowe1xp=ZDYrLYzc-(*`lLjoR
zj$HeskL`hoJL7f>YdMQN5xCo+TIQe68Wglqt$eU_L?=EJ)lOu4*TmwSBzRgK*GaG*
ziH-$kZ`gD0$sEA8*-C!Vmun;Ui%Y({h>`jORmYU+r$$?V7)7#b2|Qb-|Lxy^R~NQp
zy(}i~l(YhLeUh4`HE|OfTWIBpEi}H0+s&fb>!nJyw)%LuKXXe8;cnvZr(Ij0Wg7&J
zD9QY%sjW!YAfYu%tyyx%in5cEF?$LWX1Xtd&`Gs_7Ow<-D1dMUPWmHuQh!ax%DIN&
zE`-Z9MbqZ%-6%EMORVO!U~)E89J}c45IbD!#W%~M^6EA)W$+zz!;k7^63OC3=&<Xw
z&3_Kct2!pp+m*mc8*5-nK1FW0IPzQ#E?i;&V&zxYK9fTtf3j4Hh0Lvanvj6yNLyy`
zVptddkc%>qu(Fa(KW)yDJ;$Clj_e5DMDUK~t!+$Oov3INHdk-7c5y5{m7+<<vh0~8
z&2v^?pJ_b3-)eu!X#05}{N6!-jW$)$CXewP^>Y@mZ&Q=6oy+7{rX=&ZW%~(bWh!0X
zQ9*`DOrWZzRnf>YCosr&n@^2DKji1Mie*+(8Wk3iW;g%oU&ov7G?7J;rh>E>j^0{j
zu!+LRnI~C5B({8X`NvW~PG&Wi=-Et#-02O%@(!=UEqn&7os$xOZm94OiULsfG&fX`
ztHSi>T~PY&e4ojYZeI%z@Uk(Bn6*WoW!Kb`k8}kHX>A)&Lkb4JQ_8+=^9VdW1#17c
zXu^vk_7ag3YW?l!UHGw2^_Z)~{f|`l*I11qqg`>;GZfQue}SBPDgXNUb@|75F?co(
zio?-ErcvNwQCXctnZ`2lKk$vsOZF(~bqGg|cO5kOvwh1***GN)?A(%Xz9hpSO9dw|
z${Z=xcbIQw4dc>zv9hh*uq#ms&f8q@?rzTOj7tG4!zEXC#0VN-lD{LkLx+(2)2)Jf
z{fw3G?0e4qF6r2tb}qm$(Aj*}Y~s%XPF|@|G-2#2llc0#(}-+KAJ_~K>TUisa4tg`
zy2{AbDa#-z>y}}nwf6U%Z(OaT|AQuvrs{jwK3(NX0>)RPYrow<3;%MOI<!}wSjxA?
z?)mh1Tehh3q=O$P^R>ji$BuAHbMP!g;$?jK2MasZ3YRLyWQ>PouVBFw`9SI7&O&A9
zz8=QQE^3-7gZi|zEIzD4v56wv46ip{WksX(yvyE+ML{m=NEY5tmR3OJ_E(ND*}Z7S
zCvx_7u1b6QiNdmJaP&Cz-KlfB?C+=+(E+}8MmZ3fPA8mo^Vw_+eiESc0$TydFe9=I
zCu%Q3Xf55*oRN;pUB&Mjs7zT!1N<b7gZv#S*V<GlW(xXJYTCN@ZUNn-I4BxIqiDvZ
z7S7;7aP-&ys6(=E!n60Gpr)P964RX+I?42_f;h^xAGxFH4jg%f+4x3Z!dVZnhKR@|
zU5|pKTQ-2g60@--<w|UJ@f<4k=roz^%w_jjHg0?U79s%sp>1xNz5T}xZ=zzOlj>t2
z8bIoG56D4$(Ortr(4exBfFALyNR*YWyE+BW_KJL3sxrJuG(mc0{Oan*1!lhz9QVU@
zWu0S}U~B3z3bV{~FF|U1(*E)kUu01de!Gc;&j>1xc~)!Zz%Qzg&v<ZrS^-a@B{dAV
zkU6}^zaazCfF_G12Jc@{DoOMv??158RHD<5*=%nLc|HAQgh+1`4eu<4VkO<TvJFtB
z2K`G66Xy;L_r)ukn36@smR}=60&+O)C45~|u>Ok9zGueR(r{$O#`sViqbIbP6ZYgu
zrDAovsdy)kCI1lBtxPYSXtkiccB7uhfAh^-=&f=PcQAEm?%8hN!q1h6_x+%&r9GS?
zcZ{?ln_qSI=ehDu6tSRLm@0qO^Wh{u)=iq<MzSo<64ZB)v?%C&9kr<E2IkmhB`$4D
zGj-E^)&F=DyC3XrM_Q?S4gZ=f)yxHG*kel3l(U~Qg2|kB>FvndNI~c?A-s3~*iQDZ
zg`jy0AXxfh*r9X<vcSF4p?)L_bI9ZG*N&-*i`M4t9T^r${o?^!BH(CC=D@ND0DKI_
zbIxhVCRfA1DGIKa3-x7^9PvGamb%iqkL0f|oH+9fjY&}}VNHH?b7)ya6v%CyUt(@N
zmj)ci1(d~;=B;3#s|>-W8`l8T()l@xVDkva?uH*cCHmXZs=FQVjvzR>u3lareHAhW
z5x@4Py2*`wZXQvBQ|?Y;u(Cb``PVMPT`-cNf-c@b6ZE|C-G|a`YCrwmLd&<LF1~(t
zTG}zV0(vXGthSk`8bI3dn*>iWV42N0Yz3`Z{J|9$ZvZNC<55{>=f;hBtj14YN3Jv(
zSj9LOr`QV@l6xuhTPAXti1`_@>Aw_X8VMsW*xf`9y4ijf%e#9$5_$R<sk{&$#|Z;z
zgy?7{J9K7#dn5rd(jyohyyrhqli-CW7l|oZs)?>RIj9+`&j-56|4Aov3LbCybxfAO
zMqE?fXwC^6iHf;98op)}9=Fy=kKvI|OSkE|KH`bOX!#~!OO~&j>CH29PA5&5yeTa@
zH*TCv0=Z-51siSEh8UQ(a0OILA~CRJKDuj2_Nv&hID+PO0$_(3IdH&0L>a^F&g)8N
z>5_cpOp^YNolPTS-jDk+eWuh=J$Y00r_`6Pn!9*Y<$b5(qjxNu5})bB1DGw#ajqjL
zJUNUK_FR-(`&?Z2`G77T`np`$qojotidoPU^qi<wqklTYw_sZVQf<^1f1>GHZ)*kG
zthj1s;mUk!nocWBDWua??|jLp%Z(pbYld6-gFr%O;BS5?bcXfLIe;*?3l7zUZV7Jf
zK1AA$7KuGK*o^|s82#`A^BOw>7Ty$IFM)dSYy+okD;MJzp?gqVphWi_hNLm*9%0LE
z9R;(MF2Zv`iB)W?^k5h*t%0EKeTZ#1V*Oo=*!aJ1>k!Dl*`6?4j5zT9zdUfMcd0aB
zW(3%NAyn>)YW!pnM(KpF{)-;Gi`RnAbVjahgJ&JD-I8lthq)aKpeaHmn-L1NR(VAI
zS9Z$>AdxN^G;nbQY+8Fm;Xq@p`b8>#!cqIcXZ+R21n3J9`H*4UWsX*bl)1z3sM6~V
zvhVXbt!)JJCbRIw{G(;I`m4Lkl7&uB-xp%cc+42RWnP;tsF6;t?wD2gM7@U0k<=yY
zgf@(AyZNk1OK-#my*fhlgnj5%fqUUeK&*M=nTGmDZ0M&KR3=nVd_JfT4JZZ<oTr6`
z@tQ|^_%SP<tOa?65d@7a;skNlt|)t76m1|^KYKx$1npD{H_%CnGA2B{?<F_JA(3(o
zps+R>jJJG=$G&QY@{<Qev~+*fP^AmH%nPN%5ZS8rged*;4nNq){`Lpu?XW>4a?pHp
z+bpSihP4%-<Vx&nXs-Zfw+B<^Mo4qE1M&r7=k};geAfeViLwUkzAl3+$;M1AsFhNk
z3xpy+mbiT_yfr)bh2s~bbD1~PF}p*qCx~2h->*SuCBShS&mEq)fk*d1Ga)4G1j`*u
zY%ig`A7qBI7=YT#Lm$C&bj4@XB+39v8+2eziPB`k05tQ%u?m|^6SjHu%`132c%Dgt
zT(JdzTBy1wJ_nSeZebT)C5}gv<X3OzuHiBuu0hQs@n11*8n6>z;PS9dVhds8%`Lr|
z5LXz6o#gVY?Ppf+NDCnyC}6c0bX9p59dl|OaXNqpG5UtACWC0{2@1M9@q1q%I@_)s
z?R6*_Wir{?6qAM&o-%iPvRn#RT{KAAh(XATPi@I_CT3NUI#Q6<g(owwah+B5zbb9T
z==s`GGuK<;I&w(s@}AgC$mBP#707HCDS%uxdE=_YK~@=8%yA{tUrn5_Hf+nYH71M1
z?pkvWY(sD-452O90Y-Ge`|ICIi|r_D@MUH^hHN}Ia;E&fx||s6tMpKf_xVXV2<DAZ
z1{iNhI)n5f--D?=F*k@yQ}qG7OYXKfU4)-&aFjPVdst6N;D!7~SE4wqb%@p@U2X6s
z4J<`)R1cMq6Hao&?twE8sV>4SOy&>qztZ{Yd3yV<2R#;2e)BDCpUYrjWL%0eF#{v!
zYkg@S-W;>W(ro{F>1OGAGFcGq<mMmhsaM7qLU8sQ@9qR4?HW?9#`N`r(}ee(>8+p#
zW@<a2WP1D<`cX^sd*5C<5>l_p&EQSI906FvAFWq{^N33q#tRdLMg7wopw=)@cEg`m
zb(m44Sw$PF(}MPh%nPmiq77h`$^&CWr^50AA4r!xlBHyP_*n&;_W;qs>(VwFRgYmn
z`9^lwn8uXhL1x%h-*P%EHDSnU?d`)mOn22&w2BrjXn}ATkJUsIH-H5PY`Z25?i$)s
zV&|IauiC$Cz!Z_A?SwA0sHaqsixNZ)vcy0wm~+WT*@*ldWITJe9x4lHIT+#GPY8aI
z2@7cxBuYm1XPe%d+ocoyoQ~|9#_u*0LRWerFA=dP(zhR=d=h^kyAgnXLpfjWa6sk>
zU4P<ZZ9p*Kc|&xoi`zBg+j+VqV+_fOKqjZsF_PXxmWJV(6~F3bqCfIaCHrEh*^RlN
z^WW0e@c@~Y>-pgW0XSM>Ow0oqd+G*W$2O+no72g5<s>q$N50IDIM9q%|C=Nw@2(@~
z;FFBxKTR;&6MQL1HiDD7&4#>526Lc?xkbFR`im~tmvNFp6Sn&v>f`c`5l<7>7s4By
zW&{NBLE-cu0qn^#M%#xHZ-b6F^G_cBDBHzTm|zHodne|M(WlMGG)J~%Icm(f)0CMC
zHlot}(Oi~fUieM)1~aK6XmBpN$uZ5kxFz+KBBq>~_ZC(3<C=FB6+)e=D?I(f9%_mn
zYIq398wzHG#8AYDdEDQ|altEl_ZmIK6!@15-Z@~?*<sUJs^Kw``Q{LDX6-L>?kjRk
zyt()wjgnaR>k$4$Pv;07bJ9Lc$M0wKo-Q;^OtU&S0&n%7dDGOPv@Gd&kJe4^OWl%9
zYpMVz9_;i>z3yc%{7@P-4<_Drr9bMMS=n!Y!+OV_3z>ldw?T}N{GcfR3K?Sv`gwf;
za=Y^D+lJW3RJU6+t(G0XbuH%DXMl7;E`KYw-<(mOPeQ=ulMF9JAUnc!X?ZuuFePPl
z(ntW~Kgl&bA;=tK`@KsEQPc@St;bV*MBxt)mUTA<<|(BTU##<QcLJyV!vcN5#Qt(9
z%I*Zty(2jNJCGfG`oH*kryx&)cH6tBd)l^b+qP}nwr$(CZQHipJ*{c|+dlKg-e1Jo
zCw6=h6?st?b(8f}W#+TiZvl`uO3{>&H{u(!4hjrkix=n_D9jqCH%==MV*Jk72#)Hc
ziEiHaMtb8%d;><lU?V@kkzNRqUJ#L9?tvn*^Mg97NgV%e7HN*?+9I%XC3GhFi0leQ
zH7EOgO!euT`b3)ggqr%qn)*U@TttaMgM|o@Ca`RiS+~fnS&~@gl2~_$sL_k>O*zC&
zbfYZ;B-d02N~!NgkVTVG=0V<~DBG|n_A`jj-Q4&SWb!d!f=3WAXqpJMI|>9&0<>X*
z8;R%x`Ql~s$IIq}A9drc;hUB?L7_@E>=Nco*|&`s)onWgGDY<r3}D`C&r1e}VC5Le
zWU~?U>63OTR3i-goYc6N*dGOBCjuz&Ku<oA@8y5XQYskv-zD)^#)&U6K?H2kbl97F
z*{np@xXG;KVf?nhpLj%kmw*)X>6g2-ZQMN*PwA!^zj`5cQ?3X*Jn1Rmv-CE7x}L`l
z(Ejd3`HM1k#Nv53*rm_iJnLDeYQRKQ2wiJ{35&3vL}FpksTGFRgc&u$l|{ocXy;@d
zXdT~37v|%T{RVfE37+)b6_hSE+S{bwN0~i9piLmvLe|+d$i5x?>oy~SdDOf7=h-uQ
zn|8uBeezn@Td@XyaCi4W%Iw`7QYL$6uNhmV6nZoI7w2oy?){?TAL4AJ7;lE<5}pG*
zWuBKO1l>53V2Hy{W(6KYmcI~D=F}*Wau}p;10;@YGzez{QjT~vh-brMj=xwUr4L*j
zErUARHun0a&8RIJRfBAH<*)Dr(}j6>3;+!yt@B1?VDN5}8XpSqx@C&`u`asMnMUj|
z$ozs?c4A(3qqN<;hSx~m*WDYtYg^Pbt?pC0LaqDz+N}5j?v3<<thvu<oSXABt1eC6
z8@)<bx5B|lm5ls5*bm1MZ;>n+x9yDl0?#88lUbGeV0D0m6QlmzUit<UJA}H`*e<lI
z-j(Kp$TOrzn}psKg69UEs75;)!Va0aW6VSHlt<hN37L1eHCB$O^T1AgD}?J&;!y8{
zCZqLYCixlavQI9sa5v>sgy3;E;k;5yrrg4nLg;4#BWg!?-Z)He#?l-4jLHu|4*&v=
zox|5B5RYhF&np2BZm@pMQxda(88llOH<B5@_3T*WTU_v+4*JZMdt3MZCVY_t7vq2q
zw0HrwUYPnlWeEoRkORuGb;U)!afJs6SrmVOdJjnSsCR=5PH^%l_yPf6h}^wAhq@0;
zdX)SD)xCX(+9z}!dj62`#x0uukl{Tl4yyj}^f`h)>i&TBk@l;`p_8@T;DQsKiS)4h
zz>~rNTtn~%w@rMnS^VLj4ei&+Txs7SyhO%eukHqNlUqeL(A^2bZ8(b)MjXa?G5qmb
z{~<UK^rE4J`ZC)YCg!;s3?6$t+cl5gQBtTsPvWLSKSP4Aq;M}>uqsT8v*!#NlR-G9
z5GPcd2dV(1xZWt+q3F$Iw8PQA4KUc93Ff7DFwyHOlWz7!UZmSngmro$)$v2CyOhb-
z<u*MJG(B8i3)vSTY+&@yfTbys5q3x>RC!>!-LWT@578k>#>j1k-iBpu1t%asSNp&&
z^slYq1WUAcX&w4P>fztqVDz_O;BGakwC8_Sy$QvKzOr=md|LeKSwB!Yxd|WiV1yGV
zE+kGICmv}`x^Tp(oDFiA(8(xJ6^c}ZDwRN)Q%o7uD?>x4CL44#L90_(8{{;h`Al(H
zD6x@x5)AF*2lEooey?y3<)waKb3XT6kP!I!kx~z<&kpU@K~<W4$=WO030?vx)VGk<
zur2A?mZ08MxTh>3KLdxV>O7=7?V@|<D=hySWQfuf#i)ylHyEU%@JK}=rM100VM}>(
zn^2kyDx8v=P@W4EI^AI*U+FiBu0^&Yn&2tqql$k-d7o_&1w&1TlN1vq+#0f$7-yIg
zX>^-ccQ{9Utp)D2VmWo%DW^_|p&l&N2_?}<PH-Yia#%_7M*L`XjWa+ZCV=)Gq?RC<
zJXL+p?t4O-DoKA(XAo3%E3Zt~OP*nR)_&%OUax1&%NqYR5_jc}fvU$oZ*+FXO+%lb
ze><Um<foV3hl<<l4duGG0W$osDBiPqFsly01wW|8`1?1=kmcDMi(1g}i|}G#bf<V*
z(7-FHbO+Qq#oK`Nh+md7rR>pv7bzjW*Kn8Ubt4;qCO9B=A&7#a%Igh1PQm@d`w=|4
zr+IDyxeY<j=nAnXmV`q(s(c>u9xthqDHZ(-s5<&^DjPB-rhyXE(7ORK4ZL`7I|=FX
z3o*ArC^e>JGB9I5(i^`I*>N#-ki`Y;w&VN63q9XIZqVBq`dOgtD&vYC{IDK=sXYke
zA20n3m6Dygb)pe{kJ|G$p8-MpnLWkbE<<@p=l3_nr?5aLNH>1gF3eU7kx6{qT=*aJ
z1<G%6?;4Ujpiksu2BTLEBZ@K0d<_hTYyZsWoLd3w@00}#6#SoE&{~dTey1_9oO{jr
ztbA>2qnCa&^;vaG&D1ns;ymxU6@-r;q{d~~VZzs<z=@evxPf%WS18QStihf-dvN4r
z#@DthZP8~2+s{AHF-tR}08K(4;(TOHpXs__$PUwS0_`_w80Bv$(5Vj#Q-5LkSNDvP
zPmtcja0b~o2s7%R5U5k*3Prv^uv7g8#W$2T%AY{oDRYND0H;pjC;BthPcU~1{ek(E
zx<fvI6-S{jusp^7P?TkD9T$hsiQ@n}d`c%yChc~@EEFy`*2$#NaU=g6V}>V=&<5(c
zoJ&W^l}<Rc>KFY-vdSbF4bgt;3#58M|3@>9H<XoW<8c7GVPZ`&(}61u!`^Tn6#k%x
z8_cR?@a7%Z2XyMF4GISX{wwt}Pt!{uPhzfFr8ygRFeVk|)bFxp_>Fx9UUEkAk8T&U
zoNsi<E0$*%oyeVo#v`0DW0}8!M30x8GMp61zgWXL;hJJFl-Jz`ze2kWafd9=A>F2r
zZBX~YP8rN&Ot%zV{7SVf(R`a8XrP6P){*19yA52aN;EGL%}T|%I3O+UVsU2VFnkoY
zuB7jvu#GBbg(kopPy&|&HG_>=V%%du;*Ei2++{*c;ox6!^)@atfYG_64$a0@Jcbx?
z^_*sc)Nz;(RL5mJ<{g7@rS(D!I}q`uKKRW(B8{E4GynElmsvdim}~M~xI@Si8gK&6
zXyO_R#Z9aNX2vqAyG{_(h7H(LjLb2DhiTf)pny*^!5Dqm&EQ#JUoH(|Vl}FFwx6!0
znS>E|&1>VJCR|j6(u^rjxT*|Nj4_!yaHeor8KxVNsBl{wHX5O-a9rI)00R_mm>(FD
z)WL^;k)P=+38!t-(zG?r>1IswoBWF@jxozP0r;8pK4X0C89Fjt;&!Xq!+^x^L=Bwg
zpgb9|F{*K~1)S_9l#w6PpXA2N=oAj<V~%LAV-|$7Keq#Kq#sj5oeM)3B00qn<xAN5
zK=-Yr2hug$eP;VW(`y^;EyGCqnXcwn1D9%#BIus}u<c|fsc>@;vTb9W=)PpeUoG|m
z$*4CCWa;F2MNKQx+L(cy+RscUbyhm9%O{#hcm(9(v3u~zqkbLIoAB=3&%?7JDNiQ*
z4%kHgD5EYAxx2;#onp}d!5qKJMm$tUI{g83!<Fq{fBerh=5^N|DxQ3ny}tLn`fT||
zB#$_==GpI+N3!1Dj?f%ccCr}H|6f>YJ(MKo{68z<I`sddy%qJaG?Os3aWHlIZx%qR
zqyvg7&RBoC3{$S8IU#mPLkKN3lEQNXX@Y=(kP*@_)kfw;<^{tt@7yDaV1g_{imbGh
z^ym^5Zv}cZ6|Ab2XQNa#kLSb5Y_eB+^7~K!daewM658lX{{DLX{`=E3yuaTYYyfNr
z_K+72wIFz0bB+P$B!Fg`GHsb=z7d1Qm<BP8B6<?ZII@{UgC@-}jhRL=4J8^k1bIlP
zgq3HWwV1Gaa5Z6>q0mriI3=tZOK-tJZrBr+-m0VEuqaF#i_W^E=#Ugv{cY8nh92CJ
zHv$`&RBUSo!;a1vN+onW7P6Swa^pVEkllFmUhWsIRY#e1>3OG}Txl*1D{i6&iZs?{
zh=AoxB*tWe<+yH{2iJD03oSc(Dch+hi^*68Jkzsc{BT{ORP~x6aeu2kbM0^(?n|Ef
zNwJNB?3}?^WX2|qZ2P_ovYblqnDb1PAXIG)F@gl9xyKqMxfPkE3Au4*n{+WJTQ6f~
zgHH2yL92L$Vx#GcmgIXQi_OMjjIk)UlGzFqmseShM*ekHW(FdorF)RvoGNX!yGGmT
zP0^y3mbhh0Z(NS!M$_zY=SoH<CgWI=Q?h5fSZvJb-^^d^hNhsG!-(XoiE<omnCweV
z4IpMoa1mll#F)v?we#5;w$uIa(c`N|j~)vL$q-L6qBAV@^w=ZRz@}B<zx>Cz3{%Dn
z9vIH=O~Tp?(u9ZQ=#Uvzx1%;YYmOaVaRl<^@&}W-@{Beonj%e^r_s`CX|^@mnq8Xy
z8f;EBMVqou<E7E1*`@W;d}w$rR2%bqfnwn~!|<dFaz*L2&U5LF%5Fi(WkOZ$F|)V#
z>e+dpow)rRIOy3uNRTGReC{CqIc1AC(>gn2!&kMN%p`9=0pRosQoV<Phb@<3;uiH?
zbAXa8)HChentB+>g~gwkYK+tFtT}@F0z>~0s{*GsV`5=ovlG+J%4nr6FS0Wv<9`>)
zv`?32#GdM82`u|uWZyn7G&}EE=biPwIqT%HlFekYH){x{A9!_nSSt=x7VCrJ@MyAo
zxhAW#d%H%fw|lu}tG9c%E?0B+bS+nR_jGMnd-rUeuG-b#JYDkDE9sc-(pw|`_9rO;
zkMtwgS7_bF6KaX1R~S&5Kr)~-qBMhSvY;WQAxu+3%Poy5%_$8kO)~u@jVjG54J%D6
zy$iybFI+OND6SO`gjW0;mSP-9#h4P!5c9&RMua%aGJSoi9#%utyCdt_9JaPMa&1+{
z+F}q$i!q1|N0?hqaT;QcQ1A??EYG!->+zUDRnQjP(nQY_K2}qpwdR_dhG*>?A=<*N
z85w#qTzilm)Lo?<%NzH;zTDCqH0<0x;F94B-_z#I_2+L7wom2f{#^e3yvzngO10O@
z+B2tB^<{Zu#=NXhaEK77G|6uinpA}ngUk>k&}q`&s4P+oC^ZQRMFyoI2|=nzQm8d)
z1=JeEg))N4Ax@yPNK_~-5)~>7REB{;Y>=u@Tcj$~8q|emZusE}!dv1Wt_c9=2mnG^
zeO-QE#PFj%5c#<PQcF6gm1n5iJss|%@7AO|LzE@XU^_<?J|#Q9GMs<un*V``o)z9~
ziCM~60=Tw=&UJ5xD00;YULd#%bYHP6g4!yx%rPWYXy5ukK~KOft)YTm;w`PIf?ne-
zt+9gM!b=)6h5SRW7}#m*>mC%?X{e7qX)r*_*B&((;IgkhThPO_uRUDQ<Fs#Wq@Wji
z%gRhqzx1Mok<vc!qJ^2Fe(LQrr8-sp-0KE*y861O^>36l-nGHwE7b;KKoo(&qERu(
zxk)D3#ir~k#qIK3cA++_uuc1?Bwo%aC|4FScZ581z&&$>N57+^J2KW8Gf&B?cT9D1
zigj|r<v#@TE9^h+KO`$XX8Rt(Ej(sbj9nKc-b0w}AZI(0U5soW`PD-Ub{EGH`9T!)
zB7$`rE$Ks0cO?9egEad`W(VMu_S1@=XwCJ`{y$A@zo;}Fy#E;--Tqm92>)LyjF_d3
zsfv@KowJ##)Bk7m@l}+S$7V$EO)lAFk%A71XIoI=b&&9?IK&A_AVNrOyEd%G@p5J(
zW8B)9*dyp5_LHUOC3HLhzbjTS&y`qEdpy9L$L`NO%lru6<_7AvSXUg|hNy+eMr?yv
z<+XL`lc#X+0ud^;7msQ{u`ceLD-%BLn>HMiU~a3N0b9Bt(hErSDdPPVGG=a^a%H~c
zJu1O1cde2mTcc>~NfyVVoWt@h(s{j$=gzAxm#>2)Le7_Zrev}dBbvl*JJuVZ15xaB
z=u4JFBA4>Am8JIrUdYzS$L@s1@-<8<;`g1=@a97(#M{W6UL}NScv?9i4;n4*V6img
zMfWaxip(8#R~Lw0fz<Z>z&->hF0&t2PW=<|;(y7Z=VPESBS0-~!K;nP{qH>9W2L7L
z314kMafE#^59;I?_FP?JeM1ezBQ)Ix`vJV-7&VHvcWf!hXP{5Vfr|gfNDur^xTo77
zjoq{c<Qr0!25ixqP)i)_Gindy*8mKZP~evR|C~8xVxmy$f3v3h&wlv-KXd<$j7U}f
zuTZfv^t3fmXg$Tw2m)J1IxOEiBv?y^BoyBQOBtUmIN|@qiZM6;{tmw%1^)@+!$3y<
z`t?n5oOwzl*x8Yt$?N>bXTS4iUVq;Ys3Urt6oo-m43Ql~20R1OfqH;uIN*wsn|I!!
zmNF@}Vqd!DFTn3nXSB(*qs@AWhpd@giuxtRu*WM#w{}*+f}}d>P)FJFjcNB>V)-aH
zgN1lj<gQ~j7I3C(I@oOvB-~Nb$`YHQO)bgn){=eUjj|x2-UUi%@=t6?YOQPu!J=K;
zYgzXoi>FDcRJ`LxQsTIH1^xh!O;W*1+L4S$=cUwRJ0fMZ&QwW?7AC%`T<C6NRM)*2
z#VqCC+!I|io@$oCY5F^u$F+COjlX(EKL+M>lr}$Css&bIH`+rqOSbA<Z{#$UgjMMM
zk^u&vW(ikb(pF=INRCF4PI_Hh4P-@Vg%O=-z#szY4@Q|>T>98?h8u&*H_2U9GhJx0
z;C)rCgfzM)wt0x=#<b2u9m`6Me+Tb@6TffRBC#(s45xe-!Z<zBmBnwssup%K%U{u~
z%3lpqqvldS0)c9frb~H*7ko~Sz^Cs!=ne1cCw$A4;R$X+i{Eg<E#a9uW129-@)r<u
zw@f0BPwu0i?kD`X!2SF{bT`5D2Sl2lcg$Lz_1u4-gu!xlI(I<5E|BQVUtrW3q#~*{
z#a7U?*5%8-UiVu(V@z?5GbUV;I|8NDpwd#4^7jAdn?~+!{(OK21T;(gzgPkP?{CC^
ztru%GA$?R<SNYG(m~LmMr6E9)O@K)M63Rq$6vzp{5E>9boBaYIf}13Ukuf`(2|=*F
zs%u?aTPrP9v$m#PLoJb8P_eFUwbQ*W+r6%;-EFCDjo$z1VNaGxg1r0cvj=?idf#?#
zcbdQDJKN{|+#1UxEHbt377*jyEg+~*npY04`Xr4_yYOkADZ}uk$}f9#hRdHZ!vO9w
zxq59K60BXwK#tYVdz8+aP1dO1a%e}ia@D6}xPsU2u`<=_A7Cyts~@;>=Mj~HV>IYn
zVX@e;ROV!xw3{6kiHzB&0-RaxSS<+IAv<M{-Gb4aljm@k_Db%}f~y!30iBY^4=gt<
z7MS_=3u1d^51?T7XV9#0m@PRVOB;mwbQd>k8%z~qW!Eegq~I<$iB9Qq{mD!<%hpZ>
zyMWDNXOUw)PB{UMXe%6M3*MK>GonOsopSe*#03sY;&;>d-l3C#m1j#H3k7g}n*5iE
zGo;*o>eCOGK9#fS60goV^>d%nLG}ApK&RN5b?CQWY<)5S1kCl}X=n!=`W5Uu!H2Kr
zAy()+Vho>^f@r)$aw;3PFVueZ&3H-R%`vl0pW`b8reF3<{?ey=&i(w8GWhmH9{Urs
zPueO!Re6s#n6LcdSK$tE?ELf@UhM6vXSATYWB%9+r1A^43oU=aLvT?9pCu2;F1RZn
z$!RUqA45$*gHIm;$PMBaF;+QDmuT6}kT8I==%IM&A!BZM=n0+GZ>M1U4f60%TInOl
z=VtLuGPd7lLANNn`<1dWtN#46Wllf!f!FwM{Z%vZ(;19^o*v_q$Y1x&{`^z+;yZ0@
zKMlYQhCB49qPOJU9o8!Z1j}Fk_?Fo+miDTxeZ9^Yz;*+74XY|Hw3v6<X2OGWU1>;F
z6D^87sld`niE`0?02T{7`?S5iWv#vK`u!`}uKg-|-Jo=p7I)TKi`(^^5KVh~L8HI7
zv()!PtI)3A-q!R8tc((N_8*WLd(Gz7!q%li)RlI2_Q~}cmUb4duw{D-^D>@fdkbsZ
zNY}gOWJ^Jv2@T(bs$FwO9k(@UHBzL+>oX#2aq?^gY0{!%eamEYn0r{w=jh~~_@u>J
z%O;O~wVkcz+Qg|ILVS3#IRik2W^d%QI@(1TOc{GvvAVP0Jsi~@?j}Nms9QsgvWXHE
zUYbkRmDD{1S(X{A+qiexr`uSuihNnEhdmbHL6Nm#d0V0RQB(I#66UTZlj3hov!~q4
zjTo&~Z*Of`7dtK-%!({di`Ok&L9f%xxU`QP*QNz20o={7MvvXC@zqCHO^+ET8XB2v
zU=<Ad>q^NwOhMrq_C@PD*teqVL+D<Ce(ngnTWmURS1r9pKO^RaJn6~1_LU%Gz)w2^
zs>|(3{6%9|wrvIjDuY+?9|9y%qry96-iI15ev|lGIL!FD;E#rrZ4Lic?kwPwhLJ^t
zNP|HM`}X3twP^CMVKW()j9a_CNq$(GO&9i`5G)srsF#DCWoJs@IiON;w~(%978heV
zqBZ<mBui4pNhz}uCG5zEQbW|#bE7QAMB)yOrLA<F({VmkHhyC2RZU0Di;&u5HOutx
zvVVcr#@ecu>N`-RwKm$-?j+qsMTFs*rwo-lQO_GtPCEra;WHCCm1RWfF-|sZ9OyIW
zzKtRqh@OUHAJ=>xcqNd9&)aE3kBd70__LyuuIIGcX!zT9?xe}S3)4II2*f5pxGXrW
zT}x9l+r)Wkv2DahuA#|6D$BWj-zFSNyFgM98)UslIYt(0KJ_rp<JVumB$gHtuCLGw
zH4FC`!+53ANV^6k$7pTXLPsHS+{TeGrBhkgLXry8zD=Hm@^FJCsTZvxrK0|NUGFJy
z91-L<7W<RS)Y1AhvLrQ{P&8?U0fDUr+m@q$H@LE{>|$@Vb6I=n`SS#kievtEK1$SW
z+{j~ik9Iic8zG@K#y3TNJf|U7Lya^0eT46v;V2Xt0@@OT7!OkH<!(c8si8CLsJUZ;
zr_2I2WwU^R$m&CpQ_ISnMtWicI<evi)sWZ)f<}atVUd3>F>!OZ7+ZK!*LtsEFU~X5
z!ZB`$CT~Qe0BR;<3nSWn-009=9P6RM)?cwNRf5<AKONjuM4c3uDwYi!Vr^@jn-wc4
zZHk|qSB@_8PQ`1yw0^D`tIzg^`i-b8dGq?a(WE}`m@O0;@=o^#$j*~S?}ngmjGyg|
z{8RbhSP`UXjGy@p{gaC0P~Ym4I@y1=pYcN03)&6$1~iOrcNct`>95z*4PW*6$v)s#
z#xGW%{lfO0d^t(#LtU>Mgo|2!Z0cC8i64&^K9yTevkw`G-d$k&WZ#(i8>F9*`+M;O
zlP9_IvO^7nb(j<6kU~qEILRtPWD5*gvfBOPxeh_do&^&>W%b7dke{3U1!}}$g~Iw)
z|5+wUf3HpEo0-RSG5?63{4-V$JRXOuBl`};3yPh~(?<kT8%;Xx4L-f7Y-c**{AY&o
z!ZMSaR{Sov!N|=-n2FVrj`hccEU1=cp!3KzQGv*iR0PJK{SE(<EvB;<k-f@4>l5yW
zx>wQ_xKf=b2dBm^IcgP3IQ}W?)BZbt^5?W&)=ynAY_^dRa|P$d?%2BBluAvC&$G;_
z(nq;-v`2UGTf(HrGA^E!Z2tI-LzM0P5JieP70#40-UmiCz~)&aajazh(EOlyq2%mb
zQyI0AGBfz>x1Ta<b!8b~$~-FzDvrIar8V2CYv};mRkOm>rlF><YD>a{e(qA4)L>)I
zuxOHs+%RW5x;Z3~m8{x*?5J0DcVH(A*T}c<^+0O-hE)|xw}MIeZ58IgJ2&>WEUVIN
zaFjfnr;JN5mjXD`w#tcBT-jNcReqLz6}S~)PWzNYwa~CibjbB$WC0=0C7O_ShM|Wn
zXW|5J5TIx_eQMT#RIOeynpMTJisXlkXk8Z)Ed+vnM{N~W30yU$BCX2W1qD0c*;&xU
zj5=snr(@Uj8<}Q(MY2q*48ZEzR4J!eo^{F6x}#EF&1{m%+$i)8p{nW>QDD&!rU%6F
z2hJ&zST4r8Osh~Wsw7~7S*w-~dg_v{eVH9xGlynKrFx`<YGpIQ3x0<cS#KP!3YA%}
z)-1D1&c-pe!NjaMy7F>WOSx9LVXw#ai6PtBL}oFI#cwkRa!L$V^AZ<-J!JohC>d6x
zkCp^y`(cVOV25!|CALaZ0e?f+>a61wq<euAIL9rnz@1YI2xPWOR2f^=wa$uFHQQ=k
zCA^ZYayE-=UM1H``kf7>CQQyVwX&`1p*f_-&8En-%J!4kX9ZL|w9IsZpX@r-hS$9%
zNKsXlu(Jgg81s1K6N@aqBYiT&2Njkx`RYgps2zD~3?qyQc&g}l+Pa|rO&qrTVLPeN
zgx`tGy-bM&#;%^fzRs_B=km~2yuYway`s^%_82QOSbk?ddR%!h*;Ub>f=GQmDiZR=
z$l~AcC4ENhjtSA|MrCebVYN|X1WIx**fFC{YeXfv@h_<qHJSEd%`vZD-G$Ro>`ywV
z6Lc-b1A(&k8HM$|;|*alY=(YvsssVo@s?8J@~7ITy}iwK_fg}oPRWfibG8<f?4?Ll
zaZh=~G_!zG)?{9SS=nZf74nj%$$yb0x$T2~2+7&sOOnYKk~c4Ol8KpY>M{NO_6=an
z?Jvc8*VyFq+BonC92njwn32U3#(JZTBZSp|e%)nIIp?@3>2r>iQW`HM&$tmsJWsR|
z)eFfCfQ(~<cJ7$bWNl)^lN#$XnrMPfY8cx9MH)~Lx{qn(qt411n3>S9<{HIze#s3>
zA?w4FYstmE3|mI(D3e2Y4#{k%ipVo^cR+O6G{T!M=RiQp3se&uu7-BGP3m@G%&JZI
zMY3v6>M{y+xu^WreAK)@IdDAYY0FN9L;+cg<2^KKO-_y_**`@XToha3IIN)aRo3Tt
zQ+1{hNC~>)I%`~jtR~>D4+CyGu!d5z#dKz+tH$VUiR;GrpmuuMfba0G5tOJSVfOxn
zj&>(PeH*A#DB67X(>O+xJh>jzXu*a>0=bi+{@OW&dm023WK<m|iE?q*Vj@p6DT>OE
zG4T}$<6YqDphlmflJ4)JnvSlmIxQ?#t3H1Ok+ZyuDYJA5C;JA^U!}$n_ZJlk>dc|G
z=ex1goFR<7{^i~Nd&Z|e>a|I}8?WW3{!b^9*3Z0@zj4~b6SLXVV$|dw))bY4+f+qo
z!?HEc9C(ak_<k*JQ^uM*U6y~1d`t=Y4>wuIog>jdOF-LzFL%UI{Sc>^GwS<JIKJCm
z&W#fe*OI8I+L;tnT;XXox*=*S7zKrmL%O~0RR($-E}K?Bz%ZH|IcvCRE>{rpCWrZw
z6O8Mqi2RFYg7Pr3p5Ie<(pR7rM^mUv5t?E*`Zc7{IgS%T&pbFRw?G)XaY7HAMZ8_k
z{C4#i%<ye<93$u$>N)-&NjwVDJZpxj)#2Z=aJ|VH$x_Nf>hV^hWVcDg$NY#POIX+?
zBmyQ&Fn-B+ge4}8h<!_c#)?1g8CmoCS4)4&s$UWhKq0tG98do*z_MEfkYkpvUu>?J
zHW|BrWA14?{36<7C7H(@QKkZis16`5IZ1Y($a{75iKc+xU!D}LW^9e?3rxF^DYRc|
zm%!8LlihbroAyREh7#-w4yJ?q0}fC+f$9RLqXfV&#1w2_JzI%O?DNRv&4o|iSqZB+
zI7F_?C?5JnIWEi!#s+(t66|ZUh$si$Oa*Lf)3DYu6?m3Q$-<vg0>F3!johQkXxV{B
zvr<4){nGjOZ=bFGc5m-7`+`tp;j=at*}IG*@wHRo6fxPJwzKEj%S)GLW@qp&pXacO
zkm0yyk;5&X1u>7u>zqGth*{j7Pls9L&EOY53;w`pAFP`^%?yYVgHXruH7sF5prt`T
zXCQFAhm;ai;~N{aGBeORa)P1`FO(@$o-QlB!+a%7UC^D&Pt`BO|3z{U>p|<%4YErY
zsxKL3)0HZerhKebF<mZ2=}Hmmhx&l{&#eoMb>nk#EqLs0ptvjp?%9KC*c@9D{#<Bw
z%h3qghW-Z%iQJZ?wuMa>J~NwQw=N+6?a3nO%5<R>dG2$s%cATG>~2jL{_7HyrvYC#
z!}?tg)eybGiG8J%y`W0QCr3Qpkx`U0WQss#5>A0HAF}IHEvy5xt#D)*09#jv`?9x3
z0Nt;%+f(avUms*$EAJuwLp49ZqV%Kg9exReFTA-^@O<v0?+S~<HfSW@zeXMxG*1r<
z{6*>M!HKxTw_nc9cm-;}1JgU?7fK)KgUGdM4FK)ro_U2OMlXcdPtMLEt1QsH@C&%*
z5298;m7q6jOCaJFoA(aAU^kdIN6wJ&@*Z`o{$>DCtNyZm0cPbFS_{wA@%FiUMJL0@
z@gtU1QRlk&!7;)bl23&zuN=ASAK2w4IiSf&+t^g`bCiI{mla|cE#-i8m}S5mAs4Tx
z`EMncKZsCx|J>Jl>{!&mMmgaP28^`D%9UicSkQzNMcIPA*ub0u<O{qilKJBqAB>lJ
zT(LL74)_hL3Xov(0f(P?-vOKDf;sey*iHxs+0HVWAMuame~V6Jxo5wV4e*8vPy?zB
zwIJc<p}IclZmTjWxxAUFS`8dpRW7SaoPa8l;mfDc|6P4wb-^0aDvF#&D{yB5iUvK9
zDKEbc<wMTVe$7$`ZvP_q%w&*0{G|DdA5bMi`!*ygMqBZP$}#6At5WcH%Q{YrK|kdR
z_(?V+(m4xzA&C`D6;xMRsl{xq+;S~Rld>wEnO8V;uhlO-*5ih%5C>=Q6|)T?Z@6h*
z*o8g;eR@`K-lu^`ChwAlduWSjTW+K73s#1z`}u{%`r!h<ZM5N2{kN|Htv~CQpUuk&
zLv3)%Jfs&@I*g+5!hyjr@Y%}dTOB^zj5T+#FbiRaE`P5mEajCG+qTWxd&~R+Bf>Tw
zN$g-y@N*Q5%}(Oq`lb8nMQRW`x850BN-H-nlNCdc5pf2A{XpdVCjRUn&<Lq>59l7;
z$}OOyYPWBcTVYe6d)E~>h0ukM3JYg1yuxG?+$K-9e7^jc-@yAVD6X)|?&bJ{qgX|`
zg31JK<Qhlxo+$}N*W+LngrQJr@3OZyDA)Jd!zhE5-o1+`qo1Xem%<ml5cw#h*T42c
zbP3!zdnZwz$}Q-*z!n@2cDqLbQU;!+MxLZ?r>9yyRLu?U`8KCXTLnH~O>EOL9U5UL
z@wct+kJyx6^8h0KMEfnoE|WKu{S^93!TS9>?*|`crN_O~(7fen-%xi2S;(kr;d1m3
zUeZxYFZ{U!m`;~Zq|Idbo(~x_;$?45ul{LLCVj$u>hOyyx!YA?7ug1rjJj6SuW!OG
zIt{25h%{Jb)$$h*VVAFT5iR_`FloHPqTfjVno)KeJ_oz(2txcMge!>a;iZ=^6IkqJ
z=fo9|jH39dlkAXhX8CRTXmQM4NdCWUssYfyjV;9s12p~S1veg~eZbZg`n1Z_Dpw;?
z+Tib<MCgIByaUQc@8T>47LW!OWd>$}IW8>kQV4uZaKEq{Z}?XPZ<jzL1i3XA?F>BW
zts^)=Bj`n4NaahfJh*lz__pRrBMSVw;>{NX^CaT|HeNx~7u7uQIW$H3j-b7R(HFEP
z_I!Fn%^U;Lol)|`FEDyztU9yQZzOv2<#(MvRQiE=+@75H2h4ARZ~z1`o;mY-=bkA2
z6RmHy`akKNasG4Guda1x{dZb^;p>#}_6nmr6;hp|vq!O3aQW3}PTg8#*{f80MQRV8
zR<Q0>W_x8^Z@{aw=v5HmD?skm)0;}`&hcG|?v>ge@m=Y}RHMC@jyK3Yhi^c)a04gY
zkMutK1<nM;KR}QAf<8a=Cn`hK%Ltl9YXnwOBs9n@lLSd#Nt2O=6^$Ti=U;iT5=tL^
z{}}>thfAJ?xyPhrjT+6?NzkrN{?)~leBrc_Yr?}uC~tWsI7j~Oz&O%feWM&1zxa;<
z{9Qdl(qmJg7UIc8AX<JA<tLGgkrN@RaG$5nh;l$R^Xl#ddtQ($jY9jq$}^G0Zn+N+
ztj^mC(>sHF_?+|#RacI5M~c)cnT9x~*R%o1Z$DJ0s?ia^j}f@`8-bi!Kwo+I1=_C#
z?d(8ceCfq;cIYBHL=jg=qz#FT+xeFp^qt^+|Dmfnfk9i#mRAymfoF7=e*W{kOQP4_
zw00f*vTg3_u=BVAaljRdZ<TYWAGpBg@jAd~V(gaZ?#9|rK8laG>yLSZ*}yL}^720D
zlX)=M{$JlWd>emVi**!TL-^V^pU**#7Tr`l1MqMpL9_@7kEADt)0b5Gg3JJ^EkK?c
z0rh33KD4$6R~4!J0=YiCx%2D;`F0|7FNj?+_GQ&?YF)uE%fCz*;Q{0qgnhYq!gj=r
z*G3^`@Vm1k%?8BG7i8Mlbg!4LKERJT@wxM7$c5hQfH^pAe=MeXHSJ?AK)168+vh^?
zipVi14>}tlAs4dG&|E}5USzub`fk=ucBs9HmGZt3>dCXgPdi=$4se}`E8X)_a{lmP
z$wdeJ!uHGiMtbop;RK|kiO1sQcbW&j)Z$=j^GYs@YX+PvT_X0vu&~RkL04$QPiSJ9
zidax@Zth(#!nrTQ`iCVLzr@2UVO0pB>I0$HWO!v_xEP>{2;&`CFJd#51wG(6<RdQe
z*cB+ip(jx|H5ra$iX?*d*`i2k-7qWNKZ9x~oRUE%egH)&yz)B1*B_-#<T(kh(*m``
zo2|tewM3cH24uBuOH&FjiR0`g;%oKI1?Tw8{No4we;$q_OQd6;{%gYs{==9N|8EU6
zRR<e;LlY%aXIC4S{}xmzU&$dWB7Dnr+qRp6>ex{cL_wK$)(`{%qk#%mq9Rq1eD1W7
zn@Voh?$$11>`NfamS9Nw0O3z@m}|G8L*0+h<z)T~p=4(^|M~oS!XBV$Gd>^mL7~Ef
zY9tsj`W;W?fg_CZz?2rEhh`)?hFpluq-G3pSQ%qJq=!7_^?ROp!yv+puWLurdD_%K
z60CG2x5$>$XLrug$(C`#oDPiD)uM;}G05=rsYRQq_LE82W3)wveGnl={x741s)_nk
z%d6WP#jvz}jLaa&wq|jId5VnTdQOtJ0T&E$WsPqMI=oHvS!_|CCEDw@(IA^s_YNhx
zPF2xKXSdp!RO@f;@=40k<RHO`t4In2llDqnAw^+bxoZ6=dq@LukbpvVzQwv-xN^n{
zdOtp~5+xn(%)QOMNgMzTBX)s~8)ZE{S6k^iJ%z5#v2YstKS!NtgQVLQU3!y_Oh8jR
zoRJucvI9skl-FW;0X_&+-65B-eD<eGN9wNDCe4XQ<ooMMy`SVDbPq~U*)r$q>+c@w
zESH&=q%%~dM;1P6k61}Tvn<2cr7uR8b<Z5dD|@29@qu_LiZo8t;|#lY9cMbNaTaO9
zEkDxr?R4F6z0})uu)cr$tB?fTt}ij$FZll!^0Pz)Xh7!z8!_jVohGCWj;u+*C8m~0
zh;^xR|5`2@hp-4V{>|zJbI~1+MOG<9#3|u~p|~SLE+zpig(|&9yA)FuzXrGrL2)O%
z1_##v5;2_T+ya7oJK*ln1|g47Q4p~v7O9XU7Q@0Ip6N(0+;1Lkg*kGG*D3=SWIX0W
z{DTbXXGvJpN{TcdB2S_~TL`<PpcOfTAl4rck<m#}W7q_Xc%coQ*x4ph#^4(_VX|yg
zC4vUg?C}e+(M8c?OgnPIRba75?g*vuOF8649zpRGs>nzcbz~*(l2aqFNUt)lH2=IL
zc}uh?=muHG_S&GbFj%Da+xMLWFtfydHp>6{e^p7UrjP)`V=VF*84ys35)cs1|5_z3
zmNw4+RUWNA|LGs0zI49K0ho9QV17eDgor|DMil*X8-*bdWPm0aL{xBO%1jKHkj=<w
zT+%s~-l%}Sq|(u$*aQ_Btah!aRo6;ax4J1>TiafnX>Y&h{`lJKkxl+SfBEWb>-+f+
zVC?oM$NQ%9Y%lWb+drQ}KxDkiDE}@Zy=lbg-dDKCCIbJ}qV=^<zK2NfDGL8>f?AJx
z<jUiRQP0mPg54(t!M^AZt#FTRgtqSxtzT3;Kl6yMhvzr~yzseh&*u)p?cpi9hvz=R
z`tj*M7x#~&W3~R9MU=-RLjRmm;QqlW$if=}uV08*KkLZ2$6GF;)%~}(u#ZuMwZdmG
zAs_3AE5-LB!ghc^(}+37(Y(i7G+`UokrK*J)cF3w{66EtSy%@U>kq>SKjAk$PoKbS
zKkPlea8BfrKkPked%`FGU~I{w6sU`5={7a5-o<G4VXCG;zB=54)G~GWv293v)v3gq
zh}p4giv0WOISr@S9}K4&^|*)0d#3dSWFMy@o~eZ7jT@&XdAUT-upFpE%i$9jPLTNG
zUMDhQ?A)yrn);a+MU6S86Pp&wfno&xD4!OQo)D$Rcr}N}@Z956(ghiH{NVA%PpUI4
z07nb=UIO`R1zv8dll4I)4~P@qR^IP>CgHgk#n_zCtmJzR(0Jv04TFj0o~9jf^}?U(
zlOY;Ag}@~umRgn*qk5gA;;U07o~j<F%y_$@Y1yVJa{2UCkCg+(XfW4vmrg?UgVMbO
zSU#>?@IUEdE?r15^8?n&gzCStVIw`0s_!|VS<SHlIQXi9iL7Bf>j>%sxdDWAEGEz;
zL18wb1``RkVLH|mZuqPMJT?=q2paMAi1~jL6otna5Oc$J3?@1VkzZ3p!ga%TEGA^b
zGNP+y!#WUU+Ygr2VLbB)=f`vO4JM!$7e&K*HWJb?07}AkqQQ1Py)y~v*hz1-19$30
z*Q#MXThxbRfNDN3b-m-%_4jl1hMR5x7v1F5eaEkVkArhbmbXjSXFiz?>j6z|e?Nii
zM2_FS>%et&_c+bvdr#?a+`JXK;7X|*Kepqs>IL8l?_Cx5Pk!8O#DwSNf55&0g?S<@
zvqP7-AKtt2^aYNy-@l^a!5`i?sPi4A#zO(r)@e1DHTpyn`n_}wj0;GRBI;-@CB}vq
zTOUAS>m&Yk!~|G8#R!&0nH#keyl0C5V@}^H+Up%=j=NJ^qSjPbSD=wpf@Z>|qf_ry
zV`kM<)jo#0zQw9@VIIDwZ$*I6)l{`qO-*gZ_KGUE$S1DGHal6^e)_s93j3O>YF%YL
zUEOsROLzXNs^=KMWtFHk7S=TOHJlIZY-{Xkbxry`WuTw$x%@XO^%d6ix=LMDMUBph
z%f?1ekCUvds<5o5@u*U@-3b67Mpsv5Wnt5xYEe_8si&^5w?8vXTVG>;AfMVA8x-?C
z71ovdgqj)@mP)U$XA4g;vD!w4gUT|-WX_@1#DN338V+1r$br4G+eWsQiu2k@i6?hC
zpO-wm=m1a=r1F2p+))>;VI66y8eUYeRTr10*u$`h3}Mi0G$3#iBfuN$*1eEw3rDtz
zxHPCKE@|dPgRO;ix%^fq8&3S~ehX_02il!Pvz^25(N%5yPbYeX)Mzo;6xOu`@Zf1M
z{WhrF{OX2x36o9}?^+8hekv4ECz&jcK>I$E`6eIwp*i-?NLd_X!TPuRFWfEk;6X!A
zS@!SgN^>nF$m&MYk{Q)nV>}j7XTXpmS)j>^u@8icIaB~<n-RzeKOR$l&unK))4{ol
zYE!d=3*$;Y)JQ2cdr}8^Y_U20<3N-tk)D$+*u<uWYz^BU8vF|)Rh+0%w$N`k{&t@B
zYnc)Ay*kPcMr7z;>OdL$Wb;a7SQ05~poBKf9-@`5rhYD6(y@h(YPz1kOV}b+u^=8r
z7n`n~8(8NUZEj(fLlJQTOk4T17qDQ8M-}jWD-R;y^QeS0K}TOzD!)^Ygd1rOU|Yv-
z!Bp>3b<u)C4-t|CDWfwp{J9WQjX4Ho9d$>LB@L$CRud&E<e-lea|az-ta}q6(4?zC
z#~v%n7WODLIKyTmNg|Aklc%vMGaK$8F5f_%7tsGl4ZNuKUZbP6gf#)C<u_7c64X~@
z=!^l)(kkL<>OR)i3||%uX%hAE-yh<4vpDh?QdRV--de)EAcSn`HdijCw(h2sc}8|^
zYmJ;@anq@*2l)A2O-RGvI5&yeu{yjCFt*iO0^r%p=`r9%k!*1EjDpl~*jP5(FlgM)
z6vSqt!r5uyM?Ef@?sVG2U0g=k!gm=O>O2#nh_yCt4l3P0MGV<K8d{*@e+jUOFtt+j
z+^xu(zEG}z*t`=^8GcXcz>IOVYm6QP;CCg>XnP|)7OZaJ#JLgwTyvnDrVTy=)dxxl
zxhop>4)l6(FBA<ka#_#njv}1t*mjZY8Qo*TBr2o`hM5oO-50RUM>rG(VXul-Cq*ih
z#0GCAtev0H;$)+~4E73ns^L5sAmYavVMQz6BUoJuYk(fc7EYuQqT#=AjwPM0eT|62
zHjs)mYkh>>Y0Pf;SPMVPn79lQJ5LenE=&t+B@SXs*V4qFD$bC%aAI5l8_%iKNHH{G
zL34di{N-9`Z_+4CS&xSyxiW4v$+8T;U(Zrt3a|*`bciCh<$m-%(cD-t{isA8^9Y};
z$C6T2PXb{Vf@agZsae|MjK||Z6lT3`nL&|bv55rhJP`(>l4l8HYbJX5M%R9vCvzQ%
zyezd3`O6!zE;XG-LX@J@oAA{HN;yLkem+#k1}9y(MpZ+8LxFNGfM6R*y2Sn#x)TiN
z<?6-A>9l8|4z5K1Y%LusY9kjn+yi17Q-sOkJ?LqgLwrF&{(WVE2mi2cIH<ug`LJC9
zdox(3;Kj3+n#aaFd>EJTr0V*cV+H^8v59h}iEjqGi&g>oT*R*fveMuW1%F4G)iaYw
zLR*^%MWk(KGc$^*Y480&nP^s^2o;xSLoQf`a(M~zyXQENbeEO~kw?DtSa*@2w<`oz
zcHk+K17K@0?jsI-Yw4rT{K**il&i8ieG;NqCh0o*xDn3wVrIKJdH?ZjFBHx1CWxHt
z$R$|U&+@wfb2`C&gZ?yU$p(hJ-Q*cKpLaeh4~on)KHu-RuOaQIan4wrUali=4o=L*
zTVK84ZD5+FI0xqkP7Bkh3gc{wx5E$-8&^_vSU~EgMkbMxn(|F*yyvOA%st5Fu=IHX
zCYn2?H|GlB(ugol6Y>={7sy}&rC$2S-Myn(Vhgcc)erfJpK=c&or&w+B&6xHyJPi6
zV3~Z@5ual}WquO4%zcAL$dim`EG7I@x$GkKb0(l0V0l9!{M)FQkez8%gK;Nie!^V#
zEvG_gexG^t=?Kj2TsFsilx;ThQU3Z*4J25GBZx>oyJ&3%GRu=f5f@$75f;QBTqy^{
zj_50qT*@}V4U=xp%WMFsV=!e~l%28;6&=ezd?OZ$9!qFGD+2m}5#GNx8>4dHNE6_r
z;iQu&;9qEgL*3cKlGStNaN{Wqf^PrJgZBhT9Hk6n4)Hf)uA>Yi-q84G{Wy->=u9|{
zp!0V-aU7-7fB~RTp0f-Cv~m#>j?1QtnB$K_kV{B7j&e-!!xzxiO}Im!`AD<gKR>2^
zDnDRqUG^=^BjM$RHR8du{Dk(Pl*Pf<`!u`EN4js8(bx3&=*Uy=O<DO{=I?@M8625u
znUA>6dFpKz;0(aKQ&YgL{4LaXo7&HET7Ob6`-V+p#_ZdK2v?=-`aC$aS3V^rCG!^e
zxsZZCxt|3v-ZY-tzZbSa*FPrUd`&QzswRB!euGro!hf9@DB(->KY?{NEMSHA{iBKP
zW@qe8F)y|9pk-Vrf`>l=5ON^-d!>tr>%}Q{H-&ypWHZG-Ilm!I4ZNs1$;08PH*gu}
z8h;w<I%E~~AUcAAea8VG|J1?cAlk_;cnpT+VyMosgcX%-)c)B_`9t*2mZR!tHq~!f
zV7VsXn5$P3b`%KgX_@(_!-cubmRLi{pZ)X<fS;oV+Y0G*$}h{P{vC~8_c@gE6K1Ug
zxowA({XuO-nT{@}tnv-M%+XD>hHAO$#5Fo2-6Xpl$APwv5tQ^<|Cz+9YC=_5Qkl}R
zf%&_TWSL;9bf<?5H}qlXna0(HjB~~pwef<;k+COf@->*C7*y-2vWq5OUD3IQn!ZB3
zk&1QH14hW#jRun>)y&KeQQ{ffE3T3!A}|?yyHjgk#+zW!b}EA}IX`uQ&n&8XWOZi0
zNj5S$@vIfpgPbK*z5e&MQ&*hvFQrw%Z;r`IP*L4X^ystA;O1tSH(psu#URt*2zvep
zs$msPfb<@U^wculFDaSR;1^G+pg;p|FTI%_q1wA1Hn`KYrW%ue75;8wS}-=Jck?R4
zzv=)?Qz!L1ZW+;Mpw>SIrp+(D$lh1XRvc(idYPMudpI=>SXQlWRXQV+G<%#}#`i$p
z$ymSA_Tcu2lR8`+48=N!igbrEt4iZ)mnAx$em@>w!Q6AwC9a5PP_{DGDhSz2c{aB3
z<S+yNHbcHYg}BOr`)%%6awNL#WO_uT?4ig<m3yF8DOzG{kCp7H__1a!L$Qvja9Yu9
z#W1gWq+Y2a%djfqjvAt9r8uf&*_R%RB4nMYCd;ylo@QE6VJpZE8+Tz%L%tOz8MEXX
zRuzx7v`jECgr2f+_dzBx%iiZ@h5lWKx+|MfZ<b{Q)*O)FX}ZUV9mn7yJ90$%%ft4N
zN*i87xWtjS$5M$Y?vy*mawT`hd2|6)pxAHR<NG?i+2jA`e8xbQ080Zq>Z;l@jcS6w
ziMxmSiP!BrlLHmUGJDh_c(@t$Rj`%HSc~rmf_uhC^ZXF8>R^NJrf;gtzaq|%M}?-D
z4yp#KwB7=WDMvbtC#0MD>gww933fHnab^Y9g6_xvf}r`&ux8_9i1#xhT;X<8>e9BE
zqkg4l)kl93*9ko=&(?$-ozqX?!TXqpfId=D<TtH(=Tq?X%5dIr&4XcRE5%i<wV~U|
z#anYONKvnmG#JF}OO+5`OnJ#GLp$RPr-Y<z1uKrlfhl5^;_Bcu5u@;WgS=)v&zIY1
z#*}Jo>Qn3Ksx{T6)&24!mM>ebQ$}ECx!OnFM+waMhG5&2Ltlt=yqr7|`USUn^;N;Q
z;bgi5*wLhjGR6xpF?h@nmkZcYq{9BF;?KkD!8Ss(@OZ=;sxG0(XKZk!d4Z=$7mn5E
zVEg@X*y~83$j7g`%W4N@eRO-9_;EH^$I{7XY%|<#wD98zYMw*|7h0K7!UTRZ(k?Be
zwzK%z`YD_u9<K*E17!%2+U|-Pi486datBT>?}bqxzp{axw=jKtQeeX!Q#l!X)kVAr
zb_4x5uv%#K9m=%!276c1>wWRD6Y~>o9}#q8H@Z0PIgyB7l7tY~SQ8plNCfFx>2JaH
z{+=q|jIb5h#TAr9;hiLTu9AQ}gt&Flx9K#~bEy8hBXlL3yGlC38#pl|2YdJNcQu{z
z^6iPO_2vig-3v7HoSeez<5hmh)mGC!n&po;!(6Sq?P%&E<PDs0YA_vP#~NLXXi=d+
z3O|O0N(WnuWM9m5z`I6Jd>{7ky+(`hnJuy-Xb&f5lsE|D2#sEmrDvw=2b#`&>sm<W
z#hb|=S^G_e?7dH6eQh&0v+}2oL6Jto12a{5MIz>G!un6=4;}iir3R^T631S&-nVLW
zHO=mR)g$@gBt~*{5jqBJ^yTAM=RdSib#}XVc)T13raH#Vg6s>G&h~pfTt<r`kibq2
zC86>`_q3$Y*WM<|`$^$S^>}{@COZ@l3dv!7(`|H>SnmRQq7N>Oown@K?=L-bzM4VI
z2(k`}BVF;QtF3*uc-g3MA+OFtL)X51$$r*0^Sfi=ovy_{uTa`E()$12F&diGFr&z3
ztK)KnH~av>-&GOeo!oVE)#nOBEUFx$;Spg8BZsJCkcgo5OCBD-82a9>2x)f2A3LGJ
zfnbSmW!N55V1Kd2wK>Mba<av>I_AV4+s?E)2E`)V@<<U!N*XndQ4+-)QaNW+mEAjY
z_2Y{B?3lWsKPJ7lsr?_$-ZD6@AjuZCWs4bF%*?VZW@ct)W@<6ZVrB-b#mr0=Tg=SN
z%=~Hg?ZkUCJF!2$h>ngM8Fjm=GHz$ytU7g$0R*47be1`IOR+BQ7}*R83R6GrE$MZ?
zb=fcLU)+7At+wkzwWE7#Cg*}(Wg)9v=A*pVi5~X}O&kkJJ4a+juDN_tzF1}VaTmfb
zGwKs69n6tkY0p}=amTq^FXnxJ3P}*(IJA7T6@PbOF#g)&VJ;m-A2uQ4gN>ROM5WEe
z$7Z_pjDGh4YEp=t<72M~?LgGvRf*g@3p;sQ^bnSWX&%FQ@f{0KsLRdY<0=1~-!Xg}
zoXo$x=dw8VNuOSoa(^%JG}lCwVPKl<$4`&5x}BbCbN(>$v?x@WP=@~~*Bw6SG&|{x
zsl~ii6v+AcE+_>m?h<xL@57Y><#+Wl{vwM$V_<Z>q#U#e)A$zY(q5J#i%F}UuAy#%
z#;X9!AQ{C|HJh+wa3Rr=V?6YrxOC1;G9H55K}F(W&?opY)LQgZl3b+D1J8GjAdC0c
z^Q&9VfXxWxjc)2cexdTvZd1epC8?v{t?6w)IAlAc*Xc+<`>m6KYxDum<6UmU3h~DK
z>Eqx&Dy{Rt!^6Bl#T8;d>3wL*BHglpj5$kouGw#V-VGtE>I$q?Y^UQ^Cu(ByQ!SA2
zl^<b{h9#Q_gl)9#5yckDgZ&VmW9}vNs<U(8$SFS_JHk>K>w)X;zglv|`jj~E?HVuY
zg8Ex=?JP95luE*Y3U#r&pD&w=#XJ8cWB?!1tN$kAcVEIsCd>cbAUZ|>^^X>amt8rs
z3;(?9Tlari&1V01LuC5@=?H)G16RfBfA8pj4CVj!`~g2_{{Q#p{R>A0yhkhJckHw-
z(fz8pr~kVA92Uz@->6YNlADFU|L5{^LjSqR&6f|XOez2W>$3lv{6DAm4<G&qLyp4D
ze|fq4+bf1b$Nqo0`oEp_Y0vxL4gYlO<(Cgt%gO)U#r&85Z2fQJz~9`k=_iQ#AK$<C
z|Fivnw)}5Pg=N`*t#i)6%Um6Hj#AhBBTfoft2RAPrB!g5;0|$$?S-ZD(f$08Ft@k?
zuYabD?L1#Zz;2N$wir?4xF$8oC4FQAW70!Y5;^+?AvydiMRxhmM~5E@kb~^V^w`kK
z24pv7dYnsVU2}72!kM#f7REOza_icfis+gWI#sWNE3)P_-Xe`Qxo3#4LsWVw=>TDa
z`t`XqbgIFSNr$3w`m=;-RXEMh==)Z$b6Swmp8$+-^S1@qP0C*3uaWZ>uJj)ODG18W
z<Bg7NIewid^#gOtf4}U(c*ti<Y{U{hCu@r#4t?jLW%w<&*HEvuF6z1WcAM&z*hxZ=
zhwtupKcsf#@I=o;#rL~t7X!#|GBq<iF~yaWtx#~AsmZ^gG;-+P5U#rmw@o%Dx}lbF
zXtEyV`<uRqpj7J+u)d_Lf;b(+PT?Kp8n!TZb8B>mP88pj%bU+OcW{d?R@J0~|6F2)
z`xZ&k%~hFpTX`b<%u!YPpdE39QAzHR!*iQb$@-jRg=)acXRjkm(Aqd9#?BHhcc`9?
zql6YJ$V)a}umuuFb1GRcS=mgq-JizwpD~V6^2pIj{0%-KTB_V%VANM*d|9p>(b7uK
zPtxbmYFnmreaW3K$-rI^qePbNuUyhYrDOGQy5~*_82km$;#7H{1gtpg*+-yG2ApM4
z)9omhu*XSdDAFw+C-ieWpe(Fy&+1g33^!LUlz7T7j2*N#WwstTuMKHGv?x8~R&oV#
za}&7WO&}c0?zN(3wWhV&eqCVUaE@?Zv(P@cbkcYoZaH@xZWQh1Sm)izt4G4XYE|xT
zmC(`ba}Hmv#1ST&2#ToHUI;bOKG?r=Z!K=D0;ndW6ofj$;^!6OYc_<WznQgWgXYFc
zt8+ufIZZZIdd--#-%G2ougim}u(eC4m<OB|M*8fNlOJE`eXjXI!4f<8rk`uvr`|x>
zsA9V7s-s*dSNTs=^0L@hD|KI~Ur3;k0Fz4Xl&(Do%OvIF@lT`;k$}ug3A`)x`JhEb
zzOH4}n#kZqk-d`wLj{c!;A!E6eo&~Ka%JS;SRBz=-LbGzxTQG+#AUJQquC>txG3Or
zHd{sW=-k^4<`Z+_GOH_{XCEi1n@bt-w!+Y^Oj)~l;{`0m9B>aE^4t>Vl!`PA_IVD+
z?42^_)}eFcn3m4R!%aI!PG}fPu5Ey|2v(=JH&PlVFEbNrIigJ`!xko4sPV`Bb&f*Q
zAkYD1yMTtkVU9RQlQ9HPO^t5wXx9l2t}yjmj*Q;IJbYzZ5Y*spZd^dSQ*+@X!%S$<
zUTgSujm4VWqFlliBIC8Gi>;>p<!1a7i9T6aXxp@Sw<p%`Jx{66Mi^bA0SfhYK!`F!
z977#s{Md0{%i_NgrlK<~M>o+lx_9FYjz%%F;EAvZXV=QiyDN9TEeBZDXKN^zG$fpA
zI^9yA%{Yb4-)Kh@CUb$eApYv&(R}5OqPw@-UlY(non?FJnwC1ilP=NQA9uF;1{d=6
z_26L|{8=mRqX)kg3hbG5S?~96_Jyd7!ibS}b8m^t6oTj52|<>zcPUSc69F#+SlPc0
zXM}ZrIG5dxo=rN<)}O4CdnLy-&u}e~Y{KQ?TcG5D8ZK!7JhN7L{?6hTSdB9i?t&;o
z_zGmA@G#b8;-2=Yik&eV9y?>ab_3^WJi~81lqk!ScgY;MdAyc5fCBVv(h?~FJT!UB
zJ)|R0Njqb(n=l()KEl)h8Dd55o*`XI`|=~XZ`pqD9E|McNt!3uO|{@)#wz~DzQd<L
z=c^iet+z}3ky_BQysd)HBRAmB?8_1LeREkv1ANn2Zq;={P~+VsOLdpk!ldD8)<U7g
ze(UooTUrWunAD<3E0vh`0Bd_Zd3f2P%L*lJ<rFK&`hH5SgzyOiaLAE4@pswwM{qwU
zeM|Gl9kC%p5yc|@VIFpwIb>9gYSbS1LO1OF%-v-jj>n;>t|J>!r}af{RZ>fMoq9rs
zlMWAXgqnUWe7XW$<V|pdc{Hs#t0|w$jc9Gme+!>ebyckBvQT{-de-ntJRN^78h;M-
zD-A|Rv*<2W;E8zHB6>T@3v{>}FExR0io+DrUq@5`C=!|9UYaSIi}uk3T)t}eG^E^4
zkI#mzTz12do7=bPG8VDDTpSi~A=bVQEN_1+P$eC5Sd)V9#}z5>??=Z`h&?fw(Voxm
zZD3kjo%kGJ6U!2kOoj~u+mzJ+j36R>wGLL4z6?V38A9z@_THCU+?8_?1b&7ou&bXc
zVQM8Juc7l{3&m2esSCq$ZWZm4h+$1xcaD%DjAuu)f)T>np1yQhy)?(TjaoceRPnft
z+V%12!YK&))=XyT_n}euw5L-vVwMpv>YeE}KAc)Q+ZPCDa{+!qNo*y>@^%VF5$aa-
zqS_Taz?k+3*W-{`p=b{hLRy~@uD(I;+?;%y<^)`@gg*3@EQ+wI!#9C#IcA%Mvsqag
zW+%!8y4`e7*LZAwbv{rX|M{&Q_5=;7oX3o4&QT=qj6+XaGAd_Ht7e%`XK((XY3;GE
zL(_}mdE+lf%yT~bqPH!7A^V&#J@#0pVTVy~;<0$KshXcL`$Hwb^i0u_U0U9dafunT
zq`V1gGfuSv8M7Q-j8Iq`?|??$mT`QoKNFA~hgA2|y32R+zDC0dR8sW66|R}F>1Ytr
zxJ<4Jmv`aLx6`TV^+@R(LwwfP*H2*YtjBv=%cwZ*OR1grn#tEjbdz?{wf5=%(A`!R
z+F~$dZq$q}xNaXrl+M=P`1Zndk6XU%3#bv8;c1xA6-_%cYtR?vVZoY^j3v=nv{*Yf
zIw#Lq4UBpAp>>#&M(tMMTZz`}w|I={msPpmmSd#+`TJJiHp_U*x>8L6&s+|$=nN7!
zYH{#Qar=9pRP{i`_|<g#Mj+YRtT)60bov_%t6*m@xE`8)h{z?L>FZ#=%oo!Q&A(di
z88rb14XY^KH(x?HRgSk_jl60;w(vc^$Js%`)7<lgW5_9V<r}lb#|H@BN86>i6S-ph
zEc_KPMV|YqGWO1s3YEq7``INrNrUp#W?GTUq9oY^PSGVQsm=?M19ti7+|5E}Ne+JO
zJzMv9E?~a)Al<u|ieF_p-6Bt$-j<B4?P(N<^|ZUUo1!+!?oK8Xw;<1()3iT~Q!KqM
z4ExDknyi<{v`hE+A+|aD$p)X$q@=wra4_OothFw+a830{{`6&yoFE@^m+dj|RpvOU
zZ6-ePTl5@a=*TIQ3x5%fVha5MP~>Quj8j6PUQfH5jBR3&*P(znDEZ2wt3)qev0tFc
zU+j;nYf|$vLK~aCXG*pnuN`+K$%Xg<ZgoUqk&S53kwr)c>|9|%rxEhUUIOW!5_4qC
z!_Mvu5acCFqpFWMeIQHKFIx*p0D_WQo$OW=i-<W<pCINl&ki;IP`F^^qw^!44SIgq
z2y_ZU5V(o`UASE|s=&{zq0p*4Eoa2sEo&d3{gnv`5eW-p)9^5rpgO$g8%{9Kc=<&a
zQB!r&UB|^h60T)!GfT2l>SoUq81BUvH4PRr4d&@A@#@JvZrEg6X#7W_|N5w?LRjY`
zSXt}zgWlJ(FeKYXG6T^n%(qACRcSccHy`?Xf?4K0D12{YdOyF9NMW1yDvi@tV!SIj
z!fMO<TQt@J2dS@Z!s-vdU0|%V$jrfM;QU8N;zqubZ?;zZ?~)fiW17xcp^by>5mn2G
z?I4lmYRY%QU+K?%1*wgSi51$w$m?lt6ZxQFkmg>VDNCegk_00QvCJ8K^fC@^!-`GA
zL5-5BB95z(YNTh94xYvzszz)U)Q3sLi^7G7SB4k8uXEnFr5|F;So7#ldNk~rG#%ML
zM^Vi)8}|`5z{=`*ZQwp)VyaJw!0(<uC~$QqOe)r!Gmd}HWxO?D|3YSIVdu4<=VT7*
zoO11US7UzJI4)>HM2Bw{lt=w5k7|*hF1#~moL*TtDan#mDbHllG+e}{^0gxm=7>i{
zn4sA3S$Qniw-jYdX)xSq4%)CY{U8&()&00!{hFMhz8pnP)pEE6NOI900Ot_U3~kos
zvj7hEQ5bi&p|;FrYhekBc;z!uTb~l*v!cH4`bFDI-KlN<LPL-VYvcRL_WudWwNjVJ
zn=?!=PoA`HNQ_pSvskey*-0!|2BZ-Y+{)Qw7J}wn%-)h#t{mJng{4>8xS?uFsp$6M
zT!S&`ZSj#Hf|~oGf2AD9N;6a3iT%KxRrI|BMVRV27zY;@G06ZnRh9&Mm1&|Bh_K7%
zr_ttQmF769<xfh)o%0zpc79|SZ7e{)uB0}C7<N87B5F(%pU)B?2*@^U22?L^6zGo&
z9)`7Fjxf0SE>ej0{yGC_&`)ypSW`S~^Ws|04U>99iuBH&uk+sOTd~+syY}JF*}ln+
z91C6-N0?`}re4pIo%*LtJ6O`t$)|9nC`tdx)gW<M_Ee8*mboy%*Ce(*s4E3IaQ|`*
zZ%YN@10vd<R*wshlnKvGx^D7=k^tqq-rMi>P89FUmPM+yrhf4aRCo@dwDgY3Kp_#e
zxM2q?fG^E3chLRZ)^~*Bue?;6t|{Wyyp%Wg%Yp18W^&m}pF(YjS51)fJ#T+`O>J+S
z7FOyj9s{3h8bU`RweuzniyY~tjy)O|;kj$ruKU)7XJ%bERlTER6*9X@vXl#K^EjQk
zvMSDhJI(3L7M>T#Iuopc&KJ;ab|!TOAxj`1X%Sb>f!1v^jTIq{RuPge@wPS!B1(tc
zHVPOQav2RGYe4KA5!a)#d)db8g_fWc+bzmV_)4bdB`(;H>$tOBDQgOXmKYy39reXN
z<g*8!TZx?bXGt|4LHaxM^rGn5-D=C=FuSmj`XXLh{2GcWE4l3@ul-aYMb0TKh0eSb
zs%nd*PP^w@?r292ug$>IPRt`oY(_e)lXl0a5_CSE+q6E8rz3olmHp;x<c((Hn)W->
z{yBr&E5Nleh38bBwqQ&8N<#6N>bmqBE+1mN9#1dhtwztp1=+Eua%px^&@p(a0)t|Q
zM_Bsoh-OwDEhu_!!iD?U+J>V<D(3hm+z|F+{%GH=6m7#4wl{C255FeGMyn^{p79E=
z(SvFXh3B=QYmV&Q+rpD-!#rmy{C;L59rn%lqF}<oc~0o#?}`sjl;}}TbMoj(t}n|T
zPkGnvk(J0a+mNzd-NsuYc}dO`+#SN0@&(70FUrLA4sqcHNjUD=KR&k;bn!FW+*g5%
zb{pV#4&I8~CQfJ7J0G`#9~d4YQQhICH5h1e{avmrY}y}K_CmjT_ZJ_yuycLnP-lx|
zV+jNb+5em)%*eVH%Mc(%q*TueT-BcyF07<jJ7p4lv4nvQFDLlQ?qBN*W)INn`hs@Q
ze7pDI*Qfm!;dKlf-TSdWcEAU$f3{nmTf)84**ETA|J+j>{UgTI=d|rPit39Q{^Hgz
z@KbAJu+7ae$Mya4+Qmi@A*QmUezqg!{bWf>&*R~Gy&)yp>}KTE+6Q%MK$obl?q1QR
z(T+i81ivu_yKbzbUiz$nz;T9c)idb&6hQy_o0$0`C~<7UoqJuP9Xa_5m^I2$^dnE{
zNxISRDRY2cUG|AqLmI%Gf<6_NDLuO2i_?&3W$)!9u(Bmmqs$e967eKmzgw^UlujMX
zSE$V)+DYy!*z*6PME`+*>pmLHZ2v@v-oyU~{F|7GouH$g)j#>RDpWtYY*o<TJ#=}P
zETE#{en7#RYPkG_j>KN*4-~mkgb)fKg$SUZOsh{oNI0)4f{a&LSl|T`@XkLRSB958
z^21Wez?9U!LYLnAE`AvL&cBUk84!*J8kQ9+Kd*a^w;XsKa2>33eY|h2TzpxLX4nxo
zQWX2t!z4F)<R~;e3<C7$DMa=w`~l*!n(jK$$~rTKhnO(Zz>0<7h|x$Y;3nT0adI!|
zqUSQu)6lU;qtd1JwtM;H?S!G14<>N>;0!`=ld;N4Et-KA$>YuTZZboCDRMSO4iJf7
z@}du%+kbacs-MT|+|vzS4`bWnr!&T6EQQ-))U}OW-|E)Q<`J=4V&KkHxg`g$i$-Lr
zC`<uimJ~MXvIHmO*R#fw3v~vmQwvVtQjBg-L0#gxhqCD+@Fyuvd2_NWHE%lD0Y~=^
z@VP#&;a6HA)`QrUqq3UosT>;lq>Q`!W82L~OSP5ILhtosUh^#94{uhDhC6J>G@ioc
zR>FV@-?gh^v#8o+T_z6y+E*Q<-S9-Io=L4`ka4wDsZ%YE`;=)@Jx79)!1a4Ysc8k8
zNQXDI*QuWxPsFcHbxo!FZeea~TCoV>9ZYpInQsOil~$GRHS%kt`5bsl_i63NiL%~A
z>a-i1S3PX{v`SaL`xSlP9iopJ=X$b$A0p>&ATac79`{qZ=W*2)T6FZ18|XexZ3pQr
zQfnoqp6B&z<`#fbWJKwR==5LWuS^`qo499O3#_e@RXsa_CEIUf#BUoF9F1tB<2akj
ztFp`z`=U>>XtZ5j+wR7?%_WU8q~4S%2}TLkxLamTI;rPl2Q=AfW-838G7o1OBNee0
zbc3SlEC;7c!`62G%E3$G_<%DR7<$``JEzN3k-^;Bi{#`Zw1BXfRse(DnweC$>b%^J
z3nOc6zYVsnWwS0^J&Dog1m@%yJYU93wf5p2vTqDKfN#FNWe@|GvHlB}t^Ofbp}|oL
z){bGf!T!DMJua3$VDRl>Uu!%^{;WK<MZ3baNBAB-7WqG1cKRdQD-MRV|Hzn~{L^J0
zU*y@+iuDN9g!QP-yHc&wlZmpKgZYS-gY}481n)&u*W2?qeP1m#xM9S&#9-tO*D<>;
z4wAXNwN=p?|D+~dgH}&vFm4Eo=AsNW$GkmKUHjf3=LDTjsj>nn3rCW;huhU^n$h3f
ziAI)YyDq_VbkdfW-n1ww05rbT|JdxTS^ZmWxqaeDk&$<NzujW?iQ&gNF91k=XKu0*
zOB2!jRF3pcGEcldmC4vMuo_ph!?A$ju&m)+TmSnIUwz6LOcu6dTGPXnFE_`q&K*{C
za(1+r-7eZW3r>`@g+wbZs+9p~$12p9u#Lu(8LgW6x{;#s&>W=o<U}^6C-?RJDpN=(
zMAP{?C*+&sE=vpcV@FmQ?{|)GswU{UCgUVOYC<>Jpu7uQ*19hwHT^t=R@a8JbhNSN
zc$!hWHjB6DUu%!$R-&OuzD#6`G;<|}0z<e^p20wNBuPhb^n~+Rn*8ldqZ447vIf6N
z3@Dx36swS&rAxR-hD}Xeceynw6myl0k;}$`q_&FtqH|tf!_rx4mrKty%5{aW;jRXM
zM8nt)e0{VmHw8j|DosG;g`l^^{^8jzPkDT~{PJwU6Pni?!$<1sq=rCIEoRa|pl}R-
z`e$wQ`n%>~UI>$^mXV+-SIOM$soE``e4QsH?9cUtW{hvfKZD%|nln(M9L}rew&|k{
z381nn>j)G&2UK2JRBU)uf1^v0j7#0UG87m@zx>qurCf=1%pTH!eeaUp%NgZ*VJfSL
z-8uNYWpiL3G0F-IQDk0oJ0AQ{W_t_lErbmn;dd8(fyl@w2vDnbP1VLV;KS|bOf~N%
z<sy|^L#xr~yQ6fcjb+0jNmV$!AgyG*myX7Tu)rHY;-V&1x55%h8$>uYA+IPO_~8ms
z{Ec;{v-L(`yj1n&L^ZE|dbhun(LOUXY=PC^7g>V!E;vlu@Mb_{by!$7R|E|QW74H%
z5Y=*U=X8}KwnvFuWP)-ut+a@9$ELjRt4bUzZeL)j7!HC1c~PjH34CwJsO&RH3hGS#
zk6h56J+&8d6D2d=5YiMdB#E=%cEgbnARGVO7|rA?f0Fc>eFG4kz^e37H}>Jy_5IiY
z%{p^P&h|Qw&J}m9Xrq4Vc*>i`<UfRN8&!}QDh4S&6(XQ2`l&U(y)uEVueg8pH~?$Z
z9h-THh4ci-8nWc<S84_|w;+&d{4%VbAxm8q6-&ZM@FwyBE7zfUK9^w}8?2!~c_H|}
zXCwZR^>kd;ODI0Go-y2)FZlnC`u@y%(iToY6Wf30y(rZaHB>dE54!Iz&@`6cg~211
zC87LhU8(8;-<g@YVL}@kmrXQ!E#spy;3c&-yt}L$E?jM_HV{R&IqovEeWsnB*>0si
z;<CqAX^F0D2~yLtxLo%iGPoXsyWZd45Wi&n*y~4#Ow{KBqUX`Vp@(P)OZ|XQ>PBXW
zCMG8t9}ff@fn|vQ8SSnBp(P+0ywmTvsH-VAg82Z#CDFwlgl;59<L-UdxaTg~Bt220
zm92Y$(=yY@G;+xHo~UyZ=#GHVRlKYXP;39brvhF@<(9RuE`Ld`*7e7k;YVc?TKm`?
zLoL_XIddCBjhom&+voFL-QMN&n}VAi^ZbNoc4`Ud{4|y@h%E8p0X{fnv8}1erkM`c
z!YT$R85`2WljZFhLW-7}hvF4SvfPXwZV_f~K3Ov+Trbiyt*p5arEHmk9uZ~!tN?v%
zFcvxH<+0tCKm}b!(h5K%8!Qh*o{J~C78y-6B8AI{r@Yeb<*;2s>%1RlU&z6r86-(w
z&m$u(k1-EZSotX?#3;3ZJ0lrLTq$s(sT_zAvpBENn=H=)>u1mq0id@d$L+;mFhpCo
zB$qxgfc`9aw+~#1wE3jDT{ZF`?nn&DBiDgmebpiLajD%lB=R)|W2{dr&K{YJPT7^1
zs`yGVMgvsJ_$-RiHZtOrw@yS$XY6;wUG|Wg?Des$DD$)^B9RH{75!8hA)gF`1$^8o
zxrD{A0YO*F%7O~RQ`RAw@3c>eMr0*%6&|B!Ij)nEE3H!|KUYlL`_kE4!hb+0*KZR6
zJSWRRux%=*!WrQ%r}0;v;fR++WSOG0J0t*t9aQKBS1up`@Anp6B)JkbZ@(Gv7B&jM
z_c4<*JvF=YxIb8~UjR;AouiHG%z}y4a`9)U{1q8}*&~eJOb1NuRa7`lvor>!dfB#?
z?kmE^O%EcqkMRiwI^Pb){afian|1+7*g!dQ_CRSMtF0)@U~LA12z=Slrz8~~SvhQc
zv7Legd;$u!smQg4V`>q-y4GMzm6F&o`>O<Z!L|Ui5`|~Q@)7wwxsBB-DSC;fq1k|&
zWQH<#^cyw)<~PeNJQY|O8oVoMwP(?2OwKXUy;qD-zr%58Xq@v*Z#s+M=d~EtHO4_1
zvw#7oHJx9@F0=L!6i^agv6VF?GkrF<6HI+^OPEx?RA*<dEmDh&7meT)wjLyV7B?S=
zoLfOvTpJ)2SoGoT$k?;|ezMzznHimOvINlp-F-`6u{Ye!b9I!)fi`9%m-gX?a^YFJ
zfr1r7+4q#nA{&_rUI`uTE~^?Z-Q{Up^V58qv5+KYxB$8Y4$^gY$(b>WRt%{;cGY<i
zKK1t&e>8<;kP9$@uVBSAUbNbfcfVJgs@<NfJa1zZ?-o&zO499dh<Xc$1Q;>7StNBB
zqVpD7b_9=_p3RthL`SUg2Ql+;o#cMx7DJSclv{FsgEBbeR(%s9pWhw^+&`TP4FbDx
z6Ixt}(og}{ycuDs$XNcGqFsp+UR$h0ZcKlOE)mieWX)H#ARk`P{tF{z4?X1o-8=E9
zlpl?#1*<d`-<rr)>qsxeMqS{vEYug?!4Az!3;IYF4z-T5<~SG6pH}x4Bv*}%`buix
zU<MO7C+7(}^nwYYU8p7Qq^v;r3&8ZF-B2hs-X-GJl9e*W2T8~_z?ag1=tzo9q4NWR
z8vAGQsD42e^)D6UDpOCH`O5K|1><U$<xYx;%CWiylWN{y@I14vU>hB3giNB(m(2xU
z4+^*p@z*w_$i{im-_M5s@Cg;g|7JR*s7B=M$W^GN-}d{hnh}(f=K}3nQimeKtORUy
zx;<_M%C!MAZX9M0wg@B3LhXM2`2JfTVKR${9yLt#C>EY`vDaNc-AO+k98N+VQv1iP
z=T-oR*wpEgY=4Ap*jHN6a#VgqT~7b)Qr~mqq4tzbvA-46)A@w{3|xGJ;VUXB9c@3O
zWr_?hq(HvKYc#BJ(vl>H@k)Qcfia|0Z~X*bVLB~7Lm3>a+190+1B8}o&aecvXLz~;
z1b{ulGIIi_8M`SnK&XW{$`D+AJFRaXBoP=+Q4^IQ>8_(Al%OTEV)^%_p0fDu-wqaq
zXv`(Uex{hL|CnOzo&G(=tSF(Hp?y?98$(B!BMI|E>6$}H3VWiSkr7UclTv*}^Q@7o
z4eU2&JGVt@zb);svIBB1TMY6(O^3|KvCoVHpJzkfMZAx1z4TZ!2*19>UU-Z@y^Zg2
zWpsVKogset_BbDbFTJouXu4>h41cirgNFFH-@Sdm`^5SqI3<`(MEg>(PwP~;vKKd=
zSW!1UiF1_XtUCaMS2{v|shx70ID<*oI5%ukWLH=l#US*Dh&u5#adPUjiK%m%Kza2X
z0I|};e(cu?*y@sjmBycUbH#~ZN7&ZF{5@^)@six;4rmHGXNd+?S*T0nJdf+ha_B{j
zq=v-YvJ!bwx#8qetK8y_-<}*5n54RSdh=*P{3{+iM&bA>GE!5`v1S6Sazn|q{OoeT
zcw<rim;L>;@VEtL6)D(ao)XK_JCL9KrY}3vQl{7ioB`qql?cC)@?2t=my0Z8;cg3D
z)+45isVJ**V-w=qe1N6xEuER_<Gy6=VtA=3)j)hE5eCWa2u!gYjp`85SI=)9TF)ml
z4b8a>B~<<F1?h0SWWPC(bP`i`<wfVGa|2D}xtlQz$I(sN*~Fn1HCS0eOO4phbOuAJ
z>$tjv8ZOgX{T_WpB^kN7?a9NGxHa>;t@ZNBbV7w9N&tyyZO7s6BRK0V4p)kuz>;k0
z0$gUb-zmoh!PW2)waB5DXz9t>JFfLt<hSi{%AzXCm3V-(BeO~g_FxI<Hz*1A;b0+l
zS|UGP#P#G$gmu8CuVR!G6i7}G&Y?&8KpOgD%Nttk$7VMqitT2;UviCGkKS+?pUFX$
zUXP5|VYe6x?*Iju3m^VjZhQKcgmoDq?_rLn{O|y&SNH@az0ce&O~1C}BW@FSGu;+!
zAozDyN(`sHg@ZTM0;;d^IXx$G$tW|`vI&-9{(Xf-uQdw3hQ^NMKe+|nO*@a=Bhr{k
z`sVVd<ziC8WTP^}2FZI9;to%Pj>0ab*-_vTMI?&+*Md`wS(LoQym2U#L1WNkRN?y*
z2a2@?`K@GLVGhuGTUO8v+houi`YQY<rVO#Qx(HU*wh9u81wgy>*;>s9R8Q!%LW)dv
zq9|+7VT)h3rQFYFc5n~qw#Azi87u8P1P%Hld6l;cPN5T1_^2P-HNwW!C>iPmJ`da?
z*`+^`O4fO)iB)f-sWW~`zZFte9p|z`YvqIfYJlWv4jjWp0Zxz5>s4h|ifD8lZo=B%
zaKI%%B{0O!AGj+fl)Cs#InvbREScy+Es1K<MMbhV0l5*~)cLY8w)iv71c4AjL&s9#
zM&)J^rYgCiw$GFI{C|{+`&s7|54--b&Qm{1dk0U<x<5*<1x$!Nbw=MtZ&_gH<gPu~
zcgx(=Y?43;EMPa*bOX5CAzZ8N;90sig=QZuVJ}~y9pIh&PolxvyBzZ-rWb`o1<2Qg
z3!=@fDQ0AVGvNn^yY3*T%s-G8kga?6Ko8u_G64|7<s5V-X@vD1*irLg;`(nHVEBc<
ztZ4DLnx0>MFoY)CD>&n!X`jVgMDNg`L-3@Z!D$cGX*cCyO1P@E*H;D-Ym!JLFd;M1
zHN@(*1@%ACwF$aDSR~&ZY>NvhPuZvW^?Qva39I9W>KcbCAs3&xyy{{mcUM&Soe18%
z=$O%}+x+GS1;&xPmSAG(A@fJRViEa<6MigGX;*w%QUbGZ;^#cy77r5klmPX{Q9gB~
zymrRaAUyEk78gz(nXihuviMh0XP@PD1^EePkIit(IOzS>r&rWvAV!SBwy6a1s^Z0{
z*~Bbaj#kE~v<E;{h0I_!<=Ok&F6wY0Uq7X>wUa-Gi)@qYu9^I#E6#ODqpXl$uavLR
z7Qv}h32a{@nvACGAV9xnO0Dh|^g{H&L##P78?>h5YgbS(W0B38qF7b!94DZAbEhy_
z(7`nn*69b?c4-jM>Jz-(=a>{;=yQ=wP<!Hi$hw)gi|p7`BVOS@TRSU4Au5_jZ??hk
zLE!R1Jl+_#>-Fc$m}DAbj+u(?Asl1Dg7N(!aL1~AO!gscCYTEKyv_D0y{uWfV(exq
zeE;^Zl?rY=Oz`O^k!~CGf2dT%fk1n416yP3e^x3<sw<kPYH07SvZ%e3#KaKDp7L<w
zaP|0>_4RwC3WVtL5#}ofwM2OdY3ylNllQe%Q&zTTB0_X;&tJSFdBs<J5s|Lb^y$1b
z>K-`XttvY1M{|5X?jijcUt@cyq>Cm)utaPvQ)P&P1!0=(+rBxaE>y<~qRe22Q{~%>
z*>s-%Ax>tdEwcYUBeAM7;TgWF#;RwbF0s`-?d_-1;8FaSM5J^6GAh^(9EFW`@Ols&
zl$PrWRwL0w3eI^zD@Ol4iRFk6$BLC>a9?|-`T{Gv;J$4%Rj<(!%-g9@Ye;3Jl7ubN
z(sur#tS(row!k&Zhb^DMo{s5Z(am(%x_9X>-Bb3SwYJ?J97_$k_Cj*75Mn@_M>^>Y
zgS5sSo!St{-;Bndt`f?2O%W4y`ikzOfd3=&#AY|L)F9cUQaX}o@<?9tuD7pc0twUR
zm)qePy<)h@GCB#&t|qWTa&G)A)Je&44eIpArt#n0mcsfTOA}3N*D>m8hPDDt%==Fw
z013JI(n=+x!f!THbmzk*D_5&^UM;7x8VwX+MimO_wH687F(Lck0dm-6tOb8^`X8Cf
zukm^rV1;RmrYJ|o0GXDXGpg8txu^zx?<~$TRO@t{$K%;k3u=u1KX$5eEa}=a`sV5+
zRzvXIO5=e#Jj=kp^wfNu&kmY{P_>-&TebYI8Q=1H`z+we@K8>$S%HZTnuIT1oMb;9
zZPyfHY4KvNgnw1!fh89`jMd71Pu7XYhfOO>lJ2G112z{QyTQnb!Na*;|K_xS0&@2{
z;W1n)4!V|p*(eK?#b=J8UFG%LUN*9r{z&sy?QXO%WOxc@z)@K#D>$~O30u)H0Sh!t
zl}qO7HCAiY97qw{Pcwk5{kxv?m)o3g(;G5J$e)CKf?qx^p>ii=?!tmC_1JnCV;at@
zhq80#b@i@X<cT?!<-@PVHa+vbX$Ty_!Sdk}!T5bASsZh&6v!^P)W|ma6;e2=_2Rtx
zd$gG*U~U#kEKjz>lasD)aV>ZZdJXH;&D7a2v=<MN0X8}5MNk01-f0WTGVZ=wzn0$j
z;-!!k@Ejpfd_;n`Nk3S$$;8_Ze#L}=oJk}TIQq3+tn`9%vL7<{DTKYv>J=8W`z<Ae
z!J4S{M<(8qAP_a{Nu5(wjQg1erK+|n7rMPWlB!1@n)4!mL<#7VJdw5Oz5A;hW%r0(
z?8tqX3A0}w$~-fkzEgF=AeQx46u|#9K)LLu9%;)mlm<W(VxUd98`|pTqEzfu1&RuP
zvLRJ#v^O`vDFN)y#Ko8Z40#CT2K9ET|Gbhb!fNaj>PEGLyaOM{+2j%VVY?8BA5%l=
zuNu75oI3@x%9=yv1b6FZ6>{J(!pJ0}@<uHp@t>c(FOko-h0~$x!l<RAtVLbx!X_2>
zkhb_PWEA%aIS;px8t_F1n;Zf;fcRXRVhd2d&bT9k^zEWe{JiUc-iskGL!3di=^DD*
z-3B0cR`E_>lCj)11u5%P*8Fssxm<1ZIzgV{O-|ReCLRSq;vy%Cn@_`UqU8mwBbCrD
z-mfV2ugtLN6&B3y`Zn8`4VnZ7W6X>CAE9$)WPB8Bd>+~{l|q@tC}x77p)mV~nR+Ny
zjn*<+F$PonsCLYqsF`=p2o~`nc(393sG5SE$a3Tq&JLKB?>sV}Tb}RW{~9M7M8{)%
zKjS0->dP0#e_zp&wy-rZaFjN1w{r$6*_i^ROxz9a3>=MxO@Jmw|IK}oq#`AU^BFqn
zeIgl!pb$}^V$);MjKE~|n85`T(#3Ey*~6d{3*oU&BX~;EY6iYBuQ@NNB&%S=fndUH
zXjs5iELBPrF;p;;O3z!53!eZgU0g1N^b!OS90%D>U7iy!pX2j+qw`CVhs%RJz;?j3
zqx@O<H;_0XJagek!56z=d!oPygZ3a}%$ZbZ1Jzz_%#>Kg;Sr+IkXVE*Nhq}>V$_}n
zq{@)oEm0^9cvx&(m`8N_ap?Mj3+xP0kg<A@@Vv8h*$<-0%=(IOEA?}b!g4HFlna%w
zM0ya2hENfVXjsa0oeqXs#W6ZjRc5+u8nt|aG6g)k!0Fxtq+L&^@nbm5VvzO5Ni@wR
zAfeEtRSAs3(4u#^EJ}F1QQM*=EPtDz8MS0~66D8cad0FqwOqeD7j>s{M2lHQR`S~9
zBx*5bFHN?P=+k7b`d#!G{xe7?u%0jB*v{)Z9qe_etk_@AOeb-qoSV0l%J`ojw2~k#
zmJVRk&V#J$D`=*Rt=a2wLsj19R`0Hd3%8(f?>1TZ8)==uD&`WLTkYr9?HwKGmERFx
z>&o&<jX8DuK+zaTb5m7+B}5?5ID%%t;>^f(%rZJg%kerBMbzUJdgByk!lzRXeUzu1
zkI>KBgURshj5K=b@S19RER7|f%p2yXZl-43Av`Cg)8^XRReJI8AXMihM3<C9ctPWy
zSxQQQIp~^7;3I|3DkH_K#>l|k8tDV3Xo(?vnU!$z2<CxAcs-@upFLA7GjTJYN7%Ab
zv7BjH)tPUu-!$ug388Y5&cE-87ns}eI0qhnOi6+9$UTS5F^D%IFigI@x~PrKD3}dX
zW`qHQ^Qc+DA&f!}?y61A6@&zSUxdZUDA|&sOUTaMX)9&r7tu;_4#g{!h$F;^Hr4Hi
zSf(465FvP<_@|+H(}}Y-HJ0Fq!X+$8$Uh?mxZ`}t;crNObU3w3L(P!^EcO_jQtTo$
zOz(*&nic%D5Q9d#*~c+Zq2eDvh}Mph@aDUNLs#=}EIzdZkd~QByAIs~IHXYu9{fvH
z>&K6m^untTQ1Ic8Xje2Sp%G$G1D;8XMSWWrzZGtRT<4H1a1Ew0!I*Iir_ixaf7jTi
za|!f)L1u*8p&hp`xXc!?9RIRz`8^LPR)GR+=+?^G8x|uiYCA4nG@TSU=ZSu}Jtv->
zUqoLQQo6vuW%NZnLi@xm+SwZ~VSJ##dzufOZ&4;ysF?Km{<d5hd_qV(Q!&w#$)kTl
zYc)jv5MoB1stNgvV5<Z;^bGas9|Uvw*)=Rp`iB&GPNK=ho_<?RtZ7OD{q-wj|8lf<
zP$k~2>I1Kkr?cF{eQOIw%%ci)s>Oyt@ItDTe&&=MDD9)mg><T)U=PaF{%c)x7zf&q
z7`pr`<e!h23l0Qqm(aDemtc)yi(8&|9LY5iu9rM|Z8_BediIcASJ2N{6N3cxpi(9g
zng`@=no(bV6VEQ$m@8`M9<7f3xe{1DPr%Joo?b`zQwiS9s}J5qTu4|>VZZCtBgVf*
zvtFcZ<+)E8q|ndB1LA*=X0j$gS35_me_KFM(@;YD3}5LL8M(-K{0c}AO>n>1>6cbR
zzky+4`Ty{nqFo-<&UGmCJUtf(U0R#$v(}Wb(7jGxASE+WQA`?E!oQZfrcva0aG3yu
z+w5JvTfKPs+>u=k_I-bOllvlexft?>S=G<m=g!ofA+at^g?YaPww~+|H^J~!>@L>b
z#!KlIQ`N2)G15#dbd&pa2d2<HM?Q9!=VpuA6m67x5->{DTu4|zSn)?*f1dc)39ov!
zH?t$Vaq`Z@%@jNq>`!zPFTz~vwF_GDMI5QrBYV?%=EcZlXe%rp?tK|zXtA7yto{U)
zUErv6<^mkFr(t?ry)+M&Y#Q{~lne>(4Mcs_*pG<OvN0TpI?_{3Xx_fjR9mi3Zkg+H
z)0{b6nE+teE-93#;K}plYiJS++*)d!yptpwut-gi^brg}cwu3RMP&8OG+x3y^auiH
zsIVxFC0C}%ynmuaNh!VHrlm=JZ}hk^@IEP(WVFRVb3yX8O#1SXx^?S^m9A7=hQf0J
z+3eU4ii^a+weCuI@B55_RFm-&3Dc}O8+szDTn@~Pnf(TPNhZ@Che1#(lw4w@*>FQu
zO>A`q6sx|QI(#9rD>H@F!$drt-VyaLe7aEPGkd*x@xoO7@|u1P>}v4AY4b_-0mUB&
zS=5*HkZhOQ%?Z?jCFyRoAs~XtaGE+iCLu<I>o5je(~9pnvrl)-6|G@Hs{nu)V<`wS
zM7dPjveiMpUkYltxnx_&i<GEZL$~ZuP+SD=fC?EtMYw<PQCI{s#Kfy~o5_pbVDNbH
z&g3q!IsRT{TJ}4+sRp61$yY#=y;cDB<Qe~Tn<c>2UTuH}AjK|J()*zPzK@XH@5Df=
zuM5v!aEO~qO&|ML%y%VyCXpG}7wAa*gA+3pF;Y(C1+tj@X}j;wQ_a-XUpHo#tLt6y
z&k{XK<k_%ZYr>V}COzA6#K@Vf8FVcGKq<sx0$Y++bW*QX8t?`nUIs-nsBrhGQFjh-
z05&$Y07X+}+g#l7lZ^^B5{sIVPlva-Qt}{RrDsmRQC0>o-glWfY`uKcBlfwPY(fmg
z#InvsOX$Q~nf7Ux6)e_60or7*=F_Jre1DV=ZMwu~)8uw*mpC93x9AT9e?~ePNXvTZ
zU@YJWPlmZp90(}yAnh793%P(DFJgoxS{e$MQ}DMf`EFhFeGF@O(TWcit8I75TEi};
zHYdIaQ>4`U+4ipsYn(o7?mzJ2v~{p@C;8$(mf01^zaKy>#5{!C33c>O?{m}m;Vo{C
zQFDaKKJTAHF6BW0UJG)&ps62Wi9I}ggyj(950AbgzacZK9j+?i=G~j5zlBOFEBMmh
z;wlz9VgcGq;O=PisAoGOkL3@sO5a#G{`v}Nh*q?%CI7lm`}z#i@VPi?lj?UrZO+$-
zWI!_2fTR#x>=AlQsnIE^N|b_7wdKqo8U4x7D@tJ>kMwki)*>%arks~O3C#$(-11w~
zR|nzv=dp$M2V0^%07G_14<`LJ;DGrUIv3hbpMp3*&sl-nC(LEs4GtsJzs~hFn9le2
z*0z)No!v<Hh76xC2@41F-lR5gg<^C9d9m7W{T!d6d0rsV`#XK^N56Pul@tm^e3*>*
zxZxj?r-ioJ0+e_>_xNNmi4~<&nwrJ5rbU(NM=T*56~3e<OS+n4TC+*jfee?wv%0yu
zz4+2f`tfe4aGa(Nh)!f!waS<FLpQN85FKzDJxEzQSjYvi_8sGs2ph2Rm>;$v=Q_}e
zOhT!d`9$sx)$wECcZl#(7X>W;_fi#orB3!lE?Be$5$f^`GDbvnH1MMy#E8_Hhh-yQ
zLP_L9vd7^f_VFQ_HD#L)C5++R1RqcONy&cH`ec~p9tv)EHFHN2=ZNK%&5fh1W+|(O
zl4yK+RX*COIjzY#8tTv!?C#<st5j>Z)AW`~ik=ru#agvlhq!UN6fxn4)OXm&Y{~tQ
zct;ER#F13?tND+AO$s;f#m7XSgl>qRuetw&(CxpIf{cN!f!Y6~iKL`sha!N+qZAut
z(vWD$SKgppbFI)ub`;T_N?8I8ZIf>J%&SxQL(=T;Ioip@&np^U%$zrc0WR1@^&o4P
z{qZc%iH=XU_fJus&TqxJ$^O6KF)Yxg7lBt_5b@A-%6H;^(Lu&wDHc-XZPWL9&`ch@
z|1L^8y!Q8{9Oc66<k<{&6;UtxW2Pu^lbI`@j-|nCAkGRD`!U*-j}n4$P(<uCCik*C
z)CBzVLcyKr!s9}20}H2rnJyVtJ$0Z!`nQg;Ouj}`#-yGT-9J_+V2P%o`8ZJ1<&~d?
zB=HKzrIY#2mo@zg?cw-)9%1lY$rI26%M(+z(15Yo#v2)8JE=ZI^R;ayi_PnASe!TD
z)|pi0fj>3-oSo90GH;vc+kz0fN^m*03F};%OZC|nv<qf3g^7i0PhiyLX7BpCbRi~d
zmFwHj*>=>+zmZR{So5a(lSjk`*r=tAl@@-8`M%7$?NE`pk~h4jYznnI(;plpJis81
zZDGv~NrR8+Kw-s(*;?x-@5)x6mB2pLj@J+uyeBoRWM};E#Kh1SDDZM-R&^{v!j=GV
z4{8e!7TT1$6oGl%Hx0M^kqqOrsb!B<$vaf_J=lHTKE@_<X$3eW{cKT&MxEVi^C^2A
z*8wOS(!+1))CAp)H(?Xv?|-7I#C5*5ID|1to)72;DfD2DYD%d`!_w-5m!W0-S!4Hv
ze=wJwp6QJ7iWHuXcDls**C!0jHNqkm=F1l@z<*F~`qwAyzX=1?p}lZb@ZQOnj44(u
z(&>4`5wQ=G%GU6|5>W+>nM$Ob+isgCFpESbtPw4_Ftv@2vqDo76NeL16N`87Pf`Cy
zmsH9Rce5u5AO?I#yW;PIMdY5k7?X9OAd`{sali1sc-wf{_;?^k>~uNM`NArB!*keo
zz`YoJQpVmY5XsB11B<^J%Fud6#@Hgqtmm>rgYRbF5t$+ETZhx+CLdJ=JzS->_4Cwq
zM-{O>V4HP{0BP*(XXW)KAvurzPArZq)UX{?p{qyr_YjdA8He|#J`UHGD;q4=k;iCA
zik&umFT@Ru`iH;G3%_3MyS^ZX?h9ZchT$Pb9Ep7o5i@z^A20&rqu&Yn=|j2$jm4LI
zm9NfAyhHIbJN~LZGH2LLbfE5McES}C7GKI$d!*i9Hvy<?si{{<<}Q~VHrsYe1Kaw~
ze;n-dx0Tnkt>53NNVgJ+@lRo&Aiuq<)1pPfyFBi^cborM-vF%88w>$K?~@$4(;z8+
z==Do_=a^%uvghimL1x8gdmIjkpC04N&UJD!2Q1Klx7<+QkjM?m;z(daNFdr?77udv
z^b+2Q0mkX!ZYIqn@>ShQRA2vYW40|Q+=i#aWrN7WRgJls1U<%yyqRu(tvj#B!9m|H
zUq>)$k$DmCeDABI*KaQNMVvMKv*Q>=YFLP!l>kOdq8&0tEhTW7)p<9igIRMYhuLWk
z5iByh@!&R2$Q_??dU0c*j#O$%B)<I25fMubS0bqZeZnH1f-^KlhzgH|v7$syWm>17
zOb3ODti1-_Je;N!Ykgqyavm0nD*BLnb;(g-)!N_Up}=$|BUWTKWm}0ODkmD1O1nc;
z)e%yQUH7fTN|Bp9p>$-mkm>YG8S>o17iAK%YM!H?Vu~ElBfVjx#SC2WQw;_zClQwW
z>H~{9D8mUeqkgdltBKWxKAa8dGEc2Gn@x8XsGvlOQHR|AtCFLv#DXo3l6op-z9Z+-
z5Zse|SF0UOVmrkk|K|lr9d;wQ7ni-Ctrx4=mBkxBX2Tj6lvqXyH8}Y)r;Rk}b6AJ^
zlcpyo#EY}`*;Y7-=%KsoqUlgnaUVt{=faWjE3td)-vZJC3x-gmkxGr<Q=c+%x^|ie
zu@js^uZ+G=ThbRHSEgm%l=iR^`5BCS9uV{(zwHYR3}RZWHlWzy&T}>AnE5MREk8LA
zi)Y+@6_^Z2zx)gSWUa{3z|Z(Dl)RQaM=)bg%)5`MrNCk{(yGxos;sTOFRWSzrYv`_
zDTphCbM2I%*Un!_j-pB5WZ4@Gk1}4I!}4sVl56et%bfM6T@&fF%jc`dPj`}BM%AI?
zz@xzmjCiU?O5Q?#F;M~RJecc6AzyM_@b0J-z$?D5zA#>qDdl3&8jPa8f)=aRytujv
zL)C%833$_;f2BDyW@yN>;FZ6C>VvtNd^dpuyi^Y@tA>a-(e6h=0N)M(+_!rV1)ad=
z_TGy+3(X7T;kd<%HG@%_PGccy4o-!=y+O8H?}`oFcd*R%Rj8ZqiUIs%z&F~|2S`ct
z$Uv`V58$OYc9ZG;Fz1dm(2gT5i6qY<5+_rZTkwZQWsZzgNLhflVNc5Qr*zEHB`nP-
z?LkwdF7k?(>P}J&3Xp@^X$FSxCsPB4=!Re_3rH1{b`8W=UZmLkiO1s5MA9SF043N}
zju-03uV{7l%uIb>6!P5-YrWXnh6}dJyQN($h73eymkJG{QHK;%;w<gK2cHxYMgTa2
z@Cip+xlx!J=po_A*lG>W`G-0r98*a)`}f!N;-QY~-{w73ZMFqrF;?BZo3gQH0D<<E
z0cRlS9c^eSvnwthceugJ+nU+pVMhk5{ZP|MIJhP@#aK5Q{0E;{`QF*HwBHG$p3Fva
z)VUf9lW>3z<~f%72z>ppV#NfBE*+;6(+TIeX%?j|BpThmgSjsM47YonvMtP!#41j-
zvzrhhyk9=#hHA>INK3RMX)17LDh`_IVNJi%sHAI%7beu{t)jC@*v<ml)5q~tSZz+i
zr1Zbq*trWjDf2-{diT;U7;0eX1=%olpqVx&n9?uYJRUAqS}c_`p^>!t6scb(D>m-t
zvDo#A88(F+3#-4X#2K+Dd0v}RpTU}$$Ivl#P?%<f#bBl}US(QZZT31`F<KKF$Woi7
z*wI;hD&K`S8LYR4k=El5st*2`&a@_1Q#3m}t(D_YIjy_sDdrsZb{dstXBrp`OeZNt
zA4(?p88L#-%Lm7_kn>aQk!ogWf_jrwIc&OHA*mQ&m7wuiQy3{IkUn~3ljPiGlMQtc
z*X^4_%r`sYXs%1sZCyxPqI0Lsna~%!N8mOdf*1Lf-?t{@3*aVQ-vP%ZR-c{2rs{SR
z=cPuUozrGr7$n}J+^Y*D0#X?Qw{Rx=Fs}q8Z<4yxW<}otmp#{2^|z`$v4hZWIX!%x
z;DkPpKdL=C85hTi;B#=T>x8w$2eojs2ZSiC5)nYJs#YK1)@2IgjX3lkW#Q{T2`fD#
zusKps$*zoR<XZiK0lbroK&Z+Aa=U&~>WknPLSqNpIRiHc1OwUpr7~$l+nqDYF2shY
z5CtCo`J2DZ5~D0~pu#TF9_*hGcuE3hZbyFo%*Qa;jx6wt(%-UW$yQ2Ikt!<xtfR|B
zKBE7&r>TZPZJt!T#d9m7JCER2GVR)79kp}D3r^|D+SK_G79{hU(Fd9jC%@R1$aKR?
z$5~MDk))6VH8x!TNQPStE{JMK3aLItN^WYkTC0@ER6bc}NVe2z0A#NDCL$Q^vdL2D
zgeE0|vK_7a+9-EKq;p)EOz3NX{~u%T99;>!WDlof+qP||W81cEJ2|m!r{j)ocI>2M
z+h!-fymRk-Gw;2#=9{(7S?m0Lo_hAKT~*JnaK+LXjj@y{h0#Uo8eQ0y_=d7&_|6fh
zMoitHr^F~s-LW>O+vC1B2QJ;Z5TdX7Mb-FQ;nx18SJua%?yC3HLZ6f+O@iiU2I?ww
z&y<x;(i-{DiIRPiGOduF%h0$DXr^qD4Sv5hFZm4S!?7SHb+q#p7YMca23oiKeIfLC
z;3u+u1f9thYfgVW^_mjYJd=L^3d&hx+L4s!a5D2KI_(S(-ZkW=HDph0(eqgfYbm7t
zIyJjOGJ7|RV=AlTIvcvG{;*=-TscxB%M5qh;uF0{{)pGEGUC+{PQoaFg!5<*7@P$V
zF6t+u(dv32m;vQBy|@lNjgyX<Gp#wazU*1*P1>|%miv@k(V|;=!rHAwL-@~OGp#l&
z<e2{LO>*c(9VKTZJh=6d_fCSl8=wq<iCX_bqTbU&ph~*t-8!9d#J1na+pAOuCE?ZY
zNLC-18C6k?6wBVeYSb!TzHfA`eL?yMufzSX<Z|ajO4gk#*wYQebdTN2FmG~MgISM8
z9c=s?#608Jd4@3@+Iwo&olDp)T(KLwoR2bZzpF!yr=8++E(q_|OfKG@>U2A{a427F
zX%6dr6Ce5ek3Aw2o>=7uSy<N^EP9<gyK~KNyuWemlARBXdxYzY#O<Q-PEDs!JU20$
zu2QcXza@y#V82N8jk7Tuzi_X$RHv3_I1&Sj6Yrq0TIZ1RQhr<KDUb3Z&Jyp<55ek~
z&w@CQBjgXb0`*0La2}~u;-{THT2VIx)|PI2r!}hhqY!GJoLsQ>_WqbJC(gaT2>d;r
zorOuf4fqmF&|j6be-}*lE|zAN#)dAI_I9L9|G7jqM#WYhMG(<1wL6<nj`le+9F?;c
z^`I)qUi5nuc??=KCbEFtRjk|2ZxVO)cU|n{vIv5h+oI@(Wo$&Dak3U39*(<-i3Vrq
z>!URUAW>TLd}AGPh6z0x1Lk1<^||<I186WjDjAwdTReBhqP{r?b>RdeJT?&vbhdSK
zpkT#>Ik+)=1Yr&n%$n7Y=BD}U673_NrAUGZIKw-M=Q-NcU*38WNOX+*w|I0vmaq~{
zw;ZwPRYG0VGuPNSJVvbXEx{|gC%atnAzkfglBgK~339cL(3uS5xwS2r<hQEyIlUOM
zrf<wnrY3YSmoE>{ctLP>9VL-cq!)u)fZ3Wy*m49oLk>)hP(l5>tiX$IRO-HuqP7W}
zTV1)PuK4DoFrg*=4#fd?*a@SlUe9|R%-(DO1UNqRBndCM(<e>L735jWauv+W5?q#E
z@lHgbC$DNQ3^;mS@lHnI5hcMBuN<_nT8Xiz&QkT_YN@q2tXi7V<RW^ED$<-eN4}Aq
z1%NxmR0331(ppcEca98OH;bg-7HJO6+`Y|wjKl!-_+I-54HM6;S&b;K6|&uH-b}-5
zq+z`mI)f0y{<IlZi&EZLPUdo@qj%+QnI3<!A02cV3Z&EZf>n4}t>s$Hu3@wE_MGH#
zx$AzupXaM%U%lp{B`d7gF<!6eoF1`d>XcLwMyWtB+T-jUQ*)b)b*4=~UaL?g(l~d`
zF7^T?=HLT+Q2t3mzOT<$8*p$2|2KZ(R)W_j)X5-!W9s2Lh6#MZn^BrR>MqBy17g^(
zCWBR?WY!QI$KQ^yd*q(vjL0PWj8fi-3d8Yamb9tbahscP*v?OLR^25ETG;O}e-B`a
zNvrW75Fnsfi2q5C{Vjn1p~rGmz3oxN5kGC;TYuvc1)^I4lLjc}IB!e9_##4+g0G?;
zDJBlX`AVGK88PTw&fRgBY!wm|>gOxr6%!N9jtHo(#i_U+p0iW+4Of$Wnwi_XnfW!a
zxc7X#3@8J!JQD|#cqHv0510a4FgMLS!ge-j_4?3Y)Ej<n^8u`3m$B?L(#MTJ@2Zk9
z?U>i=9oG8a(D@N-n@jSZCP)GsOc~Z)TCffCPo2h7v{!XcsGW0X*H(S_XdD7AI8+;`
z&ZM>-UIN!sYZ!vtJFJND7Dh=2$i;B-VBv4tSDDFS$LcG50u?u*go>`L<+1U=f%iUR
zI~$LP+HfLRlDqX&HU~m8zpt{ou=ppStGnh;vIW}1`0~Pjw-$&BbbB3KH|K4lkEab~
ztC7@%uqtoTRGrPNdUeDSCT^uCne=jJ8D#|{G++P?jFjrOVMn{jKF8w}5C)SLp`*4c
z>?J~B>yb<2-J0{06$Sn=&Riy1P@_oHyw0UBdRUt3r!nm=d+g)JW+R&0Ud<I%*LBIj
zNJs2IbNyZ`*@&KE8Nvnw!_Gg5hl9dtxknkh;sM8nGlDgYC3hXH+?g3-TtLfslPL1r
zX?7Sn)wYV!C!}Mr3*q4%Hczvu4iFh5Uu(FB&tBH`nqA<x-c@mM3UYwe9=lQ9QB8QP
zBVO|ZBQSaY9qbbI!<?e4RyX#cEWS6QUtsw-G*B_nQJR(@<JsVAP4(^;33ms_4<%u-
z%G2>wXkIoRw(ktENtI1glmx}5l5>JR%JDusn}qn}ZxiHAG)FvQx$0$k7TAkE?=`j8
zSWPQV3b##9wN+Un2_4H<qo(?N++S}HkT=qD#{`b732!YKl;#i@Z-nHXnWforcGS`N
zF&sXP(Y;IaN1&{ZN$&kHJkXYoDdW(;CzjHrj&wM6(pXLyc~(@)*TxdP%I~szatT+u
z&V@<J@eHwtuxt#+J9o!~BuO_XxHy%wE6LGsh^>xl+G<Q0!}?=*b4jO@GxRF&LtS|A
z#W+(2Y$+={v@>-JQpbAjK{4Y@Jz;u9+q6kU4Z_2#cqFU`>QW_oF{&xcGu8_xz+V_N
zDy{cn4(yECt+O~zO;aAmsYK<4?@T8TFtkQ*Ie_)-aest6bFW6MO^yzep*rT)OKl6C
zj}M6^O1?IC2QC};NLDx;rS;L)jm|(c+`VDu8S&-3{L2MK(+#f<`9Cob^Z(93v|kJ)
z^8Yc=Pw@_i^91j{trEeA%x92y2C+XN!z<QskOc>cYdJYto@R$DZ7&~3;~f9SK{Nlw
zL9%!)|G`1pe{m4IsKFNp8U6<c-Hg*C08<!zanR-$2i+IXZ+~$RM&uU<DR|6f(<M9w
z#S`n8{5s&#lB;GR9oO41<WxtS(~M}gj{O8I>&(Hb@MU$Jtz(?7tC6ef!II<{OcIym
zd)A*rdq)`(>mSr#dKcQQ<ig@%X^jVU=oJY;_y@1al@}sQE*sMgSg3mg7CK66vtX<G
z^M86K*z-(>O4WWk(6eOuq$%4@7hiY<#>b?|{k}g1KV-DurhSEjHP9Q-1$jz7<i|&B
z`%D>j4|y1i!4~Rv3;G4e#>-k8AU@_i+iOf~>0z`@H73p%m)IY#dZIy}24~&WeDa$p
zc(Fvqxk=Pm74&}Praav^vjE-@3)zp<a*`%eyj`Tox-!Z@8`NcJMfWoE77-JS`(^1w
zY9h8X!<q<zq+j+E#Y;_}QASOEPxLtS{e*T;?Nqr<`L3PK&R+GjA`PKTAIA3-Gzgcs
z4ttj<+-6OYcfu7)hZ~-+DHeBuL0*7fgT0bF1|W#g1;Q!63PU<Mt7&=Pe=lC!&+oN4
z!j54nn*?_al4ikXq&Z@$6Nn8K+`1};$jXP@7$@&97KFJ9vL^i1y0aG`%vldxn#+Fq
znq_hMTFaIs^xlu@H$vn@m+l5h2DhVy>xMhfDwhitJqXDaJ(o+G%w!^o9d)o&)Z!jI
zyl$g4*@7x19qj+@?=18X<y{x}e+=S(Zgl^*G%DH2fNBitZ$bR`G)kaX-(&&P{3jb>
zNUF4*yPMr%Muz#(;aeWV7SMzN7YLp)x0m6g5iSbW{SE*i1fE2BDq$#PX?NNhY6+JL
zSi?5MoKqAIIgAGIz#1@8E42%*>=_;dU<Xv!wwm3ryIszFMzn57>WFOcq4YBw$Zquz
zl|-Uo+l0i&M_mCXEABb~XH}w&ltZ^kxXtTK@yx&qduRI`2%(&{vEs2P!(tSh?4ZN(
zdWv&8z>QFfG{tqO@k)2J4wmM4khfo#P?$mRn%!R^%u|<Y*jULYe5xz_8xCB}aAx`4
z%%J0+Aw2(|A^cJh|Bz<4aE<phL&xEO{s$bK@#juWptqDW0Ydotr_>%#zt;iV*;fb;
zlww$VSQvbZOFk+L9MPD&9_&?4j`PAN3ni+YtK+3VTe7m9Zz2J&lrBHCiW;tfJZZpD
zU>ac+#_MM$4Js{e%BRFXL5``JMA~VFJc(@RSZ6sPVuW_Nt)5Rw$Ma-aCdOxj;`k$f
ztm)gwsK^(CQGfySqaj+mT>e0A@@%oSOVv?@fk2@L9c%##l*_}2ZBY1kqpkW4<1(4U
z3FrMjx06B-@1ItKm8w%#Y;eAN_-$TGhIm$S^OD&pWrDuQw_{I&HJxHMS@vE8ox;U%
zQ@k`sFe_BpT`L^HnR|&De)b0}C?g958-&rH5?y}+T&xJRq@52@m?36->&E4wZ(uy%
zV}<v%7%vc|u=|@h&oKdxIlL&C5lBv$C47>Uo+grGBTi?tYaN2dcI?%M+R!B>eLa7V
zU<j4^ivODsU?yexXJz|8g+R0WBWK+<4YAU8uTpXn$5vzjx-2#gCKIXO`X=5*f1UUx
zn132Lnbj`BwK$gf+JEQ(cOIUWFCD=0MGMn$`aouNsiA?6AYHXyOo5}cuMYC!L{U_z
za3+k^tWR*fz0vU6Bf@wMuv+Vg32c?dx!+*TM5P#L-*_WC!wp+cLA@XSNaFQ!uGY>3
zX`4d_jFBX)Yebf$g(5vNi1d#=oUEdVbm4X4cBE7#?D<wIJ$E4V?j%_h;BYVPZxqUW
zwKLQlnW9~SnhvQz`QlCWIXhrcLaEd2Fd>)SfU&%po0mbKg1ti7ci7!Kl|;b`+ho5m
zc=--CLmqC2^-Br#{f14PxzU3`Gx!|UFmrqU_G4X7as+{x=*+&W6{(dRz1Cuv`BfIy
zKyicwB`)O<Di^u!vt;-w^v{(1sZjS*;b5FAFH2p>(U{Z9AheomC*uwB!F=iuNyA^|
z4mNq??Olp%H`(cZmx&ckvxRlk#IF~j$rD(U3J@)@<%|jUbd+Bh>`_$TM!brGl)~xW
z>noiLL?V8qo+D-Cx<9!Z?U{{O^C*A3;xWLe*%glV6~7ofD>fzkXgq8`_4lUihE%(J
zWd4}pDp4TrZ?~-=A}H>1=I$C6MD5LK9+%VY7u4|T>eTAUxnjcw<9k6kq%<x|Xytd!
zVGf=AG#Dbe_p!@ulhcPgUHah=Y@$3G;)c?aFV;tB*MbBp8;4rGH@}rY41n*0Pxy$K
z7-5)cBsr#=EV2KEFZ@J>k{US78qL&oLcA4Z*`Y9pc*(jEYmDhW${d<NE`(pySPEqd
z%au5s>2$`lS}AF4C#QTz7d&^mt^fA`j^-hjc>WRsDPPlVME^Dq^52EPKLI#J)z(>A
z712*F>Hh0r8x<mv;)%b_tw~uZ_)rDe0+kmt%&lsiu8mGgI<2mGpG`{kVf7p%+$6mN
znaiXnVEG034<O~tPQOk%PIvXGNzbLr<ZkeFm``8kZX^+WzV1K;P}vM8^lM|6vgs^d
zHv_D(Ypgve0x_733G=?=a<Hy1I7kn4fZI{T4`!opvN%u#?kG@Vrpp_UqN20XT4^wU
zJ)-UaPsNJHyDYYS2-vaddu*;>W1B`(?anz^WA0c$H?tvgFMc)3+=*}ALVn=>2@N0#
zh3g(@fOoH4F+GrOks^1rEi88W)w|$h+FX!)w1gE~BVa!e&+f!WMl*LP<wZXb;SbSJ
zD=vwXC^)n3D7C(sO~Z0unOXIN0m)glT}jv2BmHEzAWY_Iq|N_;Yt)6uCGX~$TA1}J
zrCcryW)2M|raJLj-D4C=>P!((xt^wF#~|jK3!C3R)mC$T2mf;!tUCMD$AMcME$SJr
z!iuygE;>1fTKC;XnA>!RC7a5j<=neoCgu0k6lcFW2dR6fRlBXw8_KxeK+6zac@gI3
z*+-#V6msjyYOMN?#>3DGPg4*Ya{k_mh&zca&Io04y?#p+W9+GIQxx;2-E4FQgR$=k
zJNMrLEyfXKt9EiDT;T|IzDxq7Pfw`2j!;nY3S9zBr$T)5XH8K|lVu=PWK<Lj<SvZl
zs=K^TqDtTlY1)5plytx?!!fWg&cbXYU$mi}*fXt<-p{3WRUPwlZWgS<Qm}kBg633*
zRMvaS5|kMj7t$}hH&7UO*~`3OKcx*F!R@RXd3A<$V-u>=>?kuy*yPTOQP4_qJO9K$
zFxCan(b6B`k;zRf<FITLeMZHKU#O3=+e~;g6I`Ma<%5zN(Ro}Xi8hV}?di8o_=x+N
zn@CXDiY_AjvJN!>Ev%c*>n2>nG5H9lu9AR~5vw<<-KckWiSygw*T=NM*V4c+Jk}<v
zSCB$P16a5dOYrcy?+`9kvX)gKQb~9-&KD1NT4Dr$=m~}Oh9k7eJOhr4*=9i-$g_?c
z^el;uN(yB~s#U5Y(o;_D3%8`OWHFaWV0|z=>LA}nVXjfgAtwX!itW)~Ejva0%XhHk
zkznNhyfW=tFFhT5hlm&krAxqsMP^1c8=zB2;L;|ddf&o{Jvh-OdPnbL=Xkb;7AT<o
zX|9e+w9`0?ZFFE=7|J~{D#n>@H>Qh5r_kc8*$LgX+gE3lcxDm(gF12zvv{puF=dbX
z=c+YUzyZhKD2FLoli-pCMZaFqXDCsyw8)VCLPqwSFif3l8B!1CUBB;4q{surewWyh
zt3nxihay%}hg_!lV22&ga(-F?<SOnH?(eW60z!{?`3(rD^$R*k{#V#w`A_)~s;v7}
z07K<VOQqLtR^k_VsTW1371hM?oqwLQ5>g5j8F+KyX%tS)FmoUOWDZP!-u{dCu537@
zj4U`-GMsy+*15c&mahl|zBMAYrjNK`k)5|X+)RkVxk7Zn=ki=bmAI54_Z(~o00p@h
zHbt)`NFZk*y0sUy!HWqO9ej@tQckLnMvGLzy6Ev7S-eV7JAn}DVq&|y4pOkm>L#Ui
zO-cQ+ca|I76R9_tn^FTM>Oy2>da<tA=!;}EZ}A7crPjbj`&dB?v}YErod9PMLFj9%
z>wJEZhzU4_&0rdFvL;E1-y!Mwlnh03Pr4)SnEV)flh5b-9*rZ(Ge3bVW`@W~pLqtn
z?A8DbD=%&DokHC)qAY|szTPex4EF<fNCg=jaREf1=9LtnJlMGZ49oY`ybWA8#X)CS
z=Dx?;dTb>`h<B-zy-H{i2kGTi4;Vw>ok*i31|m2_ido66jJxf0&0iIxNYMd5OOQ6n
z1lhD=HM*m43Pg8T(e?Xc#bU;hPwW;new};7tafwtk9FR55VjuUOYKzUgGIHV$J&YC
z4Vb1?254^2%h#Od$NR8)cjzurz#9e6aYZ)9jd7yfzdV*G+PLCG&pi5Nz<4LE*lS0<
z6a0JVXqi{{!=px7@~+??YxSKzf&LyYpwK_vtG*KbqOW@C|IRZ1Op;RmnIy&Pc{k%K
zA<hI@1X3S(a3OB>VN_)rP$ODP?5{cTt&)xCb*&Nm-T6P$$gEnh-atHmRZMN6RBeXH
zb24&rJReswR^D#z&fI~dJ&?s2YG|0MMbsj&$f`hPCa}|`dwYF=VQTk&8O-)32I7FH
zvXLTWq#<?hd#@WNz6lLzY~CQ8ORZqoMW~*~G*6<z0i+!E69DB~dm5o@+SNmuBrim1
zS5*8pyJTs(m4=Kx)9@J=Op5g|%-e+`-@2%`d*OuD3ggph?-&~-hN&@h_!q8;)<UN<
zT0X`uS##!dGi>3!rWlZ0K6o)M#U2cn;q)3d4nuvyJlANqtu~xazZxs~eL5KZa8CFz
z!fCvFIV)zV<;V&7QU`G+iwO}y`f#{UT<YN<7X>hp#0j3{xYGy`yVB~Ze+mP$$nAET
zBMk4eIDd*DgOGze_6^1(lSrUM(Bm>oQy<3$c935hE)IeyfDE^r%mC%6*f_gyeNC|(
z3_es)i!@M|$5LXyYE+VdjRFIwPvthToX`&lvZ)dk$)JMdVOWAvKdNn~0cSS-$oBM$
z@Ip)d;|`8L&&Mtr3pMg^%bQH!Bs(x-^TD}%1IAU7qx>q-+%TG=so=1srYm)MytTpw
zwpd&%7iAE~Wp_Azr*3welQG|TABt8peD+M8))9)MF<<-KgUYJ&M;v<YK7+|};SEui
zd~xAhvE?;(rrFPeFfA{Qi=wa(l2!@Lv|nC=XP76AY}#RFlZ&&)lgmhTN?v&FDUnM^
zP5dN}<p~+YSixSpmeGmTQ>8l5JJ1VB9a3&6?kG3In<1(sgV^7eAZq|+HU7aj0K#cs
z!Oqx0C<h_MdGeDCleJz7t!<=wm3`7uiL-m6E`VdbnB@<Q$-LRQryEF`x@U&Jhx#m*
zaQ*2QGPeEyA|vbngpBBvWt95O#}y@%)+n2--Hn;?3qiBj{2O@9|AvgoF-EW#<UG!o
z%Nac8S0C>We;@+bfidoW*AxcfVbJ4ulojn5Ecc;6@E0T^s2;Z9@lphA<5|+p%MsVh
zn1$r%S<nZ~&RAeYDb8@TaVr=6N}2uG!Kv}9Y#iG{!k#S8@ct3vG$N8%JEyGmID!F^
z;fE9)!e`Bg61lHZJhmFzVDm=2@MHGX*3Pi+ICiE$2GXyA!X+6S4Xj|cZNYO!m6+)U
z3FjmO@}M|Diq#R>&Ab$)B5#rt?f}9xORLNGqpz(M)hF+XTSlhT<z4Ym7{${gurv(J
z13#5^Rd~FwJ1os(C`hggzQ9Z}Smc<K6F+;L(cR&@2Var=XX{M<59ZkM<cJS<TUo9w
z1*wtD<x<r$H!5WPEvfC@4gt{0Mo07bT3#vH>@nIi^m_Zx1l?${zEJ_i!;0xvT5R4~
zv|LpPl}gP5&zYlV-F{|obxgc^TfW7m54N%gIA?tdE;c<|va&eU;oPAzBe*AnAD{gA
zsIVJBeb%~xH425+$)8Rtw$XC65_#mjXB=%{f1%<p88Y6?1sj8;C+1IoZ4HygQ6vnG
zX`ebCk4SU0Cyu{|O1AVlqSRNIw0=G2{@+oN^&iqPMRm&=MHThKF3C)?JyhYlt+ZuI
zbTL)DnxH6RU$W3xb4;-s%(FvB8)=&4)$m4^(&l?wHj$y2na_Qnz}QZ<2~*%|WX7nw
zU!M2WinrV6>)Vq65be$pt6b5q+F!MU*H{BbSlNAO5b7)r*P_^I*JRH6OghHTnLFGA
zZ~%MU^$Ef#d(GA%hqXR;cq#Z)uzK(M43@w}`9_9n_~_ooBZ!V6H4?@OdhMYHqCMAd
zVIV#o3=SW*0xNSvQnc%j)tmE=TrWRXwyf4vfKfJ;+bE)BEl-Ck;F`*l1~7TfD<~6P
zog`NPu})Eg>oa0&S-?Gqab-tcvY%QTeNOOJhb^FqCHZ1aIoFMfXBQiIXm(>ce!_ta
zS=!7Cv?F7rErdYdT5O`BrDd^1BUxF()U!H-k|aWGvHgjs#my=NdF~e@52Go<bQzo@
zR3`BDID*5abd;Ns7I4=c>w-Gyr*=p%2$*Gz#)ep@+S3iwhdO(cS(_MV*fJ$5HK2mM
zB)%Sy*JCZL?Bzx=tLd(X9T~x$(X(SxKW`3!EUE4&Qi!uAYVY!9(fjqv(>K3NoRF-a
zK*O7L*WIbSq#klB@LAx@=bh~rXo3!FJ5s392unE-eRfYj+H88WAPF$4VQJGcZM5*+
z-7IO75c^+Uf16{O5F1nbC_nJL;@=<7KEc#vfAePK)6p#_8mM?JsgC~XC2sa*z&yzx
zourUxVl|vb^BM1}bWUOkH3FDIN#`+AKaO<Vr-J^?_$N6xw#*QX+e0L!rxLBz%Yprm
z*f?p3eDT-#3HZYknHA_XE-$*qd(RDU!zWS@mlsrS!Nn_3(F(1;O917@1AfWbW)TY$
z--uiEjDIRI7(cmP%0B9BTfY!Qp+jA8LVpQ7a_FcD#AyG%1w>J3n#7-_sP_;?Fuh~b
zY>G|OT&DwvZ=DC86C<9VBK789F5JDpXgJqIP#7Gmf?2Kg2y@PfQ5r-fuyG`cbX!4M
zZqg^0+Bxy>BIxA?&uP9k<_;$5$_!@G%fX$}5ek=78wjlrMYo25DGsyMN!h=@l|jbk
zK4H6wqD>DTD#*V%%0opS$-uNquuA5ok3T23Qq^aReWt~npyTh3sJycM{UVNn92bCn
zO((8=O(zokZ`tfWu3?wDwFj;#njgi=<hdQWY`g5doxNoN-6;8qmR6OWl(IyWEOuh%
zy$}p0d6p%&>0iT%0CW*b(Lo&O)YK&<q`)#23#2(Im>^>6$RKyogedpV=K+Ct1)u42
zlO)zG1&;+@`R=QUjH~Rs+%t~1_ntft=w79Fz7R7X-ted!C{2E<@gG60z<Kc7k3h&o
zKHzz9JMimRyIIp<2BX~!K-%f<qXT|u5F)#mh|~@WslwlM80`58dSmJd;0@x=pFkZN
z&c%U$)9mWUhk1jvsy;GA?)y@AleS+X?0n;;Gyo5Mb%NCIQ~%@eS-L?kkKieP47Wqs
zUAk)+SMbgf-~t)9ogTSIL_5Hb76)+n)=fV#0_>sVgRSI99KtCFxQ62`*j0hV*lmoY
z5Vq*IG~_SY&7#g#Q%IH2T$AnSng3;y6boDu+9|WzNIRfsd^)O<7sO@TzG(epVlzEg
zZiM}JIse)(6DNBdG#Sab9ZE_~ORdrdDM3fs3p23pLzSNe`JI!E(T_I%afbE_-iiAm
zYf4ajZJI5zo{#DL=3yC%j2(0dr*S3j#k588@*}Itv27bN$FUjp7D{YxSP@kNd)n5k
zZl@q#wB_2qb@U_b)!oC*$r~7J8IqcHOEs~NQ8wCJ8=N017aA~LtI@U+W^Xby7|>dZ
zHeieP{*jbsv21N_>irVl3exu>3cDAakoRgWZ^yQ#M8BYgVCCz@<#jgZq(!mB-RrT?
zrsFT2EWxy*NGrI?&6&XoFyv$14CQ1LR`j}6S>~J8q|Ox>yS|fJw;&nC85XxKHcBxc
z#c?kfaRF@2=VNDiR*e^#-eOeLBFj@gOM(4~Q<|P}5li6vsM0fkQjI$pW!WSJWwKF^
zBQNZb{1N+EKElms$i!su_`7{C6(&Z}IX1y)xb$d9DdV?UoGeyPE~`zDhJKmRCYtze
z!DGYq1HaHUPbmqQ&T5h?WP|J#Q=&~^NP~1=8`$kGpU&VdCL^Atd+(H%S`7@fxaQe?
z>u$?(b@U=7jf{`M+t4M;sAU=kbtCge!vJzTWwyJTA|gT)(kSX#zD?^IpXkfcq!%*{
zRJkP*)#vw1MI0{rxq=#%B{|Hr^xgf1S=}y?Xlo0>N&uTi<qopX_W^Fr?oc~0g&SMA
z>0KV`-1%!=A9-QmE^J!O?zkhi-}z6@6t+Nc0^eIOUkU&i*CcSuBt<)7>&1p~nBAIX
z1bd=z-i}cK?a<|*G*lI|OM5s0!IsE8t7j~~njNk4xoenrrJ<j!?^+@L!D*`RY6Dlj
z@VOkGXJsCu16McH${P7WT*wsJ;V@~?6U(ffu^hi0AFw|H1mvh4x*^{shw|9o!K#z+
zb;-p)xla-fus;CWs3PRNg$Bc*5sJ0fHfE_og|QFN)Kj#IvCMm!RrGv}W&y7E=d8%F
zJiYyU<}^Iz(+;aj#0+5Lkf5WOYFs&0Lb9kfSI3t+Yfa_0MM0~X4OvZdum@NJn$uLP
z=P}Mq?Xr5wGZs-YV&D3*T5f1l&@UILcJ-fD$1|7he*d1Eoid~3{m!sRCr7KMf;IV*
zsrhVS0&1e1#4j#yyo7ftBX8Z>>Q<aH26w>8XtMsw343I8NshO_61vBba!yiGVP?XH
zaOW_13u$e5-)|3oZDvLBLuRfk8@=<wqokG8!+n_PwFB0>S7v5mS4e&HnOMoef08th
z#GGku>mY_DVloI!VHl=(VATXZ%v?;iz<LmGI>TiydmFoq&Lfcb+8<Kz+rSkkcmw%|
zn(6XWW`-ZjfT833O2=K#wMu-d6E!TzAn*sa#UX?r6KdPXzOugEcX$1xOKhsmSe@m&
zay-%EfU#pJ%GtsZMO0OM@jBY>y?u;=7;ChBcVSrm1;TJG89~(fYkZy4lOkR=*H$(5
z?O?7AQ5LF_MAZk%cSrqJ(#xMPmBNs?BA$)i9*})RA>cP&x~(p>$~c2Ct~<<Wnpey}
z7T!#5oGmehUZ_-Td{LF<32_-BlCKvVB}VJo9S%Z}=PBaLoXDufC1DMR3As=ESvEKd
zjuDB2Eh=E9sU4gi3DFlrkD`GE+#&D46%{dR+%l+#j-pP&8FmE%!A5q;xCoDse=!|W
z{yO6gcQ!ES=^#)5zRZn!1v+%HH9=LsH9_gui1D1b@|?J4K6E2v=?LWN3d*=Jl!Fu7
zDBPc%7{8bp;Wyg{YH(!WcErWG0cGF8vgx~Pg=H|tVR#z9LC}fdxFLFnQJ<}^NmfcS
zd4LAp_>^-g2wCNgypk@rMDd)cOmi+^SN^%Hlx9eC1Je}KY4n^@-Z($G3Po+&8p$gl
zf7+N-*{jSud53(jGxn#uXrRqyv;xWL5R%I}B%4J@4Iybr{BEcN`rymYIY{){GWC>=
z_87Ker&bqSV{Ew)zvE@^iMy&d3~L_;a~}ulk{n?46DPI;chE4b?GRUOe{a@#U$z}{
zw|mGR8D_00&QNhck~a2@xcjJ<y|rKe;OC}0W(*Sgv}a10W&t!BU-*lvmBSX2NX3HG
z0v3%4Uj(49WiuQCV#}*!j9^av`Rm6c=OioB*;(zNGwl>V=%oSgRdJO2Y~7!#I1o+@
z_Xc@{xeVcCPMHjn<n}N=|B$J3iu*U6A4_#S+HLkG2cT4SkZZHzo3K(Bgk*d@WLLN7
z>HCiR4ajc0R%XrF*om-JaXK^vfXbKiJ^mK%)+@wgS(~Oo;!YRHBY_yx3%H5dTNd$g
zVcN2y=*<Dv56HvqbQlNz7zIWAew|_+NEQ$7Nm_Ik|97n?SOEzN;B}0swpIb^Nw>Zw
zi$Q($Ekvq_XSwYzN7YSH&JeZih;3BY+)}^~i$9`(T`~+ob2(%DKBJ{*?c?J5;z%8<
zUOJb8;(gx*R{idsat?_J$+1)g>u@$Vyn&AIesmt`dHWIh(M!CCfa|YSwjZrt&^Ne`
z;h7*?m<X-gAjZAZiE{hPeo%TPh0Ba+_67+`fn?|HJN&7meCOY3um1W(i{?2Krn={|
zU-cSI2bNb=<6I+g*Zy)Q`>y_+HR60gxdoYeAfow>3qjmMR5hVXVaGG*`@>;p$wGKg
zUELqJ^0?-Ck6>?_3)#UGUB#5Wl+u||HY4mrip`AX4oS68qjaIouX=1{?5%12LCleA
z<iVO7M<*V`n4P$WgTL7ezAf+9)BaWO(mNg}{tIM%tx8jU@~<h1dQ%ZM!N52B!1qTQ
zL?nH=pVRYaI1v)c{KS<M5x=NcZ3{OR8@-uG<|e|c3`N*kh_yeYk#_7=5j?Xvl4zWM
zNt<Tzg+z%d$R>Cxwnv;&C)4m10Zc^k1;O~oRtA1ry?oOlTrwZtpU}9<cT3{GDxMw%
zuA}cCS$|;P)X%5zQ}YI^(ZSoHoc=S^^+(9we$4jszjd;czib~D+94DLzEuC?*Z1F~
zoPv|7nW>Yhow2E$y@}~Ra!6l=ak>8QsC+HSKMsfp`Qt-7lwxA6V{lN^L1h_ff5VxE
zBr=m36WuiEAfjOS1rV5aD$7O_IXYj`95LP9ygb5h1CNmH*Q$%4(}BE!!{2gF?1dZ9
z)WwH*+0!re$Ax6R28)DQc}f1N5pCQx7L;a+P`#JQM<Q}Zt6*#+Z@px<_GUSSUpXYt
ztyOBmpkC3Z8&(nscTC0}2@D4ag_(V5u8z|B5W9E@c3!77XpEL?ygq61OVOzkzR?c9
zNCkV8fOz6y%k5pgtnWK)=U))U1qBxdBD+Ce_^UuQZ9%NZ95G8kVzuxLLVaq*ezJft
z2dyW}%Fv9Lru_anp|L|11eRqz?+xbp14m<X1sv;VL*So&Zy42K^va+WcA0)=78;A|
zl40$utT^3;z($ttWVhiJDV{xBW;UhC!~gcE`LBPU><K6b^h-!Te3cgo|22RAuYX_J
z^q-ClzAD=C%7Ta=%`Nle38_xX(2>9;bjj!{odIR}kXjXzaAKRO^^IZ4%DjAJ!{(o$
zJ-rzCjDq2rm|HUM2p?#!ZrU_6LYWg8IpZ8GTj!5QS6`z9GK6R1Jmjo0uRFaV2t+z*
zt8i3yQcPq+)j)Q8v8e8BGH-~z(F9M7G)-@QQeOEx1pqGapN5(JV^CQIBn_kP9u-zN
zB@4tqQAar^x5u%-lGaqE8D-eTCroY+su$eqY$AcT<hp7H0kt6+7%R8!>A7S;)6s_5
zkF>!o==z2ZlS#ou=}a;S)ppfTXJq;`31rz+N1m3U+5q0=82Szi70lPE3Z=8z(dA_<
zaHFHg!pN)&kIyeVLN%sMsKsmKU><$sb>cntP$m&$He{)F+G3|>)AZ02kA{fA3|M&M
z@Pa!`Yw70NR^8@bS1BHv-6dl72?X&UrgleBL7149ip`=Vm5q!UE&bA}z;0Iy-5)w_
zRtG~t1>yXHTdkn8voZL9$I^#W$Rc5JfkRiFAvV0=<JlX?xGxUz2olAU_83Ft3RA$F
zj-QF2t)n#@PMBc|F$8Qjq>UlI3asBX$tF-JFFV3piLuo!mo<#d;6=5V@vPgJ&O~-5
zqS@OvovM2BEflbz+tZVFS!ou`SIwhg*jIF_d|3+JbAQw7+>hzbadFCr!JmsTO2imt
zhM=(gPU#4m`V2jCM#3r3_n;`MPrM?A6hJ`lRV#RWT#}?WE(q#dAtpf2agBRl^gQ@Y
zrzp&!=QVC$J(qA_KUCzTMs!KB*bNLMWMJR#%p>U()`M)5h}RpAHLl(r_iSYC*u0i$
zYhl#q!i9rxhO!0?d?Si`*gMi?mP2>onm*1K5NC)1Qv8h7O%jhMi~n6<FjUt=(t7Rl
z`UqpqegV4jJ-j~_S$mJQyefmxJLGrx+`3!^-Vmfw#ZQ;u6xLl-iXWIm8eK&(UgA5T
zintTx{=FCL(y@wvx|G=<B7PWVvPs<yVY8Jy5%{&nGBlA|!jCD)3vWax_e+2Ni^<7D
z8WEBC7j}_+73uN*^#&=sd^tf0+SuFu6T4g$WaWXG5PiW+kQ7l-QDYJYL5zg<RAVBH
z-X+-e6lzLq(X3Ka&*`_fZbf$c2)5&x<(6fmBOb3yS?)HoECu+tHoxH-QpC|N(b?=P
z)YY9D%=e)SKdM-w<uDcFK<ENw);tmmj;ZOc$cu7eFGZ(+NR6`j?zoHQ+vK9M%qoP!
zYTIo^KYLhwxq2{Ni3oWg@tab>auuxwq9WDNz@=daD&lhx^`u)&r%||BP@yWHY@Ei2
z_)0pB(|-z@{c@imJszhq9l`J?Z^|7~LER=)?}d(peUlgAI?Se^k0XXP9W-yiQeRDC
zs5WH1g()-4DtMiKg~jRNPFp(GipIj-g1jQSj+k}0u(*WbBecxF57-RhMn6uwkPKXD
zg2bTOL&X{jJ;Xg{vpa%naI6E6_4jiG?lOy-<t2sNhv(EsAMW6mn^EzJAC4G<S@!EH
zT_(u$Jy!VKp)h!B4{3D@Q7xtP{7VZZC?*X*;j2bbfC>bJ{qHAa@AUOL_aD@fqYmYP
zGlcdbzFd<WgM!K<_}#(+xY>9F7+WVkaQL@eoukbNdjv}UiI!eAT%y{FE*aCo@wcvH
z!8SPC0w{z09SKNiA}}fGf)YA9b(qlH`yipKDEt|JH3+xDfS%Pnv%|?w&$~na&&~|r
z^M^NlActs9(jYq>^kK_Z9dz|yyJL)Vtx`ja)J{k$JDHGj{jIb$F%Hk%Xh)JechKF0
zXAEPzUR+MWK@6gZLuz1a#W6S~4$7b$#zL!IWI@`FS&<ClwRkP!4iJ|r4(gzHjv2IW
zAuA2aLmNuJ$;>xMVh&BMTOz$x&l7Hal{RU#^)mwBm<qN7A+c`^F!hIosk_NTe~Mo-
zb{Fg-p~Y1^m#z=CsPK}X*;hWtMqX8T=nOp-2VT*52wiS7Q}LE>mqVtah5RsOq8~CZ
z?nfXl8xF3&3R7Ay+0{gwrg}~YIsyx--U!C~13Y^P_e#!}JI7LV^KF@(rHBrgWvwcD
z?-a{DC3g%9xS;tXcBv0O@VmFaeO>_fZ+|a&?E(tEC4O3k<!W;=n{nKTxZ@iBDju=*
zm2_rZ68_ryELHEiv|$j<4PE&xk^w$1Eo_0=iS)}+;E(oKRb0CUvEMwEYZI7!ZTGc?
z2&V&7!d_Nn4-3>A>?Jzqu&rmZ;s$o^b5bJ>XVuY673OV7<4fWPMv-+x5{EigHRWsm
zKQ>bNu(!4~GCY>Q+sjwlo*C1<Sue`7)tFCu=u>l8nZ3eMq&a>02fv){%VU()m?URO
zV_{LxEOVKw1nJBS1^<w{_?^gFUt?*?i9456KLmI7NEssnDQcx5pF7XhFE~6l$px)v
z;N5EtW08{)ZP-%cGQvcO|FD#$p^{FnUf%^TWX=s@oIxtAs{F0}wF%geX5Nmo#x};0
zi^keSN)cT`MaUbQPd5>`8;MzJ#pHKvi>d9POFfmZjqdQCbT8AiDOr2C5K}t{j&e#`
z6_9IawSy!Z-%@G=-Z*;rh5SK3V&4sxHt6XV;4EnmeLbDUrXOYOv^m!dH|R3emE0Je
zHRtis?v^;CR3)XUx_E~()Ig!Syg!iIOVJa=Z*6r#Le^B_>KdGc3JRNxCrv5^_)K6V
zU%XE?w4s{3S|uxG{8yk!>{}eH1{aSdEyuyjT%>rpBz=V;8-NwoKw;qIc(zswT|i6?
z2-`2{pM?et4@F`4EY^4A9^~|{p99!_F<TbTbb50R_){3^pQ-D~<J}W1dM^$Z&v^Ap
z2WVhFt)9E?uMwV$f&?s|Sw8yVQh`*i)#3aHw$R>%2Lx_1dpmvkc*x94#bC7udamu^
zJ_Qj3EwQnduJt=hcU*~BbzsF&_;-$M82CvBWbgU2n01UxqFr_A+O*eN^P8KyMNz)(
zEQ=_Fu=>CfsD}_M@W|d;2o1#(_h*KOV*!Vy0N;=woSmY;aNDfa%g-GzTSumsM^K+=
zsE*b(xU!J_xmjlSD!I2vUH1sU)|8z9FGrVJ1<<pYD9E>gL*=)-(I?%v`<Q2!L<EZ@
zueg6!l}2!RM7&f1AFwLQ5{F|msiWVqI@UG{a-h$c@j+?oQt6}2fglPR%(~2B#60B=
z<6+@AdyTD7IHDm0r?rZ~wIDi_&ui*a5z#E1G#85nV9T%*&7bU0QU78sR4j-F(@k@u
zF8x4M{w(Xf_2|1vv?$NgqptCpsw_Tm#S^y0^9|1F+Bg5hIypKjE_;<oj+RIzz4TE$
z9@0|V4=q}dvOGsVpR&fgYnuYe&SX7lrc8b!8he+qgRPzJ3198aQciAaJ{*GqVd=T~
z4FE}Z(Ui4+-VZ(6gQ`9sIc_2*ylT>hxXXXVq@=5!07Aq!t{wB@DOrN!&{Jdd7>_{t
zGK|G&GUrZrC80^ytvVi6zif90uM6cUI=EjsE`2@jxu|_RRZFu`FdwyDNL8w}c{!YU
z&wYn4bI#XW&46``m`ESXDY-Vm3|Ucaucz61m@0b(U$ZU$5}D&3K*SH#kUil%u0EY#
zO%YShF`mAMZOObe)^>|eE86~(G0ft}0pG9ipWA$AWLaEjE|38&Qjt{V0Bcw6tQWv-
ztVl>4?V77vRw4t-+!DF*jF#PM>{*WWVKDWoU4v4aOQ}cB6s<cde)~t2OZ7puzE}yZ
zYd}<IjgnYpwi_`Rfp=$c{r%?-T<o^GG)GSdDsB+kao~3bG6K2$bq-1X+}klpCzgW`
zNv9w(eYkjkA5M=4>Yr-m1L9!gY{_0_<1L^S7*_xd+RH$BbU#f{H;>e%`s^se@jb-v
zDE;AgBqtUVJDKL+`Gq@QI8n^&&^-v2&}^b$5QRc~IW9#Qk-`DUeSosWFz(m^435`3
zNDgolq-0UbI0<|f@_Y^vHhFUiQXwV7Lr&JuKV?!O<h3ep6H=5+nHd{ZOJ#aJJzP2{
zHHs~T<meSpBgvVJbnrT;=qUD`IvSMdw`!w%`CZ{P5nx7r8|lvK#H1xTWh*gl?z2aX
zHT{e0l7`c|@62GUZFlgo*;3^w(wI4B!$+XQUy{a^iJay|K;(QG$v!FkNW(t>QeOzR
zrnJPdkkoO^2poVk@K!LtDMeeFY?2*Ti%4>=Y}rHrK1FV|w}3a~)f}#eq`AV}1v$P1
zKK0;P?fm=bN7^#U5F2o#FCKe6gM=)O9MjZfRY^BPZ5Qrhyt#GP(Z+heg(sc9Bi*-_
ziIf^<b+^7JNV8GuI8S`*&3&n4{$Cr^_l1%869u7CygSxS7Egv#@jSZPwK!BO8(^PB
zRT>1@;<R3nB%T)dVUk{#L+@-Ik|Y)TH?cVyz4d`T$4Iod9uzAyM__|p8k|EN11A{Q
zlBsDk9n*#2X@&S{EV=44X*7KDX<jz^+QUY4>==&vQFNOT3Dryp?kn7BH}DSG2xr81
zXI<eydr>%U#<QHo4E(R|CZjjUiucYDF0IYm4*0GpoD<5{6Gi+;8n`eH*$4QnkTUrU
zNZ|?Z(r$(2CL~kk^;gG<5yoSOaXGB0zUr3MB?nDz9&21FE_SrQ&a@z)HY9NNgEs4f
z!hSGGzp9I0Y!^DRGFwoJc_e0e3=Ju2`sfj=lCauA3p#-?kVDWG-U#{k6%9IJw>kNB
zKpk)ii28i>&WI7d=lN`6MAT*^hPXf#aNCI*H*&?f>qiaX6peVtWDXxg=?Pm$lmEsP
zXRO`m@g+Fikl!aTkRcEO!N1kfQDD?^GnbsrAw0dFH3Hvn5n^(~P}Vl9ww+DQ1@Lhy
z&ZxRG$Pw32VANy!6UBCl=WDJ+nc`Z=mW7fQ+lbl<%X%Ql8A8K*RkJq>F|naXGmSL;
ze4LwWkP)=P$E&13lngPJkr}tV?gC!!t`i1aEaXy&SSI(K(TdhtOQB|^^NNj2R_4)d
zJKF6)4c|%5y-}5B|6n4R-j?7Mzc})A?F>+UhFh7u8c|K2-ly1y?7<O#L9^TyHF>UX
z&B%*9+C#G$syx_th5bfH%8)cOdXHM#W%>*nmo%2LbSFWE6@*#sJ0|`8uKd%oSxCnl
zGH*v`XitL*am@pW;ohTe(l|K!15WQYv9omn=KSavJC+u~94*VZkp~FJT@L04!QY#0
zUk~SBWWR)Z8qELDY*R6{b@&(iF|`$U6jjX64V$Epg2n<=YK2IV3F6|yLS#z1l9ccH
z64V;(8FDoz$tN=D8K^;TfVYqRsJPb(d<g`n*f8@?%DAmAD9bGJz_3lat=l)ht+|({
zo}SNd*SvnQMjX&a8Blv7sP@~PK`=<Ldy|mxhV0Q%hS8#qP-#W?9%Rvyb^5B;YN&jz
z=%R?L;1hxv(u&_O+U=u`5;YD<7;E#ly-?Q_AO}$23N@-2ZR*lOyKta!!D@ix1T|?L
z#+&c}eVt}#cx#kqhipGQl$||FKa^7qi)iG3uu0Q6CgNR^uEi6k%oq+ZcPfJW6MN<o
zF&biU4U~2o-ms($aa~SWIFok`-Zs}{9I=fcJ`Ef9W^w2ME<88%CX$bAqtY6k%m56j
zcYrfTX|M41^{iUDxUE9YNAjgHD^n8ZW=E`LKI75r3e9hWKfPNpA9({=69()ZyLOTC
zS48{-wda^i%~F`brkSdg*zI{rCW5TBGm=72SoUIzR2$Ap5^Z@iQW6bw_Uwl4L6xyR
z8|egxxNQrCoTWrW{dw#Mzd4#uS-w8#B*3=i9;#CQMB~QT&k&r{6j=@_Z=?Tlwt4BW
z>&g~5mVf|@w8lN9J6%@^D|ov-qupD~%6Px@O`UgOB787@wRhD;Z9GmX(=LH;y>4Ah
zbfLyP4eQm$T4$Liwp5+sFaljp@lwWRVIl%FY+Xz+tO-C3GOl>CqNZDAY3VL5og}?}
zYtjbV#>oupih)KZy(pPmN=XIQv3u+@hUoZIU9<Wp2n21KxWGt&89G&E9dvO|;mJ?w
z2KKR{Y!?y)bzSWSep8i+{9J}uu-Ij?;`%u^^64fp2tm~+Bu>>QNFJ-%&7sl=VV9bJ
z01qv14+c!X;%hBNl8|*MekG=vVswbZ=%Ywk$T5x&P3je<&uCTT)lG0D!3|1GdhCTv
zDvwAn;??kbWZ-iWDm&Sqx)^y^-Cex`DS#y>w=`htz{hfal}3Kv8Ab=gbvuh+6kN-+
zoc1Lq(hNC(F5<yzGzxab4W&xfy17r#wO#RhYU94CwVm94;#o(7`9;(*%N~0gOD6ZA
zJUeK&&RVY*o*uFZ4^6VXi+%oK)#Y3*sz;SkHAjw*&^+-Y-UeyJ3)y5<_{vcSD_N;+
z+XUU|hi}~Iapr63vpZ>N`ybrLbMf*^`6>+5{doiG++ufi_vrd%C8$ZAx#d2_KTN!E
z1iowvBy*=IAOVkzUGw+(Y?3V)7C!<546Lxu<*8B&*{IRxA-B1-zBSQ{wD>l%FnMBw
zm+qw1XDOeUJ}aH1_W*i@L9d7!jcUR|0@8l<3JzY^vvMh@Tc@M`Kzi*)vVfOR>3_Bd
zB@}rJ?8(Q49_$YbI?*Tw95aNMTK&G}@tS8+-9&4*_X)^d>FYIcz{>itc*QTYguo@)
zLJ6NKi!y``<`i7t506tu9=F(#Mj8LsDPfVpi$~hY@97n~`EFuPpf`jhgiaJ)#7qq+
zvc)75sg6dMuq~x4GL{8#mk|3ETm0o6S-EiRZ}Q6jis?60qq6Exz(jy=bjNoO6NpOp
zrvSTI2eJEoZW(9=%okY9F~g!usKg=V*3}m6f&{KdvCts<SAm#~K}8R4nxG6j6BIP)
zX1I&yz;|l{?nPBcRf7aG17(kD!~HVQ@I_bj#Qr-a$JP&H7O3b%)U+NJsYS`JZon;^
zF$^i){@zK)?^A*d8NS};6;s&Z+zLbQP5@qAj!T(g89=u>)Iv#;R!Li<@_jhVZ;vyE
zWnZ*UuHv$x_+;R0uAd7x^&89U+@+wK&9(o3A@N^j(=@NfUdOMZPxx2S=ihb}89G=p
zNGjO4np@iavtk`TE;qo4C_17*Y3qq<;TcI+j6=JmNrb4Rn2&};_`7YCvbEUlfYbKQ
zn)VrpA9{yV6jEy^G>&<1oyYk<YChYr@Z+`m01#l)Y=d|!((8Q>Uv?u_GvdN-H64)}
z3RRJ}2-N%4FY_CkA!heS)p3~p0C@f4-f%c79H-To`S2(nnK_M);ZO=c@*oW0NiO<o
zbKphLhfq{(ip<_R7IDW{M|=zZU2bP>1hM7!hh9gS?U|c&$dr8|Jmaer>(}tEPSwt&
z!tuF58%?L&yZ*?=0XUfw@*%p|wPCGeeeS?UHm$}gInhXInZ`t{Kv8q8wmwqB1V!$Q
zv~Bs4`7>jM<Asvv&7xo7y$SPnpXM9!g)BlP9^p^akEAd$ouiX!<<QrWBW3}MZV7Le
zc2WlR<b#%5u-EQYrof=+gaS>8n($IU0O?vAO#s?Bv<jVdtyLTQ0k@6DlHt4)OfwzM
zOyl~fYxF=(8-~HvzdZPS<x*pu{qkq4{xa_TxBAathb1E~{*QwyNtss1QAHi;5f(C&
z5N44H(6X6dSVhh!Thg}$p##N^$A$uhL_duq!s_2<Oag#bSnIl!XuBQ=bvPP6;Eq}H
z(Ldn2w=Xq)py6L-!6pT!k#LO+t#`g{`sRJvW_3T^o(ahRwa@Y?IDA(QVro|w3Jb{|
zY-a=ys^Oetd;*u{PH?}La7PC*N+Z!huwNAF4>CCEJ{fJpPD@7H_yjad<;1%2A)eW$
z=^>xlra7$YU}ks_5L4citO>>(a0u47oTSt?UDZh|JvOV%I3*jD89yGrI@U?tJfP2s
zbCuMlKMQ(t2WFZbIYD!6I_x9a0YFqqIa9@VC(!}DWp<~F+Q2?HfxNOAjggrF4q_Zl
zE2~SHYMLs`u&0X5YJzOHR-)$J^Cv&;j@N*_Sir1l6gO*Ss*6)mtTg50d&2`z*0k7+
zQ<zs{%@kaG0Fn}bwRx0jn+hJQeuYUTqXMnj$vH?E#b>*3g1%WAWa1ebG>sHIz^_@~
zGmU*!n?#%`jSD3HUt?zhRn_t}a3rL=Te?A{Te>@?ySowTZb7<R=>|#Z4rytSZb8!G
zJN)1C`Mjdv8@%hXT+Hw6*=JAB?42dI!sr!<Zxgn*`(*KzMl(Go{^F#w$m42?gW{KT
z&Gki?#q3iRYEto*`2!Da-kW#W!(nSzS|<3j7u0weBoLaOkZAWNpai4jJsPf>kSQ^l
z7r6H_n)0FIWK^zN4!4}G0@Hc-D-q^^X==4PLlTS}<{Ba)SbWkml-^33_W>vf*5gRM
zyZA69VIwHE%q*ia;VI-YGiKE^l=u(lz<`+G_m)PGqQS0r!gte)H>*vR=E_-lShSOB
zDCdh<oRz*AX%uUoGfGj8LMsK9ruKvvV58R++matJSfBKd5NHng$vke>Q;s?$dwG-n
zf$rw`VVtr4Qn7VWtqDh}eQE|9Kiu|iM?`f4_)7;QW|%2qJ4D?FH~xJ-v0oyHZqTm3
z5(&tC^X(%Rf#!*uIx6Jn&M^)dkbYayPE_1Mg+jED1FMzklG!6|EPM|3^o3sG3Q~)|
zdd7g$hdHD1HsZI1SD76?m$35*?L^&ed=j2J@5JpJ1^Hkv5RfKoGAic~pJG(Z4KRP&
zNBUYM?3102vnagd1i2u&g{ma=avj?Grr2@fM07!*B9Kt8`YWSo`R6!-)zf@b#a+^m
zeDl;MqB)dFZWyF<`_CN$s%4ax$(*yqm?P5O74Xbx^g(F$v3U~C($u#_TZtGLWq9SE
zV2a$3U3sk#&Fxtr=T9z0lEY4uC}S-3)>keCJ0l<+lD(H?Hjf#dTuhhUD-&0aqbHnc
zl4S5pZg4lv?l{;=F6nM@LvV^T3r944Ze-c5EfCB#%2IH@Cd5dyo1VB!rg7LJ1UHc{
z;&?Ngcw!@l_iZISV)I*aN`f8U3=P-Lu5(f-=n%%^bqwgQ$=O-&-fHlr2UM%Uy}%gR
z>sf;!`r<_JO}W!&=8<<~Uj)$?3#1#UwKvwd0;B5`$ZauQKC)MKn!PWzpN)15RlB)m
zZeOj8AM_Em9h{mZG4Xr}QCV0(@)=*FJD+!*zhW6-Tw`%w6OZwKPfK0y?_cXxO049;
z71VA3^-b!V4BVUA(ucitp&^)8@SpH$zARUFa#lPbR9mgsC(i$1HUvkbZZM!2+Am%o
z_NK)Lb=59Lq&p$>H5#h8P%ie`ssOWP%-bRB8@-3cs~$y6v0hzjsn;NzeM8(!B1J&2
zwGZ@KRG<stw+*3!Ij~b<W?(O9<ZR(;;q38Os~DstYlqH^LilpwzL1551$Yov(VpL1
z2rO(yK?zmGf^4Yb`;J-eWrrAjx^v4CU+Co|2(IpZq3(8n0hSwj)M2+h(sKRb>T^uR
z3fL+x?_N6`uXUF${smNN>jUYN0^fvhFRFYGx-m7|P36?yl)XehTv_jaSd+mMWEz<n
z*ZKg6mM7S5P`;?5hCRB6Mi+)TP!r@(N;*RAjR&)%uNYaI6>GS;?(Gfuo49X7BR>9u
z0a`s}N^v`(yhRPig+%|dr9QUssf^$203$1%Zi!Jx>{fxZH*DJOWae5erg{pQ#njoK
zW8N33Fo~Qw%$*i}+~%GNh8p{<PDPNJ(nQYFKaRDmNRm*axIi6(h!9M(Zu|Dl>Bx(W
zY-V&7VyJ@~DvOEwsIK<`9N@O9jNKgEkn|OAn%rJUm%ab8CsuwTm8CSVdU>3{E1T-l
zudmwPQ3sDvSwnzPBE`6S0H*mRePZ^0Y}`p>Z=x|qWQn-m<7Zo0SkPe2XpPVuSK3+7
z?Xo*y#=Mj)46m2S7c{zU*)w@6r&rk*ZS0|&5HGO4@Vy>8dA1~*0WAQsvA!-5jh_K@
zdpSV2_shoA|K9e$hA2_$E9&^7IIS-N0|TS<weTuu{Cn_(Y)b3Z3d%&`@FZZ-q=M8A
zO<Abu$(x<sx?-U9yk>kJ>zxzmmCk3bSBUfVQGE^J^=4_7OsY)#@O*C0uI+f)?r2d`
z?%TKHBmpq(`|>1FLTGSU-Id8gsBTK3Ml^m(XhT;LEv2D3^uemA&1vnL;FoAu$t1bz
zxN;Z`Q#x#V>QS0)2O3R^X{HhfCxfYg^9Zr<V#PX{*3_48>yI{$8|mUPrqjKGKZ=f6
zZ@96`2Fy-nv^3>yC$%Qwj*PpxZ2LN{&$<Y^*(xczI!2MOTd8q%=__(vDb*;h%@k`E
zIgLjZ6`iw9PxLfnM{=b#jXcC_SFxLM7G@p3Y@BhX_TcjbBArhbZ#Gy@_A|vxOS2>v
z5Xlgaq#|_bt-015!C);h664HMcG-gsZQMUpF5pYMFFd$4T57@hY{lU9bG~2+p(IGv
z#-^-+U|6P)GDc5q=7rJ@f?=o;_Y~YzJkz)h^rxiW(BRuCO!!*RpR|Iz7;%PVvnltU
z9>oPl@9WM>XkZCXu-ZB;R1HILz3H;iDnlJB5u6u@h^N)kc6wr{I<1JDHl}5Q^C&8j
zy8INutR_gPp%9w>+bc=J#(G1jiIunl+tqlBc-KagT~+VdVr<zuTGep&GVU%Xc8+5B
zso=6FpQ6zn>qX*f38&W(Y2-R>E%9v9)}-FfeX>DEC_K1w#2Gz5(+xioZOye@fNH93
zJTQ><oQG1Tz$^QRi&VPjVas32uQXo!Dy@31mX*IE;xpH3{ZmO5YMfpRC@Kf3j*pzN
z?M?n}%w_rzm%9YbN00oV;rP3R{Yd<1;aC^d6?%k&Wh5AI3nxX4m&pc#)Gpk|N+h(S
zpSU8s&nPcVKi1v!Ws3H#cpFx(l|lU?Db+a3-6|IYAwa9fWxAfLRZJ>EWM&DI2qt#v
zz@SsjboDyIDTAN!aW-8rp_ANIu5xKxV?x4&ly$my#zb~nFm+S_PHq+x<swOzG3L|E
zd|a-OUWC@o-GQCCBu}^t2w75`9A?G<Bb)+72lNl%qhQRz*bZu)t$|KN{aR;{q4PVJ
zgfO$@ofdA>qR(rXEoD(+)=iMtDMdxqcsb5lNXNJ(2X+un-W+#@H&nfM)B@k<rSz}N
z&CrMlR7L1OQ-Up3x9{j`qAhVyNmnI?v=V-cDXu0Ya}n(R7J@XSNEammB{afaR!G}2
z>nuJJ`myyVxkjjtew+%=pyP2WJe4a6tmwuF{v$z;*M_dRb_!5kX|Lb=VeX*AgMZfc
z-&_<Wey6(2$lNSeBjM@PxoSt;<);_O`GIiE?<`^0VA#D}a?4xDcn{VvqxTx^>(wB1
zl64n_!%{%A;Fi;x)KsnlCBqsczn~u2#%%s)4u0H8n|{_^Z|S24vKfeyxOQ&|?K@@%
zx=01c+I>WyePu>dmLDe;`pDq&B_oD%vT#5jtARqcSDa-wgA!NhW3st7LILhxb_#M5
zEhgAEe980ARRyWXl+(Ucswg8_wIOe!8K$3c6y4`7@;CoRlIjyfqY6pfzlVHMRBCp1
zOd2h38}$wO=ed_++hfE}z>$?_z`bkAJA1MJwQC?=mowCCl!2kWcVeJ5dZK@=!Y;f5
z9x6CRS%vDnW`5CqG=E9Kj+rKF+pY-{j+*A2E9e6^fvby-PaUY|T0DW#-0Q%VN-lmk
z^!z$_hvDH&&#}fak0qz0t+6-WpCQ^sIUUZ{Y$OZG8|eoyCCjBw<-n=z%OED*IsAx*
zyB!EqAO{c!+NkC(HyP8~>9;l*Uy@cB>Skh~x!;3Vy7CLp4UY>?gF{PeN+{K=3%8)-
zOkqina&{T15*4i|JTFceWrQ?Smd&@lDik)Bx7AshnoP7+pP*P_JA^|O2M^Rb!5|pp
zvZZJ};&OdjuacbQs`HhFG+HV!M{B0oc5x^X^Oaxwijw`2#|pfxX{sEDtR7zIwN+tK
zOSV2WB#}t!tW7Jac37+Re4&qO$826%JM{L~XPE{mLD`ySEcN*hxYy%@{L9lVBCh9q
zi|y_9N)n$#xoW(mSYo4C!4NaKfXjY7G+%FTM!)nClA?<NO-9$4kJL8Gj`0!g*LvJ?
z|Bis#@XnGaZS*<Y``%GV@$|%EZ$GOPrZ5PrnDF#(QFF1)qHqj9xG;MrFNIi`T!lDv
zqLJ3}VK%)wToh6IN}=oFsKrj7B;reZ%`RL7bDa2QlJx24-TC1$tn@~rU45?$-q#27
zT&V;^YvHLGm{Uuut(J#}2eT#P%{ZucR6W<gOy^>?K)lRnhR2^^TN5s$Ey?y=kvDMB
z!Qq##WTKt1Za(>RABm&qlCC~5XZ6BdLf|XYz@Wyv^fq^e1}7pDNVcpF#t^8JEKQ$M
z6RjS)P9`><h_C(2QbfgZix7Pm>?hZq8HR<m$?KTxj<4SoK3Xb{)?&9=GGuw=%SBSm
zGEzbfV-#ehn5=By=_bVn#FA)mTa<{*6tYCqT&rPtndO#4b#O}W!q>%Ca*(q8a6f%o
zcV*yp`T94W)C-v^4Qj^=;JW{Kb%^^(bntyvmsQLw>)1}xRf3C?=B_ru(q=6=+V+Gl
zywdbpeM0Ng^m+YFjgK#8da1&aUh#D<fqNwEOIWrbQLrhBYwbNFj8*ZejW#cS(;9uD
z;!_%}u?IUP?)PmdpLq{LPd{D-{(=mr3vxr%o#+MPz7&C?2({<)`J5%f)TNwp!rGf~
zGR2KvH`F(dpP12_cdm#sjO*-B7J4ZLxoJE@M}6cxi?HyMnwmMABFb&fcqw*~$h#U>
z#%sRd^qKEop`UG07#b3vP{Y(l!o6vZVx=4x{6sNyjX8A5FmZ*%;vOpc<?-T}$hZD|
zEBwn7bpAdj!KR9wj4KaArnk#9#@9@1nDfms<&S5?qVBawrJr47KS_kqMGn8bzr2Ch
zL(vlCaP*XVUwGXuW07k1)6M;#TMx_^W&BadU|`rJU|{6`Z|m{b0J!c6th>sr%eR<%
zj#LjrR2ZCx4-Y2HaVweG(RyJ>4E)%iKZdD1ncN{kj5O`FTL!BZJ|LHSPw%o$ZzD0^
zt%JtKP|nPj2eU{odpH%gKrTB`XjM<?u;3h);YD`ibu1Z~e~<1+{p$7c;$iv?{pF%l
z$k><D(>^fkIF3)KUGR9{=3~HH6v9cqL|O8`OdTuPf-k<-5=dhz-jXi9t|s;gd2_iI
zh-{~{q5kCx`b%EwHI?Ys8sr<a_BZcK_<6Vb_@9l0RFr(<cy?8&d1lA|Y$(Kz?v#hW
z<rVo&bLtH;;>~U!?KAZ*pX(|yubYJ!m#Zu=%@1$z+Fq_v2o!&)CQi6&v-Hk3_1+PO
z@Ky;YUZ?VA7f@Zwvbge~@%GcRe7)Ca+OmrNf$n|Zh*I_|@HZGzv6MZF)D(+kskzU>
zX$zFztE;qAHR%l+M^idYyJb>-4AUA^t$7?pPYzk6FhVMe^?5w__>*y%yuXTcqGh#=
zmz~m35}l>!V>K!22PMXJmNV2)ZTYShs#8grb#iR`)9(@Q6~#ZNTmy@iWRs;~3ollM
z-+PrQ@~nECD(#tL4P}FQ^^@#^_bDA3qzoEwT{}5VL>{@)6EzM=AlKm+-50cQvwmps
z4tEHHbyT}*gfJXGtV5!~rUxwm(Pn(Zo}4XSCOJTi)-c~Nc7{=0tjqQEV}b0x3caP$
z>dahK8guSD46#ENe>N5q7mtkISA;y6HR4m6WC>{W7A$BGYLD1axNI)6BIjatYi{(1
zc}JiqaOvdM$m@I1m_3{IJvYzQ#)J%~1qBtA9euIV7O<p~2~*a*C-;~?trO7LNsC2Y
z33i1SwQ*<|Blnm;S0LJo-kgsLWH#4?D>k7GRVh{qgYACN`*=1Gx~|s7h0}4!OjGtj
z`n$J@wfD))g4c^=c!{{`XdKNsmqn|GDtD5%SQJ@I`r=^A%k7_Z$HmT!E}r<m1A9`3
zcCV2-7(F<g61_g9k}NSrP5Ux!*SI%4mC+1Sa*IapGBO{AY*kE0c~JtrVdc;Tr)v;v
z3zvoVb+aRT&cn3WF4gNuMMLB#h0G79Rrp46%pwr1p0{Ih&v3`eQIdK#@$ld=3@O}G
zeg7VlzSX<5#5b*)Yc@F54W@rEw3vC`R}uA?BbQ1mY~ZCU8#hXL)R~0;#q%y!uPL<B
z7TxD>S5sb>MJFdnvNknuA*9wDZDf#@yUcDfTa|mI_iQK<MB!hq$X6LZ5*TaoQOc;L
zY=GP9nHc4IXOrK=yG~!4UR4n;6^{o2fiCSjJUF1rQSB%?`bir-Ni0D`eOF1-K*(4}
z7h>_TZ<c#A)nc82tMBx{nf5_%bE1qhZb~iO@nDx_(}Q}opxHXeca~|122|66;~~3!
z$u{}&akxt<&f5FbaWV&wJo;ad?ZHq?x;CfCv9Pp|R*rr{H=S~2ne;WlSMFL)qZl*J
z?c!b9OE>DM9t7MGWjJ2Ncej{Gmp6pNQKDzOlo<*~OolFX$9GD|QxxSVe#jcGEH<pf
zypmqYQ2eTa60LAEFuI9})^WJUxpn4A!70yVLp603eQK(Xg(p)N`^Ey#{(`9<k+{ug
z0ecnRq^C3wQ#gt6ho4id*YhRH@nD_0@if*@Y-!^vGx~A&$cx`M^LS*Yoy{$`njal#
zX+529pM?Z(L0HlAgi!vyf3!4b$pDs)?TZDMIok77)}3nEqqir#v;D4(%3!jtI}_CB
zO$YImpElxA$C8^4;!JxL{I{k0Ja}`C80qrRo;=DqA|>>R6d>_#%D-@@m($vvAZ>PO
zl-9xBH+8w*sTQYccrf-=*l2jTpEdYkx&V>bj3_m8*rR0mN=c_#^3YCQHiR)_5KO09
zKI!X3v19`y^hP#g>qPMo$*xi0ru<$i!OUhT0VaLs(Q!tK#<O<gt(nxz<Ksm=;)zY$
zM)4%0!4H>vhW)x7r}&gEI-kP)Ve*;~sCf$sW=#|<_{h)wr;!6E*duD4z08ed&ELtw
zo#!C7C<z4&Y_tcX5E4ypLh?WMokcAel6)50cm1?cq3`%T1ot--;t2}It|oHwB5A3k
zH2di(g5k*(>nD<Q-Crc>0vGL(Po#<_d*aS8^coW<dJ-uKiF;o$;&K%XSm=!Qhf-ed
zpZcB^J;0keVHMWU4PXXbZiyz<oNCGvO>N}B;wa1KGgc^T=*7hBpWd(gY83ud!(*?V
z@P^n2vYAhy8E=+(S-8sC{2kwdOOC>N`(p`A$@Eb7>4utqxnME(17RAvqEiP#RHQjq
zS{>prjo#g+j%2?0-HNpLnXtLQ=@Vppi_FG;hY091=Lv4y0Wyio_r2nV;Z}=7etqWi
zCd;w4T5&1ekE6TPTMcc7(?^@#b6JfMN{dSewI0hcTG&S<GpdONZY^)a(|t^I9<u9~
zP!QuUgGdi0jG>`uXd6VU2~Q~vY(b(?4yM!kX!X1TQkSD7Xc%MTs94i*If?oGu7%rH
zx63Gx6Mqu>JmgGP)kpxXIJ|9^$&-Y>;Gm*Nz9>H``k1R{6e5b9yzBh(<^_#3)pgA_
z+!cL~RPH5Q?wPUW^h_+3YJ@-@mpv;`e|uh1$7{JwvugIyc;xddt#o*AAIeyTx*!(i
z;WH~m8(BWx9T-79e&S&`nM_M(O}~o0Ia{g~cpzro$$Xdz1-giZ_;%ITktOK)r;z)0
z^aBf}%XE?vT#Ndz#|m~@3sWplb?KsCBFm3#lF0~mrArhmG+jg<I2!pSomM^-K2fx#
zbmyCG>x?iSq$t+qaGf9=EJAVADA8k8VH$nLDxPw!@iC`xt2}dN6iIN}#mK6-cd($N
zu)g=`$cQk5uTPU3+4*2_Q`vwjquHht4&8TVObR<;Vq(e*xo=XDF0p!PG5@WceJT&b
zf>PPK<j@H0Gb^@JMqKC4iXJJY?Z-k1hX|b_&SKu_ys6(<i34a)UO_bRXVIKO@vRis
zf7&z}^wgh^A+^*YVM{jk!`}?^mGZl9m)}Zh7lih*DL+w~GMlHtUHK6aN8WOTtwEbZ
zukbKk|C2P?x%7{@v{_tIJ;9OAAx7~0C6vTU{K~3`OHxVK%I_RP(+3L?WOke1JmA_k
z62a9n33O&+vU#-mDk%;AnxK;sf#iNR4pgyj$b(Vcd%@RCv6J$-+L#~mhg1>A>|%@e
zoVK=OM^`ZxCJ8(+g1*38BgF`Isw=$Z2=0`oZW6=NBa`lAOUe!^Vd}sh%{`+DS;ws}
zSu<LA{A4;g0*}6jK_kQlW*teSGNYA;xf7E_9qXtM!dI9k^1T9_%e~#%)zT0fCiRlW
zaC-wRZz+TguolXebVI)-))5_QQ93Nc7%~|*4$n@JR#WZXQ*t+R0#EiYthMxKr`4xi
zj9eTM9t(-BF;dY6Z5++?5vLdahnw(w5my!N9^=p_JE!ma9I8zT;GxbbI^s^l>9I1p
z>hWmwc%vzTUNMp4IuE?JujJH-@0mC?A!r%EbxsW7Vh-MH&4Y>Ufits44N8=$hQ%_g
zs!np$fV3lS{bWi(7crfuKGrlfKVGu?(mWV>9ag)YcH0xzinohE{J9M_mI1MvzCi1^
z?8@2O8R$w(=-njU+Eo<wvo#nbCm<-$1T$}_=Ly!?x=v`^`U8*N0WTPATtB0HCKm84
z0~xQlGd;(UM;D5zZ9$)jx`nCN1`S(~DyYsQg<JhFMh+VdQCH%T*Q1=paE|-Z0Dt>s
z9bCMfRYKO?p44ASn#@^<y0j!Qoi-OfxQ=-+b;!?xGf8<#ik@H{!p)pRMf6s-En}A#
za_vhetn7X5nAo;&$-N>N3@E5w4F-Q(CYnc0yO^tLzFm0%NBg-vyO?SCI=g~>hZv$&
zSBDtpe)TIFJ^KzqVsRT(ZKqis5%P$r7^CPt8}1Oaay(I;)?-rJM*k6n5v`#HV+XCb
zNj-;OOsm);KGB))G>6(4y$%Sa@ldVYm`vV}wsjN3e6KHQgXLygMW%5|050`-ojQET
zO*h+xRr8|kHSYbgg0^y>;||06n75{OYvBzi4_Y#aZV*d1igY7ZHawm|yRK%O9eI>{
z`8PAY)$$Qr5RgsNBY7F)*vH8)6r<ajRkJA_;v*nE<_(qQ_~p~X!PhI|<uRm>VR28r
zpg#*bK8<XVrm^YgYW6-Y&aGJ4-0;Vy8oP>c=kTINIww+sLOR#Vha=o;Ak?GVYmM|X
zjP{Pmd@4XD)-`*=LooR|1X;44mhLPrY5oc2;q(}AgItldZdN-v5s|-dd3)eJJmlA&
z^eJU_*b)R{XMIfjp7kp}Z=V&(M1O$?BUB|xfzj13AB0d_UxObMkLF%`QET~PiDrBh
z+IzNkEeYvFAgM=DQE~Flt1Gsxf0LPpZ=)Y$dnfv7obFbep?BU|D)Ye+%xv^pxzoG;
zSLR<KHTNQL$VJ&`V@nSZi=)}2`Jn72RyZ$c<2qiq1>ny+y{`&z(CG5n%y@B+2AjZV
ziUp$9Biqh(bn4Q)I_XvWP-N*bOUVsb-4%&#Ukr}4!1i9&!<ZWk*(+S5UF>MXg+?Rh
zJlP&0)LkvY9=JwZHlwu|0%Z}Z>1gilCj@(Ba`YIl^n7?B-Yx536pHoK+Rjo{RxFKk
zM||CWI7`O0=t!b1OXec))EqB_Er2BrW|dFhceo}AX@Kk}H~Sh!<SX?iiTNc8BmpGb
z;MD99?s-<|^9Nt5Swmd(<6OXe_Gqw^jlYsJx|b5`>xr7yO^`-pIuM`$$1SQ*xI=o#
zpF&NQ=DE&sB4O&E?KM<{xe7_CeZ<oUs4R8r4jEwVuF0X->$lg9ewpm1nye}>RJ>&&
zAP$!64er7A_|qwP5yf+E@VP5mU+vVEW#wf-q-}7Ek_%t@;!LpI%9GZIPtSQK9jr;B
z7ZfP8sJ@~a!q5^xbvwKW5O!Q-YH{o1-Hma7S;naTRJ@GJ%i=Kb>{G73A{#0J4Y|La
zoOmUANj_}d#KD7iGSMZ;XiHrRVytj}6IHeoXf85Ew((QUU!!>x9a9FbW?hg*oLDQI
zE+(jLoaOo|*3!+Aza}`Td~@^T-M?p{dM<(G7PFp7@F0!Kmtg-@VZo8=MjJhX5JJt$
z@tFrUx^XSows-~q@kXBz^cI||rz8{l6$yPDe<xpLlp|#GhV4P3r=xxaMVdU<g;fUR
z!eE^6Tt(#OW=%Bhn8)?B&W(k*EZe2J+*1$lN6XQi_4n0ux*s<Vu)b>RYdy}sR9&B?
zZ;}WKJ?o-U9DZ?+9`%KN%yxWI39mlXRpg{MmQTmAl0PS<>Xor1&9TVkSj_kXJ|6!!
z;6G326<<GD)c_U)tpG<bw7;LuE15XCSUZyg*KwR(oc@~B-@3zHP{Z(+kvV`=2Cps1
zsl<eN-Yzz8W3AJLWAQLU%czD^FoK=tQA!dXE_6`-eBaU6&DqkTTDdg#bEh{4#Iiiw
zy{Twr#fH*jdD|^Zo};Z75kB5G@a+sL=+CRtx<lS6R~D_>qQO%$ACzdw#3=)TM=+&_
zFIDJSeDV#0<`iNL+A0hauKmK<OqF}MKjwtf*A$TUS<`XGJ+C}?`oyi+R8(kj_jSfm
z5abAqaD@)sVg!85M(Uh-#^xAty->w&=Jt}4fDeXqnzzOUW0N4&q&%GjP7SeyMAC5X
z`V>R6l0aq2jJM8Bem=1(!a|(=$V1t$y5ptT(i9o~_qCmZH&w#bdZ??3P6@C^Aex`O
zI-V^taeAAFdy(B@tkEYr`R?Uj>{=U(wxu>x(qT0ug|MIMQf%e7-B%+$#EpVUeX&DZ
zVsdfPWn+A>%7w&F)h-XZt<)D^_|k{JGW8)@lbhjnA#S{GM@;j0IeF1#O2T3J6}M*E
zKESBq&}r^fJwcNh(dTdKNlouggx}QAt?fxCvN`s}FL~@JC&BjF1=mWY(e_jyD7fJX
z#y|6XppM*Z#*=sGmc;(tS#!y?i{}G?4N%n5R_?mL@>Ld*IIq-Kj+#Zv0+B;;yfVs-
zOrskSQ5s<gferyTST&d}*d>@=7>Q%28lgcXsQ~qDE*hhm6U5;>)l1zx;VAkxM?JK9
zXlVMjg3ckNr|#38%M71bv3GnPRwZpwg1s*YO(N3`<3vBP?6yL!5KoWd>`PDG9#=BK
zg>CWUATfxTdc-U+K$Ne?d_hp9Cn4F7-Wznx+_RE@qb%T!Z`8@n4DYed5h)Nd3~M9|
zYlmw2^<hhtTVPgnkiGPmJ;O8b!QQP-mhP+;Qk@RZ7Pmz#=40U=LZK>ji*W9>?PGxl
zv!?OySYFA;qL9+SGm`|eGj`{rB)u1sfsIuPOvW-4!!%S29V+r(#LOud^K%l?kv=Dz
z6dHMnCZr=zaYIhHKc1xg!ZX?4a-C0xyUrb1Sx$D>V7{n`Z<xCdBc&WA)+RbM(jr#`
zc{bza^UN<C-xyMfK44Owux*_n67Dy!4jn6WUsisA;O~mz?2*4h6L_)7JW?xA2<{5$
z<2!q;Uz94tRdHDG@7r;=2c_PGPbWA7b@L464sVA)HX;A2pMO=%0yPUQbaf2xkjIa@
zVL0J(b45&GNl>thNh9E)qDt{f?l&MAz;qZ;%23wMFj|)B?6e(wW_j<1%qPBk$$!}A
zz2mc^w>#-%Mrl9}u{Dm|=(M%$H2OL7Q109Ham*XAgI;9agAQjdNy++Q_bP1lWOC1k
z`$71VycicMbEe^vPBIfM62h0H0bG<LC&^}J@>QD__1c>!2r*W?nVTo+&|{v85!mk9
z+YVjQ7aSff{q?pd?qPj4L`)yugKVC^RQG7v>Hv?K^=Ro>mnE`0aZl^x;a%Q5A&R;5
zc(&RRLiB8-qmN)wQD=(90;w%DS3)z3zHkz)wP|vOAK1rFNtm!;CUHOsHtqIcrjL*!
zC77<ukJ}-gq>GE+LpSjdiqs>Ca6l?>U@mid^{^E=ZEM5ks|OYI(NTWflqXj$Wbpev
zYfiQ@S|uTwpdOV+yp(2WlAH1Iqy0|<b}LFY5d_bQUUa{5q%M*mOPPa}<YAEOzc0?l
zIA|uqFtA)UqU6Obd39d$nTk=ihk5m_D*0@uFYf1Y!!lI{)J(||sVfm@=Z(<9Fm?40
zuRA0Yy50%ji;^3baPWf4w-nbw;)_8+|G4m(S|uewKNg8pCPf;{?x8-8%(z{)d!9p=
zxxXeW!*0N3l!Qe)C%wGHQ`>LaepsojOos^D!8XF#Jr<g@=tE1f3?qx0^JcKjm|WIV
z)8>>!RCZh=i;~LiIhAq>%dbsvQ^@1P5KOY`A0L~WT1rhwG;6AVW|N&x>^fO;n8UL-
zlydOQvlNSvhLB`W**|EsG8^^cgd7M7*g4I?&)|RN@5F!5<sDvx!b>ABg-6je7b1U>
zg3PybzUCD9*&Zx|=-FCV((8i`b%J)*Hq#*v>+8g19hQp50F{X6E(5XJsMRaxwH<tY
zIlWxAVi!C}R$HPY71A{{J~3Hm5Wwm9>F()?O%sh3r+2))cw5QImSYst#d6sxp{yav
z4)7*b`CKCKFD&8dBhMarsXK-07bhy`J`_`VW11hA9*LyXfTP}|r|5DMpQ`vO8WZ(N
zVQ<3M+<Wp#jv_g%)K8VBUKGDi!hxxqtfZDNnlEMD9W#HV7#X=0O-nl1LQO?A08x|e
zU)?s8k$9dqR#qZ6;B_#9yY*IKSbzLdVw&<rxJ3S<AuUB!_I$XdMTr)5121AoLiIV)
zEUYMVlA_B68%;|o=M)ra30DO?La8@z+q^@aGBqn(4yiC}A?m_zOefK&G^P7~QAm>D
z_%KfsD+eBBF7<kH;p09nhY)XlmOMjt=89gBe~$oR84BB(A(y<Lp%c@3B-a_$q{Gv`
z@2HdP!;|<MaJvs2@rNYi?qh}{q|e+CBJ*l(3vXC`vv_SOYHeOUaAkWZxWh9pPQ^xv
zMkFqvFY)=|V_uvrBdjd035W3-Zz%qpm8zM0wd42aMIMikLm?=<*=0o5wDWruMp4}D
zD`4BPl6$H2l)V%(OBAXDdcoW&tc%^<9C4nr7A*ut(gx#ca|fCEr;(55{U6OA5TTN>
zA&M1g-_JwuVJX%Q8)wANTk1APmh=o$6i1D`508V0sYMF7tdOo96EhWv<$A1ShDs5x
zL4n6e)HZRiZRq}r><3_R3G1GKc}I-Khgr$A-39@D{bKXSd(|4-yyPJ^*3l?wc~dlA
z?Cggg|NDni(4Au4OXM#rjOEXg=8d0r&(JCI9f8k-v=^KvRbl+vwlh36Tn0ug64t??
zBOf5<(hK2O*yUFvdkT}5pCC5}XoU`-h0net%%l65f2irW-P(kxcc94~;gncWc_KGU
z-wft6*zAa(_7ahUU%A7vizL_q+Gu5LC~}MoFRKp<dOdElADbYGX)Bfqm*yU~W6H|o
z6f+V9Be?0p1EX1wD4HY%#lWbo>9+Kp7wo0cyfYNq^_Ac1!r#~<*D>epF|s4R5T9Ma
zLEL=Hkw(oJ{5ojh$rQ6kNmz1EeT~P`(|IeCkZ%QD#Hh5qE4EIxU0c)<8PX)l8Eleu
zNjngnqLW$KtRt)J##&|!8=m@porn4DEwAsPqKo0JUn>}?nXzs4vu^aWV#Phl?29kk
z#rx<Rh4nz5oC1EU)Iks;q`1W=mu3qsHLpsE1SKi~mSH?u3r5U{D2EMiJxGC7Z4+zW
z{2b=6_Eac&#?e6iOx^t$CrFd@Ipq#bfC_jF?#K3VbpsA=B)d-__bik)`y{V{!K5c}
zR*D96P-$vmZNemKYh-6^VQVJpZe(JA8?EZ^G3E0ysjkN;y>G&p$2H2-=yzmAJ|H`v
zXzz;d(YP0#wJnwJN>$^>sXSwl_lG8K4?&|U*~!6nGq^~zGxdh}{6FUuaIKJ5JH79s
zs>DOfqu545?d=o!2dQWrEm)W>XpL&tuH#XbUpG=ZD;u3JRVVN6>5e+OJ}pvylr=b5
zdmV$z4zG+Zr@RTL$e2EzLf;cGP=}+nxg|p=K&QjrJ4Zso=&Um|JgHWX9v7yiCbg1^
zwWN0sVLlc~s1#l98xZ&WreR~YhZ+1^>;;Nmp+h7meiiWtd>!pJe_aizP%g@4zKu3A
z>&iVJH-i^+A1vVs$L23sc=Ub@$`gQ2AEVIZ*%hESFF=2Ecj`|JP@<^2g_E-rs0J1I
z<hveXv?K*X3gsw3g0tW6P73VNo`OoCF{If$y8i-?!ZrT&E1wA1FhAn<7$IJ0NC<>?
z6W7bFZpY+rTHmyQzkVzr2;GW<&&&=xUcf$&2)od?8}KYX_c<lDk-F6jWI4*f4};4z
zLQK<QOT$A&#de#u`UP3@GFa$Otn_@sa?*B#?c+`BF{X#{5{9G}_l3f&g2#n8%5fPU
zsdCwj_`an{TRi@hAS==9s%tj*8K&9i-B@c;1d4QEmk$(Ly|;gxD#3$Qfs>G{Q~uu2
z5|aIUZ^n1$Sa!mm_$D)3O!H+f^gXJ{7^5k*hi1?cZCI+Cc{(Eia$`Nu5Har_puBY8
z!+NIzC2d^|tSyXX0W16-FbzbL2@0~(fGv8V8|7AMmhA}2w_e|i%A{)z^+#z{dAdTm
z;7mS;D5?2HD-#m=8<<Z#XIL(@pgor9N=u3d%kaYIAv#~DGw{;veWQgwq>g6&uJh1J
zHw?a41#m1T6ZYCk))Q+dfvdXnBIr%1_+AbDFPmD_CuNd#jg1myRR(0gh&G+4({(<<
zSm34Kn%PmoT#IBOTuv?+<ZP^i9phAE({eh;+0VTv?4Pw?tYks=#R^sEVSU7-nb}2|
z-J1e7^ClkqDk+>Vc8HxvV>@<OUYw5Ay%L!)5trn6u*dz!8R`51nUGu`dY~CRAGm~Q
zpx53!333_87RBGG)l9P)n*pM$LqGzz{$XIiZfz0~b{_%~P-iaiVZT$Qa(4gLrl7U8
zotugAZ<LA;D0N;_@ok#>353jHof68p@<GAGXZE>5vb3e=`Fks;<nA8;m&)Ce7<@4P
z%@02>r=@UowcXk$r!Yr5+B`ouKRZ;5(<2o`sCwi)9uFpA23fr55`P(P&QzG!N$iT?
zhoO;p4An)nwwo$76H(Um=OS1tADPC>wp8HG^4^&m@HdDRJVG|hSLLkcV9&wrsV22z
ztgT0;ZG0N3s{7H;H>;>R-oogs6{erQHMVGJc~Pd*hlT}<r4|1O6Tf92b<}sCaBs>C
ziIIG?y&(1Kw|1EEtB*eH6K3%W^D;ZGIw9b>B<){RcA9V3z?Gy62F$#*Y?(>RjQZDU
zoLjxtuzvLa2Iw;c&@028dR6hTH<7h)vN3QrG6zv-)bpy_ixI&$@Fac;)EFHKl$6vG
zBEw}(50b&9OODE!!xRn0!y;CzlAq&z0^`MakA{NqP+xlchJWR&+4bR97uZ#TRv5aS
z;CDz>!Z2d<<{Xp<gjARB1-ly`TJSm~u<zPGB)h`CP(y7BW8X7X99Ct+{FpAuRHd}R
zqPR<W<KH&qEQ>=vf#s0$Bu`1P*Nt2K<g7?#wuv$D#oT6|O2Om|0<1yKo@Rd8dIdI0
zZkUdWlFn{#+s(^?CzCUNF{+*80?_ELKEYnf1fA<E7FZ{y;?eiajJAlfItF&(cTy5U
zo*PX~@Xr$JM@@e-!<@OkUpD{v<@vm|XFWeq=kI}IK-`)r5JUn{C7`{35-b>Sa`S%)
z1?*7p_7_=E6+s3`IWeYhgJA#43IldK%|cRYVbcTt$O`xXUM~Jg`F^+U?>|{(1?42g
zM3q$-WySve@LR$^S%6=@KN<||_TeqS{}|cX0M43!FD~Lg*>7_!|DD7B@8iUO%!>L`
zR#?D{ZXfnf*8j~B|L|nApR#j;X8&Jr{X_D<+JcJI2>4S#@6uR*IX(K0$oDe`%`a$V
zWMcjEwaS0fZZ*fG4$kozc!h&NNdVwKDc>&{IC=Y1VFc~%{~9QOGJ2~fAsT_do(Jxy
z+`3Wyp7Q<r0LQ97GhB=<>?8oUGS()Jcf;VY#a>4PM_hbJ{<@s>1J+7<7fiw0z~gr;
z*6=b!M?fiGfFt9#hwZ+ne7}%Kzp$LmO>CY24&SL_XJzvDs0g&M4{}hvZX+NR0_%3S
zM{vHUd_O**v-_#ALI%#xCXOE8U%+>_-=IYQ<o9lGfOw4Jz$yb!#D7x0pAFE~|A~0F
z26OAj5levA!G`^pPqOd8d_QY`5T3AswY8yvk(IKEqwDXKxbx^ar!HU`aP*)!HR)e)
zHYSb+G6pWTM&`f6Q8~BBW1)kAIRIz)Z|^gGPx*cy4SvDdJG(gk?cD}cYxY@O5%oYd
z*auAPXRQgkfO70?><yfpzQ2dNwPuhQ<h=yE*W31k>AO(CcfKEo?=L)CX9FYW+uG&i
zWamh(4iwfz{(mFszn5o0g~bx2W>W%Q@jeo$um=8rhTko$_y_vYU`{YF8Bb8d{uuUW
zp0cqO+uh8k{NSw3z+zV-&>WKdq=44WyP1C<QoS2D90-j~3=Rgy3FwphCtSn8FE~eI
zJ68i?b4NQH6Jcu$pdS9Nu1JE%uA%}|@?WR~!~cQ$cPt~&*CP*`CnyI{Lw=z;js6Gf
z-?1w|sY%!iwL}1w`xh$o_<x}O?fV^+n)R-9?ABWs*DqA7$^St8&C5SJhQ7c6s1(0Y
zr>6e{mHloTuxu&-9KHh=O@E;>zWWbUj=QPur2?M005t$`Ch)Um_0RtYD(Br)+85y}
zBmh<K7g;Np{sWckZmPGODB~1Rp&)>M@#h{0d-eaP-pw4jWK+8jNIDAiK(_;=?<wDp
z>F92zx{0Bhg^Anus`b0d_4)mwkQxA1090_ha_~Ln`+0x(PvE=dJsgDN3kUk6UZA<Z
zy}0!~<@@1({14c>p{d@?%O!vUPJtE+|2q-*&iC890fCB`xLO#Q{I1X!+B?FTK+{|g
z^uD-1fkq+j{oMQh1-e_Fqem;^R)9f%g#Bx);5#YbFAp9RW8r9G<ZS2Y@yGUaZmM0-
z2PhyXP{5xDRr08yKu0?ZV{rrfA3?`K8x0~34GdF2I#i&;yuD5JJ>~nsWBwL)cR{P-
zK1Zzq{Uk9U+s~*{yx*aI)9gOINUuNwFf4#%Kco5yeuw%^Tf3>{n|B6CmG+BNs1JUJ
z`b`7-Tqm~vwt#%UpdOR{4)vQ>waBIKT^>-Owt))ua{;x<e~0=_Q@WU3*-Q?gdH|_@
zHV1C1-=R2uXY-bQDGdq$XcDlkpXExU`7P{jbI?3oRe60|tJOj4Atl3aP<MkW;3RR!
z07ICC2bBq16$AvVy_rgwSlj<@h<T6piT&;Brz@Z@lJBMteCPX-Xn~+^m-18`4Q!nN
zN4>w(mNFS>5FLQh0p8-zxCQM$;eKQFRGwxRtH5}A1XytR`Av%I{Q-Bk*3c!A@HYY3
z1c5h6_ES*}UGIRY+FRQh82@{}^4~4R?KJ-3SrmFNC7>%MFff9jfT13D0i7+Z?-=vm
zk~((#(pvzrE`aV2gp>_J5;w6Eas;MacT5RyNjk2}MN|OE80bW9{Z)KVK)>|zSJLl?
z`M0c)C)0`W04w7c)>;`T%l;2jhFcav99-}LU=+<joBy+1)U_Zi31?^f-%fjPS#@Hg
zF+Knb6PSxLe=i{Lo$sg62*Q%Fur)DolriwIb8%L-Gj*0W@i4SAa5NS%aR&O8U+v@;
z4_w(%nFeZCC{S$DpYTL&Ab2?wXE!@Xt3Rvp<F{9Px1%LwK;)n8j-~r<9>|S0P`d+n
zi?DbO^iDj$bnfR$meBi0;N9gNhmSk`cYNOOMb7s#9tXw!JJ>1nU5&u40;xtUhx~yi
zGa48w{45{E)E|L&%Lf|9{fB&8vwy<<6Vx44f1n|?e*jD7{|vmNnYt}7XoTY*KpSA1
z{L`w0+`l#WPrPGL2|**y{s1zr{t<Y$20<fH{=k`R{0a9@TuM;+Kw}mD0LE|q5qP(J
zpz+{-;Cy!fg!?Bt9H@MtQNw-!i}(Ksyjwod*hfEbEXRMq{R+EXMFe$&{{!Z74Fdb&
zmi>oQ{C^kq76<Cr{Ri&jr{CiK@$&v}+N~vn`ndi<WBUd|1NC?fiUM`U`~x+6^9$-<
zu9-nOpuX^aaI)dRf394=ddB-V>{eT#?wo$WXi-35x9ibAId}Ru>sD8w-iCg#W`Sjw
zpKARr>mT1k|K{Av1nR8g2WJ)Q4$j@KJ3yhJJ|TWUM{(|g{>wuIC<^o%_77Ac;croY
z=)!Kx40<{92Xh1HDu2=4Up}_}I0pnhANqq>!~9#~9j8S>OAmUk?FUzx?f>EaTK{j&
z2K3Cq4<HOL2=GrQ5dJOaEf#bu{s&fq?=I|bH|9aXpj*^Gz+wD%f&c#vYtScv?%4i#
y!lJ-kPxvqUx1i4e-M#$r3|7Irp7DphOa*BuU{DMOrV0Fv;sb{tgn+>v*#7~CYE{Vq

literal 0
HcmV?d00001

diff --git a/apps/files_odfviewer/src/webodf/programs/android/res/drawable-hdpi/ic_launcher.png b/apps/files_odfviewer/src/webodf/programs/android/res/drawable-hdpi/ic_launcher.png
new file mode 100644
index 0000000000000000000000000000000000000000..8074c4c571b8cd19e27f4ee5545df367420686d7
GIT binary patch
literal 4147
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

literal 0
HcmV?d00001

diff --git a/apps/files_odfviewer/src/webodf/programs/android/res/drawable-ldpi/ic_launcher.png b/apps/files_odfviewer/src/webodf/programs/android/res/drawable-ldpi/ic_launcher.png
new file mode 100644
index 0000000000000000000000000000000000000000..1095584ec21f71cd0afc9e0993aa2209671b590c
GIT binary patch
literal 1723
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
Rn%e*X002ovPDHLkV1g`*Fem^3

literal 0
HcmV?d00001

diff --git a/apps/files_odfviewer/src/webodf/programs/android/res/drawable-mdpi/ic_launcher.png b/apps/files_odfviewer/src/webodf/programs/android/res/drawable-mdpi/ic_launcher.png
new file mode 100644
index 0000000000000000000000000000000000000000..a07c69fa5a0f4da5d5efe96eea12a543154dbab6
GIT binary patch
literal 2574
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

literal 0
HcmV?d00001

diff --git a/apps/files_odfviewer/src/webodf/programs/android/res/drawable/icon.png b/apps/files_odfviewer/src/webodf/programs/android/res/drawable/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..13ee5e8612c886a9605b147d3e3c9e0fcd0e326a
GIT binary patch
literal 3535
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
JPDHLkV1lAbd;S0b

literal 0
HcmV?d00001

diff --git a/apps/files_odfviewer/src/webodf/programs/android/res/layout/listitem.xml b/apps/files_odfviewer/src/webodf/programs/android/res/layout/listitem.xml
new file mode 100644
index 0000000000..f0958d609d
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/programs/android/res/layout/listitem.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:padding="10dp"
+    android:textSize="16sp" >
+</TextView>
\ No newline at end of file
diff --git a/apps/files_odfviewer/src/webodf/programs/android/res/layout/main.xml b/apps/files_odfviewer/src/webodf/programs/android/res/layout/main.xml
new file mode 100644
index 0000000000..bc12cd8231
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/programs/android/res/layout/main.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:orientation="vertical" >
+
+    <TextView
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:text="@string/hello" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/apps/files_odfviewer/src/webodf/programs/android/res/layout/selector.xml b/apps/files_odfviewer/src/webodf/programs/android/res/layout/selector.xml
new file mode 100644
index 0000000000..4af1380e95
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/programs/android/res/layout/selector.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:orientation="vertical"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent" >
+
+    <ScrollView
+        android:layout_width="fill_parent" 
+        android:layout_height="fill_parent">
+        
+        <TextView android:id="@+id/noteview"  
+	          android:layout_width="fill_parent" 
+            android:layout_height="fill_parent"
+            android:textSize="10pt" />
+	  </ScrollView>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/apps/files_odfviewer/src/webodf/programs/android/res/values/strings.xml b/apps/files_odfviewer/src/webodf/programs/android/res/values/strings.xml
new file mode 100644
index 0000000000..44673ed78b
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/programs/android/res/values/strings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+    <string name="hello">Hello World, WebODFActivity!</string>
+    <string name="app_name">WebODF</string>
+
+</resources>
\ No newline at end of file
diff --git a/apps/files_odfviewer/src/webodf/programs/android/res/xml/phonegap.xml b/apps/files_odfviewer/src/webodf/programs/android/res/xml/phonegap.xml
new file mode 100755
index 0000000000..97f31ea110
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/programs/android/res/xml/phonegap.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<phonegap>
+    <access origin="http://127.0.0.1*"/>
+    <log level="DEBUG"/>
+</phonegap>
diff --git a/apps/files_odfviewer/src/webodf/programs/android/res/xml/plugins.xml b/apps/files_odfviewer/src/webodf/programs/android/res/xml/plugins.xml
new file mode 100644
index 0000000000..3d8d48d838
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/programs/android/res/xml/plugins.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<plugins>
+    <plugin name="App" value="com.phonegap.App"/>
+    <plugin name="Geolocation" value="com.phonegap.GeoBroker"/>
+    <plugin name="Device" value="com.phonegap.Device"/>
+    <plugin name="Accelerometer" value="com.phonegap.AccelListener"/>
+    <plugin name="Compass" value="com.phonegap.CompassListener"/>
+    <plugin name="Media" value="com.phonegap.AudioHandler"/>
+    <plugin name="Camera" value="com.phonegap.CameraLauncher"/>
+    <plugin name="Contacts" value="com.phonegap.ContactManager"/>
+    <plugin name="Crypto" value="com.phonegap.CryptoHandler"/>
+    <plugin name="File" value="com.phonegap.FileUtils"/>
+    <plugin name="Network Status" value="com.phonegap.NetworkManager"/>
+    <plugin name="Notification" value="com.phonegap.Notification"/>
+    <plugin name="Storage" value="com.phonegap.Storage"/>
+    <plugin name="Temperature" value="com.phonegap.TempListener"/>
+    <plugin name="FileTransfer" value="com.phonegap.FileTransfer"/>
+    <plugin name="Capture" value="com.phonegap.Capture"/>
+</plugins>
\ No newline at end of file
diff --git a/apps/files_odfviewer/src/webodf/programs/android/src/org/webodf/WebODFActivity.java b/apps/files_odfviewer/src/webodf/programs/android/src/org/webodf/WebODFActivity.java
new file mode 100644
index 0000000000..9c826c9210
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/programs/android/src/org/webodf/WebODFActivity.java
@@ -0,0 +1,33 @@
+package org.webodf;
+
+import android.os.Bundle;
+
+import com.phonegap.DroidGap;
+
+public class WebODFActivity extends DroidGap {
+
+	private String path;
+
+	/** Called when the activity is first created. */
+	@Override
+	public void onCreate(Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
+		path = null;
+		if (getIntent() != null && getIntent().getData() != null) {
+			path = getIntent().getData().getPath();
+		}
+		setContentView(R.layout.main);
+		super.loadUrl("file:///android_asset/www/index.html");
+	}
+
+	@Override
+	protected void onResume() {
+		super.onResume();
+		if (path == null) {
+			return;
+		}
+		String escapedPath = "file://" + path.replace("'", "\\'");
+		sendJavascript("invokeString = '" + escapedPath + "';");
+	}
+
+}
\ No newline at end of file
diff --git a/apps/files_odfviewer/src/webodf/programs/android/updateWebODF.sh b/apps/files_odfviewer/src/webodf/programs/android/updateWebODF.sh
new file mode 100755
index 0000000000..b51e94290b
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/programs/android/updateWebODF.sh
@@ -0,0 +1,3 @@
+# /bin/bash
+cd assets
+for f in `find . -type f`; do cp ../../webodf/$f $f; done
diff --git a/apps/files_odfviewer/src/webodf/programs/docnosis/CMakeLists.txt b/apps/files_odfviewer/src/webodf/programs/docnosis/CMakeLists.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/apps/files_odfviewer/src/webodf/programs/docnosis/OpenDocument-manifest-schema-v1.0-os.rng b/apps/files_odfviewer/src/webodf/programs/docnosis/OpenDocument-manifest-schema-v1.0-os.rng
new file mode 100644
index 0000000000..97fe580eab
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/programs/docnosis/OpenDocument-manifest-schema-v1.0-os.rng
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    OASIS OpenDocument v1.0
+    OASIS standard, 1 May 2005
+    Relax-NG Manifest Schema
+
+    $Id$
+
+    © 2002-2005 OASIS Open
+    © 1999-2005 Sun Microsystems, Inc.
+-->
+
+<grammar 
+    xmlns="http://relaxng.org/ns/structure/1.0"
+
+    datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
+
+    xmlns:manifest="urn:oasis:names:tc:opendocument:xmlns:manifest:1.0">
+<define name="manifest">
+    <element name="manifest:manifest">
+        <oneOrMore>
+            <ref name="file-entry"/>
+        </oneOrMore>
+    </element>
+</define>
+
+<start>
+    <choice>
+        <ref name="manifest"/>
+    </choice>
+</start>
+<define name="file-entry">
+    <element name="manifest:file-entry">
+        <ref name="file-entry-attlist"/>
+        <optional>
+            <ref name="encryption-data"/>
+        </optional>
+    </element>
+</define>
+<define name="file-entry-attlist" combine="interleave">
+    <attribute name="manifest:full-path">
+        <data type="string"/>
+    </attribute>
+</define>
+<define name="file-entry-attlist" combine="interleave">
+    <optional>
+        <attribute name="manifest:size">
+            <data type="nonNegativeInteger"/>
+        </attribute>
+    </optional>
+</define>
+<define name="file-entry-attlist" combine="interleave">
+    <attribute name="manifest:media-type">
+        <data type="string"/>
+    </attribute>
+</define>
+<define name="encryption-data">
+    <element name="manifest:encryption-data">
+        <ref name="encryption-data-attlist"/>
+        <ref name="algorithm"/>
+        <ref name="key-derivation"/>
+    </element>
+</define>
+<define name="encryption-data-attlist" combine="interleave">
+    <attribute name="manifest:checksum-type">
+        <data type="string"/>
+    </attribute>
+</define>
+<define name="encryption-data-attlist" combine="interleave">
+    <attribute name="manifest:checksum">
+        <data type="base64Binary"/>
+    </attribute>
+</define>
+<define name="algorithm">
+    <element name="manifest:algorithm">
+        <ref name="algorithm-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="algorithm-attlist" combine="interleave">
+    <attribute name="manifest:algorithm-name">
+        <data type="string"/>
+    </attribute>
+</define>
+<define name="algorithm-attlist" combine="interleave">
+    <attribute name="manifest:initialisation-vector">
+        <data type="base64Binary"/>
+    </attribute>
+</define>
+<define name="key-derivation">
+    <element name="manifest:key-derivation">
+        <ref name="key-derivation-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="key-derivation-attlist" combine="interleave">
+    <attribute name="manifest:key-derivation-name">
+        <data type="string"/>
+    </attribute>
+</define>
+<define name="key-derivation-attlist" combine="interleave">
+    <attribute name="manifest:salt">
+        <data type="base64Binary"/>
+    </attribute>
+</define>
+<define name="key-derivation-attlist" combine="interleave">
+    <attribute name="manifest:iteration-count">
+            <data type="nonNegativeInteger"/>
+        </attribute>
+</define>
+</grammar>
diff --git a/apps/files_odfviewer/src/webodf/programs/docnosis/OpenDocument-manifest-schema-v1.1.rng b/apps/files_odfviewer/src/webodf/programs/docnosis/OpenDocument-manifest-schema-v1.1.rng
new file mode 100644
index 0000000000..4082d4ba95
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/programs/docnosis/OpenDocument-manifest-schema-v1.1.rng
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    OASIS OpenDocument v1.1
+    OASIS Standard, 1 Feb 2007
+    Relax-NG Manifest Schema
+
+    $Id$
+
+    © 2002-2007 OASIS Open
+    © 1999-2007 Sun Microsystems, Inc.
+-->
+
+<grammar 
+    xmlns="http://relaxng.org/ns/structure/1.0"
+
+    datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
+
+    xmlns:manifest="urn:oasis:names:tc:opendocument:xmlns:manifest:1.0">
+<define name="manifest">
+    <element name="manifest:manifest">
+        <oneOrMore>
+            <ref name="file-entry"/>
+        </oneOrMore>
+    </element>
+</define>
+
+<start>
+    <choice>
+        <ref name="manifest"/>
+    </choice>
+</start>
+<define name="file-entry">
+    <element name="manifest:file-entry">
+        <ref name="file-entry-attlist"/>
+        <optional>
+            <ref name="encryption-data"/>
+        </optional>
+    </element>
+</define>
+<define name="file-entry-attlist" combine="interleave">
+    <attribute name="manifest:full-path">
+        <data type="string"/>
+    </attribute>
+</define>
+<define name="file-entry-attlist" combine="interleave">
+    <optional>
+        <attribute name="manifest:size">
+            <data type="nonNegativeInteger"/>
+        </attribute>
+    </optional>
+</define>
+<define name="file-entry-attlist" combine="interleave">
+    <attribute name="manifest:media-type">
+        <data type="string"/>
+    </attribute>
+</define>
+<define name="encryption-data">
+    <element name="manifest:encryption-data">
+        <ref name="encryption-data-attlist"/>
+        <ref name="algorithm"/>
+        <ref name="key-derivation"/>
+    </element>
+</define>
+<define name="encryption-data-attlist" combine="interleave">
+    <attribute name="manifest:checksum-type">
+        <data type="string"/>
+    </attribute>
+</define>
+<define name="encryption-data-attlist" combine="interleave">
+    <attribute name="manifest:checksum">
+        <data type="base64Binary"/>
+    </attribute>
+</define>
+<define name="algorithm">
+    <element name="manifest:algorithm">
+        <ref name="algorithm-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="algorithm-attlist" combine="interleave">
+    <attribute name="manifest:algorithm-name">
+        <data type="string"/>
+    </attribute>
+</define>
+<define name="algorithm-attlist" combine="interleave">
+    <attribute name="manifest:initialisation-vector">
+        <data type="base64Binary"/>
+    </attribute>
+</define>
+<define name="key-derivation">
+    <element name="manifest:key-derivation">
+        <ref name="key-derivation-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="key-derivation-attlist" combine="interleave">
+    <attribute name="manifest:key-derivation-name">
+        <data type="string"/>
+    </attribute>
+</define>
+<define name="key-derivation-attlist" combine="interleave">
+    <attribute name="manifest:salt">
+        <data type="base64Binary"/>
+    </attribute>
+</define>
+<define name="key-derivation-attlist" combine="interleave">
+    <attribute name="manifest:iteration-count">
+            <data type="nonNegativeInteger"/>
+        </attribute>
+</define>
+</grammar>
diff --git a/apps/files_odfviewer/src/webodf/programs/docnosis/OpenDocument-schema-v1.0-os.rng b/apps/files_odfviewer/src/webodf/programs/docnosis/OpenDocument-schema-v1.0-os.rng
new file mode 100644
index 0000000000..cf4ee51741
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/programs/docnosis/OpenDocument-schema-v1.0-os.rng
@@ -0,0 +1,17666 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    OASIS OpenDocument v1.0
+    OASIS Standard, 1 May 2005
+    Relax-NG Schema
+
+    $Id$
+
+    © 2002-2005 OASIS Open
+    © 1999-2005 Sun Microsystems, Inc.
+-->
+
+<grammar
+    xmlns="http://relaxng.org/ns/structure/1.0"
+    xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
+
+    datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
+
+    xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
+    xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0"
+    xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0"
+    xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
+    xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0"
+    xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
+    xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0"
+    xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0"
+    xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
+    xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0"
+    xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0"
+    xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
+    xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0"
+    xmlns:anim="urn:oasis:names:tc:opendocument:xmlns:animation:1.0"
+
+    xmlns:dc="http://purl.org/dc/elements/1.1/"
+    xmlns:xlink="http://www.w3.org/1999/xlink"
+    xmlns:math="http://www.w3.org/1998/Math/MathML"
+    xmlns:xforms="http://www.w3.org/2002/xforms"
+
+    xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0"
+    xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0"
+    xmlns:smil="urn:oasis:names:tc:opendocument:xmlns:smil-compatible:1.0"
+>
+<define name="office-process-content">
+    <optional>
+        <attribute name="office:process-content" a:defaultValue="true">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<start>
+    <choice>
+        <ref name="office-document"/>
+        <ref name="office-document-content"/>
+        <ref name="office-document-styles"/>
+        <ref name="office-document-meta"/>
+        <ref name="office-document-settings"/>
+    </choice>
+</start>
+<define name="office-document">
+    <element name="office:document">
+        <ref name="office-document-attrs"/>
+        <ref name="office-document-common-attrs"/>
+        <ref name="office-meta"/>
+        <ref name="office-settings"/>
+        <ref name="office-scripts"/>
+        <ref name="office-font-face-decls"/>
+        <ref name="office-styles"/>
+        <ref name="office-automatic-styles"/>
+        <ref name="office-master-styles"/>
+        <ref name="office-body"/>
+    </element>
+</define>
+<define name="office-document-content">
+    <element name="office:document-content">
+        <ref name="office-document-common-attrs"/>
+        <ref name="office-scripts"/>
+        <ref name="office-font-face-decls"/>
+        <ref name="office-automatic-styles"/>
+        <ref name="office-body"/>
+    </element>
+</define>
+<define name="office-document-styles">
+    <element name="office:document-styles">
+        <ref name="office-document-common-attrs"/>
+        <ref name="office-font-face-decls"/>
+        <ref name="office-styles"/>
+        <ref name="office-automatic-styles"/>
+        <ref name="office-master-styles"/>
+    </element>
+</define>
+<define name="office-document-meta">
+    <element name="office:document-meta">
+        <ref name="office-document-common-attrs"/>
+        <ref name="office-meta"/>
+    </element>
+</define>
+<define name="office-document-settings">
+    <element name="office:document-settings">
+        <ref name="office-document-common-attrs"/>
+        <ref name="office-settings"/>
+    </element>
+</define>
+<define name="office-document-common-attrs" combine="interleave">
+    <optional>
+        <attribute name="office:version">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="office-document-attrs" combine="interleave">
+    <attribute name="office:mimetype">
+        <ref name="string"/>
+    </attribute>
+</define>
+<define name="office-meta">
+    <optional>
+        <element name="office:meta">
+            <ref name="office-meta-content"/>
+        </element>
+    </optional>
+</define>
+
+<define name="office-meta-content">
+    <ref name="anyElements"/>
+</define>
+
+<define name="office-meta-content-strict">
+    <zeroOrMore>
+        <ref name="office-meta-data"/>
+    </zeroOrMore>
+</define>
+<define name="office-body">
+    <element name="office:body">
+        <ref name="office-body-content"/>
+    </element>
+</define>
+<define name="office-body-content" combine="choice">
+    <element name="office:text">
+        <ref name="office-text-attlist"/>
+        <ref name="office-text-content-prelude"/>
+        <zeroOrMore>
+            <ref name="office-text-content-main"/>
+        </zeroOrMore>
+        <ref name="office-text-content-epilogue"/>
+    </element>
+</define>
+<define name="office-text-content-prelude">
+    <ref name="office-forms"/>
+    <ref name="text-tracked-changes"/>
+    <ref name="text-decls"/>
+    <ref name="table-decls"/>
+</define>
+<define name="office-text-content-main">
+    <choice>
+        <zeroOrMore>
+            <ref name="text-content"/>
+        </zeroOrMore>
+        <group>
+            <ref name="text-page-sequence"/>
+            <zeroOrMore>
+                <choice>
+                    <ref name="draw-a"/>
+                    <ref name="shape"/>
+                </choice>
+            </zeroOrMore>
+        </group>
+    </choice>
+</define>
+
+<define name="text-content">
+    <choice>
+        <ref name="text-h"/>
+        <ref name="text-p"/>
+        <ref name="text-list"/>
+        <ref name="text-numbered-paragraph"/>
+        <ref name="table-table"/>
+        <ref name="draw-a"/>
+        <ref name="text-section"/>
+        <ref name="text-table-of-content"/>
+        <ref name="text-illustration-index"/>
+        <ref name="text-table-index"/>
+        <ref name="text-object-index"/>
+        <ref name="text-user-index"/>
+        <ref name="text-alphabetical-index"/>
+        <ref name="text-bibliography"/>
+        <ref name="shape"/>
+        <ref name="change-marks"/>
+    </choice>
+</define>
+<define name="office-text-content-epilogue">
+    <ref name="table-functions"/>
+</define>
+<define name="office-text-attlist" combine="interleave">
+    <optional>
+        <attribute name="text:global" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="office-body-content" combine="choice">
+    <element name="office:drawing">
+        <ref name="office-drawing-attlist"/>
+        <ref name="office-drawing-content-prelude"/>
+        <ref name="office-drawing-content-main"/>
+        <ref name="office-drawing-content-epilogue"/>
+    </element>
+</define>
+
+<define name="office-drawing-attlist">
+    <empty/>
+</define>
+<define name="office-drawing-content-prelude">
+    <ref name="text-decls"/>
+    <ref name="table-decls"/>
+</define>
+<define name="office-drawing-content-main">
+    <zeroOrMore>
+        <ref name="draw-page"/>
+    </zeroOrMore>
+</define>
+<define name="office-drawing-content-epilogue">
+    <ref name="table-functions"/>
+</define>
+<define name="office-body-content" combine="choice">
+    <element name="office:presentation">
+        <ref name="office-presentation-attlist"/>
+        <ref name="office-presentation-content-prelude"/>
+        <ref name="office-presentation-content-main"/>
+        <ref name="office-presentation-content-epilogue"/>
+    </element>
+</define>
+
+<define name="office-presentation-attlist">
+    <empty/>
+</define>
+<define name="office-presentation-content-prelude">
+    <ref name="text-decls"/>
+    <ref name="table-decls"/>
+    <ref name="presentation-decls"/>
+</define>
+<define name="office-presentation-content-main">
+    <zeroOrMore>
+        <ref name="draw-page"/>
+    </zeroOrMore>
+</define>
+<define name="office-presentation-content-epilogue">
+    <ref name="presentation-settings"/>
+    <ref name="table-functions"/>
+</define>
+<define name="office-body-content" combine="choice">
+    <element name="office:spreadsheet">
+        <ref name="office-spreadsheet-attlist"/>
+        <ref name="office-spreadsheet-content-prelude"/>
+        <ref name="office-spreadsheet-content-main"/>
+        <ref name="office-spreadsheet-content-epilogue"/>
+    </element>
+</define>
+<define name="office-spreadsheet-content-prelude">
+    <optional>
+        <ref name="table-tracked-changes"/>    
+    </optional>
+    <ref name="text-decls"/>
+    <ref name="table-decls"/>
+</define>
+
+<define name="table-decls">
+    <optional>
+        <ref name="table-calculation-settings"/>    
+    </optional>
+    <optional>
+        <ref name="table-content-validations"/>    
+    </optional>
+    <optional>
+        <ref name="table-label-ranges"/>    
+    </optional>
+</define>
+<define name="office-spreadsheet-content-main">
+    <zeroOrMore>
+        <ref name="table-table"/>
+    </zeroOrMore>
+</define>
+<define name="office-spreadsheet-content-epilogue">
+    <ref name="table-functions"/>    
+</define>
+
+<define name="table-functions">
+    <optional>
+        <ref name="table-named-expressions"/>    
+    </optional>
+    <optional>
+        <ref name="table-database-ranges"/>    
+    </optional>
+    <optional>
+        <ref name="table-data-pilot-tables"/>    
+    </optional>
+    <optional>
+        <ref name="table-consolidation"/>    
+    </optional>
+    <optional>
+        <ref name="table-dde-links"/>    
+    </optional>
+</define>
+<define name="office-body-content" combine="choice">
+    <element name="office:chart">
+        <ref name="office-chart-attlist"/>
+        <ref name="office-chart-content-prelude"/>
+        <ref name="office-chart-content-main"/>
+        <ref name="office-chart-content-epilogue"/>
+    </element>
+</define>
+
+<define name="office-chart-attlist">
+    <empty/>
+</define>
+<define name="office-chart-content-prelude">
+    <ref name="text-decls"/>
+    <ref name="table-decls"/>
+</define>
+<define name="office-chart-content-main">
+    <ref name="chart-chart"/>
+</define>
+<define name="office-chart-content-epilogue">
+    <ref name="table-functions"/>    
+</define>
+<define name="office-body-content" combine="choice">
+    <element name="office:image">
+        <ref name="office-image-attlist"/>
+        <ref name="office-image-content-prelude"/>
+        <ref name="office-image-content-main"/>
+        <ref name="office-image-content-epilogue"/>
+    </element>
+</define>
+
+<define name="office-image-attlist">
+    <empty/>
+</define>
+<define name="office-image-content-prelude">
+    <empty/>
+</define>
+<define name="office-image-content-main">
+    <ref name="draw-frame"/>
+</define>
+<define name="office-image-content-epilogue">
+    <empty/>
+</define>
+<define name="office-settings">
+    <optional>
+        <element name="office:settings">
+            <oneOrMore>
+                <ref name="config-config-item-set"/>
+            </oneOrMore>
+        </element>
+    </optional>
+</define>
+<define name="config-config-item-set">
+    <element name="config:config-item-set">
+        <ref name="config-config-item-set-attlist"/>
+        <ref name="config-items"/>
+    </element>
+</define>
+
+<define name="config-items">
+    <oneOrMore>
+        <choice>
+            <ref name="config-config-item"/>
+            <ref name="config-config-item-set"/>
+            <ref name="config-config-item-map-named"/>
+            <ref name="config-config-item-map-indexed"/>
+        </choice>
+    </oneOrMore>
+</define>
+<define name="config-config-item-set-attlist" combine="interleave">
+    <attribute name="config:name">
+        <ref name="string"/>
+    </attribute>
+</define>
+<define name="config-config-item">
+    <element name="config:config-item">
+        <ref name="config-config-item-attlist"/>
+        <text/>
+    </element>
+</define>
+<define name="config-config-item-attlist" combine="interleave">
+    <attribute name="config:name">
+        <ref name="string"/>
+    </attribute>
+</define>
+<define name="config-config-item-attlist" combine="interleave">
+    <attribute name="config:type">
+        <choice>
+            <value>boolean</value>
+            <value>short</value>
+            <value>int</value>
+            <value>long</value>
+            <value>double</value>
+            <value>string</value>
+            <value>datetime</value>
+            <value>base64Binary</value>
+        </choice>
+    </attribute>
+</define>
+<define name="config-config-item-map-indexed">
+    <element name="config:config-item-map-indexed">
+        <ref name="config-config-item-map-indexed-attlist"/>
+        <oneOrMore>
+            <ref name="config-config-item-map-entry"/>
+        </oneOrMore>
+    </element>
+</define>
+<define name="config-config-item-map-indexed-attlist" combine="interleave">
+    <attribute name="config:name">
+        <ref name="string"/>
+    </attribute>
+</define>
+<define name="config-config-item-map-entry">
+    <element name="config:config-item-map-entry">
+        <ref name="config-config-item-map-entry-attlist"/>
+        <ref name="config-items"/>
+    </element>
+</define>
+<define name="config-config-item-map-entry-attlist" combine="interleave">
+    <optional>
+        <attribute name="config:name">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="config-config-item-map-named">
+    <element name="config:config-item-map-named">
+        <ref name="config-config-item-map-named-attlist"/>
+        <oneOrMore>
+            <ref name="config-config-item-map-entry"/>
+        </oneOrMore>
+    </element>
+</define>
+<define name="config-config-item-map-named-attlist" combine="interleave">
+    <attribute name="config:name">
+        <ref name="string"/>
+    </attribute>
+</define>
+<define name="office-scripts">
+    <optional>
+        <element name="office:scripts">
+            <zeroOrMore>
+                <ref name="office-script"/>
+            </zeroOrMore>
+            <optional>
+                <ref name="office-event-listeners"/>
+            </optional>
+        </element>
+    </optional>
+</define>
+<define name="office-script">
+    <element name="office:script">
+        <ref name="office-script-attlist"/>
+        <mixed>
+            <ref name="anyElements"/>
+        </mixed>
+    </element>
+</define>
+<define name="office-script-attlist">
+    <attribute name="script:language">
+        <ref name="string"/>
+    </attribute>
+</define>
+<define name="office-font-face-decls">
+    <optional>
+        <element name="office:font-face-decls">
+            <zeroOrMore>
+                <ref name="style-font-face"/>
+            </zeroOrMore>
+        </element>
+    </optional>
+</define>
+<define name="office-styles">
+    <optional>
+        <element name="office:styles">
+            <interleave>
+                <ref name="styles"/>
+                <zeroOrMore>
+                    <ref name="style-default-style"/>
+                </zeroOrMore>
+                <optional>
+                    <ref name="text-outline-style"/>
+                </optional>
+                <zeroOrMore>
+                    <ref name="text-notes-configuration"/>
+                </zeroOrMore>
+                <optional>
+                    <ref name="text-bibliography-configuration"/>
+                </optional>
+                <optional>
+                    <ref name="text-linenumbering-configuration"/>
+                </optional>
+                <zeroOrMore>
+                    <ref name="draw-gradient"/>
+                </zeroOrMore>
+                <zeroOrMore>
+                    <ref name="svg-linearGradient"/>
+                </zeroOrMore>
+                <zeroOrMore>
+                    <ref name="svg-radialGradient"/>
+                </zeroOrMore>
+                <zeroOrMore>
+                    <ref name="draw-hatch"/>
+                </zeroOrMore>
+                <zeroOrMore>
+                    <ref name="draw-fill-image"/>
+                </zeroOrMore>
+                <zeroOrMore>
+                    <ref name="draw-marker"/>
+                </zeroOrMore>
+                <zeroOrMore>
+                    <ref name="draw-stroke-dash"/>
+                </zeroOrMore>
+                <zeroOrMore>
+                    <ref name="draw-opacity"/>
+                </zeroOrMore>
+                <zeroOrMore>
+                    <ref name="style-presentation-page-layout"/>
+                </zeroOrMore>
+            </interleave>
+        </element>
+    </optional>
+</define>
+<define name="office-automatic-styles">
+    <optional>
+        <element name="office:automatic-styles">
+            <interleave>
+                <ref name="styles"/>
+                <zeroOrMore>
+                    <ref name="style-page-layout"/>
+                </zeroOrMore>
+            </interleave>
+        </element>
+    </optional>
+</define>
+<define name="office-master-styles">
+    <optional>
+        <element name="office:master-styles">
+            <interleave>
+                <zeroOrMore>
+                    <ref name="style-master-page"/>
+                </zeroOrMore>
+                <optional>
+                    <ref name="style-handout-master"/>
+                </optional>
+                <optional>
+                    <ref name="draw-layer-set"/>
+                </optional>
+            </interleave>
+        </element>
+    </optional>
+</define>
+
+<define name="styles">
+    <interleave>
+        <zeroOrMore>
+            <ref name="style-style"/>
+        </zeroOrMore>
+        <zeroOrMore>
+            <ref name="text-list-style"/>
+        </zeroOrMore>
+        <zeroOrMore>
+            <ref name="number-number-style"/>
+        </zeroOrMore>
+        <zeroOrMore>
+            <ref name="number-currency-style"/>
+        </zeroOrMore>
+        <zeroOrMore>
+            <ref name="number-percentage-style"/>
+        </zeroOrMore>
+        <zeroOrMore>
+            <ref name="number-date-style"/>
+        </zeroOrMore>
+        <zeroOrMore>
+            <ref name="number-time-style"/>
+        </zeroOrMore>
+        <zeroOrMore>
+            <ref name="number-boolean-style"/>
+        </zeroOrMore>
+        <zeroOrMore>
+            <ref name="number-text-style"/>
+        </zeroOrMore>
+    </interleave>
+</define>
+<define name="office-meta-data" combine="choice">
+    <element name="meta:generator">
+        <ref name="string"/>
+    </element>
+</define>
+<define name="office-meta-data" combine="choice">
+    <element name="dc:title">
+        <ref name="string"/>
+    </element>
+</define>
+<define name="office-meta-data" combine="choice">
+    <element name="dc:description">
+        <ref name="string"/>
+    </element>
+</define>
+<define name="office-meta-data" combine="choice">
+    <element name="dc:subject">
+        <ref name="string"/>
+    </element>
+</define>
+<define name="office-meta-data" combine="choice">
+    <element name="meta:keyword">
+        <ref name="string"/>
+    </element>
+</define>
+<define name="office-meta-data" combine="choice">
+    <element name="meta:initial-creator">
+        <ref name="string"/>
+    </element>
+</define>
+<define name="office-meta-data" combine="choice">
+    <ref name="dc-creator"/>
+</define>
+<define name="dc-creator">
+    <element name="dc:creator">
+        <ref name="string"/>
+    </element>
+</define>
+<define name="office-meta-data" combine="choice">
+    <element name="meta:printed-by">
+        <ref name="string"/>
+    </element>
+</define>
+<define name="office-meta-data" combine="choice">
+    <element name="meta:creation-date">
+        <ref name="dateTime"/>
+    </element>
+</define>
+<define name="office-meta-data" combine="choice">
+    <ref name="dc-date"/>
+</define>
+<define name="dc-date">
+    <element name="dc:date">
+        <ref name="dateTime"/>
+    </element>
+</define>
+<define name="office-meta-data" combine="choice">
+    <element name="meta:print-date">
+        <ref name="dateTime"/>
+    </element>
+</define>
+<define name="office-meta-data" combine="choice">
+    <element name="meta:template">
+        <attribute name="xlink:href">
+            <ref name="anyURI"/>
+        </attribute>
+        <optional>
+            <attribute name="xlink:type" a:defaultValue="simple">
+                <value>simple</value>
+            </attribute>
+        </optional>
+        <optional>
+            <attribute name="xlink:actuate" a:defaultValue="onRequest">
+                <value>onRequest</value>
+            </attribute>
+        </optional>
+        <optional>
+            <attribute name="xlink:title">
+                <ref name="string"/>
+            </attribute>
+        </optional>
+        <optional>
+            <attribute name="meta:date">
+                <ref name="dateTime"/>
+            </attribute>
+        </optional>
+    </element>
+</define>
+<define name="office-meta-data" combine="choice">
+    <element name="meta:auto-reload">
+        <optional>
+            <attribute name="xlink:type" a:defaultValue="simple">
+                <value>simple</value>
+            </attribute>
+        </optional>
+        <optional>
+            <attribute name="xlink:show" a:defaultValue="replace">
+                <value>replace</value>
+            </attribute>
+        </optional>
+        <optional>
+            <attribute name="xlink:actuate" a:defaultValue="onLoad">
+                <value>onLoad</value>
+            </attribute>
+        </optional>
+        <optional>
+            <attribute name="xlink:href">
+                <ref name="anyURI"/>
+            </attribute>
+        </optional>
+        <optional>
+            <attribute name="meta:delay">
+                <ref name="duration"/>
+            </attribute>
+        </optional>
+    </element>
+</define>
+<define name="office-meta-data" combine="choice">
+    <element name="meta:hyperlink-behaviour">
+        <optional>
+            <attribute name="office:target-frame-name">
+                <ref name="targetFrameName"/>
+            </attribute>
+        </optional>
+        <optional>
+            <attribute name="xlink:show">
+                <choice>
+                    <value>new</value>
+                    <value>replace</value>
+                </choice>
+            </attribute>
+        </optional>
+    </element>
+</define>
+<define name="office-meta-data" combine="choice">
+    <element name="dc:language">
+        <ref name="language"/>
+    </element>
+</define>
+<define name="office-meta-data" combine="choice">
+    <element name="meta:editing-cycles">
+        <ref name="nonNegativeInteger"/>
+    </element>
+</define>
+<define name="office-meta-data" combine="choice">
+    <element name="meta:editing-duration">
+        <ref name="duration"/>
+    </element>
+</define>
+<define name="office-meta-data" combine="choice">
+    <element name="meta:document-statistic">
+        <optional>
+            <attribute name="meta:page-count">
+                <ref name="nonNegativeInteger"/>
+            </attribute>
+        </optional>
+        <optional>
+            <attribute name="meta:table-count">
+                <ref name="nonNegativeInteger"/>
+            </attribute>
+        </optional>
+        <optional>
+            <attribute name="meta:draw-count">
+                <ref name="nonNegativeInteger"/>
+            </attribute>
+        </optional>
+        <optional>
+            <attribute name="meta:image-count">
+                <ref name="nonNegativeInteger"/>
+            </attribute>
+        </optional>
+        <optional>
+            <attribute name="meta:ole-object-count">
+                <ref name="nonNegativeInteger"/>
+            </attribute>
+        </optional>
+        <optional>
+            <attribute name="meta:paragraph-count">
+                <ref name="nonNegativeInteger"/>
+            </attribute>
+        </optional>
+        <optional>
+            <attribute name="meta:word-count">
+                <ref name="nonNegativeInteger"/>
+            </attribute>
+        </optional>
+        <optional>
+            <attribute name="meta:character-count">
+                <ref name="nonNegativeInteger"/>
+            </attribute>
+        </optional>
+        <optional>
+            <attribute name="frame-count">
+                <ref name="nonNegativeInteger"/>
+            </attribute>
+        </optional>
+        <optional>
+            <attribute name="sentence-count">
+                <ref name="nonNegativeInteger"/>
+            </attribute>
+        </optional>
+        <optional>
+            <attribute name="syllable-count">
+                <ref name="nonNegativeInteger"/>
+            </attribute>
+        </optional>
+        <optional>
+            <attribute name="non-whitespace-character-count">
+                <ref name="nonNegativeInteger"/>
+            </attribute>
+        </optional>
+        <optional>
+            <attribute name="meta:row-count">
+                <ref name="nonNegativeInteger"/>
+            </attribute>
+        </optional>
+        <optional>
+            <attribute name="meta:cell-count">
+                <ref name="nonNegativeInteger"/>
+            </attribute>
+        </optional>
+        <optional>
+            <attribute name="meta:object-count">
+                <ref name="nonNegativeInteger"/>
+            </attribute>
+        </optional>
+    </element>
+</define>
+<define name="office-meta-data" combine="choice">
+    <element name="meta:user-defined">
+        <attribute name="meta:name">
+            <ref name="string"/>
+        </attribute>
+        <choice>
+            <group>
+                <attribute name="meta:value-type">
+                    <value>float</value>
+                </attribute>
+                <ref name="double"/>
+            </group>
+            <group>
+                <attribute name="meta:value-type">
+                    <value>date</value>
+                </attribute>
+                <ref name="dateOrDateTime"/>
+            </group>
+            <group>
+                <attribute name="meta:value-type">
+                    <value>time</value>
+                </attribute>
+                <ref name="duration"/>
+            </group>
+            <group>
+                <attribute name="meta:value-type">
+                    <value>boolean</value>
+                </attribute>
+                <ref name="boolean"/>
+            </group>
+            <group>
+                <attribute name="meta:value-type">
+                    <value>string</value>
+                </attribute>
+                <ref name="string"/>
+            </group>
+            <text/>
+        </choice>
+    </element>
+</define>
+<define name="text-h">
+    <element name="text:h">
+        <ref name="heading-attrs"/>
+        <ref name="paragraph-attrs"/>
+        <optional>
+            <ref name="text-number"/>
+        </optional>
+        <zeroOrMore>
+            <ref name="paragraph-content"/>
+        </zeroOrMore>
+    </element>
+</define>
+<define name="heading-attrs" combine="interleave">
+    <attribute name="text:outline-level">
+        <ref name="positiveInteger"/>
+    </attribute>
+</define>
+<define name="heading-attrs" combine="interleave">
+    <optional>
+        <attribute name="text:restart-numbering" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="heading-attrs" combine="interleave">
+    <optional>
+        <attribute name="text:start-value">
+            <ref name="nonNegativeInteger"/>
+        </attribute>
+    </optional>
+</define>
+<define name="heading-attrs" combine="interleave">
+    <optional>
+        <attribute name="text:is-list-header" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-number">
+    <element name="text:number">
+        <ref name="string"/>
+    </element>
+</define>
+<define name="text-p">
+    <element name="text:p">
+        <ref name="paragraph-attrs"/>
+        <zeroOrMore>
+            <ref name="paragraph-content"/>
+        </zeroOrMore>
+    </element>
+</define>
+<define name="paragraph-attrs">
+    <optional>
+        <attribute name="text:style-name">
+            <ref name="styleNameRef"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="text:class-names">
+            <ref name="styleNameRefs"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="text:cond-style-name">
+            <ref name="styleNameRef"/>
+        </attribute>
+    </optional>
+</define>
+<define name="paragraph-attrs" combine="interleave">
+    <optional>
+        <ref name="text-id"/>
+    </optional>
+</define>
+<define name="text-page-sequence">
+    <element name="text:page-sequence">
+        <oneOrMore>
+            <ref name="text-page"/>
+        </oneOrMore>
+    </element>
+</define>
+<define name="text-page">
+    <element name="text:page">
+        <ref name="text-page-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="text-page-attlist">
+    <attribute name="text:master-page-name">
+        <ref name="styleNameRef"/>
+    </attribute>
+</define>
+<define name="text-list">
+    <element name="text:list">
+        <ref name="text-list-attr"/>
+        <optional>
+            <ref name="text-list-header"/>
+        </optional>
+        <zeroOrMore>
+            <ref name="text-list-item"/>
+        </zeroOrMore>
+    </element>
+</define>
+<define name="text-list-attr" combine="interleave">
+    <optional>
+        <attribute name="text:style-name">
+            <ref name="styleNameRef"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-list-attr" combine="interleave">
+    <optional>
+        <attribute name="text:continue-numbering">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-list-item">
+    <element name="text:list-item">
+        <ref name="text-list-item-attr"/>
+        <ref name="text-list-item-content"/>
+    </element>
+</define>
+<define name="text-list-item-content">
+    <optional>
+        <ref name="text-number"/>
+    </optional>
+    <zeroOrMore>
+        <choice>
+            <ref name="text-p"/>
+            <ref name="text-h"/>
+            <ref name="text-list"/>
+        </choice>
+    </zeroOrMore>
+</define>
+<define name="text-list-item-attr" combine="interleave">
+    <optional>
+        <attribute name="text:start-value">
+            <ref name="nonNegativeInteger"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-list-header">
+    <element name="text:list-header">
+        <ref name="text-list-item-content"/>
+    </element>
+</define>
+<define name="text-numbered-paragraph">
+    <element name="text:numbered-paragraph">
+        <ref name="text-numbered-paragraph-attr"/>
+        <optional>
+            <ref name="text-number"/>
+        </optional>
+        <choice>
+            <ref name="text-p"/>
+            <ref name="text-h"/>
+        </choice>
+    </element>
+</define>
+<define name="text-numbered-paragraph-attr" combine="interleave">
+    <optional>
+        <attribute name="text:level" a:defaultValue="1">
+            <ref name="positiveInteger"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-numbered-paragraph-attr" combine="interleave">
+    <ref name="text-list-attr"/>
+</define>
+<define name="text-numbered-paragraph-attr" combine="interleave">
+    <ref name="text-list-item-attr"/>
+</define>
+<define name="text-section">
+    <element name="text:section">
+        <ref name="text-section-attr"/>
+        <choice>
+            <ref name="text-section-source"/>
+            <ref name="text-section-source-dde"/>
+            <empty/>
+        </choice>
+        <zeroOrMore>
+            <ref name="text-content"/>
+        </zeroOrMore>
+    </element>
+</define>
+<define name="text-section-attr" combine="interleave">
+    <ref name="sectionAttr"/>
+</define>
+<define name="sectionAttr" combine="interleave">
+    <optional>
+        <attribute name="text:style-name">
+            <ref name="styleNameRef"/>
+        </attribute>
+    </optional>
+</define>
+<define name="sectionAttr" combine="interleave">
+    <attribute name="text:name">
+        <ref name="string"/>
+    </attribute>
+</define>
+<define name="sectionAttr" combine="interleave">
+    <optional>
+        <attribute name="text:protected">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="sectionAttr" combine="interleave">
+    <optional>
+        <attribute name="text:protection-key">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-section-attr" combine="interleave">
+    <choice>
+        <attribute name="text:display">
+            <choice>
+                <value>true</value>
+                <value>none</value>
+            </choice>
+        </attribute>
+        <group>
+            <attribute name="text:display">
+                <value>condition</value>
+            </attribute>
+            <attribute name="text:condition">
+                <ref name="string"/>
+            </attribute>
+        </group>
+        <empty/>
+    </choice>
+</define>
+<define name="text-section-source">
+    <element name="text:section-source">
+        <ref name="text-section-source-attr"/>
+    </element>
+</define>
+<define name="text-section-source-attr" combine="interleave">
+    <optional>
+        <attribute name="xlink:href">
+            <ref name="anyURI"/>
+        </attribute>
+        <optional>
+            <attribute name="xlink:type" a:defaultValue="simple">
+                <value>simple</value>
+            </attribute>
+        </optional>
+        <optional>
+            <attribute name="xlink:show" a:defaultValue="embed">
+                <value>embed</value>
+            </attribute>
+        </optional>
+    </optional>
+</define>
+<define name="text-section-source-attr" combine="interleave">
+    <optional>
+        <attribute name="text:section-name">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-section-source-attr" combine="interleave">
+    <optional>
+        <attribute name="text:filter-name">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-section-source-dde">
+    <ref name="office-dde-source"/>
+</define>
+<define name="text-tracked-changes">
+    <optional>
+        <element name="text:tracked-changes">
+            <ref name="text-tracked-changes-attr"/>
+            <zeroOrMore>
+                <ref name="text-changed-region"/>
+            </zeroOrMore>
+        </element>
+    </optional>
+</define>
+<define name="text-tracked-changes-attr" combine="interleave">
+    <optional>
+        <attribute name="text:track-changes" a:defaultValue="true">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-changed-region">
+    <element name="text:changed-region">
+        <ref name="text-changed-region-attr"/>
+        <ref name="text-changed-region-content"/>
+    </element>
+</define>
+<define name="text-changed-region-attr" combine="interleave">
+    <attribute name="text:id">
+        <ref name="ID"/>
+    </attribute>
+</define>
+<define name="text-changed-region-content" combine="choice">
+    <element name="text:insertion">
+        <ref name="office-change-info"/>
+    </element>
+</define>
+<define name="text-changed-region-content" combine="choice">
+    <element name="text:deletion">
+        <ref name="office-change-info"/>
+        <zeroOrMore>
+            <ref name="text-content"/>
+        </zeroOrMore>
+    </element>
+</define>
+<define name="text-changed-region-content" combine="choice">
+    <element name="text:format-change">
+        <ref name="office-change-info"/>
+    </element>
+</define>
+<define name="change-marks">
+    <choice>
+        <element name="text:change">
+            <ref name="change-mark-attr"/>
+        </element>
+        <element name="text:change-start">
+            <ref name="change-mark-attr"/>
+        </element>
+        <element name="text:change-end">
+            <ref name="change-mark-attr"/>
+        </element>
+    </choice>
+</define>
+<define name="change-mark-attr">
+    <attribute name="text:change-id">
+        <ref name="IDREF"/>
+    </attribute>
+</define>
+<define name="text-decls">
+    <optional>
+        <element name="text:variable-decls">
+            <zeroOrMore>
+                <ref name="text-variable-decl"/>
+            </zeroOrMore>
+        </element>
+    </optional>
+    <optional>
+        <element name="text:sequence-decls">
+            <zeroOrMore>
+                <ref name="text-sequence-decl"/>
+            </zeroOrMore>
+        </element>
+    </optional>
+    <optional>
+        <element name="text:user-field-decls">
+            <zeroOrMore>
+                <ref name="text-user-field-decl"/>
+            </zeroOrMore>
+        </element>
+    </optional>
+    <optional>
+        <element name="text:dde-connection-decls">
+            <zeroOrMore>
+                <ref name="text-dde-connection-decl"/>
+            </zeroOrMore>
+        </element>
+    </optional>
+    <optional>
+        <ref name="text-alphabetical-index-auto-mark-file"/>
+    </optional>
+</define>
+<define name="paragraph-content" combine="choice">
+    <text/>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:s">
+        <optional>
+            <attribute name="text:c">
+                <ref name="nonNegativeInteger"/>
+            </attribute>
+        </optional>
+    </element>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:tab">
+        <ref name="text-tab-attr"/>
+    </element>
+</define>
+<define name="text-tab-attr">
+    <optional>
+        <attribute name="text:tab-ref">
+            <ref name="nonNegativeInteger"/>
+        </attribute>
+    </optional>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:line-break">
+        <empty/>
+    </element>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:span">
+        <optional>
+            <attribute name="text:style-name">
+                <ref name="styleNameRef"/>
+            </attribute>
+        </optional>
+        <optional>
+            <attribute name="text:class-names">
+                <ref name="styleNameRefs"/>
+            </attribute>
+        </optional>
+        <zeroOrMore>
+            <ref name="paragraph-content"/>
+        </zeroOrMore>
+    </element>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:a">
+        <ref name="text-a-attlist"/>
+        <optional>
+            <ref name="office-event-listeners"/>
+        </optional>
+        <zeroOrMore>
+            <ref name="paragraph-content"/>
+        </zeroOrMore>
+    </element>
+</define>
+<define name="text-a-attlist" combine="interleave">
+    <optional>
+        <attribute name="office:name">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-a-attlist" combine="interleave">
+    <attribute name="xlink:href">
+        <ref name="anyURI"/>
+    </attribute>
+    <optional>
+        <attribute name="xlink:type" a:defaultValue="simple">
+            <value>simple</value>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="xlink:actuate" a:defaultValue="onRequest">
+            <value>onRequest</value>
+        </attribute>
+    </optional>
+</define>
+<define name="text-a-attlist" combine="interleave">
+    <optional>
+        <attribute name="office:target-frame-name">
+            <ref name="targetFrameName"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="xlink:show">
+            <choice>
+                <value>new</value>
+                <value>replace</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="text-a-attlist" combine="interleave">
+    <optional>
+        <attribute name="text:style-name">
+            <ref name="styleNameRef"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="text:visited-style-name">
+            <ref name="styleNameRef"/>
+        </attribute>
+    </optional>
+</define>
+<define name="paragraph-content" combine="choice">
+    <choice>
+        <element name="text:bookmark">
+            <attribute name="text:name">
+                <ref name="string"/>
+            </attribute>
+        </element>
+        <element name="text:bookmark-start">
+            <attribute name="text:name">
+                <ref name="string"/>
+            </attribute>
+        </element>
+        <element name="text:bookmark-end">
+            <attribute name="text:name">
+                <ref name="string"/>
+            </attribute>
+        </element>
+    </choice>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:reference-mark">
+        <attribute name="text:name">
+            <ref name="string"/>
+        </attribute>
+    </element>
+</define>
+<define name="paragraph-content" combine="choice">
+    <choice>
+        <element name="text:reference-mark-start">
+            <attribute name="text:name">
+                <ref name="string"/>
+            </attribute>
+        </element>
+        <element name="text:reference-mark-end">
+            <attribute name="text:name">
+                <ref name="string"/>
+            </attribute>
+        </element>
+    </choice>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:note">
+        <ref name="text-note-class"/>
+        <optional>
+            <attribute name="text:id">
+                <ref name="string"/>
+            </attribute>
+        </optional>
+        <element name="text:note-citation">
+            <optional>
+                <attribute name="text:label">
+                    <ref name="string"/>
+                </attribute>
+            </optional>
+            <text/>
+        </element>
+        <element name="text:note-body">
+            <zeroOrMore>
+                <ref name="text-content"/>
+            </zeroOrMore>
+        </element>
+    </element>
+</define>
+<define name="text-note-class">
+    <attribute name="text:note-class">
+        <choice>
+            <value>footnote</value>
+            <value>endnote</value>
+        </choice>
+    </attribute>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:ruby">
+        <optional>
+            <attribute name="text:style-name">
+                <ref name="styleNameRef"/>
+            </attribute>
+        </optional>
+        <element name="text:ruby-base">
+            <ref name="paragraph-content"/>
+        </element>
+        <element name="text:ruby-text">
+            <optional>
+                <attribute name="text:style-name">
+                    <ref name="styleNameRef"/>
+                </attribute>
+            </optional>
+            <text/>
+        </element>
+    </element>
+</define>
+<define name="paragraph-content" combine="choice">
+    <ref name="office-annotation"/>
+</define>
+<define name="paragraph-content" combine="choice">
+    <ref name="change-marks"/>
+</define>
+<define name="paragraph-content" combine="choice">
+    <choice>
+        <ref name="shape"/>
+        <ref name="draw-a"/>
+    </choice>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:date">
+        <ref name="text-date-attlist"/>
+        <text/>
+    </element>
+</define>
+<define name="text-date-attlist" combine="interleave">
+    <interleave>
+        <ref name="common-field-fixed-attlist"/>
+        <ref name="common-field-data-style-name-attlist"/>
+    </interleave>
+</define>
+<define name="text-date-attlist" combine="interleave">
+    <optional>
+        <attribute name="text:date-value">
+            <ref name="dateOrDateTime"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-date-attlist" combine="interleave">
+    <optional>
+        <attribute name="text:date-adjust">
+            <ref name="duration"/>
+        </attribute>
+    </optional>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:time">
+        <ref name="text-time-attlist"/>
+        <text/>
+    </element>
+</define>
+<define name="text-time-attlist" combine="interleave">
+    <interleave>
+        <ref name="common-field-fixed-attlist"/>
+        <ref name="common-field-data-style-name-attlist"/>
+    </interleave>
+</define>
+<define name="text-time-attlist" combine="interleave">
+    <optional>
+        <attribute name="text:time-value">
+            <ref name="timeOrDateTime"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-time-attlist" combine="interleave">
+    <optional>
+        <attribute name="text:time-adjust">
+            <ref name="duration"/>
+        </attribute>
+    </optional>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:page-number">
+        <ref name="text-page-number-attlist"/>
+        <text/>
+    </element>
+</define>
+<define name="text-page-number-attlist" combine="interleave">
+    <interleave>
+        <ref name="common-field-num-format-attlist"/>
+        <ref name="common-field-fixed-attlist"/>
+    </interleave>
+</define>
+<define name="text-page-number-attlist" combine="interleave">
+    <optional>
+        <attribute name="text:page-adjust">
+            <ref name="integer"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-page-number-attlist" combine="interleave">
+    <optional>
+        <attribute name="text:select-page">
+            <choice>
+                <value>previous</value>
+                <value>current</value>
+                <value>next</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:page-continuation">
+        <ref name="text-page-continuation-attlist"/>
+        <text/>
+    </element>
+</define>
+<define name="text-page-continuation-attlist" combine="interleave">
+    <attribute name="text:select-page">
+        <choice>
+            <value>previous</value>
+            <value>next</value>
+        </choice>
+    </attribute>
+</define>
+<define name="text-page-continuation-attlist" combine="interleave">
+    <optional>
+        <attribute name="text:string-value">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:sender-firstname">
+        <ref name="common-field-fixed-attlist"/>
+        <text/>
+    </element>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:sender-lastname">
+        <ref name="common-field-fixed-attlist"/>
+        <text/>
+    </element>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:sender-initials">
+        <ref name="common-field-fixed-attlist"/>
+        <text/>
+    </element>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:sender-title">
+        <ref name="common-field-fixed-attlist"/>
+        <text/>
+    </element>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:sender-position">
+        <ref name="common-field-fixed-attlist"/>
+        <text/>
+    </element>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:sender-email">
+        <ref name="common-field-fixed-attlist"/>
+        <text/>
+    </element>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:sender-phone-private">
+        <ref name="common-field-fixed-attlist"/>
+        <text/>
+    </element>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:sender-fax">
+        <ref name="common-field-fixed-attlist"/>
+        <text/>
+    </element>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:sender-company">
+        <ref name="common-field-fixed-attlist"/>
+        <text/>
+    </element>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:sender-phone-work">
+        <ref name="common-field-fixed-attlist"/>
+        <text/>
+    </element>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:sender-street">
+        <ref name="common-field-fixed-attlist"/>
+        <text/>
+    </element>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:sender-city">
+        <ref name="common-field-fixed-attlist"/>
+        <text/>
+    </element>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:sender-postal-code">
+        <ref name="common-field-fixed-attlist"/>
+        <text/>
+    </element>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:sender-country">
+        <ref name="common-field-fixed-attlist"/>
+        <text/>
+    </element>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:sender-state-or-province">
+        <ref name="common-field-fixed-attlist"/>
+        <text/>
+    </element>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:author-name">
+        <ref name="common-field-fixed-attlist"/>
+        <text/>
+    </element>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:author-initials">
+        <ref name="common-field-fixed-attlist"/>
+        <text/>
+    </element>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:chapter">
+        <ref name="text-chapter-attlist"/>
+        <text/>
+    </element>
+</define>
+<define name="text-chapter-attlist" combine="interleave">
+    <attribute name="text:display">
+        <choice>
+            <value>name</value>
+            <value>number</value>
+            <value>number-and-name</value>
+            <value>plain-number-and-name</value>
+            <value>plain-number</value>
+        </choice>
+    </attribute>
+</define>
+<define name="text-chapter-attlist" combine="interleave">
+    <attribute name="text:outline-level">
+        <ref name="nonNegativeInteger"/>
+    </attribute>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:file-name">
+        <ref name="text-file-name-attlist"/>
+        <text/>
+    </element>
+</define>
+<define name="text-file-name-attlist" combine="interleave">
+    <optional>
+        <attribute name="text:display">
+            <choice>
+                <value>full</value>
+                <value>path</value>
+                <value>name</value>
+                <value>name-and-extension</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="text-file-name-attlist" combine="interleave">
+    <ref name="common-field-fixed-attlist"/>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:template-name">
+        <ref name="text-template-name-attlist"/>
+        <text/>
+    </element>
+</define>
+<define name="text-template-name-attlist">
+    <optional>
+        <attribute name="text:display">
+            <choice>
+                <value>full</value>
+                <value>path</value>
+                <value>name</value>
+                <value>name-and-extension</value>
+                <value>area</value>
+                <value>title</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:sheet-name">
+        <text/>
+    </element>
+</define>
+<define name="text-variable-decl">
+    <element name="text:variable-decl">
+        <ref name="common-field-name-attlist"/>
+        <ref name="common-value-type-attlist"/>
+    </element>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:variable-set">
+        <interleave>
+            <ref name="common-field-name-attlist"/>
+            <ref name="common-field-formula-attlist"/>
+            <ref name="common-value-and-type-attlist"/>
+            <ref name="common-field-display-value-none-attlist"/>
+            <ref name="common-field-data-style-name-attlist"/>
+        </interleave>
+        <text/>
+    </element>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:variable-get">
+        <interleave>
+            <ref name="common-field-name-attlist"/>
+            <ref name="common-field-display-value-formula-attlist"/>
+            <ref name="common-field-data-style-name-attlist"/>
+        </interleave>
+        <text/>
+    </element>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:variable-input">
+        <interleave>
+            <ref name="common-field-name-attlist"/>
+            <ref name="common-field-description-attlist"/>
+            <ref name="common-value-type-attlist"/>
+            <ref name="common-field-display-value-none-attlist"/>
+            <ref name="common-field-data-style-name-attlist"/>
+        </interleave>
+        <text/>
+    </element>
+</define>
+<define name="text-user-field-decl">
+    <element name="text:user-field-decl">
+        <ref name="common-field-name-attlist"/>
+        <optional>
+            <ref name="common-field-formula-attlist"/>
+        </optional>
+        <ref name="common-value-and-type-attlist"/>
+    </element>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:user-field-get">
+        <interleave>
+            <ref name="common-field-name-attlist"/>
+            <ref name="common-field-display-value-formula-none-attlist"/>
+            <ref name="common-field-data-style-name-attlist"/>
+        </interleave>
+        <text/>
+    </element>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:user-field-input">
+        <interleave>
+            <ref name="common-field-name-attlist"/>
+            <ref name="common-field-description-attlist"/>
+            <ref name="common-field-data-style-name-attlist"/>
+        </interleave>
+        <text/>
+    </element>
+</define>
+<define name="text-sequence-decl">
+    <element name="text:sequence-decl">
+        <ref name="text-sequence-decl-attlist"/>
+    </element>
+</define>
+<define name="text-sequence-decl-attlist" combine="interleave">
+    <ref name="common-field-name-attlist"/>
+</define>
+<define name="text-sequence-decl-attlist" combine="interleave">
+    <attribute name="text:display-outline-level">
+        <ref name="nonNegativeInteger"/>
+    </attribute>
+</define>
+<define name="text-sequence-decl-attlist" combine="interleave">
+    <optional>
+        <attribute name="text:separation-character">
+            <ref name="character"/>
+        </attribute>
+    </optional>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:sequence">
+        <interleave>
+            <ref name="common-field-name-attlist"/>
+            <ref name="common-field-formula-attlist"/>
+            <ref name="common-field-num-format-attlist"/>
+            <ref name="text-sequence-ref-name"/>
+        </interleave>
+        <text/>
+    </element>
+</define>
+<define name="text-sequence-ref-name">
+    <optional>
+        <attribute name="text:ref-name">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:expression">
+        <interleave>
+            <ref name="common-field-formula-attlist"/>
+            <optional>
+                <ref name="common-value-and-type-attlist"/>
+            </optional>
+            <ref name="common-field-display-value-formula-attlist"/>
+            <ref name="common-field-data-style-name-attlist"/>
+        </interleave>
+        <text/>
+    </element>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:text-input">
+        <ref name="common-field-description-attlist"/>
+        <text/>
+    </element>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:initial-creator">
+        <ref name="common-field-fixed-attlist"/>
+        <text/>
+    </element>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:creation-date">
+        <interleave>
+            <ref name="common-field-fixed-attlist"/>
+            <ref name="common-field-data-style-name-attlist"/>
+            <optional>
+                <attribute name="text:date-value">
+                    <ref name="dateOrDateTime"/>
+                </attribute>
+            </optional>
+        </interleave>
+        <text/>
+    </element>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:creation-time">
+        <interleave>
+            <ref name="common-field-fixed-attlist"/>
+            <ref name="common-field-data-style-name-attlist"/>
+            <optional>
+                <attribute name="text:time-value">
+                    <ref name="timeOrDateTime"/>
+                </attribute>
+            </optional>
+        </interleave>
+        <text/>
+    </element>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:description">
+        <ref name="common-field-fixed-attlist"/>
+        <text/>
+    </element>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:user-defined">
+        <interleave>
+            <ref name="common-field-fixed-attlist"/>
+            <attribute name="text:name">
+                <ref name="string"/>
+            </attribute>
+            <ref name="common-field-data-style-name-attlist"/>
+            <optional>
+                <attribute name="office:value">
+                    <ref name="double"/>
+                </attribute>
+            </optional>
+            <optional>
+                <attribute name="office:date-value">
+                    <ref name="dateOrDateTime"/>
+                </attribute>
+            </optional>
+            <optional>
+                <attribute name="office:time-value">
+                    <ref name="duration"/>
+                </attribute>
+            </optional>
+            <optional>
+                <attribute name="office:boolean-value">
+                    <ref name="boolean"/>
+                </attribute>
+            </optional>
+            <optional>
+                <attribute name="office:string-value">
+                    <ref name="string"/>
+                </attribute>
+            </optional>
+        </interleave>
+        <text/>
+    </element>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:print-time">
+        <interleave>
+            <ref name="common-field-fixed-attlist"/>
+            <ref name="common-field-data-style-name-attlist"/>
+            <optional>
+                <attribute name="text:time-value">
+                    <ref name="time"/>
+                </attribute>
+            </optional>
+        </interleave>
+        <text/>
+    </element>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:print-date">
+        <interleave>
+            <ref name="common-field-fixed-attlist"/>
+            <ref name="common-field-data-style-name-attlist"/>
+            <optional>
+                <attribute name="text:date-value">
+                    <ref name="date"/>
+                </attribute>
+            </optional>
+        </interleave>
+        <text/>
+    </element>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:printed-by">
+        <ref name="common-field-fixed-attlist"/>
+        <text/>
+    </element>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:title">
+        <ref name="common-field-fixed-attlist"/>
+        <text/>
+    </element>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:subject">
+        <ref name="common-field-fixed-attlist"/>
+        <text/>
+    </element>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:keywords">
+        <ref name="common-field-fixed-attlist"/>
+        <text/>
+    </element>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:editing-cycles">
+        <ref name="common-field-fixed-attlist"/>
+        <text/>
+    </element>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:editing-duration">
+        <interleave>
+            <ref name="common-field-fixed-attlist"/>
+            <ref name="common-field-data-style-name-attlist"/>
+            <optional>
+                <attribute name="text:duration">
+                    <ref name="duration"/>
+                </attribute>
+            </optional>
+        </interleave>
+        <text/>
+    </element>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:modification-time">
+        <interleave>
+            <ref name="common-field-fixed-attlist"/>
+            <ref name="common-field-data-style-name-attlist"/>
+            <optional>
+                <attribute name="text:time-value">
+                    <ref name="time"/>
+                </attribute>
+            </optional>
+        </interleave>
+        <text/>
+    </element>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:modification-date">
+        <interleave>
+            <ref name="common-field-fixed-attlist"/>
+            <ref name="common-field-data-style-name-attlist"/>
+            <optional>
+                <attribute name="text:date-value">
+                    <ref name="date"/>
+                </attribute>
+            </optional>
+        </interleave>
+        <text/>
+    </element>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:creator">
+        <ref name="common-field-fixed-attlist"/>
+        <text/>
+    </element>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element>
+        <choice>
+            <name>text:page-count</name>
+            <name>text:paragraph-count</name>
+            <name>text:word-count</name>
+            <name>text:character-count</name>
+            <name>text:table-count</name>
+            <name>text:image-count</name>
+            <name>text:object-count</name>
+        </choice>
+        <ref name="common-field-num-format-attlist"/>
+        <text/>
+    </element>
+</define>
+<define name="common-field-database-table">
+    <ref name="common-field-database-table-attlist"/>
+    <ref name="common-field-database-name"/>
+</define>
+<define name="common-field-database-name" combine="choice">
+    <optional>
+        <attribute name="text:database-name">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-field-database-name" combine="choice">
+    <ref name="form-connection-resource"/>
+</define>
+<define name="common-field-database-table-attlist" combine="interleave">
+    <attribute name="text:table-name">
+        <ref name="string"/>
+    </attribute>
+</define>
+<define name="common-field-database-table-attlist" combine="interleave">
+    <optional>
+        <attribute name="text:table-type">
+            <choice>
+                <value>table</value>
+                <value>query</value>
+                <value>command</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:database-display">
+        <ref name="text-database-display-attlist"/>
+        <text/>
+    </element>
+</define>
+<define name="text-database-display-attlist" combine="interleave">
+    <ref name="common-field-database-table"/>
+</define>
+<define name="text-database-display-attlist" combine="interleave">
+    <ref name="common-field-data-style-name-attlist"/>
+</define>
+<define name="text-database-display-attlist" combine="interleave">
+    <attribute name="text:column-name">
+        <ref name="string"/>
+    </attribute>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:database-next">
+        <ref name="text-database-next-attlist"/>
+    </element>
+</define>
+<define name="text-database-next-attlist" combine="interleave">
+    <ref name="common-field-database-table"/>
+</define>
+<define name="text-database-next-attlist" combine="interleave">
+    <optional>
+        <attribute name="text:condition">
+            <ref name="formula"/>
+        </attribute>
+    </optional>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:database-row-select">
+        <ref name="text-database-row-select-attlist"/>
+    </element>
+</define>
+<define name="text-database-row-select-attlist" combine="interleave">
+    <ref name="common-field-database-table"/>
+</define>
+<define name="text-database-row-select-attlist" combine="interleave">
+    <optional>
+        <attribute name="text:condition">
+            <ref name="formula"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-database-row-select-attlist" combine="interleave">
+    <optional>
+        <attribute name="text:row-number">
+            <ref name="nonNegativeInteger"/>
+        </attribute>
+    </optional>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:database-row-number">
+        <interleave>
+            <ref name="common-field-database-table"/>
+            <ref name="common-field-num-format-attlist"/>
+            <optional>
+                <attribute name="text:value">
+                    <ref name="nonNegativeInteger"/>
+                </attribute>
+            </optional>
+        </interleave>
+        <text/>
+    </element>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:database-name">
+        <ref name="common-field-database-table"/>
+        <text/>
+    </element>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:page-variable-set">
+        <ref name="text-set-page-variable-attlist"/>
+        <text/>
+    </element>
+</define>
+<define name="text-set-page-variable-attlist" combine="interleave">
+    <optional>
+        <attribute name="text:active">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-set-page-variable-attlist" combine="interleave">
+    <optional>
+        <attribute name="text:page-adjust">
+            <ref name="integer"/>
+        </attribute>
+    </optional>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:page-variable-get">
+        <ref name="text-get-page-variable-attlist"/>
+        <text/>
+    </element>
+</define>
+<define name="text-get-page-variable-attlist" combine="interleave">
+    <ref name="common-field-num-format-attlist"/>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:placeholder">
+        <ref name="text-placeholder-attlist"/>
+        <text/>
+    </element>
+</define>
+<define name="text-placeholder-attlist" combine="interleave">
+    <attribute name="text:placeholder-type">
+        <choice>
+            <value>text</value>
+            <value>table</value>
+            <value>text-box</value>
+            <value>image</value>
+            <value>object</value>
+        </choice>
+    </attribute>
+</define>
+<define name="text-placeholder-attlist" combine="interleave">
+    <ref name="common-field-description-attlist"/>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:conditional-text">
+        <ref name="text-conditional-text-attlist"/>
+        <text/>
+    </element>
+</define>
+<define name="text-conditional-text-attlist" combine="interleave">
+    <attribute name="text:condition">
+        <ref name="formula"/>
+    </attribute>
+</define>
+<define name="text-conditional-text-attlist" combine="interleave">
+    <attribute name="text:string-value-if-true">
+        <ref name="string"/>
+    </attribute>
+</define>
+<define name="text-conditional-text-attlist" combine="interleave">
+    <attribute name="text:string-value-if-false">
+        <ref name="string"/>
+    </attribute>
+</define>
+<define name="text-conditional-text-attlist" combine="interleave">
+    <optional>
+        <attribute name="text:current-value">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:hidden-text">
+        <ref name="text-hidden-text-attlist"/>
+        <text/>
+    </element>
+</define>
+<define name="text-hidden-text-attlist" combine="interleave">
+    <attribute name="text:condition">
+        <ref name="formula"/>
+    </attribute>
+</define>
+<define name="text-hidden-text-attlist" combine="interleave">
+    <attribute name="text:string-value">
+        <ref name="string"/>
+    </attribute>
+</define>
+<define name="text-hidden-text-attlist" combine="interleave">
+    <optional>
+        <attribute name="text:is-hidden">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element>
+        <choice>
+            <name>text:reference-ref</name>
+            <name>text:bookmark-ref</name>
+        </choice>
+        <interleave>
+            <ref name="text-common-ref-content"/>
+            <ref name="text-ref-content"/>
+        </interleave>
+    </element>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:note-ref">
+        <interleave>
+            <ref name="text-common-ref-content"/>
+            <ref name="text-note-ref-content"/>
+            <ref name="text-ref-content"/>
+        </interleave>
+    </element>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:sequence-ref">
+        <interleave>
+            <ref name="text-common-ref-content"/>
+            <ref name="text-sequence-ref-content"/>
+        </interleave>
+    </element>
+</define>
+<define name="text-common-ref-content" combine="interleave">
+    <text/>
+</define>
+<define name="text-common-ref-content" combine="interleave">
+    <optional>
+        <attribute name="text:ref-name">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-note-ref-content" combine="interleave">
+    <ref name="text-note-class"/>
+</define>
+<define name="text-ref-content" combine="interleave">
+    <optional>
+        <attribute name="text:reference-format">
+            <choice>
+                <value>page</value>
+                <value>chapter</value>
+                <value>direction</value>
+                <value>text</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="text-sequence-ref-content" combine="interleave">
+    <optional>
+        <attribute name="text:reference-format">
+            <choice>
+                <value>page</value>
+                <value>chapter</value>
+                <value>direction</value>
+                <value>text</value>
+                <value>category-and-value</value>
+                <value>caption</value>
+                <value>value</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:script">
+        <interleave>
+            <choice>
+                <group>
+                    <attribute name="xlink:href">
+                        <ref name="anyURI"/>
+                    </attribute>
+                    <optional>
+                        <attribute name="xlink:type" a:defaultValue="simple">
+                            <value>simple</value>
+                        </attribute>
+                    </optional>
+                </group>    
+                <text/>
+            </choice>
+            <optional>
+                <attribute name="script:language">
+                    <ref name="string"/>
+                </attribute>
+            </optional>
+        </interleave>
+    </element>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:execute-macro">
+        <optional>
+            <attribute name="text:name">
+                <ref name="string"/>
+            </attribute>
+        </optional>
+        <optional>
+            <ref name="office-event-listeners"/>
+        </optional>
+        <text/>
+    </element>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:hidden-paragraph">
+        <ref name="text-hidden-paragraph-attlist"/>
+        <text/>
+    </element>
+</define>
+<define name="text-hidden-paragraph-attlist" combine="interleave">
+    <attribute name="text:condition">
+        <ref name="formula"/>
+    </attribute>
+</define>
+<define name="text-hidden-paragraph-attlist" combine="interleave">
+    <optional>
+        <attribute name="text:is-hidden">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:dde-connection">
+        <attribute name="text:connection-name">
+            <ref name="string"/>
+        </attribute>
+        <text/>
+    </element>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:measure">
+        <attribute name="text:kind">
+            <choice>
+                <value>value</value>
+                <value>unit</value>
+                <value>gap</value>
+            </choice>
+        </attribute>
+        <text/>
+    </element>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:table-formula">
+        <interleave>
+            <ref name="common-field-formula-attlist"/>
+            <ref name="common-field-display-value-formula-attlist"/>
+            <ref name="common-field-data-style-name-attlist"/>
+        </interleave>
+        <text/>
+    </element>
+</define>
+<define name="common-value-type-attlist">
+    <attribute name="office:value-type">
+        <ref name="valueType"/>
+    </attribute>
+</define>
+<define name="common-value-and-type-attlist">
+    <choice>
+        <group>
+            <attribute name="office:value-type">
+                <value>float</value>
+            </attribute>
+            <attribute name="office:value">
+                <ref name="double"/>
+            </attribute>
+        </group>
+        <group>
+            <attribute name="office:value-type">
+                <value>percentage</value>
+            </attribute>
+            <attribute name="office:value">
+                <ref name="double"/>
+            </attribute>
+        </group>
+        <group>
+            <attribute name="office:value-type">
+                <value>currency</value>
+            </attribute>
+            <attribute name="office:value">
+                <ref name="double"/>
+            </attribute>
+            <optional>
+                <attribute name="office:currency">
+                    <ref name="string"/>
+                </attribute>
+            </optional>
+        </group>
+        <group>
+            <attribute name="office:value-type">
+                <value>date</value>
+            </attribute>
+            <attribute name="office:date-value">
+                <ref name="dateOrDateTime"/>
+            </attribute>
+        </group>
+        <group>
+            <attribute name="office:value-type">
+                <value>time</value>
+            </attribute>
+            <attribute name="office:time-value">
+                <ref name="duration"/>
+            </attribute>
+        </group>
+        <group>
+            <attribute name="office:value-type">
+                <value>boolean</value>
+            </attribute>
+            <attribute name="office:boolean-value">
+                <ref name="boolean"/>
+            </attribute>
+        </group>
+        <group>
+            <attribute name="office:value-type">
+                <value>string</value>
+            </attribute>
+            <optional>
+                <attribute name="office:string-value">
+                    <ref name="string"/>
+                </attribute>
+            </optional>
+        </group>
+    </choice>
+</define>
+<define name="common-field-fixed-attlist">
+    <optional>
+        <attribute name="text:fixed">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-field-name-attlist">
+    <attribute name="text:name">
+        <ref name="variableName"/>
+    </attribute>
+</define>
+<define name="common-field-description-attlist">
+    <optional>
+        <attribute name="text:description">
+            <text/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-field-display-value-none-attlist">
+    <optional>
+        <attribute name="text:display">
+            <choice>
+                <value>value</value>
+                <value>none</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="common-field-display-value-formula-none-attlist">
+    <optional>
+        <attribute name="text:display">
+            <choice>
+                <value>value</value>
+                <value>formula</value>
+                <value>none</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="common-field-display-value-formula-attlist">
+    <optional>
+        <attribute name="text:display">
+            <choice>
+                <value>value</value>
+                <value>formula</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="common-field-formula-attlist">
+    <optional>
+        <attribute name="text:formula">
+            <ref name="formula"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-field-data-style-name-attlist">
+    <optional>
+        <attribute name="style:data-style-name">
+            <ref name="styleNameRef"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-field-num-format-attlist">
+    <optional>
+        <ref name="common-num-format-attlist"/>
+    </optional>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:toc-mark-start">
+        <ref name="text-toc-mark-start-attrs"/>
+    </element>
+</define>
+<define name="text-toc-mark-start-attrs">
+    <ref name="text-id"/>
+    <ref name="text-outline-level"/>
+</define>
+<define name="text-outline-level">
+    <optional>
+        <attribute name="text:outline-level">
+            <ref name="positiveInteger"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-id">
+    <attribute name="text:id">
+        <ref name="string"/>
+    </attribute>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:toc-mark-end">
+        <ref name="text-id"/>
+    </element>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:toc-mark">
+        <attribute name="text:string-value">
+            <ref name="string"/>
+        </attribute>
+        <ref name="text-outline-level"/>
+    </element>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:user-index-mark-start">
+        <ref name="text-id"/>
+        <ref name="text-outline-level"/>
+        <ref name="text-index-name"/>
+    </element>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:user-index-mark-end">
+        <ref name="text-id"/>
+        <ref name="text-outline-level"/>
+    </element>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:user-index-mark">
+        <attribute name="text:string-value">
+            <ref name="string"/>
+        </attribute>
+        <ref name="text-outline-level"/>
+        <ref name="text-index-name"/>
+    </element>
+</define>
+<define name="text-index-name">
+    <attribute name="text:index-name">
+        <ref name="string"/>
+    </attribute>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:alphabetical-index-mark-start">
+        <ref name="text-id"/>
+        <ref name="text-alphabetical-index-mark-attrs"/>
+    </element>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:alphabetical-index-mark-end">
+        <ref name="text-id"/>
+    </element>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:alphabetical-index-mark">
+        <attribute name="text:string-value">
+            <ref name="string"/>
+        </attribute>
+        <ref name="text-alphabetical-index-mark-attrs"/>
+    </element>
+</define>
+<define name="text-alphabetical-index-mark-attrs" combine="interleave">
+    <optional>
+        <attribute name="text:key1">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="text:key2">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-alphabetical-index-mark-attrs" combine="interleave">
+    <optional>
+        <attribute name="text:string-value-phonetic">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="text:key1-phonetic">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="text:key2-phonetic">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-alphabetical-index-mark-attrs" combine="interleave">
+    <optional>
+        <attribute name="text:main-entry" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:bibliography-mark">
+        <attribute name="text:bibliography-type">
+            <ref name="text-bibliography-types"/>
+        </attribute>
+        <zeroOrMore>
+            <attribute>
+                <choice>
+                    <name>text:identifier</name>
+                    <name>text:address</name>
+                    <name>text:annote</name>
+                    <name>text:author</name>
+                    <name>text:booktitle</name>
+                    <name>text:chapter</name>
+                    <name>text:edition</name>
+                    <name>text:editor</name>
+                    <name>text:howpublished</name>
+                    <name>text:institution</name>
+                    <name>text:journal</name>
+                    <name>text:month</name>
+                    <name>text:note</name>
+                    <name>text:number</name>
+                    <name>text:organizations</name>
+                    <name>text:pages</name>
+                    <name>text:publisher</name>
+                    <name>text:school</name>
+                    <name>text:series</name>
+                    <name>text:title</name>
+                    <name>text:report-type</name>
+                    <name>text:volume</name>
+                    <name>text:year</name>
+                    <name>text:url</name>
+                    <name>text:custom1</name>
+                    <name>text:custom2</name>
+                    <name>text:custom3</name>
+                    <name>text:custom4</name>
+                    <name>text:custom5</name>
+                    <name>text:isbn</name>
+                    <name>text:issn</name>
+                </choice>
+                <ref name="string"/>
+            </attribute>
+        </zeroOrMore>
+        <text/>
+    </element>
+</define>
+<define name="text-bibliography-types">
+    <choice>
+        <value>article</value>
+        <value>book</value>
+        <value>booklet</value>
+        <value>conference</value>
+        <value>custom1</value>
+        <value>custom2</value>
+        <value>custom3</value>
+        <value>custom4</value>
+        <value>custom5</value>
+        <value>email</value>
+        <value>inbook</value>
+        <value>incollection</value>
+        <value>inproceedings</value>
+        <value>journal</value>
+        <value>manual</value>
+        <value>mastersthesis</value>
+        <value>misc</value>
+        <value>phdthesis</value>
+        <value>proceedings</value>
+        <value>techreport</value>
+        <value>unpublished</value>
+        <value>www</value>
+    </choice>
+</define>
+<define name="text-index-body">
+    <element name="text:index-body">
+        <zeroOrMore>
+            <ref name="index-content-main"/>
+        </zeroOrMore>
+    </element>
+</define>
+<define name="index-content-main">
+    <choice>
+        <ref name="text-content"/>
+        <ref name="text-index-title"/>
+    </choice>
+</define>
+<define name="text-index-title">
+    <element name="text:index-title">
+        <ref name="sectionAttr"/>
+        <zeroOrMore>
+            <ref name="index-content-main"/>
+        </zeroOrMore>
+    </element>
+</define>
+<define name="text-table-of-content">
+    <element name="text:table-of-content">
+        <ref name="sectionAttr"/>
+        <ref name="text-table-of-content-source"/>
+        <ref name="text-index-body"/>
+    </element>
+</define>
+<define name="text-table-of-content-source">
+    <element name="text:table-of-content-source">
+        <ref name="text-table-of-content-source-attlist"/>
+        <optional>
+            <ref name="text-index-title-template"/>
+        </optional>
+        <zeroOrMore>
+            <ref name="text-table-of-content-entry-template"/>
+        </zeroOrMore>
+        <zeroOrMore>
+            <ref name="text-index-source-styles"/>
+        </zeroOrMore>
+    </element>
+</define>
+<define name="text-table-of-content-source-attlist" combine="interleave">
+    <optional>
+        <attribute name="text:outline-level">
+            <choice>
+                <ref name="positiveInteger"/>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="text-table-of-content-source-attlist" combine="interleave">
+    <optional>
+        <attribute name="text:use-outline-level" a:defaultValue="true">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-table-of-content-source-attlist" combine="interleave">
+    <optional>
+        <attribute name="text:use-index-marks">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-table-of-content-source-attlist" combine="interleave">
+    <optional>
+        <attribute name="text:use-index-source-styles">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-table-of-content-source-attlist" combine="interleave">
+    <optional>
+        <attribute name="text:index-scope">
+            <choice>
+                <value>document</value>
+                <value>chapter</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="text-table-of-content-source-attlist" combine="interleave">
+    <optional>
+        <attribute name="text:relative-tab-stop-position">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-table-of-content-entry-template">
+    <element name="text:table-of-content-entry-template">
+        <ref name="text-table-of-content-entry-template-attlist"/>
+        <zeroOrMore>
+            <ref name="text-table-of-content-children"/>
+
+        </zeroOrMore>
+    </element>
+</define>
+<define name="text-table-of-content-children">
+    <choice>
+        <ref name="text-index-entry-chapter"/>
+        <ref name="text-index-entry-page-number"/>
+        <ref name="text-index-entry-text"/>
+        <ref name="text-index-entry-span"/>
+        <ref name="text-index-entry-tab-stop"/>
+        <ref name="text-index-entry-link-start"/>
+        <ref name="text-index-entry-link-end"/>
+    </choice>
+</define>
+<define name="text-table-of-content-entry-template-attlist"
+        combine="interleave">
+    <attribute name="text:outline-level">
+        <ref name="positiveInteger"/>
+    </attribute>
+</define>
+<define name="text-table-of-content-entry-template-attlist"
+        combine="interleave">
+    <attribute name="text:style-name">
+        <ref name="styleNameRef"/>
+    </attribute>
+</define>
+<define name="text-illustration-index">
+    <element name="text:illustration-index">
+        <ref name="sectionAttr"/>
+        <ref name="text-illustration-index-source"/>
+        <ref name="text-index-body"/>
+    </element>
+</define>
+<define name="text-illustration-index-source">
+    <element name="text:illustration-index-source">
+        <ref name="text-illustration-index-source-attrs"/>
+        <optional>
+            <ref name="text-index-title-template"/>
+        </optional>
+        <optional>
+            <ref name="text-illustration-index-entry-template"/>
+        </optional>
+    </element>
+</define>
+<define name="text-illustration-index-source-attrs" combine="interleave">
+    <ref name="text-index-scope-attr"/>
+</define>
+<define name="text-index-scope-attr">
+    <optional>
+        <attribute name="text:index-scope" a:defaultValue="document">
+            <choice>
+                <value>document</value>
+                <value>chapter</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="text-illustration-index-source-attrs" combine="interleave">
+    <ref name="text-relative-tab-stop-position-attr"/>
+</define>
+<define name="text-relative-tab-stop-position-attr">
+    <optional>
+        <attribute name="text:relative-tab-stop-position"
+                   a:defaultValue="true">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-illustration-index-source-attrs" combine="interleave">
+    <optional>
+        <attribute name="text:use-caption" a:defaultValue="true">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-illustration-index-source-attrs" combine="interleave">
+    <optional>
+        <attribute name="text:caption-sequence-name">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-illustration-index-source-attrs" combine="interleave">
+    <optional>
+        <attribute name="text:caption-sequence-format">
+            <choice>
+                <value>text</value>
+                <value>category-and-value</value>
+                <value>caption</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="text-illustration-index-entry-template">
+    <element name="text:illustration-index-entry-template">
+        <ref name="text-illustration-index-entry-content"/>
+    </element>
+</define>
+<define name="text-illustration-index-entry-content">
+    <ref name="text-illustration-index-entry-template-attrs"/>
+    <zeroOrMore>
+        <choice>
+            <ref name="text-index-entry-page-number"/>
+            <ref name="text-index-entry-text"/>
+            <ref name="text-index-entry-span"/>
+            <ref name="text-index-entry-tab-stop"/>
+        </choice>
+    </zeroOrMore>
+</define>
+<define name="text-illustration-index-entry-template-attrs">
+    <attribute name="text:style-name">
+        <ref name="styleNameRef"/>
+    </attribute>
+</define>
+<define name="text-table-index">
+    <element name="text:table-index">
+        <ref name="sectionAttr"/>
+        <ref name="text-table-index-source"/>
+        <ref name="text-index-body"/>
+    </element>
+</define>
+<define name="text-table-index-source">
+    <element name="text:table-index-source">
+        <ref name="text-illustration-index-source-attrs"/>
+        <optional>
+            <ref name="text-index-title-template"/>
+        </optional>
+        <optional>
+            <ref name="text-table-index-entry-template"/>
+        </optional>
+    </element>
+</define>
+<define name="text-table-index-entry-template">
+    <element name="text:table-index-entry-template">
+        <ref name="text-illustration-index-entry-content"/>
+    </element>
+</define>
+<define name="text-object-index">
+    <element name="text:object-index">
+        <ref name="sectionAttr"/>
+        <ref name="text-object-index-source"/>
+        <ref name="text-index-body"/>
+    </element>
+</define>
+<define name="text-object-index-source">
+    <element name="text:object-index-source">
+        <ref name="text-object-index-source-attrs"/>
+        <optional>
+            <ref name="text-index-title-template"/>
+        </optional>
+        <optional>
+            <ref name="text-object-index-entry-template"/>
+        </optional>
+    </element>
+</define>
+<define name="text-object-index-source-attrs" combine="interleave">
+    <ref name="text-index-scope-attr"/>
+</define>
+<define name="text-object-index-source-attrs" combine="interleave">
+    <ref name="text-relative-tab-stop-position-attr"/>
+</define>
+<define name="text-object-index-source-attrs" combine="interleave">
+    <optional>
+        <attribute name="text:use-spreadsheet-objects" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-object-index-source-attrs" combine="interleave">
+    <optional>
+        <attribute name="text:use-math-objects" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-object-index-source-attrs" combine="interleave">
+    <optional>
+        <attribute name="text:use-draw-objects" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-object-index-source-attrs" combine="interleave">
+    <optional>
+        <attribute name="text:use-chart-objects" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-object-index-source-attrs" combine="interleave">
+    <optional>
+        <attribute name="text:use-other-objects" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-object-index-entry-template">
+    <element name="text:object-index-entry-template">
+        <ref name="text-illustration-index-entry-content"/>
+    </element>
+</define>
+<define name="text-user-index">
+    <element name="text:user-index">
+        <ref name="sectionAttr"/>
+        <ref name="text-user-index-source"/>
+        <ref name="text-index-body"/>
+    </element>
+</define>
+<define name="text-user-index-source">
+    <element name="text:user-index-source">
+        <ref name="text-user-index-source-attr"/>
+        <optional>
+            <ref name="text-index-title-template"/>
+        </optional>
+        <zeroOrMore>
+            <ref name="text-user-index-entry-template"/>
+        </zeroOrMore>
+        <zeroOrMore>
+            <ref name="text-index-source-styles"/>
+        </zeroOrMore>
+    </element>
+</define>
+<define name="text-user-index-source-attr" combine="interleave">
+    <ref name="text-index-scope-attr"/>
+    <ref name="text-relative-tab-stop-position-attr"/>
+    <attribute name="text:index-name">
+        <ref name="string"/>
+    </attribute>
+</define>
+<define name="text-user-index-source-attr" combine="interleave">
+    <optional>
+        <attribute name="text:use-index-marks" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="text:use-graphics" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="text:use-tables" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="text:use-floating-frames"
+                     a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="text:use-objects" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-user-index-source-attr" combine="interleave">
+    <optional>
+        <attribute name="text:copy-outline-levels"
+                     a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-user-index-entry-template">
+    <element name="text:user-index-entry-template">
+        <ref name="text-user-index-entry-template-attrs"/>
+        <zeroOrMore>
+            <choice>
+                <ref name="text-index-entry-chapter"/>
+                <ref name="text-index-entry-page-number"/>
+                <ref name="text-index-entry-text"/>
+                <ref name="text-index-entry-span"/>
+                <ref name="text-index-entry-tab-stop"/>
+            </choice>
+        </zeroOrMore>
+    </element>
+</define>
+<define name="text-user-index-entry-template-attrs" combine="interleave">
+    <attribute name="text:outline-level">
+        <ref name="positiveInteger"/>
+    </attribute>
+</define>
+<define name="text-user-index-entry-template-attrs" combine="interleave">
+    <attribute name="text:style-name">
+        <ref name="styleNameRef"/>
+    </attribute>
+</define>
+<define name="text-alphabetical-index">
+    <element name="text:alphabetical-index">
+        <ref name="sectionAttr"/>
+        <ref name="text-alphabetical-index-source"/>
+        <ref name="text-index-body"/>
+    </element>
+</define>
+<define name="text-alphabetical-index-source">
+    <element name="text:alphabetical-index-source">
+        <ref name="text-alphabetical-index-source-attrs"/>
+        <optional>
+            <ref name="text-index-title-template"/>
+        </optional>
+        <zeroOrMore>
+            <ref name="text-alphabetical-index-entry-template"/>
+        </zeroOrMore>
+    </element>
+</define>
+<define name="text-alphabetical-index-source-attrs" combine="interleave">
+    <ref name="text-index-scope-attr"/>
+    <ref name="text-relative-tab-stop-position-attr"/>
+</define>
+<define name="text-alphabetical-index-source-attrs" combine="interleave">
+    <optional>
+        <attribute name="text:ignore-case" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-alphabetical-index-source-attrs" combine="interleave">
+    <optional>
+        <attribute name="text:main-entry-style-name">
+            <ref name="styleNameRef"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-alphabetical-index-source-attrs" combine="interleave">
+    <optional>
+        <attribute name="text:alphabetical-separators" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-alphabetical-index-source-attrs" combine="interleave">
+    <optional>
+        <attribute name="text:combine-entries" a:defaultValue="true">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="text:combine-entries-with-dash"
+                   a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="text:combine-entries-with-pp" a:defaultValue="true">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-alphabetical-index-source-attrs" combine="interleave">
+    <optional>
+        <attribute name="text:use-keys-as-entries" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-alphabetical-index-source-attrs" combine="interleave">
+    <optional>
+        <attribute name="text:capitalize-entries" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-alphabetical-index-source-attrs" combine="interleave">
+    <optional>
+        <attribute name="text:comma-separated" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-alphabetical-index-source-attrs" combine="interleave">
+    <optional>
+        <attribute name="fo:language">
+            <ref name="languageCode"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-alphabetical-index-source-attrs" combine="interleave">
+    <optional>
+        <attribute name="fo:country">
+            <ref name="countryCode"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-alphabetical-index-source-attrs" combine="interleave">
+    <optional>
+        <attribute name="text:sort-algorithm">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-alphabetical-index-auto-mark-file">
+    <element name="text:alphabetical-index-auto-mark-file">
+        <attribute name="xlink:href">
+            <ref name="anyURI"/>
+        </attribute>
+        <optional>
+            <attribute name="xlink:type" a:defaultValue="simple">
+                <value>simple</value>
+            </attribute>
+        </optional>
+    </element>
+</define>
+<define name="text-alphabetical-index-entry-template">
+    <element name="text:alphabetical-index-entry-template">
+        <ref name="text-alphabetical-index-entry-template-attrs"/>
+        <zeroOrMore>
+            <choice>
+                <ref name="text-index-entry-chapter"/>
+                <ref name="text-index-entry-page-number"/>
+                <ref name="text-index-entry-text"/>
+                <ref name="text-index-entry-span"/>
+                <ref name="text-index-entry-tab-stop"/>
+            </choice>
+        </zeroOrMore>
+    </element>
+</define>
+<define name="text-alphabetical-index-entry-template-attrs"
+        combine="interleave">
+    <attribute name="text:outline-level">
+        <choice>
+            <value>1</value>
+            <value>2</value>
+            <value>3</value>
+            <value>separator</value>
+        </choice>
+    </attribute>
+</define>
+<define name="text-alphabetical-index-entry-template-attrs"
+        combine="interleave">
+    <attribute name="text:style-name">
+        <ref name="styleNameRef"/>
+    </attribute>
+</define>
+<define name="text-bibliography">
+    <element name="text:bibliography">
+        <ref name="sectionAttr"/>
+        <ref name="text-bibliography-source"/>
+        <ref name="text-index-body"/>
+    </element>
+</define>
+<define name="text-bibliography-source">
+    <element name="text:bibliography-source">
+        <optional>
+            <ref name="text-index-title-template"/>
+        </optional>
+        <zeroOrMore>
+            <ref name="text-bibliography-entry-template"/>
+        </zeroOrMore>
+    </element>
+</define>
+<define name="text-bibliography-entry-template">
+    <element name="text:bibliography-entry-template">
+        <ref name="text-bibliography-entry-template-attrs"/>
+        <zeroOrMore>
+            <choice>
+                <ref name="text-index-entry-span"/>
+                <ref name="text-index-entry-tab-stop"/>
+                <ref name="text-index-entry-bibliography"/>
+            </choice>
+        </zeroOrMore>
+    </element>
+</define>
+<define name="text-bibliography-entry-template-attrs" combine="interleave">
+    <attribute name="text:bibliography-type">
+        <ref name="text-bibliography-types"/>
+    </attribute>
+</define>
+<define name="text-bibliography-entry-template-attrs" combine="interleave">
+    <attribute name="text:style-name">
+        <ref name="styleNameRef"/>
+    </attribute>
+</define>
+<define name="text-index-source-styles">
+    <element name="text:index-source-styles">
+        <attribute name="text:outline-level">
+            <ref name="positiveInteger"/>
+        </attribute>
+        <zeroOrMore>
+            <ref name="text-index-source-style"/>
+        </zeroOrMore>
+    </element>
+</define>
+<define name="text-index-source-style">
+    <element name="text:index-source-style">
+        <attribute name="text:style-name">
+            <ref name="styleName"/>
+        </attribute>
+        <empty/>
+    </element>
+</define>
+<define name="text-index-title-template">
+    <element name="text:index-title-template">
+        <optional>
+            <attribute name="text:style-name">
+                <ref name="styleNameRef"/>
+            </attribute>
+        </optional>
+        <text/>
+    </element>
+</define>
+<define name="text-index-entry-chapter">
+    <element name="text:index-entry-chapter">
+        <optional>
+            <attribute name="text:style-name">
+                <ref name="styleNameRef"/>
+            </attribute>
+        </optional>
+        <ref name="text-index-entry-chapter-attrs"/>
+    </element>
+</define>
+<define name="text-index-entry-chapter-attrs">
+    <optional>
+        <attribute name="text:display" a:defaultValue="number">
+            <choice>
+                <value>name</value>
+                <value>number</value>
+                <value>number-and-name</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="text-index-entry-text">
+    <element name="text:index-entry-text">
+        <optional>
+            <attribute name="text:style-name">
+                <ref name="styleNameRef"/>
+            </attribute>
+        </optional>
+    </element>
+</define>
+<define name="text-index-entry-page-number">
+    <element name="text:index-entry-page-number">
+        <optional>
+            <attribute name="text:style-name">
+                <ref name="styleNameRef"/>
+            </attribute>
+        </optional>
+    </element>
+</define>
+<define name="text-index-entry-span">
+    <element name="text:index-entry-span">
+        <optional>
+            <attribute name="text:style-name">
+                <ref name="styleNameRef"/>
+            </attribute>
+        </optional>
+        <text/>
+    </element>
+</define>
+<define name="text-index-entry-bibliography">
+    <element name="text:index-entry-bibliography">
+        <ref name="text-index-entry-bibliography-attrs"/>
+    </element>
+</define>
+<define name="text-index-entry-bibliography-attrs" combine="interleave">
+    <optional>
+        <attribute name="text:style-name">
+            <ref name="styleNameRef"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-index-entry-bibliography-attrs" combine="interleave">
+    <attribute name="text:bibliography-data-field">
+        <choice>
+            <value>address</value>
+            <value>annote</value>
+            <value>author</value>
+            <value>bibliography-type</value>
+            <value>booktitle</value>
+            <value>chapter</value>
+            <value>custom1</value>
+            <value>custom2</value>
+            <value>custom3</value>
+            <value>custom4</value>
+            <value>custom5</value>
+            <value>edition</value>
+            <value>editor</value>
+            <value>howpublished</value>
+            <value>identifier</value>
+            <value>institution</value>
+            <value>isbn</value>
+            <value>issn</value>
+            <value>journal</value>
+            <value>month</value>
+            <value>note</value>
+            <value>number</value>
+            <value>organizations</value>
+            <value>pages</value>
+            <value>publisher</value>
+            <value>report-type</value>
+            <value>school</value>
+            <value>series</value>
+            <value>title</value>
+            <value>url</value>
+            <value>volume</value>
+            <value>year</value>
+        </choice>
+    </attribute>
+</define>
+<define name="text-index-entry-tab-stop">
+    <element name="text:index-entry-tab-stop">
+        <optional>
+            <attribute name="text:style-name">
+                <ref name="styleNameRef"/>
+            </attribute>
+        </optional>
+        <ref name="text-index-entry-tab-stop-attrs"/>
+    </element>
+</define>
+<define name="text-index-entry-tab-stop-attrs" combine="interleave">
+    <optional>
+        <attribute name="style:leader-char">
+            <ref name="character"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-index-entry-tab-stop-attrs" combine="interleave">
+    <choice>
+        <attribute name="style:type">
+            <value>right</value>
+        </attribute>
+        <group>
+            <attribute name="style:type">
+                <value>left</value>
+            </attribute>
+            <attribute name="style:position">
+                <ref name="length"/>
+            </attribute>
+        </group>
+    </choice>
+</define>
+<define name="text-index-entry-link-start">
+    <element name="text:index-entry-link-start">
+        <optional>
+            <attribute name="text:style-name">
+                <ref name="styleNameRef"/>
+            </attribute>
+        </optional>
+    </element>
+</define>
+<define name="text-index-entry-link-end">
+    <element name="text:index-entry-link-end">
+        <optional>
+            <attribute name="text:style-name">
+                <ref name="styleNameRef"/>
+            </attribute>
+        </optional>
+    </element>
+</define>
+<define name="table-table">
+    <element name="table:table">
+        <ref name="table-table-attlist"/>
+        <optional>
+            <ref name="table-table-source"/>
+        </optional>
+        <optional>
+            <ref name="office-dde-source"/>
+        </optional>
+        <optional>
+            <ref name="table-scenario"/>
+        </optional>
+        <optional>
+            <ref name="office-forms"/>
+        </optional>
+        <optional>
+            <ref name="table-shapes"/>
+        </optional>
+        <ref name="table-columns-and-groups"/>
+        <ref name="table-rows-and-groups"/>
+    </element>
+</define>
+<define name="table-columns-and-groups">
+    <oneOrMore>
+        <choice>
+            <ref name="table-table-column-group"/>
+            <ref name="table-columns-no-group"/>
+        </choice>
+    </oneOrMore>
+</define>
+
+<define name="table-columns-no-group">
+    <choice>
+        <group>
+            <ref name="table-columns"/>
+            <optional>
+                <ref name="table-table-header-columns"/>
+                <optional>
+                    <ref name="table-columns"/>
+                </optional>
+            </optional>
+        </group>
+        <group>
+            <ref name="table-table-header-columns"/>
+            <optional>
+                <ref name="table-columns"/>
+            </optional>
+        </group>
+    </choice>
+</define>
+
+<define name="table-columns">
+    <choice>
+        <ref name="table-table-columns"/>
+        <oneOrMore>
+                <ref name="table-table-column"/>
+        </oneOrMore>
+    </choice>
+</define>
+
+<define name="table-rows-and-groups">
+    <oneOrMore>
+        <choice>
+            <ref name="table-table-row-group"/>
+            <ref name="table-rows-no-group"/>
+        </choice>
+    </oneOrMore>
+</define>
+
+<define name="table-rows-no-group">
+    <choice>
+        <group>
+            <ref name="table-rows"/>
+            <optional>
+                <ref name="table-table-header-rows"/>
+                <optional>
+                    <ref name="table-rows"/>
+                </optional>
+            </optional>
+        </group>
+        <group>
+            <ref name="table-table-header-rows"/>
+            <optional>
+                <ref name="table-rows"/>
+            </optional>
+        </group>
+    </choice>
+</define>
+
+<define name="table-rows">
+    <choice>
+        <ref name="table-table-rows"/>
+        <oneOrMore>
+                <ref name="table-table-row"/>
+        </oneOrMore>
+    </choice>
+</define>
+<define name="table-table-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:name">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-table-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:style-name">
+            <ref name="styleNameRef"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-table-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:protected" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="table:protection-key">
+            <text/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-table-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:print" a:defaultValue="true">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-table-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:print-ranges">
+            <ref name="cellRangeAddressList"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-table-row">
+    <element name="table:table-row">
+        <ref name="table-table-row-attlist"/>
+        <oneOrMore>
+            <choice>
+                <ref name="table-table-cell"/>
+                <ref name="table-covered-table-cell"/>
+            </choice>
+        </oneOrMore>
+    </element>
+</define>
+<define name="table-table-row-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:number-rows-repeated" a:defaultValue="1">
+            <ref name="positiveInteger"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-table-row-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:style-name">
+            <ref name="styleNameRef"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-table-row-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:default-cell-style-name">
+            <ref name="styleNameRef"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-table-row-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:visibility" a:defaultValue="visible">
+            <ref name="table-visibility-value"/>
+        </attribute>
+    </optional>
+</define>
+
+<define name="table-visibility-value">
+    <choice>
+        <value>visible</value>
+        <value>collapse</value>
+        <value>filter</value>
+    </choice>
+</define>
+<define name="table-table-cell">
+    <element name="table:table-cell">
+        <ref name="table-table-cell-attlist"/>
+        <ref name="table-table-cell-attlist-extra"/>
+        <ref name="table-table-cell-content"/>
+    </element>
+</define>
+
+<define name="table-covered-table-cell">
+    <element name="table:covered-table-cell">
+        <ref name="table-table-cell-attlist"/>
+        <ref name="table-table-cell-content"/>
+    </element>
+</define>
+
+<define name="table-table-cell-content">
+    <optional>
+        <ref name="table-cell-range-source"/>
+    </optional>
+    <optional>
+        <ref name="office-annotation"/>
+    </optional>
+    <optional>
+        <ref name="table-detective"/>
+    </optional>
+    <zeroOrMore>
+        <ref name="text-content"/>
+    </zeroOrMore>
+</define>
+<define name="table-table-cell-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:number-columns-repeated" a:defaultValue="1">
+            <ref name="positiveInteger"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-table-cell-attlist-extra" combine="interleave">
+    <optional>
+        <attribute name="table:number-columns-spanned" a:defaultValue="1">
+            <ref name="positiveInteger"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="table:number-rows-spanned" a:defaultValue="1">
+            <ref name="positiveInteger"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-table-cell-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:style-name">
+            <ref name="styleNameRef"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-table-cell-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:content-validation-name">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-table-cell-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:formula">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-table-cell-attlist-extra" combine="interleave">
+    <optional>
+        <attribute name="table:number-matrix-columns-spanned">
+            <ref name="positiveInteger"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="table:number-matrix-rows-spanned">
+            <ref name="positiveInteger"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-table-cell-attlist" combine="interleave">
+    <optional>
+        <ref name="common-value-and-type-attlist"/>
+    </optional>
+</define>
+<define name="table-table-cell-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:protect" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-table-column">
+    <element name="table:table-column">
+        <ref name="table-table-column-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="table-table-column-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:number-columns-repeated" a:defaultValue="1">
+            <ref name="positiveInteger"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-table-column-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:style-name">
+            <ref name="styleNameRef"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-table-column-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:visibility" a:defaultValue="visible">
+            <ref name="table-visibility-value"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-table-column-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:default-cell-style-name">
+            <ref name="styleNameRef"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-table-header-columns">
+    <element name="table:table-header-columns">
+        <oneOrMore>
+            <ref name="table-table-column"/>
+        </oneOrMore>
+    </element>
+</define>
+
+<define name="table-table-columns">
+    <element name="table:table-columns">
+        <oneOrMore>
+            <ref name="table-table-column"/>
+        </oneOrMore>
+    </element>
+</define>
+<define name="table-table-column-group">
+    <element name="table:table-column-group">
+        <ref name="table-table-column-group-attlist"/>
+        <ref name="table-columns-and-groups"/>
+    </element>
+</define>
+<define name="table-table-column-group-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:display" a:defaultValue="true">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-table-header-rows">
+    <element name="table:table-header-rows">
+        <oneOrMore>
+            <ref name="table-table-row"/>
+        </oneOrMore>
+    </element>
+</define>
+
+<define name="table-table-rows">
+    <element name="table:table-rows">
+        <oneOrMore>
+            <ref name="table-table-row"/>
+        </oneOrMore>
+    </element>
+</define>
+<define name="table-table-row-group">
+    <element name="table:table-row-group">
+        <ref name="table-table-row-group-attlist"/>
+        <ref name="table-rows-and-groups"/>
+    </element>
+</define>
+<define name="table-table-row-group-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:display" a:defaultValue="true">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-table-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:is-sub-table" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="cellAddress">
+    <data type="string">
+        <param name="pattern">($?([^\. ']+|'[^']+'))?\.$?[A-Z]+$?[0-9]+</param>
+    </data>
+</define>
+<define name="cellRangeAddress">
+    <data type="string">
+        <param name="pattern">($?([^\. ']+|'[^']+'))?\.$?[A-Z]+$?[0-9]+(:($?([^\. ']+|'[^']+'))?\.$?[A-Z]+$?[0-9]+)?</param>
+
+    </data>
+</define>
+<define name="cellRangeAddressList">
+    <!-- Value is a space separated list of "cellRangeAddress" patterns -->
+    <data type="string"/> 
+</define>
+<define name="table-table-source">
+    <element name="table:table-source">
+        <ref name="table-table-source-attlist"/>
+        <ref name="table-linked-source-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="table-table-source-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:mode" a:defaultValue="copy-all">
+            <choice>
+                <value>copy-all</value>
+                <value>copy-results-only</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="table-table-source-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:table-name">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-linked-source-attlist" combine="interleave">
+    <optional>
+        <attribute name="xlink:type" a:defaultValue="simple">
+            <value>simple</value>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="xlink:actuate" a:defaultValue="onRequest">
+            <value>onRequest</value>
+        </attribute>
+    </optional>
+    <attribute name="xlink:href">
+        <ref name="anyURI"/>
+    </attribute>
+</define>
+<define name="table-linked-source-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:filter-name">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-linked-source-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:filter-options">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-linked-source-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:refresh-delay">
+            <ref name="duration"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-scenario">
+    <element name="table:scenario">
+        <ref name="table-scenario-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="table-scenario-attlist" combine="interleave">
+    <attribute name="table:scenario-ranges">
+        <ref name="cellRangeAddressList"/>
+    </attribute>
+</define>
+<define name="table-scenario-attlist" combine="interleave">
+    <attribute name="table:is-active">
+        <ref name="boolean"/>
+    </attribute>
+</define>
+<define name="table-scenario-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:display-border" a:defaultValue="true">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-scenario-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:border-color">
+            <ref name="color"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-scenario-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:copy-back" a:defaultValue="true">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-scenario-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:copy-styles" a:defaultValue="true">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-scenario-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:copy-formulas" a:defaultValue="true">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-scenario-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:comment">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-scenario-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:protected">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-shapes">
+    <element name="table:shapes">
+        <oneOrMore>
+            <ref name="shape"/>
+        </oneOrMore>
+    </element>
+</define>
+<define name="table-cell-range-source">
+    <element name="table:cell-range-source">
+        <ref name="table-table-cell-range-source-attlist"/>
+        <ref name="table-linked-source-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="table-table-cell-range-source-attlist" combine="interleave">
+    <attribute name="table:name">
+        <ref name="string"/>
+    </attribute>
+</define>
+<define name="table-table-cell-range-source-attlist" combine="interleave">
+    <attribute name="table:last-column-spanned">
+        <ref name="positiveInteger"/>
+    </attribute>
+    <attribute name="table:last-row-spanned">
+        <ref name="positiveInteger"/>
+    </attribute>
+</define>
+<define name="table-detective">
+    <element name="table:detective">
+        <zeroOrMore>
+            <ref name="table-highlighted-range"/>
+        </zeroOrMore>
+        <zeroOrMore>
+            <ref name="table-operation"/>
+        </zeroOrMore>
+    </element>
+</define>
+<define name="table-operation">
+    <element name="table:operation">
+        <ref name="table-operation-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="table-operation-attlist" combine="interleave">
+    <attribute name="table:name">
+        <choice>
+            <value>trace-dependents</value>
+            <value>remove-dependents</value>
+            <value>trace-precedents</value>
+            <value>remove-precedents</value>
+            <value>trace-errors</value>
+        </choice>
+    </attribute>
+</define>
+<define name="table-operation-attlist" combine="interleave">
+    <attribute name="table:index">
+        <ref name="nonNegativeInteger"/>
+    </attribute>
+</define>
+<define name="table-highlighted-range">
+    <element name="table:highlighted-range">
+        <choice>
+            <group>
+                <ref name="table-highlighted-range-attlist"/>
+            </group>
+            <group>
+                <ref name="table-highlighted-range-attlist-invalid"/>
+            </group>
+        </choice>
+        <empty/>
+    </element>
+</define>
+<define name="table-highlighted-range-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:cell-range-address">
+            <ref name="cellRangeAddress"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-highlighted-range-attlist" combine="interleave">
+    <attribute name="table:direction">
+        <choice>
+            <value>from-another-table</value>
+            <value>to-another-table</value>
+            <value>from-same-table</value>
+        </choice>
+    </attribute>
+</define>
+<define name="table-highlighted-range-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:contains-error" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-highlighted-range-attlist-invalid" combine="interleave">
+    <attribute name="table:marked-invalid">
+        <ref name="boolean"/>
+    </attribute>
+</define>
+<define name="office-spreadsheet-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:structure-protected" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="table:protection-key">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-calculation-settings">
+    <element name="table:calculation-settings">
+        <ref name="table-calculation-setting-attlist"/>
+        <optional>
+            <ref name="table-null-date"/>
+        </optional>
+        <optional>
+            <ref name="table-iteration"/>
+        </optional>
+    </element>
+</define>
+<define name="table-calculation-setting-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:case-sensitive" a:defaultValue="true">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-calculation-setting-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:precision-as-shown" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-calculation-setting-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:search-criteria-must-apply-to-whole-cell"
+                     a:defaultValue="true">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-calculation-setting-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:automatic-find-labels" a:defaultValue="true">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-calculation-setting-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:use-regular-expressions"
+                     a:defaultValue="true">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-calculation-setting-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:null-year" a:defaultValue="1930">
+            <ref name="positiveInteger"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-null-date">
+    <element name="table:null-date">
+        <optional>
+            <attribute name="table:value-type" a:defaultValue="date">
+                <ref name="valueType"/>
+            </attribute>
+        </optional>
+        <optional>
+            <attribute name="table:date-value-type" 
+                         a:defaultValue="1899-12-30">
+                <ref name="date"/>
+            </attribute>
+        </optional>
+        <empty/>
+    </element>
+</define>
+<define name="table-iteration">
+    <element name="table:iteration">
+        <optional>
+            <attribute name="table:status" a:defaultValue="disable">
+                <choice>
+                    <value>enable</value>
+                    <value>disable</value>
+                </choice>
+            </attribute>
+        </optional>
+        <optional>
+            <attribute name="table:steps" a:defaultValue="100">
+                <ref name="positiveInteger"/>
+            </attribute>
+        </optional>
+        <optional>
+            <attribute name="table:maximum-difference"
+                         a:defaultValue="0.001">
+                <ref name="double"/>
+            </attribute>
+        </optional>
+        <empty/>
+    </element>
+</define>
+<define name="table-content-validations">
+    <element name="table:content-validations">
+        <oneOrMore>
+            <ref name="table-content-validation"/>
+        </oneOrMore>
+    </element>
+</define>
+
+<define name="table-content-validation">
+    <element name="table:content-validation">
+        <ref name="table-validation-attlist"/>
+        <optional>
+            <ref name="table-help-message"/>
+        </optional>
+        <optional>
+            <choice>
+                <ref name="table-error-message"/>
+                <group>
+                    <ref name="table-error-macro"/>
+                    <optional>
+                        <ref name="office-event-listeners"/>
+                    </optional>
+                </group>
+            </choice>
+        </optional>
+    </element>
+</define>
+<define name="table-validation-attlist" combine="interleave">
+    <attribute name="table:name">
+        <ref name="string"/>
+    </attribute>
+</define>
+<define name="table-validation-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:condition">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-validation-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:base-cell-address">
+            <ref name="cellAddress"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-validation-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:allow-empty-cell" a:defaultValue="true">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-validation-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:display-list" a:defaultValue="unsorted">
+            <choice>
+                <value>none</value>
+                <value>unsorted</value>
+                <value>sort-ascending</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="table-help-message">
+    <element name="table:help-message">
+        <optional>
+            <attribute name="table:title">
+                <ref name="string"/>
+            </attribute>
+        </optional>
+        <optional>
+            <attribute name="table:display" a:defaultValue="false">
+                <ref name="boolean"/>
+            </attribute>
+        </optional>
+        <zeroOrMore>
+            <ref name="text-p"/>
+        </zeroOrMore>
+    </element>
+</define>
+<define name="table-error-message">
+    <element name="table:error-message">
+        <optional>
+            <attribute name="table:title">
+                <ref name="string"/>
+            </attribute>
+        </optional>
+        <optional>
+            <attribute name="table:display" a:defaultValue="false">
+                <ref name="boolean"/>
+            </attribute>
+        </optional>
+        <optional>
+            <attribute name="table:message-type" a:defaultValue="stop">
+                <choice>
+                    <value>stop</value>
+                    <value>warning</value>
+                    <value>information</value>
+                </choice>
+            </attribute>
+        </optional>
+        <zeroOrMore>
+            <ref name="text-p"/>
+        </zeroOrMore>
+    </element>
+</define>
+<define name="table-error-macro">
+    <element name="table:error-macro">
+        <optional>
+            <attribute name="table:execute" a:defaultValue="true">
+                <ref name="boolean"/>
+            </attribute>
+        </optional>
+    </element>
+</define>
+<define name="table-label-ranges">
+    <element name="table:label-ranges">
+        <zeroOrMore>
+            <ref name="table-label-range"/>
+        </zeroOrMore>
+    </element>
+</define>
+
+<define name="table-label-range">
+    <element name="table:label-range">
+        <ref name="table-label-range-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="table-label-range-attlist" combine="interleave">
+    <attribute name="table:label-cell-range-address">
+        <ref name="cellRangeAddress"/>
+    </attribute>
+</define>
+<define name="table-label-range-attlist" combine="interleave">
+    <attribute name="table:data-cell-range-address">
+        <ref name="cellRangeAddress"/>
+    </attribute>
+</define>
+<define name="table-label-range-attlist" combine="interleave">
+    <attribute name="table:orientation">
+        <choice>
+            <value>column</value>
+            <value>row</value>
+        </choice>
+    </attribute>
+</define>
+<define name="table-named-expressions">
+    <element name="table:named-expressions">
+        <zeroOrMore>
+            <choice>
+                <ref name="table-named-range"/>
+                <ref name="table-named-expression"/>
+            </choice>
+        </zeroOrMore>
+    </element>
+</define>
+
+<define name="table-named-range">
+    <element name="table:named-range">
+        <ref name="table-named-range-attlist"/>
+        <empty/>
+    </element>
+</define>
+
+<define name="table-named-range-attlist" combine="interleave">
+    <attribute name="table:name">
+        <ref name="string"/>
+    </attribute>
+    <attribute name="table:cell-range-address">
+        <ref name="cellRangeAddress"/>
+    </attribute>
+    <optional>
+        <attribute name="table:base-cell-address">
+            <ref name="cellAddress"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="table:range-usable-as" a:defaultValue="none">
+            <choice>
+                <value>none</value>
+                <list>
+                    <oneOrMore>
+                        <choice>
+                            <value>print-range</value>
+                            <value>filter</value>
+                            <value>repeat-row</value>
+                            <value>repeat-column</value>
+                        </choice>
+                    </oneOrMore>
+                </list>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="table-named-expression">
+    <element name="table:named-expression">
+        <ref name="table-named-expression-attlist"/>
+        <empty/>
+    </element>
+</define>
+
+<define name="table-named-expression-attlist" combine="interleave">
+    <attribute name="table:name">
+        <ref name="string"/>
+    </attribute>
+    <attribute name="table:expression">
+        <ref name="string"/>
+    </attribute>
+    <optional>
+        <attribute name="table:base-cell-address">
+            <ref name="cellAddress"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-database-ranges">
+    <element name="table:database-ranges">
+        <zeroOrMore>
+            <ref name="table-database-range"/>
+        </zeroOrMore>
+    </element>
+</define>
+<define name="table-database-range">
+    <element name="table:database-range">
+        <ref name="table-database-range-attlist"/>
+        <optional>
+            <choice>
+                <ref name="table-database-source-sql"/>
+                <ref name="table-database-source-table"/>
+                <ref name="table-database-source-query"/>
+            </choice>
+        </optional>
+        <optional>
+            <ref name="table-filter"/>
+        </optional>
+        <optional>
+            <ref name="table-sort"/>
+        </optional>
+        <optional>
+            <ref name="table-subtotal-rules"/>
+        </optional>
+    </element>
+</define>
+<define name="table-database-range-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:name">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-database-range-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:is-selection" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-database-range-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:on-update-keep-styles" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-database-range-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:on-update-keep-size" a:defaultValue="true">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-database-range-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:has-persistent-data" a:defaultValue="true">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-database-range-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:orientation" a:defaultValue="row">
+            <choice>
+                <value>column</value>
+                <value>row</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="table-database-range-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:contains-header" a:defaultValue="true">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-database-range-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:display-filter-buttons"
+                   a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-database-range-attlist" combine="interleave">
+    <attribute name="table:target-range-address">
+        <ref name="cellRangeAddress"/>
+    </attribute>
+</define>
+<define name="table-database-range-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:refresh-delay">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-database-source-sql">
+    <element name="table:database-source-sql">
+        <ref name="table-database-source-sql-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="table-database-source-sql-attlist" combine="interleave">
+    <attribute name="table:database-name">
+        <ref name="string"/>
+    </attribute>
+</define>
+<define name="table-database-source-sql-attlist" combine="interleave">
+    <attribute name="table:sql-statement">
+        <ref name="string"/>
+    </attribute>
+</define>
+<define name="table-database-source-sql-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:parse-sql-statement" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-database-source-query">
+    <element name="table:database-source-table">
+        <ref name="table-database-source-table-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="table-database-source-table-attlist" combine="interleave">
+    <attribute name="table:database-name">
+        <ref name="string"/>
+    </attribute>
+</define>
+<define name="table-database-source-table-attlist" combine="interleave">
+    <attribute name="table:database-table-name">
+        <ref name="string"/>
+    </attribute>
+</define>
+<define name="table-database-source-table">
+    <element name="table:database-source-query">
+        <ref name="table-database-source-query-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="table-database-source-query-attlist" combine="interleave">
+    <attribute name="table:database-name">
+        <ref name="string"/>
+    </attribute>
+</define>
+<define name="table-database-source-query-attlist" combine="interleave">
+    <attribute name="table:query-name">
+        <ref name="string"/>
+    </attribute>
+</define>
+<define name="table-sort">
+    <element name="table:sort">
+        <ref name="table-sort-attlist"/>
+        <oneOrMore>
+            <ref name="table-sort-by"/>
+        </oneOrMore>
+    </element>
+</define>
+<define name="table-sort-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:bind-styles-to-content" a:defaultValue="true">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-sort-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:target-range-address">
+            <ref name="cellRangeAddress"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-sort-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:case-sensitive" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-sort-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:language">
+            <ref name="languageCode"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-sort-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:country">
+            <ref name="countryCode"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-sort-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:algorithm">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-sort-by">
+    <element name="table:sort-by">
+        <ref name="table-sort-by-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="table-sort-by-attlist" combine="interleave">
+    <attribute name="table:field-number">
+        <ref name="nonNegativeInteger"/>
+    </attribute>
+</define>
+<define name="table-sort-by-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:data-type" a:defaultValue="automatic">
+            <choice>
+                <value>text</value>
+                <value>number</value>
+                <value>automatic</value>
+                <ref name="string"/>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="table-sort-by-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:order" a:defaultValue="ascending">
+            <choice>
+                <value>ascending</value>
+                <value>descending</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="table-subtotal-rules">
+    <element name="table:subtotal-rules">
+        <ref name="table-subtotal-rules-attlist"/>
+        <optional>
+            <ref name="table-sort-groups"/>
+        </optional>
+        <zeroOrMore>
+            <ref name="table-subtotal-rule"/>
+        </zeroOrMore>
+    </element>
+</define>
+<define name="table-subtotal-rules-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:bind-styles-to-content" a:defaultValue="true">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-subtotal-rules-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:case-sensitive" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-subtotal-rules-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:page-breaks-on-group-change"
+                   a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-sort-groups">
+    <element name="table:sort-groups">
+        <ref name="table-sort-groups-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="table-sort-groups-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:data-type" a:defaultValue="automatic">
+            <choice>
+                <value>text</value>
+                <value>number</value>
+                <value>automatic</value>
+                <ref name="string"/>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="table-sort-groups-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:order" a:defaultValue="ascending">
+            <choice>
+                <value>ascending</value>
+                <value>descending</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="table-subtotal-rule">
+    <element name="table:subtotal-rule">
+        <ref name="table-subtotal-rule-attlist"/>
+        <zeroOrMore>
+            <ref name="table-subtotal-field"/>
+        </zeroOrMore>
+    </element>
+</define>
+<define name="table-subtotal-rule-attlist" combine="interleave">
+    <attribute name="table:group-by-field-number">
+        <ref name="nonNegativeInteger"/>
+    </attribute>
+</define>
+<define name="table-subtotal-field">
+    <element name="table:subtotal-field">
+        <ref name="table-subtotal-field-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="table-subtotal-field-attlist" combine="interleave">
+    <attribute name="table:field-number">
+        <ref name="nonNegativeInteger"/>
+    </attribute>
+</define>
+<define name="table-subtotal-field-attlist" combine="interleave">
+    <attribute name="table:function">
+        <choice>
+            <value>auto</value>
+            <value>average</value>
+            <value>count</value>
+            <value>countnums</value>
+            <value>max</value>
+            <value>min</value>
+            <value>product</value>
+            <value>stdev</value>
+            <value>stdevp</value>
+            <value>sum</value>
+            <value>var</value>
+            <value>varp</value>
+            <ref name="string"/>
+        </choice>
+    </attribute>
+</define>
+<define name="table-filter">
+    <element name="table:filter">
+        <ref name="table-filter-attlist"/>
+        <choice>
+            <ref name="table-filter-condition"/>
+            <ref name="table-filter-and"/>
+            <ref name="table-filter-or"/>
+        </choice>
+    </element>
+</define>
+<define name="table-filter-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:target-range-address">
+            <ref name="cellRangeAddress"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-filter-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:condition-source" a:defaultValue="self">
+            <choice>
+                <value>self</value>
+                <value>cell-range</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="table-filter-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:condition-source-range-address">
+            <ref name="cellRangeAddress"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-filter-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:display-duplicates" a:defaultValue="true">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-filter-and">
+    <element name="table:filter-and">
+        <oneOrMore>
+            <choice>
+                <ref name="table-filter-or"/>
+                <ref name="table-filter-condition"/>
+            </choice>
+        </oneOrMore>
+    </element>
+</define>
+<define name="table-filter-or">
+    <element name="table:filter-or">
+        <oneOrMore>
+            <choice>
+                <ref name="table-filter-and"/>
+                <ref name="table-filter-condition"/>
+            </choice>
+        </oneOrMore>
+    </element>
+</define>
+<define name="table-filter-condition">
+    <element name="table:filter-condition">
+        <ref name="table-filter-condition-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="table-filter-condition-attlist" combine="interleave">
+    <attribute name="table:field-number">    
+        <ref name="nonNegativeInteger"/>
+    </attribute>
+</define>
+<define name="table-filter-condition-attlist" combine="interleave">
+    <attribute name="table:value">    
+        <ref name="string"/>
+    </attribute>
+</define>
+<define name="table-filter-condition-attlist" combine="interleave">
+    <attribute name="table:operator">    
+        <ref name="string"/>
+    </attribute>
+</define>
+<define name="table-filter-condition-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:case-sensitive" a:defaultValue="false">    
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-filter-condition-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:data-type" a:defaultValue="text">
+            <choice>
+                <value>text</value>
+                <value>number</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="table-data-pilot-tables">
+    <element name="table:data-pilot-tables">
+        <zeroOrMore>
+            <ref name="table-data-pilot-table"/>
+        </zeroOrMore>
+    </element>
+</define>
+<define name="table-data-pilot-table">
+    <element name="table:data-pilot-table">
+        <ref name="table-data-pilot-table-attlist"/>
+        <optional>
+            <choice>
+                <ref name="table-database-source-sql"/>
+                <ref name="table-database-source-table"/>
+                <ref name="table-database-source-query"/>
+                <ref name="table-source-service"/>
+                <ref name="table-source-cell-range"/>
+            </choice>
+        </optional>
+        <oneOrMore>
+            <ref name="table-data-pilot-field"/>
+        </oneOrMore>
+    </element>
+</define>
+<define name="table-data-pilot-table-attlist" combine="interleave">
+    <attribute name="table:name">
+        <ref name="string"/>
+    </attribute>
+</define>
+<define name="table-data-pilot-table-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:application-data">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-data-pilot-table-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:grand-total" a:defaultValue="both">
+            <choice>
+                <value>none</value>
+                <value>row</value>
+                <value>column</value>
+                <value>both</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="table-data-pilot-table-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:ignore-empty-rows" a:defaultValue="false">    
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-data-pilot-table-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:identify-categories" a:defaultValue="false">    
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-data-pilot-table-attlist" combine="interleave">
+    <attribute name="table:target-range-address">    
+        <ref name="cellRangeAddress"/>
+    </attribute>
+</define>
+<define name="table-data-pilot-table-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:buttons">    
+            <ref name="cellRangeAddressList"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-data-pilot-table-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:show-filter-button" a:defaultValue="true">    
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-data-pilot-table-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:drill-down-on-double-click"
+                   a:defaultValue="true">    
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-source-cell-range">
+    <element name="table:source-cell-range">
+        <ref name="table-source-cell-range-attlist"/>
+        <optional>
+            <ref name="table-filter"/>
+        </optional>
+    </element>
+</define>
+<define name="table-source-cell-range-attlist" combine="interleave">
+    <attribute name="table:cell-range-address">    
+        <ref name="cellRangeAddress"/>
+    </attribute>
+</define>
+<define name="table-source-service">
+    <element name="table:source-service">
+        <ref name="table-source-service-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="table-source-service-attlist" combine="interleave">
+    <attribute name="table:name">    
+        <ref name="string"/>
+    </attribute>
+</define>
+<define name="table-source-service-attlist" combine="interleave">
+    <attribute name="table:source-name">
+        <ref name="string"/>
+    </attribute>
+</define>
+<define name="table-source-service-attlist" combine="interleave">
+    <attribute name="table:object-name">
+        <ref name="string"/>
+    </attribute>
+</define>
+<define name="table-source-service-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:user-name">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-source-service-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:password">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-data-pilot-field">
+    <element name="table:data-pilot-field">
+        <ref name="table-data-pilot-field-attlist"/>
+        <optional>
+            <ref name="table-data-pilot-level"/>
+        </optional>
+        <optional>
+            <ref name="table-data-pilot-field-reference"/>
+        </optional>
+        <optional>
+            <ref name="table-data-pilot-groups"/>
+        </optional>
+    </element>
+</define>
+<define name="table-data-pilot-field-attlist" combine="interleave">
+    <attribute name="table:source-field-name">    
+        <ref name="string"/>
+    </attribute>
+</define>
+<define name="table-data-pilot-field-attlist" combine="interleave">
+    <choice>
+        <attribute name="table:orientation">    
+            <choice>
+                <value>row</value>
+                <value>column</value>
+                <value>data</value>
+                <value>hidden</value>
+            </choice>
+        </attribute>
+        <group>
+            <attribute name="table:orientation">
+                <value>page</value>
+            </attribute>
+            <attribute name="table:selected-page">
+                <ref name="string"/>
+            </attribute>
+        </group>
+    </choice>
+</define>
+<define name="table-data-pilot-field-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:is-data-layout-field" a:defaultValue="false">    
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-data-pilot-field-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:function">
+            <choice>
+                <value>auto</value>
+                <value>average</value>
+                <value>count</value>
+                <value>countnums</value>
+                <value>max</value>
+                <value>min</value>
+                <value>product</value>
+                <value>stdev</value>
+                <value>stdevp</value>
+                <value>sum</value>
+                <value>var</value>
+                <value>varp</value>
+                <ref name="string"/>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="table-data-pilot-field-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:used-hierarchy" a:defaultValue="-1">    
+            <ref name="integer"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-data-pilot-level">
+    <element name="table:data-pilot-level">
+        <ref name="table-data-pilot-level-attlist"/>
+        <optional>
+            <ref name="table-data-pilot-subtotals"/>
+        </optional>
+        <optional>
+            <ref name="table-data-pilot-members"/>
+        </optional>
+        <optional>
+            <ref name="table-data-pilot-display-info"/>
+        </optional>
+        <optional>
+            <ref name="table-data-pilot-sort-info"/>
+        </optional>
+        <optional>
+            <ref name="table-data-pilot-layout-info"/>
+        </optional>
+    </element>
+</define>
+<define name="table-data-pilot-level-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:show-empty">    
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-data-pilot-subtotals">
+    <element name="table:data-pilot-subtotals">
+        <zeroOrMore>
+            <ref name="table-data-pilot-subtotal"/>
+        </zeroOrMore>
+    </element>
+</define>
+<define name="table-data-pilot-subtotal">
+    <element name="table:data-pilot-subtotal">
+        <ref name="table-data-pilot-subtotal-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="table-data-pilot-subtotal-attlist" combine="interleave">
+    <attribute name="table:function">
+        <choice>
+            <value>auto</value>
+            <value>average</value>
+            <value>count</value>
+            <value>countnums</value>
+            <value>max</value>
+            <value>min</value>
+            <value>product</value>
+            <value>stdev</value>
+            <value>stdevp</value>
+            <value>sum</value>
+            <value>var</value>
+            <value>varp</value>
+            <ref name="string"/>
+        </choice>
+    </attribute>
+</define>
+<define name="table-data-pilot-members">
+    <element name="table:data-pilot-members">
+        <zeroOrMore>
+            <ref name="table-data-pilot-member"/>
+        </zeroOrMore>
+    </element>
+</define>
+<define name="table-data-pilot-member">
+    <element name="table:data-pilot-member">
+        <ref name="table-data-pilot-member-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="table-data-pilot-member-attlist" combine="interleave">
+    <attribute name="table:name">
+        <ref name="string"/>
+    </attribute>
+</define>
+<define name="table-data-pilot-member-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:display">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-data-pilot-member-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:show-details">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-data-pilot-display-info">
+    <element name="table:data-pilot-display-info">
+        <ref name="table-data-pilot-display-info-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="table-data-pilot-display-info-attlist" combine="interleave">
+    <attribute name="table:enabled">
+        <ref name="boolean"/>
+    </attribute>
+</define>
+<define name="table-data-pilot-display-info-attlist" combine="interleave">
+    <attribute name="table:data-field">
+        <ref name="string"/>
+    </attribute>
+</define>
+<define name="table-data-pilot-display-info-attlist" combine="interleave">
+    <attribute name="table:member-count">
+        <ref name="nonNegativeInteger"/>
+    </attribute>
+</define>
+<define name="table-data-pilot-display-info-attlist" combine="interleave">
+    <attribute name="table:display-member-mode">
+        <choice>
+            <value>from-top</value>
+            <value>from-bottom</value>
+        </choice>
+    </attribute>
+</define>
+<define name="table-data-pilot-sort-info">
+    <element name="table:data-pilot-sort-info">
+        <ref name="table-data-pilot-sort-info-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="table-data-pilot-sort-info-attlist" combine="interleave">
+    <choice>
+        <group>
+            <attribute name="table:sort-mode">
+                <value>data</value>
+            </attribute>
+            <attribute name="table:data-field">
+                <ref name="string"/>
+            </attribute>
+        </group>
+        <attribute name="table:sort-mode">
+            <choice>
+                <value>none</value>
+                <value>manual</value>
+                <value>name</value>
+            </choice>
+        </attribute>
+    </choice>
+</define>
+<define name="table-data-pilot-sort-info-attlist" combine="interleave">
+    <attribute name="table:order">
+        <choice>
+            <value>ascending</value>
+            <value>descending</value>
+        </choice>
+    </attribute>
+</define>
+<define name="table-data-pilot-layout-info">
+    <element name="table:data-pilot-layout-info">
+        <ref name="table-data-pilot-layout-info-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="table-data-pilot-layout-info-attlist" combine="interleave">
+    <attribute name="table:layout-mode">
+        <choice>
+            <value>tabular-layout</value>
+            <value>outline-subtotals-top</value>
+            <value>outline-subtotals-bottom</value>
+        </choice>
+    </attribute>
+</define>
+<define name="table-data-pilot-layout-info-attlist" combine="interleave">
+    <attribute name="table:add-empty-lines">
+        <ref name="boolean"/>
+    </attribute>
+</define>
+<define name="table-data-pilot-field-reference">
+    <element name="table:data-pilot-field-reference">
+        <ref name="table-data-pilot-field-reference-attlist"/>
+    </element>
+</define>
+<define name="table-data-pilot-field-reference-attlist" combine="interleave">
+    <attribute name="table:field-name">
+        <ref name="string"/>
+    </attribute>
+</define>
+<define name="table-data-pilot-field-reference-attlist" combine="interleave">
+    <choice>
+        <group>
+            <attribute name="table:member-type">
+                <value>named</value>
+            </attribute>
+            <attribute name="table:member-name">
+                <ref name="string"/>
+            </attribute>
+        </group>
+        <attribute name="table:member-type">
+            <choice>
+                <value>previous</value>
+                <value>next</value>
+            </choice>
+        </attribute>
+    </choice>
+</define>
+<define name="table-data-pilot-field-reference-attlist" combine="interleave">
+    <attribute name="table:type">
+        <choice>
+            <value>none</value>
+            <value>member-difference</value>
+            <value>member-percentage</value>
+            <value>member-percentage-difference</value>
+            <value>running-total</value>
+            <value>row-percentage</value>
+            <value>column-percentage</value>
+            <value>total-percentage</value>
+            <value>index</value>
+        </choice>
+    </attribute>
+</define>
+<define name="table-data-pilot-groups">
+    <element name="table:data-pilot-groups">
+        <ref name="table-data-pilot-groups-attlist"/>
+        <oneOrMore>
+            <ref name="table-data-pilot-group"/>
+        </oneOrMore>
+    </element>
+</define>
+<define name="table-data-pilot-groups-attlist" combine="interleave">
+    <attribute name="table:source-field-name">
+        <ref name="string"/>
+    </attribute>
+</define>
+<define name="table-data-pilot-groups-attlist" combine="interleave">
+    <choice>
+        <attribute name="table:date-start">
+            <choice>
+                <ref name="dateOrDateTime"/>
+                <value>auto</value>
+            </choice>
+        </attribute>
+        <attribute name="table:start">
+            <choice>
+                <ref name="double"/>
+                <value>auto</value>
+            </choice>
+        </attribute>
+    </choice>
+</define>
+<define name="table-data-pilot-groups-attlist" combine="interleave">
+    <choice>
+        <attribute name="table:date-end">
+            <choice>
+                <ref name="dateOrDateTime"/>
+                <value>auto</value>
+            </choice>
+        </attribute>
+        <attribute name="table:end">
+            <choice>
+                <ref name="double"/>
+                <value>auto</value>
+            </choice>
+        </attribute>
+    </choice>
+</define>
+<define name="table-data-pilot-groups-attlist" combine="interleave">
+    <attribute name="table:step">
+        <ref name="double"/>
+    </attribute>
+</define>
+<define name="table-data-pilot-groups-attlist" combine="interleave">
+    <attribute name="table:grouped-by">
+        <choice>
+            <value>seconds</value>
+            <value>minutes</value>
+            <value>hours</value>
+            <value>days</value>
+            <value>months</value>
+            <value>quarters</value>
+            <value>years</value>
+        </choice>
+    </attribute>
+</define>
+<define name="table-data-pilot-group">
+    <element name="table:data-pilot-group">
+        <ref name="table-data-pilot-group-attlist"/>
+        <oneOrMore>
+            <ref name="table-data-pilot-group-member"/>
+        </oneOrMore>
+    </element>
+</define>
+<define name="table-data-pilot-group-attlist" combine="interleave">
+    <attribute name="table:name">
+        <ref name="string"/>
+    </attribute>
+</define>
+<define name="table-data-pilot-group-member">
+    <element name="table:data-pilot-group-member">
+        <ref name="table-data-pilot-group-member-attlist"/>
+    </element>
+</define>
+<define name="table-data-pilot-group-member-attlist" combine="interleave">
+    <attribute name="table:name">
+        <ref name="string"/>
+    </attribute>
+</define>
+<define name="table-consolidation">
+    <element name="table:consolidation">
+        <ref name="table-consolidation-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="table-consolidation-attlist" combine="interleave">
+    <attribute name="table:function">    
+        <choice>
+            <value>auto</value>
+            <value>average</value>
+            <value>count</value>
+            <value>countnums</value>
+            <value>max</value>
+            <value>min</value>
+            <value>product</value>
+            <value>stdev</value>
+            <value>stdevp</value>
+            <value>sum</value>
+            <value>var</value>
+            <value>varp</value>
+            <ref name="string"/>
+        </choice>
+    </attribute>
+</define>
+<define name="table-consolidation-attlist" combine="interleave">
+    <attribute name="table:source-cell-range-addresses">    
+        <ref name="cellRangeAddressList"/>
+    </attribute>
+</define>
+<define name="table-consolidation-attlist" combine="interleave">
+    <attribute name="table:target-cell-address">    
+        <ref name="cellAddress"/>
+    </attribute>
+</define>
+<define name="table-consolidation-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:use-labels" a:defaultValue="none">
+            <choice>
+                <value>none</value>
+                <value>row</value>
+                <value>column</value>
+                <value>both</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="table-consolidation-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:link-to-source-data" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-dde-links">
+    <element name="table:dde-links">
+        <oneOrMore>
+            <ref name="table-dde-link"/>
+        </oneOrMore>
+    </element>
+</define>
+<define name="table-tracked-changes">
+    <element name="table:tracked-changes">
+        <ref name="table-tracked-changes-attlist"/>
+        <zeroOrMore>
+            <choice>
+                <ref name="table-cell-content-change"/>
+                <ref name="table-insertion"/>
+                <ref name="table-deletion"/>
+                <ref name="table-movement"/>
+            </choice>
+        </zeroOrMore>
+    </element>
+</define>
+<define name="table-tracked-changes-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:track-changes" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-insertion">
+    <element name="table:insertion">
+        <ref name="table-insertion-attlist"/>
+        <ref name="common-table-change-attlist"/>
+        <ref name="office-change-info"/>
+        <optional>
+            <ref name="table-dependencies"/>
+        </optional>
+        <optional>
+            <ref name="table-deletions"/>
+        </optional>
+    </element>
+</define>
+<define name="table-insertion-attlist" combine="interleave">
+    <attribute name="table:type">
+        <choice>
+            <value>row</value>
+            <value>column</value>
+            <value>table</value>
+        </choice>
+    </attribute>
+</define>
+<define name="table-insertion-attlist" combine="interleave">
+    <attribute name="table:position">
+        <ref name="integer"/>
+    </attribute>
+</define>
+<define name="table-insertion-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:count" a:defaultValue="1">
+            <ref name="positiveInteger"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-insertion-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:table">
+            <ref name="integer"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-dependencies">
+    <element name="table:dependencies">
+        <oneOrMore>
+            <ref name="table-dependency"/>
+        </oneOrMore>
+    </element>
+</define>
+<define name="table-dependency">
+    <element name="table:dependency">
+        <attribute name="table:id">
+            <ref name="string"/>
+        </attribute>
+        <empty/>
+    </element>
+</define>
+<define name="table-deletions">
+    <element name="table:deletions">
+        <oneOrMore>
+            <choice>
+                <ref name="table-cell-content-deletion"/>
+                <ref name="table-change-deletion"/>
+            </choice>
+        </oneOrMore>
+    </element>
+</define>
+<define name="table-cell-content-deletion">
+    <element name="table:cell-content-deletion">
+        <optional>
+            <attribute name="table:id">
+                <ref name="string"/>
+            </attribute>
+        </optional>
+        <optional>
+            <ref name="table-cell-address"/>
+        </optional>
+        <optional>
+            <ref name="table-change-track-table-cell"/>
+        </optional>
+    </element>
+</define>
+<define name="table-change-deletion">
+    <element name="table:change-deletion">
+        <optional>
+            <attribute name="table:id">
+                <ref name="string"/>
+            </attribute>
+        </optional>
+        <empty/>
+    </element>
+</define>
+<define name="table-deletion">
+    <element name="table:deletion">
+        <ref name="table-deletion-attlist"/>
+        <ref name="common-table-change-attlist"/>
+        <ref name="office-change-info"/>
+        <optional>
+            <ref name="table-dependencies"/>
+        </optional>
+        <optional>
+            <ref name="table-deletions"/>
+        </optional>
+        <optional>
+            <ref name="table-cut-offs"/>
+        </optional>
+    </element>
+</define>
+<define name="table-deletion-attlist" combine="interleave">
+    <attribute name="table:type">
+        <choice>
+            <value>row</value>
+            <value>column</value>
+            <value>table</value>
+        </choice>
+    </attribute>
+</define>
+<define name="table-deletion-attlist" combine="interleave">
+    <attribute name="table:position">
+        <ref name="integer"/>
+    </attribute>
+</define>
+<define name="table-deletion-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:table">
+            <ref name="integer"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-deletion-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:multi-deletion-spanned">
+            <ref name="integer"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-cut-offs">
+    <element name="table:cut-offs">
+        <choice>
+            <oneOrMore>
+                <ref name="table-movement-cut-off"/>
+            </oneOrMore>
+            <group>
+                <ref name="table-insertion-cut-off"/>
+                <zeroOrMore>
+                    <ref name="table-movement-cut-off"/>
+                </zeroOrMore>
+            </group>
+        </choice>
+    </element>
+</define>
+<define name="table-insertion-cut-off">
+    <element name="table:insertion-cut-off">
+        <ref name="table-insertion-cut-off-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="table-insertion-cut-off-attlist" combine="interleave">
+    <attribute name="table:id">
+        <ref name="string"/>
+    </attribute>
+</define>
+<define name="table-insertion-cut-off-attlist" combine="interleave">
+    <attribute name="table:position">
+        <ref name="integer"/>
+    </attribute>
+</define>
+<define name="table-movement-cut-off">
+    <element name="table:movement-cut-off">
+        <ref name="table-movement-cut-off-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="table-movement-cut-off-attlist" combine="interleave">
+    <choice>
+        <attribute name="table:position">
+            <ref name="integer"/>
+        </attribute>
+        <group>
+            <attribute name="table:start-position">
+                <ref name="integer"/>
+            </attribute>
+            <attribute name="table:end-position">
+                <ref name="integer"/>
+            </attribute>
+        </group>
+    </choice>
+</define>
+<define name="table-movement">
+    <element name="table:movement">
+        <ref name="common-table-change-attlist"/>
+        <ref name="table-source-range-address"/>
+        <ref name="table-target-range-address"/>
+        <ref name="office-change-info"/>
+        <optional>
+            <ref name="table-dependencies"/>
+        </optional>
+        <optional>
+            <ref name="table-deletions"/>
+        </optional>
+    </element>
+</define>
+<define name="table-source-range-address">
+    <element name="table:source-range-address">
+        <ref name="common-table-range-attlist"/>
+        <empty/>
+    </element>
+</define>
+
+<define name="table-target-range-address">
+    <element name="table:target-range-address">
+        <ref name="common-table-range-attlist"/>
+        <empty/>
+    </element>
+</define>
+
+
+<define name="common-table-range-attlist" combine="interleave">
+    <choice>
+        <group>
+            <ref name="common-table-cell-address-attlist"/>
+        </group>
+        <group>
+            <ref name="common-table-cell-range-address-attlist"/>
+        </group>
+    </choice>
+</define>
+<define name="common-table-cell-address-attlist" combine="interleave">
+    <attribute name="table:column">
+        <ref name="integer"/>
+    </attribute>
+    <attribute name="table:row">
+        <ref name="integer"/>
+    </attribute>
+    <attribute name="table:table">
+        <ref name="integer"/>
+    </attribute>
+</define>
+<define name="common-table-cell-range-address-attlist" combine="interleave">
+    <attribute name="table:start-column">
+        <ref name="integer"/>
+    </attribute>
+    <attribute name="table:start-row">
+        <ref name="integer"/>
+    </attribute>
+    <attribute name="table:start-table">
+        <ref name="integer"/>
+    </attribute>
+    <attribute name="table:end-column">
+        <ref name="integer"/>
+    </attribute>
+    <attribute name="table:end-row">
+        <ref name="integer"/>
+    </attribute>
+    <attribute name="table:end-table">
+        <ref name="integer"/>
+    </attribute>
+</define>
+<define name="table-change-track-table-cell" combine="interleave">
+    <element name="table:change-track-table-cell">
+        <ref name="table-change-track-table-cell-attlist"/>
+        <zeroOrMore>
+            <ref name="text-p"/>
+        </zeroOrMore>
+    </element>
+</define>
+<define name="table-change-track-table-cell-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:cell-address">
+            <ref name="cellAddress"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-change-track-table-cell-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:matrix-covered" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-change-track-table-cell-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:formula">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="table:number-matrix-columns-spanned">
+            <ref name="positiveInteger"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="table:number-matrix-rows-spanned">
+            <ref name="positiveInteger"/>
+        </attribute>
+    </optional>
+    <optional>
+        <ref name="common-value-and-type-attlist"/>
+    </optional>
+</define>
+<define name="table-cell-content-change">
+    <element name="table:cell-content-change">
+        <ref name="common-table-change-attlist"/>
+        <ref name="table-cell-address"/>
+        <ref name="office-change-info"/>
+        <optional>
+            <ref name="table-dependencies"/>
+        </optional>
+        <optional>
+            <ref name="table-deletions"/>
+        </optional>
+        <ref name="table-previous"/>
+    </element>
+</define>
+<define name="table-cell-address">
+    <element name="table:cell-address">
+        <ref name="common-table-cell-address-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="table-previous">
+    <element name="table:previous">
+        <optional>
+            <attribute name="table:id">
+                <ref name="string"/>
+            </attribute>
+        </optional>
+        <ref name="table-change-track-table-cell"/>
+    </element>
+</define>
+<define name="common-table-change-attlist" combine="interleave">
+    <attribute name="table:id">
+        <ref name="string"/>
+    </attribute>
+</define>
+<define name="common-table-change-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:acceptance-state" a:defaultValue="pending">
+            <choice>
+                <value>accepted</value>
+                <value>rejected</value>
+                <value>pending</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="common-table-change-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:rejecting-change-id">
+            <ref name="string"/> 
+        </attribute>
+    </optional>
+</define>
+<define name="style-handout-master">
+    <element name="style:handout-master">
+        <ref name="common-presentation-header-footer-attlist"/>
+        <ref name="style-handout-master-attlist"/>
+        <zeroOrMore>
+            <ref name="shape"/>
+        </zeroOrMore>
+    </element>
+</define>
+<define name="style-handout-master-attlist" combine="interleave">
+    <optional>
+        <attribute name="presentation:presentation-page-layout-name">
+            <ref name="styleNameRef"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-handout-master-attlist" combine="interleave">
+    <attribute name="style:page-layout-name">
+        <ref name="styleNameRef"/>
+    </attribute>
+</define>
+<define name="style-handout-master-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:style-name">
+            <ref name="styleNameRef"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-layer-set">
+    <element name="draw:layer-set">
+        <zeroOrMore>
+            <ref name="draw-layer"/>
+        </zeroOrMore>
+    </element>
+</define>
+<define name="draw-layer">
+    <element name="draw:layer">
+        <ref name="draw-layer-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="draw-layer-attlist" combine="interleave">
+    <attribute name="draw:name">
+        <ref name="string"/>
+    </attribute>
+</define>
+<define name="draw-layer-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:protected" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-layer-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:display" a:defaultValue="always">
+            <choice>
+                <value>always</value>
+                <value>screen</value>
+                <value>printer</value>
+                <value>none</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-page">
+    <element name="draw:page">
+        <ref name="common-presentation-header-footer-attlist"/>
+        <ref name="draw-page-attlist"/>
+        <optional>
+            <ref name="office-forms"/>
+        </optional>
+        <zeroOrMore>
+            <ref name="shape"/>
+        </zeroOrMore>
+        <optional>
+            <choice>
+                <ref name="presentation-animations"/>
+                <ref name="animation-element"/>
+            </choice>
+        </optional>
+        <optional>
+            <ref name="presentation-notes"/>
+        </optional>
+    </element>
+</define>
+<define name="draw-page-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:name">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-page-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:style-name">
+            <ref name="styleNameRef"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-page-attlist" combine="interleave">
+    <attribute name="draw:master-page-name">
+        <ref name="styleNameRef"/>
+    </attribute>
+</define>
+<define name="draw-page-attlist" combine="interleave">
+    <optional>
+        <attribute name="presentation:presentation-page-layout-name">
+            <ref name="styleNameRef"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-presentation-header-footer-attlist" combine="interleave">
+    <optional>
+        <attribute name="presentation:use-header-name">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-presentation-header-footer-attlist" combine="interleave">
+    <optional>
+        <attribute name="presentation:use-footer-name">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-presentation-header-footer-attlist" combine="interleave">
+    <optional>
+        <attribute name="presentation:use-date-time-name">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-page-attlist">
+    <optional>
+        <attribute name="draw:id">
+            <ref name="ID"/>
+        </attribute>
+    </optional>
+</define>
+<define name="shape">
+    <choice>
+        <ref name="draw-rect"/>
+        <ref name="draw-line"/>
+        <ref name="draw-polyline"/>
+        <ref name="draw-polygon"/>
+        <ref name="draw-regular-polygon"/>
+        <ref name="draw-path"/>
+        <ref name="draw-circle"/>
+        <ref name="draw-ellipse"/>
+        <ref name="draw-g"/>
+        <ref name="draw-page-thumbnail"/>
+        <ref name="draw-frame"/>
+        <ref name="draw-measure"/>
+        <ref name="draw-caption"/>
+        <ref name="draw-connector"/>
+        <ref name="draw-control"/>
+        <ref name="dr3d-scene"/>
+        <ref name="draw-custom-shape"/>
+    </choice>
+</define>
+<define name="draw-rect">
+    <element name="draw:rect">
+        <ref name="draw-rect-attlist"/>
+        <ref name="common-draw-position-attlist"/>
+        <ref name="common-draw-size-attlist"/>
+        <ref name="common-draw-shape-with-text-and-styles-attlist"/>
+        <optional>
+            <ref name="office-event-listeners"/>
+        </optional>
+        <zeroOrMore>
+            <ref name="draw-glue-point"/>
+        </zeroOrMore>
+        <ref name="draw-text"/>
+    </element>
+</define>
+<define name="draw-rect-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:corner-radius">
+            <ref name="nonNegativeLength"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-line">
+    <element name="draw:line">
+        <ref name="draw-line-attlist"/>
+        <ref name="common-draw-shape-with-text-and-styles-attlist"/>
+        <optional>
+            <ref name="office-event-listeners"/>
+        </optional>
+        <zeroOrMore>
+            <ref name="draw-glue-point"/>
+        </zeroOrMore>
+        <ref name="draw-text"/>
+    </element>
+</define>
+<define name="draw-line-attlist" combine="interleave">
+    <attribute name="svg:x1">
+        <ref name="coordinate"/>
+    </attribute>
+    <attribute name="svg:y1">
+        <ref name="coordinate"/>
+    </attribute>
+</define>
+<define name="draw-line-attlist" combine="interleave">
+    <attribute name="svg:x2">
+        <ref name="coordinate"/>
+    </attribute>
+    <attribute name="svg:y2">
+        <ref name="coordinate"/>
+    </attribute>
+</define>
+<define name="draw-polyline">
+    <element name="draw:polyline">
+        <ref name="common-draw-points-attlist"/>
+        <ref name="common-draw-position-attlist"/>
+        <ref name="common-draw-size-attlist"/>
+        <ref name="common-draw-viewbox-attlist"/>
+        <ref name="common-draw-shape-with-text-and-styles-attlist"/>
+        <optional>
+            <ref name="office-event-listeners"/>
+        </optional>
+        <zeroOrMore>
+            <ref name="draw-glue-point"/>
+        </zeroOrMore>
+        <ref name="draw-text"/>
+    </element>
+</define>
+<define name="common-draw-points-attlist">
+    <attribute name="draw:points">
+        <ref name="points"/>
+    </attribute>
+</define>
+<define name="draw-polygon">
+    <element name="draw:polygon">
+        <ref name="common-draw-points-attlist"/>
+        <ref name="common-draw-position-attlist"/>
+        <ref name="common-draw-size-attlist"/>
+        <ref name="common-draw-viewbox-attlist"/>
+        <ref name="common-draw-shape-with-text-and-styles-attlist"/>
+        <optional>
+            <ref name="office-event-listeners"/>
+        </optional>
+        <zeroOrMore>
+            <ref name="draw-glue-point"/>
+        </zeroOrMore>
+        <ref name="draw-text"/>
+    </element>
+</define>
+<define name="draw-regular-polygon">
+    <element name="draw:regular-polygon">
+        <ref name="draw-regular-polygon-attlist"/>
+        <ref name="common-draw-position-attlist"/>
+        <ref name="common-draw-size-attlist"/>
+        <ref name="common-draw-shape-with-text-and-styles-attlist"/>
+        <optional>
+            <ref name="office-event-listeners"/>
+        </optional>
+        <zeroOrMore>
+            <ref name="draw-glue-point"/>
+        </zeroOrMore>
+        <ref name="draw-text"/>
+    </element>
+</define>
+<define name="draw-regular-polygon-attlist" combine="interleave">
+    <choice>
+        <attribute name="draw:concave">
+            <value>false</value>
+        </attribute>
+        <group>
+            <attribute name="draw:concave">
+                <value>true</value>
+            </attribute>
+            <ref name="draw-regular-polygon-sharpness-attlist"/>
+        </group>
+    </choice>
+</define>
+<define name="draw-regular-polygon-attlist" combine="interleave">
+    <attribute name="draw:corners">
+        <ref name="positiveInteger"/>
+    </attribute>
+</define>
+<define name="draw-regular-polygon-sharpness-attlist">
+    <attribute name="draw:sharpness">
+        <ref name="percent"/>
+    </attribute>
+</define>
+<define name="draw-path">
+    <element name="draw:path">
+        <ref name="common-draw-path-data-attlist"/>
+        <ref name="common-draw-position-attlist"/>
+        <ref name="common-draw-size-attlist"/>
+        <ref name="common-draw-viewbox-attlist"/>
+        <ref name="common-draw-shape-with-text-and-styles-attlist"/>
+        <optional>
+            <ref name="office-event-listeners"/>
+        </optional>
+        <zeroOrMore>
+            <ref name="draw-glue-point"/>
+        </zeroOrMore>
+        <ref name="draw-text"/>
+    </element>
+</define>
+<define name="common-draw-path-data-attlist">
+    <attribute name="svg:d">
+        <ref name="pathData"/>
+    </attribute>
+</define>
+<define name="draw-circle">
+    <element name="draw:circle">
+        <ref name="draw-circle-attlist"/>
+        <ref name="common-draw-circle-ellipse-attlist"/>
+        <ref name="common-draw-position-attlist"/>
+        <ref name="common-draw-size-attlist"/>
+        <ref name="common-draw-shape-with-text-and-styles-attlist"/>
+        <optional>
+            <ref name="office-event-listeners"/>
+        </optional>
+        <zeroOrMore>
+            <ref name="draw-glue-point"/>
+        </zeroOrMore>
+        <ref name="draw-text"/>
+    </element>
+</define>
+<define name="common-draw-circle-ellipse-attlist" combine="interleave">
+    <optional>
+        <attribute name="svg:cx">
+            <ref name="coordinate"/>
+        </attribute>
+        <attribute name="svg:cy">
+            <ref name="coordinate"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-circle-attlist" combine="interleave">
+    <optional>
+        <attribute name="svg:r">
+            <ref name="length"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-draw-circle-ellipse-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:kind" a:defaultValue="full">
+            <choice>
+                <value>full</value>
+                <value>section</value>
+                <value>cut</value>
+                <value>arc</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="common-draw-circle-ellipse-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:start-angle">
+            <ref name="double"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-draw-circle-ellipse-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:end-angle">
+            <ref name="double"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-ellipse">
+    <element name="draw:ellipse">
+        <ref name="common-draw-circle-ellipse-attlist"/>
+        <ref name="draw-ellipse-attlist"/>
+        <ref name="common-draw-position-attlist"/>
+        <ref name="common-draw-size-attlist"/>
+        <ref name="common-draw-shape-with-text-and-styles-attlist"/>
+        <optional>
+            <ref name="office-event-listeners"/>
+        </optional>
+        <zeroOrMore>
+            <ref name="draw-glue-point"/>
+        </zeroOrMore>
+        <ref name="draw-text"/>
+    </element>
+</define>
+<define name="draw-ellipse-attlist" combine="interleave">
+    <optional>
+        <attribute name="svg:rx">
+            <ref name="length"/>
+        </attribute>
+        <attribute name="svg:ry">
+            <ref name="length"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-connector">
+    <element name="draw:connector">
+        <ref name="draw-connector-attlist"/>
+        <ref name="common-draw-shape-with-text-and-styles-attlist"/>
+        <optional>
+            <ref name="office-event-listeners"/>
+        </optional>
+        <zeroOrMore>
+            <ref name="draw-glue-point"/>
+        </zeroOrMore>
+        <ref name="draw-text"/>
+    </element>
+</define>
+<define name="draw-connector-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:type" a:defaultValue="standard">
+            <choice>
+                <value>standard</value>
+                <value>lines</value>
+                <value>line</value>
+                <value>curve</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-connector-attlist" combine="interleave">
+    <optional>
+        <attribute name="svg:x1">
+            <ref name="coordinate"/>
+        </attribute>
+        <attribute name="svg:y1">
+            <ref name="coordinate"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-connector-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:start-shape">
+            <ref name="IDREF"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-connector-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:start-glue-point">
+            <ref name="nonNegativeInteger"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-connector-attlist" combine="interleave">
+    <optional>
+        <attribute name="svg:x2">
+            <ref name="coordinate"/>
+        </attribute>
+        <attribute name="svg:y2">
+            <ref name="coordinate"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-connector-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:end-shape">
+            <ref name="IDREF"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-connector-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:end-glue-point">
+            <ref name="nonNegativeInteger"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-connector-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:line-skew">
+            <list>
+                <ref name="length"/>
+                <optional>
+                    <ref name="length"/>
+                    <optional>
+                        <ref name="length"/>
+                    </optional>
+                </optional>
+            </list>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-caption">
+    <element name="draw:caption">
+        <ref name="draw-caption-attlist"/>
+        <ref name="common-draw-position-attlist"/>
+        <ref name="common-draw-size-attlist"/>
+        <ref name="common-draw-shape-with-text-and-styles-attlist"/>    
+        <optional>
+            <ref name="office-event-listeners"/>
+        </optional>
+        <zeroOrMore>
+            <ref name="draw-glue-point"/>
+        </zeroOrMore>
+        <ref name="draw-text"/>
+    </element>
+</define>
+<define name="draw-caption-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:caption-point-x">
+            <ref name="coordinate"/>
+        </attribute>
+        <attribute name="draw:caption-point-y">
+            <ref name="coordinate"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-caption-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:corner-radius">
+            <ref name="nonNegativeLength"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-measure">
+    <element name="draw:measure">
+        <ref name="draw-measure-attlist"/>
+        <ref name="common-draw-shape-with-text-and-styles-attlist"/>
+        <optional>
+            <ref name="office-event-listeners"/>
+        </optional>
+        <zeroOrMore>
+            <ref name="draw-glue-point"/>
+        </zeroOrMore>
+        <ref name="draw-text"/>
+    </element>
+</define>
+<define name="draw-measure-attlist" combine="interleave">
+    <attribute name="svg:x1">
+        <ref name="coordinate"/>
+    </attribute>
+    <attribute name="svg:y1">
+        <ref name="coordinate"/>
+    </attribute>
+</define>
+<define name="draw-measure-attlist" combine="interleave">
+    <attribute name="svg:x2">
+        <ref name="coordinate"/>
+    </attribute>
+    <attribute name="svg:y2">
+        <ref name="coordinate"/>
+    </attribute>
+</define>
+<define name="draw-control">
+    <element name="draw:control">
+        <ref name="draw-control-attlist"/>
+        <ref name="common-draw-position-attlist"/>
+        <ref name="common-draw-size-attlist"/>
+        <ref name="common-draw-shape-with-text-and-styles-attlist"/>    
+        <zeroOrMore>
+            <ref name="draw-glue-point"/>
+        </zeroOrMore>
+    </element>
+</define>
+<define name="draw-control-attlist" combine="interleave">
+    <attribute name="draw:control">
+        <ref name="IDREF"/>
+    </attribute>
+</define>
+<define name="draw-page-thumbnail">
+    <element name="draw:page-thumbnail">
+        <ref name="draw-page-thumbnail-attlist"/>
+        <ref name="common-draw-position-attlist"/>
+        <ref name="common-draw-size-attlist"/>
+        <ref name="presentation-shape-attlist"/>
+        <ref name="common-draw-shape-with-styles-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="draw-page-thumbnail-attlist">
+    <optional>
+        <attribute name="draw:page-number">
+            <ref name="positiveInteger"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-g">
+    <element name="draw:g">
+        <ref name="draw-g-attlist"/>
+        <ref name="common-draw-z-index-attlist"/>
+        <ref name="common-draw-name-attlist"/>
+        <ref name="common-draw-id-attlist"/>
+        <ref name="common-draw-style-name-attlist"/>
+        <ref name="common-text-spreadsheet-shape-attlist"/>
+        <optional>
+            <ref name="office-event-listeners"/>
+        </optional>
+        <zeroOrMore>
+            <ref name="draw-glue-point"/>
+        </zeroOrMore>
+        <zeroOrMore>
+            <ref name="shape"/>
+        </zeroOrMore>
+    </element>
+</define>
+<define name="draw-g-attlist" combine="interleave">
+    <optional>
+        <attribute name="svg:y">
+            <ref name="coordinate"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-draw-name-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:name">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-draw-position-attlist">
+    <optional>
+        <attribute name="svg:x">
+            <ref name="coordinate"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="svg:y">
+            <ref name="coordinate"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-draw-size-attlist">
+    <optional>
+        <attribute name="svg:width">
+            <ref name="length"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="svg:height">
+            <ref name="length"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-draw-transform-attlist">
+    <optional>
+        <attribute name="draw:transform">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-draw-viewbox-attlist">
+    <attribute name="svg:viewBox">
+        <list>
+            <ref name="integer"/>
+            <ref name="integer"/>
+            <ref name="integer"/>
+            <ref name="integer"/>
+        </list>
+    </attribute>
+</define>
+<define name="common-draw-style-name-attlist">
+    <choice>
+        <group>
+            <optional>
+                <attribute name="draw:style-name">
+                    <ref name="styleNameRef"/>
+                </attribute>
+            </optional>
+            <optional>
+                <attribute name="draw:class-names">
+                    <ref name="styleNameRefs"/>
+                </attribute>
+            </optional>
+        </group>
+        <group>
+            <optional>
+                <attribute name="presentation:style-name">
+                    <ref name="styleNameRef"/>
+                </attribute>
+            </optional>
+            <optional>
+                <attribute name="presentation:class-names">
+                    <ref name="styleNameRefs"/>
+                </attribute>
+            </optional>
+        </group>
+    </choice>
+</define>
+<define name="common-draw-text-style-name-attlist">
+    <optional>
+        <attribute name="draw:text-style-name">
+            <ref name="styleNameRef"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-draw-layer-name-attlist">
+    <optional>
+        <attribute name="draw:layer">
+            <data type="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-draw-id-attlist">
+    <optional>
+        <attribute name="draw:id">
+            <ref name="ID"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-draw-z-index-attlist">
+    <optional>
+        <attribute name="draw:z-index">
+            <ref name="nonNegativeInteger"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-text-spreadsheet-shape-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:end-cell-address">
+            <ref name="cellAddress"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="table:end-x">
+            <ref name="coordinate"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="table:end-y">
+            <ref name="coordinate"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-text-spreadsheet-shape-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:table-background">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-text-spreadsheet-shape-attlist" combine="interleave">
+    <ref name="common-text-anchor-attlist"/>
+</define>
+
+<define name="common-text-anchor-attlist" combine="interleave">
+    <optional>
+        <attribute name="text:anchor-type">
+            <choice>
+                <value>page</value>
+                <value>frame</value>
+                <value>paragraph</value>
+                <value>char</value>
+                <value>as-char</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="common-text-anchor-attlist" combine="interleave">
+    <optional>
+        <attribute name="text:anchor-page-number">
+            <ref name="positiveInteger"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-text">
+    <zeroOrMore>
+        <choice>
+            <ref name="text-p"/>
+            <ref name="text-list"/>
+        </choice>
+    </zeroOrMore>
+</define>
+<define name="common-draw-shape-with-styles-attlist">
+    <ref name="common-draw-z-index-attlist"/>
+    <ref name="common-draw-id-attlist"/>
+    <ref name="common-draw-layer-name-attlist"/>
+    <ref name="common-draw-style-name-attlist"/>
+    <ref name="common-draw-transform-attlist"/>
+    <ref name="common-draw-name-attlist"/>
+    <ref name="common-text-spreadsheet-shape-attlist"/>
+</define>
+<define name="common-draw-shape-with-text-and-styles-attlist">
+    <ref name="common-draw-shape-with-styles-attlist"/>
+    <ref name="common-draw-text-style-name-attlist"/>
+</define>
+<define name="draw-glue-point">
+    <element name="draw:glue-point">
+        <ref name="draw-glue-point-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="draw-glue-point-attlist" combine="interleave">
+    <attribute name="draw:id">
+        <ref name="nonNegativeInteger"/>
+    </attribute>
+</define>
+<define name="draw-glue-point-attlist" combine="interleave">
+    <attribute name="svg:x">
+        <choice>
+            <ref name="distance"/> 
+            <ref name="percent"/>
+        </choice>
+    </attribute>
+    <attribute name="svg:y">
+        <choice>
+            <ref name="distance"/> 
+            <ref name="percent"/>
+        </choice>
+    </attribute>
+</define>
+<define name="draw-glue-point-attlist" combine="interleave">
+    <attribute name="draw:align">
+        <choice>
+            <value>top-left</value>
+            <value>top</value>
+            <value>top-right</value>
+            <value>left</value>
+            <value>center</value>
+            <value>right</value>
+            <value>bottom-left</value>
+            <value>bottom-right</value>
+        </choice>
+    </attribute>
+</define>
+<define name="draw-glue-points-attlist" combine="interleave">
+    <attribute name="draw:escape-direction">
+        <choice>
+            <value>auto</value>
+            <value>left</value>
+            <value>right</value>
+            <value>up</value>
+            <value>down</value>
+            <value>horizontal</value>
+            <value>vertical</value>
+        </choice>
+    </attribute>
+</define>
+<define name="draw-frame">
+    <element name="draw:frame">
+        <ref name="common-draw-shape-with-text-and-styles-attlist"/>
+        <ref name="common-draw-position-attlist"/>
+        <ref name="common-draw-rel-size-attlist"/>
+        <ref name="presentation-shape-attlist"/>
+        <ref name="draw-frame-attlist"/>
+        <zeroOrMore>
+            <choice>
+                <ref name="draw-text-box"/>
+                <ref name="draw-image"/>
+                <ref name="draw-object"/>
+                <ref name="draw-object-ole"/>
+                <ref name="draw-applet"/>
+                <ref name="draw-floating-frame"/>
+                <ref name="draw-plugin"/>
+            </choice>
+        </zeroOrMore>
+        <optional>
+            <ref name="office-event-listeners"/>
+        </optional>
+        <zeroOrMore>
+            <ref name="draw-glue-point"/>
+        </zeroOrMore>
+        <optional>
+            <ref name="draw-image-map"/>
+        </optional>
+        <optional>
+            <ref name="svg-desc"/>
+        </optional>
+        <optional>
+            <choice>
+                <ref name="draw-contour-polygon"/>
+                <ref name="draw-contour-path"/>
+            </choice>
+        </optional>
+    </element>
+</define>
+<define name="common-draw-rel-size-attlist">
+    <ref name="common-draw-size-attlist"/>
+    <optional>
+        <attribute name="style:rel-width">
+            <choice>
+                <ref name="percent"/>
+                <value>scale</value>
+                <value>scale-min</value>
+            </choice>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="style:rel-height">
+            <choice>
+                <ref name="percent"/>
+                <value>scale</value>
+                <value>scale-min</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-frame-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:copy-of">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-text-box">
+    <element name="draw:text-box">
+        <ref name="draw-text-box-attlist"/>
+        <zeroOrMore>
+            <ref name="text-content"/>
+        </zeroOrMore>
+    </element>
+</define>
+<define name="draw-text-box-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:chain-next-name">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-text-box-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:corner-radius">
+            <ref name="nonNegativeLength"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-text-box-attlist" combine="interleave">
+    <optional>
+        <attribute name="fo:min-height">
+            <choice>
+                <ref name="length"/>
+                <ref name="percent"/>
+            </choice>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="fo:min-width">
+            <choice>
+                <ref name="length"/>
+                <ref name="percent"/>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-text-box-attlist" combine="interleave">
+    <optional>
+        <attribute name="fo:max-height">
+            <choice>
+                <ref name="length"/>
+                <ref name="percent"/>
+            </choice>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="fo:max-width">
+            <choice>
+                <ref name="length"/>
+                <ref name="percent"/>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-image">
+    <element name="draw:image">
+        <ref name="draw-image-attlist"/>
+        <choice>
+            <ref name="common-draw-data-attlist"/>
+            <ref name="office-binary-data"/>
+        </choice>
+        <ref name="draw-text"/>
+    </element>
+</define>
+<define name="common-draw-data-attlist" combine="interleave">
+    <group>
+        <attribute name="xlink:href">
+            <ref name="anyURI"/>
+        </attribute>
+        <optional>
+            <attribute name="xlink:type" a:defaultValue="simple">
+                <choice>
+                    <value>simple</value>
+                </choice>
+            </attribute>
+        </optional>
+        <optional>
+            <attribute name="xlink:show" a:defaultValue="embed">
+                <choice>
+                    <value>embed</value>
+                </choice>
+            </attribute>
+        </optional>
+        <optional>
+            <attribute name="xlink:actuate" a:defaultValue="onLoad">
+                <choice>
+                    <value>onLoad</value>
+                </choice>
+            </attribute>
+        </optional>
+    </group>
+</define>
+
+<define name="office-binary-data">
+    <element name="office:binary-data">
+        <ref name="base64Binary"/>
+    </element>
+</define>
+<define name="draw-image-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:filter-name">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-object">
+    <element name="draw:object">
+        <ref name="draw-object-attlist"/>
+        <choice>
+            <ref name="common-draw-data-attlist"/>
+            <ref name="office-document"/>
+            <ref name="math-math"/>
+        </choice>
+    </element>
+</define>
+
+<define name="draw-object-ole">
+    <element name="draw:object-ole">
+        <ref name="draw-object-ole-attlist"/>
+        <choice>
+            <ref name="common-draw-data-attlist"/>
+            <ref name="office-binary-data"/>
+        </choice>
+    </element>
+</define>
+<define name="draw-object-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:notify-on-update-of-ranges">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-object-ole-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:class-id"/>
+    </optional>
+</define>
+<define name="draw-applet">
+    <element name="draw:applet">
+        <ref name="draw-applet-attlist"/>
+        <optional>
+            <ref name="common-draw-data-attlist"/>
+        </optional>
+        <zeroOrMore>
+            <ref name="draw-param"/>
+        </zeroOrMore>
+    </element>
+</define>
+<define name="draw-applet-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:code"/>
+    </optional>
+</define>
+<define name="draw-applet-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:object"/>
+    </optional>
+</define>
+<define name="draw-applet-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:archive"/>
+    </optional>
+</define>
+<define name="draw-applet-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:may-script" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-plugin">
+    <element name="draw:plugin">
+        <ref name="draw-plugin-attlist"/>
+        <ref name="common-draw-data-attlist"/>
+        <zeroOrMore>
+            <ref name="draw-param"/>
+        </zeroOrMore>
+    </element>
+</define>
+<define name="draw-plugin-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:mime-type"/>
+    </optional>
+</define>
+<define name="draw-param">
+    <element name="draw:param">
+        <ref name="draw-param-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="draw-param-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:name"/>
+    </optional>
+</define>
+<define name="draw-param-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:value"/>
+    </optional>
+</define>
+<define name="draw-floating-frame">
+    <element name="draw:floating-frame">
+        <ref name="draw-floating-frame-attlist"/>
+        <ref name="common-draw-data-attlist"/>
+    </element>
+</define>
+<define name="draw-floating-frame-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:frame-name">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-contour-polygon">
+    <element name="draw:contour-polygon">
+        <ref name="common-contour-attlist"/>
+        <ref name="common-draw-size-attlist"/>
+        <ref name="common-draw-viewbox-attlist"/>
+        <ref name="common-draw-points-attlist"/>
+        <empty/>
+    </element>
+</define>
+
+<define name="draw-contour-path">
+    <element name="draw:contour-path">
+        <ref name="common-contour-attlist"/>
+        <ref name="common-draw-size-attlist"/>
+        <ref name="common-draw-viewbox-attlist"/>
+        <ref name="common-draw-path-data-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="common-contour-attlist" combine="interleave">
+    <attribute name="draw:recreate-on-edit">
+        <ref name="boolean"/>
+    </attribute>
+</define>
+<define name="svg-desc">
+    <element name="svg:desc">
+        <text/>
+    </element>
+</define>
+<define name="draw-a">
+    <element name="draw:a">
+        <ref name="draw-a-attlist"/>
+        <ref name="draw-frame"/>
+    </element>
+</define>
+<define name="draw-a-attlist" combine="interleave">
+    <attribute name="xlink:href">
+        <ref name="anyURI"/>
+    </attribute>
+    <optional>
+        <attribute name="xlink:type" a:defaultValue="simple">
+            <value>simple</value>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="xlink:actuate" a:defaultValue="onRequest">
+            <choice>
+                <value>onRequest</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-a-attlist" combine="interleave">
+    <optional>
+        <attribute name="office:target-frame-name">
+            <ref name="targetFrameName"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="xlink:show">
+            <choice>
+                <value>new</value>
+                <value>replace</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-a-attlist" combine="interleave">
+    <optional>
+        <attribute name="office:name">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-a-attlist" combine="interleave">
+    <optional>
+        <attribute name="office:server-map" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-image-map">
+    <element name="draw:image-map">
+        <zeroOrMore>
+            <choice>
+                <ref name="draw-area-rectangle"/>
+                <ref name="draw-area-circle"/>
+                <ref name="draw-area-polygon"/>
+            </choice>
+        </zeroOrMore>
+    </element>
+</define>
+<define name="draw-area-rectangle">
+    <element name="draw:area-rectangle">
+        <ref name="common-draw-area-attlist"/>
+        <attribute name="svg:x">
+            <ref name="coordinate"/>
+        </attribute>
+        <attribute name="svg:y">
+            <ref name="coordinate"/>
+        </attribute>
+        <attribute name="svg:width">
+            <ref name="length"/>
+        </attribute>
+        <attribute name="svg:height">
+            <ref name="length"/>
+        </attribute>
+        <optional>
+            <ref name="svg-desc"/>
+        </optional>
+        <optional>
+            <ref name="office-event-listeners"/>
+        </optional>
+    </element>
+</define>
+<define name="draw-area-circle">
+    <element name="draw:area-circle">
+        <ref name="common-draw-area-attlist"/>
+        <attribute name="svg:cx">
+            <ref name="coordinate"/>
+        </attribute>
+        <attribute name="svg:cy">
+            <ref name="coordinate"/>
+        </attribute>
+        <attribute name="svg:r">
+            <ref name="length"/>
+        </attribute>
+        <optional>
+            <ref name="svg-desc"/>
+        </optional>
+        <optional>
+            <ref name="office-event-listeners"/>
+        </optional>
+    </element>
+</define>
+<define name="draw-area-polygon">
+    <element name="draw:area-polygon">
+        <ref name="common-draw-area-attlist"/>
+        <attribute name="svg:x">
+            <ref name="coordinate"/>
+        </attribute>
+        <attribute name="svg:y">
+            <ref name="coordinate"/>
+        </attribute>
+        <attribute name="svg:width">
+            <ref name="length"/>
+        </attribute>
+        <attribute name="svg:height">
+            <ref name="length"/>
+        </attribute>
+        <ref name="common-draw-viewbox-attlist"/>
+        <ref name="common-draw-points-attlist"/>
+        <optional>
+            <ref name="svg-desc"/>
+        </optional>
+        <optional>
+            <ref name="office-event-listeners"/>
+        </optional>
+    </element>
+</define>
+<define name="common-draw-area-attlist" combine="interleave">
+    <optional>
+        <attribute name="xlink:href">
+            <ref name="anyURI"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="xlink:type" a:defaultValue="simple">
+            <choice>
+                <value>simple</value>
+            </choice>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="office:target-frame-name">
+            <ref name="targetFrameName"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="xlink:show">
+            <choice>
+                <value>new</value>
+                <value>replace</value>
+            </choice>
+            </attribute>
+    </optional>
+</define>
+<define name="common-draw-area-attlist" combine="interleave">
+    <optional>
+        <attribute name="office:name">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-draw-area-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:nohref">
+            <choice>
+                <value>nohref</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="dr3d-scene">
+    <element name="dr3d:scene">
+        <ref name="dr3d-scene-attlist"/>
+        <ref name="common-draw-position-attlist"/>
+        <ref name="common-draw-size-attlist"/>
+        <ref name="common-draw-style-name-attlist"/>
+        <ref name="common-draw-z-index-attlist"/>
+        <ref name="common-draw-id-attlist"/>
+        <ref name="common-draw-layer-name-attlist"/>
+        <ref name="common-text-spreadsheet-shape-attlist"/>
+        <ref name="common-dr3d-transform-attlist"/>
+        <zeroOrMore>
+            <ref name="dr3d-light"/>
+        </zeroOrMore>
+        <zeroOrMore>
+            <ref name="shapes3d"/>
+        </zeroOrMore>
+    </element>
+</define>
+
+<define name="shapes3d">
+    <choice>
+        <ref name="dr3d-scene"/>
+        <ref name="dr3d-extrude"/>
+        <ref name="dr3d-sphere"/>
+        <ref name="dr3d-rotate"/>
+        <ref name="dr3d-cube"/>
+    </choice>
+</define>
+<define name="dr3d-scene-attlist" combine="interleave">
+    <optional>
+        <attribute name="dr3d:vrp">
+            <ref name="vector3D"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="dr3d:vpn">
+            <ref name="vector3D"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="dr3d:vup">
+            <ref name="vector3D"/>
+        </attribute>
+    </optional>
+</define>
+<define name="dr3d-scene-attlist" combine="interleave">
+    <optional>
+        <attribute name="dr3d:projection">
+            <choice>
+                <value>parallel</value>
+                <value>perspective</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="dr3d-scene-attlist" combine="interleave">
+    <optional>
+        <attribute name="dr3d:distance">
+            <ref name="length"/>
+        </attribute>
+    </optional>
+</define>
+<define name="dr3d-scene-attlist" combine="interleave">
+    <optional>
+        <attribute name="dr3d:focal-length">
+            <ref name="length"/>
+        </attribute>
+    </optional>
+</define>
+<define name="dr3d-scene-attlist" combine="interleave">
+    <optional>
+        <attribute name="dr3d:shadow-slant">
+            <ref name="nonNegativeInteger"/>
+        </attribute>
+    </optional>
+</define>
+<define name="dr3d-scene-attlist" combine="interleave">
+    <optional>
+        <attribute name="dr3d:shade-mode">
+            <choice>
+                <value>flat</value>
+                <value>phong</value>
+                <value>gouraud</value>
+                <value>draft</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="dr3d-scene-attlist" combine="interleave">
+    <optional>
+        <attribute name="dr3d:ambient-color">
+            <ref name="color"/>
+        </attribute>
+    </optional>
+</define>
+<define name="dr3d-scene-attlist" combine="interleave">
+    <optional>
+        <attribute name="dr3d:lighting-mode">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-dr3d-transform-attlist">
+    <optional>
+        <attribute name="dr3d:transform"/>
+    </optional>
+</define>
+<define name="dr3d-light">
+    <element name="dr3d:light">
+        <ref name="dr3d-light-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="dr3d-light-attlist" combine="interleave">
+    <optional>
+        <attribute name="dr3d:diffuse-color">
+            <ref name="color"/>
+        </attribute>
+    </optional>
+</define>
+<define name="dr3d-light-attlist" combine="interleave">
+    <attribute name="dr3d:direction">
+        <ref name="vector3D"/>
+    </attribute>
+</define>
+<define name="dr3d-light-attlist" combine="interleave">
+    <optional>
+        <attribute name="dr3d:enabled">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="dr3d-light-attlist" combine="interleave">
+    <optional>
+        <attribute name="dr3d:specular">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="dr3d-cube">
+    <element name="dr3d:cube">
+        <ref name="dr3d-cube-attlist"/>
+        <ref name="common-draw-z-index-attlist"/>
+        <ref name="common-draw-id-attlist"/>
+        <ref name="common-draw-layer-name-attlist"/>
+        <ref name="common-draw-style-name-attlist"/>
+        <ref name="common-dr3d-transform-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="dr3d-cube-attlist" combine="interleave">
+    <optional>
+        <attribute name="dr3d:min-edge">
+            <ref name="vector3D"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="dr3d:max-edge">
+            <ref name="vector3D"/>
+        </attribute>
+    </optional>
+</define>
+<define name="dr3d-sphere">
+    <element name="dr3d:sphere">
+        <ref name="dr3d-sphere-attlist"/>
+        <ref name="common-draw-z-index-attlist"/>
+        <ref name="common-draw-id-attlist"/>
+        <ref name="common-draw-layer-name-attlist"/>
+        <ref name="common-draw-style-name-attlist"/>
+        <ref name="common-dr3d-transform-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="dr3d-sphere-attlist" combine="interleave">
+    <optional>
+        <attribute name="dr3d:center">
+            <ref name="vector3D"/>
+        </attribute>
+    </optional>
+</define>
+<define name="dr3d-sphere-attlist" combine="interleave">
+    <optional>
+        <attribute name="dr3d:size">
+            <ref name="vector3D"/>
+        </attribute>
+    </optional>
+</define>
+<define name="dr3d-extrude">
+    <element name="dr3d:extrude">
+        <ref name="common-draw-path-data-attlist"/>
+        <ref name="common-draw-viewbox-attlist"/>
+        <ref name="common-draw-id-attlist"/>
+        <ref name="common-draw-z-index-attlist"/>
+        <ref name="common-draw-layer-name-attlist"/>
+        <ref name="common-draw-style-name-attlist"/>
+        <ref name="common-dr3d-transform-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="dr3d-rotate">
+    <element name="dr3d:rotate">
+        <ref name="common-draw-viewbox-attlist"/>
+        <ref name="common-draw-path-data-attlist"/>
+        <ref name="common-draw-z-index-attlist"/>
+        <ref name="common-draw-id-attlist"/>
+        <ref name="common-draw-layer-name-attlist"/>
+        <ref name="common-draw-style-name-attlist"/>
+        <ref name="common-dr3d-transform-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="draw-custom-shape">
+    <element name="draw:custom-shape">
+        <ref name="draw-custom-shape-attlist"/>
+        <ref name="common-draw-position-attlist"/>
+        <ref name="common-draw-size-attlist"/>
+        <ref name="common-draw-shape-with-text-and-styles-attlist"/>
+        <optional>
+            <ref name="office-event-listeners"/>
+        </optional>
+        <zeroOrMore>
+            <ref name="draw-glue-point"/>
+        </zeroOrMore>
+        <ref name="draw-text"/>
+        <optional>
+            <ref name="draw-enhanced-geometry"/>
+        </optional>
+    </element>
+</define>
+<define name="draw-custom-shape-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:engine">
+            <ref name="namespacedToken"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-custom-shape-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:data">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-enhanced-geometry">
+    <element name="draw:enhanced-geometry">
+        <ref name="draw-enhanced-geometry-attlist"/>
+        <zeroOrMore>
+            <ref name="draw-equation"/>
+        </zeroOrMore>
+        <zeroOrMore>
+            <ref name="draw-handle"/>
+        </zeroOrMore>
+    </element>
+</define>
+<define name="draw-enhanced-geometry-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:type" a:defaultValue="non-primitive">
+            <ref name="custom-shape-type"/>
+        </attribute>
+    </optional>
+</define>
+
+<define name="custom-shape-type">
+    <choice>
+        <value>non-primitive</value>
+        <ref name="string"/>
+    </choice>
+</define>
+<define name="draw-enhanced-geometry-attlist" combine="interleave">
+    <optional>
+        <attribute name="svg:viewBox">
+            <list>
+                <ref name="integer"/>
+                <ref name="integer"/>
+                <ref name="integer"/>
+                <ref name="integer"/>
+            </list>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-enhanced-geometry-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:mirror-vertical" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="draw:mirror-horizontal" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-enhanced-geometry-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:text-rotate-angle" a:defaultValue="0">
+            <ref name="double"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-enhanced-geometry-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:extrusion-allowed" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-enhanced-geometry-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:text-path-allowed" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-enhanced-geometry-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:concentric-gradient-fill-allowed"
+                    a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-enhanced-geometry-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:extrusion" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-enhanced-geometry-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:extrusion-brightness" a:defaultValue="33%">
+            <ref name="percent"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-enhanced-geometry-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:extrusion-depth" a:defaultValue="36pt 0">
+            <list>
+                <ref name="length"/>
+                <ref name="double"/>
+            </list>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-enhanced-geometry-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:extrusion-diffusion" a:defaultValue="0%">
+            <ref name="percent"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-enhanced-geometry-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:extrusion-number-of-line-segments"
+                   a:defaultValue="30">
+            <ref name="integer"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-enhanced-geometry-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:extrusion-light-face" a:defaultValue="true">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-enhanced-geometry-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:extrusion-first-light-harsh"
+                   a:defaultValue="true">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-enhanced-geometry-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:extrusion-second-light-harsh"
+                   a:defaultValue="true">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-enhanced-geometry-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:extrusion-first-light-level"
+                   a:defaultValue="66%">
+            <ref name="percent"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-enhanced-geometry-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:extrusion-second-light-level"
+                   a:defaultValue="66%">
+            <ref name="percent"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-enhanced-geometry-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:extrusion-first-light-direction"
+                   a:defaultValue="(5 0 1)">
+            <ref name="vector3D"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-enhanced-geometry-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:extrusion-second-light-direction"
+                   a:defaultValue="(-5 0 1)">
+            <ref name="vector3D"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-enhanced-geometry-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:extrusion-metal" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-enhanced-geometry-attlist" combine="interleave">
+    <optional>
+        <attribute name="dr3d:shade-mode" a:defaultValue="flat">
+            <choice>
+                <value>flat</value>
+                <value>phong</value>
+                <value>gouraud</value>
+                <value>draft</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-enhanced-geometry-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:extrusion-rotation-angle" a:defaultValue="0 0">
+            <list>
+                <ref name="double"/>
+                <ref name="double"/>
+            </list>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-enhanced-geometry-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:extrusion-rotation-center">
+            <ref name="vector3D"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-enhanced-geometry-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:extrusion-shininess" a:defaultValue="50%">
+            <ref name="percent"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-enhanced-geometry-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:extrusion-skew" a:defaultValue="50 45">
+            <list>
+                <ref name="double"/>
+                <ref name="double"/>
+            </list>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-enhanced-geometry-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:extrusion-specularity" a:defaultValue="0%">
+            <ref name="percent"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-enhanced-geometry-attlist" combine="interleave">
+    <optional>
+        <attribute name="dr3d:projection" a:defaultValue="parallel">
+            <choice>
+                <value>parallel</value>
+                <value>perspective</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-enhanced-geometry-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:extrusion-viewpoint" 
+                   a:defaultValue="3.5cm -3.5cm 25cm">
+            <ref name="point3D"/>
+        </attribute>
+    </optional>
+</define>
+
+<define name="point3D">
+    <data type="string"/>
+</define>
+<define name="draw-enhanced-geometry-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:extrusion-origin" a:defaultValue="0.5 -0.5">
+            <list>
+                <ref name="double"/>
+                <ref name="double"/>
+            </list>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-enhanced-geometry-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:extrusion-color" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-enhanced-geometry-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:enhanced-path">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-enhanced-geometry-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:path-stretchpoint-x" a:defaultValue="0">
+            <ref name="double"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="draw:path-stretchpoint-y" a:defaultValue="0">
+            <ref name="double"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-enhanced-geometry-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:text-areas">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-enhanced-geometry-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:glue-points">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-enhanced-geometry-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:glue-point-type" a:defaultValue="none">
+            <choice>
+                <value>none</value>
+                <value>segments</value>
+                <value>rectangle</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-enhanced-geometry-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:glue-point-leaving-directions"/>
+    </optional>
+</define>
+<define name="draw-enhanced-geometry-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:text-path" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-enhanced-geometry-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:text-path-mode" a:defaultValue="normal">
+            <choice>
+                <value>normal</value>
+                <value>path</value>
+                <value>shape</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-enhanced-geometry-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:text-path-scale" a:defaultValue="path">
+            <choice>
+                <value>path</value>
+                <value>shape</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-enhanced-geometry-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:text-path-same-letter-heights"
+                   a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-enhanced-geometry-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:modifiers">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-equation">
+    <element name="draw:equation">
+        <ref name="draw-equation-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="draw-equation-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:name">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-equation-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:formula">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-handle">
+    <element name="draw:handle">
+        <ref name="draw-handle-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="draw-handle-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:handle-mirror-vertical" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-handle-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:handle-mirror-horizontal" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-handle-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:handle-switched" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-handle-attlist" combine="interleave">
+    <attribute name="draw:handle-position">
+        <ref name="string"/>
+    </attribute>
+</define>
+<define name="draw-handle-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:handle-range-x-minimum">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-handle-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:handle-range-x-maximum">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-handle-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:handle-range-y-minimum">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-handle-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:handle-range-y-maximum">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-handle-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:handle-polar">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-handle-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:handle-radius-range-minimum">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-handle-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:handle-radius-range-maximum">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="presentation-shape-attlist" combine="interleave">
+    <optional>
+        <attribute name="presentation:class">
+            <ref name="presentation-classes"/>
+        </attribute>
+    </optional>
+</define>
+<define name="presentation-classes">
+    <choice>
+        <value>title</value>
+        <value>outline</value>
+        <value>subtitle</value>
+        <value>text</value>
+        <value>graphic</value>
+        <value>object</value>
+        <value>chart</value>
+        <value>table</value>
+        <value>orgchart</value>
+        <value>page</value>
+        <value>notes</value>
+        <value>handout</value>
+        <value>header</value>
+        <value>footer</value>
+        <value>date-time</value>
+        <value>page-number</value>
+    </choice>
+</define>
+<define name="presentation-shape-attlist" combine="interleave">
+    <optional>
+        <attribute name="presentation:placeholder">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="presentation-shape-attlist" combine="interleave">
+    <optional>
+        <attribute name="presentation:user-transformed">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="presentation-animations">
+    <element name="presentation:animations">
+        <zeroOrMore>
+            <choice>
+                <ref name="presentation-animation-elements"/>
+                <ref name="presentation-animation-group"/>
+            </choice>
+        </zeroOrMore>
+    </element>
+</define>
+<define name="presentation-animation-elements">
+    <choice>
+        <ref name="presentation-show-shape"/>
+        <ref name="presentation-show-text"/>
+        <ref name="presentation-hide-shape"/>
+        <ref name="presentation-hide-text"/>
+        <ref name="presentation-dim"/>
+        <ref name="presentation-play"/>
+    </choice>
+</define>
+<define name="presentation-sound">
+    <element name="presentation:sound">
+        <ref name="presentation-sound-attlist"/>
+        <attribute name="xlink:href">
+            <ref name="anyURI"/>
+        </attribute>
+        <optional>
+            <attribute name="xlink:type" a:defaultValue="simple">
+                <choice>
+                    <value>simple</value>
+                </choice>
+            </attribute>
+        </optional>
+        <optional>
+            <attribute name="xlink:actuate" a:defaultValue="onRequest">
+                <choice>
+                    <value>onRequest</value>
+                </choice>
+            </attribute>
+        </optional>
+        <optional>
+            <attribute name="xlink:show">
+                <choice>
+                    <value>new</value>
+                    <value>replace</value>
+                </choice>
+            </attribute>
+        </optional>
+        <empty/>
+    </element>
+</define>
+<define name="presentation-sound-attlist" combine="interleave">
+    <optional>
+        <attribute name="presentation:play-full">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="presentation-show-shape">
+    <element name="presentation:show-shape">
+        <ref name="common-presentation-effect-attlist"/>
+        <optional>
+            <ref name="presentation-sound"/>
+        </optional>
+    </element>
+</define>
+<define name="common-presentation-effect-attlist" combine="interleave">
+    <attribute name="draw:shape-id">
+        <ref name="IDREF"/>
+    </attribute>
+</define>
+<define name="common-presentation-effect-attlist" combine="interleave">
+    <optional>
+        <attribute name="presentation:effect" a:defaultValue="none">
+            <ref name="presentationEffects"/>
+        </attribute>
+    </optional>
+</define>
+<define name="presentationEffects">
+    <choice>
+        <value>none</value>
+        <value>fade</value>
+        <value>move</value>
+        <value>stripes</value>
+        <value>open</value>
+        <value>close</value>
+        <value>dissolve</value>
+        <value>wavyline</value>
+        <value>random</value>
+        <value>lines</value>
+        <value>laser</value>
+        <value>appear</value>
+        <value>hide</value>
+        <value>move-short</value>
+        <value>checkerboard</value>
+        <value>rotate</value>
+        <value>stretch</value>
+    </choice>
+</define>
+<define name="common-presentation-effect-attlist" combine="interleave">
+    <optional>
+        <attribute name="presentation:direction" a:defaultValue="none">
+            <ref name="presentationEffectDirections"/>
+        </attribute>
+    </optional>
+</define>
+<define name="presentationEffectDirections">
+    <choice>
+        <value>none</value>
+        <value>from-left</value>
+        <value>from-top</value>
+        <value>from-right</value>
+        <value>from-bottom</value>
+        <value>from-center</value>
+        <value>from-upper-left</value>
+        <value>from-upper-right</value>
+        <value>from-lower-left</value>
+        <value>from-lower-right</value>
+        <value>to-left</value>
+        <value>to-top</value>
+        <value>to-right</value>
+        <value>to-bottom</value>
+        <value>to-upper-left</value>
+        <value>to-upper-right</value>
+        <value>to-lower-right</value>
+        <value>to-lower-left</value>
+        <value>path</value>
+        <value>spiral-inward-left</value>
+        <value>spiral-inward-right</value>
+        <value>spiral-outward-left</value>
+        <value>spiral-outward-right</value>
+        <value>vertical</value>
+        <value>horizontal</value>
+        <value>to-center</value>
+        <value>clockwise</value>
+        <value>counter-clockwise</value>
+    </choice>
+</define>
+<define name="common-presentation-effect-attlist" combine="interleave">
+    <optional>
+        <attribute name="presentation:speed" a:defaultValue="medium">
+            <ref name="presentationSpeeds"/>
+        </attribute>
+    </optional>
+</define>
+<define name="presentationSpeeds">
+    <choice>
+        <value>slow</value>
+        <value>medium</value>
+        <value>fast</value>
+    </choice>
+</define>
+<define name="common-presentation-effect-attlist" combine="interleave">
+    <optional>
+        <attribute name="presentation:delay">
+            <ref name="duration"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-presentation-effect-attlist" combine="interleave">
+    <optional>
+        <attribute name="presentation:start-scale" a:defaultValue="100%">
+            <ref name="percent"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-presentation-effect-attlist" combine="interleave">
+    <optional>
+        <attribute name="presentation:path-id"/>
+    </optional>
+</define>
+<define name="presentation-show-text">
+    <element name="presentation:show-text">
+        <ref name="common-presentation-effect-attlist"/>
+        <optional>
+            <ref name="presentation-sound"/>
+        </optional>
+    </element>
+</define>
+<define name="presentation-hide-shape">
+    <element name="presentation:hide-shape">
+        <ref name="common-presentation-effect-attlist"/>
+        <optional>
+            <ref name="presentation-sound"/>
+        </optional>
+    </element>
+</define>
+<define name="presentation-hide-text">
+    <element name="presentation:hide-text">
+        <ref name="common-presentation-effect-attlist"/>
+        <optional>
+            <ref name="presentation-sound"/>
+        </optional>
+    </element>
+</define>
+<define name="presentation-dim">
+    <element name="presentation:dim">
+        <ref name="presentation-dim-attlist"/>
+        <optional>
+            <ref name="presentation-sound"/>
+        </optional>
+    </element>
+</define>
+<define name="presentation-dim-attlist" combine="interleave">
+    <attribute name="draw:shape-id">
+        <ref name="IDREF"/>
+    </attribute>
+</define>
+<define name="presentation-dim-attlist" combine="interleave">
+    <attribute name="draw:color">
+        <ref name="color"/>
+    </attribute>
+</define>
+<define name="presentation-play">
+    <element name="presentation:play">
+        <ref name="presentation-play-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="presentation-play-attlist" combine="interleave">
+    <attribute name="draw:shape-id">
+        <ref name="IDREF"/>
+    </attribute>
+    <optional>
+        <attribute name="presentation:speed" a:defaultValue="medium">
+            <ref name="presentationSpeeds"/>
+        </attribute>
+    </optional>
+</define>
+<define name="presentation-animation-group">
+    <element name="presentation:animation-group">
+        <zeroOrMore>
+            <ref name="presentation-animation-elements"/>
+        </zeroOrMore>
+    </element>
+</define>
+<define name="common-anim-attlist" combine="interleave">
+    <optional>
+        <attribute name="presentation:node-type" a:defaultValue="default">
+            <choice>
+                <value>default</value>
+                <value>on-click</value>
+                <value>with-previous</value>
+                <value>after-previous</value>
+                <value>timing-root</value>
+                <value>main-sequence</value>
+                <value>interactive-sequence</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="common-anim-attlist" combine="interleave">
+    <optional>
+        <attribute name="presentation:preset-id">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-anim-attlist" combine="interleave">
+    <optional>
+        <attribute name="presentation:preset-sub-type">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-anim-attlist" combine="interleave">
+    <optional>
+        <attribute name="presentation:preset-class" a:defaultValue="custom">
+            <choice>
+                <value>custom</value>
+                <value>entrance</value>
+                <value>exit</value>
+                <value>emphasis</value>
+                <value>motion-path</value>
+                <value>ole-action</value>
+                <value>media-call</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="common-anim-attlist" combine="interleave">
+    <optional>
+        <attribute name="presentation:master-element">
+            <ref name="IDREF"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-anim-attlist" combine="interleave">
+    <optional>
+        <attribute name="presentation:group-id">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="presentation-event-listener">
+    <element name="presentation:event-listener">
+        <ref name="presentation-event-listener-attlist"/>
+        <optional>
+            <ref name="presentation-sound"/>
+        </optional>
+    </element>
+</define>
+<define name="presentation-event-listener-attlist" combine="interleave">
+    <attribute name="script:event-name">
+        <ref name="string"/>
+    </attribute>
+</define>
+<define name="presentation-event-listener-attlist" combine="interleave">
+    <attribute name="presentation:action">
+        <choice>
+            <value>none</value>
+            <value>previous-page</value>
+            <value>next-page</value>
+            <value>first-page</value>
+            <value>last-page</value>
+            <value>hide</value>
+            <value>stop</value>
+            <value>execute</value>
+            <value>show</value>
+            <value>verb</value>
+            <value>fade-out</value>
+            <value>sound</value>
+        </choice>
+    </attribute>
+</define>
+<define name="presentation-event-listener-attlist" combine="interleave">
+    <optional>
+        <attribute name="presentation:effect" a:defaultValue="none">
+            <ref name="presentationEffects"/>
+        </attribute>
+    </optional>
+</define>
+<define name="presentation-event-listener-attlist" combine="interleave">
+    <optional>
+        <attribute name="presentation:direction" a:defaultValue="none">
+            <ref name="presentationEffectDirections"/>
+        </attribute>
+    </optional>
+</define>
+<define name="presentation-event-listener-attlist" combine="interleave">
+    <optional>
+        <attribute name="presentation:speed" a:defaultValue="medium">
+            <ref name="presentationSpeeds"/>
+        </attribute>
+    </optional>
+</define>
+<define name="presentation-event-listener-attlist" combine="interleave">
+    <optional>
+        <attribute name="presentation:start-scale" a:defaultValue="100%">
+            <ref name="percent"/>
+        </attribute>
+    </optional>
+</define>
+<define name="presentation-event-listener-attlist" combine="interleave">
+    <optional>
+        <attribute name="xlink:href">
+            <ref name="anyURI"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="xlink:type" a:defaultValue="simple">
+            <choice>
+                <value>simple</value>
+            </choice>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="xlink:show" a:defaultValue="embed">
+            <choice>
+                <value>embed</value>
+            </choice>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="xlink:actuate" a:defaultValue="onRequest">
+            <choice>
+                <value>onRequest</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="presentation-event-listener-attlist" combine="interleave">
+    <optional>
+        <attribute name="presentation:verb">
+            <ref name="nonNegativeInteger"/>
+        </attribute>
+    </optional>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="presentation:header">
+        <empty/>
+    </element>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="presentation:footer">
+        <empty/>
+    </element>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="presentation:date-time">
+        <empty/>
+    </element>
+</define>
+<define name="presentation-decls">
+    <zeroOrMore>
+        <ref name="presentation-decl"/>
+    </zeroOrMore>
+</define>
+<define name="presentation-decl" combine="choice">
+    <element name="presentation:header-decl">
+        <ref name="presentation-header-decl-attlist"/>
+        <text/>
+    </element>
+</define>
+<define name="presentation-header-decl-attlist" combine="interleave">
+    <attribute name="presentation:name">
+        <ref name="string"/>
+    </attribute>
+</define>
+<define name="presentation-decl" combine="choice">
+    <element name="presentation:footer-decl">
+        <ref name="presentation-footer-decl-attlist"/>
+        <text/>
+    </element>
+</define>
+<define name="presentation-footer-decl-attlist" combine="interleave">
+    <attribute name="presentation:name">
+        <ref name="string"/>
+    </attribute>
+</define>
+<define name="presentation-decl" combine="choice">
+    <element name="presentation:date-time-decl">
+        <ref name="presentation-date-time-decl-attlist"/>
+        <text/>
+    </element>
+</define>
+<define name="presentation-date-time-decl-attlist" combine="interleave">
+    <attribute name="presentation:name">
+        <ref name="string"/>
+    </attribute>
+</define>
+<define name="presentation-date-time-decl-attlist" combine="interleave">
+    <attribute name="presentation:source">
+        <choice>
+            <value>fixed</value>
+            <value>current-date</value>
+        </choice>
+    </attribute>
+</define>
+<define name="presentation-date-time-decl-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:data-style-name">
+            <ref name="styleNameRef"/>
+        </attribute>
+    </optional>
+</define>
+<define name="presentation-settings">
+    <optional>
+        <element name="presentation:settings">
+            <ref name="presentation-settings-attlist"/>
+            <zeroOrMore>
+                <ref name="presentation-show"/>
+            </zeroOrMore>
+        </element>
+    </optional>
+</define>
+<define name="presentation-settings-attlist" combine="interleave">
+    <optional>
+        <attribute name="presentation:start-page">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="presentation-settings-attlist" combine="interleave">
+    <optional>
+        <attribute name="presentation:show">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="presentation-settings-attlist" combine="interleave">
+    <optional>
+        <attribute name="presentation:full-screen" a:defaultValue="true">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="presentation-settings-attlist" combine="interleave">
+    <optional>
+        <attribute name="presentation:endless" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="presentation-settings-attlist" combine="interleave">
+    <optional>
+        <attribute name="presentation:pause">
+            <ref name="duration"/>
+        </attribute>
+    </optional>
+</define>
+<define name="presentation-settings-attlist" combine="interleave">
+    <optional>
+        <attribute name="presentation:show-logo" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="presentation-settings-attlist" combine="interleave">
+    <optional>
+        <attribute name="presentation:force-manual" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="presentation-settings-attlist" combine="interleave">
+    <optional>
+        <attribute name="presentation:mouse-visible" a:defaultValue="true">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="presentation-settings-attlist" combine="interleave">
+    <optional>
+        <attribute name="presentation:mouse-as-pen" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="presentation-settings-attlist" combine="interleave">
+    <optional>
+        <attribute name="presentation:start-with-navigator"
+                   a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="presentation-settings-attlist" combine="interleave">
+    <optional>
+        <attribute name="presentation:animations" a:defaultValue="enabled">
+            <choice>
+                <value>enabled</value>
+                <value>disabled</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="presentation-settings-attlist" combine="interleave">
+    <optional>
+        <attribute name="presentation:transition-on-click"
+                   a:defaultValue="enabled">
+            <choice>
+                <value>enabled</value>
+                <value>disabled</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="presentation-settings-attlist" combine="interleave">
+    <optional>
+        <attribute name="presentation:stay-on-top" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="presentation-show">
+    <element name="presentation:show">
+        <ref name="presentation-show-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="presentation-show-attlist" combine="interleave">
+    <attribute name="presentation:name">
+        <ref name="string"/>
+    </attribute>
+</define>
+<define name="presentation-show-attlist" combine="interleave">
+    <attribute name="presentation:pages"/>
+</define>
+<define name="chart-chart">
+    <element name="chart:chart">
+        <ref name="chart-chart-attlist"/>
+        <optional>
+            <ref name="chart-title"/>
+        </optional>
+        <optional>
+            <ref name="chart-subtitle"/>
+        </optional>
+        <optional>
+            <ref name="chart-footer"/>
+        </optional>
+        <optional>
+            <ref name="chart-legend"/>
+        </optional>
+        <ref name="chart-plot-area"/>
+        <optional>
+            <ref name="table-table"/>
+        </optional>
+    </element>
+</define>
+<define name="chart-chart-attlist" combine="interleave">
+    <attribute name="chart:class">
+        <ref name="namespacedToken"/>
+    </attribute>
+</define>
+<define name="chart-chart-attlist" combine="interleave">
+    <ref name="common-draw-size-attlist"/>
+</define>
+<define name="chart-chart-attlist" combine="interleave">
+    <optional>
+        <attribute name="chart:column-mapping">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="chart-chart-attlist" combine="interleave">
+    <optional>
+        <attribute name="chart:row-mapping">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="chart-chart-attlist" combine="interleave">
+    <optional>
+        <attribute name="chart:style-name">
+            <ref name="styleNameRef"/>
+        </attribute>
+    </optional>
+</define>
+<define name="chart-title">
+    <element name="chart:title">
+        <ref name="chart-title-attlist"/>
+        <optional>
+            <ref name="text-p"/>
+        </optional>
+    </element>
+</define>
+<define name="chart-title-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:cell-range">
+            <ref name="cellAddress"/>
+        </attribute>
+    </optional>
+</define>
+<define name="chart-title-attlist" combine="interleave">
+    <ref name="common-draw-position-attlist"/>
+</define>
+<define name="chart-title-attlist" combine="interleave">
+    <optional>
+        <attribute name="chart:style-name">
+            <ref name="styleNameRef"/>
+        </attribute>
+    </optional>
+</define>
+<define name="chart-subtitle">
+    <element name="chart:subtitle">
+        <ref name="chart-title-attlist"/>
+        <optional>
+            <ref name="text-p"/>
+        </optional>
+    </element>
+</define>
+<define name="chart-footer">
+    <element name="chart:footer">
+        <ref name="chart-title-attlist"/>
+        <optional>
+            <ref name="text-p"/>
+        </optional>
+    </element>
+</define>
+<define name="chart-legend">
+    <element name="chart:legend">
+        <ref name="chart-legend-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="chart-legend-attlist" combine="interleave">
+    <choice>
+        <group>
+            <attribute name="chart:legend-position">
+                <choice>
+                    <value>start</value>
+                    <value>end</value>
+                    <value>top</value>
+                    <value>bottom</value>
+                </choice>
+            </attribute>
+            <optional>
+                <attribute name="chart:legend-align">
+                    <choice>
+                        <value>start</value>
+                        <value>center</value>
+                        <value>end</value>
+                    </choice>
+                </attribute>
+            </optional>
+        </group>
+        <attribute name="chart:legend-position">
+            <choice>
+                <value>top-start</value>
+                <value>bottom-start</value>
+                <value>top-end</value>
+                <value>bottom-end</value>
+            </choice>
+        </attribute>
+        <empty/>
+    </choice>
+</define>
+<define name="chart-legend-attlist" combine="interleave">
+    <ref name="common-draw-position-attlist"/>
+</define>
+<define name="chart-legend-attlist" combine="interleave">
+    <choice>
+        <attribute name="style:legend-expansion">
+            <choice>
+                <value>wide</value>
+                <value>high</value>
+                <value>balanced</value>
+            </choice>
+        </attribute>
+        <group>
+            <attribute name="style:legend-expansion">
+                <value>custom</value>
+            </attribute>
+            <attribute name="style:legend-expansion-aspect-ratio">
+                <ref name="double"/>
+            </attribute>
+        </group>
+        <empty/>
+    </choice>
+</define>
+<define name="chart-legend-attlist" combine="interleave">
+    <optional>
+        <attribute name="chart:style-name">
+            <ref name="styleNameRef"/>
+        </attribute>
+    </optional>
+</define>
+<define name="chart-plot-area">
+    <element name="chart:plot-area">
+        <ref name="chart-plot-area-attlist"/>
+        <zeroOrMore>
+            <ref name="dr3d-light"/>
+        </zeroOrMore>
+        <zeroOrMore>
+            <ref name="chart-axis"/>
+        </zeroOrMore>
+        <zeroOrMore>
+            <ref name="chart-series"/>
+        </zeroOrMore>
+        <optional>
+            <ref name="chart-stock-gain-marker"/>
+        </optional>
+        <optional>
+            <ref name="chart-stock-loss-marker"/>
+        </optional>
+        <optional>
+            <ref name="chart-stock-range-line"/>
+        </optional>
+        <optional>
+            <ref name="chart-wall"/>
+        </optional>
+        <optional>
+            <ref name="chart-floor"/>
+        </optional>
+    </element>
+</define>
+<define name="chart-plot-area-attlist" combine="interleave">
+    <ref name="common-draw-position-attlist"/>
+    <ref name="common-draw-size-attlist"/>
+</define>
+<define name="chart-plot-area-attlist" combine="interleave">
+    <optional>
+        <attribute name="chart:style-name">
+            <ref name="styleNameRef"/>
+        </attribute>
+    </optional>
+</define>
+<define name="chart-plot-area-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:cell-range-address">
+            <ref name="cellRangeAddress"/>
+        </attribute>
+    </optional>
+</define>
+<define name="chart-plot-area-attlist" combine="interleave">
+    <optional>
+        <attribute name="chart:data-source-has-labels" a:defaultValue="none">
+            <choice>
+                <value>none</value>
+                <value>row</value>
+                <value>column</value>
+                <value>both</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="chart-plot-area-attlist" combine="interleave">
+    <ref name="dr3d-scene-attlist"/>
+    <ref name="common-dr3d-transform-attlist"/>
+</define>
+<define name="chart-wall">
+    <element name="chart:wall">
+        <ref name="chart-wall-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="chart-wall-attlist" combine="interleave">
+    <optional>
+        <attribute name="svg:width">
+            <ref name="length"/>
+        </attribute>
+    </optional>
+</define>
+<define name="chart-wall-attlist" combine="interleave">
+    <optional>
+        <attribute name="chart:style-name">
+            <ref name="styleNameRef"/>
+        </attribute>
+    </optional>
+</define>
+<define name="chart-floor">
+    <element name="chart:floor">
+        <ref name="chart-floor-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="chart-floor-attlist" combine="interleave">
+    <optional>
+        <attribute name="svg:width">
+            <ref name="length"/>
+        </attribute>
+    </optional>
+</define>
+<define name="chart-floor-attlist" combine="interleave">
+    <optional>
+        <attribute name="chart:style-name">
+            <ref name="styleNameRef"/>
+        </attribute>
+    </optional>
+</define>
+<define name="chart-axis">
+    <element name="chart:axis">
+        <ref name="chart-axis-attlist"/>
+        <optional>
+            <ref name="chart-title"/>
+        </optional>
+        <optional>
+            <ref name="chart-categories"/>
+        </optional>
+        <zeroOrMore>
+            <ref name="chart-grid"/>
+        </zeroOrMore>
+    </element>
+</define>
+<define name="chart-axis-attlist" combine="interleave">
+    <attribute name="chart:dimension">
+        <choice>
+            <value>x</value>
+            <value>y</value>
+            <value>z</value>
+        </choice>
+    </attribute>
+</define>
+<define name="chart-axis-attlist" combine="interleave">
+    <optional>
+        <attribute name="chart:name">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="chart-axis-attlist" combine="interleave">
+    <optional>
+        <attribute name="chart:style-name">
+            <ref name="styleNameRef"/>
+        </attribute>
+    </optional>
+</define>
+<define name="chart-grid">
+    <element name="chart:grid">
+        <ref name="chart-grid-attlist"/>
+    </element>
+</define>
+<define name="chart-grid-attlist" combine="interleave">
+    <optional>
+        <attribute name="chart:class" a:defaultValue="major">
+            <choice>
+                <value>major</value>
+                <value>minor</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="chart-grid-attlist" combine="interleave">
+    <optional>
+        <attribute name="chart:style-name">
+            <ref name="styleNameRef"/>
+        </attribute>
+    </optional>
+</define>
+<define name="chart-series">
+    <element name="chart:series">
+        <ref name="chart-series-attlist"/>
+        <zeroOrMore>
+            <ref name="chart-domain"/>
+        </zeroOrMore>
+        <optional>
+            <ref name="chart-mean-value"/>
+        </optional>
+        <optional>
+            <ref name="chart-regression-curve"/>
+        </optional>
+        <optional>
+            <ref name="chart-error-indicator"/>
+        </optional>
+        <zeroOrMore>
+            <ref name="chart-data-point"/>
+        </zeroOrMore>
+    </element>
+</define>
+<define name="chart-series-attlist" combine="interleave">
+    <optional>
+        <attribute name="chart:values-cell-range-address">
+            <ref name="cellRangeAddress"/>
+        </attribute>
+    </optional>
+</define>
+<define name="chart-series-attlist" combine="interleave">
+    <optional>
+        <attribute name="chart:label-cell-address">
+            <ref name="cellAddress"/>
+        </attribute>
+    </optional>
+</define>
+<define name="chart-series-attlist" combine="interleave">
+    <optional>
+        <attribute name="chart:class">
+            <ref name="namespacedToken"/>
+        </attribute>
+    </optional>
+</define>
+<define name="chart-series-attlist" combine="interleave">
+    <optional>
+        <attribute name="chart:attached-axis">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="chart-series-attlist" combine="interleave">
+    <optional>
+        <attribute name="chart:style-name">
+            <ref name="styleNameRef"/>
+        </attribute>
+    </optional>
+</define>
+<define name="chart-domain">
+    <element name="chart:domain">
+    <optional>
+        <attribute name="table:cell-range-address">
+            <ref name="cellRangeAddress"/>
+        </attribute>
+    </optional>
+    </element>
+</define>
+<define name="chart-categories">
+    <element name="chart:categories">
+    <optional>
+        <attribute name="table:cell-range-address">
+            <ref name="cellRangeAddress"/>
+        </attribute>
+    </optional>
+    </element>
+</define>
+<define name="chart-data-point">
+    <element name="chart:data-point">
+        <ref name="chart-data-point-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="chart-data-point-attlist" combine="interleave">
+    <optional>
+        <attribute name="chart:repeated">
+            <ref name="nonNegativeInteger"/>
+        </attribute>
+    </optional>
+</define>
+<define name="chart-data-point-attlist" combine="interleave">
+    <optional>
+        <attribute name="chart:style-name">
+            <ref name="styleNameRef"/>
+        </attribute>
+    </optional>
+</define>
+
+<define name="chart-mean-value">
+    <element name="chart:mean-value">
+        <ref name="chart-mean-value-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="chart-mean-value-attlist" combine="interleave">
+    <optional>
+        <attribute name="chart:style-name">
+            <ref name="styleNameRef"/>
+        </attribute>
+    </optional>
+</define>
+<define name="chart-error-indicator">
+    <element name="chart:error-indicator">
+        <ref name="chart-error-indicator-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="chart-error-indicator-attlist" combine="interleave">
+    <optional>
+        <attribute name="chart:style-name">
+            <ref name="styleNameRef"/>
+        </attribute>
+    </optional>
+</define>
+<define name="chart-regression-curve">
+    <element name="chart:regression-curve">
+        <ref name="chart-regression-curve-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="chart-regression-curve-attlist" combine="interleave">
+    <optional>
+        <attribute name="chart:style-name">
+            <ref name="styleNameRef"/>
+        </attribute>
+    </optional>
+</define>
+<define name="chart-stock-gain-marker">
+    <element name="chart:stock-gain-marker">
+        <ref name="common-stock-marker-attlist"/>
+    </element>
+</define>
+<define name="chart-stock-loss-marker">
+    <element name="chart:stock-loss-marker">
+        <ref name="common-stock-marker-attlist"/>
+    </element>
+</define>
+<define name="chart-stock-range-line">
+    <element name="chart:stock-range-line">
+        <ref name="common-stock-marker-attlist"/>
+    </element>
+</define>
+<define name="common-stock-marker-attlist">
+    <optional>
+        <attribute name="chart:style-name">
+            <ref name="styleNameRef"/>
+        </attribute>
+    </optional>
+</define>
+<define name="office-forms">
+    <optional>
+        <element name="office:forms">
+            <ref name="office-forms-attlist"/>
+            <zeroOrMore>
+                <choice>
+                    <ref name="form-form"/>
+                    <ref name="xforms-model"/>
+                </choice>
+            </zeroOrMore>
+        </element>
+    </optional>
+</define>
+<define name="office-forms-attlist" combine="interleave">
+    <optional>
+        <attribute name="form:automatic-focus" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="office-forms-attlist" combine="interleave">
+    <optional>
+        <attribute name="form:apply-design-mode" a:defaultValue="true">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="form-form">
+    <element name="form:form">
+        <ref name="common-form-control-attlist"/>
+        <ref name="form-form-attlist"/>
+        <optional>
+            <ref name="form-properties"/>
+        </optional>
+        <optional>
+            <ref name="office-event-listeners"/>
+        </optional>
+        <zeroOrMore>
+            <choice>
+                <ref name="controls"/>
+                <ref name="form-form"/>
+            </choice>
+        </zeroOrMore>
+        <optional>
+            <ref name="form-connection-resource"/>
+        </optional>
+    </element>
+</define>
+<define name="form-form-attlist" combine="interleave">
+    <optional>
+        <attribute name="xlink:href">
+            <ref name="anyURI"/>
+        </attribute>
+        <optional>
+            <attribute name="xlink:type" a:defaultValue="simple">
+                <value>simple</value>
+            </attribute>
+        </optional>
+        <optional>
+            <attribute name="xlink:actuate" a:defaultValue="onRequest">
+                <value>onRequest</value>
+            </attribute>
+        </optional>
+    </optional>
+</define>
+<define name="form-form-attlist" combine="interleave">
+    <optional>
+        <attribute name="office:target-frame" a:defaultValue="_blank">
+            <ref name="targetFrameName"/>
+        </attribute>
+    </optional>
+</define>
+<define name="form-form-attlist" combine="interleave">
+    <optional>
+        <attribute name="form:method" a:defaultValue="get">
+            <choice>
+                <value>get</value>
+                <value>post</value>
+                <ref name="string"/>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="form-form-attlist" combine="interleave">
+    <optional>
+        <attribute name="form:enctype" 
+                    a:defaultValue="application/x-www-form-urlencoded">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="form-form-attlist" combine="interleave">
+    <optional>
+        <attribute name="form:allow-deletes" a:defaultValue="true">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="form-form-attlist" combine="interleave">
+    <optional>
+        <attribute name="form:allow-inserts" a:defaultValue="true">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="form-form-attlist" combine="interleave">
+    <optional>
+        <attribute name="form:allow-updates" a:defaultValue="true">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="form-form-attlist" combine="interleave">
+    <optional>
+        <attribute name="form:apply-filter" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="form-form-attlist" combine="interleave">
+    <optional>
+        <attribute name="form:command-type" a:defaultValue="command">
+            <choice>
+                <value>table</value>
+                <value>query</value>
+                <value>command</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="form-form-attlist" combine="interleave">
+    <optional>
+        <attribute name="form:command"/>
+    </optional>
+</define>
+<define name="form-form-attlist" combine="interleave">
+    <optional>
+        <attribute name="form:datasource">
+            <choice>
+                <ref name="anyURI"/>
+                <ref name="string"/>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="form-form-attlist" combine="interleave">
+    <optional>
+        <attribute name="form:master-fields">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="form-form-attlist" combine="interleave">
+    <optional>
+        <attribute name="form:detail-fields">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="form-form-attlist" combine="interleave">
+    <optional>
+        <attribute name="form:escape-processing" a:defaultValue="true">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="form-form-attlist" combine="interleave">
+    <optional>
+        <attribute name="form:filter">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="form-form-attlist" combine="interleave">
+    <optional>
+        <attribute name="form:ignore-result" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="form-form-attlist" combine="interleave">
+    <optional>
+        <attribute name="form:navigation-mode">
+            <ref name="navigation"/>
+        </attribute>
+    </optional>
+</define>
+
+<define name="navigation">
+    <choice>
+        <value>none</value>
+        <value>current</value>
+        <value>parent</value>
+    </choice>
+</define>
+<define name="form-form-attlist" combine="interleave">
+    <optional>
+        <attribute name="form:order">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="form-form-attlist" combine="interleave">
+    <optional>
+        <attribute name="form:tab-cycle">
+            <ref name="tab-cycles"/>
+        </attribute>
+    </optional>
+</define>
+<define name="tab-cycles">
+    <choice>
+        <value>records</value>
+        <value>current</value>
+        <value>page</value>
+    </choice>
+</define>
+<define name="form-connection-resource">
+    <element name="form:connection-resource">
+        <attribute name="xlink:href">
+            <ref name="anyURI"/>
+        </attribute>
+        <empty/>
+    </element>
+</define>
+<define name="xforms-model">
+    <element name="xforms:model">
+        <ref name="anyAttListOrElements"/>
+    </element>
+</define>
+<define name="column-controls" combine="choice">
+    <element name="form:text">
+        <ref name="form-text-attlist"/>
+        <ref name="common-form-control-content"/>
+    </element>
+</define>
+<define name="controls" combine="choice">
+    <ref name="column-controls"/>
+</define>
+<define name="form-text-attlist">
+    <ref name="form-control-attlist"/>
+    <ref name="common-current-value-attlist"/>
+    <ref name="common-disabled-attlist"/>
+    <ref name="common-maxlength-attlist"/>
+    <ref name="common-printable-attlist"/>
+    <ref name="common-readonly-attlist"/>
+    <ref name="common-tab-attlist"/>
+    <ref name="common-title-attlist"/>
+    <ref name="common-value-attlist"/>
+    <ref name="common-convert-empty-attlist"/>
+    <ref name="common-data-field-attlist"/>
+</define>
+<define name="form-control-attlist">
+    <ref name="common-form-control-attlist"/>
+    <ref name="common-control-id-attlist"/>
+    <ref name="xforms-bind-attlist"/>
+</define>
+<define name="common-form-control-content">
+    <optional>
+        <ref name="form-properties"/>
+    </optional>
+    <optional>
+        <ref name="office-event-listeners"/>
+    </optional>
+</define>
+<define name="column-controls" combine="choice">
+    <element name="form:textarea">
+        <ref name="form-textarea-attlist"/>
+        <ref name="common-form-control-content"/>
+        <zeroOrMore>
+            <ref name="text-p"/>
+        </zeroOrMore>
+    </element>
+</define>
+<define name="form-textarea-attlist">
+    <ref name="form-control-attlist"/>
+    <ref name="common-current-value-attlist"/>
+    <ref name="common-disabled-attlist"/>
+    <ref name="common-maxlength-attlist"/>
+    <ref name="common-printable-attlist"/>
+    <ref name="common-readonly-attlist"/>
+    <ref name="common-tab-attlist"/>
+    <ref name="common-title-attlist"/>
+    <ref name="common-value-attlist"/>
+    <ref name="common-convert-empty-attlist"/>
+    <ref name="common-data-field-attlist"/>
+</define>
+<define name="controls" combine="choice">
+    <element name="form:password">
+        <ref name="form-password-attlist"/>
+        <ref name="common-form-control-content"/>
+    </element>
+</define>
+<define name="form-password-attlist" combine="interleave">
+    <ref name="form-control-attlist"/>
+    <ref name="common-disabled-attlist"/>
+    <ref name="common-maxlength-attlist"/>
+    <ref name="common-printable-attlist"/>
+    <ref name="common-tab-attlist"/>
+    <ref name="common-title-attlist"/>
+    <ref name="common-value-attlist"/>
+    <ref name="common-convert-empty-attlist"/>
+</define>
+<define name="form-password-attlist" combine="interleave">
+    <optional>
+        <attribute name="form:echo-char" a:defaultValue="*">
+            <ref name="character"/>
+        </attribute>
+    </optional>
+</define>
+<define name="controls" combine="choice">
+    <element name="form:file">
+        <ref name="form-file-attlist"/>
+        <ref name="common-form-control-content"/>
+    </element>
+</define>
+<define name="form-file-attlist" combine="interleave">
+    <ref name="form-control-attlist"/>
+    <ref name="common-current-value-attlist"/>
+    <ref name="common-disabled-attlist"/>
+    <ref name="common-maxlength-attlist"/>
+    <ref name="common-printable-attlist"/>
+    <ref name="common-readonly-attlist"/>
+    <ref name="common-tab-attlist"/>
+    <ref name="common-title-attlist"/>
+    <ref name="common-value-attlist"/>
+</define>
+<define name="column-controls" combine="choice">
+    <element name="form:formatted-text">
+        <ref name="form-formatted-text-attlist"/>
+        <ref name="common-form-control-content"/>
+    </element>
+</define>
+<define name="form-formatted-text-attlist" combine="interleave">
+    <ref name="form-control-attlist"/>
+    <ref name="common-current-value-attlist"/>
+    <ref name="common-disabled-attlist"/>
+    <ref name="common-maxlength-attlist"/>
+    <ref name="common-printable-attlist"/>
+    <ref name="common-readonly-attlist"/>
+    <ref name="common-tab-attlist"/>
+    <ref name="common-title-attlist"/>
+    <ref name="common-value-attlist"/>
+    <ref name="common-convert-empty-attlist"/>
+    <ref name="common-data-field-attlist"/>
+</define>
+<define name="form-formatted-text-attlist" combine="interleave">
+    <optional>
+        <attribute name="form:max-value">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="form-formatted-text-attlist" combine="interleave">
+    <optional>
+        <attribute name="form:min-value">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="form-formatted-text-attlist" combine="interleave">
+    <optional>
+        <attribute name="form:validation" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="column-controls" combine="choice">
+    <element name="form:number">
+        <ref name="form-number-attlist"/>
+        <ref name="common-numeric-control-attlist"/>
+        <ref name="common-form-control-content"/>
+    </element>
+</define>
+<define name="common-numeric-control-attlist">
+    <ref name="form-control-attlist"/>
+    <ref name="common-disabled-attlist"/>
+    <ref name="common-maxlength-attlist"/>
+    <ref name="common-printable-attlist"/>
+    <ref name="common-readonly-attlist"/>
+    <ref name="common-tab-attlist"/>
+    <ref name="common-title-attlist"/>
+    <ref name="common-convert-empty-attlist"/>
+    <ref name="common-data-field-attlist"/>
+</define>
+<define name="form-number-attlist" combine="interleave">
+    <optional>
+        <attribute name="form:value">
+            <ref name="double"/>
+        </attribute>
+    </optional>
+</define>
+<define name="form-number-attlist" combine="interleave">
+    <optional>
+        <attribute name="form:current-value">
+            <ref name="double"/>
+        </attribute>
+    </optional>
+</define>
+<define name="form-number-attlist" combine="interleave">
+    <optional>
+        <attribute name="form:min-value">
+            <ref name="double"/>
+        </attribute>
+    </optional>
+</define>
+<define name="form-number-attlist" combine="interleave">
+    <optional>
+        <attribute name="form:max-value">
+            <ref name="double"/>
+        </attribute>
+    </optional>
+</define>
+<define name="column-controls" combine="choice">
+    <element name="form:date">
+        <ref name="form-date-attlist"/>
+        <ref name="common-numeric-control-attlist"/>
+        <ref name="common-form-control-content"/>
+    </element>
+</define>
+<define name="controls" combine="choice">
+    <element name="form:time">
+        <ref name="form-time-attlist"/>
+        <ref name="common-numeric-control-attlist"/>
+        <ref name="common-form-control-content"/>
+    </element>
+</define>
+<define name="form-date-attlist" combine="interleave">
+    <optional>
+        <attribute name="form:value">
+            <ref name="date"/>
+        </attribute>
+    </optional>
+</define>
+<define name="form-time-attlist" combine="interleave">
+    <optional>
+        <attribute name="form:value">
+            <ref name="time"/>
+        </attribute>
+    </optional>
+</define>
+<define name="form-date-attlist" combine="interleave">
+    <optional>
+        <attribute name="form:current-value">
+            <ref name="date"/>
+        </attribute>
+    </optional>
+</define>
+<define name="form-time-attlist" combine="interleave">
+    <optional>
+        <attribute name="form:current-value">
+            <ref name="time"/>
+        </attribute>
+    </optional>
+</define>
+<define name="form-date-attlist" combine="interleave">
+    <optional>
+        <attribute name="form:min-value">
+            <ref name="date"/>
+        </attribute>
+    </optional>
+</define>
+<define name="form-time-attlist" combine="interleave">
+    <optional>
+        <attribute name="form:min-value">
+            <ref name="time"/>
+        </attribute>
+    </optional>
+</define>
+<define name="form-date-attlist" combine="interleave">
+    <optional>
+        <attribute name="form:max-value">
+            <ref name="date"/>
+        </attribute>
+    </optional>
+</define>
+<define name="form-time-attlist" combine="interleave">
+    <optional>
+        <attribute name="form:max-value">
+            <ref name="time"/>
+        </attribute>
+    </optional>
+</define>
+<define name="controls" combine="choice">
+    <element name="form:fixed-text">
+        <ref name="form-fixed-text-attlist"/>
+        <ref name="common-form-control-content"/>
+    </element>
+</define>
+<define name="form-fixed-text-attlist" combine="interleave">
+    <ref name="form-control-attlist"/>
+    <ref name="for"/>
+    <ref name="common-disabled-attlist"/>
+    <ref name="label"/>
+    <ref name="common-printable-attlist"/>
+    <ref name="common-title-attlist"/>
+</define>
+<define name="form-fixed-text-attlist" combine="interleave">
+    <optional>
+        <attribute name="form:multi-line" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="column-controls" combine="choice">
+    <element name="form:combobox">
+        <ref name="form-combobox-attlist"/>
+        <ref name="common-form-control-content"/>
+        <zeroOrMore>
+            <ref name="form-item"/>
+        </zeroOrMore>
+    </element>
+</define>
+<define name="form-combobox-attlist" combine="interleave">
+    <ref name="form-control-attlist"/>
+    <ref name="common-current-value-attlist"/>
+    <ref name="common-disabled-attlist"/>
+    <ref name="dropdown"/>
+    <ref name="common-maxlength-attlist"/>
+    <ref name="common-printable-attlist"/>
+    <ref name="common-readonly-attlist"/>
+    <ref name="size"/>
+    <ref name="common-tab-attlist"/>
+    <ref name="common-title-attlist"/>
+    <ref name="common-value-attlist"/>
+    <ref name="common-convert-empty-attlist"/>
+    <ref name="common-data-field-attlist"/>
+    <ref name="list-source"/>
+    <ref name="list-source-type"/>
+</define>
+<define name="form-combobox-attlist" combine="interleave">
+    <optional>
+        <attribute name="form:auto-complete">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="form-item">
+    <element name="form:item">
+        <ref name="form-item-attlist"/>
+        <text/>
+    </element>
+</define>
+<define name="form-item-attlist" combine="interleave">
+    <ref name="label"/>
+</define>
+<define name="column-controls" combine="choice">
+    <element name="form:listbox">
+        <ref name="form-listbox-attlist"/>
+        <ref name="common-form-control-content"/>
+        <zeroOrMore>
+            <ref name="form-option"/>
+        </zeroOrMore>
+    </element>
+</define>
+<define name="form-listbox-attlist" combine="interleave">
+    <ref name="form-control-attlist"/>
+    <ref name="common-disabled-attlist"/>
+    <ref name="dropdown"/>
+    <ref name="common-printable-attlist"/>
+    <ref name="size"/>
+    <ref name="common-tab-attlist"/>
+    <ref name="common-title-attlist"/>
+    <ref name="bound-column"/>
+    <ref name="common-data-field-attlist"/>
+    <ref name="list-source"/>
+    <ref name="list-source-type"/>
+</define>
+<define name="form-listbox-attlist" combine="interleave">
+    <optional>
+        <attribute name="form:multiple" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="form-listbox-attlist" combine="interleave">
+    <optional>
+        <attribute name="form:xforms-list-source">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="form-option">
+    <element name="form:option">
+        <ref name="form-option-attlist"/>
+        <text/>
+    </element>
+</define>
+<define name="form-option-attlist" combine="interleave">
+    <ref name="current-selected"/>
+    <ref name="selected"/>
+    <ref name="label"/>
+    <ref name="common-value-attlist"/>
+</define>
+<define name="controls" combine="choice">
+    <element name="form:button">
+        <ref name="form-button-attlist"/>
+        <ref name="common-form-control-content"/>
+    </element>
+</define>
+<define name="form-button-attlist" combine="interleave">
+    <ref name="form-control-attlist"/>
+    <ref name="button-type"/>
+    <ref name="common-disabled-attlist"/>
+    <ref name="label"/>
+    <ref name="image-data"/>
+    <ref name="common-printable-attlist"/>
+    <ref name="common-tab-attlist"/>
+    <ref name="target-frame"/>
+    <ref name="target-location"/>
+    <ref name="common-title-attlist"/>
+    <ref name="common-value-attlist"/>
+    <ref name="common-form-relative-image-position-attlist"/>
+</define>
+<define name="form-button-attlist" combine="interleave">
+    <optional>
+        <attribute name="form:default-button" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="form-button-attlist" combine="interleave">
+    <optional>
+        <attribute name="form:toggle" a:default-value="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="form-button-attlist" combine="interleave">
+    <optional>
+        <attribute name="form:focus-on-click">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="form-button-attlist" combine="interleave">
+    <optional>
+        <attribute name="form:xforms-submission">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="controls" combine="choice">
+    <element name="form:image">
+        <ref name="form-image-attlist"/>
+        <ref name="common-form-control-content"/>
+    </element>
+</define>
+<define name="form-image-attlist" combine="interleave">
+    <ref name="form-control-attlist"/>
+    <ref name="button-type"/>
+    <ref name="common-disabled-attlist"/>
+    <ref name="image-data"/>
+    <ref name="common-printable-attlist"/>
+    <ref name="common-tab-attlist"/>
+    <ref name="target-frame"/>
+    <ref name="target-location"/>
+    <ref name="common-title-attlist"/>
+    <ref name="common-value-attlist"/>
+</define>
+<define name="column-controls" combine="choice">
+    <element name="form:checkbox">
+        <ref name="form-checkbox-attlist"/>
+        <ref name="common-form-control-content"/>
+    </element>
+</define>
+<define name="form-checkbox-attlist" combine="interleave">
+    <ref name="form-control-attlist"/>
+    <ref name="common-disabled-attlist"/>
+    <ref name="label"/>
+    <ref name="common-printable-attlist"/>
+    <ref name="common-tab-attlist"/>
+    <ref name="common-title-attlist"/>
+    <ref name="common-value-attlist"/>
+    <ref name="common-data-field-attlist"/>
+    <ref name="common-form-visual-effect-attlist"/>
+    <ref name="common-form-relative-image-position-attlist"/>
+</define>
+<define name="states">
+    <choice>
+        <value>unchecked</value>
+        <value>checked</value>
+        <value>unknown</value>
+    </choice>
+</define>
+<define name="form-checkbox-attlist" combine="interleave">
+    <optional>
+        <attribute name="form:current-state">
+            <ref name="states"/>
+        </attribute>
+    </optional>
+</define>
+<define name="form-checkbox-attlist" combine="interleave">
+    <optional>
+        <attribute name="form:is-tristate" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="form-checkbox-attlist" combine="interleave">
+    <optional>
+        <attribute name="form:state" a:defaultValue="unchecked">
+            <ref name="states"/>
+        </attribute>
+    </optional>
+</define>
+<define name="controls" combine="choice">
+    <element name="form:radio">
+        <ref name="form-radio-attlist"/>
+        <ref name="common-form-control-content"/>
+    </element>
+</define>
+<define name="form-radio-attlist" combine="interleave">
+    <ref name="form-control-attlist"/>
+    <ref name="current-selected"/>
+    <ref name="common-disabled-attlist"/>
+    <ref name="label"/>
+    <ref name="common-printable-attlist"/>
+    <ref name="selected"/>
+    <ref name="common-tab-attlist"/>
+    <ref name="common-title-attlist"/>
+    <ref name="common-value-attlist"/>
+    <ref name="common-data-field-attlist"/>
+    <ref name="common-form-visual-effect-attlist"/>
+    <ref name="common-form-relative-image-position-attlist"/>
+</define>
+<define name="controls" combine="choice">
+    <element name="form:frame">
+        <ref name="form-frame-attlist"/>
+        <ref name="common-form-control-content"/>
+    </element>
+</define>
+<define name="form-frame-attlist" combine="interleave">
+    <ref name="form-control-attlist"/>
+    <ref name="common-disabled-attlist"/>
+    <ref name="for"/>
+    <ref name="label"/>
+    <ref name="common-printable-attlist"/>
+    <ref name="common-title-attlist"/>
+</define>
+<define name="controls" combine="choice">
+    <element name="form:image-frame">
+        <ref name="form-image-frame-attlist"/>
+        <ref name="common-form-control-content"/>
+    </element>
+</define>
+<define name="form-image-frame-attlist" combine="interleave">
+    <ref name="form-control-attlist"/>
+    <ref name="common-disabled-attlist"/>
+    <ref name="image-data"/>
+    <ref name="common-printable-attlist"/>
+    <ref name="common-readonly-attlist"/>
+    <ref name="common-title-attlist"/>
+    <ref name="common-data-field-attlist"/>
+</define>
+<define name="controls" combine="choice">
+    <element name="form:hidden">
+        <ref name="form-hidden-attlist"/>
+        <ref name="common-form-control-content"/>
+    </element>
+</define>
+<define name="form-hidden-attlist" combine="interleave">
+    <ref name="form-control-attlist"/>
+    <ref name="common-value-attlist"/>
+</define>
+<define name="controls" combine="choice">
+    <element name="form:grid">
+        <ref name="form-grid-attlist"/>
+        <ref name="common-form-control-content"/>
+        <zeroOrMore>
+            <ref name="form-column"/>
+        </zeroOrMore>
+    </element>
+</define>
+<define name="form-grid-attlist" combine="interleave">
+    <ref name="form-control-attlist"/>
+    <ref name="common-disabled-attlist"/>
+    <ref name="common-printable-attlist"/>
+    <ref name="common-tab-attlist"/>
+    <ref name="common-title-attlist"/>
+</define>
+<define name="form-column">
+    <element name="form:column">
+        <ref name="form-column-attlist"/>
+        <oneOrMore>
+            <ref name="column-controls"/>
+        </oneOrMore>
+    </element>
+</define>
+<define name="form-column-attlist" combine="interleave">
+    <ref name="common-form-control-attlist"/>
+    <ref name="label"/>
+    <ref name="text-style-name"/>
+</define>
+<define name="text-style-name">
+    <optional>
+        <attribute name="form:text-style-name">
+            <ref name="styleNameRef"/>
+        </attribute>
+    </optional>
+</define>
+<define name="controls" combine="choice">
+    <element name="form:value-range">
+        <ref name="form-value-range-attlist"/>
+        <ref name="common-form-control-content"/>
+    </element>
+</define>
+<define name="form-value-range-attlist" combine="interleave">
+    <ref name="form-control-attlist"/>
+    <ref name="common-disabled-attlist"/>
+    <ref name="common-printable-attlist"/>
+    <ref name="common-tab-attlist"/>
+    <ref name="common-title-attlist"/>
+    <ref name="common-value-attlist"/>
+</define>
+<define name="form-value-range-attlist" combine="interleave">
+    <optional>
+        <attribute name="form:max-value">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="form-value-range-attlist" combine="interleave">
+    <optional>
+        <attribute name="form:min-value">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="form-value-range-attlist" combine="interleave">
+    <optional>
+        <attribute name="form:step-size" a:defaultName="1">
+            <ref name="positiveInteger"/>
+        </attribute>
+    </optional>
+</define>
+<define name="form-value-range-attlist" combine="interleave">
+    <optional>
+        <attribute name="form:page-step-size">
+            <ref name="positiveInteger"/>
+        </attribute>
+    </optional>
+</define>
+<define name="form-value-range-attlist" combine="interleave">
+    <optional>
+        <attribute name="form:delay-for-repeat">
+            <ref name="duration"/>
+        </attribute>
+    </optional>
+</define>
+<define name="form-value-range-attlist" combine="interleave">
+    <optional>
+        <attribute name="form:orientation">
+            <choice>
+                <value>horizontal</value>
+                <value>vertical</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="controls" combine="choice">
+    <element name="form:generic-control">
+        <ref name="form-generic-control-attlist"/>
+        <ref name="common-form-control-content"/>
+    </element>
+</define>
+<define name="form-generic-control-attlist" combine="interleave">
+    <ref name="form-control-attlist"/>
+</define>
+<define name="common-form-control-attlist" combine="interleave">
+    <optional>
+        <attribute name="form:name">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-form-control-attlist" combine="interleave">
+    <optional>
+        <attribute name="form:control-implementation">
+            <ref name="namespacedToken"/>
+        </attribute>
+    </optional>
+</define>
+<define name="xforms-bind-attlist">
+    <optional>
+        <attribute name="xforms:bind">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="types">
+    <choice>
+        <value>submit</value>
+        <value>reset</value>
+        <value>push</value>
+        <value>url</value>
+    </choice>
+</define>
+<define name="button-type">
+    <optional>
+        <attribute name="form:button-type" a:defaultValue="push">
+            <ref name="types"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-control-id-attlist">
+    <attribute name="form:id">
+        <ref name="ID"/>
+    </attribute>
+</define>
+<define name="current-selected">
+    <optional>
+        <attribute name="form:current-selected" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-value-attlist">
+    <optional>
+        <attribute name="form:value">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-current-value-attlist">
+    <optional>
+        <attribute name="form:current-value">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-disabled-attlist">
+    <optional>
+        <attribute name="form:disabled" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="dropdown">
+    <optional>
+        <attribute name="form:dropdown" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="for">
+    <optional>
+        <attribute name="form:for">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="image-data">
+    <optional>
+        <attribute name="form:image-data">
+            <ref name="anyURI"/>
+        </attribute>
+    </optional>
+</define>
+<define name="label">
+    <optional>
+        <attribute name="form:label">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-maxlength-attlist">
+    <optional>
+        <attribute name="form:max-length">
+            <ref name="nonNegativeInteger"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-printable-attlist">
+    <optional>
+        <attribute name="form:printable" a:defaultValue="true">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-readonly-attlist">
+    <optional>
+        <attribute name="form:readonly" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="selected">
+    <optional>
+        <attribute name="form:selected" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="size">
+    <optional>
+        <attribute name="form:size">
+            <ref name="nonNegativeInteger"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-tab-attlist" combine="interleave">
+    <optional>
+        <attribute name="form:tab-index" a:defaultValue="0">
+            <ref name="nonNegativeInteger"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-tab-attlist" combine="interleave">
+    <optional>
+        <attribute name="form:tab-stop" a:defaultValue="true">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="target-frame">
+    <optional>
+        <attribute name="office:target-frame" a:defaultValue="_blank">
+            <ref name="targetFrameName"/>
+        </attribute>
+    </optional>
+</define>
+<define name="target-location">
+    <optional>
+        <attribute name="xlink:href">
+            <ref name="anyURI"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-title-attlist">
+    <optional>
+        <attribute name="form:title"/>
+    </optional>
+</define>
+<define name="common-form-visual-effect-attlist" combine="interleave">
+    <optional>
+        <attribute name="form:visual-effect">
+            <choice>
+                <value>flat</value>
+                <value>3d</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="common-form-relative-image-position-attlist"
+        combine="interleave">
+    <choice>
+        <optional>
+            <attribute name="form:image-position" a:defaultValue="center">
+                <value>center</value>
+            </attribute>
+        </optional>
+        <group>
+            <attribute name="form:image-position">
+                <choice>
+                    <value>start</value>
+                    <value>end</value>
+                    <value>top</value>
+                    <value>bottom</value>
+                </choice>
+            </attribute>
+            <optional>
+                <attribute name="form:image-align" a:defaultValue="center">
+                    <choice>
+                        <value>start</value>
+                        <value>center</value>
+                        <value>end</value>
+                    </choice>
+                </attribute>
+            </optional>
+        </group>
+    </choice>
+</define>
+<define name="bound-column">
+    <optional>
+        <attribute name="form:bound-column">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-convert-empty-attlist">
+    <optional>
+        <attribute name="form:convert-empty-to-null" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-data-field-attlist">
+    <optional>
+        <attribute name="form:data-field">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="list-source">
+    <optional>
+        <attribute name="form:list-source">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="list-source-type">
+    <optional>
+        <attribute name="form:list-source-type">
+            <choice>
+                <value>table</value>
+                <value>query</value>
+                <value>sql</value>
+                <value>sql-pass-through</value>
+                <value>value-list</value>
+                <value>table-fields</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="form-properties">
+    <element name="form:properties">
+        <oneOrMore>
+            <ref name="form-property"/>
+        </oneOrMore>
+    </element>
+</define>
+<define name="form-property" combine="choice">
+    <element name="form:property">
+        <ref name="form-property-name"/>
+        <ref name="form-property-value-and-type-attlist"/>
+    </element>
+</define>
+<define name="form-property-name" combine="interleave">
+    <attribute name="form:property-name">
+        <ref name="string"/>
+    </attribute>
+</define>
+<define name="form-property-value-and-type-attlist" combine="interleave">
+    <choice>
+        <ref name="common-value-and-type-attlist"/>
+        <attribute name="office:value-type">
+            <value>void</value>
+        </attribute>
+    </choice>
+</define>
+<define name="form-property" combine="choice">
+    <element name="form:list-property">
+        <ref name="form-property-name"/>
+        <ref name="form-property-type-and-value-list"/>
+    </element>
+</define>
+<define name="form-property-type-and-value-list">
+    <choice>
+        <group>
+            <attribute name="office:value-type">
+                <value>float</value>
+            </attribute>
+            <zeroOrMore>
+                <element name="form:list-value">
+                    <attribute name="office:value">
+                        <ref name="double"/>
+                    </attribute>
+                </element>
+            </zeroOrMore>
+        </group>
+        <group>
+            <attribute name="office:value-type">
+                <value>percentage</value>
+            </attribute>
+            <zeroOrMore>
+                <element name="form:list-value">
+                    <attribute name="office:value">
+                        <ref name="double"/>
+                    </attribute>
+                </element>
+            </zeroOrMore>
+        </group>
+        <group>
+            <attribute name="office:value-type">
+                <value>currency</value>
+            </attribute>
+            <zeroOrMore>
+                <element name="form:list-value">
+                    <attribute name="office:value">
+                        <ref name="double"/>
+                    </attribute>
+                    <optional>
+                        <attribute name="office:currency">
+                            <ref name="string"/>
+                        </attribute>
+                    </optional>
+                </element>
+            </zeroOrMore>
+        </group>
+        <group>
+            <attribute name="office:value-type">
+                <value>date</value>
+            </attribute>
+            <zeroOrMore>
+                <element name="form:list-value">
+                    <attribute name="office:date-value">
+                        <ref name="dateOrDateTime"/>
+                    </attribute>
+                </element>
+            </zeroOrMore>
+        </group>
+        <group>
+            <attribute name="office:value-type">
+                <value>time</value>
+            </attribute>
+            <zeroOrMore>
+                <element name="form:list-value">
+                    <attribute name="office:time-value">
+                        <ref name="duration"/>
+                    </attribute>
+                </element>
+            </zeroOrMore>
+        </group>
+        <group>
+            <attribute name="office:value-type">
+                <value>boolean</value>
+            </attribute>
+            <zeroOrMore>
+                <element name="form:list-value">
+                    <attribute name="office:boolean-value">
+                        <ref name="boolean"/>
+                    </attribute>
+                </element>
+            </zeroOrMore>
+        </group>
+        <group>
+            <attribute name="office:value-type">
+                <value>string</value>
+            </attribute>
+            <zeroOrMore>
+                <element name="form:list-value">
+                    <attribute name="office:string-value">
+                        <ref name="string"/>
+                    </attribute>
+                </element>
+            </zeroOrMore>
+        </group>
+        <attribute name="office:value-type">
+            <value>void</value>
+        </attribute>
+    </choice>
+</define>
+<define name="office-annotation">
+    <element name="office:annotation">
+        <ref name="office-annotation-attlist"/>
+        <ref name="draw-caption-attlist"/>
+        <ref name="common-draw-position-attlist"/>
+        <ref name="common-draw-size-attlist"/>
+        <ref name="common-draw-shape-with-text-and-styles-attlist"/>
+        <optional>
+            <ref name="dc-creator"/>
+        </optional>
+        <optional>
+            <ref name="dc-date"/>
+        </optional>
+        <optional>
+            <ref name="meta-date-string"/>
+        </optional>
+        <zeroOrMore>
+            <choice>
+                <ref name="text-p"/>
+                <ref name="text-list"/>
+            </choice>
+        </zeroOrMore>
+    </element>
+</define>
+<define name="office-annotation-attlist" combine="interleave">
+    <optional>
+        <attribute name="office:display">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="meta-date-string">
+    <element name="meta:date-string">
+        <ref name="string"/>
+    </element>
+</define>
+<define name="common-num-format-prefix-suffix-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:num-prefix">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="style:num-suffix">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-num-format-attlist" combine="interleave">
+    <choice>
+        <attribute name="style:num-format">
+            <choice>
+                <value>1</value>
+                <value>i</value>
+                <value>I</value>
+                <ref name="string"/>
+                <empty/>
+            </choice>
+        </attribute>
+        <group>
+            <attribute name="style:num-format">
+                <choice>
+                    <value>a</value>
+                    <value>A</value>
+                </choice>
+            </attribute>
+            <ref name="style-num-letter-sync-attlist"/>
+        </group>
+        <empty/>
+    </choice>
+</define>
+<define name="style-num-letter-sync-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:num-letter-sync">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="office-change-info">
+    <element name="office:change-info">
+        <ref name="dc-creator"/>
+        <ref name="dc-date"/>
+        <zeroOrMore>
+            <ref name="text-p"/>
+        </zeroOrMore>
+    </element>
+</define>
+<define name="office-event-listeners">
+    <element name="office:event-listeners">
+        <zeroOrMore>
+            <choice>
+                <ref name="script-event-listener"/>
+                <ref name="presentation-event-listener"/>
+            </choice>
+        </zeroOrMore>
+    </element>
+</define>
+<define name="script-event-listener" combine="interleave">
+    <element name="script:event-listener">
+        <ref name="script-event-listener-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="script-event-listener-attlist" combine="interleave">
+    <attribute name="script:event-name">
+        <ref name="string"/>
+    </attribute>
+</define>
+<define name="script-event-listener-attlist" combine="interleave">
+    <attribute name="script:language">
+        <ref name="string"/>
+    </attribute>
+</define>
+<define name="script-event-listener-attlist" combine="interleave">
+    <choice>
+        <attribute name="script:macro-name">
+            <ref name="string"/>
+        </attribute>
+        <group>
+            <attribute name="xlink:href">
+                <ref name="anyURI"/>
+            </attribute>
+            <optional>
+                <attribute name="xlink:type" a:defaultValue="simple">
+                    <value>simple</value>
+                </attribute>
+            </optional>
+            <optional>
+                <attribute name="xlink:actuate" a:defaultValue="onRequest">
+                    <value>onRequest</value>
+                </attribute>
+            </optional>
+        </group>
+    </choice>
+</define>
+<define name="math-math">
+    <element name="math:math">
+        <ref name="mathMarkup"/>
+    </element>
+</define>
+
+<!-- To avoid inclusion of the complete MathML schema, anything -->
+<!-- is allowed within a math:math top-level element            -->
+<define name="mathMarkup">
+    <zeroOrMore>
+        <choice>
+            <attribute>
+                <anyName/>
+            </attribute>
+            <text/>
+            <element>
+                <anyName/>
+                <ref name="mathMarkup"/>
+            </element>
+        </choice>
+    </zeroOrMore>
+</define>
+<define name="text-dde-connection-decl">
+    <element name="text:dde-connection-decl">
+        <ref name="text-dde-connection-decl-attlist"/>
+        <ref name="common-dde-connection-decl-attlist"/>
+    </element>
+</define>
+<define name="text-dde-connection-decl-attlist" combine="interleave">
+    <attribute name="office:name">
+        <ref name="string"/>
+    </attribute>
+</define>
+<define name="common-dde-connection-decl-attlist" combine="interleave">
+    <attribute name="office:dde-application">
+        <ref name="string"/>
+    </attribute>
+</define>
+<define name="common-dde-connection-decl-attlist" combine="interleave">
+    <attribute name="office:dde-topic">
+        <ref name="string"/>
+    </attribute>
+</define>
+<define name="common-dde-connection-decl-attlist" combine="interleave">
+    <attribute name="office:dde-item">
+        <ref name="string"/>
+    </attribute>
+</define>
+<define name="common-dde-connection-decl-attlist" combine="interleave">
+    <optional>
+        <attribute name="office:automatic-update" a:defaultValue="true">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-dde-link">
+    <element name="table:dde-link">
+        <ref name="office-dde-source"/>
+        <ref name="table-table"/>
+    </element>
+</define>
+<define name="office-dde-source">
+    <element name="office:dde-source">
+        <ref name="office-dde-source-attlist"/>
+        <ref name="common-dde-connection-decl-attlist"/>
+    </element>
+</define>
+<define name="office-dde-source-attlist" combine="interleave">
+    <optional>
+        <attribute name="office:name">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="office-dde-source-attlist" combine="interleave">
+    <optional>
+        <attribute name="office:conversion-mode" 
+                    a:defaultValue="into-default-style-data-style">
+            <choice>
+                <value>into-default-style-data-style</value>
+                <value>into-english-number</value>
+                <value>keep-text</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="animation-element" combine="choice">
+    <element name="anim:animate">
+        <ref name="common-anim-target-attlist"/>
+        <ref name="common-anim-named-target-attlist"/>
+        <ref name="common-anim-values-attlist"/>
+        <ref name="common-anim-spline-mode-attlist"/>
+        <ref name="common-spline-anim-value-attlist"/>
+        <ref name="common-repeat-timing-attlist"/>
+        <ref name="common-fill-timing-attlist"/>
+        <ref name="common-anim-add-accum-attlist"/>
+    </element>
+</define>
+<define name="animation-element" combine="choice">
+    <element name="anim:set">
+        <ref name="common-anim-target-attlist"/>
+        <ref name="common-anim-named-target-attlist"/>
+        <ref name="common-anim-set-values-attlist"/>
+        <ref name="common-fill-timing-attlist"/>
+        <ref name="common-anim-add-accum-attlist"/>
+    </element>
+</define>
+<define name="animation-element" combine="choice">
+    <element name="anim:animateMotion">
+        <ref name="anim-animate-motion-attlist"/>
+        <ref name="common-anim-target-attlist"/>
+        <ref name="common-anim-named-target-attlist"/>
+        <ref name="common-anim-add-accum-attlist"/>
+        <ref name="common-anim-values-attlist"/>
+        <ref name="common-fill-timing-attlist"/>
+        <ref name="common-spline-anim-value-attlist"/>
+    </element>
+</define>
+<define name="anim-animate-motion-attlist" combine="interleave">
+    <optional>
+        <attribute name="svg:path">
+            <ref name="pathData"/>
+        </attribute>
+    </optional>
+</define>
+<define name="anim-animate-motion-attlist" combine="interleave">
+    <optional>
+        <attribute name="svg:origin">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="anim-animate-motion-attlist" combine="interleave">
+    <optional>
+        <attribute name="smil:calcMode" a:defaultValue="paced">   
+            <choice>
+                <value>discrete</value>
+                <value>linear</value>
+                <value>paced</value>
+                <value>spline</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="animation-element" combine="choice">
+    <element name="anim:animateColor">
+        <ref name="common-anim-target-attlist"/>
+        <ref name="common-anim-named-target-attlist"/>
+        <ref name="common-anim-add-accum-attlist"/>
+        <ref name="common-anim-values-attlist"/>
+        <ref name="common-anim-spline-mode-attlist"/>
+        <ref name="common-spline-anim-value-attlist"/>
+        <ref name="anim-animate-color-attlist"/>
+        <ref name="common-fill-timing-attlist"/>
+    </element>
+</define>
+<define name="anim-animate-color-attlist" combine="interleave">
+    <optional>
+        <attribute name="anim:color-interpolation" a:defaultValue="rgb">
+            <choice>
+                <value>rgb</value>
+                <value>hsl</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="anim-animate-color-attlist" combine="interleave">
+    <optional>
+        <attribute name="anim:color-interpolation-direction"     
+                                   a:defaultValue="clockwise">
+            <choice>
+                <value>clockwise</value>
+                <value>counter-clockwise</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="animation-element" combine="choice">
+    <element name="anim:animateTransform">
+        <ref name="common-anim-target-attlist"/>
+        <ref name="common-anim-named-target-attlist"/>
+        <ref name="common-anim-add-accum-attlist"/>
+        <ref name="common-anim-values-attlist"/>
+        <ref name="anim-animate-transform-attlist"/>
+        <ref name="common-fill-timing-attlist"/>
+    </element>
+</define>
+<define name="anim-animate-transform-attlist" combine="interleave">
+    <attribute name="svg:type">
+        <choice>
+            <value>translate</value>
+            <value>scale</value>
+            <value>rotate</value>
+            <value>skewX</value>
+            <value>skewY</value> 
+        </choice>
+    </attribute>
+</define>
+<define name="animation-element" combine="choice">
+    <element name="anim:transitionFilter">
+        <ref name="common-anim-target-attlist"/>
+        <ref name="common-anim-add-accum-attlist"/>
+        <ref name="common-anim-values-attlist"/>
+        <ref name="common-anim-spline-mode-attlist "/>
+        <ref name="anim-transition-filter-attlist"/>
+        <ref name="common-fill-timing-attlist"/>
+    </element>
+</define>
+<define name="anim-transition-filter-attlist" combine="interleave">
+    <attribute name="smil:type">
+        <ref name="string"/>
+    </attribute>
+</define>
+<define name="anim-transition-filter-attlist" combine="interleave">
+    <optional>
+        <attribute name="smil:subtype">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="anim-transition-filter-attlist" combine="interleave">
+    <optional>
+        <attribute name="smil:direction" a:defaultValue="forward">
+            <choice>
+                <value>forward</value>
+                <value>reverse</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="anim-transition-filter-attlist" combine="interleave">
+    <optional>
+        <attribute name="smil:fadeColor">
+            <choice>
+                <value>forward</value>
+                <value>reverse</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="anim-transition-filter-attlist" combine="interleave">
+    <optional>
+        <attribute name="smil:mode" a:defaultValue="in">
+            <choice>
+                <value>in</value>
+                <value>out</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="common-anim-attlist" combine="interleave">
+    <optional>
+        <attribute name="anim:id">
+            <ref name="ID"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-anim-target-attlist" combine="interleave">
+    <optional>
+        <attribute name="smil:targetElement">
+            <ref name="IDREF"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-anim-named-target-attlist" combine="interleave">
+    <attribute name="smil:attributeName">
+        <ref name="string"/>
+    </attribute>
+</define>
+<define name="common-anim-target-attlist" combine="interleave">
+    <optional>
+        <attribute name="anim:sub-item">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-anim-values-attlist" combine="interleave">
+    <optional>
+        <attribute name="smil:values">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-anim-spline-mode-attlist" combine="interleave">
+    <optional>
+        <attribute name="smil:calcMode" a:defaultValue="discrete">   
+            <choice>
+                <value>discrete</value>
+                <value>linear</value>
+                <value>paced</value>
+                <value>spline</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="common-spline-anim-value-attlist" combine="interleave">
+    <optional>
+        <attribute name="smil:keyTimes">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-spline-anim-value-attlist" combine="interleave">
+    <optional>
+        <attribute name="smil:keySplines">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-anim-add-accum-attlist" combine="interleave">
+    <optional>
+        <attribute name="smil:accumulate">
+            <choice>
+                <value>none</value>
+                <value>sum</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="common-anim-add-accum-attlist" combine="interleave">
+    <optional>
+        <attribute name="smil:additive">
+            <choice>
+                <value>replace</value>
+                <value>sum</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="common-anim-values-attlist" combine="interleave">
+    <optional>
+        <attribute name="anim:formula">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-anim-set-values-attlist" combine="interleave">
+    <optional>
+        <attribute name="smil:to">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+
+<define name="common-anim-values-attlist" combine="interleave">
+    <ref name="common-anim-set-values-attlist"/>
+    <optional>
+        <attribute name="smil:from">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="smil:by">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-begin-end-timing-attlist" combine="interleave">
+    <optional>
+        <attribute name="smil:begin">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-begin-end-timing-attlist" combine="interleave">
+    <optional>
+        <attribute name="smil:end">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-dur-timing-attlist" combine="interleave">
+    <optional>
+        <attribute name="smil:dur">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-endsync-timing-attlist" combine="interleave">
+    <optional>
+        <attribute name="smil:endsync">
+            <choice>
+                <value>first</value>
+                <value>last</value>
+                <value>all</value>
+                <value>media</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="common-repeat-timing-attlist" combine="interleave">
+    <optional>
+        <attribute name="smil:repeatDur">
+            <ref name="string"/>
+        </attribute>
+        <attribute name="smil:repeatCount">
+            <ref name="nonNegativeInteger"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-fill-timing-attlist" combine="interleave">
+    <optional>
+        <attribute name="smil:fill">
+            <choice>
+                <value>remove</value>
+                <value>freeze</value>
+                <value>hold</value>
+                <value>auto</value>
+                <value>default</value>
+                <value>transition</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="common-fill-default-attlist" combine="interleave">
+    <optional>
+        <attribute name="smil:fillDefault">
+            <choice>
+                <value>remove</value>
+                <value>freeze</value>
+                <value>hold</value>
+                <value>transition</value>
+                <value>auto</value>
+                <value>inherit</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="common-restart-timing-attlist" combine="interleave">
+    <optional>
+        <attribute name="smil:restart" a:defaultValue="default">
+            <choice>
+                <value>never</value>
+                <value>always</value>
+                <value>whenNotActive</value>
+                <value>default</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="common-restart-default-attlist" combine="interleave">
+    <optional>
+        <attribute name="smil:restartDefault" a:defaultValue="inherit">
+            <choice>
+                <value>never</value>
+                <value>always</value>
+                <value>whenNotActive</value>
+                <value>inherit</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="common-time-manip-attlist" combine="interleave">
+    <optional>    
+        <attribute name="smil:accelerate" a:defaultValue="0.0">
+            <ref name="double"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-time-manip-attlist" combine="interleave">
+    <optional>
+        <attribute name="smil:decelerate" a:defaultValue="0.0">
+            <ref name="double"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-time-manip-attlist" combine="interleave">
+    <optional>
+        <attribute name="smil:autoReverse" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="animation-element" combine="choice">
+    <element name="anim:par">
+        <ref name="common-anim-attlist"/>
+        <ref name="common-timing-attlist"/>
+        <ref name="common-endsync-timing-attlist"/>
+        <zeroOrMore>
+            <ref name="animation-element"/>
+        </zeroOrMore>
+    </element>
+</define>
+
+<define name="common-basic-timing-attlist" combine="interleave">
+   <ref name="common-begin-end-timing-attlist"/>
+   <ref name="common-dur-timing-attlist"/>
+   <ref name="common-repeat-timing-attlist"/>
+</define>
+
+<define name="common-timing-attlist" combine="interleave">
+   <ref name="common-basic-timing-attlist"/>
+   <ref name="common-restart-timing-attlist"/>
+   <ref name="common-restart-default-attlist"/>
+   <ref name="common-fill-timing-attlist"/>
+   <ref name="common-fill-default-attlist"/>
+   <ref name="common-time-manip-attlist"/>
+</define>
+<define name="animation-element" combine="choice">
+    <element name="anim:seq">
+        <ref name="common-anim-attlist"/>
+        <ref name="common-endsync-timing-attlist"/>
+        <ref name="common-timing-attlist"/>
+    </element>
+</define>
+<define name="animation-element" combine="choice">
+    <element name="anim:iterate">
+        <ref name="common-anim-attlist"/>
+        <ref name="anin-iterate-attlist"/>
+        <ref name="common-timing-attlist"/>
+        <ref name="common-endsync-timing-attlist"/>
+        <zeroOrMore>
+            <ref name="animation-element"/>
+        </zeroOrMore>
+    </element>
+</define>
+<define name="anin-iterate-attlist" combine="interleave">
+    <optional>
+        <attribute name="smil:targetElement">
+            <ref name="IDREF"/>
+        </attribute>
+    </optional>
+</define>
+<define name="anin-iterate-attlist" combine="interleave">
+    <optional>
+        <attribute name="anim:iterate-type">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="anin-iterate-attlist" combine="interleave">
+    <optional>
+        <attribute name="anim:iterate-interval">
+            <ref name="duration"/>
+        </attribute>
+    </optional>
+</define>
+<define name="animation-element" combine="choice">
+    <element name="anim:audio">
+        <ref name="common-anim-attlist"/>
+        <ref name="anim-audio-attlist"/>
+        <ref name="common-basic-timing-attlist"/>
+    </element>
+</define>
+<define name="anim-audio-attlist" combine="interleave">
+    <optional>
+        <attribute name="xlink:href">
+            <ref name="anyURI"/>
+        </attribute>
+    </optional>
+</define>
+<define name="anim-audio-attlist" combine="interleave">
+    <optional>
+        <attribute name="anim:audio-level">
+            <ref name="double"/>
+        </attribute>
+    </optional>
+</define>
+<define name="animation-element" combine="choice">
+    <element name="anim:command">
+        <ref name="common-anim-attlist"/>
+        <ref name="anim-command-attlist"/>
+        <ref name="common-begin-end-timing-attlist"/>
+        <ref name="common-anim-target-attlist"/>
+        <zeroOrMore>
+            <element name="anim:param">
+                <attribute name="anim:name"/>
+                <attribute name="anim:value"/>
+            </element>
+        </zeroOrMore>
+    </element>
+</define>
+<define name="anim-command-attlist" combine="interleave">
+    <attribute name="anim:command">
+        <ref name="string"/>
+    </attribute>
+</define>
+<define name="style-style">
+    <element name="style:style">
+        <ref name="style-style-attlist"/>
+        <ref name="style-style-content"/>
+        <zeroOrMore>
+            <ref name="style-map"/>
+        </zeroOrMore>
+    </element>
+</define>
+<define name="style-style-attlist" combine="interleave">
+    <attribute name="style:name">
+        <ref name="styleName"/>
+    </attribute>
+</define>
+<define name="style-style-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:display-name">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-style-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:parent-style-name">
+            <ref name="styleNameRef"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-style-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:next-style-name">
+            <ref name="styleNameRef"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-style-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:list-style-name">
+            <choice>
+                <ref name="styleName"/>
+                <empty/>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-style-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:master-page-name">
+            <ref name="styleNameRef"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-style-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:auto-update" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-style-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:data-style-name">
+            <ref name="styleNameRef"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-style-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:class">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-style-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:default-outline-level">
+            <ref name="positiveInteger"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-map">
+    <element name="style:map">
+        <ref name="style-map-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="style-map-attlist" combine="interleave">
+    <attribute name="style:condition">
+        <ref name="string"/>
+    </attribute>
+</define>
+<define name="style-map-attlist" combine="interleave">
+    <attribute name="style:apply-style-name">
+        <ref name="styleNameRef"/>
+    </attribute>
+</define>
+<define name="style-map-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:base-cell-address">
+            <ref name="cellAddress"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-default-style">
+    <element name="style:default-style">
+        <ref name="style-style-content"/>
+    </element>
+</define>
+<define name="style-page-layout">
+    <element name="style:page-layout">
+        <ref name="style-page-layout-attlist"/>
+        <optional>
+            <ref name="style-page-layout-properties"/>
+        </optional>
+        <optional>
+            <ref name="style-header-style"/>
+        </optional>
+        <optional>
+            <ref name="style-footer-style"/>
+        </optional>
+    </element>
+</define>
+<define name="style-page-layout-attlist" combine="interleave">
+    <attribute name="style:name">
+        <ref name="styleName"/>
+    </attribute>
+</define>
+<define name="style-page-layout-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:page-usage" a:defaultValue="all">
+            <choice>
+                <value>all</value>
+                <value>left</value>
+                <value>right</value>
+                <value>mirrored</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-header-style">
+    <element name="style:header-style">
+        <optional>
+            <ref name="style-header-footer-properties"/>
+        </optional>
+    </element>
+</define>
+<define name="style-footer-style">
+    <element name="style:footer-style">
+        <optional>
+            <ref name="style-header-footer-properties"/>
+        </optional>
+    </element>
+</define>
+<define name="style-master-page">
+    <element name="style:master-page">
+        <ref name="style-master-page-attlist"/>
+        <optional>
+            <ref name="style-header"/>
+            <optional>
+                <ref name="style-header-left"/>
+            </optional>
+        </optional>
+        <optional>
+            <ref name="style-footer"/>
+            <optional>
+                <ref name="style-footer-left"/>
+            </optional>
+        </optional>
+        <optional>
+            <ref name="office-forms"/>
+        </optional>
+        <zeroOrMore>
+            <ref name="style-style"/>
+        </zeroOrMore>
+        <zeroOrMore>
+            <ref name="shape"/>
+        </zeroOrMore>
+        <optional>
+            <ref name="presentation-notes"/>
+        </optional>
+    </element>
+</define>
+<define name="style-master-page-attlist" combine="interleave">
+    <attribute name="style:name">
+        <ref name="styleName"/>
+    </attribute>
+</define>
+<define name="style-master-page-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:display-name">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-master-page-attlist" combine="interleave">
+    <attribute name="style:page-layout-name">
+        <ref name="styleNameRef"/>
+    </attribute>
+</define>
+<define name="style-master-page-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:style-name">
+            <ref name="styleNameRef"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-master-page-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:next-style-name">
+            <ref name="styleNameRef"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-header">
+    <element name="style:header">
+        <ref name="common-style-header-footer-attlist"/>
+        <ref name="header-footer-content"/>
+    </element>
+</define>
+<define name="style-footer">
+    <element name="style:footer">
+        <ref name="common-style-header-footer-attlist"/>
+        <ref name="header-footer-content"/>
+    </element>
+</define>
+<define name="style-header-left">
+    <element name="style:header-left">
+        <ref name="common-style-header-footer-attlist"/>
+        <ref name="header-footer-content"/>
+    </element>
+</define>
+<define name="style-footer-left">
+    <element name="style:footer-left">
+        <ref name="common-style-header-footer-attlist"/>
+        <ref name="header-footer-content"/>
+    </element>
+</define>
+<define name="header-footer-content">
+    <choice>
+        <group>
+            <ref name="text-decls"/>
+            <zeroOrMore>
+                <choice>
+                    <ref name="text-h"/>
+                    <ref name="text-p"/>
+                    <ref name="text-list"/>
+                    <ref name="table-table"/>
+                    <ref name="text-section"/>
+                    <ref name="text-table-of-content"/>
+                    <ref name="text-illustration-index"/>
+                    <ref name="text-table-index"/>
+                    <ref name="text-object-index"/>
+                    <ref name="text-user-index"/>
+                    <ref name="text-alphabetical-index"/>
+                    <ref name="text-bibliography"/>
+                    <ref name="text-index-title"/>
+                    <ref name="change-marks"/>
+                </choice>
+            </zeroOrMore>
+        </group>
+        <group>
+            <optional>
+                <ref name="style-region-left"/>
+            </optional>
+            <optional>
+                <ref name="style-region-center"/>
+            </optional>
+            <optional>
+                <ref name="style-region-right"/>
+            </optional>
+        </group>
+    </choice>
+</define>
+<define name="common-style-header-footer-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:display" a:defaultValue="true">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-region-left">
+    <element name="style:region-left">
+        <ref name="region-content"/>
+    </element>
+</define>
+<define name="style-region-center">
+    <element name="style:region-center">
+        <ref name="region-content"/>
+    </element>
+</define>
+<define name="style-region-right">
+    <element name="style:region-right">
+        <ref name="region-content"/>
+    </element>
+</define>
+
+<define name="region-content">
+    <zeroOrMore>
+        <ref name="text-p"/>
+    </zeroOrMore>
+</define>
+<define name="presentation-notes">
+    <element name="presentation:notes">
+        <ref name="common-presentation-header-footer-attlist"/>
+        <ref name="presentation-notes-attlist"/>
+        <zeroOrMore>
+            <ref name="shape"/>
+        </zeroOrMore>
+    </element>
+</define>
+<define name="presentation-notes-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:page-layout-name">
+            <ref name="styleNameRef"/>
+        </attribute>
+    </optional>
+</define>
+<define name="presentation-notes-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:style-name">
+            <ref name="styleNameRef"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-table-template">
+    <element name="table:table-template">
+        <ref name="table-table-template-attlist"/>
+        <optional>
+            <ref name="table-first-row"/>
+        </optional>
+        <optional>
+            <ref name="table-last-row"/>
+        </optional>
+        <optional>
+            <ref name="table-first-column"/>
+        </optional>
+        <optional>
+            <ref name="table-last-column"/>
+        </optional>
+        <choice>
+            <ref name="table-body"/>
+            <group>
+                <ref name="table-even-rows"/>
+                <ref name="table-odd-rows"/>
+            </group>
+            <group>
+                <ref name="table-even-columns"/>
+                <ref name="table-odd-columns"/>
+            </group>
+        </choice>
+    </element>
+</define>
+<define name="table-table-template-attlist" combine="interleave">
+    <attribute name="text:name">
+        <ref name="string"/>
+    </attribute>
+</define>
+<define name="table-table-template-attlist" combine="interleave">
+    <attribute name="text:first-row-start-column">
+        <ref name="rowOrCol"/>
+    </attribute>
+</define>
+
+<define name="table-table-template-attlist" combine="interleave">
+    <attribute name="text:first-row-end-column">
+        <ref name="rowOrCol"/>
+    </attribute>
+</define>
+
+<define name="table-table-template-attlist" combine="interleave">
+    <attribute name="text:last-row-start-column">
+        <ref name="rowOrCol"/>
+    </attribute>
+</define>
+
+<define name="table-table-template-attlist" combine="interleave">
+    <attribute name="text:last-row-end-column">
+        <ref name="rowOrCol"/>
+    </attribute>
+</define>
+
+<define name="rowOrCol">
+    <choice>
+        <value>row</value>
+        <value>column</value>
+    </choice>
+</define>
+<define name="table-first-row">
+    <element name="table:first-row">
+        <ref name="common-table-template-attlist"/>
+        <empty/>
+    </element>
+</define>
+
+<define name="table-last-row">
+    <element name="table:last-row">
+        <ref name="common-table-template-attlist"/>
+        <empty/>
+    </element>
+</define>
+
+<define name="table-first-column">
+    <element name="table:first-column">
+        <ref name="common-table-template-attlist"/>
+        <empty/>
+    </element>
+</define>
+
+<define name="table-last-column">
+    <element name="table:last-column">
+        <ref name="common-table-template-attlist"/>
+        <empty/>
+    </element>
+</define>
+
+<define name="table-body">
+    <element name="table:body">
+        <ref name="common-table-template-attlist"/>
+        <empty/>
+    </element>
+</define>
+
+<define name="table-even-rows">
+    <element name="table:even-rows">
+        <ref name="common-table-template-attlist"/>
+        <empty/>
+    </element>
+</define>
+
+<define name="table-odd-rows">
+    <element name="table:odd-rows">
+        <ref name="common-table-template-attlist"/>
+        <empty/>
+    </element>
+</define>
+
+<define name="table-even-columns">
+    <element name="table:even-columns">
+        <ref name="common-table-template-attlist"/>
+        <empty/>
+    </element>
+</define>
+
+<define name="table-odd-columns">
+    <element name="table:odd-columns">
+        <ref name="common-table-template-attlist"/>
+        <empty/>
+    </element>
+</define>
+
+<define name="common-table-template-attlist" combine="interleave">
+    <attribute name="text:style-name">
+        <ref name="styleNameRef"/>
+    </attribute>
+</define>
+<define name="style-font-face">
+    <element name="style:font-face">
+        <ref name="style-font-face-attlist"/>
+        <optional>
+            <ref name="svg-font-face-src"/>
+        </optional>
+        <optional>
+            <ref name="svg-definition-src"/>
+        </optional>
+    </element>
+</define>
+<define name="style-font-face-attlist" combine="interleave">
+    <optional>
+        <attribute name="svg:font-family">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="svg:font-style">
+            <ref name="fontStyle"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="svg:font-variant">
+            <ref name="fontVariant"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="svg:font-weight">
+            <ref name="fontWeight"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="svg:font-stretch">
+            <choice>
+                <value>normal</value>
+                <value>ultra-condensed</value>
+                <value>extra-condensed</value>
+                <value>condensed</value>
+                <value>semi-condensed</value>
+                <value>semi-expanded</value>
+                <value>expanded</value>
+                <value>extra-expanded</value>
+                <value>ultra-expanded</value>
+            </choice>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="svg:font-size">
+            <ref name="positiveLength"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="svg:unicode-range"/>
+    </optional>
+    <optional>
+        <attribute name="svg:units-per-em">
+            <ref name="integer"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="svg:panose-1"/>
+    </optional>
+    <optional>
+        <attribute name="svg:stemv">
+            <ref name="integer"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="svg:stemh">
+            <ref name="integer"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="svg:slope">
+            <ref name="integer"/>
+        </attribute>
+        </optional>
+    <optional>
+        <attribute name="svg:cap-height">
+            <ref name="integer"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="svg:x-height">
+            <ref name="integer"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="svg:accent-height">
+            <ref name="integer"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="svg:ascent">
+            <ref name="integer"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="svg:descent">
+            <ref name="integer"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="svg:widths"/>
+    </optional>
+    <optional>
+        <attribute name="svg:bbox"/>
+    </optional>
+    <optional>
+        <attribute name="svg:ideographic">
+            <ref name="integer"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="svg:alphabetic">
+            <ref name="integer"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="svg:mathematical">
+            <ref name="integer"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="svg:hanging">
+            <ref name="integer"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="svg:v-ideographic">
+            <ref name="integer"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="svg:v-alphabetic">
+            <ref name="integer"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="svg:v-mathematical">
+            <ref name="integer"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="svg:v-hanging">
+            <ref name="integer"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="svg:underline-position">
+            <ref name="integer"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="svg:underline-thickness">
+            <ref name="integer"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="svg:strikethrough-position">
+            <ref name="integer"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="svg:strikethrough-thickness">
+            <ref name="integer"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="svg:overline-position">
+            <ref name="integer"/>
+        </attribute>
+        </optional>
+    <optional>
+        <attribute name="svg:overline-thickness">
+            <ref name="integer"/>
+        </attribute>
+    </optional>
+</define>
+
+<define name="svg-font-face-src">
+    <element name="svg:font-face-src">
+        <oneOrMore>
+            <choice>
+                <ref name="svg-font-face-uri"/>
+                <ref name="svg-font-face-name"/>
+            </choice>
+        </oneOrMore>
+    </element>
+</define>
+
+<define name="svg-font-face-uri">
+    <element name="svg:font-face-uri">
+        <ref name="common-svg-font-face-xlink-attlist"/>
+        <zeroOrMore>
+            <ref name="svg-font-face-format"/>
+        </zeroOrMore>
+    </element>
+</define>
+
+<define name="svg-font-face-format">
+    <element name="svg:font-face-format">
+        <optional>
+            <attribute name="svg:string"/>
+        </optional>
+        <empty/>
+    </element>
+</define>
+<define name="svg-font-face-name">
+    <element name="svg:font-face-name">
+        <optional>
+            <attribute name="name"/>
+        </optional>
+        <empty/>
+    </element>
+</define>
+
+<define name="svg-definition-src">
+    <element name="svg:definition-src">
+        <ref name="common-svg-font-face-xlink-attlist"/>
+    <empty/>
+    </element>
+</define>
+
+<define name="common-svg-font-face-xlink-attlist" combine="interleave">
+    <attribute name="xlink:href">
+        <ref name="anyURI"/>
+    </attribute>
+    <optional>
+        <attribute name="xlink:type" a:defaultValue="simple">
+            <value>simple</value>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="xlink:actuate" a:defaultValue="onRequest">
+            <value>onRequest</value>
+        </attribute>
+    </optional>
+</define>
+<define name="style-font-face-attlist" combine="interleave">
+    <attribute name="style:name">
+        <ref name="string"/>
+    </attribute>
+</define>
+<define name="style-font-face-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:font-adornments">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-font-face-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:font-family-generic">
+            <ref name="fontFamilyGeneric"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-font-face-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:font-pitch">
+            <ref name="fontPitch"/>
+        </attribute>
+    </optional>
+</define>
+
+<define name="style-font-face-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:font-charset">
+            <ref name="textEncoding"/>
+        </attribute>
+    </optional>
+</define>
+<define name="number-number-style">
+    <element name="number:number-style">
+        <ref name="common-data-style-attlist"/>
+        <optional>
+            <ref name="style-text-properties"/>
+        </optional>
+        <optional>
+            <ref name="number-text"/>
+        </optional>
+        <optional>
+            <ref name="any-number"/>
+            <optional>
+                <ref name="number-text"/>
+            </optional>
+        </optional>
+        <zeroOrMore>
+            <ref name="style-map"/>
+        </zeroOrMore>
+    </element>
+</define>
+
+<define name="any-number">
+    <choice>
+        <ref name="number-number"/>
+        <ref name="number-scientific-number"/>
+        <ref name="number-fraction"/>
+    </choice>
+</define>
+<define name="number-number">
+    <element name="number:number">
+        <ref name="number-number-attlist"/>
+        <ref name="common-decimal-places-attlist"/>
+        <ref name="common-number-attlist"/>
+        <zeroOrMore>
+            <ref name="number-embedded-text"/>
+        </zeroOrMore>
+    </element>
+</define>
+<define name="number-number-attlist" combine="interleave">
+    <optional>
+        <attribute name="number:decimal-replacement"/>
+    </optional>
+</define>
+<define name="number-number-attlist" combine="interleave">
+    <optional>
+        <attribute name="number:display-factor" a:defaultValue="1">
+            <ref name="double"/>
+        </attribute>
+    </optional>
+</define>
+<define name="number-embedded-text">
+    <element name="number:embedded-text">
+        <ref name="number-embedded-text-attlist"/>
+        <text/>
+    </element>
+</define>
+<define name="number-embedded-text-attlist" combine="interleave">
+    <attribute name="number:position">
+        <ref name="integer"/>
+    </attribute>
+</define>
+<define name="number-scientific-number">
+    <element name="number:scientific-number">
+        <ref name="number-scientific-number-attlist"/>
+        <ref name="common-decimal-places-attlist"/>
+        <ref name="common-number-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="number-scientific-number-attlist" combine="interleave">
+    <optional>
+        <attribute name="number:min-exponent-digits">
+            <ref name="integer"/>
+        </attribute>
+    </optional>
+</define>
+<define name="number-fraction">
+    <element name="number:fraction">
+        <ref name="number-fraction-attlist"/>
+        <ref name="common-number-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="number-fraction-attlist" combine="interleave">
+    <optional>
+        <attribute name="number:min-numerator-digits">
+            <ref name="integer"/>
+        </attribute>
+    </optional>
+</define>
+<define name="number-fraction-attlist" combine="interleave">
+    <optional>
+        <attribute name="number:min-denominator-digits">
+            <ref name="integer"/>
+        </attribute>
+    </optional>
+</define>
+<define name="number-fraction-attlist" combine="interleave">
+    <optional>
+        <attribute name="number:denominator-value">
+            <ref name="integer"/>
+        </attribute>
+    </optional>
+</define>
+<define name="number-currency-style">
+    <element name="number:currency-style">
+        <ref name="common-data-style-attlist"/>
+        <ref name="common-auto-reorder-attlist"/>
+        <optional>
+            <ref name="style-text-properties"/>
+        </optional>
+        <optional>
+            <ref name="number-text"/>
+        </optional>
+        <optional>
+            <choice>
+                <group>
+                    <ref name="number-and-text"/>
+                    <optional>
+                        <ref name="currency-symbol-and-text"/>
+                    </optional>
+                </group>
+                <group>
+                    <ref name="currency-symbol-and-text"/>
+                    <optional>
+                        <ref name="number-and-text"/>
+                    </optional>
+                </group>
+            </choice>
+        </optional>
+        <zeroOrMore>
+            <ref name="style-map"/>
+        </zeroOrMore>
+    </element>
+</define>
+
+<define name="currency-symbol-and-text">
+    <ref name="number-currency-symbol"/>
+    <optional>
+        <ref name="number-text"/>
+    </optional>
+</define>
+<define name="number-and-text">
+    <ref name="number-number"/>
+    <optional>
+        <ref name="number-text"/>
+    </optional>
+</define>
+<define name="number-currency-symbol">
+    <element name="number:currency-symbol">
+        <ref name="number-currency-symbol-attlist"/>
+        <text/>
+    </element>
+</define>
+<define name="number-currency-symbol-attlist" combine="interleave">
+    <optional>
+        <attribute name="number:language">
+            <ref name="languageCode"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="number:country">
+            <ref name="countryCode"/>
+        </attribute>
+    </optional>
+</define>
+<define name="number-percentage-style">
+    <element name="number:percentage-style">
+        <ref name="common-data-style-attlist"/>
+        <optional>
+            <ref name="style-text-properties"/>
+        </optional>
+        <optional>
+            <ref name="number-text"/>
+        </optional>
+        <optional>
+            <ref name="number-and-text"/>
+        </optional>
+        <zeroOrMore>
+            <ref name="style-map"/>
+        </zeroOrMore>
+    </element>
+</define>
+<define name="number-date-style">
+    <element name="number:date-style">
+        <ref name="common-data-style-attlist"/>
+        <ref name="common-auto-reorder-attlist"/>
+        <ref name="common-format-source-attlist"/>
+        <optional>
+            <ref name="style-text-properties"/>
+        </optional>
+        <!-- This DTD does not reflect the fact that some elements must not -->
+        <!-- occur more than once. -->
+        <optional>
+            <ref name="number-text"/>
+        </optional>
+        <oneOrMore>
+            <ref name="any-date"/>
+            <optional>
+                <ref name="number-text"/>
+            </optional>
+        </oneOrMore>
+        <zeroOrMore>
+            <ref name="style-map"/>
+        </zeroOrMore>
+    </element>
+</define>
+
+<define name="any-date">
+    <choice>
+        <ref name="number-day"/>
+        <ref name="number-month"/>
+        <ref name="number-year"/>
+        <ref name="number-era"/>
+        <ref name="number-day-of-week"/>
+        <ref name="number-week-of-year"/>
+        <ref name="number-quarter"/>
+        <ref name="number-hours"/>
+        <ref name="number-am-pm"/>
+        <ref name="number-minutes"/>
+        <ref name="number-seconds"/>
+    </choice>
+</define>
+<define name="number-day">
+    <element name="number:day">
+        <ref name="number-day-attlist"/>
+        <ref name="common-calendar-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="number-day-attlist" combine="interleave">
+    <optional>
+        <attribute name="number:style" a:defaultValue="short">
+            <choice>
+                <value>short</value>
+                <value>long</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="number-month">
+    <element name="number:month">
+        <ref name="number-month-attlist"/>
+        <ref name="common-calendar-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="number-month-attlist" combine="interleave">
+    <optional>
+        <attribute name="number:textual" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="number-month-attlist" combine="interleave">
+    <optional>
+        <attribute name="number:possessive-form" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="number-month-attlist" combine="interleave">
+    <optional>
+        <attribute name="number:style" a:defaultValue="short">
+            <choice>
+                <value>short</value>
+                <value>long</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="number-year">
+    <element name="number:year">
+        <ref name="number-year-attlist"/>
+        <ref name="common-calendar-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="number-year-attlist" combine="interleave">
+    <optional>
+        <attribute name="number:style" a:defaultValue="short">
+            <choice>
+                <value>short</value>
+                <value>long</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="number-era">
+    <element name="number:era">
+        <ref name="number-era-attlist"/>
+        <ref name="common-calendar-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="number-era-attlist" combine="interleave">
+    <optional>
+        <attribute name="number:style" a:defaultValue="short">
+            <choice>
+                <value>short</value>
+                <value>long</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="number-day-of-week">
+    <element name="number:day-of-week">
+        <ref name="number-day-of-week-attlist"/>
+        <ref name="common-calendar-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="number-day-of-week-attlist" combine="interleave">
+    <optional>
+        <attribute name="number:style" a:defaultValue="short">
+            <choice>
+                <value>short</value>
+                <value>long</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="number-week-of-year">
+    <element name="number:week-of-year">
+        <ref name="common-calendar-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="number-quarter">
+    <element name="number:quarter">
+        <ref name="number-quarter-attlist"/>
+        <ref name="common-calendar-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="number-quarter-attlist" combine="interleave">
+    <optional>
+        <attribute name="number:style" a:defaultValue="short">
+            <choice>
+                <value>short</value>
+                <value>long</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="number-time-style">
+    <element name="number:time-style">
+        <ref name="number-time-style-attlist"/>
+        <ref name="common-data-style-attlist"/>
+        <ref name="common-format-source-attlist"/>
+        <optional>
+            <ref name="style-text-properties"/>
+        </optional>
+        <!-- This DTD does not reflect the fact that some elements must not -->
+        <!-- occur more than once. -->
+        <optional>
+            <ref name="number-text"/>
+        </optional>
+        <oneOrMore>
+            <ref name="any-time"/>
+            <optional>
+                <ref name="number-text"/>
+            </optional>
+        </oneOrMore>
+        <zeroOrMore>
+            <ref name="style-map"/>
+        </zeroOrMore>
+    </element>
+</define>
+
+<define name="any-time">
+    <choice>
+        <ref name="number-hours"/>
+        <ref name="number-am-pm"/>
+        <ref name="number-minutes"/>
+        <ref name="number-seconds"/>
+    </choice>
+</define>
+<define name="number-time-style-attlist" combine="interleave">
+    <optional>
+        <attribute name="number:truncate-on-overflow" a:defaultValue="true">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="number-hours">
+    <element name="number:hours">
+        <ref name="number-hours-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="number-hours-attlist" combine="interleave">
+    <optional>
+        <attribute name="number:style" a:defaultValue="short">
+            <choice>
+                <value>short</value>
+                <value>long</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="number-minutes">
+    <element name="number:minutes">
+        <ref name="number-minutes-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="number-minutes-attlist" combine="interleave">
+    <optional>
+        <attribute name="number:style" a:defaultValue="short">
+            <choice>
+                <value>short</value>
+                <value>long</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="number-seconds">
+    <element name="number:seconds">
+        <ref name="number-seconds-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="number-seconds-attlist" combine="interleave">
+    <optional>
+        <attribute name="number:style" a:defaultValue="short">
+            <choice>
+                <value>short</value>
+                <value>long</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="number-seconds-attlist" combine="interleave">
+    <optional>
+        <attribute name="number:decimal-places" a:defaultValue="0">
+            <ref name="integer"/>
+        </attribute>
+    </optional>
+</define>
+<define name="number-am-pm">
+    <element name="number:am-pm">
+        <empty/>
+    </element>
+</define>
+<define name="number-boolean-style">
+    <element name="number:boolean-style">
+        <ref name="common-data-style-attlist"/>
+        <optional>
+            <ref name="style-text-properties"/>
+        </optional>
+        <optional>
+            <ref name="number-text"/>
+        </optional>
+        <optional>
+            <ref name="number-boolean"/>
+            <optional>
+                <ref name="number-text"/>
+            </optional>
+        </optional>
+        <zeroOrMore>
+            <ref name="style-map"/>
+        </zeroOrMore>
+    </element>
+</define>
+<define name="number-boolean">
+    <element name="number:boolean">
+        <empty/>
+    </element>
+</define>
+<define name="number-text-style">
+    <element name="number:text-style">
+        <ref name="common-data-style-attlist"/>
+        <optional>
+            <ref name="style-text-properties"/>
+        </optional>
+        <optional>
+            <ref name="number-text"/>
+        </optional>
+        <zeroOrMore>
+            <ref name="number-text-content"/>
+            <optional>
+                <ref name="number-text"/>
+            </optional>
+        </zeroOrMore>
+        <zeroOrMore>
+            <ref name="style-map"/>
+        </zeroOrMore>
+    </element>
+</define>
+<define name="number-text">
+    <element name="number:text">
+        <text/>
+    </element>
+</define>
+<define name="number-text-content">
+    <element name="number:text-content">
+        <empty/>
+    </element>
+</define>
+<define name="common-data-style-attlist" combine="interleave">
+    <attribute name="style:name">
+        <ref name="styleName"/>
+    </attribute>
+</define>
+<define name="style-data-style-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:display-name">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-data-style-attlist" combine="interleave">
+    <optional>
+        <attribute name="number:language">
+            <ref name="languageCode"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-data-style-attlist" combine="interleave">
+    <optional>
+        <attribute name="number:country">
+            <ref name="countryCode"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-data-style-attlist" combine="interleave">
+    <optional>
+        <attribute name="number:title"/>
+    </optional>
+</define>
+<define name="common-data-style-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:volatile">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-auto-reorder-attlist" combine="interleave">
+    <optional>
+        <attribute name="number:automatic-order" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-format-source-attlist">
+    <optional>
+        <attribute name="number:format-source" a:defaultValue="fixed">
+            <choice>
+                <value>fixed</value>
+                <value>language</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="common-data-style-attlist" combine="interleave">
+    <optional>
+        <attribute name="number:transliteration-format" a:defaultValue="1">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-data-style-attlist" combine="interleave">
+    <optional>
+        <attribute name="number:transliteration-language">
+            <ref name="countryCode"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-data-style-attlist" combine="interleave">
+    <optional>
+        <attribute name="number:transliteration-country">
+            <ref name="countryCode"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-data-style-attlist" combine="interleave">
+    <optional>
+        <attribute name="number:transliteration-style" a:defaultValue="short">
+            <choice>
+                <value>short</value>
+                <value>medium</value>
+                <value>long</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="common-decimal-places-attlist">
+    <optional>
+        <attribute name="number:decimal-places">
+            <ref name="integer"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-number-attlist" combine="interleave">
+    <optional>
+        <attribute name="number:min-integer-digits">
+            <ref name="integer"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-number-attlist" combine="interleave">
+    <optional>
+        <attribute name="number:grouping" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-calendar-attlist" combine="interleave">
+    <optional>
+        <attribute name="number:calendar">
+            <choice>
+                <value>gregorian</value>
+                <value>gengou</value>
+                <value>ROC</value>
+                <value>hanja_yoil</value>
+                <value>hanja</value>
+                <value>hijri</value>
+                <value>jewish</value>
+                <value>buddhist</value>
+                <ref name="string"/>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-style-content" combine="choice">
+    <group>
+        <attribute name="style:family">
+            <value>text</value>
+        </attribute>
+        <optional>
+            <ref name="style-text-properties"/>
+        </optional>
+    </group>
+</define>
+<define name="style-style-content" combine="choice">
+    <group>
+        <attribute name="style:family">
+            <value>paragraph</value>
+        </attribute>
+        <optional>
+            <ref name="style-paragraph-properties"/>
+        </optional>
+        <optional>
+            <ref name="style-text-properties"/>
+        </optional>
+    </group>
+</define>
+<define name="style-style-content" combine="choice">
+    <group>
+        <attribute name="style:family">
+            <value>section</value>
+        </attribute>
+        <optional>
+            <ref name="style-section-properties"/>
+        </optional>
+    </group>
+</define>
+<define name="style-style-content" combine="choice">
+    <group>
+        <attribute name="style:family">
+            <value>ruby</value>
+        </attribute>
+        <optional>
+            <ref name="style-ruby-properties"/>
+        </optional>
+    </group>
+</define>
+<define name="text-linenumbering-configuration">
+    <element name="text:linenumbering-configuration">
+        <ref name="text-linenumbering-configuration-attlist"/>
+        <optional>
+            <ref name="text-linenumbering-separator"/>
+        </optional>
+    </element>
+</define>
+<define name="text-linenumbering-configuration-attlist" combine="interleave">
+    <optional>
+        <attribute name="text:number-lines" a:defaultValue="true">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-linenumbering-configuration-attlist" combine="interleave">
+    <optional>
+        <ref name="common-num-format-attlist"/>
+    </optional>
+</define>
+<define name="text-linenumbering-configuration-attlist" combine="interleave">
+    <optional>
+        <attribute name="text:style-name">
+            <ref name="styleNameRef"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-linenumbering-configuration-attlist" combine="interleave">
+    <optional>
+        <attribute name="text:increment">
+            <ref name="nonNegativeInteger"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-linenumbering-configuration-attlist" combine="interleave">
+    <optional>
+        <attribute name="text:number-position" a:defaultValue="left">
+            <choice>
+                <value>left</value>
+                <value>rigth</value>
+                <value>inner</value>
+                <value>outer</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="text-linenumbering-configuration-attlist" combine="interleave">
+    <optional>
+        <attribute name="text:offset">
+            <ref name="nonNegativeLength"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-linenumbering-configuration-attlist" combine="interleave">
+    <optional>
+        <attribute name="text:count-empty-lines" a:defaultValue="true">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-linenumbering-configuration-attlist" combine="interleave">
+    <optional>
+        <attribute name="text:count-in-text-boxes" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-linenumbering-configuration-attlist" combine="interleave">
+    <optional>
+        <attribute name="text:restart-on-page" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-linenumbering-separator">
+    <element name="text:linenumbering-separator">
+        <optional>
+            <attribute name="text:increment">
+                <ref name="nonNegativeInteger"/>
+            </attribute>
+        </optional>
+        <text/>
+    </element>
+</define>
+<define name="text-notes-configuration">
+    <element name="text:notes-configuration">
+        <ref name="text-notes-configuration-content"/>
+    </element>
+</define>
+<define name="text-notes-configuration-content" combine="interleave">
+    <ref name="text-note-class"/>
+</define>
+<define name="text-notes-configuration-content" combine="interleave">
+    <optional>
+        <attribute name="text:citation-style-name">
+            <ref name="styleNameRef"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-notes-configuration-content" combine="interleave">
+    <optional>
+        <attribute name="text:citation-body-style-name">
+            <ref name="styleNameRef"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-notes-configuration-content" combine="interleave">
+    <optional>
+        <attribute name="text:default-style-name">
+            <ref name="styleNameRef"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-notes-configuration-content" combine="interleave">
+    <optional>
+        <attribute name="text:master-page-name">
+            <ref name="styleNameRef"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-notes-configuration-content" combine="interleave">
+    <optional>
+        <attribute name="text:start-value">
+            <ref name="nonNegativeInteger"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-notes-configuration-content" combine="interleave">
+    <ref name="common-num-format-prefix-suffix-attlist"/>
+    <optional>
+        <ref name="common-num-format-attlist"/>
+    </optional>
+</define>
+<define name="text-notes-configuration-content" combine="interleave">
+    <optional>
+        <attribute name="text:start-numbering-at">
+            <choice>
+                <value>document</value>
+                <value>chapter</value>
+                <value>page</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="text-notes-configuration-content" combine="interleave">
+    <optional>
+        <attribute name="text:footnotes-position">
+            <choice>
+                <value>text</value>
+                <value>page</value>
+                <value>section</value>
+                <value>document</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="text-notes-configuration-content" combine="interleave">
+    <optional>
+        <element name="text:note-continuation-notice-forward">
+            <text/>
+        </element>
+    </optional>
+</define>
+<define name="text-notes-configuration-content" combine="interleave">
+    <optional>
+        <element name="text:note-continuation-notice-backward">
+            <text/>
+        </element>
+    </optional>
+</define>
+<define name="text-bibliography-configuration">
+    <element name="text:bibliography-configuration">
+        <ref name="text-bibliography-configuration-attlist"/>
+        <zeroOrMore>
+            <ref name="text-sort-key"/>
+        </zeroOrMore>
+    </element>
+</define>
+<define name="text-bibliography-configuration-attlist" combine="interleave">
+    <optional>
+        <attribute name="text:prefix">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="text:suffix">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-bibliography-configuration-attlist" combine="interleave">
+    <optional>
+        <attribute name="text:numbered-entries" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-bibliography-configuration-attlist" combine="interleave">
+    <optional>
+        <attribute name="text:sort-by-position" a:defaultValue="true">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="fo:language">
+            <ref name="languageCode"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="fo:country">
+            <ref name="countryCode"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="text:sort-algorithm">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-sort-key">
+    <element name="text:sort-key">
+        <ref name="text-sort-key-attlist"/>
+        <empty/>
+    </element>
+</define>
+
+<define name="text-sort-key-attlist" combine="interleave">
+    <attribute name="text:key">
+        <choice>
+            <value>address</value>
+            <value>annote</value>
+            <value>author</value>
+            <value>bibliography-type</value>
+            <value>booktitle</value>
+            <value>chapter</value>
+            <value>custom1</value>
+            <value>custom2</value>
+            <value>custom3</value>
+            <value>custom4</value>
+            <value>custom5</value>
+            <value>edition</value>
+            <value>editor</value>
+            <value>howpublished</value>
+            <value>identifier</value>
+            <value>institution</value>
+            <value>isbn</value>
+            <value>issn</value>
+            <value>journal</value>
+            <value>month</value>
+            <value>note</value>
+            <value>number</value>
+            <value>organizations</value>
+            <value>pages</value>
+            <value>publisher</value>
+            <value>report-type</value>
+            <value>school</value>
+            <value>series</value>
+            <value>title</value>
+            <value>url</value>
+            <value>volume</value>
+            <value>year</value>
+        </choice>
+    </attribute>
+    <optional>
+        <attribute name="text:sort-ascending" a:defaultValue="true">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-list-style">
+    <element name="text:list-style">
+        <ref name="text-list-style-attr"/>
+        <zeroOrMore>
+            <ref name="text-list-style-content"/>
+        </zeroOrMore>
+    </element>
+</define>
+<define name="text-list-style-attr" combine="interleave">
+    <attribute name="style:name">
+        <ref name="styleName"/>
+    </attribute>
+</define>
+<define name="text-list-style-attr" combine="interleave">
+    <optional>
+        <attribute name="style:display-name">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-list-style-attr" combine="interleave">
+    <optional>
+        <attribute name="text:consecutive-numbering" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-list-level-style-attr">
+    <attribute name="text:level">
+        <ref name="positiveInteger"/>
+    </attribute>
+</define>
+<define name="text-list-style-content" combine="choice">
+    <element name="text:list-level-style-number">
+        <ref name="text-list-level-style-attr"/>
+        <ref name="text-list-level-style-number-attr"/>
+        <optional>
+            <ref name="style-list-level-properties"/>
+        </optional>
+        <optional>
+            <ref name="style-text-properties"/>
+        </optional>
+    </element>
+</define>
+<define name="text-list-level-style-number-attr" combine="interleave">
+    <optional>
+        <attribute name="text:style-name">
+            <ref name="styleNameRef"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-list-level-style-number-attr" combine="interleave">
+    <ref name="common-num-format-attlist"/>
+    <ref name="common-num-format-prefix-suffix-attlist"/>
+</define>
+<define name="text-list-level-style-number-attr" combine="interleave">
+    <optional>
+        <attribute name="text:display-levels" a:defaultValue="1">
+            <ref name="positiveInteger"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-list-level-style-number-attr" combine="interleave">
+    <optional>
+        <attribute name="text:start-value" a:defaultValue="1">
+            <ref name="positiveInteger"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-list-style-content" combine="choice">
+    <element name="text:list-level-style-bullet">
+        <ref name="text-list-level-style-attr"/>
+        <ref name="text-list-level-style-bullet-attr"/>
+        <optional>
+            <ref name="style-list-level-properties"/>
+        </optional>
+        <optional>
+            <ref name="style-text-properties"/>
+        </optional>
+    </element>
+</define>
+<define name="text-list-level-style-bullet-attr" combine="interleave">
+    <optional>
+        <attribute name="text:style-name">
+            <ref name="styleNameRef"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-list-level-style-bullet-attr" combine="interleave">
+    <attribute name="text:bullet-char">
+        <ref name="character"/>
+    </attribute>
+</define>
+<define name="text-list-level-style-bullet-attr" combine="interleave">
+    <ref name="common-num-format-prefix-suffix-attlist"/>
+</define>
+<define name="text-list-level-style-bullet-attr" combine="interleave">
+    <optional>
+        <attribute name="text:bullet-relative-size">
+            <ref name="percent"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-list-style-content" combine="choice">
+    <element name="text:list-level-style-image">
+        <ref name="text-list-level-style-attr"/>
+        <ref name="text-list-level-style-image-attr"/>
+        <optional>
+            <ref name="style-list-level-properties"/>
+        </optional>
+    </element>
+</define>
+<define name="text-list-level-style-image-attr" combine="interleave">
+    <choice>
+        <ref name="common-draw-data-attlist"/>
+        <ref name="office-binary-data"/>
+    </choice>
+</define>
+<define name="text-outline-style">
+    <element name="text:outline-style">
+        <oneOrMore>
+            <ref name="text-outline-level-style"/>
+        </oneOrMore>
+    </element>
+</define>
+<define name="text-outline-level-style">
+    <element name="text:outline-level-style">
+        <ref name="text-outline-level-style-attlist"/>
+        <optional>
+            <ref name="style-list-level-properties"/>
+        </optional>
+        <optional>
+            <ref name="style-text-properties"/>
+        </optional>
+    </element>
+</define>
+<define name="text-outline-level-style-attlist" combine="interleave">
+    <attribute name="text:level">
+        <ref name="positiveInteger"/>
+    </attribute>
+</define>
+<define name="text-outline-level-style-attlist" combine="interleave">
+    <optional>
+        <attribute name="text:style-name">
+            <ref name="styleNameRef"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-outline-level-style-attlist" combine="interleave">
+    <ref name="common-num-format-attlist"/>
+    <ref name="common-num-format-prefix-suffix-attlist"/>
+</define>
+<define name="text-outline-level-style-attlist" combine="interleave">
+    <optional>
+        <attribute name="text:display-levels" a:defaultValue="1">
+            <ref name="positiveInteger"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-outline-level-style-attlist" combine="interleave">
+    <optional>
+        <attribute name="text:start-value" a:defaultValue="1">
+            <ref name="positiveInteger"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-style-content" combine="choice">
+    <group>
+        <attribute name="style:family">
+            <value>table</value>
+        </attribute>
+        <optional>
+            <ref name="style-table-properties"/>
+        </optional>
+    </group>
+</define>
+<define name="style-style-content" combine="choice">
+    <group>
+        <attribute name="style:family">
+            <value>table-column</value>
+        </attribute>
+        <optional>
+            <ref name="style-table-column-properties"/>
+        </optional>
+    </group>
+</define>
+<define name="style-style-content" combine="choice">
+    <group>
+        <attribute name="style:family">
+            <value>table-row</value>
+        </attribute>
+        <optional>
+            <ref name="style-table-row-properties"/>
+        </optional>
+    </group>
+</define>
+<define name="style-style-content" combine="choice">
+    <group>
+        <attribute name="style:family">
+            <value>table-cell</value>
+        </attribute>
+        <optional>
+            <ref name="style-table-cell-properties"/>
+        </optional>
+        <optional>
+            <ref name="style-paragraph-properties"/>
+        </optional>
+        <optional>
+            <ref name="style-text-properties"/>
+        </optional>
+    </group>
+</define>
+<define name="style-style-content" combine="choice">
+    <group>
+        <attribute name="style:family">
+            <choice>
+                <value>graphic</value>
+                <value>presentation</value>
+            </choice>
+        </attribute>
+        <optional>
+            <ref name="style-graphic-properties"/>
+        </optional>
+        <optional>
+            <ref name="style-paragraph-properties"/>
+        </optional>
+        <optional>
+            <ref name="style-text-properties"/>
+        </optional>
+    </group>
+</define>
+
+<define name="style-graphic-properties">
+    <element name="style:graphic-properties">
+        <ref name="style-graphic-properties-content"/>
+    </element>
+</define>
+
+<define name="style-graphic-properties-content">
+    <ref name="style-properties-content"/>
+</define>
+
+<define name="style-graphic-properties-content-strict">
+    <ref name="style-graphic-properties-attlist"/>
+    <ref name="style-graphic-fill-properties-attlist"/>
+    <ref name="style-graphic-properties-elements"/>
+</define>
+
+<define name=" style-graphic-properties-elements">
+    <empty/>
+</define>
+<define name="style-style-content" combine="choice">
+    <group>
+        <attribute name="style:family">
+            <value>drawing-page</value>
+        </attribute>
+        <optional>
+            <ref name="style-drawing-page-properties"/>
+        </optional>
+    </group>
+</define>
+
+<define name="style-drawing-page-properties">
+    <element name="style:drawing-page-properties">
+        <ref name="style-drawing-page-properties-content"/>
+    </element>
+</define>
+
+<define name="style-drawing-page-properties-content">
+    <ref name="style-properties-content"/>
+</define>
+
+<define name="style-drawing-page-properties-content-strict">
+    <ref name="style-graphic-fill-properties-attlist"/>
+    <ref name="style-drawing-page-properties-attlist"/>
+    <ref name="style-drawing-page-properties-elements"/>
+</define>
+<define name="draw-gradient">
+    <element name="draw:gradient">
+        <ref name="common-draw-gradient-attlist"/>
+        <ref name="draw-gradient-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="common-draw-gradient-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:name">
+            <ref name="styleName"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-draw-gradient-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:display-name">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-draw-gradient-attlist" combine="interleave">
+    <attribute name="draw:style">
+        <ref name="gradient-style"/>
+    </attribute>
+</define>
+<define name="gradient-style">
+    <choice>
+        <value>linear</value>
+        <value>axial</value>
+        <value>radial</value>
+        <value>ellipsoid</value>
+        <value>square</value>
+        <value>rectangular</value>
+    </choice>
+</define>
+<define name="common-draw-gradient-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:cx">
+            <ref name="percent"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="draw:cy">
+            <ref name="percent"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-gradient-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:start-color">
+            <ref name="color"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="draw:end-color">
+            <ref name="color"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-gradient-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:start-intensity">
+            <ref name="percent"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="draw:end-intensity">
+            <ref name="percent"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-draw-gradient-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:angle">
+            <ref name="integer"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-draw-gradient-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:border">
+            <ref name="percent"/>
+        </attribute>
+    </optional>
+</define>
+<define name="svg-linearGradient">
+    <element name="svg:linearGradient">
+        <ref name="common-svg-gradient-attlist"/>
+        <optional>
+            <attribute name="svg:x1" a:defaultValue="0%">
+                <choice>
+                    <ref name="coordinate"/>
+                    <ref name="percent"/>
+                </choice>                
+            </attribute>
+        </optional>
+        <optional>
+            <attribute name="svg:y1" a:defaultValue="0%">
+                <choice>
+                    <ref name="coordinate"/>
+                    <ref name="percent"/>
+                </choice>                
+            </attribute>
+        </optional>
+        <optional>
+            <attribute name="svg:x2" a:defaultValue="100%">
+                <choice>
+                    <ref name="coordinate"/>
+                    <ref name="percent"/>
+                </choice>                
+            </attribute>
+        </optional>
+        <optional>
+            <attribute name="svg:y2" a:defaultValue="100%">
+                <choice>
+                    <ref name="coordinate"/>
+                    <ref name="percent"/>
+                </choice>                
+            </attribute>
+        </optional>
+        <zeroOrMore>
+            <ref name="svg-stop"/>
+        </zeroOrMore>
+    </element>
+</define>
+
+<define name="svg-radialGradient">
+    <element name="svg:radialGradient">
+        <ref name="common-svg-gradient-attlist"/>
+        <optional>
+            <attribute name="svg:cx" a:defaultValue="50%">
+                <choice>
+                    <ref name="coordinate"/>
+                    <ref name="percent"/>
+                </choice>                
+            </attribute>
+        </optional>
+        <optional>
+            <attribute name="svg:cy" a:defaultValue="50%">
+                <choice>
+                    <ref name="coordinate"/>
+                    <ref name="percent"/>
+                </choice>                
+            </attribute>
+        </optional>
+        <optional>
+            <attribute name="svg:r" a:defaultValue="50%">
+                <choice>
+                    <ref name="coordinate"/>
+                    <ref name="percent"/>
+                </choice>                
+            </attribute>
+        </optional>
+        <optional>
+            <attribute name="svg:fx">
+                <choice>
+                    <ref name="coordinate"/>
+                    <ref name="percent"/>
+                </choice>                
+            </attribute>
+        </optional>
+        <optional>
+            <attribute name="svg:fy">
+                <choice>
+                    <ref name="coordinate"/>
+                    <ref name="percent"/>
+                </choice>                
+            </attribute>
+        </optional>
+        <zeroOrMore>
+            <ref name="svg-stop"/>
+        </zeroOrMore>
+    </element>
+</define>
+
+<define name="svg-stop">
+    <element name="svg:stop">
+        <attribute name="svg:offset">
+            <choice>
+                <ref name="double"/>
+                <ref name="percent"/>
+            </choice>
+        </attribute>
+        <optional>
+            <attribute name="svg:stop-color">
+                <ref name="color"/>
+            </attribute>
+        </optional>
+        <optional>
+            <attribute name="svg:stop-opacity">
+                <ref name="double"/>
+            </attribute>
+        </optional>
+    </element>
+</define>
+
+<define name="common-svg-gradient-attlist" combine="interleave">
+    <optional>
+        <attribute name="svg:gradientUnits" a:defaultValue="objectBoundingBox">
+            <value>objectBoundingBox</value>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="svg:gradientTransform">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="svg:spreadMethod" a:defaultValue="pad">
+            <choice>
+                <value>pad</value>
+                <value>reflect</value>
+                <value>repeat</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="common-svg-gradient-attlist" combine="interleave">
+    <attribute name="draw:name">
+        <ref name="styleName"/>
+    </attribute>
+</define>
+<define name="common-svg-gradient-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:display-name">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-hatch">
+    <element name="draw:hatch">
+        <ref name="draw-hatch-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="draw-hatch-attlist" combine="interleave">
+    <attribute name="draw:name">
+        <ref name="styleName"/>
+    </attribute>
+</define>
+<define name="draw-hatch-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:display-name">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-hatch-attlist" combine="interleave">
+    <attribute name="draw:style">
+        <choice>
+            <value>single</value>
+            <value>double</value>
+            <value>triple</value>
+        </choice>
+    </attribute>
+</define>
+<define name="draw-hatch-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:color">
+            <ref name="color"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-hatch-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:distance">
+            <ref name="length"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-hatch-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:rotation">
+            <ref name="integer"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-fill-image">
+    <element name="draw:fill-image">
+        <ref name="draw-fill-image-attlist"/>
+        <attribute name="xlink:href">
+            <ref name="anyURI"/>
+        </attribute>
+        <optional>
+            <attribute name="xlink:type" a:defaultValue="simple">
+                <choice>
+                    <value>simple</value>
+                </choice>
+            </attribute>
+        </optional>
+        <optional>
+            <attribute name="xlink:show" a:defaultValue="embed">
+                <choice>
+                    <value>embed</value>
+                </choice>
+            </attribute>
+        </optional>
+        <optional>
+            <attribute name="xlink:actuate" a:defaultValue="onLoad">
+                <choice>
+                    <value>onLoad</value>
+                </choice>
+            </attribute>
+        </optional>
+        <empty/>
+    </element>
+</define>
+<define name="draw-fill-image-attlist" combine="interleave">
+    <attribute name="draw:name">
+        <ref name="styleName"/>
+    </attribute>
+</define>
+<define name="draw-fill-image-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:display-name">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-fill-image-attlist" combine="interleave">
+    <optional>
+        <attribute name="svg:width">
+            <ref name="length"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="svg:height">
+            <ref name="length"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-opacity">
+    <element name="draw:opacity">
+        <ref name="common-draw-gradient-attlist"/>
+        <ref name="draw-opacity-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="draw-opacity-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:start">
+            <ref name="percent"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="draw:end">
+            <ref name="percent"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-marker">
+    <element name="draw:marker">
+        <ref name="draw-marker-attlist"/>
+        <ref name="common-draw-viewbox-attlist"/>
+        <ref name="common-draw-path-data-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="draw-marker-attlist" combine="interleave">
+    <attribute name="draw:name">
+        <ref name="styleName"/>
+    </attribute>
+</define>
+<define name="draw-marker-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:display-name">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-stroke-dash">
+    <element name="draw:stroke-dash">
+        <ref name="draw-stroke-dash-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="draw-stroke-dash-attlist" combine="interleave">
+    <attribute name="draw:name">
+        <ref name="styleName"/>
+    </attribute>
+</define>
+<define name="draw-stroke-dash-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:display-name">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-stroke-dash-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:style">
+            <choice>
+                <value>rect</value>
+                <value>round</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-stroke-dash-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:dots1">
+            <ref name="integer"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="draw:dots1-length">
+            <ref name="length"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="draw:dots2">
+            <ref name="integer"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="draw:dots2-length">
+            <ref name="length"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-stroke-dash-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:distance">
+            <ref name="length"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-presentation-page-layout">
+    <element name="style:presentation-page-layout">
+        <attribute name="style:name">
+            <ref name="styleName"/>
+        </attribute>
+        <optional>
+            <attribute name="style:display-name">
+                <ref name="string"/>
+            </attribute>
+        </optional>
+        <zeroOrMore>
+            <ref name="presentation-placeholder"/>
+        </zeroOrMore>
+    </element>
+</define>
+<define name="presentation-placeholder">
+    <element name="presentation:placeholder">
+        <attribute name="presentation:object">
+            <ref name="presentation-classes"/>
+        </attribute>
+        <attribute name="svg:x">
+            <choice>
+                <ref name="coordinate"/>
+                <ref name="percent"/>
+            </choice>
+        </attribute>
+        <attribute name="svg:y">
+            <choice>
+                <ref name="coordinate"/>
+                <ref name="percent"/>
+            </choice>
+        </attribute>
+        <attribute name="svg:width">
+            <choice>
+                <ref name="length"/>
+                <ref name="percent"/>
+            </choice>
+        </attribute>
+        <attribute name="svg:height">
+            <choice>
+                <ref name="length"/>
+                <ref name="percent"/>
+            </choice>
+        </attribute>
+        <empty/>
+    </element>
+</define>
+<define name="style-style-content" combine="choice">
+    <group>
+        <attribute name="style:family">
+            <value>chart</value>
+        </attribute>
+        <optional>
+            <ref name="style-chart-properties"/>
+        </optional>
+        <optional>
+            <ref name="style-graphic-properties"/>
+        </optional>
+        <optional>
+            <ref name="style-paragraph-properties"/>
+        </optional>
+        <optional>
+            <ref name="style-text-properties"/>
+        </optional>
+    </group>
+</define>
+<define name="style-properties-content">
+    <ref name="anyAttListOrElements"/>
+</define>
+<define name="style-page-layout-properties">
+    <element name="style:page-layout-properties">
+        <ref name="style-page-layout-properties-content"/>
+    </element>
+</define>
+
+<define name="style-page-layout-properties-content">
+    <ref name="style-properties-content"/>
+</define>
+
+<define name="style-page-layout-properties-content-strict">
+    <ref name="style-page-layout-properties-attlist"/>
+    <ref name="style-page-layout-properties-elements"/>
+</define>
+<define name="style-page-layout-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="fo:page-width">
+            <ref name="length"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="fo:page-height">
+            <ref name="length"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-page-layout-properties-attlist" combine="interleave">
+    <optional>
+        <ref name="common-num-format-attlist"/>
+    </optional>
+    <ref name="common-num-format-prefix-suffix-attlist"/>
+</define>
+<define name="style-page-layout-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:paper-tray-name">
+            <choice>
+                <value>default</value>
+                <ref name="string"/>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-page-layout-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:print-orientation">
+            <choice>
+                <value>portrait</value>
+                <value>landscape</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-page-layout-properties-attlist" combine="interleave">
+    <ref name="common-horizontal-margin-attlist"/>
+    <ref name="common-vertical-margin-attlist"/>
+    <ref name="common-margin-attlist"/>
+</define>
+<define name="style-page-layout-properties-attlist" combine="interleave">
+    <ref name="common-border-attlist"/>
+</define>
+<define name="style-page-layout-properties-attlist" combine="interleave">
+    <ref name="common-border-line-width-attlist"/>
+</define>
+<define name="style-page-layout-properties-attlist" combine="interleave">
+    <ref name="common-padding-attlist"/>
+</define>
+<define name="style-page-layout-properties-attlist" combine="interleave">
+    <ref name="common-shadow-attlist"/>
+</define>
+<define name="style-page-layout-properties-attlist" combine="interleave">
+    <ref name="common-background-color-attlist"/>
+</define>
+<define name="style-page-layout-properties-elements" combine="interleave">
+    <ref name="style-background-image"/>
+</define>
+<define name="style-page-layout-properties-elements" combine="interleave">
+    <ref name="style-columns"/>
+</define>
+<define name="style-page-layout-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:register-truth-ref-style-name">
+            <ref name="styleNameRef"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-page-layout-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:print">
+            <list>
+                <zeroOrMore>
+                    <choice>
+                        <value>headers</value>
+                        <value>grid</value>
+                        <value>annotations</value>
+                        <value>objects</value>
+                        <value>charts</value>
+                        <value>drawings</value>
+                        <value>formulas</value>
+                        <value>zero-values</value>
+                    </choice>
+                </zeroOrMore>
+            </list>
+        </attribute>
+    </optional>
+</define>
+<define name="style-page-layout-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:print-page-order">
+            <choice>
+                <value>ttb</value>
+                <value>ltr</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-page-layout-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:first-page-number">
+            <choice>
+                <ref name="positiveInteger"/>
+                <value>continue</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-page-layout-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:scale-to">
+            <ref name="percent"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="style:scale-to-pages">
+            <ref name="positiveInteger"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-page-layout-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:table-centering">
+            <choice>
+                <value>horizontal</value>
+                <value>vertical</value>
+                <value>both</value>
+                <value>none</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-page-layout-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:footnote-max-height">
+            <ref name="length"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-page-layout-properties-attlist" combine="interleave">
+    <ref name="common-writing-mode-attlist"/>
+</define>
+<define name="style-page-layout-properties-elements" combine="interleave">
+    <ref name="style-footnote-sep"/>
+</define>
+
+<define name="style-footnote-sep">
+    <optional>
+        <element name="style:footnote-sep">
+            <ref name="style-footnote-sep-attlist"/>
+            <empty/>
+        </element>
+    </optional>
+</define>
+<define name="style-footnote-sep-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:width">
+            <ref name="length"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="style:rel-width">
+            <ref name="percent"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="style:color">
+            <ref name="color"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="style:line-style">
+            <ref name="lineStyle"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="style:adjustment" a:defaultValue="left">
+            <choice>
+                <value>left</value>
+                <value>center</value>
+                <value>right</value>
+            </choice>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="style:distance-before-sep">
+            <ref name="length"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="style:distance-after-sep">
+            <ref name="length"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-page-layout-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:layout-grid-mode">
+            <choice>
+                <value>none</value>
+                <value>line</value>
+                <value>both</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-page-layout-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:layout-grid-base-height">
+            <ref name="length"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-page-layout-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:layout-grid-ruby-height">
+            <ref name="length"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-page-layout-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:layout-grid-lines">
+            <ref name="positiveInteger"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-page-layout-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:layout-grid-color">
+            <ref name="color"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-page-layout-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:layout-grid-ruby-below">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-page-layout-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:layout-grid-print">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-page-layout-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:layout-grid-display">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-header-footer-properties">
+    <element name="style:header-footer-properties">
+        <ref name="style-header-footer-properties-content"/>
+    </element>
+</define>
+
+<define name="style-header-footer-properties-content">
+    <ref name="style-properties-content"/>
+</define>
+
+<define name="style-header-footer-properties-content-strict">
+        <ref name="style-header-footer-properties-attlist"/>
+        <ref name="style-header-footer-properties-elements"/>
+</define>
+<define name="style-header-footer-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="svg:height">
+            <ref name="length"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="fo:min-height">
+            <ref name="length"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-header-footer-properties-attlist" combine="interleave">
+    <ref name="common-horizontal-margin-attlist"/>
+    <ref name="common-vertical-margin-attlist"/>
+    <ref name="common-margin-attlist"/>
+</define>
+<define name="style-header-footer-properties-attlist" combine="interleave">
+    <ref name="common-border-attlist"/>
+</define>
+<define name="style-header-footer-properties-attlist" combine="interleave">
+    <ref name="common-border-line-width-attlist"/>
+</define>
+<define name="style-header-footer-properties-attlist" combine="interleave">
+    <ref name="common-padding-attlist"/>
+</define>
+<define name="style-header-footer-properties-attlist" combine="interleave">
+    <ref name="common-background-color-attlist"/>
+</define>
+<define name="style-header-footer-properties-elements" combine="interleave">
+    <ref name="style-background-image"/>
+</define>
+<define name="style-header-footer-properties-attlist" combine="interleave">
+    <ref name="common-shadow-attlist"/>
+</define>
+<define name="style-header-footer-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:dynamic-spacing">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-text-properties">
+    <element name="style:text-properties">
+        <ref name="style-text-properties-content"/>
+    </element>
+</define>
+
+<define name="style-text-properties-content">
+    <ref name="style-properties-content"/>
+</define>
+
+<define name="style-text-properties-content-strict">
+    <ref name="style-text-properties-attlist"/>
+    <ref name="style-text-properties-elements"/>
+</define>
+
+<define name="style-text-properties-elements">
+    <empty/>
+</define>
+<define name="style-text-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="fo:font-variant">
+            <ref name="fontVariant"/>
+        </attribute>
+    </optional>
+</define>
+
+<define name="fontVariant">
+    <choice>
+        <value>normal</value>
+        <value>small-caps</value>
+    </choice>
+</define>
+<define name="style-text-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="fo:text-transform">
+            <choice>
+                <value>none</value>
+                <value>lowercase</value>
+                <value>uppercase</value>
+                <value>capitalize</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-text-properties-attlist" combine="interleave">
+    <optional>
+            <attribute name="fo:color">
+            <ref name="color"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-text-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:use-window-font-color">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-text-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:text-outline">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-text-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:text-line-through-type">
+            <ref name="lineType"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-text-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:text-line-through-style">
+            <ref name="lineStyle"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-text-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:text-line-through-width">
+            <ref name="lineWidth"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-text-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:text-line-through-color">
+            <choice>
+                <value>font-color</value>
+                <ref name="color"/>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-text-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:text-line-through-text">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-text-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:text-line-through-text-style">
+            <ref name="styleNameRef"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-text-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:text-position">
+            <list>
+                <choice>
+                    <ref name="percent"/>
+                    <value>super</value>
+                    <value>sub</value>
+                </choice>
+                <optional>
+                    <ref name="percent"/>
+                </optional>
+            </list>
+        </attribute>
+    </optional>
+</define>
+<define name="style-text-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:font-name">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="style:font-name-asian">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="style:font-name-complex">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-text-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="fo:font-family">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="style:font-family-asian">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="style:font-family-complex">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-text-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:font-family-generic">
+            <ref name="fontFamilyGeneric"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="style:font-family-generic-asian">
+            <ref name="fontFamilyGeneric"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="style:font-family-generic-complex">
+            <ref name="fontFamilyGeneric"/>
+        </attribute>
+    </optional>
+</define>
+
+<define name="fontFamilyGeneric">
+    <choice>
+        <value>roman</value>
+        <value>swiss</value>
+        <value>modern</value>
+        <value>decorative</value>
+        <value>script</value>
+        <value>system</value>
+    </choice>
+</define>
+<define name="style-text-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:font-style-name">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="style:font-style-name-asian">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="style:font-style-name-complex">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-text-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:font-pitch">
+            <ref name="fontPitch"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="style:font-pitch-asian">
+            <ref name="fontPitch"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="style:font-pitch-complex">
+            <ref name="fontPitch"/>
+        </attribute>
+    </optional>
+</define>
+
+<define name="fontPitch">
+    <choice>
+        <value>fixed</value>
+        <value>variable</value>
+    </choice>
+</define>
+<define name="style-text-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:font-charset">
+            <ref name="textEncoding"/>
+        </attribute>
+    </optional>
+</define>
+
+<define name="textEncoding">
+    <data type="string">
+        <param name="pattern">[A-Za-z][A-Za-z0-9._\-]*</param>
+    </data>
+</define>
+<define name="style-text-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="fo:font-size">
+            <choice>
+                <ref name="positiveLength"/>
+                <ref name="percent"/>
+            </choice>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="style:font-size-asian">
+            <choice>
+                <ref name="positiveLength"/>
+                <ref name="percent"/>
+            </choice>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="style:font-size-complex">
+            <choice>
+                <ref name="positiveLength"/>
+                <ref name="percent"/>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-text-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:font-size-rel">
+            <ref name="length"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="style:font-size-rel-asian">
+            <ref name="length"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="style:font-size-rel-complex">
+            <ref name="length"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-text-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:script-type">
+            <choice>
+                <value>latin</value>
+                <value>asian</value>
+                <value>complex</value>
+                <value>ignore</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-text-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="fo:letter-spacing">
+            <choice>
+                <ref name="length"/>
+                <value>normal</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-text-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="fo:language">
+            <ref name="languageCode"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="style:language-asian">
+            <ref name="languageCode"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="style:language-complex">
+            <ref name="languageCode"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-text-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="fo:country">
+            <ref name="countryCode"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="style:country-asian">
+            <ref name="countryCode"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="style:country-complex">
+            <ref name="countryCode"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-text-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="fo:font-style">
+            <ref name="fontStyle"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="style:font-style-asian">
+            <ref name="fontStyle"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="style:font-style-complex">
+            <ref name="fontStyle"/>
+        </attribute>
+    </optional>
+</define>
+
+<define name="fontStyle">
+    <choice>
+        <value>normal</value>
+        <value>italic</value>
+        <value>oblique</value>
+    </choice>
+</define>
+<define name="style-text-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:font-relief">
+            <choice>
+            <value>none</value>
+                <value>embossed</value>
+                <value>engraved</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-text-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="fo:text-shadow">
+            <ref name="shadowType"/>
+        </attribute>
+    </optional>
+</define>
+
+<define name="shadowType">
+    <choice>
+        <value>none</value>
+        <!-- The follwing string must match an XSL shadow decl -->
+        <ref name="string"/>
+    </choice>
+</define>
+<define name="style-text-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:text-underline-type">
+            <ref name="lineType"/>
+        </attribute>
+    </optional>
+</define>
+
+<define name="lineType">
+    <choice>
+        <value>none</value>
+        <value>single</value>
+        <value>double</value>
+    </choice>
+</define>
+<define name="style-text-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:text-underline-style">
+            <ref name="lineStyle"/>
+        </attribute>
+    </optional>
+</define>
+
+<define name="lineStyle">
+    <choice>
+        <value>none</value>
+        <value>solid</value>
+        <value>dotted</value>
+        <value>dash</value>
+        <value>long-dash</value>
+        <value>dot-dash</value>
+        <value>dot-dot-dash</value>
+        <value>wave</value>
+    </choice>
+</define>
+<define name="style-text-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:text-underline-width">
+            <ref name="lineWidth"/>
+        </attribute>
+    </optional>
+</define>
+
+<define name="lineWidth">
+    <choice>
+        <value>auto</value>
+        <value>normal</value>
+        <value>bold</value>
+        <value>thin</value>
+        <value>dash</value>
+        <value>medium</value>
+        <value>thick</value>
+        <ref name="positiveInteger"/>
+        <ref name="percent"/>
+        <ref name="positiveLength"/>
+    </choice>
+</define>
+<define name="style-text-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:text-underline-color">
+            <choice>
+                <value>font-color</value>
+                <ref name="color"/>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-text-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="fo:font-weight">
+            <ref name="fontWeight"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="style:font-weight-asian">
+            <ref name="fontWeight"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="style:font-weight-complex">
+            <ref name="fontWeight"/>
+        </attribute>
+    </optional>
+</define>
+
+<define name="fontWeight">
+    <choice>
+        <value>normal</value>
+        <value>bold</value>
+        <value>100</value>
+        <value>200</value>
+        <value>300</value>
+        <value>400</value>
+        <value>500</value>
+        <value>600</value>
+        <value>700</value>
+        <value>800</value>
+        <value>900</value>
+    </choice>
+</define>
+<define name="style-text-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:text-underline-mode">
+            <ref name="lineMode"/>
+        </attribute>
+    </optional>
+</define>
+
+<define name="lineMode">
+    <choice>
+        <value>continuous</value>
+        <value>skip-white-space</value>
+    </choice>
+</define>
+<define name="style-text-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:text-line-through-mode">
+            <ref name="lineMode"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-text-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:letter-kerning">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-text-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:text-blinking">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-text-properties-attlist" combine="interleave">
+    <ref name="common-background-color-attlist"/>
+</define>
+<define name="style-text-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:text-combine">
+            <choice>
+                <value>none</value>
+                <value>letters</value>
+                <value>lines</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-text-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:text-combine-start-char">
+            <ref name="character"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="style:text-combine-end-char">
+            <ref name="character"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-text-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:text-emphasize">
+            <choice>
+                <value>none</value>
+                <list>
+                    <choice>
+                        <value>none</value>
+                        <value>accent</value>
+                        <value>dot</value>
+                        <value>circle</value>
+                        <value>disc</value>
+                    </choice>
+                    <choice>
+                        <value>above</value>
+                        <value>below</value>
+                    </choice>
+                </list>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-text-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:text-scale">
+            <ref name="percent"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-text-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:text-rotation-angle">
+            <ref name="integer"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-text-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:text-rotation-scale">
+            <choice>
+                <value>fixed</value>
+                <value>line-height</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-text-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="fo:hyphenate">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-text-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="fo:hyphenation-remain-char-count">
+            <ref name="positiveInteger"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-text-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="fo:hyphenation-push-char-count">
+            <ref name="positiveInteger"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-text-properties-attlist" combine="interleave">
+    <choice>
+        <attribute name="text:display">
+            <value>true</value>
+        </attribute>
+        <attribute name="text:display">
+            <value>none</value>
+        </attribute>
+        <group>
+            <attribute name="text:display">
+                <value>condition</value>
+            </attribute>
+            <attribute name="text:condition">
+                <value>none</value>
+            </attribute>
+        </group>
+        <empty/>
+    </choice>
+</define>
+<define name="style-paragraph-properties">
+    <element name="style:paragraph-properties">
+        <ref name="style-paragraph-properties-content"/>
+    </element>
+</define>
+
+<define name="style-paragraph-properties-content">
+    <ref name="style-properties-content"/>
+</define>
+
+<define name="style-paragraph-properties-content-strict">
+    <ref name="style-paragraph-properties-attlist"/>
+    <ref name="style-paragraph-properties-elements"/>
+</define>
+<define name="style-paragraph-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="fo:line-height">
+            <choice>
+                <value>normal</value>
+                <ref name="nonNegativeLength"/>
+                <ref name="percent"/>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-paragraph-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:line-height-at-least">
+            <ref name="nonNegativeLength"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-paragraph-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:line-spacing">
+            <ref name="length"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-paragraph-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:font-independent-line-spacing">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-paragraph-properties-attlist" combine="interleave">
+    <ref name="common-text-align"/>
+</define>
+
+<define name="common-text-align">
+    <optional>
+        <attribute name="fo:text-align">
+            <choice>
+                <value>start</value>
+                <value>end</value>
+                <value>left</value>
+                <value>right</value>
+                <value>center</value>
+                <value>justify</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-paragraph-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="fo:text-align-last">
+            <choice>
+                <value>start</value>
+                <value>center</value>
+                <value>justify</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-paragraph-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:justify-single-word">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-paragraph-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="fo:keep-together">
+            <choice>
+                <value>auto</value>
+                <value>always</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-paragraph-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="fo:widows">
+            <ref name="nonNegativeInteger"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-paragraph-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="fo:orphans">
+            <ref name="nonNegativeInteger"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-paragraph-properties-elements" combine="interleave">
+    <ref name="style-tab-stops"/>
+</define>
+
+<define name="style-tab-stops">
+    <optional>
+        <element name="style:tab-stops">
+            <zeroOrMore>
+                <ref name="style-tab-stop"/>
+            </zeroOrMore>
+        </element>
+    </optional>
+</define>
+
+<define name="style-tab-stop">
+    <element name="style:tab-stop">
+        <ref name="style-tab-stop-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="style-tab-stop-attlist" combine="interleave">
+    <attribute name="style:position">
+        <ref name="nonNegativeLength"/>
+    </attribute>
+</define>
+<define name="style-tab-stop-attlist" combine="interleave">
+    <choice>
+        <optional>
+            <attribute name="style:type" a:defaultValue="left">
+                <choice>
+                    <value>left</value>
+                    <value>center</value>
+                    <value>right</value>
+                </choice>
+            </attribute>
+        </optional>
+        <group>
+            <attribute name="style:type">
+                <value>char</value>
+            </attribute>
+            <ref name="style-tab-stop-char-attlist"/>
+        </group>
+    </choice>
+</define>
+<define name="style-tab-stop-char-attlist" combine="interleave">
+    <attribute name="style:char">
+        <ref name="character"/>
+    </attribute>
+</define>
+<define name="style-tab-stop-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:leader-type">
+            <ref name="lineType"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-tab-stop-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:leader-style">
+            <ref name="lineStyle"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-tab-stop-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:leader-width">
+            <ref name="lineWidth"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-tab-stop-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:leader-color">
+            <choice>
+                <value>font-color</value>
+                <ref name="color"/>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-tab-stop-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:leader-text" a:defaultValue=" ">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-tab-stop-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:leader-text-style">
+            <ref name="styleNameRef"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-paragraph-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:tab-stop-distance">
+            <ref name="nonNegativeLength"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-paragraph-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="fo:hyphenation-keep">
+            <choice>
+                <value>auto</value>
+                <value>page</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-paragraph-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="fo:hyphenation-ladder-count">
+            <choice>
+                <value>no-limit</value>
+                <ref name="positiveInteger"/>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-paragraph-properties-elements" combine="interleave">
+    <ref name="style-drop-cap"/>
+</define>
+
+<define name="style-drop-cap">
+    <optional>
+        <element name="style:drop-cap">
+            <ref name="style-drop-cap-attlist"/>
+            <empty/>
+        </element>
+    </optional>
+</define>
+<define name="style-drop-cap-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:length" a:defaultValue="1">
+            <choice>
+                <value>word</value>
+                <ref name="positiveInteger"/>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-drop-cap-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:lines" a:defaultValue="1">
+            <ref name="positiveInteger"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-drop-cap-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:distance" a:defaultValue="0cm">
+            <ref name="length"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-drop-cap-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:style-name">
+            <ref name="styleNameRef"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-paragraph-properties-attlist" combine="interleave">
+        <optional>
+            <attribute name="style:register-true">
+                <ref name="boolean"/>
+            </attribute>
+        </optional>
+    </define>
+<define name="style-paragraph-properties-attlist" combine="interleave">
+    <ref name="common-horizontal-margin-attlist"/>
+</define>
+
+<define name="common-horizontal-margin-attlist">
+    <optional>
+        <attribute name="fo:margin-left">
+            <choice>
+                <ref name="length"/>
+                <ref name="percent"/>
+            </choice>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="fo:margin-right">
+            <choice>
+                <ref name="length"/>
+                <ref name="percent"/>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-paragraph-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="fo:text-indent">
+            <choice>
+                <ref name="length"/>
+                <ref name="percent"/>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-paragraph-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:auto-text-indent">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-paragraph-properties-attlist" combine="interleave">
+    <ref name="common-vertical-margin-attlist"/>
+</define>
+
+<define name="common-vertical-margin-attlist">
+    <optional>
+        <attribute name="fo:margin-top">
+            <choice>
+                <ref name="nonNegativeLength"/>
+                <ref name="percent"/>
+            </choice>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="fo:margin-bottom">
+            <choice>
+                <ref name="nonNegativeLength"/>
+                <ref name="percent"/>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-paragraph-properties-attlist" combine="interleave">
+    <ref name="common-margin-attlist"/>
+</define>
+
+<define name="common-margin-attlist">
+    <optional>
+        <attribute name="fo:margin">
+            <choice>
+                <ref name="nonNegativeLength"/>
+                <ref name="percent"/>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-paragraph-properties-attlist" combine="interleave">
+    <ref name="common-break-attlist"/>
+</define>
+
+<define name="common-break-attlist">
+    <optional>
+        <attribute name="fo:break-before">
+            <choice>
+                <value>auto</value>
+                <value>column</value>
+                <value>page</value>
+            </choice>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="fo:break-after">
+            <choice>
+                <value>auto</value>
+                <value>column</value>
+                <value>page</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-paragraph-properties-attlist" combine="interleave">
+    <ref name="common-background-color-attlist"/>
+</define>
+
+<define name="common-background-color-attlist">
+    <optional>
+        <attribute name="fo:background-color">
+            <choice>
+                <value>transparent</value>
+                <ref name="color"/>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-paragraph-properties-elements" combine="interleave">
+    <ref name="style-background-image"/>
+</define>
+
+<define name="style-background-image">
+    <optional>
+        <element name="style:background-image">
+            <ref name="style-background-image-attlist"/>
+            <choice>
+                <ref name="common-draw-data-attlist"/>
+                <ref name="office-binary-data"/>
+                <empty/>
+            </choice>
+        </element>
+    </optional>
+</define>
+<define name="style-background-image-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:repeat" a:defaultValue="repeat">
+            <choice>
+                <value>no-repeat</value>
+                <value>repeat</value>
+                <value>stretch</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-background-image-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:position" a:defaultValue="center">
+            <choice>
+                <value>left</value>
+                <value>center</value>
+                <value>right</value>
+                <value>top</value>
+                <value>bottom</value>
+                <list>
+                    <ref name="horiBackPos"/>
+                    <ref name="vertBackPos"/>
+                </list>
+                <list>
+                    <ref name="vertBackPos"/>
+                    <ref name="horiBackPos"/>
+                </list>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+
+<define name="horiBackPos">
+    <choice>
+        <value>left</value>
+        <value>center</value>
+        <value>right</value>
+    </choice>
+</define>
+<define name="vertBackPos">
+    <choice>
+        <value>top</value>
+        <value>center</value>
+        <value>bottom</value>
+    </choice>
+</define>
+<define name="style-background-image-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:filter-name">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-background-image-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:opacity">
+            <ref name="percent"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-paragraph-properties-attlist" combine="interleave">
+    <ref name="common-border-attlist"/>
+</define>
+
+<define name="common-border-attlist">
+    <optional>
+        <attribute name="fo:border">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="fo:border-top">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="fo:border-bottom">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="fo:border-left">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="fo:border-right">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-paragraph-properties-attlist" combine="interleave">
+    <ref name="common-border-line-width-attlist"/>
+</define>
+
+<define name="common-border-line-width-attlist">
+    <optional>
+        <attribute name="style:border-line-width">
+            <ref name="borderWidths"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="style:border-line-width-top">
+            <ref name="borderWidths"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="style:border-line-width-bottom">
+            <ref name="borderWidths"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="style:border-line-width-left">
+            <ref name="borderWidths"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="style:border-line-width-right">
+            <ref name="borderWidths"/>
+        </attribute>
+    </optional>
+</define>
+
+<define name="borderWidths">
+    <list>
+        <ref name="positiveLength"/>
+        <ref name="positiveLength"/>
+        <ref name="positiveLength"/>
+    </list>
+</define>
+<define name="style-paragraph-properties-attlist" combine="interleave">
+    <ref name="common-padding-attlist"/>
+</define>
+
+<define name="common-padding-attlist">
+    <optional>
+        <attribute name="fo:padding">
+            <ref name="nonNegativeLength"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="fo:padding-top">
+            <ref name="nonNegativeLength"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="fo:padding-bottom">
+            <ref name="nonNegativeLength"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="fo:padding-left">
+            <ref name="nonNegativeLength"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="fo:padding-right">
+            <ref name="nonNegativeLength"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-paragraph-properties-attlist" combine="interleave">
+    <ref name="common-shadow-attlist"/>
+</define>
+
+<define name="common-shadow-attlist">
+    <optional>
+        <attribute name="style:shadow">
+            <ref name="shadowType"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-paragraph-properties-attlist" combine="interleave">
+    <ref name="common-keep-with-next-attlist"/>
+</define>
+
+<define name="common-keep-with-next-attlist">
+    <optional>
+        <attribute name="fo:keep-with-next">
+            <choice>
+                <value>auto</value>
+                <value>always</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-paragraph-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="text:number-lines" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-paragraph-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="text:line-number">
+            <ref name="nonNegativeInteger"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-paragraph-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:text-autospace">
+            <choice>
+                <value>none</value>
+                <value>ideograph-alpha</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-paragraph-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:punctuation-wrap">
+            <choice>
+                <value>simple</value>
+                <value>hanging</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-paragraph-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:line-break">
+            <choice>
+                <value>normal</value>
+                <value>strict</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-paragraph-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:vertical-align" a:defaultValue="auto">
+            <choice>
+                <value>top</value>
+                <value>middle</value>
+                <value>bottom</value>
+                <value>auto</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-paragraph-properties-attlist" combine="interleave">
+    <ref name="common-writing-mode-attlist"/>
+</define>
+
+<define name="common-writing-mode-attlist">
+    <optional>
+        <attribute name="style:writing-mode">
+            <choice>
+                <value>lr-tb</value>
+                <value>rl-tb</value>
+                <value>tb-rl</value>
+                <value>tb-lr</value>
+                <value>lr</value>
+                <value>rl</value>
+                <value>tb</value>
+                <value>page</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-paragraph-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:writing-mode-automatic">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-paragraph-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:snap-to-layout-grid">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-paragraph-properties-attlist" combine="interleave">
+    <ref name="common-page-number-attlist"/>
+</define>
+
+<define name="common-page-number-attlist">
+    <optional>
+        <attribute name="style:page-number">
+            <ref name="positiveInteger"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-paragraph-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:background-transparency">
+            <ref name="percent"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-ruby-properties">
+    <element name="style:ruby-properties">
+        <ref name="style-ruby-properties-content"/>
+    </element>
+</define>
+
+<define name="style-ruby-properties-content">
+    <ref name="style-properties-content"/>
+</define>
+
+<define name="style-ruby-properties-content-strict">
+    <ref name="style-ruby-properties-attlist"/>
+    <ref name="style-ruby-properties-elements"/>
+</define>
+
+<define name="style-ruby-properties-elements">
+    <empty/>
+</define>
+<define name="style-ruby-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:ruby-position">
+            <choice>
+                <value>above</value>
+                <value>below</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-ruby-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:ruby-align">
+            <choice>
+                <value>left</value>
+                <value>center</value>
+                <value>right</value>
+                <value>distribute-letter</value>
+                <value>distribute-space</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-section-properties">
+    <element name="style:section-properties">
+        <ref name="style-section-properties-content"/>
+    </element>
+</define>
+
+<define name="style-section-properties-content">
+    <ref name="style-properties-content"/>
+</define>
+
+<define name="style-section-properties-content-strict">
+    <ref name="style-section-properties-attlist"/>
+    <ref name="style-section-properties-elements"/>
+</define>
+<define name="style-section-properties-attlist" combine="interleave">
+    <ref name="common-background-color-attlist"/>
+</define>
+<define name="style-section-properties-elements" combine="interleave">
+    <ref name="style-background-image"/>
+</define>
+<define name="style-section-properties-attlist" combine="interleave">
+    <ref name="common-horizontal-margin-attlist"/>
+</define>
+<define name="style-section-properties-elements" combine="interleave">
+    <ref name="style-columns"/>
+</define>
+
+<define name="style-columns">
+    <optional>
+        <element name="style:columns">
+            <ref name="style-columns-attlist"/>
+            <optional>
+                <ref name="style-column-sep"/>
+            </optional>
+            <zeroOrMore>
+                <ref name="style-column"/>
+            </zeroOrMore>
+        </element>
+    </optional>
+</define>
+<define name="style-columns-attlist" combine="interleave">
+    <attribute name="fo:column-count">
+        <ref name="positiveInteger"/>
+    </attribute>
+</define>
+<define name="style-columns-attlist" combine="interleave">
+    <optional>
+        <attribute name="fo:column-gap">
+            <ref name="length"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-column">
+    <element name="style:column">
+        <ref name="style-column-attlist"/>
+    </element>
+</define>
+<define name="style-column-attlist" combine="interleave">
+    <attribute name="style:rel-width">
+        <ref name="relativeLength"/>
+    </attribute>
+</define>
+<define name="style-column-attlist" combine="interleave">
+    <optional>
+        <attribute name="fo:start-indent" a:defaultValue="0cm">
+            <ref name="length"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-column-attlist" combine="interleave">
+    <optional>
+        <attribute name="fo:end-indent" a:defaultValue="0cm">
+            <ref name="length"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-column-attlist" combine="interleave">
+    <optional>
+        <attribute name="fo:space-before" a:defaultValue="0cm">
+            <ref name="length"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-column-attlist" combine="interleave">
+    <optional>
+        <attribute name="fo:space-after" a:defaultValue="0cm">
+            <ref name="length"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-column-sep">
+    <element name="style:column-sep">
+        <ref name="style-column-sep-attlist"/>
+    </element>
+</define>
+<define name="style-column-sep-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:style" a:defaultValue="solid">
+            <choice>
+                <value>none</value>
+                <value>solid</value>
+                <value>dotted</value>
+                <value>dashed</value>
+                <value>dot-dashed</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-column-sep-attlist" combine="interleave">
+    <attribute name="style:width">
+        <ref name="length"/>
+    </attribute>
+</define>
+<define name="style-column-sep-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:height" a:defaultValue="100%">
+            <ref name="percent"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-column-sep-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:vertical-align" a:defaultValue="top">
+            <choice>
+                <value>top</value>
+                <value>middle</value>
+                <value>bottom</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-column-sep-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:color" a:defaultValue="#000000">
+            <ref name="color"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-section-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:protect" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-section-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="text:dont-balance-text-columns">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-section-properties-attlist" combine="interleave">
+    <ref name="common-writing-mode-attlist"/>
+</define>
+<define name="style-section-properties-elements" combine="interleave">
+    <zeroOrMore>
+        <ref name="text-notes-configuration"/>
+    </zeroOrMore>
+</define>
+<define name="style-table-properties">
+    <element name="style:table-properties">
+        <ref name="style-table-properties-content"/>
+    </element>
+</define>
+
+<define name="style-table-properties-content">
+    <ref name="style-properties-content"/>
+</define>
+
+<define name="style-table-properties-content-strict">
+    <ref name="style-table-properties-attlist"/>
+    <ref name="style-table-properties-elements"/>
+</define>
+<define name="style-table-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:width">
+            <ref name="positiveLength"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="style:rel-width">
+            <ref name="percent"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-table-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:align">
+            <choice>
+                <value>left</value>
+                <value>center</value>
+                <value>right</value>
+                <value>margins</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-table-properties-attlist" combine="interleave">
+    <ref name="common-horizontal-margin-attlist"/>
+</define>
+<define name="style-table-properties-attlist" combine="interleave">
+    <ref name="common-vertical-margin-attlist"/>
+</define>
+<define name="style-table-properties-attlist" combine="interleave">
+    <ref name="common-margin-attlist"/>
+</define>
+<define name="style-table-properties-attlist" combine="interleave">
+    <ref name="common-page-number-attlist"/>
+</define>
+<define name="style-table-properties-attlist" combine="interleave">
+    <ref name="common-break-attlist"/>
+</define>
+<define name="style-table-properties-attlist" combine="interleave">
+    <ref name="common-background-color-attlist"/>
+</define>
+<define name="style-table-properties-elements" combine="interleave">
+    <ref name="style-background-image"/>
+</define>
+<define name="style-table-properties-attlist" combine="interleave">
+    <ref name="common-shadow-attlist"/>
+</define>
+<define name="style-table-properties-attlist" combine="interleave">
+    <ref name="common-keep-with-next-attlist"/>
+</define>
+<define name="style-table-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:may-break-between-rows">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-table-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:border-model">
+            <choice>
+                <value>collapsing</value>
+                <value>separating</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-table-properties-attlist" combine="interleave">
+    <ref name="common-writing-mode-attlist"/>
+</define>
+<define name="style-table-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:display">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-table-column-properties">
+    <element name="style:table-column-properties">
+        <ref name="style-table-column-properties-content"/>
+    </element>
+</define>
+
+<define name="style-table-column-properties-content">
+    <ref name="style-properties-content"/>
+</define>
+
+<define name="style-table-column-properties-content-strict">
+    <ref name="style-table-column-properties-attlist"/>
+    <ref name="style-table-column-properties-elements"/>
+</define>
+
+<define name="style-table-column-properties-elements">
+    <empty/>
+</define>
+<define name="style-table-column-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:column-width">
+            <ref name="positiveLength"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="style:rel-column-width">
+            <ref name="relativeLength"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-table-column-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:use-optimal-column-width">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-table-column-properties-attlist" combine="interleave">
+    <ref name="common-break-attlist"/>
+</define>
+<define name="style-table-row-properties">
+    <element name="style:table-row-properties">
+        <ref name="style-table-row-properties-content"/>
+    </element>
+</define>
+
+<define name="style-table-row-properties-content">
+    <ref name="style-properties-content"/>
+</define>
+
+<define name="style-table-row-properties-content-strict">
+    <ref name="style-table-row-properties-attlist"/>
+    <ref name="style-table-row-properties-elements"/>
+</define>
+<define name="style-table-row-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:row-height">
+            <ref name="positiveLength"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="style:min-row-height">
+            <ref name="nonNegativeLength"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-table-row-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:use-optimal-row-height">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-table-row-properties-attlist" combine="interleave">
+    <ref name="common-background-color-attlist"/>
+</define>
+<define name="style-table-row-properties-elements" combine="interleave">
+    <ref name="style-background-image"/>
+</define>
+<define name="style-table-row-properties-attlist" combine="interleave">
+    <ref name="common-break-attlist"/>
+</define>
+<define name="style-table-row-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="fo:keep-together">
+            <choice>
+                <value>auto</value>
+                <value>always</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-table-cell-properties">
+    <element name="style:table-cell-properties">
+        <ref name="style-table-cell-properties-content"/>
+    </element>
+</define>
+
+<define name="style-table-cell-properties-content">
+    <ref name="style-properties-content"/>
+</define>
+
+<define name="style-table-cell-properties-content-strict">
+    <ref name="style-table-cell-properties-attlist"/>
+    <ref name="style-table-cell-properties-elements"/>
+</define>
+<define name="style-table-cell-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:vertical-align">
+            <choice>
+                <value>top</value>
+                <value>middle</value>
+                <value>bottom</value>
+                <value>automatic</value>
+            </choice>
+            </attribute>
+    </optional>
+</define>
+<define name="style-table-cell-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:text-align-source">
+            <choice>
+                <value>fix</value>
+                <value>value-type</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-table-cell-properties-attlist" combine="interleave">
+    <ref name="common-style-direction-attlist"/>
+</define>
+
+<define name="common-style-direction-attlist">
+    <optional>
+        <attribute name="style:direction">
+            <choice>
+                <value>ltr</value>
+                <value>ttb</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-table-cell-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:glyph-orientation-vertical">
+            <choice>
+                <value>auto</value>
+                <value>0</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-table-cell-properties-attlist" combine="interleave">
+    <ref name="common-shadow-attlist"/>
+</define>
+<define name="style-table-cell-properties-attlist" combine="interleave">
+    <ref name="common-background-color-attlist"/>
+</define>
+<define name="style-table-cell-properties-elements" combine="interleave">
+    <ref name="style-background-image"/>
+</define>
+<define name="style-table-cell-properties-attlist" combine="interleave">
+    <ref name="common-border-attlist"/>
+</define>
+<define name="style-table-cell-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:diagonal-tl-br">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="style:diagonal-tl-br-widths">
+            <ref name="borderWidths"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="style:diagonal-bl-tr">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="style:diagonal-bl-tr-widths">
+            <ref name="borderWidths"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-table-cell-properties-attlist" combine="interleave">
+    <ref name="common-border-line-width-attlist"/>
+</define>
+<define name="style-table-cell-properties-attlist" combine="interleave">
+    <ref name="common-padding-attlist"/>
+</define>
+<define name="style-table-cell-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="fo:wrap-option">
+            <choice>
+                <value>no-wrap</value>
+                <value>wrap</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-table-cell-properties-attlist" combine="interleave">
+    <ref name="common-rotation-angle-attlist"/>
+</define>
+
+<define name="common-rotation-angle-attlist">
+    <optional>
+        <attribute name="style:rotation-angle">
+            <ref name="nonNegativeInteger"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-table-cell-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:rotation-align">
+            <choice>
+                <value>none</value>
+                <value>bottom</value>
+                <value>top</value>
+                <value>center</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-table-cell-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:cell-protect">
+            <choice>
+                <value>none</value>
+                <value>hidden-and-protected</value>
+                <list>
+                    <oneOrMore>
+                        <choice>
+                            <value>protected</value>
+                            <value>formula-hidden</value>
+                        </choice>
+                    </oneOrMore>
+                </list>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-table-cell-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:print-content">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-table-cell-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:decimal-places">
+            <ref name="nonNegativeInteger"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-table-cell-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:repeat-content">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-table-cell-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:shrink-to-fit">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-list-level-properties">
+    <element name="style:list-level-properties">
+        <ref name="style-list-level-properties-content"/>
+    </element>
+</define>
+
+<define name="style-list-level-properties-content">
+    <ref name="style-properties-content"/>
+</define>
+
+<define name="style-list-level-properties-content-strict">
+    <ref name="style-list-level-properties-attlist"/>
+    <ref name="style-list-level-properties-elements"/>
+</define>
+
+<define name="style-list-level-properties-elements">
+    <empty/>
+</define>
+<define name="style-list-level-properties-attlist" combine="interleave">
+    <ref name="common-text-align"/>
+</define>
+<define name="style-list-level-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="text:space-before">
+            <ref name="nonNegativeLength"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-list-level-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="text:min-label-width">
+            <ref name="nonNegativeLength"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-list-level-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="text:min-label-distance">
+            <ref name="nonNegativeLength"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-list-level-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:font-name">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-list-level-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="fo:width">
+            <ref name="positiveLength"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="fo:height">
+            <ref name="positiveLength"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-list-level-properties-attlist" combine="interleave">
+    <ref name="common-vertical-rel-attlist"/>
+    <ref name="common-vertical-pos-attlist"/>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:stroke">
+            <choice>
+                <value>none</value>
+                <value>dash</value>
+                <value>solid</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:stroke-dash">
+            <ref name="styleNameRef"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:stroke-dash-names">
+            <ref name="styleNameRefs"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="svg:stroke-width">
+            <ref name="length"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="svg:stroke-color">
+            <ref name="color"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:marker-start">
+            <ref name="styleNameRef"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:marker-end">
+            <ref name="styleNameRef"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:marker-start-width">
+            <ref name="length"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:marker-end-width">
+            <ref name="length"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:marker-start-center">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:marker-end-center">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="svg:stroke-opacity">
+            <choice>
+                <data type="double">
+                    <param name="minInclusive">0</param>
+                    <param name="maxInclusive">1</param>
+                </data>
+                <ref name="percent"/>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:stroke-linejoin">
+            <choice>
+                <value>miter</value>
+                <value>round</value>
+                <value>bevel</value>
+                <value>middle</value>
+                <value>none</value>
+                <value>inherit</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-fill-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:fill">
+            <choice>
+                <value>none</value>
+                <value>solid</value>
+                <value>bitmap</value>
+                <value>gradient</value>
+                <value>hatch</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-fill-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:fill-color">
+            <ref name="color"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-fill-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:secondary-fill-color">
+            <ref name="color"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-fill-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:fill-gradient-name">
+            <ref name="styleNameRef"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-fill-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:gradient-step-count">
+            <ref name="nonNegativeInteger"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-fill-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:fill-hatch-name">
+            <ref name="styleNameRef"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-fill-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:fill-hatch-solid">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-fill-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:fill-image-name">
+            <ref name="styleNameRef"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-fill-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:repeat">
+            <choice>
+                <value>no-repeat</value>
+                <value>repeat</value>
+                <value>stretch</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-fill-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:fill-image-width">
+            <choice>
+                <ref name="length"/>
+                <ref name="percent"/>
+            </choice>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="draw:fill-image-height">
+            <choice>
+                <ref name="length"/>
+                <ref name="percent"/>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-fill-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:fill-image-ref-point-x">
+            <ref name="percent"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="draw:fill-image-ref-point-y">
+            <ref name="percent"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="draw:fill-image-ref-point">
+            <choice>
+                <value>top-left</value>
+                <value>top</value>
+                <value>top-right</value>
+                <value>left</value>
+                <value>center</value>
+                <value>right</value>
+                <value>bottom-left</value>
+                <value>bottom</value>
+                <value>bottom-right</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-fill-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:tile-repeat-offset"/>
+    </optional>
+</define>
+<define name="style-graphic-fill-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:opacity">
+            <ref name="percent"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-fill-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:opacity-name">
+            <ref name="styleNameRef"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-fill-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="svg:fill-rule">
+            <choice>
+                <value>nonzero</value>
+                <value>evenodd</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:symbol-color">
+            <ref name="color"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="text:animation">
+            <choice>
+                <value>none</value>
+                <value>scroll</value>
+                <value>alternate</value>
+                <value>slide</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="text:animation-direction">
+            <choice>
+                <value>left</value>
+                <value>right</value>
+                <value>up</value>
+                <value>down</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="text:animation-start-inside">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="text:animation-stop-inside">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="text:animation-repeat">
+            <ref name="nonNegativeInteger"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="text:animation-delay">
+            <ref name="duration"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="text:animation-steps">
+            <ref name="length"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:auto-grow-width">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="draw:auto-grow-height">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:fit-to-size">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:fit-to-contour">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:textarea-vertical-align">
+            <choice>
+                <value>top</value>
+                <value>middle</value>
+                <value>bottom</value>
+                <value>justify</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:textarea-horizontal-align">
+            <choice>
+                <value>left</value>
+                <value>center</value>
+                <value>right</value>
+                <value>justify</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="fo:wrap-option">
+            <choice>
+                <value>no-wrap</value>
+                <value>wrap</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-elements" combine="interleave">
+    <optional>
+        <ref name="text-list-style"/>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:color-mode">
+            <choice>
+                <value>greyscale</value>
+                <value>mono</value>
+                <value>watermark</value>
+                <value>standard</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:color-inversion">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:luminance">
+            <ref name="percent"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:contrast">
+            <ref name="percent"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:gamma">
+            <ref name="percent"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:red">
+            <ref name="percent"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:green">
+            <ref name="percent"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:blue">
+            <ref name="percent"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:image-opacity">
+            <ref name="percent"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:shadow">
+            <choice>
+                <value>visible</value>
+                <value>hidden</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:shadow-offset-x">
+            <ref name="length"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="draw:shadow-offset-y">
+            <ref name="length"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:shadow-color">
+            <ref name="color"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:shadow-opacity">
+            <ref name="percent"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:start-line-spacing-horizontal">
+            <ref name="distance"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="draw:start-line-spacing-vertical">
+            <ref name="distance"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:end-line-spacing-horizontal">
+            <ref name="distance"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="draw:end-line-spacing-vertical">
+            <ref name="distance"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:line-distance">
+            <ref name="distance"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:guide-overhang">
+            <ref name="length"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:guide-distance">
+            <ref name="distance"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:start-guide">
+            <ref name="length"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:end-guide">
+            <ref name="length"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:placing">
+            <choice>
+                <value>below</value>
+                <value>above</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:parallel">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:measure-align">
+            <choice>
+                <value>automatic</value>
+                <value>left-outside</value>
+                <value>inside</value>
+                <value>right-outside</value>
+            </choice>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="draw:measure-vertical-align">
+            <choice>
+                <value>automatic</value>
+                <value>above</value>
+                <value>below</value>
+                <value>center</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:unit">
+            <choice>
+                <value>automatic</value>
+                <value>mm</value>
+                <value>cm</value>
+                <value>m</value>
+                <value>km</value>
+                <value>pt</value>
+                <value>pc</value>
+                <value>inch</value>
+                <value>ft</value>
+                <value>mi</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:show-unit">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:decimal-places">
+            <ref name="nonNegativeInteger"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:caption-type">
+            <choice>
+                <value>straight-line</value>
+                <value>angled-line</value>
+                <value>angled-connector-line</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:caption-angle-type">
+            <choice>
+                <value>fixed</value>
+                <value>free</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:caption-angle">
+            <ref name="nonNegativeInteger"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:caption-gap">
+            <ref name="distance"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:caption-escape-direction">
+            <choice>
+                <value>horizontal</value>
+                <value>vertical</value>
+                <value>auto</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:caption-escape">
+            <choice>
+                <ref name="length"/>
+                <ref name="percent"/>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:caption-line-length">
+            <ref name="length"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:caption-fit-line-length">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="dr3d:horizontal-segments">
+            <ref name="nonNegativeInteger"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="dr3d:vertical-segments">
+            <ref name="nonNegativeInteger"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="dr3d:edge-rounding">
+            <ref name="percent"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="dr3d:edge-rounding-mode">
+            <choice>
+                <value>correct</value>
+                <value>attractive</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="dr3d:back-scale">
+            <ref name="percent"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="dr3d:depth">
+            <ref name="length"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="dr3d:backface-culling">
+            <choice>
+                <value>enabled</value>
+                <value>disabled</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="dr3d:end-angle">
+            <ref name="nonNegativeInteger"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="dr3d:close-front">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="dr3d:close-back">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="dr3d:lighting-mode">
+            <choice>
+                <value>standard</value>
+                <value>double-sided</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="dr3d:normals-kind">
+            <choice>
+                <value>object</value>
+                <value>flat</value>
+                <value>sphere</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="dr3d:normals-direction">
+            <choice>
+                <value>normal</value>
+                <value>inverse</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="dr3d:texture-generation-mode-x">
+            <choice>
+                <value>object</value>
+                <value>parallel</value>
+                <value>sphere</value>
+            </choice>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="dr3d:texture-generation-mode-y">
+            <choice>
+                <value>object</value>
+                <value>parallel</value>
+                <value>sphere</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="dr3d:texture-kind">
+            <choice>
+                <value>luminance</value>
+                <value>intesity</value>
+                <value>color</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="dr3d:texture-filter">
+            <choice>
+                <value>enabled</value>
+                <value>disabled</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="dr3d:texture-mode">
+            <choice>
+                <value>replace</value>
+                <value>modulate</value>
+                <value>blend</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="dr3d:ambient-color">
+            <ref name="color"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="dr3d:emissive-color">
+            <ref name="color"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="dr3d:specular-color">
+            <ref name="color"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="dr3d:diffuse-color">
+            <ref name="color"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="dr3d:shininess">
+            <ref name="percent"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="dr3d:shadow">
+            <choice>
+                <value>visible</value>
+                <value>hidden</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <ref name="common-draw-rel-size-attlist"/>
+    <optional>
+        <attribute name="fo:min-width">
+            <choice>
+                <ref name="length"/>
+                <ref name="percent"/>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="fo:min-height">
+            <choice>
+                <ref name="length"/>
+                <ref name="percent"/>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="fo:max-height">
+            <choice>
+                <ref name="length"/>
+                <ref name="percent"/>
+            </choice>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="fo:max-width">
+            <choice>
+                <ref name="length"/>
+                <ref name="percent"/>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <ref name="common-horizontal-margin-attlist"/>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <ref name="common-vertical-margin-attlist"/>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <ref name="common-margin-attlist"/>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:print-content">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:protect">
+            <choice>
+                <value>none</value>
+                <list>
+                    <oneOrMore>
+                        <choice>
+                            <value>content</value>
+                            <value>position</value>
+                            <value>size</value>
+                        </choice>
+                    </oneOrMore>
+                </list>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:horizontal-pos">
+            <choice>
+                <value>left</value>
+                <value>center</value>
+                <value>right</value>
+                <value>from-left</value>
+                <value>inside</value>
+                <value>outside</value>
+                <value>from-inside</value>
+            </choice>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="svg:x">
+            <ref name="coordinate"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:horizontal-rel">
+            <choice>
+                    <value>page</value>
+                <value>page-content</value>
+                <value>page-start-margin</value>
+                <value>page-end-margin</value>
+                <value>frame</value>
+                <value>frame-content</value>
+                <value>frame-start-margin</value>
+                <value>frame-end-margin</value>
+                <value>paragraph</value>
+                <value>paragraph-content</value>
+                <value>paragraph-start-margin</value>
+                <value>paragraph-end-margin</value>
+                <value>char</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <ref name="common-vertical-pos-attlist"/>
+</define>
+
+<define name="common-vertical-pos-attlist">
+    <optional>
+        <attribute name="style:vertical-pos">
+            <choice>
+                <value>top</value>
+                <value>middle</value>
+                <value>bottom</value>
+                <value>from-top</value>
+                <value>below</value>
+            </choice>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="svg:y">
+            <ref name="coordinate"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <ref name="common-vertical-rel-attlist"/>
+</define>
+
+<define name="common-vertical-rel-attlist">
+    <optional>
+        <attribute name="style:vertical-rel">
+            <choice>
+                <value>page</value>
+                <value>page-content</value>
+                <value>frame</value>
+                <value>frame-content</value>
+                <value>paragraph</value>
+                <value>paragraph-content</value>
+                <value>char</value>
+                <value>line</value>
+                <value>baseline</value>
+                <value>text</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <ref name="common-text-anchor-attlist"/>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <ref name="common-border-attlist"/>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <ref name="common-border-line-width-attlist"/>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <ref name="common-padding-attlist"/>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <ref name="common-shadow-attlist"/>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <ref name="common-background-color-attlist"/>
+</define>
+<define name="style-graphic-properties-elements" combine="interleave">
+    <ref name="style-background-image"/>
+</define>
+<define name="style-graphic-properties-elements" combine="interleave">
+    <ref name="style-columns"/>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:editable">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:wrap">
+            <choice>
+                <value>none</value>
+                <value>left</value>
+                <value>right</value>
+                <value>parallel</value>
+                <value>dynamic</value>
+                <value>run-through</value>
+                <value>biggest</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:wrap-dynamic-treshold">
+            <ref name="nonNegativeLength"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:number-wrapped-paragraphs">
+            <choice>
+                <value>no-limit</value>
+                <ref name="positiveInteger"/>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:wrap-contour">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:wrap-contour-mode">
+            <choice>
+                <value>full</value>
+                <value>outside</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:run-through">
+            <choice>
+                <value>foreground</value>
+                <value>background</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:flow-with-text">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:overflow-behavior">
+            <choice>
+                <value>clip</value>
+                <value>auto-create-new-frame</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:mirror">
+            <choice>
+                <value>none</value>
+                <value>vertical</value>
+                <ref name="horizontal-mirror"/>
+                <list>
+                    <value>vertical</value>
+                    <ref name="horizontal-mirror"/>
+                </list>
+                <list>
+                    <ref name="horizontal-mirror"/>
+                    <value>vertical</value>
+                </list>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+
+<define name="horizontal-mirror">
+    <choice>
+        <value>horizontal</value>
+        <value>horizontal-on-odd</value>
+        <value>horizontal-on-even</value>
+    </choice>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="fo:clip">
+            <!-- The attribute value must match the one XSL's clip -->
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:wrap-influence-on-position"
+                    a:defaultValue="iterative">
+            <choice>
+                <value>iterative</value>
+                <value>once-concurrent</value>
+                <value>once-successive</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:frame-display-scrollbar">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:frame-display-border">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:frame-margin-horizontal">
+            <ref name="nonNegativePixelLength"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="draw:frame-margin-vertical">
+            <ref name="nonNegativePixelLength"/>
+        </attribute>
+    </optional>
+</define>
+
+<define name="nonNegativePixelLength">
+    <data type="string">
+        <param name="pattern">([0-9]+(\.[0-9]*)?|\.[0-9]+)(px)</param>
+    </data>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:visible-area-left">
+            <ref name="nonNegativeLength"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="draw:visible-area-top">
+            <ref name="nonNegativeLength"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="draw:visible-area-width">
+            <ref name="positiveLength"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="draw:visible-area-height">
+            <ref name="positiveLength"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:ole-draw-aspect">
+            <ref name="nonNegativeInteger"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-chart-properties">
+    <element name="style:chart-properties">
+        <ref name="style-chart-properties-content"/>
+    </element>
+</define>
+
+<define name="style-chart-properties-content">
+    <ref name="style-properties-content"/>
+</define>
+
+<define name="style-chart-properties-content-strict">
+    <ref name="style-chart-properties-attlist"/>
+    <ref name="style-chart-properties-elements"/>
+</define>
+
+<define name="style-chart-properties-elements">
+    <empty/>
+</define>
+<define name="style-chart-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="chart:scale-text" a:defaultValue="true">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-chart-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="chart:three-dimensional">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-chart-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="chart:deep">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-chart-properties-attlist" combine="interleave">
+    <choice>
+        <attribute name="chart:symbol-type">
+            <value>none</value>
+        </attribute>
+        <attribute name="chart:symbol-type">
+            <value>automatic</value>
+        </attribute>
+        <group>
+            <attribute name="chart:symbol-type">
+                <value>named-symbol</value>
+            </attribute>
+            <attribute name="chart:symbol-name">
+                <choice>
+                    <value>square</value>
+                    <value>diamond</value>
+                    <value>arrow-down</value>
+                    <value>arrow-up</value>
+                    <value>arrow-right</value>
+                    <value>arrow-left</value>
+                    <value>bow-tie</value>
+                    <value>hourglass</value>
+                    <value>circle</value>
+                    <value>star</value>
+                    <value>x</value>
+                    <value>plus</value>
+                    <value>asterisk</value>
+                    <value>horizontal-bar</value>
+                    <value>vertical-bar</value>
+                </choice>
+            </attribute>
+        </group>
+        <group>
+            <attribute name="chart:symbol-type">
+                <value>image</value>
+            </attribute>
+            <element name="chart:symbol-image">
+                <attribute name="xlink:href">
+                    <ref name="anyURI"/>
+                </attribute>
+            </element>
+        </group>
+        <empty/>
+    </choice>
+</define>
+<define name="style-chart-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="chart:symbol-width">
+            <ref name="nonNegativeLength"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="chart:symbol-height">
+            <ref name="nonNegativeLength"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-chart-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="chart:vertical" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-chart-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="chart:connect-bars" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-chart-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="chart:gap-width">
+            <ref name="integer"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="chart:overlap">
+            <ref name="integer"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-chart-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="chart:japanese-candle-stick"
+                    a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-chart-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="chart:interpolation" a:defaultValue="none">
+            <choice>
+                <value>none</value>
+                <value>cubic-spline</value>
+                <value>b-spline</value>
+            </choice>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="chart:spline-order" a:defaultValue="2">
+            <ref name="positiveInteger"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="chart:spline-resolution" a:defaultValue="20">
+            <ref name="positiveInteger"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-chart-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="chart:pie-offset" a:defaultValue="0">
+            <ref name="nonNegativeInteger"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-chart-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="chart:lines" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-chart-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="chart:solid-type" a:defaultValue="cuboid">
+            <choice>
+                <value>cuboid</value>
+                <value>cylinder</value>
+                <value>cone</value>
+                <value>pyramid</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-chart-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="chart:stacked" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="chart:percentage" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-chart-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="chart:link-data-style-to-source">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-chart-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="chart:visible">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-chart-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="chart:logarithmic">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-chart-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="chart:maximum">
+            <ref name="double"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="chart:minimum">
+            <ref name="double"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="chart:origin">
+            <ref name="double"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="chart:interval-major">
+            <ref name="double"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="chart:interval-minor">
+            <ref name="positiveInteger"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-chart-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="chart:tick-marks-major-inner">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="chart:tick-marks-major-outer">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="chart:tick-marks-minor-inner">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="chart:tick-marks-minor-outer">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-chart-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="chart:display-label">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="chart:text-overlap">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="text:line-break">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="chart:label-arrangement"
+                   a:defaultValue="side-by-side">
+            <choice>
+                <value>side-by-side</value>
+                <value>stagger-even</value>
+                <value>stagger-odd</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-chart-properties-attlist" combine="interleave">
+    <ref name="common-style-direction-attlist"/>
+</define>
+<define name="style-chart-properties-attlist" combine="interleave">
+    <ref name="common-rotation-angle-attlist"/>
+</define>
+<define name="style-chart-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="chart:data-label-number">
+            <choice>
+                <value>none</value>
+                <value>value</value>
+                <value>percentage</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-chart-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="chart:data-label-text">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-chart-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="chart:data-label-symbol">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-chart-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="chart:mean-value">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-chart-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="chart:error-category" a:defaultValue="none">
+            <choice>
+                <value>none</value>
+                <value>variance</value>
+                <value>standard-deviation</value>
+                <value>percentage</value>
+                <value>error-margin</value>
+                <value>constant</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-chart-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="chart:error-percentage">
+            <ref name="double"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-chart-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="chart:error-margin">
+            <ref name="double"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-chart-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="chart:error-lower-limit">
+            <ref name="double"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="chart:error-upper-limit">
+            <ref name="double"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-chart-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="chart:error-upper-indicator">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="chart:error-lower-indicator">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-chart-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="chart:series-source" a:defaultValue="columns">
+            <choice>
+                <value>columns</value>
+                <value>rows</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-chart-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="chart:regression-type" a:defaultValue="none">
+            <choice>
+                <value>none</value>
+                <value>linear</value>
+                <value>logarithmic</value>
+                <value>exponential</value>
+                <value>power</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-drawing-page-properties-attlist"
+        combine="interleave">
+    <optional>
+        <attribute name="presentation:transition-type">
+            <choice>
+                <value>manual</value>
+                <value>automatic</value>
+                <value>semi-automatic</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-drawing-page-properties-attlist"
+         combine="interleave">
+    <optional>
+        <attribute name="presentation:transition-style">
+            <choice>
+                <value>none</value>
+                <value>fade-from-left</value>
+                <value>fade-from-top</value>
+                <value>fade-from-right</value>
+                <value>fade-from-bottom</value>
+                <value>fade-from-upperleft</value>
+                <value>fade-from-upperright</value>
+                <value>fade-from-lowerleft</value>
+                <value>fade-from-lowerright</value>
+                <value>move-from-left</value>
+                <value>move-from-top</value>
+                <value>move-from-right</value>
+                <value>move-from-bottom</value>
+                <value>move-from-upperleft</value>
+                <value>move-from-upperright</value>
+                <value>move-from-lowerleft</value>
+                <value>move-from-lowerright</value>
+                <value>uncover-to-left</value>
+                <value>uncover-to-top</value>
+                <value>uncover-to-right</value>    
+                <value>uncover-to-bottom</value>
+                <value>uncover-to-upperleft</value>
+                <value>uncover-to-upperright</value>
+                <value>uncover-to-lowerleft</value>
+                <value>uncover-to-lowerright</value>
+                <value>fade-to-center</value>
+                <value>fade-from-center</value>
+                <value>vertical-stripes</value>
+                <value>horizontal-stripes</value>
+                <value>clockwise</value>
+                <value>counterclockwise</value>
+                <value>open-vertical</value>
+                <value>open-horizontal</value>
+                <value>close-vertical</value>
+                <value>close-horizontal</value>
+                <value>wavyline-from-left</value>
+                <value>wavyline-from-top</value>
+                <value>wavyline-from-right</value>
+                <value>wavyline-from-bottom</value>
+                <value>spiralin-left</value>
+                <value>spiralin-right</value>
+                <value>spiralout-left</value>
+                <value>spiralout-right</value>
+                <value>roll-from-top</value>
+                <value>roll-from-left</value>
+                <value>roll-from-right</value>
+                <value>roll-from-bottom</value>
+                <value>stretch-from-left</value>
+                <value>stretch-from-top</value>
+                <value>stretch-from-right</value>
+                <value>stretch-from-bottom</value>
+
+                <value>vertical-lines</value>
+                <value>horizontal-lines</value>
+                <value>dissolve</value>
+                <value>random</value>
+                <value>vertical-checkerboard</value>
+                <value>horizontal-checkerboard</value>
+                <value>interlocking-horizontal-left</value>
+                <value>interlocking-horizontal-right</value>
+                <value>interlocking-vertical-top</value>
+                <value>interlocking-vertical-bottom</value>
+                <value>fly-away</value>
+                <value>open</value>
+                <value>close</value>
+                <value>melt</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-drawing-page-properties-attlist"
+        combine="interleave">
+    <optional>
+        <attribute name="presentation:transition-speed">
+            <ref name="presentationSpeeds"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-drawing-page-properties-attlist " combine="interleave">
+    <optional>
+        <attribute name="smil:type">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-drawing-page-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="smil:subtype">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-drawing-page-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="smil:direction" a:defaultValue="forward">
+            <choice>
+                <value>forward</value>
+                <value>reverse</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-drawing-page-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="smil:fadeColor">
+            <choice>
+                <value>forward</value>
+                <value>reverse</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-drawing-page-properties-attlist"
+        combine="interleave">
+    <optional>
+        <attribute name="presentation:duration">
+            <ref name="duration"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-drawing-page-properties-attlist"
+         combine="interleave">
+    <optional>
+        <attribute name="presentation:visibility">
+            <choice>
+                <value>visible</value>
+                <value>hidden</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-drawing-page-properties-elements"
+         combine="interleave">
+    <optional>
+        <ref name="presentation-sound"/>
+    </optional>
+</define>
+<define name="style-drawing-page-properties-attlist"
+         combine="interleave">
+    <optional>
+        <attribute name="draw:background-size">
+            <choice>
+                <value>full</value>
+                <value>border</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-drawing-page-properties-attlist"
+         combine="interleave">
+    <optional>
+        <attribute name="presentation:background-objects-visible">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-drawing-page-properties-attlist"
+         combine="interleave">
+    <optional>
+        <attribute name="presentation:background-visible">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-drawing-page-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="presentation:display-header">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-drawing-page-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="presentation:display-footer">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-drawing-page-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="presentation:display-page-number">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-drawing-page-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="presentation:display-date-time">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="string">
+    <data type="string"/>
+</define>
+<define name="date">
+    <data type="date"/>
+</define>
+<define name="time">
+    <data type="time"/>
+</define>
+<define name="dateTime">
+    <data type="dateTime"/>
+</define>
+<define name="duration">
+    <data type="duration"/>
+</define>
+<define name="integer">
+    <data type="integer"/>
+</define>
+<define name="nonNegativeInteger">
+    <data type="nonNegativeInteger"/>
+</define>
+<define name="positiveInteger">
+    <data type="positiveInteger"/>
+</define>
+<define name="double">
+    <data type="double"/>
+</define>
+<define name="anyURI">
+    <data type="anyURI"/>
+</define>
+<define name="base64Binary">
+    <data type="base64Binary"/>
+</define>
+<define name="ID">
+    <data type="ID"/>
+</define>
+<define name="IDREF">
+    <data type="IDREF"/>
+</define>
+<define name="boolean">
+    <choice>
+        <value>true</value>
+        <value>false</value>
+    </choice>
+</define>
+<define name="dateOrDateTime">
+    <choice>
+        <data type="date"/>
+        <data type="dateTime"/>
+    </choice>
+</define>
+<define name="timeOrDateTime">
+    <choice>
+        <data type="time"/>
+        <data type="dateTime"/>
+    </choice>
+</define>
+<define name="language">
+    <data type="token">
+        <param name="pattern">[A-Za-z]{1,8}(-[A-Za-z0-9]{1,8})*</param>
+    </data>
+</define>
+<define name="countryCode">
+    <data type="token">
+        <param name="pattern">[A-Za-z0-9]{1,8}</param>
+    </data>
+</define>
+<define name="languageCode">
+    <data type="token">
+        <param name="pattern">[A-Za-z]{1,8}</param>
+    </data>
+</define>
+<define name="character">
+    <data type="string">
+        <param name="length">1</param>
+    </data>
+</define>
+<define name="length">
+    <data type="string">
+        <param name="pattern">-?([0-9]+(\.[0-9]*)?|\.[0-9]+)((cm)|(mm)|(in)|(pt)|(pc)|(px))</param>
+
+    </data>
+</define>
+<define name="nonNegativeLength">
+    <data type="string">
+        <param name="pattern">([0-9]+(\.[0-9]*)?|\.[0-9]+)((cm)|(mm)|(in)|(pt)|(pc)|(px))</param>
+
+    </data>
+</define>
+<define name="positiveLength">
+    <data type="string">
+        <!-- A zero value is not allowed here -->
+        <param name="pattern">([0-9]+(\.[0-9]*)?|\.[0-9]+)((cm)|(mm)|(in)|(pt)|(pc)|(px))</param>
+
+    </data>
+</define>
+<define name="percent">
+    <data type="string">
+        <param name="pattern">-?([0-9]+(\.[0-9]*)?|\.[0-9]+)%</param>
+    </data>
+</define>
+<define name="relativeLength">
+    <data type="string">
+        <param name="pattern">[0-9]+\*</param>
+    </data>
+</define>
+<define name="coordinate">
+    <ref name="length"/>
+</define>
+<define name="distance">
+    <ref name="length"/>
+</define>
+<define name="color">
+    <data type="string">
+        <param name="pattern">#[0-9a-fA-F]{6}</param>
+    </data>
+</define>
+<define name="styleName">
+    <data type="NCName"/>
+</define>
+<define name="styleNameRef">
+    <choice>
+        <data type="NCName"/>
+        <empty/>
+    </choice>
+</define>
+<define name="styleNameRefs">
+    <list>
+        <zeroOrMore>
+            <data type="NCName"/>
+        </zeroOrMore>
+    </list>
+</define>
+<define name="variableName">
+    <data type="string"/>
+</define>
+<define name="formula">
+    <!-- A formula should start with a namespace prefix, -->
+    <!-- but has no restrictions-->
+    <data type="string"/>
+</define>
+
+<define name="targetFrameName">
+    <choice>
+        <value>_self</value>
+        <value>_blank</value>
+        <value>_parent</value>
+        <value>_top</value>
+        <ref name="string"/>
+    </choice>
+</define>
+
+<define name="valueType">
+    <choice>
+        <value>float</value>
+        <value>time</value>
+        <value>date</value>
+        <value>percentage</value>
+        <value>currency</value>
+        <value>boolean</value>
+        <value>string</value>
+    </choice>
+</define>
+
+<define name="points">
+    <data type="string">
+        <param name="pattern">-?[0-9]+,-?[0-9]+([ ]+-?[0-9]+,-?[0-9]+)*</param>
+    </data>
+</define>
+<define name="pathData">
+    <data type="string"/>
+</define>
+
+<define name="vector3D">
+    <data type="string">
+        <param name="pattern">\([ ]*-?([0-9]+(\.[0-9]*)?|\.[0-9]+)([ ]+-?([0-9]+(\.[0-9]*)?|\.[0-9]+)){2}[ ]*\)</param>
+
+    </data>
+</define>
+
+<define name="namespacedToken">
+    <data type="string">
+        <param name="pattern">[0-9a-zA-Z_]+:[0-9a-zA-Z._\-]+</param>
+    </data>
+</define>
+<define name="anyAttListOrElements">
+    <zeroOrMore>
+        <attribute>
+            <anyName/>
+            <text/>
+        </attribute>
+    </zeroOrMore>
+    <ref name="anyElements"/>
+</define>
+<define name="anyElements">
+    <zeroOrMore>
+        <element>
+            <anyName/>
+            <mixed>
+                <ref name="anyAttListOrElements"/>
+            </mixed>
+        </element>
+    </zeroOrMore>
+</define>
+</grammar>
diff --git a/apps/files_odfviewer/src/webodf/programs/docnosis/OpenDocument-schema-v1.1.rng b/apps/files_odfviewer/src/webodf/programs/docnosis/OpenDocument-schema-v1.1.rng
new file mode 100644
index 0000000000..3ba6a687c4
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/programs/docnosis/OpenDocument-schema-v1.1.rng
@@ -0,0 +1,17891 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    OASIS OpenDocument v1.1
+    OASIS Standard, 1 Feb 2007
+    Relax-NG Schema
+
+    $Id$
+
+    © 2002-2007 OASIS Open
+    © 1999-2007 Sun Microsystems, Inc.
+-->
+
+<grammar
+    xmlns="http://relaxng.org/ns/structure/1.0"
+    xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
+
+    datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
+
+    xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
+    xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0"
+    xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0"
+    xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
+    xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0"
+    xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
+    xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0"
+    xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0"
+    xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
+    xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0"
+    xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0"
+    xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
+    xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0"
+    xmlns:anim="urn:oasis:names:tc:opendocument:xmlns:animation:1.0"
+
+    xmlns:dc="http://purl.org/dc/elements/1.1/"
+    xmlns:xlink="http://www.w3.org/1999/xlink"
+    xmlns:math="http://www.w3.org/1998/Math/MathML"
+    xmlns:xforms="http://www.w3.org/2002/xforms"
+
+    xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0"
+    xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0"
+    xmlns:smil="urn:oasis:names:tc:opendocument:xmlns:smil-compatible:1.0"
+>
+<define name="office-process-content">
+    <optional>
+        <attribute name="office:process-content" a:defaultValue="true">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<start>
+    <choice>
+        <ref name="office-document"/>
+        <ref name="office-document-content"/>
+        <ref name="office-document-styles"/>
+        <ref name="office-document-meta"/>
+        <ref name="office-document-settings"/>
+    </choice>
+</start>
+<define name="office-document">
+    <element name="office:document">
+        <ref name="office-document-attrs"/>
+        <ref name="office-document-common-attrs"/>
+        <ref name="office-meta"/>
+        <ref name="office-settings"/>
+        <ref name="office-scripts"/>
+        <ref name="office-font-face-decls"/>
+        <ref name="office-styles"/>
+        <ref name="office-automatic-styles"/>
+        <ref name="office-master-styles"/>
+        <ref name="office-body"/>
+    </element>
+</define>
+<define name="office-document-content">
+    <element name="office:document-content">
+        <ref name="office-document-common-attrs"/>
+        <ref name="office-scripts"/>
+        <ref name="office-font-face-decls"/>
+        <ref name="office-automatic-styles"/>
+        <ref name="office-body"/>
+    </element>
+</define>
+<define name="office-document-styles">
+    <element name="office:document-styles">
+        <ref name="office-document-common-attrs"/>
+        <ref name="office-font-face-decls"/>
+        <ref name="office-styles"/>
+        <ref name="office-automatic-styles"/>
+        <ref name="office-master-styles"/>
+    </element>
+</define>
+<define name="office-document-meta">
+    <element name="office:document-meta">
+        <ref name="office-document-common-attrs"/>
+        <ref name="office-meta"/>
+    </element>
+</define>
+<define name="office-document-settings">
+    <element name="office:document-settings">
+        <ref name="office-document-common-attrs"/>
+        <ref name="office-settings"/>
+    </element>
+</define>
+<define name="office-document-common-attrs" combine="interleave">
+    <optional>
+        <attribute name="office:version">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="office-document-attrs" combine="interleave">
+    <attribute name="office:mimetype">
+        <ref name="string"/>
+    </attribute>
+</define>
+<define name="office-meta">
+    <optional>
+        <element name="office:meta">
+            <ref name="office-meta-content"/>
+        </element>
+    </optional>
+</define>
+
+<define name="office-meta-content">
+    <ref name="anyElements"/>
+</define>
+
+<define name="office-meta-content-strict">
+    <zeroOrMore>
+        <ref name="office-meta-data"/>
+    </zeroOrMore>
+</define>
+<define name="office-body">
+    <element name="office:body">
+        <ref name="office-body-content"/>
+    </element>
+</define>
+<define name="office-body-content" combine="choice">
+    <element name="office:text">
+        <ref name="office-text-attlist"/>
+        <ref name="office-text-content-prelude"/>
+        <zeroOrMore>
+            <ref name="office-text-content-main"/>
+        </zeroOrMore>
+        <ref name="office-text-content-epilogue"/>
+    </element>
+</define>
+<define name="office-text-content-prelude">
+    <ref name="office-forms"/>
+    <ref name="text-tracked-changes"/>
+    <ref name="text-decls"/>
+    <ref name="table-decls"/>
+</define>
+<define name="office-text-content-main">
+    <choice>
+        <zeroOrMore>
+            <ref name="text-content"/>
+        </zeroOrMore>
+        <group>
+            <ref name="text-page-sequence"/>
+            <zeroOrMore>
+                <choice>
+                    <ref name="draw-a"/>
+                    <ref name="shape"/>
+                </choice>
+            </zeroOrMore>
+        </group>
+    </choice>
+</define>
+
+<define name="text-content">
+    <choice>
+        <ref name="text-h"/>
+        <ref name="text-p"/>
+        <ref name="text-list"/>
+        <ref name="text-numbered-paragraph"/>
+        <ref name="table-table"/>
+        <ref name="draw-a"/>
+        <ref name="text-section"/>
+        <ref name="text-soft-page-break"/> 
+        <ref name="text-table-of-content"/>
+        <ref name="text-illustration-index"/>
+        <ref name="text-table-index"/>
+        <ref name="text-object-index"/>
+        <ref name="text-user-index"/>
+        <ref name="text-alphabetical-index"/>
+        <ref name="text-bibliography"/>
+        <ref name="shape"/>
+        <ref name="change-marks"/>
+    </choice>
+</define>
+<define name="office-text-content-epilogue">
+    <ref name="table-functions"/>
+</define>
+<define name="office-text-attlist" combine="interleave">
+    <optional>
+        <attribute name="text:global" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="office-text-attlist" combine="interleave">
+    <optional>
+        <attribute name="text:use-soft-page-breaks" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="office-body-content" combine="choice">
+    <element name="office:drawing">
+        <ref name="office-drawing-attlist"/>
+        <ref name="office-drawing-content-prelude"/>
+        <ref name="office-drawing-content-main"/>
+        <ref name="office-drawing-content-epilogue"/>
+    </element>
+</define>
+
+<define name="office-drawing-attlist">
+    <empty/>
+</define>
+<define name="office-drawing-content-prelude">
+    <ref name="text-decls"/>
+    <ref name="table-decls"/>
+</define>
+<define name="office-drawing-content-main">
+    <zeroOrMore>
+        <ref name="draw-page"/>
+    </zeroOrMore>
+</define>
+<define name="office-drawing-content-epilogue">
+    <ref name="table-functions"/>
+</define>
+<define name="office-body-content" combine="choice">
+    <element name="office:presentation">
+        <ref name="office-presentation-attlist"/>
+        <ref name="office-presentation-content-prelude"/>
+        <ref name="office-presentation-content-main"/>
+        <ref name="office-presentation-content-epilogue"/>
+    </element>
+</define>
+
+<define name="office-presentation-attlist">
+    <empty/>
+</define>
+<define name="office-presentation-content-prelude">
+    <ref name="text-decls"/>
+    <ref name="table-decls"/>
+    <ref name="presentation-decls"/>
+</define>
+<define name="office-presentation-content-main">
+    <zeroOrMore>
+        <ref name="draw-page"/>
+    </zeroOrMore>
+</define>
+<define name="office-presentation-content-epilogue">
+    <ref name="presentation-settings"/>
+    <ref name="table-functions"/>
+</define>
+<define name="office-body-content" combine="choice">
+    <element name="office:spreadsheet">
+        <ref name="office-spreadsheet-attlist"/>
+        <ref name="office-spreadsheet-content-prelude"/>
+        <ref name="office-spreadsheet-content-main"/>
+        <ref name="office-spreadsheet-content-epilogue"/>
+    </element>
+</define>
+<define name="office-spreadsheet-content-prelude">
+    <optional>
+        <ref name="table-tracked-changes"/>    
+    </optional>
+    <ref name="text-decls"/>
+    <ref name="table-decls"/>
+</define>
+
+<define name="table-decls">
+    <optional>
+        <ref name="table-calculation-settings"/>    
+    </optional>
+    <optional>
+        <ref name="table-content-validations"/>    
+    </optional>
+    <optional>
+        <ref name="table-label-ranges"/>    
+    </optional>
+</define>
+<define name="office-spreadsheet-content-main">
+    <zeroOrMore>
+        <ref name="table-table"/>
+    </zeroOrMore>
+</define>
+<define name="office-spreadsheet-content-epilogue">
+    <ref name="table-functions"/>    
+</define>
+
+<define name="table-functions">
+    <optional>
+        <ref name="table-named-expressions"/>    
+    </optional>
+    <optional>
+        <ref name="table-database-ranges"/>    
+    </optional>
+    <optional>
+        <ref name="table-data-pilot-tables"/>    
+    </optional>
+    <optional>
+        <ref name="table-consolidation"/>    
+    </optional>
+    <optional>
+        <ref name="table-dde-links"/>    
+    </optional>
+</define>
+<define name="office-body-content" combine="choice">
+    <element name="office:chart">
+        <ref name="office-chart-attlist"/>
+        <ref name="office-chart-content-prelude"/>
+        <ref name="office-chart-content-main"/>
+        <ref name="office-chart-content-epilogue"/>
+    </element>
+</define>
+
+<define name="office-chart-attlist">
+    <empty/>
+</define>
+<define name="office-chart-content-prelude">
+    <ref name="text-decls"/>
+    <ref name="table-decls"/>
+</define>
+<define name="office-chart-content-main">
+    <ref name="chart-chart"/>
+</define>
+<define name="office-chart-content-epilogue">
+    <ref name="table-functions"/>    
+</define>
+<define name="office-body-content" combine="choice">
+    <element name="office:image">
+        <ref name="office-image-attlist"/>
+        <ref name="office-image-content-prelude"/>
+        <ref name="office-image-content-main"/>
+        <ref name="office-image-content-epilogue"/>
+    </element>
+</define>
+
+<define name="office-image-attlist">
+    <empty/>
+</define>
+<define name="office-image-content-prelude">
+    <empty/>
+</define>
+<define name="office-image-content-main">
+    <ref name="draw-frame"/>
+</define>
+<define name="office-image-content-epilogue">
+    <empty/>
+</define>
+<define name="office-settings">
+    <optional>
+        <element name="office:settings">
+            <oneOrMore>
+                <ref name="config-config-item-set"/>
+            </oneOrMore>
+        </element>
+    </optional>
+</define>
+<define name="config-config-item-set">
+    <element name="config:config-item-set">
+        <ref name="config-config-item-set-attlist"/>
+        <ref name="config-items"/>
+    </element>
+</define>
+
+<define name="config-items">
+    <oneOrMore>
+        <choice>
+            <ref name="config-config-item"/>
+            <ref name="config-config-item-set"/>
+            <ref name="config-config-item-map-named"/>
+            <ref name="config-config-item-map-indexed"/>
+        </choice>
+    </oneOrMore>
+</define>
+<define name="config-config-item-set-attlist" combine="interleave">
+    <attribute name="config:name">
+        <ref name="string"/>
+    </attribute>
+</define>
+<define name="config-config-item">
+    <element name="config:config-item">
+        <ref name="config-config-item-attlist"/>
+        <text/>
+    </element>
+</define>
+<define name="config-config-item-attlist" combine="interleave">
+    <attribute name="config:name">
+        <ref name="string"/>
+    </attribute>
+</define>
+<define name="config-config-item-attlist" combine="interleave">
+    <attribute name="config:type">
+        <choice>
+            <value>boolean</value>
+            <value>short</value>
+            <value>int</value>
+            <value>long</value>
+            <value>double</value>
+            <value>string</value>
+            <value>datetime</value>
+            <value>base64Binary</value>
+        </choice>
+    </attribute>
+</define>
+<define name="config-config-item-map-indexed">
+    <element name="config:config-item-map-indexed">
+        <ref name="config-config-item-map-indexed-attlist"/>
+        <oneOrMore>
+            <ref name="config-config-item-map-entry"/>
+        </oneOrMore>
+    </element>
+</define>
+<define name="config-config-item-map-indexed-attlist" combine="interleave">
+    <attribute name="config:name">
+        <ref name="string"/>
+    </attribute>
+</define>
+<define name="config-config-item-map-entry">
+    <element name="config:config-item-map-entry">
+        <ref name="config-config-item-map-entry-attlist"/>
+        <ref name="config-items"/>
+    </element>
+</define>
+<define name="config-config-item-map-entry-attlist" combine="interleave">
+    <optional>
+        <attribute name="config:name">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="config-config-item-map-named">
+    <element name="config:config-item-map-named">
+        <ref name="config-config-item-map-named-attlist"/>
+        <oneOrMore>
+            <ref name="config-config-item-map-entry"/>
+        </oneOrMore>
+    </element>
+</define>
+<define name="config-config-item-map-named-attlist" combine="interleave">
+    <attribute name="config:name">
+        <ref name="string"/>
+    </attribute>
+</define>
+<define name="office-scripts">
+    <optional>
+        <element name="office:scripts">
+            <zeroOrMore>
+                <ref name="office-script"/>
+            </zeroOrMore>
+            <optional>
+                <ref name="office-event-listeners"/>
+            </optional>
+        </element>
+    </optional>
+</define>
+<define name="office-script">
+    <element name="office:script">
+        <ref name="office-script-attlist"/>
+        <mixed>
+            <ref name="anyElements"/>
+        </mixed>
+    </element>
+</define>
+<define name="office-script-attlist">
+    <attribute name="script:language">
+        <ref name="string"/>
+    </attribute>
+</define>
+<define name="office-font-face-decls">
+    <optional>
+        <element name="office:font-face-decls">
+            <zeroOrMore>
+                <ref name="style-font-face"/>
+            </zeroOrMore>
+        </element>
+    </optional>
+</define>
+<define name="office-styles">
+    <optional>
+        <element name="office:styles">
+            <interleave>
+                <ref name="styles"/>
+                <zeroOrMore>
+                    <ref name="style-default-style"/>
+                </zeroOrMore>
+                <optional>
+                    <ref name="text-outline-style"/>
+                </optional>
+                <zeroOrMore>
+                    <ref name="text-notes-configuration"/>
+                </zeroOrMore>
+                <optional>
+                    <ref name="text-bibliography-configuration"/>
+                </optional>
+                <optional>
+                    <ref name="text-linenumbering-configuration"/>
+                </optional>
+                <zeroOrMore>
+                    <ref name="draw-gradient"/>
+                </zeroOrMore>
+                <zeroOrMore>
+                    <ref name="svg-linearGradient"/>
+                </zeroOrMore>
+                <zeroOrMore>
+                    <ref name="svg-radialGradient"/>
+                </zeroOrMore>
+                <zeroOrMore>
+                    <ref name="draw-hatch"/>
+                </zeroOrMore>
+                <zeroOrMore>
+                    <ref name="draw-fill-image"/>
+                </zeroOrMore>
+                <zeroOrMore>
+                    <ref name="draw-marker"/>
+                </zeroOrMore>
+                <zeroOrMore>
+                    <ref name="draw-stroke-dash"/>
+                </zeroOrMore>
+                <zeroOrMore>
+                    <ref name="draw-opacity"/>
+                </zeroOrMore>
+                <zeroOrMore>
+                    <ref name="style-presentation-page-layout"/>
+                </zeroOrMore>
+            </interleave>
+        </element>
+    </optional>
+</define>
+<define name="office-automatic-styles">
+    <optional>
+        <element name="office:automatic-styles">
+            <interleave>
+                <ref name="styles"/>
+                <zeroOrMore>
+                    <ref name="style-page-layout"/>
+                </zeroOrMore>
+            </interleave>
+        </element>
+    </optional>
+</define>
+<define name="office-master-styles">
+    <optional>
+        <element name="office:master-styles">
+            <interleave>
+                <zeroOrMore>
+                    <ref name="style-master-page"/>
+                </zeroOrMore>
+                <optional>
+                    <ref name="style-handout-master"/>
+                </optional>
+                <optional>
+                    <ref name="draw-layer-set"/>
+                </optional>
+            </interleave>
+        </element>
+    </optional>
+</define>
+
+<define name="styles">
+    <interleave>
+        <zeroOrMore>
+            <ref name="style-style"/>
+        </zeroOrMore>
+        <zeroOrMore>
+            <ref name="text-list-style"/>
+        </zeroOrMore>
+        <zeroOrMore>
+            <ref name="number-number-style"/>
+        </zeroOrMore>
+        <zeroOrMore>
+            <ref name="number-currency-style"/>
+        </zeroOrMore>
+        <zeroOrMore>
+            <ref name="number-percentage-style"/>
+        </zeroOrMore>
+        <zeroOrMore>
+            <ref name="number-date-style"/>
+        </zeroOrMore>
+        <zeroOrMore>
+            <ref name="number-time-style"/>
+        </zeroOrMore>
+        <zeroOrMore>
+            <ref name="number-boolean-style"/>
+        </zeroOrMore>
+        <zeroOrMore>
+            <ref name="number-text-style"/>
+        </zeroOrMore>
+    </interleave>
+</define>
+<define name="office-meta-data" combine="choice">
+    <element name="meta:generator">
+        <ref name="string"/>
+    </element>
+</define>
+<define name="office-meta-data" combine="choice">
+    <element name="dc:title">
+        <ref name="string"/>
+    </element>
+</define>
+<define name="office-meta-data" combine="choice">
+    <element name="dc:description">
+        <ref name="string"/>
+    </element>
+</define>
+<define name="office-meta-data" combine="choice">
+    <element name="dc:subject">
+        <ref name="string"/>
+    </element>
+</define>
+<define name="office-meta-data" combine="choice">
+    <element name="meta:keyword">
+        <ref name="string"/>
+    </element>
+</define>
+<define name="office-meta-data" combine="choice">
+    <element name="meta:initial-creator">
+        <ref name="string"/>
+    </element>
+</define>
+<define name="office-meta-data" combine="choice">
+    <ref name="dc-creator"/>
+</define>
+<define name="dc-creator">
+    <element name="dc:creator">
+        <ref name="string"/>
+    </element>
+</define>
+<define name="office-meta-data" combine="choice">
+    <element name="meta:printed-by">
+        <ref name="string"/>
+    </element>
+</define>
+<define name="office-meta-data" combine="choice">
+    <element name="meta:creation-date">
+        <ref name="dateTime"/>
+    </element>
+</define>
+<define name="office-meta-data" combine="choice">
+    <ref name="dc-date"/>
+</define>
+<define name="dc-date">
+    <element name="dc:date">
+        <ref name="dateTime"/>
+    </element>
+</define>
+<define name="office-meta-data" combine="choice">
+    <element name="meta:print-date">
+        <ref name="dateTime"/>
+    </element>
+</define>
+<define name="office-meta-data" combine="choice">
+    <element name="meta:template">
+        <attribute name="xlink:href">
+            <ref name="anyURI"/>
+        </attribute>
+        <optional>
+            <attribute name="xlink:type" a:defaultValue="simple">
+                <value>simple</value>
+            </attribute>
+        </optional>
+        <optional>
+            <attribute name="xlink:actuate" a:defaultValue="onRequest">
+                <value>onRequest</value>
+            </attribute>
+        </optional>
+        <optional>
+            <attribute name="xlink:title">
+                <ref name="string"/>
+            </attribute>
+        </optional>
+        <optional>
+            <attribute name="meta:date">
+                <ref name="dateTime"/>
+            </attribute>
+        </optional>
+    </element>
+</define>
+<define name="office-meta-data" combine="choice">
+    <element name="meta:auto-reload">
+        <optional>
+            <attribute name="xlink:type" a:defaultValue="simple">
+                <value>simple</value>
+            </attribute>
+        </optional>
+        <optional>
+            <attribute name="xlink:show" a:defaultValue="replace">
+                <value>replace</value>
+            </attribute>
+        </optional>
+        <optional>
+            <attribute name="xlink:actuate" a:defaultValue="onLoad">
+                <value>onLoad</value>
+            </attribute>
+        </optional>
+        <optional>
+            <attribute name="xlink:href">
+                <ref name="anyURI"/>
+            </attribute>
+        </optional>
+        <optional>
+            <attribute name="meta:delay">
+                <ref name="duration"/>
+            </attribute>
+        </optional>
+    </element>
+</define>
+<define name="office-meta-data" combine="choice">
+    <element name="meta:hyperlink-behaviour">
+        <optional>
+            <attribute name="office:target-frame-name">
+                <ref name="targetFrameName"/>
+            </attribute>
+        </optional>
+        <optional>
+            <attribute name="xlink:show">
+                <choice>
+                    <value>new</value>
+                    <value>replace</value>
+                </choice>
+            </attribute>
+        </optional>
+    </element>
+</define>
+<define name="office-meta-data" combine="choice">
+    <element name="dc:language">
+        <ref name="language"/>
+    </element>
+</define>
+<define name="office-meta-data" combine="choice">
+    <element name="meta:editing-cycles">
+        <ref name="nonNegativeInteger"/>
+    </element>
+</define>
+<define name="office-meta-data" combine="choice">
+    <element name="meta:editing-duration">
+        <ref name="duration"/>
+    </element>
+</define>
+<define name="office-meta-data" combine="choice">
+    <element name="meta:document-statistic">
+        <optional>
+            <attribute name="meta:page-count">
+                <ref name="nonNegativeInteger"/>
+            </attribute>
+        </optional>
+        <optional>
+            <attribute name="meta:table-count">
+                <ref name="nonNegativeInteger"/>
+            </attribute>
+        </optional>
+        <optional>
+            <attribute name="meta:draw-count">
+                <ref name="nonNegativeInteger"/>
+            </attribute>
+        </optional>
+        <optional>
+            <attribute name="meta:image-count">
+                <ref name="nonNegativeInteger"/>
+            </attribute>
+        </optional>
+        <optional>
+            <attribute name="meta:ole-object-count">
+                <ref name="nonNegativeInteger"/>
+            </attribute>
+        </optional>
+        <optional>
+            <attribute name="meta:object-count">
+                <ref name="nonNegativeInteger"/>
+            </attribute>
+        </optional>
+        <optional>
+            <attribute name="meta:paragraph-count">
+                <ref name="nonNegativeInteger"/>
+            </attribute>
+        </optional>
+        <optional>
+            <attribute name="meta:word-count">
+                <ref name="nonNegativeInteger"/>
+            </attribute>
+        </optional>
+        <optional>
+            <attribute name="meta:character-count">
+                <ref name="nonNegativeInteger"/>
+            </attribute>
+        </optional>
+        <optional>
+            <attribute name="frame-count">
+                <ref name="nonNegativeInteger"/>
+            </attribute>
+        </optional>
+        <optional>
+            <attribute name="sentence-count">
+                <ref name="nonNegativeInteger"/>
+            </attribute>
+        </optional>
+        <optional>
+            <attribute name="syllable-count">
+                <ref name="nonNegativeInteger"/>
+            </attribute>
+        </optional>
+        <optional>
+            <attribute name="non-whitespace-character-count">
+                <ref name="nonNegativeInteger"/>
+            </attribute>
+        </optional>
+        <optional>
+            <attribute name="meta:row-count">
+                <ref name="nonNegativeInteger"/>
+            </attribute>
+        </optional>
+        <optional>
+            <attribute name="meta:cell-count">
+                <ref name="nonNegativeInteger"/>
+            </attribute>
+        </optional>
+    </element>
+</define>
+<define name="office-meta-data" combine="choice">
+    <element name="meta:user-defined">
+        <attribute name="meta:name">
+            <ref name="string"/>
+        </attribute>
+        <choice>
+            <group>
+                <attribute name="meta:value-type">
+                    <value>float</value>
+                </attribute>
+                <ref name="double"/>
+            </group>
+            <group>
+                <attribute name="meta:value-type">
+                    <value>date</value>
+                </attribute>
+                <ref name="dateOrDateTime"/>
+            </group>
+            <group>
+                <attribute name="meta:value-type">
+                    <value>time</value>
+                </attribute>
+                <ref name="duration"/>
+            </group>
+            <group>
+                <attribute name="meta:value-type">
+                    <value>boolean</value>
+                </attribute>
+                <ref name="boolean"/>
+            </group>
+            <group>
+                <attribute name="meta:value-type">
+                    <value>string</value>
+                </attribute>
+                <ref name="string"/>
+            </group>
+            <text/>
+        </choice>
+    </element>
+</define>
+<define name="text-h">
+    <element name="text:h">
+        <ref name="heading-attrs"/>
+        <ref name="paragraph-attrs"/>
+        <optional>
+            <ref name="text-number"/>
+        </optional>
+        <zeroOrMore>
+            <ref name="paragraph-content"/>
+        </zeroOrMore>
+    </element>
+</define>
+<define name="heading-attrs" combine="interleave">
+    <attribute name="text:outline-level">
+        <ref name="positiveInteger"/>
+    </attribute>
+</define>
+<define name="heading-attrs" combine="interleave">
+    <optional>
+        <attribute name="text:restart-numbering" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="heading-attrs" combine="interleave">
+    <optional>
+        <attribute name="text:start-value">
+            <ref name="nonNegativeInteger"/>
+        </attribute>
+    </optional>
+</define>
+<define name="heading-attrs" combine="interleave">
+    <optional>
+        <attribute name="text:is-list-header" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-number">
+    <element name="text:number">
+        <ref name="string"/>
+    </element>
+</define>
+<define name="text-p">
+    <element name="text:p">
+        <ref name="paragraph-attrs"/>
+        <zeroOrMore>
+            <ref name="paragraph-content"/>
+        </zeroOrMore>
+    </element>
+</define>
+<define name="paragraph-attrs">
+    <optional>
+        <attribute name="text:style-name">
+            <ref name="styleNameRef"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="text:class-names">
+            <ref name="styleNameRefs"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="text:cond-style-name">
+            <ref name="styleNameRef"/>
+        </attribute>
+    </optional>
+</define>
+<define name="paragraph-attrs" combine="interleave">
+    <optional>
+        <ref name="text-id"/>
+    </optional>
+</define>
+<define name="text-page-sequence">
+    <element name="text:page-sequence">
+        <oneOrMore>
+            <ref name="text-page"/>
+        </oneOrMore>
+    </element>
+</define>
+<define name="text-page">
+    <element name="text:page">
+        <ref name="text-page-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="text-page-attlist">
+    <attribute name="text:master-page-name">
+        <ref name="styleNameRef"/>
+    </attribute>
+</define>
+<define name="text-list">
+    <element name="text:list">
+        <ref name="text-list-attr"/>
+        <optional>
+            <ref name="text-list-header"/>
+        </optional>
+        <zeroOrMore>
+            <ref name="text-list-item"/>
+        </zeroOrMore>
+    </element>
+</define>
+<define name="text-list-attr" combine="interleave">
+    <optional>
+        <attribute name="text:style-name">
+            <ref name="styleNameRef"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-list-attr" combine="interleave">
+    <optional>
+        <attribute name="text:continue-numbering">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-list-item">
+    <element name="text:list-item">
+        <ref name="text-list-item-attr"/>
+        <ref name="text-list-item-content"/>
+    </element>
+</define>
+<define name="text-list-item-content">
+    <optional>
+        <ref name="text-number"/>
+    </optional>
+    <zeroOrMore>
+        <choice>
+            <ref name="text-p"/>
+            <ref name="text-h"/>
+            <ref name="text-list"/>
+            <ref name="text-soft-page-break"/>
+        </choice>
+    </zeroOrMore>
+</define>
+<define name="text-list-item-attr" combine="interleave">
+    <optional>
+        <attribute name="text:start-value">
+            <ref name="nonNegativeInteger"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-list-header">
+    <element name="text:list-header">
+        <ref name="text-list-item-content"/>
+    </element>
+</define>
+<define name="text-numbered-paragraph">
+    <element name="text:numbered-paragraph">
+        <ref name="text-numbered-paragraph-attr"/>
+        <optional>
+            <ref name="text-number"/>
+        </optional>
+        <choice>
+            <ref name="text-p"/>
+            <ref name="text-h"/>
+        </choice>
+    </element>
+</define>
+<define name="text-numbered-paragraph-attr" combine="interleave">
+    <optional>
+        <attribute name="text:level" a:defaultValue="1">
+            <ref name="positiveInteger"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-numbered-paragraph-attr" combine="interleave">
+    <ref name="text-list-attr"/>
+</define>
+<define name="text-numbered-paragraph-attr" combine="interleave">
+    <ref name="text-list-item-attr"/>
+</define>
+<define name="text-section">
+    <element name="text:section">
+        <ref name="text-section-attr"/>
+        <choice>
+            <ref name="text-section-source"/>
+            <ref name="text-section-source-dde"/>
+            <empty/>
+        </choice>
+        <zeroOrMore>
+            <ref name="text-content"/>
+        </zeroOrMore>
+    </element>
+</define>
+<define name="text-section-attr" combine="interleave">
+    <ref name="sectionAttr"/>
+</define>
+<define name="sectionAttr" combine="interleave">
+    <optional>
+        <attribute name="text:style-name">
+            <ref name="styleNameRef"/>
+        </attribute>
+    </optional>
+</define>
+<define name="sectionAttr" combine="interleave">
+    <attribute name="text:name">
+        <ref name="string"/>
+    </attribute>
+</define>
+<define name="sectionAttr" combine="interleave">
+    <optional>
+        <attribute name="text:protected">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="sectionAttr" combine="interleave">
+    <optional>
+        <attribute name="text:protection-key">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-section-attr" combine="interleave">
+    <choice>
+        <attribute name="text:display">
+            <choice>
+                <value>true</value>
+                <value>none</value>
+            </choice>
+        </attribute>
+        <group>
+            <attribute name="text:display">
+                <value>condition</value>
+            </attribute>
+            <attribute name="text:condition">
+                <ref name="string"/>
+            </attribute>
+        </group>
+        <empty/>
+    </choice>
+</define>
+<define name="text-section-source">
+    <element name="text:section-source">
+        <ref name="text-section-source-attr"/>
+    </element>
+</define>
+<define name="text-section-source-attr" combine="interleave">
+    <optional>
+        <attribute name="xlink:href">
+            <ref name="anyURI"/>
+        </attribute>
+        <optional>
+            <attribute name="xlink:type" a:defaultValue="simple">
+                <value>simple</value>
+            </attribute>
+        </optional>
+        <optional>
+            <attribute name="xlink:show" a:defaultValue="embed">
+                <value>embed</value>
+            </attribute>
+        </optional>
+    </optional>
+</define>
+<define name="text-section-source-attr" combine="interleave">
+    <optional>
+        <attribute name="text:section-name">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-section-source-attr" combine="interleave">
+    <optional>
+        <attribute name="text:filter-name">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-section-source-dde">
+    <ref name="office-dde-source"/>
+</define>
+<define name="text-tracked-changes">
+    <optional>
+        <element name="text:tracked-changes">
+            <ref name="text-tracked-changes-attr"/>
+            <zeroOrMore>
+                <ref name="text-changed-region"/>
+            </zeroOrMore>
+        </element>
+    </optional>
+</define>
+<define name="text-tracked-changes-attr" combine="interleave">
+    <optional>
+        <attribute name="text:track-changes" a:defaultValue="true">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-changed-region">
+    <element name="text:changed-region">
+        <ref name="text-changed-region-attr"/>
+        <ref name="text-changed-region-content"/>
+    </element>
+</define>
+<define name="text-changed-region-attr" combine="interleave">
+    <attribute name="text:id">
+        <ref name="ID"/>
+    </attribute>
+</define>
+<define name="text-changed-region-content" combine="choice">
+    <element name="text:insertion">
+        <ref name="office-change-info"/>
+    </element>
+</define>
+<define name="text-changed-region-content" combine="choice">
+    <element name="text:deletion">
+        <ref name="office-change-info"/>
+        <zeroOrMore>
+            <ref name="text-content"/>
+        </zeroOrMore>
+    </element>
+</define>
+<define name="text-changed-region-content" combine="choice">
+    <element name="text:format-change">
+        <ref name="office-change-info"/>
+    </element>
+</define>
+<define name="change-marks">
+    <choice>
+        <element name="text:change">
+            <ref name="change-mark-attr"/>
+        </element>
+        <element name="text:change-start">
+            <ref name="change-mark-attr"/>
+        </element>
+        <element name="text:change-end">
+            <ref name="change-mark-attr"/>
+        </element>
+    </choice>
+</define>
+<define name="change-mark-attr">
+    <attribute name="text:change-id">
+        <ref name="IDREF"/>
+    </attribute>
+</define>
+<define name="text-soft-page-break">
+    <element name="text:soft-page-break">
+        <empty/>
+    </element>
+</define>
+<define name="text-decls">
+    <optional>
+        <element name="text:variable-decls">
+            <zeroOrMore>
+                <ref name="text-variable-decl"/>
+            </zeroOrMore>
+        </element>
+    </optional>
+    <optional>
+        <element name="text:sequence-decls">
+            <zeroOrMore>
+                <ref name="text-sequence-decl"/>
+            </zeroOrMore>
+        </element>
+    </optional>
+    <optional>
+        <element name="text:user-field-decls">
+            <zeroOrMore>
+                <ref name="text-user-field-decl"/>
+            </zeroOrMore>
+        </element>
+    </optional>
+    <optional>
+        <element name="text:dde-connection-decls">
+            <zeroOrMore>
+                <ref name="text-dde-connection-decl"/>
+            </zeroOrMore>
+        </element>
+    </optional>
+    <optional>
+        <ref name="text-alphabetical-index-auto-mark-file"/>
+    </optional>
+</define>
+<define name="paragraph-content" combine="choice">
+    <text/>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:s">
+        <optional>
+            <attribute name="text:c">
+                <ref name="nonNegativeInteger"/>
+            </attribute>
+        </optional>
+    </element>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:tab">
+        <ref name="text-tab-attr"/>
+    </element>
+</define>
+<define name="text-tab-attr">
+    <optional>
+        <attribute name="text:tab-ref">
+            <ref name="nonNegativeInteger"/>
+        </attribute>
+    </optional>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:line-break">
+        <empty/>
+    </element>
+</define>
+<define name="paragraph-content" combine="choice">
+    <ref name="text-soft-page-break"/>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:span">
+        <optional>
+            <attribute name="text:style-name">
+                <ref name="styleNameRef"/>
+            </attribute>
+        </optional>
+        <optional>
+            <attribute name="text:class-names">
+                <ref name="styleNameRefs"/>
+            </attribute>
+        </optional>
+        <zeroOrMore>
+            <ref name="paragraph-content"/>
+        </zeroOrMore>
+    </element>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:a">
+        <ref name="text-a-attlist"/>
+        <optional>
+            <ref name="office-event-listeners"/>
+        </optional>
+        <zeroOrMore>
+            <ref name="paragraph-content"/>
+        </zeroOrMore>
+    </element>
+</define>
+<define name="text-a-attlist" combine="interleave">
+    <optional>
+        <attribute name="office:name">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-a-attlist" combine="interleave">
+    <optional>
+        <attribute name="office:title">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-a-attlist" combine="interleave">
+    <attribute name="xlink:href">
+        <ref name="anyURI"/>
+    </attribute>
+    <optional>
+        <attribute name="xlink:type" a:defaultValue="simple">
+            <value>simple</value>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="xlink:actuate" a:defaultValue="onRequest">
+            <value>onRequest</value>
+        </attribute>
+    </optional>
+</define>
+<define name="text-a-attlist" combine="interleave">
+    <optional>
+        <attribute name="office:target-frame-name">
+            <ref name="targetFrameName"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="xlink:show">
+            <choice>
+                <value>new</value>
+                <value>replace</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="text-a-attlist" combine="interleave">
+    <optional>
+        <attribute name="text:style-name">
+            <ref name="styleNameRef"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="text:visited-style-name">
+            <ref name="styleNameRef"/>
+        </attribute>
+    </optional>
+</define>
+<define name="paragraph-content" combine="choice">
+    <choice>
+        <element name="text:bookmark">
+            <attribute name="text:name">
+                <ref name="string"/>
+            </attribute>
+        </element>
+        <element name="text:bookmark-start">
+            <attribute name="text:name">
+                <ref name="string"/>
+            </attribute>
+        </element>
+        <element name="text:bookmark-end">
+            <attribute name="text:name">
+                <ref name="string"/>
+            </attribute>
+        </element>
+    </choice>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:reference-mark">
+        <attribute name="text:name">
+            <ref name="string"/>
+        </attribute>
+    </element>
+</define>
+<define name="paragraph-content" combine="choice">
+    <choice>
+        <element name="text:reference-mark-start">
+            <attribute name="text:name">
+                <ref name="string"/>
+            </attribute>
+        </element>
+        <element name="text:reference-mark-end">
+            <attribute name="text:name">
+                <ref name="string"/>
+            </attribute>
+        </element>
+    </choice>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:note">
+        <ref name="text-note-class"/>
+        <optional>
+            <attribute name="text:id">
+                <ref name="string"/>
+            </attribute>
+        </optional>
+        <element name="text:note-citation">
+            <optional>
+                <attribute name="text:label">
+                    <ref name="string"/>
+                </attribute>
+            </optional>
+            <text/>
+        </element>
+        <element name="text:note-body">
+            <zeroOrMore>
+                <ref name="text-content"/>
+            </zeroOrMore>
+        </element>
+    </element>
+</define>
+<define name="text-note-class">
+    <attribute name="text:note-class">
+        <choice>
+            <value>footnote</value>
+            <value>endnote</value>
+        </choice>
+    </attribute>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:ruby">
+        <optional>
+            <attribute name="text:style-name">
+                <ref name="styleNameRef"/>
+            </attribute>
+        </optional>
+        <element name="text:ruby-base">
+            <ref name="paragraph-content"/>
+        </element>
+        <element name="text:ruby-text">
+            <optional>
+                <attribute name="text:style-name">
+                    <ref name="styleNameRef"/>
+                </attribute>
+            </optional>
+            <text/>
+        </element>
+    </element>
+</define>
+<define name="paragraph-content" combine="choice">
+    <ref name="office-annotation"/>
+</define>
+<define name="paragraph-content" combine="choice">
+    <ref name="change-marks"/>
+</define>
+<define name="paragraph-content" combine="choice">
+    <choice>
+        <ref name="shape"/>
+        <ref name="draw-a"/>
+    </choice>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:date">
+        <ref name="text-date-attlist"/>
+        <text/>
+    </element>
+</define>
+<define name="text-date-attlist" combine="interleave">
+    <interleave>
+        <ref name="common-field-fixed-attlist"/>
+        <ref name="common-field-data-style-name-attlist"/>
+    </interleave>
+</define>
+<define name="text-date-attlist" combine="interleave">
+    <optional>
+        <attribute name="text:date-value">
+            <ref name="dateOrDateTime"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-date-attlist" combine="interleave">
+    <optional>
+        <attribute name="text:date-adjust">
+            <ref name="duration"/>
+        </attribute>
+    </optional>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:time">
+        <ref name="text-time-attlist"/>
+        <text/>
+    </element>
+</define>
+<define name="text-time-attlist" combine="interleave">
+    <interleave>
+        <ref name="common-field-fixed-attlist"/>
+        <ref name="common-field-data-style-name-attlist"/>
+    </interleave>
+</define>
+<define name="text-time-attlist" combine="interleave">
+    <optional>
+        <attribute name="text:time-value">
+            <ref name="timeOrDateTime"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-time-attlist" combine="interleave">
+    <optional>
+        <attribute name="text:time-adjust">
+            <ref name="duration"/>
+        </attribute>
+    </optional>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:page-number">
+        <ref name="text-page-number-attlist"/>
+        <text/>
+    </element>
+</define>
+<define name="text-page-number-attlist" combine="interleave">
+    <interleave>
+        <ref name="common-field-num-format-attlist"/>
+        <ref name="common-field-fixed-attlist"/>
+    </interleave>
+</define>
+<define name="text-page-number-attlist" combine="interleave">
+    <optional>
+        <attribute name="text:page-adjust">
+            <ref name="integer"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-page-number-attlist" combine="interleave">
+    <optional>
+        <attribute name="text:select-page">
+            <choice>
+                <value>previous</value>
+                <value>current</value>
+                <value>next</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:page-continuation">
+        <ref name="text-page-continuation-attlist"/>
+        <text/>
+    </element>
+</define>
+<define name="text-page-continuation-attlist" combine="interleave">
+    <attribute name="text:select-page">
+        <choice>
+            <value>previous</value>
+            <value>next</value>
+        </choice>
+    </attribute>
+</define>
+<define name="text-page-continuation-attlist" combine="interleave">
+    <optional>
+        <attribute name="text:string-value">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:sender-firstname">
+        <ref name="common-field-fixed-attlist"/>
+        <text/>
+    </element>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:sender-lastname">
+        <ref name="common-field-fixed-attlist"/>
+        <text/>
+    </element>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:sender-initials">
+        <ref name="common-field-fixed-attlist"/>
+        <text/>
+    </element>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:sender-title">
+        <ref name="common-field-fixed-attlist"/>
+        <text/>
+    </element>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:sender-position">
+        <ref name="common-field-fixed-attlist"/>
+        <text/>
+    </element>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:sender-email">
+        <ref name="common-field-fixed-attlist"/>
+        <text/>
+    </element>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:sender-phone-private">
+        <ref name="common-field-fixed-attlist"/>
+        <text/>
+    </element>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:sender-fax">
+        <ref name="common-field-fixed-attlist"/>
+        <text/>
+    </element>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:sender-company">
+        <ref name="common-field-fixed-attlist"/>
+        <text/>
+    </element>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:sender-phone-work">
+        <ref name="common-field-fixed-attlist"/>
+        <text/>
+    </element>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:sender-street">
+        <ref name="common-field-fixed-attlist"/>
+        <text/>
+    </element>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:sender-city">
+        <ref name="common-field-fixed-attlist"/>
+        <text/>
+    </element>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:sender-postal-code">
+        <ref name="common-field-fixed-attlist"/>
+        <text/>
+    </element>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:sender-country">
+        <ref name="common-field-fixed-attlist"/>
+        <text/>
+    </element>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:sender-state-or-province">
+        <ref name="common-field-fixed-attlist"/>
+        <text/>
+    </element>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:author-name">
+        <ref name="common-field-fixed-attlist"/>
+        <text/>
+    </element>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:author-initials">
+        <ref name="common-field-fixed-attlist"/>
+        <text/>
+    </element>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:chapter">
+        <ref name="text-chapter-attlist"/>
+        <text/>
+    </element>
+</define>
+<define name="text-chapter-attlist" combine="interleave">
+    <attribute name="text:display">
+        <choice>
+            <value>name</value>
+            <value>number</value>
+            <value>number-and-name</value>
+            <value>plain-number-and-name</value>
+            <value>plain-number</value>
+        </choice>
+    </attribute>
+</define>
+<define name="text-chapter-attlist" combine="interleave">
+    <attribute name="text:outline-level">
+        <ref name="nonNegativeInteger"/>
+    </attribute>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:file-name">
+        <ref name="text-file-name-attlist"/>
+        <text/>
+    </element>
+</define>
+<define name="text-file-name-attlist" combine="interleave">
+    <optional>
+        <attribute name="text:display">
+            <choice>
+                <value>full</value>
+                <value>path</value>
+                <value>name</value>
+                <value>name-and-extension</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="text-file-name-attlist" combine="interleave">
+    <ref name="common-field-fixed-attlist"/>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:template-name">
+        <ref name="text-template-name-attlist"/>
+        <text/>
+    </element>
+</define>
+<define name="text-template-name-attlist">
+    <optional>
+        <attribute name="text:display">
+            <choice>
+                <value>full</value>
+                <value>path</value>
+                <value>name</value>
+                <value>name-and-extension</value>
+                <value>area</value>
+                <value>title</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:sheet-name">
+        <text/>
+    </element>
+</define>
+<define name="text-variable-decl">
+    <element name="text:variable-decl">
+        <ref name="common-field-name-attlist"/>
+        <ref name="common-value-type-attlist"/>
+    </element>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:variable-set">
+        <interleave>
+            <ref name="common-field-name-attlist"/>
+            <ref name="common-field-formula-attlist"/>
+            <ref name="common-value-and-type-attlist"/>
+            <ref name="common-field-display-value-none-attlist"/>
+            <ref name="common-field-data-style-name-attlist"/>
+        </interleave>
+        <text/>
+    </element>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:variable-get">
+        <interleave>
+            <ref name="common-field-name-attlist"/>
+            <ref name="common-field-display-value-formula-attlist"/>
+            <ref name="common-field-data-style-name-attlist"/>
+        </interleave>
+        <text/>
+    </element>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:variable-input">
+        <interleave>
+            <ref name="common-field-name-attlist"/>
+            <ref name="common-field-description-attlist"/>
+            <ref name="common-value-type-attlist"/>
+            <ref name="common-field-display-value-none-attlist"/>
+            <ref name="common-field-data-style-name-attlist"/>
+        </interleave>
+        <text/>
+    </element>
+</define>
+<define name="text-user-field-decl">
+    <element name="text:user-field-decl">
+        <ref name="common-field-name-attlist"/>
+        <optional>
+            <ref name="common-field-formula-attlist"/>
+        </optional>
+        <ref name="common-value-and-type-attlist"/>
+    </element>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:user-field-get">
+        <interleave>
+            <ref name="common-field-name-attlist"/>
+            <ref name="common-field-display-value-formula-none-attlist"/>
+            <ref name="common-field-data-style-name-attlist"/>
+        </interleave>
+        <text/>
+    </element>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:user-field-input">
+        <interleave>
+            <ref name="common-field-name-attlist"/>
+            <ref name="common-field-description-attlist"/>
+            <ref name="common-field-data-style-name-attlist"/>
+        </interleave>
+        <text/>
+    </element>
+</define>
+<define name="text-sequence-decl">
+    <element name="text:sequence-decl">
+        <ref name="text-sequence-decl-attlist"/>
+    </element>
+</define>
+<define name="text-sequence-decl-attlist" combine="interleave">
+    <ref name="common-field-name-attlist"/>
+</define>
+<define name="text-sequence-decl-attlist" combine="interleave">
+    <attribute name="text:display-outline-level">
+        <ref name="nonNegativeInteger"/>
+    </attribute>
+</define>
+<define name="text-sequence-decl-attlist" combine="interleave">
+    <optional>
+        <attribute name="text:separation-character">
+            <ref name="character"/>
+        </attribute>
+    </optional>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:sequence">
+        <interleave>
+            <ref name="common-field-name-attlist"/>
+            <ref name="common-field-formula-attlist"/>
+            <ref name="common-field-num-format-attlist"/>
+            <ref name="text-sequence-ref-name"/>
+        </interleave>
+        <text/>
+    </element>
+</define>
+<define name="text-sequence-ref-name">
+    <optional>
+        <attribute name="text:ref-name">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:expression">
+        <interleave>
+            <ref name="common-field-formula-attlist"/>
+            <optional>
+                <ref name="common-value-and-type-attlist"/>
+            </optional>
+            <ref name="common-field-display-value-formula-attlist"/>
+            <ref name="common-field-data-style-name-attlist"/>
+        </interleave>
+        <text/>
+    </element>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:text-input">
+        <ref name="common-field-description-attlist"/>
+        <text/>
+    </element>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:initial-creator">
+        <ref name="common-field-fixed-attlist"/>
+        <text/>
+    </element>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:creation-date">
+        <interleave>
+            <ref name="common-field-fixed-attlist"/>
+            <ref name="common-field-data-style-name-attlist"/>
+            <optional>
+                <attribute name="text:date-value">
+                    <ref name="dateOrDateTime"/>
+                </attribute>
+            </optional>
+        </interleave>
+        <text/>
+    </element>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:creation-time">
+        <interleave>
+            <ref name="common-field-fixed-attlist"/>
+            <ref name="common-field-data-style-name-attlist"/>
+            <optional>
+                <attribute name="text:time-value">
+                    <ref name="timeOrDateTime"/>
+                </attribute>
+            </optional>
+        </interleave>
+        <text/>
+    </element>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:description">
+        <ref name="common-field-fixed-attlist"/>
+        <text/>
+    </element>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:user-defined">
+        <interleave>
+            <ref name="common-field-fixed-attlist"/>
+            <attribute name="text:name">
+                <ref name="string"/>
+            </attribute>
+            <ref name="common-field-data-style-name-attlist"/>
+            <optional>
+                <attribute name="office:value">
+                    <ref name="double"/>
+                </attribute>
+            </optional>
+            <optional>
+                <attribute name="office:date-value">
+                    <ref name="dateOrDateTime"/>
+                </attribute>
+            </optional>
+            <optional>
+                <attribute name="office:time-value">
+                    <ref name="duration"/>
+                </attribute>
+            </optional>
+            <optional>
+                <attribute name="office:boolean-value">
+                    <ref name="boolean"/>
+                </attribute>
+            </optional>
+            <optional>
+                <attribute name="office:string-value">
+                    <ref name="string"/>
+                </attribute>
+            </optional>
+        </interleave>
+        <text/>
+    </element>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:print-time">
+        <interleave>
+            <ref name="common-field-fixed-attlist"/>
+            <ref name="common-field-data-style-name-attlist"/>
+            <optional>
+                <attribute name="text:time-value">
+                    <ref name="time"/>
+                </attribute>
+            </optional>
+        </interleave>
+        <text/>
+    </element>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:print-date">
+        <interleave>
+            <ref name="common-field-fixed-attlist"/>
+            <ref name="common-field-data-style-name-attlist"/>
+            <optional>
+                <attribute name="text:date-value">
+                    <ref name="date"/>
+                </attribute>
+            </optional>
+        </interleave>
+        <text/>
+    </element>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:printed-by">
+        <ref name="common-field-fixed-attlist"/>
+        <text/>
+    </element>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:title">
+        <ref name="common-field-fixed-attlist"/>
+        <text/>
+    </element>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:subject">
+        <ref name="common-field-fixed-attlist"/>
+        <text/>
+    </element>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:keywords">
+        <ref name="common-field-fixed-attlist"/>
+        <text/>
+    </element>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:editing-cycles">
+        <ref name="common-field-fixed-attlist"/>
+        <text/>
+    </element>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:editing-duration">
+        <interleave>
+            <ref name="common-field-fixed-attlist"/>
+            <ref name="common-field-data-style-name-attlist"/>
+            <optional>
+                <attribute name="text:duration">
+                    <ref name="duration"/>
+                </attribute>
+            </optional>
+        </interleave>
+        <text/>
+    </element>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:modification-time">
+        <interleave>
+            <ref name="common-field-fixed-attlist"/>
+            <ref name="common-field-data-style-name-attlist"/>
+            <optional>
+                <attribute name="text:time-value">
+                    <ref name="time"/>
+                </attribute>
+            </optional>
+        </interleave>
+        <text/>
+    </element>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:modification-date">
+        <interleave>
+            <ref name="common-field-fixed-attlist"/>
+            <ref name="common-field-data-style-name-attlist"/>
+            <optional>
+                <attribute name="text:date-value">
+                    <ref name="date"/>
+                </attribute>
+            </optional>
+        </interleave>
+        <text/>
+    </element>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:creator">
+        <ref name="common-field-fixed-attlist"/>
+        <text/>
+    </element>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element>
+        <choice>
+            <name>text:page-count</name>
+            <name>text:paragraph-count</name>
+            <name>text:word-count</name>
+            <name>text:character-count</name>
+            <name>text:table-count</name>
+            <name>text:image-count</name>
+            <name>text:object-count</name>
+        </choice>
+        <ref name="common-field-num-format-attlist"/>
+        <text/>
+    </element>
+</define>
+<define name="common-field-database-table">
+    <ref name="common-field-database-table-attlist"/>
+    <ref name="common-field-database-name"/>
+</define>
+<define name="common-field-database-name" combine="choice">
+    <optional>
+        <attribute name="text:database-name">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-field-database-name" combine="choice">
+    <ref name="form-connection-resource"/>
+</define>
+<define name="common-field-database-table-attlist" combine="interleave">
+    <attribute name="text:table-name">
+        <ref name="string"/>
+    </attribute>
+</define>
+<define name="common-field-database-table-attlist" combine="interleave">
+    <optional>
+        <attribute name="text:table-type">
+            <choice>
+                <value>table</value>
+                <value>query</value>
+                <value>command</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:database-display">
+        <ref name="text-database-display-attlist"/>
+        <text/>
+    </element>
+</define>
+<define name="text-database-display-attlist" combine="interleave">
+    <ref name="common-field-database-table"/>
+</define>
+<define name="text-database-display-attlist" combine="interleave">
+    <ref name="common-field-data-style-name-attlist"/>
+</define>
+<define name="text-database-display-attlist" combine="interleave">
+    <attribute name="text:column-name">
+        <ref name="string"/>
+    </attribute>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:database-next">
+        <ref name="text-database-next-attlist"/>
+    </element>
+</define>
+<define name="text-database-next-attlist" combine="interleave">
+    <ref name="common-field-database-table"/>
+</define>
+<define name="text-database-next-attlist" combine="interleave">
+    <optional>
+        <attribute name="text:condition">
+            <ref name="formula"/>
+        </attribute>
+    </optional>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:database-row-select">
+        <ref name="text-database-row-select-attlist"/>
+    </element>
+</define>
+<define name="text-database-row-select-attlist" combine="interleave">
+    <ref name="common-field-database-table"/>
+</define>
+<define name="text-database-row-select-attlist" combine="interleave">
+    <optional>
+        <attribute name="text:condition">
+            <ref name="formula"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-database-row-select-attlist" combine="interleave">
+    <optional>
+        <attribute name="text:row-number">
+            <ref name="nonNegativeInteger"/>
+        </attribute>
+    </optional>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:database-row-number">
+        <interleave>
+            <ref name="common-field-database-table"/>
+            <ref name="common-field-num-format-attlist"/>
+            <optional>
+                <attribute name="text:value">
+                    <ref name="nonNegativeInteger"/>
+                </attribute>
+            </optional>
+        </interleave>
+        <text/>
+    </element>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:database-name">
+        <ref name="common-field-database-table"/>
+        <text/>
+    </element>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:page-variable-set">
+        <ref name="text-set-page-variable-attlist"/>
+        <text/>
+    </element>
+</define>
+<define name="text-set-page-variable-attlist" combine="interleave">
+    <optional>
+        <attribute name="text:active">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-set-page-variable-attlist" combine="interleave">
+    <optional>
+        <attribute name="text:page-adjust">
+            <ref name="integer"/>
+        </attribute>
+    </optional>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:page-variable-get">
+        <ref name="text-get-page-variable-attlist"/>
+        <text/>
+    </element>
+</define>
+<define name="text-get-page-variable-attlist" combine="interleave">
+    <ref name="common-field-num-format-attlist"/>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:placeholder">
+        <ref name="text-placeholder-attlist"/>
+        <text/>
+    </element>
+</define>
+<define name="text-placeholder-attlist" combine="interleave">
+    <attribute name="text:placeholder-type">
+        <choice>
+            <value>text</value>
+            <value>table</value>
+            <value>text-box</value>
+            <value>image</value>
+            <value>object</value>
+        </choice>
+    </attribute>
+</define>
+<define name="text-placeholder-attlist" combine="interleave">
+    <ref name="common-field-description-attlist"/>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:conditional-text">
+        <ref name="text-conditional-text-attlist"/>
+        <text/>
+    </element>
+</define>
+<define name="text-conditional-text-attlist" combine="interleave">
+    <attribute name="text:condition">
+        <ref name="formula"/>
+    </attribute>
+</define>
+<define name="text-conditional-text-attlist" combine="interleave">
+    <attribute name="text:string-value-if-true">
+        <ref name="string"/>
+    </attribute>
+</define>
+<define name="text-conditional-text-attlist" combine="interleave">
+    <attribute name="text:string-value-if-false">
+        <ref name="string"/>
+    </attribute>
+</define>
+<define name="text-conditional-text-attlist" combine="interleave">
+    <optional>
+        <attribute name="text:current-value">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:hidden-text">
+        <ref name="text-hidden-text-attlist"/>
+        <text/>
+    </element>
+</define>
+<define name="text-hidden-text-attlist" combine="interleave">
+    <attribute name="text:condition">
+        <ref name="formula"/>
+    </attribute>
+</define>
+<define name="text-hidden-text-attlist" combine="interleave">
+    <attribute name="text:string-value">
+        <ref name="string"/>
+    </attribute>
+</define>
+<define name="text-hidden-text-attlist" combine="interleave">
+    <optional>
+        <attribute name="text:is-hidden">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element>
+        <choice>
+            <name>text:reference-ref</name>
+            <name>text:bookmark-ref</name>
+        </choice>
+        <interleave>
+            <ref name="text-common-ref-content"/>
+            <ref name="text-ref-content"/>
+        </interleave>
+    </element>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:note-ref">
+        <interleave>
+            <ref name="text-common-ref-content"/>
+            <ref name="text-note-ref-content"/>
+            <ref name="text-ref-content"/>
+        </interleave>
+    </element>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:sequence-ref">
+        <interleave>
+            <ref name="text-common-ref-content"/>
+            <ref name="text-sequence-ref-content"/>
+        </interleave>
+    </element>
+</define>
+<define name="text-common-ref-content" combine="interleave">
+    <text/>
+</define>
+<define name="text-common-ref-content" combine="interleave">
+    <optional>
+        <attribute name="text:ref-name">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-note-ref-content" combine="interleave">
+    <ref name="text-note-class"/>
+</define>
+<define name="text-ref-content" combine="interleave">
+    <optional>
+        <attribute name="text:reference-format">
+            <choice>
+                <value>page</value>
+                <value>chapter</value>
+                <value>direction</value>
+                <value>text</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="text-sequence-ref-content" combine="interleave">
+    <optional>
+        <attribute name="text:reference-format">
+            <choice>
+                <value>page</value>
+                <value>chapter</value>
+                <value>direction</value>
+                <value>text</value>
+                <value>category-and-value</value>
+                <value>caption</value>
+                <value>value</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:script">
+        <interleave>
+            <choice>
+                <group>
+                    <attribute name="xlink:href">
+                        <ref name="anyURI"/>
+                    </attribute>
+                    <optional>
+                        <attribute name="xlink:type" a:defaultValue="simple">
+                            <value>simple</value>
+                        </attribute>
+                    </optional>
+                </group>    
+                <text/>
+            </choice>
+            <optional>
+                <attribute name="script:language">
+                    <ref name="string"/>
+                </attribute>
+            </optional>
+        </interleave>
+    </element>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:execute-macro">
+        <optional>
+            <attribute name="text:name">
+                <ref name="string"/>
+            </attribute>
+        </optional>
+        <optional>
+            <ref name="office-event-listeners"/>
+        </optional>
+        <text/>
+    </element>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:hidden-paragraph">
+        <ref name="text-hidden-paragraph-attlist"/>
+        <text/>
+    </element>
+</define>
+<define name="text-hidden-paragraph-attlist" combine="interleave">
+    <attribute name="text:condition">
+        <ref name="formula"/>
+    </attribute>
+</define>
+<define name="text-hidden-paragraph-attlist" combine="interleave">
+    <optional>
+        <attribute name="text:is-hidden">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:dde-connection">
+        <attribute name="text:connection-name">
+            <ref name="string"/>
+        </attribute>
+        <text/>
+    </element>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:measure">
+        <attribute name="text:kind">
+            <choice>
+                <value>value</value>
+                <value>unit</value>
+                <value>gap</value>
+            </choice>
+        </attribute>
+        <text/>
+    </element>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:table-formula">
+        <interleave>
+            <ref name="common-field-formula-attlist"/>
+            <ref name="common-field-display-value-formula-attlist"/>
+            <ref name="common-field-data-style-name-attlist"/>
+        </interleave>
+        <text/>
+    </element>
+</define>
+<define name="common-value-type-attlist">
+    <attribute name="office:value-type">
+        <ref name="valueType"/>
+    </attribute>
+</define>
+<define name="common-value-and-type-attlist">
+    <choice>
+        <group>
+            <attribute name="office:value-type">
+                <value>float</value>
+            </attribute>
+            <attribute name="office:value">
+                <ref name="double"/>
+            </attribute>
+        </group>
+        <group>
+            <attribute name="office:value-type">
+                <value>percentage</value>
+            </attribute>
+            <attribute name="office:value">
+                <ref name="double"/>
+            </attribute>
+        </group>
+        <group>
+            <attribute name="office:value-type">
+                <value>currency</value>
+            </attribute>
+            <attribute name="office:value">
+                <ref name="double"/>
+            </attribute>
+            <optional>
+                <attribute name="office:currency">
+                    <ref name="string"/>
+                </attribute>
+            </optional>
+        </group>
+        <group>
+            <attribute name="office:value-type">
+                <value>date</value>
+            </attribute>
+            <attribute name="office:date-value">
+                <ref name="dateOrDateTime"/>
+            </attribute>
+        </group>
+        <group>
+            <attribute name="office:value-type">
+                <value>time</value>
+            </attribute>
+            <attribute name="office:time-value">
+                <ref name="duration"/>
+            </attribute>
+        </group>
+        <group>
+            <attribute name="office:value-type">
+                <value>boolean</value>
+            </attribute>
+            <attribute name="office:boolean-value">
+                <ref name="boolean"/>
+            </attribute>
+        </group>
+        <group>
+            <attribute name="office:value-type">
+                <value>string</value>
+            </attribute>
+            <optional>
+                <attribute name="office:string-value">
+                    <ref name="string"/>
+                </attribute>
+            </optional>
+        </group>
+    </choice>
+</define>
+<define name="common-field-fixed-attlist">
+    <optional>
+        <attribute name="text:fixed">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-field-name-attlist">
+    <attribute name="text:name">
+        <ref name="variableName"/>
+    </attribute>
+</define>
+<define name="common-field-description-attlist">
+    <optional>
+        <attribute name="text:description">
+            <text/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-field-display-value-none-attlist">
+    <optional>
+        <attribute name="text:display">
+            <choice>
+                <value>value</value>
+                <value>none</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="common-field-display-value-formula-none-attlist">
+    <optional>
+        <attribute name="text:display">
+            <choice>
+                <value>value</value>
+                <value>formula</value>
+                <value>none</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="common-field-display-value-formula-attlist">
+    <optional>
+        <attribute name="text:display">
+            <choice>
+                <value>value</value>
+                <value>formula</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="common-field-formula-attlist">
+    <optional>
+        <attribute name="text:formula">
+            <ref name="formula"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-field-data-style-name-attlist">
+    <optional>
+        <attribute name="style:data-style-name">
+            <ref name="styleNameRef"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-field-num-format-attlist">
+    <optional>
+        <ref name="common-num-format-attlist"/>
+    </optional>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:toc-mark-start">
+        <ref name="text-toc-mark-start-attrs"/>
+    </element>
+</define>
+<define name="text-toc-mark-start-attrs">
+    <ref name="text-id"/>
+    <ref name="text-outline-level"/>
+</define>
+<define name="text-outline-level">
+    <optional>
+        <attribute name="text:outline-level">
+            <ref name="positiveInteger"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-id">
+    <attribute name="text:id">
+        <ref name="string"/>
+    </attribute>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:toc-mark-end">
+        <ref name="text-id"/>
+    </element>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:toc-mark">
+        <attribute name="text:string-value">
+            <ref name="string"/>
+        </attribute>
+        <ref name="text-outline-level"/>
+    </element>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:user-index-mark-start">
+        <ref name="text-id"/>
+        <ref name="text-outline-level"/>
+        <ref name="text-index-name"/>
+    </element>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:user-index-mark-end">
+        <ref name="text-id"/>
+        <ref name="text-outline-level"/>
+    </element>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:user-index-mark">
+        <attribute name="text:string-value">
+            <ref name="string"/>
+        </attribute>
+        <ref name="text-outline-level"/>
+        <ref name="text-index-name"/>
+    </element>
+</define>
+<define name="text-index-name">
+    <attribute name="text:index-name">
+        <ref name="string"/>
+    </attribute>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:alphabetical-index-mark-start">
+        <ref name="text-id"/>
+        <ref name="text-alphabetical-index-mark-attrs"/>
+    </element>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:alphabetical-index-mark-end">
+        <ref name="text-id"/>
+    </element>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:alphabetical-index-mark">
+        <attribute name="text:string-value">
+            <ref name="string"/>
+        </attribute>
+        <ref name="text-alphabetical-index-mark-attrs"/>
+    </element>
+</define>
+<define name="text-alphabetical-index-mark-attrs" combine="interleave">
+    <optional>
+        <attribute name="text:key1">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="text:key2">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-alphabetical-index-mark-attrs" combine="interleave">
+    <optional>
+        <attribute name="text:string-value-phonetic">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="text:key1-phonetic">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="text:key2-phonetic">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-alphabetical-index-mark-attrs" combine="interleave">
+    <optional>
+        <attribute name="text:main-entry" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="text:bibliography-mark">
+        <attribute name="text:bibliography-type">
+            <ref name="text-bibliography-types"/>
+        </attribute>
+        <zeroOrMore>
+            <attribute>
+                <choice>
+                    <name>text:identifier</name>
+                    <name>text:address</name>
+                    <name>text:annote</name>
+                    <name>text:author</name>
+                    <name>text:booktitle</name>
+                    <name>text:chapter</name>
+                    <name>text:edition</name>
+                    <name>text:editor</name>
+                    <name>text:howpublished</name>
+                    <name>text:institution</name>
+                    <name>text:journal</name>
+                    <name>text:month</name>
+                    <name>text:note</name>
+                    <name>text:number</name>
+                    <name>text:organizations</name>
+                    <name>text:pages</name>
+                    <name>text:publisher</name>
+                    <name>text:school</name>
+                    <name>text:series</name>
+                    <name>text:title</name>
+                    <name>text:report-type</name>
+                    <name>text:volume</name>
+                    <name>text:year</name>
+                    <name>text:url</name>
+                    <name>text:custom1</name>
+                    <name>text:custom2</name>
+                    <name>text:custom3</name>
+                    <name>text:custom4</name>
+                    <name>text:custom5</name>
+                    <name>text:isbn</name>
+                    <name>text:issn</name>
+                </choice>
+                <ref name="string"/>
+            </attribute>
+        </zeroOrMore>
+        <text/>
+    </element>
+</define>
+<define name="text-bibliography-types">
+    <choice>
+        <value>article</value>
+        <value>book</value>
+        <value>booklet</value>
+        <value>conference</value>
+        <value>custom1</value>
+        <value>custom2</value>
+        <value>custom3</value>
+        <value>custom4</value>
+        <value>custom5</value>
+        <value>email</value>
+        <value>inbook</value>
+        <value>incollection</value>
+        <value>inproceedings</value>
+        <value>journal</value>
+        <value>manual</value>
+        <value>mastersthesis</value>
+        <value>misc</value>
+        <value>phdthesis</value>
+        <value>proceedings</value>
+        <value>techreport</value>
+        <value>unpublished</value>
+        <value>www</value>
+    </choice>
+</define>
+<define name="text-index-body">
+    <element name="text:index-body">
+        <zeroOrMore>
+            <ref name="index-content-main"/>
+        </zeroOrMore>
+    </element>
+</define>
+<define name="index-content-main">
+    <choice>
+        <ref name="text-content"/>
+        <ref name="text-index-title"/>
+    </choice>
+</define>
+<define name="text-index-title">
+    <element name="text:index-title">
+        <ref name="sectionAttr"/>
+        <zeroOrMore>
+            <ref name="index-content-main"/>
+        </zeroOrMore>
+    </element>
+</define>
+<define name="text-table-of-content">
+    <element name="text:table-of-content">
+        <ref name="sectionAttr"/>
+        <ref name="text-table-of-content-source"/>
+        <ref name="text-index-body"/>
+    </element>
+</define>
+<define name="text-table-of-content-source">
+    <element name="text:table-of-content-source">
+        <ref name="text-table-of-content-source-attlist"/>
+        <optional>
+            <ref name="text-index-title-template"/>
+        </optional>
+        <zeroOrMore>
+            <ref name="text-table-of-content-entry-template"/>
+        </zeroOrMore>
+        <zeroOrMore>
+            <ref name="text-index-source-styles"/>
+        </zeroOrMore>
+    </element>
+</define>
+<define name="text-table-of-content-source-attlist" combine="interleave">
+    <optional>
+        <attribute name="text:outline-level">
+            <choice>
+                <ref name="positiveInteger"/>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="text-table-of-content-source-attlist" combine="interleave">
+    <optional>
+        <attribute name="text:use-outline-level" a:defaultValue="true">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-table-of-content-source-attlist" combine="interleave">
+    <optional>
+        <attribute name="text:use-index-marks">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-table-of-content-source-attlist" combine="interleave">
+    <optional>
+        <attribute name="text:use-index-source-styles">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-table-of-content-source-attlist" combine="interleave">
+    <optional>
+        <attribute name="text:index-scope">
+            <choice>
+                <value>document</value>
+                <value>chapter</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="text-table-of-content-source-attlist" combine="interleave">
+    <optional>
+        <attribute name="text:relative-tab-stop-position">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-table-of-content-entry-template">
+    <element name="text:table-of-content-entry-template">
+        <ref name="text-table-of-content-entry-template-attlist"/>
+        <zeroOrMore>
+            <ref name="text-table-of-content-children"/>
+
+        </zeroOrMore>
+    </element>
+</define>
+<define name="text-table-of-content-children">
+    <choice>
+        <ref name="text-index-entry-chapter"/>
+        <ref name="text-index-entry-page-number"/>
+        <ref name="text-index-entry-text"/>
+        <ref name="text-index-entry-span"/>
+        <ref name="text-index-entry-tab-stop"/>
+        <ref name="text-index-entry-link-start"/>
+        <ref name="text-index-entry-link-end"/>
+    </choice>
+</define>
+<define name="text-table-of-content-entry-template-attlist"
+        combine="interleave">
+    <attribute name="text:outline-level">
+        <ref name="positiveInteger"/>
+    </attribute>
+</define>
+<define name="text-table-of-content-entry-template-attlist"
+        combine="interleave">
+    <attribute name="text:style-name">
+        <ref name="styleNameRef"/>
+    </attribute>
+</define>
+<define name="text-illustration-index">
+    <element name="text:illustration-index">
+        <ref name="sectionAttr"/>
+        <ref name="text-illustration-index-source"/>
+        <ref name="text-index-body"/>
+    </element>
+</define>
+<define name="text-illustration-index-source">
+    <element name="text:illustration-index-source">
+        <ref name="text-illustration-index-source-attrs"/>
+        <optional>
+            <ref name="text-index-title-template"/>
+        </optional>
+        <optional>
+            <ref name="text-illustration-index-entry-template"/>
+        </optional>
+    </element>
+</define>
+<define name="text-illustration-index-source-attrs" combine="interleave">
+    <ref name="text-index-scope-attr"/>
+</define>
+<define name="text-index-scope-attr">
+    <optional>
+        <attribute name="text:index-scope" a:defaultValue="document">
+            <choice>
+                <value>document</value>
+                <value>chapter</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="text-illustration-index-source-attrs" combine="interleave">
+    <ref name="text-relative-tab-stop-position-attr"/>
+</define>
+<define name="text-relative-tab-stop-position-attr">
+    <optional>
+        <attribute name="text:relative-tab-stop-position"
+                   a:defaultValue="true">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-illustration-index-source-attrs" combine="interleave">
+    <optional>
+        <attribute name="text:use-caption" a:defaultValue="true">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-illustration-index-source-attrs" combine="interleave">
+    <optional>
+        <attribute name="text:caption-sequence-name">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-illustration-index-source-attrs" combine="interleave">
+    <optional>
+        <attribute name="text:caption-sequence-format">
+            <choice>
+                <value>text</value>
+                <value>category-and-value</value>
+                <value>caption</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="text-illustration-index-entry-template">
+    <element name="text:illustration-index-entry-template">
+        <ref name="text-illustration-index-entry-content"/>
+    </element>
+</define>
+<define name="text-illustration-index-entry-content">
+    <ref name="text-illustration-index-entry-template-attrs"/>
+    <zeroOrMore>
+        <choice>
+            <ref name="text-index-entry-page-number"/>
+            <ref name="text-index-entry-text"/>
+            <ref name="text-index-entry-span"/>
+            <ref name="text-index-entry-tab-stop"/>
+        </choice>
+    </zeroOrMore>
+</define>
+<define name="text-illustration-index-entry-template-attrs">
+    <attribute name="text:style-name">
+        <ref name="styleNameRef"/>
+    </attribute>
+</define>
+<define name="text-table-index">
+    <element name="text:table-index">
+        <ref name="sectionAttr"/>
+        <ref name="text-table-index-source"/>
+        <ref name="text-index-body"/>
+    </element>
+</define>
+<define name="text-table-index-source">
+    <element name="text:table-index-source">
+        <ref name="text-illustration-index-source-attrs"/>
+        <optional>
+            <ref name="text-index-title-template"/>
+        </optional>
+        <optional>
+            <ref name="text-table-index-entry-template"/>
+        </optional>
+    </element>
+</define>
+<define name="text-table-index-entry-template">
+    <element name="text:table-index-entry-template">
+        <ref name="text-illustration-index-entry-content"/>
+    </element>
+</define>
+<define name="text-object-index">
+    <element name="text:object-index">
+        <ref name="sectionAttr"/>
+        <ref name="text-object-index-source"/>
+        <ref name="text-index-body"/>
+    </element>
+</define>
+<define name="text-object-index-source">
+    <element name="text:object-index-source">
+        <ref name="text-object-index-source-attrs"/>
+        <optional>
+            <ref name="text-index-title-template"/>
+        </optional>
+        <optional>
+            <ref name="text-object-index-entry-template"/>
+        </optional>
+    </element>
+</define>
+<define name="text-object-index-source-attrs" combine="interleave">
+    <ref name="text-index-scope-attr"/>
+</define>
+<define name="text-object-index-source-attrs" combine="interleave">
+    <ref name="text-relative-tab-stop-position-attr"/>
+</define>
+<define name="text-object-index-source-attrs" combine="interleave">
+    <optional>
+        <attribute name="text:use-spreadsheet-objects" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-object-index-source-attrs" combine="interleave">
+    <optional>
+        <attribute name="text:use-math-objects" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-object-index-source-attrs" combine="interleave">
+    <optional>
+        <attribute name="text:use-draw-objects" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-object-index-source-attrs" combine="interleave">
+    <optional>
+        <attribute name="text:use-chart-objects" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-object-index-source-attrs" combine="interleave">
+    <optional>
+        <attribute name="text:use-other-objects" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-object-index-entry-template">
+    <element name="text:object-index-entry-template">
+        <ref name="text-illustration-index-entry-content"/>
+    </element>
+</define>
+<define name="text-user-index">
+    <element name="text:user-index">
+        <ref name="sectionAttr"/>
+        <ref name="text-user-index-source"/>
+        <ref name="text-index-body"/>
+    </element>
+</define>
+<define name="text-user-index-source">
+    <element name="text:user-index-source">
+        <ref name="text-user-index-source-attr"/>
+        <optional>
+            <ref name="text-index-title-template"/>
+        </optional>
+        <zeroOrMore>
+            <ref name="text-user-index-entry-template"/>
+        </zeroOrMore>
+        <zeroOrMore>
+            <ref name="text-index-source-styles"/>
+        </zeroOrMore>
+    </element>
+</define>
+<define name="text-user-index-source-attr" combine="interleave">
+    <ref name="text-index-scope-attr"/>
+    <ref name="text-relative-tab-stop-position-attr"/>
+    <attribute name="text:index-name">
+        <ref name="string"/>
+    </attribute>
+</define>
+<define name="text-user-index-source-attr" combine="interleave">
+    <optional>
+        <attribute name="text:use-index-marks" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="text:use-graphics" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="text:use-tables" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="text:use-floating-frames"
+                     a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="text:use-objects" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-user-index-source-attr" combine="interleave">
+    <optional>
+        <attribute name="text:copy-outline-levels"
+                     a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-user-index-entry-template">
+    <element name="text:user-index-entry-template">
+        <ref name="text-user-index-entry-template-attrs"/>
+        <zeroOrMore>
+            <choice>
+                <ref name="text-index-entry-chapter"/>
+                <ref name="text-index-entry-page-number"/>
+                <ref name="text-index-entry-text"/>
+                <ref name="text-index-entry-span"/>
+                <ref name="text-index-entry-tab-stop"/>
+            </choice>
+        </zeroOrMore>
+    </element>
+</define>
+<define name="text-user-index-entry-template-attrs" combine="interleave">
+    <attribute name="text:outline-level">
+        <ref name="positiveInteger"/>
+    </attribute>
+</define>
+<define name="text-user-index-entry-template-attrs" combine="interleave">
+    <attribute name="text:style-name">
+        <ref name="styleNameRef"/>
+    </attribute>
+</define>
+<define name="text-alphabetical-index">
+    <element name="text:alphabetical-index">
+        <ref name="sectionAttr"/>
+        <ref name="text-alphabetical-index-source"/>
+        <ref name="text-index-body"/>
+    </element>
+</define>
+<define name="text-alphabetical-index-source">
+    <element name="text:alphabetical-index-source">
+        <ref name="text-alphabetical-index-source-attrs"/>
+        <optional>
+            <ref name="text-index-title-template"/>
+        </optional>
+        <zeroOrMore>
+            <ref name="text-alphabetical-index-entry-template"/>
+        </zeroOrMore>
+    </element>
+</define>
+<define name="text-alphabetical-index-source-attrs" combine="interleave">
+    <ref name="text-index-scope-attr"/>
+    <ref name="text-relative-tab-stop-position-attr"/>
+</define>
+<define name="text-alphabetical-index-source-attrs" combine="interleave">
+    <optional>
+        <attribute name="text:ignore-case" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-alphabetical-index-source-attrs" combine="interleave">
+    <optional>
+        <attribute name="text:main-entry-style-name">
+            <ref name="styleNameRef"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-alphabetical-index-source-attrs" combine="interleave">
+    <optional>
+        <attribute name="text:alphabetical-separators" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-alphabetical-index-source-attrs" combine="interleave">
+    <optional>
+        <attribute name="text:combine-entries" a:defaultValue="true">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="text:combine-entries-with-dash"
+                   a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="text:combine-entries-with-pp" a:defaultValue="true">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-alphabetical-index-source-attrs" combine="interleave">
+    <optional>
+        <attribute name="text:use-keys-as-entries" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-alphabetical-index-source-attrs" combine="interleave">
+    <optional>
+        <attribute name="text:capitalize-entries" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-alphabetical-index-source-attrs" combine="interleave">
+    <optional>
+        <attribute name="text:comma-separated" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-alphabetical-index-source-attrs" combine="interleave">
+    <optional>
+        <attribute name="fo:language">
+            <ref name="languageCode"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-alphabetical-index-source-attrs" combine="interleave">
+    <optional>
+        <attribute name="fo:country">
+            <ref name="countryCode"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-alphabetical-index-source-attrs" combine="interleave">
+    <optional>
+        <attribute name="text:sort-algorithm">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-alphabetical-index-auto-mark-file">
+    <element name="text:alphabetical-index-auto-mark-file">
+        <attribute name="xlink:href">
+            <ref name="anyURI"/>
+        </attribute>
+        <optional>
+            <attribute name="xlink:type" a:defaultValue="simple">
+                <value>simple</value>
+            </attribute>
+        </optional>
+    </element>
+</define>
+<define name="text-alphabetical-index-entry-template">
+    <element name="text:alphabetical-index-entry-template">
+        <ref name="text-alphabetical-index-entry-template-attrs"/>
+        <zeroOrMore>
+            <choice>
+                <ref name="text-index-entry-chapter"/>
+                <ref name="text-index-entry-page-number"/>
+                <ref name="text-index-entry-text"/>
+                <ref name="text-index-entry-span"/>
+                <ref name="text-index-entry-tab-stop"/>
+            </choice>
+        </zeroOrMore>
+    </element>
+</define>
+<define name="text-alphabetical-index-entry-template-attrs"
+        combine="interleave">
+    <attribute name="text:outline-level">
+        <choice>
+            <value>1</value>
+            <value>2</value>
+            <value>3</value>
+            <value>separator</value>
+        </choice>
+    </attribute>
+</define>
+<define name="text-alphabetical-index-entry-template-attrs"
+        combine="interleave">
+    <attribute name="text:style-name">
+        <ref name="styleNameRef"/>
+    </attribute>
+</define>
+<define name="text-bibliography">
+    <element name="text:bibliography">
+        <ref name="sectionAttr"/>
+        <ref name="text-bibliography-source"/>
+        <ref name="text-index-body"/>
+    </element>
+</define>
+<define name="text-bibliography-source">
+    <element name="text:bibliography-source">
+        <optional>
+            <ref name="text-index-title-template"/>
+        </optional>
+        <zeroOrMore>
+            <ref name="text-bibliography-entry-template"/>
+        </zeroOrMore>
+    </element>
+</define>
+<define name="text-bibliography-entry-template">
+    <element name="text:bibliography-entry-template">
+        <ref name="text-bibliography-entry-template-attrs"/>
+        <zeroOrMore>
+            <choice>
+                <ref name="text-index-entry-span"/>
+                <ref name="text-index-entry-tab-stop"/>
+                <ref name="text-index-entry-bibliography"/>
+            </choice>
+        </zeroOrMore>
+    </element>
+</define>
+<define name="text-bibliography-entry-template-attrs" combine="interleave">
+    <attribute name="text:bibliography-type">
+        <ref name="text-bibliography-types"/>
+    </attribute>
+</define>
+<define name="text-bibliography-entry-template-attrs" combine="interleave">
+    <attribute name="text:style-name">
+        <ref name="styleNameRef"/>
+    </attribute>
+</define>
+<define name="text-index-source-styles">
+    <element name="text:index-source-styles">
+        <attribute name="text:outline-level">
+            <ref name="positiveInteger"/>
+        </attribute>
+        <zeroOrMore>
+            <ref name="text-index-source-style"/>
+        </zeroOrMore>
+    </element>
+</define>
+<define name="text-index-source-style">
+    <element name="text:index-source-style">
+        <attribute name="text:style-name">
+            <ref name="styleName"/>
+        </attribute>
+        <empty/>
+    </element>
+</define>
+<define name="text-index-title-template">
+    <element name="text:index-title-template">
+        <optional>
+            <attribute name="text:style-name">
+                <ref name="styleNameRef"/>
+            </attribute>
+        </optional>
+        <text/>
+    </element>
+</define>
+<define name="text-index-entry-chapter">
+    <element name="text:index-entry-chapter">
+        <optional>
+            <attribute name="text:style-name">
+                <ref name="styleNameRef"/>
+            </attribute>
+        </optional>
+        <ref name="text-index-entry-chapter-attrs"/>
+    </element>
+</define>
+<define name="text-index-entry-chapter-attrs">
+    <optional>
+        <attribute name="text:display" a:defaultValue="number">
+            <choice>
+                <value>name</value>
+                <value>number</value>
+                <value>number-and-name</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="text-index-entry-text">
+    <element name="text:index-entry-text">
+        <optional>
+            <attribute name="text:style-name">
+                <ref name="styleNameRef"/>
+            </attribute>
+        </optional>
+    </element>
+</define>
+<define name="text-index-entry-page-number">
+    <element name="text:index-entry-page-number">
+        <optional>
+            <attribute name="text:style-name">
+                <ref name="styleNameRef"/>
+            </attribute>
+        </optional>
+    </element>
+</define>
+<define name="text-index-entry-span">
+    <element name="text:index-entry-span">
+        <optional>
+            <attribute name="text:style-name">
+                <ref name="styleNameRef"/>
+            </attribute>
+        </optional>
+        <text/>
+    </element>
+</define>
+<define name="text-index-entry-bibliography">
+    <element name="text:index-entry-bibliography">
+        <ref name="text-index-entry-bibliography-attrs"/>
+    </element>
+</define>
+<define name="text-index-entry-bibliography-attrs" combine="interleave">
+    <optional>
+        <attribute name="text:style-name">
+            <ref name="styleNameRef"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-index-entry-bibliography-attrs" combine="interleave">
+    <attribute name="text:bibliography-data-field">
+        <choice>
+            <value>address</value>
+            <value>annote</value>
+            <value>author</value>
+            <value>bibliography-type</value>
+            <value>booktitle</value>
+            <value>chapter</value>
+            <value>custom1</value>
+            <value>custom2</value>
+            <value>custom3</value>
+            <value>custom4</value>
+            <value>custom5</value>
+            <value>edition</value>
+            <value>editor</value>
+            <value>howpublished</value>
+            <value>identifier</value>
+            <value>institution</value>
+            <value>isbn</value>
+            <value>issn</value>
+            <value>journal</value>
+            <value>month</value>
+            <value>note</value>
+            <value>number</value>
+            <value>organizations</value>
+            <value>pages</value>
+            <value>publisher</value>
+            <value>report-type</value>
+            <value>school</value>
+            <value>series</value>
+            <value>title</value>
+            <value>url</value>
+            <value>volume</value>
+            <value>year</value>
+        </choice>
+    </attribute>
+</define>
+<define name="text-index-entry-tab-stop">
+    <element name="text:index-entry-tab-stop">
+        <optional>
+            <attribute name="text:style-name">
+                <ref name="styleNameRef"/>
+            </attribute>
+        </optional>
+        <ref name="text-index-entry-tab-stop-attrs"/>
+    </element>
+</define>
+<define name="text-index-entry-tab-stop-attrs" combine="interleave">
+    <optional>
+        <attribute name="style:leader-char">
+            <ref name="character"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-index-entry-tab-stop-attrs" combine="interleave">
+    <choice>
+        <attribute name="style:type">
+            <value>right</value>
+        </attribute>
+        <group>
+            <attribute name="style:type">
+                <value>left</value>
+            </attribute>
+            <attribute name="style:position">
+                <ref name="length"/>
+            </attribute>
+        </group>
+    </choice>
+</define>
+<define name="text-index-entry-link-start">
+    <element name="text:index-entry-link-start">
+        <optional>
+            <attribute name="text:style-name">
+                <ref name="styleNameRef"/>
+            </attribute>
+        </optional>
+    </element>
+</define>
+<define name="text-index-entry-link-end">
+    <element name="text:index-entry-link-end">
+        <optional>
+            <attribute name="text:style-name">
+                <ref name="styleNameRef"/>
+            </attribute>
+        </optional>
+    </element>
+</define>
+<define name="table-table">
+    <element name="table:table">
+        <ref name="table-table-attlist"/>
+        <optional>
+            <ref name="table-table-source"/>
+        </optional>
+        <optional>
+            <ref name="office-dde-source"/>
+        </optional>
+        <optional>
+            <ref name="table-scenario"/>
+        </optional>
+        <optional>
+            <ref name="office-forms"/>
+        </optional>
+        <optional>
+            <ref name="table-shapes"/>
+        </optional>
+        <ref name="table-columns-and-groups"/>
+        <ref name="table-rows-and-groups"/>
+    </element>
+</define>
+<define name="table-columns-and-groups">
+    <oneOrMore>
+        <choice>
+            <ref name="table-table-column-group"/>
+            <ref name="table-columns-no-group"/>
+        </choice>
+    </oneOrMore>
+</define>
+
+<define name="table-columns-no-group">
+    <choice>
+        <group>
+            <ref name="table-columns"/>
+            <optional>
+                <ref name="table-table-header-columns"/>
+                <optional>
+                    <ref name="table-columns"/>
+                </optional>
+            </optional>
+        </group>
+        <group>
+            <ref name="table-table-header-columns"/>
+            <optional>
+                <ref name="table-columns"/>
+            </optional>
+        </group>
+    </choice>
+</define>
+
+<define name="table-columns">
+    <choice>
+        <ref name="table-table-columns"/>
+        <oneOrMore>
+                <ref name="table-table-column"/>
+        </oneOrMore>
+    </choice>
+</define>
+
+<define name="table-rows-and-groups">
+    <oneOrMore>
+        <choice>
+            <ref name="table-table-row-group"/>
+            <ref name="table-rows-no-group"/>
+        </choice>
+    </oneOrMore>
+</define>
+
+<define name="table-rows-no-group">
+    <choice>
+        <group>
+            <ref name="table-rows"/>
+            <optional>
+                <ref name="table-table-header-rows"/>
+                <optional>
+                    <ref name="table-rows"/>
+                </optional>
+            </optional>
+        </group>
+        <group>
+            <ref name="table-table-header-rows"/>
+            <optional>
+                <ref name="table-rows"/>
+            </optional>
+        </group>
+    </choice>
+</define>
+
+<define name="table-rows">
+    <choice>
+        <ref name="table-table-rows"/>
+        <oneOrMore>
+            <optional>
+                <ref name="text-soft-page-break"/>
+            </optional>
+            <ref name="table-table-row"/>
+        </oneOrMore>
+    </choice>
+</define>
+<define name="table-table-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:name">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-table-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:style-name">
+            <ref name="styleNameRef"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-table-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:protected" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="table:protection-key">
+            <text/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-table-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:print" a:defaultValue="true">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-table-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:print-ranges">
+            <ref name="cellRangeAddressList"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-table-row">
+    <element name="table:table-row">
+        <ref name="table-table-row-attlist"/>
+        <oneOrMore>
+            <choice>
+                <ref name="table-table-cell"/>
+                <ref name="table-covered-table-cell"/>
+            </choice>
+        </oneOrMore>
+    </element>
+</define>
+<define name="table-table-row-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:number-rows-repeated" a:defaultValue="1">
+            <ref name="positiveInteger"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-table-row-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:style-name">
+            <ref name="styleNameRef"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-table-row-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:default-cell-style-name">
+            <ref name="styleNameRef"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-table-row-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:visibility" a:defaultValue="visible">
+            <ref name="table-visibility-value"/>
+        </attribute>
+    </optional>
+</define>
+
+<define name="table-visibility-value">
+    <choice>
+        <value>visible</value>
+        <value>collapse</value>
+        <value>filter</value>
+    </choice>
+</define>
+<define name="table-table-cell">
+    <element name="table:table-cell">
+        <ref name="table-table-cell-attlist"/>
+        <ref name="table-table-cell-attlist-extra"/>
+        <ref name="table-table-cell-content"/>
+    </element>
+</define>
+
+<define name="table-covered-table-cell">
+    <element name="table:covered-table-cell">
+        <ref name="table-table-cell-attlist"/>
+        <ref name="table-table-cell-content"/>
+    </element>
+</define>
+
+<define name="table-table-cell-content">
+    <optional>
+        <ref name="table-cell-range-source"/>
+    </optional>
+    <optional>
+        <ref name="office-annotation"/>
+    </optional>
+    <optional>
+        <ref name="table-detective"/>
+    </optional>
+    <zeroOrMore>
+        <ref name="text-content"/>
+    </zeroOrMore>
+</define>
+<define name="table-table-cell-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:number-columns-repeated" a:defaultValue="1">
+            <ref name="positiveInteger"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-table-cell-attlist-extra" combine="interleave">
+    <optional>
+        <attribute name="table:number-columns-spanned" a:defaultValue="1">
+            <ref name="positiveInteger"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="table:number-rows-spanned" a:defaultValue="1">
+            <ref name="positiveInteger"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-table-cell-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:style-name">
+            <ref name="styleNameRef"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-table-cell-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:content-validation-name">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-table-cell-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:formula">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-table-cell-attlist-extra" combine="interleave">
+    <optional>
+        <attribute name="table:number-matrix-columns-spanned">
+            <ref name="positiveInteger"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="table:number-matrix-rows-spanned">
+            <ref name="positiveInteger"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-table-cell-attlist" combine="interleave">
+    <optional>
+        <ref name="common-value-and-type-attlist"/>
+    </optional>
+</define>
+<define name="table-table-cell-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:protect" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-table-column">
+    <element name="table:table-column">
+        <ref name="table-table-column-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="table-table-column-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:number-columns-repeated" a:defaultValue="1">
+            <ref name="positiveInteger"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-table-column-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:style-name">
+            <ref name="styleNameRef"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-table-column-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:visibility" a:defaultValue="visible">
+            <ref name="table-visibility-value"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-table-column-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:default-cell-style-name">
+            <ref name="styleNameRef"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-table-header-columns">
+    <element name="table:table-header-columns">
+        <oneOrMore>
+            <ref name="table-table-column"/>
+        </oneOrMore>
+    </element>
+</define>
+
+<define name="table-table-columns">
+    <element name="table:table-columns">
+        <oneOrMore>
+            <ref name="table-table-column"/>
+        </oneOrMore>
+    </element>
+</define>
+<define name="table-table-column-group">
+    <element name="table:table-column-group">
+        <ref name="table-table-column-group-attlist"/>
+        <ref name="table-columns-and-groups"/>
+    </element>
+</define>
+<define name="table-table-column-group-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:display" a:defaultValue="true">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-table-header-rows">
+    <element name="table:table-header-rows">
+        <oneOrMore>
+            <optional>
+                <ref name="text-soft-page-break"/>
+            </optional>
+            <ref name="table-table-row"/>
+        </oneOrMore>
+    </element>
+</define>
+
+<define name="table-table-rows">
+    <element name="table:table-rows">
+        <oneOrMore>
+            <optional>
+                <ref name="text-soft-page-break"/>
+            </optional>
+            <ref name="table-table-row"/>
+        </oneOrMore>
+    </element>
+</define>
+<define name="table-table-row-group">
+    <element name="table:table-row-group">
+        <ref name="table-table-row-group-attlist"/>
+        <ref name="table-rows-and-groups"/>
+    </element>
+</define>
+<define name="table-table-row-group-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:display" a:defaultValue="true">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-table-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:is-sub-table" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="cellAddress">
+    <data type="string">
+        <param name="pattern">($?([^\. ']+|'([^']|'')+'))?\.$?[A-Z]+$?[0-9]+</param>
+
+    </data>
+</define>
+<define name="cellRangeAddress">
+    <data type="string">
+        <param name="pattern">($?([^\. ']+|'([^']|'')+'))?\.$?[A-Z]+$?[0-9]+(:($?([^\. ']+|'([^']|'')+'))?\.$?[A-Z]+$?[0-9]+)?</param>
+
+    </data>
+</define>
+<define name="cellRangeAddressList">
+    <!-- Value is a space separated list of "cellRangeAddress" patterns -->
+    <data type="string"/> 
+</define>
+<define name="table-table-source">
+    <element name="table:table-source">
+        <ref name="table-table-source-attlist"/>
+        <ref name="table-linked-source-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="table-table-source-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:mode" a:defaultValue="copy-all">
+            <choice>
+                <value>copy-all</value>
+                <value>copy-results-only</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="table-table-source-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:table-name">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-linked-source-attlist" combine="interleave">
+    <optional>
+        <attribute name="xlink:type" a:defaultValue="simple">
+            <value>simple</value>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="xlink:actuate" a:defaultValue="onRequest">
+            <value>onRequest</value>
+        </attribute>
+    </optional>
+    <attribute name="xlink:href">
+        <ref name="anyURI"/>
+    </attribute>
+</define>
+<define name="table-linked-source-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:filter-name">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-linked-source-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:filter-options">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-linked-source-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:refresh-delay">
+            <ref name="duration"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-scenario">
+    <element name="table:scenario">
+        <ref name="table-scenario-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="table-scenario-attlist" combine="interleave">
+    <attribute name="table:scenario-ranges">
+        <ref name="cellRangeAddressList"/>
+    </attribute>
+</define>
+<define name="table-scenario-attlist" combine="interleave">
+    <attribute name="table:is-active">
+        <ref name="boolean"/>
+    </attribute>
+</define>
+<define name="table-scenario-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:display-border" a:defaultValue="true">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-scenario-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:border-color">
+            <ref name="color"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-scenario-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:copy-back" a:defaultValue="true">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-scenario-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:copy-styles" a:defaultValue="true">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-scenario-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:copy-formulas" a:defaultValue="true">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-scenario-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:comment">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-scenario-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:protected">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-shapes">
+    <element name="table:shapes">
+        <oneOrMore>
+            <ref name="shape"/>
+        </oneOrMore>
+    </element>
+</define>
+<define name="table-cell-range-source">
+    <element name="table:cell-range-source">
+        <ref name="table-table-cell-range-source-attlist"/>
+        <ref name="table-linked-source-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="table-table-cell-range-source-attlist" combine="interleave">
+    <attribute name="table:name">
+        <ref name="string"/>
+    </attribute>
+</define>
+<define name="table-table-cell-range-source-attlist" combine="interleave">
+    <attribute name="table:last-column-spanned">
+        <ref name="positiveInteger"/>
+    </attribute>
+    <attribute name="table:last-row-spanned">
+        <ref name="positiveInteger"/>
+    </attribute>
+</define>
+<define name="table-detective">
+    <element name="table:detective">
+        <zeroOrMore>
+            <ref name="table-highlighted-range"/>
+        </zeroOrMore>
+        <zeroOrMore>
+            <ref name="table-operation"/>
+        </zeroOrMore>
+    </element>
+</define>
+<define name="table-operation">
+    <element name="table:operation">
+        <ref name="table-operation-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="table-operation-attlist" combine="interleave">
+    <attribute name="table:name">
+        <choice>
+            <value>trace-dependents</value>
+            <value>remove-dependents</value>
+            <value>trace-precedents</value>
+            <value>remove-precedents</value>
+            <value>trace-errors</value>
+        </choice>
+    </attribute>
+</define>
+<define name="table-operation-attlist" combine="interleave">
+    <attribute name="table:index">
+        <ref name="nonNegativeInteger"/>
+    </attribute>
+</define>
+<define name="table-highlighted-range">
+    <element name="table:highlighted-range">
+        <choice>
+            <group>
+                <ref name="table-highlighted-range-attlist"/>
+            </group>
+            <group>
+                <ref name="table-highlighted-range-attlist-invalid"/>
+            </group>
+        </choice>
+        <empty/>
+    </element>
+</define>
+<define name="table-highlighted-range-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:cell-range-address">
+            <ref name="cellRangeAddress"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-highlighted-range-attlist" combine="interleave">
+    <attribute name="table:direction">
+        <choice>
+            <value>from-another-table</value>
+            <value>to-another-table</value>
+            <value>from-same-table</value>
+        </choice>
+    </attribute>
+</define>
+<define name="table-highlighted-range-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:contains-error" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-highlighted-range-attlist-invalid" combine="interleave">
+    <attribute name="table:marked-invalid">
+        <ref name="boolean"/>
+    </attribute>
+</define>
+<define name="office-spreadsheet-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:structure-protected" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="table:protection-key">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-calculation-settings">
+    <element name="table:calculation-settings">
+        <ref name="table-calculation-setting-attlist"/>
+        <optional>
+            <ref name="table-null-date"/>
+        </optional>
+        <optional>
+            <ref name="table-iteration"/>
+        </optional>
+    </element>
+</define>
+<define name="table-calculation-setting-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:case-sensitive" a:defaultValue="true">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-calculation-setting-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:precision-as-shown" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-calculation-setting-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:search-criteria-must-apply-to-whole-cell"
+                     a:defaultValue="true">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-calculation-setting-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:automatic-find-labels" a:defaultValue="true">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-calculation-setting-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:use-regular-expressions"
+                     a:defaultValue="true">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-calculation-setting-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:null-year" a:defaultValue="1930">
+            <ref name="positiveInteger"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-null-date">
+    <element name="table:null-date">
+        <optional>
+            <attribute name="table:value-type" a:defaultValue="date">
+                <ref name="valueType"/>
+            </attribute>
+        </optional>
+        <optional>
+            <attribute name="table:date-value"
+                         a:defaultValue="1899-12-30">
+                <ref name="date"/>
+            </attribute>
+        </optional>
+        <empty/>
+    </element>
+</define>
+<define name="table-iteration">
+    <element name="table:iteration">
+        <optional>
+            <attribute name="table:status" a:defaultValue="disable">
+                <choice>
+                    <value>enable</value>
+                    <value>disable</value>
+                </choice>
+            </attribute>
+        </optional>
+        <optional>
+            <attribute name="table:steps" a:defaultValue="100">
+                <ref name="positiveInteger"/>
+            </attribute>
+        </optional>
+        <optional>
+            <attribute name="table:maximum-difference"
+                         a:defaultValue="0.001">
+                <ref name="double"/>
+            </attribute>
+        </optional>
+        <empty/>
+    </element>
+</define>
+<define name="table-content-validations">
+    <element name="table:content-validations">
+        <oneOrMore>
+            <ref name="table-content-validation"/>
+        </oneOrMore>
+    </element>
+</define>
+
+<define name="table-content-validation">
+    <element name="table:content-validation">
+        <ref name="table-validation-attlist"/>
+        <optional>
+            <ref name="table-help-message"/>
+        </optional>
+        <optional>
+            <choice>
+                <ref name="table-error-message"/>
+                <group>
+                    <ref name="table-error-macro"/>
+                    <optional>
+                        <ref name="office-event-listeners"/>
+                    </optional>
+                </group>
+            </choice>
+        </optional>
+    </element>
+</define>
+<define name="table-validation-attlist" combine="interleave">
+    <attribute name="table:name">
+        <ref name="string"/>
+    </attribute>
+</define>
+<define name="table-validation-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:condition">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-validation-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:base-cell-address">
+            <ref name="cellAddress"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-validation-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:allow-empty-cell" a:defaultValue="true">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-validation-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:display-list" a:defaultValue="unsorted">
+            <choice>
+                <value>none</value>
+                <value>unsorted</value>
+                <value>sort-ascending</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="table-help-message">
+    <element name="table:help-message">
+        <optional>
+            <attribute name="table:title">
+                <ref name="string"/>
+            </attribute>
+        </optional>
+        <optional>
+            <attribute name="table:display" a:defaultValue="false">
+                <ref name="boolean"/>
+            </attribute>
+        </optional>
+        <zeroOrMore>
+            <ref name="text-p"/>
+        </zeroOrMore>
+    </element>
+</define>
+<define name="table-error-message">
+    <element name="table:error-message">
+        <optional>
+            <attribute name="table:title">
+                <ref name="string"/>
+            </attribute>
+        </optional>
+        <optional>
+            <attribute name="table:display" a:defaultValue="false">
+                <ref name="boolean"/>
+            </attribute>
+        </optional>
+        <optional>
+            <attribute name="table:message-type" a:defaultValue="stop">
+                <choice>
+                    <value>stop</value>
+                    <value>warning</value>
+                    <value>information</value>
+                </choice>
+            </attribute>
+        </optional>
+        <zeroOrMore>
+            <ref name="text-p"/>
+        </zeroOrMore>
+    </element>
+</define>
+<define name="table-error-macro">
+    <element name="table:error-macro">
+        <optional>
+            <attribute name="table:execute" a:defaultValue="true">
+                <ref name="boolean"/>
+            </attribute>
+        </optional>
+    </element>
+</define>
+<define name="table-label-ranges">
+    <element name="table:label-ranges">
+        <zeroOrMore>
+            <ref name="table-label-range"/>
+        </zeroOrMore>
+    </element>
+</define>
+
+<define name="table-label-range">
+    <element name="table:label-range">
+        <ref name="table-label-range-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="table-label-range-attlist" combine="interleave">
+    <attribute name="table:label-cell-range-address">
+        <ref name="cellRangeAddress"/>
+    </attribute>
+</define>
+<define name="table-label-range-attlist" combine="interleave">
+    <attribute name="table:data-cell-range-address">
+        <ref name="cellRangeAddress"/>
+    </attribute>
+</define>
+<define name="table-label-range-attlist" combine="interleave">
+    <attribute name="table:orientation">
+        <choice>
+            <value>column</value>
+            <value>row</value>
+        </choice>
+    </attribute>
+</define>
+<define name="table-named-expressions">
+    <element name="table:named-expressions">
+        <zeroOrMore>
+            <choice>
+                <ref name="table-named-range"/>
+                <ref name="table-named-expression"/>
+            </choice>
+        </zeroOrMore>
+    </element>
+</define>
+
+<define name="table-named-range">
+    <element name="table:named-range">
+        <ref name="table-named-range-attlist"/>
+        <empty/>
+    </element>
+</define>
+
+<define name="table-named-range-attlist" combine="interleave">
+    <attribute name="table:name">
+        <ref name="string"/>
+    </attribute>
+    <attribute name="table:cell-range-address">
+        <ref name="cellRangeAddress"/>
+    </attribute>
+    <optional>
+        <attribute name="table:base-cell-address">
+            <ref name="cellAddress"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="table:range-usable-as" a:defaultValue="none">
+            <choice>
+                <value>none</value>
+                <list>
+                    <oneOrMore>
+                        <choice>
+                            <value>print-range</value>
+                            <value>filter</value>
+                            <value>repeat-row</value>
+                            <value>repeat-column</value>
+                        </choice>
+                    </oneOrMore>
+                </list>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="table-named-expression">
+    <element name="table:named-expression">
+        <ref name="table-named-expression-attlist"/>
+        <empty/>
+    </element>
+</define>
+
+<define name="table-named-expression-attlist" combine="interleave">
+    <attribute name="table:name">
+        <ref name="string"/>
+    </attribute>
+    <attribute name="table:expression">
+        <ref name="string"/>
+    </attribute>
+    <optional>
+        <attribute name="table:base-cell-address">
+            <ref name="cellAddress"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-database-ranges">
+    <element name="table:database-ranges">
+        <zeroOrMore>
+            <ref name="table-database-range"/>
+        </zeroOrMore>
+    </element>
+</define>
+<define name="table-database-range">
+    <element name="table:database-range">
+        <ref name="table-database-range-attlist"/>
+        <optional>
+            <choice>
+                <ref name="table-database-source-sql"/>
+                <ref name="table-database-source-table"/>
+                <ref name="table-database-source-query"/>
+            </choice>
+        </optional>
+        <optional>
+            <ref name="table-filter"/>
+        </optional>
+        <optional>
+            <ref name="table-sort"/>
+        </optional>
+        <optional>
+            <ref name="table-subtotal-rules"/>
+        </optional>
+    </element>
+</define>
+<define name="table-database-range-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:name">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-database-range-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:is-selection" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-database-range-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:on-update-keep-styles" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-database-range-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:on-update-keep-size" a:defaultValue="true">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-database-range-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:has-persistent-data" a:defaultValue="true">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-database-range-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:orientation" a:defaultValue="row">
+            <choice>
+                <value>column</value>
+                <value>row</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="table-database-range-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:contains-header" a:defaultValue="true">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-database-range-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:display-filter-buttons"
+                   a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-database-range-attlist" combine="interleave">
+    <attribute name="table:target-range-address">
+        <ref name="cellRangeAddress"/>
+    </attribute>
+</define>
+<define name="table-database-range-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:refresh-delay">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-database-source-sql">
+    <element name="table:database-source-sql">
+        <ref name="table-database-source-sql-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="table-database-source-sql-attlist" combine="interleave">
+    <attribute name="table:database-name">
+        <ref name="string"/>
+    </attribute>
+</define>
+<define name="table-database-source-sql-attlist" combine="interleave">
+    <attribute name="table:sql-statement">
+        <ref name="string"/>
+    </attribute>
+</define>
+<define name="table-database-source-sql-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:parse-sql-statement" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-database-source-query">
+    <element name="table:database-source-table">
+        <ref name="table-database-source-table-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="table-database-source-table-attlist" combine="interleave">
+    <attribute name="table:database-name">
+        <ref name="string"/>
+    </attribute>
+</define>
+<define name="table-database-source-table-attlist" combine="interleave">
+    <attribute name="table:database-table-name">
+        <ref name="string"/>
+    </attribute>
+</define>
+<define name="table-database-source-table">
+    <element name="table:database-source-query">
+        <ref name="table-database-source-query-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="table-database-source-query-attlist" combine="interleave">
+    <attribute name="table:database-name">
+        <ref name="string"/>
+    </attribute>
+</define>
+<define name="table-database-source-query-attlist" combine="interleave">
+    <attribute name="table:query-name">
+        <ref name="string"/>
+    </attribute>
+</define>
+<define name="table-sort">
+    <element name="table:sort">
+        <ref name="table-sort-attlist"/>
+        <oneOrMore>
+            <ref name="table-sort-by"/>
+        </oneOrMore>
+    </element>
+</define>
+<define name="table-sort-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:bind-styles-to-content" a:defaultValue="true">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-sort-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:target-range-address">
+            <ref name="cellRangeAddress"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-sort-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:case-sensitive" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-sort-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:language">
+            <ref name="languageCode"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-sort-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:country">
+            <ref name="countryCode"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-sort-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:algorithm">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-sort-by">
+    <element name="table:sort-by">
+        <ref name="table-sort-by-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="table-sort-by-attlist" combine="interleave">
+    <attribute name="table:field-number">
+        <ref name="nonNegativeInteger"/>
+    </attribute>
+</define>
+<define name="table-sort-by-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:data-type" a:defaultValue="automatic">
+            <choice>
+                <value>text</value>
+                <value>number</value>
+                <value>automatic</value>
+                <ref name="string"/>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="table-sort-by-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:order" a:defaultValue="ascending">
+            <choice>
+                <value>ascending</value>
+                <value>descending</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="table-subtotal-rules">
+    <element name="table:subtotal-rules">
+        <ref name="table-subtotal-rules-attlist"/>
+        <optional>
+            <ref name="table-sort-groups"/>
+        </optional>
+        <zeroOrMore>
+            <ref name="table-subtotal-rule"/>
+        </zeroOrMore>
+    </element>
+</define>
+<define name="table-subtotal-rules-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:bind-styles-to-content" a:defaultValue="true">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-subtotal-rules-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:case-sensitive" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-subtotal-rules-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:page-breaks-on-group-change"
+                   a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-sort-groups">
+    <element name="table:sort-groups">
+        <ref name="table-sort-groups-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="table-sort-groups-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:data-type" a:defaultValue="automatic">
+            <choice>
+                <value>text</value>
+                <value>number</value>
+                <value>automatic</value>
+                <ref name="string"/>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="table-sort-groups-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:order" a:defaultValue="ascending">
+            <choice>
+                <value>ascending</value>
+                <value>descending</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="table-subtotal-rule">
+    <element name="table:subtotal-rule">
+        <ref name="table-subtotal-rule-attlist"/>
+        <zeroOrMore>
+            <ref name="table-subtotal-field"/>
+        </zeroOrMore>
+    </element>
+</define>
+<define name="table-subtotal-rule-attlist" combine="interleave">
+    <attribute name="table:group-by-field-number">
+        <ref name="nonNegativeInteger"/>
+    </attribute>
+</define>
+<define name="table-subtotal-field">
+    <element name="table:subtotal-field">
+        <ref name="table-subtotal-field-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="table-subtotal-field-attlist" combine="interleave">
+    <attribute name="table:field-number">
+        <ref name="nonNegativeInteger"/>
+    </attribute>
+</define>
+<define name="table-subtotal-field-attlist" combine="interleave">
+    <attribute name="table:function">
+        <choice>
+            <value>auto</value>
+            <value>average</value>
+            <value>count</value>
+            <value>countnums</value>
+            <value>max</value>
+            <value>min</value>
+            <value>product</value>
+            <value>stdev</value>
+            <value>stdevp</value>
+            <value>sum</value>
+            <value>var</value>
+            <value>varp</value>
+            <ref name="string"/>
+        </choice>
+    </attribute>
+</define>
+<define name="table-filter">
+    <element name="table:filter">
+        <ref name="table-filter-attlist"/>
+        <choice>
+            <ref name="table-filter-condition"/>
+            <ref name="table-filter-and"/>
+            <ref name="table-filter-or"/>
+        </choice>
+    </element>
+</define>
+<define name="table-filter-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:target-range-address">
+            <ref name="cellRangeAddress"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-filter-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:condition-source" a:defaultValue="self">
+            <choice>
+                <value>self</value>
+                <value>cell-range</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="table-filter-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:condition-source-range-address">
+            <ref name="cellRangeAddress"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-filter-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:display-duplicates" a:defaultValue="true">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-filter-and">
+    <element name="table:filter-and">
+        <oneOrMore>
+            <choice>
+                <ref name="table-filter-or"/>
+                <ref name="table-filter-condition"/>
+            </choice>
+        </oneOrMore>
+    </element>
+</define>
+<define name="table-filter-or">
+    <element name="table:filter-or">
+        <oneOrMore>
+            <choice>
+                <ref name="table-filter-and"/>
+                <ref name="table-filter-condition"/>
+            </choice>
+        </oneOrMore>
+    </element>
+</define>
+<define name="table-filter-condition">
+    <element name="table:filter-condition">
+        <ref name="table-filter-condition-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="table-filter-condition-attlist" combine="interleave">
+    <attribute name="table:field-number">    
+        <ref name="nonNegativeInteger"/>
+    </attribute>
+</define>
+<define name="table-filter-condition-attlist" combine="interleave">
+    <attribute name="table:value">    
+        <ref name="string"/>
+    </attribute>
+</define>
+<define name="table-filter-condition-attlist" combine="interleave">
+    <attribute name="table:operator">    
+        <ref name="string"/>
+    </attribute>
+</define>
+<define name="table-filter-condition-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:case-sensitive" a:defaultValue="false">    
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-filter-condition-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:data-type" a:defaultValue="text">
+            <choice>
+                <value>text</value>
+                <value>number</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="table-data-pilot-tables">
+    <element name="table:data-pilot-tables">
+        <zeroOrMore>
+            <ref name="table-data-pilot-table"/>
+        </zeroOrMore>
+    </element>
+</define>
+<define name="table-data-pilot-table">
+    <element name="table:data-pilot-table">
+        <ref name="table-data-pilot-table-attlist"/>
+        <optional>
+            <choice>
+                <ref name="table-database-source-sql"/>
+                <ref name="table-database-source-table"/>
+                <ref name="table-database-source-query"/>
+                <ref name="table-source-service"/>
+                <ref name="table-source-cell-range"/>
+            </choice>
+        </optional>
+        <oneOrMore>
+            <ref name="table-data-pilot-field"/>
+        </oneOrMore>
+    </element>
+</define>
+<define name="table-data-pilot-table-attlist" combine="interleave">
+    <attribute name="table:name">
+        <ref name="string"/>
+    </attribute>
+</define>
+<define name="table-data-pilot-table-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:application-data">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-data-pilot-table-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:grand-total" a:defaultValue="both">
+            <choice>
+                <value>none</value>
+                <value>row</value>
+                <value>column</value>
+                <value>both</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="table-data-pilot-table-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:ignore-empty-rows" a:defaultValue="false">    
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-data-pilot-table-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:identify-categories" a:defaultValue="false">    
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-data-pilot-table-attlist" combine="interleave">
+    <attribute name="table:target-range-address">    
+        <ref name="cellRangeAddress"/>
+    </attribute>
+</define>
+<define name="table-data-pilot-table-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:buttons">    
+            <ref name="cellRangeAddressList"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-data-pilot-table-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:show-filter-button" a:defaultValue="true">    
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-data-pilot-table-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:drill-down-on-double-click"
+                   a:defaultValue="true">    
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-source-cell-range">
+    <element name="table:source-cell-range">
+        <ref name="table-source-cell-range-attlist"/>
+        <optional>
+            <ref name="table-filter"/>
+        </optional>
+    </element>
+</define>
+<define name="table-source-cell-range-attlist" combine="interleave">
+    <attribute name="table:cell-range-address">    
+        <ref name="cellRangeAddress"/>
+    </attribute>
+</define>
+<define name="table-source-service">
+    <element name="table:source-service">
+        <ref name="table-source-service-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="table-source-service-attlist" combine="interleave">
+    <attribute name="table:name">    
+        <ref name="string"/>
+    </attribute>
+</define>
+<define name="table-source-service-attlist" combine="interleave">
+    <attribute name="table:source-name">
+        <ref name="string"/>
+    </attribute>
+</define>
+<define name="table-source-service-attlist" combine="interleave">
+    <attribute name="table:object-name">
+        <ref name="string"/>
+    </attribute>
+</define>
+<define name="table-source-service-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:user-name">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-source-service-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:password">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-data-pilot-field">
+    <element name="table:data-pilot-field">
+        <ref name="table-data-pilot-field-attlist"/>
+        <optional>
+            <ref name="table-data-pilot-level"/>
+        </optional>
+        <optional>
+            <ref name="table-data-pilot-field-reference"/>
+        </optional>
+        <optional>
+            <ref name="table-data-pilot-groups"/>
+        </optional>
+    </element>
+</define>
+<define name="table-data-pilot-field-attlist" combine="interleave">
+    <attribute name="table:source-field-name">    
+        <ref name="string"/>
+    </attribute>
+</define>
+<define name="table-data-pilot-field-attlist" combine="interleave">
+    <choice>
+        <attribute name="table:orientation">    
+            <choice>
+                <value>row</value>
+                <value>column</value>
+                <value>data</value>
+                <value>hidden</value>
+            </choice>
+        </attribute>
+        <group>
+            <attribute name="table:orientation">
+                <value>page</value>
+            </attribute>
+            <attribute name="table:selected-page">
+                <ref name="string"/>
+            </attribute>
+        </group>
+    </choice>
+</define>
+<define name="table-data-pilot-field-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:is-data-layout-field" a:defaultValue="false">    
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-data-pilot-field-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:function">
+            <choice>
+                <value>auto</value>
+                <value>average</value>
+                <value>count</value>
+                <value>countnums</value>
+                <value>max</value>
+                <value>min</value>
+                <value>product</value>
+                <value>stdev</value>
+                <value>stdevp</value>
+                <value>sum</value>
+                <value>var</value>
+                <value>varp</value>
+                <ref name="string"/>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="table-data-pilot-field-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:used-hierarchy" a:defaultValue="-1">    
+            <ref name="integer"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-data-pilot-level">
+    <element name="table:data-pilot-level">
+        <ref name="table-data-pilot-level-attlist"/>
+        <optional>
+            <ref name="table-data-pilot-subtotals"/>
+        </optional>
+        <optional>
+            <ref name="table-data-pilot-members"/>
+        </optional>
+        <optional>
+            <ref name="table-data-pilot-display-info"/>
+        </optional>
+        <optional>
+            <ref name="table-data-pilot-sort-info"/>
+        </optional>
+        <optional>
+            <ref name="table-data-pilot-layout-info"/>
+        </optional>
+    </element>
+</define>
+<define name="table-data-pilot-level-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:show-empty">    
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-data-pilot-subtotals">
+    <element name="table:data-pilot-subtotals">
+        <zeroOrMore>
+            <ref name="table-data-pilot-subtotal"/>
+        </zeroOrMore>
+    </element>
+</define>
+<define name="table-data-pilot-subtotal">
+    <element name="table:data-pilot-subtotal">
+        <ref name="table-data-pilot-subtotal-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="table-data-pilot-subtotal-attlist" combine="interleave">
+    <attribute name="table:function">
+        <choice>
+            <value>auto</value>
+            <value>average</value>
+            <value>count</value>
+            <value>countnums</value>
+            <value>max</value>
+            <value>min</value>
+            <value>product</value>
+            <value>stdev</value>
+            <value>stdevp</value>
+            <value>sum</value>
+            <value>var</value>
+            <value>varp</value>
+            <ref name="string"/>
+        </choice>
+    </attribute>
+</define>
+<define name="table-data-pilot-members">
+    <element name="table:data-pilot-members">
+        <zeroOrMore>
+            <ref name="table-data-pilot-member"/>
+        </zeroOrMore>
+    </element>
+</define>
+<define name="table-data-pilot-member">
+    <element name="table:data-pilot-member">
+        <ref name="table-data-pilot-member-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="table-data-pilot-member-attlist" combine="interleave">
+    <attribute name="table:name">
+        <ref name="string"/>
+    </attribute>
+</define>
+<define name="table-data-pilot-member-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:display">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-data-pilot-member-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:show-details">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-data-pilot-display-info">
+    <element name="table:data-pilot-display-info">
+        <ref name="table-data-pilot-display-info-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="table-data-pilot-display-info-attlist" combine="interleave">
+    <attribute name="table:enabled">
+        <ref name="boolean"/>
+    </attribute>
+</define>
+<define name="table-data-pilot-display-info-attlist" combine="interleave">
+    <attribute name="table:data-field">
+        <ref name="string"/>
+    </attribute>
+</define>
+<define name="table-data-pilot-display-info-attlist" combine="interleave">
+    <attribute name="table:member-count">
+        <ref name="nonNegativeInteger"/>
+    </attribute>
+</define>
+<define name="table-data-pilot-display-info-attlist" combine="interleave">
+    <attribute name="table:display-member-mode">
+        <choice>
+            <value>from-top</value>
+            <value>from-bottom</value>
+        </choice>
+    </attribute>
+</define>
+<define name="table-data-pilot-sort-info">
+    <element name="table:data-pilot-sort-info">
+        <ref name="table-data-pilot-sort-info-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="table-data-pilot-sort-info-attlist" combine="interleave">
+    <choice>
+        <group>
+            <attribute name="table:sort-mode">
+                <value>data</value>
+            </attribute>
+            <attribute name="table:data-field">
+                <ref name="string"/>
+            </attribute>
+        </group>
+        <attribute name="table:sort-mode">
+            <choice>
+                <value>none</value>
+                <value>manual</value>
+                <value>name</value>
+            </choice>
+        </attribute>
+    </choice>
+</define>
+<define name="table-data-pilot-sort-info-attlist" combine="interleave">
+    <attribute name="table:order">
+        <choice>
+            <value>ascending</value>
+            <value>descending</value>
+        </choice>
+    </attribute>
+</define>
+<define name="table-data-pilot-layout-info">
+    <element name="table:data-pilot-layout-info">
+        <ref name="table-data-pilot-layout-info-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="table-data-pilot-layout-info-attlist" combine="interleave">
+    <attribute name="table:layout-mode">
+        <choice>
+            <value>tabular-layout</value>
+            <value>outline-subtotals-top</value>
+            <value>outline-subtotals-bottom</value>
+        </choice>
+    </attribute>
+</define>
+<define name="table-data-pilot-layout-info-attlist" combine="interleave">
+    <attribute name="table:add-empty-lines">
+        <ref name="boolean"/>
+    </attribute>
+</define>
+<define name="table-data-pilot-field-reference">
+    <element name="table:data-pilot-field-reference">
+        <ref name="table-data-pilot-field-reference-attlist"/>
+    </element>
+</define>
+<define name="table-data-pilot-field-reference-attlist" combine="interleave">
+    <attribute name="table:field-name">
+        <ref name="string"/>
+    </attribute>
+</define>
+<define name="table-data-pilot-field-reference-attlist" combine="interleave">
+    <choice>
+        <group>
+            <attribute name="table:member-type">
+                <value>named</value>
+            </attribute>
+            <attribute name="table:member-name">
+                <ref name="string"/>
+            </attribute>
+        </group>
+        <attribute name="table:member-type">
+            <choice>
+                <value>previous</value>
+                <value>next</value>
+            </choice>
+        </attribute>
+    </choice>
+</define>
+<define name="table-data-pilot-field-reference-attlist" combine="interleave">
+    <attribute name="table:type">
+        <choice>
+            <value>none</value>
+            <value>member-difference</value>
+            <value>member-percentage</value>
+            <value>member-percentage-difference</value>
+            <value>running-total</value>
+            <value>row-percentage</value>
+            <value>column-percentage</value>
+            <value>total-percentage</value>
+            <value>index</value>
+        </choice>
+    </attribute>
+</define>
+<define name="table-data-pilot-groups">
+    <element name="table:data-pilot-groups">
+        <ref name="table-data-pilot-groups-attlist"/>
+        <oneOrMore>
+            <ref name="table-data-pilot-group"/>
+        </oneOrMore>
+    </element>
+</define>
+<define name="table-data-pilot-groups-attlist" combine="interleave">
+    <attribute name="table:source-field-name">
+        <ref name="string"/>
+    </attribute>
+</define>
+<define name="table-data-pilot-groups-attlist" combine="interleave">
+    <choice>
+        <attribute name="table:date-start">
+            <choice>
+                <ref name="dateOrDateTime"/>
+                <value>auto</value>
+            </choice>
+        </attribute>
+        <attribute name="table:start">
+            <choice>
+                <ref name="double"/>
+                <value>auto</value>
+            </choice>
+        </attribute>
+    </choice>
+</define>
+<define name="table-data-pilot-groups-attlist" combine="interleave">
+    <choice>
+        <attribute name="table:date-end">
+            <choice>
+                <ref name="dateOrDateTime"/>
+                <value>auto</value>
+            </choice>
+        </attribute>
+        <attribute name="table:end">
+            <choice>
+                <ref name="double"/>
+                <value>auto</value>
+            </choice>
+        </attribute>
+    </choice>
+</define>
+<define name="table-data-pilot-groups-attlist" combine="interleave">
+    <attribute name="table:step">
+        <ref name="double"/>
+    </attribute>
+</define>
+<define name="table-data-pilot-groups-attlist" combine="interleave">
+    <attribute name="table:grouped-by">
+        <choice>
+            <value>seconds</value>
+            <value>minutes</value>
+            <value>hours</value>
+            <value>days</value>
+            <value>months</value>
+            <value>quarters</value>
+            <value>years</value>
+        </choice>
+    </attribute>
+</define>
+<define name="table-data-pilot-group">
+    <element name="table:data-pilot-group">
+        <ref name="table-data-pilot-group-attlist"/>
+        <oneOrMore>
+            <ref name="table-data-pilot-group-member"/>
+        </oneOrMore>
+    </element>
+</define>
+<define name="table-data-pilot-group-attlist" combine="interleave">
+    <attribute name="table:name">
+        <ref name="string"/>
+    </attribute>
+</define>
+<define name="table-data-pilot-group-member">
+    <element name="table:data-pilot-group-member">
+        <ref name="table-data-pilot-group-member-attlist"/>
+    </element>
+</define>
+<define name="table-data-pilot-group-member-attlist" combine="interleave">
+    <attribute name="table:name">
+        <ref name="string"/>
+    </attribute>
+</define>
+<define name="table-consolidation">
+    <element name="table:consolidation">
+        <ref name="table-consolidation-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="table-consolidation-attlist" combine="interleave">
+    <attribute name="table:function">    
+        <choice>
+            <value>auto</value>
+            <value>average</value>
+            <value>count</value>
+            <value>countnums</value>
+            <value>max</value>
+            <value>min</value>
+            <value>product</value>
+            <value>stdev</value>
+            <value>stdevp</value>
+            <value>sum</value>
+            <value>var</value>
+            <value>varp</value>
+            <ref name="string"/>
+        </choice>
+    </attribute>
+</define>
+<define name="table-consolidation-attlist" combine="interleave">
+    <attribute name="table:source-cell-range-addresses">    
+        <ref name="cellRangeAddressList"/>
+    </attribute>
+</define>
+<define name="table-consolidation-attlist" combine="interleave">
+    <attribute name="table:target-cell-address">    
+        <ref name="cellAddress"/>
+    </attribute>
+</define>
+<define name="table-consolidation-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:use-labels" a:defaultValue="none">
+            <choice>
+                <value>none</value>
+                <value>row</value>
+                <value>column</value>
+                <value>both</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="table-consolidation-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:link-to-source-data" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-dde-links">
+    <element name="table:dde-links">
+        <oneOrMore>
+            <ref name="table-dde-link"/>
+        </oneOrMore>
+    </element>
+</define>
+<define name="table-tracked-changes">
+    <element name="table:tracked-changes">
+        <ref name="table-tracked-changes-attlist"/>
+        <zeroOrMore>
+            <choice>
+                <ref name="table-cell-content-change"/>
+                <ref name="table-insertion"/>
+                <ref name="table-deletion"/>
+                <ref name="table-movement"/>
+            </choice>
+        </zeroOrMore>
+    </element>
+</define>
+<define name="table-tracked-changes-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:track-changes" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-insertion">
+    <element name="table:insertion">
+        <ref name="table-insertion-attlist"/>
+        <ref name="common-table-change-attlist"/>
+        <ref name="office-change-info"/>
+        <optional>
+            <ref name="table-dependencies"/>
+        </optional>
+        <optional>
+            <ref name="table-deletions"/>
+        </optional>
+    </element>
+</define>
+<define name="table-insertion-attlist" combine="interleave">
+    <attribute name="table:type">
+        <choice>
+            <value>row</value>
+            <value>column</value>
+            <value>table</value>
+        </choice>
+    </attribute>
+</define>
+<define name="table-insertion-attlist" combine="interleave">
+    <attribute name="table:position">
+        <ref name="integer"/>
+    </attribute>
+</define>
+<define name="table-insertion-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:count" a:defaultValue="1">
+            <ref name="positiveInteger"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-insertion-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:table">
+            <ref name="integer"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-dependencies">
+    <element name="table:dependencies">
+        <oneOrMore>
+            <ref name="table-dependency"/>
+        </oneOrMore>
+    </element>
+</define>
+<define name="table-dependency">
+    <element name="table:dependency">
+        <attribute name="table:id">
+            <ref name="string"/>
+        </attribute>
+        <empty/>
+    </element>
+</define>
+<define name="table-deletions">
+    <element name="table:deletions">
+        <oneOrMore>
+            <choice>
+                <ref name="table-cell-content-deletion"/>
+                <ref name="table-change-deletion"/>
+            </choice>
+        </oneOrMore>
+    </element>
+</define>
+<define name="table-cell-content-deletion">
+    <element name="table:cell-content-deletion">
+        <optional>
+            <attribute name="table:id">
+                <ref name="string"/>
+            </attribute>
+        </optional>
+        <optional>
+            <ref name="table-cell-address"/>
+        </optional>
+        <optional>
+            <ref name="table-change-track-table-cell"/>
+        </optional>
+    </element>
+</define>
+<define name="table-change-deletion">
+    <element name="table:change-deletion">
+        <optional>
+            <attribute name="table:id">
+                <ref name="string"/>
+            </attribute>
+        </optional>
+        <empty/>
+    </element>
+</define>
+<define name="table-deletion">
+    <element name="table:deletion">
+        <ref name="table-deletion-attlist"/>
+        <ref name="common-table-change-attlist"/>
+        <ref name="office-change-info"/>
+        <optional>
+            <ref name="table-dependencies"/>
+        </optional>
+        <optional>
+            <ref name="table-deletions"/>
+        </optional>
+        <optional>
+            <ref name="table-cut-offs"/>
+        </optional>
+    </element>
+</define>
+<define name="table-deletion-attlist" combine="interleave">
+    <attribute name="table:type">
+        <choice>
+            <value>row</value>
+            <value>column</value>
+            <value>table</value>
+        </choice>
+    </attribute>
+</define>
+<define name="table-deletion-attlist" combine="interleave">
+    <attribute name="table:position">
+        <ref name="integer"/>
+    </attribute>
+</define>
+<define name="table-deletion-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:table">
+            <ref name="integer"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-deletion-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:multi-deletion-spanned">
+            <ref name="integer"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-cut-offs">
+    <element name="table:cut-offs">
+        <choice>
+            <oneOrMore>
+                <ref name="table-movement-cut-off"/>
+            </oneOrMore>
+            <group>
+                <ref name="table-insertion-cut-off"/>
+                <zeroOrMore>
+                    <ref name="table-movement-cut-off"/>
+                </zeroOrMore>
+            </group>
+        </choice>
+    </element>
+</define>
+<define name="table-insertion-cut-off">
+    <element name="table:insertion-cut-off">
+        <ref name="table-insertion-cut-off-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="table-insertion-cut-off-attlist" combine="interleave">
+    <attribute name="table:id">
+        <ref name="string"/>
+    </attribute>
+</define>
+<define name="table-insertion-cut-off-attlist" combine="interleave">
+    <attribute name="table:position">
+        <ref name="integer"/>
+    </attribute>
+</define>
+<define name="table-movement-cut-off">
+    <element name="table:movement-cut-off">
+        <ref name="table-movement-cut-off-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="table-movement-cut-off-attlist" combine="interleave">
+    <choice>
+        <attribute name="table:position">
+            <ref name="integer"/>
+        </attribute>
+        <group>
+            <attribute name="table:start-position">
+                <ref name="integer"/>
+            </attribute>
+            <attribute name="table:end-position">
+                <ref name="integer"/>
+            </attribute>
+        </group>
+    </choice>
+</define>
+<define name="table-movement">
+    <element name="table:movement">
+        <ref name="common-table-change-attlist"/>
+        <ref name="table-source-range-address"/>
+        <ref name="table-target-range-address"/>
+        <ref name="office-change-info"/>
+        <optional>
+            <ref name="table-dependencies"/>
+        </optional>
+        <optional>
+            <ref name="table-deletions"/>
+        </optional>
+    </element>
+</define>
+<define name="table-source-range-address">
+    <element name="table:source-range-address">
+        <ref name="common-table-range-attlist"/>
+        <empty/>
+    </element>
+</define>
+
+<define name="table-target-range-address">
+    <element name="table:target-range-address">
+        <ref name="common-table-range-attlist"/>
+        <empty/>
+    </element>
+</define>
+
+
+<define name="common-table-range-attlist" combine="interleave">
+    <choice>
+        <group>
+            <ref name="common-table-cell-address-attlist"/>
+        </group>
+        <group>
+            <ref name="common-table-cell-range-address-attlist"/>
+        </group>
+    </choice>
+</define>
+<define name="common-table-cell-address-attlist" combine="interleave">
+    <attribute name="table:column">
+        <ref name="integer"/>
+    </attribute>
+    <attribute name="table:row">
+        <ref name="integer"/>
+    </attribute>
+    <attribute name="table:table">
+        <ref name="integer"/>
+    </attribute>
+</define>
+<define name="common-table-cell-range-address-attlist" combine="interleave">
+    <attribute name="table:start-column">
+        <ref name="integer"/>
+    </attribute>
+    <attribute name="table:start-row">
+        <ref name="integer"/>
+    </attribute>
+    <attribute name="table:start-table">
+        <ref name="integer"/>
+    </attribute>
+    <attribute name="table:end-column">
+        <ref name="integer"/>
+    </attribute>
+    <attribute name="table:end-row">
+        <ref name="integer"/>
+    </attribute>
+    <attribute name="table:end-table">
+        <ref name="integer"/>
+    </attribute>
+</define>
+<define name="table-change-track-table-cell" combine="interleave">
+    <element name="table:change-track-table-cell">
+        <ref name="table-change-track-table-cell-attlist"/>
+        <zeroOrMore>
+            <ref name="text-p"/>
+        </zeroOrMore>
+    </element>
+</define>
+<define name="table-change-track-table-cell-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:cell-address">
+            <ref name="cellAddress"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-change-track-table-cell-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:matrix-covered" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-change-track-table-cell-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:formula">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="table:number-matrix-columns-spanned">
+            <ref name="positiveInteger"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="table:number-matrix-rows-spanned">
+            <ref name="positiveInteger"/>
+        </attribute>
+    </optional>
+    <optional>
+        <ref name="common-value-and-type-attlist"/>
+    </optional>
+</define>
+<define name="table-cell-content-change">
+    <element name="table:cell-content-change">
+        <ref name="common-table-change-attlist"/>
+        <ref name="table-cell-address"/>
+        <ref name="office-change-info"/>
+        <optional>
+            <ref name="table-dependencies"/>
+        </optional>
+        <optional>
+            <ref name="table-deletions"/>
+        </optional>
+        <ref name="table-previous"/>
+    </element>
+</define>
+<define name="table-cell-address">
+    <element name="table:cell-address">
+        <ref name="common-table-cell-address-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="table-previous">
+    <element name="table:previous">
+        <optional>
+            <attribute name="table:id">
+                <ref name="string"/>
+            </attribute>
+        </optional>
+        <ref name="table-change-track-table-cell"/>
+    </element>
+</define>
+<define name="common-table-change-attlist" combine="interleave">
+    <attribute name="table:id">
+        <ref name="string"/>
+    </attribute>
+</define>
+<define name="common-table-change-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:acceptance-state" a:defaultValue="pending">
+            <choice>
+                <value>accepted</value>
+                <value>rejected</value>
+                <value>pending</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="common-table-change-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:rejecting-change-id">
+            <ref name="string"/> 
+        </attribute>
+    </optional>
+</define>
+<define name="style-handout-master">
+    <element name="style:handout-master">
+        <ref name="common-presentation-header-footer-attlist"/>
+        <ref name="style-handout-master-attlist"/>
+        <zeroOrMore>
+            <ref name="shape"/>
+        </zeroOrMore>
+    </element>
+</define>
+<define name="style-handout-master-attlist" combine="interleave">
+    <optional>
+        <attribute name="presentation:presentation-page-layout-name">
+            <ref name="styleNameRef"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-handout-master-attlist" combine="interleave">
+    <attribute name="style:page-layout-name">
+        <ref name="styleNameRef"/>
+    </attribute>
+</define>
+<define name="style-handout-master-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:style-name">
+            <ref name="styleNameRef"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-layer-set">
+    <element name="draw:layer-set">
+        <zeroOrMore>
+            <ref name="draw-layer"/>
+        </zeroOrMore>
+    </element>
+</define>
+<define name="draw-layer">
+    <element name="draw:layer">
+        <ref name="draw-layer-attlist"/>
+        <optional>
+            <ref name="svg-title"/>
+        </optional>
+        <optional>
+            <ref name="svg-desc"/>
+        </optional>
+    </element>
+</define>
+<define name="draw-layer-attlist" combine="interleave">
+    <attribute name="draw:name">
+        <ref name="string"/>
+    </attribute>
+</define>
+<define name="draw-layer-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:protected" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-layer-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:display" a:defaultValue="always">
+            <choice>
+                <value>always</value>
+                <value>screen</value>
+                <value>printer</value>
+                <value>none</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-page">
+    <element name="draw:page">
+        <ref name="common-presentation-header-footer-attlist"/>
+        <ref name="draw-page-attlist"/>
+        <optional>
+            <ref name="office-forms"/>
+        </optional>
+        <zeroOrMore>
+            <ref name="shape"/>
+        </zeroOrMore>
+        <optional>
+            <choice>
+                <ref name="presentation-animations"/>
+                <ref name="animation-element"/>
+            </choice>
+        </optional>
+        <optional>
+            <ref name="presentation-notes"/>
+        </optional>
+    </element>
+</define>
+<define name="draw-page-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:name">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-page-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:style-name">
+            <ref name="styleNameRef"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-page-attlist" combine="interleave">
+    <attribute name="draw:master-page-name">
+        <ref name="styleNameRef"/>
+    </attribute>
+</define>
+<define name="draw-page-attlist" combine="interleave">
+    <optional>
+        <attribute name="presentation:presentation-page-layout-name">
+            <ref name="styleNameRef"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-presentation-header-footer-attlist" combine="interleave">
+    <optional>
+        <attribute name="presentation:use-header-name">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-presentation-header-footer-attlist" combine="interleave">
+    <optional>
+        <attribute name="presentation:use-footer-name">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-presentation-header-footer-attlist" combine="interleave">
+    <optional>
+        <attribute name="presentation:use-date-time-name">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-page-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:id">
+            <ref name="ID"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-page-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:nav-order">
+            <ref name="IDREFS"/>
+        </attribute>
+    </optional>
+</define>
+<define name="shape">
+    <choice>
+        <ref name="draw-rect"/>
+        <ref name="draw-line"/>
+        <ref name="draw-polyline"/>
+        <ref name="draw-polygon"/>
+        <ref name="draw-regular-polygon"/>
+        <ref name="draw-path"/>
+        <ref name="draw-circle"/>
+        <ref name="draw-ellipse"/>
+        <ref name="draw-g"/>
+        <ref name="draw-page-thumbnail"/>
+        <ref name="draw-frame"/>
+        <ref name="draw-measure"/>
+        <ref name="draw-caption"/>
+        <ref name="draw-connector"/>
+        <ref name="draw-control"/>
+        <ref name="dr3d-scene"/>
+        <ref name="draw-custom-shape"/>
+    </choice>
+</define>
+<define name="draw-rect">
+    <element name="draw:rect">
+        <ref name="draw-rect-attlist"/>
+        <ref name="common-draw-position-attlist"/>
+        <ref name="common-draw-size-attlist"/>
+        <ref name="common-draw-shape-with-text-and-styles-attlist"/>
+        <ref name="common-draw-caption-id-attlist"/>
+        <optional>
+            <ref name="svg-title"/>
+        </optional>
+        <optional>
+            <ref name="svg-desc"/>
+        </optional>
+        <optional>
+            <ref name="office-event-listeners"/>
+        </optional>
+        <zeroOrMore>
+            <ref name="draw-glue-point"/>
+        </zeroOrMore>
+        <ref name="draw-text"/>
+    </element>
+</define>
+<define name="draw-rect-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:corner-radius">
+            <ref name="nonNegativeLength"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-line">
+    <element name="draw:line">
+        <ref name="draw-line-attlist"/>
+        <ref name="common-draw-shape-with-text-and-styles-attlist"/>
+        <ref name="common-draw-caption-id-attlist"/>
+        <optional>
+            <ref name="svg-title"/>
+        </optional>
+        <optional>
+            <ref name="svg-desc"/>
+        </optional>
+        <optional>
+            <ref name="office-event-listeners"/>
+        </optional>
+        <zeroOrMore>
+            <ref name="draw-glue-point"/>
+        </zeroOrMore>
+        <ref name="draw-text"/>
+    </element>
+</define>
+<define name="draw-line-attlist" combine="interleave">
+    <attribute name="svg:x1">
+        <ref name="coordinate"/>
+    </attribute>
+    <attribute name="svg:y1">
+        <ref name="coordinate"/>
+    </attribute>
+</define>
+<define name="draw-line-attlist" combine="interleave">
+    <attribute name="svg:x2">
+        <ref name="coordinate"/>
+    </attribute>
+    <attribute name="svg:y2">
+        <ref name="coordinate"/>
+    </attribute>
+</define>
+<define name="draw-polyline">
+    <element name="draw:polyline">
+        <ref name="common-draw-points-attlist"/>
+        <ref name="common-draw-position-attlist"/>
+        <ref name="common-draw-size-attlist"/>
+        <ref name="common-draw-viewbox-attlist"/>
+        <ref name="common-draw-shape-with-text-and-styles-attlist"/>
+        <ref name="common-draw-caption-id-attlist"/>
+        <optional>
+            <ref name="svg-title"/>
+        </optional>
+        <optional>
+            <ref name="svg-desc"/>
+        </optional>
+        <optional>
+            <ref name="office-event-listeners"/>
+        </optional>
+        <zeroOrMore>
+            <ref name="draw-glue-point"/>
+        </zeroOrMore>
+        <ref name="draw-text"/>
+    </element>
+</define>
+<define name="common-draw-points-attlist">
+    <attribute name="draw:points">
+        <ref name="points"/>
+    </attribute>
+</define>
+<define name="draw-polygon">
+    <element name="draw:polygon">
+        <ref name="common-draw-points-attlist"/>
+        <ref name="common-draw-position-attlist"/>
+        <ref name="common-draw-size-attlist"/>
+        <ref name="common-draw-viewbox-attlist"/>
+        <ref name="common-draw-shape-with-text-and-styles-attlist"/>
+        <ref name="common-draw-caption-id-attlist"/>
+        <optional>
+            <ref name="svg-title"/>
+        </optional>
+        <optional>
+            <ref name="svg-desc"/>
+        </optional>
+        <optional>
+            <ref name="office-event-listeners"/>
+        </optional>
+        <zeroOrMore>
+            <ref name="draw-glue-point"/>
+        </zeroOrMore>
+        <ref name="draw-text"/>
+    </element>
+</define>
+<define name="draw-regular-polygon">
+    <element name="draw:regular-polygon">
+        <ref name="draw-regular-polygon-attlist"/>
+        <ref name="common-draw-position-attlist"/>
+        <ref name="common-draw-size-attlist"/>
+        <ref name="common-draw-shape-with-text-and-styles-attlist"/>
+        <ref name="common-draw-caption-id-attlist"/>
+        <optional>
+            <ref name="svg-title"/>
+        </optional>
+        <optional>
+            <ref name="svg-desc"/>
+        </optional>
+        <optional>
+            <ref name="office-event-listeners"/>
+        </optional>
+        <zeroOrMore>
+            <ref name="draw-glue-point"/>
+        </zeroOrMore>
+        <ref name="draw-text"/>
+    </element>
+</define>
+<define name="draw-regular-polygon-attlist" combine="interleave">
+    <choice>
+        <attribute name="draw:concave">
+            <value>false</value>
+        </attribute>
+        <group>
+            <attribute name="draw:concave">
+                <value>true</value>
+            </attribute>
+            <ref name="draw-regular-polygon-sharpness-attlist"/>
+        </group>
+    </choice>
+</define>
+<define name="draw-regular-polygon-attlist" combine="interleave">
+    <attribute name="draw:corners">
+        <ref name="positiveInteger"/>
+    </attribute>
+</define>
+<define name="draw-regular-polygon-sharpness-attlist">
+    <attribute name="draw:sharpness">
+        <ref name="percent"/>
+    </attribute>
+</define>
+<define name="draw-path">
+    <element name="draw:path">
+        <ref name="common-draw-path-data-attlist"/>
+        <ref name="common-draw-position-attlist"/>
+        <ref name="common-draw-size-attlist"/>
+        <ref name="common-draw-viewbox-attlist"/>
+        <ref name="common-draw-shape-with-text-and-styles-attlist"/>
+        <ref name="common-draw-caption-id-attlist"/>
+        <optional>
+            <ref name="svg-title"/>
+        </optional>
+        <optional>
+            <ref name="svg-desc"/>
+        </optional>
+        <optional>
+            <ref name="office-event-listeners"/>
+        </optional>
+        <zeroOrMore>
+            <ref name="draw-glue-point"/>
+        </zeroOrMore>
+        <ref name="draw-text"/>
+    </element>
+</define>
+<define name="common-draw-path-data-attlist">
+    <attribute name="svg:d">
+        <ref name="pathData"/>
+    </attribute>
+</define>
+<define name="draw-circle">
+    <element name="draw:circle">
+        <ref name="draw-circle-attlist"/>
+        <ref name="common-draw-circle-ellipse-attlist"/>
+        <ref name="common-draw-position-attlist"/>
+        <ref name="common-draw-size-attlist"/>
+        <ref name="common-draw-shape-with-text-and-styles-attlist"/>
+        <ref name="common-draw-caption-id-attlist"/>
+        <optional>
+            <ref name="svg-title"/>
+        </optional>
+        <optional>
+            <ref name="svg-desc"/>
+        </optional>
+        <optional>
+            <ref name="office-event-listeners"/>
+        </optional>
+        <zeroOrMore>
+            <ref name="draw-glue-point"/>
+        </zeroOrMore>
+        <ref name="draw-text"/>
+    </element>
+</define>
+<define name="common-draw-circle-ellipse-attlist" combine="interleave">
+    <optional>
+        <attribute name="svg:cx">
+            <ref name="coordinate"/>
+        </attribute>
+        <attribute name="svg:cy">
+            <ref name="coordinate"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-circle-attlist" combine="interleave">
+    <optional>
+        <attribute name="svg:r">
+            <ref name="length"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-draw-circle-ellipse-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:kind" a:defaultValue="full">
+            <choice>
+                <value>full</value>
+                <value>section</value>
+                <value>cut</value>
+                <value>arc</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="common-draw-circle-ellipse-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:start-angle">
+            <ref name="double"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-draw-circle-ellipse-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:end-angle">
+            <ref name="double"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-ellipse">
+    <element name="draw:ellipse">
+        <ref name="common-draw-circle-ellipse-attlist"/>
+        <ref name="draw-ellipse-attlist"/>
+        <ref name="common-draw-position-attlist"/>
+        <ref name="common-draw-size-attlist"/>
+        <ref name="common-draw-shape-with-text-and-styles-attlist"/>
+        <ref name="common-draw-caption-id-attlist"/>
+        <optional>
+            <ref name="svg-title"/>
+        </optional>
+        <optional>
+            <ref name="svg-desc"/>
+        </optional>
+        <optional>
+            <ref name="office-event-listeners"/>
+        </optional>
+        <zeroOrMore>
+            <ref name="draw-glue-point"/>
+        </zeroOrMore>
+        <ref name="draw-text"/>
+    </element>
+</define>
+<define name="draw-ellipse-attlist" combine="interleave">
+    <optional>
+        <attribute name="svg:rx">
+            <ref name="length"/>
+        </attribute>
+        <attribute name="svg:ry">
+            <ref name="length"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-connector">
+    <element name="draw:connector">
+        <ref name="draw-connector-attlist"/>
+        <ref name="common-draw-shape-with-text-and-styles-attlist"/>
+        <ref name="common-draw-caption-id-attlist"/>
+        <optional>
+            <ref name="svg-title"/>
+        </optional>
+        <optional>
+            <ref name="svg-desc"/>
+        </optional>
+        <optional>
+            <ref name="office-event-listeners"/>
+        </optional>
+        <zeroOrMore>
+            <ref name="draw-glue-point"/>
+        </zeroOrMore>
+        <ref name="draw-text"/>
+    </element>
+</define>
+<define name="draw-connector-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:type" a:defaultValue="standard">
+            <choice>
+                <value>standard</value>
+                <value>lines</value>
+                <value>line</value>
+                <value>curve</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-connector-attlist" combine="interleave">
+    <optional>
+        <attribute name="svg:x1">
+            <ref name="coordinate"/>
+        </attribute>
+        <attribute name="svg:y1">
+            <ref name="coordinate"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-connector-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:start-shape">
+            <ref name="IDREF"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-connector-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:start-glue-point">
+            <ref name="nonNegativeInteger"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-connector-attlist" combine="interleave">
+    <optional>
+        <attribute name="svg:x2">
+            <ref name="coordinate"/>
+        </attribute>
+        <attribute name="svg:y2">
+            <ref name="coordinate"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-connector-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:end-shape">
+            <ref name="IDREF"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-connector-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:end-glue-point">
+            <ref name="nonNegativeInteger"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-connector-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:line-skew">
+            <list>
+                <ref name="length"/>
+                <optional>
+                    <ref name="length"/>
+                    <optional>
+                        <ref name="length"/>
+                    </optional>
+                </optional>
+            </list>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-caption">
+    <element name="draw:caption">
+        <ref name="draw-caption-attlist"/>
+        <ref name="common-draw-position-attlist"/>
+        <ref name="common-draw-size-attlist"/>
+        <ref name="common-draw-shape-with-text-and-styles-attlist"/>
+        <ref name="common-draw-caption-id-attlist"/>
+        <optional>
+            <ref name="svg-title"/>
+        </optional>
+        <optional>
+            <ref name="svg-desc"/>
+        </optional>
+        <optional>
+            <ref name="office-event-listeners"/>
+        </optional>
+        <zeroOrMore>
+            <ref name="draw-glue-point"/>
+        </zeroOrMore>
+        <ref name="draw-text"/>
+    </element>
+</define>
+<define name="draw-caption-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:caption-point-x">
+            <ref name="coordinate"/>
+        </attribute>
+        <attribute name="draw:caption-point-y">
+            <ref name="coordinate"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-caption-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:corner-radius">
+            <ref name="nonNegativeLength"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-measure">
+    <element name="draw:measure">
+        <ref name="draw-measure-attlist"/>
+        <ref name="common-draw-shape-with-text-and-styles-attlist"/>
+        <ref name="common-draw-caption-id-attlist"/>
+        <optional>
+            <ref name="svg-title"/>
+        </optional>
+        <optional>
+            <ref name="svg-desc"/>
+        </optional>
+        <optional>
+            <ref name="office-event-listeners"/>
+        </optional>
+        <zeroOrMore>
+            <ref name="draw-glue-point"/>
+        </zeroOrMore>
+        <ref name="draw-text"/>
+    </element>
+</define>
+<define name="draw-measure-attlist" combine="interleave">
+    <attribute name="svg:x1">
+        <ref name="coordinate"/>
+    </attribute>
+    <attribute name="svg:y1">
+        <ref name="coordinate"/>
+    </attribute>
+</define>
+<define name="draw-measure-attlist" combine="interleave">
+    <attribute name="svg:x2">
+        <ref name="coordinate"/>
+    </attribute>
+    <attribute name="svg:y2">
+        <ref name="coordinate"/>
+    </attribute>
+</define>
+<define name="draw-control">
+    <element name="draw:control">
+        <ref name="draw-control-attlist"/>
+        <ref name="common-draw-position-attlist"/>
+        <ref name="common-draw-size-attlist"/>
+        <ref name="common-draw-shape-with-text-and-styles-attlist"/>    
+        <ref name="common-draw-caption-id-attlist"/>
+        <optional>
+            <ref name="svg-title"/>
+        </optional>
+        <optional>
+            <ref name="svg-desc"/>
+        </optional>
+        <zeroOrMore>
+            <ref name="draw-glue-point"/>
+        </zeroOrMore>
+    </element>
+</define>
+<define name="draw-control-attlist" combine="interleave">
+    <attribute name="draw:control">
+        <ref name="IDREF"/>
+    </attribute>
+</define>
+<define name="draw-page-thumbnail">
+    <element name="draw:page-thumbnail">
+        <ref name="draw-page-thumbnail-attlist"/>
+        <ref name="common-draw-position-attlist"/>
+        <ref name="common-draw-size-attlist"/>
+        <ref name="presentation-shape-attlist"/>
+        <ref name="common-draw-shape-with-styles-attlist"/>
+        <ref name="common-draw-caption-id-attlist"/>
+        <optional>
+            <ref name="svg-title"/>
+        </optional>
+        <optional>
+            <ref name="svg-desc"/>
+        </optional>
+    </element>
+</define>
+<define name="draw-page-thumbnail-attlist">
+    <optional>
+        <attribute name="draw:page-number">
+            <ref name="positiveInteger"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-g">
+    <element name="draw:g">
+        <ref name="draw-g-attlist"/>
+        <ref name="common-draw-z-index-attlist"/>
+        <ref name="common-draw-name-attlist"/>
+        <ref name="common-draw-id-attlist"/>
+        <ref name="common-draw-style-name-attlist"/>
+        <ref name="common-text-spreadsheet-shape-attlist"/>
+        <ref name="common-draw-caption-id-attlist"/>
+        <optional>
+            <ref name="svg-title"/>
+        </optional>
+        <optional>
+            <ref name="svg-desc"/>
+        </optional>
+        <optional>
+            <ref name="office-event-listeners"/>
+        </optional>
+        <zeroOrMore>
+            <ref name="draw-glue-point"/>
+        </zeroOrMore>
+        <zeroOrMore>
+            <ref name="shape"/>
+        </zeroOrMore>
+    </element>
+</define>
+<define name="draw-g-attlist" combine="interleave">
+    <optional>
+        <attribute name="svg:y">
+            <ref name="coordinate"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-draw-name-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:name">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-draw-caption-id-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:caption-id">
+            <ref name="IDREF"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-draw-position-attlist">
+    <optional>
+        <attribute name="svg:x">
+            <ref name="coordinate"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="svg:y">
+            <ref name="coordinate"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-draw-size-attlist">
+    <optional>
+        <attribute name="svg:width">
+            <ref name="length"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="svg:height">
+            <ref name="length"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-draw-transform-attlist">
+    <optional>
+        <attribute name="draw:transform">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-draw-viewbox-attlist">
+    <attribute name="svg:viewBox">
+        <list>
+            <ref name="integer"/>
+            <ref name="integer"/>
+            <ref name="integer"/>
+            <ref name="integer"/>
+        </list>
+    </attribute>
+</define>
+<define name="common-draw-style-name-attlist">
+    <choice>
+        <group>
+            <optional>
+                <attribute name="draw:style-name">
+                    <ref name="styleNameRef"/>
+                </attribute>
+            </optional>
+            <optional>
+                <attribute name="draw:class-names">
+                    <ref name="styleNameRefs"/>
+                </attribute>
+            </optional>
+        </group>
+        <group>
+            <optional>
+                <attribute name="presentation:style-name">
+                    <ref name="styleNameRef"/>
+                </attribute>
+            </optional>
+            <optional>
+                <attribute name="presentation:class-names">
+                    <ref name="styleNameRefs"/>
+                </attribute>
+            </optional>
+        </group>
+    </choice>
+</define>
+<define name="common-draw-text-style-name-attlist">
+    <optional>
+        <attribute name="draw:text-style-name">
+            <ref name="styleNameRef"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-draw-layer-name-attlist">
+    <optional>
+        <attribute name="draw:layer">
+            <data type="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-draw-id-attlist">
+    <optional>
+        <attribute name="draw:id">
+            <ref name="ID"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-draw-z-index-attlist">
+    <optional>
+        <attribute name="draw:z-index">
+            <ref name="nonNegativeInteger"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-text-spreadsheet-shape-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:end-cell-address">
+            <ref name="cellAddress"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="table:end-x">
+            <ref name="coordinate"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="table:end-y">
+            <ref name="coordinate"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-text-spreadsheet-shape-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:table-background">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-text-spreadsheet-shape-attlist" combine="interleave">
+    <ref name="common-text-anchor-attlist"/>
+</define>
+
+<define name="common-text-anchor-attlist" combine="interleave">
+    <optional>
+        <attribute name="text:anchor-type">
+            <choice>
+                <value>page</value>
+                <value>frame</value>
+                <value>paragraph</value>
+                <value>char</value>
+                <value>as-char</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="common-text-anchor-attlist" combine="interleave">
+    <optional>
+        <attribute name="text:anchor-page-number">
+            <ref name="positiveInteger"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-text">
+    <zeroOrMore>
+        <choice>
+            <ref name="text-p"/>
+            <ref name="text-list"/>
+        </choice>
+    </zeroOrMore>
+</define>
+<define name="common-draw-shape-with-styles-attlist">
+    <ref name="common-draw-z-index-attlist"/>
+    <ref name="common-draw-id-attlist"/>
+    <ref name="common-draw-layer-name-attlist"/>
+    <ref name="common-draw-style-name-attlist"/>
+    <ref name="common-draw-transform-attlist"/>
+    <ref name="common-draw-name-attlist"/>
+    <ref name="common-text-spreadsheet-shape-attlist"/>
+</define>
+<define name="common-draw-shape-with-text-and-styles-attlist">
+    <ref name="common-draw-shape-with-styles-attlist"/>
+    <ref name="common-draw-text-style-name-attlist"/>
+</define>
+<define name="draw-glue-point">
+    <element name="draw:glue-point">
+        <ref name="draw-glue-point-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="draw-glue-point-attlist" combine="interleave">
+    <attribute name="draw:id">
+        <ref name="nonNegativeInteger"/>
+    </attribute>
+</define>
+<define name="draw-glue-point-attlist" combine="interleave">
+    <attribute name="svg:x">
+        <choice>
+            <ref name="distance"/> 
+            <ref name="percent"/>
+        </choice>
+    </attribute>
+    <attribute name="svg:y">
+        <choice>
+            <ref name="distance"/> 
+            <ref name="percent"/>
+        </choice>
+    </attribute>
+</define>
+<define name="draw-glue-point-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:align">
+            <choice>
+                <value>top-left</value>
+                <value>top</value>
+                <value>top-right</value>
+                <value>left</value>
+                <value>center</value>
+                <value>right</value>
+                <value>bottom-left</value>
+                <value>bottom-right</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-glue-points-attlist" combine="interleave">
+    <attribute name="draw:escape-direction">
+        <choice>
+            <value>auto</value>
+            <value>left</value>
+            <value>right</value>
+            <value>up</value>
+            <value>down</value>
+            <value>horizontal</value>
+            <value>vertical</value>
+        </choice>
+    </attribute>
+</define>
+<define name="svg-title">
+    <element name="svg:title">
+        <text/>
+    </element>
+</define>
+<define name="svg-desc">
+    <element name="svg:desc">
+        <text/>
+    </element>
+</define>
+<define name="draw-frame">
+    <element name="draw:frame">
+        <ref name="common-draw-shape-with-text-and-styles-attlist"/>
+        <ref name="common-draw-position-attlist"/>
+        <ref name="common-draw-rel-size-attlist"/>
+        <ref name="common-draw-caption-id-attlist"/>
+        <ref name="presentation-shape-attlist"/>
+        <ref name="draw-frame-attlist"/>
+        <zeroOrMore>
+            <choice>
+                <ref name="draw-text-box"/>
+                <ref name="draw-image"/>
+                <ref name="draw-object"/>
+                <ref name="draw-object-ole"/>
+                <ref name="draw-applet"/>
+                <ref name="draw-floating-frame"/>
+                <ref name="draw-plugin"/>
+            </choice>
+        </zeroOrMore>
+        <optional>
+            <ref name="office-event-listeners"/>
+        </optional>
+        <zeroOrMore>
+            <ref name="draw-glue-point"/>
+        </zeroOrMore>
+        <optional>
+            <ref name="draw-image-map"/>
+        </optional>
+        <optional>
+            <ref name="svg-title"/>
+        </optional>
+        <optional>
+            <ref name="svg-desc"/>
+        </optional>
+        <optional>
+            <choice>
+                <ref name="draw-contour-polygon"/>
+                <ref name="draw-contour-path"/>
+            </choice>
+        </optional>
+    </element>
+</define>
+<define name="common-draw-rel-size-attlist">
+    <ref name="common-draw-size-attlist"/>
+    <optional>
+        <attribute name="style:rel-width">
+            <choice>
+                <ref name="percent"/>
+                <value>scale</value>
+                <value>scale-min</value>
+            </choice>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="style:rel-height">
+            <choice>
+                <ref name="percent"/>
+                <value>scale</value>
+                <value>scale-min</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-frame-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:copy-of">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-text-box">
+    <element name="draw:text-box">
+        <ref name="draw-text-box-attlist"/>
+        <zeroOrMore>
+            <ref name="text-content"/>
+        </zeroOrMore>
+    </element>
+</define>
+<define name="draw-text-box-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:chain-next-name">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-text-box-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:corner-radius">
+            <ref name="nonNegativeLength"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-text-box-attlist" combine="interleave">
+    <optional>
+        <attribute name="fo:min-height">
+            <choice>
+                <ref name="length"/>
+                <ref name="percent"/>
+            </choice>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="fo:min-width">
+            <choice>
+                <ref name="length"/>
+                <ref name="percent"/>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-text-box-attlist" combine="interleave">
+    <optional>
+        <attribute name="fo:max-height">
+            <choice>
+                <ref name="length"/>
+                <ref name="percent"/>
+            </choice>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="fo:max-width">
+            <choice>
+                <ref name="length"/>
+                <ref name="percent"/>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-text-box-attlist" combine="interleave">
+    <optional>
+        <ref name="text-id"/>
+    </optional>
+</define>
+<define name="draw-image">
+    <element name="draw:image">
+        <ref name="draw-image-attlist"/>
+        <choice>
+            <ref name="common-draw-data-attlist"/>
+            <ref name="office-binary-data"/>
+        </choice>
+        <ref name="draw-text"/>
+    </element>
+</define>
+<define name="common-draw-data-attlist" combine="interleave">
+    <group>
+        <attribute name="xlink:href">
+            <ref name="anyURI"/>
+        </attribute>
+        <optional>
+            <attribute name="xlink:type" a:defaultValue="simple">
+                <choice>
+                    <value>simple</value>
+                </choice>
+            </attribute>
+        </optional>
+        <optional>
+            <attribute name="xlink:show" a:defaultValue="embed">
+                <choice>
+                    <value>embed</value>
+                </choice>
+            </attribute>
+        </optional>
+        <optional>
+            <attribute name="xlink:actuate" a:defaultValue="onLoad">
+                <choice>
+                    <value>onLoad</value>
+                </choice>
+            </attribute>
+        </optional>
+    </group>
+</define>
+
+<define name="office-binary-data">
+    <element name="office:binary-data">
+        <ref name="base64Binary"/>
+    </element>
+</define>
+<define name="draw-image-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:filter-name">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-object">
+    <element name="draw:object">
+        <ref name="draw-object-attlist"/>
+        <choice>
+            <ref name="common-draw-data-attlist"/>
+            <ref name="office-document"/>
+            <ref name="math-math"/>
+        </choice>
+    </element>
+</define>
+
+<define name="draw-object-ole">
+    <element name="draw:object-ole">
+        <ref name="draw-object-ole-attlist"/>
+        <choice>
+            <ref name="common-draw-data-attlist"/>
+            <ref name="office-binary-data"/>
+        </choice>
+    </element>
+</define>
+<define name="draw-object-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:notify-on-update-of-ranges">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-object-ole-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:class-id"/>
+    </optional>
+</define>
+<define name="draw-applet">
+    <element name="draw:applet">
+        <ref name="draw-applet-attlist"/>
+        <optional>
+            <ref name="common-draw-data-attlist"/>
+        </optional>
+        <zeroOrMore>
+            <ref name="draw-param"/>
+        </zeroOrMore>
+    </element>
+</define>
+<define name="draw-applet-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:code"/>
+    </optional>
+</define>
+<define name="draw-applet-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:object"/>
+    </optional>
+</define>
+<define name="draw-applet-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:archive"/>
+    </optional>
+</define>
+<define name="draw-applet-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:may-script" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-plugin">
+    <element name="draw:plugin">
+        <ref name="draw-plugin-attlist"/>
+        <ref name="common-draw-data-attlist"/>
+        <zeroOrMore>
+            <ref name="draw-param"/>
+        </zeroOrMore>
+    </element>
+</define>
+<define name="draw-plugin-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:mime-type"/>
+    </optional>
+</define>
+<define name="draw-param">
+    <element name="draw:param">
+        <ref name="draw-param-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="draw-param-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:name"/>
+    </optional>
+</define>
+<define name="draw-param-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:value"/>
+    </optional>
+</define>
+<define name="draw-floating-frame">
+    <element name="draw:floating-frame">
+        <ref name="draw-floating-frame-attlist"/>
+        <ref name="common-draw-data-attlist"/>
+    </element>
+</define>
+<define name="draw-floating-frame-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:frame-name">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-contour-polygon">
+    <element name="draw:contour-polygon">
+        <ref name="common-contour-attlist"/>
+        <ref name="common-draw-size-attlist"/>
+        <ref name="common-draw-viewbox-attlist"/>
+        <ref name="common-draw-points-attlist"/>
+        <empty/>
+    </element>
+</define>
+
+<define name="draw-contour-path">
+    <element name="draw:contour-path">
+        <ref name="common-contour-attlist"/>
+        <ref name="common-draw-size-attlist"/>
+        <ref name="common-draw-viewbox-attlist"/>
+        <ref name="common-draw-path-data-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="common-contour-attlist" combine="interleave">
+    <attribute name="draw:recreate-on-edit">
+        <ref name="boolean"/>
+    </attribute>
+</define>
+<define name="draw-a">
+    <element name="draw:a">
+        <ref name="draw-a-attlist"/>
+        <ref name="draw-frame"/>
+    </element>
+</define>
+<define name="draw-a-attlist" combine="interleave">
+    <attribute name="xlink:href">
+        <ref name="anyURI"/>
+    </attribute>
+    <optional>
+        <attribute name="xlink:type" a:defaultValue="simple">
+            <value>simple</value>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="xlink:actuate" a:defaultValue="onRequest">
+            <choice>
+                <value>onRequest</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-a-attlist" combine="interleave">
+    <optional>
+        <attribute name="office:target-frame-name">
+            <ref name="targetFrameName"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="xlink:show">
+            <choice>
+                <value>new</value>
+                <value>replace</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-a-attlist" combine="interleave">
+    <optional>
+        <attribute name="office:name">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-a-attlist" combine="interleave">
+    <optional>
+        <attribute name="office:title">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-a-attlist" combine="interleave">
+    <optional>
+        <attribute name="office:server-map" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-image-map">
+    <element name="draw:image-map">
+        <zeroOrMore>
+            <choice>
+                <ref name="draw-area-rectangle"/>
+                <ref name="draw-area-circle"/>
+                <ref name="draw-area-polygon"/>
+            </choice>
+        </zeroOrMore>
+    </element>
+</define>
+<define name="draw-area-rectangle">
+    <element name="draw:area-rectangle">
+        <ref name="common-draw-area-attlist"/>
+        <attribute name="svg:x">
+            <ref name="coordinate"/>
+        </attribute>
+        <attribute name="svg:y">
+            <ref name="coordinate"/>
+        </attribute>
+        <attribute name="svg:width">
+            <ref name="length"/>
+        </attribute>
+        <attribute name="svg:height">
+            <ref name="length"/>
+        </attribute>
+        <optional>
+            <ref name="svg-title"/>
+        </optional>
+        <optional>
+            <ref name="svg-desc"/>
+        </optional>
+        <optional>
+            <ref name="office-event-listeners"/>
+        </optional>
+    </element>
+</define>
+<define name="draw-area-circle">
+    <element name="draw:area-circle">
+        <ref name="common-draw-area-attlist"/>
+        <attribute name="svg:cx">
+            <ref name="coordinate"/>
+        </attribute>
+        <attribute name="svg:cy">
+            <ref name="coordinate"/>
+        </attribute>
+        <attribute name="svg:r">
+            <ref name="length"/>
+        </attribute>
+        <optional>
+            <ref name="svg-title"/>
+        </optional>
+        <optional>
+            <ref name="svg-desc"/>
+        </optional>
+        <optional>
+            <ref name="office-event-listeners"/>
+        </optional>
+    </element>
+</define>
+<define name="draw-area-polygon">
+    <element name="draw:area-polygon">
+        <ref name="common-draw-area-attlist"/>
+        <attribute name="svg:x">
+            <ref name="coordinate"/>
+        </attribute>
+        <attribute name="svg:y">
+            <ref name="coordinate"/>
+        </attribute>
+        <attribute name="svg:width">
+            <ref name="length"/>
+        </attribute>
+        <attribute name="svg:height">
+            <ref name="length"/>
+        </attribute>
+        <ref name="common-draw-viewbox-attlist"/>
+        <ref name="common-draw-points-attlist"/>
+        <optional>
+            <ref name="svg-title"/>
+        </optional>
+        <optional>
+            <ref name="svg-desc"/>
+        </optional>
+        <optional>
+            <ref name="office-event-listeners"/>
+        </optional>
+    </element>
+</define>
+<define name="common-draw-area-attlist" combine="interleave">
+    <optional>
+        <attribute name="xlink:href">
+            <ref name="anyURI"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="xlink:type" a:defaultValue="simple">
+            <choice>
+                <value>simple</value>
+            </choice>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="office:target-frame-name">
+            <ref name="targetFrameName"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="xlink:show">
+            <choice>
+                <value>new</value>
+                <value>replace</value>
+            </choice>
+            </attribute>
+    </optional>
+</define>
+<define name="common-draw-area-attlist" combine="interleave">
+    <optional>
+        <attribute name="office:name">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-draw-area-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:nohref">
+            <choice>
+                <value>nohref</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="dr3d-scene">
+    <element name="dr3d:scene">
+        <ref name="dr3d-scene-attlist"/>
+        <ref name="common-draw-position-attlist"/>
+        <ref name="common-draw-size-attlist"/>
+        <ref name="common-draw-style-name-attlist"/>
+        <ref name="common-draw-z-index-attlist"/>
+        <ref name="common-draw-id-attlist"/>
+        <ref name="common-draw-layer-name-attlist"/>
+        <ref name="common-text-spreadsheet-shape-attlist"/>
+        <ref name="common-dr3d-transform-attlist"/>
+        <ref name="common-draw-caption-id-attlist"/>
+        <optional>
+            <ref name="svg-title"/>
+        </optional>
+        <optional>
+            <ref name="svg-desc"/>
+        </optional>
+        <zeroOrMore>
+            <ref name="dr3d-light"/>
+        </zeroOrMore>
+        <zeroOrMore>
+            <ref name="shapes3d"/>
+        </zeroOrMore>
+    </element>
+</define>
+
+<define name="shapes3d">
+    <choice>
+        <ref name="dr3d-scene"/>
+        <ref name="dr3d-extrude"/>
+        <ref name="dr3d-sphere"/>
+        <ref name="dr3d-rotate"/>
+        <ref name="dr3d-cube"/>
+    </choice>
+</define>
+<define name="dr3d-scene-attlist" combine="interleave">
+    <optional>
+        <attribute name="dr3d:vrp">
+            <ref name="vector3D"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="dr3d:vpn">
+            <ref name="vector3D"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="dr3d:vup">
+            <ref name="vector3D"/>
+        </attribute>
+    </optional>
+</define>
+<define name="dr3d-scene-attlist" combine="interleave">
+    <optional>
+        <attribute name="dr3d:projection">
+            <choice>
+                <value>parallel</value>
+                <value>perspective</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="dr3d-scene-attlist" combine="interleave">
+    <optional>
+        <attribute name="dr3d:distance">
+            <ref name="length"/>
+        </attribute>
+    </optional>
+</define>
+<define name="dr3d-scene-attlist" combine="interleave">
+    <optional>
+        <attribute name="dr3d:focal-length">
+            <ref name="length"/>
+        </attribute>
+    </optional>
+</define>
+<define name="dr3d-scene-attlist" combine="interleave">
+    <optional>
+        <attribute name="dr3d:shadow-slant">
+            <ref name="nonNegativeInteger"/>
+        </attribute>
+    </optional>
+</define>
+<define name="dr3d-scene-attlist" combine="interleave">
+    <optional>
+        <attribute name="dr3d:shade-mode">
+            <choice>
+                <value>flat</value>
+                <value>phong</value>
+                <value>gouraud</value>
+                <value>draft</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="dr3d-scene-attlist" combine="interleave">
+    <optional>
+        <attribute name="dr3d:ambient-color">
+            <ref name="color"/>
+        </attribute>
+    </optional>
+</define>
+<define name="dr3d-scene-attlist" combine="interleave">
+    <optional>
+        <attribute name="dr3d:lighting-mode">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-dr3d-transform-attlist">
+    <optional>
+        <attribute name="dr3d:transform"/>
+    </optional>
+</define>
+<define name="dr3d-light">
+    <element name="dr3d:light">
+        <ref name="dr3d-light-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="dr3d-light-attlist" combine="interleave">
+    <optional>
+        <attribute name="dr3d:diffuse-color">
+            <ref name="color"/>
+        </attribute>
+    </optional>
+</define>
+<define name="dr3d-light-attlist" combine="interleave">
+    <attribute name="dr3d:direction">
+        <ref name="vector3D"/>
+    </attribute>
+</define>
+<define name="dr3d-light-attlist" combine="interleave">
+    <optional>
+        <attribute name="dr3d:enabled">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="dr3d-light-attlist" combine="interleave">
+    <optional>
+        <attribute name="dr3d:specular">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="dr3d-cube">
+    <element name="dr3d:cube">
+        <ref name="dr3d-cube-attlist"/>
+        <ref name="common-draw-z-index-attlist"/>
+        <ref name="common-draw-id-attlist"/>
+        <ref name="common-draw-layer-name-attlist"/>
+        <ref name="common-draw-style-name-attlist"/>
+        <ref name="common-dr3d-transform-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="dr3d-cube-attlist" combine="interleave">
+    <optional>
+        <attribute name="dr3d:min-edge">
+            <ref name="vector3D"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="dr3d:max-edge">
+            <ref name="vector3D"/>
+        </attribute>
+    </optional>
+</define>
+<define name="dr3d-sphere">
+    <element name="dr3d:sphere">
+        <ref name="dr3d-sphere-attlist"/>
+        <ref name="common-draw-z-index-attlist"/>
+        <ref name="common-draw-id-attlist"/>
+        <ref name="common-draw-layer-name-attlist"/>
+        <ref name="common-draw-style-name-attlist"/>
+        <ref name="common-dr3d-transform-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="dr3d-sphere-attlist" combine="interleave">
+    <optional>
+        <attribute name="dr3d:center">
+            <ref name="vector3D"/>
+        </attribute>
+    </optional>
+</define>
+<define name="dr3d-sphere-attlist" combine="interleave">
+    <optional>
+        <attribute name="dr3d:size">
+            <ref name="vector3D"/>
+        </attribute>
+    </optional>
+</define>
+<define name="dr3d-extrude">
+    <element name="dr3d:extrude">
+        <ref name="common-draw-path-data-attlist"/>
+        <ref name="common-draw-viewbox-attlist"/>
+        <ref name="common-draw-id-attlist"/>
+        <ref name="common-draw-z-index-attlist"/>
+        <ref name="common-draw-layer-name-attlist"/>
+        <ref name="common-draw-style-name-attlist"/>
+        <ref name="common-dr3d-transform-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="dr3d-rotate">
+    <element name="dr3d:rotate">
+        <ref name="common-draw-viewbox-attlist"/>
+        <ref name="common-draw-path-data-attlist"/>
+        <ref name="common-draw-z-index-attlist"/>
+        <ref name="common-draw-id-attlist"/>
+        <ref name="common-draw-layer-name-attlist"/>
+        <ref name="common-draw-style-name-attlist"/>
+        <ref name="common-dr3d-transform-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="draw-custom-shape">
+    <element name="draw:custom-shape">
+        <ref name="draw-custom-shape-attlist"/>
+        <ref name="common-draw-position-attlist"/>
+        <ref name="common-draw-size-attlist"/>
+        <ref name="common-draw-shape-with-text-and-styles-attlist"/>
+        <ref name="common-draw-caption-id-attlist"/>
+        <optional>
+            <ref name="svg-title"/>
+        </optional>
+        <optional>
+            <ref name="svg-desc"/>
+        </optional>
+        <optional>
+            <ref name="office-event-listeners"/>
+        </optional>
+        <zeroOrMore>
+            <ref name="draw-glue-point"/>
+        </zeroOrMore>
+        <ref name="draw-text"/>
+        <optional>
+            <ref name="draw-enhanced-geometry"/>
+        </optional>
+    </element>
+</define>
+<define name="draw-custom-shape-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:engine">
+            <ref name="namespacedToken"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-custom-shape-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:data">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-enhanced-geometry">
+    <element name="draw:enhanced-geometry">
+        <ref name="draw-enhanced-geometry-attlist"/>
+        <zeroOrMore>
+            <ref name="draw-equation"/>
+        </zeroOrMore>
+        <zeroOrMore>
+            <ref name="draw-handle"/>
+        </zeroOrMore>
+    </element>
+</define>
+<define name="draw-enhanced-geometry-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:type" a:defaultValue="non-primitive">
+            <ref name="custom-shape-type"/>
+        </attribute>
+    </optional>
+</define>
+
+<define name="custom-shape-type">
+    <choice>
+        <value>non-primitive</value>
+        <ref name="string"/>
+    </choice>
+</define>
+<define name="draw-enhanced-geometry-attlist" combine="interleave">
+    <optional>
+        <attribute name="svg:viewBox">
+            <list>
+                <ref name="integer"/>
+                <ref name="integer"/>
+                <ref name="integer"/>
+                <ref name="integer"/>
+            </list>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-enhanced-geometry-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:mirror-vertical" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="draw:mirror-horizontal" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-enhanced-geometry-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:text-rotate-angle" a:defaultValue="0">
+            <ref name="double"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-enhanced-geometry-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:extrusion-allowed" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-enhanced-geometry-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:text-path-allowed" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-enhanced-geometry-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:concentric-gradient-fill-allowed"
+                    a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-enhanced-geometry-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:extrusion" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-enhanced-geometry-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:extrusion-brightness" a:defaultValue="33%">
+            <ref name="percent"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-enhanced-geometry-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:extrusion-depth" a:defaultValue="36pt 0">
+            <list>
+                <ref name="length"/>
+                <ref name="double"/>
+            </list>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-enhanced-geometry-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:extrusion-diffusion" a:defaultValue="0%">
+            <ref name="percent"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-enhanced-geometry-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:extrusion-number-of-line-segments"
+                   a:defaultValue="30">
+            <ref name="integer"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-enhanced-geometry-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:extrusion-light-face" a:defaultValue="true">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-enhanced-geometry-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:extrusion-first-light-harsh"
+                   a:defaultValue="true">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-enhanced-geometry-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:extrusion-second-light-harsh"
+                   a:defaultValue="true">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-enhanced-geometry-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:extrusion-first-light-level"
+                   a:defaultValue="66%">
+            <ref name="percent"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-enhanced-geometry-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:extrusion-second-light-level"
+                   a:defaultValue="66%">
+            <ref name="percent"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-enhanced-geometry-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:extrusion-first-light-direction"
+                   a:defaultValue="(5 0 1)">
+            <ref name="vector3D"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-enhanced-geometry-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:extrusion-second-light-direction"
+                   a:defaultValue="(-5 0 1)">
+            <ref name="vector3D"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-enhanced-geometry-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:extrusion-metal" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-enhanced-geometry-attlist" combine="interleave">
+    <optional>
+        <attribute name="dr3d:shade-mode" a:defaultValue="flat">
+            <choice>
+                <value>flat</value>
+                <value>phong</value>
+                <value>gouraud</value>
+                <value>draft</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-enhanced-geometry-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:extrusion-rotation-angle" a:defaultValue="0 0">
+            <list>
+                <ref name="double"/>
+                <ref name="double"/>
+            </list>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-enhanced-geometry-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:extrusion-rotation-center">
+            <ref name="vector3D"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-enhanced-geometry-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:extrusion-shininess" a:defaultValue="50%">
+            <ref name="percent"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-enhanced-geometry-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:extrusion-skew" a:defaultValue="50 45">
+            <list>
+                <ref name="double"/>
+                <ref name="double"/>
+            </list>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-enhanced-geometry-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:extrusion-specularity" a:defaultValue="0%">
+            <ref name="percent"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-enhanced-geometry-attlist" combine="interleave">
+    <optional>
+        <attribute name="dr3d:projection" a:defaultValue="parallel">
+            <choice>
+                <value>parallel</value>
+                <value>perspective</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-enhanced-geometry-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:extrusion-viewpoint" 
+                   a:defaultValue="3.5cm -3.5cm 25cm">
+            <ref name="point3D"/>
+        </attribute>
+    </optional>
+</define>
+
+<define name="point3D">
+    <data type="string"/>
+</define>
+<define name="draw-enhanced-geometry-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:extrusion-origin" a:defaultValue="0.5 -0.5">
+            <list>
+                <ref name="double"/>
+                <ref name="double"/>
+            </list>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-enhanced-geometry-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:extrusion-color" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-enhanced-geometry-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:enhanced-path">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-enhanced-geometry-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:path-stretchpoint-x" a:defaultValue="0">
+            <ref name="double"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="draw:path-stretchpoint-y" a:defaultValue="0">
+            <ref name="double"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-enhanced-geometry-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:text-areas">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-enhanced-geometry-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:glue-points">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-enhanced-geometry-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:glue-point-type" a:defaultValue="none">
+            <choice>
+                <value>none</value>
+                <value>segments</value>
+                <value>rectangle</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-enhanced-geometry-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:glue-point-leaving-directions"/>
+    </optional>
+</define>
+<define name="draw-enhanced-geometry-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:text-path" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-enhanced-geometry-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:text-path-mode" a:defaultValue="normal">
+            <choice>
+                <value>normal</value>
+                <value>path</value>
+                <value>shape</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-enhanced-geometry-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:text-path-scale" a:defaultValue="path">
+            <choice>
+                <value>path</value>
+                <value>shape</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-enhanced-geometry-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:text-path-same-letter-heights"
+                   a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-enhanced-geometry-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:modifiers">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-equation">
+    <element name="draw:equation">
+        <ref name="draw-equation-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="draw-equation-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:name">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-equation-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:formula">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-handle">
+    <element name="draw:handle">
+        <ref name="draw-handle-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="draw-handle-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:handle-mirror-vertical" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-handle-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:handle-mirror-horizontal" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-handle-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:handle-switched" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-handle-attlist" combine="interleave">
+    <attribute name="draw:handle-position">
+        <ref name="string"/>
+    </attribute>
+</define>
+<define name="draw-handle-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:handle-range-x-minimum">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-handle-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:handle-range-x-maximum">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-handle-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:handle-range-y-minimum">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-handle-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:handle-range-y-maximum">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-handle-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:handle-polar">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-handle-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:handle-radius-range-minimum">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-handle-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:handle-radius-range-maximum">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="presentation-shape-attlist" combine="interleave">
+    <optional>
+        <attribute name="presentation:class">
+            <ref name="presentation-classes"/>
+        </attribute>
+    </optional>
+</define>
+<define name="presentation-classes">
+    <choice>
+        <value>title</value>
+        <value>outline</value>
+        <value>subtitle</value>
+        <value>text</value>
+        <value>graphic</value>
+        <value>object</value>
+        <value>chart</value>
+        <value>table</value>
+        <value>orgchart</value>
+        <value>page</value>
+        <value>notes</value>
+        <value>handout</value>
+        <value>header</value>
+        <value>footer</value>
+        <value>date-time</value>
+        <value>page-number</value>
+    </choice>
+</define>
+<define name="presentation-shape-attlist" combine="interleave">
+    <optional>
+        <attribute name="presentation:placeholder">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="presentation-shape-attlist" combine="interleave">
+    <optional>
+        <attribute name="presentation:user-transformed">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="presentation-animations">
+    <element name="presentation:animations">
+        <zeroOrMore>
+            <choice>
+                <ref name="presentation-animation-elements"/>
+                <ref name="presentation-animation-group"/>
+            </choice>
+        </zeroOrMore>
+    </element>
+</define>
+<define name="presentation-animation-elements">
+    <choice>
+        <ref name="presentation-show-shape"/>
+        <ref name="presentation-show-text"/>
+        <ref name="presentation-hide-shape"/>
+        <ref name="presentation-hide-text"/>
+        <ref name="presentation-dim"/>
+        <ref name="presentation-play"/>
+    </choice>
+</define>
+<define name="presentation-sound">
+    <element name="presentation:sound">
+        <ref name="presentation-sound-attlist"/>
+        <attribute name="xlink:href">
+            <ref name="anyURI"/>
+        </attribute>
+        <optional>
+            <attribute name="xlink:type" a:defaultValue="simple">
+                <choice>
+                    <value>simple</value>
+                </choice>
+            </attribute>
+        </optional>
+        <optional>
+            <attribute name="xlink:actuate" a:defaultValue="onRequest">
+                <choice>
+                    <value>onRequest</value>
+                </choice>
+            </attribute>
+        </optional>
+        <optional>
+            <attribute name="xlink:show">
+                <choice>
+                    <value>new</value>
+                    <value>replace</value>
+                </choice>
+            </attribute>
+        </optional>
+        <empty/>
+    </element>
+</define>
+<define name="presentation-sound-attlist" combine="interleave">
+    <optional>
+        <attribute name="presentation:play-full">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="presentation-show-shape">
+    <element name="presentation:show-shape">
+        <ref name="common-presentation-effect-attlist"/>
+        <optional>
+            <ref name="presentation-sound"/>
+        </optional>
+    </element>
+</define>
+<define name="common-presentation-effect-attlist" combine="interleave">
+    <attribute name="draw:shape-id">
+        <ref name="IDREF"/>
+    </attribute>
+</define>
+<define name="common-presentation-effect-attlist" combine="interleave">
+    <optional>
+        <attribute name="presentation:effect" a:defaultValue="none">
+            <ref name="presentationEffects"/>
+        </attribute>
+    </optional>
+</define>
+<define name="presentationEffects">
+    <choice>
+        <value>none</value>
+        <value>fade</value>
+        <value>move</value>
+        <value>stripes</value>
+        <value>open</value>
+        <value>close</value>
+        <value>dissolve</value>
+        <value>wavyline</value>
+        <value>random</value>
+        <value>lines</value>
+        <value>laser</value>
+        <value>appear</value>
+        <value>hide</value>
+        <value>move-short</value>
+        <value>checkerboard</value>
+        <value>rotate</value>
+        <value>stretch</value>
+    </choice>
+</define>
+<define name="common-presentation-effect-attlist" combine="interleave">
+    <optional>
+        <attribute name="presentation:direction" a:defaultValue="none">
+            <ref name="presentationEffectDirections"/>
+        </attribute>
+    </optional>
+</define>
+<define name="presentationEffectDirections">
+    <choice>
+        <value>none</value>
+        <value>from-left</value>
+        <value>from-top</value>
+        <value>from-right</value>
+        <value>from-bottom</value>
+        <value>from-center</value>
+        <value>from-upper-left</value>
+        <value>from-upper-right</value>
+        <value>from-lower-left</value>
+        <value>from-lower-right</value>
+        <value>to-left</value>
+        <value>to-top</value>
+        <value>to-right</value>
+        <value>to-bottom</value>
+        <value>to-upper-left</value>
+        <value>to-upper-right</value>
+        <value>to-lower-right</value>
+        <value>to-lower-left</value>
+        <value>path</value>
+        <value>spiral-inward-left</value>
+        <value>spiral-inward-right</value>
+        <value>spiral-outward-left</value>
+        <value>spiral-outward-right</value>
+        <value>vertical</value>
+        <value>horizontal</value>
+        <value>to-center</value>
+        <value>clockwise</value>
+        <value>counter-clockwise</value>
+    </choice>
+</define>
+<define name="common-presentation-effect-attlist" combine="interleave">
+    <optional>
+        <attribute name="presentation:speed" a:defaultValue="medium">
+            <ref name="presentationSpeeds"/>
+        </attribute>
+    </optional>
+</define>
+<define name="presentationSpeeds">
+    <choice>
+        <value>slow</value>
+        <value>medium</value>
+        <value>fast</value>
+    </choice>
+</define>
+<define name="common-presentation-effect-attlist" combine="interleave">
+    <optional>
+        <attribute name="presentation:delay">
+            <ref name="duration"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-presentation-effect-attlist" combine="interleave">
+    <optional>
+        <attribute name="presentation:start-scale" a:defaultValue="100%">
+            <ref name="percent"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-presentation-effect-attlist" combine="interleave">
+    <optional>
+        <attribute name="presentation:path-id"/>
+    </optional>
+</define>
+<define name="presentation-show-text">
+    <element name="presentation:show-text">
+        <ref name="common-presentation-effect-attlist"/>
+        <optional>
+            <ref name="presentation-sound"/>
+        </optional>
+    </element>
+</define>
+<define name="presentation-hide-shape">
+    <element name="presentation:hide-shape">
+        <ref name="common-presentation-effect-attlist"/>
+        <optional>
+            <ref name="presentation-sound"/>
+        </optional>
+    </element>
+</define>
+<define name="presentation-hide-text">
+    <element name="presentation:hide-text">
+        <ref name="common-presentation-effect-attlist"/>
+        <optional>
+            <ref name="presentation-sound"/>
+        </optional>
+    </element>
+</define>
+<define name="presentation-dim">
+    <element name="presentation:dim">
+        <ref name="presentation-dim-attlist"/>
+        <optional>
+            <ref name="presentation-sound"/>
+        </optional>
+    </element>
+</define>
+<define name="presentation-dim-attlist" combine="interleave">
+    <attribute name="draw:shape-id">
+        <ref name="IDREF"/>
+    </attribute>
+</define>
+<define name="presentation-dim-attlist" combine="interleave">
+    <attribute name="draw:color">
+        <ref name="color"/>
+    </attribute>
+</define>
+<define name="presentation-play">
+    <element name="presentation:play">
+        <ref name="presentation-play-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="presentation-play-attlist" combine="interleave">
+    <attribute name="draw:shape-id">
+        <ref name="IDREF"/>
+    </attribute>
+    <optional>
+        <attribute name="presentation:speed" a:defaultValue="medium">
+            <ref name="presentationSpeeds"/>
+        </attribute>
+    </optional>
+</define>
+<define name="presentation-animation-group">
+    <element name="presentation:animation-group">
+        <zeroOrMore>
+            <ref name="presentation-animation-elements"/>
+        </zeroOrMore>
+    </element>
+</define>
+<define name="common-anim-attlist" combine="interleave">
+    <optional>
+        <attribute name="presentation:node-type" a:defaultValue="default">
+            <choice>
+                <value>default</value>
+                <value>on-click</value>
+                <value>with-previous</value>
+                <value>after-previous</value>
+                <value>timing-root</value>
+                <value>main-sequence</value>
+                <value>interactive-sequence</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="common-anim-attlist" combine="interleave">
+    <optional>
+        <attribute name="presentation:preset-id">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-anim-attlist" combine="interleave">
+    <optional>
+        <attribute name="presentation:preset-sub-type">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-anim-attlist" combine="interleave">
+    <optional>
+        <attribute name="presentation:preset-class" a:defaultValue="custom">
+            <choice>
+                <value>custom</value>
+                <value>entrance</value>
+                <value>exit</value>
+                <value>emphasis</value>
+                <value>motion-path</value>
+                <value>ole-action</value>
+                <value>media-call</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="common-anim-attlist" combine="interleave">
+    <optional>
+        <attribute name="presentation:master-element">
+            <ref name="IDREF"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-anim-attlist" combine="interleave">
+    <optional>
+        <attribute name="presentation:group-id">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="presentation-event-listener">
+    <element name="presentation:event-listener">
+        <ref name="presentation-event-listener-attlist"/>
+        <optional>
+            <ref name="presentation-sound"/>
+        </optional>
+    </element>
+</define>
+<define name="presentation-event-listener-attlist" combine="interleave">
+    <attribute name="script:event-name">
+        <ref name="string"/>
+    </attribute>
+</define>
+<define name="presentation-event-listener-attlist" combine="interleave">
+    <attribute name="presentation:action">
+        <choice>
+            <value>none</value>
+            <value>previous-page</value>
+            <value>next-page</value>
+            <value>first-page</value>
+            <value>last-page</value>
+            <value>hide</value>
+            <value>stop</value>
+            <value>execute</value>
+            <value>show</value>
+            <value>verb</value>
+            <value>fade-out</value>
+            <value>sound</value>
+        </choice>
+    </attribute>
+</define>
+<define name="presentation-event-listener-attlist" combine="interleave">
+    <optional>
+        <attribute name="presentation:effect" a:defaultValue="none">
+            <ref name="presentationEffects"/>
+        </attribute>
+    </optional>
+</define>
+<define name="presentation-event-listener-attlist" combine="interleave">
+    <optional>
+        <attribute name="presentation:direction" a:defaultValue="none">
+            <ref name="presentationEffectDirections"/>
+        </attribute>
+    </optional>
+</define>
+<define name="presentation-event-listener-attlist" combine="interleave">
+    <optional>
+        <attribute name="presentation:speed" a:defaultValue="medium">
+            <ref name="presentationSpeeds"/>
+        </attribute>
+    </optional>
+</define>
+<define name="presentation-event-listener-attlist" combine="interleave">
+    <optional>
+        <attribute name="presentation:start-scale" a:defaultValue="100%">
+            <ref name="percent"/>
+        </attribute>
+    </optional>
+</define>
+<define name="presentation-event-listener-attlist" combine="interleave">
+    <optional>
+        <attribute name="xlink:href">
+            <ref name="anyURI"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="xlink:type" a:defaultValue="simple">
+            <choice>
+                <value>simple</value>
+            </choice>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="xlink:show" a:defaultValue="embed">
+            <choice>
+                <value>embed</value>
+            </choice>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="xlink:actuate" a:defaultValue="onRequest">
+            <choice>
+                <value>onRequest</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="presentation-event-listener-attlist" combine="interleave">
+    <optional>
+        <attribute name="presentation:verb">
+            <ref name="nonNegativeInteger"/>
+        </attribute>
+    </optional>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="presentation:header">
+        <empty/>
+    </element>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="presentation:footer">
+        <empty/>
+    </element>
+</define>
+<define name="paragraph-content" combine="choice">
+    <element name="presentation:date-time">
+        <empty/>
+    </element>
+</define>
+<define name="presentation-decls">
+    <zeroOrMore>
+        <ref name="presentation-decl"/>
+    </zeroOrMore>
+</define>
+<define name="presentation-decl" combine="choice">
+    <element name="presentation:header-decl">
+        <ref name="presentation-header-decl-attlist"/>
+        <text/>
+    </element>
+</define>
+<define name="presentation-header-decl-attlist" combine="interleave">
+    <attribute name="presentation:name">
+        <ref name="string"/>
+    </attribute>
+</define>
+<define name="presentation-decl" combine="choice">
+    <element name="presentation:footer-decl">
+        <ref name="presentation-footer-decl-attlist"/>
+        <text/>
+    </element>
+</define>
+<define name="presentation-footer-decl-attlist" combine="interleave">
+    <attribute name="presentation:name">
+        <ref name="string"/>
+    </attribute>
+</define>
+<define name="presentation-decl" combine="choice">
+    <element name="presentation:date-time-decl">
+        <ref name="presentation-date-time-decl-attlist"/>
+        <text/>
+    </element>
+</define>
+<define name="presentation-date-time-decl-attlist" combine="interleave">
+    <attribute name="presentation:name">
+        <ref name="string"/>
+    </attribute>
+</define>
+<define name="presentation-date-time-decl-attlist" combine="interleave">
+    <attribute name="presentation:source">
+        <choice>
+            <value>fixed</value>
+            <value>current-date</value>
+        </choice>
+    </attribute>
+</define>
+<define name="presentation-date-time-decl-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:data-style-name">
+            <ref name="styleNameRef"/>
+        </attribute>
+    </optional>
+</define>
+<define name="presentation-settings">
+    <optional>
+        <element name="presentation:settings">
+            <ref name="presentation-settings-attlist"/>
+            <zeroOrMore>
+                <ref name="presentation-show"/>
+            </zeroOrMore>
+        </element>
+    </optional>
+</define>
+<define name="presentation-settings-attlist" combine="interleave">
+    <optional>
+        <attribute name="presentation:start-page">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="presentation-settings-attlist" combine="interleave">
+    <optional>
+        <attribute name="presentation:show">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="presentation-settings-attlist" combine="interleave">
+    <optional>
+        <attribute name="presentation:full-screen" a:defaultValue="true">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="presentation-settings-attlist" combine="interleave">
+    <optional>
+        <attribute name="presentation:endless" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="presentation-settings-attlist" combine="interleave">
+    <optional>
+        <attribute name="presentation:pause">
+            <ref name="duration"/>
+        </attribute>
+    </optional>
+</define>
+<define name="presentation-settings-attlist" combine="interleave">
+    <optional>
+        <attribute name="presentation:show-logo" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="presentation-settings-attlist" combine="interleave">
+    <optional>
+        <attribute name="presentation:force-manual" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="presentation-settings-attlist" combine="interleave">
+    <optional>
+        <attribute name="presentation:mouse-visible" a:defaultValue="true">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="presentation-settings-attlist" combine="interleave">
+    <optional>
+        <attribute name="presentation:mouse-as-pen" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="presentation-settings-attlist" combine="interleave">
+    <optional>
+        <attribute name="presentation:start-with-navigator"
+                   a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="presentation-settings-attlist" combine="interleave">
+    <optional>
+        <attribute name="presentation:animations" a:defaultValue="enabled">
+            <choice>
+                <value>enabled</value>
+                <value>disabled</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="presentation-settings-attlist" combine="interleave">
+    <optional>
+        <attribute name="presentation:transition-on-click"
+                   a:defaultValue="enabled">
+            <choice>
+                <value>enabled</value>
+                <value>disabled</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="presentation-settings-attlist" combine="interleave">
+    <optional>
+        <attribute name="presentation:stay-on-top" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="presentation-settings-attlist" combine="interleave">
+    <optional>
+        <attribute name="presentation:show-end-of-presentation-slide"
+                   a:defaultValue="true">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="presentation-show">
+    <element name="presentation:show">
+        <ref name="presentation-show-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="presentation-show-attlist" combine="interleave">
+    <attribute name="presentation:name">
+        <ref name="string"/>
+    </attribute>
+</define>
+<define name="presentation-show-attlist" combine="interleave">
+    <attribute name="presentation:pages"/>
+</define>
+<define name="chart-chart">
+    <element name="chart:chart">
+        <ref name="chart-chart-attlist"/>
+        <optional>
+            <ref name="chart-title"/>
+        </optional>
+        <optional>
+            <ref name="chart-subtitle"/>
+        </optional>
+        <optional>
+            <ref name="chart-footer"/>
+        </optional>
+        <optional>
+            <ref name="chart-legend"/>
+        </optional>
+        <ref name="chart-plot-area"/>
+        <optional>
+            <ref name="table-table"/>
+        </optional>
+    </element>
+</define>
+<define name="chart-chart-attlist" combine="interleave">
+    <attribute name="chart:class">
+        <ref name="namespacedToken"/>
+    </attribute>
+</define>
+<define name="chart-chart-attlist" combine="interleave">
+    <ref name="common-draw-size-attlist"/>
+</define>
+<define name="chart-chart-attlist" combine="interleave">
+    <optional>
+        <attribute name="chart:column-mapping">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="chart-chart-attlist" combine="interleave">
+    <optional>
+        <attribute name="chart:row-mapping">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="chart-chart-attlist" combine="interleave">
+    <optional>
+        <attribute name="chart:style-name">
+            <ref name="styleNameRef"/>
+        </attribute>
+    </optional>
+</define>
+<define name="chart-title">
+    <element name="chart:title">
+        <ref name="chart-title-attlist"/>
+        <optional>
+            <ref name="text-p"/>
+        </optional>
+    </element>
+</define>
+<define name="chart-title-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:cell-range">
+            <ref name="cellAddress"/>
+        </attribute>
+    </optional>
+</define>
+<define name="chart-title-attlist" combine="interleave">
+    <ref name="common-draw-position-attlist"/>
+</define>
+<define name="chart-title-attlist" combine="interleave">
+    <optional>
+        <attribute name="chart:style-name">
+            <ref name="styleNameRef"/>
+        </attribute>
+    </optional>
+</define>
+<define name="chart-subtitle">
+    <element name="chart:subtitle">
+        <ref name="chart-title-attlist"/>
+        <optional>
+            <ref name="text-p"/>
+        </optional>
+    </element>
+</define>
+<define name="chart-footer">
+    <element name="chart:footer">
+        <ref name="chart-title-attlist"/>
+        <optional>
+            <ref name="text-p"/>
+        </optional>
+    </element>
+</define>
+<define name="chart-legend">
+    <element name="chart:legend">
+        <ref name="chart-legend-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="chart-legend-attlist" combine="interleave">
+    <choice>
+        <group>
+            <attribute name="chart:legend-position">
+                <choice>
+                    <value>start</value>
+                    <value>end</value>
+                    <value>top</value>
+                    <value>bottom</value>
+                </choice>
+            </attribute>
+            <optional>
+                <attribute name="chart:legend-align">
+                    <choice>
+                        <value>start</value>
+                        <value>center</value>
+                        <value>end</value>
+                    </choice>
+                </attribute>
+            </optional>
+        </group>
+        <attribute name="chart:legend-position">
+            <choice>
+                <value>top-start</value>
+                <value>bottom-start</value>
+                <value>top-end</value>
+                <value>bottom-end</value>
+            </choice>
+        </attribute>
+        <empty/>
+    </choice>
+</define>
+<define name="chart-legend-attlist" combine="interleave">
+    <ref name="common-draw-position-attlist"/>
+</define>
+<define name="chart-legend-attlist" combine="interleave">
+    <choice>
+        <attribute name="style:legend-expansion">
+            <choice>
+                <value>wide</value>
+                <value>high</value>
+                <value>balanced</value>
+            </choice>
+        </attribute>
+        <group>
+            <attribute name="style:legend-expansion">
+                <value>custom</value>
+            </attribute>
+            <attribute name="style:legend-expansion-aspect-ratio">
+                <ref name="double"/>
+            </attribute>
+        </group>
+        <empty/>
+    </choice>
+</define>
+<define name="chart-legend-attlist" combine="interleave">
+    <optional>
+        <attribute name="chart:style-name">
+            <ref name="styleNameRef"/>
+        </attribute>
+    </optional>
+</define>
+<define name="chart-plot-area">
+    <element name="chart:plot-area">
+        <ref name="chart-plot-area-attlist"/>
+        <zeroOrMore>
+            <ref name="dr3d-light"/>
+        </zeroOrMore>
+        <zeroOrMore>
+            <ref name="chart-axis"/>
+        </zeroOrMore>
+        <zeroOrMore>
+            <ref name="chart-series"/>
+        </zeroOrMore>
+        <optional>
+            <ref name="chart-stock-gain-marker"/>
+        </optional>
+        <optional>
+            <ref name="chart-stock-loss-marker"/>
+        </optional>
+        <optional>
+            <ref name="chart-stock-range-line"/>
+        </optional>
+        <optional>
+            <ref name="chart-wall"/>
+        </optional>
+        <optional>
+            <ref name="chart-floor"/>
+        </optional>
+    </element>
+</define>
+<define name="chart-plot-area-attlist" combine="interleave">
+    <ref name="common-draw-position-attlist"/>
+    <ref name="common-draw-size-attlist"/>
+</define>
+<define name="chart-plot-area-attlist" combine="interleave">
+    <optional>
+        <attribute name="chart:style-name">
+            <ref name="styleNameRef"/>
+        </attribute>
+    </optional>
+</define>
+<define name="chart-plot-area-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:cell-range-address">
+            <ref name="cellRangeAddress"/>
+        </attribute>
+    </optional>
+</define>
+<define name="chart-plot-area-attlist" combine="interleave">
+    <optional>
+        <attribute name="chart:data-source-has-labels" a:defaultValue="none">
+            <choice>
+                <value>none</value>
+                <value>row</value>
+                <value>column</value>
+                <value>both</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="chart-plot-area-attlist" combine="interleave">
+    <ref name="dr3d-scene-attlist"/>
+    <ref name="common-dr3d-transform-attlist"/>
+</define>
+<define name="chart-wall">
+    <element name="chart:wall">
+        <ref name="chart-wall-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="chart-wall-attlist" combine="interleave">
+    <optional>
+        <attribute name="svg:width">
+            <ref name="length"/>
+        </attribute>
+    </optional>
+</define>
+<define name="chart-wall-attlist" combine="interleave">
+    <optional>
+        <attribute name="chart:style-name">
+            <ref name="styleNameRef"/>
+        </attribute>
+    </optional>
+</define>
+<define name="chart-floor">
+    <element name="chart:floor">
+        <ref name="chart-floor-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="chart-floor-attlist" combine="interleave">
+    <optional>
+        <attribute name="svg:width">
+            <ref name="length"/>
+        </attribute>
+    </optional>
+</define>
+<define name="chart-floor-attlist" combine="interleave">
+    <optional>
+        <attribute name="chart:style-name">
+            <ref name="styleNameRef"/>
+        </attribute>
+    </optional>
+</define>
+<define name="chart-axis">
+    <element name="chart:axis">
+        <ref name="chart-axis-attlist"/>
+        <optional>
+            <ref name="chart-title"/>
+        </optional>
+        <optional>
+            <ref name="chart-categories"/>
+        </optional>
+        <zeroOrMore>
+            <ref name="chart-grid"/>
+        </zeroOrMore>
+    </element>
+</define>
+<define name="chart-axis-attlist" combine="interleave">
+    <attribute name="chart:dimension">
+        <choice>
+            <value>x</value>
+            <value>y</value>
+            <value>z</value>
+        </choice>
+    </attribute>
+</define>
+<define name="chart-axis-attlist" combine="interleave">
+    <optional>
+        <attribute name="chart:name">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="chart-axis-attlist" combine="interleave">
+    <optional>
+        <attribute name="chart:style-name">
+            <ref name="styleNameRef"/>
+        </attribute>
+    </optional>
+</define>
+<define name="chart-grid">
+    <element name="chart:grid">
+        <ref name="chart-grid-attlist"/>
+    </element>
+</define>
+<define name="chart-grid-attlist" combine="interleave">
+    <optional>
+        <attribute name="chart:class" a:defaultValue="major">
+            <choice>
+                <value>major</value>
+                <value>minor</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="chart-grid-attlist" combine="interleave">
+    <optional>
+        <attribute name="chart:style-name">
+            <ref name="styleNameRef"/>
+        </attribute>
+    </optional>
+</define>
+<define name="chart-series">
+    <element name="chart:series">
+        <ref name="chart-series-attlist"/>
+        <zeroOrMore>
+            <ref name="chart-domain"/>
+        </zeroOrMore>
+        <optional>
+            <ref name="chart-mean-value"/>
+        </optional>
+        <optional>
+            <ref name="chart-regression-curve"/>
+        </optional>
+        <optional>
+            <ref name="chart-error-indicator"/>
+        </optional>
+        <zeroOrMore>
+            <ref name="chart-data-point"/>
+        </zeroOrMore>
+    </element>
+</define>
+<define name="chart-series-attlist" combine="interleave">
+    <optional>
+        <attribute name="chart:values-cell-range-address">
+            <ref name="cellRangeAddress"/>
+        </attribute>
+    </optional>
+</define>
+<define name="chart-series-attlist" combine="interleave">
+    <optional>
+        <attribute name="chart:label-cell-address">
+            <ref name="cellAddress"/>
+        </attribute>
+    </optional>
+</define>
+<define name="chart-series-attlist" combine="interleave">
+    <optional>
+        <attribute name="chart:class">
+            <ref name="namespacedToken"/>
+        </attribute>
+    </optional>
+</define>
+<define name="chart-series-attlist" combine="interleave">
+    <optional>
+        <attribute name="chart:attached-axis">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="chart-series-attlist" combine="interleave">
+    <optional>
+        <attribute name="chart:style-name">
+            <ref name="styleNameRef"/>
+        </attribute>
+    </optional>
+</define>
+<define name="chart-domain">
+    <element name="chart:domain">
+    <optional>
+        <attribute name="table:cell-range-address">
+            <ref name="cellRangeAddress"/>
+        </attribute>
+    </optional>
+    </element>
+</define>
+<define name="chart-categories">
+    <element name="chart:categories">
+    <optional>
+        <attribute name="table:cell-range-address">
+            <ref name="cellRangeAddress"/>
+        </attribute>
+    </optional>
+    </element>
+</define>
+<define name="chart-data-point">
+    <element name="chart:data-point">
+        <ref name="chart-data-point-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="chart-data-point-attlist" combine="interleave">
+    <optional>
+        <attribute name="chart:repeated">
+            <ref name="nonNegativeInteger"/>
+        </attribute>
+    </optional>
+</define>
+<define name="chart-data-point-attlist" combine="interleave">
+    <optional>
+        <attribute name="chart:style-name">
+            <ref name="styleNameRef"/>
+        </attribute>
+    </optional>
+</define>
+
+<define name="chart-mean-value">
+    <element name="chart:mean-value">
+        <ref name="chart-mean-value-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="chart-mean-value-attlist" combine="interleave">
+    <optional>
+        <attribute name="chart:style-name">
+            <ref name="styleNameRef"/>
+        </attribute>
+    </optional>
+</define>
+<define name="chart-error-indicator">
+    <element name="chart:error-indicator">
+        <ref name="chart-error-indicator-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="chart-error-indicator-attlist" combine="interleave">
+    <optional>
+        <attribute name="chart:style-name">
+            <ref name="styleNameRef"/>
+        </attribute>
+    </optional>
+</define>
+<define name="chart-regression-curve">
+    <element name="chart:regression-curve">
+        <ref name="chart-regression-curve-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="chart-regression-curve-attlist" combine="interleave">
+    <optional>
+        <attribute name="chart:style-name">
+            <ref name="styleNameRef"/>
+        </attribute>
+    </optional>
+</define>
+<define name="chart-stock-gain-marker">
+    <element name="chart:stock-gain-marker">
+        <ref name="common-stock-marker-attlist"/>
+    </element>
+</define>
+<define name="chart-stock-loss-marker">
+    <element name="chart:stock-loss-marker">
+        <ref name="common-stock-marker-attlist"/>
+    </element>
+</define>
+<define name="chart-stock-range-line">
+    <element name="chart:stock-range-line">
+        <ref name="common-stock-marker-attlist"/>
+    </element>
+</define>
+<define name="common-stock-marker-attlist">
+    <optional>
+        <attribute name="chart:style-name">
+            <ref name="styleNameRef"/>
+        </attribute>
+    </optional>
+</define>
+<define name="office-forms">
+    <optional>
+        <element name="office:forms">
+            <ref name="office-forms-attlist"/>
+            <zeroOrMore>
+                <choice>
+                    <ref name="form-form"/>
+                    <ref name="xforms-model"/>
+                </choice>
+            </zeroOrMore>
+        </element>
+    </optional>
+</define>
+<define name="office-forms-attlist" combine="interleave">
+    <optional>
+        <attribute name="form:automatic-focus" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="office-forms-attlist" combine="interleave">
+    <optional>
+        <attribute name="form:apply-design-mode" a:defaultValue="true">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="form-form">
+    <element name="form:form">
+        <ref name="common-form-control-attlist"/>
+        <ref name="form-form-attlist"/>
+        <optional>
+            <ref name="form-properties"/>
+        </optional>
+        <optional>
+            <ref name="office-event-listeners"/>
+        </optional>
+        <zeroOrMore>
+            <choice>
+                <ref name="controls"/>
+                <ref name="form-form"/>
+            </choice>
+        </zeroOrMore>
+        <optional>
+            <ref name="form-connection-resource"/>
+        </optional>
+    </element>
+</define>
+<define name="form-form-attlist" combine="interleave">
+    <optional>
+        <attribute name="xlink:href">
+            <ref name="anyURI"/>
+        </attribute>
+        <optional>
+            <attribute name="xlink:type" a:defaultValue="simple">
+                <value>simple</value>
+            </attribute>
+        </optional>
+        <optional>
+            <attribute name="xlink:actuate" a:defaultValue="onRequest">
+                <value>onRequest</value>
+            </attribute>
+        </optional>
+    </optional>
+</define>
+<define name="form-form-attlist" combine="interleave">
+    <optional>
+        <attribute name="office:target-frame" a:defaultValue="_blank">
+            <ref name="targetFrameName"/>
+        </attribute>
+    </optional>
+</define>
+<define name="form-form-attlist" combine="interleave">
+    <optional>
+        <attribute name="form:method" a:defaultValue="get">
+            <choice>
+                <value>get</value>
+                <value>post</value>
+                <ref name="string"/>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="form-form-attlist" combine="interleave">
+    <optional>
+        <attribute name="form:enctype" 
+                    a:defaultValue="application/x-www-form-urlencoded">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="form-form-attlist" combine="interleave">
+    <optional>
+        <attribute name="form:allow-deletes" a:defaultValue="true">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="form-form-attlist" combine="interleave">
+    <optional>
+        <attribute name="form:allow-inserts" a:defaultValue="true">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="form-form-attlist" combine="interleave">
+    <optional>
+        <attribute name="form:allow-updates" a:defaultValue="true">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="form-form-attlist" combine="interleave">
+    <optional>
+        <attribute name="form:apply-filter" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="form-form-attlist" combine="interleave">
+    <optional>
+        <attribute name="form:command-type" a:defaultValue="command">
+            <choice>
+                <value>table</value>
+                <value>query</value>
+                <value>command</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="form-form-attlist" combine="interleave">
+    <optional>
+        <attribute name="form:command"/>
+    </optional>
+</define>
+<define name="form-form-attlist" combine="interleave">
+    <optional>
+        <attribute name="form:datasource">
+            <choice>
+                <ref name="anyURI"/>
+                <ref name="string"/>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="form-form-attlist" combine="interleave">
+    <optional>
+        <attribute name="form:master-fields">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="form-form-attlist" combine="interleave">
+    <optional>
+        <attribute name="form:detail-fields">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="form-form-attlist" combine="interleave">
+    <optional>
+        <attribute name="form:escape-processing" a:defaultValue="true">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="form-form-attlist" combine="interleave">
+    <optional>
+        <attribute name="form:filter">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="form-form-attlist" combine="interleave">
+    <optional>
+        <attribute name="form:ignore-result" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="form-form-attlist" combine="interleave">
+    <optional>
+        <attribute name="form:navigation-mode">
+            <ref name="navigation"/>
+        </attribute>
+    </optional>
+</define>
+
+<define name="navigation">
+    <choice>
+        <value>none</value>
+        <value>current</value>
+        <value>parent</value>
+    </choice>
+</define>
+<define name="form-form-attlist" combine="interleave">
+    <optional>
+        <attribute name="form:order">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="form-form-attlist" combine="interleave">
+    <optional>
+        <attribute name="form:tab-cycle">
+            <ref name="tab-cycles"/>
+        </attribute>
+    </optional>
+</define>
+<define name="tab-cycles">
+    <choice>
+        <value>records</value>
+        <value>current</value>
+        <value>page</value>
+    </choice>
+</define>
+<define name="form-connection-resource">
+    <element name="form:connection-resource">
+        <attribute name="xlink:href">
+            <ref name="anyURI"/>
+        </attribute>
+        <empty/>
+    </element>
+</define>
+<define name="xforms-model">
+    <element name="xforms:model">
+        <ref name="anyAttListOrElements"/>
+    </element>
+</define>
+<define name="column-controls" combine="choice">
+    <element name="form:text">
+        <ref name="form-text-attlist"/>
+        <ref name="common-form-control-content"/>
+    </element>
+</define>
+<define name="controls" combine="choice">
+    <ref name="column-controls"/>
+</define>
+<define name="form-text-attlist">
+    <ref name="form-control-attlist"/>
+    <ref name="common-current-value-attlist"/>
+    <ref name="common-disabled-attlist"/>
+    <ref name="common-maxlength-attlist"/>
+    <ref name="common-printable-attlist"/>
+    <ref name="common-readonly-attlist"/>
+    <ref name="common-tab-attlist"/>
+    <ref name="common-title-attlist"/>
+    <ref name="common-value-attlist"/>
+    <ref name="common-convert-empty-attlist"/>
+    <ref name="common-data-field-attlist"/>
+</define>
+<define name="form-control-attlist">
+    <ref name="common-form-control-attlist"/>
+    <ref name="common-control-id-attlist"/>
+    <ref name="xforms-bind-attlist"/>
+</define>
+<define name="common-form-control-content">
+    <optional>
+        <ref name="form-properties"/>
+    </optional>
+    <optional>
+        <ref name="office-event-listeners"/>
+    </optional>
+</define>
+<define name="column-controls" combine="choice">
+    <element name="form:textarea">
+        <ref name="form-textarea-attlist"/>
+        <ref name="common-form-control-content"/>
+        <zeroOrMore>
+            <ref name="text-p"/>
+        </zeroOrMore>
+    </element>
+</define>
+<define name="form-textarea-attlist">
+    <ref name="form-control-attlist"/>
+    <ref name="common-current-value-attlist"/>
+    <ref name="common-disabled-attlist"/>
+    <ref name="common-maxlength-attlist"/>
+    <ref name="common-printable-attlist"/>
+    <ref name="common-readonly-attlist"/>
+    <ref name="common-tab-attlist"/>
+    <ref name="common-title-attlist"/>
+    <ref name="common-value-attlist"/>
+    <ref name="common-convert-empty-attlist"/>
+    <ref name="common-data-field-attlist"/>
+</define>
+<define name="controls" combine="choice">
+    <element name="form:password">
+        <ref name="form-password-attlist"/>
+        <ref name="common-form-control-content"/>
+    </element>
+</define>
+<define name="form-password-attlist" combine="interleave">
+    <ref name="form-control-attlist"/>
+    <ref name="common-disabled-attlist"/>
+    <ref name="common-maxlength-attlist"/>
+    <ref name="common-printable-attlist"/>
+    <ref name="common-tab-attlist"/>
+    <ref name="common-title-attlist"/>
+    <ref name="common-value-attlist"/>
+    <ref name="common-convert-empty-attlist"/>
+</define>
+<define name="form-password-attlist" combine="interleave">
+    <optional>
+        <attribute name="form:echo-char" a:defaultValue="*">
+            <ref name="character"/>
+        </attribute>
+    </optional>
+</define>
+<define name="controls" combine="choice">
+    <element name="form:file">
+        <ref name="form-file-attlist"/>
+        <ref name="common-form-control-content"/>
+    </element>
+</define>
+<define name="form-file-attlist" combine="interleave">
+    <ref name="form-control-attlist"/>
+    <ref name="common-current-value-attlist"/>
+    <ref name="common-disabled-attlist"/>
+    <ref name="common-maxlength-attlist"/>
+    <ref name="common-printable-attlist"/>
+    <ref name="common-readonly-attlist"/>
+    <ref name="common-tab-attlist"/>
+    <ref name="common-title-attlist"/>
+    <ref name="common-value-attlist"/>
+</define>
+<define name="column-controls" combine="choice">
+    <element name="form:formatted-text">
+        <ref name="form-formatted-text-attlist"/>
+        <ref name="common-form-control-content"/>
+    </element>
+</define>
+<define name="form-formatted-text-attlist" combine="interleave">
+    <ref name="form-control-attlist"/>
+    <ref name="common-current-value-attlist"/>
+    <ref name="common-disabled-attlist"/>
+    <ref name="common-maxlength-attlist"/>
+    <ref name="common-printable-attlist"/>
+    <ref name="common-readonly-attlist"/>
+    <ref name="common-tab-attlist"/>
+    <ref name="common-title-attlist"/>
+    <ref name="common-value-attlist"/>
+    <ref name="common-convert-empty-attlist"/>
+    <ref name="common-data-field-attlist"/>
+</define>
+<define name="form-formatted-text-attlist" combine="interleave">
+    <optional>
+        <attribute name="form:max-value">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="form-formatted-text-attlist" combine="interleave">
+    <optional>
+        <attribute name="form:min-value">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="form-formatted-text-attlist" combine="interleave">
+    <optional>
+        <attribute name="form:validation" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="column-controls" combine="choice">
+    <element name="form:number">
+        <ref name="form-number-attlist"/>
+        <ref name="common-numeric-control-attlist"/>
+        <ref name="common-form-control-content"/>
+    </element>
+</define>
+<define name="common-numeric-control-attlist">
+    <ref name="form-control-attlist"/>
+    <ref name="common-disabled-attlist"/>
+    <ref name="common-maxlength-attlist"/>
+    <ref name="common-printable-attlist"/>
+    <ref name="common-readonly-attlist"/>
+    <ref name="common-tab-attlist"/>
+    <ref name="common-title-attlist"/>
+    <ref name="common-convert-empty-attlist"/>
+    <ref name="common-data-field-attlist"/>
+</define>
+<define name="form-number-attlist" combine="interleave">
+    <optional>
+        <attribute name="form:value">
+            <ref name="double"/>
+        </attribute>
+    </optional>
+</define>
+<define name="form-number-attlist" combine="interleave">
+    <optional>
+        <attribute name="form:current-value">
+            <ref name="double"/>
+        </attribute>
+    </optional>
+</define>
+<define name="form-number-attlist" combine="interleave">
+    <optional>
+        <attribute name="form:min-value">
+            <ref name="double"/>
+        </attribute>
+    </optional>
+</define>
+<define name="form-number-attlist" combine="interleave">
+    <optional>
+        <attribute name="form:max-value">
+            <ref name="double"/>
+        </attribute>
+    </optional>
+</define>
+<define name="column-controls" combine="choice">
+    <element name="form:date">
+        <ref name="form-date-attlist"/>
+        <ref name="common-numeric-control-attlist"/>
+        <ref name="common-form-control-content"/>
+    </element>
+</define>
+<define name="controls" combine="choice">
+    <element name="form:time">
+        <ref name="form-time-attlist"/>
+        <ref name="common-numeric-control-attlist"/>
+        <ref name="common-form-control-content"/>
+    </element>
+</define>
+<define name="form-date-attlist" combine="interleave">
+    <optional>
+        <attribute name="form:value">
+            <ref name="date"/>
+        </attribute>
+    </optional>
+</define>
+<define name="form-time-attlist" combine="interleave">
+    <optional>
+        <attribute name="form:value">
+            <ref name="time"/>
+        </attribute>
+    </optional>
+</define>
+<define name="form-date-attlist" combine="interleave">
+    <optional>
+        <attribute name="form:current-value">
+            <ref name="date"/>
+        </attribute>
+    </optional>
+</define>
+<define name="form-time-attlist" combine="interleave">
+    <optional>
+        <attribute name="form:current-value">
+            <ref name="time"/>
+        </attribute>
+    </optional>
+</define>
+<define name="form-date-attlist" combine="interleave">
+    <optional>
+        <attribute name="form:min-value">
+            <ref name="date"/>
+        </attribute>
+    </optional>
+</define>
+<define name="form-time-attlist" combine="interleave">
+    <optional>
+        <attribute name="form:min-value">
+            <ref name="time"/>
+        </attribute>
+    </optional>
+</define>
+<define name="form-date-attlist" combine="interleave">
+    <optional>
+        <attribute name="form:max-value">
+            <ref name="date"/>
+        </attribute>
+    </optional>
+</define>
+<define name="form-time-attlist" combine="interleave">
+    <optional>
+        <attribute name="form:max-value">
+            <ref name="time"/>
+        </attribute>
+    </optional>
+</define>
+<define name="controls" combine="choice">
+    <element name="form:fixed-text">
+        <ref name="form-fixed-text-attlist"/>
+        <ref name="common-form-control-content"/>
+    </element>
+</define>
+<define name="form-fixed-text-attlist" combine="interleave">
+    <ref name="form-control-attlist"/>
+    <ref name="for"/>
+    <ref name="common-disabled-attlist"/>
+    <ref name="label"/>
+    <ref name="common-printable-attlist"/>
+    <ref name="common-title-attlist"/>
+</define>
+<define name="form-fixed-text-attlist" combine="interleave">
+    <optional>
+        <attribute name="form:multi-line" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="column-controls" combine="choice">
+    <element name="form:combobox">
+        <ref name="form-combobox-attlist"/>
+        <ref name="common-form-control-content"/>
+        <zeroOrMore>
+            <ref name="form-item"/>
+        </zeroOrMore>
+    </element>
+</define>
+<define name="form-combobox-attlist" combine="interleave">
+    <ref name="form-control-attlist"/>
+    <ref name="common-current-value-attlist"/>
+    <ref name="common-disabled-attlist"/>
+    <ref name="dropdown"/>
+    <ref name="common-maxlength-attlist"/>
+    <ref name="common-printable-attlist"/>
+    <ref name="common-readonly-attlist"/>
+    <ref name="size"/>
+    <ref name="common-tab-attlist"/>
+    <ref name="common-title-attlist"/>
+    <ref name="common-value-attlist"/>
+    <ref name="common-convert-empty-attlist"/>
+    <ref name="common-data-field-attlist"/>
+    <ref name="list-source"/>
+    <ref name="list-source-type"/>
+</define>
+<define name="form-combobox-attlist" combine="interleave">
+    <optional>
+        <attribute name="form:auto-complete">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="form-item">
+    <element name="form:item">
+        <ref name="form-item-attlist"/>
+        <text/>
+    </element>
+</define>
+<define name="form-item-attlist" combine="interleave">
+    <ref name="label"/>
+</define>
+<define name="column-controls" combine="choice">
+    <element name="form:listbox">
+        <ref name="form-listbox-attlist"/>
+        <ref name="common-form-control-content"/>
+        <zeroOrMore>
+            <ref name="form-option"/>
+        </zeroOrMore>
+    </element>
+</define>
+<define name="form-listbox-attlist" combine="interleave">
+    <ref name="form-control-attlist"/>
+    <ref name="common-disabled-attlist"/>
+    <ref name="dropdown"/>
+    <ref name="common-printable-attlist"/>
+    <ref name="size"/>
+    <ref name="common-tab-attlist"/>
+    <ref name="common-title-attlist"/>
+    <ref name="bound-column"/>
+    <ref name="common-data-field-attlist"/>
+    <ref name="list-source"/>
+    <ref name="list-source-type"/>
+</define>
+<define name="form-listbox-attlist" combine="interleave">
+    <optional>
+        <attribute name="form:multiple" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="form-listbox-attlist" combine="interleave">
+    <optional>
+        <attribute name="form:xforms-list-source">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="form-option">
+    <element name="form:option">
+        <ref name="form-option-attlist"/>
+        <text/>
+    </element>
+</define>
+<define name="form-option-attlist" combine="interleave">
+    <ref name="current-selected"/>
+    <ref name="selected"/>
+    <ref name="label"/>
+    <ref name="common-value-attlist"/>
+</define>
+<define name="controls" combine="choice">
+    <element name="form:button">
+        <ref name="form-button-attlist"/>
+        <ref name="common-form-control-content"/>
+    </element>
+</define>
+<define name="form-button-attlist" combine="interleave">
+    <ref name="form-control-attlist"/>
+    <ref name="button-type"/>
+    <ref name="common-disabled-attlist"/>
+    <ref name="label"/>
+    <ref name="image-data"/>
+    <ref name="common-printable-attlist"/>
+    <ref name="common-tab-attlist"/>
+    <ref name="target-frame"/>
+    <ref name="target-location"/>
+    <ref name="common-title-attlist"/>
+    <ref name="common-value-attlist"/>
+    <ref name="common-form-relative-image-position-attlist"/>
+</define>
+<define name="form-button-attlist" combine="interleave">
+    <optional>
+        <attribute name="form:default-button" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="form-button-attlist" combine="interleave">
+    <optional>
+        <attribute name="form:toggle" a:default-value="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="form-button-attlist" combine="interleave">
+    <optional>
+        <attribute name="form:focus-on-click">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="form-button-attlist" combine="interleave">
+    <optional>
+        <attribute name="form:xforms-submission">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="controls" combine="choice">
+    <element name="form:image">
+        <ref name="form-image-attlist"/>
+        <ref name="common-form-control-content"/>
+    </element>
+</define>
+<define name="form-image-attlist" combine="interleave">
+    <ref name="form-control-attlist"/>
+    <ref name="button-type"/>
+    <ref name="common-disabled-attlist"/>
+    <ref name="image-data"/>
+    <ref name="common-printable-attlist"/>
+    <ref name="common-tab-attlist"/>
+    <ref name="target-frame"/>
+    <ref name="target-location"/>
+    <ref name="common-title-attlist"/>
+    <ref name="common-value-attlist"/>
+</define>
+<define name="column-controls" combine="choice">
+    <element name="form:checkbox">
+        <ref name="form-checkbox-attlist"/>
+        <ref name="common-form-control-content"/>
+    </element>
+</define>
+<define name="form-checkbox-attlist" combine="interleave">
+    <ref name="form-control-attlist"/>
+    <ref name="common-disabled-attlist"/>
+    <ref name="label"/>
+    <ref name="common-printable-attlist"/>
+    <ref name="common-tab-attlist"/>
+    <ref name="common-title-attlist"/>
+    <ref name="common-value-attlist"/>
+    <ref name="common-data-field-attlist"/>
+    <ref name="common-form-visual-effect-attlist"/>
+    <ref name="common-form-relative-image-position-attlist"/>
+</define>
+<define name="states">
+    <choice>
+        <value>unchecked</value>
+        <value>checked</value>
+        <value>unknown</value>
+    </choice>
+</define>
+<define name="form-checkbox-attlist" combine="interleave">
+    <optional>
+        <attribute name="form:current-state">
+            <ref name="states"/>
+        </attribute>
+    </optional>
+</define>
+<define name="form-checkbox-attlist" combine="interleave">
+    <optional>
+        <attribute name="form:is-tristate" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="form-checkbox-attlist" combine="interleave">
+    <optional>
+        <attribute name="form:state" a:defaultValue="unchecked">
+            <ref name="states"/>
+        </attribute>
+    </optional>
+</define>
+<define name="controls" combine="choice">
+    <element name="form:radio">
+        <ref name="form-radio-attlist"/>
+        <ref name="common-form-control-content"/>
+    </element>
+</define>
+<define name="form-radio-attlist" combine="interleave">
+    <ref name="form-control-attlist"/>
+    <ref name="current-selected"/>
+    <ref name="common-disabled-attlist"/>
+    <ref name="label"/>
+    <ref name="common-printable-attlist"/>
+    <ref name="selected"/>
+    <ref name="common-tab-attlist"/>
+    <ref name="common-title-attlist"/>
+    <ref name="common-value-attlist"/>
+    <ref name="common-data-field-attlist"/>
+    <ref name="common-form-visual-effect-attlist"/>
+    <ref name="common-form-relative-image-position-attlist"/>
+</define>
+<define name="controls" combine="choice">
+    <element name="form:frame">
+        <ref name="form-frame-attlist"/>
+        <ref name="common-form-control-content"/>
+    </element>
+</define>
+<define name="form-frame-attlist" combine="interleave">
+    <ref name="form-control-attlist"/>
+    <ref name="common-disabled-attlist"/>
+    <ref name="for"/>
+    <ref name="label"/>
+    <ref name="common-printable-attlist"/>
+    <ref name="common-title-attlist"/>
+</define>
+<define name="controls" combine="choice">
+    <element name="form:image-frame">
+        <ref name="form-image-frame-attlist"/>
+        <ref name="common-form-control-content"/>
+    </element>
+</define>
+<define name="form-image-frame-attlist" combine="interleave">
+    <ref name="form-control-attlist"/>
+    <ref name="common-disabled-attlist"/>
+    <ref name="image-data"/>
+    <ref name="common-printable-attlist"/>
+    <ref name="common-readonly-attlist"/>
+    <ref name="common-title-attlist"/>
+    <ref name="common-data-field-attlist"/>
+</define>
+<define name="controls" combine="choice">
+    <element name="form:hidden">
+        <ref name="form-hidden-attlist"/>
+        <ref name="common-form-control-content"/>
+    </element>
+</define>
+<define name="form-hidden-attlist" combine="interleave">
+    <ref name="form-control-attlist"/>
+    <ref name="common-value-attlist"/>
+</define>
+<define name="controls" combine="choice">
+    <element name="form:grid">
+        <ref name="form-grid-attlist"/>
+        <ref name="common-form-control-content"/>
+        <zeroOrMore>
+            <ref name="form-column"/>
+        </zeroOrMore>
+    </element>
+</define>
+<define name="form-grid-attlist" combine="interleave">
+    <ref name="form-control-attlist"/>
+    <ref name="common-disabled-attlist"/>
+    <ref name="common-printable-attlist"/>
+    <ref name="common-tab-attlist"/>
+    <ref name="common-title-attlist"/>
+</define>
+<define name="form-column">
+    <element name="form:column">
+        <ref name="form-column-attlist"/>
+        <oneOrMore>
+            <ref name="column-controls"/>
+        </oneOrMore>
+    </element>
+</define>
+<define name="form-column-attlist" combine="interleave">
+    <ref name="common-form-control-attlist"/>
+    <ref name="label"/>
+    <ref name="text-style-name"/>
+</define>
+<define name="text-style-name">
+    <optional>
+        <attribute name="form:text-style-name">
+            <ref name="styleNameRef"/>
+        </attribute>
+    </optional>
+</define>
+<define name="controls" combine="choice">
+    <element name="form:value-range">
+        <ref name="form-value-range-attlist"/>
+        <ref name="common-form-control-content"/>
+    </element>
+</define>
+<define name="form-value-range-attlist" combine="interleave">
+    <ref name="form-control-attlist"/>
+    <ref name="common-disabled-attlist"/>
+    <ref name="common-printable-attlist"/>
+    <ref name="common-tab-attlist"/>
+    <ref name="common-title-attlist"/>
+    <ref name="common-value-attlist"/>
+</define>
+<define name="form-value-range-attlist" combine="interleave">
+    <optional>
+        <attribute name="form:max-value">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="form-value-range-attlist" combine="interleave">
+    <optional>
+        <attribute name="form:min-value">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="form-value-range-attlist" combine="interleave">
+    <optional>
+        <attribute name="form:step-size" a:defaultName="1">
+            <ref name="positiveInteger"/>
+        </attribute>
+    </optional>
+</define>
+<define name="form-value-range-attlist" combine="interleave">
+    <optional>
+        <attribute name="form:page-step-size">
+            <ref name="positiveInteger"/>
+        </attribute>
+    </optional>
+</define>
+<define name="form-value-range-attlist" combine="interleave">
+    <optional>
+        <attribute name="form:delay-for-repeat">
+            <ref name="duration"/>
+        </attribute>
+    </optional>
+</define>
+<define name="form-value-range-attlist" combine="interleave">
+    <optional>
+        <attribute name="form:orientation">
+            <choice>
+                <value>horizontal</value>
+                <value>vertical</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="controls" combine="choice">
+    <element name="form:generic-control">
+        <ref name="form-generic-control-attlist"/>
+        <ref name="common-form-control-content"/>
+    </element>
+</define>
+<define name="form-generic-control-attlist" combine="interleave">
+    <ref name="form-control-attlist"/>
+</define>
+<define name="common-form-control-attlist" combine="interleave">
+    <optional>
+        <attribute name="form:name">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-form-control-attlist" combine="interleave">
+    <optional>
+        <attribute name="form:control-implementation">
+            <ref name="namespacedToken"/>
+        </attribute>
+    </optional>
+</define>
+<define name="xforms-bind-attlist">
+    <optional>
+        <attribute name="xforms:bind">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="types">
+    <choice>
+        <value>submit</value>
+        <value>reset</value>
+        <value>push</value>
+        <value>url</value>
+    </choice>
+</define>
+<define name="button-type">
+    <optional>
+        <attribute name="form:button-type" a:defaultValue="push">
+            <ref name="types"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-control-id-attlist">
+    <attribute name="form:id">
+        <ref name="ID"/>
+    </attribute>
+</define>
+<define name="current-selected">
+    <optional>
+        <attribute name="form:current-selected" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-value-attlist">
+    <optional>
+        <attribute name="form:value">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-current-value-attlist">
+    <optional>
+        <attribute name="form:current-value">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-disabled-attlist">
+    <optional>
+        <attribute name="form:disabled" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="dropdown">
+    <optional>
+        <attribute name="form:dropdown" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="for">
+    <optional>
+        <attribute name="form:for">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="image-data">
+    <optional>
+        <attribute name="form:image-data">
+            <ref name="anyURI"/>
+        </attribute>
+    </optional>
+</define>
+<define name="label">
+    <optional>
+        <attribute name="form:label">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-maxlength-attlist">
+    <optional>
+        <attribute name="form:max-length">
+            <ref name="nonNegativeInteger"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-printable-attlist">
+    <optional>
+        <attribute name="form:printable" a:defaultValue="true">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-readonly-attlist">
+    <optional>
+        <attribute name="form:readonly" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="selected">
+    <optional>
+        <attribute name="form:selected" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="size">
+    <optional>
+        <attribute name="form:size">
+            <ref name="nonNegativeInteger"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-tab-attlist" combine="interleave">
+    <optional>
+        <attribute name="form:tab-index" a:defaultValue="0">
+            <ref name="nonNegativeInteger"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-tab-attlist" combine="interleave">
+    <optional>
+        <attribute name="form:tab-stop" a:defaultValue="true">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="target-frame">
+    <optional>
+        <attribute name="office:target-frame" a:defaultValue="_blank">
+            <ref name="targetFrameName"/>
+        </attribute>
+    </optional>
+</define>
+<define name="target-location">
+    <optional>
+        <attribute name="xlink:href">
+            <ref name="anyURI"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-title-attlist">
+    <optional>
+        <attribute name="form:title"/>
+    </optional>
+</define>
+<define name="common-form-visual-effect-attlist" combine="interleave">
+    <optional>
+        <attribute name="form:visual-effect">
+            <choice>
+                <value>flat</value>
+                <value>3d</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="common-form-relative-image-position-attlist"
+        combine="interleave">
+    <choice>
+        <optional>
+            <attribute name="form:image-position" a:defaultValue="center">
+                <value>center</value>
+            </attribute>
+        </optional>
+        <group>
+            <attribute name="form:image-position">
+                <choice>
+                    <value>start</value>
+                    <value>end</value>
+                    <value>top</value>
+                    <value>bottom</value>
+                </choice>
+            </attribute>
+            <optional>
+                <attribute name="form:image-align" a:defaultValue="center">
+                    <choice>
+                        <value>start</value>
+                        <value>center</value>
+                        <value>end</value>
+                    </choice>
+                </attribute>
+            </optional>
+        </group>
+    </choice>
+</define>
+<define name="bound-column">
+    <optional>
+        <attribute name="form:bound-column">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-convert-empty-attlist">
+    <optional>
+        <attribute name="form:convert-empty-to-null" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-data-field-attlist">
+    <optional>
+        <attribute name="form:data-field">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="list-source">
+    <optional>
+        <attribute name="form:list-source">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="list-source-type">
+    <optional>
+        <attribute name="form:list-source-type">
+            <choice>
+                <value>table</value>
+                <value>query</value>
+                <value>sql</value>
+                <value>sql-pass-through</value>
+                <value>value-list</value>
+                <value>table-fields</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="form-properties">
+    <element name="form:properties">
+        <oneOrMore>
+            <ref name="form-property"/>
+        </oneOrMore>
+    </element>
+</define>
+<define name="form-property" combine="choice">
+    <element name="form:property">
+        <ref name="form-property-name"/>
+        <ref name="form-property-value-and-type-attlist"/>
+    </element>
+</define>
+<define name="form-property-name" combine="interleave">
+    <attribute name="form:property-name">
+        <ref name="string"/>
+    </attribute>
+</define>
+<define name="form-property-value-and-type-attlist" combine="interleave">
+    <choice>
+        <ref name="common-value-and-type-attlist"/>
+        <attribute name="office:value-type">
+            <value>void</value>
+        </attribute>
+    </choice>
+</define>
+<define name="form-property" combine="choice">
+    <element name="form:list-property">
+        <ref name="form-property-name"/>
+        <ref name="form-property-type-and-value-list"/>
+    </element>
+</define>
+<define name="form-property-type-and-value-list">
+    <choice>
+        <group>
+            <attribute name="office:value-type">
+                <value>float</value>
+            </attribute>
+            <zeroOrMore>
+                <element name="form:list-value">
+                    <attribute name="office:value">
+                        <ref name="double"/>
+                    </attribute>
+                </element>
+            </zeroOrMore>
+        </group>
+        <group>
+            <attribute name="office:value-type">
+                <value>percentage</value>
+            </attribute>
+            <zeroOrMore>
+                <element name="form:list-value">
+                    <attribute name="office:value">
+                        <ref name="double"/>
+                    </attribute>
+                </element>
+            </zeroOrMore>
+        </group>
+        <group>
+            <attribute name="office:value-type">
+                <value>currency</value>
+            </attribute>
+            <zeroOrMore>
+                <element name="form:list-value">
+                    <attribute name="office:value">
+                        <ref name="double"/>
+                    </attribute>
+                    <optional>
+                        <attribute name="office:currency">
+                            <ref name="string"/>
+                        </attribute>
+                    </optional>
+                </element>
+            </zeroOrMore>
+        </group>
+        <group>
+            <attribute name="office:value-type">
+                <value>date</value>
+            </attribute>
+            <zeroOrMore>
+                <element name="form:list-value">
+                    <attribute name="office:date-value">
+                        <ref name="dateOrDateTime"/>
+                    </attribute>
+                </element>
+            </zeroOrMore>
+        </group>
+        <group>
+            <attribute name="office:value-type">
+                <value>time</value>
+            </attribute>
+            <zeroOrMore>
+                <element name="form:list-value">
+                    <attribute name="office:time-value">
+                        <ref name="duration"/>
+                    </attribute>
+                </element>
+            </zeroOrMore>
+        </group>
+        <group>
+            <attribute name="office:value-type">
+                <value>boolean</value>
+            </attribute>
+            <zeroOrMore>
+                <element name="form:list-value">
+                    <attribute name="office:boolean-value">
+                        <ref name="boolean"/>
+                    </attribute>
+                </element>
+            </zeroOrMore>
+        </group>
+        <group>
+            <attribute name="office:value-type">
+                <value>string</value>
+            </attribute>
+            <zeroOrMore>
+                <element name="form:list-value">
+                    <attribute name="office:string-value">
+                        <ref name="string"/>
+                    </attribute>
+                </element>
+            </zeroOrMore>
+        </group>
+        <attribute name="office:value-type">
+            <value>void</value>
+        </attribute>
+    </choice>
+</define>
+<define name="office-annotation">
+    <element name="office:annotation">
+        <ref name="office-annotation-attlist"/>
+        <ref name="draw-caption-attlist"/>
+        <ref name="common-draw-position-attlist"/>
+        <ref name="common-draw-size-attlist"/>
+        <ref name="common-draw-shape-with-text-and-styles-attlist"/>
+        <optional>
+            <ref name="dc-creator"/>
+        </optional>
+        <optional>
+            <ref name="dc-date"/>
+        </optional>
+        <optional>
+            <ref name="meta-date-string"/>
+        </optional>
+        <zeroOrMore>
+            <choice>
+                <ref name="text-p"/>
+                <ref name="text-list"/>
+            </choice>
+        </zeroOrMore>
+    </element>
+</define>
+<define name="office-annotation-attlist" combine="interleave">
+    <optional>
+        <attribute name="office:display">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="meta-date-string">
+    <element name="meta:date-string">
+        <ref name="string"/>
+    </element>
+</define>
+<define name="common-num-format-prefix-suffix-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:num-prefix">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="style:num-suffix">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-num-format-attlist" combine="interleave">
+    <choice>
+        <attribute name="style:num-format">
+            <choice>
+                <value>1</value>
+                <value>i</value>
+                <value>I</value>
+                <ref name="string"/>
+                <empty/>
+            </choice>
+        </attribute>
+        <group>
+            <attribute name="style:num-format">
+                <choice>
+                    <value>a</value>
+                    <value>A</value>
+                </choice>
+            </attribute>
+            <ref name="style-num-letter-sync-attlist"/>
+        </group>
+        <empty/>
+    </choice>
+</define>
+<define name="style-num-letter-sync-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:num-letter-sync">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="office-change-info">
+    <element name="office:change-info">
+        <ref name="dc-creator"/>
+        <ref name="dc-date"/>
+        <zeroOrMore>
+            <ref name="text-p"/>
+        </zeroOrMore>
+    </element>
+</define>
+<define name="office-event-listeners">
+    <element name="office:event-listeners">
+        <zeroOrMore>
+            <choice>
+                <ref name="script-event-listener"/>
+                <ref name="presentation-event-listener"/>
+            </choice>
+        </zeroOrMore>
+    </element>
+</define>
+<define name="script-event-listener" combine="interleave">
+    <element name="script:event-listener">
+        <ref name="script-event-listener-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="script-event-listener-attlist" combine="interleave">
+    <attribute name="script:event-name">
+        <ref name="string"/>
+    </attribute>
+</define>
+<define name="script-event-listener-attlist" combine="interleave">
+    <attribute name="script:language">
+        <ref name="string"/>
+    </attribute>
+</define>
+<define name="script-event-listener-attlist" combine="interleave">
+    <choice>
+        <attribute name="script:macro-name">
+            <ref name="string"/>
+        </attribute>
+        <group>
+            <attribute name="xlink:href">
+                <ref name="anyURI"/>
+            </attribute>
+            <optional>
+                <attribute name="xlink:type" a:defaultValue="simple">
+                    <value>simple</value>
+                </attribute>
+            </optional>
+            <optional>
+                <attribute name="xlink:actuate" a:defaultValue="onRequest">
+                    <value>onRequest</value>
+                </attribute>
+            </optional>
+        </group>
+    </choice>
+</define>
+<define name="math-math">
+    <element name="math:math">
+        <ref name="mathMarkup"/>
+    </element>
+</define>
+
+<!-- To avoid inclusion of the complete MathML schema, anything -->
+<!-- is allowed within a math:math top-level element            -->
+<define name="mathMarkup">
+    <zeroOrMore>
+        <choice>
+            <attribute>
+                <anyName/>
+            </attribute>
+            <text/>
+            <element>
+                <anyName/>
+                <ref name="mathMarkup"/>
+            </element>
+        </choice>
+    </zeroOrMore>
+</define>
+<define name="text-dde-connection-decl">
+    <element name="text:dde-connection-decl">
+        <ref name="text-dde-connection-decl-attlist"/>
+        <ref name="common-dde-connection-decl-attlist"/>
+    </element>
+</define>
+<define name="text-dde-connection-decl-attlist" combine="interleave">
+    <attribute name="office:name">
+        <ref name="string"/>
+    </attribute>
+</define>
+<define name="common-dde-connection-decl-attlist" combine="interleave">
+    <attribute name="office:dde-application">
+        <ref name="string"/>
+    </attribute>
+</define>
+<define name="common-dde-connection-decl-attlist" combine="interleave">
+    <attribute name="office:dde-topic">
+        <ref name="string"/>
+    </attribute>
+</define>
+<define name="common-dde-connection-decl-attlist" combine="interleave">
+    <attribute name="office:dde-item">
+        <ref name="string"/>
+    </attribute>
+</define>
+<define name="common-dde-connection-decl-attlist" combine="interleave">
+    <optional>
+        <attribute name="office:automatic-update" a:defaultValue="true">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-dde-link">
+    <element name="table:dde-link">
+        <ref name="office-dde-source"/>
+        <ref name="table-table"/>
+    </element>
+</define>
+<define name="office-dde-source">
+    <element name="office:dde-source">
+        <ref name="office-dde-source-attlist"/>
+        <ref name="common-dde-connection-decl-attlist"/>
+    </element>
+</define>
+<define name="office-dde-source-attlist" combine="interleave">
+    <optional>
+        <attribute name="office:name">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="office-dde-source-attlist" combine="interleave">
+    <optional>
+        <attribute name="office:conversion-mode" 
+                    a:defaultValue="into-default-style-data-style">
+            <choice>
+                <value>into-default-style-data-style</value>
+                <value>into-english-number</value>
+                <value>keep-text</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="animation-element" combine="choice">
+    <element name="anim:animate">
+        <ref name="common-anim-target-attlist"/>
+        <ref name="common-anim-named-target-attlist"/>
+        <ref name="common-anim-values-attlist"/>
+        <ref name="common-anim-spline-mode-attlist"/>
+        <ref name="common-spline-anim-value-attlist"/>
+        <ref name="common-timing-attlist"/>
+        <ref name="common-anim-add-accum-attlist"/>
+    </element>
+</define>
+<define name="animation-element" combine="choice">
+    <element name="anim:set">
+        <ref name="common-anim-target-attlist"/>
+        <ref name="common-anim-named-target-attlist"/>
+        <ref name="common-anim-set-values-attlist"/>
+        <ref name="common-timing-attlist"/>
+        <ref name="common-anim-add-accum-attlist"/>
+    </element>
+</define>
+<define name="animation-element" combine="choice">
+    <element name="anim:animateMotion">
+        <ref name="anim-animate-motion-attlist"/>
+        <ref name="common-anim-target-attlist"/>
+        <ref name="common-anim-named-target-attlist"/>
+        <ref name="common-anim-add-accum-attlist"/>
+        <ref name="common-anim-values-attlist"/>
+        <ref name="common-timing-attlist"/>
+        <ref name="common-spline-anim-value-attlist"/>
+    </element>
+</define>
+<define name="anim-animate-motion-attlist" combine="interleave">
+    <optional>
+        <attribute name="svg:path">
+            <ref name="pathData"/>
+        </attribute>
+    </optional>
+</define>
+<define name="anim-animate-motion-attlist" combine="interleave">
+    <optional>
+        <attribute name="svg:origin">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="anim-animate-motion-attlist" combine="interleave">
+    <optional>
+        <attribute name="smil:calcMode" a:defaultValue="paced">   
+            <choice>
+                <value>discrete</value>
+                <value>linear</value>
+                <value>paced</value>
+                <value>spline</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="animation-element" combine="choice">
+    <element name="anim:animateColor">
+        <ref name="common-anim-target-attlist"/>
+        <ref name="common-anim-named-target-attlist"/>
+        <ref name="common-anim-add-accum-attlist"/>
+        <ref name="common-anim-values-attlist"/>
+        <ref name="common-anim-spline-mode-attlist"/>
+        <ref name="common-spline-anim-value-attlist"/>
+        <ref name="anim-animate-color-attlist"/>
+        <ref name="common-timing-attlist"/>
+    </element>
+</define>
+<define name="anim-animate-color-attlist" combine="interleave">
+    <optional>
+        <attribute name="anim:color-interpolation" a:defaultValue="rgb">
+            <choice>
+                <value>rgb</value>
+                <value>hsl</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="anim-animate-color-attlist" combine="interleave">
+    <optional>
+        <attribute name="anim:color-interpolation-direction"     
+                                   a:defaultValue="clockwise">
+            <choice>
+                <value>clockwise</value>
+                <value>counter-clockwise</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="animation-element" combine="choice">
+    <element name="anim:animateTransform">
+        <ref name="common-anim-target-attlist"/>
+        <ref name="common-anim-named-target-attlist"/>
+        <ref name="common-anim-add-accum-attlist"/>
+        <ref name="common-anim-values-attlist"/>
+        <ref name="anim-animate-transform-attlist"/>
+        <ref name="common-timing-attlist"/>
+    </element>
+</define>
+<define name="anim-animate-transform-attlist" combine="interleave">
+    <attribute name="svg:type">
+        <choice>
+            <value>translate</value>
+            <value>scale</value>
+            <value>rotate</value>
+            <value>skewX</value>
+            <value>skewY</value> 
+        </choice>
+    </attribute>
+</define>
+<define name="animation-element" combine="choice">
+    <element name="anim:transitionFilter">
+        <ref name="common-anim-target-attlist"/>
+        <ref name="common-anim-add-accum-attlist"/>
+        <ref name="common-anim-values-attlist"/>
+        <ref name="common-anim-spline-mode-attlist "/>
+        <ref name="anim-transition-filter-attlist"/>
+        <ref name="common-timing-attlist"/>
+    </element>
+</define>
+<define name="anim-transition-filter-attlist" combine="interleave">
+    <attribute name="smil:type">
+        <ref name="string"/>
+    </attribute>
+</define>
+<define name="anim-transition-filter-attlist" combine="interleave">
+    <optional>
+        <attribute name="smil:subtype">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="anim-transition-filter-attlist" combine="interleave">
+    <optional>
+        <attribute name="smil:direction" a:defaultValue="forward">
+            <choice>
+                <value>forward</value>
+                <value>reverse</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="anim-transition-filter-attlist" combine="interleave">
+    <optional>
+        <attribute name="smil:fadeColor">
+            <choice>
+                <value>forward</value>
+                <value>reverse</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="anim-transition-filter-attlist" combine="interleave">
+    <optional>
+        <attribute name="smil:mode" a:defaultValue="in">
+            <choice>
+                <value>in</value>
+                <value>out</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="common-anim-attlist" combine="interleave">
+    <optional>
+        <attribute name="anim:id">
+            <ref name="ID"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-anim-target-attlist" combine="interleave">
+    <optional>
+        <attribute name="smil:targetElement">
+            <ref name="IDREF"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-anim-named-target-attlist" combine="interleave">
+    <attribute name="smil:attributeName">
+        <ref name="string"/>
+    </attribute>
+</define>
+<define name="common-anim-target-attlist" combine="interleave">
+    <optional>
+        <attribute name="anim:sub-item">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-anim-values-attlist" combine="interleave">
+    <optional>
+        <attribute name="smil:values">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-anim-spline-mode-attlist" combine="interleave">
+    <optional>
+        <attribute name="smil:calcMode" a:defaultValue="discrete">   
+            <choice>
+                <value>discrete</value>
+                <value>linear</value>
+                <value>paced</value>
+                <value>spline</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="common-spline-anim-value-attlist" combine="interleave">
+    <optional>
+        <attribute name="smil:keyTimes">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-spline-anim-value-attlist" combine="interleave">
+    <optional>
+        <attribute name="smil:keySplines">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-anim-add-accum-attlist" combine="interleave">
+    <optional>
+        <attribute name="smil:accumulate">
+            <choice>
+                <value>none</value>
+                <value>sum</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="common-anim-add-accum-attlist" combine="interleave">
+    <optional>
+        <attribute name="smil:additive">
+            <choice>
+                <value>replace</value>
+                <value>sum</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="common-anim-values-attlist" combine="interleave">
+    <optional>
+        <attribute name="anim:formula">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-anim-set-values-attlist" combine="interleave">
+    <optional>
+        <attribute name="smil:to">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+
+<define name="common-anim-values-attlist" combine="interleave">
+    <ref name="common-anim-set-values-attlist"/>
+    <optional>
+        <attribute name="smil:from">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="smil:by">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-begin-end-timing-attlist" combine="interleave">
+    <optional>
+        <attribute name="smil:begin">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-begin-end-timing-attlist" combine="interleave">
+    <optional>
+        <attribute name="smil:end">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-dur-timing-attlist" combine="interleave">
+    <optional>
+        <attribute name="smil:dur">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-endsync-timing-attlist" combine="interleave">
+    <optional>
+        <attribute name="smil:endsync">
+            <choice>
+                <value>first</value>
+                <value>last</value>
+                <value>all</value>
+                <value>media</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="common-repeat-timing-attlist" combine="interleave">
+    <optional>
+        <attribute name="smil:repeatDur">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="smil:repeatCount">
+            <choice>
+                <ref name="nonNegativeInteger"/>
+                <value>indefinite</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="common-fill-timing-attlist" combine="interleave">
+    <optional>
+        <attribute name="smil:fill">
+            <choice>
+                <value>remove</value>
+                <value>freeze</value>
+                <value>hold</value>
+                <value>auto</value>
+                <value>default</value>
+                <value>transition</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="common-fill-default-attlist" combine="interleave">
+    <optional>
+        <attribute name="smil:fillDefault">
+            <choice>
+                <value>remove</value>
+                <value>freeze</value>
+                <value>hold</value>
+                <value>transition</value>
+                <value>auto</value>
+                <value>inherit</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="common-restart-timing-attlist" combine="interleave">
+    <optional>
+        <attribute name="smil:restart" a:defaultValue="default">
+            <choice>
+                <value>never</value>
+                <value>always</value>
+                <value>whenNotActive</value>
+                <value>default</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="common-restart-default-attlist" combine="interleave">
+    <optional>
+        <attribute name="smil:restartDefault" a:defaultValue="inherit">
+            <choice>
+                <value>never</value>
+                <value>always</value>
+                <value>whenNotActive</value>
+                <value>inherit</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="common-time-manip-attlist" combine="interleave">
+    <optional>    
+        <attribute name="smil:accelerate" a:defaultValue="0.0">
+            <ref name="double"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-time-manip-attlist" combine="interleave">
+    <optional>
+        <attribute name="smil:decelerate" a:defaultValue="0.0">
+            <ref name="double"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-time-manip-attlist" combine="interleave">
+    <optional>
+        <attribute name="smil:autoReverse" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="animation-element" combine="choice">
+    <element name="anim:par">
+        <ref name="common-anim-attlist"/>
+        <ref name="common-timing-attlist"/>
+        <ref name="common-endsync-timing-attlist"/>
+        <zeroOrMore>
+            <ref name="animation-element"/>
+        </zeroOrMore>
+    </element>
+</define>
+
+<define name="common-basic-timing-attlist" combine="interleave">
+   <ref name="common-begin-end-timing-attlist"/>
+   <ref name="common-dur-timing-attlist"/>
+   <ref name="common-repeat-timing-attlist"/>
+</define>
+
+<define name="common-timing-attlist" combine="interleave">
+   <ref name="common-basic-timing-attlist"/>
+   <ref name="common-restart-timing-attlist"/>
+   <ref name="common-restart-default-attlist"/>
+   <ref name="common-fill-timing-attlist"/>
+   <ref name="common-fill-default-attlist"/>
+   <ref name="common-time-manip-attlist"/>
+</define>
+<define name="animation-element" combine="choice">
+    <element name="anim:seq">
+        <ref name="common-anim-attlist"/>
+        <ref name="common-endsync-timing-attlist"/>
+        <ref name="common-timing-attlist"/>
+        <zeroOrMore>
+            <ref name="animation-element"/>
+        </zeroOrMore>
+    </element>
+</define>
+<define name="animation-element" combine="choice">
+    <element name="anim:iterate">
+        <ref name="common-anim-attlist"/>
+        <ref name="anim-iterate-attlist"/>
+        <ref name="common-timing-attlist"/>
+        <ref name="common-endsync-timing-attlist"/>
+        <zeroOrMore>
+            <ref name="animation-element"/>
+        </zeroOrMore>
+    </element>
+</define>
+<define name="anim-iterate-attlist" combine="interleave">
+    <ref name="common-anim-target-attlist"/>
+</define>
+<define name="anim-iterate-attlist" combine="interleave">
+    <optional>
+        <attribute name="anim:iterate-type">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="anim-iterate-attlist" combine="interleave">
+    <optional>
+        <attribute name="anim:iterate-interval">
+            <ref name="duration"/>
+        </attribute>
+    </optional>
+</define>
+<define name="animation-element" combine="choice">
+    <element name="anim:audio">
+        <ref name="common-anim-attlist"/>
+        <ref name="anim-audio-attlist"/>
+        <ref name="common-basic-timing-attlist"/>
+    </element>
+</define>
+<define name="anim-audio-attlist" combine="interleave">
+    <optional>
+        <attribute name="xlink:href">
+            <ref name="anyURI"/>
+        </attribute>
+    </optional>
+</define>
+<define name="anim-audio-attlist" combine="interleave">
+    <optional>
+        <attribute name="anim:audio-level">
+            <ref name="double"/>
+        </attribute>
+    </optional>
+</define>
+<define name="animation-element" combine="choice">
+    <element name="anim:command">
+        <ref name="common-anim-attlist"/>
+        <ref name="anim-command-attlist"/>
+        <ref name="common-begin-end-timing-attlist"/>
+        <ref name="common-anim-target-attlist"/>
+        <zeroOrMore>
+            <element name="anim:param">
+                <attribute name="anim:name"/>
+                <attribute name="anim:value"/>
+            </element>
+        </zeroOrMore>
+    </element>
+</define>
+<define name="anim-command-attlist" combine="interleave">
+    <attribute name="anim:command">
+        <ref name="string"/>
+    </attribute>
+</define>
+<define name="style-style">
+    <element name="style:style">
+        <ref name="style-style-attlist"/>
+        <ref name="style-style-content"/>
+        <zeroOrMore>
+            <ref name="style-map"/>
+        </zeroOrMore>
+    </element>
+</define>
+<define name="style-style-attlist" combine="interleave">
+    <attribute name="style:name">
+        <ref name="styleName"/>
+    </attribute>
+</define>
+<define name="style-style-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:display-name">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-style-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:parent-style-name">
+            <ref name="styleNameRef"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-style-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:next-style-name">
+            <ref name="styleNameRef"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-style-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:list-style-name">
+            <choice>
+                <ref name="styleName"/>
+                <empty/>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-style-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:master-page-name">
+            <ref name="styleNameRef"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-style-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:auto-update" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-style-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:data-style-name">
+            <ref name="styleNameRef"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-style-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:class">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-style-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:default-outline-level">
+            <ref name="positiveInteger"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-map">
+    <element name="style:map">
+        <ref name="style-map-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="style-map-attlist" combine="interleave">
+    <attribute name="style:condition">
+        <ref name="string"/>
+    </attribute>
+</define>
+<define name="style-map-attlist" combine="interleave">
+    <attribute name="style:apply-style-name">
+        <ref name="styleNameRef"/>
+    </attribute>
+</define>
+<define name="style-map-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:base-cell-address">
+            <ref name="cellAddress"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-default-style">
+    <element name="style:default-style">
+        <ref name="style-style-content"/>
+    </element>
+</define>
+<define name="style-page-layout">
+    <element name="style:page-layout">
+        <ref name="style-page-layout-attlist"/>
+        <optional>
+            <ref name="style-page-layout-properties"/>
+        </optional>
+        <optional>
+            <ref name="style-header-style"/>
+        </optional>
+        <optional>
+            <ref name="style-footer-style"/>
+        </optional>
+    </element>
+</define>
+<define name="style-page-layout-attlist" combine="interleave">
+    <attribute name="style:name">
+        <ref name="styleName"/>
+    </attribute>
+</define>
+<define name="style-page-layout-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:page-usage" a:defaultValue="all">
+            <choice>
+                <value>all</value>
+                <value>left</value>
+                <value>right</value>
+                <value>mirrored</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-header-style">
+    <element name="style:header-style">
+        <optional>
+            <ref name="style-header-footer-properties"/>
+        </optional>
+    </element>
+</define>
+<define name="style-footer-style">
+    <element name="style:footer-style">
+        <optional>
+            <ref name="style-header-footer-properties"/>
+        </optional>
+    </element>
+</define>
+<define name="style-master-page">
+    <element name="style:master-page">
+        <ref name="style-master-page-attlist"/>
+        <optional>
+            <ref name="style-header"/>
+            <optional>
+                <ref name="style-header-left"/>
+            </optional>
+        </optional>
+        <optional>
+            <ref name="style-footer"/>
+            <optional>
+                <ref name="style-footer-left"/>
+            </optional>
+        </optional>
+        <optional>
+            <ref name="office-forms"/>
+        </optional>
+        <zeroOrMore>
+            <ref name="style-style"/>
+        </zeroOrMore>
+        <zeroOrMore>
+            <ref name="shape"/>
+        </zeroOrMore>
+        <optional>
+            <ref name="presentation-notes"/>
+        </optional>
+    </element>
+</define>
+<define name="style-master-page-attlist" combine="interleave">
+    <attribute name="style:name">
+        <ref name="styleName"/>
+    </attribute>
+</define>
+<define name="style-master-page-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:display-name">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-master-page-attlist" combine="interleave">
+    <attribute name="style:page-layout-name">
+        <ref name="styleNameRef"/>
+    </attribute>
+</define>
+<define name="style-master-page-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:style-name">
+            <ref name="styleNameRef"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-master-page-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:next-style-name">
+            <ref name="styleNameRef"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-header">
+    <element name="style:header">
+        <ref name="common-style-header-footer-attlist"/>
+        <ref name="header-footer-content"/>
+    </element>
+</define>
+<define name="style-footer">
+    <element name="style:footer">
+        <ref name="common-style-header-footer-attlist"/>
+        <ref name="header-footer-content"/>
+    </element>
+</define>
+<define name="style-header-left">
+    <element name="style:header-left">
+        <ref name="common-style-header-footer-attlist"/>
+        <ref name="header-footer-content"/>
+    </element>
+</define>
+<define name="style-footer-left">
+    <element name="style:footer-left">
+        <ref name="common-style-header-footer-attlist"/>
+        <ref name="header-footer-content"/>
+    </element>
+</define>
+<define name="header-footer-content">
+    <choice>
+        <group>
+            <ref name="text-tracked-changes"/>
+            <ref name="text-decls"/>
+            <zeroOrMore>
+                <choice>
+                    <ref name="text-h"/>
+                    <ref name="text-p"/>
+                    <ref name="text-list"/>
+                    <ref name="table-table"/>
+                    <ref name="text-section"/>
+                    <ref name="text-table-of-content"/>
+                    <ref name="text-illustration-index"/>
+                    <ref name="text-table-index"/>
+                    <ref name="text-object-index"/>
+                    <ref name="text-user-index"/>
+                    <ref name="text-alphabetical-index"/>
+                    <ref name="text-bibliography"/>
+                    <ref name="text-index-title"/>
+                    <ref name="change-marks"/>
+                </choice>
+            </zeroOrMore>
+        </group>
+        <group>
+            <optional>
+                <ref name="style-region-left"/>
+            </optional>
+            <optional>
+                <ref name="style-region-center"/>
+            </optional>
+            <optional>
+                <ref name="style-region-right"/>
+            </optional>
+        </group>
+    </choice>
+</define>
+<define name="common-style-header-footer-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:display" a:defaultValue="true">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-region-left">
+    <element name="style:region-left">
+        <ref name="region-content"/>
+    </element>
+</define>
+<define name="style-region-center">
+    <element name="style:region-center">
+        <ref name="region-content"/>
+    </element>
+</define>
+<define name="style-region-right">
+    <element name="style:region-right">
+        <ref name="region-content"/>
+    </element>
+</define>
+
+<define name="region-content">
+    <zeroOrMore>
+        <ref name="text-p"/>
+    </zeroOrMore>
+</define>
+<define name="presentation-notes">
+    <element name="presentation:notes">
+        <ref name="common-presentation-header-footer-attlist"/>
+        <ref name="presentation-notes-attlist"/>
+        <ref name="office-forms"/>
+        <zeroOrMore>
+            <ref name="shape"/>
+        </zeroOrMore>
+    </element>
+</define>
+<define name="presentation-notes-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:page-layout-name">
+            <ref name="styleNameRef"/>
+        </attribute>
+    </optional>
+</define>
+<define name="presentation-notes-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:style-name">
+            <ref name="styleNameRef"/>
+        </attribute>
+    </optional>
+</define>
+<define name="table-table-template">
+    <element name="table:table-template">
+        <ref name="table-table-template-attlist"/>
+        <optional>
+            <ref name="table-first-row"/>
+        </optional>
+        <optional>
+            <ref name="table-last-row"/>
+        </optional>
+        <optional>
+            <ref name="table-first-column"/>
+        </optional>
+        <optional>
+            <ref name="table-last-column"/>
+        </optional>
+        <choice>
+            <ref name="table-body"/>
+            <group>
+                <ref name="table-even-rows"/>
+                <ref name="table-odd-rows"/>
+            </group>
+            <group>
+                <ref name="table-even-columns"/>
+                <ref name="table-odd-columns"/>
+            </group>
+        </choice>
+    </element>
+</define>
+<define name="table-table-template-attlist" combine="interleave">
+    <attribute name="text:name">
+        <ref name="string"/>
+    </attribute>
+</define>
+<define name="table-table-template-attlist" combine="interleave">
+    <attribute name="text:first-row-start-column">
+        <ref name="rowOrCol"/>
+    </attribute>
+</define>
+
+<define name="table-table-template-attlist" combine="interleave">
+    <attribute name="text:first-row-end-column">
+        <ref name="rowOrCol"/>
+    </attribute>
+</define>
+
+<define name="table-table-template-attlist" combine="interleave">
+    <attribute name="text:last-row-start-column">
+        <ref name="rowOrCol"/>
+    </attribute>
+</define>
+
+<define name="table-table-template-attlist" combine="interleave">
+    <attribute name="text:last-row-end-column">
+        <ref name="rowOrCol"/>
+    </attribute>
+</define>
+
+<define name="rowOrCol">
+    <choice>
+        <value>row</value>
+        <value>column</value>
+    </choice>
+</define>
+<define name="table-first-row">
+    <element name="table:first-row">
+        <ref name="common-table-template-attlist"/>
+        <empty/>
+    </element>
+</define>
+
+<define name="table-last-row">
+    <element name="table:last-row">
+        <ref name="common-table-template-attlist"/>
+        <empty/>
+    </element>
+</define>
+
+<define name="table-first-column">
+    <element name="table:first-column">
+        <ref name="common-table-template-attlist"/>
+        <empty/>
+    </element>
+</define>
+
+<define name="table-last-column">
+    <element name="table:last-column">
+        <ref name="common-table-template-attlist"/>
+        <empty/>
+    </element>
+</define>
+
+<define name="table-body">
+    <element name="table:body">
+        <ref name="common-table-template-attlist"/>
+        <empty/>
+    </element>
+</define>
+
+<define name="table-even-rows">
+    <element name="table:even-rows">
+        <ref name="common-table-template-attlist"/>
+        <empty/>
+    </element>
+</define>
+
+<define name="table-odd-rows">
+    <element name="table:odd-rows">
+        <ref name="common-table-template-attlist"/>
+        <empty/>
+    </element>
+</define>
+
+<define name="table-even-columns">
+    <element name="table:even-columns">
+        <ref name="common-table-template-attlist"/>
+        <empty/>
+    </element>
+</define>
+
+<define name="table-odd-columns">
+    <element name="table:odd-columns">
+        <ref name="common-table-template-attlist"/>
+        <empty/>
+    </element>
+</define>
+
+<define name="common-table-template-attlist" combine="interleave">
+    <attribute name="text:style-name">
+        <ref name="styleNameRef"/>
+    </attribute>
+    <attribute name="text:paragraph-style-name">
+        <optional>
+            <ref name="styleNameRef"/>
+        </optional>
+    </attribute>
+</define>
+<define name="style-font-face">
+    <element name="style:font-face">
+        <ref name="style-font-face-attlist"/>
+        <optional>
+            <ref name="svg-font-face-src"/>
+        </optional>
+        <optional>
+            <ref name="svg-definition-src"/>
+        </optional>
+    </element>
+</define>
+<define name="style-font-face-attlist" combine="interleave">
+    <optional>
+        <attribute name="svg:font-family">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="svg:font-style">
+            <ref name="fontStyle"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="svg:font-variant">
+            <ref name="fontVariant"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="svg:font-weight">
+            <ref name="fontWeight"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="svg:font-stretch">
+            <choice>
+                <value>normal</value>
+                <value>ultra-condensed</value>
+                <value>extra-condensed</value>
+                <value>condensed</value>
+                <value>semi-condensed</value>
+                <value>semi-expanded</value>
+                <value>expanded</value>
+                <value>extra-expanded</value>
+                <value>ultra-expanded</value>
+            </choice>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="svg:font-size">
+            <ref name="positiveLength"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="svg:unicode-range"/>
+    </optional>
+    <optional>
+        <attribute name="svg:units-per-em">
+            <ref name="integer"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="svg:panose-1"/>
+    </optional>
+    <optional>
+        <attribute name="svg:stemv">
+            <ref name="integer"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="svg:stemh">
+            <ref name="integer"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="svg:slope">
+            <ref name="integer"/>
+        </attribute>
+        </optional>
+    <optional>
+        <attribute name="svg:cap-height">
+            <ref name="integer"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="svg:x-height">
+            <ref name="integer"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="svg:accent-height">
+            <ref name="integer"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="svg:ascent">
+            <ref name="integer"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="svg:descent">
+            <ref name="integer"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="svg:widths"/>
+    </optional>
+    <optional>
+        <attribute name="svg:bbox"/>
+    </optional>
+    <optional>
+        <attribute name="svg:ideographic">
+            <ref name="integer"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="svg:alphabetic">
+            <ref name="integer"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="svg:mathematical">
+            <ref name="integer"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="svg:hanging">
+            <ref name="integer"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="svg:v-ideographic">
+            <ref name="integer"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="svg:v-alphabetic">
+            <ref name="integer"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="svg:v-mathematical">
+            <ref name="integer"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="svg:v-hanging">
+            <ref name="integer"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="svg:underline-position">
+            <ref name="integer"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="svg:underline-thickness">
+            <ref name="integer"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="svg:strikethrough-position">
+            <ref name="integer"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="svg:strikethrough-thickness">
+            <ref name="integer"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="svg:overline-position">
+            <ref name="integer"/>
+        </attribute>
+        </optional>
+    <optional>
+        <attribute name="svg:overline-thickness">
+            <ref name="integer"/>
+        </attribute>
+    </optional>
+</define>
+
+<define name="svg-font-face-src">
+    <element name="svg:font-face-src">
+        <oneOrMore>
+            <choice>
+                <ref name="svg-font-face-uri"/>
+                <ref name="svg-font-face-name"/>
+            </choice>
+        </oneOrMore>
+    </element>
+</define>
+
+<define name="svg-font-face-uri">
+    <element name="svg:font-face-uri">
+        <ref name="common-svg-font-face-xlink-attlist"/>
+        <zeroOrMore>
+            <ref name="svg-font-face-format"/>
+        </zeroOrMore>
+    </element>
+</define>
+
+<define name="svg-font-face-format">
+    <element name="svg:font-face-format">
+        <optional>
+            <attribute name="svg:string"/>
+        </optional>
+        <empty/>
+    </element>
+</define>
+<define name="svg-font-face-name">
+    <element name="svg:font-face-name">
+        <optional>
+            <attribute name="svg:name"/>
+        </optional>
+        <empty/>
+    </element>
+</define>
+
+<define name="svg-definition-src">
+    <element name="svg:definition-src">
+        <ref name="common-svg-font-face-xlink-attlist"/>
+    <empty/>
+    </element>
+</define>
+
+<define name="common-svg-font-face-xlink-attlist" combine="interleave">
+    <attribute name="xlink:href">
+        <ref name="anyURI"/>
+    </attribute>
+    <optional>
+        <attribute name="xlink:type" a:defaultValue="simple">
+            <value>simple</value>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="xlink:actuate" a:defaultValue="onRequest">
+            <value>onRequest</value>
+        </attribute>
+    </optional>
+</define>
+<define name="style-font-face-attlist" combine="interleave">
+    <attribute name="style:name">
+        <ref name="string"/>
+    </attribute>
+</define>
+<define name="style-font-face-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:font-adornments">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-font-face-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:font-family-generic">
+            <ref name="fontFamilyGeneric"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-font-face-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:font-pitch">
+            <ref name="fontPitch"/>
+        </attribute>
+    </optional>
+</define>
+
+<define name="style-font-face-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:font-charset">
+            <ref name="textEncoding"/>
+        </attribute>
+    </optional>
+</define>
+<define name="number-number-style">
+    <element name="number:number-style">
+        <ref name="common-data-style-attlist"/>
+        <optional>
+            <ref name="style-text-properties"/>
+        </optional>
+        <optional>
+            <ref name="number-text"/>
+        </optional>
+        <optional>
+            <ref name="any-number"/>
+            <optional>
+                <ref name="number-text"/>
+            </optional>
+        </optional>
+        <zeroOrMore>
+            <ref name="style-map"/>
+        </zeroOrMore>
+    </element>
+</define>
+
+<define name="any-number">
+    <choice>
+        <ref name="number-number"/>
+        <ref name="number-scientific-number"/>
+        <ref name="number-fraction"/>
+    </choice>
+</define>
+<define name="number-number">
+    <element name="number:number">
+        <ref name="number-number-attlist"/>
+        <ref name="common-decimal-places-attlist"/>
+        <ref name="common-number-attlist"/>
+        <zeroOrMore>
+            <ref name="number-embedded-text"/>
+        </zeroOrMore>
+    </element>
+</define>
+<define name="number-number-attlist" combine="interleave">
+    <optional>
+        <attribute name="number:decimal-replacement"/>
+    </optional>
+</define>
+<define name="number-number-attlist" combine="interleave">
+    <optional>
+        <attribute name="number:display-factor" a:defaultValue="1">
+            <ref name="double"/>
+        </attribute>
+    </optional>
+</define>
+<define name="number-embedded-text">
+    <element name="number:embedded-text">
+        <ref name="number-embedded-text-attlist"/>
+        <text/>
+    </element>
+</define>
+<define name="number-embedded-text-attlist" combine="interleave">
+    <attribute name="number:position">
+        <ref name="integer"/>
+    </attribute>
+</define>
+<define name="number-scientific-number">
+    <element name="number:scientific-number">
+        <ref name="number-scientific-number-attlist"/>
+        <ref name="common-decimal-places-attlist"/>
+        <ref name="common-number-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="number-scientific-number-attlist" combine="interleave">
+    <optional>
+        <attribute name="number:min-exponent-digits">
+            <ref name="integer"/>
+        </attribute>
+    </optional>
+</define>
+<define name="number-fraction">
+    <element name="number:fraction">
+        <ref name="number-fraction-attlist"/>
+        <ref name="common-number-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="number-fraction-attlist" combine="interleave">
+    <optional>
+        <attribute name="number:min-numerator-digits">
+            <ref name="integer"/>
+        </attribute>
+    </optional>
+</define>
+<define name="number-fraction-attlist" combine="interleave">
+    <optional>
+        <attribute name="number:min-denominator-digits">
+            <ref name="integer"/>
+        </attribute>
+    </optional>
+</define>
+<define name="number-fraction-attlist" combine="interleave">
+    <optional>
+        <attribute name="number:denominator-value">
+            <ref name="integer"/>
+        </attribute>
+    </optional>
+</define>
+<define name="number-currency-style">
+    <element name="number:currency-style">
+        <ref name="common-data-style-attlist"/>
+        <ref name="common-auto-reorder-attlist"/>
+        <optional>
+            <ref name="style-text-properties"/>
+        </optional>
+        <optional>
+            <ref name="number-text"/>
+        </optional>
+        <optional>
+            <choice>
+                <group>
+                    <ref name="number-and-text"/>
+                    <optional>
+                        <ref name="currency-symbol-and-text"/>
+                    </optional>
+                </group>
+                <group>
+                    <ref name="currency-symbol-and-text"/>
+                    <optional>
+                        <ref name="number-and-text"/>
+                    </optional>
+                </group>
+            </choice>
+        </optional>
+        <zeroOrMore>
+            <ref name="style-map"/>
+        </zeroOrMore>
+    </element>
+</define>
+
+<define name="currency-symbol-and-text">
+    <ref name="number-currency-symbol"/>
+    <optional>
+        <ref name="number-text"/>
+    </optional>
+</define>
+<define name="number-and-text">
+    <ref name="number-number"/>
+    <optional>
+        <ref name="number-text"/>
+    </optional>
+</define>
+<define name="number-currency-symbol">
+    <element name="number:currency-symbol">
+        <ref name="number-currency-symbol-attlist"/>
+        <text/>
+    </element>
+</define>
+<define name="number-currency-symbol-attlist" combine="interleave">
+    <optional>
+        <attribute name="number:language">
+            <ref name="languageCode"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="number:country">
+            <ref name="countryCode"/>
+        </attribute>
+    </optional>
+</define>
+<define name="number-percentage-style">
+    <element name="number:percentage-style">
+        <ref name="common-data-style-attlist"/>
+        <optional>
+            <ref name="style-text-properties"/>
+        </optional>
+        <optional>
+            <ref name="number-text"/>
+        </optional>
+        <optional>
+            <ref name="number-and-text"/>
+        </optional>
+        <zeroOrMore>
+            <ref name="style-map"/>
+        </zeroOrMore>
+    </element>
+</define>
+<define name="number-date-style">
+    <element name="number:date-style">
+        <ref name="common-data-style-attlist"/>
+        <ref name="common-auto-reorder-attlist"/>
+        <ref name="common-format-source-attlist"/>
+        <optional>
+            <ref name="style-text-properties"/>
+        </optional>
+        <!-- This DTD does not reflect the fact that some elements must not -->
+        <!-- occur more than once. -->
+        <optional>
+            <ref name="number-text"/>
+        </optional>
+        <oneOrMore>
+            <ref name="any-date"/>
+            <optional>
+                <ref name="number-text"/>
+            </optional>
+        </oneOrMore>
+        <zeroOrMore>
+            <ref name="style-map"/>
+        </zeroOrMore>
+    </element>
+</define>
+
+<define name="any-date">
+    <choice>
+        <ref name="number-day"/>
+        <ref name="number-month"/>
+        <ref name="number-year"/>
+        <ref name="number-era"/>
+        <ref name="number-day-of-week"/>
+        <ref name="number-week-of-year"/>
+        <ref name="number-quarter"/>
+        <ref name="number-hours"/>
+        <ref name="number-am-pm"/>
+        <ref name="number-minutes"/>
+        <ref name="number-seconds"/>
+    </choice>
+</define>
+<define name="number-day">
+    <element name="number:day">
+        <ref name="number-day-attlist"/>
+        <ref name="common-calendar-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="number-day-attlist" combine="interleave">
+    <optional>
+        <attribute name="number:style" a:defaultValue="short">
+            <choice>
+                <value>short</value>
+                <value>long</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="number-month">
+    <element name="number:month">
+        <ref name="number-month-attlist"/>
+        <ref name="common-calendar-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="number-month-attlist" combine="interleave">
+    <optional>
+        <attribute name="number:textual" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="number-month-attlist" combine="interleave">
+    <optional>
+        <attribute name="number:possessive-form" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="number-month-attlist" combine="interleave">
+    <optional>
+        <attribute name="number:style" a:defaultValue="short">
+            <choice>
+                <value>short</value>
+                <value>long</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="number-year">
+    <element name="number:year">
+        <ref name="number-year-attlist"/>
+        <ref name="common-calendar-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="number-year-attlist" combine="interleave">
+    <optional>
+        <attribute name="number:style" a:defaultValue="short">
+            <choice>
+                <value>short</value>
+                <value>long</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="number-era">
+    <element name="number:era">
+        <ref name="number-era-attlist"/>
+        <ref name="common-calendar-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="number-era-attlist" combine="interleave">
+    <optional>
+        <attribute name="number:style" a:defaultValue="short">
+            <choice>
+                <value>short</value>
+                <value>long</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="number-day-of-week">
+    <element name="number:day-of-week">
+        <ref name="number-day-of-week-attlist"/>
+        <ref name="common-calendar-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="number-day-of-week-attlist" combine="interleave">
+    <optional>
+        <attribute name="number:style" a:defaultValue="short">
+            <choice>
+                <value>short</value>
+                <value>long</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="number-week-of-year">
+    <element name="number:week-of-year">
+        <ref name="common-calendar-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="number-quarter">
+    <element name="number:quarter">
+        <ref name="number-quarter-attlist"/>
+        <ref name="common-calendar-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="number-quarter-attlist" combine="interleave">
+    <optional>
+        <attribute name="number:style" a:defaultValue="short">
+            <choice>
+                <value>short</value>
+                <value>long</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="number-time-style">
+    <element name="number:time-style">
+        <ref name="number-time-style-attlist"/>
+        <ref name="common-data-style-attlist"/>
+        <ref name="common-format-source-attlist"/>
+        <optional>
+            <ref name="style-text-properties"/>
+        </optional>
+        <!-- This DTD does not reflect the fact that some elements must not -->
+        <!-- occur more than once. -->
+        <optional>
+            <ref name="number-text"/>
+        </optional>
+        <oneOrMore>
+            <ref name="any-time"/>
+            <optional>
+                <ref name="number-text"/>
+            </optional>
+        </oneOrMore>
+        <zeroOrMore>
+            <ref name="style-map"/>
+        </zeroOrMore>
+    </element>
+</define>
+
+<define name="any-time">
+    <choice>
+        <ref name="number-hours"/>
+        <ref name="number-am-pm"/>
+        <ref name="number-minutes"/>
+        <ref name="number-seconds"/>
+    </choice>
+</define>
+<define name="number-time-style-attlist" combine="interleave">
+    <optional>
+        <attribute name="number:truncate-on-overflow" a:defaultValue="true">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="number-hours">
+    <element name="number:hours">
+        <ref name="number-hours-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="number-hours-attlist" combine="interleave">
+    <optional>
+        <attribute name="number:style" a:defaultValue="short">
+            <choice>
+                <value>short</value>
+                <value>long</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="number-minutes">
+    <element name="number:minutes">
+        <ref name="number-minutes-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="number-minutes-attlist" combine="interleave">
+    <optional>
+        <attribute name="number:style" a:defaultValue="short">
+            <choice>
+                <value>short</value>
+                <value>long</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="number-seconds">
+    <element name="number:seconds">
+        <ref name="number-seconds-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="number-seconds-attlist" combine="interleave">
+    <optional>
+        <attribute name="number:style" a:defaultValue="short">
+            <choice>
+                <value>short</value>
+                <value>long</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="number-seconds-attlist" combine="interleave">
+    <optional>
+        <attribute name="number:decimal-places" a:defaultValue="0">
+            <ref name="integer"/>
+        </attribute>
+    </optional>
+</define>
+<define name="number-am-pm">
+    <element name="number:am-pm">
+        <empty/>
+    </element>
+</define>
+<define name="number-boolean-style">
+    <element name="number:boolean-style">
+        <ref name="common-data-style-attlist"/>
+        <optional>
+            <ref name="style-text-properties"/>
+        </optional>
+        <optional>
+            <ref name="number-text"/>
+        </optional>
+        <optional>
+            <ref name="number-boolean"/>
+            <optional>
+                <ref name="number-text"/>
+            </optional>
+        </optional>
+        <zeroOrMore>
+            <ref name="style-map"/>
+        </zeroOrMore>
+    </element>
+</define>
+<define name="number-boolean">
+    <element name="number:boolean">
+        <empty/>
+    </element>
+</define>
+<define name="number-text-style">
+    <element name="number:text-style">
+        <ref name="common-data-style-attlist"/>
+        <optional>
+            <ref name="style-text-properties"/>
+        </optional>
+        <optional>
+            <ref name="number-text"/>
+        </optional>
+        <zeroOrMore>
+            <ref name="number-text-content"/>
+            <optional>
+                <ref name="number-text"/>
+            </optional>
+        </zeroOrMore>
+        <zeroOrMore>
+            <ref name="style-map"/>
+        </zeroOrMore>
+    </element>
+</define>
+<define name="number-text">
+    <element name="number:text">
+        <text/>
+    </element>
+</define>
+<define name="number-text-content">
+    <element name="number:text-content">
+        <empty/>
+    </element>
+</define>
+<define name="common-data-style-attlist" combine="interleave">
+    <attribute name="style:name">
+        <ref name="styleName"/>
+    </attribute>
+</define>
+<define name="style-data-style-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:display-name">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-data-style-attlist" combine="interleave">
+    <optional>
+        <attribute name="number:language">
+            <ref name="languageCode"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-data-style-attlist" combine="interleave">
+    <optional>
+        <attribute name="number:country">
+            <ref name="countryCode"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-data-style-attlist" combine="interleave">
+    <optional>
+        <attribute name="number:title"/>
+    </optional>
+</define>
+<define name="common-data-style-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:volatile">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-auto-reorder-attlist" combine="interleave">
+    <optional>
+        <attribute name="number:automatic-order" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-format-source-attlist">
+    <optional>
+        <attribute name="number:format-source" a:defaultValue="fixed">
+            <choice>
+                <value>fixed</value>
+                <value>language</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="common-data-style-attlist" combine="interleave">
+    <optional>
+        <attribute name="number:transliteration-format" a:defaultValue="1">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-data-style-attlist" combine="interleave">
+    <optional>
+        <attribute name="number:transliteration-language">
+            <ref name="countryCode"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-data-style-attlist" combine="interleave">
+    <optional>
+        <attribute name="number:transliteration-country">
+            <ref name="countryCode"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-data-style-attlist" combine="interleave">
+    <optional>
+        <attribute name="number:transliteration-style" a:defaultValue="short">
+            <choice>
+                <value>short</value>
+                <value>medium</value>
+                <value>long</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="common-decimal-places-attlist">
+    <optional>
+        <attribute name="number:decimal-places">
+            <ref name="integer"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-number-attlist" combine="interleave">
+    <optional>
+        <attribute name="number:min-integer-digits">
+            <ref name="integer"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-number-attlist" combine="interleave">
+    <optional>
+        <attribute name="number:grouping" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-calendar-attlist" combine="interleave">
+    <optional>
+        <attribute name="number:calendar">
+            <choice>
+                <value>gregorian</value>
+                <value>gengou</value>
+                <value>ROC</value>
+                <value>hanja_yoil</value>
+                <value>hanja</value>
+                <value>hijri</value>
+                <value>jewish</value>
+                <value>buddhist</value>
+                <ref name="string"/>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-style-content" combine="choice">
+    <group>
+        <attribute name="style:family">
+            <value>text</value>
+        </attribute>
+        <optional>
+            <ref name="style-text-properties"/>
+        </optional>
+    </group>
+</define>
+<define name="style-style-content" combine="choice">
+    <group>
+        <attribute name="style:family">
+            <value>paragraph</value>
+        </attribute>
+        <optional>
+            <ref name="style-paragraph-properties"/>
+        </optional>
+        <optional>
+            <ref name="style-text-properties"/>
+        </optional>
+    </group>
+</define>
+<define name="style-style-content" combine="choice">
+    <group>
+        <attribute name="style:family">
+            <value>section</value>
+        </attribute>
+        <optional>
+            <ref name="style-section-properties"/>
+        </optional>
+    </group>
+</define>
+<define name="style-style-content" combine="choice">
+    <group>
+        <attribute name="style:family">
+            <value>ruby</value>
+        </attribute>
+        <optional>
+            <ref name="style-ruby-properties"/>
+        </optional>
+    </group>
+</define>
+<define name="text-linenumbering-configuration">
+    <element name="text:linenumbering-configuration">
+        <ref name="text-linenumbering-configuration-attlist"/>
+        <optional>
+            <ref name="text-linenumbering-separator"/>
+        </optional>
+    </element>
+</define>
+<define name="text-linenumbering-configuration-attlist" combine="interleave">
+    <optional>
+        <attribute name="text:number-lines" a:defaultValue="true">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-linenumbering-configuration-attlist" combine="interleave">
+    <optional>
+        <ref name="common-num-format-attlist"/>
+    </optional>
+</define>
+<define name="text-linenumbering-configuration-attlist" combine="interleave">
+    <optional>
+        <attribute name="text:style-name">
+            <ref name="styleNameRef"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-linenumbering-configuration-attlist" combine="interleave">
+    <optional>
+        <attribute name="text:increment">
+            <ref name="nonNegativeInteger"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-linenumbering-configuration-attlist" combine="interleave">
+    <optional>
+        <attribute name="text:number-position" a:defaultValue="left">
+            <choice>
+                <value>left</value>
+                <value>right</value>
+                <value>inner</value>
+                <value>outer</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="text-linenumbering-configuration-attlist" combine="interleave">
+    <optional>
+        <attribute name="text:offset">
+            <ref name="nonNegativeLength"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-linenumbering-configuration-attlist" combine="interleave">
+    <optional>
+        <attribute name="text:count-empty-lines" a:defaultValue="true">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-linenumbering-configuration-attlist" combine="interleave">
+    <optional>
+        <attribute name="text:count-in-text-boxes" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-linenumbering-configuration-attlist" combine="interleave">
+    <optional>
+        <attribute name="text:restart-on-page" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-linenumbering-separator">
+    <element name="text:linenumbering-separator">
+        <optional>
+            <attribute name="text:increment">
+                <ref name="nonNegativeInteger"/>
+            </attribute>
+        </optional>
+        <text/>
+    </element>
+</define>
+<define name="text-notes-configuration">
+    <element name="text:notes-configuration">
+        <ref name="text-notes-configuration-content"/>
+    </element>
+</define>
+<define name="text-notes-configuration-content" combine="interleave">
+    <ref name="text-note-class"/>
+</define>
+<define name="text-notes-configuration-content" combine="interleave">
+    <optional>
+        <attribute name="text:citation-style-name">
+            <ref name="styleNameRef"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-notes-configuration-content" combine="interleave">
+    <optional>
+        <attribute name="text:citation-body-style-name">
+            <ref name="styleNameRef"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-notes-configuration-content" combine="interleave">
+    <optional>
+        <attribute name="text:default-style-name">
+            <ref name="styleNameRef"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-notes-configuration-content" combine="interleave">
+    <optional>
+        <attribute name="text:master-page-name">
+            <ref name="styleNameRef"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-notes-configuration-content" combine="interleave">
+    <optional>
+        <attribute name="text:start-value">
+            <ref name="nonNegativeInteger"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-notes-configuration-content" combine="interleave">
+    <ref name="common-num-format-prefix-suffix-attlist"/>
+    <optional>
+        <ref name="common-num-format-attlist"/>
+    </optional>
+</define>
+<define name="text-notes-configuration-content" combine="interleave">
+    <optional>
+        <attribute name="text:start-numbering-at">
+            <choice>
+                <value>document</value>
+                <value>chapter</value>
+                <value>page</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="text-notes-configuration-content" combine="interleave">
+    <optional>
+        <attribute name="text:footnotes-position">
+            <choice>
+                <value>text</value>
+                <value>page</value>
+                <value>section</value>
+                <value>document</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="text-notes-configuration-content" combine="interleave">
+    <optional>
+        <element name="text:note-continuation-notice-forward">
+            <text/>
+        </element>
+    </optional>
+</define>
+<define name="text-notes-configuration-content" combine="interleave">
+    <optional>
+        <element name="text:note-continuation-notice-backward">
+            <text/>
+        </element>
+    </optional>
+</define>
+<define name="text-bibliography-configuration">
+    <element name="text:bibliography-configuration">
+        <ref name="text-bibliography-configuration-attlist"/>
+        <zeroOrMore>
+            <ref name="text-sort-key"/>
+        </zeroOrMore>
+    </element>
+</define>
+<define name="text-bibliography-configuration-attlist" combine="interleave">
+    <optional>
+        <attribute name="text:prefix">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="text:suffix">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-bibliography-configuration-attlist" combine="interleave">
+    <optional>
+        <attribute name="text:numbered-entries" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-bibliography-configuration-attlist" combine="interleave">
+    <optional>
+        <attribute name="text:sort-by-position" a:defaultValue="true">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="fo:language">
+            <ref name="languageCode"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="fo:country">
+            <ref name="countryCode"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="text:sort-algorithm">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-sort-key">
+    <element name="text:sort-key">
+        <ref name="text-sort-key-attlist"/>
+        <empty/>
+    </element>
+</define>
+
+<define name="text-sort-key-attlist" combine="interleave">
+    <attribute name="text:key">
+        <choice>
+            <value>address</value>
+            <value>annote</value>
+            <value>author</value>
+            <value>bibliography-type</value>
+            <value>booktitle</value>
+            <value>chapter</value>
+            <value>custom1</value>
+            <value>custom2</value>
+            <value>custom3</value>
+            <value>custom4</value>
+            <value>custom5</value>
+            <value>edition</value>
+            <value>editor</value>
+            <value>howpublished</value>
+            <value>identifier</value>
+            <value>institution</value>
+            <value>isbn</value>
+            <value>issn</value>
+            <value>journal</value>
+            <value>month</value>
+            <value>note</value>
+            <value>number</value>
+            <value>organizations</value>
+            <value>pages</value>
+            <value>publisher</value>
+            <value>report-type</value>
+            <value>school</value>
+            <value>series</value>
+            <value>title</value>
+            <value>url</value>
+            <value>volume</value>
+            <value>year</value>
+        </choice>
+    </attribute>
+    <optional>
+        <attribute name="text:sort-ascending" a:defaultValue="true">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-list-style">
+    <element name="text:list-style">
+        <ref name="text-list-style-attr"/>
+        <zeroOrMore>
+            <ref name="text-list-style-content"/>
+        </zeroOrMore>
+    </element>
+</define>
+<define name="text-list-style-attr" combine="interleave">
+    <attribute name="style:name">
+        <ref name="styleName"/>
+    </attribute>
+</define>
+<define name="text-list-style-attr" combine="interleave">
+    <optional>
+        <attribute name="style:display-name">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-list-style-attr" combine="interleave">
+    <optional>
+        <attribute name="text:consecutive-numbering" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-list-level-style-attr">
+    <attribute name="text:level">
+        <ref name="positiveInteger"/>
+    </attribute>
+</define>
+<define name="text-list-style-content" combine="choice">
+    <element name="text:list-level-style-number">
+        <ref name="text-list-level-style-attr"/>
+        <ref name="text-list-level-style-number-attr"/>
+        <optional>
+            <ref name="style-list-level-properties"/>
+        </optional>
+        <optional>
+            <ref name="style-text-properties"/>
+        </optional>
+    </element>
+</define>
+<define name="text-list-level-style-number-attr" combine="interleave">
+    <optional>
+        <attribute name="text:style-name">
+            <ref name="styleNameRef"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-list-level-style-number-attr" combine="interleave">
+    <ref name="common-num-format-attlist"/>
+    <ref name="common-num-format-prefix-suffix-attlist"/>
+</define>
+<define name="text-list-level-style-number-attr" combine="interleave">
+    <optional>
+        <attribute name="text:display-levels" a:defaultValue="1">
+            <ref name="positiveInteger"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-list-level-style-number-attr" combine="interleave">
+    <optional>
+        <attribute name="text:start-value" a:defaultValue="1">
+            <ref name="positiveInteger"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-list-style-content" combine="choice">
+    <element name="text:list-level-style-bullet">
+        <ref name="text-list-level-style-attr"/>
+        <ref name="text-list-level-style-bullet-attr"/>
+        <optional>
+            <ref name="style-list-level-properties"/>
+        </optional>
+        <optional>
+            <ref name="style-text-properties"/>
+        </optional>
+    </element>
+</define>
+<define name="text-list-level-style-bullet-attr" combine="interleave">
+    <optional>
+        <attribute name="text:style-name">
+            <ref name="styleNameRef"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-list-level-style-bullet-attr" combine="interleave">
+    <attribute name="text:bullet-char">
+        <ref name="character"/>
+    </attribute>
+</define>
+<define name="text-list-level-style-bullet-attr" combine="interleave">
+    <ref name="common-num-format-prefix-suffix-attlist"/>
+</define>
+<define name="text-list-level-style-bullet-attr" combine="interleave">
+    <optional>
+        <attribute name="text:bullet-relative-size">
+            <ref name="percent"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-list-style-content" combine="choice">
+    <element name="text:list-level-style-image">
+        <ref name="text-list-level-style-attr"/>
+        <ref name="text-list-level-style-image-attr"/>
+        <optional>
+            <ref name="style-list-level-properties"/>
+        </optional>
+    </element>
+</define>
+<define name="text-list-level-style-image-attr" combine="interleave">
+    <choice>
+        <ref name="common-draw-data-attlist"/>
+        <ref name="office-binary-data"/>
+    </choice>
+</define>
+<define name="text-outline-style">
+    <element name="text:outline-style">
+        <oneOrMore>
+            <ref name="text-outline-level-style"/>
+        </oneOrMore>
+    </element>
+</define>
+<define name="text-outline-level-style">
+    <element name="text:outline-level-style">
+        <ref name="text-outline-level-style-attlist"/>
+        <optional>
+            <ref name="style-list-level-properties"/>
+        </optional>
+        <optional>
+            <ref name="style-text-properties"/>
+        </optional>
+    </element>
+</define>
+<define name="text-outline-level-style-attlist" combine="interleave">
+    <attribute name="text:level">
+        <ref name="positiveInteger"/>
+    </attribute>
+</define>
+<define name="text-outline-level-style-attlist" combine="interleave">
+    <optional>
+        <attribute name="text:style-name">
+            <ref name="styleNameRef"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-outline-level-style-attlist" combine="interleave">
+    <ref name="common-num-format-attlist"/>
+    <ref name="common-num-format-prefix-suffix-attlist"/>
+</define>
+<define name="text-outline-level-style-attlist" combine="interleave">
+    <optional>
+        <attribute name="text:display-levels" a:defaultValue="1">
+            <ref name="positiveInteger"/>
+        </attribute>
+    </optional>
+</define>
+<define name="text-outline-level-style-attlist" combine="interleave">
+    <optional>
+        <attribute name="text:start-value" a:defaultValue="1">
+            <ref name="positiveInteger"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-style-content" combine="choice">
+    <group>
+        <attribute name="style:family">
+            <value>table</value>
+        </attribute>
+        <optional>
+            <ref name="style-table-properties"/>
+        </optional>
+    </group>
+</define>
+<define name="style-style-content" combine="choice">
+    <group>
+        <attribute name="style:family">
+            <value>table-column</value>
+        </attribute>
+        <optional>
+            <ref name="style-table-column-properties"/>
+        </optional>
+    </group>
+</define>
+<define name="style-style-content" combine="choice">
+    <group>
+        <attribute name="style:family">
+            <value>table-row</value>
+        </attribute>
+        <optional>
+            <ref name="style-table-row-properties"/>
+        </optional>
+    </group>
+</define>
+<define name="style-style-content" combine="choice">
+    <group>
+        <attribute name="style:family">
+            <value>table-cell</value>
+        </attribute>
+        <optional>
+            <ref name="style-table-cell-properties"/>
+        </optional>
+        <optional>
+            <ref name="style-paragraph-properties"/>
+        </optional>
+        <optional>
+            <ref name="style-text-properties"/>
+        </optional>
+    </group>
+</define>
+<define name="style-style-content" combine="choice">
+    <group>
+        <attribute name="style:family">
+            <choice>
+                <value>graphic</value>
+                <value>presentation</value>
+            </choice>
+        </attribute>
+        <optional>
+            <ref name="style-graphic-properties"/>
+        </optional>
+        <optional>
+            <ref name="style-paragraph-properties"/>
+        </optional>
+        <optional>
+            <ref name="style-text-properties"/>
+        </optional>
+    </group>
+</define>
+
+<define name="style-graphic-properties">
+    <element name="style:graphic-properties">
+        <ref name="style-graphic-properties-content"/>
+    </element>
+</define>
+
+<define name="style-graphic-properties-content">
+    <ref name="style-properties-content"/>
+</define>
+
+<define name="style-graphic-properties-content-strict">
+    <ref name="style-graphic-properties-attlist"/>
+    <ref name="style-graphic-fill-properties-attlist"/>
+    <ref name="style-graphic-properties-elements"/>
+</define>
+
+<define name=" style-graphic-properties-elements">
+    <empty/>
+</define>
+<define name="style-style-content" combine="choice">
+    <group>
+        <attribute name="style:family">
+            <value>drawing-page</value>
+        </attribute>
+        <optional>
+            <ref name="style-drawing-page-properties"/>
+        </optional>
+    </group>
+</define>
+
+<define name="style-drawing-page-properties">
+    <element name="style:drawing-page-properties">
+        <ref name="style-drawing-page-properties-content"/>
+    </element>
+</define>
+
+<define name="style-drawing-page-properties-content">
+    <ref name="style-properties-content"/>
+</define>
+
+<define name="style-drawing-page-properties-content-strict">
+    <ref name="style-graphic-fill-properties-attlist"/>
+    <ref name="style-drawing-page-properties-attlist"/>
+    <ref name="style-drawing-page-properties-elements"/>
+</define>
+<define name="draw-gradient">
+    <element name="draw:gradient">
+        <ref name="common-draw-gradient-attlist"/>
+        <ref name="draw-gradient-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="common-draw-gradient-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:name">
+            <ref name="styleName"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-draw-gradient-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:display-name">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-draw-gradient-attlist" combine="interleave">
+    <attribute name="draw:style">
+        <ref name="gradient-style"/>
+    </attribute>
+</define>
+<define name="gradient-style">
+    <choice>
+        <value>linear</value>
+        <value>axial</value>
+        <value>radial</value>
+        <value>ellipsoid</value>
+        <value>square</value>
+        <value>rectangular</value>
+    </choice>
+</define>
+<define name="common-draw-gradient-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:cx">
+            <ref name="percent"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="draw:cy">
+            <ref name="percent"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-gradient-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:start-color">
+            <ref name="color"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="draw:end-color">
+            <ref name="color"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-gradient-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:start-intensity">
+            <ref name="percent"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="draw:end-intensity">
+            <ref name="percent"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-draw-gradient-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:angle">
+            <ref name="integer"/>
+        </attribute>
+    </optional>
+</define>
+<define name="common-draw-gradient-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:border">
+            <ref name="percent"/>
+        </attribute>
+    </optional>
+</define>
+<define name="svg-linearGradient">
+    <element name="svg:linearGradient">
+        <ref name="common-svg-gradient-attlist"/>
+        <optional>
+            <attribute name="svg:x1" a:defaultValue="0%">
+                <choice>
+                    <ref name="coordinate"/>
+                    <ref name="percent"/>
+                </choice>                
+            </attribute>
+        </optional>
+        <optional>
+            <attribute name="svg:y1" a:defaultValue="0%">
+                <choice>
+                    <ref name="coordinate"/>
+                    <ref name="percent"/>
+                </choice>                
+            </attribute>
+        </optional>
+        <optional>
+            <attribute name="svg:x2" a:defaultValue="100%">
+                <choice>
+                    <ref name="coordinate"/>
+                    <ref name="percent"/>
+                </choice>                
+            </attribute>
+        </optional>
+        <optional>
+            <attribute name="svg:y2" a:defaultValue="100%">
+                <choice>
+                    <ref name="coordinate"/>
+                    <ref name="percent"/>
+                </choice>                
+            </attribute>
+        </optional>
+        <zeroOrMore>
+            <ref name="svg-stop"/>
+        </zeroOrMore>
+    </element>
+</define>
+
+<define name="svg-radialGradient">
+    <element name="svg:radialGradient">
+        <ref name="common-svg-gradient-attlist"/>
+        <optional>
+            <attribute name="svg:cx" a:defaultValue="50%">
+                <choice>
+                    <ref name="coordinate"/>
+                    <ref name="percent"/>
+                </choice>                
+            </attribute>
+        </optional>
+        <optional>
+            <attribute name="svg:cy" a:defaultValue="50%">
+                <choice>
+                    <ref name="coordinate"/>
+                    <ref name="percent"/>
+                </choice>                
+            </attribute>
+        </optional>
+        <optional>
+            <attribute name="svg:r" a:defaultValue="50%">
+                <choice>
+                    <ref name="coordinate"/>
+                    <ref name="percent"/>
+                </choice>                
+            </attribute>
+        </optional>
+        <optional>
+            <attribute name="svg:fx">
+                <choice>
+                    <ref name="coordinate"/>
+                    <ref name="percent"/>
+                </choice>                
+            </attribute>
+        </optional>
+        <optional>
+            <attribute name="svg:fy">
+                <choice>
+                    <ref name="coordinate"/>
+                    <ref name="percent"/>
+                </choice>                
+            </attribute>
+        </optional>
+        <zeroOrMore>
+            <ref name="svg-stop"/>
+        </zeroOrMore>
+    </element>
+</define>
+
+<define name="svg-stop">
+    <element name="svg:stop">
+        <attribute name="svg:offset">
+            <choice>
+                <ref name="double"/>
+                <ref name="percent"/>
+            </choice>
+        </attribute>
+        <optional>
+            <attribute name="svg:stop-color">
+                <ref name="color"/>
+            </attribute>
+        </optional>
+        <optional>
+            <attribute name="svg:stop-opacity">
+                <ref name="double"/>
+            </attribute>
+        </optional>
+    </element>
+</define>
+
+<define name="common-svg-gradient-attlist" combine="interleave">
+    <optional>
+        <attribute name="svg:gradientUnits" a:defaultValue="objectBoundingBox">
+            <value>objectBoundingBox</value>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="svg:gradientTransform">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="svg:spreadMethod" a:defaultValue="pad">
+            <choice>
+                <value>pad</value>
+                <value>reflect</value>
+                <value>repeat</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="common-svg-gradient-attlist" combine="interleave">
+    <attribute name="draw:name">
+        <ref name="styleName"/>
+    </attribute>
+</define>
+<define name="common-svg-gradient-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:display-name">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-hatch">
+    <element name="draw:hatch">
+        <ref name="draw-hatch-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="draw-hatch-attlist" combine="interleave">
+    <attribute name="draw:name">
+        <ref name="styleName"/>
+    </attribute>
+</define>
+<define name="draw-hatch-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:display-name">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-hatch-attlist" combine="interleave">
+    <attribute name="draw:style">
+        <choice>
+            <value>single</value>
+            <value>double</value>
+            <value>triple</value>
+        </choice>
+    </attribute>
+</define>
+<define name="draw-hatch-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:color">
+            <ref name="color"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-hatch-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:distance">
+            <ref name="length"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-hatch-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:rotation">
+            <ref name="integer"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-fill-image">
+    <element name="draw:fill-image">
+        <ref name="draw-fill-image-attlist"/>
+        <attribute name="xlink:href">
+            <ref name="anyURI"/>
+        </attribute>
+        <optional>
+            <attribute name="xlink:type" a:defaultValue="simple">
+                <choice>
+                    <value>simple</value>
+                </choice>
+            </attribute>
+        </optional>
+        <optional>
+            <attribute name="xlink:show" a:defaultValue="embed">
+                <choice>
+                    <value>embed</value>
+                </choice>
+            </attribute>
+        </optional>
+        <optional>
+            <attribute name="xlink:actuate" a:defaultValue="onLoad">
+                <choice>
+                    <value>onLoad</value>
+                </choice>
+            </attribute>
+        </optional>
+        <empty/>
+    </element>
+</define>
+<define name="draw-fill-image-attlist" combine="interleave">
+    <attribute name="draw:name">
+        <ref name="styleName"/>
+    </attribute>
+</define>
+<define name="draw-fill-image-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:display-name">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-fill-image-attlist" combine="interleave">
+    <optional>
+        <attribute name="svg:width">
+            <ref name="length"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="svg:height">
+            <ref name="length"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-opacity">
+    <element name="draw:opacity">
+        <ref name="common-draw-gradient-attlist"/>
+        <ref name="draw-opacity-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="draw-opacity-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:start">
+            <ref name="percent"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="draw:end">
+            <ref name="percent"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-marker">
+    <element name="draw:marker">
+        <ref name="draw-marker-attlist"/>
+        <ref name="common-draw-viewbox-attlist"/>
+        <ref name="common-draw-path-data-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="draw-marker-attlist" combine="interleave">
+    <attribute name="draw:name">
+        <ref name="styleName"/>
+    </attribute>
+</define>
+<define name="draw-marker-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:display-name">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-stroke-dash">
+    <element name="draw:stroke-dash">
+        <ref name="draw-stroke-dash-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="draw-stroke-dash-attlist" combine="interleave">
+    <attribute name="draw:name">
+        <ref name="styleName"/>
+    </attribute>
+</define>
+<define name="draw-stroke-dash-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:display-name">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-stroke-dash-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:style">
+            <choice>
+                <value>rect</value>
+                <value>round</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-stroke-dash-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:dots1">
+            <ref name="integer"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="draw:dots1-length">
+            <ref name="length"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="draw:dots2">
+            <ref name="integer"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="draw:dots2-length">
+            <ref name="length"/>
+        </attribute>
+    </optional>
+</define>
+<define name="draw-stroke-dash-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:distance">
+            <ref name="length"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-presentation-page-layout">
+    <element name="style:presentation-page-layout">
+        <attribute name="style:name">
+            <ref name="styleName"/>
+        </attribute>
+        <optional>
+            <attribute name="style:display-name">
+                <ref name="string"/>
+            </attribute>
+        </optional>
+        <zeroOrMore>
+            <ref name="presentation-placeholder"/>
+        </zeroOrMore>
+    </element>
+</define>
+<define name="presentation-placeholder">
+    <element name="presentation:placeholder">
+        <attribute name="presentation:object">
+            <ref name="presentation-classes"/>
+        </attribute>
+        <attribute name="svg:x">
+            <choice>
+                <ref name="coordinate"/>
+                <ref name="percent"/>
+            </choice>
+        </attribute>
+        <attribute name="svg:y">
+            <choice>
+                <ref name="coordinate"/>
+                <ref name="percent"/>
+            </choice>
+        </attribute>
+        <attribute name="svg:width">
+            <choice>
+                <ref name="length"/>
+                <ref name="percent"/>
+            </choice>
+        </attribute>
+        <attribute name="svg:height">
+            <choice>
+                <ref name="length"/>
+                <ref name="percent"/>
+            </choice>
+        </attribute>
+        <empty/>
+    </element>
+</define>
+<define name="style-style-content" combine="choice">
+    <group>
+        <attribute name="style:family">
+            <value>chart</value>
+        </attribute>
+        <optional>
+            <ref name="style-chart-properties"/>
+        </optional>
+        <optional>
+            <ref name="style-graphic-properties"/>
+        </optional>
+        <optional>
+            <ref name="style-paragraph-properties"/>
+        </optional>
+        <optional>
+            <ref name="style-text-properties"/>
+        </optional>
+    </group>
+</define>
+<define name="style-properties-content">
+    <ref name="anyAttListOrElements"/>
+</define>
+<define name="style-page-layout-properties">
+    <element name="style:page-layout-properties">
+        <ref name="style-page-layout-properties-content"/>
+    </element>
+</define>
+
+<define name="style-page-layout-properties-content">
+    <ref name="style-properties-content"/>
+</define>
+
+<define name="style-page-layout-properties-content-strict">
+    <ref name="style-page-layout-properties-attlist"/>
+    <ref name="style-page-layout-properties-elements"/>
+</define>
+<define name="style-page-layout-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="fo:page-width">
+            <ref name="length"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="fo:page-height">
+            <ref name="length"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-page-layout-properties-attlist" combine="interleave">
+    <optional>
+        <ref name="common-num-format-attlist"/>
+    </optional>
+    <ref name="common-num-format-prefix-suffix-attlist"/>
+</define>
+<define name="style-page-layout-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:paper-tray-name">
+            <choice>
+                <value>default</value>
+                <ref name="string"/>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-page-layout-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:print-orientation">
+            <choice>
+                <value>portrait</value>
+                <value>landscape</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-page-layout-properties-attlist" combine="interleave">
+    <ref name="common-horizontal-margin-attlist"/>
+    <ref name="common-vertical-margin-attlist"/>
+    <ref name="common-margin-attlist"/>
+</define>
+<define name="style-page-layout-properties-attlist" combine="interleave">
+    <ref name="common-border-attlist"/>
+</define>
+<define name="style-page-layout-properties-attlist" combine="interleave">
+    <ref name="common-border-line-width-attlist"/>
+</define>
+<define name="style-page-layout-properties-attlist" combine="interleave">
+    <ref name="common-padding-attlist"/>
+</define>
+<define name="style-page-layout-properties-attlist" combine="interleave">
+    <ref name="common-shadow-attlist"/>
+</define>
+<define name="style-page-layout-properties-attlist" combine="interleave">
+    <ref name="common-background-color-attlist"/>
+</define>
+<define name="style-page-layout-properties-elements" combine="interleave">
+    <ref name="style-background-image"/>
+</define>
+<define name="style-page-layout-properties-elements" combine="interleave">
+    <ref name="style-columns"/>
+</define>
+<define name="style-page-layout-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:register-truth-ref-style-name">
+            <ref name="styleNameRef"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-page-layout-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:print">
+            <list>
+                <zeroOrMore>
+                    <choice>
+                        <value>headers</value>
+                        <value>grid</value>
+                        <value>annotations</value>
+                        <value>objects</value>
+                        <value>charts</value>
+                        <value>drawings</value>
+                        <value>formulas</value>
+                        <value>zero-values</value>
+                    </choice>
+                </zeroOrMore>
+            </list>
+        </attribute>
+    </optional>
+</define>
+<define name="style-page-layout-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:print-page-order">
+            <choice>
+                <value>ttb</value>
+                <value>ltr</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-page-layout-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:first-page-number">
+            <choice>
+                <ref name="positiveInteger"/>
+                <value>continue</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-page-layout-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:scale-to">
+            <ref name="percent"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="style:scale-to-pages">
+            <ref name="positiveInteger"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-page-layout-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:table-centering">
+            <choice>
+                <value>horizontal</value>
+                <value>vertical</value>
+                <value>both</value>
+                <value>none</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-page-layout-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:footnote-max-height">
+            <ref name="length"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-page-layout-properties-attlist" combine="interleave">
+    <ref name="common-writing-mode-attlist"/>
+</define>
+<define name="style-page-layout-properties-elements" combine="interleave">
+    <ref name="style-footnote-sep"/>
+</define>
+
+<define name="style-footnote-sep">
+    <optional>
+        <element name="style:footnote-sep">
+            <ref name="style-footnote-sep-attlist"/>
+            <empty/>
+        </element>
+    </optional>
+</define>
+<define name="style-footnote-sep-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:width">
+            <ref name="length"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="style:rel-width">
+            <ref name="percent"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="style:color">
+            <ref name="color"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="style:line-style">
+            <ref name="lineStyle"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="style:adjustment" a:defaultValue="left">
+            <choice>
+                <value>left</value>
+                <value>center</value>
+                <value>right</value>
+            </choice>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="style:distance-before-sep">
+            <ref name="length"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="style:distance-after-sep">
+            <ref name="length"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-page-layout-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:layout-grid-mode">
+            <choice>
+                <value>none</value>
+                <value>line</value>
+                <value>both</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-page-layout-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:layout-grid-base-height">
+            <ref name="length"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-page-layout-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:layout-grid-ruby-height">
+            <ref name="length"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-page-layout-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:layout-grid-lines">
+            <ref name="positiveInteger"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-page-layout-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:layout-grid-color">
+            <ref name="color"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-page-layout-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:layout-grid-ruby-below">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-page-layout-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:layout-grid-print">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-page-layout-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:layout-grid-display">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-header-footer-properties">
+    <element name="style:header-footer-properties">
+        <ref name="style-header-footer-properties-content"/>
+    </element>
+</define>
+
+<define name="style-header-footer-properties-content">
+    <ref name="style-properties-content"/>
+</define>
+
+<define name="style-header-footer-properties-content-strict">
+        <ref name="style-header-footer-properties-attlist"/>
+        <ref name="style-header-footer-properties-elements"/>
+</define>
+<define name="style-header-footer-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="svg:height">
+            <ref name="length"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="fo:min-height">
+            <ref name="length"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-header-footer-properties-attlist" combine="interleave">
+    <ref name="common-horizontal-margin-attlist"/>
+    <ref name="common-vertical-margin-attlist"/>
+    <ref name="common-margin-attlist"/>
+</define>
+<define name="style-header-footer-properties-attlist" combine="interleave">
+    <ref name="common-border-attlist"/>
+</define>
+<define name="style-header-footer-properties-attlist" combine="interleave">
+    <ref name="common-border-line-width-attlist"/>
+</define>
+<define name="style-header-footer-properties-attlist" combine="interleave">
+    <ref name="common-padding-attlist"/>
+</define>
+<define name="style-header-footer-properties-attlist" combine="interleave">
+    <ref name="common-background-color-attlist"/>
+</define>
+<define name="style-header-footer-properties-elements" combine="interleave">
+    <ref name="style-background-image"/>
+</define>
+<define name="style-header-footer-properties-attlist" combine="interleave">
+    <ref name="common-shadow-attlist"/>
+</define>
+<define name="style-header-footer-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:dynamic-spacing">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-text-properties">
+    <element name="style:text-properties">
+        <ref name="style-text-properties-content"/>
+    </element>
+</define>
+
+<define name="style-text-properties-content">
+    <ref name="style-properties-content"/>
+</define>
+
+<define name="style-text-properties-content-strict">
+    <ref name="style-text-properties-attlist"/>
+    <ref name="style-text-properties-elements"/>
+</define>
+
+<define name="style-text-properties-elements">
+    <empty/>
+</define>
+<define name="style-text-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="fo:font-variant">
+            <ref name="fontVariant"/>
+        </attribute>
+    </optional>
+</define>
+
+<define name="fontVariant">
+    <choice>
+        <value>normal</value>
+        <value>small-caps</value>
+    </choice>
+</define>
+<define name="style-text-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="fo:text-transform">
+            <choice>
+                <value>none</value>
+                <value>lowercase</value>
+                <value>uppercase</value>
+                <value>capitalize</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-text-properties-attlist" combine="interleave">
+    <optional>
+            <attribute name="fo:color">
+            <ref name="color"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-text-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:use-window-font-color">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-text-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:text-outline">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-text-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:text-line-through-type">
+            <ref name="lineType"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-text-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:text-line-through-style">
+            <ref name="lineStyle"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-text-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:text-line-through-width">
+            <ref name="lineWidth"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-text-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:text-line-through-color">
+            <choice>
+                <value>font-color</value>
+                <ref name="color"/>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-text-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:text-line-through-text">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-text-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:text-line-through-text-style">
+            <ref name="styleNameRef"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-text-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:text-position">
+            <list>
+                <choice>
+                    <ref name="percent"/>
+                    <value>super</value>
+                    <value>sub</value>
+                </choice>
+                <optional>
+                    <ref name="percent"/>
+                </optional>
+            </list>
+        </attribute>
+    </optional>
+</define>
+<define name="style-text-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:font-name">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="style:font-name-asian">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="style:font-name-complex">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-text-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="fo:font-family">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="style:font-family-asian">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="style:font-family-complex">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-text-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:font-family-generic">
+            <ref name="fontFamilyGeneric"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="style:font-family-generic-asian">
+            <ref name="fontFamilyGeneric"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="style:font-family-generic-complex">
+            <ref name="fontFamilyGeneric"/>
+        </attribute>
+    </optional>
+</define>
+
+<define name="fontFamilyGeneric">
+    <choice>
+        <value>roman</value>
+        <value>swiss</value>
+        <value>modern</value>
+        <value>decorative</value>
+        <value>script</value>
+        <value>system</value>
+    </choice>
+</define>
+<define name="style-text-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:font-style-name">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="style:font-style-name-asian">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="style:font-style-name-complex">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-text-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:font-pitch">
+            <ref name="fontPitch"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="style:font-pitch-asian">
+            <ref name="fontPitch"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="style:font-pitch-complex">
+            <ref name="fontPitch"/>
+        </attribute>
+    </optional>
+</define>
+
+<define name="fontPitch">
+    <choice>
+        <value>fixed</value>
+        <value>variable</value>
+    </choice>
+</define>
+<define name="style-text-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:font-charset">
+            <ref name="textEncoding"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="style:font-charset-asian">
+            <ref name="textEncoding"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="style:font-charset-complex">
+            <ref name="textEncoding"/>
+        </attribute>
+    </optional>
+</define>
+
+<define name="textEncoding">
+    <data type="string">
+        <param name="pattern">[A-Za-z][A-Za-z0-9._\-]*</param>
+    </data>
+</define>
+<define name="style-text-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="fo:font-size">
+            <choice>
+                <ref name="positiveLength"/>
+                <ref name="percent"/>
+            </choice>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="style:font-size-asian">
+            <choice>
+                <ref name="positiveLength"/>
+                <ref name="percent"/>
+            </choice>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="style:font-size-complex">
+            <choice>
+                <ref name="positiveLength"/>
+                <ref name="percent"/>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-text-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:font-size-rel">
+            <ref name="length"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="style:font-size-rel-asian">
+            <ref name="length"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="style:font-size-rel-complex">
+            <ref name="length"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-text-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:script-type">
+            <choice>
+                <value>latin</value>
+                <value>asian</value>
+                <value>complex</value>
+                <value>ignore</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-text-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="fo:letter-spacing">
+            <choice>
+                <ref name="length"/>
+                <value>normal</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-text-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="fo:language">
+            <ref name="languageCode"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="style:language-asian">
+            <ref name="languageCode"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="style:language-complex">
+            <ref name="languageCode"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-text-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="fo:country">
+            <ref name="countryCode"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="style:country-asian">
+            <ref name="countryCode"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="style:country-complex">
+            <ref name="countryCode"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-text-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="fo:font-style">
+            <ref name="fontStyle"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="style:font-style-asian">
+            <ref name="fontStyle"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="style:font-style-complex">
+            <ref name="fontStyle"/>
+        </attribute>
+    </optional>
+</define>
+
+<define name="fontStyle">
+    <choice>
+        <value>normal</value>
+        <value>italic</value>
+        <value>oblique</value>
+    </choice>
+</define>
+<define name="style-text-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:font-relief">
+            <choice>
+            <value>none</value>
+                <value>embossed</value>
+                <value>engraved</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-text-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="fo:text-shadow">
+            <ref name="shadowType"/>
+        </attribute>
+    </optional>
+</define>
+
+<define name="shadowType">
+    <choice>
+        <value>none</value>
+        <!-- The following string must match an XSL shadow decl -->
+        <ref name="string"/>
+    </choice>
+</define>
+<define name="style-text-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:text-underline-type">
+            <ref name="lineType"/>
+        </attribute>
+    </optional>
+</define>
+
+<define name="lineType">
+    <choice>
+        <value>none</value>
+        <value>single</value>
+        <value>double</value>
+    </choice>
+</define>
+<define name="style-text-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:text-underline-style">
+            <ref name="lineStyle"/>
+        </attribute>
+    </optional>
+</define>
+
+<define name="lineStyle">
+    <choice>
+        <value>none</value>
+        <value>solid</value>
+        <value>dotted</value>
+        <value>dash</value>
+        <value>long-dash</value>
+        <value>dot-dash</value>
+        <value>dot-dot-dash</value>
+        <value>wave</value>
+    </choice>
+</define>
+<define name="style-text-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:text-underline-width">
+            <ref name="lineWidth"/>
+        </attribute>
+    </optional>
+</define>
+
+<define name="lineWidth">
+    <choice>
+        <value>auto</value>
+        <value>normal</value>
+        <value>bold</value>
+        <value>thin</value>
+        <value>dash</value>
+        <value>medium</value>
+        <value>thick</value>
+        <ref name="positiveInteger"/>
+        <ref name="percent"/>
+        <ref name="positiveLength"/>
+    </choice>
+</define>
+<define name="style-text-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:text-underline-color">
+            <choice>
+                <value>font-color</value>
+                <ref name="color"/>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-text-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="fo:font-weight">
+            <ref name="fontWeight"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="style:font-weight-asian">
+            <ref name="fontWeight"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="style:font-weight-complex">
+            <ref name="fontWeight"/>
+        </attribute>
+    </optional>
+</define>
+
+<define name="fontWeight">
+    <choice>
+        <value>normal</value>
+        <value>bold</value>
+        <value>100</value>
+        <value>200</value>
+        <value>300</value>
+        <value>400</value>
+        <value>500</value>
+        <value>600</value>
+        <value>700</value>
+        <value>800</value>
+        <value>900</value>
+    </choice>
+</define>
+<define name="style-text-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:text-underline-mode">
+            <ref name="lineMode"/>
+        </attribute>
+    </optional>
+</define>
+
+<define name="lineMode">
+    <choice>
+        <value>continuous</value>
+        <value>skip-white-space</value>
+    </choice>
+</define>
+<define name="style-text-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:text-line-through-mode">
+            <ref name="lineMode"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-text-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:letter-kerning">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-text-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:text-blinking">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-text-properties-attlist" combine="interleave">
+    <ref name="common-background-color-attlist"/>
+</define>
+<define name="style-text-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:text-combine">
+            <choice>
+                <value>none</value>
+                <value>letters</value>
+                <value>lines</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-text-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:text-combine-start-char">
+            <ref name="character"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="style:text-combine-end-char">
+            <ref name="character"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-text-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:text-emphasize">
+            <choice>
+                <value>none</value>
+                <list>
+                    <choice>
+                        <value>none</value>
+                        <value>accent</value>
+                        <value>dot</value>
+                        <value>circle</value>
+                        <value>disc</value>
+                    </choice>
+                    <choice>
+                        <value>above</value>
+                        <value>below</value>
+                    </choice>
+                </list>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-text-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:text-scale">
+            <ref name="percent"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-text-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:text-rotation-angle">
+            <ref name="integer"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-text-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:text-rotation-scale">
+            <choice>
+                <value>fixed</value>
+                <value>line-height</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-text-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="fo:hyphenate">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-text-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="fo:hyphenation-remain-char-count">
+            <ref name="positiveInteger"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-text-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="fo:hyphenation-push-char-count">
+            <ref name="positiveInteger"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-text-properties-attlist" combine="interleave">
+    <choice>
+        <attribute name="text:display">
+            <value>true</value>
+        </attribute>
+        <attribute name="text:display">
+            <value>none</value>
+        </attribute>
+        <group>
+            <attribute name="text:display">
+                <value>condition</value>
+            </attribute>
+            <attribute name="text:condition">
+                <value>none</value>
+            </attribute>
+        </group>
+        <empty/>
+    </choice>
+</define>
+<define name="style-paragraph-properties">
+    <element name="style:paragraph-properties">
+        <ref name="style-paragraph-properties-content"/>
+    </element>
+</define>
+
+<define name="style-paragraph-properties-content">
+    <ref name="style-properties-content"/>
+</define>
+
+<define name="style-paragraph-properties-content-strict">
+    <ref name="style-paragraph-properties-attlist"/>
+    <ref name="style-paragraph-properties-elements"/>
+</define>
+<define name="style-paragraph-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="fo:line-height">
+            <choice>
+                <value>normal</value>
+                <ref name="nonNegativeLength"/>
+                <ref name="percent"/>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-paragraph-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:line-height-at-least">
+            <ref name="nonNegativeLength"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-paragraph-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:line-spacing">
+            <ref name="length"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-paragraph-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:font-independent-line-spacing">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-paragraph-properties-attlist" combine="interleave">
+    <ref name="common-text-align"/>
+</define>
+
+<define name="common-text-align">
+    <optional>
+        <attribute name="fo:text-align">
+            <choice>
+                <value>start</value>
+                <value>end</value>
+                <value>left</value>
+                <value>right</value>
+                <value>center</value>
+                <value>justify</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-paragraph-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="fo:text-align-last">
+            <choice>
+                <value>start</value>
+                <value>center</value>
+                <value>justify</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-paragraph-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:justify-single-word">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-paragraph-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="fo:keep-together">
+            <choice>
+                <value>auto</value>
+                <value>always</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-paragraph-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="fo:widows">
+            <ref name="nonNegativeInteger"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-paragraph-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="fo:orphans">
+            <ref name="nonNegativeInteger"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-paragraph-properties-elements" combine="interleave">
+    <ref name="style-tab-stops"/>
+</define>
+
+<define name="style-tab-stops">
+    <optional>
+        <element name="style:tab-stops">
+            <zeroOrMore>
+                <ref name="style-tab-stop"/>
+            </zeroOrMore>
+        </element>
+    </optional>
+</define>
+
+<define name="style-tab-stop">
+    <element name="style:tab-stop">
+        <ref name="style-tab-stop-attlist"/>
+        <empty/>
+    </element>
+</define>
+<define name="style-tab-stop-attlist" combine="interleave">
+    <attribute name="style:position">
+        <ref name="nonNegativeLength"/>
+    </attribute>
+</define>
+<define name="style-tab-stop-attlist" combine="interleave">
+    <choice>
+        <optional>
+            <attribute name="style:type" a:defaultValue="left">
+                <choice>
+                    <value>left</value>
+                    <value>center</value>
+                    <value>right</value>
+                </choice>
+            </attribute>
+        </optional>
+        <group>
+            <attribute name="style:type">
+                <value>char</value>
+            </attribute>
+            <ref name="style-tab-stop-char-attlist"/>
+        </group>
+    </choice>
+</define>
+<define name="style-tab-stop-char-attlist" combine="interleave">
+    <attribute name="style:char">
+        <ref name="character"/>
+    </attribute>
+</define>
+<define name="style-tab-stop-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:leader-type">
+            <ref name="lineType"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-tab-stop-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:leader-style">
+            <ref name="lineStyle"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-tab-stop-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:leader-width">
+            <ref name="lineWidth"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-tab-stop-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:leader-color">
+            <choice>
+                <value>font-color</value>
+                <ref name="color"/>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-tab-stop-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:leader-text" a:defaultValue=" ">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-tab-stop-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:leader-text-style">
+            <ref name="styleNameRef"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-paragraph-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:tab-stop-distance">
+            <ref name="nonNegativeLength"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-paragraph-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="fo:hyphenation-keep">
+            <choice>
+                <value>auto</value>
+                <value>page</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-paragraph-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="fo:hyphenation-ladder-count">
+            <choice>
+                <value>no-limit</value>
+                <ref name="positiveInteger"/>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-paragraph-properties-elements" combine="interleave">
+    <ref name="style-drop-cap"/>
+</define>
+
+<define name="style-drop-cap">
+    <optional>
+        <element name="style:drop-cap">
+            <ref name="style-drop-cap-attlist"/>
+            <empty/>
+        </element>
+    </optional>
+</define>
+<define name="style-drop-cap-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:length" a:defaultValue="1">
+            <choice>
+                <value>word</value>
+                <ref name="positiveInteger"/>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-drop-cap-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:lines" a:defaultValue="1">
+            <ref name="positiveInteger"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-drop-cap-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:distance" a:defaultValue="0cm">
+            <ref name="length"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-drop-cap-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:style-name">
+            <ref name="styleNameRef"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-paragraph-properties-attlist" combine="interleave">
+        <optional>
+            <attribute name="style:register-true">
+                <ref name="boolean"/>
+            </attribute>
+        </optional>
+    </define>
+<define name="style-paragraph-properties-attlist" combine="interleave">
+    <ref name="common-horizontal-margin-attlist"/>
+</define>
+
+<define name="common-horizontal-margin-attlist">
+    <optional>
+        <attribute name="fo:margin-left">
+            <choice>
+                <ref name="length"/>
+                <ref name="percent"/>
+            </choice>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="fo:margin-right">
+            <choice>
+                <ref name="length"/>
+                <ref name="percent"/>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-paragraph-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="fo:text-indent">
+            <choice>
+                <ref name="length"/>
+                <ref name="percent"/>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-paragraph-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:auto-text-indent">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-paragraph-properties-attlist" combine="interleave">
+    <ref name="common-vertical-margin-attlist"/>
+</define>
+
+<define name="common-vertical-margin-attlist">
+    <optional>
+        <attribute name="fo:margin-top">
+            <choice>
+                <ref name="nonNegativeLength"/>
+                <ref name="percent"/>
+            </choice>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="fo:margin-bottom">
+            <choice>
+                <ref name="nonNegativeLength"/>
+                <ref name="percent"/>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-paragraph-properties-attlist" combine="interleave">
+    <ref name="common-margin-attlist"/>
+</define>
+
+<define name="common-margin-attlist">
+    <optional>
+        <attribute name="fo:margin">
+            <choice>
+                <ref name="nonNegativeLength"/>
+                <ref name="percent"/>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-paragraph-properties-attlist" combine="interleave">
+    <ref name="common-break-attlist"/>
+</define>
+
+<define name="common-break-attlist">
+    <optional>
+        <attribute name="fo:break-before">
+            <choice>
+                <value>auto</value>
+                <value>column</value>
+                <value>page</value>
+            </choice>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="fo:break-after">
+            <choice>
+                <value>auto</value>
+                <value>column</value>
+                <value>page</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-paragraph-properties-attlist" combine="interleave">
+    <ref name="common-background-color-attlist"/>
+</define>
+
+<define name="common-background-color-attlist">
+    <optional>
+        <attribute name="fo:background-color">
+            <choice>
+                <value>transparent</value>
+                <ref name="color"/>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-paragraph-properties-elements" combine="interleave">
+    <ref name="style-background-image"/>
+</define>
+
+<define name="style-background-image">
+    <optional>
+        <element name="style:background-image">
+            <ref name="style-background-image-attlist"/>
+            <choice>
+                <ref name="common-draw-data-attlist"/>
+                <ref name="office-binary-data"/>
+                <empty/>
+            </choice>
+        </element>
+    </optional>
+</define>
+<define name="style-background-image-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:repeat" a:defaultValue="repeat">
+            <choice>
+                <value>no-repeat</value>
+                <value>repeat</value>
+                <value>stretch</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-background-image-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:position" a:defaultValue="center">
+            <choice>
+                <value>left</value>
+                <value>center</value>
+                <value>right</value>
+                <value>top</value>
+                <value>bottom</value>
+                <list>
+                    <ref name="horiBackPos"/>
+                    <ref name="vertBackPos"/>
+                </list>
+                <list>
+                    <ref name="vertBackPos"/>
+                    <ref name="horiBackPos"/>
+                </list>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+
+<define name="horiBackPos">
+    <choice>
+        <value>left</value>
+        <value>center</value>
+        <value>right</value>
+    </choice>
+</define>
+<define name="vertBackPos">
+    <choice>
+        <value>top</value>
+        <value>center</value>
+        <value>bottom</value>
+    </choice>
+</define>
+<define name="style-background-image-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:filter-name">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-background-image-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:opacity">
+            <ref name="percent"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-paragraph-properties-attlist" combine="interleave">
+    <ref name="common-border-attlist"/>
+</define>
+
+<define name="common-border-attlist">
+    <optional>
+        <attribute name="fo:border">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="fo:border-top">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="fo:border-bottom">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="fo:border-left">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="fo:border-right">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-paragraph-properties-attlist" combine="interleave">
+    <ref name="common-border-line-width-attlist"/>
+</define>
+
+<define name="common-border-line-width-attlist">
+    <optional>
+        <attribute name="style:border-line-width">
+            <ref name="borderWidths"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="style:border-line-width-top">
+            <ref name="borderWidths"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="style:border-line-width-bottom">
+            <ref name="borderWidths"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="style:border-line-width-left">
+            <ref name="borderWidths"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="style:border-line-width-right">
+            <ref name="borderWidths"/>
+        </attribute>
+    </optional>
+</define>
+
+<define name="borderWidths">
+    <list>
+        <ref name="positiveLength"/>
+        <ref name="positiveLength"/>
+        <ref name="positiveLength"/>
+    </list>
+</define>
+<define name="style-paragraph-properties-attlist" combine="interleave">
+    <ref name="common-padding-attlist"/>
+</define>
+
+<define name="common-padding-attlist">
+    <optional>
+        <attribute name="fo:padding">
+            <ref name="nonNegativeLength"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="fo:padding-top">
+            <ref name="nonNegativeLength"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="fo:padding-bottom">
+            <ref name="nonNegativeLength"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="fo:padding-left">
+            <ref name="nonNegativeLength"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="fo:padding-right">
+            <ref name="nonNegativeLength"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-paragraph-properties-attlist" combine="interleave">
+    <ref name="common-shadow-attlist"/>
+</define>
+
+<define name="common-shadow-attlist">
+    <optional>
+        <attribute name="style:shadow">
+            <ref name="shadowType"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-paragraph-properties-attlist" combine="interleave">
+    <ref name="common-keep-with-next-attlist"/>
+</define>
+
+<define name="common-keep-with-next-attlist">
+    <optional>
+        <attribute name="fo:keep-with-next">
+            <choice>
+                <value>auto</value>
+                <value>always</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-paragraph-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="text:number-lines" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-paragraph-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="text:line-number">
+            <ref name="nonNegativeInteger"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-paragraph-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:text-autospace">
+            <choice>
+                <value>none</value>
+                <value>ideograph-alpha</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-paragraph-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:punctuation-wrap">
+            <choice>
+                <value>simple</value>
+                <value>hanging</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-paragraph-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:line-break">
+            <choice>
+                <value>normal</value>
+                <value>strict</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-paragraph-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:vertical-align" a:defaultValue="auto">
+            <choice>
+                <value>top</value>
+                <value>middle</value>
+                <value>bottom</value>
+                <value>auto</value>
+                <value>baseline</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-paragraph-properties-attlist" combine="interleave">
+    <ref name="common-writing-mode-attlist"/>
+</define>
+
+<define name="common-writing-mode-attlist">
+    <optional>
+        <attribute name="style:writing-mode">
+            <choice>
+                <value>lr-tb</value>
+                <value>rl-tb</value>
+                <value>tb-rl</value>
+                <value>tb-lr</value>
+                <value>lr</value>
+                <value>rl</value>
+                <value>tb</value>
+                <value>page</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-paragraph-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:writing-mode-automatic">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-paragraph-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:snap-to-layout-grid">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-paragraph-properties-attlist" combine="interleave">
+    <ref name="common-page-number-attlist"/>
+</define>
+
+<define name="common-page-number-attlist">
+    <optional>
+        <attribute name="style:page-number">
+            <choice>                <ref name="positiveInteger"/>                <value>auto</value>            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-paragraph-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:background-transparency">
+            <ref name="percent"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-ruby-properties">
+    <element name="style:ruby-properties">
+        <ref name="style-ruby-properties-content"/>
+    </element>
+</define>
+
+<define name="style-ruby-properties-content">
+    <ref name="style-properties-content"/>
+</define>
+
+<define name="style-ruby-properties-content-strict">
+    <ref name="style-ruby-properties-attlist"/>
+    <ref name="style-ruby-properties-elements"/>
+</define>
+
+<define name="style-ruby-properties-elements">
+    <empty/>
+</define>
+<define name="style-ruby-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:ruby-position">
+            <choice>
+                <value>above</value>
+                <value>below</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-ruby-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:ruby-align">
+            <choice>
+                <value>left</value>
+                <value>center</value>
+                <value>right</value>
+                <value>distribute-letter</value>
+                <value>distribute-space</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-section-properties">
+    <element name="style:section-properties">
+        <ref name="style-section-properties-content"/>
+    </element>
+</define>
+
+<define name="style-section-properties-content">
+    <ref name="style-properties-content"/>
+</define>
+
+<define name="style-section-properties-content-strict">
+    <ref name="style-section-properties-attlist"/>
+    <ref name="style-section-properties-elements"/>
+</define>
+<define name="style-section-properties-attlist" combine="interleave">
+    <ref name="common-background-color-attlist"/>
+</define>
+<define name="style-section-properties-elements" combine="interleave">
+    <ref name="style-background-image"/>
+</define>
+<define name="style-section-properties-attlist" combine="interleave">
+    <ref name="common-horizontal-margin-attlist"/>
+</define>
+<define name="style-section-properties-elements" combine="interleave">
+    <ref name="style-columns"/>
+</define>
+
+<define name="style-columns">
+    <optional>
+        <element name="style:columns">
+            <ref name="style-columns-attlist"/>
+            <optional>
+                <ref name="style-column-sep"/>
+            </optional>
+            <zeroOrMore>
+                <ref name="style-column"/>
+            </zeroOrMore>
+        </element>
+    </optional>
+</define>
+<define name="style-columns-attlist" combine="interleave">
+    <attribute name="fo:column-count">
+        <ref name="positiveInteger"/>
+    </attribute>
+</define>
+<define name="style-columns-attlist" combine="interleave">
+    <optional>
+        <attribute name="fo:column-gap">
+            <ref name="length"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-column">
+    <element name="style:column">
+        <ref name="style-column-attlist"/>
+    </element>
+</define>
+<define name="style-column-attlist" combine="interleave">
+    <attribute name="style:rel-width">
+        <ref name="relativeLength"/>
+    </attribute>
+</define>
+<define name="style-column-attlist" combine="interleave">
+    <optional>
+        <attribute name="fo:start-indent" a:defaultValue="0cm">
+            <ref name="length"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-column-attlist" combine="interleave">
+    <optional>
+        <attribute name="fo:end-indent" a:defaultValue="0cm">
+            <ref name="length"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-column-attlist" combine="interleave">
+    <optional>
+        <attribute name="fo:space-before" a:defaultValue="0cm">
+            <ref name="length"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-column-attlist" combine="interleave">
+    <optional>
+        <attribute name="fo:space-after" a:defaultValue="0cm">
+            <ref name="length"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-column-sep">
+    <element name="style:column-sep">
+        <ref name="style-column-sep-attlist"/>
+    </element>
+</define>
+<define name="style-column-sep-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:style" a:defaultValue="solid">
+            <choice>
+                <value>none</value>
+                <value>solid</value>
+                <value>dotted</value>
+                <value>dashed</value>
+                <value>dot-dashed</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-column-sep-attlist" combine="interleave">
+    <attribute name="style:width">
+        <ref name="length"/>
+    </attribute>
+</define>
+<define name="style-column-sep-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:height" a:defaultValue="100%">
+            <ref name="percent"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-column-sep-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:vertical-align" a:defaultValue="top">
+            <choice>
+                <value>top</value>
+                <value>middle</value>
+                <value>bottom</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-column-sep-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:color" a:defaultValue="#000000">
+            <ref name="color"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-section-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:protect" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-section-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="text:dont-balance-text-columns">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-section-properties-attlist" combine="interleave">
+    <ref name="common-writing-mode-attlist"/>
+</define>
+<define name="style-section-properties-elements" combine="interleave">
+    <zeroOrMore>
+        <ref name="text-notes-configuration"/>
+    </zeroOrMore>
+</define>
+<define name="style-table-properties">
+    <element name="style:table-properties">
+        <ref name="style-table-properties-content"/>
+    </element>
+</define>
+
+<define name="style-table-properties-content">
+    <ref name="style-properties-content"/>
+</define>
+
+<define name="style-table-properties-content-strict">
+    <ref name="style-table-properties-attlist"/>
+    <ref name="style-table-properties-elements"/>
+</define>
+<define name="style-table-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:width">
+            <ref name="positiveLength"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="style:rel-width">
+            <ref name="percent"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-table-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:align">
+            <choice>
+                <value>left</value>
+                <value>center</value>
+                <value>right</value>
+                <value>margins</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-table-properties-attlist" combine="interleave">
+    <ref name="common-horizontal-margin-attlist"/>
+</define>
+<define name="style-table-properties-attlist" combine="interleave">
+    <ref name="common-vertical-margin-attlist"/>
+</define>
+<define name="style-table-properties-attlist" combine="interleave">
+    <ref name="common-margin-attlist"/>
+</define>
+<define name="style-table-properties-attlist" combine="interleave">
+    <ref name="common-page-number-attlist"/>
+</define>
+<define name="style-table-properties-attlist" combine="interleave">
+    <ref name="common-break-attlist"/>
+</define>
+<define name="style-table-properties-attlist" combine="interleave">
+    <ref name="common-background-color-attlist"/>
+</define>
+<define name="style-table-properties-elements" combine="interleave">
+    <ref name="style-background-image"/>
+</define>
+<define name="style-table-properties-attlist" combine="interleave">
+    <ref name="common-shadow-attlist"/>
+</define>
+<define name="style-table-properties-attlist" combine="interleave">
+    <ref name="common-keep-with-next-attlist"/>
+</define>
+<define name="style-table-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:may-break-between-rows">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-table-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:border-model">
+            <choice>
+                <value>collapsing</value>
+                <value>separating</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-table-properties-attlist" combine="interleave">
+    <ref name="common-writing-mode-attlist"/>
+</define>
+<define name="style-table-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="table:display">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-table-column-properties">
+    <element name="style:table-column-properties">
+        <ref name="style-table-column-properties-content"/>
+    </element>
+</define>
+
+<define name="style-table-column-properties-content">
+    <ref name="style-properties-content"/>
+</define>
+
+<define name="style-table-column-properties-content-strict">
+    <ref name="style-table-column-properties-attlist"/>
+    <ref name="style-table-column-properties-elements"/>
+</define>
+
+<define name="style-table-column-properties-elements">
+    <empty/>
+</define>
+<define name="style-table-column-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:column-width">
+            <ref name="positiveLength"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="style:rel-column-width">
+            <ref name="relativeLength"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-table-column-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:use-optimal-column-width">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-table-column-properties-attlist" combine="interleave">
+    <ref name="common-break-attlist"/>
+</define>
+<define name="style-table-row-properties">
+    <element name="style:table-row-properties">
+        <ref name="style-table-row-properties-content"/>
+    </element>
+</define>
+
+<define name="style-table-row-properties-content">
+    <ref name="style-properties-content"/>
+</define>
+
+<define name="style-table-row-properties-content-strict">
+    <ref name="style-table-row-properties-attlist"/>
+    <ref name="style-table-row-properties-elements"/>
+</define>
+<define name="style-table-row-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:row-height">
+            <ref name="positiveLength"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="style:min-row-height">
+            <ref name="nonNegativeLength"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-table-row-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:use-optimal-row-height">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-table-row-properties-attlist" combine="interleave">
+    <ref name="common-background-color-attlist"/>
+</define>
+<define name="style-table-row-properties-elements" combine="interleave">
+    <ref name="style-background-image"/>
+</define>
+<define name="style-table-row-properties-attlist" combine="interleave">
+    <ref name="common-break-attlist"/>
+</define>
+<define name="style-table-row-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="fo:keep-together">
+            <choice>
+                <value>auto</value>
+                <value>always</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-table-cell-properties">
+    <element name="style:table-cell-properties">
+        <ref name="style-table-cell-properties-content"/>
+    </element>
+</define>
+
+<define name="style-table-cell-properties-content">
+    <ref name="style-properties-content"/>
+</define>
+
+<define name="style-table-cell-properties-content-strict">
+    <ref name="style-table-cell-properties-attlist"/>
+    <ref name="style-table-cell-properties-elements"/>
+</define>
+<define name="style-table-cell-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:vertical-align">
+            <choice>
+                <value>top</value>
+                <value>middle</value>
+                <value>bottom</value>
+                <value>automatic</value>
+            </choice>
+            </attribute>
+    </optional>
+</define>
+<define name="style-table-cell-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:text-align-source">
+            <choice>
+                <value>fix</value>
+                <value>value-type</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-table-cell-properties-attlist" combine="interleave">
+    <ref name="common-style-direction-attlist"/>
+</define>
+
+<define name="common-style-direction-attlist">
+    <optional>
+        <attribute name="style:direction">
+            <choice>
+                <value>ltr</value>
+                <value>ttb</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-table-cell-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:glyph-orientation-vertical">
+            <choice>
+                <value>auto</value>
+                <value>0</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-table-cell-properties-attlist" combine="interleave">
+    <ref name="common-shadow-attlist"/>
+</define>
+<define name="style-table-cell-properties-attlist" combine="interleave">
+    <ref name="common-background-color-attlist"/>
+</define>
+<define name="style-table-cell-properties-elements" combine="interleave">
+    <ref name="style-background-image"/>
+</define>
+<define name="style-table-cell-properties-attlist" combine="interleave">
+    <ref name="common-border-attlist"/>
+</define>
+<define name="style-table-cell-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:diagonal-tl-br">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="style:diagonal-tl-br-widths">
+            <ref name="borderWidths"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="style:diagonal-bl-tr">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="style:diagonal-bl-tr-widths">
+            <ref name="borderWidths"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-table-cell-properties-attlist" combine="interleave">
+    <ref name="common-border-line-width-attlist"/>
+</define>
+<define name="style-table-cell-properties-attlist" combine="interleave">
+    <ref name="common-padding-attlist"/>
+</define>
+<define name="style-table-cell-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="fo:wrap-option">
+            <choice>
+                <value>no-wrap</value>
+                <value>wrap</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-table-cell-properties-attlist" combine="interleave">
+    <ref name="common-rotation-angle-attlist"/>
+</define>
+
+<define name="common-rotation-angle-attlist">
+    <optional>
+        <attribute name="style:rotation-angle">
+            <ref name="nonNegativeInteger"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-table-cell-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:rotation-align">
+            <choice>
+                <value>none</value>
+                <value>bottom</value>
+                <value>top</value>
+                <value>center</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-table-cell-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:cell-protect">
+            <choice>
+                <value>none</value>
+                <value>hidden-and-protected</value>
+                <list>
+                    <oneOrMore>
+                        <choice>
+                            <value>protected</value>
+                            <value>formula-hidden</value>
+                        </choice>
+                    </oneOrMore>
+                </list>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-table-cell-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:print-content">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-table-cell-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:decimal-places">
+            <ref name="nonNegativeInteger"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-table-cell-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:repeat-content">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-table-cell-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:shrink-to-fit">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-list-level-properties">
+    <element name="style:list-level-properties">
+        <ref name="style-list-level-properties-content"/>
+    </element>
+</define>
+
+<define name="style-list-level-properties-content">
+    <ref name="style-properties-content"/>
+</define>
+
+<define name="style-list-level-properties-content-strict">
+    <ref name="style-list-level-properties-attlist"/>
+    <ref name="style-list-level-properties-elements"/>
+</define>
+
+<define name="style-list-level-properties-elements">
+    <empty/>
+</define>
+<define name="style-list-level-properties-attlist" combine="interleave">
+    <ref name="common-text-align"/>
+</define>
+<define name="style-list-level-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="text:space-before">
+            <ref name="nonNegativeLength"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-list-level-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="text:min-label-width">
+            <ref name="nonNegativeLength"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-list-level-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="text:min-label-distance">
+            <ref name="nonNegativeLength"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-list-level-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:font-name">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-list-level-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="fo:width">
+            <ref name="positiveLength"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="fo:height">
+            <ref name="positiveLength"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-list-level-properties-attlist" combine="interleave">
+    <ref name="common-vertical-rel-attlist"/>
+    <ref name="common-vertical-pos-attlist"/>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:stroke">
+            <choice>
+                <value>none</value>
+                <value>dash</value>
+                <value>solid</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:stroke-dash">
+            <ref name="styleNameRef"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:stroke-dash-names">
+            <ref name="styleNameRefs"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="svg:stroke-width">
+            <ref name="length"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="svg:stroke-color">
+            <ref name="color"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:marker-start">
+            <ref name="styleNameRef"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:marker-end">
+            <ref name="styleNameRef"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:marker-start-width">
+            <ref name="length"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:marker-end-width">
+            <ref name="length"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:marker-start-center">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:marker-end-center">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="svg:stroke-opacity">
+            <choice>
+                <data type="double">
+                    <param name="minInclusive">0</param>
+                    <param name="maxInclusive">1</param>
+                </data>
+                <ref name="percent"/>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:stroke-linejoin">
+            <choice>
+                <value>miter</value>
+                <value>round</value>
+                <value>bevel</value>
+                <value>middle</value>
+                <value>none</value>
+                <value>inherit</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-fill-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:fill">
+            <choice>
+                <value>none</value>
+                <value>solid</value>
+                <value>bitmap</value>
+                <value>gradient</value>
+                <value>hatch</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-fill-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:fill-color">
+            <ref name="color"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-fill-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:secondary-fill-color">
+            <ref name="color"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-fill-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:fill-gradient-name">
+            <ref name="styleNameRef"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-fill-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:gradient-step-count">
+            <ref name="nonNegativeInteger"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-fill-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:fill-hatch-name">
+            <ref name="styleNameRef"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-fill-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:fill-hatch-solid">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-fill-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:fill-image-name">
+            <ref name="styleNameRef"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-fill-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:repeat">
+            <choice>
+                <value>no-repeat</value>
+                <value>repeat</value>
+                <value>stretch</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-fill-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:fill-image-width">
+            <choice>
+                <ref name="length"/>
+                <ref name="percent"/>
+            </choice>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="draw:fill-image-height">
+            <choice>
+                <ref name="length"/>
+                <ref name="percent"/>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-fill-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:fill-image-ref-point-x">
+            <ref name="percent"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="draw:fill-image-ref-point-y">
+            <ref name="percent"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="draw:fill-image-ref-point">
+            <choice>
+                <value>top-left</value>
+                <value>top</value>
+                <value>top-right</value>
+                <value>left</value>
+                <value>center</value>
+                <value>right</value>
+                <value>bottom-left</value>
+                <value>bottom</value>
+                <value>bottom-right</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-fill-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:tile-repeat-offset"/>
+    </optional>
+</define>
+<define name="style-graphic-fill-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:opacity">
+            <ref name="percent"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-fill-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:opacity-name">
+            <ref name="styleNameRef"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-fill-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="svg:fill-rule">
+            <choice>
+                <value>nonzero</value>
+                <value>evenodd</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:symbol-color">
+            <ref name="color"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="text:animation">
+            <choice>
+                <value>none</value>
+                <value>scroll</value>
+                <value>alternate</value>
+                <value>slide</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="text:animation-direction">
+            <choice>
+                <value>left</value>
+                <value>right</value>
+                <value>up</value>
+                <value>down</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="text:animation-start-inside">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="text:animation-stop-inside">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="text:animation-repeat">
+            <ref name="nonNegativeInteger"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="text:animation-delay">
+            <ref name="duration"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="text:animation-steps">
+            <ref name="length"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:auto-grow-width">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="draw:auto-grow-height">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:fit-to-size">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:fit-to-contour">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:textarea-vertical-align">
+            <choice>
+                <value>top</value>
+                <value>middle</value>
+                <value>bottom</value>
+                <value>justify</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:textarea-horizontal-align">
+            <choice>
+                <value>left</value>
+                <value>center</value>
+                <value>right</value>
+                <value>justify</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="fo:wrap-option">
+            <choice>
+                <value>no-wrap</value>
+                <value>wrap</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-elements" combine="interleave">
+    <optional>
+        <ref name="text-list-style"/>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:color-mode">
+            <choice>
+                <value>greyscale</value>
+                <value>mono</value>
+                <value>watermark</value>
+                <value>standard</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:color-inversion">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:luminance">
+            <ref name="percent"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:contrast">
+            <ref name="percent"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:gamma">
+            <ref name="percent"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:red">
+            <ref name="percent"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:green">
+            <ref name="percent"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:blue">
+            <ref name="percent"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:image-opacity">
+            <ref name="percent"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:shadow">
+            <choice>
+                <value>visible</value>
+                <value>hidden</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:shadow-offset-x">
+            <ref name="length"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="draw:shadow-offset-y">
+            <ref name="length"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:shadow-color">
+            <ref name="color"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:shadow-opacity">
+            <ref name="percent"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:start-line-spacing-horizontal">
+            <ref name="distance"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="draw:start-line-spacing-vertical">
+            <ref name="distance"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:end-line-spacing-horizontal">
+            <ref name="distance"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="draw:end-line-spacing-vertical">
+            <ref name="distance"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:line-distance">
+            <ref name="distance"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:guide-overhang">
+            <ref name="length"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:guide-distance">
+            <ref name="distance"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:start-guide">
+            <ref name="length"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:end-guide">
+            <ref name="length"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:placing">
+            <choice>
+                <value>below</value>
+                <value>above</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:parallel">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:measure-align">
+            <choice>
+                <value>automatic</value>
+                <value>left-outside</value>
+                <value>inside</value>
+                <value>right-outside</value>
+            </choice>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="draw:measure-vertical-align">
+            <choice>
+                <value>automatic</value>
+                <value>above</value>
+                <value>below</value>
+                <value>center</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:unit">
+            <choice>
+                <value>automatic</value>
+                <value>mm</value>
+                <value>cm</value>
+                <value>m</value>
+                <value>km</value>
+                <value>pt</value>
+                <value>pc</value>
+                <value>inch</value>
+                <value>ft</value>
+                <value>mi</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:show-unit">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:decimal-places">
+            <ref name="nonNegativeInteger"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:caption-type">
+            <choice>
+                <value>straight-line</value>
+                <value>angled-line</value>
+                <value>angled-connector-line</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:caption-angle-type">
+            <choice>
+                <value>fixed</value>
+                <value>free</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:caption-angle">
+            <ref name="nonNegativeInteger"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:caption-gap">
+            <ref name="distance"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:caption-escape-direction">
+            <choice>
+                <value>horizontal</value>
+                <value>vertical</value>
+                <value>auto</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:caption-escape">
+            <choice>
+                <ref name="length"/>
+                <ref name="percent"/>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:caption-line-length">
+            <ref name="length"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:caption-fit-line-length">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="dr3d:horizontal-segments">
+            <ref name="nonNegativeInteger"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="dr3d:vertical-segments">
+            <ref name="nonNegativeInteger"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="dr3d:edge-rounding">
+            <ref name="percent"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="dr3d:edge-rounding-mode">
+            <choice>
+                <value>correct</value>
+                <value>attractive</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="dr3d:back-scale">
+            <ref name="percent"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="dr3d:depth">
+            <ref name="length"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="dr3d:backface-culling">
+            <choice>
+                <value>enabled</value>
+                <value>disabled</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="dr3d:end-angle">
+            <ref name="nonNegativeInteger"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="dr3d:close-front">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="dr3d:close-back">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="dr3d:lighting-mode">
+            <choice>
+                <value>standard</value>
+                <value>double-sided</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="dr3d:normals-kind">
+            <choice>
+                <value>object</value>
+                <value>flat</value>
+                <value>sphere</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="dr3d:normals-direction">
+            <choice>
+                <value>normal</value>
+                <value>inverse</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="dr3d:texture-generation-mode-x">
+            <choice>
+                <value>object</value>
+                <value>parallel</value>
+                <value>sphere</value>
+            </choice>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="dr3d:texture-generation-mode-y">
+            <choice>
+                <value>object</value>
+                <value>parallel</value>
+                <value>sphere</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="dr3d:texture-kind">
+            <choice>
+                <value>luminance</value>
+                <value>intensity</value>
+                <value>color</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="dr3d:texture-filter">
+            <choice>
+                <value>enabled</value>
+                <value>disabled</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="dr3d:texture-mode">
+            <choice>
+                <value>replace</value>
+                <value>modulate</value>
+                <value>blend</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="dr3d:ambient-color">
+            <ref name="color"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="dr3d:emissive-color">
+            <ref name="color"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="dr3d:specular-color">
+            <ref name="color"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="dr3d:diffuse-color">
+            <ref name="color"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="dr3d:shininess">
+            <ref name="percent"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="dr3d:shadow">
+            <choice>
+                <value>visible</value>
+                <value>hidden</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <ref name="common-draw-rel-size-attlist"/>
+    <optional>
+        <attribute name="fo:min-width">
+            <choice>
+                <ref name="length"/>
+                <ref name="percent"/>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="fo:min-height">
+            <choice>
+                <ref name="length"/>
+                <ref name="percent"/>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="fo:max-height">
+            <choice>
+                <ref name="length"/>
+                <ref name="percent"/>
+            </choice>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="fo:max-width">
+            <choice>
+                <ref name="length"/>
+                <ref name="percent"/>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <ref name="common-horizontal-margin-attlist"/>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <ref name="common-vertical-margin-attlist"/>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <ref name="common-margin-attlist"/>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:print-content">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:protect">
+            <choice>
+                <value>none</value>
+                <list>
+                    <oneOrMore>
+                        <choice>
+                            <value>content</value>
+                            <value>position</value>
+                            <value>size</value>
+                        </choice>
+                    </oneOrMore>
+                </list>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:horizontal-pos">
+            <choice>
+                <value>left</value>
+                <value>center</value>
+                <value>right</value>
+                <value>from-left</value>
+                <value>inside</value>
+                <value>outside</value>
+                <value>from-inside</value>
+            </choice>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="svg:x">
+            <ref name="coordinate"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:horizontal-rel">
+            <choice>
+                    <value>page</value>
+                <value>page-content</value>
+                <value>page-start-margin</value>
+                <value>page-end-margin</value>
+                <value>frame</value>
+                <value>frame-content</value>
+                <value>frame-start-margin</value>
+                <value>frame-end-margin</value>
+                <value>paragraph</value>
+                <value>paragraph-content</value>
+                <value>paragraph-start-margin</value>
+                <value>paragraph-end-margin</value>
+                <value>char</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <ref name="common-vertical-pos-attlist"/>
+</define>
+
+<define name="common-vertical-pos-attlist">
+    <optional>
+        <attribute name="style:vertical-pos">
+            <choice>
+                <value>top</value>
+                <value>middle</value>
+                <value>bottom</value>
+                <value>from-top</value>
+                <value>below</value>
+            </choice>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="svg:y">
+            <ref name="coordinate"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <ref name="common-vertical-rel-attlist"/>
+</define>
+
+<define name="common-vertical-rel-attlist">
+    <optional>
+        <attribute name="style:vertical-rel">
+            <choice>
+                <value>page</value>
+                <value>page-content</value>
+                <value>frame</value>
+                <value>frame-content</value>
+                <value>paragraph</value>
+                <value>paragraph-content</value>
+                <value>char</value>
+                <value>line</value>
+                <value>baseline</value>
+                <value>text</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <ref name="common-text-anchor-attlist"/>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <ref name="common-border-attlist"/>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <ref name="common-border-line-width-attlist"/>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <ref name="common-padding-attlist"/>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <ref name="common-shadow-attlist"/>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <ref name="common-background-color-attlist"/>
+</define>
+<define name="style-graphic-properties-elements" combine="interleave">
+    <ref name="style-background-image"/>
+</define>
+<define name="style-graphic-properties-elements" combine="interleave">
+    <ref name="style-columns"/>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:editable">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:wrap">
+            <choice>
+                <value>none</value>
+                <value>left</value>
+                <value>right</value>
+                <value>parallel</value>
+                <value>dynamic</value>
+                <value>run-through</value>
+                <value>biggest</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:wrap-dynamic-threshold">
+            <ref name="nonNegativeLength"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:number-wrapped-paragraphs">
+            <choice>
+                <value>no-limit</value>
+                <ref name="positiveInteger"/>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:wrap-contour">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:wrap-contour-mode">
+            <choice>
+                <value>full</value>
+                <value>outside</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:run-through">
+            <choice>
+                <value>foreground</value>
+                <value>background</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:flow-with-text">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:overflow-behavior">
+            <choice>
+                <value>clip</value>
+                <value>auto-create-new-frame</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="style:mirror">
+            <choice>
+                <value>none</value>
+                <value>vertical</value>
+                <ref name="horizontal-mirror"/>
+                <list>
+                    <value>vertical</value>
+                    <ref name="horizontal-mirror"/>
+                </list>
+                <list>
+                    <ref name="horizontal-mirror"/>
+                    <value>vertical</value>
+                </list>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+
+<define name="horizontal-mirror">
+    <choice>
+        <value>horizontal</value>
+        <value>horizontal-on-odd</value>
+        <value>horizontal-on-even</value>
+    </choice>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="fo:clip">
+            <!-- The attribute value must match the one XSL's clip -->
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:wrap-influence-on-position"
+                    a:defaultValue="iterative">
+            <choice>
+                <value>iterative</value>
+                <value>once-concurrent</value>
+                <value>once-successive</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <ref name="common-writing-mode-attlist"/>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:frame-display-scrollbar">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:frame-display-border">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:frame-margin-horizontal">
+            <ref name="nonNegativePixelLength"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="draw:frame-margin-vertical">
+            <ref name="nonNegativePixelLength"/>
+        </attribute>
+    </optional>
+</define>
+
+<define name="nonNegativePixelLength">
+    <data type="string">
+        <param name="pattern">([0-9]+(\.[0-9]*)?|\.[0-9]+)(px)</param>
+    </data>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:visible-area-left">
+            <ref name="nonNegativeLength"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="draw:visible-area-top">
+            <ref name="nonNegativeLength"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="draw:visible-area-width">
+            <ref name="positiveLength"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="draw:visible-area-height">
+            <ref name="positiveLength"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-graphic-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="draw:ole-draw-aspect">
+            <ref name="nonNegativeInteger"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-chart-properties">
+    <element name="style:chart-properties">
+        <ref name="style-chart-properties-content"/>
+    </element>
+</define>
+
+<define name="style-chart-properties-content">
+    <ref name="style-properties-content"/>
+</define>
+
+<define name="style-chart-properties-content-strict">
+    <ref name="style-chart-properties-attlist"/>
+    <ref name="style-chart-properties-elements"/>
+</define>
+
+<define name="style-chart-properties-elements">
+    <empty/>
+</define>
+<define name="style-chart-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="chart:scale-text" a:defaultValue="true">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-chart-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="chart:three-dimensional">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-chart-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="chart:deep">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-chart-properties-attlist" combine="interleave">
+    <choice>
+        <attribute name="chart:symbol-type">
+            <value>none</value>
+        </attribute>
+        <attribute name="chart:symbol-type">
+            <value>automatic</value>
+        </attribute>
+        <group>
+            <attribute name="chart:symbol-type">
+                <value>named-symbol</value>
+            </attribute>
+            <attribute name="chart:symbol-name">
+                <choice>
+                    <value>square</value>
+                    <value>diamond</value>
+                    <value>arrow-down</value>
+                    <value>arrow-up</value>
+                    <value>arrow-right</value>
+                    <value>arrow-left</value>
+                    <value>bow-tie</value>
+                    <value>hourglass</value>
+                    <value>circle</value>
+                    <value>star</value>
+                    <value>x</value>
+                    <value>plus</value>
+                    <value>asterisk</value>
+                    <value>horizontal-bar</value>
+                    <value>vertical-bar</value>
+                </choice>
+            </attribute>
+        </group>
+        <group>
+            <attribute name="chart:symbol-type">
+                <value>image</value>
+            </attribute>
+            <element name="chart:symbol-image">
+                <attribute name="xlink:href">
+                    <ref name="anyURI"/>
+                </attribute>
+            </element>
+        </group>
+        <empty/>
+    </choice>
+</define>
+<define name="style-chart-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="chart:symbol-width">
+            <ref name="nonNegativeLength"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="chart:symbol-height">
+            <ref name="nonNegativeLength"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-chart-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="chart:vertical" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-chart-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="chart:connect-bars" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-chart-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="chart:gap-width">
+            <ref name="integer"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="chart:overlap">
+            <ref name="integer"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-chart-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="chart:japanese-candle-stick"
+                    a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-chart-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="chart:interpolation" a:defaultValue="none">
+            <choice>
+                <value>none</value>
+                <value>cubic-spline</value>
+                <value>b-spline</value>
+            </choice>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="chart:spline-order" a:defaultValue="2">
+            <ref name="positiveInteger"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="chart:spline-resolution" a:defaultValue="20">
+            <ref name="positiveInteger"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-chart-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="chart:pie-offset" a:defaultValue="0">
+            <ref name="nonNegativeInteger"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-chart-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="chart:lines" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-chart-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="chart:solid-type" a:defaultValue="cuboid">
+            <choice>
+                <value>cuboid</value>
+                <value>cylinder</value>
+                <value>cone</value>
+                <value>pyramid</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-chart-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="chart:stacked" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="chart:percentage" a:defaultValue="false">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-chart-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="chart:link-data-style-to-source">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-chart-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="chart:visible">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-chart-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="chart:logarithmic">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-chart-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="chart:maximum">
+            <ref name="double"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="chart:minimum">
+            <ref name="double"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="chart:origin">
+            <ref name="double"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="chart:interval-major">
+            <ref name="double"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="chart:interval-minor-divisor">
+            <ref name="positiveInteger"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-chart-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="chart:tick-marks-major-inner">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="chart:tick-marks-major-outer">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="chart:tick-marks-minor-inner">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="chart:tick-marks-minor-outer">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-chart-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="chart:display-label">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="chart:text-overlap">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="text:line-break">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="chart:label-arrangement"
+                   a:defaultValue="side-by-side">
+            <choice>
+                <value>side-by-side</value>
+                <value>stagger-even</value>
+                <value>stagger-odd</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-chart-properties-attlist" combine="interleave">
+    <ref name="common-style-direction-attlist"/>
+</define>
+<define name="style-chart-properties-attlist" combine="interleave">
+    <ref name="common-rotation-angle-attlist"/>
+</define>
+<define name="style-chart-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="chart:data-label-number">
+            <choice>
+                <value>none</value>
+                <value>value</value>
+                <value>percentage</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-chart-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="chart:data-label-text">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-chart-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="chart:data-label-symbol">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-chart-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="chart:mean-value">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-chart-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="chart:error-category" a:defaultValue="none">
+            <choice>
+                <value>none</value>
+                <value>variance</value>
+                <value>standard-deviation</value>
+                <value>percentage</value>
+                <value>error-margin</value>
+                <value>constant</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-chart-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="chart:error-percentage">
+            <ref name="double"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-chart-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="chart:error-margin">
+            <ref name="double"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-chart-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="chart:error-lower-limit">
+            <ref name="double"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="chart:error-upper-limit">
+            <ref name="double"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-chart-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="chart:error-upper-indicator">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+    <optional>
+        <attribute name="chart:error-lower-indicator">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-chart-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="chart:series-source" a:defaultValue="columns">
+            <choice>
+                <value>columns</value>
+                <value>rows</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-chart-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="chart:regression-type" a:defaultValue="none">
+            <choice>
+                <value>none</value>
+                <value>linear</value>
+                <value>logarithmic</value>
+                <value>exponential</value>
+                <value>power</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-drawing-page-properties-attlist"
+        combine="interleave">
+    <optional>
+        <attribute name="presentation:transition-type">
+            <choice>
+                <value>manual</value>
+                <value>automatic</value>
+                <value>semi-automatic</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-drawing-page-properties-attlist"
+         combine="interleave">
+    <optional>
+        <attribute name="presentation:transition-style">
+            <choice>
+                <value>none</value>
+                <value>fade-from-left</value>
+                <value>fade-from-top</value>
+                <value>fade-from-right</value>
+                <value>fade-from-bottom</value>
+                <value>fade-from-upperleft</value>
+                <value>fade-from-upperright</value>
+                <value>fade-from-lowerleft</value>
+                <value>fade-from-lowerright</value>
+                <value>move-from-left</value>
+                <value>move-from-top</value>
+                <value>move-from-right</value>
+                <value>move-from-bottom</value>
+                <value>move-from-upperleft</value>
+                <value>move-from-upperright</value>
+                <value>move-from-lowerleft</value>
+                <value>move-from-lowerright</value>
+                <value>uncover-to-left</value>
+                <value>uncover-to-top</value>
+                <value>uncover-to-right</value>    
+                <value>uncover-to-bottom</value>
+                <value>uncover-to-upperleft</value>
+                <value>uncover-to-upperright</value>
+                <value>uncover-to-lowerleft</value>
+                <value>uncover-to-lowerright</value>
+                <value>fade-to-center</value>
+                <value>fade-from-center</value>
+                <value>vertical-stripes</value>
+                <value>horizontal-stripes</value>
+                <value>clockwise</value>
+                <value>counterclockwise</value>
+                <value>open-vertical</value>
+                <value>open-horizontal</value>
+                <value>close-vertical</value>
+                <value>close-horizontal</value>
+                <value>wavyline-from-left</value>
+                <value>wavyline-from-top</value>
+                <value>wavyline-from-right</value>
+                <value>wavyline-from-bottom</value>
+                <value>spiralin-left</value>
+                <value>spiralin-right</value>
+                <value>spiralout-left</value>
+                <value>spiralout-right</value>
+                <value>roll-from-top</value>
+                <value>roll-from-left</value>
+                <value>roll-from-right</value>
+                <value>roll-from-bottom</value>
+                <value>stretch-from-left</value>
+                <value>stretch-from-top</value>
+                <value>stretch-from-right</value>
+                <value>stretch-from-bottom</value>
+
+                <value>vertical-lines</value>
+                <value>horizontal-lines</value>
+                <value>dissolve</value>
+                <value>random</value>
+                <value>vertical-checkerboard</value>
+                <value>horizontal-checkerboard</value>
+                <value>interlocking-horizontal-left</value>
+                <value>interlocking-horizontal-right</value>
+                <value>interlocking-vertical-top</value>
+                <value>interlocking-vertical-bottom</value>
+                <value>fly-away</value>
+                <value>open</value>
+                <value>close</value>
+                <value>melt</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-drawing-page-properties-attlist"
+        combine="interleave">
+    <optional>
+        <attribute name="presentation:transition-speed">
+            <ref name="presentationSpeeds"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-drawing-page-properties-attlist " combine="interleave">
+    <optional>
+        <attribute name="smil:type">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-drawing-page-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="smil:subtype">
+            <ref name="string"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-drawing-page-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="smil:direction" a:defaultValue="forward">
+            <choice>
+                <value>forward</value>
+                <value>reverse</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-drawing-page-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="smil:fadeColor">
+            <ref name="color"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-drawing-page-properties-attlist"
+        combine="interleave">
+    <optional>
+        <attribute name="presentation:duration">
+            <ref name="duration"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-drawing-page-properties-attlist"
+         combine="interleave">
+    <optional>
+        <attribute name="presentation:visibility">
+            <choice>
+                <value>visible</value>
+                <value>hidden</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-drawing-page-properties-elements"
+         combine="interleave">
+    <optional>
+        <ref name="presentation-sound"/>
+    </optional>
+</define>
+<define name="style-drawing-page-properties-attlist"
+         combine="interleave">
+    <optional>
+        <attribute name="draw:background-size">
+            <choice>
+                <value>full</value>
+                <value>border</value>
+            </choice>
+        </attribute>
+    </optional>
+</define>
+<define name="style-drawing-page-properties-attlist"
+         combine="interleave">
+    <optional>
+        <attribute name="presentation:background-objects-visible">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-drawing-page-properties-attlist"
+         combine="interleave">
+    <optional>
+        <attribute name="presentation:background-visible">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-drawing-page-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="presentation:display-header">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-drawing-page-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="presentation:display-footer">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-drawing-page-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="presentation:display-page-number">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="style-drawing-page-properties-attlist" combine="interleave">
+    <optional>
+        <attribute name="presentation:display-date-time">
+            <ref name="boolean"/>
+        </attribute>
+    </optional>
+</define>
+<define name="string">
+    <data type="string"/>
+</define>
+<define name="date">
+    <data type="date"/>
+</define>
+<define name="time">
+    <data type="time"/>
+</define>
+<define name="dateTime">
+    <data type="dateTime"/>
+</define>
+<define name="duration">
+    <data type="duration"/>
+</define>
+<define name="integer">
+    <data type="integer"/>
+</define>
+<define name="nonNegativeInteger">
+    <data type="nonNegativeInteger"/>
+</define>
+<define name="positiveInteger">
+    <data type="positiveInteger"/>
+</define>
+<define name="double">
+    <data type="double"/>
+</define>
+<define name="anyURI">
+    <data type="anyURI"/>
+</define>
+<define name="base64Binary">
+    <data type="base64Binary"/>
+</define>
+<define name="ID">
+    <data type="ID"/>
+</define>
+<define name="IDREF">
+    <data type="IDREF"/>
+</define>
+<define name="IDREFS">
+    <data type="IDREFS"/>
+</define>
+<define name="boolean">
+    <choice>
+        <value>true</value>
+        <value>false</value>
+    </choice>
+</define>
+<define name="dateOrDateTime">
+    <choice>
+        <data type="date"/>
+        <data type="dateTime"/>
+    </choice>
+</define>
+<define name="timeOrDateTime">
+    <choice>
+        <data type="time"/>
+        <data type="dateTime"/>
+    </choice>
+</define>
+<define name="language">
+    <data type="language"/>
+</define>
+<define name="countryCode">
+    <data type="token">
+        <param name="pattern">[A-Za-z0-9]{1,8}</param>
+    </data>
+</define>
+<define name="languageCode">
+    <data type="token">
+        <param name="pattern">[A-Za-z]{1,8}</param>
+    </data>
+</define>
+<define name="character">
+    <data type="string">
+        <param name="length">1</param>
+    </data>
+</define>
+<define name="length">
+    <data type="string">
+        <param name="pattern">-?([0-9]+(\.[0-9]*)?|\.[0-9]+)((cm)|(mm)|(in)|(pt)|(pc)|(px))</param>
+
+    </data>
+</define>
+<define name="nonNegativeLength">
+    <data type="string">
+        <param name="pattern">([0-9]+(\.[0-9]*)?|\.[0-9]+)((cm)|(mm)|(in)|(pt)|(pc)|(px))</param>
+
+    </data>
+</define>
+<define name="positiveLength">
+    <data type="string">
+        <param name="pattern">([0-9]*[1-9][0-9]*(\.[0-9]*)?|0+\.[0-9]*[1-9][0-9]*|\.[0-9]*[1-9][0-9]*)((cm)|(mm)|(in)|(pt)|(pc)|(px))</param>
+
+    </data>
+</define>
+<define name="percent">
+    <data type="string">
+        <param name="pattern">-?([0-9]+(\.[0-9]*)?|\.[0-9]+)%</param>
+    </data>
+</define>
+<define name="relativeLength">
+    <data type="string">
+        <param name="pattern">[0-9]+\*</param>
+    </data>
+</define>
+<define name="coordinate">
+    <ref name="length"/>
+</define>
+<define name="distance">
+    <ref name="length"/>
+</define>
+<define name="color">
+    <data type="string">
+        <param name="pattern">#[0-9a-fA-F]{6}</param>
+    </data>
+</define>
+<define name="styleName">
+    <data type="NCName"/>
+</define>
+<define name="styleNameRef">
+    <choice>
+        <data type="NCName"/>
+        <empty/>
+    </choice>
+</define>
+<define name="styleNameRefs">
+    <list>
+        <zeroOrMore>
+            <data type="NCName"/>
+        </zeroOrMore>
+    </list>
+</define>
+<define name="variableName">
+    <data type="string"/>
+</define>
+<define name="formula">
+    <!-- A formula should start with a namespace prefix, -->
+    <!-- but has no restrictions-->
+    <data type="string"/>
+</define>
+
+<define name="targetFrameName">
+    <choice>
+        <value>_self</value>
+        <value>_blank</value>
+        <value>_parent</value>
+        <value>_top</value>
+        <ref name="string"/>
+    </choice>
+</define>
+
+<define name="valueType">
+    <choice>
+        <value>float</value>
+        <value>time</value>
+        <value>date</value>
+        <value>percentage</value>
+        <value>currency</value>
+        <value>boolean</value>
+        <value>string</value>
+    </choice>
+</define>
+
+<define name="points">
+    <data type="string">
+        <param name="pattern">-?[0-9]+,-?[0-9]+([ ]+-?[0-9]+,-?[0-9]+)*</param>
+    </data>
+</define>
+<define name="pathData">
+    <data type="string"/>
+</define>
+
+<define name="vector3D">
+    <data type="string">
+        <param name="pattern">\([ ]*-?([0-9]+(\.[0-9]*)?|\.[0-9]+)([ ]+-?([0-9]+(\.[0-9]*)?|\.[0-9]+)){2}[ ]*\)</param>
+
+    </data>
+</define>
+
+<define name="namespacedToken">
+    <data type="string">
+        <param name="pattern">[0-9a-zA-Z_]+:[0-9a-zA-Z._\-]+</param>
+    </data>
+</define>
+<define name="anyAttListOrElements">
+    <zeroOrMore>
+        <attribute>
+            <anyName/>
+            <text/>
+        </attribute>
+    </zeroOrMore>
+    <ref name="anyElements"/>
+</define>
+<define name="anyElements">
+    <zeroOrMore>
+        <element>
+            <anyName/>
+            <mixed>
+                <ref name="anyAttListOrElements"/>
+            </mixed>
+        </element>
+    </zeroOrMore>
+</define>
+</grammar>
diff --git a/apps/files_odfviewer/src/webodf/programs/docnosis/OpenDocument-strict-schema-v1.0-os.rng b/apps/files_odfviewer/src/webodf/programs/docnosis/OpenDocument-strict-schema-v1.0-os.rng
new file mode 100644
index 0000000000..aa761dc880
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/programs/docnosis/OpenDocument-strict-schema-v1.0-os.rng
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    OASIS OpenDocument v1.0
+    OASIS Standard, 1 May 2005
+    Strict Relax-NG Schema
+
+    $Id$
+
+    © 2002-2005 OASIS Open
+    © 1999-2005 Sun Microsystems, Inc.
+-->
+
+<grammar xmlns="http://relaxng.org/ns/structure/1.0">
+    <include href="OpenDocument-schema-v1.0-os.rng">
+        <define name="office-meta-content">
+            <ref name="office-meta-content-strict"/>
+        </define>
+        <define name="style-page-layout-properties-content">
+            <ref name="style-page-layout-properties-content-strict"/>
+        </define>
+        <define name="style-header-footer-properties-content">
+            <ref name="style-header-footer-properties-content-strict"/>
+        </define>
+        <define name="style-drawing-page-properties-content">
+            <ref name="style-drawing-page-properties-content-strict"/>
+        </define>
+        <define name="style-text-properties-content">
+            <ref name="style-text-properties-content-strict"/>
+        </define>
+        <define name="style-paragraph-properties-content">
+            <ref name="style-paragraph-properties-content-strict"/>
+        </define>
+        <define name="style-ruby-properties-content">
+            <ref name="style-ruby-properties-content-strict"/>
+        </define>
+        <define name="style-section-properties-content">
+            <ref name="style-section-properties-content-strict"/>
+        </define>
+        <define name="style-list-level-properties-content">
+            <ref name="style-list-level-properties-content-strict"/>
+        </define>
+        <define name="style-table-properties-content">
+            <ref name="style-table-properties-content-strict"/>
+        </define>
+        <define name="style-table-column-properties-content">
+            <ref name="style-table-column-properties-content-strict"/>
+        </define>
+        <define name="style-table-row-properties-content">
+            <ref name="style-table-row-properties-content-strict"/>
+        </define>
+        <define name="style-table-cell-properties-content">
+            <ref name="style-table-cell-properties-content-strict"/>
+        </define>
+        <define name="style-graphic-properties-content">
+            <ref name="style-graphic-properties-content-strict"/>
+        </define>
+        <define name="style-chart-properties-content">
+            <ref name="style-properties-content"/>
+        </define>
+    </include>
+</grammar>
diff --git a/apps/files_odfviewer/src/webodf/programs/docnosis/OpenDocument-strict-schema-v1.1.rng b/apps/files_odfviewer/src/webodf/programs/docnosis/OpenDocument-strict-schema-v1.1.rng
new file mode 100644
index 0000000000..e77fe4ba6e
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/programs/docnosis/OpenDocument-strict-schema-v1.1.rng
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    OASIS OpenDocument v1.1
+    OASIS Standard, 1 Feb 2007
+    Strict Relax-NG Schema
+
+    $Id$
+
+    © 2002-2007 OASIS Open
+    © 1999-2007 Sun Microsystems, Inc.
+-->
+
+<grammar xmlns="http://relaxng.org/ns/structure/1.0">
+    <include href="OpenDocument-schema-v1.1.rng">
+        <define name="office-meta-content">
+            <ref name="office-meta-content-strict"/>
+        </define>
+        <define name="style-page-layout-properties-content">
+            <ref name="style-page-layout-properties-content-strict"/>
+        </define>
+        <define name="style-header-footer-properties-content">
+            <ref name="style-header-footer-properties-content-strict"/>
+        </define>
+        <define name="style-drawing-page-properties-content">
+            <ref name="style-drawing-page-properties-content-strict"/>
+        </define>
+        <define name="style-text-properties-content">
+            <ref name="style-text-properties-content-strict"/>
+        </define>
+        <define name="style-paragraph-properties-content">
+            <ref name="style-paragraph-properties-content-strict"/>
+        </define>
+        <define name="style-ruby-properties-content">
+            <ref name="style-ruby-properties-content-strict"/>
+        </define>
+        <define name="style-section-properties-content">
+            <ref name="style-section-properties-content-strict"/>
+        </define>
+        <define name="style-list-level-properties-content">
+            <ref name="style-list-level-properties-content-strict"/>
+        </define>
+        <define name="style-table-properties-content">
+            <ref name="style-table-properties-content-strict"/>
+        </define>
+        <define name="style-table-column-properties-content">
+            <ref name="style-table-column-properties-content-strict"/>
+        </define>
+        <define name="style-table-row-properties-content">
+            <ref name="style-table-row-properties-content-strict"/>
+        </define>
+        <define name="style-table-cell-properties-content">
+            <ref name="style-table-cell-properties-content-strict"/>
+        </define>
+        <define name="style-graphic-properties-content">
+            <ref name="style-graphic-properties-content-strict"/>
+        </define>
+        <define name="style-chart-properties-content">
+            <ref name="style-chart-properties-content-strict"/>
+        </define>
+    </include>
+</grammar>
diff --git a/apps/files_odfviewer/src/webodf/programs/docnosis/OpenDocument-v1.2-cos01-dsig-schema.rng b/apps/files_odfviewer/src/webodf/programs/docnosis/OpenDocument-v1.2-cos01-dsig-schema.rng
new file mode 100644
index 0000000000..bb2e591d86
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/programs/docnosis/OpenDocument-v1.2-cos01-dsig-schema.rng
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+        Open Document Format for Office Applications (OpenDocument) Version 1.2
+        Candidate OASIS Standard (COS) 01, 10 May 2011
+	Digital Signatures Relax-NG Schema
+        Source: http://docs.oasis-open.org/office/v1.2/cos01/
+        Copyright (c) OASIS Open 2002-2011. All Rights Reserved.
+
+	All capitalized terms in the following text have the meanings assigned to them
+   	in the OASIS Intellectual Property Rights Policy (the "OASIS IPR Policy"). The
+	full Policy may be found at the OASIS website.
+
+	This document and translations of it may be copied and furnished to others, and
+	derivative works that comment on or otherwise explain it or assist in its
+	implementation may be prepared, copied, published, and distributed, in whole or
+	in part, without restriction of any kind, provided that the above copyright
+	notice and this section are included on all such copies and derivative works.
+	However, this document itself may not be modified in any way, including by
+	removing the copyright notice or references to OASIS, except as needed for the
+	purpose of developing any document or deliverable produced by an OASIS
+	Technical Committee (in which case the rules applicable to copyrights, as set
+	forth in the OASIS IPR Policy, must be followed) or as required to translate it
+	into languages other than English.
+
+	The limited permissions granted above are perpetual and will not be revoked by
+	OASIS or its successors or assigns.
+
+	This document and the information contained herein is provided on an "AS IS"
+	basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT
+	LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT
+	INFRINGE ANY OWNERSHIP RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR
+	FITNESS FOR A PARTICULAR PURPOSE. 
+-->
+
+<grammar
+	xmlns="http://relaxng.org/ns/structure/1.0"
+
+	datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
+
+	xmlns:dsig="urn:oasis:names:tc:opendocument:xmlns:digitalsignature:1.0"
+	xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
+>
+<start>
+	<choice>
+		<ref name="dsig-document-signatures"/>
+	</choice>
+</start>
+<define name="dsig-document-signatures">
+	<element name="dsig:document-signatures">
+		<ref name="dsig-document-signatures-attlist"/>
+		<oneOrMore>
+			<ref name="ds-signature"/>
+		</oneOrMore>
+	</element>
+</define>
+<define name="dsig-document-signatures-attlist">
+	<attribute name="dsig:version">
+		<value>1.2</value>
+	</attribute>
+</define>
+<define name="ds-signature">
+	<element name="ds:Signature">
+		<!-- The permitted content of this element is the permitted -->
+		<!-- content of the Signature element defined by W3C XML    -->
+		<!-- Signature Syntax and Processing (Second Edition).      -->
+		<!-- See OpenDocument v1.2 part 3, section 4.3.             -->
+		<ref name="dsMarkup"/>
+	</element>
+</define>
+<define name="dsMarkup">
+	<zeroOrMore>
+		<choice>
+			<attribute>
+				<anyName/>
+			</attribute>
+			<text/>
+			<element>
+				<anyName/>
+				<ref name="dsMarkup"/>
+			</element>
+		</choice>
+	</zeroOrMore>
+</define>
+</grammar>
diff --git a/apps/files_odfviewer/src/webodf/programs/docnosis/OpenDocument-v1.2-cos01-manifest-schema.rng b/apps/files_odfviewer/src/webodf/programs/docnosis/OpenDocument-v1.2-cos01-manifest-schema.rng
new file mode 100644
index 0000000000..8902970eec
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/programs/docnosis/OpenDocument-v1.2-cos01-manifest-schema.rng
@@ -0,0 +1,224 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+        Open Document Format for Office Applications (OpenDocument) Version 1.2
+        Candidate OASIS Standard (COS) 01, 10 May 2011
+	Manifest Relax-NG Schema
+        Source: http://docs.oasis-open.org/office/v1.2/cos01/
+        Copyright (c) OASIS Open 2002-2011. All Rights Reserved.
+
+	All capitalized terms in the following text have the meanings assigned to them
+   	in the OASIS Intellectual Property Rights Policy (the "OASIS IPR Policy"). The
+	full Policy may be found at the OASIS website.
+
+	This document and translations of it may be copied and furnished to others, and
+	derivative works that comment on or otherwise explain it or assist in its
+	implementation may be prepared, copied, published, and distributed, in whole or
+	in part, without restriction of any kind, provided that the above copyright
+	notice and this section are included on all such copies and derivative works.
+	However, this document itself may not be modified in any way, including by
+	removing the copyright notice or references to OASIS, except as needed for the
+	purpose of developing any document or deliverable produced by an OASIS
+	Technical Committee (in which case the rules applicable to copyrights, as set
+	forth in the OASIS IPR Policy, must be followed) or as required to translate it
+	into languages other than English.
+
+	The limited permissions granted above are perpetual and will not be revoked by
+	OASIS or its successors or assigns.
+
+	This document and the information contained herein is provided on an "AS IS"
+	basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT
+	LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT
+	INFRINGE ANY OWNERSHIP RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR
+	FITNESS FOR A PARTICULAR PURPOSE. 
+-->
+<grammar 
+	xmlns="http://relaxng.org/ns/structure/1.0"
+
+	datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
+
+	xmlns:manifest="urn:oasis:names:tc:opendocument:xmlns:manifest:1.0"
+>
+<start>
+	<choice>
+		<ref name="manifest"/>
+	</choice>
+</start>
+<define name="manifest">
+	<element name="manifest:manifest">
+		<ref name="manifest-attlist"/>
+		<oneOrMore>
+			<ref name="file-entry"/>
+		</oneOrMore>
+	</element>
+</define>
+<define name="manifest-attlist">
+	<attribute name="manifest:version">
+		<value>1.2</value>
+	</attribute>
+</define>
+<define name="file-entry">
+	<element name="manifest:file-entry">
+		<ref name="file-entry-attlist"/>
+		<optional>
+			<ref name="encryption-data"/>
+		</optional>
+	</element>
+</define>
+<define name="file-entry-attlist">
+  <interleave>
+	<attribute name="manifest:full-path">
+		<ref name="string"/>
+	</attribute>
+	<optional>
+		<attribute name="manifest:size">
+			<ref name="nonNegativeInteger"/>
+		</attribute>
+	</optional>
+	<attribute name="manifest:media-type">
+		<ref name="string"/>
+	</attribute>
+	<optional>
+		<attribute name="manifest:preferred-view-mode">
+			<choice>
+				<value>edit</value>
+				<value>presentation-slide-show</value>
+				<value>read-only</value>
+				<ref name="namespacedToken"/> 
+			</choice> 
+		</attribute> 
+	</optional> 
+	<optional>
+		<attribute name="manifest:version">
+			<ref name="string"/>
+		</attribute>
+	</optional>
+  </interleave>
+</define>
+
+<define name="encryption-data">
+	<element name="manifest:encryption-data">
+		<ref name="encryption-data-attlist"/>
+		<ref name="algorithm"/>
+		<optional>
+			<ref name="start-key-generation"/>
+		</optional>
+		<ref name="key-derivation"/>
+	</element>
+</define>
+<define name="encryption-data-attlist">
+  <interleave>
+	<attribute name="manifest:checksum-type">
+		<choice>
+			<value>SHA1/1K</value>
+			<ref name="anyURI"/>
+		</choice>
+	</attribute>
+	<attribute name="manifest:checksum">
+		<ref name="base64Binary"/>
+	</attribute>
+  </interleave>
+</define>
+<define name="algorithm">
+	<element name="manifest:algorithm">
+		<ref name="algorithm-attlist"/>
+		<ref name="anyElements"/>
+	</element>
+</define>
+<define name="algorithm-attlist">
+  <interleave>
+	<attribute name="manifest:algorithm-name">
+		<choice>
+			<value>Blowfish CFB</value>
+			<ref name="anyURI"/>
+		</choice>
+	</attribute>
+	<attribute name="manifest:initialisation-vector">
+		<ref name="base64Binary"/>
+	</attribute>
+  </interleave>
+</define>
+<define name="anyAttListOrElements">
+	<zeroOrMore>
+		<attribute>
+			<anyName/>
+			<text/>
+		</attribute>
+	</zeroOrMore>
+	<ref name="anyElements"/>
+</define>
+<define name="anyElements">
+	<zeroOrMore>
+		<element>
+			<anyName/>
+			<mixed>
+				<ref name="anyAttListOrElements"/>
+			</mixed>
+		</element>
+	</zeroOrMore>
+</define>
+<define name="key-derivation">
+	<element name="manifest:key-derivation">
+		<ref name="key-derivation-attlist"/>
+		<empty/>
+	</element>
+</define>
+<define name="key-derivation-attlist">
+  <interleave>
+	<attribute name="manifest:key-derivation-name">
+		<choice>
+			<value>PBKDF2</value>
+			<ref name="anyURI"/>
+		</choice>
+	</attribute>
+	<attribute name="manifest:salt">
+		<ref name="base64Binary"/>
+	</attribute>
+	<attribute name="manifest:iteration-count">
+			<ref name="nonNegativeInteger"/>
+		</attribute>
+	<optional>
+		<attribute name="manifest:key-size">
+			<ref name="nonNegativeInteger"/>
+		</attribute>
+	</optional>
+  </interleave>
+</define>
+<define name="start-key-generation">
+	<element name="manifest:start-key-generation">
+		<ref name="start-key-generation-attlist"/>
+		<empty/>
+	</element>
+</define>
+<define name="start-key-generation-attlist">
+  <interleave>
+	<attribute name="manifest:start-key-generation-name">
+		<choice>
+			<value>SHA1</value>
+			<ref name="anyURI"/>
+		</choice>
+	</attribute>
+	<optional>
+		<attribute name="manifest:key-size">
+			<ref name="nonNegativeInteger"/>
+		</attribute>
+	</optional>
+  </interleave>
+</define>
+<define name="base64Binary">
+	<data type="base64Binary"/>
+</define>
+<define name="namespacedToken">
+	<data type="QName">
+		<param name="pattern">[^:]+:[^:]+</param>
+	</data>
+</define>
+<define name="nonNegativeInteger">
+	<data type="nonNegativeInteger"/>
+</define>
+<define name="string">
+	<data type="string"/>
+</define>
+<define name="anyURI">
+	<data type="anyURI"/>
+</define>
+</grammar>
diff --git a/apps/files_odfviewer/src/webodf/programs/docnosis/OpenDocument-v1.2-cos01-schema.rng b/apps/files_odfviewer/src/webodf/programs/docnosis/OpenDocument-v1.2-cos01-schema.rng
new file mode 100644
index 0000000000..bd57af13f7
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/programs/docnosis/OpenDocument-v1.2-cos01-schema.rng
@@ -0,0 +1,18127 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+        Open Document Format for Office Applications (OpenDocument) Version 1.2
+        Candidate OASIS Standard (COS) 01, 10 May 2011
+	Relax-NG Schema
+        Source: http://docs.oasis-open.org/office/v1.2/cos01/
+        Copyright (c) OASIS Open 2002-2011. All Rights Reserved.
+
+	All capitalized terms in the following text have the meanings assigned to them
+	in the OASIS Intellectual Property Rights Policy (the "OASIS IPR Policy"). The
+	full Policy may be found at the OASIS website.
+
+	This document and translations of it may be copied and furnished to others, and
+	derivative works that comment on or otherwise explain it or assist in its
+	implementation may be prepared, copied, published, and distributed, in whole or
+	in part, without restriction of any kind, provided that the above copyright
+	notice and this section are included on all such copies and derivative works.
+	However, this document itself may not be modified in any way, including by
+	removing the copyright notice or references to OASIS, except as needed for the
+	purpose of developing any document or deliverable produced by an OASIS
+	Technical Committee (in which case the rules applicable to copyrights, as set
+	forth in the OASIS IPR Policy, must be followed) or as required to translate it
+	into languages other than English.
+
+	The limited permissions granted above are perpetual and will not be revoked by
+	OASIS or its successors or assigns.
+
+	This document and the information contained herein is provided on an "AS IS"
+	basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT
+	LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT
+	INFRINGE ANY OWNERSHIP RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR
+	FITNESS FOR A PARTICULAR PURPOSE. 
+-->
+<grammar
+	xmlns="http://relaxng.org/ns/structure/1.0"
+
+	datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
+
+	xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
+	xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0"
+	xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0"
+	xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
+	xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0"
+	xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
+	xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0"
+	xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0"
+	xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
+	xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0"
+	xmlns:db="urn:oasis:names:tc:opendocument:xmlns:database:1.0"
+	xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0"
+	xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
+	xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0"
+	xmlns:anim="urn:oasis:names:tc:opendocument:xmlns:animation:1.0"
+
+	xmlns:dc="http://purl.org/dc/elements/1.1/"
+	xmlns:xlink="http://www.w3.org/1999/xlink"
+	xmlns:math="http://www.w3.org/1998/Math/MathML"
+	xmlns:xforms="http://www.w3.org/2002/xforms"
+	xmlns:grddl="http://www.w3.org/2003/g/data-view#"
+	xmlns:xhtml="http://www.w3.org/1999/xhtml"
+
+	xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0"
+	xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0"
+	xmlns:smil="urn:oasis:names:tc:opendocument:xmlns:smil-compatible:1.0"
+>
+	<define name="office-process-content">
+		<optional>
+			<attribute name="office:process-content">
+				<ref name="boolean"/>
+			</attribute>
+		</optional>
+	</define>
+	<start>
+		<choice>
+			<ref name="office-document"/>
+			<ref name="office-document-content"/>
+			<ref name="office-document-styles"/>
+			<ref name="office-document-meta"/>
+			<ref name="office-document-settings"/>
+		</choice>
+	</start>
+	<define name="office-document">
+		<element name="office:document">
+			<ref name="office-document-attrs"/>
+			<ref name="office-document-common-attrs"/>
+			<ref name="office-meta"/>
+			<ref name="office-settings"/>
+			<ref name="office-scripts"/>
+			<ref name="office-font-face-decls"/>
+			<ref name="office-styles"/>
+			<ref name="office-automatic-styles"/>
+			<ref name="office-master-styles"/>
+			<ref name="office-body"/>
+		</element>
+	</define>
+	<define name="office-document-content">
+		<element name="office:document-content">
+			<ref name="office-document-common-attrs"/>
+			<ref name="office-scripts"/>
+			<ref name="office-font-face-decls"/>
+			<ref name="office-automatic-styles"/>
+			<ref name="office-body"/>
+		</element>
+	</define>
+	<define name="office-document-styles">
+		<element name="office:document-styles">
+			<ref name="office-document-common-attrs"/>
+			<ref name="office-font-face-decls"/>
+			<ref name="office-styles"/>
+			<ref name="office-automatic-styles"/>
+			<ref name="office-master-styles"/>
+		</element>
+	</define>
+	<define name="office-document-meta">
+		<element name="office:document-meta">
+			<ref name="office-document-common-attrs"/>
+			<ref name="office-meta"/>
+		</element>
+	</define>
+	<define name="office-document-settings">
+		<element name="office:document-settings">
+			<ref name="office-document-common-attrs"/>
+			<ref name="office-settings"/>
+		</element>
+	</define>
+	<define name="office-document-common-attrs">
+		<interleave>
+			<attribute name="office:version">
+				<value>1.2</value>
+			</attribute>
+			<optional>
+				<attribute name="grddl:transformation">
+					<list>
+						<zeroOrMore>
+							<ref name="anyIRI"/>
+						</zeroOrMore>
+					</list>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="office-document-attrs">
+		<attribute name="office:mimetype">
+			<ref name="string"/>
+		</attribute>
+	</define>
+	<define name="office-meta">
+		<optional>
+			<element name="office:meta">
+				<ref name="office-meta-content-strict"/>
+			</element>
+		</optional>
+	</define>
+	<define name="office-meta-content-strict">
+		<zeroOrMore>
+			<ref name="office-meta-data"/>
+		</zeroOrMore>
+	</define>
+	<define name="office-body">
+		<element name="office:body">
+			<ref name="office-body-content"/>
+		</element>
+	</define>
+	<define name="office-body-content">
+		<choice>
+			<element name="office:text">
+				<ref name="office-text-attlist"/>
+				<ref name="office-text-content-prelude"/>
+				<ref name="office-text-content-main"/>
+				<ref name="office-text-content-epilogue"/>
+			</element>
+			<element name="office:drawing">
+				<ref name="office-drawing-attlist"/>
+				<ref name="office-drawing-content-prelude"/>
+				<ref name="office-drawing-content-main"/>
+				<ref name="office-drawing-content-epilogue"/>
+			</element>
+			<element name="office:presentation">
+				<ref name="office-presentation-attlist"/>
+				<ref name="office-presentation-content-prelude"/>
+				<ref name="office-presentation-content-main"/>
+				<ref name="office-presentation-content-epilogue"/>
+			</element>
+			<element name="office:spreadsheet">
+				<ref name="office-spreadsheet-attlist"/>
+				<ref name="office-spreadsheet-content-prelude"/>
+				<ref name="office-spreadsheet-content-main"/>
+				<ref name="office-spreadsheet-content-epilogue"/>
+			</element>
+			<element name="office:chart">
+				<ref name="office-chart-attlist"/>
+				<ref name="office-chart-content-prelude"/>
+				<ref name="office-chart-content-main"/>
+				<ref name="office-chart-content-epilogue"/>
+			</element>
+			<element name="office:image">
+				<ref name="office-image-attlist"/>
+				<ref name="office-image-content-prelude"/>
+				<ref name="office-image-content-main"/>
+				<ref name="office-image-content-epilogue"/>
+			</element>
+			<ref name="office-database"/>
+		</choice>
+	</define>
+	<define name="office-text-content-prelude">
+		<ref name="office-forms"/>
+		<ref name="text-tracked-changes"/>
+		<ref name="text-decls"/>
+		<ref name="table-decls"/>
+	</define>
+	<define name="office-text-content-main">
+		<choice>
+			<zeroOrMore>
+				<ref name="text-content"/>
+			</zeroOrMore>
+			<group>
+				<ref name="text-page-sequence"/>
+				<zeroOrMore>
+					<choice>
+						<ref name="shape"/>
+					</choice>
+				</zeroOrMore>
+			</group>
+		</choice>
+	</define>
+	<define name="text-content">
+		<choice>
+			<ref name="text-h"/>
+			<ref name="text-p"/>
+			<ref name="text-list"/>
+			<ref name="text-numbered-paragraph"/>
+			<ref name="table-table"/>
+			<ref name="text-section"/>
+			<ref name="text-soft-page-break"/>
+			<ref name="text-table-of-content"/>
+			<ref name="text-illustration-index"/>
+			<ref name="text-table-index"/>
+			<ref name="text-object-index"/>
+			<ref name="text-user-index"/>
+			<ref name="text-alphabetical-index"/>
+			<ref name="text-bibliography"/>
+			<ref name="shape"/>
+			<ref name="change-marks"/>
+		</choice>
+	</define>
+	<define name="office-text-content-epilogue">
+		<ref name="table-functions"/>
+	</define>
+	<define name="office-text-attlist">
+		<interleave>
+			<optional>
+				<attribute name="text:global">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="text:use-soft-page-breaks">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="office-drawing-attlist">
+		<empty/>
+	</define>
+	<define name="office-drawing-content-prelude">
+		<ref name="text-decls"/>
+		<ref name="table-decls"/>
+	</define>
+	<define name="office-drawing-content-main">
+		<zeroOrMore>
+			<ref name="draw-page"/>
+		</zeroOrMore>
+	</define>
+	<define name="office-drawing-content-epilogue">
+		<ref name="table-functions"/>
+	</define>
+	<define name="office-presentation-attlist">
+		<empty/>
+	</define>
+	<define name="office-presentation-content-prelude">
+		<ref name="text-decls"/>
+		<ref name="table-decls"/>
+		<ref name="presentation-decls"/>
+	</define>
+	<define name="office-presentation-content-main">
+		<zeroOrMore>
+			<ref name="draw-page"/>
+		</zeroOrMore>
+	</define>
+	<define name="office-presentation-content-epilogue">
+		<ref name="presentation-settings"/>
+		<ref name="table-functions"/>
+	</define>
+	<define name="office-spreadsheet-content-prelude">
+		<optional>
+			<ref name="table-tracked-changes"/>
+		</optional>
+		<ref name="text-decls"/>
+		<ref name="table-decls"/>
+	</define>
+	<define name="table-decls">
+		<optional>
+			<ref name="table-calculation-settings"/>
+		</optional>
+		<optional>
+			<ref name="table-content-validations"/>
+		</optional>
+		<optional>
+			<ref name="table-label-ranges"/>
+		</optional>
+	</define>
+	<define name="office-spreadsheet-content-main">
+		<zeroOrMore>
+			<ref name="table-table"/>
+		</zeroOrMore>
+	</define>
+	<define name="office-spreadsheet-content-epilogue">
+		<ref name="table-functions"/>
+	</define>
+	<define name="table-functions">
+		<optional>
+			<ref name="table-named-expressions"/>
+		</optional>
+		<optional>
+			<ref name="table-database-ranges"/>
+		</optional>
+		<optional>
+			<ref name="table-data-pilot-tables"/>
+		</optional>
+		<optional>
+			<ref name="table-consolidation"/>
+		</optional>
+		<optional>
+			<ref name="table-dde-links"/>
+		</optional>
+	</define>
+	<define name="office-chart-attlist">
+		<empty/>
+	</define>
+	<define name="office-chart-content-prelude">
+		<ref name="text-decls"/>
+		<ref name="table-decls"/>
+	</define>
+	<define name="office-chart-content-main">
+		<ref name="chart-chart"/>
+	</define>
+	<define name="office-chart-content-epilogue">
+		<ref name="table-functions"/>
+	</define>
+	<define name="office-image-attlist">
+		<empty/>
+	</define>
+	<define name="office-image-content-prelude">
+		<empty/>
+	</define>
+	<define name="office-image-content-main">
+		<ref name="draw-frame"/>
+	</define>
+	<define name="office-image-content-epilogue">
+		<empty/>
+	</define>
+	<define name="office-settings">
+		<optional>
+			<element name="office:settings">
+				<oneOrMore>
+					<ref name="config-config-item-set"/>
+				</oneOrMore>
+			</element>
+		</optional>
+	</define>
+	<define name="config-config-item-set">
+		<element name="config:config-item-set">
+			<ref name="config-config-item-set-attlist"/>
+			<ref name="config-items"/>
+		</element>
+	</define>
+	<define name="config-items">
+		<oneOrMore>
+			<choice>
+				<ref name="config-config-item"/>
+				<ref name="config-config-item-set"/>
+				<ref name="config-config-item-map-named"/>
+				<ref name="config-config-item-map-indexed"/>
+			</choice>
+		</oneOrMore>
+	</define>
+	<define name="config-config-item-set-attlist">
+		<attribute name="config:name">
+			<ref name="string"/>
+		</attribute>
+	</define>
+	<define name="config-config-item">
+		<element name="config:config-item">
+			<ref name="config-config-item-attlist"/>
+			<text/>
+		</element>
+	</define>
+	<define name="config-config-item-attlist">
+		<interleave>
+			<attribute name="config:name">
+				<ref name="string"/>
+			</attribute>
+			<attribute name="config:type">
+				<choice>
+					<value>boolean</value>
+					<value>short</value>
+					<value>int</value>
+					<value>long</value>
+					<value>double</value>
+					<value>string</value>
+					<value>datetime</value>
+					<value>base64Binary</value>
+				</choice>
+			</attribute>
+		</interleave>
+	</define>
+	<define name="config-config-item-map-indexed">
+		<element name="config:config-item-map-indexed">
+			<ref name="config-config-item-map-indexed-attlist"/>
+			<oneOrMore>
+				<ref name="config-config-item-map-entry"/>
+			</oneOrMore>
+		</element>
+	</define>
+	<define name="config-config-item-map-indexed-attlist">
+		<attribute name="config:name">
+			<ref name="string"/>
+		</attribute>
+	</define>
+	<define name="config-config-item-map-entry">
+		<element name="config:config-item-map-entry">
+			<ref name="config-config-item-map-entry-attlist"/>
+			<ref name="config-items"/>
+		</element>
+	</define>
+	<define name="config-config-item-map-entry-attlist">
+		<optional>
+			<attribute name="config:name">
+				<ref name="string"/>
+			</attribute>
+		</optional>
+	</define>
+	<define name="config-config-item-map-named">
+		<element name="config:config-item-map-named">
+			<ref name="config-config-item-map-named-attlist"/>
+			<oneOrMore>
+				<ref name="config-config-item-map-entry"/>
+			</oneOrMore>
+		</element>
+	</define>
+	<define name="config-config-item-map-named-attlist">
+		<attribute name="config:name">
+			<ref name="string"/>
+		</attribute>
+	</define>
+	<define name="office-scripts">
+		<optional>
+			<element name="office:scripts">
+				<zeroOrMore>
+					<ref name="office-script"/>
+				</zeroOrMore>
+				<optional>
+					<ref name="office-event-listeners"/>
+				</optional>
+			</element>
+		</optional>
+	</define>
+	<define name="office-script">
+		<element name="office:script">
+			<ref name="office-script-attlist"/>
+			<mixed>
+				<ref name="anyElements"/>
+			</mixed>
+		</element>
+	</define>
+	<define name="office-script-attlist">
+		<attribute name="script:language">
+			<ref name="string"/>
+		</attribute>
+	</define>
+	<define name="office-font-face-decls">
+		<optional>
+			<element name="office:font-face-decls">
+				<zeroOrMore>
+					<ref name="style-font-face"/>
+				</zeroOrMore>
+			</element>
+		</optional>
+	</define>
+	<define name="office-styles">
+		<optional>
+			<element name="office:styles">
+				<interleave>
+					<ref name="styles"/>
+					<zeroOrMore>
+						<ref name="style-default-style"/>
+					</zeroOrMore>
+					<optional>
+						<ref name="style-default-page-layout"/>
+					</optional>
+					<optional>
+						<ref name="text-outline-style"/>
+					</optional>
+					<zeroOrMore>
+						<ref name="text-notes-configuration"/>
+					</zeroOrMore>
+					<optional>
+						<ref name="text-bibliography-configuration"/>
+					</optional>
+					<optional>
+						<ref name="text-linenumbering-configuration"/>
+					</optional>
+					<zeroOrMore>
+						<ref name="draw-gradient"/>
+					</zeroOrMore>
+					<zeroOrMore>
+						<ref name="svg-linearGradient"/>
+					</zeroOrMore>
+					<zeroOrMore>
+						<ref name="svg-radialGradient"/>
+					</zeroOrMore>
+					<zeroOrMore>
+						<ref name="draw-hatch"/>
+					</zeroOrMore>
+					<zeroOrMore>
+						<ref name="draw-fill-image"/>
+					</zeroOrMore>
+					<zeroOrMore>
+						<ref name="draw-marker"/>
+					</zeroOrMore>
+					<zeroOrMore>
+						<ref name="draw-stroke-dash"/>
+					</zeroOrMore>
+					<zeroOrMore>
+						<ref name="draw-opacity"/>
+					</zeroOrMore>
+					<zeroOrMore>
+						<ref name="style-presentation-page-layout"/>
+					</zeroOrMore>
+					<zeroOrMore>
+						<ref name="table-table-template"/>
+					</zeroOrMore>
+				</interleave>
+			</element>
+		</optional>
+	</define>
+	<define name="office-automatic-styles">
+		<optional>
+			<element name="office:automatic-styles">
+				<interleave>
+					<ref name="styles"/>
+					<zeroOrMore>
+						<ref name="style-page-layout"/>
+					</zeroOrMore>
+				</interleave>
+			</element>
+		</optional>
+	</define>
+	<define name="office-master-styles">
+		<optional>
+			<element name="office:master-styles">
+				<interleave>
+					<zeroOrMore>
+						<ref name="style-master-page"/>
+					</zeroOrMore>
+					<optional>
+						<ref name="style-handout-master"/>
+					</optional>
+					<optional>
+						<ref name="draw-layer-set"/>
+					</optional>
+				</interleave>
+			</element>
+		</optional>
+	</define>
+	<define name="styles">
+		<interleave>
+			<zeroOrMore>
+				<ref name="style-style"/>
+			</zeroOrMore>
+			<zeroOrMore>
+				<ref name="text-list-style"/>
+			</zeroOrMore>
+			<zeroOrMore>
+				<ref name="number-number-style"/>
+			</zeroOrMore>
+			<zeroOrMore>
+				<ref name="number-currency-style"/>
+			</zeroOrMore>
+			<zeroOrMore>
+				<ref name="number-percentage-style"/>
+			</zeroOrMore>
+			<zeroOrMore>
+				<ref name="number-date-style"/>
+			</zeroOrMore>
+			<zeroOrMore>
+				<ref name="number-time-style"/>
+			</zeroOrMore>
+			<zeroOrMore>
+				<ref name="number-boolean-style"/>
+			</zeroOrMore>
+			<zeroOrMore>
+				<ref name="number-text-style"/>
+			</zeroOrMore>
+		</interleave>
+	</define>
+	<define name="office-meta-data">
+		<choice>
+			<element name="meta:generator">
+				<ref name="string"/>
+			</element>
+			<element name="dc:title">
+				<ref name="string"/>
+			</element>
+			<element name="dc:description">
+				<ref name="string"/>
+			</element>
+			<element name="dc:subject">
+				<ref name="string"/>
+			</element>
+			<element name="meta:keyword">
+				<ref name="string"/>
+			</element>
+			<element name="meta:initial-creator">
+				<ref name="string"/>
+			</element>
+			<ref name="dc-creator"/>
+			<element name="meta:printed-by">
+				<ref name="string"/>
+			</element>
+			<element name="meta:creation-date">
+				<ref name="dateTime"/>
+			</element>
+			<ref name="dc-date"/>
+			<element name="meta:print-date">
+				<ref name="dateTime"/>
+			</element>
+			<element name="meta:template">
+				<attribute name="xlink:type">
+					<value>simple</value>
+				</attribute>
+				<attribute name="xlink:href">
+					<ref name="anyIRI"/>
+				</attribute>
+				<optional>
+					<attribute name="xlink:actuate">
+						<value>onRequest</value>
+					</attribute>
+				</optional>
+				<optional>
+					<attribute name="xlink:title">
+						<ref name="string"/>
+					</attribute>
+				</optional>
+				<optional>
+					<attribute name="meta:date">
+						<ref name="dateTime"/>
+					</attribute>
+				</optional>
+			</element>
+			<element name="meta:auto-reload">
+				<optional>
+					<attribute name="xlink:type">
+						<value>simple</value>
+					</attribute>
+					<attribute name="xlink:href">
+						<ref name="anyIRI"/>
+					</attribute>
+					<optional>
+						<attribute name="xlink:show">
+							<value>replace</value>
+						</attribute>
+					</optional>
+					<optional>
+						<attribute name="xlink:actuate">
+							<value>onLoad</value>
+						</attribute>
+					</optional>
+				</optional>
+				<optional>
+					<attribute name="meta:delay">
+						<ref name="duration"/>
+					</attribute>
+				</optional>
+			</element>
+			<element name="meta:hyperlink-behaviour">
+				<optional>
+					<attribute name="office:target-frame-name">
+						<ref name="targetFrameName"/>
+					</attribute>
+				</optional>
+				<optional>
+					<attribute name="xlink:show">
+						<choice>
+							<value>new</value>
+							<value>replace</value>
+						</choice>
+					</attribute>
+				</optional>
+			</element>
+			<element name="dc:language">
+				<ref name="language"/>
+			</element>
+			<element name="meta:editing-cycles">
+				<ref name="nonNegativeInteger"/>
+			</element>
+			<element name="meta:editing-duration">
+				<ref name="duration"/>
+			</element>
+			<element name="meta:document-statistic">
+				<optional>
+					<attribute name="meta:page-count">
+						<ref name="nonNegativeInteger"/>
+					</attribute>
+				</optional>
+				<optional>
+					<attribute name="meta:table-count">
+						<ref name="nonNegativeInteger"/>
+					</attribute>
+				</optional>
+				<optional>
+					<attribute name="meta:draw-count">
+						<ref name="nonNegativeInteger"/>
+					</attribute>
+				</optional>
+				<optional>
+					<attribute name="meta:image-count">
+						<ref name="nonNegativeInteger"/>
+					</attribute>
+				</optional>
+				<optional>
+					<attribute name="meta:ole-object-count">
+						<ref name="nonNegativeInteger"/>
+					</attribute>
+				</optional>
+				<optional>
+					<attribute name="meta:object-count">
+						<ref name="nonNegativeInteger"/>
+					</attribute>
+				</optional>
+				<optional>
+					<attribute name="meta:paragraph-count">
+						<ref name="nonNegativeInteger"/>
+					</attribute>
+				</optional>
+				<optional>
+					<attribute name="meta:word-count">
+						<ref name="nonNegativeInteger"/>
+					</attribute>
+				</optional>
+				<optional>
+					<attribute name="meta:character-count">
+						<ref name="nonNegativeInteger"/>
+					</attribute>
+				</optional>
+				<optional>
+					<attribute name="meta:frame-count">
+						<ref name="nonNegativeInteger"/>
+					</attribute>
+				</optional>
+				<optional>
+					<attribute name="meta:sentence-count">
+						<ref name="nonNegativeInteger"/>
+					</attribute>
+				</optional>
+				<optional>
+					<attribute name="meta:syllable-count">
+						<ref name="nonNegativeInteger"/>
+					</attribute>
+				</optional>
+				<optional>
+					<attribute name="meta:non-whitespace-character-count">
+						<ref name="nonNegativeInteger"/>
+					</attribute>
+				</optional>
+				<optional>
+					<attribute name="meta:row-count">
+						<ref name="nonNegativeInteger"/>
+					</attribute>
+				</optional>
+				<optional>
+					<attribute name="meta:cell-count">
+						<ref name="nonNegativeInteger"/>
+					</attribute>
+				</optional>
+			</element>
+			<element name="meta:user-defined">
+				<attribute name="meta:name">
+					<ref name="string"/>
+				</attribute>
+				<choice>
+					<group>
+						<attribute name="meta:value-type">
+							<value>float</value>
+						</attribute>
+						<ref name="double"/>
+					</group>
+					<group>
+						<attribute name="meta:value-type">
+							<value>date</value>
+						</attribute>
+						<ref name="dateOrDateTime"/>
+					</group>
+					<group>
+						<attribute name="meta:value-type">
+							<value>time</value>
+						</attribute>
+						<ref name="duration"/>
+					</group>
+					<group>
+						<attribute name="meta:value-type">
+							<value>boolean</value>
+						</attribute>
+						<ref name="boolean"/>
+					</group>
+					<group>
+						<attribute name="meta:value-type">
+							<value>string</value>
+						</attribute>
+						<ref name="string"/>
+					</group>
+					<text/>
+				</choice>
+			</element>
+		</choice>
+	</define>
+	<define name="dc-creator">
+		<element name="dc:creator">
+			<ref name="string"/>
+		</element>
+	</define>
+	<define name="dc-date">
+		<element name="dc:date">
+			<ref name="dateTime"/>
+		</element>
+	</define>
+	<define name="text-h">
+		<element name="text:h">
+			<ref name="heading-attrs"/>
+			<ref name="paragraph-attrs"/>
+			<optional>
+				<ref name="text-number"/>
+			</optional>
+			<zeroOrMore>
+				<ref name="paragraph-content-or-hyperlink"/>
+			</zeroOrMore>
+		</element>
+	</define>
+	<define name="heading-attrs">
+		<interleave>
+			<attribute name="text:outline-level">
+				<ref name="positiveInteger"/>
+			</attribute>
+			<optional>
+				<attribute name="text:restart-numbering">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="text:start-value">
+					<ref name="nonNegativeInteger"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="text:is-list-header">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="text-number">
+		<element name="text:number">
+			<ref name="string"/>
+		</element>
+	</define>
+	<define name="text-p">
+		<element name="text:p">
+			<ref name="paragraph-attrs"/>
+			<zeroOrMore>
+				<ref name="paragraph-content-or-hyperlink"/>
+			</zeroOrMore>
+		</element>
+	</define>
+	<define name="paragraph-attrs">
+		<interleave>
+			<optional>
+				<attribute name="text:style-name">
+					<ref name="styleNameRef"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="text:class-names">
+					<ref name="styleNameRefs"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="text:cond-style-name">
+					<ref name="styleNameRef"/>
+				</attribute>
+			</optional>
+			<optional>
+				<group>
+					<ref name="xml-id"/>
+					<optional>
+						<attribute name="text:id">
+							<ref name="NCName"/>
+						</attribute>
+					</optional>
+				</group>
+			</optional>
+			<optional>
+				<ref name="common-in-content-meta-attlist"/>
+			</optional>
+		</interleave>
+	</define>
+	<define name="text-page-sequence">
+		<element name="text:page-sequence">
+			<oneOrMore>
+				<ref name="text-page"/>
+			</oneOrMore>
+		</element>
+	</define>
+	<define name="text-page">
+		<element name="text:page">
+			<ref name="text-page-attlist"/>
+			<empty/>
+		</element>
+	</define>
+	<define name="text-page-attlist">
+		<attribute name="text:master-page-name">
+			<ref name="styleNameRef"/>
+		</attribute>
+	</define>
+	<define name="text-list">
+		<element name="text:list">
+			<ref name="text-list-attr"/>
+			<optional>
+				<ref name="text-list-header"/>
+			</optional>
+			<zeroOrMore>
+				<ref name="text-list-item"/>
+			</zeroOrMore>
+		</element>
+	</define>
+	<define name="text-list-attr">
+		<interleave>
+			<optional>
+				<attribute name="text:style-name">
+					<ref name="styleNameRef"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="text:continue-numbering">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="text:continue-list">
+					<ref name="IDREF"/>
+				</attribute>
+			</optional>
+			<optional>
+				<ref name="xml-id"/>
+			</optional>
+		</interleave>
+	</define>
+	<define name="text-list-item">
+		<element name="text:list-item">
+			<ref name="text-list-item-attr"/>
+			<ref name="text-list-item-content"/>
+		</element>
+	</define>
+	<define name="text-list-item-content">
+		<optional>
+			<ref name="text-number"/>
+		</optional>
+		<zeroOrMore>
+			<choice>
+				<ref name="text-p"/>
+				<ref name="text-h"/>
+				<ref name="text-list"/>
+				<ref name="text-soft-page-break"/>
+			</choice>
+		</zeroOrMore>
+	</define>
+	<define name="text-list-item-attr">
+		<interleave>
+			<optional>
+				<attribute name="text:start-value">
+					<ref name="nonNegativeInteger"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="text:style-override">
+					<ref name="styleNameRef"/>
+				</attribute>
+			</optional>
+			<optional>
+				<ref name="xml-id"/>
+			</optional>
+		</interleave>
+	</define>
+	<define name="text-list-header">
+		<element name="text:list-header">
+			<ref name="text-list-header-attr"/>
+			<ref name="text-list-item-content"/>
+		</element>
+	</define>
+	<define name="text-list-header-attr">
+		<optional>
+			<ref name="xml-id"/>
+		</optional>
+	</define>
+	<define name="text-numbered-paragraph">
+		<element name="text:numbered-paragraph">
+			<ref name="text-numbered-paragraph-attr"/>
+			<optional>
+				<ref name="text-number"/>
+			</optional>
+			<choice>
+				<ref name="text-p"/>
+				<ref name="text-h"/>
+			</choice>
+		</element>
+	</define>
+	<define name="text-numbered-paragraph-attr">
+		<interleave>
+			<attribute name="text:list-id">
+				<ref name="NCName"/>
+			</attribute>
+			<optional>
+				<attribute name="text:level">
+					<ref name="positiveInteger"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="text:style-name">
+					<ref name="styleNameRef"/>
+				</attribute>
+				<attribute name="text:continue-numbering">
+					<ref name="boolean"/>
+				</attribute>
+				<attribute name="text:start-value">
+					<ref name="nonNegativeInteger"/>
+				</attribute>
+			</optional>
+			<optional>
+				<ref name="xml-id"/>
+			</optional>
+		</interleave>
+	</define>
+	<define name="text-section">
+		<element name="text:section">
+			<ref name="text-section-attlist"/>
+			<choice>
+				<ref name="text-section-source"/>
+				<ref name="text-section-source-dde"/>
+				<empty/>
+			</choice>
+			<zeroOrMore>
+				<ref name="text-content"/>
+			</zeroOrMore>
+		</element>
+	</define>
+	<define name="text-section-attlist">
+		<interleave>
+			<ref name="common-section-attlist"/>
+			<choice>
+				<attribute name="text:display">
+					<choice>
+						<value>true</value>
+						<value>none</value>
+					</choice>
+				</attribute>
+				<group>
+					<attribute name="text:display">
+						<value>condition</value>
+					</attribute>
+					<attribute name="text:condition">
+						<ref name="string"/>
+					</attribute>
+				</group>
+				<empty/>
+			</choice>
+		</interleave>
+	</define>
+	<define name="common-section-attlist">
+		<interleave>
+			<optional>
+				<attribute name="text:style-name">
+					<ref name="styleNameRef"/>
+				</attribute>
+			</optional>
+			<attribute name="text:name">
+				<ref name="string"/>
+			</attribute>
+			<optional>
+				<attribute name="text:protected">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="text:protection-key">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="text:protection-key-digest-algorithm">
+					<ref name="anyIRI"/>
+				</attribute>
+			</optional>
+			<optional>
+				<ref name="xml-id"/>
+			</optional>
+		</interleave>
+	</define>
+	<define name="text-section-source">
+		<element name="text:section-source">
+			<ref name="text-section-source-attr"/>
+		</element>
+	</define>
+	<define name="text-section-source-attr">
+		<interleave>
+			<optional>
+				<attribute name="xlink:type">
+					<value>simple</value>
+				</attribute>
+				<attribute name="xlink:href">
+					<ref name="anyIRI"/>
+				</attribute>
+				<optional>
+					<attribute name="xlink:show">
+						<value>embed</value>
+					</attribute>
+				</optional>
+			</optional>
+			<optional>
+				<attribute name="text:section-name">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="text:filter-name">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="text-section-source-dde">
+		<ref name="office-dde-source"/>
+	</define>
+	<define name="text-tracked-changes">
+		<optional>
+			<element name="text:tracked-changes">
+				<ref name="text-tracked-changes-attr"/>
+				<zeroOrMore>
+					<ref name="text-changed-region"/>
+				</zeroOrMore>
+			</element>
+		</optional>
+	</define>
+	<define name="text-tracked-changes-attr">
+		<optional>
+			<attribute name="text:track-changes">
+				<ref name="boolean"/>
+			</attribute>
+		</optional>
+	</define>
+	<define name="text-changed-region">
+		<element name="text:changed-region">
+			<ref name="text-changed-region-attr"/>
+			<ref name="text-changed-region-content"/>
+		</element>
+	</define>
+	<define name="text-changed-region-attr">
+		<group>
+			<ref name="xml-id"/>
+			<optional>
+				<attribute name="text:id">
+					<ref name="NCName"/>
+				</attribute>
+			</optional>
+		</group>
+	</define>
+	<define name="text-changed-region-content">
+		<choice>
+			<element name="text:insertion">
+				<ref name="office-change-info"/>
+			</element>
+			<element name="text:deletion">
+				<ref name="office-change-info"/>
+				<zeroOrMore>
+					<ref name="text-content"/>
+				</zeroOrMore>
+			</element>
+			<element name="text:format-change">
+				<ref name="office-change-info"/>
+			</element>
+		</choice>
+	</define>
+	<define name="change-marks">
+		<choice>
+			<element name="text:change">
+				<ref name="change-mark-attr"/>
+			</element>
+			<element name="text:change-start">
+				<ref name="change-mark-attr"/>
+			</element>
+			<element name="text:change-end">
+				<ref name="change-mark-attr"/>
+			</element>
+		</choice>
+	</define>
+	<define name="change-mark-attr">
+		<attribute name="text:change-id">
+			<ref name="IDREF"/>
+		</attribute>
+	</define>
+	<define name="text-soft-page-break">
+		<element name="text:soft-page-break">
+			<empty/>
+		</element>
+	</define>
+	<define name="text-decls">
+		<optional>
+			<element name="text:variable-decls">
+				<zeroOrMore>
+					<ref name="text-variable-decl"/>
+				</zeroOrMore>
+			</element>
+		</optional>
+		<optional>
+			<element name="text:sequence-decls">
+				<zeroOrMore>
+					<ref name="text-sequence-decl"/>
+				</zeroOrMore>
+			</element>
+		</optional>
+		<optional>
+			<element name="text:user-field-decls">
+				<zeroOrMore>
+					<ref name="text-user-field-decl"/>
+				</zeroOrMore>
+			</element>
+		</optional>
+		<optional>
+			<element name="text:dde-connection-decls">
+				<zeroOrMore>
+					<ref name="text-dde-connection-decl"/>
+				</zeroOrMore>
+			</element>
+		</optional>
+		<optional>
+			<ref name="text-alphabetical-index-auto-mark-file"/>
+		</optional>
+	</define>
+	<define name="paragraph-content-or-hyperlink">
+		<choice>
+			<ref name="paragraph-content"/>
+			<ref name="text-a"/>
+		</choice>
+	</define>
+	<define name="paragraph-content">
+		<choice>
+			<text/>
+			<element name="text:s">
+				<optional>
+					<attribute name="text:c">
+						<ref name="nonNegativeInteger"/>
+					</attribute>
+				</optional>
+			</element>
+			<element name="text:tab">
+				<ref name="text-tab-attr"/>
+			</element>
+			<element name="text:line-break">
+				<empty/>
+			</element>
+			<ref name="text-soft-page-break"/>
+			<element name="text:span">
+				<optional>
+					<attribute name="text:style-name">
+						<ref name="styleNameRef"/>
+					</attribute>
+				</optional>
+				<optional>
+					<attribute name="text:class-names">
+						<ref name="styleNameRefs"/>
+					</attribute>
+				</optional>
+				<zeroOrMore>
+					<ref name="paragraph-content-or-hyperlink"/>
+				</zeroOrMore>
+			</element>
+			<element name="text:meta">
+				<ref name="text-meta-attlist"/>
+				<zeroOrMore>
+					<ref name="paragraph-content-or-hyperlink"/>
+				</zeroOrMore>
+			</element>
+			<choice>
+				<ref name="text-bookmark"/>
+				<ref name="text-bookmark-start"/>
+				<ref name="text-bookmark-end"/>
+			</choice>
+			<element name="text:reference-mark">
+				<attribute name="text:name">
+					<ref name="string"/>
+				</attribute>
+			</element>
+			<choice>
+				<element name="text:reference-mark-start">
+					<attribute name="text:name">
+						<ref name="string"/>
+					</attribute>
+				</element>
+				<element name="text:reference-mark-end">
+					<attribute name="text:name">
+						<ref name="string"/>
+					</attribute>
+				</element>
+			</choice>
+			<element name="text:note">
+				<ref name="text-note-class"/>
+				<optional>
+					<attribute name="text:id">
+						<ref name="string"/>
+					</attribute>
+				</optional>
+				<element name="text:note-citation">
+					<optional>
+						<attribute name="text:label">
+							<ref name="string"/>
+						</attribute>
+					</optional>
+					<text/>
+				</element>
+				<element name="text:note-body">
+					<zeroOrMore>
+						<ref name="text-content"/>
+					</zeroOrMore>
+				</element>
+			</element>
+			<element name="text:ruby">
+				<optional>
+					<attribute name="text:style-name">
+						<ref name="styleNameRef"/>
+					</attribute>
+				</optional>
+				<element name="text:ruby-base">
+					<zeroOrMore>
+						<ref name="paragraph-content-or-hyperlink"/>
+					</zeroOrMore>
+				</element>
+				<element name="text:ruby-text">
+					<optional>
+						<attribute name="text:style-name">
+							<ref name="styleNameRef"/>
+						</attribute>
+					</optional>
+					<text/>
+				</element>
+			</element>
+			<choice>
+				<ref name="office-annotation"/>
+				<ref name="office-annotation-end"/>
+			</choice>
+			<ref name="change-marks"/>
+			<ref name="shape"/>
+			<element name="text:date">
+				<ref name="text-date-attlist"/>
+				<text/>
+			</element>
+			<element name="text:time">
+				<ref name="text-time-attlist"/>
+				<text/>
+			</element>
+			<element name="text:page-number">
+				<ref name="text-page-number-attlist"/>
+				<text/>
+			</element>
+			<element name="text:page-continuation">
+				<ref name="text-page-continuation-attlist"/>
+				<text/>
+			</element>
+			<element name="text:sender-firstname">
+				<ref name="common-field-fixed-attlist"/>
+				<text/>
+			</element>
+			<element name="text:sender-lastname">
+				<ref name="common-field-fixed-attlist"/>
+				<text/>
+			</element>
+			<element name="text:sender-initials">
+				<ref name="common-field-fixed-attlist"/>
+				<text/>
+			</element>
+			<element name="text:sender-title">
+				<ref name="common-field-fixed-attlist"/>
+				<text/>
+			</element>
+			<element name="text:sender-position">
+				<ref name="common-field-fixed-attlist"/>
+				<text/>
+			</element>
+			<element name="text:sender-email">
+				<ref name="common-field-fixed-attlist"/>
+				<text/>
+			</element>
+			<element name="text:sender-phone-private">
+				<ref name="common-field-fixed-attlist"/>
+				<text/>
+			</element>
+			<element name="text:sender-fax">
+				<ref name="common-field-fixed-attlist"/>
+				<text/>
+			</element>
+			<element name="text:sender-company">
+				<ref name="common-field-fixed-attlist"/>
+				<text/>
+			</element>
+			<element name="text:sender-phone-work">
+				<ref name="common-field-fixed-attlist"/>
+				<text/>
+			</element>
+			<element name="text:sender-street">
+				<ref name="common-field-fixed-attlist"/>
+				<text/>
+			</element>
+			<element name="text:sender-city">
+				<ref name="common-field-fixed-attlist"/>
+				<text/>
+			</element>
+			<element name="text:sender-postal-code">
+				<ref name="common-field-fixed-attlist"/>
+				<text/>
+			</element>
+			<element name="text:sender-country">
+				<ref name="common-field-fixed-attlist"/>
+				<text/>
+			</element>
+			<element name="text:sender-state-or-province">
+				<ref name="common-field-fixed-attlist"/>
+				<text/>
+			</element>
+			<element name="text:author-name">
+				<ref name="common-field-fixed-attlist"/>
+				<text/>
+			</element>
+			<element name="text:author-initials">
+				<ref name="common-field-fixed-attlist"/>
+				<text/>
+			</element>
+			<element name="text:chapter">
+				<ref name="text-chapter-attlist"/>
+				<text/>
+			</element>
+			<element name="text:file-name">
+				<ref name="text-file-name-attlist"/>
+				<text/>
+			</element>
+			<element name="text:template-name">
+				<ref name="text-template-name-attlist"/>
+				<text/>
+			</element>
+			<element name="text:sheet-name">
+				<text/>
+			</element>
+			<element name="text:variable-set">
+				<interleave>
+					<ref name="common-field-name-attlist"/>
+					<ref name="common-field-formula-attlist"/>
+					<ref name="common-value-and-type-attlist"/>
+					<ref name="common-field-display-value-none-attlist"/>
+					<ref name="common-field-data-style-name-attlist"/>
+				</interleave>
+				<text/>
+			</element>
+			<element name="text:variable-get">
+				<interleave>
+					<ref name="common-field-name-attlist"/>
+					<ref name="common-field-display-value-formula-attlist"/>
+					<ref name="common-field-data-style-name-attlist"/>
+				</interleave>
+				<text/>
+			</element>
+			<element name="text:variable-input">
+				<interleave>
+					<ref name="common-field-name-attlist"/>
+					<ref name="common-field-description-attlist"/>
+					<ref name="common-value-type-attlist"/>
+					<ref name="common-field-display-value-none-attlist"/>
+					<ref name="common-field-data-style-name-attlist"/>
+				</interleave>
+				<text/>
+			</element>
+			<element name="text:user-field-get">
+				<interleave>
+					<ref name="common-field-name-attlist"/>
+					<ref name="common-field-display-value-formula-none-attlist"/>
+					<ref name="common-field-data-style-name-attlist"/>
+				</interleave>
+				<text/>
+			</element>
+			<element name="text:user-field-input">
+				<interleave>
+					<ref name="common-field-name-attlist"/>
+					<ref name="common-field-description-attlist"/>
+					<ref name="common-field-data-style-name-attlist"/>
+				</interleave>
+				<text/>
+			</element>
+			<element name="text:sequence">
+				<interleave>
+					<ref name="common-field-name-attlist"/>
+					<ref name="common-field-formula-attlist"/>
+					<ref name="common-field-num-format-attlist"/>
+					<ref name="text-sequence-ref-name"/>
+				</interleave>
+				<text/>
+			</element>
+			<element name="text:expression">
+				<interleave>
+					<ref name="common-field-formula-attlist"/>
+					<optional>
+						<ref name="common-value-and-type-attlist"/>
+					</optional>
+					<ref name="common-field-display-value-formula-attlist"/>
+					<ref name="common-field-data-style-name-attlist"/>
+				</interleave>
+				<text/>
+			</element>
+			<element name="text:text-input">
+				<ref name="common-field-description-attlist"/>
+				<text/>
+			</element>
+			<element name="text:initial-creator">
+				<ref name="common-field-fixed-attlist"/>
+				<text/>
+			</element>
+			<element name="text:creation-date">
+				<interleave>
+					<ref name="common-field-fixed-attlist"/>
+					<ref name="common-field-data-style-name-attlist"/>
+					<optional>
+						<attribute name="text:date-value">
+							<ref name="dateOrDateTime"/>
+						</attribute>
+					</optional>
+				</interleave>
+				<text/>
+			</element>
+			<element name="text:creation-time">
+				<interleave>
+					<ref name="common-field-fixed-attlist"/>
+					<ref name="common-field-data-style-name-attlist"/>
+					<optional>
+						<attribute name="text:time-value">
+							<ref name="timeOrDateTime"/>
+						</attribute>
+					</optional>
+				</interleave>
+				<text/>
+			</element>
+			<element name="text:description">
+				<ref name="common-field-fixed-attlist"/>
+				<text/>
+			</element>
+			<element name="text:user-defined">
+				<interleave>
+					<ref name="common-field-fixed-attlist"/>
+					<attribute name="text:name">
+						<ref name="string"/>
+					</attribute>
+					<ref name="common-field-data-style-name-attlist"/>
+					<optional>
+						<attribute name="office:value">
+							<ref name="double"/>
+						</attribute>
+					</optional>
+					<optional>
+						<attribute name="office:date-value">
+							<ref name="dateOrDateTime"/>
+						</attribute>
+					</optional>
+					<optional>
+						<attribute name="office:time-value">
+							<ref name="duration"/>
+						</attribute>
+					</optional>
+					<optional>
+						<attribute name="office:boolean-value">
+							<ref name="boolean"/>
+						</attribute>
+					</optional>
+					<optional>
+						<attribute name="office:string-value">
+							<ref name="string"/>
+						</attribute>
+					</optional>
+				</interleave>
+				<text/>
+			</element>
+			<element name="text:print-time">
+				<interleave>
+					<ref name="common-field-fixed-attlist"/>
+					<ref name="common-field-data-style-name-attlist"/>
+					<optional>
+						<attribute name="text:time-value">
+							<ref name="time"/>
+						</attribute>
+					</optional>
+				</interleave>
+				<text/>
+			</element>
+			<element name="text:print-date">
+				<interleave>
+					<ref name="common-field-fixed-attlist"/>
+					<ref name="common-field-data-style-name-attlist"/>
+					<optional>
+						<attribute name="text:date-value">
+							<ref name="date"/>
+						</attribute>
+					</optional>
+				</interleave>
+				<text/>
+			</element>
+			<element name="text:printed-by">
+				<ref name="common-field-fixed-attlist"/>
+				<text/>
+			</element>
+			<element name="text:title">
+				<ref name="common-field-fixed-attlist"/>
+				<text/>
+			</element>
+			<element name="text:subject">
+				<ref name="common-field-fixed-attlist"/>
+				<text/>
+			</element>
+			<element name="text:keywords">
+				<ref name="common-field-fixed-attlist"/>
+				<text/>
+			</element>
+			<element name="text:editing-cycles">
+				<ref name="common-field-fixed-attlist"/>
+				<text/>
+			</element>
+			<element name="text:editing-duration">
+				<interleave>
+					<ref name="common-field-fixed-attlist"/>
+					<ref name="common-field-data-style-name-attlist"/>
+					<optional>
+						<attribute name="text:duration">
+							<ref name="duration"/>
+						</attribute>
+					</optional>
+				</interleave>
+				<text/>
+			</element>
+			<element name="text:modification-time">
+				<interleave>
+					<ref name="common-field-fixed-attlist"/>
+					<ref name="common-field-data-style-name-attlist"/>
+					<optional>
+						<attribute name="text:time-value">
+							<ref name="time"/>
+						</attribute>
+					</optional>
+				</interleave>
+				<text/>
+			</element>
+			<element name="text:modification-date">
+				<interleave>
+					<ref name="common-field-fixed-attlist"/>
+					<ref name="common-field-data-style-name-attlist"/>
+					<optional>
+						<attribute name="text:date-value">
+							<ref name="date"/>
+						</attribute>
+					</optional>
+				</interleave>
+				<text/>
+			</element>
+			<element name="text:creator">
+				<ref name="common-field-fixed-attlist"/>
+				<text/>
+			</element>
+			<element>
+				<choice>
+					<name>text:page-count</name>
+					<name>text:paragraph-count</name>
+					<name>text:word-count</name>
+					<name>text:character-count</name>
+					<name>text:table-count</name>
+					<name>text:image-count</name>
+					<name>text:object-count</name>
+				</choice>
+				<ref name="common-field-num-format-attlist"/>
+				<text/>
+			</element>
+			<element name="text:database-display">
+				<ref name="text-database-display-attlist"/>
+				<text/>
+			</element>
+			<element name="text:database-next">
+				<ref name="text-database-next-attlist"/>
+			</element>
+			<element name="text:database-row-select">
+				<ref name="text-database-row-select-attlist"/>
+			</element>
+			<element name="text:database-row-number">
+				<interleave>
+					<ref name="common-field-database-table"/>
+					<ref name="common-field-num-format-attlist"/>
+					<optional>
+						<attribute name="text:value">
+							<ref name="nonNegativeInteger"/>
+						</attribute>
+					</optional>
+				</interleave>
+				<text/>
+			</element>
+			<element name="text:database-name">
+				<ref name="common-field-database-table"/>
+				<text/>
+			</element>
+			<element name="text:page-variable-set">
+				<ref name="text-set-page-variable-attlist"/>
+				<text/>
+			</element>
+			<element name="text:page-variable-get">
+				<ref name="text-get-page-variable-attlist"/>
+				<text/>
+			</element>
+			<element name="text:placeholder">
+				<ref name="text-placeholder-attlist"/>
+				<text/>
+			</element>
+			<element name="text:conditional-text">
+				<ref name="text-conditional-text-attlist"/>
+				<text/>
+			</element>
+			<element name="text:hidden-text">
+				<ref name="text-hidden-text-attlist"/>
+				<text/>
+			</element>
+			<element>
+				<choice>
+					<name>text:reference-ref</name>
+					<name>text:bookmark-ref</name>
+				</choice>
+				<interleave>
+					<ref name="text-common-ref-content"/>
+					<ref name="text-bookmark-ref-content"/>
+				</interleave>
+			</element>
+			<element name="text:note-ref">
+				<interleave>
+					<ref name="text-common-ref-content"/>
+					<ref name="text-note-ref-content"/>
+				</interleave>
+			</element>
+			<element name="text:sequence-ref">
+				<interleave>
+					<ref name="text-common-ref-content"/>
+					<ref name="text-sequence-ref-content"/>
+				</interleave>
+			</element>
+			<element name="text:script">
+				<interleave>
+					<choice>
+						<group>
+							<attribute name="xlink:type">
+								<value>simple</value>
+							</attribute>
+							<attribute name="xlink:href">
+								<ref name="anyIRI"/>
+							</attribute>
+						</group>
+						<text/>
+					</choice>
+					<optional>
+						<attribute name="script:language">
+							<ref name="string"/>
+						</attribute>
+					</optional>
+				</interleave>
+			</element>
+			<element name="text:execute-macro">
+				<optional>
+					<attribute name="text:name">
+						<ref name="string"/>
+					</attribute>
+				</optional>
+				<optional>
+					<ref name="office-event-listeners"/>
+				</optional>
+				<text/>
+			</element>
+			<element name="text:hidden-paragraph">
+				<ref name="text-hidden-paragraph-attlist"/>
+				<text/>
+			</element>
+			<element name="text:dde-connection">
+				<attribute name="text:connection-name">
+					<ref name="string"/>
+				</attribute>
+				<text/>
+			</element>
+			<element name="text:measure">
+				<attribute name="text:kind">
+					<choice>
+						<value>value</value>
+						<value>unit</value>
+						<value>gap</value>
+					</choice>
+				</attribute>
+				<text/>
+			</element>
+			<element name="text:table-formula">
+				<interleave>
+					<ref name="common-field-formula-attlist"/>
+					<ref name="common-field-display-value-formula-attlist"/>
+					<ref name="common-field-data-style-name-attlist"/>
+				</interleave>
+				<text/>
+			</element>
+			<element name="text:meta-field">
+				<ref name="text-meta-field-attlist"/>
+				<zeroOrMore>
+					<ref name="paragraph-content-or-hyperlink"/>
+				</zeroOrMore>
+			</element>
+			<element name="text:toc-mark-start">
+				<ref name="text-toc-mark-start-attrs"/>
+			</element>
+			<element name="text:toc-mark-end">
+				<ref name="text-id"/>
+			</element>
+			<element name="text:toc-mark">
+				<attribute name="text:string-value">
+					<ref name="string"/>
+				</attribute>
+				<ref name="text-outline-level"/>
+			</element>
+			<element name="text:user-index-mark-start">
+				<ref name="text-id"/>
+				<ref name="text-outline-level"/>
+				<ref name="text-index-name"/>
+			</element>
+			<element name="text:user-index-mark-end">
+				<ref name="text-id"/>
+			</element>
+			<element name="text:user-index-mark">
+				<attribute name="text:string-value">
+					<ref name="string"/>
+				</attribute>
+				<ref name="text-outline-level"/>
+				<ref name="text-index-name"/>
+			</element>
+			<element name="text:alphabetical-index-mark-start">
+				<ref name="text-id"/>
+				<ref name="text-alphabetical-index-mark-attrs"/>
+			</element>
+			<element name="text:alphabetical-index-mark-end">
+				<ref name="text-id"/>
+			</element>
+			<element name="text:alphabetical-index-mark">
+				<attribute name="text:string-value">
+					<ref name="string"/>
+				</attribute>
+				<ref name="text-alphabetical-index-mark-attrs"/>
+			</element>
+			<element name="text:bibliography-mark">
+				<attribute name="text:bibliography-type">
+					<ref name="text-bibliography-types"/>
+				</attribute>
+				<zeroOrMore>
+					<attribute>
+						<choice>
+							<name>text:identifier</name>
+							<name>text:address</name>
+							<name>text:annote</name>
+							<name>text:author</name>
+							<name>text:booktitle</name>
+							<name>text:chapter</name>
+							<name>text:edition</name>
+							<name>text:editor</name>
+							<name>text:howpublished</name>
+							<name>text:institution</name>
+							<name>text:journal</name>
+							<name>text:month</name>
+							<name>text:note</name>
+							<name>text:number</name>
+							<name>text:organizations</name>
+							<name>text:pages</name>
+							<name>text:publisher</name>
+							<name>text:school</name>
+							<name>text:series</name>
+							<name>text:title</name>
+							<name>text:report-type</name>
+							<name>text:volume</name>
+							<name>text:year</name>
+							<name>text:url</name>
+							<name>text:custom1</name>
+							<name>text:custom2</name>
+							<name>text:custom3</name>
+							<name>text:custom4</name>
+							<name>text:custom5</name>
+							<name>text:isbn</name>
+							<name>text:issn</name>
+						</choice>
+						<ref name="string"/>
+					</attribute>
+				</zeroOrMore>
+				<text/>
+			</element>
+			<element name="presentation:header">
+				<empty/>
+			</element>
+			<element name="presentation:footer">
+				<empty/>
+			</element>
+			<element name="presentation:date-time">
+				<empty/>
+			</element>
+		</choice>
+	</define>
+	<define name="text-tab-attr">
+		<optional>
+			<attribute name="text:tab-ref">
+				<ref name="nonNegativeInteger"/>
+			</attribute>
+		</optional>
+	</define>
+	<define name="text-a">
+		<element name="text:a">
+			<ref name="text-a-attlist"/>
+			<optional>
+				<ref name="office-event-listeners"/>
+			</optional>
+			<zeroOrMore>
+				<ref name="paragraph-content"/>
+			</zeroOrMore>
+		</element>
+	</define>
+	<define name="text-a-attlist">
+		<interleave>
+			<optional>
+				<attribute name="office:name">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="office:title">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<attribute name="xlink:type">
+				<value>simple</value>
+			</attribute>
+			<attribute name="xlink:href">
+				<ref name="anyIRI"/>
+			</attribute>
+			<optional>
+				<attribute name="xlink:actuate">
+					<value>onRequest</value>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="office:target-frame-name">
+					<ref name="targetFrameName"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="xlink:show">
+					<choice>
+						<value>new</value>
+						<value>replace</value>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="text:style-name">
+					<ref name="styleNameRef"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="text:visited-style-name">
+					<ref name="styleNameRef"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="text-meta-attlist">
+		<interleave>
+			<optional>
+				<ref name="common-in-content-meta-attlist"/>
+			</optional>
+			<optional>
+				<ref name="xml-id"/>
+			</optional>
+		</interleave>
+	</define>
+	<define name="text-bookmark">
+		<element name="text:bookmark">
+			<ref name="text-bookmark-attlist"/>
+			<empty/>
+		</element>
+	</define>
+	<define name="text-bookmark-start">
+		<element name="text:bookmark-start">
+			<ref name="text-bookmark-start-attlist"/>
+			<empty/>
+		</element>
+	</define>
+	<define name="text-bookmark-end">
+		<element name="text:bookmark-end">
+			<ref name="text-bookmark-end-attlist"/>
+			<empty/>
+		</element>
+	</define>
+	<define name="text-bookmark-attlist">
+		<interleave>
+			<attribute name="text:name">
+				<ref name="string"/>
+			</attribute>
+			<optional>
+				<ref name="xml-id"/>
+			</optional>
+		</interleave>
+	</define>
+	<define name="text-bookmark-start-attlist">
+		<interleave>
+			<attribute name="text:name">
+				<ref name="string"/>
+			</attribute>
+			<optional>
+				<ref name="xml-id"/>
+			</optional>
+			<optional>
+				<ref name="common-in-content-meta-attlist"/>
+			</optional>
+		</interleave>
+	</define>
+	<define name="text-bookmark-end-attlist">
+		<attribute name="text:name">
+			<ref name="string"/>
+		</attribute>
+	</define>
+	<define name="text-note-class">
+		<attribute name="text:note-class">
+			<choice>
+				<value>footnote</value>
+				<value>endnote</value>
+			</choice>
+		</attribute>
+	</define>
+	<define name="text-date-attlist">
+		<interleave>
+			<interleave>
+				<ref name="common-field-fixed-attlist"/>
+				<ref name="common-field-data-style-name-attlist"/>
+			</interleave>
+			<optional>
+				<attribute name="text:date-value">
+					<ref name="dateOrDateTime"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="text:date-adjust">
+					<ref name="duration"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="text-time-attlist">
+		<interleave>
+			<interleave>
+				<ref name="common-field-fixed-attlist"/>
+				<ref name="common-field-data-style-name-attlist"/>
+			</interleave>
+			<optional>
+				<attribute name="text:time-value">
+					<ref name="timeOrDateTime"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="text:time-adjust">
+					<ref name="duration"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="text-page-number-attlist">
+		<interleave>
+			<interleave>
+				<ref name="common-field-num-format-attlist"/>
+				<ref name="common-field-fixed-attlist"/>
+			</interleave>
+			<optional>
+				<attribute name="text:page-adjust">
+					<ref name="integer"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="text:select-page">
+					<choice>
+						<value>previous</value>
+						<value>current</value>
+						<value>next</value>
+					</choice>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="text-page-continuation-attlist">
+		<interleave>
+			<attribute name="text:select-page">
+				<choice>
+					<value>previous</value>
+					<value>next</value>
+				</choice>
+			</attribute>
+			<optional>
+				<attribute name="text:string-value">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="text-chapter-attlist">
+		<interleave>
+			<attribute name="text:display">
+				<choice>
+					<value>name</value>
+					<value>number</value>
+					<value>number-and-name</value>
+					<value>plain-number-and-name</value>
+					<value>plain-number</value>
+				</choice>
+			</attribute>
+			<attribute name="text:outline-level">
+				<ref name="nonNegativeInteger"/>
+			</attribute>
+		</interleave>
+	</define>
+	<define name="text-file-name-attlist">
+		<interleave>
+			<optional>
+				<attribute name="text:display">
+					<choice>
+						<value>full</value>
+						<value>path</value>
+						<value>name</value>
+						<value>name-and-extension</value>
+					</choice>
+				</attribute>
+			</optional>
+			<ref name="common-field-fixed-attlist"/>
+		</interleave>
+	</define>
+	<define name="text-template-name-attlist">
+		<optional>
+			<attribute name="text:display">
+				<choice>
+					<value>full</value>
+					<value>path</value>
+					<value>name</value>
+					<value>name-and-extension</value>
+					<value>area</value>
+					<value>title</value>
+				</choice>
+			</attribute>
+		</optional>
+	</define>
+	<define name="text-variable-decl">
+		<element name="text:variable-decl">
+			<ref name="common-field-name-attlist"/>
+			<ref name="common-value-type-attlist"/>
+		</element>
+	</define>
+	<define name="text-user-field-decl">
+		<element name="text:user-field-decl">
+			<ref name="common-field-name-attlist"/>
+			<optional>
+				<ref name="common-field-formula-attlist"/>
+			</optional>
+			<ref name="common-value-and-type-attlist"/>
+		</element>
+	</define>
+	<define name="text-sequence-decl">
+		<element name="text:sequence-decl">
+			<ref name="text-sequence-decl-attlist"/>
+		</element>
+	</define>
+	<define name="text-sequence-decl-attlist">
+		<interleave>
+			<ref name="common-field-name-attlist"/>
+			<attribute name="text:display-outline-level">
+				<ref name="nonNegativeInteger"/>
+			</attribute>
+			<optional>
+				<attribute name="text:separation-character">
+					<ref name="character"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="text-sequence-ref-name">
+		<optional>
+			<attribute name="text:ref-name">
+				<ref name="string"/>
+			</attribute>
+		</optional>
+	</define>
+	<define name="common-field-database-table">
+		<ref name="common-field-database-table-attlist"/>
+		<ref name="common-field-database-name"/>
+	</define>
+	<define name="common-field-database-name">
+		<choice>
+			<optional>
+				<attribute name="text:database-name">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<ref name="form-connection-resource"/>
+		</choice>
+	</define>
+	<define name="common-field-database-table-attlist">
+		<interleave>
+			<attribute name="text:table-name">
+				<ref name="string"/>
+			</attribute>
+			<optional>
+				<attribute name="text:table-type">
+					<choice>
+						<value>table</value>
+						<value>query</value>
+						<value>command</value>
+					</choice>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="text-database-display-attlist">
+		<interleave>
+			<ref name="common-field-database-table"/>
+			<ref name="common-field-data-style-name-attlist"/>
+			<attribute name="text:column-name">
+				<ref name="string"/>
+			</attribute>
+		</interleave>
+	</define>
+	<define name="text-database-next-attlist">
+		<interleave>
+			<ref name="common-field-database-table"/>
+			<optional>
+				<attribute name="text:condition">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="text-database-row-select-attlist">
+		<interleave>
+			<ref name="common-field-database-table"/>
+			<optional>
+				<attribute name="text:condition">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="text:row-number">
+					<ref name="nonNegativeInteger"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="text-set-page-variable-attlist">
+		<interleave>
+			<optional>
+				<attribute name="text:active">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="text:page-adjust">
+					<ref name="integer"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="text-get-page-variable-attlist">
+		<ref name="common-field-num-format-attlist"/>
+	</define>
+	<define name="text-placeholder-attlist">
+		<interleave>
+			<attribute name="text:placeholder-type">
+				<choice>
+					<value>text</value>
+					<value>table</value>
+					<value>text-box</value>
+					<value>image</value>
+					<value>object</value>
+				</choice>
+			</attribute>
+			<ref name="common-field-description-attlist"/>
+		</interleave>
+	</define>
+	<define name="text-conditional-text-attlist">
+		<interleave>
+			<attribute name="text:condition">
+				<ref name="string"/>
+			</attribute>
+			<attribute name="text:string-value-if-true">
+				<ref name="string"/>
+			</attribute>
+			<attribute name="text:string-value-if-false">
+				<ref name="string"/>
+			</attribute>
+			<optional>
+				<attribute name="text:current-value">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="text-hidden-text-attlist">
+		<interleave>
+			<attribute name="text:condition">
+				<ref name="string"/>
+			</attribute>
+			<attribute name="text:string-value">
+				<ref name="string"/>
+			</attribute>
+			<optional>
+				<attribute name="text:is-hidden">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="text-common-ref-content">
+		<interleave>
+			<text/>
+			<optional>
+				<attribute name="text:ref-name">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="text-bookmark-ref-content">
+		<optional>
+			<attribute name="text:reference-format">
+				<choice>
+					<ref name="common-ref-format-values"/>
+					<value>number-no-superior</value>
+					<value>number-all-superior</value>
+					<value>number</value>
+				</choice>
+			</attribute>
+		</optional>
+	</define>
+	<define name="text-note-ref-content">
+		<interleave>
+			<optional>
+				<attribute name="text:reference-format">
+					<choice>
+						<ref name="common-ref-format-values"/>
+					</choice>
+				</attribute>
+			</optional>
+			<ref name="text-note-class"/>
+		</interleave>
+	</define>
+	<define name="text-sequence-ref-content">
+		<optional>
+			<attribute name="text:reference-format">
+				<choice>
+					<ref name="common-ref-format-values"/>
+					<value>category-and-value</value>
+					<value>caption</value>
+					<value>value</value>
+				</choice>
+			</attribute>
+		</optional>
+	</define>
+	<define name="common-ref-format-values">
+		<choice>
+			<value>page</value>
+			<value>chapter</value>
+			<value>direction</value>
+			<value>text</value>
+		</choice>
+	</define>
+	<define name="text-hidden-paragraph-attlist">
+		<interleave>
+			<attribute name="text:condition">
+				<ref name="string"/>
+			</attribute>
+			<optional>
+				<attribute name="text:is-hidden">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="text-meta-field-attlist">
+		<interleave>
+			<ref name="xml-id"/>
+			<ref name="common-field-data-style-name-attlist"/>
+		</interleave>
+	</define>
+	<define name="common-value-type-attlist">
+		<attribute name="office:value-type">
+			<ref name="valueType"/>
+		</attribute>
+	</define>
+	<define name="common-value-and-type-attlist">
+		<choice>
+			<group>
+				<attribute name="office:value-type">
+					<value>float</value>
+				</attribute>
+				<attribute name="office:value">
+					<ref name="double"/>
+				</attribute>
+			</group>
+			<group>
+				<attribute name="office:value-type">
+					<value>percentage</value>
+				</attribute>
+				<attribute name="office:value">
+					<ref name="double"/>
+				</attribute>
+			</group>
+			<group>
+				<attribute name="office:value-type">
+					<value>currency</value>
+				</attribute>
+				<attribute name="office:value">
+					<ref name="double"/>
+				</attribute>
+				<optional>
+					<attribute name="office:currency">
+						<ref name="string"/>
+					</attribute>
+				</optional>
+			</group>
+			<group>
+				<attribute name="office:value-type">
+					<value>date</value>
+				</attribute>
+				<attribute name="office:date-value">
+					<ref name="dateOrDateTime"/>
+				</attribute>
+			</group>
+			<group>
+				<attribute name="office:value-type">
+					<value>time</value>
+				</attribute>
+				<attribute name="office:time-value">
+					<ref name="duration"/>
+				</attribute>
+			</group>
+			<group>
+				<attribute name="office:value-type">
+					<value>boolean</value>
+				</attribute>
+				<attribute name="office:boolean-value">
+					<ref name="boolean"/>
+				</attribute>
+			</group>
+			<group>
+				<attribute name="office:value-type">
+					<value>string</value>
+				</attribute>
+				<optional>
+					<attribute name="office:string-value">
+						<ref name="string"/>
+					</attribute>
+				</optional>
+			</group>
+		</choice>
+	</define>
+	<define name="common-field-fixed-attlist">
+		<optional>
+			<attribute name="text:fixed">
+				<ref name="boolean"/>
+			</attribute>
+		</optional>
+	</define>
+	<define name="common-field-name-attlist">
+		<attribute name="text:name">
+			<ref name="variableName"/>
+		</attribute>
+	</define>
+	<define name="common-field-description-attlist">
+		<optional>
+			<attribute name="text:description">
+				<ref name="string"/>
+			</attribute>
+		</optional>
+	</define>
+	<define name="common-field-display-value-none-attlist">
+		<optional>
+			<attribute name="text:display">
+				<choice>
+					<value>value</value>
+					<value>none</value>
+				</choice>
+			</attribute>
+		</optional>
+	</define>
+	<define name="common-field-display-value-formula-none-attlist">
+		<optional>
+			<attribute name="text:display">
+				<choice>
+					<value>value</value>
+					<value>formula</value>
+					<value>none</value>
+				</choice>
+			</attribute>
+		</optional>
+	</define>
+	<define name="common-field-display-value-formula-attlist">
+		<optional>
+			<attribute name="text:display">
+				<choice>
+					<value>value</value>
+					<value>formula</value>
+				</choice>
+			</attribute>
+		</optional>
+	</define>
+	<define name="common-field-formula-attlist">
+		<optional>
+			<attribute name="text:formula">
+				<ref name="string"/>
+			</attribute>
+		</optional>
+	</define>
+	<define name="common-field-data-style-name-attlist">
+		<optional>
+			<attribute name="style:data-style-name">
+				<ref name="styleNameRef"/>
+			</attribute>
+		</optional>
+	</define>
+	<define name="common-field-num-format-attlist">
+		<optional>
+			<ref name="common-num-format-attlist"/>
+		</optional>
+	</define>
+	<define name="text-toc-mark-start-attrs">
+		<ref name="text-id"/>
+		<ref name="text-outline-level"/>
+	</define>
+	<define name="text-outline-level">
+		<optional>
+			<attribute name="text:outline-level">
+				<ref name="positiveInteger"/>
+			</attribute>
+		</optional>
+	</define>
+	<define name="text-id">
+		<attribute name="text:id">
+			<ref name="string"/>
+		</attribute>
+	</define>
+	<define name="text-index-name">
+		<attribute name="text:index-name">
+			<ref name="string"/>
+		</attribute>
+	</define>
+	<define name="text-alphabetical-index-mark-attrs">
+		<interleave>
+			<optional>
+				<attribute name="text:key1">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="text:key2">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="text:string-value-phonetic">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="text:key1-phonetic">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="text:key2-phonetic">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="text:main-entry">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="text-bibliography-types">
+		<choice>
+			<value>article</value>
+			<value>book</value>
+			<value>booklet</value>
+			<value>conference</value>
+			<value>custom1</value>
+			<value>custom2</value>
+			<value>custom3</value>
+			<value>custom4</value>
+			<value>custom5</value>
+			<value>email</value>
+			<value>inbook</value>
+			<value>incollection</value>
+			<value>inproceedings</value>
+			<value>journal</value>
+			<value>manual</value>
+			<value>mastersthesis</value>
+			<value>misc</value>
+			<value>phdthesis</value>
+			<value>proceedings</value>
+			<value>techreport</value>
+			<value>unpublished</value>
+			<value>www</value>
+		</choice>
+	</define>
+	<define name="text-index-body">
+		<element name="text:index-body">
+			<zeroOrMore>
+				<ref name="index-content-main"/>
+			</zeroOrMore>
+		</element>
+	</define>
+	<define name="index-content-main">
+		<choice>
+			<ref name="text-content"/>
+			<ref name="text-index-title"/>
+		</choice>
+	</define>
+	<define name="text-index-title">
+		<element name="text:index-title">
+			<ref name="common-section-attlist"/>
+			<zeroOrMore>
+				<ref name="index-content-main"/>
+			</zeroOrMore>
+		</element>
+	</define>
+	<define name="text-table-of-content">
+		<element name="text:table-of-content">
+			<ref name="common-section-attlist"/>
+			<ref name="text-table-of-content-source"/>
+			<ref name="text-index-body"/>
+		</element>
+	</define>
+	<define name="text-table-of-content-source">
+		<element name="text:table-of-content-source">
+			<ref name="text-table-of-content-source-attlist"/>
+			<optional>
+				<ref name="text-index-title-template"/>
+			</optional>
+			<zeroOrMore>
+				<ref name="text-table-of-content-entry-template"/>
+			</zeroOrMore>
+			<zeroOrMore>
+				<ref name="text-index-source-styles"/>
+			</zeroOrMore>
+		</element>
+	</define>
+	<define name="text-table-of-content-source-attlist">
+		<interleave>
+			<optional>
+				<attribute name="text:outline-level">
+					<ref name="positiveInteger"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="text:use-outline-level">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="text:use-index-marks">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="text:use-index-source-styles">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="text:index-scope">
+					<choice>
+						<value>document</value>
+						<value>chapter</value>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="text:relative-tab-stop-position">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="text-table-of-content-entry-template">
+		<element name="text:table-of-content-entry-template">
+			<ref name="text-table-of-content-entry-template-attlist"/>
+			<zeroOrMore>
+				<ref name="text-table-of-content-children"/>
+			</zeroOrMore>
+		</element>
+	</define>
+	<define name="text-table-of-content-children">
+		<choice>
+			<ref name="text-index-entry-chapter"/>
+			<ref name="text-index-entry-page-number"/>
+			<ref name="text-index-entry-text"/>
+			<ref name="text-index-entry-span"/>
+			<ref name="text-index-entry-tab-stop"/>
+			<ref name="text-index-entry-link-start"/>
+			<ref name="text-index-entry-link-end"/>
+		</choice>
+	</define>
+	<define name="text-table-of-content-entry-template-attlist">
+		<interleave>
+			<attribute name="text:outline-level">
+				<ref name="positiveInteger"/>
+			</attribute>
+			<attribute name="text:style-name">
+				<ref name="styleNameRef"/>
+			</attribute>
+		</interleave>
+	</define>
+	<define name="text-illustration-index">
+		<element name="text:illustration-index">
+			<ref name="common-section-attlist"/>
+			<ref name="text-illustration-index-source"/>
+			<ref name="text-index-body"/>
+		</element>
+	</define>
+	<define name="text-illustration-index-source">
+		<element name="text:illustration-index-source">
+			<ref name="text-illustration-index-source-attrs"/>
+			<optional>
+				<ref name="text-index-title-template"/>
+			</optional>
+			<optional>
+				<ref name="text-illustration-index-entry-template"/>
+			</optional>
+		</element>
+	</define>
+	<define name="text-illustration-index-source-attrs">
+		<interleave>
+			<ref name="text-index-scope-attr"/>
+			<ref name="text-relative-tab-stop-position-attr"/>
+			<optional>
+				<attribute name="text:use-caption">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="text:caption-sequence-name">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="text:caption-sequence-format">
+					<choice>
+						<value>text</value>
+						<value>category-and-value</value>
+						<value>caption</value>
+					</choice>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="text-index-scope-attr">
+		<optional>
+			<attribute name="text:index-scope">
+				<choice>
+					<value>document</value>
+					<value>chapter</value>
+				</choice>
+			</attribute>
+		</optional>
+	</define>
+	<define name="text-relative-tab-stop-position-attr">
+		<optional>
+			<attribute name="text:relative-tab-stop-position">
+				<ref name="boolean"/>
+			</attribute>
+		</optional>
+	</define>
+	<define name="text-illustration-index-entry-template">
+		<element name="text:illustration-index-entry-template">
+			<ref name="text-illustration-index-entry-content"/>
+		</element>
+	</define>
+	<define name="text-illustration-index-entry-content">
+		<ref name="text-illustration-index-entry-template-attrs"/>
+		<zeroOrMore>
+			<choice>
+				<ref name="text-index-entry-chapter"/>
+				<ref name="text-index-entry-page-number"/>
+				<ref name="text-index-entry-text"/>
+				<ref name="text-index-entry-span"/>
+				<ref name="text-index-entry-tab-stop"/>
+			</choice>
+		</zeroOrMore>
+	</define>
+	<define name="text-illustration-index-entry-template-attrs">
+		<attribute name="text:style-name">
+			<ref name="styleNameRef"/>
+		</attribute>
+	</define>
+	<define name="text-table-index">
+		<element name="text:table-index">
+			<ref name="common-section-attlist"/>
+			<ref name="text-table-index-source"/>
+			<ref name="text-index-body"/>
+		</element>
+	</define>
+	<define name="text-table-index-source">
+		<element name="text:table-index-source">
+			<ref name="text-illustration-index-source-attrs"/>
+			<optional>
+				<ref name="text-index-title-template"/>
+			</optional>
+			<optional>
+				<ref name="text-table-index-entry-template"/>
+			</optional>
+		</element>
+	</define>
+	<define name="text-table-index-entry-template">
+		<element name="text:table-index-entry-template">
+			<ref name="text-illustration-index-entry-content"/>
+		</element>
+	</define>
+	<define name="text-object-index">
+		<element name="text:object-index">
+			<ref name="common-section-attlist"/>
+			<ref name="text-object-index-source"/>
+			<ref name="text-index-body"/>
+		</element>
+	</define>
+	<define name="text-object-index-source">
+		<element name="text:object-index-source">
+			<ref name="text-object-index-source-attrs"/>
+			<optional>
+				<ref name="text-index-title-template"/>
+			</optional>
+			<optional>
+				<ref name="text-object-index-entry-template"/>
+			</optional>
+		</element>
+	</define>
+	<define name="text-object-index-source-attrs">
+		<interleave>
+			<ref name="text-index-scope-attr"/>
+			<ref name="text-relative-tab-stop-position-attr"/>
+			<optional>
+				<attribute name="text:use-spreadsheet-objects">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="text:use-math-objects">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="text:use-draw-objects">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="text:use-chart-objects">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="text:use-other-objects">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="text-object-index-entry-template">
+		<element name="text:object-index-entry-template">
+			<ref name="text-illustration-index-entry-content"/>
+		</element>
+	</define>
+	<define name="text-user-index">
+		<element name="text:user-index">
+			<ref name="common-section-attlist"/>
+			<ref name="text-user-index-source"/>
+			<ref name="text-index-body"/>
+		</element>
+	</define>
+	<define name="text-user-index-source">
+		<element name="text:user-index-source">
+			<ref name="text-user-index-source-attr"/>
+			<optional>
+				<ref name="text-index-title-template"/>
+			</optional>
+			<zeroOrMore>
+				<ref name="text-user-index-entry-template"/>
+			</zeroOrMore>
+			<zeroOrMore>
+				<ref name="text-index-source-styles"/>
+			</zeroOrMore>
+		</element>
+	</define>
+	<define name="text-user-index-source-attr">
+		<interleave>
+			<ref name="text-index-scope-attr"/>
+			<ref name="text-relative-tab-stop-position-attr"/>
+			<optional>
+				<attribute name="text:use-index-marks">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="text:use-index-source-styles">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="text:use-graphics">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="text:use-tables">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="text:use-floating-frames">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="text:use-objects">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="text:copy-outline-levels">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<attribute name="text:index-name">
+				<ref name="string"/>
+			</attribute>
+		</interleave>
+	</define>
+	<define name="text-user-index-entry-template">
+		<element name="text:user-index-entry-template">
+			<ref name="text-user-index-entry-template-attrs"/>
+			<zeroOrMore>
+				<choice>
+					<ref name="text-index-entry-chapter"/>
+					<ref name="text-index-entry-page-number"/>
+					<ref name="text-index-entry-text"/>
+					<ref name="text-index-entry-span"/>
+					<ref name="text-index-entry-tab-stop"/>
+				</choice>
+			</zeroOrMore>
+		</element>
+	</define>
+	<define name="text-user-index-entry-template-attrs">
+		<interleave>
+			<attribute name="text:outline-level">
+				<ref name="positiveInteger"/>
+			</attribute>
+			<attribute name="text:style-name">
+				<ref name="styleNameRef"/>
+			</attribute>
+		</interleave>
+	</define>
+	<define name="text-alphabetical-index">
+		<element name="text:alphabetical-index">
+			<ref name="common-section-attlist"/>
+			<ref name="text-alphabetical-index-source"/>
+			<ref name="text-index-body"/>
+		</element>
+	</define>
+	<define name="text-alphabetical-index-source">
+		<element name="text:alphabetical-index-source">
+			<ref name="text-alphabetical-index-source-attrs"/>
+			<optional>
+				<ref name="text-index-title-template"/>
+			</optional>
+			<zeroOrMore>
+				<ref name="text-alphabetical-index-entry-template"/>
+			</zeroOrMore>
+		</element>
+	</define>
+	<define name="text-alphabetical-index-source-attrs">
+		<interleave>
+			<ref name="text-index-scope-attr"/>
+			<ref name="text-relative-tab-stop-position-attr"/>
+			<optional>
+				<attribute name="text:ignore-case">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="text:main-entry-style-name">
+					<ref name="styleNameRef"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="text:alphabetical-separators">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="text:combine-entries">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="text:combine-entries-with-dash">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="text:combine-entries-with-pp">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="text:use-keys-as-entries">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="text:capitalize-entries">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="text:comma-separated">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="fo:language">
+					<ref name="languageCode"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="fo:country">
+					<ref name="countryCode"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="fo:script">
+					<ref name="scriptCode"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:rfc-language-tag">
+					<ref name="language"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="text:sort-algorithm">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="text-alphabetical-index-auto-mark-file">
+		<element name="text:alphabetical-index-auto-mark-file">
+			<attribute name="xlink:type">
+				<value>simple</value>
+			</attribute>
+			<attribute name="xlink:href">
+				<ref name="anyIRI"/>
+			</attribute>
+		</element>
+	</define>
+	<define name="text-alphabetical-index-entry-template">
+		<element name="text:alphabetical-index-entry-template">
+			<ref name="text-alphabetical-index-entry-template-attrs"/>
+			<zeroOrMore>
+				<choice>
+					<ref name="text-index-entry-chapter"/>
+					<ref name="text-index-entry-page-number"/>
+					<ref name="text-index-entry-text"/>
+					<ref name="text-index-entry-span"/>
+					<ref name="text-index-entry-tab-stop"/>
+				</choice>
+			</zeroOrMore>
+		</element>
+	</define>
+	<define name="text-alphabetical-index-entry-template-attrs">
+		<interleave>
+			<attribute name="text:outline-level">
+				<choice>
+					<value>1</value>
+					<value>2</value>
+					<value>3</value>
+					<value>separator</value>
+				</choice>
+			</attribute>
+			<attribute name="text:style-name">
+				<ref name="styleNameRef"/>
+			</attribute>
+		</interleave>
+	</define>
+	<define name="text-bibliography">
+		<element name="text:bibliography">
+			<ref name="common-section-attlist"/>
+			<ref name="text-bibliography-source"/>
+			<ref name="text-index-body"/>
+		</element>
+	</define>
+	<define name="text-bibliography-source">
+		<element name="text:bibliography-source">
+			<optional>
+				<ref name="text-index-title-template"/>
+			</optional>
+			<zeroOrMore>
+				<ref name="text-bibliography-entry-template"/>
+			</zeroOrMore>
+		</element>
+	</define>
+	<define name="text-bibliography-entry-template">
+		<element name="text:bibliography-entry-template">
+			<ref name="text-bibliography-entry-template-attrs"/>
+			<zeroOrMore>
+				<choice>
+					<ref name="text-index-entry-span"/>
+					<ref name="text-index-entry-tab-stop"/>
+					<ref name="text-index-entry-bibliography"/>
+				</choice>
+			</zeroOrMore>
+		</element>
+	</define>
+	<define name="text-bibliography-entry-template-attrs">
+		<interleave>
+			<attribute name="text:bibliography-type">
+				<ref name="text-bibliography-types"/>
+			</attribute>
+			<attribute name="text:style-name">
+				<ref name="styleNameRef"/>
+			</attribute>
+		</interleave>
+	</define>
+	<define name="text-index-source-styles">
+		<element name="text:index-source-styles">
+			<attribute name="text:outline-level">
+				<ref name="positiveInteger"/>
+			</attribute>
+			<zeroOrMore>
+				<ref name="text-index-source-style"/>
+			</zeroOrMore>
+		</element>
+	</define>
+	<define name="text-index-source-style">
+		<element name="text:index-source-style">
+			<attribute name="text:style-name">
+				<ref name="styleName"/>
+			</attribute>
+			<empty/>
+		</element>
+	</define>
+	<define name="text-index-title-template">
+		<element name="text:index-title-template">
+			<optional>
+				<attribute name="text:style-name">
+					<ref name="styleNameRef"/>
+				</attribute>
+			</optional>
+			<text/>
+		</element>
+	</define>
+	<define name="text-index-entry-chapter">
+		<element name="text:index-entry-chapter">
+			<optional>
+				<attribute name="text:style-name">
+					<ref name="styleNameRef"/>
+				</attribute>
+			</optional>
+			<ref name="text-index-entry-chapter-attrs"/>
+		</element>
+	</define>
+	<define name="text-index-entry-chapter-attrs">
+		<interleave>
+			<optional>
+				<attribute name="text:display">
+					<choice>
+						<value>name</value>
+						<value>number</value>
+						<value>number-and-name</value>
+						<value>plain-number</value>
+						<value>plain-number-and-name</value>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="text:outline-level">
+					<ref name="positiveInteger"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="text-index-entry-text">
+		<element name="text:index-entry-text">
+			<optional>
+				<attribute name="text:style-name">
+					<ref name="styleNameRef"/>
+				</attribute>
+			</optional>
+		</element>
+	</define>
+	<define name="text-index-entry-page-number">
+		<element name="text:index-entry-page-number">
+			<optional>
+				<attribute name="text:style-name">
+					<ref name="styleNameRef"/>
+				</attribute>
+			</optional>
+		</element>
+	</define>
+	<define name="text-index-entry-span">
+		<element name="text:index-entry-span">
+			<optional>
+				<attribute name="text:style-name">
+					<ref name="styleNameRef"/>
+				</attribute>
+			</optional>
+			<text/>
+		</element>
+	</define>
+	<define name="text-index-entry-bibliography">
+		<element name="text:index-entry-bibliography">
+			<ref name="text-index-entry-bibliography-attrs"/>
+		</element>
+	</define>
+	<define name="text-index-entry-bibliography-attrs">
+		<interleave>
+			<optional>
+				<attribute name="text:style-name">
+					<ref name="styleNameRef"/>
+				</attribute>
+			</optional>
+			<attribute name="text:bibliography-data-field">
+				<choice>
+					<value>address</value>
+					<value>annote</value>
+					<value>author</value>
+					<value>bibliography-type</value>
+					<value>booktitle</value>
+					<value>chapter</value>
+					<value>custom1</value>
+					<value>custom2</value>
+					<value>custom3</value>
+					<value>custom4</value>
+					<value>custom5</value>
+					<value>edition</value>
+					<value>editor</value>
+					<value>howpublished</value>
+					<value>identifier</value>
+					<value>institution</value>
+					<value>isbn</value>
+					<value>issn</value>
+					<value>journal</value>
+					<value>month</value>
+					<value>note</value>
+					<value>number</value>
+					<value>organizations</value>
+					<value>pages</value>
+					<value>publisher</value>
+					<value>report-type</value>
+					<value>school</value>
+					<value>series</value>
+					<value>title</value>
+					<value>url</value>
+					<value>volume</value>
+					<value>year</value>
+				</choice>
+			</attribute>
+		</interleave>
+	</define>
+	<define name="text-index-entry-tab-stop">
+		<element name="text:index-entry-tab-stop">
+			<optional>
+				<attribute name="text:style-name">
+					<ref name="styleNameRef"/>
+				</attribute>
+			</optional>
+			<ref name="text-index-entry-tab-stop-attrs"/>
+		</element>
+	</define>
+	<define name="text-index-entry-tab-stop-attrs">
+		<interleave>
+			<optional>
+				<attribute name="style:leader-char">
+					<ref name="character"/>
+				</attribute>
+			</optional>
+			<choice>
+				<attribute name="style:type">
+					<value>right</value>
+				</attribute>
+				<group>
+					<attribute name="style:type">
+						<value>left</value>
+					</attribute>
+					<attribute name="style:position">
+						<ref name="length"/>
+					</attribute>
+				</group>
+			</choice>
+		</interleave>
+	</define>
+	<define name="text-index-entry-link-start">
+		<element name="text:index-entry-link-start">
+			<optional>
+				<attribute name="text:style-name">
+					<ref name="styleNameRef"/>
+				</attribute>
+			</optional>
+		</element>
+	</define>
+	<define name="text-index-entry-link-end">
+		<element name="text:index-entry-link-end">
+			<optional>
+				<attribute name="text:style-name">
+					<ref name="styleNameRef"/>
+				</attribute>
+			</optional>
+		</element>
+	</define>
+	<define name="table-table">
+		<element name="table:table">
+			<ref name="table-table-attlist"/>
+			<optional>
+				<ref name="table-title"/>
+			</optional>
+			<optional>
+				<ref name="table-desc"/>
+			</optional>
+			<optional>
+				<ref name="table-table-source"/>
+			</optional>
+			<optional>
+				<ref name="office-dde-source"/>
+			</optional>
+			<optional>
+				<ref name="table-scenario"/>
+			</optional>
+			<optional>
+				<ref name="office-forms"/>
+			</optional>
+			<optional>
+				<ref name="table-shapes"/>
+			</optional>
+			<ref name="table-columns-and-groups"/>
+			<ref name="table-rows-and-groups"/>
+			<optional>
+				<ref name="table-named-expressions"/>
+			</optional>
+		</element>
+	</define>
+	<define name="table-columns-and-groups">
+		<oneOrMore>
+			<choice>
+				<ref name="table-table-column-group"/>
+				<ref name="table-columns-no-group"/>
+			</choice>
+		</oneOrMore>
+	</define>
+	<define name="table-columns-no-group">
+		<choice>
+			<group>
+				<ref name="table-columns"/>
+				<optional>
+					<ref name="table-table-header-columns"/>
+					<optional>
+						<ref name="table-columns"/>
+					</optional>
+				</optional>
+			</group>
+			<group>
+				<ref name="table-table-header-columns"/>
+				<optional>
+					<ref name="table-columns"/>
+				</optional>
+			</group>
+		</choice>
+	</define>
+	<define name="table-columns">
+		<choice>
+			<ref name="table-table-columns"/>
+			<oneOrMore>
+				<ref name="table-table-column"/>
+			</oneOrMore>
+		</choice>
+	</define>
+	<define name="table-rows-and-groups">
+		<oneOrMore>
+			<choice>
+				<ref name="table-table-row-group"/>
+				<ref name="table-rows-no-group"/>
+			</choice>
+		</oneOrMore>
+	</define>
+	<define name="table-rows-no-group">
+		<choice>
+			<group>
+				<ref name="table-rows"/>
+				<optional>
+					<ref name="table-table-header-rows"/>
+					<optional>
+						<ref name="table-rows"/>
+					</optional>
+				</optional>
+			</group>
+			<group>
+				<ref name="table-table-header-rows"/>
+				<optional>
+					<ref name="table-rows"/>
+				</optional>
+			</group>
+		</choice>
+	</define>
+	<define name="table-rows">
+		<choice>
+			<ref name="table-table-rows"/>
+			<oneOrMore>
+				<optional>
+					<ref name="text-soft-page-break"/>
+				</optional>
+				<ref name="table-table-row"/>
+			</oneOrMore>
+		</choice>
+	</define>
+	<define name="table-table-attlist">
+		<interleave>
+			<optional>
+				<attribute name="table:name">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="table:style-name">
+					<ref name="styleNameRef"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="table:template-name">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="table:use-first-row-styles">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="table:use-last-row-styles">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="table:use-first-column-styles">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="table:use-last-column-styles">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="table:use-banding-rows-styles">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="table:use-banding-columns-styles">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="table:protected">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="table:protection-key">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="table:protection-key-digest-algorithm">
+					<ref name="anyIRI"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="table:print">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="table:print-ranges">
+					<ref name="cellRangeAddressList"/>
+				</attribute>
+			</optional>
+			<optional>
+				<ref name="xml-id"/>
+			</optional>
+			<optional>
+				<attribute name="table:is-sub-table">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="table-title">
+		<element name="table:title">
+			<text/>
+		</element>
+	</define>
+	<define name="table-desc">
+		<element name="table:desc">
+			<text/>
+		</element>
+	</define>
+	<define name="table-table-row">
+		<element name="table:table-row">
+			<ref name="table-table-row-attlist"/>
+			<oneOrMore>
+				<choice>
+					<ref name="table-table-cell"/>
+					<ref name="table-covered-table-cell"/>
+				</choice>
+			</oneOrMore>
+		</element>
+	</define>
+	<define name="table-table-row-attlist">
+		<interleave>
+			<optional>
+				<attribute name="table:number-rows-repeated">
+					<ref name="positiveInteger"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="table:style-name">
+					<ref name="styleNameRef"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="table:default-cell-style-name">
+					<ref name="styleNameRef"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="table:visibility">
+					<ref name="table-visibility-value"/>
+				</attribute>
+			</optional>
+			<optional>
+				<ref name="xml-id"/>
+			</optional>
+		</interleave>
+	</define>
+	<define name="table-visibility-value">
+		<choice>
+			<value>visible</value>
+			<value>collapse</value>
+			<value>filter</value>
+		</choice>
+	</define>
+	<define name="table-table-cell">
+		<element name="table:table-cell">
+			<ref name="table-table-cell-attlist"/>
+			<ref name="table-table-cell-attlist-extra"/>
+			<ref name="table-table-cell-content"/>
+		</element>
+	</define>
+	<define name="table-covered-table-cell">
+		<element name="table:covered-table-cell">
+			<ref name="table-table-cell-attlist"/>
+			<ref name="table-table-cell-content"/>
+		</element>
+	</define>
+	<define name="table-table-cell-content">
+		<optional>
+			<ref name="table-cell-range-source"/>
+		</optional>
+		<optional>
+			<ref name="office-annotation"/>
+		</optional>
+		<optional>
+			<ref name="table-detective"/>
+		</optional>
+		<zeroOrMore>
+			<ref name="text-content"/>
+		</zeroOrMore>
+	</define>
+	<define name="table-table-cell-attlist">
+		<interleave>
+			<optional>
+				<attribute name="table:number-columns-repeated">
+					<ref name="positiveInteger"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="table:style-name">
+					<ref name="styleNameRef"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="table:content-validation-name">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="table:formula">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<ref name="common-value-and-type-attlist"/>
+			</optional>
+			<optional>
+				<attribute name="table:protect">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="table:protected">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<ref name="xml-id"/>
+			</optional>
+			<optional>
+				<ref name="common-in-content-meta-attlist"/>
+			</optional>
+		</interleave>
+	</define>
+	<define name="table-table-cell-attlist-extra">
+		<interleave>
+			<optional>
+				<attribute name="table:number-columns-spanned">
+					<ref name="positiveInteger"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="table:number-rows-spanned">
+					<ref name="positiveInteger"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="table:number-matrix-columns-spanned">
+					<ref name="positiveInteger"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="table:number-matrix-rows-spanned">
+					<ref name="positiveInteger"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="table-table-column">
+		<element name="table:table-column">
+			<ref name="table-table-column-attlist"/>
+			<empty/>
+		</element>
+	</define>
+	<define name="table-table-column-attlist">
+		<interleave>
+			<optional>
+				<attribute name="table:number-columns-repeated">
+					<ref name="positiveInteger"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="table:style-name">
+					<ref name="styleNameRef"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="table:visibility">
+					<ref name="table-visibility-value"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="table:default-cell-style-name">
+					<ref name="styleNameRef"/>
+				</attribute>
+			</optional>
+			<optional>
+				<ref name="xml-id"/>
+			</optional>
+		</interleave>
+	</define>
+	<define name="table-table-header-columns">
+		<element name="table:table-header-columns">
+			<oneOrMore>
+				<ref name="table-table-column"/>
+			</oneOrMore>
+		</element>
+	</define>
+	<define name="table-table-columns">
+		<element name="table:table-columns">
+			<oneOrMore>
+				<ref name="table-table-column"/>
+			</oneOrMore>
+		</element>
+	</define>
+	<define name="table-table-column-group">
+		<element name="table:table-column-group">
+			<ref name="table-table-column-group-attlist"/>
+			<ref name="table-columns-and-groups"/>
+		</element>
+	</define>
+	<define name="table-table-column-group-attlist">
+		<optional>
+			<attribute name="table:display">
+				<ref name="boolean"/>
+			</attribute>
+		</optional>
+	</define>
+	<define name="table-table-header-rows">
+		<element name="table:table-header-rows">
+			<oneOrMore>
+				<optional>
+					<ref name="text-soft-page-break"/>
+				</optional>
+				<ref name="table-table-row"/>
+			</oneOrMore>
+		</element>
+	</define>
+	<define name="table-table-rows">
+		<element name="table:table-rows">
+			<oneOrMore>
+				<optional>
+					<ref name="text-soft-page-break"/>
+				</optional>
+				<ref name="table-table-row"/>
+			</oneOrMore>
+		</element>
+	</define>
+	<define name="table-table-row-group">
+		<element name="table:table-row-group">
+			<ref name="table-table-row-group-attlist"/>
+			<ref name="table-rows-and-groups"/>
+		</element>
+	</define>
+	<define name="table-table-row-group-attlist">
+		<optional>
+			<attribute name="table:display">
+				<ref name="boolean"/>
+			</attribute>
+		</optional>
+	</define>
+	<define name="cellAddress">
+		<data type="string">
+			<param name="pattern">($?([^\. ']+|'([^']|'')+'))?\.$?[A-Z]+$?[0-9]+</param>
+		</data>
+	</define>
+	<define name="cellRangeAddress">
+		<choice>
+			<data type="string">
+				<param name="pattern">($?([^\. ']+|'([^']|'')+'))?\.$?[A-Z]+$?[0-9]+(:($?([^\. ']+|'([^']|'')+'))?\.$?[A-Z]+$?[0-9]+)?</param>
+			</data>
+			<data type="string">
+				<param name="pattern">($?([^\. ']+|'([^']|'')+'))?\.$?[0-9]+:($?([^\. ']+|'([^']|'')+'))?\.$?[0-9]+</param>
+			</data>
+			<data type="string">
+				<param name="pattern">($?([^\. ']+|'([^']|'')+'))?\.$?[A-Z]+:($?([^\. ']+|'([^']|'')+'))?\.$?[A-Z]+</param>
+			</data>
+		</choice>
+	</define>
+	<define name="cellRangeAddressList">
+		<data type="string"/>
+		<dc:description>Value is a space separated list of "cellRangeAddress" patterns</dc:description>
+	</define>
+	<define name="table-table-source">
+		<element name="table:table-source">
+			<ref name="table-table-source-attlist"/>
+			<ref name="table-linked-source-attlist"/>
+			<empty/>
+		</element>
+	</define>
+	<define name="table-table-source-attlist">
+		<interleave>
+			<optional>
+				<attribute name="table:mode">
+					<choice>
+						<value>copy-all</value>
+						<value>copy-results-only</value>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="table:table-name">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="table-linked-source-attlist">
+		<interleave>
+			<attribute name="xlink:type">
+				<value>simple</value>
+			</attribute>
+			<attribute name="xlink:href">
+				<ref name="anyIRI"/>
+			</attribute>
+			<optional>
+				<attribute name="xlink:actuate">
+					<value>onRequest</value>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="table:filter-name">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="table:filter-options">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="table:refresh-delay">
+					<ref name="duration"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="table-scenario">
+		<element name="table:scenario">
+			<ref name="table-scenario-attlist"/>
+			<empty/>
+		</element>
+	</define>
+	<define name="table-scenario-attlist">
+		<interleave>
+			<attribute name="table:scenario-ranges">
+				<ref name="cellRangeAddressList"/>
+			</attribute>
+			<attribute name="table:is-active">
+				<ref name="boolean"/>
+			</attribute>
+			<optional>
+				<attribute name="table:display-border">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="table:border-color">
+					<ref name="color"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="table:copy-back">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="table:copy-styles">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="table:copy-formulas">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="table:comment">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="table:protected">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="table-shapes">
+		<element name="table:shapes">
+			<oneOrMore>
+				<ref name="shape"/>
+			</oneOrMore>
+		</element>
+	</define>
+	<define name="table-cell-range-source">
+		<element name="table:cell-range-source">
+			<ref name="table-table-cell-range-source-attlist"/>
+			<ref name="table-linked-source-attlist"/>
+			<empty/>
+		</element>
+	</define>
+	<define name="table-table-cell-range-source-attlist">
+		<interleave>
+			<attribute name="table:name">
+				<ref name="string"/>
+			</attribute>
+			<attribute name="table:last-column-spanned">
+				<ref name="positiveInteger"/>
+			</attribute>
+			<attribute name="table:last-row-spanned">
+				<ref name="positiveInteger"/>
+			</attribute>
+		</interleave>
+	</define>
+	<define name="table-detective">
+		<element name="table:detective">
+			<zeroOrMore>
+				<ref name="table-highlighted-range"/>
+			</zeroOrMore>
+			<zeroOrMore>
+				<ref name="table-operation"/>
+			</zeroOrMore>
+		</element>
+	</define>
+	<define name="table-operation">
+		<element name="table:operation">
+			<ref name="table-operation-attlist"/>
+			<empty/>
+		</element>
+	</define>
+	<define name="table-operation-attlist">
+		<interleave>
+			<attribute name="table:name">
+				<choice>
+					<value>trace-dependents</value>
+					<value>remove-dependents</value>
+					<value>trace-precedents</value>
+					<value>remove-precedents</value>
+					<value>trace-errors</value>
+				</choice>
+			</attribute>
+			<attribute name="table:index">
+				<ref name="nonNegativeInteger"/>
+			</attribute>
+		</interleave>
+	</define>
+	<define name="table-highlighted-range">
+		<element name="table:highlighted-range">
+			<choice>
+				<group>
+					<ref name="table-highlighted-range-attlist"/>
+				</group>
+				<group>
+					<ref name="table-highlighted-range-attlist-invalid"/>
+				</group>
+			</choice>
+			<empty/>
+		</element>
+	</define>
+	<define name="table-highlighted-range-attlist">
+		<interleave>
+			<optional>
+				<attribute name="table:cell-range-address">
+					<ref name="cellRangeAddress"/>
+				</attribute>
+			</optional>
+			<attribute name="table:direction">
+				<choice>
+					<value>from-another-table</value>
+					<value>to-another-table</value>
+					<value>from-same-table</value>
+				</choice>
+			</attribute>
+			<optional>
+				<attribute name="table:contains-error">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="table-highlighted-range-attlist-invalid">
+		<attribute name="table:marked-invalid">
+			<ref name="boolean"/>
+		</attribute>
+	</define>
+	<define name="office-spreadsheet-attlist">
+		<optional>
+			<attribute name="table:structure-protected">
+				<ref name="boolean"/>
+			</attribute>
+		</optional>
+		<optional>
+			<attribute name="table:protection-key">
+				<ref name="string"/>
+			</attribute>
+		</optional>
+		<optional>
+			<attribute name="table:protection-key-digest-algorithm">
+				<ref name="anyIRI"/>
+			</attribute>
+		</optional>
+	</define>
+	<define name="table-calculation-settings">
+		<element name="table:calculation-settings">
+			<ref name="table-calculation-setting-attlist"/>
+			<optional>
+				<ref name="table-null-date"/>
+			</optional>
+			<optional>
+				<ref name="table-iteration"/>
+			</optional>
+		</element>
+	</define>
+	<define name="table-calculation-setting-attlist">
+		<interleave>
+			<optional>
+				<attribute name="table:case-sensitive">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="table:precision-as-shown">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="table:search-criteria-must-apply-to-whole-cell">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="table:automatic-find-labels">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="table:use-regular-expressions">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="table:use-wildcards">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="table:null-year">
+					<ref name="positiveInteger"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="table-null-date">
+		<element name="table:null-date">
+			<optional>
+				<attribute name="table:value-type">
+					<value>date</value>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="table:date-value">
+					<ref name="date"/>
+				</attribute>
+			</optional>
+			<empty/>
+		</element>
+	</define>
+	<define name="table-iteration">
+		<element name="table:iteration">
+			<optional>
+				<attribute name="table:status">
+					<choice>
+						<value>enable</value>
+						<value>disable</value>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="table:steps">
+					<ref name="positiveInteger"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="table:maximum-difference">
+					<ref name="double"/>
+				</attribute>
+			</optional>
+			<empty/>
+		</element>
+	</define>
+	<define name="table-content-validations">
+		<element name="table:content-validations">
+			<oneOrMore>
+				<ref name="table-content-validation"/>
+			</oneOrMore>
+		</element>
+	</define>
+	<define name="table-content-validation">
+		<element name="table:content-validation">
+			<ref name="table-validation-attlist"/>
+			<optional>
+				<ref name="table-help-message"/>
+			</optional>
+			<optional>
+				<choice>
+					<ref name="table-error-message"/>
+					<group>
+						<ref name="table-error-macro"/>
+						<ref name="office-event-listeners"/>
+					</group>
+				</choice>
+			</optional>
+		</element>
+	</define>
+	<define name="table-validation-attlist">
+		<interleave>
+			<attribute name="table:name">
+				<ref name="string"/>
+			</attribute>
+			<optional>
+				<attribute name="table:condition">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="table:base-cell-address">
+					<ref name="cellAddress"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="table:allow-empty-cell">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="table:display-list">
+					<choice>
+						<value>none</value>
+						<value>unsorted</value>
+						<value>sort-ascending</value>
+					</choice>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="table-help-message">
+		<element name="table:help-message">
+			<optional>
+				<attribute name="table:title">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="table:display">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<zeroOrMore>
+				<ref name="text-p"/>
+			</zeroOrMore>
+		</element>
+	</define>
+	<define name="table-error-message">
+		<element name="table:error-message">
+			<optional>
+				<attribute name="table:title">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="table:display">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="table:message-type">
+					<choice>
+						<value>stop</value>
+						<value>warning</value>
+						<value>information</value>
+					</choice>
+				</attribute>
+			</optional>
+			<zeroOrMore>
+				<ref name="text-p"/>
+			</zeroOrMore>
+		</element>
+	</define>
+	<define name="table-error-macro">
+		<element name="table:error-macro">
+			<optional>
+				<attribute name="table:execute">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+		</element>
+	</define>
+	<define name="table-label-ranges">
+		<element name="table:label-ranges">
+			<zeroOrMore>
+				<ref name="table-label-range"/>
+			</zeroOrMore>
+		</element>
+	</define>
+	<define name="table-label-range">
+		<element name="table:label-range">
+			<ref name="table-label-range-attlist"/>
+			<empty/>
+		</element>
+	</define>
+	<define name="table-label-range-attlist">
+		<interleave>
+			<attribute name="table:label-cell-range-address">
+				<ref name="cellRangeAddress"/>
+			</attribute>
+			<attribute name="table:data-cell-range-address">
+				<ref name="cellRangeAddress"/>
+			</attribute>
+			<attribute name="table:orientation">
+				<choice>
+					<value>column</value>
+					<value>row</value>
+				</choice>
+			</attribute>
+		</interleave>
+	</define>
+	<define name="table-named-expressions">
+		<element name="table:named-expressions">
+			<zeroOrMore>
+				<choice>
+					<ref name="table-named-range"/>
+					<ref name="table-named-expression"/>
+				</choice>
+			</zeroOrMore>
+		</element>
+	</define>
+	<define name="table-named-range">
+		<element name="table:named-range">
+			<ref name="table-named-range-attlist"/>
+			<empty/>
+		</element>
+	</define>
+	<define name="table-named-range-attlist">
+		<attribute name="table:name">
+			<ref name="string"/>
+		</attribute>
+		<attribute name="table:cell-range-address">
+			<ref name="cellRangeAddress"/>
+		</attribute>
+		<optional>
+			<attribute name="table:base-cell-address">
+				<ref name="cellAddress"/>
+			</attribute>
+		</optional>
+		<optional>
+			<attribute name="table:range-usable-as">
+				<choice>
+					<value>none</value>
+					<list>
+						<oneOrMore>
+							<choice>
+								<value>print-range</value>
+								<value>filter</value>
+								<value>repeat-row</value>
+								<value>repeat-column</value>
+							</choice>
+						</oneOrMore>
+					</list>
+				</choice>
+			</attribute>
+		</optional>
+	</define>
+	<define name="table-named-expression">
+		<element name="table:named-expression">
+			<ref name="table-named-expression-attlist"/>
+			<empty/>
+		</element>
+	</define>
+	<define name="table-named-expression-attlist">
+		<attribute name="table:name">
+			<ref name="string"/>
+		</attribute>
+		<attribute name="table:expression">
+			<ref name="string"/>
+		</attribute>
+		<optional>
+			<attribute name="table:base-cell-address">
+				<ref name="cellAddress"/>
+			</attribute>
+		</optional>
+	</define>
+	<define name="table-database-ranges">
+		<element name="table:database-ranges">
+			<zeroOrMore>
+				<ref name="table-database-range"/>
+			</zeroOrMore>
+		</element>
+	</define>
+	<define name="table-database-range">
+		<element name="table:database-range">
+			<ref name="table-database-range-attlist"/>
+			<optional>
+				<choice>
+					<ref name="table-database-source-sql"/>
+					<ref name="table-database-source-table"/>
+					<ref name="table-database-source-query"/>
+				</choice>
+			</optional>
+			<optional>
+				<ref name="table-filter"/>
+			</optional>
+			<optional>
+				<ref name="table-sort"/>
+			</optional>
+			<optional>
+				<ref name="table-subtotal-rules"/>
+			</optional>
+		</element>
+	</define>
+	<define name="table-database-range-attlist">
+		<interleave>
+			<optional>
+				<attribute name="table:name">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="table:is-selection">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="table:on-update-keep-styles">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="table:on-update-keep-size">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="table:has-persistent-data">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="table:orientation">
+					<choice>
+						<value>column</value>
+						<value>row</value>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="table:contains-header">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="table:display-filter-buttons">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<attribute name="table:target-range-address">
+				<ref name="cellRangeAddress"/>
+			</attribute>
+			<optional>
+				<attribute name="table:refresh-delay">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="table-database-source-sql">
+		<element name="table:database-source-sql">
+			<ref name="table-database-source-sql-attlist"/>
+			<empty/>
+		</element>
+	</define>
+	<define name="table-database-source-sql-attlist">
+		<interleave>
+			<attribute name="table:database-name">
+				<ref name="string"/>
+			</attribute>
+			<attribute name="table:sql-statement">
+				<ref name="string"/>
+			</attribute>
+			<optional>
+				<attribute name="table:parse-sql-statement">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="table-database-source-query">
+		<element name="table:database-source-table">
+			<ref name="table-database-source-table-attlist"/>
+			<empty/>
+		</element>
+	</define>
+	<define name="table-database-source-table-attlist">
+		<interleave>
+			<attribute name="table:database-name">
+				<ref name="string"/>
+			</attribute>
+			<attribute name="table:database-table-name">
+				<ref name="string"/>
+			</attribute>
+		</interleave>
+	</define>
+	<define name="table-database-source-table">
+		<element name="table:database-source-query">
+			<ref name="table-database-source-query-attlist"/>
+			<empty/>
+		</element>
+	</define>
+	<define name="table-database-source-query-attlist">
+		<interleave>
+			<attribute name="table:database-name">
+				<ref name="string"/>
+			</attribute>
+			<attribute name="table:query-name">
+				<ref name="string"/>
+			</attribute>
+		</interleave>
+	</define>
+	<define name="table-sort">
+		<element name="table:sort">
+			<ref name="table-sort-attlist"/>
+			<oneOrMore>
+				<ref name="table-sort-by"/>
+			</oneOrMore>
+		</element>
+	</define>
+	<define name="table-sort-attlist">
+		<interleave>
+			<optional>
+				<attribute name="table:bind-styles-to-content">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="table:target-range-address">
+					<ref name="cellRangeAddress"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="table:case-sensitive">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="table:language">
+					<ref name="languageCode"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="table:country">
+					<ref name="countryCode"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="table:script">
+					<ref name="scriptCode"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="table:rfc-language-tag">
+					<ref name="language"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="table:algorithm">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="table:embedded-number-behavior">
+					<choice>
+						<value>alpha-numeric</value>
+						<value>integer</value>
+						<value>double</value>
+					</choice>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="table-sort-by">
+		<element name="table:sort-by">
+			<ref name="table-sort-by-attlist"/>
+			<empty/>
+		</element>
+	</define>
+	<define name="table-sort-by-attlist">
+		<interleave>
+			<attribute name="table:field-number">
+				<ref name="nonNegativeInteger"/>
+			</attribute>
+			<optional>
+				<attribute name="table:data-type">
+					<choice>
+						<value>text</value>
+						<value>number</value>
+						<value>automatic</value>
+						<ref name="string"/>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="table:order">
+					<choice>
+						<value>ascending</value>
+						<value>descending</value>
+					</choice>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="table-subtotal-rules">
+		<element name="table:subtotal-rules">
+			<ref name="table-subtotal-rules-attlist"/>
+			<optional>
+				<ref name="table-sort-groups"/>
+			</optional>
+			<zeroOrMore>
+				<ref name="table-subtotal-rule"/>
+			</zeroOrMore>
+		</element>
+	</define>
+	<define name="table-subtotal-rules-attlist">
+		<interleave>
+			<optional>
+				<attribute name="table:bind-styles-to-content">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="table:case-sensitive">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="table:page-breaks-on-group-change">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="table-sort-groups">
+		<element name="table:sort-groups">
+			<ref name="table-sort-groups-attlist"/>
+			<empty/>
+		</element>
+	</define>
+	<define name="table-sort-groups-attlist">
+		<interleave>
+			<optional>
+				<attribute name="table:data-type">
+					<choice>
+						<value>text</value>
+						<value>number</value>
+						<value>automatic</value>
+						<ref name="string"/>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="table:order">
+					<choice>
+						<value>ascending</value>
+						<value>descending</value>
+					</choice>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="table-subtotal-rule">
+		<element name="table:subtotal-rule">
+			<ref name="table-subtotal-rule-attlist"/>
+			<zeroOrMore>
+				<ref name="table-subtotal-field"/>
+			</zeroOrMore>
+		</element>
+	</define>
+	<define name="table-subtotal-rule-attlist">
+		<attribute name="table:group-by-field-number">
+			<ref name="nonNegativeInteger"/>
+		</attribute>
+	</define>
+	<define name="table-subtotal-field">
+		<element name="table:subtotal-field">
+			<ref name="table-subtotal-field-attlist"/>
+			<empty/>
+		</element>
+	</define>
+	<define name="table-subtotal-field-attlist">
+		<interleave>
+			<attribute name="table:field-number">
+				<ref name="nonNegativeInteger"/>
+			</attribute>
+			<attribute name="table:function">
+				<choice>
+					<value>average</value>
+					<value>count</value>
+					<value>countnums</value>
+					<value>max</value>
+					<value>min</value>
+					<value>product</value>
+					<value>stdev</value>
+					<value>stdevp</value>
+					<value>sum</value>
+					<value>var</value>
+					<value>varp</value>
+					<ref name="string"/>
+				</choice>
+			</attribute>
+		</interleave>
+	</define>
+	<define name="table-filter">
+		<element name="table:filter">
+			<ref name="table-filter-attlist"/>
+			<choice>
+				<ref name="table-filter-condition"/>
+				<ref name="table-filter-and"/>
+				<ref name="table-filter-or"/>
+			</choice>
+		</element>
+	</define>
+	<define name="table-filter-attlist">
+		<interleave>
+			<optional>
+				<attribute name="table:target-range-address">
+					<ref name="cellRangeAddress"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="table:condition-source">
+					<choice>
+						<value>self</value>
+						<value>cell-range</value>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="table:condition-source-range-address">
+					<ref name="cellRangeAddress"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="table:display-duplicates">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="table-filter-and">
+		<element name="table:filter-and">
+			<oneOrMore>
+				<choice>
+					<ref name="table-filter-or"/>
+					<ref name="table-filter-condition"/>
+				</choice>
+			</oneOrMore>
+		</element>
+	</define>
+	<define name="table-filter-or">
+		<element name="table:filter-or">
+			<oneOrMore>
+				<choice>
+					<ref name="table-filter-and"/>
+					<ref name="table-filter-condition"/>
+				</choice>
+			</oneOrMore>
+		</element>
+	</define>
+	<define name="table-filter-condition">
+		<element name="table:filter-condition">
+			<ref name="table-filter-condition-attlist"/>
+			<zeroOrMore>
+				<ref name="table-filter-set-item"/>
+			</zeroOrMore>
+		</element>
+	</define>
+	<define name="table-filter-condition-attlist">
+		<interleave>
+			<attribute name="table:field-number">
+				<ref name="nonNegativeInteger"/>
+			</attribute>
+			<attribute name="table:value">
+				<choice>
+					<ref name="string"/>
+					<ref name="double"/>
+				</choice>
+			</attribute>
+			<attribute name="table:operator">
+				<ref name="string"/>
+			</attribute>
+			<optional>
+				<attribute name="table:case-sensitive">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="table:data-type">
+					<choice>
+						<value>text</value>
+						<value>number</value>
+					</choice>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="table-filter-set-item">
+		<element name="table:filter-set-item">
+			<attribute name="table:value">
+				<ref name="string"/>
+			</attribute>
+			<empty/>
+		</element>
+	</define>
+	<define name="table-data-pilot-tables">
+		<element name="table:data-pilot-tables">
+			<zeroOrMore>
+				<ref name="table-data-pilot-table"/>
+			</zeroOrMore>
+		</element>
+	</define>
+	<define name="table-data-pilot-table">
+		<element name="table:data-pilot-table">
+			<ref name="table-data-pilot-table-attlist"/>
+			<optional>
+				<choice>
+					<ref name="table-database-source-sql"/>
+					<ref name="table-database-source-table"/>
+					<ref name="table-database-source-query"/>
+					<ref name="table-source-service"/>
+					<ref name="table-source-cell-range"/>
+				</choice>
+			</optional>
+			<oneOrMore>
+				<ref name="table-data-pilot-field"/>
+			</oneOrMore>
+		</element>
+	</define>
+	<define name="table-data-pilot-table-attlist">
+		<interleave>
+			<attribute name="table:name">
+				<ref name="string"/>
+			</attribute>
+			<optional>
+				<attribute name="table:application-data">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="table:grand-total">
+					<choice>
+						<value>none</value>
+						<value>row</value>
+						<value>column</value>
+						<value>both</value>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="table:ignore-empty-rows">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="table:identify-categories">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<attribute name="table:target-range-address">
+				<ref name="cellRangeAddress"/>
+			</attribute>
+			<optional>
+				<attribute name="table:buttons">
+					<ref name="cellRangeAddressList"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="table:show-filter-button">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="table:drill-down-on-double-click">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="table-source-cell-range">
+		<element name="table:source-cell-range">
+			<ref name="table-source-cell-range-attlist"/>
+			<optional>
+				<ref name="table-filter"/>
+			</optional>
+		</element>
+	</define>
+	<define name="table-source-cell-range-attlist">
+		<attribute name="table:cell-range-address">
+			<ref name="cellRangeAddress"/>
+		</attribute>
+	</define>
+	<define name="table-source-service">
+		<element name="table:source-service">
+			<ref name="table-source-service-attlist"/>
+			<empty/>
+		</element>
+	</define>
+	<define name="table-source-service-attlist">
+		<interleave>
+			<attribute name="table:name">
+				<ref name="string"/>
+			</attribute>
+			<attribute name="table:source-name">
+				<ref name="string"/>
+			</attribute>
+			<attribute name="table:object-name">
+				<ref name="string"/>
+			</attribute>
+			<optional>
+				<attribute name="table:user-name">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="table:password">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="table-data-pilot-field">
+		<element name="table:data-pilot-field">
+			<ref name="table-data-pilot-field-attlist"/>
+			<optional>
+				<ref name="table-data-pilot-level"/>
+			</optional>
+			<optional>
+				<ref name="table-data-pilot-field-reference"/>
+			</optional>
+			<optional>
+				<ref name="table-data-pilot-groups"/>
+			</optional>
+		</element>
+	</define>
+	<define name="table-data-pilot-field-attlist">
+		<interleave>
+			<attribute name="table:source-field-name">
+				<ref name="string"/>
+			</attribute>
+			<choice>
+				<attribute name="table:orientation">
+					<choice>
+						<value>row</value>
+						<value>column</value>
+						<value>data</value>
+						<value>hidden</value>
+					</choice>
+				</attribute>
+				<group>
+					<attribute name="table:orientation">
+						<value>page</value>
+					</attribute>
+					<attribute name="table:selected-page">
+						<ref name="string"/>
+					</attribute>
+				</group>
+			</choice>
+			<optional>
+				<attribute name="table:is-data-layout-field">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="table:function">
+					<choice>
+						<value>auto</value>
+						<value>average</value>
+						<value>count</value>
+						<value>countnums</value>
+						<value>max</value>
+						<value>min</value>
+						<value>product</value>
+						<value>stdev</value>
+						<value>stdevp</value>
+						<value>sum</value>
+						<value>var</value>
+						<value>varp</value>
+						<ref name="string"/>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="table:used-hierarchy">
+					<ref name="integer"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="table-data-pilot-level">
+		<element name="table:data-pilot-level">
+			<ref name="table-data-pilot-level-attlist"/>
+			<optional>
+				<ref name="table-data-pilot-subtotals"/>
+			</optional>
+			<optional>
+				<ref name="table-data-pilot-members"/>
+			</optional>
+			<optional>
+				<ref name="table-data-pilot-display-info"/>
+			</optional>
+			<optional>
+				<ref name="table-data-pilot-sort-info"/>
+			</optional>
+			<optional>
+				<ref name="table-data-pilot-layout-info"/>
+			</optional>
+		</element>
+	</define>
+	<define name="table-data-pilot-level-attlist">
+		<optional>
+			<attribute name="table:show-empty">
+				<ref name="boolean"/>
+			</attribute>
+		</optional>
+	</define>
+	<define name="table-data-pilot-subtotals">
+		<element name="table:data-pilot-subtotals">
+			<zeroOrMore>
+				<ref name="table-data-pilot-subtotal"/>
+			</zeroOrMore>
+		</element>
+	</define>
+	<define name="table-data-pilot-subtotal">
+		<element name="table:data-pilot-subtotal">
+			<ref name="table-data-pilot-subtotal-attlist"/>
+			<empty/>
+		</element>
+	</define>
+	<define name="table-data-pilot-subtotal-attlist">
+		<attribute name="table:function">
+			<choice>
+				<value>auto</value>
+				<value>average</value>
+				<value>count</value>
+				<value>countnums</value>
+				<value>max</value>
+				<value>min</value>
+				<value>product</value>
+				<value>stdev</value>
+				<value>stdevp</value>
+				<value>sum</value>
+				<value>var</value>
+				<value>varp</value>
+				<ref name="string"/>
+			</choice>
+		</attribute>
+	</define>
+	<define name="table-data-pilot-members">
+		<element name="table:data-pilot-members">
+			<zeroOrMore>
+				<ref name="table-data-pilot-member"/>
+			</zeroOrMore>
+		</element>
+	</define>
+	<define name="table-data-pilot-member">
+		<element name="table:data-pilot-member">
+			<ref name="table-data-pilot-member-attlist"/>
+			<empty/>
+		</element>
+	</define>
+	<define name="table-data-pilot-member-attlist">
+		<interleave>
+			<attribute name="table:name">
+				<ref name="string"/>
+			</attribute>
+			<optional>
+				<attribute name="table:display">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="table:show-details">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="table-data-pilot-display-info">
+		<element name="table:data-pilot-display-info">
+			<ref name="table-data-pilot-display-info-attlist"/>
+			<empty/>
+		</element>
+	</define>
+	<define name="table-data-pilot-display-info-attlist">
+		<interleave>
+			<attribute name="table:enabled">
+				<ref name="boolean"/>
+			</attribute>
+			<attribute name="table:data-field">
+				<ref name="string"/>
+			</attribute>
+			<attribute name="table:member-count">
+				<ref name="nonNegativeInteger"/>
+			</attribute>
+			<attribute name="table:display-member-mode">
+				<choice>
+					<value>from-top</value>
+					<value>from-bottom</value>
+				</choice>
+			</attribute>
+		</interleave>
+	</define>
+	<define name="table-data-pilot-sort-info">
+		<element name="table:data-pilot-sort-info">
+			<ref name="table-data-pilot-sort-info-attlist"/>
+			<empty/>
+		</element>
+	</define>
+	<define name="table-data-pilot-sort-info-attlist">
+		<interleave>
+			<choice>
+				<group>
+					<attribute name="table:sort-mode">
+						<value>data</value>
+					</attribute>
+					<attribute name="table:data-field">
+						<ref name="string"/>
+					</attribute>
+				</group>
+				<attribute name="table:sort-mode">
+					<choice>
+						<value>none</value>
+						<value>manual</value>
+						<value>name</value>
+					</choice>
+				</attribute>
+			</choice>
+			<attribute name="table:order">
+				<choice>
+					<value>ascending</value>
+					<value>descending</value>
+				</choice>
+			</attribute>
+		</interleave>
+	</define>
+	<define name="table-data-pilot-layout-info">
+		<element name="table:data-pilot-layout-info">
+			<ref name="table-data-pilot-layout-info-attlist"/>
+			<empty/>
+		</element>
+	</define>
+	<define name="table-data-pilot-layout-info-attlist">
+		<interleave>
+			<attribute name="table:layout-mode">
+				<choice>
+					<value>tabular-layout</value>
+					<value>outline-subtotals-top</value>
+					<value>outline-subtotals-bottom</value>
+				</choice>
+			</attribute>
+			<attribute name="table:add-empty-lines">
+				<ref name="boolean"/>
+			</attribute>
+		</interleave>
+	</define>
+	<define name="table-data-pilot-field-reference">
+		<element name="table:data-pilot-field-reference">
+			<ref name="table-data-pilot-field-reference-attlist"/>
+		</element>
+	</define>
+	<define name="table-data-pilot-field-reference-attlist">
+		<interleave>
+			<attribute name="table:field-name">
+				<ref name="string"/>
+			</attribute>
+			<choice>
+				<group>
+					<attribute name="table:member-type">
+						<value>named</value>
+					</attribute>
+					<attribute name="table:member-name">
+						<ref name="string"/>
+					</attribute>
+				</group>
+				<attribute name="table:member-type">
+					<choice>
+						<value>previous</value>
+						<value>next</value>
+					</choice>
+				</attribute>
+			</choice>
+			<attribute name="table:type">
+				<choice>
+					<value>none</value>
+					<value>member-difference</value>
+					<value>member-percentage</value>
+					<value>member-percentage-difference</value>
+					<value>running-total</value>
+					<value>row-percentage</value>
+					<value>column-percentage</value>
+					<value>total-percentage</value>
+					<value>index</value>
+				</choice>
+			</attribute>
+		</interleave>
+	</define>
+	<define name="table-data-pilot-groups">
+		<element name="table:data-pilot-groups">
+			<ref name="table-data-pilot-groups-attlist"/>
+			<oneOrMore>
+				<ref name="table-data-pilot-group"/>
+			</oneOrMore>
+		</element>
+	</define>
+	<define name="table-data-pilot-groups-attlist">
+		<interleave>
+			<attribute name="table:source-field-name">
+				<ref name="string"/>
+			</attribute>
+			<choice>
+				<attribute name="table:date-start">
+					<choice>
+						<ref name="dateOrDateTime"/>
+						<value>auto</value>
+					</choice>
+				</attribute>
+				<attribute name="table:start">
+					<choice>
+						<ref name="double"/>
+						<value>auto</value>
+					</choice>
+				</attribute>
+			</choice>
+			<choice>
+				<attribute name="table:date-end">
+					<choice>
+						<ref name="dateOrDateTime"/>
+						<value>auto</value>
+					</choice>
+				</attribute>
+				<attribute name="table:end">
+					<choice>
+						<ref name="double"/>
+						<value>auto</value>
+					</choice>
+				</attribute>
+			</choice>
+			<attribute name="table:step">
+				<ref name="double"/>
+			</attribute>
+			<attribute name="table:grouped-by">
+				<choice>
+					<value>seconds</value>
+					<value>minutes</value>
+					<value>hours</value>
+					<value>days</value>
+					<value>months</value>
+					<value>quarters</value>
+					<value>years</value>
+				</choice>
+			</attribute>
+		</interleave>
+	</define>
+	<define name="table-data-pilot-group">
+		<element name="table:data-pilot-group">
+			<ref name="table-data-pilot-group-attlist"/>
+			<oneOrMore>
+				<ref name="table-data-pilot-group-member"/>
+			</oneOrMore>
+		</element>
+	</define>
+	<define name="table-data-pilot-group-attlist">
+		<attribute name="table:name">
+			<ref name="string"/>
+		</attribute>
+	</define>
+	<define name="table-data-pilot-group-member">
+		<element name="table:data-pilot-group-member">
+			<ref name="table-data-pilot-group-member-attlist"/>
+		</element>
+	</define>
+	<define name="table-data-pilot-group-member-attlist">
+		<attribute name="table:name">
+			<ref name="string"/>
+		</attribute>
+	</define>
+	<define name="table-consolidation">
+		<element name="table:consolidation">
+			<ref name="table-consolidation-attlist"/>
+			<empty/>
+		</element>
+	</define>
+	<define name="table-consolidation-attlist">
+		<interleave>
+			<attribute name="table:function">
+				<choice>
+					<value>average</value>
+					<value>count</value>
+					<value>countnums</value>
+					<value>max</value>
+					<value>min</value>
+					<value>product</value>
+					<value>stdev</value>
+					<value>stdevp</value>
+					<value>sum</value>
+					<value>var</value>
+					<value>varp</value>
+					<ref name="string"/>
+				</choice>
+			</attribute>
+			<attribute name="table:source-cell-range-addresses">
+				<ref name="cellRangeAddressList"/>
+			</attribute>
+			<attribute name="table:target-cell-address">
+				<ref name="cellAddress"/>
+			</attribute>
+			<optional>
+				<attribute name="table:use-labels">
+					<choice>
+						<value>none</value>
+						<value>row</value>
+						<value>column</value>
+						<value>both</value>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="table:link-to-source-data">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="table-dde-links">
+		<element name="table:dde-links">
+			<oneOrMore>
+				<ref name="table-dde-link"/>
+			</oneOrMore>
+		</element>
+	</define>
+	<define name="table-tracked-changes">
+		<element name="table:tracked-changes">
+			<ref name="table-tracked-changes-attlist"/>
+			<zeroOrMore>
+				<choice>
+					<ref name="table-cell-content-change"/>
+					<ref name="table-insertion"/>
+					<ref name="table-deletion"/>
+					<ref name="table-movement"/>
+				</choice>
+			</zeroOrMore>
+		</element>
+	</define>
+	<define name="table-tracked-changes-attlist">
+		<optional>
+			<attribute name="table:track-changes">
+				<ref name="boolean"/>
+			</attribute>
+		</optional>
+	</define>
+	<define name="table-insertion">
+		<element name="table:insertion">
+			<ref name="table-insertion-attlist"/>
+			<ref name="common-table-change-attlist"/>
+			<ref name="office-change-info"/>
+			<optional>
+				<ref name="table-dependencies"/>
+			</optional>
+			<optional>
+				<ref name="table-deletions"/>
+			</optional>
+		</element>
+	</define>
+	<define name="table-insertion-attlist">
+		<interleave>
+			<attribute name="table:type">
+				<choice>
+					<value>row</value>
+					<value>column</value>
+					<value>table</value>
+				</choice>
+			</attribute>
+			<attribute name="table:position">
+				<ref name="integer"/>
+			</attribute>
+			<optional>
+				<attribute name="table:count">
+					<ref name="positiveInteger"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="table:table">
+					<ref name="integer"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="table-dependencies">
+		<element name="table:dependencies">
+			<oneOrMore>
+				<ref name="table-dependency"/>
+			</oneOrMore>
+		</element>
+	</define>
+	<define name="table-dependency">
+		<element name="table:dependency">
+			<attribute name="table:id">
+				<ref name="string"/>
+			</attribute>
+			<empty/>
+		</element>
+	</define>
+	<define name="table-deletions">
+		<element name="table:deletions">
+			<oneOrMore>
+				<choice>
+					<ref name="table-cell-content-deletion"/>
+					<ref name="table-change-deletion"/>
+				</choice>
+			</oneOrMore>
+		</element>
+	</define>
+	<define name="table-cell-content-deletion">
+		<element name="table:cell-content-deletion">
+			<optional>
+				<attribute name="table:id">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<ref name="table-cell-address"/>
+			</optional>
+			<optional>
+				<ref name="table-change-track-table-cell"/>
+			</optional>
+		</element>
+	</define>
+	<define name="table-change-deletion">
+		<element name="table:change-deletion">
+			<optional>
+				<attribute name="table:id">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<empty/>
+		</element>
+	</define>
+	<define name="table-deletion">
+		<element name="table:deletion">
+			<ref name="table-deletion-attlist"/>
+			<ref name="common-table-change-attlist"/>
+			<ref name="office-change-info"/>
+			<optional>
+				<ref name="table-dependencies"/>
+			</optional>
+			<optional>
+				<ref name="table-deletions"/>
+			</optional>
+			<optional>
+				<ref name="table-cut-offs"/>
+			</optional>
+		</element>
+	</define>
+	<define name="table-deletion-attlist">
+		<interleave>
+			<attribute name="table:type">
+				<choice>
+					<value>row</value>
+					<value>column</value>
+					<value>table</value>
+				</choice>
+			</attribute>
+			<attribute name="table:position">
+				<ref name="integer"/>
+			</attribute>
+			<optional>
+				<attribute name="table:table">
+					<ref name="integer"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="table:multi-deletion-spanned">
+					<ref name="integer"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="table-cut-offs">
+		<element name="table:cut-offs">
+			<choice>
+				<oneOrMore>
+					<ref name="table-movement-cut-off"/>
+				</oneOrMore>
+				<group>
+					<ref name="table-insertion-cut-off"/>
+					<zeroOrMore>
+						<ref name="table-movement-cut-off"/>
+					</zeroOrMore>
+				</group>
+			</choice>
+		</element>
+	</define>
+	<define name="table-insertion-cut-off">
+		<element name="table:insertion-cut-off">
+			<ref name="table-insertion-cut-off-attlist"/>
+			<empty/>
+		</element>
+	</define>
+	<define name="table-insertion-cut-off-attlist">
+		<interleave>
+			<attribute name="table:id">
+				<ref name="string"/>
+			</attribute>
+			<attribute name="table:position">
+				<ref name="integer"/>
+			</attribute>
+		</interleave>
+	</define>
+	<define name="table-movement-cut-off">
+		<element name="table:movement-cut-off">
+			<ref name="table-movement-cut-off-attlist"/>
+			<empty/>
+		</element>
+	</define>
+	<define name="table-movement-cut-off-attlist">
+		<choice>
+			<attribute name="table:position">
+				<ref name="integer"/>
+			</attribute>
+			<group>
+				<attribute name="table:start-position">
+					<ref name="integer"/>
+				</attribute>
+				<attribute name="table:end-position">
+					<ref name="integer"/>
+				</attribute>
+			</group>
+		</choice>
+	</define>
+	<define name="table-movement">
+		<element name="table:movement">
+			<ref name="common-table-change-attlist"/>
+			<ref name="table-source-range-address"/>
+			<ref name="table-target-range-address"/>
+			<ref name="office-change-info"/>
+			<optional>
+				<ref name="table-dependencies"/>
+			</optional>
+			<optional>
+				<ref name="table-deletions"/>
+			</optional>
+		</element>
+	</define>
+	<define name="table-source-range-address">
+		<element name="table:source-range-address">
+			<ref name="common-table-range-attlist"/>
+			<empty/>
+		</element>
+	</define>
+	<define name="table-target-range-address">
+		<element name="table:target-range-address">
+			<ref name="common-table-range-attlist"/>
+			<empty/>
+		</element>
+	</define>
+	<define name="common-table-range-attlist">
+		<choice>
+			<group>
+				<ref name="common-table-cell-address-attlist"/>
+			</group>
+			<group>
+				<ref name="common-table-cell-range-address-attlist"/>
+			</group>
+		</choice>
+	</define>
+	<define name="common-table-cell-address-attlist">
+		<attribute name="table:column">
+			<ref name="integer"/>
+		</attribute>
+		<attribute name="table:row">
+			<ref name="integer"/>
+		</attribute>
+		<attribute name="table:table">
+			<ref name="integer"/>
+		</attribute>
+	</define>
+	<define name="common-table-cell-range-address-attlist">
+		<attribute name="table:start-column">
+			<ref name="integer"/>
+		</attribute>
+		<attribute name="table:start-row">
+			<ref name="integer"/>
+		</attribute>
+		<attribute name="table:start-table">
+			<ref name="integer"/>
+		</attribute>
+		<attribute name="table:end-column">
+			<ref name="integer"/>
+		</attribute>
+		<attribute name="table:end-row">
+			<ref name="integer"/>
+		</attribute>
+		<attribute name="table:end-table">
+			<ref name="integer"/>
+		</attribute>
+	</define>
+	<define name="table-change-track-table-cell">
+		<element name="table:change-track-table-cell">
+			<ref name="table-change-track-table-cell-attlist"/>
+			<zeroOrMore>
+				<ref name="text-p"/>
+			</zeroOrMore>
+		</element>
+	</define>
+	<define name="table-change-track-table-cell-attlist">
+		<interleave>
+			<optional>
+				<attribute name="table:cell-address">
+					<ref name="cellAddress"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="table:matrix-covered">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="table:formula">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="table:number-matrix-columns-spanned">
+					<ref name="positiveInteger"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="table:number-matrix-rows-spanned">
+					<ref name="positiveInteger"/>
+				</attribute>
+			</optional>
+			<optional>
+				<ref name="common-value-and-type-attlist"/>
+			</optional>
+		</interleave>
+	</define>
+	<define name="table-cell-content-change">
+		<element name="table:cell-content-change">
+			<ref name="common-table-change-attlist"/>
+			<ref name="table-cell-address"/>
+			<ref name="office-change-info"/>
+			<optional>
+				<ref name="table-dependencies"/>
+			</optional>
+			<optional>
+				<ref name="table-deletions"/>
+			</optional>
+			<ref name="table-previous"/>
+		</element>
+	</define>
+	<define name="table-cell-address">
+		<element name="table:cell-address">
+			<ref name="common-table-cell-address-attlist"/>
+			<empty/>
+		</element>
+	</define>
+	<define name="table-previous">
+		<element name="table:previous">
+			<optional>
+				<attribute name="table:id">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<ref name="table-change-track-table-cell"/>
+		</element>
+	</define>
+	<define name="common-table-change-attlist">
+		<interleave>
+			<attribute name="table:id">
+				<ref name="string"/>
+			</attribute>
+			<optional>
+				<attribute name="table:acceptance-state">
+					<choice>
+						<value>accepted</value>
+						<value>rejected</value>
+						<value>pending</value>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="table:rejecting-change-id">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="style-handout-master">
+		<element name="style:handout-master">
+			<ref name="common-presentation-header-footer-attlist"/>
+			<ref name="style-handout-master-attlist"/>
+			<zeroOrMore>
+				<ref name="shape"/>
+			</zeroOrMore>
+		</element>
+	</define>
+	<define name="style-handout-master-attlist">
+		<interleave>
+			<optional>
+				<attribute name="presentation:presentation-page-layout-name">
+					<ref name="styleNameRef"/>
+				</attribute>
+			</optional>
+			<attribute name="style:page-layout-name">
+				<ref name="styleNameRef"/>
+			</attribute>
+			<optional>
+				<attribute name="draw:style-name">
+					<ref name="styleNameRef"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="draw-layer-set">
+		<element name="draw:layer-set">
+			<zeroOrMore>
+				<ref name="draw-layer"/>
+			</zeroOrMore>
+		</element>
+	</define>
+	<define name="draw-layer">
+		<element name="draw:layer">
+			<ref name="draw-layer-attlist"/>
+			<optional>
+				<ref name="svg-title"/>
+			</optional>
+			<optional>
+				<ref name="svg-desc"/>
+			</optional>
+		</element>
+	</define>
+	<define name="draw-layer-attlist">
+		<interleave>
+			<attribute name="draw:name">
+				<ref name="string"/>
+			</attribute>
+			<optional>
+				<attribute name="draw:protected">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:display">
+					<choice>
+						<value>always</value>
+						<value>screen</value>
+						<value>printer</value>
+						<value>none</value>
+					</choice>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="draw-page">
+		<element name="draw:page">
+			<ref name="common-presentation-header-footer-attlist"/>
+			<ref name="draw-page-attlist"/>
+			<optional>
+				<ref name="svg-title"/>
+			</optional>
+			<optional>
+				<ref name="svg-desc"/>
+			</optional>
+			<optional>
+				<ref name="draw-layer-set"/>
+			</optional>
+			<optional>
+				<ref name="office-forms"/>
+			</optional>
+			<zeroOrMore>
+				<ref name="shape"/>
+			</zeroOrMore>
+			<optional>
+				<choice>
+					<ref name="presentation-animations"/>
+					<ref name="animation-element"/>
+				</choice>
+			</optional>
+			<optional>
+				<ref name="presentation-notes"/>
+			</optional>
+		</element>
+	</define>
+	<define name="draw-page-attlist">
+		<interleave>
+			<optional>
+				<attribute name="draw:name">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:style-name">
+					<ref name="styleNameRef"/>
+				</attribute>
+			</optional>
+			<attribute name="draw:master-page-name">
+				<ref name="styleNameRef"/>
+			</attribute>
+			<optional>
+				<attribute name="presentation:presentation-page-layout-name">
+					<ref name="styleNameRef"/>
+				</attribute>
+			</optional>
+			<optional>
+				<group>
+					<ref name="xml-id"/>
+					<optional>
+						<attribute name="draw:id">
+							<ref name="NCName"/>
+						</attribute>
+					</optional>
+				</group>
+			</optional>
+			<optional>
+				<attribute name="draw:nav-order">
+					<ref name="IDREFS"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="common-presentation-header-footer-attlist">
+		<interleave>
+			<optional>
+				<attribute name="presentation:use-header-name">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="presentation:use-footer-name">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="presentation:use-date-time-name">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="shape">
+		<choice>
+			<ref name="shape-instance"/>
+			<ref name="draw-a"/>
+		</choice>
+	</define>
+	<define name="shape-instance">
+		<choice>
+			<ref name="draw-rect"/>
+			<ref name="draw-line"/>
+			<ref name="draw-polyline"/>
+			<ref name="draw-polygon"/>
+			<ref name="draw-regular-polygon"/>
+			<ref name="draw-path"/>
+			<ref name="draw-circle"/>
+			<ref name="draw-ellipse"/>
+			<ref name="draw-g"/>
+			<ref name="draw-page-thumbnail"/>
+			<ref name="draw-frame"/>
+			<ref name="draw-measure"/>
+			<ref name="draw-caption"/>
+			<ref name="draw-connector"/>
+			<ref name="draw-control"/>
+			<ref name="dr3d-scene"/>
+			<ref name="draw-custom-shape"/>
+		</choice>
+	</define>
+	<define name="draw-rect">
+		<element name="draw:rect">
+			<ref name="draw-rect-attlist"/>
+			<ref name="common-draw-position-attlist"/>
+			<ref name="common-draw-size-attlist"/>
+			<ref name="common-draw-shape-with-text-and-styles-attlist"/>
+			<ref name="common-draw-caption-id-attlist"/>
+			<optional>
+				<ref name="svg-title"/>
+			</optional>
+			<optional>
+				<ref name="svg-desc"/>
+			</optional>
+			<optional>
+				<ref name="office-event-listeners"/>
+			</optional>
+			<zeroOrMore>
+				<ref name="draw-glue-point"/>
+			</zeroOrMore>
+			<ref name="draw-text"/>
+		</element>
+	</define>
+	<define name="draw-rect-attlist">
+		<choice>
+			<optional>
+				<attribute name="draw:corner-radius">
+					<ref name="nonNegativeLength"/>
+				</attribute>
+			</optional>
+			<group>
+				<optional>
+					<attribute name="svg:rx">
+						<ref name="nonNegativeLength"/>
+					</attribute>
+				</optional>
+				<optional>
+					<attribute name="svg:ry">
+						<ref name="nonNegativeLength"/>
+					</attribute>
+				</optional>
+			</group>
+		</choice>
+	</define>
+	<define name="draw-line">
+		<element name="draw:line">
+			<ref name="draw-line-attlist"/>
+			<ref name="common-draw-shape-with-text-and-styles-attlist"/>
+			<ref name="common-draw-caption-id-attlist"/>
+			<optional>
+				<ref name="svg-title"/>
+			</optional>
+			<optional>
+				<ref name="svg-desc"/>
+			</optional>
+			<optional>
+				<ref name="office-event-listeners"/>
+			</optional>
+			<zeroOrMore>
+				<ref name="draw-glue-point"/>
+			</zeroOrMore>
+			<ref name="draw-text"/>
+		</element>
+	</define>
+	<define name="draw-line-attlist">
+		<interleave>
+			<attribute name="svg:x1">
+				<ref name="coordinate"/>
+			</attribute>
+			<attribute name="svg:y1">
+				<ref name="coordinate"/>
+			</attribute>
+			<attribute name="svg:x2">
+				<ref name="coordinate"/>
+			</attribute>
+			<attribute name="svg:y2">
+				<ref name="coordinate"/>
+			</attribute>
+		</interleave>
+	</define>
+	<define name="draw-polyline">
+		<element name="draw:polyline">
+			<ref name="common-draw-points-attlist"/>
+			<ref name="common-draw-position-attlist"/>
+			<ref name="common-draw-size-attlist"/>
+			<ref name="common-draw-viewbox-attlist"/>
+			<ref name="common-draw-shape-with-text-and-styles-attlist"/>
+			<ref name="common-draw-caption-id-attlist"/>
+			<optional>
+				<ref name="svg-title"/>
+			</optional>
+			<optional>
+				<ref name="svg-desc"/>
+			</optional>
+			<optional>
+				<ref name="office-event-listeners"/>
+			</optional>
+			<zeroOrMore>
+				<ref name="draw-glue-point"/>
+			</zeroOrMore>
+			<ref name="draw-text"/>
+		</element>
+	</define>
+	<define name="common-draw-points-attlist">
+		<attribute name="draw:points">
+			<ref name="points"/>
+		</attribute>
+	</define>
+	<define name="draw-polygon">
+		<element name="draw:polygon">
+			<ref name="common-draw-points-attlist"/>
+			<ref name="common-draw-position-attlist"/>
+			<ref name="common-draw-size-attlist"/>
+			<ref name="common-draw-viewbox-attlist"/>
+			<ref name="common-draw-shape-with-text-and-styles-attlist"/>
+			<ref name="common-draw-caption-id-attlist"/>
+			<optional>
+				<ref name="svg-title"/>
+			</optional>
+			<optional>
+				<ref name="svg-desc"/>
+			</optional>
+			<optional>
+				<ref name="office-event-listeners"/>
+			</optional>
+			<zeroOrMore>
+				<ref name="draw-glue-point"/>
+			</zeroOrMore>
+			<ref name="draw-text"/>
+		</element>
+	</define>
+	<define name="draw-regular-polygon">
+		<element name="draw:regular-polygon">
+			<ref name="draw-regular-polygon-attlist"/>
+			<ref name="common-draw-position-attlist"/>
+			<ref name="common-draw-size-attlist"/>
+			<ref name="common-draw-shape-with-text-and-styles-attlist"/>
+			<ref name="common-draw-caption-id-attlist"/>
+			<optional>
+				<ref name="svg-title"/>
+			</optional>
+			<optional>
+				<ref name="svg-desc"/>
+			</optional>
+			<optional>
+				<ref name="office-event-listeners"/>
+			</optional>
+			<zeroOrMore>
+				<ref name="draw-glue-point"/>
+			</zeroOrMore>
+			<ref name="draw-text"/>
+		</element>
+	</define>
+	<define name="draw-regular-polygon-attlist">
+		<interleave>
+			<choice>
+				<attribute name="draw:concave">
+					<value>false</value>
+				</attribute>
+				<group>
+					<attribute name="draw:concave">
+						<value>true</value>
+					</attribute>
+					<ref name="draw-regular-polygon-sharpness-attlist"/>
+				</group>
+			</choice>
+			<attribute name="draw:corners">
+				<ref name="positiveInteger"/>
+			</attribute>
+		</interleave>
+	</define>
+	<define name="draw-regular-polygon-sharpness-attlist">
+		<attribute name="draw:sharpness">
+			<ref name="percent"/>
+		</attribute>
+	</define>
+	<define name="draw-path">
+		<element name="draw:path">
+			<ref name="common-draw-path-data-attlist"/>
+			<ref name="common-draw-position-attlist"/>
+			<ref name="common-draw-size-attlist"/>
+			<ref name="common-draw-viewbox-attlist"/>
+			<ref name="common-draw-shape-with-text-and-styles-attlist"/>
+			<ref name="common-draw-caption-id-attlist"/>
+			<optional>
+				<ref name="svg-title"/>
+			</optional>
+			<optional>
+				<ref name="svg-desc"/>
+			</optional>
+			<optional>
+				<ref name="office-event-listeners"/>
+			</optional>
+			<zeroOrMore>
+				<ref name="draw-glue-point"/>
+			</zeroOrMore>
+			<ref name="draw-text"/>
+		</element>
+	</define>
+	<define name="common-draw-path-data-attlist">
+		<attribute name="svg:d">
+			<ref name="pathData"/>
+		</attribute>
+	</define>
+	<define name="draw-circle">
+		<element name="draw:circle">
+			<choice>
+				<group>
+					<ref name="draw-circle-attlist"/>
+					<ref name="common-draw-circle-ellipse-pos-attlist"/>
+				</group>
+				<group>
+					<ref name="common-draw-position-attlist"/>
+					<ref name="common-draw-size-attlist"/>
+				</group>
+			</choice>
+			<ref name="common-draw-circle-ellipse-attlist"/>
+			<ref name="common-draw-shape-with-text-and-styles-attlist"/>
+			<ref name="common-draw-caption-id-attlist"/>
+			<optional>
+				<ref name="svg-title"/>
+			</optional>
+			<optional>
+				<ref name="svg-desc"/>
+			</optional>
+			<optional>
+				<ref name="office-event-listeners"/>
+			</optional>
+			<zeroOrMore>
+				<ref name="draw-glue-point"/>
+			</zeroOrMore>
+			<ref name="draw-text"/>
+		</element>
+	</define>
+	<define name="common-draw-circle-ellipse-pos-attlist">
+		<attribute name="svg:cx">
+			<ref name="coordinate"/>
+		</attribute>
+		<attribute name="svg:cy">
+			<ref name="coordinate"/>
+		</attribute>
+	</define>
+	<define name="draw-circle-attlist">
+		<attribute name="svg:r">
+			<ref name="length"/>
+		</attribute>
+	</define>
+	<define name="common-draw-circle-ellipse-attlist">
+		<interleave>
+			<optional>
+				<attribute name="draw:kind">
+					<choice>
+						<value>full</value>
+						<value>section</value>
+						<value>cut</value>
+						<value>arc</value>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:start-angle">
+					<ref name="angle"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:end-angle">
+					<ref name="angle"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="draw-ellipse">
+		<element name="draw:ellipse">
+			<choice>
+				<group>
+					<ref name="draw-ellipse-attlist"/>
+					<ref name="common-draw-circle-ellipse-pos-attlist"/>
+				</group>
+				<group>
+					<ref name="common-draw-position-attlist"/>
+					<ref name="common-draw-size-attlist"/>
+				</group>
+			</choice>
+			<ref name="common-draw-circle-ellipse-attlist"/>
+			<ref name="common-draw-shape-with-text-and-styles-attlist"/>
+			<ref name="common-draw-caption-id-attlist"/>
+			<optional>
+				<ref name="svg-title"/>
+			</optional>
+			<optional>
+				<ref name="svg-desc"/>
+			</optional>
+			<optional>
+				<ref name="office-event-listeners"/>
+			</optional>
+			<zeroOrMore>
+				<ref name="draw-glue-point"/>
+			</zeroOrMore>
+			<ref name="draw-text"/>
+		</element>
+	</define>
+	<define name="draw-ellipse-attlist">
+		<attribute name="svg:rx">
+			<ref name="length"/>
+		</attribute>
+		<attribute name="svg:ry">
+			<ref name="length"/>
+		</attribute>
+	</define>
+	<define name="draw-connector">
+		<element name="draw:connector">
+			<ref name="draw-connector-attlist"/>
+			<ref name="common-draw-shape-with-text-and-styles-attlist"/>
+			<ref name="common-draw-caption-id-attlist"/>
+			<ref name="common-draw-viewbox-attlist"/>
+			<optional>
+				<ref name="svg-title"/>
+			</optional>
+			<optional>
+				<ref name="svg-desc"/>
+			</optional>
+			<optional>
+				<ref name="office-event-listeners"/>
+			</optional>
+			<zeroOrMore>
+				<ref name="draw-glue-point"/>
+			</zeroOrMore>
+			<ref name="draw-text"/>
+		</element>
+	</define>
+	<define name="draw-connector-attlist">
+		<interleave>
+			<optional>
+				<attribute name="draw:type">
+					<choice>
+						<value>standard</value>
+						<value>lines</value>
+						<value>line</value>
+						<value>curve</value>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="svg:x1">
+					<ref name="coordinate"/>
+				</attribute>
+				<attribute name="svg:y1">
+					<ref name="coordinate"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:start-shape">
+					<ref name="IDREF"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:start-glue-point">
+					<ref name="nonNegativeInteger"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="svg:x2">
+					<ref name="coordinate"/>
+				</attribute>
+				<attribute name="svg:y2">
+					<ref name="coordinate"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:end-shape">
+					<ref name="IDREF"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:end-glue-point">
+					<ref name="nonNegativeInteger"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:line-skew">
+					<list>
+						<ref name="length"/>
+						<optional>
+							<ref name="length"/>
+							<optional>
+								<ref name="length"/>
+							</optional>
+						</optional>
+					</list>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="svg:d">
+					<ref name="pathData"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="draw-caption">
+		<element name="draw:caption">
+			<ref name="draw-caption-attlist"/>
+			<ref name="common-draw-position-attlist"/>
+			<ref name="common-draw-size-attlist"/>
+			<ref name="common-draw-shape-with-text-and-styles-attlist"/>
+			<ref name="common-draw-caption-id-attlist"/>
+			<optional>
+				<ref name="svg-title"/>
+			</optional>
+			<optional>
+				<ref name="svg-desc"/>
+			</optional>
+			<optional>
+				<ref name="office-event-listeners"/>
+			</optional>
+			<zeroOrMore>
+				<ref name="draw-glue-point"/>
+			</zeroOrMore>
+			<ref name="draw-text"/>
+		</element>
+	</define>
+	<define name="draw-caption-attlist">
+		<interleave>
+			<optional>
+				<attribute name="draw:caption-point-x">
+					<ref name="coordinate"/>
+				</attribute>
+				<attribute name="draw:caption-point-y">
+					<ref name="coordinate"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:corner-radius">
+					<ref name="nonNegativeLength"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="draw-measure">
+		<element name="draw:measure">
+			<ref name="draw-measure-attlist"/>
+			<ref name="common-draw-shape-with-text-and-styles-attlist"/>
+			<ref name="common-draw-caption-id-attlist"/>
+			<optional>
+				<ref name="svg-title"/>
+			</optional>
+			<optional>
+				<ref name="svg-desc"/>
+			</optional>
+			<optional>
+				<ref name="office-event-listeners"/>
+			</optional>
+			<zeroOrMore>
+				<ref name="draw-glue-point"/>
+			</zeroOrMore>
+			<ref name="draw-text"/>
+		</element>
+	</define>
+	<define name="draw-measure-attlist">
+		<interleave>
+			<attribute name="svg:x1">
+				<ref name="coordinate"/>
+			</attribute>
+			<attribute name="svg:y1">
+				<ref name="coordinate"/>
+			</attribute>
+			<attribute name="svg:x2">
+				<ref name="coordinate"/>
+			</attribute>
+			<attribute name="svg:y2">
+				<ref name="coordinate"/>
+			</attribute>
+		</interleave>
+	</define>
+	<define name="draw-control">
+		<element name="draw:control">
+			<ref name="draw-control-attlist"/>
+			<ref name="common-draw-position-attlist"/>
+			<ref name="common-draw-size-attlist"/>
+			<ref name="common-draw-shape-with-text-and-styles-attlist"/>
+			<ref name="common-draw-caption-id-attlist"/>
+			<optional>
+				<ref name="svg-title"/>
+			</optional>
+			<optional>
+				<ref name="svg-desc"/>
+			</optional>
+			<zeroOrMore>
+				<ref name="draw-glue-point"/>
+			</zeroOrMore>
+		</element>
+	</define>
+	<define name="draw-control-attlist">
+		<attribute name="draw:control">
+			<ref name="IDREF"/>
+		</attribute>
+	</define>
+	<define name="draw-page-thumbnail">
+		<element name="draw:page-thumbnail">
+			<ref name="draw-page-thumbnail-attlist"/>
+			<ref name="common-draw-position-attlist"/>
+			<ref name="common-draw-size-attlist"/>
+			<ref name="presentation-shape-attlist"/>
+			<ref name="common-draw-shape-with-styles-attlist"/>
+			<ref name="common-draw-caption-id-attlist"/>
+			<optional>
+				<ref name="svg-title"/>
+			</optional>
+			<optional>
+				<ref name="svg-desc"/>
+			</optional>
+		</element>
+	</define>
+	<define name="draw-page-thumbnail-attlist">
+		<optional>
+			<attribute name="draw:page-number">
+				<ref name="positiveInteger"/>
+			</attribute>
+		</optional>
+	</define>
+	<define name="draw-g">
+		<element name="draw:g">
+			<ref name="draw-g-attlist"/>
+			<ref name="common-draw-z-index-attlist"/>
+			<ref name="common-draw-name-attlist"/>
+			<ref name="common-draw-id-attlist"/>
+			<ref name="common-draw-style-name-attlist"/>
+			<ref name="common-text-spreadsheet-shape-attlist"/>
+			<ref name="common-draw-caption-id-attlist"/>
+			<optional>
+				<ref name="svg-title"/>
+			</optional>
+			<optional>
+				<ref name="svg-desc"/>
+			</optional>
+			<optional>
+				<ref name="office-event-listeners"/>
+			</optional>
+			<zeroOrMore>
+				<ref name="draw-glue-point"/>
+			</zeroOrMore>
+			<zeroOrMore>
+				<ref name="shape"/>
+			</zeroOrMore>
+		</element>
+	</define>
+	<define name="draw-g-attlist">
+		<optional>
+			<attribute name="svg:y">
+				<ref name="coordinate"/>
+			</attribute>
+		</optional>
+	</define>
+	<define name="common-draw-name-attlist">
+		<optional>
+			<attribute name="draw:name">
+				<ref name="string"/>
+			</attribute>
+		</optional>
+	</define>
+	<define name="common-draw-caption-id-attlist">
+		<optional>
+			<attribute name="draw:caption-id">
+				<ref name="IDREF"/>
+			</attribute>
+		</optional>
+	</define>
+	<define name="common-draw-position-attlist">
+		<optional>
+			<attribute name="svg:x">
+				<ref name="coordinate"/>
+			</attribute>
+		</optional>
+		<optional>
+			<attribute name="svg:y">
+				<ref name="coordinate"/>
+			</attribute>
+		</optional>
+	</define>
+	<define name="common-draw-size-attlist">
+		<optional>
+			<attribute name="svg:width">
+				<ref name="length"/>
+			</attribute>
+		</optional>
+		<optional>
+			<attribute name="svg:height">
+				<ref name="length"/>
+			</attribute>
+		</optional>
+	</define>
+	<define name="common-draw-transform-attlist">
+		<optional>
+			<attribute name="draw:transform">
+				<ref name="string"/>
+			</attribute>
+		</optional>
+	</define>
+	<define name="common-draw-viewbox-attlist">
+		<attribute name="svg:viewBox">
+			<list>
+				<ref name="integer"/>
+				<ref name="integer"/>
+				<ref name="integer"/>
+				<ref name="integer"/>
+			</list>
+		</attribute>
+	</define>
+	<define name="common-draw-style-name-attlist">
+		<choice>
+			<group>
+				<optional>
+					<attribute name="draw:style-name">
+						<ref name="styleNameRef"/>
+					</attribute>
+				</optional>
+				<optional>
+					<attribute name="draw:class-names">
+						<ref name="styleNameRefs"/>
+					</attribute>
+				</optional>
+			</group>
+			<group>
+				<optional>
+					<attribute name="presentation:style-name">
+						<ref name="styleNameRef"/>
+					</attribute>
+				</optional>
+				<optional>
+					<attribute name="presentation:class-names">
+						<ref name="styleNameRefs"/>
+					</attribute>
+				</optional>
+			</group>
+		</choice>
+	</define>
+	<define name="common-draw-text-style-name-attlist">
+		<optional>
+			<attribute name="draw:text-style-name">
+				<ref name="styleNameRef"/>
+			</attribute>
+		</optional>
+	</define>
+	<define name="common-draw-layer-name-attlist">
+		<optional>
+			<attribute name="draw:layer">
+				<ref name="string"/>
+			</attribute>
+		</optional>
+	</define>
+	<define name="common-draw-id-attlist">
+		<optional>
+			<group>
+				<ref name="xml-id"/>
+				<optional>
+					<attribute name="draw:id">
+						<ref name="NCName"/>
+					</attribute>
+				</optional>
+			</group>
+		</optional>
+	</define>
+	<define name="common-draw-z-index-attlist">
+		<optional>
+			<attribute name="draw:z-index">
+				<ref name="nonNegativeInteger"/>
+			</attribute>
+		</optional>
+	</define>
+	<define name="common-text-spreadsheet-shape-attlist">
+		<interleave>
+			<optional>
+				<attribute name="table:end-cell-address">
+					<ref name="cellAddress"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="table:end-x">
+					<ref name="coordinate"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="table:end-y">
+					<ref name="coordinate"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="table:table-background">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<ref name="common-text-anchor-attlist"/>
+		</interleave>
+	</define>
+	<define name="common-text-anchor-attlist">
+		<interleave>
+			<optional>
+				<attribute name="text:anchor-type">
+					<choice>
+						<value>page</value>
+						<value>frame</value>
+						<value>paragraph</value>
+						<value>char</value>
+						<value>as-char</value>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="text:anchor-page-number">
+					<ref name="positiveInteger"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="draw-text">
+		<zeroOrMore>
+			<choice>
+				<ref name="text-p"/>
+				<ref name="text-list"/>
+			</choice>
+		</zeroOrMore>
+	</define>
+	<define name="common-draw-shape-with-styles-attlist">
+		<ref name="common-draw-z-index-attlist"/>
+		<ref name="common-draw-id-attlist"/>
+		<ref name="common-draw-layer-name-attlist"/>
+		<ref name="common-draw-style-name-attlist"/>
+		<ref name="common-draw-transform-attlist"/>
+		<ref name="common-draw-name-attlist"/>
+		<ref name="common-text-spreadsheet-shape-attlist"/>
+	</define>
+	<define name="common-draw-shape-with-text-and-styles-attlist">
+		<ref name="common-draw-shape-with-styles-attlist"/>
+		<ref name="common-draw-text-style-name-attlist"/>
+	</define>
+	<define name="draw-glue-point">
+		<element name="draw:glue-point">
+			<ref name="draw-glue-point-attlist"/>
+			<empty/>
+		</element>
+	</define>
+	<define name="draw-glue-point-attlist">
+		<interleave>
+			<attribute name="draw:id">
+				<ref name="nonNegativeInteger"/>
+			</attribute>
+			<attribute name="svg:x">
+				<choice>
+					<ref name="distance"/>
+					<ref name="percent"/>
+				</choice>
+			</attribute>
+			<attribute name="svg:y">
+				<choice>
+					<ref name="distance"/>
+					<ref name="percent"/>
+				</choice>
+			</attribute>
+			<optional>
+				<attribute name="draw:align">
+					<choice>
+						<value>top-left</value>
+						<value>top</value>
+						<value>top-right</value>
+						<value>left</value>
+						<value>center</value>
+						<value>right</value>
+						<value>bottom-left</value>
+						<value>bottom-right</value>
+					</choice>
+				</attribute>
+			</optional>
+			<attribute name="draw:escape-direction">
+				<choice>
+					<value>auto</value>
+					<value>left</value>
+					<value>right</value>
+					<value>up</value>
+					<value>down</value>
+					<value>horizontal</value>
+					<value>vertical</value>
+				</choice>
+			</attribute>
+		</interleave>
+	</define>
+	<define name="svg-title">
+		<element name="svg:title">
+			<text/>
+		</element>
+	</define>
+	<define name="svg-desc">
+		<element name="svg:desc">
+			<text/>
+		</element>
+	</define>
+	<define name="draw-frame">
+		<element name="draw:frame">
+			<ref name="common-draw-shape-with-text-and-styles-attlist"/>
+			<ref name="common-draw-position-attlist"/>
+			<ref name="common-draw-rel-size-attlist"/>
+			<ref name="common-draw-caption-id-attlist"/>
+			<ref name="presentation-shape-attlist"/>
+			<ref name="draw-frame-attlist"/>
+			<zeroOrMore>
+				<choice>
+					<ref name="draw-text-box"/>
+					<ref name="draw-image"/>
+					<ref name="draw-object"/>
+					<ref name="draw-object-ole"/>
+					<ref name="draw-applet"/>
+					<ref name="draw-floating-frame"/>
+					<ref name="draw-plugin"/>
+					<ref name="table-table"/>
+				</choice>
+			</zeroOrMore>
+			<optional>
+				<ref name="office-event-listeners"/>
+			</optional>
+			<zeroOrMore>
+				<ref name="draw-glue-point"/>
+			</zeroOrMore>
+			<optional>
+				<ref name="draw-image-map"/>
+			</optional>
+			<optional>
+				<ref name="svg-title"/>
+			</optional>
+			<optional>
+				<ref name="svg-desc"/>
+			</optional>
+			<optional>
+				<choice>
+					<ref name="draw-contour-polygon"/>
+					<ref name="draw-contour-path"/>
+				</choice>
+			</optional>
+		</element>
+	</define>
+	<define name="common-draw-rel-size-attlist">
+		<ref name="common-draw-size-attlist"/>
+		<optional>
+			<attribute name="style:rel-width">
+				<choice>
+					<ref name="percent"/>
+					<value>scale</value>
+					<value>scale-min</value>
+				</choice>
+			</attribute>
+		</optional>
+		<optional>
+			<attribute name="style:rel-height">
+				<choice>
+					<ref name="percent"/>
+					<value>scale</value>
+					<value>scale-min</value>
+				</choice>
+			</attribute>
+		</optional>
+	</define>
+	<define name="draw-frame-attlist">
+		<optional>
+			<attribute name="draw:copy-of">
+				<ref name="string"/>
+			</attribute>
+		</optional>
+	</define>
+	<define name="draw-text-box">
+		<element name="draw:text-box">
+			<ref name="draw-text-box-attlist"/>
+			<zeroOrMore>
+				<ref name="text-content"/>
+			</zeroOrMore>
+		</element>
+	</define>
+	<define name="draw-text-box-attlist">
+		<interleave>
+			<optional>
+				<attribute name="draw:chain-next-name">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:corner-radius">
+					<ref name="nonNegativeLength"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="fo:min-height">
+					<choice>
+						<ref name="length"/>
+						<ref name="percent"/>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="fo:min-width">
+					<choice>
+						<ref name="length"/>
+						<ref name="percent"/>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="fo:max-height">
+					<choice>
+						<ref name="length"/>
+						<ref name="percent"/>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="fo:max-width">
+					<choice>
+						<ref name="length"/>
+						<ref name="percent"/>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<group>
+					<ref name="xml-id"/>
+					<optional>
+						<attribute name="text:id">
+							<ref name="NCName"/>
+						</attribute>
+					</optional>
+				</group>
+			</optional>
+		</interleave>
+	</define>
+	<define name="draw-image">
+		<element name="draw:image">
+			<ref name="draw-image-attlist"/>
+			<choice>
+				<ref name="common-draw-data-attlist"/>
+				<ref name="office-binary-data"/>
+			</choice>
+			<ref name="draw-text"/>
+		</element>
+	</define>
+	<define name="common-draw-data-attlist">
+		<group>
+			<attribute name="xlink:type">
+				<value>simple</value>
+			</attribute>
+			<attribute name="xlink:href">
+				<ref name="anyIRI"/>
+			</attribute>
+			<optional>
+				<attribute name="xlink:show">
+					<value>embed</value>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="xlink:actuate">
+					<value>onLoad</value>
+				</attribute>
+			</optional>
+		</group>
+	</define>
+	<define name="office-binary-data">
+		<element name="office:binary-data">
+			<ref name="base64Binary"/>
+		</element>
+	</define>
+	<define name="draw-image-attlist">
+		<interleave>
+			<optional>
+				<attribute name="draw:filter-name">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<ref name="xml-id"/>
+			</optional>
+		</interleave>
+	</define>
+	<define name="draw-object">
+		<element name="draw:object">
+			<ref name="draw-object-attlist"/>
+			<choice>
+				<ref name="common-draw-data-attlist"/>
+				<ref name="office-document"/>
+				<ref name="math-math"/>
+			</choice>
+		</element>
+	</define>
+	<define name="draw-object-ole">
+		<element name="draw:object-ole">
+			<ref name="draw-object-ole-attlist"/>
+			<choice>
+				<ref name="common-draw-data-attlist"/>
+				<ref name="office-binary-data"/>
+			</choice>
+		</element>
+	</define>
+	<define name="draw-object-attlist">
+		<interleave>
+			<optional>
+				<attribute name="draw:notify-on-update-of-ranges">
+					<choice>
+						<ref name="cellRangeAddressList"/>
+						<ref name="string"/>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<ref name="xml-id"/>
+			</optional>
+		</interleave>
+	</define>
+	<define name="draw-object-ole-attlist">
+		<interleave>
+			<optional>
+				<attribute name="draw:class-id">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<ref name="xml-id"/>
+			</optional>
+		</interleave>
+	</define>
+	<define name="draw-applet">
+		<element name="draw:applet">
+			<ref name="draw-applet-attlist"/>
+			<optional>
+				<ref name="common-draw-data-attlist"/>
+			</optional>
+			<zeroOrMore>
+				<ref name="draw-param"/>
+			</zeroOrMore>
+		</element>
+	</define>
+	<define name="draw-applet-attlist">
+		<interleave>
+			<optional>
+				<attribute name="draw:code">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:object">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:archive">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:may-script">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<ref name="xml-id"/>
+			</optional>
+		</interleave>
+	</define>
+	<define name="draw-plugin">
+		<element name="draw:plugin">
+			<ref name="draw-plugin-attlist"/>
+			<ref name="common-draw-data-attlist"/>
+			<zeroOrMore>
+				<ref name="draw-param"/>
+			</zeroOrMore>
+		</element>
+	</define>
+	<define name="draw-plugin-attlist">
+		<interleave>
+			<optional>
+				<attribute name="draw:mime-type">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<ref name="xml-id"/>
+			</optional>
+		</interleave>
+	</define>
+	<define name="draw-param">
+		<element name="draw:param">
+			<ref name="draw-param-attlist"/>
+			<empty/>
+		</element>
+	</define>
+	<define name="draw-param-attlist">
+		<interleave>
+			<optional>
+				<attribute name="draw:name">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:value">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="draw-floating-frame">
+		<element name="draw:floating-frame">
+			<ref name="draw-floating-frame-attlist"/>
+			<ref name="common-draw-data-attlist"/>
+		</element>
+	</define>
+	<define name="draw-floating-frame-attlist">
+		<interleave>
+			<optional>
+				<attribute name="draw:frame-name">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<ref name="xml-id"/>
+			</optional>
+		</interleave>
+	</define>
+	<define name="draw-contour-polygon">
+		<element name="draw:contour-polygon">
+			<ref name="common-contour-attlist"/>
+			<ref name="common-draw-size-attlist"/>
+			<ref name="common-draw-viewbox-attlist"/>
+			<ref name="common-draw-points-attlist"/>
+			<empty/>
+		</element>
+	</define>
+	<define name="draw-contour-path">
+		<element name="draw:contour-path">
+			<ref name="common-contour-attlist"/>
+			<ref name="common-draw-size-attlist"/>
+			<ref name="common-draw-viewbox-attlist"/>
+			<ref name="common-draw-path-data-attlist"/>
+			<empty/>
+		</element>
+	</define>
+	<define name="common-contour-attlist">
+		<attribute name="draw:recreate-on-edit">
+			<ref name="boolean"/>
+		</attribute>
+	</define>
+	<define name="draw-a">
+		<element name="draw:a">
+			<ref name="draw-a-attlist"/>
+			<ref name="shape-instance"/>
+		</element>
+	</define>
+	<define name="draw-a-attlist">
+		<interleave>
+			<attribute name="xlink:type">
+				<value>simple</value>
+			</attribute>
+			<attribute name="xlink:href">
+				<ref name="anyIRI"/>
+			</attribute>
+			<optional>
+				<attribute name="xlink:actuate">
+					<value>onRequest</value>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="office:target-frame-name">
+					<ref name="targetFrameName"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="xlink:show">
+					<choice>
+						<value>new</value>
+						<value>replace</value>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="office:name">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="office:title">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="office:server-map">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<ref name="xml-id"/>
+			</optional>
+		</interleave>
+	</define>
+	<define name="draw-image-map">
+		<element name="draw:image-map">
+			<zeroOrMore>
+				<choice>
+					<ref name="draw-area-rectangle"/>
+					<ref name="draw-area-circle"/>
+					<ref name="draw-area-polygon"/>
+				</choice>
+			</zeroOrMore>
+		</element>
+	</define>
+	<define name="draw-area-rectangle">
+		<element name="draw:area-rectangle">
+			<ref name="common-draw-area-attlist"/>
+			<attribute name="svg:x">
+				<ref name="coordinate"/>
+			</attribute>
+			<attribute name="svg:y">
+				<ref name="coordinate"/>
+			</attribute>
+			<attribute name="svg:width">
+				<ref name="length"/>
+			</attribute>
+			<attribute name="svg:height">
+				<ref name="length"/>
+			</attribute>
+			<optional>
+				<ref name="svg-title"/>
+			</optional>
+			<optional>
+				<ref name="svg-desc"/>
+			</optional>
+			<optional>
+				<ref name="office-event-listeners"/>
+			</optional>
+		</element>
+	</define>
+	<define name="draw-area-circle">
+		<element name="draw:area-circle">
+			<ref name="common-draw-area-attlist"/>
+			<attribute name="svg:cx">
+				<ref name="coordinate"/>
+			</attribute>
+			<attribute name="svg:cy">
+				<ref name="coordinate"/>
+			</attribute>
+			<attribute name="svg:r">
+				<ref name="length"/>
+			</attribute>
+			<optional>
+				<ref name="svg-title"/>
+			</optional>
+			<optional>
+				<ref name="svg-desc"/>
+			</optional>
+			<optional>
+				<ref name="office-event-listeners"/>
+			</optional>
+		</element>
+	</define>
+	<define name="draw-area-polygon">
+		<element name="draw:area-polygon">
+			<ref name="common-draw-area-attlist"/>
+			<attribute name="svg:x">
+				<ref name="coordinate"/>
+			</attribute>
+			<attribute name="svg:y">
+				<ref name="coordinate"/>
+			</attribute>
+			<attribute name="svg:width">
+				<ref name="length"/>
+			</attribute>
+			<attribute name="svg:height">
+				<ref name="length"/>
+			</attribute>
+			<ref name="common-draw-viewbox-attlist"/>
+			<ref name="common-draw-points-attlist"/>
+			<optional>
+				<ref name="svg-title"/>
+			</optional>
+			<optional>
+				<ref name="svg-desc"/>
+			</optional>
+			<optional>
+				<ref name="office-event-listeners"/>
+			</optional>
+		</element>
+	</define>
+	<define name="common-draw-area-attlist">
+		<interleave>
+			<optional>
+				<attribute name="xlink:type">
+					<value>simple</value>
+				</attribute>
+				<attribute name="xlink:href">
+					<ref name="anyIRI"/>
+				</attribute>
+				<optional>
+					<attribute name="office:target-frame-name">
+						<ref name="targetFrameName"/>
+					</attribute>
+				</optional>
+				<optional>
+					<attribute name="xlink:show">
+						<choice>
+							<value>new</value>
+							<value>replace</value>
+						</choice>
+					</attribute>
+				</optional>
+			</optional>
+			<optional>
+				<attribute name="office:name">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:nohref">
+					<value>nohref</value>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="dr3d-scene">
+		<element name="dr3d:scene">
+			<ref name="dr3d-scene-attlist"/>
+			<ref name="common-draw-position-attlist"/>
+			<ref name="common-draw-size-attlist"/>
+			<ref name="common-draw-style-name-attlist"/>
+			<ref name="common-draw-z-index-attlist"/>
+			<ref name="common-draw-id-attlist"/>
+			<ref name="common-draw-layer-name-attlist"/>
+			<ref name="common-text-spreadsheet-shape-attlist"/>
+			<ref name="common-dr3d-transform-attlist"/>
+			<ref name="common-draw-caption-id-attlist"/>
+			<optional>
+				<ref name="svg-title"/>
+			</optional>
+			<optional>
+				<ref name="svg-desc"/>
+			</optional>
+			<zeroOrMore>
+				<ref name="dr3d-light"/>
+			</zeroOrMore>
+			<zeroOrMore>
+				<ref name="shapes3d"/>
+			</zeroOrMore>
+			<zeroOrMore>
+				<ref name="draw-glue-point"/>
+			</zeroOrMore>
+		</element>
+	</define>
+	<define name="shapes3d">
+		<choice>
+			<ref name="dr3d-scene"/>
+			<ref name="dr3d-extrude"/>
+			<ref name="dr3d-sphere"/>
+			<ref name="dr3d-rotate"/>
+			<ref name="dr3d-cube"/>
+		</choice>
+	</define>
+	<define name="dr3d-scene-attlist">
+		<interleave>
+			<optional>
+				<attribute name="dr3d:vrp">
+					<ref name="vector3D"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="dr3d:vpn">
+					<ref name="vector3D"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="dr3d:vup">
+					<ref name="vector3D"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="dr3d:projection">
+					<choice>
+						<value>parallel</value>
+						<value>perspective</value>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="dr3d:distance">
+					<ref name="length"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="dr3d:focal-length">
+					<ref name="length"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="dr3d:shadow-slant">
+					<ref name="angle"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="dr3d:shade-mode">
+					<choice>
+						<value>flat</value>
+						<value>phong</value>
+						<value>gouraud</value>
+						<value>draft</value>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="dr3d:ambient-color">
+					<ref name="color"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="dr3d:lighting-mode">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="common-dr3d-transform-attlist">
+		<optional>
+			<attribute name="dr3d:transform">
+				<ref name="string"/>
+			</attribute>
+		</optional>
+	</define>
+	<define name="dr3d-light">
+		<element name="dr3d:light">
+			<ref name="dr3d-light-attlist"/>
+			<empty/>
+		</element>
+	</define>
+	<define name="dr3d-light-attlist">
+		<interleave>
+			<optional>
+				<attribute name="dr3d:diffuse-color">
+					<ref name="color"/>
+				</attribute>
+			</optional>
+			<attribute name="dr3d:direction">
+				<ref name="vector3D"/>
+			</attribute>
+			<optional>
+				<attribute name="dr3d:enabled">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="dr3d:specular">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="dr3d-cube">
+		<element name="dr3d:cube">
+			<ref name="dr3d-cube-attlist"/>
+			<ref name="common-draw-z-index-attlist"/>
+			<ref name="common-draw-id-attlist"/>
+			<ref name="common-draw-layer-name-attlist"/>
+			<ref name="common-draw-style-name-attlist"/>
+			<ref name="common-dr3d-transform-attlist"/>
+			<empty/>
+		</element>
+	</define>
+	<define name="dr3d-cube-attlist">
+		<optional>
+			<attribute name="dr3d:min-edge">
+				<ref name="vector3D"/>
+			</attribute>
+		</optional>
+		<optional>
+			<attribute name="dr3d:max-edge">
+				<ref name="vector3D"/>
+			</attribute>
+		</optional>
+	</define>
+	<define name="dr3d-sphere">
+		<element name="dr3d:sphere">
+			<ref name="dr3d-sphere-attlist"/>
+			<ref name="common-draw-z-index-attlist"/>
+			<ref name="common-draw-id-attlist"/>
+			<ref name="common-draw-layer-name-attlist"/>
+			<ref name="common-draw-style-name-attlist"/>
+			<ref name="common-dr3d-transform-attlist"/>
+			<empty/>
+		</element>
+	</define>
+	<define name="dr3d-sphere-attlist">
+		<interleave>
+			<optional>
+				<attribute name="dr3d:center">
+					<ref name="vector3D"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="dr3d:size">
+					<ref name="vector3D"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="dr3d-extrude">
+		<element name="dr3d:extrude">
+			<ref name="common-draw-path-data-attlist"/>
+			<ref name="common-draw-viewbox-attlist"/>
+			<ref name="common-draw-id-attlist"/>
+			<ref name="common-draw-z-index-attlist"/>
+			<ref name="common-draw-layer-name-attlist"/>
+			<ref name="common-draw-style-name-attlist"/>
+			<ref name="common-dr3d-transform-attlist"/>
+			<empty/>
+		</element>
+	</define>
+	<define name="dr3d-rotate">
+		<element name="dr3d:rotate">
+			<ref name="common-draw-viewbox-attlist"/>
+			<ref name="common-draw-path-data-attlist"/>
+			<ref name="common-draw-z-index-attlist"/>
+			<ref name="common-draw-id-attlist"/>
+			<ref name="common-draw-layer-name-attlist"/>
+			<ref name="common-draw-style-name-attlist"/>
+			<ref name="common-dr3d-transform-attlist"/>
+			<empty/>
+		</element>
+	</define>
+	<define name="draw-custom-shape">
+		<element name="draw:custom-shape">
+			<ref name="draw-custom-shape-attlist"/>
+			<ref name="common-draw-position-attlist"/>
+			<ref name="common-draw-size-attlist"/>
+			<ref name="common-draw-shape-with-text-and-styles-attlist"/>
+			<ref name="common-draw-caption-id-attlist"/>
+			<optional>
+				<ref name="svg-title"/>
+			</optional>
+			<optional>
+				<ref name="svg-desc"/>
+			</optional>
+			<optional>
+				<ref name="office-event-listeners"/>
+			</optional>
+			<zeroOrMore>
+				<ref name="draw-glue-point"/>
+			</zeroOrMore>
+			<ref name="draw-text"/>
+			<optional>
+				<ref name="draw-enhanced-geometry"/>
+			</optional>
+		</element>
+	</define>
+	<define name="draw-custom-shape-attlist">
+		<interleave>
+			<optional>
+				<attribute name="draw:engine">
+					<ref name="namespacedToken"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:data">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="draw-enhanced-geometry">
+		<element name="draw:enhanced-geometry">
+			<ref name="draw-enhanced-geometry-attlist"/>
+			<zeroOrMore>
+				<ref name="draw-equation"/>
+			</zeroOrMore>
+			<zeroOrMore>
+				<ref name="draw-handle"/>
+			</zeroOrMore>
+		</element>
+	</define>
+	<define name="draw-enhanced-geometry-attlist">
+		<interleave>
+			<optional>
+				<attribute name="draw:type">
+					<ref name="custom-shape-type"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="svg:viewBox">
+					<list>
+						<ref name="integer"/>
+						<ref name="integer"/>
+						<ref name="integer"/>
+						<ref name="integer"/>
+					</list>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:mirror-vertical">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:mirror-horizontal">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:text-rotate-angle">
+					<ref name="angle"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:extrusion-allowed">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:text-path-allowed">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:concentric-gradient-fill-allowed">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:extrusion">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:extrusion-brightness">
+					<ref name="zeroToHundredPercent"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:extrusion-depth">
+					<list>
+						<ref name="length"/>
+						<ref name="double"/>
+					</list>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:extrusion-diffusion">
+					<ref name="percent"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:extrusion-number-of-line-segments">
+					<ref name="integer"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:extrusion-light-face">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:extrusion-first-light-harsh">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:extrusion-second-light-harsh">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:extrusion-first-light-level">
+					<ref name="zeroToHundredPercent"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:extrusion-second-light-level">
+					<ref name="zeroToHundredPercent"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:extrusion-first-light-direction">
+					<ref name="vector3D"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:extrusion-second-light-direction">
+					<ref name="vector3D"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:extrusion-metal">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="dr3d:shade-mode">
+					<choice>
+						<value>flat</value>
+						<value>phong</value>
+						<value>gouraud</value>
+						<value>draft</value>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:extrusion-rotation-angle">
+					<list>
+						<ref name="angle"/>
+						<ref name="angle"/>
+					</list>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:extrusion-rotation-center">
+					<ref name="vector3D"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:extrusion-shininess">
+					<ref name="zeroToHundredPercent"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:extrusion-skew">
+					<list>
+						<ref name="double"/>
+						<ref name="angle"/>
+					</list>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:extrusion-specularity">
+					<ref name="zeroToHundredPercent"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="dr3d:projection">
+					<choice>
+						<value>parallel</value>
+						<value>perspective</value>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:extrusion-viewpoint">
+					<ref name="point3D"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:extrusion-origin">
+					<list>
+						<ref name="extrusionOrigin"/>
+						<ref name="extrusionOrigin"/>
+					</list>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:extrusion-color">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:enhanced-path">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:path-stretchpoint-x">
+					<ref name="double"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:path-stretchpoint-y">
+					<ref name="double"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:text-areas">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:glue-points">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:glue-point-type">
+					<choice>
+						<value>none</value>
+						<value>segments</value>
+						<value>rectangle</value>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:glue-point-leaving-directions">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:text-path">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:text-path-mode">
+					<choice>
+						<value>normal</value>
+						<value>path</value>
+						<value>shape</value>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:text-path-scale">
+					<choice>
+						<value>path</value>
+						<value>shape</value>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:text-path-same-letter-heights">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:modifiers">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="custom-shape-type">
+		<choice>
+			<value>non-primitive</value>
+			<ref name="string"/>
+		</choice>
+	</define>
+	<define name="point3D">
+		<data type="string">
+			<param name="pattern">\([ ]*-?([0-9]+(\.[0-9]*)?|\.[0-9]+)((cm)|(mm)|(in)|(pt)|(pc))([ ]+-?([0-9]+(\.[0-9]*)?|\.[0-9]+)((cm)|(mm)|(in)|(pt)|(pc))){2}[ ]*\)</param>
+		</data>
+	</define>
+	<define name="extrusionOrigin">
+		<data type="double">
+			<param name="minInclusive">-0.5</param>
+			<param name="maxInclusive">0.5</param>
+		</data>
+	</define>
+	<define name="draw-equation">
+		<element name="draw:equation">
+			<ref name="draw-equation-attlist"/>
+			<empty/>
+		</element>
+	</define>
+	<define name="draw-equation-attlist">
+		<interleave>
+			<optional>
+				<attribute name="draw:name">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:formula">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="draw-handle">
+		<element name="draw:handle">
+			<ref name="draw-handle-attlist"/>
+			<empty/>
+		</element>
+	</define>
+	<define name="draw-handle-attlist">
+		<interleave>
+			<optional>
+				<attribute name="draw:handle-mirror-vertical">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:handle-mirror-horizontal">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:handle-switched">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<attribute name="draw:handle-position">
+				<ref name="string"/>
+			</attribute>
+			<optional>
+				<attribute name="draw:handle-range-x-minimum">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:handle-range-x-maximum">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:handle-range-y-minimum">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:handle-range-y-maximum">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:handle-polar">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:handle-radius-range-minimum">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:handle-radius-range-maximum">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="presentation-shape-attlist">
+		<interleave>
+			<optional>
+				<attribute name="presentation:class">
+					<ref name="presentation-classes"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="presentation:placeholder">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="presentation:user-transformed">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="presentation-classes">
+		<choice>
+			<value>title</value>
+			<value>outline</value>
+			<value>subtitle</value>
+			<value>text</value>
+			<value>graphic</value>
+			<value>object</value>
+			<value>chart</value>
+			<value>table</value>
+			<value>orgchart</value>
+			<value>page</value>
+			<value>notes</value>
+			<value>handout</value>
+			<value>header</value>
+			<value>footer</value>
+			<value>date-time</value>
+			<value>page-number</value>
+		</choice>
+	</define>
+	<define name="presentation-animations">
+		<element name="presentation:animations">
+			<zeroOrMore>
+				<choice>
+					<ref name="presentation-animation-elements"/>
+					<ref name="presentation-animation-group"/>
+				</choice>
+			</zeroOrMore>
+		</element>
+	</define>
+	<define name="presentation-animation-elements">
+		<choice>
+			<ref name="presentation-show-shape"/>
+			<ref name="presentation-show-text"/>
+			<ref name="presentation-hide-shape"/>
+			<ref name="presentation-hide-text"/>
+			<ref name="presentation-dim"/>
+			<ref name="presentation-play"/>
+		</choice>
+	</define>
+	<define name="presentation-sound">
+		<element name="presentation:sound">
+			<ref name="presentation-sound-attlist"/>
+			<attribute name="xlink:type">
+				<value>simple</value>
+			</attribute>
+			<attribute name="xlink:href">
+				<ref name="anyIRI"/>
+			</attribute>
+			<optional>
+				<attribute name="xlink:actuate">
+					<value>onRequest</value>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="xlink:show">
+					<choice>
+						<value>new</value>
+						<value>replace</value>
+					</choice>
+				</attribute>
+			</optional>
+			<empty/>
+		</element>
+	</define>
+	<define name="presentation-sound-attlist">
+		<interleave>
+			<optional>
+				<attribute name="presentation:play-full">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<ref name="xml-id"/>
+			</optional>
+		</interleave>
+	</define>
+	<define name="presentation-show-shape">
+		<element name="presentation:show-shape">
+			<ref name="common-presentation-effect-attlist"/>
+			<optional>
+				<ref name="presentation-sound"/>
+			</optional>
+		</element>
+	</define>
+	<define name="common-presentation-effect-attlist">
+		<interleave>
+			<attribute name="draw:shape-id">
+				<ref name="IDREF"/>
+			</attribute>
+			<optional>
+				<attribute name="presentation:effect">
+					<ref name="presentationEffects"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="presentation:direction">
+					<ref name="presentationEffectDirections"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="presentation:speed">
+					<ref name="presentationSpeeds"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="presentation:delay">
+					<ref name="duration"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="presentation:start-scale">
+					<ref name="percent"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="presentation:path-id">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="presentationEffects">
+		<choice>
+			<value>none</value>
+			<value>fade</value>
+			<value>move</value>
+			<value>stripes</value>
+			<value>open</value>
+			<value>close</value>
+			<value>dissolve</value>
+			<value>wavyline</value>
+			<value>random</value>
+			<value>lines</value>
+			<value>laser</value>
+			<value>appear</value>
+			<value>hide</value>
+			<value>move-short</value>
+			<value>checkerboard</value>
+			<value>rotate</value>
+			<value>stretch</value>
+		</choice>
+	</define>
+	<define name="presentationEffectDirections">
+		<choice>
+			<value>none</value>
+			<value>from-left</value>
+			<value>from-top</value>
+			<value>from-right</value>
+			<value>from-bottom</value>
+			<value>from-center</value>
+			<value>from-upper-left</value>
+			<value>from-upper-right</value>
+			<value>from-lower-left</value>
+			<value>from-lower-right</value>
+			<value>to-left</value>
+			<value>to-top</value>
+			<value>to-right</value>
+			<value>to-bottom</value>
+			<value>to-upper-left</value>
+			<value>to-upper-right</value>
+			<value>to-lower-right</value>
+			<value>to-lower-left</value>
+			<value>path</value>
+			<value>spiral-inward-left</value>
+			<value>spiral-inward-right</value>
+			<value>spiral-outward-left</value>
+			<value>spiral-outward-right</value>
+			<value>vertical</value>
+			<value>horizontal</value>
+			<value>to-center</value>
+			<value>clockwise</value>
+			<value>counter-clockwise</value>
+		</choice>
+	</define>
+	<define name="presentationSpeeds">
+		<choice>
+			<value>slow</value>
+			<value>medium</value>
+			<value>fast</value>
+		</choice>
+	</define>
+	<define name="presentation-show-text">
+		<element name="presentation:show-text">
+			<ref name="common-presentation-effect-attlist"/>
+			<optional>
+				<ref name="presentation-sound"/>
+			</optional>
+		</element>
+	</define>
+	<define name="presentation-hide-shape">
+		<element name="presentation:hide-shape">
+			<ref name="common-presentation-effect-attlist"/>
+			<optional>
+				<ref name="presentation-sound"/>
+			</optional>
+		</element>
+	</define>
+	<define name="presentation-hide-text">
+		<element name="presentation:hide-text">
+			<ref name="common-presentation-effect-attlist"/>
+			<optional>
+				<ref name="presentation-sound"/>
+			</optional>
+		</element>
+	</define>
+	<define name="presentation-dim">
+		<element name="presentation:dim">
+			<ref name="presentation-dim-attlist"/>
+			<optional>
+				<ref name="presentation-sound"/>
+			</optional>
+		</element>
+	</define>
+	<define name="presentation-dim-attlist">
+		<interleave>
+			<attribute name="draw:shape-id">
+				<ref name="IDREF"/>
+			</attribute>
+			<attribute name="draw:color">
+				<ref name="color"/>
+			</attribute>
+		</interleave>
+	</define>
+	<define name="presentation-play">
+		<element name="presentation:play">
+			<ref name="presentation-play-attlist"/>
+			<empty/>
+		</element>
+	</define>
+	<define name="presentation-play-attlist">
+		<attribute name="draw:shape-id">
+			<ref name="IDREF"/>
+		</attribute>
+		<optional>
+			<attribute name="presentation:speed">
+				<ref name="presentationSpeeds"/>
+			</attribute>
+		</optional>
+	</define>
+	<define name="presentation-animation-group">
+		<element name="presentation:animation-group">
+			<zeroOrMore>
+				<ref name="presentation-animation-elements"/>
+			</zeroOrMore>
+		</element>
+	</define>
+	<define name="common-anim-attlist">
+		<interleave>
+			<optional>
+				<attribute name="presentation:node-type">
+					<choice>
+						<value>default</value>
+						<value>on-click</value>
+						<value>with-previous</value>
+						<value>after-previous</value>
+						<value>timing-root</value>
+						<value>main-sequence</value>
+						<value>interactive-sequence</value>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="presentation:preset-id">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="presentation:preset-sub-type">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="presentation:preset-class">
+					<choice>
+						<value>custom</value>
+						<value>entrance</value>
+						<value>exit</value>
+						<value>emphasis</value>
+						<value>motion-path</value>
+						<value>ole-action</value>
+						<value>media-call</value>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="presentation:master-element">
+					<ref name="IDREF"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="presentation:group-id">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<group>
+					<ref name="xml-id"/>
+					<optional>
+						<attribute name="anim:id">
+							<ref name="NCName"/>
+						</attribute>
+					</optional>
+				</group>
+			</optional>
+		</interleave>
+	</define>
+	<define name="presentation-event-listener">
+		<element name="presentation:event-listener">
+			<ref name="presentation-event-listener-attlist"/>
+			<optional>
+				<ref name="presentation-sound"/>
+			</optional>
+		</element>
+	</define>
+	<define name="presentation-event-listener-attlist">
+		<interleave>
+			<attribute name="script:event-name">
+				<ref name="string"/>
+			</attribute>
+			<attribute name="presentation:action">
+				<choice>
+					<value>none</value>
+					<value>previous-page</value>
+					<value>next-page</value>
+					<value>first-page</value>
+					<value>last-page</value>
+					<value>hide</value>
+					<value>stop</value>
+					<value>execute</value>
+					<value>show</value>
+					<value>verb</value>
+					<value>fade-out</value>
+					<value>sound</value>
+					<value>last-visited-page</value>
+				</choice>
+			</attribute>
+			<optional>
+				<attribute name="presentation:effect">
+					<ref name="presentationEffects"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="presentation:direction">
+					<ref name="presentationEffectDirections"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="presentation:speed">
+					<ref name="presentationSpeeds"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="presentation:start-scale">
+					<ref name="percent"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="xlink:type">
+					<value>simple</value>
+				</attribute>
+				<attribute name="xlink:href">
+					<ref name="anyIRI"/>
+				</attribute>
+				<optional>
+					<attribute name="xlink:show">
+						<value>embed</value>
+					</attribute>
+				</optional>
+				<optional>
+					<attribute name="xlink:actuate">
+						<value>onRequest</value>
+					</attribute>
+				</optional>
+			</optional>
+			<optional>
+				<attribute name="presentation:verb">
+					<ref name="nonNegativeInteger"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="presentation-decls">
+		<zeroOrMore>
+			<ref name="presentation-decl"/>
+		</zeroOrMore>
+	</define>
+	<define name="presentation-decl">
+		<choice>
+			<element name="presentation:header-decl">
+				<ref name="presentation-header-decl-attlist"/>
+				<text/>
+			</element>
+			<element name="presentation:footer-decl">
+				<ref name="presentation-footer-decl-attlist"/>
+				<text/>
+			</element>
+			<element name="presentation:date-time-decl">
+				<ref name="presentation-date-time-decl-attlist"/>
+				<text/>
+			</element>
+		</choice>
+	</define>
+	<define name="presentation-header-decl-attlist">
+		<attribute name="presentation:name">
+			<ref name="string"/>
+		</attribute>
+	</define>
+	<define name="presentation-footer-decl-attlist">
+		<attribute name="presentation:name">
+			<ref name="string"/>
+		</attribute>
+	</define>
+	<define name="presentation-date-time-decl-attlist">
+		<interleave>
+			<attribute name="presentation:name">
+				<ref name="string"/>
+			</attribute>
+			<attribute name="presentation:source">
+				<choice>
+					<value>fixed</value>
+					<value>current-date</value>
+				</choice>
+			</attribute>
+			<optional>
+				<attribute name="style:data-style-name">
+					<ref name="styleNameRef"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="presentation-settings">
+		<optional>
+			<element name="presentation:settings">
+				<ref name="presentation-settings-attlist"/>
+				<zeroOrMore>
+					<ref name="presentation-show"/>
+				</zeroOrMore>
+			</element>
+		</optional>
+	</define>
+	<define name="presentation-settings-attlist">
+		<interleave>
+			<optional>
+				<attribute name="presentation:start-page">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="presentation:show">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="presentation:full-screen">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="presentation:endless">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="presentation:pause">
+					<ref name="duration"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="presentation:show-logo">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="presentation:force-manual">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="presentation:mouse-visible">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="presentation:mouse-as-pen">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="presentation:start-with-navigator">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="presentation:animations">
+					<choice>
+						<value>enabled</value>
+						<value>disabled</value>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="presentation:transition-on-click">
+					<choice>
+						<value>enabled</value>
+						<value>disabled</value>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="presentation:stay-on-top">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="presentation:show-end-of-presentation-slide">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="presentation-show">
+		<element name="presentation:show">
+			<ref name="presentation-show-attlist"/>
+			<empty/>
+		</element>
+	</define>
+	<define name="presentation-show-attlist">
+		<interleave>
+			<attribute name="presentation:name">
+				<ref name="string"/>
+			</attribute>
+			<attribute name="presentation:pages">
+				<ref name="string"/>
+			</attribute>
+		</interleave>
+	</define>
+	<define name="chart-chart">
+		<element name="chart:chart">
+			<ref name="chart-chart-attlist"/>
+			<optional>
+				<ref name="chart-title"/>
+			</optional>
+			<optional>
+				<ref name="chart-subtitle"/>
+			</optional>
+			<optional>
+				<ref name="chart-footer"/>
+			</optional>
+			<optional>
+				<ref name="chart-legend"/>
+			</optional>
+			<ref name="chart-plot-area"/>
+			<optional>
+				<ref name="table-table"/>
+			</optional>
+		</element>
+	</define>
+	<define name="chart-chart-attlist">
+		<interleave>
+			<attribute name="chart:class">
+				<ref name="namespacedToken"/>
+			</attribute>
+			<ref name="common-draw-size-attlist"/>
+			<optional>
+				<attribute name="chart:column-mapping">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="chart:row-mapping">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="chart:style-name">
+					<ref name="styleNameRef"/>
+				</attribute>
+			</optional>
+			<optional>
+				<group>
+					<attribute name="xlink:type">
+						<value>simple</value>
+					</attribute>
+					<attribute name="xlink:href">
+						<ref name="anyIRI"/>
+					</attribute>
+				</group>
+			</optional>
+			<optional>
+				<ref name="xml-id"/>
+			</optional>
+		</interleave>
+	</define>
+	<define name="chart-title">
+		<element name="chart:title">
+			<ref name="chart-title-attlist"/>
+			<optional>
+				<ref name="text-p"/>
+			</optional>
+		</element>
+	</define>
+	<define name="chart-title-attlist">
+		<interleave>
+			<optional>
+				<attribute name="table:cell-range">
+					<ref name="cellRangeAddressList"/>
+				</attribute>
+			</optional>
+			<ref name="common-draw-position-attlist"/>
+			<optional>
+				<attribute name="chart:style-name">
+					<ref name="styleNameRef"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="chart-subtitle">
+		<element name="chart:subtitle">
+			<ref name="chart-title-attlist"/>
+			<optional>
+				<ref name="text-p"/>
+			</optional>
+		</element>
+	</define>
+	<define name="chart-footer">
+		<element name="chart:footer">
+			<ref name="chart-title-attlist"/>
+			<optional>
+				<ref name="text-p"/>
+			</optional>
+		</element>
+	</define>
+	<define name="chart-legend">
+		<element name="chart:legend">
+			<ref name="chart-legend-attlist"/>
+			<optional>
+				<ref name="text-p"/>
+			</optional>
+		</element>
+	</define>
+	<define name="chart-legend-attlist">
+		<interleave>
+			<choice>
+				<group>
+					<attribute name="chart:legend-position">
+						<choice>
+							<value>start</value>
+							<value>end</value>
+							<value>top</value>
+							<value>bottom</value>
+						</choice>
+					</attribute>
+					<optional>
+						<attribute name="chart:legend-align">
+							<choice>
+								<value>start</value>
+								<value>center</value>
+								<value>end</value>
+							</choice>
+						</attribute>
+					</optional>
+				</group>
+				<attribute name="chart:legend-position">
+					<choice>
+						<value>top-start</value>
+						<value>bottom-start</value>
+						<value>top-end</value>
+						<value>bottom-end</value>
+					</choice>
+				</attribute>
+				<empty/>
+			</choice>
+			<ref name="common-draw-position-attlist"/>
+			<choice>
+				<attribute name="style:legend-expansion">
+					<choice>
+						<value>wide</value>
+						<value>high</value>
+						<value>balanced</value>
+					</choice>
+				</attribute>
+				<group>
+					<attribute name="style:legend-expansion">
+						<value>custom</value>
+					</attribute>
+					<attribute name="style:legend-expansion-aspect-ratio">
+						<ref name="double"/>
+					</attribute>
+				</group>
+				<empty/>
+			</choice>
+			<optional>
+				<attribute name="chart:style-name">
+					<ref name="styleNameRef"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="chart-plot-area">
+		<element name="chart:plot-area">
+			<ref name="chart-plot-area-attlist"/>
+			<zeroOrMore>
+				<ref name="dr3d-light"/>
+			</zeroOrMore>
+			<zeroOrMore>
+				<ref name="chart-axis"/>
+			</zeroOrMore>
+			<zeroOrMore>
+				<ref name="chart-series"/>
+			</zeroOrMore>
+			<optional>
+				<ref name="chart-stock-gain-marker"/>
+			</optional>
+			<optional>
+				<ref name="chart-stock-loss-marker"/>
+			</optional>
+			<optional>
+				<ref name="chart-stock-range-line"/>
+			</optional>
+			<optional>
+				<ref name="chart-wall"/>
+			</optional>
+			<optional>
+				<ref name="chart-floor"/>
+			</optional>
+		</element>
+	</define>
+	<define name="chart-plot-area-attlist">
+		<interleave>
+			<ref name="common-draw-position-attlist"/>
+			<ref name="common-draw-size-attlist"/>
+			<optional>
+				<attribute name="chart:style-name">
+					<ref name="styleNameRef"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="table:cell-range-address">
+					<ref name="cellRangeAddressList"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="chart:data-source-has-labels">
+					<choice>
+						<value>none</value>
+						<value>row</value>
+						<value>column</value>
+						<value>both</value>
+					</choice>
+				</attribute>
+			</optional>
+			<ref name="dr3d-scene-attlist"/>
+			<ref name="common-dr3d-transform-attlist"/>
+			<optional>
+				<ref name="xml-id"/>
+			</optional>
+		</interleave>
+	</define>
+	<define name="chart-wall">
+		<element name="chart:wall">
+			<ref name="chart-wall-attlist"/>
+			<empty/>
+		</element>
+	</define>
+	<define name="chart-wall-attlist">
+		<interleave>
+			<optional>
+				<attribute name="svg:width">
+					<ref name="length"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="chart:style-name">
+					<ref name="styleNameRef"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="chart-floor">
+		<element name="chart:floor">
+			<ref name="chart-floor-attlist"/>
+			<empty/>
+		</element>
+	</define>
+	<define name="chart-floor-attlist">
+		<interleave>
+			<optional>
+				<attribute name="svg:width">
+					<ref name="length"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="chart:style-name">
+					<ref name="styleNameRef"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="chart-axis">
+		<element name="chart:axis">
+			<ref name="chart-axis-attlist"/>
+			<optional>
+				<ref name="chart-title"/>
+			</optional>
+			<optional>
+				<ref name="chart-categories"/>
+			</optional>
+			<zeroOrMore>
+				<ref name="chart-grid"/>
+			</zeroOrMore>
+		</element>
+	</define>
+	<define name="chart-axis-attlist">
+		<interleave>
+			<attribute name="chart:dimension">
+				<ref name="chart-dimension"/>
+			</attribute>
+			<optional>
+				<attribute name="chart:name">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="chart:style-name">
+					<ref name="styleNameRef"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="chart-dimension">
+		<choice>
+			<value>x</value>
+			<value>y</value>
+			<value>z</value>
+		</choice>
+	</define>
+	<define name="chart-categories">
+		<element name="chart:categories">
+			<optional>
+				<attribute name="table:cell-range-address">
+					<ref name="cellRangeAddressList"/>
+				</attribute>
+			</optional>
+		</element>
+	</define>
+	<define name="chart-grid">
+		<element name="chart:grid">
+			<ref name="chart-grid-attlist"/>
+		</element>
+	</define>
+	<define name="chart-grid-attlist">
+		<interleave>
+			<optional>
+				<attribute name="chart:class">
+					<choice>
+						<value>major</value>
+						<value>minor</value>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="chart:style-name">
+					<ref name="styleNameRef"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="chart-series">
+		<element name="chart:series">
+			<ref name="chart-series-attlist"/>
+			<zeroOrMore>
+				<ref name="chart-domain"/>
+			</zeroOrMore>
+			<optional>
+				<ref name="chart-mean-value"/>
+			</optional>
+			<zeroOrMore>
+				<ref name="chart-regression-curve"/>
+			</zeroOrMore>
+			<zeroOrMore>
+				<ref name="chart-error-indicator"/>
+			</zeroOrMore>
+			<zeroOrMore>
+				<ref name="chart-data-point"/>
+			</zeroOrMore>
+			<optional>
+				<ref name="chart-data-label"/>
+			</optional>
+		</element>
+	</define>
+	<define name="chart-series-attlist">
+		<interleave>
+			<optional>
+				<attribute name="chart:values-cell-range-address">
+					<ref name="cellRangeAddressList"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="chart:label-cell-address">
+					<ref name="cellRangeAddressList"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="chart:class">
+					<ref name="namespacedToken"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="chart:attached-axis">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="chart:style-name">
+					<ref name="styleNameRef"/>
+				</attribute>
+			</optional>
+			<optional>
+				<ref name="xml-id"/>
+			</optional>
+		</interleave>
+	</define>
+	<define name="chart-domain">
+		<element name="chart:domain">
+			<optional>
+				<attribute name="table:cell-range-address">
+					<ref name="cellRangeAddressList"/>
+				</attribute>
+			</optional>
+		</element>
+	</define>
+	<define name="chart-data-point">
+		<element name="chart:data-point">
+			<ref name="chart-data-point-attlist"/>
+			<optional>
+				<ref name="chart-data-label"/>
+			</optional>
+		</element>
+	</define>
+	<define name="chart-data-point-attlist">
+		<interleave>
+			<optional>
+				<attribute name="chart:repeated">
+					<ref name="positiveInteger"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="chart:style-name">
+					<ref name="styleNameRef"/>
+				</attribute>
+			</optional>
+			<optional>
+				<ref name="xml-id"/>
+			</optional>
+		</interleave>
+	</define>
+	<define name="chart-data-label">
+		<element name="chart:data-label">
+			<ref name="chart-data-label-attlist"/>
+			<optional>
+				<ref name="text-p"/>
+			</optional>
+		</element>
+	</define>
+	<define name="chart-data-label-attlist">
+		<interleave>
+			<ref name="common-draw-position-attlist"/>
+			<optional>
+				<attribute name="chart:style-name">
+					<ref name="styleNameRef"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="chart-mean-value">
+		<element name="chart:mean-value">
+			<ref name="chart-mean-value-attlist"/>
+			<empty/>
+		</element>
+	</define>
+	<define name="chart-mean-value-attlist">
+		<optional>
+			<attribute name="chart:style-name">
+				<ref name="styleNameRef"/>
+			</attribute>
+		</optional>
+	</define>
+	<define name="chart-error-indicator">
+		<element name="chart:error-indicator">
+			<ref name="chart-error-indicator-attlist"/>
+			<empty/>
+		</element>
+	</define>
+	<define name="chart-error-indicator-attlist">
+		<interleave>
+			<optional>
+				<attribute name="chart:style-name">
+					<ref name="styleNameRef"/>
+				</attribute>
+			</optional>
+			<attribute name="chart:dimension">
+				<ref name="chart-dimension"/>
+			</attribute>
+		</interleave>
+	</define>
+	<define name="chart-regression-curve">
+		<element name="chart:regression-curve">
+			<ref name="chart-regression-curve-attlist"/>
+			<optional>
+				<ref name="chart-equation"/>
+			</optional>
+		</element>
+	</define>
+	<define name="chart-regression-curve-attlist">
+		<optional>
+			<attribute name="chart:style-name">
+				<ref name="styleNameRef"/>
+			</attribute>
+		</optional>
+	</define>
+	<define name="chart-equation">
+		<element name="chart:equation">
+			<ref name="chart-equation-attlist"/>
+			<optional>
+				<ref name="text-p"/>
+			</optional>
+		</element>
+	</define>
+	<define name="chart-equation-attlist">
+		<interleave>
+			<optional>
+				<attribute name="chart:automatic-content">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="chart:display-r-square">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="chart:display-equation">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<ref name="common-draw-position-attlist"/>
+			<optional>
+				<attribute name="chart:style-name">
+					<ref name="styleNameRef"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="chart-stock-gain-marker">
+		<element name="chart:stock-gain-marker">
+			<ref name="common-stock-marker-attlist"/>
+		</element>
+	</define>
+	<define name="chart-stock-loss-marker">
+		<element name="chart:stock-loss-marker">
+			<ref name="common-stock-marker-attlist"/>
+		</element>
+	</define>
+	<define name="chart-stock-range-line">
+		<element name="chart:stock-range-line">
+			<ref name="common-stock-marker-attlist"/>
+		</element>
+	</define>
+	<define name="common-stock-marker-attlist">
+		<optional>
+			<attribute name="chart:style-name">
+				<ref name="styleNameRef"/>
+			</attribute>
+		</optional>
+	</define>
+	<define name="office-database">
+		<element name="office:database">
+			<ref name="db-data-source"/>
+			<optional>
+				<ref name="db-forms"/>
+			</optional>
+			<optional>
+				<ref name="db-reports"/>
+			</optional>
+			<optional>
+				<ref name="db-queries"/>
+			</optional>
+			<optional>
+				<ref name="db-table-presentations"/>
+			</optional>
+			<optional>
+				<ref name="db-schema-definition"/>
+			</optional>
+		</element>
+	</define>
+	<define name="db-data-source">
+		<element name="db:data-source">
+			<ref name="db-data-source-attlist"/>
+			<ref name="db-connection-data"/>
+			<optional>
+				<ref name="db-driver-settings"/>
+			</optional>
+			<optional>
+				<ref name="db-application-connection-settings"/>
+			</optional>
+		</element>
+	</define>
+	<define name="db-data-source-attlist">
+		<empty/>
+	</define>
+	<define name="db-connection-data">
+		<element name="db:connection-data">
+			<ref name="db-connection-data-attlist"/>
+			<choice>
+				<ref name="db-database-description"/>
+				<ref name="db-connection-resource"/>
+			</choice>
+			<optional>
+				<ref name="db-login"/>
+			</optional>
+		</element>
+	</define>
+	<define name="db-connection-data-attlist">
+		<empty/>
+	</define>
+	<define name="db-database-description">
+		<element name="db:database-description">
+			<ref name="db-database-description-attlist"/>
+			<choice>
+				<ref name="db-file-based-database"/>
+				<ref name="db-server-database"/>
+			</choice>
+		</element>
+	</define>
+	<define name="db-database-description-attlist">
+		<empty/>
+	</define>
+	<define name="db-file-based-database">
+		<element name="db:file-based-database">
+			<ref name="db-file-based-database-attlist"/>
+		</element>
+	</define>
+	<define name="db-file-based-database-attlist">
+		<interleave>
+			<attribute name="xlink:type">
+				<value>simple</value>
+			</attribute>
+			<attribute name="xlink:href">
+				<ref name="anyIRI"/>
+			</attribute>
+			<attribute name="db:media-type">
+				<ref name="string"/>
+			</attribute>
+			<optional>
+				<attribute name="db:extension">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="db-server-database">
+		<element name="db:server-database">
+			<ref name="db-server-database-attlist"/>
+			<empty/>
+		</element>
+	</define>
+	<define name="db-server-database-attlist">
+		<interleave>
+			<attribute name="db:type">
+				<ref name="namespacedToken"/>
+			</attribute>
+			<choice>
+				<ref name="db-host-and-port"/>
+				<ref name="db-local-socket-name"/>
+			</choice>
+			<optional>
+				<attribute name="db:database-name">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="db-host-and-port">
+		<attribute name="db:hostname">
+			<ref name="string"/>
+		</attribute>
+		<optional>
+			<attribute name="db:port">
+				<ref name="positiveInteger"/>
+			</attribute>
+		</optional>
+	</define>
+	<define name="db-local-socket-name">
+		<optional>
+			<attribute name="db:local-socket">
+				<ref name="string"/>
+			</attribute>
+		</optional>
+	</define>
+	<define name="db-connection-resource">
+		<element name="db:connection-resource">
+			<ref name="db-connection-resource-attlist"/>
+			<empty/>
+		</element>
+	</define>
+	<define name="db-connection-resource-attlist">
+		<attribute name="xlink:type">
+			<value>simple</value>
+		</attribute>
+		<attribute name="xlink:href">
+			<ref name="anyIRI"/>
+		</attribute>
+		<optional>
+			<attribute name="xlink:show">
+				<value>none</value>
+			</attribute>
+		</optional>
+		<optional>
+			<attribute name="xlink:actuate">
+				<value>onRequest</value>
+			</attribute>
+		</optional>
+	</define>
+	<define name="db-login">
+		<element name="db:login">
+			<ref name="db-login-attlist"/>
+			<empty/>
+		</element>
+	</define>
+	<define name="db-login-attlist">
+		<interleave>
+			<optional>
+				<choice>
+					<attribute name="db:user-name">
+						<ref name="string"/>
+					</attribute>
+					<attribute name="db:use-system-user">
+						<ref name="boolean"/>
+					</attribute>
+				</choice>
+			</optional>
+			<optional>
+				<attribute name="db:is-password-required">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="db:login-timeout">
+					<ref name="positiveInteger"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="db-driver-settings">
+		<element name="db:driver-settings">
+			<ref name="db-driver-settings-attlist"/>
+			<optional>
+				<ref name="db-auto-increment"/>
+			</optional>
+			<optional>
+				<ref name="db-delimiter"/>
+			</optional>
+			<optional>
+				<ref name="db-character-set"/>
+			</optional>
+			<optional>
+				<ref name="db-table-settings"/>
+			</optional>
+		</element>
+	</define>
+	<define name="db-driver-settings-attlist">
+		<interleave>
+			<ref name="db-show-deleted"/>
+			<optional>
+				<attribute name="db:system-driver-settings">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="db:base-dn">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<ref name="db-is-first-row-header-line"/>
+			<optional>
+				<attribute name="db:parameter-name-substitution">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="db-show-deleted">
+		<optional>
+			<attribute name="db:show-deleted">
+				<ref name="boolean"/>
+			</attribute>
+		</optional>
+	</define>
+	<define name="db-is-first-row-header-line">
+		<optional>
+			<attribute name="db:is-first-row-header-line">
+				<ref name="boolean"/>
+			</attribute>
+		</optional>
+	</define>
+	<define name="db-auto-increment">
+		<element name="db:auto-increment">
+			<ref name="db-auto-increment-attlist"/>
+			<empty/>
+		</element>
+	</define>
+	<define name="db-auto-increment-attlist">
+		<interleave>
+			<optional>
+				<attribute name="db:additional-column-statement">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="db:row-retrieving-statement">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="db-delimiter">
+		<element name="db:delimiter">
+			<ref name="db-delimiter-attlist"/>
+			<empty/>
+		</element>
+	</define>
+	<define name="db-delimiter-attlist">
+		<interleave>
+			<optional>
+				<attribute name="db:field">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="db:string">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="db:decimal">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="db:thousand">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="db-character-set">
+		<element name="db:character-set">
+			<ref name="db-character-set-attlist"/>
+			<empty/>
+		</element>
+	</define>
+	<define name="db-character-set-attlist">
+		<optional>
+			<attribute name="db:encoding">
+				<ref name="textEncoding"/>
+			</attribute>
+		</optional>
+	</define>
+	<define name="db-table-settings">
+		<element name="db:table-settings">
+			<zeroOrMore>
+				<ref name="db-table-setting"/>
+			</zeroOrMore>
+		</element>
+	</define>
+	<define name="db-table-setting">
+		<element name="db:table-setting">
+			<ref name="db-table-setting-attlist"/>
+			<optional>
+				<ref name="db-delimiter"/>
+			</optional>
+			<optional>
+				<ref name="db-character-set"/>
+			</optional>
+			<empty/>
+		</element>
+	</define>
+	<define name="db-table-setting-attlist">
+		<ref name="db-is-first-row-header-line"/>
+		<ref name="db-show-deleted"/>
+	</define>
+	<define name="db-application-connection-settings">
+		<element name="db:application-connection-settings">
+			<ref name="db-application-connection-settings-attlist"/>
+			<optional>
+				<ref name="db-table-filter"/>
+			</optional>
+			<optional>
+				<ref name="db-table-type-filter"/>
+			</optional>
+			<optional>
+				<ref name="db-data-source-settings"/>
+			</optional>
+		</element>
+	</define>
+	<define name="db-application-connection-settings-attlist">
+		<interleave>
+			<optional>
+				<attribute name="db:is-table-name-length-limited">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="db:enable-sql92-check">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="db:append-table-alias-name">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="db:ignore-driver-privileges">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="db:boolean-comparison-mode">
+					<choice>
+						<value>equal-integer</value>
+						<value>is-boolean</value>
+						<value>equal-boolean</value>
+						<value>equal-use-only-zero</value>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="db:use-catalog">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="db:max-row-count">
+					<ref name="integer"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="db:suppress-version-columns">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="db-table-filter">
+		<element name="db:table-filter">
+			<ref name="db-table-filter-attlist"/>
+			<optional>
+				<ref name="db-table-include-filter"/>
+			</optional>
+			<optional>
+				<ref name="db-table-exclude-filter"/>
+			</optional>
+		</element>
+	</define>
+	<define name="db-table-filter-attlist">
+		<empty/>
+	</define>
+	<define name="db-table-include-filter">
+		<element name="db:table-include-filter">
+			<ref name="db-table-include-filter-attlist"/>
+			<oneOrMore>
+				<ref name="db-table-filter-pattern"/>
+			</oneOrMore>
+		</element>
+	</define>
+	<define name="db-table-include-filter-attlist">
+		<empty/>
+	</define>
+	<define name="db-table-exclude-filter">
+		<element name="db:table-exclude-filter">
+			<ref name="db-table-exclude-filter-attlist"/>
+			<oneOrMore>
+				<ref name="db-table-filter-pattern"/>
+			</oneOrMore>
+		</element>
+	</define>
+	<define name="db-table-exclude-filter-attlist">
+		<empty/>
+	</define>
+	<define name="db-table-filter-pattern">
+		<element name="db:table-filter-pattern">
+			<ref name="db-table-filter-pattern-attlist"/>
+			<ref name="string"/>
+		</element>
+	</define>
+	<define name="db-table-filter-pattern-attlist">
+		<empty/>
+	</define>
+	<define name="db-table-type-filter">
+		<element name="db:table-type-filter">
+			<ref name="db-table-type-filter-attlist"/>
+			<zeroOrMore>
+				<ref name="db-table-type"/>
+			</zeroOrMore>
+		</element>
+	</define>
+	<define name="db-table-type-filter-attlist">
+		<empty/>
+	</define>
+	<define name="db-table-type">
+		<element name="db:table-type">
+			<ref name="db-table-type-attlist"/>
+			<ref name="string"/>
+		</element>
+	</define>
+	<define name="db-table-type-attlist">
+		<empty/>
+	</define>
+	<define name="db-data-source-settings">
+		<element name="db:data-source-settings">
+			<ref name="db-data-source-settings-attlist"/>
+			<oneOrMore>
+				<ref name="db-data-source-setting"/>
+			</oneOrMore>
+		</element>
+	</define>
+	<define name="db-data-source-settings-attlist">
+		<empty/>
+	</define>
+	<define name="db-data-source-setting">
+		<element name="db:data-source-setting">
+			<ref name="db-data-source-setting-attlist"/>
+			<oneOrMore>
+				<ref name="db-data-source-setting-value"/>
+			</oneOrMore>
+		</element>
+	</define>
+	<define name="db-data-source-setting-attlist">
+		<interleave>
+			<optional>
+				<attribute name="db:data-source-setting-is-list">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<attribute name="db:data-source-setting-name">
+				<ref name="string"/>
+			</attribute>
+			<attribute name="db:data-source-setting-type">
+				<ref name="db-data-source-setting-types"/>
+			</attribute>
+		</interleave>
+	</define>
+	<define name="db-data-source-setting-types">
+		<choice>
+			<value>boolean</value>
+			<value>short</value>
+			<value>int</value>
+			<value>long</value>
+			<value>double</value>
+			<value>string</value>
+		</choice>
+	</define>
+	<define name="db-data-source-setting-value">
+		<element name="db:data-source-setting-value">
+			<ref name="db-data-source-setting-value-attlist"/>
+			<ref name="string"/>
+		</element>
+	</define>
+	<define name="db-data-source-setting-value-attlist">
+		<empty/>
+	</define>
+	<define name="db-forms">
+		<element name="db:forms">
+			<ref name="db-forms-attlist"/>
+			<zeroOrMore>
+				<choice>
+					<ref name="db-component"/>
+					<ref name="db-component-collection"/>
+				</choice>
+			</zeroOrMore>
+		</element>
+	</define>
+	<define name="db-forms-attlist">
+		<empty/>
+	</define>
+	<define name="db-reports">
+		<element name="db:reports">
+			<ref name="db-reports-attlist"/>
+			<zeroOrMore>
+				<choice>
+					<ref name="db-component"/>
+					<ref name="db-component-collection"/>
+				</choice>
+			</zeroOrMore>
+		</element>
+	</define>
+	<define name="db-reports-attlist">
+		<empty/>
+	</define>
+	<define name="db-component-collection">
+		<element name="db:component-collection">
+			<ref name="db-component-collection-attlist"/>
+			<ref name="common-db-object-name"/>
+			<ref name="common-db-object-title"/>
+			<ref name="common-db-object-description"/>
+			<zeroOrMore>
+				<choice>
+					<ref name="db-component"/>
+					<ref name="db-component-collection"/>
+				</choice>
+			</zeroOrMore>
+		</element>
+	</define>
+	<define name="db-component-collection-attlist">
+		<empty/>
+	</define>
+	<define name="db-component">
+		<element name="db:component">
+			<ref name="db-component-attlist"/>
+			<ref name="common-db-object-name"/>
+			<ref name="common-db-object-title"/>
+			<ref name="common-db-object-description"/>
+			<optional>
+				<choice>
+					<ref name="office-document"/>
+					<ref name="math-math"/>
+				</choice>
+			</optional>
+		</element>
+	</define>
+	<define name="db-component-attlist">
+		<interleave>
+			<optional>
+				<attribute name="xlink:type">
+					<value>simple</value>
+				</attribute>
+				<attribute name="xlink:href">
+					<ref name="anyIRI"/>
+				</attribute>
+				<optional>
+					<attribute name="xlink:show">
+						<value>none</value>
+					</attribute>
+				</optional>
+				<optional>
+					<attribute name="xlink:actuate">
+						<value>onRequest</value>
+					</attribute>
+				</optional>
+			</optional>
+			<optional>
+				<attribute name="db:as-template">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="db-queries">
+		<element name="db:queries">
+			<ref name="db-queries-attlist"/>
+			<zeroOrMore>
+				<choice>
+					<ref name="db-query"/>
+					<ref name="db-query-collection"/>
+				</choice>
+			</zeroOrMore>
+		</element>
+	</define>
+	<define name="db-queries-attlist">
+		<empty/>
+	</define>
+	<define name="db-query-collection">
+		<element name="db:query-collection">
+			<ref name="db-query-collection-attlist"/>
+			<ref name="common-db-object-name"/>
+			<ref name="common-db-object-title"/>
+			<ref name="common-db-object-description"/>
+			<zeroOrMore>
+				<choice>
+					<ref name="db-query"/>
+					<ref name="db-query-collection"/>
+				</choice>
+			</zeroOrMore>
+		</element>
+	</define>
+	<define name="db-query-collection-attlist">
+		<empty/>
+	</define>
+	<define name="db-query">
+		<element name="db:query">
+			<ref name="db-query-attlist"/>
+			<ref name="common-db-object-name"/>
+			<ref name="common-db-object-title"/>
+			<ref name="common-db-object-description"/>
+			<ref name="common-db-table-style-name"/>
+			<optional>
+				<ref name="db-order-statement"/>
+			</optional>
+			<optional>
+				<ref name="db-filter-statement"/>
+			</optional>
+			<optional>
+				<ref name="db-columns"/>
+			</optional>
+			<optional>
+				<ref name="db-update-table"/>
+			</optional>
+		</element>
+	</define>
+	<define name="db-query-attlist">
+		<interleave>
+			<attribute name="db:command">
+				<ref name="string"/>
+			</attribute>
+			<optional>
+				<attribute name="db:escape-processing">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="db-order-statement">
+		<element name="db:order-statement">
+			<ref name="db-command"/>
+			<ref name="db-apply-command"/>
+			<empty/>
+		</element>
+	</define>
+	<define name="db-filter-statement">
+		<element name="db:filter-statement">
+			<ref name="db-command"/>
+			<ref name="db-apply-command"/>
+			<empty/>
+		</element>
+	</define>
+	<define name="db-update-table">
+		<element name="db:update-table">
+			<ref name="common-db-table-name-attlist"/>
+		</element>
+	</define>
+	<define name="db-table-presentations">
+		<element name="db:table-representations">
+			<ref name="db-table-presentations-attlist"/>
+			<zeroOrMore>
+				<ref name="db-table-presentation"/>
+			</zeroOrMore>
+		</element>
+	</define>
+	<define name="db-table-presentations-attlist">
+		<empty/>
+	</define>
+	<define name="db-table-presentation">
+		<element name="db:table-representation">
+			<ref name="db-table-presentation-attlist"/>
+			<ref name="common-db-table-name-attlist"/>
+			<ref name="common-db-object-title"/>
+			<ref name="common-db-object-description"/>
+			<ref name="common-db-table-style-name"/>
+			<optional>
+				<ref name="db-order-statement"/>
+			</optional>
+			<optional>
+				<ref name="db-filter-statement"/>
+			</optional>
+			<optional>
+				<ref name="db-columns"/>
+			</optional>
+		</element>
+	</define>
+	<define name="db-table-presentation-attlist">
+		<empty/>
+	</define>
+	<define name="db-columns">
+		<element name="db:columns">
+			<ref name="db-columns-attlist"/>
+			<oneOrMore>
+				<ref name="db-column"/>
+			</oneOrMore>
+		</element>
+	</define>
+	<define name="db-columns-attlist">
+		<empty/>
+	</define>
+	<define name="db-column">
+		<element name="db:column">
+			<ref name="db-column-attlist"/>
+			<ref name="common-db-object-name"/>
+			<ref name="common-db-object-title"/>
+			<ref name="common-db-object-description"/>
+			<ref name="common-db-default-value"/>
+		</element>
+	</define>
+	<define name="db-column-attlist">
+		<interleave>
+			<optional>
+				<attribute name="db:visible">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+	
+			<optional>
+				<attribute name="db:style-name">
+					<ref name="styleNameRef"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="db:default-cell-style-name">
+					<ref name="styleNameRef"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="db-command">
+		<attribute name="db:command">
+			<ref name="string"/>
+		</attribute>
+	</define>
+	<define name="db-apply-command">
+		<optional>
+			<attribute name="db:apply-command">
+				<ref name="boolean"/>
+			</attribute>
+		</optional>
+	</define>
+	<define name="common-db-table-name-attlist">
+		<interleave>
+			<attribute name="db:name">
+				<ref name="string"/>
+			</attribute>
+			<optional>
+				<attribute name="db:catalog-name">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="db:schema-name">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="common-db-object-name">
+		<attribute name="db:name">
+			<ref name="string"/>
+		</attribute>
+	</define>
+	<define name="common-db-object-title">
+		<optional>
+			<attribute name="db:title">
+				<ref name="string"/>
+			</attribute>
+		</optional>
+	</define>
+	<define name="common-db-object-description">
+		<optional>
+			<attribute name="db:description">
+				<ref name="string"/>
+			</attribute>
+		</optional>
+	</define>
+	<define name="common-db-table-style-name">
+		<interleave>
+			<optional>
+				<attribute name="db:style-name">
+					<ref name="styleNameRef"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="db:default-row-style-name">
+					<ref name="styleNameRef"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="common-db-default-value">
+		<optional>
+			<ref name="common-value-and-type-attlist"/>
+		</optional>
+	</define>
+	<define name="db-schema-definition">
+		<element name="db:schema-definition">
+			<ref name="db-schema-definition-attlist"/>
+			<ref name="db-table-definitions"/>
+		</element>
+	</define>
+	<define name="db-schema-definition-attlist">
+		<empty/>
+	</define>
+	<define name="db-table-definitions">
+		<element name="db:table-definitions">
+			<ref name="db-table-definitions-attlist"/>
+			<zeroOrMore>
+				<ref name="db-table-definition"/>
+			</zeroOrMore>
+		</element>
+	</define>
+	<define name="db-table-definitions-attlist">
+		<empty/>
+	</define>
+	<define name="db-table-definition">
+		<element name="db:table-definition">
+			<ref name="common-db-table-name-attlist"/>
+			<ref name="db-table-definition-attlist"/>
+			<ref name="db-column-definitions"/>
+			<optional>
+				<ref name="db-keys"/>
+			</optional>
+			<optional>
+				<ref name="db-indices"/>
+			</optional>
+		</element>
+	</define>
+	<define name="db-table-definition-attlist">
+		<optional>
+			<attribute name="db:type">
+				<ref name="string"/>
+			</attribute>
+		</optional>
+	</define>
+	<define name="db-column-definitions">
+		<element name="db:column-definitions">
+			<ref name="db-column-definitions-attlist"/>
+			<oneOrMore>
+				<ref name="db-column-definition"/>
+			</oneOrMore>
+		</element>
+	</define>
+	<define name="db-column-definitions-attlist">
+		<empty/>
+	</define>
+	<define name="db-column-definition">
+		<element name="db:column-definition">
+			<ref name="db-column-definition-attlist"/>
+			<ref name="common-db-default-value"/>
+		</element>
+	</define>
+	<define name="db-column-definition-attlist">
+		<interleave>
+			<attribute name="db:name">
+				<ref name="string"/>
+			</attribute>
+	
+			<optional>
+				<attribute name="db:data-type">
+					<ref name="db-data-types"/>
+				</attribute>
+			</optional>
+	
+			<optional>
+				<attribute name="db:type-name">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+	
+			<optional>
+				<attribute name="db:precision">
+					<ref name="positiveInteger"/>
+				</attribute>
+			</optional>
+	
+			<optional>
+				<attribute name="db:scale">
+					<ref name="positiveInteger"/>
+				</attribute>
+			</optional>
+	
+			<optional>
+				<attribute name="db:is-nullable">
+					<choice>
+						<value>no-nulls</value>
+						<value>nullable</value>
+					</choice>
+				</attribute>
+			</optional>
+	
+			<optional>
+				<attribute name="db:is-empty-allowed">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+	
+			<optional>
+				<attribute name="db:is-autoincrement">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="db-data-types">
+		<choice>
+			<value>bit</value>
+			<value>boolean</value>
+			<value>tinyint</value>
+			<value>smallint</value>
+			<value>integer</value>
+			<value>bigint</value>
+			<value>float</value>
+			<value>real</value>
+			<value>double</value>
+			<value>numeric</value>
+			<value>decimal</value>
+			<value>char</value>
+			<value>varchar</value>
+			<value>longvarchar</value>
+			<value>date</value>
+			<value>time</value>
+			<value>timestmp</value>
+			<value>binary</value>
+			<value>varbinary</value>
+			<value>longvarbinary</value>
+			<value>sqlnull</value>
+			<value>other</value>
+			<value>object</value>
+			<value>distinct</value>
+			<value>struct</value>
+			<value>array</value>
+			<value>blob</value>
+			<value>clob</value>
+			<value>ref</value>
+		</choice>
+	</define>
+	<define name="db-keys">
+		<element name="db:keys">
+			<ref name="db-keys-attlist"/>
+			<oneOrMore>
+				<ref name="db-key"/>
+			</oneOrMore>
+		</element>
+	</define>
+	<define name="db-keys-attlist">
+		<empty/>
+	</define>
+	<define name="db-key">
+		<element name="db:key">
+			<ref name="db-key-attlist"/>
+			<oneOrMore>
+				<ref name="db-key-columns"/>
+			</oneOrMore>
+		</element>
+	</define>
+	<define name="db-key-attlist">
+		<interleave>
+			<optional>
+				<attribute name="db:name">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+	
+			<attribute name="db:type">
+				<choice>
+					<value>primary</value>
+					<value>unique</value>
+					<value>foreign</value>
+				</choice>
+			</attribute>
+	
+			<optional>
+				<attribute name="db:referenced-table-name">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+	
+			<optional>
+				<attribute name="db:update-rule">
+					<choice>
+						<value>cascade</value>
+						<value>restrict</value>
+						<value>set-null</value>
+						<value>no-action</value>
+						<value>set-default</value>
+					</choice>
+				</attribute>
+			</optional>
+	
+			<optional>
+				<attribute name="db:delete-rule">
+					<choice>
+						<value>cascade</value>
+						<value>restrict</value>
+						<value>set-null</value>
+						<value>no-action</value>
+						<value>set-default</value>
+					</choice>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="db-key-columns">
+		<element name="db:key-columns">
+			<ref name="db-key-columns-attlist"/>
+			<oneOrMore>
+				<ref name="db-key-column"/>
+			</oneOrMore>
+		</element>
+	</define>
+	<define name="db-key-columns-attlist">
+		<empty/>
+	</define>
+	<define name="db-key-column">
+		<element name="db:key-column">
+			<ref name="db-key-column-attlist"/>
+			<empty/>
+		</element>
+	</define>
+	<define name="db-key-column-attlist">
+		<interleave>
+			<optional>
+				<attribute name="db:name">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+	
+			<optional>
+				<attribute name="db:related-column-name">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="db-indices">
+		<element name="db:indices">
+			<ref name="db-indices-attlist"/>
+			<oneOrMore>
+				<ref name="db-index"/>
+			</oneOrMore>
+		</element>
+	</define>
+	<define name="db-indices-attlist">
+		<empty/>
+	</define>
+	<define name="db-index">
+		<element name="db:index">
+			<ref name="db-index-attlist"/>
+			<oneOrMore>
+				<ref name="db-index-columns"/>
+			</oneOrMore>
+		</element>
+	</define>
+	<define name="db-index-attlist">
+		<interleave>
+			<attribute name="db:name">
+				<ref name="string"/>
+			</attribute>
+	
+			<optional>
+				<attribute name="db:catalog-name">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+	
+			<optional>
+				<attribute name="db:is-unique">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+	
+			<optional>
+				<attribute name="db:is-clustered">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="db-index-columns">
+		<element name="db:index-columns">
+			<oneOrMore>
+				<ref name="db-index-column"/>
+			</oneOrMore>
+		</element>
+	</define>
+	<define name="db-index-column">
+		<element name="db:index-column">
+			<ref name="db-index-column-attlist"/>
+			<empty/>
+		</element>
+	</define>
+	<define name="db-index-column-attlist">
+		<interleave>
+			<attribute name="db:name">
+				<ref name="string"/>
+			</attribute>
+	
+			<optional>
+				<attribute name="db:is-ascending">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="office-forms">
+		<optional>
+			<element name="office:forms">
+				<ref name="office-forms-attlist"/>
+				<zeroOrMore>
+					<choice>
+						<ref name="form-form"/>
+						<ref name="xforms-model"/>
+					</choice>
+				</zeroOrMore>
+			</element>
+		</optional>
+	</define>
+	<define name="office-forms-attlist">
+		<interleave>
+			<optional>
+				<attribute name="form:automatic-focus">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="form:apply-design-mode">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="form-form">
+		<element name="form:form">
+			<ref name="common-form-control-attlist"/>
+			<ref name="form-form-attlist"/>
+			<optional>
+				<ref name="form-properties"/>
+			</optional>
+			<optional>
+				<ref name="office-event-listeners"/>
+			</optional>
+			<zeroOrMore>
+				<choice>
+					<ref name="controls"/>
+					<ref name="form-form"/>
+				</choice>
+			</zeroOrMore>
+			<optional>
+				<ref name="form-connection-resource"/>
+			</optional>
+		</element>
+	</define>
+	<define name="form-form-attlist">
+		<interleave>
+			<optional>
+				<attribute name="xlink:type">
+					<value>simple</value>
+				</attribute>
+				<attribute name="xlink:href">
+					<ref name="anyIRI"/>
+				</attribute>
+				<optional>
+					<attribute name="xlink:actuate">
+						<value>onRequest</value>
+					</attribute>
+				</optional>
+			</optional>
+			<optional>
+				<attribute name="office:target-frame">
+					<ref name="targetFrameName"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="form:method">
+					<choice>
+						<value>get</value>
+						<value>post</value>
+						<ref name="string"/>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="form:enctype">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="form:allow-deletes">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="form:allow-inserts">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="form:allow-updates">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="form:apply-filter">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="form:command-type">
+					<choice>
+						<value>table</value>
+						<value>query</value>
+						<value>command</value>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="form:command">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="form:datasource">
+					<choice>
+						<ref name="anyIRI"/>
+						<ref name="string"/>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="form:master-fields">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="form:detail-fields">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="form:escape-processing">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="form:filter">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="form:ignore-result">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="form:navigation-mode">
+					<ref name="navigation"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="form:order">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="form:tab-cycle">
+					<ref name="tab-cycles"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="navigation">
+		<choice>
+			<value>none</value>
+			<value>current</value>
+			<value>parent</value>
+		</choice>
+	</define>
+	<define name="tab-cycles">
+		<choice>
+			<value>records</value>
+			<value>current</value>
+			<value>page</value>
+		</choice>
+	</define>
+	<define name="form-connection-resource">
+		<element name="form:connection-resource">
+			<attribute name="xlink:href">
+				<ref name="anyIRI"/>
+			</attribute>
+			<empty/>
+		</element>
+	</define>
+	<define name="xforms-model">
+		<element name="xforms:model">
+			<ref name="anyAttListOrElements"/>
+		</element>
+	</define>
+	<define name="column-controls">
+		<choice>
+			<element name="form:text">
+				<ref name="form-text-attlist"/>
+				<ref name="common-form-control-content"/>
+			</element>
+			<element name="form:textarea">
+				<ref name="form-textarea-attlist"/>
+				<ref name="common-form-control-content"/>
+				<zeroOrMore>
+					<ref name="text-p"/>
+				</zeroOrMore>
+			</element>
+			<element name="form:formatted-text">
+				<ref name="form-formatted-text-attlist"/>
+				<ref name="common-form-control-content"/>
+			</element>
+			<element name="form:number">
+				<ref name="form-number-attlist"/>
+				<ref name="common-numeric-control-attlist"/>
+				<ref name="common-form-control-content"/>
+				<ref name="common-linked-cell"/>
+				<ref name="common-spin-button"/>
+				<ref name="common-repeat"/>
+				<ref name="common-delay-for-repeat"/>
+			</element>
+			<element name="form:date">
+				<ref name="form-date-attlist"/>
+				<ref name="common-numeric-control-attlist"/>
+				<ref name="common-form-control-content"/>
+				<ref name="common-linked-cell"/>
+				<ref name="common-spin-button"/>
+				<ref name="common-repeat"/>
+				<ref name="common-delay-for-repeat"/>
+			</element>
+			<element name="form:time">
+				<ref name="form-time-attlist"/>
+				<ref name="common-numeric-control-attlist"/>
+				<ref name="common-form-control-content"/>
+				<ref name="common-linked-cell"/>
+				<ref name="common-spin-button"/>
+				<ref name="common-repeat"/>
+				<ref name="common-delay-for-repeat"/>
+			</element>
+			<element name="form:combobox">
+				<ref name="form-combobox-attlist"/>
+				<ref name="common-form-control-content"/>
+				<zeroOrMore>
+					<ref name="form-item"/>
+				</zeroOrMore>
+			</element>
+			<element name="form:listbox">
+				<ref name="form-listbox-attlist"/>
+				<ref name="common-form-control-content"/>
+				<zeroOrMore>
+					<ref name="form-option"/>
+				</zeroOrMore>
+			</element>
+			<element name="form:checkbox">
+				<ref name="form-checkbox-attlist"/>
+				<ref name="common-form-control-content"/>
+			</element>
+		</choice>
+	</define>
+	<define name="controls">
+		<choice>
+			<ref name="column-controls"/>
+			<element name="form:password">
+				<ref name="form-password-attlist"/>
+				<ref name="common-form-control-content"/>
+			</element>
+			<element name="form:file">
+				<ref name="form-file-attlist"/>
+				<ref name="common-form-control-content"/>
+			</element>
+			<element name="form:fixed-text">
+				<ref name="form-fixed-text-attlist"/>
+				<ref name="common-form-control-content"/>
+			</element>
+			<element name="form:button">
+				<ref name="form-button-attlist"/>
+				<ref name="common-form-control-content"/>
+			</element>
+			<element name="form:image">
+				<ref name="form-image-attlist"/>
+				<ref name="common-form-control-content"/>
+			</element>
+			<element name="form:radio">
+				<ref name="form-radio-attlist"/>
+				<ref name="common-form-control-content"/>
+			</element>
+			<element name="form:frame">
+				<ref name="form-frame-attlist"/>
+				<ref name="common-form-control-content"/>
+			</element>
+			<element name="form:image-frame">
+				<ref name="form-image-frame-attlist"/>
+				<ref name="common-form-control-content"/>
+			</element>
+			<element name="form:hidden">
+				<ref name="form-hidden-attlist"/>
+				<ref name="common-form-control-content"/>
+			</element>
+			<element name="form:grid">
+				<ref name="form-grid-attlist"/>
+				<ref name="common-form-control-content"/>
+				<zeroOrMore>
+					<ref name="form-column"/>
+				</zeroOrMore>
+			</element>
+			<element name="form:value-range">
+				<ref name="form-value-range-attlist"/>
+				<ref name="common-form-control-content"/>
+			</element>
+			<element name="form:generic-control">
+				<ref name="form-generic-control-attlist"/>
+				<ref name="common-form-control-content"/>
+			</element>
+		</choice>
+	</define>
+	<define name="form-text-attlist">
+		<ref name="form-control-attlist"/>
+		<ref name="common-current-value-attlist"/>
+		<ref name="common-disabled-attlist"/>
+		<ref name="common-maxlength-attlist"/>
+		<ref name="common-printable-attlist"/>
+		<ref name="common-readonly-attlist"/>
+		<ref name="common-tab-attlist"/>
+		<ref name="common-title-attlist"/>
+		<ref name="common-value-attlist"/>
+		<ref name="common-convert-empty-attlist"/>
+		<ref name="common-data-field-attlist"/>
+		<ref name="common-linked-cell"/>
+	</define>
+	<define name="form-control-attlist">
+		<ref name="common-form-control-attlist"/>
+		<ref name="common-control-id-attlist"/>
+		<ref name="xforms-bind-attlist"/>
+	</define>
+	<define name="common-form-control-content">
+		<optional>
+			<ref name="form-properties"/>
+		</optional>
+		<optional>
+			<ref name="office-event-listeners"/>
+		</optional>
+	</define>
+	<define name="form-textarea-attlist">
+		<ref name="form-control-attlist"/>
+		<ref name="common-current-value-attlist"/>
+		<ref name="common-disabled-attlist"/>
+		<ref name="common-maxlength-attlist"/>
+		<ref name="common-printable-attlist"/>
+		<ref name="common-readonly-attlist"/>
+		<ref name="common-tab-attlist"/>
+		<ref name="common-title-attlist"/>
+		<ref name="common-value-attlist"/>
+		<ref name="common-convert-empty-attlist"/>
+		<ref name="common-data-field-attlist"/>
+		<ref name="common-linked-cell"/>
+	</define>
+	<define name="form-password-attlist">
+		<interleave>
+			<ref name="form-control-attlist"/>
+			<ref name="common-disabled-attlist"/>
+			<ref name="common-maxlength-attlist"/>
+			<ref name="common-printable-attlist"/>
+			<ref name="common-tab-attlist"/>
+			<ref name="common-title-attlist"/>
+			<ref name="common-value-attlist"/>
+			<ref name="common-convert-empty-attlist"/>
+			<ref name="common-linked-cell"/>
+			<optional>
+				<attribute name="form:echo-char">
+					<ref name="character"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="form-file-attlist">
+		<ref name="form-control-attlist"/>
+		<ref name="common-current-value-attlist"/>
+		<ref name="common-disabled-attlist"/>
+		<ref name="common-maxlength-attlist"/>
+		<ref name="common-printable-attlist"/>
+		<ref name="common-readonly-attlist"/>
+		<ref name="common-tab-attlist"/>
+		<ref name="common-title-attlist"/>
+		<ref name="common-value-attlist"/>
+		<ref name="common-linked-cell"/>
+	</define>
+	<define name="form-formatted-text-attlist">
+		<interleave>
+			<ref name="form-control-attlist"/>
+			<ref name="common-current-value-attlist"/>
+			<ref name="common-disabled-attlist"/>
+			<ref name="common-maxlength-attlist"/>
+			<ref name="common-printable-attlist"/>
+			<ref name="common-readonly-attlist"/>
+			<ref name="common-tab-attlist"/>
+			<ref name="common-title-attlist"/>
+			<ref name="common-value-attlist"/>
+			<ref name="common-convert-empty-attlist"/>
+			<ref name="common-data-field-attlist"/>
+			<ref name="common-linked-cell"/>
+			<ref name="common-spin-button"/>
+			<ref name="common-repeat"/>
+			<ref name="common-delay-for-repeat"/>
+			<optional>
+				<attribute name="form:max-value">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="form:min-value">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="form:validation">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="common-numeric-control-attlist">
+		<ref name="form-control-attlist"/>
+		<ref name="common-disabled-attlist"/>
+		<ref name="common-maxlength-attlist"/>
+		<ref name="common-printable-attlist"/>
+		<ref name="common-readonly-attlist"/>
+		<ref name="common-tab-attlist"/>
+		<ref name="common-title-attlist"/>
+		<ref name="common-convert-empty-attlist"/>
+		<ref name="common-data-field-attlist"/>
+	</define>
+	<define name="form-number-attlist">
+		<interleave>
+			<optional>
+				<attribute name="form:value">
+					<ref name="double"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="form:current-value">
+					<ref name="double"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="form:min-value">
+					<ref name="double"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="form:max-value">
+					<ref name="double"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="form-date-attlist">
+		<interleave>
+			<optional>
+				<attribute name="form:value">
+					<ref name="date"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="form:current-value">
+					<ref name="date"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="form:min-value">
+					<ref name="date"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="form:max-value">
+					<ref name="date"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="form-time-attlist">
+		<interleave>
+			<optional>
+				<attribute name="form:value">
+					<ref name="time"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="form:current-value">
+					<ref name="time"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="form:min-value">
+					<ref name="time"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="form:max-value">
+					<ref name="time"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="form-fixed-text-attlist">
+		<interleave>
+			<ref name="form-control-attlist"/>
+			<ref name="for"/>
+			<ref name="common-disabled-attlist"/>
+			<ref name="label"/>
+			<ref name="common-printable-attlist"/>
+			<ref name="common-title-attlist"/>
+			<optional>
+				<attribute name="form:multi-line">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="form-combobox-attlist">
+		<interleave>
+			<ref name="form-control-attlist"/>
+			<ref name="common-current-value-attlist"/>
+			<ref name="common-disabled-attlist"/>
+			<ref name="dropdown"/>
+			<ref name="common-maxlength-attlist"/>
+			<ref name="common-printable-attlist"/>
+			<ref name="common-readonly-attlist"/>
+			<ref name="size"/>
+			<ref name="common-tab-attlist"/>
+			<ref name="common-title-attlist"/>
+			<ref name="common-value-attlist"/>
+			<ref name="common-convert-empty-attlist"/>
+			<ref name="common-data-field-attlist"/>
+			<ref name="list-source"/>
+			<ref name="list-source-type"/>
+			<ref name="common-linked-cell"/>
+			<ref name="common-source-cell-range"/>
+			<optional>
+				<attribute name="form:auto-complete">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="form-item">
+		<element name="form:item">
+			<ref name="form-item-attlist"/>
+			<text/>
+		</element>
+	</define>
+	<define name="form-item-attlist">
+		<ref name="label"/>
+	</define>
+	<define name="form-listbox-attlist">
+		<interleave>
+			<ref name="form-control-attlist"/>
+			<ref name="common-disabled-attlist"/>
+			<ref name="dropdown"/>
+			<ref name="common-printable-attlist"/>
+			<ref name="size"/>
+			<ref name="common-tab-attlist"/>
+			<ref name="common-title-attlist"/>
+			<ref name="bound-column"/>
+			<ref name="common-data-field-attlist"/>
+			<ref name="list-source"/>
+			<ref name="list-source-type"/>
+			<ref name="common-linked-cell"/>
+			<ref name="list-linkage-type"/>
+			<ref name="common-source-cell-range"/>
+			<optional>
+				<attribute name="form:multiple">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="form:xforms-list-source">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="list-linkage-type">
+		<optional>
+			<attribute name="form:list-linkage-type">
+				<choice>
+					<value>selection</value>
+					<value>selection-indices</value>
+				</choice>
+			</attribute>
+		</optional>
+	</define>
+	<define name="form-option">
+		<element name="form:option">
+			<ref name="form-option-attlist"/>
+			<text/>
+		</element>
+	</define>
+	<define name="form-option-attlist">
+		<ref name="current-selected"/>
+		<ref name="selected"/>
+		<ref name="label"/>
+		<ref name="common-value-attlist"/>
+	</define>
+	<define name="form-button-attlist">
+		<interleave>
+			<ref name="form-control-attlist"/>
+			<ref name="button-type"/>
+			<ref name="common-disabled-attlist"/>
+			<ref name="label"/>
+			<ref name="image-data"/>
+			<ref name="common-printable-attlist"/>
+			<ref name="common-tab-attlist"/>
+			<ref name="target-frame"/>
+			<ref name="target-location"/>
+			<ref name="common-title-attlist"/>
+			<ref name="common-value-attlist"/>
+			<ref name="common-form-relative-image-position-attlist"/>
+			<ref name="common-repeat"/>
+			<ref name="common-delay-for-repeat"/>
+			<optional>
+				<attribute name="form:default-button">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="form:toggle">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="form:focus-on-click">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="form:xforms-submission">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="form-image-attlist">
+		<ref name="form-control-attlist"/>
+		<ref name="button-type"/>
+		<ref name="common-disabled-attlist"/>
+		<ref name="image-data"/>
+		<ref name="common-printable-attlist"/>
+		<ref name="common-tab-attlist"/>
+		<ref name="target-frame"/>
+		<ref name="target-location"/>
+		<ref name="common-title-attlist"/>
+		<ref name="common-value-attlist"/>
+	</define>
+	<define name="form-checkbox-attlist">
+		<interleave>
+			<ref name="form-control-attlist"/>
+			<ref name="common-disabled-attlist"/>
+			<ref name="label"/>
+			<ref name="common-printable-attlist"/>
+			<ref name="common-tab-attlist"/>
+			<ref name="common-title-attlist"/>
+			<ref name="common-value-attlist"/>
+			<ref name="common-data-field-attlist"/>
+			<ref name="common-form-visual-effect-attlist"/>
+			<ref name="common-form-relative-image-position-attlist"/>
+			<ref name="common-linked-cell"/>
+			<optional>
+				<attribute name="form:current-state">
+					<ref name="states"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="form:is-tristate">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="form:state">
+					<ref name="states"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="states">
+		<choice>
+			<value>unchecked</value>
+			<value>checked</value>
+			<value>unknown</value>
+		</choice>
+	</define>
+	<define name="form-radio-attlist">
+		<ref name="form-control-attlist"/>
+		<ref name="current-selected"/>
+		<ref name="common-disabled-attlist"/>
+		<ref name="label"/>
+		<ref name="common-printable-attlist"/>
+		<ref name="selected"/>
+		<ref name="common-tab-attlist"/>
+		<ref name="common-title-attlist"/>
+		<ref name="common-value-attlist"/>
+		<ref name="common-data-field-attlist"/>
+		<ref name="common-form-visual-effect-attlist"/>
+		<ref name="common-form-relative-image-position-attlist"/>
+		<ref name="common-linked-cell"/>
+	</define>
+	<define name="form-frame-attlist">
+		<ref name="form-control-attlist"/>
+		<ref name="common-disabled-attlist"/>
+		<ref name="for"/>
+		<ref name="label"/>
+		<ref name="common-printable-attlist"/>
+		<ref name="common-title-attlist"/>
+	</define>
+	<define name="form-image-frame-attlist">
+		<ref name="form-control-attlist"/>
+		<ref name="common-disabled-attlist"/>
+		<ref name="image-data"/>
+		<ref name="common-printable-attlist"/>
+		<ref name="common-readonly-attlist"/>
+		<ref name="common-title-attlist"/>
+		<ref name="common-data-field-attlist"/>
+	</define>
+	<define name="form-hidden-attlist">
+		<ref name="form-control-attlist"/>
+		<ref name="common-value-attlist"/>
+	</define>
+	<define name="form-grid-attlist">
+		<ref name="form-control-attlist"/>
+		<ref name="common-disabled-attlist"/>
+		<ref name="common-printable-attlist"/>
+		<ref name="common-tab-attlist"/>
+		<ref name="common-title-attlist"/>
+	</define>
+	<define name="form-column">
+		<element name="form:column">
+			<ref name="form-column-attlist"/>
+			<oneOrMore>
+				<ref name="column-controls"/>
+			</oneOrMore>
+		</element>
+	</define>
+	<define name="form-column-attlist">
+		<ref name="common-form-control-attlist"/>
+		<ref name="label"/>
+		<ref name="text-style-name"/>
+	</define>
+	<define name="text-style-name">
+		<optional>
+			<attribute name="form:text-style-name">
+				<ref name="styleNameRef"/>
+			</attribute>
+		</optional>
+	</define>
+	<define name="form-value-range-attlist">
+		<interleave>
+			<ref name="form-control-attlist"/>
+			<ref name="common-disabled-attlist"/>
+			<ref name="common-printable-attlist"/>
+			<ref name="common-tab-attlist"/>
+			<ref name="common-title-attlist"/>
+			<ref name="common-value-attlist"/>
+			<ref name="common-linked-cell"/>
+			<ref name="common-repeat"/>
+			<ref name="common-delay-for-repeat"/>
+			<optional>
+				<attribute name="form:max-value">
+					<ref name="integer"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="form:min-value">
+					<ref name="integer"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="form:step-size">
+					<ref name="positiveInteger"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="form:page-step-size">
+					<ref name="positiveInteger"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="form:orientation">
+					<choice>
+						<value>horizontal</value>
+						<value>vertical</value>
+					</choice>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="form-generic-control-attlist">
+		<ref name="form-control-attlist"/>
+	</define>
+	<define name="common-form-control-attlist">
+		<interleave>
+			<optional>
+				<attribute name="form:name">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="form:control-implementation">
+					<ref name="namespacedToken"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="xforms-bind-attlist">
+		<optional>
+			<attribute name="xforms:bind">
+				<ref name="string"/>
+			</attribute>
+		</optional>
+	</define>
+	<define name="types">
+		<choice>
+			<value>submit</value>
+			<value>reset</value>
+			<value>push</value>
+			<value>url</value>
+		</choice>
+	</define>
+	<define name="button-type">
+		<optional>
+			<attribute name="form:button-type">
+				<ref name="types"/>
+			</attribute>
+		</optional>
+	</define>
+	<define name="common-control-id-attlist">
+		<group>
+			<ref name="xml-id"/>
+			<optional>
+				<attribute name="form:id">
+					<ref name="NCName"/>
+				</attribute>
+			</optional>
+		</group>
+	</define>
+	<define name="current-selected">
+		<optional>
+			<attribute name="form:current-selected">
+				<ref name="boolean"/>
+			</attribute>
+		</optional>
+	</define>
+	<define name="common-value-attlist">
+		<optional>
+			<attribute name="form:value">
+				<ref name="string"/>
+			</attribute>
+		</optional>
+	</define>
+	<define name="common-current-value-attlist">
+		<optional>
+			<attribute name="form:current-value">
+				<ref name="string"/>
+			</attribute>
+		</optional>
+	</define>
+	<define name="common-disabled-attlist">
+		<optional>
+			<attribute name="form:disabled">
+				<ref name="boolean"/>
+			</attribute>
+		</optional>
+	</define>
+	<define name="dropdown">
+		<optional>
+			<attribute name="form:dropdown">
+				<ref name="boolean"/>
+			</attribute>
+		</optional>
+	</define>
+	<define name="for">
+		<optional>
+			<attribute name="form:for">
+				<ref name="string"/>
+			</attribute>
+		</optional>
+	</define>
+	<define name="image-data">
+		<optional>
+			<attribute name="form:image-data">
+				<ref name="anyIRI"/>
+			</attribute>
+		</optional>
+	</define>
+	<define name="label">
+		<optional>
+			<attribute name="form:label">
+				<ref name="string"/>
+			</attribute>
+		</optional>
+	</define>
+	<define name="common-maxlength-attlist">
+		<optional>
+			<attribute name="form:max-length">
+				<ref name="nonNegativeInteger"/>
+			</attribute>
+		</optional>
+	</define>
+	<define name="common-printable-attlist">
+		<optional>
+			<attribute name="form:printable">
+				<ref name="boolean"/>
+			</attribute>
+		</optional>
+	</define>
+	<define name="common-readonly-attlist">
+		<optional>
+			<attribute name="form:readonly">
+				<ref name="boolean"/>
+			</attribute>
+		</optional>
+	</define>
+	<define name="selected">
+		<optional>
+			<attribute name="form:selected">
+				<ref name="boolean"/>
+			</attribute>
+		</optional>
+	</define>
+	<define name="size">
+		<optional>
+			<attribute name="form:size">
+				<ref name="nonNegativeInteger"/>
+			</attribute>
+		</optional>
+	</define>
+	<define name="common-tab-attlist">
+		<interleave>
+			<optional>
+				<attribute name="form:tab-index">
+					<ref name="nonNegativeInteger"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="form:tab-stop">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="target-frame">
+		<optional>
+			<attribute name="office:target-frame">
+				<ref name="targetFrameName"/>
+			</attribute>
+		</optional>
+	</define>
+	<define name="target-location">
+		<optional>
+			<attribute name="xlink:href">
+				<ref name="anyIRI"/>
+			</attribute>
+		</optional>
+	</define>
+	<define name="common-title-attlist">
+		<optional>
+			<attribute name="form:title">
+				<ref name="string"/>
+			</attribute>
+		</optional>
+	</define>
+	<define name="common-form-visual-effect-attlist">
+		<optional>
+			<attribute name="form:visual-effect">
+				<choice>
+					<value>flat</value>
+					<value>3d</value>
+				</choice>
+			</attribute>
+		</optional>
+	</define>
+	<define name="common-form-relative-image-position-attlist">
+		<choice>
+			<optional>
+				<attribute name="form:image-position">
+					<value>center</value>
+				</attribute>
+			</optional>
+			<group>
+				<attribute name="form:image-position">
+					<choice>
+						<value>start</value>
+						<value>end</value>
+						<value>top</value>
+						<value>bottom</value>
+					</choice>
+				</attribute>
+				<optional>
+					<attribute name="form:image-align">
+						<choice>
+							<value>start</value>
+							<value>center</value>
+							<value>end</value>
+						</choice>
+					</attribute>
+				</optional>
+			</group>
+		</choice>
+	</define>
+	<define name="bound-column">
+		<optional>
+			<attribute name="form:bound-column">
+				<ref name="string"/>
+			</attribute>
+		</optional>
+	</define>
+	<define name="common-convert-empty-attlist">
+		<optional>
+			<attribute name="form:convert-empty-to-null">
+				<ref name="boolean"/>
+			</attribute>
+		</optional>
+	</define>
+	<define name="common-data-field-attlist">
+		<optional>
+			<attribute name="form:data-field">
+				<ref name="string"/>
+			</attribute>
+		</optional>
+	</define>
+	<define name="list-source">
+		<optional>
+			<attribute name="form:list-source">
+				<ref name="string"/>
+			</attribute>
+		</optional>
+	</define>
+	<define name="list-source-type">
+		<optional>
+			<attribute name="form:list-source-type">
+				<choice>
+					<value>table</value>
+					<value>query</value>
+					<value>sql</value>
+					<value>sql-pass-through</value>
+					<value>value-list</value>
+					<value>table-fields</value>
+				</choice>
+			</attribute>
+		</optional>
+	</define>
+	<define name="common-linked-cell">
+		<optional>
+			<attribute name="form:linked-cell">
+				<choice>
+					<ref name="cellAddress"/>
+					<ref name="string"/>
+				</choice>
+			</attribute>
+		</optional>
+	</define>
+	<define name="common-source-cell-range">
+		<optional>
+			<attribute name="form:source-cell-range">
+				<choice>
+					<ref name="cellRangeAddress"/>
+					<ref name="string"/>
+				</choice>
+			</attribute>
+		</optional>
+	</define>
+	<define name="common-spin-button">
+		<optional>
+			<attribute name="form:spin-button">
+				<ref name="boolean"/>
+			</attribute>
+		</optional>
+	</define>
+	<define name="common-repeat">
+		<optional>
+			<attribute name="form:repeat">
+				<ref name="boolean"/>
+			</attribute>
+		</optional>
+	</define>
+	<define name="common-delay-for-repeat">
+		<optional>
+			<attribute name="form:delay-for-repeat">
+				<ref name="duration"/>
+			</attribute>
+		</optional>
+	</define>
+	<define name="form-properties">
+		<element name="form:properties">
+			<oneOrMore>
+				<ref name="form-property"/>
+			</oneOrMore>
+		</element>
+	</define>
+	<define name="form-property">
+		<choice>
+			<element name="form:property">
+				<ref name="form-property-name"/>
+				<ref name="form-property-value-and-type-attlist"/>
+			</element>
+			<element name="form:list-property">
+				<ref name="form-property-name"/>
+				<ref name="form-property-type-and-value-list"/>
+			</element>
+		</choice>
+	</define>
+	<define name="form-property-name">
+		<attribute name="form:property-name">
+			<ref name="string"/>
+		</attribute>
+	</define>
+	<define name="form-property-value-and-type-attlist">
+		<choice>
+			<ref name="common-value-and-type-attlist"/>
+			<attribute name="office:value-type">
+				<value>void</value>
+			</attribute>
+		</choice>
+	</define>
+	<define name="form-property-type-and-value-list">
+		<choice>
+			<group>
+				<attribute name="office:value-type">
+					<value>float</value>
+				</attribute>
+				<zeroOrMore>
+					<element name="form:list-value">
+						<attribute name="office:value">
+							<ref name="double"/>
+						</attribute>
+					</element>
+				</zeroOrMore>
+			</group>
+			<group>
+				<attribute name="office:value-type">
+					<value>percentage</value>
+				</attribute>
+				<zeroOrMore>
+					<element name="form:list-value">
+						<attribute name="office:value">
+							<ref name="double"/>
+						</attribute>
+					</element>
+				</zeroOrMore>
+			</group>
+			<group>
+				<attribute name="office:value-type">
+					<value>currency</value>
+				</attribute>
+				<zeroOrMore>
+					<element name="form:list-value">
+						<attribute name="office:value">
+							<ref name="double"/>
+						</attribute>
+						<optional>
+							<attribute name="office:currency">
+								<ref name="string"/>
+							</attribute>
+						</optional>
+					</element>
+				</zeroOrMore>
+			</group>
+			<group>
+				<attribute name="office:value-type">
+					<value>date</value>
+				</attribute>
+				<zeroOrMore>
+					<element name="form:list-value">
+						<attribute name="office:date-value">
+							<ref name="dateOrDateTime"/>
+						</attribute>
+					</element>
+				</zeroOrMore>
+			</group>
+			<group>
+				<attribute name="office:value-type">
+					<value>time</value>
+				</attribute>
+				<zeroOrMore>
+					<element name="form:list-value">
+						<attribute name="office:time-value">
+							<ref name="duration"/>
+						</attribute>
+					</element>
+				</zeroOrMore>
+			</group>
+			<group>
+				<attribute name="office:value-type">
+					<value>boolean</value>
+				</attribute>
+				<zeroOrMore>
+					<element name="form:list-value">
+						<attribute name="office:boolean-value">
+							<ref name="boolean"/>
+						</attribute>
+					</element>
+				</zeroOrMore>
+			</group>
+			<group>
+				<attribute name="office:value-type">
+					<value>string</value>
+				</attribute>
+				<zeroOrMore>
+					<element name="form:list-value">
+						<attribute name="office:string-value">
+							<ref name="string"/>
+						</attribute>
+					</element>
+				</zeroOrMore>
+			</group>
+			<attribute name="office:value-type">
+				<value>void</value>
+			</attribute>
+		</choice>
+	</define>
+	<define name="office-annotation">
+		<element name="office:annotation">
+			<ref name="office-annotation-attlist"/>
+			<ref name="draw-caption-attlist"/>
+			<ref name="common-draw-position-attlist"/>
+			<ref name="common-draw-size-attlist"/>
+			<ref name="common-draw-shape-with-text-and-styles-attlist"/>
+			<optional>
+				<ref name="dc-creator"/>
+			</optional>
+			<optional>
+				<ref name="dc-date"/>
+			</optional>
+			<optional>
+				<ref name="meta-date-string"/>
+			</optional>
+			<zeroOrMore>
+				<choice>
+					<ref name="text-p"/>
+					<ref name="text-list"/>
+				</choice>
+			</zeroOrMore>
+		</element>
+	</define>
+	<define name="office-annotation-end">
+		<element name="office:annotation-end">
+			<ref name="office-annotation-end-attlist"/>
+		</element>
+	</define>
+	<define name="office-annotation-attlist">
+		<interleave>
+			<optional>
+				<attribute name="office:display">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<ref name="common-office-annotation-name-attlist"/>
+			</optional>
+		</interleave>
+	</define>
+	<define name="office-annotation-end-attlist">
+		<ref name="common-office-annotation-name-attlist"/>
+	</define>
+	<define name="common-office-annotation-name-attlist">
+		<attribute name="office:name">
+			<ref name="string"/>
+		</attribute>
+	</define>
+	<define name="meta-date-string">
+		<element name="meta:date-string">
+			<ref name="string"/>
+		</element>
+	</define>
+	<define name="common-num-format-prefix-suffix-attlist">
+		<optional>
+			<attribute name="style:num-prefix">
+				<ref name="string"/>
+			</attribute>
+		</optional>
+		<optional>
+			<attribute name="style:num-suffix">
+				<ref name="string"/>
+			</attribute>
+		</optional>
+	</define>
+	<define name="common-num-format-attlist">
+		<choice>
+			<attribute name="style:num-format">
+				<choice>
+					<value>1</value>
+					<value>i</value>
+					<value>I</value>
+					<ref name="string"/>
+					<empty/>
+				</choice>
+			</attribute>
+			<group>
+				<attribute name="style:num-format">
+					<choice>
+						<value>a</value>
+						<value>A</value>
+					</choice>
+				</attribute>
+				<ref name="style-num-letter-sync-attlist"/>
+			</group>
+			<empty/>
+		</choice>
+	</define>
+	<define name="style-num-letter-sync-attlist">
+		<optional>
+			<attribute name="style:num-letter-sync">
+				<ref name="boolean"/>
+			</attribute>
+		</optional>
+	</define>
+	<define name="office-change-info">
+		<element name="office:change-info">
+			<ref name="dc-creator"/>
+			<ref name="dc-date"/>
+			<zeroOrMore>
+				<ref name="text-p"/>
+			</zeroOrMore>
+		</element>
+	</define>
+	<define name="office-event-listeners">
+		<element name="office:event-listeners">
+			<zeroOrMore>
+				<choice>
+					<ref name="script-event-listener"/>
+					<ref name="presentation-event-listener"/>
+				</choice>
+			</zeroOrMore>
+		</element>
+	</define>
+	<define name="script-event-listener">
+		<element name="script:event-listener">
+			<ref name="script-event-listener-attlist"/>
+			<empty/>
+		</element>
+	</define>
+	<define name="script-event-listener-attlist">
+		<interleave>
+			<attribute name="script:event-name">
+				<ref name="string"/>
+			</attribute>
+			<attribute name="script:language">
+				<ref name="string"/>
+			</attribute>
+			<choice>
+				<attribute name="script:macro-name">
+					<ref name="string"/>
+				</attribute>
+				<group>
+					<attribute name="xlink:type">
+						<value>simple</value>
+					</attribute>
+					<attribute name="xlink:href">
+						<ref name="anyIRI"/>
+					</attribute>
+					<optional>
+						<attribute name="xlink:actuate">
+							<value>onRequest</value>
+						</attribute>
+					</optional>
+				</group>
+			</choice>
+		</interleave>
+	</define>
+	<define name="math-math">
+		<element name="math:math">
+			<ref name="mathMarkup"/>
+		</element>
+	</define>
+	<define name="mathMarkup">
+		<dc:description>To avoid inclusion of the complete MathML schema, anything is allowed within a math:math top-level element</dc:description>
+		<zeroOrMore>
+			<choice>
+				<attribute>
+					<anyName/>
+				</attribute>
+				<text/>
+				<element>
+					<anyName/>
+					<ref name="mathMarkup"/>
+				</element>
+			</choice>
+		</zeroOrMore>
+	</define>
+	<define name="text-dde-connection-decl">
+		<element name="text:dde-connection-decl">
+			<ref name="text-dde-connection-decl-attlist"/>
+			<ref name="common-dde-connection-decl-attlist"/>
+		</element>
+	</define>
+	<define name="text-dde-connection-decl-attlist">
+		<attribute name="office:name">
+			<ref name="string"/>
+		</attribute>
+	</define>
+	<define name="common-dde-connection-decl-attlist">
+		<interleave>
+			<attribute name="office:dde-application">
+				<ref name="string"/>
+			</attribute>
+			<attribute name="office:dde-topic">
+				<ref name="string"/>
+			</attribute>
+			<attribute name="office:dde-item">
+				<ref name="string"/>
+			</attribute>
+			<optional>
+				<attribute name="office:automatic-update">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="table-dde-link">
+		<element name="table:dde-link">
+			<ref name="office-dde-source"/>
+			<ref name="table-table"/>
+		</element>
+	</define>
+	<define name="office-dde-source">
+		<element name="office:dde-source">
+			<ref name="office-dde-source-attlist"/>
+			<ref name="common-dde-connection-decl-attlist"/>
+		</element>
+	</define>
+	<define name="office-dde-source-attlist">
+		<interleave>
+			<optional>
+				<attribute name="office:name">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="office:conversion-mode">
+					<choice>
+						<value>into-default-style-data-style</value>
+						<value>into-english-number</value>
+						<value>keep-text</value>
+					</choice>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="animation-element">
+		<choice>
+			<element name="anim:animate">
+				<ref name="common-anim-target-attlist"/>
+				<ref name="common-anim-named-target-attlist"/>
+				<ref name="common-anim-values-attlist"/>
+				<ref name="common-anim-spline-mode-attlist"/>
+				<ref name="common-spline-anim-value-attlist"/>
+				<ref name="common-timing-attlist"/>
+				<ref name="common-anim-add-accum-attlist"/>
+			</element>
+			<element name="anim:set">
+				<ref name="common-anim-target-attlist"/>
+				<ref name="common-anim-named-target-attlist"/>
+				<ref name="common-anim-set-values-attlist"/>
+				<ref name="common-timing-attlist"/>
+				<ref name="common-anim-add-accum-attlist"/>
+			</element>
+			<element name="anim:animateMotion">
+				<ref name="anim-animate-motion-attlist"/>
+				<ref name="common-anim-target-attlist"/>
+				<ref name="common-anim-named-target-attlist"/>
+				<ref name="common-anim-add-accum-attlist"/>
+				<ref name="common-anim-values-attlist"/>
+				<ref name="common-timing-attlist"/>
+				<ref name="common-spline-anim-value-attlist"/>
+			</element>
+			<element name="anim:animateColor">
+				<ref name="common-anim-target-attlist"/>
+				<ref name="common-anim-named-target-attlist"/>
+				<ref name="common-anim-add-accum-attlist"/>
+				<ref name="common-anim-values-attlist"/>
+				<ref name="common-anim-spline-mode-attlist"/>
+				<ref name="common-spline-anim-value-attlist"/>
+				<ref name="anim-animate-color-attlist"/>
+				<ref name="common-timing-attlist"/>
+			</element>
+			<element name="anim:animateTransform">
+				<ref name="common-anim-target-attlist"/>
+				<ref name="common-anim-named-target-attlist"/>
+				<ref name="common-anim-add-accum-attlist"/>
+				<ref name="common-anim-values-attlist"/>
+				<ref name="anim-animate-transform-attlist"/>
+				<ref name="common-timing-attlist"/>
+			</element>
+			<element name="anim:transitionFilter">
+				<ref name="common-anim-target-attlist"/>
+				<ref name="common-anim-add-accum-attlist"/>
+				<ref name="common-anim-values-attlist"/>
+				<ref name="common-anim-spline-mode-attlist"/>
+				<ref name="anim-transition-filter-attlist"/>
+				<ref name="common-timing-attlist"/>
+			</element>
+			<element name="anim:par">
+				<ref name="common-anim-attlist"/>
+				<ref name="common-timing-attlist"/>
+				<ref name="common-endsync-timing-attlist"/>
+				<zeroOrMore>
+					<ref name="animation-element"/>
+				</zeroOrMore>
+			</element>
+			<element name="anim:seq">
+				<ref name="common-anim-attlist"/>
+				<ref name="common-endsync-timing-attlist"/>
+				<ref name="common-timing-attlist"/>
+				<zeroOrMore>
+					<ref name="animation-element"/>
+				</zeroOrMore>
+			</element>
+			<element name="anim:iterate">
+				<ref name="common-anim-attlist"/>
+				<ref name="anim-iterate-attlist"/>
+				<ref name="common-timing-attlist"/>
+				<ref name="common-endsync-timing-attlist"/>
+				<zeroOrMore>
+					<ref name="animation-element"/>
+				</zeroOrMore>
+			</element>
+			<element name="anim:audio">
+				<ref name="common-anim-attlist"/>
+				<ref name="anim-audio-attlist"/>
+				<ref name="common-basic-timing-attlist"/>
+			</element>
+			<element name="anim:command">
+				<ref name="common-anim-attlist"/>
+				<ref name="anim-command-attlist"/>
+				<ref name="common-begin-end-timing-attlist"/>
+				<ref name="common-anim-target-attlist"/>
+				<zeroOrMore>
+					<element name="anim:param">
+						<attribute name="anim:name">
+							<ref name="string"/>
+						</attribute>
+						<attribute name="anim:value">
+							<ref name="string"/>
+						</attribute>
+					</element>
+				</zeroOrMore>
+			</element>
+		</choice>
+	</define>
+	<define name="anim-animate-motion-attlist">
+		<interleave>
+			<optional>
+				<attribute name="svg:path">
+					<ref name="pathData"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="svg:origin">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="smil:calcMode">
+					<choice>
+						<value>discrete</value>
+						<value>linear</value>
+						<value>paced</value>
+						<value>spline</value>
+					</choice>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="anim-animate-color-attlist">
+		<interleave>
+			<optional>
+				<attribute name="anim:color-interpolation">
+					<choice>
+						<value>rgb</value>
+						<value>hsl</value>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="anim:color-interpolation-direction">
+					<choice>
+						<value>clockwise</value>
+						<value>counter-clockwise</value>
+					</choice>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="anim-animate-transform-attlist">
+		<attribute name="svg:type">
+			<choice>
+				<value>translate</value>
+				<value>scale</value>
+				<value>rotate</value>
+				<value>skewX</value>
+				<value>skewY</value>
+			</choice>
+		</attribute>
+	</define>
+	<define name="anim-transition-filter-attlist">
+		<interleave>
+			<attribute name="smil:type">
+				<ref name="string"/>
+			</attribute>
+			<optional>
+				<attribute name="smil:subtype">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="smil:direction">
+					<choice>
+						<value>forward</value>
+						<value>reverse</value>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="smil:fadeColor">
+					<ref name="color"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="smil:mode">
+					<choice>
+						<value>in</value>
+						<value>out</value>
+					</choice>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="common-anim-target-attlist">
+		<interleave>
+			<optional>
+				<attribute name="smil:targetElement">
+					<ref name="IDREF"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="anim:sub-item">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="common-anim-named-target-attlist">
+		<attribute name="smil:attributeName">
+			<ref name="string"/>
+		</attribute>
+	</define>
+	<define name="common-anim-values-attlist">
+		<interleave>
+			<optional>
+				<attribute name="smil:values">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="anim:formula">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<ref name="common-anim-set-values-attlist"/>
+			<optional>
+				<attribute name="smil:from">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="smil:by">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="common-anim-spline-mode-attlist">
+		<optional>
+			<attribute name="smil:calcMode">
+				<choice>
+					<value>discrete</value>
+					<value>linear</value>
+					<value>paced</value>
+					<value>spline</value>
+				</choice>
+			</attribute>
+		</optional>
+	</define>
+	<define name="common-spline-anim-value-attlist">
+		<interleave>
+			<optional>
+				<attribute name="smil:keyTimes">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="smil:keySplines">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="common-anim-add-accum-attlist">
+		<interleave>
+			<optional>
+				<attribute name="smil:accumulate">
+					<choice>
+						<value>none</value>
+						<value>sum</value>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="smil:additive">
+					<choice>
+						<value>replace</value>
+						<value>sum</value>
+					</choice>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="common-anim-set-values-attlist">
+		<optional>
+			<attribute name="smil:to">
+				<ref name="string"/>
+			</attribute>
+		</optional>
+	</define>
+	<define name="common-begin-end-timing-attlist">
+		<interleave>
+			<optional>
+				<attribute name="smil:begin">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="smil:end">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="common-dur-timing-attlist">
+		<optional>
+			<attribute name="smil:dur">
+				<ref name="string"/>
+			</attribute>
+		</optional>
+	</define>
+	<define name="common-endsync-timing-attlist">
+		<optional>
+			<attribute name="smil:endsync">
+				<choice>
+					<value>first</value>
+					<value>last</value>
+					<value>all</value>
+					<value>media</value>
+					<ref name="IDREF"/>
+				</choice>
+			</attribute>
+		</optional>
+	</define>
+	<define name="common-repeat-timing-attlist">
+		<optional>
+			<attribute name="smil:repeatDur">
+				<ref name="string"/>
+			</attribute>
+		</optional>
+		<optional>
+			<attribute name="smil:repeatCount">
+				<choice>
+					<ref name="nonNegativeDecimal"/>
+					<value>indefinite</value>
+				</choice>
+			</attribute>
+		</optional>
+	</define>
+	<define name="nonNegativeDecimal">
+		<data type="decimal">
+			<param name="minInclusive">0.0</param>
+		</data>
+	</define>
+	<define name="common-fill-timing-attlist">
+		<optional>
+			<attribute name="smil:fill">
+				<choice>
+					<value>remove</value>
+					<value>freeze</value>
+					<value>hold</value>
+					<value>auto</value>
+					<value>default</value>
+					<value>transition</value>
+				</choice>
+			</attribute>
+		</optional>
+	</define>
+	<define name="common-fill-default-attlist">
+		<optional>
+			<attribute name="smil:fillDefault">
+				<choice>
+					<value>remove</value>
+					<value>freeze</value>
+					<value>hold</value>
+					<value>transition</value>
+					<value>auto</value>
+					<value>inherit</value>
+				</choice>
+			</attribute>
+		</optional>
+	</define>
+	<define name="common-restart-timing-attlist">
+		<optional>
+			<attribute name="smil:restart">
+				<choice>
+					<value>never</value>
+					<value>always</value>
+					<value>whenNotActive</value>
+					<value>default</value>
+				</choice>
+			</attribute>
+		</optional>
+	</define>
+	<define name="common-restart-default-attlist">
+		<optional>
+			<attribute name="smil:restartDefault">
+				<choice>
+					<value>never</value>
+					<value>always</value>
+					<value>whenNotActive</value>
+					<value>inherit</value>
+				</choice>
+			</attribute>
+		</optional>
+	</define>
+	<define name="common-time-manip-attlist">
+		<interleave>
+			<optional>
+				<attribute name="smil:accelerate">
+					<ref name="zeroToOneDecimal"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="smil:decelerate">
+					<ref name="zeroToOneDecimal"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="smil:autoReverse">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="zeroToOneDecimal">
+		<data type="decimal">
+			<param name="minInclusive">0</param>
+			<param name="maxInclusive">1</param>
+		</data>
+	</define>
+	<define name="common-basic-timing-attlist">
+		<ref name="common-begin-end-timing-attlist"/>
+		<ref name="common-dur-timing-attlist"/>
+		<ref name="common-repeat-timing-attlist"/>
+		<ref name="common-restart-timing-attlist"/>
+		<ref name="common-restart-default-attlist"/>
+		<ref name="common-fill-timing-attlist"/>
+		<ref name="common-fill-default-attlist"/>
+	</define>
+	<define name="common-timing-attlist">
+		<ref name="common-basic-timing-attlist"/>
+		<ref name="common-time-manip-attlist"/>
+	</define>
+	<define name="anim-iterate-attlist">
+		<interleave>
+			<ref name="common-anim-target-attlist"/>
+			<optional>
+				<attribute name="anim:iterate-type">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="anim:iterate-interval">
+					<ref name="duration"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="anim-audio-attlist">
+		<interleave>
+			<optional>
+				<attribute name="xlink:href">
+					<ref name="anyIRI"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="anim:audio-level">
+					<ref name="double"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="anim-command-attlist">
+		<attribute name="anim:command">
+			<ref name="string"/>
+		</attribute>
+	</define>
+	<define name="style-style">
+		<element name="style:style">
+			<ref name="style-style-attlist"/>
+			<ref name="style-style-content"/>
+			<zeroOrMore>
+				<ref name="style-map"/>
+			</zeroOrMore>
+		</element>
+	</define>
+	<define name="common-in-content-meta-attlist">
+		<attribute name="xhtml:about">
+			<ref name="URIorSafeCURIE"/>
+		</attribute>
+		<attribute name="xhtml:property">
+			<ref name="CURIEs"/>
+		</attribute>
+		<ref name="common-meta-literal-attlist"/>
+	</define>
+	<define name="common-meta-literal-attlist">
+		<optional>
+			<attribute name="xhtml:datatype">
+				<ref name="CURIE"/>
+			</attribute>
+		</optional>
+		<optional>
+			<attribute name="xhtml:content">
+				<ref name="string"/>
+			</attribute>
+		</optional>
+	</define>
+	<define name="xml-id">
+		<attribute name="xml:id">
+			<ref name="ID"/>
+		</attribute>
+	</define>
+	<define name="style-style-attlist">
+		<interleave>
+			<attribute name="style:name">
+				<ref name="styleName"/>
+			</attribute>
+			<optional>
+				<attribute name="style:display-name">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:parent-style-name">
+					<ref name="styleNameRef"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:next-style-name">
+					<ref name="styleNameRef"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:list-level">
+					<choice>
+						<ref name="positiveInteger"/>
+						<empty/>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:list-style-name">
+					<choice>
+						<ref name="styleName"/>
+						<empty/>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:master-page-name">
+					<ref name="styleNameRef"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:auto-update">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:data-style-name">
+					<ref name="styleNameRef"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:percentage-data-style-name">
+					<ref name="styleNameRef"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:class">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:default-outline-level">
+					<choice>
+						<ref name="positiveInteger"/>
+						<empty/>
+					</choice>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="style-map">
+		<element name="style:map">
+			<ref name="style-map-attlist"/>
+			<empty/>
+		</element>
+	</define>
+	<define name="style-map-attlist">
+		<interleave>
+			<attribute name="style:condition">
+				<ref name="string"/>
+			</attribute>
+			<attribute name="style:apply-style-name">
+				<ref name="styleNameRef"/>
+			</attribute>
+			<optional>
+				<attribute name="style:base-cell-address">
+					<ref name="cellAddress"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="style-default-style">
+		<element name="style:default-style">
+			<ref name="style-style-content"/>
+		</element>
+	</define>
+	<define name="style-page-layout">
+		<element name="style:page-layout">
+			<ref name="style-page-layout-attlist"/>
+			<ref name="style-page-layout-content"/>
+		</element>
+	</define>
+	<define name="style-page-layout-content">
+		<optional>
+			<ref name="style-page-layout-properties"/>
+		</optional>
+		<optional>
+			<ref name="style-header-style"/>
+		</optional>
+		<optional>
+			<ref name="style-footer-style"/>
+		</optional>
+	</define>
+	<define name="style-page-layout-attlist">
+		<interleave>
+			<attribute name="style:name">
+				<ref name="styleName"/>
+			</attribute>
+			<optional>
+				<attribute name="style:page-usage">
+					<choice>
+						<value>all</value>
+						<value>left</value>
+						<value>right</value>
+						<value>mirrored</value>
+					</choice>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="style-header-style">
+		<element name="style:header-style">
+			<optional>
+				<ref name="style-header-footer-properties"/>
+			</optional>
+		</element>
+	</define>
+	<define name="style-footer-style">
+		<element name="style:footer-style">
+			<optional>
+				<ref name="style-header-footer-properties"/>
+			</optional>
+		</element>
+	</define>
+	<define name="style-default-page-layout">
+		<element name="style:default-page-layout">
+			<ref name="style-page-layout-content"/>
+		</element>
+	</define>
+	<define name="style-master-page">
+		<element name="style:master-page">
+			<ref name="style-master-page-attlist"/>
+			<optional>
+				<ref name="style-header"/>
+				<optional>
+					<ref name="style-header-left"/>
+				</optional>
+			</optional>
+			<optional>
+				<ref name="style-footer"/>
+				<optional>
+					<ref name="style-footer-left"/>
+				</optional>
+			</optional>
+			<optional>
+				<ref name="draw-layer-set"/>
+			</optional>
+			<optional>
+				<ref name="office-forms"/>
+			</optional>
+			<zeroOrMore>
+				<ref name="shape"/>
+			</zeroOrMore>
+			<optional>
+				<ref name="animation-element"/>
+			</optional>
+			<optional>
+				<ref name="presentation-notes"/>
+			</optional>
+		</element>
+	</define>
+	<define name="style-master-page-attlist">
+		<interleave>
+			<attribute name="style:name">
+				<ref name="styleName"/>
+			</attribute>
+			<optional>
+				<attribute name="style:display-name">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<attribute name="style:page-layout-name">
+				<ref name="styleNameRef"/>
+			</attribute>
+			<optional>
+				<attribute name="draw:style-name">
+					<ref name="styleNameRef"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:next-style-name">
+					<ref name="styleNameRef"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="style-header">
+		<element name="style:header">
+			<ref name="common-style-header-footer-attlist"/>
+			<ref name="header-footer-content"/>
+		</element>
+	</define>
+	<define name="style-footer">
+		<element name="style:footer">
+			<ref name="common-style-header-footer-attlist"/>
+			<ref name="header-footer-content"/>
+		</element>
+	</define>
+	<define name="style-header-left">
+		<element name="style:header-left">
+			<ref name="common-style-header-footer-attlist"/>
+			<ref name="header-footer-content"/>
+		</element>
+	</define>
+	<define name="style-footer-left">
+		<element name="style:footer-left">
+			<ref name="common-style-header-footer-attlist"/>
+			<ref name="header-footer-content"/>
+		</element>
+	</define>
+	<define name="header-footer-content">
+		<choice>
+			<group>
+				<ref name="text-tracked-changes"/>
+				<ref name="text-decls"/>
+				<zeroOrMore>
+					<choice>
+						<ref name="text-h"/>
+						<ref name="text-p"/>
+						<ref name="text-list"/>
+						<ref name="table-table"/>
+						<ref name="text-section"/>
+						<ref name="text-table-of-content"/>
+						<ref name="text-illustration-index"/>
+						<ref name="text-table-index"/>
+						<ref name="text-object-index"/>
+						<ref name="text-user-index"/>
+						<ref name="text-alphabetical-index"/>
+						<ref name="text-bibliography"/>
+						<ref name="text-index-title"/>
+						<ref name="change-marks"/>
+					</choice>
+				</zeroOrMore>
+			</group>
+			<group>
+				<optional>
+					<ref name="style-region-left"/>
+				</optional>
+				<optional>
+					<ref name="style-region-center"/>
+				</optional>
+				<optional>
+					<ref name="style-region-right"/>
+				</optional>
+			</group>
+		</choice>
+	</define>
+	<define name="common-style-header-footer-attlist">
+		<optional>
+			<attribute name="style:display">
+				<ref name="boolean"/>
+			</attribute>
+		</optional>
+	</define>
+	<define name="style-region-left">
+		<element name="style:region-left">
+			<ref name="region-content"/>
+		</element>
+	</define>
+	<define name="style-region-center">
+		<element name="style:region-center">
+			<ref name="region-content"/>
+		</element>
+	</define>
+	<define name="style-region-right">
+		<element name="style:region-right">
+			<ref name="region-content"/>
+		</element>
+	</define>
+	<define name="region-content">
+		<zeroOrMore>
+			<ref name="text-p"/>
+		</zeroOrMore>
+	</define>
+	<define name="presentation-notes">
+		<element name="presentation:notes">
+			<ref name="common-presentation-header-footer-attlist"/>
+			<ref name="presentation-notes-attlist"/>
+			<ref name="office-forms"/>
+			<zeroOrMore>
+				<ref name="shape"/>
+			</zeroOrMore>
+		</element>
+	</define>
+	<define name="presentation-notes-attlist">
+		<interleave>
+			<optional>
+				<attribute name="style:page-layout-name">
+					<ref name="styleNameRef"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:style-name">
+					<ref name="styleNameRef"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="table-table-template">
+		<element name="table:table-template">
+			<ref name="table-table-template-attlist"/>
+			<optional>
+				<ref name="table-first-row"/>
+			</optional>
+			<optional>
+				<ref name="table-last-row"/>
+			</optional>
+			<optional>
+				<ref name="table-first-column"/>
+			</optional>
+			<optional>
+				<ref name="table-last-column"/>
+			</optional>
+			<ref name="table-body"/>
+			<optional>
+				<ref name="table-even-rows"/>
+			</optional>
+			<optional>
+				<ref name="table-odd-rows"/>
+			</optional>
+			<optional>
+				<ref name="table-even-columns"/>
+			</optional>
+			<optional>
+				<ref name="table-odd-columns"/>
+			</optional>
+			<optional>
+				<ref name="table-background"/>
+			</optional>
+		</element>
+	</define>
+	<define name="table-table-template-attlist">
+		<interleave>
+			<attribute name="table:name">
+				<ref name="string"/>
+			</attribute>
+			<attribute name="table:first-row-start-column">
+				<ref name="rowOrCol"/>
+			</attribute>
+			<attribute name="table:first-row-end-column">
+				<ref name="rowOrCol"/>
+			</attribute>
+			<attribute name="table:last-row-start-column">
+				<ref name="rowOrCol"/>
+			</attribute>
+			<attribute name="table:last-row-end-column">
+				<ref name="rowOrCol"/>
+			</attribute>
+		</interleave>
+	</define>
+	<define name="rowOrCol">
+		<choice>
+			<value>row</value>
+			<value>column</value>
+		</choice>
+	</define>
+	<define name="table-first-row">
+		<element name="table:first-row">
+			<ref name="common-table-template-attlist"/>
+			<empty/>
+		</element>
+	</define>
+	<define name="table-last-row">
+		<element name="table:last-row">
+			<ref name="common-table-template-attlist"/>
+			<empty/>
+		</element>
+	</define>
+	<define name="table-first-column">
+		<element name="table:first-column">
+			<ref name="common-table-template-attlist"/>
+			<empty/>
+		</element>
+	</define>
+	<define name="table-last-column">
+		<element name="table:last-column">
+			<ref name="common-table-template-attlist"/>
+			<empty/>
+		</element>
+	</define>
+	<define name="table-body">
+		<element name="table:body">
+			<ref name="common-table-template-attlist"/>
+			<empty/>
+		</element>
+	</define>
+	<define name="table-even-rows">
+		<element name="table:even-rows">
+			<ref name="common-table-template-attlist"/>
+			<empty/>
+		</element>
+	</define>
+	<define name="table-odd-rows">
+		<element name="table:odd-rows">
+			<ref name="common-table-template-attlist"/>
+			<empty/>
+		</element>
+	</define>
+	<define name="table-even-columns">
+		<element name="table:even-columns">
+			<ref name="common-table-template-attlist"/>
+			<empty/>
+		</element>
+	</define>
+	<define name="table-odd-columns">
+		<element name="table:odd-columns">
+			<ref name="common-table-template-attlist"/>
+			<empty/>
+		</element>
+	</define>
+	<define name="common-table-template-attlist">
+		<attribute name="table:style-name">
+			<ref name="styleNameRef"/>
+		</attribute>
+		<optional>
+			<attribute name="table:paragraph-style-name">
+				<ref name="styleNameRef"/>
+			</attribute>
+		</optional>
+	</define>
+	<define name="table-background">
+		<element name="table:background">
+			<ref name="table-background-attlist"/>
+			<empty/>
+		</element>
+	</define>
+	<define name="table-background-attlist">
+		<attribute name="table:style-name">
+			<ref name="styleNameRef"/>
+		</attribute>
+	</define>
+	<define name="style-font-face">
+		<element name="style:font-face">
+			<ref name="style-font-face-attlist"/>
+			<optional>
+				<ref name="svg-font-face-src"/>
+			</optional>
+			<optional>
+				<ref name="svg-definition-src"/>
+			</optional>
+		</element>
+	</define>
+	<define name="style-font-face-attlist">
+		<interleave>
+			<optional>
+				<attribute name="svg:font-family">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="svg:font-style">
+					<ref name="fontStyle"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="svg:font-variant">
+					<ref name="fontVariant"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="svg:font-weight">
+					<ref name="fontWeight"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="svg:font-stretch">
+					<choice>
+						<value>normal</value>
+						<value>ultra-condensed</value>
+						<value>extra-condensed</value>
+						<value>condensed</value>
+						<value>semi-condensed</value>
+						<value>semi-expanded</value>
+						<value>expanded</value>
+						<value>extra-expanded</value>
+						<value>ultra-expanded</value>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="svg:font-size">
+					<ref name="positiveLength"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="svg:unicode-range">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="svg:units-per-em">
+					<ref name="integer"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="svg:panose-1">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="svg:stemv">
+					<ref name="integer"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="svg:stemh">
+					<ref name="integer"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="svg:slope">
+					<ref name="integer"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="svg:cap-height">
+					<ref name="integer"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="svg:x-height">
+					<ref name="integer"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="svg:accent-height">
+					<ref name="integer"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="svg:ascent">
+					<ref name="integer"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="svg:descent">
+					<ref name="integer"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="svg:widths">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="svg:bbox">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="svg:ideographic">
+					<ref name="integer"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="svg:alphabetic">
+					<ref name="integer"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="svg:mathematical">
+					<ref name="integer"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="svg:hanging">
+					<ref name="integer"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="svg:v-ideographic">
+					<ref name="integer"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="svg:v-alphabetic">
+					<ref name="integer"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="svg:v-mathematical">
+					<ref name="integer"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="svg:v-hanging">
+					<ref name="integer"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="svg:underline-position">
+					<ref name="integer"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="svg:underline-thickness">
+					<ref name="integer"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="svg:strikethrough-position">
+					<ref name="integer"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="svg:strikethrough-thickness">
+					<ref name="integer"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="svg:overline-position">
+					<ref name="integer"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="svg:overline-thickness">
+					<ref name="integer"/>
+				</attribute>
+			</optional>
+			<attribute name="style:name">
+				<ref name="string"/>
+			</attribute>
+			<optional>
+				<attribute name="style:font-adornments">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:font-family-generic">
+					<ref name="fontFamilyGeneric"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:font-pitch">
+					<ref name="fontPitch"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:font-charset">
+					<ref name="textEncoding"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="svg-font-face-src">
+		<element name="svg:font-face-src">
+			<oneOrMore>
+				<choice>
+					<ref name="svg-font-face-uri"/>
+					<ref name="svg-font-face-name"/>
+				</choice>
+			</oneOrMore>
+		</element>
+	</define>
+	<define name="svg-font-face-uri">
+		<element name="svg:font-face-uri">
+			<ref name="common-svg-font-face-xlink-attlist"/>
+			<zeroOrMore>
+				<ref name="svg-font-face-format"/>
+			</zeroOrMore>
+		</element>
+	</define>
+	<define name="svg-font-face-format">
+		<element name="svg:font-face-format">
+			<optional>
+				<attribute name="svg:string">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<empty/>
+		</element>
+	</define>
+	<define name="svg-font-face-name">
+		<element name="svg:font-face-name">
+			<optional>
+				<attribute name="svg:name">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<empty/>
+		</element>
+	</define>
+	<define name="svg-definition-src">
+		<element name="svg:definition-src">
+			<ref name="common-svg-font-face-xlink-attlist"/>
+			<empty/>
+		</element>
+	</define>
+	<define name="common-svg-font-face-xlink-attlist">
+		<attribute name="xlink:type">
+			<value>simple</value>
+		</attribute>
+		<attribute name="xlink:href">
+			<ref name="anyIRI"/>
+		</attribute>
+		<optional>
+			<attribute name="xlink:actuate">
+				<value>onRequest</value>
+			</attribute>
+		</optional>
+	</define>
+	<define name="number-number-style">
+		<element name="number:number-style">
+			<ref name="common-data-style-attlist"/>
+			<optional>
+				<ref name="style-text-properties"/>
+			</optional>
+			<optional>
+				<ref name="number-text"/>
+			</optional>
+			<optional>
+				<ref name="any-number"/>
+				<optional>
+					<ref name="number-text"/>
+				</optional>
+			</optional>
+			<zeroOrMore>
+				<ref name="style-map"/>
+			</zeroOrMore>
+		</element>
+	</define>
+	<define name="any-number">
+		<choice>
+			<ref name="number-number"/>
+			<ref name="number-scientific-number"/>
+			<ref name="number-fraction"/>
+		</choice>
+	</define>
+	<define name="number-number">
+		<element name="number:number">
+			<ref name="number-number-attlist"/>
+			<ref name="common-decimal-places-attlist"/>
+			<ref name="common-number-attlist"/>
+			<zeroOrMore>
+				<ref name="number-embedded-text"/>
+			</zeroOrMore>
+		</element>
+	</define>
+	<define name="number-number-attlist">
+		<interleave>
+			<optional>
+				<attribute name="number:decimal-replacement">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="number:display-factor">
+					<ref name="double"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="number-embedded-text">
+		<element name="number:embedded-text">
+			<ref name="number-embedded-text-attlist"/>
+			<text/>
+		</element>
+	</define>
+	<define name="number-embedded-text-attlist">
+		<attribute name="number:position">
+			<ref name="integer"/>
+		</attribute>
+	</define>
+	<define name="number-scientific-number">
+		<element name="number:scientific-number">
+			<ref name="number-scientific-number-attlist"/>
+			<ref name="common-decimal-places-attlist"/>
+			<ref name="common-number-attlist"/>
+			<empty/>
+		</element>
+	</define>
+	<define name="number-scientific-number-attlist">
+		<optional>
+			<attribute name="number:min-exponent-digits">
+				<ref name="integer"/>
+			</attribute>
+		</optional>
+	</define>
+	<define name="number-fraction">
+		<element name="number:fraction">
+			<ref name="number-fraction-attlist"/>
+			<ref name="common-number-attlist"/>
+			<empty/>
+		</element>
+	</define>
+	<define name="number-fraction-attlist">
+		<interleave>
+			<optional>
+				<attribute name="number:min-numerator-digits">
+					<ref name="integer"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="number:min-denominator-digits">
+					<ref name="integer"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="number:denominator-value">
+					<ref name="integer"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="number-currency-style">
+		<element name="number:currency-style">
+			<ref name="common-data-style-attlist"/>
+			<ref name="common-auto-reorder-attlist"/>
+			<optional>
+				<ref name="style-text-properties"/>
+			</optional>
+			<optional>
+				<ref name="number-text"/>
+			</optional>
+			<optional>
+				<choice>
+					<group>
+						<ref name="number-and-text"/>
+						<optional>
+							<ref name="currency-symbol-and-text"/>
+						</optional>
+					</group>
+					<group>
+						<ref name="currency-symbol-and-text"/>
+						<optional>
+							<ref name="number-and-text"/>
+						</optional>
+					</group>
+				</choice>
+			</optional>
+			<zeroOrMore>
+				<ref name="style-map"/>
+			</zeroOrMore>
+		</element>
+	</define>
+	<define name="currency-symbol-and-text">
+		<ref name="number-currency-symbol"/>
+		<optional>
+			<ref name="number-text"/>
+		</optional>
+	</define>
+	<define name="number-and-text">
+		<ref name="number-number"/>
+		<optional>
+			<ref name="number-text"/>
+		</optional>
+	</define>
+	<define name="number-currency-symbol">
+		<element name="number:currency-symbol">
+			<ref name="number-currency-symbol-attlist"/>
+			<text/>
+		</element>
+	</define>
+	<define name="number-currency-symbol-attlist">
+		<optional>
+			<attribute name="number:language">
+				<ref name="languageCode"/>
+			</attribute>
+		</optional>
+		<optional>
+			<attribute name="number:country">
+				<ref name="countryCode"/>
+			</attribute>
+		</optional>
+		<optional>
+			<attribute name="number:script">
+				<ref name="scriptCode"/>
+			</attribute>
+		</optional>
+		<optional>
+			<attribute name="number:rfc-language-tag">
+				<ref name="language"/>
+			</attribute>
+		</optional>
+	</define>
+	<define name="number-percentage-style">
+		<element name="number:percentage-style">
+			<ref name="common-data-style-attlist"/>
+			<optional>
+				<ref name="style-text-properties"/>
+			</optional>
+			<optional>
+				<ref name="number-text"/>
+			</optional>
+			<optional>
+				<ref name="number-and-text"/>
+			</optional>
+			<zeroOrMore>
+				<ref name="style-map"/>
+			</zeroOrMore>
+		</element>
+	</define>
+	<define name="number-date-style">
+		<element name="number:date-style">
+			<ref name="common-data-style-attlist"/>
+			<ref name="common-auto-reorder-attlist"/>
+			<ref name="common-format-source-attlist"/>
+			<optional>
+				<ref name="style-text-properties"/>
+			</optional>
+			<optional>
+				<ref name="number-text"/>
+			</optional>
+			<oneOrMore>
+				<ref name="any-date"/>
+				<optional>
+					<ref name="number-text"/>
+				</optional>
+			</oneOrMore>
+			<zeroOrMore>
+				<ref name="style-map"/>
+			</zeroOrMore>
+		</element>
+	</define>
+	<define name="any-date">
+		<choice>
+			<ref name="number-day"/>
+			<ref name="number-month"/>
+			<ref name="number-year"/>
+			<ref name="number-era"/>
+			<ref name="number-day-of-week"/>
+			<ref name="number-week-of-year"/>
+			<ref name="number-quarter"/>
+			<ref name="number-hours"/>
+			<ref name="number-am-pm"/>
+			<ref name="number-minutes"/>
+			<ref name="number-seconds"/>
+		</choice>
+	</define>
+	<define name="number-day">
+		<element name="number:day">
+			<ref name="number-day-attlist"/>
+			<ref name="common-calendar-attlist"/>
+			<empty/>
+		</element>
+	</define>
+	<define name="number-day-attlist">
+		<optional>
+			<attribute name="number:style">
+				<choice>
+					<value>short</value>
+					<value>long</value>
+				</choice>
+			</attribute>
+		</optional>
+	</define>
+	<define name="number-month">
+		<element name="number:month">
+			<ref name="number-month-attlist"/>
+			<ref name="common-calendar-attlist"/>
+			<empty/>
+		</element>
+	</define>
+	<define name="number-month-attlist">
+		<interleave>
+			<optional>
+				<attribute name="number:textual">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="number:possessive-form">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="number:style">
+					<choice>
+						<value>short</value>
+						<value>long</value>
+					</choice>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="number-year">
+		<element name="number:year">
+			<ref name="number-year-attlist"/>
+			<ref name="common-calendar-attlist"/>
+			<empty/>
+		</element>
+	</define>
+	<define name="number-year-attlist">
+		<optional>
+			<attribute name="number:style">
+				<choice>
+					<value>short</value>
+					<value>long</value>
+				</choice>
+			</attribute>
+		</optional>
+	</define>
+	<define name="number-era">
+		<element name="number:era">
+			<ref name="number-era-attlist"/>
+			<ref name="common-calendar-attlist"/>
+			<empty/>
+		</element>
+	</define>
+	<define name="number-era-attlist">
+		<optional>
+			<attribute name="number:style">
+				<choice>
+					<value>short</value>
+					<value>long</value>
+				</choice>
+			</attribute>
+		</optional>
+	</define>
+	<define name="number-day-of-week">
+		<element name="number:day-of-week">
+			<ref name="number-day-of-week-attlist"/>
+			<ref name="common-calendar-attlist"/>
+			<empty/>
+		</element>
+	</define>
+	<define name="number-day-of-week-attlist">
+		<optional>
+			<attribute name="number:style">
+				<choice>
+					<value>short</value>
+					<value>long</value>
+				</choice>
+			</attribute>
+		</optional>
+	</define>
+	<define name="number-week-of-year">
+		<element name="number:week-of-year">
+			<ref name="common-calendar-attlist"/>
+			<empty/>
+		</element>
+	</define>
+	<define name="number-quarter">
+		<element name="number:quarter">
+			<ref name="number-quarter-attlist"/>
+			<ref name="common-calendar-attlist"/>
+			<empty/>
+		</element>
+	</define>
+	<define name="number-quarter-attlist">
+		<optional>
+			<attribute name="number:style">
+				<choice>
+					<value>short</value>
+					<value>long</value>
+				</choice>
+			</attribute>
+		</optional>
+	</define>
+	<define name="number-time-style">
+		<element name="number:time-style">
+			<ref name="number-time-style-attlist"/>
+			<ref name="common-data-style-attlist"/>
+			<ref name="common-format-source-attlist"/>
+			<optional>
+				<ref name="style-text-properties"/>
+			</optional>
+			<optional>
+				<ref name="number-text"/>
+			</optional>
+			<oneOrMore>
+				<ref name="any-time"/>
+				<optional>
+					<ref name="number-text"/>
+				</optional>
+			</oneOrMore>
+			<zeroOrMore>
+				<ref name="style-map"/>
+			</zeroOrMore>
+		</element>
+	</define>
+	<define name="any-time">
+		<choice>
+			<ref name="number-hours"/>
+			<ref name="number-am-pm"/>
+			<ref name="number-minutes"/>
+			<ref name="number-seconds"/>
+		</choice>
+	</define>
+	<define name="number-time-style-attlist">
+		<optional>
+			<attribute name="number:truncate-on-overflow">
+				<ref name="boolean"/>
+			</attribute>
+		</optional>
+	</define>
+	<define name="number-hours">
+		<element name="number:hours">
+			<ref name="number-hours-attlist"/>
+			<empty/>
+		</element>
+	</define>
+	<define name="number-hours-attlist">
+		<optional>
+			<attribute name="number:style">
+				<choice>
+					<value>short</value>
+					<value>long</value>
+				</choice>
+			</attribute>
+		</optional>
+	</define>
+	<define name="number-minutes">
+		<element name="number:minutes">
+			<ref name="number-minutes-attlist"/>
+			<empty/>
+		</element>
+	</define>
+	<define name="number-minutes-attlist">
+		<optional>
+			<attribute name="number:style">
+				<choice>
+					<value>short</value>
+					<value>long</value>
+				</choice>
+			</attribute>
+		</optional>
+	</define>
+	<define name="number-seconds">
+		<element name="number:seconds">
+			<ref name="number-seconds-attlist"/>
+			<empty/>
+		</element>
+	</define>
+	<define name="number-seconds-attlist">
+		<interleave>
+			<optional>
+				<attribute name="number:style">
+					<choice>
+						<value>short</value>
+						<value>long</value>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="number:decimal-places">
+					<ref name="integer"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="number-am-pm">
+		<element name="number:am-pm">
+			<empty/>
+		</element>
+	</define>
+	<define name="number-boolean-style">
+		<element name="number:boolean-style">
+			<ref name="common-data-style-attlist"/>
+			<optional>
+				<ref name="style-text-properties"/>
+			</optional>
+			<optional>
+				<ref name="number-text"/>
+			</optional>
+			<optional>
+				<ref name="number-boolean"/>
+				<optional>
+					<ref name="number-text"/>
+				</optional>
+			</optional>
+			<zeroOrMore>
+				<ref name="style-map"/>
+			</zeroOrMore>
+		</element>
+	</define>
+	<define name="number-boolean">
+		<element name="number:boolean">
+			<empty/>
+		</element>
+	</define>
+	<define name="number-text-style">
+		<element name="number:text-style">
+			<ref name="common-data-style-attlist"/>
+			<optional>
+				<ref name="style-text-properties"/>
+			</optional>
+			<optional>
+				<ref name="number-text"/>
+			</optional>
+			<zeroOrMore>
+				<ref name="number-text-content"/>
+				<optional>
+					<ref name="number-text"/>
+				</optional>
+			</zeroOrMore>
+			<zeroOrMore>
+				<ref name="style-map"/>
+			</zeroOrMore>
+		</element>
+	</define>
+	<define name="number-text">
+		<element name="number:text">
+			<text/>
+		</element>
+	</define>
+	<define name="number-text-content">
+		<element name="number:text-content">
+			<empty/>
+		</element>
+	</define>
+	<define name="common-data-style-attlist">
+		<interleave>
+			<attribute name="style:name">
+				<ref name="styleName"/>
+			</attribute>
+			<optional>
+				<attribute name="style:display-name">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="number:language">
+					<ref name="languageCode"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="number:country">
+					<ref name="countryCode"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="number:script">
+					<ref name="scriptCode"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="number:rfc-language-tag">
+					<ref name="language"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="number:title">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:volatile">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="number:transliteration-format">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="number:transliteration-language">
+					<ref name="countryCode"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="number:transliteration-country">
+					<ref name="countryCode"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="number:transliteration-style">
+					<choice>
+						<value>short</value>
+						<value>medium</value>
+						<value>long</value>
+					</choice>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="common-auto-reorder-attlist">
+		<optional>
+			<attribute name="number:automatic-order">
+				<ref name="boolean"/>
+			</attribute>
+		</optional>
+	</define>
+	<define name="common-format-source-attlist">
+		<optional>
+			<attribute name="number:format-source">
+				<choice>
+					<value>fixed</value>
+					<value>language</value>
+				</choice>
+			</attribute>
+		</optional>
+	</define>
+	<define name="common-decimal-places-attlist">
+		<optional>
+			<attribute name="number:decimal-places">
+				<ref name="integer"/>
+			</attribute>
+		</optional>
+	</define>
+	<define name="common-number-attlist">
+		<interleave>
+			<optional>
+				<attribute name="number:min-integer-digits">
+					<ref name="integer"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="number:grouping">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="common-calendar-attlist">
+		<optional>
+			<attribute name="number:calendar">
+				<choice>
+					<value>gregorian</value>
+					<value>gengou</value>
+					<value>ROC</value>
+					<value>hanja_yoil</value>
+					<value>hanja</value>
+					<value>hijri</value>
+					<value>jewish</value>
+					<value>buddhist</value>
+					<ref name="string"/>
+				</choice>
+			</attribute>
+		</optional>
+	</define>
+	<define name="style-style-content">
+		<choice>
+			<group>
+				<attribute name="style:family">
+					<value>text</value>
+				</attribute>
+				<optional>
+					<ref name="style-text-properties"/>
+				</optional>
+			</group>
+			<group>
+				<attribute name="style:family">
+					<value>paragraph</value>
+				</attribute>
+				<optional>
+					<ref name="style-paragraph-properties"/>
+				</optional>
+				<optional>
+					<ref name="style-text-properties"/>
+				</optional>
+			</group>
+			<group>
+				<attribute name="style:family">
+					<value>section</value>
+				</attribute>
+				<optional>
+					<ref name="style-section-properties"/>
+				</optional>
+			</group>
+			<group>
+				<attribute name="style:family">
+					<value>ruby</value>
+				</attribute>
+				<optional>
+					<ref name="style-ruby-properties"/>
+				</optional>
+			</group>
+			<group>
+				<attribute name="style:family">
+					<value>table</value>
+				</attribute>
+				<optional>
+					<ref name="style-table-properties"/>
+				</optional>
+			</group>
+			<group>
+				<attribute name="style:family">
+					<value>table-column</value>
+				</attribute>
+				<optional>
+					<ref name="style-table-column-properties"/>
+				</optional>
+			</group>
+			<group>
+				<attribute name="style:family">
+					<value>table-row</value>
+				</attribute>
+				<optional>
+					<ref name="style-table-row-properties"/>
+				</optional>
+			</group>
+			<group>
+				<attribute name="style:family">
+					<value>table-cell</value>
+				</attribute>
+				<optional>
+					<ref name="style-table-cell-properties"/>
+				</optional>
+				<optional>
+					<ref name="style-paragraph-properties"/>
+				</optional>
+				<optional>
+					<ref name="style-text-properties"/>
+				</optional>
+			</group>
+			<group>
+				<attribute name="style:family">
+					<choice>
+						<value>graphic</value>
+						<value>presentation</value>
+					</choice>
+				</attribute>
+				<optional>
+					<ref name="style-graphic-properties"/>
+				</optional>
+				<optional>
+					<ref name="style-paragraph-properties"/>
+				</optional>
+				<optional>
+					<ref name="style-text-properties"/>
+				</optional>
+			</group>
+			<group>
+				<attribute name="style:family">
+					<value>drawing-page</value>
+				</attribute>
+				<optional>
+					<ref name="style-drawing-page-properties"/>
+				</optional>
+			</group>
+			<group>
+				<attribute name="style:family">
+					<value>chart</value>
+				</attribute>
+				<optional>
+					<ref name="style-chart-properties"/>
+				</optional>
+				<optional>
+					<ref name="style-graphic-properties"/>
+				</optional>
+				<optional>
+					<ref name="style-paragraph-properties"/>
+				</optional>
+				<optional>
+					<ref name="style-text-properties"/>
+				</optional>
+			</group>
+		</choice>
+	</define>
+	<define name="text-linenumbering-configuration">
+		<element name="text:linenumbering-configuration">
+			<ref name="text-linenumbering-configuration-attlist"/>
+			<optional>
+				<ref name="text-linenumbering-separator"/>
+			</optional>
+		</element>
+	</define>
+	<define name="text-linenumbering-configuration-attlist">
+		<interleave>
+			<optional>
+				<attribute name="text:number-lines">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<ref name="common-num-format-attlist"/>
+			</optional>
+			<optional>
+				<attribute name="text:style-name">
+					<ref name="styleNameRef"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="text:increment">
+					<ref name="nonNegativeInteger"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="text:number-position">
+					<choice>
+						<value>left</value>
+						<value>right</value>
+						<value>inner</value>
+						<value>outer</value>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="text:offset">
+					<ref name="nonNegativeLength"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="text:count-empty-lines">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="text:count-in-text-boxes">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="text:restart-on-page">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="text-linenumbering-separator">
+		<element name="text:linenumbering-separator">
+			<optional>
+				<attribute name="text:increment">
+					<ref name="nonNegativeInteger"/>
+				</attribute>
+			</optional>
+			<text/>
+		</element>
+	</define>
+	<define name="text-notes-configuration">
+		<element name="text:notes-configuration">
+			<ref name="text-notes-configuration-content"/>
+		</element>
+	</define>
+	<define name="text-notes-configuration-content">
+		<interleave>
+			<ref name="text-note-class"/>
+			<optional>
+				<attribute name="text:citation-style-name">
+					<ref name="styleNameRef"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="text:citation-body-style-name">
+					<ref name="styleNameRef"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="text:default-style-name">
+					<ref name="styleNameRef"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="text:master-page-name">
+					<ref name="styleNameRef"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="text:start-value">
+					<ref name="nonNegativeInteger"/>
+				</attribute>
+			</optional>
+			<ref name="common-num-format-prefix-suffix-attlist"/>
+			<optional>
+				<ref name="common-num-format-attlist"/>
+			</optional>
+			<optional>
+				<attribute name="text:start-numbering-at">
+					<choice>
+						<value>document</value>
+						<value>chapter</value>
+						<value>page</value>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="text:footnotes-position">
+					<choice>
+						<value>text</value>
+						<value>page</value>
+						<value>section</value>
+						<value>document</value>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<element name="text:note-continuation-notice-forward">
+					<text/>
+				</element>
+			</optional>
+			<optional>
+				<element name="text:note-continuation-notice-backward">
+					<text/>
+				</element>
+			</optional>
+		</interleave>
+	</define>
+	<define name="text-bibliography-configuration">
+		<element name="text:bibliography-configuration">
+			<ref name="text-bibliography-configuration-attlist"/>
+			<zeroOrMore>
+				<ref name="text-sort-key"/>
+			</zeroOrMore>
+		</element>
+	</define>
+	<define name="text-bibliography-configuration-attlist">
+		<interleave>
+			<optional>
+				<attribute name="text:prefix">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="text:suffix">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="text:numbered-entries">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="text:sort-by-position">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="fo:language">
+					<ref name="languageCode"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="fo:country">
+					<ref name="countryCode"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="fo:script">
+					<ref name="scriptCode"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:rfc-language-tag">
+					<ref name="language"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="text:sort-algorithm">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="text-sort-key">
+		<element name="text:sort-key">
+			<ref name="text-sort-key-attlist"/>
+			<empty/>
+		</element>
+	</define>
+	<define name="text-sort-key-attlist">
+		<attribute name="text:key">
+			<choice>
+				<value>address</value>
+				<value>annote</value>
+				<value>author</value>
+				<value>bibliography-type</value>
+				<value>booktitle</value>
+				<value>chapter</value>
+				<value>custom1</value>
+				<value>custom2</value>
+				<value>custom3</value>
+				<value>custom4</value>
+				<value>custom5</value>
+				<value>edition</value>
+				<value>editor</value>
+				<value>howpublished</value>
+				<value>identifier</value>
+				<value>institution</value>
+				<value>isbn</value>
+				<value>issn</value>
+				<value>journal</value>
+				<value>month</value>
+				<value>note</value>
+				<value>number</value>
+				<value>organizations</value>
+				<value>pages</value>
+				<value>publisher</value>
+				<value>report-type</value>
+				<value>school</value>
+				<value>series</value>
+				<value>title</value>
+				<value>url</value>
+				<value>volume</value>
+				<value>year</value>
+			</choice>
+		</attribute>
+		<optional>
+			<attribute name="text:sort-ascending">
+				<ref name="boolean"/>
+			</attribute>
+		</optional>
+	</define>
+	<define name="text-list-style">
+		<element name="text:list-style">
+			<ref name="text-list-style-attr"/>
+			<zeroOrMore>
+				<ref name="text-list-style-content"/>
+			</zeroOrMore>
+		</element>
+	</define>
+	<define name="text-list-style-attr">
+		<interleave>
+			<attribute name="style:name">
+				<ref name="styleName"/>
+			</attribute>
+			<optional>
+				<attribute name="style:display-name">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="text:consecutive-numbering">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="text-list-style-content">
+		<choice>
+			<element name="text:list-level-style-number">
+				<ref name="text-list-level-style-attr"/>
+				<ref name="text-list-level-style-number-attr"/>
+				<optional>
+					<ref name="style-list-level-properties"/>
+				</optional>
+				<optional>
+					<ref name="style-text-properties"/>
+				</optional>
+			</element>
+			<element name="text:list-level-style-bullet">
+				<ref name="text-list-level-style-attr"/>
+				<ref name="text-list-level-style-bullet-attr"/>
+				<optional>
+					<ref name="style-list-level-properties"/>
+				</optional>
+				<optional>
+					<ref name="style-text-properties"/>
+				</optional>
+			</element>
+			<element name="text:list-level-style-image">
+				<ref name="text-list-level-style-attr"/>
+				<ref name="text-list-level-style-image-attr"/>
+				<optional>
+					<ref name="style-list-level-properties"/>
+				</optional>
+			</element>
+		</choice>
+	</define>
+	<define name="text-list-level-style-number-attr">
+		<interleave>
+			<optional>
+				<attribute name="text:style-name">
+					<ref name="styleNameRef"/>
+				</attribute>
+			</optional>
+			<ref name="common-num-format-attlist"/>
+			<ref name="common-num-format-prefix-suffix-attlist"/>
+			<optional>
+				<attribute name="text:display-levels">
+					<ref name="positiveInteger"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="text:start-value">
+					<ref name="positiveInteger"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="text-list-level-style-bullet-attr">
+		<interleave>
+			<optional>
+				<attribute name="text:style-name">
+					<ref name="styleNameRef"/>
+				</attribute>
+			</optional>
+			<attribute name="text:bullet-char">
+				<ref name="character"/>
+			</attribute>
+			<ref name="common-num-format-prefix-suffix-attlist"/>
+			<optional>
+				<attribute name="text:bullet-relative-size">
+					<ref name="percent"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="text-list-level-style-image-attr">
+		<choice>
+			<ref name="common-draw-data-attlist"/>
+			<ref name="office-binary-data"/>
+		</choice>
+	</define>
+	<define name="text-list-level-style-attr">
+		<attribute name="text:level">
+			<ref name="positiveInteger"/>
+		</attribute>
+	</define>
+	<define name="text-outline-style">
+		<element name="text:outline-style">
+			<ref name="text-outline-style-attr"/>
+			<oneOrMore>
+				<ref name="text-outline-level-style"/>
+			</oneOrMore>
+		</element>
+	</define>
+	<define name="text-outline-style-attr">
+		<attribute name="style:name">
+			<ref name="styleName"/>
+		</attribute>
+	</define>
+	<define name="text-outline-level-style">
+		<element name="text:outline-level-style">
+			<ref name="text-outline-level-style-attlist"/>
+			<optional>
+				<ref name="style-list-level-properties"/>
+			</optional>
+			<optional>
+				<ref name="style-text-properties"/>
+			</optional>
+		</element>
+	</define>
+	<define name="text-outline-level-style-attlist">
+		<interleave>
+			<attribute name="text:level">
+				<ref name="positiveInteger"/>
+			</attribute>
+			<optional>
+				<attribute name="text:style-name">
+					<ref name="styleNameRef"/>
+				</attribute>
+			</optional>
+			<ref name="common-num-format-attlist"/>
+			<ref name="common-num-format-prefix-suffix-attlist"/>
+			<optional>
+				<attribute name="text:display-levels">
+					<ref name="positiveInteger"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="text:start-value">
+					<ref name="positiveInteger"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="style-graphic-properties">
+		<element name="style:graphic-properties">
+			<ref name="style-graphic-properties-content-strict"/>
+		</element>
+	</define>
+	<define name="style-graphic-properties-content-strict">
+		<ref name="style-graphic-properties-attlist"/>
+		<ref name="style-graphic-fill-properties-attlist"/>
+		<ref name="style-graphic-properties-elements"/>
+	</define>
+	<define name="style-drawing-page-properties">
+		<element name="style:drawing-page-properties">
+			<ref name="style-drawing-page-properties-content-strict"/>
+		</element>
+	</define>
+	<define name="style-drawing-page-properties-content-strict">
+		<ref name="style-graphic-fill-properties-attlist"/>
+		<ref name="style-drawing-page-properties-attlist"/>
+		<ref name="style-drawing-page-properties-elements"/>
+	</define>
+	<define name="draw-gradient">
+		<element name="draw:gradient">
+			<ref name="common-draw-gradient-attlist"/>
+			<ref name="draw-gradient-attlist"/>
+			<empty/>
+		</element>
+	</define>
+	<define name="common-draw-gradient-attlist">
+		<interleave>
+			<optional>
+				<attribute name="draw:name">
+					<ref name="styleName"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:display-name">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<attribute name="draw:style">
+				<ref name="gradient-style"/>
+			</attribute>
+			<optional>
+				<attribute name="draw:cx">
+					<ref name="percent"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:cy">
+					<ref name="percent"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:angle">
+					<ref name="angle"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:border">
+					<ref name="percent"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="gradient-style">
+		<choice>
+			<value>linear</value>
+			<value>axial</value>
+			<value>radial</value>
+			<value>ellipsoid</value>
+			<value>square</value>
+			<value>rectangular</value>
+		</choice>
+	</define>
+	<define name="draw-gradient-attlist">
+		<interleave>
+			<optional>
+				<attribute name="draw:start-color">
+					<ref name="color"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:end-color">
+					<ref name="color"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:start-intensity">
+					<ref name="zeroToHundredPercent"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:end-intensity">
+					<ref name="zeroToHundredPercent"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="svg-linearGradient">
+		<element name="svg:linearGradient">
+			<ref name="common-svg-gradient-attlist"/>
+			<optional>
+				<attribute name="svg:x1">
+					<choice>
+						<ref name="coordinate"/>
+						<ref name="percent"/>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="svg:y1">
+					<choice>
+						<ref name="coordinate"/>
+						<ref name="percent"/>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="svg:x2">
+					<choice>
+						<ref name="coordinate"/>
+						<ref name="percent"/>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="svg:y2">
+					<choice>
+						<ref name="coordinate"/>
+						<ref name="percent"/>
+					</choice>
+				</attribute>
+			</optional>
+			<zeroOrMore>
+				<ref name="svg-stop"/>
+			</zeroOrMore>
+		</element>
+	</define>
+	<define name="svg-radialGradient">
+		<element name="svg:radialGradient">
+			<ref name="common-svg-gradient-attlist"/>
+			<optional>
+				<attribute name="svg:cx">
+					<choice>
+						<ref name="coordinate"/>
+						<ref name="percent"/>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="svg:cy">
+					<choice>
+						<ref name="coordinate"/>
+						<ref name="percent"/>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="svg:r">
+					<choice>
+						<ref name="coordinate"/>
+						<ref name="percent"/>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="svg:fx">
+					<choice>
+						<ref name="coordinate"/>
+						<ref name="percent"/>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="svg:fy">
+					<choice>
+						<ref name="coordinate"/>
+						<ref name="percent"/>
+					</choice>
+				</attribute>
+			</optional>
+			<zeroOrMore>
+				<ref name="svg-stop"/>
+			</zeroOrMore>
+		</element>
+	</define>
+	<define name="svg-stop">
+		<element name="svg:stop">
+			<attribute name="svg:offset">
+				<choice>
+					<ref name="double"/>
+					<ref name="percent"/>
+				</choice>
+			</attribute>
+			<optional>
+				<attribute name="svg:stop-color">
+					<ref name="color"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="svg:stop-opacity">
+					<ref name="double"/>
+				</attribute>
+			</optional>
+		</element>
+	</define>
+	<define name="common-svg-gradient-attlist">
+		<interleave>
+			<optional>
+				<attribute name="svg:gradientUnits">
+					<value>objectBoundingBox</value>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="svg:gradientTransform">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="svg:spreadMethod">
+					<choice>
+						<value>pad</value>
+						<value>reflect</value>
+						<value>repeat</value>
+					</choice>
+				</attribute>
+			</optional>
+			<attribute name="draw:name">
+				<ref name="styleName"/>
+			</attribute>
+			<optional>
+				<attribute name="draw:display-name">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="draw-hatch">
+		<element name="draw:hatch">
+			<ref name="draw-hatch-attlist"/>
+			<empty/>
+		</element>
+	</define>
+	<define name="draw-hatch-attlist">
+		<interleave>
+			<attribute name="draw:name">
+				<ref name="styleName"/>
+			</attribute>
+			<optional>
+				<attribute name="draw:display-name">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<attribute name="draw:style">
+				<choice>
+					<value>single</value>
+					<value>double</value>
+					<value>triple</value>
+				</choice>
+			</attribute>
+			<optional>
+				<attribute name="draw:color">
+					<ref name="color"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:distance">
+					<ref name="length"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:rotation">
+					<ref name="angle"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="draw-fill-image">
+		<element name="draw:fill-image">
+			<ref name="draw-fill-image-attlist"/>
+			<attribute name="xlink:type">
+				<value>simple</value>
+			</attribute>
+			<attribute name="xlink:href">
+				<ref name="anyIRI"/>
+			</attribute>
+			<optional>
+				<attribute name="xlink:show">
+					<value>embed</value>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="xlink:actuate">
+					<value>onLoad</value>
+				</attribute>
+			</optional>
+			<empty/>
+		</element>
+	</define>
+	<define name="draw-fill-image-attlist">
+		<interleave>
+			<attribute name="draw:name">
+				<ref name="styleName"/>
+			</attribute>
+			<optional>
+				<attribute name="draw:display-name">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="svg:width">
+					<ref name="length"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="svg:height">
+					<ref name="length"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="draw-opacity">
+		<element name="draw:opacity">
+			<ref name="common-draw-gradient-attlist"/>
+			<ref name="draw-opacity-attlist"/>
+			<empty/>
+		</element>
+	</define>
+	<define name="draw-opacity-attlist">
+		<optional>
+			<attribute name="draw:start">
+				<ref name="zeroToHundredPercent"/>
+			</attribute>
+		</optional>
+		<optional>
+			<attribute name="draw:end">
+				<ref name="zeroToHundredPercent"/>
+			</attribute>
+		</optional>
+	</define>
+	<define name="draw-marker">
+		<element name="draw:marker">
+			<ref name="draw-marker-attlist"/>
+			<ref name="common-draw-viewbox-attlist"/>
+			<ref name="common-draw-path-data-attlist"/>
+			<empty/>
+		</element>
+	</define>
+	<define name="draw-marker-attlist">
+		<interleave>
+			<attribute name="draw:name">
+				<ref name="styleName"/>
+			</attribute>
+			<optional>
+				<attribute name="draw:display-name">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="draw-stroke-dash">
+		<element name="draw:stroke-dash">
+			<ref name="draw-stroke-dash-attlist"/>
+			<empty/>
+		</element>
+	</define>
+	<define name="draw-stroke-dash-attlist">
+		<interleave>
+			<attribute name="draw:name">
+				<ref name="styleName"/>
+			</attribute>
+			<optional>
+				<attribute name="draw:display-name">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:style">
+					<choice>
+						<value>rect</value>
+						<value>round</value>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:dots1">
+					<ref name="integer"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:dots1-length">
+					<choice>
+						<ref name="length"/>
+						<ref name="percent"/>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:dots2">
+					<ref name="integer"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:dots2-length">
+					<choice>
+						<ref name="length"/>
+						<ref name="percent"/>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:distance">
+					<choice>
+						<ref name="length"/>
+						<ref name="percent"/>
+					</choice>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="style-presentation-page-layout">
+		<element name="style:presentation-page-layout">
+			<attribute name="style:name">
+				<ref name="styleName"/>
+			</attribute>
+			<optional>
+				<attribute name="style:display-name">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<zeroOrMore>
+				<ref name="presentation-placeholder"/>
+			</zeroOrMore>
+		</element>
+	</define>
+	<define name="presentation-placeholder">
+		<element name="presentation:placeholder">
+			<attribute name="presentation:object">
+				<ref name="presentation-classes"/>
+			</attribute>
+			<attribute name="svg:x">
+				<choice>
+					<ref name="coordinate"/>
+					<ref name="percent"/>
+				</choice>
+			</attribute>
+			<attribute name="svg:y">
+				<choice>
+					<ref name="coordinate"/>
+					<ref name="percent"/>
+				</choice>
+			</attribute>
+			<attribute name="svg:width">
+				<choice>
+					<ref name="length"/>
+					<ref name="percent"/>
+				</choice>
+			</attribute>
+			<attribute name="svg:height">
+				<choice>
+					<ref name="length"/>
+					<ref name="percent"/>
+				</choice>
+			</attribute>
+			<empty/>
+		</element>
+	</define>
+	<define name="style-page-layout-properties">
+		<element name="style:page-layout-properties">
+			<ref name="style-page-layout-properties-content-strict"/>
+		</element>
+	</define>
+	<define name="style-page-layout-properties-content-strict">
+		<ref name="style-page-layout-properties-attlist"/>
+		<ref name="style-page-layout-properties-elements"/>
+	</define>
+	<define name="style-page-layout-properties-attlist">
+		<interleave>
+			<optional>
+				<attribute name="fo:page-width">
+					<ref name="length"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="fo:page-height">
+					<ref name="length"/>
+				</attribute>
+			</optional>
+			<optional>
+				<ref name="common-num-format-attlist"/>
+			</optional>
+			<ref name="common-num-format-prefix-suffix-attlist"/>
+			<optional>
+				<attribute name="style:paper-tray-name">
+					<choice>
+						<value>default</value>
+						<ref name="string"/>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:print-orientation">
+					<choice>
+						<value>portrait</value>
+						<value>landscape</value>
+					</choice>
+				</attribute>
+			</optional>
+			<ref name="common-horizontal-margin-attlist"/>
+			<ref name="common-vertical-margin-attlist"/>
+			<ref name="common-margin-attlist"/>
+			<ref name="common-border-attlist"/>
+			<ref name="common-border-line-width-attlist"/>
+			<ref name="common-padding-attlist"/>
+			<ref name="common-shadow-attlist"/>
+			<ref name="common-background-color-attlist"/>
+			<optional>
+				<attribute name="style:register-truth-ref-style-name">
+					<ref name="styleNameRef"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:print">
+					<list>
+						<zeroOrMore>
+							<choice>
+								<value>headers</value>
+								<value>grid</value>
+								<value>annotations</value>
+								<value>objects</value>
+								<value>charts</value>
+								<value>drawings</value>
+								<value>formulas</value>
+								<value>zero-values</value>
+							</choice>
+						</zeroOrMore>
+					</list>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:print-page-order">
+					<choice>
+						<value>ttb</value>
+						<value>ltr</value>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:first-page-number">
+					<choice>
+						<ref name="positiveInteger"/>
+						<value>continue</value>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:scale-to">
+					<ref name="percent"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:scale-to-pages">
+					<ref name="positiveInteger"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:table-centering">
+					<choice>
+						<value>horizontal</value>
+						<value>vertical</value>
+						<value>both</value>
+						<value>none</value>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:footnote-max-height">
+					<ref name="length"/>
+				</attribute>
+			</optional>
+			<ref name="common-writing-mode-attlist"/>
+			<optional>
+				<attribute name="style:layout-grid-mode">
+					<choice>
+						<value>none</value>
+						<value>line</value>
+						<value>both</value>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:layout-grid-standard-mode">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:layout-grid-base-height">
+					<ref name="length"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:layout-grid-ruby-height">
+					<ref name="length"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:layout-grid-lines">
+					<ref name="positiveInteger"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:layout-grid-base-width">
+					<ref name="length"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:layout-grid-color">
+					<ref name="color"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:layout-grid-ruby-below">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:layout-grid-print">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:layout-grid-display">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:layout-grid-snap-to">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="style-page-layout-properties-elements">
+		<interleave>
+			<ref name="style-background-image"/>
+			<ref name="style-columns"/>
+			<ref name="style-footnote-sep"/>
+		</interleave>
+	</define>
+	<define name="style-footnote-sep">
+		<optional>
+			<element name="style:footnote-sep">
+				<ref name="style-footnote-sep-attlist"/>
+				<empty/>
+			</element>
+		</optional>
+	</define>
+	<define name="style-footnote-sep-attlist">
+		<optional>
+			<attribute name="style:width">
+				<ref name="length"/>
+			</attribute>
+		</optional>
+		<optional>
+			<attribute name="style:rel-width">
+				<ref name="percent"/>
+			</attribute>
+		</optional>
+		<optional>
+			<attribute name="style:color">
+				<ref name="color"/>
+			</attribute>
+		</optional>
+		<optional>
+			<attribute name="style:line-style">
+				<ref name="lineStyle"/>
+			</attribute>
+		</optional>
+		<optional>
+			<attribute name="style:adjustment">
+				<choice>
+					<value>left</value>
+					<value>center</value>
+					<value>right</value>
+				</choice>
+			</attribute>
+		</optional>
+		<optional>
+			<attribute name="style:distance-before-sep">
+				<ref name="length"/>
+			</attribute>
+		</optional>
+		<optional>
+			<attribute name="style:distance-after-sep">
+				<ref name="length"/>
+			</attribute>
+		</optional>
+	</define>
+	<define name="style-header-footer-properties">
+		<element name="style:header-footer-properties">
+			<ref name="style-header-footer-properties-content-strict"/>
+		</element>
+	</define>
+	<define name="style-header-footer-properties-content-strict">
+		<ref name="style-header-footer-properties-attlist"/>
+		<ref name="style-header-footer-properties-elements"/>
+	</define>
+	<define name="style-header-footer-properties-attlist">
+		<interleave>
+			<optional>
+				<attribute name="svg:height">
+					<ref name="length"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="fo:min-height">
+					<ref name="length"/>
+				</attribute>
+			</optional>
+			<ref name="common-horizontal-margin-attlist"/>
+			<ref name="common-vertical-margin-attlist"/>
+			<ref name="common-margin-attlist"/>
+			<ref name="common-border-attlist"/>
+			<ref name="common-border-line-width-attlist"/>
+			<ref name="common-padding-attlist"/>
+			<ref name="common-background-color-attlist"/>
+			<ref name="common-shadow-attlist"/>
+			<optional>
+				<attribute name="style:dynamic-spacing">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="style-header-footer-properties-elements">
+		<ref name="style-background-image"/>
+	</define>
+	<define name="style-text-properties">
+		<element name="style:text-properties">
+			<ref name="style-text-properties-content-strict"/>
+		</element>
+	</define>
+	<define name="style-text-properties-content-strict">
+		<ref name="style-text-properties-attlist"/>
+		<ref name="style-text-properties-elements"/>
+	</define>
+	<define name="style-text-properties-elements">
+		<empty/>
+	</define>
+	<define name="style-text-properties-attlist">
+		<interleave>
+			<optional>
+				<attribute name="fo:font-variant">
+					<ref name="fontVariant"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="fo:text-transform">
+					<choice>
+						<value>none</value>
+						<value>lowercase</value>
+						<value>uppercase</value>
+						<value>capitalize</value>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="fo:color">
+					<ref name="color"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:use-window-font-color">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:text-outline">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:text-line-through-type">
+					<ref name="lineType"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:text-line-through-style">
+					<ref name="lineStyle"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:text-line-through-width">
+					<ref name="lineWidth"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:text-line-through-color">
+					<choice>
+						<value>font-color</value>
+						<ref name="color"/>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:text-line-through-text">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:text-line-through-text-style">
+					<ref name="styleNameRef"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:text-position">
+					<list>
+						<choice>
+							<ref name="percent"/>
+							<value>super</value>
+							<value>sub</value>
+						</choice>
+						<optional>
+							<ref name="percent"/>
+						</optional>
+					</list>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:font-name">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:font-name-asian">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:font-name-complex">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="fo:font-family">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:font-family-asian">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:font-family-complex">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:font-family-generic">
+					<ref name="fontFamilyGeneric"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:font-family-generic-asian">
+					<ref name="fontFamilyGeneric"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:font-family-generic-complex">
+					<ref name="fontFamilyGeneric"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:font-style-name">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:font-style-name-asian">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:font-style-name-complex">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:font-pitch">
+					<ref name="fontPitch"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:font-pitch-asian">
+					<ref name="fontPitch"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:font-pitch-complex">
+					<ref name="fontPitch"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:font-charset">
+					<ref name="textEncoding"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:font-charset-asian">
+					<ref name="textEncoding"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:font-charset-complex">
+					<ref name="textEncoding"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="fo:font-size">
+					<choice>
+						<ref name="positiveLength"/>
+						<ref name="percent"/>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:font-size-asian">
+					<choice>
+						<ref name="positiveLength"/>
+						<ref name="percent"/>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:font-size-complex">
+					<choice>
+						<ref name="positiveLength"/>
+						<ref name="percent"/>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:font-size-rel">
+					<ref name="length"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:font-size-rel-asian">
+					<ref name="length"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:font-size-rel-complex">
+					<ref name="length"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:script-type">
+					<choice>
+						<value>latin</value>
+						<value>asian</value>
+						<value>complex</value>
+						<value>ignore</value>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="fo:letter-spacing">
+					<choice>
+						<ref name="length"/>
+						<value>normal</value>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="fo:language">
+					<ref name="languageCode"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:language-asian">
+					<ref name="languageCode"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:language-complex">
+					<ref name="languageCode"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="fo:country">
+					<ref name="countryCode"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:country-asian">
+					<ref name="countryCode"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:country-complex">
+					<ref name="countryCode"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="fo:script">
+					<ref name="scriptCode"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:script-asian">
+					<ref name="scriptCode"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:script-complex">
+					<ref name="scriptCode"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:rfc-language-tag">
+					<ref name="language"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:rfc-language-tag-asian">
+					<ref name="language"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:rfc-language-tag-complex">
+					<ref name="language"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="fo:font-style">
+					<ref name="fontStyle"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:font-style-asian">
+					<ref name="fontStyle"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:font-style-complex">
+					<ref name="fontStyle"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:font-relief">
+					<choice>
+						<value>none</value>
+						<value>embossed</value>
+						<value>engraved</value>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="fo:text-shadow">
+					<ref name="shadowType"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:text-underline-type">
+					<ref name="lineType"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:text-underline-style">
+					<ref name="lineStyle"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:text-underline-width">
+					<ref name="lineWidth"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:text-underline-color">
+					<choice>
+						<value>font-color</value>
+						<ref name="color"/>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:text-overline-type">
+					<ref name="lineType"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:text-overline-style">
+					<ref name="lineStyle"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:text-overline-width">
+					<ref name="lineWidth"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:text-overline-color">
+					<choice>
+						<value>font-color</value>
+						<ref name="color"/>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:text-overline-mode">
+					<ref name="lineMode"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="fo:font-weight">
+					<ref name="fontWeight"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:font-weight-asian">
+					<ref name="fontWeight"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:font-weight-complex">
+					<ref name="fontWeight"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:text-underline-mode">
+					<ref name="lineMode"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:text-line-through-mode">
+					<ref name="lineMode"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:letter-kerning">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:text-blinking">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<ref name="common-background-color-attlist"/>
+			<optional>
+				<attribute name="style:text-combine">
+					<choice>
+						<value>none</value>
+						<value>letters</value>
+						<value>lines</value>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:text-combine-start-char">
+					<ref name="character"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:text-combine-end-char">
+					<ref name="character"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:text-emphasize">
+					<choice>
+						<value>none</value>
+						<list>
+							<choice>
+								<value>none</value>
+								<value>accent</value>
+								<value>dot</value>
+								<value>circle</value>
+								<value>disc</value>
+							</choice>
+							<choice>
+								<value>above</value>
+								<value>below</value>
+							</choice>
+						</list>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:text-scale">
+					<ref name="percent"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:text-rotation-angle">
+					<ref name="angle"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:text-rotation-scale">
+					<choice>
+						<value>fixed</value>
+						<value>line-height</value>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="fo:hyphenate">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="fo:hyphenation-remain-char-count">
+					<ref name="positiveInteger"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="fo:hyphenation-push-char-count">
+					<ref name="positiveInteger"/>
+				</attribute>
+			</optional>
+			<choice>
+				<attribute name="text:display">
+					<value>true</value>
+				</attribute>
+				<attribute name="text:display">
+					<value>none</value>
+				</attribute>
+				<group>
+					<attribute name="text:display">
+						<value>condition</value>
+					</attribute>
+					<attribute name="text:condition">
+						<value>none</value>
+					</attribute>
+				</group>
+				<empty/>
+			</choice>
+		</interleave>
+	</define>
+	<define name="fontVariant">
+		<choice>
+			<value>normal</value>
+			<value>small-caps</value>
+		</choice>
+	</define>
+	<define name="fontFamilyGeneric">
+		<choice>
+			<value>roman</value>
+			<value>swiss</value>
+			<value>modern</value>
+			<value>decorative</value>
+			<value>script</value>
+			<value>system</value>
+		</choice>
+	</define>
+	<define name="fontPitch">
+		<choice>
+			<value>fixed</value>
+			<value>variable</value>
+		</choice>
+	</define>
+	<define name="textEncoding">
+		<data type="string">
+			<param name="pattern">[A-Za-z][A-Za-z0-9._\-]*</param>
+		</data>
+	</define>
+	<define name="fontStyle">
+		<choice>
+			<value>normal</value>
+			<value>italic</value>
+			<value>oblique</value>
+		</choice>
+	</define>
+	<define name="shadowType">
+		<choice>
+			<value>none</value>
+			<ref name="string"/>
+		</choice>
+	</define>
+	<define name="lineType">
+		<choice>
+			<value>none</value>
+			<value>single</value>
+			<value>double</value>
+		</choice>
+	</define>
+	<define name="lineStyle">
+		<choice>
+			<value>none</value>
+			<value>solid</value>
+			<value>dotted</value>
+			<value>dash</value>
+			<value>long-dash</value>
+			<value>dot-dash</value>
+			<value>dot-dot-dash</value>
+			<value>wave</value>
+		</choice>
+	</define>
+	<define name="lineWidth">
+		<choice>
+			<value>auto</value>
+			<value>normal</value>
+			<value>bold</value>
+			<value>thin</value>
+			<value>medium</value>
+			<value>thick</value>
+			<ref name="positiveInteger"/>
+			<ref name="percent"/>
+			<ref name="positiveLength"/>
+		</choice>
+	</define>
+	<define name="fontWeight">
+		<choice>
+			<value>normal</value>
+			<value>bold</value>
+			<value>100</value>
+			<value>200</value>
+			<value>300</value>
+			<value>400</value>
+			<value>500</value>
+			<value>600</value>
+			<value>700</value>
+			<value>800</value>
+			<value>900</value>
+		</choice>
+	</define>
+	<define name="lineMode">
+		<choice>
+			<value>continuous</value>
+			<value>skip-white-space</value>
+		</choice>
+	</define>
+	<define name="style-paragraph-properties">
+		<element name="style:paragraph-properties">
+			<ref name="style-paragraph-properties-content-strict"/>
+		</element>
+	</define>
+	<define name="style-paragraph-properties-content-strict">
+		<ref name="style-paragraph-properties-attlist"/>
+		<ref name="style-paragraph-properties-elements"/>
+	</define>
+	<define name="style-paragraph-properties-attlist">
+		<interleave>
+			<optional>
+				<attribute name="fo:line-height">
+					<choice>
+						<value>normal</value>
+						<ref name="nonNegativeLength"/>
+						<ref name="percent"/>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:line-height-at-least">
+					<ref name="nonNegativeLength"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:line-spacing">
+					<ref name="length"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:font-independent-line-spacing">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<ref name="common-text-align"/>
+			<optional>
+				<attribute name="fo:text-align-last">
+					<choice>
+						<value>start</value>
+						<value>center</value>
+						<value>justify</value>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:justify-single-word">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="fo:keep-together">
+					<choice>
+						<value>auto</value>
+						<value>always</value>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="fo:widows">
+					<ref name="nonNegativeInteger"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="fo:orphans">
+					<ref name="nonNegativeInteger"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:tab-stop-distance">
+					<ref name="nonNegativeLength"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="fo:hyphenation-keep">
+					<choice>
+						<value>auto</value>
+						<value>page</value>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="fo:hyphenation-ladder-count">
+					<choice>
+						<value>no-limit</value>
+						<ref name="positiveInteger"/>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:register-true">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+	
+			<ref name="common-horizontal-margin-attlist"/>
+			<optional>
+				<attribute name="fo:text-indent">
+					<choice>
+						<ref name="length"/>
+						<ref name="percent"/>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:auto-text-indent">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<ref name="common-vertical-margin-attlist"/>
+			<ref name="common-margin-attlist"/>
+			<ref name="common-break-attlist"/>
+			<ref name="common-background-color-attlist"/>
+			<ref name="common-border-attlist"/>
+			<ref name="common-border-line-width-attlist"/>
+			<optional>
+				<attribute name="style:join-border">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<ref name="common-padding-attlist"/>
+			<ref name="common-shadow-attlist"/>
+			<ref name="common-keep-with-next-attlist"/>
+			<optional>
+				<attribute name="text:number-lines">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="text:line-number">
+					<ref name="nonNegativeInteger"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:text-autospace">
+					<choice>
+						<value>none</value>
+						<value>ideograph-alpha</value>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:punctuation-wrap">
+					<choice>
+						<value>simple</value>
+						<value>hanging</value>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:line-break">
+					<choice>
+						<value>normal</value>
+						<value>strict</value>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:vertical-align">
+					<choice>
+						<value>top</value>
+						<value>middle</value>
+						<value>bottom</value>
+						<value>auto</value>
+						<value>baseline</value>
+					</choice>
+				</attribute>
+			</optional>
+			<ref name="common-writing-mode-attlist"/>
+			<optional>
+				<attribute name="style:writing-mode-automatic">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:snap-to-layout-grid">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<ref name="common-page-number-attlist"/>
+			<ref name="common-background-transparency-attlist"/>
+		</interleave>
+	</define>
+	<define name="common-text-align">
+		<optional>
+			<attribute name="fo:text-align">
+				<choice>
+					<value>start</value>
+					<value>end</value>
+					<value>left</value>
+					<value>right</value>
+					<value>center</value>
+					<value>justify</value>
+				</choice>
+			</attribute>
+		</optional>
+	</define>
+	<define name="style-paragraph-properties-elements">
+		<interleave>
+			<ref name="style-tab-stops"/>
+			<ref name="style-drop-cap"/>
+			<ref name="style-background-image"/>
+		</interleave>
+	</define>
+	<define name="style-tab-stops">
+		<optional>
+			<element name="style:tab-stops">
+				<zeroOrMore>
+					<ref name="style-tab-stop"/>
+				</zeroOrMore>
+			</element>
+		</optional>
+	</define>
+	<define name="style-tab-stop">
+		<element name="style:tab-stop">
+			<ref name="style-tab-stop-attlist"/>
+			<empty/>
+		</element>
+	</define>
+	<define name="style-tab-stop-attlist">
+		<interleave>
+			<attribute name="style:position">
+				<ref name="length"/>
+			</attribute>
+			<choice>
+				<optional>
+					<attribute name="style:type">
+						<choice>
+							<value>left</value>
+							<value>center</value>
+							<value>right</value>
+						</choice>
+					</attribute>
+				</optional>
+				<group>
+					<attribute name="style:type">
+						<value>char</value>
+					</attribute>
+					<ref name="style-tab-stop-char-attlist"/>
+				</group>
+			</choice>
+			<optional>
+				<attribute name="style:leader-type">
+					<ref name="lineType"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:leader-style">
+					<ref name="lineStyle"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:leader-width">
+					<ref name="lineWidth"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:leader-color">
+					<choice>
+						<value>font-color</value>
+						<ref name="color"/>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:leader-text">
+					<ref name="character"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:leader-text-style">
+					<ref name="styleNameRef"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="style-tab-stop-char-attlist">
+		<attribute name="style:char">
+			<ref name="character"/>
+		</attribute>
+	</define>
+	<define name="style-drop-cap">
+		<optional>
+			<element name="style:drop-cap">
+				<ref name="style-drop-cap-attlist"/>
+				<empty/>
+			</element>
+		</optional>
+	</define>
+	<define name="style-drop-cap-attlist">
+		<interleave>
+			<optional>
+				<attribute name="style:length">
+					<choice>
+						<value>word</value>
+						<ref name="positiveInteger"/>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:lines">
+					<ref name="positiveInteger"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:distance">
+					<ref name="length"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:style-name">
+					<ref name="styleNameRef"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="common-horizontal-margin-attlist">
+		<optional>
+			<attribute name="fo:margin-left">
+				<choice>
+					<ref name="length"/>
+					<ref name="percent"/>
+				</choice>
+			</attribute>
+		</optional>
+		<optional>
+			<attribute name="fo:margin-right">
+				<choice>
+					<ref name="length"/>
+					<ref name="percent"/>
+				</choice>
+			</attribute>
+		</optional>
+	</define>
+	<define name="common-vertical-margin-attlist">
+		<optional>
+			<attribute name="fo:margin-top">
+				<choice>
+					<ref name="nonNegativeLength"/>
+					<ref name="percent"/>
+				</choice>
+			</attribute>
+		</optional>
+		<optional>
+			<attribute name="fo:margin-bottom">
+				<choice>
+					<ref name="nonNegativeLength"/>
+					<ref name="percent"/>
+				</choice>
+			</attribute>
+		</optional>
+	</define>
+	<define name="common-margin-attlist">
+		<optional>
+			<attribute name="fo:margin">
+				<choice>
+					<ref name="nonNegativeLength"/>
+					<ref name="percent"/>
+				</choice>
+			</attribute>
+		</optional>
+	</define>
+	<define name="common-break-attlist">
+		<optional>
+			<attribute name="fo:break-before">
+				<choice>
+					<value>auto</value>
+					<value>column</value>
+					<value>page</value>
+				</choice>
+			</attribute>
+		</optional>
+		<optional>
+			<attribute name="fo:break-after">
+				<choice>
+					<value>auto</value>
+					<value>column</value>
+					<value>page</value>
+				</choice>
+			</attribute>
+		</optional>
+	</define>
+	<define name="common-background-color-attlist">
+		<optional>
+			<attribute name="fo:background-color">
+				<choice>
+					<value>transparent</value>
+					<ref name="color"/>
+				</choice>
+			</attribute>
+		</optional>
+	</define>
+	<define name="style-background-image">
+		<optional>
+			<element name="style:background-image">
+				<ref name="style-background-image-attlist"/>
+				<choice>
+					<ref name="common-draw-data-attlist"/>
+					<ref name="office-binary-data"/>
+					<empty/>
+				</choice>
+			</element>
+		</optional>
+	</define>
+	<define name="style-background-image-attlist">
+		<interleave>
+			<optional>
+				<attribute name="style:repeat">
+					<choice>
+						<value>no-repeat</value>
+						<value>repeat</value>
+						<value>stretch</value>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:position">
+					<choice>
+						<value>left</value>
+						<value>center</value>
+						<value>right</value>
+						<value>top</value>
+						<value>bottom</value>
+						<list>
+							<ref name="horiBackPos"/>
+							<ref name="vertBackPos"/>
+						</list>
+						<list>
+							<ref name="vertBackPos"/>
+							<ref name="horiBackPos"/>
+						</list>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:filter-name">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:opacity">
+					<ref name="zeroToHundredPercent"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="horiBackPos">
+		<choice>
+			<value>left</value>
+			<value>center</value>
+			<value>right</value>
+		</choice>
+	</define>
+	<define name="vertBackPos">
+		<choice>
+			<value>top</value>
+			<value>center</value>
+			<value>bottom</value>
+		</choice>
+	</define>
+	<define name="common-border-attlist">
+		<optional>
+			<attribute name="fo:border">
+				<ref name="string"/>
+			</attribute>
+		</optional>
+		<optional>
+			<attribute name="fo:border-top">
+				<ref name="string"/>
+			</attribute>
+		</optional>
+		<optional>
+			<attribute name="fo:border-bottom">
+				<ref name="string"/>
+			</attribute>
+		</optional>
+		<optional>
+			<attribute name="fo:border-left">
+				<ref name="string"/>
+			</attribute>
+		</optional>
+		<optional>
+			<attribute name="fo:border-right">
+				<ref name="string"/>
+			</attribute>
+		</optional>
+	</define>
+	<define name="common-border-line-width-attlist">
+		<optional>
+			<attribute name="style:border-line-width">
+				<ref name="borderWidths"/>
+			</attribute>
+		</optional>
+		<optional>
+			<attribute name="style:border-line-width-top">
+				<ref name="borderWidths"/>
+			</attribute>
+		</optional>
+		<optional>
+			<attribute name="style:border-line-width-bottom">
+				<ref name="borderWidths"/>
+			</attribute>
+		</optional>
+		<optional>
+			<attribute name="style:border-line-width-left">
+				<ref name="borderWidths"/>
+			</attribute>
+		</optional>
+		<optional>
+			<attribute name="style:border-line-width-right">
+				<ref name="borderWidths"/>
+			</attribute>
+		</optional>
+	</define>
+	<define name="borderWidths">
+		<list>
+			<ref name="positiveLength"/>
+			<ref name="positiveLength"/>
+			<ref name="positiveLength"/>
+		</list>
+	</define>
+	<define name="common-padding-attlist">
+		<optional>
+			<attribute name="fo:padding">
+				<ref name="nonNegativeLength"/>
+			</attribute>
+		</optional>
+		<optional>
+			<attribute name="fo:padding-top">
+				<ref name="nonNegativeLength"/>
+			</attribute>
+		</optional>
+		<optional>
+			<attribute name="fo:padding-bottom">
+				<ref name="nonNegativeLength"/>
+			</attribute>
+		</optional>
+		<optional>
+			<attribute name="fo:padding-left">
+				<ref name="nonNegativeLength"/>
+			</attribute>
+		</optional>
+		<optional>
+			<attribute name="fo:padding-right">
+				<ref name="nonNegativeLength"/>
+			</attribute>
+		</optional>
+	</define>
+	<define name="common-shadow-attlist">
+		<optional>
+			<attribute name="style:shadow">
+				<ref name="shadowType"/>
+			</attribute>
+		</optional>
+	</define>
+	<define name="common-keep-with-next-attlist">
+		<optional>
+			<attribute name="fo:keep-with-next">
+				<choice>
+					<value>auto</value>
+					<value>always</value>
+				</choice>
+			</attribute>
+		</optional>
+	</define>
+	<define name="common-writing-mode-attlist">
+		<optional>
+			<attribute name="style:writing-mode">
+				<choice>
+					<value>lr-tb</value>
+					<value>rl-tb</value>
+					<value>tb-rl</value>
+					<value>tb-lr</value>
+					<value>lr</value>
+					<value>rl</value>
+					<value>tb</value>
+					<value>page</value>
+				</choice>
+			</attribute>
+		</optional>
+	</define>
+	<define name="common-page-number-attlist">
+		<optional>
+			<attribute name="style:page-number">
+				<choice>
+					<ref name="positiveInteger"/>
+					<value>auto</value>
+				</choice>
+			</attribute>
+		</optional>
+	</define>
+	<define name="common-background-transparency-attlist">
+		<optional>
+			<attribute name="style:background-transparency">
+				<ref name="zeroToHundredPercent"/>
+			</attribute>
+		</optional>
+	</define>
+	<define name="style-ruby-properties">
+		<element name="style:ruby-properties">
+			<ref name="style-ruby-properties-content-strict"/>
+		</element>
+	</define>
+	<define name="style-ruby-properties-content-strict">
+		<ref name="style-ruby-properties-attlist"/>
+		<ref name="style-ruby-properties-elements"/>
+	</define>
+	<define name="style-ruby-properties-elements">
+		<empty/>
+	</define>
+	<define name="style-ruby-properties-attlist">
+		<interleave>
+			<optional>
+				<attribute name="style:ruby-position">
+					<choice>
+						<value>above</value>
+						<value>below</value>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:ruby-align">
+					<choice>
+						<value>left</value>
+						<value>center</value>
+						<value>right</value>
+						<value>distribute-letter</value>
+						<value>distribute-space</value>
+					</choice>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="style-section-properties">
+		<element name="style:section-properties">
+			<ref name="style-section-properties-content-strict"/>
+		</element>
+	</define>
+	<define name="style-section-properties-content-strict">
+		<ref name="style-section-properties-attlist"/>
+		<ref name="style-section-properties-elements"/>
+	</define>
+	<define name="style-section-properties-attlist">
+		<interleave>
+			<ref name="common-background-color-attlist"/>
+			<ref name="common-horizontal-margin-attlist"/>
+			<optional>
+				<attribute name="style:protect">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<ref name="common-editable-attlist"/>
+			<optional>
+				<attribute name="text:dont-balance-text-columns">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<ref name="common-writing-mode-attlist"/>
+		</interleave>
+	</define>
+	<define name="style-section-properties-elements">
+		<interleave>
+			<ref name="style-background-image"/>
+			<ref name="style-columns"/>
+			<zeroOrMore>
+				<ref name="text-notes-configuration"/>
+			</zeroOrMore>
+		</interleave>
+	</define>
+	<define name="style-columns">
+		<optional>
+			<element name="style:columns">
+				<ref name="style-columns-attlist"/>
+				<optional>
+					<ref name="style-column-sep"/>
+				</optional>
+				<zeroOrMore>
+					<ref name="style-column"/>
+				</zeroOrMore>
+			</element>
+		</optional>
+	</define>
+	<define name="style-columns-attlist">
+		<interleave>
+			<attribute name="fo:column-count">
+				<ref name="positiveInteger"/>
+			</attribute>
+			<optional>
+				<attribute name="fo:column-gap">
+					<ref name="length"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="style-column">
+		<element name="style:column">
+			<ref name="style-column-attlist"/>
+		</element>
+	</define>
+	<define name="style-column-attlist">
+		<interleave>
+			<attribute name="style:rel-width">
+				<ref name="relativeLength"/>
+			</attribute>
+			<optional>
+				<attribute name="fo:start-indent">
+					<ref name="length"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="fo:end-indent">
+					<ref name="length"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="fo:space-before">
+					<ref name="length"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="fo:space-after">
+					<ref name="length"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="style-column-sep">
+		<element name="style:column-sep">
+			<ref name="style-column-sep-attlist"/>
+		</element>
+	</define>
+	<define name="style-column-sep-attlist">
+		<interleave>
+			<optional>
+				<attribute name="style:style">
+					<choice>
+						<value>none</value>
+						<value>solid</value>
+						<value>dotted</value>
+						<value>dashed</value>
+						<value>dot-dashed</value>
+					</choice>
+				</attribute>
+			</optional>
+			<attribute name="style:width">
+				<ref name="length"/>
+			</attribute>
+			<optional>
+				<attribute name="style:height">
+					<ref name="zeroToHundredPercent"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:vertical-align">
+					<choice>
+						<value>top</value>
+						<value>middle</value>
+						<value>bottom</value>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:color">
+					<ref name="color"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="style-table-properties">
+		<element name="style:table-properties">
+			<ref name="style-table-properties-content-strict"/>
+		</element>
+	</define>
+	<define name="style-table-properties-content-strict">
+		<ref name="style-table-properties-attlist"/>
+		<ref name="style-table-properties-elements"/>
+	</define>
+	<define name="style-table-properties-attlist">
+		<interleave>
+			<optional>
+				<attribute name="style:width">
+					<ref name="positiveLength"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:rel-width">
+					<ref name="percent"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="table:align">
+					<choice>
+						<value>left</value>
+						<value>center</value>
+						<value>right</value>
+						<value>margins</value>
+					</choice>
+				</attribute>
+			</optional>
+			<ref name="common-horizontal-margin-attlist"/>
+			<ref name="common-vertical-margin-attlist"/>
+			<ref name="common-margin-attlist"/>
+			<ref name="common-page-number-attlist"/>
+			<ref name="common-break-attlist"/>
+			<ref name="common-background-color-attlist"/>
+			<ref name="common-shadow-attlist"/>
+			<ref name="common-keep-with-next-attlist"/>
+			<optional>
+				<attribute name="style:may-break-between-rows">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="table:border-model">
+					<choice>
+						<value>collapsing</value>
+						<value>separating</value>
+					</choice>
+				</attribute>
+			</optional>
+			<ref name="common-writing-mode-attlist"/>
+			<optional>
+				<attribute name="table:display">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="style-table-properties-elements">
+		<ref name="style-background-image"/>
+	</define>
+	<define name="style-table-column-properties">
+		<element name="style:table-column-properties">
+			<ref name="style-table-column-properties-content-strict"/>
+		</element>
+	</define>
+	<define name="style-table-column-properties-content-strict">
+		<ref name="style-table-column-properties-attlist"/>
+		<ref name="style-table-column-properties-elements"/>
+	</define>
+	<define name="style-table-column-properties-elements">
+		<empty/>
+	</define>
+	<define name="style-table-column-properties-attlist">
+		<interleave>
+			<optional>
+				<attribute name="style:column-width">
+					<ref name="positiveLength"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:rel-column-width">
+					<ref name="relativeLength"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:use-optimal-column-width">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<ref name="common-break-attlist"/>
+		</interleave>
+	</define>
+	<define name="style-table-row-properties">
+		<element name="style:table-row-properties">
+			<ref name="style-table-row-properties-content-strict"/>
+		</element>
+	</define>
+	<define name="style-table-row-properties-content-strict">
+		<ref name="style-table-row-properties-attlist"/>
+		<ref name="style-table-row-properties-elements"/>
+	</define>
+	<define name="style-table-row-properties-attlist">
+		<interleave>
+			<optional>
+				<attribute name="style:row-height">
+					<ref name="positiveLength"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:min-row-height">
+					<ref name="nonNegativeLength"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:use-optimal-row-height">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<ref name="common-background-color-attlist"/>
+			<ref name="common-break-attlist"/>
+			<optional>
+				<attribute name="fo:keep-together">
+					<choice>
+						<value>auto</value>
+						<value>always</value>
+					</choice>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="style-table-row-properties-elements">
+		<ref name="style-background-image"/>
+	</define>
+	<define name="style-table-cell-properties">
+		<element name="style:table-cell-properties">
+			<ref name="style-table-cell-properties-content-strict"/>
+		</element>
+	</define>
+	<define name="style-table-cell-properties-content-strict">
+		<ref name="style-table-cell-properties-attlist"/>
+		<ref name="style-table-cell-properties-elements"/>
+	</define>
+	<define name="style-table-cell-properties-attlist">
+		<interleave>
+			<optional>
+				<attribute name="style:vertical-align">
+					<choice>
+						<value>top</value>
+						<value>middle</value>
+						<value>bottom</value>
+						<value>automatic</value>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:text-align-source">
+					<choice>
+						<value>fix</value>
+						<value>value-type</value>
+					</choice>
+				</attribute>
+			</optional>
+			<ref name="common-style-direction-attlist"/>
+			<optional>
+				<attribute name="style:glyph-orientation-vertical">
+					<choice>
+						<value>auto</value>
+						<value>0</value>
+						<value>0deg</value>
+						<value>0rad</value>
+						<value>0grad</value>
+					</choice>
+				</attribute>
+			</optional>
+			<ref name="common-writing-mode-attlist"/>
+			<ref name="common-shadow-attlist"/>
+			<ref name="common-background-color-attlist"/>
+			<ref name="common-border-attlist"/>
+			<optional>
+				<attribute name="style:diagonal-tl-br">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:diagonal-tl-br-widths">
+					<ref name="borderWidths"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:diagonal-bl-tr">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:diagonal-bl-tr-widths">
+					<ref name="borderWidths"/>
+				</attribute>
+			</optional>
+			<ref name="common-border-line-width-attlist"/>
+			<ref name="common-padding-attlist"/>
+			<optional>
+				<attribute name="fo:wrap-option">
+					<choice>
+						<value>no-wrap</value>
+						<value>wrap</value>
+					</choice>
+				</attribute>
+			</optional>
+			<ref name="common-rotation-angle-attlist"/>
+			<optional>
+				<attribute name="style:rotation-align">
+					<choice>
+						<value>none</value>
+						<value>bottom</value>
+						<value>top</value>
+						<value>center</value>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:cell-protect">
+					<choice>
+						<value>none</value>
+						<value>hidden-and-protected</value>
+						<list>
+							<oneOrMore>
+								<choice>
+									<value>protected</value>
+									<value>formula-hidden</value>
+								</choice>
+							</oneOrMore>
+						</list>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:print-content">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:decimal-places">
+					<ref name="nonNegativeInteger"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:repeat-content">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:shrink-to-fit">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="common-style-direction-attlist">
+		<optional>
+			<attribute name="style:direction">
+				<choice>
+					<value>ltr</value>
+					<value>ttb</value>
+				</choice>
+			</attribute>
+		</optional>
+	</define>
+	<define name="style-table-cell-properties-elements">
+		<ref name="style-background-image"/>
+	</define>
+	<define name="common-rotation-angle-attlist">
+		<optional>
+			<attribute name="style:rotation-angle">
+				<ref name="angle"/>
+			</attribute>
+		</optional>
+	</define>
+	<define name="style-list-level-properties">
+		<element name="style:list-level-properties">
+			<ref name="style-list-level-properties-content-strict"/>
+		</element>
+	</define>
+	<define name="style-list-level-properties-content-strict">
+		<ref name="style-list-level-properties-attlist"/>
+		<ref name="style-list-level-properties-elements"/>
+	</define>
+	<define name="style-list-level-properties-attlist">
+		<interleave>
+			<ref name="common-text-align"/>
+			<optional>
+				<attribute name="text:space-before">
+					<ref name="length"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="text:min-label-width">
+					<ref name="nonNegativeLength"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="text:min-label-distance">
+					<ref name="nonNegativeLength"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:font-name">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="fo:width">
+					<ref name="positiveLength"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="fo:height">
+					<ref name="positiveLength"/>
+				</attribute>
+			</optional>
+			<ref name="common-vertical-rel-attlist"/>
+			<ref name="common-vertical-pos-attlist"/>
+			<optional>
+				<attribute name="text:list-level-position-and-space-mode">
+					<choice>
+						<value>label-width-and-position</value>
+						<value>label-alignment</value>
+					</choice>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="style-list-level-properties-elements">
+		<ref name="style-list-level-label-alignment"/>
+	</define>
+	<define name="style-list-level-label-alignment">
+		<optional>
+			<element name="style:list-level-label-alignment">
+				<ref name="style-list-level-label-alignment-attlist"/>
+				<empty/>
+			</element>
+		</optional>
+	</define>
+	<define name="style-list-level-label-alignment-attlist">
+		<interleave>
+			<attribute name="text:label-followed-by">
+				<choice>
+					<value>listtab</value>
+					<value>space</value>
+					<value>nothing</value>
+				</choice>
+			</attribute>
+			<optional>
+				<attribute name="text:list-tab-stop-position">
+					<ref name="length"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="fo:text-indent">
+					<ref name="length"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="fo:margin-left">
+					<ref name="length"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="style-graphic-properties-attlist">
+		<interleave>
+			<optional>
+				<attribute name="draw:stroke">
+					<choice>
+						<value>none</value>
+						<value>dash</value>
+						<value>solid</value>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:stroke-dash">
+					<ref name="styleNameRef"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:stroke-dash-names">
+					<ref name="styleNameRefs"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="svg:stroke-width">
+					<ref name="length"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="svg:stroke-color">
+					<ref name="color"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:marker-start">
+					<ref name="styleNameRef"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:marker-end">
+					<ref name="styleNameRef"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:marker-start-width">
+					<ref name="length"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:marker-end-width">
+					<ref name="length"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:marker-start-center">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:marker-end-center">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="svg:stroke-opacity">
+					<choice>
+						<data type="double">
+							<param name="minInclusive">0</param>
+							<param name="maxInclusive">1</param>
+						</data>
+						<ref name="zeroToHundredPercent"/>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:stroke-linejoin">
+					<choice>
+						<value>miter</value>
+						<value>round</value>
+						<value>bevel</value>
+						<value>middle</value>
+						<value>none</value>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="svg:stroke-linecap">
+					<choice>
+						<value>butt</value>
+						<value>square</value>
+						<value>round</value>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:symbol-color">
+					<ref name="color"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="text:animation">
+					<choice>
+						<value>none</value>
+						<value>scroll</value>
+						<value>alternate</value>
+						<value>slide</value>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="text:animation-direction">
+					<choice>
+						<value>left</value>
+						<value>right</value>
+						<value>up</value>
+						<value>down</value>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="text:animation-start-inside">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="text:animation-stop-inside">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="text:animation-repeat">
+					<ref name="nonNegativeInteger"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="text:animation-delay">
+					<ref name="duration"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="text:animation-steps">
+					<ref name="length"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:auto-grow-width">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:auto-grow-height">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:fit-to-size">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:fit-to-contour">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:textarea-vertical-align">
+					<choice>
+						<value>top</value>
+						<value>middle</value>
+						<value>bottom</value>
+						<value>justify</value>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:textarea-horizontal-align">
+					<choice>
+						<value>left</value>
+						<value>center</value>
+						<value>right</value>
+						<value>justify</value>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="fo:wrap-option">
+					<choice>
+						<value>no-wrap</value>
+						<value>wrap</value>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:shrink-to-fit">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:color-mode">
+					<choice>
+						<value>greyscale</value>
+						<value>mono</value>
+						<value>watermark</value>
+						<value>standard</value>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:color-inversion">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:luminance">
+					<ref name="zeroToHundredPercent"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:contrast">
+					<ref name="percent"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:gamma">
+					<ref name="percent"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:red">
+					<ref name="signedZeroToHundredPercent"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:green">
+					<ref name="signedZeroToHundredPercent"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:blue">
+					<ref name="signedZeroToHundredPercent"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:image-opacity">
+					<ref name="zeroToHundredPercent"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:shadow">
+					<choice>
+						<value>visible</value>
+						<value>hidden</value>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:shadow-offset-x">
+					<ref name="length"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:shadow-offset-y">
+					<ref name="length"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:shadow-color">
+					<ref name="color"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:shadow-opacity">
+					<ref name="zeroToHundredPercent"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:start-line-spacing-horizontal">
+					<ref name="distance"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:start-line-spacing-vertical">
+					<ref name="distance"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:end-line-spacing-horizontal">
+					<ref name="distance"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:end-line-spacing-vertical">
+					<ref name="distance"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:line-distance">
+					<ref name="distance"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:guide-overhang">
+					<ref name="length"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:guide-distance">
+					<ref name="distance"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:start-guide">
+					<ref name="length"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:end-guide">
+					<ref name="length"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:placing">
+					<choice>
+						<value>below</value>
+						<value>above</value>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:parallel">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:measure-align">
+					<choice>
+						<value>automatic</value>
+						<value>left-outside</value>
+						<value>inside</value>
+						<value>right-outside</value>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:measure-vertical-align">
+					<choice>
+						<value>automatic</value>
+						<value>above</value>
+						<value>below</value>
+						<value>center</value>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:unit">
+					<choice>
+						<value>automatic</value>
+						<value>mm</value>
+						<value>cm</value>
+						<value>m</value>
+						<value>km</value>
+						<value>pt</value>
+						<value>pc</value>
+						<value>inch</value>
+						<value>ft</value>
+						<value>mi</value>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:show-unit">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:decimal-places">
+					<ref name="nonNegativeInteger"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:caption-type">
+					<choice>
+						<value>straight-line</value>
+						<value>angled-line</value>
+						<value>angled-connector-line</value>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:caption-angle-type">
+					<choice>
+						<value>fixed</value>
+						<value>free</value>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:caption-angle">
+					<ref name="angle"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:caption-gap">
+					<ref name="distance"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:caption-escape-direction">
+					<choice>
+						<value>horizontal</value>
+						<value>vertical</value>
+						<value>auto</value>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:caption-escape">
+					<choice>
+						<ref name="length"/>
+						<ref name="percent"/>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:caption-line-length">
+					<ref name="length"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:caption-fit-line-length">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="dr3d:horizontal-segments">
+					<ref name="nonNegativeInteger"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="dr3d:vertical-segments">
+					<ref name="nonNegativeInteger"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="dr3d:edge-rounding">
+					<ref name="percent"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="dr3d:edge-rounding-mode">
+					<choice>
+						<value>correct</value>
+						<value>attractive</value>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="dr3d:back-scale">
+					<ref name="percent"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="dr3d:depth">
+					<ref name="length"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="dr3d:backface-culling">
+					<choice>
+						<value>enabled</value>
+						<value>disabled</value>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="dr3d:end-angle">
+					<ref name="angle"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="dr3d:close-front">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="dr3d:close-back">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="dr3d:lighting-mode">
+					<choice>
+						<value>standard</value>
+						<value>double-sided</value>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="dr3d:normals-kind">
+					<choice>
+						<value>object</value>
+						<value>flat</value>
+						<value>sphere</value>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="dr3d:normals-direction">
+					<choice>
+						<value>normal</value>
+						<value>inverse</value>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="dr3d:texture-generation-mode-x">
+					<choice>
+						<value>object</value>
+						<value>parallel</value>
+						<value>sphere</value>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="dr3d:texture-generation-mode-y">
+					<choice>
+						<value>object</value>
+						<value>parallel</value>
+						<value>sphere</value>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="dr3d:texture-kind">
+					<choice>
+						<value>luminance</value>
+						<value>intensity</value>
+						<value>color</value>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="dr3d:texture-filter">
+					<choice>
+						<value>enabled</value>
+						<value>disabled</value>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="dr3d:texture-mode">
+					<choice>
+						<value>replace</value>
+						<value>modulate</value>
+						<value>blend</value>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="dr3d:ambient-color">
+					<ref name="color"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="dr3d:emissive-color">
+					<ref name="color"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="dr3d:specular-color">
+					<ref name="color"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="dr3d:diffuse-color">
+					<ref name="color"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="dr3d:shininess">
+					<ref name="percent"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="dr3d:shadow">
+					<choice>
+						<value>visible</value>
+						<value>hidden</value>
+					</choice>
+				</attribute>
+			</optional>
+			<ref name="common-draw-rel-size-attlist"/>
+			<optional>
+				<attribute name="fo:min-width">
+					<choice>
+						<ref name="length"/>
+						<ref name="percent"/>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="fo:min-height">
+					<choice>
+						<ref name="length"/>
+						<ref name="percent"/>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="fo:max-height">
+					<choice>
+						<ref name="length"/>
+						<ref name="percent"/>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="fo:max-width">
+					<choice>
+						<ref name="length"/>
+						<ref name="percent"/>
+					</choice>
+				</attribute>
+			</optional>
+			<ref name="common-horizontal-margin-attlist"/>
+			<ref name="common-vertical-margin-attlist"/>
+			<ref name="common-margin-attlist"/>
+			<optional>
+				<attribute name="style:print-content">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:protect">
+					<choice>
+						<value>none</value>
+						<list>
+							<oneOrMore>
+								<choice>
+									<value>content</value>
+									<value>position</value>
+									<value>size</value>
+								</choice>
+							</oneOrMore>
+						</list>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:horizontal-pos">
+					<choice>
+						<value>left</value>
+						<value>center</value>
+						<value>right</value>
+						<value>from-left</value>
+						<value>inside</value>
+						<value>outside</value>
+						<value>from-inside</value>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="svg:x">
+					<ref name="coordinate"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:horizontal-rel">
+					<choice>
+						<value>page</value>
+						<value>page-content</value>
+						<value>page-start-margin</value>
+						<value>page-end-margin</value>
+						<value>frame</value>
+						<value>frame-content</value>
+						<value>frame-start-margin</value>
+						<value>frame-end-margin</value>
+						<value>paragraph</value>
+						<value>paragraph-content</value>
+						<value>paragraph-start-margin</value>
+						<value>paragraph-end-margin</value>
+						<value>char</value>
+					</choice>
+				</attribute>
+			</optional>
+			<ref name="common-vertical-pos-attlist"/>
+			<ref name="common-vertical-rel-attlist"/>
+			<ref name="common-text-anchor-attlist"/>
+			<ref name="common-border-attlist"/>
+			<ref name="common-border-line-width-attlist"/>
+			<ref name="common-padding-attlist"/>
+			<ref name="common-shadow-attlist"/>
+			<ref name="common-background-color-attlist"/>
+			<ref name="common-background-transparency-attlist"/>
+			<ref name="common-editable-attlist"/>
+			<optional>
+				<attribute name="style:wrap">
+					<choice>
+						<value>none</value>
+						<value>left</value>
+						<value>right</value>
+						<value>parallel</value>
+						<value>dynamic</value>
+						<value>run-through</value>
+						<value>biggest</value>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:wrap-dynamic-threshold">
+					<ref name="nonNegativeLength"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:number-wrapped-paragraphs">
+					<choice>
+						<value>no-limit</value>
+						<ref name="positiveInteger"/>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:wrap-contour">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:wrap-contour-mode">
+					<choice>
+						<value>full</value>
+						<value>outside</value>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:run-through">
+					<choice>
+						<value>foreground</value>
+						<value>background</value>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:flow-with-text">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:overflow-behavior">
+					<choice>
+						<value>clip</value>
+						<value>auto-create-new-frame</value>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:mirror">
+					<choice>
+						<value>none</value>
+						<value>vertical</value>
+						<ref name="horizontal-mirror"/>
+						<list>
+							<value>vertical</value>
+							<ref name="horizontal-mirror"/>
+						</list>
+						<list>
+							<ref name="horizontal-mirror"/>
+							<value>vertical</value>
+						</list>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="fo:clip">
+					<choice>
+						<value>auto</value>
+						<ref name="clipShape"/>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:wrap-influence-on-position">
+					<choice>
+						<value>iterative</value>
+						<value>once-concurrent</value>
+						<value>once-successive</value>
+					</choice>
+				</attribute>
+			</optional>
+			<ref name="common-writing-mode-attlist"/>
+			<optional>
+				<attribute name="draw:frame-display-scrollbar">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:frame-display-border">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:frame-margin-horizontal">
+					<ref name="nonNegativePixelLength"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:frame-margin-vertical">
+					<ref name="nonNegativePixelLength"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:visible-area-left">
+					<ref name="nonNegativeLength"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:visible-area-top">
+					<ref name="nonNegativeLength"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:visible-area-width">
+					<ref name="positiveLength"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:visible-area-height">
+					<ref name="positiveLength"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:draw-aspect">
+					<choice>
+						<value>content</value>
+						<value>thumbnail</value>
+						<value>icon</value>
+						<value>print-view</value>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:ole-draw-aspect">
+					<ref name="nonNegativeInteger"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="style-graphic-fill-properties-attlist">
+		<interleave>
+			<optional>
+				<attribute name="draw:fill">
+					<choice>
+						<value>none</value>
+						<value>solid</value>
+						<value>bitmap</value>
+						<value>gradient</value>
+						<value>hatch</value>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:fill-color">
+					<ref name="color"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:secondary-fill-color">
+					<ref name="color"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:fill-gradient-name">
+					<ref name="styleNameRef"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:gradient-step-count">
+					<ref name="nonNegativeInteger"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:fill-hatch-name">
+					<ref name="styleNameRef"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:fill-hatch-solid">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:fill-image-name">
+					<ref name="styleNameRef"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:repeat">
+					<choice>
+						<value>no-repeat</value>
+						<value>repeat</value>
+						<value>stretch</value>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:fill-image-width">
+					<choice>
+						<ref name="length"/>
+						<ref name="percent"/>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:fill-image-height">
+					<choice>
+						<ref name="length"/>
+						<ref name="percent"/>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:fill-image-ref-point-x">
+					<ref name="percent"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:fill-image-ref-point-y">
+					<ref name="percent"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:fill-image-ref-point">
+					<choice>
+						<value>top-left</value>
+						<value>top</value>
+						<value>top-right</value>
+						<value>left</value>
+						<value>center</value>
+						<value>right</value>
+						<value>bottom-left</value>
+						<value>bottom</value>
+						<value>bottom-right</value>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:tile-repeat-offset">
+					<list>
+						<ref name="zeroToHundredPercent"/>
+						<choice>
+							<value>horizontal</value>
+							<value>vertical</value>
+						</choice>
+					</list>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:opacity">
+					<ref name="zeroToHundredPercent"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:opacity-name">
+					<ref name="styleNameRef"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="svg:fill-rule">
+					<choice>
+						<value>nonzero</value>
+						<value>evenodd</value>
+					</choice>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="style-graphic-properties-elements">
+		<interleave>
+			<optional>
+				<ref name="text-list-style"/>
+			</optional>
+			<ref name="style-background-image"/>
+			<ref name="style-columns"/>
+		</interleave>
+	</define>
+	<define name="common-vertical-pos-attlist">
+		<optional>
+			<attribute name="style:vertical-pos">
+				<choice>
+					<value>top</value>
+					<value>middle</value>
+					<value>bottom</value>
+					<value>from-top</value>
+					<value>below</value>
+				</choice>
+			</attribute>
+		</optional>
+		<optional>
+			<attribute name="svg:y">
+				<ref name="coordinate"/>
+			</attribute>
+		</optional>
+	</define>
+	<define name="common-vertical-rel-attlist">
+		<optional>
+			<attribute name="style:vertical-rel">
+				<choice>
+					<value>page</value>
+					<value>page-content</value>
+					<value>frame</value>
+					<value>frame-content</value>
+					<value>paragraph</value>
+					<value>paragraph-content</value>
+					<value>char</value>
+					<value>line</value>
+					<value>baseline</value>
+					<value>text</value>
+				</choice>
+			</attribute>
+		</optional>
+	</define>
+	<define name="common-editable-attlist">
+		<optional>
+			<attribute name="style:editable">
+				<ref name="boolean"/>
+			</attribute>
+		</optional>
+	</define>
+	<define name="horizontal-mirror">
+		<choice>
+			<value>horizontal</value>
+			<value>horizontal-on-odd</value>
+			<value>horizontal-on-even</value>
+		</choice>
+	</define>
+	<define name="clipShape">
+		<data type="string">
+			<param name="pattern">rect\([ ]*((-?([0-9]+(\.[0-9]*)?|\.[0-9]+)((cm)|(mm)|(in)|(pt)|(pc)))|(auto))([ ]*,[ ]*((-?([0-9]+(\.[0-9]*)?|\.[0-9]+)((cm)|(mm)|(in)|(pt)|(pc))))|(auto)){3}[ ]*\)</param>
+		</data>
+	</define>
+	<define name="nonNegativePixelLength">
+		<data type="string">
+			<param name="pattern">([0-9]+(\.[0-9]*)?|\.[0-9]+)(px)</param>
+		</data>
+	</define>
+	<define name="style-chart-properties">
+		<element name="style:chart-properties">
+			<ref name="style-chart-properties-content-strict"/>
+		</element>
+	</define>
+	<define name="style-chart-properties-content-strict">
+		<ref name="style-chart-properties-attlist"/>
+		<ref name="style-chart-properties-elements"/>
+	</define>
+	<define name="style-chart-properties-elements">
+		<empty/>
+	</define>
+	<define name="style-chart-properties-attlist">
+		<interleave>
+			<optional>
+				<attribute name="chart:scale-text">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="chart:three-dimensional">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="chart:deep">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="chart:right-angled-axes">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<choice>
+				<attribute name="chart:symbol-type">
+					<value>none</value>
+				</attribute>
+				<attribute name="chart:symbol-type">
+					<value>automatic</value>
+				</attribute>
+				<group>
+					<attribute name="chart:symbol-type">
+						<value>named-symbol</value>
+					</attribute>
+					<attribute name="chart:symbol-name">
+						<choice>
+							<value>square</value>
+							<value>diamond</value>
+							<value>arrow-down</value>
+							<value>arrow-up</value>
+							<value>arrow-right</value>
+							<value>arrow-left</value>
+							<value>bow-tie</value>
+							<value>hourglass</value>
+							<value>circle</value>
+							<value>star</value>
+							<value>x</value>
+							<value>plus</value>
+							<value>asterisk</value>
+							<value>horizontal-bar</value>
+							<value>vertical-bar</value>
+						</choice>
+					</attribute>
+				</group>
+				<group>
+					<attribute name="chart:symbol-type">
+						<value>image</value>
+					</attribute>
+					<element name="chart:symbol-image">
+						<attribute name="xlink:href">
+							<ref name="anyIRI"/>
+						</attribute>
+					</element>
+				</group>
+				<empty/>
+			</choice>
+			<optional>
+				<attribute name="chart:symbol-width">
+					<ref name="nonNegativeLength"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="chart:symbol-height">
+					<ref name="nonNegativeLength"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="chart:sort-by-x-values">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="chart:vertical">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="chart:connect-bars">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="chart:gap-width">
+					<ref name="integer"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="chart:overlap">
+					<ref name="integer"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="chart:group-bars-per-axis">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="chart:japanese-candle-stick">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="chart:interpolation">
+					<choice>
+						<value>none</value>
+						<value>cubic-spline</value>
+						<value>b-spline</value>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="chart:spline-order">
+					<ref name="positiveInteger"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="chart:spline-resolution">
+					<ref name="positiveInteger"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="chart:pie-offset">
+					<ref name="nonNegativeInteger"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="chart:angle-offset">
+					<ref name="angle"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="chart:hole-size">
+					<ref name="percent"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="chart:lines">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="chart:solid-type">
+					<choice>
+						<value>cuboid</value>
+						<value>cylinder</value>
+						<value>cone</value>
+						<value>pyramid</value>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="chart:stacked">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="chart:percentage">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="chart:treat-empty-cells">
+					<choice>
+						<value>use-zero</value>
+						<value>leave-gap</value>
+						<value>ignore</value>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="chart:link-data-style-to-source">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="chart:logarithmic">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="chart:maximum">
+					<ref name="double"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="chart:minimum">
+					<ref name="double"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="chart:origin">
+					<ref name="double"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="chart:interval-major">
+					<ref name="double"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="chart:interval-minor-divisor">
+					<ref name="positiveInteger"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="chart:tick-marks-major-inner">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="chart:tick-marks-major-outer">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="chart:tick-marks-minor-inner">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="chart:tick-marks-minor-outer">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="chart:reverse-direction">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="chart:display-label">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="chart:text-overlap">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="text:line-break">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="chart:label-arrangement">
+					<choice>
+						<value>side-by-side</value>
+						<value>stagger-even</value>
+						<value>stagger-odd</value>
+					</choice>
+				</attribute>
+			</optional>
+			<ref name="common-style-direction-attlist"/>
+			<ref name="common-rotation-angle-attlist"/>
+			<optional>
+				<attribute name="chart:data-label-number">
+					<choice>
+						<value>none</value>
+						<value>value</value>
+						<value>percentage</value>
+						<value>value-and-percentage</value>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="chart:data-label-text">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="chart:data-label-symbol">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<element name="chart:label-separator">
+					<ref name="text-p"/>
+				</element>
+			</optional>
+			<optional>
+				<attribute name="chart:label-position">
+					<ref name="labelPositions"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="chart:label-position-negative">
+					<ref name="labelPositions"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="chart:visible">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="chart:auto-position">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="chart:auto-size">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="chart:mean-value">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="chart:error-category">
+					<choice>
+						<value>none</value>
+						<value>variance</value>
+						<value>standard-deviation</value>
+						<value>percentage</value>
+						<value>error-margin</value>
+						<value>constant</value>
+						<value>standard-error</value>
+						<value>cell-range</value>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="chart:error-percentage">
+					<ref name="double"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="chart:error-margin">
+					<ref name="double"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="chart:error-lower-limit">
+					<ref name="double"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="chart:error-upper-limit">
+					<ref name="double"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="chart:error-upper-indicator">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="chart:error-lower-indicator">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="chart:error-lower-range">
+					<ref name="cellRangeAddressList"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="chart:error-upper-range">
+					<ref name="cellRangeAddressList"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="chart:series-source">
+					<choice>
+						<value>columns</value>
+						<value>rows</value>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="chart:regression-type">
+					<choice>
+						<value>none</value>
+						<value>linear</value>
+						<value>logarithmic</value>
+						<value>exponential</value>
+						<value>power</value>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="chart:axis-position">
+					<choice>
+						<value>start</value>
+						<value>end</value>
+						<ref name="double"/>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="chart:axis-label-position">
+					<choice>
+						<value>near-axis</value>
+						<value>near-axis-other-side</value>
+						<value>outside-start</value>
+						<value>outside-end</value>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="chart:tick-mark-position">
+					<choice>
+						<value>at-labels</value>
+						<value>at-axis</value>
+						<value>at-labels-and-axis</value>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="chart:include-hidden-cells">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="labelPositions">
+		<choice>
+			<value>avoid-overlap</value>
+			<value>center</value>
+			<value>top</value>
+			<value>top-right</value>
+			<value>right</value>
+			<value>bottom-right</value>
+			<value>bottom</value>
+			<value>bottom-left</value>
+			<value>left</value>
+			<value>top-left</value>
+			<value>inside</value>
+			<value>outside</value>
+			<value>near-origin</value>
+		</choice>
+	</define>
+	<define name="style-drawing-page-properties-attlist">
+		<interleave>
+			<optional>
+				<attribute name="presentation:transition-type">
+					<choice>
+						<value>manual</value>
+						<value>automatic</value>
+						<value>semi-automatic</value>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="presentation:transition-style">
+					<choice>
+						<value>none</value>
+						<value>fade-from-left</value>
+						<value>fade-from-top</value>
+						<value>fade-from-right</value>
+						<value>fade-from-bottom</value>
+						<value>fade-from-upperleft</value>
+						<value>fade-from-upperright</value>
+						<value>fade-from-lowerleft</value>
+						<value>fade-from-lowerright</value>
+						<value>move-from-left</value>
+						<value>move-from-top</value>
+						<value>move-from-right</value>
+						<value>move-from-bottom</value>
+						<value>move-from-upperleft</value>
+						<value>move-from-upperright</value>
+						<value>move-from-lowerleft</value>
+						<value>move-from-lowerright</value>
+						<value>uncover-to-left</value>
+						<value>uncover-to-top</value>
+						<value>uncover-to-right</value>
+						<value>uncover-to-bottom</value>
+						<value>uncover-to-upperleft</value>
+						<value>uncover-to-upperright</value>
+						<value>uncover-to-lowerleft</value>
+						<value>uncover-to-lowerright</value>
+						<value>fade-to-center</value>
+						<value>fade-from-center</value>
+						<value>vertical-stripes</value>
+						<value>horizontal-stripes</value>
+						<value>clockwise</value>
+						<value>counterclockwise</value>
+						<value>open-vertical</value>
+						<value>open-horizontal</value>
+						<value>close-vertical</value>
+						<value>close-horizontal</value>
+						<value>wavyline-from-left</value>
+						<value>wavyline-from-top</value>
+						<value>wavyline-from-right</value>
+						<value>wavyline-from-bottom</value>
+						<value>spiralin-left</value>
+						<value>spiralin-right</value>
+						<value>spiralout-left</value>
+						<value>spiralout-right</value>
+						<value>roll-from-top</value>
+						<value>roll-from-left</value>
+						<value>roll-from-right</value>
+						<value>roll-from-bottom</value>
+						<value>stretch-from-left</value>
+						<value>stretch-from-top</value>
+						<value>stretch-from-right</value>
+						<value>stretch-from-bottom</value>
+						<value>vertical-lines</value>
+						<value>horizontal-lines</value>
+						<value>dissolve</value>
+						<value>random</value>
+						<value>vertical-checkerboard</value>
+						<value>horizontal-checkerboard</value>
+						<value>interlocking-horizontal-left</value>
+						<value>interlocking-horizontal-right</value>
+						<value>interlocking-vertical-top</value>
+						<value>interlocking-vertical-bottom</value>
+						<value>fly-away</value>
+						<value>open</value>
+						<value>close</value>
+						<value>melt</value>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="presentation:transition-speed">
+					<ref name="presentationSpeeds"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="smil:type">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="smil:subtype">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="smil:direction">
+					<choice>
+						<value>forward</value>
+						<value>reverse</value>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="smil:fadeColor">
+					<ref name="color"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="presentation:duration">
+					<ref name="duration"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="presentation:visibility">
+					<choice>
+						<value>visible</value>
+						<value>hidden</value>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="draw:background-size">
+					<choice>
+						<value>full</value>
+						<value>border</value>
+					</choice>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="presentation:background-objects-visible">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="presentation:background-visible">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="presentation:display-header">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="presentation:display-footer">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="presentation:display-page-number">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="presentation:display-date-time">
+					<ref name="boolean"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="style-drawing-page-properties-elements">
+		<optional>
+			<ref name="presentation-sound"/>
+		</optional>
+	</define>
+	<define name="string">
+		<data type="string"/>
+	</define>
+	<define name="date">
+		<data type="date"/>
+	</define>
+	<define name="time">
+		<data type="time"/>
+	</define>
+	<define name="dateTime">
+		<data type="dateTime"/>
+	</define>
+	<define name="duration">
+		<data type="duration"/>
+	</define>
+	<define name="integer">
+		<data type="integer"/>
+	</define>
+	<define name="nonNegativeInteger">
+		<data type="nonNegativeInteger"/>
+	</define>
+	<define name="positiveInteger">
+		<data type="positiveInteger"/>
+	</define>
+	<define name="double">
+		<data type="double"/>
+	</define>
+	<define name="anyURI">
+		<data type="anyURI"/>
+	</define>
+	<define name="base64Binary">
+		<data type="base64Binary"/>
+	</define>
+	<define name="ID">
+		<data type="ID"/>
+	</define>
+	<define name="IDREF">
+		<data type="IDREF"/>
+	</define>
+	<define name="IDREFS">
+		<data type="IDREFS"/>
+	</define>
+	<define name="NCName">
+		<data type="NCName"/>
+	</define>
+	<define name="boolean">
+		<choice>
+			<value>true</value>
+			<value>false</value>
+		</choice>
+	</define>
+	<define name="dateOrDateTime">
+		<choice>
+			<data type="date"/>
+			<data type="dateTime"/>
+		</choice>
+	</define>
+	<define name="timeOrDateTime">
+		<choice>
+			<data type="time"/>
+			<data type="dateTime"/>
+		</choice>
+	</define>
+	<define name="language">
+		<data type="language"/>
+	</define>
+	<define name="countryCode">
+		<data type="token">
+			<param name="pattern">[A-Za-z0-9]{1,8}</param>
+		</data>
+	</define>
+	<define name="languageCode">
+		<data type="token">
+			<param name="pattern">[A-Za-z]{1,8}</param>
+		</data>
+	</define>
+	<define name="scriptCode">
+		<data type="token">
+			<param name="pattern">[A-Za-z0-9]{1,8}</param>
+		</data>
+	</define>
+	<define name="character">
+		<data type="string">
+			<param name="length">1</param>
+		</data>
+	</define>
+	<define name="length">
+		<data type="string">
+			<param name="pattern">-?([0-9]+(\.[0-9]*)?|\.[0-9]+)((cm)|(mm)|(in)|(pt)|(pc)|(px))</param>
+		</data>
+	</define>
+	<define name="nonNegativeLength">
+		<data type="string">
+			<param name="pattern">([0-9]+(\.[0-9]*)?|\.[0-9]+)((cm)|(mm)|(in)|(pt)|(pc)|(px))</param>
+		</data>
+	</define>
+	<define name="positiveLength">
+		<data type="string">
+			<param name="pattern">([0-9]*[1-9][0-9]*(\.[0-9]*)?|0+\.[0-9]*[1-9][0-9]*|\.[0-9]*[1-9][0-9]*)((cm)|(mm)|(in)|(pt)|(pc)|(px))</param>
+		</data>
+	</define>
+	<define name="percent">
+		<data type="string">
+			<param name="pattern">-?([0-9]+(\.[0-9]*)?|\.[0-9]+)%</param>
+		</data>
+	</define>
+	<define name="zeroToHundredPercent">
+		<data type="string">
+			<param name="pattern">([0-9]?[0-9](\.[0-9]*)?|100(\.0*)?|\.[0-9]+)%</param>
+		</data>
+	</define>
+	<define name="signedZeroToHundredPercent">
+		<data type="string">
+			<param name="pattern">-?([0-9]?[0-9](\.[0-9]*)?|100(\.0*)?|\.[0-9]+)%</param>
+		</data>
+	</define>
+	<define name="relativeLength">
+		<data type="string">
+			<param name="pattern">[0-9]+\*</param>
+		</data>
+	</define>
+	<define name="coordinate">
+		<ref name="length"/>
+	</define>
+	<define name="distance">
+		<ref name="length"/>
+	</define>
+	<define name="color">
+		<data type="string">
+			<param name="pattern">#[0-9a-fA-F]{6}</param>
+		</data>
+	</define>
+	<define name="angle">
+		<data type="string"/>
+	</define>
+	<define name="CURIE">
+		<data type="string">
+			<param name="pattern">(([\i-[:]][\c-[:]]*)?:)?.+</param>
+			<param name="minLength">1</param>
+		</data>
+	</define>
+	<define name="CURIEs">
+		<list>
+			<oneOrMore>
+				<ref name="CURIE"/>
+			</oneOrMore>
+		</list>
+	</define>
+	<define name="SafeCURIE">
+		<data type="string">
+			<param name="pattern">\[(([\i-[:]][\c-[:]]*)?:)?.+\]</param>
+			<param name="minLength">3</param>
+		</data>
+	</define>
+	<define name="URIorSafeCURIE">
+		<choice>
+			<ref name="anyURI"/>
+			<ref name="SafeCURIE"/>
+		</choice>
+	</define>
+	<define name="styleName">
+		<data type="NCName"/>
+	</define>
+	<define name="styleNameRef">
+		<choice>
+			<data type="NCName"/>
+			<empty/>
+		</choice>
+	</define>
+	<define name="styleNameRefs">
+		<list>
+			<zeroOrMore>
+				<data type="NCName"/>
+			</zeroOrMore>
+		</list>
+	</define>
+	<define name="variableName">
+		<data type="string"/>
+	</define>
+	<define name="targetFrameName">
+		<choice>
+			<value>_self</value>
+			<value>_blank</value>
+			<value>_parent</value>
+			<value>_top</value>
+			<ref name="string"/>
+		</choice>
+	</define>
+	<define name="valueType">
+		<choice>
+			<value>float</value>
+			<value>time</value>
+			<value>date</value>
+			<value>percentage</value>
+			<value>currency</value>
+			<value>boolean</value>
+			<value>string</value>
+		</choice>
+	</define>
+	<define name="points">
+		<data type="string">
+			<param name="pattern">-?[0-9]+,-?[0-9]+([ ]+-?[0-9]+,-?[0-9]+)*</param>
+		</data>
+	</define>
+	<define name="pathData">
+		<data type="string"/>
+	</define>
+	<define name="vector3D">
+		<data type="string">
+			<param name="pattern">\([ ]*-?([0-9]+(\.[0-9]*)?|\.[0-9]+)([ ]+-?([0-9]+(\.[0-9]*)?|\.[0-9]+)){2}[ ]*\)</param>
+		</data>
+	</define>
+	<define name="namespacedToken">
+		<data type="QName">
+			<param name="pattern">[^:]+:[^:]+</param>
+		</data>
+	</define>
+	<define name="anyIRI">
+		<data type="anyURI"/>
+		<dc:description>An IRI-reference as defined in [RFC3987]. See ODF 1.2 Part 1 section 18.3.</dc:description> 
+	</define>
+	<define name="anyAttListOrElements">
+		<zeroOrMore>
+			<attribute>
+				<anyName/>
+				<text/>
+			</attribute>
+		</zeroOrMore>
+		<ref name="anyElements"/>
+	</define>
+	<define name="anyElements">
+		<zeroOrMore>
+			<element>
+				<anyName/>
+				<mixed>
+					<ref name="anyAttListOrElements"/>
+				</mixed>
+			</element>
+		</zeroOrMore>
+	</define>
+</grammar>
diff --git a/apps/files_odfviewer/src/webodf/programs/docnosis/application-vnd.oasis.opendocument.presentation.png b/apps/files_odfviewer/src/webodf/programs/docnosis/application-vnd.oasis.opendocument.presentation.png
new file mode 100644
index 0000000000000000000000000000000000000000..1d0fdc08af2f32c16e879686b7da19353b0bca24
GIT binary patch
literal 6617
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%0Awyy
zzd+9h7hila1B2QIGZ5>~8|M%tqkJnT(9?Sa*(usA1Tum~uYCP7Zhfu3Pc*-2(<Vmm
z`chtA4nO_$6LacDjT*&zvHHYrBkRz^oTpEp&P;;dFQ7u-Azy;P)3<M5b{(U_)nirh
zdgU9>TPZmaV0bbUXf`3lE)QUQYKECPp!M~75a>anI(RiTHLz>fF4(qhTim3{qeqW2
zMO}I2mC&zWKXyGkzl2`5Y10O#PMykphdq1tu-_;uD$=fb;J^V`wQ3a<7Z*d9E?pR_
z5L4(CY{mk5`|YIX+cE%M6FklUb^{(p$~XJI-2{!iygb%JiMr1|`)q9k2bNV-Hfjh4
zgG`)0YiG=uG0b!j0L-qNo14q7tAeV&Vq`2c#!DmtWE>9mY!smHv2^nr3WE9^Lv<F9
zep#0rg%nHIbmO{q>D@$>uY$)2VozlP!Qy!VDrKu6urdcmo7`A=f^_Eg6IH%lD%dlb
zK&yozjl~4bLHTA=!qUP3P9}w_if?Wpa8voJ3Gj9z$RY|*H#Sn8rRD$vx0P?T^E&6X
z;b1%OS9M}kC1$EmkP79i=i(TE^YC!6KE^hJAXAwjmC83OK2I$Ssb@lnzOk9e1gTWM
zek`EL3<v8?fWFsfA`_%q`FbbNyFNfYPN2HLQqb*`WlWtW!USfi<8*?+Y67R(u@ykf
z7MH5PFq(lTH5_d0^=i*IGJ(nhcDst`-;1Zh^njqTlyAiVo*oW1`T>~+g2q(7<=#t@
zhlhjpjWklfO8<I0r}_bU5Y%T5%s$r`AV`Js&3phoAoQz)($4@6GJ!PjF4KzMZ%OYT
z@sJN-RyJ?mY}p(1{()UjX~_4iW(!$e*J@Ueelmx8-gwUHygu<|{CuJ_ip<U@5_x%o
z0X)@HGPFqP0zhgu3Cfmq=^>ESf0hB97J6D^Yvakc?i!};U8gRekEu=0sau_i^?Z(b
z$PTU>bL|BFlj>D#8%#j#vFdUAOy1Lfh6CfZxVUR3@;j!VGhD+)Hz{X;pRnp}6%KN4
zdnxW;ER%cxPfoAZklDrCvnudx+1?loumG!(kTFko%$Pz}azV-&V9EEw7DU0r?0GI`
zkFCl|I)rrbFw>1w<J!<2K7V_bpZtK?C}*K`F>?&FC8dQNzFjEvgv|v@w+ml3<RbqM
XQNJo$)Gw_d00000NkvXXu0mjfFS<TW

literal 0
HcmV?d00001

diff --git a/apps/files_odfviewer/src/webodf/programs/docnosis/application-vnd.oasis.opendocument.spreadsheet.png b/apps/files_odfviewer/src/webodf/programs/docnosis/application-vnd.oasis.opendocument.spreadsheet.png
new file mode 100644
index 0000000000000000000000000000000000000000..9614ca81d6af07ef50296a491708e7f1bdcea202
GIT binary patch
literal 7002
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

literal 0
HcmV?d00001

diff --git a/apps/files_odfviewer/src/webodf/programs/docnosis/application-vnd.oasis.opendocument.text.png b/apps/files_odfviewer/src/webodf/programs/docnosis/application-vnd.oasis.opendocument.text.png
new file mode 100644
index 0000000000000000000000000000000000000000..3fa71f4dc140eef6005415d37557c973c8b61503
GIT binary patch
literal 6723
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
Z{{bYFzUPlgdp!UE002ovPDHLkV1g%jzAFF#

literal 0
HcmV?d00001

diff --git a/apps/files_odfviewer/src/webodf/programs/docnosis/docnosis.js b/apps/files_odfviewer/src/webodf/programs/docnosis/docnosis.js
new file mode 100644
index 0000000000..4bddc12cc2
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/programs/docnosis/docnosis.js
@@ -0,0 +1,779 @@
+/*global runtime, Node, window, DOMParser, core, xmldom, NodeFilter, alert,
+   FileReader*/
+runtime.loadClass("core.Zip");
+runtime.loadClass("core.Base64");
+runtime.loadClass("xmldom.RelaxNG");
+
+/** This code runs a number of tests on an ODF document.
+ * Ideally, it would use ODFContainer, but for now, it uses a custome container
+ * for loaded odf files.
+ */
+
+function conformsToPattern(object, pattern, name) {
+    "use strict";
+    var i;
+    if (object === undefined || object === null) {
+        return pattern === null || (typeof pattern) !== "object";
+    }
+    for (i in pattern) {
+        if (pattern.hasOwnProperty(i)) {
+            if (!(object.hasOwnProperty(i) ||
+                        (i === "length" && object.length)) ||
+                    !conformsToPattern(object[i], pattern[i], i)) {
+                return false;
+            }
+        }
+    }
+    return true;
+}
+
+function getConformingObjects(object, pattern, name) {
+    "use strict";
+    var c = [], i, j;
+    name = name || "??";
+    // we do not look inside long arrays and strings atm,
+    // detection of these types could be better
+    function accept(object) {
+        return object !== null && object !== undefined &&
+            (typeof object) === "object" &&
+            (object.length === undefined || object.length < 1000) &&
+            !(object instanceof Node) &&
+            !(object.constructor && object.constructor === window.Uint8Array);
+    }
+    for (i in object) {
+        if (object.hasOwnProperty(i) && accept(object[i])) {
+            c = c.concat(getConformingObjects(object[i], pattern, i));
+        }
+    }
+    if (conformsToPattern(object, pattern, "?")) {
+        c.push(object);
+    }
+    return c;
+}
+function parseXml(data, errorlog, name) {
+    "use strict";
+    function getText(e) {
+        var str = "", c = e.firstChild;
+        while (c) {
+            if (c.nodeType === 3) {
+                str += c.nodeValue;
+            } else {
+                str += getText(c);
+            }
+            c = c.nextSibling;
+        }
+        return str;
+    }
+    var str, parser, errorelements;
+    try {
+        str = runtime.byteArrayToString(data, "utf8");
+        parser = new DOMParser();
+        str = parser.parseFromString(str, "text/xml");
+        if (str.documentElement.localName === "parsererror"
+                || str.documentElement.localName === "html") {
+            errorelements = str.getElementsByTagName("parsererror");
+            if (errorelements.length > 0) {
+                errorlog.push("invalid XML in " + name + ": " +
+                    getText(errorelements[0]));
+                str = null;
+            }
+        }
+    } catch (err) {
+        errorlog.push(err);
+    }
+    return str;
+}
+
+/*** the jobs / tests ***/
+
+function ParseXMLJob() {
+    "use strict";
+    this.inputpattern = { file: { entries: [] } };
+    this.outputpattern  = {
+        file: { entries: [] },
+        errors: { parseXmlErrors: [] },
+        content_xml: null,
+        manifest_xml: null,
+        settings_xml: null,
+        meta_xml: null,
+        styles_xml: null
+    };
+    function parseXmlFiles(input, position, callback) {
+        var e = input.file.entries,
+            filename,
+            ext,
+            dom;
+        if (position >= e.length) {
+            return callback();
+        }
+        filename = e[position].filename;
+        ext = filename.substring(filename.length - 4);
+        if (ext === ".xml" || ext === ".rdf") {
+            dom = parseXml(e[position].data, input.errors.parseXmlErrors,
+                    filename);
+            if (filename === "content.xml") {
+                input.content_xml = dom;
+            } else if (filename === "META-INF/manifest.xml") {
+                input.manifest_xml = dom;
+            } else if (filename === "styles.xml") {
+                input.styles_xml = dom;
+            } else if (filename === "meta.xml") {
+                input.meta_xml = dom;
+            } else if (filename === "settings.xml") {
+                input.settings_xml = dom;
+            }
+            e[position].dom = dom;
+        }
+        window.setTimeout(function () {
+            parseXmlFiles(input, position + 1, callback);
+        }, 0);
+    }
+    this.run = function (input, callback) {
+        input.errors = input.errors || {};
+        input.errors.parseXmlErrors = [];
+        input.content_xml = null;
+        input.manifest_xml = null;
+        input.styles_xml = null;
+        input.meta_xml = null;
+        input.settings_xml = null;
+        parseXmlFiles(input, 0, callback);
+    };
+}
+function UnpackJob() {
+    "use strict";
+    this.inputpattern = { file: { path: "", data: { length: 0 } } };
+    this.outputpattern  = {
+        file: { entries: [], dom: null }, errors: { unpackErrors: [] }
+    };
+    function getText(e) {
+        var str = "", c = e.firstChild;
+        while (c) {
+            if (c.nodeType === 3) {
+                str += c.nodeValue;
+            } else {
+                str += getText(c);
+            }
+            c = c.nextSibling;
+        }
+        return str;
+    }
+    function loadZipEntries(input, position, callback) {
+        if (position >= input.file.entries.length) {
+            return callback();
+        }
+        var e = input.file.entries[position];
+        e.load(function (err, data) {
+            if (err) {
+                input.errors.unpackErrors.push(err);
+            }
+            e.error = err;
+            e.data = data;
+            window.setTimeout(function () {
+                loadZipEntries(input, position + 1, callback);
+            }, 0);
+        });
+    }
+    function loadZip(input, callback) {
+        var zip = new core.Zip(input.file.path, function (err, zip) {
+            var i;
+            if (err) {
+                input.errors.unpackErrors.push(err);
+                callback();
+            } else {
+                input.file.entries = zip.getEntries();
+                loadZipEntries(input, 0, callback);
+            }
+        });
+    }
+    function loadXml(input, callback) {
+        input.file.dom = parseXml(input.file.data, input.errors.unpackErrors,
+                input.file.name);
+        callback();
+    }
+    this.run = function (input, callback) {
+        input.errors = input.errors || {};
+        input.errors.unpackErrors = [];
+        input.file.dom = null;
+        input.file.entries = [];
+
+        if (input.file.data.length < 1) {
+            input.errors.unpackErrors.push("Input data is empty.");
+            return;
+        }
+        if (input.file.data[0] === 80) { // a ZIP file starts with 'P'
+            loadZip(input, callback);
+        } else {
+            loadXml(input, callback);
+        }
+    };
+}
+function MimetypeTestJob(odffile) {
+    "use strict";
+    this.inputpattern = {
+        file: { entries: [], dom: null },
+        manifest_xml: null
+    };
+    this.outputpattern = { mimetype: "", errors: { mimetypeErrors: [] } };
+    var manifestns = "urn:oasis:names:tc:opendocument:xmlns:manifest:1.0";
+    function getManifestMimetype(manifest) {
+        if (!manifest) {
+            return null;
+        }
+        var path, mimetype, node;
+        node = manifest.documentElement.firstChild;
+        while (node) {
+            if (node.nodeType === 1 && node.localName === "file-entry" &&
+                    node.namespaceURI === manifestns) {
+                path = node.getAttributeNS(manifestns, "full-path");
+                if (path === "/") {
+                    mimetype = node.getAttributeNS(manifestns, "media-type");
+                    break;
+                }
+            }
+            node = node.nextSibling;
+        }
+        return mimetype;
+    }
+    this.run = function (input, callback) {
+        input.mimetype = null;
+        input.errors.mimetypeErrors = [];
+        var mime = null,
+            altmime,
+            e = input.file.entries,
+            i;
+        if (input.file.dom) {
+            mime = input.file.dom.documentElement.getAttributeNS(
+                "urn:oasis:names:tc:opendocument:xmlns:office:1.0", "mimetype");
+        } else {
+            if (e.length < 1 || e[0].filename !== "mimetype") {
+                input.errors.mimetypeErrors.push(
+                        "First file in zip is not 'mimetype'");
+            }
+            for (i = 0; i < e.length; i += 1) {
+                if (e[i].filename === "mimetype") {
+                    mime = runtime.byteArrayToString(e[i].data, "binary");
+                    break;
+                }
+            }
+            if (mime) {
+                altmime = input.file.data.slice(38, 38 + mime.length);
+                altmime = runtime.byteArrayToString(altmime, "binary");
+                if (mime !== altmime) {
+                    input.errors.mimetypeErrors.push(
+                           "mimetype should start at byte 38 in the zip file.");
+                }
+            }
+            // compare with mimetype from manifest_xml
+            altmime = getManifestMimetype(input.manifest_xml);
+            if (altmime !== mime) {
+                input.errors.mimetypeErrors.push(
+                    "manifest.xml has a different mimetype.");
+            }
+        }
+        if (!mime) {
+            input.errors.mimetypeErrors.push("No mimetype was found.");
+        }
+        input.mimetype = mime;
+        callback();
+    };
+}
+function VersionTestJob() {
+    "use strict";
+    this.inputpattern = {
+        file: { dom: null },
+        content_xml: null,
+        styles_xml: null,
+        meta_xml: null,
+        settings_xml: null,
+        manifest_xml: null
+    };
+    this.outputpattern = { version: "", errors: { versionErrors: [] } };
+    var officens = "urn:oasis:names:tc:opendocument:xmlns:office:1.0";
+    function getVersion(dom, filename, log, vinfo, filerequired) {
+        var v, ns = officens;
+        if (!dom) {
+            if (filerequired) {
+                log.push(filename + " is missing, so version cannot be found.");
+            }
+            return;
+        }
+        if (filename === "META-INF/manifest.xml") {
+            ns = "urn:oasis:names:tc:opendocument:xmlns:manifest:1.0";
+        }
+        if (!dom.documentElement.hasAttributeNS(ns, "version")) {
+            if (vinfo.versionrequired) {
+                log.push(filename + " has no version number.");
+            }
+            return;
+        }
+        v = dom.documentElement.getAttributeNS(ns, "version");
+        if (vinfo.version === undefined) {
+            vinfo.version = v;
+            // version number is required since ODF 1.2
+            vinfo.needversion = vinfo.version === "1.2";
+            vinfo.versionSource = filename;
+        } else if (v !== vinfo.version) {
+            log.push(vinfo.versionSource + " and " + filename + " " +
+                    " have  different version number.");
+        }
+    }
+    this.run = function (input, callback) {
+        input.errors.versionErrors = [];
+        var v,
+            e = input.file.entries,
+            log = input.errors.versionErrors,
+            vinfo = {
+                version: undefined,
+                needversion: null,
+                versionSource: null
+            },
+            contentxmlhasnoversionnumber;
+        if (input.file.dom) {
+            getVersion(input.file.dom, input.file.name, log, vinfo, true);
+        } else {
+            // until we know the version number, we cannot claim that
+            // content.xml needs a version number
+            getVersion(input.content_xml, "content.xml", log, vinfo, true);
+            contentxmlhasnoversionnumber = vinfo.version === undefined;
+            getVersion(input.manifest_xml, "META-INF/manifest.xml", log,
+                    vinfo, true);
+            getVersion(input.styles_xml, "styles.xml", log, vinfo);
+            getVersion(input.meta_xml, "meta.xml", log, vinfo);
+            getVersion(input.settings_xml, "settings.xml", log, vinfo);
+            if (vinfo.needversion && contentxmlhasnoversionnumber) {
+                log.push("content.xml has no version number.");
+            }
+        }
+        input.version = vinfo.version;
+        callback();
+    };
+}
+function GetThumbnailJob() {
+    "use strict";
+    var base64 = new core.Base64();
+    this.inputpattern = { file: { entries: [] }, errors: {}, mimetype: "" };
+    this.outputpattern = { thumbnail: "", errors: { thumbnailErrors: [] } };
+    this.run = function (input, callback) {
+        input.thumbnail = null;
+        input.errors.thumbnailErrors = [];
+        var i, e = input.file.entries, mime = input.mimetype, thumb = null;
+        if (mime === "application/vnd.oasis.opendocument.text") {
+            thumb = "application-vnd.oasis.opendocument.text.png";
+        } else if (mime === "application/vnd.oasis.opendocument.spreadsheet") {
+            thumb = "application-vnd.oasis.opendocument.spreadsheet.png";
+        } else if (mime === "application/vnd.oasis.opendocument.presentation") {
+            thumb = "application-vnd.oasis.opendocument.presentation.png";
+        }
+        for (i = 0; i < e.length; i += 1) {
+            if (e[i].filename === "Thumbnails/thumbnail.png") {
+                thumb = "data:image/png;base64," +
+                        base64.convertUTF8ArrayToBase64(e[i].data);
+                break;
+            }
+        }
+        input.thumbnail = thumb;
+        callback();
+    };
+}
+function RelaxNGJob() {
+    "use strict";
+    var parser = new xmldom.RelaxNGParser(),
+        validators = {};
+    this.inputpattern = { file: {dom: null}, version: null };
+    this.outputpattern = { errors: { relaxngErrors: [] } };
+    function loadValidator(ns, version, callback) {
+        var rng;
+        if (ns === "urn:oasis:names:tc:opendocument:xmlns:manifest:1.0") {
+            if (version === "1.2") {
+                rng = "OpenDocument-v1.2-cos01-manifest-schema.rng";
+            } else if (version === "1.1") {
+                rng = "OpenDocument-manifest-schema-v1.1.rng";
+            } else if (version === "1.0") {
+                rng = "OpenDocument-manifest-schema-v1.0-os.rng";
+            }
+        } else if (ns === "urn:oasis:names:tc:opendocument:xmlns:office:1.0") {
+            if (version === "1.2") {
+                rng = "OpenDocument-v1.2-cos01-schema.rng";
+            } else if (version === "1.1") {
+                rng = "OpenDocument-schema-v1.1.rng";
+            } else if (version === "1.0") {
+                rng = "OpenDocument-schema-v1.0-os.rng";
+            }
+        }
+        if (rng) {
+            runtime.loadXML(rng, function (err, dom) {
+                var relaxng;
+                if (err) {
+                    runtime.log(err);
+                } else {
+                    relaxng = new xmldom.RelaxNG();
+                    err = parser.parseRelaxNGDOM(dom, relaxng.makePattern);
+                    if (err) {
+                        runtime.log(err);
+                    } else {
+                        relaxng.init(parser.rootPattern);
+                    }
+                }
+                validators[ns] = validators[ns] || {};
+                validators[ns][version] = relaxng;
+                callback(relaxng);
+            });
+        } else {
+            callback(null);
+        }
+    }
+    function getValidator(ns, version, callback) {
+        if (ns === "urn:oasis:names:tc:opendocument:xmlns:office:1.0" ||
+                ns === "urn:oasis:names:tc:opendocument:xmlns:manifest:1.0") {
+            if (!version) {
+                version = "1.1";
+            }
+        }
+        if (validators[ns] && validators[ns][version]) {
+            return callback(validators[ns][version]);
+        }
+        loadValidator(ns, version, callback);
+    }
+    function validate(log, dom, filename, version, callback) {
+        var ns = dom.documentElement.namespaceURI;
+        getValidator(ns, version, function (relaxng) {
+            if (!relaxng) {
+                return callback();
+            }
+            var walker = dom.createTreeWalker(dom.firstChild, 0xFFFFFFFF,
+                    { acceptNode: function(node) {
+                        return NodeFilter.FILTER_ACCEPT; }
+                    }, false),
+                err;
+runtime.log("START VALIDATING");
+            err = relaxng.validate(walker, function (err) {
+runtime.log("FINISHED VALIDATING");
+                var i;
+                if (err) {
+                    for (i = 0; i < err.length; i += 1) {
+                        log.push(filename + ": " + err[i]);
+                    }
+                }
+                callback();
+            });
+        });
+    }
+    function validateEntries(log, entries, position, version, callback) {
+        if (position >= entries.length) {
+            return callback();
+        }
+        var e = entries[position];
+        if (e.dom) {
+            validate(log, e.dom, e.filename, version, function () {
+                window.setTimeout(function () {
+                    validateEntries(log, entries, position + 1, version,
+                            callback);
+                }, 0);
+            });
+        } else {
+            validateEntries(log, entries, position + 1, version, callback);
+        }
+    }
+    this.run = function (input, callback) {
+        input.errors = input.errors || {};
+        input.errors.relaxngErrors = [];
+        runtime.log(input.version);
+        if (input.file.dom) {
+            validate(input.errors.relaxngErrors, input.file.dom,
+                input.file.path, input.version, callback);
+            return;
+        }
+        var i, e = input.file.entries;
+        validateEntries(input.errors.relaxngErrors, input.file.entries, 0,
+            input.version, callback);
+    };
+}
+
+function DataRenderer(parentelement) {
+    "use strict";
+    var doc = parentelement.ownerDocument,
+        element = doc.createElement("div"),
+        lastrendertime,
+        delayedRenderComing,
+        renderinterval = 300; // minimal milliseconds between renders
+    function clear(element) {
+        while (element.firstChild) {
+            element.removeChild(element.firstChild);
+        }
+    }
+    function addParagraph(div, text) {
+        var p = doc.createElement("p");
+        p.appendChild(doc.createTextNode(text));
+        div.appendChild(p);
+    }
+    function addSpan(parent, nodename, text) {
+        var e = doc.createElement(nodename);
+        e.appendChild(doc.createTextNode(text));
+        parent.appendChild(e);
+    }
+    function addErrors(div, e, active) {
+        var i, o;
+        for (i in e) {
+            if (e.hasOwnProperty(i)) {
+                o = e[i];
+                if (active && ((typeof o) === "string"
+                        || o instanceof String)) {
+                    addParagraph(div, o);
+                } else if (o && (typeof o) === "object" &&
+                        !(o instanceof Node) &&
+                        !(o.constructor &&
+                          o.constructor === window.Uint8Array)) {
+                    addErrors(div, o, active || i === "errors");
+                }
+            }
+        }
+    }
+    function renderFile(data) {
+        var div = doc.createElement("div"),
+            h1 = doc.createElement("h1"),
+            icon = doc.createElement("img");
+        div.style.clear = "both";
+        div.appendChild(h1);
+        div.appendChild(icon);
+        h1.appendChild(doc.createTextNode(data.file.path));
+        element.appendChild(div);
+        if (data.thumbnail) {
+            icon.src = data.thumbnail;
+        }
+        icon.style.width = "128px";
+        icon.style.float = "left";
+        icon.style.mozBoxShadow = icon.style.webkitBoxShadow =
+                icon.style.boxShadow = "3px 3px 4px #000";
+        icon.style.marginRight = icon.style.marginBottom = "10px";
+        addParagraph(div, "mimetype: " + data.mimetype);
+        addParagraph(div, "version: " + data.version);
+        addParagraph(div, "document representation: " +
+                ((data.file.dom) ? "single XML document" :"package"));
+        addErrors(div, data, false);
+    }
+    function dorender(data) {
+        clear(element);
+        var i;
+        for (i = 0; i < data.length; i += 1) {
+            renderFile(data[i]);
+        }
+    }
+    this.render = function render(data) {
+        var now = Date.now();
+        if (!lastrendertime || now - lastrendertime > renderinterval) {
+            lastrendertime = now;
+            dorender(data);
+        } else if (!delayedRenderComing) {
+            delayedRenderComing = true;
+            window.setTimeout(function () {
+                delayedRenderComing = false;
+                lastrendertime = now + renderinterval;
+                dorender(data);
+            }, renderinterval);
+        }
+    };
+    parentelement.appendChild(element);
+}
+
+function JobRunner(datarenderer) {
+    "use strict";
+    var jobrunner = this,
+        jobtypes = [],
+        data,
+        busy = false,
+        todo = [];
+        
+    jobtypes.push(new UnpackJob());
+    jobtypes.push(new MimetypeTestJob());
+    jobtypes.push(new GetThumbnailJob());
+    jobtypes.push(new VersionTestJob());
+    jobtypes.push(new ParseXMLJob());
+    jobtypes.push(new RelaxNGJob());
+
+    function run() {
+        if (busy) {
+           return;
+        }
+        var job = todo.shift();
+        if (job) {
+            busy = true;
+            job.job.run(job.object, function () {
+                busy = false;
+                if (!conformsToPattern(job.object, job.job.outputpattern)) {
+                    throw "Job does not give correct output.";
+                }
+                datarenderer.render(data);
+                window.setTimeout(run, 0);
+            });
+        }
+    }
+
+    function update(ignore, callback) {
+        var i, jobtype, j, inobjects, outobjects;
+        todo = [];
+        for (i = 0; i < jobtypes.length; i += 1) {
+            jobtype = jobtypes[i];
+            inobjects = getConformingObjects(data, jobtype.inputpattern);
+            outobjects = getConformingObjects(data, jobtype.outputpattern);
+            for (j = 0; j < inobjects.length; j += 1) {
+                if (outobjects.indexOf(inobjects[j]) === -1) {
+                    todo.push({job: jobtype, object: inobjects[j]});
+                }
+            }
+        }
+        if (todo.length > 0) {
+            // run update again after all todos are done
+            todo.push({job: jobrunner, object: null});
+        }
+        if (callback) {
+            callback();
+        } else {
+            run();
+        }
+    }
+
+    this.run = update;
+
+    this.setData = function setData(newdata) {
+        data = newdata;
+        if (busy) {
+            todo = [];
+            todo.push({job: jobrunner, object: null});
+        } else {
+            update();
+        }
+    };
+}
+function LoadingFile(file) {
+    "use strict";
+    var data,
+        error,
+        readRequests = [];
+    function load(callback) {
+        var reader = new FileReader();
+        reader.onloadend = function(evt) {
+            data = runtime.byteArrayFromString(evt.target.result, "binary");
+            error = evt.target.error && String(evt.target.error);
+            var i = 0;
+            for (i = 0; i < readRequests.length; i += 1) {
+                readRequests[i]();
+            }
+            readRequests = undefined;
+            reader = undefined;
+            callback(error, data);
+        };
+        reader.readAsBinaryString(file);
+    }
+    this.file = file;
+    this.read = function (offset, length, callback) {
+        function read() {
+            if (error) {
+                return callback(error);
+            }
+            if (data) {
+                return callback(error, data.slice(offset, offset + length));
+            }
+            readRequests.push(read);
+        }
+        read();
+    };
+    this.load = load;
+}
+function Docnosis(element) {
+    "use strict";
+    var doc = element.ownerDocument,
+        form,
+        diagnoses = doc.createElement("div"),
+        openedFiles = {},
+        datarenderer = new DataRenderer(diagnoses),
+        jobrunner = new JobRunner(datarenderer),
+        jobrunnerdata = [];
+
+    function dragHandler(evt) {
+        var over = evt.type === "dragover" && evt.target.nodeName !== "INPUT";
+        if (over || evt.type === "drop") {
+            evt.stopPropagation();
+            evt.preventDefault();
+        }
+        if (evt.target.style) {
+            evt.target.style.background = (over ? "#CCCCCC" : "inherit");
+        }
+    }
+
+    function fileSelectHandler(evt) {
+        // cancel event and hover styling
+        dragHandler(evt);
+
+        function diagnoseFile(file) {
+            var loadingfile, path;
+            path = file.name;
+            loadingfile = new LoadingFile(file);
+            openedFiles[path] = loadingfile;
+            loadingfile.load(function (error, data) {
+                jobrunnerdata.push({file:{
+                    path: path,
+                    data: data
+                }});
+                jobrunner.setData(jobrunnerdata);
+            });
+        }
+        // process all File objects
+        var i, files, div;
+        files = (evt.target && evt.target.files) ||
+                (evt.dataTransfer && evt.dataTransfer.files);
+        if (files) {
+            for (i = 0; files && i < files.length; i += 1) {
+                div = doc.createElement("div");
+                diagnoses.appendChild(div);
+                diagnoseFile(files[i]);
+            }
+        } else {
+            alert("File(s) could not be opened in this browser.");
+        }
+    }
+
+    function createForm() {
+        var form = doc.createElement("form"),
+            fieldset = doc.createElement("fieldset"),
+            legend = doc.createElement("legend"),
+            input = doc.createElement("input");
+        form = doc.createElement("form");
+        form.appendChild(fieldset);
+        fieldset.appendChild(legend);
+        input.setAttribute("type", "file");
+        input.setAttribute("name", "fileselect[]");
+        input.setAttribute("multiple", "multiple");
+        input.addEventListener("change", fileSelectHandler, false);
+        fieldset.appendChild(input);
+        fieldset.appendChild(doc.createTextNode("or drop files here"));
+        legend.appendChild(doc.createTextNode("docnosis"));
+        form.addEventListener("dragover", dragHandler, false);
+        form.addEventListener("dragleave", dragHandler, false);
+        form.addEventListener("drop", fileSelectHandler, false);
+        return form;
+    }
+
+    function enhanceRuntime() {
+        var read = runtime.read,
+            getFileSize = runtime.getFileSize;
+        runtime.read = function (path, offset, length, callback) {
+            if (openedFiles.hasOwnProperty(path)) {
+                return openedFiles[path].read(offset, length, callback);
+            } else {
+                return read(path, offset, length, callback);
+            }
+        };
+        runtime.getFileSize = function (path, callback) {
+            if (openedFiles.hasOwnProperty(path)) {
+                return callback(openedFiles[path].file.size);
+            } else {
+                return getFileSize(path, callback);
+            }
+        };
+    }
+
+    form = createForm();
+    element.appendChild(form);
+    element.appendChild(diagnoses);
+    enhanceRuntime();
+}
diff --git a/apps/files_odfviewer/src/webodf/programs/docnosis/index.html b/apps/files_odfviewer/src/webodf/programs/docnosis/index.html
new file mode 100644
index 0000000000..cd56d4f746
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/programs/docnosis/index.html
@@ -0,0 +1,27 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html xml:lang="en" lang="en">
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8"></meta>
+  <title>docnosis</title>
+  <!-- <script src="../../webodf/webodf.js" type="text/javascript" charset="utf-8"></script> -->
+  <script src="../../webodf/lib/runtime.js" type="text/javascript" charset="utf-8"></script>
+  <script type="text/javascript">//<![CDATA[
+runtime.libraryPaths = function () {
+    return ["../../webodf/lib/"];
+};
+  //]]></script>
+  <script src="docnosis.js" type="text/javascript" charset="utf-8"></script>
+  <script type="text/javascript">//<![CDATA[
+runtime.libraryPaths = function () {
+    return ["../../webodf/lib/"];
+};
+window.addEventListener("load", function () {
+   var docnosis = document.getElementById("docnosis");
+   new Docnosis(docnosis);
+}, false);
+  //]]></script>
+ </head>
+ <body>
+  <div id="docnosis"></div>
+ </body>
+</html>
diff --git a/apps/files_odfviewer/src/webodf/programs/firefoxextension/CMakeLists.txt b/apps/files_odfviewer/src/webodf/programs/firefoxextension/CMakeLists.txt
new file mode 100644
index 0000000000..92d1e19f7c
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/programs/firefoxextension/CMakeLists.txt
@@ -0,0 +1,35 @@
+# the files that go into the extension
+set(FIREFOXEXTENSIONFILES
+    bootstrap.js
+    chrome.manifest
+    skin/default/icon.png
+    content/odf.html
+    components/odfContentHandler.js
+)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/install.rdf.in
+    ${CMAKE_CURRENT_SOURCE_DIR}/install.rdf)
+set(WEBODFXPI ${CMAKE_CURRENT_BINARY_DIR}/webodf-${WEBODF_VERSION}.xpi)
+add_custom_command(
+    OUTPUT ${WEBODFXPI}
+    # copy the common webodf.css and webodf.js
+    COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different
+        ${CMAKE_SOURCE_DIR}/webodf/webodf.css
+        ${CMAKE_CURRENT_SOURCE_DIR}/content/webodf.css
+    COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different
+        ${CMAKE_BINARY_DIR}/webodf/webodf.js
+        ${CMAKE_CURRENT_SOURCE_DIR}/content/webodf.js
+    # zip using javascript code running in node.js
+    COMMAND ${NODE} ARGS ../../webodf/lib/runtime.js packextension.js
+        ${WEBODFXPI}
+        ${FIREFOXEXTENSIONFILES}
+        content/webodf.js
+        content/webodf.css
+        install.rdf
+    DEPENDS NodeJS
+        packextension.js ${FIREFOXEXTENSIONFILES}
+        install.rdf.in
+        ${CMAKE_SOURCE_DIR}/webodf/webodf.css
+        ${CMAKE_BINARY_DIR}/webodf/webodf.js
+    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+)
+add_custom_target(firefoxextension ALL DEPENDS ${WEBODFXPI})
diff --git a/apps/files_odfviewer/src/webodf/programs/firefoxextension/bootstrap.js b/apps/files_odfviewer/src/webodf/programs/firefoxextension/bootstrap.js
new file mode 100644
index 0000000000..c95dbd4a90
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/programs/firefoxextension/bootstrap.js
@@ -0,0 +1,36 @@
+/*global Components: true, dump: true, Services: true*/
+
+var Cc = Components.classes;
+var Ci = Components.interfaces;
+var Cm = Components.manager;
+var Cu = Components.utils;
+
+Cu["import"]('resource://gre/modules/Services.jsm');
+
+function log(str) {
+    "use strict";
+    dump(str + '\n');
+}
+
+function startup(aData, aReason) {
+    "use strict";
+    var manifestPath = 'chrome.manifest',
+        file = Cc['@mozilla.org/file/local;1'].createInstance(Ci.nsILocalFile);
+    try {
+        file.initWithPath(aData.installPath.path);
+        file.append(manifestPath);
+        Cm.QueryInterface(Ci.nsIComponentRegistrar).autoRegister(file);
+    } catch (e) {
+        log(e);
+    }
+}
+
+function shutdown(aData, aReason) {
+    "use strict";
+}
+
+function install(aData, aReason) {
+    "use strict";
+    var url = 'chrome://webodf.js/content/odf.html?file=%s';
+    Services.prefs.setCharPref('extensions.webodf.js.url', url);
+}
diff --git a/apps/files_odfviewer/src/webodf/programs/firefoxextension/chrome.manifest b/apps/files_odfviewer/src/webodf/programs/firefoxextension/chrome.manifest
new file mode 100644
index 0000000000..b6f6e75cfb
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/programs/firefoxextension/chrome.manifest
@@ -0,0 +1,13 @@
+content webodf.js content/
+skin webodf.js default skin/default/
+
+component {afe5fa21-709d-4916-b51c-56f60d574a0a} components/odfContentHandler.js
+contract @mozilla.org/uriloader/content-handler;1?type=application/vnd.oasis.opendocument.text {afe5fa21-709d-4916-b51c-56f60d574a0a}
+contract @mozilla.org/uriloader/content-handler;1?type=application/vnd.oasis.opendocument.spreadsheet {afe5fa21-709d-4916-b51c-56f60d574a0a}
+contract @mozilla.org/uriloader/content-handler;1?type=application/vnd.oasis.opendocument.presentation {afe5fa21-709d-4916-b51c-56f60d574a0a}
+category ext-to-type-mapping odt application/vnd.oasis.opendocument.text
+category ext-to-type-mapping fodt application/vnd.oasis.opendocument.text
+category ext-to-type-mapping ods application/vnd.oasis.opendocument.spreadsheet
+category ext-to-type-mapping fods application/vnd.oasis.opendocument.spreadsheet
+category ext-to-type-mapping odp application/vnd.oasis.opendocument.presentation
+category ext-to-type-mapping fodp application/vnd.oasis.opendocument.presentation
diff --git a/apps/files_odfviewer/src/webodf/programs/firefoxextension/components/odfContentHandler.js b/apps/files_odfviewer/src/webodf/programs/firefoxextension/components/odfContentHandler.js
new file mode 100644
index 0000000000..47a3d349ac
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/programs/firefoxextension/components/odfContentHandler.js
@@ -0,0 +1,196 @@
+/*jslint bitwise: true*/
+/*global Components: true, dump: true, Uint8Array: true, Services: true,
+   XPCOMUtils: true*/
+var Cc = Components.classes;
+var Ci = Components.interfaces;
+var Cr = Components.results;
+var Cu = Components.utils;
+
+var ODF_CONTENT_TYPE_PREFIX = 'application/vnd.oasis.opendocument.';
+var NS_ERROR_WONT_HANDLE_CONTENT = 0x805d0001;
+
+Cu["import"]('resource://gre/modules/XPCOMUtils.jsm');
+Cu["import"]('resource://gre/modules/Services.jsm');
+
+function log(aMsg) {
+    "use strict";
+    var msg = 'odfContentHandler.js: ' + (aMsg.join ? aMsg.join('') : aMsg);
+    Cc['@mozilla.org/consoleservice;1'].getService(Ci.nsIConsoleService)
+                                       .logStringMessage(msg);
+    dump(msg + '\n');
+}
+
+function fireEventTo(aName, aData, aWindow) {
+    "use strict";
+    var mywindow = aWindow.wrappedJSObject,
+        evt = mywindow.document.createEvent('CustomEvent');
+    evt.initCustomEvent('odf' + aName, false, false, aData);
+    mywindow.document.dispatchEvent(evt);
+}
+
+function loadDocument(aWindow, aDocumentUrl) {
+    "use strict";
+    var xhr = Cc['@mozilla.org/xmlextras/xmlhttprequest;1']
+              .createInstance(Ci.nsIXMLHttpRequest);
+    xhr.onprogress = function updateProgress(evt) {
+        if (evt.lengthComputable) {
+            fireEventTo(evt.type, evt.loaded / evt.total, aWindow);
+        }
+    };
+
+    xhr.onerror = function error(evt) {
+        fireEventTo(evt.type, false, aWindow);
+    };
+
+    xhr.onload = function load(evt) {
+        var data = (xhr.mozResponseArrayBuffer || xhr.mozResponse ||
+                xhr.responseArrayBuffer || xhr.response),
+            view,
+            mywindow,
+            arrayBuffer,
+            view2,
+            array,
+            i;
+        try {
+            view = new Uint8Array(data);
+            mywindow = aWindow.wrappedJSObject;
+            arrayBuffer = new mywindow.ArrayBuffer(data.byteLength);
+            view2 = new mywindow.Uint8Array(arrayBuffer);
+            view2.set(view);
+            array = [];
+            array.length = view2.byteLength;
+            for (i = 0; i < view2.byteLength; i += 1) {
+                array[i] = view2[i];
+            }
+            fireEventTo(evt.type, array, aWindow);
+        } catch (e) {
+            log('Error - ' + e);
+        }
+    };
+
+    xhr.open('GET', aDocumentUrl);
+    xhr.responseType = 'arraybuffer';
+    xhr.send(null);
+}
+
+var WebProgressListener = {
+    init: function WebProgressListenerInit(aWindow, aUrl) {
+        "use strict";
+        this.locationHasChanged = false;
+        this.documentUrl = aUrl;
+
+        var flags = Ci.nsIWebProgress.NOTIFY_LOCATION |
+                Ci.nsIWebProgress.NOTIFY_STATE_NETWORK |
+                Ci.nsIWebProgress.NOTIFY_STATE_DOCUMENT,
+            docShell = aWindow.QueryInterface(Ci.nsIInterfaceRequestor)
+                          .getInterface(Ci.nsIWebNavigation)
+                          .QueryInterface(Ci.nsIDocShell),
+            webProgress = docShell.QueryInterface(Ci.nsIInterfaceRequestor)
+                              .getInterface(Ci.nsIWebProgress);
+        try {
+            webProgress.removeProgressListener(this);
+        } catch (e) {
+        }
+        webProgress.addProgressListener(this, flags);
+    },
+
+    onStateChange: function onStateChange(aWebProgress, aRequest, aStateFlags,
+                                        aStatus) {
+        "use strict";
+        var complete = Ci.nsIWebProgressListener.STATE_IS_WINDOW +
+                     Ci.nsIWebProgressListener.STATE_STOP;
+        if ((aStateFlags & complete) === complete && this.locationHasChanged) {
+            aWebProgress.removeProgressListener(this);
+            loadDocument(aWebProgress.DOMWindow, this.documentUrl);
+        }
+    },
+
+    onProgressChange: function onProgressChange(aWebProgress, aRequest,
+                                                aCurSelf, aMaxSelf, aCurTotal,
+                                                aMaxTotal) {
+        "use strict";
+    },
+
+    onLocationChange: function onLocationChange(aWebProgress, aRequest,
+                                              aLocationURI) {
+        "use strict";
+        this.locationHasChanged = true;
+    },
+
+    onStatusChange: function onStatusChange(aWebProgress, aRequest, aStatus,
+                                          aMessage) {
+        "use strict";
+    },
+
+    onSecurityChange: function onSecurityChange(aWebProgress, aRequest, aState) {
+        "use strict";
+    },
+
+    QueryInterface: function QueryInterface(aIID) {
+        "use strict";
+        if (aIID.equals(Ci.nsIWebProgressListener) ||
+                aIID.equals(Ci.nsISupportsWeakReference) ||
+                aIID.equals(Ci.nsISupports)) {
+            return this;
+        }
+        throw Components.results.NS_ERROR_NO_INTERFACE;
+    }
+};
+
+function odfContentHandler() {
+    "use strict";
+}
+
+odfContentHandler.prototype = {
+    handleContent: function handleContent(aMimetype, aContext, aRequest) {
+        "use strict";
+
+        if (!(aMimetype.indexOf(ODF_CONTENT_TYPE_PREFIX) === 0 ||
+                aMimetype === "application/octet-stream")) {
+            throw NS_ERROR_WONT_HANDLE_CONTENT;
+        }
+
+        if (!(aRequest instanceof Ci.nsIChannel)) {
+            throw NS_ERROR_WONT_HANDLE_CONTENT;
+        }
+
+        var mywindow = null,
+            callbacks,
+            uri = aRequest.URI,
+            targetUrl = uri.spec,
+            tail = targetUrl.substring(targetUrl.length-9),
+            url;
+
+        // if the url ends with a download parameter, then do not handle it
+        if (tail === "#download") {
+            throw NS_ERROR_WONT_HANDLE_CONTENT;
+        }
+
+        callbacks = aRequest.notificationCallbacks ||
+                    aRequest.loadGroup.notificationCallbacks;
+        if (!callbacks) {
+            return;
+        }
+
+        mywindow = callbacks.getInterface(Ci.nsIDOMWindow);
+
+        WebProgressListener.init(mywindow, uri.spec);
+
+        try {
+            url = Services.prefs.getCharPref('extensions.webodf.js.url');
+            //url = url.replace('%s', encodeURIComponent(targetUrl));
+            url = url.replace('%s', targetUrl);
+        } catch (e) {
+            log('Error retrieving the webodf base url - ' + e);
+            throw NS_ERROR_WONT_HANDLE_CONTENT;
+        }
+
+        aRequest.cancel(Cr.NS_BINDING_ABORTED);
+        mywindow.location = url;
+    },
+
+    classID: Components.ID('{afe5fa21-709d-4916-b51c-56f60d574a0a}'),
+    QueryInterface: XPCOMUtils.generateQI([Ci.nsIContentHandler])
+};
+
+var NSGetFactory = XPCOMUtils.generateNSGetFactory([odfContentHandler]);
diff --git a/apps/files_odfviewer/src/webodf/programs/firefoxextension/content/odf.html b/apps/files_odfviewer/src/webodf/programs/firefoxextension/content/odf.html
new file mode 100644
index 0000000000..0dc023aed8
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/programs/firefoxextension/content/odf.html
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!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"></meta>
+  <style type="text/css" media="screen">
+    body, html, div {
+      padding: 0px;
+      margin: 0px;
+      border: 0px;
+    }
+    body, html {
+      height: 100%;
+      text-align: center;
+    }
+    html > body {
+      background: black;
+    }
+    div#toolbar {
+      background: white;
+      padding: 7px;
+      border-bottom: 1px solid black;
+    }
+    div#toolbar > span {
+      border: 1px solid black;
+      padding: 2px;
+    }
+    div#toolbar > span:hover {
+      background: #CCCCCC;
+    }
+  </style>
+  <link rel="stylesheet" type="text/css" href="webodf.css"/>
+  <script src="webodf.js" type="text/javascript" charset="utf-8"></script>
+  <script type="text/javascript" charset="utf-8">//<![CDATA[
+var webodffirefox = {
+    url: undefined,
+    data: undefined,
+    odfcanvas: undefined
+};
+window.addEventListener('odfload', function webViewerLoad(evt) {
+    runtime.loadClass("odf.OdfCanvas");
+    var wf = webodffirefox,
+        params = document.location.search.substring(1).split('&'),
+        param,
+        odfelement = document.getElementById("odf"),
+        data = evt.detail;
+    for (i = 0; i < params.length; i += 1) {
+        param = params[i].split('=');
+        params[unescape(param[0])] = unescape(param[1]);
+    }
+    wf.url = params.file;
+    wf.data = data;
+    wf.odfcanvas = new odf.OdfCanvas(odfelement);
+
+    runtime.read = function (path, offset, length, callback) {
+        var d = data.slice(offset, offset + length);
+        callback(null, d);
+    }
+    runtime.getFileSize = function (path, callback) {
+        callback(data.length);
+    }
+    wf.odfcanvas.load(params.file);
+}, true);
+function addButton(parent, label, onclick) {
+    var doc = parent.ownerDocument,
+        button = doc.createElement("span");
+    button.appendChild(doc.createTextNode(label));
+    button.onclick = onclick;
+    parent.appendChild(button);
+}
+function init() {
+    runtime.loadClass("core.Base64");
+    var toolbar = document.getElementById("toolbar");
+    addButton(toolbar, "download", function onclick() {
+        window.location.href = webodffirefox.url + "#download";
+    });
+}
+window.setTimeout(function () {
+    init();
+}, 1);
+//--></script>
+  <title></title>
+</head>
+<body>
+  <div id="toolbar">
+  </div>
+  <div id="odf"/>
+</body>
+</html>
diff --git a/apps/files_odfviewer/src/webodf/programs/firefoxextension/install.rdf.in b/apps/files_odfviewer/src/webodf/programs/firefoxextension/install.rdf.in
new file mode 100644
index 0000000000..caf59198a2
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/programs/firefoxextension/install.rdf.in
@@ -0,0 +1,34 @@
+<?xml version="1.0"?>
+
+<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+     xmlns:em="http://www.mozilla.org/2004/em-rdf#">
+
+  <Description about="urn:mozilla:install-manifest">
+    <em:id>uriloader@webodf.js</em:id>
+    <em:name>WebODF</em:name>
+    <em:type>2</em:type>
+    <em:version>@WEBODF_VERSION@</em:version>
+    <em:iconURL>chrome://webodf.js/skin/icon.png</em:iconURL>
+    <em:targetApplication>
+      <!-- Firefox -->
+      <Description>
+       <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
+       <em:minVersion>3.6</em:minVersion>
+       <em:maxVersion>9.*</em:maxVersion>
+     </Description>
+    </em:targetApplication>
+    <em:targetApplication>
+      <!-- Fennec -->
+      <Description>
+       <em:id>{a23983c0-fd0e-11dc-95ff-0800200c9a66}</em:id>
+       <em:minVersion>4.0</em:minVersion>
+       <em:maxVersion>9.*</em:maxVersion>
+      </Description>
+    </em:targetApplication>
+    <em:bootstrap>true</em:bootstrap>
+    <em:unpack>true</em:unpack>
+    <em:creator>Jos van den Oever</em:creator>
+    <em:description>OpenDocument Viewer</em:description>
+    <em:homepageURL>http://webodf.org/</em:homepageURL>
+  </Description>
+</RDF>
diff --git a/apps/files_odfviewer/src/webodf/programs/firefoxextension/packextension.js b/apps/files_odfviewer/src/webodf/programs/firefoxextension/packextension.js
new file mode 100644
index 0000000000..ce606817ea
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/programs/firefoxextension/packextension.js
@@ -0,0 +1,77 @@
+/**
+ * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
+ * @licstart
+ * The JavaScript code in this page is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU Affero General Public License
+ * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.  The code is distributed
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
+ *
+ * As additional permission under GNU AGPL version 3 section 7, you
+ * may distribute non-source (e.g., minimized or compacted) forms of
+ * that code without the copy of the GNU GPL normally required by
+ * section 4, provided you include this license notice and a URL
+ * through which recipients can access the Corresponding Source.
+ *
+ * As a special exception to the AGPL, any HTML file which merely makes function
+ * calls to this code, and for that purpose includes it by reference shall be
+ * deemed a separate work for copyright law purposes. In addition, the copyright
+ * holders of this code give you permission to combine this code with free
+ * software libraries that are released under the GNU LGPL. You may copy and
+ * distribute such a system following the terms of the GNU AGPL for this code
+ * and the LGPL for the libraries. If you modify this code, you may extend this
+ * exception to your version of the code, but you are not obligated to do so.
+ * If you do not wish to do so, delete this exception statement from your
+ * version.
+ *
+ * This license applies to this entire compilation.
+ * @licend
+ * @source: http://www.webodf.org/
+ * @source: http://gitorious.org/odfkit/webodf/
+ */
+/*global runtime: true, core: true*/
+runtime.loadClass("core.Zip");
+runtime.loadClass("core.Base64");
+
+function addFiles(zip, pos, files, callback) {
+    "use strict";
+    if (pos >= files.length) {
+        zip.write(function (err) {
+            return callback(err);
+        });
+        return;
+    }
+    var path = files[pos];
+    runtime.readFile(path, "binary", function (err, data) {
+        var base64;
+        if (err) {
+            return callback(err);
+        }
+        if (path === "content/webodf.js") {
+            // replace eval() with evil(), since Firefox does not approve of it
+            base64 = new core.Base64();
+            data = base64.convertUTF8ArrayToUTF16String(data);
+            data = data.replace(new RegExp('eval\\(', 'g'), 'evil(');
+            data = runtime.byteArrayFromString(data);
+        }
+        zip.save(path, data, false, new Date());
+        addFiles(zip, pos + 1, files, callback);
+    });
+}
+
+var args = arguments,
+    filename = args[1],
+    zipmembers = [],
+    i,
+    zip = new core.Zip(filename, null);
+for (i = 2; i < arguments.length; i += 1) {
+    zipmembers.push(arguments[i]);
+}
+
+addFiles(zip, 0, zipmembers, function (err) {
+    "use strict";
+    if (err) {
+        runtime.log(err);
+    }
+});
diff --git a/apps/files_odfviewer/src/webodf/programs/firefoxextension/skin/default/icon.png b/apps/files_odfviewer/src/webodf/programs/firefoxextension/skin/default/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..94d7d8da5defc1d587cbbd4e8ef7cdc1901ca6d9
GIT binary patch
literal 44606
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

literal 0
HcmV?d00001

diff --git a/apps/files_odfviewer/src/webodf/programs/ios/Default-Landscape~ipad.png b/apps/files_odfviewer/src/webodf/programs/ios/Default-Landscape~ipad.png
new file mode 100644
index 0000000000000000000000000000000000000000..06bb96b394f8360815781aada7d1c3704263726b
GIT binary patch
literal 52135
zcmeEt<y(|(_w^tkN-9!<GN5!L2uhbA-5mo+r*tz2B1%h#fYOaHgmei=H%JUa$Ivkh
z0~0Uz{XD<_;r;N;aa`AV&9}MMxzD}VUVF_KEe$0yVtQf#06?bvRzU{<Ah><Jb8zqO
z?GmEeCv*E{%u!xmOIco?Nz2pS&e6pd0PtUoOCENnGNy{^gfD+jWFoDvu^>%1ew)aW
zLLvN2YD(E9zt(j~A(`oI$+fRvW;Q&_bk>9F;b4E!m_X2J?fW(0YEL9Ll;dGA^XDMy
zH&n}|^)Ya7!;=655N52o(`$^E&wH_tX@c{<SE$W5GXo6`^<nDqx3#%^FTAOt0(3l7
z{eWoM?<h7YsqQ=ee~}opW<dp2i<f29$C;ZXV)NZA(iyH~-DxJ_M5)Jw4?la!EdIX6
z$po@(@5?O4ipw*(;Z-bmDKH)3;kz{$g=^ql7*M_xx}Q7k)AV{ADARPtPL9vO<YN%|
zT)mM-rEd*iM%t)G#mS#wmvBFDVM&zu0x&*o2U8fCQ{<<An(*4^_dKeWt>)bREGjGa
z+2^{kB=9S+zm2lA_A&_Y!tynw0iXQmU7a9J!-0f;m%ZuPAHm7M%oZU$G+~+Z2fo-o
zNYRl%q~h9I!O7QGn}4R1!hR?|rl5#ZB9BbyS$+882CAaY+@17<|1{uB_l7&1gN0n_
z&$jWd>+82SWtjd@7f@r(LJhwiT=H-v{Pj_D4DE`xjFm~psEb$eUszE;6TLcNpP6%s
zfS{vwOC4Bn+SikozfE`N9QeqzT%knDPV3`{^+|@(kNeuBY%Q4GORDRmOw;|vcE*_O
z0Y+b#B;=sl3FcB{V#<qin`a&8J}vpnqSzPq_XAbXZ;M(}(ips2-Pi^Vwbcy|%1GwI
z&;2`8o(nkBa@J61K%v)=VZT>V^6*f2S*m0erRD|g9xQgS%<=KG_fxlzKYg7|Z&oew
z=Cb-4X`X&GcmJ^=Yq~$!1y_CVm2E0|uI@bCLh<#Q{SI9@VM(lEnW87e)jd5z_Iv6R
z1QcswJYzy%qZ23Rs8>4D#)Wv4*5ndz-U69G<xgJy#4|t>fv~Q^Qs$1r9cGd7JMT@w
zgk5czH`2wLn*ab4Kv_Xn&wud%YMf{jkOo7*P#};sOi1Y2^XH!9l_TZVMHS^p<Cd2(
zS=!GtWbdhwGD+UyzcaELNi@<$ir-5*(&aB>d6y!?=8mG`QmkTcmxJ9*LGDU=d9|bv
zclzfMBWN#j3rj(PwD3z9aT$GkZ&K(SbFu#Th!JUl{PX#b7k1}c=RXJTf1m#$@IM6p
zhrs_3`2P?Aw6S#?Apn4$)-507%@glzfWi&utTRlw^tTP=Y<-*cGEJ3-Aj8T&ZmgW6
zJglkBwh)~+-6}e7c~XW%YbsOtKt>v&`#=c}UjETEDa7Jy@D4WA`LAmZ>CIvP&m~9F
zsKfpt>$0zxOK}_R5sMqGeo_+tXQx4!?Xgymzh&ptx0tZpURNbdoQC$rwBv50JUL6b
z#wMMwAl|+~Za$dx>r9gL71({+WE;CRp&Ivvp5WQgeLv|J0hc#(=4{PsX_zAf+V5w!
zGGBTMOZTR>qc^5`98@1P;L54;A|17RP8GhlI4jiR>#K-6gk2Sr5oz<y|I`I9J0G<z
zxgU1SyWg%-*b|CCb|4t3In}9}bhfTo*7noNAeUG<z{xk%jf*q2qH6o6n2@A?4k%Zd
zK2Fi=@9{TMqQmQ-FezoCoaD8iOK*vCJ_S8FYoY=GC~sc~J=sYouajkBBq<H?cXJLz
zEnkkTFH~i2dC}UZjk%8V<+K`Qnu--T6kFQWF=d(?=QX(p@6^6D!5_5Q(y{J5+cLc*
zf(1GtfwM&%5T<j9$KR)$P{;4md5i=&`%Ae^RTux7)DH|CYBzQjuw)Jv?PVr~Za>;V
zv?Jp$8frocGXm2TKcgO=CzFW{P-F+eP)_fTTS2bCc4X_B_sOFZw)6@i)0)%@=lN>0
zR$p7x^7huOP`05jFj7@qysF$Rw@A)fcyQd6@4BKUCt)@TE$)7-m@o;I9D+ipISln;
zkIw$?&mvpmFhS7mZj8pwYG_S}f9H}|@WlQT>1dCME%#S|uzv^u`0glQRaK3PS&OmB
za<J9uL6ND~4&O?yxpAk%552Lu1zTd~jAb?EKO=Sbg3&uVNq>vB9^V|+NDG(UI~%Pw
zH>ovruUV?WK!Kc!lDhYq(rxUFzvmJn?2<B#W0QhrN-WIh(d#KvEACm!o=w`8xb?aG
z&~sdeGYFlzFDBu##{fgWl0JYahaD_edry>!QiPsl$3dmhrlXkS5JcWqP)-W%_&86;
z$+<2GKYIBBjmQ(M7*UzrI@)LO!uDsIN{O4F!LAT~Z5GEZgUb?eNvI3&LGV#t>%)ZB
zvb>qaTHlEiy6IiPmd(imr9o(c5|XZ9z~QK`sx>H9uoyFTIyQLPe*DrI2(B@1#bH95
z8hicl{tHg@$3n9l^QAVi&PJb*ql3#)l+cps&bTYg%-qzxB`}m3)g3j!%w;4H=~5*{
zf#oGg&demF2DZBFk5sZIWl}o(TwhiJk4#5s_IP7jM_HOc*Xv}hol6s@(t#4%m&cyQ
zxda?T*D)?(RN*PbNt<kbuHSN|4;d=B(jV!UP{s&4{Y?nmZ^sV_?yN>FaE9!~%wMeK
z$hTwW#(<dw9E|WM;FE@SKU_MvY5wX;90zJYPTh-JBC%gV8y3@8T%kM>%ZCRCM@OhW
z8@#q*sC*(AK1zb!o9DkeMz1J^n(hB40?tFHXQXc;UBRAHaYZ^OvtA^E>QSLTO=BWL
z;n9LE`9T*MPX*(u=_Ffdl>q@GNd(4wGTxfH34)hFaqV`PZlq~LLMN<J`pT-t3;p?+
z1^~E!8(7$nZ_B-gN$mMM-f#ExRSd49_RsD4SH77`HMypx@P4$Up%fx{K|+&say<%J
zYrkojI4bVuArNIC!lk97vNNf|GqY`cJp$%Jk*4BlHOtwVBT$#NeE#I&G};ox7QaPP
z=Q(nv!M8%Xc3oP9Qf=hUA1*-B1D^hjzWz5;->(W1g6=MdP|eg-jV@?{kIFmFBZyl3
zkh>^lfFD@wJ`>Uih9bh9cN5{3z$urSjJWA*dbLpy20ex1#~>EA(nAFaIE#-MC1W}v
z5L*5%JxZBLb2iwb$=P@aR<2T%h%u^6R6GQHb;XjEuS#P$HWFmZ^(CtH<uT&!WRx+g
zbAZm=QEz0Ci0a+N%sV}chY#MR)UkxsseI5YQ-U18uc6nn=U3enChQb2r(B7^3K%Q%
zZD)W70CZ`N9M=w^7Y_GkW130~`P*N$`|cGDEobs_vgC#Cx%>hzEAy~?8Ik*$NC06{
zrHr&rh4sXd4F7;?_KwMlXGAi2CClAo&M0Kcq^8EB8F9-2{XA~>a%jDI>V@P{TD7ao
zZ<CHWiXe>P3%Q<EuSj`>!HOQ+pH{FX12%la4rGisWYx@%avL705gfkB{eHE%&OF%A
z-ds2@-CQMob^TN_VCt%X8!zAfIiXp!W0S|pS`B8P;Rd$@#^AP{1zXWyKqiZ56xiMA
z=&U6AQKV(GpijclP|w96OPKw<pV<A?Gk;8fR*n1UO)s=K!Qg5O72O%^;V3r7tAU!_
z2t4q<sm?gvHGU(L)o_R7<|>mbOakx0mY|QZa35WiV4#}rc%IO1Q@nKx&i8P2Woh)f
z0O+%%#B!U@{w-JbXR6$sn(Dl+7C9!+j+gCqh@P3VKGVUOk?;{p<0OK}-_%JDk~W97
zgYW4wJ0c_mNtkOBe?=zxAlQwm!{lByy?8X2R@^I&bh5KECJZAKG8V`T_-VOt658tR
zJJx|{4{`P(N+Y|3@a&2%IAno+0mJy--03Qp!=O;vPE13q*ejPEWk6gKfW86$E%Wem
zqmEq3+b9jypcziUzUR7s(h~=1@i?puMIxoO+E*}2EO`BcfN@p2Y76oGL-tN23^xYD
zj^lEymsf%F*L{Yeb~jsKOsAMcR-lz$%c^Il{Yy$lNSE}sJx>xK*N{K~Y0VgB#^>kP
z48GRQUQrF7haYkbo|g;+Ka?IDQNKBZdrL^U_*cw*S-^WIoNg~0e4F|N^YBj4Tw!#&
z$x6f0pL>N72TyLXr8TgBw^R7&rrpA6t_^&(35C@hwj(Km+7054-vYYwgzvlK0an>(
zXO`E8E*4WY+b;L=t`~-Da6O%7Ef<i^mY<l#bh|MNltMtLt56Ep^pN$<?-5E8WlA1p
zs+5_mh?Aa69nUG%N6Ca+vfz8liB#c{mdqbz>3c8xt^IZOKkW{MgCUmP(Qk0yU5LZX
zjk0Q+j%Vt$Lr@#WL0wlO1VV;s0*SWW!L35|njQ64$FSEU$%I2<q|yE0t!Z4{#`YE_
z&5!AiaG=Il3c4M_I^W0x08tcgc6QZbmFfQFi8l08?~Izkw`nRpQs9%PJLv5s3-CsM
zvHfu4x&IMDn8)1lC}igtT}$~QO>eFm9fRBJKLlaiErPfDGl%q)8%%OHIV|k4+s!vu
zg~ogG9nY;-ZdQGrjC*VXuXYt`I)cY2oS<k%bqNst1rZ#1ZDL`XNT^#golbpDEq~hP
zv93^XNZSw0v=3k)xzzJzRkc<d*Pq?LNF~p2HKa)!H*0GT-D}8$z4F2it%Xic|6NR%
z*lMK)$lL({!oYI#(#TZsM!$XMnR_vbAuM<!ncpHNbs@DkS$0s4^Q*CSTFQuA67Nye
zZyseHqst7re3p;DRR)(`USC9|WpHZVu|Z&nng8%8P*}NIv5^*-mH;DINSHrL{29N-
zsb5|fQQwS$uO_Bus&?=FDKOQ&7oY_iIZZFrQm8i&--E+1%Q@dF4dfgIykR;rUIh{S
zvJ-J*&A1nIo_+A`jaDAfq)6cMh0U>o{W#z5*_OVf|NC#e)d|)hp-7&`KkHu<%&+{N
z+eWd5Ty=M>V7ud6pdX628!h4^wmp!WN1|A5P#$Ww%Cr+bkA>9u`kaHV`lS74$9N2>
z<*jvvbj75cvUU#1?R1j<Sl32;*z%(ZdS=2nx+AK|j@Q^kqwh{8?3Bgf30PQFAR{Uh
zJM5rIx6{kyDuW*F$aW4=L&~Gk6U^hHSHA;B>XIVzn|op?&euqFA^OMlfkWGme%;0V
zV7DtDtNGUcD+Dupy_T8xGFx(E<@lFhJZg*(ka%0!R)N#(;A?*LRzkvhrSaQp7rvB5
zb4_ykh^bdynrB_oEJN4mM<mRx>PZTMACrBv%wT4u?CrwZ9qV}r)J`veTCG^CDy`?h
zoArrkpq-WV8MwCGz5A1PF^6+~lmWqdK)TFaYaTE2&ZPez(fd3G&9*lKu9%DLrAuu4
z^O&+7e7w=kH#T`WGm0dW$+GZQe}R%Hy*FL2?yvG4N>%T#Uq;W((_ZXaxjr#!6_(VU
z<*qTCIHa9(^+W#dI6u58f7&n*v&lAExs28E!nK0bZ`d_+kqyQzCq>|!8Vmxr?#?Du
zL0fHZI@yYJUX*lN*g`yRAgW6hIu~1Z&alTkq@m>Oe?~g*l?0H|@Qhtz6c*B*+hV8?
zEBA>hHAC$LG|uD|sjN@5&%zzutV|#fY9BHDzDc$2)2`nKlEXtxJnnga$^p^uqVjor
zMvHV<wS8JPp>`m*$#ZQ&sV9ZeM_IXfXIqhbI)_Xy2CAlcT<qC-by~TchEvz?|2m(V
zlm4en0)I%nY|5zaMA637VTbo)lv{zx5y`S5GyKQr>Bf|mDMmk8SeU=o6^0c)kmD4D
z*l<wn7}&|#uYMsUA!fFTykv&mXCi1m=vi3!8T3~W!m|0ppTpWSvl6O#*aNSW^q*o(
zMba|2#`R!a$Uqw^VcI(1VVbUXjrm>`UW*IPc9S<8e}MC6QEh}>N>zl9X3tQ%U^B|^
zzod(+2NE>B&##R~#|;~9t`xR(lttZhrrAMIgI4IgXh(o%tGG|!OpI{fE(?vEPC1{e
z2qSpIT?$cD>(zvX<9^j)ws4j{0gc|vj1Dz(4b}~9P`_-0@=#$@nAsFIndklksxu#7
z;7iF^3m+-U?r70>`P8co^W*!IR_x&4!p7Os#+2GT`%T$T_3gP$GV(6nO87P3(QF2#
z*?dkK$)|GBBTIbR3*~(qU8j9@%w@=>lC%o-b)WfV$;LSp)vJdIg_Cd#nHZH{bte}`
z6-uOj+!{`=0k5CydNGK;(|hrxK7M%`4>tRsc1mJk27XzEI&YGyN=!w8Bs(+euN^(#
zzj$lI%#YAavMf?4R$w070dRcfF-l@dVzpCt@Uiyv^$@G%*NmD)l?lWWV`d;uVV2!I
zA7$ZIUal+fDl0nDceOX5jNR@g%kFAdp1%<hX$Yd+Dr|zhA9vstb&rir7Ew#L&D5Iq
zycDj#5en8btjXKf2W&9nEEik=>9#RbC4tzyWCE>8DFHqv4y?qJV&C_F>(VVG++$*<
zFQ*R4^eb3Hc7iA_)`)KCN!NeZ#(eC#D(9ZwpJxbyVH@gUf4MCN7HC5eou<oIJ)l%&
z3P1YGh52#k&K2IYtyy59iA8QL2HKM3xgf&Fv-iHn@kRQ;`k(3&RT`I>q4$A|T}8v(
zVtb@)F^@JE=15Q;8e}iMmEpoIT&a(EdB@9P3{C=SwtaT^eZgVc222cX9L+?{o6KOQ
zAop@1+W`7@7=z6Y8EWusD140x;pV=o%I#%hRC+a;oVL6fmt1{I7CIBJhelCF6?xo-
zG-G5@ha19&B3DOu|4mbtJ<E~lQljmRAwv866oXrFk%hC!&DFv@#Ptr6b_;8l#$lAy
zx5xZ7ie(8kPDw&@8Ba9W8=;X=mJ*RFPgh91Knym(XNnY%)~zi}`Dhm;@DNS=A;bU<
zo;X-obeX-34=O<5zTkxw4B;jnI$fm0Bu>cEinSRFv(pWIcDifh!cmp7lG!{NHbPe+
z^%9b=@xQ-XDHW4>RFXYHU7Ero)+AN4RrI)uXB<AM0mYs$AS<Wg35$5SqEzowv;>k%
zBHV6H4q-`!LZa9+aC7jQDsFCbe(!XnIAl#Xdr=%dbZ-7YV==_MwcdsLO#_kJ&KN)Z
zeW#-%{ebiCCE6fN_dbPRj-*h9XG0RZYN0l;iz7Kva&oz@bVc2*`u0Sm2RpjXZ3s9`
zs4C@I9~G!Sv~D~N%T7Y8?he%vF0heJL#S`byh@aIolCTpFAeoO5{ak9D~IIuo_1q~
zbHxp~tKX8T24iFX6;QuS<7NpzJGayI{nVkU?e~Anih4D2jy?a=3$gHma0mRU_J(7|
z_mqFKG`BQo)CUT_cDQ(C{5G6A83*YGr+p0Gl8#Nr?+%w3Oa?Ij;cfGFeJxRqluzv6
z!VMK)u@?Ov<I#w0H<=%iql+x*>yjQ!v*YshpMfYk8+{xuPzh^008`Z^&;t~;-7f!3
zdJI_Leg{;%40I9>3UFfrK6BXUzDgDX=#9{3#3q49#sETI`p^~+4fnQ=BBzFYKNvVa
zqBpJD%wl#-!yF@<^^}{x9mtBuR(u>cO;_ZJnLNhEH8^*o^D52IXPr1bq3}SAo}X0t
z!r?x*iFu}W)uia4&&+NaZBa$`d5f=yF}MBp#pys)w0zTGT9oz_GfYHKyd_~}5t{R;
z{c@@$KD#~moy?XHDRclIUxSrGqT=~`vOs*YsIoMJ9qRLh7=!SGFH%{oTIc~aV$|Ju
zn!>#W&g1%)Xh#ESEf<Sd^gM}i&rdQGUz$qRjA`th^|8WW&Q7nMTu%+v`?bn%r5Ebh
z1_t;Z^$gEu&Z>I+btR2*{dD&Z;O#%XsTxFxAJfxGqq0?g_627sx}9twg)f8p4JI5m
zIF+ZYL*2Z2BlA{`COk<&R#rt$<VH%l`dc2wz@e;`2#LUEE1HlH(yg_2h9X>&Jjkdc
z=>AO%zMMp*8VBu1Y)HH!-*_1EW&u2zCjEMJT%&2eRTa9TRRgw`KZZ)a0E$8q>;b=@
zRg?KTF@%*EqS?cDh3vNx@ZlZAP|VKk5$Q!cP+}_RSXz6du*9UQs=1ldyuGEEh$4PV
zuu})DvDc-LEn8OieooHO330}ci4r-zvZ1tm72AUJfR5$mO!kcuHnf(JP3i4TxYo=~
z_Oi44qK2|MPWD_?-<3mi>_Sl`J9rNHTUOpBstt-tv`y)=E)+2XZ2biBN2ilKVP8Il
zg@Q{%{Z>^ggpT-*k$2sUV><KT42heLbN*I#Iw?b`bwksv$KSkTCZriC9cp*kPfqn)
zti6wY?!r|=H?GUU7e^n)-1+<q7RE~+(9G}UvP_deyms6{ZQdx8&Lu~m*3su3hj{<C
zYvApaoq3V;>X2*NQ8~(RLWqtC{&(7BOmgTS6M$U)gQUcCoc$p{S!7d_hV2o-LR;7a
zDxOL{^(eQjyM`Qh(S%zSm`TY>J`H2=?%W|6gbTn;a}J>i>&vV=l5$wI`GVv4{4{P~
zl}%+?=^P-u!l)%y?dP*GRi2vky}ftt*MKyRD!~rBObu2)BK^*Cza`jF-#ye*HJz{8
z0jVqxyP6Aug5OuV`T4_dAEqYed>eH-A*Miz2N(H~-I}a;(X_81!5bwShogocp>`t8
zt}slLPtb9Dh&jw+YQ)U=@JOr9C9QkKV)`!gWTqF1@BVc(&CYOO{q(nG>Qz1Ju1#lG
zQKG=pB8XU}50t0o&L6`SA19@-FONS2Xt^a#370QDcJK($V1C<v!~_lurJwh2`yN#}
z#iXFFZYbHW7lCD>ScTZfDm}DYx)<9@x%@6Rx_4JHouA*(_Gkr8Zi7lA+}>~=UO^41
zaT+%_H~XLhAq#tCM5FSdw=KoL2Vx`x`U|^w&_6oQ%cA@TALGnG@?+Mp4s>k4gfdP#
zyz?N15SzyG!glNSZoCSl+)Bn$*I{tJ2`y{M^9B&Eu;900g^7e`%B2RXBI5du8{6NF
z8u`mn>WnUq#V$x+Qv-!cdcP~$eWb`k1<f&hI#?deZ|Z0dQscUZX;q@PW8LoC{V;i5
zFG+nt>o+o@@4esOB6Z&1xV=+y(XB*uz3s>7aI7rvNUs?MN8y^yf;6*QLW1PAr%pYB
zp56bR--y+#l-3TmOukR5ZXkMPv)<){vohbW@M`>Nq+cO4GvaL=A*%<OguvC_NT$<Q
zb%boko!{oI$zG+nQ$Y>akXMY;;Ely{a_6UUhLbV0BB%DqwvPOJ2Ql<uPI7aM8;E2W
zLfk#GPu@QX_Dv=u`k4`uwQRp*KjY?GmqT!7az928NRXILphkc*sK@_Z>P;8o>T1v{
z3qQQ<8qg)uw_z~brYF}0S!B)i2F2}F%-2}x*ZEHKkl(a#uU)PGNBX(abvixU2W6Qo
zwB@&@!+2Qc$M{*REYvPF0>9Ya)(K8*8UYD$-2*u~GW-!Pz{nXTn9#9)3dnfm*PAUm
z*Q4$HpiUhQaRLx#Dv>PhY`Y-8dx>2c3J@;9ds3hwe_v6fmmGj$x*>;`dX$z_vozyQ
zjn^ii?CHg!SjK~Iu_lDkGyrL8=j`om?iNo+{hIc=GDDD=Avh7<>VCLOB)zO%wZb`c
zou^Ev#)kK)R}T@WRMQ?T8#UnSvxs>HkV@s7NLaAYN`7;*!S&%*?oqDJfqqJ}t7vS|
z((YVniW3rAd?j9S+gD_PzSZqDbB1^yzm<G*gU&WJv8aYm7N8|RZ;U8;RI_WE1fE`I
z0rM^tW3XHX8|>wPk(g#cA5&y-<jR(yBBBMKmuHM4CH(qOc2Z!quQdnPX~=DxTEW_|
zZ(hU*%|ENcAK_Iqc)GcScXeg6AQC%iUosr}er7ULXnMs35wk-jelNBhu)R~>(KJ0_
znQ?t~7W|TvAN0+1`Pb_wq#N%iq=ppb?)=+ypOj3%5Baf0Qx`p+0wiwAlyYyY^YS#a
z+UYJeuZ;)6Nj4a)9ZEoE_!GeH9FXMF173mUJ$+t5@YB*W61rjGe}3)s*ZBf+7wZz(
zNv1<#y0d-oYqCk6<fGpIc>!cEti`*uCqjK|oq&=K8lQU7Mkh(e)h5In$Sgf@x=X01
zv*Opw>`e#VZoOjAA0ran?&H0GQIVYHt!?F^77H`n{BD23_f|0PLN>%He2^<Y7OSvc
z<plkxD0_T=-PT#dl#BH$AIZhCokvG6n;F6+mxxdFMC3Fjr51-|vT`|1#nccsokc_x
z@W49QRC}vW(EHBfd5}bfT}6pbLuF*q;|gE{;;NK2mGWkUA$xJfV(K!IP;$Y2dx^@9
zc5a`{=e+;%?T_r+vhBsT8Jz;Fe(ux;YrEu;QIDjrNZ#_MeX?LHtGVQ)wxvByjf-&w
z)P<S82i@#3dGrh1X><R^BXdoCyiHLzK7G|~O<#@R^YuD7B7SEd8_*Y?K>k|D^wO?<
z<4_Sa4JmTribx&O)g7kg+DdhHT$EIv=4-w64gH(RylV^1%!5$0xai12o3tvd>Aki7
zIi0D4fI7otT2_oQ$2FFh;X-uruE1a;Vz}u(sa;>93`sZ7uaQray#)~#{up@O%bVWB
z{?oM3^XXYj<)3!;8CB?t41~L{ug8$oFR+daqjc_pX!OxxnH@?(jxi1iBwDxAX-Z#Q
zc6npil#b{gP<o-Psyf}`>!|MD(NbpUR>N&H0VNu^?sb=*i1H)%30^iZG5Z;J$@%Sx
zq|t%atI3Yll4|(w&!W^+V^??n{k4L{Ul-U+mM#T3t95|g_!xU>+9QlA_>|E6SAF49
z)0l%*b-7Y&++?>-^9t@{qT0etuWF@sZ=rmfws_XXyJ{Zjbo{GeLs1hkH(?QS`c10E
z%bP3DbE7{CI3u<(-Cs#-Nu`z0kALl;0{)u%hYJm<4$DyV5tkh09W6Cenc2VGO3KgA
z-eeZ!<rytqa0n86d%k@iIhh~gjZDlD#+}6z-;WjvOHFlzwS#nT3U|&`b+fXn{7a_C
zxyW41URttgzSHyJI-OGnjVjL1i*DbF0o*B+>2gITw?tXI_2=ULw}aM_kWiKXZkt|)
zMf>}ZwJG*aI=Oqq%1P-c_IXhnIS6fXdmz6mu@PnEU&5}W-;}Cnspv^pkt_bqan5o)
zp3PIww*^rNz9zmw&XYs4I=dGVK}`1>8;u$;CVo_^QNiqC4XAP{e}7M>(U2J=xSX)7
z-xW@yRw8n5ri_9-K|FAyh>Vv{ZLeX8ArKYmr9wHKbMrC;vqW)$RU#4-gR2o>=rMk0
zT)AW7-=fD|>xVJBr|s>Z_{=S)mxJ|#g2=X*UD@82_}=rsT=WUN{&3OHE_$%hn|2xB
zx>(_J*n=WGJeqmA+c){=jo&=9_2tb$c6Q78=?|JTJJ(PvmAGULDGr#LwuxC~x%P1>
zlyS4f7y7HVIKo7;qy%Z-U61;;3R7Idry2J|y68()bo%MWmLV5I@=P->Jzt+%G)cpo
zGct3MSkK0krL&0=+3Dq0G**)&;tFQ5ZB$I1@jMS}g+ZrLe$GiF6iE6|Y)`%%>#2o3
zQ=fH@d>W~dMb;T6=hKvxce1z6{&n+cz_D)>vGR$q`d0afyNe4*{PmHEo-=5K=yquO
zi1>CI9hOI>%WXQ(lQEc-IIzc@H<_NkM+8Z<na12oOBz0_rgIhU3qv7{toHlJfEh6p
z;q<ye04Qj`%OvgxR6^Q))^pG)E|+&q-I!925uH%5uV**-`-hU%i9chPfAjKz-U80X
zOiEhR){wsnPU7yiKP(-ju1x7|>#Ph64KBoCL}8P#n|2Ds3egSx;_gPq3R@j<Nj8bb
z))VZnDnPF=+!Tg2%HBz@Z)h;Pc(Lhmt~(fMZ-RHB)?;N?TxliNfjn~SwFt6(&cJ8%
zZAHDNz2(P^W|oRBga}DNEjNK0o&DlUT@)nFevP(oJeP|>19?PV8!!hkWn?CtGZzrV
zE|uw!lGtrCFCED+i!0I>JUtYxG~--aA6n)p(8;MPojx!Yp%R3V=~ziz2}*yjYl{d-
z$;>8<>s%?APlBQ5ni!ot8m({7%fe2e_OHbDGz<QxaYj!r3tl>zSLoGwrK@~Vt21dg
zT<i$mNR6%zHC8FUa>V;r^14dS0T@Bs(yC^L>%Lwsl!r8m<Pi`Oj?+NT!=yHQF(XuU
zhv-5Uo74A6gy=U(Ou+4Qr4K0KCZ5+PSj;DEjr*Y!8|Ol*kXPdi)5f^jOposjb%nCA
z)pYDpxP|F%gn|$H>a?hj6WY>J%pba)gsA|bK4OOWJHFqx^fO1~2*k1E4D1@wG`nBo
z<Q?ebN3`%ToXv~oa=8ol+7w^v>49e2anu8i$fHq3O&G5GdHcnB056|rp2i*Yua7+n
ztI`X^4+`>BNJ*zlBa6yP_|z7S@(jTlTp;E7f&>cv>NM{ov~^>p`3s1{<%&jc$Jscn
zZr;Llyu)p9GcB5)OkF~<K|u3jGhH;7Ed!+RFnA}2QqV_y#oeem#lg|lLI|P{;n;7O
zMo%wGP>i(yU7qZ}|2bdfSrAXFv>?R5?|VaB^QqU!K@h03W;W6>8}x1P5kZ0avk_~9
zY#kd3a$ge>A$<{KX<^Fk6wPmeDJ~0SY{cWdUs8B>2N#bIKyT#V8Zu5EZH#b(u(O3P
zUOF47)G=Zo@Z2AaJC9L@q<>;Z$lfc?zmRU_EynJIVEaP)$N|;)WHQEmG953!XV#5E
z>)HY8Y(buXA>tI-2ArubK|W)Y$-HCwl`D*YY#YT4YsC}jOXOguFAxs;CeGZ`EsYJ<
zHOmqe<L!-QONR4$oaru|bCagW$NRug<kyu>uhM}V^_N*8WS_M8rmHF{u1}7>vZbxK
z3WJWz@WQ3tY{4&NaDrfoS>g$o3%zodmH<p8qg1)=(!F>SykO6$u$|l*fA(ALd<I@5
zvhaEWPKp>hgtP=9e;KVdBBfr<lz^Z=lP_h;TCKgE8(K`nA>RwBDxq-YNh(PvkB)NW
z%93uY<izaouvn>IOhAO2v3jSl(-?pMotA_}fSE-bSc;x914h$|&k@)pG||94Y-0XR
z`v4JK?qXtG>EzY{A2k@KF35G`rXvH4ED<PH0Xz}cWqIZ~ml5r0HmI==ve+wG==}VS
z@Jqu>4e_PNmKln9rlqB`yQtm1UqKs%6^K#7+q_k68QnV*6`?oGEwu8AUQM;PI)(gP
z^YPg<KHy|Pd!6?-g(;xrvMh{l%`%mL<T@JiGV6$gArE*yCc5vXS6!R_ak?<?=J~U1
zb7VZ-S=SMqOvylW-Oa;I4s;zWVaeOel}t$w8J6<@`?Dfj^}797YH~{MO<s#nKUdNB
znogg@fi5<`d35k>+IEGBd8t!?mC5kAKJTdJAnTH(gOguP(Q!v-NpEjs->XH`VJ5ko
z&>lvd==%4l(BiVu#Ms8CqB6zNL*k@<`P1`kkMkS<aM;yizdVM;YxsKMoEf}eA1IZ)
zf>>$QtgjcSN(ZgXG<Eub7$wB>h?1?P>iKReT{3btD9BS%$RS>L)BDgpEfEexRUNpQ
z9e%hos58$Tl-P020NmvUuYFo+HWkWjEz!Qwbn?AiPNKNczKx<PUd{c}f=7qPwh=ff
z?A2RmRUxrbAC2}iOFIwYuhQenzn0Hi5>B%P%NPF)UD|GM+fDKWmjBg6jNL?)179B6
z)L7A&r8@l_PEW5g6JfozBT=d`mxoR@Y-}`Ir`Rs>+XazP4N@o64e9mCS$k4!JMu6>
zkl+gi2HNz49@Lw|gSjdgaB-pG@u8$xEqXM0nCGd&EV-%3OHhLbcLf0*d6ZMbbz_}W
zMehLjeE#AMTefdxlJLRX+_PkY|4{Wu?oL}h4V4drh5ty!5-sl7V&A+Aky=~fB@nVz
z28`o(Ofm(>6|d4VTyrj#hIEaL=nAQxnQw*{X1w`%>q^q+>ZaMQFp%Ec-<KAf7(%DG
zy7TO&?%TWAdZ-MO=#$u$H+>Q-_dEQ#GKm==dz$Bc_-iF~z`C~i-UPyBMw)mAl8bJV
z`a93vB;vB;v7rZ$j{n6f$$tXoV&W&4#L9O_RZlMBUJ-qDcgD3JOV7}Dyw_i%HT1@9
z6nIcFWl(c3_pz%pR($>y1pT3+JaID97_L+Ba^kwrcy!F5(qqbNc>ZWww(-^g(i||F
zGQu^R1g_VezTVDPtDepLjXgSs>ehbgPFPt$-p<YT=?@9MTk2$$=tVz_FotweRT&kG
zcVO$7AeCZFf8?{;8__S4S!xSS8tX;tGf|uY^s|)>l`!?goF?REZr1YX`AGNBV#?UJ
zoKd*OrpRaQ8zR(YBA-_?<8jl$B8mM$gx{sjm&_@iM;m1>$WV251gEKSwL^>8t&yqI
zJr@%xLSeTs{6c)ud4Fgqwt-bu<;#?CL#XuZ*;&fd<A&m-U;cvnhw+0d)rDMSOK29n
ze|2m0@1<Y<C=;4}TJxKL?|HoN9l4Hu^U&;?vjpTCNx`c0{`q|AF(@g8VEE3a2kuv-
zrO<5MsCuf4TZ^^OG;4NQnrnt4W@y}OPOr$NsBW)NaH3mzoP6J0^6I4PcA14sl1)1l
zq+%xdPNm{+*qzt&jFt1$?z{yqzphVr|2Ey<AI>OQzOOfv!{0B>u$iDKnW^RP)?>Ne
zEL&%!hnG>Y^mI4swi}*J7xnS}t5dKr`g{}USE)PimXIrqf#kJ(*Kq%?7*skikfVLJ
z)=Ts<<T_3rb9uZx2=m&D5P!L}^6mTv8IM?tQo0^8bSu9dli@siLoY{3u7TJR_nhkF
zpOzlG0cXt8XQj(l&uX-7*rPjelN%*djBhCWS#IrAv5ZF|i1n(Mm?IeOkAWx+54moG
z>EXen7#|;sZ55xN^NkVgyn_XUx>etDYGcyVym8tg!a!>QwU>JNaifGw0b1#--F4;B
z4jyz>(+5t{>Q$!49C7l-Puw|v{N_<*8f07%pF^ptiix?Hl%<ry{3_;K#URa=K@?Mm
zrQ7k&6JI6HbpLzc*n9f84Qr&MmH*sD+cz1X0D1E6S}HeFEuSyoh*96AjejPwvO-u`
z47gYgh`W<Kt(ET?@Y&*F4!j5LO1N&dqPpfX6|BcXaXD+IT8>4zov40+xK^w93|1Lt
zuw8!HiN%PQzYG%D9k3S#i6d%r;)T>-P;8HrWhlKtZ%izPlTDR2NiWWGi;nM2YDga2
zG})Wt38PS&gu4X>VI_|U#vAX%E-rd$GUn}0!YeH>n`zipU~r+Hpu6NfwuI1YqvU41
z>E!mb(8G#j<s>Y6+`N{(fJyR3zU-S#UM~9!DfF%kF!((a=TNvJgs{=D<N}QDZ*2*F
zXMT(XmWNE``17KiNxG@teU*Nk@G_%PMN7c&V$c#M32dZ2Px;zvSj=sZQ~h_%Z8WQ)
zbUf5e6?}ytGBE}T7?vBfrxRYE<*Tp&hgQ=<o*Y=#6m2VyOPvnAh6Wi4A@$fGiyq@+
zmFoL#&4&`DwzK!X*l4Q+P2ROCEkl(zXyyl`*$R*tpVTlxI1r2S=QHX@3vXjtIG&PM
z>1m|sB|W%NHT)!Y_3$4%*6r1mch8Qd8q^tx7<d0x8(RMWav$5RU#C~sw@~)p&Prr?
z(WKUsvsR~!N~OrMsL-Z}<vugZ!j+F|onY9Dm|Tqe1E@)RsRpcS;b|!}#@ByJuR^rm
zSG2*v&*AWB!dkDR!L%{DQvx&#x?bQGbG+njv43<is;}03?(%YFv)G|P%a7_oYeN5~
zddjeLDu2fAApcP?ZtRCeTc9Gt{`um9tAuF{zqG#c_mXh*VB?3=?`=Dkp%uG%KtsGg
zMSd$G`QxFNb#5yb^WyG@@ipxZg#H#iYh~x{h|5PIdnNpP&eFlpG8gn-UrlP;qrEA%
zX_Vwi?CghE4okAKIhS%;l|pwgA?Cl<TLPWsk8vkI0uMtk6Vei6;~%ooGgAu11Q3NS
zL-?m06fFgevkVD8+OKc+Z5cPvKP7vYGT?ypy`BDzn@<q|51dgW;YFA%pRC@t^e)$L
zxStZ@$yHZKG5nC7Y>LC=+YFEZWV}^WY-Jb49hS~?^hMqC{;hL5BJn+2^uAGPEVj3U
zS-40`@h<8r`rtTq=SEAa1vEWZ^kxa>&XGc?I{m{55kHm-`Uwr%GuB0Xtq2;?ytS_W
zvyGZ<&9exS<3oz##acUxgaYGx2At`TS+pl-TWGUQgKvH7jd={QNUU4gur;ZOw{dKp
zRZ7t$&!{^@@coa{bN)tip>bc+VHE@fx)fuDSMX}yX3hc0+v4r!su-l?8em;8b<=hi
z8vWsnQK{B4jqcBJa$V~F<Z=Ln2k=r^&@_(X1^3+{)hWwFc+S84#pm!qB=_kRa@ink
zhk_t@B{pow08fpDYDyS>0|S?i2X9A{UuG>Xi4PLpk;)GCcVb%Qm_B{qRHUStRX}n(
z4J+-uL9XQeH4v26OAHVOWz>`}F*xlnw}oOVj^DCLq8&h6o8Qbs*4kFU`yUL_OQ0$X
z+iy0~AFHJW-nI#8*o2kvk`=%p^c*j&4%KIzY*S_DH&ZM~r`Ya?oG_TTbMdiN;a@hI
zM0SM0F8wswD4C5{*l>#`U;lh|yd_cCE~(SS*E#h!1~oovN%79+s^Q)@vt;|o>&xyX
z&1fkq#A3+pb{XVWJ4_rJ=Q1ZsjAG+kQZ5U8#N=6(ttSgql=IgFRDbB%4bzyCm}(=$
z|EXnY?Z0;)08VhNMTbl7JTA~{y{eo~qp6vjz3e%KD^EUdTnaqNBTX9KCt34o2d;#^
zr;MlXeLqG2DcP5v9%|))%=ZZrydYw{E;EG_Pf}ZVWaTN691&}~9Wg8Td8NP63~${@
zy<;rbotg?#N-xs(b#t9tE`s*P_hq;;9q01$(gxknh}MYY5g}E+^hhFLMGbr*G!|f$
zC1#Eld3HN@+#s)`dyx@Nc*|lg;8i|PXT)yB;76v|9AY=bvMVk(uv)U+{Co5sQ9;SV
zbORnHwA?BS9!Wdb(5gEx(4SA(-ET@M6;wIsN-R2mJF!E{y{QhmwL`o>OP~a_YqiSm
zLR%W`D1fu|txI&~?=huCMGdbp4V`DvVvaM=D8v^-&=VGz9Y3(cGV4#Vnj4DUmYNtP
z5;Q$+n+N)Ky3zZoBw|KslnS*|FODx=?lbFv#4I9&Iy^!xREPCzfIbrH(-OnUPnUXj
z&CYhQSK7T5v#UG*C{0f}`ga8tc}MlpP@ts8xUbqtTT$<{EIf4~X}MrP)|&+7vzcD8
zy8<jW5f|Dxv>Q*>$)_to21dA;c9|T$DnCukyY&&?p0=<&{~b5*HtqJftGN)#m+;6k
zmDi4!)>>~VjqmZhj79~re;PnoBpUxI#zlP()(Q(JG`?pX=hsLg^YeijaUc1ef`Jja
z4i*>VT7TaP9u`Q3enPgAqg{(jwlgH~*kaVCZnrwaj$xxuFIqdgjN8Xp&0MfWV#xZN
z5sE);fLHT@&2v(HmGH<1DJ;b-8A*w(q)9A)pwvm<xlM;#kgG<0@xB3Ts8_q8Y=6Ka
zf5CP{;X9Ik^|~v+9{;e|cd!jGVAzjYT&R-lY+2nqSN{gb_C9J44$<c~GoGu#^+y%A
z`LD1?;LycTdN>q`Y-pXPOE=mS9Uvkj<C#PZbGLNrPQO}24t|txT!1-T;`Ru_Y^f=7
zBWI74Ij_zZ!$qB{a8d2Z&?KAI8uS>_&JG1HzqD%^$lkGJ1cVdFz8_3AV5Y5Q_#vIF
z^HGjDGW2VGp>HkA+XqLFM}maT`!DL7w$$xb3V?2lFQ6DknLCeKfR+=IwsmfH)PdLE
zZZNt0Q4t=()!k@Kop|O#ncW-ayS-r@VL6uo<Z;dWkcv-nRrI1wa3ff`mutaLLmYk7
z^Spu%&7v@kpx?>8d?IrdW-ckUZD!j?6(nN0mcsW&O5_Ku?hweU*BpE$m35s{S5W-$
zVEtaN7DUf??S?t^xg{N?ion@8h)@<cf@P^S;-MM#`AY+c>9ejycN-gZp8r*tj;Sa5
zQOQTO^^-cIG?WnU=?7wkFVPA?-!Aglu=o#HpT+hQ3FML`rj@V{y{=w}*I8wKO!9!}
z@L|~VI=`vjywIO)T6TG_@24dA)xIk$f82l*nrr@izQZC!%@oub{ZcsdUZA#}7T)e^
zUxim2&XUlSf#j9cA={@rUrM)R7&009qciN{7A$Z9@9;JZ!fZ^sy_uL4P6pY7uFiqd
zUC`DFf7IC~T&8Ozrl0HzHxFx9sm_cZ57=hG6O8$yL}5o$*w8PHn|AikjX~yBZcLX%
zy*0mc9x9ljCi`}t&fJ=99vHqobVo5l@VfoiCZkbh`ebSAJw@jJP^PF7^A95XM}D7l
zzCPoM<GR!oqr8$ue+X0Ln4q6YIm}@**}?z9FY@CQ9V7H%F3f?aMt^f9g1SEacD#Zr
z1JD;{>OZ_oPZzbGN<xQ<D15`zXjjj6Z4QDXh_Bnfau_nHSp7xHl2=|e{eyg*)+Ocb
z8nZ?5WrKP+wJ2`sbWBpAQ0sku+|hxA%sspxrQR^p-x+v{R`jwpNl~iHP@q1+W^UBX
z{kMLd`fYhG9p4(GwC?cmra&mt500ANUK+5b%mA6<D84(E<JYsvsXLI}Z&0LjB4A#N
zq7VHpNdCDNX#M2lE=7n$h(|O9u!@x)sz=K4t2%t=HODVv3+-;ilUKRT;~s=Vq*?;0
z_*_Bxk6@ai;@X6(MD(2~8wv_wb^avJxIdD`o^F$G%Esr;wjt}E-=OmWN`j3CB}BAF
z4tiQOO8akD##3HJF(X6OzFEF2Vk1r*9u9Ro<&H~2U$}!d>~ULUD{XCE&{4wW=60s|
z7oEHaG5q_z4;t(UxnOc%V*}NsVo(&SXY{=v5<+200Lu{PZV7%tZ>F_Z0J)wDnvt*T
zz1m%g&*GU#g@pl69XRG6CIt$^7XUK<M6wZn*X@l5jMg)3JdV-f(#EOil{QrJP$gw6
zFq2=zEbbI!UF|;H7Ed+YnUuIxsOoDtx5lDWhqq_zNeybhe>}*ec<)?Aubw(iPn4vM
z%ixb^<$g;@nMoQuwDzu`%Z7w5f@wy9?oOVhc(--IN4tVM(i8XcrTZnA)+KIAivYPL
zs{wq(x#5OdCuT(P3=NN8-O;ApVlLiS9&;WmGy8@(fg>JwAgWw{5x&$tuy4hyesuGz
z-2B4}ME0N(uzCZGKF+f|_r=eXlI($B-%+7<?^s|Gx_+3?04Jd?OCfnBzRv`L04}aW
z&k7;aQdn$B&FOGndmr4|_z31^X%D#%UL}$L-l+H0=*%AUUC+CAf~Uy&bL@w!^~=R~
zTDtJrJ8rI`i8p3F!FLt$K~Dxgn7(IyE%ZS^Se|^b>g$XXp#zy!=|gyT(NjE!TO`x6
zt%U%$f!cRQWV^NI7rMM0aAq#392l=Nw0C17xl&oy?gg^}xQOZn(b)rD4Y}+nJq9S#
zgmFBFs^@iTUn=8$xU=qb=bebcGv2ZnpZ##Gj!y*=$_*u4s`a)|Zrn9q>I`ycu8PW<
zG0U+NG=FA8KNKp1Wo2IFMu?k|1vdm)aS_))jMiQWE93c$Bk$k1&m4B2CDxPhiIQxY
za1@ipmr^6Jog%Tu1rqcPS=&4*)2`h!sBM4QWB(XGGh2T%ed2;sEf4#9_0GKsfsON%
zz6ugE-%oU8AsnnmCgnet7{gEdK1(nZKPOA7iM_trk0W*>vCVzrLw7BkLd2vUch`th
zOyaMzP}(}+@u$sG?Wo(a*XDw8y6Wh&eby*vZhbyp1Ff1?@28R76YR3}V)84kO`p3h
zN35hj^D@e1uF7h6EjT8yD?QE4xqRT1L&j?(EE`^E_v1jD$STF!QlsaTN)bO#mD~36
zM(X9@>F&Dv1Mm0)P0D|wd6^&^&+?y5kmhJWEG1YoyInMEAGq@moUI)aqJnGkmf5^N
z4qk~Wm@a<yJ1sawl)eo6TBq*&P6#drc{jpY#28YeAY+ZI=Lbrg$)^0xjm^^RUn~0I
z|H5>3XW(S3QzLc_-%BtEaB_jVkL~RYq8L`y|CWQ8ss&rpd)5@BD+ld<&CQgd`r)vM
z_xoYj!&lnxB;?=GJCJE*<_5vloMiQKP6kVEt|k+XHco!VK{nikz1=;3uWoh(TFmZL
zzj#CEx1+ipZc_(1T5()otxRvt-?2CURULsaC3|v^8!;o30j6c!Acc=c&p1)%GUoLH
zQM&Hhlz%hYT^=RSUxoyuP@FQ+8~3yJUwZSmaL`iE&2w>3J^e-4-PZ>|0(mx!>GHj#
z-byJgXfklTVEhzNz@fndco^Ss#U=A&-Rdvds4d&aEG?DqJ~lp%Zy#K09BMxN7g?&M
zJO4$Ngu#z7JLlAaEq7Ax#f3a4?NdFK>faqQ&(c}S`p46hpR*r%#Vx9^*}(>Xo3&jy
z*AYJ-O5nfC5kQ`W&?yJmBLa8o05<)vq*$BN^JIN(Ks;}i3Lb#kBzl{2E3Gc4r{;@9
zviGw_Hpv}6e)t4*iVf)jMx9_D$ja;r3{85er-totQAw~n0^b*0;%#w|61{7?g3|$m
zf8L+hh0G^P-d84h=9!>pXoIKr1d$B;W?8nodZbA0H^2X@vptNxiFS<u&rH)Qz}0FD
zGQAIS*ZVn9x_)s*xnU)+L0|soSbO2kHd)S>X|nJKhY&`mQDQNupcL*vArvzlf<^;Z
zR62#^9yp)|HIKSE%hAkVNj=~4r>W&M%iwnySNOk~Hxr_!u>P#b>2!Y4b^PBnyG&>L
z-@v4cbb8mU<;atHBBdyfd^RK~j_M#UGV!jHTnTr{09E#H1kO8({+}1X6Z`6|K>1D{
zv8~XD^Bxvc=tDx{hw3C5mFk8vrC%b3@fr;(9DF`~Iq4bU3JbV{`J@j>%#^!o8rM8I
z#@z}BCY9@G30=Ym?#)WG_fdvw+gnA>v24^@&z0fnSBO8m@Hd&!Dok46qtEUO*CH?P
zFffq#pJDHY-t2|y$iCm;0%V%Qf$HXf9-F8qS|7<j<B%op`Ahdc-<7uvD2hb_YgP-8
zb0;H_ZBR)~ix*2|Aajm_TBENU?W*xg-7`1OigOk2$-FN98g?&PDfp(9!5?$|B%Kz2
z)As}~mPqRQ>DS02dcFjcd-CT!L_w|xovv%5oy+)TJBE>^BSmXAPoCq+^<w~$b@=Sw
zEVutiNtm+EWP0K|Xz2h>`j-t9|0Vt}AuFwcg{Bmr4OoGnvDg$CCrul0upfFPSqzvR
z<bBq80b!S}D41TAO0CBqS^ki|46zpE`EGe!7<JeHPl?S&$Bf(?h_MK?5P-Ubyz;1=
z<oFFS+z~Cm(^W|tKIlmFxpiz>;)9kmffc>*E)g?2?B0f8Xnc4DRY!1O?4fClk$H`h
zE)iAAJ8Rk`^^44T*};+3&OxrQvi0x-Q@fS)e=5(pCTPPQyZwkKMfGa;l#2~EzbN;3
zw1`WCT#POuL~TJ_IFB~GG%Y5-chB=<jfKS@@D&nh?b?3#i*E9_i^%IL=Kc);VhjFF
zQy=?r(Cl*|3+VaubHj!^$rr~7_`e8g*A;-F?Cp)Y;&ofN+X7@=dpGQ#3ctdPFH<zd
zr*VKE*4xPMH?N|7*m<v;qn*z*9C&<X|2x#=;R8txw%;LWwU-6xz)y1eT}#u9jp-G3
zPqLHs7}d&Vj6-|sWd>qJKI~&Yz@((R`<=*Q;#9EIwwIl|(+vbK+86J?3p@QI_bf}{
zK{g(J$1QJi@NU6x3l4}z!e9zzyIE-;N?p4=s8a0vAM~e7b^df_yYuSNBfKZc)B;N!
z4=)z+(Hqk3-Pl0@EXe(38D1H0%7j_@+Gc6oq{FMzsidGz`Uc85!=bA_{>$Rx$KFft
z&_LXdE*b%n%n<OLdgoIR8-DGnza2u;fpxdv6O;qRkiT5c&qmY|0K{@)9^L5v{)gqv
z0e=3&CB>})%ONfbaVmjlWmA0U`5k$5U-BEyz-DZKtOx;9wP}JWe$wRL3;9H4J~{zh
zQ|w7r>7!R-3~w7Y^9{Jw_UFHtBLnmSUT*~KmZf{6=*UAPz#;Joxs{`@=f2Ii=M!7P
z>5?ONwf(~5`yV-}6Z}7}zA_-He*1c6=<bs45b3TVC8ecX0STo$W@x0PyAhBQk&<qZ
zmX>a$JBOK<=ehU!zxUoR=lj{`_uG5zwbtGzs6Tp_mHcv`DZmRQC@%OorPG6o*aR&s
z7^w!|79F6%9{Fp8d)+}FxFrSTWmSAZMdN;Ur~lp`_7<o9B}Mdek8CPaD+%)5z^S3!
zALw7}_4=BGyEPEUulqd)z3~C+@ek)<1b5y@;A)|U>Om#ioST*rTS=Oa6|%*#aE)OP
zo$hS;Pofx5Bq4#K0ufc=VgM!JFQ`K50Qmb7QA^8<&ZHbYyc|?~L@0S3qa;W>+?|(U
zG1Ci?MkOxbj3r-buuNEc?zz1OGBlsIJIp<K$<YPlj2RuPW|@R5;F&$vQ<%0XeZ!Tf
zt)jUAx?9)+M#HTAJE5QEJ#U-1oSnyfZ7f)RQOK>;jpKf;t%Vx3A%mIv1JS|L=%Z}n
zA}VTS7F|KR>`i9VT>0k=p1<=4^??)0eD}M#y<J)SF^~8f=JlsNPEPAvr-Vg8kdiru
zpSl-dh^N$pt8JhhL(t2jQ1Ii$qO+-WwT^amO}<?0m;&CmJ;8^Cth>~)>bD7ZrbrZc
zQO`~lfyqU`5MI&`mLl&K@|gbPmcaMex!)g(pwu9L{)4dLms%JSZn;<4$`>U4qIq1Y
zU%1HYN9G|m2fly#YOX`WQL!{wcPJSYVuv)JF$f%d=cYCjKR&mj4`y+z9LhOgpBRW<
z#_}hB4OC0HtAI5Rz25L$+2D)MfqZydBitQbqkabW%fctvn^2=d_kX%BF(LSY`Q;ua
z)D~)hn*23V5);L)3<0F-#Qwx_(eze`1SVZ|h&jTB_W70ezJc`iA`_okFc_CLkTTKm
zB|b9rfE^nt7L15)aW)ma%F^Y*o^Zm`a!6kHX5q20D+w;C|2h4}I@gl%0%ANxPjLS%
zEYZP;FZh_fT0QUkUx%RY8Q`yA+-+J|ZeBA^AR{Q2b3Sbqeik~=5PKs~k-KEXC70lY
z5g7t1e2=*72%hFiFZW=sxwOHwyjWhb!)w(0@+q>_X4jmB6?cqm!*!IcRr$@@g)M7S
zy_w>h0{0}=5vl!9nFO5Uj%rN0=e=I$c|CZtOOPh}{^>vOeoDV1g!M@G+z9q>;=>IX
zvFkA|$bt?qUu8k%t3W@Q&W3xh+IEcmnA4sVX6X{W-mYU5-#7V(9K@LVuqZ|*K}}Av
zq`9!6tAe*`$V3tb>`mVAdk`2lITll%*jXmr|8A?O-5^NE^{bmLL8E7;fdNNJhl^G<
zZ_wLrd&@*gd{p{WeU81WfZNTuBg9_~XSCqIK>P<y<CaG@jMqg>OoT5mZ&aQ1U8kQ}
z)f*;&edaskSB?3;L5%!01nY;3#o~ieF7R~pf1dVC(L9?0aWHcuxc5kafm1Kg=0ev#
zZaI+I5R+h|O11xP>y3z?yRa3ZKox1`Y;NY|5zltMM^@gr7{95lUyy%On+etw7*$6?
z7sTh`MJB&xF?m{QrR^*kr0=}ugKIh$w8_rKtQn^UYe+QLsMqW5xe@A0xZVE)<Wm13
zB5A)qI)op8!kHCe&)4`Qb)W`WHAA%*+RpVEgNG8@^AMX{$Bx3aUP}X;Z0^p9G7jj}
z@1AP2@jUp@;v_$$#fx;;A<(1hDrw2MoHQRJQX3ss{jX?P;rv}}TPdgKoWOkImmFF(
zx(VgQ9y`y^@r>mT&2YD_?f~FB3j)No@o-a{(a=d|{}n)VA!`&X{l)L?sLs|&kzOBL
z$0x7l$L6e1;LlOy)sZlTgS(?TB1b1KwJ^dl;@gYggr6A*t*cM713&!84RngpuNgaq
zC*g?XW+I|dfv<qdq4WgrVmpP2P(gVU^uS17Bomami#7QfpvsVLQ2#Gq>Ze1}xowD7
zlS|8pEr8s)U`bh|6{(3-5|t(n+`nXE+q%$CyM^C4mE;mx1Os<W#8z2XS|t?Q_6wSI
zZRk~Y#wnPd?bV|h7_jxQr#}RM>id4BpiXh#u-y+L0XXVGvyJ<|KHwGfBnSZ}{<E$G
z{Y6dm#lF{c-F)El)t4_E0&wKw4{o&^$e{q=;%lOA@;o~bej^@eW+q)+eeN}KXR8%c
z{?&_b64ki}qTnPz==?J*otx|-g!ek`x3{;Gb%V>9;7iaLA8NJPxI5iymay$a=2IED
zdp5=BN6gEJCP)yf_7dm*&HE7mkV<ilgjizkl`L{jaQ9dUiR05pe%KFHY$3DoRMr*o
z4v4Dp6!%BKqYU5c{sxPhN+%I38dUqb`Tg14O?N14?pS?UBPs8+wi$w_Z!5(*-5X8T
zU%X&aK~IjhXBNl9c!x0Jx7gI9Zam?#@@b2js*?g(NbH*?7C8M2jQx{Bib@+A9svv9
z%_3;h$xw#o$@gM}mK*5E^Y*DOw#`u`Dl&oa!mygS`@Pt1yZW5aJJC9<`I*q}QCxsp
z#Qbh<gV*n#s+oQ46cH^BL~IWLCCU1@4haUe<sNs2*b-D1*|ZMgD1yxDMKWr?iyqK_
zEY-lPt*Z-Fspmm7CDD6l2>EHtIWS-=KUJ4tKzj{A_-D|n3o_OypVaLvu6-<~S%6Q>
z^&Q>fIlicTW;?9~<OX{tjIcGBA92sNw!J7M1#=D<YaUj6v$lPKl}+t6X^*2L_qN;L
z=V2d|7vLHx{6H=7(7kmvg!7qyODYSL?4XcsitX&e8=1}4N$U~!@0RJ`)XGUX@N3}i
zC$*FZaUa8HCos98#}dqAu9Vt3-IU!3B-o*$YWSPj6G?;4eJddNF5gG4P12l6<InGp
zLIB`buh|~$wn*)+ENuio7IrljQZJ0B^B^WTsg4E}iMFvZYcBh8MiRlq-$PPkJRalX
zuhl2r!r!@WiG`O}sbLBx0c%iFNVMhZ$}8FcJd`w%WGwozxN3x5PKHo@mkG=yC8f!c
zIlVdF6DTdA0CY7c$gc(r%pBxt8P)ZHdmk$jCB^$yb8^4YVTvprtj$D6KVL1A@j`x=
zugyJ1d?QS+zf5O?{09Hu@A?nG>h8WjQl!vIA%m;yq9jZz^(1Vdb=HMQHKeMX+iGNz
zGxi=_NOApm;}am247ph63xvV>NIA^Dv~Js29lR8;16`s@{qErv(*HTv0E~=W6JxYG
z#(g|g4_D4@6YD7|JA`{-A!Tn;j66Lbbpx+9i0kb!Dh@nG#DE~;3~M?yxC+BZ8g5c7
zZ`e91Y1$WW_$7XgIn|rPi0MrHffyoAVq$8IH4z)vx6S(-+z?kh#N|OiaPNlpi)Oaz
zsogza4#*gv!!Fp3lC}SY9T+N5DjgM-+=A*`CDmpHG#lE!>Q}$!lMh$8)_G<svD!%V
zcd_^<Ju?249;1HTU1+)2HRPa(G*N9>@gy!jSHSKEn&n;docGAT^+E;a=3H)F`OvQV
zO$@TBexk(ukWuxqG_4NuYv5Yted<Ps5fdbK1U#lUsPi6B<H@a6Mf&xdNt>*eSshKr
z*?fj#R{aBaMh{l7OJt21)n-?ZpoqGeyhbLc&64?!u61FuS?5d@>Iz~^=w%N;1H2&j
zP#D28J#ExO>ku;l44$Cs)dDr<-|nsR!OvN}?iQlmA_2Cg?~@%+bUFIG#dC&gq?J`=
zcjgMbhfTLv;xjgKTpBuC52^v-&w7sWOYGT?RGK;NAl)W|Bmi{s@S-4GMe6^?*|d^j
zMs9u2xdm8W7o#)2N`D<wuFQiipziyI!hw4ENNw0d`<ff=_S7>VE;5JlM|Boz!l$o(
zr2&prx-}y3t=eje`Wx}@z)+*j?PC<0<t(ChuThSSa_+pDduLOT^~zNaT)f{;=zFQX
zgRhMy<(<h`p#BJA_L+4nBImv1vi<qhFi|_~Ji(G2pIDZDp>K|!0GU3(yvXe8R3G9)
zHkyKIcG$Qk0vaIMlfF2wjP6T$Mm4S+D)4=b1eU}^wT=_`#%dPGqdJy79y2WP>>eG4
zpJF45$kKOz?91>ZwfZ)!8)qTmNV|~7@E<^O1!Lbq9Pgs;@$**s5bDGN<xFpShb~Nm
zrd%9zvhqhAa$|3liOtOXsysi|SIDm(qdMgA*Bv)@03Z6mIw2@o%~)+)EmV6lM@Xby
zkFxW%B{akJvSRT`w;yj8>949{`BJ~}-6B^^pQRR1@+}%oL+Es?=hdYcqyKe<X?C7T
z^TI0^C@o?ESL*&4HLv|g@0m}Y*z|;vPHzke6`p?_8ZdQke=s1C?K6YL${#ku<nQlg
zY{THihIAImlwW`7z4;ssq!T^FE<ol?iH4#&-6PUI*oImSS^7W1v=*-s#{VBJ`Usa*
zEeDcgoyG9Py|rc<zrBL{{KPpY%4iFN^hiJtnhs-mFl8%+e)5whVwxnv9!=}--UE(~
z(FbfLC7SBoM^lC>O!!Dvbav#9ede+U<S7Bf69>4>Ud|t%01^uarcKSL3zg%lVZY*P
z+p9U9+e2YL?~54>7+ty<UhJ7{f_Nj@>FT3!yvsbz##7=}(jmbQmoNKBH-TLw=g#$T
zX%e=hLc&nzxm+scHew$1G~acxn3VY;)*A-r$W*oVM?@^Ly<Y0QoM5^?BETfU`_Pqf
zrS1|=-*d4^Lu#+Umc$P|n@0s0{l_aS@{j<^P4W;mle$yBOAI`U-TV!NOz7Y3Xwt=2
zV#GWJAFQ{dOwW6w>1We8=F$lgMP~&mkXL(C5~js`;QLfJC!7j91Fvw|g++wg)hRoZ
zl}~pn_>)y=^n@uR6@lq*cwFcJ7S?TXPLLC!RDFBzvu*nJTlc)473a@?629*f!Mbi5
zoE>Zl^4dfOyovez)bK-5zoT|*GERinAZ6!#H>^oBEGPcMffkn}%FNnayp{ZizS#`2
z-^38CmPMv^YhH4A26K%}YkAR%Sbz2<R@OCn0*{v_#_$Uny-Q2bNEvEE%mSTs4gbs9
zE!hY$Y}j%6Bl}+{=bv^lo`zt1dbaUox85cjn4of9ah=VNv}!|&xnxwiHXO1d`1|^v
z3TkL20(bRa8R(}%TJv4znrrQ!3HF=iyNMT@$ejOe(xgQx{ow}jQwaLeLTbbgDZ&5A
z*BtuPDU-1_L7YfFba4jD>agJD&$6xe#Ctj4z&UWQx$m;f+q<@Xz>+agB4z&_aN*tA
zKvw?l+FCK1rpDDO5!9yDNh6WoLmE3mifi1jj9ZT$w_JWtM3z8XbgS|b!ZDgn(VemV
zfDFBnGU>7N$3<RkeZM)GM8YvuD+?gM?w_F7swB4E!W@Bb(b9TOI1-CKYtWcNM*fRT
zF{u1EgJ;DtOey~J3^S<+!BUc}#I!Sw{USU11HbEUt>A}>*N)sNXEQQ*WYh=;<@4u#
zcQFyPX4qfbO`_n;%pK~uov|hn86O`n9*&ha`VO!pezdqhc5OWi**wr^-a__XdYWA+
zWqp6`E4S3#VgF%5x^`=A-H-D2)Oc~PUh(#d+icVMgn<{;h8%z7IFbyDYj)ON<o%Uf
zaE3A@@TI&CtN3L<I^cJjWT;G}eHDlrMTLXe*%W1tSH@38_pOLC!zVChW_pLy<}8S=
z8_uINC++N26C2-NpV4B}vx0Bd^(1e2A30eIyhcq+W8^uU|1X*71hwAr4qOwLLdI+-
z^N_75#^C+csK=-(G%sMGAMEcFWIxmgc|1xHExfszN`v@MDz@oLH}8!a-1dreQrg37
zW>9&~o-uR|FS~Ja>rIrURr|;4_QF>d0X*#KGF{QO0|w^iYqCW#IW4NN6};mDP3P00
z8n3hciZ`g6&f2Hu%?&4ke$?Ea#%i7$Ddl#NnR}Z;Aqy{%cSI$?c6GY!oo6PYKpsqi
zC<VN@qO~7U)rw-(MAjNAOC$+`V%nR);z)}JJtS7!05ujad&1?e^jI5qUL5x_(PuGQ
zUx;l@#_Sk-*x9}tGsY--g8pXD{{7Xx`T>J!2=fA`n%6y}Um}i52m|jg3BiajDBuZA
z(30u%0)A}U6E?-GlQ|mG>h=OK_5|g<fib7~-KAss<JBgh&MV+i4f@po96SoqEE#83
zAM0mat^KeA%$X;tQFhkPxk}(pe84-cIytoPsE^~$rP;VxJ*-`&X4Y4J+g%uma*a*2
zoum=(4H3^_7!v(>Pe>gC;+NuaYYX9#FP(Ywrd&na&8cHp5s#DtnZ6uIfHLsZ5#(pT
zQ-P-cL?z&P|C)F1qR6S{%}qY_D<TW7EhrPWv0SCo%;rrnfM-9R!oE<GE8XMEp9>3O
zpMqp7@^JD?<Nxk&TAp~bK<}`h?RtLwn09{U$g609*9y;tSsx$pNL^O2yxm1JrO>Bf
z((2a@<BPnh3l#+Ebe*w%tBSatm6P85r1W#<&AU%1epinOWgPf{$JM!k!X;!9s&86Z
zW|gn&;e(ib7I<6q;BFdr#@4yG?3SJ9Syy#0U0oAsbq|oKYsqT>T}A+(s=k3eanj8T
zSA3B(UghVY!W#+W?$!74`O2J}ukp2uw7Cln-0@ML1<@ulrD(gqdJUk`XUm8IP#?kk
za*=BGc+fqxfn6p=QKGEl9=~8e-|=-ei3c0IuQ#a&9*s1<X4CKb<RXqefb_q3CQhF-
zE$exf@TZia<2Gn@(OPqGV(Hg5gZ||dj$G>NGgy9>pL+dP{vJkZ1(#VK_6G~Lr7{Vy
zASTOGIv#s4Fy$ykWR491Z=aal-E_Q*ejun*!2#-N8@jkS`h3=<tt|dh;No-0NV`x5
z834MYO+p*^KnmZ|I4Lr?JpEJZ_mluu)@Fuvj+e}Y#P{n`W%wXb7jt)68u3j(Gz$;D
zz}z-<;f^&@0=(~^CrmizTp4hs8L+kZ!*>!_5%3rLW%FQk!EQ}C2ifNQ%^#7!L1l$*
zUZ#Dtu%Q>n)b5{a6u;42T-{d2ABkf%lZI(J-1h*&G9&I~3F23b`*y};#f|`-KW$<c
z#c{mD)(ies7gASA=FC8UrAU~=#Qc17N3$mB3tXygKpa*Hak495TRJ&75=pCiVUk2a
zmVO%37>nev(H}My%^w3Zpxl|c#-rg}>$9W1(X;Oe`OU)U^Rihb2-De}w{svqb@%z6
zw=C6eD-}e8OfTk+j>VF8+$?YX5v{`e`kXU2CLLq2#hzZDlcW9lU8W>BXcKdGc7J}s
zzVrEy`BkU0g|rCrtH)jm5y?LmZgoLdqb#_d+=U@_JMpi^0$*K__16KAZ#xj1sxUmn
z5fXeqda4W)dWQ6i&>uzRo#$2<9SKw|yd8`?@#k{FQP*V&Z(={T)}tc)aaoA%ZJF{%
zE23mja>54tUIH7LMBwQpM{Zj?z{8gY*=~$;b(r=Rs2a=1mqdaN*z8KbX-LbbTA$Ry
zs>WLJYXwoGB12a?2mTn+R?TMoFX?2y*o;^Vky;aZxz_`vLU9?nVZfCq&L^hBWZ03C
zK5ct=mF+P=b@yAT`Q!4*%uC=ho7#tTtds{9U!xs0-(k0>%v-)@QD7w9A`IDwMyhQ5
z=`9<&>-M!`0Cohao_cn~p0qXw#m+p#eOioI7T@P|Y1EvyHRs9328dE1TU?BuU$VE5
zIIVrS1}UPw2(?Tv57%hROygF+-3q~>qHUnKx127{GsZ!u&lhz$R|~D<gJ8*xA}()Q
zp4QkkoL=_b>0$(AK9IMmU3P%92N+R+PXP4^<k-g&#*d5n!<;i7oQ&-b0Kjky{BUI8
zHhy*K?edA!`rU9H8xftaxv1zEw^J*d*8GCq+R-tyQof02ty@dbSf^r{pgj9+AT(*}
zgTS)p)bk$`mP(MN29m$o%YOt9oZ#O(Ar;4n$sQDJxv*=^&5ES;IkD@ISdNu!ynOju
zGrjYqr;POr^VGej=g(!E(+8Zl6ll-LsA(OdNxu8N7)hF75`8}HoZ6{jw7|TokbBs)
zDqZOC%KvHygm=QFh}xNLt43qd9iwE<7hv(-hD&I8e!;N!Tm@&>R?`3akJPwE(H!5;
z8410~bX?>DsHY!P&jFevuIhaS6RC5M8V`;ffwDgUiBU|l@mzeDtZVlyL_koU3&&CK
z#=Hp@MT_$=hUaVNg##re9H@^Vf1IXV*)@kud(Z`{Hd68DYe6u~o9L-0qzC;_!I#bN
zaX)~ZU&y9^3G3P9Qe_UikuqXbjv0`OAM>3sntCpBipixILWd!wTaA>64m%UUzE8U@
zjr<GK1nN8fOC*B7X5-#v1!$fd9g;bTK>?#*y3Hj%m{j$YyFUI|u=6*kxjsApu2>}i
zzc;S99f}yfJwqG5okUZ;J#PE6;_Y8V6L7IHkQPumo`HPYl8)u(6eo9IJ@~XdGtFtN
zw%tgsWXr`9wF^g^oP~xX&f-Fk2z+1XcYC`@{lt8OA0E<fXKGe9V3p#Jtr%6*9UEC`
zwkE6Z@^#Nyj+y9*?f{9B>2HyMNpla|HFz#wb#VeXiE35R@64r4O{dp2RCI9xfUZH?
z8u7PowcUDNojX=OR!1&;fZ8ULmt}$jn+Zk^?-Esl;)?Q#-@#aP>=N2oT&nxt;h(O3
zjSdOH)fm55u7HBCF;GOzh|!h!qj*l`?l;E>0wJ#$|E9$eybYkgjWUQ0V*AmQ2jgKZ
zh4HY1AI_3wg;cjjr`wb1nw{^c&h@z$4IEM@Dz_i)g899I=sVkDIdF|Py<tWS6c0s!
z@%SIm$UnRK!HN#`txZfK`Z%TH>-=bFn9!aJAkBN>YDq{UF|3_~V5drO6!>I4qN1wz
zL98%H-N8;-G{*e%R$ZI~hUX1x-Z-=c(P7{1jEY`+8lNWdA=t2`MOabeKeC}hWgsy{
zJ*1w;FE)qA@iN*QCv!XOnuW^|%FjD{r%^xK0F^z(7&(~H<#I^ZZT00`KY+v1ciqM1
zh*fB0MGVZio@BRIvhQS(i^y=h9`I7{>~BEG1w{-%0%<KBb`%0WY+^bw@hHAGO3q?Q
zGL(u8<S6b~xUyh6c_5QVndLCz#Z$!2AG-DaB`%p~m&E4yRdtcGwh_dM$sL+s`#AG<
zieT5yaBhXdUHoFW>o5=*)Q3aMj)^Abr}Nae8PpE0`#wYO-7cN3ef0OYhLizFm4d3D
z@nBKPfHR|-Omuvw<D`xj4e8)<^PJ6<Dg_Y^9o~GKy!+y|Nt4R8wi}_-ImjJ47zU?K
z#-fpWIFdq4K>~yHYsS|jEd7UETh4a+%i`&up{2LlNCas?+k|Z$g}#)%Abx`~V)#7C
z(DrkYLypgQ;9Z5>(qgsZ=OA8e_w%5kn#sfaB>6<-gmj#v3$8Y+ppwD?#{v{(*-)%#
zg_wSNx^8#dyy*fPd_pmMh$e1XcGEMuk48$P0OeIyx>#KF9(*yT*5C{geAFGWhs_2Y
zz+b}4@CnMlodFOROjTp$JFp-{yr>S~k>}SNhH|XAZr!baya0eHPn;Zr#ANrEzL%Pc
z7)w5g#8-|@I!S2(w2k`Dz1^1L-@r=+KmQ@g%SPrgWvA;j^aC&l_ZboF=1g85*e0GQ
z`HR&ta!moDbsX>xGkl9#t0ym^l>n}@L&Zm7C+=@ts5Wia8&)V;2Ob|PXSAHDsdC&;
zFNYba^4tkf#r{ld%({onV%Q{}W;CNdX}nG+**C{kYr-9YSs#z1y%3B=3XEL57J=(@
z^*-1bap6++v^z1h9|>Va<tS=}i0V`Q{x`I_MZBR*FG2Wd6o0u<TyDPdTl>n>8ty0H
z+pBEtuvvqid*HvnQ{}uXVv}XsMW-(pT*C_>{YfM55FUh@@3H3fzw9dVOiGpC=(k~`
zX6dL-7fj7KSqCPOKewxNr5Z$<-mVo<%XOAJdasx{hyZ!}{y^tn)azZoBu;S;Iw~Hs
z`42u{ggnV)UuAz+G%)|7MhVdA2YpKd#9;9FfSvpHIx9i|wy()rz1`v>yi)m4rQr*z
z(bkTY+!hW+xZ_$9Vn-Vnwu&O6`<;;*jPGmAr`%7#Zf{P1<(%H0pgpAh)y(`-N!ex1
zp;!;eY)(?c4*G5lJ$plZH)K2T<g>tBJ@#Vx1|RILjI0nTL`1%`rw&66%>;d8+p=6#
zv@QsJ`g29(=g0}I{LL@L$&8}31sIgN09nR^uuLc~C>g4ImNV&F_!H%$3ftR__i7`+
zgrHS%M!8iu@n7xwKN6N=e5C7_;jBhuB-$$#jJ#vKd@5Reg>4b22r^Yd{s?<dd|&a~
z(4C_h!UOAwG`T#6d}-$HC93CKV)2xxD2=4Uw^s-1>P{MzK=bif5h-CAXh%T6*wD9-
zits<oe#>-)+uO{SF{byI`JZ=l@1v?gz?Ig&6t3CY`O3A8?sOVeRg$IO2Aw<iAk6CS
zbvv@W0GHmPO(9wH-Fnz`da&+_#wu3^_3_=YvcE}qrqdI=8_Tga$@Wwx+7P}vEDOy$
za|hNPXvk*FCBBPU>)VE+SkGESA;oBp&zSY{LRoyBz8pa(if3CT9O@=3zpYXbysUrX
zLz$0hy)KT}#H!gM+sFNlhRPIVM|Sn7fJFqUT8c8&9CT*!#_ov|(gUyeJRA`n|Iy-m
zg`RKxezDy|Bk25#Vxwmi6UpW7+?`m%j$g)6>rEqusSdKBV5o|&u1!^vt3!}Qi5avM
z8E@{3rWN73e-#g|EUw(3MdhCe<z3OaOlDDs_;oQ%u=jlL)3$T9FlmP8b(_alkKq}N
zux}(tieyOsyItoe?y*)R<4y8wKL!ZP^>U}|0f4~#v->qdS_w0SQsI6*lNBd<a9rFX
zdO!U|CY)mtq*H?6D<Y%&(?X`5zVH~oii0MNo=wx(T)WVDzXQU(;o@fj+67Zy_EMCH
zpJ;iYtpl)QC!|F7zZtRTPf=?F!qs5G3-nNV37Z7`Z)WWIi!=puG=<tPTrHb>XI&!P
z2klFsNyAb_%8?7ph%L9Fp;Q3jwAeEti*9@c3<Au0bcU&(Y>ro+&;v1YoB<|5lko!Z
z2g85aN&l?_w8(f|&9)hE#s(*#9RaBZdLHZfa;an4)YX?>v45|W9*dfQ1iB~_pb(%)
zul>Nx-TZ3eTC8`e`P|2VjXjFcMSlJ03>rbk2s<4j43~*yZM65kZ+K4Bea&%}(*d?e
z5s{*`xZ7kfQKaVyKBg?a#Q;=gg!d|vfHFX54)Fz4PlnT&nGz1YG!6sD<aIHS3|U^F
zOK4A#P;hNrT=~T&{2K|{$kmc!!{A$k)yiKG$u^}F6K;7QzmN2%_cIu@l4iR@meH0x
z&Fr)ofv>FiX24g^2qz!6(`;`KAZ}?nD|AL}1lx(qhtb9W`Ser-KNI=~r|G*!#5fkn
z;-E5QdlVJ53K-H^dVubRgi>b(uJX6|MF`jm2Fbj~CZO-7XC{tP;v;~{l48<y)8${w
zxml^;-%|g#J7YP&;hTpr=Cta>w7Zo|sj|o&p!4muL}Ie1JmZq67RR^&6osBVG$E+Q
zW#tSbofA-3z*Wx0>auX*;#Cq=>eRyjR?4je)@r4jpU}F8!#w@$ITkZj?iHiUEsi4G
zwC+v{Ye37uKJ{yZ$&)D-MRk-<dhN0>K52?3_sQzxB{ko>*dw%ZTyNzu-uwdftS@&E
zYvjYFY6C**V0wfH4f)J(JbN8~@mbC+e%lKAf$^)uliVrfs}L~<uHLqX3{y`6La}GY
z<di6MUS7r~=G7Z}#aZQ~6Q4BE*qPi6LE%TE&%k%1z|G}{vq9Sq{;h6ToFY%WBD%MP
zI_XAuc0AVpemnCcTX>;#qrEaZGjt#hf+$9Gxd|8QNYJBYq=>DHz~N1|#e6MT;V+u@
z9}$M=$<TbP{!tZBO%#nN&i2!m-1(sTa*X%cc0UCL+~uaeOs!N<4Z~B{2m#BFI9YaL
zayfNT?J6EjbM!SO{LMP0I<qy|r#YL-@d*fB9Yt>H$8a_cOX<U$O?_@)TxnHq_yjD~
z#~wt)j@Fa7<D3I|p|j=v%gavd*EUEsX69=~(Uy8;09Krk!$<{7|B{VFPqnz#Vb7(5
zku%2i)`y*Jjg`f<^)8fp?g=GQ@S7XjVkRe$PSQ)dD1SH%dr{nDrDJg|TKL7qsX@~L
z2GS6lE0<7|<CD(lDKyv)aWr>t_N*8ZKdExLS>yYn6p0<`n7`I*EAH1nGG?Rng+!ok
zSU*m-V9!~A%C?$bl*aV;Ipl8|^Itdg1oer_AR|lFqj#Y*=77sq{qX^TEv8YWL7C5@
z>}4%OwjQ#qVK8flLTqCq-Q>59#$WbFg*=3&HHdUYPGZi6vKqX9ehjPF3PAhh&<!Y>
zQ&za2>;oLATC4eyo0n2cvj`LytTjI|9&g?^M_s*(0HX`Ujr-1v@2`<{NcP_OfX}6@
zhBCnC$AMTUU<1qMEi0bOU2>c{6<E?mI{YD2(NexTO2H%Zl{DXbAfRAGssHffwYZ#n
zi=3mQKrLb?d+LC3)8F6C;nIKdb1zuzb2&cmYd{d~+N@{D!vHlOrMgn)IpQsvd7UBq
z=?Pd=;8So$omKuq+o9Wf7ejL%$yvsgA_+=%b|9UdQvTc6;Jt=~{w+;9EQL9FB2;<>
z3kFQ!E#o4>=|7ln>Vj|Id~98psEarbi>}c%gzRCLM*#F!%+eezqdbBHuR3MwHmpQ&
z`9Z2|{3@vOg$7`m))z18JU8RV6}2MsM)0qjjvLtHxbFSG*3;MZU67;z5+Nu9Bm&Qw
z1?&|#1y!Fwh()bg_aL5&`)toaj}ZK9D!{}9TV{X6qOC&s%I}eY`!|xKli=xL#gu3R
zsuLG{D!S)6X~IW+;&54>7|=<go5uZabEDtbz{&elXGAbIgE%7}&WN?j1AvLKc<NJN
z#)dx>4UKwbp?u0CG!T%i!sS$>FG>|xZW6(5p2tt@T%f(SBC|-2otS*cx=mD4D2s2O
z>Y(6h{8-G+&{0RL&)K^peTXJMgI2DPSd8?N09zLYg<$=i$Y*U(RgojWKJI^+)6o6%
z9qRDOu?{}*k`4Km`l!Pv$<CbnY<q}2Y7KE2^4eYtwhD1m2MZ{lRx@4>03+zXnp}DR
z#z@#_w-iu+p^~cenOE9DHaR`<Xr46E_*ZFI&B9mGAw!I5mpFi>kjtn*7e#;PnGfw~
z)Uegir%4`U;!klRgM9}`fMi0>=_rFrvf3t1`8u=iU$PijBzQ(hRV(PbRlwX6vyHv)
z(b2;)zR8E{q55Q(s+ksF{U*AXt9HHvrCqNrH^_b-c8?Px>TrUm$rA)tyZlMiq8tHx
z9^reQiUzCp7Kl;9dp?fL->gc(kH1XNr!X0m&4G1p1b29d+f>Ai`Em%YeFOJBY_Y>n
zS##<tls4e2O5@(QEwS5{aXh;i#vF1&re?R&p_F<)^HwRvHm#j};kRpO83h3uD-at$
z#1tujIt)MaMpZF{M%w<D3&~RO@T5g34>tQ`F@V_uJv?Ytvi`plA0uk#EcM%&nz)@t
z#muk#=Y}sZ+TB`ya>pscvhwl(Kbal|d|^d7V%K6wAA~tzv+5*>vpQ9q0n{<V%a@mm
z!IJ#nxIZA#p(~?}SSLQp48o`(NhnZuqWrmwNm>+x_o=tnU(=+_k+1B5(N_$q`wCn$
z(NE>I#PEVna}U=)yB<x%3FqwoYpkbjWb`lrj83hd*9jk<M~Q+y;@iLYNZS7R7U{~K
zAZKNQoH$AR#!jJIo>g`Qdu>D>PO(Az$%0Hdi%5V)6~;*LVrfxwbCZ=);&+F|UWDOz
z$j~vQ6<Ja74xsfN9BY|;*sACSyWqZFpp6lEM!v3|*scNFNQ=M+dNv#o5wQ?QE3BiP
z)VSdzFD;(n(+%|Sa$FHE?k>mpeEM)@+gj{sidwYIbYf*vPKU{vEP>h{?@aZw1eA&I
z78kTCidyzRJ`UuR?O5tw=J6<H-<A7dMYi~q!sv^@!A7zGDWfWxW-d9Ldn508%z0{i
zDe(UJ!%f54y<=y`<6*FkpCn`KXs-Rs<c}ET@z#}{BSu6dGcbn{H9RIhNuU-&sz@dH
zt^~#en0xIyOR;&TPNaH8m`2HLSef$GfV=y(G=zAgQnJ^_A+n9EwDld1^CZQvH`Qmx
zZF*-a25egl|0N4CX_gXmJ_^_*k>VzRb=UOJQSkIG4QVU~kkH2b<%dRm+A%CE5`~&u
zYMCI94~5AzZ!8okldiR_akUukCH}_UkFm0v`}Fh(Wi#h|KKs)=ClAB#N;!=3By8EI
zp^VOVyVPV=^ll#`l_aneGyR+vVYlLxRI&cPxpLc?Ge<NgnR9V`NI!Du$x?rwN<?gG
zrI!l~B9pT0R_a_Z3S;84_yOM5>OyBTH?=wsJp_S(E$?ZuuV9(~D%r$eVyznu%7M@W
z%+xO^z6xo@!}_IfutRuLT$}1mc6w4U;~u11mI)NtIb6<`#XVqY+~SAW{$`g*X1D_9
zN7HNHnc{zg5}sDagq~UdI`q($p~V3_SxM#P01|Vb?8~9{Lo&@<-}KIlwcQPCytTQS
z%ScUiF>x_-u@cbTDPmO!Y>$8){%-WPRRm+=NZ1j;gft&J1Czw`n^$YG;i&zRmrl4w
z-mXqzc@Q6w1K^wupx64AXX@s&7aT=NA<zhydqD+>-Zl(}Bi$YLxa=n7-x{~sqgu!R
z;n(H2e%bo~LhSUHbfCAoHv|x~NcZo><uCJDzT-1+CR2Y2wmRr8rHxUd{w0shLW?FV
zO>K|s$Eat|922oQM2gzKiC(^Wj`;q{f-kpL)A<jZWydaM7x%(sFmjnFP5sjZ%-?ew
z|Co-D>r+N^f<eMr%nbqS$9Lq6M{>!9Y!Ucq;={~B6<oiI5|#@z*piUFD-1Ub=WIQZ
zXoqxtUj^~~+4l(=aHQ>!e^}F6l}bs^@l|ARihCM)D<d|YR-xHv#@kNpu^*DF+ET9C
z`f7Atye2lmgvR)yO$NHcChxRYv`l%i=TEmB6u&a4*g<=G{nAvbsV)+6<z!B7E0Yy|
zd;q#vYnEkc=PG9#mvUOUF&}=u)+K|r>H|TFj>Y8Sx=-hk+=+sy<B|@tEMG(|KG}6+
zgnQ(V9NvcdnRMe_i^)A{qt)*Pyia!|#HikJ<_!8oA~!U*x{xSQu_@V8*8>1g9S~Cr
z*!P9jjzb5yu#`B2N6m<U>5Gz*y12dI-i@MTstKtoO?XJb5c9->R_GlsREx>_{tkIh
zB<jOZUm2x7i~RWPA9o;#d=cZncx4irl@_-LZd&fH3rzQ9x$UM<?c%0W6NS7rJ8laA
zec!fyQRr0|A@#tvH7!->R-Pn>j@&$33ltqIp7f7M6v`80*yK*FFs|h;8Iij=;YLC|
zXWiw|t0Oz-(d$9=qnc5rS4kNt9aQu2DV7l8eE#XZSWxp`-05}kz%fq(TtvE&%y})M
z5Q$o$Q9<zNPv8qWh6(8I_3dW-tOAv?P!sc5anga;?Y0-mtv)*9))+h?BJpQq){{{P
zfUbTGRI`7CeeIyI3k7^r%oqdZ%kRWmnTRGVwrTiYGXgt07B_lWD<q^^EqH_i&T11h
zN|B0Rp!c)$p+cD!;dl96B5a+>mx?Db<>;2=;gdqGHeZ%E=Y~>GlOB%~O6-G**3qZ`
zWFjkD{>(myXg6bqB@UlW*pi2Srjb|Di6e|f#pk<3OPlVR_-}qfed0ysA<U^ms^~z>
znTo7>)457(=a+2IE)tIBUK7{8b=pBJgB*vHB-O-g8cB^w4{F~yt4SSqVgvUu1;sKH
z@>oGXD&Ar%B^f0;^dQZo0@RQRVjN`R@MnbY_^=}rq{+3vvwUak{pgh#Y0PUSxg1YM
zU(OVj%a61B@-s6>8Zoo$0(BQ~zLIRaP%@o#eIf0B&O-f9*GeGPD%=7qFTi(@0<YN!
zrU4ljtw}>S|HPETvw+dTHJv|qR5wTM>hV4Z&54`u1?prJF}v6s)VC^of-+ikJ!Lb}
zg*iU&`H)Ad+tfWDWL~{FrNbncRtuA0|6C1b*L~`mIa8=ee{w}E(-EH9;YwTC%dbOp
znPjD@ENc%ZX&+7%1FK&^6V-(10JlY|{{uy3lKGvpvIxVm(HQ{GnNd(iYjFKS4>aXn
ziVQ6(6a&w%u^DjLWh0w4*ioVi3HwTnf}FVfZ~HEU%B7<i^4ahs*`m<tIrhnTR->gy
z(xpjCY6e<PWpzAhOO8Iumjh#3dWoKQQVqutKKWe=c#&cvQ(~|`vy=#)*8XBU`^Jw<
zh3+9xA^q-rsgC(#QtKBv2zH!>P!?E$AyLzK-JU7-{<J4y9WWgsy*1Z|9XPH+)M2Vt
zxW$_f8~NgH+X>6%8o7|uYeGDls`K0YJ|1*FWrT|lgcz0la~C904J$H^dBGk2R^Foc
zut?C(RpgwpNLI(q{wB|YV?z1cDrKz+yYn=qjKgP1#K%J6mmxexX^fn&F(=;S6$Rz#
zqBH3bF!`BEKPf|xe~-f4k;yEm{yo38DjXJ;g2Og|!We}5OQ+kVi~y^q%7)@0jj>(g
zXlkq0Ht9D;PSzF8XmI>P2S3m~#?w)m=#geMR|5Py<FinsmhFw#XucrGf_%Aj3cb-l
z#U5wx-M&egpxmoavA6e<1mT&bNA#)tee$Hw(TLITpM2WVedY@JYLWD#`ay|<Pgbd(
zQB@QMEo?JNbfxrS|3m8f+O}r=2l_v_zLn0R?6*a~P*}?0pCV_J^J!UoA@-=upl4GX
zdCi}EYrRoBKRET8L3&f_eeJ1w3&HGr@%<_<+pcv-LQ(p~VSm1(>nvIt0Y(BoGpuiY
zAK#Is7o^zu6!O`c$t`F!?QEj-=?}Nx$X;Xc@S<&ahKs;tkSleg-jciWQ1Rl*#Ej2w
z(Z5{<yGqzE!vDKj?A!V6$=CkEzVX9Nzz>xsEpE#yy^V_^DPu|S(fI60{EaG#)vs1+
z@T~4Dhu|sk!Se9wJDS6hIKfXCaXq1Hu_K{NtD9s>Y9W;$6RMB5tUCK%vS(h|aP-vk
zlH~X7omfgRjValc02HN5q*1gLK1-j^T&5{PV&;=ECb@<2;R}>2G~a8RjY>C*=>z!K
zm)zKInjMlCj`SBcH6js8&;h~Qq?QYvISCB%$nFaPyld{-A9_V>$|InUVRcI9xvJUx
zolII_!bdI94jwy{$WfMpIBekQR^`CU`c5`R1`2|7{%7gRS7fde)ZYxQ*;Ia+!S|l+
z-BOVld?BT<AC++;hG_F|BZeXbMZ;&|Y}of?|5nic@rU#P3=CFDhfY+Iww~ew@tfbA
zdgO}O<YBB-Yi`2jFU0wMSlMrUGBoD$eUsC!Ly(A{4xTB9rOha<os*GT%qrfVLFhr}
z$;7hrd;Gvhcr~w4(V&W~P}x<>BM8-<ioNDjuInrlU6->JqX-|GJO&lXYdkg`Njep}
zM0k)I4q>*S3Z3D>f?>Q&S#5*f_~66**N?f}cW%Qu;EbATp3N(kUhuDTNbuQ$rG0VG
zSQh@LTePk~Kk3yu1C#R4GC?0F^ZD&UGo)o=-`;?y;`7jb>K^j`u+shUiQ1&2L6D_g
z+6IF*9fsU9p|r@@AqjnnX}_f>dBbdoElaeE0pwQ^T5~`?5~LAZO8Hf^&A1o;HAaC;
z0T`_}9y!jo$F~ZejTszYLepd*U}N|+FD%|JrlnJBGi$fd6zA1l>N~^Vwk`H5+xFMJ
zWTUQ>IR&6@25)5^S)_%kQ148WO=ME9Zf7LzV_VR>FtOP(mkOC*A1vDAJG4t>4XxFH
z1LPoLW-S_7M_fSRw>cJq<9Tt%H-2tG{E2{zxv4VOpRYH-4#emg>c)e~hr5#KQ;po2
zE+$ee3NBkCRMaM}@2keXr_fb%@)QJ=mnZQ`y0ZW@f88V#p1>)CK8!{CUpjyEQ(Sg@
zqm(R|@B*$hfZhMOJ73tUc2A26_}z{dKe&+iXFZ{ZfS~ljEtKL7$AgjBd$F?tPgvf6
z^2^(_q%{Vf6|vjjqiLGqHp<%LQ}_*KS5k!UKXJyru8oT?ibc21gpa8yi`ErN>U_&t
zPElt(-{3<y4jMNwNjiX>bDtCnN~2|h5W1~jvg{QeQ&ylcA*62us_?`Hawdp-1D&jc
z{peo2Pjyrbko7`Qd0HJ`A5VVq-06n9xm`O<-<iil-H>+-qem_=5MrSXv-P^&yqP;}
zl8aW}(4b@&_~et;JCrVy7<E5<L8B0gHR@_oV9|eN{aje!92L;J1>|9bD`SRnJZ+`=
zA)E4zQk3UoN$=JL;c6kjjjS%!8X7QQ)wWzWvc&)nzFyf<Y!GZYUVIRrd@FzLbK+3J
zO)B1%`feUc2KBA-wLFoAz-8y@AR_9KcAgQ4itT4Xl&~Je4n1ZYBxH*&R{BjG{rbvG
zu%_8mXi_n|E)C5OvU;b!6%fx%rmUNIU`u?`mhs7jpK<EO?x^kBXyT=dFE2`Ek8gcg
zUo*t+#h@taI{K$CC;*0Ut1bX(box*vz|&vxG(v~^#A&a;ajiN~_PPRS^TWFWnr|8%
zI7c0{ro(tZ3_CA+&8@E#=euxvzKVR30hk2zyzt<V2sd6eJJj#KK9U1aL@s;(5RPs$
zF;_bidEL>t05<#4vbsWphfMQWlZk;Hfi#PUF2<jpBLBcgtR(6n{hB7#c)`*5?(`As
z9cBw$dSq^+!xb<272?zFK<(|x(ftCvnuGbf6CIogT8)Qt`2I$!*yn76=A_k6iX1yq
zuZOA1jdA4ur1?66jN^4*-b*$*9-3X&eXBv;U0K~yl&C-v%^Z-Uo_Gu^j&{+zmr+v}
zMDC^$SFWs9lcD(QIPgEXNH`C9{L;jp^W0{q<^)f1paS5_qWci4aj)EcRo5YtOSN!0
z$ZmY}k+8s@VrW;{`(c;YVjG|;y>Kv~9HiUu_-&zv6T#QC*-#MaCl5)bYZDN!u1;bc
z=(Lc7`_`uHrs;^1j$P5^>mA=_v>@UXu~9``vA&x|G+gut`zI&pp8eUyyY1KKVrC|J
zwN9*=LM0+Xg^pbb`!r)wW?m<=Z60`-&w@9j9G>du?QS#!z#ZcOJZVZMR-SzQLynGj
zmC`6YAD26x+``z29FtrwR%;%i@YZtsIQ*{0c8^#MbI#$>j+=|u)rp)dJ@tfcUp7R(
zj(uIF<;l}<@%0S8p0H|LdQE{8{5#CbhtnoxUycC%_v3j=rxE=5Q#Ag4HiCz&T>#kk
zYXNVJ)C=BB9V{Brg3=8G$V?qq^gsYh(Fcv6{j^uJ<cd}oY!zUzdCKle1n7Df7yz)S
z8RMOpe_dvA6&M-W+P=K8&_^7Pigk{%fONH+!;jnkbrw%C4zL!T+Y*DssmPI90Kk^E
zWdYw0wV9ZXIrCA-WMw~J+Xa0wS^|AxCgyQkaC?wOTp2(5s-~a;bYrm}4I}S6(a6!)
zyYk$SLp`X?+RQfY{K)XN*ed;R4hn$hyYxm>jE@dkXqvhFpAsQU3xCL4a?k)@-oa-T
z7iIHkftPYne^5e4`|$*QEFta#lF)Dt1ot;$$#$UQXFf)Oe-=|W`#S_{D1J8(Kp&b=
zDhPNQsFR_Nsy5^_^Z*BN&JQ=NxcVC}z*U#9-=(kuqQzavM)bPjDztvg0(FB=5+It@
zkB-S2!YyVH;OOi#f(==tMdmA=nWUq$TOflI*|`WQ)O>7B6n+^mL;VtR$wi@ib@zsr
zlyd2X=Q-SO*D9yr0DD&E%S!+lPl<yA6UPhsj^ij$0fvW0tQ~rywJ8hFW!w71PnY;O
ze4|;Bm!_Y$y14;E-c;_`NaNV1C7gw5fsrDiGDKmZ)I8P*B%^F#=NFw%&MC>|nuOTY
zl!}Nv;M4*+>jj3`0mJ;)apu9XG)DyOtp;%qFg%j#8qX0x_kXW1<K`Ne@-m4ia#g=#
zdZVM!3@fhJvi(e0|AwP}k8gO<M8P&O2kBE~^(O{{B|urIlq21~Uyxl0Y4H8dg9zZO
zQ%0R)7sPNgY$cYXvr6q{@SQ)*U=WY^?vzwI@OOc<k4g`(lV7?-6b%*J6nwXZYwm;S
zcEFM=&ZJ*8jl@Io-^|mUV0wpDq4$p$0AX%VoT;10Ccr#7?R0dJ)4ua3en$D8=5oGN
zp6VmwcI;il$$;1O*8^urWA}v@cU&)oW<@?E)QGzpSVQct_2JI%2y9Ne9`b7r{(2F?
z;Zf-LU}<yLEC{@aCQ?&>X&~wN)$9ZBhnES()<rc@=Tzrx7PZeZ4dBm2|9@OqySFwL
z&=~69|G=F~YA58`1vE)6-4y@2qi)Vi&ARh}ro6Bx;mk)ulkvoLN9|zX`Sa$+t<qve
zJHnw;liL?f`OL#Re`}&;GrvV9wjh}v3RoNkF3PcvbE%&iKq0l(i1%_qmIi<?c2NP7
zU)QuMI*k!4`*z^FL$fiBQW424Y~(KxTNUEm2u!0bbaJ{JB|;e$X%*-fS%n1oO-D1-
zn)i>&_AlU9dogmK9Ox%)w;wjm+PpijuBcuWU48BUX;CnZ1lkaST2000DhxZ#{Q$~V
zipXm&Uafw+LxUz0j&a-K6L22SzFWlg+?!~4!IGq9SN&c4aZVpoHk=jL$G~FwgWd9n
zA&A0L+Hn4>ux#031IF??PNJGls^n?|yjW&lc`TfJ1yq^i8WQn3VY1!K>Xj^dybhFZ
zCrV31#v8H>(hEaU$wSQ(KbmYI+#l^oiLa=*ixX;Sn@{~3o0f<~@M-QwT%si%w-v!K
z&=vA{ZS+7C1|dQn1-Q2UsbM<Ul#xb+kM2O{ZXE7@K9Hs8Yz*dTZL@6|^$Zd~UlZW4
zTSrLC{``peJ$GM@In8m<F}rx?&&{18^3o?ea>1s4z^1<bz;@T=o?z7&YrV$i&bw2s
z;EX@w{+b3;!S->n*q)|LT`BGv+W9p^f?^$JAKug6cODp9{oIye{=-eWTGoaM+YDsJ
zP*oE7xw$Y@@(2-%FDvrbDLF4j1(1!e))3v+y*96S@Le4&A|I8TzOg$-8un1Hz1S10
z!Mt20GbAYmz}>aQ7VC9UF_BFd8d8Ds@P|W}ZAulzfR4w$B8x5+o89?<tE1bB7Mu^&
z>RVNm2yO>@0DSscC-<WPHWCh6$kXz*FzfuYB#q<Kbu=<pcNJ&d3t<UJf`|+cV3q<q
zd@O(*{z99sT=w-R`Ntcs-=n6qXZN4YpwGVvcleL>HRM59%-UNA>UJ;4G2fwInmm?r
z)%4}ti;{nZIokObZB+0AM}CYIKLdGx2+Q!(7&&4<B_bKwA<E8uRcrXZ*6=7H2Um3D
z7cTXWS)PozFC416Gr<9U+nrqu!9A%!=>LU8cVaq5qh^I5J!K7?5;zQRu$P)%KCu+x
zzE`T-6Y9}SS9MGx0M&jlIWPr)c*%QFyF2uHF-3m@2DOFN3GYn+pMH!THSOc}JRA#0
zS1o0~iaR-{HNF^a>}3#*srFKzCWJ+Y!N~+s4c<FIBz(#JaTxLf;n0P*p%oQ|S3a}#
z0j>hDuTlvFZA~b2fgEeA>Iapr=CA3$i0V#gplS~~8$`Mhr$tWN0`D#~Eqpo@=0Ius
z7YwavqBu0@md)oHz4;hBV0Avn4156f+8Zn|UP3loL7Ti&;s(qre8@et@9|m7lXdNY
z^98~^9ni8&Q#4ctgUX-xo?gZ9la^;=U;~)`Nvy0rx0n0PpOe3QZe<{^i!fKU@{98v
z&RVqJ%!<F9%wRD7!E8Lfe4W#_dkT*1J#Ji??};krx<R<QYnz8nD7&CsS~WvDUfW&7
zceKO%CB6Vo8k@wZ83j4^zS(ur7@xVlGLdBP&YEcCu0XBKJsEtTzait9sYtAd6awR;
z^2}-Ve)6eoW3OSE0A|Si1&}GCJo8%V9wf0*>#F_7bx|^x=+`Jffx{<xCEJbwxx7()
z24gja)BTy8WeM@B;|BsmfOfcg;r^-?hFtJRJfN$B#T^|b%Y{SE2|!KbWm8i|4`6Av
zdV=Q1FaP`y9TeIf_XkqUp0~er!8)(8WU)Ck5liXyN0wLNh^QwBwhn;e%MK=4xWW(H
zj6`sd;}xj$6~6oD#p?;q%#A_Y#oNe^xR@WRAhy5qK<P4Sa(25GT~zHhJ_!lbz=T8}
zbJj^pF`~MCDoYW8G8#%T{kNyPJgKWvj-L{LZZ9y&mn4%0FV(T8s6aT^5U&udSLg*R
zJkePfZl{*kX<t>gD%O(5X-`+gcjIM24h81+mpn^0c!<Ne=wzoqCC^K#^ujPw4baXS
zpwsU{F`}Xo=O&NgrV18T-c8FEe0DrpuVA*yf|;mR`CDK|mfsm)q#1v7V5b)zYbewj
zo$x;Uf9<{ZKih5l2b|c{rl{IAN|p9PwW!2u?Nv%CQEgF_)}BdFwJtSl6RWLFtM-T*
zRaL9DAjBRKn~?G3y1(~*-PiLUJkRTO=Z8=7OY%B%yw2k|-sk&xAIJFu>j-xhK2!!}
zQ}CAqzUFvna*c_23_|AYX}Qt4`_upVF<$RQ3>X$}p6m52>c<oEu2{SA--rxE{&T1b
z{r)GboYT>De}<3kg_R62>LBV?7CPW!_sP+nvO}M-(jD{76_KMA=q1SvRysxrks72{
z`qTcV_xg<_667b9KrUd;>|*ZsrxwFP%qRVKJ>)(f-GvHHNfFn=zI>>ny9(LYUozNU
zHqV<Gj^flmiV<RC+DDT&$MuaR8J(SdgEiy{ai{VoQd;Tv?<_?R>7C<(@XZIx-)6hb
zW@wv#_%fK~B?m?39V3eLh2}d{wqE(Se2v?BB+PIL6&%A1Zw-w)f>mV+|MEZ04JC{S
z&JR$eDuNk?y^XDz)MAanwH<yf^3MEKM*|jD%0*yoWuvLY9S524k;Xe^X#!40!z7cx
z5vmX1)qw{GnaBu(NIDnns9Gb9a1nqj0>hYPv@)LV+I7GL{#@2GvNmID|LK)QknH&;
zb-26giOshnER2V^ig3`&ua2TBsUYLim&sa}{PJ=6Y)OQ(ClOl*8%y!c(E`=GD`w&3
zks6G_CUtobHM16hPAj}%U3id2EfN~sLF}T#sUfUN$wc725IfK5GpmaU<2R^|MD97x
z7KSz!>c8N=5&f;1poQsz-=oRuR?{`DupmTI<YTqnJuAO3AtLqUr0*p+^a26DTkdTR
zsXA-<*g5;T5S@)2)_A4-pisx`@d+W1^a<ZwytAidth#qcF>|e9IXhEzVfPdNj%Tyo
zFEpl4QD#bo^ne{<%5jF`MgKX@xG3bkGd7kNy0F%J>$T1t&5f^Sam={tINy#hF6oQX
z;Q47As4*M;uo`&S-sQ#gvegkBub5BhIXW-%A>VdOUkXyONb<$Jf6JM@|Cshvw-wa9
z#jAVgF_|g>rl;GHbcg)%A}qn<G<XCN$|l*HNyX058c^5WGGx4W%nvRdJ=i-|1E9aV
zSz@Ea(kfexWpvKiGzqfC+J%n8`wo(&-GP98FyI^uJjb%~rYn@^h^Ac=dU7K^f^@1X
zYjr<%b75uPgY9-^!fPUdf>#<TM)Rw?=1l*GK$QjP^5>%=<ioB+VwH|7w^0h6R*pHy
zn#GE>g_a)hcdk+7L)al7#Ni+BNu^1+`2kOZ#-2Zep#<+Qrr7~RX+yVUdIZ@RUuQ<<
zfaJ7WkG<3`w>~}h%;Od5c`ZV{2qDhH!|Vh;*HvkqehJtymBMPhtKY50O$I=3h6?Zm
z5RfW4)oN&j*FnPOLCDqt?Au4kFQm}jnbqE>_N_LUO~=@gl1sOM%w-p@+=Z;H<K(2M
z;MT9b8W)bGV`FuUwQ_$WBE9c2{}2U2g@(U5Bn>QR0m7KJcLw;=tv;>1=`I5N^4b+G
zuFVlm>}k1bSOGgfefGwv{B+Ywj*@a;lbs@~up#Cj-cQNzP;XHS81zCe4OuhtDmoxN
zZ{{f;ZS)r5EGMgQaKGMv;WL8H4UEBG5Y1T#kYkU$a%9wa{LV#3BJIp}N4(JV<iO3`
z=ux9vr^wt~!+tJa8d(yP>1v*@FfJ)?XQaY)Rr|_olMgYj0R}RRiGvo3F&P>U%p+nx
zE~8EcwJmhaHw6#Hk~MX%5h$%!#hB8`ebwOQLD)e}65gkHDaH{Q7XS!dKA!w}$u#rG
zEYENE^vpX&MJB&hFk$|r@y^0+#hOz=A)#AS!YYBsA#aC3wgTgqV^hyS*O7uMm!G-3
z94bF3{4nASTt;wEgaf>$wWEdZGuK<>nW@GzE{JF7cY1xU_eZyMZ2N>`UDu4b>c-o1
zu2}enjW8r-z3I<x8gP1QTUlQp;!<P3bM}Vh+7adoH_c*{{Rrfdx;CCK;cP76cinhU
z()2x{@&0)1`5e)iz)RUmKOo#bfAItOX?lS3Bu>|t&aMJ$6G_wo3&e)PUafgtJt03Y
z7xp~xzXu5!1AOnbb-pROetn`z&tBDK{$ZD_%?cqf_VQh0j-R`o%9EmltsEWuePM?U
zOL+X|<-kjCsnlhUZ~NrVr78dzUrO^aZ7r$XErq>rh(75hUsfv*O}d;vHu>JBd+LjU
zZv%P%h!gi1AvAYdG^?roGFOlm$U1mMaTZXvj-)?&1qQ~uQe807p<K|$Nq&2F44S-S
zO`lQcRJph_&{^eSEZT>n=8i39;HBF1rXkld$yKeLE^JL^<S7OmVT2mwg@>`KTuKog
zp2X|jp?3tqFERj_o4dmx%Z-C8Kd<)2U&prBjTB#EzHh4ZT;TXCnTukVxCqw2$RyA?
zzyXS9{=8wOkdm5gyQTD^-p5U!NkJ!N-vMlBd0D(~G1TTU)%)jmOQ{_e4l-$mS*^Dp
z9yv5UlS~ws-dxuC%5~ES<93*;-ECpGe=MApd{z6&$K>P|I`+B{Cw9y0Uu<={AI~&L
zkG38^e4z8^=tX{+xuZF3mvPnLr~T<TOP3jv^oLYB-HQYWQKszm#BRMPy!CmKu*n5x
zBkDjcVZ<YkYd01~A^@!+b*T{ipelYuLKR@n!grR{eX3s}Oy>f%omzRF$^}qR3X^{8
zOv{tW`s6&CE9!n&Qp7K<$hmpBy(3TchGmdoVp1kJX?W5|Ta|KY9@k?#L{`}paqc%y
z!`8YMjrk}du|)fGu~4qHwNRlh+H$&Q=;fer>K}4c4ih`JhQ|Ec&jaL=q9m};y<~Fu
ze{oNK=HO7>B@=NP<e?tcZ1fXjm8vLHMrLWOq)}faf<O7iy5~hRNJ*zfk29Uv@GIJ@
z-0Gb0(vl2)&gdBZ-`^_z+~3_L3^6B%3@82)$s+K~MFFTlK={Yh$S-BMFG_CE0nJC2
z1vjr=bwtwx)z#QzVmh$IdsQZ%#CnZ`N{jH87S|m)&Q8SDcuq*%6DUHZ$w@i%&Y3M8
z7kty~DC*deG~WN=PuR-c9E8crBJ@ESwUR1ezgq;gOia0I#K>RWrqiq$Qpf?=fYpa!
z7KJ?{nsxGd$sgi7%7q={gs-zRb=07Q+-s+o4l&(35cz}M9~K;<iQyXo?p8xiw=&<=
z*n94+_E67g#pNg$V4A4F&xw;7!(#jJYh)Roc>1i`D};H8S&p|Z5-up7r;0A$8L@+9
z4{3qTUG;9tCj={sw=(=I{O5g#>8_>^6*nIZqCzhkiKZFCQ*lH~#Zt!nTs>Ed&d)5B
z9z9DZKQ^#QTdO?omby}6(ld)=bt=DTr2V#6J8iTLDUFjf3K5d9h-eLo(u}4;lRjUM
zwQQIXBVDvulZC-%lQ*e2(5_0ooR67`rciX{=*aOJ1coE*#ifCS3X=_s`-1}Vhr(2x
z^3#urwudhj!Zj2+l1SBaz_*LeO9`r9CH>hht06O&NYLwL9Sg(YScQ%Vo^rGBIM2$?
z9WlNe=+)jc`!XYFd;d^)Q!7rF;C6_QX{@1FIasrpMLwDuIPjirv(K=$plG%fd0L=r
zovY4V+Y`Ydq>aj#>A?pM_ob=D7_(!eFBuwgVVEV#q_@5$>(oTP4ea=pzdrP^nDcb+
zs4j}9=%dE9sP;=5aAMdI?C;e1hHpq7adhitg3D+$!K#=Bpf}5SBf#)?<JPUwVwoF9
zZ7ro>%bu|aeEvKmz?ZE(Q>3&c)8(fY(99@LSsq-bxvs5pO$(sZF=p|UK_pq6Fkh%g
zD|EhwXmJJU)qJ6!Os18Jm1CpI58Of=)x`cJdP(u3oA=7;q=i4$?L17MB4)pP))ejP
zdu5mB8>CGXH25~<?PlLrNBe0d%Qho`at6`Q17$Cr3v0B_+~8z)Ek~w?X_h{u0Su%u
z9##UfMn$|kAf!Mu&j;|d<+mCRke#6mz4Y2w!qFjO&)6T_w3TZJI3CQ*{q=pSqTZCF
zr8RG9f0YJX&=qHbbFZD%q;atrW;En9R8cTn$X)ZEz3bjqDsmxMcW%ejh9y4<xB!V;
zxkXdyPVBWzin5EF4q-N8+Hx!b@NJR*=0ajv09ARSox_jUGJ$d%z*-t!l9QA42QPB9
zq>PM=-o=_?m)NTod?I}z3?iHT&ufPt$+&*}U2@W%4NiviyE!u*RU+eT&Ek=eZh|_H
zNqhu@Gm(kqo(8V2l2Sw7BZ6N3c^e$fMXQtCNPGy^8Oz5&>5a-9JBVJN4qhaW=&rn4
z@4nB_+pM<rtEj<wgq1m-NVyYx*&qivevGbY2G(3veq|e>+b+5L{B*6F=QPrD{zpLS
zt92D58k{Q#zn=*xaotyQ?hwPHt=78^{@e!Clo=0~9g-Ulcq3O+0P#;l53<=KtUYMi
zGv?6MuLG58#cQ(HoY`*%AMAhQIl1i5_hwueqXEy;TB!cD(lcg1Uu{&20`w4Z1<5mH
znN_XuoPw*dG9vqXlbKIhRJLyLOKi>5x8|PwmqPI|H5%yKc<!$FpkB?5aL2Y$N3qoN
zP5&iuMb9})d1l#`7cai)r`@k#%^`vgRU;{lB!lpK7Fu&<iuSY&Tq)d_g7mm03#Buo
zJ;_QtWQif#WN8&%QdyysWEs<jSPFPHH}RxZw9s-1@U4>r9?im_aPHW|rSN0g{ZCXV
z?+iMMj_BqBo`j6S%o-7`b=+XrUa}cG_zv3NS2!$u$6j98MyR4KBYoU44!a{Vsq7s>
z>Z3lp8urHvxDDi-9TvkzWnPNue?T2zTJ+`zZixCUIKZE7xjBr%@J-Mr)bOGh_{K-(
zGM@U-45nc$o1b53SV{_q2ju$pq6bT@9KG&Let~94QFT21S^RhY3Fuz00djBX1v!ub
z&PTP}jx;~F>ZJPc)j<2PgZsH{cIqv_kiu<&v}$|;WgD`y0w_<lcye@34n$A=TU2JJ
zL`c0?xhvBiw=^k>@NxE+0?BY(doH?~2|RAN_zoH`9&%BET9#*Gw+r?<X-A4yI{Z*O
zSuys@`}f=Ii9asrg8!i9ELM0g*<_UeK-@@ZA&q+vCWbc&`6jIYNKqZ4%mHR*I=T%=
z|NcC1&NuvMHJ{h{X;YhRa5#9nuUtrHTk9D+^^L|=kP1tQ(9?)ia#)SL79H78f_!)P
zn-<K;^sbis8Kli-A=lX(Pe^HLT}*2gO#gjl3Pld}d1|IG?60<ZnH-|ZF-?6(tfuU{
z_lN4wRaU7i&F@8lXChz**_eex42{*K!h?(3{*~8x-GUqKx`rclKq$Oj^f{tP<}+7z
zuDAl1Fr5#To|*L{OBGFr8yO{;KBQ~EqG&kIJd+h@M4C89TzSEhmqbe60PCYx+`{Vq
z-?>G5l~)<>*CI?+Y|#KXT^0DiYAV9N5m-t?&mZFb*yB^17<->Z(iqEvQ;o4svdbTl
z5=kHX*9fBf1&M<q@g+V~<HgAforXQaDCuGjOFgi2nGt7(ZhB{~gY?+zY0?F4qm<Za
z$-dtY2>JyN2CjKVy4(V4Kg(-><nj8Zu-ij4hLv7gltL1mTcw4TtnZEs8B^a7U^~QZ
zV8UDjHQ}3@`STNOZ)qPbJ8O{k2h5>Iyyzo)y2Fi=9;ZZQbdr6BaEd1Q#O_3tRK&yf
z+nHLs3c?V?OMbMTE(>?;P5|qIls}i3->Irvt49fLANA8d?2os5{OeVqLhn}k$p>>&
z+4|EqK?;Z<`GqXGDW7g1{YF=n(6o&W(B!eeNzC~wR#y|GKLH}xJ4i2Iq8t_VUHm(q
z+&>5Xy(2%6qkj!n>r;dIqt%QG-hbdEwTC4LHf7)kTFb;;+E4uNOuIY-@)=tE8spkq
zd>*_*w$k_mc_944{ezJ><8Wl4NKB00ekv>?qvRt^HIWN)=r1NF<9LUNCbL2|+_(Yv
zZWol4mg#<yjyhR!07YjpSV+hMpkc3&vm5w6K8a<J=h;E~-TTx4FYd!h+}>*ez&c{e
zAq-(MTo<(9pb!7{7D?vgkd_N4-So7-K0^2z?DZNNet!PGmoLo$MDa3~CO7=}4Nv;$
z@;~j_`-g#vy)<~PN%w5tF$_A$?XJ6``Qyh!*nO|JD_!5A`$d!WXd(TG4%eo-t+fLN
z>e=3h?fhb?{2ILbqbc82e1r9bTyzb~)f{Ss8Qxp~yw<wON9AH1lL+N|$i}cwh7Iqi
z8ah8MF221>Li`PK#$ejUgVkz15bm_({&PM$KIT3PrA@#CcgTQ6a)~R&ichZRcB6`b
zfI_i8g|iXqiUYOVW|ltT+)D6dn%^(vh*}e)i_E*CU@1nU*zHC>DiKYZ<h8yR`af7{
zhh!6PFzbpl9aGIJkVNcX4zp1y2IjTV^J?lGKKb0GJP)$sZ7(CL%n#7kX-{Zi(Y8DU
z=qK3WtzZIpYJtHaK+@EPkSN8LR!uF2GuA2IV)plUQ)|iWBhHoiAEk%Wl7C%4;k`GG
z5bw)<E5YbsdY)cHt+-0ZgS_4ef~hfoG!2V4zSr2EIlU1Q-hz4`N@z>J{k5{kd|qsN
zWJb$5dz|&t+5=QYJx^HV!$JBlap1c#WLpTb^HcT1wgC`5tqnK3OY|9LE&2&S<`d<z
zN-<}Ved_)5iX1v!wUR9xw|lNwC_eU|_#2!(A|7wDdWY8TiKJxgy_C}?1+iW9*c@Kw
z#<=7pQ2+fIWV%~IfF^q3E^M;|$X!kJ=54dWNsG}8E0dB4!urZ@0cqV|xgc9oVLtY!
zJWLQBu0s18LJneuH%^a*%Si1EQeS^auG6H2m=;i7^by?#!bq<GzdXHAA@is;VAz{c
zaA9PA*_wC1HlctSU}|@|l%&wHdBQ5pxfk?kxpy?p1$G4a=>!o8AO=a`+P&Z6)>428
zYCkY-{w&X&;lT=;AY0)8t6b{FQ@@ysP{I6_Uac!M?6I{6F?OJAQHeT~l|k$2^2G2;
zY@fO?nAT~vE278o<q!g~RQJg&%UW3EYLmw>rHDxVvRmy$)RTM=&>2)9{4Js_LW6FN
zr35Vmxh6vohVd^9jR>l^xLP@#E0Hf!y!zi|(mmlst_HI6XGBA@>kU0q^r4%@wqBDc
z?`bGf+?yB73jF1nQY;p#n;&4@9uV!I2q-B*`?Xx@_yp8xI4OWpa@yc!DjGdCf(a&d
zcEwqoHP(iz+d}azTOl|)cmt!RVaajvt=Q|PVV%W%TWUheD_R(G3iB-4XYA@seSb<!
z$So1wb#Htp5Ux^V5^{Uk?JUddH$)re3pACZv0$FQ%?^z5O+ni#0K_v}gK9e(kbzfH
z`uJL~>M*tshx1SQcB90KTiB6z#D}f+vbYYlzOMNJ`0_WILdO{7s)x4E&bYG&SgRpw
zQ?5-~^#|wqAK9iyXW18CQrAD)5g8iVey09;z%>Qryw%fkiRO5mZE*WwvRuWbCWpZS
zOLO%(Jh=gXV|){*JqJh>Wc_UgSbY^0V2I+cX!%6^uV1qc^i4nK(IC=+P6~^BI<Jjg
zKYnde&9Ni($S~Lmi6VLLA}BZe&WDHr(1c(v_*MRaZ!kT>BrI7MV-^biP>H#?KYUMH
z<<cy%NbiZTi4bRoB8qi3p3QQkc&~L{Eb)xc%4(`7!$Jtr0Qd+AWMIiu-(2e^2UT(q
z?+%abvL#wqS3)f4?&X7%u=poux3}0lhv;q#@u%u(j<YNv{FSVKV9>8Dt^hI|nx^`l
zf;$F|7}fDUQGd8!z5Fu5Vj9qtqOogDaNfY_#Y>0}&2|ERtv;Al%SKT=8HG|(KO<dG
zb!U47wsrB3TL7X7QI+#{G!Hwet@`70^Nefkt3tP`@0fJ-AQ^55Nlkqrd$XP?kndce
zhp%YEx?kLf97&Cvihw-TfzhHmtjeh~8h~#ep(g*xE(K)xuR*yh)<ZpQF+qKZ(pXQ@
z`Aj1N)7TW}(*P>dPIR~7bv!#brBh{e>}tj6u+<JA`mF{V6}R^mGP*3r%}-$@RdYD&
z{*rP*m&(N#+De_|uZ(T;(uPl!5Ed4kDmV2C3v&^|87(~GrTS7#8){H+Cx-)-*->ci
zSr4$H%WH0P!~M-<gJfR12-KF{jC$wRP(+yh(4-{s8<A{Ub)r(M_Vp*AB#O%B?vGvF
z!xJew2`fM~ME;exQo4zHQ`}1!<9<qOTSAsbbn$kM{KG&Nx9IO8;AYt}mKUk7yhCHN
zvom9u{wn1rz)oi>u(7-M1?e)B@w;4rYnZ!MOwH^Nx%vRoPLssZQZR_R218}qVSdGF
z-HoIeMO=CK-HVg`Jtg#v%B;YyZeNoE=X^=s{FcMUE=7BerTzzj>f<7L;GG(z$a@lM
zngcX_prGSb9+I=!i?H<O%Qsk6yB+PLCVa7^|3Mr-_>HMQ3e>GFTk2vw7xx=@f@#@N
z1`SyqDFFOeKNZjPY|gw7;og_f*hj(Yia)NNjbA5&%@s|RhUj+B3A)sOW`_-rX1M`E
z9Ynp5vzz!3S(#lw&AsGs^&GbG7ae;q$s=i??=;j!;Clypu)BFxasB_%0`OfO;z}Oh
z%=jj-61D%iWELnHaO5P4+&92!q;Lm5*7owCSw{&u+U8xOI&ba>ks1Dzo7YO=v7I6I
zFeG-xE6xPe*42eAs~@+$t!H?~)cIxcq@Sa|AY63&der`tmif%-S*K526+*WrV6ujx
zwm9^-%CO0P4dyd-en|Y@y?itwu7gk~J$VuTu}Fa9Fhv01_%hfUz4uQtzIe~4>V=|=
z@=z(8_Jc#lT?r9WT1Th6BKpXTw>tJW8;Mat&CR9sr&7xAZPzYEkQQ#Yo-o|iwJ*Jb
z#-As4SUf(BYoOP@?$AiOqMZLAn!>x(Xy{lZ$A0rX8`mx<6w7tpq78$$(1>jeA#L<z
zq|;Xleo~vZLEK;8yj=dAqpFPQpjG>z6~Ln7(d4wi*NUA~!6G*amy1bHPou>{oxmW`
z^=zP5W_Z+D-yD`Qp{!?`#=qfm7}J;*^;Qrv$A;nB!=UP5?hf;mSAloC#>bhRd8MW*
zj|040I!vI4GxaSIZ1e!O<G7Oh*3mE)4xt&8t!Rb#SrmK1ld#k=@{uFui0oM2qv8m7
zQsxvb%&seb5=E_}Bc@wJ2>noHdd3V_i!3`P=4s`t7s}YeN_WWT`PvILkoL5OhiVka
z^M6$h{GH;=JbUgZDY&BX$M1{W4=zUQgSd`n+GS*~v(a}m@7jPPoT*AOMRn}qX(E1>
z2mBztLMFCVw)^m9AF{X}eLP_GE!EK|P?*VOt$?U2^BeCj!bW9UcycjsxteNRyzlb9
zMaWf=kL+fO>f-DhB0M{EeX8ya3Tm?c`vYw9MNae2zeL9>4u?4Gl%x?F3;bZM`!L%9
z2;Q53uGle96)WrL&}CLsogu8@5@3%feH$rFtY<-T{tefv&msUqhv}d}$Q?423h>>i
zb7fp$(n{*Ks_HkVx~^>02jc0H^3+TJ(1+R##MZr`mY{}n-p?;3F66rty(^zVXfw8s
zMLN8i>Q2-f-$+JgHu-|i=#7W&)lYw2r@ydUOcom*K_9PKkO{};=aX?E3)kZ*2Y9N3
z(r~63V)!xaKSm5Rr-mPRp|9Uysc!2I`?`vK!4SyEk!wO_5pq!7r-<IZQW|?!(_tZ@
z(IuVO4Tz8RGdWd$;1UZy79V+%J_I2AwzJ!|WeAEUPp3CQB^T%k>I}nUF$i+p*`bET
zjLTK_l1mf-3bSv=T1D7=n(^FL;-~IDV6wQ#J}ci4q~3B|`|ADvl)XY0Lo%xeNvjFT
zGR6gOZ<H6KzBY+0(B{|IrcV6^n3p6hl?KrRwc*PC27%-`Z$kbQsUKe89~v#9#5g(m
zDZo#ucLPteH7?{iFT2;pPL!PI3=838uL8bFJV931{*Zx3ZQ&mx^=IVY!Aryy8;lMy
z5M~Mx9~NTuQ$b8&o<uaFmAPu;;-u5cb9?+iIZWmi<mX6vtr7C=X;=VC{?3U=;PR78
zOx<fN8Ff2<Njm;5?69B%92|W4fc2j5)W=>9J(-mnm%$5e_F<tH9bQw3l$DM&Hn1w?
zibpXv%WaJTj->o9Af*T`THvCyp(wySSAOzr0Ct-6L2_96r*xCINMJeKhsjMXalYG|
zc2+QdrZkGAV;`0oMb%8=^}QDUc0K*E@cMfwqfG7(ue#BV+j^rV^>$Oo;})`I7it4Z
zpA{avCCMjLojiZV3D=)0BDwT?4gukRlmLEVkYi`>oqgtrs{>5vvl%7Hr8jf)#k}>g
zdsi1XgWfqSE94+@9hzn_M{`V|({+jZ7HaOahBZFA^_6F2o2g!W^h!Q>gBnmv3!-U`
zzNAP8bi4}5*RezZ%6q<37)Q0)>c@mAT~MZ^t%u)3&vP^T{9Vz;*ZD($#2h_#t?<V$
zuC9-gy#3&KG!Ar=YUAfK`hV5?|I2%if|Zm~rc1Y^Esff0D2=KpwvlH}$zu&C^Tlfo
zdz@6P?Kk~DBM2mj*)}Oz#e^6oEv^dq(!Ns*U^m%m_q{m6K9S73^N7%r-N6M&j{eHQ
zzWxay_WG>|-mn8lq<y_5&+iBsw;93@{UL7-OhT{5oV54bSNhM?SLO`d4?3ywovzdi
zljC1Hyh?<4-B>VPHh@tm2-<{ubPuh7$3&`i^t(cwj+)vHvXRYOh7ZS{Z8J~W?kuc2
zNg_i05?-gg3iW>LJha+)JJ+#odU1S<rJdZyJB2;Q$9_``Awq*q$F)}VLE|K2b@cps
zCbV=!m4|c{q)Jt4LM{H7#*D)SUinZp2QuhBCcZT@zmEgLEzM#0<u8p1@NXFAt53pi
zS}<kG-w_7W`IDfjPk2TJM{g&%pa!UivHxUw7_;`azj7wY1*l|*yVU!YXK83#Uarid
zl8p<UT#;7Wb&@M9=YhB4@BbF}*ngXu-u!~IPXmVe25bLqT=jH33K%Xv&(02e_b1?{
zrGd~NxE*+iYZbeJ9(Ps(o|a=fJpy24k>W`ZEp%M;(#@sPTROA-Fou_irwX*IIQF`A
zc?(OFYzH6Q471{Tb_F&;3bLSGKng%;w3QsNEYXW#2)*e&hAs>^rm?%dNux}rBY785
zgnbQb=x)K~^&O2f$_;+Bmi4C`ZNfnKoeN*jjkSq?%qNx$E7>k{cngAAZoY({Nc!OY
zK)3cn!`q+rhx#6{NgorE324+-6b3>&Q7?Gh5@EFVR2Ii3cdX<}Tb=^E$cs0hJjE*y
zZWcr?FTyRuK_4$oV<2qQ81J75&_ASFUv)>PGcQ~om>J&p4Ao&X>79H$&2!HMlDNjN
z%$98OQB1Fu^M?5mEnUKH`m;javKl!nr1QlJvn46cJ3uizj`JiD>p?6Lo7=%HlhvIp
zQV1lT+=TB&04xpQ`r&?ADn}s^uc)5ghr7s$uXE>?<i{}p_D*7=^*<GK9YO0-Y6F+<
zF_wru&xX5lY(Z%jKM{0>t(xuLg%kT<0A8tG`*A&F=N4dgfnB%)uXa~m%m)T}Ad+Ex
z-^=$-4<65*z9yAn%zu+3<Pd+i{d_LHeIvm{J9y+B=QH+B$WKq17TA8-4;4U7H1yCf
z`1<jgeNNFcN}+r*nav@|h2bcMn!DyG$gOsoum4>Aw&{azpuYTIze7Ru$<R*t<^(#j
zElbpx#dMBj5K5P5B5>ve{!0HZZt?#_e~crBtIl#`7IQL{qNIU?<Ndo0nXdX-*xy-d
zN{}ROOau@-w}Z$AI383#*<-u@X^{q}1?bs-0oOHez(uVK=TN6U2FU+<FhX-Q1CC+R
z;LzeU$dg(Z4d-yZN@~&!Gfs(h28xtMQ?B+Z-+b_vTT^&%O@M~)3axmkHFi1VmbsEA
z-H#y1FK#X0>V#Xwqj$odfe;SD(deN+Rof9nJR5z0vH;vnnhpss?=O99fBF{ohyH%e
zEan&*hiearnL8FC528<HJa7|JSichE3;B-(Z4nvrj_Lz_PNAQ_6yT@<=gpuP-@ti7
zugJGAx>g$UQ;VMyH$fbG)R-mO$b?wJ8{v98+-s<MUGZjp$X+*jzFoL0M*TC={fMZb
zRQ{I#?Ka>?p>P{@epYk-*NfV^qBOU+1IhnYv$z6YdD(O)TqU$m8y1iJ+!0tqJ7Mks
zZElgPu-wme7c?KU#6HXWDPJZdIV{lX?0D2vr&x9adDLL69lR%h10+_mLpm@Ojf3&N
zkbY4yYh=M)Si>5dnqSBsA(OnCLL;t2Z@Hnl95vj)K*gP;OSB4$7Atk(&4t_3o^D4N
zMEdP@6i(DVJaR4b?F7*wt7*wa8sHb~V4h<!C~f{*S2(~drFN9DO3vBK_h!!uKBic5
z@yX|;mKGLu;xa26o9#wLzyB^fcmgFjX#B~#x_-TynQjBxL+fxy4^sYsqgMCDb_DPs
zH<X5W<VQ;WBENU|u#7~=5`n_MoF-_%V=~X8JG8^Pb{wz;bsHgX2EHf>hb*l7p-m_Q
zsYK#n(v0a%$MT#&uT5B=$Pb8-AFYUop_gfXrf*cGZ;J$(_P;cQhU>kVKc()xx3dh*
zPWW!p%F#d;()uJ5zna>jCbIkT1rkr;;Rz>!T?vjjUSRVVKEKx}#;-9(?QiP`8c3m6
zC^)*gQQ7|+E*`+|jAp`7TV%L+72qsG<+?8>tE~<PGmjqt%zygAIJl#0$VC=Znkp;@
zVbQU24{h&c&y~ErsNuyeroFWUb@~0|2Rdm=_!+6dlc{^x81SB2B=g6{G|eQhLQ`|j
z!e)r1wDgY9EwA8)?+H*Zc{aAK8@0Cc3;kvT2w9<9w?VlJ-pgTBiG?TXK7o6`c`t-k
zoji!chQ3U%E+YqV*vXRdPQ~u%gST^B$NPPZbQlnZboT>Vc{h7NNJ{F8t^ChhAOs-8
z>6^Xf(YP{s{gW}NwjAo37$HYL00>{4L%#n7{P<T9|NoSCqlK3cId3cP@Sx;=7dHab
z`XJmho^C14ktl9S8R-ilY*c@uUPd;omUcYuZ}G8=j>$Z&{=pg+z-npMI7P4hc-@WR
z{(zFZbPE8!921<?Su3pYW_bkA-v3bC)6430xw?onzK?3Gmac$l;2T`s_Qy1R6Q`+;
z<%7qU!Rc|8hW87NQi@-yCKYeiGMZgpCi;55p!wlh^G&`>R0Bf(B;y5zhCA~<pjfVN
zd?hAY+Cz9^f7LHO0Tv*|7ROQ%AuzWW%mZKk*}>@~CDzeJq!Vt1*>96=%<)R8Etc<q
z7v!})Q_}@9tk?kE`#`u(C{R%-g7eU7ZtL7A@&)qs{m1;LSft(?)8hho%lP0bE-x$A
zA?Wv%2fC0ID2oVz4dHMX_S6FqNA<8VR=A3Z2<oOHOt#{#>_0@|pS1W9zkr9*ILB2z
zvXhLSfrvvpev;c48r?!}m0;tgL{8WJY*+?fQ)rd;^*HLvvfa4_IRIe;qG69O1Emy8
z2c2Rl^;T`w=;G7{G6qHF)XIk@=C9hQOE4P1{>XPffAE`6_q1D76L^I%WchWC#@abK
z8Pw}E+1HLe^hsNWzGl}ok7lTdWACik6V+=o1Jo&q%qtHQc9Z%E&tyJ*x{`x1UfB$h
zNl$+ecF6-*zrX5n9kw4aX)W83*CN&4c2do6{*Joh4c$ZJUiq1TVxzUk-oVDidq$e5
zdMbwGhn*l>qQN-gkm4&SK-qAcD|n&M&R`hw{s&@|G~zjSFkw&Y#Df8`<reP9doK8&
zw`C68%zWp5%b<R`{=K!l6fhzfdYa%LO;F>DE(kkjg@+k{H%Dp5G{RljwroikC?}PF
zccHv>^7^Bib0(M<o@RW^PKK&ncaqe53Lfrmf}d|%&X!cZW?2}br<4ICe4ikm&fDmu
z+bt3+k&;OQbnE;oWc8Ss2EeiaAc-|GRoiG-S~0K+(Tn*Y{@QPW(jdVR@j@SC7q(+>
zYUZ<Q#UKP*a|Q~nS7Yjdkv=!s8RB45Ts-}`IfM6u$Tb|+kD7x67Qj=^ynvte5S?f0
zm;0xuEe2N~G~E{L!@G+e;4PRX`&TG4L5%I&AN>>##eI-XNBzJ@xC~xmMyYSggqdqt
zH`ASmhN_!KgDS0TzuLu(j&khmu;Lx4B&OtH6=UOpoN}aBv8PL4ECDuj)St(33iQmr
zM0>-$Zm~sV@wTn-W_nM^SL$V!)(nT1`Dve9U+{XJUcohGk3>93#Dkv&aK{=is6!hO
zoqetR2^cR>DNZ&J<mZFf`dgz9{=rB5vF@UB?XrEP>>TC=S%qDzQ0DW%5C&;YGW$*9
zP=f2qq3kw~vtgdh+ye%dEPHIAr4z+4nLUVNIH122Jlj<sL<dIzT?WP8xa!k2J_o=%
zgMld}QkO*V&jXFmPf+Ap#q~?RzoP*9LL$+sK(ReYGCeRaPw^)Ey4vcE$pZ;b@`H<+
zM&G^s{0b=r!aE3)<!v7^=i1NFvF;BmXRH0cQ1W`p5bqc3o#(aF1zYcCf#$c)Erq}c
znW;$tD?LzdYN;<oIN|JOTofhUNHw<DT>unsBjp>&64pbod)!1sk)X(TsyiLk%^z@f
zG$Y)LCS^`G9y>%VUH<^!;WTc}cX;wp)D!QYotq0898s*PDt}8`!$9{{f4A3E1i{<=
z9puV<?hS|DegZu-&%Ka;o2p{28mB${Pg;i`gS=#-^udD0#{DQR(R@<BN;KsjZ;KNz
zyt>QMXy7Tp%O0#qb=A;rUg~uqWE^O-mKL0G8V;%_at^u~K~vea0G?MZ8uHx2&p078
zdLnl9q+ZjGa`LcrGMX`97vZ^XX}2WBOJK-GmiX9n@TJi89ntRHLg<$uMxzYCJX@7{
z#`luf_-a#<@(_m01Rt?AXRfx}xj&{uWb}0ETa0(og6%3A_VMNKWhZPO$(^*T@*X~d
z`&p2A%b*#;3zT!w75XLpHU?-CCx3K-K}T6-8`A&t>;lG}sUwkvFFbiXiX=Ht2+2q9
z@>+E6S6k}lYtwaf*x;&wERc5VP@MeHut?Men^K<bh*J?bww}JFk?P*lN;<j;1j`r(
zGRMIl7*1(oWChd;Si4X=YYx&x$952MsPbQ0{YyRe@5Cb-A9~J)6ih(9LX+<2H^<zv
zah>KabCN85EhwQU@fd)A(_shr{PVs$u}6U_q;%)=IZwZ%&+28EL1F3qev8Tc5C^vy
zBg1RR7ocG!cH**||78?Td19v?vqf+@;{vu$id0?J&hFDw$b=}SjK(Qu=6-VeqrZ|i
z%aC^ZQa+QO5a-pA%U26iUMHvQX`2}H-_87U*<F2t(#nTNk$0kkRD=yuERN|%&&Q1^
zA%U>qQ53gg&lA`7b<W{Q2sd+d0|S|)?D~1nYB@l=6m$A)n3s>opImGCJZwUhS}`31
zjEiEKhplnzg^{w*`%7l@gy&nJvB=Oj63iZ_c4{Y!@EKT|gzSyqXJ!&7CkdCD>191P
z=&RrioU<>F{k+wMqhYN&gcc=gr!+14u6fTDw`(tf!xZ$r-=<?hlg3W#cGCKfel<k^
zpOLY6Cpq?|?c=NXW5^P#YU}oW3<xAAJ1gp%0v4MVmOCb5dwy3Zicj2okYn||r4pUo
zLL4bTz1*3Z!&IT<a5GqpQH$NI-}%6A)|U9XmO8<DH=ii%&>6pr>-QIGs+Wyc*OpT7
zcmf80ZiNfQ^5(Tsrko%TzA3kdLZK=MqkBPKfBa6_)78;wHukCYeBOXN9M-s(br^-1
z|LNE^8r5U$7hEm4ZFL46Gt~}uIeZ#40;wb87isB=!oIW(l@m83eqOnGctMvJz4nUk
z(DC8Jxa%|>?&_UEO*n7rW!=;J)bL0W?m7YQET!EN#TFF#><!hSGa!`Dp>(=m^D({h
zv1KBpj)<dYk^HMw=N5l%54)%o-WH<3hk<neVqTShKEFLV<a?+zwnno~e-VGQK651a
z4<sqoHQuw)=c4upSF~OcU8KhF^J{*rv}5z15GbHmBLZxZsLeG-llHS7q*H6lDL%^W
zPfDH@9IkKa+FbN#3Ov|sM^y?n&+WI*$>At(Rg^cHV_q)^%NFaLM<5ED*3c69V}Ip7
z>=YAB#wgc%A?(zGaffGJo`}bxrx!-ct4TlCF_&S);miic=yjjpKhR`b^lxEkkd)mu
z*U(CYkY4cn-g6>U4&Goyr5Rlmgvy89XraPj$AN(T^AMC^AM_=vl2^V0RZ%flS%Ipg
zJS*p_ps<7LiR=N5$t}O)(o1oQSH=~?Kbq+e+>SS{&feQF8vQkB8J7_i027my6%0H_
z#}QTZK=fy#L$tq&nVDq~1-dzO-Iw%{#GzwoM$B0?MZ}%eZO&O+#V-P&W8ABDTGu38
z{<#Voyimb^FI6B6<HTM%N3Tx1#d_JgWeNEY9?ev*C?@*JZ}C6x_kAzAC$+?3aj{fS
zH|tj$?h0F{l`lQK<ovkK45Y~$CRu%+QoMTzRnn`sl^34qKSyDMULzsZJm*-~&uCd3
zdCwDf%Va^Rb9M2^IXh|+(btP4o9Jj~ZA>3c(~~FA>g3&O^4!J>J$ia4|0SyLSz)uf
zz!!m`aJ#4>$&m?vSxP#%%$gr37rt+}exEk)D|-@S9jGJn<Ov>sa#EfyEId&S^RY&f
z_MRM^^<s~YAACbaZ0)F%q+u>!GmHDCjTF>_Z}B7MDIW)1yzry|zk@obkUis(GxKS@
zs<37^uWMd4?*?1RynO{}L=Nsg)j*O3)4z{+J2)()ayg#s*v^*m<P}ZH`%N(Ua?mFY
zAw>)0H)T{eT7a?*RMvwME^Pnw@nX{blnuvGo#-6Ry2!T+CPr6`MqTt{iy2Gx(#(@n
z`HiF>jTQ&Mo=QtxQi{LDvRwnI_ABopIvu@gu%|TT@SHT*1y7Nm2hCA-<}s-VcAT&S
zI&&twgq&@cuL+Y-u(bn74ly_7b&%)9Kwt;>bStTfQs1{G3LOT9#x5G>&y!9@g2br4
zqRx4<Q8;ox7Rv^8_CDXk6`(3fk0r&{kLPwswI2TD={@C#qb@2cP57CBpo8&|z9Xyq
zQp%7QA9-=*E?#jk#`%LQG_~!H^7BHKRG|P7!crn_@G{dge<00-kPXE!^==s@EBXd7
z<2doI9NI)2(c5JaynS*JzCOfqHX9Z~{#W%c5%GzvEC`{Zphp-#rG`3wdUz%%-)o>}
zk>aY4A0nb26z!38r%bZUpJJa(Vki4OkdJ&&E1?ax^Igqdka6;H`$;YghZ|@=ri5<A
zJ59TfsmE>Fu35ZRW9%5IJ~{@`Q%`&YJdA-we$9?bj~jyGgsbgIBcK<`p3r^ov)_tK
z(+8f0t2pBCXQX-gTcg?4WwD)<+G8**HJHr4B;kwXXW|Z4|6*;`0bS(vsKGj%c&4rY
zGL(JG*ozV7^o9S3r^O2tpbxEB;iMc9D(WJ(SH33^=z5Qq1*F*D<g+**!X7zkXfjm0
z3qw__GwABk{Qm3TG(7U5#OmX%708p%<jCT^ZNjuXv5kC4xCUDSahIg+BGoU{m>hJC
z+{m{gM)*_avVu6Q8v>8o(Dor`s>shx#BVq?Xfon}d|#hG_fKcaO*3k+6V;`ZllIX+
z*OZfJrZ14%_t|dildCnU;<y%U(T&~qV`*%c1z71HFgQ4syd>0}PRh^>mors<<<Wg1
z&*#M0jbpKE2{`CQ9*x=i|EB<fzxHc+zpdJhKOQYf5@i=S&fckc<lA!8$(ntUcF1I?
zZ+wz8qYA^~$ZJdZgX);r<0gUxA6PgY;IO~|cd+JxSJ@GkAtZS=(AgSt9!uVz&HpsA
z?WGocqB=Ut2CcgjNHVGm=y_#9AK>!|g2ZK`8^0R4-4;+mRWz(-MkUbG)yNohc+H`C
zqsb-gsUiC8QVdbV{ehspBJ`5Uoxf#DNo4b4ry%_Nq>iP|19Of#KV+R>!)K!3ORR_1
zH*ziV`%wFVFhR-+eVR@F9L->%cz>x!aUoz7ltCLXhd??XVaUWvR04Dhx#h<uPx3-O
zTbh1GBFURL2@^I?m(SeT$5q16;#qX>9#iVz-#^@~VB?EVrl{5uSVPKBhcrQKl#ZE6
zR=6yQ5+#VeJGZLU=U-B$-w3~=m=Yv^gC>#EpOAi`(n+zNvaT+u8x|Vpfh<}eE6`1}
zk#@+(XzR%xISSoDrjDnEM!Wt*NA1Ig*Uo$7B@^em637T;*nT#7w<ZWb0*O!Gu9?0L
zJ8WrLNq}072HeVQJ26<AK1a?P$|J=*m>D$C7f!efpix?JeLk)qLOWEc)QG~KT;$Wz
zZV-(ro5PLh{Ff9J_M#-E@%2EvEB&utzH~=BxAOtcIq0=@n|2Wx)ZG(y8kL;2cZlhN
zXtFkW3&yz|MRe$VjMcQv|6S(~I+Y?5w?L$L@(e3XhimQ0OaFk=5F}}t?WA0ooadVz
zY_t^U`duOB5EcgJzJ*8__H`=NtEp1hlJz*Ror1-6@TzfAx+CoqwdlP65Ot`xMG{D6
zp49)LhS)Xt*%y{Tx0?t*<r9qM&>Sftz4J?#eBr>T0jx8EOsXcQZ>5vZ$e3$ZY}7mm
z+$4gaL78|KI{HgaB1WcLC{6Wo&O3KC<8_r<EmQ#w`P<oW$9+7o=lU=bTZuuVJ?1=o
zr{+RCJ^vP8vhP3Ff}=s9CsyRNcUdtd(cL6a6<Jhls+BZPCSp#=z2rjF-PYx6$2zre
zV%c09$)$nvf1jK`ca>Ba-|O?LqhOFRL+<mr_GnmwS;Y>1iwiEW>n}@M#E?(1*eCdA
z)e29%9VMs!ON7I&*>2tF7xi+|W3qP3lVsxpU4EqstRZZ(krI^2XUe2&z^#k08LO|V
zvXC8R1ktReg&0$^?t#uhp6_JJTB$}f0MZm;R|}m?Z?KblBY;4~St`G=Td$_(V6Jn}
zfyuo8=+7AN=B)kcAhpnwbh4A{NADOc5)g2@hdf2#pt~?qL#N1hGOP%Iszwp93Af6J
zNR6u74KLJ?Z}b${$#ijkJx^}InR{R!tha@jqC5Putw7v-3JMg%{fkq6lZenP7xLSh
z9%z7GR|V{VNT0}ET?w#r7{=hhd4Jz;Yh|u{WljoR=MmSGUjP6w80u+jSTwk1r6?G^
zu=qrryc`O%MO@g8#0cNeY5`GpUiW0if7f2>;(sDP1R~Utb#;93)50Vi8;G!m9JE>)
zf^rTEP57h6*U&iD>~lr_A@eN5es+-^YW+FLGn&*^_|yAvz=X#Rs%w)4V)LJ%Cc6A7
z_2Y!`5c=G&rRkh7fFP`bxMxV@#~U+P#|9{I?+G#_C2LPF<-61hcRnY1e1bCagtudc
z*k!QgXV6~wpYX2v!$e;HB)eyS6n2FCV;3jSx^=uoTs@YGn(OLM%`&5G|2>Tk)DDpz
z1EHDn#Hj<D??UwciU*!o|CRgRB+5%FjgF>_`nTT|Ld-c>pYRq!^mXz9^+BhLxU)dY
zKnse4(h5@Of6BKYRKtR-Em6GKCxO|&1G2J4xZyGP%p7>gV(ioMY%M+4+Fk!%8AD)M
z1i;Ndir5vmQ)8!Cv}gES(Qi*)H-5%tj8dwftBV>4ujctr^kmn}BZw^2+}#$kw{Acy
zF7>&q34NjnwX~w<R(EJC=JqTpDed2T_6LOX7i)Ic&f*7OtbL*rd>!h4&WIy3QhtlF
z#y5$`Ru_dV$ief!kmFyj^}omeUu-}^9xo(P?(PJDhsl%eH-LYA{NL+;7Wkh9{%3*z
d&sv~{Ve2ALQSSDi;J=orr(>*LrRfm<{{S6paEbr`

literal 0
HcmV?d00001

diff --git a/apps/files_odfviewer/src/webodf/programs/ios/Default-Portrait~ipad.png b/apps/files_odfviewer/src/webodf/programs/ios/Default-Portrait~ipad.png
new file mode 100644
index 0000000000000000000000000000000000000000..dbfed967af6dbda81c510e41d83cc9abf4ae9626
GIT binary patch
literal 51794
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
Z@c?$9q{=`5#lL#2rLM15qiXl&{{!kJSVjN<

literal 0
HcmV?d00001

diff --git a/apps/files_odfviewer/src/webodf/programs/ios/WebODF.xcodeproj/project.pbxproj b/apps/files_odfviewer/src/webodf/programs/ios/WebODF.xcodeproj/project.pbxproj
new file mode 100644
index 0000000000..d4a76518f3
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/programs/ios/WebODF.xcodeproj/project.pbxproj
@@ -0,0 +1,512 @@
+// !$*UTF8*$!
+{
+	archiveVersion = 1;
+	classes = {
+	};
+	objectVersion = 46;
+	objects = {
+
+/* Begin PBXBuildFile section */
+		CB099EC714DAC535000D7B99 /* Default-Portrait~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = CB099EC614DAC535000D7B99 /* Default-Portrait~ipad.png */; };
+		CB099EC914DAC53D000D7B99 /* Default-Landscape~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = CB099EC814DAC53D000D7B99 /* Default-Landscape~ipad.png */; };
+		CB29ECBD14FFBBBB00CEAEE3 /* unzip.c in Sources */ = {isa = PBXBuildFile; fileRef = CB29ECBC14FFBBBB00CEAEE3 /* unzip.c */; };
+		CB29ECBF14FFBC0500CEAEE3 /* ioapi.c in Sources */ = {isa = PBXBuildFile; fileRef = CB29ECBE14FFBC0500CEAEE3 /* ioapi.c */; };
+		CB29ECC114FFBC1B00CEAEE3 /* mztools.c in Sources */ = {isa = PBXBuildFile; fileRef = CB29ECC014FFBC1B00CEAEE3 /* mztools.c */; };
+		CB29ECC314FFBC5500CEAEE3 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = CB29ECC214FFBC5500CEAEE3 /* libz.dylib */; };
+		CB36D11814F68F7F0084BECB /* www in Resources */ = {isa = PBXBuildFile; fileRef = CB36D11714F68F7F0084BECB /* www */; };
+		CB533D9114DABDA600C733F6 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CB533D9014DABDA600C733F6 /* Foundation.framework */; };
+		CB533D9314DABDA600C733F6 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CB533D9214DABDA600C733F6 /* UIKit.framework */; };
+		CB533D9514DABDA600C733F6 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CB533D9414DABDA600C733F6 /* CoreGraphics.framework */; };
+		CB533D9714DABDA600C733F6 /* AddressBook.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CB533D9614DABDA600C733F6 /* AddressBook.framework */; };
+		CB533D9914DABDA600C733F6 /* AddressBookUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CB533D9814DABDA600C733F6 /* AddressBookUI.framework */; };
+		CB533D9B14DABDA600C733F6 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CB533D9A14DABDA600C733F6 /* AudioToolbox.framework */; };
+		CB533D9D14DABDA600C733F6 /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CB533D9C14DABDA600C733F6 /* AVFoundation.framework */; };
+		CB533D9F14DABDA600C733F6 /* CoreLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CB533D9E14DABDA600C733F6 /* CoreLocation.framework */; };
+		CB533DA114DABDA600C733F6 /* MediaPlayer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CB533DA014DABDA600C733F6 /* MediaPlayer.framework */; };
+		CB533DA314DABDA600C733F6 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CB533DA214DABDA600C733F6 /* QuartzCore.framework */; };
+		CB533DA514DABDA600C733F6 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CB533DA414DABDA600C733F6 /* SystemConfiguration.framework */; };
+		CB533DA714DABDA600C733F6 /* MobileCoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CB533DA614DABDA600C733F6 /* MobileCoreServices.framework */; };
+		CB533DA914DABDA600C733F6 /* CoreMedia.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CB533DA814DABDA600C733F6 /* CoreMedia.framework */; };
+		CB533DAF14DABDA600C733F6 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = CB533DAD14DABDA600C733F6 /* InfoPlist.strings */; };
+		CB533DB114DABDA600C733F6 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = CB533DB014DABDA600C733F6 /* main.m */; };
+		CB533DB414DABDA600C733F6 /* PhoneGap.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CB533DB314DABDA600C733F6 /* PhoneGap.framework */; };
+		CB533DB914DABDA600C733F6 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = CB533DB714DABDA600C733F6 /* Localizable.strings */; };
+		CB533DC014DABDA600C733F6 /* icon.png in Resources */ = {isa = PBXBuildFile; fileRef = CB533DBF14DABDA600C733F6 /* icon.png */; };
+		CB533DC214DABDA600C733F6 /* icon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = CB533DC114DABDA600C733F6 /* icon@2x.png */; };
+		CB533DC414DABDA600C733F6 /* icon-72.png in Resources */ = {isa = PBXBuildFile; fileRef = CB533DC314DABDA600C733F6 /* icon-72.png */; };
+		CB533DC714DABDA600C733F6 /* Default.png in Resources */ = {isa = PBXBuildFile; fileRef = CB533DC614DABDA600C733F6 /* Default.png */; };
+		CB533DC914DABDA600C733F6 /* Default@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = CB533DC814DABDA600C733F6 /* Default@2x.png */; };
+		CB533DCD14DABDA600C733F6 /* PhoneGap.plist in Resources */ = {isa = PBXBuildFile; fileRef = CB533DCC14DABDA600C733F6 /* PhoneGap.plist */; };
+		CB533DD114DABDA600C733F6 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = CB533DD014DABDA600C733F6 /* AppDelegate.m */; };
+		CB533DD414DABDA600C733F6 /* MainViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = CB533DD314DABDA600C733F6 /* MainViewController.m */; };
+		CB533DD614DABDA600C733F6 /* MainViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = CB533DD514DABDA600C733F6 /* MainViewController.xib */; };
+		CBD2B77314FF8E9700FC3A44 /* NativeZip.m in Sources */ = {isa = PBXBuildFile; fileRef = CBD2B77214FF8E9700FC3A44 /* NativeZip.m */; };
+		CBDCA69D1504EAEB00C706C7 /* WebViewCache.m in Sources */ = {isa = PBXBuildFile; fileRef = CBDCA69C1504EAEB00C706C7 /* WebViewCache.m */; };
+/* End PBXBuildFile section */
+
+/* Begin PBXFileReference section */
+		CB099EC614DAC535000D7B99 /* Default-Portrait~ipad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Default-Portrait~ipad.png"; path = "../Default-Portrait~ipad.png"; sourceTree = "<group>"; };
+		CB099EC814DAC53D000D7B99 /* Default-Landscape~ipad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Default-Landscape~ipad.png"; path = "../Default-Landscape~ipad.png"; sourceTree = "<group>"; };
+		CB29ECBC14FFBBBB00CEAEE3 /* unzip.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = unzip.c; path = WebODF/Classes/minizip/unzip.c; sourceTree = "<group>"; };
+		CB29ECBE14FFBC0500CEAEE3 /* ioapi.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ioapi.c; path = WebODF/Classes/minizip/ioapi.c; sourceTree = "<group>"; };
+		CB29ECC014FFBC1B00CEAEE3 /* mztools.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = mztools.c; path = WebODF/Classes/minizip/mztools.c; sourceTree = "<group>"; };
+		CB29ECC214FFBC5500CEAEE3 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; };
+		CB36D11714F68F7F0084BECB /* www */ = {isa = PBXFileReference; lastKnownFileType = folder; path = www; sourceTree = "<group>"; };
+		CB533D8C14DABDA500C733F6 /* KO Viewer.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "KO Viewer.app"; sourceTree = BUILT_PRODUCTS_DIR; };
+		CB533D9014DABDA600C733F6 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
+		CB533D9214DABDA600C733F6 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
+		CB533D9414DABDA600C733F6 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
+		CB533D9614DABDA600C733F6 /* AddressBook.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AddressBook.framework; path = System/Library/Frameworks/AddressBook.framework; sourceTree = SDKROOT; };
+		CB533D9814DABDA600C733F6 /* AddressBookUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AddressBookUI.framework; path = System/Library/Frameworks/AddressBookUI.framework; sourceTree = SDKROOT; };
+		CB533D9A14DABDA600C733F6 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; };
+		CB533D9C14DABDA600C733F6 /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; };
+		CB533D9E14DABDA600C733F6 /* CoreLocation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreLocation.framework; path = System/Library/Frameworks/CoreLocation.framework; sourceTree = SDKROOT; };
+		CB533DA014DABDA600C733F6 /* MediaPlayer.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MediaPlayer.framework; path = System/Library/Frameworks/MediaPlayer.framework; sourceTree = SDKROOT; };
+		CB533DA214DABDA600C733F6 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
+		CB533DA414DABDA600C733F6 /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; };
+		CB533DA614DABDA600C733F6 /* MobileCoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MobileCoreServices.framework; path = System/Library/Frameworks/MobileCoreServices.framework; sourceTree = SDKROOT; };
+		CB533DA814DABDA600C733F6 /* CoreMedia.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMedia.framework; path = System/Library/Frameworks/CoreMedia.framework; sourceTree = SDKROOT; };
+		CB533DAC14DABDA600C733F6 /* WebODF-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "WebODF-Info.plist"; sourceTree = "<group>"; };
+		CB533DAE14DABDA600C733F6 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
+		CB533DB014DABDA600C733F6 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
+		CB533DB214DABDA600C733F6 /* WebODF-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "WebODF-Prefix.pch"; sourceTree = "<group>"; };
+		CB533DB314DABDA600C733F6 /* PhoneGap.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = PhoneGap.framework; path = /Users/Shared/PhoneGap/Frameworks/PhoneGap.framework; sourceTree = "<absolute>"; };
+		CB533DB814DABDA600C733F6 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = Resources/en.lproj/Localizable.strings; sourceTree = "<group>"; };
+		CB533DBF14DABDA600C733F6 /* icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = icon.png; path = Resources/icons/icon.png; sourceTree = "<group>"; };
+		CB533DC114DABDA600C733F6 /* icon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "icon@2x.png"; path = "Resources/icons/icon@2x.png"; sourceTree = "<group>"; };
+		CB533DC314DABDA600C733F6 /* icon-72.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "icon-72.png"; path = "Resources/icons/icon-72.png"; sourceTree = "<group>"; };
+		CB533DC614DABDA600C733F6 /* Default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Default.png; path = Resources/splash/Default.png; sourceTree = "<group>"; };
+		CB533DC814DABDA600C733F6 /* Default@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Default@2x.png"; path = "Resources/splash/Default@2x.png"; sourceTree = "<group>"; };
+		CB533DCC14DABDA600C733F6 /* PhoneGap.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = PhoneGap.plist; sourceTree = "<group>"; };
+		CB533DCF14DABDA600C733F6 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = Classes/AppDelegate.h; sourceTree = "<group>"; };
+		CB533DD014DABDA600C733F6 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = AppDelegate.m; path = Classes/AppDelegate.m; sourceTree = "<group>"; };
+		CB533DD214DABDA600C733F6 /* MainViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = MainViewController.h; path = Classes/MainViewController.h; sourceTree = "<group>"; };
+		CB533DD314DABDA600C733F6 /* MainViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = MainViewController.m; path = Classes/MainViewController.m; sourceTree = "<group>"; };
+		CB533DD514DABDA600C733F6 /* MainViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = MainViewController.xib; path = Classes/MainViewController.xib; sourceTree = "<group>"; };
+		CBD2B77114FF8E9700FC3A44 /* NativeZip.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NativeZip.h; path = Classes/NativeZip.h; sourceTree = "<group>"; };
+		CBD2B77214FF8E9700FC3A44 /* NativeZip.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = NativeZip.m; path = Classes/NativeZip.m; sourceTree = "<group>"; };
+		CBDCA69B1504EAEB00C706C7 /* WebViewCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebViewCache.h; path = Classes/WebViewCache.h; sourceTree = "<group>"; };
+		CBDCA69C1504EAEB00C706C7 /* WebViewCache.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = WebViewCache.m; path = Classes/WebViewCache.m; sourceTree = "<group>"; };
+/* End PBXFileReference section */
+
+/* Begin PBXFrameworksBuildPhase section */
+		CB533D8614DABDA500C733F6 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				CB29ECC314FFBC5500CEAEE3 /* libz.dylib in Frameworks */,
+				CB533D9114DABDA600C733F6 /* Foundation.framework in Frameworks */,
+				CB533D9314DABDA600C733F6 /* UIKit.framework in Frameworks */,
+				CB533D9514DABDA600C733F6 /* CoreGraphics.framework in Frameworks */,
+				CB533D9714DABDA600C733F6 /* AddressBook.framework in Frameworks */,
+				CB533D9914DABDA600C733F6 /* AddressBookUI.framework in Frameworks */,
+				CB533D9B14DABDA600C733F6 /* AudioToolbox.framework in Frameworks */,
+				CB533D9D14DABDA600C733F6 /* AVFoundation.framework in Frameworks */,
+				CB533D9F14DABDA600C733F6 /* CoreLocation.framework in Frameworks */,
+				CB533DA114DABDA600C733F6 /* MediaPlayer.framework in Frameworks */,
+				CB533DA314DABDA600C733F6 /* QuartzCore.framework in Frameworks */,
+				CB533DA514DABDA600C733F6 /* SystemConfiguration.framework in Frameworks */,
+				CB533DA714DABDA600C733F6 /* MobileCoreServices.framework in Frameworks */,
+				CB533DA914DABDA600C733F6 /* CoreMedia.framework in Frameworks */,
+				CB533DB414DABDA600C733F6 /* PhoneGap.framework in Frameworks */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		CB533D8914DABDA500C733F6 /* Frameworks */ = {
+			isa = PBXFrameworksBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXFrameworksBuildPhase section */
+
+/* Begin PBXGroup section */
+		CB533D7E14DABDA500C733F6 = {
+			isa = PBXGroup;
+			children = (
+				CB29ECC214FFBC5500CEAEE3 /* libz.dylib */,
+				CB29ECC014FFBC1B00CEAEE3 /* mztools.c */,
+				CB29ECBE14FFBC0500CEAEE3 /* ioapi.c */,
+				CB29ECBC14FFBBBB00CEAEE3 /* unzip.c */,
+				CB36D11714F68F7F0084BECB /* www */,
+				CB533DAA14DABDA600C733F6 /* WebODF */,
+				CB533D8F14DABDA500C733F6 /* Frameworks */,
+				CB533D8D14DABDA500C733F6 /* Products */,
+			);
+			sourceTree = "<group>";
+		};
+		CB533D8D14DABDA500C733F6 /* Products */ = {
+			isa = PBXGroup;
+			children = (
+				CB533D8C14DABDA500C733F6 /* KO Viewer.app */,
+			);
+			name = Products;
+			sourceTree = "<group>";
+		};
+		CB533D8F14DABDA500C733F6 /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				CB533D9014DABDA600C733F6 /* Foundation.framework */,
+				CB533D9214DABDA600C733F6 /* UIKit.framework */,
+				CB533D9414DABDA600C733F6 /* CoreGraphics.framework */,
+				CB533D9614DABDA600C733F6 /* AddressBook.framework */,
+				CB533D9814DABDA600C733F6 /* AddressBookUI.framework */,
+				CB533D9A14DABDA600C733F6 /* AudioToolbox.framework */,
+				CB533D9C14DABDA600C733F6 /* AVFoundation.framework */,
+				CB533D9E14DABDA600C733F6 /* CoreLocation.framework */,
+				CB533DA014DABDA600C733F6 /* MediaPlayer.framework */,
+				CB533DA214DABDA600C733F6 /* QuartzCore.framework */,
+				CB533DA414DABDA600C733F6 /* SystemConfiguration.framework */,
+				CB533DA614DABDA600C733F6 /* MobileCoreServices.framework */,
+				CB533DA814DABDA600C733F6 /* CoreMedia.framework */,
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
+		CB533DAA14DABDA600C733F6 /* WebODF */ = {
+			isa = PBXGroup;
+			children = (
+				CB533DB314DABDA600C733F6 /* PhoneGap.framework */,
+				CB533DB514DABDA600C733F6 /* Resources */,
+				CB533DCE14DABDA600C733F6 /* Classes */,
+				CB533DAB14DABDA600C733F6 /* Supporting Files */,
+			);
+			path = WebODF;
+			sourceTree = "<group>";
+		};
+		CB533DAB14DABDA600C733F6 /* Supporting Files */ = {
+			isa = PBXGroup;
+			children = (
+				CB533DAC14DABDA600C733F6 /* WebODF-Info.plist */,
+				CB533DAD14DABDA600C733F6 /* InfoPlist.strings */,
+				CB533DB014DABDA600C733F6 /* main.m */,
+				CB533DB214DABDA600C733F6 /* WebODF-Prefix.pch */,
+				CB533DCC14DABDA600C733F6 /* PhoneGap.plist */,
+				CB533DD514DABDA600C733F6 /* MainViewController.xib */,
+			);
+			name = "Supporting Files";
+			sourceTree = "<group>";
+		};
+		CB533DB514DABDA600C733F6 /* Resources */ = {
+			isa = PBXGroup;
+			children = (
+				CB533DB614DABDA600C733F6 /* en.lproj */,
+				CB533DBE14DABDA600C733F6 /* icons */,
+				CB533DC514DABDA600C733F6 /* splash */,
+			);
+			name = Resources;
+			sourceTree = "<group>";
+		};
+		CB533DB614DABDA600C733F6 /* en.lproj */ = {
+			isa = PBXGroup;
+			children = (
+				CB533DB714DABDA600C733F6 /* Localizable.strings */,
+			);
+			name = en.lproj;
+			sourceTree = "<group>";
+		};
+		CB533DBE14DABDA600C733F6 /* icons */ = {
+			isa = PBXGroup;
+			children = (
+				CB533DBF14DABDA600C733F6 /* icon.png */,
+				CB533DC114DABDA600C733F6 /* icon@2x.png */,
+				CB533DC314DABDA600C733F6 /* icon-72.png */,
+			);
+			name = icons;
+			sourceTree = "<group>";
+		};
+		CB533DC514DABDA600C733F6 /* splash */ = {
+			isa = PBXGroup;
+			children = (
+				CB099EC814DAC53D000D7B99 /* Default-Landscape~ipad.png */,
+				CB099EC614DAC535000D7B99 /* Default-Portrait~ipad.png */,
+				CB533DC614DABDA600C733F6 /* Default.png */,
+				CB533DC814DABDA600C733F6 /* Default@2x.png */,
+			);
+			name = splash;
+			sourceTree = "<group>";
+		};
+		CB533DCE14DABDA600C733F6 /* Classes */ = {
+			isa = PBXGroup;
+			children = (
+				CBDCA69B1504EAEB00C706C7 /* WebViewCache.h */,
+				CBDCA69C1504EAEB00C706C7 /* WebViewCache.m */,
+				CB533DCF14DABDA600C733F6 /* AppDelegate.h */,
+				CB533DD014DABDA600C733F6 /* AppDelegate.m */,
+				CB533DD214DABDA600C733F6 /* MainViewController.h */,
+				CB533DD314DABDA600C733F6 /* MainViewController.m */,
+				CBD2B77114FF8E9700FC3A44 /* NativeZip.h */,
+				CBD2B77214FF8E9700FC3A44 /* NativeZip.m */,
+			);
+			name = Classes;
+			sourceTree = "<group>";
+		};
+/* End PBXGroup section */
+
+/* Begin PBXNativeTarget section */
+		CB533D8B14DABDA500C733F6 /* KO Viewer */ = {
+			isa = PBXNativeTarget;
+			buildConfigurationList = CB533DDB14DABDA600C733F6 /* Build configuration list for PBXNativeTarget "KO Viewer" */;
+			buildPhases = (
+				CB533D8514DABDA500C733F6 /* Sources */,
+				CB533D8614DABDA500C733F6 /* Frameworks */,
+				CB533D8714DABDA500C733F6 /* Resources */,
+				CB533D8814DABDA500C733F6 /* Sources */,
+				CB533D8914DABDA500C733F6 /* Frameworks */,
+				CB533D8A14DABDA500C733F6 /* ShellScript */,
+			);
+			buildRules = (
+			);
+			dependencies = (
+			);
+			name = "KO Viewer";
+			productName = WebODF;
+			productReference = CB533D8C14DABDA500C733F6 /* KO Viewer.app */;
+			productType = "com.apple.product-type.application";
+		};
+/* End PBXNativeTarget section */
+
+/* Begin PBXProject section */
+		CB533D8014DABDA500C733F6 /* Project object */ = {
+			isa = PBXProject;
+			attributes = {
+				LastUpgradeCheck = 0420;
+			};
+			buildConfigurationList = CB533D8314DABDA500C733F6 /* Build configuration list for PBXProject "WebODF" */;
+			compatibilityVersion = "Xcode 3.2";
+			developmentRegion = English;
+			hasScannedForEncodings = 0;
+			knownRegions = (
+				en,
+				es,
+			);
+			mainGroup = CB533D7E14DABDA500C733F6;
+			productRefGroup = CB533D8D14DABDA500C733F6 /* Products */;
+			projectDirPath = "";
+			projectRoot = "";
+			targets = (
+				CB533D8B14DABDA500C733F6 /* KO Viewer */,
+			);
+		};
+/* End PBXProject section */
+
+/* Begin PBXResourcesBuildPhase section */
+		CB533D8714DABDA500C733F6 /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				CB533DAF14DABDA600C733F6 /* InfoPlist.strings in Resources */,
+				CB533DB914DABDA600C733F6 /* Localizable.strings in Resources */,
+				CB533DC014DABDA600C733F6 /* icon.png in Resources */,
+				CB533DC214DABDA600C733F6 /* icon@2x.png in Resources */,
+				CB533DC414DABDA600C733F6 /* icon-72.png in Resources */,
+				CB533DC714DABDA600C733F6 /* Default.png in Resources */,
+				CB533DC914DABDA600C733F6 /* Default@2x.png in Resources */,
+				CB533DCD14DABDA600C733F6 /* PhoneGap.plist in Resources */,
+				CB533DD614DABDA600C733F6 /* MainViewController.xib in Resources */,
+				CB099EC714DAC535000D7B99 /* Default-Portrait~ipad.png in Resources */,
+				CB099EC914DAC53D000D7B99 /* Default-Landscape~ipad.png in Resources */,
+				CB36D11814F68F7F0084BECB /* www in Resources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXResourcesBuildPhase section */
+
+/* Begin PBXShellScriptBuildPhase section */
+		CB533D8A14DABDA500C733F6 /* ShellScript */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputPaths = (
+			);
+			outputPaths = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/bash;
+			shellScript = "rsync -a ../touchui/app/ www/app/\ncp ../../webodf/webodf.css www/\ncp ../touchui/sencha-touch.* www/\ncp ../touchui/Zoom*.png www/\nif [ ! -e www/webodf.js ]; then\n    # webodf.js should be built\n    if [ ! -e build ]; then mkdir build; fi\n    cd build\n    cmake -G Xcode ../../.. && make && cp webodf/webodf.js ..\n    if [ ! -e webodf.js ]; then\n        echo \"put webodf.js in the ios/www directory\"\n        exit 1;\n    fi\nfi\n";
+		};
+/* End PBXShellScriptBuildPhase section */
+
+/* Begin PBXSourcesBuildPhase section */
+		CB533D8514DABDA500C733F6 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				CB533DB114DABDA600C733F6 /* main.m in Sources */,
+				CB533DD114DABDA600C733F6 /* AppDelegate.m in Sources */,
+				CB533DD414DABDA600C733F6 /* MainViewController.m in Sources */,
+				CBD2B77314FF8E9700FC3A44 /* NativeZip.m in Sources */,
+				CB29ECBD14FFBBBB00CEAEE3 /* unzip.c in Sources */,
+				CB29ECBF14FFBC0500CEAEE3 /* ioapi.c in Sources */,
+				CB29ECC114FFBC1B00CEAEE3 /* mztools.c in Sources */,
+				CBDCA69D1504EAEB00C706C7 /* WebViewCache.m in Sources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+		CB533D8814DABDA500C733F6 /* Sources */ = {
+			isa = PBXSourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXSourcesBuildPhase section */
+
+/* Begin PBXVariantGroup section */
+		CB533DAD14DABDA600C733F6 /* InfoPlist.strings */ = {
+			isa = PBXVariantGroup;
+			children = (
+				CB533DAE14DABDA600C733F6 /* en */,
+			);
+			name = InfoPlist.strings;
+			sourceTree = "<group>";
+		};
+		CB533DB714DABDA600C733F6 /* Localizable.strings */ = {
+			isa = PBXVariantGroup;
+			children = (
+				CB533DB814DABDA600C733F6 /* en */,
+			);
+			name = Localizable.strings;
+			sourceTree = "<group>";
+		};
+/* End PBXVariantGroup section */
+
+/* Begin XCBuildConfiguration section */
+		CB533DD914DABDA600C733F6 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
+				CLANG_ENABLE_OBJC_ARC = YES;
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				COPY_PHASE_STRIP = NO;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_PREPROCESSOR_DEFINITIONS = (
+					"DEBUG=1",
+					"$(inherited)",
+				);
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+				GCC_VERSION = com.apple.compilers.llvmgcc42;
+				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 3.0;
+				SDKROOT = iphoneos;
+			};
+			name = Debug;
+		};
+		CB533DDA14DABDA600C733F6 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = NO;
+				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
+				CLANG_ENABLE_OBJC_ARC = YES;
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
+				COPY_PHASE_STRIP = YES;
+				GCC_C_LANGUAGE_STANDARD = gnu99;
+				GCC_VERSION = com.apple.compilers.llvmgcc42;
+				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				IPHONEOS_DEPLOYMENT_TARGET = 3.0;
+				SDKROOT = iphoneos;
+				VALIDATE_PRODUCT = YES;
+			};
+			name = Release;
+		};
+		CB533DDC14DABDA600C733F6 /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = YES;
+				CODE_SIGN_IDENTITY = "iPhone Developer: Jos van den Oever (GJ9RDPR233)";
+				COPY_PHASE_STRIP = NO;
+				FRAMEWORK_SEARCH_PATHS = /Users/Shared/PhoneGap/Frameworks;
+				GCC_DYNAMIC_NO_PIC = NO;
+				GCC_PRECOMPILE_PREFIX_HEADER = YES;
+				GCC_PREFIX_HEADER = "WebODF/WebODF-Prefix.pch";
+				GCC_PREPROCESSOR_DEFINITIONS = "PHONEGAP_FRAMEWORK=YES";
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+				INFOPLIST_FILE = "WebODF/WebODF-Info.plist";
+				IPHONEOS_DEPLOYMENT_TARGET = 5.0;
+				OTHER_LDFLAGS = (
+					"-weak_framework",
+					UIKit,
+					"-weak_framework",
+					AVFoundation,
+					"-weak_framework",
+					CoreMedia,
+					"-weak_library",
+					/usr/lib/libSystem.B.dylib,
+				);
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE = "8A253628-DC77-4EEA-8543-53315AA93987";
+				TARGETED_DEVICE_FAMILY = "1,2";
+				WRAPPER_EXTENSION = app;
+			};
+			name = Debug;
+		};
+		CB533DDD14DABDA600C733F6 /* Release */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ALWAYS_SEARCH_USER_PATHS = YES;
+				ARCHS = (
+					armv6,
+					"$(ARCHS_STANDARD_32_BIT)",
+				);
+				CODE_SIGN_IDENTITY = "iPhone Developer: Jos van den Oever (GJ9RDPR233)";
+				COPY_PHASE_STRIP = YES;
+				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
+				FRAMEWORK_SEARCH_PATHS = /Users/Shared/PhoneGap/Frameworks;
+				GCC_PRECOMPILE_PREFIX_HEADER = YES;
+				GCC_PREFIX_HEADER = "WebODF/WebODF-Prefix.pch";
+				GCC_PREPROCESSOR_DEFINITIONS = "PHONEGAP_FRAMEWORK=YES";
+				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
+				INFOPLIST_FILE = "WebODF/WebODF-Info.plist";
+				IPHONEOS_DEPLOYMENT_TARGET = 5.0;
+				OTHER_LDFLAGS = (
+					"-weak_framework",
+					UIKit,
+					"-weak_framework",
+					AVFoundation,
+					"-weak_framework",
+					CoreMedia,
+					"-weak_library",
+					/usr/lib/libSystem.B.dylib,
+				);
+				PRODUCT_NAME = "$(TARGET_NAME)";
+				PROVISIONING_PROFILE = "8A253628-DC77-4EEA-8543-53315AA93987";
+				TARGETED_DEVICE_FAMILY = "1,2";
+				VALIDATE_PRODUCT = YES;
+				WRAPPER_EXTENSION = app;
+			};
+			name = Release;
+		};
+/* End XCBuildConfiguration section */
+
+/* Begin XCConfigurationList section */
+		CB533D8314DABDA500C733F6 /* Build configuration list for PBXProject "WebODF" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				CB533DD914DABDA600C733F6 /* Debug */,
+				CB533DDA14DABDA600C733F6 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+		CB533DDB14DABDA600C733F6 /* Build configuration list for PBXNativeTarget "KO Viewer" */ = {
+			isa = XCConfigurationList;
+			buildConfigurations = (
+				CB533DDC14DABDA600C733F6 /* Debug */,
+				CB533DDD14DABDA600C733F6 /* Release */,
+			);
+			defaultConfigurationIsVisible = 0;
+			defaultConfigurationName = Release;
+		};
+/* End XCConfigurationList section */
+	};
+	rootObject = CB533D8014DABDA500C733F6 /* Project object */;
+}
diff --git a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/AppDelegate.h b/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/AppDelegate.h
new file mode 100644
index 0000000000..e2e93b0d9e
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/AppDelegate.h
@@ -0,0 +1,52 @@
+/*
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you 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.
+ */
+
+//
+//  AppDelegate.h
+//  WebODF
+//
+//  Created by KO GmbH on 2/2/12.
+//  Copyright __MyCompanyName__ 2012. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+#ifdef PHONEGAP_FRAMEWORK
+    #import <PhoneGap/PGViewController.h>
+#else
+    #import "PGViewController.h"
+#endif
+
+
+@interface AppDelegate : NSObject < UIApplicationDelegate, UIWebViewDelegate, PGCommandDelegate > {
+
+	NSString* invokeString;
+}
+
+// invoke string is passed to your app on launch, this is only valid if you 
+// edit FooBar.plist to add a protocol
+// a simple tutorial can be found here : 
+// http://iphonedevelopertips.com/cocoa/launching-your-own-application-via-a-custom-url-scheme.html
+
+@property (nonatomic, copy)  NSString* invokeString;
+@property (nonatomic, retain) IBOutlet UIWindow* window;
+@property (nonatomic, retain) IBOutlet PGViewController* viewController;
+
+@end
+
diff --git a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/AppDelegate.m b/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/AppDelegate.m
new file mode 100644
index 0000000000..6845e95349
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/AppDelegate.m
@@ -0,0 +1,202 @@
+/*
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you 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.
+ */
+
+//
+//  AppDelegate.m
+//  WebODF
+//
+//  Created by KO GmbH on 2/2/12.
+//  Copyright __MyCompanyName__ 2012. All rights reserved.
+//
+
+#import "AppDelegate.h"
+#import "MainViewController.h"
+
+#ifdef PHONEGAP_FRAMEWORK
+    #import <PhoneGap/PGPlugin.h>
+    #import <PhoneGap/PGURLProtocol.h>
+#else
+    #import "PGPlugin.h"
+    #import "PGURLProtocol.h"
+#endif
+#import "WebViewCache.h"
+
+
+@implementation AppDelegate
+
+@synthesize invokeString, window, viewController;
+
+- (id) init
+{	
+	/** If you need to do any extra app-specific initialization, you can do it here
+	 *  -jm
+	 **/
+    NSHTTPCookieStorage *cookieStorage = [NSHTTPCookieStorage sharedHTTPCookieStorage]; 
+    [cookieStorage setCookieAcceptPolicy:NSHTTPCookieAcceptPolicyAlways];
+    
+    [PGURLProtocol registerPGHttpURLProtocol];
+    
+    return [super init];
+}
+
+#pragma UIApplicationDelegate implementation
+
+/**
+ * This is main kick off after the app inits, the views and Settings are setup here. (preferred - iOS4 and up)
+ */
+- (BOOL) application:(UIApplication*)application didFinishLaunchingWithOptions:(NSDictionary*)launchOptions
+{    
+    NSURL* url = [launchOptions objectForKey:UIApplicationLaunchOptionsURLKey];
+    if (url && [url isKindOfClass:[NSURL class]]) {
+        self.invokeString = [url absoluteString];
+		NSLog(@"WebODF launchOptions = %@", url);
+    }    
+    
+    CGRect screenBounds = [[UIScreen mainScreen] bounds];
+    self.window = [[UIWindow alloc] initWithFrame:screenBounds];
+    self.window.autoresizesSubviews = YES;
+    
+    CGRect viewBounds = [[UIScreen mainScreen] applicationFrame];
+    
+    self.viewController = [[MainViewController alloc] init];
+    self.viewController.useSplashScreen = YES;
+    self.viewController.wwwFolderName = @"www";
+    self.viewController.startPage = @"index.html";
+    self.viewController.view.frame = viewBounds;
+    
+    // over-ride delegates
+    self.viewController.webView.delegate = self;
+    self.viewController.commandDelegate = self;
+
+    // check whether the current orientation is supported: if it is, keep it, rather than forcing a rotation
+    BOOL forceStartupRotation = YES;
+    UIDeviceOrientation curDevOrientation = [[UIDevice currentDevice] orientation];
+    
+    if (UIDeviceOrientationUnknown == curDevOrientation) {
+        // UIDevice isn't firing orientation notifications yet… go look at the status bar
+        curDevOrientation = (UIDeviceOrientation)[[UIApplication sharedApplication] statusBarOrientation];
+    }
+    
+    if (UIDeviceOrientationIsValidInterfaceOrientation(curDevOrientation)) {
+        for (NSNumber *orient in self.viewController.supportedOrientations) {
+            if ([orient intValue] == curDevOrientation) {
+                forceStartupRotation = NO;
+                break;
+            }
+        }
+    }
+    
+    if (forceStartupRotation) {
+        NSLog(@"supportedOrientations: %@", self.viewController.supportedOrientations);
+        // The first item in the supportedOrientations array is the start orientation (guaranteed to be at least Portrait)
+        UIInterfaceOrientation newOrient = [[self.viewController.supportedOrientations objectAtIndex:0] intValue];
+        NSLog(@"AppDelegate forcing status bar to: %d from: %d", newOrient, curDevOrientation);
+        [[UIApplication sharedApplication] setStatusBarOrientation:newOrient];
+    }
+    
+    [self.window addSubview:self.viewController.view];
+    [self.window makeKeyAndVisible];
+    
+    
+    NSString *path = @"./cache";
+    NSUInteger discCapacity = 1*1024*1024;
+    NSUInteger memoryCapacity = 0*1024*1024;
+    
+    WebViewCache *cache =
+    [[WebViewCache alloc] initWithMemoryCapacity: memoryCapacity
+                                        diskCapacity: discCapacity diskPath:path];
+    [NSURLCache setSharedURLCache:cache];
+
+    
+    return YES;
+}
+
+// this happens while we are running ( in the background, or from within our own app )
+// only valid if FooBar.plist specifies a protocol to handle
+- (BOOL) application:(UIApplication*)application handleOpenURL:(NSURL*)url 
+{
+    if (!url) { 
+        return NO; 
+    }
+    
+	// calls into javascript global function 'handleOpenURL'
+    NSString* jsString = [NSString stringWithFormat:@"handleOpenURL(\"%@\");", url];
+    [self.viewController.webView stringByEvaluatingJavaScriptFromString:jsString];
+    
+    // all plugins will get the notification, and their handlers will be called 
+    [[NSNotificationCenter defaultCenter] postNotification:[NSNotification notificationWithName:PGPluginHandleOpenURLNotification object:url]];
+    
+    return YES;    
+}
+
+#pragma PGCommandDelegate implementation
+
+- (id) getCommandInstance:(NSString*)className
+{
+	return [self.viewController getCommandInstance:className];
+}
+
+- (BOOL) execute:(InvokedUrlCommand*)command
+{
+	return [self.viewController execute:command];
+}
+
+- (NSString*) pathForResource:(NSString*)resourcepath;
+{
+	return [self.viewController pathForResource:resourcepath];
+}
+
+#pragma UIWebDelegate implementation
+
+- (void) webViewDidFinishLoad:(UIWebView*) theWebView 
+{
+	// only valid if FooBar.plist specifies a protocol to handle
+	if (self.invokeString)
+	{
+		// this is passed before the deviceready event is fired, so you can access it in js when you receive deviceready
+		NSString* jsString = [NSString stringWithFormat:@"var invokeString = \"%@\";", self.invokeString];
+		[theWebView stringByEvaluatingJavaScriptFromString:jsString];
+	}
+	
+	 // Black base color for background matches the native apps
+   	theWebView.backgroundColor = [UIColor blackColor];
+    
+	return [self.viewController webViewDidFinishLoad:theWebView];
+}
+
+- (void) webViewDidStartLoad:(UIWebView*)theWebView 
+{
+	return [self.viewController webViewDidStartLoad:theWebView];
+}
+
+- (void) webView:(UIWebView*)theWebView didFailLoadWithError:(NSError*)error 
+{
+	return [self.viewController webView:theWebView didFailLoadWithError:error];
+}
+
+- (BOOL) webView:(UIWebView*)theWebView shouldStartLoadWithRequest:(NSURLRequest*)request navigationType:(UIWebViewNavigationType)navigationType
+{
+	return [self.viewController webView:theWebView shouldStartLoadWithRequest:request navigationType:navigationType];
+}
+
+- (void) dealloc
+{
+}
+
+@end
diff --git a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/MainViewController.h b/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/MainViewController.h
new file mode 100644
index 0000000000..33ddbc2103
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/MainViewController.h
@@ -0,0 +1,17 @@
+//
+//  MainViewController.h
+//  FooBar
+//
+//  Created by Shazron Abdullah on 12-01-26.
+//  Copyright (c) 2012 __MyCompanyName__. All rights reserved.
+//
+
+#ifdef PHONEGAP_FRAMEWORK
+    #import <PhoneGap/PGViewController.h>
+#else
+    #import "PGViewController.h"
+#endif
+
+@interface MainViewController : PGViewController
+
+@end
diff --git a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/MainViewController.m b/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/MainViewController.m
new file mode 100644
index 0000000000..550e4b25c2
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/MainViewController.m
@@ -0,0 +1,47 @@
+//
+//  MainViewController.m
+//  WebODF
+//
+#import "MainViewController.h"
+
+@implementation MainViewController
+
+- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
+{
+    self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil];
+    if (self) {
+        // Custom initialization
+    }
+    return self;
+}
+
+- (void)didReceiveMemoryWarning
+{
+    // Releases the view if it doesn't have a superview.
+    [super didReceiveMemoryWarning];
+    
+    // Release any cached data, images, etc that aren't in use.
+}
+
+#pragma mark - View lifecycle
+
+- (void)viewDidLoad
+{
+    [super viewDidLoad];
+    // Do any additional setup after loading the view from its nib.
+}
+
+- (void)viewDidUnload
+{
+    [super viewDidUnload];
+    // Release any retained subviews of the main view.
+    // e.g. self.myOutlet = nil;
+}
+
+- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation
+{
+    // Return YES for supported orientations
+    return (interfaceOrientation == UIInterfaceOrientationPortrait);
+}
+
+@end
diff --git a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/MainViewController.xib b/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/MainViewController.xib
new file mode 100644
index 0000000000..9837f578ca
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/MainViewController.xib
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
+	<data>
+		<int key="IBDocument.SystemTarget">1280</int>
+		<string key="IBDocument.SystemVersion">11C25</string>
+		<string key="IBDocument.InterfaceBuilderVersion">1919</string>
+		<string key="IBDocument.AppKitVersion">1138.11</string>
+		<string key="IBDocument.HIToolboxVersion">566.00</string>
+		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
+			<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+			<string key="NS.object.0">916</string>
+		</object>
+		<array key="IBDocument.IntegratedClassDependencies">
+			<string>IBProxyObject</string>
+			<string>IBUIView</string>
+		</array>
+		<array key="IBDocument.PluginDependencies">
+			<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+		</array>
+		<object class="NSMutableDictionary" key="IBDocument.Metadata">
+			<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
+			<integer value="1" key="NS.object.0"/>
+		</object>
+		<array class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
+			<object class="IBProxyObject" id="372490531">
+				<string key="IBProxiedObjectIdentifier">IBFilesOwner</string>
+				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+			</object>
+			<object class="IBProxyObject" id="975951072">
+				<string key="IBProxiedObjectIdentifier">IBFirstResponder</string>
+				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+			</object>
+			<object class="IBUIView" id="191373211">
+				<reference key="NSNextResponder"/>
+				<int key="NSvFlags">274</int>
+				<string key="NSFrame">{{0, 20}, {320, 460}}</string>
+				<reference key="NSSuperview"/>
+				<reference key="NSWindow"/>
+				<object class="NSColor" key="IBUIBackgroundColor">
+					<int key="NSColorSpace">3</int>
+					<bytes key="NSWhite">MQA</bytes>
+					<object class="NSColorSpace" key="NSCustomColorSpace">
+						<int key="NSID">2</int>
+					</object>
+				</object>
+				<object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/>
+				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
+			</object>
+		</array>
+		<object class="IBObjectContainer" key="IBDocument.Objects">
+			<array class="NSMutableArray" key="connectionRecords">
+				<object class="IBConnectionRecord">
+					<object class="IBCocoaTouchOutletConnection" key="connection">
+						<string key="label">view</string>
+						<reference key="source" ref="372490531"/>
+						<reference key="destination" ref="191373211"/>
+					</object>
+					<int key="connectionID">3</int>
+				</object>
+			</array>
+			<object class="IBMutableOrderedSet" key="objectRecords">
+				<array key="orderedObjects">
+					<object class="IBObjectRecord">
+						<int key="objectID">0</int>
+						<array key="object" id="0"/>
+						<reference key="children" ref="1000"/>
+						<nil key="parent"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">1</int>
+						<reference key="object" ref="191373211"/>
+						<reference key="parent" ref="0"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-1</int>
+						<reference key="object" ref="372490531"/>
+						<reference key="parent" ref="0"/>
+						<string key="objectName">File's Owner</string>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">-2</int>
+						<reference key="object" ref="975951072"/>
+						<reference key="parent" ref="0"/>
+					</object>
+				</array>
+			</object>
+			<dictionary class="NSMutableDictionary" key="flattenedProperties">
+				<string key="-1.CustomClassName">MainViewController</string>
+				<string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="-2.CustomClassName">UIResponder</string>
+				<string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+				<string key="1.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
+			</dictionary>
+			<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
+			<nil key="activeLocalization"/>
+			<dictionary class="NSMutableDictionary" key="localizations"/>
+			<nil key="sourceID"/>
+			<int key="maxID">3</int>
+		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes">
+			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
+				<object class="IBPartialClassDescription">
+					<string key="className">MainViewController</string>
+					<string key="superclassName">UIViewController</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/MainViewController.h</string>
+					</object>
+				</object>
+			</array>
+		</object>
+		<int key="IBDocument.localizationMode">0</int>
+		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
+		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
+		<int key="IBDocument.defaultPropertyAccessControl">3</int>
+		<string key="IBCocoaTouchPluginVersion">916</string>
+	</data>
+</archive>
diff --git a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/NSData+Base64.h b/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/NSData+Base64.h
new file mode 100644
index 0000000000..eb1ff485a7
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/NSData+Base64.h
@@ -0,0 +1,33 @@
+//
+//  NSData+Base64.h
+//  base64
+//
+//  Created by Matt Gallagher on 2009/06/03.
+//  Copyright 2009 Matt Gallagher. All rights reserved.
+//
+//  Permission is given to use this source code file, free of charge, in any
+//  project, commercial or otherwise, entirely at your risk, with the condition
+//  that any redistribution (in part or whole) of source code must retain
+//  this copyright and permission notice. Attribution in compiled projects is
+//  appreciated but not required.
+//
+
+#import <Foundation/Foundation.h>
+
+void *NewBase64Decode(
+	const char *inputBuffer,
+	size_t length,
+	size_t *outputLength);
+
+char *NewBase64Encode(
+	const void *inputBuffer,
+	size_t length,
+	bool separateLines,
+	size_t *outputLength);
+
+@interface NSData (Base64)
+
++ (NSData *)dataFromBase64String:(NSString *)aString;
+- (NSString *)base64EncodedString;
+
+@end
diff --git a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/NSData+Base64.m b/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/NSData+Base64.m
new file mode 100644
index 0000000000..13f828d09c
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/NSData+Base64.m
@@ -0,0 +1,299 @@
+//
+//  NSData+Base64.m
+//  base64
+//
+//  Created by Matt Gallagher on 2009/06/03.
+//  Copyright 2009 Matt Gallagher. All rights reserved.
+//
+//  Permission is given to use this source code file, free of charge, in any
+//  project, commercial or otherwise, entirely at your risk, with the condition
+//  that any redistribution (in part or whole) of source code must retain
+//  this copyright and permission notice. Attribution in compiled projects is
+//  appreciated but not required.
+//
+
+#import "NSData+Base64.h"
+
+//
+// Mapping from 6 bit pattern to ASCII character.
+//
+static unsigned char base64EncodeLookup[65] =
+	"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+
+//
+// Definition for "masked-out" areas of the base64DecodeLookup mapping
+//
+#define xx 65
+
+//
+// Mapping from ASCII character to 6 bit pattern.
+//
+static unsigned char base64DecodeLookup[256] =
+{
+    xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, 
+    xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, 
+    xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, 62, xx, xx, xx, 63, 
+    52, 53, 54, 55, 56, 57, 58, 59, 60, 61, xx, xx, xx, xx, xx, xx, 
+    xx,  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 
+    15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, xx, xx, xx, xx, xx, 
+    xx, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 
+    41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, xx, xx, xx, xx, xx, 
+    xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, 
+    xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, 
+    xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, 
+    xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, 
+    xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, 
+    xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, 
+    xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, 
+    xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, 
+};
+
+//
+// Fundamental sizes of the binary and base64 encode/decode units in bytes
+//
+#define BINARY_UNIT_SIZE 3
+#define BASE64_UNIT_SIZE 4
+
+//
+// NewBase64Decode
+//
+// Decodes the base64 ASCII string in the inputBuffer to a newly malloced
+// output buffer.
+//
+//  inputBuffer - the source ASCII string for the decode
+//	length - the length of the string or -1 (to specify strlen should be used)
+//	outputLength - if not-NULL, on output will contain the decoded length
+//
+// returns the decoded buffer. Must be free'd by caller. Length is given by
+//	outputLength.
+//
+void *NewBase64Decode(
+	const char *inputBuffer,
+	size_t length,
+	size_t *outputLength)
+{
+	if (length == -1)
+	{
+		length = strlen(inputBuffer);
+	}
+	
+	size_t outputBufferSize = (length / BASE64_UNIT_SIZE) * BINARY_UNIT_SIZE;
+	unsigned char *outputBuffer = (unsigned char *)malloc(outputBufferSize);
+	
+	size_t i = 0;
+	size_t j = 0;
+	while (i < length)
+	{
+		//
+		// Accumulate 4 valid characters (ignore everything else)
+		//
+		unsigned char accumulated[BASE64_UNIT_SIZE];
+		bzero(accumulated, sizeof(unsigned char) * BASE64_UNIT_SIZE);
+		size_t accumulateIndex = 0;
+		while (i < length)
+		{
+			unsigned char decode = base64DecodeLookup[inputBuffer[i++]];
+			if (decode != xx)
+			{
+				accumulated[accumulateIndex] = decode;
+				accumulateIndex++;
+				
+				if (accumulateIndex == BASE64_UNIT_SIZE)
+				{
+					break;
+				}
+			}
+		}
+		
+		//
+		// Store the 6 bits from each of the 4 characters as 3 bytes
+		//
+		outputBuffer[j] = (accumulated[0] << 2) | (accumulated[1] >> 4);
+		outputBuffer[j + 1] = (accumulated[1] << 4) | (accumulated[2] >> 2);
+		outputBuffer[j + 2] = (accumulated[2] << 6) | accumulated[3];
+		j += accumulateIndex - 1;
+	}
+	
+	if (outputLength)
+	{
+		*outputLength = j;
+	}
+	return outputBuffer;
+}
+
+//
+// NewBase64Decode
+//
+// Encodes the arbitrary data in the inputBuffer as base64 into a newly malloced
+// output buffer.
+//
+//  inputBuffer - the source data for the encode
+//	length - the length of the input in bytes
+//  separateLines - if zero, no CR/LF characters will be added. Otherwise
+//		a CR/LF pair will be added every 64 encoded chars.
+//	outputLength - if not-NULL, on output will contain the encoded length
+//		(not including terminating 0 char)
+//
+// returns the encoded buffer. Must be free'd by caller. Length is given by
+//	outputLength.
+//
+char *NewBase64Encode(
+	const void *buffer,
+	size_t length,
+	bool separateLines,
+	size_t *outputLength)
+{
+	const unsigned char *inputBuffer = (const unsigned char *)buffer;
+	
+	#define MAX_NUM_PADDING_CHARS 2
+	#define OUTPUT_LINE_LENGTH 64
+	#define INPUT_LINE_LENGTH ((OUTPUT_LINE_LENGTH / BASE64_UNIT_SIZE) * BINARY_UNIT_SIZE)
+	#define CR_LF_SIZE 0
+	
+	//
+	// Byte accurate calculation of final buffer size
+	//
+	size_t outputBufferSize =
+			((length / BINARY_UNIT_SIZE)
+				+ ((length % BINARY_UNIT_SIZE) ? 1 : 0))
+					* BASE64_UNIT_SIZE;
+	if (separateLines)
+	{
+		outputBufferSize +=
+			(outputBufferSize / OUTPUT_LINE_LENGTH) * CR_LF_SIZE;
+	}
+	
+	//
+	// Include space for a terminating zero
+	//
+	outputBufferSize += 1;
+
+	//
+	// Allocate the output buffer
+	//
+	char *outputBuffer = (char *)malloc(outputBufferSize);
+	if (!outputBuffer)
+	{
+		return NULL;
+	}
+
+	size_t i = 0;
+	size_t j = 0;
+	const size_t lineLength = separateLines ? INPUT_LINE_LENGTH : length;
+	size_t lineEnd = lineLength;
+	
+	while (true)
+	{
+		if (lineEnd > length)
+		{
+			lineEnd = length;
+		}
+
+		for (; i + BINARY_UNIT_SIZE - 1 < lineEnd; i += BINARY_UNIT_SIZE)
+		{
+			//
+			// Inner loop: turn 48 bytes into 64 base64 characters
+			//
+			outputBuffer[j++] = base64EncodeLookup[(inputBuffer[i] & 0xFC) >> 2];
+			outputBuffer[j++] = base64EncodeLookup[((inputBuffer[i] & 0x03) << 4)
+				| ((inputBuffer[i + 1] & 0xF0) >> 4)];
+			outputBuffer[j++] = base64EncodeLookup[((inputBuffer[i + 1] & 0x0F) << 2)
+				| ((inputBuffer[i + 2] & 0xC0) >> 6)];
+			outputBuffer[j++] = base64EncodeLookup[inputBuffer[i + 2] & 0x3F];
+		}
+		
+		if (lineEnd == length)
+		{
+			break;
+		}
+		
+		//
+		// Add the newline
+		//
+		//outputBuffer[j++] = '\r';
+		//outputBuffer[j++] = '\n';
+		lineEnd += lineLength;
+	}
+	
+	if (i + 1 < length)
+	{
+		//
+		// Handle the single '=' case
+		//
+		outputBuffer[j++] = base64EncodeLookup[(inputBuffer[i] & 0xFC) >> 2];
+		outputBuffer[j++] = base64EncodeLookup[((inputBuffer[i] & 0x03) << 4)
+			| ((inputBuffer[i + 1] & 0xF0) >> 4)];
+		outputBuffer[j++] = base64EncodeLookup[(inputBuffer[i + 1] & 0x0F) << 2];
+		outputBuffer[j++] =	'=';
+	}
+	else if (i < length)
+	{
+		//
+		// Handle the double '=' case
+		//
+		outputBuffer[j++] = base64EncodeLookup[(inputBuffer[i] & 0xFC) >> 2];
+		outputBuffer[j++] = base64EncodeLookup[(inputBuffer[i] & 0x03) << 4];
+		outputBuffer[j++] = '=';
+		outputBuffer[j++] = '=';
+	}
+	outputBuffer[j] = 0;
+	
+	//
+	// Set the output length and return the buffer
+	//
+	if (outputLength)
+	{
+		*outputLength = j;
+	}
+	return outputBuffer;
+}
+
+@implementation NSData (Base64)
+
+//
+// dataFromBase64String:
+//
+// Creates an NSData object containing the base64 decoded representation of
+// the base64 string 'aString'
+//
+// Parameters:
+//    aString - the base64 string to decode
+//
+// returns the autoreleased NSData representation of the base64 string
+//
++ (NSData *)dataFromBase64String:(NSString *)aString
+{
+	NSData *data = [aString dataUsingEncoding:NSASCIIStringEncoding];
+	size_t outputLength;
+	void *outputBuffer = NewBase64Decode([data bytes], [data length], &outputLength);
+	NSData *result = [NSData dataWithBytes:outputBuffer length:outputLength];
+	free(outputBuffer);
+	return result;
+}
+
+//
+// base64EncodedString
+//
+// Creates an NSString object that contains the base 64 encoding of the
+// receiver's data. Lines are broken at 64 characters long.
+//
+// returns an autoreleased NSString being the base 64 representation of the
+//	receiver.
+//
+- (NSString *)base64EncodedString
+{
+	size_t outputLength;
+	char *outputBuffer =
+		NewBase64Encode([self bytes], [self length], true, &outputLength);
+	
+	NSString *result =
+		[[[NSString alloc]
+			initWithBytes:outputBuffer
+			length:outputLength
+			encoding:NSASCIIStringEncoding]
+		autorelease];
+	free(outputBuffer);
+	return result;
+}
+
+@end
diff --git a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/NativeZip.h b/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/NativeZip.h
new file mode 100644
index 0000000000..44e296b8cf
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/NativeZip.h
@@ -0,0 +1,13 @@
+#import <PhoneGap/PGPlugin.h>
+
+@interface NativeZip : PGPlugin {
+     NSString* callbackID;
+}
+
+@property (nonatomic, copy) NSString* callbackID;
+
+- (void) load:(BOOL)base64 arguments:(NSMutableArray*)arguments withDict:(NSMutableDictionary*)options;
+- (void) loadAsString:(NSMutableArray*)arguments withDict:(NSMutableDictionary*)options;
+- (void) loadAsDataURL:(NSMutableArray*)arguments withDict:(NSMutableDictionary*)options;
+
+@end
\ No newline at end of file
diff --git a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/NativeZip.m b/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/NativeZip.m
new file mode 100644
index 0000000000..d8c241cf0b
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/NativeZip.m
@@ -0,0 +1,79 @@
+#import "NativeZip.h"
+#import "minizip/unzip.h"
+#import "NSData+Base64.h"
+
+@implementation NativeZip
+@synthesize callbackID;
+
+-(void) load:(BOOL)base64 arguments:(NSMutableArray*)arguments withDict:(NSMutableDictionary*)options
+{
+    self.callbackID = [arguments objectAtIndex:0];
+    NSString *zipPath = [arguments objectAtIndex:1];
+    NSString *entryPath = [arguments objectAtIndex:2];
+    NSString *mimetype = nil;
+    if (base64 == TRUE) {
+        mimetype = [arguments objectAtIndex:3];
+    }
+    
+    const char* path = [ zipPath cStringUsingEncoding:NSUTF8StringEncoding ];
+    unzFile unzipFile = unzOpen(path);
+    NSString* jsString = nil;
+    BOOL error = TRUE;
+    if (!unzipFile) {
+		jsString = [[NSString alloc] initWithString: @"cannot open file"];
+    } else {
+        path = [ entryPath cStringUsingEncoding:NSUTF8StringEncoding ];
+        int r = unzLocateFile(unzipFile, path, 2);
+        if (r != UNZ_OK) {
+		    jsString = [[NSString alloc] initWithString: @"cannot find entry"];
+        } else {
+            unz_file_info info;
+            r = unzGetCurrentFileInfo(unzipFile, &info, 0, 0, 0, 0, 0, 0);
+            if (r != UNZ_OK) {
+		        jsString = [[NSString alloc] initWithString: @"cannot determine size"];
+            } else {
+                r = unzOpenCurrentFile(unzipFile);
+                if (r != UNZ_OK) {
+		            jsString = [[NSString alloc] initWithString: @"cannot open entry"];
+                } else {
+                    char* contents = malloc(info.uncompressed_size);
+                    r = unzReadCurrentFile(unzipFile, contents, info.uncompressed_size);
+                    if (r != info.uncompressed_size) {
+                        jsString = [[NSString alloc] initWithString: @"cannot uncompress file"];
+                    } else {
+                        if (base64) {
+                            NSData* readData = [NSData dataWithBytes:(const void *)contents length:sizeof(unsigned char)*info.uncompressed_size];
+                            jsString = [NSString stringWithFormat:@"data:%@;base64,%@", mimetype, [readData base64EncodedString]];
+                        } else {                    
+                            jsString = [[NSString alloc] initWithUTF8String: contents];
+                        }
+                    }
+                    unzCloseCurrentFile(unzipFile);
+                    free(contents);
+                    error = FALSE;
+                }
+            }
+        }
+        unzClose(unzipFile);
+    }
+    PluginResult* pluginResult = [PluginResult
+                                  resultWithStatus:PGCommandStatus_OK
+                                  messageAsString: jsString
+                                  ];
+    if (!error) {
+        [self writeJavascript: [pluginResult toSuccessCallbackString:self.callbackID]];
+    } else {
+        [self writeJavascript: [pluginResult toErrorCallbackString:self.callbackID]];
+    }
+}
+
+-(void)loadAsString:(NSMutableArray*)arguments withDict:(NSMutableDictionary*)options  
+{
+    [self load:FALSE arguments:arguments withDict:options];
+}
+-(void)loadAsDataURL:(NSMutableArray*)arguments withDict:(NSMutableDictionary*)options  
+{
+    [self load:TRUE arguments:arguments withDict:options];
+}
+
+@end
diff --git a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/WebViewCache.h b/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/WebViewCache.h
new file mode 100644
index 0000000000..216a0bf2bb
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/WebViewCache.h
@@ -0,0 +1,15 @@
+//
+//  WebCache.h
+//  KO Viewer
+//
+//  Created by Tobias Hintze on 3/5/12.
+//  Copyright (c) 2012 KO GmbH. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+@interface WebViewCache : NSURLCache
+
+- (NSData*)getSomeData:(NSString*)zip entry:(NSString*)entry;
+
+@end
diff --git a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/WebViewCache.m b/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/WebViewCache.m
new file mode 100644
index 0000000000..4de0bb3a0c
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/WebViewCache.m
@@ -0,0 +1,72 @@
+//
+//  WebCache.m
+//  KO Viewer
+//
+//  Created by Tobias Hintze on 3/5/12.
+//  Copyright (c) 2012 KO GmbH. All rights reserved.
+//
+
+#import "WebViewCache.h"
+#import "minizip/unzip.h"
+
+@implementation WebViewCache
+
+- (NSCachedURLResponse*)cachedResponseForRequest:(NSURLRequest*)request
+{
+    [super removeAllCachedResponses];
+    NSURL *url = [request URL];
+        if ([url query]) {
+        NSData *somedata = [self getSomeData:[url path] entry:[url query]];
+        NSHTTPURLResponse *response = [[NSHTTPURLResponse alloc] initWithURL:url
+                              MIMEType:@"text/xml"
+                 expectedContentLength:[somedata length]
+                      textEncodingName:nil];
+        NSCachedURLResponse *cachedResponse = [[NSCachedURLResponse alloc] 
+            initWithResponse:response data:somedata];
+        return cachedResponse;
+    }
+    return [super cachedResponseForRequest:request];
+}
+
+- (NSData*)getSomeData:(NSString*)zip entry:(NSString*)entry
+{
+    NSLog(@"get some data: %@ %@", zip, entry);
+    const char* path = [ zip cStringUsingEncoding:NSUTF8StringEncoding ];
+    unzFile unzipFile = unzOpen(path);
+    NSData *data = nil;
+    if (!unzipFile) {
+		NSLog(@"cannot open file %@", zip);
+    } else {
+        path = [ entry cStringUsingEncoding:NSUTF8StringEncoding ];
+        int r = unzLocateFile(unzipFile, path, 2);
+        if (r != UNZ_OK) {
+		    NSLog(@"cannot find entry %@", entry);
+        } else {
+            unz_file_info info;
+            r = unzGetCurrentFileInfo(unzipFile, &info, 0, 0, 0, 0, 0, 0);
+            if (r != UNZ_OK) {
+		        NSLog(@"cannot determine size of %@", entry);
+            } else {
+                r = unzOpenCurrentFile(unzipFile);
+                if (r != UNZ_OK) {
+		            NSLog(@"cannot open entry %@", entry);
+                } else {
+                    char* contents = malloc(info.uncompressed_size);
+                    r = unzReadCurrentFile(unzipFile, contents, info.uncompressed_size);
+                    if (r != info.uncompressed_size) {
+                        NSLog(@"cannot uncompress file %@", entry);
+                    } else {
+                        data = [NSData dataWithBytes:(const void *)contents length:sizeof(unsigned char)*info.uncompressed_size];
+                        NSLog(@"read file entry %li %@", info.uncompressed_size, entry);
+                    }
+                    unzCloseCurrentFile(unzipFile);
+                    free(contents);
+                }
+            }
+        }
+        unzClose(unzipFile);
+    }
+    return data;
+}
+
+@end
diff --git a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/minizip/crypt.h b/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/minizip/crypt.h
new file mode 100644
index 0000000000..622f4bc2ec
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/minizip/crypt.h
@@ -0,0 +1,132 @@
+/* crypt.h -- base code for crypt/uncrypt ZIPfile
+
+
+   Version 1.01e, February 12th, 2005
+
+   Copyright (C) 1998-2005 Gilles Vollant
+
+   This code is a modified version of crypting code in Infozip distribution
+
+   The encryption/decryption parts of this source code (as opposed to the
+   non-echoing password parts) were originally written in Europe.  The
+   whole source package can be freely distributed, including from the USA.
+   (Prior to January 2000, re-export from the US was a violation of US law.)
+
+   This encryption code is a direct transcription of the algorithm from
+   Roger Schlafly, described by Phil Katz in the file appnote.txt.  This
+   file (appnote.txt) is distributed with the PKZIP program (even in the
+   version without encryption capabilities).
+
+   If you don't need crypting in your application, just define symbols
+   NOCRYPT and NOUNCRYPT.
+
+   This code support the "Traditional PKWARE Encryption".
+
+   The new AES encryption added on Zip format by Winzip (see the page
+   http://www.winzip.com/aes_info.htm ) and PKWare PKZip 5.x Strong
+   Encryption is not supported.
+*/
+
+#define CRC32(c, b) ((*(pcrc_32_tab+(((int)(c) ^ (b)) & 0xff))) ^ ((c) >> 8))
+
+/***********************************************************************
+ * Return the next byte in the pseudo-random sequence
+ */
+static int decrypt_byte(unsigned long* pkeys, const unsigned long* pcrc_32_tab)
+{
+    unsigned temp;  /* POTENTIAL BUG:  temp*(temp^1) may overflow in an
+                     * unpredictable manner on 16-bit systems; not a problem
+                     * with any known compiler so far, though */
+
+    temp = ((unsigned)(*(pkeys+2)) & 0xffff) | 2;
+    return (int)(((temp * (temp ^ 1)) >> 8) & 0xff);
+}
+
+/***********************************************************************
+ * Update the encryption keys with the next byte of plain text
+ */
+static int update_keys(unsigned long* pkeys,const unsigned long* pcrc_32_tab,int c)
+{
+    (*(pkeys+0)) = CRC32((*(pkeys+0)), c);
+    (*(pkeys+1)) += (*(pkeys+0)) & 0xff;
+    (*(pkeys+1)) = (*(pkeys+1)) * 134775813L + 1;
+    {
+      register int keyshift = (int)((*(pkeys+1)) >> 24);
+      (*(pkeys+2)) = CRC32((*(pkeys+2)), keyshift);
+    }
+    return c;
+}
+
+
+/***********************************************************************
+ * Initialize the encryption keys and the random header according to
+ * the given password.
+ */
+static void init_keys(const char* passwd,unsigned long* pkeys,const unsigned long* pcrc_32_tab)
+{
+    *(pkeys+0) = 305419896L;
+    *(pkeys+1) = 591751049L;
+    *(pkeys+2) = 878082192L;
+    while (*passwd != '\0') {
+        update_keys(pkeys,pcrc_32_tab,(int)*passwd);
+        passwd++;
+    }
+}
+
+#define zdecode(pkeys,pcrc_32_tab,c) \
+    (update_keys(pkeys,pcrc_32_tab,c ^= decrypt_byte(pkeys,pcrc_32_tab)))
+
+#define zencode(pkeys,pcrc_32_tab,c,t) \
+    (t=decrypt_byte(pkeys,pcrc_32_tab), update_keys(pkeys,pcrc_32_tab,c), t^(c))
+
+#ifdef INCLUDECRYPTINGCODE_IFCRYPTALLOWED
+
+#define RAND_HEAD_LEN  12
+   /* "last resort" source for second part of crypt seed pattern */
+#  ifndef ZCR_SEED2
+#    define ZCR_SEED2 3141592654UL     /* use PI as default pattern */
+#  endif
+
+static int crypthead(passwd, buf, bufSize, pkeys, pcrc_32_tab, crcForCrypting)
+    const char *passwd;         /* password string */
+    unsigned char *buf;         /* where to write header */
+    int bufSize;
+    unsigned long* pkeys;
+    const unsigned long* pcrc_32_tab;
+    unsigned long crcForCrypting;
+{
+    int n;                       /* index in random header */
+    int t;                       /* temporary */
+    int c;                       /* random byte */
+    unsigned char header[RAND_HEAD_LEN-2]; /* random header */
+    static unsigned calls = 0;   /* ensure different random header each time */
+
+    if (bufSize<RAND_HEAD_LEN)
+      return 0;
+
+    /* First generate RAND_HEAD_LEN-2 random bytes. We encrypt the
+     * output of rand() to get less predictability, since rand() is
+     * often poorly implemented.
+     */
+    if (++calls == 1)
+    {
+        srand((unsigned)(time(NULL) ^ ZCR_SEED2));
+    }
+    init_keys(passwd, pkeys, pcrc_32_tab);
+    for (n = 0; n < RAND_HEAD_LEN-2; n++)
+    {
+        c = (rand() >> 7) & 0xff;
+        header[n] = (unsigned char)zencode(pkeys, pcrc_32_tab, c, t);
+    }
+    /* Encrypt random header (last two bytes is high word of crc) */
+    init_keys(passwd, pkeys, pcrc_32_tab);
+    for (n = 0; n < RAND_HEAD_LEN-2; n++)
+    {
+        buf[n] = (unsigned char)zencode(pkeys, pcrc_32_tab, header[n], t);
+    }
+    buf[n++] = zencode(pkeys, pcrc_32_tab, (int)(crcForCrypting >> 16) & 0xff, t);
+    buf[n++] = zencode(pkeys, pcrc_32_tab, (int)(crcForCrypting >> 24) & 0xff, t);
+    return n;
+}
+
+#endif
diff --git a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/minizip/ioapi.c b/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/minizip/ioapi.c
new file mode 100644
index 0000000000..7f20c182f9
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/minizip/ioapi.c
@@ -0,0 +1,177 @@
+/* ioapi.c -- IO base function header for compress/uncompress .zip
+   files using zlib + zip or unzip API
+
+   Version 1.01e, February 12th, 2005
+
+   Copyright (C) 1998-2005 Gilles Vollant
+*/
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
+#include "zlib.h"
+#include "ioapi.h"
+
+
+
+/* I've found an old Unix (a SunOS 4.1.3_U1) without all SEEK_* defined.... */
+
+#ifndef SEEK_CUR
+#define SEEK_CUR    1
+#endif
+
+#ifndef SEEK_END
+#define SEEK_END    2
+#endif
+
+#ifndef SEEK_SET
+#define SEEK_SET    0
+#endif
+
+voidpf ZCALLBACK fopen_file_func OF((
+   voidpf opaque,
+   const char* filename,
+   int mode));
+
+uLong ZCALLBACK fread_file_func OF((
+   voidpf opaque,
+   voidpf stream,
+   void* buf,
+   uLong size));
+
+uLong ZCALLBACK fwrite_file_func OF((
+   voidpf opaque,
+   voidpf stream,
+   const void* buf,
+   uLong size));
+
+long ZCALLBACK ftell_file_func OF((
+   voidpf opaque,
+   voidpf stream));
+
+long ZCALLBACK fseek_file_func OF((
+   voidpf opaque,
+   voidpf stream,
+   uLong offset,
+   int origin));
+
+int ZCALLBACK fclose_file_func OF((
+   voidpf opaque,
+   voidpf stream));
+
+int ZCALLBACK ferror_file_func OF((
+   voidpf opaque,
+   voidpf stream));
+
+
+voidpf ZCALLBACK fopen_file_func (opaque, filename, mode)
+   voidpf opaque;
+   const char* filename;
+   int mode;
+{
+    FILE* file = NULL;
+    const char* mode_fopen = NULL;
+    if ((mode & ZLIB_FILEFUNC_MODE_READWRITEFILTER)==ZLIB_FILEFUNC_MODE_READ)
+        mode_fopen = "rb";
+    else
+    if (mode & ZLIB_FILEFUNC_MODE_EXISTING)
+        mode_fopen = "r+b";
+    else
+    if (mode & ZLIB_FILEFUNC_MODE_CREATE)
+        mode_fopen = "wb";
+
+    if ((filename!=NULL) && (mode_fopen != NULL))
+        file = fopen(filename, mode_fopen);
+    return file;
+}
+
+
+uLong ZCALLBACK fread_file_func (opaque, stream, buf, size)
+   voidpf opaque;
+   voidpf stream;
+   void* buf;
+   uLong size;
+{
+    uLong ret;
+    ret = (uLong)fread(buf, 1, (size_t)size, (FILE *)stream);
+    return ret;
+}
+
+
+uLong ZCALLBACK fwrite_file_func (opaque, stream, buf, size)
+   voidpf opaque;
+   voidpf stream;
+   const void* buf;
+   uLong size;
+{
+    uLong ret;
+    ret = (uLong)fwrite(buf, 1, (size_t)size, (FILE *)stream);
+    return ret;
+}
+
+long ZCALLBACK ftell_file_func (opaque, stream)
+   voidpf opaque;
+   voidpf stream;
+{
+    long ret;
+    ret = ftell((FILE *)stream);
+    return ret;
+}
+
+long ZCALLBACK fseek_file_func (opaque, stream, offset, origin)
+   voidpf opaque;
+   voidpf stream;
+   uLong offset;
+   int origin;
+{
+    int fseek_origin=0;
+    long ret;
+    switch (origin)
+    {
+    case ZLIB_FILEFUNC_SEEK_CUR :
+        fseek_origin = SEEK_CUR;
+        break;
+    case ZLIB_FILEFUNC_SEEK_END :
+        fseek_origin = SEEK_END;
+        break;
+    case ZLIB_FILEFUNC_SEEK_SET :
+        fseek_origin = SEEK_SET;
+        break;
+    default: return -1;
+    }
+    ret = 0;
+    fseek((FILE *)stream, offset, fseek_origin);
+    return ret;
+}
+
+int ZCALLBACK fclose_file_func (opaque, stream)
+   voidpf opaque;
+   voidpf stream;
+{
+    int ret;
+    ret = fclose((FILE *)stream);
+    return ret;
+}
+
+int ZCALLBACK ferror_file_func (opaque, stream)
+   voidpf opaque;
+   voidpf stream;
+{
+    int ret;
+    ret = ferror((FILE *)stream);
+    return ret;
+}
+
+void fill_fopen_filefunc (pzlib_filefunc_def)
+  zlib_filefunc_def* pzlib_filefunc_def;
+{
+    pzlib_filefunc_def->zopen_file = fopen_file_func;
+    pzlib_filefunc_def->zread_file = fread_file_func;
+    pzlib_filefunc_def->zwrite_file = fwrite_file_func;
+    pzlib_filefunc_def->ztell_file = ftell_file_func;
+    pzlib_filefunc_def->zseek_file = fseek_file_func;
+    pzlib_filefunc_def->zclose_file = fclose_file_func;
+    pzlib_filefunc_def->zerror_file = ferror_file_func;
+    pzlib_filefunc_def->opaque = NULL;
+}
diff --git a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/minizip/ioapi.h b/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/minizip/ioapi.h
new file mode 100644
index 0000000000..e73a3b2bd8
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/minizip/ioapi.h
@@ -0,0 +1,75 @@
+/* ioapi.h -- IO base function header for compress/uncompress .zip
+   files using zlib + zip or unzip API
+
+   Version 1.01e, February 12th, 2005
+
+   Copyright (C) 1998-2005 Gilles Vollant
+*/
+
+#ifndef _ZLIBIOAPI_H
+#define _ZLIBIOAPI_H
+
+
+#define ZLIB_FILEFUNC_SEEK_CUR (1)
+#define ZLIB_FILEFUNC_SEEK_END (2)
+#define ZLIB_FILEFUNC_SEEK_SET (0)
+
+#define ZLIB_FILEFUNC_MODE_READ      (1)
+#define ZLIB_FILEFUNC_MODE_WRITE     (2)
+#define ZLIB_FILEFUNC_MODE_READWRITEFILTER (3)
+
+#define ZLIB_FILEFUNC_MODE_EXISTING (4)
+#define ZLIB_FILEFUNC_MODE_CREATE   (8)
+
+
+#ifndef ZCALLBACK
+
+#if (defined(WIN32) || defined (WINDOWS) || defined (_WINDOWS)) && defined(CALLBACK) && defined (USEWINDOWS_CALLBACK)
+#define ZCALLBACK CALLBACK
+#else
+#define ZCALLBACK
+#endif
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+typedef voidpf (ZCALLBACK *open_file_func) OF((voidpf opaque, const char* filename, int mode));
+typedef uLong  (ZCALLBACK *read_file_func) OF((voidpf opaque, voidpf stream, void* buf, uLong size));
+typedef uLong  (ZCALLBACK *write_file_func) OF((voidpf opaque, voidpf stream, const void* buf, uLong size));
+typedef long   (ZCALLBACK *tell_file_func) OF((voidpf opaque, voidpf stream));
+typedef long   (ZCALLBACK *seek_file_func) OF((voidpf opaque, voidpf stream, uLong offset, int origin));
+typedef int    (ZCALLBACK *close_file_func) OF((voidpf opaque, voidpf stream));
+typedef int    (ZCALLBACK *testerror_file_func) OF((voidpf opaque, voidpf stream));
+
+typedef struct zlib_filefunc_def_s
+{
+    open_file_func      zopen_file;
+    read_file_func      zread_file;
+    write_file_func     zwrite_file;
+    tell_file_func      ztell_file;
+    seek_file_func      zseek_file;
+    close_file_func     zclose_file;
+    testerror_file_func zerror_file;
+    voidpf              opaque;
+} zlib_filefunc_def;
+
+
+
+void fill_fopen_filefunc OF((zlib_filefunc_def* pzlib_filefunc_def));
+
+#define ZREAD(filefunc,filestream,buf,size) ((*((filefunc).zread_file))((filefunc).opaque,filestream,buf,size))
+#define ZWRITE(filefunc,filestream,buf,size) ((*((filefunc).zwrite_file))((filefunc).opaque,filestream,buf,size))
+#define ZTELL(filefunc,filestream) ((*((filefunc).ztell_file))((filefunc).opaque,filestream))
+#define ZSEEK(filefunc,filestream,pos,mode) ((*((filefunc).zseek_file))((filefunc).opaque,filestream,pos,mode))
+#define ZCLOSE(filefunc,filestream) ((*((filefunc).zclose_file))((filefunc).opaque,filestream))
+#define ZERROR(filefunc,filestream) ((*((filefunc).zerror_file))((filefunc).opaque,filestream))
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
+
diff --git a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/minizip/mztools.c b/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/minizip/mztools.c
new file mode 100644
index 0000000000..74e6c75778
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/minizip/mztools.c
@@ -0,0 +1,28 @@
+/*
+  Additional tools for Minizip
+  Code: Xavier Roche '2004
+  License: Same as ZLIB (www.gzip.org)
+*/
+
+/* Code */
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include "zlib.h"
+#include "unzip.h"
+
+#define READ_8(adr)  ((unsigned char)*(adr))
+#define READ_16(adr) ( READ_8(adr) | (READ_8(adr+1) << 8) )
+#define READ_32(adr) ( READ_16(adr) | (READ_16((adr)+2) << 16) )
+
+#define WRITE_8(buff, n) do { \
+  *((unsigned char*)(buff)) = (unsigned char) ((n) & 0xff); \
+} while(0)
+#define WRITE_16(buff, n) do { \
+  WRITE_8((unsigned char*)(buff), n); \
+  WRITE_8(((unsigned char*)(buff)) + 1, (n) >> 8); \
+} while(0)
+#define WRITE_32(buff, n) do { \
+  WRITE_16((unsigned char*)(buff), (n) & 0xffff); \
+  WRITE_16((unsigned char*)(buff) + 2, (n) >> 16); \
+} while(0)
diff --git a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/minizip/mztools.h b/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/minizip/mztools.h
new file mode 100644
index 0000000000..82d1597ad7
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/minizip/mztools.h
@@ -0,0 +1,31 @@
+/*
+  Additional tools for Minizip
+  Code: Xavier Roche '2004
+  License: Same as ZLIB (www.gzip.org)
+*/
+
+#ifndef _zip_tools_H
+#define _zip_tools_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifndef _ZLIB_H
+#include "zlib.h"
+#endif
+
+#include "unzip.h"
+
+/* Repair a ZIP file (missing central directory) 
+   file: file to recover
+   fileOut: output file after recovery
+   fileOutTmp: temporary file name used for recovery
+*/
+extern int ZEXPORT unzRepair(const char* file, 
+                             const char* fileOut, 
+                             const char* fileOutTmp, 
+                             uLong* nRecovered,
+                             uLong* bytesRecovered);
+
+#endif
diff --git a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/minizip/unzip.c b/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/minizip/unzip.c
new file mode 100644
index 0000000000..81aee6a149
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/minizip/unzip.c
@@ -0,0 +1,1597 @@
+/* unzip.c -- IO for uncompress .zip files using zlib
+   Version 1.01e, February 12th, 2005
+
+   Copyright (C) 1998-2005 Gilles Vollant
+
+   Read unzip.h for more info
+*/
+
+/* Decryption code comes from crypt.c by Info-ZIP but has been greatly reduced in terms of
+compatibility with older software. The following is from the original crypt.c. Code
+woven in by Terry Thorsen 1/2003.
+*/
+/*
+  Copyright (c) 1990-2000 Info-ZIP.  All rights reserved.
+
+  See the accompanying file LICENSE, version 2000-Apr-09 or later
+  (the contents of which are also included in zip.h) for terms of use.
+  If, for some reason, all these files are missing, the Info-ZIP license
+  also may be found at:  ftp://ftp.info-zip.org/pub/infozip/license.html
+*/
+/*
+  crypt.c (full version) by Info-ZIP.      Last revised:  [see crypt.h]
+
+  The encryption/decryption parts of this source code (as opposed to the
+  non-echoing password parts) were originally written in Europe.  The
+  whole source package can be freely distributed, including from the USA.
+  (Prior to January 2000, re-export from the US was a violation of US law.)
+ */
+
+/*
+  This encryption code is a direct transcription of the algorithm from
+  Roger Schlafly, described by Phil Katz in the file appnote.txt.  This
+  file (appnote.txt) is distributed with the PKZIP program (even in the
+  version without encryption capabilities).
+ */
+
+
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include "zlib.h"
+#include "unzip.h"
+
+#ifdef STDC
+#  include <stddef.h>
+#  include <string.h>
+#  include <stdlib.h>
+#endif
+#ifdef NO_ERRNO_H
+    extern int errno;
+#else
+#   include <errno.h>
+#endif
+
+
+#ifndef local
+#  define local static
+#endif
+/* compile with -Dlocal if your debugger can't find static symbols */
+
+
+#ifndef CASESENSITIVITYDEFAULT_NO
+#  if !defined(unix) && !defined(CASESENSITIVITYDEFAULT_YES)
+#    define CASESENSITIVITYDEFAULT_NO
+#  endif
+#endif
+
+
+#ifndef UNZ_BUFSIZE
+#define UNZ_BUFSIZE (16384)
+#endif
+
+#ifndef UNZ_MAXFILENAMEINZIP
+#define UNZ_MAXFILENAMEINZIP (256)
+#endif
+
+#ifndef ALLOC
+# define ALLOC(size) (malloc(size))
+#endif
+#ifndef TRYFREE
+# define TRYFREE(p) {if (p) free(p);}
+#endif
+
+#define SIZECENTRALDIRITEM (0x2e)
+#define SIZEZIPLOCALHEADER (0x1e)
+
+
+
+
+const char unz_copyright[] =
+   " unzip 1.01 Copyright 1998-2004 Gilles Vollant - http://www.winimage.com/zLibDll";
+
+/* unz_file_info_interntal contain internal info about a file in zipfile*/
+typedef struct unz_file_info_internal_s
+{
+    uLong offset_curfile;/* relative offset of local header 4 bytes */
+} unz_file_info_internal;
+
+
+/* file_in_zip_read_info_s contain internal information about a file in zipfile,
+    when reading and decompress it */
+typedef struct
+{
+    char  *read_buffer;         /* internal buffer for compressed data */
+    z_stream stream;            /* zLib stream structure for inflate */
+
+    uLong pos_in_zipfile;       /* position in byte on the zipfile, for fseek*/
+    uLong stream_initialised;   /* flag set if stream structure is initialised*/
+
+    uLong offset_local_extrafield;/* offset of the local extra field */
+    uInt  size_local_extrafield;/* size of the local extra field */
+    uLong pos_local_extrafield;   /* position in the local extra field in read*/
+
+    uLong crc32;                /* crc32 of all data uncompressed */
+    uLong crc32_wait;           /* crc32 we must obtain after decompress all */
+    uLong rest_read_compressed; /* number of byte to be decompressed */
+    uLong rest_read_uncompressed;/*number of byte to be obtained after decomp*/
+    zlib_filefunc_def z_filefunc;
+    voidpf filestream;        /* io structore of the zipfile */
+    uLong compression_method;   /* compression method (0==store) */
+    uLong byte_before_the_zipfile;/* byte before the zipfile, (>0 for sfx)*/
+    int   raw;
+} file_in_zip_read_info_s;
+
+
+/* unz_s contain internal information about the zipfile
+*/
+typedef struct
+{
+    zlib_filefunc_def z_filefunc;
+    voidpf filestream;        /* io structore of the zipfile */
+    unz_global_info gi;       /* public global information */
+    uLong byte_before_the_zipfile;/* byte before the zipfile, (>0 for sfx)*/
+    uLong num_file;             /* number of the current file in the zipfile*/
+    uLong pos_in_central_dir;   /* pos of the current file in the central dir*/
+    uLong current_file_ok;      /* flag about the usability of the current file*/
+    uLong central_pos;          /* position of the beginning of the central dir*/
+
+    uLong size_central_dir;     /* size of the central directory  */
+    uLong offset_central_dir;   /* offset of start of central directory with
+                                   respect to the starting disk number */
+
+    unz_file_info cur_file_info; /* public info about the current file in zip*/
+    unz_file_info_internal cur_file_info_internal; /* private info about it*/
+    file_in_zip_read_info_s* pfile_in_zip_read; /* structure about the current
+                                        file if we are decompressing it */
+    int encrypted;
+#    ifndef NOUNCRYPT
+    unsigned long keys[3];     /* keys defining the pseudo-random sequence */
+    const unsigned long* pcrc_32_tab;
+#    endif
+} unz_s;
+
+
+#ifndef NOUNCRYPT
+#include "crypt.h"
+#endif
+
+/* ===========================================================================
+     Read a byte from a gz_stream; update next_in and avail_in. Return EOF
+   for end of file.
+   IN assertion: the stream s has been sucessfully opened for reading.
+*/
+
+
+local int unzlocal_getByte OF((
+    const zlib_filefunc_def* pzlib_filefunc_def,
+    voidpf filestream,
+    int *pi));
+
+local int unzlocal_getByte(pzlib_filefunc_def,filestream,pi)
+    const zlib_filefunc_def* pzlib_filefunc_def;
+    voidpf filestream;
+    int *pi;
+{
+    unsigned char c;
+    int err = (int)ZREAD(*pzlib_filefunc_def,filestream,&c,1);
+    if (err==1)
+    {
+        *pi = (int)c;
+        return UNZ_OK;
+    }
+    else
+    {
+        if (ZERROR(*pzlib_filefunc_def,filestream))
+            return UNZ_ERRNO;
+        else
+            return UNZ_EOF;
+    }
+}
+
+
+/* ===========================================================================
+   Reads a long in LSB order from the given gz_stream. Sets
+*/
+local int unzlocal_getShort OF((
+    const zlib_filefunc_def* pzlib_filefunc_def,
+    voidpf filestream,
+    uLong *pX));
+
+local int unzlocal_getShort (pzlib_filefunc_def,filestream,pX)
+    const zlib_filefunc_def* pzlib_filefunc_def;
+    voidpf filestream;
+    uLong *pX;
+{
+    uLong x ;
+    int i;
+    int err;
+
+    err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i);
+    x = (uLong)i;
+
+    if (err==UNZ_OK)
+        err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i);
+    x += ((uLong)i)<<8;
+
+    if (err==UNZ_OK)
+        *pX = x;
+    else
+        *pX = 0;
+    return err;
+}
+
+local int unzlocal_getLong OF((
+    const zlib_filefunc_def* pzlib_filefunc_def,
+    voidpf filestream,
+    uLong *pX));
+
+local int unzlocal_getLong (pzlib_filefunc_def,filestream,pX)
+    const zlib_filefunc_def* pzlib_filefunc_def;
+    voidpf filestream;
+    uLong *pX;
+{
+    uLong x ;
+    int i;
+    int err;
+
+    err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i);
+    x = (uLong)i;
+
+    if (err==UNZ_OK)
+        err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i);
+    x += ((uLong)i)<<8;
+
+    if (err==UNZ_OK)
+        err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i);
+    x += ((uLong)i)<<16;
+
+    if (err==UNZ_OK)
+        err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i);
+    x += ((uLong)i)<<24;
+
+    if (err==UNZ_OK)
+        *pX = x;
+    else
+        *pX = 0;
+    return err;
+}
+
+
+/* My own strcmpi / strcasecmp */
+local int strcmpcasenosensitive_internal (fileName1,fileName2)
+    const char* fileName1;
+    const char* fileName2;
+{
+    for (;;)
+    {
+        char c1=*(fileName1++);
+        char c2=*(fileName2++);
+        if ((c1>='a') && (c1<='z'))
+            c1 -= 0x20;
+        if ((c2>='a') && (c2<='z'))
+            c2 -= 0x20;
+        if (c1=='\0')
+            return ((c2=='\0') ? 0 : -1);
+        if (c2=='\0')
+            return 1;
+        if (c1<c2)
+            return -1;
+        if (c1>c2)
+            return 1;
+    }
+}
+
+
+#ifdef  CASESENSITIVITYDEFAULT_NO
+#define CASESENSITIVITYDEFAULTVALUE 2
+#else
+#define CASESENSITIVITYDEFAULTVALUE 1
+#endif
+
+#ifndef STRCMPCASENOSENTIVEFUNCTION
+#define STRCMPCASENOSENTIVEFUNCTION strcmpcasenosensitive_internal
+#endif
+
+/*
+   Compare two filename (fileName1,fileName2).
+   If iCaseSenisivity = 1, comparision is case sensitivity (like strcmp)
+   If iCaseSenisivity = 2, comparision is not case sensitivity (like strcmpi
+                                                                or strcasecmp)
+   If iCaseSenisivity = 0, case sensitivity is defaut of your operating system
+        (like 1 on Unix, 2 on Windows)
+
+*/
+extern int ZEXPORT unzStringFileNameCompare (fileName1,fileName2,iCaseSensitivity)
+    const char* fileName1;
+    const char* fileName2;
+    int iCaseSensitivity;
+{
+    if (iCaseSensitivity==0)
+        iCaseSensitivity=CASESENSITIVITYDEFAULTVALUE;
+
+    if (iCaseSensitivity==1)
+        return strcmp(fileName1,fileName2);
+
+    return STRCMPCASENOSENTIVEFUNCTION(fileName1,fileName2);
+}
+
+#ifndef BUFREADCOMMENT
+#define BUFREADCOMMENT (0x400)
+#endif
+
+/*
+  Locate the Central directory of a zipfile (at the end, just before
+    the global comment)
+*/
+local uLong unzlocal_SearchCentralDir OF((
+    const zlib_filefunc_def* pzlib_filefunc_def,
+    voidpf filestream));
+
+local uLong unzlocal_SearchCentralDir(pzlib_filefunc_def,filestream)
+    const zlib_filefunc_def* pzlib_filefunc_def;
+    voidpf filestream;
+{
+    unsigned char* buf;
+    uLong uSizeFile;
+    uLong uBackRead;
+    uLong uMaxBack=0xffff; /* maximum size of global comment */
+    uLong uPosFound=0;
+
+    if (ZSEEK(*pzlib_filefunc_def,filestream,0,ZLIB_FILEFUNC_SEEK_END) != 0)
+        return 0;
+
+
+    uSizeFile = ZTELL(*pzlib_filefunc_def,filestream);
+
+    if (uMaxBack>uSizeFile)
+        uMaxBack = uSizeFile;
+
+    buf = (unsigned char*)ALLOC(BUFREADCOMMENT+4);
+    if (buf==NULL)
+        return 0;
+
+    uBackRead = 4;
+    while (uBackRead<uMaxBack)
+    {
+        uLong uReadSize,uReadPos ;
+        int i;
+        if (uBackRead+BUFREADCOMMENT>uMaxBack)
+            uBackRead = uMaxBack;
+        else
+            uBackRead+=BUFREADCOMMENT;
+        uReadPos = uSizeFile-uBackRead ;
+
+        uReadSize = ((BUFREADCOMMENT+4) < (uSizeFile-uReadPos)) ?
+                     (BUFREADCOMMENT+4) : (uSizeFile-uReadPos);
+        if (ZSEEK(*pzlib_filefunc_def,filestream,uReadPos,ZLIB_FILEFUNC_SEEK_SET)!=0)
+            break;
+
+        if (ZREAD(*pzlib_filefunc_def,filestream,buf,uReadSize)!=uReadSize)
+            break;
+
+        for (i=(int)uReadSize-3; (i--)>0;)
+            if (((*(buf+i))==0x50) && ((*(buf+i+1))==0x4b) &&
+                ((*(buf+i+2))==0x05) && ((*(buf+i+3))==0x06))
+            {
+                uPosFound = uReadPos+i;
+                break;
+            }
+
+        if (uPosFound!=0)
+            break;
+    }
+    TRYFREE(buf);
+    return uPosFound;
+}
+
+/*
+  Open a Zip file. path contain the full pathname (by example,
+     on a Windows NT computer "c:\\test\\zlib114.zip" or on an Unix computer
+     "zlib/zlib114.zip".
+     If the zipfile cannot be opened (file doesn't exist or in not valid), the
+       return value is NULL.
+     Else, the return value is a unzFile Handle, usable with other function
+       of this unzip package.
+*/
+extern unzFile ZEXPORT unzOpen2 (path, pzlib_filefunc_def)
+    const char *path;
+    zlib_filefunc_def* pzlib_filefunc_def;
+{
+    unz_s us;
+    unz_s *s;
+    uLong central_pos,uL;
+
+    uLong number_disk;          /* number of the current dist, used for
+                                   spaning ZIP, unsupported, always 0*/
+    uLong number_disk_with_CD;  /* number the the disk with central dir, used
+                                   for spaning ZIP, unsupported, always 0*/
+    uLong number_entry_CD;      /* total number of entries in
+                                   the central dir
+                                   (same than number_entry on nospan) */
+
+    int err=UNZ_OK;
+
+    if (unz_copyright[0]!=' ')
+        return NULL;
+
+    if (pzlib_filefunc_def==NULL)
+        fill_fopen_filefunc(&us.z_filefunc);
+    else
+        us.z_filefunc = *pzlib_filefunc_def;
+
+    us.filestream= (*(us.z_filefunc.zopen_file))(us.z_filefunc.opaque,
+                                                 path,
+                                                 ZLIB_FILEFUNC_MODE_READ |
+                                                 ZLIB_FILEFUNC_MODE_EXISTING);
+    if (us.filestream==NULL)
+        return NULL;
+
+    central_pos = unzlocal_SearchCentralDir(&us.z_filefunc,us.filestream);
+    if (central_pos==0)
+        err=UNZ_ERRNO;
+
+    if (ZSEEK(us.z_filefunc, us.filestream,
+                                      central_pos,ZLIB_FILEFUNC_SEEK_SET)!=0)
+        err=UNZ_ERRNO;
+
+    /* the signature, already checked */
+    if (unzlocal_getLong(&us.z_filefunc, us.filestream,&uL)!=UNZ_OK)
+        err=UNZ_ERRNO;
+
+    /* number of this disk */
+    if (unzlocal_getShort(&us.z_filefunc, us.filestream,&number_disk)!=UNZ_OK)
+        err=UNZ_ERRNO;
+
+    /* number of the disk with the start of the central directory */
+    if (unzlocal_getShort(&us.z_filefunc, us.filestream,&number_disk_with_CD)!=UNZ_OK)
+        err=UNZ_ERRNO;
+
+    /* total number of entries in the central dir on this disk */
+    if (unzlocal_getShort(&us.z_filefunc, us.filestream,&us.gi.number_entry)!=UNZ_OK)
+        err=UNZ_ERRNO;
+
+    /* total number of entries in the central dir */
+    if (unzlocal_getShort(&us.z_filefunc, us.filestream,&number_entry_CD)!=UNZ_OK)
+        err=UNZ_ERRNO;
+
+    if ((number_entry_CD!=us.gi.number_entry) ||
+        (number_disk_with_CD!=0) ||
+        (number_disk!=0))
+        err=UNZ_BADZIPFILE;
+
+    /* size of the central directory */
+    if (unzlocal_getLong(&us.z_filefunc, us.filestream,&us.size_central_dir)!=UNZ_OK)
+        err=UNZ_ERRNO;
+
+    /* offset of start of central directory with respect to the
+          starting disk number */
+    if (unzlocal_getLong(&us.z_filefunc, us.filestream,&us.offset_central_dir)!=UNZ_OK)
+        err=UNZ_ERRNO;
+
+    /* zipfile comment length */
+    if (unzlocal_getShort(&us.z_filefunc, us.filestream,&us.gi.size_comment)!=UNZ_OK)
+        err=UNZ_ERRNO;
+
+    if ((central_pos<us.offset_central_dir+us.size_central_dir) &&
+        (err==UNZ_OK))
+        err=UNZ_BADZIPFILE;
+
+    if (err!=UNZ_OK)
+    {
+        ZCLOSE(us.z_filefunc, us.filestream);
+        return NULL;
+    }
+
+    us.byte_before_the_zipfile = central_pos -
+                            (us.offset_central_dir+us.size_central_dir);
+    us.central_pos = central_pos;
+    us.pfile_in_zip_read = NULL;
+    us.encrypted = 0;
+
+
+    s=(unz_s*)ALLOC(sizeof(unz_s));
+    *s=us;
+    unzGoToFirstFile((unzFile)s);
+    return (unzFile)s;
+}
+
+
+extern unzFile ZEXPORT unzOpen (path)
+    const char *path;
+{
+    return unzOpen2(path, NULL);
+}
+
+/*
+  Close a ZipFile opened with unzipOpen.
+  If there is files inside the .Zip opened with unzipOpenCurrentFile (see later),
+    these files MUST be closed with unzipCloseCurrentFile before call unzipClose.
+  return UNZ_OK if there is no problem. */
+extern int ZEXPORT unzClose (file)
+    unzFile file;
+{
+    unz_s* s;
+    if (file==NULL)
+        return UNZ_PARAMERROR;
+    s=(unz_s*)file;
+
+    if (s->pfile_in_zip_read!=NULL)
+        unzCloseCurrentFile(file);
+
+    ZCLOSE(s->z_filefunc, s->filestream);
+    TRYFREE(s);
+    return UNZ_OK;
+}
+
+
+/*
+  Write info about the ZipFile in the *pglobal_info structure.
+  No preparation of the structure is needed
+  return UNZ_OK if there is no problem. */
+extern int ZEXPORT unzGetGlobalInfo (file,pglobal_info)
+    unzFile file;
+    unz_global_info *pglobal_info;
+{
+    unz_s* s;
+    if (file==NULL)
+        return UNZ_PARAMERROR;
+    s=(unz_s*)file;
+    *pglobal_info=s->gi;
+    return UNZ_OK;
+}
+
+
+/*
+   Translate date/time from Dos format to tm_unz (readable more easilty)
+*/
+local void unzlocal_DosDateToTmuDate (ulDosDate, ptm)
+    uLong ulDosDate;
+    tm_unz* ptm;
+{
+    uLong uDate;
+    uDate = (uLong)(ulDosDate>>16);
+    ptm->tm_mday = (uInt)(uDate&0x1f) ;
+    ptm->tm_mon =  (uInt)((((uDate)&0x1E0)/0x20)-1) ;
+    ptm->tm_year = (uInt)(((uDate&0x0FE00)/0x0200)+1980) ;
+
+    ptm->tm_hour = (uInt) ((ulDosDate &0xF800)/0x800);
+    ptm->tm_min =  (uInt) ((ulDosDate&0x7E0)/0x20) ;
+    ptm->tm_sec =  (uInt) (2*(ulDosDate&0x1f)) ;
+}
+
+/*
+  Get Info about the current file in the zipfile, with internal only info
+*/
+local int unzlocal_GetCurrentFileInfoInternal OF((unzFile file,
+                                                  unz_file_info *pfile_info,
+                                                  unz_file_info_internal
+                                                  *pfile_info_internal,
+                                                  char *szFileName,
+                                                  uLong fileNameBufferSize,
+                                                  void *extraField,
+                                                  uLong extraFieldBufferSize,
+                                                  char *szComment,
+                                                  uLong commentBufferSize));
+
+local int unzlocal_GetCurrentFileInfoInternal (file,
+                                              pfile_info,
+                                              pfile_info_internal,
+                                              szFileName, fileNameBufferSize,
+                                              extraField, extraFieldBufferSize,
+                                              szComment,  commentBufferSize)
+    unzFile file;
+    unz_file_info *pfile_info;
+    unz_file_info_internal *pfile_info_internal;
+    char *szFileName;
+    uLong fileNameBufferSize;
+    void *extraField;
+    uLong extraFieldBufferSize;
+    char *szComment;
+    uLong commentBufferSize;
+{
+    unz_s* s;
+    unz_file_info file_info;
+    unz_file_info_internal file_info_internal;
+    int err=UNZ_OK;
+    uLong uMagic;
+    long lSeek=0;
+
+    if (file==NULL)
+        return UNZ_PARAMERROR;
+    s=(unz_s*)file;
+    if (ZSEEK(s->z_filefunc, s->filestream,
+              s->pos_in_central_dir+s->byte_before_the_zipfile,
+              ZLIB_FILEFUNC_SEEK_SET)!=0)
+        err=UNZ_ERRNO;
+
+
+    /* we check the magic */
+    if (err==UNZ_OK)
+        if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uMagic) != UNZ_OK)
+            err=UNZ_ERRNO;
+        else if (uMagic!=0x02014b50)
+            err=UNZ_BADZIPFILE;
+
+    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.version) != UNZ_OK)
+        err=UNZ_ERRNO;
+
+    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.version_needed) != UNZ_OK)
+        err=UNZ_ERRNO;
+
+    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.flag) != UNZ_OK)
+        err=UNZ_ERRNO;
+
+    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.compression_method) != UNZ_OK)
+        err=UNZ_ERRNO;
+
+    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info.dosDate) != UNZ_OK)
+        err=UNZ_ERRNO;
+
+    unzlocal_DosDateToTmuDate(file_info.dosDate,&file_info.tmu_date);
+
+    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info.crc) != UNZ_OK)
+        err=UNZ_ERRNO;
+
+    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info.compressed_size) != UNZ_OK)
+        err=UNZ_ERRNO;
+
+    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info.uncompressed_size) != UNZ_OK)
+        err=UNZ_ERRNO;
+
+    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.size_filename) != UNZ_OK)
+        err=UNZ_ERRNO;
+
+    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.size_file_extra) != UNZ_OK)
+        err=UNZ_ERRNO;
+
+    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.size_file_comment) != UNZ_OK)
+        err=UNZ_ERRNO;
+
+    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.disk_num_start) != UNZ_OK)
+        err=UNZ_ERRNO;
+
+    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.internal_fa) != UNZ_OK)
+        err=UNZ_ERRNO;
+
+    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info.external_fa) != UNZ_OK)
+        err=UNZ_ERRNO;
+
+    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info_internal.offset_curfile) != UNZ_OK)
+        err=UNZ_ERRNO;
+
+    lSeek+=file_info.size_filename;
+    if ((err==UNZ_OK) && (szFileName!=NULL))
+    {
+        uLong uSizeRead ;
+        if (file_info.size_filename<fileNameBufferSize)
+        {
+            *(szFileName+file_info.size_filename)='\0';
+            uSizeRead = file_info.size_filename;
+        }
+        else
+            uSizeRead = fileNameBufferSize;
+
+        if ((file_info.size_filename>0) && (fileNameBufferSize>0))
+            if (ZREAD(s->z_filefunc, s->filestream,szFileName,uSizeRead)!=uSizeRead)
+                err=UNZ_ERRNO;
+        lSeek -= uSizeRead;
+    }
+
+
+    if ((err==UNZ_OK) && (extraField!=NULL))
+    {
+        uLong uSizeRead ;
+        if (file_info.size_file_extra<extraFieldBufferSize)
+            uSizeRead = file_info.size_file_extra;
+        else
+            uSizeRead = extraFieldBufferSize;
+
+        if (lSeek!=0)
+            if (ZSEEK(s->z_filefunc, s->filestream,lSeek,ZLIB_FILEFUNC_SEEK_CUR)==0)
+                lSeek=0;
+            else
+                err=UNZ_ERRNO;
+        if ((file_info.size_file_extra>0) && (extraFieldBufferSize>0))
+            if (ZREAD(s->z_filefunc, s->filestream,extraField,uSizeRead)!=uSizeRead)
+                err=UNZ_ERRNO;
+        lSeek += file_info.size_file_extra - uSizeRead;
+    }
+    else
+        lSeek+=file_info.size_file_extra;
+
+
+    if ((err==UNZ_OK) && (szComment!=NULL))
+    {
+        uLong uSizeRead ;
+        if (file_info.size_file_comment<commentBufferSize)
+        {
+            *(szComment+file_info.size_file_comment)='\0';
+            uSizeRead = file_info.size_file_comment;
+        }
+        else
+            uSizeRead = commentBufferSize;
+
+        if (lSeek!=0)
+            if (ZSEEK(s->z_filefunc, s->filestream,lSeek,ZLIB_FILEFUNC_SEEK_CUR)==0)
+                lSeek=0;
+            else
+                err=UNZ_ERRNO;
+        if ((file_info.size_file_comment>0) && (commentBufferSize>0))
+            if (ZREAD(s->z_filefunc, s->filestream,szComment,uSizeRead)!=uSizeRead)
+                err=UNZ_ERRNO;
+        lSeek+=file_info.size_file_comment - uSizeRead;
+    }
+    else
+        lSeek+=file_info.size_file_comment;
+
+    if ((err==UNZ_OK) && (pfile_info!=NULL))
+        *pfile_info=file_info;
+
+    if ((err==UNZ_OK) && (pfile_info_internal!=NULL))
+        *pfile_info_internal=file_info_internal;
+
+    return err;
+}
+
+
+
+/*
+  Write info about the ZipFile in the *pglobal_info structure.
+  No preparation of the structure is needed
+  return UNZ_OK if there is no problem.
+*/
+extern int ZEXPORT unzGetCurrentFileInfo (file,
+                                          pfile_info,
+                                          szFileName, fileNameBufferSize,
+                                          extraField, extraFieldBufferSize,
+                                          szComment,  commentBufferSize)
+    unzFile file;
+    unz_file_info *pfile_info;
+    char *szFileName;
+    uLong fileNameBufferSize;
+    void *extraField;
+    uLong extraFieldBufferSize;
+    char *szComment;
+    uLong commentBufferSize;
+{
+    return unzlocal_GetCurrentFileInfoInternal(file,pfile_info,NULL,
+                                                szFileName,fileNameBufferSize,
+                                                extraField,extraFieldBufferSize,
+                                                szComment,commentBufferSize);
+}
+
+/*
+  Set the current file of the zipfile to the first file.
+  return UNZ_OK if there is no problem
+*/
+extern int ZEXPORT unzGoToFirstFile (file)
+    unzFile file;
+{
+    int err=UNZ_OK;
+    unz_s* s;
+    if (file==NULL)
+        return UNZ_PARAMERROR;
+    s=(unz_s*)file;
+    s->pos_in_central_dir=s->offset_central_dir;
+    s->num_file=0;
+    err=unzlocal_GetCurrentFileInfoInternal(file,&s->cur_file_info,
+                                             &s->cur_file_info_internal,
+                                             NULL,0,NULL,0,NULL,0);
+    s->current_file_ok = (err == UNZ_OK);
+    return err;
+}
+
+/*
+  Set the current file of the zipfile to the next file.
+  return UNZ_OK if there is no problem
+  return UNZ_END_OF_LIST_OF_FILE if the actual file was the latest.
+*/
+extern int ZEXPORT unzGoToNextFile (file)
+    unzFile file;
+{
+    unz_s* s;
+    int err;
+
+    if (file==NULL)
+        return UNZ_PARAMERROR;
+    s=(unz_s*)file;
+    if (!s->current_file_ok)
+        return UNZ_END_OF_LIST_OF_FILE;
+    if (s->gi.number_entry != 0xffff)    /* 2^16 files overflow hack */
+      if (s->num_file+1==s->gi.number_entry)
+        return UNZ_END_OF_LIST_OF_FILE;
+
+    s->pos_in_central_dir += SIZECENTRALDIRITEM + s->cur_file_info.size_filename +
+            s->cur_file_info.size_file_extra + s->cur_file_info.size_file_comment ;
+    s->num_file++;
+    err = unzlocal_GetCurrentFileInfoInternal(file,&s->cur_file_info,
+                                               &s->cur_file_info_internal,
+                                               NULL,0,NULL,0,NULL,0);
+    s->current_file_ok = (err == UNZ_OK);
+    return err;
+}
+
+
+/*
+  Try locate the file szFileName in the zipfile.
+  For the iCaseSensitivity signification, see unzipStringFileNameCompare
+
+  return value :
+  UNZ_OK if the file is found. It becomes the current file.
+  UNZ_END_OF_LIST_OF_FILE if the file is not found
+*/
+extern int ZEXPORT unzLocateFile (file, szFileName, iCaseSensitivity)
+    unzFile file;
+    const char *szFileName;
+    int iCaseSensitivity;
+{
+    unz_s* s;
+    int err;
+
+    /* We remember the 'current' position in the file so that we can jump
+     * back there if we fail.
+     */
+    unz_file_info cur_file_infoSaved;
+    unz_file_info_internal cur_file_info_internalSaved;
+    uLong num_fileSaved;
+    uLong pos_in_central_dirSaved;
+
+
+    if (file==NULL)
+        return UNZ_PARAMERROR;
+
+    if (strlen(szFileName)>=UNZ_MAXFILENAMEINZIP)
+        return UNZ_PARAMERROR;
+
+    s=(unz_s*)file;
+    if (!s->current_file_ok)
+        return UNZ_END_OF_LIST_OF_FILE;
+
+    /* Save the current state */
+    num_fileSaved = s->num_file;
+    pos_in_central_dirSaved = s->pos_in_central_dir;
+    cur_file_infoSaved = s->cur_file_info;
+    cur_file_info_internalSaved = s->cur_file_info_internal;
+
+    err = unzGoToFirstFile(file);
+
+    while (err == UNZ_OK)
+    {
+        char szCurrentFileName[UNZ_MAXFILENAMEINZIP+1];
+        err = unzGetCurrentFileInfo(file,NULL,
+                                    szCurrentFileName,sizeof(szCurrentFileName)-1,
+                                    NULL,0,NULL,0);
+        if (err == UNZ_OK)
+        {
+            if (unzStringFileNameCompare(szCurrentFileName,
+                                            szFileName,iCaseSensitivity)==0)
+                return UNZ_OK;
+            err = unzGoToNextFile(file);
+        }
+    }
+
+    /* We failed, so restore the state of the 'current file' to where we
+     * were.
+     */
+    s->num_file = num_fileSaved ;
+    s->pos_in_central_dir = pos_in_central_dirSaved ;
+    s->cur_file_info = cur_file_infoSaved;
+    s->cur_file_info_internal = cur_file_info_internalSaved;
+    return err;
+}
+
+
+/*
+///////////////////////////////////////////
+// Contributed by Ryan Haksi (mailto://cryogen@infoserve.net)
+// I need random access
+//
+// Further optimization could be realized by adding an ability
+// to cache the directory in memory. The goal being a single
+// comprehensive file read to put the file I need in a memory.
+*/
+
+/*
+typedef struct unz_file_pos_s
+{
+    uLong pos_in_zip_directory;   // offset in file
+    uLong num_of_file;            // # of file
+} unz_file_pos;
+*/
+
+extern int ZEXPORT unzGetFilePos(file, file_pos)
+    unzFile file;
+    unz_file_pos* file_pos;
+{
+    unz_s* s;
+
+    if (file==NULL || file_pos==NULL)
+        return UNZ_PARAMERROR;
+    s=(unz_s*)file;
+    if (!s->current_file_ok)
+        return UNZ_END_OF_LIST_OF_FILE;
+
+    file_pos->pos_in_zip_directory  = s->pos_in_central_dir;
+    file_pos->num_of_file           = s->num_file;
+
+    return UNZ_OK;
+}
+
+extern int ZEXPORT unzGoToFilePos(file, file_pos)
+    unzFile file;
+    unz_file_pos* file_pos;
+{
+    unz_s* s;
+    int err;
+
+    if (file==NULL || file_pos==NULL)
+        return UNZ_PARAMERROR;
+    s=(unz_s*)file;
+
+    /* jump to the right spot */
+    s->pos_in_central_dir = file_pos->pos_in_zip_directory;
+    s->num_file           = file_pos->num_of_file;
+
+    /* set the current file */
+    err = unzlocal_GetCurrentFileInfoInternal(file,&s->cur_file_info,
+                                               &s->cur_file_info_internal,
+                                               NULL,0,NULL,0,NULL,0);
+    /* return results */
+    s->current_file_ok = (err == UNZ_OK);
+    return err;
+}
+
+/*
+// Unzip Helper Functions - should be here?
+///////////////////////////////////////////
+*/
+
+/*
+  Read the local header of the current zipfile
+  Check the coherency of the local header and info in the end of central
+        directory about this file
+  store in *piSizeVar the size of extra info in local header
+        (filename and size of extra field data)
+*/
+local int unzlocal_CheckCurrentFileCoherencyHeader (s,piSizeVar,
+                                                    poffset_local_extrafield,
+                                                    psize_local_extrafield)
+    unz_s* s;
+    uInt* piSizeVar;
+    uLong *poffset_local_extrafield;
+    uInt  *psize_local_extrafield;
+{
+    uLong uMagic,uData,uFlags;
+    uLong size_filename;
+    uLong size_extra_field;
+    int err=UNZ_OK;
+
+    *piSizeVar = 0;
+    *poffset_local_extrafield = 0;
+    *psize_local_extrafield = 0;
+
+    if (ZSEEK(s->z_filefunc, s->filestream,s->cur_file_info_internal.offset_curfile +
+                                s->byte_before_the_zipfile,ZLIB_FILEFUNC_SEEK_SET)!=0)
+        return UNZ_ERRNO;
+
+
+    if (err==UNZ_OK)
+        if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uMagic) != UNZ_OK)
+            err=UNZ_ERRNO;
+        else if (uMagic!=0x04034b50)
+            err=UNZ_BADZIPFILE;
+
+    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&uData) != UNZ_OK)
+        err=UNZ_ERRNO;
+/*
+    else if ((err==UNZ_OK) && (uData!=s->cur_file_info.wVersion))
+        err=UNZ_BADZIPFILE;
+*/
+    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&uFlags) != UNZ_OK)
+        err=UNZ_ERRNO;
+
+    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&uData) != UNZ_OK)
+        err=UNZ_ERRNO;
+    else if ((err==UNZ_OK) && (uData!=s->cur_file_info.compression_method))
+        err=UNZ_BADZIPFILE;
+
+    if ((err==UNZ_OK) && (s->cur_file_info.compression_method!=0) &&
+                         (s->cur_file_info.compression_method!=Z_DEFLATED))
+        err=UNZ_BADZIPFILE;
+
+    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) /* date/time */
+        err=UNZ_ERRNO;
+
+    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) /* crc */
+        err=UNZ_ERRNO;
+    else if ((err==UNZ_OK) && (uData!=s->cur_file_info.crc) &&
+                              ((uFlags & 8)==0))
+        err=UNZ_BADZIPFILE;
+
+    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) /* size compr */
+        err=UNZ_ERRNO;
+    else if ((err==UNZ_OK) && (uData!=s->cur_file_info.compressed_size) &&
+                              ((uFlags & 8)==0))
+        err=UNZ_BADZIPFILE;
+
+    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) /* size uncompr */
+        err=UNZ_ERRNO;
+    else if ((err==UNZ_OK) && (uData!=s->cur_file_info.uncompressed_size) &&
+                              ((uFlags & 8)==0))
+        err=UNZ_BADZIPFILE;
+
+
+    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&size_filename) != UNZ_OK)
+        err=UNZ_ERRNO;
+    else if ((err==UNZ_OK) && (size_filename!=s->cur_file_info.size_filename))
+        err=UNZ_BADZIPFILE;
+
+    *piSizeVar += (uInt)size_filename;
+
+    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&size_extra_field) != UNZ_OK)
+        err=UNZ_ERRNO;
+    *poffset_local_extrafield= s->cur_file_info_internal.offset_curfile +
+                                    SIZEZIPLOCALHEADER + size_filename;
+    *psize_local_extrafield = (uInt)size_extra_field;
+
+    *piSizeVar += (uInt)size_extra_field;
+
+    return err;
+}
+
+/*
+  Open for reading data the current file in the zipfile.
+  If there is no error and the file is opened, the return value is UNZ_OK.
+*/
+extern int ZEXPORT unzOpenCurrentFile3 (file, method, level, raw, password)
+    unzFile file;
+    int* method;
+    int* level;
+    int raw;
+    const char* password;
+{
+    int err=UNZ_OK;
+    uInt iSizeVar;
+    unz_s* s;
+    file_in_zip_read_info_s* pfile_in_zip_read_info;
+    uLong offset_local_extrafield;  /* offset of the local extra field */
+    uInt  size_local_extrafield;    /* size of the local extra field */
+#    ifndef NOUNCRYPT
+    char source[12];
+#    else
+    if (password != NULL)
+        return UNZ_PARAMERROR;
+#    endif
+
+    if (file==NULL)
+        return UNZ_PARAMERROR;
+    s=(unz_s*)file;
+    if (!s->current_file_ok)
+        return UNZ_PARAMERROR;
+
+    if (s->pfile_in_zip_read != NULL)
+        unzCloseCurrentFile(file);
+
+    if (unzlocal_CheckCurrentFileCoherencyHeader(s,&iSizeVar,
+                &offset_local_extrafield,&size_local_extrafield)!=UNZ_OK)
+        return UNZ_BADZIPFILE;
+
+    pfile_in_zip_read_info = (file_in_zip_read_info_s*)
+                                        ALLOC(sizeof(file_in_zip_read_info_s));
+    if (pfile_in_zip_read_info==NULL)
+        return UNZ_INTERNALERROR;
+
+    pfile_in_zip_read_info->read_buffer=(char*)ALLOC(UNZ_BUFSIZE);
+    pfile_in_zip_read_info->offset_local_extrafield = offset_local_extrafield;
+    pfile_in_zip_read_info->size_local_extrafield = size_local_extrafield;
+    pfile_in_zip_read_info->pos_local_extrafield=0;
+    pfile_in_zip_read_info->raw=raw;
+
+    if (pfile_in_zip_read_info->read_buffer==NULL)
+    {
+        TRYFREE(pfile_in_zip_read_info);
+        return UNZ_INTERNALERROR;
+    }
+
+    pfile_in_zip_read_info->stream_initialised=0;
+
+    if (method!=NULL)
+        *method = (int)s->cur_file_info.compression_method;
+
+    if (level!=NULL)
+    {
+        *level = 6;
+        switch (s->cur_file_info.flag & 0x06)
+        {
+          case 6 : *level = 1; break;
+          case 4 : *level = 2; break;
+          case 2 : *level = 9; break;
+        }
+    }
+
+    if ((s->cur_file_info.compression_method!=0) &&
+        (s->cur_file_info.compression_method!=Z_DEFLATED))
+        err=UNZ_BADZIPFILE;
+
+    pfile_in_zip_read_info->crc32_wait=s->cur_file_info.crc;
+    pfile_in_zip_read_info->crc32=0;
+    pfile_in_zip_read_info->compression_method =
+            s->cur_file_info.compression_method;
+    pfile_in_zip_read_info->filestream=s->filestream;
+    pfile_in_zip_read_info->z_filefunc=s->z_filefunc;
+    pfile_in_zip_read_info->byte_before_the_zipfile=s->byte_before_the_zipfile;
+
+    pfile_in_zip_read_info->stream.total_out = 0;
+
+    if ((s->cur_file_info.compression_method==Z_DEFLATED) &&
+        (!raw))
+    {
+      pfile_in_zip_read_info->stream.zalloc = (alloc_func)0;
+      pfile_in_zip_read_info->stream.zfree = (free_func)0;
+      pfile_in_zip_read_info->stream.opaque = (voidpf)0;
+      pfile_in_zip_read_info->stream.next_in = (voidpf)0;
+      pfile_in_zip_read_info->stream.avail_in = 0;
+
+      err=inflateInit2(&pfile_in_zip_read_info->stream, -MAX_WBITS);
+      if (err == Z_OK)
+        pfile_in_zip_read_info->stream_initialised=1;
+      else
+      {
+        TRYFREE(pfile_in_zip_read_info);
+        return err;
+      }
+        /* windowBits is passed < 0 to tell that there is no zlib header.
+         * Note that in this case inflate *requires* an extra "dummy" byte
+         * after the compressed stream in order to complete decompression and
+         * return Z_STREAM_END.
+         * In unzip, i don't wait absolutely Z_STREAM_END because I known the
+         * size of both compressed and uncompressed data
+         */
+    }
+    pfile_in_zip_read_info->rest_read_compressed =
+            s->cur_file_info.compressed_size ;
+    pfile_in_zip_read_info->rest_read_uncompressed =
+            s->cur_file_info.uncompressed_size ;
+
+
+    pfile_in_zip_read_info->pos_in_zipfile =
+            s->cur_file_info_internal.offset_curfile + SIZEZIPLOCALHEADER +
+              iSizeVar;
+
+    pfile_in_zip_read_info->stream.avail_in = (uInt)0;
+
+    s->pfile_in_zip_read = pfile_in_zip_read_info;
+
+#    ifndef NOUNCRYPT
+    if (password != NULL)
+    {
+        int i;
+        s->pcrc_32_tab = get_crc_table();
+        init_keys(password,s->keys,s->pcrc_32_tab);
+        if (ZSEEK(s->z_filefunc, s->filestream,
+                  s->pfile_in_zip_read->pos_in_zipfile +
+                     s->pfile_in_zip_read->byte_before_the_zipfile,
+                  SEEK_SET)!=0)
+            return UNZ_INTERNALERROR;
+        if(ZREAD(s->z_filefunc, s->filestream,source, 12)<12)
+            return UNZ_INTERNALERROR;
+
+        for (i = 0; i<12; i++)
+            zdecode(s->keys,s->pcrc_32_tab,source[i]);
+
+        s->pfile_in_zip_read->pos_in_zipfile+=12;
+        s->encrypted=1;
+    }
+#    endif
+
+
+    return UNZ_OK;
+}
+
+extern int ZEXPORT unzOpenCurrentFile (file)
+    unzFile file;
+{
+    return unzOpenCurrentFile3(file, NULL, NULL, 0, NULL);
+}
+
+extern int ZEXPORT unzOpenCurrentFilePassword (file, password)
+    unzFile file;
+    const char* password;
+{
+    return unzOpenCurrentFile3(file, NULL, NULL, 0, password);
+}
+
+extern int ZEXPORT unzOpenCurrentFile2 (file,method,level,raw)
+    unzFile file;
+    int* method;
+    int* level;
+    int raw;
+{
+    return unzOpenCurrentFile3(file, method, level, raw, NULL);
+}
+
+/*
+  Read bytes from the current file.
+  buf contain buffer where data must be copied
+  len the size of buf.
+
+  return the number of byte copied if somes bytes are copied
+  return 0 if the end of file was reached
+  return <0 with error code if there is an error
+    (UNZ_ERRNO for IO error, or zLib error for uncompress error)
+*/
+extern int ZEXPORT unzReadCurrentFile  (file, buf, len)
+    unzFile file;
+    voidp buf;
+    unsigned len;
+{
+    int err=UNZ_OK;
+    uInt iRead = 0;
+    unz_s* s;
+    file_in_zip_read_info_s* pfile_in_zip_read_info;
+    if (file==NULL)
+        return UNZ_PARAMERROR;
+    s=(unz_s*)file;
+    pfile_in_zip_read_info=s->pfile_in_zip_read;
+
+    if (pfile_in_zip_read_info==NULL)
+        return UNZ_PARAMERROR;
+
+
+    if (pfile_in_zip_read_info->read_buffer == NULL)
+        return UNZ_END_OF_LIST_OF_FILE;
+    if (len==0)
+        return 0;
+
+    pfile_in_zip_read_info->stream.next_out = (Bytef*)buf;
+
+    pfile_in_zip_read_info->stream.avail_out = (uInt)len;
+
+    if ((len>pfile_in_zip_read_info->rest_read_uncompressed) &&
+        (!(pfile_in_zip_read_info->raw)))
+        pfile_in_zip_read_info->stream.avail_out =
+            (uInt)pfile_in_zip_read_info->rest_read_uncompressed;
+
+    if ((len>pfile_in_zip_read_info->rest_read_compressed+
+           pfile_in_zip_read_info->stream.avail_in) &&
+         (pfile_in_zip_read_info->raw))
+        pfile_in_zip_read_info->stream.avail_out =
+            (uInt)pfile_in_zip_read_info->rest_read_compressed+
+            pfile_in_zip_read_info->stream.avail_in;
+
+    while (pfile_in_zip_read_info->stream.avail_out>0)
+    {
+        if ((pfile_in_zip_read_info->stream.avail_in==0) &&
+            (pfile_in_zip_read_info->rest_read_compressed>0))
+        {
+            uInt uReadThis = UNZ_BUFSIZE;
+            if (pfile_in_zip_read_info->rest_read_compressed<uReadThis)
+                uReadThis = (uInt)pfile_in_zip_read_info->rest_read_compressed;
+            if (uReadThis == 0)
+                return UNZ_EOF;
+            if (ZSEEK(pfile_in_zip_read_info->z_filefunc,
+                      pfile_in_zip_read_info->filestream,
+                      pfile_in_zip_read_info->pos_in_zipfile +
+                         pfile_in_zip_read_info->byte_before_the_zipfile,
+                         ZLIB_FILEFUNC_SEEK_SET)!=0)
+                return UNZ_ERRNO;
+            if (ZREAD(pfile_in_zip_read_info->z_filefunc,
+                      pfile_in_zip_read_info->filestream,
+                      pfile_in_zip_read_info->read_buffer,
+                      uReadThis)!=uReadThis)
+                return UNZ_ERRNO;
+
+
+#            ifndef NOUNCRYPT
+            if(s->encrypted)
+            {
+                uInt i;
+                for(i=0;i<uReadThis;i++)
+                  pfile_in_zip_read_info->read_buffer[i] =
+                      zdecode(s->keys,s->pcrc_32_tab,
+                              pfile_in_zip_read_info->read_buffer[i]);
+            }
+#            endif
+
+
+            pfile_in_zip_read_info->pos_in_zipfile += uReadThis;
+
+            pfile_in_zip_read_info->rest_read_compressed-=uReadThis;
+
+            pfile_in_zip_read_info->stream.next_in =
+                (Bytef*)pfile_in_zip_read_info->read_buffer;
+            pfile_in_zip_read_info->stream.avail_in = (uInt)uReadThis;
+        }
+
+        if ((pfile_in_zip_read_info->compression_method==0) || (pfile_in_zip_read_info->raw))
+        {
+            uInt uDoCopy,i ;
+
+            if ((pfile_in_zip_read_info->stream.avail_in == 0) &&
+                (pfile_in_zip_read_info->rest_read_compressed == 0))
+                return (iRead==0) ? UNZ_EOF : iRead;
+
+            if (pfile_in_zip_read_info->stream.avail_out <
+                            pfile_in_zip_read_info->stream.avail_in)
+                uDoCopy = pfile_in_zip_read_info->stream.avail_out ;
+            else
+                uDoCopy = pfile_in_zip_read_info->stream.avail_in ;
+
+            for (i=0;i<uDoCopy;i++)
+                *(pfile_in_zip_read_info->stream.next_out+i) =
+                        *(pfile_in_zip_read_info->stream.next_in+i);
+
+            pfile_in_zip_read_info->crc32 = crc32(pfile_in_zip_read_info->crc32,
+                                pfile_in_zip_read_info->stream.next_out,
+                                uDoCopy);
+            pfile_in_zip_read_info->rest_read_uncompressed-=uDoCopy;
+            pfile_in_zip_read_info->stream.avail_in -= uDoCopy;
+            pfile_in_zip_read_info->stream.avail_out -= uDoCopy;
+            pfile_in_zip_read_info->stream.next_out += uDoCopy;
+            pfile_in_zip_read_info->stream.next_in += uDoCopy;
+            pfile_in_zip_read_info->stream.total_out += uDoCopy;
+            iRead += uDoCopy;
+        }
+        else
+        {
+            uLong uTotalOutBefore,uTotalOutAfter;
+            const Bytef *bufBefore;
+            uLong uOutThis;
+            int flush=Z_SYNC_FLUSH;
+
+            uTotalOutBefore = pfile_in_zip_read_info->stream.total_out;
+            bufBefore = pfile_in_zip_read_info->stream.next_out;
+
+            /*
+            if ((pfile_in_zip_read_info->rest_read_uncompressed ==
+                     pfile_in_zip_read_info->stream.avail_out) &&
+                (pfile_in_zip_read_info->rest_read_compressed == 0))
+                flush = Z_FINISH;
+            */
+            err=inflate(&pfile_in_zip_read_info->stream,flush);
+
+            if ((err>=0) && (pfile_in_zip_read_info->stream.msg!=NULL))
+              err = Z_DATA_ERROR;
+
+            uTotalOutAfter = pfile_in_zip_read_info->stream.total_out;
+            uOutThis = uTotalOutAfter-uTotalOutBefore;
+
+            pfile_in_zip_read_info->crc32 =
+                crc32(pfile_in_zip_read_info->crc32,bufBefore,
+                        (uInt)(uOutThis));
+
+            pfile_in_zip_read_info->rest_read_uncompressed -=
+                uOutThis;
+
+            iRead += (uInt)(uTotalOutAfter - uTotalOutBefore);
+
+            if (err==Z_STREAM_END)
+                return (iRead==0) ? UNZ_EOF : iRead;
+            if (err!=Z_OK)
+                break;
+        }
+    }
+
+    if (err==Z_OK)
+        return iRead;
+    return err;
+}
+
+
+/*
+  Give the current position in uncompressed data
+*/
+extern z_off_t ZEXPORT unztell (file)
+    unzFile file;
+{
+    unz_s* s;
+    file_in_zip_read_info_s* pfile_in_zip_read_info;
+    if (file==NULL)
+        return UNZ_PARAMERROR;
+    s=(unz_s*)file;
+    pfile_in_zip_read_info=s->pfile_in_zip_read;
+
+    if (pfile_in_zip_read_info==NULL)
+        return UNZ_PARAMERROR;
+
+    return (z_off_t)pfile_in_zip_read_info->stream.total_out;
+}
+
+
+/*
+  return 1 if the end of file was reached, 0 elsewhere
+*/
+extern int ZEXPORT unzeof (file)
+    unzFile file;
+{
+    unz_s* s;
+    file_in_zip_read_info_s* pfile_in_zip_read_info;
+    if (file==NULL)
+        return UNZ_PARAMERROR;
+    s=(unz_s*)file;
+    pfile_in_zip_read_info=s->pfile_in_zip_read;
+
+    if (pfile_in_zip_read_info==NULL)
+        return UNZ_PARAMERROR;
+
+    if (pfile_in_zip_read_info->rest_read_uncompressed == 0)
+        return 1;
+    else
+        return 0;
+}
+
+
+
+/*
+  Read extra field from the current file (opened by unzOpenCurrentFile)
+  This is the local-header version of the extra field (sometimes, there is
+    more info in the local-header version than in the central-header)
+
+  if buf==NULL, it return the size of the local extra field that can be read
+
+  if buf!=NULL, len is the size of the buffer, the extra header is copied in
+    buf.
+  the return value is the number of bytes copied in buf, or (if <0)
+    the error code
+*/
+extern int ZEXPORT unzGetLocalExtrafield (file,buf,len)
+    unzFile file;
+    voidp buf;
+    unsigned len;
+{
+    unz_s* s;
+    file_in_zip_read_info_s* pfile_in_zip_read_info;
+    uInt read_now;
+    uLong size_to_read;
+
+    if (file==NULL)
+        return UNZ_PARAMERROR;
+    s=(unz_s*)file;
+    pfile_in_zip_read_info=s->pfile_in_zip_read;
+
+    if (pfile_in_zip_read_info==NULL)
+        return UNZ_PARAMERROR;
+
+    size_to_read = (pfile_in_zip_read_info->size_local_extrafield -
+                pfile_in_zip_read_info->pos_local_extrafield);
+
+    if (buf==NULL)
+        return (int)size_to_read;
+
+    if (len>size_to_read)
+        read_now = (uInt)size_to_read;
+    else
+        read_now = (uInt)len ;
+
+    if (read_now==0)
+        return 0;
+
+    if (ZSEEK(pfile_in_zip_read_info->z_filefunc,
+              pfile_in_zip_read_info->filestream,
+              pfile_in_zip_read_info->offset_local_extrafield +
+              pfile_in_zip_read_info->pos_local_extrafield,
+              ZLIB_FILEFUNC_SEEK_SET)!=0)
+        return UNZ_ERRNO;
+
+    if (ZREAD(pfile_in_zip_read_info->z_filefunc,
+              pfile_in_zip_read_info->filestream,
+              buf,read_now)!=read_now)
+        return UNZ_ERRNO;
+
+    return (int)read_now;
+}
+
+/*
+  Close the file in zip opened with unzipOpenCurrentFile
+  Return UNZ_CRCERROR if all the file was read but the CRC is not good
+*/
+extern int ZEXPORT unzCloseCurrentFile (file)
+    unzFile file;
+{
+    int err=UNZ_OK;
+
+    unz_s* s;
+    file_in_zip_read_info_s* pfile_in_zip_read_info;
+    if (file==NULL)
+        return UNZ_PARAMERROR;
+    s=(unz_s*)file;
+    pfile_in_zip_read_info=s->pfile_in_zip_read;
+
+    if (pfile_in_zip_read_info==NULL)
+        return UNZ_PARAMERROR;
+
+
+    if ((pfile_in_zip_read_info->rest_read_uncompressed == 0) &&
+        (!pfile_in_zip_read_info->raw))
+    {
+        if (pfile_in_zip_read_info->crc32 != pfile_in_zip_read_info->crc32_wait)
+            err=UNZ_CRCERROR;
+    }
+
+
+    TRYFREE(pfile_in_zip_read_info->read_buffer);
+    pfile_in_zip_read_info->read_buffer = NULL;
+    if (pfile_in_zip_read_info->stream_initialised)
+        inflateEnd(&pfile_in_zip_read_info->stream);
+
+    pfile_in_zip_read_info->stream_initialised = 0;
+    TRYFREE(pfile_in_zip_read_info);
+
+    s->pfile_in_zip_read=NULL;
+
+    return err;
+}
+
+
+/*
+  Get the global comment string of the ZipFile, in the szComment buffer.
+  uSizeBuf is the size of the szComment buffer.
+  return the number of byte copied or an error code <0
+*/
+extern int ZEXPORT unzGetGlobalComment (file, szComment, uSizeBuf)
+    unzFile file;
+    char *szComment;
+    uLong uSizeBuf;
+{
+    unz_s* s;
+    uLong uReadThis ;
+    if (file==NULL)
+        return UNZ_PARAMERROR;
+    s=(unz_s*)file;
+
+    uReadThis = uSizeBuf;
+    if (uReadThis>s->gi.size_comment)
+        uReadThis = s->gi.size_comment;
+
+    if (ZSEEK(s->z_filefunc,s->filestream,s->central_pos+22,ZLIB_FILEFUNC_SEEK_SET)!=0)
+        return UNZ_ERRNO;
+
+    if (uReadThis>0)
+    {
+      *szComment='\0';
+      if (ZREAD(s->z_filefunc,s->filestream,szComment,uReadThis)!=uReadThis)
+        return UNZ_ERRNO;
+    }
+
+    if ((szComment != NULL) && (uSizeBuf > s->gi.size_comment))
+        *(szComment+s->gi.size_comment)='\0';
+    return (int)uReadThis;
+}
+
+/* Additions by RX '2004 */
+extern uLong ZEXPORT unzGetOffset (file)
+    unzFile file;
+{
+    unz_s* s;
+
+    if (file==NULL)
+          return UNZ_PARAMERROR;
+    s=(unz_s*)file;
+    if (!s->current_file_ok)
+      return 0;
+    if (s->gi.number_entry != 0 && s->gi.number_entry != 0xffff)
+      if (s->num_file==s->gi.number_entry)
+         return 0;
+    return s->pos_in_central_dir;
+}
+
+extern int ZEXPORT unzSetOffset (file, pos)
+        unzFile file;
+        uLong pos;
+{
+    unz_s* s;
+    int err;
+
+    if (file==NULL)
+        return UNZ_PARAMERROR;
+    s=(unz_s*)file;
+
+    s->pos_in_central_dir = pos;
+    s->num_file = s->gi.number_entry;      /* hack */
+    err = unzlocal_GetCurrentFileInfoInternal(file,&s->cur_file_info,
+                                              &s->cur_file_info_internal,
+                                              NULL,0,NULL,0,NULL,0);
+    s->current_file_ok = (err == UNZ_OK);
+    return err;
+}
diff --git a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/minizip/unzip.h b/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/minizip/unzip.h
new file mode 100644
index 0000000000..c3206a0589
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/minizip/unzip.h
@@ -0,0 +1,354 @@
+/* unzip.h -- IO for uncompress .zip files using zlib
+   Version 1.01e, February 12th, 2005
+
+   Copyright (C) 1998-2005 Gilles Vollant
+
+   This unzip package allow extract file from .ZIP file, compatible with PKZip 2.04g
+     WinZip, InfoZip tools and compatible.
+
+   Multi volume ZipFile (span) are not supported.
+   Encryption compatible with pkzip 2.04g only supported
+   Old compressions used by old PKZip 1.x are not supported
+
+
+   I WAIT FEEDBACK at mail info@winimage.com
+   Visit also http://www.winimage.com/zLibDll/unzip.htm for evolution
+
+   Condition of use and distribution are the same than zlib :
+
+  This software is provided 'as-is', without any express or implied
+  warranty.  In no event will the authors be held liable for any damages
+  arising from the use of this software.
+
+  Permission is granted to anyone to use this software for any purpose,
+  including commercial applications, and to alter it and redistribute it
+  freely, subject to the following restrictions:
+
+  1. The origin of this software must not be misrepresented; you must not
+     claim that you wrote the original software. If you use this software
+     in a product, an acknowledgment in the product documentation would be
+     appreciated but is not required.
+  2. Altered source versions must be plainly marked as such, and must not be
+     misrepresented as being the original software.
+  3. This notice may not be removed or altered from any source distribution.
+
+
+*/
+
+/* for more info about .ZIP format, see
+      http://www.info-zip.org/pub/infozip/doc/appnote-981119-iz.zip
+      http://www.info-zip.org/pub/infozip/doc/
+   PkWare has also a specification at :
+      ftp://ftp.pkware.com/probdesc.zip
+*/
+
+#ifndef _unz_H
+#define _unz_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifndef _ZLIB_H
+#include "zlib.h"
+#endif
+
+#ifndef _ZLIBIOAPI_H
+#include "ioapi.h"
+#endif
+
+#if defined(STRICTUNZIP) || defined(STRICTZIPUNZIP)
+/* like the STRICT of WIN32, we define a pointer that cannot be converted
+    from (void*) without cast */
+typedef struct TagunzFile__ { int unused; } unzFile__;
+typedef unzFile__ *unzFile;
+#else
+typedef voidp unzFile;
+#endif
+
+
+#define UNZ_OK                          (0)
+#define UNZ_END_OF_LIST_OF_FILE         (-100)
+#define UNZ_ERRNO                       (Z_ERRNO)
+#define UNZ_EOF                         (0)
+#define UNZ_PARAMERROR                  (-102)
+#define UNZ_BADZIPFILE                  (-103)
+#define UNZ_INTERNALERROR               (-104)
+#define UNZ_CRCERROR                    (-105)
+
+/* tm_unz contain date/time info */
+typedef struct tm_unz_s
+{
+    uInt tm_sec;            /* seconds after the minute - [0,59] */
+    uInt tm_min;            /* minutes after the hour - [0,59] */
+    uInt tm_hour;           /* hours since midnight - [0,23] */
+    uInt tm_mday;           /* day of the month - [1,31] */
+    uInt tm_mon;            /* months since January - [0,11] */
+    uInt tm_year;           /* years - [1980..2044] */
+} tm_unz;
+
+/* unz_global_info structure contain global data about the ZIPfile
+   These data comes from the end of central dir */
+typedef struct unz_global_info_s
+{
+    uLong number_entry;         /* total number of entries in
+                       the central dir on this disk */
+    uLong size_comment;         /* size of the global comment of the zipfile */
+} unz_global_info;
+
+
+/* unz_file_info contain information about a file in the zipfile */
+typedef struct unz_file_info_s
+{
+    uLong version;              /* version made by                 2 bytes */
+    uLong version_needed;       /* version needed to extract       2 bytes */
+    uLong flag;                 /* general purpose bit flag        2 bytes */
+    uLong compression_method;   /* compression method              2 bytes */
+    uLong dosDate;              /* last mod file date in Dos fmt   4 bytes */
+    uLong crc;                  /* crc-32                          4 bytes */
+    uLong compressed_size;      /* compressed size                 4 bytes */
+    uLong uncompressed_size;    /* uncompressed size               4 bytes */
+    uLong size_filename;        /* filename length                 2 bytes */
+    uLong size_file_extra;      /* extra field length              2 bytes */
+    uLong size_file_comment;    /* file comment length             2 bytes */
+
+    uLong disk_num_start;       /* disk number start               2 bytes */
+    uLong internal_fa;          /* internal file attributes        2 bytes */
+    uLong external_fa;          /* external file attributes        4 bytes */
+
+    tm_unz tmu_date;
+} unz_file_info;
+
+extern int ZEXPORT unzStringFileNameCompare OF ((const char* fileName1,
+                                                 const char* fileName2,
+                                                 int iCaseSensitivity));
+/*
+   Compare two filename (fileName1,fileName2).
+   If iCaseSenisivity = 1, comparision is case sensitivity (like strcmp)
+   If iCaseSenisivity = 2, comparision is not case sensitivity (like strcmpi
+                                or strcasecmp)
+   If iCaseSenisivity = 0, case sensitivity is defaut of your operating system
+    (like 1 on Unix, 2 on Windows)
+*/
+
+
+extern unzFile ZEXPORT unzOpen OF((const char *path));
+/*
+  Open a Zip file. path contain the full pathname (by example,
+     on a Windows XP computer "c:\\zlib\\zlib113.zip" or on an Unix computer
+     "zlib/zlib113.zip".
+     If the zipfile cannot be opened (file don't exist or in not valid), the
+       return value is NULL.
+     Else, the return value is a unzFile Handle, usable with other function
+       of this unzip package.
+*/
+
+extern unzFile ZEXPORT unzOpen2 OF((const char *path,
+                                    zlib_filefunc_def* pzlib_filefunc_def));
+/*
+   Open a Zip file, like unzOpen, but provide a set of file low level API
+      for read/write the zip file (see ioapi.h)
+*/
+
+extern int ZEXPORT unzClose OF((unzFile file));
+/*
+  Close a ZipFile opened with unzipOpen.
+  If there is files inside the .Zip opened with unzOpenCurrentFile (see later),
+    these files MUST be closed with unzipCloseCurrentFile before call unzipClose.
+  return UNZ_OK if there is no problem. */
+
+extern int ZEXPORT unzGetGlobalInfo OF((unzFile file,
+                                        unz_global_info *pglobal_info));
+/*
+  Write info about the ZipFile in the *pglobal_info structure.
+  No preparation of the structure is needed
+  return UNZ_OK if there is no problem. */
+
+
+extern int ZEXPORT unzGetGlobalComment OF((unzFile file,
+                                           char *szComment,
+                                           uLong uSizeBuf));
+/*
+  Get the global comment string of the ZipFile, in the szComment buffer.
+  uSizeBuf is the size of the szComment buffer.
+  return the number of byte copied or an error code <0
+*/
+
+
+/***************************************************************************/
+/* Unzip package allow you browse the directory of the zipfile */
+
+extern int ZEXPORT unzGoToFirstFile OF((unzFile file));
+/*
+  Set the current file of the zipfile to the first file.
+  return UNZ_OK if there is no problem
+*/
+
+extern int ZEXPORT unzGoToNextFile OF((unzFile file));
+/*
+  Set the current file of the zipfile to the next file.
+  return UNZ_OK if there is no problem
+  return UNZ_END_OF_LIST_OF_FILE if the actual file was the latest.
+*/
+
+extern int ZEXPORT unzLocateFile OF((unzFile file,
+                     const char *szFileName,
+                     int iCaseSensitivity));
+/*
+  Try locate the file szFileName in the zipfile.
+  For the iCaseSensitivity signification, see unzStringFileNameCompare
+
+  return value :
+  UNZ_OK if the file is found. It becomes the current file.
+  UNZ_END_OF_LIST_OF_FILE if the file is not found
+*/
+
+
+/* ****************************************** */
+/* Ryan supplied functions */
+/* unz_file_info contain information about a file in the zipfile */
+typedef struct unz_file_pos_s
+{
+    uLong pos_in_zip_directory;   /* offset in zip file directory */
+    uLong num_of_file;            /* # of file */
+} unz_file_pos;
+
+extern int ZEXPORT unzGetFilePos(
+    unzFile file,
+    unz_file_pos* file_pos);
+
+extern int ZEXPORT unzGoToFilePos(
+    unzFile file,
+    unz_file_pos* file_pos);
+
+/* ****************************************** */
+
+extern int ZEXPORT unzGetCurrentFileInfo OF((unzFile file,
+                         unz_file_info *pfile_info,
+                         char *szFileName,
+                         uLong fileNameBufferSize,
+                         void *extraField,
+                         uLong extraFieldBufferSize,
+                         char *szComment,
+                         uLong commentBufferSize));
+/*
+  Get Info about the current file
+  if pfile_info!=NULL, the *pfile_info structure will contain somes info about
+        the current file
+  if szFileName!=NULL, the filemane string will be copied in szFileName
+            (fileNameBufferSize is the size of the buffer)
+  if extraField!=NULL, the extra field information will be copied in extraField
+            (extraFieldBufferSize is the size of the buffer).
+            This is the Central-header version of the extra field
+  if szComment!=NULL, the comment string of the file will be copied in szComment
+            (commentBufferSize is the size of the buffer)
+*/
+
+/***************************************************************************/
+/* for reading the content of the current zipfile, you can open it, read data
+   from it, and close it (you can close it before reading all the file)
+   */
+
+extern int ZEXPORT unzOpenCurrentFile OF((unzFile file));
+/*
+  Open for reading data the current file in the zipfile.
+  If there is no error, the return value is UNZ_OK.
+*/
+
+extern int ZEXPORT unzOpenCurrentFilePassword OF((unzFile file,
+                                                  const char* password));
+/*
+  Open for reading data the current file in the zipfile.
+  password is a crypting password
+  If there is no error, the return value is UNZ_OK.
+*/
+
+extern int ZEXPORT unzOpenCurrentFile2 OF((unzFile file,
+                                           int* method,
+                                           int* level,
+                                           int raw));
+/*
+  Same than unzOpenCurrentFile, but open for read raw the file (not uncompress)
+    if raw==1
+  *method will receive method of compression, *level will receive level of
+     compression
+  note : you can set level parameter as NULL (if you did not want known level,
+         but you CANNOT set method parameter as NULL
+*/
+
+extern int ZEXPORT unzOpenCurrentFile3 OF((unzFile file,
+                                           int* method,
+                                           int* level,
+                                           int raw,
+                                           const char* password));
+/*
+  Same than unzOpenCurrentFile, but open for read raw the file (not uncompress)
+    if raw==1
+  *method will receive method of compression, *level will receive level of
+     compression
+  note : you can set level parameter as NULL (if you did not want known level,
+         but you CANNOT set method parameter as NULL
+*/
+
+
+extern int ZEXPORT unzCloseCurrentFile OF((unzFile file));
+/*
+  Close the file in zip opened with unzOpenCurrentFile
+  Return UNZ_CRCERROR if all the file was read but the CRC is not good
+*/
+
+extern int ZEXPORT unzReadCurrentFile OF((unzFile file,
+                      voidp buf,
+                      unsigned len));
+/*
+  Read bytes from the current file (opened by unzOpenCurrentFile)
+  buf contain buffer where data must be copied
+  len the size of buf.
+
+  return the number of byte copied if somes bytes are copied
+  return 0 if the end of file was reached
+  return <0 with error code if there is an error
+    (UNZ_ERRNO for IO error, or zLib error for uncompress error)
+*/
+
+extern z_off_t ZEXPORT unztell OF((unzFile file));
+/*
+  Give the current position in uncompressed data
+*/
+
+extern int ZEXPORT unzeof OF((unzFile file));
+/*
+  return 1 if the end of file was reached, 0 elsewhere
+*/
+
+extern int ZEXPORT unzGetLocalExtrafield OF((unzFile file,
+                                             voidp buf,
+                                             unsigned len));
+/*
+  Read extra field from the current file (opened by unzOpenCurrentFile)
+  This is the local-header version of the extra field (sometimes, there is
+    more info in the local-header version than in the central-header)
+
+  if buf==NULL, it return the size of the local extra field
+
+  if buf!=NULL, len is the size of the buffer, the extra header is copied in
+    buf.
+  the return value is the number of bytes copied in buf, or (if <0)
+    the error code
+*/
+
+/***************************************************************************/
+
+/* Get the current file offset */
+extern uLong ZEXPORT unzGetOffset (unzFile file);
+
+/* Set the current file offset */
+extern int ZEXPORT unzSetOffset (unzFile file, uLong pos);
+
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _unz_H */
diff --git a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/zip.h b/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/zip.h
new file mode 100644
index 0000000000..a4f0716054
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/zip.h
@@ -0,0 +1,15 @@
+//
+//  Header.h
+//  WebODF
+//
+//  Created by KO GmbH on 3/1/12.
+//  Copyright (c) 2012 __MyCompanyName__. All rights reserved.
+//
+
+#ifndef WebODF_Header_h
+#define WebODF_Header_h
+
+void readZipEntry(const char* zippath, const char* entrypath) {}
+
+
+#endif
diff --git a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/PhoneGap.plist b/apps/files_odfviewer/src/webodf/programs/ios/WebODF/PhoneGap.plist
new file mode 100644
index 0000000000..29011e6d11
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/programs/ios/WebODF/PhoneGap.plist
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>TopActivityIndicator</key>
+	<string>gray</string>
+	<key>EnableLocation</key>
+	<false/>
+	<key>EnableViewportScale</key>
+	<false/>
+	<key>AutoHideSplashScreen</key>
+	<true/>
+	<key>ShowSplashScreenSpinner</key>
+	<true/>
+	<key>MediaPlaybackRequiresUserAction</key>
+	<false/>
+	<key>AllowInlineMediaPlayback</key>
+	<false/>
+	<key>OpenAllWhitelistURLsInWebView</key>
+	<false/>
+	<key>ExternalHosts</key>
+	<array>
+		<string>zipserver</string>
+	</array>
+	<key>Plugins</key>
+	<dict>
+		<key>ZipClass</key>
+		<string>NativeZip</string>
+		<key>com.phonegap.accelerometer</key>
+		<string>PGAccelerometer</string>
+		<key>com.phonegap.camera</key>
+		<string>PGCamera</string>
+		<key>com.phonegap.connection</key>
+		<string>PGConnection</string>
+		<key>com.phonegap.contacts</key>
+		<string>PGContacts</string>
+		<key>com.phonegap.debugconsole</key>
+		<string>PGDebugConsole</string>
+		<key>com.phonegap.file</key>
+		<string>PGFile</string>
+		<key>com.phonegap.filetransfer</key>
+		<string>PGFileTransfer</string>
+		<key>com.phonegap.geolocation</key>
+		<string>PGLocation</string>
+		<key>com.phonegap.notification</key>
+		<string>PGNotification</string>
+		<key>com.phonegap.media</key>
+		<string>PGSound</string>
+		<key>com.phonegap.mediacapture</key>
+		<string>PGCapture</string>
+		<key>com.phonegap.splashscreen</key>
+		<string>PGSplashScreen</string>
+		<key>com.phonegap.battery</key>
+		<string>PGBattery</string>
+	</dict>
+</dict>
+</plist>
diff --git a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Resources/en.lproj/Localizable.strings b/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Resources/en.lproj/Localizable.strings
new file mode 100644
index 0000000000..8972684435
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Resources/en.lproj/Localizable.strings
@@ -0,0 +1,25 @@
+/*
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you 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.
+ */
+
+// accessibility label for recording button
+"toggle audio recording" = "toggle audio recording";
+// notification spoken by VoiceOver when timed recording finishes
+"timed recording complete" = "timed recording complete";
+// accessibility hint for display of recorded elapsed time
+"recorded time in minutes and seconds" = "recorded time in minutes and seconds";
\ No newline at end of file
diff --git a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Resources/icons/icon-72.png b/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Resources/icons/icon-72.png
new file mode 100644
index 0000000000000000000000000000000000000000..1aebf5d34b638026e1c7caa63e5821e372a00c45
GIT binary patch
literal 8844
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
O0000<MNUMnLSTZW7-w7n

literal 0
HcmV?d00001

diff --git a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Resources/icons/icon.png b/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Resources/icons/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..9e654236c0be58c0080b2ca786d4f5274a8fb669
GIT binary patch
literal 6106
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

literal 0
HcmV?d00001

diff --git a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Resources/icons/icon@2x.png b/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Resources/icons/icon@2x.png
new file mode 100644
index 0000000000000000000000000000000000000000..b7ccb848e3949b55361f2fb30dfe3a39756aa387
GIT binary patch
literal 19269
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

literal 0
HcmV?d00001

diff --git a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Resources/splash/Default-Landscape~ipad.png b/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Resources/splash/Default-Landscape~ipad.png
new file mode 100644
index 0000000000000000000000000000000000000000..06bb96b394f8360815781aada7d1c3704263726b
GIT binary patch
literal 52135
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

literal 0
HcmV?d00001

diff --git a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Resources/splash/Default-Portrait~ipad.png b/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Resources/splash/Default-Portrait~ipad.png
new file mode 100644
index 0000000000000000000000000000000000000000..dbfed967af6dbda81c510e41d83cc9abf4ae9626
GIT binary patch
literal 51794
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
Z@c?$9q{=`5#lL#2rLM15qiXl&{{!kJSVjN<

literal 0
HcmV?d00001

diff --git a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Resources/splash/Default.png b/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Resources/splash/Default.png
new file mode 100755
index 0000000000000000000000000000000000000000..fbf06e22d23ca03166bcfa695d7992c6df88fedc
GIT binary patch
literal 46308
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

literal 0
HcmV?d00001

diff --git a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Resources/splash/Default@2x.png b/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Resources/splash/Default@2x.png
new file mode 100755
index 0000000000000000000000000000000000000000..e845a3f0b01414ef25bb3eedaa2529e3b027f121
GIT binary patch
literal 50982
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

literal 0
HcmV?d00001

diff --git a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/WebODF-Info.plist b/apps/files_odfviewer/src/webodf/programs/ios/WebODF/WebODF-Info.plist
new file mode 100644
index 0000000000..18518ec4c1
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/programs/ios/WebODF/WebODF-Info.plist
@@ -0,0 +1,122 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFBundleDevelopmentRegion</key>
+	<string>English</string>
+	<key>CFBundleDisplayName</key>
+	<string>${PRODUCT_NAME}</string>
+	<key>CFBundleDocumentTypes</key>
+	<array>
+		<dict>
+			<key>CFBundleTypeIconFiles</key>
+			<array>
+				<string>icon.png</string>
+			</array>
+			<key>CFBundleTypeName</key>
+			<string>OpenDocument Text</string>
+			<key>CFBundleTypeRole</key>
+			<string>Viewer</string>
+			<key>LSHandlerRank</key>
+			<string>Owner</string>
+			<key>LSItemContentTypes</key>
+			<array>
+				<string>org.oasis.opendocument.text</string>
+			</array>
+		</dict>
+		<dict>
+			<key>CFBundleTypeIconFiles</key>
+			<array>
+				<string>icon.png</string>
+			</array>
+			<key>CFBundleTypeName</key>
+			<string>OpenDocument Presentation</string>
+			<key>CFBundleTypeRole</key>
+			<string>Viewer</string>
+			<key>LSHandlerRank</key>
+			<string>Owner</string>
+			<key>LSItemContentTypes</key>
+			<array>
+				<string>org.oasis.opendocument.presentation</string>
+			</array>
+		</dict>
+	</array>
+	<key>CFBundleExecutable</key>
+	<string>${EXECUTABLE_NAME}</string>
+	<key>CFBundleIconFile</key>
+	<string>icon.png</string>
+	<key>CFBundleIconFiles</key>
+	<array>
+		<string>icon.png</string>
+		<string>icon@2x.png</string>
+		<string>icon-72.png</string>
+	</array>
+	<key>CFBundleIdentifier</key>
+	<string>WebODF-03</string>
+	<key>CFBundleInfoDictionaryVersion</key>
+	<string>6.0</string>
+	<key>CFBundleName</key>
+	<string>${PRODUCT_NAME}</string>
+	<key>CFBundlePackageType</key>
+	<string>APPL</string>
+	<key>CFBundleShortVersionString</key>
+	<string>1.0</string>
+	<key>CFBundleSignature</key>
+	<string>????</string>
+	<key>CFBundleVersion</key>
+	<string>1.0</string>
+	<key>LSRequiresIPhoneOS</key>
+	<true/>
+	<key>UISupportedInterfaceOrientations</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationPortraitUpsideDown</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+	</array>
+	<key>UISupportedInterfaceOrientations~ipad</key>
+	<array>
+		<string>UIInterfaceOrientationPortrait</string>
+		<string>UIInterfaceOrientationLandscapeLeft</string>
+		<string>UIInterfaceOrientationPortraitUpsideDown</string>
+		<string>UIInterfaceOrientationLandscapeRight</string>
+	</array>
+	<key>UTExportedTypeDeclarations</key>
+	<array>
+		<dict>
+			<key>UTTypeConformsTo</key>
+			<array>
+				<string>org.gnu.gnu-zip-archive</string>
+			</array>
+			<key>UTTypeDescription</key>
+			<string>OpenDocument Text</string>
+			<key>UTTypeIdentifier</key>
+			<string>org.oasis.opendocument.text</string>
+			<key>UTTypeTagSpecification</key>
+			<dict>
+				<key>public.filename-extension</key>
+				<string>odt</string>
+				<key>public.mime-type</key>
+				<string>application/vnd.oasis.opendocument.text</string>
+			</dict>
+		</dict>
+		<dict>
+			<key>UTTypeConformsTo</key>
+			<array>
+				<string>org.gnu.gnu-zip-archive</string>
+			</array>
+			<key>UTTypeDescription</key>
+			<string>OpenDocument Presentation</string>
+			<key>UTTypeIdentifier</key>
+			<string>org.oasis.opendocument.presentation</string>
+			<key>UTTypeTagSpecification</key>
+			<dict>
+				<key>public.filename-extension</key>
+				<string>odp</string>
+				<key>public.mime-type</key>
+				<string>application/vnd.oasis.opendocument.presentation</string>
+			</dict>
+		</dict>
+	</array>
+</dict>
+</plist>
diff --git a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/WebODF-Prefix.pch b/apps/files_odfviewer/src/webodf/programs/ios/WebODF/WebODF-Prefix.pch
new file mode 100644
index 0000000000..da48b6a1fd
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/programs/ios/WebODF/WebODF-Prefix.pch
@@ -0,0 +1,7 @@
+//
+// Prefix header for all source files of the 'WebODF' target in the 'WebODF' project
+//
+
+#ifdef __OBJC__
+    #import <UIKit/UIKit.h>
+#endif
diff --git a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/en.lproj/InfoPlist.strings b/apps/files_odfviewer/src/webodf/programs/ios/WebODF/en.lproj/InfoPlist.strings
new file mode 100644
index 0000000000..477b28ff8f
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/programs/ios/WebODF/en.lproj/InfoPlist.strings
@@ -0,0 +1,2 @@
+/* Localized versions of Info.plist keys */
+
diff --git a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/main.m b/apps/files_odfviewer/src/webodf/programs/ios/WebODF/main.m
new file mode 100644
index 0000000000..bda2f99ea3
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/programs/ios/WebODF/main.m
@@ -0,0 +1,32 @@
+/*
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements.  See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership.  The ASF licenses this file
+ to you 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.
+ */
+//
+//  main.m
+//  WebODF
+//
+//  Created by KO GmbH on 2/2/12.
+//  Copyright __MyCompanyName__ 2012. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+int main(int argc, char *argv[]) {
+    int retVal = UIApplicationMain(argc, argv, nil, @"AppDelegate");
+    return retVal;
+}
diff --git a/apps/files_odfviewer/src/webodf/programs/ios/www/index.html b/apps/files_odfviewer/src/webodf/programs/ios/www/index.html
new file mode 100644
index 0000000000..ec998a1005
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/programs/ios/www/index.html
@@ -0,0 +1,52 @@
+<!DOCTYPE html>
+<html>
+ <head>
+  <title>WebODF</title>
+  <link href="sencha-touch.css" rel="stylesheet" type="text/css" />
+  <link href="webodf.css" rel="stylesheet" type="text/css" />
+  <script type="text/javascript" src="phonegap-1.4.1.js"></script>
+  <script type="text/javascript" src="sencha-touch.js"></script>
+  <script type="text/javascript" src="webodf.js"></script>
+  <script type="text/javascript" src="nativezip.js"></script>
+  <script type="text/javascript" src="app/app.js"></script>
+  <script type="text/javascript" src="app/controller/Files.js"></script>
+  <script type="text/javascript" src="app/model/FileSystem.js"></script>
+  <script type="text/javascript" src="app/store/FileStore.js"></script>
+  <script type="text/javascript" src="app/views/FileDetail.js"></script>
+  <script type="text/javascript" src="app/views/FilesList.js"></script>
+  <script type="text/javascript" src="app/views/OdfView.js"></script>
+  <script type="text/javascript" src="app/views/Viewport.js"></script>
+  <script type="text/javascript">
+var applicationReady = false,
+    deviceReady = false,
+    startScanningDirectories,
+    application;
+document.addEventListener("deviceready", function () {
+    deviceReady = true;
+    if (applicationReady) {
+        startScanningDirectories();
+    }
+}, false);
+/**
+ * Override this function so it waits until the device is ready.
+ */
+onApplicationLaunch = function (app) {
+    "use strict";
+    application = app;
+    applicationReady = true;
+    startScanningDirectories = function () {
+        if (typeof invokeString !== "undefined" && invokeString) {
+            app.openUrl(invokeString);
+        }
+        app.startScanningDirectories();
+    };
+    if (deviceReady) {
+        startScanningDirectories();
+    }
+};
+function handleOpenURL(url) {
+    application.openUrl(url);
+}
+  </script>
+ </head><body></body>
+</html>
diff --git a/apps/files_odfviewer/src/webodf/programs/ios/www/nativezip.js b/apps/files_odfviewer/src/webodf/programs/ios/www/nativezip.js
new file mode 100644
index 0000000000..04a8ff13c7
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/programs/ios/www/nativezip.js
@@ -0,0 +1,84 @@
+/*global PhoneGap, core*/
+
+var ZipPlugin = {
+    loadAsString: function (zippath, entrypath, success, fail) {
+        "use strict";
+        return PhoneGap.exec(success, fail, "ZipClass", "loadAsString", [zippath, entrypath]);
+    },
+    loadAsDataURL: function (zippath, entrypath, mimetype, success, fail) {
+        "use strict";
+        return PhoneGap.exec(success, fail, "ZipClass", "loadAsDataURL", [zippath, entrypath, mimetype]);
+    }
+};
+core.Zip = function (url, entriesReadCallback) {
+    "use strict";
+    // remove 'odf:' prefix
+    url = url.substr(4);
+    var zip = this;
+    this.load = function (filename, callback) {
+        //alert(filename);
+        callback(null, "");
+    };
+    this.loadAsString = function (filename, callback) {
+        alert("loadAsString");
+    };
+    this.loadAsDOM = function (filename, callback) {
+        var xhr = new XMLHttpRequest();
+        function handleResult() {
+            var xml;
+            console.log("loading " + filename + " status " + xhr.status + " readyState " + xhr.readyState);
+            if (xhr.readyState === 4) {
+                xml = xhr.responseXML;
+                console.log("done accessing responseXML " + xml + " " + (xhr.responseText && xhr.responseText.length)
+                    + " " + xhr.statusText);
+                console.log("statusText " + xhr.statusText);
+                if (xhr.status === 0 && !xml) {
+                    // empty files are considered as errors
+                    callback("File " + path + " is not valid XML.");
+                } else if (xhr.status === 200 || xhr.status === 0) {
+                    try {
+                        callback(null, xml);
+                    } catch (e) {
+                        console.log(e);
+                    }
+                } else {
+                    // report error
+                    callback(xhr.responseText || xhr.statusText);
+                }
+            }
+        }
+        xhr.open('GET', "http://zipserver" + url + "?" + filename, true);
+        xhr.onreadystatechange = handleResult;
+        xhr.send(null);
+    };
+    this.loadAsDataURL = function (filename, mimetype, callback) {
+        callback(null, "http://zipserver" + url + "?" + filename);
+        /*
+        ZipPlugin.loadAsDataURL(url, filename, mimetype,
+            function (content) {
+                callback(null, content);
+            },
+            function (err) { callback(err, null); }
+            );
+            */
+    };
+    this.getEntries = function () {
+        alert("getEntries");
+    };
+    this.loadContentXmlAsFragments = function (filename, handler) {
+        // the javascript implementation simply reads the file
+        zip.loadAsString(filename, function (err, data) {
+            if (err) {
+                return handler.rootElementReady(err);
+            }
+            handler.rootElementReady(null, data, true);
+        });
+    };
+    this.save = function () {
+        alert("save");
+    };
+    this.write = function () {
+        alert("write");
+    };
+    entriesReadCallback(null, this);
+};
diff --git a/apps/files_odfviewer/src/webodf/programs/ios/www/phonegap-1.4.1.js b/apps/files_odfviewer/src/webodf/programs/ios/www/phonegap-1.4.1.js
new file mode 100644
index 0000000000..680e180209
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/programs/ios/www/phonegap-1.4.1.js
@@ -0,0 +1,4123 @@
+/*     PhoneGap v1.4.1 */
+/*
+       Licensed to the Apache Software Foundation (ASF) under one
+       or more contributor license agreements.  See the NOTICE file
+       distributed with this work for additional information
+       regarding copyright ownership.  The ASF licenses this file
+       to you 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.
+*/
+
+
+/*
+ * Some base contributions
+ * Copyright (c) 2011, Proyectos Equis Ka, S.L.
+ */
+
+if (typeof PhoneGap === "undefined") {
+
+if (typeof(DeviceInfo) !== 'object'){
+    DeviceInfo = {};
+}
+/**
+ * This represents the PhoneGap API itself, and provides a global namespace for accessing
+ * information about the state of PhoneGap.
+ * @class
+ */
+PhoneGap = {
+    // This queue holds the currently executing command and all pending
+    // commands executed with PhoneGap.exec().
+    commandQueue: [],
+    // Indicates if we're currently in the middle of flushing the command
+    // queue on the native side.
+    commandQueueFlushing: false,
+    _constructors: [],
+    documentEventHandler: {},   // Collection of custom document event handlers
+    windowEventHandler: {} 
+};
+
+/**
+ * List of resource files loaded by PhoneGap.
+ * This is used to ensure JS and other files are loaded only once.
+ */
+PhoneGap.resources = {base: true};
+
+/**
+ * Determine if resource has been loaded by PhoneGap
+ *
+ * @param name
+ * @return
+ */
+PhoneGap.hasResource = function(name) {
+    return PhoneGap.resources[name];
+};
+
+/**
+ * Add a resource to list of loaded resources by PhoneGap
+ *
+ * @param name
+ */
+PhoneGap.addResource = function(name) {
+    PhoneGap.resources[name] = true;
+};
+
+/**
+ * Boolean flag indicating if the PhoneGap API is available and initialized.
+ */ // TODO: Remove this, it is unused here ... -jm
+PhoneGap.available = DeviceInfo.uuid != undefined;
+
+/**
+ * Add an initialization function to a queue that ensures it will run and initialize
+ * application constructors only once PhoneGap has been initialized.
+ * @param {Function} func The function callback you want run once PhoneGap is initialized
+ */
+PhoneGap.addConstructor = function(func) {
+    var state = document.readyState;
+    if ( ( state == 'loaded' || state == 'complete' ) && DeviceInfo.uuid != null )
+    {
+        func();
+    }
+    else
+    {
+        PhoneGap._constructors.push(func);
+    }
+};
+
+(function() 
+ {
+    var timer = setInterval(function()
+    {
+                            
+        var state = document.readyState;
+                            
+        if ( ( state == 'loaded' || state == 'complete' ) && DeviceInfo.uuid != null )
+        {
+            clearInterval(timer); // stop looking
+            // run our constructors list
+            while (PhoneGap._constructors.length > 0) 
+            {
+                var constructor = PhoneGap._constructors.shift();
+                try 
+                {
+                    constructor();
+                } 
+                catch(e) 
+                {
+                    if (typeof(console['log']) == 'function')
+                    {
+                        console.log("Failed to run constructor: " + console.processMessage(e));
+                    }
+                    else
+                    {
+                        alert("Failed to run constructor: " + e.message);
+                    }
+                }
+            }
+            // all constructors run, now fire the deviceready event
+            var e = document.createEvent('Events'); 
+            e.initEvent('deviceready');
+            document.dispatchEvent(e);
+        }
+    }, 1);
+})();
+
+// session id for calls
+PhoneGap.sessionKey = 0;
+
+// centralized callbacks
+PhoneGap.callbackId = 0;
+PhoneGap.callbacks = {};
+PhoneGap.callbackStatus = {
+    NO_RESULT: 0,
+    OK: 1,
+    CLASS_NOT_FOUND_EXCEPTION: 2,
+    ILLEGAL_ACCESS_EXCEPTION: 3,
+    INSTANTIATION_EXCEPTION: 4,
+    MALFORMED_URL_EXCEPTION: 5,
+    IO_EXCEPTION: 6,
+    INVALID_ACTION: 7,
+    JSON_EXCEPTION: 8,
+    ERROR: 9
+    };
+
+/**
+ * Creates a gap bridge iframe used to notify the native code about queued
+ * commands.
+ *
+ * @private
+ */
+PhoneGap.createGapBridge = function() {
+    gapBridge = document.createElement("iframe");
+    gapBridge.setAttribute("style", "display:none;");
+    gapBridge.setAttribute("height","0px");
+    gapBridge.setAttribute("width","0px");
+    gapBridge.setAttribute("frameborder","0");
+    document.documentElement.appendChild(gapBridge);
+    return gapBridge;
+}
+
+/** 
+ * Execute a PhoneGap command by queuing it and letting the native side know
+ * there are queued commands. The native side will then request all of the
+ * queued commands and execute them.
+ *
+ * Arguments may be in one of two formats:
+ *
+ * FORMAT ONE (preferable)
+ * The native side will call PhoneGap.callbackSuccess or
+ * PhoneGap.callbackError, depending upon the result of the action.
+ *
+ * @param {Function} success    The success callback
+ * @param {Function} fail       The fail callback
+ * @param {String} service      The name of the service to use
+ * @param {String} action       The name of the action to use
+ * @param {String[]} [args]     Zero or more arguments to pass to the method
+ *      
+ * FORMAT TWO
+ * @param {String} command    Command to be run in PhoneGap, e.g.
+ *                            "ClassName.method"
+ * @param {String[]} [args]   Zero or more arguments to pass to the method
+ *                            object parameters are passed as an array object
+ *                            [object1, object2] each object will be passed as
+ *                            JSON strings 
+ */
+PhoneGap.exec = function() { 
+    if (!PhoneGap.available) {
+        alert("ERROR: Attempting to call PhoneGap.exec()"
+              +" before 'deviceready'. Ignoring.");
+        return;
+    }
+
+    var successCallback, failCallback, service, action, actionArgs;
+    var callbackId = null;
+    if (typeof arguments[0] !== "string") {
+        // FORMAT ONE
+        successCallback = arguments[0];
+        failCallback = arguments[1];
+        service = arguments[2];
+        action = arguments[3];
+        actionArgs = arguments[4];
+
+        // Since we need to maintain backwards compatibility, we have to pass
+        // an invalid callbackId even if no callback was provided since plugins
+        // will be expecting it. The PhoneGap.exec() implementation allocates
+        // an invalid callbackId and passes it even if no callbacks were given.
+        callbackId = 'INVALID';
+    } else {
+        // FORMAT TWO
+        splitCommand = arguments[0].split(".");
+        action = splitCommand.pop();
+        service = splitCommand.join(".");
+        actionArgs = Array.prototype.splice.call(arguments, 1);
+    }
+    
+    // Start building the command object.
+    var command = {
+        className: service,
+        methodName: action,
+        arguments: []
+    };
+
+    // Register the callbacks and add the callbackId to the positional
+    // arguments if given.
+    if (successCallback || failCallback) {
+        callbackId = service + PhoneGap.callbackId++;
+        PhoneGap.callbacks[callbackId] = 
+            {success:successCallback, fail:failCallback};
+    }
+    if (callbackId != null) {
+        command.arguments.push(callbackId);
+    }
+
+    for (var i = 0; i < actionArgs.length; ++i) {
+        var arg = actionArgs[i];
+        if (arg == undefined || arg == null) {
+            continue;
+        } else if (typeof(arg) == 'object') {
+            command.options = arg;
+        } else {
+            command.arguments.push(arg);
+        }
+    }
+
+    // Stringify and queue the command. We stringify to command now to
+    // effectively clone the command arguments in case they are mutated before
+    // the command is executed.
+    PhoneGap.commandQueue.push(JSON.stringify(command));
+
+    // If the queue length is 1, then that means it was empty before we queued
+    // the given command, so let the native side know that we have some
+    // commands to execute, unless the queue is currently being flushed, in
+    // which case the command will be picked up without notification.
+    if (PhoneGap.commandQueue.length == 1 && !PhoneGap.commandQueueFlushing) {
+        if (!PhoneGap.gapBridge) {
+            PhoneGap.gapBridge = PhoneGap.createGapBridge();
+        }
+
+        PhoneGap.gapBridge.src = "gap://ready";
+    }
+}
+
+/**
+ * Called by native code to retrieve all queued commands and clear the queue.
+ */
+PhoneGap.getAndClearQueuedCommands = function() {
+  json = JSON.stringify(PhoneGap.commandQueue);
+  PhoneGap.commandQueue = [];
+  return json;
+}
+
+/**
+ * Called by native code when returning successful result from an action.
+ *
+ * @param callbackId
+ * @param args
+ *        args.status - PhoneGap.callbackStatus
+ *        args.message - return value
+ *        args.keepCallback - 0 to remove callback, 1 to keep callback in PhoneGap.callbacks[]
+ */
+PhoneGap.callbackSuccess = function(callbackId, args) {
+    if (PhoneGap.callbacks[callbackId]) {
+
+        // If result is to be sent to callback
+        if (args.status == PhoneGap.callbackStatus.OK) {
+            try {
+                if (PhoneGap.callbacks[callbackId].success) {
+                       PhoneGap.callbacks[callbackId].success(args.message);
+                }
+            }
+            catch (e) {
+                console.log("Error in success callback: "+callbackId+" = "+e);
+            }
+        }
+    
+        // Clear callback if not expecting any more results
+        if (!args.keepCallback) {
+            delete PhoneGap.callbacks[callbackId];
+        }
+    }
+};
+
+/**
+ * Called by native code when returning error result from an action.
+ *
+ * @param callbackId
+ * @param args
+ */
+PhoneGap.callbackError = function(callbackId, args) {
+    if (PhoneGap.callbacks[callbackId]) {
+        try {
+            if (PhoneGap.callbacks[callbackId].fail) {
+                PhoneGap.callbacks[callbackId].fail(args.message);
+            }
+        }
+        catch (e) {
+            console.log("Error in error callback: "+callbackId+" = "+e);
+        }
+        
+        // Clear callback if not expecting any more results
+        if (!args.keepCallback) {
+            delete PhoneGap.callbacks[callbackId];
+        }
+    }
+};
+
+
+/**
+ * Does a deep clone of the object.
+ *
+ * @param obj
+ * @return
+ */
+PhoneGap.clone = function(obj) {
+    if(!obj) { 
+        return obj;
+    }
+
+    if(obj instanceof Array){
+        var retVal = new Array();
+        for(var i = 0; i < obj.length; ++i){
+            retVal.push(PhoneGap.clone(obj[i]));
+        }
+        return retVal;
+    }
+
+    if (obj instanceof Function) {
+        return obj;
+    }
+
+    if(!(obj instanceof Object)){
+        return obj;
+    }
+    
+    if (obj instanceof Date) {
+        return obj;
+    }
+
+    retVal = new Object();
+    for(i in obj){
+        if(!(i in retVal) || retVal[i] != obj[i]) {
+            retVal[i] = PhoneGap.clone(obj[i]);
+        }
+    }
+    return retVal;
+};
+
+// Intercept calls to document.addEventListener 
+PhoneGap.m_document_addEventListener = document.addEventListener;
+
+// Intercept calls to window.addEventListener
+PhoneGap.m_window_addEventListener = window.addEventListener;
+
+/**
+ * Add a custom window event handler.
+ *
+ * @param {String} event            The event name that callback handles
+ * @param {Function} callback       The event handler
+ */
+PhoneGap.addWindowEventHandler = function(event, callback) {
+    PhoneGap.windowEventHandler[event] = callback;
+}
+
+/**
+ * Add a custom document event handler.
+ *
+ * @param {String} event            The event name that callback handles
+ * @param {Function} callback       The event handler
+ */
+PhoneGap.addDocumentEventHandler = function(event, callback) {
+    PhoneGap.documentEventHandler[event] = callback;
+}
+
+/**
+ * Intercept adding document event listeners and handle our own
+ *
+ * @param {Object} evt
+ * @param {Function} handler
+ * @param capture
+ */
+document.addEventListener = function(evt, handler, capture) {
+    var e = evt.toLowerCase();
+           
+    // If subscribing to an event that is handled by a plugin
+    if (typeof PhoneGap.documentEventHandler[e] !== "undefined") {
+        if (PhoneGap.documentEventHandler[e](e, handler, true)) {
+            return; // Stop default behavior
+        }
+    }
+    
+    PhoneGap.m_document_addEventListener.call(document, evt, handler, capture); 
+};
+
+/**
+ * Intercept adding window event listeners and handle our own
+ *
+ * @param {Object} evt
+ * @param {Function} handler
+ * @param capture
+ */
+window.addEventListener = function(evt, handler, capture) {
+    var e = evt.toLowerCase();
+        
+    // If subscribing to an event that is handled by a plugin
+    if (typeof PhoneGap.windowEventHandler[e] !== "undefined") {
+        if (PhoneGap.windowEventHandler[e](e, handler, true)) {
+            return; // Stop default behavior
+        }
+    }
+        
+    PhoneGap.m_window_addEventListener.call(window, evt, handler, capture);
+};
+
+// Intercept calls to document.removeEventListener and watch for events that
+// are generated by PhoneGap native code
+PhoneGap.m_document_removeEventListener = document.removeEventListener;
+
+// Intercept calls to window.removeEventListener
+PhoneGap.m_window_removeEventListener = window.removeEventListener;
+
+/**
+ * Intercept removing document event listeners and handle our own
+ *
+ * @param {Object} evt
+ * @param {Function} handler
+ * @param capture
+ */
+document.removeEventListener = function(evt, handler, capture) {
+    var e = evt.toLowerCase();
+
+    // If unsubcribing from an event that is handled by a plugin
+    if (typeof PhoneGap.documentEventHandler[e] !== "undefined") {
+        if (PhoneGap.documentEventHandler[e](e, handler, false)) {
+            return; // Stop default behavior
+        }
+    }
+
+    PhoneGap.m_document_removeEventListener.call(document, evt, handler, capture);
+};
+
+/**
+ * Intercept removing window event listeners and handle our own
+ *
+ * @param {Object} evt
+ * @param {Function} handler
+ * @param capture
+ */
+window.removeEventListener = function(evt, handler, capture) {
+    var e = evt.toLowerCase();
+
+    // If unsubcribing from an event that is handled by a plugin
+    if (typeof PhoneGap.windowEventHandler[e] !== "undefined") {
+        if (PhoneGap.windowEventHandler[e](e, handler, false)) {
+            return; // Stop default behavior
+        }
+    }
+
+    PhoneGap.m_window_removeEventListener.call(window, evt, handler, capture);
+};
+
+/**
+ * Method to fire document event
+ *
+ * @param {String} type             The event type to fire
+ * @param {Object} data             Data to send with event
+ */
+PhoneGap.fireDocumentEvent = function(type, data) {
+    var e = document.createEvent('Events');
+    e.initEvent(type);
+    if (data) {
+        for (var i in data) {
+            e[i] = data[i];
+        }
+    }
+    document.dispatchEvent(e);
+};
+
+/**
+ * Method to fire window event
+ *
+ * @param {String} type             The event type to fire
+ * @param {Object} data             Data to send with event
+ */
+PhoneGap.fireWindowEvent = function(type, data) {
+    var e = document.createEvent('Events');
+    e.initEvent(type);
+    if (data) {
+        for (var i in data) {
+            e[i] = data[i];
+        }
+    }
+    window.dispatchEvent(e);
+};
+
+/**
+ * Method to fire event from native code
+ * Leaving this generic version to handle problems with iOS 3.x. Is currently used by orientation and battery events
+ * Remove when iOS 3.x no longer supported and call fireWindowEvent or fireDocumentEvent directly
+ */
+PhoneGap.fireEvent = function(type, target, data) {
+    var e = document.createEvent('Events');
+    e.initEvent(type);
+    if (data) {
+        for (var i in data) {
+            e[i] = data[i];
+        }
+    }
+    target = target || document;
+    if (target.dispatchEvent === undefined) { // ie window.dispatchEvent is undefined in iOS 3.x
+        target = document;
+    } 
+
+    target.dispatchEvent(e);
+};
+/**
+ * Create a UUID
+ *
+ * @return
+ */
+PhoneGap.createUUID = function() {
+    return PhoneGap.UUIDcreatePart(4) + '-' +
+        PhoneGap.UUIDcreatePart(2) + '-' +
+        PhoneGap.UUIDcreatePart(2) + '-' +
+        PhoneGap.UUIDcreatePart(2) + '-' +
+        PhoneGap.UUIDcreatePart(6);
+};
+
+PhoneGap.UUIDcreatePart = function(length) {
+    var uuidpart = "";
+    for (var i=0; i<length; i++) {
+        var uuidchar = parseInt((Math.random() * 256)).toString(16);
+        if (uuidchar.length == 1) {
+            uuidchar = "0" + uuidchar;
+        }
+        uuidpart += uuidchar;
+    }
+    return uuidpart;
+};
+};
+
+
+if (!PhoneGap.hasResource("debugconsole")) {
+	PhoneGap.addResource("debugconsole");
+	
+/**
+ * This class provides access to the debugging console.
+ * @constructor
+ */
+var DebugConsole = function() {
+    this.winConsole = window.console;
+    this.logLevel = DebugConsole.INFO_LEVEL;
+}
+
+// from most verbose, to least verbose
+DebugConsole.ALL_LEVEL    = 1; // same as first level
+DebugConsole.INFO_LEVEL   = 1;
+DebugConsole.WARN_LEVEL   = 2;
+DebugConsole.ERROR_LEVEL  = 4;
+DebugConsole.NONE_LEVEL   = 8;
+													
+DebugConsole.prototype.setLevel = function(level) {
+    this.logLevel = level;
+};
+
+/**
+ * Utility function for rendering and indenting strings, or serializing
+ * objects to a string capable of being printed to the console.
+ * @param {Object|String} message The string or object to convert to an indented string
+ * @private
+ */
+DebugConsole.prototype.processMessage = function(message, maxDepth) {
+	if (maxDepth === undefined) maxDepth = 0;
+    if (typeof(message) != 'object') {
+        return (this.isDeprecated ? "WARNING: debug object is deprecated, please use console object \n" + message : message);
+    } else {
+        /**
+         * @function
+         * @ignore
+         */
+        function indent(str) {
+            return str.replace(/^/mg, "    ");
+        }
+        /**
+         * @function
+         * @ignore
+         */
+        function makeStructured(obj, depth) {
+            var str = "";
+            for (var i in obj) {
+                try {
+                    if (typeof(obj[i]) == 'object' && depth < maxDepth) {
+                        str += i + ":\n" + indent(makeStructured(obj[i])) + "\n";
+                    } else {
+                        str += i + " = " + indent(String(obj[i])).replace(/^    /, "") + "\n";
+                    }
+                } catch(e) {
+                    str += i + " = EXCEPTION: " + e.message + "\n";
+                }
+            }
+            return str;
+        }
+        
+        return ("Object:\n" + makeStructured(message, maxDepth));
+    }
+};
+
+/**
+ * Print a normal log message to the console
+ * @param {Object|String} message Message or object to print to the console
+ */
+DebugConsole.prototype.log = function(message, maxDepth) {
+    if (PhoneGap.available && this.logLevel <= DebugConsole.INFO_LEVEL)
+        PhoneGap.exec(null, null, 'com.phonegap.debugconsole', 'log',
+            [ this.processMessage(message, maxDepth), { logLevel: 'INFO' } ]
+        );
+    else
+        this.winConsole.log(message);
+};
+
+/**
+ * Print a warning message to the console
+ * @param {Object|String} message Message or object to print to the console
+ */
+DebugConsole.prototype.warn = function(message, maxDepth) {
+    if (PhoneGap.available && this.logLevel <= DebugConsole.WARN_LEVEL)
+    	PhoneGap.exec(null, null, 'com.phonegap.debugconsole', 'log',
+            [ this.processMessage(message, maxDepth), { logLevel: 'WARN' } ]
+        );
+    else
+        this.winConsole.error(message);
+};
+
+/**
+ * Print an error message to the console
+ * @param {Object|String} message Message or object to print to the console
+ */
+DebugConsole.prototype.error = function(message, maxDepth) {
+    if (PhoneGap.available && this.logLevel <= DebugConsole.ERROR_LEVEL)
+		PhoneGap.exec(null, null, 'com.phonegap.debugconsole', 'log',
+            [ this.processMessage(message, maxDepth), { logLevel: 'ERROR' } ]
+        );
+    else
+        this.winConsole.error(message);
+};
+
+PhoneGap.addConstructor(function() {
+    window.console = new DebugConsole();
+});
+};
+if (!PhoneGap.hasResource("position")) {
+	PhoneGap.addResource("position");
+
+/**
+ * This class contains position information.
+ * @param {Object} lat
+ * @param {Object} lng
+ * @param {Object} acc
+ * @param {Object} alt
+ * @param {Object} altAcc
+ * @param {Object} head
+ * @param {Object} vel
+ * @constructor
+ */
+Position = function(coords, timestamp) {
+	this.coords = Coordinates.cloneFrom(coords);
+    this.timestamp = timestamp || new Date().getTime();
+};
+
+Position.prototype.equals = function(other) {
+    return (this.coords && other && other.coords &&
+            this.coords.latitude == other.coords.latitude &&
+            this.coords.longitude == other.coords.longitude);
+};
+
+Position.prototype.clone = function()
+{
+    return new Position(
+        this.coords? this.coords.clone() : null,
+        this.timestamp? this.timestamp : new Date().getTime()
+    );
+}
+
+Coordinates = function(lat, lng, alt, acc, head, vel, altAcc) {
+	/**
+	 * The latitude of the position.
+	 */
+	this.latitude = lat;
+	/**
+	 * The longitude of the position,
+	 */
+	this.longitude = lng;
+	/**
+	 * The altitude of the position.
+	 */
+	this.altitude = alt;
+	/**
+	 * The accuracy of the position.
+	 */
+	this.accuracy = acc;
+	/**
+	 * The direction the device is moving at the position.
+	 */
+	this.heading = head;
+	/**
+	 * The velocity with which the device is moving at the position.
+	 */
+	this.speed = vel;
+	/**
+	 * The altitude accuracy of the position.
+	 */
+	this.altitudeAccuracy = (altAcc != 'undefined') ? altAcc : null; 
+};
+
+Coordinates.prototype.clone = function()
+{
+    return new Coordinates(
+        this.latitude,
+        this.longitude,
+        this.altitude,
+        this.accuracy,
+        this.heading,
+        this.speed,
+        this.altitudeAccuracy
+    );
+};
+
+Coordinates.cloneFrom = function(obj)
+{
+    return new Coordinates(
+        obj.latitude,
+        obj.longitude,
+        obj.altitude,
+        obj.accuracy,
+        obj.heading,
+        obj.speed,
+        obj.altitudeAccuracy
+    );
+};
+
+/**
+ * This class specifies the options for requesting position data.
+ * @constructor
+ */
+PositionOptions = function(enableHighAccuracy, timeout, maximumAge) {
+	/**
+	 * Specifies the desired position accuracy.
+	 */
+	this.enableHighAccuracy = enableHighAccuracy || false;
+	/**
+	 * The timeout after which if position data cannot be obtained the errorCallback
+	 * is called.
+	 */
+	this.timeout = timeout || 10000;
+	/**
+     * The age of a cached position whose age is no greater than the specified time 
+     * in milliseconds. 
+     */
+	this.maximumAge = maximumAge || 0;
+	
+	if (this.maximumAge < 0) {
+		this.maximumAge = 0;
+	}
+};
+
+/**
+ * This class contains information about any GPS errors.
+ * @constructor
+ */
+PositionError = function(code, message) {
+	this.code = code || 0;
+	this.message = message || "";
+};
+
+PositionError.UNKNOWN_ERROR = 0;
+PositionError.PERMISSION_DENIED = 1;
+PositionError.POSITION_UNAVAILABLE = 2;
+PositionError.TIMEOUT = 3;
+
+};if (!PhoneGap.hasResource("acceleration")) {
+	PhoneGap.addResource("acceleration");
+ 	
+
+/**
+ * This class contains acceleration information
+ * @constructor
+ * @param {Number} x The force applied by the device in the x-axis.
+ * @param {Number} y The force applied by the device in the y-axis.
+ * @param {Number} z The force applied by the device in the z-axis.
+ */
+Acceleration = function(x, y, z) {
+	/**
+	 * The force applied by the device in the x-axis.
+	 */
+	this.x = x;
+	/**
+	 * The force applied by the device in the y-axis.
+	 */
+	this.y = y;
+	/**
+	 * The force applied by the device in the z-axis.
+	 */
+	this.z = z;
+	/**
+	 * The time that the acceleration was obtained.
+	 */
+	this.timestamp = new Date().getTime();
+}
+
+/**
+ * This class specifies the options for requesting acceleration data.
+ * @constructor
+ */
+AccelerationOptions = function() {
+	/**
+	 * The timeout after which if acceleration data cannot be obtained the errorCallback
+	 * is called.
+	 */
+	this.timeout = 10000;
+}
+};if (!PhoneGap.hasResource("accelerometer")) {
+	PhoneGap.addResource("accelerometer");
+
+/**
+ * This class provides access to device accelerometer data.
+ * @constructor
+ */
+Accelerometer = function() 
+{
+	/**
+	 * The last known acceleration.
+	 */
+	this.lastAcceleration = new Acceleration(0,0,0);
+}
+
+/**
+ * Asynchronously aquires the current acceleration.
+ * @param {Function} successCallback The function to call when the acceleration
+ * data is available
+ * @param {Function} errorCallback The function to call when there is an error 
+ * getting the acceleration data.
+ * @param {AccelerationOptions} options The options for getting the accelerometer data
+ * such as timeout.
+ */
+Accelerometer.prototype.getCurrentAcceleration = function(successCallback, errorCallback, options) {
+	// If the acceleration is available then call success
+	// If the acceleration is not available then call error
+	
+	// Created for iPhone, Iphone passes back _accel obj litteral
+	if (typeof successCallback == "function") {
+		successCallback(this.lastAcceleration);
+	}
+};
+
+// private callback called from Obj-C by name
+Accelerometer.prototype._onAccelUpdate = function(x,y,z)
+{
+   this.lastAcceleration = new Acceleration(x,y,z);
+};
+
+/**
+ * Asynchronously aquires the acceleration repeatedly at a given interval.
+ * @param {Function} successCallback The function to call each time the acceleration
+ * data is available
+ * @param {Function} errorCallback The function to call when there is an error 
+ * getting the acceleration data.
+ * @param {AccelerationOptions} options The options for getting the accelerometer data
+ * such as timeout.
+ */
+
+Accelerometer.prototype.watchAcceleration = function(successCallback, errorCallback, options) {
+	//this.getCurrentAcceleration(successCallback, errorCallback, options);
+	// TODO: add the interval id to a list so we can clear all watches
+ 	var frequency = (options != undefined && options.frequency != undefined) ? options.frequency : 10000;
+	var updatedOptions = {
+		desiredFrequency:frequency 
+	}
+	PhoneGap.exec(null, null, "com.phonegap.accelerometer", "start", [options]);
+
+	return setInterval(function() {
+		navigator.accelerometer.getCurrentAcceleration(successCallback, errorCallback, options);
+	}, frequency);
+};
+
+/**
+ * Clears the specified accelerometer watch.
+ * @param {String} watchId The ID of the watch returned from #watchAcceleration.
+ */
+Accelerometer.prototype.clearWatch = function(watchId) {
+	PhoneGap.exec(null, null, "com.phonegap.accelerometer", "stop", []);
+	clearInterval(watchId);
+};
+
+Accelerometer.install = function()
+{
+    if (typeof navigator.accelerometer == "undefined") {
+		navigator.accelerometer = new Accelerometer();
+	}
+};
+
+Accelerometer.installDeviceMotionHandler = function()
+{
+	if (!(window.DeviceMotionEvent == undefined)) {
+		// supported natively, so we don't have to add support
+		return;
+	}	
+	
+	var self = this;
+	var devicemotionEvent = 'devicemotion';
+	self.deviceMotionWatchId = null;
+	self.deviceMotionListenerCount = 0;
+	self.deviceMotionLastEventTimestamp = 0;
+	
+	// backup original `window.addEventListener`, `window.removeEventListener`
+    var _addEventListener = window.addEventListener;
+    var _removeEventListener = window.removeEventListener;
+													
+	var windowDispatchAvailable = !(window.dispatchEvent === undefined); // undefined in iOS 3.x
+													
+	var accelWin = function(acceleration) {
+		var evt = document.createEvent('Events');
+	    evt.initEvent(devicemotionEvent);
+	
+		evt.acceleration = null; // not all devices have gyroscope, don't care for now if we actually have it.
+		evt.rotationRate = null; // not all devices have gyroscope, don't care for now if we actually have it:
+		evt.accelerationIncludingGravity = acceleration; // accelerometer, all iOS devices have it
+		
+		var currentTime = new Date().getTime();
+		evt.interval =  (self.deviceMotionLastEventTimestamp == 0) ? 0 : (currentTime - self.deviceMotionLastEventTimestamp);
+		self.deviceMotionLastEventTimestamp = currentTime;
+		
+		if (windowDispatchAvailable) {
+			window.dispatchEvent(evt);
+		} else {
+			document.dispatchEvent(evt);
+		}
+	};
+	
+	var accelFail = function() {
+		
+	};
+													
+    // override `window.addEventListener`
+    window.addEventListener = function() {
+        if (arguments[0] === devicemotionEvent) {
+            ++(self.deviceMotionListenerCount);
+			if (self.deviceMotionListenerCount == 1) { // start
+				self.deviceMotionWatchId = navigator.accelerometer.watchAcceleration(accelWin, accelFail, { frequency:500});
+			}
+		} 
+													
+		if (!windowDispatchAvailable) {
+			return document.addEventListener.apply(this, arguments);
+		} else {
+			return _addEventListener.apply(this, arguments);
+		}
+    };	
+
+    // override `window.removeEventListener'
+    window.removeEventListener = function() {
+        if (arguments[0] === devicemotionEvent) {
+            --(self.deviceMotionListenerCount);
+			if (self.deviceMotionListenerCount == 0) { // stop
+				navigator.accelerometer.clearWatch(self.deviceMotionWatchId);
+			}
+		} 
+		
+		if (!windowDispatchAvailable) {
+			return document.removeEventListener.apply(this, arguments);
+		} else {
+			return _removeEventListener.apply(this, arguments);
+		}
+    };	
+};
+
+
+PhoneGap.addConstructor(Accelerometer.install);
+PhoneGap.addConstructor(Accelerometer.installDeviceMotionHandler);
+
+};
+if (!PhoneGap.hasResource("battery")) {
+PhoneGap.addResource("battery");
+
+/**
+ * This class contains information about the current battery status.
+ * @constructor
+ */
+var Battery = function() {
+    this._level = null;
+    this._isPlugged = null;
+    this._batteryListener = [];
+    this._lowListener = [];
+    this._criticalListener = [];
+};
+
+/**
+ * Registers as an event producer for battery events.
+ * 
+ * @param {Object} eventType
+ * @param {Object} handler
+ * @param {Object} add
+ */
+Battery.prototype.eventHandler = function(eventType, handler, add) {
+    var me = navigator.battery;
+    if (add) {
+        // If there are no current registered event listeners start the battery listener on native side.
+        if (me._batteryListener.length === 0 && me._lowListener.length === 0 && me._criticalListener.length === 0) {
+            PhoneGap.exec(me._status, me._error, "com.phonegap.battery", "start", []);
+        }
+        
+        // Register the event listener in the proper array
+        if (eventType === "batterystatus") {
+            var pos = me._batteryListener.indexOf(handler);
+            if (pos === -1) {
+            	me._batteryListener.push(handler);
+            }
+        } else if (eventType === "batterylow") {
+            var pos = me._lowListener.indexOf(handler);
+            if (pos === -1) {
+            	me._lowListener.push(handler);
+            }
+        } else if (eventType === "batterycritical") {
+            var pos = me._criticalListener.indexOf(handler);
+            if (pos === -1) {
+            	me._criticalListener.push(handler);
+            }
+        }
+    } else {
+        // Remove the event listener from the proper array
+        if (eventType === "batterystatus") {
+            var pos = me._batteryListener.indexOf(handler);
+            if (pos > -1) {
+                me._batteryListener.splice(pos, 1);        
+            }
+        } else if (eventType === "batterylow") {
+            var pos = me._lowListener.indexOf(handler);
+            if (pos > -1) {
+                me._lowListener.splice(pos, 1);        
+            }
+        } else if (eventType === "batterycritical") {
+            var pos = me._criticalListener.indexOf(handler);
+            if (pos > -1) {
+                me._criticalListener.splice(pos, 1);        
+            }
+        }
+        
+        // If there are no more registered event listeners stop the battery listener on native side.
+        if (me._batteryListener.length === 0 && me._lowListener.length === 0 && me._criticalListener.length === 0) {
+            PhoneGap.exec(null, null, "com.phonegap.battery", "stop", []);
+        }
+    }
+};
+
+/**
+ * Callback for battery status
+ * 
+ * @param {Object} info			keys: level, isPlugged
+ */
+Battery.prototype._status = function(info) {
+	if (info) {
+		var me = this;
+		if (me._level != info.level || me._isPlugged != info.isPlugged) {
+			// Fire batterystatus event
+			//PhoneGap.fireWindowEvent("batterystatus", info);
+			// use this workaround since iOS 3.x does have window.dispatchEvent
+			PhoneGap.fireEvent("batterystatus", window, info);	
+
+			// Fire low battery event
+			if (info.level == 20 || info.level == 5) {
+				if (info.level == 20) {
+					//PhoneGap.fireWindowEvent("batterylow", info);
+					// use this workaround since iOS 3.x does not have window.dispatchEvent
+					PhoneGap.fireEvent("batterylow", window, info);
+				}
+				else {
+					//PhoneGap.fireWindowEvent("batterycritical", info);
+					// use this workaround since iOS 3.x does not have window.dispatchEvent
+					PhoneGap.fireEvent("batterycritical", window, info);
+				}
+			}
+		}
+		me._level = info.level;
+		me._isPlugged = info.isPlugged;	
+	}
+};
+
+/**
+ * Error callback for battery start
+ */
+Battery.prototype._error = function(e) {
+    console.log("Error initializing Battery: " + e);
+};
+
+PhoneGap.addConstructor(function() {
+    if (typeof navigator.battery === "undefined") {
+        navigator.battery = new Battery();
+        PhoneGap.addWindowEventHandler("batterystatus", navigator.battery.eventHandler);
+        PhoneGap.addWindowEventHandler("batterylow", navigator.battery.eventHandler);
+        PhoneGap.addWindowEventHandler("batterycritical", navigator.battery.eventHandler);
+    }
+});
+}if (!PhoneGap.hasResource("camera")) {
+	PhoneGap.addResource("camera");
+	
+
+/**
+ * This class provides access to the device camera.
+ * @constructor
+ */
+Camera = function() {
+	
+}
+/**
+ *  Available Camera Options
+ *  {boolean} allowEdit - true to allow editing image, default = false
+ *	{number} quality 0-100 (low to high) default =  100
+ *  {Camera.DestinationType} destinationType default = DATA_URL
+ *	{Camera.PictureSourceType} sourceType default = CAMERA
+ *	{number} targetWidth - width in pixels to scale image default = 0 (no scaling)
+ *  {number} targetHeight - height in pixels to scale image default = 0 (no scaling)
+ *  {Camera.EncodingType} - encodingType default = JPEG
+ *  {boolean} correctOrientation - Rotate the image to correct for the orientation of the device during capture (iOS only)
+ *  {boolean} saveToPhotoAlbum - Save the image to the photo album on the device after capture (iOS only)
+ */
+/**
+ * Format of image that is returned from getPicture.
+ *
+ * Example: navigator.camera.getPicture(success, fail,
+ *              { quality: 80,
+ *                destinationType: Camera.DestinationType.DATA_URL,
+ *                sourceType: Camera.PictureSourceType.PHOTOLIBRARY})
+ */
+Camera.DestinationType = {
+    DATA_URL: 0,                // Return base64 encoded string
+    FILE_URI: 1                 // Return file uri 
+};
+Camera.prototype.DestinationType = Camera.DestinationType;
+
+/**
+ * Source to getPicture from.
+ *
+ * Example: navigator.camera.getPicture(success, fail,
+ *              { quality: 80,
+ *                destinationType: Camera.DestinationType.DATA_URL,
+ *                sourceType: Camera.PictureSourceType.PHOTOLIBRARY})
+ */
+Camera.PictureSourceType = {
+    PHOTOLIBRARY : 0,           // Choose image from picture library 
+    CAMERA : 1,                 // Take picture from camera
+    SAVEDPHOTOALBUM : 2         // Choose image from picture library 
+};
+Camera.prototype.PictureSourceType = Camera.PictureSourceType;
+
+/** 
+ * Encoding of image returned from getPicture. 
+ * 
+ * Example: navigator.camera.getPicture(success, fail, 
+ *              { quality: 80, 
+ *                destinationType: Camera.DestinationType.DATA_URL, 
+ *                sourceType: Camera.PictureSourceType.CAMERA, 
+ *                encodingType: Camera.EncodingType.PNG}) 
+ */ 
+Camera.EncodingType = { 
+	JPEG: 0,                    // Return JPEG encoded image 
+	PNG: 1                      // Return PNG encoded image 
+};
+Camera.prototype.EncodingType = Camera.EncodingType;
+
+/** 
+ * Type of pictures to select from.  Only applicable when
+ *	PictureSourceType is PHOTOLIBRARY or SAVEDPHOTOALBUM 
+ * 
+ * Example: navigator.camera.getPicture(success, fail, 
+ *              { quality: 80, 
+ *                destinationType: Camera.DestinationType.DATA_URL, 
+ *                sourceType: Camera.PictureSourceType.PHOTOLIBRARY, 
+ *                mediaType: Camera.MediaType.PICTURE}) 
+ */ 
+Camera.MediaType = { 
+	PICTURE: 0,             // allow selection of still pictures only. DEFAULT. Will return format specified via DestinationType
+	VIDEO: 1,                // allow selection of video only, ONLY RETURNS URL
+	ALLMEDIA : 2			// allow selection from all media types
+};
+Camera.prototype.MediaType = Camera.MediaType;
+
+/**
+ * Gets a picture from source defined by "options.sourceType", and returns the
+ * image as defined by the "options.destinationType" option.
+
+ * The defaults are sourceType=CAMERA and destinationType=DATA_URL.
+ *
+ * @param {Function} successCallback
+ * @param {Function} errorCallback
+ * @param {Object} options
+ */
+Camera.prototype.getPicture = function(successCallback, errorCallback, options) {
+	// successCallback required
+	if (typeof successCallback != "function") {
+        console.log("Camera Error: successCallback is not a function");
+        return;
+    }
+
+    // errorCallback optional
+    if (errorCallback && (typeof errorCallback != "function")) {
+        console.log("Camera Error: errorCallback is not a function");
+        return;
+    }
+	
+	PhoneGap.exec(successCallback, errorCallback, "com.phonegap.camera","getPicture",[options]);
+};
+
+
+
+PhoneGap.addConstructor(function() {
+    if (typeof navigator.camera == "undefined") navigator.camera = new Camera();
+});
+};
+
+if (!PhoneGap.hasResource("device")) {
+	PhoneGap.addResource("device");
+
+/**
+ * this represents the mobile device, and provides properties for inspecting the model, version, UUID of the
+ * phone, etc.
+ * @constructor
+ */
+Device = function() 
+{
+    this.platform = null;
+    this.version  = null;
+    this.name     = null;
+    this.phonegap      = null;
+    this.uuid     = null;
+    try 
+	{      
+		this.platform = DeviceInfo.platform;
+		this.version  = DeviceInfo.version;
+		this.name     = DeviceInfo.name;
+		this.phonegap = DeviceInfo.gap;
+		this.uuid     = DeviceInfo.uuid;
+
+    } 
+	catch(e) 
+	{
+        // TODO: 
+    }
+	this.available = PhoneGap.available = this.uuid != null;
+}
+
+PhoneGap.addConstructor(function() {
+	if (typeof navigator.device === "undefined") {
+    	navigator.device = window.device = new Device();
+	}
+});
+};
+if (!PhoneGap.hasResource("capture")) {
+	PhoneGap.addResource("capture");
+/**
+ * The CaptureError interface encapsulates all errors in the Capture API.
+ */
+function CaptureError() {
+   this.code = null;
+};
+
+// Capture error codes
+CaptureError.CAPTURE_INTERNAL_ERR = 0;
+CaptureError.CAPTURE_APPLICATION_BUSY = 1;
+CaptureError.CAPTURE_INVALID_ARGUMENT = 2;
+CaptureError.CAPTURE_NO_MEDIA_FILES = 3;
+CaptureError.CAPTURE_NOT_SUPPORTED = 20;
+
+/**
+ * The Capture interface exposes an interface to the camera and microphone of the hosting device.
+ */
+function Capture() {
+	this.supportedAudioModes = [];
+	this.supportedImageModes = [];
+	this.supportedVideoModes = [];
+};
+
+/**
+ * Launch audio recorder application for recording audio clip(s).
+ * 
+ * @param {Function} successCB
+ * @param {Function} errorCB
+ * @param {CaptureAudioOptions} options
+ *
+ * No audio recorder to launch for iOS - return CAPTURE_NOT_SUPPORTED
+ */
+Capture.prototype.captureAudio = function(successCallback, errorCallback, options) {
+	/*if (errorCallback && typeof errorCallback === "function") {
+		errorCallback({
+				"code": CaptureError.CAPTURE_NOT_SUPPORTED
+			});
+	}*/
+    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.mediacapture", "captureAudio", [options]);
+};
+
+/**
+ * Launch camera application for taking image(s).
+ * 
+ * @param {Function} successCB
+ * @param {Function} errorCB
+ * @param {CaptureImageOptions} options
+ */
+Capture.prototype.captureImage = function(successCallback, errorCallback, options) {
+    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.mediacapture", "captureImage", [options]);
+};
+
+/**
+ * Casts a PluginResult message property  (array of objects) to an array of MediaFile objects
+ * (used in Objective-C)
+ *
+ * @param {PluginResult} pluginResult
+ */
+Capture.prototype._castMediaFile = function(pluginResult) {
+    var mediaFiles = [];
+    var i;
+    for (i=0; i<pluginResult.message.length; i++) {
+        var mediaFile = new MediaFile();
+	    mediaFile.name = pluginResult.message[i].name;
+	    mediaFile.fullPath = pluginResult.message[i].fullPath;
+	    mediaFile.type = pluginResult.message[i].type;
+	    mediaFile.lastModifiedDate = pluginResult.message[i].lastModifiedDate;
+	    mediaFile.size = pluginResult.message[i].size;
+        mediaFiles.push(mediaFile);
+    }
+    pluginResult.message = mediaFiles;
+    return pluginResult;
+};
+
+/**
+ * Launch device camera application for recording video(s).
+ * 
+ * @param {Function} successCB
+ * @param {Function} errorCB
+ * @param {CaptureVideoOptions} options
+ */
+Capture.prototype.captureVideo = function(successCallback, errorCallback, options) {
+    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.mediacapture", "captureVideo", [options]);
+};
+
+/**
+ * Encapsulates a set of parameters that the capture device supports.
+ */
+function ConfigurationData() {
+    // The ASCII-encoded string in lower case representing the media type. 
+    this.type; 
+    // The height attribute represents height of the image or video in pixels. 
+    // In the case of a sound clip this attribute has value 0. 
+    this.height = 0;
+    // The width attribute represents width of the image or video in pixels. 
+    // In the case of a sound clip this attribute has value 0
+    this.width = 0;
+};
+
+/**
+ * Encapsulates all image capture operation configuration options.
+ */
+var CaptureImageOptions = function() {
+    // Upper limit of images user can take. Value must be equal or greater than 1.
+    this.limit = 1; 
+    // The selected image mode. Must match with one of the elements in supportedImageModes array.
+    this.mode = null; 
+};
+
+/**
+ * Encapsulates all video capture operation configuration options.
+ */
+var CaptureVideoOptions = function() {
+    // Upper limit of videos user can record. Value must be equal or greater than 1.
+    this.limit = 1;
+    // Maximum duration of a single video clip in seconds.
+    this.duration = 0;
+    // The selected video mode. Must match with one of the elements in supportedVideoModes array.
+    this.mode = null;
+};
+
+/**
+ * Encapsulates all audio capture operation configuration options.
+ */
+var CaptureAudioOptions = function() {
+    // Upper limit of sound clips user can record. Value must be equal or greater than 1.
+    this.limit = 1;
+    // Maximum duration of a single sound clip in seconds.
+    this.duration = 0;
+    // The selected audio mode. Must match with one of the elements in supportedAudioModes array.
+    this.mode = null;
+};
+
+/**
+ * Represents a single file.
+ * 
+ * name {DOMString} name of the file, without path information
+ * fullPath {DOMString} the full path of the file, including the name
+ * type {DOMString} mime type
+ * lastModifiedDate {Date} last modified date
+ * size {Number} size of the file in bytes
+ */
+function MediaFile(name, fullPath, type, lastModifiedDate, size) {
+    this.name = name || null;
+    this.fullPath = fullPath || null;
+    this.type = type || null;
+    this.lastModifiedDate = lastModifiedDate || null;
+    this.size = size || 0;
+}
+
+/**
+ * Request capture format data for a specific file and type
+ * 
+ * @param {Function} successCB
+ * @param {Function} errorCB
+ */
+MediaFile.prototype.getFormatData = function(successCallback, errorCallback) {
+	if (typeof this.fullPath === "undefined" || this.fullPath === null) {
+		errorCallback({
+				"code": CaptureError.CAPTURE_INVALID_ARGUMENT
+			});
+	} else {
+    	PhoneGap.exec(successCallback, errorCallback, "com.phonegap.mediacapture", "getFormatData", [this.fullPath, this.type]);
+	}	
+};
+
+/**
+ * MediaFileData encapsulates format information of a media file.
+ * 
+ * @param {DOMString} codecs
+ * @param {long} bitrate
+ * @param {long} height
+ * @param {long} width
+ * @param {float} duration
+ */
+function MediaFileData(codecs, bitrate, height, width, duration) {
+    this.codecs = codecs || null;
+    this.bitrate = bitrate || 0;
+    this.height = height || 0;
+    this.width = width || 0;
+    this.duration = duration || 0;
+}
+
+PhoneGap.addConstructor(function() {
+    if (typeof navigator.device === "undefined") {
+        navigator.device = window.device = new Device();
+    }
+    if (typeof navigator.device.capture === "undefined") {
+        navigator.device.capture = window.device.capture = new Capture();
+    }
+});
+};
+if (!PhoneGap.hasResource("contact")) {
+	PhoneGap.addResource("contact");
+
+
+/**
+* Contains information about a single contact.
+* @param {DOMString} id unique identifier
+* @param {DOMString} displayName
+* @param {ContactName} name
+* @param {DOMString} nickname
+* @param {ContactField[]} phoneNumbers array of phone numbers
+* @param {ContactField[]} emails array of email addresses
+* @param {ContactAddress[]} addresses array of addresses
+* @param {ContactField[]} ims instant messaging user ids
+* @param {ContactOrganization[]} organizations
+* @param {DOMString} birthday contact's birthday
+* @param {DOMString} note user notes about contact
+* @param {ContactField[]} photos
+* @param {Array.<ContactField>} categories
+* @param {ContactField[]} urls contact's web sites
+*/
+var Contact = function(id, displayName, name, nickname, phoneNumbers, emails, addresses,
+    ims, organizations, birthday, note, photos, categories, urls) {
+    this.id = id || null;
+    this.displayName = displayName || null;
+    this.name = name || null; // ContactName
+    this.nickname = nickname || null;
+    this.phoneNumbers = phoneNumbers || null; // ContactField[]
+    this.emails = emails || null; // ContactField[]
+    this.addresses = addresses || null; // ContactAddress[]
+    this.ims = ims || null; // ContactField[]
+    this.organizations = organizations || null; // ContactOrganization[]
+    this.birthday = birthday || null; // JS Date
+    this.note = note || null;
+    this.photos = photos || null; // ContactField[]
+    this.categories = categories || null; 
+    this.urls = urls || null; // ContactField[]
+};
+
+/**
+* Converts Dates to milliseconds before sending to iOS
+*/
+Contact.prototype.convertDatesOut = function()
+{
+	var dates = new Array("birthday");
+	for (var i=0; i<dates.length; i++){
+		var value = this[dates[i]];
+		if (value){
+			if (!value instanceof Date){
+				try {
+					value = new Date(value);
+				} catch(exception){
+					value = null;
+				}
+			}
+			if (value instanceof Date){
+				value = value.valueOf();
+			}
+			this[dates[i]] = value;
+		}
+	}
+	
+};
+/**
+* Converts milliseconds to JS Date when returning from iOS
+*/
+Contact.prototype.convertDatesIn = function()
+{
+	var dates = new Array("birthday");
+	for (var i=0; i<dates.length; i++){
+		var value = this[dates[i]];
+		if (value){
+			try {
+				this[dates[i]] = new Date(parseFloat(value));
+			} catch (exception){
+				console.log("exception creating date");
+			}
+		}
+	}
+};
+/**
+* Removes contact from device storage.
+* @param successCB success callback
+* @param errorCB error callback (optional)
+*/
+Contact.prototype.remove = function(successCB, errorCB) {
+	if (this.id == null) {
+        var errorObj = new ContactError();
+        errorObj.code = ContactError.UNKNOWN_ERROR;
+        errorCB(errorObj);
+    }
+    else {
+        PhoneGap.exec(successCB, errorCB, "com.phonegap.contacts", "remove", [{ "contact": this}]);
+    }
+};
+/**
+* iOS ONLY
+* displays contact via iOS UI
+*	NOT part of W3C spec so no official documentation
+*
+* @param errorCB error callback
+* @param options object
+*	allowsEditing: boolean AS STRING
+*		"true" to allow editing the contact
+*		"false" (default) display contact
+*/
+Contact.prototype.display = function(errorCB, options) { 
+	if (this.id == null) {
+        if (typeof errorCB == "function") {
+        	var errorObj = new ContactError();
+        	errorObj.code = ContactError.UNKNOWN_ERROR;
+        	errorCB(errorObj);
+		}
+    }
+    else {
+        PhoneGap.exec(null, errorCB, "com.phonegap.contacts","displayContact", [this.id, options]);
+    }
+};
+
+/**
+* Creates a deep copy of this Contact.
+* With the contact ID set to null.
+* @return copy of this Contact
+*/
+Contact.prototype.clone = function() {
+    var clonedContact = PhoneGap.clone(this);
+    clonedContact.id = null;
+    // Loop through and clear out any id's in phones, emails, etc.
+    if (clonedContact.phoneNumbers) {
+    	for (i=0; i<clonedContact.phoneNumbers.length; i++) {
+    		clonedContact.phoneNumbers[i].id = null;
+    	}
+    }
+    if (clonedContact.emails) {
+    	for (i=0; i<clonedContact.emails.length; i++) {
+    		clonedContact.emails[i].id = null;
+    	}
+    }
+    if (clonedContact.addresses) {
+    	for (i=0; i<clonedContact.addresses.length; i++) {
+    		clonedContact.addresses[i].id = null;
+    	}
+    }
+    if (clonedContact.ims) {
+    	for (i=0; i<clonedContact.ims.length; i++) {
+    		clonedContact.ims[i].id = null;
+    	}
+    }
+    if (clonedContact.organizations) {
+    	for (i=0; i<clonedContact.organizations.length; i++) {
+    		clonedContact.organizations[i].id = null;
+    	}
+    }
+    if (clonedContact.photos) {
+    	for (i=0; i<clonedContact.photos.length; i++) {
+    		clonedContact.photos[i].id = null;
+    	}
+    }
+    if (clonedContact.urls) {
+    	for (i=0; i<clonedContact.urls.length; i++) {
+    		clonedContact.urls[i].id = null;
+    	}
+    }
+    return clonedContact;
+};
+
+/**
+* Persists contact to device storage.
+* @param successCB success callback
+* @param errorCB error callback - optional
+*/
+Contact.prototype.save = function(successCB, errorCB) {
+	// don't modify the original contact
+	var cloned = PhoneGap.clone(this);
+	cloned.convertDatesOut(); 
+	PhoneGap.exec(successCB, errorCB, "com.phonegap.contacts","save", [{"contact": cloned}]);
+};
+
+/**
+* Contact name.
+* @param formatted
+* @param familyName
+* @param givenName
+* @param middle
+* @param prefix
+* @param suffix
+*/
+var ContactName = function(formatted, familyName, givenName, middle, prefix, suffix) {
+    this.formatted = formatted != "undefined" ? formatted : null;
+    this.familyName = familyName != "undefined" ? familyName : null;
+    this.givenName = givenName != "undefined" ? givenName : null;
+    this.middleName = middle != "undefined" ? middle : null;
+    this.honorificPrefix = prefix != "undefined" ? prefix : null;
+    this.honorificSuffix = suffix != "undefined" ? suffix : null;
+};
+
+/**
+* Generic contact field.
+* @param type
+* @param value
+* @param pref
+* @param id
+*/
+var ContactField = function(type, value, pref, id) {
+    this.type = type != "undefined" ? type : null;
+    this.value = value != "undefined" ? value : null;
+    this.pref = pref != "undefined" ? pref : null;
+    this.id = id != "undefined" ? id : null;
+};
+
+/**
+* Contact address.
+* @param pref - boolean is primary / preferred address
+* @param type - string - work, home…..
+* @param formatted
+* @param streetAddress
+* @param locality
+* @param region
+* @param postalCode
+* @param country
+*/
+var ContactAddress = function(pref, type, formatted, streetAddress, locality, region, postalCode, country, id) {
+	this.pref = pref != "undefined" ? pref : null;
+	this.type = type != "undefined" ? type : null;
+    this.formatted = formatted != "undefined" ? formatted : null;
+    this.streetAddress = streetAddress != "undefined" ? streetAddress : null;
+    this.locality = locality != "undefined" ? locality : null;
+    this.region = region != "undefined" ? region : null;
+    this.postalCode = postalCode != "undefined" ? postalCode : null;
+    this.country = country != "undefined" ? country : null;
+    this.id = id != "undefined" ? id : null;
+};
+
+/**
+* Contact organization.
+* @param pref - boolean is primary / preferred address
+* @param type - string - work, home…..
+* @param name
+* @param dept
+* @param title
+*/
+var ContactOrganization = function(pref, type, name, dept, title) {
+	this.pref = pref != "undefined" ? pref : null;
+	this.type = type != "undefined" ? type : null;
+    this.name = name != "undefined" ? name : null;
+    this.department = dept != "undefined" ? dept : null;
+    this.title = title != "undefined" ? title : null;
+};
+
+/**
+* Contact account.
+* @param domain
+* @param username
+* @param userid
+*/
+/*var ContactAccount = function(domain, username, userid) {
+    this.domain = domain != "undefined" ? domain : null;
+    this.username = username != "undefined" ? username : null;
+    this.userid = userid != "undefined" ? userid : null;
+}*/
+
+/**
+* Represents a group of Contacts.
+*/
+var Contacts = function() {
+    this.inProgress = false;
+    this.records = new Array();
+};
+/**
+* Returns an array of Contacts matching the search criteria.
+* @param fields that should be searched
+* @param successCB success callback
+* @param errorCB error callback (optional)
+* @param {ContactFindOptions} options that can be applied to contact searching
+* @return array of Contacts matching search criteria
+*/
+Contacts.prototype.find = function(fields, successCB, errorCB, options) {
+	if (successCB === null) {
+        throw new TypeError("You must specify a success callback for the find command.");
+    }
+    if (fields === null || fields === "undefined" || fields.length === "undefined" || fields.length <= 0) {
+    	if (typeof errorCB === "function") {
+			errorCB({"code": ContactError.INVALID_ARGUMENT_ERROR});
+    	}
+    } else {
+		PhoneGap.exec(successCB, errorCB, "com.phonegap.contacts","search", [{"fields":fields, "findOptions":options}]);
+    }
+};
+/**
+* need to turn the array of JSON strings representing contact objects into actual objects
+* @param array of JSON strings with contact data
+* @return call results callback with array of Contact objects
+*  This function is called from objective C Contacts.search() method.
+*/
+Contacts.prototype._findCallback = function(pluginResult) {
+	var contacts = new Array();
+	try {
+		for (var i=0; i<pluginResult.message.length; i++) {
+			var newContact = navigator.contacts.create(pluginResult.message[i]); 
+			newContact.convertDatesIn();
+			contacts.push(newContact);
+		}
+		pluginResult.message = contacts;
+	} catch(e){
+			console.log("Error parsing contacts: " +e);
+	}
+	return pluginResult;
+}
+
+/**
+* need to turn the JSON string representing contact object into actual object
+* @param JSON string with contact data
+* Call stored results function with  Contact object
+*  This function is called from objective C Contacts remove and save methods
+*/
+Contacts.prototype._contactCallback = function(pluginResult)
+{
+	var newContact = null;
+	if (pluginResult.message){
+		try {
+			newContact = navigator.contacts.create(pluginResult.message);
+			newContact.convertDatesIn();
+		} catch(e){
+			console.log("Error parsing contact");
+		}
+	}
+	pluginResult.message = newContact;
+	return pluginResult;
+	
+};
+/** 
+* Need to return an error object rather than just a single error code
+* @param error code
+* Call optional error callback if found.
+* Called from objective c find, remove, and save methods on error.
+*/
+Contacts.prototype._errCallback = function(pluginResult)
+{
+	var errorObj = new ContactError();
+   	errorObj.code = pluginResult.message;
+	pluginResult.message = errorObj;
+	return pluginResult;
+};
+// iPhone only api to create a new contact via the GUI
+Contacts.prototype.newContactUI = function(successCallback) { 
+    PhoneGap.exec(successCallback, null, "com.phonegap.contacts","newContact", []);
+};
+// iPhone only api to select a contact via the GUI
+Contacts.prototype.chooseContact = function(successCallback, options) {
+    PhoneGap.exec(successCallback, null, "com.phonegap.contacts","chooseContact", options);
+};
+
+
+/**
+* This function creates a new contact, but it does not persist the contact
+* to device storage. To persist the contact to device storage, invoke
+* contact.save().
+* @param properties an object who's properties will be examined to create a new Contact
+* @returns new Contact object
+*/
+Contacts.prototype.create = function(properties) {
+    var i;
+    var contact = new Contact();
+    for (i in properties) {
+        if (contact[i] !== 'undefined') {
+            contact[i] = properties[i];
+        }
+    }
+    return contact;
+};
+
+/**
+ * ContactFindOptions.
+ * @param filter used to match contacts against
+ * @param multiple boolean used to determine if more than one contact should be returned
+ */
+var ContactFindOptions = function(filter, multiple, updatedSince) {
+    this.filter = filter || '';
+    this.multiple = multiple || false;
+};
+
+/**
+ *  ContactError.
+ *  An error code assigned by an implementation when an error has occurred
+ */
+var ContactError = function() {
+    this.code=null;
+};
+
+/**
+ * Error codes
+ */
+ContactError.UNKNOWN_ERROR = 0;
+ContactError.INVALID_ARGUMENT_ERROR = 1;
+ContactError.TIMEOUT_ERROR = 2;
+ContactError.PENDING_OPERATION_ERROR = 3;
+ContactError.IO_ERROR = 4;
+ContactError.NOT_SUPPORTED_ERROR = 5;
+ContactError.PERMISSION_DENIED_ERROR = 20;
+
+/**
+ * Add the contact interface into the browser.
+ */
+PhoneGap.addConstructor(function() { 
+    if(typeof navigator.contacts == "undefined") {
+    	navigator.contacts = new Contacts();
+    }
+});
+};
+if (!PhoneGap.hasResource("file")) {
+	PhoneGap.addResource("file");
+
+/**
+ * This class provides generic read and write access to the mobile device file system.
+ * They are not used to read files from a server.
+ */
+
+/**
+ * This class provides some useful information about a file.
+ * This is the fields returned when navigator.fileMgr.getFileProperties() 
+ * is called.
+ */
+FileProperties = function(filePath) {
+    this.filePath = filePath;
+    this.size = 0;
+    this.lastModifiedDate = null;
+}
+/**
+ * Represents a single file.
+ * 
+ * name {DOMString} name of the file, without path information
+ * fullPath {DOMString} the full path of the file, including the name
+ * type {DOMString} mime type
+ * lastModifiedDate {Date} last modified date
+ * size {Number} size of the file in bytes
+ */
+File = function(name, fullPath, type, lastModifiedDate, size) {
+	this.name = name || null;
+    this.fullPath = fullPath || null;
+	this.type = type || null;
+    this.lastModifiedDate = lastModifiedDate || null;
+    this.size = size || 0;
+}
+/**
+ * Create an event object since we can't set target on DOM event.
+ *
+ * @param type
+ * @param target
+ *
+ */
+File._createEvent = function(type, target) {
+    // Can't create event object, since we can't set target (its readonly)
+    //var evt = document.createEvent('Events');
+    //evt.initEvent("onload", false, false);
+    var evt = {"type": type};
+    evt.target = target;
+    return evt;
+};
+
+FileError = function() {
+   this.code = null;
+}
+
+// File error codes
+// Found in DOMException
+FileError.NOT_FOUND_ERR = 1;
+FileError.SECURITY_ERR = 2;
+FileError.ABORT_ERR = 3;
+
+// Added by this specification
+FileError.NOT_READABLE_ERR = 4;
+FileError.ENCODING_ERR = 5;
+FileError.NO_MODIFICATION_ALLOWED_ERR = 6;
+FileError.INVALID_STATE_ERR = 7;
+FileError.SYNTAX_ERR = 8;
+FileError.INVALID_MODIFICATION_ERR = 9;
+FileError.QUOTA_EXCEEDED_ERR = 10;
+FileError.TYPE_MISMATCH_ERR = 11;
+FileError.PATH_EXISTS_ERR = 12;
+
+//-----------------------------------------------------------------------------
+// File manager
+//-----------------------------------------------------------------------------
+
+FileMgr = function() {
+}
+
+FileMgr.prototype.testFileExists = function(fileName, successCallback, errorCallback) {
+    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "testFileExists", [fileName]);
+};
+
+FileMgr.prototype.testDirectoryExists = function(dirName, successCallback, errorCallback) {
+    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "testDirectoryExists", [dirName]);
+};
+
+FileMgr.prototype.getFreeDiskSpace = function(successCallback, errorCallback) {
+    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "getFreeDiskSpace", []);
+};
+
+FileMgr.prototype.write = function(fileName, data, position, successCallback, errorCallback) {
+    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "write", [fileName, data, position]);
+};
+
+FileMgr.prototype.truncate = function(fileName, size, successCallback, errorCallback) {
+    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "truncateFile", [fileName, size]);
+};
+
+FileMgr.prototype.readAsText = function(fileName, encoding, successCallback, errorCallback) {
+    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "readFile", [fileName, encoding]);
+};
+
+FileMgr.prototype.readAsDataURL = function(fileName, successCallback, errorCallback) {
+	PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "readAsDataURL", [fileName]);
+};
+
+PhoneGap.addConstructor(function() {
+    if (typeof navigator.fileMgr === "undefined") {
+        navigator.fileMgr = new FileMgr();
+    }
+});
+
+
+//-----------------------------------------------------------------------------
+// File Reader
+//-----------------------------------------------------------------------------
+
+/**
+ * This class reads the mobile device file system.
+ *
+ */
+FileReader = function() {
+    this.fileName = "";
+
+    this.readyState = 0;
+
+    // File data
+    this.result = null;
+
+    // Error
+    this.error = null;
+
+    // Event handlers
+    this.onloadstart = null;    // When the read starts.
+    this.onprogress = null;     // While reading (and decoding) file or fileBlob data, and reporting partial file data (progess.loaded/progress.total)
+    this.onload = null;         // When the read has successfully completed.
+    this.onerror = null;        // When the read has failed (see errors).
+    this.onloadend = null;      // When the request has completed (either in success or failure).
+    this.onabort = null;        // When the read has been aborted. For instance, by invoking the abort() method.
+}
+
+// States
+FileReader.EMPTY = 0;
+FileReader.LOADING = 1;
+FileReader.DONE = 2;
+
+/**
+ * Abort reading file.
+ */
+FileReader.prototype.abort = function() {
+    var evt;
+    this.readyState = FileReader.DONE;
+    this.result = null;
+
+    // set error
+    var error = new FileError();
+    error.code = error.ABORT_ERR;
+    this.error = error;
+   
+    // If error callback
+    if (typeof this.onerror === "function") {
+        evt = File._createEvent("error", this);
+        this.onerror(evt);
+    }
+    // If abort callback
+    if (typeof this.onabort === "function") {
+        evt = File._createEvent("abort", this);
+        this.onabort(evt);
+    }
+    // If load end callback
+    if (typeof this.onloadend === "function") {
+        evt = File._createEvent("loadend", this);
+        this.onloadend(evt);
+    }
+};
+
+/**
+ * Read text file.
+ *
+ * @param file          The name of the file
+ * @param encoding      [Optional] (see http://www.iana.org/assignments/character-sets)
+ */
+FileReader.prototype.readAsText = function(file, encoding) {
+    this.fileName = "";
+	if (typeof file.fullPath === "undefined") {
+		this.fileName = file;
+	} else {
+		this.fileName = file.fullPath;
+	}
+
+    // LOADING state
+    this.readyState = FileReader.LOADING;
+
+    // If loadstart callback
+    if (typeof this.onloadstart === "function") {
+        var evt = File._createEvent("loadstart", this);
+        this.onloadstart(evt);
+    }
+
+    // Default encoding is UTF-8
+    var enc = encoding ? encoding : "UTF-8";
+
+    var me = this;
+
+    // Read file
+    navigator.fileMgr.readAsText(this.fileName, enc,
+
+        // Success callback
+        function(r) {
+            var evt;
+
+            // If DONE (cancelled), then don't do anything
+            if (me.readyState === FileReader.DONE) {
+                return;
+            }
+
+            // Save result
+            me.result = decodeURIComponent(r);
+
+            // If onload callback
+            if (typeof me.onload === "function") {
+                evt = File._createEvent("load", me);
+                me.onload(evt);
+            }
+
+            // DONE state
+            me.readyState = FileReader.DONE;
+
+            // If onloadend callback
+            if (typeof me.onloadend === "function") {
+                evt = File._createEvent("loadend", me);
+                me.onloadend(evt);
+            }
+        },
+
+        // Error callback
+        function(e) {
+            var evt;
+            // If DONE (cancelled), then don't do anything
+            if (me.readyState === FileReader.DONE) {
+                return;
+            }
+
+            // Save error
+            me.error = e;
+
+            // If onerror callback
+            if (typeof me.onerror === "function") {
+                evt = File._createEvent("error", me);
+                me.onerror(evt);
+            }
+
+            // DONE state
+            me.readyState = FileReader.DONE;
+
+            // If onloadend callback
+            if (typeof me.onloadend === "function") {
+                evt = File._createEvent("loadend", me);
+                me.onloadend(evt);
+            }
+        }
+        );
+};
+
+
+/**
+ * Read file and return data as a base64 encoded data url.
+ * A data url is of the form:
+ *      data:[<mediatype>][;base64],<data>
+ *
+ * @param file          {File} File object containing file properties
+ */
+FileReader.prototype.readAsDataURL = function(file) {
+    this.fileName = "";
+    
+    if (typeof file.fullPath === "undefined") {
+        this.fileName = file;
+    } else {
+        this.fileName = file.fullPath;
+    }
+
+    // LOADING state
+    this.readyState = FileReader.LOADING;
+
+    // If loadstart callback
+    if (typeof this.onloadstart === "function") {
+        var evt = File._createEvent("loadstart", this);
+        this.onloadstart(evt);
+    }
+
+    var me = this;
+
+    // Read file
+    navigator.fileMgr.readAsDataURL(this.fileName,
+
+        // Success callback
+        function(r) {
+            var evt;
+
+            // If DONE (cancelled), then don't do anything
+            if (me.readyState === FileReader.DONE) {
+                return;
+            }
+
+            // Save result
+            me.result = r;
+
+            // If onload callback
+            if (typeof me.onload === "function") {
+                evt = File._createEvent("load", me);
+                me.onload(evt);
+            }
+
+            // DONE state
+            me.readyState = FileReader.DONE;
+
+            // If onloadend callback
+            if (typeof me.onloadend === "function") {
+                evt = File._createEvent("loadend", me);
+                me.onloadend(evt);
+            }
+        },
+
+        // Error callback
+        function(e) {
+            var evt;
+            // If DONE (cancelled), then don't do anything
+            if (me.readyState === FileReader.DONE) {
+                return;
+            }
+
+            // Save error
+            me.error = e;
+
+            // If onerror callback
+            if (typeof me.onerror === "function") {
+                evt = File._createEvent("error", me);
+                me.onerror(evt);
+            }
+
+            // DONE state
+            me.readyState = FileReader.DONE;
+
+            // If onloadend callback
+            if (typeof me.onloadend === "function") {
+                evt = File._createEvent("loadend", me);
+                me.onloadend(evt);
+            }
+        }
+        );
+};
+
+/**
+ * Read file and return data as a binary data.
+ *
+ * @param file          The name of the file
+ */
+FileReader.prototype.readAsBinaryString = function(file) {
+    // TODO - Can't return binary data to browser.
+    this.fileName = file;
+};
+
+/**
+ * Read file and return data as a binary data.
+ *
+ * @param file          The name of the file
+ */
+FileReader.prototype.readAsArrayBuffer = function(file) {
+    // TODO - Can't return binary data to browser.
+    this.fileName = file;
+};
+
+//-----------------------------------------------------------------------------
+// File Writer
+//-----------------------------------------------------------------------------
+
+/**
+ * This class writes to the mobile device file system.
+ *
+  @param file {File} a File object representing a file on the file system
+*/
+FileWriter = function(file) {
+    this.fileName = "";
+    this.length = 0;
+	if (file) {
+	    this.fileName = file.fullPath || file;
+	    this.length = file.size || 0;
+	}
+	
+	// default is to write at the beginning of the file
+    this.position = 0;
+    
+    this.readyState = 0; // EMPTY
+
+    this.result = null;
+
+    // Error
+    this.error = null;
+
+    // Event handlers
+    this.onwritestart = null;	// When writing starts
+    this.onprogress = null;		// While writing the file, and reporting partial file data
+    this.onwrite = null;		// When the write has successfully completed.
+    this.onwriteend = null;		// When the request has completed (either in success or failure).
+    this.onabort = null;		// When the write has been aborted. For instance, by invoking the abort() method.
+    this.onerror = null;		// When the write has failed (see errors).
+}
+
+// States
+FileWriter.INIT = 0;
+FileWriter.WRITING = 1;
+FileWriter.DONE = 2;
+
+/**
+ * Abort writing file.
+ */
+FileWriter.prototype.abort = function() {
+    // check for invalid state
+	if (this.readyState === FileWriter.DONE || this.readyState === FileWriter.INIT) {
+		throw FileError.INVALID_STATE_ERR;
+	} 
+
+    // set error
+    var error = new FileError(), evt;
+    error.code = error.ABORT_ERR;
+    this.error = error;
+    
+    // If error callback
+    if (typeof this.onerror === "function") {
+        evt = File._createEvent("error", this);
+        this.onerror(evt);
+    }
+    // If abort callback
+    if (typeof this.onabort === "function") {
+        evt = File._createEvent("abort", this);
+        this.onabort(evt);
+    }
+    
+    this.readyState = FileWriter.DONE;
+
+    // If write end callback
+    if (typeof this.onwriteend == "function") {
+        evt = File._createEvent("writeend", this);
+        this.onwriteend(evt);
+    }
+};
+
+/**
+ * @Deprecated: use write instead
+ * 
+ * @param file to write the data to
+ * @param text to be written
+ * @param bAppend if true write to end of file, otherwise overwrite the file
+ */
+FileWriter.prototype.writeAsText = function(file, text, bAppend) {
+	// Throw an exception if we are already writing a file
+	if (this.readyState === FileWriter.WRITING) {
+		throw FileError.INVALID_STATE_ERR;
+	}
+
+	if (bAppend !== true) {
+        bAppend = false; // for null values
+    }
+
+    this.fileName = file;
+
+    // WRITING state
+    this.readyState = FileWriter.WRITING;
+
+    var me = this;
+
+    // If onwritestart callback
+    if (typeof me.onwritestart === "function") {
+        var evt = File._createEvent("writestart", me);
+        me.onwritestart(evt);
+    }
+	
+	
+    // Write file 
+	navigator.fileMgr.writeAsText(file, text, bAppend,
+        // Success callback
+        function(r) {
+            var evt;
+
+            // If DONE (cancelled), then don't do anything
+            if (me.readyState === FileWriter.DONE) {
+                return;
+            }
+
+            // Save result
+            me.result = r;
+
+            // If onwrite callback
+            if (typeof me.onwrite === "function") {
+                evt = File._createEvent("write", me);
+                me.onwrite(evt);
+            }
+
+            // DONE state
+            me.readyState = FileWriter.DONE;
+
+            // If onwriteend callback
+            if (typeof me.onwriteend === "function") {
+                evt = File._createEvent("writeend", me);
+                me.onwriteend(evt);
+            }
+        },
+
+        // Error callback
+        function(e) {
+            var evt;
+
+            // If DONE (cancelled), then don't do anything
+            if (me.readyState === FileWriter.DONE) {
+                return;
+            }
+
+            // Save error
+            me.error = e;
+
+            // If onerror callback
+            if (typeof me.onerror === "function") {
+                evt = File._createEvent("error", me);
+                me.onerror(evt);
+            }
+
+            // DONE state
+            me.readyState = FileWriter.DONE;
+
+            // If onwriteend callback
+            if (typeof me.onwriteend === "function") {
+                evt = File._createEvent("writeend", me);
+                me.onwriteend(evt);
+            }
+        }
+    );
+};
+
+/**
+ * Writes data to the file
+ *  
+ * @param text to be written
+ */
+FileWriter.prototype.write = function(text) {
+	// Throw an exception if we are already writing a file
+	if (this.readyState === FileWriter.WRITING) {
+		throw FileError.INVALID_STATE_ERR;
+	}
+
+    // WRITING state
+    this.readyState = FileWriter.WRITING;
+
+    var me = this;
+
+    // If onwritestart callback
+    if (typeof me.onwritestart === "function") {
+        var evt = File._createEvent("writestart", me);
+        me.onwritestart(evt);
+    }
+
+    // Write file
+    navigator.fileMgr.write(this.fileName, text, this.position,
+
+        // Success callback
+        function(r) {
+            var evt;
+            // If DONE (cancelled), then don't do anything
+            if (me.readyState === FileWriter.DONE) {
+                return;
+            }
+
+            
+            // position always increases by bytes written because file would be extended
+            me.position += r;
+			// The length of the file is now where we are done writing.
+			me.length = me.position;
+            
+            // If onwrite callback
+            if (typeof me.onwrite === "function") {
+                evt = File._createEvent("write", me);
+                me.onwrite(evt);
+            }
+
+            // DONE state
+            me.readyState = FileWriter.DONE;
+
+            // If onwriteend callback
+            if (typeof me.onwriteend === "function") {
+                evt = File._createEvent("writeend", me);
+                me.onwriteend(evt);
+            }
+        },
+
+        // Error callback
+        function(e) {
+            var evt;
+
+            // If DONE (cancelled), then don't do anything
+            if (me.readyState === FileWriter.DONE) {
+                return;
+            }
+
+            // Save error
+            me.error = e;
+
+            // If onerror callback
+            if (typeof me.onerror === "function") {
+                evt = File._createEvent("error", me);
+                me.onerror(evt);
+            }
+
+            // DONE state
+            me.readyState = FileWriter.DONE;
+
+            // If onwriteend callback
+            if (typeof me.onwriteend === "function") {
+                evt = File._createEvent("writeend", me);
+                me.onwriteend(evt);
+            }
+        }
+        );
+
+};
+
+/** 
+ * Moves the file pointer to the location specified.
+ * 
+ * If the offset is a negative number the position of the file 
+ * pointer is rewound.  If the offset is greater than the file 
+ * size the position is set to the end of the file.  
+ * 
+ * @param offset is the location to move the file pointer to.
+ */
+FileWriter.prototype.seek = function(offset) {
+    // Throw an exception if we are already writing a file
+    if (this.readyState === FileWriter.WRITING) {
+        throw FileError.INVALID_STATE_ERR;
+    }
+
+    if (!offset) {
+        return;
+    }
+    
+    // See back from end of file.
+    if (offset < 0) {
+		this.position = Math.max(offset + this.length, 0);
+	}
+    // Offset is bigger then file size so set position 
+    // to the end of the file.
+	else if (offset > this.length) {
+		this.position = this.length;
+	}
+    // Offset is between 0 and file size so set the position
+    // to start writing.
+	else {
+		this.position = offset;
+	}	
+};
+
+/** 
+ * Truncates the file to the size specified.
+ * 
+ * @param size to chop the file at.
+ */
+FileWriter.prototype.truncate = function(size) {
+	// Throw an exception if we are already writing a file
+	if (this.readyState === FileWriter.WRITING) {
+		throw FileError.INVALID_STATE_ERR;
+	}
+	// what if no size specified? 
+
+    // WRITING state
+    this.readyState = FileWriter.WRITING;
+
+    var me = this;
+
+    // If onwritestart callback
+    if (typeof me.onwritestart === "function") {
+        var evt = File._createEvent("writestart", me);
+        me.onwritestart(evt);
+    }
+
+    // Write file
+    navigator.fileMgr.truncate(this.fileName, size,
+
+        // Success callback
+        function(r) {
+            var evt;
+            // If DONE (cancelled), then don't do anything
+            if (me.readyState === FileWriter.DONE) {
+                return;
+            }
+
+            // Update the length of the file
+            me.length = r;
+            me.position = Math.min(me.position, r);
+
+            // If onwrite callback
+            if (typeof me.onwrite === "function") {
+                evt = File._createEvent("write", me);
+                me.onwrite(evt);
+            }
+
+            // DONE state
+            me.readyState = FileWriter.DONE;
+
+            // If onwriteend callback
+            if (typeof me.onwriteend === "function") {
+                evt = File._createEvent("writeend", me);
+                me.onwriteend(evt);
+            }
+        },
+
+        // Error callback
+        function(e) {
+            var evt;
+            // If DONE (cancelled), then don't do anything
+            if (me.readyState === FileWriter.DONE) {
+                return;
+            }
+
+            // Save error
+            me.error = e;
+
+            // If onerror callback
+            if (typeof me.onerror === "function") {
+                evt = File._createEvent("error", me);
+                me.onerror(evt);
+            }
+
+            // DONE state
+            me.readyState = FileWriter.DONE;
+
+            // If onwriteend callback
+            if (typeof me.onwriteend === "function") {
+                evt = File._createEvent("writeend", me);
+                me.onwriteend(evt);
+            }
+        }
+    );
+};
+
+LocalFileSystem = function() {
+};
+
+// File error codes
+LocalFileSystem.TEMPORARY = 0;
+LocalFileSystem.PERSISTENT = 1;
+LocalFileSystem.RESOURCE = 2;
+LocalFileSystem.APPLICATION = 3;
+
+/**
+ * Requests a filesystem in which to store application data.
+ * 
+ * @param {int} type of file system being requested
+ * @param {Function} successCallback is called with the new FileSystem
+ * @param {Function} errorCallback is called with a FileError
+ */
+LocalFileSystem.prototype.requestFileSystem = function(type, size, successCallback, errorCallback) {
+	if (type < 0 || type > 3) {
+		if (typeof errorCallback == "function") {
+			errorCallback({
+				"code": FileError.SYNTAX_ERR
+			});
+		}
+	}
+	else {
+		PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "requestFileSystem", [type, size]);
+	}
+};
+
+/**
+ * 
+ * @param {DOMString} uri referring to a local file in a filesystem
+ * @param {Function} successCallback is called with the new entry
+ * @param {Function} errorCallback is called with a FileError
+ */
+LocalFileSystem.prototype.resolveLocalFileSystemURI = function(uri, successCallback, errorCallback) {
+    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "resolveLocalFileSystemURI", [uri]);
+};
+
+/**
+* This function  is required as we need to convert raw 
+* JSON objects into concrete File and Directory objects.  
+* 
+* @param a JSON Objects that need to be converted to DirectoryEntry or FileEntry objects.
+* @returns an entry 
+*/
+LocalFileSystem.prototype._castFS = function(pluginResult) {
+    var entry = null;
+    entry = new DirectoryEntry();
+    entry.isDirectory = pluginResult.message.root.isDirectory;
+    entry.isFile = pluginResult.message.root.isFile;
+    entry.name = pluginResult.message.root.name;
+    entry.fullPath = pluginResult.message.root.fullPath;
+    pluginResult.message.root = entry;
+    return pluginResult;    
+}
+
+LocalFileSystem.prototype._castEntry = function(pluginResult) {
+    var entry = null;
+    if (pluginResult.message.isDirectory) {
+        entry = new DirectoryEntry();
+    }
+    else if (pluginResult.message.isFile) {
+		entry = new FileEntry();
+    }
+    entry.isDirectory = pluginResult.message.isDirectory;
+    entry.isFile = pluginResult.message.isFile;
+    entry.name = pluginResult.message.name;
+    entry.fullPath = pluginResult.message.fullPath;
+    pluginResult.message = entry;
+    return pluginResult;    
+}
+
+LocalFileSystem.prototype._castEntries = function(pluginResult) {
+    var entries = pluginResult.message;
+	var retVal = []; 
+	for (i=0; i<entries.length; i++) {
+		retVal.push(window.localFileSystem._createEntry(entries[i]));
+	}
+    pluginResult.message = retVal;
+    return pluginResult;    
+}
+
+LocalFileSystem.prototype._createEntry = function(castMe) {
+	var entry = null;
+    if (castMe.isDirectory) {
+        entry = new DirectoryEntry();
+    }
+    else if (castMe.isFile) {
+        entry = new FileEntry();
+    }
+    entry.isDirectory = castMe.isDirectory;
+    entry.isFile = castMe.isFile;
+    entry.name = castMe.name;
+    entry.fullPath = castMe.fullPath;
+    return entry;    
+
+}
+
+LocalFileSystem.prototype._castDate = function(pluginResult) {
+	if (pluginResult.message.modificationTime) {
+		var metadataObj = new Metadata();
+		
+	    metadataObj.modificationTime = new Date(pluginResult.message.modificationTime);
+	    pluginResult.message = metadataObj;
+	}
+	else if (pluginResult.message.lastModifiedDate) {
+		var file = new File();
+        file.size = pluginResult.message.size;
+        file.type = pluginResult.message.type;
+        file.name = pluginResult.message.name;
+        file.fullPath = pluginResult.message.fullPath;
+		file.lastModifiedDate = new Date(pluginResult.message.lastModifiedDate);
+	    pluginResult.message = file;		
+	}
+
+    return pluginResult;	
+}
+LocalFileSystem.prototype._castError = function(pluginResult) {
+	var fileError = new FileError();
+	fileError.code = pluginResult.message;
+	pluginResult.message = fileError;
+	return pluginResult;
+}
+
+/**
+ * Information about the state of the file or directory
+ * 
+ * {Date} modificationTime (readonly)
+ */
+Metadata = function() {
+    this.modificationTime=null;
+};
+
+/**
+ * Supplies arguments to methods that lookup or create files and directories
+ * 
+ * @param {boolean} create file or directory if it doesn't exist 
+ * @param {boolean} exclusive if true the command will fail if the file or directory exists
+ */
+Flags = function(create, exclusive) {
+    this.create = create || false;
+    this.exclusive = exclusive || false;
+};
+
+/**
+ * An interface representing a file system
+ * 
+ * {DOMString} name the unique name of the file system (readonly)
+ * {DirectoryEntry} root directory of the file system (readonly)
+ */
+FileSystem = function() {
+    this.name = null;
+    this.root = null;
+};
+
+/**
+ * An interface representing a directory on the file system.
+ * 
+ * {boolean} isFile always false (readonly)
+ * {boolean} isDirectory always true (readonly)
+ * {DOMString} name of the directory, excluding the path leading to it (readonly)
+ * {DOMString} fullPath the absolute full path to the directory (readonly)
+ * {FileSystem} filesystem on which the directory resides (readonly)
+ */
+DirectoryEntry = function() {
+    this.isFile = false;
+    this.isDirectory = true;
+    this.name = null;
+    this.fullPath = null;
+    this.filesystem = null;
+};
+
+/**
+ * Copies a directory to a new location
+ * 
+ * @param {DirectoryEntry} parent the directory to which to copy the entry
+ * @param {DOMString} newName the new name of the entry, defaults to the current name
+ * @param {Function} successCallback is called with the new entry
+ * @param {Function} errorCallback is called with a FileError
+ */
+DirectoryEntry.prototype.copyTo = function(parent, newName, successCallback, errorCallback) {
+    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "copyTo", [this.fullPath, parent, newName]);
+};
+
+/**
+ * Looks up the metadata of the entry
+ * 
+ * @param {Function} successCallback is called with a Metadata object
+ * @param {Function} errorCallback is called with a FileError
+ */
+DirectoryEntry.prototype.getMetadata = function(successCallback, errorCallback) {
+    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "getMetadata", [this.fullPath]);
+};
+
+/**
+ * Gets the parent of the entry
+ * 
+ * @param {Function} successCallback is called with a parent entry
+ * @param {Function} errorCallback is called with a FileError
+ */
+DirectoryEntry.prototype.getParent = function(successCallback, errorCallback) {
+    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "getParent", [this.fullPath]);
+};
+
+/**
+ * Moves a directory to a new location
+ * 
+ * @param {DirectoryEntry} parent the directory to which to move the entry
+ * @param {DOMString} newName the new name of the entry, defaults to the current name
+ * @param {Function} successCallback is called with the new entry
+ * @param {Function} errorCallback is called with a FileError
+ */
+DirectoryEntry.prototype.moveTo = function(parent, newName, successCallback, errorCallback) {
+    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "moveTo", [this.fullPath, parent, newName]);
+};
+
+/**
+ * Removes the entry
+ * 
+ * @param {Function} successCallback is called with no parameters
+ * @param {Function} errorCallback is called with a FileError
+ */
+DirectoryEntry.prototype.remove = function(successCallback, errorCallback) {
+    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "remove", [this.fullPath]);
+};
+
+/**
+ * Returns a URI that can be used to identify this entry.
+ * 
+ * @param {DOMString} mimeType for a FileEntry, the mime type to be used to interpret the file, when loaded through this URI.
+ * @param {Function} successCallback is called with the new entry
+ * @param {Function} errorCallback is called with a FileError
+ */
+DirectoryEntry.prototype.toURI = function(mimeType, successCallback, errorCallback) {
+    return "file://localhost" + this.fullPath;
+    //PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "toURI", [this.fullPath, mimeType]);
+};
+
+/**
+ * Creates a new DirectoryReader to read entries from this directory
+ */
+DirectoryEntry.prototype.createReader = function(successCallback, errorCallback) {
+    return new DirectoryReader(this.fullPath);
+};
+
+/**
+ * Creates or looks up a directory
+ * 
+ * @param {DOMString} path either a relative or absolute path from this directory in which to look up or create a directory
+ * @param {Flags} options to create or excluively create the directory
+ * @param {Function} successCallback is called with the new entry
+ * @param {Function} errorCallback is called with a FileError
+ */
+DirectoryEntry.prototype.getDirectory = function(path, options, successCallback, errorCallback) {
+    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "getDirectory", [this.fullPath, path, options]);
+};
+
+/**
+ * Creates or looks up a file
+ * 
+ * @param {DOMString} path either a relative or absolute path from this directory in which to look up or create a file
+ * @param {Flags} options to create or excluively create the file
+ * @param {Function} successCallback is called with the new entry
+ * @param {Function} errorCallback is called with a FileError
+ */
+DirectoryEntry.prototype.getFile = function(path, options, successCallback, errorCallback) {
+    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "getFile", [this.fullPath, path, options]);
+};
+
+/**
+ * Deletes a directory and all of it's contents
+ * 
+ * @param {Function} successCallback is called with no parameters
+ * @param {Function} errorCallback is called with a FileError
+ */
+DirectoryEntry.prototype.removeRecursively = function(successCallback, errorCallback) {
+    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "removeRecursively", [this.fullPath]);
+};
+
+/**
+ * An interface that lists the files and directories in a directory.
+ */
+DirectoryReader = function(fullPath){
+	this.fullPath = fullPath || null;    
+};
+
+/**
+ * Returns a list of entries from a directory.
+ * 
+ * @param {Function} successCallback is called with a list of entries
+ * @param {Function} errorCallback is called with a FileError
+ */
+DirectoryReader.prototype.readEntries = function(successCallback, errorCallback) {
+    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "readEntries", [this.fullPath]);
+}
+ 
+/**
+ * An interface representing a directory on the file system.
+ * 
+ * {boolean} isFile always true (readonly)
+ * {boolean} isDirectory always false (readonly)
+ * {DOMString} name of the file, excluding the path leading to it (readonly)
+ * {DOMString} fullPath the absolute full path to the file (readonly)
+ * {FileSystem} filesystem on which the directory resides (readonly)
+ */
+FileEntry = function() {
+    this.isFile = true;
+    this.isDirectory = false;
+    this.name = null;
+    this.fullPath = null;
+    this.filesystem = null;
+};
+
+/**
+ * Copies a file to a new location
+ * 
+ * @param {DirectoryEntry} parent the directory to which to copy the entry
+ * @param {DOMString} newName the new name of the entry, defaults to the current name
+ * @param {Function} successCallback is called with the new entry
+ * @param {Function} errorCallback is called with a FileError
+ */
+FileEntry.prototype.copyTo = function(parent, newName, successCallback, errorCallback) {
+    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "copyTo", [this.fullPath, parent, newName]);
+};
+
+/**
+ * Looks up the metadata of the entry
+ * 
+ * @param {Function} successCallback is called with a Metadata object
+ * @param {Function} errorCallback is called with a FileError
+ */
+FileEntry.prototype.getMetadata = function(successCallback, errorCallback) {
+    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "getMetadata", [this.fullPath]);
+};
+
+/**
+ * Gets the parent of the entry
+ * 
+ * @param {Function} successCallback is called with a parent entry
+ * @param {Function} errorCallback is called with a FileError
+ */
+FileEntry.prototype.getParent = function(successCallback, errorCallback) {
+    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "getParent", [this.fullPath]);
+};
+
+/**
+ * Moves a directory to a new location
+ * 
+ * @param {DirectoryEntry} parent the directory to which to move the entry
+ * @param {DOMString} newName the new name of the entry, defaults to the current name
+ * @param {Function} successCallback is called with the new entry
+ * @param {Function} errorCallback is called with a FileError
+ */
+FileEntry.prototype.moveTo = function(parent, newName, successCallback, errorCallback) {
+    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "moveTo", [this.fullPath, parent, newName]);
+};
+
+/**
+ * Removes the entry
+ * 
+ * @param {Function} successCallback is called with no parameters
+ * @param {Function} errorCallback is called with a FileError
+ */
+FileEntry.prototype.remove = function(successCallback, errorCallback) {
+    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "remove", [this.fullPath]);
+};
+
+/**
+ * Returns a URI that can be used to identify this entry.
+ * 
+ * @param {DOMString} mimeType for a FileEntry, the mime type to be used to interpret the file, when loaded through this URI.
+ * @param {Function} successCallback is called with the new entry
+ * @param {Function} errorCallback is called with a FileError
+ */
+FileEntry.prototype.toURI = function(mimeType, successCallback, errorCallback) {
+    return "file://localhost" + this.fullPath;
+    //PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "toURI", [this.fullPath, mimeType]);
+};
+
+/**
+ * Creates a new FileWriter associated with the file that this FileEntry represents.
+ * 
+ * @param {Function} successCallback is called with the new FileWriter
+ * @param {Function} errorCallback is called with a FileError
+ */
+FileEntry.prototype.createWriter = function(successCallback, errorCallback) {
+	this.file(function(filePointer) {	
+		var writer = new FileWriter(filePointer);
+		if (writer.fileName == null || writer.fileName == "") {
+			if (typeof errorCallback == "function") {
+				errorCallback({
+					"code": FileError.INVALID_STATE_ERR
+				});
+		}
+		}
+		if (typeof successCallback == "function") {
+			successCallback(writer);
+		}       
+	}, errorCallback);
+};
+
+/**
+ * Returns a File that represents the current state of the file that this FileEntry represents.
+ * 
+ * @param {Function} successCallback is called with the new File object
+ * @param {Function} errorCallback is called with a FileError
+ */
+FileEntry.prototype.file = function(successCallback, errorCallback) {
+    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "getFileMetadata", [this.fullPath]);
+};
+
+/**
+ * Add the FileSystem interface into the browser.
+ */
+PhoneGap.addConstructor(function() {
+	var pgLocalFileSystem = new LocalFileSystem();
+	// Needed for cast methods
+    if(typeof window.localFileSystem == "undefined") window.localFileSystem  = pgLocalFileSystem;
+    if(typeof window.requestFileSystem == "undefined") window.requestFileSystem  = pgLocalFileSystem.requestFileSystem;
+    if(typeof window.resolveLocalFileSystemURI == "undefined") window.resolveLocalFileSystemURI = pgLocalFileSystem.resolveLocalFileSystemURI;
+});
+};
+
+
+
+
+/*
+ * Copyright (c) 2011, Matt Kane
+ */
+
+if (!PhoneGap.hasResource("filetransfer")) {
+	PhoneGap.addResource("filetransfer");
+
+/**
+ * FileTransfer uploads a file to a remote server.
+ */
+FileTransfer = function() {}
+
+/**
+ * FileUploadResult
+ */
+FileUploadResult = function() {
+    this.bytesSent = 0;
+    this.responseCode = null;
+    this.response = null;
+}
+
+/**
+ * FileTransferError
+ */
+FileTransferError = function(errorCode) {
+    this.code = errorCode || null;
+}
+
+FileTransferError.FILE_NOT_FOUND_ERR = 1;
+FileTransferError.INVALID_URL_ERR = 2;
+FileTransferError.CONNECTION_ERR = 3;
+
+/**
+* Given an absolute file path, uploads a file on the device to a remote server 
+* using a multipart HTTP request.
+* @param filePath {String}           Full path of the file on the device
+* @param server {String}             URL of the server to receive the file
+* @param successCallback (Function}  Callback to be invoked when upload has completed
+* @param errorCallback {Function}    Callback to be invoked upon error
+* @param options {FileUploadOptions} Optional parameters such as file name and mimetype           
+*/
+FileTransfer.prototype.upload = function(filePath, server, successCallback, errorCallback, options) {
+	if(!options.params) {
+		options.params = {};
+	}
+	options.filePath = filePath;
+	options.server = server;
+	if(!options.fileKey) {
+		options.fileKey = 'file';
+	}
+	if(!options.fileName) {
+		options.fileName = 'image.jpg';
+	}
+	if(!options.mimeType) {
+		options.mimeType = 'image/jpeg';
+	}
+	
+	// successCallback required
+	if (typeof successCallback != "function") {
+        console.log("FileTransfer Error: successCallback is not a function");
+        return;
+    }
+
+
+    // errorCallback optional
+    if (errorCallback && (typeof errorCallback != "function")) {
+        console.log("FileTransfer Error: errorCallback is not a function");
+        return;
+    }
+	
+    PhoneGap.exec(successCallback, errorCallback, 'com.phonegap.filetransfer', 'upload', [options]);
+};
+
+FileTransfer.prototype._castTransferError = function(pluginResult) {
+	var fileError = new FileTransferError(pluginResult.message);
+	//fileError.code = pluginResult.message;
+	pluginResult.message = fileError;
+	return pluginResult;
+}
+
+FileTransfer.prototype._castUploadResult = function(pluginResult) {
+	var result = new FileUploadResult();
+	result.bytesSent = pluginResult.message.bytesSent;
+	result.responseCode = pluginResult.message.responseCode;
+	result.response = decodeURIComponent(pluginResult.message.response);
+	pluginResult.message = result;
+	return pluginResult;
+}
+
+/**
+ * Downloads a file form a given URL and saves it to the specified directory.
+ * @param source {String}          URL of the server to receive the file
+ * @param target {String}         Full path of the file on the device
+ * @param successCallback (Function}  Callback to be invoked when upload has completed
+ * @param errorCallback {Function}    Callback to be invoked upon error
+ */
+FileTransfer.prototype.download = function(source, target, successCallback, errorCallback) {
+	PhoneGap.exec(successCallback, errorCallback, 'com.phonegap.filetransfer', 'download', [source, target]);
+};
+
+/**
+ * Options to customize the HTTP request used to upload files.
+ * @param fileKey {String}   Name of file request parameter.
+ * @param fileName {String}  Filename to be used by the server. Defaults to image.jpg.
+ * @param mimeType {String}  Mimetype of the uploaded file. Defaults to image/jpeg.
+ * @param params {Object}    Object with key: value params to send to the server.
+ */
+FileUploadOptions = function(fileKey, fileName, mimeType, params) {
+    this.fileKey = fileKey || null;
+    this.fileName = fileName || null;
+    this.mimeType = mimeType || null;
+    this.params = params || null;
+}
+
+
+PhoneGap.addConstructor(function() {
+    if (typeof navigator.fileTransfer == "undefined") navigator.fileTransfer = new FileTransfer();
+});
+};
+if (!PhoneGap.hasResource("geolocation")) {
+	PhoneGap.addResource("geolocation");
+
+/**
+ * This class provides access to device GPS data.
+ * @constructor
+ */
+Geolocation = function() {
+    // The last known GPS position.
+    this.lastPosition = null;
+    this.listener = null;
+    this.timeoutTimerId = 0;
+
+};
+
+
+/**
+ * Asynchronously aquires the current position.
+ * @param {Function} successCallback The function to call when the position
+ * data is available
+ * @param {Function} errorCallback The function to call when there is an error 
+ * getting the position data.
+ * @param {PositionOptions} options The options for getting the position data
+ * such as timeout.
+ * PositionOptions.forcePrompt:Bool default false, 
+ * - tells iPhone to prompt the user to turn on location services.
+ * - may cause your app to exit while the user is sent to the Settings app
+ * PositionOptions.distanceFilter:double aka Number
+ * - used to represent a distance in meters.
+PositionOptions
+{
+   desiredAccuracy:Number
+   - a distance in meters 
+		< 10   = best accuracy  ( Default value )
+		< 100  = Nearest Ten Meters
+		< 1000 = Nearest Hundred Meters
+		< 3000 = Accuracy Kilometers
+		3000+  = Accuracy 3 Kilometers
+		
+	forcePrompt:Boolean default false ( iPhone Only! )
+    - tells iPhone to prompt the user to turn on location services.
+	- may cause your app to exit while the user is sent to the Settings app
+	
+	distanceFilter:Number
+	- The minimum distance (measured in meters) a device must move laterally before an update event is generated.
+	- measured relative to the previously delivered location
+	- default value: null ( all movements will be reported )
+	
+}
+
+ */
+ 
+Geolocation.prototype.getCurrentPosition = function(successCallback, errorCallback, options) 
+{
+    // create an always valid local success callback
+    var win = successCallback;
+    if (!win || typeof(win) != 'function')
+    {
+        win = function(position) {};
+    }
+    
+    // create an always valid local error callback
+    var fail = errorCallback;
+    if (!fail || typeof(fail) != 'function')
+    {
+        fail = function(positionError) {};
+    }	
+
+    var self = this;
+    var totalTime = 0;
+	var timeoutTimerId;
+	
+	// set params to our default values
+	var params = new PositionOptions();
+	
+    if (options) 
+    {
+        if (options.maximumAge) 
+        {
+            // special case here if we have a cached value that is younger than maximumAge
+            if(this.lastPosition)
+            {
+                var now = new Date().getTime();
+                if((now - this.lastPosition.timestamp) < options.maximumAge)
+                {
+                    win(this.lastPosition); // send cached position immediately 
+                    return;                 // Note, execution stops here -jm
+                }
+            }
+            params.maximumAge = options.maximumAge;
+        }
+        if (options.enableHighAccuracy) 
+        {
+            params.enableHighAccuracy = (options.enableHighAccuracy == true); // make sure it's truthy
+        }
+        if (options.timeout) 
+        {
+            params.timeout = options.timeout;
+        }
+    }
+
+    var successListener = win;
+    var failListener = fail;
+    if (!this.locationRunning)
+    {
+        successListener = function(position)
+        { 
+            win(position);
+            self.stop();
+        };
+        errorListener = function(positionError)
+        { 
+            fail(positionError);
+            self.stop();
+        };
+    }
+    
+    this.listener = {"success":successListener,"fail":failListener};
+    this.start(params);
+	
+	var onTimeout = function()
+	{
+	    self.setError(new PositionError(PositionError.TIMEOUT,"Geolocation Error: Timeout."));
+	};
+
+    clearTimeout(this.timeoutTimerId);
+    this.timeoutTimerId = setTimeout(onTimeout, params.timeout); 
+};
+
+/**
+ * Asynchronously aquires the position repeatedly at a given interval.
+ * @param {Function} successCallback The function to call each time the position
+ * data is available
+ * @param {Function} errorCallback The function to call when there is an error 
+ * getting the position data.
+ * @param {PositionOptions} options The options for getting the position data
+ * such as timeout and the frequency of the watch.
+ */
+Geolocation.prototype.watchPosition = function(successCallback, errorCallback, options) {
+	// Invoke the appropriate callback with a new Position object every time the implementation 
+	// determines that the position of the hosting device has changed. 
+
+	var self = this; // those == this & that
+	
+	var params = new PositionOptions();
+
+    if(options)
+    {
+        if (options.maximumAge) {
+            params.maximumAge = options.maximumAge;
+        }
+        if (options.enableHighAccuracy) {
+            params.enableHighAccuracy = options.enableHighAccuracy;
+        }
+        if (options.timeout) {
+            params.timeout = options.timeout;
+        }
+    }
+
+	var that = this;
+    var lastPos = that.lastPosition? that.lastPosition.clone() : null;
+    
+	var intervalFunction = function() {
+        
+		var filterFun = function(position) {
+            if (lastPos == null || !position.equals(lastPos)) {
+                // only call the success callback when there is a change in position, per W3C
+                successCallback(position);
+            }
+            
+            // clone the new position, save it as our last position (internal var)
+            lastPos = position.clone();
+        };
+		
+		that.getCurrentPosition(filterFun, errorCallback, params);
+	};
+	
+    // Retrieve location immediately and schedule next retrieval afterwards
+	intervalFunction();
+	
+	return setInterval(intervalFunction, params.timeout);
+};
+
+
+/**
+ * Clears the specified position watch.
+ * @param {String} watchId The ID of the watch returned from #watchPosition.
+ */
+Geolocation.prototype.clearWatch = function(watchId) {
+	clearInterval(watchId);
+};
+
+/**
+ * Called by the geolocation framework when the current location is found.
+ * @param {PositionOptions} position The current position.
+ */
+Geolocation.prototype.setLocation = function(position) 
+{
+    var _position = new Position(position.coords, position.timestamp);
+
+    if(this.timeoutTimerId)
+    {
+        clearTimeout(this.timeoutTimerId);
+        this.timeoutTimerId = 0;
+    }
+    
+	this.lastError = null;
+    this.lastPosition = _position;
+    
+    if(this.listener && typeof(this.listener.success) == 'function')
+    {
+        this.listener.success(_position);
+    }
+    
+    this.listener = null;
+};
+
+/**
+ * Called by the geolocation framework when an error occurs while looking up the current position.
+ * @param {String} message The text of the error message.
+ */
+Geolocation.prototype.setError = function(error) 
+{
+	var _error = new PositionError(error.code, error.message);
+
+    this.locationRunning = false
+	
+    if(this.timeoutTimerId)
+    {
+        clearTimeout(this.timeoutTimerId);
+        this.timeoutTimerId = 0;
+    }
+    
+    this.lastError = _error;
+    // call error handlers directly
+    if(this.listener && typeof(this.listener.fail) == 'function')
+    {
+        this.listener.fail(_error);
+    }
+    this.listener = null;
+
+};
+
+Geolocation.prototype.start = function(positionOptions) 
+{
+    PhoneGap.exec(null, null, "com.phonegap.geolocation", "startLocation", [positionOptions]);
+    this.locationRunning = true
+
+};
+
+Geolocation.prototype.stop = function() 
+{
+    PhoneGap.exec(null, null, "com.phonegap.geolocation", "stopLocation", []);
+    this.locationRunning = false
+};
+
+
+PhoneGap.addConstructor(function() 
+{
+    if (typeof navigator._geo == "undefined") 
+    {
+        // replace origObj's functions ( listed in funkList ) with the same method name on proxyObj
+        // this is a workaround to prevent UIWebView/MobileSafari default implementation of GeoLocation
+        // because it includes the full page path as the title of the alert prompt
+        var __proxyObj = function (origObj,proxyObj,funkList)
+        {
+            var replaceFunk = function(org,proxy,fName)
+            { 
+                org[fName] = function()
+                { 
+                   return proxy[fName].apply(proxy,arguments); 
+                }; 
+            };
+
+            for(var v in funkList) { replaceFunk(origObj,proxyObj,funkList[v]);}
+        }
+        navigator._geo = new Geolocation();
+        __proxyObj(navigator.geolocation, navigator._geo,
+                 ["setLocation","getCurrentPosition","watchPosition",
+                  "clearWatch","setError","start","stop"]);
+
+    }
+
+});
+};
+if (!PhoneGap.hasResource("compass")) {
+	PhoneGap.addResource("compass");
+
+CompassError = function(){
+   this.code = null;
+};
+
+// Capture error codes
+CompassError.COMPASS_INTERNAL_ERR = 0;
+CompassError.COMPASS_NOT_SUPPORTED = 20;
+
+CompassHeading = function() {
+	this.magneticHeading = null;
+	this.trueHeading = null;
+	this.headingAccuracy = null;
+	this.timestamp = null;
+}	
+/**
+ * This class provides access to device Compass data.
+ * @constructor
+ */
+Compass = function() {
+    /**
+     * List of compass watch timers
+     */
+    this.timers = {};
+};
+
+/**
+ * Asynchronously acquires the current heading.
+ * @param {Function} successCallback The function to call when the heading
+ * data is available
+ * @param {Function} errorCallback The function to call when there is an error 
+ * getting the heading data.
+ * @param {PositionOptions} options The options for getting the heading data (not used).
+ */
+Compass.prototype.getCurrentHeading = function(successCallback, errorCallback, options) {
+ 	// successCallback required
+    if (typeof successCallback !== "function") {
+        console.log("Compass Error: successCallback is not a function");
+        return;
+    }
+
+    // errorCallback optional
+    if (errorCallback && (typeof errorCallback !== "function")) {
+        console.log("Compass Error: errorCallback is not a function");
+        return;
+    }
+
+    // Get heading
+    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.geolocation", "getCurrentHeading", []);
+};
+
+/**
+ * Asynchronously acquires the heading repeatedly at a given interval.
+ * @param {Function} successCallback The function to call each time the heading
+ * data is available
+ * @param {Function} errorCallback The function to call when there is an error 
+ * getting the heading data.
+ * @param {HeadingOptions} options The options for getting the heading data
+ * such as timeout and the frequency of the watch.
+ */
+Compass.prototype.watchHeading= function(successCallback, errorCallback, options) 
+{
+	// Default interval (100 msec)
+    var frequency = (options !== undefined) ? options.frequency : 100;
+
+    // successCallback required
+    if (typeof successCallback !== "function") {
+        console.log("Compass Error: successCallback is not a function");
+        return;
+    }
+
+    // errorCallback optional
+    if (errorCallback && (typeof errorCallback !== "function")) {
+        console.log("Compass Error: errorCallback is not a function");
+        return;
+    }
+
+    // Start watch timer to get headings
+    var id = PhoneGap.createUUID();
+    navigator.compass.timers[id] = setInterval(
+        function() {
+            PhoneGap.exec(successCallback, errorCallback, "com.phonegap.geolocation", "getCurrentHeading", [{repeats: 1}]);
+        }, frequency);
+
+    return id;
+};
+
+
+/**
+ * Clears the specified heading watch.
+ * @param {String} watchId The ID of the watch returned from #watchHeading.
+ */
+Compass.prototype.clearWatch = function(id) 
+{
+	// Stop javascript timer & remove from timer list
+    if (id && navigator.compass.timers[id]) {
+        clearInterval(navigator.compass.timers[id]);
+        delete navigator.compass.timers[id];
+    }
+    if (navigator.compass.timers.length == 0) {
+    	// stop the 
+    	PhoneGap.exec(null, null, "com.phonegap.geolocation", "stopHeading", []);
+    }
+};
+
+/** iOS only
+ * Asynchronously fires when the heading changes from the last reading.  The amount of distance 
+ * required to trigger the event is specified in the filter paramter.
+ * @param {Function} successCallback The function to call each time the heading
+ * data is available
+ * @param {Function} errorCallback The function to call when there is an error 
+ * getting the heading data.
+ * @param {HeadingOptions} options The options for getting the heading data
+ * 			@param {filter} number of degrees change to trigger a callback with heading data (float)
+ *
+ * In iOS this function is more efficient than calling watchHeading  with a frequency for updates.
+ * Only one watchHeadingFilter can be in effect at one time.  If a watchHeadingFilter is in effect, calling
+ * getCurrentHeading or watchHeading will use the existing filter value for specifying heading change. 
+  */
+Compass.prototype.watchHeadingFilter = function(successCallback, errorCallback, options) 
+{
+ 
+ 	if (options === undefined || options.filter === undefined) {
+ 		console.log("Compass Error:  options.filter not specified");
+ 		return;
+ 	}
+
+    // successCallback required
+    if (typeof successCallback !== "function") {
+        console.log("Compass Error: successCallback is not a function");
+        return;
+    }
+
+    // errorCallback optional
+    if (errorCallback && (typeof errorCallback !== "function")) {
+        console.log("Compass Error: errorCallback is not a function");
+        return;
+    }
+    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.geolocation", "watchHeadingFilter", [options]);
+}
+Compass.prototype.clearWatchFilter = function() 
+{
+    	PhoneGap.exec(null, null, "com.phonegap.geolocation", "stopHeading", []);
+};
+
+PhoneGap.addConstructor(function() 
+{
+    if (typeof navigator.compass == "undefined") 
+    {
+        navigator.compass = new Compass();
+    }
+});
+};
+
+if (!PhoneGap.hasResource("media")) {
+	PhoneGap.addResource("media");
+
+/**
+ * List of media objects.
+ * PRIVATE
+ */
+PhoneGap.mediaObjects = {};
+
+/**
+ * Object that receives native callbacks.
+ * PRIVATE
+ */
+PhoneGap.Media = function() {};
+
+
+/**
+ * Get the media object.
+ * PRIVATE
+ *
+ * @param id            The media object id (string)
+ */
+PhoneGap.Media.getMediaObject = function(id) {
+    return PhoneGap.mediaObjects[id];
+};
+
+/**
+ * Audio has status update.
+ * PRIVATE
+ *
+ * @param id            The media object id (string)
+ * @param msg           The status message (int)
+ * @param value        The status code (int)
+ */
+PhoneGap.Media.onStatus = function(id, msg, value) {
+    var media = PhoneGap.mediaObjects[id];
+
+    // If state update
+    if (msg == Media.MEDIA_STATE) {
+        if (value == Media.MEDIA_STOPPED) {
+            if (media.successCallback) {
+                media.successCallback();
+            }
+        }
+        if (media.statusCallback) {
+            media.statusCallback(value);
+        }
+    }
+    else if (msg == Media.MEDIA_DURATION) {
+        media._duration = value;
+    }
+    else if (msg == Media.MEDIA_ERROR) {
+        if (media.errorCallback) {
+            media.errorCallback(value);
+        }
+    }
+    else if (msg == Media.MEDIA_POSITION) {
+    	media._position = value;
+    }
+};
+
+/**
+ * This class provides access to the device media, interfaces to both sound and video
+ *
+ * @param src                   The file name or url to play
+ * @param successCallback       The callback to be called when the file is done playing or recording.
+ *                                  successCallback() - OPTIONAL
+ * @param errorCallback         The callback to be called if there is an error.
+ *                                  errorCallback(int errorCode) - OPTIONAL
+ * @param statusCallback        The callback to be called when media status has changed.
+ *                                  statusCallback(int statusCode) - OPTIONAL
+ * @param positionCallback      The callback to be called when media position has changed.
+ *                                  positionCallback(long position) - OPTIONAL
+ */
+Media = function(src, successCallback, errorCallback, statusCallback, positionCallback) {
+
+    // successCallback optional
+    if (successCallback && (typeof successCallback != "function")) {
+        console.log("Media Error: successCallback is not a function");
+        return;
+    }
+
+    // errorCallback optional
+    if (errorCallback && (typeof errorCallback != "function")) {
+        console.log("Media Error: errorCallback is not a function");
+        return;
+    }
+
+    // statusCallback optional
+    if (statusCallback && (typeof statusCallback != "function")) {
+        console.log("Media Error: statusCallback is not a function");
+        return;
+    }
+
+    // positionCallback optional -- NOT SUPPORTED
+    if (positionCallback && (typeof positionCallback != "function")) {
+        console.log("Media Error: positionCallback is not a function");
+        return;
+    }
+
+    this.id = PhoneGap.createUUID();
+    PhoneGap.mediaObjects[this.id] = this;
+    this.src = src;
+    this.successCallback = successCallback;
+    this.errorCallback = errorCallback;
+    this.statusCallback = statusCallback;
+    this.positionCallback = positionCallback;
+    this._duration = -1;
+    this._position = -1;
+};
+
+// Media messages
+Media.MEDIA_STATE = 1;
+Media.MEDIA_DURATION = 2;
+Media.MEDIA_POSITION = 3;
+Media.MEDIA_ERROR = 9;
+
+// Media states
+Media.MEDIA_NONE = 0;
+Media.MEDIA_STARTING = 1;
+Media.MEDIA_RUNNING = 2;
+Media.MEDIA_PAUSED = 3;
+Media.MEDIA_STOPPED = 4;
+Media.MEDIA_MSG = ["None", "Starting", "Running", "Paused", "Stopped"];
+
+// TODO: Will MediaError be used?
+/**
+ * This class contains information about any Media errors.
+ * @constructor
+ */
+
+MediaError = function() {
+	this.code = null,
+	this.message = "";
+}
+
+MediaError.MEDIA_ERR_ABORTED        = 1;
+MediaError.MEDIA_ERR_NETWORK        = 2;
+MediaError.MEDIA_ERR_DECODE         = 3;
+MediaError.MEDIA_ERR_NONE_SUPPORTED = 4;
+
+/**
+ * Start or resume playing audio file.
+ */
+Media.prototype.play = function(options) {
+    PhoneGap.exec(null, null, "com.phonegap.media", "play", [this.id, this.src, options]);
+};
+
+/**
+ * Stop playing audio file.
+ */
+Media.prototype.stop = function() {
+    PhoneGap.exec(null, null, "com.phonegap.media","stop", [this.id, this.src]);
+};
+
+/**
+ * Pause playing audio file.
+ */
+Media.prototype.pause = function() {
+    PhoneGap.exec(null, null, "com.phonegap.media","pause", [this.id, this.src]);
+};
+
+/**
+ * Seek or jump to a new time in the track..
+ */
+Media.prototype.seekTo = function(milliseconds) {
+    PhoneGap.exec(null, null, "com.phonegap.media", "seekTo", [this.id, this.src, milliseconds]);
+};
+
+/**
+ * Get duration of an audio file.
+ * The duration is only set for audio that is playing, paused or stopped.
+ *
+ * @return      duration or -1 if not known.
+ */
+Media.prototype.getDuration = function() {
+    return this._duration;
+};
+
+/**
+ * Get position of audio.
+ *
+ * @return
+ */
+Media.prototype.getCurrentPosition = function(successCB, errorCB) {
+	var errCallback = (errorCB == undefined || errorCB == null) ? null : errorCB;
+    PhoneGap.exec(successCB, errorCB, "com.phonegap.media", "getCurrentPosition", [this.id, this.src]);
+};
+
+// iOS only.  prepare/load the audio in preparation for playing
+Media.prototype.prepare = function(successCB, errorCB) {
+	PhoneGap.exec(successCB, errorCB, "com.phonegap.media", "prepare", [this.id, this.src]);
+}
+
+/**
+ * Start recording audio file.
+ */
+Media.prototype.startRecord = function() {
+    PhoneGap.exec(null, null, "com.phonegap.media","startAudioRecord", [this.id, this.src]);
+};
+
+/**
+ * Stop recording audio file.
+ */
+Media.prototype.stopRecord = function() {
+    PhoneGap.exec(null, null, "com.phonegap.media","stopAudioRecord", [this.id, this.src]);
+};
+
+/**
+ * Release the resources.
+ */
+Media.prototype.release = function() {
+    PhoneGap.exec(null, null, "com.phonegap.media","release", [this.id, this.src]);
+};
+
+};
+if (!PhoneGap.hasResource("notification")) {
+	PhoneGap.addResource("notification");
+
+/**
+ * This class provides access to notifications on the device.
+ */
+Notification = function() {
+};
+
+/**
+ * Open a native alert dialog, with a customizable title and button text.
+ *
+ * @param {String} message              Message to print in the body of the alert
+ * @param {Function} completeCallback   The callback that is called when user clicks on a button.
+ * @param {String} title                Title of the alert dialog (default: Alert)
+ * @param {String} buttonLabel          Label of the close button (default: OK)
+ */
+Notification.prototype.alert = function(message, completeCallback, title, buttonLabel) {
+    var _title = title;
+    if (title == null || typeof title === 'undefined') {
+        _title = "Alert";
+    }
+    var _buttonLabel = (buttonLabel || "OK");
+    PhoneGap.exec(completeCallback, null, "com.phonegap.notification", "alert", [message,{ "title": _title, "buttonLabel": _buttonLabel}]);
+};
+
+/**
+ * Open a native confirm dialog, with a customizable title and button text.
+ * The result that the user selects is returned to the result callback.
+ *
+ * @param {String} message              Message to print in the body of the alert
+ * @param {Function} resultCallback     The callback that is called when user clicks on a button.
+ * @param {String} title                Title of the alert dialog (default: Confirm)
+ * @param {String} buttonLabels         Comma separated list of the labels of the buttons (default: 'OK,Cancel')
+ */
+Notification.prototype.confirm = function(message, resultCallback, title, buttonLabels) {
+    var _title = (title || "Confirm");
+    var _buttonLabels = (buttonLabels || "OK,Cancel");
+    this.alert(message, resultCallback, _title, _buttonLabels);
+};
+
+/**
+ * Causes the device to blink a status LED.
+ * @param {Integer} count The number of blinks.
+ * @param {String} colour The colour of the light.
+ */
+Notification.prototype.blink = function(count, colour) {
+// NOT IMPLEMENTED	
+};
+
+Notification.prototype.vibrate = function(mills) {
+	PhoneGap.exec(null, null, "com.phonegap.notification", "vibrate", []);
+};
+
+Notification.prototype.beep = function(count, volume) {
+	// No Volume yet for the iphone interface
+	// We can use a canned beep sound and call that
+	new Media('beep.wav').play();
+};
+
+PhoneGap.addConstructor(function() {
+    if (typeof navigator.notification == "undefined") navigator.notification = new Notification();
+});
+};
+if (!PhoneGap.hasResource("orientation")) {
+	PhoneGap.addResource("orientation");
+
+/**
+ * This class provides access to the device orientation.
+ * @constructor
+ */
+Orientation  = function() {
+	/**
+	 * The current orientation, or null if the orientation hasn't changed yet.
+	 */
+	this.currentOrientation = null;
+}
+
+/**
+ * Set the current orientation of the phone.  This is called from the device automatically.
+ * 
+ * When the orientation is changed, the DOMEvent \c orientationChanged is dispatched against
+ * the document element.  The event has the property \c orientation which can be used to retrieve
+ * the device's current orientation, in addition to the \c Orientation.currentOrientation class property.
+ *
+ * @param {Number} orientation The orientation to be set
+ */
+Orientation.prototype.setOrientation = function(orientation) {
+    Orientation.currentOrientation = orientation;
+    var e = document.createEvent('Events');
+    e.initEvent('orientationChanged', 'false', 'false');
+    e.orientation = orientation;
+    document.dispatchEvent(e);
+};
+
+/**
+ * Asynchronously aquires the current orientation.
+ * @param {Function} successCallback The function to call when the orientation
+ * is known.
+ * @param {Function} errorCallback The function to call when there is an error 
+ * getting the orientation.
+ */
+Orientation.prototype.getCurrentOrientation = function(successCallback, errorCallback) {
+	// If the position is available then call success
+	// If the position is not available then call error
+};
+
+/**
+ * Asynchronously aquires the orientation repeatedly at a given interval.
+ * @param {Function} successCallback The function to call each time the orientation
+ * data is available.
+ * @param {Function} errorCallback The function to call when there is an error 
+ * getting the orientation data.
+ */
+Orientation.prototype.watchOrientation = function(successCallback, errorCallback) {
+	// Invoke the appropriate callback with a new Position object every time the implementation 
+	// determines that the position of the hosting device has changed. 
+	this.getCurrentPosition(successCallback, errorCallback);
+	return setInterval(function() {
+		navigator.orientation.getCurrentOrientation(successCallback, errorCallback);
+	}, 10000);
+};
+
+/**
+ * Clears the specified orientation watch.
+ * @param {String} watchId The ID of the watch returned from #watchOrientation.
+ */
+Orientation.prototype.clearWatch = function(watchId) {
+	clearInterval(watchId);
+};
+
+Orientation.install = function()
+{
+    if (typeof navigator.orientation == "undefined") { 
+		navigator.orientation = new Orientation();
+	}
+	
+	var windowDispatchAvailable = !(window.dispatchEvent === undefined); // undefined in iOS 3.x
+	if (windowDispatchAvailable) {
+		return;
+	} 
+	
+	// the code below is to capture window.add/remove eventListener calls on window
+	// this is for iOS 3.x where listening on 'orientationchange' events don't work on document/window (don't know why)
+	// however, window.onorientationchange DOES handle the 'orientationchange' event (sent through document), so...
+	// then we multiplex the window.onorientationchange event (consequently - people shouldn't overwrite this)
+	
+	var self = this;
+	var orientationchangeEvent = 'orientationchange';
+	var newOrientationchangeEvent = 'orientationchange_pg';
+	
+	// backup original `window.addEventListener`, `window.removeEventListener`
+    var _addEventListener = window.addEventListener;
+    var _removeEventListener = window.removeEventListener;
+
+	window.onorientationchange = function() {
+		PhoneGap.fireEvent(newOrientationchangeEvent, window);
+	}
+	
+    // override `window.addEventListener`
+    window.addEventListener = function() {
+        if (arguments[0] === orientationchangeEvent) {
+			arguments[0] = newOrientationchangeEvent; 
+		} 
+													
+		if (!windowDispatchAvailable) {
+			return document.addEventListener.apply(this, arguments);
+		} else {
+			return _addEventListener.apply(this, arguments);
+		}
+    };	
+
+    // override `window.removeEventListener'
+    window.removeEventListener = function() {
+        if (arguments[0] === orientationchangeEvent) {
+			arguments[0] = newOrientationchangeEvent; 
+		} 
+		
+		if (!windowDispatchAvailable) {
+			return document.removeEventListener.apply(this, arguments);
+		} else {
+			return _removeEventListener.apply(this, arguments);
+		}
+    };	
+};
+
+PhoneGap.addConstructor(Orientation.install);
+
+};
+if (!PhoneGap.hasResource("sms")) {
+	PhoneGap.addResource("sms");
+
+/**
+ * This class provides access to the device SMS functionality.
+ * @constructor
+ */
+Sms = function() {
+
+}
+
+/**
+ * Sends an SMS message.
+ * @param {Integer} number The phone number to send the message to.
+ * @param {String} message The contents of the SMS message to send.
+ * @param {Function} successCallback The function to call when the SMS message is sent.
+ * @param {Function} errorCallback The function to call when there is an error sending the SMS message.
+ * @param {PositionOptions} options The options for accessing the GPS location such as timeout and accuracy.
+ */
+Sms.prototype.send = function(number, message, successCallback, errorCallback, options) {
+	// not sure why this is here when it does nothing????
+};
+
+PhoneGap.addConstructor(function() {
+    if (typeof navigator.sms == "undefined") navigator.sms = new Sms();
+});
+};
+if (!PhoneGap.hasResource("telephony")) {
+	PhoneGap.addResource("telephony");
+
+/**
+ * This class provides access to the telephony features of the device.
+ * @constructor
+ */
+Telephony = function() {
+	
+}
+
+/**
+ * Calls the specifed number.
+ * @param {Integer} number The number to be called.
+ */
+Telephony.prototype.call = function(number) {
+	// not sure why this is here when it does nothing????
+};
+
+PhoneGap.addConstructor(function() {
+    if (typeof navigator.telephony == "undefined") navigator.telephony = new Telephony();
+});
+};if (!PhoneGap.hasResource("network")) {
+	PhoneGap.addResource("network");
+
+// //////////////////////////////////////////////////////////////////
+
+Connection = function() {
+	/*
+	 * One of the connection constants below.
+	 */
+	this.type = Connection.UNKNOWN;
+
+	/* initialize from the extended DeviceInfo properties */
+    try {      
+		this.type	= DeviceInfo.connection.type;
+    } 
+	catch(e) {
+    }
+};
+
+Connection.UNKNOWN = "unknown"; // Unknown connection type
+Connection.ETHERNET = "ethernet";
+Connection.WIFI = "wifi";
+Connection.CELL_2G = "2g"; // the default for iOS, for any cellular connection
+Connection.CELL_3G = "3g";
+Connection.CELL_4G = "4g";
+Connection.NONE = "none"; // NO connectivity
+
+
+PhoneGap.addConstructor(function() {
+    if (typeof navigator.network == "undefined") navigator.network = {};
+    if (typeof navigator.network.connection == "undefined") navigator.network.connection = new Connection();
+});
+
+};if (!PhoneGap.hasResource("splashscreen")) {
+	PhoneGap.addResource("splashscreen");
+
+/**
+ * This class provides access to the splashscreen
+ */
+SplashScreen = function() {
+};
+
+SplashScreen.prototype.show = function() {
+    PhoneGap.exec(null, null, "com.phonegap.splashscreen", "show", []);
+};
+
+SplashScreen.prototype.hide = function() {
+    PhoneGap.exec(null, null, "com.phonegap.splashscreen", "hide", []);
+};
+
+PhoneGap.addConstructor(function() {
+    if (typeof navigator.splashscreen == "undefined") navigator.splashscreen = new SplashScreen();
+});
+
+};
diff --git a/apps/files_odfviewer/src/webodf/programs/nativeQtClient/CMakeLists.txt b/apps/files_odfviewer/src/webodf/programs/nativeQtClient/CMakeLists.txt
new file mode 100644
index 0000000000..f317693e3d
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/programs/nativeQtClient/CMakeLists.txt
@@ -0,0 +1,39 @@
+include(${QT_USE_FILE})
+include_directories(${CMAKE_CURRENT_BINARY_DIR} ${QT_QTCORE_INCLUDE_DIR})
+QT4_WRAP_CPP(NATIVEQTCLIENT_MOC
+    odfview.h
+    ../qtjsruntime/nativeio.h
+    ../qtjsruntime/nam.h
+)
+file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/application.qrc
+        "<RCC><qresource prefix='/'>")
+foreach(FILE ${HTML5UIFILES} ${LIBJSFILES} index.html scripts.js webodf.css)
+    file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/application.qrc
+        "<file>www/${FILE}</file>\n")
+endforeach(FILE ${HTML5UIFILES})
+file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/application.qrc
+        "</qresource></RCC>")
+COPY_FILES(NATIVEDEPS ${CMAKE_SOURCE_DIR}/programs/touchui
+    ${CMAKE_CURRENT_BINARY_DIR}/www ${HTML5UIFILES})
+COPY_FILES(NATIVEDEPS ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_CURRENT_BINARY_DIR}/www scripts.js)
+COPY_FILES(NATIVEDEPS ${CMAKE_SOURCE_DIR}/programs/touchui
+    ${CMAKE_CURRENT_BINARY_DIR}/www index.html)
+COPY_FILES(NATIVEDEPS ${CMAKE_SOURCE_DIR}/webodf
+    ${CMAKE_CURRENT_BINARY_DIR}/www webodf.css)
+COPY_FILES(NATIVEDEPS ${CMAKE_SOURCE_DIR}/webodf
+    ${CMAKE_CURRENT_BINARY_DIR}/www ${LIBJSFILES})
+QT4_ADD_RESOURCES(NATIVEQTCLIENT_RES
+    ${CMAKE_CURRENT_BINARY_DIR}/application.qrc)
+
+add_custom_target(nativeQtClientDepencencies ALL DEPENDS ${NATIVEDEPS})
+
+add_executable(nativeQtClient
+    main.cpp
+    odfview.cpp
+    ../qtjsruntime/nativeio.cpp
+    odfpage.cpp ${NATIVEQTCLIENT_MOC} ${NATIVEQTCLIENT_UI}
+    ${NATIVEQTCLIENT_RES})
+
+target_link_libraries(nativeQtClient ${QT_LIBRARIES})
+add_dependencies(nativeQtClient nativeQtClientDepencencies)
diff --git a/apps/files_odfviewer/src/webodf/programs/nativeQtClient/README b/apps/files_odfviewer/src/webodf/programs/nativeQtClient/README
new file mode 100644
index 0000000000..4860fa1b00
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/programs/nativeQtClient/README
@@ -0,0 +1 @@
+This is a small app that can show ODF documents using mainly javascript. Some functions that are not fast in browers are provided in C++ and it gives the ability to open files on the file system.
diff --git a/apps/files_odfviewer/src/webodf/programs/nativeQtClient/application.qrc b/apps/files_odfviewer/src/webodf/programs/nativeQtClient/application.qrc
new file mode 100644
index 0000000000..5010cdb8a8
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/programs/nativeQtClient/application.qrc
@@ -0,0 +1,18 @@
+<RCC>
+    <qresource prefix="/">
+        <file>www/app/app.js</file>
+        <file>www/app/controller/Files.js</file>
+        <file>www/app/model/FileSystem.js</file>
+        <file>www/app/store/FileStore.js</file>
+        <file>www/app/views/FileDetail.js</file>
+        <file>www/app/views/FilesList.js</file>
+        <file>www/app/views/OdfView.js</file>
+        <file>www/app/views/Viewport.js</file>
+        <file>www/index.html</file>
+        <file>www/scripts.js</file>
+        <file>www/sencha-touch.css</file>
+        <file>www/sencha-touch.js</file>
+        <file>www/webodf.css</file>
+        <file>www/webodf.js</file>
+    </qresource>
+</RCC>
diff --git a/apps/files_odfviewer/src/webodf/programs/nativeQtClient/main.cpp b/apps/files_odfviewer/src/webodf/programs/nativeQtClient/main.cpp
new file mode 100644
index 0000000000..62e5fa18be
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/programs/nativeQtClient/main.cpp
@@ -0,0 +1,10 @@
+#include "odfview.h"
+#include <QtGui/QApplication>
+#include <QtCore/QTimer>
+
+int main(int argc, char *argv[]) {
+    QApplication a(argc, argv);
+    OdfView view;
+    view.show();
+    return a.exec();
+}
diff --git a/apps/files_odfviewer/src/webodf/programs/nativeQtClient/mainwindow.cpp b/apps/files_odfviewer/src/webodf/programs/nativeQtClient/mainwindow.cpp
new file mode 100644
index 0000000000..861014399e
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/programs/nativeQtClient/mainwindow.cpp
@@ -0,0 +1,173 @@
+#include "mainwindow.h"
+#include "ui_mainwindow.h"
+#include "odfview.h"
+#include <QtGui/QDockWidget>
+#include <QtGui/QFileDialog>
+#include <QtGui/QFileSystemModel>
+#include <QtGui/QLineEdit>
+#include <QtGui/QMdiArea>
+#include <QtGui/QTreeView>
+#include <QtGui/QVBoxLayout>
+#include <QtCore/QDir>
+#include <QtCore/QSettings>
+
+MainWindow::MainWindow(QWidget *parent) :
+    QMainWindow(parent),
+    ui(new Ui::MainWindow)
+{
+    ui->setupUi(this);
+
+    createActions();
+    createToolBars();
+
+    QCoreApplication::setOrganizationName("KO");
+    //QCoreApplication::setOrganizationDomain("example.com");
+    QCoreApplication::setApplicationName("Odf Viewer");
+
+    QSettings settings;
+
+    setWindowTitle(tr("Odf Viewer"));
+    setUnifiedTitleAndToolBarOnMac(true);
+
+    QStringList odfNameFilter;
+    odfNameFilter << "*.odt" << "*.ods" << "*.odp";
+    dirmodel = new QFileSystemModel(this);
+    dirmodel->setNameFilters(odfNameFilter);
+    dirmodel->setFilter(QDir::AllDirs|QDir::AllEntries|QDir::NoDotAndDotDot);
+    dirview = new QTreeView(this);
+    dirview->setModel(dirmodel);
+    dirview->setHeaderHidden(true);
+    dirview->setAnimated(true);
+    for (int i = 1; i < dirmodel->columnCount(); i++) {
+        dirview->setColumnHidden(i, true);
+    }
+    QString rootpath = settings.value("rootpath", QDir::homePath()).toString();
+    dirmodel->setRootPath(rootpath);
+    const QModelIndex rootindex = dirmodel->index(rootpath);
+    dirview->setRootIndex(rootindex);
+    QLineEdit *dirPath = new QLineEdit(rootpath, this);
+    dirdock = new QDockWidget(this);
+    QWidget *w = new QWidget(dirdock);
+    QVBoxLayout *layout = new QVBoxLayout(w);
+    dirdock->setWidget(w);
+    layout->addWidget(dirPath);
+    layout->addWidget(dirview);
+    addDockWidget(Qt::LeftDockWidgetArea, dirdock);
+
+    connect(dirview, SIGNAL(clicked(QModelIndex)), this, SLOT(loadOdf(QModelIndex)));
+    connect(dirPath, SIGNAL(textChanged(QString)), this, SLOT(setPath(QString)));
+}
+
+MainWindow::~MainWindow()
+{
+    delete ui;
+}
+
+void
+MainWindow::openFile(const QString& path)
+{
+    QMdiSubWindow* w = findMdiChild(path);
+    OdfView* v = (w) ?dynamic_cast<OdfView*>(w->widget()) :0;
+    if (v == 0) {
+        w = ui->mdiArea->activeSubWindow();
+        v = (w) ?dynamic_cast<OdfView*>(w->widget()) :0;
+    }
+    if (v == 0) {
+        v = new OdfView(this);
+        v->showMaximized();
+        w = ui->mdiArea->addSubWindow(v);
+        w->showMaximized();
+    }
+    ui->mdiArea->setActiveSubWindow(w);
+    v->loadFile(path);
+}
+
+void MainWindow::changeEvent(QEvent *e)
+{
+    QMainWindow::changeEvent(e);
+    switch (e->type()) {
+    case QEvent::LanguageChange:
+        ui->retranslateUi(this);
+        break;
+    default:
+        break;
+    }
+}
+void MainWindow::open()
+{
+    QString fileName = QFileDialog::getOpenFileName(this, QString(), QString(),
+        tr("Office Files (*.odt *.odp *.ods)"));
+    if (!fileName.isEmpty()) {
+        QMdiSubWindow *existing = findMdiChild(fileName);
+        if (existing) {
+            ui->mdiArea->setActiveSubWindow(existing);
+            return;
+        }
+
+        OdfView *child = createOdfView();
+        if (child->loadFile(fileName)) {
+            statusBar()->showMessage(tr("File loaded"), 2000);
+            child->showMaximized();
+        } else {
+            child->close();
+        }
+    }
+}
+void MainWindow::createActions()
+{
+    //openAct = new QAction(QIcon(":/images/open.png"), tr("&Open..."), this);
+    openAct = new QAction(tr("&Open..."), this);
+    openAct->setShortcuts(QKeySequence::Open);
+    openAct->setStatusTip(tr("Open an existing file"));
+    connect(openAct, SIGNAL(triggered()), this, SLOT(open()));
+}
+void MainWindow::createToolBars()
+{
+    fileToolBar = addToolBar(tr("File"));
+    fileToolBar->addAction(openAct);
+}
+QMdiSubWindow *MainWindow::findMdiChild(const QString &fileName)
+{
+    QString canonicalFilePath = QFileInfo(fileName).canonicalFilePath();
+
+    foreach (QMdiSubWindow *window, ui->mdiArea->subWindowList()) {
+        OdfView *odfView = qobject_cast<OdfView *>(window->widget());
+        if (odfView->currentFile() == canonicalFilePath)
+            return window;
+    }
+    return 0;
+}
+
+OdfView *MainWindow::createOdfView()
+{
+    OdfView *view = new OdfView(this);
+    ui->mdiArea->addSubWindow(view);
+    return view;
+}
+
+void
+MainWindow::loadOdf(const QModelIndex& index) {
+    if (dirmodel->isDir(index)) {
+        if (dirview->isExpanded(index)) {
+            dirview->collapse(index);
+        } else {
+            dirview->expand(index);
+        }
+        return;
+    }
+    QString path = dirmodel->filePath(index);
+    path = QFileInfo(path).canonicalFilePath();
+    openFile(path);
+}
+
+void MainWindow::setPath(const QString &path)
+{
+    dirmodel->setRootPath(path);
+    const QModelIndex rootindex = dirmodel->index(path);
+    dirview->setRootIndex(rootindex);
+    QSettings settings;
+    settings.setValue("rootpath", path);
+}
+
+
+
diff --git a/apps/files_odfviewer/src/webodf/programs/nativeQtClient/mainwindow.h b/apps/files_odfviewer/src/webodf/programs/nativeQtClient/mainwindow.h
new file mode 100644
index 0000000000..d0bc822d03
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/programs/nativeQtClient/mainwindow.h
@@ -0,0 +1,46 @@
+#ifndef MAINWINDOW_H
+#define MAINWINDOW_H
+
+#include <QtGui/QMainWindow>
+#include <QtGui/QMdiSubWindow>
+
+namespace Ui {
+    class MainWindow;
+}
+
+class OdfView;
+class QFileSystemModel;
+class QTreeView;
+class QDockWidget;
+class QModelIndex;
+
+class MainWindow : public QMainWindow {
+    Q_OBJECT
+public:
+    MainWindow(QWidget *parent = 0);
+    ~MainWindow();
+    void openFile(const QString& path);
+
+private slots:
+    void open();
+    OdfView *createOdfView();
+    void loadOdf(const QModelIndex& index);
+    void setPath(const QString &path);
+
+private:
+    QMdiSubWindow *findMdiChild(const QString &fileName);
+    void createActions();
+    void createToolBars();
+    QToolBar *fileToolBar;
+    QAction *openAct;
+protected:
+    void changeEvent(QEvent *e);
+
+private:
+    Ui::MainWindow *ui;
+    QFileSystemModel* dirmodel;
+    QTreeView* dirview;
+    QDockWidget* dirdock;
+};
+
+#endif // MAINWINDOW_H
diff --git a/apps/files_odfviewer/src/webodf/programs/nativeQtClient/mainwindow.ui b/apps/files_odfviewer/src/webodf/programs/nativeQtClient/mainwindow.ui
new file mode 100644
index 0000000000..38682c7010
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/programs/nativeQtClient/mainwindow.ui
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>MainWindow</class>
+ <widget class="QMainWindow" name="MainWindow">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>800</width>
+    <height>600</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>MainWindow</string>
+  </property>
+  <widget class="QWidget" name="centralWidget">
+   <layout class="QGridLayout" name="gridLayout">
+    <item row="0" column="0">
+     <widget class="QMdiArea" name="mdiArea"/>
+    </item>
+   </layout>
+  </widget>
+  <widget class="QMenuBar" name="menuBar">
+   <property name="geometry">
+    <rect>
+     <x>0</x>
+     <y>0</y>
+     <width>800</width>
+     <height>23</height>
+    </rect>
+   </property>
+  </widget>
+  <widget class="QToolBar" name="mainToolBar">
+   <attribute name="toolBarArea">
+    <enum>TopToolBarArea</enum>
+   </attribute>
+   <attribute name="toolBarBreak">
+    <bool>false</bool>
+   </attribute>
+  </widget>
+  <widget class="QStatusBar" name="statusBar"/>
+ </widget>
+ <layoutdefault spacing="6" margin="11"/>
+ <resources/>
+ <connections/>
+</ui>
diff --git a/apps/files_odfviewer/src/webodf/programs/nativeQtClient/odfpage.cpp b/apps/files_odfviewer/src/webodf/programs/nativeQtClient/odfpage.cpp
new file mode 100644
index 0000000000..d87a8baa2b
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/programs/nativeQtClient/odfpage.cpp
@@ -0,0 +1 @@
+#include "odfpage.h"
diff --git a/apps/files_odfviewer/src/webodf/programs/nativeQtClient/odfpage.h b/apps/files_odfviewer/src/webodf/programs/nativeQtClient/odfpage.h
new file mode 100644
index 0000000000..487d169917
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/programs/nativeQtClient/odfpage.h
@@ -0,0 +1,15 @@
+#ifndef ODFPAGE_H
+#define ODFPAGE_H
+
+#include <QtWebKit/QWebPage>
+#include <QtCore/QDebug>
+
+class OdfPage : public QWebPage {
+public:
+    OdfPage(QObject* parent) :QWebPage(parent) {}
+    void javaScriptConsoleMessage(const QString& message, int lineNumber, const QString & sourceID) {
+        qDebug() << sourceID << ":" << lineNumber << ":" << message;
+    }
+};
+
+#endif // ODFPAGE_H
diff --git a/apps/files_odfviewer/src/webodf/programs/nativeQtClient/odfview.cpp b/apps/files_odfviewer/src/webodf/programs/nativeQtClient/odfview.cpp
new file mode 100644
index 0000000000..97125a5537
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/programs/nativeQtClient/odfview.cpp
@@ -0,0 +1,83 @@
+#include "odfview.h"
+
+#include "../qtjsruntime/nativeio.h"
+#include "../qtjsruntime/nam.h"
+
+#include "odfpage.h"
+
+#include <QtCore/QByteArray>
+#include <QtWebKit/QWebFrame>
+#include <QtNetwork/QNetworkAccessManager>
+#include <QtNetwork/QNetworkRequest>
+#include <QtNetwork/QNetworkReply>
+#include <QtCore/QFileInfo>
+#include <QtCore/QDir>
+
+OdfView::OdfView(QWidget* parent) :QWebView(parent)
+{
+    QString prefix = "../android/assets/"; // set this to the right value when debugging
+    QString htmlfile = QDir(prefix).absoluteFilePath("www/index.html");
+    if (!QFileInfo(htmlfile).exists()) {
+        prefix = "qrc:/";
+        htmlfile = "qrc:/www/index.html";
+    }
+    setPage(new OdfPage(this));
+    nativeio = new NativeIO(this, QDir(prefix), QDir::current());
+    connect(page(), SIGNAL(loadFinished(bool)), this, SLOT(slotLoadFinished(bool)));
+    page()->settings()->setAttribute(QWebSettings::DeveloperExtrasEnabled, true);
+
+    connect(page()->mainFrame(), SIGNAL(javaScriptWindowObjectCleared()),
+            this, SLOT(slotInitWindowObjects()));
+
+    // use our own networkaccessmanager that gives limited access to the local
+    // file system
+    networkaccessmanager = new NAM(this);
+    page()->setNetworkAccessManager(networkaccessmanager);
+    setUrl(QUrl(htmlfile));
+    loaded = false;
+}
+
+OdfView::~OdfView() {
+}
+
+void
+OdfView::slotInitWindowObjects()
+{
+    QWebFrame *frame = page()->mainFrame();
+    frame->addToJavaScriptWindowObject("nativeio", nativeio);
+}
+
+bool
+OdfView::loadFile(const QString &fileName) {
+    curFile = fileName;
+    //    odf->addFile(identifier, fileName);
+    //    networkaccessmanager->setCurrentFile(odf->getOpenContainer(identifier));
+    if (loaded) {
+        slotLoadFinished(true);
+    }
+    return true;
+}
+void
+OdfView::slotLoadFinished(bool ok) {
+    if (!ok) return;
+    loaded = true;
+    QWebFrame *frame = page()->mainFrame();
+    QString js =
+            "var originalReadFileSync = runtime.readFileSync;"
+            "runtime.readFileSync = function (path, encoding) {"
+            "    if (path.substr(path.length - 3) === '.js') {"
+            "        return originalReadFileSync.apply(runtime,"
+            "           [path, encoding]);"
+            "    }"
+            "    return nativeio.readFileSync(path, encoding);"
+            "};"
+            "runtime.read = function (path, offset, length, callback) {"
+            "    var data = nativeio.read(path, offset, length);"
+            "    data = runtime.byteArrayFromString(data, 'binary');"
+            "    callback(nativeio.error()||null, data);"
+            "};"
+            "runtime.getFileSize = function (path, callback) {"
+            "    callback(nativeio.getFileSize(path));"
+            "};";
+    frame->evaluateJavaScript(js);
+}
diff --git a/apps/files_odfviewer/src/webodf/programs/nativeQtClient/odfview.h b/apps/files_odfviewer/src/webodf/programs/nativeQtClient/odfview.h
new file mode 100644
index 0000000000..f61ba3c926
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/programs/nativeQtClient/odfview.h
@@ -0,0 +1,29 @@
+#ifndef ODFVIEW_H
+#define ODFVIEW_H
+
+#include <QtWebKit/QWebView>
+#include <QtNetwork/QNetworkAccessManager>
+class NativeIO;
+
+class OdfView : public QWebView {
+Q_OBJECT
+public:
+    OdfView(QWidget* parent = 0);
+    ~OdfView();
+    QString currentFile() { return curFile; }
+
+public slots:
+    bool loadFile(const QString &fileName);
+
+private slots:
+    void slotLoadFinished(bool ok);
+    void slotInitWindowObjects();
+
+private:
+    bool loaded;
+    QString curFile;
+    QNetworkAccessManager* networkaccessmanager;
+    NativeIO* nativeio;
+};
+
+#endif // ODFVIEW_H
diff --git a/apps/files_odfviewer/src/webodf/programs/nativeQtClient/scripts.js b/apps/files_odfviewer/src/webodf/programs/nativeQtClient/scripts.js
new file mode 100644
index 0000000000..ce2086bc7a
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/programs/nativeQtClient/scripts.js
@@ -0,0 +1,93 @@
+/*global alert, app, window, runtime*/
+var LocalFileSystem = {
+    PERSISTENT: 0,
+    TEMPORARY: 1
+};
+function FileEntry(name, fullPath) {
+    "use strict";
+    this.isFile = true;
+    this.isDirectory = false;
+    this.name = name;
+    this.fullPath = fullPath;
+    this.file = function (onsuccess, onerror) {
+        function File(fullPath) {
+            this.name = name;
+            this.fullPath = fullPath;
+            this.type = "";
+            this.size = -1;
+            this.lastModifiedDate = -1;
+        }
+        var file = new File(fullPath);
+        try {
+            onsuccess(file);
+        } catch (e) {
+            alert("Error on determining file properties: " + e);
+            onerror(e);
+        }
+    };
+}
+function FileReader() {
+    "use strict";
+    var fr = this;
+    this.readAsArrayBuffer = function (file) {
+        var path = file.fullPath.substr(7),
+            data = runtime.readFileSync(path, 'binary');
+        data = runtime.byteArrayFromString(data, "binary");
+        window.setTimeout(function () {
+            fr.onloadend({target: {result: data}});
+        }, 1);
+    };
+}
+var DirectoryReader;
+function DirectoryEntry(name, fullPath) {
+    "use strict";
+    this.isFile = false;
+    this.isDirectory = true;
+    this.name = name;
+    this.fullPath = fullPath;
+    this.createReader = function () {
+        var reader = new DirectoryReader(fullPath);
+        return reader;
+    };
+}
+function DirectoryReader(fullPath) {
+    "use strict";
+    this.readEntries = function (onsuccess, onerror) {
+        window.setTimeout(function () {
+            var entries = [];
+            entries[entries.length] = new FileEntry("welcome.odt",
+                    "welcome.odt");
+            entries[entries.length] = new FileEntry("Traktatenblad.odt",
+                    "Traktatenblad.odt");
+            try {
+                onsuccess(entries);
+            } catch (e) {
+                onerror(e);
+            }
+        }, 1);
+    };
+}
+window.resolveLocalFileSystemURI = function (path, onsuccess, onerror) {
+    "use strict";
+    var p = path.lastIndexOf("/"),
+        name = (p === -1) ? path : path.substr(p + 1);
+    onsuccess(new FileEntry(name, path));
+};
+window.requestFileSystem = function (filesystem, id, onsuccess, onerror) {
+    "use strict";
+    var dirs = [], shared, subfolder, path;
+    try {
+        if (filesystem === LocalFileSystem.PERSISTENT) {
+            path = "";
+            onsuccess({
+                name: "root",
+                root: new DirectoryEntry("root", path)
+            });
+        } else {
+            onerror("not defined");
+        }
+    } catch (e) {
+        onerror(e);
+    }
+};
+var device = {};
diff --git a/apps/files_odfviewer/src/webodf/programs/playbook/CMakeLists.txt b/apps/files_odfviewer/src/webodf/programs/playbook/CMakeLists.txt
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/apps/files_odfviewer/src/webodf/programs/playbook/build_sign.bat b/apps/files_odfviewer/src/webodf/programs/playbook/build_sign.bat
new file mode 100644
index 0000000000..34e8deeab3
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/programs/playbook/build_sign.bat
@@ -0,0 +1,23 @@
+@echo on
+set WWSDK=M:\blackberrysdk\webworkssdk
+set BBWP=%WWSDK%\bbwp\bbwp
+set DEPLOY=%WWSDK%\bbwp\blackberry-tablet-sdk\bin\blackberry-deploy
+set JAVA_HOME=%WWSDK%\jre
+set PATH=%PATH%;%JAVA_HOME%\bin
+
+mkdir bin
+mkdir signed
+
+zip -r webodf.zip config.xml index.html icon.png scripts.js app sencha-touch.js sencha-touch.css webodf.js webodf.css ZoomIn.png ZoomOut.png
+
+rem MAKE A DEBUG VERSION
+del bin\webodf.bar
+%BBWP% webodf.zip -d -o bin
+if %errorlevel% neq 0 exit /b %errorlevel% 
+
+%DEPLOY% -installApp -password ko -device 192.168.1.111 -package bin\webodf.bar
+if %errorlevel% neq 0 exit /b %errorlevel% 
+
+rem MAKE A SIGNED VERSION, (can be done only once for each buildId!)
+rem %BBWP% webodf.zip -g U9gXpJXbGC -buildId 2 -o signed
+
diff --git a/apps/files_odfviewer/src/webodf/programs/playbook/config.xml b/apps/files_odfviewer/src/webodf/programs/playbook/config.xml
new file mode 100644
index 0000000000..cab7788317
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/programs/playbook/config.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<widget xmlns="http://www.w3.org/ns/widgets"
+        xmlns:rim="http://www.blackberry.com/ns/widgets"
+        version="2.0.0.0">
+  <author href="http://www.kogmbh.com/" rim:copyright="Copyright 2010-2012 KO GmbH">KO GmbH</author>
+  <name>WebODF</name>
+  <description>
+    Viewer for OpenDocument files.
+  </description>
+  <rim:orientation mode="auto"/>
+  <rim:loadingScreen onLocalPageLoad="true" onRemotePageLoad="true">
+    <rim:transitionEffect type="zoomIn"/>
+  </rim:loadingScreen>
+  <rim:category name="productivity"/>
+
+  <rim:permissions>
+    <rim:permit>access_shared</rim:permit>
+  </rim:permissions>
+  <icon src="icon.png"/>
+  <content src="index.html" rim:allowInvokeParams="true"/>
+  <feature id="blackberry.ui.dialog"/>
+  <feature id="blackberry.io.dir" />
+  <feature id="blackberry.io.file" />
+  <feature id="blackberry.utils" />
+  <feature id="blackberry.custom.filereader"/>
+</widget>
diff --git a/apps/files_odfviewer/src/webodf/programs/playbook/ext/blackberry.custom.filereader/js/common/custom_filereader_dispatcher.js b/apps/files_odfviewer/src/webodf/programs/playbook/ext/blackberry.custom.filereader/js/common/custom_filereader_dispatcher.js
new file mode 100644
index 0000000000..8c4d91c46e
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/programs/playbook/ext/blackberry.custom.filereader/js/common/custom_filereader_dispatcher.js
@@ -0,0 +1,17 @@
+(function () {
+	var CUSTOM_FILEREADER_API_URL = "blackberry/custom/filereader";
+
+	var ARGS_PATH = "path";
+	var ARGS_DATA = "data";
+
+	function CustomFileReader() {
+	};
+
+	CustomFileReader.prototype.readAsDataURL = function(path) {
+		var remoteCall = new blackberry.transport.RemoteFunctionCall(CUSTOM_FILEREADER_API_URL + "/readAsDataURL");
+		remoteCall.addParam(ARGS_PATH, path);
+		return remoteCall.makeSyncCall();
+	};
+
+	blackberry.Loader.javascriptLoaded("blackberry.custom.filereader", CustomFileReader);
+})();
diff --git a/apps/files_odfviewer/src/webodf/programs/playbook/ext/blackberry.custom.filereader/js/common/custom_filereader_ns.js b/apps/files_odfviewer/src/webodf/programs/playbook/ext/blackberry.custom.filereader/js/common/custom_filereader_ns.js
new file mode 100644
index 0000000000..2ae1ede11e
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/programs/playbook/ext/blackberry.custom.filereader/js/common/custom_filereader_ns.js
@@ -0,0 +1,8 @@
+(function () {
+
+	function CustomFileReader(disp) {
+		this.constructor.prototype.readAsDataURL = function(path) { return disp.readAsDataURL(path); };
+	};
+
+	blackberry.Loader.javascriptLoaded("blackberry.custom.filereader", CustomFileReader);
+})();
diff --git a/apps/files_odfviewer/src/webodf/programs/playbook/ext/blackberry.custom.filereader/library.xml b/apps/files_odfviewer/src/webodf/programs/playbook/ext/blackberry.custom.filereader/library.xml
new file mode 100644
index 0000000000..1f3aa52d36
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/programs/playbook/ext/blackberry.custom.filereader/library.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<library>
+	<extension id="blackberry.custom.filereader">
+		<entryClass>blackberry.custom.filereader.CustomFileReader</entryClass>
+	</extension>
+	<platforms>
+		<platform value="AIR">
+			<target version="default" config="AIR_XHR" />
+		</platform>
+	</platforms>
+	
+	<configurations>
+		<configuration name="AIR_XHR" version="1.0" comment="For XHR architecture for implementation">
+			<src type="text/javascript" path="js/common/custom_filereader_dispatcher.js" comment="Application JS interface" />
+			<src type="text/javascript" path="js/common/custom_filereader_ns.js" comment="Application JS interface" />
+			<src type="text/actionscript" path="src/Air/CustomFileReader/src" comment="ActionScript implementation" />
+		</configuration>
+	</configurations>
+	<features>
+		<feature id="blackberry.custom.filereader" version="1.0.0" />
+	</features>
+</library>
\ No newline at end of file
diff --git a/apps/files_odfviewer/src/webodf/programs/playbook/ext/blackberry.custom.filereader/src/AIR/CustomFileReader/src/blackberry/custom/filereader/CustomFileReader.as b/apps/files_odfviewer/src/webodf/programs/playbook/ext/blackberry.custom.filereader/src/AIR/CustomFileReader/src/blackberry/custom/filereader/CustomFileReader.as
new file mode 100644
index 0000000000..3261fbcf45
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/programs/playbook/ext/blackberry.custom.filereader/src/AIR/CustomFileReader/src/blackberry/custom/filereader/CustomFileReader.as
@@ -0,0 +1,34 @@
+package blackberry.custom.filereader {
+	import flash.filesystem.File;
+	import flash.filesystem.FileMode;
+	import flash.filesystem.FileStream;
+	import flash.utils.ByteArray;
+	import mx.utils.Base64Encoder;
+	import webworks.extension.DefaultExtension;
+	
+	public class CustomFileReader extends DefaultExtension {
+
+		public function CustomFileReader() {
+			super();
+		}
+
+		override public function getFeatureList():Array {
+			return new Array ("blackberry.custom.filereader");
+		}
+
+		public function readAsDataURL(path:String):String {
+			var file:File = new File(path);
+			if (!file.exists) {
+				return "";
+			}
+			var bytes:ByteArray = new ByteArray();
+			var stream:FileStream = new FileStream();
+			stream.open(file, FileMode.READ);
+			stream.readBytes(bytes);
+			var btoa:Base64Encoder = new Base64Encoder();
+			btoa.encodeBytes(bytes);
+			stream.close();			
+			return "data:;base64," + btoa.toString();
+		}
+	}
+}
\ No newline at end of file
diff --git a/apps/files_odfviewer/src/webodf/programs/playbook/icon.png b/apps/files_odfviewer/src/webodf/programs/playbook/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..b7ccb848e3949b55361f2fb30dfe3a39756aa387
GIT binary patch
literal 19269
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

literal 0
HcmV?d00001

diff --git a/apps/files_odfviewer/src/webodf/programs/playbook/index.html b/apps/files_odfviewer/src/webodf/programs/playbook/index.html
new file mode 100644
index 0000000000..77d331c12e
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/programs/playbook/index.html
@@ -0,0 +1,28 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+        <meta name="viewport" content="width=device-width,user-scalable=no,initial-scale=1.0">
+        <link href="sencha-touch.css" rel="stylesheet" type="text/css" />
+        <link href="webodf.css" rel="stylesheet" type="text/css" />
+        <script type="text/javascript" src="sencha-touch.js"></script>
+        <script type="text/javascript" src="webodf.js"></script>
+        <script type="text/javascript" src="scripts.js"></script>
+        <script type="text/javascript" src="app/app.js"></script>
+        <script type="text/javascript" src="app/controller/Files.js"></script>
+        <script type="text/javascript" src="app/model/FileSystem.js"></script>
+        <script type="text/javascript" src="app/store/FileStore.js"></script>
+        <script type="text/javascript" src="app/views/FileDetail.js"></script>
+        <script type="text/javascript" src="app/views/FilesList.js"></script>
+        <script type="text/javascript" src="app/views/OdfView.js"></script>
+        <script type="text/javascript" src="app/views/Viewport.js"></script>
+        <title>WebODF</title>
+        <style>
+body {
+    background: url(icon.png);
+}
+</style>
+    </head>
+    <body onload="go()">
+    </body>
+</html>
diff --git a/apps/files_odfviewer/src/webodf/programs/playbook/scripts.js b/apps/files_odfviewer/src/webodf/programs/playbook/scripts.js
new file mode 100644
index 0000000000..e7913527d6
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/programs/playbook/scripts.js
@@ -0,0 +1,146 @@
+/*global blackberry, alert, document, window, app*/
+var LocalFileSystem = {
+    PERSISTENT: 0,
+    TEMPORARY: 1
+};
+function FileWriter(fullPath) {
+    "use strict";
+    this.write = function (data) {
+        var blob;
+        try {
+            blob = blackberry.utils.stringToBlob(data, "UTF-8");
+            blackberry.io.file.saveFile(fullPath, blob);
+        } catch (e) {
+        }
+    };
+}
+function FileEntry(name, fullPath) {
+    "use strict";
+    this.isFile = true;
+    this.isDirectory = false;
+    this.name = name;
+    this.fullPath = fullPath;
+    this.file = function (onsuccess, onerror) {
+        function File(fullPath) {
+            this.name = name;
+            this.fullPath = fullPath;
+            this.type = "";
+            this.size = -1;
+            this.lastModifiedDate = -1;
+        }
+        var file = new File(fullPath),
+            properties;
+        try {
+            properties = blackberry.io.file.getFileProperties(fullPath);
+            file.type = properties.mimeType;
+            file.size = properties.size;
+            file.lastModifiedDate = properties.dateModified;
+            onsuccess(file);
+        } catch (e) {
+            alert("Error on determining file properties: " + e);
+            onerror(e);
+        }
+    };
+    this.createWriter = function (onsuccess, onerror) {
+        onsuccess(new FileWriter(fullPath));
+    };
+}
+function FileReader() {
+    "use strict";
+    var fr = this;
+    this.readAsDataURL = function (file) {
+        var path = file.fullPath.substr(7);
+        window.setTimeout(function () {
+            try {
+                var data = blackberry.custom.filereader.readAsDataURL(path);
+                fr.onloadend({target: {result: data}});
+            } catch (e) {
+                alert("Error on reading file: " + e + " " + file.fullPath);
+            }
+        }, 1);
+    };
+    this.readAsText = function (file) {
+        var path = file.fullPath.substr(7);
+        try {
+            blackberry.io.file.readFile(path, function (fullPath, blob) {
+                var str = blackberry.utils.blobToString(blob, "UTF-8");
+                fr.onloadend({target: {result: str}});
+            }, true);
+        } catch (e) {
+            fr.onloadend({target: {result: "[]"}});
+        }
+    };
+}
+var DirectoryReader;
+function DirectoryEntry(name, fullPath) {
+    "use strict";
+    this.isFile = false;
+    this.isDirectory = true;
+    this.name = name;
+    this.fullPath = fullPath;
+    this.createReader = function () {
+        var reader = new DirectoryReader(fullPath);
+        return reader;
+    };
+}
+function DirectoryReader(fullPath) {
+    "use strict";
+    this.readEntries = function (onsuccess, onerror) {
+        window.setTimeout(function () {
+            var entries = [],
+                dirs = blackberry.io.dir.listDirectories(fullPath),
+                files = blackberry.io.dir.listFiles(fullPath),
+                i;
+            try {
+                for (i = 0; i < dirs.length; i += 1) {
+                    entries[entries.length] = new DirectoryEntry(dirs[i],
+                                             fullPath + "/" + dirs[i]);
+                }
+                for (i = 0; i < files.length; i += 1) {
+                    entries[entries.length] = new FileEntry(files[i],
+                                             fullPath + "/" + files[i]);
+                }
+                onsuccess(entries);
+            } catch (e) {
+                onerror(e);
+            }
+        }, 1);
+    };
+}
+window.resolveLocalFileSystemURI = function (path, onsuccess, onerror) {
+    "use strict";
+    var p = path.lastIndexOf("/"),
+        name;
+    if (p === -1) {
+        name = path;
+        path = blackberry.io.dir.appDirs.shared.documents.path + "/" + path;
+    } else {
+        name = path.substr(p + 1);
+    }
+    onsuccess(new FileEntry(name, path));
+};
+window.requestFileSystem = function (filesystem, id, onsuccess, onerror) {
+    "use strict";
+    var dirs = [], shared, subfolder;
+    try {
+        if (filesystem === LocalFileSystem.PERSISTENT) {
+            shared = blackberry.io.dir.appDirs.shared;
+            for (subfolder in shared) {
+                if (shared.hasOwnProperty(subfolder)) {
+                    dirs[dirs.length] = subfolder;
+                }
+            }
+            onsuccess({
+                name: "root",
+                root: new DirectoryEntry("root", shared.documents.path
+                    //+ "/kofficetests/odf/odt"
+                      )
+            });
+        } else {
+            onerror("not defined");
+        }
+    } catch (e) {
+        onerror(e);
+    }
+};
+var device = {};
diff --git a/apps/files_odfviewer/src/webodf/programs/qtjsruntime/CMakeLists.txt b/apps/files_odfviewer/src/webodf/programs/qtjsruntime/CMakeLists.txt
new file mode 100644
index 0000000000..ec8026741c
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/programs/qtjsruntime/CMakeLists.txt
@@ -0,0 +1,4 @@
+include(${QT_USE_FILE})
+QT4_WRAP_CPP(QTJSRUNTIME_MOC nam.h pagerunner.h nativeio.h)
+add_executable(qtjsruntime qtjsruntime.cpp pagerunner.cpp nativeio.cpp ${QTJSRUNTIME_MOC})
+target_link_libraries(qtjsruntime ${QT_LIBRARIES})
diff --git a/apps/files_odfviewer/src/webodf/programs/qtjsruntime/nam.h b/apps/files_odfviewer/src/webodf/programs/qtjsruntime/nam.h
new file mode 100644
index 0000000000..ebb62f261a
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/programs/qtjsruntime/nam.h
@@ -0,0 +1,48 @@
+#ifndef NAM_H
+#define NAM_H
+
+#include <QtNetwork/QNetworkAccessManager>
+#include <QtNetwork/QNetworkRequest>
+
+class NAM : public QNetworkAccessManager {
+Q_OBJECT
+private:
+    const QString host;
+    const int port;
+    int outstandingRequests;
+public:
+    NAM(QObject* parent, const QString& host_ = QString(), int port_ = -1)
+            :QNetworkAccessManager(parent), host(host_), port(port_) {
+        outstandingRequests = 0;
+        connect(this, SIGNAL(finished(QNetworkReply*)),
+                this, SLOT(requestFinished()));
+    }
+    QNetworkReply* createRequest(QNetworkAccessManager::Operation o,
+            QNetworkRequest const& r, QIODevice* d) {
+        outstandingRequests += 1;
+        bool samehost = false;
+        if (port > 0) {
+            samehost = r.url().host() == host
+                    || r.url().host().endsWith("." + host)
+                    || host.endsWith("." + r.url().host());
+            samehost &= r.url().port() != port;
+        } else {
+            // use host string as a prefix
+            samehost = r.url().toString().startsWith(host);
+        }
+        if (!samehost) {
+            // if not same host or domain and port, block
+            return QNetworkAccessManager::createRequest(o, QNetworkRequest(),
+                    d);
+        }
+        return QNetworkAccessManager::createRequest(o, r, d);
+    }
+    bool hasOutstandingRequests() {
+        return outstandingRequests > 0;
+    }
+public slots:
+    void requestFinished() {
+        outstandingRequests -= 1;
+    }
+};
+#endif
diff --git a/apps/files_odfviewer/src/webodf/programs/qtjsruntime/nativeio.cpp b/apps/files_odfviewer/src/webodf/programs/qtjsruntime/nativeio.cpp
new file mode 100644
index 0000000000..0657a0c711
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/programs/qtjsruntime/nativeio.cpp
@@ -0,0 +1,106 @@
+#include "nativeio.h"
+#include <QtWebKit/QWebPage>
+#include <QtCore/QCoreApplication>
+#include <QtCore/QTextCodec>
+
+NativeIO::NativeIO(QObject* parent, const QDir& runtimedir_,
+         const QDir& cwd_,
+         const QMap<QString, QFile::Permissions>& pathPermissions_)
+    :QObject(parent), runtimedir(runtimedir_), cwd(cwd_),
+      pathPermissions(pathPermissions_) {
+}
+QString
+NativeIO::readFileSync(const QString& path, const QString& encoding) {
+    errstr = QString();
+    QFile file(cwd.absoluteFilePath(path));
+    QByteArray data;
+    if (file.open(QIODevice::ReadOnly)) {
+        data = file.readAll();
+    }
+    QString out;
+    if (encoding != "binary") {
+        QTextCodec *codec = QTextCodec::codecForName(encoding.toAscii());
+        if (codec) {
+            out = codec->toUnicode(data);
+        }
+    }
+    if (out.length() == 0 && data.length() > 0) {
+        out = QString(data.length(), 0);
+        for (int i = 0; i < data.length(); ++i) {
+            out[i] = data[i];
+        }
+    }
+    return out;
+}
+QString
+NativeIO::read(const QString& path, int offset, int length) {
+    errstr = QString();
+    QFile file(cwd.absoluteFilePath(path));
+    QByteArray data;
+    if (file.open(QIODevice::ReadOnly) && (offset == 0 || file.seek(offset))) {
+        int lastLength = 0;
+        do {
+            lastLength = data.length();
+            data += file.read(length - data.length());
+        } while (data.length() < length && data.length() != lastLength);
+    }
+    if (length != data.length()) {
+        errstr = "Not enough data: " + QString::number(length) +
+                " instead of " + QString::number(data.length());
+        return QString();
+    }
+    QString out(length, 0);
+    for (int i = 0; i < length; ++i) {
+        out[i] = data[i];
+    }
+    return out;
+}
+void
+NativeIO::writeFile(const QString& path, const QString& data) {
+    QFile file(cwd.absoluteFilePath(path));
+    errstr = QString();
+    if (!file.open(QIODevice::WriteOnly)) {
+        errstr = "Could not open file for writing.";
+        return;
+    }
+    int length = data.length();
+    QByteArray out(length, 0);
+    for (int i = 0; i < length; ++i) {
+        out[i] = data[i].unicode();
+    }
+    if (file.write(out) != out.length()) {
+        errstr = "Could not write to file.";
+    }
+    return;
+}
+void
+NativeIO::unlink(const QString& path) {
+    errstr = QString();
+    QFile file(cwd.absoluteFilePath(path));
+    if (!file.remove()) {
+        errstr = "Could not delete file";
+    }
+}
+int
+NativeIO::getFileSize(const QString& path) {
+    errstr = QString();
+    QFile file(cwd.absoluteFilePath(path));
+    if (!file.exists()) {
+        errstr = "Could not determine file size.";
+    }
+    return file.size();
+}
+void
+NativeIO::exit(int exitcode) {
+    qApp->exit(exitcode);
+}
+QString
+NativeIO::currentDirectory() const {
+    return QDir::currentPath();
+}
+QStringList
+NativeIO::libraryPaths() const {
+    QStringList paths;
+    paths << runtimedir.absolutePath() << cwd.absolutePath();
+    return paths;
+}
diff --git a/apps/files_odfviewer/src/webodf/programs/qtjsruntime/nativeio.h b/apps/files_odfviewer/src/webodf/programs/qtjsruntime/nativeio.h
new file mode 100644
index 0000000000..b699744226
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/programs/qtjsruntime/nativeio.h
@@ -0,0 +1,41 @@
+#ifndef NATIVEIO_H
+#define NATIVEIO_H
+
+#include <QtCore/QFile>
+#include <QtCore/QDir>
+#include <QtCore/QMap>
+
+class QWebPage;
+
+// class that exposes filesystem to web environment
+class NativeIO : public QObject {
+Q_OBJECT
+private:
+    QWebPage* webpage;
+    QString errstr;
+    const QDir runtimedir;
+    const QDir cwd;
+    const QMap<QString, QFile::Permissions> pathPermissions;
+public:
+    typedef QMap<QString, QFile::Permissions> PathMap;
+    PathMap v;
+    NativeIO(QObject* parent, const QDir& runtimedir, const QDir& cwd,
+             const PathMap& pathPermissions = PathMap());
+public slots:
+    /**
+     * Return the last error.
+     */
+    QString error() {
+        return errstr;
+    }
+    QString readFileSync(const QString& path, const QString& encoding);
+    QString read(const QString& path, int offset, int length);
+    void writeFile(const QString& path, const QString& data);
+    void unlink(const QString& path);
+    int getFileSize(const QString& path);
+    void exit(int exitcode);
+    QString currentDirectory() const;
+    QStringList libraryPaths() const;
+};
+
+#endif
diff --git a/apps/files_odfviewer/src/webodf/programs/qtjsruntime/pagerunner.cpp b/apps/files_odfviewer/src/webodf/programs/qtjsruntime/pagerunner.cpp
new file mode 100644
index 0000000000..a91794d9a2
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/programs/qtjsruntime/pagerunner.cpp
@@ -0,0 +1,191 @@
+#include "pagerunner.h"
+
+#include "nam.h"
+#include "nativeio.h"
+#include <QtCore/QFileInfo>
+#include <QtCore/QTemporaryFile>
+#include <QtCore/QTimer>
+#include <QtCore/QCoreApplication>
+#include <QtGui/QPainter>
+#include <QtGui/QPrinter>
+#include <QtWebKit/QWebFrame>
+#include <QtCore/QDebug>
+
+QByteArray getRuntimeBindings() {
+    return
+    "if (typeof(runtime) !== 'undefined') {"
+    "    runtime.readFileSync = function (path, encoding) {"
+    "        return nativeio.readFileSync(path, encoding);"
+    "    };"
+    "    runtime.read = function (path, offset, length, callback) {"
+    "        var data = nativeio.read(path, offset, length);"
+    "        data = runtime.byteArrayFromString(data, 'binary');"
+    "        callback(nativeio.error()||null, data);"
+    "    };"
+    "    runtime.writeFile = function (path, data, callback) {"
+    "        data = runtime.byteArrayToString(data, 'binary');"
+    "        nativeio.writeFile(path, data);"
+    "        callback(nativeio.error()||null);"
+    "    };"
+    "    runtime.deleteFile = function (path, callback) {"
+    "        nativeio.unlink(path);"
+    "        callback(nativeio.error()||null);"
+    "    };"
+    "    runtime.getFileSize = function (path, callback) {"
+    "        callback(nativeio.getFileSize(path));"
+    "    };"
+    "    runtime.exit = function (exitCode) {"
+    "        nativeio.exit(exitCode);"
+    "    };"
+    "    runtime.currentDirectory = function () {"
+    "        return nativeio.currentDirectory();"
+    "    };"
+    "}";
+}
+
+PageRunner::PageRunner(const QStringList& args)
+    : QWebPage(0),
+      out(stdout),
+      err(stderr),
+      view(new QWidget()) {
+
+    QMap<QString, QString> settings = parseArguments(args);
+    QStringList arguments = args.mid(settings.size() * 2);
+    exportpdf = settings.value("export-pdf");
+    exportpng = settings.value("export-png");
+    url = QUrl(arguments[0]);
+    nativeio = new NativeIO(this, QFileInfo(arguments[0]).dir(),
+                            QDir::current());
+    if (url.scheme() == "file" || url.isRelative()) {
+        QFileInfo info(url.toLocalFile());
+        if (!info.isReadable() || !info.isFile()) {
+            QTextStream err(stderr);
+            err << "Cannot read file '" + url.toString() + "'.\n";
+            qApp->exit(1);
+        }
+    }
+    nam = new NAM(this, QUrl(url).host(), QUrl(url).port());
+
+    setNetworkAccessManager(nam);
+    connect(this, SIGNAL(loadFinished(bool)), this, SLOT(finished(bool)));
+    connect(mainFrame(), SIGNAL(javaScriptWindowObjectCleared()),
+            this, SLOT(slotInitWindowObjects()));
+    sawJSError = false;
+
+    setView(view);
+    scriptMode = arguments[0].endsWith(".js");
+    if (scriptMode) {
+        QByteArray html = "'" + arguments[0].toUtf8().replace('\'', "\\'")
+                + "'";
+        for (int i = 1; i < arguments.length(); ++i) {
+            html += ",'" + arguments[i].toUtf8().replace('\'', "\\'") + "'";
+        }
+        html = "<html>"
+                "<head><base href=\".\"></base><title></title>"
+                "<script>var arguments=[" + html + "];</script>"
+                "<script src=\"" + arguments[0].toUtf8() + "\"></script>";
+        if (arguments[0].endsWith("runtime.js")) {
+            // add runtime modification
+            html += "<script>" + getRuntimeBindings() +
+                        "    runtime.libraryPaths = function () {"
+                        "        /* convert to javascript array */"
+                        "        var p = nativeio.libraryPaths(),"
+                        "            a = [], i;"
+                        "        for (i in p) { a[i] = p[i]; }"
+                        "        return a;"
+                        "    };</script>";
+        }
+        html += "</head><body></body></html>\n";
+        QTemporaryFile tmp("XXXXXX.html");
+        tmp.setAutoRemove(true);
+        tmp.open();
+        tmp.write(html);
+        tmp.close();
+        mainFrame()->load(tmp.fileName());
+    } else {
+        // Make the url absolute. If it is not done here, QWebFrame will do
+        // it, and it will lose the query and fragment part.
+        QUrl absurl;
+        if (url.isRelative()) {
+            absurl = QUrl::fromLocalFile(QFileInfo(url.toLocalFile()).absoluteFilePath());
+            absurl.setQueryItems(url.queryItems());
+            absurl.setFragment(url.fragment());
+        } else {
+            absurl = url;
+        }
+        mainFrame()->load(absurl);
+    }
+}
+PageRunner::~PageRunner() {
+    delete view;
+}
+void PageRunner::finished(bool ok) {
+    // bind nativeio
+    if (!ok) {
+        qApp->exit(1);
+    }
+    if (!scriptMode) {
+        mainFrame()->evaluateJavaScript(getRuntimeBindings());
+    }
+
+    // connect signals
+    connect(this, SIGNAL(contentsChanged()), this, SLOT(noteChange()));
+    connect(this, SIGNAL(downloadRequested(QNetworkRequest)),
+            this, SLOT(noteChange()));
+    connect(this, SIGNAL(repaintRequested(QRect)),
+            this, SLOT(noteChange()));
+    connect(mainFrame(), SIGNAL(pageChanged()), this, SLOT(noteChange()));
+    connect(this, SIGNAL(geometryChangeRequested(QRect)),
+            this, SLOT(noteChange()));
+    QTimer::singleShot(150, this, SLOT(reallyFinished()));
+    changed = false;
+    time.start();
+}
+void PageRunner::reallyFinished() {
+    int latency = time.restart();
+    // err << latency << " " << changed << " " << nam->hasOutstandingRequests() << endl;
+    if (changed || latency >= 152 || nam->hasOutstandingRequests()) {
+        QTimer::singleShot(150, this, SLOT(reallyFinished()));
+        changed = false;
+        return;
+    }
+    if (!exportpdf.isEmpty() || !exportpng.isEmpty()) {
+        setViewportSize(mainFrame()->contentsSize());
+    }
+    if (!exportpng.isEmpty()) {
+        renderToFile(exportpng);
+    }
+    if (!exportpdf.isEmpty()) {
+        printToFile(exportpdf);
+    }
+    qApp->exit(sawJSError);
+}
+QMap<QString, QString> PageRunner::parseArguments(const QStringList& args) {
+    int i = 0;
+    QMap<QString, QString> settings;
+    while (i + 2 < args.length()) {
+        if (args[i].startsWith("--")) {
+            settings[args[i].mid(2)] = args[i+1];
+        }
+        i += 2;
+    }
+    return settings;
+}
+void PageRunner::slotInitWindowObjects() {
+    mainFrame()->addToJavaScriptWindowObject("nativeio", nativeio);
+}
+void PageRunner::renderToFile(const QString& filename) {
+    QImage pixmap(mainFrame()->contentsSize().boundedTo(QSize(10000,10000)),
+                  QImage::Format_ARGB32_Premultiplied);
+    QPainter painter(&pixmap);
+    mainFrame()->render(&painter, QWebFrame::ContentsLayer);
+    painter.end();
+    pixmap.save(filename);
+}
+void PageRunner::printToFile(const QString& filename) {
+    QPrinter printer(QPrinter::HighResolution);
+    printer.setFontEmbeddingEnabled(true);
+    printer.setOutputFormat(QPrinter::PdfFormat);
+    printer.setOutputFileName(filename);
+    mainFrame()->print(&printer);
+}
diff --git a/apps/files_odfviewer/src/webodf/programs/qtjsruntime/pagerunner.h b/apps/files_odfviewer/src/webodf/programs/qtjsruntime/pagerunner.h
new file mode 100644
index 0000000000..9c848acc10
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/programs/qtjsruntime/pagerunner.h
@@ -0,0 +1,68 @@
+#ifndef PAGERUNNER_H
+#define PAGERUNNER_H
+
+#include <QtCore/QTextStream>
+#include <QtCore/QTime>
+#include <QtWebKit/QWebPage>
+
+class NAM;
+class NativeIO;
+
+class PageRunner : public QWebPage {
+Q_OBJECT
+private:
+    QUrl url;
+    NAM* nam;
+    QTextStream out;
+    QTextStream err;
+    bool changed;
+    QWidget* const view;
+    QTime time;
+    bool scriptMode;
+    NativeIO* nativeio;
+    QString exportpdf;
+    QString exportpng;
+    bool sawJSError;
+public:
+    PageRunner(const QStringList& args);
+    ~PageRunner();
+private slots:
+    void finished(bool ok);
+    void noteChange() {
+        changed = true;
+    }
+    void reallyFinished();
+    void slotInitWindowObjects();
+    bool shouldInterruptJavaScript() {
+        changed = true;
+        return false;
+    }
+private:
+    void javaScriptConsoleMessage(const QString& message, int lineNumber,
+            const QString& sourceID) {
+        changed = true;
+        if (scriptMode) {
+            err << message << endl;
+        } else {
+            err << sourceID << ":" << lineNumber << " " << message << endl;
+        }
+        sawJSError = true;
+    }
+    void javaScriptAlert(QWebFrame* /*frame*/, const QString& msg) {
+        changed = true;
+        err << "ALERT: " << msg << endl;
+    }
+    bool javaScriptPrompt(QWebFrame*, const QString&, const QString&, QString*){
+        changed = true;
+        return false;
+    }
+    void renderToFile(const QString& filename);
+    void printToFile(const QString& filename);
+    // overload because default impl was causing a crash
+    QString userAgentForUrl(const QUrl&) const {
+        return QString();
+    }
+    QMap<QString, QString> parseArguments(const QStringList& args);
+};
+
+#endif
diff --git a/apps/files_odfviewer/src/webodf/programs/qtjsruntime/qtjsruntime.cpp b/apps/files_odfviewer/src/webodf/programs/qtjsruntime/qtjsruntime.cpp
new file mode 100644
index 0000000000..35d04da146
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/programs/qtjsruntime/qtjsruntime.cpp
@@ -0,0 +1,20 @@
+/**
+ * Small executable that loads a javascript or html page from local a URI.
+ * If the URI ends in .js it will be run in QtScript engine, otherwise, it will
+ * be assumed to be a webpage that will be opened in
+ */
+#include "pagerunner.h"
+#include <QtGui/QApplication>
+int
+main(int argc, char** argv) {
+    if (argc < 2) {
+        QTextStream err(stderr);
+        err << "Usage: " << argv[0] << " [--export-pdf pdffile] "
+               "[--export-png pngfile] html/javascripfile [arguments]\n";
+        return 1;
+    }
+    QApplication app(argc, argv);
+    app.setApplicationName(argv[0]);
+    PageRunner p(QCoreApplication::arguments().mid(1));
+    return app.exec();
+}
diff --git a/apps/files_odfviewer/src/webodf/programs/touchui/CMakeLists.txt b/apps/files_odfviewer/src/webodf/programs/touchui/CMakeLists.txt
new file mode 100644
index 0000000000..0a18076273
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/programs/touchui/CMakeLists.txt
@@ -0,0 +1,7 @@
+COPY_FILES(TOUCHUIDEPS ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_CURRENT_BINARY_DIR} ${HTML5UIFILES})
+COPY_FILES(TOUCHUIDEPS ${CMAKE_CURRENT_SOURCE_DIR}
+    ${CMAKE_CURRENT_BINARY_DIR} index.html scripts.js welcome.odt)
+COPY_FILES(TOUCHUIDEPS ${CMAKE_SOURCE_DIR}/webodf
+    ${CMAKE_CURRENT_BINARY_DIR} webodf.css ${LIBJSFILES})
+add_custom_target(touchuiDepencencies ALL DEPENDS ${TOUCHUIDEPS})
diff --git a/apps/files_odfviewer/src/webodf/programs/touchui/ZoomIn.png b/apps/files_odfviewer/src/webodf/programs/touchui/ZoomIn.png
new file mode 100644
index 0000000000000000000000000000000000000000..6041c6ff937666e4266abf66970328fdbc080e20
GIT binary patch
literal 670
zcmV;P0%84$P)<h;3K|Lk000e1NJLTq001oj001or1^@s6IvV1d0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!KuJVFRCwC#Sj%m~KoG@<JMMsVV4rib
zsQ@~FR1glilL8`z4j>f(71&&Iji~^qf^{lzW|Kj(oSogZJs2YSNh1S`&0}`neAekz
zK%VCwTzs%Qyt=p)gJoce<2Z-jwE;wjU`w!5ZU+Ij1{+<A@DfSXg(N?0i>wFsk@G<Q
z>7Wh5BIn19i=(3uT3isA3K@PUDSRe{8RAukISBQQTW~tDMPL()U0NGF?s1adYJTXk
z;<Exxh@Du(i9bS#$ZN23l$e(sq$A?tlZMY75gr#!yzO8SNEK@v5X}R1<I8(+PGi~A
z{o$w~F0;mlQ<QzMDY3RN+#92<v|jlomME5{bv;dymR|m1O#drx(!S#J9dpgvX&SJ~
z7!ZXd(Zp~WZfWgLjLTgEf~lhTxOGXZ;_#D*VHNz+ntVN0d@r@AnAYL(?=YYWgF=YU
z#QU_A(o!mn*cv98=~c=G(tF*F5Xa~HVu<0fsXAh#RYq86(&-bi8Zz(bl+ezhZcM8Z
z|D1W^m{$<C73mETf2N8UqAg6#7_oEBYJsL3^BO*v>d{5xos`{N%dP1v*ANhK4W@>{
zSg`3u)B6^W14fo-B!X)SvKedx3som5q7===Qtn%JZW-q1Bj>C*%P$YXI^bUD>_fCg
zd}whTU_yir@LD5Y5a_z1=eOmI!%5t!n$J;iAtBHoky4|Y<^+phoGt0)GNIBD?}&HA
zJK`Pjj<^l+n>=B{avl<ACAW=|$8S446vR(O!ruZ600>Znvx<9`Z2$lO07*qoM6N<$
Ef*6}H!T<mO

literal 0
HcmV?d00001

diff --git a/apps/files_odfviewer/src/webodf/programs/touchui/ZoomOut.png b/apps/files_odfviewer/src/webodf/programs/touchui/ZoomOut.png
new file mode 100644
index 0000000000000000000000000000000000000000..733a4e1adab0a894598e1e9c8dd854cc5057718f
GIT binary patch
literal 607
zcmV-l0-*hgP)<h;3K|Lk000e1NJLTq001oj001or1^@s6IvV1d0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!0ZBwbRCwC#SkZ05Fc8HR|6v3A*RLvU
zkaPmrfNsDD=?07tbppCUU;={p>Q~YUOeb*9)qSL??OftZ04Yy8MKaOlalUtVwwSbl
zQYwVU0_+i=GyG`}b^*(U5QoXN0Yn3^1guarNU#)ael5ZYlIRLeJ{XE@2zFFF(0@7_
zg0NKlSaWd{2BGaM0yE))@8p#=EzB67F1&(J-?;_n5?cngB<xb!5b=<c^v?02O-o;q
zBgG09apFg8A__fr&L-xBgLGzbzV!4vw?tfeMH?L(Yb;aRt=X%I&R2`mfKe}|G}&>d
zM#^0KjnVdTD7kalB1*RMH?=g9yuNUFdZxDGOZ0g@{pnyrd;`JK(0pcHN&jz?LVOvP
z_e7uiy%)oJN$8j)JWTEoQ(F$|Ev+rT5q*}H^%<u~)D?vobxjXbuExwey0U2J&@~EM
z_BKoF1)1;A-_KCv9>zAlj*orJzK$8)e<!u@1|Chfedb-KgK5LTm`^W`*|&NfFel!T
zNUl>5<zO2T+O?ibKCp?D*fbVsE6Qx5ODdGRQ}1IWGbHN)x2L-gITZ1La2?Qu3<D4j
zM!X`>v}NRX^@_tuT(qs{D7e@n&|i@nCd8&2EPingq?dkDWh6clABm5|N8%%K3h|q~
tVZwGEV|%|Z)FOV{>0uyVR0;nGFaU{VsG5a2Ob!45002ovPDHLkV1ih@3se9A

literal 0
HcmV?d00001

diff --git a/apps/files_odfviewer/src/webodf/programs/touchui/app/app.js b/apps/files_odfviewer/src/webodf/programs/touchui/app/app.js
new file mode 100644
index 0000000000..60da480a5f
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/programs/touchui/app/app.js
@@ -0,0 +1,40 @@
+/*global Ext, invokeString, document*/
+/**
+ * When the application has been initialized, this function is called, if
+ * it has been set. By default, it will start scanning the files in the
+ * files sytem. It can be overridden by e.g. PhoneGap to wait until the device
+ * is ready.
+ */
+var onApplicationLaunch = function (app) {
+    "use strict";
+    app.startScanningDirectories();
+};
+Ext.application({
+    name : 'WebODFApp',
+    models: ['FileSystem'],
+    views: ['Viewport', 'FilesList', 'FileDetail', 'OdfView'],
+    controllers: ['Files'],
+    stores: ['FileStore'],
+    launch: function () {
+        'use strict';
+        var app = this;
+        Ext.create('WebODFApp.view.Viewport');
+        app.openUrl = function (url) {
+            var proxy = Ext.getStore("FileStore").getProxy();
+            proxy.getRecord(url, function (record) {
+                var controller;
+                if (!record) {
+                    alert("Cannot open " + url);
+                } else {
+                    controller = app.getController('Files');
+                    controller.show(null, null, null, record);
+                }
+            });
+        };
+        this.startScanningDirectories = function () {
+            var proxy = Ext.getStore("FileStore").getProxy();
+            proxy.startScanningDirectories();
+        };
+        onApplicationLaunch(this);
+    }
+});
diff --git a/apps/files_odfviewer/src/webodf/programs/touchui/app/controller/Files.js b/apps/files_odfviewer/src/webodf/programs/touchui/app/controller/Files.js
new file mode 100644
index 0000000000..22e06f85b6
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/programs/touchui/app/controller/Files.js
@@ -0,0 +1,82 @@
+/*global Ext, runtime*/
+Ext.define('WebODFApp.controller.Files', {
+    extend: 'Ext.app.Controller',
+
+    config: {
+        refs: {
+            mainView: 'mainview',
+            filesList: 'fileslist list',
+            fileDetail: 'filedetail',
+            openButton: '#openButton',
+            odfView: 'odfview',
+            title: 'titlebar'
+        },
+        control: {
+            mainView: {
+                pop: 'pop',
+                push: 'push',
+                back: 'back'
+            },
+            filesList: {
+                itemtap: 'show'
+            },
+            openButton: {
+                tap: 'open'
+            }
+        }
+    },
+    back: function () {
+        "use strict";
+        this.odfView.hideCanvas();
+    },
+    push: function (view, item) {
+        "use strict";
+        if (item.xtype === "filedetail") {
+            this.getOpenButton().show();
+        } else {
+            this.getOpenButton().hide();
+        }
+    },
+    pop: function (view, item) {
+        "use strict";
+        if (item.xtype === "odfview") { // going to filedetail
+            this.getOpenButton().show();
+        } else {
+            this.getOpenButton().hide();
+        }
+        this.getFilesList().deselectAll();
+    },
+    show: function (list, index, target, record, e) {
+        "use strict";
+        // set the record in the details view and the file view
+        // this way, document starts loading in the background
+        var c = this;
+        if (!this.fileDetail) {
+            this.fileDetail = Ext.create('WebODFApp.view.FileDetail');
+        }
+        if (!this.odfView) {
+            this.odfView = Ext.create('WebODFApp.view.OdfView');
+            this.odfView.addCanvasListener(this.fileDetail.canvasListener);
+        }
+        this.odfView.hideCanvas();
+        this.fileDetail.odfView = this.odfView;
+        this.fileDetail.setRecord(record);
+        this.getMainView().push(this.fileDetail);
+        runtime.setTimeout(function () {
+            c.odfView.setRecord(record);
+        }, 300);
+    },
+    open: function (options) {
+        "use strict";
+        var c = this;
+        if (!this.odfView) {
+            this.odfView = Ext.create('WebODFApp.view.OdfView');
+        }
+        this.odfView.hideCanvas();
+        this.odfView.setRecord(this.fileDetail.getRecord());
+        this.getMainView().push(this.odfView);
+        runtime.setTimeout(function () {
+            c.odfView.showCanvas();
+        }, 300);
+    }
+});
diff --git a/apps/files_odfviewer/src/webodf/programs/touchui/app/model/FileSystem.js b/apps/files_odfviewer/src/webodf/programs/touchui/app/model/FileSystem.js
new file mode 100644
index 0000000000..3346008f1a
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/programs/touchui/app/model/FileSystem.js
@@ -0,0 +1,265 @@
+/*global Ext, console, app, window, LocalFileSystem, JSON, FileReader, runtime*/
+Ext.define("WebODFApp.model.FileSystemProxy", (function () {
+    "use strict";
+    var self = this,
+        scanner;
+    function Scanner(proxy) {
+        var todo = [],
+            done = false,
+            fileSystems,
+            files,
+            cachedList = [],
+            dirs = {},
+            lastUpdate = 0,
+            lastUpdateTime = new Date();
+
+        function getFileId(fullPath) {
+            var i;
+            if (!files) {
+                return -1;
+            }
+            for (i = 0; i < files.length; i += 1) {
+                if (files[i].get('fullPath') === fullPath) {
+                    return i;
+                }
+            }
+            return -1;
+        }
+        this.getFileId = getFileId;
+        function addFileEntry(entry, callback) {
+            function fail() {
+                callback(-1);
+            }
+            var id = getFileId(entry.fullPath);
+            if (id !== -1) {
+                return callback(id);
+            }
+            entry.file(function (file) {
+                var id = files.length;
+                files.push(Ext.create('WebODFApp.model.FileSystem', {
+                    id: id,
+                    fileName: entry.name,
+                    fullPath: entry.fullPath,
+                    size: file.size
+                }));
+                callback(id);
+            }, fail);
+        }
+        function parseCachedFileList(pos, callback) {
+            if (pos === cachedList.length) {
+                return callback();
+            }
+            window.resolveLocalFileSystemURI(cachedList[pos], function (entry) {
+                addFileEntry(entry, function () {
+                    parseCachedFileList(pos + 1, callback);
+                });
+            }, function () {
+                parseCachedFileList(pos + 1, callback);
+            });
+        }
+        function readCachedFileList(callback) {
+            window.resolveLocalFileSystemURI("cachedODFList.json",
+                function (fileentry) {
+                    var reader = new FileReader();
+                    reader.onloadend = function (evt) {
+                        cachedList = [];
+                        try {
+                            cachedList = JSON.parse(evt.target.result);
+                        } catch (e) {
+                            alert(e);
+                        }
+                        parseCachedFileList(0, callback);
+                    };
+                    reader.readAsText(fileentry);
+                }, function () {
+                    callback();
+                });
+        }
+        function writeCachedFileList() {
+            var i,
+                l = files.length;
+            cachedList.length = files.length;
+            for (i = 0; i < l; i += 1) {
+                cachedList[i] = files[i].get('fullPath');
+            }
+            window.resolveLocalFileSystemURI("cachedODFList.json",
+                function (fileentry) {
+                    fileentry.createWriter(function (writer) {
+                        writer.write(JSON.stringify(cachedList));
+                    }, function (e) {
+                        runtime.log(JSON.stringify(e));
+                    });
+                }, function (e) {
+                    runtime.log(JSON.stringify(e));
+                });
+        }
+        function filter(name) {
+            var suffix = name.substr(name.length - 4);
+            return suffix === ".odt" || suffix === ".odp" || suffix === ".ods";
+        }
+        function errorCallback(err) {
+            console.log("FILE READ ERROR " + err + " " + todo.length);
+            done = true;
+        }
+        function load(entry, callback) {
+            function fail() {
+                callback(-1);
+            }
+            if (entry.isDirectory) {
+                entry.createReader().readEntries(function (entries) {
+                    var i = 0;
+                    for (i = 0; i < entries.length; i += 1) {
+                        entry = entries[i];
+                        if (entry.isDirectory
+                                && !dirs.hasOwnProperty(entry.fullPath)) {
+                            todo.push(entry);
+                            dirs[entry.fullPath] = entry;
+                        } else if (filter(entry.name)) {
+                            todo.push(entry);
+                        }
+                    }
+                    callback(-1);
+                }, fail);
+            } else if (entry.isFile) {
+                addFileEntry(entry, callback);
+            } else {
+                fail();
+            }
+        }
+        function addFileSystem(fileSystem) {
+            var dir = fileSystems[fileSystem.name] = {};
+            todo.push(fileSystem.root);
+            function callback() {
+                var now = new Date(),
+                    // a limit is needed, otherwise the # of files too large to
+                    // be handled by sencha touch
+                    done = todo.length === 0 || files.length > 2000,
+                    store = Ext.getStore('FileStore');
+                if (done || lastUpdate === 0 || (files.length - lastUpdate > 0
+                        && now - lastUpdateTime > files.length * 100)) {
+                    store.load();
+                    lastUpdate = files.length;
+                    lastUpdateTime = now;
+                }
+                if (done) {
+                    writeCachedFileList();
+                } else {
+                    load(todo.shift(), callback);
+                }
+            }
+            load(todo.shift(), callback);
+        }
+        function addFileSystems() {
+            window.requestFileSystem(LocalFileSystem.PERSISTENT, 0,
+                    addFileSystem, errorCallback);
+            window.requestFileSystem(LocalFileSystem.TEMPORARY, 0,
+                    addFileSystem, function () {});
+        }
+        this.scan = function () {
+            if (fileSystems !== undefined) {
+                return;
+            }
+            fileSystems = {};
+            readCachedFileList(function () {
+                addFileSystems();
+            });
+        };
+        this.load = load;
+        this.files = files = [];
+    }
+    function finishOperation(proxy, operation, callback, scope) {
+        if (operation) {
+            var i = 0,
+                recs = operation.getRecords(),
+                len = recs.length;
+
+            for (i; i < len; i += 1) {
+                recs[i].commit();
+            }
+            operation.setSuccessful();
+
+            Ext.callback(callback, scope || proxy, [operation]);
+        }
+    }
+    return {
+        extend: "Ext.data.proxy.Proxy",
+        xtype: 'filesystemproxy',
+        constructor: function (config) {
+            this.initConfig(config);
+            scanner = new Scanner(this);
+            this.startScanningDirectories = function () {
+                scanner.scan();
+            };
+            this.getRecord = function (url, callback) {
+                var id = scanner.getFileId(url);
+                if (id !== -1) {
+                    return callback(scanner.files[id]);
+                }
+                window.resolveLocalFileSystemURI(url,
+                    function (fileentry) {
+                        scanner.load(fileentry, function (id) {
+                            Ext.getStore('FileStore').load();
+                            callback(scanner.files[id]);
+                        });
+                    },
+                    function (evt) {
+                        callback(null);
+                    });
+            };
+        },
+    
+        create: function (operation, callback, scope) {
+            finishOperation(this, operation, callback, scope);
+        },
+    
+        read: function (operation, callback, scope) {
+            var me = this,
+                records = scanner.files;
+            if (!records) {
+                return;
+            }
+            // return model instances in a resultset
+            operation.setResultSet(new Ext.data.ResultSet({
+                //total: records.length,
+                count: records.length,
+                records: records,
+                success: true
+            }));
+
+            // announce success
+            operation.setSuccessful();
+            operation.setCompleted();
+    
+            // finish with callback
+            Ext.callback(callback, scope || me, [operation]);
+        },
+    
+        update: function (operation, callback, scope) {
+            finishOperation(this, operation, callback, scope);
+        },
+    
+        destroy: function (operation, callback, scope) {
+            finishOperation(this, operation, callback, scope);
+        }
+    };
+}()));
+
+Ext.define("WebODFApp.model.FileSystem", {
+    extend: 'Ext.data.Model',
+    config: {
+        idProperty: 'id',
+        fields: [ {
+            name: "id",
+            type: "auto"
+        }, {
+            name: "fullPath",
+            type: "string"
+        }, {
+            name: "fileName",
+            type: "string"
+        }, {
+            name: "size",
+            type: "int"
+        } ]
+    }
+});
diff --git a/apps/files_odfviewer/src/webodf/programs/touchui/app/store/FileStore.js b/apps/files_odfviewer/src/webodf/programs/touchui/app/store/FileStore.js
new file mode 100644
index 0000000000..d2932c8989
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/programs/touchui/app/store/FileStore.js
@@ -0,0 +1,30 @@
+/*global Ext*/
+Ext.define('WebODFApp.store.FileStore', {
+    extend: 'Ext.data.Store',
+    config: {
+        storeId: 'FileStore',
+        model: 'WebODFApp.model.FileSystem',
+        autoLoad: true,
+        grouper: {
+            groupFn: function (record) {
+                "use strict";
+                return record.get('fileName')[0].toUpperCase();
+            }
+        },
+        proxy: {
+            xtype: 'filesystemproxy'
+        },
+        sorters: function (a, b) {
+            "use strict";
+            a = a.get('fileName').toUpperCase();
+            b = b.get('fileName').toUpperCase();
+            if (a > b) {
+                return 1;
+            }
+            if (a < b) {
+                return -1;
+            }
+            return 0;
+        }
+    }
+});
diff --git a/apps/files_odfviewer/src/webodf/programs/touchui/app/views/FileDetail.js b/apps/files_odfviewer/src/webodf/programs/touchui/app/views/FileDetail.js
new file mode 100644
index 0000000000..b79876c6de
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/programs/touchui/app/views/FileDetail.js
@@ -0,0 +1,122 @@
+/*global Ext, app, runtime, xmldom, odf*/
+runtime.loadClass("xmldom.XPath");
+runtime.loadClass("odf.Style2CSS");
+Ext.define('WebODFApp.view.FileDetail', (function () {
+    "use strict";
+    var panel,
+        style2CSS = new odf.Style2CSS(),
+        xpath = new xmldom.XPath(),
+        fileDetail,
+        title,
+        image,
+        list,
+        emptyImageUrl = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAAXNSR0IArs4c6QAAAAtJREFUCB1jYGAAAAADAAFPSAqvAAAAAElFTkSuQmCC";
+    function getTitle(body) {
+        var ps,
+            title;
+        ps = xpath.getODFElementsWithXPath(body,
+                ".//text:h", style2CSS.namespaceResolver);
+        title = "";
+        if (ps && ps.length) {
+            title = ps[0].nodeValue;
+        } else {
+            ps = xpath.getODFElementsWithXPath(body,
+                ".//text:p", style2CSS.namespaceResolver);
+            if (ps && ps.length) {
+                title = ps[0].nodeValue;
+            }
+        }
+        return title;
+    }
+    function metaToJSON(body, meta) {
+        var json = [],
+            title = body && getTitle(body),
+            e = meta && meta.firstChild,
+            name;
+        if (title) {
+            json.push({name: "title", value: title});
+        }
+        while (e) {
+            if (e.nodeType === 1 && e.textContent) {
+                if (e.localName === "user-defined") {
+                    name = e.getAttributeNS(
+                        "urn:oasis:names:tc:opendocument:xmlns:meta:1.0",
+                        "name"
+                    );
+                } else {
+                    name = e.localName;
+                }
+                json.push({
+                    name: name,
+                    value: e.textContent
+                });
+            }
+            e = e.nextSibling;
+        }
+        return json;
+    }
+    return {
+        extend: 'Ext.Panel',
+        xtype: 'filedetail',
+        config: {
+            title: 'File details',
+            layout: 'vbox',
+            items: [{
+                id: "title",
+                dock: 'top',
+                xtype: 'toolbar'
+            }, {
+                id: 'details',
+                xtype: 'container',
+                layout: 'hbox',
+                flex: 1,
+                items: [{
+                    id: 'thumbnail',
+                    xtype: 'image',
+                    width: 256,
+                    maxWidth: "50%"
+                }, {
+                    id: 'metalist',
+                    xtype: 'list',
+                    store: {
+                        fields: ["name", "value"],
+                        data: []
+                    },
+                    itemTpl: "{name}: {value}",
+                    flex: 1
+                }]
+            }],
+            listeners: {
+                initialize: function () {
+                    fileDetail = this.query("#details")[0];
+                    title = this.query("#title")[0];
+                    image = fileDetail.query('#thumbnail')[0];
+                    list = fileDetail.query('#metalist')[0];
+                }
+            }
+        },
+        updateRecord: function (record) {
+            if (record) {
+                fileDetail.setMasked({
+                    xtype: 'loadmask',
+                    message: 'Loading...'
+                });
+                title.setTitle(record.get('fileName'));
+            }
+        },
+        canvasListener: function (odfcanvas) {
+            var view = this,
+                odfcontainer = odfcanvas.odfContainer(),
+                part = odfcontainer.getPart("Thumbnails/thumbnail.png"),
+                metajson = [];
+            metajson = metaToJSON(odfcontainer.rootElement.body,
+                    odfcontainer.rootElement.meta);
+            part.onstatereadychange = function (part) {
+                image.setSrc(part.url || emptyImageUrl);
+            };
+            part.load();
+            list.getStore().setData(metajson);
+            fileDetail.unmask();
+        }
+    };
+}()));
diff --git a/apps/files_odfviewer/src/webodf/programs/touchui/app/views/FilesList.js b/apps/files_odfviewer/src/webodf/programs/touchui/app/views/FilesList.js
new file mode 100644
index 0000000000..1a82a2e8b6
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/programs/touchui/app/views/FilesList.js
@@ -0,0 +1,47 @@
+/*global Ext, app, filestore */
+Ext.define("WebODFApp.view.FilesList", {
+    extend: "Ext.Panel",
+    xtype: 'fileslist',
+    config: {
+        layout: 'fit',
+        items: [{
+            xtype: 'list',
+            store: 'FileStore',
+/*
+            store: {
+                fields: ['fileName', 'fullPath'],
+                grouper: {
+                    groupFn: function (record) {
+                        "use strict";
+                        return record.get('fileName')[0].toUpperCase();
+                    }
+                },
+                data: [
+                    {fileName: 'Cowper', fullPath: '-'},
+                    {fileName: 'Everett', fullPath: '-'},
+                    {fileName: 'University', fullPath: '-'},
+                    {fileName: 'Forest', fullPath: '-'}
+                ]
+            },
+*/
+/*
+            listeners: {
+                'itemtap': function (view, number, item) {
+                    "use strict";
+                    var record = view.getStore().getAt(number);
+                    if (record) {
+                        Ext.app.dispatch({
+                            controller: 'Files', //app.controllers.files,
+                            action: 'show',
+                            id: record.getId()
+                        });
+                    }
+                }
+            },
+*/
+            itemTpl: '{fileName}<br/><span style="font-size:x-small">{fullPath}</span>',
+            grouped: true,
+            indexBar: true
+        }]
+    }
+});
diff --git a/apps/files_odfviewer/src/webodf/programs/touchui/app/views/OdfView.js b/apps/files_odfviewer/src/webodf/programs/touchui/app/views/OdfView.js
new file mode 100644
index 0000000000..2098304d32
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/programs/touchui/app/views/OdfView.js
@@ -0,0 +1,170 @@
+/*global Ext, runtime, core, odf, window, FileReader, PhoneGap, gui*/
+runtime.loadClass('odf.OdfCanvas');
+
+Ext.define('WebODFApp.view.OdfView', (function () {
+    "use strict";
+    var currentPath,
+        overridePath,
+        overridePathPrefix = "odf:",
+        data,
+        globalreadfunction,
+        globalfilesizefunction,
+        odfcanvas,
+        zoom = 1,
+        dom,
+        canvasListeners = [],
+        view;
+    function signalCanvasChange() {
+        var i;
+        for (i = 0; i < canvasListeners.length; i += 1) {
+            canvasListeners[i](odfcanvas);
+        }
+    }
+    function initCanvas() {
+        var cmp;
+        if (globalreadfunction === undefined) {
+            // overload the global read function with one that only reads
+            // the data from this canvas
+            globalreadfunction = runtime.read;
+            globalfilesizefunction = runtime.getFileSize;
+            runtime.read = function (path, offset, length, callback) {
+                if (path !== overridePath) {
+                    globalreadfunction.apply(runtime,
+                        [path, offset, length, callback]);
+                } else {
+                    callback(null, data.slice(offset, offset + length));
+                }
+            };
+            runtime.getFileSize = function (path, callback) {
+                if (path !== overridePath) {
+                    globalfilesizefunction.apply(runtime, [path, callback]);
+                } else {
+                    callback(data.length);
+                }
+            };
+            dom = Ext.getCmp('webodf').element.dom;
+            odfcanvas = new odf.OdfCanvas(dom);
+            odfcanvas.addListener("statereadychange", signalCanvasChange);
+        }
+    }
+    function load(path) {
+        if (path === currentPath) {
+            return;
+        }
+        currentPath = path;
+        overridePath = overridePathPrefix + path;
+        data = null;
+        window.resolveLocalFileSystemURI("file://" + path, function (file) {
+            var reader = new FileReader();
+            // so far phonegap is very limited, ideally it would implement
+            // readAsArrayBuffer and slice() on the File object
+            // right now, it has a dummy function, hence breaking simple
+            // detection of which features are implemented
+            if (reader.readAsArrayBuffer
+                    && (typeof PhoneGap === "undefined")) {
+                reader.onloadend = function (evt) {
+                    data = evt.target.result;
+                    odfcanvas.load(overridePath);
+                };
+                reader.readAsArrayBuffer(file);
+            } else {
+                reader.onloadend = function (evt) {
+                    var b = new core.Base64();
+                    data = evt.target.result;
+                    data = data.substr(data.indexOf(",") + 1);
+                    data = b.convertBase64ToUTF8Array(data);
+                    odfcanvas.load(overridePath);
+                };
+                reader.readAsDataURL(file);
+            }
+        }, function () {
+            runtime.log("COULD NOT RESOLVE " + path);
+        });
+    }
+    function tapHandler(button) {
+        var id = button.getId(),
+            dom = Ext.getCmp('odfcontainer').element.dom,
+            width = dom.offsetWidth,
+            height = dom.offsetHeight;
+        if (id === 'zoomin') {
+            odfcanvas.setZoomLevel(odfcanvas.getZoomLevel() * 1.25);
+        } else if (id === 'zoomout') {
+            odfcanvas.setZoomLevel(odfcanvas.getZoomLevel() * 0.8);
+        } else if (id === 'fit-best') {
+            odfcanvas.fitToContainingElement(width, height);
+        } else if (id === 'fit-width') {
+            odfcanvas.fitToWidth(width);
+        } else if (id === 'fit-height') {
+            odfcanvas.fitToHeight(height);
+        } else if (id === 'next') {
+            odfcanvas.showNextPage();
+        } else if (id === 'previous') {
+            odfcanvas.showPreviousPage();
+        }
+    }
+    return {
+        extend: 'Ext.Container',
+        xtype: 'odfview',
+        id: 'odfcontainer',
+        config: {
+            scrollable: 'both',
+            items: [{
+                id: 'webodf'
+            }, {
+                xtype : 'toolbar',
+                docked: 'bottom',
+                scrollable: false,
+                defaults: {
+                    iconMask: false,
+                    ui      : 'plain',
+                    handler: tapHandler
+                },
+                items: [
+                    { id: 'previous', icon: 'go-previous.png'},
+                    { id: 'next', icon: 'go-next.png' },
+                    { id: 'zoomin', icon: 'ZoomIn.png'},
+                    { id: 'zoomout', icon: 'ZoomOut.png' },
+                    { id: 'fit-best', icon: 'zoom-fit-best.png' },
+                    { id: 'fit-height', icon: 'zoom-fit-height.png' },
+                    { id: 'fit-width', icon: 'zoom-fit-width.png' }
+                ],
+                layout: {
+                    pack : 'center',
+                    align: 'center'
+                }
+            }],
+            listeners: {
+                painted: function () {
+                    // make sure the viewport is the right size
+                    odfcanvas.setZoomLevel(odfcanvas.getZoomLevel());
+                }
+            }
+        },
+        updateRecord: function (record) {
+            view = this;
+            initCanvas();
+            load(record.get('fullPath'));
+        },
+        addCanvasListener: function (listener) {
+            canvasListeners.push(listener);
+        },
+        hideCanvas: function () {
+            if (dom) {
+                dom.style.display = "none";
+            }
+            if (view) {
+                view.setMasked({
+                    xtype: 'loadmask',
+                    message: 'Loading...'
+                });
+            }
+        },
+        showCanvas: function () {
+            if (view) {
+                view.unmask();
+            }
+            dom.style.display = "inline-block";
+            odfcanvas.setZoomLevel(odfcanvas.getZoomLevel());
+        }
+    };
+}()));
diff --git a/apps/files_odfviewer/src/webodf/programs/touchui/app/views/Viewport.js b/apps/files_odfviewer/src/webodf/programs/touchui/app/views/Viewport.js
new file mode 100644
index 0000000000..3023ddc017
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/programs/touchui/app/views/Viewport.js
@@ -0,0 +1,54 @@
+/*global Ext, app*/
+Ext.define("WebODFApp.view.Viewport", {
+    extend: "Ext.navigation.View",
+    xtype: "mainview",
+    requires: [
+        "WebODFApp.view.FilesList",
+        "WebODFApp.view.FileDetail"
+    ],
+    config: {
+        fullscreen: true,
+        autoDestroy: false,
+        navigationBar: {
+            items: [{
+                xtype: 'button',
+                id: 'openButton',
+                text: 'Open',
+                align: 'right',
+                hidden: true
+            }]
+        },
+        items: [
+            { title: 'Files', xtype: 'fileslist' }
+        ]
+    }
+/*
+    initComponent: function () {
+
+        //put instances of cards into app.views namespace
+        Ext.apply(app.views, {
+            filesList: new app.views.FilesList(),
+            fileDetail: new app.views.FileDetail(),
+            odfView: new app.views.OdfView()
+        });
+        //put instances of cards into viewport
+        Ext.apply(this, {
+            items: [
+                app.views.filesList,
+                app.views.fileDetail,
+                app.views.odfView
+            ]
+        });
+        app.views.Viewport.superclass.initComponent.apply(this, arguments);
+    },
+    listeners: {
+        afterlayout: function () {
+            if (app.stores.filesystem.initialUrl) {
+                app.openUrl(app.stores.filesystem.initialUrl);
+                app.stores.filesystem.initialUrl = undefined;
+            }
+        }
+    }
+    };
+*/
+});
diff --git a/apps/files_odfviewer/src/webodf/programs/touchui/go-next.png b/apps/files_odfviewer/src/webodf/programs/touchui/go-next.png
new file mode 100644
index 0000000000000000000000000000000000000000..c4da8a9a3d787dcded3a357a062e92ee9f59d71d
GIT binary patch
literal 1473
zcmV;y1wQ(TP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000}W
z000}W0bUxB8~^|S2XskIMF-am91ti7Q*Z|P00006VoOIv0RI600RN!9r;`8x1x`ss
zK~#9!?N?iDR8<sR=RRiI&P-c@00Ksyi6)?lA5_1D2;zqUV+5qJpdkkR0VPPH^$`;i
z4MdF*2$3itYCuT95E6<NNhN|p%cB*6LXCiZKwH}B%-q*`xbNw$X)WPlXunvKHTz6*
z&fRP8z0OPqcX2z&IDT<mL)+7Dtovmo?hp*zB9v0>lWjE>obx@^XPW9K&fEOrq<NbM
zPXIyf`tj7%SYZN77nLN(j)-p(f%EP7XEziLiU7tKu3o)@oB#@kBvHO>7G_VIumIdU
zKJJ;dj}1l#Alx*vj*DE*Mb`B(bH+nhxn%mdp((41M3hf>ZlgJ{0=zCt?!k44t_O$K
z!-f}O<*PHTlF1`iDZwkr8)F7m044W4A0BnU^@tRGAu#)?hfy|r^0b1uabnW*Tj$)a
z0PXUSHx%G!Nq|oR0!?2>O)YH9=wd9HJ7wtjQOVtt=6|)0gyi4UTTya+x~1Ys)v<FW
zhiWc>872S)6*!O~xkGE0qKnm^eWdp*L{R#CFG^ii?YVXwtZA+j0t@Q5m(|@=z=N|^
zsCQSCq9f~p6m$~|iV+b}MMqe#<n%(6TuLo~B9Ss@a~wbX*5b5wcq_oz`uc5U*A<{K
z<dK)u%4G|Xb^=(o4a>4%nidSxgkgj<z*xvWQ|eQ>lo3T31q6wp1!^y3aH=8wJp)@@
zzkOlb^-ZV*y0R{rDx4`N3i!T25XguMoKxf!g(j_gD0}wlGk(DJGqg8c4`W9dczjA~
zP9o1ZIdT4$>F5Ou5f~&gSqEGiP#~%(hVLd(g=An%5g8QFyY&$zgdlQVJw*<a_UGui
z9j)y^XUk~Liz+9~{o+Fa?_JojnEywB3uf2=vxpLk4ufc-#|NO~MD)xakYSL3&<lVE
z61kj@uC6T7=?t1$+K|m;;kjXV9g59{ogDsFtoXhX05kdsIDPgK5{VQFi;9p;C6S*G
z#NrIL&Bzam#4)hQj8w6%mWyyq0-hfrO9gnIM`Q31Q1m>P_JPhBM5bw4CM;7ya<A_Q
z0Ev#yEF2H;xQU#{kY51A^Aut+L5ED3+K?>rZr`?(C$w43(7a*$O|A`0$^SKQK|uk6
z#8BZ$`vWF|_xlN;U3w!O)DN=k7*%f(ZP=C;pyyBQHG4sy1tLqpBtd4BJW8yqPNWiO
z>u@gyf|p&ce7g#SeggDdi3ST>Zt1IN6Jxes>n^aU14{K&AAJTOm5jPXjIL~6K^)Gt
z46d|v>`*Y4G*zv>*6$XaY|WXkEnkJSN}?b?g~UCDNET8|CXpA9BOZ^ziaH=&4yC_v
zv<Gw&M9GEF?bad<(?BfW#Q8t!GwF18DRp8~%i*;M(NBOE7;4mrVZZ*q|6qyZ`nqiz
zG5~}RB?3z7BUzlnD{pRq@VOSijHvZt+YKYC8k9JO*7l1yd$RVJ;HtE>`pbGmxUPVy
z_vXp(lzQ}=HOp}$<P}a=R*X!h7=)Bjaz$$a#=9$5afuU$ev(%%HLd|O-)TSbb$}bd
zLWFrF{iX<g5wiiwU<d*98iNtH(A;tkM=SRJ?RjEh=jmMsa0{?-J1}kiI}w?_JGlXP
zafP4v?L<R$%`V35m%GmIYXjlV3yAJHGbK1BmzIHss~2%#>&9HRwf%Kw<$X@cp)n8w
zl+k^s6=TTQ68kH6qIU0|<K%-<=knn*h%gWWwCnGG;svxD0sd;PN5$s#vaR9IkC|bV
zyO)pn_@7|7MKop=n_s@VQ}Q5Hy?ali5^|B(bhL8N{+NtPFx7Oa@yV9DGo_4~59s7~
baR=}ZzeY4&{TPVR00000NkvXXu0mjfqamda

literal 0
HcmV?d00001

diff --git a/apps/files_odfviewer/src/webodf/programs/touchui/go-previous.png b/apps/files_odfviewer/src/webodf/programs/touchui/go-previous.png
new file mode 100644
index 0000000000000000000000000000000000000000..68ed8a13ebda3f72affbd4061d8225397865b3f6
GIT binary patch
literal 1536
zcmV+b2LJhqP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000}W
z000}W0bUxB8~^|S2XskIMF-am91$lTA^ycs00006VoOIv0RI600RN!9r;`8x1&v8W
zK~#9!-B(*|R8<t+_uNNkrY)Vefw2$!nzn@6q(F(bRTKmi38oa~Vf3RK^@C_6BpCQG
z)EIw|Xhe*nsY;90_@O_1R3V5>6F}0a!52Zn@G5PAPRn#=?(?|LVJLQZ8RL}bZFctU
zz2}^@_TFosJ4d5ieEok2tliohnm4mBZ0PLJlEyN7(g;+o{D?SF>&df`x5^8uv)Xt4
z)XO=at0+qP2~;fKp5xl_cf!TN$66nqO|IWhy?saTA)1%|5>zaEyOCV;<L3Kkls7M}
zCyy9KOqYfR2ME!pk3e`uJL9&wF)v$fduH|BT5)NJF2)kXIT2vNX*7KztX$Pm#O?Ub
zIW<$~EniYcil$OD8Y3>yDM=u4F+BvTR(Cf0G~V94XnOwis%ez4ZBk$o78fTjQ}0^Q
zf0qD&{RnYOX(+H}>3z3ThEJujSVDr~5BNy}T;8GtHzt5=$qAUxZ%UwQRc9?D{z+3^
zer?_KTugSzG$A*Ik;2#n0+(5Mc8qdoJj@l%M@;t<)BL2s6XuZT(j(7rqq+5!2SKDk
z1fg9gYO&awoJ_W5{_H$|&J>+uag$V4CB}py-NF=>qIgcPy}6mV=aI)@F3fY`U2<Iq
z<`T#A?H%2Bt!-U=%@QE$j(jZ89xl+E>na1JsUm8HfK94K@Cq?uoC_io2#7L_j9CEn
z#z7qi-m&3f&<sQ72hUv?pQlY!`HuOz>UGwZs6|tQ9KaS9(Mj`=Doqi+E)}mzFogh*
z1^=o8E~9rb9{2=&0DIDG3ue3I(-{W36Ge#L7XIa&3~NJmAu&U<DW1^C(6I<l0t1$V
zy~F|l2@P=Z41Pip6qyN+Gt8AlK!B4C5*7#q4E1UPisyD01nmX4O>xOF0ct6v8yQ$g
z0%Jh3=D1}5XW}^wFRs{lGvZy+dm<AsR6!CDRC6-@R}=7D3(p)Hjzq~o*s7|@2q0y_
zPM{)SIH?1MchCfkNQh9C9U(8IU*rpQkR>v7gR*=YjYSa@%Gp0SLI?Vei1#T39Bc8(
zA!n1$osF^K6KZC_Pq}%y6buGwN)AyLhG{xUFb!%nG>v>2I_bI&ZJ;ZXWpF{jM!2S+
zfwZ5Gj8Xqk1OzTp3@n6cVj)V&z#qHTIdCr(FKpZG3l?^&idk}DI7)F-sM@8>EQbP_
z?j;L2<oEet8RYYEWXvF4tfGi|qt2E?2}GMnm=upYGMfOEhI@&aT7vQG)SkAUf_q<_
zX{mgBUT*e^4Cp{*viC80++@@`P*E<BFhr_lTiIweN@fD>cV!NMS@Is0Nhv|f)!(yu
zIMn#u%7HUuPX_a{w-%O^W-%se%|Jx99XykU1rhxv5^{`*wHXLNu&(04d*lhxs~*fH
z2nX+7Dl0FhzQf0<Tq(cyPB^fCn{Xex^-uLiM<QL7wKa3Hb%=qdZtPO`$^OSb5a{b0
zTFHzjh#0b>>JX?7U>GsE3x=lUQ@EnEw~Wee{xLe&_rcM;x+j``Jb3Vx!tlWQ+SyGE
zyPVikr8(#v+p;AQ`6a|^CTbt~{eW`4HD3VPO(e(vy|3YgA9mVs8yu_UtMg}0bj(@s
zU{R63f^6GC+9f#Z?MM-N21B$rUa}42+WyJ!fsvoT*vqRH*X{eP^Zn|E#+Leq2Z)<O
zaF@g;H%N|DGcA3;h(?cgpU<jXwEUNE_CDKx?8qBU%N`Geys30~PxK%<$UVL1g6MC%
zg?rEQ8hg6m-O_c(L(Q{ls_!Hgw~1?_3)tiwOyVc^|LQAlX!!o~PhUM<b9mjXg)J=G
z2#}!}lXo&ooH}5^tsnIGm-~(%+tK)RYhkFgWOV4eNj{pH{fGAW!}DkKf7`e8?CF7H
mx8iJw-v4?O*7ct|9sdbZjEEhHxB%1u0000<MNUMnLSTZ`AJkF+

literal 0
HcmV?d00001

diff --git a/apps/files_odfviewer/src/webodf/programs/touchui/index.html b/apps/files_odfviewer/src/webodf/programs/touchui/index.html
new file mode 100644
index 0000000000..49b8a31f44
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/programs/touchui/index.html
@@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<html>
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+        <title>WebODF</title>
+        <link href="sencha-touch.css" rel="stylesheet" type="text/css" />
+        <link href="webodf.css" rel="stylesheet" type="text/css" />
+        <script type="text/javascript" src="sencha-touch.js"></script>
+        <script type="text/javascript" src="lib/runtime.js"></script>
+        <script type="text/javascript" src="app/app.js"></script>
+        <script type="text/javascript" src="scripts.js"></script>
+        <script type="text/javascript" src="app/controller/Files.js"></script>
+        <script type="text/javascript" src="app/model/FileSystem.js"></script>
+        <script type="text/javascript" src="app/store/FileStore.js"></script>
+        <script type="text/javascript" src="app/views/FileDetail.js"></script>
+        <script type="text/javascript" src="app/views/FilesList.js"></script>
+        <script type="text/javascript" src="app/views/OdfView.js"></script>
+        <script type="text/javascript" src="app/views/Viewport.js"></script>
+    </head>
+    <body>
+    </body>
+</html>
diff --git a/apps/files_odfviewer/src/webodf/programs/touchui/scripts.js b/apps/files_odfviewer/src/webodf/programs/touchui/scripts.js
new file mode 100644
index 0000000000..2683bc83b4
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/programs/touchui/scripts.js
@@ -0,0 +1,130 @@
+/*global alert, app, window, runtime*/
+var LocalFileSystem = {
+    PERSISTENT: 0,
+    TEMPORARY: 1
+};
+function FileWriter(fullPath) {
+    "use strict";
+    this.write = function (data) {
+        data = runtime.byteArrayFromString(data, "utf8");
+        runtime.writeFile(fullPath, data, function () {});
+    };
+}
+function FileEntry(name, fullPath) {
+    "use strict";
+    this.isFile = true;
+    this.isDirectory = false;
+    this.name = name;
+    this.fullPath = fullPath;
+    this.file = function (onsuccess, onerror) {
+        function File(fullPath) {
+            this.name = name;
+            this.fullPath = fullPath;
+            this.type = "";
+            this.size = -1;
+            this.lastModifiedDate = -1;
+        }
+        var file = new File(fullPath);
+        try {
+            onsuccess(file);
+        } catch (e) {
+            alert("Error on determining file properties: " + e);
+            onerror(e);
+        }
+    };
+    this.createWriter = function (onsuccess, onerror) {
+        onsuccess(new FileWriter(fullPath));
+    };
+}
+function FileReader() {
+    "use strict";
+    var fr = this;
+    this.readAsArrayBuffer = function (file) {
+        var path = file.fullPath;
+        if (path.substr(0, 7) === "file://") {
+            path = path.substr(7);
+        }
+        runtime.readFile(path, 'binary', function (error, data) {
+            fr.onloadend({target: {result: data}});
+        });
+    };
+    this.readAsText = function (file) {
+        var path = file.fullPath;
+        if (path.substr(0, 7) === "file://") {
+            path = path.substr(7);
+        }
+        runtime.readFile(path, 'utf8', function (error, data) {
+            fr.onloadend({target: {result: data}});
+        });
+    };
+}
+var DirectoryReader;
+function DirectoryEntry(name, fullPath) {
+    "use strict";
+    this.isFile = false;
+    this.isDirectory = true;
+    this.name = name;
+    this.fullPath = fullPath;
+    this.createReader = function () {
+        var reader = new DirectoryReader(fullPath);
+        return reader;
+    };
+}
+function DirectoryReader(fullPath) {
+    "use strict";
+    this.readEntries = function (onsuccess, onerror) {
+        window.setTimeout(function () {
+            var entries = [];
+            entries[entries.length] = new FileEntry("welcome.odt",
+                    "welcome.odt");
+            entries[entries.length] = new FileEntry("Traktatenblad.odt",
+                    "Traktatenblad.odt");
+            entries[entries.length] = new FileEntry("DanskTest01.odt",
+                    "DanskTest01.odt");
+            entries[entries.length] = new FileEntry("plugfest-gouda.odp",
+                    "plugfest-gouda.odp");
+            entries[entries.length] = new FileEntry("OpenDocument-v1.2.odt",
+                    "OpenDocument-v1.2.odt");
+            entries[entries.length] = new FileEntry("OpenDocument-v1.2-part1.odt",
+                    "OpenDocument-v1.2-part1.odt");
+            entries[entries.length] = new FileEntry("OpenDocument-v1.2-part2.odt",
+                    "OpenDocument-v1.2-part2.odt");
+            try {
+                onsuccess(entries);
+            } catch (e) {
+                onerror(e);
+            }
+        }, 1);
+    };
+}
+window.resolveLocalFileSystemURI = function (path, onsuccess, onerror) {
+    "use strict";
+    var p = path.lastIndexOf("/"),
+        name = (p === -1) ? path : path.substr(p + 1);
+    onsuccess(new FileEntry(name, path));
+};
+window.requestFileSystem = function (filesystem, id, onsuccess, onerror) {
+    "use strict";
+    var dirs = [], shared, subfolder, path;
+    try {
+        if (filesystem === LocalFileSystem.PERSISTENT) {
+            path = "";
+            onsuccess({
+                name: "root",
+                root: new DirectoryEntry("root", path)
+            });
+        } else {
+            onerror("not defined");
+        }
+    } catch (e) {
+        onerror(e);
+    }
+};
+var device = {};
+/*
+ * override launch function to quickly open a file for testing
+onApplicationLaunch = function (app) {
+    "use strict";
+    app.openUrl("plugfest-gouda.odp");
+};
+*/
diff --git a/apps/files_odfviewer/src/webodf/programs/touchui/sencha-touch.css b/apps/files_odfviewer/src/webodf/programs/touchui/sencha-touch.css
new file mode 100644
index 0000000000..7227e268be
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/programs/touchui/sencha-touch.css
@@ -0,0 +1 @@
+body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,code,form,fieldset,legend,input,textarea,p,blockquote,th,td{margin:0;padding:0}table{border-collapse:collapse;border-spacing:0}fieldset,img{border:0}address,caption,cite,code,dfn,em,strong,th,var{font-style:normal;font-weight:normal}li{list-style:none}caption,th{text-align:left}h1,h2,h3,h4,h5,h6{font-size:100%;font-weight:normal}q:before,q:after{content:""}abbr,acronym{border:0;font-variant:normal}sup{vertical-align:text-top}sub{vertical-align:text-bottom}input,textarea,select{font-family:inherit;font-size:inherit;font-weight:inherit}*:focus{outline:none}html,body{font-family:"Helvetica Neue", HelveticaNeue, "Helvetica-Neue", Helvetica, "BBAlpha Sans", sans-serif;font-weight:normal;position:relative;-webkit-text-size-adjust:none}body.x-desktop{overflow:hidden}*,*:after,*:before{-webkit-box-sizing:border-box;box-sizing:border-box;-webkit-tap-highlight-color:rgba(0, 0, 0, 0);-webkit-user-select:none;-webkit-touch-callout:none;-webkit-user-drag:none}.x-ios.x-tablet .x-landscape *{-webkit-text-stroke:1px transparent}body{font-size:104%}body.x-ios{-webkit-backface-visibility:hidden}body.x-android.x-phone{font-size:116%}body.x-android.x-phone.x-silk{font-size:130%}body.x-ios.x-phone{font-size:114%}body.x-desktop{font-size:114%}input,textarea{-webkit-user-select:text}.x-hidden-visibility{visibility:hidden !important}.x-hidden-display,.x-field-hidden{display:none !important}.x-hidden-offsets{position:absolute !important;left:-10000em;top:-10000em;visibility:hidden}.x-fullscreen{position:absolute !important}.x-desktop .x-body-stretcher{margin-bottom:0px}.x-mask{position:absolute;top:0;left:0;bottom:0;right:0;height:100%;z-index:10;display:-webkit-box;display:box;-webkit-box-align:center;box-align:center;-webkit-box-pack:center;box-pack:center;background:rgba(0, 0, 0, 0.3) center center no-repeat}.x-mask.x-mask-gray{background-color:rgba(0, 0, 0, 0.5)}.x-mask.x-mask-transparent{background-color:transparent}.x-mask .x-mask-inner{background:rgba(0, 0, 0, 0.25);color:#fff;text-align:center;padding:.4em;font-size:.95em;font-weight:bold;-webkit-border-radius:0.5em;border-radius:0.5em}.x-mask .x-loading-spinner-outer{display:-webkit-box;display:box;-webkit-box-orient:vertical;box-orient:vertical;-webkit-box-align:center;box-align:center;-webkit-box-pack:center;box-pack:center;width:100%;min-width:8.5em;height:8.5em}.x-mask.x-indicator-hidden .x-loading-spinner-outer{display:none}.x-mask .x-mask-message{text-shadow:rgba(0, 0, 0, 0.5) 0 -0.08em 0;-webkit-box-flex:0 !important;max-width:13em;min-width:8.5em}.x-draggable{z-index:1}.x-dragging{opacity:0.7}.x-panel-list{background-color:#bacfe8}.x-html{-webkit-user-select:auto;-webkit-touch-callout:inherit;line-height:1.5;color:#333;font-size:.8em;padding:1.2em}.x-html body{line-height:1.5;font-family:"Helvetica Neue", Arial, Helvetica, sans-serif;color:#333333;font-size:75%}.x-html h1,.x-html h2,.x-html h3,.x-html h4,.x-html h5,.x-html h6{font-weight:normal;color:#222222}.x-html h1 img,.x-html h2 img,.x-html h3 img,.x-html h4 img,.x-html h5 img,.x-html h6 img{margin:0}.x-html h1{font-size:3em;line-height:1;margin-bottom:0.50em}.x-html h2{font-size:2em;margin-bottom:0.75em}.x-html h3{font-size:1.5em;line-height:1;margin-bottom:1.00em}.x-html h4{font-size:1.2em;line-height:1.25;margin-bottom:1.25em}.x-html h5{font-size:1em;font-weight:bold;margin-bottom:1.50em}.x-html h6{font-size:1em;font-weight:bold}.x-html p{margin:0 0 1.5em}.x-html p .left{display:inline;float:left;margin:1.5em 1.5em 1.5em 0;padding:0}.x-html p .right{display:inline;float:right;margin:1.5em 0 1.5em 1.5em;padding:0}.x-html a{text-decoration:underline;color:#0066cc}.x-html a:visited{color:#004c99}.x-html a:focus{color:#0099ff}.x-html a:hover{color:#0099ff}.x-html a:active{color:#bf00ff}.x-html blockquote{margin:1.5em;color:#666666;font-style:italic}.x-html strong,.x-html dfn{font-weight:bold}.x-html em,.x-html dfn{font-style:italic}.x-html sup,.x-html sub{line-height:0}.x-html abbr,.x-html acronym{border-bottom:1px dotted #666666}.x-html address{margin:0 0 1.5em;font-style:italic}.x-html del{color:#666666}.x-html pre{margin:1.5em 0;white-space:pre}.x-html pre,.x-html code,.x-html tt{font:1em "andale mono", "lucida console", monospace;line-height:1.5}.x-html li ul,.x-html li ol{margin:0}.x-html ul,.x-html ol{margin:0 1.5em 1.5em 0;padding-left:1.5em}.x-html ul{list-style-type:disc}.x-html ol{list-style-type:decimal}.x-html dl{margin:0 0 1.5em 0}.x-html dl dt{font-weight:bold}.x-html dd{margin-left:1.5em}.x-html table{margin-bottom:1.4em;width:100%}.x-html th{font-weight:bold}.x-html thead th{background:#c3d9ff}.x-html th,.x-html td,.x-html caption{padding:4px 10px 4px 5px}.x-html table.striped tr:nth-child(even) td,.x-html table tr.even td{background:#e5ecf9}.x-html tfoot{font-style:italic}.x-html caption{background:#eeeeee}.x-html .quiet{color:#666666}.x-html .loud{color:#111111}.x-html ul li{list-style-type:circle}.x-html ol li{list-style-type:decimal}.x-video{background-color:#000}.x-sortable .x-dragging{opacity:1;z-index:5}.x-layout-card-item{background:#eeeeee}.x-map{background-color:#edeae2}.x-map *{-webkit-box-sizing:content-box;box-sizing:content-box}.x-mask-map{background:transparent !important}.x-img{background-repeat:no-repeat}.x-video{height:100%;width:100%}.x-video > *{height:100%;width:100%;position:absolute}.x-video-ghost{-webkit-background-size:100% auto;background:black url() center center no-repeat}audio{width:100%}.x-panel,.x-msgbox,.x-panel-body{position:relative}.x-panel.x-floating,.x-msgbox.x-floating,.x-form.x-floating{padding:6px;-webkit-border-radius:0.3em;border-radius:0.3em;-webkit-box-shadow:rgba(0, 0, 0, 0.8) 0 0.2em 0.6em;background-color:black;background-image:none}.x-panel.x-floating.x-floating-light,.x-msgbox.x-floating.x-floating-light,.x-form.x-floating.x-floating-light{background-color:#354f6e;background-image:none}.x-panel.x-floating > .x-panel-inner,.x-panel.x-floating .x-scroll-view,.x-panel.x-floating .x-body,.x-msgbox.x-floating > .x-panel-inner,.x-msgbox.x-floating .x-scroll-view,.x-msgbox.x-floating .x-body,.x-form.x-floating > .x-panel-inner,.x-form.x-floating .x-scroll-view,.x-form.x-floating .x-body{background-color:#fff;-webkit-border-radius:0.3em;border-radius:0.3em}.x-anchor{width:1.631em;height:0.7em;position:absolute;left:0;top:0;z-index:1;-webkit-mask:0 0 url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACMAAAAPCAYAAABut3YUAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAPZJREFUeNpi/PX7LwOFwAyIG6HseiA+Ra5BjBQ6xg+IVwAxJ5T/HYgjgHgTOYYxUeCQUiBeh+QQBih7HVSOLiHDDMSTgTiTgLrpQJwLxH9p5RhOaLT4EakeFF3RQPyF2o6RhkaBGYkheRmIPYH4KbXSjC4QnyTDIch6danhGCcgPgwNGXKBNNQMb0ocEwXE24GYn4FyADJjI76Ej88x7UC8FIjZGKgHQDlxGtRsZmISMMjy+dBQoSXYBC0gv+NyDD80xzgx0AeAqg4fIH6NHk0qQHyMjg6B1WvHYDkNFjIgwS1ALMowMOAjEAeBHINe2Q0U+AUQYACQ10C2QNhRogAAAABJRU5ErkJggg==') no-repeat;-webkit-mask-size:1.631em 0.7em;overflow:hidden;background-color:black;-webkit-transform-origin:0% 0%}.x-anchor.x-anchor-top{margin-left:-0.816em;margin-top:-0.7em}.x-anchor.x-anchor-bottom{-webkit-transform:rotate(180deg);margin-left:0.816em;margin-top:0.6em}.x-anchor.x-anchor-left{-webkit-transform:rotate(270deg);margin-left:-0.7em;margin-top:-0.1em}.x-anchor.x-anchor-right{-webkit-transform:rotate(90deg);margin-left:0.7em;margin-top:0}.x-floating.x-panel-light:after{background-color:#354f6e}.x-button{-webkit-background-clip:padding;background-clip:padding-box;-webkit-border-radius:0.4em;border-radius:0.4em;display:-webkit-box;display:box;-webkit-box-align:center;box-align:center;min-height:1.8em !important;padding:.3em .6em;position:relative;overflow:hidden;-webkit-user-select:none}.x-button,.x-toolbar .x-button{border:1px solid #999999;border-top-color:#a6a6a6;color:black}.x-button.x-button-back:before,.x-button.x-button-forward:before,.x-toolbar .x-button.x-button-back:before,.x-toolbar .x-button.x-button-forward:before{background:#999999}.x-button,.x-button.x-button-back:after,.x-button.x-button-forward:after,.x-toolbar .x-button,.x-toolbar .x-button.x-button-back:after,.x-toolbar .x-button.x-button-forward:after{background-color:#ccc;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ffffff), color-stop(2%, #dedede), color-stop(100%, #bababa));background-image:-webkit-linear-gradient(#ffffff,#dedede 2%,#bababa);background-image:linear-gradient(#ffffff,#dedede 2%,#bababa)}.x-button .x-button-icon.x-icon-mask,.x-toolbar .x-button .x-button-icon.x-icon-mask{background-color:black;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #4d4d4d), color-stop(2%, #121212), color-stop(100%, #000000));background-image:-webkit-linear-gradient(#4d4d4d,#121212 2%,#000000);background-image:linear-gradient(#4d4d4d,#121212 2%,#000000)}.x-button.x-button-pressing,.x-button.x-button-pressing:after,.x-button.x-button-pressed,.x-button.x-button-pressed:after,.x-button.x-button-active,.x-button.x-button-active:after,.x-toolbar .x-button.x-button-pressing,.x-toolbar .x-button.x-button-pressing:after,.x-toolbar .x-button.x-button-pressed,.x-toolbar .x-button.x-button-pressed:after,.x-toolbar .x-button.x-button-active,.x-toolbar .x-button.x-button-active:after{background-color:#c4c4c4;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ababab), color-stop(10%, #b8b8b8), color-stop(65%, #c4c4c4), color-stop(100%, #c6c6c6));background-image:-webkit-linear-gradient(#ababab,#b8b8b8 10%,#c4c4c4 65%,#c6c6c6);background-image:linear-gradient(#ababab,#b8b8b8 10%,#c4c4c4 65%,#c6c6c6)}.x-button .x-button-icon{width:2.1em;height:2.1em;background-repeat:no-repeat;background-position:center;display:block}.x-button .x-button-icon.x-icon-mask{width:1.3em;height:1.3em;-webkit-mask-size:1.3em}.x-button.x-item-disabled .x-button-label,.x-button.x-item-disabled .x-hasbadge .x-badge,.x-hasbadge .x-button.x-item-disabled .x-badge,.x-button.x-item-disabled .x-button-icon{opacity:.5}.x-button-round,.x-button.x-button-action-round,.x-button.x-button-confirm-round,.x-button.x-button-decline-round{-webkit-border-radius:0.9em;border-radius:0.9em;padding:0.1em 0.9em}.x-iconalign-left,.x-icon-align-right{-webkit-box-orient:horizontal;box-orient:horizontal}.x-iconalign-top,.x-iconalign-bottom{-webkit-box-orient:vertical;box-orient:vertical}.x-iconalign-bottom,.x-iconalign-right{-webkit-box-direction:reverse;box-direction:reverse}.x-iconalign-center{-webkit-box-pack:center;box-pack:center}.x-iconalign-left .x-button-label,.x-iconalign-left .x-hasbadge .x-badge,.x-hasbadge .x-iconalign-left .x-badge{margin-left:0.3em}.x-iconalign-right .x-button-label,.x-iconalign-right .x-hasbadge .x-badge,.x-hasbadge .x-iconalign-right .x-badge{margin-right:0.3em}.x-iconalign-top .x-button-label,.x-iconalign-top .x-hasbadge .x-badge,.x-hasbadge .x-iconalign-top .x-badge{margin-top:0.3em}.x-iconalign-bottom .x-button-label,.x-iconalign-bottom .x-hasbadge .x-badge,.x-hasbadge .x-iconalign-bottom .x-badge{margin-bottom:0.3em}.x-button-label,.x-hasbadge .x-badge{-webkit-box-flex:1;box-flex:1;-webkit-box-align:center;box-align:center;white-space:nowrap;text-overflow:ellipsis;text-align:center;font-weight:bold;line-height:1.2em;display:block;overflow:hidden}.x-toolbar .x-button{margin:0 .2em;padding:.3em .6em}.x-toolbar .x-button .x-button-label,.x-toolbar .x-button .x-hasbadge .x-badge,.x-hasbadge .x-toolbar .x-button .x-badge{font-size:.7em}.x-button-small,.x-button.x-button-action-small,.x-button.x-button-confirm-small,.x-button.x-button-decline-small,.x-toolbar .x-button-small,.x-toolbar .x-button.x-button-action-small,.x-toolbar .x-button.x-button-confirm-small,.x-toolbar .x-button.x-button-decline-small{-webkit-border-radius:0.3em;border-radius:0.3em;padding:.2em .4em;min-height:0}.x-button-small .x-button-label,.x-button.x-button-action-small .x-button-label,.x-button.x-button-confirm-small .x-button-label,.x-button.x-button-decline-small .x-button-label,.x-button-small .x-hasbadge .x-badge,.x-hasbadge .x-button-small .x-badge,.x-button.x-button-action-small .x-hasbadge .x-badge,.x-hasbadge .x-button.x-button-action-small .x-badge,.x-button.x-button-confirm-small .x-hasbadge .x-badge,.x-hasbadge .x-button.x-button-confirm-small .x-badge,.x-button.x-button-decline-small .x-hasbadge .x-badge,.x-hasbadge .x-button.x-button-decline-small .x-badge,.x-toolbar .x-button-small .x-button-label,.x-toolbar .x-button.x-button-action-small .x-button-label,.x-toolbar .x-button.x-button-confirm-small .x-button-label,.x-toolbar .x-button.x-button-decline-small .x-button-label,.x-toolbar .x-button-small .x-hasbadge .x-badge,.x-hasbadge .x-toolbar .x-button-small .x-badge,.x-toolbar .x-button.x-button-action-small .x-hasbadge .x-badge,.x-hasbadge .x-toolbar .x-button.x-button-action-small .x-badge,.x-toolbar .x-button.x-button-confirm-small .x-hasbadge .x-badge,.x-hasbadge .x-toolbar .x-button.x-button-confirm-small .x-badge,.x-toolbar .x-button.x-button-decline-small .x-hasbadge .x-badge,.x-hasbadge .x-toolbar .x-button.x-button-decline-small .x-badge{font-size:.6em}.x-button-small .x-button-icon,.x-button.x-button-action-small .x-button-icon,.x-button.x-button-confirm-small .x-button-icon,.x-button.x-button-decline-small .x-button-icon,.x-toolbar .x-button-small .x-button-icon,.x-toolbar .x-button.x-button-action-small .x-button-icon,.x-toolbar .x-button.x-button-confirm-small .x-button-icon,.x-toolbar .x-button.x-button-decline-small .x-button-icon{width:.75em;height:.75em}.x-button-forward,.x-button-back{position:relative;overflow:visible;height:1.8em;z-index:1}.x-button-forward:before,.x-button-forward:after,.x-button-back:before,.x-button-back:after{content:"";position:absolute;width:0.773em;height:1.8em;top:-0.1em;left:auto;z-index:2;-webkit-mask:0.145em 0 url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAB4AAABGCAYAAADb7SQ4AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAiNJREFUeNrEWb9LQlEUvj5BcHoQvMnVKXD1D3CLwqBJbHJsazQaWoSCxgbHJiMIAiNok6AhCDdXVycnJ8EQOgeOYaG+d39998KH+HyP753zzjnfd325xfdSgVeV8B6BScuEV0IRSbxHeCMk/AVFXCA8ScQKSXxPqK0fQBBfE5r/D+Y8VzUT9jb94DPimqRYIYkrhGcpKhhxIqTxrpNcExdlQJTTTnRJnCc8ykhUSOIOoZ71ZFfEZ4S2zgUu+rguxZRHEnPbfKRVsOtUl0RtYpOLTYljIS2Z3nVk2DY9SbNCEt8RDm0rUpe4La1jvXSqmtum72raZI24KuNQIYl/nSGSOJb0Jq61M0pxhjwK9304hUjHGSKILzc5Q5drUzttdYY+I97pDH1FzG0zNFUb04gTG4kzJS5kdYauiZtZnaFr4ooKsCIVaDHxKAQxt1NBnGIVHfGCcEQYh3jGU8KBfMKLiyM+lgzAq/qT0ArVTg+Ei1B9fEPoovV4fcfQd2HedScX39GprwGTNjJn0maTELN6IuSzECLB6T5x2eM66jQgnIeSxa60GnS3uL56tr7b1Ai0JPVwYi6yho2U2lgfKym19VxjMRHzEGbvS9K+RBPzetGVUpf29lZHSl2/DMnLvwh1ZMQrKW3Ic4fvJOZS6ZMQW5hpmpT63DvtlFLfm7bBNruM2C2yXb7y3U6ZpRS5P/4jpUjihRTbCJ3q1eL3GMMfAQYAJmB6SBO619IAAAAASUVORK5CYII=') no-repeat;-webkit-mask-size:0.773em 1.8em;overflow:hidden}.x-button-back,.x-toolbar .x-button-back{margin-left:0.828em;padding-left:.4em}.x-button-back:before,.x-toolbar .x-button-back:before{left:-0.693em}.x-button-back:after,.x-toolbar .x-button-back:after{left:-0.628em}.x-button-forward,.x-toolbar .x-button-forward{margin-right:0.828em;padding-right:.4em}.x-button-forward:before,.x-button-forward:after,.x-toolbar .x-button-forward:before,.x-toolbar .x-button-forward:after{-webkit-mask:-0.145em 0 url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAB4AAABGCAYAAADb7SQ4AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAXlJREFUaN7lmTFqAlEQhh8EhFSCYJXW1law9QAewMrWAwQWAmmtbPcGHiCQ1gPYCla2QsDKSsgmQecvFqImu2/fzry/2OLb9mt23vwz47Kvn5MwEFxM8DkLB6HHEIOd0GGIwUpoMcRgyRKDOUsMJizxpzBiiMFR6DPEeZl1GWKwFh4ZYvAmPDDEqmVWVQxmLPG3MGaIVcosVAz2whNDDDZCmyEG7yFlpiEGKUsMEpb4XKXMtMXeiVVb7J1YLcRgW1ZmVuLSxGopLkys1mLwwhL/mVhjie8Sayxx3kp7DPFVYo0tzhNriyEGU5Z40TjxtDE/F6WcDowHBE/msDFNImG0xZQRBAonDCvxhhH2vKZIZ9Ds+7EDfaWFnKZ4xhja5owxdcnYCAQv1p1Gi4sprn08cZbDt6ZYZasXIn5mLFHTjLCvVt1V+4rVt/M+4r3FPaJMbHaBKRKb3pyKxKZXtv/Er4yjZpRL6q042u34tzh4xV9H/FHnqBHKBQeEd6aqqwD6AAAAAElFTkSuQmCC') no-repeat}.x-button-forward:before,.x-toolbar .x-button-forward:before{right:-0.693em}.x-button-forward:after,.x-toolbar .x-button-forward:after{right:-0.628em}.x-button.x-button-plain,.x-toolbar .x-button.x-button-plain{background:none;border:0 none;-webkit-border-radius:none;border-radius:none;min-height:0;text-shadow:none;line-height:auto;height:auto;padding:0.5em}.x-button.x-button-plain > *,.x-toolbar .x-button.x-button-plain > *{overflow:visible}.x-button.x-button-plain .x-button-icon,.x-toolbar .x-button.x-button-plain .x-button-icon{-webkit-mask-size:1.4em;width:1.4em;height:1.4em}.x-button.x-button-plain.x-button-pressing,.x-button.x-button-plain.x-button-pressed,.x-toolbar .x-button.x-button-plain.x-button-pressing,.x-toolbar .x-button.x-button-plain.x-button-pressed{background:none;background-image:-webkit-gradient(radial, 50% 50%, 0, 50% 50%, 24, color-stop(0%, rgba(119,178,248,0.7)), color-stop(100%, rgba(119,178,248,0)));background-image:-webkit-radial-gradient(rgba(119,178,248,0.7),rgba(119,178,248,0) 24px);background-image:radial-gradient(rgba(119,178,248,0.7),rgba(119,178,248,0) 24px)}.x-button.x-button-plain.x-button-pressing .x-button-icon.x-button-mask,.x-button.x-button-plain.x-button-pressed .x-button-icon.x-button-mask,.x-toolbar .x-button.x-button-plain.x-button-pressing .x-button-icon.x-button-mask,.x-toolbar .x-button.x-button-plain.x-button-pressed .x-button-icon.x-button-mask{background-color:#fff;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #e6e6e6), color-stop(10%, #f2f2f2), color-stop(65%, #ffffff), color-stop(100%, #ffffff));background-image:-webkit-linear-gradient(#e6e6e6,#f2f2f2 10%,#ffffff 65%,#ffffff);background-image:linear-gradient(#e6e6e6,#f2f2f2 10%,#ffffff 65%,#ffffff)}.x-segmentedbutton .x-button{margin:0;-webkit-border-radius:0;border-radius:0}.x-segmentedbutton .x-button.x-first{-webkit-border-top-left-radius:0.4em;border-top-left-radius:0.4em;-webkit-border-bottom-left-radius:0.4em;border-bottom-left-radius:0.4em}.x-segmentedbutton .x-button.x-last{-webkit-border-top-right-radius:0.4em;border-top-right-radius:0.4em;-webkit-border-bottom-right-radius:0.4em;border-bottom-right-radius:0.4em}.x-segmentedbutton .x-button:not(:first-child){border-left:0}.x-hasbadge{overflow:visible}.x-hasbadge .x-badge{-webkit-border-radius:1em;border-radius:1em;-webkit-background-clip:padding;background-clip:padding-box;padding:.15em .25em;z-index:2;text-shadow:rgba(0, 0, 0, 0.5) 0 -0.08em 0;-webkit-box-shadow:#000 0 .1em .2em;overflow:hidden;color:#fff;border:2px solid #fff;position:absolute;width:auto;min-width:2em;height:2em;line-height:1.2em;font-size:.6em;top:-0.15em;right:0px;max-width:100%;background-color:#990000;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #e60000), color-stop(50%, #b30000), color-stop(51%, #990000), color-stop(100%, #800000));background-image:-webkit-linear-gradient(#e60000,#b30000 50%,#990000 51%,#800000);background-image:linear-gradient(#e60000,#b30000 50%,#990000 51%,#800000);display:inline-block}.x-tab .x-button-icon.action,.x-button .x-button-icon.x-icon-mask.action{-webkit-mask-image:url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAFI0lEQVRoBe2YW4hVVRjHZ0yzq6lFEaMlE0PShYRAJIl6iEqKHnqI6WJB0IvdICkfEk0aIyo0KFCph8giCitI7CkoohQL7SoZDaQmXSgKo4uWNf1+zt7DOXvOOXuvvc85bc+cD36ssy/r+77/Xmt9e+3TOzIy0jORbNJEEqvWruBOH/HuCHdHuMOeQOmmdO+ozaA5oxXPunSC2Re4MbgCNiB6vvqbKbx0giNxp9BeBU/BIJqnRecLN2UVrLDj4GIYgscRfSltYSuzYMUdA/0wCI8ieglM5XduK7vgWJhTegGshucRfQHkyj1XpziLNrfmOh2ug1dhMaJn0gbZZDpNpsexQb2y3azfKXCAwns4W5dMd7m2B2ANLCT/x/A/nKknN5mUhWFp1g4Z7vM14jrbBZvgEwi1tAdkDEf3ZrgI0S/RrkP4IdqGpuA+cJo0yw7iyNfJmzAcMrokfjp93HC4XrPYCdzkgPXDPPqvJN7eRh0VrBWqfKMuev6k3Qzr4SP4HWqOFIkZ73iYA/NhLpwPZ4LLS+FZzUp+GtwAA/heS/sGwv+irWnXc9bdTRF20/8eOBWmEKwnCectOrPhSlgF2+Bb+Bl+AxP8B/6FvLn8Td8fYQXMSubgsVZU8Cv4mAeNhC7k+jLYCopzrRURlvZA9P8WLIJJlcI5zi1Ypw+Dr4oqp3EAzlsbLCjfg1PeEUxLtlnXXU4/wQboq8gpl2BHx2l5UuyosuW8I6rQb8Bp1iwRefy4VN6FReaopU3pX7jnhwSO7MmVIiNnJ3L+DtgHCm3ltA0RH4/26rhKk1tdu4kr7yeuHkKgU3rMqI5ncfAQDIKbg14oi1nJv4OvTShthC9LjmTyGB8XwhZw+oQ8+Xbc68C8AOboK6+YYPpfDV+B06YdAkJiuMtzhvrOP1JYafMLpu/Z8CmEJNGOe60fz0J/cjZmWcP0G2+sWZ/aUnCqhFosOq7gyf6uOT888th+Ot0HmxF7MOkgt2AcXQNLkg5rHPv+dffjVvPX6PdeWtf7MJhUssD578ZtEGL6sY4MIfTjeh1zCWZ0Z+DwQXAkapkjtzviPdoPYB+JuJVMNfy7QQkR7MbGPfRaYhi7ruUSjLcbwe1k0tw2vgivwy6C70/ekPE4JK+N+HySWDuz+A5xXOnvlsqD6Lf/QjwBnxNc4a02YwzBeuIdyBosWDDT7RKcn1MRYA+/V8ImAv9Rcb5VP53ufoQ8AB8S0+PMFiwYz5fDzCjCF7SLCbojOm514zZ3HViYLIZVxmD4h8B0rtWtFXkEn4tTv22thPe2SawVeDs8TTz/NqoyhLqDGoC7wervt3lNCxKMY/fIc+BLuJXgn9G20pyuVuA1sJF4vt7GjHx8nZnT7XAXzIXnoK4FCcbLVHAqLW+DWF8v78Aq2EY8v7zGDK2+EmfBI3AtTAPNTU1dCxXs/a6ht+t6bM4FNykvw/0IdYSrDLHu8iyeQ7Cg6mLKQahgd0pbSOJwit/cl6Np6p+BrxGn6hNUp1z3m/tOWAH+DrIgwSTQcBcTFLnOzcRwSjZ6j/vdvQyCxRrSanu0mWvZqp3LjkbBuYTGnSac4CxreCQqJPFD+r/bhq+dtOSyCO7DyWzIcm9avKLXXb+FcskiYjlBfB0lP9KLJp+nv6N7ZL+cp7N9sgg+L6/zMvabcEWrK7iM07CZOXVHuJlPs4y+rNJ74JkyJpczp62N+vWOfpw0uqWzrnXXcGeN53g13REe/0w660x3hDtrPMer+Q9LNCcV91c+jgAAAABJRU5ErkJggg==')}.x-tab .x-button-icon.add,.x-button .x-button-icon.x-icon-mask.add{-webkit-mask-image:url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAABqUlEQVRoBe2awWnDUBBE843B4NxcQSAFOC4lJeTkoxtJDykgvRhcgCFNJCFgIs+ChEHSJX93YT6ZD4ssmR3NztNFH5Wu6+6iVynlEZpbp+4J3s5OjWm7DRxZuMMCdUB9oyzNmrJe01hEejMtM5exIh6bCI3JbFkDT27EckEDs5DI8iHCWcmy6IowC4ksHyKclSyLrgizkMjyIcJZybLoijALiSwfIpyVLItuOGFso/xiuEvAgJdeK0DqJrHEhtsTTh9ul9y/ChR2KE+Y1ruDt2ccI7d6PszcK+oFFblWELt3Cn6i/8epMW5/W+LKGrUZ/0NwboF5QxuPsfY8dmOxJs41cBOYHCZF2BFeE60i3AQmh0kRdoTXRKsIN4HJYVKEHeE10frvCNvr4RH1HojH3rGHr3hqA7VdkxPKvuKJ3AA4hn7BM3xxA5N71Fdv1gz/tax3P+hFHmsJwM/8wraMadqOh5GuXda76rVqNWb7wgeevQvRRQ1MBCPFiginxEokKsJEMFKsiHBKrESiIkwEI8WKCKfESiQqwkQwUqyIcEqsRKIiTAQjxcoVrP83/9czD9EAAAAASUVORK5CYII=')}.x-tab .x-button-icon.arrow_down,.x-button .x-button-icon.x-icon-mask.arrow_down{-webkit-mask-image:url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA2ZpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYwIDYxLjEzNDc3NywgMjAxMC8wMi8xMi0xNzozMjowMCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDpGRTdGMTE3NDA3MjA2ODExOTJDQUMyNUQwRUE4NjdEQiIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDoxQTFBMDFDQ0I5NEYxMURGQUU1RjlGMEFERUNDQTVEMCIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDoyMkRCMDIxMkI5NEUxMURGQUU1RjlGMEFERUNDQTVEMCIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgQ1M1IE1hY2ludG9zaCI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOjMwRTE0QzVBNDIyMjY4MTFCQ0ZCOTAzOTcwNzcyRkVCIiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOkZFN0YxMTc0MDcyMDY4MTE5MkNBQzI1RDBFQTg2N0RCIi8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+HfrH/AAAAeVJREFUeNrs2cFHBGEUAPA3zYqIiIhOnTpFRHSKrp26RqeuEV077R/QqWtE166dOkVERHRa9hQRnZalFcv0Hk/W1Mx+38z3vvlm5j3eZW+/9+abne+9KEkSaFPMQMtCwQpWsIIVrGAFK1jBClawgo2ik/4hiqJGwLKuvfpIc5xSkWqYr5hzU1s/mRNxXTPsJ+ZqluvXlwOmSj3XBDvG3M1rpAmYYoUrFzr4ZNqTawqm2MH8Dhh7ZXJUbcAUx4FinzBnJcAUl4FhP/jIgRSYKvkYCJaO2LbNv08RMMUy5nsA4COTLy0XYIqtil9iF6aflq7AwBWuAvuQ9ZKSBgNX2ieWjtKSzeXBNZgqfe8J+4W5aXtbcg0GrvibB/BhkeuhBJhigzsghT0veh+WAlMcCGHvMOMQwcCdcIntYy6WmXhIg2PuiAvsEHO97IhHGgzckb4D8L6LmZYPMHBnhiWwXVdDPF9g4A4Vwd66nFr6BAN3ygbbw1yoMzjmjplgB5hrrufSvsHAHesZDOD2JAbxVYCBOzfIAZ9JbR6qAgN3cPwP9kZy1VIlGLiTdluCmoOBO/pnS9Bk8DzmS3pL4BMcpZEe1qX0GI/atC4dQYXRMa1MU0IX4gpWsIIVrGAFK1jBCnYUPwIMAPUPAyFL+nRdAAAAAElFTkSuQmCC')}.x-tab .x-button-icon.arrow_left,.x-button .x-button-icon.x-icon-mask.arrow_left{-webkit-mask-image:url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA2ZpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYwIDYxLjEzNDc3NywgMjAxMC8wMi8xMi0xNzozMjowMCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDpGRTdGMTE3NDA3MjA2ODExOTJDQUMyNUQwRUE4NjdEQiIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDpGMDZEQTFBREFDOTMxMURGOEQ2MUVDMjM0MzY2NTBDQSIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDpGMDZEQTFBQ0FDOTMxMURGOEQ2MUVDMjM0MzY2NTBDQSIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgQ1M1IE1hY2ludG9zaCI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOkFGQzJEMjQxRjIyMDY4MTE4QTZEQzUxMDg5Q0Y0RTRFIiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOkZFN0YxMTc0MDcyMDY4MTE5MkNBQzI1RDBFQTg2N0RCIi8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+FXGmxAAAAghJREFUeNrsm09ERFEUxt+rxBAxqyFm1SqiRYpMSpFapUVaRGpTRIpIbWLaFJEoRZtilChRWiRKsyklilYRERERERGZvsN57Wfmvnnnznkfv+WM+bn3e/ePN24mk3E0pcRRllC42FOWy4dc1w30R+fz3LFthEs1TelZ0KlBuAIcgmRgHS5gqlm2RsNTmqbvrUlZycLT4BhUiliWfEwEbII+UeuwT4nzqNZq2Gm1gTu/ZaUIj4NTEBW7tTTY1zUwKH4vbaive6BBw2kpAa6DkA1CeBicgZhVx8McUg5WWNi+83CWiXFfE9ZeAGQR6ukBqJKyu/Gzw7TcXEiS9UuYbiWWeU8ckXYqMT2lozyFW6SeOU0K1/FhPS75RsHUlKbj3KV0WRPC1Nd5sCuxr6anNPV12zFwk2jLCCdtk81XeAIsahL+BVOgH3xrEPayA5rAixZhyj2oB2ktwpR30A5WtQh7vR4DQ+BHg7CXLdAMXrUIU26411dahClvoBVsaBF2uMsjYFRCrwt5a7kOOnjUVQg7vE43cr9VCDu8I6Nep7QIO7z3HgCTvHYXvbCXJe71hxZhyjmv1w9ahCnP/DDb1yLs9boXzGgR9rIAusCnFmHKCff6UYsw5Ymlj7QIU75AN5gz9YVuLu8eB/S+dA+v1+l83pe2Sfg/BRe2OeGfPELhUDgUtip/AgwAw4tbozZtKFwAAAAASUVORK5CYII=')}.x-tab .x-button-icon.arrow_right,.x-button .x-button-icon.x-icon-mask.arrow_right{-webkit-mask-image:url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA2ZpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYwIDYxLjEzNDc3NywgMjAxMC8wMi8xMi0xNzozMjowMCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDpGRTdGMTE3NDA3MjA2ODExOTJDQUMyNUQwRUE4NjdEQiIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDpGMDZEQTFCMUFDOTMxMURGOEQ2MUVDMjM0MzY2NTBDQSIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDpGMDZEQTFCMEFDOTMxMURGOEQ2MUVDMjM0MzY2NTBDQSIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgQ1M1IE1hY2ludG9zaCI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOkFGQzJEMjQxRjIyMDY4MTE4QTZEQzUxMDg5Q0Y0RTRFIiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOkZFN0YxMTc0MDcyMDY4MTE5MkNBQzI1RDBFQTg2N0RCIi8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+xvZexwAAAhhJREFUeNrsm8FHRFEUxu9rxhARsxqiVauYXWoTpTYtUkRqlWkz0WaiTW2iNi3atGhTm4k2E5GYSJRaZcZQtIqIISIiYhgyfZdv/oF59913X+cdfst5733u+c495743XqvVUpKiSwmLWPB/j2QnP/I8L9SH9lN3/KxwQlpKT4FtaR7eAhegR1LRmgEVMCCpSg+CGtNczLbUC8pgQ9I+rCv3LiiBbkmNxwJ93S+p08qCRzAhqbVMg2tQkNRLa1/vg6ILvrY5POTAXdi+tj0tDbOYjUoaDzPgBuQlzcMpcEhSkg4A8lztjBTBin6u0d8iBOvoYwXPSRGsuEcXuWcnJAhuR4G+TksRrGOMfXhWimDFjqzCyUuE4LavS5yxExIEt0OfopRN+DpKbx6MHAtHSfAeWPN7kWQEhDbAMjg1cTHXBdfBLHiSUKXvwZBJsS4LPgCT4NP0hV1L6SZYAcdB3cAlwe9gDlQlTEsP9Gs16Bu5IPgIjIOP/34AoP26Ss82bd00LA/r1Vzk1mM1whCsfTrPpsJ62E7pE/q1HpaPbAn+Betgib1xaGEjpb+Ywrcu7H9BC35m8//mSncTZEqfgRGXxAYpeJNp3FCOhemU/ub+euXqzGlS8AuYBq8unyiYSulLNv9OizUleIcr+6MiEF4n3x7ze2n9OkSfE5/bfmg/30v7ERxaWBcc5Yj/5BELjgXHgiMVfwIMAGPkXbHq6ClAAAAAAElFTkSuQmCC')}.x-tab .x-button-icon.arrow_up,.x-button .x-button-icon.x-icon-mask.arrow_up{-webkit-mask-image:url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA2ZpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYwIDYxLjEzNDc3NywgMjAxMC8wMi8xMi0xNzozMjowMCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDpGRTdGMTE3NDA3MjA2ODExOTJDQUMyNUQwRUE4NjdEQiIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDpDQUZBQUM3NEFDOTMxMURGOEQ2MUVDMjM0MzY2NTBDQSIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDpDQUZBQUM3M0FDOTMxMURGOEQ2MUVDMjM0MzY2NTBDQSIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgQ1M1IE1hY2ludG9zaCI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOkFGQzJEMjQxRjIyMDY4MTE4QTZEQzUxMDg5Q0Y0RTRFIiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOkZFN0YxMTc0MDcyMDY4MTE5MkNBQzI1RDBFQTg2N0RCIi8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+ar3jxgAAAbFJREFUeNrs2j9ExGEcx/H71YmmpoiIaIq4KSKi6dabbo1oiqamm1qboimiNZpuuikiIqLppiPipqYjIuLp+/D95vy6X/frfr/n730e3sst53XP9x7u+V2ilKpM05qpTNkCGGCAAQYYYIABBhhggAEGeNSqpl9IkiQKWNbvfBc7PDdNIz1PPVK7Trd+OMPrRr8l9Uat2nT9+CyCW4yVnnnHowTXqa8UWHcdI3iNGozASscxgReo7h9YxTtfjwXcHoOVBjwJQYNPcmKlLk9EkODGP7FSO0TwOvU+IVjxZAQD1iPZK4CVGiGAZ6lOCVjFE7LhO/i0JKzUK3KImQY3S8ZKHZ4cr8A16sMQWPHkeANepF4MYqWmD2A9arcWsIonqOYafGYJK73yRDkB71nGSnd5r4jKBG9Sn47AunOb4CWq7xAr7dsA61G69wCreMK2TIMvPMFKfZ44I+ADz7DSQ9YhVgS87fiQGtdlmeBlvkNWnndYBljfGT8FgJVDbKco+CoQrBp6mrEyKfgoMOyvpxlZ4CT9vcXj0shWNe8nE8vCfzwABhhggAEGGGCATa1vAQYAZekAmr8OukgAAAAASUVORK5CYII=')}.x-tab .x-button-icon.compose,.x-button .x-button-icon.x-icon-mask.compose{-webkit-mask-image:url('data:image/png;base64,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')}.x-tab .x-button-icon.delete,.x-button .x-button-icon.x-icon-mask.delete{-webkit-mask-image:url('data:image/png;base64,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')}.x-tab .x-button-icon.organize,.x-button .x-button-icon.x-icon-mask.organize{-webkit-mask-image:url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAEdUlEQVRoBe2aS2xMURjHjbbqUaLoI7RChQUiGo9YaEqkoolIkCASSki68dixsLIVYmHbkJA03UgkFRI2QgRBKl4RgtJFK0jUI+o5fv/p68ztmUlHzpzO9PZLfjP3fOfcO9//fOeee+69E4lGo6PCZKPDJFZaQyc4N1mGI5FIMfUVkAfZMPaVwE54yqn6i+8BllQwravgAEyEv5DppsQ8gYPw3hqsJi0bNJ4El0GZzSa6iHcbjLbpsp7DDGX5V8ByyDbLJ+CdUGQLPNGQnkzj3TDFspN68BNkwhDPIY5poG/T1lBYR+LOkuW4uSeR4KXssN48grF9h20NdeukYLRL96Y6vAD2wCwwbQyFvXARPpoVA85fKnXiN4HtvP2Gf0tPG3XWUKNYT4E6PxjvD3x1EDHPZZvgxTTSDBc8gMrKbql5gKHeJh7NM6/AFu91/EVmjHGTFmN+HA3qYSoE7SuO8+zcEawY4vJdfr8Z/ljiqMS3AV2RvjpTPc7V0A623rqJv8RsnynbxDUXXieJuy/LfRmmEzSd7wKtroL2Hcc5BL4LVmRCmbheEIfmHduVQ1muQV/3BN2bJZyqaANbdm/jL+xtm4nfxKcsP08Q/zX8MxV3TDXqx+PYBGUQNHVAI9AsYrsuB9sPVflDT5xH+O7OZn8kK9msJf6G3ooFOOr66+O2NOVL6A7oP/njmmREQcN5LGhy1cLJtBwK++FSLqrVSGvPcrCZGu8DZTqTBSs+zUkarTZTUrerYh50gHYY7rSpRxZCCYTByvouS2FQK42hE9w7S/tKsOaIt/AGfoMWO3OgFLyYb8FaGByHl6C1r27jlsAh8HaN14LD1+x8jN/KNVdqlAvhgq8YfJ/DLYjVUDatk8J905HObd+Cf1rEaHTp5sSL+RacaKWWyO+8E3wLdi4g1QOOCE61x7Kt/UiGsy1jqcY7kuFUeyzF9ok6WA8ZvJjLtbQWEI/hXpLIW4N1rLyiPHV5hP9MsM4or2V7hlH+702XghWE3gAcTRKN3mjY7AZOdZbNCnAug4wTrNXSItCrmmYSZ3tGTNVAo+1nvCLOyLyeT9WC7WlqXNtUCq7vlpTlGkQMeG+Vio9j6NbxMOjtn8u7udjzaJcH1H3uLViVikCzLftqEtsKbeAyNh3LuWAdVM+yr8JsU8hgt9mvGh6ATousEKwgdcvXCMWDFap2mOYBTWK6b3YtNvYDrs9hM0i9BTgB+YMRTbvp0AS6bzaP43I7LUPaDFBvHPVmIy+ZaOp1+TkJX8Dc3/V22gUrYF1jN4L1r0T4NSPXg+sZ2dZZXgRr5m6BymCW8en6rc54BrYAXfu8CFbQmoQ0c1eYoilXw0NQp7gWZzueN8H68S44DbG/IPA9H66AL7FR12tpYk9qetOwGfSaVjcMNVAFie6iqHJv6bws2YaUfLpctYP+S5WoTVr8vjOMvphN4FN4N69Dybs6yw+OCLZ0yrByhS7DmrRaoQE0Kw5707JOf/UvH/ZKewTG/kscFrHSGbpzOHSC/wHSRhVOrpN3ggAAAABJRU5ErkJggg==')}.x-tab .x-button-icon.refresh,.x-button .x-button-icon.x-icon-mask.refresh{-webkit-mask-image:url('data:image/png;base64,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')}.x-tab .x-button-icon.reply,.x-button .x-button-icon.x-icon-mask.reply{-webkit-mask-image:url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAES0lEQVRoBe2ZSWgUQRSGM24YTdSo4AYRTcxBEZJDJCoigrtGg6CIgihqogfRgEERguhB40UP6kHw4kEET4J4E9wPAdeg4ALigjuKcSMuMX7/mAmdSU/SXdM9PTPpBx/T3al67/31urq6K5G2trac3mR9epNYaQ0FZ3vFwwqHFc6yEQhv6SwraBc5YYW7DEmWXUhZhSORSC7UwKIgxzAlghE5CZFHoAEKgxTcz8/gCI3gfzHsh6l+xnLq2zfBaC0miXpYDvmgu+kXBGqeC0aohK2D7TAF+kPamKeCETseZdugGgZDSp4RxHFsnghGqKo4H/aB5uoASEtLWjBiZ6KsFlaAHlJpbUkJRmwl6rTcFKW1SktyRoIROhofdbARhlr8OTkMdBPNlWCE6iG0AA5AqRN1Nm1cxbTpn9Qlx8ERO4pIG0Br6yDDqH3pV4kvPdRewCd4C+/ZPdWx7xZxsk1LgqvIZDeUeZzRT/xJ8Dt4BQ/gGjSSVzO/3psEJ4JoY+A4fATNvVTwhjh34RSshMGJ8jO5biuWIJqrc6AJ/kIqhNrF+EFs3fqHYRoMMxFp7dNFME5Hwi5QMLskgrqmgb8M+hgZYRXh5riTYBxpFM9CUKKcxlWOSyHPjVi1jQqmYy7shQ/gNGjQ7f6Q6yWY7UY07XNK4CK0QtAiTOK/J29tLOQ7EU67nIGgtfU1mARMhz6a3zegtCfRHXOYxhXtndJBgGkOT9FQ1Z3oDsFqhBXAFngJpkGD7veN3NclEt1JcKwRHaaD3niCTt40vh6+q2N6rL+2gtUA03p8FL6AaeAg++ntsNwqNqor/kL8OZ2WgF71vEpeq8FvC36uDveJM8qqyenHwzg67oE1MAxMTeLOQyNod0SDqO2hCaDVIma6u3R9OAxq/9WxW9PT+wRsQ7RiE7Gbj4f4v9F8Fujxb1ptfR2tj/cbf04bfbbqZWgsFEM5LITNcBLc3HF6iM2IxXAlWJ0wJXEQfoFb4RJcEwtu8kv/PCiEGdAAevFQJbvL5Rh/j351uRbcLloVmA83ewgUn0TSgq2DRGzloVt9E9yDFoiPqfOvUBHN3erA7TFOtG6fBqdfVp4KtuZLDqr8DrgDdqIPcb2/UYXjAmmu1cLDBIGswX0THMuJHIrgDGglsMZu4nxI0oItgcbjUHP7MyRaanwXrHywvlAFj8E6v+dqZ8MTI9BzHO2DtaC9KY1wIEYurXCO4JrbjyA6CvzO80wwznS3tMAFDpfBKdArnkY4ECOXqwTWUqZvA1mJp4L/+4wKf8ZxDeyE26AlLBBD9HUC14GWr8mezWEc2/oiiNZM/TumGbRLkdQ6nChOT9eJWw3ffakwjjuMRF5wUg9b4QnE5hOHKTVNsSuO3qW9SosN/Yn4KmAQbnnl040f4pelVLCb5Pxq6/st7Vfipn5DwaYjlyn9wgpnSqVM8wwrbDpymdIvrHCmVMo0z15X4X9rh8wHLEjawQAAAABJRU5ErkJggg==')}.x-tab .x-button-icon.search,.x-button .x-button-icon.x-icon-mask.search{-webkit-mask-image:url('data:image/png;base64,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')}.x-tab .x-button-icon.settings,.x-button .x-button-icon.x-icon-mask.settings{-webkit-mask-image:url('data:image/png;base64,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')}.x-tab .x-button-icon.star,.x-button .x-button-icon.x-icon-mask.star{-webkit-mask-image:url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAFfUlEQVRoBd2aXahVRRTHz/Ujv+2mZRGZB7W6mtpFikC7+UWUZiqBD0JPFdRL1EMFPfjoU4baS0FUD/UWZBEVShA+BCpmWApRSkgllNpDmZWZt9//eOay72afvWfWOTPn3rvgz8yeWbPW+s/XmT379AwODtZSSQ+CryVgA/gVfIx/pelEhFMBVlvBOaBeFo6Cean8y09KsnMg932TqCOs9M2UhMfhMJVsxtHcAmcbmekLCsqjFKUkvAYG1xSwmEHZqoLyKEVJCDOCNxH9HUCbVl6mULAuXxjrOQlhgl8Bbi0h0Uen3FBS37GqVIQHiHh2SdR16jTlo0t0woycpuxiUDSdHcFeMv3uIWYanTDB3wIWVZBQHP10zuQKvbarUxDWT1HRz1E++Ds99fLtgp6jEmbExhPNcs+IbkZPiCpRCRP5TPCQJ4MJ6A3QSUqjSWzC2ozuC4j+fnSnB+gHq8YmvJKIJgVEpRPX9QH6waqxCa8PjEhHT981H2j6qno0wqzF63BhOUxsom3Zb7aJqGsUjTAONFJlpysXQz7VuXpavrBTzzEJaz1adlzNjHs6RTBvJyZhjZTF/kTaWZZCnlvhsyWgQkPZQpagzsX1bFlAXjGtDdAPUu1p3PPQhCCXkdwG/mta0PWLds060AuAnqtEOjpdbQR3VymX1P9F3UfgGJA9X9F92c/ADaQ2P8V0DJ4/kDbeYKaSvgI2AN0+OGJK1VAbSIhTOXEOybYll2kte77yD4rqrHyb85S9Cl4HtReAyI11/A7HpRq5PSD6oR0f3Rad+H7S1DvV7UgS+tc1cU3n3V/AWJ/SX8BxVuMinow2rNNjlPQVeH0GFg378kDBfLAPXARjZbTPwmUXmOG+bgz71EKFfqKeAUWfREZbJxyCxyOOqEuHER4qrNUWovwy0CFktBHV4eNZMNvxyaaFhKWAaBt/HJwEo4W0luSKLMF8viVhp4iBeeBd8CcYqcQ1qi+CKS7uVmklYdcQY0+C42Ckkf6EmO51cVal3oRlCFkCdKgfCWtbo7obDO3AVWQbHHyUsjo40E6uq9cvQbdG+wN892fj8s0HjXDWKA51/t4JUo72H/jTDtybjSUkbyYsJ0gdfAtSjfTn+JoWQjCv2+57a4M1QaQSvZvrMsIs7RJejGcdUlLJUhzpZsYsZsJcCen6ZwCE3IaYA2021OfUdU3fJltmwni7Fvh+KDMF16KR3ux0lWuSdgjPxeNdJq/tNdKNqJaSSUyEmVK6JNPomtqbIh3eSKNsEmvAarfJ5LEzjbbR59MtpqyEb8eZjpndkhtxvNri3Er4YZxpx+yW6Jdhi8V5MOHm+n0QZ9afo0u0fQO8A5S3iPaQ1cTSG9w4f/SqesZBH/gRWI6T+gyyxfkgvw2cMdrS+/lTzpZvGnyWxsnTwHLRd4R2a/OBqQyoztKBe/P2qp6DCBOUptKHhuA+pU1fq2Co0/F0L9CVaghxXTbWW9ktKg8lrFfCrwODeh/9wgu1bEDo6OT2Fvgb+JLWq+nQEsnaa5UPJbwKBxc8A9KXPG1O3u+u6E4F24GvD3XMDjCxFcF8uTdhjGpHfwn49L42lCeAdyDZwGi3HpwAPr6+Q29htn1ZPoSwfuz3ewShXVcBNz62lzkvq6O9DjZHgQ9p72kdQljvob9VBPAN9Q+UEQmpw5b+Sf8e0FotI/4a9ZN8bIcQXlnh9AD1y3ychuhgU0tpJyhb14epn+ljN+Sk9S9G1ct50d8SdgF9x9EO3lHB5hXwPEYfA8dbGD9LuWZBtfj0inSQWUDTKzu1dAB5Dkz2tdOOHn70LvwVyMag/FYwzse295Rukq5j+G1wEOib66PAy5FPMD46+NPmqTV7CpwGGvkJPm2l8z8GWDNDloqpGQAAAABJRU5ErkJggg==')}.x-tab .x-button-icon.trash,.x-button .x-button-icon.x-icon-mask.trash{-webkit-mask-image:url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAFBElEQVRoBe2aS4gdRRRA8+L/m0QIJkYNLlQUNOAvigpRcCEIcSsiCLoLLoILcaM7QVBX4koRshDxt9CFKCoiuvGDCP5QkxCiJhInRo2Ovzie80gPNWX1dL3uesM09IUz3V1169a9daur+031aG5ubkUpGY1GK7G1Dq4Cz9vKiIY74Sv8+72tkWQ7Ay4Bxo+Hu2E3/AuOZBf+ov2TsL6Ef5WNUsGazXvgEHQJMm77N/aeg3Mrh7seOweMM2bWYH+B2OES1/9g9w0oEnSngHHCYO+FGSgRXJ0NM/0idA565BRpKyxSt9J2B5xWY+Mw5Udq6uqKT6XimESlmX4d7sTnA4n6rKJjs7QSSgTrSno7nJyodtFyGr4AP4G6TeLIHweb4A44C0LR1xtgCzwP7aTtIkBvLlSfQjwNZyl7FNa0sU077V4DX0Js25X7cRjPzDb2Nd5FnK7xPbGXskdwxsxOLLRzdnwIj8GvkQFnypqobKLLrgGnOjMzP6cqJijzfn0NXPljmXRNWNC+dcBHM7HA2NELp10nwbaz5iC4OsdidTyrYp3a68ZFi7XJFfNsOBGcUmFnPpbiBWkVZefT7g+OXcTF0EUsFPtaje0Lw0LOzfoM49B4Gy36WMKwK+WDcC2cAmGwXK7YAAYdym9c+NiIdUOdnHODc6DjpPioix9LBvwtPE3QOzjWi7MjBS0M8CGY1huUA1ISg/4cNqXiqcqSwVqJ3AQ/QEmnpm3LR+IzsLYKMD4mA6bBOfAKuFpO28nS9v0Bcxckn9V1Ad9Pg2m/H5cONLT3Mf5fFGfX63hBQG8s7/LXxcdV0nvjMtgKp0MojuaroM60xYB8Z78ZTog6c515B1ylXey+ARe3/0tqFNCy0RjrkdvgOwhH0TeiB2A1uMBNGx9Ta+FZiP34mrIrQR39cECSUzqZYYIcR0mjJtmFwmHUvdenLjwmnUl7Eh05+LP40fjvoGTACYN1Rc6CecGhM7lw2lt+AA7Fg4fOespXgYO0j3pvnXmh3rY+/52+vrXtRSd841rQJ/WV1JVX9eNj14DnjeHnJVw8DBeAnX8A2ynfXwXN+cWUPQUOjNl6i7Jt1I9nCOe+1V0NT4AB/wkvw31QRIoFjDfnwRXgfVbJGZzsry44boTNUGVjlvOToPpV5FvbjXApKE7VLZ6UkpWlDGHH+96pV93/4TSsujGA8MeF51Xw6njuO3soKTth/UTnJQOeqONFlKsBW0SlfdVyDLh9NBkth4AzBqnXKkOGe52+DOeHDGcMUq9Vhgz3On0Zzg8ZzhikXqsMGe51+jKcHzKcMUi9Vhky3Ov0ZTg/ZDhjkHqtMmS41+nLcH7IcMYg9VplOWY4/Md88cEtHbDOVg5Xx9jpsM9Yx52JeAcw1ontTXRdcm9pFz3vBveHdNJN6YPVRhrnivtMlruZ5g7DFxBuXLut8j7sA/d43Yr5CIpJsYAJ7DN2/27Bsw1gwAb3I8wLOp+g4w6+nw/6HddOyszqWDg/Qv2bXFwH4+1SyhyUYtI1YLc85wXn/ORAagWdPVRKUqh3AJwtdTLeWq2rbCoP76cm3bjeLG6ELjZim03XJujyJqXF6rtmeDvGNzMN/ajEAZi2rKOD67t00jVgN7+3dnFgqdsu5XRc6tiS/eUGvBTTNengBIVZPuYG7LcYPjdluYk++bTw++pGyQ34bSy9B35Vs5zEYGfgJfg+x7H/ADoy2VfnrtXoAAAAAElFTkSuQmCC')}.x-tab .x-button-icon.maps,.x-button .x-button-icon.x-icon-mask.maps{-webkit-mask-image:url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAADl0lEQVRoBe2b24tNURzHjfutXEPycDAltwhJbuMSJUqSB/HiES/+AK9ePc6T8uCFkImQW5KGkdwSxYyMGkZu45bbDOPzyZyTrJnjnDkGrVm/+szas2bv397f33ftPS+/Vdba2toj5igj0NcfRkG/3qWIJdcIrs/AO6gDq7cKPkOjUNAmxr8ePJsix8NUWAvLoapowSQawIUzYCZUwAqohF3QAjtgGTyCy5x/nfEu1MNDCmAxuiS4Vy8ST4DZMB9WwiTIRUGC26q1gKtWwyyYBsPB5aLIL5CNTxzotDeWTeA5DUKuO4xXoQbxHpcUbSIzJFkDi0EzdLYnBNGuYJJ4ch+YAhvB5TAORsKvib4x97vwPpk2FjJuhibu85zxAlyCangBLRQib06u68t5vk4uVYVqgO+oqy9v5ASTRLd0LQNLYB24bAfBnw5zikX0HtuhGW5ANY9ylvEBvIY3FOArcz7rWHCpboBFMAxyGjguKIZy1jzYCqfAD5BLslB8J3dCP/AdOgo+fKHXd3Sebh+EctCMieBK6Oj8QuYrXZ7roQr88PiSD4b/IVyyfhB9jQy/uppTUijYhANLytJ1F/sxzL7POpg97vQdFfwVTNYtQsHdKpLg2O1ODieHI6tAWtKRGRrISQ4HJYlsIjkcmaGBnORwUJLIJpLDkRkayEkOByWJbCI5HJmhgZzkcFCSyCaSw5EZGshJDgcliWwiORyZoYGc5HBQksgmksORGRrISQ4HJYlsIjkcmaGBnORwUJLIJpLDkRkayEkOByWJbKLbOVx0r3E7httIbttwNvzddt//JWxIfQynYX8pgu2TbgBbjw9Ds53sNHJv49gOehu5bUe2DfjXojDVpWG/9iu4CEegBp7xfO+LFfyGC5+AiQ7BFXj/c8s+xw+Z24PwvYwKnQxLoQLccGEB7Hsu9t5ckjcU2QjuozgA5+Apz9PCmItCbvqWs2vhJpwBl8ZrEuVtOebPtiWLbf2ymyL0ZVT8XJgDbgHIgFsPOhPmr4d7oAnHue9txg6jI8EfueIaHIOrcAuafieSc/IG19vw7TYD6UEBbE4vhwxMB7cizIYhYPT6MeR+WjBFPoCToEgF1hb6bD8LNpHLwT0L56EOGkhUchc6edoNcruvQWoQ7/6GMTAa3E2zACxGNjRhH9wHV4zP9oGxqCjj7C0wA06Ay/YliRT/T4MCuGnEfQ4feJ5mfvdfaG+OXSWdju+VpAoIK3D9tAAAAABJRU5ErkJggg==')}.x-tab .x-button-icon.locate,.x-button .x-button-icon.x-icon-mask.locate{-webkit-mask-image:url('data:image/png;base64,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')}.x-tab .x-button-icon.home,.x-button .x-button-icon.x-icon-mask.home{-webkit-mask-image:url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAEK0lEQVRoBe2Zy28NURzHe/vwqEepYkFIQzxWaCOC2HhELEgQImhXIrqyIEXikVQi+gdIwx9AItg1NiJELMSGhKQbobY2VY9Srfp8m5lmTO/cOXN7Zu656f0ln8zMnTNnft/z+505j5sbGxurmk5WPZ3ESuu0E1xbigjncrka3jsbftClIvsU5RZ65aLK5Lj/C75SzSjHWCuJYLxqhPXwBgYhylq4sRaixChDP8EzGIJ4UwNnCR6tgFswANegKer93LsLim4herm/JKqO8O+ZRdhL42acOwunYAacg2Hu3ePYj3Ph1A1fU2ySmZSZeCiTjxaC1LAboRs6QGJl8+AKXIU1kLqlHmHEqlFboQv2gD40QdPHqx3qKdtJkD8Hb9o+TzXCXmT1cboB+cT6evTVPgIXeWYl6DoVSy3COF2Hx0rjTthp4L0a/4xXrofn33OeqH8avKMqFcE4O4uXb4ULsNfEEa+M0v00LIIuCKc/P03NrAtGrD5Iiuh10Dia1JTOR0EZsjjpw3HlrQpGbD0v3AzFig36e4CLkeAPNs6tCUbsHBxS+mpsLSayYT2KtLBqVgQjdgFe7QP1u9VWPbRc2ZQFe2LV5zSBWG7ZP+vVTUkwYhvx6DicB+fFqvWKFuyJ1QxJ00It48rCNNgnNi+N23hQaVw2YiU0cYQRq9Q9CJdBKV1q02zMeEaWSDBil1L5JTgBDeCCzcUJ8cXImfACOeqayjbBffgDfqu6cPyJP3dgVZTvwd9jdzuoSFmgicRDGAYXRIZ9+I5fPbA6KC7feUHBVKD5rJZ1EutaZMOiv+HjbWjJJ9T/LVIwDyqyh+ApuC7WFy/RCk4r5HyRwWNewRSW2N3wGv6CX2E5HBWcB9AaFOqfTxJMQa1lNewosqNQDiLDPmqv+hFsgzpfrI7/CeamVjwnQZEtV7G+eEX6MeyHGl/0hGB+1MJdYt+B/1C5H9UdX8J2qJ6IMBfz4Ri8hXIXGfZfmdoLWr5W1zJ7ktg2aId18BuiTHNvDVUumQSNxDikLSdtBzdok0yCD8MyiLNmCqhxXBL9An+egNI3yqRT9z+O92FO/O2UuOMuymoqF06bUl53489MQw21Gm8lWmkRa6R/oVaMfT6lAmrsUVMNRa2HU3I8k2orgjNp5hK+ZLwPp/x+fR+0ONfMp9BfJ+qLmulpyze1zMtC8AACbkI/xAneQZkO0JiZimUheAjPn0MfxAnWVo3RiEG5oiwLwXJsmGFDK5iCxrCnGZNSOzVLra+EPDZ9T6EMCFVZ3KWpI8XV7uBTFcEOBsWqS5UIW21OByurRNjBoFh1qRJhq83pYGWVCDsYFKsuVSJstTkdrGz8L0VTv1i+NVF2CyTJDC0LX7E8HIx7D/Vrb3wDaLvY1D5QsI/6jXZUEwk29cDlckki5bIOY9+mneB/GfbU3e4Ey5kAAAAASUVORK5CYII=')}.x-button.x-button-action,.x-toolbar .x-button.x-button-action,.x-button.x-button-action-round,.x-toolbar .x-button.x-button-action-round,.x-button.x-button-action-small,.x-toolbar .x-button.x-button-action-small{border:1px solid #010509;border-top-color:#021022;color:white}.x-button.x-button-action.x-button-back:before,.x-button.x-button-action.x-button-forward:before,.x-toolbar .x-button.x-button-action.x-button-back:before,.x-toolbar .x-button.x-button-action.x-button-forward:before,.x-button.x-button-action-round.x-button-back:before,.x-button.x-button-action-round.x-button-forward:before,.x-toolbar .x-button.x-button-action-round.x-button-back:before,.x-toolbar .x-button.x-button-action-round.x-button-forward:before,.x-button.x-button-action-small.x-button-back:before,.x-button.x-button-action-small.x-button-forward:before,.x-toolbar .x-button.x-button-action-small.x-button-back:before,.x-toolbar .x-button.x-button-action-small.x-button-forward:before{background:#010509}.x-button.x-button-action,.x-button.x-button-action.x-button-back:after,.x-button.x-button-action.x-button-forward:after,.x-toolbar .x-button.x-button-action,.x-toolbar .x-button.x-button-action.x-button-back:after,.x-toolbar .x-button.x-button-action.x-button-forward:after,.x-button.x-button-action-round,.x-button.x-button-action-round.x-button-back:after,.x-button.x-button-action-round.x-button-forward:after,.x-toolbar .x-button.x-button-action-round,.x-toolbar .x-button.x-button-action-round.x-button-back:after,.x-toolbar .x-button.x-button-action-round.x-button-forward:after,.x-button.x-button-action-small,.x-button.x-button-action-small.x-button-back:after,.x-button.x-button-action-small.x-button-forward:after,.x-toolbar .x-button.x-button-action-small,.x-toolbar .x-button.x-button-action-small.x-button-back:after,.x-toolbar .x-button.x-button-action-small.x-button-forward:after{background-color:#06346a;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #167bf3), color-stop(2%, #07448c), color-stop(100%, #042348));background-image:-webkit-linear-gradient(#167bf3,#07448c 2%,#042348);background-image:linear-gradient(#167bf3,#07448c 2%,#042348)}.x-button.x-button-action .x-button-icon.x-icon-mask,.x-toolbar .x-button.x-button-action .x-button-icon.x-icon-mask,.x-button.x-button-action-round .x-button-icon.x-icon-mask,.x-toolbar .x-button.x-button-action-round .x-button-icon.x-icon-mask,.x-button.x-button-action-small .x-button-icon.x-icon-mask,.x-toolbar .x-button.x-button-action-small .x-button-icon.x-icon-mask{background-color:white;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ffffff), color-stop(2%, #ffffff), color-stop(100%, #ddecfd));background-image:-webkit-linear-gradient(#ffffff,#ffffff 2%,#ddecfd);background-image:linear-gradient(#ffffff,#ffffff 2%,#ddecfd)}.x-button.x-button-action.x-button-pressing,.x-button.x-button-action.x-button-pressing:after,.x-button.x-button-action.x-button-pressed,.x-button.x-button-action.x-button-pressed:after,.x-button.x-button-action.x-button-active,.x-button.x-button-action.x-button-active:after,.x-toolbar .x-button.x-button-action.x-button-pressing,.x-toolbar .x-button.x-button-action.x-button-pressing:after,.x-toolbar .x-button.x-button-action.x-button-pressed,.x-toolbar .x-button.x-button-action.x-button-pressed:after,.x-toolbar .x-button.x-button-action.x-button-active,.x-toolbar .x-button.x-button-action.x-button-active:after,.x-button.x-button-action-round.x-button-pressing,.x-button.x-button-action-round.x-button-pressing:after,.x-button.x-button-action-round.x-button-pressed,.x-button.x-button-action-round.x-button-pressed:after,.x-button.x-button-action-round.x-button-active,.x-button.x-button-action-round.x-button-active:after,.x-toolbar .x-button.x-button-action-round.x-button-pressing,.x-toolbar .x-button.x-button-action-round.x-button-pressing:after,.x-toolbar .x-button.x-button-action-round.x-button-pressed,.x-toolbar .x-button.x-button-action-round.x-button-pressed:after,.x-toolbar .x-button.x-button-action-round.x-button-active,.x-toolbar .x-button.x-button-action-round.x-button-active:after,.x-button.x-button-action-small.x-button-pressing,.x-button.x-button-action-small.x-button-pressing:after,.x-button.x-button-action-small.x-button-pressed,.x-button.x-button-action-small.x-button-pressed:after,.x-button.x-button-action-small.x-button-active,.x-button.x-button-action-small.x-button-active:after,.x-toolbar .x-button.x-button-action-small.x-button-pressing,.x-toolbar .x-button.x-button-action-small.x-button-pressing:after,.x-toolbar .x-button.x-button-action-small.x-button-pressed,.x-toolbar .x-button.x-button-action-small.x-button-pressed:after,.x-toolbar .x-button.x-button-action-small.x-button-active,.x-toolbar .x-button.x-button-action-small.x-button-active:after{background-color:#052d5c;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #02152b), color-stop(10%, #042144), color-stop(65%, #052d5c), color-stop(100%, #052e5e));background-image:-webkit-linear-gradient(#02152b,#042144 10%,#052d5c 65%,#052e5e);background-image:linear-gradient(#02152b,#042144 10%,#052d5c 65%,#052e5e)}.x-button.x-button-confirm,.x-toolbar .x-button.x-button-confirm,.x-button.x-button-confirm-round,.x-toolbar .x-button.x-button-confirm-round,.x-button.x-button-confirm-small,.x-toolbar .x-button.x-button-confirm-small{border:1px solid #263501;border-top-color:#374e02;color:white}.x-button.x-button-confirm.x-button-back:before,.x-button.x-button-confirm.x-button-forward:before,.x-toolbar .x-button.x-button-confirm.x-button-back:before,.x-toolbar .x-button.x-button-confirm.x-button-forward:before,.x-button.x-button-confirm-round.x-button-back:before,.x-button.x-button-confirm-round.x-button-forward:before,.x-toolbar .x-button.x-button-confirm-round.x-button-back:before,.x-toolbar .x-button.x-button-confirm-round.x-button-forward:before,.x-button.x-button-confirm-small.x-button-back:before,.x-button.x-button-confirm-small.x-button-forward:before,.x-toolbar .x-button.x-button-confirm-small.x-button-back:before,.x-toolbar .x-button.x-button-confirm-small.x-button-forward:before{background:#263501}.x-button.x-button-confirm,.x-button.x-button-confirm.x-button-back:after,.x-button.x-button-confirm.x-button-forward:after,.x-toolbar .x-button.x-button-confirm,.x-toolbar .x-button.x-button-confirm.x-button-back:after,.x-toolbar .x-button.x-button-confirm.x-button-forward:after,.x-button.x-button-confirm-round,.x-button.x-button-confirm-round.x-button-back:after,.x-button.x-button-confirm-round.x-button-forward:after,.x-toolbar .x-button.x-button-confirm-round,.x-toolbar .x-button.x-button-confirm-round.x-button-back:after,.x-toolbar .x-button.x-button-confirm-round.x-button-forward:after,.x-button.x-button-confirm-small,.x-button.x-button-confirm-small.x-button-back:after,.x-button.x-button-confirm-small.x-button-forward:after,.x-toolbar .x-button.x-button-confirm-small,.x-toolbar .x-button.x-button-confirm-small.x-button-back:after,.x-toolbar .x-button.x-button-confirm-small.x-button-forward:after{background-color:#6c9804;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #c2fa3b), color-stop(2%, #85bb05), color-stop(100%, #547503));background-image:-webkit-linear-gradient(#c2fa3b,#85bb05 2%,#547503);background-image:linear-gradient(#c2fa3b,#85bb05 2%,#547503)}.x-button.x-button-confirm .x-button-icon.x-icon-mask,.x-toolbar .x-button.x-button-confirm .x-button-icon.x-icon-mask,.x-button.x-button-confirm-round .x-button-icon.x-icon-mask,.x-toolbar .x-button.x-button-confirm-round .x-button-icon.x-icon-mask,.x-button.x-button-confirm-small .x-button-icon.x-icon-mask,.x-toolbar .x-button.x-button-confirm-small .x-button-icon.x-icon-mask{background-color:white;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ffffff), color-stop(2%, #ffffff), color-stop(100%, #f4fedc));background-image:-webkit-linear-gradient(#ffffff,#ffffff 2%,#f4fedc);background-image:linear-gradient(#ffffff,#ffffff 2%,#f4fedc)}.x-button.x-button-confirm.x-button-pressing,.x-button.x-button-confirm.x-button-pressing:after,.x-button.x-button-confirm.x-button-pressed,.x-button.x-button-confirm.x-button-pressed:after,.x-button.x-button-confirm.x-button-active,.x-button.x-button-confirm.x-button-active:after,.x-toolbar .x-button.x-button-confirm.x-button-pressing,.x-toolbar .x-button.x-button-confirm.x-button-pressing:after,.x-toolbar .x-button.x-button-confirm.x-button-pressed,.x-toolbar .x-button.x-button-confirm.x-button-pressed:after,.x-toolbar .x-button.x-button-confirm.x-button-active,.x-toolbar .x-button.x-button-confirm.x-button-active:after,.x-button.x-button-confirm-round.x-button-pressing,.x-button.x-button-confirm-round.x-button-pressing:after,.x-button.x-button-confirm-round.x-button-pressed,.x-button.x-button-confirm-round.x-button-pressed:after,.x-button.x-button-confirm-round.x-button-active,.x-button.x-button-confirm-round.x-button-active:after,.x-toolbar .x-button.x-button-confirm-round.x-button-pressing,.x-toolbar .x-button.x-button-confirm-round.x-button-pressing:after,.x-toolbar .x-button.x-button-confirm-round.x-button-pressed,.x-toolbar .x-button.x-button-confirm-round.x-button-pressed:after,.x-toolbar .x-button.x-button-confirm-round.x-button-active,.x-toolbar .x-button.x-button-confirm-round.x-button-active:after,.x-button.x-button-confirm-small.x-button-pressing,.x-button.x-button-confirm-small.x-button-pressing:after,.x-button.x-button-confirm-small.x-button-pressed,.x-button.x-button-confirm-small.x-button-pressed:after,.x-button.x-button-confirm-small.x-button-active,.x-button.x-button-confirm-small.x-button-active:after,.x-toolbar .x-button.x-button-confirm-small.x-button-pressing,.x-toolbar .x-button.x-button-confirm-small.x-button-pressing:after,.x-toolbar .x-button.x-button-confirm-small.x-button-pressed,.x-toolbar .x-button.x-button-confirm-small.x-button-pressed:after,.x-toolbar .x-button.x-button-confirm-small.x-button-active,.x-toolbar .x-button.x-button-confirm-small.x-button-active:after{background-color:#628904;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #3e5702), color-stop(10%, #507003), color-stop(65%, #628904), color-stop(100%, #648c04));background-image:-webkit-linear-gradient(#3e5702,#507003 10%,#628904 65%,#648c04);background-image:linear-gradient(#3e5702,#507003 10%,#628904 65%,#648c04)}.x-button.x-button-decline,.x-toolbar .x-button.x-button-decline,.x-button.x-button-decline-round,.x-toolbar .x-button.x-button-decline-round,.x-button.x-button-decline-small,.x-toolbar .x-button.x-button-decline-small{border:1px solid #630303;border-top-color:#7c0303;color:white}.x-button.x-button-decline.x-button-back:before,.x-button.x-button-decline.x-button-forward:before,.x-toolbar .x-button.x-button-decline.x-button-back:before,.x-toolbar .x-button.x-button-decline.x-button-forward:before,.x-button.x-button-decline-round.x-button-back:before,.x-button.x-button-decline-round.x-button-forward:before,.x-toolbar .x-button.x-button-decline-round.x-button-back:before,.x-toolbar .x-button.x-button-decline-round.x-button-forward:before,.x-button.x-button-decline-small.x-button-back:before,.x-button.x-button-decline-small.x-button-forward:before,.x-toolbar .x-button.x-button-decline-small.x-button-back:before,.x-toolbar .x-button.x-button-decline-small.x-button-forward:before{background:#630303}.x-button.x-button-decline,.x-button.x-button-decline.x-button-back:after,.x-button.x-button-decline.x-button-forward:after,.x-toolbar .x-button.x-button-decline,.x-toolbar .x-button.x-button-decline.x-button-back:after,.x-toolbar .x-button.x-button-decline.x-button-forward:after,.x-button.x-button-decline-round,.x-button.x-button-decline-round.x-button-back:after,.x-button.x-button-decline-round.x-button-forward:after,.x-toolbar .x-button.x-button-decline-round,.x-toolbar .x-button.x-button-decline-round.x-button-back:after,.x-toolbar .x-button.x-button-decline-round.x-button-forward:after,.x-button.x-button-decline-small,.x-button.x-button-decline-small.x-button-back:after,.x-button.x-button-decline-small.x-button-forward:after,.x-toolbar .x-button.x-button-decline-small,.x-toolbar .x-button.x-button-decline-small.x-button-back:after,.x-toolbar .x-button.x-button-decline-small.x-button-forward:after{background-color:#c70505;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #fb6a6a), color-stop(2%, #ea0606), color-stop(100%, #a40404));background-image:-webkit-linear-gradient(#fb6a6a,#ea0606 2%,#a40404);background-image:linear-gradient(#fb6a6a,#ea0606 2%,#a40404)}.x-button.x-button-decline .x-button-icon.x-icon-mask,.x-toolbar .x-button.x-button-decline .x-button-icon.x-icon-mask,.x-button.x-button-decline-round .x-button-icon.x-icon-mask,.x-toolbar .x-button.x-button-decline-round .x-button-icon.x-icon-mask,.x-button.x-button-decline-small .x-button-icon.x-icon-mask,.x-toolbar .x-button.x-button-decline-small .x-button-icon.x-icon-mask{background-color:white;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ffffff), color-stop(2%, #ffffff), color-stop(100%, #fedcdc));background-image:-webkit-linear-gradient(#ffffff,#ffffff 2%,#fedcdc);background-image:linear-gradient(#ffffff,#ffffff 2%,#fedcdc)}.x-button.x-button-decline.x-button-pressing,.x-button.x-button-decline.x-button-pressing:after,.x-button.x-button-decline.x-button-pressed,.x-button.x-button-decline.x-button-pressed:after,.x-button.x-button-decline.x-button-active,.x-button.x-button-decline.x-button-active:after,.x-toolbar .x-button.x-button-decline.x-button-pressing,.x-toolbar .x-button.x-button-decline.x-button-pressing:after,.x-toolbar .x-button.x-button-decline.x-button-pressed,.x-toolbar .x-button.x-button-decline.x-button-pressed:after,.x-toolbar .x-button.x-button-decline.x-button-active,.x-toolbar .x-button.x-button-decline.x-button-active:after,.x-button.x-button-decline-round.x-button-pressing,.x-button.x-button-decline-round.x-button-pressing:after,.x-button.x-button-decline-round.x-button-pressed,.x-button.x-button-decline-round.x-button-pressed:after,.x-button.x-button-decline-round.x-button-active,.x-button.x-button-decline-round.x-button-active:after,.x-toolbar .x-button.x-button-decline-round.x-button-pressing,.x-toolbar .x-button.x-button-decline-round.x-button-pressing:after,.x-toolbar .x-button.x-button-decline-round.x-button-pressed,.x-toolbar .x-button.x-button-decline-round.x-button-pressed:after,.x-toolbar .x-button.x-button-decline-round.x-button-active,.x-toolbar .x-button.x-button-decline-round.x-button-active:after,.x-button.x-button-decline-small.x-button-pressing,.x-button.x-button-decline-small.x-button-pressing:after,.x-button.x-button-decline-small.x-button-pressed,.x-button.x-button-decline-small.x-button-pressed:after,.x-button.x-button-decline-small.x-button-active,.x-button.x-button-decline-small.x-button-active:after,.x-toolbar .x-button.x-button-decline-small.x-button-pressing,.x-toolbar .x-button.x-button-decline-small.x-button-pressing:after,.x-toolbar .x-button.x-button-decline-small.x-button-pressed,.x-toolbar .x-button.x-button-decline-small.x-button-pressed:after,.x-toolbar .x-button.x-button-decline-small.x-button-active,.x-toolbar .x-button.x-button-decline-small.x-button-active:after{background-color:#b80505;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #860303), color-stop(10%, #9f0404), color-stop(65%, #b80505), color-stop(100%, #ba0505));background-image:-webkit-linear-gradient(#860303,#9f0404 10%,#b80505 65%,#ba0505);background-image:linear-gradient(#860303,#9f0404 10%,#b80505 65%,#ba0505)}.x-sheet,.x-sheet-action{padding:0.7em;border-top:1px solid #030507;height:auto;background-color:rgba(0, 0, 0, 0.9);background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, rgba(50,74,103,0.9)), color-stop(2%, rgba(12,17,24,0.9)), color-stop(100%, rgba(0,0,0,0.9)));background-image:-webkit-linear-gradient(rgba(50,74,103,0.9),rgba(12,17,24,0.9) 2%,rgba(0,0,0,0.9));background-image:linear-gradient(rgba(50,74,103,0.9),rgba(12,17,24,0.9) 2%,rgba(0,0,0,0.9));-webkit-border-radius:0;border-radius:0}.x-sheet-inner > .x-button,.x-sheet-action-inner > .x-button{margin-bottom:0.5em}.x-sheet-inner > .x-button:last-child,.x-sheet-action-inner > .x-button:last-child{margin-bottom:0}.x-sheet.x-picker{padding:0}.x-sheet.x-picker .x-sheet-inner{position:relative;background-color:#fff;-webkit-border-radius:0.4em;border-radius:0.4em;-webkit-background-clip:padding;background-clip:padding-box;overflow:hidden;margin:0.7em}.x-sheet.x-picker .x-sheet-inner:before,.x-sheet.x-picker .x-sheet-inner:after{z-index:1;content:"";position:absolute;width:100%;height:30%;top:0;left:0}.x-sheet.x-picker .x-sheet-inner:before{top:auto;-webkit-border-bottom-left-radius:0.4em;border-bottom-left-radius:0.4em;-webkit-border-bottom-right-radius:0.4em;border-bottom-right-radius:0.4em;bottom:0;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ffffff), color-stop(100%, #bbbbbb));background-image:-webkit-linear-gradient(#ffffff,#bbbbbb);background-image:linear-gradient(#ffffff,#bbbbbb)}.x-sheet.x-picker .x-sheet-inner:after{-webkit-border-top-left-radius:0.4em;border-top-left-radius:0.4em;-webkit-border-top-right-radius:0.4em;border-top-right-radius:0.4em;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #bbbbbb), color-stop(100%, #ffffff));background-image:-webkit-linear-gradient(#bbbbbb,#ffffff);background-image:linear-gradient(#bbbbbb,#ffffff)}.x-sheet.x-picker .x-sheet-inner .x-picker-slot .x-body{border-left:1px solid #999999;border-right:1px solid #ACACAC}.x-sheet.x-picker .x-sheet-inner .x-picker-slot:first-child .x-body{border-left:0}.x-sheet.x-picker .x-sheet-inner .x-picker-slot:last-child .x-body{border-left:0;border-right:0}.x-picker-slot .x-scroll-view{z-index:2;position:relative;-webkit-box-shadow:rgba(0, 0, 0, 0.4) -1px 0 1px}.x-picker-slot .x-scroll-view:first-child{-webkit-box-shadow:none}.x-picker-mask{position:absolute;top:0;left:0;right:0;bottom:0;z-index:3;display:-webkit-box;display:box;-webkit-box-align:stretch;box-align:stretch;-webkit-box-orient:vertical;box-orient:vertical;-webkit-box-pack:center;box-pack:center;pointer-events:none}.x-picker-bar{border-top:0.12em solid #06346a;border-bottom:0.12em solid #06346a;height:2.5em;background-color:rgba(13, 117, 242, 0.3);background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, rgba(158,200,250,0.3)), color-stop(2%, rgba(47,137,244,0.3)), color-stop(100%, rgba(11,101,208,0.3)));background-image:-webkit-linear-gradient(rgba(158,200,250,0.3),rgba(47,137,244,0.3) 2%,rgba(11,101,208,0.3));background-image:linear-gradient(rgba(158,200,250,0.3),rgba(47,137,244,0.3) 2%,rgba(11,101,208,0.3));-webkit-box-shadow:rgba(0, 0, 0, 0.2) 0 0.2em 0.2em}.x-use-titles .x-picker-bar{margin-top:1.5em}.x-picker-slot-title{height:1.5em;position:relative;z-index:2;background-color:#345b89;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #85a7d1), color-stop(2%, #3e6ca3), color-stop(100%, #2a496f));background-image:-webkit-linear-gradient(#85a7d1,#3e6ca3 2%,#2a496f);background-image:linear-gradient(#85a7d1,#3e6ca3 2%,#2a496f);border-top:1px solid #345b89;border-bottom:1px solid #182a3f;-webkit-box-shadow:0px 0.1em 0.3em rgba(0, 0, 0, 0.3);padding:0.2em 1.02em}.x-picker-slot-title > div{font-weight:bold;font-size:0.8em;color:#0d1116;text-shadow:rgba(255, 255, 255, 0.25) 0 0.08em 0}.x-picker-slot .x-dataview-inner{width:100%}.x-picker-slot .x-dataview-item{vertical-align:middle;height:2.5em;line-height:2.5em;font-weight:bold;padding:0 10px}.x-picker-slot .x-picker-item{white-space:nowrap;overflow:hidden;text-overflow:ellipsis}.x-picker-right{text-align:right}.x-picker-center{text-align:center}.x-picker-left{text-align:left}.x-tabbar.x-docked-top{border-bottom:.1em solid;height:2.6em;padding:0 .8em}.x-tabbar.x-docked-top .x-tab{padding:0.4em 0.8em;height:1.8em;-webkit-border-radius:0.9em;border-radius:0.9em}.x-tabbar.x-docked-top .x-button-label,.x-tabbar.x-docked-top .x-hasbadge .x-badge,.x-hasbadge .x-tabbar.x-docked-top .x-badge{font-size:.8em;line-height:1.2em;text-rendering:optimizeLegibility;-webkit-font-smoothing:antialiased}.x-tabbar.x-docked-bottom{border-top:.1em solid;height:3em;padding:0}.x-tabbar.x-docked-bottom .x-tab{-webkit-border-radius:0.25em;border-radius:0.25em;min-width:3.3em;position:relative;padding-top:.2em}.x-tabbar.x-docked-bottom .x-tab .x-button-icon{-webkit-mask-size:1.65em;width:1.65em;height:1.65em;display:block;margin:0 auto;position:relative}.x-tabbar.x-docked-bottom .x-tab .x-button-label,.x-tabbar.x-docked-bottom .x-tab .x-hasbadge .x-badge,.x-hasbadge .x-tabbar.x-docked-bottom .x-tab .x-badge{margin:0;padding:.1em 0 .2em 0;font-size:9px;line-height:12px;text-rendering:optimizeLegibility;-webkit-font-smoothing:antialiased}.x-tab .x-button-icon.bookmarks,.x-button .x-button-icon.x-icon-mask.bookmarks{-webkit-mask-image:url('data:image/png;base64,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')}.x-tab .x-button-icon.download,.x-button .x-button-icon.x-icon-mask.download{-webkit-mask-image:url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAGb0lEQVRoBd2aX4gVVRzH3V1dU5JMk9Q2wVxCo0QNTYRYS4l6CBFBomA1qjcjSOgPPUgR0VNBFBT0Bx96qAiSXipCH4rKIhGNUqE2SK3MqKwsLbXPZ7rnMo73jnPnzF6v9wefPefMnPP7/b7z58yZudtz6tSpMaNlPT09E/DdDxPhMpgNJyBtfTRG4AAchePk9BflqFhP1YIRqbCZsACWwjWwGIrYZ3TaDZ/ATjhIfh6IyqwywQhdRlaLYBVcB5Mgxn5n8HbYAjsQ/lGMs/pYz3AMOFLgG/AzeH+MBvo2xqqYXB1bSiyBe2EJvAaH4SSMhtC0T2MYy5jG7i0jvmXBBJoMj4D3VjuEpkVbN6axzWFyq6JbEkyAhfAqOJtmE2l32xzMZWErogsLxvE62As+Vtotrlk8czGndUVFFxKMw41wEM7FJdxMbNhuTua2sYjoXME4cVHwEDhZhACdWpqjufblCW8qmIHOxHfCT9CpIrN5mas5N53B8wS7kPgKOumezQrMts3VnJc1O8sNV1qsmq5k0LNwI3hZx9ovONgEPk4amcvRR+HiRjtb3KborbAB0fvOGJs9EnRwwf88HIHsESzbVuisbKzQdh/Yp6z/7DhzV8OEECOU3qd148z20FgDK+DC+o74in59Y2pm7rNPVWbualhT01T3e5pgts6D9eARrzIB3LXVzF0N60FNdasL5kj0sXUtzIf+eo/zt6IGtaytaUuU1AXTugKuhyomjsR5B/xRi5rUllgimCMwltYQzAHr3WJqUdNQTWOyuFDcpbASptnoMlOT2tQ4phfl3uBzwes9byZl93lpalLbXLV6SXtzr4BuPLvISkxtauxX8DjwW5Qv9t1qalPjOAX7vJoB3TRZIec0U5saZyl4ELr57CIvMTUOKngAqlxGJt478I8aBxQ8Hbpxds4eczVOV/BUuCC7twvbapyq4Ha8JPQVOIBF+hRwk9slWVLm9miy8xjbj0PRA/YHfU828eVm99mnyFziu6/9XT+Mh5as7KPIoE/BB/BPgYgeoP05/dx3OxQR4LrBF4IHoWUrK9j7wZeNzXxJGGk5amYAPvyovj2zuWGT1eEcdjwOpeYdL8mytpyBr5BAW5akroOxy4n5MiyFUqZg78W8+yvPsZfWEyQy3WzyOsbsq/n2Q9+TYMwypsbjCj4EXlJlzPHDcD/48W+0TN8PgF9kyh5YNR4y4e/AGbKsOVveC8OcCSeUSg2fir0H7oayc445qVGtY5bBHnDmjeFXxt8GY8Mn0dhSX+Ds/RvE5OZYNao1eQ/+kNJrPNapoocg9/edIgdCH3AL6DM2L7WpcZqXtKd6L/wJsXYRDl6ABVyK+i5ltbGLGfw06DPW1KbG5NY1MS+bbyD2SIbxO/G1HFo+046BG+ALCP5iS7WpsTf5MY3KPPgYTkCs8zD+XXzNLHL5hj70dwb2WbsNgp/YUk1qm2ecINh/MXoMfoTYAGG8gV6ES4Kgs5X2hZegivkk5KEmtU2qC04q/082u9gROlZRmvgmSH6lzBNMHx9pJlZF3LQPNQ2F2PXfh9noEvF18AGdHhBb/xd/d4SAzUr63AX2jY2XHq8WNU0LceuC3YCtBiecqgP7HF0XgmZL9m2AI5BONrauBrWsTsfLCnbV9AxU8ezLJnwAv2vSwa27DX6AbP/YthrU0p+OeZrgWgLO2FvB99zYoNnx+/B5dUiA+kL4FrL9YtvmroZkZg7xEn3pRqjTcRhGIDZwo/E+rpyNZ4D1Rn1it43gdzjoSZdnnGF3Yq5h74Oq76sg5D18b4PQrrI0Z3NvuKZvKLgmegqDNkPVs3aV4rK+zNWcp6TParreVHBN9ACDt8DfkHXeaW1zNNeBtMBsPVdwTfQgTt6CThZtbuY4mBWYbZ9VcEr0mx0qWrHmdlaxiZbsEWjWxuFkeBhcm7pkPNeXtDmYizkV/r/pQmc4HAQc+934ZtgBVa/GWjmAxjYHcxkf8itStiQ4OCTIbHgO9kM7z7axjGns2SGfVspSgkMAgq4EZ0b/i3U0hevbGMZaGeKXKRv+cylOCxufY/xCcS3cCl5ii6AXqjCFeum+A2/D54j0Pbu0RQsOkRHu+6zP7avgJvDsz4VWxStyD7wPrsi+hP0ILfIbFl3zrTLB6TCId3KbCK6X58MSmAOuocW69jUcrmH9U9gF38NRRB6jrNT+AwkLDdxcvfCRAAAAAElFTkSuQmCC')}.x-tab .x-button-icon.favorites,.x-button .x-button-icon.x-icon-mask.favorites{-webkit-mask-image:url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAFfUlEQVRoBd2aXahVRRTHz/Ujv+2mZRGZB7W6mtpFikC7+UWUZiqBD0JPFdRL1EMFPfjoU4baS0FUD/UWZBEVShA+BCpmWApRSkgllNpDmZWZt9//eOay72afvWfWOTPn3rvgz8yeWbPW+s/XmT379AwODtZSSQ+CryVgA/gVfIx/pelEhFMBVlvBOaBeFo6Cean8y09KsnMg932TqCOs9M2UhMfhMJVsxtHcAmcbmekLCsqjFKUkvAYG1xSwmEHZqoLyKEVJCDOCNxH9HUCbVl6mULAuXxjrOQlhgl8Bbi0h0Uen3FBS37GqVIQHiHh2SdR16jTlo0t0woycpuxiUDSdHcFeMv3uIWYanTDB3wIWVZBQHP10zuQKvbarUxDWT1HRz1E++Ds99fLtgp6jEmbExhPNcs+IbkZPiCpRCRP5TPCQJ4MJ6A3QSUqjSWzC2ozuC4j+fnSnB+gHq8YmvJKIJgVEpRPX9QH6waqxCa8PjEhHT981H2j6qno0wqzF63BhOUxsom3Zb7aJqGsUjTAONFJlpysXQz7VuXpavrBTzzEJaz1adlzNjHs6RTBvJyZhjZTF/kTaWZZCnlvhsyWgQkPZQpagzsX1bFlAXjGtDdAPUu1p3PPQhCCXkdwG/mta0PWLds060AuAnqtEOjpdbQR3VymX1P9F3UfgGJA9X9F92c/ADaQ2P8V0DJ4/kDbeYKaSvgI2AN0+OGJK1VAbSIhTOXEOybYll2kte77yD4rqrHyb85S9Cl4HtReAyI11/A7HpRq5PSD6oR0f3Rad+H7S1DvV7UgS+tc1cU3n3V/AWJ/SX8BxVuMinow2rNNjlPQVeH0GFg378kDBfLAPXARjZbTPwmUXmOG+bgz71EKFfqKeAUWfREZbJxyCxyOOqEuHER4qrNUWovwy0CFktBHV4eNZMNvxyaaFhKWAaBt/HJwEo4W0luSKLMF8viVhp4iBeeBd8CcYqcQ1qi+CKS7uVmklYdcQY0+C42Ckkf6EmO51cVal3oRlCFkCdKgfCWtbo7obDO3AVWQbHHyUsjo40E6uq9cvQbdG+wN892fj8s0HjXDWKA51/t4JUo72H/jTDtybjSUkbyYsJ0gdfAtSjfTn+JoWQjCv2+57a4M1QaQSvZvrMsIs7RJejGcdUlLJUhzpZsYsZsJcCen6ZwCE3IaYA2021OfUdU3fJltmwni7Fvh+KDMF16KR3ux0lWuSdgjPxeNdJq/tNdKNqJaSSUyEmVK6JNPomtqbIh3eSKNsEmvAarfJ5LEzjbbR59MtpqyEb8eZjpndkhtxvNri3Er4YZxpx+yW6Jdhi8V5MOHm+n0QZ9afo0u0fQO8A5S3iPaQ1cTSG9w4f/SqesZBH/gRWI6T+gyyxfkgvw2cMdrS+/lTzpZvGnyWxsnTwHLRd4R2a/OBqQyoztKBe/P2qp6DCBOUptKHhuA+pU1fq2Co0/F0L9CVaghxXTbWW9ktKg8lrFfCrwODeh/9wgu1bEDo6OT2Fvgb+JLWq+nQEsnaa5UPJbwKBxc8A9KXPG1O3u+u6E4F24GvD3XMDjCxFcF8uTdhjGpHfwn49L42lCeAdyDZwGi3HpwAPr6+Q29htn1ZPoSwfuz3ewShXVcBNz62lzkvq6O9DjZHgQ9p72kdQljvob9VBPAN9Q+UEQmpw5b+Sf8e0FotI/4a9ZN8bIcQXlnh9AD1y3ychuhgU0tpJyhb14epn+ljN+Sk9S9G1ct50d8SdgF9x9EO3lHB5hXwPEYfA8dbGD9LuWZBtfj0inSQWUDTKzu1dAB5Dkz2tdOOHn70LvwVyMag/FYwzse295Rukq5j+G1wEOib66PAy5FPMD46+NPmqTV7CpwGGvkJPm2l8z8GWDNDloqpGQAAAABJRU5ErkJggg==')}.x-tab .x-button-icon.info,.x-button .x-button-icon.x-icon-mask.info{-webkit-mask-image:url('data:image/png;base64,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')}.x-tab .x-button-icon.more,.x-button .x-button-icon.x-icon-mask.more{-webkit-mask-image:url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAADJ0lEQVRoBe2YS2sUQRSFp5MgvmLU+CAMiBJFDBHcCeoPEFciuHMjroMK4lZBcONG0JW60U1UEgRx59IXuNMoKEElKL7GRwyIqNHxO0N66FT3UNU9IHRNFXz0VNW5t+vW6RcT1ev1Sie1rk4qVrWGgn13PDgcHPZsB8Il7ZmhqXKCw6kt8WwgOOyZoalygsOpLfFsIDjsmaGpcoLDqS3xbCA47JmhqXKCw6kt8Wyg6XAURV2wEy7BM5iFtzAKu2BB0dqJ7YEtcBYmQblfwzjshUVt5O4mfhjOwwQodw3GYA8snpd77n9pFXMYvoP+qDaZZewcVKXPAzE64Qn4CmZe9f/AFSiSu4e4IzANrXJfZ24gXjO/KxEcg9+QFZQcU/CSONh2RKsraMQhr85xE/psOeN5tCr2APyA5Bqzfl9D06tYtX3wC7KE5pg2ZX98UtsR7XZo5ayZW/1DENnyzi18CO1nyMqTNXYcrTapcitHkBLJiZW2RaGRuxcg6+Stxu6i73fI3Y3uZM7cU+hXQeVvzsBP6Dc5LupxztzaiEGH3AvR3S+Qe4dc0D2cp/Uj1oPI1pR7g030n+erWlTe9pMA3cu2Jre+2ERtzBdZe01BL3Ke9Al6vQZsTbfKQ5vImH9PXxtqa3qVPbWJjHk94J6r4DPGhK17A8EHm4j7UAWP2nTG/GX6NWMs1SW3rrCroLeLaxtDqDdG4368zbHVkzM5Polus+2hEs+j7YNxx9zv0FkfhoncvegvOuZ+iW6rYhtfTXTWgV7OyeLM3w+Y3xaf0PVIzAqwFf0IzW7XnLGOmLUg58y1JvsTzA83Y5o/eLcyMQISJAN0z56G9bE275HYNXAU7kAy9xv6p2Bj3pyxntjVcBDuQTL3FH19Dg/FWh0bXzUMNhsf23JkOQzCK9B1P4NY39OFG3kjgpeB8g/AR/gG0+3mJkeF9Lp9lkIVZkDfC1r3vPs8VTAir1uRd1mpNyQUXGr7HBYfHHbYpFJLgsOlts9h8cFhh00qtSQ4XGr7HBYfHHbYpFJLgsOlts9h8cFhh00qtSQ4XGr7HBYfHHbYpFJLOs7hf5j4Vg3iLoGkAAAAAElFTkSuQmCC')}.x-tab .x-button-icon.time,.x-button .x-button-icon.x-icon-mask.time{-webkit-mask-image:url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAIPElEQVRoBdWae4gVVRzH97qr66vyhWbmurY+MA111dRMkLIXRuhG/pMVSUKGBGYPMTLDR0iaJBFUlIp/FJJlpWJS6vrAlCwTe1iaippSZipmPjL7fC/3XGbnzjkzc3fudTvwYWbO73d+jzlnzjkz96YuX75cUqiSSqWaYVs0hvZQBY3AW/7gYg/8A+fgPDFd5FiQkko6YZJUYj2hNwyDAXADlIOrHEO4A3bDVvgZ9hLfBY6JlUQSJkn14CAYAiNgFPh7kqpY5SDay2EjbCfxo7Fa25TVw/UBuw/BWvgT9HwUgl3YnQXX1ydWtc0rWRyr9zRcV8FpKESSfpuX8LMXnoDm+SYeO2GcXQfz4Cz4gyrGtSa3TaDHp1HcxGMljIN+sAGKkViYj+PEMRkax0k6csIYfgoOQVggxZa/R0ydoiYdaZZmFp6C0ZmgNTVu0YSzBQ6A1tuTYEqKk5ugA/SFkdAU4pbVNHiYpLWmu4vrztBSy83TcAai9pyeba2lz0E1tIFysD5vyMrgKugIY0GToW5MVJ/SWwltXPlIZh3SNNbdV9B/QRTH59GrhQehSZhjl5z2pucXc/4rRPEvHfV0B6dtm5CGI+B3iOLse/SehVgTiM23tx6bGuafwb8QJRY909ZlK7CHadATtOZFcfAmel28QSZ9jn0914/AYQiLScvW45Cen/yx5CSMYhNYA2GGtdGfDS38Rm3X6GpO0PNsKLPpBtXTbij8BGGxaWQODrThr0RxEuguuYzqeZ0Opf72tmt09TKxHU57+JLz7rY2QfXo3wpRkt6MXs7QrtPDKHSDfeBKVpPYjKBgXHW0mQVBz+HzrnZBMuwo6b3gilNb0Yn+9v6E30UpKCiv4WnoBD4ffuPea9q8YrE91asX9Rxb2loeBG9s/nO9YlZ6bWZf4dhc9EB4B2hJsBXtYd/AgAzHLfm0cfnYhvBlUE/aSlcE473CdMIkqyTvhU5eoe9cE8E8cvXulHwqxbvM3PRFeFzn8FqKbDTpdTQ6pof1BlQDtt5V7yzDySemYUM4Eo8mz4WgFwlb0RJbbYQm4e5U6JmwFe125tiEV7KepLWlFJp7goqW2WH0spbEkkacqOJ+UPfbylIMK+mGWl4lsLOO4DR69Tynv1y04DhSF5aiDcY7FllDqdbLSq0jmB7IKiXXkNYDrXFuK+sRHLMJG0I9o09zzEeOWDQ3DWI0lyphPbuqsJU1CFzDxdau2PVfhMSpiaupEh7uiEyJfsUNtE0IjqZFF2mmdi1R+j6eTriLI7T9yLT+/h/KBYLUHttWtPSWqYevtWlQfxjOOORJiJIaPRcJ5pAjIC1LnZVwL4fSEWSFTvhqh//IoszEtSekQYUSdpUTCLUsFbI8wOw5HvRNq75Fb3LOEpawa/Z2Gg4Q2mxpjdQ6v4KkBwa0i1Nl85G1EZZwVjGBE/Mx0GbqNgQfkvQECA3cZiSkPqWEtQG3lQoEiTxj2FkCW8E1SXVG/josJecqjnGLNlGuck4Jf+PQaIcsn4/vOSaZVLTE3Q0LwLVz095en3rXknQNlHMeWtBTLl1DFHdIri2ZtmZBaFnqo51bkmBT79660UE+vXV6DOZCVZh/dJrDUvC2956fRtYeSmaAV+A/vy/MWT5yfGr4PQNa9vw+/df6VDMRrB8NkWk0/gL+tuZ6G7JroOQeh5KU50Csz6lRbwB2NQyHwhYI+1Kqbe770D7IPvXaOmp+MAn6j5pDmkH6hywZ8yuY653I2gY5SaoO+y1hKujHMOPXdnwJnZwOoG52SNsJildFzlaCzYHqRyWVnMsOfsaAetsVyzTkdX674lrP7z5HO80F/U3CGlb6G4HLSS3ynLvqCj5fGX5ag37o/g38MX1HXc6Qzui7HolPTbv07MtFPzgKfgfm+m9kY/JNIp92+BsCmmhMDJrcJvltUaeXn689ekbfe3wSefrnWpOw9rHa3nmV/OebkLf2OyzkNf606XkNDsLbkPPrJHUa4hfAH6+51kipNnFm11cqtTa6Gko20zRsCEfiuREOgEku6LgKeXY58yasRTlsaGgjkr1bVzJp4tDHx8UQlKSp0+ozzhtnNmFVUh6DsI3At+hUeo0U+xz/KVgIJjHbcTU6dR4Df8Lat34cwdAGdDoWO9FMp5Tiezq4Hj/dAHVceinyxlkn4YxB7ViibADWo1fUnsafOmQW6KOErVdN/Yvo5PzKmZNwJmmtg6ah66gXgAHeO1ioc/y0g7kR49qIXqugWGwJl9EgyjOim6GJbCaE/mUoKIAoddgeDdvBdfONTDuuXja7gQlLmdIKwrZ5xol2ObqrYyC7BNicRq3HVm9YBPpUbHy5jifQe9Rl35pwJunBGNgV0ZkC0Z5V29BR0AHKXc79MvS1zdVmoy/Mg+PgStAr0yQ1BZw3PP1Qo2QtfEnQJLYY+liVggVHqF4O60DDXjsezax6ETf7Xo0iTUQ6toZb4Ha4E+IUbX1f4AbOD2sUmrAMkLR6egHo3TWfcopGO0G9oG2ieR2t4lw92g0qIZ+iz0XzSVYjIrz4h5XtGkvqgagTmXeoFfJcb0+B/8ey5mETBNVjvClMhjjPViES1s8qy6AiKE5XnXPSCmqIE23rBsIK0PNYiIRcNn/E53jI6/08dsLem4DTcbADdMddQSYh0we6t6BeW9pIkxZOrIUJrS3Cm6EG7gJ9TE+qaFbXLP8BbOZm76mv4XonbAIg8ZacV0B/GAvDQRNdPkVfOvQe+znsJ1HXh/tY9hNL2OuV5PWu2hyqQZsIra/6FCO6gClapn6AU7AbtDfXxuUknCHRSxwTLf8Bgi31NJnvpzwAAAAASUVORK5CYII=')}.x-tab .x-button-icon.user,.x-button .x-button-icon.x-icon-mask.user{-webkit-mask-image:url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAEWElEQVRoBe2aS0gVYRiGO1lmF8nQQlETutGFokAiqEV0ISKwgmrdMtzUpnW7drWKbFGbQAKpJIhuUGIUFUkW0T1Jq4V2U4ui7GLPexpDD+ecuX1jHqcPHseZ+f9vvnf++e8n0d/fPyZONjZOYqU1doLHRV3CiURCz5gMxTANJsJg+8XJJ+iBt9BHNdO1SCwRZR1GbAFRl8F8WAFLoRwGLME/ffAM7kETvIYPxPWDo7lFIhiheURaCVtgBywHXXOzbhJcggZoRvR7twy+76uELSEAtQsqySPwGdQN+KWDPHuh2DI2+TIVm3T455M9G0Bk6ktRvd4NBZaiTQUT3AQnSNW/VAFBzl/iZw0kq56FcOtuaQHB7QIv9ZVkrqZ2YA9Mck3pMYGZYKeh2sBz1SJb2mqcmfk0E0xQ6l9rwNoKcWjm11JwEYFVW6t1/K218mspeB5B5VsFluKnIuU88Kml4PGBo3DPqBGZiVkKNgvKRFkGJ5aCv2Z4xoi6bCm4DWUaXERhZhMJS8FfolDq+DSbRFgKjrIOa8poYpaCTQKK2sl/wSHfcFSNlll1sSzhn7ys3pAvLFP275lu+L1uKVhBPfYbgMf0zz2mc01mKfgbT7vi+kT/CeT3sv9s6XNYCtbg4CJ0pX9U4Kv3yXk3cO6UjGaCWX5Rg/UArqY8I8yp1qdPQ08YJ4Pzmgl2nCqwc2DVyKjunuddqkE0MVPBBKYSuQ7tJtEhFj9apDczU8FOVB0ctZiuHYUw9obMjbxErW2bmblgApTQengVIkq1B83QEsJH2qzmgp2n3ObYCEGndZ3krbcuXcUWiWACldCjoA0yv6a8J6HJb0Yv6SMRrAcj+gmHA+B3aneDPHXk/8jR3LR3a2rOfnAlTmfDVPDb6Khrq8bPDI5PoRPxZpMSk+1SgtOKpTa8l8BC0JaLmAkloA1xr/aOhJqEtINGWeqW7jjHXrQHbRdw4WxSJf8L8Aeh2m1QaWoBfiUsA61PTwGtUYeZ1qlP1zhan3YraBSnz/0mdAUVHqiEESoxKs0a2AxloJIMI5DsWU0vQH2z2oZToAnFI7+fu2/BiF3PgzbCKqgC1bXhNH3S6rba4BocR7TquifzLBih5XjcCSrROaAGKbJWHt9uJuGq67fgAki4zrNaVsGIzCP3dNgE20B1VJ+uro8UUz3Xr39UvxugCeEZl3UzCkZsBZn1+W6HRaB6qtZ4pJp2PtTna+58DFoR3sVxqHFxyM8euFsIW6EeXoDeoPrBXEEbAlpqqoN1kD9YY6rYxSQ4DGoE9KOSXBGZLk4NYB7CfigZEP1XMBfVEJ0BJUznIFevaSBzEEolOimYkyo4AfocclVYtrjViB0C9SzJEdE+jrn+CWcTrHvdUKuRUSm0gPrZ0W7tGjjMhTiIVWFWSbAGEnGxhAT/y+HhsL9oiVWFjo3FqnRVqrETrG5pFmiSEAuTYC3TFMVCLSIzTg9H6wuIXR2OneDfMJq1NmzzbS8AAAAASUVORK5CYII=')}.x-tab .x-button-icon.team,.x-button .x-button-icon.x-icon-mask.team{-webkit-mask-image:url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAFI0lEQVRoBe2ZSYgdVRSG+yUmnagRQYU4NbZKNLYKWTgg4gQOaDYqJIIGl4LixhBwoy50LSIiulEjCkpAUBBRURpdGceFMQ7YtgkOJE4xTjGa9vuedUl1Vd2qevSrFqvrwJ97695zzj3/PXd6nd7MzMzIQpJFC4msXDvCbc94l+Euwy2bgW5JtyyhOTpdhnNT0rKGLsMtS2iOTpfh3JS0rOGQ+eLT6/VWMNYJ4NjUmN9T/xLs4WfqvPxO7TU9DkTdNmvBbeAskJ7kv/n+AjwKXiSW7yibFQk3BSIPZHdTl5xZzML238DDYFlTsQS/jZF1AGQ1mAZZkkXfe9FbGwJrqmz6lL4cEmOgjhyO0jq2gGVj0hhhAl9M1FeB3gDRn4Pu/5NwQnJ0ALKqrgKHDmgzkHpjGR4oioPKP1H96+Dn8GvpKyLqneV5Lp0XgnHggTMFJjlYPqAcpnyLsz/LHBLL0fRfCzwbvNN3gLeI5WXKaik7DbF2/20A28HPYF+CPZQfg9tj9vS5h18DRSdyrO0j9FeW+PQenwTe138AJ+d34OPFa215zDa0l15LOLgamM0DIBukbQ60JjhLl7RL+HWQtSv7jhLGz1FgM3DJZ30Yy69gYzqGonrVHr4eJ+OgB7Ji2xi4lGUW8+PsD0vOwNGNwInMirF42K0nlmXZzvR3LNARDN3fx6WVI3VJF50Fzvr7EZtY8zQdLtUiOYXGIrJpXUmvTDdk61HCKEqiagD9SSwnLCeX3RYwSJafRd/zoUj2FzVm2hyzMJ6gV0Y46Myl/BzjeqfnyMg36G5NJqpoTPvnLGWEnS0f9lVStL/7NgT/C5XNoHTW6XesV4En/1wlGo+Oo4QJ1ivoxxqju+fKCG2lf1uFH7P3eEl2K8xndRt3VKKEE4sPKWOHiCreg28TaPR1RN/X6GwEO0GReJ3cg95kUWeqzT8W6KtMpujcVaZQRfgFjL8qcbCDvndi/Zz0h4Hr6L8JHBHRW0L7DejdAU6K6Nj8CfBQi4mH4xYmrmy1sXlK/gCAAyfkQaAT91kWj9HW/6tJ8MO3NmeC+4CHlqdu1q7o25Xk5Hqynw+WBp+hpO1K4JItsnfr5GyCbSirCHstnQpcKulBXMK+o1frCPGgWAomwL2gLsm0z3S9ny38XARWgEXJOI7xNMiS9ns9MN5ZCQhEQ1lIGCOXmZf4ZeAW8C4IAblv3wBXAIn6sjkZ3Arc80FvGKW/nu4H/nhZDiR0IngI+LYPY3i43gWuAeNgFBQSn0UYJZejRH3CPQ8cMDi19Jp6AviuVfd48ADwRZXWG3Z9J/6fApeAJUm2TYRE02OZjPfA3WAM9HVDdvt2iXHI1HkoPQd2g7SjUHef+NyU7AXgFRD65qOcZrybQXgFmtUDIDu2xE3CBuCWWBxIU+8vk9MozdQukDUO3x4qm5IJOp36ZyW6waaJci/jrkviWEV9qiQOdd8Ebr/+T0fKkYvBp6AqOB2fnQz0SA39Kn9z6Z9mfPeze/UlUOXrB3Q2AW36a77KwP7tYCwh7Mupjk1TOmZuNInlyZqxuN8n3ItrQF1xryvRl9W/3Y3/60QGCTGF71h5JB0Tbn7vsDqyP6Vkva5dymxoVQ+lIE6+3+lJCH3Zcp+E78y2Fny7Evw7kstC8YA7BtQZRP1hiwTDKnuGun8aSiekaDxXwrbG/zOtaOT/ss3MLSjpCLc93V2Guwy3bAa6Jd2yhObodBnOTUnLGroMtyyhOTpdhnNT0rKGfwD3f6JVZi/xSQAAAABJRU5ErkJggg==')}.x-tabbar-light{background-color:#475c76;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #96a9c0), color-stop(2%, #546e8c), color-stop(100%, #394b5f));background-image:-webkit-linear-gradient(#96a9c0,#546e8c 2%,#394b5f);background-image:linear-gradient(#96a9c0,#546e8c 2%,#394b5f);border-color:#3d5066}.x-tabbar-light .x-tab{color:#b6c3d3}.x-tabbar-light .x-tab-active{color:white}.x-tabbar-light .x-tab-pressed{color:white}.x-tabbar-light.x-docked-bottom .x-tab{text-shadow:rgba(0, 0, 0, 0.5) 0 -0.08em 0}.x-tabbar-light.x-docked-bottom .x-tab .x-button-icon{background-color:#768fad;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #d5dde6), color-stop(2%, #8ca1ba), color-stop(100%, #607d9f));background-image:-webkit-linear-gradient(#d5dde6,#8ca1ba 2%,#607d9f);background-image:linear-gradient(#d5dde6,#8ca1ba 2%,#607d9f)}.x-tabbar-light.x-docked-bottom .x-tab-active{background-color:#506986;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #a6b6c9), color-stop(2%, #5e7a9c), color-stop(100%, #43576f));background-image:-webkit-linear-gradient(#a6b6c9,#5e7a9c 2%,#43576f);background-image:linear-gradient(#a6b6c9,#5e7a9c 2%,#43576f);text-shadow:rgba(0, 0, 0, 0.5) 0 -0.08em 0}.x-tabbar-light.x-docked-bottom .x-tab-active .x-button-icon{background-color:#003370;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #0056bd), color-stop(50%, #003f8a), color-stop(51%, #003370), color-stop(100%, #002757));background-image:-webkit-linear-gradient(#0056bd,#003f8a 50%,#003370 51%,#002757);background-image:linear-gradient(#0056bd,#003f8a 50%,#003370 51%,#002757)}.x-tabbar-light.x-docked-top .x-tab-active{background-color:#3d5066;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #2a3746), color-stop(10%, #344356), color-stop(65%, #3d5066), color-stop(100%, #3e5167));background-image:-webkit-linear-gradient(#2a3746,#344356 10%,#3d5066 65%,#3e5167);background-image:linear-gradient(#2a3746,#344356 10%,#3d5066 65%,#3e5167);color:white}.x-tabbar-dark{background-color:#141e29;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #466890), color-stop(2%, #1f2f41), color-stop(100%, #080c11));background-image:-webkit-linear-gradient(#466890,#1f2f41 2%,#080c11);background-image:linear-gradient(#466890,#1f2f41 2%,#080c11);border-color:#0c1118}.x-tabbar-dark .x-tab{color:#5a81af}.x-tabbar-dark .x-tab-active{color:white}.x-tabbar-dark .x-tab-pressed{color:white}.x-tabbar-dark.x-docked-bottom .x-tab{text-shadow:rgba(0, 0, 0, 0.5) 0 -0.08em 0}.x-tabbar-dark.x-docked-bottom .x-tab .x-button-icon{background-color:#354f6e;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #7c9bc0), color-stop(2%, #416086), color-stop(100%, #293e56));background-image:-webkit-linear-gradient(#7c9bc0,#416086 2%,#293e56);background-image:linear-gradient(#7c9bc0,#416086 2%,#293e56)}.x-tabbar-dark.x-docked-bottom .x-tab-active{background-color:#1c2a3a;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #4e74a2), color-stop(2%, #283b52), color-stop(100%, #111922));background-image:-webkit-linear-gradient(#4e74a2,#283b52 2%,#111922);background-image:linear-gradient(#4e74a2,#283b52 2%,#111922);text-shadow:rgba(0, 0, 0, 0.5) 0 -0.08em 0}.x-tabbar-dark.x-docked-bottom .x-tab-active .x-button-icon{background-color:#0a7aff;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #57a3ff), color-stop(50%, #2488ff), color-stop(51%, #0a7aff), color-stop(100%, #006df0));background-image:-webkit-linear-gradient(#57a3ff,#2488ff 50%,#0a7aff 51%,#006df0);background-image:linear-gradient(#57a3ff,#2488ff 50%,#0a7aff 51%,#006df0)}.x-tabbar-dark.x-docked-top .x-tab-active{background-color:#0c1118;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #000000), color-stop(10%, #030507), color-stop(65%, #0c1118), color-stop(100%, #0c121a));background-image:-webkit-linear-gradient(#000000,#030507 10%,#0c1118 65%,#0c121a);background-image:linear-gradient(#000000,#030507 10%,#0c1118 65%,#0c121a);color:white}.x-tab.x-item-disabled span.x-button-label,.x-tab.x-item-disabled .x-hasbadge span.x-badge,.x-hasbadge .x-tab.x-item-disabled span.x-badge,.x-tab.x-item-disabled .x-button-icon{opacity:.5}.x-tab.x-draggable{opacity:.7}.x-tab{-webkit-user-select:none;overflow:visible !important}.x-toolbar{padding:0 0.2em;overflow:hidden;position:relative;height:2.6em}.x-toolbar > *{z-index:1}.x-toolbar.x-docked-top{border-bottom:.1em solid}.x-toolbar.x-docked-bottom{border-top:.1em solid}.x-toolbar.x-docked-left{width:7em;height:auto;padding:0.2em;border-right:.1em solid}.x-toolbar.x-docked-right{width:7em;height:auto;padding:0.2em;border-left:.1em solid}.x-title{line-height:2.1em;font-size:1.2em;text-align:center;font-weight:bold;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;margin:0 0.3em;max-width:100%}.x-title .x-innerhtml{white-space:nowrap;overflow:hidden;text-overflow:ellipsis;padding:0 .3em}.x-toolbar-dark{background-color:#24364c;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #5a81af), color-stop(2%, #304864), color-stop(100%, #192533));background-image:-webkit-linear-gradient(#5a81af,#304864 2%,#192533);background-image:linear-gradient(#5a81af,#304864 2%,#192533);border-color:black}.x-toolbar-dark .x-title{color:white;text-shadow:rgba(0, 0, 0, 0.5) 0 -0.08em 0}.x-toolbar-dark.x-docked-top{border-bottom-color:black}.x-toolbar-dark.x-docked-bottom{border-top-color:black}.x-toolbar-dark.x-docked-left{border-right-color:black}.x-toolbar-dark.x-docked-right{border-left-color:black}.x-toolbar-dark .x-button,.x-toolbar .x-toolbar-dark .x-button,.x-toolbar-dark .x-field-select .x-component-outer,.x-toolbar .x-toolbar-dark .x-field-select .x-component-outer,.x-toolbar-dark .x-field-select .x-component-outer:before,.x-toolbar .x-toolbar-dark .x-field-select .x-component-outer:before{border:1px solid black;border-top-color:black;color:white}.x-toolbar-dark .x-button.x-button-back:before,.x-toolbar-dark .x-button.x-button-forward:before,.x-toolbar .x-toolbar-dark .x-button.x-button-back:before,.x-toolbar .x-toolbar-dark .x-button.x-button-forward:before,.x-toolbar-dark .x-field-select .x-component-outer.x-button-back:before,.x-toolbar-dark .x-field-select .x-component-outer.x-button-forward:before,.x-toolbar .x-toolbar-dark .x-field-select .x-component-outer.x-button-back:before,.x-toolbar .x-toolbar-dark .x-field-select .x-component-outer.x-button-forward:before,.x-toolbar-dark .x-field-select .x-component-outer:before.x-button-back:before,.x-toolbar-dark .x-field-select .x-component-outer:before.x-button-forward:before,.x-toolbar .x-toolbar-dark .x-field-select .x-component-outer:before.x-button-back:before,.x-toolbar .x-toolbar-dark .x-field-select .x-component-outer:before.x-button-forward:before{background:black}.x-toolbar-dark .x-button,.x-toolbar-dark .x-button.x-button-back:after,.x-toolbar-dark .x-button.x-button-forward:after,.x-toolbar .x-toolbar-dark .x-button,.x-toolbar .x-toolbar-dark .x-button.x-button-back:after,.x-toolbar .x-toolbar-dark .x-button.x-button-forward:after,.x-toolbar-dark .x-field-select .x-component-outer,.x-toolbar-dark .x-field-select .x-component-outer.x-button-back:after,.x-toolbar-dark .x-field-select .x-component-outer.x-button-forward:after,.x-toolbar .x-toolbar-dark .x-field-select .x-component-outer,.x-toolbar .x-toolbar-dark .x-field-select .x-component-outer.x-button-back:after,.x-toolbar .x-toolbar-dark .x-field-select .x-component-outer.x-button-forward:after,.x-toolbar-dark .x-field-select .x-component-outer:before,.x-toolbar-dark .x-field-select .x-component-outer:before.x-button-back:after,.x-toolbar-dark .x-field-select .x-component-outer:before.x-button-forward:after,.x-toolbar .x-toolbar-dark .x-field-select .x-component-outer:before,.x-toolbar .x-toolbar-dark .x-field-select .x-component-outer:before.x-button-back:after,.x-toolbar .x-toolbar-dark .x-field-select .x-component-outer:before.x-button-forward:after{background-color:#141e29;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #466890), color-stop(2%, #1f2f41), color-stop(100%, #080c11));background-image:-webkit-linear-gradient(#466890,#1f2f41 2%,#080c11);background-image:linear-gradient(#466890,#1f2f41 2%,#080c11)}.x-toolbar-dark .x-button .x-button-icon.x-icon-mask,.x-toolbar .x-toolbar-dark .x-button .x-button-icon.x-icon-mask,.x-toolbar-dark .x-field-select .x-component-outer .x-button-icon.x-icon-mask,.x-toolbar .x-toolbar-dark .x-field-select .x-component-outer .x-button-icon.x-icon-mask,.x-toolbar-dark .x-field-select .x-component-outer:before .x-button-icon.x-icon-mask,.x-toolbar .x-toolbar-dark .x-field-select .x-component-outer:before .x-button-icon.x-icon-mask{background-color:white;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ffffff), color-stop(2%, #ffffff), color-stop(100%, #e7edf3));background-image:-webkit-linear-gradient(#ffffff,#ffffff 2%,#e7edf3);background-image:linear-gradient(#ffffff,#ffffff 2%,#e7edf3)}.x-toolbar-dark .x-button.x-button-pressing,.x-toolbar-dark .x-button.x-button-pressing:after,.x-toolbar-dark .x-button.x-button-pressed,.x-toolbar-dark .x-button.x-button-pressed:after,.x-toolbar-dark .x-button.x-button-active,.x-toolbar-dark .x-button.x-button-active:after,.x-toolbar .x-toolbar-dark .x-button.x-button-pressing,.x-toolbar .x-toolbar-dark .x-button.x-button-pressing:after,.x-toolbar .x-toolbar-dark .x-button.x-button-pressed,.x-toolbar .x-toolbar-dark .x-button.x-button-pressed:after,.x-toolbar .x-toolbar-dark .x-button.x-button-active,.x-toolbar .x-toolbar-dark .x-button.x-button-active:after,.x-toolbar-dark .x-field-select .x-component-outer.x-button-pressing,.x-toolbar-dark .x-field-select .x-component-outer.x-button-pressing:after,.x-toolbar-dark .x-field-select .x-component-outer.x-button-pressed,.x-toolbar-dark .x-field-select .x-component-outer.x-button-pressed:after,.x-toolbar-dark .x-field-select .x-component-outer.x-button-active,.x-toolbar-dark .x-field-select .x-component-outer.x-button-active:after,.x-toolbar .x-toolbar-dark .x-field-select .x-component-outer.x-button-pressing,.x-toolbar .x-toolbar-dark .x-field-select .x-component-outer.x-button-pressing:after,.x-toolbar .x-toolbar-dark .x-field-select .x-component-outer.x-button-pressed,.x-toolbar .x-toolbar-dark .x-field-select .x-component-outer.x-button-pressed:after,.x-toolbar .x-toolbar-dark .x-field-select .x-component-outer.x-button-active,.x-toolbar .x-toolbar-dark .x-field-select .x-component-outer.x-button-active:after,.x-toolbar-dark .x-field-select .x-component-outer:before.x-button-pressing,.x-toolbar-dark .x-field-select .x-component-outer:before.x-button-pressing:after,.x-toolbar-dark .x-field-select .x-component-outer:before.x-button-pressed,.x-toolbar-dark .x-field-select .x-component-outer:before.x-button-pressed:after,.x-toolbar-dark .x-field-select .x-component-outer:before.x-button-active,.x-toolbar-dark .x-field-select .x-component-outer:before.x-button-active:after,.x-toolbar .x-toolbar-dark .x-field-select .x-component-outer:before.x-button-pressing,.x-toolbar .x-toolbar-dark .x-field-select .x-component-outer:before.x-button-pressing:after,.x-toolbar .x-toolbar-dark .x-field-select .x-component-outer:before.x-button-pressed,.x-toolbar .x-toolbar-dark .x-field-select .x-component-outer:before.x-button-pressed:after,.x-toolbar .x-toolbar-dark .x-field-select .x-component-outer:before.x-button-active,.x-toolbar .x-toolbar-dark .x-field-select .x-component-outer:before.x-button-active:after{background-color:#0f161f;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #000000), color-stop(10%, #070a0e), color-stop(65%, #0f161f), color-stop(100%, #101721));background-image:-webkit-linear-gradient(#000000,#070a0e 10%,#0f161f 65%,#101721);background-image:linear-gradient(#000000,#070a0e 10%,#0f161f 65%,#101721)}.x-toolbar-dark .x-form-label{color:white;text-shadow:rgba(0, 0, 0, 0.5) 0 -0.08em 0}.x-toolbar-light{background-color:#354f6e;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #7c9bc0), color-stop(2%, #416086), color-stop(100%, #293e56));background-image:-webkit-linear-gradient(#7c9bc0,#416086 2%,#293e56);background-image:linear-gradient(#7c9bc0,#416086 2%,#293e56);border-color:black}.x-toolbar-light .x-title{color:white;text-shadow:rgba(0, 0, 0, 0.5) 0 -0.08em 0}.x-toolbar-light.x-docked-top{border-bottom-color:black}.x-toolbar-light.x-docked-bottom{border-top-color:black}.x-toolbar-light.x-docked-left{border-right-color:black}.x-toolbar-light.x-docked-right{border-left-color:black}.x-toolbar-light .x-button,.x-toolbar .x-toolbar-light .x-button,.x-toolbar-light .x-field-select .x-component-outer,.x-toolbar .x-toolbar-light .x-field-select .x-component-outer,.x-toolbar-light .x-field-select .x-component-outer:before,.x-toolbar .x-toolbar-light .x-field-select .x-component-outer:before{border:1px solid #030507;border-top-color:#0c1118;color:white}.x-toolbar-light .x-button.x-button-back:before,.x-toolbar-light .x-button.x-button-forward:before,.x-toolbar .x-toolbar-light .x-button.x-button-back:before,.x-toolbar .x-toolbar-light .x-button.x-button-forward:before,.x-toolbar-light .x-field-select .x-component-outer.x-button-back:before,.x-toolbar-light .x-field-select .x-component-outer.x-button-forward:before,.x-toolbar .x-toolbar-light .x-field-select .x-component-outer.x-button-back:before,.x-toolbar .x-toolbar-light .x-field-select .x-component-outer.x-button-forward:before,.x-toolbar-light .x-field-select .x-component-outer:before.x-button-back:before,.x-toolbar-light .x-field-select .x-component-outer:before.x-button-forward:before,.x-toolbar .x-toolbar-light .x-field-select .x-component-outer:before.x-button-back:before,.x-toolbar .x-toolbar-light .x-field-select .x-component-outer:before.x-button-forward:before{background:#030507}.x-toolbar-light .x-button,.x-toolbar-light .x-button.x-button-back:after,.x-toolbar-light .x-button.x-button-forward:after,.x-toolbar .x-toolbar-light .x-button,.x-toolbar .x-toolbar-light .x-button.x-button-back:after,.x-toolbar .x-toolbar-light .x-button.x-button-forward:after,.x-toolbar-light .x-field-select .x-component-outer,.x-toolbar-light .x-field-select .x-component-outer.x-button-back:after,.x-toolbar-light .x-field-select .x-component-outer.x-button-forward:after,.x-toolbar .x-toolbar-light .x-field-select .x-component-outer,.x-toolbar .x-toolbar-light .x-field-select .x-component-outer.x-button-back:after,.x-toolbar .x-toolbar-light .x-field-select .x-component-outer.x-button-forward:after,.x-toolbar-light .x-field-select .x-component-outer:before,.x-toolbar-light .x-field-select .x-component-outer:before.x-button-back:after,.x-toolbar-light .x-field-select .x-component-outer:before.x-button-forward:after,.x-toolbar .x-toolbar-light .x-field-select .x-component-outer:before,.x-toolbar .x-toolbar-light .x-field-select .x-component-outer:before.x-button-back:after,.x-toolbar .x-toolbar-light .x-field-select .x-component-outer:before.x-button-forward:after{background-color:#24364c;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #5a81af), color-stop(2%, #304864), color-stop(100%, #192533));background-image:-webkit-linear-gradient(#5a81af,#304864 2%,#192533);background-image:linear-gradient(#5a81af,#304864 2%,#192533)}.x-toolbar-light .x-button .x-button-icon.x-icon-mask,.x-toolbar .x-toolbar-light .x-button .x-button-icon.x-icon-mask,.x-toolbar-light .x-field-select .x-component-outer .x-button-icon.x-icon-mask,.x-toolbar .x-toolbar-light .x-field-select .x-component-outer .x-button-icon.x-icon-mask,.x-toolbar-light .x-field-select .x-component-outer:before .x-button-icon.x-icon-mask,.x-toolbar .x-toolbar-light .x-field-select .x-component-outer:before .x-button-icon.x-icon-mask{background-color:white;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ffffff), color-stop(2%, #ffffff), color-stop(100%, #e7edf3));background-image:-webkit-linear-gradient(#ffffff,#ffffff 2%,#e7edf3);background-image:linear-gradient(#ffffff,#ffffff 2%,#e7edf3)}.x-toolbar-light .x-button.x-button-pressing,.x-toolbar-light .x-button.x-button-pressing:after,.x-toolbar-light .x-button.x-button-pressed,.x-toolbar-light .x-button.x-button-pressed:after,.x-toolbar-light .x-button.x-button-active,.x-toolbar-light .x-button.x-button-active:after,.x-toolbar .x-toolbar-light .x-button.x-button-pressing,.x-toolbar .x-toolbar-light .x-button.x-button-pressing:after,.x-toolbar .x-toolbar-light .x-button.x-button-pressed,.x-toolbar .x-toolbar-light .x-button.x-button-pressed:after,.x-toolbar .x-toolbar-light .x-button.x-button-active,.x-toolbar .x-toolbar-light .x-button.x-button-active:after,.x-toolbar-light .x-field-select .x-component-outer.x-button-pressing,.x-toolbar-light .x-field-select .x-component-outer.x-button-pressing:after,.x-toolbar-light .x-field-select .x-component-outer.x-button-pressed,.x-toolbar-light .x-field-select .x-component-outer.x-button-pressed:after,.x-toolbar-light .x-field-select .x-component-outer.x-button-active,.x-toolbar-light .x-field-select .x-component-outer.x-button-active:after,.x-toolbar .x-toolbar-light .x-field-select .x-component-outer.x-button-pressing,.x-toolbar .x-toolbar-light .x-field-select .x-component-outer.x-button-pressing:after,.x-toolbar .x-toolbar-light .x-field-select .x-component-outer.x-button-pressed,.x-toolbar .x-toolbar-light .x-field-select .x-component-outer.x-button-pressed:after,.x-toolbar .x-toolbar-light .x-field-select .x-component-outer.x-button-active,.x-toolbar .x-toolbar-light .x-field-select .x-component-outer.x-button-active:after,.x-toolbar-light .x-field-select .x-component-outer:before.x-button-pressing,.x-toolbar-light .x-field-select .x-component-outer:before.x-button-pressing:after,.x-toolbar-light .x-field-select .x-component-outer:before.x-button-pressed,.x-toolbar-light .x-field-select .x-component-outer:before.x-button-pressed:after,.x-toolbar-light .x-field-select .x-component-outer:before.x-button-active,.x-toolbar-light .x-field-select .x-component-outer:before.x-button-active:after,.x-toolbar .x-toolbar-light .x-field-select .x-component-outer:before.x-button-pressing,.x-toolbar .x-toolbar-light .x-field-select .x-component-outer:before.x-button-pressing:after,.x-toolbar .x-toolbar-light .x-field-select .x-component-outer:before.x-button-pressed,.x-toolbar .x-toolbar-light .x-field-select .x-component-outer:before.x-button-pressed:after,.x-toolbar .x-toolbar-light .x-field-select .x-component-outer:before.x-button-active,.x-toolbar .x-toolbar-light .x-field-select .x-component-outer:before.x-button-active:after{background-color:#1f2f41;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #0f161f), color-stop(10%, #172330), color-stop(65%, #1f2f41), color-stop(100%, #203043));background-image:-webkit-linear-gradient(#0f161f,#172330 10%,#1f2f41 65%,#203043);background-image:linear-gradient(#0f161f,#172330 10%,#1f2f41 65%,#203043)}.x-toolbar-light .x-form-label{color:white;text-shadow:rgba(0, 0, 0, 0.5) 0 -0.08em 0}.x-navigation-bar .x-container{overflow:visible}.x-desktop .x-toolbar .x-field-search{padding-left:1.06em}.x-spinner .x-input-el,.x-field-select .x-input-el{-webkit-text-fill-color:#000;-webkit-opacity:1}.x-spinner.x-item-disabled .x-input-el,.x-field-select.x-item-disabled .x-input-el{-webkit-text-fill-color:currentcolor}.x-toolbar .x-field-select .x-input-el{-webkit-text-fill-color:#fff}.x-toolbar .x-field-select.x-item-disabled .x-input-el{-webkit-text-fill-color:rgba(255, 255, 255, 0.6)}.x-toolbar .x-form-field-container{padding:0 .3em}.x-toolbar .x-field{width:13em;margin:.5em;min-height:0;border-bottom:0}.x-toolbar .x-field .x-clear-icon{background-size:50% 50%;right:-0.8em;margin-top:-1.06em}.x-toolbar .x-field-input{padding-right:1.6em !important}.x-toolbar .x-field-textarea .x-component-outer,.x-toolbar .x-field-text .x-component-outer,.x-toolbar .x-field-number .x-component-outer,.x-toolbar .x-field-search .x-component-outer{-webkit-border-radius:0.3em;border-radius:0.3em;background-color:white;-webkit-box-shadow:inset rgba(0, 0, 0, 0.5) 0 0.1em 0, inset rgba(0, 0, 0, 0.5) 0 -0.1em 0, inset rgba(0, 0, 0, 0.5) 0.1em 0 0, inset rgba(0, 0, 0, 0.5) -0.1em 0 0, inset rgba(0, 0, 0, 0.5) 0 0.15em 0.4em}.x-toolbar .x-form-label{background:transparent;border:0;padding:0;line-height:1.4em}.x-toolbar .x-form-field{height:1.6em;color:#6e6e6e;background:transparent;min-height:0;-webkit-appearance:none;padding:0em .3em;margin:0}.x-toolbar .x-form-field:focus{color:black}.x-toolbar .x-field-select .x-component-outer,.x-toolbar .x-field-search .x-component-outer{-webkit-border-radius:0.8em;border-radius:0.8em}.x-toolbar .x-field-search .x-field-input{background-position:.5em 50%}.x-toolbar .x-field-select{-webkit-box-shadow:none}.x-toolbar .x-field-select .x-form-field{height:1.4em}.x-toolbar .x-field-select{background:transparent}.x-toolbar .x-field-select .x-component-outer:after{right:.4em}.x-toolbar .x-field-select.x-item-disabled .x-component-outer:after{opacity:.6}.x-toolbar .x-field-select .x-component-outer:before{width:3em;border-left:none;-webkit-border-top-right-radius:0.8em;border-top-right-radius:0.8em;-webkit-border-bottom-right-radius:0.8em;border-bottom-right-radius:0.8em;-webkit-mask:url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADIAAAABCAYAAACc0f2yAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAADJJREFUeNpi/P//PwMjIyMbAwMDOxRzAjEXFHMDMQ8a5kXC6HLcSHo5kcwEmU9TABBgAOcTBAFcRiSpAAAAAElFTkSuQmCC');-webkit-mask-position:right top;-webkit-mask-repeat:repeat-y;-webkit-mask-size:3em 0.05em}.x-toolbar .x-field-select .x-input-text{color:#fff}.x-android .x-field-search .x-field-input{padding-left:.2em !important;padding-right:2.2em !important}.x-indexbar-wrapper{-webkit-box-pack:end !important;box-pack:end !important;pointer-events:none}.x-indexbar-vertical{width:1.1em;-webkit-box-orient:vertical;box-orient:vertical;margin-right:8px}.x-indexbar-horizontal{height:1.1em;-webkit-box-orient:horizontal;box-orient:horizontal;margin-bottom:8px}.x-indexbar{pointer-events:auto;z-index:2;padding:.3em 0;min-height:0 !important;height:auto !important;-webkit-box-flex:0 !important}.x-indexbar > div{color:#1e2a38;font-size:0.6em;text-align:center;line-height:1.1em;font-weight:bold;display:block}.x-phone.x-landscape .x-indexbar > div{font-size:0.38em;line-height:1em}.x-indexbar-pressed{-webkit-border-radius:0.55em;border-radius:0.55em;background-color:rgba(143, 152, 163, 0.8)}.x-list{position:relative;background-color:#f7f7f7}.x-list .x-list-inner{width:100%}.x-list .x-list-disclosure{position:absolute;bottom:0.44em;right:0.44em}.x-list .x-list-disclosure{overflow:visible;-webkit-mask:0 0 url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA2ZpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYwIDYxLjEzNDc3NywgMjAxMC8wMi8xMi0xNzozMjowMCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDpFNkNCM0JGNTZFMjI2ODExQkNGQjkwMzk3MDc3MkZFQiIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDo3M0MzQUU1QUFDQkQxMURGOEQ2MUVDMjM0MzY2NTBDQSIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDo3M0MzQUU1OUFDQkQxMURGOEQ2MUVDMjM0MzY2NTBDQSIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgQ1M1IE1hY2ludG9zaCI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOkU3Q0IzQkY1NkUyMjY4MTFCQ0ZCOTAzOTcwNzcyRkVCIiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOkU2Q0IzQkY1NkUyMjY4MTFCQ0ZCOTAzOTcwNzcyRkVCIi8+IDwvcmRmOkRlc2NyaXB0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') no-repeat;-webkit-mask-size:1.7em;background-color:#003370;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #0a7aff), color-stop(2%, #004394), color-stop(100%, #00234c));background-image:-webkit-linear-gradient(#0a7aff,#004394 2%,#00234c);background-image:linear-gradient(#0a7aff,#004394 2%,#00234c);width:1.7em;height:1.7em}.x-list.x-list-indexed .x-list-disclosure{margin-right:1em}.x-list .x-item-selected .x-list-disclosure{background:#fff none}.x-list .x-list-item{position:relative;color:black}.x-list .x-list-item .x-list-item-label{min-height:2.6em;padding:0.7em 0.8em}.x-list .x-list-item.x-item-pressed .x-list-item-label{background:#77b2f8 none}.x-list .x-list-item.x-item-selected .x-list-item-label{background-color:#06346a;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #167bf3), color-stop(2%, #07448c), color-stop(100%, #042348));background-image:-webkit-linear-gradient(#167bf3,#07448c 2%,#042348);background-image:linear-gradient(#167bf3,#07448c 2%,#042348);color:white;text-shadow:rgba(0, 0, 0, 0.5) 0 -0.08em 0}.x-list-header{position:relative}.x-list-header-swap{position:absolute;left:0;width:100%;z-index:1}.x-ios .x-list-header-swap{-webkit-transform:translate3d(0, 0, 0)}.x-list-normal .x-list-header{background-color:#4d80bc;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #bccfe6), color-stop(2%, #6792c5), color-stop(100%, #3f6ea6));background-image:-webkit-linear-gradient(#bccfe6,#6792c5 2%,#3f6ea6);background-image:linear-gradient(#bccfe6,#6792c5 2%,#3f6ea6);color:#1f3651;text-shadow:rgba(255, 255, 255, 0.25) 0 0.08em 0;border-top:1px solid #4d80bc;border-bottom:1px solid #2d4e76;font-weight:bold;font-size:0.8em;padding:0.2em 1.02em;text-shadow:rgba(255, 255, 255, 0.25) 0 0.08em 0}.x-list-normal .x-list-item .x-list-item-label{border-top:1px solid #d1d1d1}.x-list-normal .x-list-item:first-child{border-top:none}.x-list-normal .x-list-item:last-child .x-list-item-label{border-bottom:1px solid #d1d1d1}.x-list-normal .x-list-item.x-item-pressed .x-list-item-label{border-top-color:#77b2f8}.x-list-normal .x-list-item.x-item-selected .x-list-item-label{border-top-color:#084b9b;border-bottom-color:#021022}.x-list-round .x-scroll-view{background-color:#EEEEEE !important}.x-list-round .x-list-disclosure{-webkit-mask:0 0 url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAACXBIWXMAAAsTAAALEwEAmpwYAAAKT2lDQ1BQaG90b3Nob3AgSUNDIHByb2ZpbGUAAHjanVNnVFPpFj333vRCS4iAlEtvUhUIIFJCi4AUkSYqIQkQSoghodkVUcERRUUEG8igiAOOjoCMFVEsDIoK2AfkIaKOg6OIisr74Xuja9a89+bN/rXXPues852zzwfACAyWSDNRNYAMqUIeEeCDx8TG4eQuQIEKJHAAEAizZCFz/SMBAPh+PDwrIsAHvgABeNMLCADATZvAMByH/w/qQplcAYCEAcB0kThLCIAUAEB6jkKmAEBGAYCdmCZTAKAEAGDLY2LjAFAtAGAnf+bTAICd+Jl7AQBblCEVAaCRACATZYhEAGg7AKzPVopFAFgwABRmS8Q5ANgtADBJV2ZIALC3AMDOEAuyAAgMADBRiIUpAAR7AGDIIyN4AISZABRG8lc88SuuEOcqAAB4mbI8uSQ5RYFbCC1xB1dXLh4ozkkXKxQ2YQJhmkAuwnmZGTKBNA/g88wAAKCRFRHgg/P9eM4Ors7ONo62Dl8t6r8G/yJiYuP+5c+rcEAAAOF0ftH+LC+zGoA7BoBt/qIl7gRoXgugdfeLZrIPQLUAoOnaV/Nw+H48PEWhkLnZ2eXk5NhKxEJbYcpXff5nwl/AV/1s+X48/Pf14L7iJIEyXYFHBPjgwsz0TKUcz5IJhGLc5o9H/LcL//wd0yLESWK5WCoU41EScY5EmozzMqUiiUKSKcUl0v9k4t8s+wM+3zUAsGo+AXuRLahdYwP2SycQWHTA4vcAAPK7b8HUKAgDgGiD4c93/+8//UegJQCAZkmScQAAXkQkLlTKsz/HCAAARKCBKrBBG/TBGCzABhzBBdzBC/xgNoRCJMTCQhBCCmSAHHJgKayCQiiGzbAdKmAv1EAdNMBRaIaTcA4uwlW4Dj1wD/phCJ7BKLyBCQRByAgTYSHaiAFiilgjjggXmYX4IcFIBBKLJCDJiBRRIkuRNUgxUopUIFVIHfI9cgI5h1xGupE7yAAygvyGvEcxlIGyUT3UDLVDuag3GoRGogvQZHQxmo8WoJvQcrQaPYw2oefQq2gP2o8+Q8cwwOgYBzPEbDAuxsNCsTgsCZNjy7EirAyrxhqwVqwDu4n1Y8+xdwQSgUXACTYEd0IgYR5BSFhMWE7YSKggHCQ0EdoJNwkDhFHCJyKTqEu0JroR+cQYYjIxh1hILCPWEo8TLxB7iEPENyQSiUMyJ7mQAkmxpFTSEtJG0m5SI+ksqZs0SBojk8naZGuyBzmULCAryIXkneTD5DPkG+Qh8lsKnWJAcaT4U+IoUspqShnlEOU05QZlmDJBVaOaUt2ooVQRNY9aQq2htlKvUYeoEzR1mjnNgxZJS6WtopXTGmgXaPdpr+h0uhHdlR5Ol9BX0svpR+iX6AP0dwwNhhWDx4hnKBmbGAcYZxl3GK+YTKYZ04sZx1QwNzHrmOeZD5lvVVgqtip8FZHKCpVKlSaVGyovVKmqpqreqgtV81XLVI+pXlN9rkZVM1PjqQnUlqtVqp1Q61MbU2epO6iHqmeob1Q/pH5Z/YkGWcNMw09DpFGgsV/jvMYgC2MZs3gsIWsNq4Z1gTXEJrHN2Xx2KruY/R27iz2qqaE5QzNKM1ezUvOUZj8H45hx+Jx0TgnnKKeX836K3hTvKeIpG6Y0TLkxZVxrqpaXllirSKtRq0frvTau7aedpr1Fu1n7gQ5Bx0onXCdHZ4/OBZ3nU9lT3acKpxZNPTr1ri6qa6UbobtEd79up+6Ynr5egJ5Mb6feeb3n+hx9L/1U/W36p/VHDFgGswwkBtsMzhg8xTVxbzwdL8fb8VFDXcNAQ6VhlWGX4YSRudE8o9VGjUYPjGnGXOMk423GbcajJgYmISZLTepN7ppSTbmmKaY7TDtMx83MzaLN1pk1mz0x1zLnm+eb15vft2BaeFostqi2uGVJsuRaplnutrxuhVo5WaVYVVpds0atna0l1rutu6cRp7lOk06rntZnw7Dxtsm2qbcZsOXYBtuutm22fWFnYhdnt8Wuw+6TvZN9un2N/T0HDYfZDqsdWh1+c7RyFDpWOt6azpzuP33F9JbpL2dYzxDP2DPjthPLKcRpnVOb00dnF2e5c4PziIuJS4LLLpc+Lpsbxt3IveRKdPVxXeF60vWdm7Obwu2o26/uNu5p7ofcn8w0nymeWTNz0MPIQ+BR5dE/C5+VMGvfrH5PQ0+BZ7XnIy9jL5FXrdewt6V3qvdh7xc+9j5yn+M+4zw33jLeWV/MN8C3yLfLT8Nvnl+F30N/I/9k/3r/0QCngCUBZwOJgUGBWwL7+Hp8Ib+OPzrbZfay2e1BjKC5QRVBj4KtguXBrSFoyOyQrSH355jOkc5pDoVQfujW0Adh5mGLw34MJ4WHhVeGP45wiFga0TGXNXfR3ENz30T6RJZE3ptnMU85ry1KNSo+qi5qPNo3ujS6P8YuZlnM1VidWElsSxw5LiquNm5svt/87fOH4p3iC+N7F5gvyF1weaHOwvSFpxapLhIsOpZATIhOOJTwQRAqqBaMJfITdyWOCnnCHcJnIi/RNtGI2ENcKh5O8kgqTXqS7JG8NXkkxTOlLOW5hCepkLxMDUzdmzqeFpp2IG0yPTq9MYOSkZBxQqohTZO2Z+pn5mZ2y6xlhbL+xW6Lty8elQfJa7OQrAVZLQq2QqboVFoo1yoHsmdlV2a/zYnKOZarnivN7cyzytuQN5zvn//tEsIS4ZK2pYZLVy0dWOa9rGo5sjxxedsK4xUFK4ZWBqw8uIq2Km3VT6vtV5eufr0mek1rgV7ByoLBtQFr6wtVCuWFfevc1+1dT1gvWd+1YfqGnRs+FYmKrhTbF5cVf9go3HjlG4dvyr+Z3JS0qavEuWTPZtJm6ebeLZ5bDpaql+aXDm4N2dq0Dd9WtO319kXbL5fNKNu7g7ZDuaO/PLi8ZafJzs07P1SkVPRU+lQ27tLdtWHX+G7R7ht7vPY07NXbW7z3/T7JvttVAVVN1WbVZftJ+7P3P66Jqun4lvttXa1ObXHtxwPSA/0HIw6217nU1R3SPVRSj9Yr60cOxx++/p3vdy0NNg1VjZzG4iNwRHnk6fcJ3/ceDTradox7rOEH0x92HWcdL2pCmvKaRptTmvtbYlu6T8w+0dbq3nr8R9sfD5w0PFl5SvNUyWna6YLTk2fyz4ydlZ19fi753GDborZ752PO32oPb++6EHTh0kX/i+c7vDvOXPK4dPKy2+UTV7hXmq86X23qdOo8/pPTT8e7nLuarrlca7nuer21e2b36RueN87d9L158Rb/1tWeOT3dvfN6b/fF9/XfFt1+cif9zsu72Xcn7q28T7xf9EDtQdlD3YfVP1v+3Njv3H9qwHeg89HcR/cGhYPP/pH1jw9DBY+Zj8uGDYbrnjg+OTniP3L96fynQ89kzyaeF/6i/suuFxYvfvjV69fO0ZjRoZfyl5O/bXyl/erA6xmv28bCxh6+yXgzMV70VvvtwXfcdx3vo98PT+R8IH8o/2j5sfVT0Kf7kxmTk/8EA5jz/GMzLdsAAAAgY0hSTQAAeiUAAICDAAD5/wAAgOkAAHUwAADqYAAAOpgAABdvkl/FRgAAAtpJREFUeNrs2k2IVlUYAODndZyaUfMnakxsERU5JChUCBIG0s8iaNGPBa0sSkUQJdq0CGnRzypyJS0SddPCsFr0QxtxlURmbcW0NlqgZg6CyuRp4RmYxUz3Bvf7Zo6eF87qu3zffXjPPe97zv0ipeRmijlusqjgCq7gCq7gCq7gCq7gCi4BHBHLIuKpiFh0Q4PjeoziLXyAjRExPBvAc3uAHcCj2IRnMQ+LcTYivkopXZhJcHS5H46I2/AMXsVjGJz08S84gD0ppTPFZzgi7szQjRid4pLVWIahiNidUjpd+jM8H89Pg52IEbyOrRExUjr4LD7FiYbrlmb0loi4p+/ilFJnA4vwCn5EahhnsBururyHxnvs/Au5BS/iaAv0JezHymLBGT2MF/ATxhvQY9iDhyaqRnHgjB7MdfhrXGlAX8QXeKRYcEbPyU3Il/inAT2Og3i4WPAk9Nqc6csN6Kv4HOuKBWd05Ezva4Eex7d4EgNd38vcPpW+FBFHcB7X8FJe2KaKATyOBbmDO5RSGp+VdbhltkfxSV6d/yvT13AYT2OoqCk9BXpFLlmpxfgGS7v67b6feETErbgvNyhN8Rd+zWWtvCmdkRtwpEVtHsNHuL+4VTpjh3L3dazFNB7DXtxbalmayGyb5/ZcbjVXltp4LMmHAm2wp/AuHiy1tVyIHTjeAvsn3sRIqZuHhdiO31pg/8B7uKPU7eFibGuJPY13sLzUA4Db8UZL7Em8jbuKPADAcuzE7y2wP2Nzr5/ZnoHzNH4/l5Um7Am8jOF+t7Vd7pYCd+cGY9rGLmM/xMGU0uViTy0zeA0+xoVpMns0T+MFM7Fp6TTD6br6h4g4n/e9z+GBSZccxi58l1K6NGMvl3pUlkbwGr7PmT2GJ3pxgvF/R/Tqz6URMR/r88u1Q/is05OL2fD2cAr0YK7Lf8/IAtVvcP2PRwVXcAVXcAVXcAVXcAVX8I0T/w4ADBKP+GttJ+EAAAAASUVORK5CYII=') no-repeat;background-color:#777777;background-image:none}.x-list-round .x-list-header{color:#777;font-size:1em;font-weight:bold;padding-left:26px;line-height:1.7em;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #eeeeee), color-stop(30%, rgba(238,238,238,0.9)), color-stop(100%, rgba(238,238,238,0.4)));background-image:-webkit-linear-gradient(top, #eeeeee,rgba(238,238,238,0.9) 30%,rgba(238,238,238,0.4));background-image:linear-gradient(top, #eeeeee,rgba(238,238,238,0.9) 30%,rgba(238,238,238,0.4))}.x-list-round .x-list-container{padding:13px 13px 0 13px}.x-list-round .x-list-container .x-list-header{padding-left:13px;background-image:none}.x-list-round.x-list-ungrouped .x-list-item-label,.x-list-round.x-list-grouped .x-list-item-label{border:solid #DDDDDD;border-width:1px 1px 0 1px;background:#fff}.x-list-round.x-list-ungrouped .x-list-item:first-child .x-list-item-label{-webkit-border-top-left-radius:0.4em;border-top-left-radius:0.4em;-webkit-border-top-right-radius:0.4em;border-top-right-radius:0.4em}.x-list-round.x-list-ungrouped .x-list-item:last-child{margin-bottom:13px}.x-list-round.x-list-ungrouped .x-list-item:last-child .x-list-item-label{-webkit-border-bottom-left-radius:0.4em;border-bottom-left-radius:0.4em;-webkit-border-bottom-right-radius:0.4em;border-bottom-right-radius:0.4em;border-width:1px}.x-list-round.x-list-grouped .x-list-header-item .x-list-item-label{-webkit-border-top-left-radius:0.4em;border-top-left-radius:0.4em;-webkit-border-top-right-radius:0.4em;border-top-right-radius:0.4em}.x-list-round.x-list-grouped .x-list-footer-item{margin-bottom:13px}.x-list-round.x-list-grouped .x-list-footer-item .x-list-item-label{border-width:1px;-webkit-border-bottom-left-radius:0.4em;border-bottom-left-radius:0.4em;-webkit-border-bottom-right-radius:0.4em;border-bottom-right-radius:0.4em}.x-dataview-inlineblock .x-dataview-item{display:inline-block !important}.x-dataview-nowrap .x-dataview-container{white-space:nowrap !important}.x-list-inlineblock .x-list-item{display:inline-block !important}.x-list-nowrap .x-list-inner{width:auto}.x-list-nowrap .x-list-container{white-space:nowrap !important}.x-list-paging{height:50px}.x-list-paging .x-loading-spinner{display:none;margin:auto}.x-list-paging .x-list-paging-msg{text-align:center;color:#06346a;padding-top:10px;-webkit-border-radius:6px;border-radius:6px}.x-list-paging.x-loading .x-loading-spinner{display:block}.x-list-paging.x-loading .x-list-paging-msg{display:none}.x-list-pullrefresh{display:-webkit-box;display:box;-webkit-box-orient:horizontal;box-orient:horizontal;-webkit-box-align:center;box-align:center;-webkit-box-pack:center;box-pack:center;position:absolute;top:-5em;left:0;width:100%;height:4.5em}.x-list-pullrefresh .x-loading-spinner{display:none}.x-list-pullrefresh-arrow{width:2.5em;height:4.5em;background:center center url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACgAAAA8CAYAAAAUufjgAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAjFJREFUeNrsmU8oREEYwOexdtNuKBfFwdVhCyfuysnFiXISS+1BLopyUpKLXETkRLaUi1LK3Q2lpPbiQLnIn03a/Hm+z86Ttv0zM++bfbOar36Hbad5v535Zp7v47iuy0wOpyoEHccRHV9L9NxPkUE/bhKCOKiOSPAdn69DsJ5I8E2HYA0QJRJ8Bb50CDYRCT7pEMQD0kwk+CByUFQEW4gE73UIhoA2IsFb4ENEMCQ5MdU1IxwygpT3oKNLMGyyYFVscdhusc8tDpu+xRG7xf95BW0O2kNiV1AgIvaQ2BzUJNgJNJYZGyUU7OG1cal4Bi68oqkDPszy2teEwJp5Cdyu/lZ1g8CwIYJ7wEF+2YmrNw90Byx3BizgKhaqizEP1wg7CLLxCEzy/CtauMeBlQDyEfNuGrgU6SyM8F9SyVgHdmRaH6tAb4XkToEp2d4M5mOK0TWMigU2koa8vJMRZPxEb2ss2LEVPMpPLlMRxBgDZjQJLgNbxb6Uab9tAn3EcifAeKkBMoLY+j0GWonk7oB+lmsFkwhidAGHBPmIeTcAnJcbKCuIMQEs+hScAzZEBqoIYuzyFVCJI36lMJ2CDfxibZeUu+EX/4uMIFP8ZyLejxkgK0hG5a8kP4IYSZbr1IuQVHmAX0HGX4VuGfZVJ6cQxPd1uoRcWqDW0SroFVzZAnJZ/h0LWhAjUUAw4XdSSsH8fExRTEgtGAOuOTETBb16Jk412e+bxOSwglYw6PgWYABvLk8P7zGJFwAAAABJRU5ErkJggg==') no-repeat;background-size:2em 3em;-webkit-transform:rotate(0deg)}.x-list-pullrefresh-release .x-list-pullrefresh-arrow{-webkit-transform:rotate(-180deg)}.x-list-pullrefresh-wrap{width:20em;font-size:0.7em}.x-list-pullrefresh-message{font-weight:bold;font-size:1.3em;margin-bottom:0.1em;text-align:center}.x-list-pullrefresh-updated{text-align:center}html,body{width:100%;height:100%}.x-translatable{position:absolute;top:100%;left:100%;z-index:1}.x-translatable-container{position:relative}.x-translatable-wrapper{width:100%;height:100%;position:absolute;overflow:hidden}.x-translatable-stretcher{width:300%;height:300%;position:absolute;visibility:hidden;z-index:-1}.x-translatable-nested-stretcher{width:100%;height:100%;left:100%;top:100%;position:absolute;visibility:hidden;z-index:-1}.x-layout-fit,.x-layout-card{position:relative;overflow:hidden}.x-layout-fit-item,.x-layout-card-item{position:absolute !important;width:100%;height:100%}.x-layout-hbox,.x-layout-vbox{display:-webkit-box}.x-layout-hbox > *,.x-layout-vbox > *{-webkit-box-flex:0}.x-layout-hbox{-webkit-box-orient:horizontal}.x-layout-vbox{-webkit-box-orient:vertical}.x-layout-hbox > .x-layout-box-item{width:0 !important}.x-layout-vbox > .x-layout-box-item{height:0 !important}.x-table-inner{display:table !important;width:100%;height:100%}.x-table-inner.x-table-fixed{table-layout:fixed !important}.x-table-row{display:table-row !important}.x-table-row > *{display:table-cell !important;vertical-align:middle}.x-container,.x-body{display:-webkit-box}.x-body{overflow:hidden;-webkit-box-flex:1;min-width:100%;min-height:100%}.x-body > .x-inner,.x-container > .x-inner{-webkit-box-flex:1;min-width:100%;min-height:100%;position:relative}.x-docking-horizontal{display:-webkit-box;-webkit-box-flex:1;-webkit-box-orient:horizontal;min-width:100%;min-height:100%}.x-docking-vertical{display:-webkit-box;-webkit-box-flex:1;-webkit-box-orient:vertical;min-width:100%;min-height:100%}.x-centered{position:absolute !important;width:100%;height:100%;display:-webkit-box;-webkit-box-align:center;-webkit-box-pack:center}.x-floating{position:absolute !important}.x-centered > *{position:relative !important;-webkit-box-flex:0 !important}.x-size-change-detector{visibility:hidden;position:absolute;left:0;top:0;z-index:-1;width:100%;height:100%;overflow:hidden}.x-size-change-detector > *{visibility:hidden}.x-size-change-detector-shrink > *{width:200%;height:200%}.x-size-change-detector-expand > *{width:100000px;height:100000px}.x-scroll-view{position:relative;display:block}.x-scroll-container{position:absolute;overflow:hidden;width:100%;height:100%}.x-scroll-scroller{position:absolute;min-width:100%;min-height:100%}.x-ios .x-scroll-scroller{-webkit-transform:translate3d(0, 0, 0)}.x-scroll-stretcher{position:absolute;visibility:hidden}.x-scroll-bar-grid-wrapper{position:absolute;width:100%;height:100%}.x-scroll-bar-grid{display:table;width:100%;height:100%}.x-scroll-bar-grid > *{display:table-row}.x-scroll-bar-grid > * > *{display:table-cell}.x-scroll-bar-grid > :first-child > :first-child{width:100%;height:100%}.x-scroll-bar-grid > :first-child > :nth-child(2){padding:3px 3px 0 0}.x-scroll-bar-grid > :nth-child(2) > :first-child{padding:0 0 3px 3px}.x-scroll-bar{position:relative;overflow:hidden}.x-scroll-bar-stretcher{position:absolute;visibility:hidden;width:100%;height:100%}.x-scroll-bar-x{width:100%}.x-scroll-bar-x > .x-scroll-bar-stretcher{width:300%}.x-scroll-bar-x.active{height:6px}.x-scroll-bar-y{height:100%}.x-scroll-bar-y > .x-scroll-bar-stretcher{height:300%}.x-scroll-bar-y.active{width:6px}.x-scroll-indicator{background:#333;position:absolute;z-index:2;opacity:0.5}.x-scroll-indicator.default{-webkit-border-top-left-radius:3px;border-top-left-radius:3px;-webkit-border-top-right-radius:3px;border-top-right-radius:3px;-webkit-border-bottom-left-radius:3px;border-bottom-left-radius:3px;-webkit-border-bottom-right-radius:3px;border-bottom-right-radius:3px}.x-list-light .x-scroll-indicator,.x-dataview-light .x-scroll-indicator{background:#fff;opacity:1}.x-scroll-indicator-x{height:100%}.x-scroll-indicator-y{width:100%}.x-scroll-indicator.csstransform{background:none}.x-scroll-indicator.csstransform > *{position:absolute;background-color:#333}.x-scroll-indicator.csstransform > :nth-child(2){-webkit-transform-origin:0% 0%;background:none;content:url(data:image/bmp;base64,Qk08AAAAAAAAADYAAAAoAAAAAQAAAAEAAAABABAAAAAAAAYAAAASCwAAEgsAAAAAAAAAAAAAxhgAAAAA)}.x-scroll-indicator.csstransform.x-scroll-indicator-light > *{background-color:#eee}.x-scroll-indicator.csstransform.x-scroll-indicator-light > :nth-child(2){content:url(data:image/bmp;base64,Qk08AAAAAAAAADYAAAAoAAAAAQAAAAEAAAABABAAAAAAAAYAAAASCwAAEgsAAAAAAAAAAAAAvXcAAAAA)}.x-scroll-indicator.csstransform.x-scroll-indicator-y > *{width:100%}.x-scroll-indicator.csstransform.x-scroll-indicator-y > :first-child{height:3px;-webkit-border-top-left-radius:3px;border-top-left-radius:3px;-webkit-border-top-right-radius:3px;border-top-right-radius:3px}.x-scroll-indicator.csstransform.x-scroll-indicator-y > :nth-child(2){height:1px}.x-scroll-indicator.csstransform.x-scroll-indicator-y > :last-child{height:3px;-webkit-border-bottom-left-radius:3px;border-bottom-left-radius:3px;-webkit-border-bottom-right-radius:3px;border-bottom-right-radius:3px}.x-scroll-indicator.csstransform.x-scroll-indicator-x > *{height:100%}.x-scroll-indicator.csstransform.x-scroll-indicator-x > :first-child{width:3px;-webkit-border-top-left-radius:3px;border-top-left-radius:3px;-webkit-border-bottom-left-radius:3px;border-bottom-left-radius:3px}.x-scroll-indicator.csstransform.x-scroll-indicator-x > :nth-child(2){width:1px}.x-scroll-indicator.csstransform.x-scroll-indicator-x > :last-child{width:3px;-webkit-border-top-right-radius:3px;border-top-right-radius:3px;-webkit-border-bottom-right-radius:3px;border-bottom-right-radius:3px}.x-carousel{position:relative;overflow:hidden}.x-carousel-item{position:absolute;width:100%;height:100%}.x-carousel-item > *{position:absolute;width:100%;height:100%}.x-carousel-indicator{padding:0;-webkit-border-radius:0;border-radius:0;-webkit-box-shadow:none;background-color:transparent;background-image:none}.x-carousel-indicator{-webkit-box-flex:1;display:-webkit-box;display:box;-webkit-box-pack:center;box-pack:center;-webkit-box-align:center;box-align:center}.x-carousel-indicator span{display:block;width:0.5em;height:0.5em;-webkit-border-radius:0.25em;border-radius:0.25em;margin:0.2em}.x-carousel-indicator-horizontal{height:1.5em;width:100%}.x-carousel-indicator-vertical{-webkit-box-orient:vertical;box-orient:vertical;width:1.5em;height:100%}.x-carousel-indicator-light span{background-color:rgba(255, 255, 255, 0.1);background-image:none}.x-carousel-indicator-light span.x-carousel-indicator-active{background-color:rgba(255, 255, 255, 0.3);background-image:none}.x-carousel-indicator-dark span{background-color:rgba(0, 0, 0, 0.1);background-image:none}.x-carousel-indicator-dark span.x-carousel-indicator-active{background-color:rgba(0, 0, 0, 0.3);background-image:none}.x-form .x-scroll-container{background-color:#eeeeee}.x-form .x-scroll-container > .x-inner{padding:1em}.x-form-label{text-shadow:#fff 0 1px 1px;color:#333333;text-shadow:rgba(255, 255, 255, 0.25) 0 0.08em 0;padding:0.6em;display:none !important;white-space:nowrap;overflow:hidden;text-overflow:ellipsis}.x-form-label span{font-size:.8em;font-weight:bold}.x-field{min-height:2.5em}.x-field .x-field-input{position:relative}.x-field .x-field-input,.x-field .x-input-el{width:100%}.x-field.x-field-labeled .x-form-label{display:block !important}.x-field:last-child{border-bottom:0}.x-label-align-left .x-component-outer,.x-label-align-right .x-component-outer{-webkit-box-flex:1;box-flex:1}.x-label-align-left:first-child .x-form-label{-webkit-border-top-left-radius:0.4em;border-top-left-radius:0.4em}.x-label-align-left:last-child .x-form-label{-webkit-border-bottom-left-radius:0.4em;border-bottom-left-radius:0.4em}.x-label-align-right{-webkit-box-direction:reverse;box-direction:reverse}.x-label-align-right:first-child .x-form-label{-webkit-border-top-right-radius:0.4em;border-top-right-radius:0.4em}.x-label-align-right:last-child{border-bottom:0}.x-label-align-right:last-child .x-form-label{-webkit-border-bottom-right-radius:0.4em;border-bottom-right-radius:0.4em}.x-label-align-top,.x-label-align-bottom{-webkit-box-orient:vertical;box-orient:vertical}.x-label-align-top:first-child .x-form-label{-webkit-border-top-left-radius:0.4em;border-top-left-radius:0.4em;-webkit-border-top-right-radius:0.4em;border-top-right-radius:0.4em}.x-label-align-bottom:last-child .x-form-label{-webkit-border-bottom-left-radius:0.4em;border-bottom-left-radius:0.4em;-webkit-border-bottom-right-radius:0.4em;border-bottom-right-radius:0.4em}.x-input-el{padding:.4em;min-height:2.5em;display:block;border-width:0;background:transparent;-webkit-appearance:none}.x-field-mask{position:absolute;top:0;right:0;bottom:0;left:0}.x-field-required label:after,.x-field-required .x-form-label:after{content:"*";display:inline}.x-item-disabled label:after,.x-item-disabled .x-form-label:after{color:#666 !important}.x-field-textarea textarea{min-height:6em;padding-top:.5em}.x-checkmark-base,.x-field .x-input-radio:after,.x-field .x-input-checkbox:after,.x-field .x-input-radio:checked:after,.x-field .x-input-checkbox:checked:after,.x-field.x-item-disabled .x-input-radio:checked:after,.x-field.x-item-disabled .x-input-checkbox:checked:after,.x-select-overlay .x-item-selected .x-list-item-label:before,.x-select-overlay .x-item-selected .x-list-item-label:after{content:"";position:absolute;width:1.4em;height:1.4em;top:50%;left:auto;right:1.1em;-webkit-mask-size:1.4em;-webkit-mask-image:url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAE+klEQVRoBe2aS28URxRGsY0h2FmwCQuEWLHjvUNgZAQ4PMwrEkIRIGEgySKwB8QvYIvEP+ANO0CwsJAA88wGBEKBZJUVQkJCQrwJ5nxN31Z5pnpc7e4ZT9vT0peqqanquqfurVvlIW3Dw8NTJtPTPplgxdoCnugeb3m45eEJtgJTJwJPGw8cP8V6TfmC4/Z/H9uEAAZsIdqHZiMBn2UNbvigSw8M2AIAD6PtqBPpmYe+8t1NoL9GLfYf3bTKKhiWo9PoA9KV0dUgn/tRh8tXWg/Hnj0KUB8yz1JNnjXUuhFd264A/f0O7dKXpQ7EIiTPfkKuVyvrSlx3US+KPF26cMbwxeg8Gg3W4LWHFd6rUUepQprQnI/Rh9A25AtjmqseHVkK7w59UxpgYFdg7wH0CwqFpWvyrKI23GZ7OWluwgqwOnqOobVoWh4Tm97DwCpBHUFp2TiUX3v5QVMnLQzMmqAsUVWWyta3UX/TAmOcwjjk6KmE830W7GbU0ZTAGKYEJdj3yAcQ2qYw1jmsG9e0KF8122UDw/SHwFX0EYWC+fpZGG/hPcn1sqk8jGHas+dQ6KXCB6o2g91IPfKsObZpgDGsqAT1hXdpz25A7QZqZU1gBsxFSh5zbEA9yniOU5R5PSvvCnYTSsLYtdkLTGf9uKdD/gS6gI6jPndgUXXe24OKSFAK4zsoSVA+G6uAGaC758/oBrIs+Zb6rbg9up35Xpa1jffpUqEEldezysbJ0VPLjhHADOpEfUiw2gtuUtAKDiGtYNXeqDWJ7zveYQnqM3V3nqx1s2s97xmRoLzzWqMgkLLaTVQJa0ZoJe+hXjRmaMYKVlslr2dlp5wgu4PsiTyszmg5qgVr0CqvoZW2WFlKxhV5gxJsdIMKtYH+Eew6yksoNLy0soJeFzqR+vEI9gx6h9wFzFoPSlA+25g3SlChnnUNU3grkWmxRg0n+ihBnUR5w9j2bCbPGjzzR3sgbc+6gL66TV4zkTHHEqSfZSzr+94V0mbzKUF1GkSWknG5QktGyoj7qBdVeZo2S1Ch2yUNXOMVUcEJyrcQjOeP4vzQCu9BpBtOck5T70HybN4w1iJcR7ouem9QPjhfG+On7EBPUNrKhrYLWp7+FS1FCjtdKvJ6VvM/Q9o2uWC1AHq60QB6hELh0voJ+im6iHReF+FZwe5HP/g8lrXNzuEfeeFu9C9Kg8nSrr9lBZ9ljK/v37xjL5qRFSytf3K15KXy9EH0D/JN3ui2Qj1rC5AAq4FnJvoDPUSNBnTnUy4YQF1maFHlCOAYuouJFN6PkWtEo+ryrH5sL2TPVi5UFXAMrfDegxrtae3ZfWh6paFFffYCx9BKZLtQo/a0YLXIhSUo3yKlAsfQ8vSBBkALtrCjxwdqbTWBY2glst9REee0Lw/ULUEZpFuOChxD1yuRybNbUV0SlAtq9SDgGFp7ushEJlhdKuqWoAzSLYOBHeidGPkc+cIztE2wA6iuCcoFtXom4Bha4f0nGmv2FqyOnoaFscFG9rsfQusYq0T2G8qayASrbdEdOlfR/TJ72AzAaHla5/QD9BnVCucvfK/fjZXtx8WzZneu/+WBf53XOb0G6XetHjQXyfv2vKLyH7qLLqMhJn5DOW5PLmBZDfRUilloGUoD/ovvXgIrT4/rkxt4XK0fw+TtYxhT6iEt4FK7L8D4locDFqnUXSadh78Bx5bEl2CLG+8AAAAASUVORK5CYII=');margin-top:-0.7em}.x-field .x-input-radio,.x-field .x-input-checkbox{position:relative}.x-field .x-input-radio:after,.x-field .x-input-checkbox:after{background-color:#dddddd}.x-field .x-input-radio:checked:after,.x-field .x-input-checkbox:checked:after{background-color:#06346a}.x-field.x-item-disabled .x-input-radio:checked:after,.x-field.x-item-disabled .x-input-checkbox:checked:after{background-color:#9caaba}.x-spinner .x-component-outer{display:-webkit-box;display:box}.x-spinner .x-component-outer > *{width:auto}.x-spinner .x-field-input{-webkit-box-flex:1}.x-spinner .x-field-input .x-input-el{-webkit-text-fill-color:#000;padding:0;width:100%;text-align:center}.x-spinner .x-field-input input::-webkit-outer-spin-button,.x-spinner .x-field-input input::-webkit-inner-spin-button{-webkit-appearance:none;margin:0}.x-spinner.x-item-disabled .x-input-el{-webkit-text-fill-color:#B3B3B3}.x-spinner.x-item-disabled .x-spinner-button{color:#aaa !important}.x-spinner.x-item-disabled .x-spinner-button,.x-toolbar .x-spinner.x-item-disabled .x-spinner-button{border:1px solid #c4c4c4;border-top-color:#d0d0d0;color:black}.x-spinner.x-item-disabled .x-spinner-button.x-button-back:before,.x-spinner.x-item-disabled .x-spinner-button.x-button-forward:before,.x-toolbar .x-spinner.x-item-disabled .x-spinner-button.x-button-back:before,.x-toolbar .x-spinner.x-item-disabled .x-spinner-button.x-button-forward:before{background:#c4c4c4}.x-spinner.x-item-disabled .x-spinner-button,.x-spinner.x-item-disabled .x-spinner-button.x-button-back:after,.x-spinner.x-item-disabled .x-spinner-button.x-button-forward:after,.x-toolbar .x-spinner.x-item-disabled .x-spinner-button,.x-toolbar .x-spinner.x-item-disabled .x-spinner-button.x-button-back:after,.x-toolbar .x-spinner.x-item-disabled .x-spinner-button.x-button-forward:after{background-color:#f7f7f7;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ffffff), color-stop(2%, #ffffff), color-stop(100%, #e5e5e5));background-image:-webkit-linear-gradient(#ffffff,#ffffff 2%,#e5e5e5);background-image:linear-gradient(#ffffff,#ffffff 2%,#e5e5e5)}.x-spinner.x-item-disabled .x-spinner-button .x-button-icon.x-icon-mask,.x-toolbar .x-spinner.x-item-disabled .x-spinner-button .x-button-icon.x-icon-mask{background-color:black;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #4d4d4d), color-stop(2%, #121212), color-stop(100%, #000000));background-image:-webkit-linear-gradient(#4d4d4d,#121212 2%,#000000);background-image:linear-gradient(#4d4d4d,#121212 2%,#000000)}.x-spinner.x-item-disabled .x-spinner-button.x-button-pressing,.x-spinner.x-item-disabled .x-spinner-button.x-button-pressing:after,.x-spinner.x-item-disabled .x-spinner-button.x-button-pressed,.x-spinner.x-item-disabled .x-spinner-button.x-button-pressed:after,.x-spinner.x-item-disabled .x-spinner-button.x-button-active,.x-spinner.x-item-disabled .x-spinner-button.x-button-active:after,.x-toolbar .x-spinner.x-item-disabled .x-spinner-button.x-button-pressing,.x-toolbar .x-spinner.x-item-disabled .x-spinner-button.x-button-pressing:after,.x-toolbar .x-spinner.x-item-disabled .x-spinner-button.x-button-pressed,.x-toolbar .x-spinner.x-item-disabled .x-spinner-button.x-button-pressed:after,.x-toolbar .x-spinner.x-item-disabled .x-spinner-button.x-button-active,.x-toolbar .x-spinner.x-item-disabled .x-spinner-button.x-button-active:after{background-color:#efefef;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #d5d5d5), color-stop(10%, #e2e2e2), color-stop(65%, #efefef), color-stop(100%, #f0f0f0));background-image:-webkit-linear-gradient(#d5d5d5,#e2e2e2 10%,#efefef 65%,#f0f0f0);background-image:linear-gradient(#d5d5d5,#e2e2e2 10%,#efefef 65%,#f0f0f0)}.x-spinner .x-spinner-button{width:3em;padding:.65em 0;font-weight:bold;text-align:center}.x-spinner .x-spinner-button,.x-toolbar .x-spinner .x-spinner-button{border:1px solid #aaaaaa;border-top-color:#b7b7b7;color:black}.x-spinner .x-spinner-button.x-button-back:before,.x-spinner .x-spinner-button.x-button-forward:before,.x-toolbar .x-spinner .x-spinner-button.x-button-back:before,.x-toolbar .x-spinner .x-spinner-button.x-button-forward:before{background:#aaaaaa}.x-spinner .x-spinner-button,.x-spinner .x-spinner-button.x-button-back:after,.x-spinner .x-spinner-button.x-button-forward:after,.x-toolbar .x-spinner .x-spinner-button,.x-toolbar .x-spinner .x-spinner-button.x-button-back:after,.x-toolbar .x-spinner .x-spinner-button.x-button-forward:after{background-color:#dddddd;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ffffff), color-stop(2%, #efefef), color-stop(100%, #cbcbcb));background-image:-webkit-linear-gradient(#ffffff,#efefef 2%,#cbcbcb);background-image:linear-gradient(#ffffff,#efefef 2%,#cbcbcb)}.x-spinner .x-spinner-button .x-button-icon.x-icon-mask,.x-toolbar .x-spinner .x-spinner-button .x-button-icon.x-icon-mask{background-color:black;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #4d4d4d), color-stop(2%, #121212), color-stop(100%, #000000));background-image:-webkit-linear-gradient(#4d4d4d,#121212 2%,#000000);background-image:linear-gradient(#4d4d4d,#121212 2%,#000000)}.x-spinner .x-spinner-button.x-button-pressing,.x-spinner .x-spinner-button.x-button-pressing:after,.x-spinner .x-spinner-button.x-button-pressed,.x-spinner .x-spinner-button.x-button-pressed:after,.x-spinner .x-spinner-button.x-button-active,.x-spinner .x-spinner-button.x-button-active:after,.x-toolbar .x-spinner .x-spinner-button.x-button-pressing,.x-toolbar .x-spinner .x-spinner-button.x-button-pressing:after,.x-toolbar .x-spinner .x-spinner-button.x-button-pressed,.x-toolbar .x-spinner .x-spinner-button.x-button-pressed:after,.x-toolbar .x-spinner .x-spinner-button.x-button-active,.x-toolbar .x-spinner .x-spinner-button.x-button-active:after{background-color:#d5d5d5;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #bcbcbc), color-stop(10%, #c9c9c9), color-stop(65%, #d5d5d5), color-stop(100%, #d7d7d7));background-image:-webkit-linear-gradient(#bcbcbc,#c9c9c9 10%,#d5d5d5 65%,#d7d7d7);background-image:linear-gradient(#bcbcbc,#c9c9c9 10%,#d5d5d5 65%,#d7d7d7)}.x-spinner .x-spinner-button-down{border:0 !important;border-right:1px solid #dddddd !important}.x-spinner .x-spinner-button-up{border:0 !important;border-left:1px solid #dddddd !important}.x-phone .x-select-overlay{min-width:14em;min-height:12.5em}.x-select-overlay{min-width:18em;min-height:22em}.x-select-overlay .x-list-item-label{height:2.6em}.x-select-overlay .x-list-label{white-space:nowrap;overflow:hidden;text-overflow:ellipsis;display:block}.x-select-overlay .x-item-selected .x-list-label{margin-right:2.6em}.x-select-overlay .x-item-selected .x-list-item-label:before{background-color:rgba(0, 0, 0, 0.3);margin-top:-0.8em}.x-select-overlay .x-item-selected .x-list-item-label:after{background-color:#dddddd}.x-slider-field .x-component-outer,.x-toggle-field .x-component-outer{padding:0.6em}.x-slider,.x-toggle{position:relative;height:2.2em;min-height:0;min-width:0}.x-slider > *,.x-toggle > *{position:absolute;width:100%;height:100%}.x-slider.x-item-disabled{opacity:.6}.x-thumb{position:absolute;height:2.2em;width:2.2em}.x-thumb:before{content:"";position:absolute;width:1.85em;height:1.85em;top:0.175em;left:0.175em;border:1px solid #919191;-webkit-border-radius:0.925em;border-radius:0.925em;background-color:#dddddd;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ffffff), color-stop(2%, #efefef), color-stop(100%, #cbcbcb));background-image:-webkit-linear-gradient(#ffffff,#efefef 2%,#cbcbcb);background-image:linear-gradient(#ffffff,#efefef 2%,#cbcbcb);-webkit-background-clip:padding;background-clip:padding-box}.x-thumb.x-dragging{opacity:1}.x-thumb.x-dragging:before{background-color:#d0d0d0;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ffffff), color-stop(2%, #e2e2e2), color-stop(100%, #bebebe));background-image:-webkit-linear-gradient(#ffffff,#e2e2e2 2%,#bebebe);background-image:linear-gradient(#ffffff,#e2e2e2 2%,#bebebe)}.x-slider:after{content:"";position:absolute;width:auto;height:0.8em;top:0.737em;left:0;right:0;margin:0 0.925em;background-color:#dddddd;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #c4c4c4), color-stop(10%, #d0d0d0), color-stop(65%, #dddddd), color-stop(100%, #dedede));background-image:-webkit-linear-gradient(#c4c4c4,#d0d0d0 10%,#dddddd 65%,#dedede);background-image:linear-gradient(#c4c4c4,#d0d0d0 10%,#dddddd 65%,#dedede);border:0.1em solid rgba(0, 0, 0, 0.1);border-bottom:0;-webkit-box-shadow:rgba(255, 255, 255, 0.7) 0 0.1em 0;-webkit-border-radius:0.4em;border-radius:0.4em}.x-toggle{width:4.4em;-webkit-border-radius:1.1em;border-radius:1.1em;overflow:hidden;border:1px solid #b7b7b7;background-color:#ddd;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #c4c4c4), color-stop(10%, #d0d0d0), color-stop(65%, #dddddd), color-stop(100%, #dedede));background-image:-webkit-linear-gradient(#c4c4c4,#d0d0d0 10%,#dddddd 65%,#dedede);background-image:linear-gradient(#c4c4c4,#d0d0d0 10%,#dddddd 65%,#dedede);-webkit-box-flex:0}.x-toggle .x-thumb.x-dragging{opacity:1}.x-toggle .x-thumb:before{top:0.175em}.x-toggle-on{background-color:#92cf00;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #6e9c00), color-stop(10%, #80b500), color-stop(65%, #92cf00), color-stop(100%, #94d200));background-image:-webkit-linear-gradient(#6e9c00,#80b500 10%,#92cf00 65%,#94d200);background-image:linear-gradient(#6e9c00,#80b500 10%,#92cf00 65%,#94d200)}input[type="search"]::-webkit-search-cancel-button{-webkit-appearance:none}.x-field-number input::-webkit-outer-spin-button,.x-field-number input::-webkit-inner-spin-button{-webkit-appearance:none;margin:0}.x-field-search .x-field-input{position:relative}.x-field-search .x-field-input:before{content:"";position:absolute;width:0.86em;height:0.86em;top:50%;left:0.5em;-webkit-mask-image:url('data:image/png;base64,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');-webkit-mask-size:.86em;background-color:#ccc;-webkit-mask-repeat:no-repeat;margin-top:-0.43em}.x-field-search .x-field-input .x-form-field{margin-left:1.0em}.x-field-input .x-clear-icon{display:none;background:url('data:image/png;base64,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') no-repeat;background-position:center center;background-size:55% 55%;width:2.2em;height:2.2em;margin:.5em;margin-top:-1.1em;position:absolute;top:50%;right:-0.5em}.x-field-clearable .x-clear-icon{display:block}.x-field-clearable .x-field-input{padding-right:2.2em}.x-android .x-input-el{-webkit-text-fill-color:#000}.x-android .x-empty .x-input-el{-webkit-text-fill-color:#A9A9A9}.x-item-disabled .x-form-label span,.x-item-disabled input,.x-item-disabled .x-input-el,.x-item-disabled .x-spinner-body,.x-item-disabled select,.x-item-disabled textarea,.x-item-disabled .x-field-clear-container{color:#b3b3b3;-webkit-text-fill-color:#b3b3b3;pointer-events:none}.x-form-fieldset{margin:0 0 1.5em}.x-form-fieldset .x-form-label{background-color:#f7f7f7;border-top:1px solid white}.x-form-fieldset .x-form-fieldset-inner{border:1px solid #dddddd;background:#fff;padding:0;-webkit-border-radius:0.4em;border-radius:0.4em;overflow:hidden}.x-form-fieldset .x-field{border-bottom:1px solid #dddddd}.x-form-fieldset .x-field:first-child{-webkit-border-top-left-radius:0.4em;border-top-left-radius:0.4em;-webkit-border-top-right-radius:0.4em;border-top-right-radius:0.4em}.x-form-fieldset .x-field:last-child{border-bottom:0;-webkit-border-bottom-left-radius:0.4em;border-bottom-left-radius:0.4em;-webkit-border-bottom-right-radius:0.4em;border-bottom-right-radius:0.4em}.x-form-fieldset-title{text-shadow:#fff 0 1px 1px;color:#333333;margin:1em 0.7em 0.3em;color:#333333;font-weight:bold;white-space:nowrap}.x-form-fieldset-instructions{text-shadow:#fff 0 1px 1px;color:#333333;color:gray;margin:1em 0.7em 0.3em;font-size:.8em;text-align:center}.x-selectmark-base,.x-field-select .x-component-outer:after{content:"";position:absolute;width:1em;height:1em;top:50%;left:auto;right:0.7em;-webkit-mask-size:1em;-webkit-mask-image:url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA2ZpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYwIDYxLjEzNDc3NywgMjAxMC8wMi8xMi0xNzozMjowMCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDpGRTdGMTE3NDA3MjA2ODExOTJDQUMyNUQwRUE4NjdEQiIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDoxQTFBMDFDQ0I5NEYxMURGQUU1RjlGMEFERUNDQTVEMCIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDoyMkRCMDIxMkI5NEUxMURGQUU1RjlGMEFERUNDQTVEMCIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgQ1M1IE1hY2ludG9zaCI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOjMwRTE0QzVBNDIyMjY4MTFCQ0ZCOTAzOTcwNzcyRkVCIiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOkZFN0YxMTc0MDcyMDY4MTE5MkNBQzI1RDBFQTg2N0RCIi8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+HfrH/AAAAeVJREFUeNrs2cFHBGEUAPA3zYqIiIhOnTpFRHSKrp26RqeuEV077R/QqWtE166dOkVERHRa9hQRnZalFcv0Hk/W1Mx+38z3vvlm5j3eZW+/9+abne+9KEkSaFPMQMtCwQpWsIIVrGAFK1jBClawgo2ik/4hiqJGwLKuvfpIc5xSkWqYr5hzU1s/mRNxXTPsJ+ZqluvXlwOmSj3XBDvG3M1rpAmYYoUrFzr4ZNqTawqm2MH8Dhh7ZXJUbcAUx4FinzBnJcAUl4FhP/jIgRSYKvkYCJaO2LbNv08RMMUy5nsA4COTLy0XYIqtil9iF6aflq7AwBWuAvuQ9ZKSBgNX2ieWjtKSzeXBNZgqfe8J+4W5aXtbcg0GrvibB/BhkeuhBJhigzsghT0veh+WAlMcCGHvMOMQwcCdcIntYy6WmXhIg2PuiAvsEHO97IhHGgzckb4D8L6LmZYPMHBnhiWwXVdDPF9g4A4Vwd66nFr6BAN3ygbbw1yoMzjmjplgB5hrrufSvsHAHesZDOD2JAbxVYCBOzfIAZ9JbR6qAgN3cPwP9kZy1VIlGLiTdluCmoOBO/pnS9Bk8DzmS3pL4BMcpZEe1qX0GI/atC4dQYXRMa1MU0IX4gpWsIIVrGAFK1jBCnYUPwIMAPUPAyFL+nRdAAAAAElFTkSuQmCC');margin-top:-0.5em}.x-field-select{position:relative}.x-field-select .x-component-outer:after{background-color:#dddddd;z-index:2}.x-field-select .x-component-outer:before,.x-field-select .x-component-outer:after{pointer-events:none;position:absolute;display:block}.x-field-select .x-component-outer:before{content:"";position:absolute;width:4em;height:auto;top:0;left:auto;right:0;bottom:0;-webkit-border-top-right-radius:0.4em;border-top-right-radius:0.4em;-webkit-border-bottom-right-radius:0.4em;border-bottom-right-radius:0.4em;background:-webkit-gradient(linear, 0% 0%, 100% 0%, from(rgba(255, 255, 255, 0)), color-stop(0.5, white));z-index:1}.x-msgbox{min-width:15em;max-width:20em;padding:0.8em;-webkit-box-shadow:rgba(0, 0, 0, 0.4) 0 0.1em 0.5em;-webkit-border-radius:0.3em;border-radius:0.3em;border:0.15em solid #354f6e}.x-msgbox .x-icon{margin-left:1.3em}.x-msgbox .x-title{font-size:.9em;line-height:1.4em}.x-msgbox .x-body{background:transparent !important}.x-msgbox .x-toolbar{background:transparent none;-webkit-box-shadow:none}.x-msgbox .x-toolbar.x-docked-top{border-bottom:0;height:1.3em}.x-msgbox .x-toolbar.x-docked-bottom{border-top:0}.x-msgbox .x-field{min-height:2em;background:#fff;-webkit-border-radius:0.2em;border-radius:0.2em}.x-msgbox .x-form-field{min-height:1.5em;padding-right:0 !important;-webkit-appearance:none}.x-msgbox .x-field-input{padding-right:2.2em}.x-msgbox-text{text-align:center;padding:6px 0;line-height:1.4em}.x-msgbox-buttons{padding:0.4em 0;height:auto}.x-msgbox-buttons .x-button{min-width:4.5em}.x-msgbox-buttons .x-button-normal span{opacity:.7}.x-msgbox-dark .x-msgbox-text{color:rgba(186, 202, 222, 0.9);text-shadow:rgba(0, 0, 0, 0.5) 0 -0.08em 0}.x-msgbox-dark .x-msgbox-input{background-color:rgba(186, 202, 222, 0.9);background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, rgba(152,176,205,0.9)), color-stop(10%, rgba(169,189,214,0.9)), color-stop(65%, rgba(186,202,222,0.9)), color-stop(100%, rgba(188,204,223,0.9)));background-image:-webkit-linear-gradient(rgba(152,176,205,0.9),rgba(169,189,214,0.9) 10%,rgba(186,202,222,0.9) 65%,rgba(188,204,223,0.9));background-image:linear-gradient(rgba(152,176,205,0.9),rgba(169,189,214,0.9) 10%,rgba(186,202,222,0.9) 65%,rgba(188,204,223,0.9));border:0.1em solid rgba(66, 99, 138, 0.9)}.x-loading-spinner{font-size:250%;height:1em;width:1em;position:relative;-webkit-transform-origin:0.5em 0.5em}.x-loading-spinner > span,.x-loading-spinner > span:before,.x-loading-spinner > span:after{display:block;position:absolute;width:0.1em;height:0.25em;top:0;-webkit-transform-origin:0.05em 0.5em;-webkit-border-radius:0.05em;border-radius:0.05em;content:" "}.x-loading-spinner > span.x-loading-top{background-color:rgba(170, 170, 170, 0.99)}.x-loading-spinner > span.x-loading-top::after{background-color:rgba(170, 170, 170, 0.9)}.x-loading-spinner > span.x-loading-left::before{background-color:rgba(170, 170, 170, 0.8)}.x-loading-spinner > span.x-loading-left{background-color:rgba(170, 170, 170, 0.7)}.x-loading-spinner > span.x-loading-left::after{background-color:rgba(170, 170, 170, 0.6)}.x-loading-spinner > span.x-loading-bottom::before{background-color:rgba(170, 170, 170, 0.5)}.x-loading-spinner > span.x-loading-bottom{background-color:rgba(170, 170, 170, 0.4)}.x-loading-spinner > span.x-loading-bottom::after{background-color:rgba(170, 170, 170, 0.35)}.x-loading-spinner > span.x-loading-right::before{background-color:rgba(170, 170, 170, 0.3)}.x-loading-spinner > span.x-loading-right{background-color:rgba(170, 170, 170, 0.25)}.x-loading-spinner > span.x-loading-right::after{background-color:rgba(170, 170, 170, 0.2)}.x-loading-spinner > span.x-loading-top::before{background-color:rgba(170, 170, 170, 0.15)}.x-loading-spinner > span{left:50%;margin-left:-0.05em}.x-loading-spinner > span.x-loading-top{-webkit-transform:rotate(0deg);-moz-transform:rotate(0deg)}.x-loading-spinner > span.x-loading-right{-webkit-transform:rotate(90deg);-moz-transform:rotate(90deg)}.x-loading-spinner > span.x-loading-bottom{-webkit-transform:rotate(180deg);-moz-transform:rotate(180deg)}.x-loading-spinner > span.x-loading-left{-webkit-transform:rotate(270deg);-moz-transform:rotate(270deg)}.x-loading-spinner > span::before{-webkit-transform:rotate(30deg);-moz-transform:rotate(30deg)}.x-loading-spinner > span::after{-webkit-transform:rotate(-30deg);-moz-transform:rotate(-30deg)}.x-loading-spinner{-webkit-animation-name:x-loading-spinner-rotate;-webkit-animation-duration:.5s;-webkit-animation-iteration-count:infinite;-webkit-animation-timing-function:linear}@-webkit-keyframes x-loading-spinner-rotate{0%{-webkit-transform:rotate(0deg)}8.32%{-webkit-transform:rotate(0deg)}8.33%{-webkit-transform:rotate(30deg)}16.65%{-webkit-transform:rotate(30deg)}16.66%{-webkit-transform:rotate(60deg)}24.99%{-webkit-transform:rotate(60deg)}25%{-webkit-transform:rotate(90deg)}33.32%{-webkit-transform:rotate(90deg)}33.33%{-webkit-transform:rotate(120deg)}41.65%{-webkit-transform:rotate(120deg)}41.66%{-webkit-transform:rotate(150deg)}49.99%{-webkit-transform:rotate(150deg)}50%{-webkit-transform:rotate(180deg)}58.32%{-webkit-transform:rotate(180deg)}58.33%{-webkit-transform:rotate(210deg)}66.65%{-webkit-transform:rotate(210deg)}66.66%{-webkit-transform:rotate(240deg)}74.99%{-webkit-transform:rotate(240deg)}75%{-webkit-transform:rotate(270deg)}83.32%{-webkit-transform:rotate(270deg)}83.33%{-webkit-transform:rotate(300deg)}91.65%{-webkit-transform:rotate(300deg)}91.66%{-webkit-transform:rotate(330deg)}100%{-webkit-transform:rotate(330deg)}}
diff --git a/apps/files_odfviewer/src/webodf/programs/touchui/sencha-touch.js b/apps/files_odfviewer/src/webodf/programs/touchui/sencha-touch.js
new file mode 100644
index 0000000000..caf8e4541d
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/programs/touchui/sencha-touch.js
@@ -0,0 +1,15 @@
+/*
+
+This file is part of Sencha Touch 2
+
+Copyright (c) 2012 Sencha Inc
+
+Contact:  http://www.sencha.com/contact
+
+Commercial Usage
+Licensees holding valid commercial licenses may use this file in accordance with the Commercial Software License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Sencha.
+
+If you are unsure which license is appropriate for your use, please contact the sales department at http://www.sencha.com/contact.
+
+*/
+(function(){var global=this,objectPrototype=Object.prototype,toString=objectPrototype.toString,enumerables=true,enumerablesTest={toString:1},emptyFn=function(){},i;if(typeof Ext==="undefined"){global.Ext={}}Ext.global=global;for(i in enumerablesTest){enumerables=null}if(enumerables){enumerables=["hasOwnProperty","valueOf","isPrototypeOf","propertyIsEnumerable","toLocaleString","toString","constructor"]}Ext.enumerables=enumerables;Ext.apply=function(object,config,defaults){if(defaults){Ext.apply(object,defaults)}if(object&&config&&typeof config==="object"){var i,j,k;for(i in config){object[i]=config[i]}if(enumerables){for(j=enumerables.length;j--;){k=enumerables[j];if(config.hasOwnProperty(k)){object[k]=config[k]}}}}return object};Ext.buildSettings=Ext.apply({baseCSSPrefix:"x-",scopeResetCSS:false},Ext.buildSettings||{});Ext.apply(Ext,{emptyFn:emptyFn,baseCSSPrefix:Ext.buildSettings.baseCSSPrefix,applyIf:function(object,config){var property;if(object){for(property in config){if(object[property]===undefined){object[property]=config[property]}}}return object},iterate:function(object,fn,scope){if(Ext.isEmpty(object)){return}if(scope===undefined){scope=object}if(Ext.isIterable(object)){Ext.Array.each.call(Ext.Array,object,fn,scope)}else{Ext.Object.each.call(Ext.Object,object,fn,scope)}}});Ext.apply(Ext,{extend:function(){var objectConstructor=objectPrototype.constructor,inlineOverrides=function(o){for(var m in o){if(!o.hasOwnProperty(m)){continue}this[m]=o[m]}};return function(subclass,superclass,overrides){if(Ext.isObject(superclass)){overrides=superclass;superclass=subclass;subclass=overrides.constructor!==objectConstructor?overrides.constructor:function(){superclass.apply(this,arguments)}}var F=function(){},subclassProto,superclassProto=superclass.prototype;F.prototype=superclassProto;subclassProto=subclass.prototype=new F();subclassProto.constructor=subclass;subclass.superclass=superclassProto;if(superclassProto.constructor===objectConstructor){superclassProto.constructor=superclass}subclass.override=function(overrides){Ext.override(subclass,overrides)};subclassProto.override=inlineOverrides;subclassProto.proto=subclassProto;subclass.override(overrides);subclass.extend=function(o){return Ext.extend(subclass,o)};return subclass}}(),override:function(cls,overrides){if(cls.$isClass){return cls.override(overrides)}else{Ext.apply(cls.prototype,overrides)}}});Ext.apply(Ext,{valueFrom:function(value,defaultValue,allowBlank){return Ext.isEmpty(value,allowBlank)?defaultValue:value},typeOf:function(value){if(value===null){return"null"}var type=typeof value;if(type==="undefined"||type==="string"||type==="number"||type==="boolean"){return type}var typeToString=toString.call(value);switch(typeToString){case"[object Array]":return"array";case"[object Date]":return"date";case"[object Boolean]":return"boolean";case"[object Number]":return"number";case"[object RegExp]":return"regexp"}if(type==="function"){return"function"}if(type==="object"){if(value.nodeType!==undefined){if(value.nodeType===3){return(/\S/).test(value.nodeValue)?"textnode":"whitespace"}else{return"element"}}return"object"}},isEmpty:function(value,allowEmptyString){return(value===null)||(value===undefined)||(!allowEmptyString?value==="":false)||(Ext.isArray(value)&&value.length===0)},isArray:("isArray" in Array)?Array.isArray:function(value){return toString.call(value)==="[object Array]"},isDate:function(value){return toString.call(value)==="[object Date]"},isObject:(toString.call(null)==="[object Object]")?function(value){return value!==null&&value!==undefined&&toString.call(value)==="[object Object]"&&value.ownerDocument===undefined}:function(value){return toString.call(value)==="[object Object]"},isSimpleObject:function(value){return value instanceof Object&&value.constructor===Object},isPrimitive:function(value){var type=typeof value;return type==="string"||type==="number"||type==="boolean"},isFunction:(typeof document!=="undefined"&&typeof document.getElementsByTagName("body")==="function")?function(value){return toString.call(value)==="[object Function]"}:function(value){return typeof value==="function"},isNumber:function(value){return typeof value==="number"&&isFinite(value)},isNumeric:function(value){return !isNaN(parseFloat(value))&&isFinite(value)},isString:function(value){return typeof value==="string"},isBoolean:function(value){return typeof value==="boolean"},isElement:function(value){return value?value.nodeType===1:false},isTextNode:function(value){return value?value.nodeName==="#text":false},isDefined:function(value){return typeof value!=="undefined"},isIterable:function(value){return(value&&typeof value!=="string")?value.length!==undefined:false}});Ext.apply(Ext,{clone:function(item){if(item===null||item===undefined){return item}if(item.nodeType&&item.cloneNode){return item.cloneNode(true)}var type=toString.call(item);if(type==="[object Date]"){return new Date(item.getTime())}var i,j,k,clone,key;if(type==="[object Array]"){i=item.length;clone=[];while(i--){clone[i]=Ext.clone(item[i])}}else{if(type==="[object Object]"&&item.constructor===Object){clone={};for(key in item){clone[key]=Ext.clone(item[key])}if(enumerables){for(j=enumerables.length;j--;){k=enumerables[j];clone[k]=item[k]}}}}return clone||item},getUniqueGlobalNamespace:function(){var uniqueGlobalNamespace=this.uniqueGlobalNamespace;if(uniqueGlobalNamespace===undefined){var i=0;do{uniqueGlobalNamespace="ExtBox"+(++i)}while(Ext.global[uniqueGlobalNamespace]!==undefined);Ext.global[uniqueGlobalNamespace]=Ext;this.uniqueGlobalNamespace=uniqueGlobalNamespace}return uniqueGlobalNamespace},functionFactory:function(){var args=Array.prototype.slice.call(arguments),ln=args.length;if(ln>0){args[ln-1]="var Ext=window."+this.getUniqueGlobalNamespace()+";"+args[ln-1]}return Function.prototype.constructor.apply(Function.prototype,args)},globalEval:("execScript" in global)?function(code){global.execScript(code)}:function(code){(function(){eval(code)})()},});Ext.type=Ext.typeOf})();(function(){var a="4.1.0",b;Ext.Version=b=Ext.extend(Object,{constructor:function(d){var c=this.toNumber,f,e;if(d instanceof b){return d}this.version=this.shortVersion=String(d).toLowerCase().replace(/_/g,".").replace(/[\-+]/g,"");e=this.version.search(/([^\d\.])/);if(e!==-1){this.release=this.version.substr(e,d.length);this.shortVersion=this.version.substr(0,e)}this.shortVersion=this.shortVersion.replace(/[^\d]/g,"");f=this.version.split(".");this.major=c(f.shift());this.minor=c(f.shift());this.patch=c(f.shift());this.build=c(f.shift());return this},toNumber:function(c){c=parseInt(c||0,10);if(isNaN(c)){c=0}return c},toString:function(){return this.version},valueOf:function(){return this.version},getMajor:function(){return this.major||0},getMinor:function(){return this.minor||0},getPatch:function(){return this.patch||0},getBuild:function(){return this.build||0},getRelease:function(){return this.release||""},isGreaterThan:function(c){return b.compare(this.version,c)===1},isGreaterThanOrEqual:function(c){return b.compare(this.version,c)>=0},isLessThan:function(c){return b.compare(this.version,c)===-1},isLessThanOrEqual:function(c){return b.compare(this.version,c)<=0},equals:function(c){return b.compare(this.version,c)===0},match:function(c){c=String(c);return this.version.substr(0,c.length)===c},toArray:function(){return[this.getMajor(),this.getMinor(),this.getPatch(),this.getBuild(),this.getRelease()]},getShortVersion:function(){return this.shortVersion},gt:function(){return this.isGreaterThan.apply(this,arguments)},lt:function(){return this.isLessThan.apply(this,arguments)},gtEq:function(){return this.isGreaterThanOrEqual.apply(this,arguments)},ltEq:function(){return this.isLessThanOrEqual.apply(this,arguments)}});Ext.apply(b,{releaseValueMap:{dev:-6,alpha:-5,a:-5,beta:-4,b:-4,rc:-3,"#":-2,p:-1,pl:-1},getComponentValue:function(c){return !c?0:(isNaN(c)?this.releaseValueMap[c]||c:parseInt(c,10))},compare:function(g,f){var d,e,c;g=new b(g).toArray();f=new b(f).toArray();for(c=0;c<Math.max(g.length,f.length);c++){d=this.getComponentValue(g[c]);e=this.getComponentValue(f[c]);if(d<e){return -1}else{if(d>e){return 1}}}return 0}});Ext.apply(Ext,{versions:{},lastRegisteredVersion:null,setVersion:function(d,c){Ext.versions[d]=new b(c);Ext.lastRegisteredVersion=Ext.versions[d];return this},getVersion:function(c){if(c===undefined){return Ext.lastRegisteredVersion}return Ext.versions[c]},deprecate:function(c,e,f,d){if(b.compare(Ext.getVersion(c),e)<1){f.call(d)}}});Ext.setVersion("core",a)})();Ext.String={trimRegex:/^[\x09\x0a\x0b\x0c\x0d\x20\xa0\u1680\u180e\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u2028\u2029\u202f\u205f\u3000]+|[\x09\x0a\x0b\x0c\x0d\x20\xa0\u1680\u180e\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u2028\u2029\u202f\u205f\u3000]+$/g,escapeRe:/('|\\)/g,formatRe:/\{(\d+)\}/g,escapeRegexRe:/([-.*+?^${}()|[\]\/\\])/g,htmlEncode:(function(){var d={"&":"&amp;",">":"&gt;","<":"&lt;",'"':"&quot;"},b=[],c,a;for(c in d){b.push(c)}a=new RegExp("("+b.join("|")+")","g");return function(e){return(!e)?e:String(e).replace(a,function(g,f){return d[f]})}})(),htmlDecode:(function(){var d={"&amp;":"&","&gt;":">","&lt;":"<","&quot;":'"'},b=[],c,a;for(c in d){b.push(c)}a=new RegExp("("+b.join("|")+"|&#[0-9]{1,5};)","g");return function(e){return(!e)?e:String(e).replace(a,function(g,f){if(f in d){return d[f]}else{return String.fromCharCode(parseInt(f.substr(2),10))}})}})(),urlAppend:function(b,a){if(!Ext.isEmpty(a)){return b+(b.indexOf("?")===-1?"?":"&")+a}return b},trim:function(a){return a.replace(Ext.String.trimRegex,"")},capitalize:function(a){return a.charAt(0).toUpperCase()+a.substr(1)},ellipsis:function(c,a,d){if(c&&c.length>a){if(d){var e=c.substr(0,a-2),b=Math.max(e.lastIndexOf(" "),e.lastIndexOf("."),e.lastIndexOf("!"),e.lastIndexOf("?"));if(b!==-1&&b>=(a-15)){return e.substr(0,b)+"..."}}return c.substr(0,a-3)+"..."}return c},escapeRegex:function(a){return a.replace(Ext.String.escapeRegexRe,"\\$1")},escape:function(a){return a.replace(Ext.String.escapeRe,"\\$1")},toggle:function(b,c,a){return b===c?a:c},leftPad:function(b,c,d){var a=String(b);d=d||" ";while(a.length<c){a=d+a}return a},format:function(b){var a=Ext.Array.toArray(arguments,1);return b.replace(Ext.String.formatRe,function(c,d){return a[d]})},repeat:function(e,d,b){for(var a=[],c=d;c--;){a.push(e)}return a.join(b||"")}};Ext.htmlEncode=Ext.String.htmlEncode;Ext.htmlDecode=Ext.String.htmlDecode;Ext.urlAppend=Ext.String.urlAppend;(function(){var f=Array.prototype,n=f.slice,p=function(){var z=[],e,y=20;if(!z.splice){return false}while(y--){z.push("A")}z.splice(15,0,"F","F","F","F","F","F","F","F","F","F","F","F","F","F","F","F","F","F","F","F","F");e=z.length;z.splice(13,0,"XXX");if(e+1!=z.length){return false}return true}(),i="forEach" in f,t="map" in f,o="indexOf" in f,x="every" in f,c="some" in f,d="filter" in f,m=function(){var e=[1,2,3,4,5].sort(function(){return 0});return e[0]===1&&e[1]===2&&e[2]===3&&e[3]===4&&e[4]===5}(),j=true,a;try{if(typeof document!=="undefined"){n.call(document.getElementsByTagName("body"))}}catch(r){j=false}function l(y,e){return(e<0)?Math.max(0,y.length+e):Math.min(y.length,e)}function w(F,E,y,I){var J=I?I.length:0,A=F.length,G=l(F,E);if(G===A){if(J){F.push.apply(F,I)}}else{var D=Math.min(y,A-G),H=G+D,z=H+J-D,e=A-H,B=A-D,C;if(z<H){for(C=0;C<e;++C){F[z+C]=F[H+C]}}else{if(z>H){for(C=e;C--;){F[z+C]=F[H+C]}}}if(J&&G===B){F.length=B;F.push.apply(F,I)}else{F.length=B+J;for(C=0;C<J;++C){F[G+C]=I[C]}}}return F}function h(A,e,z,y){if(y&&y.length){if(e<A.length){A.splice.apply(A,[e,z].concat(y))}else{A.push.apply(A,y)}}else{A.splice(e,z)}return A}function b(z,e,y){return w(z,e,y)}function q(z,e,y){z.splice(e,y);return z}function k(B,e,z){var A=l(B,e),y=B.slice(e,l(B,A+z));if(arguments.length<4){w(B,A,z)}else{w(B,A,z,n.call(arguments,3))}return y}function g(e){return e.splice.apply(e,n.call(arguments,1))}var v=p?q:b,s=p?h:w,u=p?g:k;a=Ext.Array={each:function(C,A,z,e){C=a.from(C);var y,B=C.length;if(e!==true){for(y=0;y<B;y++){if(A.call(z||C[y],C[y],y,C)===false){return y}}}else{for(y=B-1;y>-1;y--){if(A.call(z||C[y],C[y],y,C)===false){return y}}}return true},forEach:i?function(z,y,e){return z.forEach(y,e)}:function(B,z,y){var e=0,A=B.length;for(;e<A;e++){z.call(y,B[e],e,B)}},indexOf:(o)?function(z,e,y){return z.indexOf(e,y)}:function(B,z,A){var e,y=B.length;for(e=(A<0)?Math.max(0,y+A):A||0;e<y;e++){if(B[e]===z){return e}}return -1},contains:o?function(y,e){return y.indexOf(e)!==-1}:function(A,z){var e,y;for(e=0,y=A.length;e<y;e++){if(A[e]===z){return true}}return false},toArray:function(z,B,e){if(!z||!z.length){return[]}if(typeof z==="string"){z=z.split("")}if(j){return n.call(z,B||0,e||z.length)}var A=[],y;B=B||0;e=e?((e<0)?z.length+e:e):z.length;for(y=B;y<e;y++){A.push(z[y])}return A},pluck:function(C,e){var y=[],z,B,A;for(z=0,B=C.length;z<B;z++){A=C[z];y.push(A[e])}return y},map:t?function(z,y,e){return z.map(y,e)}:function(C,B,A){var z=[],y=0,e=C.length;for(;y<e;y++){z[y]=B.call(A,C[y],y,C)}return z},every:function(B,z,y){if(x){return B.every(z,y)}var e=0,A=B.length;for(;e<A;++e){if(!z.call(y,B[e],e,B)){return false}}return true},some:function(B,z,y){if(c){return B.some(z,y)}var e=0,A=B.length;for(;e<A;++e){if(z.call(y,B[e],e,B)){return true}}return false},clean:function(B){var y=[],e=0,A=B.length,z;for(;e<A;e++){z=B[e];if(!Ext.isEmpty(z)){y.push(z)}}return y},unique:function(B){var A=[],e=0,z=B.length,y;for(;e<z;e++){y=B[e];if(a.indexOf(A,y)===-1){A.push(y)}}return A},filter:function(C,A,z){if(d){return C.filter(A,z)}var y=[],e=0,B=C.length;for(;e<B;e++){if(A.call(z,C[e],e,C)){y.push(C[e])}}return y},from:function(y,e){if(y===undefined||y===null){return[]}if(Ext.isArray(y)){return(e)?n.call(y):y}if(y&&y.length!==undefined&&typeof y!=="string"){return a.toArray(y)}return[y]},remove:function(z,y){var e=a.indexOf(z,y);if(e!==-1){v(z,e,1)}return z},include:function(y,e){if(!a.contains(y,e)){y.push(e)}},clone:function(e){return n.call(e)},merge:function(){var e=n.call(arguments),A=[],y,z;for(y=0,z=e.length;y<z;y++){A=A.concat(e[y])}return a.unique(A)},intersect:function(){var A=[],e=n.call(arguments),E,C,B,G,H,K,J,I,z,D;if(!e.length){return A}for(E=K=0,I=e.length;E<I,H=e[E];E++){if(!G||H.length<G.length){G=H;K=E}}G=a.unique(G);v(e,K,1);for(E=0,I=G.length;E<I,K=G[E];E++){var F=0;for(C=0,z=e.length;C<z,H=e[C];C++){for(B=0,D=H.length;B<D,J=H[B];B++){if(K===J){F++;break}}}if(F===z){A.push(K)}}return A},difference:function(y,e){var D=n.call(y),B=D.length,A,z,C;for(A=0,C=e.length;A<C;A++){for(z=0;z<B;z++){if(D[z]===e[A]){v(D,z,1);z--;B--}}}return D},slice:function(z,y,e){return n.call(z,y,e)},sort:function(E,D){if(m){if(D){return E.sort(D)}else{return E.sort()}}var B=E.length,A=0,C,e,z,y;for(;A<B;A++){z=A;for(e=A+1;e<B;e++){if(D){C=D(E[e],E[z]);if(C<0){z=e}}else{if(E[e]<E[z]){z=e}}}if(z!==A){y=E[A];E[A]=E[z];E[z]=y}}return E},flatten:function(z){var y=[];function e(A){var C,D,B;for(C=0,D=A.length;C<D;C++){B=A[C];if(Ext.isArray(B)){e(B)}else{y.push(B)}}return y}return e(z)},min:function(C,B){var y=C[0],e,A,z;for(e=0,A=C.length;e<A;e++){z=C[e];if(B){if(B(y,z)===1){y=z}}else{if(z<y){y=z}}}return y},max:function(C,B){var e=C[0],y,A,z;for(y=0,A=C.length;y<A;y++){z=C[y];if(B){if(B(e,z)===-1){e=z}}else{if(z>e){e=z}}}return e},mean:function(e){return e.length>0?a.sum(e)/e.length:undefined},sum:function(B){var y=0,e,A,z;for(e=0,A=B.length;e<A;e++){z=B[e];y+=z}return y},erase:v,insert:function(z,y,e){return s(z,y,0,e)},replace:s,splice:u};Ext.each=a.each;a.union=a.merge;Ext.min=a.min;Ext.max=a.max;Ext.sum=a.sum;Ext.mean=a.mean;Ext.flatten=a.flatten;Ext.clean=a.clean;Ext.unique=a.unique;Ext.pluck=a.pluck;Ext.toArray=function(){return a.toArray.apply(a,arguments)}})();(function(){var a=(0.9).toFixed()!=="1";Ext.Number={constrain:function(d,c,b){d=parseFloat(d);if(!isNaN(c)){d=Math.max(d,c)}if(!isNaN(b)){d=Math.min(d,b)}return d},snap:function(e,c,d,g){var f=e,b;if(!(c&&e)){return e}b=e%c;if(b!==0){f-=b;if(b*2>=c){f+=c}else{if(b*2<-c){f-=c}}}return Ext.Number.constrain(f,d,g)},toFixed:function(d,b){if(a){b=b||0;var c=Math.pow(10,b);return(Math.round(d*c)/c).toFixed(b)}return d.toFixed(b)},from:function(c,b){if(isFinite(c)){c=parseFloat(c)}return !isNaN(c)?c:b}}})();Ext.num=function(){return Ext.Number.from.apply(this,arguments)};(function(){var a=function(){};var b=Ext.Object={chain:function(d){a.prototype=d;var c=new a();a.prototype=null;return c},toQueryObjects:function(e,j,d){var c=b.toQueryObjects,h=[],f,g;if(Ext.isArray(j)){for(f=0,g=j.length;f<g;f++){if(d){h=h.concat(c(e+"["+f+"]",j[f],true))}else{h.push({name:e,value:j[f]})}}}else{if(Ext.isObject(j)){for(f in j){if(j.hasOwnProperty(f)){if(d){h=h.concat(c(e+"["+f+"]",j[f],true))}else{h.push({name:e,value:j[f]})}}}}else{h.push({name:e,value:j})}}return h},toQueryString:function(f,d){var g=[],e=[],k,h,l,c,m;for(k in f){if(f.hasOwnProperty(k)){g=g.concat(b.toQueryObjects(k,f[k],d))}}for(h=0,l=g.length;h<l;h++){c=g[h];m=c.value;if(Ext.isEmpty(m)){m=""}else{if(Ext.isDate(m)){m=Ext.Date.toString(m)}}e.push(encodeURIComponent(c.name)+"="+encodeURIComponent(String(m)))}return e.join("&")},fromQueryString:function(d,q){var l=d.replace(/^\?/,"").split("&"),t={},r,h,v,m,p,f,n,o,c,g,s,k,u,e;for(p=0,f=l.length;p<f;p++){n=l[p];if(n.length>0){h=n.split("=");v=decodeURIComponent(h[0]);m=(h[1]!==undefined)?decodeURIComponent(h[1]):"";if(!q){if(t.hasOwnProperty(v)){if(!Ext.isArray(t[v])){t[v]=[t[v]]}t[v].push(m)}else{t[v]=m}}else{g=v.match(/(\[):?([^\]]*)\]/g);s=v.match(/^([^\[]+)/);v=s[0];k=[];if(g===null){t[v]=m;continue}for(o=0,c=g.length;o<c;o++){u=g[o];u=(u.length===2)?"":u.substring(1,u.length-1);k.push(u)}k.unshift(v);r=t;for(o=0,c=k.length;o<c;o++){u=k[o];if(o===c-1){if(Ext.isArray(r)&&u===""){r.push(m)}else{r[u]=m}}else{if(r[u]===undefined||typeof r[u]==="string"){e=k[o+1];r[u]=(Ext.isNumeric(e)||e==="")?[]:{}}r=r[u]}}}}}return t},each:function(c,e,d){for(var f in c){if(c.hasOwnProperty(f)){if(e.call(d||c,f,c[f],c)===false){return}}}},merge:function(c){var h=1,j=arguments.length,d=b.merge,f=Ext.clone,g,l,k,e;for(;h<j;h++){g=arguments[h];for(l in g){k=g[l];if(k&&k.constructor===Object){e=c[l];if(e&&e.constructor===Object){d(e,k)}else{c[l]=f(k)}}else{c[l]=k}}}return c},mergeIf:function(j){var f=1,g=arguments.length,d=Ext.clone,c,e,h;for(;f<g;f++){c=arguments[f];for(e in c){if(!(e in j)){h=c[e];if(h&&h.constructor===Object){j[e]=d(h)}else{j[e]=h}}}}return j},getKey:function(c,e){for(var d in c){if(c.hasOwnProperty(d)&&c[d]===e){return d}}return null},getValues:function(d){var c=[],e;for(e in d){if(d.hasOwnProperty(e)){c.push(d[e])}}return c},getKeys:("keys" in Object)?Object.keys:function(c){var d=[],e;for(e in c){if(c.hasOwnProperty(e)){d.push(e)}}return d},getSize:function(c){var d=0,e;for(e in c){if(c.hasOwnProperty(e)){d++}}return d},classify:function(f){var e=f,h=[],d={},c=function(){var j=0,k=h.length,l;for(;j<k;j++){l=h[j];this[l]=new d[l]}},g,i;for(g in f){if(f.hasOwnProperty(g)){i=f[g];if(i&&i.constructor===Object){h.push(g);d[g]=b.classify(i)}}}c.prototype=e;return c},defineProperty:("defineProperty" in Object)?Object.defineProperty:function(d,c,e){if(e.get){d.__defineGetter__(c,e.get)}if(e.set){d.__defineSetter__(c,e.set)}}};Ext.merge=Ext.Object.merge;Ext.mergeIf=Ext.Object.mergeIf;Ext.urlEncode=function(){var c=Ext.Array.from(arguments),d="";if((typeof c[1]==="string")){d=c[1]+"&";c[1]=false}return d+b.toQueryString.apply(b,c)};Ext.urlDecode=function(){return b.fromQueryString.apply(b,arguments)}})();Ext.Function={flexSetter:function(a){return function(d,c){var e,f;if(d===null){return this}if(typeof d!=="string"){for(e in d){if(d.hasOwnProperty(e)){a.call(this,e,d[e])}}if(Ext.enumerables){for(f=Ext.enumerables.length;f--;){e=Ext.enumerables[f];if(d.hasOwnProperty(e)){a.call(this,e,d[e])}}}}else{a.call(this,d,c)}return this}},bind:function(d,c,b,a){if(arguments.length===2){return function(){return d.apply(c,arguments)}}var f=d,e=Array.prototype.slice;return function(){var g=b||arguments;if(a===true){g=e.call(arguments,0);g=g.concat(b)}else{if(typeof a=="number"){g=e.call(arguments,0);Ext.Array.insert(g,a,b)}}return f.apply(c||window,g)}},pass:function(c,a,b){if(!Ext.isArray(a)){a=Ext.Array.clone(a)}return function(){a.push.apply(a,arguments);return c.apply(b||this,a)}},alias:function(b,a){return function(){return b[a].apply(b,arguments)}},clone:function(a){return function(){return a.apply(this,arguments)}},createInterceptor:function(d,c,b,a){var e=d;if(!Ext.isFunction(c)){return d}else{return function(){var g=this,f=arguments;c.target=g;c.method=d;return(c.apply(b||g||window,f)!==false)?d.apply(g||window,f):a||null}}},createDelayed:function(e,c,d,b,a){if(d||b){e=Ext.Function.bind(e,d,b,a)}return function(){var g=this,f=Array.prototype.slice.call(arguments);setTimeout(function(){e.apply(g,f)},c)}},defer:function(e,c,d,b,a){e=Ext.Function.bind(e,d,b,a);if(c>0){return setTimeout(e,c)}e();return 0},createSequence:function(b,c,a){if(!c){return b}else{return function(){var d=b.apply(this,arguments);c.apply(a||this,arguments);return d}}},createBuffered:function(e,b,d,c){var a;return function(){if(!d){d=this}if(!c){c=Array.prototype.slice.call(arguments)}if(a){clearTimeout(a);a=null}a=setTimeout(function(){e.apply(d,c)},b)}},createThrottled:function(e,b,d){var f,a,c,h,g=function(){e.apply(d||this,c);f=new Date().getTime()};return function(){a=new Date().getTime()-f;c=arguments;clearTimeout(h);if(!f||(a>=b)){g()}else{h=setTimeout(g,b-a)}}},interceptBefore:function(b,a,c){var d=b[a]||Ext.emptyFn;return b[a]=function(){var e=c.apply(this,arguments);d.apply(this,arguments);return e}},interceptAfter:function(b,a,c){var d=b[a]||Ext.emptyFn;return b[a]=function(){d.apply(this,arguments);return c.apply(this,arguments)}}};Ext.defer=Ext.Function.alias(Ext.Function,"defer");Ext.pass=Ext.Function.alias(Ext.Function,"pass");Ext.bind=Ext.Function.alias(Ext.Function,"bind");Ext.JSON=new (function(){var useHasOwn=!!{}.hasOwnProperty,isNative=function(){var useNative=null;return function(){if(useNative===null){useNative=Ext.USE_NATIVE_JSON&&window.JSON&&JSON.toString()=="[object JSON]"}return useNative}}(),pad=function(n){return n<10?"0"+n:n},doDecode=function(json){return eval("("+json+")")},doEncode=function(o){if(!Ext.isDefined(o)||o===null){return"null"}else{if(Ext.isArray(o)){return encodeArray(o)}else{if(Ext.isDate(o)){return Ext.JSON.encodeDate(o)}else{if(Ext.isString(o)){return encodeString(o)}else{if(typeof o=="number"){return isFinite(o)?String(o):"null"}else{if(Ext.isBoolean(o)){return String(o)}else{if(Ext.isObject(o)){return encodeObject(o)}else{if(typeof o==="function"){return"null"}}}}}}}}return"undefined"},m={"\b":"\\b","\t":"\\t","\n":"\\n","\f":"\\f","\r":"\\r",'"':'\\"',"\\":"\\\\","\x0b":"\\u000b"},charToReplace=/[\\\"\x00-\x1f\x7f-\uffff]/g,encodeString=function(s){return'"'+s.replace(charToReplace,function(a){var c=m[a];return typeof c==="string"?c:"\\u"+("0000"+a.charCodeAt(0).toString(16)).slice(-4)})+'"'},encodeArray=function(o){var a=["[",""],len=o.length,i;for(i=0;i<len;i+=1){a.push(doEncode(o[i]),",")}a[a.length-1]="]";return a.join("")},encodeObject=function(o){var a=["{",""],i;for(i in o){if(!useHasOwn||o.hasOwnProperty(i)){a.push(doEncode(i),":",doEncode(o[i]),",")}}a[a.length-1]="}";return a.join("")};this.encodeDate=function(o){return'"'+o.getFullYear()+"-"+pad(o.getMonth()+1)+"-"+pad(o.getDate())+"T"+pad(o.getHours())+":"+pad(o.getMinutes())+":"+pad(o.getSeconds())+'"'};this.encode=function(){var ec;return function(o){if(!ec){ec=isNative()?JSON.stringify:doEncode}return ec(o)}}();this.decode=function(){var dc;return function(json,safe){if(!dc){dc=isNative()?JSON.parse:doDecode}try{return dc(json)}catch(e){if(safe===true){return null}Ext.Error.raise({sourceClass:"Ext.JSON",sourceMethod:"decode",msg:"You're trying to decode an invalid JSON String: "+json})}}}()})();Ext.encode=Ext.JSON.encode;Ext.decode=Ext.JSON.decode;Ext.Error={raise:function(a){throw new Error(a.msg)}};Ext.Date={now:Date.now,toString:function(a){if(!a){a=new Date()}var b=Ext.String.leftPad;return a.getFullYear()+"-"+b(a.getMonth()+1,2,"0")+"-"+b(a.getDate(),2,"0")+"T"+b(a.getHours(),2,"0")+":"+b(a.getMinutes(),2,"0")+":"+b(a.getSeconds(),2,"0")}};(function(a){var c=[],b=function(){};Ext.apply(b,{$className:"Ext.Base",$isClass:true,create:function(){return Ext.create.apply(Ext,[this].concat(Array.prototype.slice.call(arguments,0)))},extend:function(h){var d=h.prototype,l,f,g,j,e,k;f=this.prototype=Ext.Object.chain(d);f.self=this;this.superclass=f.superclass=d;if(!h.$isClass){l=Ext.Base.prototype;for(g in l){if(g in f){f[g]=l[g]}}}k=d.$inheritableStatics;if(k){for(g=0,j=k.length;g<j;g++){e=k[g];if(!this.hasOwnProperty(e)){this[e]=h[e]}}}if(h.$onExtended){this.$onExtended=h.$onExtended.slice()}f.config=f.defaultConfig=new f.configClass;f.initConfigList=f.initConfigList.slice();f.initConfigMap=Ext.Object.chain(f.initConfigMap)},"$onExtended":[],triggerExtended:function(){var f=this.$onExtended,e=f.length,d,g;if(e>0){for(d=0;d<e;d++){g=f[d];g.fn.apply(g.scope||this,arguments)}}},onExtended:function(e,d){this.$onExtended.push({fn:e,scope:d});return this},addConfig:function(f,i){var j=this.prototype,g=j.initConfigList,e=j.initConfigMap,h=j.defaultConfig,l,d,k;i=Boolean(i);for(d in f){if(f.hasOwnProperty(d)&&(i||!(d in h))){k=f[d];l=e[d];if(k!==null){if(!l){e[d]=true;g.push(d)}}else{if(l){e[d]=false;Ext.Array.remove(g,d)}}}}if(i){Ext.merge(h,f)}else{Ext.mergeIf(h,f)}j.configClass=Ext.Object.classify(h)},addStatics:function(d){var f,e;for(e in d){if(d.hasOwnProperty(e)){f=d[e];this[e]=f}}return this},addInheritableStatics:function(e){var h,d,g=this.prototype,f,i;h=g.$inheritableStatics;d=g.$hasInheritableStatics;if(!h){h=g.$inheritableStatics=[];d=g.$hasInheritableStatics={}}for(f in e){if(e.hasOwnProperty(f)){i=e[f];this[f]=i;if(!d[f]){d[f]=true;h.push(f)}}}return this},addMembers:function(e){var g=this.prototype,d=Ext.enumerables,k=[],h,j,f,l;for(f in e){k.push(f)}if(d){k.push.apply(k,d)}for(h=0,j=k.length;h<j;h++){f=k[h];if(e.hasOwnProperty(f)){l=e[f];if(typeof l=="function"&&!l.$isClass&&l!==Ext.emptyFn){l.$owner=this;l.$name=f}g[f]=l}}return this},addMember:function(d,e){if(typeof e=="function"&&!e.$isClass&&e!==Ext.emptyFn){e.$owner=this;e.$name=d}this.prototype[d]=e;return this},implement:function(){this.addMembers.apply(this,arguments)},borrow:function(h,f){var m=this.prototype,l=h.prototype,g,j,e,k,d;f=Ext.Array.from(f);for(g=0,j=f.length;g<j;g++){e=f[g];d=l[e];if(typeof d=="function"){k=function(){return d.apply(this,arguments)};k.$owner=this;k.$name=e;m[e]=k}else{m[e]=d}}return this},override:function(e){var l=this,n=Ext.enumerables,j=l.prototype,g=Ext.Function.clone,d,i,f,m,k,h;if(arguments.length===2){d=e;e={};e[d]=arguments[1];n=null}do{k=[];m=null;for(d in e){if(d=="statics"){m=e[d]}else{k.push(d)}}if(n){k.push.apply(k,n)}for(i=k.length;i--;){d=k[i];if(e.hasOwnProperty(d)){f=e[d];if(typeof f=="function"&&!f.$className&&f!==Ext.emptyFn){if(typeof f.$owner!="undefined"){f=g(f)}f.$owner=l;f.$name=d;h=j[d];if(h){f.$previous=h}}j[d]=f}}j=l;e=m}while(e);return this},callParent:function(d){var e;return(e=this.callParent.caller)&&(e.$previous||((e=e.$owner?e:e.caller)&&e.$owner.superclass.$class[e.$name])).apply(this,d||c)},mixin:function(f,h){var d=h.prototype,e=this.prototype,g;if(typeof d.onClassMixedIn!="undefined"){d.onClassMixedIn.call(h,this)}if(!e.hasOwnProperty("mixins")){if("mixins" in e){e.mixins=Ext.Object.chain(e.mixins)}else{e.mixins={}}}for(g in d){if(g==="mixins"){Ext.merge(e.mixins,d[g])}else{if(typeof e[g]=="undefined"&&g!="mixinId"&&g!="config"){e[g]=d[g]}}}if("config" in d){this.addConfig(d.config,false)}e.mixins[f]=d},getName:function(){return Ext.getClassName(this)},createAlias:a(function(e,d){this.override(e,function(){return this[d].apply(this,arguments)})}),addXtype:function(h){var e=this.prototype,g=e.xtypesMap,f=e.xtypes,d=e.xtypesChain;if(!e.hasOwnProperty("xtypesMap")){g=e.xtypesMap=Ext.merge({},e.xtypesMap||{});f=e.xtypes=e.xtypes?[].concat(e.xtypes):[];d=e.xtypesChain=e.xtypesChain?[].concat(e.xtypesChain):[];e.xtype=h}if(!g[h]){g[h]=true;f.push(h);d.push(h);Ext.ClassManager.setAlias(this,"widget."+h)}return this}});b.implement({isInstance:true,$className:"Ext.Base",configClass:Ext.emptyFn,initConfigList:[],initConfigMap:{},statics:function(){var e=this.statics.caller,d=this.self;if(!e){return d}return e.$owner},callParent:function(e){var f,d=(f=this.callParent.caller)&&(f.$previous||((f=f.$owner?f:f.caller)&&f.$owner.superclass[f.$name]));return d.apply(this,e||c)},self:b,constructor:function(){return this},wasInstantiated:false,initConfig:function(m){var l=Ext.Class.configNameCache,p=this.self.prototype,h=this.initConfigList,f=this.initConfigMap,g=new this.configClass,j=this.defaultConfig,k,o,e,q,n,d;this.initConfig=Ext.emptyFn;this.initialConfig=m||{};if(m){Ext.merge(g,m)}this.config=g;if(!p.hasOwnProperty("wasInstantiated")){p.wasInstantiated=true;for(k=0,o=h.length;k<o;k++){e=h[k];n=l[e];q=j[e];if(!(n.apply in p)&&!(n.update in p)&&p[n.set].$isDefault&&typeof q!="object"){p[n.internal]=j[e];f[e]=false;Ext.Array.remove(h,e);k--;o--}}}if(m){h=h.slice();for(e in m){if(e in j&&!f[e]){h.push(e)}}}for(k=0,o=h.length;k<o;k++){e=h[k];n=l[e];this[n.get]=this[n.initGet]}this.beforeInitConfig(g);for(k=0,o=h.length;k<o;k++){e=h[k];n=l[e];d=n.get;if(this.hasOwnProperty(d)){this[n.set].call(this,g[e]);delete this[d]}}return this},beforeInitConfig:Ext.emptyFn,getCurrentConfig:function(){var d=this.defaultConfig,g=Ext.Class.configNameCache,f={},e,h;for(e in d){h=g[e];f[e]=this[h.get].call(this)}return f},setConfig:function(e,l){if(!e){return this}var h=Ext.Class.configNameCache,j=this.config,f=this.defaultConfig,o=this.initialConfig,k=[],d,g,n,m;l=Boolean(l);for(d in e){if((l&&(d in o))){continue}j[d]=e[d];if(d in f){k.push(d);m=h[d];this[m.get]=this[m.initGet]}}for(g=0,n=k.length;g<n;g++){d=k[g];m=h[d];this[m.set].call(this,e[d]);delete this[m.get]}return this},getConfig:function(d){return this[Ext.Class.configNameCache[d].get].call(this)},hasConfig:function(d){return(d in this.defaultConfig)},getInitialConfig:function(e){var d=this.config;if(!e){return d}else{return d[e]}},onConfigUpdate:function(j,l,m){var n=this.self,f,h,d,g,k,e;j=Ext.Array.from(j);m=m||this;for(f=0,h=j.length;f<h;f++){d=j[f];g="update"+Ext.String.capitalize(d);k=this[g]||Ext.emptyFn;e=function(){k.apply(this,arguments);m[l].apply(m,arguments)};e.$name=g;e.$owner=n;this[g]=e}},destroy:function(){this.destroy=Ext.emptyFn;this.isDestroyed=true}});b.prototype.callOverridden=b.prototype.callParent;Ext.Base=b})(Ext.Function.flexSetter);(function(){var b,a=Ext.Base,e=[],d,c;for(d in a){if(a.hasOwnProperty(d)){e.push(d)}}c=e.length;Ext.Class=b=function(g,h,f){if(typeof g!="function"){f=h;h=g;g=null}if(!h){h={}}g=b.create(g);b.process(g,h,f);return g};Ext.apply(b,{onBeforeCreated:function(g,h,f){g.addMembers(h);f.onCreated.call(g,g)},create:function(f){var g,h;if(!f){f=function(){return this.constructor.apply(this,arguments)}}for(h=0;h<c;h++){g=e[h];f[g]=a[g]}return f},process:function(g,m,k){var j=m.preprocessors||b.defaultPreprocessors,q=this.preprocessors,t={onBeforeCreated:this.onBeforeCreated,onCreated:k||Ext.emptyFn},n=0,f,u,p,l,o,r,s,h;delete m.preprocessors;h=function(v,w,i){r=null;while(r===null){f=j[n++];if(f){u=q[f];p=u.properties;if(p===true){r=u.fn}else{for(l=0,o=p.length;l<o;l++){s=p[l];if(w.hasOwnProperty(s)){r=u.fn;break}}}}else{i.onBeforeCreated.apply(this,arguments);return}}if(r.call(this,v,w,i,h)!==false){h.apply(this,arguments)}};h.call(this,g,m,t)},preprocessors:{},registerPreprocessor:function(g,j,h,f,i){if(!f){f="last"}if(!h){h=[g]}this.preprocessors[g]={name:g,properties:h||false,fn:j};this.setDefaultPreprocessorPosition(g,f,i);return this},getPreprocessor:function(f){return this.preprocessors[f]},getPreprocessors:function(){return this.preprocessors},defaultPreprocessors:[],getDefaultPreprocessors:function(){return this.defaultPreprocessors},setDefaultPreprocessors:function(f){this.defaultPreprocessors=Ext.Array.from(f);return this},setDefaultPreprocessorPosition:function(h,j,i){var f=this.defaultPreprocessors,g;if(typeof j=="string"){if(j==="first"){f.unshift(h);return this}else{if(j==="last"){f.push(h);return this}}j=(j==="after")?1:-1}g=Ext.Array.indexOf(f,i);if(g!==-1){Ext.Array.splice(f,Math.max(0,g+j),0,h)}return this},configNameCache:{},getConfigNameMap:function(h){var g=this.configNameCache,i=g[h],f;if(!i){f=h.charAt(0).toUpperCase()+h.substr(1);i=g[h]={name:h,internal:"_"+h,initializing:"is"+f+"Initializing",apply:"apply"+f,update:"update"+f,set:"set"+f,get:"get"+f,initGet:"initGet"+f,doSet:"doSet"+f,changeEvent:h.toLowerCase()+"change"}}return i},generateSetter:function(i){var g=i.internal,h=i.get,f=i.apply,k=i.update,j;j=function(n){var m=this[g],l=this[f],o=this[k];delete this[h];if(l){n=l.call(this,n,m)}if(typeof n!="undefined"){this[g]=n;if(o&&n!==m){o.call(this,n,m)}}return this};j.$isDefault=true;return j},generateInitGetter:function(j){var f=j.name,i=j.set,g=j.get,h=j.initializing;return function(){this[h]=true;delete this[g];this[i].call(this,this.config[f]);delete this[h];return this[g].apply(this,arguments)}},generateGetter:function(g){var f=g.internal;return function(){return this[f]}}});b.registerPreprocessor("extend",function(g,k){var j=Ext.Base,l=j.prototype,m=k.extend,i,f,h;delete k.extend;if(m&&m!==Object){i=m}else{i=j}f=i.prototype;if(!i.$isClass){for(h in l){if(!f[h]){f[h]=l[h]}}}g.extend(i);g.triggerExtended.apply(g,arguments);if(k.onClassExtended){g.onExtended(k.onClassExtended,g);delete k.onClassExtended}},true);b.registerPreprocessor("statics",function(f,g){f.addStatics(g.statics);delete g.statics});b.registerPreprocessor("inheritableStatics",function(f,g){f.addInheritableStatics(g.inheritableStatics);delete g.inheritableStatics});b.registerPreprocessor("config",function(h,m){var j=m.config,p=h.prototype,l=p.config,o,g,n,f,i,k,q;delete m.config;for(g in j){if(j.hasOwnProperty(g)&&!(g in l)){q=j[g];o=this.getConfigNameMap(g);n=o.set;f=o.get;i=o.initGet;k=o.internal;m[i]=this.generateInitGetter(o);if(q===null&&!m.hasOwnProperty(k)){m[k]=null}if(!m.hasOwnProperty(f)){m[f]=this.generateGetter(o)}if(!m.hasOwnProperty(n)){m[n]=this.generateSetter(o)}}}h.addConfig(j,true)});b.registerPreprocessor("mixins",function(j,n,f){var g=n.mixins,k,h,l,m;delete n.mixins;Ext.Function.interceptBefore(f,"onCreated",function(){if(g instanceof Array){for(l=0,m=g.length;l<m;l++){h=g[l];k=h.prototype.mixinId||h.$className;j.mixin(k,h)}}else{for(k in g){if(g.hasOwnProperty(k)){j.mixin(k,g[k])}}}})});Ext.extend=function(h,i,g){if(arguments.length===2&&Ext.isObject(i)){g=i;i=h;h=null}var f;if(!i){throw new Error("[Ext.extend] Attempting to extend from a class which has not been loaded on the page.")}g.extend=i;g.preprocessors=["extend","statics","inheritableStatics","mixins","config"];if(h){f=new b(h,g)}else{f=new b(g)}f.prototype.override=function(k){for(var j in k){if(k.hasOwnProperty(j)){this[j]=k[j]}}};return f}})();(function(b,d,f,c,e){var a=Ext.ClassManager={classes:{},existCache:{},namespaceRewrites:[{from:"Ext.",to:Ext}],maps:{alternateToName:{},aliasToName:{},nameToAliases:{},nameToAlternates:{},overridesByName:{}},enableNamespaceParseCache:true,namespaceParseCache:{},instantiators:[],isCreated:function(l){var k=this.existCache,j,m,h,g,n;if(this.classes[l]||k[l]){return true}g=e;n=this.parseNamespace(l);for(j=0,m=n.length;j<m;j++){h=n[j];if(typeof h!="string"){g=h}else{if(!g||!g[h]){return false}g=g[h]}}k[l]=true;this.triggerCreated(l);return true},createdListeners:[],nameCreatedListeners:{},triggerCreated:function(k){var j=this.createdListeners,h=this.nameCreatedListeners,g,l,m;for(g=0,l=j.length;g<l;g++){m=j[g];m.fn.call(m.scope,k)}j=h[k];if(j){for(g=0,l=j.length;g<l;g++){m=j[g];m.fn.call(m.scope,k)}delete h[k]}},onCreated:function(k,j,i){var h=this.createdListeners,g=this.nameCreatedListeners,l={fn:k,scope:j};if(i){if(this.isCreated(i)){k.call(j,i);return}if(!g[i]){g[i]=[]}g[i].push(l)}else{h.push(l)}},parseNamespace:function(j){var g=this.namespaceParseCache;if(this.enableNamespaceParseCache){if(g.hasOwnProperty(j)){return g[j]}}var k=[],m=this.namespaceRewrites,o=e,h=j,r,q,p,l,n;for(l=0,n=m.length;l<n;l++){r=m[l];q=r.from;p=r.to;if(h===q||h.substring(0,q.length)===q){h=h.substring(q.length);if(typeof p!="string"){o=p}else{k=k.concat(p.split("."))}break}}k.push(o);k=k.concat(h.split("."));if(this.enableNamespaceParseCache){g[j]=k}return k},setNamespace:function(k,n){var h=e,o=this.parseNamespace(k),m=o.length-1,g=o[m],l,j;for(l=0;l<m;l++){j=o[l];if(typeof j!="string"){h=j}else{if(!h[j]){h[j]={}}h=h[j]}}h[g]=n;return h[g]},createNamespaces:function(){var g=e,n,k,l,h,m,o;for(l=0,m=arguments.length;l<m;l++){n=this.parseNamespace(arguments[l]);for(h=0,o=n.length;h<o;h++){k=n[h];if(typeof k!="string"){g=k}else{if(!g[k]){g[k]={}}g=g[k]}}}return g},set:function(g,k){var j=this,m=j.maps,l=m.nameToAlternates,i=j.getName(k),h;j.classes[g]=j.setNamespace(g,k);if(i&&i!==g){m.alternateToName[g]=i;h=l[i]||(l[i]=[]);h.push(g)}return this},get:function(j){var l=this.classes;if(l[j]){return l[j]}var g=e,n=this.parseNamespace(j),h,k,m;for(k=0,m=n.length;k<m;k++){h=n[k];if(typeof h!="string"){g=h}else{if(!g||!g[h]){return null}g=g[h]}}return g},setAlias:function(g,h){var j=this.maps.aliasToName,k=this.maps.nameToAliases,i;if(typeof g=="string"){i=g}else{i=this.getName(g)}if(h&&j[h]!==i){j[h]=i}if(!k[i]){k[i]=[]}if(h){Ext.Array.include(k[i],h)}return this},getByAlias:function(g){return this.get(this.getNameByAlias(g))},getNameByAlias:function(g){return this.maps.aliasToName[g]||""},getNameByAlternate:function(g){return this.maps.alternateToName[g]||""},getAliasesByName:function(g){return this.maps.nameToAliases[g]||[]},getName:function(g){return g&&g.$className||""},getClass:function(g){return g&&g.self||null},applyOverrides:function(g){var m=this,k=m.maps.overridesByName,n=k[g],l=n&&n.length||0,j=m.createOverride,h;delete k[g];for(h=0;h<l;++h){j.apply(m,n[h])}},create:function(h,i,g){i.$className=h;return new b(i,function(){var n=i.postprocessors||a.defaultPostprocessors,u=a.postprocessors,r=0,v=[],t,k,o,s,m,q,p,w,l;delete i.postprocessors;for(o=0,s=n.length;o<s;o++){t=n[o];if(typeof t=="string"){t=u[t];p=t.properties;if(p===true){v.push(t.fn)}else{if(p){for(m=0,q=p.length;m<q;m++){w=p[m];if(i.hasOwnProperty(w)){v.push(t.fn);break}}}}}else{v.push(t)}}k=function(x,j,y){t=v[r++];if(!t){a.set(h,j);if(g){g.call(j,j)}a.triggerCreated(h);return}if(t.call(this,x,j,y,k)!==false){k.apply(this,arguments)}};k.call(a,h,this,i);a.applyOverrides(h);l=a.maps.nameToAlternates[h];for(o=0,s=l&&l.length||0;o<s;++o){a.applyOverrides(l[o])}})},createOverride:function(h,j,g){var m=this,l=j.override,o=m.get(l),k,i,n;if(o){k=Ext.apply({},j);delete k.requires;delete k.uses;delete k.override;m.create(h,{requires:j.requires,uses:j.uses,override:l},function(){this.active=true;if(o.override){o.override(k)}else{o.self.override(k)}if(g){g.call(o)}})}else{i=m.maps.overridesByName;n=i[l]||(i[l]=[]);n.push(Array.prototype.slice.call(arguments,0));m.setNamespace(h,{override:l})}},instantiateByAlias:function(){var h=arguments[0],g=f.call(arguments),i=this.getNameByAlias(h);if(!i){i=this.maps.aliasToName[h];Ext.syncRequire(i)}g[0]=i;return this.instantiate.apply(this,g)},instantiate:function(){var i=arguments[0],h=f.call(arguments,1),j=i,k,g;if(typeof i!="function"){g=this.get(i)}else{g=i}if(!g){k=this.getNameByAlias(i);if(k){i=k;g=this.get(i)}}if(!g){k=this.getNameByAlternate(i);if(k){i=k;g=this.get(i)}}if(!g){Ext.syncRequire(i);g=this.get(i)}return this.getInstantiator(h.length)(g,h)},dynInstantiate:function(h,g){g=c(g,true);g.unshift(h);return this.instantiate.apply(this,g)},getInstantiator:function(k){var j=this.instantiators,l;l=j[k];if(!l){var h=k,g=[];for(h=0;h<k;h++){g.push("a["+h+"]")}l=j[k]=new Function("c","a","return new c("+g.join(",")+")")}return l},postprocessors:{},defaultPostprocessors:[],registerPostprocessor:function(h,k,i,g,j){if(!g){g="last"}if(!i){i=[h]}this.postprocessors[h]={name:h,properties:i||false,fn:k};this.setDefaultPostprocessorPosition(h,g,j);return this},setDefaultPostprocessors:function(g){this.defaultPostprocessors=c(g);return this},setDefaultPostprocessorPosition:function(h,k,j){var i=this.defaultPostprocessors,g;if(typeof k=="string"){if(k==="first"){i.unshift(h);return this}else{if(k==="last"){i.push(h);return this}}k=(k==="after")?1:-1}g=Ext.Array.indexOf(i,j);if(g!==-1){Ext.Array.splice(i,Math.max(0,g+k),0,h)}return this},getNamesByExpression:function(o){var m=this.maps.nameToAliases,p=[],g,l,j,h,q,k,n;if(o.indexOf("*")!==-1){o=o.replace(/\*/g,"(.*?)");q=new RegExp("^"+o+"$");for(g in m){if(m.hasOwnProperty(g)){j=m[g];if(g.search(q)!==-1){p.push(g)}else{for(k=0,n=j.length;k<n;k++){l=j[k];if(l.search(q)!==-1){p.push(g);break}}}}}}else{h=this.getNameByAlias(o);if(h){p.push(h)}else{h=this.getNameByAlternate(o);if(h){p.push(h)}else{p.push(o)}}}return p}};a.registerPostprocessor("alias",function(j,h,m){var g=m.alias,k,l;for(k=0,l=g.length;k<l;k++){d=g[k];this.setAlias(h,d)}},["xtype","alias"]);a.registerPostprocessor("singleton",function(h,g,j,i){i.call(this,h,new g(),j);return false});a.registerPostprocessor("alternateClassName",function(h,g,m){var k=m.alternateClassName,j,l,n;if(!(k instanceof Array)){k=[k]}for(j=0,l=k.length;j<l;j++){n=k[j];this.set(n,g)}});Ext.apply(Ext,{create:d(a,"instantiate"),widget:function(h){var g=f.call(arguments);g[0]="widget."+h;return a.instantiateByAlias.apply(a,g)},createByAlias:d(a,"instantiateByAlias"),define:function(h,i,g){if(i.override){return a.createOverride.apply(a,arguments)}return a.create.apply(a,arguments)},getClassName:d(a,"getName"),getDisplayName:function(g){if(g){if(g.displayName){return g.displayName}if(g.$name&&g.$class){return Ext.getClassName(g.$class)+"#"+g.$name}if(g.$className){return g.$className}}return"Anonymous"},getClass:d(a,"getClass"),namespace:d(a,"createNamespaces")});Ext.createWidget=Ext.widget;Ext.ns=Ext.namespace;b.registerPreprocessor("className",function(g,h){if(h.$className){g.$className=h.$className}},true,"first");b.registerPreprocessor("alias",function(s,m){var q=s.prototype,j=c(m.xtype),g=c(m.alias),t="widget.",r=t.length,n=Array.prototype.slice.call(q.xtypesChain||[]),k=Ext.merge({},q.xtypesMap||{}),l,p,o,h;for(l=0,p=g.length;l<p;l++){o=g[l];if(o.substring(0,r)===t){h=o.substring(r);Ext.Array.include(j,h)}}s.xtype=m.xtype=j[0];m.xtypes=j;for(l=0,p=j.length;l<p;l++){h=j[l];if(!k[h]){k[h]=true;n.push(h)}}m.xtypesChain=n;m.xtypesMap=k;Ext.Function.interceptAfter(m,"onClassCreated",function(){var i=q.mixins,v,u;for(v in i){if(i.hasOwnProperty(v)){u=i[v];j=u.xtypes;if(j){for(l=0,p=j.length;l<p;l++){h=j[l];if(!k[h]){k[h]=true;n.push(h)}}}}}});for(l=0,p=j.length;l<p;l++){h=j[l];Ext.Array.include(g,t+h)}m.alias=g},["xtype","alias"])})(Ext.Class,Ext.Function.alias,Array.prototype.slice,Ext.Array.from,Ext.global);(function(a,c,d,g,i,h,f,j){var e=["extend","mixins","requires"],b;b=Ext.Loader={isInHistory:{},history:[],config:{enabled:false,disableCaching:true,disableCachingParam:"_dc",paths:{Ext:"."}},setConfig:function(k,l){if(Ext.isObject(k)&&arguments.length===1){Ext.merge(this.config,k)}else{this.config[k]=(Ext.isObject(l))?Ext.merge(this.config[k],l):l}return this},getConfig:function(k){if(k){return this.config[k]}return this.config},setPath:d(function(k,l){this.config.paths[k]=l;return this}),getPath:function(k){var m="",n=this.config.paths,l=this.getPrefix(k);if(l.length>0){if(l===k){return n[l]}m=n[l];k=k.substring(l.length+1)}if(m.length>0){m+="/"}return m.replace(/\/\.\//g,"/")+k.replace(/\./g,"/")+".js"},getPrefix:function(l){var n=this.config.paths,m,k="";if(n.hasOwnProperty(l)){return l}for(m in n){if(n.hasOwnProperty(m)&&m+"."===l.substring(0,m.length+1)){if(m.length>k.length){k=m}}}return k},require:function(m,l,k,n){if(l){l.call(k)}},syncRequire:function(){},exclude:function(l){var k=this;return{require:function(o,n,m){return k.require(o,n,m,l)},syncRequire:function(o,n,m){return k.syncRequire(o,n,m,l)}}},onReady:function(n,m,o,k){var l;if(o!==false&&Ext.onDocumentReady){l=n;n=function(){Ext.onDocumentReady(l,m,k)}}n.call(m)}};Ext.apply(b,{documentHead:typeof document!="undefined"&&(document.head||document.getElementsByTagName("head")[0]),isLoading:false,queue:[],isClassFileLoaded:{},isFileLoaded:{},readyListeners:[],optionalRequires:[],requiresMap:{},numPendingFiles:0,numLoadedFiles:0,hasFileLoadError:false,classNameToFilePathMap:{},syncModeEnabled:false,scriptElements:{},refreshQueue:function(){var k=this.queue,q=k.length,n,p,l,o,m;if(q===0){this.triggerReady();return}for(n=0;n<q;n++){p=k[n];if(p){o=p.requires;m=p.references;if(o.length>this.numLoadedFiles){continue}l=0;do{if(a.isCreated(o[l])){f(o,l,1)}else{l++}}while(l<o.length);if(p.requires.length===0){f(k,n,1);p.callback.call(p.scope);this.refreshQueue();break}}}return this},injectScriptElement:function(m,o,q,n){var l=document.createElement("script"),p=this,k=function(){p.cleanupScriptElement(l);o.call(n)},r=function(){p.cleanupScriptElement(l);q.call(n)};l.type="text/javascript";l.src=m;l.onload=k;l.onerror=r;l.onreadystatechange=function(){if(this.readyState==="loaded"||this.readyState==="complete"){k()}};this.documentHead.appendChild(l);return l},removeScriptElement:function(l){var k=this.scriptElements;if(k[l]){this.cleanupScriptElement(k[l],true);delete k[l]}return this},cleanupScriptElement:function(l,k){l.onload=null;l.onreadystatechange=null;l.onerror=null;if(k){this.documentHead.removeChild(l)}return this},loadScriptFile:function(l,s,p,w,k){var r=this,x=this.isFileLoaded,n=this.scriptElements,v=l+(this.getConfig("disableCaching")?("?"+this.getConfig("disableCachingParam")+"="+Ext.Date.now()):""),m=false,u,o,t;if(x[l]){return this}w=w||this;this.isLoading=true;if(!k){t=function(){};if(!Ext.isReady&&Ext.onDocumentReady){Ext.onDocumentReady(function(){if(!x[l]){n[l]=r.injectScriptElement(v,s,t,w)}})}else{n[l]=this.injectScriptElement(v,s,t,w)}}else{if(typeof XMLHttpRequest!="undefined"){u=new XMLHttpRequest()}else{u=new ActiveXObject("Microsoft.XMLHTTP")}try{u.open("GET",v,false);u.send(null)}catch(q){m=true}o=(u.status===1223)?204:u.status;if(!m){m=(o===0)}if(m){}else{if(o>=200&&o<300){Ext.globalEval(u.responseText+"\n//@ sourceURL="+l);s.call(w)}else{}}u=null}},syncRequire:function(){var k=this.syncModeEnabled;if(!k){this.syncModeEnabled=true}this.require.apply(this,arguments);if(!k){this.syncModeEnabled=false}this.refreshQueue()},require:function(F,t,n,q){var v={},m={},y=this.queue,C=this.classNameToFilePathMap,A=this.isClassFileLoaded,s=[],H=[],E=[],l=[],r,G,x,w,k,p,D,B,z,u,o;if(q){q=h(q);for(B=0,u=q.length;B<u;B++){k=q[B];if(typeof k=="string"&&k.length>0){s=a.getNamesByExpression(k);for(z=0,o=s.length;z<o;z++){v[s[z]]=true}}}}F=h(F);if(t){if(t.length>0){r=function(){var K=[],J,L,I;for(J=0,L=l.length;J<L;J++){I=l[J];K.push(a.get(I))}return t.apply(this,K)}}else{r=t}}else{r=Ext.emptyFn}n=n||Ext.global;for(B=0,u=F.length;B<u;B++){w=F[B];if(typeof w=="string"&&w.length>0){H=a.getNamesByExpression(w);o=H.length;for(z=0;z<o;z++){D=H[z];if(v[D]!==true){l.push(D);if(!a.isCreated(D)&&!m[D]){m[D]=true;E.push(D)}}}}}if(E.length>0){if(!this.config.enabled){throw new Error("Ext.Loader is not enabled, so dependencies cannot be resolved dynamically. Missing required class"+((E.length>1)?"es":"")+": "+E.join(", "))}}else{r.call(n);return this}G=this.syncModeEnabled;if(!G){y.push({requires:E.slice(),callback:r,scope:n})}u=E.length;for(B=0;B<u;B++){p=E[B];x=this.getPath(p);if(G&&A.hasOwnProperty(p)){this.numPendingFiles--;this.removeScriptElement(x);delete A[p]}if(!A.hasOwnProperty(p)){A[p]=false;C[p]=x;this.numPendingFiles++;this.loadScriptFile(x,i(this.onFileLoaded,[p,x],this),i(this.onFileLoadError,[p,x]),this,G)}}if(G){r.call(n);if(u===1){return a.get(p)}}return this},onFileLoaded:function(l,k){this.numLoadedFiles++;this.isClassFileLoaded[l]=true;this.isFileLoaded[k]=true;this.numPendingFiles--;if(this.numPendingFiles===0){this.refreshQueue()}},onFileLoadError:function(m,l,k,n){this.numPendingFiles--;this.hasFileLoadError=true},addOptionalRequires:function(m){var o=this.optionalRequires,l,n,k;m=h(m);for(l=0,n=m.length;l<n;l++){k=m[l];j(o,k)}return this},triggerReady:function(l){var n=this.readyListeners,m=this.optionalRequires,k;if(this.isLoading||l){this.isLoading=false;if(m.length!==0){m=m.slice();this.optionalRequires.length=0;this.require(m,i(this.triggerReady,[true],this),this);return this}while(n.length){k=n.shift();k.fn.call(k.scope);if(this.isLoading){return this}}}return this},onReady:function(n,m,o,k){var l;if(o!==false&&Ext.onDocumentReady){l=n;n=function(){Ext.onDocumentReady(l,m,k)}}if(!this.isLoading){n.call(m)}else{this.readyListeners.push({fn:n,scope:m})}},historyPush:function(l){var k=this.isInHistory;if(l&&this.isClassFileLoaded.hasOwnProperty(l)&&!k[l]){k[l]=true;this.history.push(l)}return this}});Ext.require=g(b,"require");Ext.syncRequire=g(b,"syncRequire");Ext.exclude=g(b,"exclude");Ext.onReady=function(m,l,k){b.onReady(m,l,true,k)};c.registerPreprocessor("loader",function(x,m,w,v){var t=this,r=[],s=a.getName(x),n,l,q,p,u,o,k;for(n=0,q=e.length;n<q;n++){o=e[n];if(m.hasOwnProperty(o)){k=m[o];if(typeof k=="string"){r.push(k)}else{if(k instanceof Array){for(l=0,p=k.length;l<p;l++){u=k[l];if(typeof u=="string"){r.push(u)}}}else{if(typeof k!="function"){for(l in k){if(k.hasOwnProperty(l)){u=k[l];if(typeof u=="string"){r.push(u)}}}}}}}}if(r.length===0){return}b.require(r,function(){for(n=0,q=e.length;n<q;n++){o=e[n];if(m.hasOwnProperty(o)){k=m[o];if(typeof k=="string"){m[o]=a.get(k)}else{if(k instanceof Array){for(l=0,p=k.length;l<p;l++){u=k[l];if(typeof u=="string"){m[o][l]=a.get(u)}}}else{if(typeof k!="function"){for(var y in k){if(k.hasOwnProperty(y)){u=k[y];if(typeof u=="string"){m[o][y]=a.get(u)}}}}}}}}v.call(t,x,m,w)});return false},true,"after","className");a.registerPostprocessor("uses",function(n,l,r){var k=h(r.uses),m=[],o,q,p;for(o=0,q=k.length;o<q;o++){p=k[o];if(typeof p=="string"){m.push(p)}}b.addOptionalRequires(m)});a.onCreated(function(k){this.historyPush(k)},b)})(Ext.ClassManager,Ext.Class,Ext.Function.flexSetter,Ext.Function.alias,Ext.Function.pass,Ext.Array.from,Ext.Array.erase,Ext.Array.include);Ext.setVersion("touch","2.0.0.rc");Ext.apply(Ext,{version:Ext.getVersion("touch"),idSeed:0,repaint:function(){var a=Ext.getBody().createChild({cls:Ext.baseCSSPrefix+"mask "+Ext.baseCSSPrefix+"mask-transparent"});setTimeout(function(){a.destroy()},0)},id:function(a,b){if(a&&a.id){return a.id}a=Ext.getDom(a)||{};if(a===document||a===document.documentElement){a.id="ext-application"}else{if(a===document.body){a.id="ext-viewport"}else{if(a===window){a.id="ext-window"}}}a.id=a.id||((b||"ext-element-")+(++Ext.idSeed));return a.id},getBody:function(){if(!Ext.documentBodyElement){if(!document.body){throw new Error("[Ext.getBody] document.body does not exist at this point")}Ext.documentBodyElement=Ext.get(document.body)}return Ext.documentBodyElement},getHead:function(){if(!Ext.documentHeadElement){Ext.documentHeadElement=Ext.get(document.head||document.getElementsByTagName("head")[0])}return Ext.documentHeadElement},getDoc:function(){if(!Ext.documentElement){Ext.documentElement=Ext.get(document)}return Ext.documentElement},getCmp:function(a){return Ext.ComponentMgr.get(a)},copyTo:function(a,b,d,c){if(typeof d=="string"){d=d.split(/[,;\s]/)}Ext.each(d,function(e){if(c||b.hasOwnProperty(e)){a[e]=b[e]}},this);return a},destroy:function(){var a=arguments,d=a.length,b,c;for(b=0;b<d;b++){c=a[b];if(c){if(Ext.isArray(c)){this.destroy.apply(this,c)}else{if(Ext.isFunction(c.destroy)){c.destroy()}}}}},getDom:function(a){if(!a||!document){return null}return a.dom?a.dom:(typeof a=="string"?document.getElementById(a):a)},removeNode:function(a){if(a&&a.parentNode&&a.tagName!="BODY"){Ext.get(a).clearListeners();a.parentNode.removeChild(a);delete Ext.cache[a.id]}},defaultSetupConfig:{eventPublishers:{dom:{xclass:"Ext.event.publisher.Dom"},touchGesture:{xclass:"Ext.event.publisher.TouchGesture",recognizers:{drag:{xclass:"Ext.event.recognizer.Drag"},tap:{xclass:"Ext.event.recognizer.Tap"},doubleTap:{xclass:"Ext.event.recognizer.DoubleTap"},longPress:{xclass:"Ext.event.recognizer.LongPress"},swipe:{xclass:"Ext.event.recognizer.HorizontalSwipe"},pinch:{xclass:"Ext.event.recognizer.Pinch"},rotate:{xclass:"Ext.event.recognizer.Rotate"}}},componentDelegation:{xclass:"Ext.event.publisher.ComponentDelegation"},componentPaint:{xclass:"Ext.event.publisher.ComponentPaint"},componentSize:{xclass:"Ext.event.publisher.ComponentSize"}},animator:{xclass:"Ext.fx.Runner"},viewport:{xclass:"Ext.viewport.Viewport"}},isSetup:false,setupListeners:[],onSetup:function(b,a){if(Ext.isSetup){b.call(a)}else{Ext.setupListeners.push({fn:b,scope:a})}},setup:function(s){var i=Ext.defaultSetupConfig,b=s.onReady||Ext.emptyFn,a=s.scope,c=Ext.Array.from(s.requires),n=Ext.onReady,o=s.icon,f,p,g;Ext.setup=function(){throw new Error("Ext.setup has already been called before")};delete s.requires;delete s.onReady;delete s.scope;Ext.require(["Ext.event.Dispatcher","Ext.MessageBox"]);f=function(){var v=Ext.setupListeners,w=v.length,u,x;delete Ext.setupListeners;Ext.isSetup=true;for(u=0;u<w;u++){x=v[u];x.fn.call(x.scope)}Ext.onReady=n;Ext.onReady(b,a)};Ext.onReady=function(w,v){var u=b;b=function(){u();Ext.onReady(w,v)}};s=Ext.merge({},i,s);Ext.onDocumentReady(function(){Ext.factoryConfig(s,function(u){Ext.event.Dispatcher.getInstance().setPublishers(u.eventPublishers);if(u.logger){Ext.Logger=u.logger}if(u.animator){Ext.Animator=u.animator}if(u.viewport){Ext.Viewport=p=u.viewport;if(!a){a=p}Ext.require(c,function(){Ext.Viewport.on("ready",f,null,{single:true})})}else{Ext.require(c,f)}})});if(!document.body){var k=s.phoneIcon,m=s.tabletIcon,l=s.tabletStartupScreen,d=s.statusBarStyle,q=s.phoneStartupScreen,j=Ext.os.is.iPad;document.write('<meta id="extViewportMeta" name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no">');document.write('<meta name="apple-mobile-web-app-capable" content="yes">');document.write('<meta name="apple-touch-fullscreen" content="yes">');if(Ext.isString(d)){document.write('<meta name="apple-mobile-web-app-status-bar-style" content="'+d+'">')}if(l&&j){document.write('<link rel="apple-touch-startup-image" href="'+l+'">')}if(q&&!j){document.write('<link rel="apple-touch-startup-image" href="'+q+'">')}if(Ext.isString(o)||Ext.isString(k)||Ext.isString(m)){o={"57":k||m||o,"72":m||k||o,"114":k||m||o}}g=(s.glossOnIcon===false)?"-precomposed":"";if(o){var t=o["72"],e=o["57"],h=o["114"],r='<link rel="apple-touch-icon';if(j&&t){document.write(r+g+'" sizes="72x72" href="'+t+'">')}else{if(!j){if(e){document.write(r+g+'" href="'+e+'">')}if(h){document.write(r+g+'" sizes="114x114" href="'+h+'">')}}}}}},application:function(a){var c,b;if(!a){a={}}Ext.Loader.setPath(a.name,a.appFolder||"app");a.requires=Ext.Array.from(a.requires);a.requires.push("Ext.app.Application");c=a.onReady;b=a.scope;a.onReady=function(){new Ext.app.Application(a);if(c){c.call(b)}};Ext.setup(a)},factoryConfig:function(a,l){var g=Ext.isSimpleObject(a);if(g&&a.xclass){var f=a.xclass;delete a.xclass;Ext.require(f,function(){Ext.factoryConfig(a,function(i){l(Ext.create(f,i))})});return}var d=Ext.isArray(a),m=[],k,j,c,e;if(g||d){if(g){for(k in a){if(a.hasOwnProperty(k)){j=a[k];if(Ext.isSimpleObject(j)||Ext.isArray(j)){m.push(k)}}}}else{for(c=0,e=a.length;c<e;c++){j=a[c];if(Ext.isSimpleObject(j)||Ext.isArray(j)){m.push(c)}}}c=0;e=m.length;if(e===0){l(a);return}function h(i){a[k]=i;c++;b()}function b(){if(c>=e){l(a);return}k=m[c];j=a[k];Ext.factoryConfig(j,h)}b();return}l(a)},factory:function(b,e,a,f){var d=Ext.ClassManager,c;if(!b||b.isInstance){if(a&&a!==b){a.destroy()}return b}if(f){if(typeof b=="string"){return d.instantiateByAlias(f+"."+b)}else{if(Ext.isObject(b)&&"type" in b){return d.instantiateByAlias(f+"."+b.type,b)}}}else{if(typeof b=="string"){return Ext.getCmp(b)}}if(b===true){if(a){return a}else{return d.instantiate(e)}}if("xtype" in b){c=d.instantiateByAlias("widget."+b.xtype,b)}if("xclass" in b){c=d.instantiate(b.xclass,b)}if(c){if(a){a.destroy()}return c}if(a){return a.setConfig(b)}return d.instantiate(e,b)},deprecateClassMember:function(b,c,a,d){return this.deprecateProperty(b.prototype,c,a,d)},deprecateClassMembers:function(b,c){var d=b.prototype,e,a;for(e in c){if(c.hasOwnProperty(e)){a=c[e];this.deprecateProperty(d,e,a)}}},deprecateProperty:function(b,c,a,d){if(!d){d="'"+c+"' is deprecated"}if(a){d+=", please use '"+a+"' instead"}if(a){Ext.Object.defineProperty(b,c,{get:function(){return this[a]},set:function(e){this[a]=e},configurable:true})}},deprecatePropertyValue:function(b,a,d,c){Ext.Object.defineProperty(b,a,{get:function(){return d},configurable:true})},deprecateMethod:function(b,a,d,c){b[a]=function(){if(d){return d.apply(this,arguments)}}},deprecateClassMethod:function(a,b,h,d){if(typeof b!="string"){var g,f;for(g in b){if(b.hasOwnProperty(g)){f=b[g];Ext.deprecateClassMethod(a,g,f)}}return}var c=typeof h=="string",e;if(!d){d="'"+b+"()' is deprecated, please use '"+(c?h:h.name)+"()' instead"}if(c){e=function(){return this[h].apply(this,arguments)}}else{e=function(){return h.apply(this,arguments)}}if(b in a.prototype){Ext.Object.defineProperty(a.prototype,b,{value:null,writable:true,configurable:true})}a.addMember(b,e)},isReady:false,readyListeners:[],triggerReady:function(){var b=Ext.readyListeners,a,c,d;if(!Ext.isReady){Ext.isReady=true;for(a=0,c=b.length;a<c;a++){d=b[a];d.fn.call(d.scope)}delete Ext.readyListeners}},onDocumentReady:function(c,b){if(Ext.isReady){c.call(b)}else{var a=Ext.triggerReady;Ext.readyListeners.push({fn:c,scope:b});if(Ext.browser.is.PhoneGap&&!Ext.os.is.Desktop){if(!Ext.readyListenerAttached){Ext.readyListenerAttached=true;document.addEventListener("deviceready",a,false)}}else{if(document.readyState.match(/interactive|complete|loaded/)!==null){a()}else{if(!Ext.readyListenerAttached){Ext.readyListenerAttached=true;window.addEventListener("DOMContentLoaded",a,false)}}}}},callback:function(d,c,b,a){if(Ext.isFunction(d)){b=b||[];c=c||window;if(a){Ext.defer(d,a,c,b)}else{d.apply(c,b)}}}});Ext.define("Ext.env.Browser",{requires:["Ext.Version"],statics:{browserNames:{ie:"IE",firefox:"Firefox",safari:"Safari",chrome:"Chrome",opera:"Opera",dolfin:"Dolfin",webosbrowser:"webOSBrowser",chromeMobile:"ChromeMobile",silk:"Silk",other:"Other"},engineNames:{webkit:"WebKit",gecko:"Gecko",presto:"Presto",trident:"Trident",other:"Other"},enginePrefixes:{webkit:"AppleWebKit/",gecko:"Gecko/",presto:"Presto/",trident:"Trident/"},browserPrefixes:{ie:"MSIE ",firefox:"Firefox/",chrome:"Chrome/",safari:"Version/",opera:"Opera/",dolfin:"Dolfin/",webosbrowser:"wOSBrowser/",chromeMobile:"CrMo/",silk:"Silk/"}},styleDashPrefixes:{WebKit:"-webkit-",Gecko:"-moz-",Trident:"-ms-",Presto:"-o-",Other:""},stylePrefixes:{WebKit:"Webkit",Gecko:"Moz",Trident:"ms",Presto:"O",Other:""},propertyPrefixes:{WebKit:"webkit",Gecko:"moz",Trident:"ms",Presto:"o",Other:""},is:Ext.emptyFn,name:null,version:null,engineName:null,engineVersion:null,setFlag:function(a,b){if(typeof b=="undefined"){b=true}this.is[a]=b;this.is[a.toLowerCase()]=b;return this},constructor:function(o){this.userAgent=o;e=this.is=function(i){return e[i]===true};var k=this.statics(),c=o.match(new RegExp("((?:"+Ext.Object.getValues(k.browserPrefixes).join(")|(?:")+"))([\\w\\._]+)")),b=o.match(new RegExp("((?:"+Ext.Object.getValues(k.enginePrefixes).join(")|(?:")+"))([\\w\\._]+)")),g=k.browserNames,j=g.other,f=k.engineNames,n=f.other,m="",l="",h=false,e,d,a;if(c){j=g[Ext.Object.getKey(k.browserPrefixes,c[1])];m=new Ext.Version(c[2])}if(b){n=f[Ext.Object.getKey(k.enginePrefixes,b[1])];l=new Ext.Version(b[2])}Ext.apply(this,{engineName:n,engineVersion:l,name:j,version:m});this.setFlag(j);if(m){this.setFlag(j+(m.getMajor()||""));this.setFlag(j+m.getShortVersion())}for(d in g){if(g.hasOwnProperty(d)){a=g[d];this.setFlag(a,j===a)}}this.setFlag(a);if(l){this.setFlag(n+(l.getMajor()||""));this.setFlag(n+l.getShortVersion())}for(d in f){if(f.hasOwnProperty(d)){a=f[d];this.setFlag(a,n===a)}}this.setFlag("Standalone",!!navigator.standalone);if(typeof window.PhoneGap!="undefined"){h=true;this.setFlag("PhoneGap")}else{if(!!window.isNK){h=true;this.setFlag("Sencha")}}this.setFlag("WebView",h);this.isStrict=document.compatMode=="CSS1Compat";this.isSecure=/^https/i.test(window.location.protocol);return this},getStyleDashPrefix:function(){return this.styleDashPrefixes[this.engineName]},getStylePrefix:function(){return this.stylePrefixes[this.engineName]},getVendorProperyName:function(a){var b=this.propertyPrefixes[this.engineName];if(b.length>0){return b+Ext.String.capitalize(a)}return a}},function(){var a=Ext.browser=new this(Ext.global.navigator.userAgent)});Ext.define("Ext.env.OS",{requires:["Ext.Version"],statics:{names:{ios:"iOS",android:"Android",webos:"webOS",blackberry:"BlackBerry",rimTablet:"RIMTablet",mac:"MacOS",win:"Windows",linux:"Linux",bada:"Bada",other:"Other"},prefixes:{ios:"i(?:Pad|Phone|Pod)(?:.*)CPU(?: iPhone)? OS ",android:"(Android |HTC_|Silk/)",blackberry:"BlackBerry(?:.*)Version/",rimTablet:"RIM Tablet OS ",webos:"(?:webOS|hpwOS)/",bada:"Bada/"}},is:Ext.emptyFn,name:null,version:null,setFlag:function(a,b){if(typeof b=="undefined"){b=true}this.is[a]=b;this.is[a.toLowerCase()]=b;return this},constructor:function(m,b){var k=this.statics(),j=k.names,c=k.prefixes,a,h="",d,g,f,l,e;e=this.is=function(i){return this.is[i]===true};for(d in c){if(c.hasOwnProperty(d)){g=c[d];f=m.match(new RegExp("(?:"+g+")([^\\s;]+)"));if(f){a=j[d];if(f[1]&&(f[1]=="HTC_"||f[1]=="Silk/")){h=new Ext.Version("2.3")}else{h=new Ext.Version(f[f.length-1])}break}}}if(!a){a=j[(m.toLowerCase().match(/mac|win|linux/)||["other"])[0]];h=new Ext.Version("")}this.name=a;this.version=h;if(b){this.setFlag(b)}this.setFlag(a);if(h){this.setFlag(a+(h.getMajor()||""));this.setFlag(a+h.getShortVersion())}for(d in j){if(j.hasOwnProperty(d)){l=j[d];if(!e.hasOwnProperty(a)){this.setFlag(l,(a===l))}}}return this}},function(){var a=Ext.global.navigator,e=a.userAgent,b,g,d;Ext.os=b=new this(e,a.platform);g=b.name;var c=window.location.search.match(/deviceType=(Tablet|Phone)/),f=window.deviceType;if(c&&c[1]){d=c[1]}else{if(f==="iPhone"){d="Phone"}else{if(f==="iPad"){d="Tablet"}else{if(!b.is.Android&&!b.is.iOS&&/Windows|Linux|MacOS/.test(g)){d="Desktop"}else{if(b.is.iPad||b.is.Android3||(b.is.Android4&&e.search(/mobile/i)==-1)){d="Tablet"}else{d="Phone"}}}}}b.setFlag(d,true);b.deviceType=d});Ext.define("Ext.env.Feature",{requires:["Ext.env.Browser","Ext.env.OS"],constructor:function(){this.testElements={};this.has=function(a){return !!this.has[a]};return this},getTestElement:function(a,b){if(a===undefined){a="div"}else{if(typeof a!=="string"){return a}}if(b){return document.createElement(a)}if(!this.testElements[a]){this.testElements[a]=document.createElement(a)}return this.testElements[a]},isStyleSupported:function(c,b){var d=this.getTestElement(b).style,a=Ext.String.capitalize(c);if(typeof d[c]!=="undefined"||typeof d[Ext.browser.getStylePrefix(c)+a]!=="undefined"){return true}return false},isEventSupported:function(c,a){if(a===undefined){a=window}var e=this.getTestElement(a),b="on"+c.toLowerCase(),d=(b in e);if(!d){if(e.setAttribute&&e.removeAttribute){e.setAttribute(b,"");d=typeof e[b]==="function";if(typeof e[b]!=="undefined"){e[b]=undefined}e.removeAttribute(b)}}return d},getSupportedPropertyName:function(b,a){var c=Ext.browser.getVendorProperyName(a);if(c in b){return c}else{if(a in b){return a}}return null},registerTest:Ext.Function.flexSetter(function(a,b){this.has[a]=b.call(this);return this})},function(){Ext.feature=new this;var a=Ext.feature.has;Ext.feature.registerTest({Canvas:function(){var b=this.getTestElement("canvas");return !!(b&&b.getContext&&b.getContext("2d"))},Svg:function(){var b=document;return !!(b.createElementNS&&!!b.createElementNS("http://www.w3.org/2000/svg","svg").createSVGRect)},Vml:function(){var c=this.getTestElement(),b=false;c.innerHTML="<!--[if vml]><br><![endif]-->";b=(c.childNodes.length===1);c.innerHTML="";return b},Touch:function(){return this.isEventSupported("touchstart")&&!(Ext.os&&Ext.os.name.match(/Windows|MacOSX|Linux/))},Orientation:function(){return("orientation" in window)&&this.isEventSupported("orientationchange")},OrientationChange:function(){return this.isEventSupported("orientationchange")},DeviceMotion:function(){return this.isEventSupported("devicemotion")},Geolocation:function(){return"geolocation" in window.navigator},SqlDatabase:function(){return"openDatabase" in window},WebSockets:function(){return"WebSocket" in window},Range:function(){return !!document.createRange},CreateContextualFragment:function(){var b=!!document.createRange?document.createRange():false;return b&&!!b.createContextualFragment},History:function(){return("history" in window&&"pushState" in window.history)},CssTransforms:function(){return this.isStyleSupported("transform")},Css3dTransforms:function(){return this.has("CssTransforms")&&this.isStyleSupported("perspective")&&!Ext.os.is.Android2},CssAnimations:function(){return this.isStyleSupported("animationName")},CssTransitions:function(){return this.isStyleSupported("transitionProperty")},Audio:function(){return !!this.getTestElement("audio").canPlayType},Video:function(){return !!this.getTestElement("video").canPlayType},ClassList:function(){return"classList" in this.getTestElement()}})});Ext.define("Ext.dom.Query",{select:function(h,b){var g=[],d,f,e,c,a;b=b||document;if(typeof b=="string"){b=document.getElementById(b)}h=h.split(",");for(f=0,c=h.length;f<c;f++){if(typeof h[f]=="string"){if(h[f][0]=="@"){d=b.getAttributeNode(h[f].substring(1));g.push(d)}else{d=b.querySelectorAll(h[f]);for(e=0,a=d.length;e<a;e++){g.push(d[e])}}}}return g},selectNode:function(b,a){return this.select(b,a)[0]},is:function(a,b){if(typeof a=="string"){a=document.getElementById(a)}return this.select(b).indexOf(a)!==-1},isXml:function(a){var b=(a?a.ownerDocument||a:0).documentElement;return b?b.nodeName!=="HTML":false}},function(){Ext.ns("Ext.core");Ext.core.DomQuery=Ext.DomQuery=new this();Ext.query=Ext.Function.alias(Ext.DomQuery,"select")});Ext.define("Ext.dom.Helper",{emptyTags:/^(?:br|frame|hr|img|input|link|meta|range|spacer|wbr|area|param|col)$/i,confRe:/tag|children|cn|html|tpl|tplData$/i,endRe:/end/i,attribXlat:{cls:"class",htmlFor:"for"},closeTags:{},decamelizeName:function(){var c=/([a-z])([A-Z])/g,b={};function a(d,f,e){return f+"-"+e.toLowerCase()}return function(d){return b[d]||(b[d]=d.replace(c,a))}}(),generateMarkup:function(d,c){var g=this,b,h,a,e,f;if(typeof d=="string"){c.push(d)}else{if(Ext.isArray(d)){for(e=0;e<d.length;e++){if(d[e]){g.generateMarkup(d[e],c)}}}else{a=d.tag||"div";c.push("<",a);for(b in d){if(d.hasOwnProperty(b)){h=d[b];if(!g.confRe.test(b)){if(typeof h=="object"){c.push(" ",b,'="');g.generateStyles(h,c).push('"')}else{c.push(" ",g.attribXlat[b]||b,'="',h,'"')}}}}if(g.emptyTags.test(a)){c.push("/>")}else{c.push(">");if((h=d.tpl)){h.applyOut(d.tplData,c)}if((h=d.html)){c.push(h)}if((h=d.cn||d.children)){g.generateMarkup(h,c)}f=g.closeTags;c.push(f[a]||(f[a]="</"+a+">"))}}}return c},generateStyles:function(e,c){var b=c||[],d;for(d in e){if(e.hasOwnProperty(d)){b.push(this.decamelizeName(d),":",e[d],";")}}return c||b.join("")},markup:function(a){if(typeof a=="string"){return a}var b=this.generateMarkup(a,[]);return b.join("")},applyStyles:function(a,b){Ext.fly(a).applyStyles(b)},createContextualFragment:function(c){var f=document.createElement("div"),a=document.createDocumentFragment(),b=0,d,e;f.innerHTML=c;e=f.childNodes;d=e.length;for(;b<d;b++){a.appendChild(e[b].cloneNode(true))}return a},insertHtml:function(d,a,e){var h,f,i,c,b,g;d=d.toLowerCase();if(Ext.isTextNode(a)){if(d=="afterbegin"){d="beforebegin"}else{if(d=="beforeend"){d="afterend"}}}b=d=="beforebegin";g=d=="afterbegin";f=Ext.feature.has.CreateContextualFragment?a.ownerDocument.createRange():undefined;h="setStart"+(this.endRe.test(d)?"After":"Before");if(b||d=="afterend"){if(f){f[h](a);i=f.createContextualFragment(e)}else{i=this.createContextualFragment(e)}a.parentNode.insertBefore(i,b?a:a.nextSibling);return a[(b?"previous":"next")+"Sibling"]}else{c=(g?"first":"last")+"Child";if(a.firstChild){if(f){f[h](a[c]);i=f.createContextualFragment(e)}else{i=this.createContextualFragment(e)}if(g){a.insertBefore(i,a.firstChild)}else{a.appendChild(i)}}else{a.innerHTML=e}return a[c]}},insertBefore:function(a,c,b){return this.doInsert(a,c,b,"beforebegin")},insertAfter:function(a,c,b){return this.doInsert(a,c,b,"afterend")},insertFirst:function(a,c,b){return this.doInsert(a,c,b,"afterbegin")},append:function(a,c,b){return this.doInsert(a,c,b,"beforeend")},overwrite:function(a,c,b){a=Ext.getDom(a);a.innerHTML=this.markup(c);return b?Ext.get(a.firstChild):a.firstChild},doInsert:function(b,d,c,e){var a=this.insertHtml(e,Ext.getDom(b),this.markup(d));return c?Ext.get(a,true):a},createTemplate:function(b){var a=this.markup(b);return new Ext.Template(a)}},function(){Ext.ns("Ext.core");Ext.core.DomHelper=Ext.DomHelper=new this});Ext.define("Ext.mixin.Identifiable",{statics:{uniqueIds:{}},isIdentifiable:true,mixinId:"identifiable",idCleanRegex:/\.|[^\w\-]/g,defaultIdPrefix:"ext-",defaultIdSeparator:"-",getOptimizedId:function(){return this.id},getUniqueId:function(){var f=this.id,b,d,e,a,c;if(!f){b=this.self.prototype;d=this.defaultIdSeparator;a=Ext.mixin.Identifiable.uniqueIds;if(!b.hasOwnProperty("identifiablePrefix")){e=this.xtype;if(e){c=this.defaultIdPrefix+e+d}else{c=b.$className.replace(this.idCleanRegex,d).toLowerCase()+d}b.identifiablePrefix=c}c=this.identifiablePrefix;if(!a.hasOwnProperty(c)){a[c]=0}f=this.id=c+(++a[c])}this.getUniqueId=this.getOptimizedId;return f},setId:function(a){this.id=a},getId:function(){var a=this.id;if(!a){a=this.getUniqueId()}this.getId=this.getOptimizedId;return a}});Ext.define("Ext.dom.Element",{alternateClassName:"Ext.Element",mixins:["Ext.mixin.Identifiable"],requires:["Ext.dom.Query","Ext.dom.Helper"],observableType:"element",xtype:"element",statics:{CREATE_ATTRIBUTES:{style:"style",className:"className",cls:"cls",classList:"classList",text:"text",hidden:"hidden",html:"html",children:"children"},create:function(c,b){var f=this.CREATE_ATTRIBUTES,e,h,k,j,a,d,g;if(!c){c={}}if(c.isElement){return c.dom}else{if("nodeType" in c){return c}}if(typeof c=="string"){return document.createTextNode(c)}k=c.tag;if(!k){k="div"}e=document.createElement(k);h=e.style;for(a in c){if(a!="tag"&&c.hasOwnProperty(a)){j=c[a];switch(a){case f.style:if(typeof j=="string"){e.setAttribute(a,j)}else{for(d in j){if(j.hasOwnProperty(d)){h[d]=j[d]}}}break;case f.className:case f.cls:e.className=j;break;case f.classList:e.className=j.join(" ");break;case f.text:e.textContent=j;break;case f.hidden:if(j){e.style.display="none"}break;case f.html:e.innerHTML=j;break;case f.children:for(d=0,g=j.length;d<g;d++){e.appendChild(this.create(j[d],true))}break;default:e.setAttribute(a,j)}}}if(b){return e}else{return this.get(e)}},documentElement:null,cache:{},get:function(c){var b=this.cache,a,d,e;if(!c){return null}if(typeof c=="string"){if(b.hasOwnProperty(c)){return b[c]}if(!(d=document.getElementById(c))){return null}b[c]=a=new this(d);return a}if("tagName" in c){e=c.id;if(b.hasOwnProperty(e)){return b[e]}a=new this(c);b[a.getId()]=a;return a}if(c.isElement){return c}if(c.isComposite){return c}if(Ext.isArray(c)){return this.select(c)}if(c===document){if(!this.documentElement){this.documentElement=new this(document.documentElement);this.documentElement.setId("ext-application")}return this.documentElement}return null},data:function(c,b,e){var a=Ext.cache,f,d;c=this.get(c);if(!c){return null}f=c.id;d=a[f].data;if(!d){a[f].data=d={}}if(arguments.length==2){return d[b]}else{return(d[b]=e)}}},isElement:true,constructor:function(a){if(typeof a=="string"){a=document.getElementById(a)}if(!a){throw new Error("Invalid domNode reference or an id of an existing domNode: "+a)}this.dom=a;this.getUniqueId()},attach:function(a){this.dom=a;this.id=a.id;return this},getUniqueId:function(){var b=this.id,a;if(!b){a=this.dom;if(a.id.length>0){this.id=b=a.id}else{a.id=b=this.mixins.identifiable.getUniqueId.call(this)}this.self.cache[b]=this}return b},setId:function(c){var a=this.id,b=this.self.cache;if(a){delete b[a]}this.dom.id=c;this.id=c;b[c]=this;return this},setHtml:function(a){this.dom.innerHTML=a},getHtml:function(){return this.dom.innerHTML},setText:function(a){this.dom.textContent=a},redraw:function(){var b=this.dom,a=b.style;a.display="none";b.offsetHeight;a.display=""},isPainted:function(){return Boolean(this.dom.offsetParent)},set:function(a,b){var e=this.dom,c,d;for(c in a){if(a.hasOwnProperty(c)){d=a[c];if(c=="style"){this.applyStyles(d)}else{if(c=="cls"){e.className=d}else{if(b!==false){if(d===undefined){e.removeAttribute(c)}else{e.setAttribute(c,d)}}else{e[c]=d}}}}}return this},is:function(a){return Ext.DomQuery.is(this.dom,a)},getValue:function(b){var a=this.dom.value;return b?parseInt(a,10):a},getAttribute:function(a,b){var c=this.dom;return c.getAttributeNS(b,a)||c.getAttribute(b+":"+a)||c.getAttribute(a)||c[a]},destroy:function(){this.isDestroyed=true;var a=Ext.Element.cache,b=this.dom;if(b&&b.parentNode&&b.tagName!="BODY"){b.parentNode.removeChild(b)}delete a[this.id];delete this.dom}},function(a){Ext.elements=Ext.cache=a.cache;this.addStatics({Fly:new Ext.Class({extend:a,constructor:function(b){this.dom=b}}),_flyweights:{},fly:function(d,b){var e=null,c=a._flyweights;b=b||"_global";d=Ext.getDom(d);if(d){e=c[b]||(c[b]=new a.Fly());e.dom=d;e.isSynchronized=false}return e}});Ext.get=function(b){return a.get.call(a,b)};Ext.fly=function(){return a.fly.apply(a,arguments)};Ext.ClassManager.onCreated(function(){a.mixin("observable",Ext.mixin.Observable)},null,"Ext.mixin.Observable")});Ext.dom.Element.addStatics({unitRe:/\d+(px|em|%|en|ex|pt|in|cm|mm|pc)$/i,camelRe:/(-[a-z])/gi,cssRe:/([a-z0-9-]+)\s*:\s*([^;\s]+(?:\s*[^;\s]+)*);?/gi,opacityRe:/alpha\(opacity=(.*)\)/i,propertyCache:{},defaultUnit:"px",borders:{l:"border-left-width",r:"border-right-width",t:"border-top-width",b:"border-bottom-width"},paddings:{l:"padding-left",r:"padding-right",t:"padding-top",b:"padding-bottom"},margins:{l:"margin-left",r:"margin-right",t:"margin-top",b:"margin-bottom"},addUnits:function(b,a){if(Ext.isNumber(b)){return b+(a||this.defaultUnit||"px")}if(b===""||b=="auto"||b===undefined||b===null){return b||""}if(!this.unitRe.test(b)){return b||""}return b},isAncestor:function(b,d){var a=false;b=Ext.getDom(b);d=Ext.getDom(d);if(b&&d){if(b.contains){return b.contains(d)}else{if(b.compareDocumentPosition){return !!(b.compareDocumentPosition(d)&16)}else{while((d=d.parentNode)){a=d==b||a}}}}return a},parseBox:function(b){if(typeof b!="string"){b=b.toString()}var c=b.split(" "),a=c.length;if(a==1){c[1]=c[2]=c[3]=c[0]}else{if(a==2){c[2]=c[0];c[3]=c[1]}else{if(a==3){c[3]=c[1]}}}return{top:parseFloat(c[0])||0,right:parseFloat(c[1])||0,bottom:parseFloat(c[2])||0,left:parseFloat(c[3])||0}},unitizeBox:function(f,e){var d=this.addUnits,c=this.parseBox(f);return d(c.top,e)+" "+d(c.right,e)+" "+d(c.bottom,e)+" "+d(c.left,e)},camelReplaceFn:function(b,c){return c.charAt(1).toUpperCase()},normalize:function(a){return this.propertyCache[a]||(this.propertyCache[a]=a.replace(this.camelRe,this.camelReplaceFn))},fromPoint:function(a,b){return Ext.get(document.elementFromPoint(a,b))},parseStyles:function(c){var a={},b=this.cssRe,d;if(c){b.lastIndex=0;while((d=b.exec(c))){a[d[1]]=d[2]}}return a}});Ext.dom.Element.addMembers({appendChild:function(a){this.dom.appendChild(Ext.getDom(a));return this},removeChild:function(a){this.dom.removeChild(Ext.getDom(a));return this},append:function(){this.appendChild.apply(this,arguments)},appendTo:function(a){Ext.getDom(a).appendChild(this.dom);return this},insertBefore:function(a){a=Ext.getDom(a);a.parentNode.insertBefore(this.dom,a);return this},insertAfter:function(a){a=Ext.getDom(a);a.parentNode.insertBefore(this.dom,a.nextSibling);return this},insertFirst:function(b){var a=Ext.getDom(b),d=this.dom,c=d.firstChild;if(!c){d.appendChild(a)}else{d.insertBefore(a,c)}return this},insertSibling:function(e,c,d){var f=this,b,a=(c||"before").toLowerCase()=="after",g;if(Ext.isArray(e)){g=f;Ext.each(e,function(h){b=Ext.fly(g,"_internal").insertSibling(h,c,d);if(a){g=b}});return b}e=e||{};if(e.nodeType||e.dom){b=f.dom.parentNode.insertBefore(Ext.getDom(e),a?f.dom.nextSibling:f.dom);if(!d){b=Ext.get(b)}}else{if(a&&!f.dom.nextSibling){b=Ext.core.DomHelper.append(f.dom.parentNode,e,!d)}else{b=Ext.core.DomHelper[a?"insertAfter":"insertBefore"](f.dom,e,!d)}}return b},replace:function(a){a=Ext.get(a);this.insertBefore(a);a.remove();return this},replaceWith:function(a){var b=this;if(a.nodeType||a.dom||typeof a=="string"){a=Ext.get(a);b.dom.parentNode.insertBefore(a,b.dom)}else{a=Ext.core.DomHelper.insertBefore(b.dom,a)}delete Ext.cache[b.id];Ext.removeNode(b.dom);b.id=Ext.id(b.dom=a);Ext.dom.Element.addToCache(b.isFlyweight?new Ext.dom.Element(b.dom):b);return b},createChild:function(b,a,c){b=b||{tag:"div"};if(a){return Ext.core.DomHelper.insertBefore(a,b,c!==true)}else{return Ext.core.DomHelper[!this.dom.firstChild?"insertFirst":"append"](this.dom,b,c!==true)}},wrap:function(b,c){var e=this.dom,f=this.self.create(b,c),d=(c)?f:f.dom,a=e.parentNode;if(a){a.insertBefore(d,e)}d.appendChild(e);return f},wrapAllChildren:function(a){var d=this.dom,b=d.childNodes,e=this.self.create(a),c=e.dom;while(b.length>0){c.appendChild(d.firstChild)}d.appendChild(c);return e},unwrapAllChildren:function(){var c=this.dom,b=c.childNodes,a=c.parentNode;if(a){while(b.length>0){a.insertBefore(c,c.firstChild)}this.destroy()}},unwrap:function(){var c=this.dom,a=c.parentNode,b;if(a){b=a.parentNode;b.insertBefore(c,a);b.removeChild(a)}else{b=document.createDocumentFragment();b.appendChild(c)}return this},insertHtml:function(b,c,a){var d=Ext.core.DomHelper.insertHtml(b,this.dom,c);return a?Ext.get(d):d}});Ext.dom.Element.override({getX:function(a){return this.getXY(a)[0]},getY:function(a){return this.getXY(a)[1]},getXY:function(){var a=window.webkitConvertPointFromNodeToPage;if(a){return function(){var b=a(this.dom,new WebKitPoint(0,0));return[b.x,b.y]}}else{return function(){var c=this.dom.getBoundingClientRect(),b=Math.round;return[b(c.left+window.pageXOffset),b(c.top+window.pageYOffset)]}}}(),getOffsetsTo:function(a){var c=this.getXY(),b=Ext.fly(a,"_internal").getXY();return[c[0]-b[0],c[1]-b[1]]},setX:function(a){return this.setXY([a,this.getY()])},setY:function(a){return this.setXY([this.getX(),a])},setXY:function(d){var b=this;if(arguments.length>1){d=[d,arguments[1]]}var c=b.translatePoints(d),a=b.dom.style;for(d in c){if(!c.hasOwnProperty(d)){continue}if(!isNaN(c[d])){a[d]=c[d]+"px"}}return b},getLeft:function(){return parseInt(this.getStyle("left"),10)||0},getRight:function(){return parseInt(this.getStyle("right"),10)||0},getTop:function(){return parseInt(this.getStyle("top"),10)||0},getBottom:function(){return parseInt(this.getStyle("bottom"),10)||0},translatePoints:function(a,g){g=isNaN(a[1])?g:a[1];a=isNaN(a[0])?a:a[0];var d=this,e=d.isStyle("position","relative"),f=d.getXY(),b=parseInt(d.getStyle("left"),10),c=parseInt(d.getStyle("top"),10);b=!isNaN(b)?b:(e?0:d.dom.offsetLeft);c=!isNaN(c)?c:(e?0:d.dom.offsetTop);return{left:(a-f[0]+b),top:(g-f[1]+c)}},setBox:function(d){var c=this,b=d.width,a=d.height,f=d.top,e=d.left;if(e!==undefined){c.setLeft(e)}if(f!==undefined){c.setTop(f)}if(b!==undefined){c.setWidth(b)}if(a!==undefined){c.setHeight(a)}return this},getBox:function(g,j){var h=this,e=h.dom,c=e.offsetWidth,k=e.offsetHeight,n,f,d,a,m,i;if(!j){n=h.getXY()}else{if(g){n=[0,0]}else{n=[parseInt(h.getStyle("left"),10)||0,parseInt(h.getStyle("top"),10)||0]}}if(!g){f={x:n[0],y:n[1],0:n[0],1:n[1],width:c,height:k}}else{d=h.getBorderWidth.call(h,"l")+h.getPadding.call(h,"l");a=h.getBorderWidth.call(h,"r")+h.getPadding.call(h,"r");m=h.getBorderWidth.call(h,"t")+h.getPadding.call(h,"t");i=h.getBorderWidth.call(h,"b")+h.getPadding.call(h,"b");f={x:n[0]+d,y:n[1]+m,0:n[0]+d,1:n[1]+m,width:c-(d+a),height:k-(m+i)}}f.left=f.x;f.top=f.y;f.right=f.x+f.width;f.bottom=f.y+f.height;return f},getPageBox:function(e){var g=this,c=g.dom,j=c.offsetWidth,f=c.offsetHeight,m=g.getXY(),k=m[1],a=m[0]+j,i=m[1]+f,d=m[0];if(!c){return new Ext.util.Region()}if(e){return new Ext.util.Region(k,a,i,d)}else{return{left:d,top:k,width:j,height:f,right:a,bottom:i}}}});Ext.dom.Element.addMembers({WIDTH:"width",HEIGHT:"height",MIN_WIDTH:"min-width",MIN_HEIGHT:"min-height",MAX_WIDTH:"max-width",MAX_HEIGHT:"max-height",TOP:"top",RIGHT:"right",BOTTOM:"bottom",LEFT:"left",VISIBILITY:1,DISPLAY:2,OFFSETS:3,SEPARATOR:"-",trimRe:/^\s+|\s+$/g,wordsRe:/\w/g,spacesRe:/\s+/,styleSplitRe:/\s*(?::|;)\s*/,transparentRe:/^(?:transparent|(?:rgba[(](?:\s*\d+\s*[,]){3}\s*0\s*[)]))$/i,classNameSplitRegex:/[\s]+/,borders:{t:"border-top-width",r:"border-right-width",b:"border-bottom-width",l:"border-left-width"},paddings:{t:"padding-top",r:"padding-right",b:"padding-bottom",l:"padding-left"},margins:{t:"margin-top",r:"margin-right",b:"margin-bottom",l:"margin-left"},defaultUnit:"px",isSynchronized:false,synchronize:function(){var g=this.dom,a={},d=g.className,f,c,e,b;if(d.length>0){f=g.className.split(this.classNameSplitRegex);for(c=0,e=f.length;c<e;c++){b=f[c];a[b]=true}}else{f=[]}this.classList=f;this.hasClassMap=a;this.isSynchronized=true;return this},addCls:function(j,g,k){if(!j){return this}if(!this.isSynchronized){this.synchronize()}var e=this.dom,c=this.hasClassMap,d=this.classList,a=this.SEPARATOR,f,h,b;g=g?g+a:"";k=k?a+k:"";if(typeof j=="string"){j=j.split(this.spacesRe)}for(f=0,h=j.length;f<h;f++){b=g+j[f]+k;if(!c[b]){c[b]=true;d.push(b)}}e.className=d.join(" ");return this},removeCls:function(j,g,k){if(!j){return this}if(!this.isSynchronized){this.synchronize()}if(!k){k=""}var e=this.dom,c=this.hasClassMap,d=this.classList,a=this.SEPARATOR,f,h,b;g=g?g+a:"";k=k?a+k:"";if(typeof j=="string"){j=j.split(this.spacesRe)}for(f=0,h=j.length;f<h;f++){b=g+j[f]+k;if(c[b]){delete c[b];Ext.Array.remove(d,b)}}e.className=d.join(" ");return this},replaceCls:function(b,a,c,d){return this.removeCls(b,c,d).addCls(a,c,d)},hasCls:function(a){if(!this.isSynchronized){this.synchronize()}return this.hasClassMap.hasOwnProperty(a)},toggleCls:function(a){return this.hasCls(a)?this.removeCls(a):this.addCls(a)},setWidth:function(a){return this.setLengthValue(this.WIDTH,a)},setHeight:function(a){return this.setLengthValue(this.HEIGHT,a)},setSize:function(b,a){if(Ext.isObject(b)){a=b.height;b=b.width}this.setWidth(b);this.setHeight(a);return this},setMinWidth:function(a){return this.setLengthValue(this.MIN_WIDTH,a)},setMinHeight:function(a){return this.setLengthValue(this.MIN_HEIGHT,a)},setMaxWidth:function(a){return this.setLengthValue(this.MAX_WIDTH,a)},setMaxHeight:function(a){return this.setLengthValue(this.MAX_HEIGHT,a)},setTop:function(a){return this.setLengthValue(this.TOP,a)},setRight:function(a){return this.setLengthValue(this.RIGHT,a)},setBottom:function(a){return this.setLengthValue(this.BOTTOM,a)},setLeft:function(a){return this.setLengthValue(this.LEFT,a)},setMargin:function(b){var a=this.dom.style;if(b||b===0){b=this.self.unitizeBox((b===true)?5:b);a.setProperty("margin",b,"important")}else{a.removeProperty("margin-top");a.removeProperty("margin-right");a.removeProperty("margin-bottom");a.removeProperty("margin-left")}},setPadding:function(b){var a=this.dom.style;if(b||b===0){b=this.self.unitizeBox((b===true)?5:b);a.setProperty("padding",b,"important")}else{a.removeProperty("padding-top");a.removeProperty("padding-right");a.removeProperty("padding-bottom");a.removeProperty("padding-left")}},setBorder:function(a){var b=this.dom.style;if(a||a===0){a=this.self.unitizeBox((a===true)?1:a);b.setProperty("border-width",a,"important")}else{b.removeProperty("border-top-width");b.removeProperty("border-right-width");b.removeProperty("border-bottom-width");b.removeProperty("border-left-width")}},setLengthValue:function(a,c){var b=this.dom.style;if(c===null){b.removeProperty(a);return this}if(typeof c=="number"){c=c+"px"}b.setProperty(a,c,"important");return this},setVisible:function(b){var a=this.getVisibilityMode(),c=b?"removeCls":"addCls";switch(a){case this.VISIBILITY:this.removeCls(["x-hidden-display","x-hidden-offsets"]);this[c]("x-hidden-visibility");break;case this.DISPLAY:this.removeCls(["x-hidden-visibility","x-hidden-offsets"]);this[c]("x-hidden-display");break;case this.OFFSETS:this.removeCls(["x-hidden-visibility","x-hidden-display"]);this[c]("x-hidden-offsets");break}return this},getVisibilityMode:function(){var b=this.dom,a=Ext.dom.Element.data(b,"visibilityMode");if(a===undefined){Ext.dom.Element.data(b,"visibilityMode",a=this.DISPLAY)}return a},setVisibilityMode:function(a){this.self.data(this.dom,"visibilityMode",a);return this},show:function(){var a=this.dom;if(a){a.style.removeProperty("display")}},hide:function(){var c=this.dom,b=c.style,a=Ext.os.is.iOS5;if(b.getPropertyValue("display")!=="none"){if(a){b.setProperty("display","none","important");c.offsetHeight;b.removeProperty("display");c.offsetHeight}b.setProperty("display","none","important")}},setVisibility:function(a){var b=this.dom.style;if(a){b.removeProperty("visibility")}else{b.setProperty("visibility","hidden","important")}},styleHooks:{},addStyles:function(h,g){var b=0,f=h.match(this.wordsRe),e=0,a=f.length,d,c;for(;e<a;e++){d=f[e];c=d&&parseInt(this.getStyle(g[d]),10);if(c){b+=Math.abs(c)}}return b},isStyle:function(a,b){return this.getStyle(a)==b},getStyle:function(f){var c=this,e=c.dom,d=c.styleHooks[f],b,a;if(e==document){return null}if(!d){c.styleHooks[f]=d={name:this.self.normalize(f)}}if(d.get){return d.get(e,c)}b=window.getComputedStyle(e,"");a=(b&&b[d.name]);return a},setStyle:function(a,h){var f=this,d=f.dom,i=f.styleHooks,b=d.style,e=Ext.valueFrom,c,g;if(typeof a=="string"){g=i[a];if(!g){i[a]=g={name:Ext.dom.Element.normalize(a)}}h=e(h,"");if(g.set){g.set(d,h,f)}else{b[g.name]=h}}else{for(c in a){if(a.hasOwnProperty(c)){g=i[c];if(!g){i[c]=g={name:Ext.dom.Element.normalize(c)}}h=e(a[c],"");if(g.set){g.set(d,h,f)}else{b[g.name]=h}}}}return f},getHeight:function(b){var c=this.dom,a=b?(c.clientHeight-this.getPadding("tb")):c.offsetHeight;return a>0?a:0},getWidth:function(a){var c=this.dom,b=a?(c.clientWidth-this.getPadding("lr")):c.offsetWidth;return b>0?b:0},getBorderWidth:function(a){return this.addStyles(a,this.borders)},getPadding:function(a){return this.addStyles(a,this.paddings)},applyStyles:function(d){if(d){var e=this.dom,c,b,a;if(typeof d=="function"){d=d.call()}c=typeof d;if(c=="string"){d=Ext.util.Format.trim(d).split(this.styleSplitRe);for(b=0,a=d.length;b<a;){e.style[Ext.dom.Element.normalize(d[b++])]=d[b++]}}else{if(c=="object"){this.setStyle(d)}}}},getSize:function(b){var a=this.dom;return{width:Math.max(0,b?(a.clientWidth-this.getPadding("lr")):a.offsetWidth),height:Math.max(0,b?(a.clientHeight-this.getPadding("tb")):a.offsetHeight)}},repaint:function(){var a=this.dom;this.addCls(Ext.baseCSSPrefix+"repaint");setTimeout(function(){Ext.fly(a).removeCls(Ext.baseCSSPrefix+"repaint")},1);return this},getMargin:function(b){var c=this,d={t:"top",l:"left",r:"right",b:"bottom"},e={},a;if(!b){for(a in c.margins){e[d[a]]=parseFloat(c.getStyle(c.margins[a]))||0}return e}else{return c.addStyles.call(c,b,c.margins)}}});Ext.dom.Element.addMembers({getParent:function(){return Ext.get(this.dom.parentNode)},getFirstChild:function(){return Ext.get(this.dom.firstElementChild)},contains:function(a){if(!a){return false}var b=Ext.getDom(a);return(b===this.dom)||this.self.isAncestor(this.dom,b)},findParent:function(h,g,c){var e=this.dom,a=document.body,f=0,d;g=g||50;if(isNaN(g)){d=Ext.getDom(g);g=Number.MAX_VALUE}while(e&&e.nodeType==1&&f<g&&e!=a&&e!=d){if(Ext.DomQuery.is(e,h)){return c?Ext.get(e):e}f++;e=e.parentNode}return null},findParentNode:function(d,c,a){var b=Ext.fly(this.dom.parentNode,"_internal");return b?b.findParent(d,c,a):null},up:function(b,a){return this.findParentNode(b,a,true)},select:function(a,b){return Ext.dom.Element.select(a,this.dom,b)},query:function(a){return Ext.DomQuery.select(a,this.dom)},down:function(a,b){var c=Ext.DomQuery.selectNode(a,this.dom);return b?c:Ext.get(c)},child:function(a,b){var d,c=this,e;e=Ext.get(c).id;e=e.replace(/[\.:]/g,"\\$0");d=Ext.DomQuery.selectNode("#"+e+" > "+a,c.dom);return b?d:Ext.get(d)},parent:function(a,b){return this.matchNode("parentNode","parentNode",a,b)},next:function(a,b){return this.matchNode("nextSibling","nextSibling",a,b)},prev:function(a,b){return this.matchNode("previousSibling","previousSibling",a,b)},first:function(a,b){return this.matchNode("nextSibling","firstChild",a,b)},last:function(a,b){return this.matchNode("previousSibling","lastChild",a,b)},matchNode:function(b,e,a,c){if(!this.dom){return null}var d=this.dom[e];while(d){if(d.nodeType==1&&(!a||Ext.DomQuery.is(d,a))){return !c?Ext.get(d):d}d=d[b]}return null},isAncestor:function(a){return this.self.isAncestor.call(this.self,this.dom,a)}});Ext.define("Ext.dom.CompositeElementLite",{alternateClassName:["Ext.CompositeElementLite","Ext.CompositeElement"],requires:["Ext.dom.Element"],statics:{importElementMethods:function(){}},constructor:function(b,a){this.elements=[];this.add(b,a);this.el=new Ext.dom.Element.Fly()},isComposite:true,getElement:function(a){return this.el.attach(a)},transformElement:function(a){return Ext.getDom(a)},getCount:function(){return this.elements.length},add:function(c,a){var e=this.elements,b,d;if(!c){return this}if(typeof c=="string"){c=Ext.dom.Element.selectorFunction(c,a)}else{if(c.isComposite){c=c.elements}else{if(!Ext.isIterable(c)){c=[c]}}}for(b=0,d=c.length;b<d;++b){e.push(this.transformElement(c[b]))}return this},invoke:function(d,a){var f=this.elements,e=f.length,c,b;for(b=0;b<e;b++){c=f[b];if(c){Ext.dom.Element.prototype[d].apply(this.getElement(c),a)}}return this},item:function(b){var c=this.elements[b],a=null;if(c){a=this.getElement(c)}return a},addListener:function(b,h,g,f){var d=this.elements,a=d.length,c,j;for(c=0;c<a;c++){j=d[c];if(j){Ext.EventManager.on(j,b,h,g||j,f)}}return this},each:function(f,d){var g=this,c=g.elements,a=c.length,b,h;for(b=0;b<a;b++){h=c[b];if(h){h=this.getElement(h);if(f.call(d||h,h,g,b)===false){break}}}return g},fill:function(a){var b=this;b.elements=[];b.add(a);return b},filter:function(a){var b=[],d=this,c=Ext.isFunction(a)?a:function(e){return e.is(a)};d.each(function(g,e,f){if(c(g,f)!==false){b[b.length]=d.transformElement(g)}});d.elements=b;return d},indexOf:function(a){return Ext.Array.indexOf(this.elements,this.transformElement(a))},replaceElement:function(e,c,a){var b=!isNaN(e)?e:this.indexOf(e),f;if(b>-1){c=Ext.getDom(c);if(a){f=this.elements[b];f.parentNode.insertBefore(c,f);Ext.removeNode(f)}Ext.Array.splice(this.elements,b,1,c)}return this},clear:function(){this.elements=[]},addElements:function(c,a){if(!c){return this}if(typeof c=="string"){c=Ext.dom.Element.selectorFunction(c,a)}var b=this.elements;Ext.each(c,function(d){b.push(Ext.get(d))});return this},first:function(){return this.item(0)},last:function(){return this.item(this.getCount()-1)},contains:function(a){return this.indexOf(a)!=-1},removeElement:function(c,e){var b=this,d=this.elements,a;Ext.each(c,function(f){if((a=(d[f]||d[f=b.indexOf(f)]))){if(e){if(a.dom){a.remove()}else{Ext.removeNode(a)}}Ext.Array.erase(d,f,1)}});return this}},function(){var a=Ext.dom.Element,d=a.prototype,c=this.prototype,b;for(b in d){if(typeof d[b]=="function"){(function(e){c[e]=c[e]||function(){return this.invoke(e,arguments)}}).call(c,b)}}c.on=c.addListener;if(Ext.DomQuery){a.selectorFunction=Ext.DomQuery.select}a.select=function(e,f){var g;if(typeof e=="string"){g=a.selectorFunction(e,f)}else{if(e.length!==undefined){g=e}else{}}return new Ext.CompositeElementLite(g)};Ext.select=function(){return a.select.apply(a,arguments)}});Ext.define("Ext.ComponentManager",{alternateClassName:"Ext.ComponentMgr",singleton:true,constructor:function(){var a={};this.all={map:a,getArray:function(){var b=[],c;for(c in a){b.push(a[c])}return b}};this.map=a},register:function(a){this.map[a.getId()]=a},unregister:function(a){delete this.map[a.getId()]},isRegistered:function(a){return this.map[a]!==undefined},get:function(a){return this.map[a]},create:function(a,c){if(a.isComponent){return a}else{if(Ext.isString(a)){return Ext.createByAlias("widget."+a)}else{var b=a.xtype||c;return Ext.createByAlias("widget."+b,a)}}},registerType:Ext.emptyFn});Ext.define("Ext.ComponentQuery",{singleton:true,uses:["Ext.ComponentManager"]},function(){var g=this,j=["var r = [],","i = 0,","it = items,","l = it.length,","c;","for (; i < l; i++) {","c = it[i];","if (c.{0}) {","r.push(c);","}","}","return r;"].join(""),e=function(o,n){return n.method.apply(this,[o].concat(n.args))},a=function(p,t){var n=[],q=0,s=p.length,r,o=t!==">";for(;q<s;q++){r=p[q];if(r.getRefItems){n=n.concat(r.getRefItems(o))}}return n},f=function(o){var n=[],p=0,r=o.length,q;for(;p<r;p++){q=o[p];while(!!(q=(q.ownerCt||q.floatParent))){n.push(q)}}return n},l=function(o,t,s){if(t==="*"){return o.slice()}else{var n=[],p=0,r=o.length,q;for(;p<r;p++){q=o[p];if(q.isXType(t,s)){n.push(q)}}return n}},i=function(o,r){var t=Ext.Array,n=[],p=0,s=o.length,q;for(;p<s;p++){q=o[p];if(q.el?q.el.hasCls(r):t.contains(q.initCls(),r)){n.push(q)}}return n},m=function(r,u,o,t){var w=[],q=0,n=r.length,v,s,p;for(;q<n;q++){v=r[q];s=Ext.Class.getConfigNameMap(u).get;if(v[s]){p=v[s]();if(!t?!!p:(String(p)===t)){w.push(v)}}else{if(v.config&&v.config[u]){if(!t?!!v.config[u]:(String(v.config[u])===t)){w.push(v)}}else{if(!t?!!v[u]:(String(v[u])===t)){w.push(v)}}}}return w},d=function(o,s){var n=[],p=0,r=o.length,q;for(;p<r;p++){q=o[p];if(q.getId()===s||q.getItemId()===s){n.push(q)}}return n},k=function(n,o,p){return g.pseudos[o](n,p)},h=/^(\s?([>\^])\s?|\s|$)/,c=/^(#)?([\w\-]+|\*)(?:\((true|false)\))?/,b=[{re:/^\.([\w\-]+)(?:\((true|false)\))?/,method:l},{re:/^(?:[\[](?:@)?([\w\-]+)\s?(?:(=|.=)\s?['"]?(.*?)["']?)?[\]])/,method:m},{re:/^#([\w\-]+)/,method:d},{re:/^\:([\w\-]+)(?:\(((?:\{[^\}]+\})|(?:(?!\{)[^\s>\/]*?(?!\})))\))?/,method:k},{re:/^(?:\{([^\}]+)\})/,method:j}];g.Query=Ext.extend(Object,{constructor:function(n){n=n||{};Ext.apply(this,n)},execute:function(o){var q=this.operations,r=0,s=q.length,p,n;if(!o){n=Ext.ComponentManager.all.getArray()}else{if(Ext.isArray(o)){n=o}}for(;r<s;r++){p=q[r];if(p.mode==="^"){n=f(n||[o])}else{if(p.mode){n=a(n||[o],p.mode)}else{n=e(n||a([o]),p)}}if(r===s-1){return n}}return[]},is:function(p){var o=this.operations,s=Ext.isArray(p)?p:[p],n=s.length,t=o[o.length-1],r,q;s=e(s,t);if(s.length===n){if(o.length>1){for(q=0,r=s.length;q<r;q++){if(Ext.Array.indexOf(this.execute(),s[q])===-1){return false}}}return true}return false}});Ext.apply(this,{cache:{},pseudos:{not:function(t,n){var u=Ext.ComponentQuery,r=0,s=t.length,q=[],p=-1,o;for(;r<s;++r){o=t[r];if(!u.is(o,n)){q[++p]=o}}return q}},query:function(o,v){var w=o.split(","),n=w.length,p=0,q=[],x=[],u={},s,r,t;for(;p<n;p++){o=Ext.String.trim(w[p]);s=this.parse(o);q=q.concat(s.execute(v))}if(n>1){r=q.length;for(p=0;p<r;p++){t=q[p];if(!u[t.id]){x.push(t);u[t.id]=true}}q=x}return q},is:function(o,n){if(!n){return true}var p=this.cache[n];if(!p){this.cache[n]=p=this.parse(n)}return p.is(o)},parse:function(q){var o=[],p=b.length,u,r,v,w,x,s,t,n;while(q&&u!==q){u=q;r=q.match(c);if(r){v=r[1];if(v==="#"){o.push({method:d,args:[Ext.String.trim(r[2])]})}else{if(v==="."){o.push({method:i,args:[Ext.String.trim(r[2])]})}else{o.push({method:l,args:[Ext.String.trim(r[2]),Boolean(r[3])]})}}q=q.replace(r[0],"")}while(!(w=q.match(h))){for(s=0;q&&s<p;s++){t=b[s];x=q.match(t.re);n=t.method;if(x){o.push({method:Ext.isString(t.method)?Ext.functionFactory("items",Ext.String.format.apply(Ext.String,[n].concat(x.slice(1)))):t.method,args:x.slice(1)});q=q.replace(x[0],"");break}}}if(w[1]){o.push({mode:w[2]||w[1]});q=q.replace(w[0],"")}}return new g.Query({operations:o})}})});Ext.define("Ext.XTemplateParser",{constructor:function(a){Ext.apply(this,a)},doTpl:Ext.emptyFn,parse:function(n){var o=this,l=n.length,c={elseif:"elif"},j=o.topRe,b=o.actionsRe,k,p,r,f,q,g,a,e,d,h,i;o.level=0;o.stack=p=[];for(k=0;k<l;k=h){j.lastIndex=k;f=j.exec(n);if(!f){o.doText(n.substring(k,l));break}d=f.index;h=j.lastIndex;if(k<d){o.doText(n.substring(k,d))}if(f[1]){h=n.indexOf("%}",d+2);o.doEval(n.substring(d+2,h));h+=2}else{if(f[2]){h=n.indexOf("]}",d+2);o.doExpr(n.substring(d+2,h));h+=2}else{if(f[3]){o.doTag(f[3])}else{if(f[4]){i=null;while((e=b.exec(f[4]))!==null){r=e[2]||e[3];if(r){r=Ext.String.htmlDecode(r);q=e[1];q=c[q]||q;i=i||{};g=i[q];if(typeof g=="string"){i[q]=[g,r]}else{if(g){i[q].push(r)}else{i[q]=r}}}}if(!i){if(o.elseRe.test(f[4])){o.doElse()}else{if(o.defaultRe.test(f[4])){o.doDefault()}else{o.doTpl();p.push({type:"tpl"})}}}else{if(i["if"]){o.doIf(i["if"],i);p.push({type:"if"})}else{if(i["switch"]){o.doSwitch(i["switch"],i);p.push({type:"switch"})}else{if(i["case"]){o.doCase(i["case"],i)}else{if(i.elif){o.doElseIf(i.elif,i)}else{if(i["for"]){++o.level;o.doFor(i["for"],i);p.push({type:"for",actions:i})}else{if(i.exec){o.doExec(i.exec,i);p.push({type:"exec",actions:i})}}}}}}}}else{a=p.pop();o.doEnd(a.type,a.actions);if(a.type=="for"){--o.level}}}}}}},topRe:/(?:(\{\%)|(\{\[)|\{([^{}]*)\})|(?:<tpl([^>]*)\>)|(?:<\/tpl>)/g,actionsRe:/\s*(elif|elseif|if|for|exec|switch|case|eval)\s*\=\s*(?:(?:["]([^"]*)["])|(?:[']([^']*)[']))\s*/g,defaultRe:/^\s*default\s*$/,elseRe:/^\s*else\s*$/});Ext.define("Ext.app.Action",{config:{scope:null,application:null,controller:null,action:null,args:[],url:undefined,data:{},title:null,beforeFilters:[],currentFilterIndex:-1},constructor:function(a){this.initConfig(a);this.getUrl()},execute:function(){this.resume()},resume:function(){var b=this.getCurrentFilterIndex()+1,c=this.getBeforeFilters(),a=this.getController(),d=c[b];if(d){this.setCurrentFilterIndex(b);d.call(a,this)}else{a[this.getAction()].apply(a,this.getArgs())}},applyUrl:function(a){if(a===null||a===undefined){a=this.urlEncode()}return a},applyController:function(a){var c=this.getApplication(),b=c.getCurrentProfile();if(Ext.isString(a)){a=c.getController(a,b?b.getNamespace():null)}return a},urlEncode:function(){var a=this.getController(),b;if(a instanceof Ext.app.Controller){b=a.$className.split(".");a=b[b.length-1]}return a+"/"+this.getAction()}});Ext.define("Ext.app.Route",{config:{conditions:{},url:null,controller:null,action:null,initialized:false},constructor:function(a){this.initConfig(a)},recognize:function(b){if(!this.getInitialized()){this.initialize()}if(this.recognizes(b)){var c=this.matchesFor(b),a=b.match(this.matcherRegex);a.shift();return Ext.applyIf(c,{controller:this.getController(),action:this.getAction(),historyUrl:b,args:a})}},initialize:function(){this.paramMatchingRegex=new RegExp(/:([0-9A-Za-z\_]*)/g);this.paramsInMatchString=this.getUrl().match(this.paramMatchingRegex)||[];this.matcherRegex=this.createMatcherRegex(this.getUrl());this.setInitialized(true)},recognizes:function(a){return this.matcherRegex.test(a)},matchesFor:function(b){var f={},e=this.paramsInMatchString,a=b.match(this.matcherRegex),d=e.length,c;a.shift();for(c=0;c<d;c++){f[e[c].replace(":","")]=a[c]}return f},argsFor:function(c){var b=[],f=this.paramsInMatchString,a=c.match(this.matcherRegex),e=f.length,d;a.shift();for(d=0;d<e;d++){b.push(f[d].replace(":",""));params[f[d].replace(":","")]=a[d]}return params},urlFor:function(b){var a=this.getUrl();for(var c in b){a=a.replace(":"+c,b[c])}return a},createMatcherRegex:function(a){var e=this.paramsInMatchString,d=e.length,b,c,f;for(b=0;b<d;b++){c=this.getConditions()[e[b]];f=Ext.util.Format.format("({0})",c||"[%a-zA-Z0-9-\\_\\s,]+");a=a.replace(new RegExp(e[b]),f)}return new RegExp("^"+a+"$")}});Ext.define("Ext.app.Router",{requires:["Ext.app.Route"],config:{routes:[],defaults:{action:"index"}},constructor:function(a){this.initConfig(a)},connect:function(b,c){c=Ext.apply({url:b},c||{},this.getDefaults());var a=Ext.create("Ext.app.Route",c);this.getRoutes().push(a);return a},recognize:function(c){var b=this.getRoutes(),e=b.length,d,a;for(d=0;d<e;d++){a=b[d].recognize(c);if(a!==undefined){return a}}return undefined},draw:function(a){a.call(this,this)},clear:function(){this.setRoutes([])}},function(){});Ext.define("Ext.behavior.Behavior",{constructor:function(a){this.component=a;a.on("destroy","onComponentDestroy",this)},onComponentDestroy:Ext.emptyFn});Ext.define("Ext.data.JsonP",{alternateClassName:"Ext.util.JSONP",singleton:true,statics:{requestCount:0,requests:{}},timeout:30000,disableCaching:true,disableCachingParam:"_dc",callbackKey:"callback",request:function(m){m=Ext.apply({},m);var i=this,d=Ext.isDefined(m.disableCaching)?m.disableCaching:i.disableCaching,g=m.disableCachingParam||i.disableCachingParam,c=++i.statics().requestCount,k=m.callbackName||"callback"+c,h=m.callbackKey||i.callbackKey,l=Ext.isDefined(m.timeout)?m.timeout:i.timeout,e=Ext.apply({},m.params),b=m.url,a=Ext.isSandboxed?Ext.getUniqueGlobalNamespace():"Ext",f,j;e[h]=a+".data.JsonP."+k;if(d){e[g]=new Date().getTime()}j=i.createScript(b,e,m);i.statics().requests[c]=f={url:b,params:e,script:j,id:c,scope:m.scope,success:m.success,failure:m.failure,callback:m.callback,callbackKey:h,callbackName:k};if(l>0){f.timeout=setTimeout(Ext.bind(i.handleTimeout,i,[f]),l)}i.setupErrorHandling(f);i[k]=Ext.bind(i.handleResponse,i,[f],true);i.loadScript(f);return f},abort:function(b){var c=this.statics().requests,a;if(b){if(!b.id){b=c[b]}this.abort(b)}else{for(a in c){if(c.hasOwnProperty(a)){this.abort(c[a])}}}},setupErrorHandling:function(a){a.script.onerror=Ext.bind(this.handleError,this,[a])},handleAbort:function(a){a.errorType="abort";this.handleResponse(null,a)},handleError:function(a){a.errorType="error";this.handleResponse(null,a)},cleanupErrorHandling:function(a){a.script.onerror=null},handleTimeout:function(a){a.errorType="timeout";this.handleResponse(null,a)},handleResponse:function(a,b){var c=true;if(b.timeout){clearTimeout(b.timeout)}delete this[b.callbackName];delete this.statics()[b.id];this.cleanupErrorHandling(b);Ext.fly(b.script).destroy();if(b.errorType){c=false;Ext.callback(b.failure,b.scope,[b.errorType])}else{Ext.callback(b.success,b.scope,[a])}Ext.callback(b.callback,b.scope,[c,a,b.errorType])},createScript:function(c,d,b){var a=document.createElement("script");a.setAttribute("src",Ext.urlAppend(c,Ext.Object.toQueryString(d)));a.setAttribute("async",true);a.setAttribute("type","text/javascript");return a},loadScript:function(a){Ext.getHead().appendChild(a.script)}});Ext.define("Ext.data.Operation",{config:{synchronous:true,action:null,filters:null,sorters:null,grouper:null,start:null,limit:null,batch:null,callback:null,scope:null,resultSet:null,records:null,request:null,response:null,withCredentials:null,params:null,url:null,page:null,node:null,model:undefined,addRecords:false},started:false,running:false,complete:false,success:undefined,exception:false,error:undefined,constructor:function(a){this.initConfig(a)},applyModel:function(a){if(typeof a=="string"){a=Ext.data.ModelManager.getModel(a);if(!a){Ext.Logger.error("Model with name "+arguments[0]+" doesnt exist.")}}if(a&&!a.prototype.isModel&&Ext.isObject(a)){a=Ext.data.ModelManager.registerType(a.storeId||a.id||Ext.id(),a)}return a},getRecords:function(){var a=this.getResultSet();return this._records||(a?a.getRecords():[])},setStarted:function(){this.started=true;this.running=true},setCompleted:function(){this.complete=true;this.running=false},setSuccessful:function(){this.success=true},setException:function(a){this.exception=true;this.success=false;this.running=false;this.error=a},hasException:function(){return this.exception===true},getError:function(){return this.error},isStarted:function(){return this.started===true},isRunning:function(){return this.running===true},isComplete:function(){return this.complete===true},wasSuccessful:function(){return this.isComplete()&&this.success===true},allowWrite:function(){return this.getAction()!="read"},process:function(d,b,c,a){if(b.getSuccess()!==false){this.setResponse(a);this.setResultSet(b);this.setCompleted();this.setSuccessful()}else{return false}return this["process"+Ext.String.capitalize(d)].call(this,b,c,a)},processRead:function(d){var b=d.getRecords(),g=[],f=this.getModel(),e=b.length,c,a;for(c=0;c<e;c++){a=b[c];g.push(new f(a.data,a.id,a.node))}this.setRecords(g);return true},processCreate:function(d){var b=d.getRecords(),e=b.length,c,a,f;for(c=0;c<e;c++){f=b[c];a=this.findCurrentRecord(f.clientId);if(a){this.updateRecord(a,f)}}return true},processUpdate:function(e){var c=e.getRecords(),b=this.getRecords(),f=c.length,d,a,g;for(d=0;d<f;d++){g=c[d];a=b[d];if(a){this.updateRecord(a,g)}}return true},processDestroy:function(d){var b=d.getRecords(),e=b.length,c,a,f;for(c=0;c<e;c++){f=b[c];a=this.findCurrentRecord(f.id);if(a){a.setIsErased(true);a.notifyStores("afterErase",a)}}},findCurrentRecord:function(a){var c=this.getRecords(),e=c.length,d,b;for(d=0;d<e;d++){b=c[d];if(b.getId()===a){return b}}},updateRecord:function(b,d){var a=d.data,c=d.id;b.beginEdit();b.set(a);if(c!==null){b.setId(c)}b.endEdit(true);b.commit()}});Ext.define("Ext.data.Request",{config:{action:null,params:null,method:"GET",url:null,operation:null,proxy:null,disableCaching:false,headers:{},callbackKey:null,jsonP:null,jsonData:null,xmlData:null,withCredentials:null,callback:null,scope:null,timeout:30000,records:null,directFn:null,args:null},constructor:function(a){this.initConfig(a)}});Ext.define("Ext.data.ResultSet",{config:{loaded:true,count:null,total:null,success:false,records:null},constructor:function(a){this.initConfig(a)},applyCount:function(a){if(!a&&a!==0){return this.getRecords().length}return a},updateRecords:function(a){this.setCount(a.length)}});Ext.define("Ext.data.SortTypes",{singleton:true,stripTagsRE:/<\/?[^>]+>/gi,none:function(a){return a},asText:function(a){return String(a).replace(this.stripTagsRE,"")},asUCText:function(a){return String(a).toUpperCase().replace(this.stripTagsRE,"")},asUCString:function(a){return String(a).toUpperCase()},asDate:function(a){if(!a){return 0}if(Ext.isDate(a)){return a.getTime()}return Date.parse(String(a))},asFloat:function(a){a=parseFloat(String(a).replace(/,/g,""));return isNaN(a)?0:a},asInt:function(a){a=parseInt(String(a).replace(/,/g,""),10);return isNaN(a)?0:a}});Ext.define("Ext.data.Types",{singleton:true,requires:["Ext.data.SortTypes"],stripRe:/[\$,%]/g,dashesRe:/-/g,iso8601TestRe:/\d\dT\d\d/,iso8601SplitRe:/[- :T\.Z\+]/},function(){var b=this,a=Ext.data.SortTypes;Ext.apply(b,{AUTO:{convert:function(c){return c},sortType:a.none,type:"auto"},STRING:{convert:function(c){return(c===undefined||c===null)?(this.getAllowNull()?null:""):String(c)},sortType:a.asUCString,type:"string"},INT:{convert:function(c){return(c!==undefined&&c!==null&&c!=="")?((typeof c==="number")?parseInt(c,10):parseInt(String(c).replace(b.stripRe,""),10)):(this.getAllowNull()?null:0)},sortType:a.none,type:"int"},FLOAT:{convert:function(c){return(c!==undefined&&c!==null&&c!=="")?((typeof c==="number")?c:parseFloat(String(c).replace(b.stripRe,""),10)):(this.getAllowNull()?null:0)},sortType:a.none,type:"float"},BOOL:{convert:function(c){if((c===undefined||c===null||c==="")&&this.getAllowNull()){return null}return c===true||c==="true"||c==1},sortType:a.none,type:"bool"},DATE:{convert:function(e){var c=this.getDateFormat(),d;if(!e){return null}if(Ext.isDate(e)){return e}if(c){if(c=="timestamp"){return new Date(e*1000)}if(c=="time"){return new Date(parseInt(e,10))}return Ext.Date.parse(e,c)}d=new Date(Date.parse(e));if(isNaN(d)){if(b.iso8601TestRe.test(e)){d=e.split(b.iso8601SplitRe);d=new Date(d[0],d[1]-1,d[2],d[3],d[4],d[5])}if(isNaN(d)){d=new Date(Date.parse(e.replace(this.dashesRe,"/")))}}return isNaN(d)?null:d},sortType:a.asDate,type:"date"}});Ext.apply(b,{BOOLEAN:this.BOOL,INTEGER:this.INT,NUMBER:this.FLOAT})});Ext.define("Ext.data.Validations",{alternateClassName:"Ext.data.validations",singleton:true,config:{presenceMessage:"must be present",lengthMessage:"is the wrong length",formatMessage:"is the wrong format",inclusionMessage:"is not included in the list of acceptable values",exclusionMessage:"is not an acceptable value",emailMessage:"is not a valid email address"},constructor:function(a){this.initConfig(a)},getMessage:function(a){var b=this["get"+a[0].toUpperCase()+a.slice(1)+"Message"];if(b){return b.call(this)}return""},emailRe:/^([a-zA-Z0-9_\.\-])+\@(([a-zA-Z0-9\-])+\.)+([a-zA-Z0-9]{2,4})+$/,presence:function(a,b){if(b===undefined){b=a}return !!b||b===0},length:function(b,e){if(e===undefined||e===null){return false}var d=e.length,c=b.min,a=b.max;if((c&&d<c)||(a&&d>a)){return false}else{return true}},email:function(b,a){return Ext.data.validations.emailRe.test(a)},format:function(a,b){return !!(a.matcher&&a.matcher.test(b))},inclusion:function(a,b){return a.list&&Ext.Array.indexOf(a.list,b)!=-1},exclusion:function(a,b){return a.list&&Ext.Array.indexOf(a.list,b)==-1}});Ext.define("Ext.data.identifier.Simple",{alias:"data.identifier.simple",statics:{AUTO_ID:1},config:{prefix:"ext-record-"},constructor:function(a){this.initConfig(a)},generate:function(a){return this._prefix+this.self.AUTO_ID++}});Ext.define("Ext.data.identifier.Uuid",{extend:"Ext.data.identifier.Simple",alias:"data.identifier.uuid",config:{id:undefined,salt:null,timestamp:null,version:4},applyId:function(a){if(a===undefined){return Ext.data.identifier.Uuid.Global}return a},constructor:function(){var a=this;a.callParent(arguments);a.parts=[];a.init()},reconfigure:function(a){this.setConfig(a);this.init()},generate:function(){var c=this,e=c.parts,a=c.getVersion(),b=c.getSalt(),d=c.getTimestamp();e[0]=c.toHex(d.lo,8);e[1]=c.toHex(d.hi&65535,4);e[2]=c.toHex(((d.hi>>>16)&4095)|(a<<12),4);e[3]=c.toHex(128|((c.clockSeq>>>8)&63),2)+c.toHex(c.clockSeq&255,2);e[4]=c.toHex(b.hi,4)+c.toHex(b.lo,8);if(a==4){c.init()}else{++d.lo;if(d.lo>=c.twoPow32){d.lo=0;++d.hi}}return e.join("-").toLowerCase()},init:function(){var b=this,a=b.getSalt(),c=b.getTimestamp();if(b.getVersion()==4){b.clockSeq=b.rand(0,b.twoPow14-1);if(!a){a={};b.setSalt(a)}if(!c){c={};b.setTimestamp(c)}a.lo=b.rand(0,b.twoPow32-1);a.hi=b.rand(0,b.twoPow16-1);c.lo=b.rand(0,b.twoPow32-1);c.hi=b.rand(0,b.twoPow28-1)}else{b.setSalt(b.split(b.getSalt()));b.setTimestamp(b.split(b.getTimestamp()));b.getSalt().hi|=256}},twoPow14:Math.pow(2,14),twoPow16:Math.pow(2,16),twoPow28:Math.pow(2,28),twoPow32:Math.pow(2,32),toHex:function(c,b){var a=c.toString(16);if(a.length>b){a=a.substring(a.length-b)}else{if(a.length<b){a=Ext.String.leftPad(a,b,"0")}}return a},rand:function(c,b){var a=Math.random()*(b-c+1);return Math.floor(a)+c},split:function(b){if(typeof(b)=="number"){var a=Math.floor(b/this.twoPow32);return{lo:Math.floor(b-a*this.twoPow32),hi:a}}return b}},function(){this.Global=new this({id:"uuid"})});Ext.define("Ext.data.writer.Writer",{alias:"writer.base",alternateClassName:["Ext.data.DataWriter","Ext.data.Writer"],config:{writeAllFields:true,nameProperty:"name"},constructor:function(a){this.initConfig(a)},write:function(e){var c=e.getOperation(),b=c.getRecords()||[],a=b.length,d=0,f=[];for(;d<a;d++){f.push(this.getRecordData(b[d]))}return this.writeRecords(e,f)},writeDate:function(c,b){var a=c.dateFormat||"timestamp";switch(a){case"timestamp":return b.getTime()/1000;case"time":return b.getTime();default:return Ext.Date.format(b,a)}},getRecordData:function(f){var k=f.phantom===true,c=this.getWriteAllFields()||k,d=this.getNameProperty(),g=f.getFields(),e={},i,a,h,l,j,b;if(c){g.each(function(m){b=m.config;if(b.persist){a=b[d]||b.name;j=f.get(b.name);if(b.type.type=="date"){j=this.writeDate(b,j)}e[a]=j}},this)}else{i=f.getChanges();for(l in i){if(i.hasOwnProperty(l)){h=g.get(l);b=h.config;if(b.persist){a=b[d]||h.name;j=i[l];if(b.type.type=="date"){j=this.writeDate(b,j)}e[a]=j}}}if(!k){e[f.idProperty]=f.getId()}}return e}});Ext.define("Ext.data.writer.Xml",{extend:"Ext.data.writer.Writer",alternateClassName:"Ext.data.XmlWriter",alias:"writer.xml",config:{documentRoot:"xmlData",defaultDocumentRoot:"xmlData",header:"",record:"record"},writeRecords:function(a,b){var g=this,d=[],c=0,f=b.length,h=g.getDocumentRoot(),e=g.getRecord(),l=b.length!==1,k,j;d.push(g.getHeader()||"");if(!h&&l){h=g.getDefaultDocumentRoot()}if(h){d.push("<",h,">")}for(;c<f;++c){k=b[c];d.push("<",e,">");for(j in k){if(k.hasOwnProperty(j)){d.push("<",j,">",k[j],"</",j,">")}}d.push("</",e,">")}if(h){d.push("</",h,">")}a.setXmlData(d.join(""));return a}});Ext.define("Ext.direct.RemotingMethod",{config:{name:null,params:null,formHandler:null,len:null,ordered:true},constructor:function(a){this.initConfig(a)},applyParams:function(f){if(Ext.isNumber(f)){this.setLen(f)}else{if(Ext.isArray(f)){this.setOrdered(false);var d=f.length,b=[],c,e,a;for(c=0;c<d;c++){e=f[c];a=Ext.isObject(e)?e.name:e;b.push(a)}return b}}},getArgs:function(e,a,f){var b=[],c,d;if(this.getOrdered()){if(this.getLen()>0){if(a){for(c=0,d=a.length;c<d;c++){b.push(e[a[c]])}}else{if(f){b.push(e)}}}}else{b.push(e)}return b},getCallData:function(c){var e=this,f=null,a=e.getLen(),g=e.getParams(),h,d,b;if(e.getOrdered()){h=c[a];d=c[a+1];if(a!==0){f=c.slice(0,a)}}else{f=Ext.apply({},c[0]);h=c[1];d=c[2];for(b in f){if(f.hasOwnProperty(b)){if(!Ext.Array.contains(g,b)){delete f[b]}}}}return{data:f,callback:h,scope:d}}});Ext.define("Ext.direct.Transaction",{alias:"direct.transaction",alternateClassName:"Ext.Direct.Transaction",statics:{TRANSACTION_ID:0},config:{id:undefined,provider:null,retryCount:0,args:null,action:null,method:null,data:null,callback:null,form:null},constructor:function(a){this.initConfig(a)},applyId:function(a){if(a===undefined){a=++this.self.TRANSACTION_ID}return a},updateId:function(a){this.id=this.tid=a},getTid:function(){return this.tid},send:function(){this.getProvider().queueTransaction(this)},retry:function(){this.setRetryCount(this.getRetryCount()+1);this.send()}});Ext.define("Ext.dom.CompositeElement",{alternateClassName:"Ext.CompositeElement",extend:"Ext.dom.CompositeElementLite",getElement:function(a){return a},transformElement:function(a){return Ext.get(a)}},function(){Ext.dom.Element.select=function(a,d,b){var c;if(typeof a=="string"){c=Ext.dom.Element.selectorFunction(a,b)}else{if(a.length!==undefined){c=a}else{}}return(d===true)?new Ext.CompositeElement(c):new Ext.CompositeElementLite(c)}});Ext.define("Ext.event.Controller",{isFiring:false,listenerStack:null,constructor:function(a){this.firingListeners=[];this.firingArguments=[];this.setInfo(a);return this},setInfo:function(a){this.info=a},getInfo:function(){return this.info},setListenerStacks:function(a){this.listenerStacks=a},fire:function(h,e){var n=this.listenerStacks,m=this.firingListeners,d=this.firingArguments,k=m.push,g=n.length,j,l,c,o,a=false,b=false,f;m.length=0;if(e){if(e.order!=="after"){a=true}else{b=true}}if(g===1){j=n[0].listeners;l=j.before;c=j.current;o=j.after;if(l.length>0){k.apply(m,l)}if(a){k.call(m,e)}if(c.length>0){k.apply(m,c)}if(b){k.call(m,e)}if(o.length>0){k.apply(m,o)}}else{for(f=0;f<g;f++){l=n[f].listeners.before;if(l.length>0){k.apply(m,l)}}if(a){k.call(m,e)}for(f=0;f<g;f++){c=n[f].listeners.current;if(c.length>0){k.apply(m,c)}}if(b){k.call(m,e)}for(f=0;f<g;f++){o=n[f].listeners.after;if(o.length>0){k.apply(m,o)}}}if(m.length===0){return this}if(!h){h=[]}d.length=0;d.push.apply(d,h);d.push(null,this);this.doFire();return this},doFire:function(){var k=this.firingListeners,c=this.firingArguments,g=c.length-2,d,f,b,o,h,n,a,j,l,e,m;this.isPausing=false;this.isPaused=false;this.isStopped=false;this.isFiring=true;for(d=0,f=k.length;d<f;d++){b=k[d];o=b.options;h=b.fn;n=b.firingFn;a=b.boundFn;j=b.isLateBinding;l=b.scope;if(j&&a&&a!==l[h]){a=false;n=false}if(!a){if(j){a=l[h];if(!a){continue}}else{a=h}b.boundFn=a}if(!n){n=a;if(o.buffer){n=Ext.Function.createBuffered(n,o.buffer,l)}if(o.delay){n=Ext.Function.createDelayed(n,o.delay,l)}b.firingFn=n}c[g]=o;e=c;if(o.args){e=o.args.concat(e)}if(o.single===true){b.stack.remove(h,l,b.order)}m=n.apply(l,e);if(m===false){this.stop()}if(this.isStopped){break}if(this.isPausing){this.isPaused=true;k.splice(0,d+1);return}}this.isFiring=false;this.listenerStacks=null;k.length=0;c.length=0;this.connectingController=null},connect:function(a){this.connectingController=a},resume:function(){var a=this.connectingController;this.isPausing=false;if(this.isPaused&&this.firingListeners.length>0){this.isPaused=false;this.doFire()}if(a){a.resume()}return this},isInterrupted:function(){return this.isStopped||this.isPaused},stop:function(){var a=this.connectingController;this.isStopped=true;if(a){this.connectingController=null;a.stop()}this.isFiring=false;this.listenerStacks=null;return this},pause:function(){var a=this.connectingController;this.isPausing=true;if(a){a.pause()}return this}});Ext.define("Ext.event.Event",{alternateClassName:"Ext.EventObject",isStopped:false,set:function(a,b){if(arguments.length===1&&typeof a!="string"){var c=a;for(a in c){if(c.hasOwnProperty(a)){this[a]=c[a]}}}else{this[a]=c[a]}},stopEvent:function(){return this.stopPropagation()},stopPropagation:function(){this.isStopped=true;return this}});Ext.define("Ext.event.ListenerStack",{currentOrder:"current",length:0,constructor:function(){this.listeners={before:[],current:[],after:[]};this.lateBindingMap={};return this},add:function(h,j,k,e){var a=this.lateBindingMap,g=this.getAll(e),f=g.length,b,d,c;if(typeof h=="string"&&j.isIdentifiable){c=j.getId();b=a[c];if(b){if(b[h]){return false}else{b[h]=true}}else{a[c]=b={};b[h]=true}}else{if(f>0){while(f--){d=g[f];if(d.fn===h&&d.scope===j){d.options=k;return false}}}}d=this.create(h,j,k,e);if(k&&k.prepend){delete k.prepend;g.unshift(d)}else{g.push(d)}this.length++;return true},getAt:function(b,a){return this.getAll(a)[b]},getAll:function(a){if(!a){a=this.currentOrder}return this.listeners[a]},count:function(a){return this.getAll(a).length},create:function(d,c,b,a){return{stack:this,fn:d,firingFn:false,boundFn:false,isLateBinding:typeof d=="string",scope:c,options:b||{},order:a}},remove:function(h,j,e){var g=this.getAll(e),f=g.length,b=false,a=this.lateBindingMap,d,c;if(f>0){while(f--){d=g[f];if(d.fn===h&&d.scope===j){g.splice(f,1);b=true;this.length--;if(typeof h=="string"&&j.isIdentifiable){c=j.getId();if(a[c]&&a[c][h]){delete a[c][h]}}break}}}return b}});Ext.define("Ext.event.publisher.Publisher",{targetType:"",idSelectorRegex:/^#([\w\-]+)$/i,constructor:function(){var b=this.handledEvents,a,c,e,d;a=this.handledEventsMap={};for(c=0,e=b.length;c<e;c++){d=b[c];a[d]=true}this.subscribers={};return this},handles:function(a){var b=this.handledEventsMap;return !!b[a]||!!b["*"]||a==="*"},getHandledEvents:function(){return this.handledEvents},setDispatcher:function(a){this.dispatcher=a},subscribe:function(){return false},unsubscribe:function(){return false},unsubscribeAll:function(){delete this.subscribers;this.subscribers={};return this},notify:function(){return false},getTargetType:function(){return this.targetType},dispatch:function(c,a,b){this.dispatcher.doDispatchEvent(this.targetType,c,a,b)}});Ext.define("Ext.event.recognizer.Recognizer",{mixins:["Ext.mixin.Identifiable"],handledEvents:[],config:{onRecognized:Ext.emptyFn,onFailed:Ext.emptyFn,callbackScope:null},constructor:function(a){this.initConfig(a);return this},getHandledEvents:function(){return this.handledEvents},onStart:Ext.emptyFn,onEnd:Ext.emptyFn,fail:function(){this.getOnFailed().apply(this.getCallbackScope(),arguments);return false},fire:function(){this.getOnRecognized().apply(this.getCallbackScope(),arguments)}});Ext.define("Ext.event.recognizer.Touch",{extend:"Ext.event.recognizer.Recognizer",onTouchStart:Ext.emptyFn,onTouchMove:Ext.emptyFn,onTouchEnd:Ext.emptyFn});Ext.define("Ext.fx.State",{isAnimatable:{"background-color":true,"background-image":true,"background-position":true,"border-bottom-color":true,"border-bottom-width":true,"border-color":true,"border-left-color":true,"border-left-width":true,"border-right-color":true,"border-right-width":true,"border-spacing":true,"border-top-color":true,"border-top-width":true,"border-width":true,bottom:true,color:true,crop:true,"font-size":true,"font-weight":true,height:true,left:true,"letter-spacing":true,"line-height":true,"margin-bottom":true,"margin-left":true,"margin-right":true,"margin-top":true,"max-height":true,"max-width":true,"min-height":true,"min-width":true,opacity:true,"outline-color":true,"outline-offset":true,"outline-width":true,"padding-bottom":true,"padding-left":true,"padding-right":true,"padding-top":true,right:true,"text-indent":true,"text-shadow":true,top:true,"vertical-align":true,visibility:true,width:true,"word-spacing":true,"z-index":true,zoom:true,transform:true},constructor:function(a){this.data={};this.set(a)},setConfig:function(a){this.set(a);return this},setRaw:function(a){this.data=a;return this},clear:function(){return this.setRaw({})},setTransform:function(c,g){var f=this.data,a=Ext.isArray(g),b=f.transform,e,d;if(!b){b=f.transform={translateX:0,translateY:0,translateZ:0,scaleX:1,scaleY:1,scaleZ:1,rotate:0,rotateX:0,rotateY:0,rotateZ:0,skewX:0,skewY:0}}if(typeof c=="string"){switch(c){case"translate":if(a){e=g.length;if(e==0){break}b.translateX=g[0];if(e==1){break}b.translateY=g[1];if(e==2){break}b.translateZ=g[2]}else{b.translateX=g}break;case"rotate":if(a){e=g.length;if(e==0){break}b.rotateX=g[0];if(e==1){break}b.rotateY=g[1];if(e==2){break}b.rotateZ=g[2]}else{b.rotate=g}break;case"scale":if(a){e=g.length;if(e==0){break}b.scaleX=g[0];if(e==1){break}b.scaleY=g[1];if(e==2){break}b.scaleZ=g[2]}else{b.scaleX=g;b.scaleY=g}break;case"skew":if(a){e=g.length;if(e==0){break}b.skewX=g[0];if(e==1){break}b.skewY=g[1]}else{b.skewX=g}break;default:b[c]=g}}else{for(d in c){if(c.hasOwnProperty(d)){g=c[d];this.setTransform(d,g)}}}},set:function(a,d){var c=this.data,b;if(typeof a!="string"){for(b in a){d=a[b];if(b==="transform"){this.setTransform(d)}else{c[b]=d}}}else{if(a==="transform"){this.setTransform(d)}else{c[a]=d}}return this},unset:function(a){var b=this.data;if(b.hasOwnProperty(a)){delete b[a]}return this},getData:function(){return this.data}});Ext.define("Ext.fx.easing.Abstract",{config:{startTime:0,startValue:0},isEasing:true,isEnded:false,constructor:function(a){this.initConfig(a);return this},applyStartTime:function(a){if(!a){a=Ext.Date.now()}return a},updateStartTime:function(a){this.reset()},reset:function(){this.isEnded=false},getValue:Ext.emptyFn});Ext.define("Ext.fx.easing.Bounce",{extend:"Ext.fx.easing.Abstract",config:{springTension:0.3,acceleration:30,startVelocity:0},getValue:function(){var b=Ext.Date.now()-this.getStartTime(),c=(b/this.getAcceleration()),a=c*Math.pow(Math.E,-this.getSpringTension()*c);return this.getStartValue()+(this.getStartVelocity()*a)}});Ext.define("Ext.fx.easing.Linear",{extend:"Ext.fx.easing.Abstract",alias:"easing.linear",config:{duration:0,endValue:0},updateStartValue:function(a){this.distance=this.getEndValue()-a},updateEndValue:function(a){this.distance=a-this.getStartValue()},getValue:function(){var a=Ext.Date.now()-this.getStartTime(),b=this.getDuration();if(a>b){this.isEnded=true;return this.getEndValue()}else{return this.getStartValue()+((a/b)*this.distance)}}});Ext.define("Ext.fx.easing.Momentum",{extend:"Ext.fx.easing.Abstract",config:{acceleration:30,friction:0,startVelocity:0},alpha:0,updateFriction:function(b){var a=Math.log(1-(b/10));this.theta=a;this.alpha=a/this.getAcceleration()},updateStartVelocity:function(a){this.velocity=a*this.getAcceleration()},updateAcceleration:function(a){this.velocity=this.getStartVelocity()*a;this.alpha=this.theta/a},getValue:function(){return this.getStartValue()-this.velocity*(1-this.getFrictionFactor())/this.theta},getFrictionFactor:function(){var a=Ext.Date.now()-this.getStartTime();return Math.exp(a*this.alpha)},getVelocity:function(){return this.getFrictionFactor()*this.velocity}});Ext.define("Ext.mixin.Mixin",{onClassExtended:function(b,e){var a=e.mixinConfig,d,f,c;if(a){d=b.superclass.mixinConfig;if(d){a=e.mixinConfig=Ext.merge({},d,a)}e.mixinId=a.id;f=a.beforeHooks;c=a.hooks||a.afterHooks;if(f||c){Ext.Function.interceptBefore(e,"onClassMixedIn",function(h){var g=this.prototype;if(f){Ext.Object.each(f,function(j,i){h.override(i,function(){if(g[j].apply(this,arguments)!==false){return this.callOverridden(arguments)}})})}if(c){Ext.Object.each(c,function(j,i){h.override(i,function(){var k=this.callOverridden(arguments);g[j].apply(this,arguments);return k})})}})}}}});Ext.define("Ext.mixin.Selectable",{extend:"Ext.mixin.Mixin",mixinConfig:{id:"selectable",hooks:{updateStore:"updateStore"}},config:{disableSelection:null,mode:"SINGLE",allowDeselect:false,lastSelected:null,lastFocused:null,deselectOnContainerClick:true},modes:{SINGLE:true,SIMPLE:true,MULTI:true},selectableEventHooks:{addrecords:"onSelectionStoreAdd",removerecords:"onSelectionStoreRemove",updaterecord:"onSelectionStoreUpdate",load:"refreshSelection",refresh:"refreshSelection"},constructor:function(){this.selected=new Ext.util.MixedCollection();this.callParent(arguments)},applyMode:function(a){a=a?a.toUpperCase():"SINGLE";return this.modes[a]?a:"SINGLE"},updateStore:function(a,c){var b=this,d=Ext.apply({},b.selectableEventHooks,{scope:b});if(c&&Ext.isObject(c)&&c.isStore){if(c.autoDestroy){c.destroy()}else{c.un(d)}}if(a){a.on(d);b.refreshSelection()}},selectAll:function(a){var e=this,c=e.getStore().getRange(),d=c.length,b=0;for(;b<d;b++){e.select(c[b],true,a)}},deselectAll:function(e){var d=this,b=d.getStore().getRange(),c=b.length,a=0;for(;a<c;a++){d.deselect(b,e)}d.selected.clear();d.setLastSelected(null);d.setLastFocused(null)},selectWithEvent:function(a){var c=this,b=c.isSelected(a);switch(c.getMode()){case"MULTI":case"SIMPLE":if(b){c.deselect(a)}else{c.select(a,true)}break;case"SINGLE":if(c.getAllowDeselect()&&b){c.deselect(a)}else{c.select(a,false)}break}},selectRange:function(h,j,m,b){var g=this,k=g.getStore(),l=k.indexOf(h),d=k.indexOf(j),c=0,f,a,e;if(g.getDisableSelection()){return}if(l>d){f=d;d=l;l=f}for(e=l;e<=d;e++){if(g.isSelected(k.getAt(e))){c++}}if(!b){a=-1}else{a=(b=="up")?l:d}for(e=l;e<=d;e++){if(c==(d-l+1)){if(e!=a){g.deselect(e,true)}}else{g.select(e,true)}}},select:function(c,e,b){var d=this,a;if(d.getDisableSelection()){return}if(typeof c==="number"){c=[d.getStore().getAt(c)]}if(!c){return}if(d.getMode()=="SINGLE"&&c){a=c.length?c[0]:c;d.doSingleSelect(a,b)}else{d.doMultiSelect(c,e,b)}},doSingleSelect:function(a,b){var d=this,c=d.selected;if(d.getDisableSelection()){return}if(d.isSelected(a)){return}if(c.getCount()>0){d.deselect(d.getLastSelected(),b)}c.add(a);d.setLastSelected(a);d.onItemSelect(a,b);d.setLastFocused(a);d.fireSelectionChange(!b)},doMultiSelect:function(a,j,h){if(a===null||this.getDisableSelection()){return}a=!Ext.isArray(a)?[a]:a;var f=this,b=f.selected,e=a.length,g=false,c=0,d;if(!j&&b.getCount()>0){g=true;f.deselect(f.getSelection(),true)}for(;c<e;c++){d=a[c];if(j&&f.isSelected(d)){continue}g=true;f.setLastSelected(d);b.add(d);if(!h){f.setLastFocused(d)}f.onItemSelect(d,h)}this.fireSelectionChange(g&&!h)},deselect:function(a,j){var f=this;if(f.getDisableSelection()){return}a=Ext.isArray(a)?a:[a];var b=f.selected,g=false,c=0,h=f.getStore(),e=a.length,d;for(;c<e;c++){d=a[c];if(typeof d==="number"){d=h.getAt(d)}if(b.remove(d)){if(f.getLastSelected()==d){f.setLastSelected(b.last())}g=true}if(d){f.onItemDeselect(d,j)}}f.fireSelectionChange(g&&!j)},updateLastFocused:function(b,a){this.onLastFocusChanged(a,b)},fireSelectionChange:function(a){var b=this;if(a){b.fireEvent("selectionchange",b,b.getSelection())}},getSelection:function(){return this.selected.getRange()},isSelected:function(a){a=Ext.isNumber(a)?this.getStore().getAt(a):a;return this.selected.indexOf(a)!==-1},hasSelection:function(){return this.selected.getCount()>0},refreshSelection:function(){var b=this,a=b.getSelection();b.deselectAll(true);if(a.length){b.select(a,false,true)}},onSelectionStoreClear:function(){var b=this,a=b.selected;if(a.getCount()>0){a.clear();b.setLastSelected(null);b.setLastFocused(null);b.fireSelectionChange(true)}},onSelectionStoreRemove:function(b,a){var d=this,c=d.selected;if(d.getDisableSelection()){return}if(c.remove(a)){if(d.getLastSelected()==a){d.setLastSelected(null)}if(d.getLastFocused()==a){d.setLastFocused(null)}d.fireSelectionChange(true)}},getSelectionCount:function(){return this.selected.getCount()},onSelectionStoreAdd:Ext.emptyFn,onSelectionStoreUpdate:Ext.emptyFn,onItemSelect:Ext.emptyFn,onItemDeselect:Ext.emptyFn,onLastFocusChanged:Ext.emptyFn,onEditorKey:Ext.emptyFn},function(){});Ext.define("Ext.mixin.Traversable",{extend:"Ext.mixin.Mixin",mixinConfig:{id:"traversable"},setParent:function(a){this.parent=a;return this},hasParent:function(){return Boolean(this.parent)},getParent:function(){return this.parent},getAncestors:function(){var b=[],a=this.getParent();while(a){b.push(a);a=a.getParent()}return b},getAncestorIds:function(){var b=[],a=this.getParent();while(a){b.push(a.getId());a=a.getParent()}return b}});Ext.define("Ext.util.DelayedTask",{config:{interval:null,delay:null,fn:null,scope:null,args:null},constructor:function(d,c,b){var a={fn:d,scope:c,args:b};this.initConfig(a)},delay:function(b,f,e,a){var d=this;d.cancel();d.setConfig({delay:b,fn:f,scope:e,args:a});var c=function(){d.getFn().apply(d.getScope(),d.getArgs()||[]);d.cancel()};d.setInterval(setInterval(c,d.getDelay()))},cancel:function(){this.setInterval(null)},updateInterval:function(a,b){if(b){clearInterval(b)}},applyArgs:function(a){if(!Ext.isArray(a)){a=[a]}return a}});Ext.define("Ext.util.Filter",{isFilter:true,config:{property:null,value:null,filterFn:Ext.emptyFn,anyMatch:false,exactMatch:false,caseSensitive:false,root:null,id:undefined,scope:null},applyId:function(a){if(!a){if(this.getProperty()){a=this.getProperty()+"-"+String(this.getValue())}if(!a){a=Ext.id(null,"ext-filter-")}}return a},constructor:function(a){this.initConfig(a)},applyFilterFn:function(b){if(b===Ext.emptyFn){b=this.getInitialConfig("filter");if(b){return b}var a=this.getValue();if(!this.getProperty()&&!a&&a!==0){return Ext.emptyFn}else{return this.createFilterFn()}}return b},createFilterFn:function(){var a=this,b=a.createValueMatcher();return function(d){var c=a.getRoot(),e=a.getProperty();if(c){d=d[c]}return b.test(d[e])}},createValueMatcher:function(){var d=this,e=d.getValue(),f=d.getAnyMatch(),c=d.getExactMatch(),a=d.getCaseSensitive(),b=Ext.String.escapeRegex;if(e===null||e===undefined||!e.exec){e=String(e);if(f===true){e=b(e)}else{e="^"+b(e);if(c===true){e+="$"}}e=new RegExp(e,a?"":"i")}return e}});Ext.define("Ext.util.Point",{radianToDegreeConstant:180/Math.PI,statics:{fromEvent:function(b){var a=b.changedTouches,c=(a&&a.length>0)?a[0]:b;return this.fromTouch(c)},fromTouch:function(a){return new this(a.pageX,a.pageY)},from:function(a){if(!a){return new this(0,0)}if(!(a instanceof this)){return new this(a.x,a.y)}return a}},constructor:function(a,b){if(typeof a=="undefined"){a=0}if(typeof b=="undefined"){b=0}this.x=a;this.y=b;return this},clone:function(){return new this.self(this.x,this.y)},copy:function(){return this.clone.apply(this,arguments)},copyFrom:function(a){this.x=a.x;this.y=a.y;return this},toString:function(){return"Point["+this.x+","+this.y+"]"},equals:function(a){return(this.x===a.x&&this.y===a.y)},isCloseTo:function(c,b){if(typeof b=="number"){b={x:b};b.y=b.x}var a=c.x,f=c.y,e=b.x,d=b.y;return(this.x<=a+e&&this.x>=a-e&&this.y<=f+d&&this.y>=f-d)},isWithin:function(){return this.isCloseTo.apply(this,arguments)},translate:function(a,b){this.x+=a;this.y+=b;return this},roundedEquals:function(a){return(Math.round(this.x)===Math.round(a.x)&&Math.round(this.y)===Math.round(a.y))},getDistanceTo:function(b){var c=this.x-b.x,a=this.y-b.y;return Math.sqrt(c*c+a*a)},getAngleTo:function(b){var c=this.x-b.x,a=this.y-b.y;return Math.atan2(a,c)*this.radianToDegreeConstant}});Ext.define("Ext.util.Region",{statics:{getRegion:function(a){return Ext.fly(a).getPageBox(true)},from:function(a){return new this(a.top,a.right,a.bottom,a.left)}},constructor:function(d,f,a,c){var e=this;e.top=d;e[1]=d;e.right=f;e.bottom=a;e.left=c;e[0]=c},contains:function(b){var a=this;return(b.left>=a.left&&b.right<=a.right&&b.top>=a.top&&b.bottom<=a.bottom)},intersect:function(g){var f=this,d=Math.max(f.top,g.top),e=Math.min(f.right,g.right),a=Math.min(f.bottom,g.bottom),c=Math.max(f.left,g.left);if(a>d&&e>c){return new Ext.util.Region(d,e,a,c)}else{return false}},union:function(g){var f=this,d=Math.min(f.top,g.top),e=Math.max(f.right,g.right),a=Math.max(f.bottom,g.bottom),c=Math.min(f.left,g.left);return new Ext.util.Region(d,e,a,c)},constrainTo:function(b){var a=this,c=Ext.util.Numbers.constrain;a.top=c(a.top,b.top,b.bottom);a.bottom=c(a.bottom,b.top,b.bottom);a.left=c(a.left,b.left,b.right);a.right=c(a.right,b.left,b.right);return a},adjust:function(d,f,a,c){var e=this;e.top+=d;e.left+=c;e.right+=f;e.bottom+=a;return e},getOutOfBoundOffset:function(a,b){if(!Ext.isObject(a)){if(a=="x"){return this.getOutOfBoundOffsetX(b)}else{return this.getOutOfBoundOffsetY(b)}}else{b=a;var c=new Ext.util.Offset();c.x=this.getOutOfBoundOffsetX(b.x);c.y=this.getOutOfBoundOffsetY(b.y);return c}},getOutOfBoundOffsetX:function(a){if(a<=this.left){return this.left-a}else{if(a>=this.right){return this.right-a}}return 0},getOutOfBoundOffsetY:function(a){if(a<=this.top){return this.top-a}else{if(a>=this.bottom){return this.bottom-a}}return 0},isOutOfBound:function(a,b){if(!Ext.isObject(a)){if(a=="x"){return this.isOutOfBoundX(b)}else{return this.isOutOfBoundY(b)}}else{b=a;return(this.isOutOfBoundX(b.x)||this.isOutOfBoundY(b.y))}},isOutOfBoundX:function(a){return(a<this.left||a>this.right)},isOutOfBoundY:function(a){return(a<this.top||a>this.bottom)},restrict:function(b,d,a){if(Ext.isObject(b)){var c;a=d;d=b;if(d.copy){c=d.copy()}else{c={x:d.x,y:d.y}}c.x=this.restrictX(d.x,a);c.y=this.restrictY(d.y,a);return c}else{if(b=="x"){return this.restrictX(d,a)}else{return this.restrictY(d,a)}}},restrictX:function(b,a){if(!a){a=1}if(b<=this.left){b-=(b-this.left)*a}else{if(b>=this.right){b-=(b-this.right)*a}}return b},restrictY:function(b,a){if(!a){a=1}if(b<=this.top){b-=(b-this.top)*a}else{if(b>=this.bottom){b-=(b-this.bottom)*a}}return b},getSize:function(){return{width:this.right-this.left,height:this.bottom-this.top}},copy:function(){return new Ext.util.Region(this.top,this.right,this.bottom,this.left)},toString:function(){return"Region["+this.top+","+this.right+","+this.bottom+","+this.left+"]"},translateBy:function(a){this.left+=a.x;this.right+=a.x;this.top+=a.y;this.bottom+=a.y;return this},round:function(){this.top=Math.round(this.top);this.right=Math.round(this.right);this.bottom=Math.round(this.bottom);this.left=Math.round(this.left);return this},equals:function(a){return(this.top==a.top&&this.right==a.right&&this.bottom==a.bottom&&this.left==a.left)}});Ext.define("Ext.util.Sorter",{isSorter:true,config:{property:null,sorterFn:null,root:null,transform:null,direction:"ASC",id:undefined},constructor:function(a){this.initConfig(a)},applyId:function(a){if(!a){a=this.getProperty();if(!a){a=Ext.id(null,"ext-sorter-")}}return a},createSortFunction:function(b){var c=this,a=c.getDirection().toUpperCase()=="DESC"?-1:1;return function(e,d){return a*b.call(c,e,d)}},defaultSortFn:function(e,c){var g=this,f=g._transform,b=g._root,d,a,h=g._property;if(b!==null){e=e[b];c=c[b]}d=e[h];a=c[h];if(f){d=f(d);a=f(a)}return d>a?1:(d<a?-1:0)},updateDirection:function(){this.updateSortFn()},updateSortFn:function(){this.sort=this.createSortFunction(this.getSorterFn()||this.defaultSortFn)},toggle:function(){this.setDirection(Ext.String.toggle(this.getDirection(),"ASC","DESC"))}});Ext.define("Ext.util.Inflector",{singleton:true,plurals:[[(/(quiz)$/i),"$1zes"],[(/^(ox)$/i),"$1en"],[(/([m|l])ouse$/i),"$1ice"],[(/(matr|vert|ind)ix|ex$/i),"$1ices"],[(/(x|ch|ss|sh)$/i),"$1es"],[(/([^aeiouy]|qu)y$/i),"$1ies"],[(/(hive)$/i),"$1s"],[(/(?:([^f])fe|([lr])f)$/i),"$1$2ves"],[(/sis$/i),"ses"],[(/([ti])um$/i),"$1a"],[(/(buffal|tomat|potat)o$/i),"$1oes"],[(/(bu)s$/i),"$1ses"],[(/(alias|status|sex)$/i),"$1es"],[(/(octop|vir)us$/i),"$1i"],[(/(ax|test)is$/i),"$1es"],[(/^person$/),"people"],[(/^man$/),"men"],[(/^(child)$/),"$1ren"],[(/s$/i),"s"],[(/$/),"s"]],singulars:[[(/(quiz)zes$/i),"$1"],[(/(matr)ices$/i),"$1ix"],[(/(vert|ind)ices$/i),"$1ex"],[(/^(ox)en/i),"$1"],[(/(alias|status)es$/i),"$1"],[(/(octop|vir)i$/i),"$1us"],[(/(cris|ax|test)es$/i),"$1is"],[(/(shoe)s$/i),"$1"],[(/(o)es$/i),"$1"],[(/(bus)es$/i),"$1"],[(/([m|l])ice$/i),"$1ouse"],[(/(x|ch|ss|sh)es$/i),"$1"],[(/(m)ovies$/i),"$1ovie"],[(/(s)eries$/i),"$1eries"],[(/([^aeiouy]|qu)ies$/i),"$1y"],[(/([lr])ves$/i),"$1f"],[(/(tive)s$/i),"$1"],[(/(hive)s$/i),"$1"],[(/([^f])ves$/i),"$1fe"],[(/(^analy)ses$/i),"$1sis"],[(/((a)naly|(b)a|(d)iagno|(p)arenthe|(p)rogno|(s)ynop|(t)he)ses$/i),"$1$2sis"],[(/([ti])a$/i),"$1um"],[(/(n)ews$/i),"$1ews"],[(/people$/i),"person"],[(/s$/i),""]],uncountable:["sheep","fish","series","species","money","rice","information","equipment","grass","mud","offspring","deer","means"],singular:function(b,a){this.singulars.unshift([b,a])},plural:function(b,a){this.plurals.unshift([b,a])},clearSingulars:function(){this.singulars=[]},clearPlurals:function(){this.plurals=[]},isTransnumeral:function(a){return Ext.Array.indexOf(this.uncountable,a)!=-1},pluralize:function(f){if(this.isTransnumeral(f)){return f}var e=this.plurals,d=e.length,a,c,b;for(b=0;b<d;b++){a=e[b];c=a[0];if(c==f||(c.test&&c.test(f))){return f.replace(c,a[1])}}return f},singularize:function(f){if(this.isTransnumeral(f)){return f}var e=this.singulars,d=e.length,a,c,b;for(b=0;b<d;b++){a=e[b];c=a[0];if(c==f||(c.test&&c.test(f))){return f.replace(c,a[1])}}return f},classify:function(a){return Ext.String.capitalize(this.singularize(a))},ordinalize:function(d){var b=parseInt(d,10),c=b%10,a=b%100;if(11<=a&&a<=13){return d+"th"}else{switch(c){case 1:return d+"st";case 2:return d+"nd";case 3:return d+"rd";default:return d+"th"}}}},function(){var b={alumnus:"alumni",cactus:"cacti",focus:"foci",nucleus:"nuclei",radius:"radii",stimulus:"stimuli",ellipsis:"ellipses",paralysis:"paralyses",oasis:"oases",appendix:"appendices",index:"indexes",beau:"beaux",bureau:"bureaux",tableau:"tableaux",woman:"women",child:"children",man:"men",corpus:"corpora",criterion:"criteria",curriculum:"curricula",genus:"genera",memorandum:"memoranda",phenomenon:"phenomena",foot:"feet",goose:"geese",tooth:"teeth",antenna:"antennae",formula:"formulae",nebula:"nebulae",vertebra:"vertebrae",vita:"vitae"},a;for(a in b){this.plural(a,b[a]);this.singular(b[a],a)}});Ext.Anim=Ext.extend(Object,{isAnim:true,disableAnimations:false,defaultConfig:{from:{},to:{},duration:250,delay:0,easing:"ease-in-out",autoClear:true,out:true,direction:null,reverse:false},opposites:{left:"right",right:"left",up:"down",down:"up"},constructor:function(a){a=Ext.apply({},a||{},this.defaultConfig);this.config=a;Ext.Anim.superclass.constructor.call(this);this.running=[]},initConfig:function(c,b){var d=this,a=Ext.apply({},b||{},d.config);a.el=c=Ext.get(c);if(a.reverse&&d.opposites[a.direction]){a.direction=d.opposites[a.direction]}if(d.config.before){d.config.before.call(a,c,a)}if(b.before){b.before.call(a.scope||a,c,a)}return a},run:function(c,a){c=Ext.get(c);a=a||{};var d=this,b=c.dom.style,e,f=a.after;if(d.running[c.id]){d.onTransitionEnd(null,c,{config:a,after:f})}a=this.initConfig(c,a);if(this.disableAnimations){for(e in a.to){if(!a.to.hasOwnProperty(e)){continue}b[e]=a.to[e]}this.onTransitionEnd(null,c,{config:a,after:f});return d}c.un("transitionend",d.onTransitionEnd,d);b.webkitTransitionDuration="0ms";for(e in a.from){if(!a.from.hasOwnProperty(e)){continue}b[e]=a.from[e]}setTimeout(function(){if(!c.dom){return}if(a.is3d===true){c.parent().setStyle({"-webkit-perspective":"1200","-webkit-transform-style":"preserve-3d"})}b.webkitTransitionDuration=a.duration+"ms";b.webkitTransitionProperty="all";b.webkitTransitionTimingFunction=a.easing;c.on("transitionend",d.onTransitionEnd,d,{single:true,config:a,after:f});for(e in a.to){if(!a.to.hasOwnProperty(e)){continue}b[e]=a.to[e]}},a.delay||5);d.running[c.id]=a;return d},onTransitionEnd:function(e,c,g){c=Ext.get(c);if(this.running[c.id]===undefined){return}var b=c.dom.style,a=g.config,d=this,f;if(a.autoClear){for(f in a.to){if(!a.to.hasOwnProperty(f)||a[f]===false){continue}b[f]=""}}b.webkitTransitionDuration=null;b.webkitTransitionProperty=null;b.webkitTransitionTimingFunction=null;if(a.is3d){c.parent().setStyle({"-webkit-perspective":"","-webkit-transform-style":""})}if(d.config.after){d.config.after.call(a,c,a)}if(g.after){g.after.call(a.scope||d,c,a)}delete d.running[c.id]}});Ext.Anim.seed=1000;Ext.Anim.run=function(b,c,a){if(b.isComponent){b=b.element}a=a||{};if(c.isAnim){c.run(b,a)}else{if(Ext.isObject(c)){if(a.before&&c.before){a.before=Ext.createInterceptor(a.before,c.before,c.scope)}if(a.after&&c.after){a.after=Ext.createInterceptor(a.after,c.after,c.scope)}a=Ext.apply({},a,c);c=c.type}if(!Ext.anims[c]){throw c+" is not a valid animation type."}else{if(b&&b.dom){Ext.anims[c].run(b,a)}}}};Ext.anims={fade:new Ext.Anim({type:"fade",before:function(b){var c=1,a=1,e=b.getStyle("z-index")=="auto"?0:b.getStyle("z-index"),d=e;if(this.out){a=0}else{d=Math.abs(e)+1;c=0}this.from={opacity:c,"z-index":d};this.to={opacity:a,"z-index":d}}}),slide:new Ext.Anim({direction:"left",cover:false,reveal:false,opacity:false,"z-index":false,before:function(a){var c=a.getStyle("z-index")=="auto"?0:a.getStyle("z-index"),f=a.getStyle("opacity"),h=c+1,d=this.out,l=this.direction,k=0,i=0,j=0,g=0,b=a.getHeight(),e=a.getWidth();if(l=="left"||l=="right"){if(d){k=-e}else{j=e}}else{if(l=="up"||l=="down"){if(d){i=-b}else{g=b}}}if(l=="right"||l=="down"){i*=-1;k*=-1;g*=-1;j*=-1}if(this.cover&&d){k=0;i=0;h=c}else{if(this.reveal&&!d){j=0;g=0;h=c}}this.from={"-webkit-transform":"translate3d("+j+"px, "+g+"px, 0)","z-index":h,opacity:f-0.01};this.to={"-webkit-transform":"translate3d("+k+"px, "+i+"px, 0)","z-index":h,opacity:f}}}),pop:new Ext.Anim({scaleOnExit:true,before:function(d){var b=1,c=1,g=1,a=1,h=d.getStyle("z-index")=="auto"?0:d.getStyle("z-index"),f=h,e=h;if(!this.out){b=0.01;f=h+1;e=h+1;g=0}else{if(this.scaleOnExit){c=0.01;a=0}else{a=0.8}}this.from={"-webkit-transform":"scale("+b+")","-webkit-transform-origin":"50% 50%",opacity:g,"z-index":f};this.to={"-webkit-transform":"scale("+c+")","-webkit-transform-origin":"50% 50%",opacity:a,"z-index":e}}}),flip:new Ext.Anim({is3d:true,direction:"left",before:function(c){var f="Y",a=1,b=1,e=0,d=0;if(this.out){d=-180;b=0.8}else{e=180;a=0.8}if(this.direction=="up"||this.direction=="down"){f="X"}if(this.direction=="right"||this.direction=="left"){d*=-1;e*=-1}this.from={"-webkit-transform":"rotate"+f+"("+e+"deg) scale("+a+")","-webkit-backface-visibility":"hidden"};this.to={"-webkit-transform":"rotate"+f+"("+d+"deg) scale("+b+")","-webkit-backface-visibility":"hidden"}}}),cube:new Ext.Anim({is3d:true,direction:"left",style:"outer",before:function(b){var k="0% 0%",l=0,a=0,i="Y",f=0,g=0,e=b.getWidth(),d=b.getHeight(),j=true,c=" translateX(0)",h="";if(this.direction=="left"||this.direction=="right"){if(this.out){k="100% 100%";g=e;a=-90}else{k="0% 0%";f=e;l=90}}else{if(this.direction=="up"||this.direction=="down"){i="X";if(this.out){k="100% 100%";g=d;a=90}else{k="0% 0%";f=d;l=-90}}}if(this.direction=="down"||this.direction=="right"){l*=-1;a*=-1;k=(k=="0% 0%")?"100% 100%":"0% 0%"}if(this.style=="inner"){f*=-1;g*=-1;l*=-1;a*=-1;if(!this.out){h=" translateX(0px)";k="0% 50%"}else{h=c;k="100% 50%"}}this.from={"-webkit-transform":"rotate"+i+"("+l+"deg)"+(j?" translateZ("+f+"px)":"")+c,"-webkit-transform-origin":k};this.to={"-webkit-transform":"rotate"+i+"("+a+"deg) translateZ("+g+"px)"+h,"-webkit-transform-origin":k}},duration:250}),wipe:new Ext.Anim({before:function(b){var d=b.getStyle("z-index"),c,a="";if(!this.out){c=d+1;a="-webkit-gradient(linear, left bottom, right bottom, from(transparent), to(#000), color-stop(66%, #000), color-stop(33%, transparent))";this.from={"-webkit-mask-image":a,"-webkit-mask-size":b.getWidth()*3+"px "+b.getHeight()+"px","z-index":c,"-webkit-mask-position-x":0};this.to={"-webkit-mask-image":a,"-webkit-mask-size":b.getWidth()*3+"px "+b.getHeight()+"px","z-index":c,"-webkit-mask-position-x":-b.getWidth()*2+"px"}}},duration:500})};Ext.define("Ext.XTemplateCompiler",{extend:"Ext.XTemplateParser",useEval:Ext.isGecko,useFormat:true,propNameRe:/^[\w\d\$]*$/,compile:function(a){var c=this,b=c.generate(a);return c.useEval?c.evalTpl(b):(new Function("Ext",b))(Ext)},generate:function(a){var c=this;c.body=["var c0=values, p0=parent, n0=xcount, i0=xindex;\n"];c.funcs=["var fm=Ext.util.Format;"];c.switches=[];c.parse(a);c.funcs.push((c.useEval?"$=":"return")+" function ("+c.fnArgs+") {",c.body.join(""),"}");var b=c.funcs.join("\n");return b},doText:function(a){a=a.replace(this.aposRe,"\\'");a=a.replace(this.newLineRe,"\\n");this.body.push("out.push('",a,"')\n")},doExpr:function(a){this.body.push("out.push(String(",a,"))\n")},doTag:function(a){this.doExpr(this.parseTag(a))},doElse:function(){this.body.push("} else {\n")},doEval:function(a){this.body.push(a,"\n")},doIf:function(b,c){var a=this;if(a.propNameRe.test(b)){a.body.push("if (",a.parseTag(b),") {\n")}else{a.body.push("if (",a.addFn(b),a.callFn,") {\n")}if(c.exec){a.doExec(c.exec)}},doElseIf:function(b,c){var a=this;if(a.propNameRe.test(b)){a.body.push("} else if (",a.parseTag(b),") {\n")}else{a.body.push("} else if (",a.addFn(b),a.callFn,") {\n")}if(c.exec){a.doExec(c.exec)}},doSwitch:function(b){var a=this;if(a.propNameRe.test(b)){a.body.push("switch (",a.parseTag(b),") {\n")}else{a.body.push("switch (",a.addFn(b),a.callFn,") {\n")}a.switches.push(0)},doCase:function(e){var d=this,c=Ext.isArray(e)?e:[e],f=d.switches.length-1,a,b;if(d.switches[f]){d.body.push("break;\n")}else{d.switches[f]++}for(b=0,f=c.length;b<f;++b){a=d.intRe.exec(c[b]);c[b]=a?a[1]:("'"+c[b].replace(d.aposRe,"\\'")+"'")}d.body.push("case ",c.join(": case "),":\n")},doDefault:function(){var a=this,b=a.switches.length-1;if(a.switches[b]){a.body.push("break;\n")}else{a.switches[b]++}a.body.push("default:\n")},doEnd:function(b,d){var c=this,a=c.level-1;if(b=="for"){if(d.exec){c.doExec(d.exec)}c.body.push("}\n");c.body.push("parent=p",a,";values=r",a+1,";xcount=n",a,";xindex=i",a,"\n")}else{if(b=="if"||b=="switch"){c.body.push("}\n")}}},doFor:function(e,f){var d=this,c=d.addFn(e),b=d.level,a=b-1;d.body.push("var c",b,"=",c,d.callFn,", a",b,"=Ext.isArray(c",b,"),p",b,"=(parent=c",a,"),r",b,"=values\n","for (var i",b,"=0,n",b,"=a",b,"?c",b,".length:(c",b,"?1:0), xcount=n",b,";i",b,"<n"+b+";++i",b,"){\n","values=a",b,"?c",b,"[i",b,"]:c",b,"\n","xindex=i",b,"+1\n")},doExec:function(c,d){var b=this,a="f"+b.funcs.length;b.funcs.push("function "+a+"("+b.fnArgs+") {"," try { with(values) {","  "+c," }} catch(e) {}","}");b.body.push(a+b.callFn+"\n")},addFn:function(a){var c=this,b="f"+c.funcs.length;if(a==="."){c.funcs.push("function "+b+"("+c.fnArgs+") {"," return values","}")}else{if(a===".."){c.funcs.push("function "+b+"("+c.fnArgs+") {"," return parent","}")}else{c.funcs.push("function "+b+"("+c.fnArgs+") {"," try { with(values) {","  return("+a+")"," }} catch(e) {}","}")}}return b},parseTag:function(b){var a=this.tagRe.exec(b),e=a[1],g=a[2],d=a[3],f=a[4],c;if(e=="."){c='Ext.Array.indexOf(["string", "number", "boolean"], typeof values) > -1 || Ext.isDate(values) ? values : ""'}else{if(e=="#"){c="xindex"}else{if(e.substr(0,7)=="parent."){c=e}else{if((e.indexOf(".")!==-1)&&(e.indexOf("-")===-1)){c="values."+e}else{c="values['"+e+"']"}}}}if(f){c="("+c+f+")"}if(g&&this.useFormat){d=d?","+d:"";if(g.substr(0,5)!="this."){g="fm."+g+"("}else{g+="("}}else{d="";g="("+c+" === undefined ? '' : "}return g+c+d+")"},evalTpl:function($){eval($);return $},newLineRe:/\r\n|\r|\n/g,aposRe:/[']/g,intRe:/^\s*(\d+)\s*$/,tagRe:/([\w-\.\#]+)(?:\:([\w\.]*)(?:\((.*?)?\))?)?(\s?[\+\-\*\/]\s?[\d\.\+\-\*\/\(\)]+)?/},function(){var a=this.prototype;a.fnArgs="out,values,parent,xindex,xcount";a.callFn=".call(this,"+a.fnArgs+")"});Ext.define("Ext.data.Field",{requires:["Ext.data.Types","Ext.data.SortTypes"],alias:"data.field",isField:true,config:{name:null,type:"auto",convert:undefined,dateFormat:null,allowNull:true,defaultValue:undefined,mapping:null,sortType:undefined,sortDir:"ASC",allowBlank:true,persist:true,encode:null,decode:null},constructor:function(a){if(Ext.isString(a)){a={name:a}}this.initConfig(a)},applyType:function(c){var b=Ext.data.Types,a=b.AUTO;if(c){if(Ext.isString(c)){return b[c.toUpperCase()]||a}else{return c}}return a},updateType:function(a,b){var c=this.getConvert();if(b&&c===b.convert){this.setConvert(a.convert)}},applySortType:function(d){var c=Ext.data.SortTypes,a=this.getType(),b=a.sortType;if(d){if(Ext.isString(d)){return c[d]||b}else{return d}}return b},applyConvert:function(b){var a=this.getType().convert;if(b&&b!==a){this._hasCustomConvert=true;return b}else{this._hasCustomConvert=false;return a}},hasCustomConvert:function(){return this._hasCustomConvert}});Ext.define("Ext.data.identifier.Sequential",{extend:"Ext.data.identifier.Simple",alias:"data.identifier.sequential",config:{prefix:"",seed:1},constructor:function(){var a=this;a.callParent(arguments);a.parts=[a.getPrefix(),""]},generate:function(b){var c=this,d=c.parts,a=c.getSeed()+1;c.setSeed(a);d[1]=a;return d.join("")}});Ext.define("Ext.data.writer.Json",{extend:"Ext.data.writer.Writer",alternateClassName:"Ext.data.JsonWriter",alias:"writer.json",config:{root:undefined,encode:false,allowSingle:true,encodeRequest:false},applyRoot:function(a){if(!a&&(this.getEncode()||this.getEncodeRequest())){a="data"}return a},writeRecords:function(d,e){var a=this.getRoot(),f=d.getParams(),b=this.getAllowSingle(),c;if(this.getAllowSingle()&&e&&e.length==1){e=e[0]}if(this.getEncodeRequest()){c=d.getJsonData()||{};if(e&&(e.length||(b&&Ext.isObject(e)))){c[a]=e}d.setJsonData(Ext.apply(c,f||{}));d.setParams(null);d.setMethod("POST");return d}if(!e||!(e.length||(b&&Ext.isObject(e)))){return d}if(this.getEncode()){if(a){f[a]=Ext.encode(e)}else{}}else{c=d.getJsonData()||{};if(a){c[a]=e}else{c=e}d.setJsonData(c)}return d}});Ext.define("Ext.event.Dispatcher",{requires:["Ext.event.ListenerStack","Ext.event.Controller"],statics:{getInstance:function(){if(!this.instance){this.instance=new this()}return this.instance},setInstance:function(a){this.instance=a;return this}},config:{publishers:{}},wildcard:"*",constructor:function(a){this.listenerStacks={};this.activePublishers={};this.publishersCache={};this.noActivePublishers=[];this.controller=null;this.initConfig(a);return this},getListenerStack:function(e,g,c,b){var d=this.listenerStacks,f=d[e],a;b=Boolean(b);if(!f){if(b){d[e]=f={}}else{return null}}f=f[g];if(!f){if(b){d[e][g]=f={}}else{return null}}a=f[c];if(!a){if(b){f[c]=a=new Ext.event.ListenerStack()}else{return null}}return a},getController:function(d,f,c,b){var a=this.controller,e={targetType:d,target:f,eventName:c};if(!a){this.controller=a=new Ext.event.Controller()}if(a.isFiring){a=new Ext.event.Controller()}a.setInfo(e);if(b&&a!==b){a.connect(b)}return a},applyPublishers:function(c){var a,b;this.publishersCache={};for(a in c){if(c.hasOwnProperty(a)){b=c[a];this.registerPublisher(b)}}return c},registerPublisher:function(b){var a=this.activePublishers,c=b.getTargetType(),d=a[c];if(!d){a[c]=d=[]}d.push(b);b.setDispatcher(this);return this},getCachedActivePublishers:function(c,b){var a=this.publishersCache,d;if((d=a[c])&&(d=d[b])){return d}return null},cacheActivePublishers:function(c,b,d){var a=this.publishersCache;if(!a[c]){a[c]={}}a[c][b]=d;return d},getActivePublishers:function(f,b){var g,a,c,e,d;if((g=this.getCachedActivePublishers(f,b))){return g}a=this.activePublishers[f];if(a){g=[];for(c=0,e=a.length;c<e;c++){d=a[c];if(d.handles(b)){g.push(d)}}}else{g=this.noActivePublishers}return this.cacheActivePublishers(f,b,g)},hasListener:function(c,d,b){var a=this.getListenerStack(c,d,b);if(a){return a.count()>0}return false},addListener:function(d,e,a){var f=this.getActivePublishers(d,a),c=f.length,b;if(c>0){for(b=0;b<c;b++){f[b].subscribe(e,a)}}return this.doAddListener.apply(this,arguments)},doAddListener:function(g,h,c,f,e,d,a){var b=this.getListenerStack(g,h,c,true);return b.add(f,e,d,a)},removeListener:function(d,e,a){var f=this.getActivePublishers(d,a),c=f.length,b;if(c>0){for(b=0;b<c;b++){f[b].unsubscribe(e,a)}}return this.doRemoveListener.apply(this,arguments)},doRemoveListener:function(f,g,c,e,d,a){var b=this.getListenerStack(f,g,c);if(b===null){return false}return b.remove(e,d,a)},clearListeners:function(a,e,d){var j=this.listenerStacks,f=arguments.length,b,h,c,g;if(f===3){if(j[a]&&j[a][e]){this.removeListener(a,e,d);delete j[a][e][d]}}else{if(f===2){if(j[a]){b=j[a][e];if(b){for(d in b){if(b.hasOwnProperty(d)){h=this.getActivePublishers(a,d);for(c=0,f=h.length;c<f;c++){h[c].unsubscribe(e,d,true)}}}delete j[a][e]}}}else{if(f===1){h=this.activePublishers[a];for(c=0,f=h.length;c<f;c++){h[c].unsubscribeAll()}delete j[a]}else{h=this.activePublishers;for(a in h){if(h.hasOwnProperty(a)){g=h[a];for(c=0,f=g.length;c<f;c++){g[c].unsubscribeAll()}}}delete this.listenerStacks;this.listenerStacks={}}}}return this},dispatchEvent:function(d,e,a){var f=this.getActivePublishers(d,a),c=f.length,b;if(c>0){for(b=0;b<c;b++){f[b].notify(e,a)}}return this.doDispatchEvent.apply(this,arguments)},doDispatchEvent:function(a,g,f,i,c,b){var h=this.getListenerStack(a,g,f),d=this.getWildcardListenerStacks(a,g,f),e;if((h===null||h.length==0)){if(d.length==0&&!c){return}}else{d.push(h)}e=this.getController(a,g,f,b);e.setListenerStacks(d);e.fire(i,c);return !e.isInterrupted()},getWildcardListenerStacks:function(g,h,d){var f=[],b=this.wildcard,c=d!==b,e=h!==b,a;if(c&&(a=this.getListenerStack(g,h,b))){f.push(a)}if(e&&(a=this.getListenerStack(g,b,d))){f.push(a)}return f}});Ext.define("Ext.event.Dom",{extend:"Ext.event.Event",constructor:function(a){var c=a.target,b;if(c&&c.nodeType!==1){c=c.parentNode}b=a.changedTouches;if(b){b=b[0];this.pageX=b.pageX;this.pageY=b.pageY}else{this.pageX=a.pageX;this.pageY=a.pageY}this.browserEvent=this.event=a;this.target=this.delegatedTarget=c;this.type=a.type;this.timeStamp=this.time=a.timeStamp;if(typeof this.time!="number"){this.time=new Date(this.time).getTime()}return this},stopEvent:function(){this.preventDefault();return this.callParent()},preventDefault:function(){this.browserEvent.preventDefault()},getPageX:function(){return this.browserEvent.pageX},getPageY:function(){return this.browserEvent.pageY},getXY:function(){if(!this.xy){this.xy=[this.getPageX(),this.getPageY()]}return this.xy},getTarget:function(b,c,a){if(arguments.length===0){return this.delegatedTarget}return b?Ext.fly(this.target).findParent(b,c,a):(a?Ext.get(this.target):this.target)},getTime:function(){return this.time},setDelegatedTarget:function(a){this.delegatedTarget=a},makeUnpreventable:function(){this.browserEvent.preventDefault=Ext.emptyFn}});Ext.define("Ext.event.Touch",{extend:"Ext.event.Dom",requires:["Ext.util.Point"],constructor:function(a,b){if(b){this.set(b)}this.touchesMap={};this.changedTouches=this.cloneTouches(a.changedTouches);this.touches=this.cloneTouches(a.touches);this.targetTouches=this.cloneTouches(a.targetTouches);return this.callParent([a])},clone:function(){return new this.self(this)},setTargets:function(a){this.doSetTargets(this.changedTouches,a);this.doSetTargets(this.touches,a);this.doSetTargets(this.targetTouches,a)},doSetTargets:function(f,d){var c,e,g,b,a;for(c=0,e=f.length;c<e;c++){g=f[c];b=g.identifier;a=d[b];if(a){g.targets=a}}},cloneTouches:function(f){var e=this.touchesMap,h=[],d=null,b,c,g,a;for(b=0,c=f.length;b<c;b++){g=f[b];a=g.identifier;if(d!==null&&a===d){a++}d=a;if(!e[a]){e[a]={pageX:g.pageX,pageY:g.pageY,identifier:a,target:g.target,timeStamp:g.timeStamp,point:Ext.util.Point.fromTouch(g),targets:g.targets}}h[b]=e[a]}return h}});Ext.define("Ext.event.publisher.ComponentPaint",{extend:"Ext.event.publisher.Publisher",targetType:"component",handledEvents:["painted","erased"],eventNames:{painted:"painted",erased:"erased"},constructor:function(){this.callParent(arguments);this.hiddenQueue={};this.renderedQueue={}},getSubscribers:function(b,a){var c=this.subscribers;if(!c.hasOwnProperty(b)){if(!a){return null}c[b]={$length:0}}return c[b]},setDispatcher:function(a){var b=this.targetType;a.doAddListener(b,"*","renderedchange","onBeforeComponentRenderedChange",this,null,"before");a.doAddListener(b,"*","hiddenchange","onBeforeComponentHiddenChange",this,null,"before");a.doAddListener(b,"*","renderedchange","onComponentRenderedChange",this,null,"after");a.doAddListener(b,"*","hiddenchange","onComponentHiddenChange",this,null,"after");return this.callParent(arguments)},subscribe:function(d,a){var b=d.match(this.idSelectorRegex),c,e;if(!b){return false}e=b[1];c=this.getSubscribers(a,true);if(c.hasOwnProperty(e)){c[e]++;return true}c[e]=1;c.$length++;return true},unsubscribe:function(e,a,c){var b=e.match(this.idSelectorRegex),d,f;if(!b||!(d=this.getSubscribers(a))){return false}f=b[1];if(!d.hasOwnProperty(f)||(!c&&--d[f]>0)){return true}delete d[f];if(--d.$length===0){delete this.subscribers[a]}return true},onBeforeComponentRenderedChange:function(b,d,g){var f=this.eventNames,c=g?f.painted:f.erased,e=this.getSubscribers(c),a;if(e&&e.$length>0){this.renderedQueue[d.getId()]=a=[];this.publish(e,d,c,a)}},onBeforeComponentHiddenChange:function(c,d){var f=this.eventNames,b=d?f.erased:f.painted,e=this.getSubscribers(b),a;if(e&&e.$length>0){this.hiddenQueue[c.getId()]=a=[];this.publish(e,c,b,a)}},onComponentRenderedChange:function(b,c){var d=this.renderedQueue,e=c.getId(),a;if(!d.hasOwnProperty(e)){return}a=d[e];delete d[e];if(a.length>0){this.dispatchQueue(a)}},onComponentHiddenChange:function(c){var b=this.hiddenQueue,d=c.getId(),a;if(!b.hasOwnProperty(d)){return}a=b[d];delete b[d];if(a.length>0){this.dispatchQueue(a)}},dispatchQueue:function(g){var l=this.dispatcher,a=this.targetType,b=this.eventNames,e=g.slice(),f=e.length,c,k,h,d,j;g.length=0;if(f>0){for(c=0;c<f;c++){k=e[c];h=k.component;d=k.eventName;j=h.isPainted();if((d===b.painted&&j)||d===b.erased&&!j){l.doDispatchEvent(a,"#"+k.id,d,[h])}}e.length=0}},publish:function(a,k,f,j){var c=k.getId(),b=false,d,h,e,g,l;if(a[c]){d=this.eventNames;l=k.isPainted();if((f===d.painted&&!l)||f===d.erased&&l){b=true}else{return this}}if(k.isContainer){h=k.getItems().items;for(e=0,g=h.length;e<g;e++){this.publish(a,h[e],f,j)}}else{if(k.isDecorator){this.publish(a,k.getComponent(),f,j)}}if(b){j.push({id:c,eventName:f,component:k})}}});Ext.define("Ext.event.publisher.Dom",{extend:"Ext.event.publisher.Publisher",requires:["Ext.env.Browser","Ext.Element","Ext.event.Dom"],targetType:"element",idOrClassSelectorRegex:/^([#|\.])([\w\-]+)$/,handledEvents:["click","focus","blur","mousemove","mousedown","mouseup","mouseover","mouseout","keyup","keydown","keypress","submit","transitionend","animationstart","animationend"],classNameSplitRegex:/\s+/,SELECTOR_ALL:"*",constructor:function(){var f=this.getHandledEvents(),e={},b,c,a,d;this.doBubbleEventsMap={click:true,submit:true,mousedown:true,mousemove:true,mouseup:true,mouseover:true,mouseout:true,transitionend:true};this.onEvent=Ext.Function.bind(this.onEvent,this);for(b=0,c=f.length;b<c;b++){a=f[b];d=this.getVendorEventName(a);e[d]=a;this.attachListener(d)}this.eventNameMap=e;return this.callParent()},getSubscribers:function(a){var c=this.subscribers,b=c[a];if(!b){b=c[a]={id:{$length:0},className:{$length:0},selector:[],all:0,$length:0}}return b},getVendorEventName:function(a){if(a==="transitionend"){a=Ext.browser.getVendorProperyName("transitionEnd")}else{if(a==="animationstart"){a=Ext.browser.getVendorProperyName("animationStart")}else{if(a==="animationend"){a=Ext.browser.getVendorProperyName("animationEnd")}}}return a},attachListener:function(a){document.addEventListener(a,this.onEvent,!this.doesEventBubble(a));return this},removeListener:function(a){document.removeEventListener(a,this.onEvent,!this.doesEventBubble(a));return this},doesEventBubble:function(a){return !!this.doBubbleEventsMap[a]},subscribe:function(g,f){if(!this.handles(f)){return false}var e=g.match(this.idOrClassSelectorRegex),a=this.getSubscribers(f),c=a.id,d=a.className,b=a.selector,h,i;if(e!==null){h=e[1];i=e[2];if(h==="#"){if(c.hasOwnProperty(i)){c[i]++;return true}c[i]=1;c.$length++}else{if(d.hasOwnProperty(i)){d[i]++;return true}d[i]=1;d.$length++}}else{if(g===this.SELECTOR_ALL){a.all++}else{if(b.hasOwnProperty(g)){b[g]++;return true}b[g]=1;b.push(g)}}a.$length++;return true},unsubscribe:function(g,f,j){if(!this.handles(f)){return false}var e=g.match(this.idOrClassSelectorRegex),a=this.getSubscribers(f),c=a.id,d=a.className,b=a.selector,h,i;j=Boolean(j);if(e!==null){h=e[1];i=e[2];if(h==="#"){if(!c.hasOwnProperty(i)||(!j&&--c[i]>0)){return true}delete c[i];c.$length--}else{if(!d.hasOwnProperty(i)||(!j&&--d[i]>0)){return true}delete d[i];d.$length--}}else{if(g===this.SELECTOR_ALL){if(j){a.all=0}else{a.all--}}else{if(!b.hasOwnProperty(g)||(!j&&--b[g]>0)){return true}delete b[g];Ext.Array.remove(b,g)}}a.$length--;return true},getElementTarget:function(a){if(a.nodeType!==1){a=a.parentNode;if(!a||a.nodeType!==1){return null}}return a},getBubblingTargets:function(b){var a=[];if(!b){return a}do{a[a.length]=b;b=b.parentNode}while(b&&b.nodeType===1);return a},dispatch:function(c,a,b){b.push(b[0].target);this.callParent(arguments)},publish:function(b,a,c){var d=this.getSubscribers(b),e;if(d.$length===0||!this.doPublish(d,b,a,c)){e=this.getSubscribers("*");if(e.$length>0){this.doPublish(e,b,a,c)}}return this},doPublish:function(f,h,x,u){var r=f.id,g=f.className,b=f.selector,p=r.$length>0,a=g.$length>0,l=b.length>0,o=f.all>0,y={},e=[u],q=false,m=this.classNameSplitRegex,v,k,t,d,z,n,c,w,s;for(v=0,k=x.length;v<k;v++){z=x[v];u.setDelegatedTarget(z);if(p){n=z.id;if(n){if(r.hasOwnProperty(n)){q=true;this.dispatch("#"+n,h,e)}}}if(a){c=z.className;if(c){w=c.split(m);for(t=0,d=w.length;t<d;t++){c=w[t];if(!y[c]){y[c]=true;if(g.hasOwnProperty(c)){q=true;this.dispatch("."+c,h,e)}}}}}if(u.isStopped){return q}}if(o&&!q){u.setDelegatedTarget(u.browserEvent.target);q=true;this.dispatch(this.ALL_SELECTOR,h,e);if(u.isStopped){return q}}if(l){for(t=0,d=x.length;t<d;t++){z=x[t];for(v=0,k=b.length;v<k;v++){s=b[v];if(this.matchesSelector(z,s)){u.setDelegatedTarget(z);q=true;this.dispatch(s,h,e)}if(u.isStopped){return q}}}}return q},matchesSelector:function(b,a){if("webkitMatchesSelector" in b){return b.webkitMatchesSelector(a)}return Ext.DomQuery.is(b,a)},onEvent:function(d){var b=this.eventNameMap[d.type];if(!b||this.getSubscribersCount(b)===0){return}var c=this.getElementTarget(d.target),a;if(!c){return}if(this.doesEventBubble(b)){a=this.getBubblingTargets(c)}else{a=[c]}this.publish(b,a,new Ext.event.Dom(d))},getSubscribersCount:function(a){if(!this.handles(a)){return 0}return this.getSubscribers(a).$length+this.getSubscribers("*").$length}});Ext.define("Ext.event.publisher.TouchGesture",{extend:"Ext.event.publisher.Dom",requires:["Ext.util.Point","Ext.event.Touch"],handledEvents:["touchstart","touchmove","touchend","touchcancel"],moveEventName:"touchmove",config:{moveThrottle:1,buffering:{enabled:false,interval:10},recognizers:{}},currentTouchesCount:0,constructor:function(a){this.processEvents=Ext.Function.bind(this.processEvents,this);this.eventProcessors={touchstart:this.onTouchStart,touchmove:this.onTouchMove,touchend:this.onTouchEnd,touchcancel:this.onTouchEnd};this.eventToRecognizerMap={};this.activeRecognizers=[];this.currentRecognizers=[];this.currentTargets={};this.currentTouches={};this.buffer=[];this.initConfig(a);return this.callParent()},applyBuffering:function(a){if(a.enabled===true){this.bufferTimer=setInterval(this.processEvents,a.interval)}else{clearInterval(this.bufferTimer)}return a},applyRecognizers:function(b){var c,a;for(c in b){if(b.hasOwnProperty(c)){a=b[c];this.registerRecognizer(a)}}return b},handles:function(a){return this.callParent(arguments)||this.eventToRecognizerMap.hasOwnProperty(a)},doesEventBubble:function(){return true},eventLogs:[],onEvent:function(b){var a=this.getBuffering();b=new Ext.event.Touch(b);if(a.enabled){this.buffer.push(b)}else{this.processEvent(b)}},processEvents:function(){var a=this.buffer,f=a.length,d=[],c,e,b;if(f>0){c=a.slice(0);a.length=0;for(b=0;b<f;b++){e=c[b];if(e.type===this.moveEventName){d.push(e)}else{if(d.length>0){this.processEvent(this.mergeEvents(d));d.length=0}this.processEvent(e)}}if(d.length>0){this.processEvent(this.mergeEvents(d));d.length=0}}},mergeEvents:function(c){var b=[],f=c.length,a,e,d;d=c[f-1];if(f===1){return d}for(a=0;a<f;a++){e=c[a];b.push(e.changedTouches)}d.changedTouches=this.mergeTouchLists(b);return d},mergeTouchLists:function(l){var e={},h=[],d,k,a,b,f,c,g;for(d=0,k=l.length;d<k;d++){a=l[d];for(b=0,f=a.length;b<f;b++){c=a[b];g=c.identifier;e[g]=c}}for(g in e){if(e.hasOwnProperty(g)){h.push(e[g])}}return h},registerRecognizer:function(a){var g=this.eventToRecognizerMap,e=this.activeRecognizers,c=a.getHandledEvents(),d,f,b;a.setOnRecognized(this.onRecognized);a.setCallbackScope(this);for(d=0,f=c.length;d<f;d++){b=c[d];g[b]=a}e.push(a);return this},onRecognized:function(f,h,d,a){var k=[],j=d.length,g,c,b;if(j===1){return this.publish(f,d[0].targets,h,a)}for(c=0;c<j;c++){b=d[c];k.push(b.targets)}g=this.getCommonTargets(k);this.publish(f,g,h,a)},publish:function(b,a,c,d){c.set(d);return this.callParent([b,a,c])},getCommonTargets:function(a){var h=a[0],f=a.length;if(f===1){return h}var d=[],e=1,g,b,c;while(true){g=h[h.length-e];if(!g){return d}for(c=1;c<f;c++){b=a[c];if(b[b.length-e]!==g){return d}}d.unshift(g);e++}return d},invokeRecognizers:function(c,g){var b=this.activeRecognizers,f=b.length,d,a;if(c==="onStart"){for(d=0;d<f;d++){b[d].isActive=true}}for(d=0;d<f;d++){a=b[d];if(a.isActive&&a[c].call(a,g)===false){a.isActive=false}}},getActiveRecognizers:function(){return this.activeRecognizers},processEvent:function(a){this.eventProcessors[a.type].call(this,a)},onTouchStart:function(k){var m=this.currentTargets,g=this.currentTouches,o=this.currentTouchesCount,n=k.changedTouches,f=k.touches,h=f.length,a={},l=n.length,d,c,j,b;o+=l;if(o>h){for(d=0;d<h;d++){c=f[d];j=c.identifier;a[j]=true}for(j in g){if(g.hasOwnProperty(j)){if(!a[j]){o--;b=k.clone();c=g[j];c.targets=this.getBubblingTargets(this.getElementTarget(c.target));b.changedTouches=[c];this.onTouchEnd(b)}}}if(o>h){return}}for(d=0;d<l;d++){c=n[d];j=c.identifier;if(!g.hasOwnProperty(j)){this.currentTouchesCount++}g[j]=c;m[j]=this.getBubblingTargets(this.getElementTarget(c.target))}k.setTargets(m);for(d=0;d<l;d++){c=n[d];this.publish("touchstart",c.targets,k,{touch:c})}if(!this.isStarted){this.isStarted=true;this.invokeRecognizers("onStart",k)}this.invokeRecognizers("onTouchStart",k)},onTouchMove:function(j){if(!this.isStarted){return}var l=this.currentTargets,g=this.currentTouches,c=this.getMoveThrottle(),m=j.changedTouches,b=0,f,k,d,n,a,h;j.setTargets(l);for(f=0,k=m.length;f<k;f++){d=m[f];h=d.identifier;n=d.point;a=g[h].point;if(c&&n.isCloseTo(a,c)){b++;continue}g[h]=d;this.publish("touchmove",d.targets,j,{touch:d})}if(b<k){this.invokeRecognizers("onTouchMove",j)}},onTouchEnd:function(d){if(!this.isStarted){return}var h=this.currentTargets,c=this.currentTouches,k=d.changedTouches,g=k.length,j,f,b,a;d.setTargets(h);this.currentTouchesCount-=g;j=(this.currentTouchesCount===0);if(j){this.isStarted=false}for(b=0;b<g;b++){a=k[b];f=a.identifier;delete c[f];delete h[f];this.publish("touchend",a.targets,d,{touch:a})}this.invokeRecognizers("onTouchEnd",d);if(j){this.invokeRecognizers("onEnd",d)}}},function(){if(!Ext.feature.has.Touch){this.override({moveEventName:"mousemove",map:{mouseToTouch:{mousedown:"touchstart",mousemove:"touchmove",mouseup:"touchend"},touchToMouse:{touchstart:"mousedown",touchmove:"mousemove",touchend:"mouseup"}},attachListener:function(a){a=this.map.touchToMouse[a];if(!a){return}return this.callOverridden([a])},lastEventType:null,onEvent:function(d){if("button" in d&&d.button!==0){return}var c=d.type,b=[d];if(c==="mousedown"&&this.lastEventType&&this.lastEventType!=="mouseup"){var a=document.createEvent("MouseEvent");a.initMouseEvent("mouseup",d.bubbles,d.cancelable,document.defaultView,d.detail,d.screenX,d.screenY,d.clientX,d.clientY,d.ctrlKey,d.altKey,d.shiftKey,d.metaKey,d.metaKey,d.button,d.relatedTarget);this.onEvent(a)}if(c!=="mousemove"){this.lastEventType=c}d.identifier=1;d.touches=(c!=="mouseup")?b:[];d.targetTouches=(c!=="mouseup")?b:[];d.changedTouches=b;return this.callOverridden([d])},processEvent:function(a){this.eventProcessors[this.map.mouseToTouch[a.type]].call(this,a)}})}});Ext.define("Ext.event.recognizer.MultiTouch",{extend:"Ext.event.recognizer.Touch",requiredTouchesCount:2,isTracking:false,isStarted:false,onTouchStart:function(d){var a=this.requiredTouchesCount,c=d.touches,b=c.length;if(b===a){this.start(d)}else{if(b>a){this.end(d)}}},onTouchEnd:function(a){this.end(a)},start:function(){if(!this.isTracking){this.isTracking=true;this.isStarted=false}},end:function(a){if(this.isTracking){this.isTracking=false;if(this.isStarted){this.isStarted=false;this.fireEnd(a)}}}});Ext.define("Ext.event.recognizer.Pinch",{extend:"Ext.event.recognizer.MultiTouch",requiredTouchesCount:2,handledEvents:["pinchstart","pinch","pinchend"],startDistance:0,lastTouches:null,onTouchMove:function(c){if(!this.isTracking){return}var b=Array.prototype.slice.call(c.touches),d,a,f;d=b[0].point;a=b[1].point;f=d.getDistanceTo(a);if(f===0){return}if(!this.isStarted){this.isStarted=true;this.startDistance=f;this.fire("pinchstart",c,b,{touches:b,distance:f,scale:1})}else{this.fire("pinch",c,b,{touches:b,distance:f,scale:f/this.startDistance})}this.lastTouches=b},fireEnd:function(a){this.fire("pinchend",a,this.lastTouches)},fail:function(){return this.callParent(arguments)}});Ext.define("Ext.event.recognizer.Rotate",{extend:"Ext.event.recognizer.MultiTouch",requiredTouchesCount:2,handledEvents:["rotatestart","rotate","rotateend"],startAngle:0,lastTouches:null,lastAngle:null,onTouchMove:function(h){if(!this.isTracking){return}var g=Array.prototype.slice.call(h.touches),b=this.lastAngle,d,f,c,a,i,j;d=g[0].point;f=g[1].point;c=d.getAngleTo(f);if(b!==null){j=Math.abs(b-c);a=c+360;i=c-360;if(Math.abs(a-b)<j){c=a}else{if(Math.abs(i-b)<j){c=i}}}this.lastAngle=c;if(!this.isStarted){this.isStarted=true;this.startAngle=c;this.fire("rotatestart",h,g,{touches:g,angle:c,rotation:0})}else{this.fire("rotate",h,g,{touches:g,angle:c,rotation:c-this.startAngle})}this.lastTouches=g},fireEnd:function(a){this.lastAngle=null;this.fire("rotateend",a,this.lastTouches)}});Ext.define("Ext.event.recognizer.SingleTouch",{extend:"Ext.event.recognizer.Touch",inheritableStatics:{NOT_SINGLE_TOUCH:1,TOUCH_MOVED:2},onTouchStart:function(a){if(a.touches.length>1){return this.fail(this.self.NOT_SINGLE_TOUCH)}}});Ext.define("Ext.event.recognizer.DoubleTap",{extend:"Ext.event.recognizer.SingleTouch",config:{maxDuration:300},handledEvents:["singletap","doubletap"],singleTapTimer:null,onTouchStart:function(a){if(this.callParent(arguments)===false){return false}this.startTime=a.time;clearTimeout(this.singleTapTimer)},onTouchMove:function(){return this.fail(this.self.TOUCH_MOVED)},onEnd:function(g){var c=this,b=this.getMaxDuration(),h=g.changedTouches[0],f=g.time,a=this.lastTapTime,d;this.lastTapTime=f;if(a){d=f-a;if(d<=b){this.lastTapTime=0;this.fire("doubletap",g,[h],{touch:h,duration:d});return}}if(f-this.startTime>b){this.fireSingleTap(g,h)}else{this.singleTapTimer=setTimeout(function(){c.fireSingleTap(g,h)},b)}},fireSingleTap:function(a,b){this.fire("singletap",a,[b],{touch:b})}});Ext.define("Ext.event.recognizer.Drag",{extend:"Ext.event.recognizer.SingleTouch",isStarted:false,startPoint:null,previousPoint:null,lastPoint:null,handledEvents:["dragstart","drag","dragend"],onTouchStart:function(b){var c,a;if(this.callParent(arguments)===false){if(this.isStarted&&this.lastMoveEvent!==null){this.onTouchEnd(this.lastMoveEvent)}return false}this.startTouches=c=b.changedTouches;this.startTouch=a=c[0];this.startPoint=a.point},onTouchMove:function(d){var c=d.changedTouches,f=c[0],a=f.point,b=d.time;if(this.lastPoint){this.previousPoint=this.lastPoint}if(this.lastTime){this.previousTime=this.lastTime}this.lastTime=b;this.lastPoint=a;this.lastMoveEvent=d;if(!this.isStarted){this.isStarted=true;this.startTime=b;this.previousTime=b;this.previousPoint=this.startPoint;this.fire("dragstart",d,this.startTouches,this.getInfo(d,this.startTouch))}else{this.fire("drag",d,c,this.getInfo(d,f))}},onTouchEnd:function(c){if(this.isStarted){var b=c.changedTouches,d=b[0],a=d.point;this.isStarted=false;this.lastPoint=a;this.fire("dragend",c,b,this.getInfo(c,d));this.startTime=0;this.previousTime=0;this.lastTime=0;this.startPoint=null;this.previousPoint=null;this.lastPoint=null;this.lastMoveEvent=null}},getInfo:function(j,i){var d=j.time,a=this.startPoint,f=this.previousPoint,b=this.startTime,k=this.previousTime,l=this.lastPoint,h=l.x-a.x,g=l.y-a.y,c={touch:i,startX:a.x,startY:a.y,previousX:f.x,previousY:f.y,pageX:l.x,pageY:l.y,deltaX:h,deltaY:g,absDeltaX:Math.abs(h),absDeltaY:Math.abs(g),previousDeltaX:l.x-f.x,previousDeltaY:l.y-f.y,time:d,startTime:b,previousTime:k,deltaTime:d-b,previousDeltaTime:d-k};return c}});Ext.define("Ext.event.recognizer.LongPress",{extend:"Ext.event.recognizer.SingleTouch",inheritableStatics:{DURATION_NOT_ENOUGH:32},config:{minDuration:1000},handledEvents:["longpress"],fireLongPress:function(a){var b=a.changedTouches[0];this.fire("longpress",a,[b],{touch:b,duration:this.getMinDuration()});this.isLongPress=true},onTouchStart:function(b){var a=this;if(this.callParent(arguments)===false){return false}this.isLongPress=false;this.timer=setTimeout(function(){a.fireLongPress(b)},this.getMinDuration())},onTouchMove:function(){return this.fail(this.self.TOUCH_MOVED)},onTouchEnd:function(){if(!this.isLongPress){return this.fail(this.self.DURATION_NOT_ENOUGH)}},fail:function(){clearTimeout(this.timer);return this.callParent(arguments)}},function(){});Ext.define("Ext.event.recognizer.Tap",{handledEvents:["tap"],extend:"Ext.event.recognizer.SingleTouch",onTouchMove:function(){return this.fail(this.self.TOUCH_MOVED)},onTouchEnd:function(a){var b=a.changedTouches[0];this.fire("tap",a,[b])}},function(){});(function(){function b(d){var c=Array.prototype.slice.call(arguments,1);return d.replace(/\{(\d+)\}/g,function(e,f){return c[f]})}Ext.DateExtras={now:Date.now||function(){return +new Date()},getElapsed:function(d,c){return Math.abs(d-(c||new Date()))},useStrict:false,formatCodeToRegex:function(d,c){var e=a.parseCodes[d];if(e){e=typeof e=="function"?e():e;a.parseCodes[d]=e}return e?Ext.applyIf({c:e.c?b(e.c,c||"{0}"):e.c},e):{g:0,c:null,s:Ext.String.escapeRegex(d)}},parseFunctions:{MS:function(d,c){var e=new RegExp("\\/Date\\(([-+])?(\\d+)(?:[+-]\\d{4})?\\)\\/");var f=(d||"").match(e);return f?new Date(((f[1]||"")+f[2])*1):null}},parseRegexes:[],formatFunctions:{MS:function(){return"\\/Date("+this.getTime()+")\\/"}},y2kYear:50,MILLI:"ms",SECOND:"s",MINUTE:"mi",HOUR:"h",DAY:"d",MONTH:"mo",YEAR:"y",defaults:{},dayNames:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],monthNames:["January","February","March","April","May","June","July","August","September","October","November","December"],monthNumbers:{Jan:0,Feb:1,Mar:2,Apr:3,May:4,Jun:5,Jul:6,Aug:7,Sep:8,Oct:9,Nov:10,Dec:11},defaultFormat:"m/d/Y",getShortMonthName:function(c){return a.monthNames[c].substring(0,3)},getShortDayName:function(c){return a.dayNames[c].substring(0,3)},getMonthNumber:function(c){return a.monthNumbers[c.substring(0,1).toUpperCase()+c.substring(1,3).toLowerCase()]},formatCodes:{d:"Ext.String.leftPad(this.getDate(), 2, '0')",D:"Ext.Date.getShortDayName(this.getDay())",j:"this.getDate()",l:"Ext.Date.dayNames[this.getDay()]",N:"(this.getDay() ? this.getDay() : 7)",S:"Ext.Date.getSuffix(this)",w:"this.getDay()",z:"Ext.Date.getDayOfYear(this)",W:"Ext.String.leftPad(Ext.Date.getWeekOfYear(this), 2, '0')",F:"Ext.Date.monthNames[this.getMonth()]",m:"Ext.String.leftPad(this.getMonth() + 1, 2, '0')",M:"Ext.Date.getShortMonthName(this.getMonth())",n:"(this.getMonth() + 1)",t:"Ext.Date.getDaysInMonth(this)",L:"(Ext.Date.isLeapYear(this) ? 1 : 0)",o:"(this.getFullYear() + (Ext.Date.getWeekOfYear(this) == 1 && this.getMonth() > 0 ? +1 : (Ext.Date.getWeekOfYear(this) >= 52 && this.getMonth() < 11 ? -1 : 0)))",Y:"Ext.String.leftPad(this.getFullYear(), 4, '0')",y:"('' + this.getFullYear()).substring(2, 4)",a:"(this.getHours() < 12 ? 'am' : 'pm')",A:"(this.getHours() < 12 ? 'AM' : 'PM')",g:"((this.getHours() % 12) ? this.getHours() % 12 : 12)",G:"this.getHours()",h:"Ext.String.leftPad((this.getHours() % 12) ? this.getHours() % 12 : 12, 2, '0')",H:"Ext.String.leftPad(this.getHours(), 2, '0')",i:"Ext.String.leftPad(this.getMinutes(), 2, '0')",s:"Ext.String.leftPad(this.getSeconds(), 2, '0')",u:"Ext.String.leftPad(this.getMilliseconds(), 3, '0')",O:"Ext.Date.getGMTOffset(this)",P:"Ext.Date.getGMTOffset(this, true)",T:"Ext.Date.getTimezone(this)",Z:"(this.getTimezoneOffset() * -60)",c:function(){for(var j="Y-m-dTH:i:sP",g=[],f=0,d=j.length;f<d;++f){var h=j.charAt(f);g.push(h=="T"?"'T'":a.getFormatCode(h))}return g.join(" + ")},U:"Math.round(this.getTime() / 1000)"},isValid:function(n,c,l,j,f,g,e){j=j||0;f=f||0;g=g||0;e=e||0;var k=a.add(new Date(n<100?100:n,c-1,l,j,f,g,e),a.YEAR,n<100?n-100:0);return n==k.getFullYear()&&c==k.getMonth()+1&&l==k.getDate()&&j==k.getHours()&&f==k.getMinutes()&&g==k.getSeconds()&&e==k.getMilliseconds()},parse:function(d,f,c){var e=a.parseFunctions;if(e[f]==null){a.createParser(f)}return e[f](d,Ext.isDefined(c)?c:a.useStrict)},parseDate:function(d,e,c){return a.parse(d,e,c)},getFormatCode:function(d){var c=a.formatCodes[d];if(c){c=typeof c=="function"?c():c;a.formatCodes[d]=c}return c||("'"+Ext.String.escape(d)+"'")},createFormat:function(g){var f=[],c=false,e="";for(var d=0;d<g.length;++d){e=g.charAt(d);if(!c&&e=="\\"){c=true}else{if(c){c=false;f.push("'"+Ext.String.escape(e)+"'")}else{f.push(a.getFormatCode(e))}}}a.formatFunctions[g]=Ext.functionFactory("return "+f.join("+"))},createParser:(function(){var c=["var dt, y, m, d, h, i, s, ms, o, z, zz, u, v,","def = Ext.Date.defaults,","results = String(input).match(Ext.Date.parseRegexes[{0}]);","if(results){","{1}","if(u != null){","v = new Date(u * 1000);","}else{","dt = Ext.Date.clearTime(new Date);","y = Ext.Number.from(y, Ext.Number.from(def.y, dt.getFullYear()));","m = Ext.Number.from(m, Ext.Number.from(def.m - 1, dt.getMonth()));","d = Ext.Number.from(d, Ext.Number.from(def.d, dt.getDate()));","h  = Ext.Number.from(h, Ext.Number.from(def.h, dt.getHours()));","i  = Ext.Number.from(i, Ext.Number.from(def.i, dt.getMinutes()));","s  = Ext.Number.from(s, Ext.Number.from(def.s, dt.getSeconds()));","ms = Ext.Number.from(ms, Ext.Number.from(def.ms, dt.getMilliseconds()));","if(z >= 0 && y >= 0){","v = Ext.Date.add(new Date(y < 100 ? 100 : y, 0, 1, h, i, s, ms), Ext.Date.YEAR, y < 100 ? y - 100 : 0);","v = !strict? v : (strict === true && (z <= 364 || (Ext.Date.isLeapYear(v) && z <= 365))? Ext.Date.add(v, Ext.Date.DAY, z) : null);","}else if(strict === true && !Ext.Date.isValid(y, m + 1, d, h, i, s, ms)){","v = null;","}else{","v = Ext.Date.add(new Date(y < 100 ? 100 : y, m, d, h, i, s, ms), Ext.Date.YEAR, y < 100 ? y - 100 : 0);","}","}","}","if(v){","if(zz != null){","v = Ext.Date.add(v, Ext.Date.SECOND, -v.getTimezoneOffset() * 60 - zz);","}else if(o){","v = Ext.Date.add(v, Ext.Date.MINUTE, -v.getTimezoneOffset() + (sn == '+'? -1 : 1) * (hr * 60 + mn));","}","}","return v;"].join("\n");return function(l){var e=a.parseRegexes.length,m=1,f=[],k=[],j=false,d="";for(var h=0;h<l.length;++h){d=l.charAt(h);if(!j&&d=="\\"){j=true}else{if(j){j=false;k.push(Ext.String.escape(d))}else{var g=a.formatCodeToRegex(d,m);m+=g.g;k.push(g.s);if(g.g&&g.c){f.push(g.c)}}}}a.parseRegexes[e]=new RegExp("^"+k.join("")+"$","i");a.parseFunctions[l]=Ext.functionFactory("input","strict",b(c,e,f.join("")))}})(),parseCodes:{d:{g:1,c:"d = parseInt(results[{0}], 10);\n",s:"(\\d{2})"},j:{g:1,c:"d = parseInt(results[{0}], 10);\n",s:"(\\d{1,2})"},D:function(){for(var c=[],d=0;d<7;c.push(a.getShortDayName(d)),++d){}return{g:0,c:null,s:"(?:"+c.join("|")+")"}},l:function(){return{g:0,c:null,s:"(?:"+a.dayNames.join("|")+")"}},N:{g:0,c:null,s:"[1-7]"},S:{g:0,c:null,s:"(?:st|nd|rd|th)"},w:{g:0,c:null,s:"[0-6]"},z:{g:1,c:"z = parseInt(results[{0}], 10);\n",s:"(\\d{1,3})"},W:{g:0,c:null,s:"(?:\\d{2})"},F:function(){return{g:1,c:"m = parseInt(Ext.Date.getMonthNumber(results[{0}]), 10);\n",s:"("+a.monthNames.join("|")+")"}},M:function(){for(var c=[],d=0;d<12;c.push(a.getShortMonthName(d)),++d){}return Ext.applyIf({s:"("+c.join("|")+")"},a.formatCodeToRegex("F"))},m:{g:1,c:"m = parseInt(results[{0}], 10) - 1;\n",s:"(\\d{2})"},n:{g:1,c:"m = parseInt(results[{0}], 10) - 1;\n",s:"(\\d{1,2})"},t:{g:0,c:null,s:"(?:\\d{2})"},L:{g:0,c:null,s:"(?:1|0)"},o:function(){return a.formatCodeToRegex("Y")},Y:{g:1,c:"y = parseInt(results[{0}], 10);\n",s:"(\\d{4})"},y:{g:1,c:"var ty = parseInt(results[{0}], 10);\ny = ty > Ext.Date.y2kYear ? 1900 + ty : 2000 + ty;\n",s:"(\\d{1,2})"},a:{g:1,c:"if (/(am)/i.test(results[{0}])) {\nif (!h || h == 12) { h = 0; }\n} else { if (!h || h < 12) { h = (h || 0) + 12; }}",s:"(am|pm|AM|PM)"},A:{g:1,c:"if (/(am)/i.test(results[{0}])) {\nif (!h || h == 12) { h = 0; }\n} else { if (!h || h < 12) { h = (h || 0) + 12; }}",s:"(AM|PM|am|pm)"},g:function(){return a.formatCodeToRegex("G")},G:{g:1,c:"h = parseInt(results[{0}], 10);\n",s:"(\\d{1,2})"},h:function(){return a.formatCodeToRegex("H")},H:{g:1,c:"h = parseInt(results[{0}], 10);\n",s:"(\\d{2})"},i:{g:1,c:"i = parseInt(results[{0}], 10);\n",s:"(\\d{2})"},s:{g:1,c:"s = parseInt(results[{0}], 10);\n",s:"(\\d{2})"},u:{g:1,c:"ms = results[{0}]; ms = parseInt(ms, 10)/Math.pow(10, ms.length - 3);\n",s:"(\\d+)"},O:{g:1,c:["o = results[{0}];","var sn = o.substring(0,1),","hr = o.substring(1,3)*1 + Math.floor(o.substring(3,5) / 60),","mn = o.substring(3,5) % 60;","o = ((-12 <= (hr*60 + mn)/60) && ((hr*60 + mn)/60 <= 14))? (sn + Ext.String.leftPad(hr, 2, '0') + Ext.String.leftPad(mn, 2, '0')) : null;\n"].join("\n"),s:"([+-]\\d{4})"},P:{g:1,c:["o = results[{0}];","var sn = o.substring(0,1),","hr = o.substring(1,3)*1 + Math.floor(o.substring(4,6) / 60),","mn = o.substring(4,6) % 60;","o = ((-12 <= (hr*60 + mn)/60) && ((hr*60 + mn)/60 <= 14))? (sn + Ext.String.leftPad(hr, 2, '0') + Ext.String.leftPad(mn, 2, '0')) : null;\n"].join("\n"),s:"([+-]\\d{2}:\\d{2})"},T:{g:0,c:null,s:"[A-Z]{1,4}"},Z:{g:1,c:"zz = results[{0}] * 1;\nzz = (-43200 <= zz && zz <= 50400)? zz : null;\n",s:"([+-]?\\d{1,5})"},c:function(){var e=[],c=[a.formatCodeToRegex("Y",1),a.formatCodeToRegex("m",2),a.formatCodeToRegex("d",3),a.formatCodeToRegex("h",4),a.formatCodeToRegex("i",5),a.formatCodeToRegex("s",6),{c:"ms = results[7] || '0'; ms = parseInt(ms, 10)/Math.pow(10, ms.length - 3);\n"},{c:["if(results[8]) {","if(results[8] == 'Z'){","zz = 0;","}else if (results[8].indexOf(':') > -1){",a.formatCodeToRegex("P",8).c,"}else{",a.formatCodeToRegex("O",8).c,"}","}"].join("\n")}];for(var f=0,d=c.length;f<d;++f){e.push(c[f].c)}return{g:1,c:e.join(""),s:[c[0].s,"(?:","-",c[1].s,"(?:","-",c[2].s,"(?:","(?:T| )?",c[3].s,":",c[4].s,"(?::",c[5].s,")?","(?:(?:\\.|,)(\\d+))?","(Z|(?:[-+]\\d{2}(?::)?\\d{2}))?",")?",")?",")?"].join("")}},U:{g:1,c:"u = parseInt(results[{0}], 10);\n",s:"(-?\\d+)"}},dateFormat:function(c,d){return a.format(c,d)},format:function(d,e){if(a.formatFunctions[e]==null){a.createFormat(e)}var c=a.formatFunctions[e].call(d);return c+""},getTimezone:function(c){return c.toString().replace(/^.* (?:\((.*)\)|([A-Z]{1,4})(?:[\-+][0-9]{4})?(?: -?\d+)?)$/,"$1$2").replace(/[^A-Z]/g,"")},getGMTOffset:function(c,d){var e=c.getTimezoneOffset();return(e>0?"-":"+")+Ext.String.leftPad(Math.floor(Math.abs(e)/60),2,"0")+(d?":":"")+Ext.String.leftPad(Math.abs(e%60),2,"0")},getDayOfYear:function(f){var e=0,h=Ext.Date.clone(f),c=f.getMonth(),g;for(g=0,h.setDate(1),h.setMonth(0);g<c;h.setMonth(++g)){e+=a.getDaysInMonth(h)}return e+f.getDate()-1},getWeekOfYear:(function(){var c=86400000,d=7*c;return function(f){var g=Date.UTC(f.getFullYear(),f.getMonth(),f.getDate()+3)/c,e=Math.floor(g/7),h=new Date(e*d).getUTCFullYear();return e-Math.floor(Date.UTC(h,0,7)/d)+1}})(),isLeapYear:function(c){var d=c.getFullYear();return !!((d&3)==0&&(d%100||(d%400==0&&d)))},getFirstDayOfMonth:function(d){var c=(d.getDay()-(d.getDate()-1))%7;return(c<0)?(c+7):c},getLastDayOfMonth:function(c){return a.getLastDateOfMonth(c).getDay()},getFirstDateOfMonth:function(c){return new Date(c.getFullYear(),c.getMonth(),1)},getLastDateOfMonth:function(c){return new Date(c.getFullYear(),c.getMonth(),a.getDaysInMonth(c))},getDaysInMonth:(function(){var c=[31,28,31,30,31,30,31,31,30,31,30,31];return function(e){var d=e.getMonth();return d==1&&a.isLeapYear(e)?29:c[d]}})(),getSuffix:function(c){switch(c.getDate()){case 1:case 21:case 31:return"st";case 2:case 22:return"nd";case 3:case 23:return"rd";default:return"th"}},clone:function(c){return new Date(c.getTime())},isDST:function(c){return new Date(c.getFullYear(),0,1).getTimezoneOffset()!=c.getTimezoneOffset()},clearTime:function(e,i){if(i){return Ext.Date.clearTime(Ext.Date.clone(e))}var g=e.getDate();e.setHours(0);e.setMinutes(0);e.setSeconds(0);e.setMilliseconds(0);if(e.getDate()!=g){for(var f=1,h=a.add(e,Ext.Date.HOUR,f);h.getDate()!=g;f++,h=a.add(e,Ext.Date.HOUR,f)){}e.setDate(g);e.setHours(h.getHours())}return e},add:function(g,f,h){var i=Ext.Date.clone(g),c=Ext.Date;if(!f||h===0){return i}switch(f.toLowerCase()){case Ext.Date.MILLI:i.setMilliseconds(i.getMilliseconds()+h);break;case Ext.Date.SECOND:i.setSeconds(i.getSeconds()+h);break;case Ext.Date.MINUTE:i.setMinutes(i.getMinutes()+h);break;case Ext.Date.HOUR:i.setHours(i.getHours()+h);break;case Ext.Date.DAY:i.setDate(i.getDate()+h);break;case Ext.Date.MONTH:var e=g.getDate();if(e>28){e=Math.min(e,Ext.Date.getLastDateOfMonth(Ext.Date.add(Ext.Date.getFirstDateOfMonth(g),"mo",h)).getDate())}i.setDate(e);i.setMonth(g.getMonth()+h);break;case Ext.Date.YEAR:i.setFullYear(g.getFullYear()+h);break}return i},between:function(d,f,c){var e=d.getTime();return f.getTime()<=e&&e<=c.getTime()}};var a=Ext.DateExtras;Ext.apply(Ext.Date,a)})();Ext.define("Ext.fx.Easing",{requires:["Ext.fx.easing.Linear"],constructor:function(a){return Ext.factory(a,Ext.fx.easing.Linear,null,"easing")}});Ext.define("Ext.fx.easing.BoundMomentum",{extend:"Ext.fx.easing.Abstract",requires:["Ext.fx.easing.Momentum","Ext.fx.easing.Bounce"],config:{momentum:null,bounce:null,minMomentumValue:0,maxMomentumValue:0,minVelocity:0.01,startVelocity:0},applyMomentum:function(a,b){return Ext.factory(a,Ext.fx.easing.Momentum,b)},applyBounce:function(a,b){return Ext.factory(a,Ext.fx.easing.Bounce,b)},updateStartTime:function(a){this.getMomentum().setStartTime(a);this.callParent(arguments)},updateStartVelocity:function(a){this.getMomentum().setStartVelocity(a)},updateStartValue:function(a){this.getMomentum().setStartValue(a)},reset:function(){this.lastValue=null;this.isBouncingBack=false;this.isOutOfBound=false;return this.callParent(arguments)},getValue:function(){var a=this.getMomentum(),j=this.getBounce(),e=a.getStartVelocity(),f=e>0?1:-1,g=this.getMinMomentumValue(),d=this.getMaxMomentumValue(),c=(f==1)?d:g,h=this.lastValue,i,b;if(e===0){return this.getStartValue()}if(!this.isOutOfBound){i=a.getValue();b=a.getVelocity();if(Math.abs(b)<this.getMinVelocity()){this.isEnded=true}if(i>=g&&i<=d){return i}this.isOutOfBound=true;j.setStartTime(Ext.Date.now()).setStartVelocity(b).setStartValue(c)}i=j.getValue();if(!this.isEnded){if(!this.isBouncingBack){if(h!==null){if((f==1&&i<h)||(f==-1&&i>h)){this.isBouncingBack=true}}}else{if(Math.round(i)==c){this.isEnded=true}}}this.lastValue=i;return i}});Ext.define("Ext.fx.easing.EaseIn",{extend:"Ext.fx.easing.Linear",alias:"easing.ease-in",config:{exponent:4,duration:1500},getValue:function(){var c=Ext.Date.now()-this.getStartTime(),g=this.getDuration(),b=this.getStartValue(),a=this.getEndValue(),h=this.distance,e=c/g,d=Math.pow(e,this.getExponent()),f=b+(d*h);if(c>=g){this.isEnded=true;return a}return f}});Ext.define("Ext.fx.easing.EaseOut",{extend:"Ext.fx.easing.Linear",alias:"easing.ease-out",config:{exponent:4,duration:1500},getValue:function(){var f=Ext.Date.now()-this.getStartTime(),d=this.getDuration(),b=this.getStartValue(),h=this.getEndValue(),a=this.distance,c=f/d,g=1-c,e=1-Math.pow(g,this.getExponent()),i=b+(e*a);if(f>=d){this.isEnded=true;return h}return i}});Ext.define("Ext.mixin.Filterable",{extend:"Ext.mixin.Mixin",requires:["Ext.util.Filter"],mixinConfig:{id:"filterable"},config:{filters:null,filterRoot:null},dirtyFilterFn:false,filterFn:null,filtered:false,applyFilters:function(a,b){if(!b){b=this.createFiltersCollection()}b.clear();this.filtered=false;this.dirtyFilterFn=true;if(a){this.addFilters(a)}return b},createFiltersCollection:function(){this._filters=Ext.create("Ext.util.Collection",function(a){return a.getId()});return this._filters},addFilter:function(a){this.addFilters([a])},addFilters:function(b){var a=this.getFilters();return this.insertFilters(a?a.length:0,b)},insertFilter:function(a,b){return this.insertFilters(a,[b])},insertFilters:function(h,c){if(!Ext.isArray(c)){c=[c]}var j=c.length,a=this.getFilterRoot(),d=this.getFilters(),e=[],f,g,b;if(!d){d=this.createFiltersCollection()}for(g=0;g<j;g++){b=c[g];f={root:a};if(Ext.isFunction(b)){f.filterFn=b}else{if(Ext.isObject(b)){if(!b.isFilter){if(b.fn){b.filterFn=b.fn;delete b.fn}f=Ext.apply(f,b)}else{e.push(b);if(!b.getRoot()){b.setRoot(a)}continue}}}b=Ext.create("Ext.util.Filter",f);e.push(b)}for(g=0,j=e.length;g<j;g++){d.insert(h+g,e[g])}this.dirtyFilterFn=true;if(d.length){this.filtered=true}return d},removeFilters:function(e){if(!Ext.isArray(e)){e=[e]}var d=e.length,c=this.getFilters(),a,b;for(a=0;a<d;a++){b=e[a];if(typeof b==="string"){c.each(function(f){if(f.getProperty()===b){c.remove(f)}})}else{if(typeof b==="function"){c.each(function(f){if(f.getFilterFn()===b){c.remove(f)}})}else{if(b.isFilter){c.remove(b)}else{if(b.property!==undefined&&b.value!==undefined){c.each(function(f){if(f.getProperty()===b.property&&f.getValue()===b.value){c.remove(f)}})}}}}}if(!c.length){this.filtered=false}},updateFilterFn:function(){var a=this.getFilters().items;this.filterFn=function(h){var f=true,g=a.length,b;for(b=0;b<g;b++){var e=a[b],d=e.getFilterFn(),c=e.getScope()||this;f=f&&d.call(c,h)}return f};this.dirtyFilterFn=false;return this.filterFn},filter:function(a){return this.getFilters().length?Ext.Array.filter(a,this.getFilterFn()):a},isFiltered:function(a){return this.getFilters().length?!this.getFilterFn()(a):false},getFilterFn:function(){if(this.dirtyFilterFn){return this.updateFilterFn()}return this.filterFn}});Ext.define("Ext.mixin.Observable",{requires:["Ext.event.Dispatcher"],extend:"Ext.mixin.Mixin",mixins:["Ext.mixin.Identifiable"],mixinConfig:{id:"observable",hooks:{destroy:"destroy"}},alternateClassName:"Ext.util.Observable",isObservable:true,observableType:"observable",validIdRegex:/^([\w\-]+)$/,observableIdPrefix:"#",listenerOptionsRegex:/^(?:delegate|single|delay|buffer|args|prepend)$/,config:{listeners:null,bubbleEvents:null},constructor:function(a){this.initConfig(a)},applyListeners:function(a){if(a){this.addListener(a)}},applyBubbleEvents:function(a){if(a){this.enableBubble(a)}},getOptimizedObservableId:function(){return this.observableId},getObservableId:function(){if(!this.observableId){var a=this.getUniqueId();this.observableId=this.observableIdPrefix+a;this.getObservableId=this.getOptimizedObservableId}return this.observableId},getOptimizedEventDispatcher:function(){return this.eventDispatcher},getEventDispatcher:function(){if(!this.eventDispatcher){this.eventDispatcher=Ext.event.Dispatcher.getInstance();this.getEventDispatcher=this.getOptimizedEventDispatcher;this.getListeners();this.getBubbleEvents()}return this.eventDispatcher},getManagedListeners:function(c,b){var d=c.getUniqueId(),a=this.managedListeners;if(!a){this.managedListeners=a={}}if(!a[d]){a[d]={};c.doAddListener("destroy","clearManagedListeners",this,{single:true,args:[c]})}if(!a[d][b]){a[d][b]=[]}return a[d][b]},getUsedSelectors:function(){var a=this.usedSelectors;if(!a){a=this.usedSelectors=[];a.$map={}}return a},fireEvent:function(a){var b=Array.prototype.slice.call(arguments,1);return this.doFireEvent(a,b)},fireAction:function(c,e,g,f,d,a){var b=typeof g,h;if(e===undefined){e=[]}if(b!="undefined"){h={fn:g,isLateBinding:b=="string",scope:f||this,options:d||{},order:a}}return this.doFireEvent(c,e,h)},doFireEvent:function(b,c,e,a){if(this.eventFiringSuspended){return}var f=this.getObservableId(),d=this.getEventDispatcher();return d.dispatchEvent(this.observableType,f,b,c,e,a)},doAddListener:function(a,i,k,l,c){var e=(k&&k!==this&&k.isIdentifiable),b=this.getUsedSelectors(),f=b.$map,d=this.getObservableId(),g,j,h;if(!l){l={}}if(!k){k=this}if(l.delegate){h=l.delegate;d+=" "+h}if(!(d in f)){f[d]=true;b.push(d)}g=this.addDispatcherListener(d,a,i,k,l,c);if(g&&e){j=this.getManagedListeners(k,a);j.push({delegate:h,scope:k,fn:i,order:c})}return g},addDispatcherListener:function(b,d,f,e,c,a){return this.getEventDispatcher().addListener(this.observableType,b,d,f,e,c,a)},doRemoveListener:function(b,k,m,n,d){var g=(m&&m!==this&&m.isIdentifiable),e=this.getObservableId(),a,l,f,h,c,j;if(n&&n.delegate){j=n.delegate;e+=" "+j}if(!m){m=this}a=this.removeDispatcherListener(e,b,k,m,d);if(a&&g){l=this.getManagedListeners(m,b);for(f=0,h=l.length;f<h;f++){c=l[f];if(c.fn===k&&c.scope===m&&c.delegate===j&&c.order===d){l.splice(f,1);break}}}return a},removeDispatcherListener:function(b,c,e,d,a){return this.getEventDispatcher().removeListener(this.observableType,b,c,e,d,a)},clearManagedListeners:function(d){var j=this.managedListeners,a,c,h,f,e,g,b,k;if(!j){return this}if(d){if(typeof d!="string"){a=d.getUniqueId()}else{a=d}c=j[a];for(f in c){if(c.hasOwnProperty(f)){h=c[f];for(e=0,g=h.length;e<g;e++){b=h[e];k={};if(b.delegate){k.delegate=b.delegate}if(this.doRemoveListener(f,b.fn,b.scope,k,b.order)){e--;g--}}}}delete j[a];return this}for(a in j){if(j.hasOwnProperty(a)){this.clearManagedListeners(a)}}},changeListener:function(l,h,n,p,q,d){var b,m,g,j,a,o,f,k,c,e;if(typeof n!="undefined"){if(typeof h!="string"){for(f=0,k=h.length;f<k;f++){a=h[f];l.call(this,a,n,p,q,d)}return this}l.call(this,h,n,p,q,d)}else{if(Ext.isArray(h)){m=h;for(f=0,k=m.length;f<k;f++){c=m[f];l.call(this,c.event,c.fn,c.scope,c,c.order)}}else{g=this.listenerOptionsRegex;q=h;b=[];m=[];j={};for(a in q){o=q[a];if(a==="scope"){p=o;continue}else{if(a==="order"){d=o;continue}}if(!g.test(a)){e=typeof o;if(e!="string"&&e!="function"){l.call(this,a,o.fn,o.scope||p,o,o.order||d);continue}b.push(a);m.push(o)}else{j[a]=o}}for(f=0,k=b.length;f<k;f++){l.call(this,b[f],m[f],p,j,d)}}}},addListener:function(b,e,d,c,a){return this.changeListener(this.doAddListener,b,e,d,c,a)},addBeforeListener:function(a,d,c,b){return this.addListener(a,d,c,b,"before")},addAfterListener:function(a,d,c,b){return this.addListener(a,d,c,b,"after")},removeListener:function(b,e,d,c,a){return this.changeListener(this.doRemoveListener,b,e,d,c,a)},removeBeforeListener:function(a,d,c,b){return this.removeListener(a,d,c,b,"before")},removeAfterListener:function(a,d,c,b){return this.removeListener(a,d,c,b,"after")},clearListeners:function(){var e=this.getUsedSelectors(),c=this.getEventDispatcher(),b,d,a;for(b=0,d=e.length;b<d;b++){a=e[b];c.clearListeners(this.observableType,a)}},hasListener:function(a){return this.getEventDispatcher().hasListener(this.observableType,this.getObservableId(),a)},suspendEvents:function(a){this.eventFiringSuspended=true},resumeEvents:function(){this.eventFiringSuspended=false},relayEvents:function(b,d,g){var c,f,e,a;if(typeof g=="undefined"){g=""}if(typeof d=="string"){d=[d]}if(Ext.isArray(d)){for(c=0,f=d.length;c<f;c++){e=d[c];a=g+e;b.addListener(e,this.createEventRelayer(a),this)}}else{for(e in d){if(d.hasOwnProperty(e)){a=g+d[e];b.addListener(e,this.createEventRelayer(a),this)}}}return this},relayEvent:function(e,f,h,i,a){var g=typeof f,c=e[e.length-1],d=c.getInfo().eventName,b;e=Array.prototype.slice.call(e,0,-2);e[0]=this;if(g!="undefined"){b={fn:f,scope:h||this,options:i||{},order:a,isLateBinding:g=="string"}}return this.doFireEvent(d,e,b,c)},createEventRelayer:function(a){return function(){return this.doFireEvent(a,Array.prototype.slice.call(arguments,0,-2))}},enableBubble:function(d){var a=this.isBubblingEnabled,c,e,b;if(!a){a=this.isBubblingEnabled={}}if(typeof d=="string"){d=Ext.Array.clone(arguments)}for(c=0,e=d.length;c<e;c++){b=d[c];if(!a[b]){a[b]=true;this.addListener(b,this.createEventBubbler(b),this)}}},createEventBubbler:function(a){return function b(){var c=("getBubbleTarget" in this)?this.getBubbleTarget():null;if(c&&c!==this&&c.isObservable){c.fireAction(a,Array.prototype.slice.call(arguments,0,-2),b,c,null,"after")}}},getBubbleTarget:function(){return false},destroy:function(){if(this.observableId){this.fireEvent("destroy",this);this.clearListeners();this.clearManagedListeners()}},addEvents:Ext.emptyFn},function(){this.createAlias({on:"addListener",un:"removeListener",onBefore:"addBeforeListener",onAfter:"addAfterListener",unBefore:"removeBeforeListener",unAfter:"removeAfterListener"})});Ext.define("Ext.Evented",{alternateClassName:"Ext.EventedBase",mixins:["Ext.mixin.Observable"],statics:{generateSetter:function(e){var c=e.internal,b=e.apply,a=e.changeEvent,d=e.doSet;return function(h){var i=this.initialized,g=this[c],f=this[b];if(f){h=f.call(this,h,g);if(typeof h=="undefined"){return this}}if(h!==g){if(i){this.fireAction(a,[this,h,g],this.doSet,this,{nameMap:e})}else{this[c]=h;this[d].call(this,h,g)}}return this}}},initialized:false,constructor:function(a){this.initialConfig=a;this.initialize()},initialize:function(){this.initConfig(this.initialConfig);this.initialized=true},doSet:function(c,d,b,a){var e=a.nameMap;c[e.internal]=d;c[e.doSet].call(this,d,b)},onClassExtended:function(a,e){if(!e.hasOwnProperty("eventedConfig")){return}var d=Ext.Class,c=e.config,g=e.eventedConfig,b,f;e.config=(c)?Ext.applyIf(c,g):g;for(b in g){if(g.hasOwnProperty(b)){f=d.getConfigNameMap(b);e[f.set]=this.generateSetter(f)}}}});Ext.define("Ext.AbstractComponent",{extend:"Ext.Evented",onClassExtended:function(b,f){if(!f.hasOwnProperty("cachedConfig")){return}var g=b.prototype,c=f.config,e=f.cachedConfig,d=g.cachedConfigList,i=g.hasCachedConfig,a,h;delete f.cachedConfig;g.cachedConfigList=d=(d)?d.slice():[];g.hasCachedConfig=i=(i)?Ext.Object.chain(i):{};if(!c){f.config=c={}}for(a in e){if(e.hasOwnProperty(a)){h=e[a];if(!i[a]){i[a]=true;d.push(a)}c[a]=h}}},getElementConfig:Ext.emptyFn,referenceAttributeName:"reference",referenceSelector:"[reference]",addReferenceNode:function(a,b){Ext.Object.defineProperty(this,a,{get:function(){var c;delete this[a];this[a]=c=new Ext.Element(b);return c},configurable:true})},initElement:function(){var k=this.self.prototype,n=this.getId(),s=[],g=true,x=this.referenceAttributeName,p=false,e,v,b,o,t,d,l,c,f,j,w,m,a,q,h,y,u,r;if(k.hasOwnProperty("renderTemplate")){e=this.renderTemplate.cloneNode(true);v=e.firstChild}else{g=false;p=true;e=document.createDocumentFragment();v=Ext.Element.create(this.getElementConfig(),true);e.appendChild(v)}o=e.querySelectorAll(this.referenceSelector);for(t=0,d=o.length;t<d;t++){l=o[t];c=l.getAttribute(x);if(g){l.removeAttribute(x)}if(c=="element"){l.id=n;this.element=b=new Ext.Element(l)}else{this.addReferenceNode(c,l)}s.push(c)}this.referenceList=s;if(!this.innerElement){this.innerElement=b}if(v===b.dom){this.renderElement=b}else{this.addReferenceNode("renderElement",v)}if(p){f=Ext.Class.configNameCache;j=this.config;w=this.cachedConfigList;m=this.initConfigList;a=this.initConfigMap;q=[];for(t=0,d=w.length;t<d;t++){y=w[t];u=f[y];if(a[y]){a[y]=false;Ext.Array.remove(m,y)}if(j[y]!==null){q.push(y);this[u.get]=this[u.initGet]}}for(t=0,d=q.length;t<d;t++){y=q[t];u=f[y];r=u.internal;this[r]=null;this[u.set].call(this,j[y]);delete this[u.get];k[r]=this[r]}v=this.renderElement.dom;k.renderTemplate=e=document.createDocumentFragment();e.appendChild(v.cloneNode(true));h=e.querySelectorAll("[id]");for(t=0,d=h.length;t<d;t++){b=h[t];b.removeAttribute("id")}for(t=0,d=s.length;t<d;t++){c=s[t];this[c].dom.removeAttribute("reference")}}return this}});Ext.define("Ext.app.Controller",{mixins:{observable:"Ext.mixin.Observable"},config:{refs:{},routes:{},control:{},before:{},application:{},stores:[],models:[],views:[]},constructor:function(a){this.initConfig(a);this.mixins.observable.constructor.call(this,a)},init:Ext.emptyFn,launch:Ext.emptyFn,redirectTo:function(a){return this.getApplication().redirectTo(a)},execute:function(b,a){b.setBeforeFilters(this.getBefore()[b.getAction()]);b.execute()},applyBefore:function(e){var d,a,c,b;for(a in e){d=Ext.Array.from(e[a]);c=d.length;for(b=0;b<c;b++){d[b]=this[d[b]]}e[a]=d}return e},applyControl:function(a){this.control(a,this);return a},applyRefs:function(a){this.ref(a);return a},applyRoutes:function(a){var f=this instanceof Ext.app.Application?this:this.getApplication(),c=f.getRouter(),b,e,d;for(e in a){b=a[e];d={controller:this.$className};if(Ext.isString(b)){d.action=b}else{Ext.apply(d,b)}c.connect(e,d)}return a},applyStores:function(a){return this.getFullyQualified(a,"store")},applyModels:function(a){return this.getFullyQualified(a,"model")},applyViews:function(a){return this.getFullyQualified(a,"view")},getFullyQualified:function(b,e){var f=b.length,a=this.getApplication().getName(),c,d;for(d=0;d<f;d++){c=b[d];if(Ext.isString(c)&&(Ext.Loader.getPrefix(c)===""||c===a)){b[d]=a+"."+e+"."+c}}return b},control:function(a){this.getApplication().control(a,this)},ref:function(b){var e,c,a,d;for(e in b){a=b[e];c="get"+Ext.String.capitalize(e);if(!this[c]){if(Ext.isString(b[e])){d={ref:e,selector:a}}else{d=b[e]}this[c]=Ext.Function.pass(this.getRef,[e,d],this)}this.references=this.references||[];this.references.push(e.toLowerCase())}},getRef:function(d,e,a){this.refCache=this.refCache||{};e=e||{};a=a||{};Ext.apply(e,a);if(e.forceCreate){return Ext.ComponentManager.create(e,"component")}var c=this,b=c.refCache[d];if(!b){c.refCache[d]=b=Ext.ComponentQuery.query(e.selector)[0];if(!b&&e.autoCreate){c.refCache[d]=b=Ext.ComponentManager.create(e,"component")}if(b){b.on("destroy",function(){c.refCache[d]=null})}}return b},hasRef:function(a){return this.references&&this.references.indexOf(a.toLowerCase())!==-1},},function(){});Ext.define("Ext.app.History",{mixins:["Ext.mixin.Observable"],config:{actions:[],updateUrl:true,token:""},constructor:function(a){if(Ext.feature.has.History){window.addEventListener("hashchange",Ext.bind(this.detectStateChange,this))}else{setInterval(Ext.bind(this.detectStateChange,this),50)}this.initConfig(a)},add:function(c,a){this.getActions().push(Ext.factory(c,Ext.app.Action));var b=c.getUrl();if(this.getUpdateUrl()){this.setToken(b);window.location.hash=b}if(a!==true){this.fireEvent("change",b)}this.setToken(b)},back:function(){this.getActions().pop().run()},applyToken:function(a){return a[0]=="#"?a.substr(1):a},detectStateChange:function(){var b=this.applyToken(window.location.hash),a=this.getToken();if(b!=a){this.onStateChange();this.setToken(b)}},onStateChange:function(){this.fireEvent("change",window.location.hash.substr(1))}});Ext.define("Ext.app.Profile",{mixins:{observable:"Ext.mixin.Observable"},config:{namespace:"auto",name:"auto",controllers:[],models:[],views:[],stores:[],application:null},constructor:function(a){this.initConfig(a);this.mixins.observable.constructor.apply(this,arguments)},isActive:function(){return false},launch:Ext.emptyFn,applyNamespace:function(a){if(a=="auto"){a=this.getName()}return a.toLowerCase()},applyName:function(a){if(a=="auto"){var b=this.$className.split(".");a=b[b.length-1]}return a},getDependencies:function(){var c=[],g=Ext.String.format,b=this.getApplication().getName(),d=this.getNamespace(),f={model:this.getModels(),view:this.getViews(),controller:this.getControllers(),store:this.getStores()},e,h,a;for(e in f){h=[];Ext.each(f[e],function(i){if(Ext.isString(i)){if(i.match("\\.")){a=i}else{a=g("{0}.{1}.{2}.{3}",b,e,d,i)}h.push(a);c.push(a)}});f[e]=h}f.all=c;return f}});Ext.define("Ext.app.Application",{extend:"Ext.app.Controller",requires:["Ext.app.History","Ext.app.Profile","Ext.app.Router","Ext.app.Action"],config:{profiles:[],controllers:[],history:{},name:null,appFolder:"app",router:{},controllerInstances:[],profileInstances:[],currentProfile:null,launch:Ext.emptyFn,enableLoader:true},constructor:function(a){a=a||{};Ext.applyIf(a,{application:this});this.initConfig(a);for(var b in a){this[b]=a[b]}if(this.getEnableLoader()!==false){Ext.require(this.getProfiles(),this.onProfilesLoaded,this)}},dispatch:function(e,d){e=e||{};Ext.applyIf(e,{application:this});e=Ext.factory(e,Ext.app.Action);if(e){var c=this.getCurrentProfile(),b=c?c.getNamespace():undefined,a=this.getController(e.getController(),b);if(a){if(d!==false){this.getHistory().add(e,true)}a.execute(e)}}},redirectTo:function(c){if(Ext.data&&Ext.data.Model&&c instanceof Ext.data.Model){var a=c;c=a.toUrl()}var b=this.getRouter().recognize(c);if(b){b.url=c;if(a){b.data={};b.data.record=a}return this.dispatch(b)}},control:function(h,d){d=d||this;var i=this.getEventDispatcher(),g=(d)?d.getRefs():{},c,e,b,f,a;for(c in h){if(h.hasOwnProperty(c)){f=h[c];a=g[c];if(a){c=a.selector||a}for(e in f){b=f[e];if(Ext.isString(b)){b=d[b]}i.addListener("component",c,e,b,d)}}}},getController:function(b,d){var f=this.getControllerInstances(),a=this.getName(),e=Ext.String.format,c;if(b instanceof Ext.app.Controller){return b}if(f[b]){return f[b]}else{c=e("{0}.controller.{1}",a,b);d=e("{0}.controller.{1}.{2}",a,d,b);return f[d]||f[c]}},onProfilesLoaded:function(){var b=this.getProfiles(),e=b.length,g=[],d=this.gatherDependencies(),f,c,a;for(c=0;c<e;c++){g[c]=Ext.create(b[c],{application:this});a=g[c].getDependencies();d=d.concat(a.all);if(g[c].isActive()&&!f){f=g[c];this.setCurrentProfile(f);this.setControllers(this.getControllers().concat(a.controller));this.setModels(this.getModels().concat(a.model));this.setViews(this.getViews().concat(a.view));this.setStores(this.getStores().concat(a.store))}}this.setProfileInstances(g);Ext.require(d,this.loadControllerDependencies,this)},loadControllerDependencies:function(){this.instantiateStores();this.instantiateControllers();var e=this.getControllerInstances(),d=[],c,a,b;for(b in e){a=e[b];d=d.concat(a.getModels().concat(a.getViews()).concat(a.getStores()))}Ext.require(d,this.onDependenciesLoaded,this)},onDependenciesLoaded:function(){var c=this,b=this.getCurrentProfile(),e=this.getLaunch(),d,a;d=this.getControllerInstances();for(a in d){d[a].init(this)}if(b){b.launch()}e.call(c);for(a in d){d[a].launch(this)}c.redirectTo(window.location.hash.substr(1))},gatherDependencies:function(){var a=this.getModels().concat(this.getViews()).concat(this.getControllers());Ext.each(this.getStores(),function(b){if(Ext.isString(b)){a.push(b)}},this);return a},instantiateStores:function(){var b=this.getStores(),f=b.length,c,a,d,g,e;for(e=0;e<f;e++){c=b[e];if(Ext.data&&Ext.data.Store&&!(c instanceof Ext.data.Store)){if(Ext.isString(c)){d=c;a=Ext.ClassManager.classes[c];c={xclass:c};if(a.prototype.defaultConfig.storeId===undefined){g=d.split(".");c.id=g[g.length-1]}}b[e]=Ext.factory(c,Ext.data.Store)}}this.setStores(b)},instantiateControllers:function(){var e=this.getControllers(),d={},c=e.length,a,b;for(b=0;b<c;b++){a=e[b];d[a]=Ext.create(a,{application:this})}return this.setControllerInstances(d)},applyControllers:function(a){return this.getFullyQualified(a,"controller")},applyProfiles:function(a){return this.getFullyQualified(a,"profile")},applyName:function(a){var b;if(a&&a.match(/ /g)){b=a;a=a.replace(/ /g,"")}return a},updateName:function(a){Ext.ClassManager.setNamespace(a+".app",this);if(!Ext.Loader.config.paths[a]){Ext.Loader.setPath(a,this.getAppFolder())}},applyRouter:function(a){return Ext.factory(a,Ext.app.Router,this.getRouter())},applyHistory:function(a){var b=Ext.factory(a,Ext.app.History,this.getHistory());b.on("change",this.onHistoryChange,this);return b},onHistoryChange:function(a){this.dispatch(this.getRouter().recognize(a),false)}},function(){});Ext.define("Ext.data.Batch",{mixins:{observable:"Ext.mixin.Observable"},config:{autoStart:false,pauseOnException:true,proxy:null},current:-1,total:0,isRunning:false,isComplete:false,hasException:false,constructor:function(a){var b=this;b.initConfig(a);b.operations=[]},add:function(a){this.total++;a.setBatch(this);this.operations.push(a)},start:function(){this.hasException=false;this.isRunning=true;this.runNextOperation()},runNextOperation:function(){this.runOperation(this.current+1)},pause:function(){this.isRunning=false},runOperation:function(d){var e=this,c=e.operations,b=c[d],a;if(b===undefined){e.isRunning=false;e.isComplete=true;e.fireEvent("complete",e,c[c.length-1])}else{e.current=d;a=function(f){var g=f.hasException();if(g){e.hasException=true;e.fireEvent("exception",e,f)}else{e.fireEvent("operationcomplete",e,f)}if(g&&e.getPauseOnException()){e.pause()}else{f.setCompleted();e.runNextOperation()}};b.setStarted();e.getProxy()[b.getAction()](b,a,e)}}});Ext.define("Ext.data.Connection",{mixins:{observable:"Ext.util.Observable"},statics:{requestId:0},config:{url:null,async:true,method:null,username:"",password:"",disableCaching:true,disableCachingParam:"_dc",timeout:30000,extraParams:null,defaultHeaders:null,useDefaultHeader:true,defaultPostHeader:"application/x-www-form-urlencoded; charset=UTF-8",useDefaultXhrHeader:true,defaultXhrHeader:"XMLHttpRequest",autoAbort:false},textAreaRe:/textarea/i,multiPartRe:/multipart\/form-data/i,lineBreakRe:/\r\n/g,constructor:function(a){this.initConfig(a);this.requests={}},request:function(j){j=j||{};var f=this,i=j.scope||window,e=j.username||f.getUsername(),g=j.password||f.getPassword()||"",b,c,d,a,h;if(f.fireEvent("beforerequest",f,j)!==false){c=f.setOptions(j,i);if(this.isFormUpload(j)===true){this.upload(j.form,c.url,c.data,j);return null}if(j.autoAbort===true||f.getAutoAbort()){f.abort()}h=this.getXhrInstance();b=j.async!==false?(j.async||f.getAsync()):false;if(e){h.open(c.method,c.url,b,e,g)}else{h.open(c.method,c.url,b)}a=f.setupHeaders(h,j,c.data,c.params);d={id:++this.self.requestId,xhr:h,headers:a,options:j,async:b,timeout:setTimeout(function(){d.timedout=true;f.abort(d)},j.timeout||f.getTimeout())};f.requests[d.id]=d;if(b){h.onreadystatechange=Ext.Function.bind(f.onStateChange,f,[d])}h.send(c.data);if(!b){return this.onComplete(d)}return d}else{Ext.callback(j.callback,j.scope,[j,undefined,undefined]);return null}},upload:function(e,c,i,k){e=Ext.getDom(e);k=k||{};var d=Ext.id(),g=document.createElement("iframe"),j=[],h="multipart/form-data",f={target:e.target,method:e.method,encoding:e.encoding,enctype:e.enctype,action:e.action},b=function(l,m){a=document.createElement("input");Ext.fly(a).set({type:"hidden",value:m,name:l});e.appendChild(a);j.push(a)},a;Ext.fly(g).set({id:d,name:d,cls:Ext.baseCSSPrefix+"hide-display",src:Ext.SSL_SECURE_URL});document.body.appendChild(g);if(document.frames){document.frames[d].name=d}Ext.fly(e).set({target:d,method:"POST",enctype:h,encoding:h,action:c||f.action});if(i){Ext.iterate(Ext.Object.fromQueryString(i),function(l,m){if(Ext.isArray(m)){Ext.each(m,function(n){b(l,n)})}else{b(l,m)}})}Ext.fly(g).on("load",Ext.Function.bind(this.onUploadComplete,this,[g,k]),null,{single:true});e.submit();Ext.fly(e).set(f);Ext.each(j,function(l){Ext.removeNode(l)})},onUploadComplete:function(h,b){var c=this,a={responseText:"",responseXML:null},g,f;try{g=h.contentWindow.document||h.contentDocument||window.frames[id].document;if(g){if(g.body){if(this.textAreaRe.test((f=g.body.firstChild||{}).tagName)){a.responseText=f.value}else{a.responseText=g.body.innerHTML}}a.responseXML=g.XMLDocument||g}}catch(d){}c.fireEvent("requestcomplete",c,a,b);Ext.callback(b.success,b.scope,[a,b]);Ext.callback(b.callback,b.scope,[b,true,a]);setTimeout(function(){Ext.removeNode(h)},100)},isFormUpload:function(a){var b=this.getForm(a);if(b){return(a.isUpload||(this.multiPartRe).test(b.getAttribute("enctype")))}return false},getForm:function(a){return Ext.getDom(a.form)||null},setOptions:function(k,j){var h=this,e=k.params||{},g=h.getExtraParams(),d=k.urlParams,c=k.url||h.getUrl(),i=k.jsonData,b,a,f;if(Ext.isFunction(e)){e=e.call(j,k)}if(Ext.isFunction(c)){c=c.call(j,k)}c=this.setupUrl(k,c);f=k.rawData||k.xmlData||i||null;if(i&&!Ext.isPrimitive(i)){f=Ext.encode(f)}if(Ext.isObject(e)){e=Ext.Object.toQueryString(e)}if(Ext.isObject(g)){g=Ext.Object.toQueryString(g)}e=e+((g)?((e)?"&":"")+g:"");d=Ext.isObject(d)?Ext.Object.toQueryString(d):d;e=this.setupParams(k,e);b=(k.method||h.getMethod()||((e||f)?"POST":"GET")).toUpperCase();this.setupMethod(k,b);a=k.disableCaching!==false?(k.disableCaching||h.getDisableCaching()):false;if(b==="GET"&&a){c=Ext.urlAppend(c,(k.disableCachingParam||h.getDisableCachingParam())+"="+(new Date().getTime()))}if((b=="GET"||f)&&e){c=Ext.urlAppend(c,e);e=null}if(d){c=Ext.urlAppend(c,d)}return{url:c,method:b,data:f||e||null}},setupUrl:function(b,a){var c=this.getForm(b);if(c){a=a||c.action}return a},setupParams:function(a,d){var c=this.getForm(a),b;if(c&&!this.isFormUpload(a)){b=Ext.Element.serializeForm(c);d=d?(d+"&"+b):b}return d},setupMethod:function(a,b){if(this.isFormUpload(a)){return"POST"}return b},setupHeaders:function(l,m,d,c){var h=this,b=Ext.apply({},m.headers||{},h.getDefaultHeaders()||{}),k=h.getDefaultPostHeader(),i=m.jsonData,a=m.xmlData,j,f;if(!b["Content-Type"]&&(d||c)){if(d){if(m.rawData){k="text/plain"}else{if(a&&Ext.isDefined(a)){k="text/xml"}else{if(i&&Ext.isDefined(i)){k="application/json"}}}}b["Content-Type"]=k}if(h.getUseDefaultXhrHeader()&&!b["X-Requested-With"]){b["X-Requested-With"]=h.getDefaultXhrHeader()}try{for(j in b){if(b.hasOwnProperty(j)){f=b[j];l.setRequestHeader(j,f)}}}catch(g){h.fireEvent("exception",j,f)}if(m.withCredentials){l.withCredentials=m.withCredentials}return b},getXhrInstance:(function(){var b=[function(){return new XMLHttpRequest()},function(){return new ActiveXObject("MSXML2.XMLHTTP.3.0")},function(){return new ActiveXObject("MSXML2.XMLHTTP")},function(){return new ActiveXObject("Microsoft.XMLHTTP")}],c=0,a=b.length,f;for(;c<a;++c){try{f=b[c];f();break}catch(d){}}return f})(),isLoading:function(a){if(!(a&&a.xhr)){return false}var b=a.xhr.readyState;return !(b===0||b==4)},abort:function(b){var a=this,d=a.requests,c;if(b&&a.isLoading(b)){b.xhr.onreadystatechange=null;b.xhr.abort();a.clearTimeout(b);if(!b.timedout){b.aborted=true}a.onComplete(b);a.cleanup(b)}else{if(!b){for(c in d){if(d.hasOwnProperty(c)){a.abort(d[c])}}}}},abortAll:function(){this.abort()},onStateChange:function(a){if(a.xhr.readyState==4){this.clearTimeout(a);this.onComplete(a);this.cleanup(a)}},clearTimeout:function(a){clearTimeout(a.timeout);delete a.timeout},cleanup:function(a){a.xhr=null;delete a.xhr},onComplete:function(f){var d=this,c=f.options,a,h,b;try{a=d.parseStatus(f.xhr.status);if(f.timedout){a.success=false}}catch(g){a={success:false,isException:false}}h=a.success;if(h){b=d.createResponse(f);d.fireEvent("requestcomplete",d,b,c);Ext.callback(c.success,c.scope,[b,c])}else{if(a.isException||f.aborted||f.timedout){b=d.createException(f)}else{b=d.createResponse(f)}d.fireEvent("requestexception",d,b,c);Ext.callback(c.failure,c.scope,[b,c])}Ext.callback(c.callback,c.scope,[c,h,b]);delete d.requests[f.id];return b},parseStatus:function(a){a=a==1223?204:a;var c=(a>=200&&a<300)||a==304||a==0,b=false;if(!c){switch(a){case 12002:case 12029:case 12030:case 12031:case 12152:case 13030:b=true;break}}return{success:c,isException:b}},createResponse:function(c){var g=c.xhr,a={},h,d,i,e,f,b;if(c.timedout||c.aborted){c.success=false;h=[]}else{h=g.getAllResponseHeaders().replace(this.lineBreakRe,"\n").split("\n")}d=h.length;while(d--){i=h[d];e=i.indexOf(":");if(e>=0){f=i.substr(0,e).toLowerCase();if(i.charAt(e+1)==" "){++e}a[f]=i.substr(e+1)}}c.xhr=null;delete c.xhr;b={request:c,requestId:c.id,status:g.status,statusText:g.statusText,getResponseHeader:function(j){return a[j.toLowerCase()]},getAllResponseHeaders:function(){return a},responseText:g.responseText,responseXML:g.responseXML};g=null;return b},createException:function(a){return{request:a,requestId:a.id,status:a.aborted?-1:0,statusText:a.aborted?"transaction aborted":"communication failure",aborted:a.aborted,timedout:a.timedout}}});Ext.define("Ext.Ajax",{extend:"Ext.data.Connection",singleton:true,autoAbort:false});Ext.define("Ext.data.reader.Reader",{requires:["Ext.data.ResultSet"],alternateClassName:["Ext.data.Reader","Ext.data.DataReader"],mixins:["Ext.mixin.Observable"],isReader:true,config:{idProperty:undefined,clientIdProperty:"clientId",totalProperty:"total",successProperty:"success",messageProperty:null,rootProperty:"",implicitIncludes:true,model:undefined},constructor:function(a){this.initConfig(a)},fieldCount:0,applyModel:function(a){if(typeof a=="string"){a=Ext.data.ModelManager.getModel(a);if(!a){Ext.Logger.error("Model with name "+arguments[0]+" doesnt exist.")}}if(a&&!a.prototype.isModel&&Ext.isObject(a)){a=Ext.data.ModelManager.registerType(a.storeId||a.id||Ext.id(),a)}return a},applyIdProperty:function(a){if(!a&&this.getModel()){a=this.getModel().getIdProperty()}return a},updateModel:function(a){if(a){if(!this.getIdProperty()){this.setIdProperty(a.getIdProperty())}this.buildExtractors()}},createAccessor:Ext.emptyFn,createFieldAccessExpression:function(){return"undefined"},buildExtractors:function(){if(!this.getModel()){return}var b=this,c=b.getTotalProperty(),a=b.getSuccessProperty(),d=b.getMessageProperty();if(c){b.getTotal=b.createAccessor(c)}if(a){b.getSuccess=b.createAccessor(a)}if(d){b.getMessage=b.createAccessor(d)}b.extractRecordData=b.buildRecordDataExtractor()},buildRecordDataExtractor:function(){var k=this,e=k.getModel(),g=e.getFields(),j=g.length,a=[],h=k.getModel().getClientIdProperty(),f="__field",b=["var me = this,\n","    fields = me.getModel().getFields(),\n","    idProperty = me.getIdProperty(),\n",'    idPropertyIsFn = (typeof idProperty == "function"),',"    value,\n","    internalId"],d,l,c,m;g=g.items;for(d=0;d<j;d++){l=g[d];m=l.getName();if(m===e.getIdProperty()){a[d]="idField"}else{a[d]=f+d}b.push(",\n    ",a[d],' = fields.get("',l.getName(),'")')}b.push(";\n\n    return function(source) {\n        var dest = {};\n");b.push("        if (idPropertyIsFn) {\n");b.push("            idField.setMapping(idProperty);\n");b.push("        }\n");for(d=0;d<j;d++){l=g[d];c=a[d];m=l.getName();if(m===e.getIdProperty()&&l.getMapping()===null){l.setMapping(this.getIdProperty())}b.push('        dest["'+l.getName()+'"]'," = ",k.createFieldAccessExpression(l,c,"source"),";\n")}if(h){b.push("        internalId = "+k.createFieldAccessExpression(Ext.create("Ext.data.Field",{name:h}),null,"source")+";\n");b.push("        if (internalId !== undefined) {\n");b.push('            dest["_clientId"] = internalId;\n        }\n')}b.push("        return dest;\n");b.push("    };");return Ext.functionFactory(b.join("")).call(k)},getFields:function(){return this.getModel().getFields().items},getData:function(a){return a},getResponseData:function(a){return a},getRoot:function(a){return a},read:function(c){var g=c,h=this.getModel(),e,b,d,f,a;if(c){g=this.getResponseData(c)}if(g){e=this.readRecords(g);b=e.getRecords();for(d=0,f=b.length;d<f;d++){a=b[d];b[d]=new h(a.data,a.id,a.node)}return e}else{return this.nullResultSet}},process:function(a){var b=a;if(a){b=this.getResponseData(a)}if(b){return this.readRecords(b)}else{return this.nullResultSet}},readRecords:function(c){var d=this;d.rawData=c;c=d.getData(c);if(c.metaData){d.onMetaChange(c.metaData)}var f=Ext.isArray(c)?c:d.getRoot(c),h=true,b=0,e,g,a,i;if(d.getTotalProperty()){g=parseInt(d.getTotal(c),10);if(!isNaN(g)){e=g}}if(d.getSuccessProperty()){g=d.getSuccess(c);if(g===false||g==="false"){h=false}}if(d.getMessageProperty()){i=d.getMessage(c)}if(f){a=d.extractData(f);b=a.length}else{b=0;a=[]}return new Ext.data.ResultSet({total:e,count:b,records:a,success:h,message:i})},extractData:function(l){var j=this,e=[],c=l.length,h=j.getModel(),m=h.getIdProperty(),k=h.getFields(),d,g,f,b,a;if(k.isDirty){j.buildExtractors(true);delete k.isDirty}if(!l.length&&Ext.isObject(l)){l=[l];c=1}for(g=0;g<c;g++){a=null;b=null;d=l[g];f=j.extractRecordData(d);if(f._clientId!==undefined){a=f._clientId;delete f._clientId}if(f[m]!==undefined){b=f[m]}if(j.getImplicitIncludes()){j.readAssociated(f,d)}e.push({clientId:a,id:b,data:f,node:d})}return e},readAssociated:function(h,g){var e=this.getModel().associations.items,d=0,f=e.length,a,c,b;for(;d<f;d++){a=e[d];b=a.getAssociationKey();c=this.getAssociatedDataRoot(g,b);if(c){h[b]=c}}},getAssociatedDataRoot:function(b,a){return b[a]},onMetaChange:function(f){var a=f.fields,e=this,d,c,b;e.metaData=f;if(f.rootProperty!==undefined){e.setRootProperty(f.rootProperty)}else{if(f.root!==undefined){e.setRootProperty(f.root)}}if(f.idProperty!==undefined){e.setIdProperty(f.idProperty)}if(f.totalProperty!==undefined){e.setTotalProperty(f.totalProperty)}if(f.successProperty!==undefined){e.setSuccessProperty(f.successProperty)}if(f.messageProperty!==undefined){e.setMessageProperty(f.messageProperty)}if(a){if(e.getModel()){e.getModel().setFields(a);e.buildExtractors()}else{b=e.getIdProperty();c={fields:a};if(b){c.idProperty=b}d=Ext.define("Ext.data.reader.MetaModel"+Ext.id(),{extend:"Ext.data.Model",config:c});e.setModel(d)}}else{e.buildExtractors()}}},function(){Ext.apply(this.prototype,{nullResultSet:new Ext.data.ResultSet({total:0,count:0,records:[],success:true})})});Ext.define("Ext.data.reader.Json",{extend:"Ext.data.reader.Reader",alternateClassName:"Ext.data.JsonReader",alias:"reader.json",config:{record:null,useSimpleAccessors:false},objectRe:/[\[\.]/,getResponseData:function(a){var d=a;if(a&&a.responseText){d=a.responseText}if(typeof d!=="string"){return d}var c;try{c=Ext.decode(d)}catch(b){this.fireEvent("exception",this,a,"Unable to parse the JSON returned by the server: "+b.toString());Ext.Logger.warn("Unable to parse the JSON returned by the server: "+b.toString())}return c},buildExtractors:function(){var b=this,a=b.getRootProperty();b.callParent(arguments);if(a){b.rootAccessor=b.createAccessor(a)}else{delete b.rootAccessor}},getRoot:function(b){var a=this.getModel().getFields();if(a.isDirty){this.buildExtractors(true);delete a.isDirty}if(this.rootAccessor){return this.rootAccessor.call(this,b)}else{return b}},extractData:function(a){var e=this.getRecord(),d=[],c,b;if(e){c=a.length;if(!c&&Ext.isObject(a)){c=1;a=[a]}for(b=0;b<c;b++){d[b]=a[b][e]}}else{d=a}return this.callParent([d])},createAccessor:function(){var a=/[\[\.]/;return function(c){if(Ext.isEmpty(c)){return Ext.emptyFn}if(Ext.isFunction(c)){return c}if(this.getUseSimpleAccessors()!==true){var b=String(c).search(a);if(b>=0){return Ext.functionFactory("obj","var value; try {value = obj"+(b>0?".":"")+c+"} catch(e) {}; return value;")}}return function(d){return d[c]}}}(),createFieldAccessExpression:function(g,b,c){var f=this,h=f.objectRe,e=(g.getMapping()!==null),a=e?g.getMapping():g.getName(),i,d;if(typeof a==="function"){i=b+".getMapping()("+c+", this)"}else{if(f.getUseSimpleAccessors()===true||((d=String(a).search(h))<0)){if(!e||isNaN(a)){a='"'+a+'"'}i=c+"["+a+"]"}else{i=c+(d>0?".":"")+a}}return i}});Ext.define("Ext.data.proxy.Proxy",{extend:"Ext.Evented",alias:"proxy.proxy",alternateClassName:["Ext.data.DataProxy","Ext.data.Proxy"],requires:["Ext.data.reader.Json","Ext.data.writer.Json"],uses:["Ext.data.Batch","Ext.data.Operation","Ext.data.Model"],config:{batchOrder:"create,update,destroy",batchActions:true,model:null,reader:{type:"json"},writer:{type:"json"}},isProxy:true,applyModel:function(a){if(typeof a=="string"){a=Ext.data.ModelManager.getModel(a);if(!a){Ext.Logger.error("Model with name "+arguments[0]+" doesnt exist.")}}if(a&&!a.prototype.isModel&&Ext.isObject(a)){a=Ext.data.ModelManager.registerType(a.storeId||a.id||Ext.id(),a)}return a},updateModel:function(b){if(b){var a=this.getReader();if(a&&!a.getModel()){a.setModel(b)}}},applyReader:function(b,a){return Ext.factory(b,Ext.data.Reader,a,"reader")},updateReader:function(a){if(a){var b=this.getModel();if(!b){b=a.getModel();if(b){this.setModel(b)}}else{a.setModel(b)}if(a.onMetaChange){a.onMetaChange=Ext.Function.createSequence(a.onMetaChange,this.onMetaChange,this)}}},onMetaChange:function(b){var a=this.getReader().getModel();if(!this.getModel()&&a){this.setModel(a)}this.fireEvent("metachange",this,b)},applyWriter:function(b,a){return Ext.factory(b,Ext.data.Writer,a,"writer")},create:Ext.emptyFn,read:Ext.emptyFn,update:Ext.emptyFn,destroy:Ext.emptyFn,onDestroy:function(){Ext.destroy(this.getReader(),this.getWriter())},batch:function(e,f){var g=this,d=g.getBatchActions(),c=this.getModel(),b,a;if(e.operations===undefined){e={operations:e,batch:{listeners:f}}}if(e.batch){if(e.batch.isBatch){e.batch.setProxy(g)}else{e.batch.proxy=g}}else{e.batch={proxy:g,listeners:e.listeners||{}}}if(!b){b=new Ext.data.Batch(e.batch)}b.on("complete",Ext.bind(g.onBatchComplete,g,[e],0));Ext.each(g.getBatchOrder().split(","),function(h){a=e.operations[h];if(a){if(d){b.add(new Ext.data.Operation({action:h,records:a,model:c}))}else{Ext.each(a,function(i){b.add(new Ext.data.Operation({action:h,records:[i],model:c}))})}}},g);b.start();return b},onBatchComplete:function(a,b){var c=a.scope||this;if(b.hasException){if(Ext.isFunction(a.failure)){Ext.callback(a.failure,c,[b,a])}}else{if(Ext.isFunction(a.success)){Ext.callback(a.success,c,[b,a])}}if(Ext.isFunction(a.callback)){Ext.callback(a.callback,c,[b,a])}}},function(){});Ext.define("Ext.data.proxy.Client",{extend:"Ext.data.proxy.Proxy",alternateClassName:"Ext.proxy.ClientProxy",clear:function(){}});Ext.define("Ext.data.proxy.Memory",{extend:"Ext.data.proxy.Client",alias:"proxy.memory",alternateClassName:"Ext.data.MemoryProxy",isMemoryProxy:true,config:{data:[]},finishOperation:function(b,f,d){if(b){var c=0,e=b.getRecords(),a=e.length;for(c;c<a;c++){e[c].commit()}b.setSuccessful();Ext.callback(f,d||this,[b])}},create:function(){this.finishOperation.apply(this,arguments)},update:function(){this.finishOperation.apply(this,arguments)},destroy:function(){this.finishOperation.apply(this,arguments)},read:function(b,e,c){var d=this,a=d.getReader();if(b.process("read",a.process(d.getData()))===false){this.fireEvent("exception",this,null,b)}Ext.callback(e,c||d,[b])},clear:Ext.emptyFn});Ext.define("Ext.data.proxy.Server",{extend:"Ext.data.proxy.Proxy",alias:"proxy.server",alternateClassName:"Ext.data.ServerProxy",requires:["Ext.data.Request"],config:{url:null,pageParam:"page",startParam:"start",limitParam:"limit",groupParam:"group",sortParam:"sort",filterParam:"filter",directionParam:"dir",enablePagingParams:true,simpleSortMode:false,noCache:true,cacheString:"_dc",timeout:30000,api:{create:undefined,read:undefined,update:undefined,destroy:undefined},extraParams:{}},constructor:function(a){a=a||{};if(a.nocache!==undefined){a.noCache=a.nocache}this.callParent([a])},create:function(){return this.doRequest.apply(this,arguments)},read:function(){return this.doRequest.apply(this,arguments)},update:function(){return this.doRequest.apply(this,arguments)},destroy:function(){return this.doRequest.apply(this,arguments)},setExtraParam:function(a,b){this.getExtraParams()[a]=b},buildRequest:function(a){var c=this,d=Ext.applyIf(a.getParams()||{},c.getExtraParams()||{}),b;d=Ext.applyIf(d,c.getParams(a));b=Ext.create("Ext.data.Request",{params:d,action:a.getAction(),records:a.getRecords(),url:a.getUrl(),operation:a,proxy:c});b.setUrl(c.buildUrl(b));a.setRequest(b);return b},processResponse:function(k,b,d,c,j,l){var h=this,a=b.getAction(),f,i;if(k===true){f=h.getReader();try{i=f.process(c)}catch(g){b.setException(g.message);h.fireEvent("exception",this,c,b);return}if(!b.getModel()){b.setModel(this.getModel())}if(b.process(a,i,d,c)===false){this.fireEvent("exception",this,c,b)}}else{h.setException(b,c);h.fireEvent("exception",this,c,b)}if(typeof j=="function"){j.call(l||h,b)}h.afterRequest(d,k)},setException:function(b,a){b.setException({status:a.status,statusText:a.statusText})},applyEncoding:function(a){return Ext.encode(a)},encodeSorters:function(d){var b=[],c=d.length,a=0;for(;a<c;a++){b[a]={property:d[a].getProperty(),direction:d[a].getDirection()}}return this.applyEncoding(b)},encodeFilters:function(d){var b=[],c=d.length,a=0;for(;a<c;a++){b[a]={property:d[a].getProperty(),value:d[a].getValue()}}return this.applyEncoding(b)},getParams:function(i){var n=this,h={},a=i.getGrouper(),m=i.getSorters(),f=i.getFilters(),l=i.getPage(),d=i.getStart(),g=i.getLimit(),o=n.getSimpleSortMode(),q=n.getPageParam(),k=n.getStartParam(),p=n.getLimitParam(),j=n.getGroupParam(),e=n.getSortParam(),c=n.getFilterParam(),b=n.getDirectionParam();if(n.getEnablePagingParams()){if(q&&l!==null){h[q]=l}if(k&&d!==null){h[k]=d}if(p&&g!==null){h[p]=g}}if(j&&a){h[j]=n.encodeSorters([a])}if(e&&m&&m.length>0){if(o){h[e]=m[0].getProperty();h[b]=m[0].getDirection()}else{h[e]=n.encodeSorters(m)}}if(c&&f&&f.length>0){h[c]=n.encodeFilters(f)}return h},buildUrl:function(c){var b=this,a=b.getUrl(c);if(b.getNoCache()){a=Ext.urlAppend(a,Ext.String.format("{0}={1}",b.getCacheString(),Ext.Date.now()))}return a},getUrl:function(a){return a?a.getUrl()||this.getApi()[a.getAction()]||this._url:this._url},doRequest:function(a,c,b){},afterRequest:Ext.emptyFn});Ext.define("Ext.data.proxy.JsonP",{extend:"Ext.data.proxy.Server",alternateClassName:"Ext.data.ScriptTagProxy",alias:["proxy.jsonp","proxy.scripttag"],requires:["Ext.data.JsonP"],config:{defaultWriterType:"base",callbackKey:"callback",recordParam:"records",autoAppendParams:true},doRequest:function(a,g,b){var d=this,e=d.getWriter(),c=d.buildRequest(a),f=c.getParams();if(a.allowWrite()){c=e.write(c)}c.setConfig({callbackKey:d.getCallbackKey(),timeout:d.getTimeout(),scope:d,callback:d.createRequestCallback(c,a,g,b)});if(d.getAutoAppendParams()){c.setParams({})}c.setJsonP(Ext.data.JsonP.request(c.getCurrentConfig()));c.setParams(f);a.setStarted();d.lastRequest=c;return c},createRequestCallback:function(d,a,e,b){var c=this;return function(h,f,g){delete c.lastRequest;c.processResponse(h,a,d,f,e,b)}},setException:function(b,a){b.setException(b.getRequest().getJsonP().errorType)},buildUrl:function(f){var h=this,a=h.callParent(arguments),e=Ext.apply({},f.getParams()),c=e.filters,d,b,g,j;delete e.filters;if(h.getAutoAppendParams()){a=Ext.urlAppend(a,Ext.Object.toQueryString(e))}if(c&&c.length){for(g=0;g<c.length;g++){b=c[g];j=b.getValue();if(j){a=Ext.urlAppend(a,b.getProperty()+"="+j)}}}d=f.getRecords();if(Ext.isArray(d)&&d.length>0){a=Ext.urlAppend(a,Ext.String.format("{0}={1}",h.getRecordParam(),h.encodeRecords(d)))}return a},destroy:function(){this.abort();this.callParent(arguments)},abort:function(){var a=this.lastRequest;if(a){Ext.data.JsonP.abort(a.getJsonP())}},encodeRecords:function(b){var d="",c=0,a=b.length;for(;c<a;c++){d+=Ext.Object.toQueryString(b[c].getData())}return d}});Ext.define("Ext.data.proxy.WebStorage",{extend:"Ext.data.proxy.Client",alternateClassName:"Ext.data.WebStorageProxy",requires:"Ext.Date",config:{id:undefined,reader:null,writer:null},constructor:function(a){this.callParent(arguments);this.cache={}},updateModel:function(a){if(!this.getId()){this.setId(a.modelName)}},create:function(e,h,j){var d=e.getRecords(),c=d.length,a=this.getIds(),b,g,f;e.setStarted();for(f=0;f<c;f++){g=d[f];if(g.phantom){g.phantom=false;b=this.getNextId()}else{b=g.getId()}this.setRecord(g,b);a.push(b)}this.setIds(a);e.setCompleted();e.setSuccessful();if(typeof h=="function"){h.call(j||this,e)}},read:function(e,j,k){var c=[],a=this.getIds(),h=this.getModel(),l=h.getIdProperty(),d=e.getParams()||{},b=a.length,f,g;if(d[l]!==undefined){g=this.getRecord(d[l]);if(g){c.push(g);e.setSuccessful()}}else{for(f=0;f<b;f++){c.push(this.getRecord(a[f]))}e.setSuccessful()}e.setCompleted();e.setResultSet(Ext.create("Ext.data.ResultSet",{records:c,total:c.length,loaded:true}));e.setRecords(c);if(typeof j=="function"){j.call(k||this,e)}},update:function(e,h,j){var d=e.getRecords(),c=d.length,a=this.getIds(),g,b,f;e.setStarted();for(f=0;f<c;f++){g=d[f];this.setRecord(g);b=g.getId();if(b!==undefined&&Ext.Array.indexOf(a,b)==-1){a.push(b)}}this.setIds(a);e.setCompleted();e.setSuccessful();if(typeof h=="function"){h.call(j||this,e)}},destroy:function(b,h,e){var a=b.getRecords(),f=a.length,d=this.getIds(),g=[].concat(d),c;for(c=0;c<f;c++){Ext.Array.remove(g,a[c].getId());this.removeRecord(a[c],false)}this.setIds(g);b.setCompleted();b.setSuccessful();if(typeof h=="function"){h.call(e||this,b)}},getRecord:function(d){if(this.cache[d]===undefined){var m=this.getRecordKey(d),n=this.getStorageObject().getItem(m),g={},f=this.getModel(),k=f.getFields().items,e=k.length,h,l,c,j,a,b;if(!n){return}a=Ext.decode(n);for(h=0;h<e;h++){l=k[h];c=l.getName();if(typeof l.getDecode()=="function"){g[c]=l.getDecode()(a[c])}else{if(l.getType().type=="date"){b=l.getDateFormat();if(b){g[c]=Ext.Date.parse(a[c],b)}else{g[c]=new Date(a[c])}}else{g[c]=a[c]}}}j=new f(g,d);this.cache[d]=j}return this.cache[d]},setRecord:function(k,d){if(d){k.setId(d)}else{d=k.getId()}var m=this,a=k.getData(),j={},f=m.getModel(),l=f.getFields().items,e=l.length,h=0,n,c,g,o,b;for(;h<e;h++){n=l[h];c=n.getName();if(typeof n.getEncode()=="function"){j[c]=n.getEncode()(a[c],k)}else{if(n.getType().type=="date"&&Ext.isDate(a[c])){b=n.getDateFormat();if(b){j[c]=Ext.Date.format(a[c],b)}else{j[c]=a[c].getTime()}}else{j[c]=a[c]}}}g=m.getStorageObject();o=m.getRecordKey(d);m.cache[d]=k;g.removeItem(o);g.setItem(o,Ext.encode(j))},removeRecord:function(d,c){var b=this,a;if(d.isModel){d=d.getId()}if(c!==false){a=b.getIds();Ext.Array.remove(a,d);b.setIds(a)}b.getStorageObject().removeItem(b.getRecordKey(d))},getRecordKey:function(a){if(a.isModel){a=a.getId()}return Ext.String.format("{0}-{1}",this.getId(),a)},getRecordCounterKey:function(){return Ext.String.format("{0}-counter",this.getId())},getIds:function(){var b=(this.getStorageObject().getItem(this.getId())||"").split(","),c=b.length,a;if(c==1&&b[0]===""){b=[]}else{for(a=0;a<c;a++){b[a]=parseInt(b[a],10)}}return b},setIds:function(b){var c=this.getStorageObject(),d=b.join(","),e=this.getId(),a=this.getRecordCounterKey();c.removeItem(e);if(Ext.isEmpty(d)){c.removeItem(a)}else{c.setItem(e,d)}},getNextId:function(){var d=this.getStorageObject(),a=this.getRecordCounterKey(),c=d.getItem(a),b,e;if(c===null){b=this.getIds();c=b[b.length-1]||0}e=parseInt(c,10)+1;d.setItem(a,e);return e},initialize:function(){this.callParent(arguments);var a=this.getStorageObject();a.setItem(this.getId(),a.getItem(this.getId())||"")},clear:function(){var d=this.getStorageObject(),c=this.getIds(),a=c.length,b;for(b=0;b<a;b++){this.removeRecord(c[b])}d.removeItem(this.getRecordCounterKey());d.removeItem(this.getId())},getStorageObject:function(){}});Ext.define("Ext.data.proxy.LocalStorage",{extend:"Ext.data.proxy.WebStorage",alias:"proxy.localstorage",alternateClassName:"Ext.data.LocalStorageProxy",getStorageObject:function(){return window.localStorage}});Ext.define("Ext.data.proxy.SessionStorage",{extend:"Ext.data.proxy.WebStorage",alias:"proxy.sessionstorage",alternateClassName:"Ext.data.SessionStorageProxy",getStorageObject:function(){return window.sessionStorage}});Ext.define("Ext.data.reader.Array",{extend:"Ext.data.reader.Json",alternateClassName:"Ext.data.ArrayReader",alias:"reader.array",config:{totalProperty:undefined,successProperty:undefined},getResponseData:function(a){return a},createFieldAccessExpression:function(g,c,b){var f=this,e=g.getMapping(),d=(e==null)?f.getModel().getFields().indexOf(g):e,a;if(typeof d==="function"){a=c+".getMapping()("+b+", this)"}else{if(isNaN(d)){d='"'+d+'"'}a=b+"["+d+"]"}return a}});Ext.define("Ext.data.reader.Xml",{extend:"Ext.data.reader.Reader",alternateClassName:"Ext.data.XmlReader",alias:"reader.xml",config:{record:null},createAccessor:function(b){var a=this;if(Ext.isEmpty(b)){return Ext.emptyFn}if(Ext.isFunction(b)){return b}return function(c){return a.getNodeValue(Ext.DomQuery.selectNode(b,c))}},getNodeValue:function(a){if(a&&a.firstChild){return a.firstChild.nodeValue}return undefined},getResponseData:function(a){if(a.nodeType===1){return a}var b=a.responseXML;return b},getData:function(a){return a.documentElement||a},getRoot:function(b){var c=b.nodeName,a=this.getRootProperty();if(!a||(c&&c==a)){return b}else{if(Ext.DomQuery.isXml(b)){return Ext.DomQuery.selectNode(a,b)}}},extractData:function(a){var b=this.getRecord();if(b!=a.nodeName){a=Ext.DomQuery.select(b,a)}else{a=[a]}return this.callParent([a])},getAssociatedDataRoot:function(b,a){return Ext.DomQuery.select(a,b)[0]},readRecords:function(a){if(Ext.isArray(a)){a=a[0]}return this.callParent([a])},createFieldAccessExpression:function(e,d,c){var b=e.getMapping()||e.getName(),a;if(typeof b==="function"){a=d+".getMapping()("+c+", this)"}else{a='me.getNodeValue(Ext.DomQuery.selectNode("'+b+'", '+c+"))"}return a}});Ext.define("Ext.direct.Provider",{alias:"direct.provider",mixins:{observable:"Ext.util.Observable"},config:{id:undefined},constructor:function(a){this.initConfig(a)},applyId:function(a){if(a===undefined){a=this.getUniqueId()}return a},isConnected:function(){return false},connect:Ext.emptyFn,disconnect:Ext.emptyFn});Ext.define("Ext.direct.JsonProvider",{extend:"Ext.direct.Provider",alias:"direct.jsonprovider",uses:["Ext.direct.ExceptionEvent"],parseResponse:function(a){if(!Ext.isEmpty(a.responseText)){if(Ext.isObject(a.responseText)){return a.responseText}return Ext.decode(a.responseText)}return null},createEvents:function(a){var g=null,c=[],b=0,f,d;try{g=this.parseResponse(a)}catch(h){d=Ext.create("Ext.direct.ExceptionEvent",{data:h,xhr:a,code:Ext.direct.Manager.exceptions.PARSE,message:"Error parsing json response: \n\n "+g});return[d]}if(Ext.isArray(g)){for(f=g.length;b<f;++b){c.push(this.createEvent(g[b]))}}else{c.push(this.createEvent(g))}return c},createEvent:function(a){return Ext.create("direct."+a.type,a)}});Ext.define("Ext.direct.PollingProvider",{extend:"Ext.direct.JsonProvider",alias:"direct.pollingprovider",uses:["Ext.direct.ExceptionEvent"],requires:["Ext.Ajax","Ext.util.DelayedTask"],config:{interval:3000,baseParams:null,url:null},isConnected:function(){return !!this.pollTask},connect:function(){var b=this,a=b.getUrl(),c=b.getBaseParams();if(a&&!b.pollTask){b.pollTask=setInterval(function(){if(b.fireEvent("beforepoll",b)!==false){if(Ext.isFunction(a)){a(c)}else{Ext.Ajax.request({url:a,callback:b.onData,scope:b,params:c})}}},b.getInterval());b.fireEvent("connect",b)}else{if(!a){}}},disconnect:function(){var a=this;if(a.pollTask){clearInterval(a.pollTask);delete a.pollTask;a.fireEvent("disconnect",a)}},onData:function(e,g,b){var f=this,d=0,a,c;if(g){c=f.createEvents(b);for(a=c.length;d<a;++d){f.fireEvent("data",f,c[d])}}else{f.fireEvent("data",f,Ext.create("Ext.direct.ExceptionEvent",{data:null,code:Ext.direct.Manager.exceptions.TRANSPORT,message:"Unable to connect to the server.",xhr:b}))}}});Ext.define("Ext.fx.animation.Abstract",{extend:"Ext.Evented",isAnimation:true,requires:["Ext.fx.State"],config:{name:"",element:null,before:null,from:{},to:{},after:null,states:{},duration:300,easing:"linear",iteration:1,direction:"normal",delay:0,onBeforeStart:null,onEnd:null,onBeforeEnd:null,scope:null,reverse:null,preserveEndState:false,replacePrevious:true},STATE_FROM:"0%",STATE_TO:"100%",DIRECTION_UP:"up",DIRECTION_DOWN:"down",DIRECTION_LEFT:"left",DIRECTION_RIGHT:"right",stateNameRegex:/^(?:[\d\.]+)%$/,constructor:function(){this.states={};this.callParent(arguments);return this},applyElement:function(a){return Ext.get(a)},applyBefore:function(a,b){if(a){return Ext.factory(a,Ext.fx.State,b)}},applyAfter:function(b,a){if(b){return Ext.factory(b,Ext.fx.State,a)}},setFrom:function(a){return this.setState(this.STATE_FROM,a)},setTo:function(a){return this.setState(this.STATE_TO,a)},getFrom:function(){return this.getState(this.STATE_FROM)},getTo:function(){return this.getState(this.STATE_TO)},setStates:function(a){var c=this.stateNameRegex,b;for(b in a){if(c.test(b)){this.setState(b,a[b])}}return this},getStates:function(){return this.states},setState:function(b,d){var a=this.getStates(),c;c=Ext.factory(d,Ext.fx.State,a[b]);if(c){a[b]=c}return this},getState:function(a){return this.getStates()[a]},getData:function(){var k=this.getStates(),e={},g=this.getBefore(),c=this.getAfter(),h=k[this.STATE_FROM],i=k[this.STATE_TO],j=h.getData(),f=i.getData(),d,b,a;for(b in k){if(k.hasOwnProperty(b)){a=k[b];d=a.getData();e[b]=d}}if(Ext.os.is.Android2){e["0.0001%"]=j}return{before:g?g.getData():{},after:c?c.getData():{},states:e,from:j,to:f,duration:this.getDuration(),iteration:this.getIteration(),direction:this.getDirection(),easing:this.getEasing(),delay:this.getDelay(),onEnd:this.getOnEnd(),onBeforeEnd:this.getOnBeforeEnd(),onBeforeStart:this.getOnBeforeStart(),scope:this.getScope(),preserveEndState:this.getPreserveEndState(),replacePrevious:this.getReplacePrevious()}}});Ext.define("Ext.fx.animation.Cube",{extend:"Ext.fx.animation.Abstract",alias:"animation.cube",config:{before:{},after:{},direction:"right",out:false},getData:function(){var m=this.getTo(),n=this.getFrom(),k=this.getBefore(),a=this.getAfter(),e=this.getOut(),j=this.getDirection(),b=this.getElement(),g=b.getWidth(),c=b.getHeight(),l=e?"100% 100%":"0% 0%",i=1,d=1,f={rotateY:0,translateZ:0,},h={rotateY:0,translateZ:0};if(j=="left"||j=="right"){if(e){d=0.5;h.translateZ=g;h.rotateY=-90}else{i=0.5;f.translateZ=g;f.rotateY=90}}k["transform-origin"]=l;a["transform-origin"]=null;m.set("transform",h);n.set("transform",f);n.set("opacity",i);m.set("opacity",d);return this.callParent(arguments)}});Ext.define("Ext.fx.animation.Fade",{extend:"Ext.fx.animation.Abstract",alternateClassName:"Ext.fx.animation.FadeIn",alias:["animation.fade","animation.fadeIn"],config:{out:false,before:{display:null,opacity:0},after:{opacity:null},reverse:null},updateOut:function(a){var c=this.getTo(),b=this.getFrom();if(a){b.set("opacity",1);c.set("opacity",0)}else{b.set("opacity",0);c.set("opacity",1)}}});Ext.define("Ext.fx.animation.FadeOut",{extend:"Ext.fx.animation.Fade",alias:"animation.fadeOut",config:{out:true,before:{}}});Ext.define("Ext.fx.animation.Flip",{extend:"Ext.fx.animation.Abstract",alias:"animation.flip",config:{easing:"ease-in",direction:"right",half:false,out:null},getData:function(){var h=this.getFrom(),i=this.getTo(),g=this.getDirection(),b=this.getOut(),l=this.getHalf(),c=(l)?90:180,e=1,a=1,k=0,j=0,f=0,d=0;if(b){a=0.8}else{e=0.8}switch(g){case this.DIRECTION_UP:if(b){f=c}else{k=-c}break;case this.DIRECTION_DOWN:if(b){f=-c}else{k=c}break;case this.DIRECTION_RIGHT:if(b){d=-c}else{j=c}break;case this.DIRECTION_LEFT:if(b){d=-c}else{j=c}break}h.setTransform({rotateX:k,rotateY:j,scale:e});i.setTransform({rotateX:f,rotateY:d,scale:a});return this.callParent(arguments)}});Ext.define("Ext.fx.animation.Pop",{extend:"Ext.fx.animation.Abstract",alias:["animation.pop","animation.popIn"],alternateClassName:"Ext.fx.animation.PopIn",config:{out:false,before:{display:null,opacity:0},after:{opacity:null}},getData:function(){var c=this.getTo(),b=this.getFrom(),a=this.getOut();if(a){b.set("opacity",1);b.setTransform({scale:1});c.set("opacity",0);c.setTransform({scale:0})}else{b.set("opacity",0);b.setTransform({scale:0});c.set("opacity",1);c.setTransform({scale:1})}return this.callParent(arguments)}});Ext.define("Ext.fx.animation.PopOut",{extend:"Ext.fx.animation.Pop",alias:"animation.popOut",config:{out:true,before:{}}});Ext.define("Ext.fx.animation.Slide",{extend:"Ext.fx.animation.Abstract",alternateClassName:"Ext.fx.animation.SlideIn",alias:["animation.slide","animation.slideIn"],config:{direction:"left",out:false,offset:0,easing:"auto",containerBox:"auto",elementBox:"auto",isElementBoxFit:true,useCssTransform:true},reverseDirectionMap:{up:"down",down:"up",left:"right",right:"left"},applyEasing:function(a){if(a==="auto"){return"ease-"+((this.getOut())?"in":"out")}return a},getContainerBox:function(){var a=this._containerBox;if(a==="auto"){a=this.getElement().getParent().getPageBox()}return a},getElementBox:function(){var a=this._elementBox;if(this.getIsElementBoxFit()){return this.getContainerBox()}if(a==="auto"){a=this.getElement().getPageBox()}return a},getData:function(){var p=this.getElementBox(),c=this.getContainerBox(),g=p?p:c,n=this.getFrom(),o=this.getTo(),f=this.getOut(),e=this.getOffset(),m=this.getDirection(),b=this.getUseCssTransform(),h=this.getReverse(),d=0,a=0,l,j,k,i;if(h){m=this.reverseDirectionMap[m]}switch(m){case this.DIRECTION_UP:if(f){a=c.top-g.top-g.height-e}else{a=c.bottom-g.bottom+g.height+e}break;case this.DIRECTION_DOWN:if(f){a=c.bottom-g.bottom+g.height+e}else{a=c.top-g.height-g.top-e}break;case this.DIRECTION_RIGHT:if(f){d=c.right-g.right+g.width+e}else{d=c.left-g.left-g.width-e}break;case this.DIRECTION_LEFT:if(f){d=c.left-g.left-g.width-e}else{d=c.right-g.right+g.width+e}break}l=(f)?0:d;j=(f)?0:a;if(b){n.setTransform({translateX:l,translateY:j})}else{n.set("left",l);n.set("top",j)}k=(f)?d:0;i=(f)?a:0;if(b){o.setTransform({translateX:k,translateY:i})}else{o.set("left",k);o.set("top",i)}return this.callParent(arguments)}});Ext.define("Ext.fx.animation.SlideOut",{extend:"Ext.fx.animation.Slide",alias:["animation.slideOut"],config:{out:true}});Ext.define("Ext.fx.Animation",{requires:["Ext.fx.animation.Slide","Ext.fx.animation.SlideOut","Ext.fx.animation.Fade","Ext.fx.animation.FadeOut","Ext.fx.animation.Flip","Ext.fx.animation.Pop","Ext.fx.animation.PopOut","Ext.fx.animation.Cube"],constructor:function(b){var a=Ext.fx.animation.Abstract,c;if(typeof b=="string"){c=b;b={}}else{if(b&&b.type){c=b.type}}if(c){if(Ext.os.is.Android2){if(c=="pop"){c="fade"}if(c=="popIn"){c="fadeIn"}if(c=="popOut"){c="fadeOut"}}a=Ext.ClassManager.getByAlias("animation."+c)}return Ext.factory(b,a)}});Ext.define("Ext.fx.layout.card.Abstract",{extend:"Ext.Evented",isAnimation:true,config:{direction:"left",duration:null,reverse:null,layout:null},updateLayout:function(){this.enable()},enable:function(){var a=this.getLayout();if(a){a.onBefore("activeitemchange","onActiveItemChange",this)}},disable:function(){var a=this.getLayout();if(this.isAnimating){this.stopAnimation()}if(a){a.unBefore("activeitemchange","onActiveItemChange",this)}},onActiveItemChange:Ext.emptyFn,destroy:function(){var a=this.getLayout();if(this.isAnimating){this.stopAnimation()}if(a){a.unBefore("activeitemchange","onActiveItemChange",this)}this.setLayout(null)}});Ext.define("Ext.fx.layout.card.Scroll",{extend:"Ext.fx.layout.card.Abstract",requires:["Ext.fx.easing.Linear"],alias:"fx.layout.card.scroll",config:{duration:150},constructor:function(a){this.initConfig(a);this.doAnimationFrame=Ext.Function.bind(this.doAnimationFrame,this)},getEasing:function(){var a=this.easing;if(!a){this.easing=a=new Ext.fx.easing.Linear()}return a},updateDuration:function(a){this.getEasing().setDuration(a)},onActiveItemChange:function(a,d,l,m,c){var i=this.getDirection(),g=this.getEasing(),k,e,b,h,j,f;if(d&&l){if(this.isAnimating){this.stopAnimation()}k=this.getLayout().container.innerElement;h=k.getWidth();j=k.getHeight();e=d.renderElement;b=l.renderElement;this.oldItem=l;this.newItem=d;this.currentEventController=c;this.containerElement=k;this.isReverse=f=this.getReverse();d.show();if(i=="right"){i="left";this.isReverse=f=!f}else{if(i=="down"){i="up";this.isReverse=f=!f}}if(i=="left"){if(f){g.setConfig({startValue:h,endValue:0});k.dom.scrollLeft=h;b.setLeft(h)}else{g.setConfig({startValue:0,endValue:h});e.setLeft(h)}}else{if(f){g.setConfig({startValue:j,endValue:0});k.dom.scrollTop=j;b.setTop(j)}else{g.setConfig({startValue:0,endValue:j});e.setTop(j)}}this.startAnimation();c.pause()}},startAnimation:function(){this.isAnimating=true;this.getEasing().setStartTime(Date.now());this.timer=setInterval(this.doAnimationFrame,20);this.doAnimationFrame()},doAnimationFrame:function(){var d=this.getEasing(),c=this.getDirection(),a="scrollTop",b;if(c=="left"||c=="right"){a="scrollLeft"}if(d.isEnded){this.stopAnimation()}else{b=d.getValue();this.containerElement.dom[a]=b}},stopAnimation:function(){var b=this.getDirection(),a="setTop";if(b=="left"||b=="right"){a="setLeft"}this.currentEventController.resume();if(this.isReverse){this.oldItem.renderElement[a](null)}else{this.newItem.renderElement[a](null)}clearInterval(this.timer);this.isAnimating=false;this.fireEvent("animationend",this)}});Ext.define("Ext.fx.layout.card.Style",{extend:"Ext.fx.layout.card.Abstract",requires:["Ext.fx.Animation"],config:{inAnimation:{before:{visibility:null},preserveEndState:false,replacePrevious:true},outAnimation:{preserveEndState:false,replacePrevious:true}},constructor:function(b){var c,a;this.initConfig(b);this.endAnimationCounter=0;c=this.getInAnimation();a=this.getOutAnimation();c.on("animationend","incrementEnd",this);a.on("animationend","incrementEnd",this);c.setConfig(b);a.setConfig(b)},incrementEnd:function(){this.endAnimationCounter++;if(this.endAnimationCounter>1){this.endAnimationCounter=0;this.fireEvent("animationend",this)}},applyInAnimation:function(b,a){return Ext.factory(b,Ext.fx.Animation,a)},applyOutAnimation:function(b,a){return Ext.factory(b,Ext.fx.Animation,a)},updateInAnimation:function(a){a.setScope(this)},updateOutAnimation:function(a){a.setScope(this)},onActiveItemChange:function(a,e,h,i,d){var b=this.getInAnimation(),g=this.getOutAnimation(),f,c;if(e&&h&&h.isPainted()){f=e.renderElement;c=h.renderElement;b.setElement(f);g.setElement(c);g.setOnBeforeEnd(function(j,k){if(k||Ext.Animator.hasRunningAnimations(j)){d.firingArguments[1]=null;d.firingArguments[2]=null}});g.setOnEnd(function(){d.resume()});f.dom.style.setProperty("visibility","hidden","!important");e.show();Ext.Animator.run([g,b]);d.pause()}}});Ext.define("Ext.fx.layout.card.Cover",{extend:"Ext.fx.layout.card.Style",alias:"fx.layout.card.cover",config:{reverse:null,inAnimation:{before:{"z-index":100},after:{"z-index":0},type:"slide",easing:"ease-out"},outAnimation:{easing:"ease-out",from:{opacity:0.99},to:{opacity:1},out:true}},updateReverse:function(a){this.getInAnimation().setReverse(a);this.getOutAnimation().setReverse(a)}});Ext.define("Ext.fx.layout.card.Cube",{extend:"Ext.fx.layout.card.Style",alias:"fx.layout.card.cube",config:{reverse:null,inAnimation:{type:"cube"},outAnimation:{type:"cube",out:true}}});Ext.define("Ext.fx.layout.card.Fade",{extend:"Ext.fx.layout.card.Style",alias:"fx.layout.card.fade",config:{reverse:null,inAnimation:{type:"fade",easing:"ease-out"},outAnimation:{type:"fade",easing:"ease-out",out:true}}});Ext.define("Ext.fx.layout.card.Flip",{extend:"Ext.fx.layout.card.Style",alias:"fx.layout.card.flip",config:{duration:500,inAnimation:{type:"flip",half:true,easing:"ease-out",before:{"backface-visibility":"hidden"},after:{"backface-visibility":null}},outAnimation:{type:"flip",half:true,easing:"ease-in",before:{"backface-visibility":"hidden"},after:{"backface-visibility":null},out:true}},updateDuration:function(d){var c=d/2,b=this.getInAnimation(),a=this.getOutAnimation();b.setDelay(c);b.setDuration(c);a.setDuration(c)}});Ext.define("Ext.fx.layout.card.Pop",{extend:"Ext.fx.layout.card.Style",alias:"fx.layout.card.pop",config:{duration:500,inAnimation:{type:"pop",easing:"ease-out"},outAnimation:{type:"pop",easing:"ease-in",out:true}},updateDuration:function(d){var c=d/2,b=this.getInAnimation(),a=this.getOutAnimation();b.setDelay(c);b.setDuration(c);a.setDuration(c)}});Ext.define("Ext.fx.layout.card.Reveal",{extend:"Ext.fx.layout.card.Style",alias:"fx.layout.card.reveal",config:{inAnimation:{easing:"ease-out",from:{opacity:0.99},to:{opacity:1}},outAnimation:{before:{"z-index":100},after:{"z-index":0},type:"slide",easing:"ease-out",out:true}},updateReverse:function(a){this.getInAnimation().setReverse(a);this.getOutAnimation().setReverse(a)}});Ext.define("Ext.fx.layout.card.Slide",{extend:"Ext.fx.layout.card.Style",alias:"fx.layout.card.slide",config:{inAnimation:{type:"slide",easing:"ease-out"},outAnimation:{type:"slide",easing:"ease-out",out:true}},updateReverse:function(a){this.getInAnimation().setReverse(a);this.getOutAnimation().setReverse(a)}});Ext.define("Ext.fx.layout.Card",{requires:["Ext.fx.layout.card.Slide","Ext.fx.layout.card.Cover","Ext.fx.layout.card.Reveal","Ext.fx.layout.card.Fade","Ext.fx.layout.card.Flip","Ext.fx.layout.card.Pop","Ext.fx.layout.card.Cube","Ext.fx.layout.card.Scroll"],constructor:function(b){var a=Ext.fx.layout.card.Abstract,c;if(!b){return null}if(typeof b=="string"){c=b;b={}}else{if(b.type){c=b.type}}b.elementBox=false;if(c){if(Ext.os.is.Android2){if(c!="fade"){c="scroll"}}else{if(c==="slide"&&Ext.browser.is.ChromeMobile){c="scroll"}}a=Ext.ClassManager.getByAlias("fx.layout.card."+c)}return Ext.factory(b,a)}});Ext.define("Ext.fx.runner.Css",{extend:"Ext.Evented",requires:["Ext.fx.Animation"],prefixedProperties:{transform:true,"transform-origin":true,perspective:true,"transform-style":true,transition:true,"transition-property":true,"transition-duration":true,"transition-timing-function":true,"transition-delay":true,animation:true,"animation-name":true,"animation-duration":true,"animation-iteration-count":true,"animation-direction":true,"animation-timing-function":true,"animation-delay":true},lengthProperties:{top:true,right:true,bottom:true,left:true,width:true,height:true,"max-height":true,"max-width":true,"min-height":true,"min-width":true,"margin-bottom":true,"margin-left":true,"margin-right":true,"margin-top":true,"padding-bottom":true,"padding-left":true,"padding-right":true,"padding-top":true,"border-bottom-width":true,"border-left-width":true,"border-right-width":true,"border-spacing":true,"border-top-width":true,"border-width":true,"outline-width":true,"letter-spacing":true,"line-height":true,"text-indent":true,"word-spacing":true,"font-size":true,translate:true,translateX:true,translateY:true,translateZ:true,translate3d:true},durationProperties:{"transition-duration":true,"transition-delay":true,"animation-duration":true,"animation-delay":true},angleProperties:{rotate:true,rotateX:true,rotateY:true,rotateZ:true,skew:true,skewX:true,skewY:true},lengthUnitRegex:/([a-z%]*)$/,DEFAULT_UNIT_LENGTH:"px",DEFAULT_UNIT_ANGLE:"deg",DEFAULT_UNIT_DURATION:"ms",formattedNameCache:{},constructor:function(){var a=Ext.feature.has.Css3dTransforms;if(a){this.transformMethods=["translateX","translateY","translateZ","rotate","rotateX","rotateY","rotateZ","skewX","skewY","scaleX","scaleY","scaleZ"]}else{this.transformMethods=["translateX","translateY","rotate","skewX","skewY","scaleX","scaleY"]}this.vendorPrefix=Ext.browser.getStyleDashPrefix();this.ruleStylesCache={};return this},getStyleSheet:function(){var c=this.styleSheet,a,b;if(!c){a=document.createElement("style");a.type="text/css";(document.head||document.getElementsByTagName("head")[0]).appendChild(a);b=document.styleSheets;this.styleSheet=c=b[b.length-1]}return c},applyRules:function(i){var g=this.getStyleSheet(),k=this.ruleStylesCache,j=g.cssRules,c,e,h,b,d,a,f;for(c in i){e=i[c];h=k[c];if(h===undefined){d=j.length;g.insertRule(c+"{}",d);h=k[c]=j.item(d).style}b=h.$cache;if(!b){b=h.$cache={}}for(a in e){f=this.formatValue(e[a],a);a=this.formatName(a);if(b[a]!==f){b[a]=f;if(f===null){h.removeProperty(a)}else{h.setProperty(a,f,"important")}}}}return this},applyStyles:function(d){var g,c,f,b,a,e;for(g in d){c=document.getElementById(g);if(!c){return this}f=c.style;b=d[g];for(a in b){e=this.formatValue(b[a],a);a=this.formatName(a);if(e===null){f.removeProperty(a)}else{f.setProperty(a,e,"important")}}}return this},formatName:function(b){var a=this.formattedNameCache,c=a[b];if(!c){if(this.prefixedProperties[b]){c=this.vendorPrefix+b}else{c=b}a[b]=c}return c},formatValue:function(j,b){var g=typeof j,l=this.DEFAULT_UNIT_LENGTH,e,a,d,f,c,k,h;if(g=="string"){if(this.lengthProperties[b]){h=j.match(this.lengthUnitRegex)[1];if(h.length>0){}else{return j+l}}return j}else{if(g=="number"){if(j==0){return"0"}if(this.lengthProperties[b]){return j+l}if(this.angleProperties[b]){return j+this.DEFAULT_UNIT_ANGLE}if(this.durationProperties[b]){return j+this.DEFAULT_UNIT_DURATION}}else{if(b==="transform"){e=this.transformMethods;c=[];for(d=0,f=e.length;d<f;d++){a=e[d];c.push(a+"("+this.formatValue(j[a],a)+")")}return c.join(" ")}else{if(Ext.isArray(j)){k=[];for(d=0,f=j.length;d<f;d++){k.push(this.formatValue(j[d],b))}return(k.length>0)?k.join(", "):"none"}}}}return j}});Ext.define("Ext.fx.runner.CssTransition",{extend:"Ext.fx.runner.Css",listenersAttached:false,constructor:function(){this.runningAnimationsData={};return this.callParent(arguments)},attachListeners:function(){this.listenersAttached=true;this.getEventDispatcher().addListener("element","*","transitionend","onTransitionEnd",this)},onTransitionEnd:function(b){var a=b.target,c=a.id;if(c&&this.runningAnimationsData.hasOwnProperty(c)){this.refreshRunningAnimationsData(Ext.get(a),[b.browserEvent.propertyName])}},onAnimationEnd:function(g,f,d,j,n){var b=g.getId(),k=this.runningAnimationsData[b],c=k.nameMap,o={},m={},h,e,l,a;o[b]=m;if(f.onBeforeEnd){f.onBeforeEnd.call(f.scope||this,g,j)}d.fireEvent("animationbeforeend",d,g,j);this.fireEvent("animationbeforeend",this,d,g,j);if(n||(!j&&!f.preserveEndState)){h=f.toPropertyNames;for(e=0,l=h.length;e<l;e++){a=h[e];if(!c.hasOwnProperty(a)){m[a]=null}}}if(f.after){Ext.merge(m,f.after)}this.applyStyles(o);if(f.onEnd){f.onEnd.call(f.scope||this,g,j)}d.fireEvent("animationend",d,g,j);this.fireEvent("animationend",this,d,g,j)},onAllAnimationsEnd:function(b){var c=b.getId(),a={};delete this.runningAnimationsData[c];a[c]={"transition-property":null,"transition-duration":null,"transition-timing-function":null,"transition-delay":null};this.applyStyles(a);this.fireEvent("animationallend",this,b)},hasRunningAnimations:function(a){var c=a.getId(),b=this.runningAnimationsData;return b.hasOwnProperty(c)&&b[c].sessions.length>0},refreshRunningAnimationsData:function(d,k,t,p){var g=d.getId(),q=this.runningAnimationsData,a=q[g],m=a.nameMap,s=a.nameList,b=a.sessions,f,h,e,u,l,c,r,o,n=false;t=Boolean(t);p=Boolean(p);if(!b){return this}f=b.length;if(f===0){return this}if(p){a.nameMap={};s.length=0;for(l=0;l<f;l++){c=b[l];this.onAnimationEnd(d,c.data,c.animation,t,p)}b.length=0}else{for(l=0;l<f;l++){c=b[l];r=c.map;o=c.list;for(h=0,e=k.length;h<e;h++){u=k[h];if(r[u]){delete r[u];Ext.Array.remove(o,u);c.length--;if(--m[u]==0){delete m[u];Ext.Array.remove(s,u)}}}if(c.length==0){b.splice(l,1);l--;f--;n=true;this.onAnimationEnd(d,c.data,c.animation,t)}}}if(!p&&!t&&b.length==0&&n){this.onAllAnimationsEnd(d)}},getRunningData:function(b){var a=this.runningAnimationsData;if(!a.hasOwnProperty(b)){a[b]={nameMap:{},nameList:[],sessions:[]}}return a[b]},getTestElement:function(){var c=this.testElement,b,d,a;if(!c){b=document.createElement("iframe");a=b.style;a.setProperty("visibility","hidden","important");a.setProperty("width","0px","important");a.setProperty("height","0px","important");a.setProperty("position","absolute","important");a.setProperty("border","0px","important");a.setProperty("zIndex","-1000","important");document.body.appendChild(b);d=b.contentDocument;d.open();d.writeln("</body>");d.close();this.testElement=c=d.createElement("div");c.style.setProperty("position","absolute","!important");d.body.appendChild(c);this.testElementComputedStyle=window.getComputedStyle(c)}return c},getCssStyleValue:function(b,e){var d=this.getTestElement(),a=this.testElementComputedStyle,c=d.style;c.setProperty(b,e);e=a.getPropertyValue(b);c.removeProperty(b);return e},run:function(o){var E=this,h=this.lengthProperties,w={},D={},F={},d,r,x,e,t,H,u,p,q,a,z,y,n,A,l,s,g,B,G,k,f,v,m,c,C,b;if(!this.listenersAttached){this.attachListeners()}o=Ext.Array.from(o);for(z=0,n=o.length;z<n;z++){A=o[z];A=Ext.factory(A,Ext.fx.Animation);d=A.getElement();g=window.getComputedStyle(d.dom);r=d.getId();F=Ext.merge({},A.getData());if(A.onBeforeStart){A.onBeforeStart.call(A.scope||this,d);A.fireEvent("animationstart",A);this.fireEvent("animationstart",this,A)}F[r]=F;t=F.before;x=F.from;e=F.to;F.fromPropertyNames=H=[];F.toPropertyNames=u=[];for(G in e){if(e.hasOwnProperty(G)){e[G]=k=this.formatValue(e[G],G);B=this.formatName(G);m=h.hasOwnProperty(G);if(!m){k=this.getCssStyleValue(B,k)}if(x.hasOwnProperty(G)){x[G]=v=this.formatValue(x[G],G);if(!m){v=this.getCssStyleValue(B,v)}if(k!==v){H.push(B);u.push(B)}}else{f=g.getPropertyValue(B);if(k!==f){u.push(B)}}}}l=u.length;if(l===0){this.onAnimationEnd(d,F,A);continue}a=this.getRunningData(r);b=a.sessions;if(b.length>0){this.refreshRunningAnimationsData(d,Ext.Array.merge(H,u),true,F.replacePrevious)}c=a.nameMap;C=a.nameList;s={};for(y=0;y<l;y++){G=u[y];s[G]=true;if(!c.hasOwnProperty(G)){c[G]=1;C.push(G)}else{c[G]++}}b.push({element:d,map:s,list:u.slice(),length:l,data:F,animation:A});w[r]=x=Ext.apply(Ext.Object.chain(t),x);if(C.length>0){H=Ext.Array.difference(C,H);u=Ext.Array.merge(H,u);x["transition-property"]=H}D[r]=e=Ext.Object.chain(e);e["transition-property"]=u;e["transition-duration"]=F.duration;e["transition-timing-function"]=F.easing;e["transition-delay"]=F.delay;A.startTime=Date.now()}q=this.$className;this.applyStyles(w);p=function(i){if(i.data===q&&i.source===window){window.removeEventListener("message",p,false);E.applyStyles(D)}};window.addEventListener("message",p,false);window.postMessage(q,"*")}});Ext.define("Ext.fx.Runner",{requires:["Ext.fx.runner.CssTransition"],constructor:function(){return new Ext.fx.runner.CssTransition()}});(function(a){Ext.define("Ext.layout.Default",{extend:"Ext.Evented",alternateClassName:["Ext.layout.AutoContainerLayout","Ext.layout.ContainerLayout"],alias:["layout.auto","layout.default"],isLayout:true,hasDockedItemsCls:a+"hasdocked",centeredItemCls:a+"centered",floatingItemCls:a+"floating",dockingWrapperCls:a+"docking",dockingInnerCls:a+"docking-inner",maskCls:a+"mask",positionMap:{top:"start",left:"start",bottom:"end",right:"end"},positionDirectionMap:{top:"vertical",bottom:"vertical",left:"horizontal",right:"horizontal"},DIRECTION_VERTICAL:"vertical",DIRECTION_HORIZONTAL:"horizontal",POSITION_START:"start",POSITION_END:"end",config:{animation:null},constructor:function(b,c){this.container=b;this.innerItems=[];this.centeringWrappers={};this.initConfig(c)},reapply:Ext.emptyFn,unapply:Ext.emptyFn,onItemAdd:function(){this.doItemAdd.apply(this,arguments)},onItemRemove:function(){this.doItemRemove.apply(this,arguments)},onItemMove:function(){this.doItemMove.apply(this,arguments)},onItemCenteredChange:function(){this.doItemCenteredChange.apply(this,arguments)},onItemFloatingChange:function(){this.doItemFloatingChange.apply(this,arguments)},onItemDockedChange:function(){this.doItemDockedChange.apply(this,arguments)},doItemAdd:function(c,b){var d=c.getDocked();if(d!==null){this.dockItem(c,d)}else{if(c.isCentered()){this.centerItem(c,b)}else{this.insertItem(c,b)}}if(c.isFloating()){this.onItemFloatingChange(c,true)}},doItemRemove:function(b){if(b.isDocked()){this.undockItem(b)}else{if(b.isCentered()){this.uncenterItem(b)}}Ext.Array.remove(this.innerItems,b);this.container.innerElement.dom.removeChild(b.renderElement.dom)},doItemMove:function(c,d,b){if(c.isCentered()){c.setZIndex((d+1)*2)}else{if(c.isFloating()){c.setZIndex((d+1)*2)}this.insertItem(c,d)}},doItemCenteredChange:function(c,b){if(b){this.centerItem(c)}else{this.uncenterItem(c)}},doItemFloatingChange:function(d,e){var c=d.element,b=this.floatingItemCls;if(e){if(d.getZIndex()===null){d.setZIndex((this.container.indexOf(d)+1)*2)}c.addCls(b)}else{d.setZIndex(null);c.removeCls(b)}},doItemDockedChange:function(b,d,c){if(c){this.undockItem(b,c)}if(d){this.dockItem(b,d)}},centerItem:function(b){this.insertItem(b,0);if(b.getZIndex()===null){b.setZIndex((this.container.indexOf(b)+1)*2)}this.createCenteringWrapper(b);b.element.addCls(this.floatingItemCls)},uncenterItem:function(b){this.destroyCenteringWrapper(b);b.setZIndex(null);this.insertItem(b,this.container.indexOf(b));b.element.removeCls(this.floatingItemCls)},dockItem:function(f,b){var c=this.container,g=f.renderElement,e=f.element,d=this.dockingInnerElement;if(!d){c.setUseBodyElement(true);this.dockingInnerElement=d=c.bodyElement}this.getDockingWrapper(b);if(this.positionMap[b]===this.POSITION_START){g.insertBefore(d)}else{g.insertAfter(d)}e.addCls(a+"docked-"+b)},undockItem:function(b,c){this.insertItem(b,this.container.indexOf(b));b.element.removeCls(a+"docked-"+c)},getDockingWrapper:function(b){var e=this.currentDockingDirection,d=this.positionDirectionMap[b],c=this.dockingWrapper;if(e!==d){this.currentDockingDirection=d;this.dockingWrapper=c=this.createDockingWrapper(d)}return c},createDockingWrapper:function(b){return this.dockingInnerElement.wrap({classList:[this.dockingWrapperCls+"-"+b]},true)},createCenteringWrapper:function(c){var f=c.getId(),d=this.centeringWrappers,b=c.renderElement,e;d[f]=e=b.wrap({className:this.centeredItemCls});return e},destroyCenteringWrapper:function(c){var f=c.getId(),d=this.centeringWrappers,b=c.renderElement,e=d[f];b.unwrap();e.destroy();delete d[f];return this},insertItem:function(k,g){var d=this.container,j=d.getItems().items,e=this.innerItems,c=d.innerElement.dom,i=k.renderElement.dom,h,f,b;if(d.has(k)){Ext.Array.remove(e,k)}if(typeof g=="number"){h=j[g];if(h===k){h=j[++g]}while(h&&(h.isCentered()||h.isDocked())){h=j[++g]}if(h){b=e.indexOf(h);if(b!==-1){while(h&&(h.isCentered()||h.isDocked())){h=e[++b]}if(h){e.splice(b,0,k);f=h.renderElement.dom;c.insertBefore(i,f);return this}}}}e.push(k);c.appendChild(i);return this}})})(Ext.baseCSSPrefix);Ext.define("Ext.layout.AbstractBox",{extend:"Ext.layout.Default",config:{align:"stretch",pack:null},flexItemCls:Ext.baseCSSPrefix+"layout-box-item",positionMap:{middle:"center",left:"start",top:"start",right:"end",bottom:"end"},constructor:function(a){this.callParent(arguments);a.innerElement.addCls(this.cls);a.on(this.sizeChangeEventName,"onItemSizeChange",this,{delegate:"> component"})},reapply:function(){this.container.innerElement.addCls(this.cls);this.updatePack(this.getPack());this.updateAlign(this.getAlign())},unapply:function(){this.container.innerElement.removeCls(this.cls);this.updatePack(null);this.updateAlign(null)},doItemAdd:function(d,b){this.callParent(arguments);if(d.isInnerItem()){var c=d.getConfig(this.sizePropertyName),a=d.config;if(!c&&("flex" in a)){this.setItemFlex(d,a.flex)}}},doItemRemove:function(a){if(a.isInnerItem()){this.setItemFlex(a,null)}this.callParent(arguments)},onItemSizeChange:function(a){this.setItemFlex(a,null)},doItemCenteredChange:function(b,a){if(a){this.setItemFlex(b,null)}this.callParent(arguments)},doItemFloatingChange:function(a,b){if(b){this.setItemFlex(a,null)}this.callParent(arguments)},doItemDockedChange:function(a,b){if(b){this.setItemFlex(a,null)}this.callParent(arguments)},redrawContainer:function(){var a=this.container,b=a.renderElement.dom.parentNode;if(b&&b.nodeType!==11){a.innerElement.redraw()}},setItemFlex:function(c,a){var b=c.element,d=this.flexItemCls;if(a){b.addCls(d)}else{if(b.hasCls(d)){this.redrawContainer();b.removeCls(d)}}b.dom.style.webkitBoxFlex=a},convertPosition:function(a){if(this.positionMap.hasOwnProperty(a)){return this.positionMap[a]}return a},applyAlign:function(a){return this.convertPosition(a)},updateAlign:function(a){this.container.innerElement.dom.style.webkitBoxAlign=a},applyPack:function(a){return this.convertPosition(a)},updatePack:function(a){this.container.innerElement.dom.style.webkitBoxPack=a}});Ext.define("Ext.layout.Fit",{extend:"Ext.layout.Default",alternateClassName:"Ext.layout.FitLayout",alias:"layout.fit",cls:Ext.baseCSSPrefix+"layout-fit",itemCls:Ext.baseCSSPrefix+"layout-fit-item",constructor:function(a){this.callParent(arguments);this.apply()},apply:function(){this.container.innerElement.addCls(this.cls)},reapply:function(){this.apply()},unapply:function(){this.container.innerElement.removeCls(this.cls)},doItemAdd:function(b,a){if(b.isInnerItem()){b.addCls(this.itemCls)}this.callParent(arguments)},doItemRemove:function(a){if(a.isInnerItem()){a.removeCls(this.itemCls)}this.callParent(arguments)}});Ext.define("Ext.layout.Card",{extend:"Ext.layout.Fit",alternateClassName:"Ext.layout.CardLayout",isCard:true,requires:["Ext.fx.layout.Card"],alias:"layout.card",cls:Ext.baseCSSPrefix+"layout-card",itemCls:Ext.baseCSSPrefix+"layout-card-item",constructor:function(){this.callParent(arguments);this.container.onInitialized(this.onContainerInitialized,this)},applyAnimation:function(a){return new Ext.fx.layout.Card(a)},updateAnimation:function(b,a){if(b&&b.isAnimation){b.setLayout(this)}if(a){a.destroy()}},doItemAdd:function(b,a){if(b.isInnerItem()){b.hide()}this.callParent(arguments)},doItemRemove:function(c,a,b){this.callParent(arguments);if(!b&&c.isInnerItem()){c.show()}},onContainerInitialized:function(a){var b=a.getActiveItem();if(b){b.show()}a.on("activeitemchange","onContainerActiveItemChange",this)},onContainerActiveItemChange:function(a){this.relayEvent(arguments,"doActiveItemChange")},doActiveItemChange:function(b,c,a){if(a){a.hide()}if(c){c.show()}},doItemDockedChange:function(b,c){var a=b.element;if(c){a.removeCls(this.itemCls)}else{a.addCls(this.itemCls)}this.callParent(arguments)}});Ext.define("Ext.layout.HBox",{extend:"Ext.layout.AbstractBox",alternateClassName:"Ext.layout.HBoxLayout",alias:"layout.hbox",sizePropertyName:"width",sizeChangeEventName:"widthchange",cls:Ext.baseCSSPrefix+"layout-hbox"});Ext.define("Ext.layout.VBox",{extend:"Ext.layout.AbstractBox",alternateClassName:"Ext.layout.VBoxLayout",alias:"layout.vbox",sizePropertyName:"height",sizeChangeEventName:"heightchange",cls:Ext.baseCSSPrefix+"layout-vbox"});Ext.define("Ext.layout.Layout",{requires:["Ext.layout.Fit","Ext.layout.Card","Ext.layout.HBox","Ext.layout.VBox"],constructor:function(a,b){var c=Ext.layout.Default,d,e;if(typeof b=="string"){d=b;b={}}else{if("type" in b){d=b.type}}if(d){c=Ext.ClassManager.getByAlias("layout."+d)}return new c(a,b)}});Ext.define("Ext.mixin.Sortable",{extend:"Ext.mixin.Mixin",requires:["Ext.util.Sorter"],mixinConfig:{id:"sortable"},config:{sorters:null,defaultSortDirection:"ASC",sortRoot:null},dirtySortFn:false,sortFn:null,sorted:false,applySorters:function(a,b){if(!b){b=this.createSortersCollection()}b.clear();this.sorted=false;if(a){this.addSorters(a)}return b},createSortersCollection:function(){this._sorters=Ext.create("Ext.util.Collection",function(a){return a.getId()});return this._sorters},addSorter:function(b,a){this.addSorters([b],a)},addSorters:function(c,a){var b=this.getSorters();return this.insertSorters(b?b.length:0,c,a)},insertSorter:function(a,c,b){return this.insertSorters(a,[c],b)},insertSorters:function(e,h,a){if(!Ext.isArray(h)){h=[h]}var f=h.length,j=a||this.getDefaultSortDirection(),c=this.getSortRoot(),k=this.getSorters(),l=[],g,b,m,d;if(!k){k=this.createSortersCollection()}for(b=0;b<f;b++){m=h[b];g={direction:j,root:c};if(typeof m==="string"){d=k.get(m);if(!d){g.property=m}else{if(a!==undefined){d.setDirection(a)}else{d.toggle()}continue}}else{if(Ext.isFunction(m)){g.sorterFn=m}else{if(Ext.isObject(m)){if(!m.isSorter){if(m.fn){m.sorterFn=m.fn;delete m.fn}g=Ext.apply(g,m)}else{l.push(m);if(!m.getRoot()){m.setRoot(c)}continue}}}}m=Ext.create("Ext.util.Sorter",g);l.push(m)}for(b=0,f=l.length;b<f;b++){k.insert(e+b,l[b])}this.dirtySortFn=true;if(k.length){this.sorted=true}return k},removeSorter:function(a){return this.removeSorters([a])},removeSorters:function(d){if(!Ext.isArray(d)){d=[d]}var b=d.length,c=this.getSorters(),a,e;for(a=0;a<b;a++){e=d[a];if(typeof e==="string"){c.removeAtKey(e)}else{if(typeof e==="function"){c.each(function(f){if(f.getSorterFn()===e){c.remove(f)}})}else{if(e.isSorter){c.remove(e)}}}}if(!c.length){this.sorted=false}},updateSortFn:function(){var a=this.getSorters().items;this.sortFn=function(d,c){var f=a.length,b,e;for(e=0;e<f;e++){b=a[e].sort.call(this,d,c);if(b!==0){break}}return b};this.dirtySortFn=false;return this.sortFn},getSortFn:function(){if(this.dirtySortFn){return this.updateSortFn()}return this.sortFn},sort:function(a){Ext.Array.sort(a,this.getSortFn());return a},findInsertionIndex:function(b,e,g){var h=0,a=b.length-1,d=g||this.getSortFn(),c,f;while(h<=a){c=(h+a)>>1;f=d(e,b[c]);if(f>=0){h=c+1}else{if(f<0){a=c-1}}}return h}});Ext.define("Ext.util.AbstractMixedCollection",{requires:["Ext.util.Filter"],mixins:{observable:"Ext.util.Observable"},constructor:function(b,a){var c=this;c.items=[];c.map={};c.keys=[];c.length=0;c.allowFunctions=b===true;if(a){c.getKey=a}c.mixins.observable.constructor.call(c)},allowFunctions:false,add:function(b,e){var d=this,f=e,c=b,a;if(arguments.length==1){f=c;c=d.getKey(f)}if(typeof c!="undefined"&&c!==null){a=d.map[c];if(typeof a!="undefined"){return d.replace(c,f)}d.map[c]=f}d.length++;d.items.push(f);d.keys.push(c);d.fireEvent("add",d.length-1,f,c);return f},getKey:function(a){return a.id},replace:function(c,e){var d=this,a,b;if(arguments.length==1){e=arguments[0];c=d.getKey(e)}a=d.map[c];if(typeof c=="undefined"||c===null||typeof a=="undefined"){return d.add(c,e)}b=d.indexOfKey(c);d.items[b]=e;d.map[c]=e;d.fireEvent("replace",c,a,e);return e},addAll:function(f){var e=this,d=0,b,a,c;if(arguments.length>1||Ext.isArray(f)){b=arguments.length>1?arguments:f;for(a=b.length;d<a;d++){e.add(b[d])}}else{for(c in f){if(f.hasOwnProperty(c)){if(e.allowFunctions||typeof f[c]!="function"){e.add(c,f[c])}}}}},each:function(e,d){var b=[].concat(this.items),c=0,a=b.length,f;for(;c<a;c++){f=b[c];if(e.call(d||f,f,c,a)===false){break}}},eachKey:function(e,d){var f=this.keys,b=this.items,c=0,a=f.length;for(;c<a;c++){e.call(d||window,f[c],b[c],c,a)}},findBy:function(e,d){var f=this.keys,b=this.items,c=0,a=b.length;for(;c<a;c++){if(e.call(d||window,b[c],f[c])){return b[c]}}return null},insert:function(a,b,e){var d=this,c=b,f=e;if(arguments.length==2){f=c;c=d.getKey(f)}if(d.containsKey(c)){d.suspendEvents();d.removeAtKey(c);d.resumeEvents()}if(a>=d.length){return d.add(c,f)}d.length++;Ext.Array.splice(d.items,a,0,f);if(typeof c!="undefined"&&c!==null){d.map[c]=f}Ext.Array.splice(d.keys,a,0,c);d.fireEvent("add",a,f,c);return f},remove:function(a){return this.removeAt(this.indexOf(a))},removeAll:function(a){Ext.each(a||[],function(b){this.remove(b)},this);return this},removeAt:function(a){var c=this,d,b;if(a<c.length&&a>=0){c.length--;d=c.items[a];Ext.Array.erase(c.items,a,1);b=c.keys[a];if(typeof b!="undefined"){delete c.map[b]}Ext.Array.erase(c.keys,a,1);c.fireEvent("remove",d,b);return d}return false},removeAtKey:function(a){return this.removeAt(this.indexOfKey(a))},getCount:function(){return this.length},indexOf:function(a){return Ext.Array.indexOf(this.items,a)},indexOfKey:function(a){return Ext.Array.indexOf(this.keys,a)},get:function(b){var d=this,a=d.map[b],c=a!==undefined?a:(typeof b=="number")?d.items[b]:undefined;return typeof c!="function"||d.allowFunctions?c:null},getAt:function(a){return this.items[a]},getByKey:function(a){return this.map[a]},contains:function(a){return Ext.Array.contains(this.items,a)},containsKey:function(a){return typeof this.map[a]!="undefined"},clear:function(){var a=this;a.length=0;a.items=[];a.keys=[];a.map={};a.fireEvent("clear")},first:function(){return this.items[0]},last:function(){return this.items[this.length-1]},sum:function(g,b,h,a){var c=this.extractValues(g,b),f=c.length,e=0,d;h=h||0;a=(a||a===0)?a:f-1;for(d=h;d<=a;d++){e+=c[d]}return e},collect:function(j,e,g){var k=this.extractValues(j,e),a=k.length,b={},c=[],h,f,d;for(d=0;d<a;d++){h=k[d];f=String(h);if((g||!Ext.isEmpty(h))&&!b[f]){b[f]=true;c.push(h)}}return c},extractValues:function(c,a){var b=this.items;if(a){b=Ext.Array.pluck(b,a)}return Ext.Array.pluck(b,c)},getRange:function(f,a){var e=this,c=e.items,b=[],d;if(c.length<1){return b}f=f||0;a=Math.min(typeof a=="undefined"?e.length-1:a,e.length-1);if(f<=a){for(d=f;d<=a;d++){b[b.length]=c[d]}}else{for(d=f;d>=a;d--){b[b.length]=c[d]}}return b},filter:function(d,c,f,a){var b=[],e;if(Ext.isString(d)){b.push(Ext.create("Ext.util.Filter",{property:d,value:c,anyMatch:f,caseSensitive:a}))}else{if(Ext.isArray(d)||d instanceof Ext.util.Filter){b=b.concat(d)}}e=function(g){var m=true,n=b.length,h;for(h=0;h<n;h++){var l=b[h],k=l.getFilterFn(),j=l.getScope();m=m&&k.call(j,g)}return m};return this.filterBy(e)},filterBy:function(e,d){var h=this,a=new this.self(),g=h.keys,b=h.items,f=b.length,c;a.getKey=h.getKey;for(c=0;c<f;c++){if(e.call(d||h,b[c],g[c])){a.add(g[c],b[c])}}return a},findIndex:function(c,b,e,d,a){if(Ext.isEmpty(b,false)){return -1}b=this.createValueMatcher(b,d,a);return this.findIndexBy(function(f){return f&&b.test(f[c])},null,e)},findIndexBy:function(e,d,h){var g=this,f=g.keys,b=g.items,c=h||0,a=b.length;for(;c<a;c++){if(e.call(d||g,b[c],f[c])){return c}}return -1},createValueMatcher:function(c,e,a,b){if(!c.exec){var d=Ext.String.escapeRegex;c=String(c);if(e===true){c=d(c)}else{c="^"+d(c);if(b===true){c+="$"}}c=new RegExp(c,a?"":"i")}return c},clone:function(){var e=this,f=new this.self(),d=e.keys,b=e.items,c=0,a=b.length;for(;c<a;c++){f.add(d[c],b[c])}f.getKey=e.getKey;return f}});Ext.define("Ext.util.Collection",{config:{autoFilter:true,autoSort:true},mixins:{sortable:"Ext.mixin.Sortable",filterable:"Ext.mixin.Filterable"},constructor:function(b,a){var c=this;c.all=[];c.items=[];c.keys=[];c.indices={};c.map={};c.length=0;if(b){c.getKey=b}this.initConfig(a)},updateAutoSort:function(a,b){if(b===false&&a&&this.items.length){this.sort()}},updateAutoFilter:function(b,a){if(a===false&&b&&this.all.length){this.runFilters()}},insertSorters:function(){this.mixins.sortable.insertSorters.apply(this,arguments);if(this.getAutoSort()&&this.items.length){this.sort()}return this},removeSorters:function(a){this.mixins.sortable.removeSorters.call(this,a);if(this.sorted&&this.getAutoSort()&&this.items.length){this.sort()}return this},applyFilters:function(a){var b=this.mixins.filterable.applyFilters.call(this,a);if(!a&&this.all.length&&this.getAutoFilter()){this.filter()}return b},addFilters:function(a){this.mixins.filterable.addFilters.call(this,a);if(this.items.length&&this.getAutoFilter()){this.runFilters()}return this},removeFilters:function(a){this.mixins.filterable.removeFilters.call(this,a);if(this.filtered&&this.all.length&&this.getAutoFilter()){this.filter()}return this},filter:function(c,b,d,a){if(c){if(Ext.isString(c)){this.addFilters({property:c,value:b,anyMatch:d,caseSensitive:a});return this.items}else{this.addFilters(c);return this.items}}this.items=this.mixins.filterable.filter.call(this,this.all.slice());this.updateAfterFilter();if(this.sorted&&this.getAutoSort()){this.sort()}},runFilters:function(){this.items=this.mixins.filterable.filter.call(this,this.items);this.updateAfterFilter()},updateAfterFilter:function(){var a=this.items,f=this.keys,g=this.indices={},e=a.length,c,d,b;f.length=0;for(c=0;c<e;c++){d=a[c];b=this.getKey(d);g[b]=c;f[c]=b}this.length=a.length;this.dirtyIndices=false},sort:function(e,a){var d=this.items,h=this.keys,g=this.indices,c=d.length,b,j,f;if(e){this.addSorters(e,a);return this.items}for(b=0;b<c;b++){d[b]._current_key=h[b]}this.handleSort(d);for(b=0;b<c;b++){j=d[b];f=j._current_key;h[b]=f;g[f]=b;delete j._current_key}this.dirtyIndices=true},handleSort:function(a){this.mixins.sortable.sort.call(this,a)},add:function(i,k){var g=this,d=this.filtered,e=this.sorted,h=this.all,f=this.items,l=this.keys,j=this.indices,a=this.mixins.filterable,b=f.length,c=b;if(arguments.length==1){k=i;i=g.getKey(k)}if(typeof i!="undefined"&&i!==null){if(typeof g.map[i]!="undefined"){return g.replace(i,k)}g.map[i]=k}h.push(k);if(d&&this.getAutoFilter()&&a.isFiltered.call(g,k)){return null}g.length++;if(e&&this.getAutoSort()){c=this.findInsertionIndex(f,k)}if(c!==b){this.dirtyIndices=true;Ext.Array.splice(l,c,0,i);Ext.Array.splice(f,c,0,k)}else{j[i]=b;l.push(i);f.push(k)}return k},getKey:function(a){return a.id},replace:function(d,m){var i=this,g=i.sorted,f=i.filtered,b=i.mixins.filterable,h=i.items,n=i.keys,k=i.all,c=i.map,l=null,a=h.length,o,e,j;if(arguments.length==1){m=d;d=j=i.getKey(m)}else{j=i.getKey(m)}o=c[d];if(typeof d=="undefined"||d===null||typeof o=="undefined"){return i.add(j,m)}i.map[j]=m;if(j!==d){delete i.map[d]}if(g&&i.getAutoSort()){Ext.Array.remove(h,o);Ext.Array.remove(n,d);Ext.Array.remove(k,o);k.push(m);i.dirtyIndices=true;if(f&&i.getAutoFilter()){if(b.isFiltered.call(i,m)){if(a!==h.length){i.length--}return null}else{if(a===h.length){i.length++;l=m}}}e=this.findInsertionIndex(h,m);Ext.Array.splice(n,e,0,j);Ext.Array.splice(h,e,0,m)}else{if(f){if(i.getAutoFilter()&&b.isFiltered.call(i,m)){if(h.indexOf(o)!==-1){Ext.Array.remove(h,o);Ext.Array.remove(n,d);i.length--;i.dirtyIndices=true}return null}else{if(h.indexOf(o)===-1){h.push(m);n.push(j);i.indices[j]=i.length;i.length++;return m}}}e=i.items.indexOf(o);n[e]=j;h[e]=m;this.dirtyIndices=true}return l},addAll:function(h){var q=this,e=q.filtered,a=q.sorted,b=q.all,k=q.items,j=q.keys,p=q.map,l=q.getAutoFilter(),m=q.getAutoSort(),r=[],f=[],c=q.mixins.filterable,d=[],g,s,n,o;if(Ext.isObject(h)){for(s in h){if(h.hasOwnProperty(s)){f.push(k[s]);r.push(s)}}}else{f=h;g=h.length;for(n=0;n<g;n++){r.push(q.getKey(h[n]))}}for(n=0;n<g;n++){s=r[n];o=f[n];if(typeof s!="undefined"&&s!==null){if(typeof p[s]!="undefined"){q.replace(s,o);continue}p[s]=o}b.push(o);if(e&&l&&c.isFiltered.call(q,o)){continue}q.length++;j.push(s);k.push(o);d.push(o)}if(d.length){q.dirtyIndices=true;if(a&&m){q.sort()}return d}return null},each:function(e,d){var b=this.items.slice(),c=0,a=b.length,f;for(;c<a;c++){f=b[c];if(e.call(d||f,f,c,a)===false){break}}},eachKey:function(d,c){var f=this.keys,a=this.items,e=f.length,b;for(b=0;b<e;b++){d.call(c||window,f[b],a[b],b,e)}},findBy:function(e,d){var f=this.keys,b=this.items,c=0,a=b.length;for(;c<a;c++){if(e.call(d||window,b[c],f[c])){return b[c]}}return null},filterBy:function(e,d){var h=this,c=new this.self(),g=h.keys,a=h.all,f=a.length,b;c.getKey=h.getKey;for(b=0;b<f;b++){if(e.call(d||h,a[b],g[b])){c.add(g[b],a[b])}}return c},insert:function(c,d,f){var e=this,a=this.sorted,b=this.filtered;if(arguments.length==2){f=d;d=e.getKey(f)}if(e.containsKey(d)){e.removeAtKey(d)}if(c>=e.length||(a&&e.getAutoSort())){return e.add(d,f)}this.all.push(f);if(typeof d!="undefined"&&d!==null){e.map[d]=f}if(b&&this.getAutoFilter()&&filterable.isFiltered.call(e,f)){return null}e.length++;Ext.Array.splice(e.items,c,0,f);Ext.Array.splice(e.keys,c,0,d);e.dirtyIndices=true;return f},insertAll:function(g,d){if(g>=this.items.length||(this.sorted&&this.getAutoSort())){return this.addAll(d)}var s=this,h=this.filtered,a=this.sorted,b=this.all,m=this.items,l=this.keys,r=this.map,n=this.getAutoFilter(),o=this.getAutoSort(),t=[],j=[],f=[],c=this.mixins.filterable,e=false,k,u,p,q;if(a&&this.getAutoSort()){}if(Ext.isObject(d)){for(u in d){if(d.hasOwnProperty(u)){j.push(m[u]);t.push(u)}}}else{j=d;k=d.length;for(p=0;p<k;p++){t.push(s.getKey(d[p]))}}for(p=0;p<k;p++){u=t[p];q=j[p];if(typeof u!="undefined"&&u!==null){if(s.containsKey(u)){s.removeAtKey(u)}r[u]=q}b.push(q);if(h&&n&&c.isFiltered.call(s,q)){continue}s.length++;Ext.Array.splice(m,g+p,0,q);Ext.Array.splice(l,g+p,0,u);e=true;f.push(q)}if(e){this.dirtyIndices=true;if(a&&o){this.sort()}return f}return null},remove:function(b){var a=this.items.indexOf(b);if(a===-1){Ext.Array.remove(this.all,b);return b}return this.removeAt(this.items.indexOf(b))},removeAll:function(a){if(a){var c=a.length,b;for(b=0;b<c;b++){this.remove(a[b])}}return this},removeAt:function(b){var g=this,a=g.items,f=g.keys,d=this.all,e,c;if(b<g.length&&b>=0){e=a[b];c=f[b];if(typeof c!="undefined"){delete g.map[c]}Ext.Array.erase(a,b,1);Ext.Array.erase(f,b,1);Ext.Array.remove(d,e);g.length--;this.dirtyIndices=true;return e}return false},removeAtKey:function(a){return this.removeAt(this.indexOfKey(a))},getCount:function(){return this.length},indexOf:function(b){if(this.dirtyIndices){this.updateIndices()}var a=this.indices[this.getKey(b)];return(a===undefined)?-1:a},indexOfKey:function(b){if(this.dirtyIndices){this.updateIndices()}var a=this.indices[b];return(a===undefined)?-1:a},updateIndices:function(){var a=this.items,e=a.length,f=this.indices={},c,d,b;for(c=0;c<e;c++){d=a[c];b=this.getKey(d);f[b]=c}this.dirtyIndices=false},get:function(b){var d=this,a=d.map[b],c;if(a!==undefined){c=a}else{if(typeof b=="number"){c=d.items[b]}}return typeof c!="function"||d.getAllowFunctions()?c:null},getAt:function(a){return this.items[a]},getByKey:function(a){return this.map[a]},contains:function(b){var a=this.getKey(b);if(a){return this.containsKey(a)}else{return Ext.Array.contains(this.items,b)}},containsKey:function(a){return typeof this.map[a]!="undefined"},clear:function(){var a=this;a.length=0;a.items.length=0;a.keys.length=0;a.all.length=0;a.map={}},first:function(){return this.items[0]},last:function(){return this.items[this.length-1]},getRange:function(f,a){var e=this,c=e.items,b=[],d;if(c.length<1){return b}f=f||0;a=Math.min(typeof a=="undefined"?e.length-1:a,e.length-1);if(f<=a){for(d=f;d<=a;d++){b[b.length]=c[d]}}else{for(d=f;d>=a;d--){b[b.length]=c[d]}}return b},findIndexBy:function(d,c,h){var g=this,f=g.keys,a=g.items,b=h||0,e=a.length;for(;b<e;b++){if(d.call(c||g,a[b],f[b])){return b}}return -1},clone:function(){var e=this,f=new this.self(),d=e.keys,a=e.items,b=0,c=a.length;for(;b<c;b++){f.add(d[b],a[b])}f.getKey=e.getKey;return f}});Ext.define("Ext.data.StoreManager",{extend:"Ext.util.Collection",alternateClassName:["Ext.StoreMgr","Ext.data.StoreMgr","Ext.StoreManager"],singleton:true,uses:["Ext.data.ArrayStore"],register:function(){for(var a=0,b;(b=arguments[a]);a++){this.add(b)}},unregister:function(){for(var a=0,b;(b=arguments[a]);a++){this.remove(this.lookup(b))}},lookup:function(c){if(Ext.isArray(c)){var b=["field1"],e=!Ext.isArray(c[0]),f=c,d,a;if(e){f=[];for(d=0,a=c.length;d<a;++d){f.push([c[d]])}}else{for(d=2,a=c[0].length;d<=a;++d){b.push("field"+d)}}return Ext.create("Ext.data.ArrayStore",{data:f,fields:b,autoDestroy:true,autoCreated:true,expanded:e})}if(Ext.isString(c)){return this.get(c)}else{if(c instanceof Ext.data.Store){return c}else{return Ext.factory(c,Ext.data.Store,null,"store")}}},getKey:function(a){return a.getStoreId()}},function(){Ext.regStore=function(c,b){var a;if(Ext.isObject(c)){b=c}else{if(b instanceof Ext.data.Store){b.setStoreId(c)}else{b.storeId=c}}if(b instanceof Ext.data.Store){a=b}else{a=Ext.create("Ext.data.Store",b)}return Ext.data.StoreManager.register(a)};Ext.getStore=function(a){return Ext.data.StoreManager.lookup(a)}});Ext.define("Ext.direct.Manager",{singleton:true,mixins:{observable:"Ext.util.Observable"},requires:["Ext.util.Collection"],alternateClassName:"Ext.Direct",statics:{exceptions:{TRANSPORT:"xhr",PARSE:"parse",LOGIN:"login",SERVER:"exception"}},constructor:function(){var a=this;a.transactions=Ext.create("Ext.util.Collection",this.getKey);a.providers=Ext.create("Ext.util.Collection",this.getKey)},getKey:function(a){return a.getId()},addProvider:function(e){var d=this,a=Ext.toArray(arguments),b=0,c;if(a.length>1){for(c=a.length;b<c;++b){d.addProvider(a[b])}return}if(!e.isProvider){e=Ext.create("direct."+e.type+"provider",e)}d.providers.add(e);e.on("data",d.onProviderData,d);if(!e.isConnected()){e.connect()}return e},getProvider:function(a){return a.isProvider?a:this.providers.get(a)},removeProvider:function(c){var b=this,a=b.providers;c=c.isProvider?c:a.get(c);if(c){c.un("data",b.onProviderData,b);a.remove(c);return c}return null},addTransaction:function(a){this.transactions.add(a);return a},removeTransaction:function(a){a=this.getTransaction(a);this.transactions.remove(a);return a},getTransaction:function(a){return Ext.isObject(a)?a:this.transactions.get(a)},onProviderData:function(f,e){var d=this,b=0,c,a;if(Ext.isArray(e)){for(c=e.length;b<c;++b){d.onProviderData(f,e[b])}return}a=e.getName();if(a&&a!="event"&&a!="exception"){d.fireEvent(a,e)}else{if(e.getStatus()===false){d.fireEvent("exception",e)}}d.fireEvent("event",e,f)},parseMethod:function(b){if(Ext.isString(b)){var e=b.split("."),a=0,c=e.length,d=window;while(d&&a<c){d=d[e[a]];++a}b=Ext.isFunction(d)?d:null}return b||null}});Ext.define("Ext.data.proxy.Direct",{extend:"Ext.data.proxy.Server",alternateClassName:"Ext.data.DirectProxy",alias:"proxy.direct",requires:["Ext.direct.Manager"],config:{paramOrder:undefined,paramsAsHash:true,directFn:undefined,api:null,extraParams:null},paramOrderRe:/[\s,|]/,applyParamOrder:function(a){if(Ext.isString(a)){a=a.split(this.paramOrderRe)}return a},applyDirectFn:function(a){return Ext.direct.Manager.parseMethod(fn)},applyApi:function(b){var a;if(b&&Ext.isObject(b)){for(a in b){if(b.hasOwnProperty(a)){b[a]=Ext.direct.Manager.parseMethod(b[a])}}}return b},doRequest:function(d,j,k){var h=this,b=h.getWriter(),e=h.buildRequest(d,j,k),f=h.getApi(),i=f&&f[e.getAction()]||h.getDirectFn(),c=e.getParams(),g=[],a;e=b.write(e);if(d.getAction()=="read"){a=i.directCfg.method;g=a.getArgs(c,h.getParamOrder(),h.getParamsAsHash())}else{g.push(e.getJsonData())}g.push(h.createRequestCallback(e,d,j,k),h);e.setConfig({args:g,directFn:i});i.apply(window,g)},applyEncoding:function(a){return a},createRequestCallback:function(d,a,e,b){var c=this;return function(g,f){c.processResponse(f.getStatus(),a,d,f,e,b)}},extractResponseData:function(b){var a=b.getResult();return Ext.isDefined(a)?a:b.getData()},setException:function(b,a){b.setException(a.getMessage())},buildUrl:function(){return""}});Ext.define("Ext.direct.Event",{alias:"direct.event",requires:["Ext.direct.Manager"],config:{status:true,data:null,name:"event",xhr:null,code:null,message:"",result:null,transaction:null},constructor:function(a){this.initConfig(a)}});Ext.define("Ext.direct.RemotingEvent",{extend:"Ext.direct.Event",alias:"direct.rpc",config:{name:"remoting",tid:null,transaction:null},getTransaction:function(){return this._transaction||Ext.direct.Manager.getTransaction(this.getTid())}});Ext.define("Ext.direct.ExceptionEvent",{extend:"Ext.direct.RemotingEvent",alias:"direct.exception",config:{status:false,name:"exception",error:null}});Ext.define("Ext.util.Format",{requires:["Ext.DateExtras"],singleton:true,defaultDateFormat:"m/d/Y",escapeRe:/('|\\)/g,trimRe:/^[\x09\x0a\x0b\x0c\x0d\x20\xa0\u1680\u180e\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u2028\u2029\u202f\u205f\u3000]+|[\x09\x0a\x0b\x0c\x0d\x20\xa0\u1680\u180e\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u2028\u2029\u202f\u205f\u3000]+$/g,formatRe:/\{(\d+)\}/g,escapeRegexRe:/([-.*+?^${}()|[\]\/\\])/g,dashesRe:/-/g,iso8601TestRe:/\d\dT\d\d/,iso8601SplitRe:/[- :T\.Z\+]/,ellipsis:function(c,a,d){if(c&&c.length>a){if(d){var e=c.substr(0,a-2),b=Math.max(e.lastIndexOf(" "),e.lastIndexOf("."),e.lastIndexOf("!"),e.lastIndexOf("?"));if(b!=-1&&b>=(a-15)){return e.substr(0,b)+"..."}}return c.substr(0,a-3)+"..."}return c},escapeRegex:function(a){return a.replace(Ext.util.Format.escapeRegexRe,"\\$1")},escape:function(a){return a.replace(Ext.util.Format.escapeRe,"\\$1")},toggle:function(b,c,a){return b==c?a:c},trim:function(a){return a.replace(Ext.util.Format.trimRe,"")},leftPad:function(d,b,c){var a=String(d);c=c||" ";while(a.length<b){a=c+a}return a},format:function(b){var a=Ext.toArray(arguments,1);return b.replace(Ext.util.Format.formatRe,function(c,d){return a[d]})},htmlEncode:function(a){return !a?a:String(a).replace(/&/g,"&amp;").replace(/>/g,"&gt;").replace(/</g,"&lt;").replace(/"/g,"&quot;")},htmlDecode:function(a){return !a?a:String(a).replace(/&gt;/g,">").replace(/&lt;/g,"<").replace(/&quot;/g,'"').replace(/&amp;/g,"&")},date:function(b,c){var a=b;if(!b){return""}if(!Ext.isDate(b)){a=new Date(Date.parse(b));if(isNaN(a)){if(this.iso8601TestRe.test(b)){a=b.split(this.iso8601SplitRe);a=new Date(a[0],a[1]-1,a[2],a[3],a[4],a[5])}if(isNaN(a)){a=new Date(Date.parse(b.replace(this.dashesRe,"/")))}}b=a}return Ext.Date.format(b,c||Ext.util.Format.defaultDateFormat)}});Ext.define("Ext.Template",{requires:["Ext.dom.Helper","Ext.util.Format"],inheritableStatics:{from:function(b,a){b=Ext.getDom(b);return new this(b.value||b.innerHTML,a||"")}},constructor:function(d){var f=this,b=arguments,a=[],c=0,e=b.length,g;f.initialConfig={};if(e>1){for(;c<e;c++){g=b[c];if(typeof g=="object"){Ext.apply(f.initialConfig,g);Ext.apply(f,g)}else{a.push(g)}}d=a.join("")}else{if(Ext.isArray(d)){a.push(d.join(""))}else{a.push(d)}}f.html=a.join("");if(f.compiled){f.compile()}},isTemplate:true,disableFormats:false,re:/\{([\w\-]+)(?:\:([\w\.]*)(?:\((.*?)?\))?)?\}/g,apply:function(a){var g=this,d=g.disableFormats!==true,f=Ext.util.Format,c=g,b;if(g.compiled){return g.compiled(a).join("")}function e(h,j,k,i){if(k&&d){if(i){i=[a[j]].concat(Ext.functionFactory("return ["+i+"];")())}else{i=[a[j]]}if(k.substr(0,5)=="this."){return c[k.substr(5)].apply(c,i)}else{return f[k].apply(f,i)}}else{return a[j]!==undefined?a[j]:""}}b=g.html.replace(g.re,e);return b},applyOut:function(a,b){var c=this;if(c.compiled){b.push.apply(b,c.compiled(a))}else{b.push(c.apply(a))}return b},applyTemplate:function(){return this.apply.apply(this,arguments)},set:function(a,c){var b=this;b.html=a;b.compiled=null;return c?b.compile():b},compileARe:/\\/g,compileBRe:/(\r\n|\n)/g,compileCRe:/'/g,compile:function(){var me=this,fm=Ext.util.Format,useFormat=me.disableFormats!==true,body,bodyReturn;function fn(m,name,format,args){if(format&&useFormat){args=args?","+args:"";if(format.substr(0,5)!="this."){format="fm."+format+"("}else{format="this."+format.substr(5)+"("}}else{args="";format="(values['"+name+"'] == undefined ? '' : "}return"',"+format+"values['"+name+"']"+args+") ,'"}bodyReturn=me.html.replace(me.compileARe,"\\\\").replace(me.compileBRe,"\\n").replace(me.compileCRe,"\\'").replace(me.re,fn);body="this.compiled = function(values){ return ['"+bodyReturn+"'];};";eval(body);return me},insertFirst:function(b,a,c){return this.doInsert("afterBegin",b,a,c)},insertBefore:function(b,a,c){return this.doInsert("beforeBegin",b,a,c)},insertAfter:function(b,a,c){return this.doInsert("afterEnd",b,a,c)},append:function(b,a,c){return this.doInsert("beforeEnd",b,a,c)},doInsert:function(c,e,b,a){e=Ext.getDom(e);var d=Ext.DomHelper.insertHtml(c,e,this.apply(b));return a?Ext.get(d,true):d},overwrite:function(b,a,c){b=Ext.getDom(b);b.innerHTML=this.apply(a);return c?Ext.get(b.firstChild,true):b.firstChild}});Ext.define("Ext.XTemplate",{extend:"Ext.Template",requires:"Ext.XTemplateCompiler",apply:function(a){return this.applyOut(a,[]).join("")},applyOut:function(a,b){var d=this,c;if(!d.fn){c=new Ext.XTemplateCompiler({useFormat:d.disableFormats!==true});d.fn=c.compile(d.html)}try{d.fn.call(d,b,a,{},1,1)}catch(f){}return b},compile:function(){return this},statics:{getTpl:function(a,c){var b=a[c],d;if(b&&!b.isTemplate){b=Ext.ClassManager.dynInstantiate("Ext.XTemplate",b);if(a.hasOwnProperty(c)){a[c]=b}else{for(d=a.self.prototype;d;d=d.superclass){if(d.hasOwnProperty(c)){d[c]=b;break}}}}return b||null}}});Ext.define("Ext.util.GeoLocation",{extend:"Ext.Evented",config:{autoUpdate:true,latitude:null,longitude:null,accuracy:null,altitude:null,altitudeAccuracy:null,heading:null,speed:null,timestamp:null,allowHighAccuracy:false,timeout:Infinity,maximumAge:0,provider:undefined},updateMaximumAge:function(){if(this.watchOperation){this.updateWatchOperation()}},updateTimeout:function(){if(this.watchOperation){this.updateWatchOperation()}},updateAllowHighAccuracy:function(){if(this.watchOperation){this.updateWatchOperation()}},applyProvider:function(a){if(Ext.feature.has.Geolocation){if(!a){if(navigator&&navigator.geolocation){a=navigator.geolocation}else{if(window.google){a=google.gears.factory.create("beta.geolocation")}}}}else{this.fireEvent("locationerror",this,false,false,true,"This device does not support Geolocation.")}return a},updateAutoUpdate:function(a,b){var c=this,f=c.getProvider();if(b&&f){clearInterval(c.watchOperationId);c.watchOperationId=null}if(a){if(!f){c.fireEvent("locationerror",c,false,false,true,null);return}try{c.updateWatchOperation()}catch(d){c.fireEvent("locationerror",c,false,false,true,d.message)}}},updateWatchOperation:function(){var a=this,b=a.getProvider();if(a.watchOperationId){clearInterval(a.watchOperationId)}function c(){b.getCurrentPosition(Ext.bind(a.fireUpdate,a),Ext.bind(a.fireError,a),a.parseOptions())}c();a.watchOperationId=setInterval(c,10000)},updateLocation:function(h,a,c){var b=this,g=b.getProvider();var f=function(i,e){if(e){b.fireError(e)}else{b.fireEvent("locationerror",b,false,false,true,i)}if(h){h.call(a||b,null,b)}};if(!g){f(null);return}try{g.getCurrentPosition(function(e){b.fireUpdate(e);if(h){h.call(a||b,b,b)}},function(e){f(null,e)},c||b.parseOptions())}catch(d){f(d.message)}},fireUpdate:function(a){var b=this,c=a.coords;b.setConfig({timestamp:a.timestamp,latitude:c.latitude,longitude:c.longitude,accuracy:c.accuracy,altitude:c.altitude,altitudeAccuracy:c.altitudeAccuracy,heading:c.heading,speed:c.speed});b.fireEvent("locationupdate",b)},fireError:function(a){var b=a.code;this.fireEvent("locationerror",this,b==a.TIMEOUT,b==a.PERMISSION_DENIED,b==a.POSITION_UNAVAILABLE,a.message==undefined?null:a.message)},parseOptions:function(){var b=this.getTimeout(),a={maximumAge:this.getMaximumAge(),allowHighAccuracy:this.getAllowHighAccuracy()};if(b!==Infinity){a.timeout=b}return a},destroy:function(){this.updateAutoUpdate(null)}});Ext.define("Ext.util.Grouper",{extend:"Ext.util.Sorter",isGrouper:true,config:{groupFn:null,sortProperty:null,sorterFn:function(d,c){var e=this.getSortProperty(),g,b,f,a;g=this.getGroupFn();b=g.call(this,d);f=g.call(this,c);if(e){if(b!==f){return this.defaultSortFn.call(this,d,c)}else{return 0}}return(b>f)?1:((b<f)?-1:0)}},defaultSortFn:function(e,c){var g=this,f=g._transform,b=g._root,d,a,h=g._sortProperty;if(b!==null){e=e[b];c=c[b]}d=e[h];a=c[h];if(f){d=f(d);a=f(a)}return d>a?1:(d<a?-1:0)},updateProperty:function(a){this.setGroupFn(this.standardGroupFn)},standardGroupFn:function(b){var a=this.getRoot(),d=this.getProperty(),c=b;if(a){c=b[a]}return c[d]},getGroupString:function(a){var b=this.getGroupFn().call(this,a);return typeof b!="undefined"?b.toString():""}});Ext.define("Ext.util.HashMap",{mixins:{observable:"Ext.util.Observable"},constructor:function(a){this.callParent();this.mixins.observable.constructor.call(this);this.clear(true)},getCount:function(){return this.length},getData:function(a,b){if(b===undefined){b=a;a=this.getKey(b)}return[a,b]},getKey:function(a){return a.id},add:function(a,d){var b=this,c;if(b.containsKey(a)){throw new Error("This key already exists in the HashMap")}c=this.getData(a,d);a=c[0];d=c[1];b.map[a]=d;++b.length;b.fireEvent("add",b,a,d);return d},replace:function(b,d){var c=this,e=c.map,a;if(!c.containsKey(b)){c.add(b,d)}a=e[b];e[b]=d;c.fireEvent("replace",c,b,d,a);return d},remove:function(b){var a=this.findKey(b);if(a!==undefined){return this.removeByKey(a)}return false},removeByKey:function(a){var b=this,c;if(b.containsKey(a)){c=b.map[a];delete b.map[a];--b.length;b.fireEvent("remove",b,a,c);return true}return false},get:function(a){return this.map[a]},clear:function(a){var b=this;b.map={};b.length=0;if(a!==true){b.fireEvent("clear",b)}return b},containsKey:function(a){return this.map[a]!==undefined},contains:function(a){return this.containsKey(this.findKey(a))},getKeys:function(){return this.getArray(true)},getValues:function(){return this.getArray(false)},getArray:function(d){var a=[],b,c=this.map;for(b in c){if(c.hasOwnProperty(b)){a.push(d?b:c[b])}}return a},each:function(d,c){var a=Ext.apply({},this.map),b,e=this.length;c=c||this;for(b in a){if(a.hasOwnProperty(b)){if(d.call(c,b,a[b],e)===false){break}}}return this},clone:function(){var c=new Ext.util.HashMap(),b=this.map,a;c.suspendEvents();for(a in b){if(b.hasOwnProperty(a)){c.add(a,b[a])}}c.resumeEvents();return c},findKey:function(b){var a,c=this.map;for(a in c){if(c.hasOwnProperty(a)&&c[a]===b){return a}}return undefined}});Ext.define("Ext.AbstractManager",{requires:["Ext.util.HashMap"],typeName:"type",constructor:function(a){Ext.apply(this,a||{});this.all=Ext.create("Ext.util.HashMap");this.types={}},get:function(a){return this.all.get(a)},register:function(a){this.all.add(a)},unregister:function(a){this.all.remove(a)},registerType:function(b,a){this.types[b]=a;a[this.typeName]=b},isRegistered:function(a){return this.types[a]!==undefined},create:function(a,d){var b=a[this.typeName]||a.type||d,c=this.types[b];return new c(a)},onAvailable:function(e,c,b){var a=this.all,d;if(a.containsKey(e)){d=a.get(e);c.call(b||d,d)}else{a.on("add",function(h,f,g){if(f==e){c.call(b||g,g);a.un("add",c,b)}})}},each:function(b,a){this.all.each(b,a||this)},getCount:function(){return this.all.getCount()}});Ext.define("Ext.data.ModelManager",{extend:"Ext.AbstractManager",alternateClassName:["Ext.ModelMgr","Ext.ModelManager"],singleton:true,modelNamespace:null,registerType:function(c,b){var d=b.prototype,a;if(d&&d.isModel){a=b}else{b={extend:b.extend||"Ext.data.Model",config:b};a=Ext.define(c,b)}this.types[c]=a;return a},onModelDefined:Ext.emptyFn,getModel:function(b){var a=b;if(typeof a=="string"){a=this.types[a];if(!a&&this.modelNamespace){a=this.types[this.modelNamespace+"."+a]}}return a},create:function(c,b,d){var a=typeof b=="function"?b:this.types[b||c.name];return new a(c,d)}},function(){Ext.regModel=function(){return this.ModelManager.registerType.apply(this.ModelManager,arguments)}});Ext.define("Ext.data.NodeInterface",{requires:["Ext.data.Field","Ext.data.ModelManager"],alternateClassName:"Ext.data.Node",statics:{decorate:function(d){if(!d.isNode){var g=Ext.data.ModelManager,c=d.modelName,e=g.getModel(c),b=[],f,h,a;e.override(this.getPrototypeBody());b=this.applyFields(e,[{name:"parentId",type:"string",defaultValue:null},{name:"index",type:"int",defaultValue:0},{name:"depth",type:"int",defaultValue:0},{name:"expanded",type:"bool",defaultValue:false,persist:false},{name:"expandable",type:"bool",defaultValue:true,persist:false},{name:"checked",type:"auto",defaultValue:null},{name:"leaf",type:"bool",defaultValue:false,persist:false},{name:"cls",type:"string",defaultValue:null,persist:false},{name:"iconCls",type:"string",defaultValue:null,persist:false},{name:"root",type:"boolean",defaultValue:false,persist:false},{name:"isLast",type:"boolean",defaultValue:false,persist:false},{name:"isFirst",type:"boolean",defaultValue:false,persist:false},{name:"allowDrop",type:"boolean",defaultValue:true,persist:false},{name:"allowDrag",type:"boolean",defaultValue:true,persist:false},{name:"loaded",type:"boolean",defaultValue:false,persist:false},{name:"loading",type:"boolean",defaultValue:false,persist:false},{name:"href",type:"string",defaultValue:null,persist:false},{name:"hrefTarget",type:"string",defaultValue:null,persist:false},{name:"qtip",type:"string",defaultValue:null,persist:false},{name:"qtitle",type:"string",defaultValue:null,persist:false}]);a=b.length;e.getFields().isDirty=true;for(f=0;f<a;++f){h=b[f];if(d.get(h.getName())===undefined){d.data[h.getName()]=h.getDefaultValue()}}}if(!d.isDecorated){d.isDecorated=true;Ext.applyIf(d,{firstChild:null,lastChild:null,parentNode:null,previousSibling:null,nextSibling:null,childNodes:[]});d.enableBubble(["append","remove","move","insert","beforeappend","beforeremove","beforemove","beforeinsert","expand","collapse","beforeexpand","beforecollapse","sort","load"])}return d},applyFields:function(g,h){var b=g.prototype,d=b.fields,j=d.keys,f=h.length,a,c,e=[];for(c=0;c<f;c++){a=h[c];if(!Ext.Array.contains(j,a.name)){a=Ext.create("Ext.data.Field",a);e.push(a);d.add(a)}}return e},getPrototypeBody:function(){return{isNode:true,createNode:function(a){if(Ext.isObject(a)&&!a.isModel){a=Ext.data.ModelManager.create(a,this.modelName)}return Ext.data.NodeInterface.decorate(a)},isLeaf:function(){return this.get("leaf")===true},setFirstChild:function(a){this.firstChild=a},setLastChild:function(a){this.lastChild=a},updateInfo:function(g){var j=this,f=j.parentNode,b=(!f?true:f.firstChild==j),e=(!f?true:f.lastChild==j),d=0,k=j,a=j.childNodes,h=a.length,c;while(k.parentNode){++d;k=k.parentNode}j.beginEdit();j.set({isFirst:b,isLast:e,depth:d,index:f?f.indexOf(j):0,parentId:f?f.getId():null});j.endEdit(g);if(g){j.commit(g)}for(c=0;c<h;c++){a[c].updateInfo(g)}},isLast:function(){return this.get("isLast")},isFirst:function(){return this.get("isFirst")},hasChildNodes:function(){return !this.isLeaf()&&this.childNodes.length>0},isExpandable:function(){var a=this;if(a.get("expandable")){return !(a.isLeaf()||(a.isLoaded()&&!a.hasChildNodes()))}return false},appendChild:function(b,j,h){var f=this,c,e,d,g,a;if(Ext.isArray(b)){for(c=0,e=b.length;c<e;c++){f.appendChild(b[c])}}else{b=f.createNode(b);if(j!==true&&f.fireEvent("beforeappend",f,b)===false){return false}d=f.childNodes.length;g=b.parentNode;if(g){if(j!==true&&b.fireEvent("beforemove",b,g,f,d)===false){return false}g.removeChild(b,null,false,true)}d=f.childNodes.length;if(d===0){f.setFirstChild(b)}f.childNodes.push(b);b.parentNode=f;b.nextSibling=null;f.setLastChild(b);a=f.childNodes[d-1];if(a){b.previousSibling=a;a.nextSibling=b;a.updateInfo(h)}else{b.previousSibling=null}b.updateInfo(h);if(!f.isLoaded()){f.set("loaded",true)}else{if(f.childNodes.length===1){f.set("loaded",f.isLoaded())}}if(j!==true){f.fireEvent("append",f,b,d);if(g){b.fireEvent("move",b,g,f,d)}}return b}},getBubbleTarget:function(){return this.parentNode},removeChild:function(e,b,c,f){var d=this,a=d.indexOf(e);if(a==-1||(c!==true&&d.fireEvent("beforeremove",d,e)===false)){return false}Ext.Array.erase(d.childNodes,a,1);if(d.firstChild==e){d.setFirstChild(e.nextSibling)}if(d.lastChild==e){d.setLastChild(e.previousSibling)}if(c!==true){d.fireEvent("remove",d,e)}if(e.previousSibling){e.previousSibling.nextSibling=e.nextSibling;e.previousSibling.updateInfo(f)}if(e.nextSibling){e.nextSibling.previousSibling=e.previousSibling;e.nextSibling.updateInfo(f)}if(!d.childNodes.length){d.set("loaded",d.isLoaded())}if(b){e.destroy(true)}else{e.clear()}return e},copy:function(d,c){var f=this,b=f.callOverridden(arguments),a=f.childNodes?f.childNodes.length:0,e;if(c){for(e=0;e<a;e++){b.appendChild(f.childNodes[e].copy(true))}}return b},clear:function(a){var b=this;b.parentNode=b.previousSibling=b.nextSibling=null;if(a){b.firstChild=b.lastChild=null}},destroy:function(a){var c=this,b=c.destroyOptions;if(a===true){c.clear(true);Ext.each(c.childNodes,function(d){d.destroy(true)});c.childNodes=null;delete c.destroyOptions;c.callOverridden([b])}else{c.destroyOptions=a;c.remove(true)}},insertBefore:function(f,a,d){var e=this,b=e.indexOf(a),c=f.parentNode,g=b,h;if(!a){return e.appendChild(f)}if(f==a){return false}f=e.createNode(f);if(d!==true&&e.fireEvent("beforeinsert",e,f,a)===false){return false}if(c==e&&e.indexOf(f)<b){g--}if(c){if(d!==true&&f.fireEvent("beforemove",f,c,e,b,a)===false){return false}c.removeChild(f)}if(g===0){e.setFirstChild(f)}Ext.Array.splice(e.childNodes,g,0,f);f.parentNode=e;f.nextSibling=a;a.previousSibling=f;h=e.childNodes[g-1];if(h){f.previousSibling=h;h.nextSibling=f;h.updateInfo()}else{f.previousSibling=null}f.updateInfo();if(!e.isLoaded()){e.set("loaded",true)}else{if(e.childNodes.length===1){e.set("loaded",e.isLoaded())}}if(d!==true){e.fireEvent("insert",e,f,a);if(c){f.fireEvent("move",f,c,e,g,a)}}return f},insertChild:function(a,c){var b=this.childNodes[a];if(b){return this.insertBefore(c,b)}else{return this.appendChild(c)}},remove:function(b,c){var a=this.parentNode;if(a){a.removeChild(this,b,c,true)}return this},removeAll:function(a,b){var d=this.childNodes,c;while((c=d[0])){this.removeChild(c,a,b)}return this},getChildAt:function(a){return this.childNodes[a]},replaceChild:function(a,d,c){var b=d?d.nextSibling:null;this.removeChild(d,c);this.insertBefore(a,b,c);return d},indexOf:function(a){return Ext.Array.indexOf(this.childNodes,a)},getPath:function(d,c){d=d||this.idProperty;c=c||"/";var b=[this.get(d)],a=this.parentNode;while(a){b.unshift(a.get(d));a=a.parentNode}return c+b.join(c)},getDepth:function(){return this.get("depth")},bubble:function(c,b,a){var d=this;while(d){if(c.apply(b||d,a||[d])===false){break}d=d.parentNode}},cascadeBy:function(d,c,a){if(d.apply(c||this,a||[this])!==false){var f=this.childNodes,e=f.length,b;for(b=0;b<e;b++){f[b].cascadeBy(d,c,a)}}},eachChild:function(d,c,a){var f=this.childNodes,e=f.length,b;for(b=0;b<e;b++){if(d.apply(c||this,a||[f[b]])===false){break}}},findChild:function(b,c,a){return this.findChildBy(function(){return this.get(b)==c},null,a)},findChildBy:function(g,f,b){var e=this.childNodes,a=e.length,d=0,h,c;for(;d<a;d++){h=e[d];if(g.call(f||h,h)===true){return h}else{if(b){c=h.findChildBy(g,f,b);if(c!==null){return c}}}}return null},contains:function(a){return a.isAncestor(this)},isAncestor:function(a){var b=this.parentNode;while(b){if(b==a){return true}b=b.parentNode}return false},sort:function(f,b,a){var d=this.childNodes,e=d.length,c,g;if(e>0){Ext.Array.sort(d,f);for(c=0;c<e;c++){g=d[c];g.previousSibling=d[c-1];g.nextSibling=d[c+1];if(c===0){this.setFirstChild(g)}if(c==e-1){this.setLastChild(g)}g.updateInfo(a);if(b&&!g.isLeaf()){g.sort(f,true,true)}}this.notifyStores("afterEdit",["sorted"],{sorted:"sorted"});if(a!==true){this.fireEvent("sort",this,d)}}},isExpanded:function(){return this.get("expanded")},isLoaded:function(){return this.get("loaded")},isLoading:function(){return this.get("loading")},isRoot:function(){return !this.parentNode},isVisible:function(){var a=this.parentNode;while(a){if(!a.isExpanded()){return false}a=a.parentNode}return true},expand:function(a,d,b){var c=this;if(!c.isLeaf()){if(c.isLoading()){c.on("expand",function(){c.expand(a,d,b)},c,{single:true})}else{if(!c.isExpanded()){c.fireAction("expand",[this],function(){c.set("expanded",true);Ext.callback(d,b||c,[c.childNodes])})}else{Ext.callback(d,b||c,[c.childNodes])}}}else{Ext.callback(d,b||c)}},collapse:function(a,d,b){var c=this;if(!c.isLeaf()&&c.isExpanded()){this.fireAction("collapse",[c],function(){c.set("expanded",false);Ext.callback(d,b||c,[c.childNodes])})}else{Ext.callback(d,b||c,[c.childNodes])}}}}}});Ext.define("Ext.data.association.Association",{alternateClassName:"Ext.data.Association",requires:["Ext.data.ModelManager"],config:{ownerModel:null,ownerName:undefined,associatedModel:null,associatedName:undefined,associationKey:undefined,primaryKey:"id",reader:null,type:null,name:undefined},statics:{create:function(a){if(!a.isAssociation){if(Ext.isString(a)){a={type:a}}a.type=a.type.toLowerCase();return Ext.factory(a,Ext.data.association.Association,null,"association")}return a}},constructor:function(a){this.initConfig(a)},applyName:function(a){if(!a){a=this.getAssociatedName()}return a},applyOwnerModel:function(a){var b=Ext.data.ModelManager.getModel(a);if(b===undefined){Ext.Logger.error("The configured ownerModel was not valid (you tried "+a+")")}return b},applyOwnerName:function(a){if(!a){a=this.getOwnerModel().modelName}a=a.slice(a.lastIndexOf(".")+1);return a},updateOwnerModel:function(a){this.setOwnerName(a.modelName)},applyAssociatedModel:function(a){var b=Ext.data.ModelManager.types[a];if(b===undefined){Ext.Logger.error("The configured associatedModel was not valid (you tried "+a+")")}return b},applyAssociatedName:function(a){if(!a){a=this.getAssociatedModel().modelName}a=a.slice(a.lastIndexOf(".")+1);return a},updateAssociatedModel:function(a){this.setAssociatedName(a.modelName)},applyReader:function(a){if(a){if(Ext.isString(a)){a={type:a}}if(!a.isReader){Ext.applyIf(a,{type:"json"})}}return Ext.factory(a,Ext.data.Reader,this.getReader(),"reader")},updateReader:function(a){a.setModel(this.getAssociatedModel())}});Ext.define("Ext.data.association.BelongsTo",{extend:"Ext.data.association.Association",alternateClassName:"Ext.data.BelongsToAssociation",alias:"association.belongsto",config:{foreignKey:undefined,getterName:undefined,setterName:undefined,instanceName:undefined},applyForeignKey:function(a){if(!a){a=this.getAssociatedName().toLowerCase()+"_id"}return a},updateForeignKey:function(b,d){var a=this.getOwnerModel().getFields(),c=a.get(b);if(!c){c=new Ext.data.Field({name:b});a.add(c);a.isDirty=true}if(d){c=a.get(d);if(c){a.isDirty=true;a.remove(c)}}},applyInstanceName:function(a){if(!a){a=this.getAssociatedName()+"BelongsToInstance"}return a},applyAssociationKey:function(a){if(!a){var b=this.getAssociatedName();a=b[0].toLowerCase()+b.slice(1)}return a},applyGetterName:function(a){if(!a){a="get"+this.getAssociatedName()}return a},applySetterName:function(a){if(!a){a="set"+this.getAssociatedName()}return a},updateGetterName:function(b,c){var a=this.getOwnerModel().prototype;if(c){delete a[c]}if(b){a[b]=this.createGetter()}},updateSetterName:function(b,c){var a=this.getOwnerModel().prototype;if(c){delete a[c]}if(b){a[b]=this.createSetter()}},createSetter:function(){var b=this,a=b.getForeignKey();return function(e,c,d){if(e&&e.isModel){e=e.getId()}this.set(a,e);if(Ext.isFunction(c)){c={callback:c,scope:d||this}}if(Ext.isObject(c)){return this.save(c)}}},createGetter:function(){var c=this,d=c.getAssociatedModel(),b=c.getForeignKey(),a=c.getInstanceName();return function(h,i){h=h||{};var g=this,j=g.get(b),k,e,f;if(h.reload===true||g[a]===undefined){if(typeof h=="function"){h={callback:h,scope:i||g}}k=h.success;h.success=function(l){g[a]=l;if(k){k.call(this,arguments)}};d.load(j,h)}else{e=g[a];f=[e];i=i||g;Ext.callback(h,i,f);Ext.callback(h.success,i,f);Ext.callback(h.failure,i,f);Ext.callback(h.callback,i,f);return e}}},read:function(b,a,c){b[this.getInstanceName()]=a.read([c]).getRecords()[0]}});Ext.define("Ext.data.association.HasMany",{extend:"Ext.data.association.Association",alternateClassName:"Ext.data.HasManyAssociation",requires:["Ext.util.Inflector"],alias:"association.hasmany",config:{foreignKey:undefined,store:undefined,storeName:undefined,filterProperty:null,autoLoad:false},constructor:function(a){a=a||{};if(a.storeConfig){a.store=a.storeConfig;delete a.storeConfig}this.callParent([a])},applyName:function(a){if(!a){a=Ext.util.Inflector.pluralize(this.getAssociatedName().toLowerCase())}return a},applyStoreName:function(a){if(!a){a=this.getName()+"Store"}return a},applyForeignKey:function(a){if(!a){a=this.getOwnerName().toLowerCase()+"_id"}return a},applyAssociationKey:function(a){if(!a){var b=this.getAssociatedName();a=Ext.util.Inflector.pluralize(b[0].toLowerCase()+b.slice(1))}return a},updateForeignKey:function(b,d){var a=this.getAssociatedModel().getFields(),c=a.get(b);if(!c){c=new Ext.data.Field({name:b});a.add(c);a.isDirty=true}if(d){c=a.get(d);if(c){a.remove(c);a.isDirty=true}}},applyStore:function(a){var e=this,c=e,i=e.getAssociatedModel(),f=e.getStoreName(),d=e.getForeignKey(),h=e.getPrimaryKey(),g=e.getFilterProperty(),b=e.getAutoLoad();return function(){var m=this,k,l,j={};if(m[f]===undefined){if(g){l={property:g,value:m.get(g),exactMatch:true}}else{l={property:d,value:m.get(h),exactMatch:true}}j[d]=m.get(h);k=Ext.apply({},a,{model:i,filters:[l],remoteFilter:true,modelDefaults:j});m[f]=Ext.create("Ext.data.Store",k);if(b){m[f].load(function(o,n){c.updateInverseInstances(m)})}}return m[f]}},updateStore:function(a){this.getOwnerModel().prototype[this.getName()]=a},read:function(c,a,f){var e=c[this.getName()](),d=a.read(f).getRecords(),b;e.add(d);this.updateInverseInstances(c)},updateInverseInstances:function(a){var b=a[this.getName()]();inverse=this.getAssociatedModel().associations.findBy(function(c){return c.getType()==="belongsTo"&&c.getAssociatedModel().$className===a.$className});if(inverse){b.each(function(c){c[inverse.getInstanceName()]=a})}}});Ext.define("Ext.data.association.HasOne",{extend:"Ext.data.association.Association",alternateClassName:"Ext.data.HasOneAssociation",alias:"association.hasone",config:{foreignKey:undefined,getterName:undefined,setterName:undefined,instanceName:undefined},applyForeignKey:function(a){if(!a){a=this.getAssociatedName().toLowerCase()+"_id"}return a},updateForeignKey:function(b,d){var a=this.getAssociatedModel().getFields(),c=a.get(b);if(!c){c=new Ext.data.Field({name:b});a.add(c);a.isDirty=true}if(d){c=a.get(d);if(c){a.remove(c);a.isDirty=true}}},applyInstanceName:function(a){if(!a){a=this.getAssociatedName()+"BelongsToInstance"}return a},applyAssociationKey:function(a){if(!a){var b=this.getAssociatedName();a=b[0].toLowerCase()+b.slice(1)}return a},applyGetterName:function(a){if(!a){a="get"+this.getAssociatedName()}return a},applySetterName:function(a){if(!a){a="set"+this.getAssociatedName()}return a},updateGetterName:function(b,c){var a=this.getOwnerModel().prototype;if(c){delete a[c]}if(b){a[b]=this.createGetter()}},updateSetterName:function(b,c){var a=this.getOwnerModel().prototype;if(c){delete a[c]}if(b){a[b]=this.createSetter()}},createSetter:function(){var c=this,b=c.getForeignKey(),a=c.getInstanceName(),d=c.getAssociatedModel();return function(h,f,g){var i=Ext.data.Model,e;if(h&&h.isModel){h=h.getId()}this.set(b,h);e=i.cache.get(i.generateCacheId(d.modelName,h));if(e){this[a]=e}if(Ext.isFunction(f)){f={callback:f,scope:g||this}}if(Ext.isObject(f)){return this.save(f)}}},createGetter:function(){var c=this,d=c.getAssociatedModel(),b=c.getForeignKey(),a=c.getInstanceName();return function(h,i){h=h||{};var g=this,j=g.get(b),k,e,f;if(h.reload===true||g[a]===undefined){if(typeof h=="function"){h={callback:h,scope:i||g}}k=h.success;h.success=function(l){g[a]=l;if(k){k.call(this,arguments)}};d.load(j,h)}else{e=g[a];f=[e];i=i||g;Ext.callback(h,i,f);Ext.callback(h.success,i,f);Ext.callback(h.failure,i,f);Ext.callback(h.callback,i,f);return e}}},read:function(c,a,e){var b=this.getAssociatedModel().associations.findBy(function(f){return f.getType()==="belongsTo"&&f.getAssociatedName()===c.$className}),d=a.read([e]).getRecords()[0];c[this.getInstanceName()]=d;if(b){d[b.getInstanceName()]=c}}});Ext.define("Ext.util.LineSegment",{requires:["Ext.util.Point"],constructor:function(b,a){var c=Ext.util.Point;this.point1=c.from(b);this.point2=c.from(a)},intersects:function(l){var o=this.point1,m=this.point2,i=l.point1,f=l.point2,c=o.x,b=m.x,a=i.x,q=f.x,p=o.y,n=m.y,k=i.y,h=f.y,g=(c-b)*(k-h)-(p-n)*(a-q),j,e;if(g==0){return null}j=((a-q)*(c*n-p*b)-(c-b)*(a*h-k*q))/g;e=((k-h)*(c*n-p*b)-(p-n)*(a*h-k*q))/g;if(j<Math.min(c,b)||j>Math.max(c,b)||j<Math.min(a,q)||j>Math.max(a,q)||e<Math.min(p,n)||e>Math.max(p,n)||e<Math.min(k,h)||e>Math.max(k,h)){return null}return new Ext.util.Point(j,e)},toString:function(){return this.point1.toString()+" "+this.point2.toString()}});Ext.define("Ext.util.SizeMonitor",{extend:"Ext.Evented",config:{element:null,detectorCls:Ext.baseCSSPrefix+"size-change-detector",callback:Ext.emptyFn,scope:null,args:[]},constructor:function(d){this.initConfig(d);this.doFireSizeChangeEvent=Ext.Function.bind(this.doFireSizeChangeEvent,this);var g=this,e=this.getElement().dom,b=this.getDetectorCls(),c=Ext.Element.create({classList:[b,b+"-expand"],children:[{}]},true),h=Ext.Element.create({classList:[b,b+"-shrink"],children:[{}]},true),a=function(i){g.onDetectorScroll("expand",i)},f=function(i){g.onDetectorScroll("shrink",i)};e.appendChild(c);e.appendChild(h);c.addEventListener("scroll",a,true);h.addEventListener("scroll",f,true);this.detectors={expand:c,shrink:h};this.position={expand:{left:0,top:0},shrink:{left:0,top:0}};this.listeners={expand:a,shrink:f};this.refresh()},applyElement:function(a){if(a){return Ext.get(a)}},refreshPosition:function(b){var e=this.detectors[b],a=this.position[b],d,c;a.left=d=e.scrollWidth-e.offsetWidth;a.top=c=e.scrollHeight-e.offsetHeight;e.scrollLeft=d;e.scrollTop=c},refresh:function(){this.refreshPosition("expand");this.refreshPosition("shrink")},onDetectorScroll:function(b){var c=this.detectors[b],a=this.position[b];if(c.scrollLeft!==a.left||c.scrollTop!==a.top){this.refresh();this.fireSizeChangeEvent()}},fireSizeChangeEvent:function(){clearTimeout(this.sizeChangeThrottleTimer);this.sizeChangeThrottleTimer=setTimeout(this.doFireSizeChangeEvent,1)},doFireSizeChangeEvent:function(){this.getCallback().apply(this.getScope(),this.getArgs())},destroyDetector:function(a){var c=this.detectors[a],b=this.listeners[a];c.removeEventListener("scroll",b,true);Ext.removeNode(c)},destroy:function(){this.callParent(arguments);this.destroyDetector("expand");this.destroyDetector("shrink");delete this.listeners;delete this.detectors}});Ext.define("Ext.event.publisher.ComponentSize",{extend:"Ext.event.publisher.Publisher",requires:["Ext.ComponentManager","Ext.util.SizeMonitor"],targetType:"component",handledEvents:["resize"],constructor:function(){this.callParent(arguments);this.sizeMonitors={}},subscribe:function(g){var c=g.match(this.idSelectorRegex),f=this.subscribers,a=this.sizeMonitors,d=this.dispatcher,e=this.targetType,b;if(!c){return false}if(!f.hasOwnProperty(g)){f[g]=0;d.addListener(e,g,"painted","onComponentPainted",this,null,"before");b=Ext.ComponentManager.get(c[1]);a[g]=new Ext.util.SizeMonitor({element:b.element,callback:this.onComponentSizeChange,scope:this,args:[this,g]})}f[g]++;return true},unsubscribe:function(h,b,e){var c=h.match(this.idSelectorRegex),g=this.subscribers,d=this.dispatcher,f=this.targetType,a=this.sizeMonitors;if(!c){return false}if(!g.hasOwnProperty(h)||(!e&&--g[h]>0)){return true}a[h].destroy();delete a[h];d.removeListener(f,h,"painted","onComponentPainted",this,"before");delete g[h];return true},onComponentPainted:function(b){var c=b.getObservableId(),a=this.sizeMonitors[c];a.refresh()},onComponentSizeChange:function(a,b){this.dispatcher.doDispatchEvent(this.targetType,b,"resize",[a])}});Ext.define("Ext.util.Sortable",{isSortable:true,defaultSortDirection:"ASC",requires:["Ext.util.Sorter"],initSortable:function(){var a=this,b=a.sorters;a.sorters=Ext.create("Ext.util.AbstractMixedCollection",false,function(c){return c.id||c.property});if(b){a.sorters.addAll(a.decodeSorters(b))}},sort:function(g,f,c,e){var d=this,h,b,a;if(Ext.isArray(g)){e=c;c=f;a=g}else{if(Ext.isObject(g)){e=c;c=f;a=[g]}else{if(Ext.isString(g)){h=d.sorters.get(g);if(!h){h={property:g,direction:f};a=[h]}else{if(f===undefined){h.toggle()}else{h.setDirection(f)}}}}}if(a&&a.length){a=d.decodeSorters(a);if(Ext.isString(c)){if(c==="prepend"){g=d.sorters.clone().items;d.sorters.clear();d.sorters.addAll(a);d.sorters.addAll(g)}else{d.sorters.addAll(a)}}else{d.sorters.clear();d.sorters.addAll(a)}if(e!==false){d.onBeforeSort(a)}}if(e!==false){g=d.sorters.items;if(g.length){b=function(l,k){var j=g[0].sort(l,k),n=g.length,m;for(m=1;m<n;m++){j=j||g[m].sort.call(this,l,k)}return j};d.doSort(b)}}return g},onBeforeSort:Ext.emptyFn,decodeSorters:function(f){if(!Ext.isArray(f)){if(f===undefined){f=[]}else{f=[f]}}var d=f.length,g=Ext.util.Sorter,a=this.model?this.model.prototype.fields:null,e,b,c;for(c=0;c<d;c++){b=f[c];if(!(b instanceof g)){if(Ext.isString(b)){b={property:b}}Ext.applyIf(b,{root:this.sortRoot,direction:"ASC"});if(b.fn){b.sorterFn=b.fn}if(typeof b=="function"){b={sorterFn:b}}if(a&&!b.transform){e=a.get(b.property);b.transform=e?e.sortType:undefined}f[c]=Ext.create("Ext.util.Sorter",b)}}return f},getSorters:function(){return this.sorters.items}});Ext.define("Ext.util.MixedCollection",{extend:"Ext.util.AbstractMixedCollection",mixins:{sortable:"Ext.util.Sortable"},constructor:function(){var a=this;a.callParent(arguments);a.mixins.sortable.initSortable.call(a)},doSort:function(a){this.sortBy(a)},_sort:function(k,a,j){var h=this,d,e,b=String(a).toUpperCase()=="DESC"?-1:1,g=[],l=h.keys,f=h.items;j=j||function(i,c){return i-c};for(d=0,e=f.length;d<e;d++){g[g.length]={key:l[d],value:f[d],index:d}}Ext.Array.sort(g,function(i,c){var m=j(i[k],c[k])*b;if(m===0){m=(i.index<c.index?-1:1)}return m});for(d=0,e=g.length;d<e;d++){f[d]=g[d].value;l[d]=g[d].key}h.fireEvent("sort",h)},sortBy:function(c){var g=this,b=g.items,f=g.keys,e=b.length,a=[],d;for(d=0;d<e;d++){a[d]={key:f[d],value:b[d],index:d}}Ext.Array.sort(a,function(i,h){var j=c(i.value,h.value);if(j===0){j=(i.index<h.index?-1:1)}return j});for(d=0;d<e;d++){b[d]=a[d].value;f[d]=a[d].key}g.fireEvent("sort",g,b,f)},reorder:function(d){var g=this,b=g.items,c=0,f=b.length,a=[],e=[],h;g.suspendEvents();for(h in d){a[d[h]]=b[h]}for(c=0;c<f;c++){if(d[c]==undefined){e.push(b[c])}}for(c=0;c<f;c++){if(a[c]==undefined){a[c]=e.shift()}}g.clear();g.addAll(a);g.resumeEvents();g.fireEvent("sort",g)},sortByKey:function(a,b){this._sort("key",a,b||function(d,c){var f=String(d).toUpperCase(),e=String(c).toUpperCase();return f>e?1:(f<e?-1:0)})}});Ext.define("Ext.ItemCollection",{extend:"Ext.util.MixedCollection",getKey:function(a){return a.getItemId()},has:function(a){return this.map.hasOwnProperty(a.getId())}});Ext.define("Ext.data.Error",{extend:"Ext.util.MixedCollection",config:{field:null,message:""},constructor:function(a){this.initConfig(a)}});Ext.define("Ext.data.Errors",{extend:"Ext.util.Collection",requires:"Ext.data.Error",isValid:function(){return this.length===0},getByField:function(d){var c=[],a,b;for(b=0;b<this.length;b++){a=this.items[b];if(a.getField()==d){c.push(a)}}return c},add:function(){var a=arguments.length==1?arguments[0]:arguments[1];if(!(a instanceof Ext.data.Error)){a=Ext.create("Ext.data.Error",{field:a.field||a.name,message:a.error||a.message})}return this.callParent([a])}});Ext.define("Ext.data.proxy.Ajax",{extend:"Ext.data.proxy.Server",requires:["Ext.util.MixedCollection","Ext.Ajax"],alias:"proxy.ajax",alternateClassName:["Ext.data.HttpProxy","Ext.data.AjaxProxy"],config:{actionMethods:{create:"POST",read:"GET",update:"POST",destroy:"POST"},headers:{},withCredentials:false},doRequest:function(a,e,b){var d=this.getWriter(),c=this.buildRequest(a);c.setConfig({headers:this.getHeaders(),timeout:this.getTimeout(),method:this.getMethod(c),callback:this.createRequestCallback(c,a,e,b),scope:this});if(a.getWithCredentials()||this.getWithCredentials()){c.setWithCredentials(true)}c=d.write(c);Ext.Ajax.request(c.getCurrentConfig());return c},getMethod:function(a){return this.getActionMethods()[a.getAction()]},createRequestCallback:function(d,a,e,b){var c=this;return function(g,h,f){c.processResponse(h,a,d,f,e,b)}}});Ext.define("Ext.data.Model",{alternateClassName:"Ext.data.Record",mixins:{observable:"Ext.mixin.Observable"},isModel:true,requires:["Ext.util.Collection","Ext.data.Field","Ext.data.identifier.Simple","Ext.data.ModelManager","Ext.data.proxy.Ajax","Ext.data.association.HasMany","Ext.data.association.BelongsTo","Ext.data.association.HasOne","Ext.data.Errors"],config:{idProperty:"id",data:null,fields:undefined,validations:null,associations:null,hasMany:null,hasOne:null,belongsTo:null,proxy:null,identifier:{type:"simple"},clientIdProperty:"clientId",isErased:false},staticConfigs:["idProperty","fields","validations","associations","hasMany","hasOne","belongsTo","clientIdProperty","identifier","proxy"],statics:{EDIT:"edit",REJECT:"reject",COMMIT:"commit",generateProxyMethod:function(a){return function(){var b=this.prototype;return b[a].apply(b,arguments)}},generateCacheId:function(b,c){var a;if(b&&b.isModel){a=b.modelName;if(c===undefined){c=b.getId()}}else{a=b}return a.replace(/\./g,"-").toLowerCase()+"-"+c}},inheritableStatics:{load:function(a,b,h){var f=this.getProxy(),i=this.getIdProperty(),e=null,d={},g,c;h=h||(b&&b.scope)||this;if(Ext.isFunction(b)){b={callback:b,scope:h}}d[i]=a;b=Ext.apply({},b);b=Ext.applyIf(b,{action:"read",params:d,model:this});c=Ext.create("Ext.data.Operation",b);if(!f){Ext.Logger.error("You are trying to load a model that doesn't have a Proxy specified")}g=function(j){if(j.wasSuccessful()){e=j.getRecords()[0];Ext.callback(b.success,h,[e,j])}else{Ext.callback(b.failure,h,[e,j])}Ext.callback(b.callback,h,[e,j])};f.read(c,g,this)}},editing:false,dirty:false,phantom:false,constructor:function(e,g,b,f){var d=this,c=null,a=this.getIdProperty();d.modified={};d.raw=b||e||{};d.stores=[];e=e||f||{};if(g||g===0){e[a]=d.internalId=g}g=d.data[a];if(g||g===0){c=Ext.data.Model.cache.get(Ext.data.Model.generateCacheId(this,g));if(c){return c.mergeData(f||e||{})}}if(f){d.setConvertedData(e)}else{d.setData(e)}g=d.data[a];if(!g&&g!==0){d.data[a]=d.internalId=d.id=d.getIdentifier().generate(d);d.phantom=true;if(this.associations.length){this.handleInlineAssociationData(e)}}else{d.id=d.getIdentifier().generate(d)}Ext.data.Model.cache.add(d);if(this.init&&typeof this.init=="function"){this.init()}},mergeData:function(a){var g=this,d=g.getFields().items,e=d.length,b=g.data,c,h,k,j,f;for(c=0;c<e;c++){h=d[c];k=h.getName();f=h.getConvert();j=a[k];if(j!==undefined&&!g.isModified(k)){if(f){j=f.call(h,j,g)}b[k]=j}}return this},setData:function(a){var g=this.fields.items,h=g.length,f=Ext.isArray(a),d=this._data=this.data={},e,k,b,l,j,c;if(!a){return this}for(e=0;e<h;e++){k=g[e];b=k.getName();j=k.getConvert();if(f){l=a[e]}else{l=a[b];if(typeof l=="undefined"){l=k.getDefaultValue()}}if(j){l=j.call(k,l,this)}d[b]=l}c=this.getId();if(this.associations.length&&(c||c===0)){this.handleInlineAssociationData(a)}return this},handleInlineAssociationData:function(f){var e=this.associations.items,k=e.length,a=this.raw,g,d,c,h,j,b;for(g=0;g<k;g++){d=e[g];b=d.getAssociationKey();c=f[b];if(!c){c=a[b]}if(c){h=d.getReader();if(!h){j=d.getAssociatedModel().getProxy();if(j){h=j.getReader()}else{h=new Ext.data.JsonReader({model:d.getAssociatedModel()})}}d.read(this,h,c)}}},setId:function(b){var a=this.getId();this.set(this.getIdProperty(),b);this.internalId=b;Ext.data.Model.cache.replace(a,this)},getId:function(){return this.get(this.getIdProperty())},setConvertedData:function(a){this._data=this.data=a;return this},get:function(a){return this.data[a]},set:function(p,l){var j=this,b=j.fields.map,o=j.modified,a=!j.editing,c=j.associations.items,f=0,d=[],k,n,e,m,g,h;if(arguments.length==1){for(n in p){if(p.hasOwnProperty(n)){k=b[n];if(k&&k.hasCustomConvert()){d.push(n);continue}if(!f&&a){j.beginEdit()}++f;j.set(n,p[n])}}g=d.length;if(g){if(!f&&a){j.beginEdit()}f+=g;for(e=0;e<g;e++){k=d[e];j.set(k,p[k])}}if(a&&f){j.endEdit(false,d)}}else{k=b[p];h=k&&k.getConvert();if(h){l=h.call(k,l,j)}m=j.data[p];j.data[p]=l;if(k&&!j.isEqual(m,l)){if(o.hasOwnProperty(p)){if(j.isEqual(o[p],l)){delete o[p];j.dirty=false;for(n in o){if(o.hasOwnProperty(n)){j.dirty=true;break}}}}else{j.dirty=true;o[p]=m}}if(a){j.afterEdit([p],o)}}},isEqual:function(d,c){if(Ext.isDate(d)&&Ext.isDate(c)){return d.getTime()===c.getTime()}return d===c},beginEdit:function(){var a=this;if(!a.editing){a.editing=true;a.dirtySave=a.dirty;a.dataSave=Ext.apply({},a.data);a.modifiedSave=Ext.apply({},a.modified)}},cancelEdit:function(){var a=this;if(a.editing){a.editing=false;a.modified=a.modifiedSave;a.data=a.dataSave;a.dirty=a.dirtySave;delete a.modifiedSave;delete a.dataSave;delete a.dirtySave}},endEdit:function(a,c){var b=this;if(b.editing){b.editing=false;if(a!==true&&(b.changedWhileEditing())){b.afterEdit(c||Ext.Object.getKeys(this.modified),this.modified)}delete b.modifiedSave;delete b.dataSave;delete b.dirtySave}},changedWhileEditing:function(){var c=this,b=c.dataSave,d=c.data,a;for(a in d){if(d.hasOwnProperty(a)){if(!c.isEqual(d[a],b[a])){return true}}}return false},getChanges:function(){var a=this.modified,b={},c;for(c in a){if(a.hasOwnProperty(c)){b[c]=this.get(c)}}return b},isModified:function(a){return this.modified.hasOwnProperty(a)},save:function(b,d){var e=this,f=e.phantom?"create":"update",c=e.getProxy(),a,g;if(!c){Ext.Logger.error("You are trying to save a model instance that doesn't have a Proxy specified")}b=b||{};d=d||e;if(Ext.isFunction(b)){b={callback:b,scope:d}}Ext.applyIf(b,{records:[e],action:f,model:e.self});a=Ext.create("Ext.data.Operation",b);g=function(h){if(h.wasSuccessful()){Ext.callback(b.success,d,[e,h])}else{Ext.callback(b.failure,d,[e,h])}Ext.callback(b.callback,d,[e,h])};c[f](a,g,e);return e},erase:function(b,d){var e=this,c=this.getProxy(),a,f;if(!c){Ext.Logger.error("You are trying to erase a model instance that doesn't have a Proxy specified")}b=b||{};d=d||e;if(Ext.isFunction(b)){b={callback:b,scope:d}}Ext.applyIf(b,{records:[e],action:"destroy",model:this.self});a=Ext.create("Ext.data.Operation",b);f=function(g){if(g.wasSuccessful()){Ext.callback(b.success,d,[e,g])}else{Ext.callback(b.failure,d,[e,g])}Ext.callback(b.callback,d,[e,g])};c.destroy(a,f,e);return e},reject:function(a){var c=this,b=c.modified,d;for(d in b){if(b.hasOwnProperty(d)){if(typeof b[d]!="function"){c.data[d]=b[d]}}}c.dirty=false;c.editing=false;c.modified={};if(a!==true){c.afterReject()}},commit:function(a){var c=this,b=this.modified;c.phantom=c.dirty=c.editing=false;c.modified={};if(a!==true){c.afterCommit(b)}},afterEdit:function(b,a){this.notifyStores("afterEdit",b,a)},afterReject:function(){this.notifyStores("afterReject")},afterCommit:function(a){this.notifyStores("afterCommit",Ext.Object.getKeys(a||{}),a)},notifyStores:function(e){var c=Ext.Array.clone(arguments),a=this.stores,f=a.length,d,b;c[0]=this;for(d=0;d<f;++d){b=a[d];if(b!==undefined&&typeof b[e]=="function"){b[e].apply(b,c)}}},copy:function(c){var d=this,b=d.getIdProperty(),a=Ext.apply({},d.raw),e=Ext.apply({},d.data);delete a[b];delete e[b];return new d.self(null,c,a,e)},getData:function(a){var b=this.data;if(a===true){Ext.apply(b,this.getAssociatedData())}return b},getAssociatedData:function(){return this.prepareAssociatedData(this,[],null)},prepareAssociatedData:function(o,a,n){var h=o.associations.items,l=h.length,e={},f,s,g,q,r,d,c,m,k,p,b;for(m=0;m<l;m++){d=h[m];s=d.getName();p=d.getType();b=true;if(n){b=p==n}if(b&&p.toLowerCase()=="hasmany"){f=o[d.getStoreName()];e[s]=[];if(f&&f.getCount()>0){g=f.data.items;r=g.length;for(k=0;k<r;k++){q=g[k];c=q.id;if(Ext.Array.indexOf(a,c)==-1){a.push(c);e[s][k]=q.getData();Ext.apply(e[s][k],this.prepareAssociatedData(q,a,p))}}}}else{if(b&&(p.toLowerCase()=="belongsto"||p.toLowerCase()=="hasone")){q=o[d.getInstanceName()];if(q!==undefined){c=q.id;if(Ext.Array.indexOf(a,c)===-1){a.push(c);e[s]=q.getData();Ext.apply(e[s],this.prepareAssociatedData(q,a,p))}}}}}return e},join:function(a){Ext.Array.include(this.stores,a)},unjoin:function(a){Ext.Array.remove(this.stores,a)},setDirty:function(){var b=this,a;b.dirty=true;b.fields.each(function(c){if(c.getPersist()){a=c.getName();b.modified[a]=b.get(a)}})},validate:function(){var j=Ext.create("Ext.data.Errors"),c=this.getValidations().items,e=Ext.data.Validations,b,d,h,a,g,f;if(c){b=c.length;for(f=0;f<b;f++){d=c[f];h=d.field||d.name;g=d.type;a=e[g](d,this.get(h));if(!a){j.add(Ext.create("Ext.data.Error",{field:h,message:d.message||e.getMessage(g)}))}}}return j},isValid:function(){return this.validate().isValid()},toUrl:function(){var b=this.$className.split("."),a=b[b.length-1].toLowerCase();return a+"/"+this.getId()},destroy:function(){var a=this;a.notifyStores("afterErase",a);Ext.data.Model.cache.remove(a);a.data=a._data=a.raw=a.stores=a.modified=null;a.callParent(arguments)},applyProxy:function(b,a){return Ext.factory(b,Ext.data.Proxy,a,"proxy")},updateProxy:function(a){if(a){a.setModel(this.self)}},applyAssociations:function(a){if(a){this.addAssociations(a,"hasMany")}},applyBelongsTo:function(a){if(a){this.addAssociations(a,"belongsTo")}},applyHasMany:function(a){if(a){this.addAssociations(a,"hasMany")}},applyHasOne:function(a){if(a){this.addAssociations(a,"hasOne")}},addAssociations:function(e,h){var f,d,b,c=this.self.modelName,g=this.self.associations,a;e=Ext.Array.from(e);for(d=0,f=e.length;d<f;d++){b=e[d];if(!Ext.isObject(b)){b={model:b}}Ext.applyIf(b,{type:h,ownerModel:c,associatedModel:b.model});delete b.model;a=Ext.Function.bind(function(i){g.add(Ext.data.association.Association.create(this))},b);Ext.ClassManager.onCreated(a,this,(typeof b.associatedModel==="string")?b.associatedModel:Ext.getClassName(b.associatedModel))}},applyValidations:function(a){if(a){if(!Ext.isArray(a)){a=[a]}this.addValidations(a)}},addValidations:function(a){this.self.validations.addAll(a)},applyFields:function(a){var b=this.superclass.fields;if(b){a=b.items.concat(a||[])}return a||[]},updateFields:function(c){var d=c.length,e=this,h=e.self.prototype,j=this.getIdProperty(),a,f,g,b;f=e._fields=e.fields=new Ext.util.Collection(h.getFieldName);for(b=0;b<d;b++){g=c[b];if(!g.isField){g=new Ext.data.Field(c[b])}f.add(g)}a=f.get(j);if(!a){f.add(new Ext.data.Field(j))}else{a.setType("auto")}f.addSorter(h.sortConvertFields)},applyIdentifier:function(a){if(typeof a==="string"){a={type:a}}return Ext.factory(a,Ext.data.identifier.Simple,this.getIdentifier(),"data.identifier")},getFieldName:function(a){return a.getName()},sortConvertFields:function(a,d){var c=a.hasCustomConvert(),b=d.hasCustomConvert();if(c&&!b){return 1}if(!c&&b){return -1}return 0},onClassExtended:function(k,d,j){var f=j.onBeforeCreated,b=this,h=b.prototype,e=Ext.Class.configNameCache,g=h.staticConfigs.concat(d.staticConfigs||[]),c=h.config,a=d.config||{},i;d.config=a;j.onBeforeCreated=function(A,t){var v=[],x=A.prototype,w={},m=x.config,n=g.length,q=["set","get"],s=q.length,o=m.associations||[],l=Ext.getClassName(A),z,y,r,p,u;for(r=0;r<n;r++){z=g[r];for(p=0;p<s;p++){y=e[z][q[p]];if(y in x){w[y]=b.generateProxyMethod(y)}}}A.addStatics(w);A.modelName=l;x.modelName=l;if(m.belongsTo){v.push("association.belongsto")}if(m.hasMany){v.push("association.hasmany")}if(m.hasOne){v.push("association.hasone")}for(r=0,u=o.length;r<u;++r){v.push("association."+o[r].type.toLowerCase())}if(m.proxy){if(typeof m.proxy==="string"){v.push("proxy."+m.proxy)}else{if(typeof m.proxy.type==="string"){v.push("proxy."+m.proxy.type)}}}if(m.validations){v.push("Ext.data.Validations")}Ext.require(v,function(){Ext.Function.interceptBefore(j,"onCreated",function(){Ext.data.ModelManager.registerType(l,A);var B=A.prototype.superclass;A.prototype.associations=A.associations=A.prototype._associations=(B&&B.associations)?B.associations.clone():new Ext.util.Collection(function(C){return C.getName()});A.prototype.validations=A.validations=A.prototype._validations=(B&&B.validations)?B.validations.clone():new Ext.util.Collection(function(C){return C.field||C.name});A.prototype=Ext.Object.chain(A.prototype);A.prototype.initConfig.call(A.prototype,m);delete A.prototype.initConfig});f.call(b,A,t,j)})}}},function(){this.cache=new Ext.util.Collection(this.generateCacheId)});Ext.define("Ext.data.Store",{alias:"store.store",extend:"Ext.Evented",requires:["Ext.util.Collection","Ext.data.Operation","Ext.data.proxy.Memory","Ext.data.Model","Ext.data.StoreManager","Ext.util.Grouper"],statics:{create:function(a){if(!a.isStore){if(!a.type){a.type="store"}a=Ext.createByAlias("store."+a.type,a)}return a}},isStore:true,config:{storeId:undefined,data:null,autoLoad:null,autoSync:false,model:undefined,proxy:undefined,fields:null,remoteSort:false,remoteFilter:false,remoteGroup:false,filters:null,sorters:null,grouper:null,groupField:null,groupDir:null,getGroupString:null,pageSize:25,totalCount:null,clearOnPageLoad:true,modelDefaults:{},autoDestroy:false,syncRemovedRecords:true},currentPage:1,constructor:function(a){a=a||{};this.data=this._data=this.createDataCollection();this.data.setSortRoot("data");this.data.setFilterRoot("data");this.removed=[];if(a.id&&!a.storeId){a.storeId=a.id;delete a.id}this.initConfig(a)},createDataCollection:function(){return new Ext.util.Collection(function(a){return a.getId()})},applyStoreId:function(a){if(a===undefined||a===null){a=this.getUniqueId()}return a},updateStoreId:function(a,b){if(b){Ext.data.StoreManager.unregister(this)}if(a){Ext.data.StoreManager.register(this)}},applyModel:function(b){if(typeof b=="string"){var d=Ext.data.ModelManager.getModel(b);if(!d){Ext.Logger.error('Model with name "'+b+'" does not exist.')}b=d}if(b&&!b.prototype.isModel&&Ext.isObject(b)){b=Ext.data.ModelManager.registerType(b.storeId||b.id||Ext.id(),b)}if(!b){var a=this.getFields(),c=this.config.data;if(!a&&c&&c.length){a=Ext.Object.getKeys(c[0])}if(a){b=Ext.define("Ext.data.Store.ImplicitModel-"+(this.getStoreId()||Ext.id()),{extend:"Ext.data.Model",config:{fields:a,proxy:this.getProxy()}});this.implicitModel=true}}if(!b&&this.getProxy()){b=this.getProxy().getModel()}return b},updateModel:function(a){var b=this.getProxy();if(b&&!b.getModel()){b.setModel(a)}},applyProxy:function(b,a){b=Ext.factory(b,Ext.data.Proxy,a,"proxy");if(!b&&this.getModel()){b=this.getModel().getProxy();if(!b){b=new Ext.data.proxy.Memory({model:this.getModel()})}}return b},updateProxy:function(a){if(a){if(!a.getModel()){a.setModel(this.getModel())}a.on("metachange",this.onMetaChange,this)}},applyData:function(c){var b=this,a;if(c){a=b.getProxy();if(a instanceof Ext.data.proxy.Memory){a.setData(c);b.load()}else{b.removeAll(true);b.fireEvent("clear",b);b.suspendEvents();b.add(c);b.resumeEvents();b.dataLoaded=true}}else{b.removeAll(true);b.fireEvent("clear",b)}b.fireEvent("refresh",b,b.data)},clearData:function(){this.setData(null)},addData:function(d){var a=this.getProxy().getReader(),c=a.read(d),b=c.getRecords();this.add(b)},updateAutoLoad:function(a){var b=this.getProxy();if(a&&(b&&!b.isMemoryProxy)){this.load(Ext.isObject(a)?a:null)}},isAutoLoading:function(){var a=this.getProxy();return(this.getAutoLoad()||(a&&a.isMemoryProxy)||this.dataLoaded)},updateGroupField:function(a){var b=this.getGrouper();if(a){if(!b){this.setGrouper({property:a,direction:this.getGroupDir()||"ASC"})}else{b.setProperty(a)}}else{if(b){this.setGrouper(null)}}},updateGroupDir:function(a){var b=this.getGrouper();if(b){b.setDirection(a)}},applyGetGroupString:function(b){var a=this.getGrouper();if(b){if(a){a.setGroupFn(b)}else{this.setGrouper({groupFn:b})}}else{if(a){this.setGrouper(null)}}},applyGrouper:function(a){if(typeof a=="string"){a={property:a}}else{if(typeof a=="function"){a={groupFn:a}}}a=Ext.factory(a,Ext.util.Grouper,this.getGrouper());return a},updateGrouper:function(b,a){var c=this.data;if(a){c.removeSorter(a);if(!b){c.getSorters().removeSorter("isGrouper")}}if(b){c.insertSorter(0,b);if(!a){c.getSorters().addSorter({direction:"DESC",property:"isGrouper",transform:function(d){return(d===true)?1:-1}})}}},isGrouped:function(){return !!this.getGrouped()},updateSorters:function(d){var b=this.getGrouper(),c=this.data,a=c.getAutoSort();c.setAutoSort(false);c.setSorters(d);if(b){c.insertSorter(0,b)}this.updateSortTypes();c.setAutoSort(a)},updateSortTypes:function(){var b=this.getModel(),a=b&&b.getFields(),c=this.data;if(a){c.getSorters().each(function(f){var d=f.getProperty(),e;if(!f.isGrouper&&d&&!f.getTransform()){e=a.get(d);if(e){f.setTransform(e.getSortType())}}})}},updateFilters:function(a){this.data.setFilters(a)},add:function(a){if(!Ext.isArray(a)){a=Array.prototype.slice.apply(arguments)}return this.insert(this.data.length,a)},insert:function(e,b){if(!Ext.isArray(b)){b=Array.prototype.slice.call(arguments,1)}var h=this,k=false,f=b.length,a=this.getModel(),g=h.getModelDefaults(),c,d,j=false;b=b.slice();for(c=0;c<f;c++){d=b[c];if(!d.isModel){d=new a(d)}else{if(this.removed.indexOf(d)!=-1){Ext.Array.remove(this.removed,d)}}d.set(g);b[c]=d;d.join(h);k=k||(d.phantom===true)}if(f===1){j=this.data.insert(e,b[0]);if(j){j=[j]}}else{j=this.data.insertAll(e,b)}if(j){h.fireEvent("addrecords",h,j)}if(h.getAutoSync()&&k){h.sync()}return b},remove:function(b){if(b.isModel){b=[b]}var l=this,m=false,d=0,a=this.getAutoSync(),k=b.length,o=[],g=[],n,h=l.data.items,e,f,c;for(;d<k;d++){e=b[d];if(l.data.contains(e)){n=(e.phantom===true);f=h.indexOf(e);if(f!==-1){g.push(e);o.push(f)}if(!n&&l.getSyncRemovedRecords()){l.removed.push(e)}e.unjoin(l);l.data.remove(e);m=m||!n}}l.fireEvent("removerecords",l,g,o);if(a&&m){l.sync()}},removeAt:function(b){var a=this.getAt(b);if(a){this.remove(a)}},removeAll:function(a){if(a!==true){this.fireAction("clear",[this],"doRemoveAll")}else{this.doRemoveAll.call(this,true)}},doRemoveAll:function(a){var b=this;b.data.each(function(c){c.unjoin(b)});if(b.getSyncRemovedRecords()){b.removed=b.removed.concat(b.data.items)}b.data.clear();if(a!==true){b.fireEvent("refresh",b,b.data)}if(b.getAutoSync()){this.sync()}},each:function(b,a){this.data.each(b,a)},getCount:function(){return this.data.length||0},getAt:function(a){return this.data.getAt(a)},getRange:function(b,a){return this.data.getRange(b,a)},getById:function(a){return this.data.findBy(function(b){return b.getId()==a})},indexOf:function(a){return this.data.indexOf(a)},indexOfId:function(a){return this.data.indexOfKey(a)},afterEdit:function(c,g,d){var f=this,h=f.data,a=d[c.getIdProperty()]||c.getId(),b=h.keys.indexOf(a),e;if(b===-1&&h.map[a]===undefined){return}if(f.getAutoSync()){f.sync()}if(a!==c.getId()){h.replace(a,c)}else{h.replace(c)}e=h.indexOf(c);if(b===-1&&e!==-1){f.fireEvent("addrecords",f,[c])}else{if(b!==-1&&e===-1){f.fireEvent("removerecords",f,[c],[b])}else{if(e!==-1){f.fireEvent("updaterecord",f,c,e,b,g,d)}}}},afterReject:function(a){var b=this.data.indexOf(a);this.fireEvent("updaterecord",this,a,b,b,[],{})},afterCommit:function(c,g,d){var f=this,h=f.data,a=d[c.getIdProperty()]||c.getId(),b=h.keys.indexOf(a),e;if(b===-1&&h.map[a]===undefined){return}if(a!==c.getId()){h.replace(a,c)}else{h.replace(c)}e=h.indexOf(c);if(b===-1&&e!==-1){f.fireEvent("addrecords",f,[c])}else{if(b!==-1&&e===-1){f.fireEvent("removerecords",f,[c],[b])}else{if(e!==-1){f.fireEvent("updaterecord",f,c,e,b,g,d)}}}},afterErase:function(a){var c=this,d=c.data,b=d.indexOf(a);if(b!==-1){d.remove(a);c.fireEvent("removerecords",c,[a],[b])}},updateRemoteFilter:function(a){this.data.setAutoFilter(!a)},updateRemoteSort:function(a){this.data.setAutoSort(!a)},sort:function(f,d,c){var e=this.data,b=this.getGrouper(),a=e.getAutoSort();if(f){e.setAutoSort(false);if(typeof c==="string"){if(c=="prepend"){e.insertSorters(b?1:0,f,d)}else{e.addSorters(f,d)}}else{e.setSorters(null);if(b){e.addSorters(b)}e.addSorters(f,d)}this.updateSortTypes();e.setAutoSort(a)}if(!this.getRemoteSort()){if(!f){this.data.sort()}this.fireEvent("sort",this,this.data,this.data.getSorters());if(e.length){this.fireEvent("refresh",this,this.data)}}},filter:function(e,d,f,a){var c=this.data,b=c.length;if(this.getRemoteFilter()){if(e){if(Ext.isString(e)){c.addFilters({property:e,value:d,anyMatch:f,caseSensitive:a})}else{if(Ext.isArray(e)||e.isFilter){c.addFilters(e)}}}}else{c.filter(e,d);this.fireEvent("filter",this,c,c.getFilters());if(c.length!==b){this.fireEvent("refresh",this,c)}}},filterBy:function(b,a){var d=this,e=d.data,c=e.length;e.filter({filterFn:b,scope:a});this.fireEvent("filter",this,e,e.getFilters());if(e.length!==c){this.fireEvent("refresh",this,e)}},queryBy:function(b,a){return this.data.filterBy(b,a||this)},clearFilter:function(a){var b=this.data.length;if(a){this.suspendEvents()}this.data.setFilters(null);if(a){this.resumeEvents()}else{if(b!==this.data.length){this.fireEvent("refresh",this,this.data)}}},isFiltered:function(){return this.data.filtered},getSorters:function(){var a=this.data.getSorters();return(a)?a.items:[]},getFilters:function(){var a=this.data.getFilters();return(a)?a.items:[]},getGroups:function(c){var e=this.data.items,b=e.length,a=this.getGrouper(),d=[],k={},g,h,j,f;for(f=0;f<b;f++){g=e[f];h=a.getGroupString(g);j=k[h];if(j===undefined){j={name:h,children:[]};d.push(j);k[h]=j}j.children.push(g)}return c?k[c]:d},getGroupString:function(a){var b=this.getGrouper();if(b){return b.getGroupString(a)}return null},find:function(g,d,e,f,a,c){var b=Ext.create("Ext.util.Filter",{property:g,value:d,anyMatch:f,caseSensitive:a,exactMatch:c,root:"data"});return this.data.findIndexBy(b.getFilterFn(),null,e)},findRecord:function(){var b=this,a=b.find.apply(b,arguments);return a!==-1?b.getAt(a):null},findExact:function(c,a,b){return this.data.findIndexBy(function(d){return d.get(c)===a},this,b)},findBy:function(b,a,c){return this.data.findIndexBy(b,a,c)},load:function(c,e){var f=this,b,d=f.currentPage,a=f.getPageSize();c=c||{};if(Ext.isFunction(c)){c={callback:c,scope:e||this}}if(f.getRemoteSort()){c.sorters=c.sorters||this.getSorters()}if(f.getRemoteFilter()){c.filters=c.filters||this.getFilters()}if(f.getRemoteGroup()){c.grouper=c.grouper||this.getGrouper()}Ext.applyIf(c,{page:d,start:(d-1)*a,limit:a,addRecords:false,action:"read",model:this.getModel()});b=Ext.create("Ext.data.Operation",c);if(f.fireEvent("beforeload",f,b)!==false){f.loading=true;f.getProxy().read(b,f.onProxyLoad,f)}return f},isLoading:function(){return Boolean(this.loading)},isLoaded:function(){return Boolean(this.loaded)},sync:function(){var d=this,b={},e=d.getNewRecords(),c=d.getUpdatedRecords(),a=d.getRemovedRecords(),f=false;if(e.length>0){b.create=e;f=true}if(c.length>0){b.update=c;f=true}if(a.length>0){b.destroy=a;f=true}if(f&&d.fireEvent("beforesync",this,b)!==false){d.getProxy().batch({operations:b,listeners:d.getBatchListeners()})}return{added:e,updated:c,removed:a}},first:function(){return this.data.first()},last:function(){return this.data.last()},sum:function(e){var d=0,c=0,b=this.data.items,a=b.length;for(;c<a;++c){d+=b[c].get(e)}return d},min:function(f){var d=1,b=this.data.items,a=b.length,e,c;if(a>0){c=b[0].get(f)}for(;d<a;++d){e=b[d].get(f);if(e<c){c=e}}return c},max:function(f){var d=1,c=this.data.items,b=c.length,e,a;if(b>0){a=c[0].get(f)}for(;d<b;++d){e=c[d].get(f);if(e>a){a=e}}return a},average:function(e){var c=0,b=this.data.items,a=b.length,d=0;if(b.length>0){for(;c<a;++c){d+=b[c].get(e)}return d/a}return 0},getBatchListeners:function(){return{scope:this,exception:this.onBatchException,complete:this.onBatchComplete}},onBatchComplete:function(b){var e=this,a=b.operations,d=a.length,c;for(c=0;c<d;c++){e.onProxyWrite(a[c])}},onBatchException:function(b,a){},onProxyLoad:function(b){var d=this,a=b.getRecords(),c=b.getResultSet(),e=b.wasSuccessful();if(c){d.setTotalCount(c.getTotal())}if(e){if(b.getAddRecords()!==true){d.data.each(function(f){f.unjoin(d)});d.data.clear();d.fireEvent("clear",this)}if(a&&a.length){d.suspendEvents();d.add(a);d.resumeEvents()}d.fireEvent("refresh",this,this.data)}d.loaded=true;d.loading=false;d.fireEvent("load",this,a,e);Ext.callback(b.getCallback(),b.getScope()||d,[a,b,e])},onProxyWrite:function(b){var c=this,d=b.wasSuccessful(),a=b.getRecords();switch(b.getAction()){case"create":c.onCreateRecords(a,b,d);break;case"update":c.onUpdateRecords(a,b,d);break;case"destroy":c.onDestroyRecords(a,b,d);break}if(d){c.fireEvent("write",c,b)}Ext.callback(b.getCallback(),b.getScope()||c,[a,b,d])},onCreateRecords:function(b,a,c){},onUpdateRecords:function(b,a,c){},onDestroyRecords:function(b,a,c){this.removed=[]},onMetaChange:function(b){var a=this.getProxy().getModel();if(!this.getModel()&&a){this.setModel(a)}this.fireEvent("metachange",this,b)},getNewRecords:function(){return this.data.filterBy(function(a){return a.phantom===true&&a.isValid()}).items},getUpdatedRecords:function(){return this.data.filterBy(function(a){return a.dirty===true&&a.phantom!==true&&a.isValid()}).items},getRemovedRecords:function(){return this.removed},loadPage:function(f,c,d){if(typeof c==="function"){c={callback:c,scope:d||this}}var e=this,b=e.getPageSize(),a=e.getClearOnPageLoad();c=Ext.apply({},c);e.currentPage=f;e.load(Ext.applyIf(c,{page:f,start:(f-1)*b,limit:b,addRecords:!a}))},nextPage:function(a){this.loadPage(this.currentPage+1,a)},previousPage:function(a){this.loadPage(this.currentPage-1,a)}});Ext.define("Ext.data.ArrayStore",{extend:"Ext.data.Store",alias:"store.array",uses:["Ext.data.reader.Array"],config:{proxy:{type:"memory",reader:"array"}},loadData:function(b,a){this.callParent([b,a])}},function(){Ext.data.SimpleStore=Ext.data.ArrayStore});Ext.define("Ext.data.DirectStore",{extend:"Ext.data.Store",alias:"store.direct",requires:["Ext.data.proxy.Direct"],config:{proxy:{type:"direct",reader:{type:"json"}}}});Ext.define("Ext.data.JsonStore",{extend:"Ext.data.Store",alias:"store.json",config:{proxy:{type:"ajax",reader:"json",writer:"json"}}});Ext.define("Ext.data.NodeStore",{extend:"Ext.data.Store",alias:"store.node",requires:["Ext.data.NodeInterface"],config:{node:null,recursive:false,rootVisible:false,sorters:undefined,filters:undefined,folderSort:false},afterEdit:function(a,b){if(b){if(b.indexOf("loaded")!==-1){return this.add(this.retrieveChildNodes(a))}if(b.indexOf("expanded")!==-1){return this.filter()}if(b.indexOf("sorted")!==-1){return this.sort()}}this.callParent(arguments)},onNodeAppend:function(a,b){this.add([b].concat(this.retrieveChildNodes(b)))},onNodeInsert:function(a,b){this.add([b].concat(this.retrieveChildNodes(b)))},onNodeRemove:function(a,b){this.remove([b].concat(this.retrieveChildNodes(b)))},onNodeSort:function(){this.sort()},updateFolderSort:function(a){if(a){this.setGrouper(function(b){if(b.isLeaf()){return 1}return 0})}else{this.setGrouper(null)}},createDataCollection:function(){var a=this.callParent();a.handleSort=Ext.Function.bind(this.handleTreeSort,this,[a],true);a.findInsertionIndex=Ext.Function.bind(this.handleTreeInsertionIndex,this,[a,a.findInsertionIndex],true);return a},handleTreeInsertionIndex:function(a,b,d,c){return c.call(d,a,b,this.treeSortFn)},handleTreeSort:function(a){Ext.Array.sort(a,this.treeSortFn);return a},treeSortFn:function(c,a){if(c.parentNode===a.parentNode){return(c.data.index<a.data.index)?-1:1}var f=0,e=0,d=c,b=a;while(d){f+=(Math.pow(10,(d.data.depth+1)*-4)*(d.data.index+1));d=d.parentNode}while(b){e+=(Math.pow(10,(b.data.depth+1)*-4)*(b.data.index+1));b=b.parentNode}if(f>e){return 1}else{if(f<e){return -1}}return(c.data.index>a.data.index)?1:-1},applyFilters:function(b){var a=this;return function(c){return a.isVisible(c)}},applyProxy:function(a){},applyNode:function(a){if(a){a=Ext.data.NodeInterface.decorate(a)}return a},updateNode:function(a,c){if(c){c.un({append:"onNodeAppend",insert:"onNodeInsert",remove:"onNodeRemove",load:"onNodeLoad",scope:this});c.unjoin(this)}if(a){a.on({scope:this,append:"onNodeAppend",insert:"onNodeInsert",remove:"onNodeRemove",load:"onNodeLoad"});a.join(this);var b=[];if(a.childNodes.length){b=b.concat(this.retrieveChildNodes(a))}if(this.getRootVisible()){b.push(a)}else{if(a.isLoaded()||a.isLoading()){a.set("expanded",true)}}this.data.clear();this.fireEvent("clear",this);this.suspendEvents();this.add(b);this.resumeEvents();this.fireEvent("refresh",this,this.data)}},retrieveChildNodes:function(a){var d=this.getNode(),b=this.getRecursive(),c=[],e=a;if(!a.childNodes.length||(!b&&a!==d)){return c}if(!b){return a.childNodes}while(e){if(e._added){delete e._added;if(e===a){break}else{e=e.nextSibling||e.parentNode}}else{if(e!==a){c.push(e)}if(e.firstChild){e._added=true;e=e.firstChild}else{e=e.nextSibling||e.parentNode}}}return c},isVisible:function(b){var a=b.parentNode;while(a){if(!a.isExpanded()){return false}if(a===this.getNode()){break}a=a.parentNode}return true}});Ext.define("Ext.data.TreeStore",{extend:"Ext.data.NodeStore",alias:"store.tree",config:{root:undefined,clearOnLoad:true,nodeParam:"node",defaultRootId:"root",defaultRootProperty:"children",recursive:true},applyProxy:function(){return Ext.data.Store.prototype.applyProxy.apply(this,arguments)},applyRoot:function(a){var b=this;a=a||{};a=Ext.apply({},a);if(!a.isModel){Ext.applyIf(a,{id:b.getDefaultRootId(),text:"Root",allowDrag:false});a=Ext.data.ModelManager.create(a,b.getModel())}Ext.data.NodeInterface.decorate(a);a.set(a.raw);return a},handleTreeInsertionIndex:function(a,b,d,c){if(b.parentNode){b.parentNode.sort(d.getSortFn(),true,true)}return this.callParent(arguments)},handleTreeSort:function(a,b){if(this._sorting){return a}this._sorting=true;this.getNode().sort(b.getSortFn(),true,true);delete this._sorting;return this.callParent(arguments)},updateRoot:function(a,b){if(b){b.unBefore({expand:"onNodeBeforeExpand",scope:this});b.unjoin(this)}a.onBefore({expand:"onNodeBeforeExpand",scope:this});this.onNodeAppend(null,a);this.setNode(a);if(!a.isLoaded()&&!a.isLoading()&&a.isExpanded()){this.load({node:a})}this.fireEvent("rootchange",this,a,b)},getNodeById:function(a){return this.data.getByKey(a)},onNodeBeforeExpand:function(b,a,c){if(b.isLoading()){c.pause();this.on("load",function(){c.resume()},this,{single:true})}else{if(!b.isLoaded()){c.pause();this.load({node:b,callback:function(){c.resume()}})}}},onNodeAppend:function(l,b){var j=this.getProxy(),g=j.getReader(),e=b.raw,c=[],a=g.getRootProperty(),k,f,d,h;if(!b.isLeaf()){k=g.getRoot(e);if(k){f=g.extractData(k);for(d=0,h=f.length;d<h;d++){if(f[d].node[a]){f[d].data[a]=f[d].node[a]}c.push(f[d].data)}if(c.length){this.fillNode(b,c)}delete e[a]}}},updateAutoLoad:function(b){if(b){var a=this.getRoot();if(!a.isLoaded()&&!a.isLoading()){this.load({node:a})}}},load:function(a){a=a||{};a.params=a.params||{};var c=this,b=a.node=a.node||c.getRoot();a.params[c.getNodeParam()]=b.getId();if(c.getClearOnLoad()){b.removeAll(true)}b.set("loading",true);return c.callParent([a])},updateProxy:function(b){this.callParent(arguments);var a=b.getReader();if(!a.getRootProperty()){a.setRootProperty(this.getDefaultRootProperty());a.buildExtractors()}},removeAll:function(){this.getRootNode().removeAll(true);this.callParent(arguments)},onProxyLoad:function(b){var d=this,a=b.getRecords(),e=b.wasSuccessful(),c=b.getNode();c.beginEdit();c.set("loading",false);if(e){a=d.fillNode(c,a)}c.endEdit();c.fireEvent("load",c,a,e);d.loading=false;d.fireEvent("load",this,a,e);Ext.callback(b.getCallback(),b.getScope()||d,[a,b,e])},fillNode:function(d,a){var c=a?a.length:0,b,e;for(b=0;b<c;b++){e=d.appendChild(a[b],true,true);this.onNodeAppend(d,e)}d.set("loaded",true);return a}});Ext.define("Ext.data.proxy.Rest",{extend:"Ext.data.proxy.Ajax",alternateClassName:"Ext.data.RestProxy",alias:"proxy.rest",config:{appendId:true,format:null,batchActions:false,actionMethods:{create:"POST",read:"GET",update:"PUT",destroy:"DELETE"}},buildUrl:function(f){var i=this,e=f.getOperation(),c=e.getRecords()||[],h=c[0],g=i.getModel(),k=g.getIdProperty(),j=i.getFormat(),a=i.getUrl(f),d=f.getParams()||{},b=(h&&!h.phantom)?h.getId():d[k];if(i.getAppendId()&&b){if(!a.match(/\/$/)){a+="/"}a+=b;delete d[k]}if(j){if(!a.match(/\.$/)){a+="."}a+=j}f.setUrl(a);return i.callParent([f])}});Ext.define("Ext.direct.RemotingProvider",{alias:"direct.remotingprovider",extend:"Ext.direct.JsonProvider",requires:["Ext.util.MixedCollection","Ext.util.DelayedTask","Ext.direct.Transaction","Ext.direct.RemotingMethod"],config:{namespace:undefined,url:null,enableUrlEncode:null,enableBuffer:10,maxRetries:1,timeout:undefined,actions:{}},constructor:function(a){var b=this;b.callParent(arguments);b.transactions=Ext.create("Ext.util.Collection",function(c){return c.getId()});b.callBuffer=[]},applyNamespace:function(a){if(Ext.isString(a)){return Ext.ns(a)}return a||window},initAPI:function(){var g=this.getActions(),d=this.getNamespace(),f,a,b,c,e,h;for(f in g){if(g.hasOwnProperty(f)){a=d[f];if(!a){a=d[f]={}}b=g[f];for(c=0,e=b.length;c<e;++c){h=Ext.create("Ext.direct.RemotingMethod",b[c]);a[h.getName()]=this.createHandler(f,h)}}}},createHandler:function(c,d){var b=this,a;if(!d.getFormHandler()){a=function(){b.configureRequest(c,d,Array.prototype.slice.call(arguments,0))}}else{a=function(f,g,e){b.configureFormRequest(c,d,f,g,e)}}a.directCfg={action:c,method:d};return a},isConnected:function(){return !!this.connected},connect:function(){var a=this;if(a.getUrl()){a.initAPI();a.connected=true;a.fireEvent("connect",a)}else{}},disconnect:function(){var a=this;if(a.connected){a.connected=false;a.fireEvent("disconnect",a)}},runCallback:function(e,b){var d=!!b.getStatus(),c=d?"success":"failure",f=e&&e.getCallback(),a;if(f){a=b.getResult();if(Ext.isFunction(f)){f(a,b,d)}else{Ext.callback(f[c],f.scope,[a,b,d]);Ext.callback(f.callback,f.scope,[a,b,d])}}},onData:function(k,h,c){var f=this,d=0,e,j,a,b,g;if(h){j=f.createEvents(c);for(e=j.length;d<e;++d){a=j[d];b=f.getTransaction(a);f.fireEvent("data",f,a);if(b){f.runCallback(b,a,true);Ext.direct.Manager.removeTransaction(b)}}}else{g=[].concat(k.transaction);for(e=g.length;d<e;++d){b=f.getTransaction(g[d]);if(b&&b.getRetryCount()<f.getMaxRetries()){b.retry()}else{a=Ext.create("Ext.direct.ExceptionEvent",{data:null,transaction:b,code:Ext.direct.Manager.exceptions.TRANSPORT,message:"Unable to connect to the server.",xhr:c});f.fireEvent("data",f,a);if(b){f.runCallback(b,a,false);Ext.direct.Manager.removeTransaction(b)}}}}},getTransaction:function(a){return a&&a.getTid()?Ext.direct.Manager.getTransaction(a.getTid()):null},configureRequest:function(d,a,f){var g=this,c=a.getCallData(f),e=c.data,h=c.callback,i=c.scope,b;b=Ext.create("Ext.direct.Transaction",{provider:g,args:f,action:d,method:a.getName(),data:e,callback:i&&Ext.isFunction(h)?Ext.Function.bind(h,i):h});if(g.fireEvent("beforecall",g,b,a)!==false){Ext.direct.Manager.addTransaction(b);g.queueTransaction(b);g.fireEvent("call",g,b,a)}},getCallData:function(a){return{action:a.getAction(),method:a.getMethod(),data:a.getData(),type:"rpc",tid:a.getId()}},sendRequest:function(g){var f=this,e={url:f.getUrl(),callback:f.onData,scope:f,transaction:g,timeout:f.getTimeout()},a,c=f.getEnableUrlEncode(),b=0,d,h;if(Ext.isArray(g)){a=[];for(d=g.length;b<d;++b){a.push(f.getCallData(g[b]))}}else{a=f.getCallData(g)}if(c){h={};h[Ext.isString(c)?c:"data"]=Ext.encode(a);e.params=h}else{e.jsonData=a}Ext.Ajax.request(e)},queueTransaction:function(c){var b=this,a=b.getEnableBuffer();if(c.getForm()){b.sendFormRequest(c);return}b.callBuffer.push(c);if(a){if(!b.callTask){b.callTask=Ext.create("Ext.util.DelayedTask",b.combineAndSend,b)}b.callTask.delay(Ext.isNumber(a)?a:10)}else{b.combineAndSend()}},combineAndSend:function(){var a=this.callBuffer,b=a.length;if(b>0){this.sendRequest(b==1?a[0]:a);this.callBuffer=[]}}});Ext.define("Ext.util.TapRepeater",{requires:["Ext.DateExtras"],mixins:{observable:"Ext.mixin.Observable"},config:{el:null,accelerate:true,interval:10,delay:250,preventDefault:true,stopDefault:false,timer:0,pressCls:null},constructor:function(a){var b=this;b.initConfig(a)},updateEl:function(c,b){var a={touchstart:"onTouchStart",touchend:"onTouchEnd",tap:"eventOptions",scope:this};if(b){b.un(a)}c.on(a)},eventOptions:function(a){if(this.getPreventDefault()){a.preventDefault()}if(this.getStopDefault()){a.stopEvent()}},destroy:function(){this.clearListeners();Ext.destroy(this.el)},onTouchStart:function(c){var b=this,a=b.getPressCls();clearTimeout(b.getTimer());if(a){b.getEl().addCls(a)}b.tapStartTime=new Date();b.fireEvent("touchstart",b,c);b.fireEvent("tap",b,c);if(b.getAccelerate()){b.delay=400}b.setTimer(Ext.defer(b.tap,b.getDelay()||b.getInterval(),b,[c]))},tap:function(b){var a=this;a.fireEvent("tap",a,b);a.setTimer(Ext.defer(a.tap,a.getAccelerate()?a.easeOutExpo(Ext.Date.getElapsed(a.tapStartTime),400,-390,12000):a.getInterval(),a,[b]))},easeOutExpo:function(e,a,g,f){return(e==f)?a+g:g*(-Math.pow(2,-10*e/f)+1)+a},onTouchEnd:function(b){var a=this;clearTimeout(a.getTimer());a.getEl().removeCls(a.getPressCls());a.fireEvent("touchend",a,b)}});Ext.define("Ext.util.translatable.Abstract",{extend:"Ext.Evented",requires:["Ext.fx.easing.Linear"],config:{element:null,easing:null,easingX:null,easingY:null,fps:60},constructor:function(a){var b;this.doAnimationFrame=Ext.Function.bind(this.doAnimationFrame,this);this.x=0;this.y=0;this.activeEasingX=null;this.activeEasingY=null;this.initialConfig=a;if(a&&a.element){b=a.element;this.setElement(b)}},applyElement:function(a){if(!a){return}return Ext.get(a)},updateElement:function(a){this.initConfig(this.initialConfig);this.refresh()},factoryEasing:function(a){return Ext.factory(a,Ext.fx.easing.Linear,null,"easing")},applyEasing:function(a){if(!this.getEasingX()){this.setEasingX(this.factoryEasing(a))}if(!this.getEasingY()){this.setEasingY(this.factoryEasing(a))}},applyEasingX:function(a){return this.factoryEasing(a)},applyEasingY:function(a){return this.factoryEasing(a)},updateFps:function(a){this.animationInterval=1000/a},doTranslate:function(a,b){if(typeof a=="number"){this.x=a}if(typeof b=="number"){this.y=b}return this},translate:function(a,c,b){if(Ext.isObject(a)){throw new Error()}this.stopAnimation();if(b!==undefined){return this.translateAnimated(a,c,b)}return this.doTranslate(a,c)},animate:function(b,a){this.activeEasingX=b;this.activeEasingY=a;this.isAnimating=true;this.animationTimer=setInterval(this.doAnimationFrame,this.animationInterval);this.fireEvent("animationstart",this,this.x,this.y);return this},translateAnimated:function(b,g,e){if(Ext.isObject(b)){throw new Error()}if(!Ext.isObject(e)){e={}}var d=Ext.Date.now(),f=e.easing,c=(typeof b=="number")?(e.easingX||this.getEasingX()||f||true):null,a=(typeof g=="number")?(e.easingY||this.getEasingY()||f||true):null;if(c){c=this.factoryEasing(c);c.setStartTime(d);c.setStartValue(this.x);c.setEndValue(b);if("duration" in e){c.setDuration(e.duration)}}if(a){a=this.factoryEasing(a);a.setStartTime(d);a.setStartValue(this.y);a.setEndValue(g);if("duration" in e){a.setDuration(e.duration)}}return this.animate(c,a)},doAnimationFrame:function(){if(!this.isAnimating){return}var c=this.activeEasingX,b=this.activeEasingY,a,d;if(c===null&&b===null){this.stopAnimation();return}if(c!==null){this.x=a=Math.round(c.getValue());if(c.isEnded){this.activeEasingX=null;this.fireEvent("axisanimationend",this,"x",a)}}else{a=this.x}if(b!==null){this.y=d=Math.round(b.getValue());if(b.isEnded){this.activeEasingY=null;this.fireEvent("axisanimationend",this,"y",d)}}else{d=this.y}this.doTranslate(a,d);this.fireEvent("animationframe",this,a,d)},stopAnimation:function(){if(!this.isAnimating){return}this.activeEasingX=null;this.activeEasingY=null;this.isAnimating=false;clearInterval(this.animationTimer);this.fireEvent("animationend",this,this.x,this.y)},refresh:function(){this.translate(this.x,this.y)}});Ext.define("Ext.util.translatable.CssTransform",{extend:"Ext.util.translatable.Abstract",doTranslate:function(a,c){var b=this.getElement().dom.style;if(typeof a!="number"){a=this.x}if(typeof c!="number"){c=this.y}b.webkitTransform="translate3d("+a+"px, "+c+"px, 0px)";return this.callParent(arguments)},destroy:function(){var a=this.getElement();if(a&&!a.isDestroyed){a.dom.style.webkitTransform=null}this.callParent(arguments)}});Ext.define("Ext.util.translatable.ScrollPosition",{extend:"Ext.util.translatable.Abstract",wrapperWidth:0,wrapperHeight:0,baseCls:"x-translatable",config:{useWrapper:true},getWrapper:function(){var e=this.wrapper,c=this.baseCls,b=this.getElement(),d,a;if(!e){a=b.getParent();if(!a){return null}if(this.getUseWrapper()){e=b.wrap({className:c+"-wrapper"},true)}else{e=a.dom}e.appendChild(Ext.Element.create({className:c+"-stretcher"},true));this.nestedStretcher=d=Ext.Element.create({className:c+"-nested-stretcher"},true);b.appendChild(d);b.addCls(c);a.addCls(c+"-container");this.container=a;this.wrapper=e;this.refresh()}return e},doTranslate:function(a,c){var b=this.getWrapper();if(b){if(typeof a=="number"){b.scrollLeft=this.wrapperWidth-a}if(typeof c=="number"){b.scrollTop=this.wrapperHeight-c}}return this.callParent(arguments)},refresh:function(){var a=this.getWrapper();if(a){this.wrapperWidth=a.offsetWidth;this.wrapperHeight=a.offsetHeight;this.callParent(arguments)}},destroy:function(){var b=this.getElement(),a=this.baseCls;if(this.wrapper){if(this.getUseWrapper()){b.unwrap()}this.container.removeCls(a+"-container");b.removeCls(a);b.removeChild(this.nestedStretcher)}this.callParent(arguments)}});Ext.define("Ext.util.Translatable",{requires:["Ext.util.translatable.CssTransform","Ext.util.translatable.ScrollPosition"],constructor:function(a){var c=Ext.util.translatable,e=c.CssTransform,d=c.ScrollPosition,b;if(typeof a=="object"&&"translationMethod" in a){if(a.translationMethod==="scrollposition"){b=d}else{if(a.translationMethod==="csstransform"){b=e}}}if(!b){if(Ext.os.is.Android2||Ext.browser.is.ChromeMobile){b=d}else{b=e}}return new b(a)}});Ext.define("Ext.behavior.Translatable",{extend:"Ext.behavior.Behavior",requires:["Ext.util.Translatable"],constructor:function(){this.listeners={painted:"onComponentPainted",scope:this};this.callParent(arguments)},onComponentPainted:function(){this.translatable.refresh()},setConfig:function(c){var a=this.translatable,b=this.component;if(c){if(!a){this.translatable=a=new Ext.util.Translatable(c);a.setElement(b.renderElement);a.on("destroy","onTranslatableDestroy",this);if(b.isPainted()){this.onComponentPainted(b)}b.on(this.listeners)}else{if(Ext.isObject(c)){a.setConfig(c)}}}else{if(a){a.destroy()}}return this},getTranslatable:function(){return this.translatable},onTranslatableDestroy:function(){var a=this.component;delete this.translatable;a.un(this.listeners)},onComponentDestroy:function(){var a=this.translatable;if(a){a.destroy()}}});Ext.define("Ext.scroll.Scroller",{extend:"Ext.Evented",requires:["Ext.fx.easing.BoundMomentum","Ext.fx.easing.EaseOut","Ext.util.SizeMonitor","Ext.util.Translatable"],config:{element:null,direction:"auto",translationMethod:"auto",fps:"auto",disabled:null,directionLock:false,momentumEasing:{momentum:{acceleration:30,friction:0.5},bounce:{acceleration:30,springTension:0.3},minVelocity:1},bounceEasing:{duration:400},outOfBoundRestrictFactor:0.5,startMomentumResetTime:300,maxAbsoluteVelocity:6,containerSize:"auto",containerScrollSize:"auto",size:"auto",autoRefresh:true,initialOffset:{x:0,y:0},slotSnapSize:{x:0,y:0},slotSnapOffset:{x:0,y:0},slotSnapEasing:{duration:150}},cls:Ext.baseCSSPrefix+"scroll-scroller",containerCls:Ext.baseCSSPrefix+"scroll-container",dragStartTime:0,dragEndTime:0,isDragging:false,isAnimating:false,constructor:function(a){var b=a&&a.element;this.doAnimationFrame=Ext.Function.bind(this.doAnimationFrame,this);this.stopAnimation=Ext.Function.bind(this.stopAnimation,this);this.listeners={scope:this,touchstart:"onTouchStart",touchend:"onTouchEnd",dragstart:"onDragStart",drag:"onDrag",dragend:"onDragEnd"};this.minPosition={x:0,y:0};this.startPosition={x:0,y:0};this.size={x:0,y:0};this.position={x:0,y:0};this.velocity={x:0,y:0};this.isAxisEnabledFlags={x:false,y:false};this.flickStartPosition={x:0,y:0};this.flickStartTime={x:0,y:0};this.lastDragPosition={x:0,y:0};this.dragDirection={x:0,y:0};this.initialConfig=a;if(b){this.setElement(b)}return this},applyElement:function(a){if(!a){return}return Ext.get(a)},updateElement:function(a){this.initialize();a.addCls(this.cls);if(!this.getDisabled()){this.attachListeneners()}this.onConfigUpdate(["containerSize","size"],"refreshMaxPosition");this.on("maxpositionchange","snapToBoundary");this.on("minpositionchange","snapToBoundary");return this},getTranslatable:function(){if(!this.hasOwnProperty("translatable")){var a=this.getBounceEasing();this.translatable=new Ext.util.Translatable({translationMethod:this.getTranslationMethod(),element:this.getElement(),easingX:a.x,easingY:a.y,useWrapper:false,listeners:{animationframe:"onAnimationFrame",animationend:"onAnimationEnd",axisanimationend:"onAxisAnimationEnd",scope:this}})}return this.translatable},updateFps:function(a){if(a!=="auto"){this.getTranslatable().setFps(a)}},attachListeneners:function(){this.getContainer().on(this.listeners)},detachListeners:function(){this.getContainer().un(this.listeners)},updateDisabled:function(a){if(a){this.detachListeners()}else{this.attachListeneners()}},updateInitialOffset:function(c){if(typeof c=="number"){c={x:c,y:c}}var b=this.position,a,d;b.x=a=c.x;b.y=d=c.y;this.getTranslatable().doTranslate(-a,-d)},applyDirection:function(a){var e=this.getMinPosition(),d=this.getMaxPosition(),c,b;this.givenDirection=a;if(a==="auto"){c=d.x>e.x;b=d.y>e.y;if(c&&b){a="both"}else{if(c){a="horizontal"}else{a="vertical"}}}return a},updateDirection:function(b){var a=this.isAxisEnabledFlags;a.x=(b==="both"||b==="horizontal");a.y=(b==="both"||b==="vertical")},isAxisEnabled:function(a){this.getDirection();return this.isAxisEnabledFlags[a]},applyMomentumEasing:function(b){var a=Ext.fx.easing.BoundMomentum;return{x:Ext.factory(b,a),y:Ext.factory(b,a)}},applyBounceEasing:function(b){var a=Ext.fx.easing.EaseOut;return{x:Ext.factory(b,a),y:Ext.factory(b,a)}},applySlotSnapEasing:function(b){var a=Ext.fx.easing.EaseOut;return{x:Ext.factory(b,a),y:Ext.factory(b,a)}},getMinPosition:function(){var a=this.minPosition;if(!a){this.minPosition=a={x:0,y:0};this.fireEvent("minpositionchange",this,a)}return a},getMaxPosition:function(){var c=this.maxPosition,a,b;if(!c){a=this.getSize();b=this.getContainerSize();this.maxPosition=c={x:Math.max(0,a.x-b.x),y:Math.max(0,a.y-b.y)};this.fireEvent("maxpositionchange",this,c)}return c},refreshMaxPosition:function(){this.maxPosition=null;this.getMaxPosition()},applyContainerSize:function(b){var c,a,d;this.givenContainerSize=b;if(b==="auto"){c=this.getContainer().dom;a=c.offsetWidth;d=c.offsetHeight}else{a=b.x;d=b.y}return{x:a,y:d}},applySize:function(b){var c,a,d;this.givenSize=b;if(b==="auto"){c=this.getElement().dom;a=c.offsetWidth;d=c.offsetHeight}else{a=b.x;d=b.y}return{x:a,y:d}},applyContainerScrollSize:function(b){var c,a,d;this.givenContainerScrollSize=b;if(b==="auto"){c=this.getContainer().dom;a=c.scrollWidth;d=c.scrollHeight}else{a=b.x;d=b.y}return{x:a,y:d}},updateAutoRefresh:function(b){var c=Ext.util.SizeMonitor,a;if(b){this.sizeMonitors={element:new c({element:this.getElement(),callback:this.doRefresh,scope:this}),container:new c({element:this.getContainer(),callback:this.doRefresh,scope:this})}}else{a=this.sizeMonitors;if(a){a.element.destroy();a.container.destroy()}}},applySlotSnapSize:function(a){if(typeof a=="number"){return{x:a,y:a}}return a},applySlotSnapOffset:function(a){if(typeof a=="number"){return{x:a,y:a}}return a},getContainer:function(){var a=this.container;if(!a){this.container=a=this.getElement().getParent();a.addCls(this.containerCls)}return a},doRefresh:function(){this.stopAnimation();this.getTranslatable().refresh();this.setSize(this.givenSize);this.setContainerSize(this.givenContainerSize);this.setContainerScrollSize(this.givenContainerScrollSize);this.setDirection(this.givenDirection);this.fireEvent("refresh",this)},refresh:function(){var a=this.sizeMonitors;if(a){a.element.refresh();a.container.refresh()}this.doRefresh();return this},scrollTo:function(c,h,g){var b=this.getTranslatable(),a=this.position,d=false,f,e;if(this.isAxisEnabled("x")){if(typeof c!="number"){c=a.x}else{if(a.x!==c){a.x=c;d=true}}f=-c}if(this.isAxisEnabled("y")){if(typeof h!="number"){h=a.y}else{if(a.y!==h){a.y=h;d=true}}e=-h}if(d){if(g!==undefined){b.translateAnimated(f,e,g)}else{this.fireEvent("scroll",this,a.x,a.y);b.doTranslate(f,e)}}return this},scrollToTop:function(b){var a=this.getInitialOffset();return this.scrollTo(a.x,a.y,b)},scrollToEnd:function(a){return this.scrollTo(0,this.getSize().y-this.getContainerSize().y,a)},scrollBy:function(b,d,c){var a=this.position;b=(typeof b=="number")?b+a.x:null;d=(typeof d=="number")?d+a.y:null;return this.scrollTo(b,d,c)},onTouchStart:function(){this.isTouching=true;this.stopAnimation()},onTouchEnd:function(){var a=this.position;this.isTouching=false;if(!this.isDragging&&this.snapToSlot()){this.fireEvent("scrollstart",this,a.x,a.y)}},onDragStart:function(l){var o=this.getDirection(),g=l.absDeltaX,f=l.absDeltaY,j=this.getDirectionLock(),i=this.startPosition,d=this.flickStartPosition,k=this.flickStartTime,h=this.lastDragPosition,c=this.position,b=this.dragDirection,n=c.x,m=c.y,a=Ext.Date.now();this.isDragging=true;if(j&&o!=="both"){if((o==="horizontal"&&g>f)||(o==="vertical"&&f>g)){l.stopPropagation()}else{this.isDragging=false;return}}h.x=n;h.y=m;d.x=n;d.y=m;i.x=n;i.y=m;k.x=a;k.y=a;b.x=0;b.y=0;this.dragStartTime=a;this.isDragging=true;this.fireEvent("scrollstart",this,n,m)},onAxisDrag:function(i,q){if(!this.isAxisEnabled(i)){return}var h=this.flickStartPosition,l=this.flickStartTime,j=this.lastDragPosition,e=this.dragDirection,g=this.position[i],k=this.getMinPosition()[i],o=this.getMaxPosition()[i],d=this.startPosition[i],p=j[i],n=d-q,c=e[i],m=this.getOutOfBoundRestrictFactor(),f=this.getStartMomentumResetTime(),b=Ext.Date.now(),a;if(n<k){n*=m}else{if(n>o){a=n-o;n=o+a*m}}if(n>p){e[i]=1}else{if(n<p){e[i]=-1}}if((c!==0&&(e[i]!==c))||(b-l[i])>f){h[i]=g;l[i]=b}j[i]=n},onDrag:function(b){if(!this.isDragging){return}var a=this.lastDragPosition;this.onAxisDrag("x",b.deltaX);this.onAxisDrag("y",b.deltaY);this.scrollTo(a.x,a.y)},onDragEnd:function(c){var b,a;if(!this.isDragging){return}this.dragEndTime=Ext.Date.now();this.onDrag(c);this.isDragging=false;b=this.getAnimationEasing("x");a=this.getAnimationEasing("y");if(b||a){this.getTranslatable().animate(b,a)}else{this.onScrollEnd()}},getAnimationEasing:function(g){if(!this.isAxisEnabled(g)){return null}var e=this.position[g],f=this.flickStartPosition[g],k=this.flickStartTime[g],c=this.getMinPosition()[g],j=this.getMaxPosition()[g],a=this.getMaxAbsoluteVelocity(),d=null,b=this.dragEndTime,l,i,h;if(e<c){d=c}else{if(e>j){d=j}}if(d!==null){l=this.getBounceEasing()[g];l.setConfig({startTime:b,startValue:-e,endValue:-d});return l}h=b-k;if(h===0){return null}i=(e-f)/(b-k);if(i===0){return null}if(i<-a){i=-a}else{if(i>a){i=a}}l=this.getMomentumEasing()[g];l.setConfig({startTime:b,startValue:-e,startVelocity:-i,minMomentumValue:-j,maxMomentumValue:0});return l},onAnimationFrame:function(c,b,d){var a=this.position;a.x=-b;a.y=-d;this.fireEvent("scroll",this,a.x,a.y)},onAxisAnimationEnd:function(a){},onAnimationEnd:function(){this.snapToBoundary();this.onScrollEnd()},stopAnimation:function(){this.getTranslatable().stopAnimation()},onScrollEnd:function(){var a=this.position;if(this.isTouching||!this.snapToSlot()){this.fireEvent("scrollend",this,a.x,a.y)}},snapToSlot:function(){var b=this.getSnapPosition("x"),a=this.getSnapPosition("y"),c=this.getSlotSnapEasing();if(b!==null||a!==null){this.scrollTo(b,a,{easingX:c.x,easingY:c.y});return true}return false},getSnapPosition:function(c){var g=this.getSlotSnapSize()[c],d=null,a,f,e,b;if(g!==0&&this.isAxisEnabled(c)){a=this.position[c];f=this.getSlotSnapOffset()[c];e=this.getMaxPosition()[c];b=(a-f)%g;if(b!==0){if(Math.abs(b)>g/2){d=a+((b>0)?g-b:b-g);if(d>e){d=a-b}}else{d=a-b}}}return d},snapToBoundary:function(){var g=this.position,c=this.getMinPosition(),f=this.getMaxPosition(),e=c.x,d=c.y,b=f.x,a=f.y,i=Math.round(g.x),h=Math.round(g.y);if(i<e){i=e}else{if(i>b){i=b}}if(h<d){h=d}else{if(h>a){h=a}}this.scrollTo(i,h)},destroy:function(){var b=this.getElement(),a=this.sizeMonitors;if(a){a.element.destroy();a.container.destroy()}if(b&&!b.isDestroyed){b.removeCls(this.cls);this.getContainer().removeCls(this.containerCls)}Ext.destroy(this.translatable);this.callParent(arguments)}},function(){});Ext.define("Ext.util.Draggable",{isDraggable:true,mixins:["Ext.mixin.Observable"],requires:["Ext.util.SizeMonitor","Ext.util.Translatable"],config:{cls:Ext.baseCSSPrefix+"draggable",draggingCls:Ext.baseCSSPrefix+"dragging",element:null,constraint:"container",disabled:null,direction:"both",translatable:{}},DIRECTION_BOTH:"both",DIRECTION_VERTICAL:"vertical",DIRECTION_HORIZONTAL:"horizontal",constructor:function(a){var b;this.sizeMonitors={};this.extraConstraint={};this.initialConfig=a;this.offset={x:0,y:0};this.listeners={dragstart:"onDragStart",drag:"onDrag",dragend:"onDragEnd",scope:this};if(a&&a.element){b=a.element;delete a.element;this.setElement(b)}return this},applyElement:function(a){if(!a){return}return Ext.get(a)},updateElement:function(a){a.on(this.listeners);this.sizeMonitors.element=new Ext.util.SizeMonitor({element:a,callback:this.doRefresh,scope:this});this.initConfig(this.initialConfig)},updateCls:function(a){this.getElement().addCls(a)},applyTranslatable:function(a,b){a=Ext.factory(a,Ext.util.Translatable,b);a.setElement(this.getElement());return a},setExtraConstraint:function(a){this.extraConstraint=a||{};this.refreshConstraint();return this},addExtraConstraint:function(a){Ext.merge(this.extraConstraint,a);this.refreshConstraint();return this},applyConstraint:function(b,a){this.currentConstraint=b;if(b==="container"){return Ext.merge(this.getContainerConstraint(),this.extraConstraint)}return Ext.merge({},this.extraConstraint,b)},updateConstraint:function(){this.refreshOffset()},getContainerConstraint:function(){var b=this.getContainer();if(!b){return{min:{x:-Infinity,y:-Infinity},max:{x:Infinity,y:Infinity}}}var g=this.getElement().dom,f=b.dom,c=g.offsetWidth,a=g.offsetHeight,e=f.offsetWidth,d=f.offsetHeight;return{min:{x:0,y:0},max:{x:e-c,y:d-a}}},getContainer:function(){var a=this.container;if(!a){a=this.getElement().getParent();if(a){this.sizeMonitors.container=new Ext.util.SizeMonitor({element:a,callback:this.doRefresh,scope:this});this.container=a}}return a},detachListeners:function(){this.getElement().un(this.listeners)},isAxisEnabled:function(a){var b=this.getDirection();if(a==="x"){return(b===this.DIRECTION_BOTH||b===this.DIRECTION_HORIZONTAL)}return(b===this.DIRECTION_BOTH||b===this.DIRECTION_VERTICAL)},onDragStart:function(a){if(this.getDisabled()){return false}var b=this.offset;this.fireAction("dragstart",[this,a,b.x,b.y],this.initDragStart)},initDragStart:function(b,c,a,d){this.dragStartOffset={x:a,y:d};this.isDragging=true;this.getElement().addCls(this.getDraggingCls())},onDrag:function(b){if(!this.isDragging){return}var a=this.dragStartOffset;this.fireAction("drag",[this,b,a.x+b.deltaX,a.y+b.deltaY],this.doDrag)},doDrag:function(b,c,a,d){b.setOffset(a,d)},onDragEnd:function(a){if(!this.isDragging){return}this.onDrag(a);this.isDragging=false;this.getElement().removeCls(this.getDraggingCls());this.fireEvent("dragend",this,a,this.offset.x,this.offset.y)},setOffset:function(i,h,b){var f=this.offset,a=this.getConstraint(),e=a.min,c=a.max,d=Math.min,g=Math.max;if(this.isAxisEnabled("x")&&typeof i=="number"){i=d(g(i,e.x),c.x)}else{i=f.x}if(this.isAxisEnabled("y")&&typeof h=="number"){h=d(g(h,e.y),c.y)}else{h=f.y}f.x=i;f.y=h;this.getTranslatable().translate(i,h,b)},getOffset:function(){return this.offset},refreshConstraint:function(){this.setConstraint(this.currentConstraint)},refreshOffset:function(){var a=this.offset;this.setOffset(a.x,a.y)},doRefresh:function(){this.refreshConstraint();this.getTranslatable().refresh();this.refreshOffset()},refresh:function(){var a=this.sizeMonitors;if(a.element){a.element.refresh()}if(a.container){a.container.refresh()}this.doRefresh()},enable:function(){return this.setDisabled(false)},disable:function(){return this.setDisabled(true)},destroy:function(){var b=this.sizeMonitors,a=this.getTranslatable();if(b.element){b.element.destroy()}if(b.container){b.container.destroy()}var c=this.getElement();if(c&&!c.isDestroyed){c.removeCls(this.getCls())}this.detachListeners();if(a){a.destroy()}}},function(){});Ext.define("Ext.behavior.Draggable",{extend:"Ext.behavior.Behavior",requires:["Ext.util.Draggable"],constructor:function(){this.listeners={painted:"onComponentPainted",scope:this};this.callParent(arguments)},onComponentPainted:function(){this.draggable.refresh()},setConfig:function(c){var a=this.draggable,b=this.component;if(c){if(!a){b.setTranslatable(true);this.draggable=a=new Ext.util.Draggable(c);a.setTranslatable(b.getTranslatable());a.setElement(b.renderElement);a.on("destroy","onDraggableDestroy",this);if(b.isPainted()){this.onComponentPainted(b)}b.on(this.listeners)}else{if(Ext.isObject(c)){a.setConfig(c)}}}else{if(a){a.destroy()}}return this},getDraggable:function(){return this.draggable},onDraggableDestroy:function(){var a=this.component;delete this.draggable;a.un(this.listeners)},onComponentDestroy:function(){var a=this.draggable;if(a){a.destroy()}}});(function(a){Ext.define("Ext.Component",{extend:"Ext.AbstractComponent",alternateClassName:"Ext.lib.Component",mixins:["Ext.mixin.Traversable"],requires:["Ext.ComponentManager","Ext.XTemplate","Ext.dom.Element","Ext.behavior.Translatable","Ext.behavior.Draggable"],xtype:"component",observableType:"component",cachedConfig:{baseCls:null,cls:null,floatingCls:null,hiddenCls:a+"item-hidden",ui:null,margin:null,padding:null,border:null,styleHtmlCls:a+"html",styleHtmlContent:null},eventedConfig:{left:null,top:null,right:null,bottom:null,width:null,height:null,minWidth:null,minHeight:null,maxWidth:null,maxHeight:null,docked:null,centered:null,hidden:null,disabled:null},config:{style:null,html:null,draggable:null,translatable:null,renderTo:null,zIndex:null,tpl:null,enterAnimation:null,exitAnimation:null,showAnimation:null,hideAnimation:null,tplWriteMode:"overwrite",data:null,disabledCls:a+"item-disabled",contentEl:null,itemId:undefined,record:null,plugins:null},listenerOptionsRegex:/^(?:delegate|single|delay|buffer|args|prepend|element)$/,alignmentRegex:/^([a-z]+)-([a-z]+)(\?)?$/,isComponent:true,floating:false,rendered:false,dockPositions:{top:true,right:true,bottom:true,left:true},innerElement:null,element:null,template:[],constructor:function(c){var d=this,b=d.config,e;d.onInitializedListeners=[];d.initialConfig=c;if(c!==undefined&&"id" in c){e=c.id}else{if("id" in b){e=b.id}else{e=d.getId()}}d.id=e;d.setId(e);Ext.ComponentManager.register(d);d.initElement();d.initConfig(d.initialConfig);d.initialize();d.triggerInitialized();if("fullscreen" in d.config){d.fireEvent("fullscreen",d)}d.fireEvent("initialize",d)},beforeInitConfig:function(b){this.beforeInitialize.apply(this,arguments)},beforeInitialize:Ext.emptyFn,initialize:Ext.emptyFn,getTemplate:function(){return this.template},getElementConfig:function(){return{reference:"element",children:this.getTemplate()}},triggerInitialized:function(){var c=this.onInitializedListeners,d=c.length,e,b;if(!this.initialized){this.initialized=true;if(d>0){for(b=0;b<d;b++){e=c[b];e.fn.call(e.scope,this)}c.length=0}}},onInitialized:function(d,c){var b=this.onInitializedListeners;if(!c){c=this}if(this.initialized){d.call(c,this)}else{b.push({fn:d,scope:c})}},renderTo:function(b,d){var f=this.renderElement.dom,e=Ext.getDom(b),c=Ext.getDom(d);if(e){if(c){e.insertBefore(f,c)}else{e.appendChild(f)}this.setRendered(Boolean(f.offsetParent))}},setParent:function(c){var b=this.parent;if(c&&b&&b!==c){b.remove(this,false)}this.parent=c;return this},applyPlugins:function(b){var d,c,e;if(!b){return b}b=[].concat(b);for(c=0,d=b.length;c<d;c++){e=b[c];b[c]=Ext.factory(e,"Ext.plugin.Plugin",null,"plugin")}return b},updatePlugins:function(e,b){var d,c;if(e){for(c=0,d=e.length;c<d;c++){e[c].init(this)}}if(b){for(c=0,d=b.length;c<d;c++){Ext.destroy(b[c])}}},updateRenderTo:function(b){this.renderTo(b)},updateStyle:function(b){this.element.dom.style.cssText+=b},updateBorder:function(b){this.element.setBorder(b)},updatePadding:function(b){this.innerElement.setPadding(b)},updateMargin:function(b){this.element.setMargin(b)},updateUi:function(b,d){var c=this.getBaseCls();if(c){if(d){this.element.removeCls(d,c)}if(b){this.element.addCls(b,c)}}},applyBaseCls:function(b){return b||a+this.xtype},updateBaseCls:function(b,c){var d=this,e=d.getUi();if(b){this.element.addCls(b);if(e){this.element.addCls(b,null,e)}}if(c){this.element.removeCls(c);if(e){this.element.removeCls(c,null,e)}}},addCls:function(b,h,j){var e=this.getCls(),g=(e)?e.slice():[],f,d,c;h=h||"";j=j||"";if(typeof b=="string"){b=[b]}f=b.length;if(!g.length&&h===""&&j===""){g=b}else{for(d=0;d<f;d++){c=h+b[d]+j;if(g.indexOf(c)==-1){g.push(c)}}}this.setCls(g)},removeCls:function(b,g,h){var d=this.getCls(),f=(d)?d.slice():[],e,c;g=g||"";h=h||"";if(typeof b=="string"){f=Ext.Array.remove(f,g+b+h)}else{e=b.length;for(c=0;c<e;c++){f=Ext.Array.remove(f,g+b[c]+h)}}this.setCls(f)},replaceCls:function(e,j,d,h){var k=this.getCls(),f=(k)?k.slice():[],g,c,b;d=d||"";h=h||"";if(typeof e=="string"){f=Ext.Array.remove(f,d+e+h)}else{if(e){g=e.length;for(c=0;c<g;c++){f=Ext.Array.remove(f,d+e[c]+h)}}}if(typeof j=="string"){f.push(d+j+h)}else{if(j){g=j.length;if(!f.length&&d===""&&h===""){f=j}else{for(c=0;c<g;c++){b=d+j[c]+h;if(f.indexOf(b)==-1){f.push(b)}}}}}this.setCls(f)},applyCls:function(b){if(typeof b=="string"){b=[b]}if(!b||!b.length){b=null}return b},updateCls:function(c,b){this.element.replaceCls(b,c)},updateStyleHtmlCls:function(d,b){var e=this.innerHtmlElement,c=this.innerElement;if(this.getStyleHtmlContent()&&b){if(e){e.replaceCls(b,d)}else{c.replaceCls(b,d)}}},applyStyleHtmlContent:function(b){return Boolean(b)},updateStyleHtmlContent:function(d){var b=this.getStyleHtmlCls(),c=this.innerElement,e=this.innerHtmlElement;if(d){if(e){e.addCls(b)}else{c.addCls(b)}}else{if(e){e.removeCls(b)}else{c.addCls(b)}}},applyContentEl:function(b){if(b){return Ext.get(b)}},updateContentEl:function(b,c){if(c){c.hide();Ext.getBody().append(c)}if(b){this.setHtml(b.dom);b.show()}},getSize:function(){return{width:this.getWidth(),height:this.getHeight()}},isCentered:function(){return Boolean(this.getCentered())},isFloating:function(){return this.floating},isDocked:function(){return Boolean(this.getDocked())},isInnerItem:function(){var b=this;return !b.isCentered()&&!b.isFloating()&&!b.isDocked()},filterPositionValue:function(b){if(b===""||b==="auto"){b=null}return b},applyTop:function(b){return this.filterPositionValue(b)},applyRight:function(b){return this.filterPositionValue(b)},applyBottom:function(b){return this.filterPositionValue(b)},applyLeft:function(b){return this.filterPositionValue(b)},doSetTop:function(b){this.updateFloating();this.element.setTop(b)},doSetRight:function(b){this.updateFloating();this.element.setRight(b)},doSetBottom:function(b){this.updateFloating();this.element.setBottom(b)},doSetLeft:function(b){this.updateFloating();this.element.setLeft(b)},doSetWidth:function(b){this.element.setWidth(b)},doSetHeight:function(b){this.element.setHeight(b)},doSetMinWidth:function(b){this.element.setMinWidth(b)},doSetMinHeight:function(b){this.element.setMinHeight(b)},doSetMaxWidth:function(b){this.element.setMaxWidth(b)},doSetMaxHeight:function(b){this.element.setMaxHeight(b)},applyCentered:function(b){b=Boolean(b);if(b){if(this.isFloating()){this.resetFloating()}if(this.isDocked()){this.setDocked(false)}}return b},doSetCentered:Ext.emptyFn,applyDocked:function(b){if(b){if(!this.dockPositions[b]){return}if(this.isFloating()){this.resetFloating()}if(this.isCentered()){this.setCentered(false)}}return b},doSetDocked:Ext.emptyFn,resetFloating:function(){this.setTop(null);this.setRight(null);this.setBottom(null);this.setLeft(null)},updateFloating:function(){var c=true,b=this.getFloatingCls();if(this.getTop()===null&&this.getBottom()===null&&this.getRight()===null&&this.getLeft()===null){c=false}if(c!==this.floating){if(c){if(this.isCentered()){this.setCentered(false)}if(this.isDocked()){this.setDocked(false)}if(b){this.addCls(b)}}else{if(b){this.removeCls(b)}}this.floating=c;this.fireEvent("floatingchange",this,c)}},updateFloatingCls:function(b,c){if(this.isFloating()){this.replaceCls(c,b)}},applyDisabled:function(b){return Boolean(b)},doSetDisabled:function(b){this.element[b?"addCls":"removeCls"](this.getDisabledCls())},updateDisabledCls:function(b,c){if(this.isDisabled()){this.element.replaceCls(c,b)}},disable:function(){this.setDisabled(true)},enable:function(){this.setDisabled(false)},isDisabled:function(){return this.getDisabled()},applyZIndex:function(b){if(b!==null){b=Number(b);if(isNaN(b)){b=null}}return b},updateZIndex:function(c){var b=this.element.dom.style;if(c!==null){b.setProperty("z-index",c,"important")}else{b.removeProperty("z-index")}},getInnerHtmlElement:function(){var b=this.innerHtmlElement,c=this.getStyleHtmlCls();if(!b||!b.dom||!b.dom.parentNode){this.innerHtmlElement=b=this.innerElement.createChild({cls:"x-innerhtml "});if(this.getStyleHtmlContent()){this.innerHtmlElement.addCls(c);this.innerElement.removeCls(c)}}return b},updateHtml:function(b){var c=this.getInnerHtmlElement();if(Ext.isElement(b)){c.setHtml("");c.append(b)}else{c.setHtml(b)}},applyHidden:function(b){return Boolean(b)},doSetHidden:function(c){var b=this.renderElement;if(c){b.hide()}else{b.show()}if(this.element){this.element[c?"addCls":"removeCls"](this.getHiddenCls())}this.fireEvent(c?"hide":"show",this)},updateHiddenCls:function(b,c){if(this.isHidden()){this.element.replaceCls(c,b)}},isHidden:function(){return this.getHidden()},hide:function(b){if(!this.getHidden()){if(b===undefined||(b&&b.isComponent)){b=this.getHideAnimation()}if(b){if(b===true){b="fadeOut"}this.onBefore({hiddenchange:"animateFn",scope:this,single:true,args:[b]})}this.setHidden(true)}return this},show:function(c){var b=this.getHidden();if(b||b===null){if(c===undefined||(c&&!c.isComponent)){c=this.getShowAnimation()}if(c){if(c===true){c="fadeIn"}this.onBefore({hiddenchange:"animateFn",scope:this,single:true,args:[c]})}this.setHidden(false)}return this},animateFn:function(g,e,h,d,c,b){if(g){var f=new Ext.fx.Animation(g);f.setElement(e.element);if(h){f.setOnEnd(function(){b.resume()});b.pause()}Ext.Animator.run(f)}},setVisibility:function(b){this.renderElement.setVisibility(b)},isRendered:function(){return this.rendered},isPainted:function(){return this.renderElement.isPainted()},applyTpl:function(b){return(Ext.isObject(b)&&b.isTemplate)?b:new Ext.XTemplate(b)},applyData:function(b){if(Ext.isObject(b)){return Ext.apply({},b)}return b},updateData:function(d){var e=this;if(d){var c=e.getTpl(),b=e.getTplWriteMode();if(c){c[b](e.getInnerHtmlElement(),d)}this.fireEvent("updatedata",e,d)}},applyRecord:function(b){if(b&&Ext.isObject(b)&&b.isModel){return b}return null},updateRecord:function(c,b){var d=this;if(b){b.unjoin(d)}if(!c){d.updateData("")}else{c.join(d);d.updateData(c.getData(true))}},afterEdit:function(){this.updateRecord(this.getRecord())},afterErase:function(){this.setRecord(null)},applyItemId:function(b){return b||this.getId()},isXType:function(c,b){if(b){return this.xtypes.indexOf(c)!=-1}return Boolean(this.xtypesMap[c])},getXTypes:function(){return this.xtypesChain.join("/")},getDraggableBehavior:function(){var b=this.draggableBehavior;if(!b){b=this.draggableBehavior=new Ext.behavior.Draggable(this)}return b},applyDraggable:function(b){this.getDraggableBehavior().setConfig(b)},getDraggable:function(){return this.getDraggableBehavior().getDraggable()},getTranslatableBehavior:function(){var b=this.translatableBehavior;if(!b){b=this.translatableBehavior=new Ext.behavior.Translatable(this)}return b},applyTranslatable:function(b){this.getTranslatableBehavior().setConfig(b)},getTranslatable:function(){return this.getTranslatableBehavior().getTranslatable()},translateAxis:function(c,e,d){var b,f;if(c==="x"){b=e}else{f=e}return this.translate(b,f,d)},translate:function(){var b=this.getTranslatable();if(!b){this.setTranslatable(true);b=this.getTranslatable()}b.translate.apply(b,arguments)},setRendered:function(c){var b=this.rendered;if(c!==b){this.rendered=c;return true}return false},setSize:function(c,b){if(c!=undefined){this.setWidth(c)}if(b!=undefined){this.setHeight(b)}},doAddListener:function(d,f,e,c,b){if(c&&"element" in c){this[c.element].doAddListener(d,f,e||this,c,b)}return this.callParent(arguments)},doRemoveListener:function(d,f,e,c,b){if(c&&"element" in c){this[c.element].doRemoveListener(d,f,e||this,c,b)}return this.callParent(arguments)},showBy:function(d,f){var c=Ext.Array.from(arguments);var b=Ext.Viewport,e=this.getParent();this.setVisibility(false);if(e!==b){b.add(this)}this.show();this.on("erased","onShowByErased",this,{single:true});b.on("resize","refreshShowBy",this,{args:[d,f]});this.currentShowByArgs=c;this.alignTo(d,f);this.setVisibility(true)},refreshShowBy:function(b,c){this.alignTo(b,c)},onShowByErased:function(){Ext.Viewport.un("resize","refreshShowBy",this)},alignTo:function(o,j){var f=o.isComponent?o.renderElement:o,c=this.renderElement,q=f.getPageBox(),B=this.getParent().element.getPageBox(),n=c.getPageBox(),y=q.height,p=q.width,t=n.height,v=n.width;B.bottom-=5;B.height-=10;B.left+=5;B.right-=5;B.top+=5;B.width-=10;if(!j||j==="auto"){if(B.bottom-q.bottom<t){if(q.top-B.top<t){if(q.left-B.left<v){j="cl-cr?"}else{j="cr-cl?"}}else{j="bc-tc?"}}else{j="tc-bc?"}}var b=j.match(this.alignmentRegex);var w=b[1].split(""),d=b[2].split(""),z=(b[3]==="?"),i=w[0],u=w[1]||i,m=d[0],l=d[1]||m,r=q.top,e=q.left,k=y/2,g=p/2,h=v/2,s=t/2,x,A;switch(i){case"t":switch(m){case"c":r+=k;break;case"b":r+=y}break;case"b":switch(m){case"c":r-=(t-k);break;case"t":r-=t;break;case"b":r-=t-y}break;case"c":switch(m){case"t":r-=s;break;case"c":r-=(s-k);break;case"b":r-=(s-y)}break}switch(u){case"l":switch(l){case"c":e+=k;break;case"r":e+=p}break;case"r":switch(l){case"r":e-=(v-p);break;case"c":e-=(v-h);break;case"l":e-=v}break;case"c":switch(l){case"l":e-=h;break;case"c":e-=(h-g);break;case"r":e-=(h-p)}break}if(z){x=(B.left+B.width)-v;A=(B.top+B.height)-t;e=Math.max(B.left,Math.min(x,e));r=Math.max(B.top,Math.min(A,r))}this.setLeft(e);this.setTop(r)},up:function(c){var b=this.parent;if(c){for(;b;b=b.parent){if(Ext.ComponentQuery.is(b,c)){return b}}}return b},getBubbleTarget:function(){return this.getParent()},destroy:function(){this.destroy=Ext.emptyFn;var e=this.getParent(),c=this.referenceList,d,f,b;if(e){e.remove(this,false)}for(d=0,f=c.length;d<f;d++){b=c[d];this[b].destroy();delete this[b]}this.setRecord(null);Ext.destroy(this.innerHtmlElement,this.getTranslatable());Ext.ComponentManager.unregister(this);this.callParent()}},function(){})})(Ext.baseCSSPrefix);Ext.define("Ext.Button",{extend:"Ext.Component",xtype:"button",cachedConfig:{pressedCls:Ext.baseCSSPrefix+"button-pressing",badgeCls:Ext.baseCSSPrefix+"badge",hasBadgeCls:Ext.baseCSSPrefix+"hasbadge",labelCls:Ext.baseCSSPrefix+"button-label",iconMaskCls:Ext.baseCSSPrefix+"icon-mask"},config:{badgeText:null,text:null,iconCls:null,icon:null,iconAlign:"left",pressedDelay:0,iconMask:null,handler:null,scope:null,autoEvent:null,ui:"normal",baseCls:Ext.baseCSSPrefix+"button"},template:[{tag:"span",reference:"badgeElement",hidden:true},{tag:"span",className:Ext.baseCSSPrefix+"button-icon",reference:"iconElement",hidden:true},{tag:"span",reference:"textElement",hidden:true}],initialize:function(){this.callParent();this.element.on({scope:this,tap:"onTap",touchstart:"onPress",touchmove:"onTouchMove",touchend:"onRelease"})},updateBadgeText:function(c){var a=this.element,b=this.badgeElement;if(c){b.show();b.setText(c)}else{b.hide()}a[(c)?"addCls":"removeCls"](this.getHasBadgeCls())},updateText:function(b){var a=this.textElement;if(b){a.show();a.setHtml(b)}else{a.hide()}},updateHtml:function(b){var a=this.textElement;if(b){a.show();a.setHtml(b)}else{a.hide()}},updateBadgeCls:function(b,a){this.badgeElement.replaceCls(a,b)},updateHasBadgeCls:function(b,c){var a=this.element;if(a.hasCls(c)){a.replaceCls(c,b)}},updateLabelCls:function(b,a){this.textElement.replaceCls(a,b)},updatePressedCls:function(b,c){var a=this.element;if(a.hasCls(c)){a.replaceCls(c,b)}},updateIcon:function(b){var c=this,a=c.iconElement;if(b){c.showIconElement();a.setStyle("background-image",b?"url("+b+")":"");c.refreshIconAlign();c.refreshIconMask()}else{c.hideIconElement();c.setIconAlign(false)}},updateIconCls:function(c,a){var d=this,b=d.iconElement;if(c){d.showIconElement();b.replaceCls(a,c);d.refreshIconAlign();d.refreshIconMask()}else{d.hideIconElement();d.setIconAlign(false)}},updateIconAlign:function(d,c){var b=this.element,a=Ext.baseCSSPrefix+"iconalign-";if(!this.getText()){d="center"}b.removeCls(a+"center");b.removeCls(a+c);if(this.getIcon()||this.getIconCls()){b.addCls(a+d)}},refreshIconAlign:function(){this.updateIconAlign(this.getIconAlign())},updateIconMaskCls:function(c,b){var a=this.iconElement;if(this.getIconMask()){a.replaceCls(b,c)}},updateIconMask:function(a){this.iconElement[a?"addCls":"removeCls"](this.getIconMaskCls())},refreshIconMask:function(){this.updateIconMask(this.getIconMask())},applyAutoEvent:function(b){var a=this;if(typeof b=="string"){b={name:b,scope:a.scope||a}}return b},updateAutoEvent:function(c){var a=c.name,b=c.scope;this.setHandler(function(){b.fireEvent(a,b,this)});this.setScope(b)},hideIconElement:function(){this.iconElement.hide()},showIconElement:function(){this.iconElement.show()},applyUi:function(a){if(a&&Ext.isString(a)){var b=a.split("-");if(b&&(b[1]=="back"||b[1]=="forward")){return b}}return a},getUi:function(){var a=this._ui;if(Ext.isArray(a)){return a.join("-")}return a},applyPressedDelay:function(a){if(Ext.isNumber(a)){return a}return(a)?100:0},onPress:function(){var a=this.element,c=this.getPressedDelay(),b=this.getPressedCls();if(!this.getDisabled()){this.isPressed=true;if(this.hasOwnProperty("releasedTimeout")){clearTimeout(this.releasedTimeout);delete this.releasedTimeout}if(c>0){this.pressedTimeout=setTimeout(function(){if(a){a.addCls(b)}},c)}else{a.addCls(b)}}},onTouchMove:function(a){return},onRelease:function(a){this.fireAction("release",[this,a],"doRelease")},doRelease:function(a,b){if(!a.isPressed){return}a.isPressed=false;if(a.hasOwnProperty("pressedTimeout")){clearTimeout(a.pressedTimeout);delete a.pressedTimeout}a.releasedTimeout=setTimeout(function(){if(a&&a.element){a.element.removeCls(a.getPressedCls())}},10)},onTap:function(a){if(this.getDisabled()){return false}this.fireAction("tap",[this,a],"doTap")},doTap:function(c,d){var b=c.getHandler(),a=c.getScope()||c;if(!b){return}if(typeof b=="string"){b=a[b]}d.preventDefault();b.apply(a,arguments)}},function(){});Ext.define("Ext.Decorator",{extend:"Ext.Component",isDecorator:true,config:{component:{}},statics:{generateProxySetter:function(a){return function(c){var b=this.getComponent();b[a].call(b,c);return this}},generateProxyGetter:function(a){return function(){var b=this.getComponent();return b[a].call(b)}}},onClassExtended:function(c,e){if(!e.hasOwnProperty("proxyConfig")){return}var f=Ext.Class,i=e.proxyConfig,d=e.config;e.config=(d)?Ext.applyIf(d,i):i;var b,h,g,a;for(b in i){if(i.hasOwnProperty(b)){h=f.getConfigNameMap(b);g=h.set;a=h.get;e[g]=this.generateProxySetter(g);e[a]=this.generateProxyGetter(a)}}},applyComponent:function(a){return Ext.factory(a,Ext.Component)},updateComponent:function(a,b){if(b){if(this.isRendered()&&b.setRendered(false)){b.fireAction("renderedchange",[this,b,false],"doUnsetComponent",this,{args:[b]})}else{this.doUnsetComponent(b)}}if(a){if(this.isRendered()&&a.setRendered(true)){a.fireAction("renderedchange",[this,a,true],"doSetComponent",this,{args:[a]})}else{this.doSetComponent(a)}}},doUnsetComponent:function(a){if(a.renderElement.dom){this.innerElement.dom.removeChild(a.renderElement.dom)}},doSetComponent:function(a){if(a.renderElement.dom){this.innerElement.dom.appendChild(a.renderElement.dom)}},setRendered:function(b){var a;if(this.callParent(arguments)){a=this.getComponent();if(a){a.setRendered(b)}return true}return false},setDisabled:function(a){this.callParent(arguments);this.getComponent().setDisabled(a)},destroy:function(){Ext.destroy(this.getComponent());this.callParent()}});Ext.define("Ext.Img",{extend:"Ext.Component",xtype:["image","img"],config:{src:null,baseCls:Ext.baseCSSPrefix+"img",mode:"background"},beforeInitialize:function(){var a=this;a.onLoad=Ext.Function.bind(a.onLoad,a);a.onError=Ext.Function.bind(a.onError,a)},initialize:function(){var a=this;a.callParent();a.relayEvents(a.renderElement,"*");a.element.on({tap:"onTap",scope:a})},hide:function(){this.callParent();this.hiddenSrc=this.hiddenSrc||this.getSrc();this.setSrc(null)},show:function(){this.callParent();if(this.hiddenSrc){this.setSrc(this.hiddenSrc);delete this.hiddenSrc}},updateMode:function(a){if(a==="background"){if(this.imageElement){this.imageElement.destroy();delete this.imageElement;this.updateSrc(this.getSrc())}}else{this.imageElement=this.element.createChild({tag:"img"})}},onTap:function(a){this.fireEvent("tap",this,a)},onAfterRender:function(){this.updateSrc(this.getSrc())},updateSrc:function(a){var b=this,c;if(b.getMode()==="background"){c=this.imageObject||new Image()}else{c=b.imageElement.dom}this.imageObject=c;c.setAttribute("src",Ext.isString(a)?a:"");c.addEventListener("load",b.onLoad,false);c.addEventListener("error",b.onError,false)},detachListeners:function(){var a=this.imageObject;if(a){a.removeEventListener("load",this.onLoad,false);a.removeEventListener("error",this.onError,false)}},onLoad:function(a){this.detachListeners();if(this.getMode()==="background"){this.element.dom.style.backgroundImage='url("'+this.imageObject.src+'")'}this.fireEvent("load",this,a)},onError:function(a){this.detachListeners();this.fireEvent("error",this,a)},doSetWidth:function(b){var a=(this.getMode()==="background")?this.element:this.imageElement;a.setWidth(b);this.callParent(arguments)},doSetHeight:function(b){var a=(this.getMode()==="background")?this.element:this.imageElement;a.setHeight(b);this.callParent(arguments)},destroy:function(){this.detachListeners();Ext.destroy(this.imageObject);delete this.imageObject;this.callParent()}});Ext.define("Ext.Label",{extend:"Ext.Component",xtype:"label",config:{}});Ext.define("Ext.Map",{extend:"Ext.Component",xtype:"map",requires:["Ext.util.GeoLocation"],isMap:true,config:{baseCls:Ext.baseCSSPrefix+"map",useCurrentLocation:false,map:null,geo:null,mapOptions:{}},constructor:function(){this.callParent(arguments);this.options={};this.element.setVisibilityMode(Ext.Element.OFFSETS);if(!(window.google||{}).maps){this.setHtml("Google Maps API is required")}},initialize:function(){this.callParent();this.on({painted:"doResize",scope:this});this.element.on("touchstart","onTouchStart",this)},onTouchStart:function(a){a.makeUnpreventable()},applyMapOptions:function(a){return Ext.merge({},this.options,a)},updateMapOptions:function(c){var b=(window.google||{}).maps,a=this.getMap();if(b&&a){a.setOptions(c)}},getMapOptions:function(){return Ext.merge({},this.options)},updateUseCurrentLocation:function(a){this.setGeo(a);if(!a){this.renderMap()}},applyGeo:function(a){return Ext.factory(a,Ext.util.GeoLocation,this.getGeo())},updateGeo:function(b,a){var c={locationupdate:"onGeoUpdate",locationerror:"onGeoError",scope:this};if(a){a.un(c)}if(b){b.on(c);b.updateLocation()}},doResize:function(){var b=(window.google||{}).maps,a=this.getMap();if(b&&a){b.event.trigger(a,"resize")}},renderMap:function(){var d=this,f=(window.google||{}).maps,b=d.element,a=d.getMapOptions(),e=d.getMap(),c;if(f){if(Ext.os.is.iPad){Ext.merge({navigationControlOptions:{style:f.NavigationControlStyle.ZOOM_PAN}},a)}a=Ext.merge({zoom:12,mapTypeId:f.MapTypeId.ROADMAP},a);if(!a.hasOwnProperty("center")){a.center=new f.LatLng(37.381592,-122.135672)}if(b.dom.firstChild){Ext.fly(b.dom.firstChild).destroy()}if(e){f.event.clearInstanceListeners(e)}d.setMap(new f.Map(b.dom,a));e=d.getMap();c=f.event;c.addListener(e,"zoom_changed",Ext.bind(d.onZoomChange,d));c.addListener(e,"maptypeid_changed",Ext.bind(d.onTypeChange,d));c.addListener(e,"center_changed",Ext.bind(d.onCenterChange,d));d.fireEvent("maprender",d,e)}},onGeoUpdate:function(a){if(a){this.setMapCenter(new google.maps.LatLng(a.getLatitude(),a.getLongitude()))}},onGeoError:Ext.emptyFn,setMapCenter:function(d){var a=this,c=a.getMap(),b=(window.google||{}).maps;if(b){if(!a.isPainted()){a.un("painted","setMapCenter",this);a.on("painted","setMapCenter",this,{single:true,args:[d]});return}d=d||new b.LatLng(37.381592,-122.135672);if(d&&!(d instanceof b.LatLng)&&"longitude" in d){d=new b.LatLng(d.latitude,d.longitude)}if(!c){a.renderMap();c=a.getMap()}if(c&&d instanceof b.LatLng){c.panTo(d)}else{this.options=Ext.apply(this.getMapOptions(),{center:d})}}},onZoomChange:function(){var a=this.getMapOptions(),c=this.getMap(),b;b=(c&&c.getZoom)?c.getZoom():a.zoom||10;this.options=Ext.apply(a,{zoom:b});this.fireEvent("zoomchange",this,c,b)},onTypeChange:function(){var b=this.getMapOptions(),c=this.getMap(),a;a=(c&&c.getMapTypeId)?c.getMapTypeId():b.mapTypeId;this.options=Ext.apply(b,{mapTypeId:a});this.fireEvent("typechange",this,c,a)},onCenterChange:function(){var b=this.getMapOptions(),c=this.getMap(),a;a=(c&&c.getCenter)?c.getCenter():b.center;this.options=Ext.apply(b,{center:a});this.fireEvent("centerchange",this,c,a)},destroy:function(){Ext.destroy(this.getGeo());var a=this.getMap();if(a&&(window.google||{}).maps){google.maps.event.clearInstanceListeners(a)}this.callParent()}},function(){});Ext.define("Ext.Mask",{extend:"Ext.Component",xtype:"mask",config:{baseCls:Ext.baseCSSPrefix+"mask",transparent:false,top:0,left:0,right:0,bottom:0},initialize:function(){this.callParent();this.on({painted:"onPainted",erased:"onErased"})},onPainted:function(){this.element.on("*","onEvent",this)},onErased:function(){this.element.un("*","onEvent",this)},onEvent:function(b){var a=arguments[arguments.length-1];if(a.info.eventName==="tap"){this.fireEvent("tap",this,b);return false}if(b&&b.stopEvent){b.stopEvent()}return false},updateTransparent:function(a){this[a?"addCls":"removeCls"](this.getBaseCls()+"-transparent")}});Ext.define("Ext.LoadMask",{extend:"Ext.Mask",xtype:"loadmask",config:{message:"Loading...",messageCls:Ext.baseCSSPrefix+"mask-message",indicator:true,listeners:{painted:"onPainted",erased:"onErased"}},getTemplate:function(){var a=Ext.baseCSSPrefix;return[{reference:"innerElement",cls:a+"mask-inner",children:[{reference:"indicatorElement",cls:a+"loading-spinner-outer",children:[{cls:a+"loading-spinner",children:[{tag:"span",cls:a+"loading-top"},{tag:"span",cls:a+"loading-right"},{tag:"span",cls:a+"loading-bottom"},{tag:"span",cls:a+"loading-left"}]}]},{reference:"messageElement"}]}]},updateMessage:function(a){this.messageElement.setHtml(a)},updateMessageCls:function(b,a){this.messageElement.replaceCls(a,b)},updateIndicator:function(a){this[a?"removeCls":"addCls"](Ext.baseCSSPrefix+"indicator-hidden")},onPainted:function(){this.getParent().on({scope:this,resize:this.refreshPosition});this.refreshPosition()},onErased:function(){this.getParent().un({scope:this,resize:this.refreshPosition})},refreshPosition:function(){var c=this.getParent(),d=c.getScrollable(),a=(d)?d.getScroller():null,f=(a)?a.position:{x:0,y:0},e=c.element.getSize(),b=this.element.getSize();this.innerElement.setStyle({marginTop:Math.round(e.height-b.height+(f.y*2))+"px",marginLeft:Math.round(e.width-b.width+f.x)+"px"})}},function(){});Ext.define("Ext.Media",{extend:"Ext.Component",xtype:"media",config:{url:"",enableControls:Ext.os.is.Android?false:true,autoResume:false,autoPause:true,preload:true,loop:false,media:null,playing:false,volume:1,muted:false},initialize:function(){var a=this;a.callParent();a.on({scope:a,activate:a.onActivate,deactivate:a.onDeactivate});a.addMediaListener({play:"onPlay",pause:"onPause",ended:"onEnd",volumechange:"onVolumeChange",timeupdate:"onTimeUpdate"})},addMediaListener:function(d,b){var c=this,e=c.media.dom,f=Ext.Function.bind;if(!Ext.isObject(d)){var a=d;d={};d[a]=b}Ext.Object.each(d,function(h,g){if(typeof g!=="function"){g=c[g]}if(typeof g=="function"){g=f(g,c);e.addEventListener(h,g)}})},onPlay:function(){this.fireEvent("play",this)},onPause:function(){this.fireEvent("pause",this,this.getCurrentTime())},onEnd:function(){this.fireEvent("ended",this,this.getCurrentTime())},onVolumeChange:function(){this.fireEvent("volumechange",this,this.media.dom.volume)},onTimeUpdate:function(){this.fireEvent("timeupdate",this,this.getCurrentTime())},isPlaying:function(){return this.getPlaying()},onActivate:function(){var a=this;if(a.getAutoResume()&&!a.isPlaying()){a.play()}},onDeactivate:function(){var a=this;if(a.getAutoResume()&&a.isPlaying()){a.pause()}},updateUrl:function(a){var b=this.media.dom;b.src=a;b.load();if(this.getPlaying()){this.play()}},updateEnableControls:function(a){this.media.dom.controls=a?"controls":false},updateLoop:function(a){this.media.dom.loop=a?"loop":false},play:function(){this.media.dom.play();this.setPlaying(true)},pause:function(){this.media.dom.pause();this.setPlaying(false)},toggle:function(){if(this.isPlaying()){this.pause()}else{this.play()}},stop:function(){var a=this;a.setCurrentTime(0);a.fireEvent("stop",a);a.pause()},updateVolume:function(a){this.media.dom.volume=a},updateMuted:function(a){this.fireEvent("mutedchange",this,a);this.media.dom.muted=a},getCurrentTime:function(){return this.media.dom.currentTime},setCurrentTime:function(a){this.media.dom.currentTime=a;return a},getDuration:function(){return this.media.dom.duration},destroy:function(){var a=this;Ext.Object.each(event,function(c,b){if(typeof b!=="function"){b=a[b]}if(typeof b=="function"){b=bind(b,a);dom.removeEventListener(c,b)}})}});Ext.define("Ext.Audio",{extend:"Ext.Media",xtype:"audio",config:{cls:Ext.baseCSSPrefix+"audio"},onActivate:function(){var a=this;a.callParent();if(Ext.os.is.Phone){a.element.show()}},onDeactivate:function(){var a=this;a.callParent();if(Ext.os.is.Phone){a.element.hide()}},template:[{reference:"media",preload:"auto",tag:"audio",cls:Ext.baseCSSPrefix+"component"}]});Ext.define("Ext.Spacer",{extend:"Ext.Component",alias:"widget.spacer",config:{},constructor:function(a){a=a||{};if(!a.width){a.flex=1}this.callParent([a])}});Ext.define("Ext.Title",{extend:"Ext.Component",xtype:"title",config:{baseCls:"x-title",title:""},updateTitle:function(a){this.setHtml(a)}});Ext.define("Ext.Video",{extend:"Ext.Media",xtype:"video",config:{posterUrl:null,cls:Ext.baseCSSPrefix+"video"},template:[{reference:"ghost",classList:[Ext.baseCSSPrefix+"video-ghost"]},{tag:"video",reference:"media",classList:[Ext.baseCSSPrefix+"media"]}],initialize:function(){var a=this;a.callParent();a.media.hide();a.onBefore({erased:"onErased",scope:a});a.ghost.on({tap:"onGhostTap",scope:a});a.media.on({pause:"onPause",scope:a});if(Ext.os.is.Android4||Ext.os.is.iPad){this.isInlineVideo=true}},applyUrl:function(a){return[].concat(a)},updateUrl:function(f){var c=this,e=c.media,g=f.length,d=e.query("source"),b=d.length,a;for(a=0;a<b;a++){Ext.fly(d[a]).destroy()}for(a=0;a<g;a++){e.appendChild(Ext.Element.create({tag:"source",src:f[a]}))}if(c.getPlaying()){c.play()}},onErased:function(){this.pause();this.media.setTop(-2000);this.ghost.show()},onGhostTap:function(){var a=this,c=this.media,b=this.ghost;c.show();if(Ext.os.is.Android2){setTimeout(function(){a.play();setTimeout(function(){c.hide()},10)},10)}else{b.hide();a.play();setTimeout(function(){a.play()},10)}},onPause:function(){this.callParent(arguments);if(!this.isInlineVideo){this.media.setTop(-2000);this.ghost.show()}},onPlay:function(){this.callParent(arguments);this.media.setTop(0)},updatePosterUrl:function(b){var a=this.ghost;if(a){a.setStyle("background-image","url("+b+")")}}});Ext.define("Ext.carousel.Indicator",{extend:"Ext.Component",xtype:"carouselindicator",alternateClassName:"Ext.Carousel.Indicator",config:{baseCls:Ext.baseCSSPrefix+"carousel-indicator",direction:"horizontal"},initialize:function(){this.callParent();this.indicators=[];this.element.on({tap:"onTap",scope:this})},updateDirection:function(a,c){var b=this.getBaseCls();this.element.replaceCls(c,a,b);if(a==="horizontal"){this.setBottom(0);this.setRight(null)}else{this.setRight(0);this.setBottom(null)}},addIndicator:function(){this.indicators.push(this.element.createChild({tag:"span"}))},removeIndicator:function(){var a=this.indicators;if(a.length>0){a.pop().destroy()}},setActiveIndex:function(b){var e=this.indicators,d=this.activeIndex,a=e[d],f=e[b],c=this.getBaseCls();if(a){a.removeCls(c,null,"active")}if(f){f.addCls(c,null,"active")}this.activeIndex=b;return this},onTap:function(f){var g=f.touch,a=this.element.getPageBox(),d=a.left+(a.width/2),b=a.top+(a.height/2),c=this.getDirection();if((c==="horizontal"&&g.pageX>=d)||(c==="vertical"&&g.pageY>=b)){this.fireEvent("next",this)}else{this.fireEvent("previous",this)}},destroy:function(){var d=this.indicators,b,c,a;for(b=0,c=d.length;b<c;b++){a=d[b];a.destroy()}d.length=0;this.callParent()}});Ext.define("Ext.carousel.Item",{extend:"Ext.Decorator",config:{baseCls:"x-carousel-item",component:null,translatable:true}});Ext.define("Ext.dataview.IndexBar",{extend:"Ext.Component",alternateClassName:"Ext.IndexBar",config:{baseCls:Ext.baseCSSPrefix+"indexbar",direction:"vertical",letters:["A","B","C","D","E","F","G","H","I","J","K","L","M","N","O","P","Q","R","S","T","U","V","W","X","Y","Z"],ui:"alphabet",listPrefix:null},itemCls:Ext.baseCSSPrefix+"",updateDirection:function(a,c){var b=this.getBaseCls();this.element.replaceCls(b+"-"+c,b+"-"+a)},getElementConfig:function(){return{reference:"wrapper",classList:["x-centered","x-indexbar-wrapper"],children:[this.callParent()]}},updateLetters:function(c){this.innerElement.setHtml("");if(c){var b=c.length,a;for(a=0;a<b;a++){this.innerElement.createChild({html:c[a]})}}},updateListPrefix:function(a){if(a&&a.length){this.innerElement.createChild({html:a},0)}},initialize:function(){this.callParent();this.innerElement.on({touchstart:this.onTouchStart,touchend:this.onTouchEnd,touchmove:this.onTouchMove,scope:this})},onTouchStart:function(b,a){b.stopPropagation();this.innerElement.addCls(this.getBaseCls()+"-pressed");this.pageBox=this.innerElement.getPageBox();this.onTouchMove(b)},onTouchEnd:function(b,a){this.innerElement.removeCls(this.getBaseCls()+"-pressed")},onTouchMove:function(c){var a=Ext.util.Point.fromEvent(c),b,d=this.pageBox;if(!d){d=this.pageBox=this.el.getPageBox()}if(this.getDirection()==="vertical"){if(a.y>d.bottom||a.y<d.top){return}b=Ext.Element.fromPoint(d.left+(d.width/2),a.y)}else{if(a.x>d.right||a.x<d.left){return}b=Ext.Element.fromPoint(a.x,d.top+(d.height/2))}if(b){this.fireEvent("index",this,b.dom.innerHTML,b)}},destroy:function(){var c=this,d=Array.prototype.slice.call(c.innerElement.dom.childNodes),b=d.length,a=0;for(;a<b;a++){Ext.removeNode(d[a])}this.callParent()}},function(){});Ext.define("Ext.dataview.ListItemHeader",{extend:"Ext.Component",xtype:"listitemheader",config:{baseCls:Ext.baseCSSPrefix+"list-header",docked:"top"}});Ext.define("Ext.dataview.element.Container",{extend:"Ext.Component",doInitialize:function(){this.element.on({touchstart:"onItemTouchStart",touchend:"onItemTouchEnd",tap:"onItemTap",taphold:"onItemTapHold",touchmove:"onItemTouchMove",doubletap:"onItemDoubleTap",swipe:"onItemSwipe",delegate:"> div",scope:this})},initialize:function(){this.callParent();this.doInitialize()},updateBaseCls:function(a,b){var c=this;c.callParent([a+"-container",b])},onItemTouchStart:function(d){var b=this,c=d.getTarget(),a=b.getViewItems().indexOf(c);Ext.get(c).on({touchmove:"onItemTouchMove",scope:b,single:true});b.fireEvent("itemtouchstart",b,Ext.get(c),a,d)},onItemTouchEnd:function(d){var b=this,c=d.getTarget(),a=b.getViewItems().indexOf(c);Ext.get(c).un({touchmove:"onItemTouchMove",scope:b});b.fireEvent("itemtouchend",b,Ext.get(c),a,d)},onItemTouchMove:function(d){var b=this,c=d.getTarget(),a=b.getViewItems().indexOf(c);b.fireEvent("itemtouchmove",b,Ext.get(c),a,d)},onItemTap:function(d){var b=this,c=d.getTarget(),a=b.getViewItems().indexOf(c);b.fireEvent("itemtap",b,Ext.get(c),a,d)},onItemTapHold:function(d){var b=this,c=d.getTarget(),a=b.getViewItems().indexOf(c);b.fireEvent("itemtaphold",b,Ext.get(c),a,d)},onItemDoubleTap:function(d){var b=this,c=d.getTarget(),a=b.getViewItems().indexOf(c);b.fireEvent("itemdoubletap",b,Ext.get(c),a,d)},onItemSwipe:function(d){var b=this,c=d.getTarget(),a=b.getViewItems().indexOf(c);b.fireEvent("itemswipe",b,Ext.get(c),a,d)},updateListItem:function(b,d){var c=this,a=c.dataview,e=a.prepareData(b.getData(true),a.getStore().indexOf(b),b);d.innerHTML=c.dataview.getItemTpl().apply(e)},addListItem:function(e,c){var h=this,d=h.dataview,a=d.prepareData(c.getData(true),d.getStore().indexOf(c),c),b=h.element,i=b.dom.childNodes,g=i.length,f;f=Ext.Element.create(this.getItemElementConfig(e,a));if(!g||e==g){f.appendTo(b)}else{f.insertBefore(i[e])}},getItemElementConfig:function(c,e){var b=this.dataview,d=b.getItemCls(),a=b.getBaseCls()+"-item";if(d){a+=" "+d}return{cls:a,html:b.getItemTpl().apply(e)}},doRemoveItemCls:function(a){var d=this.getViewItems(),c=d.length,b=0;for(;b<c;b++){Ext.fly(d[b]).removeCls(a)}},doAddItemCls:function(a){var d=this.getViewItems(),c=d.length,b=0;for(;b<c;b++){Ext.fly(d[b]).addCls(a)}},moveItemsToCache:function(f,e){var d=this,a=d.getViewItems(),b=e-f,c;for(;b>=0;b--){c=a[f+b];c.parentNode.removeChild(c)}if(d.getViewItems().length==0){this.dataview.showEmptyText()}},moveItemsFromCache:function(d){var g=this,b=g.dataview,c=b.getStore(),f=d.length,e,a;if(f){b.hideEmptyText()}for(e=0;e<f;e++){d[e]._tmpIndex=c.indexOf(d[e])}Ext.Array.sort(d,function(i,h){return i._tmpIndex>h._tmpIndex?1:-1});for(e=0;e<f;e++){a=d[e];g.addListItem(a._tmpIndex,a);delete a._tmpIndex}},getViewItems:function(){return Array.prototype.slice.call(this.element.dom.childNodes)},destroy:function(){var c=this.getViewItems(),b=c.length,a=0;for(;a<b;a++){Ext.removeNode(c[a])}this.callParent()}});Ext.define("Ext.dataview.element.List",{extend:"Ext.dataview.element.Container",updateBaseCls:function(a){var b=this;b.itemClsShortCache=a+"-item";b.headerClsShortCache=a+"-header";b.headerClsCache="."+b.headerClsShortCache;b.headerItemClsShortCache=a+"-header-item";b.footerClsShortCache=a+"-footer-item";b.footerClsCache="."+b.footerClsShortCache;b.labelClsShortCache=a+"-item-label";b.labelClsCache="."+b.labelClsShortCache;b.disclosureClsShortCache=a+"-disclosure";b.disclosureClsCache="."+b.disclosureClsShortCache;b.iconClsShortCache=a+"-icon";b.iconClsCache="."+b.iconClsShortCache;this.callParent(arguments)},hiddenDisplayCache:Ext.baseCSSPrefix+"hidden-display",getItemElementConfig:function(e,h){var f=this,c=f.dataview,g=c.getItemCls(),b=f.itemClsShortCache,d,a;if(g){b+=" "+g}d={cls:b,children:[{cls:f.labelClsShortCache,html:c.getItemTpl().apply(h)}]};if(c.getIcon()){a=h.iconSrc;d.children.push({cls:f.iconClsShortCache,style:"background-image: "+a?'url("'+newSrc+'")':""})}if(c.getOnItemDisclosure()){d.children.push({cls:f.disclosureClsShortCache+((h.disclosure===false)?f.hiddenDisplayCache:"")})}return d},updateListItem:function(b,j){var g=this,c=g.dataview,i=Ext.fly(j),f=i.down(g.labelClsCache,true),a=b.data,d=a&&a.hasOwnProperty("disclosure"),k=a&&a.hasOwnProperty("iconSrc"),e,h;f.innerHTML=c.getItemTpl().apply(a);if(d&&c.getOnItemDisclosure()){e=i.down(g.disclosureClsCache);e[d?"removeCls":"addCls"](g.hiddenDisplayCache)}if(c.getIcon()){h=i.down(g.iconClsCache,true);h.style.backgroundImage=k?'url("'+k+'")':""}},doRemoveHeaders:function(){var e=this,a=e.headerItemClsShortCache,b=e.element.query(e.headerClsCache),f=b.length,c=0,d;for(;c<f;c++){d=b[c];Ext.fly(d.parentNode).removeCls(a);Ext.removeNode(d)}},doRemoveFooterCls:function(){var d=this,c=d.footerClsShortCache,a=d.element.query(d.footerClsCache),e=a.length,b=0;for(;b<e;b++){Ext.fly(a[b]).removeCls(c)}},doAddHeader:function(b,a){b=Ext.fly(b);b.insertFirst(Ext.Element.create({cls:this.headerClsShortCache,html:a}));b.addCls(this.headerItemClsShortCache)},destroy:function(){this.doRemoveHeaders();this.callParent()}});Ext.define("Ext.event.publisher.ComponentDelegation",{extend:"Ext.event.publisher.Publisher",requires:["Ext.Component","Ext.ComponentQuery"],targetType:"component",optimizedSelectorRegex:/^#([\w\-]+)((?:[\s]*)>(?:[\s]*)|(?:\s*))([\w\-]+)$/i,handledEvents:["*"],getSubscribers:function(b,a){var d=this.subscribers,c=d[b];if(!c&&a){c=d[b]={type:{$length:0},selector:[],$length:0}}return c},subscribe:function(g,f){if(this.idSelectorRegex.test(g)){return false}var e=g.match(this.optimizedSelectorRegex),a=this.getSubscribers(f,true),k=a.type,c=a.selector,d,i,j,b,h;if(e!==null){d=e[1];i=e[2].indexOf(">")===-1;j=e[3];b=k[j];if(!b){k[j]=b={descendents:{$length:0},children:{$length:0},$length:0}}h=i?b.descendents:b.children;if(h.hasOwnProperty(d)){h[d]++;return true}h[d]=1;h.$length++;b.$length++;k.$length++}else{if(c.hasOwnProperty(g)){c[g]++;return true}c[g]=1;c.push(g)}a.$length++;return true},unsubscribe:function(g,f,k){var a=this.getSubscribers(f);if(!a){return false}var e=g.match(this.optimizedSelectorRegex),l=a.type,c=a.selector,d,i,j,b,h;k=Boolean(k);if(e!==null){d=e[1];i=e[2].indexOf(">")===-1;j=e[3];b=l[j];if(!b){return true}h=i?b.descendents:b.children;if(!h.hasOwnProperty(d)||(!k&&--h[d]>0)){return true}delete h[d];h.$length--;b.$length--;l.$length--}else{if(!c.hasOwnProperty(g)||(!k&&--c[g]>0)){return true}delete c[g];Ext.Array.remove(c,g)}if(--a.$length===0){delete this.subscribers[f]}return true},notify:function(d,a){var c=this.getSubscribers(a),e,b;if(!c||c.$length===0){return false}e=d.substr(1);b=Ext.ComponentManager.get(e);if(b){this.dispatcher.doAddListener(this.targetType,d,a,"publish",this,{args:[a,b]},"before")}},matchesSelector:function(b,a){return Ext.ComponentQuery.is(b,a)},dispatch:function(d,b,c,a){this.dispatcher.doDispatchEvent(this.targetType,d,b,c,null,a)},publish:function(g,k){var e=this.getSubscribers(g);if(!e){return}var p=arguments[arguments.length-1],o=e.type,b=e.selector,d=Array.prototype.slice.call(arguments,2,-2),l=k.xtypesChain,s,n,t,a,m,v,r,u,h,f,q,c;for(u=0,h=l.length;u<h;u++){f=l[u];e=o[f];if(e&&e.$length>0){s=e.descendents;if(s.$length>0){if(!a){a=k.getAncestorIds()}for(q=0,c=a.length;q<c;q++){m=a[q];if(s.hasOwnProperty(m)){this.dispatch("#"+m+" "+f,g,d,p)}}}n=e.children;if(n.$length>0){if(!t){if(a){t=a[0]}else{v=k.getParent();if(v){t=v.getId()}}}if(t){if(n.hasOwnProperty(t)){this.dispatch("#"+t+" > "+f,g,d,p)}}}}}h=b.length;if(h>0){for(u=0;u<h;u++){r=b[u];if(this.matchesSelector(k,r)){this.dispatch(r,g,d,p)}}}}});Ext.define("Ext.field.Input",{extend:"Ext.Component",xtype:"input",tag:"input",cachedConfig:{cls:Ext.baseCSSPrefix+"form-field",focusCls:Ext.baseCSSPrefix+"field-focus",maskCls:Ext.baseCSSPrefix+"field-mask",useMask:"auto",type:"text",checked:false},config:{baseCls:Ext.baseCSSPrefix+"field-input",name:null,value:null,isFocused:false,tabIndex:null,placeHolder:null,minValue:null,maxValue:null,stepValue:null,maxLength:null,autoComplete:null,autoCapitalize:null,autoCorrect:null,readOnly:null,maxRows:null,startValue:false},getTemplate:function(){var a=[{reference:"input",tag:this.tag},{reference:"clearIcon",cls:"x-clear-icon"}];a.push({reference:"mask",classList:[this.config.maskCls]});return a},initElement:function(){var a=this;a.callParent();a.input.on({scope:a,keyup:"onKeyUp",focus:"onFocus",blur:"onBlur",paste:"onPaste"});a.mask.on({tap:"onMaskTap",scope:a});if(a.clearIcon){a.clearIcon.on({tap:"onClearIconTap",scope:a})}},applyUseMask:function(a){if(a==="auto"){a=Ext.os.is.iOS&&Ext.os.version.lt("5")}return Boolean(a)},updateUseMask:function(a){this.mask[a?"show":"hide"]()},updateFieldAttribute:function(b,c){var a=this.input;if(c){a.dom.setAttribute(b,c)}else{a.dom.removeAttribute(b)}},updateCls:function(b,a){this.input.addCls(Ext.baseCSSPrefix+"input-el");this.input.replaceCls(a,b)},updateType:function(a,c){var b=Ext.baseCSSPrefix+"input-";this.input.replaceCls(b+c,b+a);this.updateFieldAttribute("type",a)},updateName:function(a){this.updateFieldAttribute("name",a)},getValue:function(){var a=this.input;if(a){this._value=a.dom.value}return this._value},applyValue:function(a){return(Ext.isEmpty(a))?"":a},updateValue:function(b){var a=this.input;if(a){a.dom.value=b}},setValue:function(a){this.updateValue(this.applyValue(a));return this},updateTabIndex:function(a){this.updateFieldAttribute("tabIndex",a)},testAutoFn:function(a){return[true,"on"].indexOf(a)!==-1},updateMaxLength:function(a){this.updateFieldAttribute("maxlength",a)},updatePlaceHolder:function(a){this.updateFieldAttribute("placeholder",a)},applyAutoComplete:function(a){return this.testAutoFn(a)},updateAutoComplete:function(a){var b=a?"on":"off";this.updateFieldAttribute("autocomplete",b)},applyAutoCapitalize:function(a){return this.testAutoFn(a)},updateAutoCapitalize:function(b){var a=b?"on":"off";this.updateFieldAttribute("autocapitalize",a)},applyAutoCorrect:function(a){return this.testAutoFn(a)},updateAutoCorrect:function(a){var b=a?"on":"off";this.updateFieldAttribute("autocorrect",b)},updateMinValue:function(a){this.updateFieldAttribute("min",a)},updateMaxValue:function(a){this.updateFieldAttribute("max",a)},updateStepValue:function(a){this.updateFieldAttribute("step",a)},checkedRe:/^(true|1|on)/i,getChecked:function(){var a=this.input,b;if(a){b=a.dom.checked;this._checked=b}return b},applyChecked:function(a){return !!this.checkedRe.test(String(a))},setChecked:function(a){this.updateChecked(this.applyChecked(a));this._checked=a},updateChecked:function(a){this.input.dom.checked=a},updateReadOnly:function(a){this.updateFieldAttribute("readonly",a)},updateMaxRows:function(a){this.updateFieldAttribute("rows",a)},doSetDisabled:function(a){this.callParent(arguments);this.input.dom.disabled=a;if(!a){this.blur()}},isDirty:function(){if(this.getDisabled()){return false}return String(this.getValue())!==String(this.originalValue)},reset:function(){this.setValue(this.originalValue)},onMaskTap:function(a){this.fireAction("masktap",[this,a],"doMaskTap")},doMaskTap:function(a,b){if(a.getDisabled()){return false}a.maskCorrectionTimer=Ext.defer(a.showMask,1000,a);a.hideMask()},showMask:function(a){if(this.mask){this.mask.setStyle("display","block")}},hideMask:function(a){if(this.mask){this.mask.setStyle("display","none")}},focus:function(){var b=this,a=b.input;if(a&&a.dom.focus){a.dom.focus()}return b},blur:function(){var b=this,a=this.input;if(a&&a.dom.blur){a.dom.blur()}return b},select:function(){var b=this,a=b.input;if(a&&a.dom.setSelectionRange){a.dom.setSelectionRange(0,9999)}return b},onFocus:function(a){this.fireAction("focus",[a],"doFocus")},doFocus:function(b){var a=this;if(a.mask){if(a.maskCorrectionTimer){clearTimeout(a.maskCorrectionTimer)}a.hideMask()}if(!a.getIsFocused()){a.setIsFocused(true);a.setStartValue(a.getValue())}},onBlur:function(a){this.fireAction("blur",[a],"doBlur")},doBlur:function(d){var b=this,c=b.getValue(),a=b.getStartValue();b.setIsFocused(false);if(String(c)!=String(a)){b.onChange(b,c,a)}b.showMask()},onClearIconTap:function(c){var a=this.getValue(),b;this.fireEvent("clearicontap",this,c);b=this.getValue();if(String(b)!=String(a)){this.onChange(this,b,a)}if(Ext.os.is.Android){this.focus()}},onClick:function(a){this.fireEvent("click",a)},onChange:function(b,c,a){this.fireEvent("change",b,c,a)},onKeyUp:function(a){this.fireEvent("keyup",a)},onPaste:function(a){this.fireEvent("paste",a)},onMouseDown:function(a){this.fireEvent("mousedown",a)}});Ext.define("Ext.field.Field",{extend:"Ext.Decorator",alternateClassName:"Ext.form.Field",xtype:"field",requires:["Ext.field.Input"],isField:true,isFormField:true,config:{baseCls:Ext.baseCSSPrefix+"field",label:null,labelAlign:"left",labelWidth:"30%",clearIcon:null,required:false,inputType:null,name:null,value:null,tabIndex:null},cachedConfig:{labelCls:null,requiredCls:Ext.baseCSSPrefix+"field-required",inputCls:null},getElementConfig:function(){var a=Ext.baseCSSPrefix;return{reference:"element",className:"x-container",children:[{reference:"label",cls:a+"form-label",children:[{reference:"labelspan",tag:"span"}]},{reference:"innerElement",cls:a+"component-outer"}]}},updateLabel:function(b,d){var a=this.renderElement,c=Ext.baseCSSPrefix;if(b){this.labelspan.setHtml(b);a.addCls(c+"field-labeled")}else{a.removeCls(c+"field-labeled")}},updateLabelAlign:function(b,c){var a=this.renderElement,d=Ext.baseCSSPrefix;if(b){a.addCls(d+"label-align-"+b);if(b=="top"){this.label.setWidth("100%")}else{this.updateLabelWidth(this.getLabelWidth())}}if(c){a.removeCls(d+"label-align-"+c)}},updateLabelCls:function(a,b){if(a){this.label.addCls(a)}if(b){this.label.removeCls(b)}},updateLabelWidth:function(a){if(a){if(this.getLabelAlign()=="top"){this.label.setWidth("100%")}else{this.label.setWidth(a)}}},updateRequired:function(a){this.renderElement[a?"addCls":"removeCls"](this.getRequiredCls())},updateRequiredCls:function(a,b){if(this.getRequired()){this.renderElement.replaceCls(b,a)}},initialize:function(){var a=this;a.callParent();a.doInitValue()},doInitValue:function(){this.originalValue=this.getInitialConfig().value},reset:function(){this.setValue(this.originalValue);return this},isDirty:function(){return false}},function(){});Ext.define("Ext.field.Checkbox",{extend:"Ext.field.Field",alternateClassName:"Ext.form.Checkbox",xtype:"checkboxfield",qsaLeftRe:/[\[]/g,qsaRightRe:/[\]]/g,isCheckbox:true,config:{ui:"checkbox",value:"",checked:false,tabIndex:-1,component:{xtype:"input",type:"checkbox",useMask:true,cls:Ext.baseCSSPrefix+"input-checkbox"}},initialize:function(){var a=this;a.callParent();a.getComponent().on({scope:a,order:"before",masktap:"onMaskTap"})},doInitValue:function(){var a=this,b=a.getInitialConfig();if(b.hasOwnProperty("value")){a.originalState=b.value}if(b.hasOwnProperty("checked")){a.originalState=b.checked}a.callParent(arguments)},updateInputType:function(a){var b=this.getComponent();if(b){b.setType(a)}},updateName:function(a){var b=this.getComponent();if(b){b.setName(a)}},getChecked:function(){this._checked=this.getComponent().getChecked();return this._checked},getValue:function(){return this.getChecked()},setValue:function(a){return this.setChecked(a)},setChecked:function(a){this.updateChecked(a);this._checked=a},updateChecked:function(a){this.getComponent().setChecked(a)},onMaskTap:function(a,c){var b=this,d=a.input.dom;if(b.getDisabled()){return false}d.checked=!d.checked;if(b.getChecked()){b.fireEvent("check",b,c)}else{b.fireEvent("uncheck",b,c)}return false},doChecked:Ext.emptyFn,doUnChecked:Ext.emptyFn,isChecked:function(){return this.getChecked()},check:function(){return this.setChecked(true)},uncheck:function(){return this.setChecked(false)},getSameGroupFields:function(){var j=this.up("formpanel")||this.up("fieldset"),b=this.getName(),g=this.qsaLeftRe,c=this.qsaRightRe,f=[],a,d,e,h;if(!j){return null}b=b.replace(g,"\\[");b=b.replace(c,"\\]");a=Ext.query("[name="+b+"]",j.element.dom);h=a.length;for(e=0;e<h;e++){d=a[e];d=Ext.fly(d).up(".x-field-"+d.getAttribute("type"));if(d&&d.id){f.push(Ext.getCmp(d.id))}}return f},getGroupValues:function(){var a=[];this.getSameGroupFields().forEach(function(b){if(b.getChecked()){a.push(b.getValue())}});return a},setGroupValues:function(a){this.getSameGroupFields().forEach(function(b){b.setChecked((a.indexOf(b.getValue())!==-1))});return this},resetGroupValues:function(){this.getSameGroupFields().forEach(function(a){a.setChecked(a.originalState)});return this},reset:function(){this.setChecked(this.originalState);return this}});Ext.define("Ext.field.Hidden",{extend:"Ext.field.Field",alternateClassName:"Ext.form.Hidden",xtype:"hiddenfield",config:{component:{xtype:"input",type:"hidden"},ui:"hidden",hidden:true,tabIndex:-1}});Ext.define("Ext.field.Radio",{extend:"Ext.field.Checkbox",xtype:"radiofield",alternateClassName:"Ext.form.Radio",isRadio:true,config:{ui:"radio",component:{type:"radio",cls:Ext.baseCSSPrefix+"input-radio"}},getValue:function(){return this._value},setValue:function(a){this._value=a;return this},getGroupValue:function(){var a=this.getSameGroupFields(),c=a.length,b=0,d;for(;b<c;b++){d=a[b];if(d.getChecked()){return d.getValue()}}return null},setGroupValue:function(d){var a=this.getSameGroupFields(),c=a.length,b=0,e;for(;b<c;b++){e=a[b];if(e.getValue()===d){e.setChecked(true);return e}}}});Ext.define("Ext.field.Text",{extend:"Ext.field.Field",xtype:"textfield",alternateClassName:"Ext.form.Text",config:{ui:"text",clearIcon:true,placeHolder:null,maxLength:null,autoComplete:null,autoCapitalize:null,autoCorrect:null,readOnly:null,component:{xtype:"input",type:"text"}},initialize:function(){var a=this;a.callParent();a.getComponent().on({scope:this,keyup:"onKeyUp",change:"onChange",focus:"onFocus",blur:"onBlur",paste:"onPaste",mousedown:"onMouseDown",clearicontap:"onClearIconTap"});a.originalValue=a.originalValue||"";a.getComponent().originalValue=a.originalValue;a.syncEmptyCls()},syncEmptyCls:function(){var b=(this._value)?this._value.length:false,a=Ext.baseCSSPrefix+"empty";if(b){this.removeCls(a)}else{this.addCls(a)}},updateValue:function(b){var a=this.getComponent();if(a){a.setValue(b)}this[b?"showClearIcon":"hideClearIcon"]();this.syncEmptyCls()},getValue:function(){var a=this;a._value=a.getComponent().getValue();a.syncEmptyCls();return a._value},updatePlaceHolder:function(a){this.getComponent().setPlaceHolder(a)},updateMaxLength:function(a){this.getComponent().setMaxLength(a)},updateAutoComplete:function(a){this.getComponent().setAutoComplete(a)},updateAutoCapitalize:function(a){this.getComponent().setAutoCapitalize(a)},updateAutoCorrect:function(a){this.getComponent().setAutoCorrect(a)},updateReadOnly:function(a){if(a){this.hideClearIcon()}else{this.showClearIcon()}this.getComponent().setReadOnly(a)},updateInputType:function(a){var b=this.getComponent();if(b){b.setType(a)}},updateName:function(a){var b=this.getComponent();if(b){b.setName(a)}},updateTabIndex:function(b){var a=this.getComponent();if(a){a.setTabIndex(b)}},updateInputCls:function(a,b){var c=this.getComponent();if(c){c.replaceCls(b,a)}},doSetDisabled:function(b){var c=this;c.callParent(arguments);var a=c.getComponent();if(a){a.setDisabled(b)}if(b){c.hideClearIcon()}else{c.showClearIcon()}},showClearIcon:function(){var a=this;if(!a.getDisabled()&&!a.getReadOnly()&&a.getValue()&&a.getClearIcon()){a.element.addCls(Ext.baseCSSPrefix+"field-clearable")}return a},hideClearIcon:function(){if(this.getClearIcon()){this.element.removeCls(Ext.baseCSSPrefix+"field-clearable")}},onKeyUp:function(a){this.fireAction("keyup",[this,a],"doKeyUp")},doKeyUp:function(a,c){var b=a.getValue();a[b?"showClearIcon":"hideClearIcon"]();if(c.browserEvent.keyCode===13){a.fireAction("action",[a,c],"doAction")}},doAction:function(){this.blur()},onClearIconTap:function(a){this.fireAction("clearicontap",[this,a],"doClearIconTap")},doClearIconTap:function(a,b){a.setValue("");a.getValue()},onChange:function(b,c,a){b.fireEvent("change",this,c,a)},onFocus:function(a){this.isFocused=true;this.fireEvent("focus",this,a)},onBlur:function(b){var a=this;this.isFocused=false;a.fireEvent("blur",a,b);setTimeout(function(){a.isFocused=false},50)},onPaste:function(a){this.fireEvent("paste",this,a)},onMouseDown:function(a){this.fireEvent("mousedown",this,a)},focus:function(){this.getComponent().focus();return this},blur:function(){this.getComponent().blur();return this},select:function(){this.getComponent().select();return this},reset:function(){this.getComponent().reset();this.getValue();this[this._value?"showClearIcon":"hideClearIcon"]()},isDirty:function(){var a=this.getComponent();if(a){return a.isDirty()}return false}});Ext.define("Ext.field.Email",{extend:"Ext.field.Text",alternateClassName:"Ext.form.Email",xtype:"emailfield",config:{component:{type:"email"},autoCapitalize:false}});Ext.define("Ext.field.Number",{extend:"Ext.field.Text",xtype:"numberfield",alternateClassName:"Ext.form.Number",config:{component:{type:"number"},ui:"number"},proxyConfig:{minValue:null,maxValue:null,stepValue:null},applyValue:function(b){var a=this.getMinValue(),c=this.getMaxValue();if(Ext.isNumber(a)){b=Math.max(b,a)}if(Ext.isNumber(c)){b=Math.min(b,c)}return parseFloat(b)},getValue:function(){var a=this.callParent();return parseFloat(a||0)},doClearIconTap:function(a,b){a.setValue(0)}});Ext.define("Ext.field.Password",{extend:"Ext.field.Text",xtype:"passwordfield",alternateClassName:"Ext.form.Password",config:{autoCapitalize:false,component:{type:"password"}}});Ext.define("Ext.field.Search",{extend:"Ext.field.Text",xtype:"searchfield",alternateClassName:"Ext.form.Search",config:{component:{type:"search"},ui:"search"}});Ext.define("Ext.field.Spinner",{extend:"Ext.field.Number",xtype:"spinnerfield",alternateClassName:"Ext.form.Spinner",requires:["Ext.util.TapRepeater"],config:{cls:Ext.baseCSSPrefix+"spinner",minValue:Number.NEGATIVE_INFINITY,maxValue:Number.MAX_VALUE,increment:0.1,accelerateOnTapHold:true,cycle:false,clearIcon:false,defaultValue:0,tabIndex:-1,component:{disabled:true}},constructor:function(){this.callParent(arguments);if(!this.getValue()){this.setValue(this.getDefaultValue())}},syncEmptyCls:Ext.emptyFn,updateComponent:function(c){this.callParent(arguments);var b=this.innerElement,a=this.getCls();if(c){this.spinDownButton=Ext.Element.create({cls:a+"-button "+a+"-button-down",html:"-"});b.insertFirst(this.spinDownButton);this.spinUpButton=Ext.Element.create({cls:a+"-button "+a+"-button-up",html:"+"});b.appendChild(this.spinUpButton);this.downRepeater=this.createRepeater(this.spinDownButton,this.onSpinDown);this.upRepeater=this.createRepeater(this.spinUpButton,this.onSpinUp)}},applyValue:function(a){a=parseFloat(a);if(isNaN(a)||a===null){a=this.getDefaultValue()}a=Math.round(a*10)/10;return this.callParent([a])},createRepeater:function(c,b){var d=this,a=Ext.create("Ext.util.TapRepeater",{el:c,accelerate:d.getAccelerateOnTapHold()});a.on({tap:b,touchstart:"onTouchStart",touchend:"onTouchEnd",scope:d});return a},onSpinDown:function(){if(!this.getDisabled()){this.spin(true)}},onSpinUp:function(){if(!this.getDisabled()){this.spin(false)}},onTouchStart:function(a){if(!this.getDisabled()){a.getEl().addCls(Ext.baseCSSPrefix+"button-pressed")}},onTouchEnd:function(a){a.getEl().removeCls(Ext.baseCSSPrefix+"button-pressed")},spin:function(h){var c=this,b=c.getValue(),a=c.getIncrement(),g=h?"down":"up",e=c.getMinValue(),f=c.getMaxValue(),d;if(h){d=b-a}else{d=b+a}if(c.getCycle()){if(b==e&&d<e){d=f}if(b==f&&d>f){d=e}}c.setValue(d);d=c.getValue();c.fireEvent("spin",c,d,g);c.fireEvent("spin"+g,c,d)},doSetDisabled:function(a){Ext.Component.prototype.doSetDisabled.apply(this,arguments)},setDisabled:function(){Ext.Component.prototype.setDisabled.apply(this,arguments)},reset:function(){this.setValue(this.getDefaultValue())},destroy:function(){var a=this;Ext.destroy(a.downRepeater,a.upRepeater,a.spinDownButton,a.spinUpButton);a.callParent(arguments)}},function(){});Ext.define("Ext.field.TextAreaInput",{extend:"Ext.field.Input",xtype:"textareainput",tag:"textarea"});Ext.define("Ext.field.TextArea",{extend:"Ext.field.Text",xtype:"textareafield",requires:["Ext.field.TextAreaInput"],alternateClassName:"Ext.form.TextArea",config:{ui:"textarea",autoCapitalize:false,component:{xtype:"textareainput"},maxRows:null},updateMaxRows:function(a){this.getComponent().setMaxRows(a)},doSetHeight:function(a){this.callParent(arguments);var b=this.getComponent();b.input.setHeight(a)},doSetWidth:function(b){this.callParent(arguments);var a=this.getComponent();a.input.setWidth(b)},doKeyUp:function(a){var b=a.getValue();a[b?"showClearIcon":"hideClearIcon"]()}});Ext.define("Ext.field.Url",{extend:"Ext.field.Text",xtype:"urlfield",alternateClassName:"Ext.form.Url",config:{autoCapitalize:false,component:{type:"url"}}});Ext.define("Ext.plugin.ListPaging",{extend:"Ext.Component",alias:"plugin.listpaging",config:{autoPaging:false,loadMoreText:"Load More...",noMoreRecordsText:"No More Records",loadTpl:['<div class="{cssPrefix}loading-spinner" style="font-size: 180%; margin: 10px auto;">','<span class="{cssPrefix}loading-top"></span>','<span class="{cssPrefix}loading-right"></span>','<span class="{cssPrefix}loading-bottom"></span>','<span class="{cssPrefix}loading-left"></span>',"</div>",'<div class="{cssPrefix}list-paging-msg">{message}</div>'].join(""),loadMoreCmp:{xtype:"component",baseCls:Ext.baseCSSPrefix+"list-paging"},loadMoreCmpAdded:false,loadingCls:Ext.baseCSSPrefix+"loading",list:null,scroller:null,loading:false},init:function(c){var a=c.getScrollable().getScroller(),b=c.getStore();this.setList(c);this.setScroller(a);this.bindStore(c.getStore());if(b){this.disableDataViewMask(b)}c.updateStore=Ext.Function.createInterceptor(c.updateStore,this.bindStore,this);if(this.getAutoPaging()){a.on({scrollend:this.onScrollEnd,scope:this})}},bindStore:function(a,b){if(b){b.un({load:this.onStoreLoad,beforeload:this.onStoreBeforeLoad,scope:this})}if(a){a.on({load:this.onStoreLoad,beforeload:this.onStoreBeforeLoad,scope:this})}},disableDataViewMask:function(a){var b=this.getList();if(a.isAutoLoading()){b.setLoadingText(null)}else{a.on({load:{single:true,fn:function(){b.setLoadingText(null)}}})}},applyLoadTpl:function(a){return(Ext.isObject(a)&&a.isTemplate)?a:new Ext.XTemplate(a)},applyLoadMoreCmp:function(a){a=Ext.merge(a,{html:this.getLoadTpl().apply({cssPrefix:Ext.baseCSSPrefix,message:this.getLoadMoreText()}),listeners:{tap:{fn:this.loadNextPage,scope:this,element:"element"}}});return Ext.factory(a,Ext.Component,this.getLoadMoreCmp())},onScrollEnd:function(b,a,c){if(!this.getLoading()&&c>=b.maxPosition.y){if(!this.storeFullyLoaded()){this.loadNextPage()}}},updateLoading:function(a){var b=this.getLoadMoreCmp(),c=this.getLoadingCls();if(a){b.addCls(c)}else{b.removeCls(c)}},onStoreBeforeLoad:function(a){if(a.getCount()===0){this.getLoadMoreCmp().hide()}},onStoreLoad:function(a){var d=this.addLoadMoreCmp(),b=this.getLoadTpl(),c=this.storeFullyLoaded()?this.getNoMoreRecordsText():this.getLoadMoreText();this.getLoadMoreCmp().show();this.setLoading(false);if(this.scrollY){this.getScroller().scrollTo(null,this.scrollY);delete this.scrollY}d.setHtml(b.apply({cssPrefix:Ext.baseCSSPrefix,message:c}))},addLoadMoreCmp:function(){var b=this.getList(),a=this.getLoadMoreCmp();if(!this.getLoadMoreCmpAdded()){b.add(a);this.setLoadMoreCmpAdded(true)}return a},storeFullyLoaded:function(){var a=this.getList().getStore(),b=a.getTotalCount();return b!==null?a.getTotalCount()<=(a.currentPage*a.getPageSize()):false},loadNextPage:function(){var a=this.getList().getStore();this.setLoading(true);this.scrollY=this.getScroller().position.y;a.nextPage({addRecords:true})}});Ext.define("Ext.plugin.PullRefresh",{extend:"Ext.Component",alias:"plugin.pullrefresh",requires:["Ext.DateExtras"],config:{list:null,pullRefreshText:"Pull down to refresh...",releaseRefreshText:"Release to refresh...",loadingText:"Loading...",snappingAnimationDuration:150,refreshFn:null,pullTpl:['<div class="x-list-pullrefresh">','<div class="x-list-pullrefresh-arrow"></div>','<div class="x-loading-spinner">','<span class="x-loading-top"></span>','<span class="x-loading-right"></span>','<span class="x-loading-bottom"></span>','<span class="x-loading-left"></span>',"</div>",'<div class="x-list-pullrefresh-wrap">','<h3 class="x-list-pullrefresh-message">{message}</h3>','<div class="x-list-pullrefresh-updated">Last Updated: <span>{lastUpdated:date("m/d/Y h:iA")}</span></div>',"</div>","</div>"].join("")},isRefreshing:false,currentViewState:"",initialize:function(){this.callParent();this.on({painted:"onPainted",scope:this})},init:function(f){var d=this,b=f.getStore(),e=d.getPullTpl(),c=d.element,a=f.getScrollable().getScroller();d.setList(f);d.lastUpdated=new Date();f.insert(0,d);if(b){if(b.isAutoLoading()){f.setLoadingText(null)}else{b.on({load:{single:true,fn:function(){f.setLoadingText(null)}}})}}e.overwrite(c,{message:d.getPullRefreshText(),lastUpdated:d.lastUpdated},true);d.loadingElement=c.getFirstChild();d.messageEl=c.down(".x-list-pullrefresh-message");d.updatedEl=c.down(".x-list-pullrefresh-updated > span");d.maxScroller=a.getMaxPosition();a.on({maxpositionchange:d.setMaxScroller,scroll:d.onScrollChange,scope:d})},fetchLatest:function(){var b=this.getList().getStore(),c=b.getProxy(),a;a=Ext.create("Ext.data.Operation",{page:1,start:0,model:b.getModel(),limit:b.getPageSize(),action:"read",filters:b.getRemoteFilter()?b.getFilters():[]});c.read(a,this.onLatestFetched,this)},onLatestFetched:function(d){var j=this.getList().getStore(),b=j.getData(),c=d.getRecords(),a=c.length,g=[],h,f,e;for(e=0;e<a;e++){h=c[e];f=b.getByKey(h.getId());if(f){f.set(h.getData())}else{g.push(h)}f=undefined}j.insert(0,g)},onPainted:function(){this.pullHeight=this.loadingElement.getHeight()},setMaxScroller:function(b,a){this.maxScroller=a},onScrollChange:function(b,a,c){if(c<0){this.onBounceTop(c)}if(c>this.maxScroller.y){this.onBounceBottom(c)}},applyPullTpl:function(a){return(Ext.isObject(a)&&a.isTemplate)?a:new Ext.XTemplate(a)},onBounceTop:function(d){var b=this,c=b.getList(),a=c.getScrollable().getScroller();if(!b.isReleased){if(!b.isRefreshing&&-d>=b.pullHeight+10){b.isRefreshing=true;b.setViewState("release");a.getContainer().onBefore({dragend:"onScrollerDragEnd",single:true,scope:b})}else{if(b.isRefreshing&&-d<b.pullHeight+10){b.isRefreshing=false;b.setViewState("pull")}}}},onScrollerDragEnd:function(){var b=this;if(b.isRefreshing){var c=b.getList(),a=c.getScrollable().getScroller();a.minPosition.y=-b.pullHeight;a.on({scrollend:"loadStore",single:true,scope:b});b.isReleased=true}},loadStore:function(){var b=this,c=b.getList(),a=c.getScrollable().getScroller();b.setViewState("loading");b.isReleased=false;Ext.defer(function(){a.on({scrollend:function(){if(b.getRefreshFn()){b.getRefreshFn().call(b,b)}else{b.fetchLatest()}b.resetRefreshState()},delay:100,single:true,scope:b});a.minPosition.y=0;a.scrollTo(null,0,true)},500,b)},onBounceBottom:Ext.emptyFn,setViewState:function(d){var b=this,c=Ext.baseCSSPrefix,e=b.messageEl,a=b.loadingElement;if(d===b.currentViewState){return b}b.currentViewState=d;if(e&&a){switch(d){case"pull":e.setHtml(b.getPullRefreshText());a.removeCls([c+"list-pullrefresh-release",c+"list-pullrefresh-loading"]);break;case"release":e.setHtml(b.getReleaseRefreshText());a.addCls(c+"list-pullrefresh-release");break;case"loading":e.setHtml(b.getLoadingText());a.addCls(c+"list-pullrefresh-loading");break}}return b},resetRefreshState:function(){var a=this;a.isRefreshing=false;a.lastUpdated=new Date();a.setViewState("pull");a.updatedEl.setHtml(Ext.util.Format.date(a.lastUpdated,"m/d/Y h:iA"))}});Ext.define("Ext.scroll.indicator.Abstract",{extend:"Ext.Component",config:{baseCls:"x-scroll-indicator",axis:"x",value:0,length:null,hidden:true,ui:"dark"},cachedConfig:{ratio:1,barCls:"x-scroll-bar",active:true},barElement:null,barLength:0,gapLength:0,getElementConfig:function(){return{reference:"barElement",children:[this.callParent()]}},applyRatio:function(a){if(isNaN(a)){a=1}return a},refresh:function(){var f=this.barElement,e=f.dom,c=this.getRatio(),b=this.getAxis(),a=(b==="x")?e.offsetWidth:e.offsetHeight,d=a*c;this.barLength=a;this.gapLength=a-d;this.setLength(d);this.updateValue(this.getValue())},updateBarCls:function(a){this.barElement.addCls(a)},updateAxis:function(a){this.element.addCls(this.getBaseCls(),null,a);this.barElement.addCls(this.getBarCls(),null,a)},updateValue:function(a){this.setOffset(this.gapLength*a)},updateActive:function(a){this.barElement[a?"addCls":"removeCls"]("active")},doSetHidden:function(a){var b=this.element.dom.style;if(a){b.opacity="0"}else{b.opacity=""}},updateLength:function(c){var b=this.getAxis(),a=this.element;if(b==="x"){a.setWidth(c)}else{a.setHeight(c)}},setOffset:function(c){var b=this.getAxis(),a=this.element;if(b==="x"){a.setLeft(c)}else{a.setTop(c)}}});Ext.define("Ext.scroll.indicator.CssTransform",{extend:"Ext.scroll.indicator.Abstract",config:{cls:"csstransform"},getElementConfig:function(){var a=this.callParent();a.children[0].children=[{reference:"startElement"},{reference:"middleElement"},{reference:"endElement"}];return a},refresh:function(){var d=this.getAxis(),c=this.startElement.dom,a=this.endElement.dom,e=this.middleElement,b,f;if(d==="x"){b=c.offsetWidth;f=a.offsetWidth;e.setLeft(b)}else{b=c.offsetHeight;f=a.offsetHeight;e.setTop(b)}this.startElementLength=b;this.endElementLength=f;this.minLength=b+f;this.callParent()},applyLength:function(a){return Math.round(Math.max(this.minLength,a))},updateLength:function(c){var b=this.getAxis(),a=this.endElement.dom.style,e=this.middleElement.dom.style,d=this.endElementLength,g=c-d,f=g-this.startElementLength;if(b==="x"){a.webkitTransform="translate3d("+g+"px, 0, 0)";e.webkitTransform="translate3d(0, 0, 0) scaleX("+f+")"}else{a.webkitTransform="translate3d(0, "+g+"px, 0)";e.webkitTransform="translate3d(0, 0, 0) scaleY("+f+")"}},updateValue:function(f){var b=this.barLength,c=this.gapLength,d=this.getLength(),e,g,a;if(f<=0){g=0;this.updateLength(this.applyLength(d+f*b))}else{if(f>=1){a=Math.round((f-1)*b);e=this.applyLength(d-a);a=d-e;this.updateLength(e);g=c+a}else{g=c*f}}this.setOffset(g)},setOffset:function(c){var a=this.getAxis(),b=this.element.dom.style;c=Math.round(c);if(a==="x"){b.webkitTransform="translate3d("+c+"px, 0, 0)"}else{b.webkitTransform="translate3d(0, "+c+"px, 0)"}}});Ext.define("Ext.scroll.indicator.Default",{extend:"Ext.scroll.indicator.Abstract",config:{cls:"default"},setOffset:function(c){var b=this.getAxis(),a=this.element.dom.style;if(b==="x"){a.webkitTransform="translate3d("+c+"px, 0, 0)"}else{a.webkitTransform="translate3d(0, "+c+"px, 0)"}},applyLength:function(a){return Math.round(Math.max(0,a))},updateValue:function(f){var b=this.barLength,c=this.gapLength,d=this.getLength(),e,g,a;if(f<=0){g=0;this.updateLength(this.applyLength(d+f*b))}else{if(f>=1){a=Math.round((f-1)*b);e=this.applyLength(d-a);a=d-e;this.updateLength(e);g=c+a}else{g=c*f}}this.setOffset(g)}});Ext.define("Ext.scroll.indicator.ScrollPosition",{extend:"Ext.scroll.indicator.Abstract",config:{cls:"scrollposition"},getElementConfig:function(){var a=this.callParent(arguments);a.children.unshift({className:"x-scroll-bar-stretcher"});return a},updateValue:function(a){if(this.gapLength===0){if(a>1){a=a-1}this.setOffset(this.barLength*a)}else{this.setOffset(this.gapLength*a)}},setLength:function(e){var c=this.getAxis(),a=this.barLength,d=this.barElement.dom,b=this.element;this.callParent(arguments);if(c==="x"){d.scrollLeft=a;b.setLeft(a)}else{d.scrollTop=a;b.setTop(a)}},setOffset:function(d){var b=this.getAxis(),a=this.barLength,c=this.barElement.dom;d=a-d;if(b==="x"){c.scrollLeft=d}else{c.scrollTop=d}}});Ext.define("Ext.scroll.Indicator",{requires:["Ext.scroll.indicator.Default","Ext.scroll.indicator.ScrollPosition","Ext.scroll.indicator.CssTransform"],alternateClassName:"Ext.util.Indicator",constructor:function(a){if(Ext.os.is.Android2||Ext.browser.is.ChromeMobile){return new Ext.scroll.indicator.ScrollPosition(a)}else{if(Ext.os.is.iOS){return new Ext.scroll.indicator.CssTransform(a)}else{return new Ext.scroll.indicator.Default(a)}}}});Ext.define("Ext.scroll.View",{extend:"Ext.Evented",alternateClassName:"Ext.util.ScrollView",requires:["Ext.scroll.Scroller","Ext.scroll.Indicator"],config:{indicatorsUi:"dark",element:null,scroller:{},indicators:{x:{axis:"x"},y:{axis:"y"}},indicatorsHidingDelay:100,cls:Ext.baseCSSPrefix+"scroll-view"},processConfig:function(c){if(!c){return null}if(typeof c=="string"){c={direction:c}}c=Ext.merge({},c);var a=c.scroller,b;if(!a){c.scroller=a={}}for(b in c){if(c.hasOwnProperty(b)){if(!this.hasConfig(b)){a[b]=c[b];delete c[b]}}}return c},constructor:function(a){a=this.processConfig(a);this.useIndicators={x:true,y:true};this.doHideIndicators=Ext.Function.bind(this.doHideIndicators,this);this.initConfig(a)},setConfig:function(a){return this.callParent([this.processConfig(a)])},updateIndicatorsUi:function(a){var b=this.getIndicators();b.x.setUi(a);b.y.setUi(a)},applyScroller:function(a,b){return Ext.factory(a,Ext.scroll.Scroller,b)},applyIndicators:function(b,d){var a=Ext.scroll.Indicator,c=this.useIndicators;if(!b){b={}}if(!b.x){c.x=false;b.x={}}if(!b.y){c.y=false;b.y={}}return{x:Ext.factory(b.x,a,d&&d.x),y:Ext.factory(b.y,a,d&&d.y)}},updateIndicators:function(a){this.indicatorsGrid=Ext.Element.create({className:"x-scroll-bar-grid-wrapper",children:[{className:"x-scroll-bar-grid",children:[{children:[{},{children:[a.y.barElement]}]},{children:[{children:[a.x.barElement]},{}]}]}]})},updateScroller:function(a){a.on({scope:this,scrollstart:"onScrollStart",scroll:"onScroll",scrollend:"onScrollEnd",refresh:"refreshIndicators"})},isAxisEnabled:function(a){return this.getScroller().isAxisEnabled(a)&&this.useIndicators[a]},applyElement:function(a){if(a){return Ext.get(a)}},updateElement:function(c){var b=c.getFirstChild().getFirstChild(),a=this.getScroller();c.addCls(this.getCls());c.insertFirst(this.indicatorsGrid);a.setElement(b);this.refreshIndicators();return this},showIndicators:function(){var a=this.getIndicators();if(this.hasOwnProperty("indicatorsHidingTimer")){clearTimeout(this.indicatorsHidingTimer);delete this.indicatorsHidingTimer}if(this.isAxisEnabled("x")){a.x.show()}if(this.isAxisEnabled("y")){a.y.show()}},hideIndicators:function(){var a=this.getIndicatorsHidingDelay();if(a>0){this.indicatorsHidingTimer=setTimeout(this.doHideIndicators,a)}else{this.doHideIndicators()}},doHideIndicators:function(){var a=this.getIndicators();if(this.isAxisEnabled("x")){a.x.hide()}if(this.isAxisEnabled("y")){a.y.hide()}},onScrollStart:function(){this.onScroll.apply(this,arguments);this.showIndicators()},onScrollEnd:function(){this.hideIndicators()},onScroll:function(b,a,c){this.setIndicatorValue("x",a);this.setIndicatorValue("y",c)},setIndicatorValue:function(b,f){if(!this.isAxisEnabled(b)){return this}var a=this.getScroller(),c=a.getMaxPosition()[b],e=a.getContainerSize()[b],d;if(c===0){d=f/e;if(f>=0){d+=1}}else{if(f>c){d=1+((f-c)/e)}else{if(f<0){d=f/e}else{d=f/c}}}this.getIndicators()[b].setValue(d)},refreshIndicator:function(d){if(!this.isAxisEnabled(d)){return this}var a=this.getScroller(),b=this.getIndicators()[d],e=a.getContainerSize()[d],f=a.getSize()[d],c=e/f;b.setRatio(c);b.refresh()},refresh:function(){return this.getScroller().refresh()},refreshIndicators:function(){var a=this.getIndicators();a.x.setActive(this.isAxisEnabled("x"));a.y.setActive(this.isAxisEnabled("y"));this.refreshIndicator("x");this.refreshIndicator("y")},destroy:function(){var a=this.getElement(),b=this.getIndicators();if(a&&!a.isDestroyed){a.removeCls(this.getCls())}b.x.destroy();b.y.destroy();Ext.destroy(this.getScroller(),this.indicatorsGrid);delete this.indicatorsGrid;this.callParent(arguments)}});Ext.define("Ext.behavior.Scrollable",{extend:"Ext.behavior.Behavior",requires:["Ext.scroll.View"],constructor:function(){this.listeners={painted:"onComponentPainted",scope:this};this.callParent(arguments)},onComponentPainted:function(){this.scrollView.refresh()},setConfig:function(d){var b=this.scrollView,c=this.component,f,e,a;if(d){if(!b){this.scrollView=b=new Ext.scroll.View(d);b.on("destroy","onScrollViewDestroy",this);c.setUseBodyElement(true);this.scrollerElement=a=c.innerElement;this.scrollContainer=e=a.wrap();this.scrollViewElement=f=c.bodyElement;b.setElement(f);if(c.isPainted()){this.onComponentPainted(c)}c.on(this.listeners)}else{if(Ext.isObject(d)){b.setConfig(d)}}}else{if(b){b.destroy()}}return this},getScrollView:function(){return this.scrollView},onScrollViewDestroy:function(){var b=this.component,a=this.scrollerElement;if(!a.isDestroyed){this.scrollerElement.unwrap()}this.scrollContainer.destroy();b.un(this.listeners);delete this.scrollerElement;delete this.scrollView;delete this.scrollContainer},onComponentDestroy:function(){var a=this.scrollView;if(a){a.destroy()}}});Ext.define("Ext.Container",{extend:"Ext.Component",alternateClassName:"Ext.lib.Container",requires:["Ext.layout.Layout","Ext.ItemCollection","Ext.behavior.Scrollable","Ext.Mask"],xtype:"container",eventedConfig:{activeItem:0},config:{layout:null,control:{},defaults:null,items:null,autoDestroy:true,defaultType:null,scrollable:null,useBodyElement:null,masked:null,modal:null,hideOnMaskTap:null},isContainer:true,delegateListeners:{delegate:"> component",centeredchange:"onItemCenteredChange",dockedchange:"onItemDockedChange",floatingchange:"onItemFloatingChange"},constructor:function(a){var b=this;b._items=b.items=new Ext.ItemCollection();b.innerItems=[];b.onItemAdd=b.onFirstItemAdd;b.callParent(arguments)},getElementConfig:function(){return{reference:"element",className:"x-container",children:[{reference:"innerElement",className:"x-inner"}]}},applyMasked:function(a,b){b=Ext.factory(a,Ext.Mask,b);if(b){this.add(b)}return b},mask:function(a){this.setMasked(a||true)},unmask:function(){this.setMasked(false)},applyModal:function(a,b){if(!a&&!b){return}return Ext.factory(a,Ext.Mask,b)},updateModal:function(c,a){var b={painted:"refreshModalMask",erased:"destroyModalMask"};if(c){this.on(b);c.on("destroy","onModalDestroy",this);if(this.getTop()===null&&this.getBottom()===null&&this.getRight()===null&&this.getLeft()===null&&!this.getCentered()){this.setTop(0);this.setLeft(0)}if(this.isPainted()){this.refreshModalMask()}}else{if(a){a.un("destroy","onModalDestroy",this);this.un(b)}}},onModalDestroy:function(){this.setModal(null)},refreshModalMask:function(){var b=this.getModal(),a=this.getParent();if(!this.painted){this.painted=true;if(b){a.insertBefore(b,this);b.setZIndex(this.getZIndex()-1)}}},destroyModalMask:function(){var b=this.getModal(),a=this.getParent();if(this.painted){this.painted=false;if(b){a.remove(b,false)}}},updateZIndex:function(b){var a=this.getModal();this.callParent(arguments);if(a){a.setZIndex(b-1)}},updateHideOnMaskTap:function(b){var a=this.getModal();if(a){a[b?"on":"un"].call(a,"tap","hide",this)}},updateBaseCls:function(a,b){var c=this,d=c.getUi();if(a){this.element.addCls(a);this.innerElement.addCls(a,null,"inner");if(d){this.element.addCls(a,null,d)}}if(b){this.element.removeCls(b);this.innerElement.removeCls(a,null,"inner");if(d){this.element.removeCls(b,null,d)}}},updateUseBodyElement:function(a){if(a){this.bodyElement=this.innerElement.wrap({cls:"x-body"});this.referenceList.push("bodyElement")}},applyItems:function(a,b){if(a){this.getDefaultType();this.getDefaults();if(this.initialized&&b.length>0){this.removeAll()}this.add(a)}},applyControl:function(c){var a,b,e,d;for(a in c){d=c[a];for(b in d){e=d[b];if(Ext.isObject(e)){e.delegate=a}}d.delegate=a;this.addListener(d)}return c},onFirstItemAdd:function(){delete this.onItemAdd;this.setLayout(new Ext.layout.Layout(this,this.getLayout()||"default"));if(this.innerHtmlElement&&!this.getHtml()){this.innerHtmlElement.destroy();delete this.innerHtmlElement}this.on(this.delegateListeners);return this.onItemAdd.apply(this,arguments)},updateDefaultType:function(a){this.defaultItemClass=Ext.ClassManager.getByAlias("widget."+a)},applyDefaults:function(a){if(a){this.factoryItem=this.factoryItemWithDefaults;return a}},factoryItem:function(a){return Ext.factory(a,this.defaultItemClass)},factoryItemWithDefaults:function(c){var b=this,d=b.getDefaults(),a;if(!d){return Ext.factory(c,b.defaultItemClass)}if(c.isComponent){a=c;if(d&&c.isInnerItem()&&!b.has(a)){a.setConfig(d,true)}}else{if(d&&!c.ignoreDefaults){if(!(c.hasOwnProperty("left")&&c.hasOwnProperty("right")&&c.hasOwnProperty("top")&&c.hasOwnProperty("bottom")&&c.hasOwnProperty("docked")&&c.hasOwnProperty("centered"))){c=Ext.mergeIf({},c,d)}}a=Ext.factory(c,b.defaultItemClass)}return a},add:function(a){var e=this,b,d,c,f;a=Ext.Array.from(a);d=a.length;for(b=0;b<d;b++){c=e.factoryItem(a[b]);this.doAdd(c);if(!f&&!this.getActiveItem()&&this.innerItems.length>0&&c.isInnerItem()){f=c}}if(f){this.setActiveItem(f)}return c},doAdd:function(d){var c=this,a=c.getItems(),b;if(!a.has(d)){b=a.length;a.add(d);if(d.isInnerItem()){c.insertInner(d)}d.setParent(c);c.onItemAdd(d,b)}},remove:function(d,b){var c=this,a=c.indexOf(d),e=this.getInnerItems(),f;if(b===undefined){b=c.getAutoDestroy()}if(a!==-1){if(!this.removingAll&&e.length>1&&d===this.getActiveItem()){this.on({activeitemchange:"doRemove",scope:this,single:true,order:"after",args:[d,a,b]});f=e.indexOf(d);if(f===0){this.setActiveItem(1)}else{this.setActiveItem(0)}}else{this.doRemove(d,a,b)}}return c},doRemove:function(d,a,b){var c=this;c.items.remove(d);if(d.isInnerItem()){c.removeInner(d)}c.onItemRemove(d,a,b);d.setParent(null);if(b){d.destroy()}},removeAll:function(c,f){var a=this.items,e=a.length,b=0,d;if(c===undefined){c=this.getAutoDestroy()}f=Boolean(f);this.removingAll=true;for(;b<e;b++){d=a.getAt(b);if(d&&(f||d.isInnerItem())){this.doRemove(d,b,c);b--;e--}}this.removingAll=false;return this},getAt:function(a){return this.items.getAt(a)},removeAt:function(a){var b=this.getAt(a);if(b){this.remove(b)}return this},removeInnerAt:function(a){var b=this.getInnerItems()[a];if(b){this.remove(b)}return this},has:function(a){return this.getItems().indexOf(a)!=-1},hasInnerItem:function(a){return this.innerItems.indexOf(a)!=-1},indexOf:function(a){return this.getItems().indexOf(a)},insertInner:function(d,b){var a=this.getItems().items,f=this.innerItems,g=f.indexOf(d),c=-1,e;if(g!==-1){f.splice(g,1)}if(typeof b=="number"){do{e=a[++b]}while(e&&!e.isInnerItem());if(e){c=f.indexOf(e);f.splice(c,0,d)}}if(c===-1){f.push(d);c=f.length-1}if(g!==-1){this.onInnerItemMove(d,c,g)}return this},onInnerItemMove:Ext.emptyFn,removeInner:function(a){Ext.Array.remove(this.innerItems,a);return this},insert:function(a,d){var c=this,b;if(Ext.isArray(d)){for(b=d.length-1;b>=0;b--){c.insert(a,d[b])}return c}d=this.factoryItem(d);this.doInsert(a,d);return d},doInsert:function(d,f){var e=this,b=e.items,c=b.length,a,g;g=f.isInnerItem();if(d>c){d=c}if(b[d-1]===f){return e}a=e.indexOf(f);if(a!==-1){if(a<d){d-=1}b.removeAt(a)}else{f.setParent(e)}b.insert(d,f);if(g){e.insertInner(f,d)}if(a!==-1){e.onItemMove(f,d,a)}else{e.onItemAdd(f,d)}},insertFirst:function(a){return this.insert(0,a)},insertLast:function(a){return this.insert(this.getItems().length,a)},insertBefore:function(c,a){var b=this.indexOf(a);if(b!==-1){this.insert(b,c)}return this},insertAfter:function(c,a){var b=this.indexOf(a);if(b!==-1){this.insert(b+1,c)}return this},onItemAdd:function(b,a){this.doItemLayoutAdd(b,a);if(this.initialized){this.fireEvent("add",this,b,a)}},doItemLayoutAdd:function(c,a){var b=this.getLayout();if(this.isRendered()&&c.setRendered(true)){c.fireAction("renderedchange",[this,c,true],"onItemAdd",b,{args:[c,a]})}else{b.onItemAdd(c,a)}},onItemRemove:function(b,a){this.doItemLayoutRemove(b,a);this.fireEvent("remove",this,b,a)},doItemLayoutRemove:function(c,a){var b=this.getLayout();if(this.isRendered()&&c.setRendered(false)){c.fireAction("renderedchange",[this,c,false],"onItemRemove",b,{args:[c,a]})}else{b.onItemRemove(c,a)}},onItemMove:function(b,c,a){if(b.isDocked()){b.setDocked(null)}this.doItemLayoutMove(b,c,a);this.fireEvent("move",this,b,c,a)},doItemLayoutMove:function(b,c,a){this.getLayout().onItemMove(b,c,a)},onItemCenteredChange:function(b,a){if(!b.isFloating()&&!b.isDocked()){if(a){this.removeInner(b)}else{this.insertInner(b,this.indexOf(b))}}this.getLayout().onItemCenteredChange(b,a)},onItemFloatingChange:function(a,b){if(!a.isCentered()&&!a.isDocked()){if(b){this.removeInner(a)}else{this.insertInner(a,this.indexOf(a))}}this.getLayout().onItemFloatingChange(a,b)},onItemDockedChange:function(a,c,b){if(!a.isCentered()&&!a.isFloating()){if(c){this.removeInner(a)}else{this.insertInner(a,this.indexOf(a))}}this.getLayout().onItemDockedChange(a,c,b)},getInnerItems:function(){return this.innerItems},getDockedItems:function(){var a=this.getItems().items,c=[],e=a.length,d,b;for(b=0;b<e;b++){d=a[b];if(d.isDocked()){c.push(d)}}return c},applyActiveItem:function(c,a){var b=this.getInnerItems();this.getItems();if(typeof c=="number"){c=Math.max(0,Math.min(c,b.length-1));c=b[c];if(c){return c}else{if(a){return null}}}else{if(c){if(!c.isComponent){c=this.factoryItem(c)}if(!this.has(c)){this.add(c)}return c}}},animateActiveItem:function(d,c){var b=this.getLayout(),a;if(this.activeItemAnimation){this.activeItemAnimation.destroy()}this.activeItemAnimation=c=new Ext.fx.layout.Card(c);if(c&&b.isCard){c.setLayout(b);a=b.getAnimation();if(a){a.disable();c.on("animationend",function(){a.enable();c.destroy()},this)}}return this.setActiveItem(d)},doSetActiveItem:function(b,a){if(a){a.fireEvent("deactivate",a,this,b)}if(b){b.fireEvent("activate",b,this,a)}},setRendered:function(d){if(this.callParent(arguments)){var a=this.items.items,b,c;for(b=0,c=a.length;b<c;b++){a[b].setRendered(d)}return true}return false},getScrollableBehavior:function(){var a=this.scrollableBehavior;if(!a){a=this.scrollableBehavior=new Ext.behavior.Scrollable(this)}return a},applyScrollable:function(a){this.getScrollableBehavior().setConfig(a)},getScrollable:function(){return this.getScrollableBehavior().getScrollView()},getRefItems:function(a){var b=this.getItems().items.slice(),e=b.length,c,d;if(a){for(c=0;c<e;c++){d=b[c];if(d.getRefItems){b=b.concat(d.getRefItems(true))}}}return b},getComponent:function(a){if(Ext.isObject(a)){a=a.getItemId()}return this.getItems().get(a)},getDockedComponent:function(a){if(Ext.isObject(a)){a=a.getItemId()}var c=this.getDockedItems(),e=c.length,d,b;if(Ext.isNumber(a)){return c[a]}for(b=0;b<e;b++){d=c[b];if(d.id==a){return d}}return false},query:function(a){return Ext.ComponentQuery.query(a,this)},child:function(a){return this.query("> "+a)[0]||null},down:function(a){return this.query(a)[0]||null},destroy:function(){var a=this.getModal();if(a){a.destroy()}this.removeAll(true,true);Ext.destroy(this.getScrollable(),this.bodyElement);this.callParent()}},function(){this.addMember("defaultItemClass",this)});Ext.define("Ext.Panel",{extend:"Ext.Container",requires:["Ext.util.LineSegment"],alternateClassName:"Ext.lib.Panel",xtype:"panel",isPanel:true,config:{baseCls:Ext.baseCSSPrefix+"panel",bodyPadding:null,bodyMargin:null,bodyBorder:null},getElementConfig:function(){var a=this.callParent();a.children.push({reference:"tipElement",className:"x-anchor",hidden:true});return a},applyBodyPadding:function(a){if(a===true){a=5}a=Ext.dom.Element.unitizeBox(a);return a},updateBodyPadding:function(a){this.element.setStyle("padding",a)},applyBodyMargin:function(a){if(a===true){a=5}a=Ext.dom.Element.unitizeBox(a);return a},updateBodyMargin:function(a){this.element.setStyle("margin",a)},applyBodyBorder:function(a){if(a===true){a=1}a=Ext.dom.Element.unitizeBox(a);return a},updateBodyBorder:function(a){this.element.setStyle("border-width",a)},alignTo:function(m){var w=this.tipElement;w.hide();if(this.currentTipPosition){w.removeCls("x-anchor-"+this.currentTipPosition)}this.callParent(arguments);var f=Ext.util.LineSegment,d=m.isComponent?m.renderElement:m,a=this.renderElement,n=d.getPageBox(),k=a.getPageBox(),b=k.left,t=k.top,C=k.right,h=k.bottom,j=b+(k.width/2),i=t+(k.height/2),o={x:b,y:t},l={x:C,y:t},B={x:b,y:h},D={x:C,y:h},y={x:j,y:i},s=n.left+(n.width/2),q=n.top+(n.height/2),v={x:s,y:q},c=new f(y,v),g=0,A=0,e,z,r,p,x,u;w.setVisibility(false);w.show();e=w.getSize();z=e.width;r=e.height;if(c.intersects(new f(o,l))){x=Math.min(Math.max(s,b),C-(z/2));u=t;A=r+10;p="top"}else{if(c.intersects(new f(o,B))){x=b;u=Math.min(Math.max(q+(z/2),t),h);g=r+10;p="left"}else{if(c.intersects(new f(B,D))){x=Math.min(Math.max(s,b),C-(z/2));u=h;A=-r-10;p="bottom"}else{if(c.intersects(new f(l,D))){x=C;u=Math.min(Math.max(q-(z/2),t),h);g=-r-10;p="right"}}}}if(x||u){this.currentTipPosition=p;w.addCls("x-anchor-"+p);w.setLeft(x-b);w.setTop(u-t);w.setVisibility(true);this.setLeft(this.getLeft()+g);this.setTop(this.getTop()+A)}}});Ext.define("Ext.SegmentedButton",{extend:"Ext.Container",xtype:"segmentedbutton",requires:["Ext.Button"],config:{baseCls:Ext.baseCSSPrefix+"segmentedbutton",pressedCls:Ext.baseCSSPrefix+"button-pressed",allowMultiple:false,allowDepress:null,pressedButtons:null,layout:{type:"hbox",align:"stretch"},defaultType:"button"},initialize:function(){var a=this;a.callParent();a.on({delegate:"> button",scope:a,tap:"onButtonRelease"});a.onAfter({delegate:"> button",scope:a,hiddenchange:"onButtonHiddenChange"})},updateAllowMultiple:function(){if(!this.initialized&&!this.getInitialConfig().hasOwnProperty("allowDepress")){this.setAllowDepress(true)}},applyItems:function(){var e=this,f=[],d,b,c,a;e.callParent(arguments);a=this.getItems();d=a.length;for(b=0;b<d;b++){c=a.items[b];if(c.getInitialConfig("pressed")){f.push(a.items[b])}}e.updateFirstAndLastCls(a);e.setPressedButtons(f)},onButtonRelease:function(a){var d=this,e=d.getPressedButtons(),c=[],b;if(!d.getDisabled()&&!a.getDisabled()){if(d.getAllowMultiple()){c=e.concat(c)}b=(c.indexOf(a)!==-1)||(e.indexOf(a)!==-1);if(b&&d.getAllowDepress()){Ext.Array.remove(c,a)}else{if(!b||!d.getAllowDepress()){c.push(a)}}d.setPressedButtons(c);Ext.defer(function(){d.fireEvent("toggle",d,a,d.isPressed(a))},50)}},onButtonHiddenChange:function(){this.updateFirstAndLastCls(this.getItems())},updateFirstAndLastCls:function(a){var d=a.length,e=Ext.baseCSSPrefix,c,b;for(b=0;b<d;b++){c=a.items[b];if(!c.isHidden()){c.addCls(e+"first");break}}for(b=d-1;b>=0;b--){c=a.items[b];if(!c.isHidden()){c.addCls(e+"last");break}}},applyPressedButtons:function(a){var e=this,f=[],c,d,b;if(Ext.isArray(a)){d=a.length;for(b=0;b<d;b++){c=e.getComponent(a[b]);if(c&&f.indexOf(c)===-1){f.push(c)}}}else{c=e.getComponent(a);if(c&&f.indexOf(c)===-1){f.push(c)}}return f},updatePressedButtons:function(a){var h=this,b=h.getItems(),g=h.getPressedCls(),f,d,e,c;e=b.length;for(c=0;c<e;c++){f=b.items[c];f.removeCls([g,f.getPressedCls()])}e=a.length;for(c=0;c<e;c++){d=a[c];d.addCls(g)}},isPressed:function(a){var b=this.getPressedButtons();return b.indexOf(a)!=-1},doSetDisabled:function(a){var b=this;b.items.each(function(c){c.setDisabled(a)},b);b.callParent(arguments)}},function(){});Ext.define("Ext.Sheet",{extend:"Ext.Panel",xtype:"sheet",requires:["Ext.fx.Animation"],config:{baseCls:Ext.baseCSSPrefix+"sheet",hidden:true,modal:true,centered:true,stretchX:null,stretchY:null,enter:"bottom",exit:"bottom",showAnimation:!Ext.os.is.Android2?{type:"slideIn",duration:250,easing:"ease-out"}:null,hideAnimation:!Ext.os.is.Android2?{type:"slideOut",duration:250,easing:"ease-in"}:null},applyHideAnimation:function(b){var a=this.getExit(),d=a;if(a===null){return null}if(b===true){b={type:"slideOut"}}if(Ext.isString(b)){b={type:b}}var c=Ext.factory(b,Ext.fx.Animation);if(c){if(a=="bottom"){d="down"}if(a=="top"){d="up"}c.setDirection(d)}return c},applyShowAnimation:function(a){var d=this.getEnter(),c=d;if(d===null){return null}if(a===true){a={type:"slideIn"}}if(Ext.isString(a)){a={type:a}}var b=Ext.factory(a,Ext.fx.Animation);if(b){if(d=="bottom"){c="down"}if(d=="top"){c="up"}b.setBefore({display:null});b.setReverse(true);b.setDirection(c)}return b},updateStretchX:function(a){this.getLeft();this.getRight();if(a){this.setLeft(0);this.setRight(0)}},updateStretchY:function(a){this.getTop();this.getBottom();if(a){this.setTop(0);this.setBottom(0)}}});Ext.define("Ext.ActionSheet",{extend:"Ext.Sheet",alias:"widget.actionsheet",requires:["Ext.Button"],config:{baseCls:Ext.baseCSSPrefix+"sheet-action",left:0,right:0,bottom:0,centered:false,height:"auto",defaultType:"button"}});Ext.define("Ext.TitleBar",{extend:"Ext.Container",xtype:"titlebar",requires:["Ext.Button","Ext.Title","Ext.Spacer","Ext.util.SizeMonitor"],isToolbar:true,config:{baseCls:Ext.baseCSSPrefix+"toolbar",cls:Ext.baseCSSPrefix+"navigation-bar",ui:"dark",title:null,defaultType:"button",layout:{type:"hbox"},items:[]},maxButtonWidth:"40%",constructor:function(){this.refreshTitlePosition=Ext.Function.createThrottled(this.refreshTitlePosition,50,this);this.callParent(arguments)},beforeInitialize:function(){this.applyItems=this.applyInitialItems},initialize:function(){delete this.applyItems;this.doAdd=this.doBoxAdd;this.remove=this.doBoxRemove;this.doInsert=this.doBoxInsert;this.add(this.initialItems);delete this.initialItems;this.on({painted:"onPainted",erased:"onErased"})},applyInitialItems:function(c){var e=Ext.util.SizeMonitor,f=this.getDefaults()||{},a,b,d;this.initialItems=c;this.leftBox=a=this.add({xtype:"container",style:"position: relative",layout:{type:"hbox",align:"center"}});this.spacer=d=this.add({xtype:"component",style:"position: relative",flex:1});this.rightBox=b=this.add({xtype:"container",style:"position: relative",layout:{type:"hbox",align:"center"}});this.titleComponent=this.add({xtype:"title",hidden:f.hidden,centered:true});this.sizeMonitors={leftBox:new e({element:a.renderElement,callback:this.refreshTitlePosition,scope:this}),spacer:new e({element:d.renderElement,callback:this.refreshTitlePosition,scope:this}),rightBox:new e({element:b.renderElement,callback:this.refreshTitlePosition,scope:this})}},doBoxAdd:function(a){if(a.config.align=="right"){this.rightBox.add(a)}else{this.leftBox.add(a)}if(this.painted){this.refreshTitlePosition()}},doBoxRemove:function(a){if(a.config.align=="right"){this.rightBox.remove(a)}else{this.leftBox.remove(a)}if(this.painted){this.refreshTitlePosition()}},doBoxInsert:function(a,b){if(b.config.align=="right"){this.rightBox.add(b)}else{this.leftBox.add(b)}},onPainted:function(){var a=this.sizeMonitors;this.painted=true;this.refreshTitlePosition();a.leftBox.refresh();a.spacer.refresh();a.rightBox.refresh()},onErased:function(){this.painted=false},getMaxButtonWidth:function(){var a=this.maxButtonWidth;if(Ext.isString(this.maxButtonWidth)){a=parseInt(a.replace("%",""),10);a=Math.round((this.element.getWidth()/100)*a)}return a},refreshTitlePosition:function(){var f=this.titleComponent.renderElement;f.setWidth(null);f.setLeft(null);var a=this.leftBox,c=a.down("button"),h,m;if(c){c.renderElement.setWidth("auto");h=a.renderElement.getWidth();m=this.getMaxButtonWidth();if(h>m){c.renderElement.setWidth(m)}}var j=this.spacer.renderElement.getPageBox(),k=f.getPageBox(),g=k.width-j.width,d=k.left,i=k.right,b,l,e;if(g>0){f.setWidth(j.width);b=g/2;d+=b;i-=b}l=j.left-d;e=i-j.right;if(l>0){f.setLeft(l)}else{if(e>0){f.setLeft(-e)}}f.repaint()},updateTitle:function(a){this.titleComponent.setTitle(a);this.titleBox=null;if(this.painted){this.refreshTitlePosition()}},destroy:function(){this.callParent();var a=this.sizeMonitors;a.leftBox.destroy();a.spacer.destroy();a.rightBox.destroy()}});Ext.define("Ext.Toolbar",{extend:"Ext.Container",xtype:"toolbar",requires:["Ext.Button","Ext.Title","Ext.Spacer"],isToolbar:true,config:{baseCls:Ext.baseCSSPrefix+"toolbar",ui:"dark",title:null,defaultType:"button",layout:{type:"hbox",align:"center"}},constructor:function(a){a=a||{};if(a.docked=="left"||a.docked=="right"){a.layout={type:"vbox",align:"stretch"}}this.callParent([a])},applyTitle:function(a){if(typeof a=="string"){a={title:a,centered:true}}return Ext.factory(a,Ext.Title,this.getTitle())},updateTitle:function(b,a){if(b){this.add(b);this.getLayout().setItemFlex(b,1)}if(a){a.destroy()}},showTitle:function(){var a=this.getTitle();if(a){a.show()}},hideTitle:function(){var a=this.getTitle();if(a){a.hide()}}},function(){});Ext.define("Ext.MessageBox",{extend:"Ext.Sheet",requires:["Ext.Toolbar","Ext.field.Text","Ext.field.TextArea"],config:{ui:"dark",baseCls:Ext.baseCSSPrefix+"msgbox",iconCls:null,showAnimation:{type:"popIn",duration:250,easing:"ease-out"},hideAnimation:{type:"popOut",duration:250,easing:"ease-out"},zIndex:10,defaultTextHeight:75,title:null,buttons:null,message:null,prompt:null,layout:{type:"vbox",pack:"center"}},statics:{OK:{text:"OK",itemId:"ok",ui:"action"},YES:{text:"Yes",itemId:"yes",ui:"action"},NO:{text:"No",itemId:"no"},CANCEL:{text:"Cancel",itemId:"cancel"},INFO:Ext.baseCSSPrefix+"msgbox-info",WARNING:Ext.baseCSSPrefix+"msgbox-warning",QUESTION:Ext.baseCSSPrefix+"msgbox-question",ERROR:Ext.baseCSSPrefix+"msgbox-error",OKCANCEL:[{text:"Cancel",itemId:"cancel"},{text:"OK",itemId:"ok",ui:"action"}],YESNOCANCEL:[{text:"Cancel",itemId:"cancel"},{text:"No",itemId:"no"},{text:"Yes",itemId:"yes",ui:"action"}],YESNO:[{text:"No",itemId:"no"},{text:"Yes",itemId:"yes",ui:"action"}]},constructor:function(a){a=a||{};if(a.hasOwnProperty("promptConfig")){Ext.applyIf(a,{prompt:a.promptConfig});delete a.promptConfig}if(a.hasOwnProperty("multiline")||a.hasOwnProperty("multiLine")){a.prompt=a.prompt||{};Ext.applyIf(a.prompt,{multiLine:a.multiline||a.multiLine});delete a.multiline;delete a.multiLine}this.callParent([a])},applyTitle:function(a){if(typeof a=="string"){a={title:a}}Ext.applyIf(a,{docked:"top",cls:this.getBaseCls()+"-title"});return Ext.factory(a,Ext.Toolbar,this.getTitle())},updateTitle:function(a){if(a){this.add(a)}},updateButtons:function(a){var b=this;if(a){if(b.buttonsToolbar){b.buttonsToolbar.removeAll();b.buttonsToolbar.setItems(a)}else{b.buttonsToolbar=Ext.create("Ext.Toolbar",{docked:"bottom",defaultType:"button",layout:{type:"hbox",pack:"center"},ui:b.getUi(),cls:b.getBaseCls()+"-buttons",items:a});b.add(b.buttonsToolbar)}}},applyMessage:function(a){a={html:a,cls:this.getBaseCls()+"-text"};return Ext.factory(a,Ext.Component,this._message)},updateMessage:function(a){if(a){this.add(a)}},getMessage:function(){if(this._message){return this._message.getHtml()}return null},applyIconCls:function(a){a={xtype:"component",docked:"left",width:40,height:40,baseCls:Ext.baseCSSPrefix+"icon",hidden:(a)?false:true,cls:a};return Ext.factory(a,Ext.Component,this._iconCls)},updateIconCls:function(a,b){var c=this;this.getTitle();this.getButtons();if(a&&!b){this.add(a)}else{this.remove(b)}},getIconCls:function(){var b=this._iconCls,a;if(b){a=b.getCls();return(a)?a[0]:null}return null},applyPrompt:function(a){if(a){var b={label:false};if(Ext.isObject(a)){Ext.apply(b,a)}if(b.multiLine){b.height=Ext.isNumber(b.multiLine)?parseFloat(b.multiLine):this.getDefaultTextHeight();return Ext.factory(b,Ext.field.TextArea,this.getPrompt())}else{return Ext.factory(b,Ext.field.Text,this.getPrompt())}}return a},updatePrompt:function(a,b){if(a){this.add(a)}if(b){this.remove(b)}},onClick:function(c){if(c){var b=c.config.userConfig||{},d=c.getInitialConfig(),a=this.getPrompt();if(typeof b.fn=="function"){this.on({hiddenchange:function(){b.fn.call(b.scope||null,d.itemId||d.text,a?a.getValue():null,b)},single:true,scope:this})}if(b.cls){this.el.removeCls(b.cls)}if(b.input){b.input.dom.blur()}}this.hide()},show:function(f){if(!this.getParent()&&Ext.Viewport){Ext.Viewport.add(this)}if(!f){return this.callParent()}var b=Ext.Object.merge({},{value:""},f);var e=f.buttons||Ext.MessageBox.OK||[],d=[],c=f;Ext.each(e,function(g){if(!g){return}d.push(Ext.apply({userConfig:c,scope:this,handler:"onClick"},g))},this);b.buttons=d;if(b.promptConfig){}b.prompt=(b.promptConfig||b.prompt)||null;if(b.multiLine){b.prompt=b.prompt||{};b.prompt.multiLine=b.multiLine;delete b.multiLine}this.setConfig(b);var a=this.getPrompt();if(a){a.setValue(f.value||"")}this.callParent();return this},alert:function(d,c,b,a){return this.show({title:d,message:c,buttons:Ext.MessageBox.OK,promptConfig:false,fn:function(e){if(b){b.call(a,e)}},scope:a})},confirm:function(d,c,b,a){return this.show({title:d,message:c,buttons:Ext.MessageBox.YESNO,promptConfig:false,scope:a,fn:function(e){if(b){b.call(a,e)}}})},prompt:function(g,d,c,b,f,e,a){return this.show({title:g,message:d,buttons:Ext.MessageBox.OKCANCEL,scope:b,prompt:a||true,multiLine:f,value:e,fn:function(i,h){if(c){c.call(b,i,h)}}})}},function(a){Ext.onSetup(function(){Ext.Msg=new a})});Ext.define("Ext.carousel.Carousel",{extend:"Ext.Container",alternateClassName:"Ext.Carousel",xtype:"carousel",requires:["Ext.fx.easing.EaseOut","Ext.carousel.Item","Ext.carousel.Indicator"],config:{baseCls:"x-carousel",direction:"horizontal",directionLock:false,animation:{duration:250,easing:{type:"ease-out"}},indicator:true,ui:"dark",itemConfig:{},bufferSize:1,itemLength:null},itemLength:0,offset:0,flickStartOffset:0,flickStartTime:0,dragDirection:0,count:0,painted:false,activeIndex:-1,beforeInitialize:function(){this.animationListeners={animationframe:"onActiveItemAnimationFrame",animationend:"onActiveItemAnimationEnd",scope:this};this.element.on({dragstart:"onDragStart",drag:"onDrag",dragend:"onDragEnd",scope:this});this.on({painted:"onPainted",erased:"onErased",resize:"onSizeChange"});this.carouselItems=[];this.orderedCarouselItems=[];this.inactiveCarouselItems=[];this.hiddenTranslation=0},updateBufferSize:function(n){var l=Ext.carousel.Item,h=n*2+1,m=this.isRendered(),c=this.innerElement,g=this.carouselItems,f=g.length,e=this.getItemConfig(),d=this.getItemLength(),j=this.getDirection(),b=j==="horizontal"?"setWidth":"setHeight",a,k;for(a=f;a<h;a++){k=Ext.factory(e,l);if(d){k[b].call(k,d)}g.push(k);c.append(k.renderElement);if(m&&k.setRendered(true)){k.fireEvent("renderedchange",this,k,true)}}},getActiveCarouselItem:function(){return this.orderedCarouselItems[this.getBufferSize()]},setRendered:function(g){var a=this.rendered;if(g!==a){this.rendered=g;var b=this.items.items,d=this.carouselItems,c,f,e;for(c=0,f=b.length;c<f;c++){e=b[c];if(!e.isInnerItem()){e.setRendered(g)}}for(c=0,f=d.length;c<f;c++){d[c].setRendered(g)}return true}return false},onPainted:function(){this.painted=true;this.refresh();this.refreshCarouselItems()},onErased:function(){this.painted=false},onSizeChange:function(){this.refreshSizing();this.refreshCarouselItems();this.refreshOffset()},onItemAdd:function(c,b){this.callParent(arguments);var d=this.getInnerItems().indexOf(c),a=this.getIndicator();if(a&&c.isInnerItem()){a.addIndicator()}if(d<=this.getActiveIndex()){this.refreshActiveIndex()}if(this.painted&&this.isIndexDirty(d)){this.refreshActiveItem()}},doItemLayoutAdd:function(a){if(a.isInnerItem()){return}this.callParent(arguments)},onItemRemove:function(f,b){this.callParent(arguments);var h=this.getInnerItems().indexOf(f),a=this.getIndicator(),d=this.carouselItems,c,e,g;if(f.isInnerItem()&&a){a.removeIndicator()}if(h<=this.getActiveIndex()){this.refreshActiveIndex()}if(this.isIndexDirty(h)){for(c=0,e=d.length;c<e;c++){g=d[c];if(g.getComponent()===f){g.setComponent(null)}}if(this.painted){this.refreshActiveItem()}}},doItemLayoutRemove:function(a){if(a.isInnerItem()){return}this.callParent(arguments)},onInnerItemMove:function(b,c,a){if(this.painted&&(this.isIndexDirty(c)||this.isIndexDirty(a))){this.refreshActiveItem()}},doItemLayoutMove:function(a){if(a.isInnerItem()){return}this.callParent(arguments)},isIndexDirty:function(b){var a=this.getActiveIndex(),c=this.getBufferSize();return(b>=a-c&&b<=a+c)},onDragStart:function(f){var d=this.getDirection(),b=f.absDeltaX,a=f.absDeltaY,c=this.getDirectionLock();this.isDragging=true;if(c){if((d==="horizontal"&&b>a)||(d==="vertical"&&a>b)){f.stopPropagation()}else{this.isDragging=false;return}}if(this.isAnimating){this.getActiveCarouselItem().getTranslatable().stopAnimation()}this.dragStartOffset=this.offset;this.dragDirection=0},onDrag:function(j){if(!this.isDragging){return}var k=this.dragStartOffset,l=this.getDirection(),m=l==="horizontal"?j.deltaX:j.deltaY,a=this.offset,i=this.flickStartTime,c=this.dragDirection,b=Ext.Date.now(),h=this.getActiveIndex(),f=this.getMaxItemIndex(),d=c,g;if((h===0&&m>0)||(h===f&&m<0)){m*=0.5}g=k+m;if(g>a){c=1}else{if(g<a){c=-1}}if(c!==d||(b-i)>300){this.flickStartOffset=a;this.flickStartTime=b}this.dragDirection=c;this.setOffset(g)},onDragEnd:function(j){if(!this.isDragging){return}this.onDrag(j);this.isDragging=false;var a=Ext.Date.now(),i=this.itemLength,g=i/2,f=this.offset,m=this.getActiveIndex(),c=this.getMaxItemIndex(),h=0,l=f-this.flickStartOffset,b=a-this.flickStartTime,k=this.getIndicator(),d;if(b>0&&Math.abs(l)>=10){d=l/b;if(Math.abs(d)>=1){if(d<0&&m<c){h=-1}else{if(d>0&&m>0){h=1}}}}if(h===0){if(m<c&&f<-g){h=-1}else{if(m>0&&f>g){h=1}}}if(k){k.setActiveIndex(m-h)}this.animationDirection=h;this.setOffsetAnimated(h*i)},applyAnimation:function(a){a.easing=Ext.factory(a.easing,Ext.fx.easing.EaseOut);return a},updateDirection:function(b){var a=this.getIndicator();this.currentAxis=(b==="horizontal")?"x":"y";if(a){a.setDirection(b)}},setOffset:function(e){var k=this.orderedCarouselItems,c=this.getBufferSize(),g=k[c],j=this.itemLength,d=this.currentAxis,a,h,b,f;this.offset=e;e+=this.itemOffset;if(g){g.translateAxis(d,e);for(f=1,b=0;f<=c;f++){h=k[c-f];if(h){b+=j;h.translateAxis(d,e-b)}}for(f=1,b=0;f<=c;f++){a=k[c+f];if(a){b+=j;a.translateAxis(d,e+b)}}}return this},setOffsetAnimated:function(c){var b=this.orderedCarouselItems[this.getBufferSize()],a=this.getIndicator();if(a){a.setActiveIndex(this.getActiveIndex()-this.animationDirection)}this.offset=c;c+=this.itemOffset;if(b){this.isAnimating=true;b.getTranslatable().on(this.animationListeners);b.translateAxis(this.currentAxis,c,this.getAnimation())}return this},onActiveItemAnimationFrame:function(k){var j=this.orderedCarouselItems,c=this.getBufferSize(),h=this.itemLength,d=this.currentAxis,e=k[d],g,a,f,b;for(f=1,b=0;f<=c;f++){g=j[c-f];if(g){b+=h;g.translateAxis(d,e-b)}}for(f=1,b=0;f<=c;f++){a=j[c+f];if(a){b+=h;a.translateAxis(d,e+b)}}},onActiveItemAnimationEnd:function(b){var c=this.getActiveIndex(),a=this.animationDirection,e=this.currentAxis,f=b[e],d=this.itemLength,g;this.isAnimating=false;b.un(this.animationListeners);if(a===-1){g=d+f}else{if(a===1){g=f-d}else{g=f}}g-=this.itemOffset;this.offset=g;this.setActiveItem(c-a)},refresh:function(){this.refreshSizing();this.refreshActiveItem()},refreshSizing:function(){var a=this.element,b=this.getItemLength(),c,d;if(this.getDirection()==="horizontal"){d=a.getWidth()}else{d=a.getHeight()}this.hiddenTranslation=-d;if(b===null){b=d;c=0}else{c=(d-b)/2}this.itemLength=b;this.itemOffset=c},refreshOffset:function(){this.setOffset(this.offset)},refreshActiveItem:function(){this.doSetActiveItem(this.getActiveItem())},getActiveIndex:function(){return this.activeIndex},refreshActiveIndex:function(){this.activeIndex=this.getInnerItemIndex(this.getActiveItem())},refreshCarouselItems:function(){var a=this.carouselItems,b,d,c;for(b=0,d=a.length;b<d;b++){c=a[b];c.getTranslatable().refresh()}this.refreshInactiveCarouselItems()},refreshInactiveCarouselItems:function(){var a=this.inactiveCarouselItems,f=this.hiddenTranslation,c=this.currentAxis,b,e,d;for(b=0,e=a.length;b<e;b++){d=a[b];d.translateAxis(c,f)}},getMaxItemIndex:function(){return this.innerItems.length-1},getInnerItemIndex:function(a){return this.innerItems.indexOf(a)},getInnerItemAt:function(a){return this.innerItems[a]},applyActiveItem:function(){var b=this.callParent(arguments),a;if(b){a=this.getInnerItemIndex(b);if(a!==-1){this.activeIndex=a;return b}}},doSetActiveItem:function(g){var q=this.getActiveIndex(),e=this.getMaxItemIndex(),m=this.getIndicator(),c=this.getBufferSize(),k=this.carouselItems.slice(),n=this.orderedCarouselItems,p={},o={},a,l,b,f,h,j,d;if(k.length===0){return}this.callParent(arguments);n.length=0;if(g){b=g.getId();o[b]=g;p[b]=c;if(q>0){for(f=1;f<=c;f++){h=q-f;if(h>=0){a=this.getInnerItemAt(h);b=a.getId();o[b]=a;p[b]=c-f}else{break}}}if(q<e){for(f=1;f<=c;f++){h=q+f;if(h<=e){a=this.getInnerItemAt(h);b=a.getId();o[b]=a;p[b]=c+f}else{break}}}for(f=0,j=k.length;f<j;f++){d=k[f];l=d.getComponent();if(l){b=l.getId();if(p.hasOwnProperty(b)){k.splice(f,1);f--;j--;delete o[b];n[p[b]]=d}}}for(b in o){if(o.hasOwnProperty(b)){a=o[b];d=k.pop();d.setComponent(a);n[p[b]]=d}}}this.inactiveCarouselItems.length=0;this.inactiveCarouselItems=k;this.refreshOffset();this.refreshInactiveCarouselItems();if(m){m.setActiveIndex(q)}},next:function(){if(this.isAnimating){this.getActiveCarouselItem().getTranslatable().stopAnimation();this.setOffset(0)}if(this.activeIndex===this.getMaxItemIndex()){return this}this.animationDirection=-1;this.setOffsetAnimated(-this.itemLength);return this},previous:function(){if(this.isAnimating){this.getActiveCarouselItem().getTranslatable().stopAnimation();this.setOffset(0)}if(this.activeIndex===0){return this}this.animationDirection=1;this.setOffsetAnimated(this.itemLength);return this},applyIndicator:function(a,b){return Ext.factory(a,Ext.carousel.Indicator,b)},updateIndicator:function(a){if(a){this.insertFirst(a);a.setUi(this.getUi());a.on({next:"next",previous:"previous",scope:this})}},destroy:function(){var a=this.carouselItems.slice();this.carouselItems.length=0;Ext.destroy(a,this.getIndicator());this.callParent();delete this.carouselItems}},function(){});Ext.define("Ext.carousel.Infinite",{extend:"Ext.carousel.Carousel",config:{indicator:null,maxItemIndex:Infinity,innerItemConfig:{}},applyIndicator:function(a){return},updateBufferSize:function(b){this.callParent(arguments);var e=b*2+1,d=this.innerItems.length,c=this.getInnerItemConfig(),a;for(a=d;a<e;a++){this.doAdd(this.factoryItem(c))}this.rebuildInnerIndexes();this.refreshActiveItem()},updateMaxItemIndex:function(b,c){if(c!==undefined){var a=this.getActiveIndex();if(a>b){this.setActiveItem(b)}else{this.rebuildInnerIndexes(a);this.refreshActiveItem()}}},rebuildInnerIndexes:function(n){var c=this.innerIndexToItem,g=this.innerIdToIndex,j=this.innerItems.slice(),h=j.length,b=this.getBufferSize(),d=this.getMaxItemIndex(),l=[],e,k,f,a,m;if(n===undefined){this.innerIndexToItem=c={};this.innerIdToIndex=g={};for(e=0;e<h;e++){m=j[e];a=m.getId();g[a]=e;c[e]=m;this.fireEvent("itemindexchange",this,m,e,-1)}}else{for(e=n-b;e<=n+b;e++){if(e>=0&&e<=d){if(c.hasOwnProperty(e)){Ext.Array.remove(j,c[e]);continue}l.push(e)}}for(e=0,h=l.length;e<h;e++){m=j[e];a=m.getId();f=l[e];k=g[a];delete c[k];g[a]=f;c[f]=m;this.fireEvent("itemindexchange",this,m,f,k)}}},reset:function(){this.rebuildInnerIndexes();this.setActiveItem(0)},refreshItems:function(){var a=this.innerItems,f=this.innerIdToIndex,b,e,c,d;for(c=0,d=a.length;c<d;c++){e=a[c];b=f[e.getId()];this.fireEvent("itemindexchange",this,e,b,-1)}},getInnerItemIndex:function(b){var a=this.innerIdToIndex[b.getId()];return(typeof a=="number")?a:-1},getInnerItemAt:function(a){return this.innerIndexToItem[a]},applyActiveItem:function(c){this.getItems();this.getBufferSize();var b=this.getMaxItemIndex(),a=this.getActiveIndex();if(typeof c=="number"){c=Math.max(0,Math.min(c,b));if(c===a){return}this.activeIndex=c;this.rebuildInnerIndexes(c);c=this.getInnerItemAt(c)}if(c){return this.callParent([c])}}});Ext.define("Ext.dataview.component.DataItem",{extend:"Ext.Container",xtype:"dataitem",config:{baseCls:Ext.baseCSSPrefix+"data-item",defaultType:"component",record:null,itemCls:null,dataMap:{},items:[{xtype:"component"}]},updateBaseCls:function(a,b){var c=this;c.callParent(arguments)},updateItemCls:function(b,a){if(a){this.removeCls(a)}if(b){this.addCls(b)}},updateRecord:function(d){if(!d){return}var h=this,c=h.config.dataview,b=c.prepareData(d.getData(true),c.getStore().indexOf(d),d),e=h.getItems(),k=e.first(),i=h.getDataMap(),f,j,g,a;if(!k){return}for(f in i){g=i[f];j=h[f]();if(j){for(a in g){if(j[a]){j[a](b[g[a]])}}}}h.fireEvent("updatedata",h,b);k.updateData(b)}});Ext.define("Ext.dataview.component.Container",{extend:"Ext.Container",requires:["Ext.dataview.component.DataItem"],constructor:function(){this.itemCache=[];this.callParent(arguments)},doInitialize:function(){this.innerElement.on({touchstart:"onItemTouchStart",touchend:"onItemTouchEnd",tap:"onItemTap",touchmove:"onItemTouchMove",doubletap:"onItemDoubleTap",swipe:"onItemSwipe",delegate:"> ."+Ext.baseCSSPrefix+"data-item",scope:this})},initialize:function(){this.callParent();this.doInitialize()},onItemTouchStart:function(d){var b=this,c=d.getTarget(),a=Ext.getCmp(c.id);a.on({touchmove:"onItemTouchMove",scope:b,single:true});b.fireEvent("itemtouchstart",b,a,b.indexOf(a),d)},onItemTouchMove:function(d){var b=this,c=d.getTarget(),a=Ext.getCmp(c.id);b.fireEvent("itemtouchmove",b,a,b.indexOf(a),d)},onItemTouchEnd:function(d){var b=this,c=d.getTarget(),a=Ext.getCmp(c.id);a.un({touchmove:"onItemTouchMove",scope:b});b.fireEvent("itemtouchend",b,a,b.indexOf(a),d)},onItemTap:function(d){var b=this,c=d.getTarget(),a=Ext.getCmp(c.id);b.fireEvent("itemtap",b,a,b.indexOf(a),d)},onItemTapHold:function(d){var b=this,c=d.getTarget(),a=Ext.getCmp(c.id);b.fireEvent("itemtaphold",b,a,b.indexOf(a),d)},onItemDoubleTap:function(d){var b=this,c=d.getTarget(),a=Ext.getCmp(c.id);b.fireEvent("itemdoubletap",b,a,b.indexOf(a),d)},onItemSwipe:function(d){var b=this,c=d.getTarget(),a=Ext.getCmp(c.id);b.fireEvent("itemswipe",b,a,b.indexOf(a),d)},moveItemsToCache:function(j,k){var h=this,c=h.dataview,a=c.getMaxItemCache(),g=h.getViewItems(),f=h.itemCache,e=f.length,l=c.getPressedCls(),d=c.getSelectedCls(),b=k-j,m;for(;b>=0;b--){m=g[j+b];if(e!==a){h.remove(m,false);m.removeCls([l,d]);f.push(m);e++}else{m.destroy()}}if(h.getViewItems().length==0){this.dataview.showEmptyText()}},moveItemsFromCache:function(b){var l=this,e=l.dataview,m=e.getStore(),k=b.length,a=e.getDefaultType(),h=e.getItemConfig(),g=l.itemCache,f=g.length,j=[],c,n,d;if(k){e.hideEmptyText()}for(c=0;c<k;c++){b[c]._tmpIndex=m.indexOf(b[c])}Ext.Array.sort(b,function(o,i){return o._tmpIndex>i._tmpIndex?1:-1});for(c=0;c<k;c++){d=b[c];if(f){f--;n=g.pop();this.updateListItem(d,n)}else{n=l.getDataItemConfig(a,d,h)}this.insert(d._tmpIndex,n);delete d._tmpIndex}return j},getViewItems:function(){return this.getInnerItems()},updateListItem:function(a,b){if(b.updateRecord){b.updateRecord(a)}},getDataItemConfig:function(d,b,c){var a=this.dataview;return{xtype:d,record:b,dataview:a,itemCls:a.getItemCls(),defaults:c}},doRemoveItemCls:function(a){var b=this.getViewItems(),d=b.length,c=0;for(;c<d;c++){b[c].removeCls(a)}},doAddItemCls:function(a){var b=this.getViewItems(),d=b.length,c=0;for(;c<d;c++){b[c].addCls(a)}},destroy:function(){var d=this,b=d.itemCache,c=b.length,a=0;for(;a<c;a++){b[a].destroy()}this.callParent()}});Ext.define("Ext.dataview.DataView",{extend:"Ext.Container",alternateClassName:"Ext.DataView",mixins:["Ext.mixin.Selectable"],xtype:"dataview",requires:["Ext.LoadMask","Ext.data.StoreManager","Ext.dataview.component.Container","Ext.dataview.element.Container"],config:{store:null,baseCls:Ext.baseCSSPrefix+"dataview",emptyText:null,deferEmptyText:true,itemTpl:"<div>{text}</div>",pressedCls:"x-item-pressed",itemCls:null,selectedCls:"x-item-selected",triggerEvent:"itemtap",triggerCtEvent:"tap",deselectOnContainerClick:true,scrollable:true,inline:null,pressedDelay:100,loadingText:"Loading...",useComponents:null,itemConfig:{},maxItemCache:20,defaultType:"dataitem",scrollToTopOnRefresh:true},constructor:function(a){var b=this;b.hasLoadedStore=false;b.mixins.selectable.constructor.apply(b,arguments);b.callParent(arguments)},updateItemCls:function(c,b){var a=this.container;if(a){if(b){a.doRemoveItemCls(b)}if(c){a.doAddItemCls(c)}}},storeEventHooks:{beforeload:"onBeforeLoad",load:"onLoad",refresh:"refresh",addrecords:"onStoreAdd",removerecords:"onStoreRemove",updaterecord:"onStoreUpdate"},initialize:function(){this.callParent();var b=this,a;b.on(b.getTriggerCtEvent(),b.onContainerTrigger,b);a=b.container=this.add(new Ext.dataview[b.getUseComponents()?"component":"element"].Container({baseCls:this.getBaseCls()}));a.dataview=b;b.on(b.getTriggerEvent(),b.onItemTrigger,b);a.on({itemtouchstart:"onItemTouchStart",itemtouchend:"onItemTouchEnd",itemtap:"onItemTap",itemtaphold:"onItemTapHold",itemtouchmove:"onItemTouchMove",itemdoubletap:"onItemDoubleTap",itemswipe:"onItemSwipe",scope:b});if(this.getStore()){this.refresh()}},applyInline:function(a){if(Ext.isObject(a)){a=Ext.apply({},a)}return a},updateInline:function(c,b){var a=this.getBaseCls();if(b){this.removeCls([a+"-inlineblock",a+"-nowrap"])}if(c){this.addCls(a+"-inlineblock");if(Ext.isObject(c)&&c.wrap===false){this.addCls(a+"-nowrap")}else{this.removeCls(a+"-nowrap")}}},prepareData:function(c,b,a){return c},onContainerTrigger:function(b){var a=this;if(b.target!=a.element.dom){return}if(a.getDeselectOnContainerClick()&&a.getStore()){a.deselectAll()}},onItemTrigger:function(b,a){this.selectWithEvent(this.getStore().getAt(a))},doAddPressedCls:function(a){var c=this,b=c.container.getViewItems()[c.getStore().indexOf(a)];if(Ext.isElement(b)){b=Ext.get(b)}if(b){b.addCls(c.getPressedCls())}},onItemTouchStart:function(b,h,d,g){var f=this,c=f.getStore(),a=c&&c.getAt(d);f.fireAction("itemtouchstart",[f,d,h,a,g],"doItemTouchStart")},doItemTouchStart:function(c,b,e,a){var d=c.getPressedDelay();if(a){if(d>0){c.pressedTimeout=Ext.defer(c.doAddPressedCls,d,c,[a])}else{c.doAddPressedCls(a)}}},onItemTouchEnd:function(b,h,d,g){var f=this,c=f.getStore(),a=c&&c.getAt(d);if(this.hasOwnProperty("pressedTimeout")){clearTimeout(this.pressedTimeout);delete this.pressedTimeout}if(a&&h){h.removeCls(f.getPressedCls())}f.fireEvent("itemtouchend",f,d,h,a,g)},onItemTouchMove:function(b,h,d,g){var f=this,c=f.getStore(),a=c&&c.getAt(d);if(f.hasOwnProperty("pressedTimeout")){clearTimeout(f.pressedTimeout);delete f.pressedTimeout}if(a&&h){h.removeCls(f.getPressedCls())}f.fireEvent("itemtouchmove",f,d,h,a,g)},onItemTap:function(b,h,d,g){var f=this,c=f.getStore(),a=c&&c.getAt(d);f.fireEvent("itemtap",f,d,h,a,g)},onItemTapHold:function(b,h,d,g){var f=this,c=f.getStore(),a=c&&c.getAt(d);f.fireEvent("itemtaphold",f,d,h,a,g)},onItemDoubleTap:function(b,h,d,g){var f=this,c=f.getStore(),a=c&&c.getAt(d);f.fireEvent("itemdoubletap",f,d,h,a,g)},onItemSwipe:function(b,h,d,g){var f=this,c=f.getStore(),a=c&&c.getAt(d);f.fireEvent("itemswipe",f,d,h,a,g)},onItemSelect:function(a,b){var c=this;if(b){c.doItemSelect(c,a)}else{c.fireAction("select",[c,a],"doItemSelect")}},doItemSelect:function(c,a){if(c.container){var b=c.container.getViewItems()[c.getStore().indexOf(a)];if(Ext.isElement(b)){b=Ext.get(b)}if(b){b.removeCls(c.getPressedCls());b.addCls(c.getSelectedCls())}}},onItemDeselect:function(a,b){var c=this;if(c.container){if(b){c.doItemDeselect(c,a)}else{c.fireAction("deselect",[c,a,b],"doItemDeselect")}}},doItemDeselect:function(c,a){var b=c.container.getViewItems()[c.getStore().indexOf(a)];if(Ext.isElement(b)){b=Ext.get(b)}if(b){b.removeCls([c.getPressedCls(),c.getSelectedCls()])}},updateData:function(b){var a=this.getStore();if(!a){this.setStore(Ext.create("Ext.data.Store",{data:b}))}else{a.add(b)}},applyStore:function(b){var d=this,e=Ext.apply({},d.storeEventHooks,{scope:d}),c,a;if(b){b=Ext.data.StoreManager.lookup(b);if(b&&Ext.isObject(b)&&b.isStore){b.on(e);c=b.getProxy();if(c){a=c.getReader();if(a){a.on("exception","handleException",this)}}}}return b},handleException:function(){this.setMasked(false)},updateStore:function(b,e){var d=this,f=Ext.apply({},d.storeEventHooks,{scope:d}),c,a;if(e&&Ext.isObject(e)&&e.isStore){if(e.autoDestroy){e.destroy()}else{e.un(f);c=e.getProxy();if(c){a=c.getReader();if(a){a.un("exception","handleException",this)}}}}if(b){if(b.isLoaded()){this.hasLoadedStore=true}if(b.isLoading()){d.onBeforeLoad()}if(d.container){d.refresh()}}},onBeforeLoad:function(){var b=this.getScrollable();if(b){b.getScroller().stopAnimation()}var a=this.getLoadingText();if(a){this.setMasked({xtype:"loadmask",message:a});if(b){b.getScroller().setDisabled(true)}}this.hideEmptyText()},updateEmptyText:function(b){var a=this;if(b){a.emptyTextCmp=a.add({xtype:"component",cls:a.getBaseCls()+"-emptytext",html:b,hidden:true})}else{if(a.emptyTextCmp){a.remove(a.emptyTextCmp,true);delete a.emptyTextCmp}}},onLoad:function(a){var b=this.getScrollable();this.hasLoadedStore=true;this.setMasked(false);if(b){b.getScroller().setDisabled(false)}if(!a.getCount()){this.showEmptyText()}},refresh:function(){var b=this,a=b.container;if(!b.getStore()){if(!b.hasLoadedStore&&!b.getDeferEmptyText()){b.showEmptyText()}return}if(a){b.fireAction("refresh",[b],"doRefresh")}},applyItemTpl:function(a){return(Ext.isObject(a)&&a.isTemplate)?a:new Ext.XTemplate(a)},onAfterRender:function(){var a=this;a.callParent(arguments);a.updateStore(a.getStore())},getViewItems:function(){return this.container.getViewItems()},doRefresh:function(f){var a=f.container,j=f.getStore(),b=j.getRange(),e=a.getViewItems(),h=b.length,l=e.length,c=h-l,g=f.getScrollable(),d,k;if(this.getScrollToTopOnRefresh()&&g){g.getScroller().scrollToTop()}if(h<1){f.onStoreClear();return}if(c<0){a.moveItemsToCache(l+c,l-1);e=a.getViewItems();l=e.length}else{if(c>0){a.moveItemsFromCache(j.getRange(l))}}for(d=0;d<l;d++){k=e[d];a.updateListItem(b[d],k)}},showEmptyText:function(){if(this.hasLoadedStore&&this.getEmptyText()){this.emptyTextCmp.show()}},hideEmptyText:function(){if(this.getEmptyText()){this.emptyTextCmp.hide()}},onStoreClear:function(){var c=this,a=c.container,b=a.getViewItems();a.moveItemsToCache(0,b.length-1);this.showEmptyText()},onStoreAdd:function(b,a){if(a){this.container.moveItemsFromCache(a)}},onStoreRemove:function(c,b,f){var a=this.container,e=b.length,d;for(d=0;d<e;d++){a.moveItemsToCache(f[d],f[d])}},onStoreUpdate:function(c,b,d,f){var e=this,a=e.container;f=(typeof f==="undefined")?d:f;if(f!==d){a.moveItemsToCache(f,f);a.moveItemsFromCache([b])}else{a.updateListItem(b,a.getViewItems()[d])}}});Ext.define("Ext.dataview.List",{alternateClassName:"Ext.List",extend:"Ext.dataview.DataView",xtype:"list",requires:["Ext.dataview.element.List","Ext.dataview.IndexBar","Ext.dataview.ListItemHeader"],config:{indexBar:false,icon:null,preventSelectionOnDisclose:true,baseCls:Ext.baseCSSPrefix+"list",pinHeaders:true,grouped:false,onItemDisclosure:null,ui:"normal"},constructor:function(){this.translateHeader=(Ext.os.is.Android2)?this.translateHeaderCssPosition:this.translateHeaderTransform;this.callParent(arguments)},onItemTrigger:function(c,b,f,a,d){if(!(this.getPreventSelectionOnDisclose()&&Ext.fly(d.target).hasCls(this.getBaseCls()+"-disclosure"))){this.callParent(arguments)}},initialize:function(){var b=this,a;b.on(b.getTriggerCtEvent(),b.onContainerTrigger,b);a=b.container=this.add(new Ext.dataview.element.List({baseCls:this.getBaseCls()}));a.dataview=b;b.on(b.getTriggerEvent(),b.onItemTrigger,b);a.element.on({delegate:"."+this.getBaseCls()+"-disclosure",tap:"handleItemDisclosure",scope:b});a.on({itemtouchstart:"onItemTouchStart",itemtouchend:"onItemTouchEnd",itemtap:"onItemTap",itemtaphold:"onItemTapHold",itemtouchmove:"onItemTouchMove",itemdoubletap:"onItemDoubleTap",itemswipe:"onItemSwipe",scope:b});if(this.getStore()){this.refresh()}},updateInline:function(a){this.callParent(arguments);if(a){this.setOnItemDisclosure(false);this.setIndexBar(false);this.setGrouped(false)}},applyIndexBar:function(a){return Ext.factory(a,Ext.dataview.IndexBar,this.getIndexBar())},updateIndexBar:function(a){if(a&&this.getScrollable()){this.indexBarElement=this.getScrollableBehavior().getScrollView().getElement().appendChild(a.renderElement);a.on({index:"onIndex",scope:this});this.element.addCls(this.getBaseCls()+"-indexed")}},updateGrouped:function(c){var b=this.getBaseCls(),a=b+"-grouped",d=b+"-ungrouped";if(c){this.addCls(a);this.removeCls(d);this.doRefreshHeaders();this.updatePinHeaders(this.getPinHeaders())}else{this.addCls(d);this.removeCls(a);if(this.container){this.container.doRemoveHeaders()}this.updatePinHeaders(null)}},updatePinHeaders:function(b){var c=this.getScrollable(),a;if(c){a=c.getScroller()}if(!c){return}if(b&&this.getGrouped()){a.on({refresh:"doRefreshHeaders",scroll:"onScroll",scope:this});if(!this.header||!this.header.renderElement.dom){this.createHeader()}}else{a.un({refresh:"doRefreshHeaders",scroll:"onScroll",scope:this});if(this.header){this.header.destroy()}}},createHeader:function(){var e,d=this.getScrollable(),a,b,c;if(d){a=d.getScroller();b=this.getScrollableBehavior().getScrollView();c=b.getElement()}else{return}this.header=e=Ext.create("Ext.dataview.ListItemHeader",{html:" ",cls:"x-list-header-swap"});c.dom.insertBefore(e.element.dom,a.getContainer().dom.nextSibling);this.translateHeader(1000)},refresh:function(){this.callParent();this.doRefreshHeaders()},onStoreAdd:function(){this.callParent(arguments);this.doRefreshHeaders()},onStoreRemove:function(){this.callParent(arguments);this.doRefreshHeaders()},onStoreUpdate:function(){this.callParent(arguments);this.doRefreshHeaders()},onStoreClear:function(){this.callParent();if(this.header){this.header.destroy()}this.doRefreshHeaders()},getClosestGroups:function(){var a=this.pinHeaderInfo.offsets,e=this.getScrollable(),d=a.length,b=0,h,g,f,c;if(e){h=e.getScroller().position}else{return{current:0,next:0}}for(;b<d;b++){g=a[b];if(g.offset>h.y){c=g;break}f=g}return{current:f,next:c}},doRefreshHeaders:function(){if(!this.getGrouped()||!this.container){return false}var l=this.findGroupHeaderIndices(),f=l.length,g=this.container.getViewItems(),j=this.pinHeaderInfo={offsets:[]},a=j.offsets,h=this.getScrollable(),e,k,b,d,c;if(f){for(b=0;b<f;b++){d=g[l[b]];if(d){c=this.getItemHeader(d);a.push({header:c,offset:d.offsetTop})}}j.closest=this.getClosestGroups();this.setActiveGroup(j.closest.current);if(c){j.headerHeight=Ext.fly(c).getHeight()}if(h){e=h.getScroller();k=e.position;this.onScroll(e,k.x,k.y)}}},getItemHeader:function(a){return a.childNodes[0]},onScroll:function(e,j,h){var g=this,i=g.pinHeaderInfo,a=i.closest,b=g.activeGroup,c=i.headerHeight,d,f;if(!a){return}d=a.next;f=a.current;if(!this.header||!this.header.renderElement.dom){this.createHeader()}if(h<=0){if(b){g.setActiveGroup(false);a.next=f}this.translateHeader(1000);return}else{if((d&&h>d.offset)||(f&&h<f.offset)){a=i.closest=this.getClosestGroups();d=a.next;f=a.current;this.setActiveGroup(f)}}if(d&&h>0&&d.offset-h<=c){var k=c-(d.offset-h);this.translateHeader(k)}else{this.translateHeader(null)}},translateHeaderTransform:function(a){this.header.renderElement.dom.style.webkitTransform=(a===null)?null:"translate3d(0px, -"+a+"px, 0px)"},translateHeaderCssPosition:function(a){this.header.renderElement.dom.style.top=(a===null)?null:"-"+Math.round(a)+"px"},setActiveGroup:function(b){var a=this,c=a.header;if(c){if(b){if(!a.activeGroup||a.activeGroup.header!=b.header){c.show();if(c.element){c.setHtml(b.header.innerHTML)}}}else{if(c&&c.dom){c.hide()}}}this.activeGroup=b},onIndex:function(o,c){var r=this,s=c.toLowerCase(),b=r.getStore(),q=b.getGroups(),f=q.length,h=r.getScrollable(),n,e,m,g,k,p;if(h){n=r.getScrollable().getScroller()}else{return}for(m=0;m<f;m++){e=q[m];k=e.name.toLowerCase();if(k==s||k>s){g=e;break}else{g=e}}if(h&&g){p=r.container.getViewItems()[b.indexOf(g.children[0])];n.stopAnimation();var l=n.getContainerSize().y,j=n.getSize().y,d=j-l,a=(p.offsetTop>d)?d:p.offsetTop;n.scrollTo(0,a)}},applyOnItemDisclosure:function(a){if(Ext.isFunction(a)){return{scope:this,handler:a}}return a},handleItemDisclosure:function(f){var d=this,c=f.getTarget().parentNode,b=d.container.getViewItems().indexOf(c),a=d.getStore().getAt(b);d.fireAction("disclose",[d,a,c,b,f],"doDisclose")},doDisclose:function(f,a,d,c,g){var b=f.getOnItemDisclosure();if(b&&b.handler){b.handler.call(f,a,d,c,g)}},findGroupHeaderIndices:function(){if(!this.getGrouped()){return[]}var h=this,k=h.getStore();if(!k){return[]}var b=h.container,d=k.getGroups(),m=d.length,g=b.getViewItems(),c=[],l=b.footerClsShortCache,e,a,f,n,j;b.doRemoveHeaders();b.doRemoveFooterCls();if(g.length){for(e=0;e<m;e++){a=d[e].children[0];f=k.indexOf(a);n=g[f];b.doAddHeader(n,k.getGroupString(a));if(e){Ext.fly(n.previousSibling).addCls(l)}c.push(f)}j=d[--e].children;Ext.fly(g[k.indexOf(j[j.length-1])]).addCls(l)}return c},destroy:function(){Ext.destroy(this.getIndexBar(),this.indexBarElement,this.header);this.callParent()}});Ext.define("Ext.dataview.NestedList",{alternateClassName:"Ext.NestedList",extend:"Ext.Container",xtype:"nestedlist",requires:["Ext.List","Ext.Toolbar","Ext.Button","Ext.XTemplate","Ext.data.StoreManager","Ext.data.NodeStore","Ext.data.TreeStore"],config:{cls:Ext.baseCSSPrefix+"nested-list",backText:"Back",useTitleAsBackText:true,updateTitleText:true,displayField:"text",loadingText:"Loading...",emptyText:"No items available.",onItemDisclosure:false,allowDeselect:false,useToolbar:null,toolbar:{docked:"top",xtype:"titlebar",ui:"light",inline:true},title:"",layout:{type:"card",animation:{type:"slide",duration:250,direction:"left"}},store:null,detailContainer:undefined,detailCard:null,backButton:{ui:"back",hidden:true},listConfig:null,lastNode:null,lastActiveList:null},constructor:function(a){if(Ext.isObject(a)){if(a.getTitleTextTpl){this.getTitleTextTpl=a.getTitleTextTpl}if(a.getItemTextTpl){this.getItemTextTpl=a.getItemTextTpl}}this.callParent(arguments)},onItemInteraction:function(){if(this.isGoingTo){return false}},applyDetailContainer:function(a){if(!a){a=this}return a},updateDetailContainer:function(a,b){a.onBefore("activeitemchange","onBeforeDetailContainerChange",this);a.onAfter("activeitemchange","onDetailContainerChange",this)},onBeforeDetailContainerChange:function(){this.isGoingTo=true},onDetailContainerChange:function(){this.isGoingTo=false},onItemTap:function(g,c,i,a,h){var f=this,b=g.getStore(),d=b.getAt(c);f.fireEvent("itemtap",this,g,c,i,a,h);if(d.isLeaf()){f.fireEvent("leafitemtap",this,g,c,i,a,h);f.goToLeaf(d)}else{this.goToNode(d)}},onBeforeSelect:function(){this.fireEvent("beforeselect",[this,Array.prototype.slice.call(arguments)])},onContainerTap:function(){this.fireEvent("containertap",[this,Array.prototype.slice.call(arguments)])},onSelectionChange:function(){this.fireEvent("selectionchange",[this,Array.prototype.slice.call(arguments)])},onItemDoubleTap:function(){this.fireEvent("itemdoubletap",[this,Array.prototype.slice.call(arguments)])},onStoreBeforeLoad:function(){var a=this.getLoadingText(),b=this.getScrollable();if(a){this.setMasked({xtype:"loadmask",message:a});if(b){b.getScroller().setDisabled(true)}}this.fireEvent("beforeload",[this,Array.prototype.slice.call(arguments)])},onStoreLoad:function(){this.setMasked(false);this.fireEvent("load",[this,Array.prototype.slice.call(arguments)])},onBackTap:function(){var d=this,c=d.getLastNode(),e=d.getDetailCard(),a=e&&d.getActiveItem()==e,b=d.getLastActiveList();this.fireAction("back",[this,c,b,a],"doBack")},doBack:function(e,d,c,a){var b=e.getLayout(),f=(b)?b.getAnimation():null;if(a&&c){if(f){f.setReverse(true)}e.setActiveItem(c);e.setLastNode(d.parentNode);e.syncToolbar()}else{this.goToNode(d.parentNode)}},updateData:function(a){if(!this.getStore()){this.setStore(new Ext.data.TreeStore({root:a}))}},applyStore:function(a){if(a){a=Ext.data.StoreManager.lookup(a);if(a&&Ext.isObject(a)&&a.isStore){a.on({scope:this,load:"onStoreLoad",beforeload:"onStoreBeforeLoad"})}}return a},updateStore:function(a,c){var b=this;if(c&&Ext.isObject(c)&&c.isStore){if(c.autoDestroy){c.destroy()}c.un({rootchange:"onStoreRootChange",scope:this})}if(a){b.goToNode(a.getRoot());a.on({rootchange:"onStoreRootChange",scope:this})}},onStoreRootChange:function(a,b){this.goToNode(b)},applyBackButton:function(a){return Ext.factory(a,Ext.Button,this.getBackButton())},applyDetailCard:function(a){return this.factoryItem(a)},updateBackButton:function(b,a){if(b){var c=this;b.on("tap",c.onBackTap,c);b.setText(c.getBackText());c.getToolbar().insert(0,b)}else{if(a){a.destroy()}}},applyToolbar:function(a){return Ext.factory(a,Ext.TitleBar,this.getToolbar())},updateToolbar:function(a,b){var c=this;if(a){a.setTitle(c.getTitle());if(!a.getParent()){c.add(a)}}else{if(b){b.destroy()}}},updateUseToolbar:function(a,b){if(!a){this.setToolbar(false)}},updateTitle:function(c){var b=this,a=b.getToolbar();if(a){if(b.getUpdateTitleText()){a.setTitle(c)}}},getItemTextTpl:function(a){return"{"+this.getDisplayField()+"}"},getTitleTextTpl:function(a){return"{"+this.getDisplayField()+"}"},renderTitleText:function(b,c){if(!b.titleTpl){b.titleTpl=Ext.create("Ext.XTemplate",this.getTitleTextTpl(b))}if(b.isRoot()){var a=this.getInitialConfig("title");return(c&&a==="")?this.getInitialConfig("backText"):a}return b.titleTpl.applyTemplate(b.data)},goToNode:function(a){if(!a){return}var i=this,d=i.getActiveItem(),k=i.getDetailCard(),j=k&&i.getActiveItem()==k,h=i.goToNodeReverseAnimation(a),c=i.firstList,e=i.secondList,f=i.getLayout(),b=(f)?f.getAnimation():null,g;if(a.isLeaf()){throw new Error("goToNode: passed a node which is a leaf.")}if(a==i.getLastNode()&&!j){return}if(j){if(b){b.setReverse(true)}i.setActiveItem(i.getLastActiveList())}else{if(c&&e){d=i.getActiveItem();i.setLastActiveList(d);g=(d==c)?e:c;g.getStore().setNode(a);a.expand();if(b){b.setReverse(h)}i.setActiveItem(g);g.deselectAll()}else{if(c){i.setLastActiveList(i.getActiveItem());i.setActiveItem(i.getList(a));i.secondList=i.getActiveItem()}else{i.setActiveItem(i.getList(a));i.firstList=i.getActiveItem()}}}i.fireEvent("listchange",this,i.getActiveItem());i.setLastNode(a);i.syncToolbar()},goToLeaf:function(f){if(!f.isLeaf()){throw new Error("goToLeaf: passed a node which is not a leaf.")}var e=this,c=e.getDetailCard(f),b=e.getDetailContainer(),a=b==this,d=e.getLayout(),g=(d)?d.getAnimation():false;if(c){if(b.getItems().indexOf(c)===-1){b.add(c)}if(a){if(e.getActiveItem() instanceof Ext.dataview.List){e.setLastActiveList(e.getActiveItem())}e.setLastNode(f)}if(g){g.setReverse(false)}b.setActiveItem(c);e.syncToolbar()}},syncToolbar:function(g){var e=this,f=e.getDetailCard(),d=e.getLastNode(),b=g||(f&&(e.getActiveItem()==f)),a=(b)?d:d.parentNode,c=e.getBackButton();if(c){c[a?"show":"hide"]();if(a&&e.getUseTitleAsBackText()){c.setText(e.renderTitleText(d.parentNode,true))}}if(d){e.setTitle(e.renderTitleText(d))}},updateBackText:function(a){this.getBackButton().setText(a)},goToNodeReverseAnimation:function(c){var b=this,a=b.getLastNode();if(!a){return false}return(!a.contains(c)&&a.isAncestor(c))?true:false},getList:function(b){var a=this,c=Ext.create("Ext.data.NodeStore",{recursive:false,node:b,rootVisible:false,model:a.getStore().getModel()});b.expand();return Ext.Object.merge({xtype:"list",pressedDelay:250,autoDestroy:true,store:c,onItemDisclosure:a.getOnItemDisclosure(),allowDeselect:a.getAllowDeselect(),listeners:[{event:"itemdoubletap",fn:"onItemDoubleTap",scope:a},{event:"itemtap",fn:"onItemInteraction",scope:a,order:"before"},{event:"itemtouchstart",fn:"onItemInteraction",scope:a,order:"before"},{event:"itemtap",fn:"onItemTap",scope:a},{event:"beforeselect",fn:"onBeforeSelect",scope:a},{event:"containertap",fn:"onContainerTap",scope:a},{event:"selectionchange",fn:"onSelectionChange",scope:a}],itemTpl:'<span<tpl if="leaf == true"> class="x-list-item-leaf"</tpl>>'+a.getItemTextTpl(b)+"</span>"},this.getListConfig())}},function(){});Ext.define("Ext.form.FieldSet",{extend:"Ext.Container",alias:"widget.fieldset",requires:["Ext.Title"],config:{baseCls:Ext.baseCSSPrefix+"form-fieldset",title:null,instructions:null},applyTitle:function(a){if(typeof a=="string"){a={title:a}}Ext.applyIf(a,{docked:"top",baseCls:this.getBaseCls()+"-title"});return Ext.factory(a,Ext.Title,this.getTitle())},updateTitle:function(b,a){if(b){this.add(b)}if(a){this.remove(a)}},applyInstructions:function(a){if(typeof a=="string"){a={title:a}}Ext.applyIf(a,{docked:"bottom",baseCls:this.getBaseCls()+"-instructions"});return Ext.factory(a,Ext.Title,this.getInstructions())},updateInstructions:function(b,a){if(b){this.add(b)}if(a){this.remove(a)}}});Ext.define("Ext.form.Panel",{alternateClassName:"Ext.form.FormPanel",extend:"Ext.Panel",xtype:"formpanel",requires:["Ext.XTemplate","Ext.field.Checkbox","Ext.Ajax"],config:{baseCls:Ext.baseCSSPrefix+"form",standardSubmit:false,url:null,baseParams:null,submitOnAction:true,record:null,method:"post",scrollable:{translationMethod:"scrollposition"}},getElementConfig:function(){var a=this.callParent();a.tag="form";return a},initialize:function(){var a=this;a.callParent();a.on({action:"onFieldAction",scope:a});a.element.on({submit:"onSubmit",scope:a})},updateRecord:function(c){var a,b,d;if(c&&(a=c.fields)){b=this.getValues();for(d in b){if(b.hasOwnProperty(d)&&a.containsKey(d)){c.set(d,b[d])}}}return this},setRecord:function(a){var b=this;if(a&&a.data){b.setValues(a.data)}b._record=a;return this},onSubmit:function(b){var a=this;if(b&&!a.getStandardSubmit()){b.stopEvent()}a.fireAction("submit",[a,a.getValues(true),b],"doSubmit")},doSubmit:function(b,a,c){if(c){c.stopEvent()}},onFieldAction:function(a){if(this.getSubmitOnAction()){a.blur();this.submit()}},submit:function(a){var c=this,b=c.element.dom||{},d;a=Ext.apply({url:c.getUrl()||b.action,submit:false,method:c.getMethod()||b.method||"post",autoAbort:false,params:null,waitMsg:null,headers:null,success:null,failure:null},a||{});d=c.getValues(c.getStandardSubmit()||!a.submitDisabled);return c.fireAction("beforesubmit",[c,d,a],"doBeforeSubmit")},doBeforeSubmit:function(c,d,a){var b=c.element.dom||{};if(c.getStandardSubmit()){if(a.url&&Ext.isEmpty(b.action)){b.action=a.url}b.method=(a.method||b.method).toLowerCase();b.submit()}else{if(a.waitMsg){c.setMasked(a.waitMsg)}return Ext.Ajax.request({url:a.url,method:a.method,rawData:Ext.urlEncode(Ext.apply(Ext.apply({},c.getBaseParams()||{}),a.params||{},d)),autoAbort:a.autoAbort,headers:Ext.apply({"Content-Type":"application/x-www-form-urlencoded; charset=UTF-8"},a.headers||{}),scope:c,callback:function(e,j,f){var h=this,i=f.responseText,g;h.setMasked(false);g=function(){if(Ext.isFunction(a.failure)){a.failure.call(a.scope||h,h,f,i)}h.fireEvent("exception",h,f)};if(j){f=Ext.decode(i);j=!!f.success;if(j){if(Ext.isFunction(a.success)){a.success.call(a.scope||h,h,f,i)}h.fireEvent("submit",h,f)}else{g()}}else{g()}}})}},setValues:function(b){var a=this.getFields(),c,e,d;b=b||{};for(c in b){if(b.hasOwnProperty(c)){e=a[c];d=b[c];if(e){if(Ext.isArray(e)){e.forEach(function(g){if(g.isRadio){g.setGroupValue(d)}else{if(Ext.isArray(b[c])){g.setChecked((d.indexOf(g.getValue())!=-1))}else{g.setChecked((d==g.getValue()))}}})}else{if(e.setChecked){e.setChecked(d)}else{e.setValue(d)}}}}}return this},getValues:function(d){var a=this.getFields(),b={},g,c,f,e;for(c in a){if(a.hasOwnProperty(c)){if(Ext.isArray(a[c])){b[c]=[];f=a[c].length;for(e=0;e<f;e++){g=a[c][e];if(!g.getChecked){b[c]=g.getValue();break}if(!(d&&g.getDisabled())){if(g.isRadio){b[c]=g.getGroupValue()}else{b[c].push(g.getValue())}}}}else{g=a[c];if(!(d&&g.getDisabled())){if(g.isCheckbox){b[c]=(g.getChecked())?g.getValue():null}else{b[c]=g.getValue()}}}}}return b},reset:function(){this.getFieldsAsArray().forEach(function(a){a.reset()});return this},enable:function(){this.getFieldsAsArray().forEach(function(a){a.enable()});return this},disable:function(){this.getFieldsAsArray().forEach(function(a){a.disable()});return this},getFieldsAsArray:function(){var a=[],b=function(c){if(c.isField){a.push(c)}if(c.isContainer){c.getItems().each(b)}};this.getItems().each(b);return a},getFields:function(b){var a={},d;var c=function(e){if(e.isField){d=e.getName();if((b&&d==b)||typeof b=="undefined"){if(a.hasOwnProperty(d)){if(!Ext.isArray(a[d])){a[d]=[a[d]]}a[d].push(e)}else{a[d]=e}}}if(e.isContainer){e.items.each(c)}};this.getItems().each(c);return(b)?(a[b]||[]):a},getFieldsArray:function(){var a=[];var b=function(c){if(c.isField){a.push(c)}if(c.isContainer){c.items.each(b)}};this.items.each(b);return a},getFieldsFromItem:Ext.emptyFn,showMask:function(a,b){a=Ext.isObject(a)?a.message:a;if(a){this.setMasked({xtype:"loadmask",message:a})}else{this.setMasked(true)}return this},hideMask:function(){this.setMasked(false);return this},getFocusedField:function(){var a=this.getFieldsArray(),c=a.length,d,b;for(b=0;b<c;b++){d=a[b];if(d.isFocused){return d}}return null},getNextField:function(){var a=this.getFieldsArray(),c=this.getFocusedField(),d=a.length,b;if(c){b=a.indexOf(c);if(b!==a.length-1){b++;return a[b]}}return false},focusNextField:function(){var a=this.getNextField();if(a){a.focus();return a}return false},getPreviousField:function(){var a=this.getFieldsArray(),c=this.getFocusedField(),d=a.length,b;if(c){b=a.indexOf(c);if(b!==0){b--;return a[b]}}return false},focusPreviousField:function(){var a=this.getPreviousField();if(a){a.focus();return a}return false}},function(){});Ext.define("Ext.navigation.Bar",{extend:"Ext.Container",requires:["Ext.Button","Ext.TitleBar","Ext.Spacer","Ext.util.SizeMonitor"],isToolbar:true,config:{baseCls:Ext.baseCSSPrefix+"toolbar",cls:Ext.baseCSSPrefix+"navigation-bar",ui:"dark",title:null,defaultType:"button",layout:{type:"hbox"},defaultBackButtonText:"Back",animation:{duration:300},useTitleForBackButtonText:null,view:null,backButton:{align:"left",ui:"back",hidden:true}},minBackButtonWidth:80,constructor:function(a){a=a||{};if(!a.items){a.items=[]}this.callParent([a])},beforeInitialize:function(){this.backButtonStack=[];this.lastAnimationProperties={};this.animating=false;this.onSizeMonitorChange=Ext.Function.createThrottled(this.onSizeMonitorChange,50,this)},initialize:function(){var a=this;a.on({painted:"onPainted",erased:"onErased"});a.onSizeMonitorChange()},updateView:function(f,a){var c=this.getBackButton(),e,b,d;this.getItems();if(f){this.backButtonStack=[];e=f.getInnerItems();for(b=0;b<e.length;b++){this.backButtonStack.push(e[b].config.title||"&nbsp;")}this.titleComponent.setTitle(this.getTitleText());d=this.getBackButtonText();if(d){c.setText(this.getBackButtonText());c.show()}}},onViewAdd:function(a,c,b){var d=a.getLayout().getAnimation();this.endAnimation();this.backButtonStack.push(c.config.title||"&nbsp;");this.refreshNavigationBarProxy();if(d&&d.isAnimation&&a.isPainted()){if(this.backButtonStack.length>1){this.pushBackButtonAnimated(this.getBackButtonText())}this.pushTitleAnimated(this.getTitleText())}else{if(this.backButtonStack.length>1){this.pushBackButton(this.getBackButtonText())}this.pushTitle(this.getTitleText())}},onViewRemove:function(a,c,b){var d=a.getLayout().getAnimation();this.endAnimation();this.backButtonStack.pop();this.refreshNavigationBarProxy();if(d&&d.isAnimation&&a.isPainted()){this.popBackButtonAnimated(this.getBackButtonText());this.popTitleAnimated(this.getTitleText())}else{this.popBackButton(this.getBackButtonText());this.popTitle(this.getTitleText())}},endAnimation:function(){var c=this.lastAnimationProperties,d,b,a;if(c){for(d in c){b=Ext.get(d);for(a in c[d].to){b.setStyle(a,c[d][a])}if(c[d].onEnd){c[d].onEnd.call(this)}}}},applyBackButton:function(a){return Ext.factory(a,Ext.Button,this.getBackButton())},updateBackButton:function(a,b){if(b){this.remove(b)}if(a){this.add(a);a.on({scope:this,tap:this.onBackButtonTap})}},onBackButtonTap:function(){this.fireEvent("back",this)},updateUseTitleForBackButtonText:function(a){var b=this.getBackButton();if(b){b.setText(this.getBackButtonText())}this.onSizeMonitorChange()},onPainted:function(){this.painted=true;this.sizeMonitor.refresh();this.onSizeMonitorChange()},onErased:function(){this.painted=false},applyItems:function(c){var e=this;if(!e.initialized){var f=e.getDefaults()||{},a,b,d;e.leftBox=a=e.add({xtype:"container",style:"position: relative",layout:{type:"hbox",align:"center"}});e.spacer=d=e.add({xtype:"component",style:"position: relative",flex:1});e.rightBox=b=e.add({xtype:"container",style:"position: relative",layout:{type:"hbox",align:"center"}});e.titleComponent=e.add({xtype:"title",hidden:f.hidden,centered:true});e.sizeMonitor=new Ext.util.SizeMonitor({element:e.element,callback:e.onSizeMonitorChange,scope:e});e.doAdd=e.doBoxAdd;e.doInsert=e.doBoxInsert}e.callParent(arguments)},doBoxAdd:function(a){if(a.config.align=="right"){this.rightBox.add(a)}else{this.leftBox.add(a)}},doBoxInsert:function(a,b){if(b.config.align=="right"){this.rightBox.add(b)}else{this.leftBox.add(b)}},onSizeMonitorChange:function(){if(!this.rendered){return}var c=this.getBackButton(),a=this.titleComponent;if(c&&c.rendered){c.setWidth(null)}this.refreshNavigationBarProxy();var b=this.getNavigationBarProxyProperties();if(c&&c.rendered){c.setWidth(b.backButton.width)}a.setStyle("-webkit-transform",null);a.setWidth(b.title.width);a.element.setLeft(b.title.left)},getBackButtonAnimationProperties:function(){var c=this,b=c.element,h=c.getBackButton().element,e=c.titleComponent.element,g=Math.min(b.getWidth()/3,200),a=this.getNavigationBarProxyProperties(),d,f;d=e.getX()-b.getX();f=b.getX()-h.getX()-h.getWidth();d=Math.min(d,g);return{element:{from:{left:d,width:a.backButton.width,opacity:0},to:{left:0,width:a.backButton.width,opacity:1}},ghost:{from:null,to:{left:f,opacity:0}}}},getBackButtonAnimationReverseProperties:function(){var d=this,c=d.element,h=d.getBackButton().element,f=d.titleComponent.element,b=Math.min(c.getWidth()/3,200),a=this.getNavigationBarProxyProperties(),e,g;e=c.getX()-h.getX()-h.getWidth();g=f.getX()-h.getWidth();g=Math.min(g,b);return{element:{from:{left:e,width:a.backButton.width,opacity:0},to:{left:0,width:a.backButton.width,opacity:1}},ghost:{from:null,to:{left:g,opacity:0}}}},getTitleAnimationProperties:function(){var c=this,b=c.element,e=c.titleComponent.element,a=this.getNavigationBarProxyProperties(),d,f;d=b.getWidth()-e.getX();f=b.getX()-e.getX()+a.backButton.width;if((a.backButton.left+e.getWidth())>e.getX()){f=b.getX()-e.getX()-e.getWidth()}return{element:{from:{left:d,width:a.title.width,opacity:0},to:{left:a.title.left,width:a.title.width,opacity:1}},ghost:{from:e.getLeft(),to:{left:f,opacity:0}}}},getTitleAnimationReverseProperties:function(){var d=this,c=d.element,f=d.titleComponent.element,a=this.getNavigationBarProxyProperties(),b=0,e,g;b=f.getLeft();f.setLeft(0);e=c.getX()-f.getX()+a.backButton.width;g=c.getX()+c.getWidth();if((a.backButton.left+f.getWidth())>f.getX()){e=c.getX()-f.getX()-f.getWidth()}return{element:{from:{left:e,width:a.title.width,opacity:0},to:{left:a.title.left,width:a.title.width,opacity:1}},ghost:{from:b,to:{left:g,opacity:0}}}},animate:function(c,d,h,g,b){var e=this,a={element:d,easing:"ease-in-out",duration:this.getAnimation().duration,replacePrevious:true,preserveEndState:true},f;this.lastAnimationProperties[d.id]={to:g,onEnd:b};d.setLeft(0);if(Ext.os.is.Android){if(h){a.from={left:h.left,opacity:h.opacity};if(h.width){a.from.width=h.width}}if(g){a.to={left:g.left,opacity:g.opacity};if(g.width){a.to.width=g.width}}}else{if(h){a.from={transform:{translateX:h.left},opacity:h.opacity};if(h.width){a.from.width=h.width}}if(g){a.to={transform:{translateX:g.left},opacity:g.opacity};if(g.width){a.to.width=g.width}}}fn=function(){if(b){b.call(e)}if(c&&Ext.isNumber(g.width)){c.setWidth(g.width)}e.lastAnimationProperties={}};f=new Ext.fx.Animation(a);f.on("animationend",fn,this);Ext.Animator.run(f)},getBackButtonText:function(){var b=this.backButtonStack[this.backButtonStack.length-2],a=this.getUseTitleForBackButtonText();if(!a){if(b){b=this.getDefaultBackButtonText()}}return b},getTitleText:function(){return this.backButtonStack[this.backButtonStack.length-1]},pushBackButton:function(c){var b=this.getBackButton();b.setText(c);b.show();var a=this.getBackButtonAnimationProperties(),d=a.element.to;if(d.left){b.setLeft(d.left)}if(d.width){b.setWidth(d.width)}},pushBackButtonAnimated:function(f){var e=this;var d=e.getBackButton(),b=d.getText(),g=d.element,c=e.getBackButtonAnimationProperties(),a;if(b){a=e.createProxy(d)}d.setText(this.getBackButtonText());d.show();e.animate(d,g,c.element.from,c.element.to,function(){e.animating=false});if(a){e.animate(null,a,c.ghost.from,c.ghost.to,function(){a.destroy()})}},popBackButton:function(c){var b=this.getBackButton();b.setText(null);if(c){b.setText(this.getBackButtonText())}else{b.hide()}var a=this.getBackButtonAnimationReverseProperties(),d=a.element.to;if(d.left){b.setLeft(d.left)}if(d.width){b.setWidth(d.width)}},popBackButtonAnimated:function(f){var e=this;var d=e.getBackButton(),b=d.getText(),g=d.element,c=e.getBackButtonAnimationReverseProperties(),a;if(b){a=e.createProxy(d)}if(f&&e.backButtonStack.length){d.setText(this.getBackButtonText());d.show();e.animate(d,g,c.element.from,c.element.to)}else{d.hide()}if(a){e.animate(null,a,c.ghost.from,c.ghost.to,function(){a.destroy();if(!f){d.setText(null)}})}},pushTitle:function(e){var c=this.titleComponent,b=c.element,a=this.getTitleAnimationProperties(),d=a.element.to;c.setTitle(e);if(d.left){b.setLeft(d.left)}if(d.width){c.setWidth(d.width)}},pushTitleAnimated:function(h){var e=this;var d=e.getBackButton(),b=(d)?d.getText():null,g=e.titleComponent,f=g.element,c,a;if(b){a=e.createProxy(g,true)}g.setTitle(h);c=e.getTitleAnimationProperties();e.animate(g,f,c.element.from,c.element.to);if(a){e.animate(null,a,c.ghost.from,c.ghost.to,function(){a.destroy()})}},popTitle:function(e){var c=this.titleComponent,b=c.element,a=this.getTitleAnimationReverseProperties(),d=a.element.to;c.setTitle(e);if(d.left){b.setLeft(d.left)}if(d.width){c.setWidth(d.width)}},popTitleAnimated:function(h){var e=this;var d=e.getBackButton(),b=e.titleComponent.getTitle(),g=e.titleComponent,f=g.element,c=e.getTitleAnimationReverseProperties(),a;if(b){a=e.createProxy(g,true)}g.setTitle(h||"");e.animate(g,f,c.element.from,c.element.to,function(){e.animating=false});if(a){e.animate(null,a,c.ghost.from,c.ghost.to,function(){a.destroy()})}},createNavigationBarProxy:function(){var a=this.proxy;if(a){return}this.proxy=a=Ext.create("Ext.TitleBar",{items:[{xtype:"button",ui:"back",text:""}],title:this.backButtonStack[0]});a.backButton=a.down("button[ui=back]");Ext.getBody().appendChild(a.element);a.element.setStyle("position","absolute");a.element.setStyle("visibility","hidden");a.element.setX(0);a.element.setY(-1000)},getNavigationBarProxyProperties:function(){return{title:{left:this.proxy.titleComponent.element.getLeft(),width:this.proxy.titleComponent.element.getWidth()},backButton:{left:this.proxy.backButton.element.getLeft(),width:this.proxy.backButton.element.getWidth()}}},refreshNavigationBarProxy:function(){var c=this.proxy,b=this.element,a=this.backButtonStack,e=a[a.length-1],d=this.getBackButtonText();if(!c){this.createNavigationBarProxy();c=this.proxy}c.element.setWidth(b.getWidth());c.element.setHeight(b.getHeight());c.setTitle(e);if(d){c.backButton.setText(d);c.backButton.show()}else{c.backButton.hide()}c.refreshTitlePosition()},onBeforePop:function(b){b--;for(var a=0;a<b;a++){this.backButtonStack.pop()}},doSetHidden:function(a){if(!a){this.element.setStyle({position:"relative",top:"auto",left:"auto",width:"auto"})}else{this.element.setStyle({position:"absolute",top:"-1000px",left:"-1000px",width:this.element.getWidth()+"px"})}},createProxy:function(b,a){var c=(a)?b.element.getParent():b.element,d=Ext.get(c.id+"-proxy");if(!d){d=c.dom.cloneNode(true);d.id=c.id+"-proxy";c.getParent().dom.appendChild(d);d=Ext.get(d);d.setStyle("position","absolute");d.setY(c.getY());d.setX(c.getX())}return d}});Ext.define("Ext.navigation.View",{extend:"Ext.Container",alternateClassName:"Ext.NavigationView",xtype:"navigationview",requires:["Ext.navigation.Bar"],config:{baseCls:Ext.baseCSSPrefix+"navigationview",navigationBar:{docked:"top"},defaultBackButtonText:"Back",useTitleForBackButtonText:false,layout:{type:"card",animation:{duration:300,easing:"ease-out",type:"slide",direction:"left"}}},initialize:function(){this.getNavigationBar().on({scope:this,back:this.onBackButtonTap});this.relayEvents(this,{add:"push",remove:"pop"})},applyLayout:function(a){a=a||{};if(Ext.os.is.Android){a.animation=false}return a},onBackButtonTap:function(){this.pop();this.fireEvent("back",this)},push:function(a){return this.add(a)},pop:function(a){if(this.onBeforePop(a)){return this.doPop()}},onBeforePop:function(f){var e=this,g=this.getInnerItems(),d=g.length,b,c,a;if(!Ext.isNumber(f)||f<1){f=1}f=Math.min(f,d-1);if(f){e.getNavigationBar().onBeforePop(f);b=g.splice(-f,f-1);for(a=0;a<b.length;a++){this.remove(b[a])}return true}return false},doPop:function(a){var c=this,e=this.getInnerItems(),b=c.getLayout(),d=b.getAnimation();c.remove(e[e.length-1]);return this.getActiveItem()},getPreviousItem:function(){var a=this.getInnerItems();return a[a.length-2]},updateUseTitleForBackButtonText:function(b){var a=this.getNavigationBar();if(a){a.setUseTitleForBackButtonText(b)}},applyNavigationBar:function(a){if(!a){a={hidden:true,docked:"top"}}if(a.title){delete a.title}a.view=this;return Ext.factory(a,Ext.navigation.Bar,this.getNavigationBar())},updateNavigationBar:function(a,c){if(c){this.remove(c)}if(a){var b=this.getLayout(),d=(b&&b.isLayout)?b.getAnimation():false;if(d&&d.isAnimation){a.setAnimation(d.config)}this.add(a)}},applyActiveItem:function(c,a){var b=this.getInnerItems();this.getItems();if(!this.initialized){c=b.length-1}if(typeof c=="number"){c=Math.max(0,Math.min(c,b.length-1));c=b[c];if(c){return c}else{if(a){return null}}}else{if(c){if(!c.isComponent){c=this.factoryItem(c)}if(!this.has(c)){this.add(c)}return c}}},remove:function(d,b){var c=this,a=c.indexOf(d),f=this.getInnerItems(),e=this.getLayout().getAnimation(),g;if(b===undefined){b=c.getAutoDestroy()}if(a!==-1){if(!this.removingAll&&f.length>1&&d===this.getActiveItem()){this.on({activeitemchange:"doRemove",scope:this,single:true,order:"after",args:[d,a,b]});g=f.indexOf(d);if(g>0){if(e&&e.isAnimation){e.setReverse(true)}this.setActiveItem(g-1);this.getNavigationBar().onViewRemove(this,f[g],g)}}else{this.doRemove(d,a,b)}}return c},doRemove:function(){var a=this.getLayout().getAnimation();if(a&&a.isAnimation){a.setReverse(false)}this.callParent(arguments)},onItemAdd:function(b,a){this.doItemLayoutAdd(b,a);if(!this.isItemsInitializing&&b.isInnerItem()){this.setActiveItem(b);this.getNavigationBar().onViewAdd(this,b,a)}if(this.initialized){this.fireEvent("add",this,b,a)}},reset:function(){this.pop(this.getInnerItems().length)}});Ext.define("Ext.picker.Slot",{extend:"Ext.DataView",xtype:"pickerslot",alternateClassName:"Ext.Picker.Slot",requires:["Ext.XTemplate","Ext.data.Store","Ext.Component","Ext.data.StoreManager"],isSlot:true,config:{title:null,showTitle:true,cls:Ext.baseCSSPrefix+"picker-slot",name:null,value:null,flex:1,align:"left",displayField:"text",valueField:"value",scrollable:{direction:"vertical",indicators:false,momentumEasing:{minVelocity:2},slotSnapEasing:{duration:100}}},constructor:function(){this.selectedIndex=0;this.callParent(arguments)},applyTitle:function(a){if(a){a=Ext.create("Ext.Component",{cls:Ext.baseCSSPrefix+"picker-slot-title",docked:"top",html:a})}return a},updateTitle:function(b,a){if(b){this.add(b);this.setupBar()}if(a){this.remove(a)}},updateShowTitle:function(a){var b=this.getTitle();if(b){b[a?"show":"hide"]();this.setupBar()}},updateDisplayField:function(a){this.setItemTpl('<div class="'+Ext.baseCSSPrefix+'picker-item {cls} <tpl if="extra">'+Ext.baseCSSPrefix+'picker-invalid</tpl>">{'+a+"}</div>")},updateAlign:function(a,c){var b=this.element;b.addCls(Ext.baseCSSPrefix+"picker-"+a);b.removeCls(Ext.baseCSSPrefix+"picker-"+c)},applyData:function(d){var f=[],c=d&&d.length,a,b,e;if(d&&Ext.isArray(d)&&c){for(a=0;a<c;a++){b=d[a];e={};if(Ext.isArray(b)){e[this.valueField]=b[0];e[this.displayField]=b[1]}else{if(Ext.isString(b)){e[this.valueField]=b;e[this.displayField]=b}else{if(Ext.isObject(b)){e=b}}}f.push(e)}}return d},updateData:function(a){this.setStore(Ext.create("Ext.data.Store",{model:"x-textvalue",data:a}))},initialize:function(){this.callParent();var a=this.getScrollable().getScroller();this.on({scope:this,painted:"onPainted",itemtap:"doItemTap"});a.on({scope:this,scrollend:"onScrollEnd"})},onPainted:function(){this.setupBar()},getPicker:function(){if(!this.picker){this.picker=this.getParent()}return this.picker},setupBar:function(){if(!this.rendered){return}var b=this.element,g=this.innerElement,h=this.getPicker(),i=h.bar,m=this.getValue(),c=this.getShowTitle(),l=this.getTitle(),j=this.getScrollable(),f=j.getScroller(),e=0,o,d,n,k,a;o=i.getY();d=b.getY();if(c&&l){d+=l.element.getHeight()}n=i.getHeight();if(c&&l){e=l.element.getHeight()}k=Math.ceil((b.getHeight()-e-n)/2);this.slotPadding=k;g.setStyle({padding:k+"px 0 "+(k)+"px"});f.refresh();f.setSlotSnapSize(n);this.setValue(m)},doItemTap:function(d,a,c,f){var b=this;b.selectedIndex=a;b.selectedNode=c;b.scrollToItem(c,true);b.fireEvent("slotpick",b,b.getValue(),b.selectedNode)},scrollToItem:function(e,d){var h=e.getY(),c=e.parent(),f=c.getY(),b=this.getScrollable(),a=b.getScroller(),g;g=h-f;a.scrollTo(0,g,d)},onScrollEnd:function(b,a,g){var f=this,d=Math.round(g/f.picker.bar.getHeight()),c=f.getViewItems(),e=c[d];if(e){f.selectedIndex=d;f.selectedNode=e;f.fireEvent("slotpick",f,f.getValue(),f.selectedNode)}},getValue:function(){var b=this.getStore(),a,c;if(!b){return}if(this._value===false){return null}a=b.getAt(this.selectedIndex);c=a?a.get(this.getValueField()):null;this._value=c;return c},setValue:function(f){if(!Ext.isDefined(f)){return}if(!this.rendered||!f){this._value=f;return}var b=this.getStore(),a=this.getViewItems(),d=this.getValueField(),c,e;c=b.find(d,f);if(c!=-1){e=Ext.get(a[c]);this.selectedIndex=c;this.scrollToItem(e);this._value=f}},setValueAnimated:function(f){if(!f){return}if(!this.rendered){this._value=f;return}var b=this.getStore(),a=this.getViewItems(),d=this.getValueField(),c,e;c=b.find(d,f);if(c!=-1){e=Ext.get(a[c]);this.selectedIndex=c;this.scrollToItem(e,{duration:100});this._value=f}}});Ext.define("Ext.picker.Picker",{extend:"Ext.Sheet",alias:"widget.picker",alternateClassName:"Ext.Picker",requires:["Ext.picker.Slot","Ext.Toolbar","Ext.data.Model"],isPicker:true,config:{cls:Ext.baseCSSPrefix+"picker",doneButton:true,cancelButton:true,useTitles:false,slots:null,value:null,height:220,layout:{type:"hbox",align:"stretch"},centered:false,left:0,right:0,bottom:0,defaultType:"pickerslot",toolbar:true},initElement:function(){this.callParent(arguments);var b=this,a=Ext.baseCSSPrefix,c=this.innerElement;this.mask=c.createChild({cls:a+"picker-mask"});this.bar=this.mask.createChild({cls:a+"picker-bar"});b.on({scope:this,delegate:"pickerslot",slotpick:"onSlotPick"});b.on({scope:this,show:"onShow"})},applyToolbar:function(a){if(a===true){a={}}Ext.applyIf(a,{docked:"top"});return Ext.factory(a,"Ext.TitleBar",this.getToolbar())},updateToolbar:function(a,b){if(a){this.add(a)}if(b){this.remove(b)}},applyDoneButton:function(a){if(a){if(Ext.isBoolean(a)){a={}}if(typeof a=="string"){a={text:a}}Ext.applyIf(a,{ui:"action",align:"right",text:"Done"})}return Ext.factory(a,"Ext.Button",this.getDoneButton())},updateDoneButton:function(c,a){var b=this.getToolbar();if(c){b.add(c);c.on("tap",this.onDoneButtonTap,this)}else{if(a){b.remove(a)}}},applyCancelButton:function(a){if(a){if(Ext.isBoolean(a)){a={}}if(typeof a=="string"){a={text:a}}Ext.applyIf(a,{align:"left",text:"Cancel"})}return Ext.factory(a,"Ext.Button",this.getCancelButton())},updateCancelButton:function(b,a){var c=this.getToolbar();if(b){c.add(b);b.on("tap",this.onCancelButtonTap,this)}else{if(a){c.remove(a)}}},updateUseTitles:function(d){var f=this.getInnerItems(),e=f.length,a=Ext.baseCSSPrefix+"use-titles",c,b;if(d){this.addCls(a)}else{this.removeCls(a)}for(c=0;c<e;c++){b=f[c];if(b.isSlot){b.setShowTitle(d)}}},applySlots:function(b){if(b){var c=b.length,a;for(a=0;a<c;a++){b[a].picker=this}}return b},updateSlots:function(a){this.removeAll();if(a){this.add(a)}this.updateUseTitles(this.getUseTitles())},onDoneButtonTap:function(){this.fireEvent("change",this,this.getValue());this.hide()},onCancelButtonTap:function(){this.fireEvent("cancel",this);this.hide()},onSlotPick:function(c,b,a){this.fireEvent("pick",this,this.getValue(),c)},onShow:function(){if(!this.isHidden()){this.setValue(this._value)}},setValue:function(j,a){var f=this,d=f.getInnerItems(),e=d.length,h,g,c,b;if(!j){j={};for(b=0;b<e;b++){j[d[b].config.name]=false}}for(h in j){value=j[h];for(b=0;b<d.length;b++){c=d[b];if(c.config.name==h){g=c;break}}if(g){if(a){g.setValueAnimated(value)}else{g.setValue(value)}}}f._value=j;f._values=j;return f},setValueAnimated:function(a){this.setValue(a,true)},getValue:function(){var d=this.getParent(),b={},a=this.getItems().items,f=a.length,e,c;if(d){for(c=0;c<f;c++){e=a[c];if(e&&e.isSlot){b[e.getName()]=e.getValue()}}this._values=b}return this._values},getValues:function(){return this.getValue()},destroy:function(){this.callParent();Ext.destroy(this.mask,this.bar)}},function(){Ext.define("x-textvalue",{extend:"Ext.data.Model",config:{fields:["text","value"]}})});Ext.define("Ext.field.Select",{extend:"Ext.field.Text",xtype:"selectfield",alternateClassName:"Ext.form.Select",requires:["Ext.Panel","Ext.picker.Picker","Ext.data.Store","Ext.data.StoreManager","Ext.List"],config:{ui:"select",valueField:"value",displayField:"text",store:null,options:null,hiddenName:null,component:{useMask:true},clearIcon:false,usePicker:"auto",defaultPhonePickerConfig:null,defaultTabletPickerConfig:null},constructor:function(a){a=a||{};if(!a.store){a.store=true}this.callParent([a])},initialize:function(){var b=this,a=b.getComponent();b.callParent();a.on({scope:b,masktap:"onMaskTap"});a.input.dom.disabled=true},updateDefaultPhonePickerConfig:function(b){var a=this.picker;if(a){a.setConfig(b)}},updateDefaultTabletPickerConfig:function(a){var b=this.listPanel;if(b){b.setConfig(a)}},applyUsePicker:function(a){if(a=="auto"){a=(Ext.os.deviceType=="Phone")}return Boolean(a)},syncEmptyCls:Ext.emptyFn,applyValue:function(c){var a=c,b;this.getOptions();if(!(c instanceof Ext.data.Model)){b=this.getStore().find(this.getValueField(),c,null,null,null,true);if(b==-1){b=this.getStore().find(this.getDisplayField(),c,null,null,null,true)}a=this.getStore().getAt(b)}return a},updateValue:function(b,a){this.previousRecord=a;this.record=b;this.callParent([b?b.get(this.getDisplayField()):""]);if(a!==b){this.fireEvent("change",this,b,a)}},getValue:function(){var a=this.record;return(a)?a.get(this.getValueField()):null},getRecord:function(){return this.record},getPhonePicker:function(){var a=this.getDefaultPhonePickerConfig();if(!this.picker){this.picker=Ext.create("Ext.picker.Picker",Ext.apply({slots:[{align:"center",name:this.getName(),valueField:this.getValueField(),displayField:this.getDisplayField(),value:this.getValue(),store:this.getStore()}],listeners:{change:this.onPickerChange,scope:this}},a))}return this.picker},getTabletPicker:function(){var a=this.getDefaultTabletPickerConfig();if(!this.listPanel){this.listPanel=Ext.create("Ext.Panel",Ext.apply({centered:true,modal:true,cls:Ext.baseCSSPrefix+"select-overlay",layout:"fit",hideOnMaskTap:true,items:{xtype:"list",store:this.getStore(),itemTpl:'<span class="x-list-label">{'+this.getDisplayField()+"}</span>",listeners:{select:this.onListSelect,itemtap:this.onListTap,scope:this}}},a))}return this.listPanel},onMaskTap:function(){if(this.getDisabled()){return false}this.showPicker();return false},showPicker:function(){if(this.getStore().getCount()===0){return}if(this.getReadOnly()){return}this.isFocused=true;if(this.getUsePicker()){var e=this.getPhonePicker(),d=this.getName(),h={};h[d]=this.record.get(this.getValueField());e.setValue(h);if(!e.getParent()){Ext.Viewport.add(e)}e.show()}else{var f=this.getTabletPicker(),g=f.down("list"),b=g.getStore(),c=b.find(this.getValueField(),this.getValue(),null,null,null,true),a=b.getAt((c==-1)?0:c);if(!f.getParent()){Ext.Viewport.add(f)}f.showBy(this.getComponent());g.select(a,null,true)}},onListSelect:function(c,a){var b=this;if(a){b.setValue(a)}},onListTap:function(){this.listPanel.hide({type:"fade",out:true,scope:this})},onPickerChange:function(d,f){var e=this,g=f[e.getName()],b=e.getStore(),c=b.find(e.getValueField(),g,null,null,null,true),a=b.getAt(c);e.setValue(a)},updateOptions:function(b){var a=this.getStore();if(!b){a.clearData()}else{a.setData(b);this.onStoreDataChanged(a)}},applyStore:function(a){if(a===true){a=Ext.create("Ext.data.Store",{fields:[this.getValueField(),this.getDisplayField()]})}if(a){a=Ext.data.StoreManager.lookup(a);a.on({scope:this,addrecords:this.onStoreDataChanged,removerecords:this.onStoreDataChanged,updaterecord:this.onStoreDataChanged,refresh:this.onStoreDataChanged})}return a},updateStore:function(a){if(a){this.onStoreDataChanged(a)}},onStoreDataChanged:function(a){var c=this.getInitialConfig(),b=this.getValue();if(Ext.isDefined(b)){this.updateValue(this.applyValue(b))}if(this.getValue()===null){if(c.hasOwnProperty("value")){this.setValue(c.value)}if(this.getValue()===null){if(a.getCount()>0){this.setValue(a.getAt(0))}}}},doSetDisabled:function(a){Ext.Component.prototype.doSetDisabled.apply(this,arguments)},setDisabled:function(){Ext.Component.prototype.setDisabled.apply(this,arguments)},reset:function(){var b=this.getStore(),a=(this.originalValue)?this.originalValue:b.getAt(0);if(b&&a){this.setValue(a)}return this},onFocus:function(a){this.fireEvent("focus",this,a);this.isFocused=true;this.showPicker()},destroy:function(){this.callParent(arguments);Ext.destroy(this.listPanel,this.picker,this.hiddenField)}});Ext.define("Ext.picker.Date",{extend:"Ext.picker.Picker",xtype:"datepicker",alternateClassName:"Ext.DatePicker",requires:["Ext.DateExtras"],config:{yearFrom:1980,yearTo:new Date().getFullYear(),monthText:"Month",dayText:"Day",yearText:"Year",slotOrder:["month","day","year"]},initialize:function(){this.callParent();this.on({scope:this,delegate:"> slot",slotpick:this.onSlotPick})},setValue:function(b,a){if(Ext.isDate(b)){b={day:b.getDate(),month:b.getMonth()+1,year:b.getFullYear()}}this.callParent([b,a])},getValue:function(){var h={},a,g,c,f,e=this.getItems().items,d=e.length,j,b;for(b=0;b<d;b++){j=e[b];if(j instanceof Ext.picker.Slot){h[j.getName()]=j.getValue()}}if(h.year===null&&h.month===null&&h.day===null){return null}f=Ext.isNumber(h.year)?h.year:1;c=Ext.isNumber(h.month)?h.month:1;g=Ext.isNumber(h.day)?h.day:1;if(c&&f&&c&&g){a=this.getDaysInMonth(c,f)}g=(a)?Math.min(g,a):g;return new Date(f,c-1,g)},updateYearFrom:function(){if(this.initialized){this.createSlots()}},updateYearTo:function(){if(this.initialized){this.createSlots()}},updateMonthText:function(a,b){var f=this.getInnerItems,e=f.length,d,c;if(this.initialized){for(c=0;c<e;c++){d=f[c];if((typeof d.title=="string"&&d.title==b)||(d.title.html==b)){d.setTitle(a)}}}},updateDayText:function(a,c){var f=this.getInnerItems,e=f.length,d,b;if(this.initialized){for(b=0;b<e;b++){d=f[b];if((typeof d.title=="string"&&d.title==c)||(d.title.html==c)){d.setTitle(a)}}}},updateYearText:function(e){var d=this.getInnerItems,c=d.length,b,a;if(this.initialized){for(a=0;a<c;a++){b=d[a];if(b.title==this.yearText){b.setTitle(e)}}}},constructor:function(){this.callParent(arguments);this.createSlots()},createSlots:function(){var k=this,c=this.getSlotOrder(),m=k.getYearFrom(),f=k.getYearTo(),g=[],l=[],b=[],j,e,d,a;if(m>f){e=m;m=f;f=e}for(d=m;d<=f;d++){g.push({text:d,value:d})}a=this.getDaysInMonth(1,new Date().getFullYear());for(d=0;d<a;d++){l.push({text:d+1,value:d+1})}for(d=0,j=Ext.Date.monthNames.length;d<j;d++){b.push({text:Ext.Date.monthNames[d],value:d+1})}var h=[];c.forEach(function(i){h.push(this.createSlot(i,l,b,g))},this);k.setSlots(h)},createSlot:function(b,d,a,c){switch(b){case"year":return{name:"year",align:"center",data:c,title:this.getYearText(),flex:3};case"month":return{name:b,align:"right",data:a,title:this.getMonthText(),flex:4};case"day":return{name:"day",align:"center",data:d,title:this.getDayText(),flex:2}}},onSlotPick:function(){var j=this.getValue(),h=this.getDaySlot(),f=j.getFullYear(),e=j.getMonth(),k=[],b=h,a,c;if(!j||!Ext.isDate(j)||!h){return}a=this.getDaysInMonth(e+1,f);for(c=0;c<a;c++){k.push({text:c+1,value:c+1})}if(h.getData().length==k.length){return}var g=h.getStore(),n=h.getViewItems(),m=h.getValueField(),d,l;h.setData(k);d=g.find(m,j.getDate());if(d==-1){return}l=Ext.get(n[d]);h.selectedIndex=d;h.scrollToItem(l);h._value=j},getDaySlot:function(){var c=this.getInnerItems(),b=c.length,a,d;if(this.daySlot){return this.daySlot}for(a=0;a<b;a++){d=c[a];if(d.isSlot&&d.getName()=="day"){this.daySlot=d;return d}}return null},getDaysInMonth:function(c,b){var a=[31,28,31,30,31,30,31,31,30,31,30,31];return c==2&&this.isLeapYear(b)?29:a[c-1]},isLeapYear:function(a){return !!((a&3)===0&&(a%100||(a%400===0&&a)))}});Ext.define("Ext.field.DatePicker",{extend:"Ext.field.Text",alternateClassName:"Ext.form.DatePicker",xtype:"datepickerfield",requires:["Ext.picker.Date","Ext.DateExtras"],config:{ui:"select",picker:true,clearIcon:false,destroyPickerOnHide:false,dateFormat:null,component:{useMask:true}},initialize:function(){this.callParent();this.getComponent().on({scope:this,masktap:"onMaskTap"});this.getComponent().input.dom.disabled=true},syncEmptyCls:Ext.emptyFn,applyValue:function(a){if(!Ext.isDate(a)&&!Ext.isObject(a)){a=null}if(Ext.isObject(a)){a=new Date(a.year,a.month-1,a.day)}return a},updateValue:function(b){var a=this._picker;if(a&&a.isPicker){a.setValue(b)}if(b!==null){this.getComponent().setValue(Ext.Date.format(b,this.getDateFormat()||Ext.util.Format.defaultDateFormat))}else{this.getComponent().setValue("")}if(this._picker&&this._picker instanceof Ext.picker.Date){this._picker.setValue(b)}},updateDateFormat:function(c,a){var b=this.getValue();if(c!=a&&Ext.isDate(b)&&this._picker&&this._picker instanceof Ext.picker.Date){this.getComponent().setValue(Ext.Date.format(b,c||Ext.util.Format.defaultDateFormat))}},getValue:function(){if(this._picker&&this._picker instanceof Ext.picker.Date){return this._picker.getValue()}return this._value},getFormattedValue:function(b){var a=this.getValue();return(Ext.isDate(a))?Ext.Date.format(a,b||this.getDateFormat()||Ext.util.Format.defaultDateFormat):a},applyPicker:function(b,a){if(a&&a.isPicker){b=a.setConfig(b)}return b},getPicker:function(){var a=this._picker;if(a&&!a.isPicker){a=Ext.factory(a,Ext.picker.Date);a.on({scope:this,change:"onPickerChange",hide:"onPickerHide"});a.hide();a.setValue(this.getValue());Ext.Viewport.add(a);this._picker=a}return a},onMaskTap:function(){if(this.getDisabled()){return false}if(this.getReadOnly()){return false}this.getPicker().show();return false},onPickerChange:function(a,c){var b=this;b.setValue(c);b.fireEvent("change",b,b.getValue())},onPickerHide:function(){var a=this.getPicker();if(this.getDestroyPickerOnHide()&&a){a.destroy();this.setPicker(null)}},reset:function(){this.setValue(this.originalValue)},destroy:function(){var a=this.getPicker();if(a){a.destroy()}this.callParent(arguments)}});Ext.define("Ext.slider.Thumb",{extend:"Ext.Component",xtype:"thumb",config:{baseCls:Ext.baseCSSPrefix+"thumb",draggable:{direction:"horizontal"}},elementWidth:0,initialize:function(){this.callParent();this.getDraggable().onBefore({dragstart:"onDragStart",drag:"onDrag",dragend:"onDragEnd",scope:this});this.on("painted","onPainted")},onDragStart:function(){if(this.isDisabled()){return false}this.relayEvent(arguments)},onDrag:function(){if(this.isDisabled()){return false}this.relayEvent(arguments)},onDragEnd:function(){if(this.isDisabled()){return false}this.relayEvent(arguments)},onPainted:function(){this.elementWidth=this.element.dom.offsetWidth},getElementWidth:function(){return this.elementWidth}});Ext.define("Ext.slider.Slider",{extend:"Ext.Container",xtype:"slider",requires:["Ext.slider.Thumb","Ext.fx.easing.EaseOut"],config:{baseCls:"x-slider",thumbConfig:{draggable:{translatable:{easingX:{duration:300,type:"ease-out"}}}},value:0,minValue:0,maxValue:100,increment:1,allowThumbsOverlapping:false,animation:true},elementWidth:0,offsetValueRatio:0,activeThumb:null,constructor:function(a){a=a||{};if(a.hasOwnProperty("values")){a.value=a.values}this.callParent([a])},initialize:function(){var a=this.element;this.callParent();a.on({scope:this,tap:"onTap"});this.on({scope:this,delegate:"> thumb",dragstart:"onThumbDragStart",drag:"onThumbDrag",dragend:"onThumbDragEnd"});this.on({painted:"refresh",resize:"refresh"})},factoryThumb:function(){return Ext.factory(this.getThumbConfig(),Ext.slider.Thumb)},getThumbs:function(){return this.innerItems},getThumb:function(a){if(typeof a!="number"){a=0}return this.innerItems[a]},refreshOffsetValueRatio:function(){var b=this.getMaxValue()-this.getMinValue(),a=this.elementWidth-this.thumbWidth;this.offsetValueRatio=a/b},refreshElementWidth:function(){this.elementWidth=this.element.dom.offsetWidth;this.thumbWidth=this.getThumb(0).getElementWidth()},refresh:function(){this.refreshElementWidth();this.refreshValue()},setActiveThumb:function(b){var a=this.activeThumb;if(a&&a!==b){a.setZIndex(null)}this.activeThumb=b;b.setZIndex(2);return this},onThumbDragStart:function(a,b){if(b.absDeltaX<=b.absDeltaY){return false}else{b.stopPropagation()}if(this.getAllowThumbsOverlapping()){this.setActiveThumb(a)}this.dragStartValue=this.getValue()[this.getThumbIndex(a)];this.fireEvent("dragstart",this,a,this.dragStartValue,b)},onThumbDrag:function(c,g,a){var d=this.getThumbIndex(c),f=this.offsetValueRatio,b=this.constrainValue(a/f);g.stopPropagation();this.setIndexValue(d,b);this.fireEvent("drag",this,c,this.getValue(),g);return false},setIndexValue:function(d,g,f){var c=this.getThumb(d),b=this.getValue(),e=this.offsetValueRatio,a=c.getDraggable();a.setOffset(g*e,null,f);b[d]=this.constrainValue(a.getOffset().x/e)},onThumbDragEnd:function(a,f){this.refreshThumbConstraints(a);var c=this.getThumbIndex(a),d=this.getValue()[c],b=this.dragStartValue;this.fireEvent("dragend",this,a,this.getValue(),f);if(b!==d){this.fireEvent("change",this,a,d,b)}},getThumbIndex:function(a){return this.getThumbs().indexOf(a)},refreshThumbConstraints:function(d){var b=this.getAllowThumbsOverlapping(),a=d.getDraggable().getOffset().x,c=this.getThumbs(),e=this.getThumbIndex(d),g=c[e-1],h=c[e+1],f=this.thumbWidth;if(g){g.getDraggable().addExtraConstraint({max:{x:a-((b)?0:f)}})}if(h){h.getDraggable().addExtraConstraint({min:{x:a+((b)?0:f)}})}},onTap:function(j){if(this.isDisabled()){return}var k=Ext.get(j.target);if(!k||k.hasCls("x-thumb")){return}var n=j.touch.point.x,h=this.element,c=h.getX(),d=n-c-(this.thumbWidth/2),o=this.constrainValue(d/this.offsetValueRatio),r=this.getValue(),q=Infinity,m=r.length,g,f,l,p,b,a;if(m===1){p=0}else{for(g=0;g<m;g++){l=r[g];f=Math.abs(l-o);if(f<q){q=f;p=g}}}b=r[p];a=this.getThumb(p);this.setIndexValue(p,o,this.getAnimation());this.refreshThumbConstraints(a);if(b!==o){this.fireEvent("change",this,a,o,b)}},updateThumbs:function(a){this.add(a)},applyValue:function(g){var d=Ext.Array.from(g||0),b=[],c=this.getMinValue(),a,e,f;for(e=0,f=d.length;e<f;e++){a=this.constrainValue(d[e]);if(a<c){a=c}b.push(a);c=a}return b},updateValue:function(e,b){var a=this.getThumbs(),d=e.length,c;this.setThumbsCount(d);for(c=0;c<d;c++){a[c].getDraggable().setExtraConstraint(null).setOffset(e[c]*this.offsetValueRatio)}for(c=0;c<d;c++){this.refreshThumbConstraints(a[c])}},refreshValue:function(){this.refreshOffsetValueRatio();this.setValue(this.getValue())},constrainValue:function(e){var b=this,d=b.getMinValue(),f=b.getMaxValue(),a=b.getIncrement(),c;e=parseFloat(e);if(isNaN(e)){e=d}c=e%a;e-=c;if(Math.abs(c)>=(a/2)){e+=(c>0)?a:-a}e=Math.max(d,e);e=Math.min(f,e);return e},setThumbsCount:function(e){var a=this.getThumbs(),f=a.length,c,d,b;if(f>e){for(c=0,d=f-e;c<d;c++){b=a[a.length-1];b.destroy()}}else{if(f<e){for(c=0,d=e-f;c<d;c++){this.add(this.factoryThumb())}}}return this},setValues:function(a){this.setValue(a)},getValues:function(){return this.getValue()},applyIncrement:function(a){if(a===0){a=1}return Math.abs(a)},updateAllowThumbsOverlapping:function(b,a){if(typeof a!="undefined"){this.refreshValue()}},updateMinValue:function(b,a){if(typeof a!="undefined"){this.refreshValue()}},updateMaxValue:function(b,a){if(typeof a!="undefined"){this.refreshValue()}},updateIncrement:function(b,a){if(typeof a!="undefined"){this.refreshValue()}},doSetDisabled:function(c){this.callParent(arguments);var a=this.getItems().items,d=a.length,b;for(b=0;b<d;b++){a[b].setDisabled(c)}}},function(){});Ext.define("Ext.field.Slider",{extend:"Ext.field.Field",xtype:"sliderfield",requires:["Ext.slider.Slider"],alternateClassName:"Ext.form.Slider",config:{cls:Ext.baseCSSPrefix+"slider-field",tabIndex:-1},proxyConfig:{value:0,minValue:0,maxValue:100,increment:1},constructor:function(a){a=a||{};if(a.hasOwnProperty("values")){a.value=a.values}this.callParent([a])},initialize:function(){this.callParent();this.getComponent().on({scope:this,change:"onSliderChange"})},applyComponent:function(a){return Ext.factory(a,Ext.slider.Slider)},onSliderChange:function(c,a,d,b){this.fireEvent("change",this,a,d,b)},setValues:function(a){this.setValue(a)},getValues:function(){return this.getValue()},reset:function(){var b=this.config,a=(this.config.hasOwnProperty("values"))?b.values:b.value;this.setValue(a)},doSetDisabled:function(a){this.callParent(arguments);this.getComponent().setDisabled(a)}});Ext.define("Ext.slider.Toggle",{extend:"Ext.slider.Slider",config:{baseCls:"x-toggle",minValueCls:"x-toggle-off",maxValueCls:"x-toggle-on"},initialize:function(){this.callParent();this.on({change:"onChange"})},applyMinValue:function(){return 0},applyMaxValue:function(){return 1},applyIncrement:function(){return 1},setValue:function(b,a){this.callParent(arguments);this.onChange(this,this.getThumbs()[0],b,a)},onChange:function(d,a,f,c){var g=f>0,b=d.getMaxValueCls(),e=d.getMinValueCls();this.element.addCls(g?b:e);this.element.removeCls(g?e:b)}});Ext.define("Ext.field.Toggle",{extend:"Ext.field.Slider",xtype:"togglefield",alternateClassName:"Ext.form.Toggle",requires:["Ext.slider.Toggle"],config:{cls:"x-toggle-field"},proxyConfig:{minValueCls:"x-toggle-off",maxValueCls:"x-toggle-on"},applyComponent:function(a){return Ext.factory(a,Ext.slider.Toggle)},setValue:function(a){if(a===true){a=1}this.getComponent().setValue(a);return this},toggle:function(){var a=this.getValue();this.setValue((a==1)?0:1);return this}});Ext.define("Ext.tab.Tab",{extend:"Ext.Button",xtype:"tab",alternateClassName:"Ext.Tab",isTab:true,config:{baseCls:Ext.baseCSSPrefix+"tab",pressedCls:Ext.baseCSSPrefix+"tab-pressed",activeCls:Ext.baseCSSPrefix+"tab-active",active:false,title:"&nbsp;"},template:[{tag:"span",reference:"badgeElement",hidden:true},{tag:"span",className:Ext.baseCSSPrefix+"button-icon",reference:"iconElement",style:"visibility: hidden !important"},{tag:"span",reference:"textElement",hidden:true}],updateTitle:function(a){this.setText(a)},hideIconElement:function(){this.iconElement.dom.style.setProperty("visibility","hidden","!important")},showIconElement:function(){this.iconElement.dom.style.setProperty("visibility","visible","!important")},updateActive:function(c,b){var a=this.getActiveCls();if(c&&!b){this.element.addCls(a);this.fireEvent("activate",this)}else{if(b){this.element.removeCls(a);this.fireEvent("deactivate",this)}}}},function(){this.override({activate:function(){this.setActive(true)},deactivate:function(){this.setActive(false)}})});Ext.define("Ext.tab.Bar",{extend:"Ext.Toolbar",alternateClassName:"Ext.TabBar",xtype:"tabbar",requires:["Ext.tab.Tab"],config:{baseCls:Ext.baseCSSPrefix+"tabbar",defaultType:"tab",layout:{type:"hbox",align:"middle"}},eventedConfig:{activeTab:null},initialize:function(){var a=this;a.callParent();a.on({tap:"onTabTap",delegate:"> tab",scope:a})},onTabTap:function(a){this.setActiveTab(a)},applyActiveTab:function(a,c){if(!a&&a!==0){return}var b=this.parseActiveTab(a);if(!b){return}return b},doSetDocked:function(a){var c=this.getLayout(),b=a=="bottom"?"center":"left";if(c.isLayout){c.setPack(b)}else{c.pack=(c&&c.pack)?c.pack:b}},doSetActiveTab:function(b,a){if(b){b.setActive(true)}if(a){a.setActive(false)}},parseActiveTab:function(a){if(typeof a=="number"){return this.getInnerItems()[a]}else{if(typeof a=="string"){a=Ext.getCmp(a)}}return a}});Ext.define("Ext.tab.Panel",{extend:"Ext.Container",xtype:"tabpanel",alternateClassName:"Ext.TabPanel",requires:["Ext.tab.Bar"],config:{ui:"dark",tabBar:true,tabBarPosition:"top",layout:{type:"card",animation:{type:"slide",direction:"left"}},cls:Ext.baseCSSPrefix+"tabpanel"},delegateListeners:{delegate:"> component",centeredchange:"onItemCenteredChange",dockedchange:"onItemDockedChange",floatingchange:"onItemFloatingChange",disabledchange:"onItemDisabledChange"},initialize:function(){this.callParent();this.on({order:"before",activetabchange:"doTabChange",delegate:"> tabbar",scope:this})},applyScrollable:function(){return false},updateUi:function(a,b){this.callParent(arguments);if(this.initialized){this.getTabBar().setUi(a)}},doSetActiveItem:function(d,j){if(d){var f=this.getInnerItems(),g=f.indexOf(j),i=f.indexOf(d),e=g>i,c=this.getLayout().getAnimation(),b=this.getTabBar(),h=b.parseActiveTab(g),a=b.parseActiveTab(i);if(c&&c.setReverse){c.setReverse(e)}this.callParent(arguments);if(i!=-1){this.getTabBar().setActiveTab(i);if(h){h.setActive(false)}if(a){a.setActive(true)}}}},doTabChange:function(a,b){this.setActiveItem(a.indexOf(b))},applyTabBar:function(a){if(a===true){a={}}if(a){Ext.applyIf(a,{ui:this.getUi(),docked:this.getTabBarPosition()})}return Ext.factory(a,Ext.tab.Bar,this.getTabBar())},updateTabBar:function(a){if(a){this.add(a);this.setTabBarPosition(a.getDocked())}},updateTabBarPosition:function(b){var a=this.getTabBar();if(a){a.setDocked(b)}},onItemAdd:function(e){var k=this;if(!e.isInnerItem()){return k.callParent(arguments)}var c=k.getTabBar(),o=e.getInitialConfig(),d=o.tab||{},g=o.title,i=o.iconCls,j=o.hidden,n=o.disabled,p=o.badgeText,b=k.getInnerItems(),h=b.indexOf(e),l=c.getItems(),a=k.getInnerItems(),m=(l.length>=a.length)&&l.getAt(h),f;if(g&&!d.title){d.title=g}if(i&&!d.iconCls){d.iconCls=i}if(j&&!d.hidden){d.hidden=j}if(n&&!d.disabled){d.disabled=n}if(p&&!d.badgeText){d.badgeText=p}f=Ext.factory(d,Ext.tab.Tab,m);if(!m){c.insert(h,f)}e.tab=f;k.callParent(arguments)},onItemDisabledChange:function(a,b){if(a&&a.tab){a.tab.setDisabled(b)}},onItemRemove:function(b,a){this.getTabBar().remove(b.tab,this.getAutoDestroy());this.callParent(arguments)}},function(){});Ext.define("Ext.table.Cell",{extend:"Ext.Container",xtype:"tablecell",config:{baseCls:"x-table-cell"},getElementConfig:function(){var a=this.callParent();a.children.length=0;return a}});Ext.define("Ext.table.Row",{extend:"Ext.table.Cell",xtype:"tablerow",config:{baseCls:"x-table-row",defaultType:"tablecell"}});Ext.define("Ext.table.Table",{extend:"Ext.Container",requires:["Ext.table.Row"],xtype:"table",config:{baseCls:"x-table",defaultType:"tablerow"},cachedConfig:{fixedLayout:false},fixedLayoutCls:"x-table-fixed",updateFixedLayout:function(a){this.innerElement[a?"addCls":"removeCls"](this.fixedLayoutCls)}});Ext.define("Ext.viewport.Default",{extend:"Ext.Container",xtype:"viewport",PORTRAIT:"portrait",LANDSCAPE:"landscape",requires:["Ext.LoadMask"],config:{autoMaximize:false,autoBlurInput:true,preventPanning:true,preventZooming:true,autoRender:true,layout:"card",width:"100%",height:"100%"},isReady:false,isViewport:true,isMaximizing:false,id:"ext-viewport",isInputRegex:/^(input|textarea|select|a)$/i,focusedElement:null,fullscreenItemCls:Ext.baseCSSPrefix+"fullscreen",constructor:function(a){var b=Ext.Function.bind;this.doPreventPanning=b(this.doPreventPanning,this);this.doPreventZooming=b(this.doPreventZooming,this);this.doBlurInput=b(this.doBlurInput,this);this.maximizeOnEvents=["ready","orientationchange"];this.orientation=this.determineOrientation();this.windowWidth=this.getWindowWidth();this.windowHeight=this.getWindowHeight();this.windowOuterHeight=this.getWindowOuterHeight();if(!this.stretchHeights){this.stretchHeights={}}this.callParent([a]);if(this.supportsOrientation()){this.addWindowListener("orientationchange",b(this.onOrientationChange,this))}else{this.addWindowListener("resize",b(this.onResize,this))}document.addEventListener("focus",b(this.onElementFocus,this),true);document.addEventListener("blur",b(this.onElementBlur,this),true);Ext.onDocumentReady(this.onDomReady,this);this.on("ready",this.onReady,this,{single:true});this.getEventDispatcher().addListener("component","*","fullscreen","onItemFullscreenChange",this);return this},onDomReady:function(){this.isReady=true;this.updateSize();this.fireEvent("ready",this)},onReady:function(){if(this.getAutoRender()){this.render()}},onElementFocus:function(a){this.focusedElement=a.target},onElementBlur:function(){this.focusedElement=null},render:function(){if(!this.rendered){var a=Ext.getBody(),b=Ext.baseCSSPrefix,h=[],d=Ext.os,g=d.name.toLowerCase(),f=Ext.browser.name.toLowerCase(),e=d.version.getMajor(),c=this.getOrientation();this.renderTo(a);h.push(b+d.deviceType.toLowerCase());if(d.is.iPad){h.push(b+"ipad")}h.push(b+g);h.push(b+f);if(e){h.push(b+g+"-"+e)}if(d.is.BlackBerry){h.push(b+"bb")}if(Ext.browser.is.Standalone){h.push(b+"standalone")}h.push(b+c);a.addCls(h)}},applyAutoBlurInput:function(a){var b=(Ext.feature.has.Touch)?"touchstart":"mousedown";if(a){this.addWindowListener(b,this.doBlurInput,false)}else{this.removeWindowListener(b,this.doBlurInput,false)}return a},applyAutoMaximize:function(a){if(a){this.on("ready","doAutoMaximizeOnReady",this,{single:true});this.on("orientationchange","doAutoMaximizeOnOrientationChange",this)}else{this.un("ready","doAutoMaximizeOnReady",this);this.un("orientationchange","doAutoMaximizeOnOrientationChange",this)}return a},applyPreventPanning:function(a){if(a){this.addWindowListener("touchmove",this.doPreventPanning,false)}else{this.removeWindowListener("touchmove",this.doPreventPanning,false)}return a},applyPreventZooming:function(a){var b=(Ext.feature.has.Touch)?"touchstart":"mousedown";if(a){this.addWindowListener(b,this.doPreventZooming,false)}else{this.removeWindowListener(b,this.doPreventZooming,false)}return a},doAutoMaximizeOnReady:function(){var a=arguments[arguments.length-1];a.pause();this.isMaximizing=true;this.on("maximize",function(){this.isMaximizing=false;this.updateSize();a.resume();this.fireEvent("ready",this)},this,{single:true});this.maximize()},doAutoMaximizeOnOrientationChange:function(){var a=arguments[arguments.length-1],b=a.firingArguments;a.pause();this.isMaximizing=true;this.on("maximize",function(){this.isMaximizing=false;this.updateSize();b[1]=this.windowWidth;b[2]=this.windowHeight;a.resume()},this,{single:true});this.maximize()},doBlurInput:function(b){var a=b.target,c=this.focusedElement;if(c&&!this.isInputRegex.test(a.tagName)){delete this.focusedElement;c.blur()}},doPreventPanning:function(a){a.preventDefault()},doPreventZooming:function(b){if("button" in b&&b.button!==0){return}var a=b.target;if(a&&a.nodeType===1&&!this.isInputRegex.test(a.tagName)){b.preventDefault()}},addWindowListener:function(b,c,a){window.addEventListener(b,c,Boolean(a))},removeWindowListener:function(b,c,a){window.removeEventListener(b,c,Boolean(a))},doAddListener:function(a,d,c,b){if(a==="ready"&&this.isReady&&!this.isMaximizing){d.call(c);return this}this.mixins.observable.doAddListener.apply(this,arguments)},supportsOrientation:function(){return Ext.feature.has.Orientation},onResize:function(){var c=this.windowWidth,f=this.windowHeight,e=this.getWindowWidth(),a=this.getWindowHeight(),d=this.getOrientation(),b=this.determineOrientation();if((c!==e||f!==a)&&d!==b){this.fireOrientationChangeEvent(b,d)}},onOrientationChange:function(){var b=this.getOrientation(),a=this.determineOrientation();if(a!==b){this.fireOrientationChangeEvent(a,b)}},fireOrientationChangeEvent:function(b,c){var a=Ext.baseCSSPrefix;Ext.getBody().replaceCls(a+c,a+b);this.orientation=b;this.updateSize();this.fireEvent("orientationchange",this,b,this.windowWidth,this.windowHeight)},updateSize:function(b,a){this.windowWidth=b!==undefined?b:this.getWindowWidth();this.windowHeight=a!==undefined?a:this.getWindowHeight();return this},waitUntil:function(h,e,g,a,f){if(!a){a=50}if(!f){f=2000}var c=this,b=0;setTimeout(function d(){b+=a;if(h.call(c)===true){if(e){e.call(c)}}else{if(b>=f){if(g){g.call(c)}}else{setTimeout(d,a)}}},a)},maximize:function(){this.fireMaximizeEvent()},fireMaximizeEvent:function(){this.updateSize();this.fireEvent("maximize",this)},doSetHeight:function(a){Ext.getBody().setHeight(a);this.callParent(arguments)},doSetWidth:function(a){Ext.getBody().setWidth(a);this.callParent(arguments)},scrollToTop:function(){window.scrollTo(0,-1)},getWindowWidth:function(){return window.innerWidth},getWindowHeight:function(){return window.innerHeight},getWindowOuterHeight:function(){return window.outerHeight},getWindowOrientation:function(){return window.orientation},getOrientation:function(){return this.orientation},getSize:function(){return{width:this.windowWidth,height:this.windowHeight}},determineOrientation:function(){var b=this.PORTRAIT,a=this.LANDSCAPE;if(this.supportsOrientation()){if(this.getWindowOrientation()%180===0){return b}return a}else{if(this.getWindowHeight()>=this.getWindowWidth()){return b}return a}},onItemFullscreenChange:function(a){a.addCls(this.fullscreenItemCls);this.add(a)}});Ext.define("Ext.viewport.Android",{extend:"Ext.viewport.Default",constructor:function(){this.on("orientationchange","doFireOrientationChangeEvent",this,{prepend:true});this.on("orientationchange","hideKeyboardIfNeeded",this,{prepend:true});return this.callParent(arguments)},getDummyInput:function(){var a=this.dummyInput,c=this.focusedElement,b=Ext.fly(c).getPageBox();if(!a){this.dummyInput=a=document.createElement("input");a.style.position="absolute";a.style.opacity="0";document.body.appendChild(a)}a.style.left=b.left+"px";a.style.top=b.top+"px";a.style.display="";return a},doBlurInput:function(c){var b=c.target,d=this.focusedElement,a;if(d&&!this.isInputRegex.test(b.tagName)){a=this.getDummyInput();delete this.focusedElement;a.focus();setTimeout(function(){a.style.display="none"},100)}},hideKeyboardIfNeeded:function(){var a=arguments[arguments.length-1],b=this.focusedElement;if(b){delete this.focusedElement;a.pause();if(Ext.os.version.lt("4")){b.style.display="none"}else{b.blur()}setTimeout(function(){b.style.display="";a.resume()},1000)}},doFireOrientationChangeEvent:function(){var a=arguments[arguments.length-1];this.orientationChanging=true;a.pause();this.waitUntil(function(){return this.getWindowOuterHeight()!==this.windowOuterHeight},function(){this.windowOuterHeight=this.getWindowOuterHeight();this.updateSize();a.firingArguments[1]=this.windowWidth;a.firingArguments[2]=this.windowHeight;a.resume();this.orientationChanging=false},function(){});return this},applyAutoMaximize:function(a){this.callParent(arguments);this.on("add","fixSize",this,{single:true});if(!a){this.on("ready","fixSize",this,{single:true});this.onAfter("orientationchange","doFixSize",this)}else{this.un("ready","fixSize",this);this.unAfter("orientationchange","doFixSize",this)}},fixSize:function(){this.doFixSize()},doFixSize:function(){this.setHeight(this.getWindowHeight())},getActualWindowOuterHeight:function(){return Math.round(this.getWindowOuterHeight()/window.devicePixelRatio)},maximize:function(){var c=this.stretchHeights,b=this.orientation,a;a=c[b];if(!a){c[b]=a=this.getActualWindowOuterHeight()}if(!this.addressBarHeight){this.addressBarHeight=a-this.getWindowHeight()}this.setHeight(a);var d=Ext.Function.bind(this.isHeightMaximized,this,[a]);this.scrollToTop();this.waitUntil(d,this.fireMaximizeEvent,this.fireMaximizeEvent)},isHeightMaximized:function(a){this.scrollToTop();return this.getWindowHeight()===a}},function(){if(!Ext.os.is.Android){return}var a=Ext.os.version,b=Ext.browser.userAgent,c=/(htc|desire|incredible|ADR6300)/i.test(b)&&a.lt("2.3");if(c){this.override({constructor:function(d){if(!d){d={}}d.autoMaximize=false;this.watchDogTick=Ext.Function.bind(this.watchDogTick,this);setInterval(this.watchDogTick,1000);return this.callParent([d])},watchDogTick:function(){this.watchDogLastTick=Ext.Date.now()},doPreventPanning:function(){var e=Ext.Date.now(),f=this.watchDogLastTick,d=e-f;if(d>=2000){return}return this.callParent(arguments)},doPreventZooming:function(){var e=Ext.Date.now(),f=this.watchDogLastTick,d=e-f;if(d>=2000){return}return this.callParent(arguments)}})}if(a.match("2")){this.override({onReady:function(){this.addWindowListener("resize",Ext.Function.bind(this.onWindowResize,this));this.callParent(arguments)},scrollToTop:function(){document.body.scrollTop=100},onWindowResize:function(){var e=this.windowWidth,g=this.windowHeight,f=this.getWindowWidth(),d=this.getWindowHeight();if(this.getAutoMaximize()&&!this.isMaximizing&&!this.orientationChanging&&window.scrollY===0&&e===f&&d<g&&((d>=g-this.addressBarHeight)||!this.focusedElement)){this.scrollToTop()}},fixSize:function(){var d=this.getOrientation(),f=window.outerHeight,g=window.outerWidth,e;if(d==="landscape"&&(f<g)||d==="portrait"&&(f>=g)){e=this.getActualWindowOuterHeight()}else{e=this.getWindowHeight()}this.waitUntil(function(){return e>this.getWindowHeight()},this.doFixSize,this.doFixSize,50,1000)}})}else{if(a.gtEq("3.1")){this.override({isHeightMaximized:function(d){this.scrollToTop();return this.getWindowHeight()===d-1}})}else{if(a.match("3")){this.override({isHeightMaximized:function(){this.scrollToTop();return true}})}}}if(a.gtEq("4")){this.override({doBlurInput:Ext.emptyFn})}});Ext.define("Ext.viewport.Ios",{extend:"Ext.viewport.Default",isFullscreen:function(){return this.isHomeScreen()},isHomeScreen:function(){return window.navigator.standalone===true},constructor:function(){this.callParent(arguments);if(this.getAutoMaximize()&&!this.isFullscreen()){this.addWindowListener("touchstart",Ext.Function.bind(this.onTouchStart,this))}},maximize:function(){if(this.isFullscreen()){return this.callParent()}var c=this.stretchHeights,b=this.orientation,d=this.getWindowHeight(),a=c[b];if(window.scrollY>0){this.scrollToTop();if(!a){c[b]=a=this.getWindowHeight()}this.setHeight(a);this.fireMaximizeEvent()}else{if(!a){a=this.getScreenHeight()}this.setHeight(a);this.waitUntil(function(){this.scrollToTop();return d!==this.getWindowHeight()},function(){if(!c[b]){a=c[b]=this.getWindowHeight();this.setHeight(a)}this.fireMaximizeEvent()},function(){a=c[b]=this.getWindowHeight();this.setHeight(a);this.fireMaximizeEvent()},50,1000)}},getScreenHeight:function(){return window.screen[this.orientation===this.PORTRAIT?"height":"width"]},onElementFocus:function(){if(this.getAutoMaximize()&&!this.isFullscreen()){clearTimeout(this.scrollToTopTimer)}this.callParent(arguments)},onElementBlur:function(){if(this.getAutoMaximize()&&!this.isFullscreen()){this.scrollToTopTimer=setTimeout(this.scrollToTop,500)}this.callParent(arguments)},onTouchStart:function(){if(this.focusedElement===null){this.scrollToTop()}},scrollToTop:function(){window.scrollTo(0,0)}},function(){if(!Ext.os.is.iOS){return}if(Ext.os.version.lt("3.2")){this.override({constructor:function(){var a=this.stretchHeights={};a[this.PORTRAIT]=416;a[this.LANDSCAPE]=268;return this.callOverridden(arguments)}})}if(Ext.os.version.lt("5")){this.override({fieldMaskClsTest:"-field-mask",doPreventZooming:function(b){var a=b.target;if(a&&a.nodeType===1&&!this.isInputRegex.test(a.tagName)&&a.className.indexOf(this.fieldMaskClsTest)==-1){b.preventDefault()}}})}if(Ext.os.is.iPad){this.override({isFullscreen:function(){return true}})}});Ext.define("Ext.viewport.Viewport",{requires:["Ext.viewport.Ios","Ext.viewport.Android"],constructor:function(b){var c=Ext.os.name,d,a;switch(c){case"Android":d="Android";break;case"iOS":d="Ios";break;default:d="Default"}a=Ext.create("Ext.viewport."+d,b);return a}});Ext.define("Ext.event.recognizer.Swipe",{extend:"Ext.event.recognizer.SingleTouch",handledEvents:["swipe"],inheritableStatics:{MAX_OFFSET_EXCEEDED:16,MAX_DURATION_EXCEEDED:17,DISTANCE_NOT_ENOUGH:18},config:{minDistance:80,maxOffset:35,maxDuration:1000},onTouchStart:function(a){if(this.callParent(arguments)===false){return false}var b=a.changedTouches[0];this.startTime=a.time;this.isHorizontal=true;this.isVertical=true;this.startX=b.pageX;this.startY=b.pageY},onTouchMove:function(f){var h=f.changedTouches[0],b=h.pageX,g=h.pageY,c=Math.abs(b-this.startX),a=Math.abs(g-this.startY),d=f.time;if(d-this.startTime>this.getMaxDuration()){return this.fail(this.self.MAX_DURATION_EXCEEDED)}if(this.isVertical&&c>this.getMaxOffset()){this.isVertical=false}if(this.isHorizontal&&a>this.getMaxOffset()){this.isHorizontal=false}if(!this.isHorizontal&&!this.isVertical){return this.fail(this.self.MAX_OFFSET_EXCEEDED)}},onTouchEnd:function(i){if(this.onTouchMove(i)===false){return false}var h=i.changedTouches[0],l=h.pageX,j=h.pageY,g=l-this.startX,f=j-this.startY,c=Math.abs(g),b=Math.abs(f),m=this.getMinDistance(),d=i.time-this.startTime,k,a;if(this.isVertical&&b<m){this.isVertical=false}if(this.isHorizontal&&c<m){this.isHorizontal=false}if(this.isHorizontal){k=(g<0)?"left":"right";a=c}else{if(this.isVertical){k=(f<0)?"up":"down";a=b}else{return this.fail(this.self.DISTANCE_NOT_ENOUGH)}}this.fire("swipe",i,[h],{touch:h,direction:k,distance:a,duration:d})}});Ext.define("Ext.event.recognizer.HorizontalSwipe",{extend:"Ext.event.recognizer.Swipe",handledEvents:["swipe"],onTouchStart:function(a){if(this.callParent(arguments)===false){return false}var b=a.changedTouches[0];this.startTime=a.time;this.startX=b.pageX;this.startY=b.pageY},onTouchMove:function(f){var h=f.changedTouches[0],g=h.pageY,a=Math.abs(g-this.startY),d=f.time,c=this.getMaxDuration(),b=this.getMaxOffset();if(d-this.startTime>c){return this.fail(this.self.MAX_DURATION_EXCEEDED)}if(a>b){return this.fail(this.self.MAX_OFFSET_EXCEEDED)}},onTouchEnd:function(f){if(this.onTouchMove(f)!==false){var i=f.changedTouches[0],a=i.pageX,b=a-this.startX,h=Math.abs(b),d=f.time-this.startTime,g=this.getMinDistance(),c;if(h<g){return this.fail(this.self.DISTANCE_NOT_ENOUGH)}c=(b<0)?"left":"right";this.fire("swipe",f,[i],{touch:i,direction:c,distance:h,duration:d})}}});
diff --git a/apps/files_odfviewer/src/webodf/programs/touchui/welcome.odt b/apps/files_odfviewer/src/webodf/programs/touchui/welcome.odt
new file mode 100644
index 0000000000000000000000000000000000000000..22e4d928241b9e316679983423df428f43bbb126
GIT binary patch
literal 62780
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
VP7)gCNetuhr~j#5=kRIo{{a)gMvwpi

literal 0
HcmV?d00001

diff --git a/apps/files_odfviewer/src/webodf/programs/touchui/zoom-fit-best.png b/apps/files_odfviewer/src/webodf/programs/touchui/zoom-fit-best.png
new file mode 100644
index 0000000000000000000000000000000000000000..623885a022926da4d55e2a8672462d89e5b19d99
GIT binary patch
literal 932
zcmV;V16%xwP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01ejw01ejxLMWSf00007bV*G`2iOG+
z3JN#>O3Zlx00SgRL_t(|+SQiNOB7)o#-DebRnwq4q?ZVymQMWzU1|+NJL`WCT}s1)
z6<J_b1kp*!bJ8K*?a(DUblNTvWZ)^Y%jPPy8@apgubJK1w{I_uFYmm~j58$BBM<ZS
zWtq?OKJU9I{<RoX9U~tX>-!^4{zlHb3no;ZaUAEhW!V7pBxFpcj!8C66A9BC2?_wq
zwoxjTzzjxAk3sUzGMt>XiuKty00RU(o6X`!u?XNd5I8z8fK)1_gdq6`A=Pc5uN#mh
zvfu#ngNA^Qj*Y=E46(Mnv=q68N|WRAa|c(?8#sH?fKYe<Mo<QLs;^jG$maS{v$$~G
z0;*PrW{}+{hp;Vw&u??Q{p?`sB5?asXaj;PcLzBi>h0j%iAHb>U`owfWngl-g=;C3
z8emb5fMI~nJd;kN)a=6HUI&ANgD_~_g)#3egY3>n`Z$)a^gz*G1EhwA#PiLU0~k5o
z6tf2^3^j}r<Y2F|<7f@IZrI$N!$SB$A~qn;R=92>LI6#X8*st?4X99Isdx?Ok|5Oe
z0Ks5=E#4)>ZUYE{`vr-A1nSq!ZNTt>#|jdD2h>Z*0e|?u-T`?D^(yzR0rd}xdI^Kz
zfAJ2eM<5yqhwCrroC~W84WJ)Gy#-x5Tmg4F9XO67OtV-Mo9Z&7H2{bPG?*W}TrQ(n
zED)4K{LmBbzha35wktbT0M+0Co_gyR#~vhhS|}8dOeVFXXti3%<#P7J*_jytD}a;{
zR&To#R=up9{73jkexoxtKldP$dAR_f77#!JYBsP{;vk7<&EiVkUQoN;7H95-=Qs0w
zaq-#X`MLQg5*`r1Mf7(A*OzR3uW(Gfu+ZPb0_!IjxvjuAH}lA3(hIZq?$2s)J%Fz9
zp#-cpFma(9iuC#gkQz{Sp3bD7-n?;ZO2Wf6Y}+<(G#b3wZ1Ugp%&RJ=7Yb9&!UW<3
z6{cBymM$P)S@|U9^{?yBox9VIKt)0-UI6l*1FWvD^0l=!YkXpS8bBXnXqa9oVG`&<
zH9O>nW%J_C5`XvpLv?g)bTSH@LDea867jV|{zz`%f6*_Jd<?mNjG43m0000<MNUMn
GLSTXlR-$wO

literal 0
HcmV?d00001

diff --git a/apps/files_odfviewer/src/webodf/programs/touchui/zoom-fit-height.png b/apps/files_odfviewer/src/webodf/programs/touchui/zoom-fit-height.png
new file mode 100644
index 0000000000000000000000000000000000000000..7f8d1935c64afd233b40d76c4f78d80928bd6e28
GIT binary patch
literal 947
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|I14-?i-C%-
zgD|6$#_S59AbW|YuPgfvRvun?laQUcKvNiN1AIbUfl~NEXjo`SNN`?$UQTXKZCy=A
zXZyK}mkyseb@S%U+jnl?xqF8*<Gn!6d)12fY8CI*t3K$|zBg+8=-mC$Yr<#$NuQ!;
zeTkj<E^gMlr1@V<R(`Eo_pNc`m*(DC?fo;mcYL3;_s8@ZATV?0%*DrlE<f^a#nJbx
zj=o;EZr%Fz>o;uJuyNzYy;r~QyY}PMjn}7dy*+d0?74I2&!4|=>C&YuSFT*UcI`S4
z+_-+@#too*ZruW+TX*l?xeo*{e>`~g^Wn2MPhP%%_U!rd7cXACeEH(#D-d}7`t_SP
zuit%m0|am1zI_J<@87@s^y57cd;o)wA3uEg^$`d@fx%}m_yPuBzkd1l{VNcBgMjbf
zzC*x|?>~Ng|M}|&5c~v#UtsVX4E{jCUl8~Q0{{R2mk};$2Zp{_NswPK11A@^jEa@D
zjjd-<NljhH)X!gj{{3fqEjAXYf-%Y4-KEZcha)gv8GAil978H@^-ezTb=X0my*zDF
zgkYEW#zjr$2gL=r7P-H->s<dxdCR`G2M3$KEDNx$6mZPZ4>RHYdAWDL@3gyW8df<c
z%J%Djp3SoApVlE!gTE)dVi}Tz=bq<K)81V3@+!CXivILP(`}QS3}Z~T>=G@ot9|?C
zf!eAtkyG3^J}sH^#z<JKG5TovgDta59+wI|IQ1Znec{%>FBzrJMJT-GaLgAon{&{!
zkae%af}~HaQyGM|T3wmL>b4-qCE3G;CFU!KOkN%PLxDRs=ca8*e{i9oKic_JY}lQW
zKA!Df)=F>Ni*k2{?>W%2S?Zq=bCA{}t1YclZ|l5@cxO=Q$oKSBiKWZyWeY4$oIP6<
zo8r07@&i-bmA0#YGFN%8Rg#<fPItkRyfsOe%oRU7&f8h|FjKnWUw0S(=ah#m2RU!=
z?c4frdL_?0rF-|T{ykPUS0MXC;Xl@Q%2oZ{?Q35xZ)<q&KL3HA!}+tDp0_ReX|VZ@
z+k(Dy^>?Nf6BN@TJ7!#+DLctaa(QRopUT4lre4dJ{;IEK_BSt$TVF7(6O@ZQUHx3v
IIVCg!0H;O`R{#J2

literal 0
HcmV?d00001

diff --git a/apps/files_odfviewer/src/webodf/programs/touchui/zoom-fit-width.png b/apps/files_odfviewer/src/webodf/programs/touchui/zoom-fit-width.png
new file mode 100644
index 0000000000000000000000000000000000000000..5bd06de6979a73e181830b111c019f62371d1dbe
GIT binary patch
literal 934
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|I14-?i-C%-
zgD|6$#_S59AbW|YuPgfvRvs=+p46POc|bkQ0X`wFKq>qnG%PeEBsecWFDEyrwyvh5
zv;Ew~ONURKx_R^F?K`*c+`S{5_g<ptgG$8*t?Kut%^#e)Ke_dM^q%m^f6}LrX`drz
zevX;-F?RN+xH(^v=6y+D^d)=Am$H@_<*hRs)_-bR|E_t%`__%`+ctfeHXQ_J%$PBA
z=FBx~*REZ+ZvFc88#Zj%bLsQGt6$HYIeYfj>vQMMpFe-$(xppRu3Wix?b>x9xN-f)
zjT=D6+`0usx9&WCedpPiyLa#0d;0c15WM*I=-HcR&z?Vf_2K!87cXAEeDU(t%U7>n
zzWwwH2wuN_{pQW<cOTvW!P~cQ-+{sV_wPP^e-8v7z~Cbod;){dVDJSDzJC4k?fX|C
z_yz&rzkP>*AK!oc`2O?P4<Psn2EV}IHyHeZfWIK{4+Q@I|9_?LlNc}##7ctvf*Clu
zxMftVtZi&Pi%M$hI;MX9^7HRM(`&J@KoyKh-tI09se9*T0NGWZE{-7;w|Xc0dNDf+
zw7%Z^j`M}vq7=mnmV@#aS|5nAoPXqM(^MsVu$B8_?~2tD6FAoW@l5hbTXyW7p|Ndm
zm)MzCzhCWbN_(=t@wd)LWo?t<0GB9s{Q@=D8&9mtErg$ZowtDTVVl4K_vycU7!JPN
z!&ore@y)Eo=ie?<komfkOX#Osp`$}v_*`C2PJdg|^d+i}HFL6-&HBz(y)_|BOm2tY
zkKE>+vRx(bt)hFmF2_|VbE-@aQV~0Jv{sOlDP!7$*4!>d)`)38Je(((G;BPif61r8
z@ucSswlskQlYW<msq9NU#+;@jV9L)~$jZd;^+oKE{=d__>lUc&SNXx`9k%BXM-!u0
z)btg{nl4<Me)(aJmETk|jx|hP_iC>=EuA_?d}_ms4{P?n_P*DDDbwP58`IfOljN5_
z-XrF7_1#4eTYFFUdEEO$Q<O{pSjj$9wC>5TIRE#bLjII&mDG~IPwPB7+TDZ0FN;K_
q)T(e58%t(?`K;zSXTfBrfA;hLXB0=6^<KCE$~c~`elF{r5}E)XDEyZI

literal 0
HcmV?d00001

diff --git a/apps/files_odfviewer/src/webodf/simplerevisionserver/webdavserver.py b/apps/files_odfviewer/src/webodf/simplerevisionserver/webdavserver.py
new file mode 100755
index 0000000000..d9125699c8
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/simplerevisionserver/webdavserver.py
@@ -0,0 +1,77 @@
+#! /usr/bin/env python
+
+import BaseHTTPServer, SimpleHTTPServer, re, os, sys, xml.etree.ElementTree
+from xml.etree.ElementTree import Element
+from xml.etree.ElementTree import ElementTree
+from xml.etree.ElementTree import QName
+from xml.etree.ElementTree import SubElement
+
+class WebDAVRequestHandler(SimpleHTTPServer.SimpleHTTPRequestHandler):
+	def do_GET(self):
+		# handle headers like Range: bytes=0-1023
+		if 'Range' in self.headers:
+			m = re.match('\s*bytes\s*=\s*(\d+)\s*-\s*(\d+)\s*',
+					self.headers['Range'])
+			if m:
+				start = int(m.group(1))
+				end = int(m.group(2))
+				f = self.send_range_head(start, end)
+				if f:
+					self.copyfilerange(f, self.wfile, start,
+							end)
+					f.close()
+				return
+		return SimpleHTTPServer.SimpleHTTPRequestHandler.do_GET(self)
+
+	def do_PROPFIND(self):
+		print 'PROPFIND ' + self.path
+		for key in self.headers.keys():
+			print key + '\t' + self.headers[key]
+		req = self.parseinputxml()
+		req = ElementTree(req)
+		res = ElementTree(Element(QName("DAV:", 'multistatus')))
+		self.addresponse('/', res.getroot(), 0)
+
+		self.writeresponse(res)
+
+	def do_OPTIONS(self):
+		req = self.parseinputxml()
+		print req
+        	self.send_response(200)
+		self.send_header("DAV", "1");
+		self.end_headers()
+		self.wfile.close()
+
+	def parseinputxml(self):
+		try:
+			contentlength = int(self.headers['content-length'])
+		except:
+			return None
+		data = self.rfile.read(contentlength)
+		print data
+		return xml.etree.ElementTree.fromstring(data)
+		
+	def writeresponse(self, response):
+		self.send_response(200)
+		self.send_header("Content-Type", 'text/xml; charset="utf-8"')
+        	self.end_headers()
+		response.write(self.wfile, 'utf-8')
+#		response.write(sys.stdout, 'utf-8')
+#		sys.stdout.flush()
+		d = xml.etree.ElementTree.tostring(response.getroot(), 'utf-8')
+		print d
+		self.wfile.close()
+
+	def addresponse(self, path, root, depth):
+		e = SubElement(root, QName("DAV:", 'response'))
+		href = SubElement(e, QName("DAV:", 'href'))
+		href.text = path
+		propstat = SubElement(e, QName("DAV:", 'propstat'))
+		prop = SubElement(propstat, QName("DAV:", 'resourcetype'))
+		if os.path.isdir(path):
+			SubElement(prop, QName("DAV:", 'collection'))
+
+if __name__ == '__main__':
+	server_address = ('', 8080)
+	httpd = BaseHTTPServer.HTTPServer(server_address, WebDAVRequestHandler)
+	httpd.serve_forever()
diff --git a/apps/files_odfviewer/src/webodf/webodf/APPNOTE.txt b/apps/files_odfviewer/src/webodf/webodf/APPNOTE.txt
new file mode 100644
index 0000000000..45ef5bcd07
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/APPNOTE.txt
@@ -0,0 +1,3218 @@
+File:    APPNOTE.TXT - .ZIP File Format Specification
+Version: 6.3.2 
+Revised: September 28, 2007
+Copyright (c) 1989 - 2007 PKWARE Inc., All Rights Reserved.
+
+The use of certain technological aspects disclosed in the current
+APPNOTE is available pursuant to the below section entitled
+"Incorporating PKWARE Proprietary Technology into Your Product".
+
+I. Purpose
+----------
+
+This specification is intended to define a cross-platform,
+interoperable file storage and transfer format.  Since its 
+first publication in 1989, PKWARE has remained committed to 
+ensuring the interoperability of the .ZIP file format through 
+publication and maintenance of this specification.  We trust that 
+all .ZIP compatible vendors and application developers that have 
+adopted and benefited from this format will share and support 
+this commitment to interoperability.
+
+II. Contacting PKWARE
+---------------------
+
+     PKWARE, Inc.
+     648 N. Plankinton Avenue, Suite 220
+     Milwaukee, WI 53203
+     +1-414-289-9788
+     +1-414-289-9789 FAX
+     zipformat@pkware.com
+
+III. Disclaimer
+---------------
+
+Although PKWARE will attempt to supply current and accurate
+information relating to its file formats, algorithms, and the
+subject programs, the possibility of error or omission cannot 
+be eliminated. PKWARE therefore expressly disclaims any warranty 
+that the information contained in the associated materials relating 
+to the subject programs and/or the format of the files created or
+accessed by the subject programs and/or the algorithms used by
+the subject programs, or any other matter, is current, correct or
+accurate as delivered.  Any risk of damage due to any possible
+inaccurate information is assumed by the user of the information.
+Furthermore, the information relating to the subject programs
+and/or the file formats created or accessed by the subject
+programs and/or the algorithms used by the subject programs is
+subject to change without notice.
+
+If the version of this file is marked as a NOTIFICATION OF CHANGE,
+the content defines an Early Feature Specification (EFS) change 
+to the .ZIP file format that may be subject to modification prior 
+to publication of the Final Feature Specification (FFS).  This
+document may also contain information on Planned Feature 
+Specifications (PFS) defining recognized future extensions.
+
+IV. Change Log
+--------------
+
+Version       Change Description                        Date
+-------       ------------------                       ----------
+5.2           -Single Password Symmetric Encryption    06/02/2003
+               storage
+
+6.1.0         -Smartcard compatibility                 01/20/2004
+              -Documentation on certificate storage
+
+6.2.0         -Introduction of Central Directory       04/26/2004
+               Encryption for encrypting metadata
+              -Added OS/X to Version Made By values
+
+6.2.1         -Added Extra Field placeholder for       04/01/2005
+               POSZIP using ID 0x4690
+
+              -Clarified size field on 
+               "zip64 end of central directory record"
+
+6.2.2         -Documented Final Feature Specification  01/06/2006
+               for Strong Encryption
+
+              -Clarifications and typographical 
+               corrections
+
+6.3.0         -Added tape positioning storage          09/29/2006
+               parameters
+
+              -Expanded list of supported hash algorithms
+
+              -Expanded list of supported compression
+               algorithms
+
+              -Expanded list of supported encryption
+               algorithms
+
+              -Added option for Unicode filename 
+               storage
+
+              -Clarifications for consistent use
+               of Data Descriptor records
+
+              -Added additional "Extra Field" 
+               definitions
+
+6.3.1         -Corrected standard hash values for      04/11/2007
+               SHA-256/384/512
+
+6.3.2         -Added compression method 97             09/28/2007
+
+              -Documented InfoZIP "Extra Field"
+               values for UTF-8 file name and
+               file comment storage
+
+V. General Format of a .ZIP file
+--------------------------------
+
+  Files stored in arbitrary order.  Large .ZIP files can span multiple
+  volumes or be split into user-defined segment sizes. All values
+  are stored in little-endian byte order unless otherwise specified. 
+
+  Overall .ZIP file format:
+
+    [local file header 1]
+    [file data 1]
+    [data descriptor 1]
+    . 
+    .
+    .
+    [local file header n]
+    [file data n]
+    [data descriptor n]
+    [archive decryption header] 
+    [archive extra data record] 
+    [central directory]
+    [zip64 end of central directory record]
+    [zip64 end of central directory locator] 
+    [end of central directory record]
+
+
+  A.  Local file header:
+
+        local file header signature     4 bytes  (0x04034b50)
+        version needed to extract       2 bytes
+        general purpose bit flag        2 bytes
+        compression method              2 bytes
+        last mod file time              2 bytes
+        last mod file date              2 bytes
+        crc-32                          4 bytes
+        compressed size                 4 bytes
+        uncompressed size               4 bytes
+        file name length                2 bytes
+        extra field length              2 bytes
+
+        file name (variable size)
+        extra field (variable size)
+
+  B.  File data
+
+      Immediately following the local header for a file
+      is the compressed or stored data for the file. 
+      The series of [local file header][file data][data
+      descriptor] repeats for each file in the .ZIP archive. 
+
+  C.  Data descriptor:
+
+        crc-32                          4 bytes
+        compressed size                 4 bytes
+        uncompressed size               4 bytes
+
+      This descriptor exists only if bit 3 of the general
+      purpose bit flag is set (see below).  It is byte aligned
+      and immediately follows the last byte of compressed data.
+      This descriptor is used only when it was not possible to
+      seek in the output .ZIP file, e.g., when the output .ZIP file
+      was standard output or a non-seekable device.  For ZIP64(tm) format
+      archives, the compressed and uncompressed sizes are 8 bytes each.
+
+      When compressing files, compressed and uncompressed sizes 
+      should be stored in ZIP64 format (as 8 byte values) when a 
+      files size exceeds 0xFFFFFFFF.   However ZIP64 format may be 
+      used regardless of the size of a file.  When extracting, if 
+      the zip64 extended information extra field is present for 
+      the file the compressed and uncompressed sizes will be 8
+      byte values.  
+
+      Although not originally assigned a signature, the value 
+      0x08074b50 has commonly been adopted as a signature value 
+      for the data descriptor record.  Implementers should be 
+      aware that ZIP files may be encountered with or without this 
+      signature marking data descriptors and should account for
+      either case when reading ZIP files to ensure compatibility.
+      When writing ZIP files, it is recommended to include the
+      signature value marking the data descriptor record.  When
+      the signature is used, the fields currently defined for
+      the data descriptor record will immediately follow the
+      signature.
+
+      An extensible data descriptor will be released in a future
+      version of this APPNOTE.  This new record is intended to
+      resolve conflicts with the use of this record going forward,
+      and to provide better support for streamed file processing.
+
+      When the Central Directory Encryption method is used, the data
+      descriptor record is not required, but may be used.  If present,
+      and bit 3 of the general purpose bit field is set to indicate
+      its presence, the values in fields of the data descriptor
+      record should be set to binary zeros.
+
+  D.  Archive decryption header:  
+
+      The Archive Decryption Header is introduced in version 6.2
+      of the ZIP format specification.  This record exists in support
+      of the Central Directory Encryption Feature implemented as part of 
+      the Strong Encryption Specification as described in this document.
+      When the Central Directory Structure is encrypted, this decryption
+      header will precede the encrypted data segment.  The encrypted
+      data segment will consist of the Archive extra data record (if
+      present) and the encrypted Central Directory Structure data.
+      The format of this data record is identical to the Decryption
+      header record preceding compressed file data.  If the central 
+      directory structure is encrypted, the location of the start of
+      this data record is determined using the Start of Central Directory
+      field in the Zip64 End of Central Directory record.  Refer to the 
+      section on the Strong Encryption Specification for information
+      on the fields used in the Archive Decryption Header record.
+
+
+  E.  Archive extra data record: 
+
+        archive extra data signature    4 bytes  (0x08064b50)
+        extra field length              4 bytes
+        extra field data                (variable size)
+
+      The Archive Extra Data Record is introduced in version 6.2
+      of the ZIP format specification.  This record exists in support
+      of the Central Directory Encryption Feature implemented as part of 
+      the Strong Encryption Specification as described in this document.
+      When present, this record immediately precedes the central 
+      directory data structure.  The size of this data record will be
+      included in the Size of the Central Directory field in the
+      End of Central Directory record.  If the central directory structure
+      is compressed, but not encrypted, the location of the start of
+      this data record is determined using the Start of Central Directory
+      field in the Zip64 End of Central Directory record.  
+
+
+  F.  Central directory structure:
+
+      [file header 1]
+      .
+      .
+      . 
+      [file header n]
+      [digital signature] 
+
+      File header:
+
+        central file header signature   4 bytes  (0x02014b50)
+        version made by                 2 bytes
+        version needed to extract       2 bytes
+        general purpose bit flag        2 bytes
+        compression method              2 bytes
+        last mod file time              2 bytes
+        last mod file date              2 bytes
+        crc-32                          4 bytes
+        compressed size                 4 bytes
+        uncompressed size               4 bytes
+        file name length                2 bytes
+        extra field length              2 bytes
+        file comment length             2 bytes
+        disk number start               2 bytes
+        internal file attributes        2 bytes
+        external file attributes        4 bytes
+        relative offset of local header 4 bytes
+
+        file name (variable size)
+        extra field (variable size)
+        file comment (variable size)
+
+      Digital signature:
+
+        header signature                4 bytes  (0x05054b50)
+        size of data                    2 bytes
+        signature data (variable size)
+
+      With the introduction of the Central Directory Encryption 
+      feature in version 6.2 of this specification, the Central 
+      Directory Structure may be stored both compressed and encrypted. 
+      Although not required, it is assumed when encrypting the
+      Central Directory Structure, that it will be compressed
+      for greater storage efficiency.  Information on the
+      Central Directory Encryption feature can be found in the section
+      describing the Strong Encryption Specification. The Digital 
+      Signature record will be neither compressed nor encrypted.
+
+  G.  Zip64 end of central directory record
+
+        zip64 end of central dir 
+        signature                       4 bytes  (0x06064b50)
+        size of zip64 end of central
+        directory record                8 bytes
+        version made by                 2 bytes
+        version needed to extract       2 bytes
+        number of this disk             4 bytes
+        number of the disk with the 
+        start of the central directory  4 bytes
+        total number of entries in the
+        central directory on this disk  8 bytes
+        total number of entries in the
+        central directory               8 bytes
+        size of the central directory   8 bytes
+        offset of start of central
+        directory with respect to
+        the starting disk number        8 bytes
+        zip64 extensible data sector    (variable size)
+
+        The value stored into the "size of zip64 end of central
+        directory record" should be the size of the remaining
+        record and should not include the leading 12 bytes.
+  
+        Size = SizeOfFixedFields + SizeOfVariableData - 12.
+
+        The above record structure defines Version 1 of the 
+        zip64 end of central directory record. Version 1 was 
+        implemented in versions of this specification preceding 
+        6.2 in support of the ZIP64 large file feature. The 
+        introduction of the Central Directory Encryption feature 
+        implemented in version 6.2 as part of the Strong Encryption 
+        Specification defines Version 2 of this record structure. 
+        Refer to the section describing the Strong Encryption 
+        Specification for details on the version 2 format for 
+        this record.
+
+        Special purpose data may reside in the zip64 extensible data
+        sector field following either a V1 or V2 version of this
+        record.  To ensure identification of this special purpose data
+        it must include an identifying header block consisting of the
+        following:
+
+           Header ID  -  2 bytes
+           Data Size  -  4 bytes
+
+        The Header ID field indicates the type of data that is in the 
+        data block that follows.
+
+        Data Size identifies the number of bytes that follow for this
+        data block type.
+
+        Multiple special purpose data blocks may be present, but each
+        must be preceded by a Header ID and Data Size field.  Current
+        mappings of Header ID values supported in this field are as
+        defined in APPENDIX C.
+
+  H.  Zip64 end of central directory locator
+
+        zip64 end of central dir locator 
+        signature                       4 bytes  (0x07064b50)
+        number of the disk with the
+        start of the zip64 end of 
+        central directory               4 bytes
+        relative offset of the zip64
+        end of central directory record 8 bytes
+        total number of disks           4 bytes
+        
+  I.  End of central directory record:
+
+        end of central dir signature    4 bytes  (0x06054b50)
+        number of this disk             2 bytes
+        number of the disk with the
+        start of the central directory  2 bytes
+        total number of entries in the
+        central directory on this disk  2 bytes
+        total number of entries in
+        the central directory           2 bytes
+        size of the central directory   4 bytes
+        offset of start of central
+        directory with respect to
+        the starting disk number        4 bytes
+        .ZIP file comment length        2 bytes
+        .ZIP file comment       (variable size)
+
+  J.  Explanation of fields:
+
+      version made by (2 bytes)
+
+          The upper byte indicates the compatibility of the file
+          attribute information.  If the external file attributes 
+          are compatible with MS-DOS and can be read by PKZIP for 
+          DOS version 2.04g then this value will be zero.  If these 
+          attributes are not compatible, then this value will 
+          identify the host system on which the attributes are 
+          compatible.  Software can use this information to determine
+          the line record format for text files etc.  The current
+          mappings are:
+
+          0 - MS-DOS and OS/2 (FAT / VFAT / FAT32 file systems)
+          1 - Amiga                     2 - OpenVMS
+          3 - UNIX                      4 - VM/CMS
+          5 - Atari ST                  6 - OS/2 H.P.F.S.
+          7 - Macintosh                 8 - Z-System
+          9 - CP/M                     10 - Windows NTFS
+         11 - MVS (OS/390 - Z/OS)      12 - VSE
+         13 - Acorn Risc               14 - VFAT
+         15 - alternate MVS            16 - BeOS
+         17 - Tandem                   18 - OS/400
+         19 - OS/X (Darwin)            20 thru 255 - unused
+
+          The lower byte indicates the ZIP specification version 
+          (the version of this document) supported by the software 
+          used to encode the file.  The value/10 indicates the major 
+          version number, and the value mod 10 is the minor version 
+          number.  
+
+      version needed to extract (2 bytes)
+
+          The minimum supported ZIP specification version needed to 
+          extract the file, mapped as above.  This value is based on 
+          the specific format features a ZIP program must support to 
+          be able to extract the file.  If multiple features are
+          applied to a file, the minimum version should be set to the 
+          feature having the highest value. New features or feature 
+          changes affecting the published format specification will be 
+          implemented using higher version numbers than the last 
+          published value to avoid conflict.
+
+          Current minimum feature versions are as defined below:
+
+          1.0 - Default value
+          1.1 - File is a volume label
+          2.0 - File is a folder (directory)
+          2.0 - File is compressed using Deflate compression
+          2.0 - File is encrypted using traditional PKWARE encryption
+          2.1 - File is compressed using Deflate64(tm)
+          2.5 - File is compressed using PKWARE DCL Implode 
+          2.7 - File is a patch data set 
+          4.5 - File uses ZIP64 format extensions
+          4.6 - File is compressed using BZIP2 compression*
+          5.0 - File is encrypted using DES
+          5.0 - File is encrypted using 3DES
+          5.0 - File is encrypted using original RC2 encryption
+          5.0 - File is encrypted using RC4 encryption
+          5.1 - File is encrypted using AES encryption
+          5.1 - File is encrypted using corrected RC2 encryption**
+          5.2 - File is encrypted using corrected RC2-64 encryption**
+          6.1 - File is encrypted using non-OAEP key wrapping***
+          6.2 - Central directory encryption
+          6.3 - File is compressed using LZMA
+          6.3 - File is compressed using PPMd+
+          6.3 - File is encrypted using Blowfish
+          6.3 - File is encrypted using Twofish
+
+
+          * Early 7.x (pre-7.2) versions of PKZIP incorrectly set the
+          version needed to extract for BZIP2 compression to be 50
+          when it should have been 46.
+
+          ** Refer to the section on Strong Encryption Specification
+          for additional information regarding RC2 corrections.
+
+          *** Certificate encryption using non-OAEP key wrapping is the
+          intended mode of operation for all versions beginning with 6.1.
+          Support for OAEP key wrapping should only be used for
+          backward compatibility when sending ZIP files to be opened by
+          versions of PKZIP older than 6.1 (5.0 or 6.0).
+
+          + Files compressed using PPMd should set the version
+          needed to extract field to 6.3, however, not all ZIP 
+          programs enforce this and may be unable to decompress 
+          data files compressed using PPMd if this value is set.
+
+          When using ZIP64 extensions, the corresponding value in the
+          zip64 end of central directory record should also be set.  
+          This field should be set appropriately to indicate whether 
+          Version 1 or Version 2 format is in use. 
+
+      general purpose bit flag: (2 bytes)
+
+          Bit 0: If set, indicates that the file is encrypted.
+
+          (For Method 6 - Imploding)
+          Bit 1: If the compression method used was type 6,
+                 Imploding, then this bit, if set, indicates
+                 an 8K sliding dictionary was used.  If clear,
+                 then a 4K sliding dictionary was used.
+          Bit 2: If the compression method used was type 6,
+                 Imploding, then this bit, if set, indicates
+                 3 Shannon-Fano trees were used to encode the
+                 sliding dictionary output.  If clear, then 2
+                 Shannon-Fano trees were used.
+
+          (For Methods 8 and 9 - Deflating)
+          Bit 2  Bit 1
+            0      0    Normal (-en) compression option was used.
+            0      1    Maximum (-exx/-ex) compression option was used.
+            1      0    Fast (-ef) compression option was used.
+            1      1    Super Fast (-es) compression option was used.
+
+          (For Method 14 - LZMA)
+          Bit 1: If the compression method used was type 14,
+                 LZMA, then this bit, if set, indicates
+                 an end-of-stream (EOS) marker is used to
+                 mark the end of the compressed data stream.
+                 If clear, then an EOS marker is not present
+                 and the compressed data size must be known
+                 to extract.
+
+          Note:  Bits 1 and 2 are undefined if the compression
+                 method is any other.
+
+          Bit 3: If this bit is set, the fields crc-32, compressed 
+                 size and uncompressed size are set to zero in the 
+                 local header.  The correct values are put in the 
+                 data descriptor immediately following the compressed
+                 data.  (Note: PKZIP version 2.04g for DOS only 
+                 recognizes this bit for method 8 compression, newer 
+                 versions of PKZIP recognize this bit for any 
+                 compression method.)
+
+          Bit 4: Reserved for use with method 8, for enhanced
+                 deflating. 
+
+          Bit 5: If this bit is set, this indicates that the file is 
+                 compressed patched data.  (Note: Requires PKZIP 
+                 version 2.70 or greater)
+
+          Bit 6: Strong encryption.  If this bit is set, you should
+                 set the version needed to extract value to at least
+                 50 and you must also set bit 0.  If AES encryption
+                 is used, the version needed to extract value must 
+                 be at least 51.
+
+          Bit 7: Currently unused.
+
+          Bit 8: Currently unused.
+
+          Bit 9: Currently unused.
+
+          Bit 10: Currently unused.
+
+          Bit 11: Language encoding flag (EFS).  If this bit is set,
+                  the filename and comment fields for this file
+                  must be encoded using UTF-8. (see APPENDIX D)
+
+          Bit 12: Reserved by PKWARE for enhanced compression.
+
+          Bit 13: Used when encrypting the Central Directory to indicate 
+                  selected data values in the Local Header are masked to
+                  hide their actual values.  See the section describing 
+                  the Strong Encryption Specification for details.
+
+          Bit 14: Reserved by PKWARE.
+
+          Bit 15: Reserved by PKWARE.
+
+      compression method: (2 bytes)
+
+          (see accompanying documentation for algorithm
+          descriptions)
+
+          0 - The file is stored (no compression)
+          1 - The file is Shrunk
+          2 - The file is Reduced with compression factor 1
+          3 - The file is Reduced with compression factor 2
+          4 - The file is Reduced with compression factor 3
+          5 - The file is Reduced with compression factor 4
+          6 - The file is Imploded
+          7 - Reserved for Tokenizing compression algorithm
+          8 - The file is Deflated
+          9 - Enhanced Deflating using Deflate64(tm)
+         10 - PKWARE Data Compression Library Imploding (old IBM TERSE)
+         11 - Reserved by PKWARE
+         12 - File is compressed using BZIP2 algorithm
+         13 - Reserved by PKWARE
+         14 - LZMA (EFS)
+         15 - Reserved by PKWARE
+         16 - Reserved by PKWARE
+         17 - Reserved by PKWARE
+         18 - File is compressed using IBM TERSE (new)
+         19 - IBM LZ77 z Architecture (PFS)
+         97 - WavPack compressed data
+         98 - PPMd version I, Rev 1
+
+      date and time fields: (2 bytes each)
+
+          The date and time are encoded in standard MS-DOS format.
+          If input came from standard input, the date and time are
+          those at which compression was started for this data. 
+          If encrypting the central directory and general purpose bit 
+          flag 13 is set indicating masking, the value stored in the 
+          Local Header will be zero. 
+
+      CRC-32: (4 bytes)
+
+          The CRC-32 algorithm was generously contributed by
+          David Schwaderer and can be found in his excellent
+          book "C Programmers Guide to NetBIOS" published by
+          Howard W. Sams & Co. Inc.  The 'magic number' for
+          the CRC is 0xdebb20e3.  The proper CRC pre and post
+          conditioning is used, meaning that the CRC register
+          is pre-conditioned with all ones (a starting value
+          of 0xffffffff) and the value is post-conditioned by
+          taking the one's complement of the CRC residual.
+          If bit 3 of the general purpose flag is set, this
+          field is set to zero in the local header and the correct
+          value is put in the data descriptor and in the central
+          directory. When encrypting the central directory, if the
+          local header is not in ZIP64 format and general purpose 
+          bit flag 13 is set indicating masking, the value stored 
+          in the Local Header will be zero. 
+
+      compressed size: (4 bytes)
+      uncompressed size: (4 bytes)
+
+          The size of the file compressed and uncompressed,
+          respectively.  When a decryption header is present it will
+          be placed in front of the file data and the value of the
+          compressed file size will include the bytes of the decryption
+          header.  If bit 3 of the general purpose bit flag is set, 
+          these fields are set to zero in the local header and the 
+          correct values are put in the data descriptor and
+          in the central directory.  If an archive is in ZIP64 format
+          and the value in this field is 0xFFFFFFFF, the size will be
+          in the corresponding 8 byte ZIP64 extended information 
+          extra field.  When encrypting the central directory, if the
+          local header is not in ZIP64 format and general purpose bit 
+          flag 13 is set indicating masking, the value stored for the 
+          uncompressed size in the Local Header will be zero. 
+
+      file name length: (2 bytes)
+      extra field length: (2 bytes)
+      file comment length: (2 bytes)
+
+          The length of the file name, extra field, and comment
+          fields respectively.  The combined length of any
+          directory record and these three fields should not
+          generally exceed 65,535 bytes.  If input came from standard
+          input, the file name length is set to zero.  
+
+      disk number start: (2 bytes)
+
+          The number of the disk on which this file begins.  If an 
+          archive is in ZIP64 format and the value in this field is 
+          0xFFFF, the size will be in the corresponding 4 byte zip64 
+          extended information extra field.
+
+      internal file attributes: (2 bytes)
+
+          Bits 1 and 2 are reserved for use by PKWARE.
+
+          The lowest bit of this field indicates, if set, that
+          the file is apparently an ASCII or text file.  If not
+          set, that the file apparently contains binary data.
+          The remaining bits are unused in version 1.0.
+
+          The 0x0002 bit of this field indicates, if set, that a 
+          4 byte variable record length control field precedes each 
+          logical record indicating the length of the record. The 
+          record length control field is stored in little-endian byte
+          order.  This flag is independent of text control characters, 
+          and if used in conjunction with text data, includes any 
+          control characters in the total length of the record. This 
+          value is provided for mainframe data transfer support.
+
+      external file attributes: (4 bytes)
+
+          The mapping of the external attributes is
+          host-system dependent (see 'version made by').  For
+          MS-DOS, the low order byte is the MS-DOS directory
+          attribute byte.  If input came from standard input, this
+          field is set to zero.
+
+      relative offset of local header: (4 bytes)
+
+          This is the offset from the start of the first disk on
+          which this file appears, to where the local header should
+          be found.  If an archive is in ZIP64 format and the value
+          in this field is 0xFFFFFFFF, the size will be in the 
+          corresponding 8 byte zip64 extended information extra field.
+
+      file name: (Variable)
+
+          The name of the file, with optional relative path.
+          The path stored should not contain a drive or
+          device letter, or a leading slash.  All slashes
+          should be forward slashes '/' as opposed to
+          backwards slashes '\' for compatibility with Amiga
+          and UNIX file systems etc.  If input came from standard
+          input, there is no file name field.  If encrypting
+          the central directory and general purpose bit flag 13 is set 
+          indicating masking, the file name stored in the Local Header 
+          will not be the actual file name.  A masking value consisting 
+          of a unique hexadecimal value will be stored.  This value will 
+          be sequentially incremented for each file in the archive. See
+          the section on the Strong Encryption Specification for details 
+          on retrieving the encrypted file name. 
+
+      extra field: (Variable)
+
+          This is for expansion.  If additional information
+          needs to be stored for special needs or for specific 
+          platforms, it should be stored here.  Earlier versions 
+          of the software can then safely skip this file, and 
+          find the next file or header.  This field will be 0 
+          length in version 1.0.
+
+          In order to allow different programs and different types
+          of information to be stored in the 'extra' field in .ZIP
+          files, the following structure should be used for all
+          programs storing data in this field:
+
+          header1+data1 + header2+data2 . . .
+
+          Each header should consist of:
+
+            Header ID - 2 bytes
+            Data Size - 2 bytes
+
+          Note: all fields stored in Intel low-byte/high-byte order.
+
+          The Header ID field indicates the type of data that is in
+          the following data block.
+
+          Header ID's of 0 thru 31 are reserved for use by PKWARE.
+          The remaining ID's can be used by third party vendors for
+          proprietary usage.
+
+          The current Header ID mappings defined by PKWARE are:
+
+          0x0001        Zip64 extended information extra field
+          0x0007        AV Info
+          0x0008        Reserved for extended language encoding data (PFS)
+                        (see APPENDIX D)
+          0x0009        OS/2
+          0x000a        NTFS 
+          0x000c        OpenVMS
+          0x000d        UNIX
+          0x000e        Reserved for file stream and fork descriptors
+          0x000f        Patch Descriptor
+          0x0014        PKCS#7 Store for X.509 Certificates
+          0x0015        X.509 Certificate ID and Signature for 
+                        individual file
+          0x0016        X.509 Certificate ID for Central Directory
+          0x0017        Strong Encryption Header
+          0x0018        Record Management Controls
+          0x0019        PKCS#7 Encryption Recipient Certificate List
+          0x0065        IBM S/390 (Z390), AS/400 (I400) attributes 
+                        - uncompressed
+          0x0066        Reserved for IBM S/390 (Z390), AS/400 (I400) 
+                        attributes - compressed
+          0x4690        POSZIP 4690 (reserved) 
+
+          Third party mappings commonly used are:
+
+
+          0x07c8        Macintosh
+          0x2605        ZipIt Macintosh
+          0x2705        ZipIt Macintosh 1.3.5+
+          0x2805        ZipIt Macintosh 1.3.5+
+          0x334d        Info-ZIP Macintosh
+          0x4341        Acorn/SparkFS 
+          0x4453        Windows NT security descriptor (binary ACL)
+          0x4704        VM/CMS
+          0x470f        MVS
+          0x4b46        FWKCS MD5 (see below)
+          0x4c41        OS/2 access control list (text ACL)
+          0x4d49        Info-ZIP OpenVMS
+          0x4f4c        Xceed original location extra field
+          0x5356        AOS/VS (ACL)
+          0x5455        extended timestamp
+          0x554e        Xceed unicode extra field
+          0x5855        Info-ZIP UNIX (original, also OS/2, NT, etc)
+          0x6375        Info-ZIP Unicode Comment Extra Field
+          0x6542        BeOS/BeBox
+          0x7075        Info-ZIP Unicode Path Extra Field
+          0x756e        ASi UNIX
+          0x7855        Info-ZIP UNIX (new)
+          0xa220        Microsoft Open Packaging Growth Hint
+          0xfd4a        SMS/QDOS
+
+          Detailed descriptions of Extra Fields defined by third 
+          party mappings will be documented as information on
+          these data structures is made available to PKWARE.  
+          PKWARE does not guarantee the accuracy of any published
+          third party data.
+
+          The Data Size field indicates the size of the following
+          data block. Programs can use this value to skip to the
+          next header block, passing over any data blocks that are
+          not of interest.
+
+          Note: As stated above, the size of the entire .ZIP file
+                header, including the file name, comment, and extra
+                field should not exceed 64K in size.
+
+          In case two different programs should appropriate the same
+          Header ID value, it is strongly recommended that each
+          program place a unique signature of at least two bytes in
+          size (and preferably 4 bytes or bigger) at the start of
+          each data area.  Every program should verify that its
+          unique signature is present, in addition to the Header ID
+          value being correct, before assuming that it is a block of
+          known type.
+
+         -Zip64 Extended Information Extra Field (0x0001):
+
+          The following is the layout of the zip64 extended 
+          information "extra" block. If one of the size or
+          offset fields in the Local or Central directory
+          record is too small to hold the required data,
+          a Zip64 extended information record is created.
+          The order of the fields in the zip64 extended 
+          information record is fixed, but the fields will
+          only appear if the corresponding Local or Central
+          directory record field is set to 0xFFFF or 0xFFFFFFFF.
+
+          Note: all fields stored in Intel low-byte/high-byte order.
+
+          Value      Size       Description
+          -----      ----       -----------
+  (ZIP64) 0x0001     2 bytes    Tag for this "extra" block type
+          Size       2 bytes    Size of this "extra" block
+          Original 
+          Size       8 bytes    Original uncompressed file size
+          Compressed
+          Size       8 bytes    Size of compressed data
+          Relative Header
+          Offset     8 bytes    Offset of local header record
+          Disk Start
+          Number     4 bytes    Number of the disk on which
+                                this file starts 
+
+          This entry in the Local header must include BOTH original
+          and compressed file size fields. If encrypting the 
+          central directory and bit 13 of the general purpose bit
+          flag is set indicating masking, the value stored in the
+          Local Header for the original file size will be zero.
+
+
+         -OS/2 Extra Field (0x0009):
+
+          The following is the layout of the OS/2 attributes "extra" 
+          block.  (Last Revision  09/05/95)
+
+          Note: all fields stored in Intel low-byte/high-byte order.
+
+          Value       Size          Description
+          -----       ----          -----------
+  (OS/2)  0x0009      2 bytes       Tag for this "extra" block type
+          TSize       2 bytes       Size for the following data block
+          BSize       4 bytes       Uncompressed Block Size
+          CType       2 bytes       Compression type
+          EACRC       4 bytes       CRC value for uncompress block
+          (var)       variable      Compressed block
+
+          The OS/2 extended attribute structure (FEA2LIST) is 
+          compressed and then stored in it's entirety within this 
+          structure.  There will only ever be one "block" of data in 
+          VarFields[].
+
+         -NTFS Extra Field (0x000a):
+
+          The following is the layout of the NTFS attributes 
+          "extra" block. (Note: At this time the Mtime, Atime
+          and Ctime values may be used on any WIN32 system.)  
+
+          Note: all fields stored in Intel low-byte/high-byte order.
+
+          Value      Size       Description
+          -----      ----       -----------
+  (NTFS)  0x000a     2 bytes    Tag for this "extra" block type
+          TSize      2 bytes    Size of the total "extra" block
+          Reserved   4 bytes    Reserved for future use
+          Tag1       2 bytes    NTFS attribute tag value #1
+          Size1      2 bytes    Size of attribute #1, in bytes
+          (var.)     Size1      Attribute #1 data
+          .
+          .
+          .
+          TagN       2 bytes    NTFS attribute tag value #N
+          SizeN      2 bytes    Size of attribute #N, in bytes
+          (var.)     SizeN      Attribute #N data
+
+          For NTFS, values for Tag1 through TagN are as follows:
+          (currently only one set of attributes is defined for NTFS)
+
+          Tag        Size       Description
+          -----      ----       -----------
+          0x0001     2 bytes    Tag for attribute #1 
+          Size1      2 bytes    Size of attribute #1, in bytes
+          Mtime      8 bytes    File last modification time
+          Atime      8 bytes    File last access time
+          Ctime      8 bytes    File creation time
+
+         -OpenVMS Extra Field (0x000c):
+
+          The following is the layout of the OpenVMS attributes 
+          "extra" block.
+
+          Note: all fields stored in Intel low-byte/high-byte order.
+
+          Value      Size       Description
+          -----      ----       -----------
+  (VMS)   0x000c     2 bytes    Tag for this "extra" block type
+          TSize      2 bytes    Size of the total "extra" block
+          CRC        4 bytes    32-bit CRC for remainder of the block
+          Tag1       2 bytes    OpenVMS attribute tag value #1
+          Size1      2 bytes    Size of attribute #1, in bytes
+          (var.)     Size1      Attribute #1 data
+          .
+          .
+          .
+          TagN       2 bytes    OpenVMS attribute tag value #N
+          SizeN      2 bytes    Size of attribute #N, in bytes
+          (var.)     SizeN      Attribute #N data
+
+          Rules:
+
+          1. There will be one or more of attributes present, which 
+             will each be preceded by the above TagX & SizeX values.  
+             These values are identical to the ATR$C_XXXX and 
+             ATR$S_XXXX constants which are defined in ATR.H under 
+             OpenVMS C.  Neither of these values will ever be zero.
+
+          2. No word alignment or padding is performed.
+
+          3. A well-behaved PKZIP/OpenVMS program should never produce
+             more than one sub-block with the same TagX value.  Also,
+             there will never be more than one "extra" block of type
+             0x000c in a particular directory record.
+
+         -UNIX Extra Field (0x000d):
+
+          The following is the layout of the UNIX "extra" block.
+          Note: all fields are stored in Intel low-byte/high-byte 
+          order.
+
+          Value       Size          Description
+          -----       ----          -----------
+  (UNIX)  0x000d      2 bytes       Tag for this "extra" block type
+          TSize       2 bytes       Size for the following data block
+          Atime       4 bytes       File last access time
+          Mtime       4 bytes       File last modification time
+          Uid         2 bytes       File user ID
+          Gid         2 bytes       File group ID
+          (var)       variable      Variable length data field
+
+          The variable length data field will contain file type 
+          specific data.  Currently the only values allowed are
+          the original "linked to" file names for hard or symbolic 
+          links, and the major and minor device node numbers for
+          character and block device nodes.  Since device nodes
+          cannot be either symbolic or hard links, only one set of
+          variable length data is stored.  Link files will have the
+          name of the original file stored.  This name is NOT NULL
+          terminated.  Its size can be determined by checking TSize -
+          12.  Device entries will have eight bytes stored as two 4
+          byte entries (in little endian format).  The first entry
+          will be the major device number, and the second the minor
+          device number.
+          
+         -PATCH Descriptor Extra Field (0x000f):
+
+          The following is the layout of the Patch Descriptor "extra"
+          block.
+
+          Note: all fields stored in Intel low-byte/high-byte order.
+
+          Value     Size     Description
+          -----     ----     -----------
+  (Patch) 0x000f    2 bytes  Tag for this "extra" block type
+          TSize     2 bytes  Size of the total "extra" block
+          Version   2 bytes  Version of the descriptor
+          Flags     4 bytes  Actions and reactions (see below) 
+          OldSize   4 bytes  Size of the file about to be patched 
+          OldCRC    4 bytes  32-bit CRC of the file to be patched 
+          NewSize   4 bytes  Size of the resulting file 
+          NewCRC    4 bytes  32-bit CRC of the resulting file 
+
+          Actions and reactions
+
+          Bits          Description
+          ----          ----------------
+          0             Use for auto detection
+          1             Treat as a self-patch
+          2-3           RESERVED
+          4-5           Action (see below)
+          6-7           RESERVED
+          8-9           Reaction (see below) to absent file 
+          10-11         Reaction (see below) to newer file
+          12-13         Reaction (see below) to unknown file
+          14-15         RESERVED
+          16-31         RESERVED
+
+          Actions
+
+          Action       Value
+          ------       ----- 
+          none         0
+          add          1
+          delete       2
+          patch        3
+
+          Reactions
+ 
+          Reaction     Value
+          --------     -----
+          ask          0
+          skip         1
+          ignore       2
+          fail         3
+
+          Patch support is provided by PKPatchMaker(tm) technology and is 
+          covered under U.S. Patents and Patents Pending. The use or 
+          implementation in a product of certain technological aspects set
+          forth in the current APPNOTE, including those with regard to 
+          strong encryption, patching, or extended tape operations requires
+          a license from PKWARE.  Please contact PKWARE with regard to 
+          acquiring a license. 
+
+         -PKCS#7 Store for X.509 Certificates (0x0014):
+
+          This field contains information about each of the certificates 
+          files may be signed with. When the Central Directory Encryption 
+          feature is enabled for a ZIP file, this record will appear in 
+          the Archive Extra Data Record, otherwise it will appear in the 
+          first central directory record and will be ignored in any 
+          other record.
+          
+          Note: all fields stored in Intel low-byte/high-byte order.
+
+          Value     Size     Description
+          -----     ----     -----------
+  (Store) 0x0014    2 bytes  Tag for this "extra" block type
+          TSize     2 bytes  Size of the store data
+          TData     TSize    Data about the store
+
+
+         -X.509 Certificate ID and Signature for individual file (0x0015):
+
+          This field contains the information about which certificate in 
+          the PKCS#7 store was used to sign a particular file. It also 
+          contains the signature data. This field can appear multiple 
+          times, but can only appear once per certificate.
+
+          Note: all fields stored in Intel low-byte/high-byte order.
+
+          Value     Size     Description
+          -----     ----     -----------
+  (CID)   0x0015    2 bytes  Tag for this "extra" block type
+          TSize     2 bytes  Size of data that follows
+          TData     TSize    Signature Data
+
+         -X.509 Certificate ID and Signature for central directory (0x0016):
+
+          This field contains the information about which certificate in 
+          the PKCS#7 store was used to sign the central directory structure.
+          When the Central Directory Encryption feature is enabled for a 
+          ZIP file, this record will appear in the Archive Extra Data Record, 
+          otherwise it will appear in the first central directory record.
+
+          Note: all fields stored in Intel low-byte/high-byte order.
+
+          Value     Size     Description
+          -----     ----     -----------
+  (CDID)  0x0016    2 bytes  Tag for this "extra" block type
+          TSize     2 bytes  Size of data that follows
+          TData     TSize    Data
+
+         -Strong Encryption Header (0x0017):
+
+          Value     Size     Description
+          -----     ----     -----------
+          0x0017    2 bytes  Tag for this "extra" block type
+          TSize     2 bytes  Size of data that follows
+          Format    2 bytes  Format definition for this record
+          AlgID     2 bytes  Encryption algorithm identifier
+          Bitlen    2 bytes  Bit length of encryption key
+          Flags     2 bytes  Processing flags
+          CertData  TSize-8  Certificate decryption extra field data
+                             (refer to the explanation for CertData
+                              in the section describing the 
+                              Certificate Processing Method under 
+                              the Strong Encryption Specification)
+
+
+         -Record Management Controls (0x0018):
+
+          Value     Size     Description
+          -----     ----     -----------
+(Rec-CTL) 0x0018    2 bytes  Tag for this "extra" block type
+          CSize     2 bytes  Size of total extra block data
+          Tag1      2 bytes  Record control attribute 1
+          Size1     2 bytes  Size of attribute 1, in bytes
+          Data1     Size1    Attribute 1 data
+            .
+            .
+            .
+          TagN      2 bytes  Record control attribute N
+          SizeN     2 bytes  Size of attribute N, in bytes
+          DataN     SizeN    Attribute N data
+
+
+         -PKCS#7 Encryption Recipient Certificate List (0x0019): 
+
+          This field contains information about each of the certificates
+          used in encryption processing and it can be used to identify who is
+          allowed to decrypt encrypted files.  This field should only appear 
+          in the archive extra data record. This field is not required and 
+          serves only to aide archive modifications by preserving public 
+          encryption key data. Individual security requirements may dictate 
+          that this data be omitted to deter information exposure.
+
+          Note: all fields stored in Intel low-byte/high-byte order.
+
+          Value     Size     Description
+          -----     ----     -----------
+ (CStore) 0x0019    2 bytes  Tag for this "extra" block type
+          TSize     2 bytes  Size of the store data
+          TData     TSize    Data about the store
+
+          TData:
+
+          Value     Size     Description
+          -----     ----     -----------
+          Version   2 bytes  Format version number - must 0x0001 at this time
+          CStore    (var)    PKCS#7 data blob
+
+
+         -MVS Extra Field (0x0065):
+
+          The following is the layout of the MVS "extra" block.
+          Note: Some fields are stored in Big Endian format.
+          All text is in EBCDIC format unless otherwise specified.
+
+          Value       Size          Description
+          -----       ----          -----------
+  (MVS)   0x0065      2 bytes       Tag for this "extra" block type
+          TSize       2 bytes       Size for the following data block
+          ID          4 bytes       EBCDIC "Z390" 0xE9F3F9F0 or
+                                    "T4MV" for TargetFour
+          (var)       TSize-4       Attribute data (see APPENDIX B)
+
+
+         -OS/400 Extra Field (0x0065):
+
+          The following is the layout of the OS/400 "extra" block.
+          Note: Some fields are stored in Big Endian format.
+          All text is in EBCDIC format unless otherwise specified.
+
+          Value       Size          Description
+          -----       ----          -----------
+  (OS400) 0x0065      2 bytes       Tag for this "extra" block type
+          TSize       2 bytes       Size for the following data block
+          ID          4 bytes       EBCDIC "I400" 0xC9F4F0F0 or
+                                    "T4MV" for TargetFour
+          (var)       TSize-4       Attribute data (see APPENDIX A)
+
+
+          Third-party Mappings:
+          
+         -ZipIt Macintosh Extra Field (long) (0x2605):
+
+          The following is the layout of the ZipIt extra block 
+          for Macintosh. The local-header and central-header versions 
+          are identical. This block must be present if the file is 
+          stored MacBinary-encoded and it should not be used if the file 
+          is not stored MacBinary-encoded.
+
+          Value         Size        Description
+          -----         ----        -----------
+  (Mac2)  0x2605        Short       tag for this extra block type
+          TSize         Short       total data size for this block
+          "ZPIT"        beLong      extra-field signature
+          FnLen         Byte        length of FileName
+          FileName      variable    full Macintosh filename
+          FileType      Byte[4]     four-byte Mac file type string
+          Creator       Byte[4]     four-byte Mac creator string
+
+
+         -ZipIt Macintosh Extra Field (short, for files) (0x2705):
+
+          The following is the layout of a shortened variant of the
+          ZipIt extra block for Macintosh (without "full name" entry).
+          This variant is used by ZipIt 1.3.5 and newer for entries of
+          files (not directories) that do not have a MacBinary encoded
+          file. The local-header and central-header versions are identical.
+
+          Value         Size        Description
+          -----         ----        -----------
+  (Mac2b) 0x2705        Short       tag for this extra block type
+          TSize         Short       total data size for this block (12)
+          "ZPIT"        beLong      extra-field signature
+          FileType      Byte[4]     four-byte Mac file type string
+          Creator       Byte[4]     four-byte Mac creator string
+          fdFlags       beShort     attributes from FInfo.frFlags,
+                                    may be omitted
+          0x0000        beShort     reserved, may be omitted
+
+
+         -ZipIt Macintosh Extra Field (short, for directories) (0x2805):
+
+          The following is the layout of a shortened variant of the
+          ZipIt extra block for Macintosh used only for directory
+          entries. This variant is used by ZipIt 1.3.5 and newer to 
+          save some optional Mac-specific information about directories.
+          The local-header and central-header versions are identical.
+
+          Value         Size        Description
+          -----         ----        -----------
+  (Mac2c) 0x2805        Short       tag for this extra block type
+          TSize         Short       total data size for this block (12)
+          "ZPIT"        beLong      extra-field signature
+          frFlags       beShort     attributes from DInfo.frFlags, may
+                                    be omitted
+          View          beShort     ZipIt view flag, may be omitted
+
+
+          The View field specifies ZipIt-internal settings as follows:
+
+          Bits of the Flags:
+              bit 0           if set, the folder is shown expanded (open)
+                              when the archive contents are viewed in ZipIt.
+              bits 1-15       reserved, zero;
+
+
+         -FWKCS MD5 Extra Field (0x4b46):
+
+          The FWKCS Contents_Signature System, used in
+          automatically identifying files independent of file name,
+          optionally adds and uses an extra field to support the
+          rapid creation of an enhanced contents_signature:
+
+              Header ID = 0x4b46
+              Data Size = 0x0013
+              Preface   = 'M','D','5'
+              followed by 16 bytes containing the uncompressed file's
+              128_bit MD5 hash(1), low byte first.
+
+          When FWKCS revises a .ZIP file central directory to add
+          this extra field for a file, it also replaces the
+          central directory entry for that file's uncompressed
+          file length with a measured value.
+
+          FWKCS provides an option to strip this extra field, if
+          present, from a .ZIP file central directory. In adding
+          this extra field, FWKCS preserves .ZIP file Authenticity
+          Verification; if stripping this extra field, FWKCS
+          preserves all versions of AV through PKZIP version 2.04g.
+
+          FWKCS, and FWKCS Contents_Signature System, are
+          trademarks of Frederick W. Kantor.
+
+          (1) R. Rivest, RFC1321.TXT, MIT Laboratory for Computer
+              Science and RSA Data Security, Inc., April 1992.
+              ll.76-77: "The MD5 algorithm is being placed in the
+              public domain for review and possible adoption as a
+              standard."
+
+
+         -Info-ZIP Unicode Comment Extra Field (0x6375):
+
+          Stores the UTF-8 version of the file comment as stored in the
+          central directory header. (Last Revision 20070912)
+
+          Value         Size        Description
+          -----         ----        -----------
+   (UCom) 0x6375        Short       tag for this extra block type ("uc")
+          TSize         Short       total data size for this block
+          Version       1 byte      version of this extra field, currently 1
+          ComCRC32      4 bytes     Comment Field CRC32 Checksum
+          UnicodeCom    Variable    UTF-8 version of the entry comment
+
+          Currently Version is set to the number 1.  If there is a need
+          to change this field, the version will be incremented.  Changes
+          may not be backward compatible so this extra field should not be
+          used if the version is not recognized.
+
+          The ComCRC32 is the standard zip CRC32 checksum of the File Comment
+          field in the central directory header.  This is used to verify that
+          the comment field has not changed since the Unicode Comment extra field
+          was created.  This can happen if a utility changes the File Comment 
+          field but does not update the UTF-8 Comment extra field.  If the CRC 
+          check fails, this Unicode Comment extra field should be ignored and 
+          the File Comment field in the header should be used instead.
+
+          The UnicodeCom field is the UTF-8 version of the File Comment field
+          in the header.  As UnicodeCom is defined to be UTF-8, no UTF-8 byte
+          order mark (BOM) is used.  The length of this field is determined by
+          subtracting the size of the previous fields from TSize.  If both the
+          File Name and Comment fields are UTF-8, the new General Purpose Bit
+          Flag, bit 11 (Language encoding flag (EFS)), can be used to indicate
+          both the header File Name and Comment fields are UTF-8 and, in this
+          case, the Unicode Path and Unicode Comment extra fields are not
+          needed and should not be created.  Note that, for backward
+          compatibility, bit 11 should only be used if the native character set
+          of the paths and comments being zipped up are already in UTF-8. It is
+          expected that the same file comment storage method, either general
+          purpose bit 11 or extra fields, be used in both the Local and Central
+          Directory Header for a file.
+
+
+         -Info-ZIP Unicode Path Extra Field (0x7075):
+
+          Stores the UTF-8 version of the file name field as stored in the
+          local header and central directory header. (Last Revision 20070912)
+
+          Value         Size        Description
+          -----         ----        -----------
+  (UPath) 0x7075        Short       tag for this extra block type ("up")
+          TSize         Short       total data size for this block
+          Version       1 byte      version of this extra field, currently 1
+          NameCRC32     4 bytes     File Name Field CRC32 Checksum
+          UnicodeName   Variable    UTF-8 version of the entry File Name
+
+          Currently Version is set to the number 1.  If there is a need
+          to change this field, the version will be incremented.  Changes
+          may not be backward compatible so this extra field should not be
+          used if the version is not recognized.
+
+          The NameCRC32 is the standard zip CRC32 checksum of the File Name
+          field in the header.  This is used to verify that the header
+          File Name field has not changed since the Unicode Path extra field
+          was created.  This can happen if a utility renames the File Name but
+          does not update the UTF-8 path extra field.  If the CRC check fails,
+          this UTF-8 Path Extra Field should be ignored and the File Name field
+          in the header should be used instead.
+
+          The UnicodeName is the UTF-8 version of the contents of the File Name
+          field in the header.  As UnicodeName is defined to be UTF-8, no UTF-8
+          byte order mark (BOM) is used.  The length of this field is determined
+          by subtracting the size of the previous fields from TSize.  If both
+          the File Name and Comment fields are UTF-8, the new General Purpose
+          Bit Flag, bit 11 (Language encoding flag (EFS)), can be used to
+          indicate that both the header File Name and Comment fields are UTF-8
+          and, in this case, the Unicode Path and Unicode Comment extra fields
+          are not needed and should not be created.  Note that, for backward
+          compatibility, bit 11 should only be used if the native character set
+          of the paths and comments being zipped up are already in UTF-8. It is
+          expected that the same file name storage method, either general
+          purpose bit 11 or extra fields, be used in both the Local and Central
+          Directory Header for a file.
+ 
+
+        -Microsoft Open Packaging Growth Hint (0xa220):
+
+          Value         Size        Description
+          -----         ----        -----------
+          0xa220        Short       tag for this extra block type
+          TSize         Short       size of Sig + PadVal + Padding
+          Sig           Short       verification signature (A028)
+          PadVal        Short       Initial padding value
+          Padding       variable    filled with NULL characters
+
+
+      file comment: (Variable)
+
+          The comment for this file.
+
+      number of this disk: (2 bytes)
+
+          The number of this disk, which contains central
+          directory end record. If an archive is in ZIP64 format
+          and the value in this field is 0xFFFF, the size will 
+          be in the corresponding 4 byte zip64 end of central 
+          directory field.
+
+
+      number of the disk with the start of the central
+      directory: (2 bytes)
+
+          The number of the disk on which the central
+          directory starts. If an archive is in ZIP64 format
+          and the value in this field is 0xFFFF, the size will 
+          be in the corresponding 4 byte zip64 end of central 
+          directory field.
+
+      total number of entries in the central dir on 
+      this disk: (2 bytes)
+
+          The number of central directory entries on this disk.
+          If an archive is in ZIP64 format and the value in 
+          this field is 0xFFFF, the size will be in the 
+          corresponding 8 byte zip64 end of central 
+          directory field.
+
+      total number of entries in the central dir: (2 bytes)
+
+          The total number of files in the .ZIP file. If an 
+          archive is in ZIP64 format and the value in this field
+          is 0xFFFF, the size will be in the corresponding 8 byte 
+          zip64 end of central directory field.
+
+      size of the central directory: (4 bytes)
+
+          The size (in bytes) of the entire central directory.
+          If an archive is in ZIP64 format and the value in 
+          this field is 0xFFFFFFFF, the size will be in the 
+          corresponding 8 byte zip64 end of central 
+          directory field.
+
+      offset of start of central directory with respect to
+      the starting disk number:  (4 bytes)
+
+          Offset of the start of the central directory on the
+          disk on which the central directory starts. If an 
+          archive is in ZIP64 format and the value in this 
+          field is 0xFFFFFFFF, the size will be in the 
+          corresponding 8 byte zip64 end of central 
+          directory field.
+
+      .ZIP file comment length: (2 bytes)
+
+          The length of the comment for this .ZIP file.
+
+      .ZIP file comment: (Variable)
+
+          The comment for this .ZIP file.  ZIP file comment data
+          is stored unsecured.  No encryption or data authentication
+          is applied to this area at this time.  Confidential information
+          should not be stored in this section.
+
+      zip64 extensible data sector    (variable size)
+
+          (currently reserved for use by PKWARE)
+
+
+  K.  Splitting and Spanning ZIP files
+
+          Spanning is the process of segmenting a ZIP file across 
+          multiple removable media. This support has typically only 
+          been provided for DOS formatted floppy diskettes. 
+
+          File splitting is a newer derivative of spanning.  
+          Splitting follows the same segmentation process as
+          spanning, however, it does not require writing each
+          segment to a unique removable medium and instead supports
+          placing all pieces onto local or non-removable locations
+          such as file systems, local drives, folders, etc...
+
+          A key difference between spanned and split ZIP files is
+          that all pieces of a spanned ZIP file have the same name.  
+          Since each piece is written to a separate volume, no name 
+          collisions occur and each segment can reuse the original 
+          .ZIP file name given to the archive.
+
+          Sequence ordering for DOS spanned archives uses the DOS 
+          volume label to determine segment numbers.  Volume labels
+          for each segment are written using the form PKBACK#xxx, 
+          where xxx is the segment number written as a decimal 
+          value from 001 - nnn.
+
+          Split ZIP files are typically written to the same location
+          and are subject to name collisions if the spanned name
+          format is used since each segment will reside on the same 
+          drive. To avoid name collisions, split archives are named 
+          as follows.
+
+          Segment 1   = filename.z01
+          Segment n-1 = filename.z(n-1)
+          Segment n   = filename.zip
+
+          The .ZIP extension is used on the last segment to support
+          quickly reading the central directory.  The segment number
+          n should be a decimal value.
+
+          Spanned ZIP files may be PKSFX Self-extracting ZIP files.
+          PKSFX files may also be split, however, in this case
+          the first segment must be named filename.exe.  The first
+          segment of a split PKSFX archive must be large enough to
+          include the entire executable program.
+
+          Capacities for split archives are as follows.
+
+          Maximum number of segments = 4,294,967,295 - 1
+          Maximum .ZIP segment size = 4,294,967,295 bytes
+          Minimum segment size = 64K
+          Maximum PKSFX segment size = 2,147,483,647 bytes
+          
+          Segment sizes may be different however by convention, all 
+          segment sizes should be the same with the exception of the 
+          last, which may be smaller.  Local and central directory 
+          header records must never be split across a segment boundary. 
+          When writing a header record, if the number of bytes remaining 
+          within a segment is less than the size of the header record,
+          end the current segment and write the header at the start
+          of the next segment.  The central directory may span segment
+          boundaries, but no single record in the central directory
+          should be split across segments.
+
+          Spanned/Split archives created using PKZIP for Windows
+          (V2.50 or greater), PKZIP Command Line (V2.50 or greater),
+          or PKZIP Explorer will include a special spanning 
+          signature as the first 4 bytes of the first segment of
+          the archive.  This signature (0x08074b50) will be 
+          followed immediately by the local header signature for
+          the first file in the archive.  
+
+          A special spanning marker may also appear in spanned/split 
+          archives if the spanning or splitting process starts but 
+          only requires one segment.  In this case the 0x08074b50 
+          signature will be replaced with the temporary spanning 
+          marker signature of 0x30304b50.  Split archives can
+          only be uncompressed by other versions of PKZIP that
+          know how to create a split archive.
+
+          The signature value 0x08074b50 is also used by some
+          ZIP implementations as a marker for the Data Descriptor 
+          record.  Conflict in this alternate assignment can be
+          avoided by ensuring the position of the signature
+          within the ZIP file to determine the use for which it
+          is intended.  
+
+  L.  General notes:
+
+      1)  All fields unless otherwise noted are unsigned and stored
+          in Intel low-byte:high-byte, low-word:high-word order.
+
+      2)  String fields are not null terminated, since the
+          length is given explicitly.
+
+      3)  The entries in the central directory may not necessarily
+          be in the same order that files appear in the .ZIP file.
+
+      4)  If one of the fields in the end of central directory
+          record is too small to hold required data, the field
+          should be set to -1 (0xFFFF or 0xFFFFFFFF) and the
+          ZIP64 format record should be created.
+
+      5)  The end of central directory record and the
+          Zip64 end of central directory locator record must
+          reside on the same disk when splitting or spanning
+          an archive.
+
+VI. Explanation of compression methods
+--------------------------------------
+
+UnShrinking - Method 1
+----------------------
+
+Shrinking is a Dynamic Ziv-Lempel-Welch compression algorithm
+with partial clearing.  The initial code size is 9 bits, and
+the maximum code size is 13 bits.  Shrinking differs from
+conventional Dynamic Ziv-Lempel-Welch implementations in several
+respects:
+
+1)  The code size is controlled by the compressor, and is not
+    automatically increased when codes larger than the current
+    code size are created (but not necessarily used).  When
+    the decompressor encounters the code sequence 256
+    (decimal) followed by 1, it should increase the code size
+    read from the input stream to the next bit size.  No
+    blocking of the codes is performed, so the next code at
+    the increased size should be read from the input stream
+    immediately after where the previous code at the smaller
+    bit size was read.  Again, the decompressor should not
+    increase the code size used until the sequence 256,1 is
+    encountered.
+
+2)  When the table becomes full, total clearing is not
+    performed.  Rather, when the compressor emits the code
+    sequence 256,2 (decimal), the decompressor should clear
+    all leaf nodes from the Ziv-Lempel tree, and continue to
+    use the current code size.  The nodes that are cleared
+    from the Ziv-Lempel tree are then re-used, with the lowest
+    code value re-used first, and the highest code value
+    re-used last.  The compressor can emit the sequence 256,2
+    at any time.
+
+Expanding - Methods 2-5
+-----------------------
+
+The Reducing algorithm is actually a combination of two
+distinct algorithms.  The first algorithm compresses repeated
+byte sequences, and the second algorithm takes the compressed
+stream from the first algorithm and applies a probabilistic
+compression method.
+
+The probabilistic compression stores an array of 'follower
+sets' S(j), for j=0 to 255, corresponding to each possible
+ASCII character.  Each set contains between 0 and 32
+characters, to be denoted as S(j)[0],...,S(j)[m], where m<32.
+The sets are stored at the beginning of the data area for a
+Reduced file, in reverse order, with S(255) first, and S(0)
+last.
+
+The sets are encoded as { N(j), S(j)[0],...,S(j)[N(j)-1] },
+where N(j) is the size of set S(j).  N(j) can be 0, in which
+case the follower set for S(j) is empty.  Each N(j) value is
+encoded in 6 bits, followed by N(j) eight bit character values
+corresponding to S(j)[0] to S(j)[N(j)-1] respectively.  If
+N(j) is 0, then no values for S(j) are stored, and the value
+for N(j-1) immediately follows.
+
+Immediately after the follower sets, is the compressed data
+stream.  The compressed data stream can be interpreted for the
+probabilistic decompression as follows:
+
+let Last-Character <- 0.
+loop until done
+    if the follower set S(Last-Character) is empty then
+        read 8 bits from the input stream, and copy this
+        value to the output stream.
+    otherwise if the follower set S(Last-Character) is non-empty then
+        read 1 bit from the input stream.
+        if this bit is not zero then
+            read 8 bits from the input stream, and copy this
+            value to the output stream.
+        otherwise if this bit is zero then
+            read B(N(Last-Character)) bits from the input
+            stream, and assign this value to I.
+            Copy the value of S(Last-Character)[I] to the
+            output stream.
+
+    assign the last value placed on the output stream to
+    Last-Character.
+end loop
+
+B(N(j)) is defined as the minimal number of bits required to
+encode the value N(j)-1.
+
+The decompressed stream from above can then be expanded to
+re-create the original file as follows:
+
+let State <- 0.
+
+loop until done
+    read 8 bits from the input stream into C.
+    case State of
+        0:  if C is not equal to DLE (144 decimal) then
+                copy C to the output stream.
+            otherwise if C is equal to DLE then
+                let State <- 1.
+
+        1:  if C is non-zero then
+                let V <- C.
+                let Len <- L(V)
+                let State <- F(Len).
+            otherwise if C is zero then
+                copy the value 144 (decimal) to the output stream.
+                let State <- 0
+
+        2:  let Len <- Len + C
+            let State <- 3.
+
+        3:  move backwards D(V,C) bytes in the output stream
+            (if this position is before the start of the output
+            stream, then assume that all the data before the
+            start of the output stream is filled with zeros).
+            copy Len+3 bytes from this position to the output stream.
+            let State <- 0.
+    end case
+end loop
+
+The functions F,L, and D are dependent on the 'compression
+factor', 1 through 4, and are defined as follows:
+
+For compression factor 1:
+    L(X) equals the lower 7 bits of X.
+    F(X) equals 2 if X equals 127 otherwise F(X) equals 3.
+    D(X,Y) equals the (upper 1 bit of X) * 256 + Y + 1.
+For compression factor 2:
+    L(X) equals the lower 6 bits of X.
+    F(X) equals 2 if X equals 63 otherwise F(X) equals 3.
+    D(X,Y) equals the (upper 2 bits of X) * 256 + Y + 1.
+For compression factor 3:
+    L(X) equals the lower 5 bits of X.
+    F(X) equals 2 if X equals 31 otherwise F(X) equals 3.
+    D(X,Y) equals the (upper 3 bits of X) * 256 + Y + 1.
+For compression factor 4:
+    L(X) equals the lower 4 bits of X.
+    F(X) equals 2 if X equals 15 otherwise F(X) equals 3.
+    D(X,Y) equals the (upper 4 bits of X) * 256 + Y + 1.
+
+Imploding - Method 6
+--------------------
+
+The Imploding algorithm is actually a combination of two distinct
+algorithms.  The first algorithm compresses repeated byte
+sequences using a sliding dictionary.  The second algorithm is
+used to compress the encoding of the sliding dictionary output,
+using multiple Shannon-Fano trees.
+
+The Imploding algorithm can use a 4K or 8K sliding dictionary
+size. The dictionary size used can be determined by bit 1 in the
+general purpose flag word; a 0 bit indicates a 4K dictionary
+while a 1 bit indicates an 8K dictionary.
+
+The Shannon-Fano trees are stored at the start of the compressed
+file. The number of trees stored is defined by bit 2 in the
+general purpose flag word; a 0 bit indicates two trees stored, a
+1 bit indicates three trees are stored.  If 3 trees are stored,
+the first Shannon-Fano tree represents the encoding of the
+Literal characters, the second tree represents the encoding of
+the Length information, the third represents the encoding of the
+Distance information.  When 2 Shannon-Fano trees are stored, the
+Length tree is stored first, followed by the Distance tree.
+
+The Literal Shannon-Fano tree, if present is used to represent
+the entire ASCII character set, and contains 256 values.  This
+tree is used to compress any data not compressed by the sliding
+dictionary algorithm.  When this tree is present, the Minimum
+Match Length for the sliding dictionary is 3.  If this tree is
+not present, the Minimum Match Length is 2.
+
+The Length Shannon-Fano tree is used to compress the Length part
+of the (length,distance) pairs from the sliding dictionary
+output.  The Length tree contains 64 values, ranging from the
+Minimum Match Length, to 63 plus the Minimum Match Length.
+
+The Distance Shannon-Fano tree is used to compress the Distance
+part of the (length,distance) pairs from the sliding dictionary
+output. The Distance tree contains 64 values, ranging from 0 to
+63, representing the upper 6 bits of the distance value.  The
+distance values themselves will be between 0 and the sliding
+dictionary size, either 4K or 8K.
+
+The Shannon-Fano trees themselves are stored in a compressed
+format. The first byte of the tree data represents the number of
+bytes of data representing the (compressed) Shannon-Fano tree
+minus 1.  The remaining bytes represent the Shannon-Fano tree
+data encoded as:
+
+    High 4 bits: Number of values at this bit length + 1. (1 - 16)
+    Low  4 bits: Bit Length needed to represent value + 1. (1 - 16)
+
+The Shannon-Fano codes can be constructed from the bit lengths
+using the following algorithm:
+
+1)  Sort the Bit Lengths in ascending order, while retaining the
+    order of the original lengths stored in the file.
+
+2)  Generate the Shannon-Fano trees:
+
+    Code <- 0
+    CodeIncrement <- 0
+    LastBitLength <- 0
+    i <- number of Shannon-Fano codes - 1   (either 255 or 63)
+
+    loop while i >= 0
+        Code = Code + CodeIncrement
+        if BitLength(i) <> LastBitLength then
+            LastBitLength=BitLength(i)
+            CodeIncrement = 1 shifted left (16 - LastBitLength)
+        ShannonCode(i) = Code
+        i <- i - 1
+    end loop
+
+3)  Reverse the order of all the bits in the above ShannonCode()
+    vector, so that the most significant bit becomes the least
+    significant bit.  For example, the value 0x1234 (hex) would
+    become 0x2C48 (hex).
+
+4)  Restore the order of Shannon-Fano codes as originally stored
+    within the file.
+
+Example:
+
+    This example will show the encoding of a Shannon-Fano tree
+    of size 8.  Notice that the actual Shannon-Fano trees used
+    for Imploding are either 64 or 256 entries in size.
+
+Example:   0x02, 0x42, 0x01, 0x13
+
+    The first byte indicates 3 values in this table.  Decoding the
+    bytes:
+            0x42 = 5 codes of 3 bits long
+            0x01 = 1 code  of 2 bits long
+            0x13 = 2 codes of 4 bits long
+
+    This would generate the original bit length array of:
+    (3, 3, 3, 3, 3, 2, 4, 4)
+
+    There are 8 codes in this table for the values 0 thru 7.  Using 
+    the algorithm to obtain the Shannon-Fano codes produces:
+
+                                  Reversed     Order     Original
+Val  Sorted   Constructed Code      Value     Restored    Length
+---  ------   -----------------   --------    --------    ------
+0:     2      1100000000000000        11       101          3
+1:     3      1010000000000000       101       001          3
+2:     3      1000000000000000       001       110          3
+3:     3      0110000000000000       110       010          3
+4:     3      0100000000000000       010       100          3
+5:     3      0010000000000000       100        11          2
+6:     4      0001000000000000      1000      1000          4
+7:     4      0000000000000000      0000      0000          4
+
+The values in the Val, Order Restored and Original Length columns
+now represent the Shannon-Fano encoding tree that can be used for
+decoding the Shannon-Fano encoded data.  How to parse the
+variable length Shannon-Fano values from the data stream is beyond
+the scope of this document.  (See the references listed at the end of
+this document for more information.)  However, traditional decoding
+schemes used for Huffman variable length decoding, such as the
+Greenlaw algorithm, can be successfully applied.
+
+The compressed data stream begins immediately after the
+compressed Shannon-Fano data.  The compressed data stream can be
+interpreted as follows:
+
+loop until done
+    read 1 bit from input stream.
+
+    if this bit is non-zero then       (encoded data is literal data)
+        if Literal Shannon-Fano tree is present
+            read and decode character using Literal Shannon-Fano tree.
+        otherwise
+            read 8 bits from input stream.
+        copy character to the output stream.
+    otherwise              (encoded data is sliding dictionary match)
+        if 8K dictionary size
+            read 7 bits for offset Distance (lower 7 bits of offset).
+        otherwise
+            read 6 bits for offset Distance (lower 6 bits of offset).
+
+        using the Distance Shannon-Fano tree, read and decode the
+          upper 6 bits of the Distance value.
+
+        using the Length Shannon-Fano tree, read and decode
+          the Length value.
+
+        Length <- Length + Minimum Match Length
+
+        if Length = 63 + Minimum Match Length
+            read 8 bits from the input stream,
+            add this value to Length.
+
+        move backwards Distance+1 bytes in the output stream, and
+        copy Length characters from this position to the output
+        stream.  (if this position is before the start of the output
+        stream, then assume that all the data before the start of
+        the output stream is filled with zeros).
+end loop
+
+Tokenizing - Method 7
+---------------------
+
+This method is not used by PKZIP.
+
+Deflating - Method 8
+--------------------
+
+The Deflate algorithm is similar to the Implode algorithm using
+a sliding dictionary of up to 32K with secondary compression
+from Huffman/Shannon-Fano codes.
+
+The compressed data is stored in blocks with a header describing
+the block and the Huffman codes used in the data block.  The header
+format is as follows:
+
+   Bit 0: Last Block bit     This bit is set to 1 if this is the last
+                             compressed block in the data.
+   Bits 1-2: Block type
+      00 (0) - Block is stored - All stored data is byte aligned.
+               Skip bits until next byte, then next word = block 
+               length, followed by the ones compliment of the block
+               length word. Remaining data in block is the stored 
+               data.
+
+      01 (1) - Use fixed Huffman codes for literal and distance codes.
+               Lit Code    Bits             Dist Code   Bits
+               ---------   ----             ---------   ----
+                 0 - 143    8                 0 - 31      5
+               144 - 255    9
+               256 - 279    7
+               280 - 287    8
+
+               Literal codes 286-287 and distance codes 30-31 are 
+               never used but participate in the huffman construction.
+
+      10 (2) - Dynamic Huffman codes.  (See expanding Huffman codes)
+
+      11 (3) - Reserved - Flag a "Error in compressed data" if seen.
+
+Expanding Huffman Codes
+-----------------------
+If the data block is stored with dynamic Huffman codes, the Huffman
+codes are sent in the following compressed format:
+
+   5 Bits: # of Literal codes sent - 256 (256 - 286)
+           All other codes are never sent.
+   5 Bits: # of Dist codes - 1           (1 - 32)
+   4 Bits: # of Bit Length codes - 3     (3 - 19)
+
+The Huffman codes are sent as bit lengths and the codes are built as
+described in the implode algorithm.  The bit lengths themselves are
+compressed with Huffman codes.  There are 19 bit length codes:
+
+   0 - 15: Represent bit lengths of 0 - 15
+       16: Copy the previous bit length 3 - 6 times.
+           The next 2 bits indicate repeat length (0 = 3, ... ,3 = 6)
+              Example:  Codes 8, 16 (+2 bits 11), 16 (+2 bits 10) will
+                        expand to 12 bit lengths of 8 (1 + 6 + 5)
+       17: Repeat a bit length of 0 for 3 - 10 times. (3 bits of length)
+       18: Repeat a bit length of 0 for 11 - 138 times (7 bits of length)
+
+The lengths of the bit length codes are sent packed 3 bits per value
+(0 - 7) in the following order:
+
+   16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15
+
+The Huffman codes should be built as described in the Implode algorithm
+except codes are assigned starting at the shortest bit length, i.e. the
+shortest code should be all 0's rather than all 1's.  Also, codes with
+a bit length of zero do not participate in the tree construction.  The
+codes are then used to decode the bit lengths for the literal and 
+distance tables.
+
+The bit lengths for the literal tables are sent first with the number
+of entries sent described by the 5 bits sent earlier.  There are up
+to 286 literal characters; the first 256 represent the respective 8
+bit character, code 256 represents the End-Of-Block code, the remaining
+29 codes represent copy lengths of 3 thru 258.  There are up to 30
+distance codes representing distances from 1 thru 32k as described
+below.
+
+                             Length Codes
+                             ------------
+      Extra             Extra              Extra              Extra
+ Code Bits Length  Code Bits Lengths  Code Bits Lengths  Code Bits Length(s)
+ ---- ---- ------  ---- ---- -------  ---- ---- -------  ---- ---- ---------
+  257   0     3     265   1   11,12    273   3   35-42    281   5  131-162
+  258   0     4     266   1   13,14    274   3   43-50    282   5  163-194
+  259   0     5     267   1   15,16    275   3   51-58    283   5  195-226
+  260   0     6     268   1   17,18    276   3   59-66    284   5  227-257
+  261   0     7     269   2   19-22    277   4   67-82    285   0    258
+  262   0     8     270   2   23-26    278   4   83-98
+  263   0     9     271   2   27-30    279   4   99-114
+  264   0    10     272   2   31-34    280   4  115-130
+
+                            Distance Codes
+                            --------------
+      Extra           Extra             Extra               Extra
+ Code Bits Dist  Code Bits  Dist   Code Bits Distance  Code Bits Distance
+ ---- ---- ----  ---- ---- ------  ---- ---- --------  ---- ---- --------
+   0   0    1      8   3   17-24    16    7  257-384    24   11  4097-6144
+   1   0    2      9   3   25-32    17    7  385-512    25   11  6145-8192
+   2   0    3     10   4   33-48    18    8  513-768    26   12  8193-12288
+   3   0    4     11   4   49-64    19    8  769-1024   27   12 12289-16384
+   4   1   5,6    12   5   65-96    20    9 1025-1536   28   13 16385-24576
+   5   1   7,8    13   5   97-128   21    9 1537-2048   29   13 24577-32768
+   6   2   9-12   14   6  129-192   22   10 2049-3072
+   7   2  13-16   15   6  193-256   23   10 3073-4096
+
+The compressed data stream begins immediately after the
+compressed header data.  The compressed data stream can be
+interpreted as follows:
+
+do
+   read header from input stream.
+
+   if stored block
+      skip bits until byte aligned
+      read count and 1's compliment of count
+      copy count bytes data block
+   otherwise
+      loop until end of block code sent
+         decode literal character from input stream
+         if literal < 256
+            copy character to the output stream
+         otherwise
+            if literal = end of block
+               break from loop
+            otherwise
+               decode distance from input stream
+
+               move backwards distance bytes in the output stream, and
+               copy length characters from this position to the output
+               stream.
+      end loop
+while not last block
+
+if data descriptor exists
+   skip bits until byte aligned
+   read crc and sizes
+endif
+
+Enhanced Deflating - Method 9
+-----------------------------
+
+The Enhanced Deflating algorithm is similar to Deflate but
+uses a sliding dictionary of up to 64K. Deflate64(tm) is supported
+by the Deflate extractor. 
+
+BZIP2 - Method 12
+-----------------
+
+BZIP2 is an open-source data compression algorithm developed by 
+Julian Seward.  Information and source code for this algorithm
+can be found on the internet.
+
+LZMA - Method 14 (EFS)
+----------------------
+
+LZMA is a block-oriented, general purpose data compression algorithm  
+developed and maintained by Igor Pavlov.  It is a derivative of LZ77
+that utilizes Markov chains and a range coder.  Information and 
+source code for this algorithm can be found on the internet.  Consult 
+with the author of this algorithm for information on terms or 
+restrictions on use.
+
+Support for LZMA within the ZIP format is defined as follows:   
+
+The Compression method field within the ZIP Local and Central 
+Header records will be set to the value 14 to indicate data was
+compressed using LZMA. 
+
+The Version needed to extract field within the ZIP Local and 
+Central Header records will be set to 6.3 to indicate the 
+minimum ZIP format version supporting this feature.
+
+File data compressed using the LZMA algorithm must be placed 
+immediately following the Local Header for the file.  If a 
+standard ZIP encryption header is required, it will follow 
+the Local Header and will precede the LZMA compressed file 
+data segment.  The location of LZMA compressed data segment 
+within the ZIP format will be as shown:
+
+    [local header file 1]
+    [encryption header file 1]
+    [LZMA compressed data segment for file 1]
+    [data descriptor 1]
+    [local header file 2]
+
+The encryption header and data descriptor records may
+be conditionally present.  The LZMA Compressed Data Segment 
+will consist of an LZMA Properties Header followed by the 
+LZMA Compressed Data as shown:
+
+    [LZMA properties header for file 1]
+    [LZMA compressed data for file 1]
+
+The LZMA Compressed Data will be stored as provided by the 
+LZMA compression library.  Compressed size, uncompressed 
+size and other file characteristics about the file being 
+compressed must be stored in standard ZIP storage format.
+
+The LZMA Properties Header will store specific data required to 
+decompress the LZMA compressed Data.  This data is set by the 
+LZMA compression engine using the function WriteCoderProperties() 
+as documented within the LZMA SDK. 
+ 
+Storage fields for the property information within the LZMA 
+Properties Header are as follows:
+
+     LZMA Version Information 2 bytes
+     LZMA Properties Size 2 bytes
+     LZMA Properties Data variable, defined by "LZMA Properties Size"
+
+LZMA Version Information - this field identifies which version of 
+     the LZMA SDK was used to compress a file.  The first byte will 
+     store the major version number of the LZMA SDK and the second 
+     byte will store the minor number.  
+
+LZMA Properties Size - this field defines the size of the remaining 
+     property data.  Typically this size should be determined by the 
+     version of the SDK.  This size field is included as a convenience
+     and to help avoid any ambiguity should it arise in the future due
+     to changes in this compression algorithm. 
+
+LZMA Property Data - this variable sized field records the required 
+     values for the decompressor as defined by the LZMA SDK.  The 
+     data stored in this field should be obtained using the 
+     WriteCoderProperties() in the version of the SDK defined by 
+     the "LZMA Version Information" field.  
+
+The layout of the "LZMA Properties Data" field is a function of the
+LZMA compression algorithm.  It is possible that this layout may be
+changed by the author over time.  The data layout in version 4.32 
+of the LZMA SDK defines a 5 byte array that uses 4 bytes to store 
+the dictionary size in little-endian order. This is preceded by a 
+single packed byte as the first element of the array that contains
+the following fields:
+
+     PosStateBits
+     LiteralPosStateBits
+     LiteralContextBits
+
+Refer to the LZMA documentation for a more detailed explanation of 
+these fields.  
+
+Data compressed with method 14, LZMA, may include an end-of-stream
+(EOS) marker ending the compressed data stream.  This marker is not
+required, but its use is highly recommended to facilitate processing
+and implementers should include the EOS marker whenever possible.
+When the EOS marker is used, general purpose bit 1 must be set.  If
+general purpose bit 1 is not set, the EOS marker is not present.
+
+WavPack - Method 97
+-------------------
+
+Information describing the use of compression method 97 is 
+provided by WinZIP International, LLC.  This method relies on the
+open source WavPack audio compression utility developed by David Bryant.  
+Information on WavPack is available at www.wavpack.com.  Please consult 
+with the author of this algorithm for information on terms and 
+restrictions on use.
+
+WavPack data for a file begins immediately after the end of the
+local header data.  This data is the output from WavPack compression
+routines.  Within the ZIP file, the use of WavPack compression is
+indicated by setting the compression method field to a value of 97 
+in both the local header and the central directory header.  The Version 
+needed to extract and version made by fields use the same values as are 
+used for data compressed using the Deflate algorithm.
+
+An implementation note for storing digital sample data when using 
+WavPack compression within ZIP files is that all of the bytes of
+the sample data should be compressed.  This includes any unused
+bits up to the byte boundary.  An example is a 2 byte sample that
+uses only 12 bits for the sample data with 4 unused bits.  If only
+12 bits are passed as the sample size to the WavPack routines, the 4 
+unused bits will be set to 0 on extraction regardless of their original 
+state.  To avoid this, the full 16 bits of the sample data size
+should be provided. 
+
+PPMd - Method 98
+----------------
+
+PPMd is a data compression algorithm developed by Dmitry Shkarin
+which includes a carryless rangecoder developed by Dmitry Subbotin.
+This algorithm is based on predictive phrase matching on multiple
+order contexts.  Information and source code for this algorithm
+can be found on the internet. Consult with the author of this
+algorithm for information on terms or restrictions on use.
+
+Support for PPMd within the ZIP format currently is provided only 
+for version I, revision 1 of the algorithm.  Storage requirements
+for using this algorithm are as follows:
+
+Parameters needed to control the algorithm are stored in the two
+bytes immediately preceding the compressed data.  These bytes are
+used to store the following fields:
+
+Model order - sets the maximum model order, default is 8, possible
+              values are from 2 to 16 inclusive
+
+Sub-allocator size - sets the size of sub-allocator in MB, default is 50,
+            possible values are from 1MB to 256MB inclusive
+
+Model restoration method - sets the method used to restart context
+            model at memory insufficiency, values are:
+
+            0 - restarts model from scratch - default
+            1 - cut off model - decreases performance by as much as 2x
+            2 - freeze context tree - not recommended
+
+An example for packing these fields into the 2 byte storage field is
+illustrated below.  These values are stored in Intel low-byte/high-byte
+order.
+
+wPPMd = (Model order - 1) + 
+        ((Sub-allocator size - 1) << 4) + 
+        (Model restoration method << 12)
+
+
+VII. Traditional PKWARE Encryption
+----------------------------------
+
+The following information discusses the decryption steps
+required to support traditional PKWARE encryption.  This
+form of encryption is considered weak by today's standards
+and its use is recommended only for situations with
+low security needs or for compatibility with older .ZIP 
+applications.
+
+Decryption
+----------
+
+PKWARE is grateful to Mr. Roger Schlafly for his expert contribution 
+towards the development of PKWARE's traditional encryption.
+
+PKZIP encrypts the compressed data stream.  Encrypted files must
+be decrypted before they can be extracted.
+
+Each encrypted file has an extra 12 bytes stored at the start of
+the data area defining the encryption header for that file.  The
+encryption header is originally set to random values, and then
+itself encrypted, using three, 32-bit keys.  The key values are
+initialized using the supplied encryption password.  After each byte
+is encrypted, the keys are then updated using pseudo-random number
+generation techniques in combination with the same CRC-32 algorithm
+used in PKZIP and described elsewhere in this document.
+
+The following is the basic steps required to decrypt a file:
+
+1) Initialize the three 32-bit keys with the password.
+2) Read and decrypt the 12-byte encryption header, further
+   initializing the encryption keys.
+3) Read and decrypt the compressed data stream using the
+   encryption keys.
+
+Step 1 - Initializing the encryption keys
+-----------------------------------------
+
+Key(0) <- 305419896
+Key(1) <- 591751049
+Key(2) <- 878082192
+
+loop for i <- 0 to length(password)-1
+    update_keys(password(i))
+end loop
+
+Where update_keys() is defined as:
+
+update_keys(char):
+  Key(0) <- crc32(key(0),char)
+  Key(1) <- Key(1) + (Key(0) & 000000ffH)
+  Key(1) <- Key(1) * 134775813 + 1
+  Key(2) <- crc32(key(2),key(1) >> 24)
+end update_keys
+
+Where crc32(old_crc,char) is a routine that given a CRC value and a
+character, returns an updated CRC value after applying the CRC-32
+algorithm described elsewhere in this document.
+
+Step 2 - Decrypting the encryption header
+-----------------------------------------
+
+The purpose of this step is to further initialize the encryption
+keys, based on random data, to render a plaintext attack on the
+data ineffective.
+
+Read the 12-byte encryption header into Buffer, in locations
+Buffer(0) thru Buffer(11).
+
+loop for i <- 0 to 11
+    C <- buffer(i) ^ decrypt_byte()
+    update_keys(C)
+    buffer(i) <- C
+end loop
+
+Where decrypt_byte() is defined as:
+
+unsigned char decrypt_byte()
+    local unsigned short temp
+    temp <- Key(2) | 2
+    decrypt_byte <- (temp * (temp ^ 1)) >> 8
+end decrypt_byte
+
+After the header is decrypted,  the last 1 or 2 bytes in Buffer
+should be the high-order word/byte of the CRC for the file being
+decrypted, stored in Intel low-byte/high-byte order.  Versions of
+PKZIP prior to 2.0 used a 2 byte CRC check; a 1 byte CRC check is
+used on versions after 2.0.  This can be used to test if the password
+supplied is correct or not.
+
+Step 3 - Decrypting the compressed data stream
+----------------------------------------------
+
+The compressed data stream can be decrypted as follows:
+
+loop until done
+    read a character into C
+    Temp <- C ^ decrypt_byte()
+    update_keys(temp)
+    output Temp
+end loop
+
+
+VIII. Strong Encryption Specification
+-------------------------------------
+
+The Strong Encryption technology defined in this specification is 
+covered under a pending patent application. The use or implementation
+in a product of certain technological aspects set forth in the current
+APPNOTE, including those with regard to strong encryption, patching, 
+or extended tape operations requires a license from PKWARE. Portions
+of this Strong Encryption technology are available for use at no charge.
+Contact PKWARE for licensing terms and conditions. Refer to section II
+of this APPNOTE (Contacting PKWARE) for information on how to 
+contact PKWARE. 
+
+Version 5.x of this specification introduced support for strong 
+encryption algorithms.  These algorithms can be used with either 
+a password or an X.509v3 digital certificate to encrypt each file. 
+This format specification supports either password or certificate 
+based encryption to meet the security needs of today, to enable 
+interoperability between users within both PKI and non-PKI 
+environments, and to ensure interoperability between different 
+computing platforms that are running a ZIP program.  
+
+Password based encryption is the most common form of encryption 
+people are familiar with.  However, inherent weaknesses with 
+passwords (e.g. susceptibility to dictionary/brute force attack) 
+as well as password management and support issues make certificate 
+based encryption a more secure and scalable option.  Industry 
+efforts and support are defining and moving towards more advanced 
+security solutions built around X.509v3 digital certificates and 
+Public Key Infrastructures(PKI) because of the greater scalability, 
+administrative options, and more robust security over traditional 
+password based encryption. 
+
+Most standard encryption algorithms are supported with this
+specification. Reference implementations for many of these 
+algorithms are available from either commercial or open source 
+distributors.  Readily available cryptographic toolkits make
+implementation of the encryption features straight-forward.  
+This document is not intended to provide a treatise on data 
+encryption principles or theory.  Its purpose is to document the 
+data structures required for implementing interoperable data 
+encryption within the .ZIP format.  It is strongly recommended that 
+you have a good understanding of data encryption before reading 
+further.
+
+The algorithms introduced in Version 5.0 of this specification 
+include:
+
+    RC2 40 bit, 64 bit, and 128 bit
+    RC4 40 bit, 64 bit, and 128 bit
+    DES
+    3DES 112 bit and 168 bit
+  
+Version 5.1 adds support for the following:
+
+    AES 128 bit, 192 bit, and 256 bit
+
+
+Version 6.1 introduces encryption data changes to support 
+interoperability with Smartcard and USB Token certificate storage 
+methods which do not support the OAEP strengthening standard.
+
+Version 6.2 introduces support for encrypting metadata by compressing 
+and encrypting the central directory data structure to reduce information 
+leakage.   Information leakage can occur in legacy ZIP applications 
+through exposure of information about a file even though that file is 
+stored encrypted.  The information exposed consists of file 
+characteristics stored within the records and fields defined by this 
+specification.  This includes data such as a files name, its original 
+size, timestamp and CRC32 value. 
+
+Version 6.3 introduces support for encrypting data using the Blowfish
+and Twofish algorithms.  These are symmetric block ciphers developed 
+by Bruce Schneier.  Blowfish supports using a variable length key from 
+32 to 448 bits.  Block size is 64 bits.  Implementations should use 16
+rounds and the only mode supported within ZIP files is CBC. Twofish 
+supports key sizes 128, 192 and 256 bits.  Block size is 128 bits.  
+Implementations should use 16 rounds and the only mode supported within
+ZIP files is CBC.  Information and source code for both Blowfish and 
+Twofish algorithms can be found on the internet.  Consult with the author
+of these algorithms for information on terms or restrictions on use.
+
+Central Directory Encryption provides greater protection against 
+information leakage by encrypting the Central Directory structure and 
+by masking key values that are replicated in the unencrypted Local 
+Header.   ZIP compatible programs that cannot interpret an encrypted 
+Central Directory structure cannot rely on the data in the corresponding 
+Local Header for decompression information.  
+
+Extra Field records that may contain information about a file that should 
+not be exposed should not be stored in the Local Header and should only 
+be written to the Central Directory where they can be encrypted.  This 
+design currently does not support streaming.  Information in the End of 
+Central Directory record, the Zip64 End of Central Directory Locator, 
+and the Zip64 End of Central Directory records are not encrypted.  Access 
+to view data on files within a ZIP file with an encrypted Central Directory
+requires the appropriate password or private key for decryption prior to 
+viewing any files, or any information about the files, in the archive.  
+
+Older ZIP compatible programs not familiar with the Central Directory 
+Encryption feature will no longer be able to recognize the Central 
+Directory and may assume the ZIP file is corrupt.  Programs that 
+attempt streaming access using Local Headers will see invalid 
+information for each file.  Central Directory Encryption need not be 
+used for every ZIP file.  Its use is recommended for greater security.  
+ZIP files not using Central Directory Encryption should operate as 
+in the past. 
+
+This strong encryption feature specification is intended to provide for 
+scalable, cross-platform encryption needs ranging from simple password
+encryption to authenticated public/private key encryption.  
+
+Encryption provides data confidentiality and privacy.  It is 
+recommended that you combine X.509 digital signing with encryption 
+to add authentication and non-repudiation.
+
+
+Single Password Symmetric Encryption Method:
+-------------------------------------------
+
+The Single Password Symmetric Encryption Method using strong 
+encryption algorithms operates similarly to the traditional 
+PKWARE encryption defined in this format.  Additional data 
+structures are added to support the processing needs of the 
+strong algorithms.
+
+The Strong Encryption data structures are:
+
+1. General Purpose Bits - Bits 0 and 6 of the General Purpose bit 
+flag in both local and central header records.  Both bits set 
+indicates strong encryption.  Bit 13, when set indicates the Central
+Directory is encrypted and that selected fields in the Local Header
+are masked to hide their actual value.
+
+
+2. Extra Field 0x0017 in central header only.
+
+     Fields to consider in this record are:
+
+     Format - the data format identifier for this record.  The only
+     value allowed at this time is the integer value 2.
+
+     AlgId - integer identifier of the encryption algorithm from the
+     following range
+
+         0x6601 - DES
+         0x6602 - RC2 (version needed to extract < 5.2)
+         0x6603 - 3DES 168
+         0x6609 - 3DES 112
+         0x660E - AES 128 
+         0x660F - AES 192 
+         0x6610 - AES 256 
+         0x6702 - RC2 (version needed to extract >= 5.2)
+         0x6720 - Blowfish
+         0x6721 - Twofish
+         0x6801 - RC4
+         0xFFFF - Unknown algorithm
+
+     Bitlen - Explicit bit length of key
+
+         32 - 448 bits
+   
+     Flags - Processing flags needed for decryption
+
+         0x0001 - Password is required to decrypt
+         0x0002 - Certificates only
+         0x0003 - Password or certificate required to decrypt
+
+         Values > 0x0003 reserved for certificate processing
+
+
+3. Decryption header record preceding compressed file data.
+
+         -Decryption Header:
+
+          Value     Size     Description
+          -----     ----     -----------
+          IVSize    2 bytes  Size of initialization vector (IV)
+          IVData    IVSize   Initialization vector for this file
+          Size      4 bytes  Size of remaining decryption header data
+          Format    2 bytes  Format definition for this record
+          AlgID     2 bytes  Encryption algorithm identifier
+          Bitlen    2 bytes  Bit length of encryption key
+          Flags     2 bytes  Processing flags
+          ErdSize   2 bytes  Size of Encrypted Random Data
+          ErdData   ErdSize  Encrypted Random Data
+          Reserved1 4 bytes  Reserved certificate processing data
+          Reserved2 (var)    Reserved for certificate processing data
+          VSize     2 bytes  Size of password validation data
+          VData     VSize-4  Password validation data
+          VCRC32    4 bytes  Standard ZIP CRC32 of password validation data
+
+     IVData - The size of the IV should match the algorithm block size.
+              The IVData can be completely random data.  If the size of
+              the randomly generated data does not match the block size
+              it should be complemented with zero's or truncated as
+              necessary.  If IVSize is 0,then IV = CRC32 + Uncompressed
+              File Size (as a 64 bit little-endian, unsigned integer value).
+
+     Format - the data format identifier for this record.  The only
+     value allowed at this time is the integer value 3.
+
+     AlgId - integer identifier of the encryption algorithm from the
+     following range
+
+         0x6601 - DES
+         0x6602 - RC2 (version needed to extract < 5.2)
+         0x6603 - 3DES 168
+         0x6609 - 3DES 112
+         0x660E - AES 128 
+         0x660F - AES 192 
+         0x6610 - AES 256 
+         0x6702 - RC2 (version needed to extract >= 5.2)
+         0x6720 - Blowfish
+         0x6721 - Twofish
+         0x6801 - RC4
+         0xFFFF - Unknown algorithm
+
+     Bitlen - Explicit bit length of key
+
+         32 - 448 bits
+   
+     Flags - Processing flags needed for decryption
+
+         0x0001 - Password is required to decrypt
+         0x0002 - Certificates only
+         0x0003 - Password or certificate required to decrypt
+
+         Values > 0x0003 reserved for certificate processing
+
+     ErdData - Encrypted random data is used to store random data that
+               is used to generate a file session key for encrypting 
+               each file.  SHA1 is used to calculate hash data used to 
+               derive keys.  File session keys are derived from a master 
+               session key generated from the user-supplied password.
+               If the Flags field in the decryption header contains 
+               the value 0x4000, then the ErdData field must be 
+               decrypted using 3DES. If the value 0x4000 is not set,
+               then the ErdData field must be decrypted using AlgId.
+
+
+     Reserved1 - Reserved for certificate processing, if value is
+               zero, then Reserved2 data is absent.  See the explanation
+               under the Certificate Processing Method for details on
+               this data structure.
+
+     Reserved2 - If present, the size of the Reserved2 data structure 
+               is located by skipping the first 4 bytes of this field 
+               and using the next 2 bytes as the remaining size.  See
+               the explanation under the Certificate Processing Method
+               for details on this data structure.
+
+     VSize - This size value will always include the 4 bytes of the
+             VCRC32 data and will be greater than 4 bytes.
+
+     VData - Random data for password validation.  This data is VSize
+             in length and VSize must be a multiple of the encryption
+             block size.  VCRC32 is a checksum value of VData.  
+             VData and VCRC32 are stored encrypted and start the
+             stream of encrypted data for a file.
+
+
+4. Useful Tips
+
+Strong Encryption is always applied to a file after compression. The
+block oriented algorithms all operate in Cypher Block Chaining (CBC) 
+mode.  The block size used for AES encryption is 16.  All other block
+algorithms use a block size of 8.  Two ID's are defined for RC2 to 
+account for a discrepancy found in the implementation of the RC2
+algorithm in the cryptographic library on Windows XP SP1 and all 
+earlier versions of Windows.  It is recommended that zero length files
+not be encrypted, however programs should be prepared to extract them
+if they are found within a ZIP file.
+
+A pseudo-code representation of the encryption process is as follows:
+
+Password = GetUserPassword()
+MasterSessionKey = DeriveKey(SHA1(Password)) 
+RD = CryptographicStrengthRandomData() 
+For Each File
+   IV = CryptographicStrengthRandomData() 
+   VData = CryptographicStrengthRandomData()
+   VCRC32 = CRC32(VData)
+   FileSessionKey = DeriveKey(SHA1(IV + RD) 
+   ErdData = Encrypt(RD,MasterSessionKey,IV) 
+   Encrypt(VData + VCRC32 + FileData, FileSessionKey,IV)
+Done
+
+The function names and parameter requirements will depend on
+the choice of the cryptographic toolkit selected.  Almost any
+toolkit supporting the reference implementations for each
+algorithm can be used.  The RSA BSAFE(r), OpenSSL, and Microsoft
+CryptoAPI libraries are all known to work well.  
+
+
+Single Password - Central Directory Encryption:
+-----------------------------------------------
+
+Central Directory Encryption is achieved within the .ZIP format by 
+encrypting the Central Directory structure.  This encapsulates the metadata 
+most often used for processing .ZIP files.  Additional metadata is stored for 
+redundancy in the Local Header for each file.  The process of concealing 
+metadata by encrypting the Central Directory does not protect the data within 
+the Local Header.  To avoid information leakage from the exposed metadata 
+in the Local Header, the fields containing information about a file are masked.  
+
+Local Header:
+
+Masking replaces the true content of the fields for a file in the Local 
+Header with false information.  When masked, the Local Header is not 
+suitable for streaming access and the options for data recovery of damaged
+archives is reduced.  Extra Data fields that may contain confidential
+data should not be stored within the Local Header.  The value set into
+the Version needed to extract field should be the correct value needed to
+extract the file without regard to Central Directory Encryption. The fields 
+within the Local Header targeted for masking when the Central Directory is 
+encrypted are:
+
+        Field Name                     Mask Value
+        ------------------             ---------------------------
+        compression method              0
+        last mod file time              0
+        last mod file date              0
+        crc-32                          0
+        compressed size                 0
+        uncompressed size               0
+        file name (variable size)       Base 16 value from the
+                                        range 1 - 0xFFFFFFFFFFFFFFFF
+                                        represented as a string whose
+                                        size will be set into the
+                                        file name length field
+
+The Base 16 value assigned as a masked file name is simply a sequentially
+incremented value for each file starting with 1 for the first file.  
+Modifications to a ZIP file may cause different values to be stored for 
+each file.  For compatibility, the file name field in the Local Header 
+should never be left blank.  As of Version 6.2 of this specification, 
+the Compression Method and Compressed Size fields are not yet masked.
+Fields having a value of 0xFFFF or 0xFFFFFFFF for the ZIP64 format
+should not be masked.  
+
+Encrypting the Central Directory:
+
+Encryption of the Central Directory does not include encryption of the 
+Central Directory Signature data, the Zip64 End of Central Directory
+record, the Zip64 End of Central Directory Locator, or the End
+of Central Directory record.  The ZIP file comment data is never
+encrypted.
+
+Before encrypting the Central Directory, it may optionally be compressed.
+Compression is not required, but for storage efficiency it is assumed
+this structure will be compressed before encrypting.  Similarly, this 
+specification supports compressing the Central Directory without
+requiring that it also be encrypted.  Early implementations of this
+feature will assume the encryption method applied to files matches the 
+encryption applied to the Central Directory.
+
+Encryption of the Central Directory is done in a manner similar to
+that of file encryption.  The encrypted data is preceded by a 
+decryption header.  The decryption header is known as the Archive
+Decryption Header.  The fields of this record are identical to
+the decryption header preceding each encrypted file.  The location
+of the Archive Decryption Header is determined by the value in the
+Start of the Central Directory field in the Zip64 End of Central
+Directory record.  When the Central Directory is encrypted, the
+Zip64 End of Central Directory record will always be present.
+
+The layout of the Zip64 End of Central Directory record for all
+versions starting with 6.2 of this specification will follow the
+Version 2 format.  The Version 2 format is as follows:
+
+The leading fixed size fields within the Version 1 format for this
+record remain unchanged.  The record signature for both Version 1 
+and Version 2 will be 0x06064b50.  Immediately following the last
+byte of the field known as the Offset of Start of Central 
+Directory With Respect to the Starting Disk Number will begin the 
+new fields defining Version 2 of this record.  
+
+New fields for Version 2:
+
+Note: all fields stored in Intel low-byte/high-byte order.
+
+          Value                 Size       Description
+          -----                 ----       -----------
+          Compression Method    2 bytes    Method used to compress the
+                                           Central Directory
+          Compressed Size       8 bytes    Size of the compressed data
+          Original   Size       8 bytes    Original uncompressed size
+          AlgId                 2 bytes    Encryption algorithm ID
+          BitLen                2 bytes    Encryption key length
+          Flags                 2 bytes    Encryption flags
+          HashID                2 bytes    Hash algorithm identifier
+          Hash Length           2 bytes    Length of hash data
+          Hash Data             (variable) Hash data
+
+The Compression Method accepts the same range of values as the 
+corresponding field in the Central Header.
+
+The Compressed Size and Original Size values will not include the
+data of the Central Directory Signature which is compressed or
+encrypted.
+
+The AlgId, BitLen, and Flags fields accept the same range of values
+the corresponding fields within the 0x0017 record. 
+
+Hash ID identifies the algorithm used to hash the Central Directory 
+data.  This data does not have to be hashed, in which case the
+values for both the HashID and Hash Length will be 0.  Possible 
+values for HashID are:
+
+      Value         Algorithm
+     ------         ---------
+     0x0000          none
+     0x0001          CRC32
+     0x8003          MD5
+     0x8004          SHA1
+     0x8007          RIPEMD160
+     0x800C          SHA256
+     0x800D          SHA384
+     0x800E          SHA512
+
+When the Central Directory data is signed, the same hash algorithm
+used to hash the Central Directory for signing should be used.
+This is recommended for processing efficiency, however, it is 
+permissible for any of the above algorithms to be used independent 
+of the signing process.
+
+The Hash Data will contain the hash data for the Central Directory.
+The length of this data will vary depending on the algorithm used.
+
+The Version Needed to Extract should be set to 62.
+
+The value for the Total Number of Entries on the Current Disk will
+be 0.  These records will no longer support random access when
+encrypting the Central Directory.
+
+When the Central Directory is compressed and/or encrypted, the
+End of Central Directory record will store the value 0xFFFFFFFF
+as the value for the Total Number of Entries in the Central
+Directory.  The value stored in the Total Number of Entries in
+the Central Directory on this Disk field will be 0.  The actual
+values will be stored in the equivalent fields of the Zip64
+End of Central Directory record.
+
+Decrypting and decompressing the Central Directory is accomplished
+in the same manner as decrypting and decompressing a file.
+
+Certificate Processing Method:
+-----------------------------
+
+The Certificate Processing Method of for ZIP file encryption 
+defines the following additional data fields:
+
+1. Certificate Flag Values
+
+Additional processing flags that can be present in the Flags field of both 
+the 0x0017 field of the central directory Extra Field and the Decryption 
+header record preceding compressed file data are:
+
+         0x0007 - reserved for future use
+         0x000F - reserved for future use
+         0x0100 - Indicates non-OAEP key wrapping was used.  If this
+                  this field is set, the version needed to extract must
+                  be at least 61.  This means OAEP key wrapping is not
+                  used when generating a Master Session Key using
+                  ErdData.
+         0x4000 - ErdData must be decrypted using 3DES-168, otherwise use the
+                  same algorithm used for encrypting the file contents.
+         0x8000 - reserved for future use
+
+
+2. CertData - Extra Field 0x0017 record certificate data structure
+
+The data structure used to store certificate data within the section
+of the Extra Field defined by the CertData field of the 0x0017
+record are as shown:
+
+          Value     Size     Description
+          -----     ----     -----------
+          RCount    4 bytes  Number of recipients.  
+          HashAlg   2 bytes  Hash algorithm identifier
+          HSize     2 bytes  Hash size
+          SRList    (var)    Simple list of recipients hashed public keys
+
+          
+     RCount    This defines the number intended recipients whose 
+               public keys were used for encryption.  This identifies
+               the number of elements in the SRList.
+
+     HashAlg   This defines the hash algorithm used to calculate
+               the public key hash of each public key used
+               for encryption. This field currently supports
+               only the following value for SHA-1
+
+               0x8004 - SHA1
+
+     HSize     This defines the size of a hashed public key.
+
+     SRList    This is a variable length list of the hashed 
+               public keys for each intended recipient.  Each 
+               element in this list is HSize.  The total size of 
+               SRList is determined using RCount * HSize.
+
+
+3. Reserved1 - Certificate Decryption Header Reserved1 Data:
+
+          Value     Size     Description
+          -----     ----     -----------
+          RCount    4 bytes  Number of recipients.  
+          
+     RCount    This defines the number intended recipients whose 
+               public keys were used for encryption.  This defines
+               the number of elements in the REList field defined below.
+
+
+4. Reserved2 - Certificate Decryption Header Reserved2 Data Structures:
+
+
+          Value     Size     Description
+          -----     ----     -----------
+          HashAlg   2 bytes  Hash algorithm identifier
+          HSize     2 bytes  Hash size
+          REList    (var)    List of recipient data elements
+
+
+     HashAlg   This defines the hash algorithm used to calculate
+               the public key hash of each public key used
+               for encryption. This field currently supports
+               only the following value for SHA-1
+
+               0x8004 - SHA1
+
+     HSize     This defines the size of a hashed public key
+               defined in REHData.
+
+     REList    This is a variable length of list of recipient data.  
+               Each element in this list consists of a Recipient
+               Element data structure as follows:
+
+
+    Recipient Element (REList) Data Structure:
+
+          Value     Size     Description
+          -----     ----     -----------
+          RESize    2 bytes  Size of REHData + REKData
+          REHData   HSize    Hash of recipients public key
+          REKData   (var)    Simple key blob
+
+
+     RESize    This defines the size of an individual REList 
+               element.  This value is the combined size of the
+               REHData field + REKData field.  REHData is defined by
+               HSize.  REKData is variable and can be calculated
+               for each REList element using RESize and HSize.
+
+     REHData   Hashed public key for this recipient.
+
+     REKData   Simple Key Blob.  The format of this data structure
+               is identical to that defined in the Microsoft
+               CryptoAPI and generated using the CryptExportKey()
+               function.  The version of the Simple Key Blob
+               supported at this time is 0x02 as defined by
+               Microsoft.
+
+Certificate Processing - Central Directory Encryption:
+------------------------------------------------------
+
+Central Directory Encryption using Digital Certificates will 
+operate in a manner similar to that of Single Password Central
+Directory Encryption.  This record will only be present when there 
+is data to place into it.  Currently, data is placed into this
+record when digital certificates are used for either encrypting 
+or signing the files within a ZIP file.  When only password 
+encryption is used with no certificate encryption or digital 
+signing, this record is not currently needed. When present, this 
+record will appear before the start of the actual Central Directory 
+data structure and will be located immediately after the Archive 
+Decryption Header if the Central Directory is encrypted.
+
+The Archive Extra Data record will be used to store the following
+information.  Additional data may be added in future versions.
+
+Extra Data Fields:
+
+0x0014 - PKCS#7 Store for X.509 Certificates
+0x0016 - X.509 Certificate ID and Signature for central directory
+0x0019 - PKCS#7 Encryption Recipient Certificate List
+
+The 0x0014 and 0x0016 Extra Data records that otherwise would be 
+located in the first record of the Central Directory for digital 
+certificate processing. When encrypting or compressing the Central 
+Directory, the 0x0014 and 0x0016 records must be located in the 
+Archive Extra Data record and they should not remain in the first 
+Central Directory record.  The Archive Extra Data record will also 
+be used to store the 0x0019 data. 
+
+When present, the size of the Archive Extra Data record will be
+included in the size of the Central Directory.  The data of the
+Archive Extra Data record will also be compressed and encrypted
+along with the Central Directory data structure.
+
+Certificate Processing Differences:
+
+The Certificate Processing Method of encryption differs from the
+Single Password Symmetric Encryption Method as follows.  Instead
+of using a user-defined password to generate a master session key,
+cryptographically random data is used.  The key material is then
+wrapped using standard key-wrapping techniques.  This key material
+is wrapped using the public key of each recipient that will need
+to decrypt the file using their corresponding private key.
+
+This specification currently assumes digital certificates will follow
+the X.509 V3 format for 1024 bit and higher RSA format digital
+certificates.  Implementation of this Certificate Processing Method
+requires supporting logic for key access and management.  This logic
+is outside the scope of this specification.
+
+OAEP Processing with Certificate-based Encryption:
+
+OAEP stands for Optimal Asymmetric Encryption Padding.  It is a
+strengthening technique used for small encoded items such as decryption
+keys.  This is commonly applied in cryptographic key-wrapping techniques
+and is supported by PKCS #1.  Versions 5.0 and 6.0 of this specification 
+were designed to support OAEP key-wrapping for certificate-based 
+decryption keys for additional security.  
+
+Support for private keys stored on Smartcards or Tokens introduced
+a conflict with this OAEP logic.  Most card and token products do 
+not support the additional strengthening applied to OAEP key-wrapped 
+data.  In order to resolve this conflict, versions 6.1 and above of this 
+specification will no longer support OAEP when encrypting using 
+digital certificates. 
+
+Versions of PKZIP available during initial development of the 
+certificate processing method set a value of 61 into the 
+version needed to extract field for a file.  This indicates that 
+non-OAEP key wrapping is used.  This affects certificate encryption 
+only, and password encryption functions should not be affected by 
+this value.  This means values of 61 may be found on files encrypted
+with certificates only, or on files encrypted with both password
+encryption and certificate encryption.  Files encrypted with both
+methods can safely be decrypted using the password methods documented.
+
+IX. Change Process
+------------------
+
+In order for the .ZIP file format to remain a viable definition, this
+specification should be considered as open for periodic review and
+revision.  Although this format was originally designed with a 
+certain level of extensibility, not all changes in technology
+(present or future) were or will be necessarily considered in its
+design.  If your application requires new definitions to the
+extensible sections in this format, or if you would like to 
+submit new data structures, please forward your request to
+zipformat@pkware.com.  All submissions will be reviewed by the
+ZIP File Specification Committee for possible inclusion into
+future versions of this specification.  Periodic revisions
+to this specification will be published to ensure interoperability. 
+We encourage comments and feedback that may help improve clarity 
+or content.
+
+X. Incorporating PKWARE Proprietary Technology into Your Product
+----------------------------------------------------------------
+
+PKWARE is committed to the interoperability and advancement of the
+.ZIP format.  PKWARE offers a free license for certain technological
+aspects described above under certain restrictions and conditions.
+However, the use or implementation in a product of certain technological
+aspects set forth in the current APPNOTE, including those with regard to
+strong encryption, patching, or extended tape operations requires a 
+license from PKWARE.  Please contact PKWARE with regard to acquiring
+a license.
+
+XI. Acknowledgements
+---------------------
+
+In addition to the above mentioned contributors to PKZIP and PKUNZIP,
+I would like to extend special thanks to Robert Mahoney for suggesting
+the extension .ZIP for this software.
+
+XII. References
+---------------
+
+    Fiala, Edward R., and Greene, Daniel H., "Data compression with
+       finite windows",  Communications of the ACM, Volume 32, Number 4,
+       April 1989, pages 490-505.
+
+    Held, Gilbert, "Data Compression, Techniques and Applications,
+       Hardware and Software Considerations", John Wiley & Sons, 1987.
+
+    Huffman, D.A., "A method for the construction of minimum-redundancy
+       codes", Proceedings of the IRE, Volume 40, Number 9, September 1952,
+       pages 1098-1101.
+
+    Nelson, Mark, "LZW Data Compression", Dr. Dobbs Journal, Volume 14,
+       Number 10, October 1989, pages 29-37.
+
+    Nelson, Mark, "The Data Compression Book",  M&T Books, 1991.
+
+    Storer, James A., "Data Compression, Methods and Theory",
+       Computer Science Press, 1988
+
+    Welch, Terry, "A Technique for High-Performance Data Compression",
+       IEEE Computer, Volume 17, Number 6, June 1984, pages 8-19.
+
+    Ziv, J. and Lempel, A., "A universal algorithm for sequential data
+       compression", Communications of the ACM, Volume 30, Number 6,
+       June 1987, pages 520-540.
+
+    Ziv, J. and Lempel, A., "Compression of individual sequences via
+       variable-rate coding", IEEE Transactions on Information Theory,
+       Volume 24, Number 5, September 1978, pages 530-536.
+
+
+APPENDIX A - AS/400 Extra Field (0x0065) Attribute Definitions
+--------------------------------------------------------------
+
+Field Definition Structure:
+
+   a. field length including length             2 bytes
+   b. field code                                2 bytes
+   c. data                                      x bytes
+
+Field Code  Description
+   4001     Source type i.e. CLP etc
+   4002     The text description of the library 
+   4003     The text description of the file
+   4004     The text description of the member
+   4005     x'F0' or 0 is PF-DTA,  x'F1' or 1 is PF_SRC
+   4007     Database Type Code                  1 byte
+   4008     Database file and fields definition
+   4009     GZIP file type                      2 bytes
+   400B     IFS code page                       2 bytes
+   400C     IFS Creation Time                   4 bytes
+   400D     IFS Access Time                     4 bytes
+   400E     IFS Modification time               4 bytes
+   005C     Length of the records in the file   2 bytes
+   0068     GZIP two words                      8 bytes
+
+APPENDIX B - z/OS Extra Field (0x0065) Attribute Definitions
+------------------------------------------------------------
+
+Field Definition Structure:
+
+   a. field length including length             2 bytes
+   b. field code                                2 bytes
+   c. data                                      x bytes
+
+Field Code  Description
+   0001     File Type                           2 bytes 
+   0002     NonVSAM Record Format               1 byte
+   0003     Reserved		
+   0004     NonVSAM Block Size                  2 bytes Big Endian
+   0005     Primary Space Allocation            3 bytes Big Endian
+   0006     Secondary Space Allocation          3 bytes Big Endian
+   0007     Space Allocation Type1 byte flag		
+   0008     Modification Date                   Retired with PKZIP 5.0 +
+   0009     Expiration Date                     Retired with PKZIP 5.0 +
+   000A     PDS Directory Block Allocation      3 bytes Big Endian binary value
+   000B     NonVSAM Volume List                 variable		
+   000C     UNIT Reference                      Retired with PKZIP 5.0 +
+   000D     DF/SMS Management Class             8 bytes EBCDIC Text Value
+   000E     DF/SMS Storage Class                8 bytes EBCDIC Text Value
+   000F     DF/SMS Data Class                   8 bytes EBCDIC Text Value
+   0010     PDS/PDSE Member Info.               30 bytes	
+   0011     VSAM sub-filetype                   2 bytes		
+   0012     VSAM LRECL                          13 bytes EBCDIC "(num_avg num_max)"
+   0013     VSAM Cluster Name                   Retired with PKZIP 5.0 +
+   0014     VSAM KSDS Key Information           13 bytes EBCDIC "(num_length num_position)"
+   0015     VSAM Average LRECL                  5 bytes EBCDIC num_value padded with blanks
+   0016     VSAM Maximum LRECL                  5 bytes EBCDIC num_value padded with blanks
+   0017     VSAM KSDS Key Length                5 bytes EBCDIC num_value padded with blanks
+   0018     VSAM KSDS Key Position              5 bytes EBCDIC num_value padded with blanks
+   0019     VSAM Data Name                      1-44 bytes EBCDIC text string
+   001A     VSAM KSDS Index Name                1-44 bytes EBCDIC text string
+   001B     VSAM Catalog Name                   1-44 bytes EBCDIC text string
+   001C     VSAM Data Space Type                9 bytes EBCDIC text string
+   001D     VSAM Data Space Primary             9 bytes EBCDIC num_value left-justified
+   001E     VSAM Data Space Secondary           9 bytes EBCDIC num_value left-justified
+   001F     VSAM Data Volume List               variable EBCDIC text list of 6-character Volume IDs
+   0020     VSAM Data Buffer Space              8 bytes EBCDIC num_value left-justified
+   0021     VSAM Data CISIZE                    5 bytes EBCDIC num_value left-justified
+   0022     VSAM Erase Flag                     1 byte flag		
+   0023     VSAM Free CI %                      3 bytes EBCDIC num_value left-justified
+   0024     VSAM Free CA %                      3 bytes EBCDIC num_value left-justified
+   0025     VSAM Index Volume List              variable EBCDIC text list of 6-character Volume IDs
+   0026     VSAM Ordered Flag                   1 byte flag		
+   0027     VSAM REUSE Flag                     1 byte flag		
+   0028     VSAM SPANNED Flag                   1 byte flag		
+   0029     VSAM Recovery Flag                  1 byte flag		
+   002A     VSAM  WRITECHK  Flag                1 byte flag		
+   002B     VSAM Cluster/Data SHROPTS           3 bytes EBCDIC "n,y"	
+   002C     VSAM Index SHROPTS                  3 bytes EBCDIC "n,y"	
+   002D     VSAM Index Space Type               9 bytes EBCDIC text string
+   002E     VSAM Index Space Primary            9 bytes EBCDIC num_value left-justified
+   002F     VSAM Index Space Secondary          9 bytes EBCDIC num_value left-justified
+   0030     VSAM Index CISIZE                   5 bytes EBCDIC num_value left-justified
+   0031     VSAM Index IMBED                    1 byte flag		
+   0032     VSAM Index Ordered Flag             1 byte flag		
+   0033     VSAM REPLICATE Flag                 1 byte flag		
+   0034     VSAM Index REUSE Flag               1 byte flag		
+   0035     VSAM Index WRITECHK Flag            1 byte flag Retired with PKZIP 5.0 +
+   0036     VSAM Owner                          8 bytes EBCDIC text string
+   0037     VSAM Index Owner                    8 bytes EBCDIC text string
+   0038     Reserved
+   0039     Reserved
+   003A     Reserved
+   003B     Reserved
+   003C     Reserved
+   003D     Reserved
+   003E     Reserved
+   003F     Reserved
+   0040     Reserved
+   0041     Reserved
+   0042     Reserved
+   0043     Reserved
+   0044     Reserved
+   0045     Reserved
+   0046     Reserved
+   0047     Reserved
+   0048     Reserved
+   0049     Reserved
+   004A     Reserved
+   004B     Reserved
+   004C     Reserved
+   004D     Reserved
+   004E     Reserved
+   004F     Reserved
+   0050     Reserved
+   0051     Reserved
+   0052     Reserved
+   0053     Reserved
+   0054     Reserved
+   0055     Reserved
+   0056     Reserved
+   0057     Reserved
+   0058     PDS/PDSE Member TTR Info.           6 bytes  Big Endian
+   0059     PDS 1st LMOD Text TTR               3 bytes  Big Endian
+   005A     PDS LMOD EP Rec #                   4 bytes  Big Endian
+   005B     Reserved
+   005C     Max Length of records               2 bytes  Big Endian
+   005D     PDSE Flag                           1 byte flag
+   005E     Reserved
+   005F     Reserved
+   0060     Reserved
+   0061     Reserved
+   0062     Reserved
+   0063     Reserved
+   0064     Reserved
+   0065     Last Date Referenced                4 bytes  Packed Hex "yyyymmdd"
+   0066     Date Created                        4 bytes  Packed Hex "yyyymmdd"
+   0068     GZIP two words                      8 bytes
+   0071     Extended NOTE Location              12 bytes Big Endian
+   0072     Archive device UNIT                 6 bytes  EBCDIC
+   0073     Archive 1st Volume                  6 bytes  EBCDIC
+   0074     Archive 1st VOL File Seq#           2 bytes  Binary
+
+APPENDIX C - Zip64 Extensible Data Sector Mappings (EFS)
+--------------------------------------------------------
+
+          -Z390   Extra Field:
+
+          The following is the general layout of the attributes for the 
+          ZIP 64 "extra" block for extended tape operations. Portions of 
+          this extended tape processing technology is covered under a 
+          pending patent application. The use or implementation in a 
+          product of certain technological aspects set forth in the 
+          current APPNOTE, including those with regard to strong encryption,
+          patching or extended tape operations, requires a license from
+          PKWARE.  Please contact PKWARE with regard to acquiring a license. 
+ 
+
+          Note: some fields stored in Big Endian format.  All text is 
+	  in EBCDIC format unless otherwise specified.
+
+          Value       Size          Description
+          -----       ----          -----------
+  (Z390)  0x0065      2 bytes       Tag for this "extra" block type
+          Size        4 bytes       Size for the following data block
+          Tag         4 bytes       EBCDIC "Z390"
+          Length71    2 bytes       Big Endian
+          Subcode71   2 bytes       Enote type code
+          FMEPos      1 byte
+          Length72    2 bytes       Big Endian
+          Subcode72   2 bytes       Unit type code
+          Unit        1 byte        Unit
+          Length73    2 bytes       Big Endian
+          Subcode73   2 bytes       Volume1 type code
+          FirstVol    1 byte        Volume
+          Length74    2 bytes       Big Endian
+          Subcode74   2 bytes       FirstVol file sequence
+          FileSeq     2 bytes       Sequence 
+
+APPENDIX D - Language Encoding (EFS)
+------------------------------------
+
+The ZIP format has historically supported only the original IBM PC character 
+encoding set, commonly referred to as IBM Code Page 437.  This limits storing 
+file name characters to only those within the original MS-DOS range of values 
+and does not properly support file names in other character encodings, or 
+languages. To address this limitation, this specification will support the 
+following change. 
+
+If general purpose bit 11 is unset, the file name and comment should conform 
+to the original ZIP character encoding.  If general purpose bit 11 is set, the 
+filename and comment must support The Unicode Standard, Version 4.1.0 or 
+greater using the character encoding form defined by the UTF-8 storage 
+specification.  The Unicode Standard is published by the The Unicode
+Consortium (www.unicode.org).  UTF-8 encoded data stored within ZIP files 
+is expected to not include a byte order mark (BOM). 
+
+Applications may choose to supplement this file name storage through the use 
+of the 0x0008 Extra Field.  Storage for this optional field is currently 
+undefined, however it will be used to allow storing extended information 
+on source or target encoding that may further assist applications with file 
+name, or file content encoding tasks.  Please contact PKWARE with any
+requirements on how this field should be used.
+
+The 0x0008 Extra Field storage may be used with either setting for general 
+purpose bit 11.  Examples of the intended usage for this field is to store 
+whether "modified-UTF-8" (JAVA) is used, or UTF-8-MAC.  Similarly, other 
+commonly used character encoding (code page) designations can be indicated 
+through this field.  Formalized values for use of the 0x0008 record remain 
+undefined at this time.  The definition for the layout of the 0x0008 field
+will be published when available.  Use of the 0x0008 Extra Field provides
+for storing data within a ZIP file in an encoding other than IBM Code
+Page 437 or UTF-8.
+
+General purpose bit 11 will not imply any encoding of file content or
+password.  Values defining character encoding for file content or 
+password must be stored within the 0x0008 Extended Language Encoding 
+Extra Field.
+
+Ed Gordon of the Info-ZIP group has defined a pair of "extra field" records 
+that can be used to store UTF-8 file name and file comment fields.  These
+records can be used for cases when the general purpose bit 11 method
+for storing UTF-8 data in the standard file name and comment fields is
+not desirable.  A common case for this alternate method is if backward
+compatibility with older programs is required.
+
+Definitions for the record structure of these fields are included above 
+in the section on 3rd party mappings for "extra field" records.  These
+records are identified by Header ID's 0x6375 (Info-ZIP Unicode Comment 
+Extra Field) and 0x7075 (Info-ZIP Unicode Path Extra Field).
+
+The choice of which storage method to use when writing a ZIP file is left
+to the implementation.  Developers should expect that a ZIP file may 
+contain either method and should provide support for reading data in 
+either format. Use of general purpose bit 11 reduces storage requirements 
+for file name data by not requiring additional "extra field" data for
+each file, but can result in older ZIP programs not being able to extract 
+files.  Use of the 0x6375 and 0x7075 records will result in a ZIP file 
+that should always be readable by older ZIP programs, but requires more 
+storage per file to write file name and/or file comment fields.
+
+ 
+
+
+
diff --git a/apps/files_odfviewer/src/webodf/webodf/CMakeLists.txt b/apps/files_odfviewer/src/webodf/webodf/CMakeLists.txt
new file mode 100644
index 0000000000..247ff5c625
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/CMakeLists.txt
@@ -0,0 +1,201 @@
+string(COMPARE EQUAL "${CMAKE_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}"
+    WRONGCMAKEDIR)
+if(WRONGCMAKEDIR)
+  message(FATAL_ERROR "You should point CMake to the parent directory.")
+endif(WRONGCMAKEDIR)
+
+set(TESTJSFILES tests/core/ZipTests.js
+    tests/core/Base64Tests.js
+    tests/core/CursorTests.js
+    tests/core/PointWalkerTests.js
+    tests/core/RuntimeTests.js
+    tests/gui/CaretTests.js
+    tests/gui/SelectionMoverTests.js
+    tests/gui/XMLEditTests.js
+    tests/xmldom/OperationalTransformDOMTests.js
+    tests/xmldom/XPathTests.js
+    tests/tests.js
+)
+
+add_custom_target(jslintcheck ALL
+    COMMAND ${NODE} lib/runtime.js tools/runjslint.js
+        ${LIBJSFILES} ${TESTJSFILES}
+    DEPENDS NodeJS
+    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+    SOURCES ${LIBJSFILES} ${TESTJSFILES}
+)
+
+if (Java_JAVA_EXECUTABLE)
+  # nonStandardJsDocs is not used because we use @licstart @licend and @source
+  set(SHARED_CLOSURE_ARGS --warning_level VERBOSE --jscomp_error accessControls --jscomp_error ambiguousFunctionDecl --jscomp_error checkRegExp --jscomp_error checkTypes --jscomp_error checkVars --jscomp_error constantProperty --jscomp_error deprecated --jscomp_error externsValidation --jscomp_error fileoverviewTags --jscomp_error globalThis --jscomp_error invalidCasts --jscomp_error missingProperties --jscomp_error strictModuleDepCheck --jscomp_error typeInvalidation --jscomp_error undefinedVars --jscomp_error unknownDefines --jscomp_error uselessCode --jscomp_error visibility --jscomp_off nonStandardJsDocs --summary_detail_level 3)
+
+  foreach(JSFILE ${LIBJSFILES})
+    set(LIB_CLOSURE_ARGS ${LIB_CLOSURE_ARGS}
+        --js ${CMAKE_CURRENT_SOURCE_DIR}/${JSFILE})
+  endforeach(JSFILE ${LIBJSFILES})
+
+  foreach(JSFILE ${TESTJSFILES})
+    set(TEST_CLOSURE_ARGS ${TEST_CLOSURE_ARGS}
+        --js ${CMAKE_CURRENT_SOURCE_DIR}/${JSFILE})
+  endforeach(JSFILE ${TESTJSFILES})
+
+  add_custom_command(
+      OUTPUT simplecompiled.js
+      COMMAND ${Java_JAVA_EXECUTABLE}
+      ARGS -jar ${CLOSURE_JAR}
+         ${SHARED_CLOSURE_ARGS} ${LIB_CLOSURE_ARGS} ${TEST_CLOSURE_ARGS}
+         --compilation_level WHITESPACE_ONLY
+         --formatting PRETTY_PRINT
+         --js_output_file simplecompiled.js
+      DEPENDS ClosureCompiler ${LIBJSFILES} ${TESTJSFILES}
+  )
+
+  add_custom_command(
+      OUTPUT compiled.js
+      COMMAND ${Java_JAVA_EXECUTABLE}
+      ARGS -jar ${CLOSURE_JAR}
+         --define IS_COMPILED_CODE=true
+         ${SHARED_CLOSURE_ARGS} ${LIB_CLOSURE_ARGS} ${TEST_CLOSURE_ARGS}
+         --compilation_level ADVANCED_OPTIMIZATIONS
+         --formatting PRETTY_PRINT
+         --externs ${CMAKE_CURRENT_SOURCE_DIR}/tools/externs.js
+         --js_output_file compiled.js
+      DEPENDS ClosureCompiler ${LIBJSFILES} ${TESTJSFILES} tools/externs.js
+  )
+
+  add_custom_command(
+      OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/webodf.js
+      COMMAND ${Java_JAVA_EXECUTABLE}
+      ARGS -jar ${CLOSURE_JAR}
+         --define IS_COMPILED_CODE=true
+         ${SHARED_CLOSURE_ARGS} ${LIB_CLOSURE_ARGS}
+         --compilation_level SIMPLE_OPTIMIZATIONS
+         --formatting PRINT_INPUT_DELIMITER
+         --externs ${CMAKE_CURRENT_SOURCE_DIR}/tools/externs.js
+         --js_output_file ${CMAKE_CURRENT_BINARY_DIR}/webodf.js
+      DEPENDS ClosureCompiler ${LIBJSFILES} tools/externs.js
+  )
+  add_custom_target(webodf.js
+      SOURCES ${CMAKE_CURRENT_BINARY_DIR}/webodf.js
+  )
+
+  # too hardcore for now...
+  # add_custom_command(
+  #     OUTPUT webodf-experimental.js
+  #     COMMAND ${Java_JAVA_EXECUTABLE}
+  #     ARGS -jar ${CLOSURE_JAR}
+  #        --define IS_COMPILED_CODE=true
+  #        ${SHARED_CLOSURE_ARGS} ${LIB_CLOSURE_ARGS}
+  #        --js ${CMAKE_CURRENT_SOURCE_DIR}/lib/export.js
+  #        --compilation_level ADVANCED_OPTIMIZATIONS
+  #        --formatting PRINT_INPUT_DELIMITER
+  #        --externs ${CMAKE_CURRENT_SOURCE_DIR}/tools/externs.js
+  #        --js_output_file webodf-experimental.js
+  #     DEPENDS ClosureCompiler ${LIBJSFILES} lib/export.js tools/externs.js
+  # )
+
+  add_custom_command(
+      OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/webodf-debug.js
+      COMMAND ${Java_JAVA_EXECUTABLE}
+      ARGS -jar ${CLOSURE_JAR}
+         --define IS_COMPILED_CODE=true
+         ${SHARED_CLOSURE_ARGS} ${LIB_CLOSURE_ARGS}
+         --compilation_level WHITESPACE_ONLY
+         --formatting PRETTY_PRINT
+         --externs ${CMAKE_CURRENT_SOURCE_DIR}/tools/externs.js
+         --js_output_file ${CMAKE_CURRENT_BINARY_DIR}/webodf-debug.js
+      DEPENDS ClosureCompiler ${LIBJSFILES} tools/externs.js
+  )
+  add_custom_target(webodf-debug.js
+     SOURCES ${CMAKE_CURRENT_BINARY_DIR}/webodf-debug.js
+  )
+
+  add_custom_command(
+      OUTPUT odfedit.js
+      COMMAND ${Java_JAVA_EXECUTABLE}
+      ARGS -jar ${CLOSURE_JAR}
+         --define IS_COMPILED_CODE=true
+         ${SHARED_CLOSURE_ARGS} ${LIB_CLOSURE_ARGS}
+         --js ${CMAKE_CURRENT_SOURCE_DIR}/odfedit.js
+         --compilation_level ADVANCED_OPTIMIZATIONS
+         --formatting PRETTY_PRINT
+         --externs ${CMAKE_CURRENT_SOURCE_DIR}/tools/externs.js
+         --externs ${CMAKE_CURRENT_SOURCE_DIR}/tools/extjsexterns.js
+         --js_output_file odfedit.js
+      DEPENDS ClosureCompiler ${LIBJSFILES} ${APPJSFILES} tools/externs.js tools/extjsexterns.js odfedit.js
+  )
+
+  add_custom_command(
+    OUTPUT gui.js
+    COMMAND ${Java_JAVA_EXECUTABLE}
+    ARGS -jar ${CLOSURE_JAR}
+         --define IS_COMPILED_CODE=true
+         ${SHARED_CLOSURE_ARGS} ${LIB_CLOSURE_ARGS}
+         --js ${CMAKE_CURRENT_SOURCE_DIR}/filelister.js
+         --js ${CMAKE_CURRENT_SOURCE_DIR}/gui.js
+         --compilation_level ADVANCED_OPTIMIZATIONS
+         --formatting PRETTY_PRINT
+         --externs ${CMAKE_CURRENT_SOURCE_DIR}/tools/externs.js
+         --externs ${CMAKE_CURRENT_SOURCE_DIR}/tools/extjsexterns.js
+         --js_output_file gui.js
+    DEPENDS ClosureCompiler ${LIBJSFILES} ${APPJSFILES} tools/externs.js tools/extjsexterns.js filelister.js gui.js
+  )
+
+  add_custom_target(syntaxcheck ALL
+      DEPENDS simplecompiled.js webodf.js webodf-debug.js compiled.js
+  )
+
+  add_custom_target(rhinotest
+      COMMAND ${Java_JAVA_EXECUTABLE} -jar ${RHINO}
+          -debug lib/runtime.js tests/tests.js
+      DEPENDS Rhino
+      WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+      SOURCES ${LIBJSFILES}
+  )
+  add_custom_target(simplerhinotest
+      COMMAND ${Java_JAVA_EXECUTABLE} -jar ${RHINO}
+          ${CMAKE_CURRENT_BINARY_DIR}/simplecompiled.js
+      DEPENDS Rhino simplecompiled.js
+      WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/tests
+  )
+  add_custom_command(
+      OUTPUT docs/index.html
+       COMMAND ${Java_JAVA_EXECUTABLE}
+        ARGS -jar ${JSDOCDIR}/jsrun.jar
+            ${JSDOCDIR}/app/run.js -d=${CMAKE_CURRENT_BINARY_DIR}/docs
+                -t=${JSDOCDIR}/templates/jsdoc ${LIBJSFILES}
+        WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+        DEPENDS ${LIBJSFILES} JsDoc
+  )
+  add_custom_target(doc DEPENDS docs/index.html)
+  add_custom_target(simplenodetest ALL
+      COMMAND ${NODE} ${CMAKE_CURRENT_BINARY_DIR}/simplecompiled.js
+      DEPENDS NodeJS simplecompiled.js
+      WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/tests
+  )
+
+endif (Java_JAVA_EXECUTABLE)
+
+add_custom_target(nodetest ALL
+    COMMAND ${NODE} lib/runtime.js tests/tests.js
+    DEPENDS NodeJS
+    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+    SOURCES ${LIBJSFILES}
+)
+if (QT4_FOUND)
+  add_custom_target(qtjsruntimetest ALL
+      COMMAND ${CMAKE_BINARY_DIR}/programs/qtjsruntime/qtjsruntime ../lib/runtime.js tests.js
+      DEPENDS qtjsruntime jslintcheck
+      WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/tests
+      SOURCES ${LIBJSFILES}
+  )
+endif (QT4_FOUND)
+add_custom_command(
+    OUTPUT instrumented/index.html
+    COMMAND ${JSCOVERAGE}
+    ARGS --exclude=extjs --exclude=extjs/.git ${CMAKE_CURRENT_SOURCE_DIR}
+         ${CMAKE_CURRENT_BINARY_DIR}/instrumented
+    DEPENDS ${LIBJSFILES} jslintcheck JSCoverage
+)
+add_custom_target(instrumented ALL DEPENDS instrumented/index.html)
+# vim:expandtab
diff --git a/apps/files_odfviewer/src/webodf/webodf/README b/apps/files_odfviewer/src/webodf/webodf/README
new file mode 100644
index 0000000000..a4dde2fee7
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/README
@@ -0,0 +1,43 @@
+This directory contains the javacript code to WebODF as well as applications that use it. The applications are browser applications, commandline applications and unit tests.
+
+lib/
+lib/core/    Parts of WebODF that also work on JavaScript runtimes without a
+             document window.
+lib/gui/     Parts of WebODF that require a domtree
+
+The library should be able to run in a number of different runtimes. Currently these are:
+ - a webbrowser
+ - node.js
+ - rhino
+A common API is implemented for these three environments in the files lib/browser.js, lib/node.js and lib/rhino.js respectively.
+
+
+
+Requirements on the code
+
+There are several requirements that need to met before code can be considered for inclusion in WebODF. Most requirements can be checked automatically, a few have to be checked by hand. A contribution must:
+ - be contributed under the appropriate license
+ - be javascript
+ - not give any warnings in a JSLint check
+ - be unchanged when passed through jsbeautifier
+ - compile with the closure compiler
+ - must pass all the unit tests that were passed before
+   - as separate js files in the currenlty used Node.JS implementation
+   - as a single compiled file in the currenlty used Node.JS implementation
+   - as separate js files in the currenlty used Rhino implementation
+   - as a single compiled file Rhino implementation
+ - must have equal or greater code coverage for the each of the test runs
+
+The automatic checks can be performed by running a dedicated command that reports in an xml file. This report is compared to the previous report.
+
+runtests.js is the command that creates a report.
+
+
+
+
+
+
+
+
+
+
diff --git a/apps/files_odfviewer/src/webodf/webodf/compare.html b/apps/files_odfviewer/src/webodf/webodf/compare.html
new file mode 100644
index 0000000000..0cf1cc80af
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/compare.html
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!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"></meta>
+  <style type="text/css" media="screen">
+    body, html, div {
+      padding: 0px;
+      margin: 0px;
+      border: 0px;
+    }
+    body, html {
+      height: 100%;
+      text-align: center;
+    }
+    html > body {
+      background: black;
+    }
+  </style>
+  <link rel="stylesheet" type="text/css" href="webodf.css"/>
+  <script src="lib/runtime.js" type="text/javascript" charset="utf-8"></script>
+  <script src="compare.js" type="text/javascript" charset="utf-8"></script>
+  <script type="text/javascript" charset="utf-8">
+window.setTimeout(function () {
+    init(window, document);
+}, 0);
+  </script>
+  <title></title>
+</head>
+ 
+<body>
+  <div id="odf"/>
+</body>
+</html>
diff --git a/apps/files_odfviewer/src/webodf/webodf/compare.js b/apps/files_odfviewer/src/webodf/webodf/compare.js
new file mode 100644
index 0000000000..16bf5e333f
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/compare.js
@@ -0,0 +1,45 @@
+/*global runtime: true, odf: true*/
+/*jslint white: false*/
+function getURIParameters(window) {
+    "use strict";
+    var params = {},
+        query = window.location.search.substring(1),
+        parms = query.split('&'),
+        i,
+        pos,
+        key,
+        val;
+    for (i = 0; i < parms.length; i += 1) {
+        pos = parms[i].indexOf('=');
+        if (pos > 0) {
+            key = parms[i].substring(0, pos);
+            val = parms[i].substring(pos + 1);
+            params[key] = val;
+        }
+    }
+    return params;
+}
+function init(window, document) {
+    "use strict";
+    runtime.loadClass("odf.OdfCanvas");
+    var params = getURIParameters(window),
+        odfelement = document.getElementById("odf"),
+        odfcanvas = new odf.OdfCanvas(odfelement);
+    if (!params.odf) {
+        return;
+    }
+    odfcanvas.addListener("statereadychange", function () {
+        var s = odfelement.style,
+            bgzoom = "100% auto",
+            pos;
+        s.backgroundImage = "url(" + params.bg + ")";
+        s.backgroundRepeat = "no-repeat";
+        if (params.bgzoom) {
+            bgzoom = params.bgzoom + "% auto";
+        }
+        s.backgroundSize = bgzoom;
+        pos = (params.x || "0") + "px " + (params.y || "0") + "px";
+        s.backgroundPosition = pos;
+    });
+    odfcanvas.load(params.odf);
+}
diff --git a/apps/files_odfviewer/src/webodf/webodf/deflateinmozilla.txt b/apps/files_odfviewer/src/webodf/webodf/deflateinmozilla.txt
new file mode 100644
index 0000000000..866b29de77
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/deflateinmozilla.txt
@@ -0,0 +1,69 @@
+Found this in a mozilla forum.
+http://forums.mozillazine.org/viewtopic.php?f=27&t=313496&start=0#
+
+Another implementation under MIT license can be found here:
+http://www.codeproject.com/KB/scripting/Javascript_binaryenc.aspx
+
+ //listener for the converted data
+      var listener =
+      {
+         onDataAvailable : function(request, context, inputStream, offset, count)
+         {
+            //write the data
+                 var output = Components.classes["@mozilla.org/network/file-output-stream;1"].createInstance(Components.interfaces.nsIFileOutputStream);
+
+                                //outputFile is a file which will contain the gunzipped data
+            if(!outputFile.exists())
+                     output.init(outputFile, 0x02 | 0x08, 0644, 0);
+
+            else
+                     output.init(outputFile, 0x02 | 0x10, 0644, 0);
+
+                  var scriptable = Components.classes["@mozilla.org/scriptableinputstream;1"].createInstance(Components.interfaces.nsIScriptableInputStream);
+               scriptable.init(inputStream);
+
+            var data = scriptable.read(inputStream.available());
+            output.write(data, data.length);
+
+            output.close();
+         },
+
+         onStartRequest : function(request, context)   
+         {
+         },
+
+         onStopRequest : function(request, context)
+         {
+         }
+      };
+
+      //fake uri needed to create a channel
+      var uri = Components.classes["@mozilla.org/network/simple-uri;1"].createInstance(Components.interfaces.nsIURI);
+      uri.scheme = "http://gunzip";
+
+      //fake channel needed to create a request
+      var chan = Components.classes["@mozilla.org/network/input-stream-channel;1"].createInstance(Components.interfaces.nsIInputStreamChannel);
+      chan.setURI(uri);
+      chan.contentLength = decrypted.length;
+      chan.contentType = "gzip";
+      chan.contentStream = null;
+
+      var request = chan.QueryInterface(Components.interfaces.nsIRequest);
+
+            // Attempt to gunzip
+      var conv = Components.classes["@mozilla.org/streamconv;1?from=gzip&to=uncompressed"].createInstance(Components.interfaces.nsIStreamConverter);
+
+      conv.asyncConvertData("gzip", "uncompressed", listener, null);
+
+      conv.onStartRequest(request, null);
+
+                //input is an inputstream which contains the gzipped data
+      var avail = input.available();
+
+      //really do the conversion
+      conv.onDataAvailable(request, null, input, 0, avail);
+
+      var status = {};
+      conv.onStopRequest(request, null, status);
+
+      input.close();
diff --git a/apps/files_odfviewer/src/webodf/webodf/embedodf.html b/apps/files_odfviewer/src/webodf/webodf/embedodf.html
new file mode 100644
index 0000000000..96bb25cc2b
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/embedodf.html
@@ -0,0 +1,2 @@
+<html><link rel='stylesheet' href='webodf.css'/><script src='webodf.js'/><div id='odf'>
+<!-- This html is used by applications that embed webodf such as nativeQtClient. You can replace webodf.js with lib/runtime.js when debugging. -->
diff --git a/apps/files_odfviewer/src/webodf/webodf/filelist.js b/apps/files_odfviewer/src/webodf/webodf/filelist.js
new file mode 100644
index 0000000000..8f7b876b46
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/filelist.js
@@ -0,0 +1,66 @@
+/**
+ * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
+ * @licstart
+ * The JavaScript code in this page is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU Affero General Public License
+ * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.  The code is distributed
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
+ *
+ * As additional permission under GNU AGPL version 3 section 7, you
+ * may distribute non-source (e.g., minimized or compacted) forms of
+ * that code without the copy of the GNU GPL normally required by
+ * section 4, provided you include this license notice and a URL
+ * through which recipients can access the Corresponding Source.
+ *
+ * As a special exception to the AGPL, any HTML file which merely makes function
+ * calls to this code, and for that purpose includes it by reference shall be
+ * deemed a separate work for copyright law purposes. In addition, the copyright
+ * holders of this code give you permission to combine this code with free
+ * software libraries that are released under the GNU LGPL. You may copy and
+ * distribute such a system following the terms of the GNU AGPL for this code
+ * and the LGPL for the libraries. If you modify this code, you may extend this
+ * exception to your version of the code, but you are not obligated to do so.
+ * If you do not wish to do so, delete this exception statement from your
+ * version.
+ *
+ * This license applies to this entire compilation.
+ * @licend
+ * @source: http://www.webodf.org/
+ * @source: http://gitorious.org/odfkit/webodf/
+ */
+var fileList = [
+    'kofficetests/odf/134010.ods',
+    '../../../odfkit/odfkit/odfkit/LayoutTests/fast/odf/script-tests/hello-odf-2.odt',
+    '../../../odfkit/odfkit/odfkit/LayoutTests/fast/odf/script-tests/hello-odf-1.odt',
+    '../../../odfkit/odfkit/odfkit/LayoutTests/platform/mac/fast/loader/resources/mimeTypeExamples/example-ods.ods',
+    '../../../odfkit/odfkit/lpod-python/test/samples/note.odt',
+    '../../../odfkit/odfkit/lpod-python/test/samples/list.odt',
+    '../../../odfkit/odfkit/lpod-python/test/samples/frame_image.odp',
+    '../../../odfkit/odfkit/lpod-python/test/samples/bookmark.odt',
+    '../../../odfkit/odfkit/lpod-python/test/samples/span_a.odt',
+    '../../../odfkit/odfkit/lpod-python/test/samples/toc.odt',
+    '../../../odfkit/odfkit/lpod-python/test/samples/meta.odt',
+    '../../../odfkit/odfkit/lpod-python/test/samples/base_text.odt',
+    '../../../odfkit/odfkit/lpod-python/test/samples/span_style.odt',
+    '../../../odfkit/odfkit/lpod-python/test/samples/variable.odt',
+    '../../../odfkit/odfkit/lpod-python/test/samples/example.odp',
+    '../../../odfkit/odfkit/lpod-python/test/samples/base_shapes.odg',
+    '../../../odfkit/odfkit/lpod-python/test/samples/simple_table.ods',
+    '../../../odfkit/odfkit/lpod-python/test/samples/example.odt',
+    '../../../odfkit/odfkit/lpod-python/test/samples/styled_table.ods',
+    '../../../odfkit/odfkit/lpod-python/test/samples/tracked_changes.odt',
+    '../../../odfkit/odfkit/lpod-python/templates/lpod_styles.odt',
+    '../../../ictu/ictu/xsl-odt/z2.odt',
+    '../../../ictu/ictu/xsl-odt/gerechtelijkeaankondigingen/input/stcrt-2010-8050.odt',
+    '../../../ictu/ictu/odfquality/stcrt-2010-6505/stcrt-2010-6505.odt',
+    '../../../ictu/ictu/odfquality/kst-31460-12/kst-31460-12.odt',
+    '../../../ictu/ictu/odfquality/ah-tk-20092010-2140/ah-tk-20092010-2140.odt',
+    '../../../ictu/ictu/odfquality/kv-tk-2010Z06142/kv-tk-2010Z06142.odt',
+    '../../../ictu/ictu/odfquality/stb-2010-161/stb-2010-161.odt',
+    'kofficetests/odf/charts/Areacharts.odp',
+    'kofficetests/odf/xenophon.odt',
+    'kofficetests/odf/134010.ods',
+    'kofficetests/interoperability/kword/oowriter/oow_pic_flip_vertical.odt'
+];
diff --git a/apps/files_odfviewer/src/webodf/webodf/filelister.html b/apps/files_odfviewer/src/webodf/webodf/filelister.html
new file mode 100644
index 0000000000..0caf7b599d
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/filelister.html
@@ -0,0 +1,42 @@
+<!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>
+  <title>FileLister demo</title>
+  <script src="filelister.js" type="text/javascript" charset="utf-8"></script>
+  <script src="base64.js" type="text/javascript" charset="utf-8"></script>
+  <script src="bytearray.js" type="text/javascript" charset="utf-8"></script>
+  <script src="rawinflate.js" type="text/javascript" charset="utf-8"></script>
+  <script src="zip.js" type="text/javascript" charset="utf-8"></script>
+  <script type="text/javascript" charset="utf-8">
+function listFilesCallback(directories, files) {
+  for (var i in files) {
+    var e = document.createElement('p');
+    var t = document.createTextNode(files[i]);
+    var img = document.createElement('img');
+    img.src = getThumbUrl(files[i]);
+    e.appendChild(img);
+    e.appendChild(t);
+    document.body.appendChild(e);
+  }
+}
+function getThumbUrl(url) {
+  var data;
+  try {
+    var zip = new Zip(url);
+    data = zip.load('Thumbnails/thumbnail.png');
+  } catch (e) {
+    return e;
+  }
+  if (data) {
+      return 'data:;base64,' + Base64.toBase64(data);
+  }
+  return null;
+}
+function init() {
+  listFiles('kofficetests/', /\.od[tps]$/i, listFilesCallback);
+}
+  </script>
+</head>
+<body onload="init()">
+</body>
+</html>
diff --git a/apps/files_odfviewer/src/webodf/webodf/filelister.js b/apps/files_odfviewer/src/webodf/webodf/filelister.js
new file mode 100644
index 0000000000..08f6cd3cb0
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/filelister.js
@@ -0,0 +1,200 @@
+/**
+ * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
+ * @licstart
+ * The JavaScript code in this page is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU Affero General Public License
+ * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.  The code is distributed
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
+ *
+ * As additional permission under GNU AGPL version 3 section 7, you
+ * may distribute non-source (e.g., minimized or compacted) forms of
+ * that code without the copy of the GNU GPL normally required by
+ * section 4, provided you include this license notice and a URL
+ * through which recipients can access the Corresponding Source.
+ *
+ * As a special exception to the AGPL, any HTML file which merely makes function
+ * calls to this code, and for that purpose includes it by reference shall be
+ * deemed a separate work for copyright law purposes. In addition, the copyright
+ * holders of this code give you permission to combine this code with free
+ * software libraries that are released under the GNU LGPL. You may copy and
+ * distribute such a system following the terms of the GNU AGPL for this code
+ * and the LGPL for the libraries. If you modify this code, you may extend this
+ * exception to your version of the code, but you are not obligated to do so.
+ * If you do not wish to do so, delete this exception statement from your
+ * version.
+ *
+ * This license applies to this entire compilation.
+ * @licend
+ * @source: http://www.webodf.org/
+ * @source: http://gitorious.org/odfkit/webodf/
+ */
+/*global XMLHttpRequest*/
+/*jslint regexp: true*/
+/** asynchroneous function that lists all files **/
+function listFiles(startdir, filepattern, fileCallback, doneCallback) {
+    "use strict";
+
+    var todoList = [],
+        doneList = [],
+        dirpattern = /\/$/,
+        hasWEBDAV = false;
+
+    function getHref(responseElement) {
+        var n = responseElement.firstChild;
+        while (n && !(n.namespaceURI === 'DAV:' && n.localName === 'href')) {
+            n = n.nextSibling;
+        }
+        return n && n.firstChild && n.firstChild.nodeValue;
+    }
+
+    function isDirectory(responseElement) {
+        var n = responseElement.firstChild;
+        while (n &&
+                !(n.namespaceURI === 'DAV:' && n.localName === 'propstat')) {
+            n = n.nextSibling;
+        }
+        n = n && n.firstChild;
+        while (n &&
+                !(n.namespaceURI === 'DAV:' && n.localName === 'prop')) {
+            n = n.nextSibling;
+        }
+        n = n && n.firstChild;
+        while (n && !(n.namespaceURI === 'DAV:' &&
+                      n.localName === 'resourcetype')) {
+            n = n.nextSibling;
+        }
+        n = n && n.firstChild;
+        while (n &&
+                !(n.namespaceURI === 'DAV:' && n.localName === 'collection')) {
+            n = n.nextSibling;
+        }
+        return n;
+    }
+
+    function processWebDavResponse(xml) {
+        if (!xml) {
+            throw new Error('No proper XML response.');
+        }
+        
+        var refs = xml.getElementsByTagNameNS('DAV:', 'response'),
+            directories = [],
+            files = [],
+            i,
+            d,
+            href;
+        if (refs.length === 0) {
+            throw new Error('No proper XML response.');
+        }
+        for (i = 0; i < refs.length; i += 1) {
+            href = getHref(refs[i]);
+            if (isDirectory(refs[i])) {
+                directories.push(href);
+            } else if (filepattern.test(href)) {
+                files.push(href);
+            }
+        }
+        for (i = 0; i < directories.length; i += 1) {
+            d = directories[i];
+            if (doneList.indexOf(d) === -1 && todoList.indexOf(d) === -1) {
+                todoList.push(d);
+            }
+        }
+        fileCallback(directories, files);
+    }
+
+    function processIndexHtmlResponse(base, text) {
+        // use regex because index.html is usually not valid xml
+        var re = /href="([^\/\?"][^"]*)"/ig,
+            matches,
+            files = [],
+            directories = [],
+            name,
+            d,
+            i;
+        while ((matches = re.exec(text)) !== null) {
+            name = matches[1];
+            if (dirpattern.test(name)) {
+                directories.push(base + name);
+            } else if (filepattern.test(name)) {
+                files.push(base + name);
+            }
+        }
+        for (i = 0; i < directories.length; i += 1) {
+            d = directories[i];
+            if (doneList.indexOf(d) === -1 && todoList.indexOf(d) === -1) {
+                todoList.push(d);
+            }
+        }
+        fileCallback(directories, files);
+    }
+
+    function getNextFileListWithIndexHtml() {
+        var url = todoList.shift(),
+            req;
+        while (url && typeof url !== 'string') {
+            url = todoList.shift();
+        }
+        if (!url) {
+            if (doneCallback) {
+                doneCallback();
+            }
+            return;
+        }
+        req = new XMLHttpRequest();
+        req.open('GET', url, true);
+        req.onreadystatechange = function (evt) {
+            if (req.readyState !== 4) {
+                return;
+            }
+            if (req.status >= 200 && req.status < 300) {
+                processIndexHtmlResponse(url, req.responseText);
+            }
+            getNextFileListWithIndexHtml();
+        };
+        req.send(null);
+
+        doneList.push(url);
+    }
+
+    function getNextFileListWithWebDav() {
+        var url = todoList.shift(),
+            req;
+        if (!url) {
+            if (doneCallback) {
+                doneCallback();
+            }
+            return;
+        }
+
+        req = new XMLHttpRequest();
+        req.open('PROPFIND', url, true);
+        req.onreadystatechange = function (evt) {
+            if (req.readyState !== 4) {
+                return;
+            }
+            if (req.status >= 200 && req.status < 300) {
+                try {
+                    processWebDavResponse(req.responseXML);
+                    hasWEBDAV = true;
+                } catch (e) {
+                }
+            }
+            if (hasWEBDAV) {
+                getNextFileListWithWebDav();
+            } else {
+                todoList.push(url);
+                doneList = [];
+                getNextFileListWithIndexHtml();
+            }
+        };
+        req.setRequestHeader('Depth', '1');
+        req.send(null);
+
+        doneList.push(url);
+    }
+
+    todoList.push(startdir);
+    getNextFileListWithWebDav();
+}
diff --git a/apps/files_odfviewer/src/webodf/webodf/flashput/Makefile b/apps/files_odfviewer/src/webodf/webodf/flashput/Makefile
new file mode 100644
index 0000000000..291eef04b6
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/flashput/Makefile
@@ -0,0 +1,2 @@
+all:
+	/tmp/flex/bin/mxmlc PUT.as
diff --git a/apps/files_odfviewer/src/webodf/webodf/flashput/PUT.as b/apps/files_odfviewer/src/webodf/webodf/flashput/PUT.as
new file mode 100644
index 0000000000..451d8a0fd0
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/flashput/PUT.as
@@ -0,0 +1,18 @@
+package {
+	import flash.display.Sprite;
+	import flash.display.LoaderInfo;
+	import flash.external.ExternalInterface;
+	public class PUT extends Sprite {
+		public function PUT() {
+			ExternalInterface.addCallback("put", this.put);
+			var callback:String = LoaderInfo(root.loaderInfo).parameters["readyCallback"];
+			ExternalInterface.call(callback);
+		}
+		public function put(host:String, port:uint, path:String,
+				data:String, callbackFunctionName:String,
+                                callbackId:String):void {
+			new Request(host, port, path, data,
+					callbackFunctionName, callbackId);
+		}
+	}
+}
diff --git a/apps/files_odfviewer/src/webodf/webodf/flashput/PUT.swf b/apps/files_odfviewer/src/webodf/webodf/flashput/PUT.swf
new file mode 100644
index 0000000000000000000000000000000000000000..466d0a1316e109f0617b7f723b0929cbd03439ce
GIT binary patch
literal 18031
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
Cf~D;M

literal 0
HcmV?d00001

diff --git a/apps/files_odfviewer/src/webodf/webodf/flashput/Request.as b/apps/files_odfviewer/src/webodf/webodf/flashput/Request.as
new file mode 100644
index 0000000000..3217dde25d
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/flashput/Request.as
@@ -0,0 +1,83 @@
+package {
+	import flash.events.*;
+	import flash.external.ExternalInterface;
+	import flash.net.Socket;
+	import flash.utils.ByteArray;
+	import mx.utils.Base64Decoder;
+	import mx.utils.Base64Encoder;
+	internal class Request {
+		private var id:String;
+		private var header:String;
+		private var data:ByteArray;
+		private var callbackName:String;
+		private var socket:Socket;
+		public function Request(host:String, port:uint, path:String,
+                                data:String, callbackName:String,
+                                callbackId:String) {
+			var atob:Base64Decoder = new Base64Decoder();
+			atob.decode(data);
+			this.data = atob.toByteArray();
+			this.header = 
+				"PUT " + path + " HTTP/1.1\r\n" +
+				"Host: " + host + "\r\n" +
+				"Content-Length: " + this.data.length + "\r\n" +
+				"\r\n";
+			this.callbackName = callbackName;
+			this.id = callbackId;
+			this.socket = new Socket();
+			this.socket.timeout = 1000;
+			this.socket.addEventListener(Event.CONNECT,
+					connectHandler);
+			this.socket.addEventListener(IOErrorEvent.IO_ERROR,
+					ioErrorHandler);
+			this.socket.addEventListener(
+					SecurityErrorEvent.SECURITY_ERROR,
+					securityErrorHandler);
+			this.socket.addEventListener(Event.CLOSE, closeHandler);
+			this.socket.addEventListener(ProgressEvent.SOCKET_DATA,
+					dataHandler); 
+			this.socket.connect(host, port);
+		}
+		private function connectHandler(connect:Event):void {
+			this.socket.writeBytes(toByteArray(this.header));
+			this.socket.writeBytes(this.data);
+			this.socket.flush();
+			this.header = null;
+			this.data.length = 0;
+		}
+		private function ioErrorHandler(ioError:IOErrorEvent):void {
+			ExternalInterface.call(this.callbackName, this.id,
+					null);
+			this.socket.close();
+		}
+		private function securityErrorHandler(
+				securityError:SecurityErrorEvent):void {
+			ExternalInterface.call(this.callbackName, this.id,
+					null);
+			this.socket.close();
+		}
+		private function closeHandler(close:Event):void {
+			ExternalInterface.call(this.callbackName, this.id,
+					null);
+		}
+		private function dataHandler(data:ProgressEvent):void {
+			// assume it went well, TODO: parse reply, handle error
+			this.socket.readBytes(this.data);
+			var btoa:Base64Encoder = new Base64Encoder();
+			btoa.encodeBytes(this.data);
+			ExternalInterface.call(this.callbackName, this.id,
+					btoa.toString());
+			this.data.length = 0;
+			this.socket.close();
+		}
+		public function toByteArray(str:String):ByteArray {
+			var length:uint = str.length;
+			var i:uint = 0;
+			var data:ByteArray = new ByteArray();
+			for (i; i < length; i++) {
+				data.writeByte(str.charCodeAt(i) & 0xff);
+			}
+			return data;
+		}
+	}
+}
diff --git a/apps/files_odfviewer/src/webodf/webodf/flashput/test.html b/apps/files_odfviewer/src/webodf/webodf/flashput/test.html
new file mode 100644
index 0000000000..349f7680ba
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/flashput/test.html
@@ -0,0 +1,96 @@
+<html>
+	<head>
+		<title>hi</title>
+	</head>
+	<body onload="init()">
+		<script type="text/javascript">//<![CDATA[
+/**
+ * @constuctor
+ */
+function FlashPut(host, port, domelement) {
+    if (port <= 0) {
+        return;
+    }
+    var flashput = this,
+        ready = false,
+        id = "FlashPut" + String(Math.random()).substring(2),
+        jobnumber = 0,
+        queue = [],
+        runningCalls = {},
+        doc = domelement.ownerDocument,
+        flash = doc.createElement("object"),
+        param = doc.createElement("param");
+    flash.setAttribute("data", "PUT.swf");
+    flash.setAttribute("type", "application/x-shockwave-flash");
+    flash.setAttribute("width", "1");
+    flash.setAttribute("height", "1");
+    param.setAttribute("name", "allowNetworking");
+    param.setAttribute("value", "all");
+    flash.appendChild(param);
+    param = doc.createElement("param");
+    param.setAttribute("name", "allowScriptAccess");
+    param.setAttribute("value", "always");
+    flash.appendChild(param);
+    param.setAttribute("name", "FlashVars");
+    param.setAttribute("value", "readyCallback=" + id);
+    flash.appendChild(param);
+    domelement.appendChild(flash);
+
+    // function to be called when flash movie is ready
+    window[id] = function () {
+        window[id] = undefined;
+        ready = true;
+        var i, a;
+        for (i = 0; i < queue.length; i += 1) {
+            a = queue[i];
+            put(a[0], a[1], a[2]);
+        }
+        queue = undefined;
+    };
+    function put(path, data, callback) {
+        var id = Math.random();
+        runningCalls[id] = callback;
+        flash.put(host, port, path, data, "FlashPut.putCallback", id);
+    }
+    this.put = function (path, data, callback) {
+        if (!ready) {
+            queue.push([path, data, callback]);
+        } else {
+            put(path, data, callback);
+        }
+    }
+    FlashPut.putCallback = function (id, result) {
+        if (id in runningCalls) {
+            runningCalls[id](result);
+            runningCalls.remove(id);
+        } else {
+            console.log("running put call " + id + " was not found.");
+        }
+    }
+};
+
+function testFlash() {
+    var i, l = 1000000, str = "", now = new Date();
+    for (i = 0; i < l; i += 1) {
+        str += String.fromCharCode(i & 0xff);
+    }
+    now = new Date();
+    str = window.btoa(str);
+    flashput.put("/zz", str, function (result) {
+        alert("'" + result + "' " + now.toString() + " " + (new Date()).toString());
+	var z = "hmm";
+        try {
+            z = window.atob(result);
+        } catch (e) {
+        }
+        alert(z + " " + now.toString() + " " + (new Date()).toString());
+    });
+}
+var flashput;
+function init() {
+    flashput = new FlashPut("", 8123, document.body);
+    testFlash();
+}
+//]]>		</script>
+	</body>
+</html>
diff --git a/apps/files_odfviewer/src/webodf/webodf/gui.js b/apps/files_odfviewer/src/webodf/webodf/gui.js
new file mode 100644
index 0000000000..5fce22f51e
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/gui.js
@@ -0,0 +1,263 @@
+/**
+ * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
+ * @licstart
+ * The JavaScript code in this page is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU Affero General Public License
+ * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.  The code is distributed
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
+ *
+ * As additional permission under GNU AGPL version 3 section 7, you
+ * may distribute non-source (e.g., minimized or compacted) forms of
+ * that code without the copy of the GNU GPL normally required by
+ * section 4, provided you include this license notice and a URL
+ * through which recipients can access the Corresponding Source.
+ *
+ * As a special exception to the AGPL, any HTML file which merely makes function
+ * calls to this code, and for that purpose includes it by reference shall be
+ * deemed a separate work for copyright law purposes. In addition, the copyright
+ * holders of this code give you permission to combine this code with free
+ * software libraries that are released under the GNU LGPL. You may copy and
+ * distribute such a system following the terms of the GNU AGPL for this code
+ * and the LGPL for the libraries. If you modify this code, you may extend this
+ * exception to your version of the code, but you are not obligated to do so.
+ * If you do not wish to do so, delete this exception statement from your
+ * version.
+ *
+ * This license applies to this entire compilation.
+ * @licend
+ * @source: http://www.webodf.org/
+ * @source: http://gitorious.org/odfkit/webodf/
+ */
+/*global Ext:true, runtime:true, core:true, listFiles:true*/
+runtime.loadClass("core.Zip");
+runtime.loadClass("core.Base64");
+
+/**
+ * @param {Ext.data.Model} node
+ * @return {undefined}
+ */
+function addThumbnail(node) {
+    "use strict";
+    var url = node.get('id'), zip;
+/*
+    zip = new core.Zip(url, function (err, zipobject) {
+        zip = zipobject;
+        if (err) {
+            return;
+        }
+        zip.load('Thumbnails/thumbnail.png', function (err, data) {
+            if (data === null) {
+                return;
+            }
+            var url = 'data:;base64,' +
+                    (new core.Base64()).convertUTF8ArrayToBase64(data),
+                el, spans, i, s;
+            el = node.getUI().getEl();
+            if (el) {
+                spans = el.getElementsByTagName('span');
+                for (i = 0; i < spans.length; i += 1) {
+                    s = spans.item(i);
+                    if (s.getAttribute('qtip')) {
+                        s.setAttribute('qtip', node.attributes.qtip);
+                    }
+                }
+            } else {
+                node.attributes.qtip += '<br/><img src="' + url + '"/>';
+            }
+        });
+    });
+*/
+}
+
+/**
+ * @param {!string} url
+ * @param {!Ext.tab.Panel} panel
+ * @param {!string} title
+ * @return {undefined}
+ */
+function loadODF(url, panel, title) {
+    "use strict";
+    var tab = panel.items.findBy(function (item) {
+            return item.url === url;
+        }),
+        newTab;
+    if (tab) {
+        panel.setActiveTab(tab);
+        return;
+    }
+    newTab = Ext.create('Ext.container.Container', {
+        title: title,
+        tabTip: url,
+        url: url,
+        closable: true,
+        autoEl: {
+            tag: 'iframe',
+            name: url,
+            src: 'odf.html#' + url,
+            frameBorder: 0,
+            style: {
+                border: '0 none'
+            }
+        },
+        region: 'center'
+    });
+    panel.add(newTab);
+    panel.setActiveTab(newTab);
+}
+
+Ext.onReady(function () {
+    "use strict";
+    var editButton, tabpanel, slider, tree, viewport;
+
+    Ext.QuickTips.init();
+
+    /**
+     * @param {!Ext.Button} button
+     * @param {!boolean} pressed
+     * @return {undefined}
+     */
+    function editToggle(button, pressed) {
+        var tab = tabpanel.getActiveTab(), o, odfcanvas = "odfcanvas";
+        if (!tab) {
+            return;
+        }
+        tab.el.dom.contentDocument[odfcanvas].setEditable(pressed);
+    }
+
+    /**
+     * @param {!Object} slider
+     * @param {!number} zoomlevel
+     * @param {!Object} thumb
+     * @return {undefined}
+     */
+    function setZoom(slider, zoomlevel, thumb) {
+        var tab = tabpanel.getActiveTab(),
+            body;
+        if (!tab) {
+            return;
+        }
+        body = tab.el.dom.contentDocument.body;
+        zoomlevel = Math.pow(10, zoomlevel / 10.0);
+        body.style.zoom = zoomlevel;
+        body.style.MozTransform = 'scale(' + zoomlevel + ')';
+    }
+
+    /**
+     * @param {!Ext.data.NodeInterface} root
+     * @param {!string} uri
+     * @return {!Ext.data.NodeInterface}
+     */
+    function getParentNode(root, uri) {
+        var parts = uri.split('/'),
+            node = root,
+            id = parts[0],
+            i,
+            n;
+        for (i = 1; i < parts.length - 1; i += 1) {
+            n = node.findChild('text', parts[i], false);
+            id += '/' + parts[i];
+            if (!n) {
+                n = {
+                    id: id,
+                    text: parts[i],
+                    qtip: uri,
+                    cls: 'folder'
+                };
+                n = node.appendChild(n);
+            }
+            node = n;
+        }
+        return node;
+    }
+
+    /**
+     * @param {!Array.<!string>} directories
+     * @param {!Array.<!string>} files
+     * @return {undefined}
+     */
+    function listFilesCallback(directories, files) {
+        var root = tree.getRootNode(),
+            i,
+            f,
+            parentNode,
+            qtip,
+            node;
+        for (i = 0; i < files.length; i += 1) {
+            f = files[i];
+            parentNode = getParentNode(root, f);
+            qtip = f;
+            node = parentNode.appendChild({
+                id: f,
+                qtip: qtip,
+                text: f.substr(f.lastIndexOf('/') + 1),
+                cls: 'file',
+                leaf: true,
+                editable: false
+            });
+            f = /**@type{!Ext.data.Model}*/(node);
+            addThumbnail(f);
+        }
+    }
+
+    /**
+     * @return {undefined}
+     */
+    function listFilesDoneCallback() {
+    }
+
+    editButton = new Ext.Button({
+        enableToggle: true,
+        text: 'Editable',
+        listeners: { toggle: { fn: editToggle } }
+    });
+
+    slider = new Ext.Slider({
+        width: 300,
+        minValue: -5,
+        maxValue: 5,
+        values: [0],
+        listeners: { changecomplete: { fn: setZoom } }
+    });
+
+    tabpanel = Ext.create('Ext.tab.Panel', {
+        tbar: [ 'Zoom: ', slider, editButton ],
+        region: 'center'
+    });
+
+    tree = Ext.create('Ext.tree.Panel', {
+        title: 'Documents',
+        region: 'west',
+        width: 200,
+        split: true,
+        autoScroll: true,
+        collapsible: true,
+        rootVisible: false,
+        enableTabScroll: true,
+        defaults: {autoScroll: true},
+        listeners: {
+            itemclick: function (view, rec) {
+                if (rec.get('cls') === 'file') {
+                    loadODF(rec.get('id'), tabpanel, rec.get('text'));
+                } else if (rec.get('cls') === 'folder') {
+                    if (rec.isExpanded()) {
+                        rec.collapse();
+                    } else {
+                        rec.expand();
+                    }
+                }
+            }
+        },
+        root: { nodeType: 'node' }
+    });
+
+    viewport = new Ext.Viewport({
+        layout: 'border',
+        items: [ tabpanel, tree ]
+    });
+
+    // put data in the tree
+    listFiles('./demodocs/', /\.od[tps]$/i, listFilesCallback,
+            listFilesDoneCallback);
+});
diff --git a/apps/files_odfviewer/src/webodf/webodf/httpserver.js b/apps/files_odfviewer/src/webodf/webodf/httpserver.js
new file mode 100644
index 0000000000..245ce9f3f7
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/httpserver.js
@@ -0,0 +1,213 @@
+/**
+ * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
+ * @licstart
+ * The JavaScript code in this page is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU Affero General Public License
+ * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.  The code is distributed
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
+ *
+ * As additional permission under GNU AGPL version 3 section 7, you
+ * may distribute non-source (e.g., minimized or compacted) forms of
+ * that code without the copy of the GNU GPL normally required by
+ * section 4, provided you include this license notice and a URL
+ * through which recipients can access the Corresponding Source.
+ *
+ * As a special exception to the AGPL, any HTML file which merely makes function
+ * calls to this code, and for that purpose includes it by reference shall be
+ * deemed a separate work for copyright law purposes. In addition, the copyright
+ * holders of this code give you permission to combine this code with free
+ * software libraries that are released under the GNU LGPL. You may copy and
+ * distribute such a system following the terms of the GNU AGPL for this code
+ * and the LGPL for the libraries. If you modify this code, you may extend this
+ * exception to your version of the code, but you are not obligated to do so.
+ * If you do not wish to do so, delete this exception statement from your
+ * version.
+ *
+ * This license applies to this entire compilation.
+ * @licend
+ * @source: http://www.webodf.org/
+ * @source: http://gitorious.org/odfkit/webodf/
+ */
+/*global require: true, console: true, process: true, Buffer: true,
+   unescape: true */
+/* A Node.JS http server*/
+var http = require("http"),
+    url = require("url"),
+    path = require("path"),
+    fs = require("fs"),
+    lookForIndexHtml = true,
+    ipaddress = "127.0.0.1",
+    //ipaddress = "192.168.1.105",
+    port = 8124;
+
+function statFile(dir, filelist, position, callback) {
+    "use strict";
+    if (position >= filelist.length) {
+        return callback(null, filelist);
+    }
+    fs.stat(dir + "/" + filelist[position], function (err, stats) {
+        if (stats && stats.isDirectory()) {
+            filelist[position] = filelist[position] + "/";
+        }
+        statFile(dir, filelist, position + 1, callback);
+    });
+}
+
+function listFiles(dir, callback) {
+    "use strict";
+    fs.readdir(dir, function (err, files) {
+        if (err) {
+            return callback(err);
+        }
+        statFile(dir, files, 0, callback);
+    });
+}
+
+http.createServer(function (request, response) {
+    "use strict";
+    var uri = unescape(url.parse(request.url).pathname),
+        filename = path.join(process.cwd(), uri);
+    if (uri !== '/favicon.ico') {
+        console.log(request.method + " " + uri);
+    }
+    function put() {
+        var contentlength = parseInt(request.headers["content-length"], 10),
+            alldata = new Buffer(contentlength),
+            sum = 0;
+        request.on("data", function (data) {
+            data.copy(alldata, sum, 0);
+            sum += data.length;
+        });
+        request.on("end", function () {
+            fs.writeFile(filename, alldata, "binary", function (err) {
+                if (err) {
+                    response.writeHead(500);
+                    response.write(err);
+                } else {
+                    response.writeHead(200);
+                }
+                response.end();
+            });
+        });
+    }
+    if (request.method === "PUT") {
+        put(request, response);
+        return;
+    }
+    if (request.method === "DELETE") {
+        fs.unlink(filename, function (err) {
+            if (err) {
+                response.writeHead(500);
+            } else {
+                response.writeHead(200);
+            }
+            response.end();
+        });
+        return;
+    }
+    function handleStat(err, stats, lookForIndexHtml) {
+        if (!err && stats.isFile()) {
+            fs.readFile(filename, "binary", function (err, file) {
+                if (err) {
+                    response.writeHead(500, {"Content-Type": "text/plain"});
+                    if (request.method !== "HEAD") {
+                        response.write(err + "\n");
+                    }
+                    response.end();
+                    return;
+                }
+                var head = {"Content-Length": stats.size};
+                if (filename.substr(-3) === ".js") {
+                    head["Content-Type"] = "text/javascript";
+                } else if (filename.substr(-4) === ".css") {
+                    head["Content-Type"] = "text/css";
+                } else if (filename.substr(-4) === ".odt" ||
+                        filename.substr(-5) === ".fodt") {
+                    head["Content-Type"] = "application/vnd.oasis.opendocument.text";
+                } else if (filename.substr(-4) === ".ods" ||
+                        filename.substr(-5) === ".fods") {
+                    head["Content-Type"] = "application/vnd.oasis.opendocument.presentation";
+                } else if (filename.substr(-4) === ".odp" ||
+                        filename.substr(-5) === ".fodp") {
+                    head["Content-Type"] = "application/vnd.oasis.opendocument.spreadsheet";
+                }
+                response.writeHead(200, head);
+                if (request.method !== "HEAD") {
+                    response.write(file, "binary");
+                }
+                response.end();
+            });
+        } else if (!err && stats.isDirectory()) {
+            if (lookForIndexHtml) {
+                fs.stat(filename + "/index.html", function (err, stats) {
+                    if (err) {
+                        fs.stat(filename, handleStat);
+                    } else {
+                        filename = filename + "/index.html";
+                        handleStat(err, stats);
+                    }
+                });
+                return;
+            }
+            if (uri.length === 0 || uri[uri.length - 1] !== "/") {
+                response.writeHead(301, {"Content-Type": "text/plain",
+                        "Location": uri + "/"});
+                if (request.method !== "HEAD") {
+                    response.write("Moved permanently\n");
+                }
+                response.end();
+                return;
+            }
+            listFiles(filename, function (err, files) {
+                if (err) {
+                    response.writeHead(500, {"Content-Type": "text/plain"});
+                    if (request.method !== "HEAD") {
+                        response.write(err + "\n");
+                    }
+                    response.end();
+                    return;
+                }
+                response.writeHead(200);
+                if (request.method !== "HEAD") {
+                    files.sort();
+                    response.write("<html><head><title></title></head><body>");
+                    response.write("<table>");
+                    var i, l = files.length, file;
+                    for (i = 0; i < l; i += 1) {
+                        file = files[i];
+                        if (file.length > 0 && file[file.length - 1] === '/') {
+                            file = encodeURIComponent(file.slice(0, file.length - 1)) + "/";
+                        } else {
+                            file = encodeURIComponent(file);
+                        }
+                        response.write("<tr><td><a href=\"");
+                        response.write(file);
+                        response.write("\">");
+                        file = files[i].replace("&", "&amp;")
+                                .replace("<", "&gt;");
+                        response.write(file.replace("\"", "\\\""));
+                        response.write("</a></td></tr>\n");
+                    }
+                    response.write("</table></body></html>\n");
+                }
+                response.end();
+            });
+        } else {
+            if (uri !== '/favicon.ico') {
+                console.log("Not found: " + uri);
+            }
+            response.writeHead(404, {"Content-Type": "text/plain"});
+            if (request.method !== "HEAD") {
+                response.write("404 Not Found\n");
+            }
+            response.end();
+        }
+    }
+    fs.stat(filename, function (err, stats) {
+        handleStat(err, stats, lookForIndexHtml);
+    });
+}).listen(port, ipaddress);
+
+console.log('Server running at ' + ipaddress + ':' + port + '/');
diff --git a/apps/files_odfviewer/src/webodf/webodf/index.html b/apps/files_odfviewer/src/webodf/webodf/index.html
new file mode 100644
index 0000000000..027a8a9b23
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/index.html
@@ -0,0 +1,17 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
+<html xml:lang="en" lang="en">
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8"></meta>
+  <link rel="stylesheet" type="text/css" href="extjs/resources/css/ext-all.css"/>
+  <!-- requirements -->
+  <script src="extjs/ext-all.js" type="text/javascript" charset="utf-8"></script>
+  <script src="lib/runtime.js" type="text/javascript" charset="utf-8"></script>
+  <script src="filelister.js" type="text/javascript" charset="utf-8"></script>
+  <!-- application -->
+  <script src="gui.js" type="text/javascript" charset="utf-8"></script>
+ 
+  <title id="page-title">WebODF</title>
+</head>
+<body>
+</body>
+</html>
diff --git a/apps/files_odfviewer/src/webodf/webodf/lib/core/Async.js b/apps/files_odfviewer/src/webodf/webodf/lib/core/Async.js
new file mode 100644
index 0000000000..358a8feee0
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/lib/core/Async.js
@@ -0,0 +1,65 @@
+/**
+ * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
+ * @licstart
+ * The JavaScript code in this page is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU Affero General Public License
+ * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.  The code is distributed
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
+ *
+ * As additional permission under GNU AGPL version 3 section 7, you
+ * may distribute non-source (e.g., minimized or compacted) forms of
+ * that code without the copy of the GNU GPL normally required by
+ * section 4, provided you include this license notice and a URL
+ * through which recipients can access the Corresponding Source.
+ *
+ * As a special exception to the AGPL, any HTML file which merely makes function
+ * calls to this code, and for that purpose includes it by reference shall be
+ * deemed a separate work for copyright law purposes. In addition, the copyright
+ * holders of this code give you permission to combine this code with free
+ * software libraries that are released under the GNU LGPL. You may copy and
+ * distribute such a system following the terms of the GNU AGPL for this code
+ * and the LGPL for the libraries. If you modify this code, you may extend this
+ * exception to your version of the code, but you are not obligated to do so.
+ * If you do not wish to do so, delete this exception statement from your
+ * version.
+ *
+ * This license applies to this entire compilation.
+ * @licend
+ * @source: http://www.webodf.org/
+ * @source: http://gitorious.org/odfkit/webodf/
+ */
+/*global core*/
+
+/**
+ * @constructor
+ */
+core.Async = function Async() {
+    "use strict";
+    /**
+     * @param {!Array.<*>} items
+     * @param {function(*, !function(!string):undefined):undefined} f
+     * @param {function(?string)} callback
+     * @return {undefined}
+     */
+    this.forEach = function (items, f, callback) {
+        var i, l = items.length, itemsDone = 0;
+        function end(err) {
+            if (itemsDone !== l) {
+                if (err) {
+                    itemsDone = l;
+                    callback(err);
+                } else {
+                    itemsDone += 1;
+                    if (itemsDone === l) {
+                        callback(null);
+                    }
+                }
+            }
+        }
+        for (i = 0; i < l; i += 1) {
+            f(items[i], end);
+        }
+    };
+};
diff --git a/apps/files_odfviewer/src/webodf/webodf/lib/core/Base64.js b/apps/files_odfviewer/src/webodf/webodf/lib/core/Base64.js
new file mode 100644
index 0000000000..736f5bb531
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/lib/core/Base64.js
@@ -0,0 +1,362 @@
+/**
+ * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
+ * @licstart
+ * The JavaScript code in this page is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU Affero General Public License
+ * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.  The code is distributed
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
+ *
+ * As additional permission under GNU AGPL version 3 section 7, you
+ * may distribute non-source (e.g., minimized or compacted) forms of
+ * that code without the copy of the GNU GPL normally required by
+ * section 4, provided you include this license notice and a URL
+ * through which recipients can access the Corresponding Source.
+ *
+ * As a special exception to the AGPL, any HTML file which merely makes function
+ * calls to this code, and for that purpose includes it by reference shall be
+ * deemed a separate work for copyright law purposes. In addition, the copyright
+ * holders of this code give you permission to combine this code with free
+ * software libraries that are released under the GNU LGPL. You may copy and
+ * distribute such a system following the terms of the GNU AGPL for this code
+ * and the LGPL for the libraries. If you modify this code, you may extend this
+ * exception to your version of the code, but you are not obligated to do so.
+ * If you do not wish to do so, delete this exception statement from your
+ * version.
+ *
+ * This license applies to this entire compilation.
+ * @licend
+ * @source: http://www.webodf.org/
+ * @source: http://gitorious.org/odfkit/webodf/
+ */
+/*jslint bitwise: true, regexp: true*/
+/*global core: true, runtime: true*/
+/*
+ * $Id: base64.js,v 0.9 2009/03/01 20:51:18 dankogai Exp dankogai $
+ */
+/**
+ * @namespace
+ */
+core.Base64 = (function () {
+    "use strict";
+    var b64chars
+        = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/',
+
+        b64charcodes = (function () {
+            var a = [], i,
+                codeA = 'A'.charCodeAt(0),
+                codea = 'a'.charCodeAt(0),
+                code0 = '0'.charCodeAt(0);
+            for (i = 0; i < 26; i += 1) {
+                a.push(codeA + i);
+            }
+            for (i = 0; i < 26; i += 1) {
+                a.push(codea + i);
+            }
+            for (i = 0; i < 10; i += 1) {
+                a.push(code0 + i);
+            }
+            a.push('+'.charCodeAt(0));
+            a.push('/'.charCodeAt(0));
+            return a;
+        }()),
+
+        b64tab = (function (bin) {
+            var t = {}, i, l;
+            for (i = 0, l = bin.length; i < l; i += 1) {
+                t[bin.charAt(i)] = i;
+            }
+            return t;
+        }(b64chars)),
+        convertUTF16StringToBase64,
+        convertBase64ToUTF16String,
+        btoa, atob;
+
+    /**
+     * @param {!string} s
+     * @return {!Array}
+     */
+    function stringToArray(s) {
+        var a = [], i, l = s.length;
+        for (i = 0; i < l; i += 1) {
+            a[i] = s.charCodeAt(i) & 0xff;
+        }
+        return a;
+    }
+
+    function convertUTF8ArrayToBase64(bin) {
+        var n,
+            b64 = "",
+            i,
+            l = bin.length - 2;
+        for (i = 0; i < l; i += 3) {
+            n = (bin[i] << 16) | (bin[i + 1] << 8) | bin[i + 2];
+            b64 += b64chars[n >>> 18];
+            b64 += b64chars[(n >>> 12) & 63];
+            b64 += b64chars[(n >>>  6) & 63];
+            b64 += b64chars[n          & 63];
+        }
+        if (i === l + 1) { // 1 byte left
+            n = bin[i] << 4;
+            b64 += b64chars[n >>> 6];
+            b64 += b64chars[n & 63];
+            b64 += "==";
+        } else if (i === l) { // 2 bytes left
+            n = (bin[i] << 10) | (bin[i + 1] << 2);
+            b64 += b64chars[n >>> 12];
+            b64 += b64chars[(n >>> 6) & 63];
+            b64 += b64chars[n & 63];
+            b64 += "=";
+        }
+        return b64;
+    }
+
+    function convertBase64ToUTF8Array(b64) {
+        b64 = b64.replace(/[^A-Za-z0-9+\/]+/g, '');
+        var bin = [],
+            padlen = b64.length % 4,
+            i,
+            l = b64.length,
+            n;
+        for (i = 0; i < l; i += 4) {
+            n = ((b64tab[b64.charAt(i)]     || 0) << 18) |
+                ((b64tab[b64.charAt(i + 1)] || 0) << 12) |
+                ((b64tab[b64.charAt(i + 2)] || 0) <<  6) |
+                ((b64tab[b64.charAt(i + 3)] || 0));
+            bin.push(
+                (n >> 16),
+                ((n >>  8) & 0xff),
+                (n         & 0xff)
+            );
+        }
+        bin.length -= [0, 0, 2, 1][padlen];
+        return bin;
+    }
+
+    function convertUTF16ArrayToUTF8Array(uni) {
+        var bin = [], i, l = uni.length, n;
+        for (i = 0; i < l; i += 1) {
+            n = uni[i];
+            if (n < 0x80) {
+                bin.push(n);
+            } else if (n < 0x800) {
+                bin.push(
+                    0xc0 | (n >>>  6),
+                    0x80 | (n & 0x3f)
+                );
+            } else {
+                bin.push(
+                    0xe0 | ((n >>> 12) & 0x0f),
+                    0x80 | ((n >>>  6) & 0x3f),
+                    0x80 |  (n         & 0x3f)
+                );
+            }
+        }
+        return bin;
+    }
+
+    function convertUTF8ArrayToUTF16Array(bin) {
+        var uni = [], i, l = bin.length,
+            c0, c1, c2;
+        for (i = 0; i < l; i += 1) {
+            c0 = bin[i];
+            if (c0 < 0x80) {
+                uni.push(c0);
+            } else {
+                i += 1;
+                c1 = bin[i];
+                if (c0 < 0xe0) {
+                    uni.push(((c0 & 0x1f) << 6) | (c1 & 0x3f));
+                } else {
+                    i += 1;
+                    c2 = bin[i];
+                    uni.push(((c0 & 0x0f) << 12) | ((c1 & 0x3f) << 6) |
+                            (c2 & 0x3f)
+                        );
+                }
+            }
+        }
+        return uni;
+    }
+
+    function convertUTF8StringToBase64(bin) {
+        return convertUTF8ArrayToBase64(stringToArray(bin));
+    }
+
+    function convertBase64ToUTF8String(b64) {
+        return String.fromCharCode.apply(String, convertBase64ToUTF8Array(b64));
+    }
+
+    function convertUTF8StringToUTF16Array(bin) {
+        return convertUTF8ArrayToUTF16Array(stringToArray(bin));
+    }
+
+    function convertUTF8ArrayToUTF16String(bin) {
+        // this conversion is done in chunks to avoid a stack overflow in
+        // apply()
+        var b = convertUTF8ArrayToUTF16Array(bin),
+            r = "",
+            i = 0,
+            chunksize = 45000;
+        while (i < b.length) {
+            r += String.fromCharCode.apply(String, b.slice(i, i + chunksize));
+            i += chunksize;
+        }
+        return r;
+    }
+    /**
+     * @param {!Array.<number>|!string} bin
+     * @param {!number} i
+     * @param {!number} end
+     * @return {!string}
+     */
+    function convertUTF8StringToUTF16String_internal(bin, i, end) {
+        var str = "", c0, c1, c2, j;
+        for (j = i; j < end; j += 1) {
+            c0 = bin.charCodeAt(j) & 0xff;
+            if (c0 < 0x80) {
+                str += String.fromCharCode(c0);
+            } else {
+                j += 1;
+                c1 = bin.charCodeAt(j) & 0xff;
+                if (c0 < 0xe0) {
+                    str += String.fromCharCode(((c0 & 0x1f) << 6) |
+                        (c1 & 0x3f));
+                } else {
+                    j += 1;
+                    c2 = bin.charCodeAt(j) & 0xff;
+                    str += String.fromCharCode(((c0 & 0x0f) << 12) |
+                            ((c1 & 0x3f) << 6) | (c2 & 0x3f));
+                }
+            }
+        }
+        return str;
+    }
+
+    /**
+     * Convert a utf-8 array into a utf-16 string.
+     * The input array is treated as a list of values between 0 and 255.
+     * This function works with a callback and splits the work up in parts
+     * between which it yields to the main thread.
+     * After each part the progress is reported with the callback function that
+     * also passes a booleant that indicates if the job has finished.
+     * If the conversion should stop, the callback should return false.
+     *
+     * @param {!Array.<number>|!string} bin
+     * @param {!function(!string, boolean):boolean} callback
+     * @return {undefined}
+     */
+    function convertUTF8StringToUTF16String(bin, callback) {
+        var partsize = 100000,
+            numparts = bin.length / partsize,
+            str = "",
+            pos = 0;
+        if (bin.length < partsize) {
+            callback(convertUTF8StringToUTF16String_internal(bin, 0,
+                    bin.length), true);
+            return;
+        }
+        // make a local copy if the input is a string, to avoid modification
+        if (typeof bin !== "string") {
+            bin = bin.slice();
+        }
+        function f() {
+            var end = pos + partsize;
+            if (end > bin.length) {
+                end = bin.length;
+            }
+            str += convertUTF8StringToUTF16String_internal(bin, pos, end);
+            pos = end;
+            end = pos === bin.length;
+            if (callback(str, end) && !end) {
+                runtime.setTimeout(f, 0);
+            }
+        }
+        f();
+    }
+
+    function convertUTF16StringToUTF8Array(uni) {
+        return convertUTF16ArrayToUTF8Array(stringToArray(uni));
+    }
+
+    function convertUTF16ArrayToUTF8String(uni) {
+        return String.fromCharCode.apply(String,
+                 convertUTF16ArrayToUTF8Array(uni));
+    }
+
+    function convertUTF16StringToUTF8String(uni) {
+        return String.fromCharCode.apply(String,
+                 convertUTF16ArrayToUTF8Array(stringToArray(uni)));
+    }
+
+    btoa = runtime.getWindow() && runtime.getWindow().btoa;
+    if (btoa) {
+        convertUTF16StringToBase64 = function (uni) {
+            return btoa(convertUTF16StringToUTF8String(uni));
+        };
+    } else {
+        btoa = convertUTF8StringToBase64;
+        convertUTF16StringToBase64 = function (uni) {
+            return convertUTF8ArrayToBase64(convertUTF16StringToUTF8Array(uni));
+        };
+    }
+    atob = runtime.getWindow() && runtime.getWindow().atob;
+    if (atob) {
+        convertBase64ToUTF16String = function (b64) {
+            var b = atob(b64);
+            return convertUTF8StringToUTF16String_internal(b, 0, b.length);
+        };
+    } else {
+        atob = convertBase64ToUTF8String;
+        convertBase64ToUTF16String = function (b64) {
+            return convertUTF8ArrayToUTF16String(convertBase64ToUTF8Array(b64));
+        };
+    }
+
+    /**
+     * @constructor
+     */
+    function Base64() {
+        this.convertUTF8ArrayToBase64 = convertUTF8ArrayToBase64;
+        this.convertByteArrayToBase64 = convertUTF8ArrayToBase64;
+        this.convertBase64ToUTF8Array = convertBase64ToUTF8Array;
+        this.convertBase64ToByteArray = convertBase64ToUTF8Array;
+        this.convertUTF16ArrayToUTF8Array = convertUTF16ArrayToUTF8Array;
+        this.convertUTF16ArrayToByteArray = convertUTF16ArrayToUTF8Array;
+        this.convertUTF8ArrayToUTF16Array = convertUTF8ArrayToUTF16Array;
+        this.convertByteArrayToUTF16Array = convertUTF8ArrayToUTF16Array;
+        this.convertUTF8StringToBase64 = convertUTF8StringToBase64;
+        this.convertBase64ToUTF8String = convertBase64ToUTF8String;
+        this.convertUTF8StringToUTF16Array = convertUTF8StringToUTF16Array;
+        this.convertUTF8ArrayToUTF16String = convertUTF8ArrayToUTF16String;
+        this.convertByteArrayToUTF16String = convertUTF8ArrayToUTF16String;
+        this.convertUTF8StringToUTF16String = convertUTF8StringToUTF16String;
+        this.convertUTF16StringToUTF8Array = convertUTF16StringToUTF8Array;
+        this.convertUTF16StringToByteArray = convertUTF16StringToUTF8Array;
+        this.convertUTF16ArrayToUTF8String = convertUTF16ArrayToUTF8String;
+        this.convertUTF16StringToUTF8String = convertUTF16StringToUTF8String;
+        this.convertUTF16StringToBase64 = convertUTF16StringToBase64;
+        this.convertBase64ToUTF16String = convertBase64ToUTF16String;
+        this.fromBase64 = convertBase64ToUTF8String;
+        this.toBase64 = convertUTF8StringToBase64;
+        this.atob = atob;
+        this.btoa = btoa;
+        this.utob = convertUTF16StringToUTF8String;
+        this.btou = convertUTF8StringToUTF16String;
+        this.encode = convertUTF16StringToBase64;
+        this.encodeURI = function (u) {
+            return convertUTF16StringToBase64(u).replace(/[+\/]/g,
+                    function (m0) {
+                    return m0 === '+' ? '-' : '_';
+                }).replace(/\\=+$/, '');
+        };
+        this.decode = function (a) {
+            return convertBase64ToUTF16String(a.replace(/[\-_]/g,
+                function (m0) {
+                    return m0 === '-' ? '+' : '/';
+                }));
+        };
+    }
+    return Base64;
+}());
diff --git a/apps/files_odfviewer/src/webodf/webodf/lib/core/ByteArray.js b/apps/files_odfviewer/src/webodf/webodf/lib/core/ByteArray.js
new file mode 100644
index 0000000000..d8a9ddd73d
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/lib/core/ByteArray.js
@@ -0,0 +1,68 @@
+/**
+ * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
+ * @licstart
+ * The JavaScript code in this page is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU Affero General Public License
+ * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.  The code is distributed
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
+ *
+ * As additional permission under GNU AGPL version 3 section 7, you
+ * may distribute non-source (e.g., minimized or compacted) forms of
+ * that code without the copy of the GNU GPL normally required by
+ * section 4, provided you include this license notice and a URL
+ * through which recipients can access the Corresponding Source.
+ *
+ * As a special exception to the AGPL, any HTML file which merely makes function
+ * calls to this code, and for that purpose includes it by reference shall be
+ * deemed a separate work for copyright law purposes. In addition, the copyright
+ * holders of this code give you permission to combine this code with free
+ * software libraries that are released under the GNU LGPL. You may copy and
+ * distribute such a system following the terms of the GNU AGPL for this code
+ * and the LGPL for the libraries. If you modify this code, you may extend this
+ * exception to your version of the code, but you are not obligated to do so.
+ * If you do not wish to do so, delete this exception statement from your
+ * version.
+ *
+ * This license applies to this entire compilation.
+ * @licend
+ * @source: http://www.webodf.org/
+ * @source: http://gitorious.org/odfkit/webodf/
+ */
+/*global core*/
+/*jslint plusplus: true, bitwise: true */
+/**
+ * @constructor
+ * @param {!Runtime.ByteArray} data
+ */
+core.ByteArray = function ByteArray(data) {
+    "use strict";
+    /**
+     * @type {!number}
+     */
+    this.pos = 0;
+    /**
+     * @type {!Runtime.ByteArray}
+     */
+    this.data = data;
+    /**
+     * @return {number}
+     */
+    this.readUInt32LE = function () {
+        var data = this.data,
+            pos = (this.pos += 4);
+        return (data[--pos] << 24) |
+            (data[--pos] << 16) |
+            (data[--pos] <<  8) |
+            data[--pos];
+    };
+    /**
+     * @return {number}
+     */
+    this.readUInt16LE = function () {
+        var data = this.data,
+            pos = (this.pos += 2);
+        return (data[--pos] << 8) | data[--pos];
+    };
+};
diff --git a/apps/files_odfviewer/src/webodf/webodf/lib/core/ByteArrayWriter.js b/apps/files_odfviewer/src/webodf/webodf/lib/core/ByteArrayWriter.js
new file mode 100644
index 0000000000..a7838be3dc
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/lib/core/ByteArrayWriter.js
@@ -0,0 +1,101 @@
+/**
+ * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
+ * @licstart
+ * The JavaScript code in this page is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU Affero General Public License
+ * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.  The code is distributed
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
+ *
+ * As additional permission under GNU AGPL version 3 section 7, you
+ * may distribute non-source (e.g., minimized or compacted) forms of
+ * that code without the copy of the GNU GPL normally required by
+ * section 4, provided you include this license notice and a URL
+ * through which recipients can access the Corresponding Source.
+ *
+ * As a special exception to the AGPL, any HTML file which merely makes function
+ * calls to this code, and for that purpose includes it by reference shall be
+ * deemed a separate work for copyright law purposes. In addition, the copyright
+ * holders of this code give you permission to combine this code with free
+ * software libraries that are released under the GNU LGPL. You may copy and
+ * distribute such a system following the terms of the GNU AGPL for this code
+ * and the LGPL for the libraries. If you modify this code, you may extend this
+ * exception to your version of the code, but you are not obligated to do so.
+ * If you do not wish to do so, delete this exception statement from your
+ * version.
+ *
+ * This license applies to this entire compilation.
+ * @licend
+ * @source: http://www.webodf.org/
+ * @source: http://gitorious.org/odfkit/webodf/
+ */
+/*global runtime: true, core: true*/
+/*jslint bitwise: true */
+/**
+ * @constructor
+ * @param {!string} encoding
+ */
+core.ByteArrayWriter = function ByteArrayWriter(encoding) {
+    "use strict";
+    var self = this,
+        data = new runtime.ByteArray(0);
+
+    /**
+     * @param {!core.ByteArrayWriter} writer
+     * @return {undefined}
+     */
+    this.appendByteArrayWriter = function (writer) {
+        data = runtime.concatByteArrays(data, writer.getByteArray());
+    };
+    /**
+     * @param {!Runtime.ByteArray} array
+     * @return {undefined}
+     */
+    this.appendByteArray = function (array) {
+        data = runtime.concatByteArrays(data, array);
+    };
+    /**
+     * @param {!Array.<!number>} array
+     * @return {undefined}
+     */
+    this.appendArray = function (array) {
+        data = runtime.concatByteArrays(data,
+                runtime.byteArrayFromArray(array));
+    };
+    /**
+     * @param {!number} value
+     * @return {undefined}
+     */
+    this.appendUInt16LE = function (value) {
+        self.appendArray([value & 0xff, (value >> 8) & 0xff]);
+    };
+    /**
+     * @param {!number} value
+     * @return {undefined}
+     */
+    this.appendUInt32LE = function (value) {
+        self.appendArray([value & 0xff, (value >> 8) & 0xff,
+                (value >> 16) & 0xff, (value >> 24) & 0xff]);
+    };
+    /**
+     * @param {!string} string
+     * @return {undefined}
+     */
+    this.appendString = function (string) {
+        data = runtime.concatByteArrays(data,
+                runtime.byteArrayFromString(string, encoding));
+    };
+    /**
+     * @return {!number}
+     */
+    this.getLength = function () {
+        return data.length;
+    };
+    /**
+     * @return {!Runtime.ByteArray}
+     */
+    this.getByteArray = function () {
+        return data;
+    };
+};
diff --git a/apps/files_odfviewer/src/webodf/webodf/lib/core/Cursor.js b/apps/files_odfviewer/src/webodf/webodf/lib/core/Cursor.js
new file mode 100644
index 0000000000..d8f7965388
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/lib/core/Cursor.js
@@ -0,0 +1,213 @@
+/**
+ * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
+ * @licstart
+ * The JavaScript code in this page is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU Affero General Public License
+ * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.  The code is distributed
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
+ *
+ * As additional permission under GNU AGPL version 3 section 7, you
+ * may distribute non-source (e.g., minimized or compacted) forms of
+ * that code without the copy of the GNU GPL normally required by
+ * section 4, provided you include this license notice and a URL
+ * through which recipients can access the Corresponding Source.
+ *
+ * As a special exception to the AGPL, any HTML file which merely makes function
+ * calls to this code, and for that purpose includes it by reference shall be
+ * deemed a separate work for copyright law purposes. In addition, the copyright
+ * holders of this code give you permission to combine this code with free
+ * software libraries that are released under the GNU LGPL. You may copy and
+ * distribute such a system following the terms of the GNU AGPL for this code
+ * and the LGPL for the libraries. If you modify this code, you may extend this
+ * exception to your version of the code, but you are not obligated to do so.
+ * If you do not wish to do so, delete this exception statement from your
+ * version.
+ *
+ * This license applies to this entire compilation.
+ * @licend
+ * @source: http://www.webodf.org/
+ * @source: http://gitorious.org/odfkit/webodf/
+ */
+/*global core: true, Node: true*/
+/**
+ * @class
+ * A cursor is a dom node that visually represents a cursor in a DOM tree.
+ * It should stay synchronized with the selection in the document. When
+ * there is only one collapsed selection range, a cursor should be shown at
+ * that point.
+ *
+ * Putting the cursor in the DOM tree modifies the DOM, so care should be taken
+ * to keep the selection consistent. If e.g. a selection is drawn over the
+ * cursor, and the cursor is updated to the selection, the cursor is removed
+ * from the DOM because the selection is not collapsed. This means that the
+ * offsets of the selection may have to be changed.
+ *
+ * When the selection is collapsed, the cursor is placed after the point of the
+ * selection and the selection will stay valid. However, if the cursor was
+ * placed in the DOM tree and was counted in the offset, the offset in the
+ * selection should be decreased by one.
+ *
+ * Even when the selection allows for a cursor, it might be desireable to hide
+ * the cursor by not letting it be part of the DOM.
+ *
+ * @constructor
+ * @param {Selection} selection The selection to which the cursor corresponds
+ * @param {Document} document The document in which the cursor is placed
+ */
+core.Cursor = function Cursor(selection, document) {
+    "use strict";
+    var cursorns,
+        cursorNode;
+    cursorns = 'urn:webodf:names:cursor';
+    cursorNode = document.createElementNS(cursorns, 'cursor');
+
+    function putCursorIntoTextNode(container, offset) {
+        var len, ref, textnode, parent;
+        parent = container.parentNode;
+        if (offset === 0) {
+            parent.insertBefore(cursorNode, container);
+        } else if (offset === container.length) {
+            parent.appendChild(cursorNode);
+        } else {
+            len = container.length;
+            ref = container.nextSibling;
+            textnode = document.createTextNode(
+                container.substringData(offset, len)
+            );
+            container.deleteData(offset, len);
+            if (ref) {
+                parent.insertBefore(textnode, ref);
+            } else {
+                parent.appendChild(textnode);
+            }
+            parent.insertBefore(cursorNode, textnode);
+        }
+    }
+    function putCursorIntoContainer(container, offset) {
+        var node;
+        node = container.firstChild;
+        while (node && offset) {
+            node = node.nextSibling;
+            offset -= 1;
+        }
+        container.insertBefore(cursorNode, node);
+    }
+    function getPotentialParentOrNode(parent, node) {
+        var n = node;
+        while (n && n !== parent) {
+            n = n.parentNode;
+        }
+        return n || node;
+    }
+    function removeCursorFromSelectionRange(range, cursorpos) {
+        var cursorParent, start, end;
+        cursorParent = cursorNode.parentNode;
+        start = getPotentialParentOrNode(cursorNode, range.startContainer);
+        end = getPotentialParentOrNode(cursorNode, range.endContainer);
+        if (start === cursorNode) {
+            range.setStart(cursorParent, cursorpos);
+        } else if (start === cursorParent &&
+                range.startOffset > cursorpos) {
+            range.setStart(cursorParent, range.startOffset - 1);
+        }
+        if (range.endContainer === cursorNode) {
+            range.setEnd(cursorParent, cursorpos);
+        } else if (range.endContainer === cursorParent &&
+                range.endOffset > cursorpos) {
+            range.setEnd(cursorParent, range.endOffset - 1);
+        }
+    }
+    function adaptRangeToMergedText(range, prev, textnodetomerge, cursorpos) {
+        var diff = prev.length - textnodetomerge.length;
+        if (range.startContainer === textnodetomerge) {
+            range.setStart(prev, diff + range.startOffset);
+        } else if (range.startContainer === prev.parentNode &&
+                range.startOffset === cursorpos) {
+            range.setStart(prev, diff);
+        }
+        if (range.endContainer === textnodetomerge) {
+            range.setEnd(prev, diff + range.endOffset);
+        } else if (range.endContainer === prev.parentNode &&
+                range.endOffset === cursorpos) {
+            range.setEnd(prev, diff);
+        }
+    }
+    function removeCursor() {
+        // if the cursor is part of a selection, the selection must be adapted
+        var i, cursorpos, node, textnodetoremove, range;
+        // if the cursor has no parent, it is already not part of the document
+        // tree
+        if (!cursorNode.parentNode) {
+            return;
+        }
+        // find the position of the cursor in its parent
+        cursorpos = 0;
+        node = cursorNode.parentNode.firstChild;
+        while (node && node !== cursorNode) {
+            cursorpos += 1;
+            node = node.nextSibling;
+        }
+        // Check if removing the node will result in a merge of texts.
+        // This will happen if the cursor is between two text nodes.
+        // The text of the text node after the cursor is put in the text node
+        // before the cursor. The latter node is removed after the selection
+        // has been adapted.
+        if (cursorNode.previousSibling &&
+                cursorNode.previousSibling.nodeType === 3 && // TEXT_NODE
+                cursorNode.nextSibling &&
+                cursorNode.nextSibling.nodeType === 3) { // TEXT_NODE
+            textnodetoremove = cursorNode.nextSibling;
+            cursorNode.previousSibling.appendData(textnodetoremove.nodeValue);
+        }
+        // remove the node from the selections
+        for (i = 0; i < selection.rangeCount; i += 1) {
+            removeCursorFromSelectionRange(selection.getRangeAt(i), cursorpos);
+        }
+        // merge the texts that surround the cursor
+        if (textnodetoremove) {
+            for (i = 0; i < selection.rangeCount; i += 1) {
+                adaptRangeToMergedText(selection.getRangeAt(i),
+                       cursorNode.previousSibling, textnodetoremove, cursorpos);
+            }
+            textnodetoremove.parentNode.removeChild(textnodetoremove);
+        }
+        cursorNode.parentNode.removeChild(cursorNode);
+    }
+    // put the cursor at a particular position
+    function putCursor(container, offset) {
+        if (container.nodeType === 3) { // TEXT_NODE
+            putCursorIntoTextNode(container, offset);
+        } else if (container.nodeType !== 9) { // DOCUMENT_NODE
+            putCursorIntoContainer(container, offset);
+        }
+    }
+    /**
+     * Obtain the node representing the cursor.
+     * @return {Element}
+     */
+    this.getNode = function () {
+        return cursorNode;
+    };
+    /**
+     * Synchronize the cursor with the current selection.
+     * If there is a single collapsed selection range, the cursor will be placed
+     * there. If not, the cursor will be removed from the document tree.
+     * @return {undefined}
+     */
+    this.updateToSelection = function () {
+        var range;
+        removeCursor();
+        if (selection.focusNode) {
+            putCursor(selection.focusNode, selection.focusOffset);
+        }
+    };
+    /**
+     * Remove the cursor from the document tree.
+     * @return {undefined}
+     */
+    this.remove = function () {
+        removeCursor();
+    };
+};
diff --git a/apps/files_odfviewer/src/webodf/webodf/lib/core/JSLint.js b/apps/files_odfviewer/src/webodf/webodf/lib/core/JSLint.js
new file mode 100644
index 0000000000..b3e422ef59
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/lib/core/JSLint.js
@@ -0,0 +1,6403 @@
+// jslint.js
+// 2012-04-15
+
+// Copyright (c) 2002 Douglas Crockford  (www.JSLint.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 shall be used for Good, not Evil.
+
+// 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.
+
+// WARNING: JSLint will hurt your feelings.
+
+// JSLINT is a global function. It takes two parameters.
+
+//     var myResult = JSLINT(source, option);
+
+// The first parameter is either a string or an array of strings. If it is a
+// string, it will be split on '\n' or '\r'. If it is an array of strings, it
+// is assumed that each string represents one line. The source can be a
+// JavaScript text, or HTML text, or a JSON text, or a CSS text.
+
+// The second parameter is an optional object of options that control the
+// operation of JSLINT. Most of the options are booleans: They are all
+// optional and have a default value of false. One of the options, predef,
+// can be an array of names, which will be used to declare global variables,
+// or an object whose keys are used as global names, with a boolean value
+// that determines if they are assignable.
+
+// If it checks out, JSLINT returns true. Otherwise, it returns false.
+
+// If false, you can inspect JSLINT.errors to find out the problems.
+// JSLINT.errors is an array of objects containing these properties:
+
+//  {
+//      line      : The line (relative to 0) at which the lint was found
+//      character : The character (relative to 0) at which the lint was found
+//      reason    : The problem
+//      evidence  : The text line in which the problem occurred
+//      raw       : The raw message before the details were inserted
+//      a         : The first detail
+//      b         : The second detail
+//      c         : The third detail
+//      d         : The fourth detail
+//  }
+
+// If a stopping error was found, a null will be the last element of the
+// JSLINT.errors array. A stopping error means that JSLint was not confident
+// enough to continue. It does not necessarily mean that the error was
+// especially heinous.
+
+// You can request a Function Report, which shows all of the functions
+// and the parameters and vars that they use. This can be used to find
+// implied global variables and other problems. The report is in HTML and
+// can be inserted in an HTML <body>.
+
+//     var myReport = JSLINT.report(errors_only);
+
+// If errors_only is true, then the report will be limited to only errors.
+
+// You can request a data structure that contains JSLint's results.
+
+//     var myData = JSLINT.data();
+
+// It returns a structure with this form:
+
+//     {
+//         errors: [
+//             {
+//                 line: NUMBER,
+//                 character: NUMBER,
+//                 reason: STRING,
+//                 evidence: STRING
+//             }
+//         ],
+//         functions: [
+//             {
+//                 name: STRING,
+//                 line: NUMBER,
+//                 last: NUMBER,
+//                 params: [
+//                     {
+//                         string: STRING
+//                     }
+//                 ],
+//                 closure: [
+//                     STRING
+//                 ],
+//                 var: [
+//                     STRING
+//                 ],
+//                 exception: [
+//                     STRING
+//                 ],
+//                 outer: [
+//                     STRING
+//                 ],
+//                 unused: [
+//                     STRING
+//                 ],
+//                 undef: [
+//                     STRING
+//                 ],
+//                 global: [
+//                     STRING
+//                 ],
+//                 label: [
+//                     STRING
+//                 ]
+//             }
+//         ],
+//         globals: [
+//             STRING
+//         ],
+//         member: {
+//             STRING: NUMBER
+//         },
+//         urls: [
+//             STRING
+//         ],
+//         json: BOOLEAN
+//     }
+
+// Empty arrays will not be included.
+
+// You can obtain the parse tree that JSLint constructed while parsing. The
+// latest tree is kept in JSLINT.tree. A nice stringication can be produced
+// with
+
+//     JSON.stringify(JSLINT.tree, [
+//         'string',  'arity', 'name',  'first',
+//         'second', 'third', 'block', 'else'
+//     ], 4));
+
+// JSLint provides three directives. They look like slashstar comments, and
+// allow for setting options, declaring global variables, and establishing a
+// set of allowed property names.
+
+// These directives respect function scope.
+
+// The jslint directive is a special comment that can set one or more options.
+// The current option set is
+
+//     anon       true, if the space may be omitted in anonymous function declarations
+//     bitwise    true, if bitwise operators should be allowed
+//     browser    true, if the standard browser globals should be predefined
+//     cap        true, if upper case HTML should be allowed
+//     'continue' true, if the continuation statement should be tolerated
+//     css        true, if CSS workarounds should be tolerated
+//     debug      true, if debugger statements should be allowed
+//     devel      true, if logging should be allowed (console, alert, etc.)
+//     eqeq       true, if == should be allowed
+//     es5        true, if ES5 syntax should be allowed
+//     evil       true, if eval should be allowed
+//     forin      true, if for in statements need not filter
+//     fragment   true, if HTML fragments should be allowed
+//     indent     the indentation factor
+//     maxerr     the maximum number of errors to allow
+//     maxlen     the maximum length of a source line
+//     newcap     true, if constructor names capitalization is ignored
+//     node       true, if Node.js globals should be predefined
+//     nomen      true, if names may have dangling _
+//     on         true, if HTML event handlers should be allowed
+//     passfail   true, if the scan should stop on first error
+//     plusplus   true, if increment/decrement should be allowed
+//     properties true, if all property names must be declared with /*properties*/
+//     regexp     true, if the . should be allowed in regexp literals
+//     rhino      true, if the Rhino environment globals should be predefined
+//     undef      true, if variables can be declared out of order
+//     unparam    true, if unused parameters should be tolerated
+//     sloppy     true, if the 'use strict'; pragma is optional
+//     stupid     true, if really stupid practices are tolerated
+//     sub        true, if all forms of subscript notation are tolerated
+//     vars       true, if multiple var statements per function should be allowed
+//     white      true, if sloppy whitespace is tolerated
+//     widget     true  if the Yahoo Widgets globals should be predefined
+//     windows    true, if MS Windows-specific globals should be predefined
+
+// For example:
+
+/*jslint
+    evil: true, nomen: true, regexp: true
+*/
+
+// The properties directive declares an exclusive list of property names.
+// Any properties named in the program that are not in the list will
+// produce a warning.
+
+// For example:
+
+/*properties
+    '\b', '\t', '\n', '\f', '\r', '!', '!=', '!==', '"', '%', '\'',
+    '(arguments)', '(begin)', '(breakage)', '(context)', '(error)',
+    '(identifier)', '(line)', '(loopage)', '(name)', '(params)', '(scope)',
+    '(token)', '(vars)', '(verb)', '*', '+', '-', '/', '<', '<=', '==',
+    '===', '>', '>=', ADSAFE, Array, Date, Function, Object, '\\', a,
+    a_label, a_not_allowed, a_not_defined, a_scope, abbr, acronym, address,
+    adsafe, adsafe_a, adsafe_autocomplete, adsafe_bad_id, adsafe_div,
+    adsafe_fragment, adsafe_go, adsafe_html, adsafe_id, adsafe_id_go, adsafe_lib,
+    adsafe_lib_second, adsafe_missing_id, adsafe_name_a, adsafe_placement,
+    adsafe_prefix_a, adsafe_script, adsafe_source, adsafe_subscript_a,
+    adsafe_tag, all, already_defined, and, anon, applet, apply, approved, area,
+    arity, article, aside, assign, assign_exception,
+    assignment_function_expression, at, attribute_case_a, audio, autocomplete,
+    avoid_a, b, background, 'background-attachment', 'background-color',
+    'background-image', 'background-position', 'background-repeat',
+    bad_assignment, bad_color_a, bad_constructor, bad_entity, bad_html, bad_id_a,
+    bad_in_a, bad_invocation, bad_name_a, bad_new, bad_number, bad_operand,
+    bad_style, bad_type, bad_url_a, bad_wrap, base, bdo, big, bitwise, block,
+    blockquote, body, border, 'border-bottom', 'border-bottom-color',
+    'border-bottom-left-radius', 'border-bottom-right-radius',
+    'border-bottom-style', 'border-bottom-width', 'border-collapse',
+    'border-color', 'border-left', 'border-left-color', 'border-left-style',
+    'border-left-width', 'border-radius', 'border-right', 'border-right-color',
+    'border-right-style', 'border-right-width', 'border-spacing', 'border-style',
+    'border-top', 'border-top-color', 'border-top-left-radius',
+    'border-top-right-radius', 'border-top-style', 'border-top-width',
+    'border-width', bottom, br, braille, browser, button, c, call, canvas, cap,
+    caption, 'caption-side', center, charAt, charCodeAt, character, cite, clear,
+    clip, closure, cm, code, col, colgroup, color, combine_var, command,
+    conditional_assignment, confusing_a, confusing_regexp, constructor_name_a,
+    content, continue, control_a, 'counter-increment', 'counter-reset', create,
+    css, cursor, d, dangerous_comment, dangling_a, data, datalist, dd, debug,
+    del, deleted, details, devel, dfn, dialog, dir, direction, display, disrupt,
+    div, dl, dt, duplicate_a, edge, edition, else, em, embed, embossed, empty,
+    'empty-cells', empty_block, empty_case, empty_class, entityify, eqeq, errors,
+    es5, eval, evidence, evil, ex, exception, exec, expected_a,
+    expected_a_at_b_c, expected_a_b, expected_a_b_from_c_d, expected_at_a,
+    expected_attribute_a, expected_attribute_value_a, expected_class_a,
+    expected_fraction_a, expected_id_a, expected_identifier_a,
+    expected_identifier_a_reserved, expected_lang_a, expected_linear_a,
+    expected_media_a, expected_name_a, expected_nonstandard_style_attribute,
+    expected_number_a, expected_operator_a, expected_percent_a,
+    expected_positive_a, expected_pseudo_a, expected_selector_a,
+    expected_small_a, expected_space_a_b, expected_string_a,
+    expected_style_attribute, expected_style_pattern, expected_tagname_a,
+    expected_type_a, f, fieldset, figure, filter, first, flag, float, floor,
+    font, 'font-family', 'font-size', 'font-size-adjust', 'font-stretch',
+    'font-style', 'font-variant', 'font-weight', footer, forEach, for_if, forin,
+    form, fragment, frame, frameset, from, fromCharCode, fud, funct, function,
+    function_block, function_eval, function_loop, function_statement,
+    function_strict, functions, global, globals, h1, h2, h3, h4, h5, h6,
+    handheld, hasOwnProperty, head, header, height, hgroup, hr,
+    'hta:application', html, html_confusion_a, html_handlers, i, id, identifier,
+    identifier_function, iframe, img, immed, implied_evil, in, indent, indexOf,
+    infix_in, init, input, ins, insecure_a, isAlpha, isArray, isDigit, isNaN,
+    join, jslint, json, kbd, keygen, keys, label, labeled, lang, lbp,
+    leading_decimal_a, led, left, legend, length, 'letter-spacing', li, lib,
+    line, 'line-height', link, 'list-style', 'list-style-image',
+    'list-style-position', 'list-style-type', map, margin, 'margin-bottom',
+    'margin-left', 'margin-right', 'margin-top', mark, 'marker-offset', match,
+    'max-height', 'max-width', maxerr, maxlen, member, menu, message, meta,
+    meter, 'min-height', 'min-width', missing_a, missing_a_after_b,
+    missing_option, missing_property, missing_space_a_b, missing_url,
+    missing_use_strict, mixed, mm, mode, move_invocation, move_var, n, name,
+    name_function, nav, nested_comment, newcap, node, noframes, nomen, noscript,
+    not, not_a_constructor, not_a_defined, not_a_function, not_a_label,
+    not_a_scope, not_greater, nud, number, object, octal_a, ol, on, opacity,
+    open, optgroup, option, outer, outline, 'outline-color', 'outline-style',
+    'outline-width', output, overflow, 'overflow-x', 'overflow-y', p, padding,
+    'padding-bottom', 'padding-left', 'padding-right', 'padding-top',
+    'page-break-after', 'page-break-before', param, parameter_a_get_b,
+    parameter_arguments_a, parameter_set_a, params, paren, parent, passfail, pc,
+    plusplus, pop, position, postscript, pre, predef, print, progress,
+    projection, properties, prototype, pt, push, px, q, quote, quotes, r, radix,
+    range, raw, read_only, reason, redefinition_a, regexp, replace, report,
+    reserved, reserved_a, rhino, right, rp, rt, ruby, safe, samp, scanned_a_b,
+    screen, script, search, second, section, select, shift, slash_equal, slice,
+    sloppy, small, sort, source, span, speech, split, src, statement_block,
+    stopping, strange_loop, strict, string, strong, stupid, style, styleproperty,
+    sub, subscript, substr, sup, supplant, sync_a, t, table, 'table-layout',
+    tag_a_in_b, tbody, td, test, 'text-align', 'text-decoration', 'text-indent',
+    'text-shadow', 'text-transform', textarea, tfoot, th, thead, third, thru,
+    time, title, toLowerCase, toString, toUpperCase, token, too_long, too_many,
+    top, tr, trailing_decimal_a, tree, tt, tty, tv, type, u, ul, unclosed,
+    unclosed_comment, unclosed_regexp, undef, undefined, unescaped_a,
+    unexpected_a, unexpected_char_a_b, unexpected_comment, unexpected_else,
+    unexpected_label_a, unexpected_property_a, unexpected_space_a_b,
+    'unicode-bidi', unnecessary_initialize, unnecessary_use, unparam,
+    unreachable_a_b, unrecognized_style_attribute_a, unrecognized_tag_a, unsafe,
+    unused, url, urls, use_array, use_braces, use_charAt, use_object, use_or,
+    use_param, used_before_a, var, var_a_not, vars, 'vertical-align', video,
+    visibility, was, weird_assignment, weird_condition, weird_new, weird_program,
+    weird_relation, weird_ternary, white, 'white-space', widget, width, windows,
+    'word-spacing', 'word-wrap', wrap, wrap_immediate, wrap_regexp,
+    write_is_wrong, writeable, 'z-index'
+*/
+
+// The global directive is used to declare global variables that can
+// be accessed by the program. If a declaration is true, then the variable
+// is writeable. Otherwise, it is read-only.
+
+// We build the application inside a function so that we produce only a single
+// global variable. That function will be invoked immediately, and its return
+// value is the JSLINT function itself. That function is also an object that
+// can contain data and other functions.
+
+var JSLINT = (function () {
+    'use strict';
+
+    function array_to_object(array, value) {
+
+// Make an object from an array of keys and a common value.
+
+        var i, length = array.length, object = {};
+        for (i = 0; i < length; i += 1) {
+            object[array[i]] = value;
+        }
+        return object;
+    }
+
+
+    var adsafe_id,      // The widget's ADsafe id.
+        adsafe_may,     // The widget may load approved scripts.
+        adsafe_top,     // At the top of the widget script.
+        adsafe_went,    // ADSAFE.go has been called.
+        allowed_option = {
+            anon      : true,
+            bitwise   : true,
+            browser   : true,
+            cap       : true,
+            'continue': true,
+            css       : true,
+            debug     : true,
+            devel     : true,
+            eqeq      : true,
+            es5       : true,
+            evil      : true,
+            forin     : true,
+            fragment  : true,
+            indent    :   10,
+            maxerr    : 1000,
+            maxlen    :  256,
+            newcap    : true,
+            node      : true,
+            nomen     : true,
+            on        : true,
+            passfail  : true,
+            plusplus  : true,
+            properties: true,
+            regexp    : true,
+            rhino     : true,
+            undef     : true,
+            unparam   : true,
+            sloppy    : true,
+            stupid    : true,
+            sub       : true,
+            vars      : true,
+            white     : true,
+            widget    : true,
+            windows   : true
+        },
+        anonname,       // The guessed name for anonymous functions.
+        approved,       // ADsafe approved urls.
+
+// These are operators that should not be used with the ! operator.
+
+        bang = {
+            '<'  : true,
+            '<=' : true,
+            '==' : true,
+            '===': true,
+            '!==': true,
+            '!=' : true,
+            '>'  : true,
+            '>=' : true,
+            '+'  : true,
+            '-'  : true,
+            '*'  : true,
+            '/'  : true,
+            '%'  : true
+        },
+
+// These are property names that should not be permitted in the safe subset.
+
+        banned = array_to_object([
+            'arguments', 'callee', 'caller', 'constructor', 'eval', 'prototype',
+            'stack', 'unwatch', 'valueOf', 'watch'
+        ], true),
+        begin,          // The root token
+
+// browser contains a set of global names that are commonly provided by a
+// web browser environment.
+
+        browser = array_to_object([
+            'clearInterval', 'clearTimeout', 'document', 'event', 'FormData',
+            'frames', 'history', 'Image', 'localStorage', 'location', 'name',
+            'navigator', 'Option', 'parent', 'screen', 'sessionStorage',
+            'setInterval', 'setTimeout', 'Storage', 'window', 'XMLHttpRequest'
+        ], false),
+
+// bundle contains the text messages.
+
+        bundle = {
+            a_label: "'{a}' is a statement label.",
+            a_not_allowed: "'{a}' is not allowed.",
+            a_not_defined: "'{a}' is not defined.",
+            a_scope: "'{a}' used out of scope.",
+            adsafe_a: "ADsafe violation: '{a}'.",
+            adsafe_autocomplete: "ADsafe autocomplete violation.",
+            adsafe_bad_id: "ADSAFE violation: bad id.",
+            adsafe_div: "ADsafe violation: Wrap the widget in a div.",
+            adsafe_fragment: "ADSAFE: Use the fragment option.",
+            adsafe_go: "ADsafe violation: Misformed ADSAFE.go.",
+            adsafe_html: "Currently, ADsafe does not operate on whole HTML " +
+                "documents. It operates on <div> fragments and .js files.",
+            adsafe_id: "ADsafe violation: id does not match.",
+            adsafe_id_go: "ADsafe violation: Missing ADSAFE.id or ADSAFE.go.",
+            adsafe_lib: "ADsafe lib violation.",
+            adsafe_lib_second: "ADsafe: The second argument to lib must be a function.",
+            adsafe_missing_id: "ADSAFE violation: missing ID_.",
+            adsafe_name_a: "ADsafe name violation: '{a}'.",
+            adsafe_placement: "ADsafe script placement violation.",
+            adsafe_prefix_a: "ADsafe violation: An id must have a '{a}' prefix",
+            adsafe_script: "ADsafe script violation.",
+            adsafe_source: "ADsafe unapproved script source.",
+            adsafe_subscript_a: "ADsafe subscript '{a}'.",
+            adsafe_tag: "ADsafe violation: Disallowed tag '{a}'.",
+            already_defined: "'{a}' is already defined.",
+            and: "The '&&' subexpression should be wrapped in parens.",
+            assign_exception: "Do not assign to the exception parameter.",
+            assignment_function_expression: "Expected an assignment or " +
+                "function call and instead saw an expression.",
+            attribute_case_a: "Attribute '{a}' not all lower case.",
+            avoid_a: "Avoid '{a}'.",
+            bad_assignment: "Bad assignment.",
+            bad_color_a: "Bad hex color '{a}'.",
+            bad_constructor: "Bad constructor.",
+            bad_entity: "Bad entity.",
+            bad_html: "Bad HTML string",
+            bad_id_a: "Bad id: '{a}'.",
+            bad_in_a: "Bad for in variable '{a}'.",
+            bad_invocation: "Bad invocation.",
+            bad_name_a: "Bad name: '{a}'.",
+            bad_new: "Do not use 'new' for side effects.",
+            bad_number: "Bad number '{a}'.",
+            bad_operand: "Bad operand.",
+            bad_style: "Bad style.",
+            bad_type: "Bad type.",
+            bad_url_a: "Bad url '{a}'.",
+            bad_wrap: "Do not wrap function literals in parens unless they " +
+                "are to be immediately invoked.",
+            combine_var: "Combine this with the previous 'var' statement.",
+            conditional_assignment: "Expected a conditional expression and " +
+                "instead saw an assignment.",
+            confusing_a: "Confusing use of '{a}'.",
+            confusing_regexp: "Confusing regular expression.",
+            constructor_name_a: "A constructor name '{a}' should start with " +
+                "an uppercase letter.",
+            control_a: "Unexpected control character '{a}'.",
+            css: "A css file should begin with @charset 'UTF-8';",
+            dangling_a: "Unexpected dangling '_' in '{a}'.",
+            dangerous_comment: "Dangerous comment.",
+            deleted: "Only properties should be deleted.",
+            duplicate_a: "Duplicate '{a}'.",
+            empty_block: "Empty block.",
+            empty_case: "Empty case.",
+            empty_class: "Empty class.",
+            es5: "This is an ES5 feature.",
+            evil: "eval is evil.",
+            expected_a: "Expected '{a}'.",
+            expected_a_b: "Expected '{a}' and instead saw '{b}'.",
+            expected_a_b_from_c_d: "Expected '{a}' to match '{b}' from line " +
+                "{c} and instead saw '{d}'.",
+            expected_at_a: "Expected an at-rule, and instead saw @{a}.",
+            expected_a_at_b_c: "Expected '{a}' at column {b}, not column {c}.",
+            expected_attribute_a: "Expected an attribute, and instead saw [{a}].",
+            expected_attribute_value_a: "Expected an attribute value and " +
+                "instead saw '{a}'.",
+            expected_class_a: "Expected a class, and instead saw .{a}.",
+            expected_fraction_a: "Expected a number between 0 and 1 and " +
+                "instead saw '{a}'",
+            expected_id_a: "Expected an id, and instead saw #{a}.",
+            expected_identifier_a: "Expected an identifier and instead saw '{a}'.",
+            expected_identifier_a_reserved: "Expected an identifier and " +
+                "instead saw '{a}' (a reserved word).",
+            expected_linear_a: "Expected a linear unit and instead saw '{a}'.",
+            expected_lang_a: "Expected a lang code, and instead saw :{a}.",
+            expected_media_a: "Expected a CSS media type, and instead saw '{a}'.",
+            expected_name_a: "Expected a name and instead saw '{a}'.",
+            expected_nonstandard_style_attribute: "Expected a non-standard " +
+                "style attribute and instead saw '{a}'.",
+            expected_number_a: "Expected a number and instead saw '{a}'.",
+            expected_operator_a: "Expected an operator and instead saw '{a}'.",
+            expected_percent_a: "Expected a percentage and instead saw '{a}'",
+            expected_positive_a: "Expected a positive number and instead saw '{a}'",
+            expected_pseudo_a: "Expected a pseudo, and instead saw :{a}.",
+            expected_selector_a: "Expected a CSS selector, and instead saw {a}.",
+            expected_small_a: "Expected a small positive integer and instead saw '{a}'",
+            expected_space_a_b: "Expected exactly one space between '{a}' and '{b}'.",
+            expected_string_a: "Expected a string and instead saw {a}.",
+            expected_style_attribute: "Excepted a style attribute, and instead saw '{a}'.",
+            expected_style_pattern: "Expected a style pattern, and instead saw '{a}'.",
+            expected_tagname_a: "Expected a tagName, and instead saw {a}.",
+            expected_type_a: "Expected a type, and instead saw {a}.",
+            for_if: "The body of a for in should be wrapped in an if " +
+                "statement to filter unwanted properties from the prototype.",
+            function_block: "Function statements should not be placed in blocks. " +
+                "Use a function expression or move the statement to the top of " +
+                "the outer function.",
+            function_eval: "The Function constructor is eval.",
+            function_loop: "Don't make functions within a loop.",
+            function_statement: "Function statements are not invocable. " +
+                "Wrap the whole function invocation in parens.",
+            function_strict: "Use the function form of 'use strict'.",
+            html_confusion_a: "HTML confusion in regular expression '<{a}'.",
+            html_handlers: "Avoid HTML event handlers.",
+            identifier_function: "Expected an identifier in an assignment " +
+                "and instead saw a function invocation.",
+            implied_evil: "Implied eval is evil. Pass a function instead of a string.",
+            infix_in: "Unexpected 'in'. Compare with undefined, or use the " +
+                "hasOwnProperty method instead.",
+            insecure_a: "Insecure '{a}'.",
+            isNaN: "Use the isNaN function to compare with NaN.",
+            lang: "lang is deprecated.",
+            leading_decimal_a: "A leading decimal point can be confused with a dot: '.{a}'.",
+            missing_a: "Missing '{a}'.",
+            missing_a_after_b: "Missing '{a}' after '{b}'.",
+            missing_option: "Missing option value.",
+            missing_property: "Missing property name.",
+            missing_space_a_b: "Missing space between '{a}' and '{b}'.",
+            missing_url: "Missing url.",
+            missing_use_strict: "Missing 'use strict' statement.",
+            mixed: "Mixed spaces and tabs.",
+            move_invocation: "Move the invocation into the parens that " +
+                "contain the function.",
+            move_var: "Move 'var' declarations to the top of the function.",
+            name_function: "Missing name in function statement.",
+            nested_comment: "Nested comment.",
+            not: "Nested not.",
+            not_a_constructor: "Do not use {a} as a constructor.",
+            not_a_defined: "'{a}' has not been fully defined yet.",
+            not_a_function: "'{a}' is not a function.",
+            not_a_label: "'{a}' is not a label.",
+            not_a_scope: "'{a}' is out of scope.",
+            not_greater: "'{a}' should not be greater than '{b}'.",
+            octal_a: "Don't use octal: '{a}'. Use '\\u....' instead.",
+            parameter_arguments_a: "Do not mutate parameter '{a}' when using 'arguments'.",
+            parameter_a_get_b: "Unexpected parameter '{a}' in get {b} function.",
+            parameter_set_a: "Expected parameter (value) in set {a} function.",
+            radix: "Missing radix parameter.",
+            read_only: "Read only.",
+            redefinition_a: "Redefinition of '{a}'.",
+            reserved_a: "Reserved name '{a}'.",
+            scanned_a_b: "{a} ({b}% scanned).",
+            slash_equal: "A regular expression literal can be confused with '/='.",
+            statement_block: "Expected to see a statement and instead saw a block.",
+            stopping: "Stopping. ",
+            strange_loop: "Strange loop.",
+            strict: "Strict violation.",
+            subscript: "['{a}'] is better written in dot notation.",
+            sync_a: "Unexpected sync method: '{a}'.",
+            tag_a_in_b: "A '<{a}>' must be within '<{b}>'.",
+            too_long: "Line too long.",
+            too_many: "Too many errors.",
+            trailing_decimal_a: "A trailing decimal point can be confused " +
+                "with a dot: '.{a}'.",
+            type: "type is unnecessary.",
+            unclosed: "Unclosed string.",
+            unclosed_comment: "Unclosed comment.",
+            unclosed_regexp: "Unclosed regular expression.",
+            unescaped_a: "Unescaped '{a}'.",
+            unexpected_a: "Unexpected '{a}'.",
+            unexpected_char_a_b: "Unexpected character '{a}' in {b}.",
+            unexpected_comment: "Unexpected comment.",
+            unexpected_else: "Unexpected 'else' after 'return'.",
+            unexpected_label_a: "Unexpected label '{a}'.",
+            unexpected_property_a: "Unexpected /*property*/ '{a}'.",
+            unexpected_space_a_b: "Unexpected space between '{a}' and '{b}'.",
+            unnecessary_initialize: "It is not necessary to initialize '{a}' " +
+                "to 'undefined'.",
+            unnecessary_use: "Unnecessary 'use strict'.",
+            unreachable_a_b: "Unreachable '{a}' after '{b}'.",
+            unrecognized_style_attribute_a: "Unrecognized style attribute '{a}'.",
+            unrecognized_tag_a: "Unrecognized tag '<{a}>'.",
+            unsafe: "Unsafe character.",
+            url: "JavaScript URL.",
+            use_array: "Use the array literal notation [].",
+            use_braces: "Spaces are hard to count. Use {{a}}.",
+            use_charAt: "Use the charAt method.",
+            use_object: "Use the object literal notation {}.",
+            use_or: "Use the || operator.",
+            use_param: "Use a named parameter.",
+            used_before_a: "'{a}' was used before it was defined.",
+            var_a_not: "Variable {a} was not declared correctly.",
+            weird_assignment: "Weird assignment.",
+            weird_condition: "Weird condition.",
+            weird_new: "Weird construction. Delete 'new'.",
+            weird_program: "Weird program.",
+            weird_relation: "Weird relation.",
+            weird_ternary: "Weird ternary.",
+            wrap_immediate: "Wrap an immediate function invocation in parentheses " +
+                "to assist the reader in understanding that the expression " +
+                "is the result of a function, and not the function itself.",
+            wrap_regexp: "Wrap the /regexp/ literal in parens to " +
+                "disambiguate the slash operator.",
+            write_is_wrong: "document.write can be a form of eval."
+        },
+        comments_off,
+        css_attribute_data,
+        css_any,
+
+        css_colorData = array_to_object([
+            "aliceblue", "antiquewhite", "aqua", "aquamarine", "azure", "beige",
+            "bisque", "black", "blanchedalmond", "blue", "blueviolet", "brown",
+            "burlywood", "cadetblue", "chartreuse", "chocolate", "coral",
+            "cornflowerblue", "cornsilk", "crimson", "cyan", "darkblue",
+            "darkcyan", "darkgoldenrod", "darkgray", "darkgreen", "darkkhaki",
+            "darkmagenta", "darkolivegreen", "darkorange", "darkorchid",
+            "darkred", "darksalmon", "darkseagreen", "darkslateblue",
+            "darkslategray", "darkturquoise", "darkviolet", "deeppink",
+            "deepskyblue", "dimgray", "dodgerblue", "firebrick", "floralwhite",
+            "forestgreen", "fuchsia", "gainsboro", "ghostwhite", "gold",
+            "goldenrod", "gray", "green", "greenyellow", "honeydew", "hotpink",
+            "indianred", "indigo", "ivory", "khaki", "lavender",
+            "lavenderblush", "lawngreen", "lemonchiffon", "lightblue",
+            "lightcoral", "lightcyan", "lightgoldenrodyellow", "lightgreen",
+            "lightpink", "lightsalmon", "lightseagreen", "lightskyblue",
+            "lightslategray", "lightsteelblue", "lightyellow", "lime",
+            "limegreen", "linen", "magenta", "maroon", "mediumaquamarine",
+            "mediumblue", "mediumorchid", "mediumpurple", "mediumseagreen",
+            "mediumslateblue", "mediumspringgreen", "mediumturquoise",
+            "mediumvioletred", "midnightblue", "mintcream", "mistyrose",
+            "moccasin", "navajowhite", "navy", "oldlace", "olive", "olivedrab",
+            "orange", "orangered", "orchid", "palegoldenrod", "palegreen",
+            "paleturquoise", "palevioletred", "papayawhip", "peachpuff",
+            "peru", "pink", "plum", "powderblue", "purple", "red", "rosybrown",
+            "royalblue", "saddlebrown", "salmon", "sandybrown", "seagreen",
+            "seashell", "sienna", "silver", "skyblue", "slateblue", "slategray",
+            "snow", "springgreen", "steelblue", "tan", "teal", "thistle",
+            "tomato", "turquoise", "violet", "wheat", "white", "whitesmoke",
+            "yellow", "yellowgreen",
+
+            "activeborder", "activecaption", "appworkspace", "background",
+            "buttonface", "buttonhighlight", "buttonshadow", "buttontext",
+            "captiontext", "graytext", "highlight", "highlighttext",
+            "inactiveborder", "inactivecaption", "inactivecaptiontext",
+            "infobackground", "infotext", "menu", "menutext", "scrollbar",
+            "threeddarkshadow", "threedface", "threedhighlight",
+            "threedlightshadow", "threedshadow", "window", "windowframe",
+            "windowtext"
+        ], true),
+
+        css_border_style,
+        css_break,
+
+        css_lengthData = {
+            '%': true,
+            'cm': true,
+            'em': true,
+            'ex': true,
+            'in': true,
+            'mm': true,
+            'pc': true,
+            'pt': true,
+            'px': true
+        },
+
+        css_media,
+        css_overflow,
+
+        descapes = {
+            'b': '\b',
+            't': '\t',
+            'n': '\n',
+            'f': '\f',
+            'r': '\r',
+            '"': '"',
+            '/': '/',
+            '\\': '\\',
+            '!': '!'
+        },
+
+        devel = array_to_object([
+            'alert', 'confirm', 'console', 'Debug', 'opera', 'prompt', 'WSH'
+        ], false),
+        directive,
+        escapes = {
+            '\b': '\\b',
+            '\t': '\\t',
+            '\n': '\\n',
+            '\f': '\\f',
+            '\r': '\\r',
+            '\'': '\\\'',
+            '"' : '\\"',
+            '/' : '\\/',
+            '\\': '\\\\'
+        },
+
+        funct,          // The current function, including the labels used in
+                        // the function, as well as (breakage),
+                        // (context), (loopage), (name), (params), (token),
+                        // (vars), (verb)
+
+        functionicity = [
+            'closure', 'exception', 'global', 'label', 'outer', 'undef',
+            'unused', 'var'
+        ],
+
+        functions,      // All of the functions
+        global_funct,   // The global body
+        global_scope,   // The global scope
+        html_tag = {
+            a:        {},
+            abbr:     {},
+            acronym:  {},
+            address:  {},
+            applet:   {},
+            area:     {empty: true, parent: ' map '},
+            article:  {},
+            aside:    {},
+            audio:    {},
+            b:        {},
+            base:     {empty: true, parent: ' head '},
+            bdo:      {},
+            big:      {},
+            blockquote: {},
+            body:     {parent: ' html noframes '},
+            br:       {empty: true},
+            button:   {},
+            canvas:   {parent: ' body p div th td '},
+            caption:  {parent: ' table '},
+            center:   {},
+            cite:     {},
+            code:     {},
+            col:      {empty: true, parent: ' table colgroup '},
+            colgroup: {parent: ' table '},
+            command:  {parent: ' menu '},
+            datalist: {},
+            dd:       {parent: ' dl '},
+            del:      {},
+            details:  {},
+            dialog:   {},
+            dfn:      {},
+            dir:      {},
+            div:      {},
+            dl:       {},
+            dt:       {parent: ' dl '},
+            em:       {},
+            embed:    {},
+            fieldset: {},
+            figure:   {},
+            font:     {},
+            footer:   {},
+            form:     {},
+            frame:    {empty: true, parent: ' frameset '},
+            frameset: {parent: ' html frameset '},
+            h1:       {},
+            h2:       {},
+            h3:       {},
+            h4:       {},
+            h5:       {},
+            h6:       {},
+            head:     {parent: ' html '},
+            header:   {},
+            hgroup:   {},
+            hr:       {empty: true},
+            'hta:application':
+                      {empty: true, parent: ' head '},
+            html:     {parent: '*'},
+            i:        {},
+            iframe:   {},
+            img:      {empty: true},
+            input:    {empty: true},
+            ins:      {},
+            kbd:      {},
+            keygen:   {},
+            label:    {},
+            legend:   {parent: ' details fieldset figure '},
+            li:       {parent: ' dir menu ol ul '},
+            link:     {empty: true, parent: ' head '},
+            map:      {},
+            mark:     {},
+            menu:     {},
+            meta:     {empty: true, parent: ' head noframes noscript '},
+            meter:    {},
+            nav:      {},
+            noframes: {parent: ' html body '},
+            noscript: {parent: ' body head noframes '},
+            object:   {},
+            ol:       {},
+            optgroup: {parent: ' select '},
+            option:   {parent: ' optgroup select '},
+            output:   {},
+            p:        {},
+            param:    {empty: true, parent: ' applet object '},
+            pre:      {},
+            progress: {},
+            q:        {},
+            rp:       {},
+            rt:       {},
+            ruby:     {},
+            samp:     {},
+            script:   {empty: true, parent: ' body div frame head iframe p pre span '},
+            section:  {},
+            select:   {},
+            small:    {},
+            span:     {},
+            source:   {},
+            strong:   {},
+            style:    {parent: ' head ', empty: true},
+            sub:      {},
+            sup:      {},
+            table:    {},
+            tbody:    {parent: ' table '},
+            td:       {parent: ' tr '},
+            textarea: {},
+            tfoot:    {parent: ' table '},
+            th:       {parent: ' tr '},
+            thead:    {parent: ' table '},
+            time:     {},
+            title:    {parent: ' head '},
+            tr:       {parent: ' table tbody thead tfoot '},
+            tt:       {},
+            u:        {},
+            ul:       {},
+            'var':    {},
+            video:    {}
+        },
+
+        ids,            // HTML ids
+        in_block,
+        indent,
+        itself,         // JSLint itself
+        json_mode,
+        lex,            // the tokenizer
+        lines,
+        lookahead,
+        node = array_to_object([
+            'Buffer', 'clearInterval', 'clearTimeout', 'console', 'exports',
+            'global', 'module', 'process', 'querystring', 'require',
+            'setInterval', 'setTimeout', '__dirname', '__filename'
+        ], false),
+        node_js,
+        numbery = array_to_object(['indexOf', 'lastIndexOf', 'search'], true),
+        next_token,
+        option,
+        predefined,     // Global variables defined by option
+        prereg,
+        prev_token,
+        property,
+        regexp_flag = array_to_object(['g', 'i', 'm'], true),
+        return_this = function return_this() {
+            return this;
+        },
+        rhino = array_to_object([
+            'defineClass', 'deserialize', 'gc', 'help', 'load', 'loadClass',
+            'print', 'quit', 'readFile', 'readUrl', 'runCommand', 'seal',
+            'serialize', 'spawn', 'sync', 'toint32', 'version'
+        ], false),
+
+        scope,      // An object containing an object for each variable in scope
+        semicolon_coda = array_to_object([';', '"', '\'', ')'], true),
+        src,
+        stack,
+
+// standard contains the global names that are provided by the
+// ECMAScript standard.
+
+        standard = array_to_object([
+            'Array', 'Boolean', 'Date', 'decodeURI', 'decodeURIComponent',
+            'encodeURI', 'encodeURIComponent', 'Error', 'eval', 'EvalError',
+            'Function', 'isFinite', 'isNaN', 'JSON', 'Math', 'Number',
+            'Object', 'parseInt', 'parseFloat', 'RangeError', 'ReferenceError',
+            'RegExp', 'String', 'SyntaxError', 'TypeError', 'URIError'
+        ], false),
+
+        strict_mode,
+        syntax = {},
+        tab,
+        token,
+        urls,
+        var_mode,
+        warnings,
+
+// widget contains the global names which are provided to a Yahoo
+// (fna Konfabulator) widget.
+
+        widget = array_to_object([
+            'alert', 'animator', 'appleScript', 'beep', 'bytesToUIString',
+            'Canvas', 'chooseColor', 'chooseFile', 'chooseFolder',
+            'closeWidget', 'COM', 'convertPathToHFS', 'convertPathToPlatform',
+            'CustomAnimation', 'escape', 'FadeAnimation', 'filesystem', 'Flash',
+            'focusWidget', 'form', 'FormField', 'Frame', 'HotKey', 'Image',
+            'include', 'isApplicationRunning', 'iTunes', 'konfabulatorVersion',
+            'log', 'md5', 'MenuItem', 'MoveAnimation', 'openURL', 'play',
+            'Point', 'popupMenu', 'preferenceGroups', 'preferences', 'print',
+            'prompt', 'random', 'Rectangle', 'reloadWidget', 'ResizeAnimation',
+            'resolvePath', 'resumeUpdates', 'RotateAnimation', 'runCommand',
+            'runCommandInBg', 'saveAs', 'savePreferences', 'screen',
+            'ScrollBar', 'showWidgetPreferences', 'sleep', 'speak', 'Style',
+            'suppressUpdates', 'system', 'tellWidget', 'Text', 'TextArea',
+            'Timer', 'unescape', 'updateNow', 'URL', 'Web', 'widget', 'Window',
+            'XMLDOM', 'XMLHttpRequest', 'yahooCheckLogin', 'yahooLogin',
+            'yahooLogout'
+        ], true),
+
+        windows = array_to_object([
+            'ActiveXObject', 'CScript', 'Debug', 'Enumerator', 'System',
+            'VBArray', 'WScript', 'WSH'
+        ], false),
+
+//  xmode is used to adapt to the exceptions in html parsing.
+//  It can have these states:
+//      ''      .js script file
+//      'html'
+//      'outer'
+//      'script'
+//      'style'
+//      'scriptstring'
+//      'styleproperty'
+
+        xmode,
+        xquote,
+
+// Regular expressions. Some of these are stupidly long.
+
+// unsafe comment or string
+        ax = /@cc|<\/?|script|\]\s*\]|<\s*!|&lt/i,
+// carriage return, carriage return linefeed, or linefeed
+        crlfx = /\r\n?|\n/,
+// unsafe characters that are silently deleted by one or more browsers
+        cx = /[\u0000-\u001f\u007f-\u009f\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/,
+// query characters for ids
+        dx = /[\[\]\/\\"'*<>.&:(){}+=#]/,
+// html token
+        hx = /^\s*(['"=>\/&#]|<(?:\/|\!(?:--)?)?|[a-zA-Z][a-zA-Z0-9_\-:]*|[0-9]+|--)/,
+// identifier
+        ix = /^([a-zA-Z_$][a-zA-Z0-9_$]*)$/,
+// javascript url
+        jx = /^(?:javascript|jscript|ecmascript|vbscript|mocha|livescript)\s*:/i,
+// star slash
+        lx = /\*\/|\/\*/,
+// characters in strings that need escapement
+        nx = /[\u0000-\u001f'\\\u007f-\u009f\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,
+// outer html token
+        ox = /[>&]|<[\/!]?|--/,
+// attributes characters
+        qx = /[^a-zA-Z0-9+\-_\/. ]/,
+// style
+        sx = /^\s*([{}:#%.=,>+\[\]@()"';]|[*$\^~]=|[a-zA-Z_][a-zA-Z0-9_\-]*|[0-9]+|<\/|\/\*)/,
+        ssx = /^\s*([@#!"'};:\-%.=,+\[\]()*_]|[a-zA-Z][a-zA-Z0-9._\-]*|\/\*?|\d+(?:\.\d+)?|<\/)/,
+// token
+        tx = /^\s*([(){}\[\]\?.,:;'"~#@`]|={1,3}|\/(\*(jslint|properties|property|members?|globals?)?|=|\/)?|\*[\/=]?|\+(?:=|\++)?|-(?:=|-+)?|[\^%]=?|&[&=]?|\|[|=]?|>{1,3}=?|<(?:[\/=!]|\!(\[|--)?|<=?)?|\!={0,2}|[a-zA-Z_$][a-zA-Z0-9_$]*|[0-9]+(?:[xX][0-9a-fA-F]+|\.[0-9]*)?(?:[eE][+\-]?[0-9]+)?)/,
+// url badness
+        ux = /&|\+|\u00AD|\.\.|\/\*|%[^;]|base64|url|expression|data|mailto|script/i,
+
+        rx = {
+            outer: hx,
+            html: hx,
+            style: sx,
+            styleproperty: ssx
+        };
+
+
+    function F() {}     // Used by Object.create
+
+// Provide critical ES5 functions to ES3.
+
+    if (typeof Array.prototype.filter !== 'function') {
+        Array.prototype.filter = function (f) {
+            var i, length = this.length, result = [], value;
+            for (i = 0; i < length; i += 1) {
+                try {
+                    value = this[i];
+                    if (f(value)) {
+                        result.push(value);
+                    }
+                } catch (ignore) {
+                }
+            }
+            return result;
+        };
+    }
+
+    if (typeof Array.prototype.forEach !== 'function') {
+        Array.prototype.forEach = function (f) {
+            var i, length = this.length;
+            for (i = 0; i < length; i += 1) {
+                try {
+                    f(this[i]);
+                } catch (ignore) {
+                }
+            }
+        };
+    }
+
+    if (typeof Array.isArray !== 'function') {
+        Array.isArray = function (o) {
+            return Object.prototype.toString.apply(o) === '[object Array]';
+        };
+    }
+
+    if (!Object.prototype.hasOwnProperty.call(Object, 'create')) {
+        Object.create = function (o) {
+            F.prototype = o;
+            return new F();
+        };
+    }
+
+    if (typeof Object.keys !== 'function') {
+        Object.keys = function (o) {
+            var array = [], key;
+            for (key in o) {
+                if (Object.prototype.hasOwnProperty.call(o, key)) {
+                    array.push(key);
+                }
+            }
+            return array;
+        };
+    }
+
+    if (typeof String.prototype.entityify !== 'function') {
+        String.prototype.entityify = function () {
+            return this
+                .replace(/&/g, '&amp;')
+                .replace(/</g, '&lt;')
+                .replace(/>/g, '&gt;');
+        };
+    }
+
+    if (typeof String.prototype.isAlpha !== 'function') {
+        String.prototype.isAlpha = function () {
+            return (this >= 'a' && this <= 'z\uffff') ||
+                (this >= 'A' && this <= 'Z\uffff');
+        };
+    }
+
+    if (typeof String.prototype.isDigit !== 'function') {
+        String.prototype.isDigit = function () {
+            return (this >= '0' && this <= '9');
+        };
+    }
+
+    if (typeof String.prototype.supplant !== 'function') {
+        String.prototype.supplant = function (o) {
+            return this.replace(/\{([^{}]*)\}/g, function (a, b) {
+                var replacement = o[b];
+                return typeof replacement === 'string' ||
+                    typeof replacement === 'number' ? replacement : a;
+            });
+        };
+    }
+
+
+    function sanitize(a) {
+
+//  Escapify a troublesome character.
+
+        return escapes[a] ||
+            '\\u' + ('0000' + a.charCodeAt().toString(16)).slice(-4);
+    }
+
+
+    function add_to_predefined(group) {
+        Object.keys(group).forEach(function (name) {
+            predefined[name] = group[name];
+        });
+    }
+
+
+    function assume() {
+        if (!option.safe) {
+            if (option.rhino) {
+                add_to_predefined(rhino);
+                option.rhino = false;
+            }
+            if (option.devel) {
+                add_to_predefined(devel);
+                option.devel = false;
+            }
+            if (option.browser) {
+                add_to_predefined(browser);
+                option.browser = false;
+            }
+            if (option.windows) {
+                add_to_predefined(windows);
+                option.windows = false;
+            }
+            if (option.node) {
+                add_to_predefined(node);
+                option.node = false;
+                node_js = true;
+            }
+            if (option.widget) {
+                add_to_predefined(widget);
+                option.widget = false;
+            }
+        }
+    }
+
+
+// Produce an error warning.
+
+    function artifact(tok) {
+        if (!tok) {
+            tok = next_token;
+        }
+        return tok.number || tok.string;
+    }
+
+    function quit(message, line, character) {
+        throw {
+            name: 'JSLintError',
+            line: line,
+            character: character,
+            message: bundle.scanned_a_b.supplant({
+                a: message,
+                b: Math.floor((line / lines.length) * 100)
+            })
+        };
+    }
+
+    function warn(message, offender, a, b, c, d) {
+        var character, line, warning;
+        offender = offender || next_token;  // ~~
+        line = offender.line || 0;
+        character = offender.from || 0;
+        warning = {
+            id: '(error)',
+            raw: bundle[message] || message,
+            evidence: lines[line - 1] || '',
+            line: line,
+            character: character,
+            a: a || (offender.id === '(number)'
+                ? String(offender.number)
+                : offender.string),
+            b: b,
+            c: c,
+            d: d
+        };
+        warning.reason = warning.raw.supplant(warning);
+        JSLINT.errors.push(warning);
+        if (option.passfail) {
+            quit(bundle.stopping, line, character);
+        }
+        warnings += 1;
+        if (warnings >= option.maxerr) {
+            quit(bundle.too_many, line, character);
+        }
+        return warning;
+    }
+
+    function warn_at(message, line, character, a, b, c, d) {
+        return warn(message, {
+            line: line,
+            from: character
+        }, a, b, c, d);
+    }
+
+    function stop(message, offender, a, b, c, d) {
+        var warning = warn(message, offender, a, b, c, d);
+        quit(bundle.stopping, warning.line, warning.character);
+    }
+
+    function stop_at(message, line, character, a, b, c, d) {
+        return stop(message, {
+            line: line,
+            from: character
+        }, a, b, c, d);
+    }
+
+    function expected_at(at) {
+        if (!option.white && next_token.from !== at) {
+            warn('expected_a_at_b_c', next_token, '', at,
+                next_token.from);
+        }
+    }
+
+    function aint(it, name, expected) {
+        if (it[name] !== expected) {
+            warn('expected_a_b', it, expected, it[name]);
+            return true;
+        }
+        return false;
+    }
+
+
+// lexical analysis and token construction
+
+    lex = (function lex() {
+        var character, c, from, length, line, pos, source_row;
+
+// Private lex methods
+
+        function next_line() {
+            var at;
+            if (line >= lines.length) {
+                return false;
+            }
+            character = 1;
+            source_row = lines[line];
+            line += 1;
+            at = source_row.search(/ \t/);
+            if (at >= 0) {
+                warn_at('mixed', line, at + 1);
+            }
+            source_row = source_row.replace(/\t/g, tab);
+            at = source_row.search(cx);
+            if (at >= 0) {
+                warn_at('unsafe', line, at);
+            }
+            if (option.maxlen && option.maxlen < source_row.length) {
+                warn_at('too_long', line, source_row.length);
+            }
+            return true;
+        }
+
+// Produce a token object.  The token inherits from a syntax symbol.
+
+        function it(type, value) {
+            var id, the_token;
+            if (type === '(string)' || type === '(range)') {
+                if (jx.test(value)) {
+                    warn_at('url', line, from);
+                }
+            }
+            the_token = Object.create(syntax[(
+                type === '(punctuator)' || (type === '(identifier)' &&
+                        Object.prototype.hasOwnProperty.call(syntax, value))
+                    ? value
+                    : type
+            )] || syntax['(error)']);
+            if (type === '(identifier)') {
+                the_token.identifier = true;
+                if (value === '__iterator__' || value === '__proto__') {
+                    stop_at('reserved_a', line, from, value);
+                } else if (!option.nomen &&
+                        (value.charAt(0) === '_' ||
+                        value.charAt(value.length - 1) === '_')) {
+                    warn_at('dangling_a', line, from, value);
+                }
+            }
+            if (type === '(number)') {
+                the_token.number = +value;
+            } else if (value !== undefined) {
+                the_token.string = String(value);
+            }
+            the_token.line = line;
+            the_token.from = from;
+            the_token.thru = character;
+            id = the_token.id;
+            prereg = id && (
+                ('(,=:[!&|?{};'.indexOf(id.charAt(id.length - 1)) >= 0) ||
+                id === 'return' || id === 'case'
+            );
+            return the_token;
+        }
+
+        function match(x) {
+            var exec = x.exec(source_row), first;
+            if (exec) {
+                length = exec[0].length;
+                first = exec[1];
+                c = first.charAt(0);
+                source_row = source_row.slice(length);
+                from = character + length - first.length;
+                character += length;
+                return first;
+            }
+        }
+
+        function string(x) {
+            var c, pos = 0, r = '', result;
+
+            function hex(n) {
+                var i = parseInt(source_row.substr(pos + 1, n), 16);
+                pos += n;
+                if (i >= 32 && i <= 126 &&
+                        i !== 34 && i !== 92 && i !== 39) {
+                    warn_at('unexpected_a', line, character, '\\');
+                }
+                character += n;
+                c = String.fromCharCode(i);
+            }
+
+            if (json_mode && x !== '"') {
+                warn_at('expected_a', line, character, '"');
+            }
+
+            if (xquote === x || (xmode === 'scriptstring' && !xquote)) {
+                return it('(punctuator)', x);
+            }
+
+            for (;;) {
+                while (pos >= source_row.length) {
+                    pos = 0;
+                    if (xmode !== 'html' || !next_line()) {
+                        stop_at('unclosed', line, from);
+                    }
+                }
+                c = source_row.charAt(pos);
+                if (c === x) {
+                    character += 1;
+                    source_row = source_row.slice(pos + 1);
+                    result = it('(string)', r);
+                    result.quote = x;
+                    return result;
+                }
+                if (c < ' ') {
+                    if (c === '\n' || c === '\r') {
+                        break;
+                    }
+                    warn_at('control_a', line, character + pos,
+                        source_row.slice(0, pos));
+                } else if (c === xquote) {
+                    warn_at('bad_html', line, character + pos);
+                } else if (c === '<') {
+                    if (option.safe && xmode === 'html') {
+                        warn_at('adsafe_a', line, character + pos, c);
+                    } else if (source_row.charAt(pos + 1) === '/' && (xmode || option.safe)) {
+                        warn_at('expected_a_b', line, character,
+                            '<\\/', '</');
+                    } else if (source_row.charAt(pos + 1) === '!' && (xmode || option.safe)) {
+                        warn_at('unexpected_a', line, character, '<!');
+                    }
+                } else if (c === '\\') {
+                    if (xmode === 'html') {
+                        if (option.safe) {
+                            warn_at('adsafe_a', line, character + pos, c);
+                        }
+                    } else if (xmode === 'styleproperty') {
+                        pos += 1;
+                        character += 1;
+                        c = source_row.charAt(pos);
+                        if (c !== x) {
+                            warn_at('unexpected_a', line, character, '\\');
+                        }
+                    } else {
+                        pos += 1;
+                        character += 1;
+                        c = source_row.charAt(pos);
+                        switch (c) {
+                        case '':
+                            if (!option.es5) {
+                                warn_at('es5', line, character);
+                            }
+                            next_line();
+                            pos = -1;
+                            break;
+                        case xquote:
+                            warn_at('bad_html', line, character + pos);
+                            break;
+                        case '\'':
+                            if (json_mode) {
+                                warn_at('unexpected_a', line, character, '\\\'');
+                            }
+                            break;
+                        case 'u':
+                            hex(4);
+                            break;
+                        case 'v':
+                            if (json_mode) {
+                                warn_at('unexpected_a', line, character, '\\v');
+                            }
+                            c = '\v';
+                            break;
+                        case 'x':
+                            if (json_mode) {
+                                warn_at('unexpected_a', line, character, '\\x');
+                            }
+                            hex(2);
+                            break;
+                        default:
+                            if (typeof descapes[c] !== 'string') {
+                                warn_at(c >= '0' && c <= '7' ? 'octal_a' : 'unexpected_a',
+                                    line, character, '\\' + c);
+                            } else {
+                                c = descapes[c];
+                            }
+                        }
+                    }
+                }
+                r += c;
+                character += 1;
+                pos += 1;
+            }
+        }
+
+        function number(snippet) {
+            var digit;
+            if (xmode !== 'style' && xmode !== 'styleproperty' &&
+                    source_row.charAt(0).isAlpha()) {
+                warn_at('expected_space_a_b',
+                    line, character, c, source_row.charAt(0));
+            }
+            if (c === '0') {
+                digit = snippet.charAt(1);
+                if (digit.isDigit()) {
+                    if (token.id !== '.' && xmode !== 'styleproperty') {
+                        warn_at('unexpected_a', line, character, snippet);
+                    }
+                } else if (json_mode && (digit === 'x' || digit === 'X')) {
+                    warn_at('unexpected_a', line, character, '0x');
+                }
+            }
+            if (snippet.slice(snippet.length - 1) === '.') {
+                warn_at('trailing_decimal_a', line, character, snippet);
+            }
+            if (xmode !== 'style') {
+                digit = +snippet;
+                if (!isFinite(digit)) {
+                    warn_at('bad_number', line, character, snippet);
+                }
+                snippet = digit;
+            }
+            return it('(number)', snippet);
+        }
+
+        function comment(snippet) {
+            if (comments_off || src || (xmode && xmode !== 'script' &&
+                    xmode !== 'style' && xmode !== 'styleproperty')) {
+                warn_at('unexpected_comment', line, character);
+            } else if (xmode === 'script' && /<\//i.test(source_row)) {
+                warn_at('unexpected_a', line, character, '<\/');
+            } else if (option.safe && ax.test(snippet)) {
+                warn_at('dangerous_comment', line, character);
+            }
+        }
+
+        function regexp() {
+            var b,
+                bit,
+                captures = 0,
+                depth = 0,
+                flag = '',
+                high,
+                letter,
+                length = 0,
+                low,
+                potential,
+                quote,
+                result;
+            for (;;) {
+                b = true;
+                c = source_row.charAt(length);
+                length += 1;
+                switch (c) {
+                case '':
+                    stop_at('unclosed_regexp', line, from);
+                    return;
+                case '/':
+                    if (depth > 0) {
+                        warn_at('unescaped_a', line, from + length, '/');
+                    }
+                    c = source_row.slice(0, length - 1);
+                    potential = Object.create(regexp_flag);
+                    for (;;) {
+                        letter = source_row.charAt(length);
+                        if (potential[letter] !== true) {
+                            break;
+                        }
+                        potential[letter] = false;
+                        length += 1;
+                        flag += letter;
+                    }
+                    if (source_row.charAt(length).isAlpha()) {
+                        stop_at('unexpected_a', line, from, source_row.charAt(length));
+                    }
+                    character += length;
+                    source_row = source_row.slice(length);
+                    quote = source_row.charAt(0);
+                    if (quote === '/' || quote === '*') {
+                        stop_at('confusing_regexp', line, from);
+                    }
+                    result = it('(regexp)', c);
+                    result.flag = flag;
+                    return result;
+                case '\\':
+                    c = source_row.charAt(length);
+                    if (c < ' ') {
+                        warn_at('control_a', line, from + length, String(c));
+                    } else if (c === '<') {
+                        warn_at(bundle.unexpected_a, line, from + length, '\\');
+                    }
+                    length += 1;
+                    break;
+                case '(':
+                    depth += 1;
+                    b = false;
+                    if (source_row.charAt(length) === '?') {
+                        length += 1;
+                        switch (source_row.charAt(length)) {
+                        case ':':
+                        case '=':
+                        case '!':
+                            length += 1;
+                            break;
+                        default:
+                            warn_at(bundle.expected_a_b, line, from + length,
+                                ':', source_row.charAt(length));
+                        }
+                    } else {
+                        captures += 1;
+                    }
+                    break;
+                case '|':
+                    b = false;
+                    break;
+                case ')':
+                    if (depth === 0) {
+                        warn_at('unescaped_a', line, from + length, ')');
+                    } else {
+                        depth -= 1;
+                    }
+                    break;
+                case ' ':
+                    pos = 1;
+                    while (source_row.charAt(length) === ' ') {
+                        length += 1;
+                        pos += 1;
+                    }
+                    if (pos > 1) {
+                        warn_at('use_braces', line, from + length, pos);
+                    }
+                    break;
+                case '[':
+                    c = source_row.charAt(length);
+                    if (c === '^') {
+                        length += 1;
+                        if (!option.regexp) {
+                            warn_at('insecure_a', line, from + length, c);
+                        } else if (source_row.charAt(length) === ']') {
+                            stop_at('unescaped_a', line, from + length, '^');
+                        }
+                    }
+                    bit = false;
+                    if (c === ']') {
+                        warn_at('empty_class', line, from + length - 1);
+                        bit = true;
+                    }
+klass:              do {
+                        c = source_row.charAt(length);
+                        length += 1;
+                        switch (c) {
+                        case '[':
+                        case '^':
+                            warn_at('unescaped_a', line, from + length, c);
+                            bit = true;
+                            break;
+                        case '-':
+                            if (bit) {
+                                bit = false;
+                            } else {
+                                warn_at('unescaped_a', line, from + length, '-');
+                                bit = true;
+                            }
+                            break;
+                        case ']':
+                            if (!bit) {
+                                warn_at('unescaped_a', line, from + length - 1, '-');
+                            }
+                            break klass;
+                        case '\\':
+                            c = source_row.charAt(length);
+                            if (c < ' ') {
+                                warn_at(bundle.control_a, line, from + length, String(c));
+                            } else if (c === '<') {
+                                warn_at(bundle.unexpected_a, line, from + length, '\\');
+                            }
+                            length += 1;
+                            bit = true;
+                            break;
+                        case '/':
+                            warn_at('unescaped_a', line, from + length - 1, '/');
+                            bit = true;
+                            break;
+                        case '<':
+                            if (xmode === 'script') {
+                                c = source_row.charAt(length);
+                                if (c === '!' || c === '/') {
+                                    warn_at(bundle.html_confusion_a, line,
+                                        from + length, c);
+                                }
+                            }
+                            bit = true;
+                            break;
+                        default:
+                            bit = true;
+                        }
+                    } while (c);
+                    break;
+                case '.':
+                    if (!option.regexp) {
+                        warn_at('insecure_a', line, from + length, c);
+                    }
+                    break;
+                case ']':
+                case '?':
+                case '{':
+                case '}':
+                case '+':
+                case '*':
+                    warn_at('unescaped_a', line, from + length, c);
+                    break;
+                case '<':
+                    if (xmode === 'script') {
+                        c = source_row.charAt(length);
+                        if (c === '!' || c === '/') {
+                            warn_at(bundle.html_confusion_a, line, from + length, c);
+                        }
+                    }
+                    break;
+                }
+                if (b) {
+                    switch (source_row.charAt(length)) {
+                    case '?':
+                    case '+':
+                    case '*':
+                        length += 1;
+                        if (source_row.charAt(length) === '?') {
+                            length += 1;
+                        }
+                        break;
+                    case '{':
+                        length += 1;
+                        c = source_row.charAt(length);
+                        if (c < '0' || c > '9') {
+                            warn_at(bundle.expected_number_a, line,
+                                from + length, c);
+                        }
+                        length += 1;
+                        low = +c;
+                        for (;;) {
+                            c = source_row.charAt(length);
+                            if (c < '0' || c > '9') {
+                                break;
+                            }
+                            length += 1;
+                            low = +c + (low * 10);
+                        }
+                        high = low;
+                        if (c === ',') {
+                            length += 1;
+                            high = Infinity;
+                            c = source_row.charAt(length);
+                            if (c >= '0' && c <= '9') {
+                                length += 1;
+                                high = +c;
+                                for (;;) {
+                                    c = source_row.charAt(length);
+                                    if (c < '0' || c > '9') {
+                                        break;
+                                    }
+                                    length += 1;
+                                    high = +c + (high * 10);
+                                }
+                            }
+                        }
+                        if (source_row.charAt(length) !== '}') {
+                            warn_at(bundle.expected_a_b, line, from + length,
+                                '}', c);
+                        } else {
+                            length += 1;
+                        }
+                        if (source_row.charAt(length) === '?') {
+                            length += 1;
+                        }
+                        if (low > high) {
+                            warn_at(bundle.not_greater, line, from + length,
+                                low, high);
+                        }
+                        break;
+                    }
+                }
+            }
+            c = source_row.slice(0, length - 1);
+            character += length;
+            source_row = source_row.slice(length);
+            return it('(regexp)', c);
+        }
+
+// Public lex methods
+
+        return {
+            init: function (source) {
+                if (typeof source === 'string') {
+                    lines = source.split(crlfx);
+                } else {
+                    lines = source;
+                }
+                line = 0;
+                next_line();
+                from = 1;
+            },
+
+            range: function (begin, end) {
+                var c, value = '';
+                from = character;
+                if (source_row.charAt(0) !== begin) {
+                    stop_at('expected_a_b', line, character, begin,
+                        source_row.charAt(0));
+                }
+                for (;;) {
+                    source_row = source_row.slice(1);
+                    character += 1;
+                    c = source_row.charAt(0);
+                    switch (c) {
+                    case '':
+                        stop_at('missing_a', line, character, c);
+                        break;
+                    case end:
+                        source_row = source_row.slice(1);
+                        character += 1;
+                        return it('(range)', value);
+                    case xquote:
+                    case '\\':
+                        warn_at('unexpected_a', line, character, c);
+                        break;
+                    }
+                    value += c;
+                }
+            },
+
+// token -- this is called by advance to get the next token.
+
+            token: function () {
+                var c, i, snippet;
+
+                for (;;) {
+                    while (!source_row) {
+                        if (!next_line()) {
+                            return it('(end)');
+                        }
+                    }
+                    while (xmode === 'outer') {
+                        i = source_row.search(ox);
+                        if (i === 0) {
+                            break;
+                        } else if (i > 0) {
+                            character += 1;
+                            source_row = source_row.slice(i);
+                            break;
+                        } else {
+                            if (!next_line()) {
+                                return it('(end)', '');
+                            }
+                        }
+                    }
+                    snippet = match(rx[xmode] || tx);
+                    if (!snippet) {
+                        if (source_row) {
+                            if (source_row.charAt(0) === ' ') {
+                                if (!option.white) {
+                                    warn_at('unexpected_a', line, character,
+                                        '(space)');
+                                }
+                                character += 1;
+                                source_row = '';
+                            } else {
+                                stop_at('unexpected_a', line, character,
+                                    source_row.charAt(0));
+                            }
+                        }
+                    } else {
+
+//      identifier
+
+                        c = snippet.charAt(0);
+                        if (c.isAlpha() || c === '_' || c === '$') {
+                            return it('(identifier)', snippet);
+                        }
+
+//      number
+
+                        if (c.isDigit()) {
+                            return number(snippet);
+                        }
+                        switch (snippet) {
+
+//      string
+
+                        case '"':
+                        case "'":
+                            return string(snippet);
+
+//      // comment
+
+                        case '//':
+                            comment(source_row);
+                            source_row = '';
+                            break;
+
+//      /* comment
+
+                        case '/*':
+                            for (;;) {
+                                i = source_row.search(lx);
+                                if (i >= 0) {
+                                    break;
+                                }
+                                comment(source_row);
+                                if (!next_line()) {
+                                    stop_at('unclosed_comment', line, character);
+                                }
+                            }
+                            comment(source_row.slice(0, i));
+                            character += i + 2;
+                            if (source_row.charAt(i) === '/') {
+                                stop_at('nested_comment', line, character);
+                            }
+                            source_row = source_row.slice(i + 2);
+                            break;
+
+                        case '':
+                            break;
+//      /
+                        case '/':
+                            if (token.id === '/=') {
+                                stop_at(
+                                    bundle.slash_equal,
+                                    line,
+                                    from
+                                );
+                            }
+                            return prereg
+                                ? regexp()
+                                : it('(punctuator)', snippet);
+
+//      punctuator
+
+                        case '<!--':
+                            length = line;
+//                            c = character;
+                            for (;;) {
+                                i = source_row.indexOf('--');
+                                if (i >= 0) {
+                                    break;
+                                }
+                                i = source_row.indexOf('<!');
+                                if (i >= 0) {
+                                    stop_at('nested_comment',
+                                        line, character + i);
+                                }
+                                if (!next_line()) {
+                                    stop_at('unclosed_comment', length, c);
+                                }
+                            }
+                            length = source_row.indexOf('<!');
+                            if (length >= 0 && length < i) {
+                                stop_at('nested_comment',
+                                    line, character + length);
+                            }
+                            character += i;
+                            if (source_row.charAt(i + 2) !== '>') {
+                                stop_at('expected_a', line, character, '-->');
+                            }
+                            character += 3;
+                            source_row = source_row.slice(i + 3);
+                            break;
+                        case '#':
+                            if (xmode === 'html' || xmode === 'styleproperty') {
+                                for (;;) {
+                                    c = source_row.charAt(0);
+                                    if ((c < '0' || c > '9') &&
+                                            (c < 'a' || c > 'f') &&
+                                            (c < 'A' || c > 'F')) {
+                                        break;
+                                    }
+                                    character += 1;
+                                    source_row = source_row.slice(1);
+                                    snippet += c;
+                                }
+                                if (snippet.length !== 4 && snippet.length !== 7) {
+                                    warn_at('bad_color_a', line,
+                                        from + length, snippet);
+                                }
+                                return it('(color)', snippet);
+                            }
+                            return it('(punctuator)', snippet);
+
+                        default:
+                            if (xmode === 'outer' && c === '&') {
+                                character += 1;
+                                source_row = source_row.slice(1);
+                                for (;;) {
+                                    c = source_row.charAt(0);
+                                    character += 1;
+                                    source_row = source_row.slice(1);
+                                    if (c === ';') {
+                                        break;
+                                    }
+                                    if (!((c >= '0' && c <= '9') ||
+                                            (c >= 'a' && c <= 'z') ||
+                                            c === '#')) {
+                                        stop_at('bad_entity', line, from + length,
+                                            character);
+                                    }
+                                }
+                                break;
+                            }
+                            return it('(punctuator)', snippet);
+                        }
+                    }
+                }
+            }
+        };
+    }());
+
+
+    function add_label(token, kind, name) {
+
+// Define the symbol in the current function in the current scope.
+
+        name = name || token.string;
+
+// Global variables cannot be created in the safe subset. If a global variable
+// already exists, do nothing. If it is predefined, define it.
+
+        if (funct === global_funct) {
+            if (option.safe) {
+                warn('adsafe_a', token, name);
+            }
+            if (typeof global_funct[name] !== 'string') {
+                token.writeable = typeof predefined[name] === 'boolean'
+                    ? predefined[name]
+                    : true;
+                token.funct = funct;
+                global_scope[name] = token;
+            }
+            if (kind === 'becoming') {
+                kind = 'var';
+            }
+
+// Ordinary variables.
+
+        } else {
+
+// Warn if the variable already exists.
+
+            if (typeof funct[name] === 'string') {
+                if (funct[name] === 'undef') {
+                    if (!option.undef) {
+                        warn('used_before_a', token, name);
+                    }
+                    kind = 'var';
+                } else {
+                    warn('already_defined', token, name);
+                }
+            } else {
+
+// Add the symbol to the current function.
+
+                token.funct = funct;
+                token.writeable = true;
+                scope[name] = token;
+            }
+        }
+        funct[name] = kind;
+    }
+
+
+    function peek(distance) {
+
+// Peek ahead to a future token. The distance is how far ahead to look. The
+// default is the next token.
+
+        var found, slot = 0;
+
+        distance = distance || 0;
+        while (slot <= distance) {
+            found = lookahead[slot];
+            if (!found) {
+                found = lookahead[slot] = lex.token();
+            }
+            slot += 1;
+        }
+        return found;
+    }
+
+
+    function advance(id, match) {
+
+// Produce the next token, also looking for programming errors.
+
+        if (indent) {
+
+// If indentation checking was requested, then inspect all of the line breakings.
+// The var statement is tricky because the names might be aligned or not. We
+// look at the first line break after the var to determine the programmer's
+// intention.
+
+            if (var_mode && next_token.line !== token.line) {
+                if ((var_mode !== indent || !next_token.edge) &&
+                        next_token.from === indent.at -
+                        (next_token.edge ? option.indent : 0)) {
+                    var dent = indent;
+                    for (;;) {
+                        dent.at -= option.indent;
+                        if (dent === var_mode) {
+                            break;
+                        }
+                        dent = dent.was;
+                    }
+                    dent.open = false;
+                }
+                var_mode = null;
+            }
+            if (next_token.id === '?' && indent.mode === ':' &&
+                    token.line !== next_token.line) {
+                indent.at -= option.indent;
+            }
+            if (indent.open) {
+
+// If the token is an edge.
+
+                if (next_token.edge) {
+                    if (next_token.edge === 'label') {
+                        expected_at(1);
+                    } else if (next_token.edge === 'case' || indent.mode === 'statement') {
+                        expected_at(indent.at - option.indent);
+                    } else if (indent.mode !== 'array' || next_token.line !== token.line) {
+                        expected_at(indent.at);
+                    }
+
+// If the token is not an edge, but is the first token on the line.
+
+                } else if (next_token.line !== token.line) {
+                    if (next_token.from < indent.at + (indent.mode ===
+                            'expression' ? 0 : option.indent)) {
+                        expected_at(indent.at + option.indent);
+                    }
+                    indent.wrap = true;
+                }
+            } else if (next_token.line !== token.line) {
+                if (next_token.edge) {
+                    expected_at(indent.at);
+                } else {
+                    indent.wrap = true;
+                    if (indent.mode === 'statement' || indent.mode === 'var') {
+                        expected_at(indent.at + option.indent);
+                    } else if (next_token.from < indent.at + (indent.mode ===
+                            'expression' ? 0 : option.indent)) {
+                        expected_at(indent.at + option.indent);
+                    }
+                }
+            }
+        }
+
+        switch (token.id) {
+        case '(number)':
+            if (next_token.id === '.') {
+                warn('trailing_decimal_a');
+            }
+            break;
+        case '-':
+            if (next_token.id === '-' || next_token.id === '--') {
+                warn('confusing_a');
+            }
+            break;
+        case '+':
+            if (next_token.id === '+' || next_token.id === '++') {
+                warn('confusing_a');
+            }
+            break;
+        }
+        if (token.id === '(string)' || token.identifier) {
+            anonname = token.string;
+        }
+
+        if (id && next_token.id !== id) {
+            if (match) {
+                warn('expected_a_b_from_c_d', next_token, id,
+                    match.id, match.line, artifact());
+            } else if (!next_token.identifier || next_token.string !== id) {
+                warn('expected_a_b', next_token, id, artifact());
+            }
+        }
+        prev_token = token;
+        token = next_token;
+        next_token = lookahead.shift() || lex.token();
+    }
+
+
+    function advance_identifier(string) {
+        if (next_token.identifier && next_token.string === string) {
+            advance();
+        } else {
+            warn('expected_a_b', next_token, string, artifact());
+        }
+    }
+
+
+    function do_safe() {
+        if (option.adsafe) {
+            option.safe = true;
+        }
+        if (option.safe) {
+            option.browser     =
+                option['continue'] =
+                option.css     =
+                option.debug   =
+                option.devel   =
+                option.evil    =
+                option.forin   =
+                option.newcap  =
+                option.nomen   =
+                option.on      =
+                option.rhino   =
+                option.sloppy  =
+                option.sub     =
+                option.undef   =
+                option.widget  =
+                option.windows = false;
+
+
+            delete predefined.Array;
+            delete predefined.Date;
+            delete predefined.Function;
+            delete predefined.Object;
+            delete predefined['eval'];
+
+            add_to_predefined({
+                ADSAFE: false,
+                lib: false
+            });
+        }
+    }
+
+
+    function do_globals() {
+        var name, writeable;
+        for (;;) {
+            if (next_token.id !== '(string)' && !next_token.identifier) {
+                return;
+            }
+            name = next_token.string;
+            advance();
+            writeable = false;
+            if (next_token.id === ':') {
+                advance(':');
+                switch (next_token.id) {
+                case 'true':
+                    writeable = predefined[name] !== false;
+                    advance('true');
+                    break;
+                case 'false':
+                    advance('false');
+                    break;
+                default:
+                    stop('unexpected_a');
+                }
+            }
+            predefined[name] = writeable;
+            if (next_token.id !== ',') {
+                return;
+            }
+            advance(',');
+        }
+    }
+
+
+    function do_jslint() {
+        var name, value;
+        while (next_token.id === '(string)' || next_token.identifier) {
+            name = next_token.string;
+            if (!allowed_option[name]) {
+                stop('unexpected_a');
+            }
+            advance();
+            if (next_token.id !== ':') {
+                stop('expected_a_b', next_token, ':', artifact());
+            }
+            advance(':');
+            if (typeof allowed_option[name] === 'number') {
+                value = next_token.number;
+                if (value > allowed_option[name] || value <= 0 ||
+                        Math.floor(value) !== value) {
+                    stop('expected_small_a');
+                }
+                option[name] = value;
+            } else {
+                if (next_token.id === 'true') {
+                    option[name] = true;
+                } else if (next_token.id === 'false') {
+                    option[name] = false;
+                } else {
+                    stop('unexpected_a');
+                }
+            }
+            advance();
+            if (next_token.id === ',') {
+                advance(',');
+            }
+        }
+        assume();
+    }
+
+
+    function do_properties() {
+        var name;
+        option.properties = true;
+        for (;;) {
+            if (next_token.id !== '(string)' && !next_token.identifier) {
+                return;
+            }
+            name = next_token.string;
+            advance();
+            if (next_token.id === ':') {
+                for (;;) {
+                    advance();
+                    if (next_token.id !== '(string)' && !next_token.identifier) {
+                        break;
+                    }
+                }
+            }
+            property[name] = 0;
+            if (next_token.id !== ',') {
+                return;
+            }
+            advance(',');
+        }
+    }
+
+
+    directive = function directive() {
+        var command = this.id,
+            old_comments_off = comments_off,
+            old_indent = indent;
+        comments_off = true;
+        indent = null;
+        if (next_token.line === token.line && next_token.from === token.thru) {
+            warn('missing_space_a_b', next_token, artifact(token), artifact());
+        }
+        if (lookahead.length > 0) {
+            warn('unexpected_a', this);
+        }
+        switch (command) {
+        case '/*properties':
+        case '/*property':
+        case '/*members':
+        case '/*member':
+            do_properties();
+            break;
+        case '/*jslint':
+            if (option.safe) {
+                warn('adsafe_a', this);
+            }
+            do_jslint();
+            break;
+        case '/*globals':
+        case '/*global':
+            if (option.safe) {
+                warn('adsafe_a', this);
+            }
+            do_globals();
+            break;
+        default:
+            stop('unexpected_a', this);
+        }
+        comments_off = old_comments_off;
+        advance('*/');
+        indent = old_indent;
+    };
+
+
+// Indentation intention
+
+    function edge(mode) {
+        next_token.edge = indent ? indent.open && (mode || 'edge') : '';
+    }
+
+
+    function step_in(mode) {
+        var open;
+        if (typeof mode === 'number') {
+            indent = {
+                at: +mode,
+                open: true,
+                was: indent
+            };
+        } else if (!indent) {
+            indent = {
+                at: 1,
+                mode: 'statement',
+                open: true
+            };
+        } else if (mode === 'statement') {
+            indent = {
+                at: indent.at,
+                open: true,
+                was: indent
+            };
+        } else {
+            open = mode === 'var' || next_token.line !== token.line;
+            indent = {
+                at: (open || mode === 'control'
+                    ? indent.at + option.indent
+                    : indent.at) + (indent.wrap ? option.indent : 0),
+                mode: mode,
+                open: open,
+                was: indent
+            };
+            if (mode === 'var' && open) {
+                var_mode = indent;
+            }
+        }
+    }
+
+    function step_out(id, symbol) {
+        if (id) {
+            if (indent && indent.open) {
+                indent.at -= option.indent;
+                edge();
+            }
+            advance(id, symbol);
+        }
+        if (indent) {
+            indent = indent.was;
+        }
+    }
+
+// Functions for conformance of whitespace.
+
+    function one_space(left, right) {
+        left = left || token;
+        right = right || next_token;
+        if (right.id !== '(end)' && !option.white &&
+                (token.line !== right.line ||
+                token.thru + 1 !== right.from)) {
+            warn('expected_space_a_b', right, artifact(token), artifact(right));
+        }
+    }
+
+    function one_space_only(left, right) {
+        left = left || token;
+        right = right || next_token;
+        if (right.id !== '(end)' && (left.line !== right.line ||
+                (!option.white && left.thru + 1 !== right.from))) {
+            warn('expected_space_a_b', right, artifact(left), artifact(right));
+        }
+    }
+
+    function no_space(left, right) {
+        left = left || token;
+        right = right || next_token;
+        if ((!option.white || xmode === 'styleproperty' || xmode === 'style') &&
+                left.thru !== right.from && left.line === right.line) {
+            warn('unexpected_space_a_b', right, artifact(left), artifact(right));
+        }
+    }
+
+    function no_space_only(left, right) {
+        left = left || token;
+        right = right || next_token;
+        if (right.id !== '(end)' && (left.line !== right.line ||
+                (!option.white && left.thru !== right.from))) {
+            warn('unexpected_space_a_b', right, artifact(left), artifact(right));
+        }
+    }
+
+    function spaces(left, right) {
+        if (!option.white) {
+            left = left || token;
+            right = right || next_token;
+            if (left.thru === right.from && left.line === right.line) {
+                warn('missing_space_a_b', right, artifact(left), artifact(right));
+            }
+        }
+    }
+
+    function comma() {
+        if (next_token.id !== ',') {
+            warn_at('expected_a_b', token.line, token.thru, ',', artifact());
+        } else {
+            if (!option.white) {
+                no_space_only();
+            }
+            advance(',');
+            spaces();
+        }
+    }
+
+
+    function semicolon() {
+        if (next_token.id !== ';') {
+            warn_at('expected_a_b', token.line, token.thru, ';', artifact());
+        } else {
+            if (!option.white) {
+                no_space_only();
+            }
+            advance(';');
+            if (semicolon_coda[next_token.id] !== true) {
+                spaces();
+            }
+        }
+    }
+
+    function use_strict() {
+        if (next_token.string === 'use strict') {
+            if (strict_mode) {
+                warn('unnecessary_use');
+            }
+            edge();
+            advance();
+            semicolon();
+            strict_mode = true;
+            option.undef = false;
+            return true;
+        }
+        return false;
+    }
+
+
+    function are_similar(a, b) {
+        if (a === b) {
+            return true;
+        }
+        if (Array.isArray(a)) {
+            if (Array.isArray(b) && a.length === b.length) {
+                var i;
+                for (i = 0; i < a.length; i += 1) {
+                    if (!are_similar(a[i], b[i])) {
+                        return false;
+                    }
+                }
+                return true;
+            }
+            return false;
+        }
+        if (Array.isArray(b)) {
+            return false;
+        }
+        if (a.id === '(number)' && b.id === '(number)') {
+            return a.number === b.number;
+        }
+        if (a.arity === b.arity && a.string === b.string) {
+            switch (a.arity) {
+            case 'prefix':
+            case 'suffix':
+            case undefined:
+                return a.id === b.id && are_similar(a.first, b.first);
+            case 'infix':
+                return are_similar(a.first, b.first) &&
+                    are_similar(a.second, b.second);
+            case 'ternary':
+                return are_similar(a.first, b.first) &&
+                    are_similar(a.second, b.second) &&
+                    are_similar(a.third, b.third);
+            case 'function':
+            case 'regexp':
+                return false;
+            default:
+                return true;
+            }
+        } else {
+            if (a.id === '.' && b.id === '[' && b.arity === 'infix') {
+                return a.second.string === b.second.string && b.second.id === '(string)';
+            }
+            if (a.id === '[' && a.arity === 'infix' && b.id === '.') {
+                return a.second.string === b.second.string && a.second.id === '(string)';
+            }
+        }
+        return false;
+    }
+
+
+// This is the heart of JSLINT, the Pratt parser. In addition to parsing, it
+// is looking for ad hoc lint patterns. We add .fud to Pratt's model, which is
+// like .nud except that it is only used on the first token of a statement.
+// Having .fud makes it much easier to define statement-oriented languages like
+// JavaScript. I retained Pratt's nomenclature.
+
+// .nud     Null denotation
+// .fud     First null denotation
+// .led     Left denotation
+//  lbp     Left binding power
+//  rbp     Right binding power
+
+// They are elements of the parsing method called Top Down Operator Precedence.
+
+    function expression(rbp, initial) {
+
+// rbp is the right binding power.
+// initial indicates that this is the first expression of a statement.
+
+        var left;
+        if (next_token.id === '(end)') {
+            stop('unexpected_a', token, next_token.id);
+        }
+        advance();
+        if (option.safe && scope[token.string] &&
+                scope[token.string] === global_scope[token.string] &&
+                (next_token.id !== '(' && next_token.id !== '.')) {
+            warn('adsafe_a', token);
+        }
+        if (initial) {
+            anonname = 'anonymous';
+            funct['(verb)'] = token.string;
+        }
+        if (initial === true && token.fud) {
+            left = token.fud();
+        } else {
+            if (token.nud) {
+                left = token.nud();
+            } else {
+                if (next_token.id === '(number)' && token.id === '.') {
+                    warn('leading_decimal_a', token, artifact());
+                    advance();
+                    return token;
+                }
+                stop('expected_identifier_a', token, token.id);
+            }
+            while (rbp < next_token.lbp) {
+                advance();
+                if (token.led) {
+                    left = token.led(left);
+                } else {
+                    stop('expected_operator_a', token, token.id);
+                }
+            }
+        }
+        return left;
+    }
+
+
+// Functional constructors for making the symbols that will be inherited by
+// tokens.
+
+    function symbol(s, p) {
+        var x = syntax[s];
+        if (!x || typeof x !== 'object') {
+            syntax[s] = x = {
+                id: s,
+                lbp: p || 0,
+                string: s
+            };
+        }
+        return x;
+    }
+
+    function postscript(x) {
+        x.postscript = true;
+        return x;
+    }
+
+    function ultimate(s) {
+        var x = symbol(s, 0);
+        x.from = 1;
+        x.thru = 1;
+        x.line = 0;
+        x.edge = 'edge';
+        s.string = s;
+        return postscript(x);
+    }
+
+
+    function stmt(s, f) {
+        var x = symbol(s);
+        x.identifier = x.reserved = true;
+        x.fud = f;
+        return x;
+    }
+
+    function labeled_stmt(s, f) {
+        var x = stmt(s, f);
+        x.labeled = true;
+    }
+
+    function disrupt_stmt(s, f) {
+        var x = stmt(s, f);
+        x.disrupt = true;
+    }
+
+
+    function reserve_name(x) {
+        var c = x.id.charAt(0);
+        if ((c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z')) {
+            x.identifier = x.reserved = true;
+        }
+        return x;
+    }
+
+
+    function prefix(s, f) {
+        var x = symbol(s, 150);
+        reserve_name(x);
+        x.nud = typeof f === 'function'
+            ? f
+            : function () {
+                if (s === 'typeof') {
+                    one_space();
+                } else {
+                    no_space_only();
+                }
+                this.first = expression(150);
+                this.arity = 'prefix';
+                if (this.id === '++' || this.id === '--') {
+                    if (!option.plusplus) {
+                        warn('unexpected_a', this);
+                    } else if ((!this.first.identifier || this.first.reserved) &&
+                            this.first.id !== '.' && this.first.id !== '[') {
+                        warn('bad_operand', this);
+                    }
+                }
+                return this;
+            };
+        return x;
+    }
+
+
+    function type(s, t, nud) {
+        var x = symbol(s);
+        x.arity = t;
+        if (nud) {
+            x.nud = nud;
+        }
+        return x;
+    }
+
+
+    function reserve(s, f) {
+        var x = symbol(s);
+        x.identifier = x.reserved = true;
+        if (typeof f === 'function') {
+            x.nud = f;
+        }
+        return x;
+    }
+
+
+    function constant(name) {
+        var x = reserve(name);
+        x.string = name;
+        x.nud = return_this;
+        return x;
+    }
+
+
+    function reservevar(s, v) {
+        return reserve(s, function () {
+            if (typeof v === 'function') {
+                v(this);
+            }
+            return this;
+        });
+    }
+
+
+    function infix(s, p, f, w) {
+        var x = symbol(s, p);
+        reserve_name(x);
+        x.led = function (left) {
+            this.arity = 'infix';
+            if (!w) {
+                spaces(prev_token, token);
+                spaces();
+            }
+            if (!option.bitwise && this.bitwise) {
+                warn('unexpected_a', this);
+            }
+            if (typeof f === 'function') {
+                return f(left, this);
+            }
+            this.first = left;
+            this.second = expression(p);
+            return this;
+        };
+        return x;
+    }
+
+    function expected_relation(node, message) {
+        if (node.assign) {
+            warn(message || bundle.conditional_assignment, node);
+        }
+        return node;
+    }
+
+    function expected_condition(node, message) {
+        switch (node.id) {
+        case '[':
+        case '-':
+            if (node.arity !== 'infix') {
+                warn(message || bundle.weird_condition, node);
+            }
+            break;
+        case 'false':
+        case 'function':
+        case 'Infinity':
+        case 'NaN':
+        case 'null':
+        case 'true':
+        case 'undefined':
+        case 'void':
+        case '(number)':
+        case '(regexp)':
+        case '(string)':
+        case '{':
+            warn(message || bundle.weird_condition, node);
+            break;
+        case '(':
+            if (node.first.id === '.' && numbery[node.first.second.string] === true) {
+                warn(message || bundle.weird_condition, node);
+            }
+            break;
+        }
+        return node;
+    }
+
+    function check_relation(node) {
+        switch (node.arity) {
+        case 'prefix':
+            switch (node.id) {
+            case '{':
+            case '[':
+                warn('unexpected_a', node);
+                break;
+            case '!':
+                warn('confusing_a', node);
+                break;
+            }
+            break;
+        case 'function':
+        case 'regexp':
+            warn('unexpected_a', node);
+            break;
+        default:
+            if (node.id  === 'NaN') {
+                warn('isNaN', node);
+            }
+        }
+        return node;
+    }
+
+
+    function relation(s, eqeq) {
+        return infix(s, 100, function (left, that) {
+            check_relation(left);
+            if (eqeq && !option.eqeq) {
+                warn('expected_a_b', that, eqeq, that.id);
+            }
+            var right = expression(100);
+            if (are_similar(left, right) ||
+                    ((left.id === '(string)' || left.id === '(number)') &&
+                    (right.id === '(string)' || right.id === '(number)'))) {
+                warn('weird_relation', that);
+            }
+            that.first = left;
+            that.second = check_relation(right);
+            return that;
+        });
+    }
+
+
+    function assignop(s, op) {
+        var x = infix(s, 20, function (left, that) {
+            var l;
+            that.first = left;
+            if (left.identifier) {
+                if (scope[left.string]) {
+                    if (scope[left.string].writeable === false) {
+                        warn('read_only', left);
+                    }
+                } else {
+                    stop('read_only');
+                }
+                if (funct['(params)']) {
+                    funct['(params)'].forEach(function (value) {
+                        if (value.string === left.string) {
+                            value.assign = true;
+                        }
+                    });
+                }
+            } else if (option.safe) {
+                l = left;
+                do {
+                    if (typeof predefined[l.string] === 'boolean') {
+                        warn('adsafe_a', l);
+                    }
+                    l = l.first;
+                } while (l);
+            }
+            if (left === syntax['function']) {
+                warn('identifier_function', token);
+            }
+            if (left.id === '.' || left.id === '[') {
+                if (!left.first || left.first.string === 'arguments') {
+                    warn('bad_assignment', that);
+                }
+            } else if (left.identifier) {
+                if (!left.reserved && funct[left.string] === 'exception') {
+                    warn('assign_exception', left);
+                }
+            } else {
+                warn('bad_assignment', that);
+            }
+            that.second = expression(19);
+            if (that.id === '=' && are_similar(that.first, that.second)) {
+                warn('weird_assignment', that);
+            }
+            return that;
+        });
+        x.assign = true;
+        if (op) {
+            if (syntax[op].bitwise) {
+                x.bitwise = true;
+            }
+        }
+        return x;
+    }
+
+
+    function bitwise(s, p) {
+        var x = infix(s, p, 'number');
+        x.bitwise = true;
+        return x;
+    }
+
+
+    function suffix(s) {
+        var x = symbol(s, 150);
+        x.led = function (left) {
+            no_space_only(prev_token, token);
+            if (!option.plusplus) {
+                warn('unexpected_a', this);
+            } else if ((!left.identifier || left.reserved) &&
+                    left.id !== '.' && left.id !== '[') {
+                warn('bad_operand', this);
+            }
+            this.first = left;
+            this.arity = 'suffix';
+            return this;
+        };
+        return x;
+    }
+
+
+    function optional_identifier() {
+        if (next_token.identifier) {
+            advance();
+            if (option.safe && banned[token.string]) {
+                warn('adsafe_a', token);
+            } else if (token.reserved && !option.es5) {
+                warn('expected_identifier_a_reserved', token);
+            }
+            return token.string;
+        }
+    }
+
+
+    function identifier() {
+        var i = optional_identifier();
+        if (!i) {
+            stop(token.id === 'function' && next_token.id === '('
+                ? 'name_function'
+                : 'expected_identifier_a');
+        }
+        return i;
+    }
+
+
+    function statement() {
+
+        var label, old_scope = scope, the_statement;
+
+// We don't like the empty statement.
+
+        if (next_token.id === ';') {
+            warn('unexpected_a');
+            semicolon();
+            return;
+        }
+
+// Is this a labeled statement?
+
+        if (next_token.identifier && !next_token.reserved && peek().id === ':') {
+            edge('label');
+            label = next_token;
+            advance();
+            advance(':');
+            scope = Object.create(old_scope);
+            add_label(label, 'label');
+            if (next_token.labeled !== true || funct === global_funct) {
+                stop('unexpected_label_a', label);
+            } else if (jx.test(label.string + ':')) {
+                warn('url', label);
+            }
+            next_token.label = label;
+        }
+
+// Parse the statement.
+
+        if (token.id !== 'else') {
+            edge();
+        }
+        step_in('statement');
+        the_statement = expression(0, true);
+        if (the_statement) {
+
+// Look for the final semicolon.
+
+            if (the_statement.arity === 'statement') {
+                if (the_statement.id === 'switch' ||
+                        (the_statement.block && the_statement.id !== 'do')) {
+                    spaces();
+                } else {
+                    semicolon();
+                }
+            } else {
+
+// If this is an expression statement, determine if it is acceptable.
+// We do not like
+//      new Blah();
+// statments. If it is to be used at all, new should only be used to make
+// objects, not side effects. The expression statements we do like do
+// assignment or invocation or delete.
+
+                if (the_statement.id === '(') {
+                    if (the_statement.first.id === 'new') {
+                        warn('bad_new');
+                    }
+                } else if (!the_statement.assign &&
+                        the_statement.id !== 'delete' &&
+                        the_statement.id !== '++' &&
+                        the_statement.id !== '--') {
+                    warn('assignment_function_expression', token);
+                }
+                semicolon();
+            }
+        }
+        step_out();
+        scope = old_scope;
+        return the_statement;
+    }
+
+
+    function statements() {
+        var array = [], disruptor, the_statement;
+
+// A disrupt statement may not be followed by any other statement.
+// If the last statement is disrupt, then the sequence is disrupt.
+
+        while (next_token.postscript !== true) {
+            if (next_token.id === ';') {
+                warn('unexpected_a', next_token);
+                semicolon();
+            } else {
+                if (next_token.string === 'use strict') {
+                    if ((!node_js && xmode !== 'script') || funct !== global_funct || array.length > 0) {
+                        warn('function_strict');
+                    }
+                    use_strict();
+                }
+                if (disruptor) {
+                    warn('unreachable_a_b', next_token, next_token.string,
+                        disruptor.string);
+                    disruptor = null;
+                }
+                the_statement = statement();
+                if (the_statement) {
+                    array.push(the_statement);
+                    if (the_statement.disrupt) {
+                        disruptor = the_statement;
+                        array.disrupt = true;
+                    }
+                }
+            }
+        }
+        return array;
+    }
+
+
+    function block(ordinary) {
+
+// array block is array sequence of statements wrapped in braces.
+// ordinary is false for function bodies and try blocks.
+// ordinary is true for if statements, while, etc.
+
+        var array,
+            curly = next_token,
+            old_in_block = in_block,
+            old_scope = scope,
+            old_strict_mode = strict_mode;
+
+        in_block = ordinary;
+        scope = Object.create(scope);
+        spaces();
+        if (next_token.id === '{') {
+            advance('{');
+            step_in();
+            if (!ordinary && !use_strict() && !old_strict_mode &&
+                    !option.sloppy && funct['(context)'] === global_funct) {
+                warn('missing_use_strict');
+            }
+            array = statements();
+            strict_mode = old_strict_mode;
+            step_out('}', curly);
+        } else if (!ordinary) {
+            stop('expected_a_b', next_token, '{', artifact());
+        } else {
+            warn('expected_a_b', next_token, '{', artifact());
+            array = [statement()];
+            array.disrupt = array[0].disrupt;
+        }
+        funct['(verb)'] = null;
+        scope = old_scope;
+        in_block = old_in_block;
+        if (ordinary && array.length === 0) {
+            warn('empty_block');
+        }
+        return array;
+    }
+
+
+    function tally_property(name) {
+        if (option.properties && typeof property[name] !== 'number') {
+            warn('unexpected_property_a', token, name);
+        }
+        if (typeof property[name] === 'number') {
+            property[name] += 1;
+        } else {
+            property[name] = 1;
+        }
+    }
+
+
+// ECMAScript parser
+
+    syntax['(identifier)'] = {
+        id: '(identifier)',
+        lbp: 0,
+        identifier: true,
+        nud: function () {
+            var name = this.string,
+                variable = scope[name],
+                site,
+                writeable;
+
+// If the variable is not in scope, then we may have an undeclared variable.
+// Check the predefined list. If it was predefined, create the global
+// variable.
+
+            if (typeof variable !== 'object') {
+                writeable = predefined[name];
+                if (typeof writeable === 'boolean') {
+                    global_scope[name] = variable = {
+                        string:    name,
+                        writeable: writeable,
+                        funct:     global_funct
+                    };
+                    global_funct[name] = 'var';
+
+// But if the variable is not in scope, and is not predefined, and if we are not
+// in the global scope, then we have an undefined variable error.
+
+                } else {
+                    if (!option.undef) {
+                        warn('used_before_a', token);
+                    }
+                    scope[name] = variable = {
+                        string: name,
+                        writeable: true,
+                        funct: funct
+                    };
+                    funct[name] = 'undef';
+                }
+
+            }
+            site = variable.funct;
+
+// The name is in scope and defined in the current function.
+
+            if (funct === site) {
+
+//      Change 'unused' to 'var', and reject labels.
+
+                switch (funct[name]) {
+                case 'becoming':
+                    warn('unexpected_a', token);
+                    funct[name] = 'var';
+                    break;
+                case 'unused':
+                    funct[name] = 'var';
+                    break;
+                case 'unparam':
+                    funct[name] = 'parameter';
+                    break;
+                case 'unction':
+                    funct[name] = 'function';
+                    break;
+                case 'label':
+                    warn('a_label', token, name);
+                    break;
+                }
+
+// If the name is already defined in the current
+// function, but not as outer, then there is a scope error.
+
+            } else {
+                switch (funct[name]) {
+                case 'closure':
+                case 'function':
+                case 'var':
+                case 'unused':
+                    warn('a_scope', token, name);
+                    break;
+                case 'label':
+                    warn('a_label', token, name);
+                    break;
+                case 'outer':
+                case 'global':
+                    break;
+                default:
+
+// If the name is defined in an outer function, make an outer entry, and if
+// it was unused, make it var.
+
+                    switch (site[name]) {
+                    case 'becoming':
+                    case 'closure':
+                    case 'function':
+                    case 'parameter':
+                    case 'unction':
+                    case 'unused':
+                    case 'var':
+                        site[name] = 'closure';
+                        funct[name] = site === global_funct
+                            ? 'global'
+                            : 'outer';
+                        break;
+                    case 'unparam':
+                        site[name] = 'parameter';
+                        funct[name] = 'outer';
+                        break;
+                    case 'undef':
+                        funct[name] = 'undef';
+                        break;
+                    case 'label':
+                        warn('a_label', token, name);
+                        break;
+                    }
+                }
+            }
+            return this;
+        },
+        led: function () {
+            stop('expected_operator_a');
+        }
+    };
+
+// Build the syntax table by declaring the syntactic elements.
+
+    type('(array)', 'array');
+    type('(color)', 'color');
+    type('(function)', 'function');
+    type('(number)', 'number', return_this);
+    type('(object)', 'object');
+    type('(string)', 'string', return_this);
+    type('(boolean)', 'boolean', return_this);
+    type('(range)', 'range');
+    type('(regexp)', 'regexp', return_this);
+
+    ultimate('(begin)');
+    ultimate('(end)');
+    ultimate('(error)');
+    postscript(symbol('</'));
+    symbol('<!');
+    symbol('<!--');
+    symbol('-->');
+    postscript(symbol('}'));
+    symbol(')');
+    symbol(']');
+    postscript(symbol('"'));
+    postscript(symbol('\''));
+    symbol(';');
+    symbol(':');
+    symbol(',');
+    symbol('#');
+    symbol('@');
+    symbol('*/');
+    postscript(reserve('case'));
+    reserve('catch');
+    postscript(reserve('default'));
+    reserve('else');
+    reserve('finally');
+
+    reservevar('arguments', function (x) {
+        if (strict_mode && funct === global_funct) {
+            warn('strict', x);
+        } else if (option.safe) {
+            warn('adsafe_a', x);
+        }
+        funct['(arguments)'] = true;
+    });
+    reservevar('eval', function (x) {
+        if (option.safe) {
+            warn('adsafe_a', x);
+        }
+    });
+    constant('false', 'boolean');
+    constant('Infinity', 'number');
+    constant('NaN', 'number');
+    constant('null', '');
+    reservevar('this', function (x) {
+        if (option.safe) {
+            warn('adsafe_a', x);
+        } else if (strict_mode && funct['(token)'].arity === 'statement' &&
+                funct['(name)'].charAt(0) > 'Z') {
+            warn('strict', x);
+        }
+    });
+    constant('true', 'boolean');
+    constant('undefined', '');
+
+    infix('?', 30, function (left, that) {
+        step_in('?');
+        that.first = expected_condition(expected_relation(left));
+        that.second = expression(0);
+        spaces();
+        step_out();
+        var colon = next_token;
+        advance(':');
+        step_in(':');
+        spaces();
+        that.third = expression(10);
+        that.arity = 'ternary';
+        if (are_similar(that.second, that.third)) {
+            warn('weird_ternary', colon);
+        } else if (are_similar(that.first, that.second)) {
+            warn('use_or', that);
+        }
+        step_out();
+        return that;
+    });
+
+    infix('||', 40, function (left, that) {
+        function paren_check(that) {
+            if (that.id === '&&' && !that.paren) {
+                warn('and', that);
+            }
+            return that;
+        }
+
+        that.first = paren_check(expected_condition(expected_relation(left)));
+        that.second = paren_check(expected_relation(expression(40)));
+        if (are_similar(that.first, that.second)) {
+            warn('weird_condition', that);
+        }
+        return that;
+    });
+
+    infix('&&', 50, function (left, that) {
+        that.first = expected_condition(expected_relation(left));
+        that.second = expected_relation(expression(50));
+        if (are_similar(that.first, that.second)) {
+            warn('weird_condition', that);
+        }
+        return that;
+    });
+
+    prefix('void', function () {
+        this.first = expression(0);
+        this.arity = 'prefix';
+        if (option.es5) {
+            warn('expected_a_b', this, 'undefined', 'void');
+        } else if (this.first.number !== 0) {
+            warn('expected_a_b', this.first, '0', artifact(this.first));
+        }
+        return this;
+    });
+
+    bitwise('|', 70);
+    bitwise('^', 80);
+    bitwise('&', 90);
+
+    relation('==', '===');
+    relation('===');
+    relation('!=', '!==');
+    relation('!==');
+    relation('<');
+    relation('>');
+    relation('<=');
+    relation('>=');
+
+    bitwise('<<', 120);
+    bitwise('>>', 120);
+    bitwise('>>>', 120);
+
+    infix('in', 120, function (left, that) {
+        warn('infix_in', that);
+        that.left = left;
+        that.right = expression(130);
+        return that;
+    });
+    infix('instanceof', 120);
+    infix('+', 130, function (left, that) {
+        if (left.id === '(number)') {
+            if (left.number === 0) {
+                warn('unexpected_a', left, '0');
+            }
+        } else if (left.id === '(string)') {
+            if (left.string === '') {
+                warn('expected_a_b', left, 'String', '\'\'');
+            }
+        }
+        var right = expression(130);
+        if (right.id === '(number)') {
+            if (right.number === 0) {
+                warn('unexpected_a', right, '0');
+            }
+        } else if (right.id === '(string)') {
+            if (right.string === '') {
+                warn('expected_a_b', right, 'String', '\'\'');
+            }
+        }
+        if (left.id === right.id) {
+            if (left.id === '(string)' || left.id === '(number)') {
+                if (left.id === '(string)') {
+                    left.string += right.string;
+                    if (jx.test(left.string)) {
+                        warn('url', left);
+                    }
+                } else {
+                    left.number += right.number;
+                }
+                left.thru = right.thru;
+                return left;
+            }
+        }
+        that.first = left;
+        that.second = right;
+        return that;
+    });
+    prefix('+', 'num');
+    prefix('+++', function () {
+        warn('confusing_a', token);
+        this.first = expression(150);
+        this.arity = 'prefix';
+        return this;
+    });
+    infix('+++', 130, function (left) {
+        warn('confusing_a', token);
+        this.first = left;
+        this.second = expression(130);
+        return this;
+    });
+    infix('-', 130, function (left, that) {
+        if ((left.id === '(number)' && left.number === 0) || left.id === '(string)') {
+            warn('unexpected_a', left);
+        }
+        var right = expression(130);
+        if ((right.id === '(number)' && right.number === 0) || right.id === '(string)') {
+            warn('unexpected_a', right);
+        }
+        if (left.id === right.id && left.id === '(number)') {
+            left.number -= right.number;
+            left.thru = right.thru;
+            return left;
+        }
+        that.first = left;
+        that.second = right;
+        return that;
+    });
+    prefix('-');
+    prefix('---', function () {
+        warn('confusing_a', token);
+        this.first = expression(150);
+        this.arity = 'prefix';
+        return this;
+    });
+    infix('---', 130, function (left) {
+        warn('confusing_a', token);
+        this.first = left;
+        this.second = expression(130);
+        return this;
+    });
+    infix('*', 140, function (left, that) {
+        if ((left.id === '(number)' && (left.number === 0 || left.number === 1)) || left.id === '(string)') {
+            warn('unexpected_a', left);
+        }
+        var right = expression(140);
+        if ((right.id === '(number)' && (right.number === 0 || right.number === 1)) || right.id === '(string)') {
+            warn('unexpected_a', right);
+        }
+        if (left.id === right.id && left.id === '(number)') {
+            left.number *= right.number;
+            left.thru = right.thru;
+            return left;
+        }
+        that.first = left;
+        that.second = right;
+        return that;
+    });
+    infix('/', 140, function (left, that) {
+        if ((left.id === '(number)' && left.number === 0) || left.id === '(string)') {
+            warn('unexpected_a', left);
+        }
+        var right = expression(140);
+        if ((right.id === '(number)' && (right.number === 0 || right.number === 1)) || right.id === '(string)') {
+            warn('unexpected_a', right);
+        }
+        if (left.id === right.id && left.id === '(number)') {
+            left.number /= right.number;
+            left.thru = right.thru;
+            return left;
+        }
+        that.first = left;
+        that.second = right;
+        return that;
+    });
+    infix('%', 140, function (left, that) {
+        if ((left.id === '(number)' && (left.number === 0 || left.number === 1)) || left.id === '(string)') {
+            warn('unexpected_a', left);
+        }
+        var right = expression(140);
+        if ((right.id === '(number)' && right.number === 0) || right.id === '(string)') {
+            warn('unexpected_a', right);
+        }
+        if (left.id === right.id && left.id === '(number)') {
+            left.number %= right.number;
+            left.thru = right.thru;
+            return left;
+        }
+        that.first = left;
+        that.second = right;
+        return that;
+    });
+
+    suffix('++');
+    prefix('++');
+
+    suffix('--');
+    prefix('--');
+    prefix('delete', function () {
+        one_space();
+        var p = expression(0);
+        if (!p || (p.id !== '.' && p.id !== '[')) {
+            warn('deleted');
+        }
+        this.first = p;
+        return this;
+    });
+
+
+    prefix('~', function () {
+        no_space_only();
+        if (!option.bitwise) {
+            warn('unexpected_a', this);
+        }
+        expression(150);
+        return this;
+    });
+    prefix('!', function () {
+        no_space_only();
+        this.first = expected_condition(expression(150));
+        this.arity = 'prefix';
+        if (bang[this.first.id] === true || this.first.assign) {
+            warn('confusing_a', this);
+        }
+        return this;
+    });
+    prefix('typeof', null);
+    prefix('new', function () {
+        one_space();
+        var c = expression(160), n, p, v;
+        this.first = c;
+        if (c.id !== 'function') {
+            if (c.identifier) {
+                switch (c.string) {
+                case 'Object':
+                    warn('use_object', token);
+                    break;
+                case 'Array':
+                    if (next_token.id === '(') {
+                        p = next_token;
+                        p.first = this;
+                        advance('(');
+                        if (next_token.id !== ')') {
+                            n = expression(0);
+                            p.second = [n];
+                            if (n.id !== '(number)' || next_token.id === ',') {
+                                warn('use_array', p);
+                            }
+                            while (next_token.id === ',') {
+                                advance(',');
+                                p.second.push(expression(0));
+                            }
+                        } else {
+                            warn('use_array', token);
+                        }
+                        advance(')', p);
+                        return p;
+                    }
+                    warn('use_array', token);
+                    break;
+                case 'Number':
+                case 'String':
+                case 'Boolean':
+                case 'Math':
+                case 'JSON':
+                    warn('not_a_constructor', c);
+                    break;
+                case 'Function':
+                    if (!option.evil) {
+                        warn('function_eval');
+                    }
+                    break;
+                case 'Date':
+                case 'RegExp':
+                case 'this':
+                    break;
+                default:
+                    if (c.id !== 'function') {
+                        v = c.string.charAt(0);
+                        if (!option.newcap && (v < 'A' || v > 'Z')) {
+                            warn('constructor_name_a', token);
+                        }
+                    }
+                }
+            } else {
+                if (c.id !== '.' && c.id !== '[' && c.id !== '(') {
+                    warn('bad_constructor', token);
+                }
+            }
+        } else {
+            warn('weird_new', this);
+        }
+        if (next_token.id !== '(') {
+            warn('missing_a', next_token, '()');
+        }
+        return this;
+    });
+
+    infix('(', 160, function (left, that) {
+        var p;
+        if (indent && indent.mode === 'expression') {
+            no_space(prev_token, token);
+        } else {
+            no_space_only(prev_token, token);
+        }
+        if (!left.immed && left.id === 'function') {
+            warn('wrap_immediate');
+        }
+        p = [];
+        if (left.identifier) {
+            if (left.string.match(/^[A-Z]([A-Z0-9_$]*[a-z][A-Za-z0-9_$]*)?$/)) {
+                if (left.string !== 'Number' && left.string !== 'String' &&
+                        left.string !== 'Boolean' && left.string !== 'Date') {
+                    if (left.string === 'Math' || left.string === 'JSON') {
+                        warn('not_a_function', left);
+                    } else if (left.string === 'Object') {
+                        warn('use_object', token);
+                    } else if (left.string === 'Array' || !option.newcap) {
+                        warn('missing_a', left, 'new');
+                    }
+                }
+            }
+        } else if (left.id === '.') {
+            if (option.safe && left.first.string === 'Math' &&
+                    left.second === 'random') {
+                warn('adsafe_a', left);
+            } else if (left.second.string === 'split' &&
+                    left.first.id === '(string)') {
+                warn('use_array', left.second);
+            }
+        }
+        step_in();
+        if (next_token.id !== ')') {
+            no_space();
+            for (;;) {
+                edge();
+                p.push(expression(10));
+                if (next_token.id !== ',') {
+                    break;
+                }
+                comma();
+            }
+        }
+        no_space();
+        step_out(')', that);
+        if (typeof left === 'object') {
+            if (left.string === 'parseInt' && p.length === 1) {
+                warn('radix', left);
+            }
+            if (!option.evil) {
+                if (left.string === 'eval' || left.string === 'Function' ||
+                        left.string === 'execScript') {
+                    warn('evil', left);
+                } else if (p[0] && p[0].id === '(string)' &&
+                        (left.string === 'setTimeout' ||
+                        left.string === 'setInterval')) {
+                    warn('implied_evil', left);
+                }
+            }
+            if (!left.identifier && left.id !== '.' && left.id !== '[' &&
+                    left.id !== '(' && left.id !== '&&' && left.id !== '||' &&
+                    left.id !== '?') {
+                warn('bad_invocation', left);
+            }
+        }
+        that.first = left;
+        that.second = p;
+        return that;
+    }, true);
+
+    prefix('(', function () {
+        step_in('expression');
+        no_space();
+        edge();
+        if (next_token.id === 'function') {
+            next_token.immed = true;
+        }
+        var value = expression(0);
+        value.paren = true;
+        no_space();
+        step_out(')', this);
+        if (value.id === 'function') {
+            switch (next_token.id) {
+            case '(':
+                warn('move_invocation');
+                break;
+            case '.':
+            case '[':
+                warn('unexpected_a');
+                break;
+            default:
+                warn('bad_wrap', this);
+            }
+        }
+        return value;
+    });
+
+    infix('.', 170, function (left, that) {
+        no_space(prev_token, token);
+        no_space();
+        var name = identifier();
+        if (typeof name === 'string') {
+            tally_property(name);
+        }
+        that.first = left;
+        that.second = token;
+        if (left && left.string === 'arguments' &&
+                (name === 'callee' || name === 'caller')) {
+            warn('avoid_a', left, 'arguments.' + name);
+        } else if (!option.evil && left && left.string === 'document' &&
+                (name === 'write' || name === 'writeln')) {
+            warn('write_is_wrong', left);
+        } else if (!option.stupid && name.indexOf('Sync') > 0) {
+            warn('sync_a', token);
+        } else if (option.adsafe) {
+            if (!adsafe_top && left.string === 'ADSAFE') {
+                if (name === 'id' || name === 'lib') {
+                    warn('adsafe_a', that);
+                } else if (name === 'go') {
+                    if (xmode !== 'script') {
+                        warn('adsafe_a', that);
+                    } else if (adsafe_went || next_token.id !== '(' ||
+                            peek(0).id !== '(string)' ||
+                            peek(0).string !== adsafe_id ||
+                            peek(1).id !== ',') {
+                        stop('adsafe_a', that, 'go');
+                    }
+                    adsafe_went = true;
+                    adsafe_may = false;
+                }
+            }
+            adsafe_top = false;
+        }
+        if (!option.evil && (name === 'eval' || name === 'execScript')) {
+            warn('evil');
+        } else if (option.safe) {
+            for (;;) {
+                if (banned[name] === true) {
+                    warn('adsafe_a', token, name);
+                }
+                if (typeof predefined[left.string] !== 'boolean' ||    //// check for writeable
+                        next_token.id === '(') {
+                    break;
+                }
+                if (next_token.id !== '.') {
+                    warn('adsafe_a', that);
+                    break;
+                }
+                advance('.');
+                token.first = that;
+                token.second = name;
+                that = token;
+                name = identifier();
+                if (typeof name === 'string') {
+                    tally_property(name);
+                }
+            }
+        }
+        return that;
+    }, true);
+
+    infix('[', 170, function (left, that) {
+        var e, s;
+        no_space_only(prev_token, token);
+        no_space();
+        step_in();
+        edge();
+        e = expression(0);
+        switch (e.id) {
+        case '(number)':
+            if (e.id === '(number)' && left.id === 'arguments') {
+                warn('use_param', left);
+            }
+            break;
+        case '(string)':
+            if (option.safe && (banned[e.string] ||
+                    e.string.charAt(0) === '_' || e.string.slice(-1) === '_')) {
+                warn('adsafe_subscript_a', e);
+            } else if (!option.evil &&
+                    (e.string === 'eval' || e.string === 'execScript')) {
+                warn('evil', e);
+            } else if (!option.sub && ix.test(e.string)) {
+                s = syntax[e.string];
+                if (!s || !s.reserved) {
+                    warn('subscript', e);
+                }
+            }
+            tally_property(e.string);
+            break;
+        default:
+            if (option.safe) {
+                warn('adsafe_subscript_a', e);
+            }
+        }
+        step_out(']', that);
+        no_space(prev_token, token);
+        that.first = left;
+        that.second = e;
+        return that;
+    }, true);
+
+    prefix('[', function () {
+        this.arity = 'prefix';
+        this.first = [];
+        step_in('array');
+        while (next_token.id !== '(end)') {
+            while (next_token.id === ',') {
+                warn('unexpected_a', next_token);
+                advance(',');
+            }
+            if (next_token.id === ']') {
+                break;
+            }
+            indent.wrap = false;
+            edge();
+            this.first.push(expression(10));
+            if (next_token.id === ',') {
+                comma();
+                if (next_token.id === ']' && !option.es5) {
+                    warn('unexpected_a', token);
+                    break;
+                }
+            } else {
+                break;
+            }
+        }
+        step_out(']', this);
+        return this;
+    }, 170);
+
+
+    function property_name() {
+        var id = optional_identifier(true);
+        if (!id) {
+            if (next_token.id === '(string)') {
+                id = next_token.string;
+                if (option.safe) {
+                    if (banned[id]) {
+                        warn('adsafe_a');
+                    } else if (id.charAt(0) === '_' ||
+                            id.charAt(id.length - 1) === '_') {
+                        warn('dangling_a');
+                    }
+                }
+                advance();
+            } else if (next_token.id === '(number)') {
+                id = next_token.number.toString();
+                advance();
+            }
+        }
+        return id;
+    }
+
+
+    function function_params() {
+        var id, paren = next_token, params = [];
+        advance('(');
+        step_in();
+        no_space();
+        if (next_token.id === ')') {
+            no_space();
+            step_out(')', paren);
+            return params;
+        }
+        for (;;) {
+            edge();
+            id = identifier();
+            params.push(token);
+            add_label(token, option.unparam ? 'parameter' : 'unparam');
+            if (next_token.id === ',') {
+                comma();
+            } else {
+                no_space();
+                step_out(')', paren);
+                return params;
+            }
+        }
+    }
+
+
+
+    function do_function(func, name) {
+        var old_funct      = funct,
+            old_option     = option,
+            old_scope      = scope;
+        funct = {
+            '(name)'     : name || '\'' + (anonname || '').replace(nx, sanitize) + '\'',
+            '(line)'     : next_token.line,
+            '(context)'  : old_funct,
+            '(breakage)' : 0,
+            '(loopage)'  : 0,
+            '(scope)'    : scope,
+            '(token)'    : func
+        };
+        option = Object.create(old_option);
+        scope = Object.create(old_scope);
+        functions.push(funct);
+        func.name = name;
+        if (name) {
+            add_label(func, 'function', name);
+        }
+        func.writeable = false;
+        func.first = funct['(params)'] = function_params();
+        one_space();
+        func.block = block(false);
+        if (funct['(arguments)']) {
+            func.first.forEach(function (value) {
+                if (value.assign) {
+                    warn('parameter_arguments_a', value, value.string);
+                }
+            });
+        }
+        funct      = old_funct;
+        option     = old_option;
+        scope      = old_scope;
+    }
+
+
+    assignop('=');
+    assignop('+=', '+');
+    assignop('-=', '-');
+    assignop('*=', '*');
+    assignop('/=', '/').nud = function () {
+        stop('slash_equal');
+    };
+    assignop('%=', '%');
+    assignop('&=', '&');
+    assignop('|=', '|');
+    assignop('^=', '^');
+    assignop('<<=', '<<');
+    assignop('>>=', '>>');
+    assignop('>>>=', '>>>');
+
+
+    prefix('{', function () {
+        var get, i, j, name, p, set, seen = {};
+        this.arity = 'prefix';
+        this.first = [];
+        step_in();
+        while (next_token.id !== '}') {
+            indent.wrap = false;
+
+// JSLint recognizes the ES5 extension for get/set in object literals,
+// but requires that they be used in pairs.
+
+            edge();
+            if (next_token.string === 'get' && peek().id !== ':') {
+                if (!option.es5) {
+                    warn('es5');
+                }
+                get = next_token;
+                advance('get');
+                one_space_only();
+                name = next_token;
+                i = property_name();
+                if (!i) {
+                    stop('missing_property');
+                }
+                get.string = '';
+                do_function(get);
+                if (funct['(loopage)']) {
+                    warn('function_loop', get);
+                }
+                p = get.first;
+                if (p && p.length) {
+                    warn('parameter_a_get_b', p[0], p[0].string, i);
+                }
+                comma();
+                set = next_token;
+                spaces();
+                edge();
+                advance('set');
+                set.string = '';
+                one_space_only();
+                j = property_name();
+                if (i !== j) {
+                    stop('expected_a_b', token, i, j || next_token.string);
+                }
+                do_function(set);
+                if (set.block.length === 0) {
+                    warn('missing_a', token, 'throw');
+                }
+                p = set.first;
+                if (!p || p.length !== 1) {
+                    stop('parameter_set_a', set, 'value');
+                } else if (p[0].string !== 'value') {
+                    stop('expected_a_b', p[0], 'value', p[0].string);
+                }
+                name.first = [get, set];
+            } else {
+                name = next_token;
+                i = property_name();
+                if (typeof i !== 'string') {
+                    stop('missing_property');
+                }
+                advance(':');
+                spaces();
+                name.first = expression(10);
+            }
+            this.first.push(name);
+            if (seen[i] === true) {
+                warn('duplicate_a', next_token, i);
+            }
+            seen[i] = true;
+            tally_property(i);
+            if (next_token.id !== ',') {
+                break;
+            }
+            for (;;) {
+                comma();
+                if (next_token.id !== ',') {
+                    break;
+                }
+                warn('unexpected_a', next_token);
+            }
+            if (next_token.id === '}' && !option.es5) {
+                warn('unexpected_a', token);
+            }
+        }
+        step_out('}', this);
+        return this;
+    });
+
+    stmt('{', function () {
+        warn('statement_block');
+        this.arity = 'statement';
+        this.block = statements();
+        this.disrupt = this.block.disrupt;
+        advance('}', this);
+        return this;
+    });
+
+    stmt('/*global', directive);
+    stmt('/*globals', directive);
+    stmt('/*jslint', directive);
+    stmt('/*member', directive);
+    stmt('/*members', directive);
+    stmt('/*property', directive);
+    stmt('/*properties', directive);
+
+    stmt('var', function () {
+
+// JavaScript does not have block scope. It only has function scope. So,
+// declaring a variable in a block can have unexpected consequences.
+
+// var.first will contain an array, the array containing name tokens
+// and assignment tokens.
+
+        var assign, id, name;
+
+        if (funct['(vars)'] && !option.vars) {
+            warn('combine_var');
+        } else if (funct !== global_funct) {
+            funct['(vars)'] = true;
+        }
+        this.arity = 'statement';
+        this.first = [];
+        step_in('var');
+        for (;;) {
+            name = next_token;
+            id = identifier();
+            add_label(name, 'becoming');
+
+            if (next_token.id === '=') {
+                assign = next_token;
+                assign.first = name;
+                spaces();
+                advance('=');
+                spaces();
+                if (next_token.id === 'undefined') {
+                    warn('unnecessary_initialize', token, id);
+                }
+                if (peek(0).id === '=' && next_token.identifier) {
+                    stop('var_a_not');
+                }
+                assign.second = expression(0);
+                assign.arity = 'infix';
+                this.first.push(assign);
+            } else {
+                this.first.push(name);
+            }
+            if (funct[id] === 'becoming') {
+                funct[id] = 'unused';
+            }
+            if (next_token.id !== ',') {
+                break;
+            }
+            comma();
+            indent.wrap = false;
+            if (var_mode && next_token.line === token.line &&
+                    this.first.length === 1) {
+                var_mode = null;
+                indent.open = false;
+                indent.at -= option.indent;
+            }
+            spaces();
+            edge();
+        }
+        var_mode = null;
+        step_out();
+        return this;
+    });
+
+    stmt('function', function () {
+        one_space();
+        if (in_block) {
+            warn('function_block', token);
+        }
+        var name = next_token, id = identifier();
+        add_label(name, 'unction');
+        no_space();
+        this.arity = 'statement';
+        do_function(this, id);
+        if (next_token.id === '(' && next_token.line === token.line) {
+            stop('function_statement');
+        }
+        return this;
+    });
+
+    prefix('function', function () {
+        if (!option.anon) {
+            one_space();
+        }
+        var id = optional_identifier();
+        if (id) {
+            no_space();
+        } else {
+            id = '';
+        }
+        do_function(this, id);
+        if (funct['(loopage)']) {
+            warn('function_loop');
+        }
+        switch (next_token.id) {
+        case ';':
+        case '(':
+        case ')':
+        case ',':
+        case ']':
+        case '}':
+        case ':':
+            break;
+        case '.':
+            if (peek().string !== 'bind' || peek(1).id !== '(') {
+                warn('unexpected_a');
+            }
+            break;
+        default:
+            stop('unexpected_a');
+        }
+        this.arity = 'function';
+        return this;
+    });
+
+    stmt('if', function () {
+        var paren = next_token;
+        one_space();
+        advance('(');
+        step_in('control');
+        no_space();
+        edge();
+        this.arity = 'statement';
+        this.first = expected_condition(expected_relation(expression(0)));
+        no_space();
+        step_out(')', paren);
+        one_space();
+        this.block = block(true);
+        if (next_token.id === 'else') {
+            one_space();
+            advance('else');
+            one_space();
+            this['else'] = next_token.id === 'if' || next_token.id === 'switch'
+                ? statement(true)
+                : block(true);
+            if (this['else'].disrupt && this.block.disrupt) {
+                this.disrupt = true;
+            }
+        }
+        return this;
+    });
+
+    stmt('try', function () {
+
+// try.first    The catch variable
+// try.second   The catch clause
+// try.third    The finally clause
+// try.block    The try block
+
+        var exception_variable, old_scope, paren;
+        if (option.adsafe) {
+            warn('adsafe_a', this);
+        }
+        one_space();
+        this.arity = 'statement';
+        this.block = block(false);
+        if (next_token.id === 'catch') {
+            one_space();
+            advance('catch');
+            one_space();
+            paren = next_token;
+            advance('(');
+            step_in('control');
+            no_space();
+            edge();
+            old_scope = scope;
+            scope = Object.create(old_scope);
+            exception_variable = next_token.string;
+            this.first = exception_variable;
+            if (!next_token.identifier) {
+                warn('expected_identifier_a', next_token);
+            } else {
+                add_label(next_token, 'exception');
+            }
+            advance();
+            no_space();
+            step_out(')', paren);
+            one_space();
+            this.second = block(false);
+            scope = old_scope;
+        }
+        if (next_token.id === 'finally') {
+            one_space();
+            advance('finally');
+            one_space();
+            this.third = block(false);
+        } else if (!this.second) {
+            stop('expected_a_b', next_token, 'catch', artifact());
+        }
+        return this;
+    });
+
+    labeled_stmt('while', function () {
+        one_space();
+        var paren = next_token;
+        funct['(breakage)'] += 1;
+        funct['(loopage)'] += 1;
+        advance('(');
+        step_in('control');
+        no_space();
+        edge();
+        this.arity = 'statement';
+        this.first = expected_relation(expression(0));
+        if (this.first.id !== 'true') {
+            expected_condition(this.first, bundle.unexpected_a);
+        }
+        no_space();
+        step_out(')', paren);
+        one_space();
+        this.block = block(true);
+        if (this.block.disrupt) {
+            warn('strange_loop', prev_token);
+        }
+        funct['(breakage)'] -= 1;
+        funct['(loopage)'] -= 1;
+        return this;
+    });
+
+    reserve('with');
+
+    labeled_stmt('switch', function () {
+
+// switch.first         the switch expression
+// switch.second        the array of cases. A case is 'case' or 'default' token:
+//    case.first        the array of case expressions
+//    case.second       the array of statements
+// If all of the arrays of statements are disrupt, then the switch is disrupt.
+
+        var cases = [],
+            old_in_block = in_block,
+            particular,
+            the_case = next_token,
+            unbroken = true;
+
+        function find_duplicate_case(value) {
+            if (are_similar(particular, value)) {
+                warn('duplicate_a', value);
+            }
+        }
+
+        funct['(breakage)'] += 1;
+        one_space();
+        advance('(');
+        no_space();
+        step_in();
+        this.arity = 'statement';
+        this.first = expected_condition(expected_relation(expression(0)));
+        no_space();
+        step_out(')', the_case);
+        one_space();
+        advance('{');
+        step_in();
+        in_block = true;
+        this.second = [];
+        while (next_token.id === 'case') {
+            the_case = next_token;
+            cases.forEach(find_duplicate_case);
+            the_case.first = [];
+            the_case.arity = 'case';
+            spaces();
+            edge('case');
+            advance('case');
+            for (;;) {
+                one_space();
+                particular = expression(0);
+                cases.forEach(find_duplicate_case);
+                cases.push(particular);
+                the_case.first.push(particular);
+                if (particular.id === 'NaN') {
+                    warn('unexpected_a', particular);
+                }
+                no_space_only();
+                advance(':');
+                if (next_token.id !== 'case') {
+                    break;
+                }
+                spaces();
+                edge('case');
+                advance('case');
+            }
+            spaces();
+            the_case.second = statements();
+            if (the_case.second && the_case.second.length > 0) {
+                particular = the_case.second[the_case.second.length - 1];
+                if (particular.disrupt) {
+                    if (particular.id === 'break') {
+                        unbroken = false;
+                    }
+                } else {
+                    warn('missing_a_after_b', next_token, 'break', 'case');
+                }
+            } else {
+                warn('empty_case');
+            }
+            this.second.push(the_case);
+        }
+        if (this.second.length === 0) {
+            warn('missing_a', next_token, 'case');
+        }
+        if (next_token.id === 'default') {
+            spaces();
+            the_case = next_token;
+            the_case.arity = 'case';
+            edge('case');
+            advance('default');
+            no_space_only();
+            advance(':');
+            spaces();
+            the_case.second = statements();
+            if (the_case.second && the_case.second.length > 0) {
+                particular = the_case.second[the_case.second.length - 1];
+                if (unbroken && particular.disrupt && particular.id !== 'break') {
+                    this.disrupt = true;
+                }
+            }
+            this.second.push(the_case);
+        }
+        funct['(breakage)'] -= 1;
+        spaces();
+        step_out('}', this);
+        in_block = old_in_block;
+        return this;
+    });
+
+    stmt('debugger', function () {
+        if (!option.debug) {
+            warn('unexpected_a', this);
+        }
+        this.arity = 'statement';
+        return this;
+    });
+
+    labeled_stmt('do', function () {
+        funct['(breakage)'] += 1;
+        funct['(loopage)'] += 1;
+        one_space();
+        this.arity = 'statement';
+        this.block = block(true);
+        if (this.block.disrupt) {
+            warn('strange_loop', prev_token);
+        }
+        one_space();
+        advance('while');
+        var paren = next_token;
+        one_space();
+        advance('(');
+        step_in();
+        no_space();
+        edge();
+        this.first = expected_condition(expected_relation(expression(0)), bundle.unexpected_a);
+        no_space();
+        step_out(')', paren);
+        funct['(breakage)'] -= 1;
+        funct['(loopage)'] -= 1;
+        return this;
+    });
+
+    labeled_stmt('for', function () {
+
+        var blok, filter, ok = false, paren = next_token, value;
+        this.arity = 'statement';
+        funct['(breakage)'] += 1;
+        funct['(loopage)'] += 1;
+        advance('(');
+        if (next_token.id === ';') {
+            no_space();
+            advance(';');
+            no_space();
+            advance(';');
+            no_space();
+            advance(')');
+            blok = block(true);
+        } else {
+            step_in('control');
+            spaces(this, paren);
+            no_space();
+            if (next_token.id === 'var') {
+                stop('move_var');
+            }
+            edge();
+            if (peek(0).id === 'in') {
+                this.forin = true;
+                value = next_token;
+                switch (funct[value.string]) {
+                case 'unused':
+                    funct[value.string] = 'var';
+                    break;
+                case 'closure':
+                case 'var':
+                    break;
+                default:
+                    warn('bad_in_a', value);
+                }
+                advance();
+                advance('in');
+                this.first = value;
+                this.second = expression(20);
+                step_out(')', paren);
+                blok = block(true);
+                if (!option.forin) {
+                    if (blok.length === 1 && typeof blok[0] === 'object' &&
+                            blok[0].string === 'if' && !blok[0]['else']) {
+                        filter = blok[0].first;
+                        while (filter.id === '&&') {
+                            filter = filter.first;
+                        }
+                        switch (filter.id) {
+                        case '===':
+                        case '!==':
+                            ok = filter.first.id === '['
+                                ? filter.first.first.string === this.second.string &&
+                                    filter.first.second.string === this.first.string
+                                : filter.first.id === 'typeof' &&
+                                    filter.first.first.id === '[' &&
+                                    filter.first.first.first.string === this.second.string &&
+                                    filter.first.first.second.string === this.first.string;
+                            break;
+                        case '(':
+                            ok = filter.first.id === '.' && ((
+                                filter.first.first.string === this.second.string &&
+                                filter.first.second.string === 'hasOwnProperty' &&
+                                filter.second[0].string === this.first.string
+                            ) || (
+                                filter.first.first.string === 'ADSAFE' &&
+                                filter.first.second.string === 'has' &&
+                                filter.second[0].string === this.second.string &&
+                                filter.second[1].string === this.first.string
+                            ) || (
+                                filter.first.first.id === '.' &&
+                                filter.first.first.first.id === '.' &&
+                                filter.first.first.first.first.string === 'Object' &&
+                                filter.first.first.first.second.string === 'prototype' &&
+                                filter.first.first.second.string === 'hasOwnProperty' &&
+                                filter.first.second.string === 'call' &&
+                                filter.second[0].string === this.second.string &&
+                                filter.second[1].string === this.first.string
+                            ));
+                            break;
+                        }
+                    }
+                    if (!ok) {
+                        warn('for_if', this);
+                    }
+                }
+            } else {
+                edge();
+                this.first = [];
+                for (;;) {
+                    this.first.push(expression(0, 'for'));
+                    if (next_token.id !== ',') {
+                        break;
+                    }
+                    comma();
+                }
+                semicolon();
+                edge();
+                this.second = expected_relation(expression(0));
+                if (this.second.id !== 'true') {
+                    expected_condition(this.second, bundle.unexpected_a);
+                }
+                semicolon(token);
+                if (next_token.id === ';') {
+                    stop('expected_a_b', next_token, ')', ';');
+                }
+                this.third = [];
+                edge();
+                for (;;) {
+                    this.third.push(expression(0, 'for'));
+                    if (next_token.id !== ',') {
+                        break;
+                    }
+                    comma();
+                }
+                no_space();
+                step_out(')', paren);
+                one_space();
+                blok = block(true);
+            }
+        }
+        if (blok.disrupt) {
+            warn('strange_loop', prev_token);
+        }
+        this.block = blok;
+        funct['(breakage)'] -= 1;
+        funct['(loopage)'] -= 1;
+        return this;
+    });
+
+    disrupt_stmt('break', function () {
+        var label = next_token.string;
+        this.arity = 'statement';
+        if (funct['(breakage)'] === 0) {
+            warn('unexpected_a', this);
+        }
+        if (next_token.identifier && token.line === next_token.line) {
+            one_space_only();
+            if (funct[label] !== 'label') {
+                warn('not_a_label', next_token);
+            } else if (scope[label].funct !== funct) {
+                warn('not_a_scope', next_token);
+            }
+            this.first = next_token;
+            advance();
+        }
+        return this;
+    });
+
+    disrupt_stmt('continue', function () {
+        if (!option['continue']) {
+            warn('unexpected_a', this);
+        }
+        var label = next_token.string;
+        this.arity = 'statement';
+        if (funct['(breakage)'] === 0) {
+            warn('unexpected_a', this);
+        }
+        if (next_token.identifier && token.line === next_token.line) {
+            one_space_only();
+            if (funct[label] !== 'label') {
+                warn('not_a_label', next_token);
+            } else if (scope[label].funct !== funct) {
+                warn('not_a_scope', next_token);
+            }
+            this.first = next_token;
+            advance();
+        }
+        return this;
+    });
+
+    disrupt_stmt('return', function () {
+        if (funct === global_funct && xmode !== 'scriptstring') {
+            warn('unexpected_a', this);
+        }
+        this.arity = 'statement';
+        if (next_token.id !== ';' && next_token.line === token.line) {
+            one_space_only();
+            if (next_token.id === '/' || next_token.id === '(regexp)') {
+                warn('wrap_regexp');
+            }
+            this.first = expression(20);
+        }
+        if (peek(0).id === '}' && peek(1).id === 'else') {
+            warn('unexpected_else', this);
+        }
+        return this;
+    });
+
+    disrupt_stmt('throw', function () {
+        this.arity = 'statement';
+        one_space_only();
+        this.first = expression(20);
+        return this;
+    });
+
+
+//  Superfluous reserved words
+
+    reserve('class');
+    reserve('const');
+    reserve('enum');
+    reserve('export');
+    reserve('extends');
+    reserve('import');
+    reserve('super');
+
+// Harmony reserved words
+
+    reserve('implements');
+    reserve('interface');
+    reserve('let');
+    reserve('package');
+    reserve('private');
+    reserve('protected');
+    reserve('public');
+    reserve('static');
+    reserve('yield');
+
+
+// Parse JSON
+
+    function json_value() {
+
+        function json_object() {
+            var brace = next_token, object = {};
+            advance('{');
+            if (next_token.id !== '}') {
+                while (next_token.id !== '(end)') {
+                    while (next_token.id === ',') {
+                        warn('unexpected_a', next_token);
+                        advance(',');
+                    }
+                    if (next_token.id !== '(string)') {
+                        warn('expected_string_a');
+                    }
+                    if (object[next_token.string] === true) {
+                        warn('duplicate_a');
+                    } else if (next_token.string === '__proto__') {
+                        warn('dangling_a');
+                    } else {
+                        object[next_token.string] = true;
+                    }
+                    advance();
+                    advance(':');
+                    json_value();
+                    if (next_token.id !== ',') {
+                        break;
+                    }
+                    advance(',');
+                    if (next_token.id === '}') {
+                        warn('unexpected_a', token);
+                        break;
+                    }
+                }
+            }
+            advance('}', brace);
+        }
+
+        function json_array() {
+            var bracket = next_token;
+            advance('[');
+            if (next_token.id !== ']') {
+                while (next_token.id !== '(end)') {
+                    while (next_token.id === ',') {
+                        warn('unexpected_a', next_token);
+                        advance(',');
+                    }
+                    json_value();
+                    if (next_token.id !== ',') {
+                        break;
+                    }
+                    advance(',');
+                    if (next_token.id === ']') {
+                        warn('unexpected_a', token);
+                        break;
+                    }
+                }
+            }
+            advance(']', bracket);
+        }
+
+        switch (next_token.id) {
+        case '{':
+            json_object();
+            break;
+        case '[':
+            json_array();
+            break;
+        case 'true':
+        case 'false':
+        case 'null':
+        case '(number)':
+        case '(string)':
+            advance();
+            break;
+        case '-':
+            advance('-');
+            no_space_only();
+            advance('(number)');
+            break;
+        default:
+            stop('unexpected_a');
+        }
+    }
+
+
+// CSS parsing.
+
+    function css_name() {
+        if (next_token.identifier) {
+            advance();
+            return true;
+        }
+    }
+
+
+    function css_number() {
+        if (next_token.id === '-') {
+            advance('-');
+            no_space_only();
+        }
+        if (next_token.id === '(number)') {
+            advance('(number)');
+            return true;
+        }
+    }
+
+
+    function css_string() {
+        if (next_token.id === '(string)') {
+            advance();
+            return true;
+        }
+    }
+
+    function css_color() {
+        var i, number, paren, value;
+        if (next_token.identifier) {
+            value = next_token.string;
+            if (value === 'rgb' || value === 'rgba') {
+                advance();
+                paren = next_token;
+                advance('(');
+                for (i = 0; i < 3; i += 1) {
+                    if (i) {
+                        comma();
+                    }
+                    number = next_token.number;
+                    if (next_token.id !== '(number)' || number < 0) {
+                        warn('expected_positive_a', next_token);
+                        advance();
+                    } else {
+                        advance();
+                        if (next_token.id === '%') {
+                            advance('%');
+                            if (number > 100) {
+                                warn('expected_percent_a', token, number);
+                            }
+                        } else {
+                            if (number > 255) {
+                                warn('expected_small_a', token, number);
+                            }
+                        }
+                    }
+                }
+                if (value === 'rgba') {
+                    comma();
+                    number = next_token.number;
+                    if (next_token.id !== '(number)' || number < 0 || number > 1) {
+                        warn('expected_fraction_a', next_token);
+                    }
+                    advance();
+                    if (next_token.id === '%') {
+                        warn('unexpected_a');
+                        advance('%');
+                    }
+                }
+                advance(')', paren);
+                return true;
+            }
+            if (css_colorData[next_token.string] === true) {
+                advance();
+                return true;
+            }
+        } else if (next_token.id === '(color)') {
+            advance();
+            return true;
+        }
+        return false;
+    }
+
+
+    function css_length() {
+        if (next_token.id === '-') {
+            advance('-');
+            no_space_only();
+        }
+        if (next_token.id === '(number)') {
+            advance();
+            if (next_token.id !== '(string)' &&
+                    css_lengthData[next_token.string] === true) {
+                no_space_only();
+                advance();
+            } else if (+token.number !== 0) {
+                warn('expected_linear_a');
+            }
+            return true;
+        }
+        return false;
+    }
+
+
+    function css_line_height() {
+        if (next_token.id === '-') {
+            advance('-');
+            no_space_only();
+        }
+        if (next_token.id === '(number)') {
+            advance();
+            if (next_token.id !== '(string)' &&
+                    css_lengthData[next_token.string] === true) {
+                no_space_only();
+                advance();
+            }
+            return true;
+        }
+        return false;
+    }
+
+
+    function css_width() {
+        if (next_token.identifier) {
+            switch (next_token.string) {
+            case 'thin':
+            case 'medium':
+            case 'thick':
+                advance();
+                return true;
+            }
+        } else {
+            return css_length();
+        }
+    }
+
+
+    function css_margin() {
+        if (next_token.identifier) {
+            if (next_token.string === 'auto') {
+                advance();
+                return true;
+            }
+        } else {
+            return css_length();
+        }
+    }
+
+    function css_attr() {
+        if (next_token.identifier && next_token.string === 'attr') {
+            advance();
+            advance('(');
+            if (!next_token.identifier) {
+                warn('expected_name_a');
+            }
+            advance();
+            advance(')');
+            return true;
+        }
+        return false;
+    }
+
+
+    function css_comma_list() {
+        while (next_token.id !== ';') {
+            if (!css_name() && !css_string()) {
+                warn('expected_name_a');
+            }
+            if (next_token.id !== ',') {
+                return true;
+            }
+            comma();
+        }
+    }
+
+
+    function css_counter() {
+        if (next_token.identifier && next_token.string === 'counter') {
+            advance();
+            advance('(');
+            advance();
+            if (next_token.id === ',') {
+                comma();
+                if (next_token.id !== '(string)') {
+                    warn('expected_string_a');
+                }
+                advance();
+            }
+            advance(')');
+            return true;
+        }
+        if (next_token.identifier && next_token.string === 'counters') {
+            advance();
+            advance('(');
+            if (!next_token.identifier) {
+                warn('expected_name_a');
+            }
+            advance();
+            if (next_token.id === ',') {
+                comma();
+                if (next_token.id !== '(string)') {
+                    warn('expected_string_a');
+                }
+                advance();
+            }
+            if (next_token.id === ',') {
+                comma();
+                if (next_token.id !== '(string)') {
+                    warn('expected_string_a');
+                }
+                advance();
+            }
+            advance(')');
+            return true;
+        }
+        return false;
+    }
+
+
+    function css_radius() {
+        return css_length() && (next_token.id !== '(number)' || css_length());
+    }
+
+
+    function css_shape() {
+        var i;
+        if (next_token.identifier && next_token.string === 'rect') {
+            advance();
+            advance('(');
+            for (i = 0; i < 4; i += 1) {
+                if (!css_length()) {
+                    warn('expected_number_a');
+                    break;
+                }
+            }
+            advance(')');
+            return true;
+        }
+        return false;
+    }
+
+
+    function css_url() {
+        var c, url;
+        if (next_token.identifier && next_token.string === 'url') {
+            next_token = lex.range('(', ')');
+            url = next_token.string;
+            c = url.charAt(0);
+            if (c === '"' || c === '\'') {
+                if (url.slice(-1) !== c) {
+                    warn('bad_url_a');
+                } else {
+                    url = url.slice(1, -1);
+                    if (url.indexOf(c) >= 0) {
+                        warn('bad_url_a');
+                    }
+                }
+            }
+            if (!url) {
+                warn('missing_url');
+            }
+            if (ux.test(url)) {
+                stop('bad_url_a');
+            }
+            urls.push(url);
+            advance();
+            return true;
+        }
+        return false;
+    }
+
+
+    css_any = [css_url, function () {
+        for (;;) {
+            if (next_token.identifier) {
+                switch (next_token.string.toLowerCase()) {
+                case 'url':
+                    css_url();
+                    break;
+                case 'expression':
+                    warn('unexpected_a');
+                    advance();
+                    break;
+                default:
+                    advance();
+                }
+            } else {
+                if (next_token.id === ';' || next_token.id === '!'  ||
+                        next_token.id === '(end)' || next_token.id === '}') {
+                    return true;
+                }
+                advance();
+            }
+        }
+    }];
+
+
+    function font_face() {
+        advance_identifier('font-family');
+        advance(':');
+        if (!css_name() && !css_string()) {
+            stop('expected_name_a');
+        }
+        semicolon();
+        advance_identifier('src');
+        advance(':');
+        while (true) {
+            if (next_token.string === 'local') {
+                advance_identifier('local');
+                advance('(');
+                if (ux.test(next_token.string)) {
+                    stop('bad_url_a');
+                }
+
+                if (!css_name() && !css_string()) {
+                    stop('expected_name_a');
+                }
+                advance(')');
+            } else if (!css_url()) {
+                stop('expected_a_b', next_token, 'url', artifact());
+            }
+            if (next_token.id !== ',') {
+                break;
+            }
+            comma();
+        }
+        semicolon();
+    }
+
+
+    css_border_style = [
+        'none', 'dashed', 'dotted', 'double', 'groove',
+        'hidden', 'inset', 'outset', 'ridge', 'solid'
+    ];
+
+    css_break = [
+        'auto', 'always', 'avoid', 'left', 'right'
+    ];
+
+    css_media = {
+        'all': true,
+        'braille': true,
+        'embossed': true,
+        'handheld': true,
+        'print': true,
+        'projection': true,
+        'screen': true,
+        'speech': true,
+        'tty': true,
+        'tv': true
+    };
+
+    css_overflow = [
+        'auto', 'hidden', 'scroll', 'visible'
+    ];
+
+    css_attribute_data = {
+        background: [
+            true, 'background-attachment', 'background-color',
+            'background-image', 'background-position', 'background-repeat'
+        ],
+        'background-attachment': ['scroll', 'fixed'],
+        'background-color': ['transparent', css_color],
+        'background-image': ['none', css_url],
+        'background-position': [
+            2, [css_length, 'top', 'bottom', 'left', 'right', 'center']
+        ],
+        'background-repeat': [
+            'repeat', 'repeat-x', 'repeat-y', 'no-repeat'
+        ],
+        'border': [true, 'border-color', 'border-style', 'border-width'],
+        'border-bottom': [
+            true, 'border-bottom-color', 'border-bottom-style',
+            'border-bottom-width'
+        ],
+        'border-bottom-color': css_color,
+        'border-bottom-left-radius': css_radius,
+        'border-bottom-right-radius': css_radius,
+        'border-bottom-style': css_border_style,
+        'border-bottom-width': css_width,
+        'border-collapse': ['collapse', 'separate'],
+        'border-color': ['transparent', 4, css_color],
+        'border-left': [
+            true, 'border-left-color', 'border-left-style', 'border-left-width'
+        ],
+        'border-left-color': css_color,
+        'border-left-style': css_border_style,
+        'border-left-width': css_width,
+        'border-radius': function () {
+            function count(separator) {
+                var n = 1;
+                if (separator) {
+                    advance(separator);
+                }
+                if (!css_length()) {
+                    return false;
+                }
+                while (next_token.id === '(number)') {
+                    if (!css_length()) {
+                        return false;
+                    }
+                    n += 1;
+                }
+                if (n > 4) {
+                    warn('bad_style');
+                }
+                return true;
+            }
+
+            return count() && (next_token.id !== '/' || count('/'));
+        },
+        'border-right': [
+            true, 'border-right-color', 'border-right-style',
+            'border-right-width'
+        ],
+        'border-right-color': css_color,
+        'border-right-style': css_border_style,
+        'border-right-width': css_width,
+        'border-spacing': [2, css_length],
+        'border-style': [4, css_border_style],
+        'border-top': [
+            true, 'border-top-color', 'border-top-style', 'border-top-width'
+        ],
+        'border-top-color': css_color,
+        'border-top-left-radius': css_radius,
+        'border-top-right-radius': css_radius,
+        'border-top-style': css_border_style,
+        'border-top-width': css_width,
+        'border-width': [4, css_width],
+        bottom: [css_length, 'auto'],
+        'caption-side' : ['bottom', 'left', 'right', 'top'],
+        clear: ['both', 'left', 'none', 'right'],
+        clip: [css_shape, 'auto'],
+        color: css_color,
+        content: [
+            'open-quote', 'close-quote', 'no-open-quote', 'no-close-quote',
+            css_string, css_url, css_counter, css_attr
+        ],
+        'counter-increment': [
+            css_name, 'none'
+        ],
+        'counter-reset': [
+            css_name, 'none'
+        ],
+        cursor: [
+            css_url, 'auto', 'crosshair', 'default', 'e-resize', 'help', 'move',
+            'n-resize', 'ne-resize', 'nw-resize', 'pointer', 's-resize',
+            'se-resize', 'sw-resize', 'w-resize', 'text', 'wait'
+        ],
+        direction: ['ltr', 'rtl'],
+        display: [
+            'block', 'compact', 'inline', 'inline-block', 'inline-table',
+            'list-item', 'marker', 'none', 'run-in', 'table', 'table-caption',
+            'table-cell', 'table-column', 'table-column-group',
+            'table-footer-group', 'table-header-group', 'table-row',
+            'table-row-group'
+        ],
+        'empty-cells': ['show', 'hide'],
+        'float': ['left', 'none', 'right'],
+        font: [
+            'caption', 'icon', 'menu', 'message-box', 'small-caption',
+            'status-bar', true, 'font-size', 'font-style', 'font-weight',
+            'font-family'
+        ],
+        'font-family': css_comma_list,
+        'font-size': [
+            'xx-small', 'x-small', 'small', 'medium', 'large', 'x-large',
+            'xx-large', 'larger', 'smaller', css_length
+        ],
+        'font-size-adjust': ['none', css_number],
+        'font-stretch': [
+            'normal', 'wider', 'narrower', 'ultra-condensed',
+            'extra-condensed', 'condensed', 'semi-condensed',
+            'semi-expanded', 'expanded', 'extra-expanded'
+        ],
+        'font-style': [
+            'normal', 'italic', 'oblique'
+        ],
+        'font-variant': [
+            'normal', 'small-caps'
+        ],
+        'font-weight': [
+            'normal', 'bold', 'bolder', 'lighter', css_number
+        ],
+        height: [css_length, 'auto'],
+        left: [css_length, 'auto'],
+        'letter-spacing': ['normal', css_length],
+        'line-height': ['normal', css_line_height],
+        'list-style': [
+            true, 'list-style-image', 'list-style-position', 'list-style-type'
+        ],
+        'list-style-image': ['none', css_url],
+        'list-style-position': ['inside', 'outside'],
+        'list-style-type': [
+            'circle', 'disc', 'square', 'decimal', 'decimal-leading-zero',
+            'lower-roman', 'upper-roman', 'lower-greek', 'lower-alpha',
+            'lower-latin', 'upper-alpha', 'upper-latin', 'hebrew', 'katakana',
+            'hiragana-iroha', 'katakana-oroha', 'none'
+        ],
+        margin: [4, css_margin],
+        'margin-bottom': css_margin,
+        'margin-left': css_margin,
+        'margin-right': css_margin,
+        'margin-top': css_margin,
+        'marker-offset': [css_length, 'auto'],
+        'max-height': [css_length, 'none'],
+        'max-width': [css_length, 'none'],
+        'min-height': css_length,
+        'min-width': css_length,
+        opacity: css_number,
+        outline: [true, 'outline-color', 'outline-style', 'outline-width'],
+        'outline-color': ['invert', css_color],
+        'outline-style': [
+            'dashed', 'dotted', 'double', 'groove', 'inset', 'none',
+            'outset', 'ridge', 'solid'
+        ],
+        'outline-width': css_width,
+        overflow: css_overflow,
+        'overflow-x': css_overflow,
+        'overflow-y': css_overflow,
+        padding: [4, css_length],
+        'padding-bottom': css_length,
+        'padding-left': css_length,
+        'padding-right': css_length,
+        'padding-top': css_length,
+        'page-break-after': css_break,
+        'page-break-before': css_break,
+        position: ['absolute', 'fixed', 'relative', 'static'],
+        quotes: [8, css_string],
+        right: [css_length, 'auto'],
+        'table-layout': ['auto', 'fixed'],
+        'text-align': ['center', 'justify', 'left', 'right'],
+        'text-decoration': [
+            'none', 'underline', 'overline', 'line-through', 'blink'
+        ],
+        'text-indent': css_length,
+        'text-shadow': ['none', 4, [css_color, css_length]],
+        'text-transform': ['capitalize', 'uppercase', 'lowercase', 'none'],
+        top: [css_length, 'auto'],
+        'unicode-bidi': ['normal', 'embed', 'bidi-override'],
+        'vertical-align': [
+            'baseline', 'bottom', 'sub', 'super', 'top', 'text-top', 'middle',
+            'text-bottom', css_length
+        ],
+        visibility: ['visible', 'hidden', 'collapse'],
+        'white-space': [
+            'normal', 'nowrap', 'pre', 'pre-line', 'pre-wrap', 'inherit'
+        ],
+        width: [css_length, 'auto'],
+        'word-spacing': ['normal', css_length],
+        'word-wrap': ['break-word', 'normal'],
+        'z-index': ['auto', css_number]
+    };
+
+    function style_attribute() {
+        var v;
+        while (next_token.id === '*' || next_token.id === '#' ||
+                next_token.string === '_') {
+            if (!option.css) {
+                warn('unexpected_a');
+            }
+            advance();
+        }
+        if (next_token.id === '-') {
+            if (!option.css) {
+                warn('unexpected_a');
+            }
+            advance('-');
+            if (!next_token.identifier) {
+                warn('expected_nonstandard_style_attribute');
+            }
+            advance();
+            return css_any;
+        }
+        if (!next_token.identifier) {
+            warn('expected_style_attribute');
+        } else {
+            if (Object.prototype.hasOwnProperty.call(css_attribute_data,
+                    next_token.string)) {
+                v = css_attribute_data[next_token.string];
+            } else {
+                v = css_any;
+                if (!option.css) {
+                    warn('unrecognized_style_attribute_a');
+                }
+            }
+        }
+        advance();
+        return v;
+    }
+
+
+    function style_value(v) {
+        var i = 0,
+            n,
+            once,
+            match,
+            round,
+            start = 0,
+            vi;
+        switch (typeof v) {
+        case 'function':
+            return v();
+        case 'string':
+            if (next_token.identifier && next_token.string === v) {
+                advance();
+                return true;
+            }
+            return false;
+        }
+        for (;;) {
+            if (i >= v.length) {
+                return false;
+            }
+            vi = v[i];
+            i += 1;
+            if (typeof vi === 'boolean') {
+                break;
+            } else if (typeof vi === 'number') {
+                n = vi;
+                vi = v[i];
+                i += 1;
+            } else {
+                n = 1;
+            }
+            match = false;
+            while (n > 0) {
+                if (style_value(vi)) {
+                    match = true;
+                    n -= 1;
+                } else {
+                    break;
+                }
+            }
+            if (match) {
+                return true;
+            }
+        }
+        start = i;
+        once = [];
+        for (;;) {
+            round = false;
+            for (i = start; i < v.length; i += 1) {
+                if (!once[i]) {
+                    if (style_value(css_attribute_data[v[i]])) {
+                        match = true;
+                        round = true;
+                        once[i] = true;
+                        break;
+                    }
+                }
+            }
+            if (!round) {
+                return match;
+            }
+        }
+    }
+
+    function style_child() {
+        if (next_token.id === '(number)') {
+            advance();
+            if (next_token.string === 'n' && next_token.identifier) {
+                no_space_only();
+                advance();
+                if (next_token.id === '+') {
+                    no_space_only();
+                    advance('+');
+                    no_space_only();
+                    advance('(number)');
+                }
+            }
+            return;
+        }
+        if (next_token.identifier &&
+                (next_token.string === 'odd' || next_token.string === 'even')) {
+            advance();
+            return;
+        }
+        warn('unexpected_a');
+    }
+
+    function substyle() {
+        var v;
+        for (;;) {
+            if (next_token.id === '}' || next_token.id === '(end)' ||
+                    (xquote && next_token.id === xquote)) {
+                return;
+            }
+            v = style_attribute();
+            advance(':');
+            if (next_token.identifier && next_token.string === 'inherit') {
+                advance();
+            } else {
+                if (!style_value(v)) {
+                    warn('unexpected_a');
+                    advance();
+                }
+            }
+            if (next_token.id === '!') {
+                advance('!');
+                no_space_only();
+                if (next_token.identifier && next_token.string === 'important') {
+                    advance();
+                } else {
+                    warn('expected_a_b',
+                        next_token, 'important', artifact());
+                }
+            }
+            if (next_token.id === '}' || next_token.id === xquote) {
+                warn('expected_a_b', next_token, ';', artifact());
+            } else {
+                semicolon();
+            }
+        }
+    }
+
+    function style_selector() {
+        if (next_token.identifier) {
+            if (!Object.prototype.hasOwnProperty.call(html_tag, option.cap
+                    ? next_token.string.toLowerCase()
+                    : next_token.string)) {
+                warn('expected_tagname_a');
+            }
+            advance();
+        } else {
+            switch (next_token.id) {
+            case '>':
+            case '+':
+                advance();
+                style_selector();
+                break;
+            case ':':
+                advance(':');
+                switch (next_token.string) {
+                case 'active':
+                case 'after':
+                case 'before':
+                case 'checked':
+                case 'disabled':
+                case 'empty':
+                case 'enabled':
+                case 'first-child':
+                case 'first-letter':
+                case 'first-line':
+                case 'first-of-type':
+                case 'focus':
+                case 'hover':
+                case 'last-child':
+                case 'last-of-type':
+                case 'link':
+                case 'only-of-type':
+                case 'root':
+                case 'target':
+                case 'visited':
+                    advance_identifier(next_token.string);
+                    break;
+                case 'lang':
+                    advance_identifier('lang');
+                    advance('(');
+                    if (!next_token.identifier) {
+                        warn('expected_lang_a');
+                    }
+                    advance(')');
+                    break;
+                case 'nth-child':
+                case 'nth-last-child':
+                case 'nth-last-of-type':
+                case 'nth-of-type':
+                    advance_identifier(next_token.string);
+                    advance('(');
+                    style_child();
+                    advance(')');
+                    break;
+                case 'not':
+                    advance_identifier('not');
+                    advance('(');
+                    if (next_token.id === ':' && peek(0).string === 'not') {
+                        warn('not');
+                    }
+                    style_selector();
+                    advance(')');
+                    break;
+                default:
+                    warn('expected_pseudo_a');
+                }
+                break;
+            case '#':
+                advance('#');
+                if (!next_token.identifier) {
+                    warn('expected_id_a');
+                }
+                advance();
+                break;
+            case '*':
+                advance('*');
+                break;
+            case '.':
+                advance('.');
+                if (!next_token.identifier) {
+                    warn('expected_class_a');
+                }
+                advance();
+                break;
+            case '[':
+                advance('[');
+                if (!next_token.identifier) {
+                    warn('expected_attribute_a');
+                }
+                advance();
+                if (next_token.id === '=' || next_token.string === '~=' ||
+                        next_token.string === '$=' ||
+                        next_token.string === '|=' ||
+                        next_token.id === '*=' ||
+                        next_token.id === '^=') {
+                    advance();
+                    if (next_token.id !== '(string)') {
+                        warn('expected_string_a');
+                    }
+                    advance();
+                }
+                advance(']');
+                break;
+            default:
+                stop('expected_selector_a');
+            }
+        }
+    }
+
+    function style_pattern() {
+        if (next_token.id === '{') {
+            warn('expected_style_pattern');
+        }
+        for (;;) {
+            style_selector();
+            if (next_token.id === '</' || next_token.id === '{' ||
+                    next_token.id === '}' || next_token.id === '(end)') {
+                return '';
+            }
+            if (next_token.id === ',') {
+                comma();
+            }
+        }
+    }
+
+    function style_list() {
+        while (next_token.id !== '}' && next_token.id !== '</' &&
+                next_token.id !== '(end)') {
+            style_pattern();
+            xmode = 'styleproperty';
+            if (next_token.id === ';') {
+                semicolon();
+            } else {
+                advance('{');
+                substyle();
+                xmode = 'style';
+                advance('}');
+            }
+        }
+    }
+
+    function styles() {
+        var i;
+        while (next_token.id === '@') {
+            i = peek();
+            advance('@');
+            switch (next_token.string) {
+            case 'import':
+                advance_identifier('import');
+                if (!css_url()) {
+                    warn('expected_a_b',
+                        next_token, 'url', artifact());
+                    advance();
+                }
+                semicolon();
+                break;
+            case 'media':
+                advance_identifier('media');
+                for (;;) {
+                    if (!next_token.identifier || css_media[next_token.string] !== true) {
+                        stop('expected_media_a');
+                    }
+                    advance();
+                    if (next_token.id !== ',') {
+                        break;
+                    }
+                    comma();
+                }
+                advance('{');
+                style_list();
+                advance('}');
+                break;
+            case 'font-face':
+                advance_identifier('font-face');
+                advance('{');
+                font_face();
+                advance('}');
+                break;
+            default:
+                stop('expected_at_a');
+            }
+        }
+        style_list();
+    }
+
+
+// Parse HTML
+
+    function do_begin(n) {
+        if (n !== 'html' && !option.fragment) {
+            if (n === 'div' && option.adsafe) {
+                stop('adsafe_fragment');
+            } else {
+                stop('expected_a_b', token, 'html', n);
+            }
+        }
+        if (option.adsafe) {
+            if (n === 'html') {
+                stop('adsafe_html', token);
+            }
+            if (option.fragment) {
+                if (n !== 'div') {
+                    stop('adsafe_div', token);
+                }
+            } else {
+                stop('adsafe_fragment', token);
+            }
+        }
+        option.browser = true;
+    }
+
+    function do_attribute(a, v) {
+        var u, x;
+        if (a === 'id') {
+            u = typeof v === 'string' ? v.toUpperCase() : '';
+            if (ids[u] === true) {
+                warn('duplicate_a', next_token, v);
+            }
+            if (!/^[A-Za-z][A-Za-z0-9._:\-]*$/.test(v)) {
+                warn('bad_id_a', next_token, v);
+            } else if (option.adsafe) {
+                if (adsafe_id) {
+                    if (v.slice(0, adsafe_id.length) !== adsafe_id) {
+                        warn('adsafe_prefix_a', next_token, adsafe_id);
+                    } else if (!/^[A-Z]+_[A-Z]+$/.test(v)) {
+                        warn('adsafe_bad_id');
+                    }
+                } else {
+                    adsafe_id = v;
+                    if (!/^[A-Z]+_$/.test(v)) {
+                        warn('adsafe_bad_id');
+                    }
+                }
+            }
+            x = v.search(dx);
+            if (x >= 0) {
+                warn('unexpected_char_a_b', token, v.charAt(x), a);
+            }
+            ids[u] = true;
+        } else if (a === 'class' || a === 'type' || a === 'name') {
+            x = v.search(qx);
+            if (x >= 0) {
+                warn('unexpected_char_a_b', token, v.charAt(x), a);
+            }
+            ids[u] = true;
+        } else if (a === 'href' || a === 'background' ||
+                a === 'content' || a === 'data' ||
+                a.indexOf('src') >= 0 || a.indexOf('url') >= 0) {
+            if (option.safe && ux.test(v)) {
+                stop('bad_url_a', next_token, v);
+            }
+            urls.push(v);
+        } else if (a === 'for') {
+            if (option.adsafe) {
+                if (adsafe_id) {
+                    if (v.slice(0, adsafe_id.length) !== adsafe_id) {
+                        warn('adsafe_prefix_a', next_token, adsafe_id);
+                    } else if (!/^[A-Z]+_[A-Z]+$/.test(v)) {
+                        warn('adsafe_bad_id');
+                    }
+                } else {
+                    warn('adsafe_bad_id');
+                }
+            }
+        } else if (a === 'name') {
+            if (option.adsafe && v.indexOf('_') >= 0) {
+                warn('adsafe_name_a', next_token, v);
+            }
+        }
+    }
+
+    function do_tag(name, attribute) {
+        var i, tag = html_tag[name], script, x;
+        src = false;
+        if (!tag) {
+            stop(
+                bundle.unrecognized_tag_a,
+                next_token,
+                name === name.toLowerCase()
+                    ? name
+                    : name + ' (capitalization error)'
+            );
+        }
+        if (stack.length > 0) {
+            if (name === 'html') {
+                stop('unexpected_a', token, name);
+            }
+            x = tag.parent;
+            if (x) {
+                if (x.indexOf(' ' + stack[stack.length - 1].name + ' ') < 0) {
+                    stop('tag_a_in_b', token, name, x);
+                }
+            } else if (!option.adsafe && !option.fragment) {
+                i = stack.length;
+                do {
+                    if (i <= 0) {
+                        stop('tag_a_in_b', token, name, 'body');
+                    }
+                    i -= 1;
+                } while (stack[i].name !== 'body');
+            }
+        }
+        switch (name) {
+        case 'div':
+            if (option.adsafe && stack.length === 1 && !adsafe_id) {
+                warn('adsafe_missing_id');
+            }
+            break;
+        case 'script':
+            xmode = 'script';
+            advance('>');
+            if (attribute.lang) {
+                warn('lang', token);
+            }
+            if (option.adsafe && stack.length !== 1) {
+                warn('adsafe_placement', token);
+            }
+            if (attribute.src) {
+                if (option.adsafe && (!adsafe_may || !approved[attribute.src])) {
+                    warn('adsafe_source', token);
+                }
+            } else {
+                step_in(next_token.from);
+                edge();
+                use_strict();
+                adsafe_top = true;
+                script = statements();
+
+// JSLint is also the static analyzer for ADsafe. See www.ADsafe.org.
+
+                if (option.adsafe) {
+                    if (adsafe_went) {
+                        stop('adsafe_script', token);
+                    }
+                    if (script.length !== 1 ||
+                            aint(script[0],             'id',     '(') ||
+                            aint(script[0].first,       'id',     '.') ||
+                            aint(script[0].first.first, 'string', 'ADSAFE') ||
+                            aint(script[0].second[0],   'string', adsafe_id)) {
+                        stop('adsafe_id_go');
+                    }
+                    switch (script[0].first.second.string) {
+                    case 'id':
+                        if (adsafe_may || adsafe_went ||
+                                script[0].second.length !== 1) {
+                            stop('adsafe_id', next_token);
+                        }
+                        adsafe_may = true;
+                        break;
+                    case 'go':
+                        if (adsafe_went) {
+                            stop('adsafe_go');
+                        }
+                        if (script[0].second.length !== 2 ||
+                                aint(script[0].second[1], 'id', 'function') ||
+                                !script[0].second[1].first ||
+                                aint(script[0].second[1].first[0], 'string', 'dom') ||
+                                script[0].second[1].first.length > 2 ||
+                                (script[0].second[1].first.length === 2 &&
+                                aint(script[0].second[1].first[1], 'string', 'lib'))) {
+                            stop('adsafe_go', next_token);
+                        }
+                        adsafe_went = true;
+                        break;
+                    default:
+                        stop('adsafe_id_go');
+                    }
+                }
+                indent = null;
+            }
+            xmode = 'html';
+            advance('</');
+            advance_identifier('script');
+            xmode = 'outer';
+            break;
+        case 'style':
+            xmode = 'style';
+            advance('>');
+            styles();
+            xmode = 'html';
+            advance('</');
+            advance_identifier('style');
+            break;
+        case 'input':
+            switch (attribute.type) {
+            case 'button':
+            case 'checkbox':
+            case 'radio':
+            case 'reset':
+            case 'submit':
+                break;
+            case 'file':
+            case 'hidden':
+            case 'image':
+            case 'password':
+            case 'text':
+                if (option.adsafe && attribute.autocomplete !== 'off') {
+                    warn('adsafe_autocomplete');
+                }
+                break;
+            default:
+                warn('bad_type');
+            }
+            break;
+        case 'applet':
+        case 'body':
+        case 'embed':
+        case 'frame':
+        case 'frameset':
+        case 'head':
+        case 'iframe':
+        case 'noembed':
+        case 'noframes':
+        case 'object':
+        case 'param':
+            if (option.adsafe) {
+                warn('adsafe_tag', next_token, name);
+            }
+            break;
+        }
+    }
+
+
+    function closetag(name) {
+        return '</' + name + '>';
+    }
+
+    function html() {
+        var attribute, attributes, is_empty, name, old_white = option.white,
+            quote, tag_name, tag, wmode;
+        xmode = 'html';
+        xquote = '';
+        stack = null;
+        for (;;) {
+            switch (next_token.string) {
+            case '<':
+                xmode = 'html';
+                advance('<');
+                attributes = {};
+                tag_name = next_token;
+                name = tag_name.string;
+                advance_identifier(name);
+                if (option.cap) {
+                    name = name.toLowerCase();
+                }
+                tag_name.name = name;
+                if (!stack) {
+                    stack = [];
+                    do_begin(name);
+                }
+                tag = html_tag[name];
+                if (typeof tag !== 'object') {
+                    stop('unrecognized_tag_a', tag_name, name);
+                }
+                is_empty = tag.empty;
+                tag_name.type = name;
+                for (;;) {
+                    if (next_token.id === '/') {
+                        advance('/');
+                        if (next_token.id !== '>') {
+                            warn('expected_a_b', next_token, '>', artifact());
+                        }
+                        break;
+                    }
+                    if (next_token.id && next_token.id.charAt(0) === '>') {
+                        break;
+                    }
+                    if (!next_token.identifier) {
+                        if (next_token.id === '(end)' || next_token.id === '(error)') {
+                            warn('expected_a_b', next_token, '>', artifact());
+                        }
+                        warn('bad_name_a');
+                    }
+                    option.white = false;
+                    spaces();
+                    attribute = next_token.string;
+                    option.white = old_white;
+                    advance();
+                    if (!option.cap && attribute !== attribute.toLowerCase()) {
+                        warn('attribute_case_a', token);
+                    }
+                    attribute = attribute.toLowerCase();
+                    xquote = '';
+                    if (Object.prototype.hasOwnProperty.call(attributes, attribute)) {
+                        warn('duplicate_a', token, attribute);
+                    }
+                    if (attribute.slice(0, 2) === 'on') {
+                        if (!option.on) {
+                            warn('html_handlers');
+                        }
+                        xmode = 'scriptstring';
+                        advance('=');
+                        quote = next_token.id;
+                        if (quote !== '"' && quote !== '\'') {
+                            stop('expected_a_b', next_token, '"', artifact());
+                        }
+                        xquote = quote;
+                        wmode = option.white;
+                        option.white = true;
+                        advance(quote);
+                        use_strict();
+                        statements();
+                        option.white = wmode;
+                        if (next_token.id !== quote) {
+                            stop('expected_a_b', next_token, quote, artifact());
+                        }
+                        xmode = 'html';
+                        xquote = '';
+                        advance(quote);
+                        tag = false;
+                    } else if (attribute === 'style') {
+                        xmode = 'scriptstring';
+                        advance('=');
+                        quote = next_token.id;
+                        if (quote !== '"' && quote !== '\'') {
+                            stop('expected_a_b', next_token, '"', artifact());
+                        }
+                        xmode = 'styleproperty';
+                        xquote = quote;
+                        advance(quote);
+                        substyle();
+                        xmode = 'html';
+                        xquote = '';
+                        advance(quote);
+                        tag = false;
+                    } else {
+                        if (next_token.id === '=') {
+                            advance('=');
+                            tag = next_token.string;
+                            if (!next_token.identifier &&
+                                    next_token.id !== '"' &&
+                                    next_token.id !== '\'' &&
+                                    next_token.id !== '(string)' &&
+                                    next_token.id !== '(string)' &&
+                                    next_token.id !== '(color)') {
+                                warn('expected_attribute_value_a', token, attribute);
+                            }
+                            advance();
+                        } else {
+                            tag = true;
+                        }
+                    }
+                    attributes[attribute] = tag;
+                    do_attribute(attribute, tag);
+                }
+                do_tag(name, attributes);
+                if (!is_empty) {
+                    stack.push(tag_name);
+                }
+                xmode = 'outer';
+                advance('>');
+                break;
+            case '</':
+                xmode = 'html';
+                advance('</');
+                if (!next_token.identifier) {
+                    warn('bad_name_a');
+                }
+                name = next_token.string;
+                if (option.cap) {
+                    name = name.toLowerCase();
+                }
+                advance();
+                if (!stack) {
+                    stop('unexpected_a', next_token, closetag(name));
+                }
+                tag_name = stack.pop();
+                if (!tag_name) {
+                    stop('unexpected_a', next_token, closetag(name));
+                }
+                if (tag_name.name !== name) {
+                    stop('expected_a_b',
+                        next_token, closetag(tag_name.name), closetag(name));
+                }
+                if (next_token.id !== '>') {
+                    stop('expected_a_b', next_token, '>', artifact());
+                }
+                xmode = 'outer';
+                advance('>');
+                break;
+            case '<!':
+                if (option.safe) {
+                    warn('adsafe_a');
+                }
+                xmode = 'html';
+                for (;;) {
+                    advance();
+                    if (next_token.id === '>' || next_token.id === '(end)') {
+                        break;
+                    }
+                    if (next_token.string.indexOf('--') >= 0) {
+                        stop('unexpected_a', next_token, '--');
+                    }
+                    if (next_token.string.indexOf('<') >= 0) {
+                        stop('unexpected_a', next_token, '<');
+                    }
+                    if (next_token.string.indexOf('>') >= 0) {
+                        stop('unexpected_a', next_token, '>');
+                    }
+                }
+                xmode = 'outer';
+                advance('>');
+                break;
+            case '(end)':
+                if (stack.length !== 0) {
+                    warn('missing_a', next_token, '</' + stack.pop().string + '>');
+                }
+                return;
+            default:
+                if (next_token.id === '(end)') {
+                    stop('missing_a', next_token,
+                        '</' + stack[stack.length - 1].string + '>');
+                } else {
+                    advance();
+                }
+            }
+            if (stack && stack.length === 0 && (option.adsafe ||
+                    !option.fragment || next_token.id === '(end)')) {
+                break;
+            }
+        }
+        if (next_token.id !== '(end)') {
+            stop('unexpected_a');
+        }
+    }
+
+
+// The actual JSLINT function itself.
+
+    itself = function JSLint(the_source, the_option) {
+
+        var i, predef, tree;
+        JSLINT.errors = [];
+        JSLINT.tree = '';
+        begin = prev_token = token = next_token =
+            Object.create(syntax['(begin)']);
+        predefined = {};
+        add_to_predefined(standard);
+        property = {};
+        if (the_option) {
+            option = Object.create(the_option);
+            predef = option.predef;
+            if (predef) {
+                if (Array.isArray(predef)) {
+                    for (i = 0; i < predef.length; i += 1) {
+                        predefined[predef[i]] = true;
+                    }
+                } else if (typeof predef === 'object') {
+                    add_to_predefined(predef);
+                }
+            }
+            do_safe();
+        } else {
+            option = {};
+        }
+        option.indent = +option.indent || 4;
+        option.maxerr = +option.maxerr || 50;
+        adsafe_id = '';
+        adsafe_may = adsafe_top = adsafe_went = false;
+        approved = {};
+        if (option.approved) {
+            for (i = 0; i < option.approved.length; i += 1) {
+                approved[option.approved[i]] = option.approved[i];
+            }
+        } else {
+            approved.test = 'test';
+        }
+        tab = '';
+        for (i = 0; i < option.indent; i += 1) {
+            tab += ' ';
+        }
+        global_scope = scope = {};
+        global_funct = funct = {
+            '(scope)': scope,
+            '(breakage)': 0,
+            '(loopage)': 0
+        };
+        functions = [funct];
+
+        comments_off = false;
+        ids = {};
+        in_block = false;
+        indent = null;
+        json_mode = false;
+        lookahead = [];
+        node_js = false;
+        prereg = true;
+        src = false;
+        stack = null;
+        strict_mode = false;
+        urls = [];
+        var_mode = null;
+        warnings = 0;
+        xmode = '';
+        lex.init(the_source);
+
+        assume();
+
+        try {
+            advance();
+            if (next_token.id === '(number)') {
+                stop('unexpected_a');
+            } else if (next_token.string.charAt(0) === '<') {
+                html();
+                if (option.adsafe && !adsafe_went) {
+                    warn('adsafe_go', this);
+                }
+            } else {
+                switch (next_token.id) {
+                case '{':
+                case '[':
+                    json_mode = true;
+                    json_value();
+                    break;
+                case '@':
+                case '*':
+                case '#':
+                case '.':
+                case ':':
+                    xmode = 'style';
+                    advance();
+                    if (token.id !== '@' || !next_token.identifier ||
+                            next_token.string !== 'charset' || token.line !== 1 ||
+                            token.from !== 1) {
+                        stop('css');
+                    }
+                    advance();
+                    if (next_token.id !== '(string)' &&
+                            next_token.string !== 'UTF-8') {
+                        stop('css');
+                    }
+                    advance();
+                    semicolon();
+                    styles();
+                    break;
+
+                default:
+                    if (option.adsafe && option.fragment) {
+                        stop('expected_a_b',
+                            next_token, '<div>', artifact());
+                    }
+
+// If the first token is a semicolon, ignore it. This is sometimes used when
+// files are intended to be appended to files that may be sloppy. A sloppy
+// file may be depending on semicolon insertion on its last line.
+
+                    step_in(1);
+                    if (next_token.id === ';' && !node_js) {
+                        semicolon();
+                    }
+                    adsafe_top = true;
+                    tree = statements();
+                    begin.first = tree;
+                    JSLINT.tree = begin;
+                    // infer_types(tree);
+                    if (option.adsafe && (tree.length !== 1 ||
+                            aint(tree[0], 'id', '(') ||
+                            aint(tree[0].first, 'id', '.') ||
+                            aint(tree[0].first.first, 'string', 'ADSAFE') ||
+                            aint(tree[0].first.second, 'string', 'lib') ||
+                            tree[0].second.length !== 2 ||
+                            tree[0].second[0].id !== '(string)' ||
+                            aint(tree[0].second[1], 'id', 'function'))) {
+                        stop('adsafe_lib');
+                    }
+                    if (tree.disrupt) {
+                        warn('weird_program', prev_token);
+                    }
+                }
+            }
+            indent = null;
+            advance('(end)');
+        } catch (e) {
+            if (e) {        // ~~
+                JSLINT.errors.push({
+                    reason    : e.message,
+                    line      : e.line || next_token.line,
+                    character : e.character || next_token.from
+                }, null);
+            }
+        }
+        return JSLINT.errors.length === 0;
+    };
+
+
+// Data summary.
+
+    itself.data = function () {
+        var data = {functions: []},
+            function_data,
+            globals,
+            i,
+            j,
+            kind,
+            members = [],
+            name,
+            the_function,
+            undef = [],
+            unused = [];
+        if (itself.errors.length) {
+            data.errors = itself.errors;
+        }
+
+        if (json_mode) {
+            data.json = true;
+        }
+
+        if (urls.length > 0) {
+            data.urls = urls;
+        }
+
+        globals = Object.keys(global_scope).filter(function (value) {
+            return value.charAt(0) !== '(' && typeof standard[value] !== 'boolean';
+        });
+        if (globals.length > 0) {
+            data.globals = globals;
+        }
+
+        for (i = 1; i < functions.length; i += 1) {
+            the_function = functions[i];
+            function_data = {};
+            for (j = 0; j < functionicity.length; j += 1) {
+                function_data[functionicity[j]] = [];
+            }
+            for (name in the_function) {
+                if (Object.prototype.hasOwnProperty.call(the_function, name)) {
+                    if (name.charAt(0) !== '(') {
+                        kind = the_function[name];
+                        if (kind === 'unction' || kind === 'unparam') {
+                            kind = 'unused';
+                        }
+                        if (Array.isArray(function_data[kind])) {
+                            function_data[kind].push(name);
+                            if (kind === 'unused') {
+                                unused.push({
+                                    name: name,
+                                    line: the_function['(line)'],
+                                    'function': the_function['(name)']
+                                });
+                            } else if (kind === 'undef') {
+                                undef.push({
+                                    name: name,
+                                    line: the_function['(line)'],
+                                    'function': the_function['(name)']
+                                });
+                            }
+                        }
+                    }
+                }
+            }
+            for (j = 0; j < functionicity.length; j += 1) {
+                if (function_data[functionicity[j]].length === 0) {
+                    delete function_data[functionicity[j]];
+                }
+            }
+            function_data.name = the_function['(name)'];
+            function_data.params = the_function['(params)'];
+            function_data.line = the_function['(line)'];
+            data.functions.push(function_data);
+        }
+
+        if (unused.length > 0) {
+            data.unused = unused;
+        }
+        if (undef.length > 0) {
+            data['undefined'] = undef;
+        }
+
+        members = [];
+        for (name in property) {
+            if (typeof property[name] === 'number') {
+                data.member = property;
+                break;
+            }
+        }
+
+        return data;
+    };
+
+
+    itself.report = function (errors_only) {
+        var data = itself.data(), err, evidence, i, italics, j, key, keys,
+            length, mem = '', name, names, not_first, output = [], snippets,
+            the_function, warning;
+
+        function detail(h, value) {
+            var comma_needed, singularity;
+            if (Array.isArray(value)) {
+                output.push('<div><i>' + h + '</i> ');
+                value.sort().forEach(function (item) {
+                    if (item !== singularity) {
+                        singularity = item;
+                        output.push((comma_needed ? ', ' : '') + singularity);
+                        comma_needed = true;
+                    }
+                });
+                output.push('</div>');
+            } else if (value) {
+                output.push('<div><i>' + h + '</i> ' + value + '</div>');
+            }
+        }
+
+        if (data.errors || data.unused || data['undefined']) {
+            err = true;
+            output.push('<div id=errors><i>Error:</i>');
+            if (data.errors) {
+                for (i = 0; i < data.errors.length; i += 1) {
+                    warning = data.errors[i];
+                    if (warning) {
+                        evidence = warning.evidence || '';
+                        output.push('<p>Problem' + (isFinite(warning.line)
+                            ? ' at line ' + String(warning.line) +
+                                ' character ' + String(warning.character)
+                            : '') +
+                            ': ' + warning.reason.entityify() +
+                            '</p><p class=evidence>' +
+                            (evidence && (evidence.length > 80
+                                ? evidence.slice(0, 77) + '...'
+                                : evidence).entityify()) + '</p>');
+                    }
+                }
+            }
+
+            if (data['undefined']) {
+                snippets = [];
+                for (i = 0; i < data['undefined'].length; i += 1) {
+                    snippets[i] = '<code><u>' + data['undefined'][i].name + '</u></code>&nbsp;<i>' +
+                        String(data['undefined'][i].line) + ' </i> <small>' +
+                        data['undefined'][i]['function'] + '</small>';
+                }
+                output.push('<p><i>Undefined variable:</i> ' + snippets.join(', ') + '</p>');
+            }
+            if (data.unused) {
+                snippets = [];
+                for (i = 0; i < data.unused.length; i += 1) {
+                    snippets[i] = '<code><u>' + data.unused[i].name + '</u></code>&nbsp;<i>' +
+                        String(data.unused[i].line) + ' </i> <small>' +
+                        data.unused[i]['function'] + '</small>';
+                }
+                output.push('<p><i>Unused variable:</i> ' + snippets.join(', ') + '</p>');
+            }
+            if (data.json) {
+                output.push('<p>JSON: bad.</p>');
+            }
+            output.push('</div>');
+        }
+
+        if (!errors_only) {
+
+            output.push('<br><div id=functions>');
+
+            if (data.urls) {
+                detail("URLs<br>", data.urls, '<br>');
+            }
+
+            if (xmode === 'style') {
+                output.push('<p>CSS.</p>');
+            } else if (data.json && !err) {
+                output.push('<p>JSON: good.</p>');
+            } else if (data.globals) {
+                output.push('<div><i>Global</i> ' +
+                    data.globals.sort().join(', ') + '</div>');
+            } else {
+                output.push('<div><i>No new global variables introduced.</i></div>');
+            }
+
+            for (i = 0; i < data.functions.length; i += 1) {
+                the_function = data.functions[i];
+                names = [];
+                if (the_function.params) {
+                    for (j = 0; j < the_function.params.length; j += 1) {
+                        names[j] = the_function.params[j].string;
+                    }
+                }
+                output.push('<br><div class=function><i>' +
+                    String(the_function.line) + '</i> ' +
+                    the_function.name.entityify() +
+                    '(' + names.join(', ') + ')</div>');
+                detail('<big><b>Undefined</b></big>', the_function['undefined']);
+                detail('<big><b>Unused</b></big>', the_function.unused);
+                detail('Closure', the_function.closure);
+                detail('Variable', the_function['var']);
+                detail('Exception', the_function.exception);
+                detail('Outer', the_function.outer);
+                detail('Global', the_function.global);
+                detail('Label', the_function.label);
+            }
+
+            if (data.member) {
+                keys = Object.keys(data.member);
+                if (keys.length) {
+                    keys = keys.sort();
+                    output.push('<br><pre id=properties>/*properties<br>');
+                    mem = '    ';
+                    italics = 0;
+                    j = 0;
+                    not_first = false;
+                    for (i = 0; i < keys.length; i += 1) {
+                        key = keys[i];
+                        if (data.member[key] > 0) {
+                            if (not_first) {
+                                mem += ', ';
+                            }
+                            name = ix.test(key)
+                                ? key
+                                : '\'' + key.entityify().replace(nx, sanitize) + '\'';
+                            length += name.length + 2;
+                            if (data.member[key] === 1) {
+                                name = '<i>' + name + '</i>';
+                                italics += 1;
+                                j = 1;
+                            }
+                            if (mem.length + name.length - (italics * 7) > 80) {
+                                output.push(mem + '<br>');
+                                mem = '    ';
+                                italics = j;
+                            }
+                            mem += name;
+                            j = 0;
+                            not_first = true;
+                        }
+                    }
+                    output.push(mem + '<br>*/</pre>');
+                }
+                output.push('</div>');
+            }
+        }
+        return output.join('');
+    };
+    itself.jslint = itself;
+
+    itself.edition = '2012-04-15';
+
+    return itself;
+}());
+core.JSLint = function JSLint() {
+  this.JSLINT = JSLINT;
+};
+
diff --git a/apps/files_odfviewer/src/webodf/webodf/lib/core/PointWalker.js b/apps/files_odfviewer/src/webodf/webodf/lib/core/PointWalker.js
new file mode 100644
index 0000000000..f3f0008f78
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/lib/core/PointWalker.js
@@ -0,0 +1,197 @@
+/**
+ * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
+ * @licstart
+ * The JavaScript code in this page is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU Affero General Public License
+ * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.  The code is distributed
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
+ *
+ * As additional permission under GNU AGPL version 3 section 7, you
+ * may distribute non-source (e.g., minimized or compacted) forms of
+ * that code without the copy of the GNU GPL normally required by
+ * section 4, provided you include this license notice and a URL
+ * through which recipients can access the Corresponding Source.
+ *
+ * As a special exception to the AGPL, any HTML file which merely makes function
+ * calls to this code, and for that purpose includes it by reference shall be
+ * deemed a separate work for copyright law purposes. In addition, the copyright
+ * holders of this code give you permission to combine this code with free
+ * software libraries that are released under the GNU LGPL. You may copy and
+ * distribute such a system following the terms of the GNU AGPL for this code
+ * and the LGPL for the libraries. If you modify this code, you may extend this
+ * exception to your version of the code, but you are not obligated to do so.
+ * If you do not wish to do so, delete this exception statement from your
+ * version.
+ *
+ * This license applies to this entire compilation.
+ * @licend
+ * @source: http://www.webodf.org/
+ * @source: http://gitorious.org/odfkit/webodf/
+ */
+/*global core: true, Node: true*/
+/**
+ * A simple walker that allows finegrained stepping through the DOM.
+ * It does not support node filtering.
+ * TODO: write a position walker that uses a treewalker
+ * @constructor
+ * @param {!Node} node
+ */
+core.PointWalker = function PointWalker(node) {
+    "use strict";
+    var currentNode = node,
+        before = null, // node before the point
+        after = node && node.firstChild, // node after the point
+        root = node,
+        pos = 0;
+
+    /**
+     * @param {!Node} node
+     * @return {!number}
+     */
+    function getPosition(node) {
+        var /**@type{!number}*/ p = -1,
+            /**@type{Node}*/ n = node;
+        while (n) {
+            n = n.previousSibling;
+            p += 1;
+        }
+        return p;
+    }
+    /**
+     * Move the walker to the point given by @p node and @p position.
+     * @param {!Element} node must be the root of this walker or part of the
+     *                   tree of this walker.
+     * @param {!number} position must be a valid position in @node.
+     **/
+    this.setPoint = function (node, position) {
+        currentNode = node;
+        pos = position;
+        if (currentNode.nodeType === 3) { // Node.TEXT_NODE
+            after = null;
+            before = null;
+        } else {
+            after = currentNode.firstChild;
+            while (position) {
+                position -= 1;
+                after = after.nextSibling;
+            }
+            if (after) {
+                before = after.previousSibling;
+            } else {
+                before = currentNode.lastChild;
+            }
+        }
+    };
+    /**
+     * @return {!boolean}
+     */
+    this.stepForward = function () {
+        var len;
+        // if this is a text node, move to the next position in the text
+        if (currentNode.nodeType === 3) { // TEXT_NODE
+            if (typeof currentNode.nodeValue.length === "number") {
+                len = currentNode.nodeValue.length;
+            } else {
+                len = currentNode.nodeValue.length();
+            }
+            if (pos < len) {
+                pos += 1;
+                return true;
+            }
+        }
+        if (after) {
+            if (after.nodeType === 1) { // ELEMENT_NODE
+                currentNode = after;
+                before = null;
+                after = currentNode.firstChild;
+                pos = 0;
+            } else if (after.nodeType === 3) { // TEXT_NODE
+                currentNode = after;
+                before = null;
+                after = null;
+                pos = 0;
+            } else {
+                before = after;
+                after = after.nextSibling;
+                pos += 1;
+            }
+            return true;
+        }
+        if (currentNode !== root) {
+            before = currentNode;
+            after = before.nextSibling;
+            currentNode = currentNode.parentNode;
+            pos = getPosition(before) + 1;
+            return true;
+        }
+        return false;
+    };
+    /**
+     * @return {!boolean}
+     */
+    this.stepBackward = function () {
+        // if this is a text node, move to the next position in the text
+        if (currentNode.nodeType === 3) { // TEXT_NODE
+            if (pos > 0) {
+                pos -= 1;
+                return true;
+            }
+        }
+        if (before) {
+            if (before.nodeType === 1) { // ELEMENT_NODE
+                currentNode = before;
+                before = currentNode.lastChild;
+                after = null;
+                pos = getPosition(before) + 1;
+            } else if (before.nodeType === 3) { // TEXT_NODE
+                currentNode = before;
+                before = null;
+                after = null;
+                if (typeof currentNode.nodeValue.length === "number") {
+                    pos = currentNode.nodeValue.length;
+                } else {
+                    pos = currentNode.nodeValue.length();
+                }
+            } else {
+                after = before;
+                before = before.previousSibling;
+                pos -= 1;
+            }
+            return true;
+        }
+        if (currentNode !== root) {
+            after = currentNode;
+            before = after.previousSibling;
+            currentNode = currentNode.parentNode;
+            pos = getPosition(after);
+            return true;
+        }
+        return false;
+    };
+    /**
+     * @return {?Node}
+     */
+    this.node = function () {
+        return currentNode;
+    };
+    /**
+     * @return {!number}
+     */
+    this.position = function () {
+        return pos;
+    };
+    /**
+     * @return {?Node}
+     */
+    this.precedingSibling = function () {
+        return before;
+    };
+    /**
+     * @return {?Node}
+     */
+    this.followingSibling = function () {
+        return after;
+    };
+};
diff --git a/apps/files_odfviewer/src/webodf/webodf/lib/core/RawDeflate.js b/apps/files_odfviewer/src/webodf/webodf/lib/core/RawDeflate.js
new file mode 100644
index 0000000000..5fdd2b02de
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/lib/core/RawDeflate.js
@@ -0,0 +1,1833 @@
+/**
+ * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
+ * @licstart
+ * The JavaScript code in this page is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU Affero General Public License
+ * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.  The code is distributed
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
+ *
+ * As additional permission under GNU AGPL version 3 section 7, you
+ * may distribute non-source (e.g., minimized or compacted) forms of
+ * that code without the copy of the GNU GPL normally required by
+ * section 4, provided you include this license notice and a URL
+ * through which recipients can access the Corresponding Source.
+ *
+ * As a special exception to the AGPL, any HTML file which merely makes function
+ * calls to this code, and for that purpose includes it by reference shall be
+ * deemed a separate work for copyright law purposes. In addition, the copyright
+ * holders of this code give you permission to combine this code with free
+ * software libraries that are released under the GNU LGPL. You may copy and
+ * distribute such a system following the terms of the GNU AGPL for this code
+ * and the LGPL for the libraries. If you modify this code, you may extend this
+ * exception to your version of the code, but you are not obligated to do so.
+ * If you do not wish to do so, delete this exception statement from your
+ * version.
+ *
+ * This license applies to this entire compilation.
+ * @licend
+ * @source: http://www.webodf.org/
+ * @source: http://gitorious.org/odfkit/webodf/
+ */
+/*global core, runtime*/
+/*jslint bitwise: true, white: false, plusplus: true, vars: true, continue: true*/
+/*
+ * $Id: rawdeflate.js,v 0.3 2009/03/01 19:05:05 dankogai Exp dankogai $
+ *
+ * Original:
+ *   http://www.onicos.com/staff/iz/amuse/javascript/expert/deflate.txt
+ */
+/**
+ * @constructor
+ */
+core.RawDeflate = function () {
+    "use strict";
+    /* Copyright (C) 1999 Masanao Izumo <iz@onicos.co.jp>
+     * Version: 1.0.1
+     * LastModified: Dec 25 1999
+     */
+
+    /* Interface:
+     * data = zip_deflate(src);
+     */
+
+    /* constant parameters */
+    var zip_WSIZE = 32768,        // Sliding Window size
+        zip_STORED_BLOCK = 0,
+        zip_STATIC_TREES = 1,
+        zip_DYN_TREES    = 2,
+
+    /* for deflate */
+        zip_DEFAULT_LEVEL = 6,
+        zip_FULL_SEARCH = true,
+        zip_INBUFSIZ = 32768,    // Input buffer size
+        zip_INBUF_EXTRA = 64,    // Extra buffer
+        zip_OUTBUFSIZ = 1024 * 8,
+        zip_window_size = 2 * zip_WSIZE,
+        zip_MIN_MATCH = 3,
+        zip_MAX_MATCH = 258,
+        zip_BITS = 16,
+    // for SMALL_MEM
+        zip_LIT_BUFSIZE = 0x2000,
+        zip_HASH_BITS = 13,
+    // for MEDIUM_MEM
+    // var zip_LIT_BUFSIZE = 0x4000;
+    // var zip_HASH_BITS = 14;
+    // for BIG_MEM
+    // var zip_LIT_BUFSIZE = 0x8000;
+        zip_DIST_BUFSIZE = zip_LIT_BUFSIZE,
+        zip_HASH_SIZE = 1 << zip_HASH_BITS,
+        zip_HASH_MASK = zip_HASH_SIZE - 1,
+        zip_WMASK = zip_WSIZE - 1,
+        zip_NIL = 0, // Tail of hash chains
+        zip_TOO_FAR = 4096,
+        zip_MIN_LOOKAHEAD = zip_MAX_MATCH + zip_MIN_MATCH + 1,
+        zip_MAX_DIST = zip_WSIZE - zip_MIN_LOOKAHEAD,
+        zip_SMALLEST = 1,
+        zip_MAX_BITS = 15,
+        zip_MAX_BL_BITS = 7,
+        zip_LENGTH_CODES = 29,
+        zip_LITERALS = 256,
+        zip_END_BLOCK = 256,
+        zip_L_CODES = zip_LITERALS + 1 + zip_LENGTH_CODES,
+        zip_D_CODES = 30,
+        zip_BL_CODES = 19,
+        zip_REP_3_6 = 16,
+        zip_REPZ_3_10 = 17,
+        zip_REPZ_11_138 = 18,
+        zip_HEAP_SIZE = 2 * zip_L_CODES + 1,
+        zip_H_SHIFT = parseInt((zip_HASH_BITS + zip_MIN_MATCH - 1) /
+                zip_MIN_MATCH, 10),
+
+    /* variables */
+        zip_free_queue,
+        zip_qhead,
+        zip_qtail,
+        zip_initflag,
+        zip_outbuf = null,
+        zip_outcnt,
+        zip_outoff,
+        zip_complete,
+        zip_window,
+        zip_d_buf,
+        zip_l_buf,
+        zip_prev,
+        zip_bi_buf,
+        zip_bi_valid,
+        zip_block_start,
+        zip_ins_h,
+        zip_hash_head,
+        zip_prev_match,
+        zip_match_available,
+        zip_match_length,
+        zip_prev_length,
+        zip_strstart,
+        zip_match_start,
+        zip_eofile,
+        zip_lookahead,
+        zip_max_chain_length,
+        zip_max_lazy_match,
+        zip_compr_level,
+        zip_good_match,
+        zip_nice_match,
+        zip_dyn_ltree,
+        zip_dyn_dtree,
+        zip_static_ltree,
+        zip_static_dtree,
+        zip_bl_tree,
+        zip_l_desc,
+        zip_d_desc,
+        zip_bl_desc,
+        zip_bl_count,
+        zip_heap,
+        zip_heap_len,
+        zip_heap_max,
+        zip_depth,
+        zip_length_code,
+        zip_dist_code,
+        zip_base_length,
+        zip_base_dist,
+        zip_flag_buf,
+        zip_last_lit,
+        zip_last_dist,
+        zip_last_flags,
+        zip_flags,
+        zip_flag_bit,
+        zip_opt_len,
+        zip_static_len,
+        zip_deflate_data,
+        zip_deflate_pos,
+    // var zip_HASH_BITS = 15;
+    /* constant tables */
+        zip_extra_lbits = [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5, 0],
+        zip_extra_dbits = [0, 0, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9, 10, 10, 11, 11, 12, 12, 13, 13],
+        zip_extra_blbits = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 3, 7],
+        zip_bl_order = [16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15],
+        zip_configuration_table;
+    if (zip_LIT_BUFSIZE > zip_INBUFSIZ) {
+        runtime.log("error: zip_INBUFSIZ is too small");
+    }
+    if ((zip_WSIZE << 1) > (1 << zip_BITS)) {
+        runtime.log("error: zip_WSIZE is too large");
+    }
+    if (zip_HASH_BITS > zip_BITS - 1) {
+        runtime.log("error: zip_HASH_BITS is too large");
+    }
+    if (zip_HASH_BITS < 8 || zip_MAX_MATCH !== 258) {
+        runtime.log("error: Code too clever");
+    }
+
+    /* objects (deflate) */
+    /**
+     * @constructor
+     */
+    function Zip_DeflateCT() {
+        this.fc = 0; // frequency count or bit string
+        this.dl = 0; // father node in Huffman tree or length of bit string
+    }
+    /**
+     * @constructor
+     */
+    function Zip_DeflateTreeDesc() {
+        this.dyn_tree = null;    // the dynamic tree
+        this.static_tree = null;    // corresponding static tree or NULL
+        this.extra_bits = null;    // extra bits for each code or NULL
+        this.extra_base = 0;    // base index for extra_bits
+        this.elems = 0;        // max number of elements in the tree
+        this.max_length = 0;    // max bit length for the codes
+        this.max_code = 0;        // largest code with non zero frequency
+    }
+
+    /** Values for max_lazy_match, good_match and max_chain_length, depending on
+     * the desired pack level (0..9). The values given below have been tuned to
+     * exclude worst case performance for pathological files. Better values may be
+     * found for specific files.
+     * @constructor
+     */
+    function Zip_DeflateConfiguration(a, b, c, d) {
+        this.good_length = a; // reduce lazy search above this match length
+        this.max_lazy = b;    // do not perform lazy search above this match length
+        this.nice_length = c; // quit search above this match length
+        this.max_chain = d;
+    }
+
+    /**
+     * @constructor
+     */
+    function Zip_DeflateBuffer() {
+        this.next = null;
+        this.len = 0;
+        this.ptr = [];
+        this.ptr.length = zip_OUTBUFSIZ;
+        this.off = 0;
+    }
+
+    /* constant tables */
+    zip_configuration_table = [
+        new Zip_DeflateConfiguration(0,    0,   0,    0),
+        new Zip_DeflateConfiguration(4,    4,   8,    4),
+        new Zip_DeflateConfiguration(4,    5,  16,    8),
+        new Zip_DeflateConfiguration(4,    6,  32,   32),
+        new Zip_DeflateConfiguration(4,    4,  16,   16),
+        new Zip_DeflateConfiguration(8,   16,  32,   32),
+        new Zip_DeflateConfiguration(8,   16, 128,  128),
+        new Zip_DeflateConfiguration(8,   32, 128,  256),
+        new Zip_DeflateConfiguration(32, 128, 258, 1024),
+        new Zip_DeflateConfiguration(32, 258, 258, 4096)
+    ];
+
+
+    /* routines (deflate) */
+
+    function zip_deflate_start(level) {
+        var i;
+
+        if (!level) {
+            level = zip_DEFAULT_LEVEL;
+        } else if (level < 1) {
+            level = 1;
+        } else if (level > 9) {
+            level = 9;
+        }
+
+        zip_compr_level = level;
+        zip_initflag = false;
+        zip_eofile = false;
+        if (zip_outbuf !== null) {
+            return;
+        }
+
+        zip_free_queue = zip_qhead = zip_qtail = null;
+        zip_outbuf = [];
+        zip_outbuf.length = zip_OUTBUFSIZ;
+        zip_window = [];
+        zip_window.length = zip_window_size;
+        zip_d_buf = [];
+        zip_d_buf.length = zip_DIST_BUFSIZE;
+        zip_l_buf = [];
+        zip_l_buf.length = zip_INBUFSIZ + zip_INBUF_EXTRA;
+        zip_prev = [];
+        zip_prev.length = 1 << zip_BITS;
+        zip_dyn_ltree = [];
+        zip_dyn_ltree.length = zip_HEAP_SIZE;
+        for (i = 0; i < zip_HEAP_SIZE; i++) {
+            zip_dyn_ltree[i] = new Zip_DeflateCT();
+        }
+        zip_dyn_dtree = [];
+        zip_dyn_dtree.length = 2 * zip_D_CODES + 1;
+        for (i = 0; i < 2 * zip_D_CODES + 1; i++) {
+            zip_dyn_dtree[i] = new Zip_DeflateCT();
+        }
+        zip_static_ltree = [];
+        zip_static_ltree.length = zip_L_CODES + 2;
+        for (i = 0; i < zip_L_CODES + 2; i++) {
+            zip_static_ltree[i] = new Zip_DeflateCT();
+        }
+        zip_static_dtree = [];
+        zip_static_dtree.length = zip_D_CODES;
+        for (i = 0; i < zip_D_CODES; i++) {
+            zip_static_dtree[i] = new Zip_DeflateCT();
+        }
+        zip_bl_tree = [];
+        zip_bl_tree.length = 2 * zip_BL_CODES + 1;
+        for (i = 0; i < 2 * zip_BL_CODES + 1; i++) {
+            zip_bl_tree[i] = new Zip_DeflateCT();
+        }
+        zip_l_desc = new Zip_DeflateTreeDesc();
+        zip_d_desc = new Zip_DeflateTreeDesc();
+        zip_bl_desc = new Zip_DeflateTreeDesc();
+        zip_bl_count = [];
+        zip_bl_count.length = zip_MAX_BITS + 1;
+        zip_heap = [];
+        zip_heap.length = 2 * zip_L_CODES + 1;
+        zip_depth = [];
+        zip_depth.length = 2 * zip_L_CODES + 1;
+        zip_length_code = [];
+        zip_length_code.length = zip_MAX_MATCH - zip_MIN_MATCH + 1;
+        zip_dist_code = [];
+        zip_dist_code.length = 512;
+        zip_base_length = [];
+        zip_base_length.length = zip_LENGTH_CODES;
+        zip_base_dist = [];
+        zip_base_dist.length = zip_D_CODES;
+        zip_flag_buf = [];
+        zip_flag_buf.length = parseInt(zip_LIT_BUFSIZE / 8, 10);
+    }
+
+    var zip_deflate_end = function () {
+        zip_free_queue = zip_qhead = zip_qtail = null;
+        zip_outbuf = null;
+        zip_window = null;
+        zip_d_buf = null;
+        zip_l_buf = null;
+        zip_prev = null;
+        zip_dyn_ltree = null;
+        zip_dyn_dtree = null;
+        zip_static_ltree = null;
+        zip_static_dtree = null;
+        zip_bl_tree = null;
+        zip_l_desc = null;
+        zip_d_desc = null;
+        zip_bl_desc = null;
+        zip_bl_count = null;
+        zip_heap = null;
+        zip_depth = null;
+        zip_length_code = null;
+        zip_dist_code = null;
+        zip_base_length = null;
+        zip_base_dist = null;
+        zip_flag_buf = null;
+    };
+
+    var zip_reuse_queue = function (p) {
+        p.next = zip_free_queue;
+        zip_free_queue = p;
+    };
+
+    var zip_new_queue = function () {
+        var p;
+
+        if (zip_free_queue !== null) {
+            p = zip_free_queue;
+            zip_free_queue = zip_free_queue.next;
+        } else {
+            p = new Zip_DeflateBuffer();
+        }
+        p.next = null;
+        p.len = p.off = 0;
+
+        return p;
+    };
+
+    var zip_head1 = function (i) {
+        return zip_prev[zip_WSIZE + i];
+    };
+
+    var zip_head2 = function (i, val) {
+        zip_prev[zip_WSIZE + i] = val;
+        return val;
+    };
+
+    var zip_qoutbuf = function () {
+        var q, i;
+        if (zip_outcnt !== 0) {
+            q = zip_new_queue();
+            if (zip_qhead === null) {
+                zip_qhead = zip_qtail = q;
+            } else {
+                zip_qtail = zip_qtail.next = q;
+            }
+            q.len = zip_outcnt - zip_outoff;
+    //      System.arraycopy(zip_outbuf, zip_outoff, q.ptr, 0, q.len);
+            for (i = 0; i < q.len; i++) {
+                q.ptr[i] = zip_outbuf[zip_outoff + i];
+            }
+            zip_outcnt = zip_outoff = 0;
+        }
+    };
+
+    /* put_byte is used for the compressed output, put_ubyte for the
+     * uncompressed output. However unlzw() uses window for its
+     * suffix table instead of its output buffer, so it does not use put_ubyte
+     * (to be cleaned up).
+     */
+    var zip_put_byte = function (c) {
+        zip_outbuf[zip_outoff + zip_outcnt++] = c;
+        if (zip_outoff + zip_outcnt === zip_OUTBUFSIZ) {
+            zip_qoutbuf();
+        }
+    };
+
+    /* Output a 16 bit value, lsb first */
+    var zip_put_short = function (w) {
+        w &= 0xffff;
+        if (zip_outoff + zip_outcnt < zip_OUTBUFSIZ - 2) {
+            zip_outbuf[zip_outoff + zip_outcnt++] = (w & 0xff);
+            zip_outbuf[zip_outoff + zip_outcnt++] = (w >>> 8);
+        } else {
+            zip_put_byte(w & 0xff);
+            zip_put_byte(w >>> 8);
+        }
+    };
+
+    /* ==========================================================================
+     * Insert string s in the dictionary and set match_head to the previous head
+     * of the hash chain (the most recent string with same hash key). Return
+     * the previous length of the hash chain.
+     * IN  assertion: all calls to to INSERT_STRING are made with consecutive
+     *    input characters and the first MIN_MATCH bytes of s are valid
+     *    (except for the last MIN_MATCH-1 bytes of the input file).
+     */
+    var zip_INSERT_STRING = function () {
+        zip_ins_h = ((zip_ins_h << zip_H_SHIFT)
+             ^ (zip_window[zip_strstart + zip_MIN_MATCH - 1] & 0xff))
+            & zip_HASH_MASK;
+        zip_hash_head = zip_head1(zip_ins_h);
+        zip_prev[zip_strstart & zip_WMASK] = zip_hash_head;
+        zip_head2(zip_ins_h, zip_strstart);
+    };
+
+    /* ==========================================================================
+     * Send a value on a given number of bits.
+     * IN assertion: length <= 16 and value fits in length bits.
+     */
+    var zip_Buf_size = 16; // bit size of bi_buf
+    var zip_send_bits = function (
+        value,    // value to send
+        length
+    ) {    // number of bits
+        /* If not enough room in bi_buf, use (valid) bits from bi_buf and
+         * (16 - bi_valid) bits from value, leaving (width - (16-bi_valid))
+         * unused bits in value.
+         */
+        if (zip_bi_valid > zip_Buf_size - length) {
+            zip_bi_buf |= (value << zip_bi_valid);
+            zip_put_short(zip_bi_buf);
+            zip_bi_buf = (value >> (zip_Buf_size - zip_bi_valid));
+            zip_bi_valid += length - zip_Buf_size;
+        } else {
+            zip_bi_buf |= value << zip_bi_valid;
+            zip_bi_valid += length;
+        }
+    };
+
+    /* Send a code of the given tree. c and tree must not have side effects */
+    var zip_SEND_CODE = function (c, tree) {
+        zip_send_bits(tree[c].fc, tree[c].dl);
+    };
+
+    /* Mapping from a distance to a distance code. dist is the distance - 1 and
+     * must not have side effects. dist_code[256] and dist_code[257] are never
+     * used.
+     */
+    var zip_D_CODE = function (dist) {
+        return (dist < 256 ? zip_dist_code[dist]
+            : zip_dist_code[256 + (dist >> 7)]) & 0xff;
+    };
+
+    /* ==========================================================================
+     * Compares to subtrees, using the tree depth as tie breaker when
+     * the subtrees have equal frequency. This minimizes the worst case length.
+     */
+    var zip_SMALLER = function (tree, n, m) {
+        return tree[n].fc < tree[m].fc ||
+            (tree[n].fc === tree[m].fc && zip_depth[n] <= zip_depth[m]);
+    };
+
+    /* ==========================================================================
+     * read string data
+     */
+    var zip_read_buff = function (buff, offset, n) {
+        var i;
+        for (i = 0; i < n && zip_deflate_pos < zip_deflate_data.length; i++) {
+            buff[offset + i] =
+                zip_deflate_data.charCodeAt(zip_deflate_pos++) & 0xff;
+        }
+        return i;
+    };
+
+    /* ==========================================================================
+     * Fill the window when the lookahead becomes insufficient.
+     * Updates strstart and lookahead, and sets eofile if end of input file.
+     * IN assertion: lookahead < MIN_LOOKAHEAD && strstart + lookahead > 0
+     * OUT assertions: at least one byte has been read, or eofile is set;
+     *    file reads are performed for at least two bytes (required for the
+     *    translate_eol option).
+     */
+    var zip_fill_window = function () {
+        var n, m;
+
+        // Amount of free space at the end of the window.
+        var more = zip_window_size - zip_lookahead - zip_strstart;
+
+        /* If the window is almost full and there is insufficient lookahead,
+         * move the upper half to the lower one to make room in the upper half.
+         */
+        if (more === -1) {
+        /* Very unlikely, but possible on 16 bit machine if strstart == 0
+             * and lookahead == 1 (input done one byte at time)
+             */
+            more--;
+        } else if (zip_strstart >= zip_WSIZE + zip_MAX_DIST) {
+        /* By the IN assertion, the window is not empty so we can't confuse
+             * more == 0 with more == 64K on a 16 bit machine.
+             */
+    //    Assert(window_size == (ulg)2*WSIZE, "no sliding with BIG_MEM");
+
+    //    System.arraycopy(window, WSIZE, window, 0, WSIZE);
+            for (n = 0; n < zip_WSIZE; n++) {
+                zip_window[n] = zip_window[n + zip_WSIZE];
+            }
+
+            zip_match_start -= zip_WSIZE;
+            zip_strstart    -= zip_WSIZE; /* we now have strstart >= MAX_DIST: */
+            zip_block_start -= zip_WSIZE;
+
+            for (n = 0; n < zip_HASH_SIZE; n++) {
+                m = zip_head1(n);
+                zip_head2(n, m >= zip_WSIZE ? m - zip_WSIZE : zip_NIL);
+            }
+            for (n = 0; n < zip_WSIZE; n++) {
+            /* If n is not on any hash chain, prev[n] is garbage but
+             * its value will never be used.
+             */
+                m = zip_prev[n];
+                zip_prev[n] = (m >= zip_WSIZE ? m - zip_WSIZE : zip_NIL);
+            }
+            more += zip_WSIZE;
+        }
+        // At this point, more >= 2
+        if (!zip_eofile) {
+            n = zip_read_buff(zip_window, zip_strstart + zip_lookahead, more);
+            if (n <= 0) {
+                zip_eofile = true;
+            } else {
+                zip_lookahead += n;
+            }
+        }
+    };
+
+
+    /* ==========================================================================
+     * Initialize the "longest match" routines for a new file
+     */
+    var zip_lm_init = function () {
+        var j;
+
+        /* Initialize the hash table. */
+        for (j = 0; j < zip_HASH_SIZE; j++) {
+    //    zip_head2(j, zip_NIL);
+            zip_prev[zip_WSIZE + j] = 0;
+        }
+        /* prev will be initialized on the fly */
+
+        /* Set the default configuration parameters:
+         */
+        zip_max_lazy_match = zip_configuration_table[zip_compr_level].max_lazy;
+        zip_good_match     = zip_configuration_table[zip_compr_level].good_length;
+        if (!zip_FULL_SEARCH) {
+            zip_nice_match = zip_configuration_table[zip_compr_level].nice_length;
+        }
+        zip_max_chain_length = zip_configuration_table[zip_compr_level].max_chain;
+
+        zip_strstart = 0;
+        zip_block_start = 0;
+
+        zip_lookahead = zip_read_buff(zip_window, 0, 2 * zip_WSIZE);
+        if (zip_lookahead <= 0) {
+            zip_eofile = true;
+            zip_lookahead = 0;
+            return;
+        }
+        zip_eofile = false;
+        /* Make sure that we always have enough lookahead. This is important
+         * if input comes from a device such as a tty.
+         */
+        while (zip_lookahead < zip_MIN_LOOKAHEAD && !zip_eofile) {
+            zip_fill_window();
+        }
+
+        /* If lookahead < MIN_MATCH, ins_h is garbage, but this is
+         * not important since only literal bytes will be emitted.
+         */
+        zip_ins_h = 0;
+        for (j = 0; j < zip_MIN_MATCH - 1; j++) {
+    //      UPDATE_HASH(ins_h, window[j]);
+            zip_ins_h = ((zip_ins_h << zip_H_SHIFT) ^ (zip_window[j] & 0xff)) & zip_HASH_MASK;
+        }
+    };
+
+    /* ==========================================================================
+     * Set match_start to the longest match starting at the given string and
+     * return its length. Matches shorter or equal to prev_length are discarded,
+     * in which case the result is equal to prev_length and match_start is
+     * garbage.
+     * IN assertions: cur_match is the head of the hash chain for the current
+     *   string (strstart) and its distance is <= MAX_DIST, and prev_length >= 1
+     */
+    var zip_longest_match = function (cur_match) {
+        var chain_length = zip_max_chain_length; // max hash chain length
+        var scanp = zip_strstart; // current string
+        var matchp;        // matched string
+        var len;        // length of current match
+        var best_len = zip_prev_length;    // best match length so far
+
+        /* Stop when cur_match becomes <= limit. To simplify the code,
+         * we prevent matches with the string of window index 0.
+         */
+        var limit = (zip_strstart > zip_MAX_DIST ? zip_strstart - zip_MAX_DIST : zip_NIL);
+
+        var strendp = zip_strstart + zip_MAX_MATCH;
+        var scan_end1 = zip_window[scanp + best_len - 1];
+        var scan_end  = zip_window[scanp + best_len];
+
+        /* Do not waste too much time if we already have a good match: */
+        if (zip_prev_length >= zip_good_match) {
+            chain_length >>= 2;
+        }
+
+    //  Assert(encoder->strstart <= window_size-MIN_LOOKAHEAD, "insufficient lookahead");
+
+        do {
+    //    Assert(cur_match < encoder->strstart, "no future");
+            matchp = cur_match;
+
+        /* Skip to next match if the match length cannot increase
+            * or if the match length is less than 2:
+        */
+            if (zip_window[matchp + best_len]    !== scan_end  ||
+                    zip_window[matchp + best_len - 1]    !== scan_end1 ||
+                    zip_window[matchp]            !== zip_window[scanp] ||
+                    zip_window[++matchp]            !== zip_window[scanp + 1]) {
+                continue;
+            }
+
+        /* The check at best_len-1 can be removed because it will be made
+             * again later. (This heuristic is not always a win.)
+             * It is not necessary to compare scan[2] and match[2] since they
+             * are always equal when the other bytes match, given that
+             * the hash keys are equal and that HASH_BITS >= 8.
+             */
+            scanp += 2;
+            matchp++;
+
+        /* We check for insufficient lookahead only every 8th comparison;
+             * the 256th check will be made at strstart+258.
+             */
+            do {
+                ++scanp;
+            } while (zip_window[scanp] === zip_window[++matchp] &&
+                zip_window[++scanp] === zip_window[++matchp] &&
+                zip_window[++scanp] === zip_window[++matchp] &&
+                zip_window[++scanp] === zip_window[++matchp] &&
+                zip_window[++scanp] === zip_window[++matchp] &&
+                zip_window[++scanp] === zip_window[++matchp] &&
+                zip_window[++scanp] === zip_window[++matchp] &&
+                zip_window[++scanp] === zip_window[++matchp] &&
+                scanp < strendp);
+
+            len = zip_MAX_MATCH - (strendp - scanp);
+            scanp = strendp - zip_MAX_MATCH;
+
+            if (len > best_len) {
+                zip_match_start = cur_match;
+                best_len = len;
+                if (zip_FULL_SEARCH) {
+                    if (len >= zip_MAX_MATCH) {
+                        break;
+                    }
+                } else {
+                    if (len >= zip_nice_match) {
+                        break;
+                    }
+                }
+
+                scan_end1  = zip_window[scanp + best_len - 1];
+                scan_end   = zip_window[scanp + best_len];
+            }
+        } while ((cur_match = zip_prev[cur_match & zip_WMASK]) > limit
+            && --chain_length !== 0);
+
+        return best_len;
+    };
+
+    /* ==========================================================================
+     * Save the match info and tally the frequency counts. Return true if
+     * the current block must be flushed.
+     */
+    var zip_ct_tally = function (
+        dist, // distance of matched string
+        lc
+    ) { // match length-MIN_MATCH or unmatched char (if dist==0)
+        zip_l_buf[zip_last_lit++] = lc;
+        if (dist === 0) {
+        // lc is the unmatched char
+            zip_dyn_ltree[lc].fc++;
+        } else {
+        // Here, lc is the match length - MIN_MATCH
+            dist--;            // dist = match distance - 1
+    //      Assert((ush)dist < (ush)MAX_DIST &&
+    //         (ush)lc <= (ush)(MAX_MATCH-MIN_MATCH) &&
+    //         (ush)D_CODE(dist) < (ush)D_CODES,  "ct_tally: bad match");
+
+            zip_dyn_ltree[zip_length_code[lc] + zip_LITERALS + 1].fc++;
+            zip_dyn_dtree[zip_D_CODE(dist)].fc++;
+
+            zip_d_buf[zip_last_dist++] = dist;
+            zip_flags |= zip_flag_bit;
+        }
+        zip_flag_bit <<= 1;
+
+        // Output the flags if they fill a byte
+        if ((zip_last_lit & 7) === 0) {
+            zip_flag_buf[zip_last_flags++] = zip_flags;
+            zip_flags = 0;
+            zip_flag_bit = 1;
+        }
+        // Try to guess if it is profitable to stop the current block here
+        if (zip_compr_level > 2 && (zip_last_lit & 0xfff) === 0) {
+        // Compute an upper bound for the compressed length
+            var out_length = zip_last_lit * 8;
+            var in_length = zip_strstart - zip_block_start;
+            var dcode;
+
+            for (dcode = 0; dcode < zip_D_CODES; dcode++) {
+                out_length += zip_dyn_dtree[dcode].fc * (5 + zip_extra_dbits[dcode]);
+            }
+            out_length >>= 3;
+    //      Trace((stderr,"\nlast_lit %u, last_dist %u, in %ld, out ~%ld(%ld%%) ",
+    //         encoder->last_lit, encoder->last_dist, in_length, out_length,
+    //         100L - out_length*100L/in_length));
+            if (zip_last_dist < parseInt(zip_last_lit / 2, 10) &&
+                    out_length < parseInt(in_length / 2, 10)) {
+                return true;
+            }
+        }
+        return (zip_last_lit === zip_LIT_BUFSIZE - 1 ||
+            zip_last_dist === zip_DIST_BUFSIZE);
+        /* We avoid equality with LIT_BUFSIZE because of wraparound at 64K
+         * on 16 bit machines and because stored blocks are restricted to
+         * 64K-1 bytes.
+         */
+    };
+
+    /* ==========================================================================
+     * Restore the heap property by moving down the tree starting at node k,
+     * exchanging a node with the smallest of its two sons if necessary, stopping
+     * when the heap property is re-established (each father smaller than its
+     * two sons).
+     */
+    var zip_pqdownheap = function (
+        tree,    // the tree to restore
+        k
+    ) {    // node to move down
+        var v = zip_heap[k];
+        var j = k << 1;    // left son of k
+
+        while (j <= zip_heap_len) {
+        // Set j to the smallest of the two sons:
+            if (j < zip_heap_len &&
+                    zip_SMALLER(tree, zip_heap[j + 1], zip_heap[j])) {
+                j++;
+            }
+
+        // Exit if v is smaller than both sons
+            if (zip_SMALLER(tree, v, zip_heap[j])) {
+                break;
+            }
+
+        // Exchange v with the smallest son
+            zip_heap[k] = zip_heap[j];
+            k = j;
+
+        // And continue down the tree, setting j to the left son of k
+            j <<= 1;
+        }
+        zip_heap[k] = v;
+    };
+
+    /* ==========================================================================
+     * Compute the optimal bit lengths for a tree and update the total bit length
+     * for the current block.
+     * IN assertion: the fields freq and dad are set, heap[heap_max] and
+     *    above are the tree nodes sorted by increasing frequency.
+     * OUT assertions: the field len is set to the optimal bit length, the
+     *     array bl_count contains the frequencies for each bit length.
+     *     The length opt_len is updated; static_len is also updated if stree is
+     *     not null.
+     */
+    var zip_gen_bitlen = function (desc) { // the tree descriptor
+        var tree        = desc.dyn_tree;
+        var extra        = desc.extra_bits;
+        var base        = desc.extra_base;
+        var max_code    = desc.max_code;
+        var max_length    = desc.max_length;
+        var stree        = desc.static_tree;
+        var h;        // heap index
+        var n, m;        // iterate over the tree elements
+        var bits;        // bit length
+        var xbits;        // extra bits
+        var f;        // frequency
+        var overflow = 0;    // number of elements with bit length too large
+
+        for (bits = 0; bits <= zip_MAX_BITS; bits++) {
+            zip_bl_count[bits] = 0;
+        }
+
+        /* In a first pass, compute the optimal bit lengths (which may
+         * overflow in the case of the bit length tree).
+         */
+        tree[zip_heap[zip_heap_max]].dl = 0; // root of the heap
+
+        for (h = zip_heap_max + 1; h < zip_HEAP_SIZE; h++) {
+            n = zip_heap[h];
+            bits = tree[tree[n].dl].dl + 1;
+            if (bits > max_length) {
+                bits = max_length;
+                overflow++;
+            }
+            tree[n].dl = bits;
+        // We overwrite tree[n].dl which is no longer needed
+
+            if (n > max_code) {
+                continue; // not a leaf node
+            }
+
+            zip_bl_count[bits]++;
+            xbits = 0;
+            if (n >= base) {
+                xbits = extra[n - base];
+            }
+            f = tree[n].fc;
+            zip_opt_len += f * (bits + xbits);
+            if (stree !== null) {
+                zip_static_len += f * (stree[n].dl + xbits);
+            }
+        }
+        if (overflow === 0) {
+            return;
+        }
+
+        // This happens for example on obj2 and pic of the Calgary corpus
+
+        // Find the first bit length which could increase:
+        do {
+            bits = max_length - 1;
+            while (zip_bl_count[bits] === 0) {
+                bits--;
+            }
+            zip_bl_count[bits]--;        // move one leaf down the tree
+            zip_bl_count[bits + 1] += 2;    // move one overflow item as its brother
+            zip_bl_count[max_length]--;
+        /* The brother of the overflow item also moves one step up,
+         * but this does not affect bl_count[max_length]
+         */
+            overflow -= 2;
+        } while (overflow > 0);
+
+        /* Now recompute all bit lengths, scanning in increasing frequency.
+         * h is still equal to HEAP_SIZE. (It is simpler to reconstruct all
+         * lengths instead of fixing only the wrong ones. This idea is taken
+         * from 'ar' written by Haruhiko Okumura.)
+         */
+        for (bits = max_length; bits !== 0; bits--) {
+            n = zip_bl_count[bits];
+            while (n !== 0) {
+                m = zip_heap[--h];
+                if (m > max_code) {
+                    continue;
+                }
+                if (tree[m].dl !== bits) {
+                    zip_opt_len += (bits - tree[m].dl) * tree[m].fc;
+                    tree[m].fc = bits;
+                }
+                n--;
+            }
+        }
+    };
+
+    /* ==========================================================================
+     * Reverse the first len bits of a code, using straightforward code (a faster
+     * method would use a table)
+     * IN assertion: 1 <= len <= 15
+     */
+    var zip_bi_reverse = function (
+        code,    // the value to invert
+        len
+    ) {    // its bit length
+        var res = 0;
+        do {
+            res |= code & 1;
+            code >>= 1;
+            res <<= 1;
+        } while (--len > 0);
+        return res >> 1;
+    };
+
+      /* ==========================================================================
+       * Generate the codes for a given tree and bit counts (which need not be
+       * optimal).
+       * IN assertion: the array bl_count contains the bit length statistics for
+       * the given tree and the field len is set for all tree elements.
+       * OUT assertion: the field code is set for all tree elements of non
+       *     zero code length.
+       */
+    var zip_gen_codes = function (tree,    // the tree to decorate
+               max_code) {    // largest code with non zero frequency
+            var next_code = [];
+            next_code.length = zip_MAX_BITS + 1; // next code value for each bit length
+            var code = 0;        // running code value
+            var bits;            // bit index
+            var n;            // code index
+
+        /* The distribution counts are first used to generate the code values
+         * without bit reversal.
+         */
+            for (bits = 1; bits <= zip_MAX_BITS; bits++) {
+                code = ((code + zip_bl_count[bits - 1]) << 1);
+                next_code[bits] = code;
+            }
+
+        /* Check that the bit counts in bl_count are consistent. The last code
+         * must be all ones.
+         */
+    //    Assert (code + encoder->bl_count[MAX_BITS]-1 == (1<<MAX_BITS)-1,
+    //        "inconsistent bit counts");
+    //    Tracev((stderr,"\ngen_codes: max_code %d ", max_code));
+
+            for (n = 0; n <= max_code; n++) {
+                var len = tree[n].dl;
+                if (len === 0) {
+                    continue;
+                }
+        // Now reverse the bits
+                tree[n].fc = zip_bi_reverse(next_code[len]++, len);
+
+    //      Tracec(tree != static_ltree, (stderr,"\nn %3d %c l %2d c %4x (%x) ",
+    //      n, (isgraph(n) ? n : ' '), len, tree[n].fc, next_code[len]-1));
+            }
+        };
+
+
+    /* ==========================================================================
+     * Construct one Huffman tree and assigns the code bit strings and lengths.
+     * Update the total bit length for the current block.
+     * IN assertion: the field freq is set for all tree elements.
+     * OUT assertions: the fields len and code are set to the optimal bit length
+     *     and corresponding code. The length opt_len is updated; static_len is
+     *     also updated if stree is not null. The field max_code is set.
+     */
+    var zip_build_tree = function (desc) { // the tree descriptor
+        var tree    = desc.dyn_tree;
+        var stree    = desc.static_tree;
+        var elems    = desc.elems;
+        var n, m;        // iterate over heap elements
+        var max_code = -1;    // largest code with non zero frequency
+        var node = elems;    // next internal node of the tree
+
+        /* Construct the initial heap, with least frequent element in
+         * heap[SMALLEST]. The sons of heap[n] are heap[2*n] and heap[2*n+1].
+         * heap[0] is not used.
+         */
+        zip_heap_len = 0;
+        zip_heap_max = zip_HEAP_SIZE;
+
+        for (n = 0; n < elems; n++) {
+            if (tree[n].fc !== 0) {
+                zip_heap[++zip_heap_len] = max_code = n;
+                zip_depth[n] = 0;
+            } else {
+                tree[n].dl = 0;
+            }
+        }
+
+        /* The pkzip format requires that at least one distance code exists,
+         * and that at least one bit should be sent even if there is only one
+         * possible code. So to avoid special checks later on we force at least
+         * two codes of non zero frequency.
+         */
+        while (zip_heap_len < 2) {
+            var xnew = zip_heap[++zip_heap_len] = (max_code < 2 ? ++max_code : 0);
+            tree[xnew].fc = 1;
+            zip_depth[xnew] = 0;
+            zip_opt_len--;
+            if (stree !== null) {
+                zip_static_len -= stree[xnew].dl;
+            }
+        // new is 0 or 1 so it does not have extra bits
+        }
+        desc.max_code = max_code;
+
+        /* The elements heap[heap_len/2+1 .. heap_len] are leaves of the tree,
+         * establish sub-heaps of increasing lengths:
+         */
+        for (n = zip_heap_len >> 1; n >= 1; n--) {
+            zip_pqdownheap(tree, n);
+        }
+
+        /* Construct the Huffman tree by repeatedly combining the least two
+         * frequent nodes.
+         */
+        do {
+            n = zip_heap[zip_SMALLEST];
+            zip_heap[zip_SMALLEST] = zip_heap[zip_heap_len--];
+            zip_pqdownheap(tree, zip_SMALLEST);
+
+            m = zip_heap[zip_SMALLEST];  // m = node of next least frequency
+
+        // keep the nodes sorted by frequency
+            zip_heap[--zip_heap_max] = n;
+            zip_heap[--zip_heap_max] = m;
+
+        // Create a new node father of n and m
+            tree[node].fc = tree[n].fc + tree[m].fc;
+    //    depth[node] = (char)(MAX(depth[n], depth[m]) + 1);
+            if (zip_depth[n] > zip_depth[m] + 1) {
+                zip_depth[node] = zip_depth[n];
+            } else {
+                zip_depth[node] = zip_depth[m] + 1;
+            }
+            tree[n].dl = tree[m].dl = node;
+
+        // and insert the new node in the heap
+            zip_heap[zip_SMALLEST] = node++;
+            zip_pqdownheap(tree, zip_SMALLEST);
+
+        } while (zip_heap_len >= 2);
+
+        zip_heap[--zip_heap_max] = zip_heap[zip_SMALLEST];
+
+        /* At this point, the fields freq and dad are set. We can now
+         * generate the bit lengths.
+         */
+        zip_gen_bitlen(desc);
+
+        // The field len is now set, we can generate the bit codes
+        zip_gen_codes(tree, max_code);
+    };
+
+    /* ==========================================================================
+     * Scan a literal or distance tree to determine the frequencies of the codes
+     * in the bit length tree. Updates opt_len to take into account the repeat
+     * counts. (The contribution of the bit length codes will be added later
+     * during the construction of bl_tree.)
+     */
+    var zip_scan_tree = function (tree,// the tree to be scanned
+               max_code) {  // and its largest code of non zero frequency
+            var n;            // iterates over all tree elements
+            var prevlen = -1;        // last emitted length
+            var curlen;            // length of current code
+            var nextlen = tree[0].dl;    // length of next code
+            var count = 0;        // repeat count of the current code
+            var max_count = 7;        // max repeat count
+            var min_count = 4;        // min repeat count
+
+            if (nextlen === 0) {
+                max_count = 138;
+                min_count = 3;
+            }
+            tree[max_code + 1].dl = 0xffff; // guard
+
+            for (n = 0; n <= max_code; n++) {
+                curlen = nextlen;
+                nextlen = tree[n + 1].dl;
+                if (++count < max_count && curlen === nextlen) {
+                    continue;
+                } else if (count < min_count) {
+                    zip_bl_tree[curlen].fc += count;
+                } else if (curlen !== 0) {
+                    if (curlen !== prevlen) {
+                        zip_bl_tree[curlen].fc++;
+                    }
+                    zip_bl_tree[zip_REP_3_6].fc++;
+                } else if (count <= 10) {
+                    zip_bl_tree[zip_REPZ_3_10].fc++;
+                } else {
+                    zip_bl_tree[zip_REPZ_11_138].fc++;
+                }
+                count = 0;
+                prevlen = curlen;
+                if (nextlen === 0) {
+                    max_count = 138;
+                    min_count = 3;
+                } else if (curlen === nextlen) {
+                    max_count = 6;
+                    min_count = 3;
+                } else {
+                    max_count = 7;
+                    min_count = 4;
+                }
+            }
+        };
+
+
+    /* ==========================================================================
+     * Construct the Huffman tree for the bit lengths and return the index in
+     * bl_order of the last bit length code to send.
+     */
+    var zip_build_bl_tree = function () {
+        var max_blindex;  // index of last bit length code of non zero freq
+
+        // Determine the bit length frequencies for literal and distance trees
+        zip_scan_tree(zip_dyn_ltree, zip_l_desc.max_code);
+        zip_scan_tree(zip_dyn_dtree, zip_d_desc.max_code);
+
+        // Build the bit length tree:
+        zip_build_tree(zip_bl_desc);
+        /* opt_len now includes the length of the tree representations, except
+         * the lengths of the bit lengths codes and the 5+5+4 bits for the counts.
+         */
+
+        /* Determine the number of bit length codes to send. The pkzip format
+         * requires that at least 4 bit length codes be sent. (appnote.txt says
+         * 3 but the actual value used is 4.)
+         */
+        for (max_blindex = zip_BL_CODES - 1; max_blindex >= 3; max_blindex--) {
+            if (zip_bl_tree[zip_bl_order[max_blindex]].dl !== 0) {
+                break;
+            }
+        }
+        /* Update opt_len to include the bit length tree and counts */
+        zip_opt_len += 3 * (max_blindex + 1) + 5 + 5 + 4;
+    //    Tracev((stderr, "\ndyn trees: dyn %ld, stat %ld",
+    //        encoder->opt_len, encoder->static_len));
+
+        return max_blindex;
+    };
+
+    /* ==========================================================================
+     * Write out any remaining bits in an incomplete byte.
+     */
+    var zip_bi_windup = function () {
+        if (zip_bi_valid > 8) {
+            zip_put_short(zip_bi_buf);
+        } else if (zip_bi_valid > 0) {
+            zip_put_byte(zip_bi_buf);
+        }
+        zip_bi_buf = 0;
+        zip_bi_valid = 0;
+    };
+
+      /* ==========================================================================
+       * Send the block data compressed using the given Huffman trees
+       */
+    var zip_compress_block = function (
+        ltree,    // literal tree
+        dtree
+    ) {    // distance tree
+        var dist;        // distance of matched string
+        var lc;        // match length or unmatched char (if dist == 0)
+        var lx = 0;        // running index in l_buf
+        var dx = 0;        // running index in d_buf
+        var fx = 0;        // running index in flag_buf
+        var flag = 0;    // current flags
+        var code;        // the code to send
+        var extra;        // number of extra bits to send
+
+        if (zip_last_lit !== 0) {
+            do {
+                if ((lx & 7) === 0) {
+                    flag = zip_flag_buf[fx++];
+                }
+                lc = zip_l_buf[lx++] & 0xff;
+                if ((flag & 1) === 0) {
+                    zip_SEND_CODE(lc, ltree); /* send a literal byte */
+    //    Tracecv(isgraph(lc), (stderr," '%c' ", lc));
+                } else {
+            // Here, lc is the match length - MIN_MATCH
+                    code = zip_length_code[lc];
+                    zip_SEND_CODE(code + zip_LITERALS + 1, ltree); // send the length code
+                    extra = zip_extra_lbits[code];
+                    if (extra !== 0) {
+                        lc -= zip_base_length[code];
+                        zip_send_bits(lc, extra); // send the extra length bits
+                    }
+                    dist = zip_d_buf[dx++];
+            // Here, dist is the match distance - 1
+                    code = zip_D_CODE(dist);
+    //    Assert (code < D_CODES, "bad d_code");
+
+                    zip_SEND_CODE(code, dtree);      // send the distance code
+                    extra = zip_extra_dbits[code];
+                    if (extra !== 0) {
+                        dist -= zip_base_dist[code];
+                        zip_send_bits(dist, extra);   // send the extra distance bits
+                    }
+                } // literal or match pair ?
+                flag >>= 1;
+            } while (lx < zip_last_lit);
+        }
+
+        zip_SEND_CODE(zip_END_BLOCK, ltree);
+    };
+
+      /* ==========================================================================
+       * Send a literal or distance tree in compressed form, using the codes in
+       * bl_tree.
+       */
+    var zip_send_tree = function (tree, // the tree to be scanned
+               max_code) { // and its largest code of non zero frequency
+            var n;            // iterates over all tree elements
+            var prevlen = -1;        // last emitted length
+            var curlen;            // length of current code
+            var nextlen = tree[0].dl;    // length of next code
+            var count = 0;        // repeat count of the current code
+            var max_count = 7;        // max repeat count
+            var min_count = 4;        // min repeat count
+
+            /* tree[max_code+1].dl = -1; */  /* guard already set */
+            if (nextlen === 0) {
+                max_count = 138;
+                min_count = 3;
+            }
+
+            for (n = 0; n <= max_code; n++) {
+                curlen = nextlen;
+                nextlen = tree[n + 1].dl;
+                if (++count < max_count && curlen === nextlen) {
+                    continue;
+                } else if (count < min_count) {
+                    do {
+                        zip_SEND_CODE(curlen, zip_bl_tree);
+                    } while (--count !== 0);
+                } else if (curlen !== 0) {
+                    if (curlen !== prevlen) {
+                        zip_SEND_CODE(curlen, zip_bl_tree);
+                        count--;
+                    }
+                    // Assert(count >= 3 && count <= 6, " 3_6?");
+                    zip_SEND_CODE(zip_REP_3_6, zip_bl_tree);
+                    zip_send_bits(count - 3, 2);
+                } else if (count <= 10) {
+                    zip_SEND_CODE(zip_REPZ_3_10, zip_bl_tree);
+                    zip_send_bits(count - 3, 3);
+                } else {
+                    zip_SEND_CODE(zip_REPZ_11_138, zip_bl_tree);
+                    zip_send_bits(count - 11, 7);
+                }
+                count = 0;
+                prevlen = curlen;
+                if (nextlen === 0) {
+                    max_count = 138;
+                    min_count = 3;
+                } else if (curlen === nextlen) {
+                    max_count = 6;
+                    min_count = 3;
+                } else {
+                    max_count = 7;
+                    min_count = 4;
+                }
+            }
+        };
+
+    /* ==========================================================================
+     * Send the header for a block using dynamic Huffman trees: the counts, the
+     * lengths of the bit length codes, the literal tree and the distance tree.
+     * IN assertion: lcodes >= 257, dcodes >= 1, blcodes >= 4.
+     */
+    var zip_send_all_trees = function (lcodes, dcodes, blcodes) { // number of codes for each tree
+        var rank; // index in bl_order
+
+    //    Assert (lcodes >= 257 && dcodes >= 1 && blcodes >= 4, "not enough codes");
+    //    Assert (lcodes <= L_CODES && dcodes <= D_CODES && blcodes <= BL_CODES,
+    //        "too many codes");
+    //    Tracev((stderr, "\nbl counts: "));
+        zip_send_bits(lcodes - 257, 5); // not +255 as stated in appnote.txt
+        zip_send_bits(dcodes - 1,   5);
+        zip_send_bits(blcodes - 4,  4); // not -3 as stated in appnote.txt
+        for (rank = 0; rank < blcodes; rank++) {
+    //      Tracev((stderr, "\nbl code %2d ", bl_order[rank]));
+            zip_send_bits(zip_bl_tree[zip_bl_order[rank]].dl, 3);
+        }
+
+        // send the literal tree
+        zip_send_tree(zip_dyn_ltree, lcodes - 1);
+
+        // send the distance tree
+        zip_send_tree(zip_dyn_dtree, dcodes - 1);
+    };
+
+    /* ==========================================================================
+     * Initialize a new block.
+     */
+    var zip_init_block = function () {
+        var n; // iterates over tree elements
+
+        // Initialize the trees.
+        for (n = 0; n < zip_L_CODES;  n++) {
+            zip_dyn_ltree[n].fc = 0;
+        }
+        for (n = 0; n < zip_D_CODES;  n++) {
+            zip_dyn_dtree[n].fc = 0;
+        }
+        for (n = 0; n < zip_BL_CODES; n++) {
+            zip_bl_tree[n].fc = 0;
+        }
+
+        zip_dyn_ltree[zip_END_BLOCK].fc = 1;
+        zip_opt_len = zip_static_len = 0;
+        zip_last_lit = zip_last_dist = zip_last_flags = 0;
+        zip_flags = 0;
+        zip_flag_bit = 1;
+    };
+
+    /* ==========================================================================
+     * Determine the best encoding for the current block: dynamic trees, static
+     * trees or store, and output the encoded block to the zip file.
+     */
+    var zip_flush_block = function (eof) { // true if this is the last block for a file
+        var opt_lenb, static_lenb; // opt_len and static_len in bytes
+        var max_blindex;    // index of last bit length code of non zero freq
+        var stored_len;    // length of input block
+
+        stored_len = zip_strstart - zip_block_start;
+        zip_flag_buf[zip_last_flags] = zip_flags; // Save the flags for the last 8 items
+
+        // Construct the literal and distance trees
+        zip_build_tree(zip_l_desc);
+    //    Tracev((stderr, "\nlit data: dyn %ld, stat %ld",
+    //        encoder->opt_len, encoder->static_len));
+
+        zip_build_tree(zip_d_desc);
+    //    Tracev((stderr, "\ndist data: dyn %ld, stat %ld",
+    //        encoder->opt_len, encoder->static_len));
+        /* At this point, opt_len and static_len are the total bit lengths of
+         * the compressed block data, excluding the tree representations.
+         */
+
+        /* Build the bit length tree for the above two trees, and get the index
+         * in bl_order of the last bit length code to send.
+         */
+        max_blindex = zip_build_bl_tree();
+
+        // Determine the best encoding. Compute first the block length in bytes
+        opt_lenb    = (zip_opt_len    + 3 + 7) >> 3;
+        static_lenb = (zip_static_len + 3 + 7) >> 3;
+
+    //    Trace((stderr, "\nopt %lu(%lu) stat %lu(%lu) stored %lu lit %u dist %u ",
+    //       opt_lenb, encoder->opt_len,
+    //       static_lenb, encoder->static_len, stored_len,
+    //       encoder->last_lit, encoder->last_dist));
+
+        if (static_lenb <= opt_lenb) {
+            opt_lenb = static_lenb;
+        }
+        if (stored_len + 4 <= opt_lenb // 4: two words for the lengths
+                && zip_block_start >= 0) {
+            var i;
+
+        /* The test buf != NULL is only necessary if LIT_BUFSIZE > WSIZE.
+         * Otherwise we can't have processed more than WSIZE input bytes since
+         * the last block flush, because compression would have been
+         * successful. If LIT_BUFSIZE <= WSIZE, it is never too late to
+         * transform a block into a stored block.
+         */
+            zip_send_bits((zip_STORED_BLOCK << 1) + eof, 3);  /* send block type */
+            zip_bi_windup();         /* align on byte boundary */
+            zip_put_short(stored_len);
+            zip_put_short(~stored_len);
+
+          // copy block
+    /*
+          p = &window[block_start];
+          for (i = 0; i < stored_len; i++)
+        put_byte(p[i]);
+    */
+            for (i = 0; i < stored_len; i++) {
+                zip_put_byte(zip_window[zip_block_start + i]);
+            }
+
+        } else if (static_lenb === opt_lenb) {
+            zip_send_bits((zip_STATIC_TREES << 1) + eof, 3);
+            zip_compress_block(zip_static_ltree, zip_static_dtree);
+        } else {
+            zip_send_bits((zip_DYN_TREES << 1) + eof, 3);
+            zip_send_all_trees(zip_l_desc.max_code + 1,
+                   zip_d_desc.max_code + 1,
+                   max_blindex + 1);
+            zip_compress_block(zip_dyn_ltree, zip_dyn_dtree);
+        }
+
+        zip_init_block();
+
+        if (eof !== 0) {
+            zip_bi_windup();
+        }
+    };
+
+    /* ==========================================================================
+     * Processes a new input file and return its compressed length. This
+     * function does not perform lazy evaluationof matches and inserts
+     * new strings in the dictionary only for unmatched strings or for short
+     * matches. It is used only for the fast compression options.
+     */
+    var zip_deflate_fast = function () {
+        while (zip_lookahead !== 0 && zip_qhead === null) {
+            var flush; // set if current block must be flushed
+
+        /* Insert the string window[strstart .. strstart+2] in the
+         * dictionary, and set hash_head to the head of the hash chain:
+         */
+            zip_INSERT_STRING();
+
+        /* Find the longest match, discarding those <= prev_length.
+         * At this point we have always match_length < MIN_MATCH
+         */
+            if (zip_hash_head !== zip_NIL &&
+                    zip_strstart - zip_hash_head <= zip_MAX_DIST) {
+            /* To simplify the code, we prevent matches with the string
+             * of window index 0 (in particular we have to avoid a match
+             * of the string with itself at the start of the input file).
+             */
+                zip_match_length = zip_longest_match(zip_hash_head);
+            /* longest_match() sets match_start */
+                if (zip_match_length > zip_lookahead) {
+                    zip_match_length = zip_lookahead;
+                }
+            }
+            if (zip_match_length >= zip_MIN_MATCH) {
+    //        check_match(strstart, match_start, match_length);
+
+                flush = zip_ct_tally(zip_strstart - zip_match_start,
+                     zip_match_length - zip_MIN_MATCH);
+                zip_lookahead -= zip_match_length;
+
+            /* Insert new strings in the hash table only if the match length
+             * is not too large. This saves time but degrades compression.
+             */
+                if (zip_match_length <= zip_max_lazy_match) {
+                    zip_match_length--; // string at strstart already in hash table
+                    do {
+                        zip_strstart++;
+                        zip_INSERT_STRING();
+                /* strstart never exceeds WSIZE-MAX_MATCH, so there are
+                 * always MIN_MATCH bytes ahead. If lookahead < MIN_MATCH
+                 * these bytes are garbage, but it does not matter since
+                 * the next lookahead bytes will be emitted as literals.
+                 */
+                    } while (--zip_match_length !== 0);
+                    zip_strstart++;
+                } else {
+                    zip_strstart += zip_match_length;
+                    zip_match_length = 0;
+                    zip_ins_h = zip_window[zip_strstart] & 0xff;
+    //        UPDATE_HASH(ins_h, window[strstart + 1]);
+                    zip_ins_h = ((zip_ins_h << zip_H_SHIFT) ^ (zip_window[zip_strstart + 1] & 0xff)) & zip_HASH_MASK;
+
+    //#if MIN_MATCH != 3
+    //        Call UPDATE_HASH() MIN_MATCH-3 more times
+    //#endif
+
+                }
+            } else {
+            /* No match, output a literal byte */
+                flush = zip_ct_tally(0, zip_window[zip_strstart] & 0xff);
+                zip_lookahead--;
+                zip_strstart++;
+            }
+            if (flush) {
+                zip_flush_block(0);
+                zip_block_start = zip_strstart;
+            }
+
+        /* Make sure that we always have enough lookahead, except
+         * at the end of the input file. We need MAX_MATCH bytes
+         * for the next match, plus MIN_MATCH bytes to insert the
+         * string following the next match.
+         */
+            while (zip_lookahead < zip_MIN_LOOKAHEAD && !zip_eofile) {
+                zip_fill_window();
+            }
+        }
+    };
+
+    var zip_deflate_better = function () {
+        /* Process the input block. */
+        while (zip_lookahead !== 0 && zip_qhead === null) {
+        /* Insert the string window[strstart .. strstart+2] in the
+         * dictionary, and set hash_head to the head of the hash chain:
+         */
+            zip_INSERT_STRING();
+
+        /* Find the longest match, discarding those <= prev_length.
+         */
+            zip_prev_length = zip_match_length;
+            zip_prev_match = zip_match_start;
+            zip_match_length = zip_MIN_MATCH - 1;
+
+            if (zip_hash_head !== zip_NIL &&
+                    zip_prev_length < zip_max_lazy_match &&
+                    zip_strstart - zip_hash_head <= zip_MAX_DIST) {
+            /* To simplify the code, we prevent matches with the string
+             * of window index 0 (in particular we have to avoid a match
+             * of the string with itself at the start of the input file).
+             */
+                zip_match_length = zip_longest_match(zip_hash_head);
+            /* longest_match() sets match_start */
+                if (zip_match_length > zip_lookahead) {
+                    zip_match_length = zip_lookahead;
+                }
+
+            /* Ignore a length 3 match if it is too distant: */
+                if (zip_match_length === zip_MIN_MATCH &&
+                        zip_strstart - zip_match_start > zip_TOO_FAR) {
+            /* If prev_match is also MIN_MATCH, match_start is garbage
+             * but we will ignore the current match anyway.
+             */
+                    zip_match_length--;
+                }
+            }
+        /* If there was a match at the previous step and the current
+         * match is not better, output the previous match:
+         */
+            if (zip_prev_length >= zip_MIN_MATCH &&
+                     zip_match_length <= zip_prev_length) {
+                var flush; // set if current block must be flushed
+
+    //        check_match(strstart - 1, prev_match, prev_length);
+                flush = zip_ct_tally(zip_strstart - 1 - zip_prev_match,
+                     zip_prev_length - zip_MIN_MATCH);
+
+            /* Insert in hash table all strings up to the end of the match.
+             * strstart-1 and strstart are already inserted.
+             */
+                zip_lookahead -= zip_prev_length - 1;
+                zip_prev_length -= 2;
+                do {
+                    zip_strstart++;
+                    zip_INSERT_STRING();
+            /* strstart never exceeds WSIZE-MAX_MATCH, so there are
+             * always MIN_MATCH bytes ahead. If lookahead < MIN_MATCH
+             * these bytes are garbage, but it does not matter since the
+             * next lookahead bytes will always be emitted as literals.
+             */
+                } while (--zip_prev_length !== 0);
+                zip_match_available = 0;
+                zip_match_length = zip_MIN_MATCH - 1;
+                zip_strstart++;
+                if (flush) {
+                    zip_flush_block(0);
+                    zip_block_start = zip_strstart;
+                }
+            } else if (zip_match_available !== 0) {
+            /* If there was no match at the previous position, output a
+             * single literal. If there was a match but the current match
+             * is longer, truncate the previous match to a single literal.
+             */
+                if (zip_ct_tally(0, zip_window[zip_strstart - 1] & 0xff)) {
+                    zip_flush_block(0);
+                    zip_block_start = zip_strstart;
+                }
+                zip_strstart++;
+                zip_lookahead--;
+            } else {
+            /* There is no previous match to compare with, wait for
+             * the next step to decide.
+             */
+                zip_match_available = 1;
+                zip_strstart++;
+                zip_lookahead--;
+            }
+
+        /* Make sure that we always have enough lookahead, except
+         * at the end of the input file. We need MAX_MATCH bytes
+         * for the next match, plus MIN_MATCH bytes to insert the
+         * string following the next match.
+         */
+            while (zip_lookahead < zip_MIN_LOOKAHEAD && !zip_eofile) {
+                zip_fill_window();
+            }
+        }
+    };
+
+    /* ==========================================================================
+     * Allocate the match buffer, initialize the various tables and save the
+     * location of the internal file attribute (ascii/binary) and method
+     * (DEFLATE/STORE).
+     */
+    var zip_ct_init = function () {
+        var n;    // iterates over tree elements
+        var bits;    // bit counter
+        var length;    // length value
+        var code;    // code value
+        var dist;    // distance index
+
+        if (zip_static_dtree[0].dl !== 0) {
+            return; // ct_init already called
+        }
+
+        zip_l_desc.dyn_tree        = zip_dyn_ltree;
+        zip_l_desc.static_tree    = zip_static_ltree;
+        zip_l_desc.extra_bits    = zip_extra_lbits;
+        zip_l_desc.extra_base    = zip_LITERALS + 1;
+        zip_l_desc.elems        = zip_L_CODES;
+        zip_l_desc.max_length    = zip_MAX_BITS;
+        zip_l_desc.max_code        = 0;
+
+        zip_d_desc.dyn_tree        = zip_dyn_dtree;
+        zip_d_desc.static_tree    = zip_static_dtree;
+        zip_d_desc.extra_bits    = zip_extra_dbits;
+        zip_d_desc.extra_base    = 0;
+        zip_d_desc.elems        = zip_D_CODES;
+        zip_d_desc.max_length    = zip_MAX_BITS;
+        zip_d_desc.max_code        = 0;
+
+        zip_bl_desc.dyn_tree    = zip_bl_tree;
+        zip_bl_desc.static_tree    = null;
+        zip_bl_desc.extra_bits    = zip_extra_blbits;
+        zip_bl_desc.extra_base    = 0;
+        zip_bl_desc.elems        = zip_BL_CODES;
+        zip_bl_desc.max_length    = zip_MAX_BL_BITS;
+        zip_bl_desc.max_code    = 0;
+
+        // Initialize the mapping length (0..255) -> length code (0..28)
+        length = 0;
+        for (code = 0; code < zip_LENGTH_CODES - 1; code++) {
+            zip_base_length[code] = length;
+            for (n = 0; n < (1 << zip_extra_lbits[code]); n++) {
+                zip_length_code[length++] = code;
+            }
+        }
+        // Assert (length == 256, "ct_init: length != 256");
+
+        /* Note that the length 255 (match length 258) can be represented
+         * in two different ways: code 284 + 5 bits or code 285, so we
+         * overwrite length_code[255] to use the best encoding:
+         */
+        zip_length_code[length - 1] = code;
+
+        /* Initialize the mapping dist (0..32K) -> dist code (0..29) */
+        dist = 0;
+        for (code = 0; code < 16; code++) {
+            zip_base_dist[code] = dist;
+            for (n = 0; n < (1 << zip_extra_dbits[code]); n++) {
+                zip_dist_code[dist++] = code;
+            }
+        }
+        // Assert (dist == 256, "ct_init: dist != 256");
+        dist >>= 7; // from now on, all distances are divided by 128
+        n = code;
+        for (code = n; code < zip_D_CODES; code++) {
+            zip_base_dist[code] = dist << 7;
+            for (n = 0; n < (1 << (zip_extra_dbits[code] - 7)); n++) {
+                zip_dist_code[256 + dist++] = code;
+            }
+        }
+        // Assert (dist == 256, "ct_init: 256+dist != 512");
+
+        // Construct the codes of the static literal tree
+        for (bits = 0; bits <= zip_MAX_BITS; bits++) {
+            zip_bl_count[bits] = 0;
+        }
+        n = 0;
+        while (n <= 143) {
+            zip_static_ltree[n++].dl = 8;
+            zip_bl_count[8]++;
+        }
+        while (n <= 255) {
+            zip_static_ltree[n++].dl = 9;
+            zip_bl_count[9]++;
+        }
+        while (n <= 279) {
+            zip_static_ltree[n++].dl = 7;
+            zip_bl_count[7]++;
+        }
+        while (n <= 287) {
+            zip_static_ltree[n++].dl = 8;
+            zip_bl_count[8]++;
+        }
+        /* Codes 286 and 287 do not exist, but we must include them in the
+         * tree construction to get a canonical Huffman tree (longest code
+         * all ones)
+         */
+        zip_gen_codes(zip_static_ltree, zip_L_CODES + 1);
+
+        /* The static distance tree is trivial: */
+        for (n = 0; n < zip_D_CODES; n++) {
+            zip_static_dtree[n].dl = 5;
+            zip_static_dtree[n].fc = zip_bi_reverse(n, 5);
+        }
+
+        // Initialize the first block of the first file:
+        zip_init_block();
+    };
+
+
+    var zip_init_deflate = function () {
+        if (zip_eofile) {
+            return;
+        }
+        zip_bi_buf = 0;
+        zip_bi_valid = 0;
+        zip_ct_init();
+        zip_lm_init();
+
+        zip_qhead = null;
+        zip_outcnt = 0;
+        zip_outoff = 0;
+
+        if (zip_compr_level <= 3) {
+            zip_prev_length = zip_MIN_MATCH - 1;
+            zip_match_length = 0;
+        } else {
+            zip_match_length = zip_MIN_MATCH - 1;
+            zip_match_available = 0;
+        }
+
+        zip_complete = false;
+    };
+
+    var zip_qcopy = function (buff, off, buff_size) {
+        var n, i, j;
+
+        n = 0;
+        while (zip_qhead !== null && n < buff_size) {
+            i = buff_size - n;
+            if (i > zip_qhead.len) {
+                i = zip_qhead.len;
+            }
+    //      System.arraycopy(qhead.ptr, qhead.off, buff, off + n, i);
+            for (j = 0; j < i; j++) {
+                buff[off + n + j] = zip_qhead.ptr[zip_qhead.off + j];
+            }
+
+            zip_qhead.off += i;
+            zip_qhead.len -= i;
+            n += i;
+            if (zip_qhead.len === 0) {
+                var p;
+                p = zip_qhead;
+                zip_qhead = zip_qhead.next;
+                zip_reuse_queue(p);
+            }
+        }
+
+        if (n === buff_size) {
+            return n;
+        }
+
+        if (zip_outoff < zip_outcnt) {
+            i = buff_size - n;
+            if (i > zip_outcnt - zip_outoff) {
+                i = zip_outcnt - zip_outoff;
+            }
+        // System.arraycopy(outbuf, outoff, buff, off + n, i);
+            for (j = 0; j < i; j++) {
+                buff[off + n + j] = zip_outbuf[zip_outoff + j];
+            }
+            zip_outoff += i;
+            n += i;
+            if (zip_outcnt === zip_outoff) {
+                zip_outcnt = zip_outoff = 0;
+            }
+        }
+        return n;
+    };
+
+    /* ==========================================================================
+     * Same as above, but achieves better compression. We use a lazy
+     * evaluation for matches: a match is finally adopted only if there is
+     * no better match at the next window position.
+     */
+    var zip_deflate_internal = function (buff, off, buff_size) {
+        var n;
+
+        if (!zip_initflag) {
+            zip_init_deflate();
+            zip_initflag = true;
+            if (zip_lookahead === 0) { // empty
+                zip_complete = true;
+                return 0;
+            }
+        }
+
+        if ((n = zip_qcopy(buff, off, buff_size)) === buff_size) {
+            return buff_size;
+        }
+
+        if (zip_complete) {
+            return n;
+        }
+
+        if (zip_compr_level <= 3) { // optimized for speed
+            zip_deflate_fast();
+        } else {
+            zip_deflate_better();
+        }
+        if (zip_lookahead === 0) {
+            if (zip_match_available !== 0) {
+                zip_ct_tally(0, zip_window[zip_strstart - 1] & 0xff);
+            }
+            zip_flush_block(1);
+            zip_complete = true;
+        }
+        return n + zip_qcopy(buff, n + off, buff_size - n);
+    };
+
+    var zip_deflate = function (str, level) {
+        var i, j;
+
+        zip_deflate_data = str;
+        zip_deflate_pos = 0;
+        if (typeof level === "undefined") {
+            level = zip_DEFAULT_LEVEL;
+        }
+        zip_deflate_start(level);
+
+        var buff = new Array(1024);
+        var aout = [];
+        while ((i = zip_deflate_internal(buff, 0, buff.length)) > 0) {
+            var cbuf = [];
+            cbuf.length = i;
+            for (j = 0; j < i; j++) {
+                cbuf[j] = String.fromCharCode(buff[j]);
+            }
+            aout[aout.length] = cbuf.join("");
+        }
+        zip_deflate_data = null; // G.C.
+        return aout.join("");
+    };
+
+    this.deflate = zip_deflate;
+};
diff --git a/apps/files_odfviewer/src/webodf/webodf/lib/core/RawInflate.js b/apps/files_odfviewer/src/webodf/webodf/lib/core/RawInflate.js
new file mode 100644
index 0000000000..0005ea56ea
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/lib/core/RawInflate.js
@@ -0,0 +1,790 @@
+/**
+ * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
+ * @licstart
+ * The JavaScript code in this page is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU Affero General Public License
+ * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.  The code is distributed
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
+ *
+ * As additional permission under GNU AGPL version 3 section 7, you
+ * may distribute non-source (e.g., minimized or compacted) forms of
+ * that code without the copy of the GNU GPL normally required by
+ * section 4, provided you include this license notice and a URL
+ * through which recipients can access the Corresponding Source.
+ *
+ * As a special exception to the AGPL, any HTML file which merely makes function
+ * calls to this code, and for that purpose includes it by reference shall be
+ * deemed a separate work for copyright law purposes. In addition, the copyright
+ * holders of this code give you permission to combine this code with free
+ * software libraries that are released under the GNU LGPL. You may copy and
+ * distribute such a system following the terms of the GNU AGPL for this code
+ * and the LGPL for the libraries. If you modify this code, you may extend this
+ * exception to your version of the code, but you are not obligated to do so.
+ * If you do not wish to do so, delete this exception statement from your
+ * version.
+ *
+ * This license applies to this entire compilation.
+ * @licend
+ * @source: http://www.webodf.org/
+ * @source: http://gitorious.org/odfkit/webodf/
+ */
+/*global core*/
+/*
+ * $Id: rawinflate.js,v 0.2 2009/03/01 18:32:24 dankogai Exp $
+ *
+ * original:
+ * http://www.onicos.com/staff/iz/amuse/javascript/expert/inflate.txt
+ */
+
+/**
+ * @constructor
+ */
+core.RawInflate = function RawInflate() {
+
+/* Copyright (C) 1999 Masanao Izumo <iz@onicos.co.jp>
+ * Version: 1.0.0.1
+ * LastModified: Dec 25 1999
+ */
+
+/* Interface:
+ * data = zip_inflate(src);
+ */
+
+/* constant parameters */
+var zip_WSIZE = 32768;		// Sliding Window size
+var zip_STORED_BLOCK = 0;
+var zip_STATIC_TREES = 1;
+var zip_DYN_TREES    = 2;
+
+/* for inflate */
+var zip_lbits = 9; 		// bits in base literal/length lookup table
+var zip_dbits = 6; 		// bits in base distance lookup table
+var zip_INBUFSIZ = 32768;	// Input buffer size
+var zip_INBUF_EXTRA = 64;	// Extra buffer
+
+/* variables (inflate) */
+var zip_slide;
+var zip_wp;			// current position in slide
+var zip_fixed_tl = null;	// inflate static
+var zip_fixed_td;		// inflate static
+var zip_fixed_bl, fixed_bd;	// inflate static
+var zip_bit_buf;		// bit buffer
+var zip_bit_len;		// bits in bit buffer
+var zip_method;
+var zip_eof;
+var zip_copy_leng;
+var zip_copy_dist;
+var zip_tl, zip_td;	// literal/length and distance decoder tables
+var zip_bl, zip_bd;	// number of bits decoded by tl and td
+
+var zip_inflate_data;
+var zip_inflate_pos;
+
+
+/* constant tables (inflate) */
+var zip_MASK_BITS = new Array(
+    0x0000,
+    0x0001, 0x0003, 0x0007, 0x000f, 0x001f, 0x003f, 0x007f, 0x00ff,
+    0x01ff, 0x03ff, 0x07ff, 0x0fff, 0x1fff, 0x3fff, 0x7fff, 0xffff);
+// Tables for deflate from PKZIP's appnote.txt.
+var zip_cplens = new Array( // Copy lengths for literal codes 257..285
+    3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31,
+    35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0);
+/* note: see note #13 above about the 258 in this list. */
+var zip_cplext = new Array( // Extra bits for literal codes 257..285
+    0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2,
+    3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5, 0, 99, 99); // 99==invalid
+var zip_cpdist = new Array( // Copy offsets for distance codes 0..29
+    1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193,
+    257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145,
+    8193, 12289, 16385, 24577);
+var zip_cpdext = new Array( // Extra bits for distance codes
+    0, 0, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6,
+    7, 7, 8, 8, 9, 9, 10, 10, 11, 11,
+    12, 12, 13, 13);
+var zip_border = new Array(  // Order of the bit length code lengths
+    16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15);
+/* objects (inflate) */
+
+/**
+ * @constructor
+ */
+var zip_HuftList = function() {
+    this.next = null;
+    this.list = null;
+}
+
+/**
+ * @constructor
+ */
+var zip_HuftNode = function() {
+    this.e = 0; // number of extra bits or operation
+    this.b = 0; // number of bits in this code or subcode
+
+    // union
+    this.n = 0; // literal, length base, or distance base
+    this.t = null; // (zip_HuftNode) pointer to next level of table
+}
+
+/**
+ * @constructor
+ */
+var zip_HuftBuild = function(b,	// code lengths in bits (all assumed <= BMAX)
+		       n,	// number of codes (assumed <= N_MAX)
+		       s,	// number of simple-valued codes (0..s-1)
+		       d,	// list of base values for non-simple codes
+		       e,	// list of extra bits for non-simple codes
+		       mm	// maximum lookup bits
+		   ) {
+    this.BMAX = 16;   // maximum bit length of any code
+    this.N_MAX = 288; // maximum number of codes in any set
+    this.status = 0;	// 0: success, 1: incomplete table, 2: bad input
+    this.root = null;	// (zip_HuftList) starting table
+    this.m = 0;		// maximum lookup bits, returns actual
+
+/* Given a list of code lengths and a maximum table size, make a set of
+   tables to decode that set of codes.	Return zero on success, one if
+   the given code set is incomplete (the tables are still built in this
+   case), two if the input is invalid (all zero length codes or an
+   oversubscribed set of lengths), and three if not enough memory.
+   The code with value 256 is special, and the tables are constructed
+   so that no bits beyond that code are fetched when that code is
+   decoded. */
+    {
+	var a;			// counter for codes of length k
+	var c = new Array(this.BMAX+1);	// bit length count table
+	var el;			// length of EOB code (value 256)
+	var f;			// i repeats in table every f entries
+	var g;			// maximum code length
+	var h;			// table level
+	var i;			// counter, current code
+	var j;			// counter
+	var k;			// number of bits in current code
+	var lx = new Array(this.BMAX+1);	// stack of bits per table
+	var p;			// pointer into c[], b[], or v[]
+	var pidx;		// index of p
+	var q;			// (zip_HuftNode) points to current table
+	var r = new zip_HuftNode(); // table entry for structure assignment
+	var u = new Array(this.BMAX); // zip_HuftNode[BMAX][]  table stack
+	var v = new Array(this.N_MAX); // values in order of bit length
+	var w;
+	var x = new Array(this.BMAX+1);// bit offsets, then code stack
+	var xp;			// pointer into x or c
+	var y;			// number of dummy codes added
+	var z;			// number of entries in current table
+	var o;
+	var tail;		// (zip_HuftList)
+
+	tail = this.root = null;
+	for(i = 0; i < c.length; i++)
+	    c[i] = 0;
+	for(i = 0; i < lx.length; i++)
+	    lx[i] = 0;
+	for(i = 0; i < u.length; i++)
+	    u[i] = null;
+	for(i = 0; i < v.length; i++)
+	    v[i] = 0;
+	for(i = 0; i < x.length; i++)
+	    x[i] = 0;
+
+	// Generate counts for each bit length
+	el = n > 256 ? b[256] : this.BMAX; // set length of EOB code, if any
+	p = b; pidx = 0;
+	i = n;
+	do {
+	    c[p[pidx]]++;	// assume all entries <= BMAX
+	    pidx++;
+	} while(--i > 0);
+	if(c[0] == n) {	// null input--all zero length codes
+	    this.root = null;
+	    this.m = 0;
+	    this.status = 0;
+	    return;
+	}
+
+	// Find minimum and maximum length, bound *m by those
+	for(j = 1; j <= this.BMAX; j++)
+	    if(c[j] != 0)
+		break;
+	k = j;			// minimum code length
+	if(mm < j)
+	    mm = j;
+	for(i = this.BMAX; i != 0; i--)
+	    if(c[i] != 0)
+		break;
+	g = i;			// maximum code length
+	if(mm > i)
+	    mm = i;
+
+	// Adjust last length count to fill out codes, if needed
+	for(y = 1 << j; j < i; j++, y <<= 1)
+	    if((y -= c[j]) < 0) {
+		this.status = 2;	// bad input: more codes than bits
+		this.m = mm;
+		return;
+	    }
+	if((y -= c[i]) < 0) {
+	    this.status = 2;
+	    this.m = mm;
+	    return;
+	}
+	c[i] += y;
+
+	// Generate starting offsets into the value table for each length
+	x[1] = j = 0;
+	p = c;
+	pidx = 1;
+	xp = 2;
+	while(--i > 0)		// note that i == g from above
+	    x[xp++] = (j += p[pidx++]);
+
+	// Make a table of values in order of bit lengths
+	p = b; pidx = 0;
+	i = 0;
+	do {
+	    if((j = p[pidx++]) != 0)
+		v[x[j]++] = i;
+	} while(++i < n);
+	n = x[g];			// set n to length of v
+
+	// Generate the Huffman codes and for each, make the table entries
+	x[0] = i = 0;		// first Huffman code is zero
+	p = v; pidx = 0;		// grab values in bit order
+	h = -1;			// no tables yet--level -1
+	w = lx[0] = 0;		// no bits decoded yet
+	q = null;			// ditto
+	z = 0;			// ditto
+
+	// go through the bit lengths (k already is bits in shortest code)
+	for(; k <= g; k++) {
+	    a = c[k];
+	    while(a-- > 0) {
+		// here i is the Huffman code of length k bits for value p[pidx]
+		// make tables up to required level
+		while(k > w + lx[1 + h]) {
+		    w += lx[1 + h]; // add bits already decoded
+		    h++;
+
+		    // compute minimum size table less than or equal to *m bits
+		    z = (z = g - w) > mm ? mm : z; // upper limit
+		    if((f = 1 << (j = k - w)) > a + 1) { // try a k-w bit table
+			// too few codes for k-w bit table
+			f -= a + 1;	// deduct codes from patterns left
+			xp = k;
+			while(++j < z) { // try smaller tables up to z bits
+			    if((f <<= 1) <= c[++xp])
+				break;	// enough codes to use up j bits
+			    f -= c[xp];	// else deduct codes from patterns
+			}
+		    }
+		    if(w + j > el && w < el)
+			j = el - w;	// make EOB code end at table
+		    z = 1 << j;	// table entries for j-bit table
+		    lx[1 + h] = j; // set table size in stack
+
+		    // allocate and link in new table
+		    q = new Array(z);
+		    for(o = 0; o < z; o++) {
+			q[o] = new zip_HuftNode();
+		    }
+
+		    if(tail == null)
+			tail = this.root = new zip_HuftList();
+		    else
+			tail = tail.next = new zip_HuftList();
+		    tail.next = null;
+		    tail.list = q;
+		    u[h] = q;	// table starts after link
+
+		    /* connect to last table, if there is one */
+		    if(h > 0) {
+			x[h] = i;		// save pattern for backing up
+			r.b = lx[h];	// bits to dump before this table
+			r.e = 16 + j;	// bits in this table
+			r.t = q;		// pointer to this table
+			j = (i & ((1 << w) - 1)) >> (w - lx[h]);
+			u[h-1][j].e = r.e;
+			u[h-1][j].b = r.b;
+			u[h-1][j].n = r.n;
+			u[h-1][j].t = r.t;
+		    }
+		}
+
+		// set up table entry in r
+		r.b = k - w;
+		if(pidx >= n)
+		    r.e = 99;		// out of values--invalid code
+		else if(p[pidx] < s) {
+		    r.e = (p[pidx] < 256 ? 16 : 15); // 256 is end-of-block code
+		    r.n = p[pidx++];	// simple code is just the value
+		} else {
+		    r.e = e[p[pidx] - s];	// non-simple--look up in lists
+		    r.n = d[p[pidx++] - s];
+		}
+
+		// fill code-like entries with r //
+		f = 1 << (k - w);
+		for(j = i >> w; j < z; j += f) {
+		    q[j].e = r.e;
+		    q[j].b = r.b;
+		    q[j].n = r.n;
+		    q[j].t = r.t;
+		}
+
+		// backwards increment the k-bit code i
+		for(j = 1 << (k - 1); (i & j) != 0; j >>= 1)
+		    i ^= j;
+		i ^= j;
+
+		// backup over finished tables
+		while((i & ((1 << w) - 1)) != x[h]) {
+		    w -= lx[h];		// don't need to update q
+		    h--;
+		}
+	    }
+	}
+
+	/* return actual size of base table */
+	this.m = lx[1];
+
+	/* Return true (1) if we were given an incomplete table */
+	this.status = ((y != 0 && g != 1) ? 1 : 0);
+    } /* end of constructor */
+}
+
+
+/* routines (inflate) */
+
+var zip_GET_BYTE = function() {
+    if(zip_inflate_data.length == zip_inflate_pos)
+	return -1;
+    return zip_inflate_data[zip_inflate_pos++];
+}
+
+var zip_NEEDBITS = function(n) {
+    while(zip_bit_len < n) {
+	zip_bit_buf |= zip_GET_BYTE() << zip_bit_len;
+	zip_bit_len += 8;
+    }
+}
+
+var zip_GETBITS = function(n) {
+    return zip_bit_buf & zip_MASK_BITS[n];
+}
+
+var zip_DUMPBITS = function(n) {
+    zip_bit_buf >>= n;
+    zip_bit_len -= n;
+}
+
+var zip_inflate_codes = function(buff, off, size) {
+    /* inflate (decompress) the codes in a deflated (compressed) block.
+       Return an error code or zero if it all goes ok. */
+    var e;		// table entry flag/number of extra bits
+    var t;		// (zip_HuftNode) pointer to table entry
+    var n;
+
+    if(size == 0)
+      return 0;
+
+    // inflate the coded data
+    n = 0;
+    for(;;) {			// do until end of block
+	zip_NEEDBITS(zip_bl);
+	t = zip_tl.list[zip_GETBITS(zip_bl)];
+	e = t.e;
+	while(e > 16) {
+	    if(e == 99)
+		return -1;
+	    zip_DUMPBITS(t.b);
+	    e -= 16;
+	    zip_NEEDBITS(e);
+	    t = t.t[zip_GETBITS(e)];
+	    e = t.e;
+	}
+	zip_DUMPBITS(t.b);
+
+	if(e == 16) {		// then it's a literal
+	    zip_wp &= zip_WSIZE - 1;
+	    buff[off + n++] = zip_slide[zip_wp++] = t.n;
+	    if(n == size)
+		return size;
+	    continue;
+	}
+
+	// exit if end of block
+	if(e == 15)
+	    break;
+
+	// it's an EOB or a length
+
+	// get length of block to copy
+	zip_NEEDBITS(e);
+	zip_copy_leng = t.n + zip_GETBITS(e);
+	zip_DUMPBITS(e);
+
+	// decode distance of block to copy
+	zip_NEEDBITS(zip_bd);
+	t = zip_td.list[zip_GETBITS(zip_bd)];
+	e = t.e;
+
+	while(e > 16) {
+	    if(e == 99)
+		return -1;
+	    zip_DUMPBITS(t.b);
+	    e -= 16;
+	    zip_NEEDBITS(e);
+	    t = t.t[zip_GETBITS(e)];
+	    e = t.e;
+	}
+	zip_DUMPBITS(t.b);
+	zip_NEEDBITS(e);
+	zip_copy_dist = zip_wp - t.n - zip_GETBITS(e);
+	zip_DUMPBITS(e);
+
+	// do the copy
+	while(zip_copy_leng > 0 && n < size) {
+	    zip_copy_leng--;
+	    zip_copy_dist &= zip_WSIZE - 1;
+	    zip_wp &= zip_WSIZE - 1;
+	    buff[off + n++] = zip_slide[zip_wp++]
+		= zip_slide[zip_copy_dist++];
+	}
+
+	if(n == size)
+	    return size;
+    }
+
+    zip_method = -1; // done
+    return n;
+}
+
+var zip_inflate_stored = function(buff, off, size) {
+    /* "decompress" an inflated type 0 (stored) block. */
+    var n;
+
+    // go to byte boundary
+    n = zip_bit_len & 7;
+    zip_DUMPBITS(n);
+
+    // get the length and its complement
+    zip_NEEDBITS(16);
+    n = zip_GETBITS(16);
+    zip_DUMPBITS(16);
+    zip_NEEDBITS(16);
+    if(n != ((~zip_bit_buf) & 0xffff))
+	return -1;			// error in compressed data
+    zip_DUMPBITS(16);
+
+    // read and output the compressed data
+    zip_copy_leng = n;
+
+    n = 0;
+    while(zip_copy_leng > 0 && n < size) {
+	zip_copy_leng--;
+	zip_wp &= zip_WSIZE - 1;
+	zip_NEEDBITS(8);
+	buff[off + n++] = zip_slide[zip_wp++] =
+	    zip_GETBITS(8);
+	zip_DUMPBITS(8);
+    }
+
+    if(zip_copy_leng == 0)
+      zip_method = -1; // done
+    return n;
+}
+
+var zip_fixed_bd;
+var zip_inflate_fixed = function(buff, off, size) {
+    /* decompress an inflated type 1 (fixed Huffman codes) block.  We should
+       either replace this with a custom decoder, or at least precompute the
+       Huffman tables. */
+
+    // if first time, set up tables for fixed blocks
+    if(zip_fixed_tl == null) {
+	var i;			// temporary variable
+	var l = new Array(288);	// length list for huft_build
+	var h;	// zip_HuftBuild
+
+	// literal table
+	for(i = 0; i < 144; i++)
+	    l[i] = 8;
+	for(; i < 256; i++)
+	    l[i] = 9;
+	for(; i < 280; i++)
+	    l[i] = 7;
+	for(; i < 288; i++)	// make a complete, but wrong code set
+	    l[i] = 8;
+	zip_fixed_bl = 7;
+
+	h = new zip_HuftBuild(l, 288, 257, zip_cplens, zip_cplext,
+			      zip_fixed_bl);
+	if(h.status != 0) {
+	    alert("HufBuild error: "+h.status);
+	    return -1;
+	}
+	zip_fixed_tl = h.root;
+	zip_fixed_bl = h.m;
+
+	// distance table
+	for(i = 0; i < 30; i++)	// make an incomplete code set
+	    l[i] = 5;
+	zip_fixed_bd = 5;
+
+	h = new zip_HuftBuild(l, 30, 0, zip_cpdist, zip_cpdext, zip_fixed_bd);
+	if(h.status > 1) {
+	    zip_fixed_tl = null;
+	    alert("HufBuild error: "+h.status);
+	    return -1;
+	}
+	zip_fixed_td = h.root;
+	zip_fixed_bd = h.m;
+    }
+
+    zip_tl = zip_fixed_tl;
+    zip_td = zip_fixed_td;
+    zip_bl = zip_fixed_bl;
+    zip_bd = zip_fixed_bd;
+    return zip_inflate_codes(buff, off, size);
+}
+
+var zip_inflate_dynamic = function(buff, off, size) {
+    // decompress an inflated type 2 (dynamic Huffman codes) block.
+    var i;		// temporary variables
+    var j;
+    var l;		// last length
+    var n;		// number of lengths to get
+    var t;		// (zip_HuftNode) literal/length code table
+    var nb;		// number of bit length codes
+    var nl;		// number of literal/length codes
+    var nd;		// number of distance codes
+    var ll = new Array(286+30); // literal/length and distance code lengths
+    var h;		// (zip_HuftBuild)
+
+    for(i = 0; i < ll.length; i++)
+	ll[i] = 0;
+
+    // read in table lengths
+    zip_NEEDBITS(5);
+    nl = 257 + zip_GETBITS(5);	// number of literal/length codes
+    zip_DUMPBITS(5);
+    zip_NEEDBITS(5);
+    nd = 1 + zip_GETBITS(5);	// number of distance codes
+    zip_DUMPBITS(5);
+    zip_NEEDBITS(4);
+    nb = 4 + zip_GETBITS(4);	// number of bit length codes
+    zip_DUMPBITS(4);
+    if(nl > 286 || nd > 30)
+      return -1;		// bad lengths
+
+    // read in bit-length-code lengths
+    for(j = 0; j < nb; j++)
+    {
+	zip_NEEDBITS(3);
+	ll[zip_border[j]] = zip_GETBITS(3);
+	zip_DUMPBITS(3);
+    }
+    for(; j < 19; j++)
+	ll[zip_border[j]] = 0;
+
+    // build decoding table for trees--single level, 7 bit lookup
+    zip_bl = 7;
+    h = new zip_HuftBuild(ll, 19, 19, null, null, zip_bl);
+    if(h.status != 0)
+	return -1;	// incomplete code set
+
+    zip_tl = h.root;
+    zip_bl = h.m;
+
+    // read in literal and distance code lengths
+    n = nl + nd;
+    i = l = 0;
+    while(i < n) {
+	zip_NEEDBITS(zip_bl);
+	t = zip_tl.list[zip_GETBITS(zip_bl)];
+	j = t.b;
+	zip_DUMPBITS(j);
+	j = t.n;
+	if(j < 16)		// length of code in bits (0..15)
+	    ll[i++] = l = j;	// save last length in l
+	else if(j == 16) {	// repeat last length 3 to 6 times
+	    zip_NEEDBITS(2);
+	    j = 3 + zip_GETBITS(2);
+	    zip_DUMPBITS(2);
+	    if(i + j > n)
+		return -1;
+	    while(j-- > 0)
+		ll[i++] = l;
+	} else if(j == 17) {	// 3 to 10 zero length codes
+	    zip_NEEDBITS(3);
+	    j = 3 + zip_GETBITS(3);
+	    zip_DUMPBITS(3);
+	    if(i + j > n)
+		return -1;
+	    while(j-- > 0)
+		ll[i++] = 0;
+	    l = 0;
+	} else {		// j == 18: 11 to 138 zero length codes
+	    zip_NEEDBITS(7);
+	    j = 11 + zip_GETBITS(7);
+	    zip_DUMPBITS(7);
+	    if(i + j > n)
+		return -1;
+	    while(j-- > 0)
+		ll[i++] = 0;
+	    l = 0;
+	}
+    }
+
+    // build the decoding tables for literal/length and distance codes
+    zip_bl = zip_lbits;
+    h = new zip_HuftBuild(ll, nl, 257, zip_cplens, zip_cplext, zip_bl);
+    if(zip_bl == 0)	// no literals or lengths
+	h.status = 1;
+    if(h.status != 0) {
+	//if(h.status == 1)
+	//    ;// **incomplete literal tree**
+	return -1;		// incomplete code set
+    }
+    zip_tl = h.root;
+    zip_bl = h.m;
+
+    for(i = 0; i < nd; i++)
+	ll[i] = ll[i + nl];
+    zip_bd = zip_dbits;
+    h = new zip_HuftBuild(ll, nd, 0, zip_cpdist, zip_cpdext, zip_bd);
+    zip_td = h.root;
+    zip_bd = h.m;
+
+    if(zip_bd == 0 && nl > 257) {   // lengths but no distances
+	// **incomplete distance tree**
+	return -1;
+    }
+
+    //if(h.status == 1) {
+//	;// **incomplete distance tree**
+    //}
+    if(h.status != 0)
+	return -1;
+
+    // decompress until an end-of-block code
+    return zip_inflate_codes(buff, off, size);
+}
+
+var zip_inflate_start = function() {
+    var i;
+
+    if(zip_slide == null)
+	zip_slide = new Array(2 * zip_WSIZE);
+    zip_wp = 0;
+    zip_bit_buf = 0;
+    zip_bit_len = 0;
+    zip_method = -1;
+    zip_eof = false;
+    zip_copy_leng = zip_copy_dist = 0;
+    zip_tl = null;
+}
+
+var zip_inflate_internal = function(buff, off, size) {
+    // decompress an inflated entry
+    var n, i;
+
+    n = 0;
+    while(n < size) {
+	if(zip_eof && zip_method == -1)
+	    return n;
+
+	if(zip_copy_leng > 0) {
+	    if(zip_method != zip_STORED_BLOCK) {
+		// STATIC_TREES or DYN_TREES
+		while(zip_copy_leng > 0 && n < size) {
+		    zip_copy_leng--;
+		    zip_copy_dist &= zip_WSIZE - 1;
+		    zip_wp &= zip_WSIZE - 1;
+		    buff[off + n++] = zip_slide[zip_wp++] =
+			zip_slide[zip_copy_dist++];
+		}
+	    } else {
+		while(zip_copy_leng > 0 && n < size) {
+		    zip_copy_leng--;
+		    zip_wp &= zip_WSIZE - 1;
+		    zip_NEEDBITS(8);
+		    buff[off + n++] = zip_slide[zip_wp++] = zip_GETBITS(8);
+		    zip_DUMPBITS(8);
+		}
+		if(zip_copy_leng == 0)
+		    zip_method = -1; // done
+	    }
+	    if(n == size)
+		return n;
+	}
+
+	if(zip_method == -1) {
+	    if(zip_eof)
+		break;
+
+	    // read in last block bit
+	    zip_NEEDBITS(1);
+	    if(zip_GETBITS(1) != 0)
+		zip_eof = true;
+	    zip_DUMPBITS(1);
+
+	    // read in block type
+	    zip_NEEDBITS(2);
+	    zip_method = zip_GETBITS(2);
+	    zip_DUMPBITS(2);
+	    zip_tl = null;
+	    zip_copy_leng = 0;
+	}
+
+	switch(zip_method) {
+	  case 0: // zip_STORED_BLOCK
+	    i = zip_inflate_stored(buff, off + n, size - n);
+	    break;
+
+	  case 1: // zip_STATIC_TREES
+	    if(zip_tl != null)
+		i = zip_inflate_codes(buff, off + n, size - n);
+	    else
+		i = zip_inflate_fixed(buff, off + n, size - n);
+	    break;
+
+	  case 2: // zip_DYN_TREES
+	    if(zip_tl != null)
+		i = zip_inflate_codes(buff, off + n, size - n);
+	    else
+		i = zip_inflate_dynamic(buff, off + n, size - n);
+	    break;
+
+	  default: // error
+	    i = -1;
+	    break;
+	}
+
+	if(i == -1) {
+	    if(zip_eof)
+		return 0;
+	    return -1;
+	}
+	n += i;
+    }
+    return n;
+}
+
+var zip_inflate = function(data, size) {
+    var i, j;
+
+    zip_inflate_start();
+    zip_inflate_data = data;
+    zip_inflate_pos = 0;
+
+    var buff = new runtime.ByteArray(size);
+    zip_inflate_internal(buff, 0, size);
+    zip_inflate_data = null; // G.C.
+    return buff;
+}
+
+this.inflate = zip_inflate;
+};
diff --git a/apps/files_odfviewer/src/webodf/webodf/lib/core/UnitTester.js b/apps/files_odfviewer/src/webodf/webodf/lib/core/UnitTester.js
new file mode 100644
index 0000000000..4dbe1fa2c0
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/lib/core/UnitTester.js
@@ -0,0 +1,255 @@
+/**
+ * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
+ * @licstart
+ * The JavaScript code in this page is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU Affero General Public License
+ * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.  The code is distributed
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
+ *
+ * As additional permission under GNU AGPL version 3 section 7, you
+ * may distribute non-source (e.g., minimized or compacted) forms of
+ * that code without the copy of the GNU GPL normally required by
+ * section 4, provided you include this license notice and a URL
+ * through which recipients can access the Corresponding Source.
+ *
+ * As a special exception to the AGPL, any HTML file which merely makes function
+ * calls to this code, and for that purpose includes it by reference shall be
+ * deemed a separate work for copyright law purposes. In addition, the copyright
+ * holders of this code give you permission to combine this code with free
+ * software libraries that are released under the GNU LGPL. You may copy and
+ * distribute such a system following the terms of the GNU AGPL for this code
+ * and the LGPL for the libraries. If you modify this code, you may extend this
+ * exception to your version of the code, but you are not obligated to do so.
+ * If you do not wish to do so, delete this exception statement from your
+ * version.
+ *
+ * This license applies to this entire compilation.
+ * @licend
+ * @source: http://www.webodf.org/
+ * @source: http://gitorious.org/odfkit/webodf/
+ */
+/*global runtime: true, Runtime: true, core: true*/
+/*jslint evil: true*/
+/**
+ * @interface
+ */
+core.UnitTest = function UnitTest() {"use strict";};
+/**
+ * @return {undefined}
+ */
+core.UnitTest.prototype.setUp = function () {"use strict";};
+/**
+ * @return {undefined}
+ */
+core.UnitTest.prototype.tearDown = function () {"use strict";};
+/**
+ * @return {!string}
+ */
+core.UnitTest.prototype.description = function () {"use strict";};
+/**
+ * @return {Array.<!function():undefined>}
+ */
+core.UnitTest.prototype.tests = function () {"use strict";};
+/**
+ * @return {Array.<!function(!function():undefined):undefined>}
+ */
+core.UnitTest.prototype.asyncTests = function () {"use strict";};
+
+/**
+ * @constructor
+ */
+core.UnitTestRunner = function UnitTestRunner() {
+    "use strict";
+    var failedTests = 0;
+    function debug(msg) {
+        runtime.log(msg);
+    }
+    function testFailed(msg) {
+        failedTests += 1;
+        runtime.log("fail", msg);
+    }
+    function testPassed(msg) {
+        runtime.log("pass", msg);
+    }
+    function areArraysEqual(a, b) {
+        var i;
+        try {
+            if (a.length !== b.length) {
+                return false;
+            }
+            for (i = 0; i < a.length; i += 1) {
+                if (a[i] !== b[i]) {
+                    return false;
+                }
+            }
+        } catch (ex) {
+            return false;
+        }
+        return true;
+    }
+    function isResultCorrect(actual, expected) {
+        if (expected === 0) {
+            return actual === expected && (1 / actual) === (1 / expected);
+        }
+        if (actual === expected) {
+            return true;
+        }
+        if (typeof expected === "number" && isNaN(expected)) {
+            return typeof actual === "number" && isNaN(actual);
+        }
+        if (Object.prototype.toString.call(expected) ===
+                Object.prototype.toString.call([])) {
+            return areArraysEqual(actual, expected);
+        }
+        return false;
+    }
+    function stringify(v) {
+        if (v === 0 && 1 / v < 0) {
+            return "-0";
+        }
+        return String(v);
+    }
+    /**
+     * @param {!Object} t
+     * @param {!string} a
+     * @param {!string} b
+     * @return {undefined}
+     */
+    function shouldBe(t, a, b) {
+        if (typeof a !== "string" || typeof b !== "string") {
+            debug("WARN: shouldBe() expects string arguments");
+        }
+        var exception, av, bv;
+        try {
+            av = eval(a);
+        } catch (e) {
+            exception = e;
+        }
+        bv = eval(b);
+
+        if (exception) {
+            testFailed(a + " should be " + bv + ". Threw exception " +
+                    exception);
+        } else if (isResultCorrect(av, bv)) {
+            testPassed(a + " is " + b);
+        } else if (typeof av === typeof bv) {
+            testFailed(a + " should be " + bv + ". Was " + stringify(av) + ".");
+        } else {
+            testFailed(a + " should be " + bv + " (of type " + typeof bv +
+                    "). Was " + av + " (of type " + typeof av + ").");
+        }
+    }
+    /**
+     * @param {!Object} t context in which values to be tested are placed
+     * @param {!string} a the value to be checked
+     * @return {undefined}
+     */
+    function shouldBeNonNull(t, a) {
+        var exception, av;
+        try {
+            av = eval(a);
+        } catch (e) {
+            exception = e;
+        }
+
+        if (exception) {
+            testFailed(a + " should be non-null. Threw exception " + exception);
+        } else if (av !== null) {
+            testPassed(a + " is non-null.");
+        } else {
+            testFailed(a + " should be non-null. Was " + av);
+        }
+    }
+    /**
+     * @param {!Object} t context in which values to be tested are placed
+     * @param {!string} a the value to be checked
+     * @return {undefined}
+     */
+    function shouldBeNull(t, a) {
+        shouldBe(t, a, "null");
+    }
+    this.shouldBeNull = shouldBeNull;
+    this.shouldBeNonNull = shouldBeNonNull;
+    this.shouldBe = shouldBe;
+    this.countFailedTests = function () {
+        return failedTests;
+    };
+};
+
+/**
+ * @constructor
+ */
+core.UnitTester = function UnitTester() {
+    "use strict";
+    var failedTests = 0,
+        results = {};
+    /**
+     * @param {Function} TestClass the constructor for the test class
+     * @param {!function():undefined} callback
+     * @return {undefined}
+     */
+    this.runTests = function (TestClass, callback) {
+        var testName = Runtime.getFunctionName(TestClass),
+            tname,
+            runner = new core.UnitTestRunner(),
+            test = new TestClass(runner),
+            testResults = {},
+            i,
+            t,
+            tests,
+            lastFailCount;
+
+        // check that this test has not been run or started yet
+        if (testName.hasOwnProperty(results)) {
+            runtime.log("Test " + testName + " has already run.");
+            return;
+        }
+
+        runtime.log("Running " + testName + ": " + test.description());
+        tests = test.tests();
+        for (i = 0; i < tests.length; i += 1) {
+            t = tests[i];
+            tname = Runtime.getFunctionName(t);
+            runtime.log("Running " + tname);
+            lastFailCount = runner.countFailedTests();
+            test.setUp();
+            t();
+            test.tearDown();
+            testResults[tname] = lastFailCount === runner.countFailedTests();
+        }
+        function runAsyncTests(todo) {
+            if (todo.length === 0) {
+                results[testName] = testResults;
+                failedTests += runner.countFailedTests();
+                callback();
+                return;
+            }
+            t = todo[0];
+            var tname = Runtime.getFunctionName(t);
+            runtime.log("Running " + tname);
+            lastFailCount = runner.countFailedTests();
+            test.setUp();
+            t(function () {
+                test.tearDown();
+                testResults[tname] = lastFailCount ===
+                    runner.countFailedTests();
+                runAsyncTests(todo.slice(1));
+            });
+        }
+        runAsyncTests(test.asyncTests());
+    };
+    /**
+     * @return {!number}
+     **/
+    this.countFailedTests = function () {
+        return failedTests;
+    };
+    /**
+     * @return {!Object}
+     **/
+    this.results = function () {
+        return results;
+    };
+};
diff --git a/apps/files_odfviewer/src/webodf/webodf/lib/core/Zip.js b/apps/files_odfviewer/src/webodf/webodf/lib/core/Zip.js
new file mode 100644
index 0000000000..66f508ee39
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/lib/core/Zip.js
@@ -0,0 +1,600 @@
+/**
+ * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
+ * @licstart
+ * The JavaScript code in this page is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU Affero General Public License
+ * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.  The code is distributed
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
+ *
+ * As additional permission under GNU AGPL version 3 section 7, you
+ * may distribute non-source (e.g., minimized or compacted) forms of
+ * that code without the copy of the GNU GPL normally required by
+ * section 4, provided you include this license notice and a URL
+ * through which recipients can access the Corresponding Source.
+ *
+ * As a special exception to the AGPL, any HTML file which merely makes function
+ * calls to this code, and for that purpose includes it by reference shall be
+ * deemed a separate work for copyright law purposes. In addition, the copyright
+ * holders of this code give you permission to combine this code with free
+ * software libraries that are released under the GNU LGPL. You may copy and
+ * distribute such a system following the terms of the GNU AGPL for this code
+ * and the LGPL for the libraries. If you modify this code, you may extend this
+ * exception to your version of the code, but you are not obligated to do so.
+ * If you do not wish to do so, delete this exception statement from your
+ * version.
+ *
+ * This license applies to this entire compilation.
+ * @licend
+ * @source: http://www.webodf.org/
+ * @source: http://gitorious.org/odfkit/webodf/
+ */
+/*global runtime, core, DOMParser*/
+/*jslint bitwise: true*/
+/*
+* @preserve
+* WebODF
+* Copyright (c) 2010 Jos van den Oever 
+* Licensed under the ... License:
+*
+* Project home: http://www.webodf.org/
+*/
+
+runtime.loadClass("core.RawInflate");
+runtime.loadClass("core.ByteArray");
+runtime.loadClass("core.ByteArrayWriter");
+runtime.loadClass("core.Base64");
+
+/**
+ * @constructor
+ * @param {!string} url path to zip file, should be readable by the runtime
+ * @param {?function(?string, !core.Zip):undefined} entriesReadCallback callback
+ *        indicating the zip
+ *        has loaded this list of entries, the arguments are a string that
+ *        indicates error if present and the created object
+ */
+core.Zip = function Zip(url, entriesReadCallback) {
+    "use strict";
+    var /**@type{Array.<!ZipEntry>}*/ entries,
+        /**@type{number}*/ filesize,
+        /**@type{number}*/ nEntries,
+        /**@type{Function}*/ inflate = new core.RawInflate().inflate,
+        /**@type{!core.Zip}*/ zip = this,
+        base64 = new core.Base64();
+
+    /**
+     * @param {!Runtime.ByteArray} data
+     * @return {!number}
+     */
+    function crc32(data) {
+        // Calculate the crc32 polynomial of a string  
+        // 
+        // version: 1009.2513
+        // discuss at: http:\/\/phpjs.org\/functions\/crc32
+        // +   original by: Webtoolkit.info (http:\/\/www.webtoolkit.info\/)
+        // +   improved by: T0bsn
+        // -    depends on: utf8_encode
+        // *     example 1: crc32('Kevin van Zonneveld');
+        // *     returns 1: 1249991249
+        var /**@const@type{!Array.<!number>}*/table = [0x00000000, 0x77073096, 0xEE0E612C, 0x990951BA, 0x076DC419, 0x706AF48F, 0xE963A535, 0x9E6495A3, 0x0EDB8832, 0x79DCB8A4, 0xE0D5E91E, 0x97D2D988, 0x09B64C2B, 0x7EB17CBD, 0xE7B82D07, 0x90BF1D91, 0x1DB71064, 0x6AB020F2, 0xF3B97148, 0x84BE41DE, 0x1ADAD47D, 0x6DDDE4EB, 0xF4D4B551, 0x83D385C7, 0x136C9856, 0x646BA8C0, 0xFD62F97A, 0x8A65C9EC, 0x14015C4F, 0x63066CD9, 0xFA0F3D63, 0x8D080DF5, 0x3B6E20C8, 0x4C69105E, 0xD56041E4, 0xA2677172, 0x3C03E4D1, 0x4B04D447, 0xD20D85FD, 0xA50AB56B, 0x35B5A8FA, 0x42B2986C, 0xDBBBC9D6, 0xACBCF940, 0x32D86CE3, 0x45DF5C75, 0xDCD60DCF, 0xABD13D59, 0x26D930AC, 0x51DE003A, 0xC8D75180, 0xBFD06116, 0x21B4F4B5, 0x56B3C423, 0xCFBA9599, 0xB8BDA50F, 0x2802B89E, 0x5F058808, 0xC60CD9B2, 0xB10BE924, 0x2F6F7C87, 0x58684C11, 0xC1611DAB, 0xB6662D3D, 0x76DC4190, 0x01DB7106, 0x98D220BC, 0xEFD5102A, 0x71B18589, 0x06B6B51F, 0x9FBFE4A5, 0xE8B8D433, 0x7807C9A2, 0x0F00F934, 0x9609A88E, 0xE10E9818, 0x7F6A0DBB, 0x086D3D2D, 0x91646C97, 0xE6635C01, 0x6B6B51F4, 0x1C6C6162, 0x856530D8, 0xF262004E, 0x6C0695ED, 0x1B01A57B, 0x8208F4C1, 0xF50FC457, 0x65B0D9C6, 0x12B7E950, 0x8BBEB8EA, 0xFCB9887C, 0x62DD1DDF, 0x15DA2D49, 0x8CD37CF3, 0xFBD44C65, 0x4DB26158, 0x3AB551CE, 0xA3BC0074, 0xD4BB30E2, 0x4ADFA541, 0x3DD895D7, 0xA4D1C46D, 0xD3D6F4FB, 0x4369E96A, 0x346ED9FC, 0xAD678846, 0xDA60B8D0, 0x44042D73, 0x33031DE5, 0xAA0A4C5F, 0xDD0D7CC9, 0x5005713C, 0x270241AA, 0xBE0B1010, 0xC90C2086, 0x5768B525, 0x206F85B3, 0xB966D409, 0xCE61E49F, 0x5EDEF90E, 0x29D9C998, 0xB0D09822, 0xC7D7A8B4, 0x59B33D17, 0x2EB40D81, 0xB7BD5C3B, 0xC0BA6CAD, 0xEDB88320, 0x9ABFB3B6, 0x03B6E20C, 0x74B1D29A, 0xEAD54739, 0x9DD277AF, 0x04DB2615, 0x73DC1683, 0xE3630B12, 0x94643B84, 0x0D6D6A3E, 0x7A6A5AA8, 0xE40ECF0B, 0x9309FF9D, 0x0A00AE27, 0x7D079EB1, 0xF00F9344, 0x8708A3D2, 0x1E01F268, 0x6906C2FE, 0xF762575D, 0x806567CB, 0x196C3671, 0x6E6B06E7, 0xFED41B76, 0x89D32BE0, 0x10DA7A5A, 0x67DD4ACC, 0xF9B9DF6F, 0x8EBEEFF9, 0x17B7BE43, 0x60B08ED5, 0xD6D6A3E8, 0xA1D1937E, 0x38D8C2C4, 0x4FDFF252, 0xD1BB67F1, 0xA6BC5767, 0x3FB506DD, 0x48B2364B, 0xD80D2BDA, 0xAF0A1B4C, 0x36034AF6, 0x41047A60, 0xDF60EFC3, 0xA867DF55, 0x316E8EEF, 0x4669BE79, 0xCB61B38C, 0xBC66831A, 0x256FD2A0, 0x5268E236, 0xCC0C7795, 0xBB0B4703, 0x220216B9, 0x5505262F, 0xC5BA3BBE, 0xB2BD0B28, 0x2BB45A92, 0x5CB36A04, 0xC2D7FFA7, 0xB5D0CF31, 0x2CD99E8B, 0x5BDEAE1D, 0x9B64C2B0, 0xEC63F226, 0x756AA39C, 0x026D930A, 0x9C0906A9, 0xEB0E363F, 0x72076785, 0x05005713, 0x95BF4A82, 0xE2B87A14, 0x7BB12BAE, 0x0CB61B38, 0x92D28E9B, 0xE5D5BE0D, 0x7CDCEFB7, 0x0BDBDF21, 0x86D3D2D4, 0xF1D4E242, 0x68DDB3F8, 0x1FDA836E, 0x81BE16CD, 0xF6B9265B, 0x6FB077E1, 0x18B74777, 0x88085AE6, 0xFF0F6A70, 0x66063BCA, 0x11010B5C, 0x8F659EFF, 0xF862AE69, 0x616BFFD3, 0x166CCF45, 0xA00AE278, 0xD70DD2EE, 0x4E048354, 0x3903B3C2, 0xA7672661, 0xD06016F7, 0x4969474D, 0x3E6E77DB, 0xAED16A4A, 0xD9D65ADC, 0x40DF0B66, 0x37D83BF0, 0xA9BCAE53, 0xDEBB9EC5, 0x47B2CF7F, 0x30B5FFE9, 0xBDBDF21C, 0xCABAC28A, 0x53B39330, 0x24B4A3A6, 0xBAD03605, 0xCDD70693, 0x54DE5729, 0x23D967BF, 0xB3667A2E, 0xC4614AB8, 0x5D681B02, 0x2A6F2B94, 0xB40BBE37, 0xC30C8EA1, 0x5A05DF1B, 0x2D02EF8D],
+            /**@type{!number}*/ crc = 0,
+            /**@type{!number}*/ i,
+            /**@const@type{!number}*/ iTop = data.length,
+            /**@type{!number}*/ x = 0,
+            /**@type{!number}*/ y = 0;
+        crc = crc ^ (-1);
+        for (i = 0; i < iTop; i += 1) {
+            y = (crc ^ data[i]) & 0xFF;
+            x = table[y];
+            crc = (crc >>> 8) ^ x;
+        }
+        return crc ^ (-1);
+    }
+
+    /**
+     * @param {!number} dostime
+     * @return {!Date}
+     */
+    function dosTime2Date(dostime) {
+        var /**@const@type{!number}*/ year = ((dostime >> 25) & 0x7f) + 1980,
+            /**@const@type{!number}*/ month = ((dostime >> 21) & 0x0f) - 1,
+            /**@const@type{!number}*/ mday = (dostime >> 16) & 0x1f,
+            /**@const@type{!number}*/ hour = (dostime >> 11) & 0x0f,
+            /**@const@type{!number}*/ min = (dostime >> 5) & 0x3f,
+            /**@const@type{!number}*/ sec = (dostime & 0x1f) << 1,
+            /**@const@type{!Date}*/ d
+                = new Date(year, month, mday, hour, min, sec);
+        return d;
+    }
+    /**
+     * @param {!Date} date
+     * @return {!number}
+     */
+    function date2DosTime(date) {
+        var /**@const@type{!number}*/ y = date.getFullYear();
+        return y < 1980 ? 0 :
+            ((y - 1980) << 25) | ((date.getMonth() + 1) << 21) |
+            (date.getDate() << 16) | (date.getHours() << 11) |
+            (date.getMinutes() << 5) | (date.getSeconds() >> 1);
+    }
+    /**
+     * Create a new ZipEntry.
+     * If the stream is not provided, the object should be initialized
+     * with ZipEntry.set()
+     * @constructor
+     * @param {!string} url
+     * @param {!core.ByteArray=} stream
+     */
+    function ZipEntry(url, stream) {
+        var /**@const@type{!number}*/ sig,
+            /**@const@type{!number}*/ namelen,
+            /**@const@type{!number}*/ extralen,
+            /**@const@type{!number}*/ commentlen,
+            /**@const@type{!number}*/ compressionMethod,
+            /**@const@type{!number}*/ compressedSize,
+            /**@const@type{!number}*/ uncompressedSize,
+            /**@const@type{!number}*/ offset,
+            /**@const@type{!number}*/ crc,
+            /**@const@type{!ZipEntry}*/ entry = this;
+
+        /**
+         * @param {!Runtime.ByteArray} data
+         * @param {!function(?string, ?Runtime.ByteArray)} callback
+         * @return {undefined}
+         */
+        function handleEntryData(data, callback) {
+            var /**@const@type{!core.ByteArray}*/ stream
+                        = new core.ByteArray(data),
+                /**@const@type{!number}*/ sig = stream.readUInt32LE(),
+                /**@const@type{!number}*/ filenamelen,
+                /**@const@type{!number}*/ extralen;
+            if (sig !== 0x04034b50) {
+                callback('File entry signature is wrong.' + sig.toString() +
+                        ' ' + data.length.toString(), null);
+                return;
+            }
+            stream.pos += 22;
+            filenamelen = stream.readUInt16LE();
+            extralen = stream.readUInt16LE();
+            stream.pos += filenamelen + extralen;
+            if (compressionMethod) {
+                data = data.slice(stream.pos, stream.pos + compressedSize);
+                if (compressedSize !== data.length) {
+                    callback("The amount of compressed bytes read was " +
+                        data.length.toString() + " instead of " +
+                        compressedSize.toString() + " for " + entry.filename +
+                        " in " + url + ".", null);
+                    return;
+                }
+                data = inflate(data, uncompressedSize);
+            } else {
+                data = data.slice(stream.pos, stream.pos + uncompressedSize);
+            }
+            if (uncompressedSize !== data.length) {
+                callback("The amount of bytes read was " +
+                        data.length.toString() +
+                        " instead of " + uncompressedSize.toString() + " for " +
+                        entry.filename + " in " + url + ".", null);
+                return;
+            }
+/*
+ * This check is disabled for performance reasons
+            if (crc !== crc32(data)) {
+                runtime.log("Warning: CRC32 for " + entry.filename +
+                    " is wrong.");
+            }
+*/
+            entry.data = data;
+            callback(null, data);
+        }
+        /**
+         * @param {!function(?string, ?Runtime.ByteArray)} callback
+         * @return {undefined}
+         */
+        function load(callback) {
+            // if data has already been downloaded, use that
+            if (entry.data !== undefined) {
+                callback(null, entry.data);
+                return;
+            }
+            // the 256 at the end is security for when local extra field is
+            // larger
+            var /**@type{!number}*/ size
+                = compressedSize + 34 + namelen + extralen + 256;
+            if (size + offset > filesize) {
+                size = filesize - offset;
+            }
+            runtime.read(url, offset, size, function (err, data) {
+                if (err) {
+                    callback(err, data);
+                } else {
+                    handleEntryData(data, callback);
+                }
+            });
+        }
+        this.load = load;
+        /**
+         * @param {!string} filename
+         * @param {!Runtime.ByteArray} data
+         * @param {!boolean} compressed
+         * @param {!Date} date
+         * @return {undefined}
+         */
+        function set(filename, data, compressed, date) {
+            entry.filename = filename;
+            entry.data = data;
+            entry.compressed = compressed;
+            entry.date = date;
+        }
+        this.set = set;
+        /**
+         * @type {?string}
+         */
+        this.error = null;
+
+        if (!stream) {
+            return;
+        }
+        sig = stream.readUInt32LE();
+
+        if (sig !== 0x02014b50) {
+            this.error =
+                "Central directory entry has wrong signature at position " +
+                (stream.pos - 4).toString() + ' for file "' + url + '": ' +
+                stream.data.length.toString();
+            return;
+        }
+        // stream should be positioned at the start of the CDS entry for the
+        // file
+        stream.pos += 6;
+        compressionMethod = stream.readUInt16LE();
+        this.date = dosTime2Date(stream.readUInt32LE());
+        crc = stream.readUInt32LE();
+        compressedSize = stream.readUInt32LE();
+        uncompressedSize = stream.readUInt32LE();
+        namelen = stream.readUInt16LE();
+        extralen = stream.readUInt16LE();
+        commentlen = stream.readUInt16LE();
+        stream.pos += 8;
+        offset = stream.readUInt32LE();
+        this.filename = runtime.byteArrayToString(
+                stream.data.slice(stream.pos, stream.pos + namelen), "utf8");
+        stream.pos += namelen + extralen + commentlen;
+    }
+    /**
+     * @param {!Runtime.ByteArray} data
+     * @param {!function(?string, !core.Zip)} callback
+     * @return {undefined}
+     */
+    function handleCentralDirectory(data, callback) {
+        // parse the central directory
+        var stream = new core.ByteArray(data), i, e;
+        entries = [];
+        for (i = 0; i < nEntries; i += 1) {
+            e = new ZipEntry(url, stream);
+            if (e.error) {
+                callback(e.error, zip);
+                return;
+            }
+            entries[entries.length] = e;
+        }
+        // report that entries are listed and no error occured
+        callback(null, zip);
+    }
+    /**
+     * @param {!Runtime.ByteArray} data
+     * @param {!function(?string, !core.Zip)} callback
+     * @return {undefined}
+     */
+    function handleCentralDirectoryEnd(data, callback) {
+        if (data.length !== 22) {
+            callback("Central directory length should be 22.", zip);
+            return;
+        }
+        var stream = new core.ByteArray(data), sig, disk, cddisk, diskNEntries,
+            cdsSize, cdsOffset;
+        sig = stream.readUInt32LE();
+        if (sig !== 0x06054b50) {
+            callback('Central directory signature is wrong: ' + sig.toString(),
+                    zip);
+            return;
+        }
+        disk = stream.readUInt16LE();
+        if (disk !== 0) {
+            callback('Zip files with non-zero disk numbers are not supported.',
+                    zip);
+            return;
+        }
+        cddisk = stream.readUInt16LE();
+        if (cddisk !== 0) {
+            callback('Zip files with non-zero disk numbers are not supported.',
+                    zip);
+            return;
+        }
+        diskNEntries = stream.readUInt16LE();
+        nEntries = stream.readUInt16LE();
+        if (diskNEntries !== nEntries) {
+            callback('Number of entries is inconsistent.', zip);
+            return;
+        }
+        cdsSize = stream.readUInt32LE();
+        cdsOffset = stream.readUInt16LE();
+        cdsOffset = filesize - 22 - cdsSize;
+
+        // for some reason cdsOffset is not always equal to offset calculated
+        // from the central directory size. The latter is reliable.
+        runtime.read(url, cdsOffset, filesize - cdsOffset,
+                function (err, data) {
+                handleCentralDirectory(data, callback);
+            });
+    }
+    /**
+     * @param {!string} filename
+     * @param {!function(?string, ?Runtime.ByteArray)} callback receiving err and data
+     * @return {undefined}
+     */
+    function load(filename, callback) {
+        var entry = null,
+            end = filesize,
+            e,
+            i;
+        for (i = 0; i < entries.length; i += 1) {
+            e = entries[i];
+            if (e.filename === filename) {
+                entry = e;
+                break;
+            }
+        }
+        if (entry) {
+            if (entry.data) {
+                callback(null, entry.data);
+            } else {
+                entry.load(callback);
+            }
+        } else {
+            callback(filename + " not found.", null);
+        }
+    }
+    /**
+     * @param {!string} filename
+     * @param {!function(?string, ?string)} callback receiving err and data
+     * @return {undefined}
+     */
+    function loadAsString(filename, callback) {
+        // the javascript implementation simply reads the file and converts to
+        // string
+        load(filename, function (err, data) {
+            if (err) {
+                return callback(err, null);
+            }
+            data = runtime.byteArrayToString(data, "utf8");
+            callback(null, data);
+        });
+    }
+    /**
+     * @param {!string} filename
+     * @param {!Object} handler
+     * @return {undefined}
+     */
+    function loadContentXmlAsFragments(filename, handler) {
+        // the javascript implementation simply reads the file
+        loadAsString(filename, function (err, data) {
+            if (err) {
+                return handler.rootElementReady(err);
+            }
+            handler.rootElementReady(null, data, true);
+        });
+    }
+    function loadAsDataURL(filename, mimetype, callback) {
+        load(filename, function (err, data) {
+            if (err) {
+                return callback(err, null);
+            }
+            var /**@const@type{!Runtime.ByteArray}*/p = data,
+                chunksize = 45000, // must be multiple of 3 and less than 50000
+                i = 0,
+                url;
+            if (!mimetype) {
+                if (p[1] === 0x50 && p[2] === 0x4E && p[3] === 0x47) {
+                    mimetype = "image/png";
+                } else if (p[0] === 0xFF && p[1] === 0xD8 && p[2] === 0xFF) {
+                    mimetype = "image/jpeg";
+                } else if (p[0] === 0x47 && p[1] === 0x49 && p[2] === 0x46) {
+                    mimetype = "image/gif";
+                } else {
+                    mimetype = "";
+                }
+            }
+            url = 'data:' + mimetype + ';base64,';
+            // to avoid exceptions, base64 encoding is done in chunks
+            // it would make sense to move this to base64.toBase64
+            while (i < data.length) {
+                url += base64.convertUTF8ArrayToBase64(
+                    p.slice(i, Math.min(i + chunksize, p.length))
+                );
+                i += chunksize;
+            }
+            callback(null, url);
+        });
+    }
+    function loadAsDOM(filename, callback) {
+        loadAsString(filename, function (err, xmldata) {
+            if (err) {
+                callback(err, null);
+                return;
+            }
+            var parser = new DOMParser();
+            xmldata = parser.parseFromString(xmldata, "text/xml");
+            callback(null, xmldata);
+        });
+    }
+    /**
+     * Add or replace an entry to the zip file.
+     * This data is not stored to disk yet, and therefore, no callback is
+     * necessary.
+     * @param {!string} filename
+     * @param {!Runtime.ByteArray} data
+     * @param {!boolean} compressed
+     * @param {!Date} date
+     * @return {undefined}
+     */
+    function save(filename, data, compressed, date) {
+        var i,
+            entry;
+        for (i = 0; i < entries.length; i += 1) {
+            entry = entries[i];
+            if (entry.filename === filename) {
+                entry.set(filename, data, compressed, date);
+                return;
+            }
+        }
+        entry = new ZipEntry(url);
+        entry.set(filename, data, compressed, date);
+        entries.push(entry);
+    }
+    /**
+     * @param {!ZipEntry} entry
+     * @return {!core.ByteArrayWriter}
+     */
+    function writeEntry(entry) {
+        // each entry is currently stored uncompressed
+        var data = new core.ByteArrayWriter("utf8"),
+            length = 0;
+        data.appendArray([0x50, 0x4B, 0x03, 0x04, 0x14, 0, 0, 0, 0, 0]);
+        if (entry.data) {
+            length = entry.data.length;
+        }
+        data.appendUInt32LE(date2DosTime(entry.date));
+        data.appendUInt32LE(crc32(entry.data));
+        data.appendUInt32LE(length); // compressedSize
+        data.appendUInt32LE(length); // uncompressedSize
+        data.appendUInt16LE(entry.filename.length); // namelen
+        data.appendUInt16LE(0); // extralen
+        data.appendString(entry.filename);
+        if (entry.data) {
+            data.appendByteArray(entry.data);
+        }
+        return data;
+    }
+    /**
+     * @param {!ZipEntry} entry
+     * @param {!number} offset
+     * @return {!core.ByteArrayWriter}
+     */
+    function writeCODEntry(entry, offset) {
+        // each entry is currently stored uncompressed
+        var data = new core.ByteArrayWriter("utf8"),
+            length = 0;
+        data.appendArray([0x50, 0x4B, 0x01, 0x02, 0x14, 0x00, 0x14, 0x00,
+                0, 0, 0, 0]);
+        if (entry.data) {
+            length = entry.data.length;
+        }
+        data.appendUInt32LE(date2DosTime(entry.date));
+        data.appendUInt32LE(crc32(entry.data));
+        data.appendUInt32LE(length); // compressedSize
+        data.appendUInt32LE(length); // uncompressedSize
+        data.appendUInt16LE(entry.filename.length); // namelen
+        // extralen, commalen, diskno, file attributes
+        data.appendArray([0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]);
+        data.appendUInt32LE(offset);
+        data.appendString(entry.filename);
+        return data;
+    }
+    /**
+     * @param {!number} position
+     * @param {!function(?string):undefined} callback
+     * @return {undefined}
+     */
+    function loadAllEntries(position, callback) {
+        if (position === entries.length) {
+            callback(null);
+            return;
+        }
+        var entry = entries[position];
+        if (entry.data !== undefined) {
+            loadAllEntries(position + 1, callback);
+            return;
+        }
+        entry.load(function (err) {
+            if (err) {
+                callback(err);
+                return;
+            }
+            loadAllEntries(position + 1, callback);
+        });
+    }
+    /**
+     * Write the zipfile to the given path.
+     * @param {!function(?string):undefined} callback receiving possible err
+     * @return {undefined}
+     */
+    function write(callback) {
+        // make sure all data is in memory, for each entry that has data
+        // undefined, try to load the entry
+        loadAllEntries(0, function (err) {
+            if (err) {
+                callback(err);
+                return;
+            }
+            var data = new core.ByteArrayWriter("utf8"),
+                i, e, codoffset, codsize,
+                offsets = [0];
+            // write entries
+            for (i = 0; i < entries.length; i += 1) {
+                data.appendByteArrayWriter(writeEntry(entries[i]));
+                offsets.push(data.getLength());
+            }
+            // write central directory
+            codoffset = data.getLength();
+            for (i = 0; i < entries.length; i += 1) {
+                e = entries[i];
+                data.appendByteArrayWriter(writeCODEntry(e, offsets[i]));
+            }
+            codsize = data.getLength() - codoffset;
+            data.appendArray([0x50, 0x4B, 0x05, 0x06, 0, 0, 0, 0]);
+            data.appendUInt16LE(entries.length);
+            data.appendUInt16LE(entries.length);
+            data.appendUInt32LE(codsize);
+            data.appendUInt32LE(codoffset);
+            data.appendArray([0, 0]);
+            runtime.writeFile(url, data.getByteArray(), callback);
+        });
+    }
+
+    this.load = load;
+    this.save = save;
+    this.write = write;
+    // a special function that makes faster odf loading possible
+    this.loadContentXmlAsFragments = loadContentXmlAsFragments;
+    this.loadAsString = loadAsString;
+    this.loadAsDOM = loadAsDOM;
+    this.loadAsDataURL = loadAsDataURL;
+    this.getEntries = function () {
+        return entries.slice();
+    };
+
+    // determine the file size
+    filesize = -1;
+    // if no callback is defined, this is a new file
+    if (entriesReadCallback === null) {
+        entries = [];
+        return;
+    }
+    runtime.getFileSize(url, function (size) {
+        filesize = size;
+        if (filesize < 0) {
+            entriesReadCallback("File '" + url + "' cannot be read.", zip);
+        } else {
+            runtime.read(url, filesize - 22, 22, function (err, data) {
+                // todo: refactor entire zip class
+                if (err || entriesReadCallback === null) {
+                    entriesReadCallback(err, zip);
+                } else {
+                    handleCentralDirectoryEnd(data, entriesReadCallback);
+                }
+            });
+        }
+    });
+};
diff --git a/apps/files_odfviewer/src/webodf/webodf/lib/core/dummyxmlmodel.js_ b/apps/files_odfviewer/src/webodf/webodf/lib/core/dummyxmlmodel.js_
new file mode 100644
index 0000000000..c14ec84411
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/lib/core/dummyxmlmodel.js_
@@ -0,0 +1,21 @@
+/*global exports require*/
+function createDummyXMLModel() {
+    var that = {};
+
+    function preserveWhitespace(node) {
+        return true;
+    }
+
+    // return an array with child qnames or null for inserting text.
+    // the dummy implementation allows text everywhere, but no new elements
+    // "*" means all elements are allowed
+    // ["#PCDATA", "*"] means any element and text is allowed
+    function getAllowedChildren(node, position) {
+        return [null];
+    }
+
+    that.getAllowedChildren = getAllowedChildren;
+    that.preserveWhitespace = preserveWhitespace;
+    return that;
+}
+exports.createDummyXMLModel = createDummyXMLModel;
diff --git a/apps/files_odfviewer/src/webodf/webodf/lib/export.js b/apps/files_odfviewer/src/webodf/webodf/lib/export.js
new file mode 100644
index 0000000000..08982cd424
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/lib/export.js
@@ -0,0 +1,39 @@
+/**
+ * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
+ * @licstart
+ * The JavaScript code in this page is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU Affero General Public License
+ * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.  The code is distributed
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
+ *
+ * As additional permission under GNU AGPL version 3 section 7, you
+ * may distribute non-source (e.g., minimized or compacted) forms of
+ * that code without the copy of the GNU GPL normally required by
+ * section 4, provided you include this license notice and a URL
+ * through which recipients can access the Corresponding Source.
+ *
+ * As a special exception to the AGPL, any HTML file which merely makes function
+ * calls to this code, and for that purpose includes it by reference shall be
+ * deemed a separate work for copyright law purposes. In addition, the copyright
+ * holders of this code give you permission to combine this code with free
+ * software libraries that are released under the GNU LGPL. You may copy and
+ * distribute such a system following the terms of the GNU AGPL for this code
+ * and the LGPL for the libraries. If you modify this code, you may extend this
+ * exception to your version of the code, but you are not obligated to do so.
+ * If you do not wish to do so, delete this exception statement from your
+ * version.
+ *
+ * This license applies to this entire compilation.
+ * @licend
+ * @source: http://www.webodf.org/
+ * @source: http://gitorious.org/odfkit/webodf/
+ */
+/*global window runtime odf*/
+/*jslint sub: true*/
+
+window["runtime"] = runtime;
+runtime["loadClass"] = runtime.loadClass;
+window["odf"] = odf;
+window["odf"]["OdfCanvas"] = odf.OdfCanvas;
diff --git a/apps/files_odfviewer/src/webodf/webodf/lib/gui/Caret.js b/apps/files_odfviewer/src/webodf/webodf/lib/gui/Caret.js
new file mode 100644
index 0000000000..744b8b022a
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/lib/gui/Caret.js
@@ -0,0 +1,65 @@
+/**
+ * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
+ * @licstart
+ * The JavaScript code in this page is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU Affero General Public License
+ * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.  The code is distributed
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
+ *
+ * As additional permission under GNU AGPL version 3 section 7, you
+ * may distribute non-source (e.g., minimized or compacted) forms of
+ * that code without the copy of the GNU GPL normally required by
+ * section 4, provided you include this license notice and a URL
+ * through which recipients can access the Corresponding Source.
+ *
+ * As a special exception to the AGPL, any HTML file which merely makes function
+ * calls to this code, and for that purpose includes it by reference shall be
+ * deemed a separate work for copyright law purposes. In addition, the copyright
+ * holders of this code give you permission to combine this code with free
+ * software libraries that are released under the GNU LGPL. You may copy and
+ * distribute such a system following the terms of the GNU AGPL for this code
+ * and the LGPL for the libraries. If you modify this code, you may extend this
+ * exception to your version of the code, but you are not obligated to do so.
+ * If you do not wish to do so, delete this exception statement from your
+ * version.
+ *
+ * This license applies to this entire compilation.
+ * @licend
+ * @source: http://www.webodf.org/
+ * @source: http://gitorious.org/odfkit/webodf/
+ */
+/*global gui*/
+/**
+ * Class that represents a caret in a document. In text nodes, a native caret is
+ * used via the HTML attribute contentEditable. Outside of text nodes, an empty
+ * element representing the caret is used.
+ * @constructor
+ */
+gui.Caret = function Caret(selection, rootNode) {
+    "use strict";
+    var document = rootNode.ownerDocument,
+        cursorns,
+        cursorNode;
+    cursorns = 'urn:webodf:names:cursor';
+    cursorNode = document.createElementNS(cursorns, 'cursor');
+    /**
+     * Synchronize the cursor with the current selection.
+     * If there is a single collapsed selection range, the cursor will be placed
+     * there. If not, the cursor will be removed from the document tree.
+     * @return {undefined}
+     */
+    this.updateToSelection = function () {
+        var range;
+//        removeCursor();
+        if (selection.rangeCount === 1) {
+            range = selection.getRangeAt(0);
+/*
+            if (range.collapsed) {
+                putCursor(range.startContainer, range.startOffset);
+            }
+*/
+        }
+    };
+};
diff --git a/apps/files_odfviewer/src/webodf/webodf/lib/gui/PresenterUI.js b/apps/files_odfviewer/src/webodf/webodf/lib/gui/PresenterUI.js
new file mode 100644
index 0000000000..c6553cc3af
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/lib/gui/PresenterUI.js
@@ -0,0 +1,246 @@
+/**
+ * Copyright (C) 2011 KO GmbH - Tobias Hintze
+ * @licstart
+ * The JavaScript code in this page is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU Affero General Public License
+ * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.  The code is distributed
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
+ *
+ * As additional permission under GNU AGPL version 3 section 7, you
+ * may distribute non-source (e.g., minimized or compacted) forms of
+ * that code without the copy of the GNU GPL normally required by
+ * section 4, provided you include this license notice and a URL
+ * through which recipients can access the Corresponding Source.
+ *
+ * As a special exception to the AGPL, any HTML file which merely makes function
+ * calls to this code, and for that purpose includes it by reference shall be
+ * deemed a separate work for copyright law purposes. In addition, the copyright
+ * holders of this code give you permission to combine this code with free
+ * software libraries that are released under the GNU LGPL. You may copy and
+ * distribute such a system following the terms of the GNU AGPL for this code
+ * and the LGPL for the libraries. If you modify this code, you may extend this
+ * exception to your version of the code, but you are not obligated to do so.
+ * If you do not wish to do so, delete this exception statement from your
+ * version.
+ *
+ * This license applies to this entire compilation.
+ * @licend
+ * @source: http://www.webodf.org/
+ * @source: http://gitorious.org/odfkit/webodf/
+ */
+
+/*global runtime, gui, odf, core, xmldom, document, window*/
+runtime.loadClass("xmldom.XPath");
+runtime.loadClass("odf.Style2CSS");
+
+gui.PresenterUI = (function () {
+    "use strict";
+    var s2css = new odf.Style2CSS(),
+        xpath = new xmldom.XPath(),
+        nsResolver = s2css.namespaceResolver;
+
+    return function PresenterUI(odf_element) {
+        var self = this;
+
+        self.setInitialSlideMode = function () {
+            self.startSlideMode('single');
+        };
+
+        self.keyDownHandler = function (ev) {
+            if (ev.target.isContentEditable) { return; }
+            if (ev.target.nodeName === 'input') { return; }
+            switch (ev.keyCode) {
+            case 84: // t - hide/show toolbar
+                self.toggleToolbar();
+                break;
+            case 37: // left
+            case 8: // left
+                self.prevSlide();
+                break;
+            case 39:  // right
+            case 32:  // space
+                self.nextSlide();
+                break;
+            case 36: // pos1
+                self.firstSlide();
+                break;
+            case 35: // end
+                self.lastSlide();
+                break;
+            }
+        };
+
+        self.root = function () { return self.odf_canvas.odfContainer().rootElement; };
+
+        self.firstSlide = function () { self.slideChange(function (old, pc) { return 0; }); };
+        self.lastSlide = function () { self.slideChange(function (old, pc) { return pc - 1; }); };
+
+        self.nextSlide = function () {
+            self.slideChange(function (old, pc) { return old + 1 < pc ? old + 1 : -1; });
+        };
+        self.prevSlide = function () {
+            self.slideChange(function (old, pc) { return old < 1 ? -1 : old - 1; });
+        };
+        // indexChanger gets (idx,pagecount) as parameter and returns the new index
+        self.slideChange = function (indexChanger) {
+            var pages = self.getPages(self.odf_canvas.odfContainer().rootElement),
+                last = -1,
+                i = 0,
+                newidx,
+                pagelist;
+            pages.forEach(function (tuple) {
+                var name = tuple[0],
+                    node = tuple[1];
+                if (node.hasAttribute('slide_current')) {
+                    last = i;
+                    node.removeAttribute('slide_current');
+                }
+                i += 1;
+            });
+            newidx = indexChanger(last, pages.length);
+            if (newidx === -1) { newidx = last; }
+            pages[newidx][1].setAttribute('slide_current', '1');
+            pagelist = document.getElementById('pagelist');
+            pagelist.selectedIndex = newidx;
+            // FIXME this needs to become a sane callback/listener mechanism
+            // (and the mode probably a class/instance..)
+            if (self.slide_mode === 'cont') {
+                window.scrollBy(0, pages[newidx][1].getBoundingClientRect().top - 30);
+            }
+        };
+
+        self.selectSlide = function (idx) {
+            self.slideChange(function (old, pc) {
+                if (idx >= pc) { return -1; }
+                if (idx < 0) { return -1; }
+                return idx;
+            });
+        };
+
+        // make one specific slide visible in cont-mode
+        self.scrollIntoContView = function (idx) {
+            var pages = self.getPages(self.odf_canvas.odfContainer().rootElement);
+            if (pages.length === 0) { return; }
+            /*
+            if (false) {
+                // works in chrome
+                pages[idx][1].scrollIntoView();
+            } else {
+            */
+                // works in ff
+            window.scrollBy(0, pages[idx][1].getBoundingClientRect().top - 30);
+            /*}*/
+        };
+
+        // return a list of tuples (pagename, pagenode)
+        self.getPages = function (root) {
+            var pagenodes = root.getElementsByTagNameNS(nsResolver('draw'), 'page'),
+                pages  = [],
+                i;
+            for (i = 0; i < pagenodes.length; i += 1) {
+                pages.push([
+                    pagenodes[i].getAttribute('draw:name'),
+                    pagenodes[i]
+                ]);
+            }
+            return pages;
+        };
+
+        // fill a html-select with options, one option per page in odf (odp)
+        self.fillPageList = function (odfdom_root, html_select) {
+            var pages = self.getPages(odfdom_root),
+                i,
+                html_option,
+                res,
+                page_denom;
+
+            // empty the pagelist
+            while (html_select.firstChild) {
+                html_select.removeChild(html_select.firstChild);
+            }
+
+            // populate it
+            for (i = 0; i < pages.length; i += 1) {
+                html_option = document.createElement('option');
+                res = xpath.getODFElementsWithXPath(pages[i][1],
+                    './draw:frame[@presentation:class="title"]//draw:text-box/text:p',
+                    xmldom.XPath);
+                page_denom = (res.length > 0) ? res[0].textContent : pages[i][0];
+                html_option.textContent = (i + 1) + ": " + page_denom;
+                html_select.appendChild(html_option);
+            }
+        };
+
+        self.startSlideMode = function (mode) {
+            var pagelist = document.getElementById('pagelist'),
+                css = self.odf_canvas.slidevisibilitycss().sheet;
+            self.slide_mode = mode;
+            while (css.cssRules.length > 0) { css.deleteRule(0); }
+            // start on slide 0
+            self.selectSlide(0);
+            if (self.slide_mode === 'single') {
+                css.insertRule("draw|page { position:fixed; left:0px;top:30px; z-index:1; }", 0);
+                css.insertRule("draw|page[slide_current]  { z-index:2;}", 1);
+                css.insertRule("draw|page  { -webkit-transform: scale(1);}", 2);
+                self.fitToWindow();
+                window.addEventListener('resize', self.fitToWindow, false);
+
+            } else if (self.slide_mode === 'cont') {
+                window.removeEventListener('resize', self.fitToWindow, false);
+            }
+
+            self.fillPageList(self.odf_canvas.odfContainer().rootElement, pagelist);
+        };
+
+        // toggle (show/hide) toolbar
+        self.toggleToolbar = function () {
+            var css, found, i;
+            css = self.odf_canvas.slidevisibilitycss().sheet;
+            found = -1;
+            for (i = 0; i < css.cssRules.length; i += 1) {
+                if (css.cssRules[i].cssText.substring(0, 8) === ".toolbar") {
+                    found = i;
+                    break;
+                }
+            }
+            if (found > -1) {
+                css.deleteRule(found);
+            } else {
+                css.insertRule(".toolbar { position:fixed; left:0px;top:-200px; z-index:0; }", 0);
+            }
+        };
+
+        // adapt css-transform to window-size
+        self.fitToWindow = function () {
+            function ruleByFactor(f) {
+                return "draw|page { \n" +
+                    "-moz-transform: scale(" + f + "); \n" +
+                    "-moz-transform-origin: 0% 0%; " +
+                    "-webkit-transform-origin: 0% 0%; -webkit-transform: scale(" + f + "); " +
+                    "-o-transform-origin: 0% 0%; -o-transform: scale(" + f + "); " +
+                    "-ms-transform-origin: 0% 0%; -ms-transform: scale(" + f + "); " +
+                    "}";
+            }
+            var pages = self.getPages(self.root()),
+                factorVert = ((window.innerHeight - 40) / pages[0][1].clientHeight),
+                factorHoriz = ((window.innerWidth - 10) / pages[0][1].clientWidth),
+                factor = factorVert < factorHoriz ? factorVert : factorHoriz,
+                css = self.odf_canvas.slidevisibilitycss().sheet;
+            css.deleteRule(2);
+            css.insertRule(ruleByFactor(factor), 2);
+        };
+
+        self.load = function (url) {
+            self.odf_canvas.load(url);
+        };
+
+        self.odf_element = odf_element;
+        self.odf_canvas = new odf.OdfCanvas(self.odf_element);
+        self.odf_canvas.addListener("statereadychange", self.setInitialSlideMode);
+        self.slide_mode = 'undefined';
+        document.addEventListener('keydown', self.keyDownHandler, false);
+    };
+}());
+
diff --git a/apps/files_odfviewer/src/webodf/webodf/lib/gui/SelectionMover.js b/apps/files_odfviewer/src/webodf/webodf/lib/gui/SelectionMover.js
new file mode 100644
index 0000000000..2356c2c8c0
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/lib/gui/SelectionMover.js
@@ -0,0 +1,217 @@
+/**
+ * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
+ * @licstart
+ * The JavaScript code in this page is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU Affero General Public License
+ * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.  The code is distributed
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
+ *
+ * As additional permission under GNU AGPL version 3 section 7, you
+ * may distribute non-source (e.g., minimized or compacted) forms of
+ * that code without the copy of the GNU GPL normally required by
+ * section 4, provided you include this license notice and a URL
+ * through which recipients can access the Corresponding Source.
+ *
+ * As a special exception to the AGPL, any HTML file which merely makes function
+ * calls to this code, and for that purpose includes it by reference shall be
+ * deemed a separate work for copyright law purposes. In addition, the copyright
+ * holders of this code give you permission to combine this code with free
+ * software libraries that are released under the GNU LGPL. You may copy and
+ * distribute such a system following the terms of the GNU AGPL for this code
+ * and the LGPL for the libraries. If you modify this code, you may extend this
+ * exception to your version of the code, but you are not obligated to do so.
+ * If you do not wish to do so, delete this exception statement from your
+ * version.
+ *
+ * This license applies to this entire compilation.
+ * @licend
+ * @source: http://www.webodf.org/
+ * @source: http://gitorious.org/odfkit/webodf/
+ */
+/*global runtime: true, core: true, gui: true*/
+runtime.loadClass("core.Cursor");
+/**
+ * This class modifies the selection in different ways.
+ * @constructor
+ * @param {Selection} selection
+ * @param {!core.PointWalker} pointWalker
+ * @return {!gui.SelectionMover}
+ */
+gui.SelectionMover = function SelectionMover(selection, pointWalker) {
+    "use strict";
+    var doc = pointWalker.node().ownerDocument,
+        cursor = new core.Cursor(selection, doc);
+    /**
+     * Return the last range in the selection. Create one if the selection is
+     * empty.
+     */
+    function getActiveRange(node) {
+        var range;
+        if (selection.rangeCount === 0) {
+            selection.addRange(node.ownerDocument.createRange());
+        }
+        return selection.getRangeAt(selection.rangeCount - 1);
+    }
+    function setStart(node, offset) {
+        // selection interface is cumbersome and in Chrome it is buggy
+        // as a workaround all ranges are removed. The last one is updated and
+        // all ranges are placed back
+        var ranges = [], i, range;
+        for (i = 0; i < selection.rangeCount; i += 1) {
+            ranges[i] = selection.getRangeAt(i);
+        }
+        selection.removeAllRanges();
+        if (ranges.length === 0) {
+            ranges[0] = node.ownerDocument.createRange();
+        }
+        ranges[ranges.length - 1].setStart(pointWalker.node(),
+                pointWalker.position());
+        for (i = 0; i < ranges.length; i += 1) {
+            selection.addRange(ranges[i]);
+        }
+    }
+    function doMove(extend, move) {
+        if (selection.rangeCount === 0) {
+            return;
+        }
+        var range = selection.getRangeAt(0),
+            /**@type{Element}*/ element;
+        if (!range.startContainer || range.startContainer.nodeType !== 1) {
+            return;
+        }
+        element = /**@type{!Element}*/(range.startContainer);
+        pointWalker.setPoint(element, range.startOffset);
+        move();
+        setStart(pointWalker.node(), pointWalker.position());
+    }
+    function doMoveForward(extend, move) {
+        if (selection.rangeCount === 0) {
+            return;
+        }
+        move();
+        var range = selection.getRangeAt(0),
+            /**@type{Element}*/ element;
+        if (!range.startContainer || range.startContainer.nodeType !== 1) {
+            return;
+        }
+        element = /**@type{!Element}*/(range.startContainer);
+        pointWalker.setPoint(element, range.startOffset);
+    }
+/*
+    function fallbackMoveLineUp() {
+        // put an element at the current position and call
+        // pointWalker.stepForward until the y position increases and x position
+        // is comparable to the previous one
+        cursor.updateToSelection();
+        // retrieve cursor x and y position, then move selection/cursor left
+        // until, y offset is less and x offset about equal
+        var rect = cursor.getNode().getBoundingClientRect(),
+            x = rect.left,
+            y = rect.top,
+            arrived = false,
+            allowedSteps = 200;
+        while (!arrived && allowedSteps) {
+            allowedSteps -= 1;
+            cursor.remove();
+            pointWalker.setPoint(selection.focusNode, selection.focusOffset);
+            pointWalker.stepForward();
+        moveCursor(walker.node(), walker.position());
+            moveCursorLeft();
+            rect = cursor.getNode().getBoundingClientRect();
+            arrived = rect.top !== y && rect.left < x;
+        }
+    }
+*/
+    function moveCursor(node, offset, selectMode) {
+        if (selectMode) {
+            selection.extend(node, offset);
+        } else {
+            selection.collapse(node, offset);
+        }
+        cursor.updateToSelection();
+    }
+    function moveCursorLeft() {
+        var /**@type{Element}*/ element;
+        if (!selection.focusNode || selection.focusNode.nodeType !== 1) {
+            return;
+        }
+        element = /**@type{!Element}*/(selection.focusNode);
+        pointWalker.setPoint(element, selection.focusOffset);
+        pointWalker.stepBackward();
+        moveCursor(pointWalker.node(), pointWalker.position(), false);
+    }
+    function moveCursorRight() {
+        cursor.remove();
+        var /**@type{Element}*/ element;
+        if (!selection.focusNode || selection.focusNode.nodeType !== 1) {
+            return;
+        }
+        element = /**@type{!Element}*/(selection.focusNode);
+        pointWalker.setPoint(element, selection.focusOffset);
+        pointWalker.stepForward();
+        moveCursor(pointWalker.node(), pointWalker.position(), false);
+    }
+    function moveCursorUp() {
+        // retrieve cursor x and y position, then move selection/cursor left
+        // until, y offset is less and x offset about equal
+        var rect = cursor.getNode().getBoundingClientRect(),
+            x = rect.left,
+            y = rect.top,
+            arrived = false,
+            left = 200;
+        while (!arrived && left) {
+            left -= 1;
+            moveCursorLeft();
+            rect = cursor.getNode().getBoundingClientRect();
+            arrived = rect.top !== y && rect.left < x;
+        }
+    }
+    function moveCursorDown() {
+        // retrieve cursor x and y position, then move selection/cursor right
+        // until, x offset is less
+        cursor.updateToSelection();
+        var rect = cursor.getNode().getBoundingClientRect(),
+            x = rect.left,
+            y = rect.top,
+            arrived = false,
+            left = 200;
+        while (!arrived) {
+            left -= 1;
+            moveCursorRight();
+            rect = cursor.getNode().getBoundingClientRect();
+            arrived = rect.top !== y && rect.left > x;
+        }
+//alert(left + " " + y + " " + x + " " + rect.top + " " + rect.left);
+    }
+    /**
+     * Move selection forward one point.
+     * @param {boolean} extend true if range is to be expanded from the current
+     *                         point
+     * @return {undefined}
+     **/
+    this.movePointForward = function (extend) {
+        doMove(extend, pointWalker.stepForward);
+    };
+    this.movePointBackward = function (extend) {
+        doMove(extend, pointWalker.stepBackward);
+    };
+    this.moveLineForward = function (extend) {
+        if (selection.modify) {
+            // TODO add a way to 
+            selection.modify(extend ? "extend" : "move", "forward", "line");
+        } else {
+            doMove(extend, moveCursorDown);
+        }
+    };
+    this.moveLineBackward = function (extend) {
+        if (selection.modify) {
+            selection.modify(extend ? "extend" : "move", "backward", "line");
+        } else {
+            doMove(extend, function () {
+            });
+        }
+    };
+    return this;
+};
diff --git a/apps/files_odfviewer/src/webodf/webodf/lib/gui/XMLEdit.js b/apps/files_odfviewer/src/webodf/webodf/lib/gui/XMLEdit.js
new file mode 100644
index 0000000000..aee0bd5e7d
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/lib/gui/XMLEdit.js
@@ -0,0 +1,330 @@
+/**
+ * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
+ * @licstart
+ * The JavaScript code in this page is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU Affero General Public License
+ * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.  The code is distributed
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
+ *
+ * As additional permission under GNU AGPL version 3 section 7, you
+ * may distribute non-source (e.g., minimized or compacted) forms of
+ * that code without the copy of the GNU GPL normally required by
+ * section 4, provided you include this license notice and a URL
+ * through which recipients can access the Corresponding Source.
+ *
+ * As a special exception to the AGPL, any HTML file which merely makes function
+ * calls to this code, and for that purpose includes it by reference shall be
+ * deemed a separate work for copyright law purposes. In addition, the copyright
+ * holders of this code give you permission to combine this code with free
+ * software libraries that are released under the GNU LGPL. You may copy and
+ * distribute such a system following the terms of the GNU AGPL for this code
+ * and the LGPL for the libraries. If you modify this code, you may extend this
+ * exception to your version of the code, but you are not obligated to do so.
+ * If you do not wish to do so, delete this exception statement from your
+ * version.
+ *
+ * This license applies to this entire compilation.
+ * @licend
+ * @source: http://www.webodf.org/
+ * @source: http://gitorious.org/odfkit/webodf/
+ */
+/*global runtime: true, core: true, gui: true*/
+runtime.loadClass("core.PointWalker");
+runtime.loadClass("core.Cursor");
+//runtime.loadClass("gui.Caret");
+/**
+ * @constructor
+ */
+gui.XMLEdit = function XMLEdit(element, stylesheet) {
+    "use strict";
+    var simplecss,
+        cssprefix,
+        documentElement,
+        customNS = "customns",
+        walker = null;
+
+    if (!element.id) {
+        element.id = "xml" + String(Math.random()).substring(2);
+    }
+//    element.contentEditable = true;
+    cssprefix = "#" + element.id + " ";
+
+    function installHandlers() {
+    }
+
+    // generic css for doing xml formatting: color tags and do indentation
+    simplecss = cssprefix + "*," + cssprefix + ":visited, " + cssprefix + ":link {display:block; margin: 0px; margin-left: 10px; font-size: medium; color: black; background: white; font-variant: normal; font-weight: normal; font-style: normal; font-family: sans-serif; text-decoration: none; white-space: pre-wrap; height: auto; width: auto}\n" +
+        cssprefix + ":before {color: blue; content: '<' attr(customns_name) attr(customns_atts) '>';}\n" +
+        cssprefix + ":after {color: blue; content: '</' attr(customns_name) '>';}\n" +
+        cssprefix + "{overflow: auto;}\n";
+
+    function listenEvent(eventTarget, eventType, eventHandler) {
+        if (eventTarget.addEventListener) {
+            eventTarget.addEventListener(eventType, eventHandler, false);
+        } else if (eventTarget.attachEvent) {
+            eventType = "on" + eventType;
+            eventTarget.attachEvent(eventType, eventHandler);
+        } else {
+            eventTarget["on" + eventType] = eventHandler;
+        }
+    }
+    function cancelEvent(event) {
+        if (event.preventDefault) {
+            event.preventDefault();
+        } else {
+            event.returnValue = false;
+        }
+    }
+
+    function isCaretMoveCommand(charCode) {
+        if (charCode >= 16 && charCode <= 20) {
+            return true;
+        }
+        if (charCode >= 33 && charCode <= 40) { //arrows,home,end,pgup,pgdown
+            return true;
+        }
+        return false;
+    }
+
+    function syncSelectionWithWalker() {
+        var sel = element.ownerDocument.defaultView.getSelection(),
+            r;
+        if (!sel || sel.rangeCount <= 0 || !walker) {
+            return;
+        }
+        r = sel.getRangeAt(0);
+        walker.setPoint(r.startContainer, r.startOffset);
+    }
+
+    function syncWalkerWithSelection() {
+        var sel = element.ownerDocument.defaultView.getSelection(),
+            n, r;
+        sel.removeAllRanges();
+        if (!walker || !walker.node()) {
+            return;
+        }
+        n = walker.node();
+        r = n.ownerDocument.createRange();
+        r.setStart(n, walker.position());
+        r.collapse(true);
+        sel.addRange(r);
+    }
+
+    function handleKeyDown(event) {
+        var charCode = event.charCode || event.keyCode;
+        // cursor movement
+        walker = null;
+        if (walker && charCode === 39) { // right arrow
+            syncSelectionWithWalker();
+            walker.stepForward();
+            syncWalkerWithSelection();
+        } else if (walker && charCode === 37) { //left arrow
+            syncSelectionWithWalker();
+            walker.stepBackward();
+            syncWalkerWithSelection();
+        } else if (isCaretMoveCommand(charCode)) {
+            return;
+        }
+        cancelEvent(event);
+    }
+
+    function handleKeyPress(event) {
+//        handleKeyDown(event);
+    }
+
+    function handleClick(event) {
+//        alert(event.target.nodeName);
+        var sel = element.ownerDocument.defaultView.getSelection(),
+            r = sel.getRangeAt(0),
+            n = r.startContainer;
+        // if cursor is in customns node, move up to the top one
+        /*
+        if (n.parentNode.namespaceURI === customNS) {
+            while (n.parentNode.namespaceURI === customNS) {
+                n = n.parentNode;
+            }
+            r = n.ownerDocument.createRange();
+            r.setStart(n.nextSibling, 0);
+            r.collapse(true);
+            sel.removeAllRanges();
+            sel.addRange(r);
+        }
+*/
+/*
+            r = element.ownerDocument.createRange();
+            r.setStart(event.target.nodeName, 0);
+            r.collapse(true);
+            sel.removeAllRanges();
+            sel.addRange(r);
+*/
+//alert(sel.getRangeAt(0).startContainer.nodeName + " " + sel.getRangeAt(0).startOffset);
+
+        cancelEvent(event);
+    }
+
+    function initElement(element) {
+        listenEvent(element, "click", handleClick);
+        listenEvent(element, "keydown", handleKeyDown);
+        listenEvent(element, "keypress", handleKeyPress);
+        //listenEvent(element, "mouseup", handleMouseUp);
+        // ignore drop events, dragstart, drag, dragenter, dragover are ok for now
+        listenEvent(element, "drop", cancelEvent);
+        listenEvent(element, "dragend", cancelEvent);
+        // pasting is also disallowed for now
+        listenEvent(element, "beforepaste", cancelEvent);
+        listenEvent(element, "paste", cancelEvent);
+    }
+
+    // remove all textnodes that contain only whitespace
+    function cleanWhitespace(node) {
+        var n = node.firstChild, p,
+            re = /^\s*$/;
+        while (n && n !== node) {
+            p = n;
+            n = n.nextSibling || n.parentNode;
+            if (p.nodeType === 3 && re.test(p.nodeValue)) {
+                p.parentNode.removeChild(p);
+            }
+        }
+    }
+    /**
+     * @param {!Node} node
+     * @return {undefined}
+     */
+    function setCssHelperAttributes(node) {
+        var atts, attsv, a, i;
+        // write all attributes in a string that is shown via the css
+        atts = node.attributes;
+        attsv = "";
+        for (i = atts.length - 1; i >= 0; i -= 1) {
+            a = atts.item(i);
+            attsv = attsv + " " + a.nodeName + "=\"" + a.nodeValue + "\"";
+        }
+        node.setAttribute("customns_name", node.nodeName);
+        node.setAttribute("customns_atts", attsv);
+    }
+    /**
+     * @param {!Node} node
+     * @return {undefined}
+     */
+    function addExplicitAttributes(node) {
+        var n = node.firstChild;
+        // recurse over the dom
+        while (n && n !== node) {
+            if (n.nodeType === 1) {
+                addExplicitAttributes(n);
+            }
+            n = n.nextSibling || n.parentNode;
+        }
+        setCssHelperAttributes(node);
+        cleanWhitespace(node);
+    }
+
+    function getNamespacePrefixes(node, prefixes) {
+        var n = node.firstChild, atts, att, i;
+        while (n && n !== node) {
+            if (n.nodeType === 1) {
+                getNamespacePrefixes(n, prefixes);
+                atts = n.attributes;
+                for (i = atts.length - 1; i >= 0; i -= 1) {
+                    att = atts.item(i);
+                    // record the prefix that the document uses for namespaces
+                    if (att.namespaceURI === "http://www.w3.org/2000/xmlns/") {
+                        if (!prefixes[att.nodeValue]) {
+                            prefixes[att.nodeValue] = att.localName;
+                        }
+                    }
+                }
+            }
+            n = n.nextSibling || n.parentNode;
+        }
+    }
+
+    /**
+     * Give each namespace a unique prefix.
+     * @param {Object.<?string,?string>} prefixes Map with namespace as key and
+     *                                          prefix as value
+     * @return {undefined}
+     */
+    function generateUniquePrefixes(prefixes) {
+        var taken = {},
+            ns, p, n = 0;
+        for (ns in prefixes) {
+            if (prefixes.hasOwnProperty(ns) && ns) {
+                p = prefixes[ns];
+                if (!p || taken.hasOwnProperty(p) || p === "xmlns") {
+                    do {
+                        p = "ns" + n;
+                        n += 1;
+                    } while (taken.hasOwnProperty(p));
+                    prefixes[ns] = p;
+                }
+                taken[p] = true;
+            }
+        }
+    }
+
+    // the CSS neededed for the XML edit view depends on the prefixes
+    function createCssFromXmlInstance(node) {
+        // collect all prefixes and elements
+        var prefixes = {},    // namespace prefixes as they occur in the XML
+            css = "@namespace customns url(customns);\n",
+            name, pre, ns, names, csssel;
+        getNamespacePrefixes(node, prefixes);
+        generateUniquePrefixes(prefixes);
+/*
+        for (ns in prefixes) {
+            if (ns) {
+                css = css + "@namepace " + prefixes[ns] + " url(" + ns + ");\n";
+            }
+        }
+        for (ns in prefixes) {
+            if (ns) {
+                pre = cssprefix + prefixes[ns] + "|";
+                css = css + pre + ":before { content: '<" + prefixes[ns] +
+                        ":' attr(customns_name); }\n" +
+                        pre + ":after { content: '</" + prefixes[ns] +
+                        ":' attr(customns_name) '>'; }\n";
+            }
+        }
+*/
+        return css;
+    }
+
+    // Adapt the CSS to the current settings.
+    function updateCSS() {
+        var css = element.ownerDocument.createElement("style"),
+            text = createCssFromXmlInstance(element);
+        css.type = "text/css";
+        text = text + simplecss;
+        css.appendChild(element.ownerDocument.createTextNode(text));
+        stylesheet = stylesheet.parentNode.replaceChild(css, stylesheet);
+    }
+    function getXML() {
+        return documentElement;
+    }
+    function setXML(xml) {
+        var node = xml.documentElement || xml;
+        node = element.ownerDocument.importNode(node, true);
+        documentElement = node;
+
+        addExplicitAttributes(node);
+
+        while (element.lastChild) {
+            element.removeChild(element.lastChild);
+        }
+        element.appendChild(node);
+
+        updateCSS();
+
+        walker = new core.PointWalker(node);
+    }
+
+    initElement(element);
+
+    this.updateCSS = updateCSS;
+    this.setXML = setXML;
+    this.getXML = getXML;
+};
diff --git a/apps/files_odfviewer/src/webodf/webodf/lib/manifest.js b/apps/files_odfviewer/src/webodf/webodf/lib/manifest.js
new file mode 100644
index 0000000000..1a185b85b9
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/lib/manifest.js
@@ -0,0 +1,34 @@
+(function () {
+    "use strict";
+    return [
+        "core/Async.js",
+        "core/Base64.js",
+        "core/ByteArray.js",
+        "core/ByteArrayWriter.js",
+        "core/Cursor.js",
+        "core/JSLint.js",
+        "core/PointWalker.js",
+        "core/RawDeflate.js",
+        "core/RawInflate.js",
+        "core/UnitTester.js",
+        "core/Zip.js",
+        "gui/Caret.js",
+        "gui/SelectionMover.js",
+        "gui/XMLEdit.js",
+        "gui/PresenterUI.js",
+        "odf/FontLoader.js",
+        "odf/Formatting.js",
+        "odf/OdfCanvas.js",
+        "odf/OdfContainer.js",
+        "odf/Style2CSS.js",
+        "odf/StyleInfo.js",
+        "xmldom/LSSerializer.js",
+        "xmldom/LSSerializerFilter.js",
+        "xmldom/OperationalTransformDOM.js",
+        "xmldom/OperationalTransformInterface.js",
+        "xmldom/RelaxNG.js",
+        "xmldom/RelaxNG2.js",
+        "xmldom/RelaxNGParser.js",
+        "xmldom/XPath.js"
+    ];
+}());
diff --git a/apps/files_odfviewer/src/webodf/webodf/lib/odf/FontLoader.js b/apps/files_odfviewer/src/webodf/webodf/lib/odf/FontLoader.js
new file mode 100644
index 0000000000..f6d51f666a
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/lib/odf/FontLoader.js
@@ -0,0 +1,135 @@
+/**
+ * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
+ * @licstart
+ * The JavaScript code in this page is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU Affero General Public License
+ * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.  The code is distributed
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
+ *
+ * As additional permission under GNU AGPL version 3 section 7, you
+ * may distribute non-source (e.g., minimized or compacted) forms of
+ * that code without the copy of the GNU GPL normally required by
+ * section 4, provided you include this license notice and a URL
+ * through which recipients can access the Corresponding Source.
+ *
+ * As a special exception to the AGPL, any HTML file which merely makes function
+ * calls to this code, and for that purpose includes it by reference shall be
+ * deemed a separate work for copyright law purposes. In addition, the copyright
+ * holders of this code give you permission to combine this code with free
+ * software libraries that are released under the GNU LGPL. You may copy and
+ * distribute such a system following the terms of the GNU AGPL for this code
+ * and the LGPL for the libraries. If you modify this code, you may extend this
+ * exception to your version of the code, but you are not obligated to do so.
+ * If you do not wish to do so, delete this exception statement from your
+ * version.
+ *
+ * This license applies to this entire compilation.
+ * @licend
+ * @source: http://www.webodf.org/
+ * @source: http://gitorious.org/odfkit/webodf/
+ */
+/*jslint sub: true*/
+/*global runtime, odf, core, document, xmldom*/
+runtime.loadClass("core.Base64");
+runtime.loadClass("xmldom.XPath");
+runtime.loadClass("odf.Style2CSS");
+/**
+ * This class loads embedded fonts into the CSS 
+ * @constructor
+ **/
+odf.FontLoader = (function () {
+    "use strict";
+    var style2CSS = new odf.Style2CSS(),
+        xpath = new xmldom.XPath(),
+        base64 = new core.Base64();
+    /**
+     * @param {!Element} fontFaceDecls
+     * @return {!Object.<string,Object>}
+     */
+    function getEmbeddedFontDeclarations(fontFaceDecls) {
+        var decls = {},
+            fonts,
+            i, font, name, uris, href;
+        if (!fontFaceDecls) {
+            return decls;
+        }
+        fonts = xpath.getODFElementsWithXPath(fontFaceDecls,
+                    "style:font-face[svg:font-face-src]",
+                    style2CSS.namespaceResolver);
+        for (i = 0; i < fonts.length; i += 1) {
+            font = fonts[i];
+            name = font.getAttributeNS(style2CSS.namespaces["style"], "name");
+            uris = xpath.getODFElementsWithXPath(font,
+                "svg:font-face-src/svg:font-face-uri",
+                style2CSS.namespaceResolver);
+            if (uris.length > 0) {
+                href = uris[0].getAttributeNS(style2CSS.namespaces["xlink"],
+                        "href");
+                decls[name] = {href: href};
+            }
+        }
+        return decls;
+    }
+    function addFontToCSS(name, font, fontdata, stylesheet) {
+        // hack: get the first stylesheet
+        stylesheet = document.styleSheets[0];
+        var rule = "@font-face { font-family: \"" + name + "\"; src: " +
+            "url(data:application/x-font-ttf;charset=binary;base64," +
+            base64.convertUTF8ArrayToBase64(fontdata) +
+            ") format(\"truetype\"); }";
+        try {
+            stylesheet.insertRule(rule, stylesheet.cssRules.length);
+        } catch (e) {
+            runtime.log("Problem inserting rule in CSS: " + rule);
+        }
+    }
+    function loadFontIntoCSS(embeddedFontDeclarations, zip, pos, stylesheet,
+            callback) {
+        var name, i = 0, n;
+        for (n in embeddedFontDeclarations) {
+            if (embeddedFontDeclarations.hasOwnProperty(n)) {
+                if (i === pos) {
+                    name = n;
+                }
+                i += 1;
+            }
+        }
+        if (!name) {
+            return callback();
+        }
+        zip.load(embeddedFontDeclarations[name].href, function (err, fontdata) {
+            if (err) {
+                runtime.log(err);
+            } else {
+                addFontToCSS(name, embeddedFontDeclarations[name], fontdata,
+                    stylesheet);
+            }
+            return loadFontIntoCSS(embeddedFontDeclarations, zip, pos + 1,
+                    stylesheet, callback);
+        });
+    }
+    function loadFontsIntoCSS(embeddedFontDeclarations, zip, stylesheet) {
+        loadFontIntoCSS(embeddedFontDeclarations, zip, 0, stylesheet,
+            function () {});
+    }
+    /**
+     * @constructor
+     */
+    odf.FontLoader = function FontLoader() {
+        var self = this;
+        /**
+         * @param {!Element} fontFaceDecls
+         * @param {!core.Zip} zip
+         * @param {!StyleSheet} stylesheet
+         * @return {undefined}
+         */
+        this.loadFonts = function (fontFaceDecls, zip, stylesheet) {
+            var embeddedFontDeclarations = getEmbeddedFontDeclarations(
+                    fontFaceDecls);
+            loadFontsIntoCSS(embeddedFontDeclarations, zip, stylesheet);
+        };
+    };
+    return odf.FontLoader;
+}());
diff --git a/apps/files_odfviewer/src/webodf/webodf/lib/odf/Formatting.js b/apps/files_odfviewer/src/webodf/webodf/lib/odf/Formatting.js
new file mode 100644
index 0000000000..cf42fcc50a
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/lib/odf/Formatting.js
@@ -0,0 +1,153 @@
+/**
+ * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
+ * @licstart
+ * The JavaScript code in this page is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU Affero General Public License
+ * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.  The code is distributed
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
+ *
+ * As additional permission under GNU AGPL version 3 section 7, you
+ * may distribute non-source (e.g., minimized or compacted) forms of
+ * that code without the copy of the GNU GPL normally required by
+ * section 4, provided you include this license notice and a URL
+ * through which recipients can access the Corresponding Source.
+ *
+ * As a special exception to the AGPL, any HTML file which merely makes function
+ * calls to this code, and for that purpose includes it by reference shall be
+ * deemed a separate work for copyright law purposes. In addition, the copyright
+ * holders of this code give you permission to combine this code with free
+ * software libraries that are released under the GNU LGPL. You may copy and
+ * distribute such a system following the terms of the GNU AGPL for this code
+ * and the LGPL for the libraries. If you modify this code, you may extend this
+ * exception to your version of the code, but you are not obligated to do so.
+ * If you do not wish to do so, delete this exception statement from your
+ * version.
+ *
+ * This license applies to this entire compilation.
+ * @licend
+ * @source: http://www.webodf.org/
+ * @source: http://gitorious.org/odfkit/webodf/
+ */
+/*global odf: true, runtime: true*/
+/**
+ * @constructor
+ */
+odf.Formatting = function Formatting() {
+    "use strict";
+    var /**@type{odf.OdfContainer}*/ odfContainer,
+        /**@type{odf.StyleInfo}*/ styleInfo = new odf.StyleInfo();
+
+    /**
+     * Class that iterates over all elements that are part of the range.
+     * @constructor
+     * @param {!Range} range
+     * @return {undefined}
+     */
+    function RangeElementIterator(range) {
+        /**
+         * @param {Node} parent
+         * @param {!number} n
+         * @return {Node}
+         */
+        function getNthChild(parent, n) {
+            var c = parent && parent.firstChild;
+            while (c && n) {
+                c = c.nextSibling;
+                n -= 1;
+            }
+            return c;
+        }
+        var start = getNthChild(range.startContainer, range.startOffset),
+            end = getNthChild(range.endContainer, range.endOffset),
+            current = start;
+        /**
+         * @return {Element|null}
+         */
+        this.next = function () {
+            var c = current;
+            if (c === null) {
+                return c;
+            }
+            return null;
+        };
+    }
+
+    /**
+     * @param {!Element} element
+     * @return {Element}
+     */
+    function getParentStyle(element) {
+        var n = element.firstChild, e;
+        if (n.nodeType === 1) { // Element
+            e = /**@type{Element}*/(n);
+            return e;
+        }
+        return null;
+    }
+    /**
+     * @param {!Range} range
+     * @return {!Array.<!Element>}
+     */
+    function getParagraphStyles(range) {
+        var iter = new RangeElementIterator(range), e, styles = [];
+        e = iter.next();
+        while (e) {
+            if (styleInfo.canElementHaveStyle("paragraph", e)) {
+                styles.push(e);
+            }
+        }
+        return styles;
+    }
+
+    /**
+     * @param {!odf.OdfContainer} odfcontainer
+     * @return {undefined}
+     */
+    this.setOdfContainer = function (odfcontainer) {
+        odfContainer = odfcontainer;
+    };
+    /**
+     * Return true if all parts of the selection are bold.
+     * @param {!Array.<!Range>} selection
+     * @return {!boolean}
+     */
+    this.isCompletelyBold = function (selection) {
+        return false;
+    };
+    /**
+     * Get the alignment or undefined if no uniform alignment is found
+     * @param {!Array.<!Range>} selection
+     * @return {!string|undefined}
+     */
+    this.getAlignment = function (selection) {
+        var styles = this.getParagraphStyles(selection), i, l = styles.length;
+        return undefined;
+    };
+    /**
+     * Get the list of paragraph styles that covered by the current selection.
+     * @param {!Array.<!Range>} selection
+     * @return {!Array.<Element>}
+     */
+    this.getParagraphStyles = function (selection) {
+        var i, j, s, styles = [];
+        for (i = 0; i < selection.length; i += 0) {
+            s = getParagraphStyles(selection[i]);
+            for (j = 0; j < s.length; j += 1) {
+                if (styles.indexOf(s[j]) === -1) {
+                    styles.push(s[j]);
+                }
+            }
+        }
+        return styles;
+    };
+    /**
+     * Get the list of text styles that are covered by the current selection.
+     * @param {!Array.<!Range>} selection
+     * @return {!Array.<Element>}
+     */
+    this.getTextStyles = function (selection) {
+        return [];
+    };
+};
diff --git a/apps/files_odfviewer/src/webodf/webodf/lib/odf/OdfCanvas.js b/apps/files_odfviewer/src/webodf/webodf/lib/odf/OdfCanvas.js
new file mode 100644
index 0000000000..b8077f8093
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/lib/odf/OdfCanvas.js
@@ -0,0 +1,912 @@
+/**
+ * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
+ * @licstart
+ * The JavaScript code in this page is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU Affero General Public License
+ * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.  The code is distributed
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
+ *
+ * As additional permission under GNU AGPL version 3 section 7, you
+ * may distribute non-source (e.g., minimized or compacted) forms of
+ * that code without the copy of the GNU GPL normally required by
+ * section 4, provided you include this license notice and a URL
+ * through which recipients can access the Corresponding Source.
+ *
+ * As a special exception to the AGPL, any HTML file which merely makes function
+ * calls to this code, and for that purpose includes it by reference shall be
+ * deemed a separate work for copyright law purposes. In addition, the copyright
+ * holders of this code give you permission to combine this code with free
+ * software libraries that are released under the GNU LGPL. You may copy and
+ * distribute such a system following the terms of the GNU AGPL for this code
+ * and the LGPL for the libraries. If you modify this code, you may extend this
+ * exception to your version of the code, but you are not obligated to do so.
+ * If you do not wish to do so, delete this exception statement from your
+ * version.
+ *
+ * This license applies to this entire compilation.
+ * @licend
+ * @source: http://www.webodf.org/
+ * @source: http://gitorious.org/odfkit/webodf/
+ */
+/*jslint sub: true*/
+/*global runtime, odf, xmldom */
+runtime.loadClass("odf.OdfContainer");
+runtime.loadClass("odf.Formatting");
+runtime.loadClass("xmldom.XPath");
+/**
+ * This class manages a loaded ODF document that is shown in an element.
+ * It takes care of giving visual feedback on loading, ensures that the
+ * stylesheets are loaded.
+ * @constructor
+ * @param {!Element} element Put and ODF Canvas inside this element.
+ **/
+odf.OdfCanvas = (function () {
+    "use strict";
+    /**
+     * A loading queue where various tasks related to loading can be placed
+     * and will be run with 10 ms between them. This gives the ui a change to
+     * to update.
+     * @constructor
+     */
+    function LoadingQueue() {
+        var queue = [],
+            taskRunning = false;
+        /**
+         * @param {Function} task
+         * @return {undefined}
+         */
+        function run(task) {
+            taskRunning = true;
+            runtime.setTimeout(function () {
+                try {
+                    task();
+                } catch (e) {
+                    runtime.log(e);
+                }
+                taskRunning = false;
+                if (queue.length > 0) {
+                    run(queue.pop());
+                }
+            }, 10);
+        }
+        /**
+         * @return {undefined}
+         */
+        this.clearQueue = function () {
+            queue.length = 0;
+        };
+        /**
+         * @param {Function} loadingTask
+         * @return {undefined}
+         */
+        this.addToQueue = function (loadingTask) {
+            if (queue.length === 0 && !taskRunning) {
+                return run(loadingTask);
+            }
+            queue.push(loadingTask);
+        };
+    }
+    /**
+     * @constructor
+     * @param css
+     */
+    function PageSwitcher(css) {
+        var sheet = css.sheet,
+            position = 1;
+        function updateCSS() {
+            while (sheet.cssRules.length > 0) {
+                sheet.deleteRule(0);
+            }
+            sheet.insertRule('office|presentation draw|page {display:none;}', 0);
+            sheet.insertRule("office|presentation draw|page:nth-child(" +
+                position + ") {display:block;}", 1);
+        }
+        /**
+         * @return {undefined}
+         */
+        this.showNextPage = function () {
+            position += 1;
+            updateCSS();
+        };
+        /**
+         * @return {undefined}
+         */
+        this.showPreviousPage = function () {
+            if (position > 1) {
+                position -= 1;
+                updateCSS();
+            }
+        };
+        this.css = css;
+    }
+    /**
+     * Register event listener on DOM element.
+     * @param {!Element} eventTarget
+     * @param {!string} eventType
+     * @param {!Function} eventHandler
+     * @return {undefined}
+     */
+    function listenEvent(eventTarget, eventType, eventHandler) {
+        if (eventTarget.addEventListener) {
+            eventTarget.addEventListener(eventType, eventHandler, false);
+        } else if (eventTarget.attachEvent) {
+            eventType = "on" + eventType;
+            eventTarget.attachEvent(eventType, eventHandler);
+        } else {
+            eventTarget["on" + eventType] = eventHandler;
+        }
+    }
+    /**
+     * Class that listens to events and sends a signal if the selection changes.
+     * @constructor
+     * @param {!Element} element
+     */
+    function SelectionWatcher(element) {
+        var selection = [], count = 0, listeners = [];
+        /**
+         * @param {!Element} ancestor
+         * @param {Node} descendant
+         * @return {!boolean}
+         */
+        function isAncestorOf(ancestor, descendant) {
+            while (descendant) {
+                if (descendant === ancestor) {
+                    return true;
+                }
+                descendant = descendant.parentNode;
+            }
+            return false;
+        }
+        /**
+         * @param {!Element} element
+         * @param {!Range} range
+         * @return {!boolean}
+         */
+        function fallsWithin(element, range) {
+            return isAncestorOf(element, range.startContainer) &&
+                isAncestorOf(element, range.endContainer);
+        }
+        /**
+         * @return {!Array.<!Range>}
+         */
+        function getCurrentSelection() {
+            var s = [], selection = runtime.getWindow().getSelection(), i, r;
+            for (i = 0; i < selection.rangeCount; i += 1) {
+                r = selection.getRangeAt(i);
+                // check if the nodes in the range fall completely within the
+                // element
+                if (r !== null && fallsWithin(element, r)) {
+                    s.push(r);
+                }
+            }
+            return s;
+        }
+        /**
+         * @param {Range} rangeA
+         * @param {Range} rangeB
+         * @return {!boolean}
+         */
+        function rangesNotEqual(rangeA, rangeB) {
+            if (rangeA === rangeB) {
+                return false;
+            }
+            if (rangeA === null || rangeB === null) {
+                return true;
+            }
+            return rangeA.startContainer !== rangeB.startContainer ||
+                   rangeA.startOffset !== rangeB.startOffset ||
+                   rangeA.endContainer !== rangeB.endContainer ||
+                   rangeA.endOffset !== rangeB.endOffset;
+        }
+        /**
+         * @return {undefined}
+         */
+        function emitNewSelection() {
+            var i, l = listeners.length;
+            for (i = 0; i < l; i += 1) {
+                listeners[i](element, selection);
+            }
+        }
+        /**
+         * @param {!Array.<!Range>} selection
+         * @return {!Array.<!Range>}
+         */
+        function copySelection(selection) {
+            var s = [selection.length], i, oldr, r,
+                doc = element.ownerDocument;
+            for (i = 0; i < selection.length; i += 1) {
+                oldr = selection[i];
+                r = doc.createRange();
+                r.setStart(oldr.startContainer, oldr.startOffset);
+                r.setEnd(oldr.endContainer, oldr.endOffset);
+                s[i] = r;
+            }
+            return s;
+        }
+        /**
+         * @return {undefined}
+         */
+        function checkSelection() {
+            var s = getCurrentSelection(), i;
+            if (s.length === selection.length) {
+                for (i = 0; i < s.length; i += 1) {
+                    if (rangesNotEqual(s[i], selection[i])) {
+                        break;
+                    }
+                }
+                if (i === s.length) {
+                    return; // no change
+                }
+            }
+            selection = s;
+            selection = copySelection(s);
+            emitNewSelection();
+        }
+        /**
+         * @param {!string} eventName
+         * @param {!function(!Element, !Array.<!Range>)} handler
+         * @return {undefined}
+         */
+        this.addListener = function (eventName, handler) {
+            var i, l = listeners.length;
+            for (i = 0; i < l; i += 1) {
+                if (listeners[i] === handler) {
+                    return;
+                }
+            }
+            listeners.push(handler);
+        };
+        listenEvent(element, "mouseup", checkSelection);
+        listenEvent(element, "keyup", checkSelection);
+        listenEvent(element, "keydown", checkSelection);
+    }
+    var style2CSS = new odf.Style2CSS(),
+        namespaces = style2CSS.namespaces,
+        drawns  = namespaces.draw,
+        fons    = namespaces.fo,
+        officens = namespaces.office,
+        svgns   = namespaces.svg,
+        textns  = namespaces.text,
+        xlinkns = namespaces.xlink,
+        window = runtime.getWindow(),
+        xpath = new xmldom.XPath(),
+        /**@const@type{!Object.<!string,!Array.<!Function>>}*/
+        eventHandlers = {},
+        editparagraph,
+        loadingQueue = new LoadingQueue();
+
+    /**
+     * Register an event handler
+     * @param {!string} eventType
+     * @param {!Function} eventHandler
+     * @return {undefined}
+     */
+    function addEventListener(eventType, eventHandler) {
+        var handlers = eventHandlers[eventType];
+        if (handlers === undefined) {
+            handlers = eventHandlers[eventType] = [];
+        }
+        if (eventHandler && handlers.indexOf(eventHandler) === -1) {
+            handlers.push(eventHandler);
+        }
+    }
+    /**
+     * Fire an event
+     * @param {!string} eventType
+     * @param {Array.<Object>=} args
+     * @return {undefined}
+     */
+    function fireEvent(eventType, args) {
+        if (!eventHandlers.hasOwnProperty(eventType)) {
+            return;
+        }
+        var handlers = eventHandlers[eventType], i;
+        for (i = 0; i < handlers.length; i += 1) {
+            handlers[i](args);
+        }
+    }
+    /**
+     * @param {!Element} element
+     * @return {undefined}
+     */
+    function clear(element) {
+        while (element.firstChild) {
+            element.removeChild(element.firstChild);
+        }
+    }
+    /**
+     * A new styles.xml has been loaded. Update the live document with it.
+     * @param {!Element} odfelement
+     * @param {!HTMLStyleElement} stylesxmlcss
+     * @return {undefined}
+     **/
+    function handleStyles(odfelement, stylesxmlcss) {
+        // update the css translation of the styles
+        var style2css = new odf.Style2CSS();
+        style2css.style2css(stylesxmlcss.sheet, odfelement.styles,
+                    odfelement.automaticStyles);
+    }
+    /**
+     * @param {!string} id
+     * @param {!Element} frame
+     * @param {!StyleSheet} stylesheet
+     * @return {undefined}
+     **/
+    function setFramePosition(id, frame, stylesheet) {
+        frame.setAttribute('styleid', id);
+        var rule,
+            anchor = frame.getAttributeNS(textns, 'anchor-type'),
+            x = frame.getAttributeNS(svgns, 'x'),
+            y = frame.getAttributeNS(svgns, 'y'),
+            width = frame.getAttributeNS(svgns, 'width'),
+            height = frame.getAttributeNS(svgns, 'height'),
+            minheight = frame.getAttributeNS(fons, 'min-height'),
+            minwidth = frame.getAttributeNS(fons, 'min-width');
+        if (anchor === "as-char") {
+            rule = 'display: inline-block;';
+        } else if (anchor || x || y) {
+            rule = 'position: absolute;';
+        } else if (width || height || minheight || minwidth) {
+            rule = 'display: block;';
+        }
+        if (x) {
+            rule += 'left: ' + x + ';';
+        }
+        if (y) {
+            rule += 'top: ' + y + ';';
+        }
+        if (width) {
+            rule += 'width: ' + width + ';';
+        }
+        if (height) {
+            rule += 'height: ' + height + ';';
+        }
+        if (minheight) {
+            rule += 'min-height: ' + minheight + ';';
+        }
+        if (minwidth) {
+            rule += 'min-width: ' + minwidth + ';';
+        }
+        if (rule) {
+            rule = 'draw|' + frame.localName + '[styleid="' + id + '"] {' +
+                rule + '}';
+            stylesheet.insertRule(rule, stylesheet.cssRules.length);
+        }
+    }
+    /**
+     * @param {!Element} image
+     * @return {string}
+     **/
+    function getUrlFromBinaryDataElement(image) {
+        var node = image.firstChild;
+        while (node) {
+            if (node.namespaceURI === officens &&
+                    node.localName === "binary-data") {
+                // TODO: detect mime-type, assuming png for now
+                return "data:image/png;base64," + node.textContent;
+            }
+            node = node.nextSibling;
+        }
+        return "";
+    }
+    /**
+     * @param {!string} id
+     * @param {!Object} container
+     * @param {!Element} image
+     * @param {!StyleSheet} stylesheet
+     * @return {undefined}
+     **/
+    function setImage(id, container, image, stylesheet) {
+        image.setAttribute('styleid', id);
+        var url = image.getAttributeNS(xlinkns, 'href'),
+            part,
+            node;
+        function callback(url) {
+            var rule = "background-image: url(" + url + ");";
+            rule = 'draw|image[styleid="' + id + '"] {' + rule + '}';
+            stylesheet.insertRule(rule, stylesheet.cssRules.length);
+        }
+        // look for a office:binary-data
+        if (url) {
+            try {
+                if (container.getPartUrl) {
+                    url = container.getPartUrl(url);
+                    callback(url);
+                } else {
+                    part = container.getPart(url);
+                    part.onchange = function (part) {
+                        callback(part.url);
+                    };
+                    part.load();
+                }
+            } catch (e) {
+                runtime.log('slight problem: ' + e);
+            }
+        } else {
+            url = getUrlFromBinaryDataElement(image);
+            callback(url);
+        }
+    }
+    function formatParagraphAnchors(odfbody) {
+        var runtimens = "urn:webodf",
+            n,
+            i,
+            nodes = xpath.getODFElementsWithXPath(odfbody,
+                ".//*[*[@text:anchor-type='paragraph']]",
+                style2CSS.namespaceResolver);
+        for (i = 0; i < nodes.length; i += 1) {
+            n = nodes[i];
+            if (n.setAttributeNS) {
+                n.setAttributeNS(runtimens, "containsparagraphanchor", true);
+            }
+        }
+    }
+    /**
+     * @param {!Object} container
+     * @param {!Element} odfbody
+     * @param {!StyleSheet} stylesheet
+     * @return {undefined}
+     **/
+    function modifyImages(container, odfbody, stylesheet) {
+        var node,
+            frames,
+            i,
+            images;
+        function namespaceResolver(prefix) {
+            return namespaces[prefix];
+        }
+        // find all the frame elements
+        frames = [];
+        node = odfbody.firstChild;
+        while (node && node !== odfbody) {
+            if (node.namespaceURI === drawns) {
+                frames[frames.length] = node;
+            }
+            if (node.firstChild) {
+                node = node.firstChild;
+            } else {
+                while (node && node !== odfbody && !node.nextSibling) {
+                    node = node.parentNode;
+                }
+                if (node && node.nextSibling) {
+                    node = node.nextSibling;
+                }
+            }
+        }
+        // adjust all the frame positions
+        for (i = 0; i < frames.length; i += 1) {
+            node = frames[i];
+            setFramePosition('frame' + String(i), node, stylesheet);
+        }
+        formatParagraphAnchors(odfbody);
+    }
+    /**
+     * Load all the images that are inside an odf element.
+     * @param {!Object} container
+     * @param {!Element} odffragment
+     * @param {!StyleSheet} stylesheet
+     * @return {undefined}
+     */
+    function loadImages(container, odffragment, stylesheet) {
+        var i,
+            images,
+            node;
+        // do delayed loading for all the images
+        function loadImage(name, container, node, stylesheet) {
+            // load image with a small delay to give the html ui a chance to
+            // update
+            loadingQueue.addToQueue(function () {
+                setImage(name, container, node, stylesheet);
+            });
+        }
+        images = odffragment.getElementsByTagNameNS(drawns, 'image');
+        for (i = 0; i < images.length; i += 1) {
+            node = /**@type{!Element}*/(images.item(i));
+            loadImage('image' + String(i), container, node, stylesheet);
+        }
+    }
+	/**
+     * @param {!string} id
+     * @param {!Object} container
+     * @param {!Element} plugin
+     * @param {!StyleSheet} stylesheet
+     * @return {undefined}
+     **/
+    function setVideo(id, container, plugin, stylesheet) {
+        var video, source, url, videoType, doc = plugin.ownerDocument, part, node;
+
+        url = plugin.getAttributeNS(xlinkns, 'href');
+
+        function callback(url, mimetype) {
+            // test for video mimetypes
+            if (mimetype.substr(0, 6) === 'video/') {
+                video = doc.createElementNS(doc.documentElement.namespaceURI, "video");
+                video.setAttribute('controls', 'controls');
+
+                source = doc.createElement('source');
+                source.setAttribute('src', url);
+                source.setAttribute('type', mimetype);
+
+                video.appendChild(source);
+                plugin.parentNode.appendChild(video);
+            } else {
+                plugin.innerHtml = 'Unrecognised Plugin';
+            }
+        }
+        // look for a office:binary-data
+        if (url) {
+            try {
+                if (container.getPartUrl) {
+                    url = container.getPartUrl(url);
+                    callback(url, 'video/mp4');
+                } else {
+                    part = container.getPart(url);
+                    part.onchange = function (part) {
+                        callback(part.url, part.mimetype);
+                    };
+                    part.load();
+                }
+            } catch (e) {
+                runtime.log('slight problem: ' + e);
+            }
+        } else {
+        // this will fail  atm - following function assumes PNG data]
+            runtime.log('using MP4 data fallback');
+            url = getUrlFromBinaryDataElement(plugin);
+            callback(url, 'video/mp4');
+        }
+    }
+    /**
+     * Load all the video that are inside an odf element.
+     * @param {!Object} container
+     * @param {!Element} odffragment
+     * @param {!StyleSheet} stylesheet
+     * @return {undefined}
+     */
+    function loadVideos(container, odffragment, stylesheet) {
+        var i,
+            plugins,
+            node;
+        // do delayed loading for all the videos
+        function loadVideo(name, container, node, stylesheet) {
+            // load video with a small delay to give the html ui a chance to
+            // update
+            loadingQueue.addToQueue(function () {
+                setVideo(name, container, node, stylesheet);
+            });
+        }
+        // embedded video is stored in a draw:plugin element
+        plugins = odffragment.getElementsByTagNameNS(drawns, 'plugin');
+        runtime.log('Loading Videos:');
+        
+        for (i = 0; i < plugins.length; i += 1) {
+            runtime.log('...Found a video.');
+            node = /**@type{!Element}*/(plugins.item(i));
+            loadVideo('video' + String(i), container, node, stylesheet);
+        }
+    }
+    /**
+     * @param {Document} document Put and ODF Canvas inside this element.
+     */
+    function addStyleSheet(document) {
+        var styles = document.getElementsByTagName("style"),
+            head = document.getElementsByTagName('head')[0],
+            text = '',
+            prefix,
+            a = "",
+            b;
+        // use cloneNode on an exisiting HTMLStyleElement, because in
+        // Chromium 12, document.createElement('style') does not give a
+        // HTMLStyleElement
+        if (styles && styles.length > 0) {
+            styles = styles[0].cloneNode(false);
+        } else {
+            styles = document.createElement('style');
+        }
+        for (prefix in namespaces) {
+            if (namespaces.hasOwnProperty(prefix) && prefix) {
+                text += "@namespace " + prefix + " url(" + namespaces[prefix] +
+                        ");\n";
+            }
+        }
+        styles.appendChild(document.createTextNode(text));
+        head.appendChild(styles);
+        return styles;
+    }
+    /**
+     * @constructor
+     * @param {!Element} element Put and ODF Canvas inside this element.
+     */
+    odf.OdfCanvas = function OdfCanvas(element) {
+        var self = this,
+            document = element.ownerDocument,
+            /**@type{odf.OdfContainer}*/ odfcontainer,
+            /**@type{!odf.Formatting}*/ formatting = new odf.Formatting(),
+            selectionWatcher = new SelectionWatcher(element),
+            slidecssindex = 0,
+            pageSwitcher = new PageSwitcher(addStyleSheet(document)),
+            stylesxmlcss = addStyleSheet(document),
+            positioncss = addStyleSheet(document),
+            editable = false,
+            zoomLevel = 1;
+
+        function fixContainerSize() {
+            var sizer = element.firstChild,
+                odfdoc = sizer.firstChild;
+            if (!odfdoc) {
+                return;
+            }
+            element.style.WebkitTransform = 'scale(' + zoomLevel + ')';
+            element.style.WebkitTransformOrigin = 'left top';
+            element.style.width = Math.round(zoomLevel * odfdoc.offsetWidth)
+                + "px";
+            element.style.height = Math.round(zoomLevel * odfdoc.offsetHeight)
+                + "px";
+        }
+        /**
+         * A new content.xml has been loaded. Update the live document with it.
+         * @param {!Object} container
+         * @param {!Element} odfnode
+         * @return {undefined}
+         **/
+        function handleContent(container, odfnode) {
+            var css = positioncss.sheet, sizer;
+            modifyImages(container, odfnode.body, css);
+/*
+            slidecssindex = css.insertRule(
+                'office|presentation draw|page:nth-child(1n) {display:block;}',
+                css.cssRules.length
+            );
+*/
+            // FIXME: this is a hack to have a defined background now
+            // should be removed as soon as we have sane background
+            // handling for pages
+            css.insertRule('draw|page { background-color:#fff; }',
+                css.cssRules.length);
+
+            // only append the content at the end
+            clear(element);
+            sizer = document.createElement('div');
+            sizer.style.display = "inline-block";
+            sizer.style.background = "white";
+            sizer.appendChild(odfnode);
+            element.appendChild(sizer);
+            loadImages(container, odfnode.body, css);
+            loadVideos(container, odfnode.body, css);
+            fixContainerSize();
+        }
+        /**
+         * @param {!odf.OdfContainer} container
+         * @return {undefined}
+         **/
+        function refreshOdf(container) {
+            if (odfcontainer !== container) {
+                return;
+            }
+
+            // synchronize the object a window.odfcontainer with the view
+            function callback() {
+                clear(element);
+                element.style.display = "inline-block";
+                var odfnode = container.rootElement;
+                element.ownerDocument.importNode(odfnode, true);
+
+                formatting.setOdfContainer(container);
+                handleStyles(odfnode, stylesxmlcss);
+                // do content last, because otherwise the document is constantly
+                // updated whenever the css changes
+                handleContent(container, odfnode);
+                fireEvent("statereadychange");
+            }
+
+            if (odfcontainer.state === odf.OdfContainer.DONE) {
+                callback();
+            } else {
+                odfcontainer.onchange = callback;
+            }
+        }
+
+        this.odfContainer = function () {
+            return odfcontainer;
+        };
+        this.slidevisibilitycss = function () {
+            return pageSwitcher.css;
+        };
+        /**
+         * @param {!string} url
+         * @return {undefined}
+         */
+        this["load"] = this.load = function (url) {
+            loadingQueue.clearQueue();
+            element.innerHTML = 'loading ' + url;
+            // open the odf container
+            odfcontainer = new odf.OdfContainer(url, function (container) {
+                odfcontainer = container;
+                refreshOdf(container);
+            });
+            odfcontainer.onstatereadychange = refreshOdf;
+        };
+
+        function stopEditing() {
+            if (!editparagraph) {
+                return;
+            }
+            var fragment = editparagraph.ownerDocument.createDocumentFragment();
+            while (editparagraph.firstChild) {
+                fragment.insertBefore(editparagraph.firstChild, null);
+            }
+            editparagraph.parentNode.replaceChild(fragment, editparagraph);
+        }
+
+        this.save = function (callback) {
+            stopEditing();
+            odfcontainer.save(callback);
+        };
+
+        function cancelPropagation(event) {
+            if (event.stopPropagation) {
+                event.stopPropagation();
+            } else {
+                event.cancelBubble = true;
+            }
+        }
+
+        function cancelEvent(event) {
+            if (event.preventDefault) {
+                event.preventDefault();
+                event.stopPropagation();
+            } else {
+                event.returnValue = false;
+                event.cancelBubble = true;
+            }
+        }
+
+        this.setEditable = function (iseditable) {
+            editable = iseditable;
+            if (!editable) {
+                stopEditing();
+            }
+        };
+
+        function processClick(evt) {
+            evt = evt || window.event;
+            // go up until we find a text:p, if we find it, wrap it in <p> and
+            // make that editable
+            var e = evt.target, selection = window.getSelection(),
+                range = ((selection.rangeCount > 0)
+                     ? selection.getRangeAt(0) : null),
+                startContainer = range && range.startContainer,
+                startOffset = range && range.startOffset,
+                endContainer = range && range.endContainer,
+                endOffset = range && range.endOffset;
+
+            while (e && !((e.localName === "p" || e.localName === "h") &&
+                    e.namespaceURI === textns)) {
+                e = e.parentNode;
+            }
+            if (!editable) {
+                return;
+            }
+            // test code for enabling editing
+            if (!e || e.parentNode === editparagraph) {
+                return;
+            }
+
+            if (!editparagraph) {
+                editparagraph = e.ownerDocument.createElement("p");
+                if (!editparagraph.style) {
+                    editparagraph = e.ownerDocument.createElementNS(
+                        "http://www.w3.org/1999/xhtml",
+                        "p"
+                    );
+                }
+                editparagraph.style.margin = "0px";
+                editparagraph.style.padding = "0px";
+                editparagraph.style.border = "0px";
+                editparagraph.setAttribute("contenteditable", true);
+            } else if (editparagraph.parentNode) {
+                stopEditing();
+            }
+            e.parentNode.replaceChild(editparagraph, e);
+            editparagraph.appendChild(e);
+
+            // set the cursor or selection at the right position
+            editparagraph.focus(); // needed in FF to show cursor in the paragraph
+            if (range) {
+                selection.removeAllRanges();
+                range = e.ownerDocument.createRange();
+                range.setStart(startContainer, startOffset);
+                range.setEnd(endContainer, endOffset);
+                selection.addRange(range);
+            }
+            cancelEvent(evt);
+        }
+
+        /**
+         * @param {!string} eventName
+         * @param {!function(*)} handler
+         * @return {undefined}
+         */
+        this.addListener = function (eventName, handler) {
+            if (eventName === "selectionchange") {
+                selectionWatcher.addListener(eventName, handler);
+            } else {
+                addEventListener(eventName, handler);
+            }
+        };
+        /**
+         * @return {!odf.Formatting}
+         */
+        this.getFormatting = function () {
+            return formatting;
+        };
+        /**
+         * @param {!number} zoom
+         * @return {undefined}
+         */
+        this.setZoomLevel = function (zoom) {
+            zoomLevel = zoom;
+            fixContainerSize();
+        };
+        /**
+         * @return {!number}
+         */
+        this.getZoomLevel = function () {
+            return zoomLevel;
+        };
+        /**
+         * @param {!number} width
+         * @param {!number} height
+         * @return {undefined}
+         */
+        this.fitToContainingElement = function (width, height) {
+            var realWidth = element.offsetWidth / zoomLevel,
+                realHeight = element.offsetHeight / zoomLevel;
+            zoomLevel = width / realWidth;
+            if (height / realHeight < zoomLevel) {
+                zoomLevel = height / realHeight;
+            }
+            fixContainerSize();
+        };
+        /**
+         * @param {!number} width
+         * @return {undefined}
+         */
+        this.fitToWidth = function (width) {
+            var realWidth = element.offsetWidth / zoomLevel;
+            zoomLevel = width / realWidth;
+            fixContainerSize();
+        };
+        /**
+         * @param {!number} height
+         * @return {undefined}
+         */
+        this.fitToHeight = function (height) {
+            var realHeight = element.offsetHeight / zoomLevel;
+            zoomLevel = height / realHeight;
+            fixContainerSize();
+        };
+        /**
+         * @return {undefined}
+         */
+        this.showNextPage = function () {
+            pageSwitcher.showNextPage();
+        };
+        /**
+         * @return {undefined}
+         */
+        this.showPreviousPage = function () {
+            pageSwitcher.showPreviousPage();
+        };
+        /**
+         * @return {undefined}
+         */
+        this.showAllPages = function () {
+        };
+
+        listenEvent(element, "click", processClick);
+    };
+    return odf.OdfCanvas;
+}());
diff --git a/apps/files_odfviewer/src/webodf/webodf/lib/odf/OdfContainer.js b/apps/files_odfviewer/src/webodf/webodf/lib/odf/OdfContainer.js
new file mode 100644
index 0000000000..709addbecd
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/lib/odf/OdfContainer.js
@@ -0,0 +1,672 @@
+/**
+ * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
+ * @licstart
+ * The JavaScript code in this page is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU Affero General Public License
+ * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.  The code is distributed
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
+ *
+ * As additional permission under GNU AGPL version 3 section 7, you
+ * may distribute non-source (e.g., minimized or compacted) forms of
+ * that code without the copy of the GNU GPL normally required by
+ * section 4, provided you include this license notice and a URL
+ * through which recipients can access the Corresponding Source.
+ *
+ * As a special exception to the AGPL, any HTML file which merely makes function
+ * calls to this code, and for that purpose includes it by reference shall be
+ * deemed a separate work for copyright law purposes. In addition, the copyright
+ * holders of this code give you permission to combine this code with free
+ * software libraries that are released under the GNU LGPL. You may copy and
+ * distribute such a system following the terms of the GNU AGPL for this code
+ * and the LGPL for the libraries. If you modify this code, you may extend this
+ * exception to your version of the code, but you are not obligated to do so.
+ * If you do not wish to do so, delete this exception statement from your
+ * version.
+ *
+ * This license applies to this entire compilation.
+ * @licend
+ * @source: http://www.webodf.org/
+ * @source: http://gitorious.org/odfkit/webodf/
+ */
+/*global runtime: true, core: true, xmldom: true, odf: true, DOMParser: true,
+  document: true */
+runtime.loadClass("core.Base64");
+runtime.loadClass("core.Zip");
+runtime.loadClass("xmldom.LSSerializer");
+runtime.loadClass("odf.StyleInfo");
+runtime.loadClass("odf.Style2CSS");
+runtime.loadClass("odf.FontLoader");
+/**
+ * The OdfContainer class manages the various parts that constitues an ODF
+ * document.
+ * @constructor
+ * @param {!string} url
+ * @param {!Function|null} onstatereadychange
+ **/
+odf.OdfContainer = (function () {
+    "use strict";
+    var styleInfo = new odf.StyleInfo(),
+        style2CSS = new odf.Style2CSS(),
+        namespaces = style2CSS.namespaces,
+        officens = "urn:oasis:names:tc:opendocument:xmlns:office:1.0",
+        manifestns = "urn:oasis:names:tc:opendocument:xmlns:manifest:1.0",
+        nodeorder = ['meta', 'settings', 'scripts', 'font-face-decls', 'styles',
+            'automatic-styles', 'master-styles', 'body'],
+        base64 = new core.Base64(),
+        fontLoader = new odf.FontLoader(),
+        partMimetypes = {};
+    /**
+     * @param {?Node} node
+     * @param {!string} ns
+     * @param {!string} name
+     * @return {?Node}
+     */
+    function getDirectChild(node, ns, name) {
+        node = (node) ? node.firstChild : null;
+        while (node) {
+            if (node.localName === name && node.namespaceURI === ns) {
+                return node;
+            }
+            node = node.nextSibling;
+        }
+        return null;
+    }
+    /**
+     * Return the position the node should get according to the ODF flat format.
+     * @param {!Node} child
+     * @return {!number}
+     */
+    function getNodePosition(child) {
+        var childpos = 0, i, l = nodeorder.length;
+        for (i = 0; i < l; i += 1) {
+            if (child.namespaceURI === officens &&
+                    child.localName === nodeorder[i]) {
+                return i;
+            }
+        }
+        return -1;
+    }
+    /**
+     * Class that filters runtime specific nodes from the DOM.
+     * @constructor
+     * @implements {xmldom.LSSerializerFilter}
+     * @param {!Element} odfroot
+     * @param {!Element=} usedStylesElement
+     */
+    function OdfNodeFilter(odfroot, usedStylesElement) {
+        var automaticStyles = odfroot.automaticStyles,
+            usedKeysList;
+        if (usedStylesElement) {
+            usedKeysList = new styleInfo.UsedKeysList(usedStylesElement);
+        }
+        /**
+         * @param {!Node} node
+         * @return {!number}
+         */
+        this.acceptNode = function (node) {
+            var styleName, styleFamily, result;
+            if (node.namespaceURI === "http://www.w3.org/1999/xhtml") {
+                result = 3; // FILTER_SKIP
+            } else if (usedKeysList && node.parentNode === automaticStyles &&
+                    node.nodeType === 1) {
+                if (usedKeysList.uses(node)) {
+                    result = 1; // FILTER_ACCEPT
+                } else {
+                    result = 2; // FILTER_REJECT
+                }
+            } else {
+                result = 1; // FILTER_ACCEPT
+            }
+            return result;
+        };
+    }
+    /**
+     * Put the element at the right position in the parent.
+     * The right order is given by the value returned from getNodePosition.
+     * @param {!Node} node
+     * @param {?Node} child
+     * @return {undefined}
+     */
+    function setChild(node, child) {
+        if (!child) {
+            return;
+        }
+        var childpos = getNodePosition(child),
+            pos,
+            c = node.firstChild;
+        if (childpos === -1) {
+            return;
+        }
+        while (c) {
+            pos = getNodePosition(c);
+            if (pos !== -1 && pos > childpos) {
+                break;
+            }
+            c = c.nextSibling;
+        }
+        node.insertBefore(child, c);
+    }
+    /**
+     * A DOM element that is part of and ODF part of a DOM.
+     * @constructor
+     * @extends {Element}
+     */
+    function ODFElement() {
+    }
+    /**
+     * The root element of an ODF document.
+     * @constructor
+     * @extends {ODFElement}
+     */
+    function ODFDocumentElement(odfcontainer) {
+        this.OdfContainer = odfcontainer;
+    }
+    ODFDocumentElement.prototype = new ODFElement();
+    ODFDocumentElement.prototype.constructor = ODFDocumentElement;
+    ODFDocumentElement.namespaceURI = officens;
+    ODFDocumentElement.localName = 'document';
+    // private constructor
+    /**
+     * @constructor
+     * @param {!string} name
+     * @param {!odf.OdfContainer} container
+     * @param {!core.Zip} zip
+     */
+    function OdfPart(name, container, zip) {
+        var self = this,
+            privatedata;
+
+        // declare public variables
+        this.size = 0;
+        this.type = null;
+        this.name = name;
+        this.container = container;
+        this.url = null;
+        this.mimetype = null;
+        this.document = null;
+        this.onreadystatechange = null;
+        this.onchange = null;
+        this.EMPTY = 0;
+        this.LOADING = 1;
+        this.DONE = 2;
+        this.state = this.EMPTY;
+
+        // private functions
+        // public functions
+        this.load = function () {
+            var mimetype = partMimetypes[name];
+            this.mimetype = mimetype;
+            zip.loadAsDataURL(name, mimetype, function (err, url) {
+                self.url = url;
+                if (self.onchange) {
+                    self.onchange(self);
+                }
+                if (self.onstatereadychange) {
+                    self.onstatereadychange(self);
+                }
+            });
+        };
+        this.abort = function () {
+            // TODO
+        };
+    }
+    OdfPart.prototype.load = function () {
+    };
+    OdfPart.prototype.getUrl = function () {
+        if (this.data) {
+            return 'data:;base64,' + base64.toBase64(this.data);
+        }
+        return null;
+    };
+    /**
+     * @constructor
+     * @param {!odf.OdfContainer} odfcontainer
+     */
+    function OdfPartList(odfcontainer) {
+        var self = this;
+        // declare public variables
+        this.length = 0;
+        this.item = function (index) {
+        };
+    }
+    /**
+     * @constructor
+     * @param {!string} url
+     * @param {!Function|null} onstatereadychange
+     */
+    odf.OdfContainer = function OdfContainer(url, onstatereadychange) {
+        var self = this,
+            zip = null,
+            contentXmlCompletelyLoaded = false;
+
+        // NOTE each instance of OdfContainer has a copy of the private functions
+        // it would be better to have a class OdfContainerPrivate where the
+        // private functions can be defined via OdfContainerPrivate.prototype
+        // without exposing them
+
+        // declare public variables
+        this.onstatereadychange = onstatereadychange;
+        this.onchange = null;
+        this.state = null;
+        this.rootElement = null;
+        this.parts = null;
+
+        /**
+         * @param {!Element} element
+         * @return {undefined}
+         */
+        function removeProcessingInstructions(element) {
+            var n = element.firstChild, next, e;
+            while (n) {
+                next = n.nextSibling;
+                if (n.nodeType === 1) { // ELEMENT
+                    e = /**@type{!Element}*/(n);
+                    removeProcessingInstructions(e);
+                } else if (n.nodeType === 7) { // PROCESSING_INSTRUCTION_NODE
+                    element.removeChild(n);
+                }
+                n = next;
+            }
+        }
+
+        // private functions
+        /**
+         * Import the document elementnode into the DOM of OdfContainer.
+         * Any processing instructions are removed, since importing them
+         * gives an exception.
+         * @param {!Document} xmldoc
+         * @return {!Node}
+         */
+        function importRootNode(xmldoc) {
+            var doc = self.rootElement.ownerDocument,
+                node;
+            // remove all processing instructions
+            // TODO: replace cursor processing instruction with an element
+            if (xmldoc) {
+                removeProcessingInstructions(xmldoc.documentElement);
+                try {
+                    node = doc.importNode(xmldoc.documentElement, true);
+                } catch (e) {
+                }
+            }
+            return node;
+        }
+        function setState(state) {
+            self.state = state;
+            if (self.onchange) {
+                self.onchange(self);
+            }
+            if (self.onstatereadychange) {
+                self.onstatereadychange(self);
+            }
+        }
+        /**
+         * @param {!Document} xmldoc
+         * @return {undefined}
+         */
+        function handleFlatXml(xmldoc) {
+            var root = importRootNode(xmldoc);
+            if (!root || root.localName !== 'document' ||
+                    root.namespaceURI !== officens) {
+                setState(OdfContainer.INVALID);
+                return;
+            }
+            self.rootElement = root;
+            root.fontFaceDecls = getDirectChild(root, officens, 'font-face-decls');
+            root.styles = getDirectChild(root, officens, 'styles');
+            root.automaticStyles = getDirectChild(root, officens,
+                    'automatic-styles');
+            root.masterStyles = getDirectChild(root, officens, 'master-styles');
+            root.body = getDirectChild(root, officens, 'body');
+            root.meta = getDirectChild(root, officens, 'meta');
+            setState(OdfContainer.DONE);
+        }
+        /**
+         * @param {!Document} xmldoc
+         * @return {undefined}
+         */
+        function handleStylesXml(xmldoc) {
+            var node = importRootNode(xmldoc),
+                root = self.rootElement;
+            if (!node || node.localName !== 'document-styles' ||
+                    node.namespaceURI !== officens) {
+                setState(OdfContainer.INVALID);
+                return;
+            }
+            root.fontFaceDecls = getDirectChild(node, officens, 'font-face-decls');
+            setChild(root, root.fontFaceDecls);
+            root.styles = getDirectChild(node, officens, 'styles');
+            setChild(root, root.styles);
+            root.automaticStyles = getDirectChild(node, officens,
+                    'automatic-styles');
+            setChild(root, root.automaticStyles);
+            root.masterStyles = getDirectChild(node, officens, 'master-styles');
+            setChild(root, root.masterStyles);
+            //removeUnusedAutomaticStyles(root.automaticStyles,
+            //        root.masterStyles);
+            fontLoader.loadFonts(root.fontFaceDecls, zip, null);
+        }
+        /**
+         * @param {!Document} xmldoc
+         * @return {undefined}
+         */
+        function handleContentXml(xmldoc) {
+            var node = importRootNode(xmldoc),
+                root,
+                automaticStyles,
+                fontFaceDecls,
+                c;
+            if (!node || node.localName !== 'document-content' ||
+                    node.namespaceURI !== officens) {
+                setState(OdfContainer.INVALID);
+                return;
+            }
+            root = self.rootElement;
+            fontFaceDecls = getDirectChild(node, officens, 'font-face-decls');
+            if (root.fontFaceDecls && fontFaceDecls) {
+                c = fontFaceDecls.firstChild;
+                while (c) {
+                    root.fontFaceDecls.appendChild(c);
+                    c = fontFaceDecls.firstChild;
+                }
+            } else if (fontFaceDecls) {
+                root.fontFaceDecls = fontFaceDecls;
+                setChild(root, fontFaceDecls);
+            }
+            automaticStyles = getDirectChild(node, officens, 'automatic-styles');
+            if (root.automaticStyles && automaticStyles) {
+                c = automaticStyles.firstChild;
+                while (c) {
+                    root.automaticStyles.appendChild(c);
+                    c = automaticStyles.firstChild; // works because node c moved
+                }
+            } else if (automaticStyles) {
+                root.automaticStyles = automaticStyles;
+                setChild(root, automaticStyles);
+            }
+            root.body = getDirectChild(node, officens, 'body');
+            setChild(root, root.body);
+        }
+        /**
+         * @param {!Document} xmldoc
+         * @return {undefined}
+         */
+        function handleMetaXml(xmldoc) {
+            var node = importRootNode(xmldoc),
+                root;
+            if (!node || node.localName !== 'document-meta' ||
+                    node.namespaceURI !== officens) {
+                return;
+            }
+            root = self.rootElement;
+            root.meta = getDirectChild(node, officens, 'meta');
+            setChild(root, root.meta);
+        }
+        /**
+         * @param {!Document} xmldoc
+         * @return {undefined}
+         */
+        function handleSettingsXml(xmldoc) {
+            var node = importRootNode(xmldoc),
+                root;
+            if (!node || node.localName !== 'document-settings' ||
+                    node.namespaceURI !== officens) {
+                return;
+            }
+            root = self.rootElement;
+            root.settings = getDirectChild(node, officens, 'settings');
+            setChild(root, root.settings);
+        }
+        /**
+         * @param {!Document} xmldoc
+         * @return {undefined}
+         */
+        function handleManifestXml(xmldoc) {
+            var node = importRootNode(xmldoc),
+                root,
+                n;
+            if (!node || node.localName !== 'manifest' ||
+                    node.namespaceURI !== manifestns) {
+                return;
+            }
+            root = self.rootElement;
+            root.manifest = node;
+            n = root.manifest.firstChild;
+            while (n) {
+                if (n.nodeType === 1 && n.localName === "file-entry" &&
+                        n.namespaceURI === manifestns) {
+                    partMimetypes[n.getAttributeNS(manifestns, "full-path")] =
+                            n.getAttributeNS(manifestns, "media-type");
+                }
+                n = n.nextSibling;
+            }
+        }
+        /**
+         * @param {!function(?string,?Document)} callback
+         * @return {undefined}
+         */
+        function getContentXmlNode(callback) {
+            var handler = {
+                rootElementReady: function (err, rootxml, done) {
+                    contentXmlCompletelyLoaded = err || done;
+                    if (err) {
+                        return callback(err, null);
+                    }
+                    var parser = new DOMParser();
+                    rootxml = parser.parseFromString(rootxml, "text/xml");
+                    callback(null, rootxml);
+                },
+                bodyChildElementsReady: function (err, nodes, done) {
+                    // TODO
+                }
+            };
+            zip.loadContentXmlAsFragments("content.xml", handler);
+        }
+        /**
+         * @param {!string} filepath
+         * @param {!function(?string,?Document)} callback
+         * @return {undefined}
+         */
+        function getXmlNode(filepath, callback) {
+            zip.loadAsDOM(filepath, callback);
+        }
+        /**
+         * @return {undefined}
+         */
+        function loadComponents() {
+            // always load content.xml, meta.xml, styles.xml and settings.xml
+            getXmlNode('styles.xml', function (err, xmldoc) {
+                handleStylesXml(xmldoc);
+                if (self.state === OdfContainer.INVALID) {
+                    return;
+                }
+                getXmlNode('content.xml', function (err, xmldoc) {
+                    handleContentXml(xmldoc);
+                    if (self.state === OdfContainer.INVALID) {
+                        return;
+                    }
+                    getXmlNode('meta.xml', function (err, xmldoc) {
+                        handleMetaXml(xmldoc);
+                        if (self.state === OdfContainer.INVALID) {
+                            return;
+                        }
+                        getXmlNode('settings.xml', function (err, xmldoc) {
+                            if (xmldoc) {
+                                handleSettingsXml(xmldoc);
+                            }
+                            getXmlNode('META-INF/manifest.xml', function (err,
+                                    xmldoc) {
+                                if (xmldoc) {
+                                    handleManifestXml(xmldoc);
+                                }
+                                if (self.state !== OdfContainer.INVALID) {
+                                    setState(OdfContainer.DONE);
+                                }
+                            });
+                        });
+                    });
+                });
+            });
+        }
+        function documentElement(name, map) {
+            var s = "", i;
+            for (i in map) {
+                if (map.hasOwnProperty(i)) {
+                    s += " xmlns:" + i + "=\"" + map[i] + "\"";
+                }
+            }
+            return "<?xml version=\"1.0\" encoding=\"UTF-8\"?><office:" + name +
+                    " " + s + " office:version=\"1.2\">";
+        }
+        /**
+         * @return {!string}
+         */
+        function serializeMetaXml() {
+            var nsmap = style2CSS.namespaces,
+                serializer = new xmldom.LSSerializer(),
+                /**@type{!string}*/ s = documentElement("document-meta", nsmap);
+            serializer.filter = new OdfNodeFilter(self.rootElement);
+            s += serializer.writeToString(self.rootElement.meta, nsmap);
+            s += "</office:document-meta>";
+            return s;
+        }
+        /**
+         * @return {!string}
+         */
+        function serializeSettingsXml() {
+            var nsmap = style2CSS.namespaces,
+                serializer = new xmldom.LSSerializer(),
+                /**@type{!string}*/ s = documentElement("document-settings", nsmap);
+            serializer.filter = new OdfNodeFilter(self.rootElement);
+            s += serializer.writeToString(self.rootElement.settings, nsmap);
+            s += "</office:document-settings>";
+            return s;
+        }
+        /**
+         * @return {!string}
+         */
+        function serializeStylesXml() {
+            var nsmap = style2CSS.namespaces,
+                serializer = new xmldom.LSSerializer(),
+                /**@type{!string}*/ s = documentElement("document-styles", nsmap);
+            serializer.filter = new OdfNodeFilter(self.rootElement,
+                    self.rootElement.masterStyles);
+            s += serializer.writeToString(self.rootElement.fontFaceDecls, nsmap);
+            s += serializer.writeToString(self.rootElement.styles, nsmap);
+            s += serializer.writeToString(self.rootElement.automaticStyles, nsmap);
+            s += serializer.writeToString(self.rootElement.masterStyles, nsmap);
+            s += "</office:document-styles>";
+            return s;
+        }
+        /**
+         * @return {!string}
+         */
+        function serializeContentXml() {
+            var nsmap = style2CSS.namespaces,
+                serializer = new xmldom.LSSerializer(),
+                /**@type{!string}*/ s = documentElement("document-content", nsmap);
+            serializer.filter = new OdfNodeFilter(self.rootElement,
+                    self.rootElement.body);
+            // Until there is code to  determine if a font is referenced only
+            // from all font declaratios will be stored in styles.xml
+            s += serializer.writeToString(self.rootElement.automaticStyles, nsmap);
+            s += serializer.writeToString(self.rootElement.body, nsmap);
+            s += "</office:document-content>";
+            return s;
+        }
+        function createElement(Type) {
+            var original = document.createElementNS(
+                    Type.namespaceURI,
+                    Type.localName
+                ),
+                method,
+                iface = new Type();
+            for (method in iface) {
+                if (iface.hasOwnProperty(method)) {
+                    original[method] = iface[method];
+                }
+            }
+            return original;
+        }
+        function loadFromXML(url, callback) {
+            runtime.loadXML(url, function (err, dom) {
+                if (err) {
+                    callback(err);
+                } else {
+                    handleFlatXml(dom);
+                }
+            });
+        }
+        // public functions
+        /**
+         * Open file and parse it. Return the XML Node. Return the root node of
+         * the file or null if this is not possible.
+         * For 'content.xml', 'styles.xml', 'meta.xml', and 'settings.xml', the
+         * elements 'document-content', 'document-styles', 'document-meta', or
+         * 'document-settings' will be returned respectively.
+         * @param {!string} partname
+         * @return {!OdfPart}
+         **/
+        this.getPart = function (partname) {
+            return new OdfPart(partname, self, zip);
+        };
+        /**
+         * @param {function(?string):undefined} callback
+         * @return {undefined}
+         */
+        this.save = function (callback) {
+            // the assumption so far is that all ODF parts are serialized
+            // already, but meta, settings, styles and content should be
+            // refreshed
+            // update the zip entries with the data from the live ODF DOM
+            var data;
+            data = runtime.byteArrayFromString(serializeSettingsXml(), "utf8");
+            zip.save("settings.xml", data, true, new Date());
+            data = runtime.byteArrayFromString(serializeMetaXml(), "utf8");
+            zip.save("meta.xml", data, true, new Date());
+            data = runtime.byteArrayFromString(serializeStylesXml(), "utf8");
+            zip.save("styles.xml", data, true, new Date());
+            data = runtime.byteArrayFromString(serializeContentXml(), "utf8");
+            zip.save("content.xml", data, true, new Date());
+            zip.write(function (err) {
+                callback(err);
+            });
+        };
+
+        // initialize public variables
+        this.state = OdfContainer.LOADING;
+        this.rootElement = createElement(ODFDocumentElement);
+        this.parts = new OdfPartList(this);
+
+        // initialize private variables
+        zip = new core.Zip(url, function (err, zipobject) {
+            zip = zipobject;
+            if (err) {
+                loadFromXML(url, function (xmlerr) {
+                    if (err) {
+                        zip.error = err + "\n" + xmlerr;
+                        setState(OdfContainer.INVALID);
+                    }
+                });
+            } else {
+                loadComponents();
+            }
+        });
+    };
+    odf.OdfContainer.EMPTY = 0;
+    odf.OdfContainer.LOADING = 1;
+    odf.OdfContainer.DONE = 2;
+    odf.OdfContainer.INVALID = 3;
+    odf.OdfContainer.SAVING = 4;
+    odf.OdfContainer.MODIFIED = 5;
+    /**
+     * @param {!string} url
+     * @return {!odf.OdfContainer}
+     */
+    odf.OdfContainer.getContainer = function (url) {
+        return new odf.OdfContainer(url, null);
+    };
+    return odf.OdfContainer;
+}());
diff --git a/apps/files_odfviewer/src/webodf/webodf/lib/odf/Style2CSS.js b/apps/files_odfviewer/src/webodf/webodf/lib/odf/Style2CSS.js
new file mode 100644
index 0000000000..f33e3faef4
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/lib/odf/Style2CSS.js
@@ -0,0 +1,632 @@
+/**
+ * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
+ * @licstart
+ * The JavaScript code in this page is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU Affero General Public License
+ * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.  The code is distributed
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
+ *
+ * As additional permission under GNU AGPL version 3 section 7, you
+ * may distribute non-source (e.g., minimized or compacted) forms of
+ * that code without the copy of the GNU GPL normally required by
+ * section 4, provided you include this license notice and a URL
+ * through which recipients can access the Corresponding Source.
+ *
+ * As a special exception to the AGPL, any HTML file which merely makes function
+ * calls to this code, and for that purpose includes it by reference shall be
+ * deemed a separate work for copyright law purposes. In addition, the copyright
+ * holders of this code give you permission to combine this code with free
+ * software libraries that are released under the GNU LGPL. You may copy and
+ * distribute such a system following the terms of the GNU AGPL for this code
+ * and the LGPL for the libraries. If you modify this code, you may extend this
+ * exception to your version of the code, but you are not obligated to do so.
+ * If you do not wish to do so, delete this exception statement from your
+ * version.
+ *
+ * This license applies to this entire compilation.
+ * @licend
+ * @source: http://www.webodf.org/
+ * @source: http://gitorious.org/odfkit/webodf/
+ */
+/*global odf: true, runtime: true*/
+/**
+ * @constructor
+ */
+odf.Style2CSS = function Style2CSS() {
+    "use strict";
+    // helper constants
+    var xlinkns = 'http://www.w3.org/1999/xlink',
+        drawns = "urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",
+        fons = "urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0",
+        officens = "urn:oasis:names:tc:opendocument:xmlns:office:1.0",
+        presentationns = "urn:oasis:names:tc:opendocument:xmlns:presentation:1.0",
+        stylens = "urn:oasis:names:tc:opendocument:xmlns:style:1.0",
+        svgns = "urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0",
+        tablens = "urn:oasis:names:tc:opendocument:xmlns:table:1.0",
+        textns = "urn:oasis:names:tc:opendocument:xmlns:text:1.0",
+        namespaces = {
+            "draw": drawns,
+            "fo": fons,
+            "office": officens,
+            "presentation": presentationns,
+            "style": stylens,
+            "svg": svgns,
+            "table": tablens,
+            "text": textns,
+            "xlink": xlinkns
+        },
+
+        familynamespaceprefixes = {
+            'graphic': 'draw',
+            'paragraph': 'text',
+            'presentation': 'presentation',
+            'ruby': 'text',
+            'section': 'text',
+            'table': 'table',
+            'table-cell': 'table',
+            'table-column': 'table',
+            'table-row': 'table',
+            'text': 'text',
+            'list': 'text'
+        },
+
+        familytagnames = {
+            'graphic': ['circle', 'connected', 'control', 'custom-shape',
+                'ellipse', 'frame', 'g', 'line', 'measure', 'page',
+                'page-thumbnail', 'path', 'polygon', 'polyline', 'rect',
+                'regular-polygon' ],
+            'paragraph': ['alphabetical-index-entry-template', 'h',
+                'illustration-index-entry-template', 'index-source-style',
+                'object-index-entry-template', 'p',
+                'table-index-entry-template', 'table-of-content-entry-template',
+                'user-index-entry-template'],
+            'presentation': ['caption', 'circle', 'connector', 'control',
+                'custom-shape', 'ellipse', 'frame', 'g', 'line', 'measure',
+                'page-thumbnail', 'path', 'polygon', 'polyline', 'rect',
+                'regular-polygon'],
+            'ruby': ['ruby', 'ruby-text'],
+            'section': ['alphabetical-index', 'bibliography',
+                'illustration-index', 'index-title', 'object-index', 'section',
+                'table-of-content', 'table-index', 'user-index'],
+            'table': ['background', 'table'],
+            'table-cell': ['body', 'covered-table-cell', 'even-columns',
+                'even-rows', 'first-column', 'first-row', 'last-column',
+                'last-row', 'odd-columns', 'odd-rows', 'table-cell'],
+            'table-column': ['table-column'],
+            'table-row': ['table-row'],
+            'text': ['a', 'index-entry-chapter', 'index-entry-link-end',
+                'index-entry-link-start', 'index-entry-page-number',
+                'index-entry-span', 'index-entry-tab-stop', 'index-entry-text',
+                'index-title-template', 'linenumbering-configuration',
+                'list-level-style-number', 'list-level-style-bullet',
+                'outline-level-style', 'span'],
+            'list': ['list-item']
+        },
+
+        textPropertySimpleMapping = [
+            [ fons, 'color', 'color' ],
+            // this sets the element background, not just the text background
+            [ fons, 'background-color', 'background-color' ],
+            [ fons, 'font-weight', 'font-weight' ],
+            [ fons, 'font-style', 'font-style' ],
+            [ fons, 'font-size', 'font-size' ]
+        ],
+
+        bgImageSimpleMapping = [
+            [ stylens, 'repeat', 'background-repeat' ]
+        ],
+
+        paragraphPropertySimpleMapping = [
+            [ fons, 'background-color', 'background-color' ],
+            [ fons, 'text-align', 'text-align' ],
+            [ fons, 'padding-left', 'padding-left' ],
+            [ fons, 'padding-right', 'padding-right' ],
+            [ fons, 'padding-top', 'padding-top' ],
+            [ fons, 'padding-bottom', 'padding-bottom' ],
+            [ fons, 'border-left', 'border-left' ],
+            [ fons, 'border-right', 'border-right' ],
+            [ fons, 'border-top', 'border-top' ],
+            [ fons, 'border-bottom', 'border-bottom' ],
+            [ fons, 'margin-left', 'margin-left' ],
+            [ fons, 'margin-right', 'margin-right' ],
+            [ fons, 'margin-top', 'margin-top' ],
+            [ fons, 'margin-bottom', 'margin-bottom' ],
+            [ fons, 'border', 'border' ]
+        ],
+
+        graphicPropertySimpleMapping = [
+            [ drawns, 'fill-color', 'background-color' ],
+            [ drawns, 'fill', 'background' ],
+            [ fons, 'min-height', 'min-height' ],
+            [ drawns, 'stroke', 'border' ],
+            [ svgns, 'stroke-color', 'border-color' ]
+        ],
+
+        tablecellPropertySimpleMapping = [
+            [ fons, 'background-color', 'background-color' ],
+            [ fons, 'border-left', 'border-left' ],
+            [ fons, 'border-right', 'border-right' ],
+            [ fons, 'border-top', 'border-top' ],
+            [ fons, 'border-bottom', 'border-bottom' ]
+        ];
+
+    // helper functions
+    /**
+     * @param {string} prefix
+     * @return {string}
+     */
+    function namespaceResolver(prefix) {
+        return namespaces[prefix] || null;
+    }
+    /**
+     * @param {!Document} doc
+     * @param {!Element} stylesnode
+     * @return {!Object}
+     */
+    function getStyleMap(doc, stylesnode) {
+        // put all style elements in a hash map by family and name
+        var stylemap = {}, node, name, family, map;
+        if (!stylesnode) {
+            return stylemap;
+        }
+        node = stylesnode.firstChild;
+        while (node) {
+            if (node.namespaceURI === stylens && node.localName === 'style') {
+                family = node.getAttributeNS(stylens, 'family');
+            } else if (node.namespaceURI === textns &&
+                    node.localName === 'list-style') {
+                family = "list";
+            }
+            name = family && node.getAttributeNS &&
+                    node.getAttributeNS(stylens, 'name');
+            if (name) {
+               if (!stylemap[family]) {
+                   stylemap[family] = {};
+               }
+               stylemap[family][name] = node;
+            }
+            node = node.nextSibling;
+        }
+        return stylemap;
+    }
+    /**
+     * @param {?Object} stylestree
+     * @param {?string} name
+     * @return {?string}
+     */
+    function findStyle(stylestree, name) {
+        if (!name || !stylestree) {
+            return null;
+        }
+        if (stylestree[name]) {
+            return stylestree[name];
+        }
+        var derivedStyles = stylestree.derivedStyles,
+            n, style;
+        for (n in stylestree) {
+            if (stylestree.hasOwnProperty(n)) {
+                style = findStyle(stylestree[n].derivedStyles, name);
+                if (style) {
+                    return style;
+                }
+            }
+        }
+        return null;
+    }
+    /**
+     * @param {!string} stylename
+     * @param {!Object} stylesmap
+     * @param {!Object} stylestree
+     * @return {undefined}
+     */
+    function addStyleToStyleTree(stylename, stylesmap, stylestree) {
+        var style = stylesmap[stylename], parentname, parentstyle;
+        if (!style) {
+            return;
+        }
+        parentname = style.getAttributeNS(stylens, 'parent-style-name');
+        parentstyle = null;
+        if (parentname) {
+            parentstyle = findStyle(stylestree, parentname);
+            if (!parentstyle && stylesmap[parentname]) {
+                // parent style has not been handled yet, do that now
+                addStyleToStyleTree(parentname, stylesmap, stylestree);
+                parentstyle = stylesmap[parentname];
+                stylesmap[parentname] = null;
+            }
+        }
+        if (parentstyle) {
+            if (!parentstyle.derivedStyles) {
+                parentstyle.derivedStyles = {};
+            }
+            parentstyle.derivedStyles[stylename] = style;
+        } else {
+            // no parent so add the root
+            stylestree[stylename] = style;
+        }
+    }
+    /**
+     * @param {!Object} stylesmap
+     * @param {!Object} stylestree
+     * @return {undefined}
+     */
+    function addStyleMapToStyleTree(stylesmap, stylestree) {
+        var name;
+        for (name in stylesmap) {
+            if (stylesmap.hasOwnProperty(name)) {
+                addStyleToStyleTree(name, stylesmap, stylestree);
+                stylesmap[name] = null;
+            }
+        }
+    }
+    /**
+     * @param {!string} family
+     * @param {!string} name
+     * @return {?string}
+     */
+    function createSelector(family, name) {
+        var prefix = familynamespaceprefixes[family],
+            namepart,
+            selector = "",
+            first = true;
+        if (prefix === null) {
+            return null;
+        }
+        namepart = '[' + prefix + '|style-name="' + name + '"]';
+        if (prefix === 'presentation') {
+            prefix = 'draw';
+            namepart = '[presentation|style-name="' + name + '"]';
+        }
+        return prefix + '|' + familytagnames[family].join(
+                namepart + ',' + prefix + '|') + namepart;
+    }
+    /**
+     * @param {!string} family
+     * @param {!string} name
+     * @param {!Element} node
+     * @return {!Array}
+     */
+    function getSelectors(family, name, node) {
+        var selectors = [], n, ss, s;
+        selectors.push(createSelector(family, name));
+        for (n in node.derivedStyles) {
+            if (node.derivedStyles.hasOwnProperty(n)) {
+                ss = getSelectors(family, n, node.derivedStyles[n]);
+                for (s in ss) {
+                    if (ss.hasOwnProperty(s)) {
+                        selectors.push(ss[s]);
+                    }
+                }
+            }
+        }
+        return selectors;
+    }
+    /**
+     * @param {?Element} node
+     * @param {!string} ns
+     * @param {!string} name
+     * @return {?Element}
+     */
+    function getDirectChild(node, ns, name) {
+        if (!node) {
+            return null;
+        }
+        var c = node.firstChild, e;
+        while (c) {
+            if (c.namespaceURI === ns && c.localName === name) {
+                e = /**@type{Element}*/(c);
+                return e;
+            }
+            c = c.nextSibling;
+        }
+        return null;
+    }
+    /**
+     * @param {!Element} props
+     * @param {!Object} mapping
+     * @return {!string}
+     */
+    function applySimpleMapping(props, mapping) {
+        var rule = '', r, value;
+        for (r in mapping) {
+            if (mapping.hasOwnProperty(r)) {
+                r = mapping[r];
+                value = props.getAttributeNS(r[0], r[1]);
+                if (value) {
+                    rule += r[2] + ':' + value + ';';
+                }
+            }
+        }
+        return rule;
+    }
+    /**
+     * @param {!string} name
+     * @return {!string}
+     */
+    function getFontDeclaration(name) {
+        return '"' + name + '"';
+    }
+    /**
+     * @param {!Element} props
+     * @return {!string}
+     */
+    function getTextProperties(props) {
+        var rule = '', value;
+        rule += applySimpleMapping(props, textPropertySimpleMapping);
+        value = props.getAttributeNS(stylens, 'text-underline-style');
+        if (value === 'solid') {
+            rule += 'text-decoration: underline;';
+        }
+        value = props.getAttributeNS(stylens, 'font-name');
+        if (value) {
+            value = getFontDeclaration(value);
+            if (value) {
+                rule += 'font-family: ' + value + ';';
+            }
+        }
+        return rule;
+    }
+    /**
+     * @param {!Element} props
+     * @return {!string}
+     */
+    function getParagraphProperties(props) {
+        var rule = '', imageProps, url, element;
+        rule += applySimpleMapping(props, paragraphPropertySimpleMapping);
+        imageProps = props.getElementsByTagNameNS(stylens, 'background-image');
+        if (imageProps.length > 0) {
+            url = imageProps.item(0).getAttributeNS(xlinkns, 'href');
+            if (url) {
+                rule += "background-image: url('odfkit:" + url + "');";
+                //rule += "background-repeat: repeat;"; //FIXME test
+                element = /**@type{!Element}*/(imageProps.item(0));
+                rule += applySimpleMapping(element, bgImageSimpleMapping);
+            }
+        }
+        return rule;
+    }
+    /**
+     * @param {!Element} props
+     * @return {!string}
+     */
+    function getGraphicProperties(props) {
+        var rule = '';
+        rule += applySimpleMapping(props, graphicPropertySimpleMapping);
+        return rule;
+    }
+    /**
+     * @param {!Element} props
+     * @return {!string}
+     */
+    function getTableCellProperties(props) {
+        var rule = '';
+        rule += applySimpleMapping(props, tablecellPropertySimpleMapping);
+        return rule;
+    }
+    /**
+     * @param {!StyleSheet} sheet
+     * @param {!string} family
+     * @param {!string} name
+     * @param {!Element} node
+     * @return {undefined}
+     */
+    function addStyleRule(sheet, family, name, node) {
+        var selectors = getSelectors(family, name, node),
+            selector = selectors.join(','),
+            rule = '',
+            properties = getDirectChild(node, stylens, 'text-properties');
+        if (properties) {
+            rule += getTextProperties(properties);
+        }
+        properties = getDirectChild(node, stylens, 'paragraph-properties');
+        if (properties) {
+            rule += getParagraphProperties(properties);
+        }
+        properties = getDirectChild(node, stylens, 'graphic-properties');
+        if (properties) {
+            rule += getGraphicProperties(properties);
+        }
+        properties = getDirectChild(node, stylens, 'table-cell-properties');
+        if (properties) {
+            rule += getTableCellProperties(properties);
+        }
+        if (rule.length === 0) {
+            return;
+        }
+        rule = selector + '{' + rule + '}';
+        try {
+            sheet.insertRule(rule, sheet.cssRules.length);
+        } catch (e) {
+            throw e;
+        }
+    }
+    /**
+     * @param {!Element} node
+     * @return {!string}
+     */
+    function getNumberRule(node) {
+        var style = node.getAttributeNS(stylens, "num-format"),
+            suffix = node.getAttributeNS(stylens, "num-suffix"),
+            prefix = node.getAttributeNS(stylens, "num-prefix"),
+            rule = "",
+            stylemap = {'1': 'decimal', 'a': 'lower-latin', 'A': 'upper-latin',
+                'i': 'lower-roman', 'I': 'upper-roman'},
+            content = "";
+        content = prefix || "";
+        if (stylemap.hasOwnProperty(style)) {
+            content += " counter(list, " + stylemap[style] + ")";
+        } else if (style) {
+            content += "'" + style + "';";
+        } else {
+            content += " ''";
+        }
+        if (suffix) {
+            content += " '" + suffix + "'";
+        }
+        rule = "content: " + content + ";";
+        return rule;
+    }
+    /**
+     * @param {!Element} node
+     * @return {!string}
+     */
+    function getImageRule(node) {
+        var rule = "content: none;";
+        return rule;
+    }
+    /**
+     * @param {!Element} node
+     * @return {!string}
+     */
+    function getBulletRule(node) {
+        var rule = "",
+            bulletChar = node.getAttributeNS(textns, "bullet-char");
+        return "content: '" + bulletChar + "';";
+    }
+    /**
+     * @param {!StyleSheet} sheet
+     * @param {!string} name
+     * @param {!Element} node
+     * @return {undefined}
+     */
+    function addListStyleRule(sheet, name, node, itemrule) {
+        var selector = 'text|list[text|style-name="' + name +
+                '"]',
+            level = node.getAttributeNS(textns, "level"),
+            rule = "";
+        level = level && parseInt(level, 10);
+        while (level > 1) {
+            selector += " > text|list-item > text|list";
+            level -= 1;
+        }
+        selector += " > list-item:before";
+        rule = itemrule;
+        rule = selector + '{' + rule + '}';
+        try {
+            sheet.insertRule(rule, sheet.cssRules.length);
+        } catch (e) {
+            throw e;
+        }
+    }
+    /**
+     * @param {!StyleSheet} sheet
+     * @param {!string} name
+     * @param {!Element} node
+     * @return {undefined}
+     */
+    function addListStyleRules(sheet, name, node) {
+        var n = node.firstChild, e, itemrule;
+        while (n) {
+            if (n.namespaceURI === textns) {
+                e = /**@type{!Element}*/(n);
+                if (n.localName === "list-level-style-number") {
+                    itemrule = getNumberRule(e);
+                    addListStyleRule(sheet, name, e, itemrule);
+                } else if (n.localName === "list-level-style-image") {
+                    itemrule = getImageRule(e);
+                    addListStyleRule(sheet, name, e, itemrule);
+                } else if (n.localName === "list-level-style-bullet") {
+                    itemrule = getBulletRule(e);
+                    addListStyleRule(sheet, name, e, itemrule);
+                }
+            }
+            n = n.nextSibling;
+        }
+    }
+    /**
+     * @param {!StyleSheet} sheet
+     * @param {!string} family
+     * @param {!string} name
+     * @param {!Element} node
+     * @return {undefined}
+     */
+    function addRule(sheet, family, name, node) {
+        if (family === "list") {
+            addListStyleRules(sheet, name, node);
+        } else {
+            addStyleRule(sheet, family, name, node);
+        }
+    }
+    /**
+     * @param {!StyleSheet} sheet
+     * @param {!string} family
+     * @param {!string} name
+     * @param {!Element} node
+     * @return {undefined}
+     */
+    function addRules(sheet, family, name, node) {
+        addRule(sheet, family, name, node);
+        var n;
+        for (n in node.derivedStyles) {
+            if (node.derivedStyles.hasOwnProperty(n)) {
+                addRules(sheet, family, n, node.derivedStyles[n]);
+            }
+        }
+    }
+
+    // css vs odf styles
+    // ODF styles occur in families. A family is a group of odf elements to
+    // which an element applies. ODF families can be mapped to a group of css
+    // elements
+
+    this.namespaces = namespaces;
+    this.namespaceResolver = namespaceResolver;
+    this.namespaceResolver.lookupNamespaceURI = this.namespaceResolver;
+
+    /**
+     * @param {!StyleSheet} stylesheet
+     * @param {!Element} styles
+     * @param {!Element} autostyles
+     * @return {undefined}
+     */
+    this.style2css = function (stylesheet, styles, autostyles) {
+        var doc, prefix, styletree, tree, name, rule, family,
+            stylenodes, styleautonodes;
+        // make stylesheet empty
+        while (stylesheet.cssRules.length) {
+            stylesheet.deleteRule(stylesheet.cssRules.length - 1);
+        }
+        doc = null;
+        if (styles) {
+            doc = styles.ownerDocument;
+        }
+        if (autostyles) {
+            doc = autostyles.ownerDocument;
+        }
+        if (!doc) {
+            return;
+        }
+        // add @namespace rules
+        for (prefix in namespaces) {
+            if (namespaces.hasOwnProperty(prefix)) {
+                rule = '@namespace ' + prefix + ' url(' + namespaces[prefix] + ');';
+                try {
+                    stylesheet.insertRule(rule, stylesheet.cssRules.length);
+                } catch (e) {
+                    // WebKit can throw an exception here, but it will have
+                    // retained the namespace declarations anyway.
+                }
+            }
+        }
+
+        // add the various styles
+        stylenodes = getStyleMap(doc, styles);
+        styleautonodes = getStyleMap(doc, autostyles);
+        styletree = {};
+        for (family in familynamespaceprefixes) {
+            if (familynamespaceprefixes.hasOwnProperty(family)) {
+                tree = styletree[family] = {};
+                addStyleMapToStyleTree(stylenodes[family], tree);
+                addStyleMapToStyleTree(styleautonodes[family], tree);
+
+                for (name in tree) {
+                    if (tree.hasOwnProperty(name)) {
+                        addRules(stylesheet, family, name, tree[name]);
+                    }
+                }
+            }
+        }
+    };
+};
diff --git a/apps/files_odfviewer/src/webodf/webodf/lib/odf/StyleInfo.js b/apps/files_odfviewer/src/webodf/webodf/lib/odf/StyleInfo.js
new file mode 100644
index 0000000000..9b76d13bed
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/lib/odf/StyleInfo.js
@@ -0,0 +1,424 @@
+/**
+ * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
+ * @licstart
+ * The JavaScript code in this page is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU Affero General Public License
+ * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.  The code is distributed
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
+ *
+ * As additional permission under GNU AGPL version 3 section 7, you
+ * may distribute non-source (e.g., minimized or compacted) forms of
+ * that code without the copy of the GNU GPL normally required by
+ * section 4, provided you include this license notice and a URL
+ * through which recipients can access the Corresponding Source.
+ *
+ * As a special exception to the AGPL, any HTML file which merely makes function
+ * calls to this code, and for that purpose includes it by reference shall be
+ * deemed a separate work for copyright law purposes. In addition, the copyright
+ * holders of this code give you permission to combine this code with free
+ * software libraries that are released under the GNU LGPL. You may copy and
+ * distribute such a system following the terms of the GNU AGPL for this code
+ * and the LGPL for the libraries. If you modify this code, you may extend this
+ * exception to your version of the code, but you are not obligated to do so.
+ * If you do not wish to do so, delete this exception statement from your
+ * version.
+ *
+ * This license applies to this entire compilation.
+ * @licend
+ * @source: http://www.webodf.org/
+ * @source: http://gitorious.org/odfkit/webodf/
+ */
+/*global odf*/
+/**
+ * @constructor
+ */
+odf.StyleInfo = function StyleInfo() {
+    "use strict";
+    // helper constants
+    var chartns = "urn:oasis:names:tc:opendocument:xmlns:chart:1.0",
+        dbns = "urn:oasis:names:tc:opendocument:xmlns:database:1.0",
+        dr3dns = "urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0",
+        drawns = "urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",
+        fons = "urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0",
+        formns = "urn:oasis:names:tc:opendocument:xmlns:form:1.0",
+        numberns = "urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0",
+        officens = "urn:oasis:names:tc:opendocument:xmlns:office:1.0",
+        presentationns = "urn:oasis:names:tc:opendocument:xmlns:presentation:1.0",
+        stylens = "urn:oasis:names:tc:opendocument:xmlns:style:1.0",
+        svgns = "urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0",
+        tablens = "urn:oasis:names:tc:opendocument:xmlns:table:1.0",
+        textns = "urn:oasis:names:tc:opendocument:xmlns:text:1.0",
+        elementstyles = {
+            "text": [
+                { ens: stylens, en: 'tab-stop', ans: stylens, a: 'leader-text-style'},
+                { ens: stylens, en: 'drop-cap', ans: stylens, a: 'style-name'},
+                { ens: textns, en: 'notes-configuration', ans: textns, a: 'citation-body-style-name'},
+                { ens: textns, en: 'notes-configuration', ans: textns, a: 'citation-style-name'},
+                { ens: textns, en: 'a', ans: textns, a: 'style-name'},
+                { ens: textns, en: 'alphabetical-index', ans: textns, a: 'style-name'},
+                { ens: textns, en: 'linenumbering-configuration', ans: textns, a: 'style-name'},
+                { ens: textns, en: 'list-level-style-number', ans: textns, a: 'style-name'},
+                { ens: textns, en: 'ruby-text', ans: textns, a: 'style-name'},
+                { ens: textns, en: 'span', ans: textns, a: 'style-name'},
+                { ens: textns, en: 'a', ans: textns, a: 'visited-style-name'},
+                { ens: stylens, en: 'text-properties', ans: stylens, a: 'text-line-through-text-style'},
+                { ens: textns, en: 'alphabetical-index-source', ans: textns, a: 'main-entry-style-name'},
+                { ens: textns, en: 'index-entry-bibliography', ans: textns, a: 'style-name'},
+                { ens: textns, en: 'index-entry-chapter', ans: textns, a: 'style-name'},
+                { ens: textns, en: 'index-entry-link-end', ans: textns, a: 'style-name'},
+                { ens: textns, en: 'index-entry-link-start', ans: textns, a: 'style-name'},
+                { ens: textns, en: 'index-entry-page-number', ans: textns, a: 'style-name'},
+                { ens: textns, en: 'index-entry-span', ans: textns, a: 'style-name'},
+                { ens: textns, en: 'index-entry-tab-stop', ans: textns, a: 'style-name'},
+                { ens: textns, en: 'index-entry-text', ans: textns, a: 'style-name'},
+                { ens: textns, en: 'index-title-template', ans: textns, a: 'style-name'},
+                { ens: textns, en: 'list-level-style-bullet', ans: textns, a: 'style-name'},
+                { ens: textns, en: 'outline-level-style', ans: textns, a: 'style-name'}
+            ],
+            "paragraph": [
+                { ens: drawns, en: 'caption', ans: drawns, a: 'text-style-name'},
+                { ens: drawns, en: 'circle', ans: drawns, a: 'text-style-name'},
+                { ens: drawns, en: 'connector', ans: drawns, a: 'text-style-name'},
+                { ens: drawns, en: 'control', ans: drawns, a: 'text-style-name'},
+                { ens: drawns, en: 'custom-shape', ans: drawns, a: 'text-style-name'},
+                { ens: drawns, en: 'ellipse', ans: drawns, a: 'text-style-name'},
+                { ens: drawns, en: 'frame', ans: drawns, a: 'text-style-name'},
+                { ens: drawns, en: 'line', ans: drawns, a: 'text-style-name'},
+                { ens: drawns, en: 'measure', ans: drawns, a: 'text-style-name'},
+                { ens: drawns, en: 'path', ans: drawns, a: 'text-style-name'},
+                { ens: drawns, en: 'polygon', ans: drawns, a: 'text-style-name'},
+                { ens: drawns, en: 'polyline', ans: drawns, a: 'text-style-name'},
+                { ens: drawns, en: 'rect', ans: drawns, a: 'text-style-name'},
+                { ens: drawns, en: 'regular-polygon', ans: drawns, a: 'text-style-name'},
+                { ens: officens, en: 'annotation', ans: drawns, a: 'text-style-name'},
+                { ens: formns, en: 'column', ans: formns, a: 'text-style-name'},
+                { ens: stylens, en: 'style', ans: stylens, a: 'next-style-name'},
+                { ens: tablens, en: 'body', ans: tablens, a: 'paragraph-style-name'},
+                { ens: tablens, en: 'even-columns', ans: tablens, a: 'paragraph-style-name'},
+                { ens: tablens, en: 'even-rows', ans: tablens, a: 'paragraph-style-name'},
+                { ens: tablens, en: 'first-column', ans: tablens, a: 'paragraph-style-name'},
+                { ens: tablens, en: 'first-row', ans: tablens, a: 'paragraph-style-name'},
+                { ens: tablens, en: 'last-column', ans: tablens, a: 'paragraph-style-name'},
+                { ens: tablens, en: 'last-row', ans: tablens, a: 'paragraph-style-name'},
+                { ens: tablens, en: 'odd-columns', ans: tablens, a: 'paragraph-style-name'},
+                { ens: tablens, en: 'odd-rows', ans: tablens, a: 'paragraph-style-name'},
+                { ens: textns, en: 'notes-configuration', ans: textns, a: 'default-style-name'},
+                { ens: textns, en: 'alphabetical-index-entry-template', ans: textns, a: 'style-name'},
+                { ens: textns, en: 'bibliography-entry-template', ans: textns, a: 'style-name'},
+                { ens: textns, en: 'h', ans: textns, a: 'style-name'},
+                { ens: textns, en: 'illustration-index-entry-template', ans: textns, a: 'style-name'},
+                { ens: textns, en: 'index-source-style', ans: textns, a: 'style-name'},
+                { ens: textns, en: 'object-index-entry-template', ans: textns, a: 'style-name'},
+                { ens: textns, en: 'p', ans: textns, a: 'style-name'},
+                { ens: textns, en: 'table-index-entry-template', ans: textns, a: 'style-name'},
+                { ens: textns, en: 'table-of-content-entry-template', ans: textns, a: 'style-name'},
+                { ens: textns, en: 'table-index-entry-template', ans: textns, a: 'style-name'},
+                { ens: textns, en: 'user-index-entry-template', ans: textns, a: 'style-name'},
+                { ens: stylens, en: 'page-layout-properties', ans: stylens, a: 'register-truth-ref-style-name'}
+            ],
+            "chart": [
+                { ens: chartns, en: 'axis', ans: chartns, a: 'style-name'},
+                { ens: chartns, en: 'chart', ans: chartns, a: 'style-name'},
+                { ens: chartns, en: 'data-label', ans: chartns, a: 'style-name'},
+                { ens: chartns, en: 'data-point', ans: chartns, a: 'style-name'},
+                { ens: chartns, en: 'equation', ans: chartns, a: 'style-name'},
+                { ens: chartns, en: 'error-indicator', ans: chartns, a: 'style-name'},
+                { ens: chartns, en: 'floor', ans: chartns, a: 'style-name'},
+                { ens: chartns, en: 'footer', ans: chartns, a: 'style-name'},
+                { ens: chartns, en: 'grid', ans: chartns, a: 'style-name'},
+                { ens: chartns, en: 'legend', ans: chartns, a: 'style-name'},
+                { ens: chartns, en: 'mean-value', ans: chartns, a: 'style-name'},
+                { ens: chartns, en: 'plot-area', ans: chartns, a: 'style-name'},
+                { ens: chartns, en: 'regression-curve', ans: chartns, a: 'style-name'},
+                { ens: chartns, en: 'series', ans: chartns, a: 'style-name'},
+                { ens: chartns, en: 'stock-gain-marker', ans: chartns, a: 'style-name'},
+                { ens: chartns, en: 'stock-loss-marker', ans: chartns, a: 'style-name'},
+                { ens: chartns, en: 'stock-range-line', ans: chartns, a: 'style-name'},
+                { ens: chartns, en: 'subtitle', ans: chartns, a: 'style-name'},
+                { ens: chartns, en: 'title', ans: chartns, a: 'style-name'},
+                { ens: chartns, en: 'wall', ans: chartns, a: 'style-name'}
+            ],
+            "section": [
+                { ens: textns, en: 'alphabetical-index', ans: textns, a: 'style-name'},
+                { ens: textns, en: 'bibliography', ans: textns, a: 'style-name'},
+                { ens: textns, en: 'illustration-index', ans: textns, a: 'style-name'},
+                { ens: textns, en: 'index-title', ans: textns, a: 'style-name'},
+                { ens: textns, en: 'object-index', ans: textns, a: 'style-name'},
+                { ens: textns, en: 'section', ans: textns, a: 'style-name'},
+                { ens: textns, en: 'table-of-content', ans: textns, a: 'style-name'},
+                { ens: textns, en: 'table-index', ans: textns, a: 'style-name'},
+                { ens: textns, en: 'user-index', ans: textns, a: 'style-name'}
+            ],
+            "ruby": [
+                { ens: textns, en: 'ruby', ans: textns, a: 'style-name'}
+            ],
+            "table": [
+                { ens: dbns, en: 'query', ans: dbns, a: 'style-name'},
+                { ens: dbns, en: 'table-representation', ans: dbns, a: 'style-name'},
+                { ens: tablens, en: 'background', ans: tablens, a: 'style-name'},
+                { ens: tablens, en: 'table', ans: tablens, a: 'style-name'}
+            ],
+            "table-column": [
+                { ens: dbns, en: 'column', ans: dbns, a: 'style-name'},
+                { ens: tablens, en: 'table-column', ans: tablens, a: 'style-name'}
+            ],
+            "table-row": [
+                { ens: dbns, en: 'query', ans: dbns, a: 'default-row-style-name'},
+                { ens: dbns, en: 'table-representation', ans: dbns, a: 'default-row-style-name'},
+                { ens: tablens, en: 'table-row', ans: tablens, a: 'style-name'}
+            ],
+            "table-cell": [
+                { ens: dbns, en: 'column', ans: dbns, a: 'default-cell-style-name'},
+                { ens: tablens, en: 'table-column', ans: tablens, a: 'default-cell-style-name'},
+                { ens: tablens, en: 'table-row', ans: tablens, a: 'default-cell-style-name'},
+                { ens: tablens, en: 'body', ans: tablens, a: 'style-name'},
+                { ens: tablens, en: 'covered-table-cell', ans: tablens, a: 'style-name'},
+                { ens: tablens, en: 'even-columns', ans: tablens, a: 'style-name'},
+                { ens: tablens, en: 'covered-table-cell', ans: tablens, a: 'style-name'},
+                { ens: tablens, en: 'even-columns', ans: tablens, a: 'style-name'},
+                { ens: tablens, en: 'even-rows', ans: tablens, a: 'style-name'},
+                { ens: tablens, en: 'first-column', ans: tablens, a: 'style-name'},
+                { ens: tablens, en: 'first-row', ans: tablens, a: 'style-name'},
+                { ens: tablens, en: 'last-column', ans: tablens, a: 'style-name'},
+                { ens: tablens, en: 'last-row', ans: tablens, a: 'style-name'},
+                { ens: tablens, en: 'odd-columns', ans: tablens, a: 'style-name'},
+                { ens: tablens, en: 'odd-rows', ans: tablens, a: 'style-name'},
+                { ens: tablens, en: 'table-cell', ans: tablens, a: 'style-name'}
+            ],
+            "graphic": [
+                { ens: dr3dns, en: 'cube', ans: drawns, a: 'style-name'},
+                { ens: dr3dns, en: 'extrude', ans: drawns, a: 'style-name'},
+                { ens: dr3dns, en: 'rotate', ans: drawns, a: 'style-name'},
+                { ens: dr3dns, en: 'scene', ans: drawns, a: 'style-name'},
+                { ens: dr3dns, en: 'sphere', ans: drawns, a: 'style-name'},
+                { ens: drawns, en: 'caption', ans: drawns, a: 'style-name'},
+                { ens: drawns, en: 'circle', ans: drawns, a: 'style-name'},
+                { ens: drawns, en: 'connector', ans: drawns, a: 'style-name'},
+                { ens: drawns, en: 'control', ans: drawns, a: 'style-name'},
+                { ens: drawns, en: 'custom-shape', ans: drawns, a: 'style-name'},
+                { ens: drawns, en: 'ellipse', ans: drawns, a: 'style-name'},
+                { ens: drawns, en: 'frame', ans: drawns, a: 'style-name'},
+                { ens: drawns, en: 'g', ans: drawns, a: 'style-name'},
+                { ens: drawns, en: 'line', ans: drawns, a: 'style-name'},
+                { ens: drawns, en: 'measure', ans: drawns, a: 'style-name'},
+                { ens: drawns, en: 'page-thumbnail', ans: drawns, a: 'style-name'},
+                { ens: drawns, en: 'path', ans: drawns, a: 'style-name'},
+                { ens: drawns, en: 'polygon', ans: drawns, a: 'style-name'},
+                { ens: drawns, en: 'polyline', ans: drawns, a: 'style-name'},
+                { ens: drawns, en: 'rect', ans: drawns, a: 'style-name'},
+                { ens: drawns, en: 'regular-polygon', ans: drawns, a: 'style-name'},
+                { ens: officens, en: 'annotation', ans: drawns, a: 'style-name'}
+            ],
+            "presentation": [
+                { ens: dr3dns, en: 'cube', ans: presentationns, a: 'style-name'},
+                { ens: dr3dns, en: 'extrude', ans: presentationns, a: 'style-name'},
+                { ens: dr3dns, en: 'rotate', ans: presentationns, a: 'style-name'},
+                { ens: dr3dns, en: 'scene', ans: presentationns, a: 'style-name'},
+                { ens: dr3dns, en: 'sphere', ans: presentationns, a: 'style-name'},
+                { ens: drawns, en: 'caption', ans: presentationns, a: 'style-name'},
+                { ens: drawns, en: 'circle', ans: presentationns, a: 'style-name'},
+                { ens: drawns, en: 'connector', ans: presentationns, a: 'style-name'},
+                { ens: drawns, en: 'control', ans: presentationns, a: 'style-name'},
+                { ens: drawns, en: 'custom-shape', ans: presentationns, a: 'style-name'},
+                { ens: drawns, en: 'ellipse', ans: presentationns, a: 'style-name'},
+                { ens: drawns, en: 'frame', ans: presentationns, a: 'style-name'},
+                { ens: drawns, en: 'g', ans: presentationns, a: 'style-name'},
+                { ens: drawns, en: 'line', ans: presentationns, a: 'style-name'},
+                { ens: drawns, en: 'measure', ans: presentationns, a: 'style-name'},
+                { ens: drawns, en: 'page-thumbnail', ans: presentationns, a: 'style-name'},
+                { ens: drawns, en: 'path', ans: presentationns, a: 'style-name'},
+                { ens: drawns, en: 'polygon', ans: presentationns, a: 'style-name'},
+                { ens: drawns, en: 'polyline', ans: presentationns, a: 'style-name'},
+                { ens: drawns, en: 'rect', ans: presentationns, a: 'style-name'},
+                { ens: drawns, en: 'regular-polygon', ans: presentationns, a: 'style-name'},
+                { ens: officens, en: 'annotation', ans: presentationns, a: 'style-name'}
+            ],
+            "drawing-page": [
+                { ens: drawns, en: 'page', ans: drawns, a: 'style-name'},
+                { ens: presentationns, en: 'notes', ans: drawns, a: 'style-name'},
+                { ens: stylens, en: 'handout-master', ans: drawns, a: 'style-name'},
+                { ens: stylens, en: 'master-page', ans: drawns, a: 'style-name'}
+            ],
+            "list-style": [
+                { ens: textns, en: 'list', ans: textns, a: 'style-name'},
+                { ens: textns, en: 'numbered-paragraph', ans: textns, a: 'style-name'},
+                { ens: textns, en: 'list-item', ans: textns, a: 'style-override'},
+                { ens: stylens, en: 'style', ans: stylens, a: 'list-style-name'},
+                { ens: stylens, en: 'style', ans: stylens, a: 'data-style-name'},
+                { ens: stylens, en: 'style', ans: stylens, a: 'percentage-data-style-name'},
+                { ens: presentationns, en: 'date-time-decl', ans: stylens, a: 'data-style-name'},
+                { ens: textns, en: 'creation-date', ans: stylens, a: 'data-style-name'},
+                { ens: textns, en: 'creation-time', ans: stylens, a: 'data-style-name'},
+                { ens: textns, en: 'database-display', ans: stylens, a: 'data-style-name'},
+                { ens: textns, en: 'date', ans: stylens, a: 'data-style-name'},
+                { ens: textns, en: 'editing-duration', ans: stylens, a: 'data-style-name'},
+                { ens: textns, en: 'expression', ans: stylens, a: 'data-style-name'},
+                { ens: textns, en: 'meta-field', ans: stylens, a: 'data-style-name'},
+                { ens: textns, en: 'modification-date', ans: stylens, a: 'data-style-name'},
+                { ens: textns, en: 'modification-time', ans: stylens, a: 'data-style-name'},
+                { ens: textns, en: 'print-date', ans: stylens, a: 'data-style-name'},
+                { ens: textns, en: 'print-time', ans: stylens, a: 'data-style-name'},
+                { ens: textns, en: 'table-formula', ans: stylens, a: 'data-style-name'},
+                { ens: textns, en: 'time', ans: stylens, a: 'data-style-name'},
+                { ens: textns, en: 'user-defined', ans: stylens, a: 'data-style-name'},
+                { ens: textns, en: 'user-field-get', ans: stylens, a: 'data-style-name'},
+                { ens: textns, en: 'user-field-input', ans: stylens, a: 'data-style-name'},
+                { ens: textns, en: 'variable-get', ans: stylens, a: 'data-style-name'},
+                { ens: textns, en: 'variable-input', ans: stylens, a: 'data-style-name'},
+                { ens: textns, en: 'variable-set', ans: stylens, a: 'data-style-name'}
+            ],
+            "data": [
+                { ens: stylens, en: 'style', ans: stylens, a: 'data-style-name'},
+                { ens: stylens, en: 'style', ans: stylens, a: 'percentage-data-style-name'},
+                { ens: presentationns, en: 'date-time-decl', ans: stylens, a: 'data-style-name'},
+                { ens: textns, en: 'creation-date', ans: stylens, a: 'data-style-name'},
+                { ens: textns, en: 'creation-time', ans: stylens, a: 'data-style-name'},
+                { ens: textns, en: 'database-display', ans: stylens, a: 'data-style-name'},
+                { ens: textns, en: 'date', ans: stylens, a: 'data-style-name'},
+                { ens: textns, en: 'editing-duration', ans: stylens, a: 'data-style-name'},
+                { ens: textns, en: 'expression', ans: stylens, a: 'data-style-name'},
+                { ens: textns, en: 'meta-field', ans: stylens, a: 'data-style-name'},
+                { ens: textns, en: 'modification-date', ans: stylens, a: 'data-style-name'},
+                { ens: textns, en: 'modification-time', ans: stylens, a: 'data-style-name'},
+                { ens: textns, en: 'print-date', ans: stylens, a: 'data-style-name'},
+                { ens: textns, en: 'print-time', ans: stylens, a: 'data-style-name'},
+                { ens: textns, en: 'table-formula', ans: stylens, a: 'data-style-name'},
+                { ens: textns, en: 'time', ans: stylens, a: 'data-style-name'},
+                { ens: textns, en: 'user-defined', ans: stylens, a: 'data-style-name'},
+                { ens: textns, en: 'user-field-get', ans: stylens, a: 'data-style-name'},
+                { ens: textns, en: 'user-field-input', ans: stylens, a: 'data-style-name'},
+                { ens: textns, en: 'variable-get', ans: stylens, a: 'data-style-name'},
+                { ens: textns, en: 'variable-input', ans: stylens, a: 'data-style-name'},
+                { ens: textns, en: 'variable-set', ans: stylens, a: 'data-style-name'}
+            ],
+            "page-layout": [
+                { ens: presentationns, en: 'notes', ans: stylens, a: 'page-layout-name'},
+                { ens: stylens, en: 'handout-master', ans: stylens, a: 'page-layout-name'},
+                { ens: stylens, en: 'master-page', ans: stylens, a: 'page-layout-name'}
+            ]
+        },
+        elements;
+
+    /**
+     * Return if a particular element can have a style for a particular family.
+     * @param {!string} family
+     * @param {!Element} element
+     * @return {!boolean}
+     */
+    function canElementHaveStyle(family, element) {
+        var elname = elements[element.localName],
+            elns = elname && elname[element.namespaceURI],
+            length = elns ? elns.length : 0,
+            i;
+        return elns && elns.length > 0;
+    }
+
+    /**
+     * @param {!string} family
+     * @param {!Element} element
+     * @return {{name:string,family:string}|null}
+     */
+    function getStyleRef(family, element) {
+        var elname = elements[element.localName],
+            elns = elname && elname[element.namespaceURI],
+            length = elns ? elns.length : 0,
+            i, attr;
+        for (i = 0; i < length; i += 1) {
+            attr = element.getAttributeNS(elns[i].ns, elns[i].localname);
+/*
+            if (attr) { // a style has been found!
+                return attr;
+            }
+*/
+        }
+        return null;
+    }
+
+    /**
+     * @param {!Element} element
+     * @param {!Object.<string,Object.<string,number>>} keys
+     * @return {undefined}
+     */
+    function getUsedStylesForAutomatic(element, keys) {
+        var elname = elements[element.localName],
+            elns = elname && elname[element.namespaceURI],
+            length = elns ? elns.length : 0,
+            i, attr, group, map, e;
+        for (i = 0; i < length; i += 1) {
+            attr = element.getAttributeNS(elns[i].ns, elns[i].localname);
+            if (attr) { // a style has been found!
+                group = elns[i].keygroup;
+                map = keys[group];
+                if (!map) {
+                    map = keys[group] = {};
+                }
+                map[attr] = 1;
+            }
+        }
+        i = element.firstChild;
+        while (i) {
+            if (i.nodeType === 1) {
+                e = /**@type{!Element}*/(i);
+                getUsedStylesForAutomatic(e, keys);
+            }
+            i = i.nextSibling;
+        }
+    }
+
+    /**
+     * @param {!Object.<Array.<Object.<string,string>>>} elementstyles
+     */
+    function inverse(elementstyles) {
+        var keyname, i, list, item, l, elements = {}, map, array;
+        for (keyname in elementstyles) {
+            if (elementstyles.hasOwnProperty(keyname)) {
+                list = elementstyles[keyname];
+                l = list.length;
+                for (i = 0; i < l; i += 1) {
+                    item = list[i];
+                    map = elements[item.en] = elements[item.en] || {};
+                    array = map[item.ens] = map[item.ens] || [];
+                    array.push(
+                        {ns: item.ans, localname: item.a, keygroup: keyname});
+                }
+            }
+        }
+        return elements;
+    }
+
+    /**
+     * @constructor
+     * @param {!Element} element
+     */
+    this.UsedKeysList = function (element) {
+        var usedKeys = {};
+
+        /**
+         * @param {!Element} element
+         * @return {!boolean}
+         */
+        this.uses = function (element) {
+            var localName = element.localName,
+                name = element.getAttributeNS(drawns, "name") ||
+                        element.getAttributeNS(stylens, "name"),
+                keyName, map;
+            if (localName === "style") {
+                keyName = element.getAttributeNS(stylens, "family");
+            } else if (element.namespaceURI === numberns) {
+                keyName = "data";
+            } else {
+                keyName = localName; // list-style or page-layout
+            }
+            map = usedKeys[keyName];
+            return map ? (map[name] > 0) : false;
+        };
+
+        getUsedStylesForAutomatic(element, usedKeys);
+    };
+
+    this.canElementHaveStyle = canElementHaveStyle;
+
+    elements = inverse(elementstyles);
+};
diff --git a/apps/files_odfviewer/src/webodf/webodf/lib/packages.js b/apps/files_odfviewer/src/webodf/webodf/lib/packages.js
new file mode 100644
index 0000000000..7277a833f9
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/lib/packages.js
@@ -0,0 +1,48 @@
+/**
+ * @license
+ * @licstart
+ * The JavaScript code in this page is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU Affero General Public License
+ * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.  The code is distributed
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
+ *
+ * As additional permission under GNU AGPL version 3 section 7, you
+ * may distribute non-source (e.g., minimized or compacted) forms of
+ * that code without the copy of the GNU GPL normally required by
+ * section 4, provided you include this license notice and a URL
+ * through which recipients can access the Corresponding Source.
+ *
+ * As a special exception to the AGPL, any HTML file which merely makes function
+ * calls to this code, and for that purpose includes it by reference shall be
+ * deemed a separate work for copyright law purposes. In addition, the copyright
+ * holders of this code give you permission to combine this code with free
+ * software libraries that are released under the GNU LGPL. You may copy and
+ * distribute such a system following the terms of the GNU AGPL for this code
+ * and the LGPL for the libraries. If you modify this code, you may extend this
+ * exception to your version of the code, but you are not obligated to do so.
+ * If you do not wish to do so, delete this exception statement from your
+ * version.
+ *
+ * This license applies to this entire compilation.
+ * @licend
+ * @source: http://www.webodf.org/
+ * @source: http://gitorious.org/odfkit/webodf/
+ */
+/**
+ * @namespace The core package.
+ */
+var core = {};
+/**
+ * @namespace The gui package.
+ */
+var gui = {};
+/**
+ * @namespace The xmldom package.
+ */
+var xmldom = {};
+/**
+ * @namespace The ODF package.
+ */
+var odf = {};
diff --git a/apps/files_odfviewer/src/webodf/webodf/lib/runtime.js b/apps/files_odfviewer/src/webodf/webodf/lib/runtime.js
new file mode 100644
index 0000000000..99ded6f1d3
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/lib/runtime.js
@@ -0,0 +1,1117 @@
+/**
+ * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
+ * @licstart
+ * The JavaScript code in this page is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU Affero General Public License
+ * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.  The code is distributed
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
+ *
+ * As additional permission under GNU AGPL version 3 section 7, you
+ * may distribute non-source (e.g., minimized or compacted) forms of
+ * that code without the copy of the GNU GPL normally required by
+ * section 4, provided you include this license notice and a URL
+ * through which recipients can access the Corresponding Source.
+ *
+ * As a special exception to the AGPL, any HTML file which merely makes function
+ * calls to this code, and for that purpose includes it by reference shall be
+ * deemed a separate work for copyright law purposes. In addition, the copyright
+ * holders of this code give you permission to combine this code with free
+ * software libraries that are released under the GNU LGPL. You may copy and
+ * distribute such a system following the terms of the GNU AGPL for this code
+ * and the LGPL for the libraries. If you modify this code, you may extend this
+ * exception to your version of the code, but you are not obligated to do so.
+ * If you do not wish to do so, delete this exception statement from your
+ * version.
+ *
+ * This license applies to this entire compilation.
+ * @licend
+ * @source: http://www.webodf.org/
+ * @source: http://gitorious.org/odfkit/webodf/
+ */
+/*jslint nomen: true, evil: true, bitwise: true */
+/*global window: true, XMLHttpRequest: true, require: true, console: true,
+  process: true, __dirname: true, setTimeout: true, Packages: true, print: true,
+  readFile: true, quit: true, Buffer: true, ArrayBuffer: true, Uint8Array: true,
+  navigator: true, VBArray: true */
+/**
+ * Three implementations of a runtime for browser, node.js and rhino.
+ */
+
+/**
+ * Abstraction of the runtime environment.
+ * @class
+ * @interface
+ */
+function Runtime() {"use strict"; }
+/**
+ * Abstraction of byte arrays.
+ * @constructor
+ * @extends {Array}
+ * @param {!number} size
+ */
+Runtime.ByteArray = function (size) {"use strict"; };
+/**
+ * @param {!number} start
+ * @param {!number} end
+ * @return {!Runtime.ByteArray}
+ */
+Runtime.ByteArray.prototype.slice = function (start, end) {"use strict"; };
+/**
+ * @param {!Array.<number>} array
+ * @return {!Runtime.ByteArray}
+ */
+Runtime.prototype.byteArrayFromArray = function (array) {"use strict"; };
+/**
+ * @param {!string} string
+ * @param {!string} encoding
+ * @return {!Runtime.ByteArray}
+ */
+Runtime.prototype.byteArrayFromString = function (string, encoding) {"use strict"; };
+/**
+ * @param {!Runtime.ByteArray} bytearray
+ * @param {!string} encoding
+ * @return {!string}
+ */
+Runtime.prototype.byteArrayToString = function (bytearray, encoding) {"use strict"; };
+/**
+ * @param {!Runtime.ByteArray} bytearray1
+ * @param {!Runtime.ByteArray} bytearray2
+ * @return {!Runtime.ByteArray}
+ */
+Runtime.prototype.concatByteArrays = function (bytearray1, bytearray2) {"use strict"; };
+/**
+ * @param {!string} path
+ * @param {!number} offset
+ * @param {!number} length
+ * @param {!function(string,Runtime.ByteArray):undefined} callback
+ * @return {undefined}
+ */
+Runtime.prototype.read = function (path, offset, length, callback) {"use strict"; };
+/**
+ * Read the contents of a file. Returns the result via a callback. If the
+ * encoding is 'binary', the result is returned as a Runtime.ByteArray,
+ * otherwise, it is returned as a string.
+ * @param {!string} path
+ * @param {!string} encoding text encoding or 'binary'
+ * @param {!function(string,(string|Runtime.ByteArray)):undefined} callback
+ * @return {undefined}
+ */
+Runtime.prototype.readFile = function (path, encoding, callback) {"use strict"; };
+/**
+ * @param {!string} path
+ * @param {!string} encoding text encoding or 'binary'
+ * @return {!string}
+ */
+Runtime.prototype.readFileSync = function (path, encoding) {"use strict"; };
+/**
+ * @param {!string} path
+ * @param {!function((string|Document)):undefined} callback
+ * @return {undefined}
+ */
+Runtime.prototype.loadXML = function (path, callback) {"use strict"; };
+/**
+ * @param {!string} path
+ * @param {!Runtime.ByteArray} data
+ * @param {!function(?string):undefined} callback
+ * @return {undefined}
+ */
+Runtime.prototype.writeFile = function (path, data, callback) {"use strict"; };
+/**
+ * @param {!string} path
+ * @param {!function(boolean):undefined} callback
+ * @return {undefined}
+ */
+Runtime.prototype.isFile = function (path, callback) {"use strict"; };
+/**
+ * @param {!string} path
+ * @param {!function(number):undefined} callback
+ * @return {undefined}
+ */
+Runtime.prototype.getFileSize = function (path, callback) {"use strict"; };
+/**
+ * @param {!string} path
+ * @param {!function(?string):undefined} callback
+ * @return {undefined}
+ */
+Runtime.prototype.deleteFile = function (path, callback) {"use strict"; };
+/**
+ * @param {!string} msgOrCategory
+ * @param {!string=} msg
+ * @return {undefined}
+ */
+Runtime.prototype.log = function (msgOrCategory, msg) {"use strict"; };
+/**
+ * @param {!function():undefined} callback
+ * @param {!number} milliseconds
+ * @return {undefined}
+ */
+Runtime.prototype.setTimeout = function (callback, milliseconds) {"use strict"; };
+/**
+ * @return {!Array.<string>}
+ */
+Runtime.prototype.libraryPaths = function () {"use strict"; };
+/**
+ * @return {string}
+ */
+Runtime.prototype.type = function () {"use strict"; };
+/**
+ * @return {?DOMImplementation}
+ */
+Runtime.prototype.getDOMImplementation = function () {"use strict"; };
+/**
+ * @return {?Window}
+ */
+Runtime.prototype.getWindow = function () {"use strict"; };
+
+/** @define {boolean} */
+var IS_COMPILED_CODE = false;
+
+/**
+ * @this {Runtime}
+ * @param {!Runtime.ByteArray} bytearray
+ * @param {!string} encoding
+ * @return {!string}
+ */
+Runtime.byteArrayToString = function (bytearray, encoding) {
+    "use strict";
+    function byteArrayToString(bytearray) {
+        var s = "", i, l = bytearray.length;
+        for (i = 0; i < l; i += 1) {
+            s += String.fromCharCode(bytearray[i] & 0xff);
+        }
+        return s;
+    }
+    function utf8ByteArrayToString(bytearray) {
+        var s = "", i, l = bytearray.length,
+            c0, c1, c2;
+        for (i = 0; i < l; i += 1) {
+            c0 = bytearray[i];
+            if (c0 < 0x80) {
+                s += String.fromCharCode(c0);
+            } else {
+                i += 1;
+                c1 = bytearray[i];
+                if (c0 < 0xe0) {
+                    s += String.fromCharCode(((c0 & 0x1f) << 6) | (c1 & 0x3f));
+                } else {
+                    i += 1;
+                    c2 = bytearray[i];
+                    s += String.fromCharCode(((c0 & 0x0f) << 12) |
+                            ((c1 & 0x3f) << 6) | (c2 & 0x3f));
+                }
+            }
+        }
+        return s;
+    }
+    var result;
+    if (encoding === "utf8") {
+        result = utf8ByteArrayToString(bytearray);
+    } else {
+        if (encoding !== "binary") {
+            this.log("Unsupported encoding: " + encoding);
+        }
+        result = byteArrayToString(bytearray);
+    }
+    return result;
+};
+Runtime.getFunctionName = function getFunctionName(f) {
+    "use strict";
+    var m;
+    if (f.name === undefined) {
+        m = new RegExp("function\\s+(\\w+)").exec(f);
+        return m && m[1];
+    }
+    return f.name;
+};
+/**
+ * @class
+ * @constructor
+ * @augments Runtime
+ * @implements {Runtime}
+ * @param {Element} logoutput
+ */
+function BrowserRuntime(logoutput) {
+    "use strict";
+    var self = this,
+        cache = {},
+        useNativeArray = window.ArrayBuffer && window.Uint8Array;
+    /**
+     * @constructor
+     * @augments Runtime.ByteArray
+     * @inner
+     * @extends {Runtime.ByteArray}
+     * @param {!number} size
+     */
+    this.ByteArray = (useNativeArray)
+        // if Uint8Array is available, use that
+        ? function ByteArray(size) {
+            Uint8Array.prototype.slice = function (begin, end) {
+                if (end === undefined) {
+                    if (begin === undefined) {
+                        begin = 0;
+                    }
+                    end = this.length;
+                }
+                var view = this.subarray(begin, end), array, i;
+                end -= begin;
+                array = new Uint8Array(new ArrayBuffer(end));
+                for (i = 0; i < end; i += 1) {
+                    array[i] = view[i];
+                }
+                return array;
+            };
+            return new Uint8Array(new ArrayBuffer(size));
+        }
+        : function ByteArray(size) {
+            var a = [];
+            a.length = size;
+            return a;
+        };
+    this.concatByteArrays = (useNativeArray)
+        ? function (bytearray1, bytearray2) {
+            var i, l1 = bytearray1.length, l2 = bytearray2.length,
+                a = new this.ByteArray(l1 + l2);
+            for (i = 0; i < l1; i += 1) {
+                a[i] = bytearray1[i];
+            }
+            for (i = 0; i < l2; i += 1) {
+                a[i + l1] = bytearray2[i];
+            }
+            return a;
+        }
+        : function (bytearray1, bytearray2) {
+            return bytearray1.concat(bytearray2);
+        };
+    function utf8ByteArrayFromString(string) {
+        var l = string.length, bytearray, i, n, j = 0;
+        // first determine the length in bytes
+        for (i = 0; i < l; i += 1) {
+            n = string.charCodeAt(i);
+            j += 1 + (n > 0x80) + (n > 0x800);
+        }
+        // allocate a buffer and convert to a utf8 array
+        bytearray = new self.ByteArray(j);
+        j = 0;
+        for (i = 0; i < l; i += 1) {
+            n = string.charCodeAt(i);
+            if (n < 0x80) {
+                bytearray[j] = n;
+                j += 1;
+            } else if (n < 0x800) {
+                bytearray[j] = 0xc0 | (n >>>  6);
+                bytearray[j + 1] = 0x80 | (n & 0x3f);
+                j += 2;
+            } else {
+                bytearray[j] = 0xe0 | ((n >>> 12) & 0x0f);
+                bytearray[j + 1] = 0x80 | ((n >>>  6) & 0x3f);
+                bytearray[j + 2] = 0x80 |  (n         & 0x3f);
+                j += 3;
+            }
+        }
+        return bytearray;
+    }
+    function byteArrayFromString(string) {
+        // ignore encoding for now
+        var l = string.length,
+            a = new self.ByteArray(l),
+            i;
+        for (i = 0; i < l; i += 1) {
+            a[i] = string.charCodeAt(i) & 0xff;
+        }
+        return a;
+    }
+    this.byteArrayFromArray = function (array) {
+        return array.slice();
+    };
+    this.byteArrayFromString = function (string, encoding) {
+        var result;
+        if (encoding === "utf8") {
+            result = utf8ByteArrayFromString(string);
+        } else {
+            if (encoding !== "binary") {
+                self.log("unknown encoding: " + encoding);
+            }
+            result = byteArrayFromString(string);
+        }
+        return result;
+    };
+    this.byteArrayToString = Runtime.byteArrayToString;
+
+    /**
+     * @param {!string} msgOrCategory
+     * @param {string=} msg
+     * @return {undefined}
+     */
+    function log(msgOrCategory, msg) {
+        var node, doc, category;
+        if (msg) {
+            category = msgOrCategory;
+        } else {
+            msg = msgOrCategory;
+        }
+        if (logoutput) {
+            doc = logoutput.ownerDocument;
+            if (category) {
+                node = doc.createElement("span");
+                node.className = category;
+                node.appendChild(doc.createTextNode(category));
+                logoutput.appendChild(node);
+                logoutput.appendChild(doc.createTextNode(" "));
+            }
+            node = doc.createElement("span");
+            node.appendChild(doc.createTextNode(msg));
+            logoutput.appendChild(node);
+            logoutput.appendChild(doc.createElement("br"));
+        } else if (console) {
+            console.log(msg);
+        }
+    }
+    function readFile(path, encoding, callback) {
+        if (cache.hasOwnProperty(path)) {
+            callback(null, cache[path]);
+            return;
+        }
+        var xhr = new XMLHttpRequest();
+        function handleResult() {
+            var data;
+            if (xhr.readyState === 4) {
+                if (xhr.status === 0 && !xhr.responseText) {
+                    // for local files there is no difference between missing
+                    // and empty files, so empty files are considered as errors
+                    callback("File " + path + " is empty.");
+                } else if (xhr.status === 200 || xhr.status === 0) {
+                    // report file
+                    if (encoding === "binary") {
+                        if (typeof VBArray !== "undefined") { // IE9
+                            data = new VBArray(xhr.responseBody).toArray();
+                        } else {
+                            data = self.byteArrayFromString(xhr.responseText,
+                                "binary");
+                        }
+                    } else {
+                        data = xhr.responseText;
+                    }
+                    cache[path] = data;
+                    callback(null, data);
+                } else {
+                    // report error
+                    callback(xhr.responseText || xhr.statusText);
+                }
+            }
+        }
+        xhr.open('GET', path, true);
+        xhr.onreadystatechange = handleResult;
+        if (xhr.overrideMimeType) {
+            if (encoding !== "binary") {
+                xhr.overrideMimeType("text/plain; charset=" + encoding);
+            } else {
+                xhr.overrideMimeType("text/plain; charset=x-user-defined");
+            }
+        }
+        try {
+            xhr.send(null);
+        } catch (e) {
+            callback(e.message);
+        }
+    }
+    function read(path, offset, length, callback) {
+        if (cache.hasOwnProperty(path)) {
+            callback(null, cache[path].slice(offset, offset + length));
+            return;
+        }
+        var xhr = new XMLHttpRequest();
+        function handleResult() {
+            var data;
+            if (xhr.readyState === 4) {
+                if (xhr.status === 0 && !xhr.responseText) {
+                    // for local files there is no difference between missing
+                    // and empty files, so empty files are considered as errors
+                    callback("File " + path + " is empty.");
+                } else if (xhr.status === 200 || xhr.status === 0) {
+                    // report file
+                    if (typeof VBArray !== "undefined") {
+                        data = new VBArray(xhr.responseBody).toArray();
+                    } else {
+                        data = self.byteArrayFromString(xhr.responseText, "binary");
+                    }
+                    cache[path] = data;
+                    callback(null, data.slice(offset, offset + length));
+                } else {
+                    // report error
+                    callback(xhr.responseText || xhr.statusText);
+                }
+            }
+        }
+        xhr.open('GET', path, true);
+        xhr.onreadystatechange = handleResult;
+        if (xhr.overrideMimeType) {
+            xhr.overrideMimeType("text/plain; charset=x-user-defined");
+        }
+        //xhr.setRequestHeader('Range', 'bytes=' + offset + '-' +
+        //       (offset + length - 1));
+        try {
+            xhr.send(null);
+        } catch (e) {
+            callback(e.message);
+        }
+    }
+    function readFileSync(path, encoding) {
+        var xhr = new XMLHttpRequest(),
+            result;
+        xhr.open('GET', path, false);
+        if (xhr.overrideMimeType) {
+            if (encoding !== "binary") {
+                xhr.overrideMimeType("text/plain; charset=" + encoding);
+            } else {
+                xhr.overrideMimeType("text/plain; charset=x-user-defined");
+            }
+        }
+        try {
+            xhr.send(null);
+            if (xhr.status === 200 || xhr.status === 0) {
+                result = xhr.responseText;
+            }
+        } catch (e) {
+        }
+        return result;
+    }
+    function writeFile(path, data, callback) {
+        cache[path] = data;
+        var xhr = new XMLHttpRequest();
+        function handleResult() {
+            if (xhr.readyState === 4) {
+                if (xhr.status === 0 && !xhr.responseText) {
+                    // for local files there is no difference between missing
+                    // and empty files, so empty files are considered as errors
+                    callback("File " + path + " is empty.");
+                } else if ((xhr.status >= 200 && xhr.status < 300) ||
+                           xhr.status === 0) {
+                    // report success
+                    callback(null);
+                } else {
+                    // report error
+                    callback("Status " + String(xhr.status) + ": " +
+                            xhr.responseText || xhr.statusText);
+                }
+            }
+        }
+        xhr.open('PUT', path, true);
+        xhr.onreadystatechange = handleResult;
+        // ArrayBufferView will have an ArrayBuffer property, in WebKit, XHR can send()
+        // an ArrayBuffer, In Firefox, one must use sendAsBinary with a string
+        if (data.buffer && !xhr.sendAsBinary) {
+            data = data.buffer; // webkit supports sending an ArrayBuffer
+        } else {
+            // encode into a string, this works in FireFox >= 3
+            data = self.byteArrayToString(data, "binary");
+        }
+        try {
+            if (xhr.sendAsBinary) {
+                xhr.sendAsBinary(data);
+            } else {
+                xhr.send(data);
+            }
+        } catch (e) {
+            self.log("HUH? " + e + " " + data);
+            callback(e.message);
+        }
+    }
+    function deleteFile(path, callback) {
+        var xhr = new XMLHttpRequest();
+        xhr.open('DELETE', path, true);
+        xhr.onreadystatechange = function () {
+            if (xhr.readyState === 4) {
+                if (xhr.status < 200 && xhr.status >= 300) {
+                    callback(xhr.responseText);
+                } else {
+                    callback(null);
+                }
+            }
+        };
+        xhr.send(null);
+    }
+    function loadXML(path, callback) {
+        var xhr = new XMLHttpRequest();
+        function handleResult() {
+            if (xhr.readyState === 4) {
+                if (xhr.status === 0 && !xhr.responseText) {
+                    callback("File " + path + " is empty.");
+                } else if (xhr.status === 200 || xhr.status === 0) {
+                    // report file
+                    callback(null, xhr.responseXML);
+                } else {
+                    // report error
+                    callback(xhr.responseText);
+                }
+            }
+        }
+        xhr.open("GET", path, true);
+        if (xhr.overrideMimeType) {
+            xhr.overrideMimeType("text/xml");
+        }
+        xhr.onreadystatechange = handleResult;
+        try {
+            xhr.send(null);
+        } catch (e) {
+            callback(e.message);
+        }
+    }
+    function isFile(path, callback) {
+        self.getFileSize(path, function (size) {
+            callback(size !== -1);
+        });
+    }
+    function getFileSize(path, callback) {
+        var xhr = new XMLHttpRequest();
+        xhr.open("HEAD", path, true);
+        xhr.onreadystatechange = function () {
+            if (xhr.readyState !== 4) {
+                return;
+            }
+            var cl = xhr.getResponseHeader("Content-Length");
+            if (cl) {
+                callback(parseInt(cl, 10));
+            } else {
+                callback(-1);
+            }
+        };
+        xhr.send(null);
+    }
+    function wrap(nativeFunction, nargs) {
+        if (!nativeFunction) {
+            return null;
+        }
+        return function () {
+            // clear cache
+            cache = {};
+            // assume the last argument is a callback function
+            var callback = arguments[nargs],
+                args = Array.prototype.slice.call(arguments, 0, nargs),
+                callbackname = "callback" + String(Math.random()).substring(2);
+            window[callbackname] = function () {
+                delete window[callbackname];
+                callback.apply(this, arguments);
+            };
+            args.push(callbackname);
+            nativeFunction.apply(this, args);
+        };
+    }
+    this.readFile = readFile;
+    this.read = read;
+    this.readFileSync = readFileSync;
+    this.writeFile = writeFile;
+    this.deleteFile = deleteFile;
+    this.loadXML = loadXML;
+    this.isFile = isFile;
+    this.getFileSize = getFileSize;
+    this.log = log;
+    this.setTimeout = function (f, msec) {
+        setTimeout(function () {
+            f();
+        }, msec);
+    };
+    this.libraryPaths = function () {
+        return ["lib"]; // TODO: find a good solution
+                                       // probably let html app specify it
+    };
+    this.setCurrentDirectory = function (dir) {
+    };
+    this.type = function () {
+        return "BrowserRuntime";
+    };
+    this.getDOMImplementation = function () {
+        return window.document.implementation;
+    };
+    this.exit = function (exitCode) {
+        log("Calling exit with code " + String(exitCode) +
+                ", but exit() is not implemented.");
+    };
+    this.getWindow = function () {
+        return window;
+    };
+}
+
+/**
+ * @constructor
+ * @implements {Runtime}
+ */
+function NodeJSRuntime() {
+    "use strict";
+    var self = this,
+        fs = require('fs'),
+        currentDirectory = "";
+
+    /**
+     * @constructor
+     * @extends {Runtime.ByteArray}
+     * @param {!number} size
+     */
+    this.ByteArray = function (size) {
+        return new Buffer(size);
+    };
+
+    this.byteArrayFromArray = function (array) {
+        var ba = new Buffer(array.length),
+            i,
+            l = array.length;
+        for (i = 0; i < l; i += 1) {
+            ba[i] = array[i];
+        }
+        return ba;
+    };
+
+    this.concatByteArrays = function (a, b) {
+        var ba = new Buffer(a.length + b.length);
+        a.copy(ba, 0, 0);
+        b.copy(ba, a.length, 0);
+        return ba;
+    };
+
+    this.byteArrayFromString = function (string, encoding) {
+        return new Buffer(string, encoding);
+    };
+
+    this.byteArrayToString = function (bytearray, encoding) {
+        return bytearray.toString(encoding);
+    };
+
+    function isFile(path, callback) {
+        if (currentDirectory) {
+            path = currentDirectory + "/" + path;
+        }
+        fs.stat(path, function (err, stats) {
+            callback(!err && stats.isFile());
+        });
+    }
+    function loadXML(path, callback) {
+        throw "Not implemented.";
+    }
+    this.readFile = function (path, encoding, callback) {
+        if (encoding !== "binary") {
+            fs.readFile(path, encoding, callback);
+        } else {
+            fs.readFile(path, null, callback);
+/*
+            // we have to encode the returned buffer to a string
+            // it would be nice if we would have a blob or buffer object
+            fs.readFile(path, null, function (err, data) {
+                if (err) {
+                    callback(err);
+                    return;
+                }
+                callback(null, data.toString("binary"));
+            });
+*/
+        }
+    };
+    this.writeFile = function (path, data, callback) {
+        fs.writeFile(path, data, "binary", function (err) {
+            callback(err || null);
+        });
+    };
+    this.deleteFile = fs.unlink;
+    this.read = function (path, offset, length, callback) {
+        if (currentDirectory) {
+            path = currentDirectory + "/" + path;
+        }
+        fs.open(path, "r+", 666, function (err, fd) {
+            if (err) {
+                callback(err);
+                return;
+            }
+            var buffer = new Buffer(length);
+            fs.read(fd, buffer, 0, length, offset, function (err, bytesRead) {
+                fs.close(fd);
+                callback(err, buffer);
+            });
+        });
+    };
+    this.readFileSync = function (path, encoding) {
+        if (!encoding) {
+            return "";
+        }
+        return fs.readFileSync(path, encoding);
+    };
+    this.loadXML = loadXML;
+    this.isFile = isFile;
+    this.getFileSize = function (path, callback) {
+        if (currentDirectory) {
+            path = currentDirectory + "/" + path;
+        }
+        fs.stat(path, function (err, stats) {
+            if (err) {
+                callback(-1);
+            } else {
+                callback(stats.size);
+            }
+        });
+    };
+    this.log = function (msg) {
+        process.stderr.write(msg + '\n');
+    };
+    this.setTimeout = function (f, msec) {
+        setTimeout(function () {
+            f();
+        }, msec);
+    };
+    this.libraryPaths = function () {
+        return [__dirname];
+    };
+    this.setCurrentDirectory = function (dir) {
+        currentDirectory = dir;
+    };
+    this.currentDirectory = function () {
+        return currentDirectory;
+    };
+    this.type = function () {
+        return "NodeJSRuntime";
+    };
+    this.getDOMImplementation = function () {
+        return null;
+    };
+    this.exit = process.exit;
+    this.getWindow = function () {
+        return null;
+    };
+}
+
+/**
+ * @constructor
+ * @implements {Runtime}
+ */
+function RhinoRuntime() {
+    "use strict";
+    var self = this,
+        dom = Packages.javax.xml.parsers.DocumentBuilderFactory.newInstance(),
+        builder,
+        entityresolver,
+        currentDirectory = "";
+    dom.setValidating(false);
+    dom.setNamespaceAware(true);
+    dom.setExpandEntityReferences(false);
+    dom.setSchema(null);
+    entityresolver = Packages.org.xml.sax.EntityResolver({
+        resolveEntity: function (publicId, systemId) {
+            var file, open = function (path) {
+                var reader = new Packages.java.io.FileReader(path),
+                    source = new Packages.org.xml.sax.InputSource(reader);
+                return source;
+            };
+            file = systemId;
+            //file = /[^\/]*$/.exec(systemId); // what should this do?
+            return open(file);
+        }
+    });
+    //dom.setEntityResolver(entityresolver);
+    builder = dom.newDocumentBuilder();
+    builder.setEntityResolver(entityresolver);
+
+    /**
+     * @constructor
+     * @param {!number} size
+     */
+    this.ByteArray = function ByteArray(size) {
+        return [size];
+    };
+    this.byteArrayFromArray = function (array) {
+        return array;
+    };
+    this.byteArrayFromString = function (string, encoding) {
+        // ignore encoding for now
+        var a = [], i, l = string.length;
+        for (i = 0; i < l; i += 1) {
+            a[i] = string.charCodeAt(i) & 0xff;
+        }
+        return a;
+    };
+    this.byteArrayToString = Runtime.byteArrayToString;
+    this.concatByteArrays = function (bytearray1, bytearray2) {
+        return bytearray1.concat(bytearray2);
+    };
+
+    function loadXML(path, callback) {
+        var file = new Packages.java.io.File(path),
+            document;
+        try {
+            document = builder.parse(file);
+        } catch (err) {
+            print(err);
+            callback(err);
+            return;
+        }
+        callback(null, document);
+    }
+    function runtimeReadFile(path, encoding, callback) {
+        var file = new Packages.java.io.File(path),
+            data,
+            // read binary, seems hacky but works
+            rhinoencoding = (encoding === "binary") ? "latin1" : encoding;
+        if (!file.isFile()) {
+            callback(path + " is not a file.");
+        } else {
+            data = readFile(path, rhinoencoding);
+            if (encoding === "binary") {
+                data = self.byteArrayFromString(data, "binary");
+            }
+            callback(null, data);
+        }
+    }
+    /**
+     * @param {!string} path
+     * @param {!string} encoding
+     * @return {?string}
+     */
+    function runtimeReadFileSync(path, encoding) {
+        var file = new Packages.java.io.File(path), data, i;
+        if (!file.isFile()) {
+            return null;
+        }
+        if (encoding === "binary") {
+            encoding = "latin1"; // read binary, seems hacky but works
+        }
+        return readFile(path, encoding);
+    }
+    function isFile(path, callback) {
+        if (currentDirectory) {
+            path = currentDirectory + "/" + path;
+        }
+        var file = new Packages.java.io.File(path);
+        callback(file.isFile());
+    }
+    this.loadXML = loadXML;
+    this.readFile = runtimeReadFile;
+    this.writeFile = function (path, data, callback) {
+        var out = new Packages.java.io.FileOutputStream(path),
+            i,
+            l = data.length;
+        for (i = 0; i < l; i += 1) {
+            out.write(data[i]);
+        }
+        out.close();
+        callback(null);
+    };
+    this.deleteFile = function (path, callback) {
+        var file = new Packages.java.io.File(path);
+        if (file['delete']()) {
+            callback(null);
+        } else {
+            callback("Could not delete " + path);
+        }
+    };
+    this.read = function (path, offset, length, callback) {
+        // TODO: adapt to read only a part instead of the whole file
+        if (currentDirectory) {
+            path = currentDirectory + "/" + path;
+        }
+        var data = runtimeReadFileSync(path, "binary");
+        if (data) {
+            callback(null, this.byteArrayFromString(
+                data.substring(offset, offset + length),
+                "binary"
+            ));
+        } else {
+            callback("Cannot read " + path);
+        }
+    };
+    this.readFileSync = function (path, encoding) {
+        if (!encoding) {
+            return "";
+        }
+        return readFile(path, encoding);
+    };
+    this.isFile = isFile;
+    this.getFileSize = function (path, callback) {
+        if (currentDirectory) {
+            path = currentDirectory + "/" + path;
+        }
+        var file = new Packages.java.io.File(path);
+        callback(file.length());
+    };
+    this.log = print;
+    this.setTimeout = function (f, msec) {
+        f();
+    };
+    this.libraryPaths = function () {
+        return ["lib"];
+    };
+    this.setCurrentDirectory = function (dir) {
+        currentDirectory = dir;
+    };
+    this.currentDirectory = function () {
+        return currentDirectory;
+    };
+    this.type = function () {
+        return "RhinoRuntime";
+    };
+    this.getDOMImplementation = function () {
+        return builder.getDOMImplementation();
+    };
+    this.exit = quit;
+    this.getWindow = function () {
+        return null;
+    };
+}
+
+/**
+ * @const
+ * @type {Runtime}
+ */
+var runtime = (function () {
+    "use strict";
+    var result;
+    if (typeof window !== "undefined") {
+        result = new BrowserRuntime(window.document.getElementById("logoutput"));
+    } else if (typeof require !== "undefined") {
+        result = new NodeJSRuntime();
+    } else {
+        result = new RhinoRuntime();
+    }
+    return result;
+}());
+/*jslint sloppy: true*/
+(function () {
+    var cache = {},
+        dircontents = {};
+    function getOrDefinePackage(packageNameComponents) {
+        var topname = packageNameComponents[0],
+            i,
+            pkg;
+        // ensure top level package exists
+        pkg = eval("if (typeof " + topname + " === 'undefined') {" +
+                "eval('" + topname + " = {};');}" + topname);
+        for (i = 1; i < packageNameComponents.length - 1; i += 1) {
+            if (!pkg.hasOwnProperty(packageNameComponents[i])) {
+                pkg = pkg[packageNameComponents[i]] = {};
+            }
+        }
+        return pkg[packageNameComponents[packageNameComponents.length - 1]];
+    }
+    /**
+     * @param {string} classpath
+     * @returns {undefined}
+     */
+    runtime.loadClass = function (classpath) {
+        if (IS_COMPILED_CODE) {
+            return;
+        }
+        if (cache.hasOwnProperty(classpath)) {
+            return;
+        }
+        var names = classpath.split("."),
+            impl;
+        impl = getOrDefinePackage(names);
+        if (impl) {
+            cache[classpath] = true;
+            return;
+        }
+        function getPathFromManifests(classpath) {
+            var path = classpath.replace(".", "/") + ".js",
+                dirs = runtime.libraryPaths(),
+                i,
+                dir,
+                code;
+            if (runtime.currentDirectory) {
+                dirs.push(runtime.currentDirectory());
+            }
+            for (i = 0; i < dirs.length; i += 1) {
+                dir = dirs[i];
+                if (!dircontents.hasOwnProperty(dir)) {
+                    code = runtime.readFileSync(dirs[i] + "/manifest.js",
+                            "utf8");
+                    if (code && code.length) {
+                        try {
+                            dircontents[dir] = eval(code);
+                        } catch (e1) {
+                            dircontents[dir] = null;
+                            runtime.log("Cannot load manifest for " + dir +
+                                    ".");
+                        }
+                    } else {
+                        dircontents[dir] = null;
+                    }
+                }
+                code = null;
+                dir = dircontents[dir];
+                if (dir && dir.indexOf && dir.indexOf(path) !== -1) {
+                    return dirs[i] + "/" + path;
+                }
+            }
+            return null;
+        }
+        function load(classpath) {
+            var code, path;
+            path = getPathFromManifests(classpath);
+            if (!path) {
+                throw classpath + " is not listed in any manifest.js.";
+            }
+            try {
+                code = runtime.readFileSync(path, "utf8");
+            } catch (e2) {
+                runtime.log("Error loading " + classpath + " " + e2);
+                throw e2;
+            }
+            if (code === undefined) {
+                throw "Cannot load class " + classpath;
+            }
+            try {
+                code = eval(classpath + " = eval(code);");
+            } catch (e4) {
+                runtime.log("Error loading " + classpath + " " + e4);
+                throw e4;
+            }
+            return code;
+        }
+        // check if the class in context already
+        impl = load(classpath);
+        if (!impl || Runtime.getFunctionName(impl) !==
+                names[names.length - 1]) {
+            runtime.log("Loaded code is not for " + names[names.length - 1]);
+            throw "Loaded code is not for " + names[names.length - 1];
+        }
+        cache[classpath] = true;
+    };
+}());
+(function (args) {
+    args = Array.prototype.slice.call(args);
+    function run(argv) {
+        if (!argv.length) {
+            return;
+        }
+        var script = argv[0];
+        runtime.readFile(script, "utf8", function (err, code) {
+            var path = "",
+                paths = runtime.libraryPaths();
+            if (script.indexOf("/") !== -1) {
+                path = script.substring(0, script.indexOf("/"));
+            }
+            runtime.setCurrentDirectory(path);
+            function run() {
+                var script, path, paths, args, argv, result; // hide variables
+                // execute script and make arguments available via argv
+                result = eval(code);
+                if (result) {
+                    runtime.exit(result);
+                }
+                return;
+            }
+            if (err) {
+                runtime.log(err);
+                runtime.exit(1);
+            } else {
+                // run the script with arguments bound to arguments parameter
+                run.apply(null, argv);
+            }
+        });
+    }
+    // if rhino or node.js, run the scripts provided as arguments
+    if (runtime.type() === "NodeJSRuntime") {
+        run(process.argv.slice(2));
+    } else if (runtime.type() === "RhinoRuntime") {
+        run(args);
+    } else {
+        run(args.slice(1));
+    }
+}(typeof arguments !== "undefined" && arguments));
+
diff --git a/apps/files_odfviewer/src/webodf/webodf/lib/xmldom/LSSerializer.js b/apps/files_odfviewer/src/webodf/webodf/lib/xmldom/LSSerializer.js
new file mode 100644
index 0000000000..12b3219f81
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/lib/xmldom/LSSerializer.js
@@ -0,0 +1,197 @@
+/**
+ * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
+ * @licstart
+ * The JavaScript code in this page is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU Affero General Public License
+ * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.  The code is distributed
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
+ *
+ * As additional permission under GNU AGPL version 3 section 7, you
+ * may distribute non-source (e.g., minimized or compacted) forms of
+ * that code without the copy of the GNU GPL normally required by
+ * section 4, provided you include this license notice and a URL
+ * through which recipients can access the Corresponding Source.
+ *
+ * As a special exception to the AGPL, any HTML file which merely makes function
+ * calls to this code, and for that purpose includes it by reference shall be
+ * deemed a separate work for copyright law purposes. In addition, the copyright
+ * holders of this code give you permission to combine this code with free
+ * software libraries that are released under the GNU LGPL. You may copy and
+ * distribute such a system following the terms of the GNU AGPL for this code
+ * and the LGPL for the libraries. If you modify this code, you may extend this
+ * exception to your version of the code, but you are not obligated to do so.
+ * If you do not wish to do so, delete this exception statement from your
+ * version.
+ *
+ * This license applies to this entire compilation.
+ * @licend
+ * @source: http://www.webodf.org/
+ * @source: http://gitorious.org/odfkit/webodf/
+ */
+/*global xmldom*/
+/*jslint sub: true*/
+if (typeof Object.create !== 'function') {
+    Object['create'] = function (o) {
+        "use strict";
+        /**
+         * @constructor
+         */
+        var F = function () {};
+        F.prototype = o;
+        return new F();
+    };
+}
+
+/**
+ * Partial implementation of LSSerializer
+ * @constructor
+ */
+xmldom.LSSerializer = function LSSerializer() {
+    "use strict";
+    var /**@const@type{!LSSerializer}*/ self = this;
+
+    /**
+     * @param {!string} prefix
+     * @param {!Attr} attr
+     * @return {!string}
+     */
+    function serializeAttribute(prefix, attr) {
+        var /**@type{!string}*/ s = prefix + attr.localName + "=\"" +
+            attr.nodeValue + "\"";
+        return s;
+    }
+    /**
+     * @param {!Object.<string,string>} nsmap
+     * @param {string} prefix
+     * @param {string} ns
+     * @return {!string}
+     */
+    function attributePrefix(nsmap, prefix, ns) {
+        // TODO: check for double prefix definitions, this needs a special class
+        if (nsmap.hasOwnProperty(ns)) {
+            return nsmap[ns] + ":";
+        }
+        if (nsmap[ns] !== prefix) {
+            nsmap[ns] = prefix;
+        }
+        return prefix + ":";
+    }
+    /**
+     * @param {!Object.<string,string>} nsmap
+     * @param {!Node} node
+     * @return {!string}
+     */
+    function startNode(nsmap, node) {
+        var /**@type{!string}*/ s = "",
+            /**@const@type{!NamedNodeMap}*/ atts = node.attributes,
+            /**@const@type{!number}*/ length,
+            /**@type{!number}*/ i,
+            /**@type{!Attr}*/ attr,
+            /**@type{!string}*/ attstr = "",
+            /**@type{!number}*/ accept,
+            /**@type{!string}*/ prefix;
+        if (atts) { // ELEMENT
+            if (nsmap[node.namespaceURI] !== node.prefix) {
+                nsmap[node.namespaceURI] = node.prefix;
+            }
+            s += "<" + node.nodeName;
+            length = atts.length;
+            for (i = 0; i < length; i += 1) {
+                attr = /**@type{!Attr}*/(atts.item(i));
+                if (attr.namespaceURI !== "http://www.w3.org/2000/xmlns/") {
+                    accept = (self.filter) ? self.filter.acceptNode(attr) : 1;
+                    if (accept === 1) {
+                        // xml attributes always need a prefix for a namespace
+                        if (attr.namespaceURI) {
+                           prefix = attributePrefix(nsmap, attr.prefix,
+                                   attr.namespaceURI);
+                        } else {
+                           prefix = "";
+                        }
+                        attstr += " " + serializeAttribute(prefix, attr);
+                    }
+                }
+            }
+            for (i in nsmap) {
+                if (nsmap.hasOwnProperty(i)) {
+                    prefix = nsmap[i];
+                    if (!prefix) {
+                        s += " xmlns=\"" + i + "\"";
+                    } else if (prefix !== "xmlns") {
+                        s += " xmlns:" + nsmap[i] + "=\"" + i + "\"";
+                    }
+                }
+            }
+            s += attstr + ">";
+        }
+        return s;
+    }
+    /**
+     * @param {!Node} node
+     * @return {!string}
+     */
+    function endNode(node) {
+        var /**@type{!string}*/ s = "";
+        if (node.nodeType === 1) { // ELEMENT
+            s += "</" + node.nodeName + ">";
+        }
+        return s;
+    }
+    /**
+     * @param {!Object.<string,string>} parentnsmap
+     * @param {!Node} node
+     * @return {!string}
+     */
+    function serializeNode(parentnsmap, node) {
+        var /**@type{!string}*/ s = "",
+            /**@const@type{!Object.<string,string>}*/ nsmap
+                = Object.create(parentnsmap),
+            /**@const@type{!number}*/ accept
+                = (self.filter) ? self.filter.acceptNode(node) : 1,
+            /**@type{Node}*/child;
+        if (accept === 1) {
+            s += startNode(nsmap, node);
+        }
+        if (accept === 1 || accept === 3) {
+            child = node.firstChild;
+            while (child) {
+                s += serializeNode(nsmap, child);
+                child = child.nextSibling;
+            }
+            if (node.nodeValue) {
+                s += node.nodeValue;
+            }
+        }
+        if (accept === 1) {
+            s += endNode(node);
+        }
+        return s;
+    }
+    function invertMap(map) {
+        var m = {}, i;
+        for (i in map) {
+            if (map.hasOwnProperty(i)) {
+                m[map[i]] = i;
+            }
+        }
+        return m;
+    }
+    /**
+     * @type {xmldom.LSSerializerFilter}
+     */
+    this.filter = null;
+    /**
+     * @param {!Node} node
+     * @param {!Object.<string,string>} nsmap
+     * @return {!string}
+     */
+    this.writeToString = function (node, nsmap) {
+        if (!node) {
+            return "";
+        }
+        nsmap = nsmap ? invertMap(nsmap) : {};
+        return serializeNode(nsmap, node);
+    };
+};
diff --git a/apps/files_odfviewer/src/webodf/webodf/lib/xmldom/LSSerializerFilter.js b/apps/files_odfviewer/src/webodf/webodf/lib/xmldom/LSSerializerFilter.js
new file mode 100644
index 0000000000..889428b831
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/lib/xmldom/LSSerializerFilter.js
@@ -0,0 +1,40 @@
+/**
+ * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
+ * @licstart
+ * The JavaScript code in this page is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU Affero General Public License
+ * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.  The code is distributed
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
+ *
+ * As additional permission under GNU AGPL version 3 section 7, you
+ * may distribute non-source (e.g., minimized or compacted) forms of
+ * that code without the copy of the GNU GPL normally required by
+ * section 4, provided you include this license notice and a URL
+ * through which recipients can access the Corresponding Source.
+ *
+ * As a special exception to the AGPL, any HTML file which merely makes function
+ * calls to this code, and for that purpose includes it by reference shall be
+ * deemed a separate work for copyright law purposes. In addition, the copyright
+ * holders of this code give you permission to combine this code with free
+ * software libraries that are released under the GNU LGPL. You may copy and
+ * distribute such a system following the terms of the GNU AGPL for this code
+ * and the LGPL for the libraries. If you modify this code, you may extend this
+ * exception to your version of the code, but you are not obligated to do so.
+ * If you do not wish to do so, delete this exception statement from your
+ * version.
+ *
+ * This license applies to this entire compilation.
+ * @licend
+ * @source: http://www.webodf.org/
+ * @source: http://gitorious.org/odfkit/webodf/
+ */
+/*global xmldom*/
+/**
+ * Partial implementation of LSSerializerFilter
+ * @interface
+ */
+xmldom.LSSerializerFilter = function LSSerializerFilter() {
+    "use strict";
+};
diff --git a/apps/files_odfviewer/src/webodf/webodf/lib/xmldom/OperationalTransformDOM.js b/apps/files_odfviewer/src/webodf/webodf/lib/xmldom/OperationalTransformDOM.js
new file mode 100644
index 0000000000..5e9f3abacf
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/lib/xmldom/OperationalTransformDOM.js
@@ -0,0 +1,115 @@
+/**
+ * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
+ * @licstart
+ * The JavaScript code in this page is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU Affero General Public License
+ * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.  The code is distributed
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
+ *
+ * As additional permission under GNU AGPL version 3 section 7, you
+ * may distribute non-source (e.g., minimized or compacted) forms of
+ * that code without the copy of the GNU GPL normally required by
+ * section 4, provided you include this license notice and a URL
+ * through which recipients can access the Corresponding Source.
+ *
+ * As a special exception to the AGPL, any HTML file which merely makes function
+ * calls to this code, and for that purpose includes it by reference shall be
+ * deemed a separate work for copyright law purposes. In addition, the copyright
+ * holders of this code give you permission to combine this code with free
+ * software libraries that are released under the GNU LGPL. You may copy and
+ * distribute such a system following the terms of the GNU AGPL for this code
+ * and the LGPL for the libraries. If you modify this code, you may extend this
+ * exception to your version of the code, but you are not obligated to do so.
+ * If you do not wish to do so, delete this exception statement from your
+ * version.
+ *
+ * This license applies to this entire compilation.
+ * @licend
+ * @source: http://www.webodf.org/
+ * @source: http://gitorious.org/odfkit/webodf/
+ */
+/*global xmldom*/
+/**
+ * @class
+ * @constructor
+ * @augments xmldom.OperationalTransformInterface
+ * @implements {xmldom.OperationalTransformInterface}
+ * @param {Element} root
+ * @param {xmldom.LSSerializer} serializer
+ */
+xmldom.OperationalTransformDOM = function OperationalTransformDOM(root, serializer) {
+    "use strict";
+    var pos, length;
+    /**
+     * Skip in the document
+     * @param {!number} amount
+     * @return {undefined}
+     */
+    function retain(amount) {}
+    /**
+     * Insert characters
+     * Can throw an exception if the current position does not allow insertion
+     * of characters.
+     * @param {!string} chars
+     * @return {undefined}
+     */
+    function insertCharacters(chars) {}
+    /**
+     * Insert element start
+     * @param {!string} tagname
+     * @param {!Object} attributes
+     * @return {undefined}
+     */
+    function insertElementStart(tagname, attributes) {}
+    /**
+     * Insert element end
+     * @return {undefined}
+     */
+    function insertElementEnd() {}
+    /**
+     * Delete characters
+     * @param {!number} amount
+     * @return {undefined}
+     */
+    function deleteCharacters(amount) {}
+    /**
+     * Delete element start
+     * @return {undefined}
+     */
+    function deleteElementStart() {}
+    /**
+     * Delete element end
+     * @return {undefined}
+     */
+    function deleteElementEnd() {}
+    /**
+     * Replace attributes
+     * @param {!Object} atts
+     * @return {undefined}
+     */
+    function replaceAttributes(atts) {}
+    /**
+     * Update attributes
+     * @param {!Object} atts
+     * @return {undefined}
+     */
+    function updateAttributes(atts) {}
+    /**
+     * @return {!boolean}
+     */
+    function atEnd() {
+        return pos === length;
+    }
+    this.retain = retain;
+    this.insertCharacters = insertCharacters;
+    this.insertElementStart = insertElementStart;
+    this.insertElementEnd = insertElementEnd;
+    this.deleteCharacters = deleteCharacters;
+    this.deleteElementStart = deleteElementStart;
+    this.deleteElementEnd = deleteElementEnd;
+    this.replaceAttributes = replaceAttributes;
+    this.updateAttributes = updateAttributes;
+    this.atEnd = atEnd;
+};
diff --git a/apps/files_odfviewer/src/webodf/webodf/lib/xmldom/OperationalTransformInterface.js b/apps/files_odfviewer/src/webodf/webodf/lib/xmldom/OperationalTransformInterface.js
new file mode 100644
index 0000000000..03aab1232b
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/lib/xmldom/OperationalTransformInterface.js
@@ -0,0 +1,97 @@
+/**
+ * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
+ * @licstart
+ * The JavaScript code in this page is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU Affero General Public License
+ * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.  The code is distributed
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
+ *
+ * As additional permission under GNU AGPL version 3 section 7, you
+ * may distribute non-source (e.g., minimized or compacted) forms of
+ * that code without the copy of the GNU GPL normally required by
+ * section 4, provided you include this license notice and a URL
+ * through which recipients can access the Corresponding Source.
+ *
+ * As a special exception to the AGPL, any HTML file which merely makes function
+ * calls to this code, and for that purpose includes it by reference shall be
+ * deemed a separate work for copyright law purposes. In addition, the copyright
+ * holders of this code give you permission to combine this code with free
+ * software libraries that are released under the GNU LGPL. You may copy and
+ * distribute such a system following the terms of the GNU AGPL for this code
+ * and the LGPL for the libraries. If you modify this code, you may extend this
+ * exception to your version of the code, but you are not obligated to do so.
+ * If you do not wish to do so, delete this exception statement from your
+ * version.
+ *
+ * This license applies to this entire compilation.
+ * @licend
+ * @source: http://www.webodf.org/
+ * @source: http://gitorious.org/odfkit/webodf/
+ */
+/*global xmldom*/
+/**
+ * This interface allows a document to be modified by operational
+ * transformations. The interface is modelled after Google Wave.
+ * Manual editing of XML documents will also be done via this interface.
+ *
+ * 
+ * @class
+ * @interface
+ */
+xmldom.OperationalTransformInterface = function () {"use strict"; };
+/**
+ * Skip in the document
+ * @param {!number} amount
+ * @return {undefined}
+ */
+xmldom.OperationalTransformInterface.prototype.retain = function (amount) {"use strict"; };
+/**
+ * Insert characters
+ * Can throw an exception if the current position does not allow insertion of
+ * characters.
+ * @param {!string} chars
+ * @return {undefined}
+ */
+xmldom.OperationalTransformInterface.prototype.insertCharacters = function (chars) {"use strict"; };
+/**
+ * Insert element start
+ * @param {!string} tagname
+ * @param {!Object} attributes
+ * @return {undefined}
+ */
+xmldom.OperationalTransformInterface.prototype.insertElementStart = function (tagname, attributes) {"use strict"; };
+/**
+ * Insert element end
+ * @return {undefined}
+ */
+xmldom.OperationalTransformInterface.prototype.insertElementEnd = function () {"use strict"; };
+/**
+ * Delete characters
+ * @param {!number} amount
+ * @return {undefined}
+ */
+xmldom.OperationalTransformInterface.prototype.deleteCharacters = function (amount) {"use strict"; };
+/**
+ * Delete element start
+ * @return {undefined}
+ */
+xmldom.OperationalTransformInterface.prototype.deleteElementStart = function () {"use strict"; };
+/**
+ * Delete element end
+ * @return {undefined}
+ */
+xmldom.OperationalTransformInterface.prototype.deleteElementEnd = function () {"use strict"; };
+/**
+ * Replace attributes
+ * @param {!Object} atts
+ * @return {undefined}
+ */
+xmldom.OperationalTransformInterface.prototype.replaceAttributes = function (atts) {"use strict"; };
+/**
+ * Update attributes
+ * @param {!Object} atts
+ * @return {undefined}
+ */
+xmldom.OperationalTransformInterface.prototype.updateAttributes = function (atts) {"use strict"; };
diff --git a/apps/files_odfviewer/src/webodf/webodf/lib/xmldom/RelaxNG.js b/apps/files_odfviewer/src/webodf/webodf/lib/xmldom/RelaxNG.js
new file mode 100644
index 0000000000..e04c3c7611
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/lib/xmldom/RelaxNG.js
@@ -0,0 +1,691 @@
+/**
+ * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
+ * @licstart
+ * The JavaScript code in this page is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU Affero General Public License
+ * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.  The code is distributed
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
+ *
+ * As additional permission under GNU AGPL version 3 section 7, you
+ * may distribute non-source (e.g., minimized or compacted) forms of
+ * that code without the copy of the GNU GPL normally required by
+ * section 4, provided you include this license notice and a URL
+ * through which recipients can access the Corresponding Source.
+ *
+ * As a special exception to the AGPL, any HTML file which merely makes function
+ * calls to this code, and for that purpose includes it by reference shall be
+ * deemed a separate work for copyright law purposes. In addition, the copyright
+ * holders of this code give you permission to combine this code with free
+ * software libraries that are released under the GNU LGPL. You may copy and
+ * distribute such a system following the terms of the GNU AGPL for this code
+ * and the LGPL for the libraries. If you modify this code, you may extend this
+ * exception to your version of the code, but you are not obligated to do so.
+ * If you do not wish to do so, delete this exception statement from your
+ * version.
+ *
+ * This license applies to this entire compilation.
+ * @licend
+ * @source: http://www.webodf.org/
+ * @source: http://gitorious.org/odfkit/webodf/
+ */
+/*global runtime: true, xmldom: true*/
+
+/**
+ * RelaxNG can check a DOM tree against a Relax NG schema
+ * The RelaxNG implementation is currently not complete. Relax NG should not
+ * report errors on valid DOM trees, but it will not check all constraints that
+ * a Relax NG file can define. The current implementation does not load external
+ * parts of a Relax NG file.
+ * The main purpose of this Relax NG engine is to validate runtime ODF
+ * documents. The DOM tree is traversed via a TreeWalker. A custom TreeWalker
+ * implementation can hide parts of a DOM tree. This is useful in WebODF, where
+ * special elements and attributes in the runtime DOM tree.
+ *
+ * implementation according to
+ * http://www.thaiopensource.com/relaxng/derivative.html
+ */
+runtime.loadClass("xmldom.RelaxNGParser");
+/**
+ * @constructor
+ */
+xmldom.RelaxNG = function RelaxNG() {
+    "use strict";
+    var xmlnsns = "http://www.w3.org/2000/xmlns/",
+        createChoice,
+        createInterleave,
+        createGroup,
+        createAfter,
+        createOneOrMore,
+        createValue,
+        createAttribute,
+        createNameClass,
+        createData,
+        makePattern,
+        notAllowed = {
+            type: "notAllowed",
+            nullable: false,
+            hash: "notAllowed",
+            textDeriv: function () { return notAllowed; },
+            startTagOpenDeriv: function () { return notAllowed; },
+            attDeriv: function () { return notAllowed; },
+            startTagCloseDeriv: function () { return notAllowed; },
+            endTagDeriv: function () { return notAllowed; }
+        },
+        empty = {
+            type: "empty",
+            nullable: true,
+            hash: "empty",
+            textDeriv: function () { return notAllowed; },
+            startTagOpenDeriv: function () { return notAllowed; },
+            attDeriv: function (context, attribute) { return notAllowed; },
+            startTagCloseDeriv: function () { return empty; },
+            endTagDeriv: function () { return notAllowed; }
+        },
+        text = {
+            type: "text",
+            nullable: true,
+            hash: "text",
+            textDeriv: function () { return text; },
+            startTagOpenDeriv: function () { return notAllowed; },
+            attDeriv: function () { return notAllowed; },
+            startTagCloseDeriv: function () { return text; },
+            endTagDeriv: function () { return notAllowed; }
+        },
+        applyAfter,
+        childDeriv,
+        rootPattern;
+
+    function memoize0arg(func) {
+        return (function () {
+            var cache;
+            return function () {
+                if (cache === undefined) {
+                    cache = func();
+                }
+                return cache;
+            };
+        }());
+    }
+    function memoize1arg(type, func) {
+        return (function () {
+            var cache = {}, cachecount = 0;
+            return function (a) {
+                var ahash = a.hash || a.toString(),
+                    v;
+                v = cache[ahash];
+                if (v !== undefined) {
+                    return v;
+                }
+                cache[ahash] = v = func(a);
+                v.hash = type + cachecount.toString();
+                cachecount += 1;
+                return v;
+            };
+        }());
+    }
+    function memoizeNode(func) {
+        return (function () {
+            var cache = {};
+            return function (node) {
+                var v, m;
+                m = cache[node.localName];
+                if (m === undefined) {
+                    cache[node.localName] = m = {};
+                } else {
+                    v = m[node.namespaceURI];
+                    if (v !== undefined) {
+                        return v;
+                    }
+                }
+                m[node.namespaceURI] = v = func(node);
+                return v;
+            };
+        }());
+    }
+    function memoize2arg(type, fastfunc, func) {
+        return (function () {
+            var cache = {}, cachecount = 0;
+            return function (a, b) {
+                var v = fastfunc && fastfunc(a, b),
+                    ahash, bhash, m;
+                if (v !== undefined) { return v; }
+                ahash = a.hash || a.toString();
+                bhash = b.hash || b.toString();
+                m = cache[ahash];
+                if (m === undefined) {
+                    cache[ahash] = m = {};
+                } else {
+                    v = m[bhash];
+                    if (v !== undefined) {
+                        return v;
+                    }
+                }
+                m[bhash] = v = func(a, b);
+                v.hash = type + cachecount.toString();
+                cachecount += 1;
+                return v;
+            };
+        }());
+    }
+    // this memoize function can be used for functions where the order of two
+    // arguments is not important
+    function unorderedMemoize2arg(type, fastfunc, func) {
+        return (function () {
+            var cache = {}, cachecount = 0;
+            return function (a, b) {
+                var v = fastfunc && fastfunc(a, b),
+                    ahash, bhash, m;
+                if (v !== undefined) { return v; }
+                ahash = a.hash || a.toString();
+                bhash = b.hash || b.toString();
+                if (ahash < bhash) {
+                    m = ahash; ahash = bhash; bhash = m;
+                    m = a; a = b; b = m;
+                }
+                m = cache[ahash];
+                if (m === undefined) {
+                    cache[ahash] = m = {};
+                } else {
+                    v = m[bhash];
+                    if (v !== undefined) {
+                        return v;
+                    }
+                }
+                m[bhash] = v = func(a, b);
+                v.hash = type + cachecount.toString();
+                cachecount += 1;
+                return v;
+            };
+        }());
+    }
+    function getUniqueLeaves(leaves, pattern) {
+        if (pattern.p1.type === "choice") {
+            getUniqueLeaves(leaves, pattern.p1);
+        } else {
+            leaves[pattern.p1.hash] = pattern.p1;
+        }
+        if (pattern.p2.type === "choice") {
+            getUniqueLeaves(leaves, pattern.p2);
+        } else {
+            leaves[pattern.p2.hash] = pattern.p2;
+        }
+    }
+    createChoice = memoize2arg("choice", function (p1, p2) {
+        if (p1 === notAllowed) { return p2; }
+        if (p2 === notAllowed) { return p1; }
+        if (p1 === p2) { return p1; }
+    }, function (p1, p2) {
+        function makeChoice(p1, p2) {
+            return {
+                type: "choice",
+                p1: p1,
+                p2: p2,
+                nullable: p1.nullable || p2.nullable,
+                textDeriv: function (context, text) {
+                    return createChoice(p1.textDeriv(context, text),
+                        p2.textDeriv(context, text));
+                },
+                startTagOpenDeriv: memoizeNode(function (node) {
+                    return createChoice(p1.startTagOpenDeriv(node),
+                        p2.startTagOpenDeriv(node));
+                }),
+                attDeriv: function (context, attribute) {
+                    return createChoice(p1.attDeriv(context, attribute),
+                        p2.attDeriv(context, attribute));
+                },
+                startTagCloseDeriv: memoize0arg(function () {
+                    return createChoice(p1.startTagCloseDeriv(),
+                        p2.startTagCloseDeriv());
+                }),
+                endTagDeriv: memoize0arg(function () {
+                    return createChoice(p1.endTagDeriv(), p2.endTagDeriv());
+                })
+            };
+        }
+        var leaves = {}, i;
+        getUniqueLeaves(leaves, {p1: p1, p2: p2});
+        p1 = undefined;
+        p2 = undefined;
+        for (i in leaves) {
+            if (leaves.hasOwnProperty(i)) {
+                if (p1 === undefined) {
+                    p1 = leaves[i];
+                } else if (p2 === undefined) {
+                    p2 = leaves[i];
+                } else {
+                    p2 = createChoice(p2, leaves[i]);
+                }
+            }
+        }
+        return makeChoice(p1, p2);
+    });
+    createInterleave = unorderedMemoize2arg("interleave", function (p1, p2) {
+        if (p1 === notAllowed || p2 === notAllowed) { return notAllowed; }
+        if (p1 === empty) { return p2; }
+        if (p2 === empty) { return p1; }
+    }, function (p1, p2) {
+        return {
+            type: "interleave",
+            p1: p1,
+            p2: p2,
+            nullable: p1.nullable && p2.nullable,
+            textDeriv: function (context, text) {
+                return createChoice(
+                    createInterleave(p1.textDeriv(context, text), p2),
+                    createInterleave(p1, p2.textDeriv(context, text))
+                );
+            },
+            startTagOpenDeriv: memoizeNode(function (node) {
+                return createChoice(
+                    applyAfter(function (p) { return createInterleave(p, p2); },
+                               p1.startTagOpenDeriv(node)),
+                    applyAfter(function (p) { return createInterleave(p1, p); },
+                               p2.startTagOpenDeriv(node)));
+            }),
+            attDeriv: function (context, attribute) {
+                return createChoice(
+                    createInterleave(p1.attDeriv(context, attribute), p2),
+                    createInterleave(p1, p2.attDeriv(context, attribute)));
+            },
+            startTagCloseDeriv: memoize0arg(function () {
+                return createInterleave(p1.startTagCloseDeriv(),
+                    p2.startTagCloseDeriv());
+            })
+        };
+    });
+    createGroup = memoize2arg("group", function (p1, p2) {
+        if (p1 === notAllowed || p2 === notAllowed) { return notAllowed; }
+        if (p1 === empty) { return p2; }
+        if (p2 === empty) { return p1; }
+    }, function (p1, p2) {
+        return {
+            type: "group",
+            p1: p1,
+            p2: p2,
+            nullable: p1.nullable && p2.nullable,
+            textDeriv: function (context, text) {
+                var p = createGroup(p1.textDeriv(context, text), p2);
+                if (p1.nullable) {
+                    return createChoice(p, p2.textDeriv(context, text));
+                }
+                return p;
+            },
+            startTagOpenDeriv: function (node) {
+                var x = applyAfter(function (p) { return createGroup(p, p2); },
+                        p1.startTagOpenDeriv(node));
+                if (p1.nullable) {
+                    return createChoice(x, p2.startTagOpenDeriv(node));
+                }
+                return x;
+            },
+            attDeriv: function (context, attribute) {
+                return createChoice(
+                    createGroup(p1.attDeriv(context, attribute), p2),
+                    createGroup(p1, p2.attDeriv(context, attribute)));
+            },
+            startTagCloseDeriv: memoize0arg(function () {
+                return createGroup(p1.startTagCloseDeriv(),
+                    p2.startTagCloseDeriv());
+            })
+        };
+    });
+    createAfter = memoize2arg("after", function (p1, p2) {
+        if (p1 === notAllowed || p2 === notAllowed) { return notAllowed; }
+    }, function (p1, p2) {
+        return {
+            type: "after",
+            p1: p1,
+            p2: p2,
+            nullable: false,
+            textDeriv: function (context, text) {
+                return createAfter(p1.textDeriv(context, text), p2);
+            },
+            startTagOpenDeriv: memoizeNode(function (node) {
+                return applyAfter(function (p) { return createAfter(p, p2); },
+                    p1.startTagOpenDeriv(node));
+            }),
+            attDeriv: function (context, attribute) {
+                return createAfter(p1.attDeriv(context, attribute), p2);
+            },
+            startTagCloseDeriv: memoize0arg(function () {
+                return createAfter(p1.startTagCloseDeriv(), p2);
+            }),
+            endTagDeriv: memoize0arg(function () {
+                return (p1.nullable) ? p2 : notAllowed;
+            })
+        };
+    });
+    createOneOrMore = memoize1arg("oneormore", function (p) {
+        if (p === notAllowed) { return notAllowed; }
+        return {
+            type: "oneOrMore",
+            p: p,
+            nullable: p.nullable,
+            textDeriv: function (context, text) {
+                return createGroup(p.textDeriv(context, text),
+                            createChoice(this, empty));
+            },
+            startTagOpenDeriv: function (node) {
+                var oneOrMore = this;
+                return applyAfter(function (pf) {
+                    return createGroup(pf, createChoice(oneOrMore, empty));
+                }, p.startTagOpenDeriv(node));
+            },
+            attDeriv: function (context, attribute) {
+                var oneOrMore = this;
+                return createGroup(p.attDeriv(context, attribute),
+                    createChoice(oneOrMore, empty));
+            },
+            startTagCloseDeriv: memoize0arg(function () {
+                return createOneOrMore(p.startTagCloseDeriv());
+            })
+        };
+    });
+    function createElement(nc, p) {
+        return {
+            type: "element",
+            nc: nc,
+            nullable: false,
+            textDeriv: function () { return notAllowed; },
+            startTagOpenDeriv: function (node) {
+                if (nc.contains(node)) {
+                    return createAfter(p, empty);
+                }
+                return notAllowed;
+            },
+            attDeriv: function (context, attribute) { return notAllowed; },
+            startTagCloseDeriv: function () { return this; }
+        };
+    }
+    function valueMatch(context, pattern, text) {
+        return (pattern.nullable && /^\s+$/.test(text)) ||
+                pattern.textDeriv(context, text).nullable;
+    }
+    createAttribute = memoize2arg("attribute", undefined, function (nc, p) {
+        return {
+            type: "attribute",
+            nullable: false,
+            nc: nc,
+            p: p,
+            attDeriv: function (context, attribute) {
+                if (nc.contains(attribute) && valueMatch(context, p,
+                        attribute.nodeValue)) {
+                    return empty;
+                }
+                return notAllowed;
+            },
+            startTagCloseDeriv: function () { return notAllowed; }
+        };
+    });
+    function createList() {
+        return {
+            type: "list",
+            nullable: false,
+            hash: "list",
+            textDeriv: function (context, text) {
+                return empty;
+            }
+        };
+    }
+    createValue = memoize1arg("value", function (value) {
+        return {
+            type: "value",
+            nullable: false,
+            value: value,
+            textDeriv: function (context, text) {
+                return (text === value) ? empty : notAllowed;
+            },
+            attDeriv: function () { return notAllowed; },
+            startTagCloseDeriv: function () { return this; }
+        };
+    });
+    createData = memoize1arg("data", function (type) {
+        return {
+            type: "data",
+            nullable: false,
+            dataType: type,
+            textDeriv: function () { return empty; },
+            attDeriv: function () { return notAllowed; },
+            startTagCloseDeriv: function () { return this; }
+        };
+    });
+    function createDataExcept() {
+        return {
+            type: "dataExcept",
+            nullable: false,
+            hash: "dataExcept"
+        };
+    }
+    applyAfter = function applyAfter(f, p) {
+        var result;
+        if (p.type === "after") {
+            result = createAfter(p.p1, f(p.p2));
+        } else if (p.type === "choice") {
+            result = createChoice(applyAfter(f, p.p1), applyAfter(f, p.p2));
+        } else {
+            result = p;
+        }
+        return result;
+    };
+    function attsDeriv(context, pattern, attributes, position) {
+        if (pattern === notAllowed) {
+            return notAllowed;
+        }
+        if (position >= attributes.length) {
+            return pattern;
+        }
+        if (position === 0) {
+            // TODO: loop over attributes to update namespace mapping
+            position = 0;
+        }
+        var a = attributes.item(position);
+        while (a.namespaceURI === xmlnsns) { // always ok
+            position += 1;
+            if (position >= attributes.length) {
+                return pattern;
+            }
+            a = attributes.item(position);
+        }
+        a = attsDeriv(context, pattern.attDeriv(context,
+                attributes.item(position)), attributes, position + 1);
+        return a;
+    }
+    function childrenDeriv(context, pattern, walker) {
+        var element = walker.currentNode,
+            childNode = walker.firstChild(),
+            numberOfTextNodes = 0,
+            childNodes = [], i, p;
+        // simple incomplete implementation: only use non-empty text nodes
+        while (childNode) {
+            if (childNode.nodeType === 1) {
+                childNodes.push(childNode);
+            } else if (childNode.nodeType === 3 &&
+                    !/^\s*$/.test(childNode.nodeValue)) {
+                childNodes.push(childNode.nodeValue);
+                numberOfTextNodes += 1;
+            }
+            childNode = walker.nextSibling();
+        }
+        // if there is no nodes at all, add an empty text node
+        if (childNodes.length === 0) {
+            childNodes = [""];
+        }
+        p = pattern;
+        for (i = 0; p !== notAllowed && i < childNodes.length; i += 1) {
+            childNode = childNodes[i];
+            if (typeof childNode === "string") {
+                if (/^\s*$/.test(childNode)) {
+                    p = createChoice(p, p.textDeriv(context, childNode));
+                } else {
+                    p = p.textDeriv(context, childNode);
+                }
+            } else {
+                walker.currentNode = childNode;
+                p = childDeriv(context, p, walker);
+            }
+        }
+        walker.currentNode = element;
+        return p;
+    }
+    childDeriv = function childDeriv(context, pattern, walker) {
+        var childNode = walker.currentNode, p;
+        p = pattern.startTagOpenDeriv(childNode);
+        p = attsDeriv(context, p, childNode.attributes, 0);
+        p = p.startTagCloseDeriv();
+        p = childrenDeriv(context, p, walker);
+        p = p.endTagDeriv();
+        return p;
+    };
+    function addNames(name, ns, pattern) {
+        if (pattern.e[0].a) {
+            name.push(pattern.e[0].text);
+            ns.push(pattern.e[0].a.ns);
+        } else {
+            addNames(name, ns, pattern.e[0]);
+        }
+        if (pattern.e[1].a) {
+            name.push(pattern.e[1].text);
+            ns.push(pattern.e[1].a.ns);
+        } else {
+            addNames(name, ns, pattern.e[1]);
+        }
+    }
+    createNameClass = function createNameClass(pattern) {
+        var name, ns, hash, i, result;
+        if (pattern.name === "name") {
+            name = pattern.text;
+            ns = pattern.a.ns;
+            result = {
+                name: name,
+                ns: ns,
+                hash: "{" + ns + "}" + name,
+                contains: function (node) {
+                    return node.namespaceURI === ns && node.localName === name;
+                }
+            };
+        } else if (pattern.name === "choice") {
+            name = [];
+            ns = [];
+            addNames(name, ns, pattern);
+            hash = "";
+            for (i = 0; i < name.length; i += 1) {
+                 hash += "{" + ns[i] + "}" + name[i] + ",";
+            }
+            result = {
+                hash: hash,
+                contains: function (node) {
+                    var i;
+                    for (i = 0; i < name.length; i += 1) {
+                        if (name[i] === node.localName &&
+                                ns[i] === node.namespaceURI) {
+                            return true;
+                        }
+                    }
+                    return false;
+                }
+            };
+        } else {
+            result = {
+                hash: "anyName",
+                contains: function () { return true; }
+            };
+        }
+        return result;
+    };
+    function resolveElement(pattern, elements) {
+        var element, p, i, hash;
+        // create an empty object in the store to enable circular
+        // dependencies
+        hash = "element" + pattern.id.toString();
+        p = elements[pattern.id] = { hash: hash };
+        element = createElement(createNameClass(pattern.e[0]),
+            makePattern(pattern.e[1], elements));
+        // copy the properties of the new object into the predefined one
+        for (i in element) {
+            if (element.hasOwnProperty(i)) {
+                p[i] = element[i];
+            }
+        }
+        return p;
+    }
+    makePattern = function makePattern(pattern, elements) {
+        var p, i;
+        if (pattern.name === "elementref") {
+            p = pattern.id || 0;
+            pattern = elements[p];
+            if (pattern.name !== undefined) {
+                return resolveElement(pattern, elements);
+            }
+            return pattern;
+        }
+        switch (pattern.name) {
+            case 'empty':
+                return empty;
+            case 'notAllowed':
+                return notAllowed;
+            case 'text':
+                return text;
+            case 'choice':
+                return createChoice(makePattern(pattern.e[0], elements),
+                    makePattern(pattern.e[1], elements));
+            case 'interleave':
+                p = makePattern(pattern.e[0], elements);
+                for (i = 1; i < pattern.e.length; i += 1) {
+                    p = createInterleave(p, makePattern(pattern.e[i],
+                            elements));
+                }
+                return p;
+            case 'group':
+                return createGroup(makePattern(pattern.e[0], elements),
+                    makePattern(pattern.e[1], elements));
+            case 'oneOrMore':
+                return createOneOrMore(makePattern(pattern.e[0], elements));
+            case 'attribute':
+                return createAttribute(createNameClass(pattern.e[0]),
+                    makePattern(pattern.e[1], elements));
+            case 'value':
+                return createValue(pattern.text);
+            case 'data':
+                p = pattern.a && pattern.a.type;
+                if (p === undefined) {
+                    p = "";
+                }
+                return createData(p);
+            case 'list':
+                return createList();
+        }
+        throw "No support for " + pattern.name;
+    };
+    this.makePattern = function (pattern, elements) {
+        var copy = {}, i;
+        for (i in elements) {
+            if (elements.hasOwnProperty(i)) {
+                copy[i] = elements[i];
+            }
+        }
+        i = makePattern(pattern, copy);
+        return i;
+    };
+    /**
+     * Validate the elements pointed to by the TreeWalker
+     * @param {!TreeWalker} walker
+     * @param {!function(Array.<string>):undefined} callback
+     * @return {undefined}
+     */
+    this.validate = function validate(walker, callback) {
+        var errors;
+        walker.currentNode = walker.root;
+        errors = childDeriv(null, rootPattern, walker);
+        if (!errors.nullable) {
+            runtime.log("Error in Relax NG validation: " + errors);
+            callback(["Error in Relax NG validation: " + errors]);
+        } else {
+            callback(null);
+        }
+    };
+    this.init = function init(rootPattern1) {
+        rootPattern = rootPattern1;
+    };
+};
diff --git a/apps/files_odfviewer/src/webodf/webodf/lib/xmldom/RelaxNG2.js b/apps/files_odfviewer/src/webodf/webodf/lib/xmldom/RelaxNG2.js
new file mode 100644
index 0000000000..185ef5236e
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/lib/xmldom/RelaxNG2.js
@@ -0,0 +1,416 @@
+/**
+ * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
+ * @licstart
+ * The JavaScript code in this page is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU Affero General Public License
+ * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.  The code is distributed
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
+ *
+ * As additional permission under GNU AGPL version 3 section 7, you
+ * may distribute non-source (e.g., minimized or compacted) forms of
+ * that code without the copy of the GNU GPL normally required by
+ * section 4, provided you include this license notice and a URL
+ * through which recipients can access the Corresponding Source.
+ *
+ * As a special exception to the AGPL, any HTML file which merely makes function
+ * calls to this code, and for that purpose includes it by reference shall be
+ * deemed a separate work for copyright law purposes. In addition, the copyright
+ * holders of this code give you permission to combine this code with free
+ * software libraries that are released under the GNU LGPL. You may copy and
+ * distribute such a system following the terms of the GNU AGPL for this code
+ * and the LGPL for the libraries. If you modify this code, you may extend this
+ * exception to your version of the code, but you are not obligated to do so.
+ * If you do not wish to do so, delete this exception statement from your
+ * version.
+ *
+ * This license applies to this entire compilation.
+ * @licend
+ * @source: http://www.webodf.org/
+ * @source: http://gitorious.org/odfkit/webodf/
+ */
+/*global runtime: true, xmldom: true*/
+
+/**
+ * RelaxNG can check a DOM tree against a Relax NG schema
+ * The RelaxNG implementation is currently not complete. Relax NG should not
+ * report errors on valid DOM trees, but it will not check all constraints that
+ * a Relax NG file can define. The current implementation does not load external
+ * parts of a Relax NG file.
+ * The main purpose of this Relax NG engine is to validate runtime ODF
+ * documents. The DOM tree is traversed via a TreeWalker. A custom TreeWalker
+ * implementation can hide parts of a DOM tree. This is useful in WebODF, where
+ * special elements and attributes in the runtime DOM tree.
+ */
+runtime.loadClass("xmldom.RelaxNGParser");
+/**
+ * @constructor
+ */
+xmldom.RelaxNG2 = function RelaxNG2() {
+    "use strict";
+    var start,
+        validateNonEmptyPattern,
+        nsmap,
+        depth = 0,
+        p = "                                                                ";
+
+    /**
+     * @constructor
+     * @param {!string} error
+     * @param {Node=} context
+     */
+    function RelaxNGParseError(error, context) {
+        this.message = function () {
+            if (context) {
+                error += (context.nodeType === 1) ? " Element " : " Node ";
+                error += context.nodeName;
+                if (context.nodeValue) {
+                    error += " with value '" + context.nodeValue + "'";
+                }
+                error += ".";
+            }
+            return error;
+        };
+//        runtime.log("[" + p.slice(0, depth) + this.message() + "]");
+    }
+    /**
+     * @param elementdef
+     * @param walker
+     * @param {Element} element
+     * @return {Array.<RelaxNGParseError>}
+     */
+    function validateOneOrMore(elementdef, walker, element) {
+        // The list of definitions in the elements list should be completely
+        // traversed at least once. If a second or later round fails, the walker
+        // should go back to the start of the last successful traversal
+        var node, i = 0, err;
+        do {
+            node = walker.currentNode;
+            err = validateNonEmptyPattern(elementdef.e[0], walker, element);
+            i += 1;
+        } while (!err && node !== walker.currentNode);
+        if (i > 1) { // at least one round was without error
+            // set position back to position of before last failed round
+            walker.currentNode = node;
+            return null;
+        }
+        return err;
+    }
+    /**
+     * @param {!Node} node
+     * @return {!string}
+     */
+    function qName(node) {
+        return nsmap[node.namespaceURI] + ":" + node.localName;
+    }
+    /**
+     * @param {!Node} node
+     * @return {!boolean}
+     */
+    function isWhitespace(node) {
+        return node && node.nodeType === 3 && /^\s+$/.test(node.nodeValue);
+    }
+    /**
+     * @param elementdef
+     * @param walker
+     * @param {Element} element
+     * @param {string=} data
+     * @return {Array.<RelaxNGParseError>}
+     */
+    function validatePattern(elementdef, walker, element, data) {
+        if (elementdef.name === "empty") {
+            return null;
+        }
+        return validateNonEmptyPattern(elementdef, walker, element, data);
+    }
+    /**
+     * @param elementdef
+     * @param walker
+     * @param {Element} element
+     * @return {Array.<RelaxNGParseError>}
+     */
+    function validateAttribute(elementdef, walker, element) {
+        if (elementdef.e.length !== 2) {
+            throw "Attribute with wrong # of elements: " + elementdef.e.length;
+        }
+        var att, a, l = elementdef.localnames.length, i;
+        for (i = 0; i < l; i += 1) {
+            a = element.getAttributeNS(elementdef.namespaces[i],
+                    elementdef.localnames[i]);
+            // if an element is not present, getAttributeNS will return an empty
+            // string but an empty string is possible attribute value, so an
+            // extra check is needed
+            if (a === "" && !element.hasAttributeNS(elementdef.namespaces[i],
+                    elementdef.localnames[i])) {
+                a = undefined;
+            }
+            if (att !== undefined && a !== undefined) {
+                return [new RelaxNGParseError("Attribute defined too often.",
+                        element)];
+            }
+            att = a;
+        }
+        if (att === undefined) {
+            return [new RelaxNGParseError("Attribute not found: " +
+                    elementdef.names, element)];
+        }
+        return validatePattern(elementdef.e[1], walker, element, att);
+    }
+    /**
+     * @param elementdef
+     * @param walker
+     * @param {Element} element
+     * @return {Array.<RelaxNGParseError>}
+     */
+    function validateTop(elementdef, walker, element) {
+        // notAllowed not implemented atm
+        return validatePattern(elementdef, walker, element);
+    }
+    /**
+     * Validate an element.
+     * Function forwards the walker until an element is met.
+     * If element if of the right type, it is entered and the validation
+     * continues inside the element. After validation, regardless of whether an
+     * error occurred, the walker is at the same depth in the dom tree.
+     * @param elementdef
+     * @param walker
+     * @param {Element} element
+     * @return {Array.<RelaxNGParseError>}
+     */
+    function validateElement(elementdef, walker, element) {
+        if (elementdef.e.length !== 2) {
+            throw "Element with wrong # of elements: " + elementdef.e.length;
+        }
+        depth += 1;
+        // forward until an element is seen, then check the name
+        var /**@type{Node}*/ node = walker.currentNode,
+            /**@type{number}*/ type = node ? node.nodeType : 0,
+            error = null;
+        // find the next element, skip text nodes with only whitespace
+        while (type > 1) {
+            if (type !== 8 &&
+                    (type !== 3 ||
+                     !/^\s+$/.test(walker.currentNode.nodeValue))) {// TEXT_NODE
+                depth -= 1;
+                return [new RelaxNGParseError("Not allowed node of type " +
+                        type + ".")];
+            }
+            node = walker.nextSibling();
+            type = node ? node.nodeType : 0;
+        }
+        if (!node) {
+            depth -= 1;
+            return [new RelaxNGParseError("Missing element " +
+                    elementdef.names)];
+        }
+        if (elementdef.names && elementdef.names.indexOf(qName(node)) === -1) {
+            depth -= 1;
+            return [new RelaxNGParseError("Found " + node.nodeName +
+                    " instead of " + elementdef.names + ".", node)];
+        }
+        // the right element was found, now parse the contents
+        if (walker.firstChild()) {
+            // currentNode now points to the first child node of this element
+            error = validateTop(elementdef.e[1], walker, node);
+            // there should be no content left
+            while (walker.nextSibling()) {
+                type = walker.currentNode.nodeType;
+                if (!isWhitespace(walker.currentNode) && type !== 8) {
+                    depth -= 1;
+                    return [new RelaxNGParseError("Spurious content.",
+                            walker.currentNode)];
+                }
+            }
+            if (walker.parentNode() !== node) {
+                depth -= 1;
+                return [new RelaxNGParseError("Implementation error.")];
+            }
+        } else {
+            error = validateTop(elementdef.e[1], walker, node);
+        }
+        depth -= 1;
+        // move to the next node
+        node = walker.nextSibling();
+        return error;
+    }
+    /**
+     * @param elementdef
+     * @param walker
+     * @param {Element} element
+     * @param {string=} data
+     * @return {Array.<RelaxNGParseError>}
+     */
+    function validateChoice(elementdef, walker, element, data) {
+        // loop through child definitions and return if a match is found
+        if (elementdef.e.length !== 2) {
+            throw "Choice with wrong # of options: " + elementdef.e.length;
+        }
+        var node = walker.currentNode, err;
+        // if the first option is empty, just check the second one for debugging
+        // but the total choice is alwasy ok
+        if (elementdef.e[0].name === "empty") {
+            err = validateNonEmptyPattern(elementdef.e[1], walker, element,
+                    data);
+            if (err) {
+                walker.currentNode = node;
+            }
+            return null;
+        }
+        err = validatePattern(elementdef.e[0], walker, element, data);
+        if (err) {
+            walker.currentNode = node;
+            err = validateNonEmptyPattern(elementdef.e[1], walker, element,
+                    data);
+        }
+        return err;
+    }
+    /**
+     * @param elementdef
+     * @param walker
+     * @param {Element} element
+     * @return {Array.<RelaxNGParseError>}
+     */
+    function validateInterleave(elementdef, walker, element) {
+        var l = elementdef.e.length, n = [l], err, i, todo = l,
+            donethisround, node, subnode, e;
+        // the interleave is done when all items are 'true' and no 
+        while (todo > 0) {
+            donethisround = 0;
+            node = walker.currentNode;
+            for (i = 0; i < l; i += 1) {
+                subnode = walker.currentNode;
+                if (n[i] !== true && n[i] !== subnode) {
+                    e = elementdef.e[i];
+                    err = validateNonEmptyPattern(e, walker, element);
+                    if (err) {
+                        walker.currentNode = subnode;
+                        if (n[i] === undefined) {
+                            n[i] = false;
+                        }
+                    } else if (subnode === walker.currentNode ||
+                            // this is a bit dodgy, there should be a rule to
+                            // see if multiple elements are allowed
+                            e.name === "oneOrMore" ||
+                            (e.name === "choice" &&
+                            (e.e[0].name === "oneOrMore" ||
+                             e.e[1].name === "oneOrMore"))) {
+                        donethisround += 1;
+                        n[i] = subnode; // no error and try this one again later
+                    } else {
+                        donethisround += 1;
+                        n[i] = true; // no error and progress
+                    }
+                }
+            }
+            if (node === walker.currentNode && donethisround === todo) {
+                return null;
+            }
+            if (donethisround === 0) {
+                for (i = 0; i < l; i += 1) {
+                    if (n[i] === false) {
+                        return [new RelaxNGParseError(
+                                "Interleave does not match.", element)];
+                    }
+                }
+                return null;
+            }
+            todo = 0;
+            for (i = 0; i < l; i += 1) {
+                if (n[i] !== true) {
+                    todo += 1;
+                }
+            }
+        }
+        return null;
+    }
+    /**
+     * @param elementdef
+     * @param walker
+     * @param {Element} element
+     * @return {Array.<RelaxNGParseError>}
+     */
+    function validateGroup(elementdef, walker, element) {
+        if (elementdef.e.length !== 2) {
+            throw "Group with wrong # of members: " + elementdef.e.length;
+        }
+        //runtime.log(elementdef.e[0].name + " " + elementdef.e[1].name);
+        return validateNonEmptyPattern(elementdef.e[0], walker, element) ||
+                validateNonEmptyPattern(elementdef.e[1], walker, element);
+    }
+    /**
+     * @param elementdef
+     * @param walker
+     * @param {Element} element
+     * @return {Array.<RelaxNGParseError>}
+     */
+    function validateText(elementdef, walker, element) {
+        var /**@type{Node}*/ node = walker.currentNode,
+            /**@type{number}*/ type = node ? node.nodeType : 0,
+            error = null;
+        // find the next element, skip text nodes with only whitespace
+        while (node !== element && type !== 3) {
+            if (type === 1) {
+                return [new RelaxNGParseError(
+                        "Element not allowed here.", node)];
+            }
+            node = walker.nextSibling();
+            type = node ? node.nodeType : 0;
+        }
+        walker.nextSibling();
+        return null;
+    }
+    /**
+     * @param elementdef
+     * @param walker
+     * @param {Element} element
+     * @param {string=} data
+     * @return {Array.<RelaxNGParseError>}
+     */
+    validateNonEmptyPattern = function validateNonEmptyPattern(elementdef,
+                walker, element, data) {
+        var name = elementdef.name, err = null;
+        if (name === "text") {
+            err = validateText(elementdef, walker, element);
+        } else if (name === "data") {
+            err = null; // data not implemented
+        } else if (name === "value") {
+            if (data !== elementdef.text) {
+                err = [new RelaxNGParseError("Wrong value, should be '" +
+                        elementdef.text + "', not '" + data + "'", element)];
+            }
+        } else if (name === "list") {
+            err = null; // list not implemented
+        } else if (name === "attribute") {
+            err = validateAttribute(elementdef, walker, element);
+        } else if (name === "element") {
+            err = validateElement(elementdef, walker, element);
+        } else if (name === "oneOrMore") {
+            err = validateOneOrMore(elementdef, walker, element);
+        } else if (name === "choice") {
+            err = validateChoice(elementdef, walker, element, data);
+        } else if (name === "group") {
+            err = validateGroup(elementdef, walker, element);
+        } else if (name === "interleave") {
+            err = validateInterleave(elementdef, walker, element);
+        } else {
+            throw name + " not allowed in nonEmptyPattern.";
+        }
+        return err;
+    };
+    /**
+     * Validate the elements pointed to by the TreeWalker
+     * @param {!TreeWalker} walker
+     * @param {!function(Array.<RelaxNGParseError>):undefined} callback
+     * @return {undefined}
+     */
+    this.validate = function validate(walker, callback) {
+        walker.currentNode = walker.root;
+        var errors = validatePattern(start.e[0], walker, walker.root);
+        callback(errors);
+    };
+    this.init = function init(start1, nsmap1) {
+        start = start1;
+        nsmap = nsmap1;
+    };
+};
diff --git a/apps/files_odfviewer/src/webodf/webodf/lib/xmldom/RelaxNGParser.js b/apps/files_odfviewer/src/webodf/webodf/lib/xmldom/RelaxNGParser.js
new file mode 100644
index 0000000000..12e37278a0
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/lib/xmldom/RelaxNGParser.js
@@ -0,0 +1,452 @@
+/**
+ * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
+ * @licstart
+ * The JavaScript code in this page is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU Affero General Public License
+ * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.  The code is distributed
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
+ *
+ * As additional permission under GNU AGPL version 3 section 7, you
+ * may distribute non-source (e.g., minimized or compacted) forms of
+ * that code without the copy of the GNU GPL normally required by
+ * section 4, provided you include this license notice and a URL
+ * through which recipients can access the Corresponding Source.
+ *
+ * As a special exception to the AGPL, any HTML file which merely makes function
+ * calls to this code, and for that purpose includes it by reference shall be
+ * deemed a separate work for copyright law purposes. In addition, the copyright
+ * holders of this code give you permission to combine this code with free
+ * software libraries that are released under the GNU LGPL. You may copy and
+ * distribute such a system following the terms of the GNU AGPL for this code
+ * and the LGPL for the libraries. If you modify this code, you may extend this
+ * exception to your version of the code, but you are not obligated to do so.
+ * If you do not wish to do so, delete this exception statement from your
+ * version.
+ *
+ * This license applies to this entire compilation.
+ * @licend
+ * @source: http://www.webodf.org/
+ * @source: http://gitorious.org/odfkit/webodf/
+ */
+/*global runtime: true, xmldom: true*/
+
+/**
+ * RelaxNG can check a DOM tree against a Relax NG schema
+ * The RelaxNG implementation is currently not complete. Relax NG should not
+ * report errors on valid DOM trees, but it will not check all constraints that
+ * a Relax NG file can define. The current implementation does not load external
+ * parts of a Relax NG file.
+ * The main purpose of this Relax NG engine is to validate runtime ODF
+ * documents. The DOM tree is traversed via a TreeWalker. A custom TreeWalker
+ * implementation can hide parts of a DOM tree. This is useful in WebODF, where
+ * special elements and attributes in the runtime DOM tree.
+ * @constructor
+ */
+xmldom.RelaxNGParser = function RelaxNGParser() {
+    "use strict";
+    var self = this,
+        rngns = "http://relaxng.org/ns/structure/1.0",
+        xmlnsns = "http://www.w3.org/2000/xmlns/",
+        start,
+        nsmap = { "http://www.w3.org/XML/1998/namespace": "xml" },
+        parse;
+
+    /**
+     * @constructor
+     * @param {!string} error
+     * @param {Node=} context
+     */
+    function RelaxNGParseError(error, context) {
+        /**
+         * return {!string}
+         */
+        this.message = function () {
+            if (context) {
+                error += (context.nodeType === 1) ? " Element " : " Node ";
+                error += context.nodeName;
+                if (context.nodeValue) {
+                    error += " with value '" + context.nodeValue + "'";
+                }
+                error += ".";
+            }
+            return error;
+        };
+    }
+    function splitToDuos(e) {
+        if (e.e.length <= 2) {
+            return e;
+        }
+        var o = { name: e.name, e: e.e.slice(0, 2) };
+        return splitToDuos({
+            name: e.name,
+            e: [ o ].concat(e.e.slice(2))
+        });
+    }
+    /**
+     * @param {!string} name
+     * @return {!Array.<string>}
+     */
+    function splitQName(name) {
+        var r = name.split(":", 2),
+            prefix = "", i;
+        if (r.length === 1) {
+            r = ["", r[0]];
+        } else {
+            prefix = r[0];
+        }
+        for (i in nsmap) {
+            if (nsmap[i] === prefix) {
+                r[0] = i;
+            }
+        }
+        return r;
+    }
+
+    function splitQNames(def) {
+        var i, l = (def.names) ? def.names.length : 0, name,
+            localnames = def.localnames = [l],
+            namespaces = def.namespaces = [l];
+        for (i = 0; i < l; i += 1) {
+            name = splitQName(def.names[i]);
+            namespaces[i] = name[0];
+            localnames[i] = name[1];
+        }
+    }
+
+    /**
+     * @param {!string} str
+     * @return {!string}
+     */
+    function trim(str) {
+        str = str.replace(/^\s\s*/, '');
+		var ws = /\s/,
+            i = str.length - 1;
+        while (ws.test(str.charAt(i))) {
+            i -= 1;
+        }
+        return str.slice(0, i + 1);
+    }
+
+    /**
+     * @param {!Object.<string,string>} atts
+     * @param {!string} name
+     * @param {!Array.<string>} names
+     * @return {!Object}
+     */
+    function copyAttributes(atts, name, names) {
+        var a = {}, i, att;
+        for (i = 0; i < atts.length; i += 1) {
+            att = atts.item(i);
+            if (!att.namespaceURI) {
+                if (att.localName === "name" &&
+                        (name === "element" || name === "attribute")) {
+                    names.push(att.value);
+                }
+                if (att.localName === "name" || att.localName === "combine" ||
+                        att.localName === "type") {
+                    att.value = trim(att.value);
+                }
+                a[att.localName] = att.value;
+            } else if (att.namespaceURI === xmlnsns) {
+                nsmap[att.value] = att.localName;
+            }
+        }
+        return a;
+    }
+
+    function parseChildren(c, e, elements, names) {
+        var text = "", ce;
+        while (c) {
+            if (c.nodeType === 1 && c.namespaceURI === rngns) {
+                ce = parse(c, elements, e);
+                if (ce) {
+                    if (ce.name === "name") {
+                        names.push(nsmap[ce.a.ns] + ":" + ce.text);
+                        e.push(ce);
+                    } else if (ce.name === "choice" && ce.names &&
+                            ce.names.length) {
+                        names = names.concat(ce.names);
+                        delete ce.names;
+                        e.push(ce);
+                    } else {
+                        e.push(ce);
+                    }
+                }
+            } else if (c.nodeType === 3) {
+                text += c.nodeValue;
+            }
+            c = c.nextSibling;
+        }
+        return text;
+    }
+
+    function combineDefines(combine, name, e, siblings) {
+        // combineDefines is called often enough that there can only be one
+        // other element with the same name
+        var i, ce;
+        for (i = 0; siblings && i < siblings.length; i += 1) {
+            ce = siblings[i];
+            if (ce.name === "define" && ce.a && ce.a.name === name) {
+                ce.e = [ { name: combine, e: ce.e.concat(e) } ];
+                return ce;
+            }
+        }
+        return null;
+    }
+
+    parse = function parse(element, elements, siblings) {
+        // parse all elements from the Relax NG namespace into JavaScript
+        // objects
+        var e = [],
+            /**@type{Object}*/a,
+            ce,
+            i, text, name = element.localName, names = [];
+        a = copyAttributes(element.attributes, name, names);
+        a.combine = a.combine || undefined;
+        text = parseChildren(element.firstChild, e, elements, names);
+
+        // 4.2 strip leading and trailing whitespace
+        if (name !== "value" && name !== "param") {
+            text = /^\s*([\s\S]*\S)?\s*$/.exec(text)[1];
+        }
+        // 4.3 datatypeLibrary attribute
+        // 4.4 type attribute of value element
+        if (name === "value" && a.type === undefined) {
+            a.type = "token";
+            a.datatypeLibrary = "";
+        }
+        // 4.5 href attribute
+        // 4.6 externalRef element
+        // 4.7 include element
+        // 4.8 name attribute of element and attribute elements
+        if ((name === "attribute" || name === "element") &&
+                a.name !== undefined) {
+           i = splitQName(a.name);
+           e = [{name: "name", text: i[1], a: {ns: i[0]}}].concat(e);
+           delete a.name;
+        }
+        // 4.9 ns attribute
+        if (name === "name" || name === "nsName" || name === "value") {
+            if (a.ns === undefined) {
+                a.ns = ""; // TODO
+            }
+        } else {
+            delete a.ns;
+        }
+        // 4.10 QNames
+        if (name === "name") {
+            i = splitQName(text);
+            a.ns = i[0];
+            text = i[1];
+        }
+        // 4.11 div element
+        // 4.12 Number of child elements
+        if (e.length > 1 && (name === "define" || name === "oneOrMore" ||
+                name === "zeroOrMore" || name === "optional" ||
+                name === "list" || name === "mixed")) {
+            e = [{name: "group", e: splitToDuos({name: "group", e: e}).e}];
+        }
+        if (e.length > 2 && name === "element") {
+            e = [e[0]].concat(
+                {name: "group", e: splitToDuos(
+                    {name: "group", e: e.slice(1)}).e});
+        }
+        if (e.length === 1 && name === "attribute") {
+            e.push({name: "text", text: text});
+        }
+        // if node has only one child, replace node with child
+        if (e.length === 1 && (name === "choice" || name === "group" ||
+                name === "interleave")) {
+            name = e[0].name;
+            names = e[0].names;
+            a = e[0].a;
+            text = e[0].text;
+            e = e[0].e;
+        } else if (e.length > 2 && (name === "choice" || name === "group" ||
+                name === "interleave")) {
+            e = splitToDuos({name: name, e: e}).e;
+        }
+        // 4.13 mixed element
+        if (name === "mixed") {
+            name = "interleave";
+            e = [ e[0], { name: "text" } ];
+        }
+        // 4.14 optional element
+        if (name === "optional") {
+            name = "choice";
+            e = [ e[0], { name: "empty" } ];
+        }
+        // 4.15 zeroOrMore element
+        if (name === "zeroOrMore") {
+            name = "choice";
+            e = [ {name: "oneOrMore", e: [ e[0] ] }, { name: "empty" } ];
+        }
+        // 4.17 combine attribute
+        if (name === "define" && a.combine) {
+            ce = combineDefines(a.combine, a.name, e, siblings);
+            if (ce) {
+                return;
+            }
+        }
+
+        // create the definition
+        ce = { name: name };
+        if (e && e.length > 0) { ce.e = e; }
+        for (i in a) {
+            if (a.hasOwnProperty(i)) {
+                ce.a = a;
+                break;
+            }
+        }
+        if (text !== undefined) { ce.text = text; }
+        if (names && names.length > 0) { ce.names = names; }
+
+        // part one of 4.19
+        if (name === "element") {
+            ce.id = elements.length;
+            elements.push(ce);
+            ce = { name: "elementref", id: ce.id };
+        }
+        return ce;
+    };
+
+    function resolveDefines(def, defines) {
+        var i = 0, e, defs, end, name = def.name;
+        while (def.e && i < def.e.length) {
+            e = def.e[i];
+            if (e.name === "ref") {
+                defs = defines[e.a.name];
+                if (!defs) {
+                    throw e.a.name + " was not defined.";
+                }
+                end = def.e.slice(i + 1);
+                def.e = def.e.slice(0, i);
+                def.e = def.e.concat(defs.e);
+                def.e = def.e.concat(end);
+            } else {
+                i += 1;
+                resolveDefines(e, defines);
+            }
+        }
+        e = def.e;
+        // 4.20 notAllowed element
+        // 4.21 empty element
+        if (name === "choice") {
+            if (!e || !e[1] || e[1].name === "empty") {
+                if (!e || !e[0] || e[0].name === "empty") {
+                    delete def.e;
+                    def.name = "empty";
+                } else {
+                    e[1] = e[0];
+                    e[0] = { name: "empty" };
+                }
+            }
+        }
+        if (name === "group" || name === "interleave") {
+            if (e[0].name === "empty") {
+                if (e[1].name === "empty") {
+                    delete def.e;
+                    def.name = "empty";
+                } else {
+                    name = def.name = e[1].name;
+                    def.names = e[1].names;
+                    e = def.e = e[1].e;
+                }
+            } else if (e[1].name === "empty") {
+                name = def.name = e[0].name;
+                def.names = e[0].names;
+                e = def.e = e[0].e;
+            }
+        }
+        if (name === "oneOrMore" && e[0].name === "empty") {
+            delete def.e;
+            def.name = "empty";
+        }
+        // for attributes we need to have the list of namespaces and
+        // localnames readily available, so we split up the qnames
+        if (name === "attribute") {
+            splitQNames(def);
+        }
+        // for interleaving validation, it is convenient to join all
+        // interleave elements that touch into one element
+        if (name === "interleave") {
+            // at this point the interleave will have two child elements,
+            // but the child interleave elements may have a different number
+            if (e[0].name === "interleave") {
+                if (e[1].name === "interleave") {
+                    e = def.e = e[0].e.concat(e[1].e);
+                } else {
+                    e = def.e = [e[1]].concat(e[0].e);
+                }
+            } else if (e[1].name === "interleave") {
+                e = def.e = [e[0]].concat(e[1].e);
+            }
+        }
+    }
+
+    function resolveElements(def, elements) {
+        var i = 0, e, name;
+        while (def.e && i < def.e.length) {
+            e = def.e[i];
+            if (e.name === "elementref") {
+                e.id = e.id || 0;
+                def.e[i] = elements[e.id];
+            } else if (e.name !== "element") {
+                resolveElements(e, elements);
+            }
+            i += 1;
+        }
+    }
+
+    /**
+     * @param {!Document} dom
+     * @param {!Function} callback
+     * @return {?Array}
+     */
+    function main(dom, callback) {
+        var elements = [],
+            grammar = parse(dom && dom.documentElement, elements, undefined),
+            i, e, defines = {};
+
+        for (i = 0; i < grammar.e.length; i += 1) {
+            e = grammar.e[i];
+            if (e.name === "define") {
+                defines[e.a.name] = e;
+            } else if (e.name === "start") {
+                start = e;
+            }
+        }
+        if (!start) {
+            return [new RelaxNGParseError(
+                    "No Relax NG start element was found.")];
+        }
+        resolveDefines(start, defines);
+        for (i in defines) {
+            if (defines.hasOwnProperty(i)) {
+                resolveDefines(defines[i], defines);
+            }
+        }
+        for (i = 0; i < elements.length; i += 1) {
+            resolveDefines(elements[i], defines);
+        }
+        if (callback) {
+            self.rootPattern = callback(start.e[0], elements);
+        }
+        resolveElements(start, elements);
+        for (i = 0; i < elements.length; i += 1) {
+            resolveElements(elements[i], elements);
+        }
+        self.start = start;
+        self.elements = elements;
+        self.nsmap = nsmap;
+        return null;
+    }
+    /**
+     * @param {!Document} dom
+     * @param {!Function} callback
+     * @return {?Array}
+     */
+    this.parseRelaxNGDOM = main;
+};
diff --git a/apps/files_odfviewer/src/webodf/webodf/lib/xmldom/XPath.js b/apps/files_odfviewer/src/webodf/webodf/lib/xmldom/XPath.js
new file mode 100644
index 0000000000..28466c2184
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/lib/xmldom/XPath.js
@@ -0,0 +1,383 @@
+/**
+ * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
+ * @licstart
+ * The JavaScript code in this page is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU Affero General Public License
+ * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.  The code is distributed
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
+ *
+ * As additional permission under GNU AGPL version 3 section 7, you
+ * may distribute non-source (e.g., minimized or compacted) forms of
+ * that code without the copy of the GNU GPL normally required by
+ * section 4, provided you include this license notice and a URL
+ * through which recipients can access the Corresponding Source.
+ *
+ * As a special exception to the AGPL, any HTML file which merely makes function
+ * calls to this code, and for that purpose includes it by reference shall be
+ * deemed a separate work for copyright law purposes. In addition, the copyright
+ * holders of this code give you permission to combine this code with free
+ * software libraries that are released under the GNU LGPL. You may copy and
+ * distribute such a system following the terms of the GNU AGPL for this code
+ * and the LGPL for the libraries. If you modify this code, you may extend this
+ * exception to your version of the code, but you are not obligated to do so.
+ * If you do not wish to do so, delete this exception statement from your
+ * version.
+ *
+ * This license applies to this entire compilation.
+ * @licend
+ * @source: http://www.webodf.org/
+ * @source: http://gitorious.org/odfkit/webodf/
+ */
+/*global xmldom, XPathResult, runtime*/
+/**
+ * Wrapper for XPath functions
+ * @constructor
+ */
+xmldom.XPath = (function () {
+    "use strict";
+    var createXPathPathIterator,
+        parsePredicates;
+    /**
+     * @param {!number} a
+     * @param {!number} b
+     * @param {!number} c
+     * @return {!boolean}
+     */
+    function isSmallestPositive(a, b, c) {
+        return a !== -1 && (a < b || b === -1) && (a < c || c === -1);
+    }
+    /**
+     * Parse a subset of xpaths.
+     * The xpath predicates may contain xpaths. The location may be equated to
+     * a value. If a parsing error occurs, null is returned.
+     * @param {!string} xpath
+     * @param {!number} pos
+     * @param {!number} end
+     * @param {!Array} steps
+     * @return {!number}
+     */
+    function parseXPathStep(xpath, pos, end, steps) {
+        var location = "",
+            predicates = [],
+            value,
+            brapos = xpath.indexOf('[', pos),
+            slapos = xpath.indexOf('/', pos),
+            eqpos = xpath.indexOf('=', pos),
+            depth = 0,
+            start = 0;
+        // parse the location
+        if (isSmallestPositive(slapos, brapos, eqpos)) {
+            location = xpath.substring(pos, slapos);
+            pos = slapos + 1;
+        } else if (isSmallestPositive(brapos, slapos, eqpos)) {
+            location = xpath.substring(pos, brapos);
+            pos = parsePredicates(xpath, brapos, predicates);
+        } else if (isSmallestPositive(eqpos, slapos, brapos)) {
+            location = xpath.substring(pos, eqpos);
+            pos = eqpos;
+        } else {
+            location = xpath.substring(pos, end);
+            pos = end;
+        }
+        steps.push({location: location, predicates: predicates});
+        return pos;
+    }
+    function parseXPath(xpath) {
+        var steps = [],
+            p = 0,
+            end = xpath.length,
+            value;
+        while (p < end) {
+            p = parseXPathStep(xpath, p, end, steps);
+            if (p < end && xpath[p] === '=') {
+                value = xpath.substring(p + 1, end);
+                if (value.length > 2 &&
+                        (value[0] === '\'' || value[0] === '"')) {
+                    value = value.slice(1, value.length - 1);
+                } else {
+                    try {
+                        value = parseInt(value, 10);
+                    } catch (e) {
+                    }
+                }
+                p = end;
+            }
+        }
+        return {steps: steps, value: value};
+    }
+    parsePredicates = function parsePredicates(xpath, start, predicates) {
+        var pos = start,
+            l = xpath.length,
+            selector,
+            depth = 0;
+        while (pos < l) {
+            if (xpath[pos] === ']') {
+                depth -= 1;
+                if (depth <= 0) {
+                    predicates.push(parseXPath(xpath.substring(start, pos)));
+                }
+            } else if (xpath[pos] === '[') {
+                if (depth <= 0) {
+                    start = pos + 1;
+                }
+                depth += 1;
+            }
+            pos += 1;
+        }
+        return pos;
+    };
+    /**
+     * Iterator over nodes uses in the xpath implementation
+     * @class
+     * @interface
+     */
+    function XPathIterator() {}
+    /**
+     * @return {Node}
+     */
+    XPathIterator.prototype.next = function () {};
+    /**
+     * @return {undefined}
+     */
+    XPathIterator.prototype.reset = function () {};
+    /**
+     * @class
+     * @constructor
+     * @augments XPathIterator
+     * @implements {XPathIterator}
+     */
+    function NodeIterator() {
+        var node, done = false;
+        this.setNode = function setNode(n) {
+            node = n;
+        };
+        this.reset = function () {
+            done = false;
+        };
+        this.next = function next() {
+            var val = (done) ? null : node;
+            done = true;
+            return val;
+        };
+    }
+    /**
+     * @class
+     * @constructor
+     * @augments XPathIterator
+     * @implements {XPathIterator}
+     * @param {XPathIterator} it
+     * @param {!string} namespace
+     * @param {!string} localName
+     */
+    function AttributeIterator(it, namespace, localName) {
+        this.reset = function reset() {
+            it.reset();
+        };
+        this.next = function next() {
+            var node = it.next(), attr;
+            while (node) {
+                node = node.getAttributeNodeNS(namespace, localName);
+                if (node) {
+                    return node;
+                }
+                node = it.next();
+            }
+            return node;
+        };
+    }
+    /**
+     * @class
+     * @constructor
+     * @augments XPathIterator
+     * @implements {XPathIterator}
+     * @param {XPathIterator} it
+     * @param {boolean} recurse
+     */
+    function AllChildElementIterator(it, recurse) {
+        var root = it.next(),
+            node = null;
+        this.reset = function reset() {
+            it.reset();
+            root = it.next();
+            node = null;
+        };
+        this.next = function next() {
+            while (root) {
+                if (node) {
+                    if (recurse && node.firstChild) {
+                        node = node.firstChild;
+                    } else {
+                        while (!node.nextSibling && node !== root) {
+                            node = node.parentNode;
+                        }
+                        if (node === root) {
+                            root = it.next();
+                        } else {
+                            node = node.nextSibling;
+                        }
+                    }
+                } else {
+                    do {
+//                        node = (recurse) ?root :root.firstChild;
+                        node = root.firstChild;
+                        if (!node) {
+                            root = it.next();
+                        }
+                    } while (root && !node);
+                }
+                if (node && node.nodeType === 1) {
+                    return node;
+                }
+            }
+            return null;
+        };
+    }
+    /**
+     * @class
+     * @constructor
+     * @augments XPathIterator
+     * @implements {XPathIterator}
+     * @param {XPathIterator} it
+     * @param {function(Node):boolean} condition
+     */
+    function ConditionIterator(it, condition) {
+        this.reset = function reset() {
+            it.reset();
+        };
+        this.next = function next() {
+            var n = it.next();
+            while (n && !condition(n)) {
+                n = it.next();
+            }
+            return n;
+        };
+    }
+    /**
+     * @param {XPathIterator} it
+     * @param {string} name
+     * @param {function(string):string} namespaceResolver
+     * @return {!ConditionIterator}
+     */
+    function createNodenameFilter(it, name, namespaceResolver) {
+        var s = name.split(':', 2),
+            namespace = namespaceResolver(s[0]),
+            localName = s[1];
+        return new ConditionIterator(it, function (node) {
+            return node.localName === localName &&
+                node.namespaceURI === namespace;
+        });
+    }
+    /**
+     * @param {XPathIterator} it
+     * @param {!Object} p
+     * @param {function(string):string} namespaceResolver
+     * @return {!ConditionIterator}
+     */
+    function createPredicateFilteredIterator(it, p, namespaceResolver) {
+        var nit = new NodeIterator(),
+            pit = createXPathPathIterator(nit, p, namespaceResolver),
+            value = p.value;
+        if (value === undefined) {
+            return new ConditionIterator(it, function (node) {
+                nit.setNode(node);
+                pit.reset();
+                return pit.next();
+            });
+        }
+        return new ConditionIterator(it, function (node) {
+            nit.setNode(node);
+            pit.reset();
+            var n = pit.next();
+            // todo: distinuish between number and string
+            return n && n.nodeValue === value;
+        });
+    }
+    /**
+     * @param {!XPathIterator} it
+     * @param {!Object} xpath
+     * @param {!Function} namespaceResolver
+     * @return {!XPathIterator}
+     */
+    createXPathPathIterator = function createXPathPathIterator(it, xpath,
+                namespaceResolver) {
+        var i, j, step, location, namespace, localName, prefix, p;
+        for (i = 0; i < xpath.steps.length; i += 1) {
+            step = xpath.steps[i];
+            location = step.location;
+            if (location === "") {
+                it = new AllChildElementIterator(it, false);
+            } else if (location[0] === '@') {
+                p = location.slice(1).split(":", 2);
+                it = new AttributeIterator(it, namespaceResolver(p[0]), p[1]);
+            } else if (location !== ".") {
+                it = new AllChildElementIterator(it, false);
+                if (location.indexOf(":") !== -1) {
+                    it = createNodenameFilter(it, location, namespaceResolver);
+                }
+            }
+            for (j = 0; j < step.predicates.length; j += 1) {
+                p = step.predicates[j];
+                it = createPredicateFilteredIterator(it, p, namespaceResolver);
+            }
+        }
+        return it;
+    };
+    /**
+     * @param {!Element} node
+     * @param {!string} xpath
+     * @param {!Function} namespaceResolver
+     * @return {!Array.<Element>}
+     */
+    function fallback(node, xpath, namespaceResolver) {
+        var it = new NodeIterator(),
+            i,
+            nodelist,
+            parsedXPath,
+            pos;
+        it.setNode(node);
+        parsedXPath = parseXPath(xpath);
+        it = createXPathPathIterator(it, parsedXPath, namespaceResolver);
+        nodelist = [];
+        i = it.next();
+        while (i) {
+            nodelist.push(i);
+            i = it.next();
+        }
+        return nodelist;
+    }
+    /**
+     * @param {!Element} node
+     * @param {!string} xpath
+     * @param {!Function} namespaceResolver
+     * @return {!Array.<Element>}
+     */
+    function getODFElementsWithXPath(node, xpath, namespaceResolver) {
+        var doc = node.ownerDocument,
+            nodes,
+            elements = [],
+            n = null;
+        if (!doc || !doc.evaluate || !n) {
+            elements = fallback(node, xpath, namespaceResolver);
+        } else {
+            nodes = doc.evaluate(xpath, node, namespaceResolver,
+                XPathResult.UNORDERED_NODE_ITERATOR_TYPE, null);
+            n = nodes.iterateNext();
+            while (n !== null) {
+                if (n.nodeType === 1) {
+                    elements.push(n);
+                }
+                n = nodes.iterateNext();
+            }
+        }
+        return elements;
+    }
+    /**
+     * @constructor
+     */
+    xmldom.XPath = function XPath() {
+        this.getODFElementsWithXPath = getODFElementsWithXPath;
+    };
+    return xmldom.XPath;
+}());
diff --git a/apps/files_odfviewer/src/webodf/webodf/misctests/carettest.html b/apps/files_odfviewer/src/webodf/webodf/misctests/carettest.html
new file mode 100644
index 0000000000..fc7f84c926
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/misctests/carettest.html
@@ -0,0 +1,135 @@
+<html>
+ <head>
+  <title></title>
+ </head>
+ <body onload="test()">
+  <script>
+function init() {
+    var p = document.createElement("p");
+    p.appendChild(document.createTextNode("MMMMM MMMMM MMMMM MMMMM MMMMM"));
+    p.style.width = "5em";
+    p.style.border = "1px solid black";
+//    p.contentEditable = true;
+    document.body.insertBefore(p, null);
+    return p;
+}
+function listenEvent(eventTarget, eventType, eventHandler) {
+    if (eventTarget.addEventListener) {
+        eventTarget.addEventListener(eventType, eventHandler, false);
+    } else if (eventTarget.attachEvent) {
+        eventType = "on" + eventType;
+        eventTarget.attachEvent(eventType, eventHandler);
+    } else {
+        eventTarget["on" + eventType] = eventHandler;
+    }
+}
+function simulateKeyEvent(target, type, keyCode) {
+    var customEvent = null,
+        bubbles = true,
+        cancelable = true,
+        view = window,
+        ctrlKey = false,
+        altKey = false,
+        shiftKey = false,
+        metaKey = false,
+        charCode = keyCode;
+    if (document.createEvent) {
+        try {
+            customEvent = document.createEvent("KeyEvents");
+            customEvent.initKeyEvent(type, bubbles, cancelable, view, ctrlKey,
+                altKey, shiftKey, metaKey, keyCode, charCode);
+        } catch (ex) {
+            try {
+                customEvent = document.createEvent("Events");
+            } catch (uierror) {
+                customEvent = document.createEvent("UIEvents");
+            } finally {
+                customEvent.initEvent(type, bubbles, cancelable);
+                customEvent.view = view;
+                customEvent.altKey = altKey;
+                customEvent.ctrlKey = ctrlKey;
+                customEvent.shiftKey = shiftKey;
+                customEvent.metaKey = metaKey;
+                customEvent.keyCode = keyCode;
+                customEvent.charCode = charCode;
+            }
+        }
+        target.dispatchEvent(customEvent);
+    } else {
+        alert('ze problem');
+    }
+}
+function moveDown(target) {
+    var evt;// = document.createEvent("KeyboardEvent");
+//    evt.initKeyEvent("keypress", true, true, null, false, false, false, false, 40, 0);
+//    target.dispatchEvent(evt);
+/*
+    evt = document.createEvent("KeyboardEvent");
+    //evt = document.createEvent("KeyEvents");
+    evt.initKeyEvent("keypress", true, true, target.ownerDocument.defaultView, false, false, false, false, 9, 0);
+    target.dispatchEvent(evt);
+*/
+                evt = document.createEvent("KeyboardEvent");
+                evt.initKeyEvent("keypress", true, true, null, false, false, false, false, 0x23, 0);
+                target.dispatchEvent(evt);
+
+}
+function moveDownOpera(target) {
+    var evt = document.createEvent("UIEvents");
+    evt.initUIEvent("keypress", true, true, window, 1);
+    target.keyCode = 8;
+    target.charCode = 0;
+    target.dispatchEvent(evt);
+alert(evt);
+}
+
+function mouseclick() {
+    var selection = window.getSelection(),
+        r = selection.getRangeAt(0);
+    alert(r.startOffset);
+}
+
+function test() {
+    var p = init(),
+        selection = window.getSelection(),
+        range;
+
+    // put caret at the start of the document
+    selection.removeAllRanges();
+    range = p.ownerDocument.createRange();
+    range.setStart(p.firstChild, 8);
+    range.collapse(true);
+    selection.addRange(range);
+
+    listenEvent(document, "keydown", show);
+    listenEvent(document, "mouseup", mouseclick);
+
+    // move the caret down
+    if (selection.modify) {
+        selection.modify("move", "forward", "line");
+    } else {
+//        moveDown(p);
+        moveDownOpera(p);
+//        simulateKeyEvent(p, "keypress", 40);
+//        simulateKeyEvent(p, "keypress", 39);
+//        simulateKeyEvent(p, "keypress", 69);
+var t = "";
+for (var i in selection) {
+ t += i + " ";
+}
+//alert(t);
+    }
+    alert("'" + selection.getRangeAt(0).startOffset + "' ");
+
+}
+function show(e) {
+var t = "";
+for (var i in e) {
+ t += i + " ";
+}
+//alert(t);
+    alert("code: " + e.charCode + " key: " + e.keyCode + ' ');
+}
+  </script>
+ </body>
+</html>
diff --git a/apps/files_odfviewer/src/webodf/webodf/misctests/selection.html b/apps/files_odfviewer/src/webodf/webodf/misctests/selection.html
new file mode 100644
index 0000000000..d758237f39
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/misctests/selection.html
@@ -0,0 +1,27 @@
+<html>
+  <head><title></title>
+<script>
+window.onload = function () {
+    var selection = window.getSelection(),
+        p = document.createElement("p"),
+        textnode = document.createTextNode("hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello "),
+        range;
+
+    document.body.appendChild(p);
+    p.appendChild(textnode);
+    selection.removeAllRanges();
+    range = document.createRange();
+    range.setStart(textnode, 1);
+    selection.removeAllRanges();
+    selection.addRange(range);
+
+selection.modify("move", "forward", "line");
+
+alert(selection.rangeCount + " " + selection.getRangeAt(0).startOffset);
+}
+</script>
+  </head>
+  <body>
+  </body>
+</html>
+
diff --git a/apps/files_odfviewer/src/webodf/webodf/misctests/testselection.html b/apps/files_odfviewer/src/webodf/webodf/misctests/testselection.html
new file mode 100644
index 0000000000..28ff15889b
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/misctests/testselection.html
@@ -0,0 +1,61 @@
+<!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><title></title>
+<script>
+function log(message) {
+    document.body.appendChild(document.createTextNode(message));
+}
+
+window.onload = function () {
+    if (!document.createElementNS) {
+        log("Error: there is no function 'document.createElementNS'.");
+        return;
+    }
+    if (!window.getSelection) {
+        log("Error: there is no function 'window.getSelection'.");
+        return;
+    }
+    var testarea = document.getElementById("testarea"),
+        selection = window.getSelection(),
+        p = document.createElementNS("http://www.w3.org/1999/xhtml", "p"),
+        text = document.createTextNode("hello");
+    testarea.appendChild(p);
+    p.appendChild(text);
+    selection.removeAllRanges();
+    if (selection.rangeCount !== 0) {
+        log("Error: not all ranges were removed.");
+        return;
+    }
+
+    var range = document.createRange();
+    range.setStart(p, 0);
+    range.setEnd(p, 0);
+    if (range.startContainer !== p) {
+        log("Error: the start of the range was not correct.");
+        return;
+    }
+    selection.addRange(range);
+
+    if (selection.rangeCount === 0) {
+        log("Error: no range was added to the selection.");
+        return;
+    }
+    if (selection.rangeCount > 1) {
+        log("Error: there are too many ranges in the selection.");
+        return;
+    }
+    if (selection.getRangeAt(0).startContainer !== p) {
+        log("Error: the start of the selection is not the right element." +
+            "It is " + selection.getRangeAt(0).startContainer.nodeName +
+            " instead of " + p.nodeName + ".");
+        return;
+    }
+    log("Success: selection test worked without error.");
+}
+</script>
+  </head>
+  <body>
+<div id="testarea"></div>
+  </body>
+</html>
+
diff --git a/apps/files_odfviewer/src/webodf/webodf/misctests/testzip.js b/apps/files_odfviewer/src/webodf/webodf/misctests/testzip.js
new file mode 100644
index 0000000000..bd57807bf5
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/misctests/testzip.js
@@ -0,0 +1,181 @@
+/**
+ * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
+ * @licstart
+ * The JavaScript code in this page is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU Affero General Public License
+ * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.  The code is distributed
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
+ *
+ * As additional permission under GNU AGPL version 3 section 7, you
+ * may distribute non-source (e.g., minimized or compacted) forms of
+ * that code without the copy of the GNU GPL normally required by
+ * section 4, provided you include this license notice and a URL
+ * through which recipients can access the Corresponding Source.
+ *
+ * As a special exception to the AGPL, any HTML file which merely makes function
+ * calls to this code, and for that purpose includes it by reference shall be
+ * deemed a separate work for copyright law purposes. In addition, the copyright
+ * holders of this code give you permission to combine this code with free
+ * software libraries that are released under the GNU LGPL. You may copy and
+ * distribute such a system following the terms of the GNU AGPL for this code
+ * and the LGPL for the libraries. If you modify this code, you may extend this
+ * exception to your version of the code, but you are not obligated to do so.
+ * If you do not wish to do so, delete this exception statement from your
+ * version.
+ *
+ * This license applies to this entire compilation.
+ * @licend
+ * @source: http://www.webodf.org/
+ * @source: http://gitorious.org/odfkit/webodf/
+ */
+/*global runtime core*/
+runtime.loadClass("core.Zip");
+runtime.loadClass("core.Async");
+
+var async = new core.Async();
+
+/**
+ * @param {!core.Zip.ZipEntry} entry
+ * @param {!core.Zip} zip
+ * @param {function(?string):undefined} callback
+ * @return {undefined}
+ */
+function copyEntry(entry, zip, callback) {
+    entry.load(function (err, data) {
+        if (err) {
+            callback(err);
+        } else {
+            zip.save(entry.filename, data, false, entry.date);
+            callback(null);
+        }
+    });
+}
+
+/**
+ * @param {!core.Zip} zipa
+ * @param {!core.Zip} zipb
+ * @param {function(?string):undefined} callback
+ * @return {undefined}
+ */
+function compareZips(zipa, zipb, callback) {
+    var entriesa = zipa.getEntries(),
+        l = entriesa.length,
+        entriesb = zipb.getEntries(),
+        i,
+        j,
+        entrya,
+        entryb;
+    // compare the number of entries
+    if (entriesb.length !== l) {
+        callback("Number of entries is not equal.");
+        return;
+    }
+    // compare the meta data of the entries
+    for (i = 0; i < l; i += 1) {
+        entrya = entriesa[i];
+        for (j = 0; j < l; j += 1) {
+            entryb = entriesb[j];
+            if (entrya.filename === entryb.filename) {
+                break;
+            }
+        }
+        if (j === l) {
+            callback("Entry " + entrya.filename + " is not present in the " +
+                    "second zip file.");
+            return;
+        }
+        if (entrya.date.valueOf() !== entryb.date.valueOf()) {
+            callback("Dates for entry " + entrya.filename + " is not equal: " +
+                entrya.date + " vs " + entryb.date);
+            return;
+        }
+    }
+    // compare the data in the entries
+    async.forEach(entriesa, function (entry, callback) {
+        entry.load(function (err, dataa) {
+            if (err) {
+                callback(err);
+                return;
+            }
+            zipb.load(entry.filename, function (err, datab) {
+                if (err) {
+                    callback(err);
+                    return;
+                }
+                var i = 0, l = dataa.length;
+                if (dataa !== datab) {
+                    for (i = 0; i < l && dataa[i] === datab[i];) {
+                        i += 1;
+                    }
+                    callback("Data is not equal for " + entry.filename +
+                            " at position " + i + ": " + dataa.charCodeAt(i) +
+                            " vs " + datab.charCodeAt(i) + ".");
+                } else {
+                    callback(null);
+                }
+            });
+        });
+    }, function (err) {
+        callback(err);
+    });
+}
+
+function testZip(filepatha, callback) {
+    var zipa = new core.Zip(filepatha, function (err, zipa) {
+        if (err) {
+            runtime.log(err);
+            runtime.exit(1);
+            return;
+        }
+        // open a new zip file and copy all entries from zipa to zipb
+        var filepathb = "tmp323.zip",
+            zipb = new core.Zip(filepathb, null),
+            entries = zipa.getEntries(),
+            i,
+            entriesDone = 0;
+        async.forEach(entries, function (entry, callback) {
+            copyEntry(entry, zipb, callback);
+        }, function (err) {
+            if (err) {
+                callback(err);
+                return;
+            }
+            zipb.write(function (err) {
+                if (err) {
+                    callback(err);
+                    return;
+                }
+                zipb = new core.Zip(filepathb, function (err, zipb) {
+                    if (err) {
+                        callback(err);
+                        return;
+                    }
+                    compareZips(zipa, zipb, callback);
+                });
+            });
+        });
+    });
+}
+
+var args = arguments;
+// open the arguments one by one, save them to a file, then open again and see
+// if the contents matches
+function doit(i) {
+    if (i >= args.length) {
+        return;
+    }
+    testZip(args[i], function (err) {
+        runtime.log(args[i]);
+        if (err) {
+            runtime.log(err);
+            return;
+        }
+        i += 1;
+        if (i < args.length) {
+            doit(i);
+        }
+    });
+}
+doit(1);
diff --git a/apps/files_odfviewer/src/webodf/webodf/misctests/writetest.zip b/apps/files_odfviewer/src/webodf/webodf/misctests/writetest.zip
new file mode 100644
index 0000000000000000000000000000000000000000..69a14abc26f0936e933110307459d7c57e9e1670
GIT binary patch
literal 153
zcmWIWW@h1H0D<M5YIbqQjCj<6Y!K!E;@r&K)RM}A)Wm{<oXq6JlFa-({j$6iz5K-D
z%woO#g4Dc}{N&Qy)VvbClGKWl0B=SnIcD6(0Zl{#FvA19S=m6sj6i4xq<z6^01HYV
AmjD0&

literal 0
HcmV?d00001

diff --git a/apps/files_odfviewer/src/webodf/webodf/notes b/apps/files_odfviewer/src/webodf/webodf/notes
new file mode 100644
index 0000000000..f21a7c3fdd
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/notes
@@ -0,0 +1,137 @@
+XMLModel:
+ - list of all possible QNames
+ - list of valid attributes for each QName  
+ - node walker positions
+ - knowledge about where whitespace is meaningfull
+
+
+
+
+xmledit
+ - receives mouse and keyboard events
+     - simple editing
+     - inputs that might be interpreted higher up
+
+Tools:
+
+Features we want:
+ - ability to run code from Rhine, Node.JS and browsers
+ - type checking
+ - sanity checking
+ - javascript compilation
+ - unit tests
+ - unit test code coverage
+
+
+Closure seems a nice compiler. It should be optional.
+Unit testing should be as simple as doing a reload in a browser or calling a single command from the command-line.
+
+The only fundamental problem is the method of resolving dependencies. Closure does not understand require() commands that load modules. However, Node.JS needs this command to load modules.
+
+If require("mypackage.MyClass") would return just the class if it was already loaded, that would be perfect. Using eval() would solve this:
+    function require(module) {
+        var m;
+        try {
+            m = eval(module);
+        } catch (e) {
+        }
+        if (m === undefined) {
+            // load the module
+        }
+    }
+
+But then how to adapt the code in the modules themselves? Currenlty, no global objects are defined, but symbols are added to the exports variable. 
+Suppose that ideal javascript modules each define one class, then the code for class a.b.Class would be stored in the file a/b/Class.js and would look like this:
+====
+a.b.Class = function () {
+};
+====
+If this code should be loaded as a module, it should be executed with eval(). The environment in which the code is executed should already have 'package' a.b.
+
+function runModuleCode(modulename, code) {
+    var names = modulename.split("."),
+        evalcode;
+    if (!eval("typeof " + names[0] + " === 'undefined'")) {
+    }
+    evalcode = "if (typeof " + names[0] + " === 'undefined') {" +
+        
+    if 
+}
+
+function loadClass(modulename) {
+    // test if class already exists
+    var names = modulename.split("."),
+        evalcode, constructor;
+    evalcode = "(typeof " + names[0] + " !== 'undefined' ")
+    
+
+var code = "";
+if (typeof a === "undefined") {
+    code = code + "var a = {};";
+    if (!eval(
+
+
+Node does not have global context in eval() it seems.
+
+
+
+Running unit tests should be possible in a number of ways:
+ - single tests in
+   * browser
+   * browser with code coverage
+   * browser from js compiled with Closure Compiler
+   * node.js
+   * rhino
+ - 
+
+
+---
+
+
+Caret should work like a cursor.
+It should use the contentEditable property to advance the cursor within one text node.
+
+Isn't the current cursor sufficient? All that is missing is to use the native display when it is a text node.
+
+Using the contentEditable means that the cursor code can be simplified quite a bit if you want to 
+
+
+If the caret is in a text node, moving should be done by passing a move signal to the system.
+After the move it should be checked if the move made sense, i.e. if the caret is in an allowed position. If it is not, the position should be corrected manually.
+
+Determining if a caret is in a legal position is done with a special class.
+
+The current players:
+ - core.Cursor : insert a caret in the text if the selection calls for it
+ - gui.XMLEdit : 
+ - ...: moving of the cursor, taking into account skipping over/ignoring the cursor itself and also taking into account that the caret in an editable text must be moved by the browser
+
+move the cursor in a simple document with a wrapped text
+
+
+Contenteditable is perhaps not strictly necessary. It does not work well across browsers anyway. The only reason to use it would be to have a nice way to move the cursor up or down a line.
+
+To move the cursor or selection, a special class is needed for determining how to modify the selection upon different inputs. The visualization of the cursor is handled by the cursor class.
+
+stepForward
+stepBackward
+setPoint
+
+----
+
+Cursor and selection:
+ - cursor is foreign element of height but with no width
+ - handle mouse event to move or place the cursor at the right position
+ - handle key events to move the cursor
+
+webkit has nice functions for manipulating the selection
+selection/cursor position is the 'real' thing, the cursor (visible or not) is just the visualization
+
+The cursor must appear invisible to the normal dom functions, this is tricky because a cursor may split a text. This is however a separate concern.
+
+So there should be an event handler that translates mouse and key events into api calls. There already is moving of the cursor/selection on mouse events in Firefox and WebKit so only keyboard events need to be handled. So core.Cursor.updateToSelection should work ok for mouse events.
+
+Should we re-evaluate the use of JQuery? NO! first add editing functions to WebODF.
+
+So current top priorities: moving the cursor and saving.
+And not in the general xml editor, but in the odf editor.
diff --git a/apps/files_odfviewer/src/webodf/webodf/odf.html b/apps/files_odfviewer/src/webodf/webodf/odf.html
new file mode 100644
index 0000000000..3abbf96ff7
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/odf.html
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!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"></meta>
+  <style type="text/css" media="screen">
+    body, html, div {
+      padding: 0px;
+      margin: 0px;
+      border: 0px;
+    }
+    body, html {
+      height: 100%;
+      text-align: center;
+    }
+    html > body {
+      background: black;
+    }
+  </style>
+  <link rel="stylesheet" type="text/css" href="webodf.css"/>
+  <script src="lib/runtime.js" type="text/javascript" charset="utf-8"></script>
+  <script type="text/javascript" charset="utf-8">
+function init() {
+    runtime.loadClass("odf.OdfCanvas");
+    // if the url has a fragment (#...), try to load the file it represents
+    var location = String(document.location),
+        pos = location.indexOf('#'),
+        odfelement = document.getElementById("odf");
+    document.odfcanvas = new odf.OdfCanvas(odfelement);
+    if (pos === -1 || !window) {
+        return;
+    }
+    location = location.substr(pos + 1);
+    document.odfcanvas.load(location);
+}
+window.setTimeout(init, 1);
+  </script>
+  <title></title>
+</head>
+ 
+<body>
+  <div id="odf"/>
+</body>
+</html>
diff --git a/apps/files_odfviewer/src/webodf/webodf/odfedit.html b/apps/files_odfviewer/src/webodf/webodf/odfedit.html
new file mode 100644
index 0000000000..d4a5b53870
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/odfedit.html
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!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"></meta>
+  <link rel="stylesheet" type="text/css" href="extjs/resources/css/ext-all.css"/>
+  <style type="text/css" media="screen">
+  body { background: #dddddd;}
+  div#odf { margin: 10px; padding; 10px; border: 1px solid black; }
+  span { border: 1px solid black; }
+  body > div > span { cursor: pointer; }
+  body > div > span:hover { background: white; }
+  body > div > span:active { background: #dddddd; }
+  </style>
+  <!-- requirements -->
+  <script src="extjs/adapter/ext/ext-base.js" type="text/javascript" charset="utf-8"></script>
+  <script src="extjs/ext-all-debug.js" type="text/javascript" charset="utf-8"></script>
+  <script src="lib/runtime.js" type="text/javascript" charset="utf-8"></script>
+  <!-- application -->
+  <script src="odfedit.js" type="text/javascript" charset="utf-8"></script>
+ 
+  <title id="page-title">WebODF</title>
+  <link rel="stylesheet" type="text/css" href="webodf.css"/>
+</head>
+<body>
+</body>
+</html>
diff --git a/apps/files_odfviewer/src/webodf/webodf/odfedit.js b/apps/files_odfviewer/src/webodf/webodf/odfedit.js
new file mode 100644
index 0000000000..6dfc1cddac
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/odfedit.js
@@ -0,0 +1,314 @@
+/**
+ * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
+ * @licstart
+ * The JavaScript code in this page is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU Affero General Public License
+ * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.  The code is distributed
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
+ *
+ * As additional permission under GNU AGPL version 3 section 7, you
+ * may distribute non-source (e.g., minimized or compacted) forms of
+ * that code without the copy of the GNU GPL normally required by
+ * section 4, provided you include this license notice and a URL
+ * through which recipients can access the Corresponding Source.
+ *
+ * As a special exception to the AGPL, any HTML file which merely makes function
+ * calls to this code, and for that purpose includes it by reference shall be
+ * deemed a separate work for copyright law purposes. In addition, the copyright
+ * holders of this code give you permission to combine this code with free
+ * software libraries that are released under the GNU LGPL. You may copy and
+ * distribute such a system following the terms of the GNU AGPL for this code
+ * and the LGPL for the libraries. If you modify this code, you may extend this
+ * exception to your version of the code, but you are not obligated to do so.
+ * If you do not wish to do so, delete this exception statement from your
+ * version.
+ *
+ * This license applies to this entire compilation.
+ * @licend
+ * @source: http://www.webodf.org/
+ * @source: http://gitorious.org/odfkit/webodf/
+ */
+/*global runtime: true, document: true, odf: true, window: true, Ext: true*/
+/**
+ * @type {odf.OdfCanvas}
+ */
+var odfcanvas;
+
+/**
+ * @return {undefined}
+ */
+function fixExtJSCSS() {
+    "use strict";
+    // look through all stylesheets to change the selector
+    // ".x-viewport, .x-viewport body"
+    // to
+    // ".x-viewport, .x-viewport > body"
+    // The normal selector os not specific enough, office|body is also affected
+    // by it. To avoid this, the selector is changed so that is only applies to
+    // a director parent child relationship with '>'
+    var i, cssRules, j, rule;
+    for (i = 0; i < document.styleSheets.length; i += 1) {
+        cssRules = document.styleSheets[i].cssRules;
+        for (j = 0; j < cssRules.length; j += 1) {
+            rule = cssRules[j];
+            if (rule.selectorText === ".x-viewport, .x-viewport body") {
+                rule = rule.cssText.replace(".x-viewport, .x-viewport body",
+                        ".x-viewport, .x-viewport > body");
+                document.styleSheets[i].deleteRule(j);
+                document.styleSheets[i].insertRule(rule, j);
+                return;
+            }
+        }
+    }
+}
+/**
+ * @return {undefined}
+ */
+function updateStyleComboBox() {
+    "use strict";
+    var paragraphStylesBox = document.getElementById("paragraphStyleBox");
+}
+/**
+ * @param {!Element} odfelement
+ * @return {undefined}
+ */
+function initCanvas(odfelement) {
+    "use strict";
+    runtime.loadClass("odf.OdfCanvas");
+    // if the url has a fragment (#...), try to load the file it represents
+    var location = String(document.location),
+        pos = location.indexOf('#');
+//    odfelement.style.overflow = 'auto';
+    odfelement.style.height = '100%';
+    odfcanvas = new odf.OdfCanvas(odfelement);
+    if (pos === -1 || !window) {
+        return;
+    }
+    location = location.substr(pos + 1);
+    odfcanvas.onstatereadychange = function () {
+        /*
+        updateStyleComboBox();
+        odfcanvas.save(function (err) {
+            alert(err);
+        });
+        */
+    };
+    odfcanvas.load(location);
+    odfcanvas.addListener("selectionchange", function (element, selection) {
+        var formatting = odfcanvas.getFormatting(),
+            completelyBold = formatting.isCompletelyBold(selection),
+            alignment = formatting.getAlignment(selection);
+        runtime.log("selection changed " + completelyBold + " " + alignment);
+    });
+}
+/**
+ * @return {undefined}
+ */
+function save() {
+    "use strict";
+    odfcanvas.odfContainer().save(function (err) {
+        if (err) {
+            runtime.log(err);
+        }
+    });
+}
+Ext.ODFEditor = Ext.extend(Ext.component.Component, {
+    buttonTips : {
+        bold : {
+            title: 'Bold (Ctrl+B)',
+            text: 'Make the selected text bold.',
+            cls: 'x-html-editor-tip'
+        },
+        italic : {
+            title: 'Italic (Ctrl+I)',
+            text: 'Make the selected text italic.',
+            cls: 'x-html-editor-tip'
+        },
+        underline : {
+            title: 'Underline (Ctrl+U)',
+            text: 'Underline the selected text.',
+            cls: 'x-html-editor-tip'
+        },
+        increasefontsize : {
+            title: 'Grow Text',
+            text: 'Increase the font size.',
+            cls: 'x-html-editor-tip'
+        },
+        decreasefontsize : {
+            title: 'Shrink Text',
+            text: 'Decrease the font size.',
+            cls: 'x-html-editor-tip'
+        },
+        backcolor : {
+            title: 'Text Highlight Color',
+            text: 'Change the background color of the selected text.',
+            cls: 'x-html-editor-tip'
+        },
+        forecolor : {
+            title: 'Font Color',
+            text: 'Change the color of the selected text.',
+            cls: 'x-html-editor-tip'
+        },
+        justifyleft : {
+            title: 'Align Text Left',
+            text: 'Align text to the left.',
+            cls: 'x-html-editor-tip'
+        },
+        justifycenter : {
+            title: 'Center Text',
+            text: 'Center text in the editor.',
+            cls: 'x-html-editor-tip'
+        },
+        justifyright : {
+            title: 'Align Text Right',
+            text: 'Align text to the right.',
+            cls: 'x-html-editor-tip'
+        },
+        insertunorderedlist : {
+            title: 'Bullet List',
+            text: 'Start a bulleted list.',
+            cls: 'x-html-editor-tip'
+        },
+        insertorderedlist : {
+            title: 'Numbered List',
+            text: 'Start a numbered list.',
+            cls: 'x-html-editor-tip'
+        },
+        createlink : {
+            title: 'Hyperlink',
+            text: 'Make the selected text a hyperlink.',
+            cls: 'x-html-editor-tip'
+        },
+        sourceedit : {
+            title: 'Source Edit',
+            text: 'Switch to source editing mode.',
+            cls: 'x-html-editor-tip'
+        },
+        save : {
+            title: 'Save (Ctrl+S)',
+            text: 'Save the document.',
+            cls: 'x-html-editor-tip'
+        }
+    }
+});
+
+
+var ODFEditor = Ext.extend(Ext.Panel, {
+    initComponent: function () {
+        "use strict";
+        var me = this,
+            statusMessage = new Ext.Toolbar.TextItem('');
+        function buttonHandler(button, event) {
+        }
+        me.defaults = {
+        };
+        me.initialConfig = Ext.apply({
+        }, me.initialConfig);
+        me.items = [{
+            xtype: 'box',
+            id: 'canvas',
+            autoEl: {
+                tag: 'div',
+                frameBorder: 0,
+                style: {
+                    border: '0 none'
+                }
+            },
+            autoScroll: true,
+            scroll: true
+        }];
+        me.tbar = {
+            xtype: 'toolbar',
+            items: [{
+                xtype: 'button',
+                icon: 'extjs/examples/shared/icons/save.gif',
+                handler: buttonHandler,
+                cls: 'x-btn-icon'
+            }, {
+                xtype: 'tbseparator'
+            }, {
+                tag: 'select',
+                //html: this.createFontOptions()
+                cls: 'x-font-select'
+            }, {
+                xtype: 'buttongroup',
+                cls: 'x-html-editor-tb',
+                frame: false,
+                items: [{
+                    xtype: 'button',
+                    iconCls: 'x-edit-bold',
+                    cls: 'x-btn-icon'
+                }, {
+                    xtype: 'button',
+                    iconCls: 'x-edit-italic',
+                    cls: 'x-btn-icon'
+                }, {
+                    xtype: 'button',
+                    iconCls: 'x-edit-underline',
+                    cls: 'x-btn-icon'
+                }, {
+                    itemId: 'forecolor',
+                    cls: 'x-btn-icon',
+                    iconCls: 'x-edit-forecolor',
+                    menu: { xtype: 'colormenu' }
+                }, {
+                    itemId: 'backcolor',
+                    cls: 'x-btn-icon',
+                    iconCls: 'x-edit-backcolor',
+                    menu: { xtype: 'colormenu' }
+                }, {
+                    xtype: 'button',
+                    iconCls: 'x-edit-justifyleft',
+                    cls: 'x-btn-icon'
+                }, {
+                    xtype: 'button',
+                    iconCls: 'x-edit-justifycenter',
+                    cls: 'x-btn-icon'
+                }, {
+                    xtype: 'button',
+                    iconCls: 'x-edit-justifyright',
+                    cls: 'x-btn-icon'
+                }, {
+                    xtype: 'button',
+                    iconCls: 'x-edit-insertorderedlist',
+                    cls: 'x-btn-icon'
+                }, {
+                    xtype: 'button',
+                    iconCls: 'x-edit-insertunorderedlist',
+                    cls: 'x-btn-icon'
+                }]
+            }, {
+                xtype: 'tbfill'
+            },
+            statusMessage
+            ]
+        };
+/*
+        me.bbar = {
+            xtype: 'toolbar',
+            items: [ {xtype: "tbfill" }, statusMessage ]
+        };
+*/
+        ODFEditor.superclass.initComponent.call(this);
+    }
+});
+Ext.onReady(function () {
+    "use strict";
+    var canvas, viewport;
+
+    Ext.QuickTips.init();
+
+    canvas = new ODFEditor({
+        region: 'center'
+    });
+
+    viewport = new Ext.Viewport({
+        layout: 'border',
+        items: [ canvas ]
+    });
+
+    fixExtJSCSS();
+    initCanvas(Ext.getCmp('canvas').el.dom);
+});
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngToCPP.js b/apps/files_odfviewer/src/webodf/webodf/relaxngToCPP.js
new file mode 100644
index 0000000000..064fe61b79
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/relaxngToCPP.js
@@ -0,0 +1,463 @@
+/**
+ * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
+ * @licstart
+ * The JavaScript code in this page is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU Affero General Public License
+ * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.  The code is distributed
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
+ *
+ * As additional permission under GNU AGPL version 3 section 7, you
+ * may distribute non-source (e.g., minimized or compacted) forms of
+ * that code without the copy of the GNU GPL normally required by
+ * section 4, provided you include this license notice and a URL
+ * through which recipients can access the Corresponding Source.
+ *
+ * As a special exception to the AGPL, any HTML file which merely makes function
+ * calls to this code, and for that purpose includes it by reference shall be
+ * deemed a separate work for copyright law purposes. In addition, the copyright
+ * holders of this code give you permission to combine this code with free
+ * software libraries that are released under the GNU LGPL. You may copy and
+ * distribute such a system following the terms of the GNU AGPL for this code
+ * and the LGPL for the libraries. If you modify this code, you may extend this
+ * exception to your version of the code, but you are not obligated to do so.
+ * If you do not wish to do so, delete this exception statement from your
+ * version.
+ *
+ * This license applies to this entire compilation.
+ * @licend
+ * @source: http://www.webodf.org/
+ * @source: http://gitorious.org/odfkit/webodf/
+ */
+/*global runtime: true, xmldom: true*/
+runtime.loadClass("xmldom.RelaxNGParser");
+
+var nsmap = {
+        "http://purl.org/dc/elements/1.1/": "purl",
+        "http://www.w3.org/1998/Math/MathML": "mathml",
+        "http://www.w3.org/1999/xhtml": "xhtml",
+        "http://www.w3.org/1999/xlink": "xlink",
+        "http://www.w3.org/2002/xforms": "xforms",
+        "http://www.w3.org/2003/g/data-view#": "dv",
+        "http://www.w3.org/XML/1998/namespace": "xmlns",
+        "urn:oasis:names:tc:opendocument:xmlns:animation:1.0": "animation",
+        "urn:oasis:names:tc:opendocument:xmlns:chart:1.0": "chart",
+        "urn:oasis:names:tc:opendocument:xmlns:config:1.0": "config",
+        "urn:oasis:names:tc:opendocument:xmlns:database:1.0": "database",
+        "urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0": "datastyle",
+        "urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0": "dr3d",
+        "urn:oasis:names:tc:opendocument:xmlns:drawing:1.0": "drawing",
+        "urn:oasis:names:tc:opendocument:xmlns:form:1.0": "form",
+        "urn:oasis:names:tc:opendocument:xmlns:meta:1.0": "meta",
+        "urn:oasis:names:tc:opendocument:xmlns:office:1.0": "office",
+        "urn:oasis:names:tc:opendocument:xmlns:presentation:1.0": "presentation",
+        "urn:oasis:names:tc:opendocument:xmlns:script:1.0": "script",
+        "urn:oasis:names:tc:opendocument:xmlns:smil-compatible:1.0": "smilc",
+        "urn:oasis:names:tc:opendocument:xmlns:style:1.0": "style",
+        "urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0": "svgc",
+        "urn:oasis:names:tc:opendocument:xmlns:table:1.0": "table",
+        "urn:oasis:names:tc:opendocument:xmlns:text:1.0": "text",
+        "urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0": "xslfoc"
+    },
+    typemap = {
+        "string": "const QString&",
+        "NCName": "const QString&",
+        "date": "const QString&",
+        "time": "const QString&",
+        "dateTime": "const QString&",
+        "duration": "const QString&",
+        "anyURI": "const QString&",
+        "ID": "const QString&",
+        "IDREF": "const QString&",
+        "IDREFS": "const QString&",
+        "QName": "const QString&",
+        "token": "const QString&",
+        "language": "const QString&",
+        "positiveInteger": "quint32",
+        "nonNegativeInteger": "quint32",
+        "integer": "qint32",
+        "decimal": "double"
+    },
+    args = arguments,
+    relaxngurl = args[1],
+    parser = new xmldom.RelaxNGParser(relaxngurl);
+
+function out(string) {
+    "use strict";
+    runtime.log(string);
+}
+function toCamelCase(s) {
+    "use strict";
+    var str = "", i, up = true;
+    for (i = 0; i < s.length; i += 1) {
+        if (up) {
+            str += s.substr(i, 1).toUpperCase();
+        } else {
+            str += s.substr(i, 1);
+        }
+        up = false;
+        while (/\W/.test(s.substr(i + 1, 1))) {
+            up = true;
+            i += 1;
+        }
+    }
+    return str;
+}
+function getName(e) {
+    "use strict";
+    return toCamelCase(nsmap[e.a.ns]) + toCamelCase(e.text);
+}
+function getNames(e, names) {
+    "use strict";
+    if (e.name === "name") {
+        names.push(e);
+    } else if (e.name === "choice") {
+        getNames(e.e[0], names);
+        getNames(e.e[1], names);
+    }
+}
+function parseAttributes(e, att) {
+    "use strict";
+    var i, name;
+    if (e.name === "choice" || e.name === "interleave"
+            || e.name === "group") {
+        for (i = 0; i < e.e.length; i += 1) {
+            parseAttributes(e.e[i], att);
+        }
+    } else if (e.name === "value") {
+        att.values.push(e.text);
+    } else if (e.name === "data") {
+        att.types.push(e.a.type);
+    } else if (e.name === "list") {
+        name = null; // todo 
+    } else if (e.name === "empty") {
+        att.empty = true;
+    } else {
+        runtime.log("OOPS " + e.name);
+        throw null;
+    }
+}
+function writeAttributeSetter(name, type, a) {
+    "use strict";
+    var i, s = "";
+    out("    /**");
+    if (a.optional) {
+        out("     * Set optional attribute " + a.nsname + ".");
+    } else {
+        out("     * Set required attribute " + a.nsname + ".");
+    }
+    if (a.values.length > 0) {
+        s = "Choose one of these values: '" + a.values[0] + "'";
+        for (i = 1; i < a.values.length; i += 1) {
+            s += ", '" + a.values[i] + "'";
+        }
+        out("     * " + s + ".");
+    }
+    out("     */");
+    out("    inline void write" + name + "(" + type + " value) {");
+    out("        xml->addAttribute(\"" + a.nsname + "\", value);");
+    out("    }");
+}
+function writeAttribute(name, a) {
+    "use strict";
+    if (!a.optional) {
+        return;
+    }
+    var i, type, done = {}, needfallback = true;
+    for (i = 0; i < a.types.length; i += 1) {
+        needfallback = false;
+        type = typemap[a.types[i]] || a.types[i];
+        if (!done.hasOwnProperty(type)) {
+            done[type] = 1;
+            writeAttributeSetter(name, type, a);
+        }
+    }
+    if (a.values.indexOf("true") !== -1 && a.values.indexOf("false") !== -1 &&
+            done.hasOwnProperty("bool")) {
+        needfallback = false;
+        writeAttributeSetter(name, "bool", a);
+    }
+    if (needfallback) {
+        writeAttributeSetter(name, "const QString&", a);
+    }
+}
+function writeOptionalAttributes(atts) {
+    "use strict";
+    var name;
+    for (name in atts) {
+        if (atts.hasOwnProperty(name)) {
+            writeAttribute(name, atts[name]);
+        }
+    }
+}
+function writeFixedRequiredAttributes(atts) {
+    "use strict";
+    var name, a;
+    for (name in atts) {
+        if (atts.hasOwnProperty(name)) {
+            a = atts[name];
+            if (!a.optional && a.types.length === 0 && a.values.length === 1) {
+                 out("        xml->addAttribute(\"" + a.nsname + "\", \"" +
+                     a.values[0] + "\");");
+            }
+        }
+    }
+}
+function getRequiredAttributeArguments(atts) {
+    "use strict";
+    var name, a, s = "", type;
+    for (name in atts) {
+        if (atts.hasOwnProperty(name)) {
+            a = atts[name];
+            if (!a.optional && (a.types.length > 0 || a.values.length !== 1)) {
+                type = typemap[a.types[0]] || a.types[0] || "const QString&";
+                if (s) {
+                    s += ", ";
+                }
+                s += type + " " + name.toLowerCase();
+            }
+        }
+    }
+    return s;
+}
+function getRequiredAttributeCall(atts) {
+    "use strict";
+    var name, a, s = "";
+    for (name in atts) {
+        if (atts.hasOwnProperty(name)) {
+            a = atts[name];
+            if (!a.optional && (a.types.length > 0 || a.values.length !== 1)) {
+                if (s) {
+                    s += ", ";
+                }
+                s += name.toLowerCase();
+            }
+        }
+    }
+    return s;
+}
+function writeRequiredAttributesSetters(atts) {
+    "use strict";
+    var name, a;
+    for (name in atts) {
+        if (atts.hasOwnProperty(name)) {
+            a = atts[name];
+            if (!a.optional && (a.types.length > 0 || a.values.length !== 1)) {
+                out("        xml->addAttribute(\"" + a.nsname + "\", " +
+                    name.toLowerCase() + ");");
+            }
+        }
+    }
+}
+function writeMembers(e, atts, optional) {
+    "use strict";
+    var ne, nsname, i, name, names;
+    if (e.name === "element") {
+        name = null;
+    } else if (e.name === "attribute") {
+        names = [];
+        getNames(e.e[0], names);
+        for (i = 0; i < names.length; i += 1) {
+            ne = names[i];
+            name = getName(ne);
+            if (!atts.hasOwnProperty(name)) {
+                nsname = nsmap[ne.a.ns] + ":" + ne.text;
+                atts[name] = {
+                    nsname: nsname,
+                    values: [],
+                    types: [],
+                    optional: optional,
+                    empty: false
+                };
+            }
+            parseAttributes(e.e[1], atts[name]);
+        }
+    } else if (e.name === "choice") {
+        for (i = 0; i < e.e.length; i += 1) {
+            writeMembers(e.e[i], atts, true);
+        }
+    } else if (e.name === "interleave" || e.name === "group") {
+        for (i = 0; i < e.e.length; i += 1) {
+            writeMembers(e.e[i], atts, optional);
+        }
+    } else if (e.name === "oneOrMore") {
+        writeMembers(e.e[0], atts, optional);
+    } else if (e.name === "value") {
+        name = null; // todo 
+    } else if (e.name === "data") {
+        name = null; // todo 
+    } else if (e.name === "text") {
+        out("    void addTextNode(const QString& str) { xml->addTextNode(str); }");
+    } else if (e.name === "empty") {
+        name = null; // todo 
+    } else {
+        runtime.log("OOPS " + e.name);
+        throw null;
+    }
+}
+function defineClass(e, parents, children) {
+    "use strict";
+    var c, p, i,
+        ne = e.e[0],
+        nsname = nsmap[ne.a.ns] + ":" + ne.text,
+        name = ne.cppname, atts = {};
+    out("/**");
+    out(" * Serialize a <" + nsname + "> element.");
+    out(" */");
+    out("class " + name + "Writer {");
+    for (c in children) {
+        if (children.hasOwnProperty(c) && c !== name) {
+            out("friend class " + c + "Writer;");
+        }
+    }
+    out("public:");
+    writeMembers(e.e[1], atts, false);
+    writeOptionalAttributes(atts);
+    e.requiredAttributes = getRequiredAttributeArguments(atts);
+    e.requiredAttributeCall = getRequiredAttributeCall(atts);
+    out("private:");
+    out("    inline void start(" + e.requiredAttributes + ") {");
+    out("        xml->startElement(\"" + nsname + "\");");
+    if (e.requiredAttributes) {
+        e.requiredAttributes = ", " + e.requiredAttributes;
+    }
+    writeFixedRequiredAttributes(atts);
+    writeRequiredAttributesSetters(atts);
+    out("    }");
+    out("public:");
+    out("    KoXmlWriter* const xml;");
+    for (p in parents) {
+        if (parents.hasOwnProperty(p)) {
+            out("    inline explicit " + name + "Writer(const " + p +
+                    "Writer& p" + e.requiredAttributes + ");");
+        }
+    }
+    out("    inline explicit " + name + "Writer(KoXmlWriter* xml_" +
+            e.requiredAttributes +
+            ") :xml(xml_) { start(" + e.requiredAttributeCall + "); }");
+    out("    void end() { xml->endElement(); }");
+    out("    void operator=(const " + name + "Writer&) { }");
+    out("};");
+}
+function defineConstructors(e, parents) {
+    "use strict";
+    var p,
+        ne = e.e[0],
+        nsname = nsmap[ne.a.ns] + ":" + ne.text,
+        name = ne.cppname;
+    for (p in parents) {
+        if (parents.hasOwnProperty(p)) {
+            out(name + "Writer::" + name + "Writer(const " + p +
+                "Writer& p" + e.requiredAttributes +
+                ") :xml(p.xml) { start(" + e.requiredAttributeCall + "); }");
+        }
+    }
+}
+function getChildren(e, children) {
+    "use strict";
+    var name, i, names;
+    if (e.name === "element") {
+        names = [];
+        getNames(e.e[0], names);
+        for (i = 0; i < names.length; i += 1) {
+            children[names[i].cppname] = 1;
+        }
+    } else if (e.name === "choice" || e.name === "interleave"
+            || e.name === "group") {
+        for (i = 0; i < e.e.length; i += 1) {
+            getChildren(e.e[i], children);
+        }
+    } else if (e.name === "oneOrMore") {
+        getChildren(e.e[0], children);
+    } else if (e.name === "attribute" || e.name === "value" ||
+            e.name === "data" || e.name === "text" || e.name === "empty") {
+        name = null; // ignore
+    } else {
+        runtime.log("OOPS " + e.name);
+        throw null;
+    }
+}
+function childrenToParents(childrenmap) {
+    "use strict";
+    var p, children, c, parents = {};
+    for (p in childrenmap) {
+        if (childrenmap.hasOwnProperty(p)) {
+            children = childrenmap[p];
+            for (c in children) {
+                if (children.hasOwnProperty(c)) {
+                    if (!parents.hasOwnProperty(c)) {
+                        parents[c] = {};
+                    }
+                    parents[c][p] = 1;
+                }
+            }
+        }
+    }
+    return parents;
+}
+function toCPP(elements) {
+    "use strict";
+    out("#include <KoXmlWriter.h>");
+
+    // first get a mapping for all the parents
+    var children = {}, parents = {}, i, j, ce, ec, name, names, c,
+        elementMap = {}, sortedElementNames = [];
+    for (i = 0; i < elements.length; i += 1) {
+        ce = elements[i];
+        if (ce.name !== "element") {
+            runtime.log("Error in parsed data.");
+            return;
+        }
+        names = [];
+        getNames(ce.e[0], names);
+        for (j = 0; j < names.length; j += 1) {
+            name = getName(names[j]);
+            while (elementMap.hasOwnProperty(name)) {
+                name = name + "_";
+            }
+            names[j].cppname = name;
+            ec = {e: [names[j], ce.e[1]]};
+            elementMap[name] = ec;
+            sortedElementNames.push(name);
+        }
+    }
+    sortedElementNames.sort();
+
+    for (i = 0; i < sortedElementNames.length; i += 1) {
+        name = sortedElementNames[i];
+        c = {};
+        getChildren(elementMap[name].e[1], c);
+        children[name] = c;
+    }
+    parents = childrenToParents(children);
+
+    for (i = 0; i < sortedElementNames.length; i += 1) {
+        name = sortedElementNames[i];
+        out("class " + name + "Writer;");
+    }
+    for (i = 0; i < sortedElementNames.length; i += 1) {
+        name = sortedElementNames[i];
+        defineClass(elementMap[name], parents[name], children[name]);
+    }
+    for (i = 0; i < sortedElementNames.length; i += 1) {
+        name = sortedElementNames[i];
+        defineConstructors(elementMap[name], parents[name]);
+    }
+}
+
+// load and parse the Relax NG
+runtime.loadXML(relaxngurl, function (err, dom) {
+    "use strict";
+    var parser = new xmldom.RelaxNGParser();
+    if (err) {
+        runtime.log(err);
+    } else {
+        err = parser.parseRelaxNGDOM(dom);
+        if (err) {
+            runtime.log(err);
+        } else {
+            toCPP(parser.elements);
+        }
+    }
+});
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test01.rng b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test01.rng
new file mode 100644
index 0000000000..0c4e4baa8d
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test01.rng
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<grammar
+	xmlns="http://relaxng.org/ns/structure/1.0"
+
+	xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
+>
+	<start>
+		<ref name="office-document-content"/>
+	</start>
+	<define name="office-document-content">
+		<element name="office:document-content">
+			<ref name="office-document-common-attrs"/>
+			<ref name="office-scripts"/>
+			<ref name="office-body"/>
+		</element>
+	</define>
+	<define name="office-document-common-attrs">
+		<attribute name="office:version">
+			<value>1.2</value>
+		</attribute>
+	</define>
+	<define name="office-scripts">
+		<optional>
+			<element name="office:scripts">
+				<empty/>
+			</element>
+		</optional>
+	</define>
+	<define name="office-body">
+		<element name="office:body">
+			<element name="office:text">
+				<empty/>
+			</element>
+		</element>
+	</define>
+</grammar>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test01.xml b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test01.xml
new file mode 100644
index 0000000000..71712e11e5
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test01.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<office:document-content xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" office:version="1.2">
+ <office:scripts/>
+ <!--comment-->
+ <office:body>
+  <office:text/>
+ </office:body>
+</office:document-content>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test02.rng b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test02.rng
new file mode 100644
index 0000000000..ed37e255fd
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test02.rng
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<grammar
+	xmlns="http://relaxng.org/ns/structure/1.0"
+
+	xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
+	xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
+>
+	<start>
+		<ref name="office-document-content"/>
+	</start>
+	<define name="office-document-content">
+		<element name="office:document-content">
+			<ref name="office-document-common-attrs"/>
+			<ref name="office-scripts"/>
+			<ref name="office-automatic-styles"/>
+			<ref name="office-body"/>
+		</element>
+	</define>
+	<define name="office-automatic-styles">
+		<optional>
+			<element name="office:automatic-styles">
+				<zeroOrMore>
+					<element name="style:style">
+						<attribute name="style:name"><value>NamespaceTable</value></attribute>
+						<ref name="style-style-content"/>
+					</element>
+				</zeroOrMore>
+			</element>
+		</optional>
+	</define>
+	<define name="office-document-common-attrs">
+		<attribute name="office:version">
+			<value>1.2</value>
+		</attribute>
+	</define>
+	<define name="office-scripts">
+		<optional>
+			<element name="office:scripts">
+				<empty/>
+			</element>
+		</optional>
+	</define>
+	<define name="office-body">
+		<element name="office:body">
+			<element name="office:text">
+				<empty/>
+			</element>
+		</element>
+	</define>
+	<define name="style-table-properties">
+		<element name="style:table-properties">
+			<empty/>
+		</element>
+	</define>
+	<define name="style-chart-properties">
+		<element name="style:chart-properties">
+			<empty/>
+		</element>
+	</define>
+	<define name="style-style-content">
+		<choice>
+			<group>
+				<attribute name="style:family">
+					<value>chart</value>
+				</attribute>
+				<optional>
+					<ref name="style-chart-properties"/>
+				</optional>
+			</group>
+			<group>
+				<attribute name="style:family">
+					<value>table</value>
+				</attribute>
+				<optional>
+					<ref name="style-table-properties"/>
+				</optional>
+			</group>
+		</choice>
+	</define>
+</grammar>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test02.xml b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test02.xml
new file mode 100644
index 0000000000..7e70255ed4
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test02.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<office:document-content xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" office:version="1.2">
+ <office:automatic-styles>
+  <style:style style:name="NamespaceTable" style:family="table">
+   <style:table-properties/>
+  </style:style>
+ </office:automatic-styles>
+ <office:body>
+  <office:text>
+  </office:text>
+ </office:body>
+</office:document-content>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test03.rng b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test03.rng
new file mode 100644
index 0000000000..8803f52898
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test03.rng
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<grammar
+	xmlns="http://relaxng.org/ns/structure/1.0"
+	xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
+>
+	<start>
+		<element name="office:a">
+			<interleave>
+				<text/>
+				<element name="office:b">
+					<empty/>
+				</element>
+			</interleave>
+		</element>
+	</start>
+</grammar>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test03.xml b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test03.xml
new file mode 100644
index 0000000000..a6255e802e
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test03.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<office:a xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0">
+	hello
+	<office:b/>
+	hi
+</office:a>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test04.rng b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test04.rng
new file mode 100644
index 0000000000..511b297efa
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test04.rng
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<grammar
+	xmlns="http://relaxng.org/ns/structure/1.0"
+	xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
+>
+	<start>
+		<element name="office:document-content">
+			<interleave>
+				<attribute name="office:version">
+					<value>1.2</value>
+				</attribute>
+			</interleave>
+			<element name="office:body">
+				<empty/>
+			</element>
+		</element>
+	</start>
+</grammar>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test04.xml b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test04.xml
new file mode 100644
index 0000000000..21ceee55b1
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test04.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<office:document-content xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"  office:version="1.2">
+ <office:body>
+ </office:body>
+</office:document-content>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test05.rng b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test05.rng
new file mode 100644
index 0000000000..c0c73052f2
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test05.rng
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<grammar
+	xmlns="http://relaxng.org/ns/structure/1.0"
+	xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
+	xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
+>
+	<start>
+		<ref name="office-document-content"/>
+	</start>
+	<define name="office-document-content">
+		<element name="office:document-content">
+			<attribute name="office:version">
+				<value>1.2</value>
+			</attribute>
+			<ref name="office-body"/>
+		</element>
+	</define>
+	<define name="office-body">
+		<element name="office:body">
+			<element name="office:text">
+				<zeroOrMore>
+					<ref name="text-p"/>
+				</zeroOrMore>
+			</element>
+		</element>
+	</define>
+	<define name="text-p">
+		<element name="text:p">
+			<zeroOrMore>
+				<ref name="paragraph-content"/>
+			</zeroOrMore>
+		</element>
+	</define>
+	<define name="paragraph-content">
+		<choice>
+			<text/>
+			<element name="text:s">
+				<empty/>
+			</element>
+		</choice>
+	</define>
+</grammar>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test05.xml b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test05.xml
new file mode 100644
index 0000000000..38cb418bde
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test05.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<office:document-content xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" office:version="1.2">
+ <office:body>
+  <office:text>
+   <text:p>
+   </text:p>
+  </office:text>
+ </office:body>
+</office:document-content>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test06.rng b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test06.rng
new file mode 100644
index 0000000000..c744850f98
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test06.rng
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<grammar
+	xmlns="http://relaxng.org/ns/structure/1.0"
+	xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
+>
+	<start>
+		<element name="office:a">
+			<text/>
+		</element>
+	</start>
+</grammar>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test06.xml b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test06.xml
new file mode 100644
index 0000000000..a9c24656ea
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test06.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<office:a xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0">
+	hello
+</office:a>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test07.rng b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test07.rng
new file mode 100644
index 0000000000..fb37cf8275
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test07.rng
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<grammar
+	xmlns="http://relaxng.org/ns/structure/1.0"
+	xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
+	xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0"
+>
+	<start>
+		<element name="office:document">
+			<attribute name="office:version">
+				<value>1.2</value>
+			</attribute>
+			<attribute name="office:mimetype">
+				<ref name="string"/>
+			</attribute>
+			<ref name="office-settings"/>
+			<ref name="office-body"/>
+		</element>
+	</start>
+	<define name="office-body">
+		<element name="office:body">
+			<element name="office:text">
+				<empty/>
+			</element>
+		</element>
+	</define>
+	<define name="office-settings">
+		<element name="office:settings">
+			<element name="config:config-item-set">
+				<attribute name="config:name">
+					<ref name="string"/>
+				</attribute>
+				<element name="config:config-item">
+					<interleave>
+						<attribute name="config:name">
+							<ref name="string"/>
+						</attribute>
+						<attribute name="config:type">
+							<choice>
+								<value>boolean</value>
+								<value>short</value>
+							</choice>
+						</attribute>
+					</interleave>
+					<text/>
+				</element>
+			</element>
+		</element>
+	</define>
+	<define name="string">
+		<data type="string"/>
+	</define>
+</grammar>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test07.xml b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test07.xml
new file mode 100644
index 0000000000..a5361bf155
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test07.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
+                 xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0"
+                 office:version="1.2"
+                 office:mimetype="application/vnd.oasis.opendocument.text">
+   <office:settings>
+      <config:config-item-set config:name="ooo:configuration-settings">
+         <config:config-item config:name="UpdateFromTemplate" config:type="boolean">true</config:config-item>
+      </config:config-item-set>
+   </office:settings>
+   <office:body>
+      <office:text/>
+   </office:body>
+</office:document>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test08.rng b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test08.rng
new file mode 100644
index 0000000000..82c2de66c5
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test08.rng
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<grammar
+	xmlns="http://relaxng.org/ns/structure/1.0"
+	xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
+	xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0"
+>
+	<start>
+		<element name="office:document">
+			<attribute name="office:version">
+				<value>1.2</value>
+			</attribute>
+			<attribute name="office:mimetype">
+				<ref name="string"/>
+			</attribute>
+			<ref name="office-settings"/>
+			<ref name="office-body"/>
+		</element>
+	</start>
+	<define name="office-body">
+		<element name="office:body">
+			<element name="office:text">
+				<empty/>
+			</element>
+		</element>
+	</define>
+	<define name="office-settings">
+		<element name="office:settings">
+			<element name="config:config-item-set">
+				<attribute name="config:name">
+					<ref name="string"/>
+				</attribute>
+				<element name="config:config-item">
+					<interleave>
+						<attribute name="config:name">
+							<ref name="string"/>
+						</attribute>
+						<attribute name="config:type">
+							<choice>
+								<value>boolean</value>
+								<value>string</value>
+							</choice>
+						</attribute>
+					</interleave>
+					<text/>
+				</element>
+			</element>
+		</element>
+	</define>
+	<define name="string">
+		<data type="string"/>
+	</define>
+</grammar>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test08.xml b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test08.xml
new file mode 100644
index 0000000000..71af08046c
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test08.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
+                 xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0"
+                 office:version="1.2"
+                 office:mimetype="application/vnd.oasis.opendocument.text">
+   <office:settings>
+      <config:config-item-set config:name="ooo:configuration-settings">
+         <config:config-item config:name="PrintFaxName" config:type="string"/>
+      </config:config-item-set>
+   </office:settings>
+   <office:body>
+      <office:text/>
+   </office:body>
+</office:document>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test09.rng b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test09.rng
new file mode 100644
index 0000000000..1726996897
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test09.rng
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<grammar
+	xmlns="http://relaxng.org/ns/structure/1.0"
+	xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
+	xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
+	xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
+>
+	<start>
+		<element name="office:document">
+			<attribute name="office:version">
+				<value>1.2</value>
+			</attribute>
+			<attribute name="office:mimetype">
+				<data type="string"/>
+			</attribute>
+			<element name="office:body">
+				<element name="office:text">
+					<element name="text:p">
+						<choice>
+							<text/>
+							<element name="draw:frame">
+								<empty/>
+							</element>
+						</choice>
+					</element>
+				</element>
+			</element>
+		</element>
+	</start>
+</grammar>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test09.xml b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test09.xml
new file mode 100644
index 0000000000..a54dd99e4b
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test09.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
+                 xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
+                 xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
+                 office:version="1.2"
+                 office:mimetype="application/vnd.oasis.opendocument.text">
+   <office:body>
+      <office:text>
+         <text:p>
+            <draw:frame/>
+         </text:p>
+      </office:text>
+   </office:body>
+</office:document>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test10.rng b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test10.rng
new file mode 100644
index 0000000000..5e271a4389
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test10.rng
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<grammar
+	xmlns="http://relaxng.org/ns/structure/1.0"
+	datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
+	xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
+	xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
+	xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
+>
+	<start>
+		<element name="office:document">
+			<attribute name="office:version">
+				<value>1.2</value>
+			</attribute>
+			<attribute name="office:mimetype">
+				<data type="string"/>
+			</attribute>
+			<element name="office:styles">
+				<interleave>
+					<choice>
+						<empty/>
+						<oneOrMore>
+							<ref name="style-style"/>
+						</oneOrMore>
+					</choice>
+					<element name="style:default-style">
+						<ref name="style-style-content"/>
+					</element>
+				</interleave>
+			</element>
+			<element name="office:body">
+				<element name="office:text">
+					<empty/>
+				</element>
+			</element>
+		</element>
+	</start>
+	<define name="style-style">
+		<element name="style:style">
+			<attribute name="style:name">
+				<data type="NCName"/>
+			</attribute>
+			<ref name="style-style-content"/>
+		</element>
+	</define>
+	<define name="style-style-content">
+		<attribute name="style:family">
+			<value>text</value>
+		</attribute>
+	</define>
+</grammar>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test10.xml b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test10.xml
new file mode 100644
index 0000000000..f4087a8976
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test10.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
+                 xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
+                 office:version="1.2"
+                 office:mimetype="application/vnd.oasis.opendocument.text">
+   <office:styles>
+      <style:default-style style:family="text"/>
+      <style:style style:name="Standard" style:family="text"/>
+   </office:styles>
+   <office:body>
+      <office:text/>
+   </office:body>
+</office:document>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test11.rng b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test11.rng
new file mode 100644
index 0000000000..2df604b5b8
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test11.rng
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<grammar
+	xmlns="http://relaxng.org/ns/structure/1.0"
+	datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
+	xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
+	xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
+	xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0"
+>
+	<start>
+		<element name="office:document">
+			<attribute name="office:version">
+				<value>1.2</value>
+			</attribute>
+			<attribute name="office:mimetype">
+				<data type="string"/>
+			</attribute>
+			<element name="office:font-face-decls">
+				<choice>
+					<empty/>
+					<oneOrMore>
+						<ref name="style-font-face"/>
+					</oneOrMore>
+				</choice>
+			</element>
+			<element name="office:body">
+				<element name="office:text">
+					<empty/>
+				</element>
+			</element>
+		</element>
+	</start>
+	<define name="style-font-face">
+		<element name="style:font-face">
+			<ref name="style-font-face-attlist"/>
+		</element>
+	</define>
+	<define name="style-font-face-attlist">
+		<interleave>
+			<optional>
+				<attribute name="svg:ascent">
+					<ref name="integer"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="svg:descent">
+					<ref name="integer"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="svg:widths">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="svg:bbox">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="svg:ideographic">
+					<ref name="integer"/>
+				</attribute>
+			</optional>
+			<attribute name="style:name">
+				<ref name="string"/>
+			</attribute>
+		</interleave>
+	</define>
+	<define name="string">
+		<data type="string"/>
+	</define>
+	<define name="integer">
+		<data type="integer"/>
+	</define>
+</grammar>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test11.xml b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test11.xml
new file mode 100644
index 0000000000..d272fd4e3e
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test11.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
+                 xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
+                 office:version="1.2"
+                 office:mimetype="application/vnd.oasis.opendocument.text">
+   <office:font-face-decls>
+      <style:font-face style:name="LucidaSans"/>
+   </office:font-face-decls>
+   <office:body>
+      <office:text/>
+   </office:body>
+</office:document>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test12.rng b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test12.rng
new file mode 100644
index 0000000000..a0e79a356e
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test12.rng
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<grammar
+	xmlns="http://relaxng.org/ns/structure/1.0"
+	xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
+	xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
+	xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0"
+>
+	<start>
+		<element name="office:document">
+			<attribute name="office:version">
+				<value>1.2</value>
+			</attribute>
+			<attribute name="office:mimetype">
+				<data type="string"/>
+			</attribute>
+			<element name="office:styles">
+				<interleave>
+					<element name="style:default-style">
+						<ref name="style-style-content"/>
+					</element>
+				</interleave>
+			</element>
+			<element name="office:body">
+				<element name="office:text">
+					<empty/>
+				</element>
+			</element>
+		</element>
+	</start>
+	<define name="style-style-content">
+		<group>
+			<attribute name="style:family">
+				<value>text</value>
+			</attribute>
+			<element name="style:text-properties">
+				<ref name="style-text-properties-attlist"/>
+			</element>
+		</group>
+	</define>
+	<define name="style-text-properties-attlist">
+		<interleave>
+			<optional>
+				<attribute name="style:text-line-through-text">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:font-name">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:font-name-asian">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:font-name-complex">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="fo:font-family">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:font-family-asian">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:font-family-complex">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:font-style-name">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:font-style-name-asian">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+			<optional>
+				<attribute name="style:font-style-name-complex">
+					<ref name="string"/>
+				</attribute>
+			</optional>
+		</interleave>
+	</define>
+	<define name="string">
+		<data type="string"/>
+	</define>
+</grammar>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test12.xml b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test12.xml
new file mode 100644
index 0000000000..a3f2a5d725
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test12.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
+                 xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
+                 office:version="1.2"
+                 office:mimetype="application/vnd.oasis.opendocument.text">
+   <office:styles>
+      <style:default-style style:family="text">
+         <style:text-properties>
+         </style:text-properties>
+      </style:default-style>
+   </office:styles>
+   <office:body>
+      <office:text/>
+   </office:body>
+</office:document>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test13.rng b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test13.rng
new file mode 100644
index 0000000000..47a2161ed9
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test13.rng
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<grammar
+	xmlns="http://relaxng.org/ns/structure/1.0"
+	datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
+	xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
+	xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
+	xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
+>
+	<start>
+		<element name="office:document">
+			<attribute name="office:version">
+				<value>1.2</value>
+			</attribute>
+			<attribute name="office:mimetype">
+				<data type="string"/>
+			</attribute>
+			<ref name="office-styles"/>
+			<element name="office:body">
+				<element name="office:text">
+					<empty/>
+				</element>
+			</element>
+		</element>
+	</start>
+	<define name="office-styles">
+		<element name="office:styles">
+			<interleave>
+				<interleave>
+					<ref name="style-style"/>
+					<ref name="text-list-style"/>
+				</interleave>
+				<ref name="text-outline-style"/>
+			</interleave>
+		</element>
+	</define>
+	<define name="style-style">
+		<element name="style:style">
+			<attribute name="style:name">
+				<ref name="styleName"/>
+			</attribute>
+			<attribute name="style:family">
+				<value>text</value>
+			</attribute>
+		</element>
+	</define>
+	<define name="text-list-style">
+		<element name="text:list-style">
+			<attribute name="style:name">
+				<ref name="styleName"/>
+			</attribute>
+		</element>
+	</define>
+	<define name="text-outline-style">
+		<element name="text:outline-style">
+			<attribute name="style:name">
+				<ref name="styleName"/>
+			</attribute>
+			<element name="text:outline-level-style">
+				<attribute name="text:level">
+					<data type="positiveInteger"/>
+				</attribute>
+			</element>
+		</element>
+	</define>
+	<define name="string">
+		<data type="string"/>
+	</define>
+	<define name="styleName">
+		<data type="NCName"/>
+	</define>
+</grammar>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test13.xml b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test13.xml
new file mode 100644
index 0000000000..8f46daa4ce
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test13.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
+                 xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
+                 xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
+                 office:version="1.2"
+                 office:mimetype="application/vnd.oasis.opendocument.text">
+   <office:styles>
+      <style:style style:name="Formula" style:family="text"/>
+      <text:outline-style style:name="Outline">
+         <text:outline-level-style text:level="1"/>
+      </text:outline-style>
+      <text:list-style style:name="Numbering_20_1"/>
+   </office:styles>
+   <office:body>
+      <office:text/>
+   </office:body>
+</office:document>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test14.rng b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test14.rng
new file mode 100644
index 0000000000..61a8c9e2b4
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test14.rng
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<grammar
+	xmlns="http://relaxng.org/ns/structure/1.0"
+	datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
+	xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
+	xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
+	xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
+>
+	<start>
+		<element name="office:document">
+			<attribute name="office:version">
+				<value>1.2</value>
+			</attribute>
+			<attribute name="office:mimetype">
+				<data type="string"/>
+			</attribute>
+			<ref name="office-automatic-styles"/>
+			<element name="office:body">
+				<element name="office:text">
+					<empty/>
+				</element>
+			</element>
+		</element>
+	</start>
+	<define name="office-automatic-styles">
+		<element name="office:automatic-styles">
+			<interleave>
+				<element name="style:style">
+					<attribute name="style:name">
+						<data type="NCName"/>
+					</attribute>
+					<attribute name="style:family">
+						<value>table</value>
+					</attribute>
+				</element>
+				<choice>
+					<empty/>
+					<element name="text:list-style">
+						<empty/>
+					</element>
+				</choice>
+			</interleave>
+		</element>
+	</define>
+</grammar>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test14.xml b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test14.xml
new file mode 100644
index 0000000000..6c16a1d614
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test14.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
+                 xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
+                 office:version="1.2"
+                 office:mimetype="application/vnd.oasis.opendocument.text">
+   <office:automatic-styles>
+      <style:style style:name="NamespaceTable" style:family="table"/>
+   </office:automatic-styles>
+   <office:body>
+      <office:text/>
+   </office:body>
+</office:document>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test15.rng b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test15.rng
new file mode 100644
index 0000000000..63557c6e2b
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test15.rng
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<grammar
+	xmlns="http://relaxng.org/ns/structure/1.0"
+	datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
+	xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
+	xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
+	xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
+	xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0"
+>
+	<start>
+		<element name="office:document">
+			<attribute name="office:version">
+				<value>1.2</value>
+			</attribute>
+			<attribute name="office:mimetype">
+				<data type="string"/>
+			</attribute>
+			<ref name="office-automatic-styles"/>
+			<element name="office:body">
+				<element name="office:text">
+					<empty/>
+				</element>
+			</element>
+		</element>
+	</start>
+	<define name="office-automatic-styles">
+		<element name="office:automatic-styles">
+			<interleave>
+				<oneOrMore>
+					<choice>
+						<empty/>
+						<element name="number:boolean-style">
+							<attribute name="style:name">
+								<data type="NCName"/>
+							</attribute>
+						</element>
+					</choice>
+				</oneOrMore>
+				<element name="number:text-style">
+					<attribute name="style:name">
+						<data type="NCName"/>
+					</attribute>
+				</element>
+			</interleave>
+		</element>
+	</define>
+</grammar>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test15.xml b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test15.xml
new file mode 100644
index 0000000000..4d8361aaa6
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test15.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
+                 xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
+                 xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0"
+                 office:version="1.2"
+                 office:mimetype="application/vnd.oasis.opendocument.text">
+   <office:automatic-styles>
+      <number:boolean-style style:name="N99">
+      </number:boolean-style>
+      <number:text-style style:name="N100">
+      </number:text-style>
+      <number:boolean-style style:name="N5099">
+      </number:boolean-style>
+   </office:automatic-styles>
+   <office:body>
+      <office:text/>
+   </office:body>
+</office:document>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test16.rng b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test16.rng
new file mode 100644
index 0000000000..32c6cb8e2c
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test16.rng
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<grammar
+	xmlns="http://relaxng.org/ns/structure/1.0"
+	datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
+	xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
+	xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
+	xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0"
+>
+	<start>
+		<element name="office:document">
+			<attribute name="office:version">
+				<value>1.2</value>
+			</attribute>
+			<attribute name="office:mimetype">
+				<data type="string"/>
+			</attribute>
+			<element name="office:automatic-styles">
+				<ref name="styles"/>
+			</element>
+			<element name="office:body">
+				<element name="office:text">
+					<empty/>
+				</element>
+			</element>
+		</element>
+	</start>
+	<define name="styles">
+		<interleave>
+			<choice>
+				<empty/>
+				<oneOrMore>
+					<element name="number:boolean-style">
+						<attribute name="style:name">
+							<data type="NCName"/>
+						</attribute>
+					</element>
+				</oneOrMore>
+			</choice>
+			<element name="number:text-style">
+				<attribute name="style:name">
+					<data type="NCName"/>
+				</attribute>
+			</element>
+		</interleave>
+	</define>
+</grammar>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test16.xml b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test16.xml
new file mode 100644
index 0000000000..4d8361aaa6
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test16.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
+                 xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
+                 xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0"
+                 office:version="1.2"
+                 office:mimetype="application/vnd.oasis.opendocument.text">
+   <office:automatic-styles>
+      <number:boolean-style style:name="N99">
+      </number:boolean-style>
+      <number:text-style style:name="N100">
+      </number:text-style>
+      <number:boolean-style style:name="N5099">
+      </number:boolean-style>
+   </office:automatic-styles>
+   <office:body>
+      <office:text/>
+   </office:body>
+</office:document>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test17.rng b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test17.rng
new file mode 100644
index 0000000000..ffcd9bd4f9
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test17.rng
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<grammar
+	xmlns="http://relaxng.org/ns/structure/1.0"
+	xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
+	xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
+>
+	<start>
+		<element name="office:document">
+			<attribute name="office:version">
+				<value>1.2</value>
+			</attribute>
+			<attribute name="office:mimetype">
+				<data type="string"/>
+			</attribute>
+			<ref name="office-body"/>
+		</element>
+	</start>
+	<define name="office-body">
+		<element name="office:body">
+			<element name="office:text">
+				<element name="text:p">
+					<zeroOrMore>
+						<ref name="paragraph-content"/>
+					</zeroOrMore>
+				</element>
+			</element>
+		</element>
+	</define>
+	<define name="paragraph-content">
+		<choice>
+			<text/>
+			<element name="text:conditional-text">
+				<ref name="text-conditional-text-attlist"/>
+				<text/>
+			</element>
+		</choice>
+	</define>
+	<define name="text-conditional-text-attlist">
+		<interleave>
+			<attribute name="text:condition">
+				<data type="string"/>
+			</attribute>
+			<attribute name="text:string-value-if-true">
+				<data type="string"/>
+			</attribute>
+			<attribute name="text:string-value-if-false">
+				<data type="string"/>
+			</attribute>
+		</interleave>
+	</define>
+</grammar>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test17.xml b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test17.xml
new file mode 100644
index 0000000000..0947bff2b1
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test17.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
+                 xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
+                 xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
+                 office:version="1.2"
+                 office:mimetype="application/vnd.oasis.opendocument.text">
+   <office:body>
+      <office:text>
+         <text:p>
+            <text:conditional-text text:condition="test"
+                text:string-value-if-true="a"
+                text:string-value-if-false="" />
+            03
+         </text:p>
+      </office:text>
+   </office:body>
+</office:document>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test18.rng b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test18.rng
new file mode 100644
index 0000000000..9ddbb9baaf
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test18.rng
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<grammar xmlns="http://relaxng.org/ns/structure/1.0"
+	datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
+	xmlns:manifest="urn:oasis:names:tc:opendocument:xmlns:manifest:1.0"
+>
+	<start>
+		<element name="manifest:manifest">
+			<attribute name="manifest:version">
+				<value>1.2</value>
+			</attribute>
+			<oneOrMore>
+				<element name="manifest:file-entry">
+					<interleave>
+						<attribute name="manifest:full-path">
+							<data type="string"/>
+						</attribute>
+						<attribute name="manifest:media-type">
+							<data type="string"/>
+						</attribute>
+					</interleave>
+				</element>
+			</oneOrMore>
+		</element>
+	</start>
+</grammar>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test18.xml b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test18.xml
new file mode 100644
index 0000000000..cc6ab02761
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test18.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<manifest:manifest xmlns:manifest="urn:oasis:names:tc:opendocument:xmlns:manifest:1.0" manifest:version="1.2" >
+ <manifest:file-entry manifest:media-type="a" manifest:full-path="a"/>
+ <manifest:file-entry manifest:media-type="a" manifest:full-path="a"/>
+ <manifest:file-entry manifest:media-type="a" manifest:full-path="a"/>
+</manifest:manifest>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test19.rng b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test19.rng
new file mode 100644
index 0000000000..ac676d982d
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test19.rng
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<grammar
+	xmlns="http://relaxng.org/ns/structure/1.0"
+	xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
+	xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
+>
+	<start>
+		<element name="office:document">
+			<attribute name="office:version">
+				<value>1.2</value>
+			</attribute>
+			<attribute name="office:mimetype">
+				<data type="string"/>
+			</attribute>
+			<ref name="office-body"/>
+		</element>
+	</start>
+	<define name="office-body">
+		<element name="office:body">
+			<element name="office:text">
+				<element name="text:p">
+					<oneOrMore>
+						<ref name="paragraph-content"/>
+					</oneOrMore>
+				</element>
+			</element>
+		</element>
+	</define>
+	<define name="paragraph-content">
+		<choice>
+			<element>
+				<choice>
+					<name>text:reference-ref</name>
+					<name>text:bookmark-ref</name>
+				</choice>
+				<empty/>
+			</element>
+			<element name="text:span">
+				<empty/>
+			</element>
+		</choice>
+	</define>
+</grammar>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test19.xml b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test19.xml
new file mode 100644
index 0000000000..c562015a37
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test19.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
+                 xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
+                 office:version="1.2"
+                 office:mimetype="application/vnd.oasis.opendocument.text">
+	<office:body>
+		<office:text>
+			<text:p><text:reference-ref/><text:span/></text:p>
+		</office:text>
+	</office:body>
+</office:document>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test20.rng b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test20.rng
new file mode 100644
index 0000000000..bd6b4e0f05
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test20.rng
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<grammar
+	xmlns="http://relaxng.org/ns/structure/1.0"
+	xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
+	xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
+	datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
+>
+	<start>
+		<element name="office:document-content">
+			<attribute name="office:version">
+				<value>1.2</value>
+			</attribute>
+			<ref name="office-body"/>
+		</element>
+	</start>
+	<define name="office-body">
+		<element name="office:body">
+			<element name="office:text">
+				<element name="text:p">
+					<zeroOrMore>
+						<choice>
+							<text/>
+							<element name="text:s">
+								<empty/>
+							</element>
+						</choice>
+					</zeroOrMore>
+				</element>
+			</element>
+		</element>
+	</define>
+</grammar>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test20.xml b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test20.xml
new file mode 100644
index 0000000000..e28b855386
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test20.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<office:document-content
+  xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
+  xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
+  office:version="1.2">
+  <office:body>
+    <office:text>
+      <text:p>,<text:s/>,</text:p>
+    </office:text>
+  </office:body>
+</office:document-content>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test21.rng b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test21.rng
new file mode 100644
index 0000000000..032886009d
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test21.rng
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<grammar
+	xmlns="http://relaxng.org/ns/structure/1.0"
+	xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
+	xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
+>
+	<start>
+		<element name="office:document-content">
+			<attribute name="office:version">
+				<value>1.2</value>
+			</attribute>
+			<ref name="office-body"/>
+		</element>
+	</start>
+	<define name="office-body">
+		<element name="office:body">
+			<element name="office:text">
+				<element name="text:p">
+					<zeroOrMore>
+						<ref name="paragraph-content"/>
+					</zeroOrMore>
+				</element>
+			</element>
+		</element>
+	</define>
+	<define name="paragraph-content">
+		<choice>
+			<text/>
+			<element name="text:bibliography-mark">
+				<attribute name="text:bibliography-type">
+					<value>misc</value>
+				</attribute>
+				<zeroOrMore>
+					<attribute>
+						<choice>
+							<name>text:url</name>
+							<name>text:custom5</name>
+							<name>text:year</name>
+						</choice>
+						<data type="string"/>
+					</attribute>
+				</zeroOrMore>
+				<text/>
+			</element>
+		</choice>
+	</define>
+</grammar>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test21.xml b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test21.xml
new file mode 100644
index 0000000000..fec92948f9
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test21.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<office:document-content
+  xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
+  xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
+  office:version="1.2">
+  <office:body>
+    <office:text>
+      <text:p><text:bibliography-mark text:bibliography-type="misc" text:year="F" text:url="h" text:custom5="i"/></text:p>
+    </office:text>
+  </office:body>
+</office:document-content>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test22.rng b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test22.rng
new file mode 100644
index 0000000000..154c810975
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test22.rng
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<grammar
+	xmlns="http://relaxng.org/ns/structure/1.0"
+	xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
+	xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
+	datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
+>
+	<start>
+		<element name="office:document">
+			<attribute name="office:version">
+				<value>1.2</value>
+			</attribute>
+			<attribute name="office:mimetype">
+				<data type="string"/>
+			</attribute>
+			<ref name="office-body"/>
+		</element>
+	</start>
+	<define name="office-body">
+		<element name="office:body">
+			<element name="office:text">
+				<element name="text:list">
+					<optional>
+						<attribute name="xml:id">
+							<data type="ID"/>
+						</attribute>
+					</optional>
+				</element>
+			</element>
+		</element>
+	</define>
+</grammar>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test22.xml b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test22.xml
new file mode 100644
index 0000000000..dd84419d66
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test22.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
+                 xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
+                 office:version="1.2"
+                 office:mimetype="application/vnd.oasis.opendocument.text">
+   <office:body>
+      <office:text>
+         <text:list xml:id="l"/>
+      </office:text>
+   </office:body>
+</office:document>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test23.rng b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test23.rng
new file mode 100644
index 0000000000..1a02206d04
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test23.rng
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<grammar 
+    xmlns="http://relaxng.org/ns/structure/1.0"
+    datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
+    xmlns:manifest="urn:oasis:names:tc:opendocument:xmlns:manifest:1.0">
+<define name="manifest">
+    <element name="manifest:manifest">
+        <oneOrMore>
+            <ref name="file-entry"/>
+        </oneOrMore>
+    </element>
+</define>
+<start>
+    <choice>
+        <ref name="manifest"/>
+    </choice>
+</start>
+<define name="file-entry">
+    <element name="manifest:file-entry">
+        <ref name="file-entry-attlist"/>
+    </element>
+</define>
+<define name="file-entry-attlist" combine="interleave">
+    <attribute name="manifest:full-path">
+        <data type="string"/>
+    </attribute>
+</define>
+<define name="file-entry-attlist" combine="interleave">
+    <attribute name="manifest:media-type">
+        <data type="string"/>
+    </attribute>
+</define>
+</grammar>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test23.xml b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test23.xml
new file mode 100644
index 0000000000..b622196b05
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test23.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<manifest:manifest xmlns:manifest="urn:oasis:names:tc:opendocument:xmlns:manifest:1.0">
+ <manifest:file-entry manifest:media-type="text/xml" manifest:full-path="settings.xml"/>
+</manifest:manifest>
diff --git a/apps/files_odfviewer/src/webodf/webodf/roundtripodf.js b/apps/files_odfviewer/src/webodf/webodf/roundtripodf.js
new file mode 100644
index 0000000000..6d16d1b2a3
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/roundtripodf.js
@@ -0,0 +1,71 @@
+/**
+ * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
+ * @licstart
+ * The JavaScript code in this page is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU Affero General Public License
+ * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.  The code is distributed
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
+ *
+ * As additional permission under GNU AGPL version 3 section 7, you
+ * may distribute non-source (e.g., minimized or compacted) forms of
+ * that code without the copy of the GNU GPL normally required by
+ * section 4, provided you include this license notice and a URL
+ * through which recipients can access the Corresponding Source.
+ *
+ * As a special exception to the AGPL, any HTML file which merely makes function
+ * calls to this code, and for that purpose includes it by reference shall be
+ * deemed a separate work for copyright law purposes. In addition, the copyright
+ * holders of this code give you permission to combine this code with free
+ * software libraries that are released under the GNU LGPL. You may copy and
+ * distribute such a system following the terms of the GNU AGPL for this code
+ * and the LGPL for the libraries. If you modify this code, you may extend this
+ * exception to your version of the code, but you are not obligated to do so.
+ * If you do not wish to do so, delete this exception statement from your
+ * version.
+ *
+ * This license applies to this entire compilation.
+ * @licend
+ * @source: http://www.webodf.org/
+ * @source: http://gitorious.org/odfkit/webodf/
+ */
+/*global runtime: true, core: true, odf: true*/
+runtime.loadClass("odf.OdfContainer");
+
+/**
+ * If the state of the OdfContainer is invalid, exit with an error message.
+ */
+function exitOnInvalid(odffilepath, odfcontainer) {
+    "use strict";
+    if (odfcontainer.state === odf.OdfContainer.INVALID) {
+        runtime.log("Document " + odffilepath + " is invalid.");
+        runtime.exit(1);
+    }
+    if (odfcontainer.state === odf.OdfContainer.DONE) {
+        odfcontainer.save(function (err) {
+            if (err) {
+                runtime.log(err);
+                runtime.exit(1);
+            }
+        });
+    }
+}
+
+/**
+ * Load an ODF document. Report an error if there is a problem.
+ */
+function loadODF(odffilepath) {
+    "use strict";
+    var odfcontainer = new odf.OdfContainer(odffilepath);
+    odfcontainer.onstatereadychange = function () {
+        exitOnInvalid(odffilepath, odfcontainer);
+    };
+    exitOnInvalid(odffilepath, odfcontainer);
+}
+
+// loop over arguments to load ODF
+var i;
+for (i = 1; i < arguments.length; i += 1) {
+    loadODF(arguments[i]);
+}
diff --git a/apps/files_odfviewer/src/webodf/webodf/roundtripzip.js b/apps/files_odfviewer/src/webodf/webodf/roundtripzip.js
new file mode 100644
index 0000000000..d3fe17fc81
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/roundtripzip.js
@@ -0,0 +1,64 @@
+/**
+ * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
+ * @licstart
+ * The JavaScript code in this page is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU Affero General Public License
+ * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.  The code is distributed
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
+ *
+ * As additional permission under GNU AGPL version 3 section 7, you
+ * may distribute non-source (e.g., minimized or compacted) forms of
+ * that code without the copy of the GNU GPL normally required by
+ * section 4, provided you include this license notice and a URL
+ * through which recipients can access the Corresponding Source.
+ *
+ * As a special exception to the AGPL, any HTML file which merely makes function
+ * calls to this code, and for that purpose includes it by reference shall be
+ * deemed a separate work for copyright law purposes. In addition, the copyright
+ * holders of this code give you permission to combine this code with free
+ * software libraries that are released under the GNU LGPL. You may copy and
+ * distribute such a system following the terms of the GNU AGPL for this code
+ * and the LGPL for the libraries. If you modify this code, you may extend this
+ * exception to your version of the code, but you are not obligated to do so.
+ * If you do not wish to do so, delete this exception statement from your
+ * version.
+ *
+ * This license applies to this entire compilation.
+ * @licend
+ * @source: http://www.webodf.org/
+ * @source: http://gitorious.org/odfkit/webodf/
+ */
+/*global runtime: true, core: true*/
+runtime.loadClass("core.Zip");
+
+/**
+ * Load an ODF document. Report an error if there is a problem.
+ */
+function roundTripZip(zipfilepath) {
+    "use strict";
+    var zip = new core.Zip(zipfilepath, function (err, zip) {
+        if (err) {
+            runtime.log(err);
+            runtime.exit(1);
+        }
+        // the TOC of the zip is loaded at this point
+        // now we want to load all parts in memory so we can save them again
+        zip.write(function (err) {
+            if (err) {
+                runtime.log(err);
+                runtime.exit(1);
+            }
+            // at this point a zip file should have been written with the same
+            // contents as the one that was read
+            runtime.exit(0);
+        });
+    });
+}
+
+// loop over arguments to load ODF
+var i;
+for (i = 1; i < arguments.length; i += 1) {
+    roundTripZip(arguments[i]);
+}
diff --git a/apps/files_odfviewer/src/webodf/webodf/styleNameRef b/apps/files_odfviewer/src/webodf/webodf/styleNameRef
new file mode 100644
index 0000000000..39b2914746
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/styleNameRef
@@ -0,0 +1,272 @@
+# cat styles.xml|xmlstarlet sel -N style=urn:oasis:names:tc:opendocument:xmlns:style:1.0 -t -m "//*[@style:family='graphic']/@style:name" -v . -
+
+gradient
+	draw:fill-gradient-name	style:drawing-page-properties
+	draw:fill-gradient-name	style:graphic-properties
+
+hatch
+	draw:fill-hatch-name	style:drawing-page-properties
+	draw:fill-hatch-name	style:graphic-properties
+
+fill-image
+	draw:fill-image-name	style:drawing-page-properties
+	draw:fill-image-name	style:graphic-properties
+
+marker
+	draw:marker-end	style:graphic-properties
+	draw:marker-start	style:graphic-properties
+
+dash
+	draw:stroke-dash	style:graphic-properties
+
+opacity
+	draw:opacity-name	style:drawing-page-properties
+	draw:opacity-name	style:graphic-properties
+
+master page
+	draw:master-page-name	draw:page
+	style:master-page-name	style:style
+	style:next-style-name	style:master-page
+	text:master-page-name	text:notes-configuration
+	text:master-page-name	text:page
+
+presentation-page-layout
+	presentation:presentation-page-layout-name	draw:page
+	presentation:presentation-page-layout-name	draw:handout-master
+
+page-layout
+	style:page-layout-name	presentation:notes
+	style:page-layout-name	style:handout-master
+	style:page-layout-name	style:master-page
+
+list
+	text:style-name	text:list
+	text:style-name	text:numbered-paragraph
+	text:style-override	text:list-item
+	style:list-style-name	style:style
+
+data
+	style:data-style-name	style:style
+	style:percentage-data-style-name	style:style
+	style:data-style-name	presentation:date-time-decl
+	style:data-style-name	text:creation-date
+	style:data-style-name	text:creation-time
+	style:data-style-name	text:database-display
+	style:data-style-name	text:date
+	style:data-style-name	text:editing-duration
+	style:data-style-name	text:expression
+	style:data-style-name	text:meta-field
+	style:data-style-name	text:modification-date
+	style:data-style-name	text:modification-time
+	style:data-style-name	text:print-date
+	style:data-style-name	text:print-time
+	style:data-style-name	text:table-formula
+	style:data-style-name	text:time
+	style:data-style-name	text:user-defined
+	style:data-style-name	text:user-field-get
+	style:data-style-name	text:user-field-input
+	style:data-style-name	text:variable-get
+	style:data-style-name	text:variable-input
+	style:data-style-name	text:variable-set
+
+chart
+	chart:style-name	chart:axis
+	chart:style-name	chart:chart
+	chart:style-name	chart:data-label
+	chart:style-name	chart:data-point
+	chart:style-name	chart:equation
+	chart:style-name	chart:error-indicator
+	chart:style-name	chart:floor
+	chart:style-name	chart:footer
+	chart:style-name	chart:grid
+	chart:style-name	chart:legend
+	chart:style-name	chart:mean-value
+	chart:style-name	chart:plot-area
+	chart:style-name	chart:regression-curve
+	chart:style-name	chart:series
+	chart:style-name	chart:stock-gain-marker
+	chart:style-name	chart:stock-loss-marker
+	chart:style-name	chart:stock-range-line
+	chart:style-name	chart:subtitle
+	chart:style-name	chart:title
+	chart:style-name	chart:wall
+
+----
+
+drawing-page
+	draw:style-name	draw:page
+	draw:style-name	presentation:notes
+	draw:style-name	style:handout-master
+	draw:style-name	style:master-page
+
+graphic
+	draw:style-name	dr3d:cube
+	draw:style-name	dr3d:extrude
+	draw:style-name	dr3d:rotate
+	draw:style-name	dr3d:scene
+	draw:style-name	dr3d:sphere
+	draw:style-name	draw:caption
+	draw:style-name	draw:circle
+	draw:style-name	draw:connector
+	draw:style-name	draw:control
+	draw:style-name	draw:custom-shape
+	draw:style-name	draw:ellipse
+	draw:style-name	draw:frame
+	draw:style-name	draw:g
+	draw:style-name	draw:line
+	draw:style-name	draw:measure
+	draw:style-name	draw:page-thumbnail
+	draw:style-name	draw:path
+	draw:style-name	draw:polygon
+	draw:style-name	draw:polyline
+	draw:style-name	draw:rect
+	draw:style-name	draw:regular-polygon
+	draw:style-name	office:annotation
+
+paragraph
+	draw:text-style-name	draw:caption
+	draw:text-style-name	draw:circle
+	draw:text-style-name	draw:connector
+	draw:text-style-name	draw:control
+	draw:text-style-name	draw:custom-shape
+	draw:text-style-name	draw:ellipse
+	draw:text-style-name	draw:frame
+	draw:text-style-name	draw:line
+	draw:text-style-name	draw:measure
+	draw:text-style-name	draw:path
+	draw:text-style-name	draw:polygon
+	draw:text-style-name	draw:polyline
+	draw:text-style-name	draw:rect
+	draw:text-style-name	draw:regular-polygon
+	draw:text-style-name	office:annotation
+	form:text-style-name	form:column
+	style:next-style-name	style:style
+	table:paragraph-style-name	table:body
+	table:paragraph-style-name	table:even-columns
+	table:paragraph-style-name	table:even-rows
+	table:paragraph-style-name	table:first-column
+	table:paragraph-style-name	table:first-row
+	table:paragraph-style-name	table:last-column
+	table:paragraph-style-name	table:last-row
+	table:paragraph-style-name	table:odd-columns
+	table:paragraph-style-name	table:odd-rows
+	text:default-style-name	text:notes-configuration
+	text:style-name	text:alphabetical-index-entry-template
+	text:style-name	text:bibliography-entry-template
+	text:style-name	text:h
+	text:style-name	text:illustration-index-entry-template
+	text:style-name	text:index-source-style
+	text:style-name	text:object-index-entry-template
+	text:style-name	text:p
+	text:style-name	text:table-index-entry-template
+	text:style-name	text:table-of-content-entry-template
+	text:style-name	text:table-index-entry-template
+	text:style-name	text:user-index-entry-template
+	style:register-truth-ref-style-name	style:page-layout-properties
+
+presentation
+	presentation:style-name	dr3d:cube
+	presentation:style-name	dr3d:extrude
+	presentation:style-name	dr3d:rotate
+	presentation:style-name	dr3d:scene
+	presentation:style-name	dr3d:sphere
+	presentation:style-name	draw:caption
+	presentation:style-name	draw:circle
+	presentation:style-name	draw:connector
+	presentation:style-name	draw:control
+	presentation:style-name	draw:custom-shape
+	presentation:style-name	draw:ellipse
+	presentation:style-name	draw:frame
+	presentation:style-name	draw:g
+	presentation:style-name	draw:line
+	presentation:style-name	draw:measure
+	presentation:style-name	draw:page-thumbnail
+	presentation:style-name	draw:path
+	presentation:style-name	draw:polygon
+	presentation:style-name	draw:polyline
+	presentation:style-name	draw:rect
+	presentation:style-name	draw:regular-polygon
+	presentation:style-name	office:annotation
+
+ruby
+	text:style-name	text:ruby
+
+section
+	text:style-name	text:alphabetical-index
+	text:style-name	text:bibliography
+	text:style-name	text:illustration-index
+	text:style-name	text:index-title
+	text:style-name	text:object-index
+	text:style-name	text:section
+	text:style-name	text:table-of-content
+	text:style-name	text:table-index
+	text:style-name	text:user-index
+
+table-cell
+	db:default-cell-style-name	db:column
+	table:default-cell-style-name	table:table-column
+	table:default-cell-style-name	table:table-row
+	table:style-name	table:body
+	table:style-name	table:covered-table-cell
+	table:style-name	table:even-columns
+	table:style-name	table:covered-table-cell
+	table:style-name	table:even-columns
+	table:style-name	table:even-rows
+	table:style-name	table:first-column
+	table:style-name	table:first-row
+	table:style-name	table:last-column
+	table:style-name	table:last-row
+	table:style-name	table:odd-columns
+	table:style-name	table:odd-rows
+	table:style-name	table:table-cell
+
+table-row
+	db:default-row-style-name	db:query
+	db:default-row-style-name	db:table-representation
+	table:style-name	table:table-row
+
+table-column
+	db:style-name	db:column
+	table:style-name	table:table-column
+
+table
+	db:style-name	db:query
+	db:style-name	db:table-representation
+	table:style-name	table:background
+	table:style-name	table:table
+
+text
+	style:leader-text-style	style:tab-stop
+	style:style-name	style:drop-cap
+	text:citation-body-style-name	text:notes-configuration
+	text:citation-style-name	text:notes-configuration
+	text:style-name	text:a
+	text:style-name	text:alphabetical-index
+	text:style-name	text:linenumbering-configuration
+	text:style-name	text:list-level-style-number
+	text:style-name	text:ruby-text
+	text:style-name	text:span
+	text:visited-style-name	text:a
+	style:text-line-through-text-style	style:text-properties
+	text:main-entry-style-name	text:alphabetical-index-source
+	text:style-name	text:index-entry-bibliography
+	text:style-name	text:index-entry-chapter
+	text:style-name	text:index-entry-link-end
+	text:style-name	text:index-entry-link-start
+	text:style-name	text:index-entry-page-number
+	text:style-name	text:index-entry-span
+	text:style-name	text:index-entry-tab-stop
+	text:style-name	text:index-entry-text
+	text:style-name	text:index-title-template
+	text:style-name	text:list-level-style-bullet
+	text:style-name	text:outline-level-style
+
+
+---
+
+conditional style
+	text:cond-style-name	text:h
+	text:cond-style-name	text:p
+
+style:apply-style-name # complicated!
+style:parent-style-name # complicated!
diff --git a/apps/files_odfviewer/src/webodf/webodf/styleNameRefs b/apps/files_odfviewer/src/webodf/webodf/styleNameRefs
new file mode 100644
index 0000000000..e63e3562df
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/styleNameRefs
@@ -0,0 +1,57 @@
+dash
+	draw:stroke-dash-names	style:graphic-properties
+
+graphic
+	draw:class-names	dr3d:cube
+	draw:class-names	dr3d:extrude
+	draw:class-names	dr3d:rotate
+	draw:class-names	dr3d:scene
+	draw:class-names	dr3d:sphere
+	draw:class-names	draw:caption
+	draw:class-names	draw:circle
+	draw:class-names	draw:connector
+	draw:class-names	draw:control
+	draw:class-names	draw:custom-shape
+	draw:class-names	draw:ellipse
+	draw:class-names	draw:frame
+	draw:class-names	draw:g
+	draw:class-names	draw:line
+	draw:class-names	draw:measure
+	draw:class-names	draw:page-thumbnail
+	draw:class-names	draw:path
+	draw:class-names	draw:polygon
+	draw:class-names	draw:polyline
+	draw:class-names	draw:rect
+	draw:class-names	draw:regular-polygon
+	draw:class-names	office:annotation
+
+paragraph
+	text:class-names	text:h
+	text:class-names	text:p
+
+presentation
+	presentation:class-names	dr3d:cube
+	presentation:class-names	dr3d:extrude
+	presentation:class-names	dr3d:rotate
+	presentation:class-names	dr3d:scene
+	presentation:class-names	dr3d:sphere
+	presentation:class-names	draw:caption
+	presentation:class-names	draw:circle
+	presentation:class-names	draw:connector
+	presentation:class-names	draw:control
+	presentation:class-names	draw:custom-shape
+	presentation:class-names	draw:ellipse
+	presentation:class-names	draw:frame
+	presentation:class-names	draw:g
+	presentation:class-names	draw:line
+	presentation:class-names	draw:measure
+	presentation:class-names	draw:page-thumbnail
+	presentation:class-names	draw:path
+	presentation:class-names	draw:polygon
+	presentation:class-names	draw:polyline
+	presentation:class-names	draw:rect
+	presentation:class-names	draw:regular-polygon
+	presentation:class-names	office:annotation
+
+text
+	text:class-names	text:span
diff --git a/apps/files_odfviewer/src/webodf/webodf/testrelaxng.js b/apps/files_odfviewer/src/webodf/webodf/testrelaxng.js
new file mode 100644
index 0000000000..875faa9de8
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/testrelaxng.js
@@ -0,0 +1,91 @@
+/**
+ * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
+ * @licstart
+ * The JavaScript code in this page is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU Affero General Public License
+ * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.  The code is distributed
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
+ *
+ * As additional permission under GNU AGPL version 3 section 7, you
+ * may distribute non-source (e.g., minimized or compacted) forms of
+ * that code without the copy of the GNU GPL normally required by
+ * section 4, provided you include this license notice and a URL
+ * through which recipients can access the Corresponding Source.
+ *
+ * As a special exception to the AGPL, any HTML file which merely makes function
+ * calls to this code, and for that purpose includes it by reference shall be
+ * deemed a separate work for copyright law purposes. In addition, the copyright
+ * holders of this code give you permission to combine this code with free
+ * software libraries that are released under the GNU LGPL. You may copy and
+ * distribute such a system following the terms of the GNU AGPL for this code
+ * and the LGPL for the libraries. If you modify this code, you may extend this
+ * exception to your version of the code, but you are not obligated to do so.
+ * If you do not wish to do so, delete this exception statement from your
+ * version.
+ *
+ * This license applies to this entire compilation.
+ * @licend
+ * @source: http://www.webodf.org/
+ * @source: http://gitorious.org/odfkit/webodf/
+ */
+/*global runtime: true, xmldom: true*/
+runtime.loadClass("xmldom.RelaxNG");
+runtime.loadClass("xmldom.RelaxNG2");
+
+function validate(relaxng, relaxng2, url) {
+    "use strict";
+    runtime.loadXML(url, function (err, dom) {
+        var walker;
+        if (err) {
+            runtime.log("Could not read " + url + ": " + err);
+        } else {
+            walker = dom.createTreeWalker(dom.firstChild, 0xFFFFFFFF);
+            relaxng.validate(walker, function (err) {
+                if (err) {
+                    var i;
+                    runtime.log("Found " + String(err.length) +
+                            " error validating " + url + ":");
+                    for (i = 0; i < err.length; i += 1) {
+                        runtime.log(err[i].message());
+                    }
+                }
+            });
+            relaxng2.validate(walker, function (err) {
+                if (err) {
+                    var i;
+                    runtime.log("Found " + String(err.length) +
+                            " error validating " + url + ":");
+                    for (i = 0; i < err.length; i += 1) {
+                        runtime.log(err[i].message());
+                    }
+                }
+            });
+        }
+    });
+}
+
+var args = arguments,
+    relaxngurl = args[1];
+
+// load and parse the Relax NG
+runtime.loadXML(relaxngurl, function (err, dom) {
+    "use strict";
+    var parser, i, relaxng, relaxng2;
+    if (err) {
+        return;
+    }
+    parser = new xmldom.RelaxNGParser();
+    relaxng = new xmldom.RelaxNG();
+    relaxng2 = new xmldom.RelaxNG2();
+    err = parser.parseRelaxNGDOM(dom, relaxng.makePattern);
+    relaxng.init(parser.rootPattern);
+    relaxng2.init(parser.start, parser.nsmap);
+
+    // loop over arguments to load ODF
+    for (i = 2; i < args.length; i += 1) {
+        runtime.log("Validating " + args[i] + " from " + relaxngurl);
+        validate(relaxng, relaxng2, args[i]);
+    }
+});
diff --git a/apps/files_odfviewer/src/webodf/webodf/tests/core/Base64Tests.js b/apps/files_odfviewer/src/webodf/webodf/tests/core/Base64Tests.js
new file mode 100644
index 0000000000..10156a1dc4
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/tests/core/Base64Tests.js
@@ -0,0 +1,105 @@
+/**
+ * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
+ * @licstart
+ * The JavaScript code in this page is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU Affero General Public License
+ * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.  The code is distributed
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
+ *
+ * As additional permission under GNU AGPL version 3 section 7, you
+ * may distribute non-source (e.g., minimized or compacted) forms of
+ * that code without the copy of the GNU GPL normally required by
+ * section 4, provided you include this license notice and a URL
+ * through which recipients can access the Corresponding Source.
+ *
+ * As a special exception to the AGPL, any HTML file which merely makes function
+ * calls to this code, and for that purpose includes it by reference shall be
+ * deemed a separate work for copyright law purposes. In addition, the copyright
+ * holders of this code give you permission to combine this code with free
+ * software libraries that are released under the GNU LGPL. You may copy and
+ * distribute such a system following the terms of the GNU AGPL for this code
+ * and the LGPL for the libraries. If you modify this code, you may extend this
+ * exception to your version of the code, but you are not obligated to do so.
+ * If you do not wish to do so, delete this exception statement from your
+ * version.
+ *
+ * This license applies to this entire compilation.
+ * @licend
+ * @source: http://www.webodf.org/
+ * @source: http://gitorious.org/odfkit/webodf/
+ */
+/*global core: true, runtime: true*/
+runtime.loadClass("core.Base64");
+/**
+ * @constructor
+ * @param runner {UnitTestRunner}
+ * @implements {core.UnitTest}
+ */
+core.Base64Tests = function Base64Tests(runner) {
+    "use strict";
+    var t, r = runner, base64 = new core.Base64();
+
+    function testConvertByteArrayToBase64() {
+        t.encoded = base64.convertByteArrayToBase64([65]);
+        r.shouldBe(t, "t.encoded", "'QQ=='");
+        t.encoded = base64.convertByteArrayToBase64([65, 65]);
+        r.shouldBe(t, "t.encoded", "'QUE='");
+        t.encoded = base64.convertByteArrayToBase64([65, 65, 65]);
+        r.shouldBe(t, "t.encoded", "'QUFB'");
+    }
+
+    function testToBase64() {
+        t.encoded = base64.toBase64("A");
+        r.shouldBe(t, "t.encoded", "'QQ=='");
+        t.encoded = base64.toBase64("AA");
+        r.shouldBe(t, "t.encoded", "'QUE='");
+        t.encoded = base64.toBase64("AAA");
+        r.shouldBe(t, "t.encoded", "'QUFB'");
+    }
+
+    function testConvertUTF8StringToUTF16String(callback) {
+        var bin = "1234567890";
+        while (bin.length < 100000) {
+            bin += bin;
+        }
+        t.numcallbacks = 0;
+        base64.convertUTF8StringToUTF16String(bin, function (str, done) {
+            t.numcallbacks += 1;
+            t.done = done;
+            if (t.numcallbacks === 1) {
+                r.shouldBe(t, "t.done", "false");
+            } else {
+                r.shouldBe(t, "t.done", "true");
+            }
+            if (done) {
+                r.shouldBe(t, "t.numcallbacks", "2");
+                t.str = str;
+                t.bin = bin;
+                r.shouldBe(t, "t.str.length", "t.bin.length");
+                callback();
+            }
+            return true;
+        });
+    }
+
+    this.setUp = function () {
+        t = {};
+    };
+    this.tearDown = function () {
+        t = {};
+    };
+    this.tests = function () {
+        return [
+            testConvertByteArrayToBase64,
+            testToBase64
+        ];
+    };
+    this.asyncTests = function () {
+        return [ testConvertUTF8StringToUTF16String ];
+    };
+    this.description = function () {
+        return "Test the Base64 class.";
+    };
+};
diff --git a/apps/files_odfviewer/src/webodf/webodf/tests/core/CursorTests.js b/apps/files_odfviewer/src/webodf/webodf/tests/core/CursorTests.js
new file mode 100644
index 0000000000..c9f7be78a6
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/tests/core/CursorTests.js
@@ -0,0 +1,238 @@
+/**
+ * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
+ * @licstart
+ * The JavaScript code in this page is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU Affero General Public License
+ * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.  The code is distributed
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
+ *
+ * As additional permission under GNU AGPL version 3 section 7, you
+ * may distribute non-source (e.g., minimized or compacted) forms of
+ * that code without the copy of the GNU GPL normally required by
+ * section 4, provided you include this license notice and a URL
+ * through which recipients can access the Corresponding Source.
+ *
+ * As a special exception to the AGPL, any HTML file which merely makes function
+ * calls to this code, and for that purpose includes it by reference shall be
+ * deemed a separate work for copyright law purposes. In addition, the copyright
+ * holders of this code give you permission to combine this code with free
+ * software libraries that are released under the GNU LGPL. You may copy and
+ * distribute such a system following the terms of the GNU AGPL for this code
+ * and the LGPL for the libraries. If you modify this code, you may extend this
+ * exception to your version of the code, but you are not obligated to do so.
+ * If you do not wish to do so, delete this exception statement from your
+ * version.
+ *
+ * This license applies to this entire compilation.
+ * @licend
+ * @source: http://www.webodf.org/
+ * @source: http://gitorious.org/odfkit/webodf/
+ */
+/*global core: true, runtime: true*/
+runtime.loadClass("core.Cursor");
+
+/**
+ * @constructor
+ * @param {core.UnitTestRunner} runner
+ * @implements {core.UnitTest}
+ */
+core.CursorTests = function CursorTests(runner) {
+    "use strict";
+    var r = runner, tests, t = {},
+        maindoc = runtime.getWindow().document,
+        testarea = maindoc.getElementById("testarea");
+    /**
+     * @param {Selection} selection
+     * @param {Node} startnode
+     * @param {number} startoffset
+     * @param {Node=} endnode
+     * @param {number=} endoffset
+     * @return {undefined}
+     */
+    function setSelection(selection, startnode, startoffset, endnode,
+            endoffset) {
+        // call createRange() on the document, even if startnode is the document
+        var range = (startnode.ownerDocument || startnode).createRange();
+        selection.removeAllRanges();
+        range.setStart(startnode, startoffset);
+        if (endnode) {
+            range.setEnd(endnode, endoffset);
+        } else {
+            range.setEnd(startnode, startoffset);
+        }
+        selection.addRange(range);
+        if (range.startContainer !== startnode) {
+            runtime.log("EVIL");
+        }
+    }
+
+    function setupEmptyRootNode() {
+        var selection = runtime.getWindow().getSelection(),
+            root = maindoc.createElementNS("", "p"),
+            cursor = new core.Cursor(selection, maindoc);
+        testarea.appendChild(root);
+        t = { selection: selection, root: root, cursor: cursor };
+        runner.shouldBeNonNull(t, "t.selection");
+    }
+
+    function setupSimpleTextDoc() {
+        setupEmptyRootNode();
+        t.textnode = maindoc.createTextNode("abc");
+        t.root.appendChild(t.textnode);
+    }
+
+    tests = [
+        // create a document, add a cursor and check that the cursor is present
+        function testOnEmptyNode1() {
+            // if the document is the container of the selection, the cursor
+            // can not be in the DOM
+            setupEmptyRootNode();
+            setSelection(t.selection, t.root, 0);
+            t.cursor.updateToSelection();
+            //r.shouldBeNull(t, "t.cursor.getNode().parentNode");
+        },
+        function testOnEmptyNode2() {
+            setupEmptyRootNode();
+            setSelection(t.selection, t.root, 0);
+       //     t.selection.focusNode = r.root;
+            var range = t.selection.getRangeAt(0);
+            t.cursor.updateToSelection();
+            r.shouldBeNonNull(t, "t.cursor.getNode().parentNode");
+            r.shouldBeNull(t, "t.cursor.getNode().previousSibling");
+            r.shouldBeNull(t, "t.cursor.getNode().nextSibling");
+        },
+        function testOnSimpleText() {
+            setupSimpleTextDoc();
+            // put the cursor at the start of the text node 
+            setSelection(t.selection, t.textnode, 0);
+            t.cursor.updateToSelection();
+            r.shouldBeNonNull(t, "t.cursor.getNode().parentNode");
+            r.shouldBeNull(t, "t.cursor.getNode().previousSibling");
+            r.shouldBe(t, "t.cursor.getNode().nextSibling.nodeValue", "'abc'");
+        },
+        function testOnSimpleText2() {
+            setupSimpleTextDoc();
+            // put the cursor in the middle of the text node 
+            setSelection(t.selection, t.textnode, 1);
+            t.cursor.updateToSelection();
+            r.shouldBeNonNull(t, "t.cursor.getNode().parentNode");
+            r.shouldBe(t, "t.cursor.getNode().previousSibling.nodeValue", "'a'");
+            r.shouldBe(t, "t.cursor.getNode().nextSibling.nodeValue", "'bc'");
+        },
+        function testOnSimpleText3() {
+            setupSimpleTextDoc();
+            // put the cursor at the end of the text node
+            setSelection(t.selection, t.textnode, 3);
+            t.cursor.updateToSelection();
+            r.shouldBeNonNull("t.cursor.getNode().parentNode");
+            r.shouldBe(t, "t.cursor.getNode().previousSibling.nodeValue", "'abc'");
+            r.shouldBeNull(t, "t.cursor.getNode().nextSibling");
+        },
+        function testOnSimpleText4() {
+            var textnode2;
+            setupSimpleTextDoc();
+            // put the cursor between 'a' and 'b', then change the selection to
+            // be between 'b' and 'c' and update the cursor
+            setSelection(t.selection, t.textnode, 1);
+            t.cursor.updateToSelection();
+            textnode2 = t.cursor.getNode().nextSibling;
+            setSelection(t.selection, textnode2, 1);
+            t.cursor.updateToSelection();
+            r.shouldBeNonNull(t, "t.cursor.getNode().parentNode");
+            r.shouldBe(t, "t.cursor.getNode().previousSibling.nodeValue", "'ab'");
+            r.shouldBe(t, "t.cursor.getNode().nextSibling.nodeValue", "'c'");
+        },
+        function testOnSimpleText5() {
+            var textnode2;
+            setupSimpleTextDoc();
+            // put the cursor between 'a' and 'b', then change the selection to
+            // span the entire text and update the cursor
+            setSelection(t.selection, t.textnode, 1);
+            t.cursor.updateToSelection();
+            textnode2 = t.cursor.getNode().nextSibling;
+            setSelection(t.selection, t.textnode, 0, textnode2, 2);
+            t.cursor.updateToSelection();
+            r.shouldBe(t, "t.selection.rangeCount", "1");
+// only null if working on a separate document
+//            r.shouldBeNull(t, "t.cursor.getNode().parentNode");
+            t.range = t.selection.getRangeAt(0);
+            r.shouldBe(t, "t.range.startContainer", "t.textnode");
+            r.shouldBe(t, "t.range.startOffset", "0");
+            r.shouldBe(t, "t.range.endContainer", "t.textnode");
+            r.shouldBe(t, "t.range.endOffset", "3");
+        },
+        function testOnSimpleText5b() {
+            var textnode2;
+            setupSimpleTextDoc();
+            setSelection(t.selection, t.textnode, 1);
+            t.cursor.updateToSelection();
+            textnode2 = t.cursor.getNode().nextSibling;
+            setSelection(t.selection, t.textnode.parentNode, 1, textnode2, 2);
+            t.cursor.updateToSelection();
+            r.shouldBe(t, "t.selection.rangeCount", "1");
+// only null if working on a separate document
+//            r.shouldBeNull(t, "t.cursor.getNode().parentNode");
+            t.range = t.selection.getRangeAt(0);
+            r.shouldBe(t, "t.range.startContainer", "t.textnode");
+            r.shouldBe(t, "t.range.startOffset", "1");
+            r.shouldBe(t, "t.range.endContainer", "t.textnode");
+            r.shouldBe(t, "t.range.endOffset", "3");
+        },
+        function testOnSimpleText6() {
+            var somenode, textnode2;
+            setupSimpleTextDoc();
+            // add a child node to the cursor
+            somenode = maindoc.createElement("p");
+            t.cursor.getNode().appendChild(somenode);
+            // select a single position so the cursor is put in the document
+            setSelection(t.selection, t.textnode, 1);
+            t.cursor.updateToSelection();
+            r.shouldBeNonNull(t, "t.cursor.getNode().parentNode");
+            textnode2 = t.cursor.getNode().nextSibling;
+            // select a range starting at the node in the cursor, but extends
+            // out of the the cursor
+            // this should have the result that the cursor is removed from the
+            // document and that the text nodes around the cursor are
+            // merged
+            setSelection(t.selection, somenode, 0, textnode2, 2);
+            t.cursor.updateToSelection();
+// only null if working on a separate document
+//            r.shouldBeNull(t, "t.cursor.getNode().parentNode");
+            t.range = t.selection.getRangeAt(0);
+            r.shouldBe(t, "t.range.startContainer", "t.textnode");
+            r.shouldBe(t, "t.range.startOffset", "1");
+            r.shouldBe(t, "t.range.endContainer", "t.textnode");
+            r.shouldBe(t, "t.range.endOffset", "3");
+            r.shouldBe(t, "t.range.collapsed", "false");
+        }
+    ];
+    this.setUp = function () {
+        t = {};
+        while (testarea.firstChild) {
+            testarea.removeChild(testarea.firstChild);
+        }
+    };
+    this.tearDown = function () {
+        t = {};
+        while (testarea.firstChild) {
+            testarea.removeChild(testarea.firstChild);
+        }
+    };
+    this.tests = function () {
+        return tests;
+    };
+    this.asyncTests = function () {
+        return [];
+    };
+};
+core.CursorTests.name = "CursorTests";
+core.CursorTests.prototype.description = function () {
+    "use strict";
+    return "Test the Cursor class.";
+};
+(function () {
+    "use strict";
+    return core.CursorTests;
+}());
diff --git a/apps/files_odfviewer/src/webodf/webodf/tests/core/PointWalkerTests.js b/apps/files_odfviewer/src/webodf/webodf/tests/core/PointWalkerTests.js
new file mode 100644
index 0000000000..dbb690f77e
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/tests/core/PointWalkerTests.js
@@ -0,0 +1,135 @@
+/**
+ * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
+ * @licstart
+ * The JavaScript code in this page is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU Affero General Public License
+ * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.  The code is distributed
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
+ *
+ * As additional permission under GNU AGPL version 3 section 7, you
+ * may distribute non-source (e.g., minimized or compacted) forms of
+ * that code without the copy of the GNU GPL normally required by
+ * section 4, provided you include this license notice and a URL
+ * through which recipients can access the Corresponding Source.
+ *
+ * As a special exception to the AGPL, any HTML file which merely makes function
+ * calls to this code, and for that purpose includes it by reference shall be
+ * deemed a separate work for copyright law purposes. In addition, the copyright
+ * holders of this code give you permission to combine this code with free
+ * software libraries that are released under the GNU LGPL. You may copy and
+ * distribute such a system following the terms of the GNU AGPL for this code
+ * and the LGPL for the libraries. If you modify this code, you may extend this
+ * exception to your version of the code, but you are not obligated to do so.
+ * If you do not wish to do so, delete this exception statement from your
+ * version.
+ *
+ * This license applies to this entire compilation.
+ * @licend
+ * @source: http://www.webodf.org/
+ * @source: http://gitorious.org/odfkit/webodf/
+ */
+/*global core: true, runtime: true*/
+runtime.loadClass("core.PointWalker");
+
+/**
+ * @constructor
+ * @param runner {UnitTestRunner}
+ * @implements {core.UnitTest}
+ */
+core.PointWalkerTests = function PointWalkerTests(runner) {
+    "use strict";
+    var t, r = runner;
+
+    function checkWalker(node, count, endpos) {
+        t = {};
+        t.node = node;
+        t.walker = new core.PointWalker(node);
+        t.count = count;
+        t.countForward = 0;
+        t.countBackward = 0;
+        t.endpos = endpos;
+        t.walker.setPoint(t.node, 0);
+        while (t.walker.stepForward()) {
+            t.countForward += 1;
+        }
+        r.shouldBe(t, "t.countForward", "t.count");
+        r.shouldBe(t, "t.walker.precedingSibling()", "t.node.lastChild");
+        r.shouldBe(t, "t.walker.followingSibling()", "null");
+        if (endpos !== null) {
+            r.shouldBe(t, "t.walker.position()", "t.endpos");
+        }
+        t.walker.setPoint(t.node, endpos);
+        while (t.walker.stepBackward()) {
+            t.countBackward += 1;
+        }
+        r.shouldBe(t, "t.countBackward", "t.count");
+        r.shouldBe(t, "t.walker.precedingSibling()", "null");
+        r.shouldBe(t, "t.walker.followingSibling()", "t.node.firstChild");
+        r.shouldBe(t, "t.walker.position()", "0");
+    }
+
+    function testEmptyDocument() {
+        var doc = runtime.getDOMImplementation().createDocument("", "p", null),
+            p = doc.firstChild,
+            textnode1,
+            textnode2,
+            textnode3,
+            em;
+
+        checkWalker(doc, 2, 1);
+        checkWalker(p, 0, 0);
+
+        t = {};
+        t.doc = doc;
+        t.walker = new core.PointWalker(t.doc);
+        r.shouldBe(t, "t.walker.position()", "0");
+        r.shouldBe(t, "t.walker.stepForward()", "true");
+        r.shouldBe(t, "t.walker.position()", "0");
+        r.shouldBe(t, "t.walker.stepForward()", "true");
+        r.shouldBe(t, "t.walker.position()", "1");
+        r.shouldBe(t, "t.walker.stepForward()", "false");
+        r.shouldBe(t, "t.walker.position()", "1");
+        r.shouldBe(t, "t.walker.stepBackward()", "true");
+        r.shouldBe(t, "t.walker.position()", "0");
+        r.shouldBe(t, "t.walker.stepBackward()", "true");
+        r.shouldBe(t, "t.walker.position()", "0");
+        r.shouldBe(t, "t.walker.stepBackward()", "false");
+        r.shouldBe(t, "t.walker.position()", "0");
+
+        textnode1 = doc.createTextNode("hello, ");
+        textnode2 = doc.createTextNode("big ");
+        textnode3 = doc.createTextNode("world.");
+        em = doc.createElement('em');
+        p.appendChild(textnode1);
+        p.appendChild(em);
+        em.appendChild(textnode2);
+        p.appendChild(textnode3);
+
+        checkWalker(textnode1, 7, 7);
+        checkWalker(textnode2, 4, 4);
+        checkWalker(textnode3, 6, 6);
+        checkWalker(em, 6, 1);
+        checkWalker(p, 25, 3);
+        checkWalker(doc, 27, 1);
+    }
+
+    this.setUp = function () {
+        t = {};
+    };
+    this.tearDown = function () {
+        t = {};
+    };
+    this.tests = function () {
+        return [
+            testEmptyDocument
+        ];
+    };
+    this.asyncTests = function () {
+        return [];
+    };
+    this.description = function () {
+        return "Test the PointWalker class.";
+    };
+};
diff --git a/apps/files_odfviewer/src/webodf/webodf/tests/core/RuntimeTests.js b/apps/files_odfviewer/src/webodf/webodf/tests/core/RuntimeTests.js
new file mode 100644
index 0000000000..d3f7c2dfa2
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/tests/core/RuntimeTests.js
@@ -0,0 +1,119 @@
+/**
+ * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
+ * @licstart
+ * The JavaScript code in this page is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU Affero General Public License
+ * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.  The code is distributed
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
+ *
+ * As additional permission under GNU AGPL version 3 section 7, you
+ * may distribute non-source (e.g., minimized or compacted) forms of
+ * that code without the copy of the GNU GPL normally required by
+ * section 4, provided you include this license notice and a URL
+ * through which recipients can access the Corresponding Source.
+ *
+ * As a special exception to the AGPL, any HTML file which merely makes function
+ * calls to this code, and for that purpose includes it by reference shall be
+ * deemed a separate work for copyright law purposes. In addition, the copyright
+ * holders of this code give you permission to combine this code with free
+ * software libraries that are released under the GNU LGPL. You may copy and
+ * distribute such a system following the terms of the GNU AGPL for this code
+ * and the LGPL for the libraries. If you modify this code, you may extend this
+ * exception to your version of the code, but you are not obligated to do so.
+ * If you do not wish to do so, delete this exception statement from your
+ * version.
+ *
+ * This license applies to this entire compilation.
+ * @licend
+ * @source: http://www.webodf.org/
+ * @source: http://gitorious.org/odfkit/webodf/
+ */
+/*global core: true, runtime: true*/
+/*jslint bitwise: true*/
+
+/**
+ * @constructor
+ * @param runner {UnitTestRunner}
+ * @implements {core.UnitTest}
+ */
+core.RuntimeTests = function RuntimeTests(runner) {
+    "use strict";
+    var t, r = runner;
+
+    function testRead(callback) {
+        runtime.read("tests.js", 2, 6, function (err, data) {
+            t.err = err;
+            r.shouldBeNull(t, "t.err");
+            t.data = runtime.byteArrayToString(data, "utf8");
+            r.shouldBe(t, "t.data", "'global'");
+            callback();
+        });
+    }
+
+    /**
+     * Test writing a binary file and reading it back.
+     */
+    function testWrite(callback) {
+        var content = new core.ByteArrayWriter("utf8"),
+            i, max = 1024, filename, clean;
+        for (i = 0; i < max; i += 1) {
+            content.appendArray([i]);
+        }
+        content = content.getByteArray();
+        filename = "tmp" + Math.random();
+        clean = new core.ByteArrayWriter("utf8");
+        for (i = 0; i < max; i += 1) {
+            clean.appendArray([content[i] & 0xff]);
+        }
+        clean = clean.getByteArray();
+        // now content has content different from what is on the server
+        runtime.writeFile(filename, content, function (err) {
+            t.err = err;
+            r.shouldBeNull(t, "t.err");
+            runtime.readFile(filename, "binary", function (err, data) {
+                t.err = err;
+                r.shouldBeNull(t, "t.err");
+                t.data = data;
+                t.clean = clean;
+                r.shouldBe(t, "t.data.length", "t.clean.length");
+                i = 0;
+                while (i < max && data[i] === clean[i]) {
+                    i += 1;
+                }
+                if (i !== max) {
+                    runtime.log("at " + String(i) + " " + data[i] + " vs " +
+                            clean[i]);
+                }
+                t.i = i;
+                t.max = max;
+                r.shouldBe(t, "t.i", "t.max");
+                // cleanup
+                runtime.deleteFile(filename, function (err) {
+                    callback();
+                });
+            });
+        });
+    }
+
+    this.setUp = function () {
+        t = {};
+    };
+    this.tearDown = function () {
+        t = {};
+    };
+    this.tests = function () {
+        return [
+        ];
+    };
+    this.asyncTests = function () {
+        return [
+            testRead,
+            testWrite
+        ];
+    };
+    this.description = function () {
+        return "Test the runtime.";
+    };
+};
diff --git a/apps/files_odfviewer/src/webodf/webodf/tests/core/ZipTests.js b/apps/files_odfviewer/src/webodf/webodf/tests/core/ZipTests.js
new file mode 100644
index 0000000000..ad2ece55ad
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/tests/core/ZipTests.js
@@ -0,0 +1,141 @@
+/**
+ * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
+ * @licstart
+ * The JavaScript code in this page is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU Affero General Public License
+ * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.  The code is distributed
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
+ *
+ * As additional permission under GNU AGPL version 3 section 7, you
+ * may distribute non-source (e.g., minimized or compacted) forms of
+ * that code without the copy of the GNU GPL normally required by
+ * section 4, provided you include this license notice and a URL
+ * through which recipients can access the Corresponding Source.
+ *
+ * As a special exception to the AGPL, any HTML file which merely makes function
+ * calls to this code, and for that purpose includes it by reference shall be
+ * deemed a separate work for copyright law purposes. In addition, the copyright
+ * holders of this code give you permission to combine this code with free
+ * software libraries that are released under the GNU LGPL. You may copy and
+ * distribute such a system following the terms of the GNU AGPL for this code
+ * and the LGPL for the libraries. If you modify this code, you may extend this
+ * exception to your version of the code, but you are not obligated to do so.
+ * If you do not wish to do so, delete this exception statement from your
+ * version.
+ *
+ * This license applies to this entire compilation.
+ * @licend
+ * @source: http://www.webodf.org/
+ * @source: http://gitorious.org/odfkit/webodf/
+ */
+/*global core: true, runtime: true*/
+runtime.loadClass("core.Zip");
+
+/**
+ * @constructor
+ * @param {core.UnitTestRunner} runner
+ * @implements {core.UnitTest}
+ */
+core.ZipTests = function ZipTests(runner) {
+    "use strict";
+    var r = runner,
+        t;
+
+    function testNonExistingFile(callback) {
+        var zip = new core.Zip("whatever", function (err) {
+            t.err = err;
+            r.shouldBeNonNull(t, "t.err");
+            callback();
+        });
+    }
+
+    function testNonZipFile(callback) {
+        var path = "core/ZipTests.js";
+        // check that file exists
+        runtime.isFile(path, function (exists) {
+            t.exists = exists;
+            r.shouldBe(t, "t.exists", "true");
+            // check that zip file opening returns an error
+            var zip = new core.Zip("core/ZipTests.js", function (err) {
+                t.err = err;
+                r.shouldBeNonNull(t, "t.err");
+                callback();
+            });
+        });
+    }
+
+    function testHi(path, callback) {
+        var zip = new core.Zip(path, function (err, zip) {
+            t.err = err;
+            t.zip = zip;
+            r.shouldBeNull(t, "t.err");
+            zip.load("hello", function (err, data) {
+                t.err = err;
+                r.shouldBeNull(t, "t.err");
+                t.data = runtime.byteArrayToString(data, "utf8");
+                r.shouldBe(t, "t.data.length", "16");
+                r.shouldBe(t, "t.data", "'bonjour\\nbonjour\\n'");
+                callback();
+            });
+        });
+    }
+
+    function testHiUncompressed(callback) {
+        testHi("core/hi-uncompressed.zip", callback);
+    }
+
+    function testHiCompressed(callback) {
+        testHi("core/hi-compressed.zip", callback);
+    }
+
+    function testCreateZip(callback) {
+        var filename = "writetest.zip",
+            zip = new core.Zip(filename, null),
+            data = runtime.byteArrayFromString(
+                    "application/vnd.oasis.opendocument.text", "utf8");
+        zip.save("mimetype", data, false, new Date());
+        zip.load("mimetype", function (err, newdata) {
+            t.err = err;
+            r.shouldBeNull(t, "t.err");
+            t.data = data;
+            t.newdata = newdata;
+            r.shouldBe(t, "t.data", "t.newdata");
+            zip.write(function (err) {
+                t.err = err;
+                r.shouldBeNull(t, "t.err");
+                runtime.deleteFile(filename, function (err) {
+                    callback();
+                });
+            });
+        });
+    }
+
+    this.setUp = function () {
+        t = {};
+    };
+    this.tearDown = function () {
+        t = {};
+    };
+    this.tests = function () {
+        return [];
+    };
+    this.asyncTests = function () {
+        return [
+            testNonExistingFile,
+            testNonZipFile,
+            testHiUncompressed,
+            testHiCompressed,
+            testCreateZip
+        ];
+    };
+};
+core.ZipTests.prototype.description = function () {
+    "use strict";
+    return "Test the Zip class.";
+};
+(function () {
+    "use strict";
+    return core.ZipTests;
+}());
diff --git a/apps/files_odfviewer/src/webodf/webodf/tests/core/hi-compressed.zip b/apps/files_odfviewer/src/webodf/webodf/tests/core/hi-compressed.zip
new file mode 100644
index 0000000000000000000000000000000000000000..ff6d86c158abed89f3865d3855e412ce6c08cd98
GIT binary patch
literal 172
zcmWIWW@Zs#U}E54a170~P5pAhori&eK>&zZ8DtnTQgd?hLqj+jn6t!h`hak01vdjD
z%NIrl1~B1$>ip?b`nr$2nl3Q}cr!A|G2=2!0%#-y15h8smPQZ@YBVdvXf$I3yjj^m
OiWq^=8%TpN0|Nm1V<LM1

literal 0
HcmV?d00001

diff --git a/apps/files_odfviewer/src/webodf/webodf/tests/core/hi-uncompressed.zip b/apps/files_odfviewer/src/webodf/webodf/tests/core/hi-uncompressed.zip
new file mode 100644
index 0000000000000000000000000000000000000000..2eafff7ab92e96eff0d1d28c21040e2c149c492b
GIT binary patch
literal 176
zcmWIWW@h1H00GC)Oxx5iC)@>qY!GH;kYUJ3&B@6R4dG;9&Jw@r1Hz>h+zgB?Ul<t}
zz(i7hURHi-5f_XO@MdI^W5#8m1jrsR*wP51pvJR8j7Kv%z?+o~q=*p+y@9kph{FH?
D59A^n

literal 0
HcmV?d00001

diff --git a/apps/files_odfviewer/src/webodf/webodf/tests/gui/CaretTests.js b/apps/files_odfviewer/src/webodf/webodf/tests/gui/CaretTests.js
new file mode 100644
index 0000000000..05f1b9bcc5
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/tests/gui/CaretTests.js
@@ -0,0 +1,82 @@
+/**
+ * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
+ * @licstart
+ * The JavaScript code in this page is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU Affero General Public License
+ * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.  The code is distributed
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
+ *
+ * As additional permission under GNU AGPL version 3 section 7, you
+ * may distribute non-source (e.g., minimized or compacted) forms of
+ * that code without the copy of the GNU GPL normally required by
+ * section 4, provided you include this license notice and a URL
+ * through which recipients can access the Corresponding Source.
+ *
+ * As a special exception to the AGPL, any HTML file which merely makes function
+ * calls to this code, and for that purpose includes it by reference shall be
+ * deemed a separate work for copyright law purposes. In addition, the copyright
+ * holders of this code give you permission to combine this code with free
+ * software libraries that are released under the GNU LGPL. You may copy and
+ * distribute such a system following the terms of the GNU AGPL for this code
+ * and the LGPL for the libraries. If you modify this code, you may extend this
+ * exception to your version of the code, but you are not obligated to do so.
+ * If you do not wish to do so, delete this exception statement from your
+ * version.
+ *
+ * This license applies to this entire compilation.
+ * @licend
+ * @source: http://www.webodf.org/
+ * @source: http://gitorious.org/odfkit/webodf/
+ */
+/*global runtime: true, core: true, gui: true*/
+runtime.loadClass("gui.Caret");
+
+/**
+ * @constructor
+ * @param {core.UnitTestRunner} runner
+ * @implements {core.UnitTest}
+ */
+gui.CaretTests = function CaretTests(runner) {
+    "use strict";
+    var r = runner,
+        t;
+
+    function setupEmptyDoc() {
+        var selection = runtime.getWindow().getSelection(),
+            doc = runtime.getDOMImplementation().createDocument("", "p", null),
+            caret = new gui.Caret(selection, doc);
+        t = { selection: selection, doc: doc }; //, cursor: cursor };
+        runner.shouldBeNonNull(t, "t.selection");
+    }
+    function setupSimpleTextDoc() {
+        setupEmptyDoc();
+        t.textnode = t.doc.createTextNode("abc");
+        t.doc.documentElement.appendChild(t.textnode);
+    }
+    function testOnUpDownTraversal() {
+    }
+
+    this.setUp = function () {
+        t = {};
+    };
+    this.tearDown = function () {
+        t = {};
+    };
+    this.tests = function () {
+        return [];
+    };
+    this.asyncTests = function () {
+        return [
+        ];
+    };
+};
+gui.CaretTests.prototype.description = function () {
+    "use strict";
+    return "Test the Caret class.";
+};
+(function () {
+    "use strict";
+    return gui.CaretTests;
+}());
diff --git a/apps/files_odfviewer/src/webodf/webodf/tests/gui/SelectionMoverTests.js b/apps/files_odfviewer/src/webodf/webodf/tests/gui/SelectionMoverTests.js
new file mode 100644
index 0000000000..8b8275bcb8
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/tests/gui/SelectionMoverTests.js
@@ -0,0 +1,109 @@
+/**
+ * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
+ * @licstart
+ * The JavaScript code in this page is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU Affero General Public License
+ * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.  The code is distributed
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
+ *
+ * As additional permission under GNU AGPL version 3 section 7, you
+ * may distribute non-source (e.g., minimized or compacted) forms of
+ * that code without the copy of the GNU GPL normally required by
+ * section 4, provided you include this license notice and a URL
+ * through which recipients can access the Corresponding Source.
+ *
+ * As a special exception to the AGPL, any HTML file which merely makes function
+ * calls to this code, and for that purpose includes it by reference shall be
+ * deemed a separate work for copyright law purposes. In addition, the copyright
+ * holders of this code give you permission to combine this code with free
+ * software libraries that are released under the GNU LGPL. You may copy and
+ * distribute such a system following the terms of the GNU AGPL for this code
+ * and the LGPL for the libraries. If you modify this code, you may extend this
+ * exception to your version of the code, but you are not obligated to do so.
+ * If you do not wish to do so, delete this exception statement from your
+ * version.
+ *
+ * This license applies to this entire compilation.
+ * @licend
+ * @source: http://www.webodf.org/
+ * @source: http://gitorious.org/odfkit/webodf/
+ */
+/*global runtime: true, core: true, gui: true*/
+runtime.loadClass("gui.SelectionMover");
+
+/**
+ * @constructor
+ * @param {core.UnitTestRunner} runner
+ * @implements {core.UnitTest}
+ */
+gui.SelectionMoverTests = function SelectionMoverTests(runner) {
+    "use strict";
+    var r = runner,
+        t, testarea = runtime.getWindow().document.getElementById("testarea");
+
+    function setupDoc() {
+        var doc = testarea.ownerDocument,
+            selection = runtime.getWindow().getSelection(),
+            p = doc.createElement("p"),
+            walker = new core.PointWalker(p),
+            mover = new gui.SelectionMover(selection, walker);
+        testarea.appendChild(p);
+        p.appendChild(doc.createTextNode("MMMMM MMMMM MMMMM MMMMM MMMMM"));
+        p.style.width = "5em";// break line after each 'MMMMM'
+        selection.removeAllRanges();
+        selection.addRange(doc.createRange());
+        t = { doc: doc, p: p, selection: selection, mover: mover };
+    }
+    function testUpDownTraversal() {
+        setupDoc();
+        r.shouldBe(t, "t.selection.rangeCount", "1");
+        t.r = t.selection.getRangeAt(0);
+        r.shouldBeNonNull(t, "t.r");
+        t.r.setStart(t.p.firstChild, 0);
+        r.shouldBe(t, "t.r.startContainer", "t.p.firstChild");
+        r.shouldBe(t, "t.r.startOffset", "0");
+        t.mover.movePointForward();
+        t.r = t.selection.getRangeAt(0);
+        r.shouldBe(t, "t.r.startContainer", "t.p.firstChild");
+        r.shouldBe(t, "t.r.startOffset", "1");
+        t.mover.movePointBackward();
+        t.r = t.selection.getRangeAt(0);
+        r.shouldBe(t, "t.r.startContainer", "t.p.firstChild");
+        r.shouldBe(t, "t.r.startOffset", "0");
+        t.mover.moveLineForward();
+//        t.selection.modify("move", "forward", "line");
+        t.r = t.selection.getRangeAt(0);
+        r.shouldBe(t, "t.r.startContainer", "t.p.firstChild");
+        r.shouldBe(t, "t.r.startOffset", "6");
+    }
+
+    this.setUp = function () {
+        t = {};
+        while (testarea.firstChild) {
+            testarea.removeChild(testarea.firstChild);
+        }
+    };
+    this.tearDown = function () {
+        t = {};
+        while (testarea.firstChild) {
+            testarea.removeChild(testarea.firstChild);
+        }
+    };
+    this.tests = function () {
+        return [ testUpDownTraversal ];
+    };
+    this.asyncTests = function () {
+        return [
+        ];
+    };
+};
+gui.SelectionMoverTests.prototype.description = function () {
+    "use strict";
+    return "Test the SelectionMover class.";
+};
+(function () {
+    "use strict";
+    return gui.SelectionMoverTests;
+}());
diff --git a/apps/files_odfviewer/src/webodf/webodf/tests/gui/XMLEditTests.js b/apps/files_odfviewer/src/webodf/webodf/tests/gui/XMLEditTests.js
new file mode 100644
index 0000000000..e253a72fea
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/tests/gui/XMLEditTests.js
@@ -0,0 +1,156 @@
+/**
+ * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
+ * @licstart
+ * The JavaScript code in this page is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU Affero General Public License
+ * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.  The code is distributed
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
+ *
+ * As additional permission under GNU AGPL version 3 section 7, you
+ * may distribute non-source (e.g., minimized or compacted) forms of
+ * that code without the copy of the GNU GPL normally required by
+ * section 4, provided you include this license notice and a URL
+ * through which recipients can access the Corresponding Source.
+ *
+ * As a special exception to the AGPL, any HTML file which merely makes function
+ * calls to this code, and for that purpose includes it by reference shall be
+ * deemed a separate work for copyright law purposes. In addition, the copyright
+ * holders of this code give you permission to combine this code with free
+ * software libraries that are released under the GNU LGPL. You may copy and
+ * distribute such a system following the terms of the GNU AGPL for this code
+ * and the LGPL for the libraries. If you modify this code, you may extend this
+ * exception to your version of the code, but you are not obligated to do so.
+ * If you do not wish to do so, delete this exception statement from your
+ * version.
+ *
+ * This license applies to this entire compilation.
+ * @licend
+ * @source: http://www.webodf.org/
+ * @source: http://gitorious.org/odfkit/webodf/
+ */
+/*global document: true, core: true, gui: true, runtime: true*/
+runtime.loadClass("core.PointWalker");
+runtime.loadClass("gui.XMLEdit");
+
+/**
+ * @constructor
+ * @param runner {core.UnitTestRunner}
+ * @implements {core.UnitTest}
+ */
+gui.XMLEditTests = function XMLEditTests(runner) {
+    "use strict";
+    var t, r = runner, tests;
+
+    function checkWalker(node, count, endpos) {
+        t = {};
+        t.node = node;
+        t.walker = new core.PointWalker(node);
+        t.count = count;
+        t.countForward = 0;
+        t.countBackward = 0;
+        t.endpos = endpos;
+        t.walker.setPoint(t.node, 0);
+        while (t.walker.stepForward()) {
+            t.countForward += 1;
+        }
+        r.shouldBe("t.countForward", "t.count");
+        r.shouldBe("t.walker.precedingSibling()", "t.node.lastChild");
+        r.shouldBe("t.walker.followingSibling()", "null");
+        if (endpos !== null) {
+            r.shouldBe("t.walker.position()", "t.endpos");
+        }
+        t.walker.setPoint(t.node, endpos);
+        while (t.walker.stepBackward()) {
+            t.countBackward += 1;
+        }
+        r.shouldBe("t.countBackward", "t.count");
+        r.shouldBe("t.walker.precedingSibling()", "null");
+        r.shouldBe("t.walker.followingSibling()", "t.node.firstChild");
+        r.shouldBe("t.walker.position()", "0");
+    }
+
+    function testSimpleDocument(xmledit) {
+        var maindoc = xmledit.ownerDocument,
+            doc = maindoc.implementation.createDocument(null, "p", null),
+            p = doc.firstChild,
+            textnode1,
+            textnode2,
+            textnode3,
+            em;
+
+        xmledit.setXML(doc);
+
+        checkWalker(doc, 2, 1);
+        checkWalker(p, 0, 0);
+
+        t = {};
+        t.doc = doc;
+        t.walker = new core.PointWalker(t.doc);
+        r.shouldBe("t.walker.position()", "0");
+        r.shouldBe("t.walker.stepForward()", "true");
+        r.shouldBe("t.walker.position()", "0");
+        r.shouldBe("t.walker.stepForward()", "true");
+        r.shouldBe("t.walker.position()", "1");
+        r.shouldBe("t.walker.stepForward()", "false");
+        r.shouldBe("t.walker.position()", "1");
+        r.shouldBe("t.walker.stepBackward()", "true");
+        r.shouldBe("t.walker.position()", "0");
+        r.shouldBe("t.walker.stepBackward()", "true");
+        r.shouldBe("t.walker.position()", "0");
+        r.shouldBe("t.walker.stepBackward()", "false");
+        r.shouldBe("t.walker.position()", "0");
+
+        textnode1 = doc.createTextNode("hello, ");
+        textnode2 = doc.createTextNode("big ");
+        textnode3 = doc.createTextNode("world.");
+        em = doc.createElement('em');
+        p.appendChild(textnode1);
+        p.appendChild(em);
+        em.appendChild(textnode2);
+        p.appendChild(textnode3);
+
+        checkWalker(textnode1, 7, 7);
+        checkWalker(textnode2, 4, 4);
+        checkWalker(textnode3, 6, 6);
+        checkWalker(em, 6, 1);
+        checkWalker(p, 25, 3);
+        checkWalker(doc, 27, 1);
+    }
+
+    function testXmlEdit(document) {
+        var head = document.getElementsByTagName("head")[0],
+            css = document.createElement("style"),
+            testarea = document.createElement("div"),
+            xmledit;
+
+        // the xml edit requires an element to put the content and a sheet to put
+        // the style
+        css.type = "text/css";
+        head.appendChild(css);
+        document.body.appendChild(testarea);
+        xmledit = new gui.XMLEdit(testarea, css);
+
+        testSimpleDocument(xmledit);
+
+        css.parentNode.removeChild(css);
+        testarea.parentNode.removeChild(testarea);
+    }
+
+    this.setUp = function () {
+        t = {};
+    };
+    this.tearDown = function () {
+        t = {};
+    };
+    this.tests = function () {
+        return [ testSimpleDocument ];
+    };
+    this.asyncTests = function () {
+        return [];
+    };
+    this.description = function () {
+        return "Test the XML editor class.";
+    };
+};
diff --git a/apps/files_odfviewer/src/webodf/webodf/tests/manifest.js b/apps/files_odfviewer/src/webodf/webodf/tests/manifest.js
new file mode 100644
index 0000000000..6d4f151bc0
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/tests/manifest.js
@@ -0,0 +1,16 @@
+(function () {
+    "use strict";
+return [
+        "core/Base64Tests.js",
+        "core/CursorTests.js",
+        "core/PointWalkerTests.js",
+        "core/RuntimeTests.js",
+        "core/ZipTests.js",
+        "gui/CaretTests.js",
+        "gui/SelectionMoverTests.js",
+        "gui/XMLEditTests.js",
+        "tests.js",
+        "xmldom/OperationalTransformDOMTests.js",
+        "xmldom/XPathTests.js"
+    ];
+}());
diff --git a/apps/files_odfviewer/src/webodf/webodf/tests/resources/js-test-style.css b/apps/files_odfviewer/src/webodf/webodf/tests/resources/js-test-style.css
new file mode 100644
index 0000000000..f12147ca43
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/tests/resources/js-test-style.css
@@ -0,0 +1,12 @@
+.pass {
+    font-weight: bold;
+    color: green;
+}
+.fail {
+    font-weight: bold;
+    color: red;
+}
+#console {
+    white-space: pre-wrap;
+    font-family: monospace;
+}
diff --git a/apps/files_odfviewer/src/webodf/webodf/tests/tests.html b/apps/files_odfviewer/src/webodf/webodf/tests/tests.html
new file mode 100644
index 0000000000..572db60554
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/tests/tests.html
@@ -0,0 +1,22 @@
+<html>
+  <head>
+    <title>WebODF unit tests</title>
+    <link rel="stylesheet" href="resources/js-test-style.css"></link>
+  </head>
+  <body>
+    <p id="description"></p>
+    <div id="console"></div>
+    <div id="testarea"></div>
+    <div id="logoutput"></div>
+    <script src="../lib/runtime.js"></script>
+<script type="text/javascript" charset="utf-8">
+runtime.libraryPaths = (function () {
+    return function () {
+        return ["../lib", "."];
+    }
+}());
+</script>
+    <script src="tests.js"></script>
+  </body>
+</html>
+
diff --git a/apps/files_odfviewer/src/webodf/webodf/tests/tests.js b/apps/files_odfviewer/src/webodf/webodf/tests/tests.js
new file mode 100644
index 0000000000..5570733de5
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/tests/tests.js
@@ -0,0 +1,94 @@
+/*global window: true, runtime: true, Runtime: true, core: true, gui: true,
+  xmldom: true, RuntimeTests: true*/
+/**
+ * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
+ * @licstart
+ * The JavaScript code in this page is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU Affero General Public License
+ * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.  The code is distributed
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
+ *
+ * As additional permission under GNU AGPL version 3 section 7, you
+ * may distribute non-source (e.g., minimized or compacted) forms of
+ * that code without the copy of the GNU GPL normally required by
+ * section 4, provided you include this license notice and a URL
+ * through which recipients can access the Corresponding Source.
+ *
+ * As a special exception to the AGPL, any HTML file which merely makes function
+ * calls to this code, and for that purpose includes it by reference shall be
+ * deemed a separate work for copyright law purposes. In addition, the copyright
+ * holders of this code give you permission to combine this code with free
+ * software libraries that are released under the GNU LGPL. You may copy and
+ * distribute such a system following the terms of the GNU AGPL for this code
+ * and the LGPL for the libraries. If you modify this code, you may extend this
+ * exception to your version of the code, but you are not obligated to do so.
+ * If you do not wish to do so, delete this exception statement from your
+ * version.
+ *
+ * This license applies to this entire compilation.
+ * @licend
+ * @source: http://www.webodf.org/
+ * @source: http://gitorious.org/odfkit/webodf/
+ */
+runtime.loadClass("core.RuntimeTests");
+runtime.loadClass("core.UnitTester");
+runtime.loadClass("core.PointWalkerTests");
+runtime.loadClass("core.CursorTests");
+runtime.loadClass("core.ZipTests");
+runtime.loadClass("core.Base64Tests");
+runtime.loadClass("xmldom.OperationalTransformDOMTests");
+runtime.loadClass("xmldom.XPathTests");
+runtime.loadClass("gui.CaretTests");
+runtime.loadClass("gui.XMLEditTests");
+
+var tests = [
+    core.RuntimeTests, // temporarily disabled, enable at next commit!
+    core.ZipTests,
+    core.Base64Tests
+];
+if (runtime.type() !== "NodeJSRuntime") {
+    tests.push(core.PointWalkerTests);
+}
+if (runtime.type() === "BrowserRuntime") {
+    tests.push(core.PointWalkerTests);
+//    tests.push(core.CursorTests);
+    tests.push(xmldom.OperationalTransformDOMTests);
+    tests.push(gui.CaretTests);
+    tests.push(xmldom.XPathTests);
+//    tests.push(gui.XMLEditTests);
+}
+var tester = new core.UnitTester();
+/**
+ * @param {!Array.<Function>} tests
+ * @return {undefined}
+ */
+function runNextTest(tests) {
+    "use strict";
+    if (tests.length === 0) {
+        //runtime.log(JSON.stringify(tester.results()));
+        runtime.log("Number of failed tests: " +
+                String(tester.countFailedTests()));
+        runtime.exit(tester.countFailedTests());
+        return;
+    }
+    var test = tests[0];
+    if (typeof test !== "function") {
+        runtime.log("Tests contain a non-function object of type " +
+                typeof(test) + ".");
+        runtime.exit(1);
+        return;
+    }
+    runtime.log("Running test '" + Runtime.getFunctionName(test) + "'.");
+    try {
+        tester.runTests(test, function () {
+            runNextTest(tests.slice(1));
+        });
+    } catch (e) {
+        runtime.log(e);
+        runtime.exit(1);
+        throw e;
+    }
+}
+runNextTest(tests);
diff --git a/apps/files_odfviewer/src/webodf/webodf/tests/xmldom/OperationalTransformDOMTests.js b/apps/files_odfviewer/src/webodf/webodf/tests/xmldom/OperationalTransformDOMTests.js
new file mode 100644
index 0000000000..3866a53708
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/tests/xmldom/OperationalTransformDOMTests.js
@@ -0,0 +1,79 @@
+/**
+ * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
+ * @licstart
+ * The JavaScript code in this page is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU Affero General Public License
+ * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.  The code is distributed
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
+ *
+ * As additional permission under GNU AGPL version 3 section 7, you
+ * may distribute non-source (e.g., minimized or compacted) forms of
+ * that code without the copy of the GNU GPL normally required by
+ * section 4, provided you include this license notice and a URL
+ * through which recipients can access the Corresponding Source.
+ *
+ * As a special exception to the AGPL, any HTML file which merely makes function
+ * calls to this code, and for that purpose includes it by reference shall be
+ * deemed a separate work for copyright law purposes. In addition, the copyright
+ * holders of this code give you permission to combine this code with free
+ * software libraries that are released under the GNU LGPL. You may copy and
+ * distribute such a system following the terms of the GNU AGPL for this code
+ * and the LGPL for the libraries. If you modify this code, you may extend this
+ * exception to your version of the code, but you are not obligated to do so.
+ * If you do not wish to do so, delete this exception statement from your
+ * version.
+ *
+ * This license applies to this entire compilation.
+ * @licend
+ * @source: http://www.webodf.org/
+ * @source: http://gitorious.org/odfkit/webodf/
+ */
+/*global runtime: true, core: true, xmldom: true*/
+runtime.loadClass("xmldom.OperationalTransformDOM");
+
+/**
+ * @constructor
+ * @param {core.UnitTestRunner} runner
+ * @implements {core.UnitTest}
+ */
+xmldom.OperationalTransformDOMTests = function OperationalTransformDOMTests(runner) {
+    "use strict";
+    var r = runner,
+        t;
+
+    function setupEmptyDoc() {
+        var doc = runtime.getDOMImplementation().createDocument("", "p", null);
+        t = { doc: doc };
+    }
+    function setupSimpleTextDoc() {
+        setupEmptyDoc();
+        t.textnode = t.doc.createTextNode("abc");
+        t.doc.documentElement.appendChild(t.textnode);
+    }
+    function testSkip() {
+        setupEmptyDoc();
+    }
+    this.setUp = function () {
+        t = {};
+    };
+    this.tearDown = function () {
+        t = {};
+    };
+    this.tests = function () {
+        return [ testSkip ];
+    };
+    this.asyncTests = function () {
+        return [
+        ];
+    };
+};
+xmldom.OperationalTransformDOMTests.prototype.description = function () {
+    "use strict";
+    return "Test the OperationalTransformDOM class.";
+};
+(function () {
+    "use strict";
+    return xmldom.OperationalTransformDOMTests;
+}());
diff --git a/apps/files_odfviewer/src/webodf/webodf/tests/xmldom/XPathTests.js b/apps/files_odfviewer/src/webodf/webodf/tests/xmldom/XPathTests.js
new file mode 100644
index 0000000000..91ebba99c6
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/tests/xmldom/XPathTests.js
@@ -0,0 +1,112 @@
+/**
+ * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
+ * @licstart
+ * The JavaScript code in this page is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU Affero General Public License
+ * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.  The code is distributed
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
+ *
+ * As additional permission under GNU AGPL version 3 section 7, you
+ * may distribute non-source (e.g., minimized or compacted) forms of
+ * that code without the copy of the GNU GPL normally required by
+ * section 4, provided you include this license notice and a URL
+ * through which recipients can access the Corresponding Source.
+ *
+ * As a special exception to the AGPL, any HTML file which merely makes function
+ * calls to this code, and for that purpose includes it by reference shall be
+ * deemed a separate work for copyright law purposes. In addition, the copyright
+ * holders of this code give you permission to combine this code with free
+ * software libraries that are released under the GNU LGPL. You may copy and
+ * distribute such a system following the terms of the GNU AGPL for this code
+ * and the LGPL for the libraries. If you modify this code, you may extend this
+ * exception to your version of the code, but you are not obligated to do so.
+ * If you do not wish to do so, delete this exception statement from your
+ * version.
+ *
+ * This license applies to this entire compilation.
+ * @licend
+ * @source: http://www.webodf.org/
+ * @source: http://gitorious.org/odfkit/webodf/
+ */
+/*global runtime: true, core: true, xmldom: true, odf: true, XMLSerializer*/
+runtime.loadClass("xmldom.XPath");
+runtime.loadClass("odf.Style2CSS");
+
+/**
+ * @constructor
+ * @param {core.UnitTestRunner} runner
+ * @implements {core.UnitTest}
+ */
+xmldom.XPathTests = function XPathTests(runner) {
+    "use strict";
+    var r = runner,
+        style2CSS = new odf.Style2CSS(),
+        t;
+
+    function setupDoc() {
+        var stylens = style2CSS.namespaceResolver("style"),
+            svgns = style2CSS.namespaceResolver("svg"),
+            drawns = style2CSS.namespaceResolver("draw"),
+            presentationns = style2CSS.namespaceResolver("presentation"),
+            textns = style2CSS.namespaceResolver("text"),
+            doc = runtime.getDOMImplementation().createDocument("", "a", null),
+            r = doc.documentElement,
+            fontFace = doc.createElementNS(stylens, "font-face"),
+            fontFaceSrc = doc.createElementNS(svgns, "font-face-src"),
+            drawFrame = doc.createElementNS(drawns, "frame"),
+            p = doc.createElementNS(textns, "p");
+        r.appendChild(p);
+        r.appendChild(fontFace);
+        fontFace = doc.createElementNS(stylens, "font-face");
+        fontFace.appendChild(fontFaceSrc);
+        fontFaceSrc.setAttributeNS(textns, "anchor-type", "paragraph");
+        r.appendChild(fontFace);
+        r.appendChild(drawFrame);
+        drawFrame = doc.createElementNS(drawns, "frame");
+        drawFrame.setAttributeNS(presentationns, "class", "title");
+        r.appendChild(drawFrame);
+
+        t = { doc: doc, fontFace: fontFace, drawFrame: drawFrame };
+    }
+    function test1() {
+        setupDoc();
+        var xpath = new xmldom.XPath(),
+            xpaths = {
+                "style:font-face[svg:font-face-src]": "t.fontFace",
+                ".//*[*[@text:anchor-type='paragraph']]": "t.fontFace",
+                "./draw:frame[@presentation:class='title']": "t.drawFrame"
+            },
+            x;
+        for (x in xpaths) {
+            if (xpaths.hasOwnProperty(x)) {
+                t.result = xpath.getODFElementsWithXPath(t.doc.documentElement,
+                        x, style2CSS.namespaceResolver);
+                r.shouldBe(t, "t.result.length", "1");
+                r.shouldBe(t, "t.result[0]", xpaths[x]);
+            }
+        }
+    }
+    this.setUp = function () {
+        t = {};
+    };
+    this.tearDown = function () {
+        t = {};
+    };
+    this.tests = function () {
+        return [ test1 ];
+    };
+    this.asyncTests = function () {
+        return [
+        ];
+    };
+};
+xmldom.XPathTests.prototype.description = function () {
+    "use strict";
+    return "Test the XPath class.";
+};
+(function () {
+    "use strict";
+    return xmldom.XPathTests;
+}());
diff --git a/apps/files_odfviewer/src/webodf/webodf/tools/clippingTestImage.html b/apps/files_odfviewer/src/webodf/webodf/tools/clippingTestImage.html
new file mode 100644
index 0000000000..67cc747737
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/tools/clippingTestImage.html
@@ -0,0 +1,39 @@
+<html>
+ <head>
+  <script type="application/javascript">//<![CDATA[
+function draw() {
+  var canvas = document.getElementById("canvas"),
+      ctx = canvas.getContext("2d"),
+      size = canvas.width / 2,
+      link = document.createElement("a");
+  ctx.translate(size, size);
+  for (i = 0; i < 4; i += 1) {
+     ctx.save();
+     ctx.rotate(i * Math.PI / 2);
+     ctx.translate(0, -size);
+     drawPattern(ctx, size);
+     ctx.restore();
+  }
+  document.body.appendChild(document.createElement("br"));
+  link.appendChild(document.createTextNode("download image"));
+  link.setAttribute("href", canvas.toDataURL());
+  document.body.appendChild(link);
+}
+function drawPattern(ctx, size) {
+  var i = 0,
+      step = 2;
+  while (i < size) {
+    ctx.fillStyle = "rgb(0,0,0)";
+    ctx.fillRect (i, i, size - i, step);
+    ctx.fillRect (i, i, step, size - i);
+    i += 2 * step;
+  }
+}
+//]]></script>
+	 </head>
+	 <body onload="draw()">
+<p>This image can be used to find clipping problems. If the sides of the image are clipped asymetrically, it will obvious visually.</p>
+   <canvas id="canvas" width="136" height="136"></canvas>
+<img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAIgAAACIAQMAAAAGdDERAAAABlBMVEUAAAAAAAClZ7nPAAAAAXRSTlMAQObYZgAAAXFJREFUSMd91EGKwzAMhWFBtjmMIQfw1XUAgQ6TrUGzGD0TW8/NaviGv69N3Irl5ZGXnGUIrrPcpSriQ7eqit6+VVVi2FZVkdu2qojHMF2qKio37sdRIobZUlURuc2WqohHDMP8QVTkxgM6SUQMw/xBROS2nD+IZ6WzqqJZ+ayqRFY2qyqSlc2qiM9Ks6qis/KsqsSsLKsqMivLqoh/KhWhop/KI6jEpzIRKvKpLIKJL5UKE10qDyaxVCZMZKksiPhWKRHdKicSW2VEnrz6/LWp8qa0XLiIXFv1EomteojIVjGJd6kuJpjP6mUSsVQPE8xnRSVyvuU4E8z3HGcSOd9ynAnme44ziZxvOc4E8z3HmeTr/VcPF/zR8S8ieMGGCSKY73irRPABGz4yEcx33DoiuOENj4AI5jseJREcgIYjQQTzHUeLCA5kwxElgvmOo04EX5CGrwwRzPc4C76w7ToL5vt7FvyAtOcsuPoPQfWe5Q+etqGXQp0CUgAAAABJRU5ErkJggg==" alt="pregenerated"/>
+ </body>
+</html>
diff --git a/apps/files_odfviewer/src/webodf/webodf/tools/externs.js b/apps/files_odfviewer/src/webodf/webodf/tools/externs.js
new file mode 100644
index 0000000000..9862befe48
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/tools/externs.js
@@ -0,0 +1,348 @@
+/**
+ * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
+ * @licstart
+ * The JavaScript code in this page is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU Affero General Public License
+ * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.  The code is distributed
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
+ *
+ * As additional permission under GNU AGPL version 3 section 7, you
+ * may distribute non-source (e.g., minimized or compacted) forms of
+ * that code without the copy of the GNU GPL normally required by
+ * section 4, provided you include this license notice and a URL
+ * through which recipients can access the Corresponding Source.
+ *
+ * As a special exception to the AGPL, any HTML file which merely makes function
+ * calls to this code, and for that purpose includes it by reference shall be
+ * deemed a separate work for copyright law purposes. In addition, the copyright
+ * holders of this code give you permission to combine this code with free
+ * software libraries that are released under the GNU LGPL. You may copy and
+ * distribute such a system following the terms of the GNU AGPL for this code
+ * and the LGPL for the libraries. If you modify this code, you may extend this
+ * exception to your version of the code, but you are not obligated to do so.
+ * If you do not wish to do so, delete this exception statement from your
+ * version.
+ *
+ * This license applies to this entire compilation.
+ * @licend
+ * @source: http://www.webodf.org/
+ * @source: http://gitorious.org/odfkit/webodf/
+ */
+/*global Packages HTMLStyleElement window XMLHttpRequest HTMLStyleElement Document*/
+/*jslint nomen: false */
+/**
+ * @constructor
+ */
+function NodeJSObject() {}
+/**
+ * @param {!string} path
+ * @param {function(...)} callback
+ * @return {undefined}
+ */
+NodeJSObject.prototype.stat = function (path, callback) {};
+/**
+ * @param {!string} path
+ * @param {?string} encoding
+ * @param {function(...)} callback
+ * @return {?string}
+ */
+NodeJSObject.prototype.readFile = function (path, encoding, callback) {};
+/**
+ * @param {!string} path
+ * @param {?string} encoding
+ * @return {?string}
+ */
+NodeJSObject.prototype.readFileSync = function (path, encoding) {};
+/**
+ * @param {!string} path
+ * @param {!string} flags
+ * @param {!number} mode
+ * @param {!function(string, !number):undefined} callback
+ * @return {undefined}
+ */
+NodeJSObject.prototype.open = function (path, flags, mode, callback) {};
+/**
+ * @param {!number} fd
+ * @param {!Buffer} buffer
+ * @param {!number} offset
+ * @param {!number} length
+ * @param {!number} position
+ * @param {function(string, !number)} callback
+ * @return {undefined}
+ */
+NodeJSObject.prototype.read = function (fd, buffer, offset, length, position,
+        callback) {};
+/**
+ * @param {!string} path
+ * @param {!string} data
+ * @param {!string} encoding
+ * @param {!function(?string):undefined} callback
+ * @return {undefined}
+ */
+NodeJSObject.prototype.writeFile = function (path, data, encoding, callback) {};
+/**
+ * @param {!string} path
+ * @param {!function(?string):undefined} callback
+ * @return {undefined}
+ */
+NodeJSObject.prototype.unlink = function (path, callback) {};
+/**
+ * @param {!number} fd
+ * @param {function(!string)} callback
+ * @return {undefined}
+ */
+NodeJSObject.prototype.close = function (fd, callback) {};
+/**
+ * @param {!string} className
+ * @return {!NodeJSObject}
+ */
+function require(className) {}
+/**
+ * @constructor
+ */
+function NodeJSConsole() {}
+/**
+ * @param {!string} msg
+ * @return {undefined}
+ */
+NodeJSConsole.prototype.log = function (msg) {};
+/**
+ * @type {!NodeJSConsole}
+ */
+var console;
+/**
+ * @constructor
+ */
+function NodeJSProcess() {}
+/**
+ * @param {!number} exitCode
+ * @return {undefined}
+ */
+NodeJSProcess.prototype.exit = function (exitCode) {};
+/**
+ * @type {!Array}
+ */
+NodeJSProcess.prototype.argv = [];
+/**
+ * @type {!Object}
+ */
+NodeJSProcess.prototype.stderr = {};
+/**
+ * @type {!NodeJSProcess}
+ */
+var process;
+/**
+ * @type {!string}
+ */
+var __dirname;
+/**
+ * @constructor
+ * @param {!number|!Array.<!number>|!string} arg1
+ * @param {!string=} encoding
+ */
+function Buffer(arg1, encoding) {}
+/**
+ * @param {!string} msg
+ * @return {undefined}
+ */
+function print(msg) {}
+/**
+ * @param {!string} path
+ * @param {!string=} encoding
+ * @return {?string}
+ */
+function readFile(path, encoding) {}
+/**
+ * @param {!number} exitCode
+ * @return {undefined}
+ */
+function quit(exitCode) {}
+/**
+ * @namespace
+ */
+Packages.javax = {};
+/**
+ * @namespace
+ */
+Packages.javax.xml = {};
+/**
+ * @namespace
+ */
+Packages.javax.xml.validation = {};
+/**
+ * @constructor
+ */
+Packages.javax.xml.validation.Schema = function () {};
+/**
+ * @namespace
+ */
+Packages.javax.xml.parsers = {};
+/**
+ * @constructor
+ */
+Packages.javax.xml.parsers.DocumentBuilder = function () {};
+/**
+ * @param {!Object} entityresolver
+ * @return {undefined}
+ */
+Packages.javax.xml.parsers.DocumentBuilder.prototype.setEntityResolver =
+    function (entityresolver) {};
+/**
+ * @param {!Packages.org.xml.sax.InputSource} source 
+ * @return {Document}
+ */
+Packages.javax.xml.parsers.DocumentBuilder.prototype.parse =
+    function (source) {};
+/**
+ * @return {DOMImplementation}
+ */
+Packages.javax.xml.parsers.DocumentBuilder.prototype.getDOMImplementation =
+    function () {};
+/**
+ * @constructor
+ */
+Packages.javax.xml.parsers.DocumentBuilderFactory = function () {};
+/**
+ * @return {!Packages.javax.xml.parsers.DocumentBuilderFactory}
+ */
+Packages.javax.xml.parsers.DocumentBuilderFactory.newInstance = function () {};
+/**
+ * @param {!boolean} value
+ */
+Packages.javax.xml.parsers.DocumentBuilderFactory.prototype.setValidating =
+    function (value) {};
+/**
+ * @param {!boolean} value
+ */
+Packages.javax.xml.parsers.DocumentBuilderFactory.prototype.setNamespaceAware =
+    function (value) {};
+/**
+ * @param {!boolean} value
+ */
+Packages.javax.xml.parsers.DocumentBuilderFactory.prototype
+    .setExpandEntityReferences = function (value) {};
+/**
+ * @param {?Packages.javax.xml.validation.Schema} schema
+ */
+Packages.javax.xml.parsers.DocumentBuilderFactory.prototype.setSchema =
+    function (schema) {};
+/**
+ * @return {!Packages.javax.xml.parsers.DocumentBuilder}
+ */
+Packages.javax.xml.parsers.DocumentBuilderFactory.prototype.newDocumentBuilder =
+    function () {};
+/**
+ * @namespace
+ */
+Packages.org = {};
+/**
+ * @namespace
+ */
+Packages.org.xml.sax = {};
+/**
+ * @param {!Object} definition
+ * @return {!Object}
+ */
+Packages.org.xml.sax.EntityResolver = function (definition) {};
+/**
+ * @namespace
+ */
+Packages.java.io = {};
+/**
+ * @constructor
+ * @param {!string} path
+ */
+Packages.java.io.FileReader = function (path) {};
+/**
+ * @constructor
+ * @param {!string} path
+ */
+Packages.java.io.FileOutputStream = function (path) {};
+/**
+ * @param {!number} b
+ * @return {undefined}
+ */
+Packages.java.io.FileOutputStream.prototype.write = function (b) {};
+/**
+ * @return {undefined}
+ */
+Packages.java.io.FileOutputStream.prototype.close = function () {};
+/**
+ * @constructor
+ * @param {!Packages.java.io.FileReader} reader
+ */
+Packages.org.xml.sax.InputSource = function (reader) {};
+/**
+ * @type {!StyleSheet}
+ */
+HTMLStyleElement.prototype.sheet;
+XMLHttpRequest.prototype.sendAsBinary = function (data) {};
+/**
+ * @const@type{!string}
+ */
+XMLHttpRequest.prototype.responseBody;
+window.nativeio = {};
+var VBArray = {};
+VBArray.prototype.toArray = function () {};
+/**
+ * @interface
+ */
+function TreeWalker() {}
+/**
+ * @const@type{!Node}
+ */
+TreeWalker.prototype.root;
+/**
+ * @const@type{number}
+ */
+TreeWalker.prototype.whatToShow;
+/**
+ * @const@type{NodeFilter}
+ */
+TreeWalker.prototype.filter;
+/**
+ * @const@type{boolean}
+ */
+TreeWalker.prototype.expandEntityReferences;
+/**
+ * @type{Node}
+ */
+TreeWalker.prototype.currentNode;
+/**
+ * @return {Node}
+ */
+TreeWalker.prototype.parentNode = function () {};
+/**
+ * @return {Node}
+ */
+TreeWalker.prototype.firstChild = function () {};
+/**
+ * @return {Node}
+ */
+TreeWalker.prototype.lastChild = function () {};
+/**
+ * @return {Node}
+ */
+TreeWalker.prototype.previousSibling = function () {};
+/**
+ * @return {Node}
+ */
+TreeWalker.prototype.nextSibling = function () {};
+/**
+ * @return {Node}
+ */
+TreeWalker.prototype.previousNode = function () {};
+/**
+ * @return {Node}
+ */
+TreeWalker.prototype.nextNode = function () {};
+/**
+ * @param {!Node} root
+ * @param {!number} whatToShow
+ * @param {NodeFilter=} filter
+ * @param {boolean=} entityReferenceExpansion
+ * @return {!TreeWalker}
+ */
+Document.prototype.createTreeWalker = function (root, whatToShow, filter, entityReferenceExpansion) {};
diff --git a/apps/files_odfviewer/src/webodf/webodf/tools/extjsexterns.js b/apps/files_odfviewer/src/webodf/webodf/tools/extjsexterns.js
new file mode 100644
index 0000000000..f65d0c5cdb
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/tools/extjsexterns.js
@@ -0,0 +1,171 @@
+/**
+ * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
+ * @licstart
+ * The JavaScript code in this page is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU Affero General Public License
+ * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.  The code is distributed
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
+ *
+ * As additional permission under GNU AGPL version 3 section 7, you
+ * may distribute non-source (e.g., minimized or compacted) forms of
+ * that code without the copy of the GNU GPL normally required by
+ * section 4, provided you include this license notice and a URL
+ * through which recipients can access the Corresponding Source.
+ *
+ * As a special exception to the AGPL, any HTML file which merely makes function
+ * calls to this code, and for that purpose includes it by reference shall be
+ * deemed a separate work for copyright law purposes. In addition, the copyright
+ * holders of this code give you permission to combine this code with free
+ * software libraries that are released under the GNU LGPL. You may copy and
+ * distribute such a system following the terms of the GNU AGPL for this code
+ * and the LGPL for the libraries. If you modify this code, you may extend this
+ * exception to your version of the code, but you are not obligated to do so.
+ * If you do not wish to do so, delete this exception statement from your
+ * version.
+ *
+ * This license applies to this entire compilation.
+ * @licend
+ * @source: http://www.webodf.org/
+ * @source: http://gitorious.org/odfkit/webodf/
+ */
+/*global Packages HTMLStyleElement window XMLHttpRequest HTMLStyleElement Document*/
+/*jslint nomen: false */
+var Ext = {};
+Ext.data = {};
+/**
+ * @constructor
+ */
+Ext.data.Model = function (settings) {};
+/**
+ * @param {!string} fieldName
+ * @return {!string}
+ */
+Ext.data.Model.prototype.get = function (fieldName) {};
+/**
+ * @return {!boolean}
+ */
+Ext.data.Model.isExpanded = function () {};
+/**
+ * @constructor
+ */
+Ext.data.NodeInterface = function () {};
+/**
+ * @param {!string} attribute
+ * @param {*} value
+ * @param {boolean=} deep
+ * @return {Ext.data.NodeInterface}
+ */
+Ext.data.NodeInterface.prototype.findChild = function (attribute, value, deep) {};
+/**
+ * @param {!Ext.data.NodeInterface|!Object} node
+ * @return {!Ext.data.NodeInterface}
+ */
+Ext.data.NodeInterface.prototype.appendChild = function (node) {};
+/**
+ * @param {!string} id
+ * @return {Ext.Component}
+ */
+Ext.getCmp = function (id) {};
+Ext.tree = {};
+/**
+ * @constructor
+ */
+Ext.tree.Panel = function (settings) {};
+/**
+ * @return {!Ext.data.NodeInterface}
+ */
+Ext.tree.Panel.prototype.getRootNode = function () {};
+Ext.component = {};
+/**
+ * @constructor
+ * @extends {Ext.Component}
+ */
+Ext.component.Component = function (settings) {};
+/**
+ * @return {!Ext.Element}
+ */
+Ext.component.Component.prototype.getEl = function () {};
+/**
+ * @constructor
+ */
+Ext.Button = function (settings) {};
+/**
+ * @constructor
+ */
+Ext.Component = function (settings) {};
+/**
+ * @type {Object}
+ */
+Ext.Component.prototype.superclass = {};
+/**
+ * @type {!Ext.Element}
+ */
+Ext.Component.prototype.el;
+/**
+ * @constructor
+ */
+Ext.Element = function (settings) {};
+/**
+ * @constructor
+ */
+Ext.Panel = function (settings) {};
+/**
+ * @type {!Element}
+ */
+Ext.Element.prototype.dom;
+Ext.QuickTips = {};
+/**
+ * @return {undefined}
+ */
+Ext.QuickTips.init = function () {};
+/**
+ * @constructor
+ */
+Ext.Slider = function (settings) {};
+Ext.util = {};
+/**
+ * @constructor
+ */
+Ext.util.MixedCollection = function () {};
+/**
+ * @param {!Function} f
+ */
+Ext.util.MixedCollection.prototype.findBy = function (f) {};
+Ext.tab = {};
+/**
+ * @constructor
+ */
+Ext.tab.Panel = function (settings) {};
+/**
+ * @param {!Object} component
+ * @return {undefined}
+ */
+Ext.tab.Panel.prototype.add = function (component) {};
+/**
+ * @return {!Ext.Component}
+ */
+Ext.tab.Panel.prototype.getActiveTab = function () {};
+/**
+ * @param {!Ext.Component} tab
+ * @return {undefined}
+ */
+Ext.tab.Panel.prototype.setActiveTab = function (tab) {};
+/**
+ * @type {!Ext.util.MixedCollection}
+ */
+Ext.tab.Panel.prototype.items;
+/**
+ * @constructor
+ */
+Ext.Toolbar = function (settings) {};
+/**
+ * @constructor
+ */
+Ext.Toolbar.TextItem = function (text) {};
+/**
+ * @constructor
+ */
+Ext.Viewport = function (settings) {};
+Ext.onReady = function (callback) {};
diff --git a/apps/files_odfviewer/src/webodf/webodf/tools/fixLicenses.py b/apps/files_odfviewer/src/webodf/webodf/tools/fixLicenses.py
new file mode 100755
index 0000000000..a81c9b55c6
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/tools/fixLicenses.py
@@ -0,0 +1,81 @@
+#!/usr/bin/python -Qwarnall
+# -*- coding: utf-8 -*-
+#
+# This script checks if all files have licenses and fixes them if needed.
+# The script should be run from the root directory of the webodf project.
+import os, os.path
+
+# read the license text from the source file
+# the license starts at the line ' * @licstart' and ends at ' */'
+def readLicense(path):
+	file = open(path, "rU")
+	licensetext = []
+	started = False
+	for line in file:
+		if line.rstrip() == ' * @licstart':
+			started = True
+		if started:
+			licensetext.append(line)
+		if line.rstrip() == ' */':
+			break
+	return licensetext
+
+def writeLicense(file, license, defaultcopyright):
+	if defaultcopyright:
+		file.write(defaultcopyright)
+	file.writelines(license)
+
+def fixLicense(path, license, defaultcopyright):
+	# read the file
+	file = open(path, "rU")
+	lines = file.readlines()
+	file.close()
+	# does the file have any copyright statement already?
+	hasLicense = False
+	hasCopyright = False
+	for line in lines:
+		if line.rstrip() == ' * @licstart':
+			hasLicense = True
+		if line[:17] == ' * Copyright (C) ':
+			hasCopyright = True
+	if hasCopyright:
+		defaultcopyright = None
+	wroteLicense = False
+	skip = False
+	# write the file with the new slice
+	file = open(path, "w")
+	for line in lines:
+		if not wroteLicense:
+			if not hasLicense:
+				file.write("/**\n")
+				writeLicense(file, license, defaultcopyright)
+				wroteLicense = True
+			elif line.rstrip() == ' * @licstart':
+				writeLicense(file, license, defaultcopyright)
+				wroteLicense = True
+				skip = True
+		if skip:
+			if line.rstrip() == ' */':
+				skip = False
+		else:
+			file.write(line)
+	file.close()
+
+# get list of *.js files
+jsfiles = []
+for root, directories, files in os.walk("."):
+	while "extjs" in directories:
+		directories.remove("extjs")
+	for f in files:
+		if f[-3:] == ".js":
+			jsfiles.append(os.path.abspath(os.path.join(root, f)))
+
+# remove webodf/lib/packackages.js since it is the source for the licenses
+sourcefilepath = os.path.join(os.getcwd(), "webodf/lib/packages.js")
+jsfiles.remove(sourcefilepath)
+
+licensetext = readLicense(sourcefilepath)
+defaultcopyright = " * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>\n"
+
+for f in jsfiles:
+	fixLicense(f, licensetext, defaultcopyright)
diff --git a/apps/files_odfviewer/src/webodf/webodf/tools/refcheck/bootstrap.xsl b/apps/files_odfviewer/src/webodf/webodf/tools/refcheck/bootstrap.xsl
new file mode 100644
index 0000000000..747e3e605b
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/tools/refcheck/bootstrap.xsl
@@ -0,0 +1,193 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
+  xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
+  xmlns:o="urn:odfkeys" xmlns:x="dummy" exclude-result-prefixes="o">
+ <xsl:output method="xml" indent="yes"/>
+ <xsl:namespace-alias stylesheet-prefix="x" result-prefix="xsl"/>
+
+ <xsl:template name="join" >
+  <xsl:param name="values"/>
+  <xsl:param name="separator"/>
+  <xsl:for-each select="$values">
+   <xsl:choose>
+    <xsl:when test="position() = 1">
+     <xsl:value-of select="."/>
+    </xsl:when>
+    <xsl:otherwise>
+     <xsl:value-of select="concat($separator, .) "/>
+    </xsl:otherwise>
+   </xsl:choose>
+  </xsl:for-each>
+ </xsl:template>
+
+ <xsl:template name="getdefs">
+  <xsl:param name="name"/>
+  <xsl:param name="separator"/>
+  <xsl:variable name="key" select="../o:key[@name=$name]"/>
+  <xsl:if test="$key/@extends">
+   <xsl:call-template name="getdefs">
+    <xsl:with-param name="name" select="$key/@extends"/>
+    <xsl:with-param name="separator" select="$separator"/>
+   </xsl:call-template>
+   <xsl:text>|</xsl:text>
+  </xsl:if>
+  <xsl:call-template name="join">
+   <xsl:with-param name="values" select="$key/o:def"/>
+   <xsl:with-param name="separator" select="$separator"/>
+  </xsl:call-template>
+ </xsl:template>
+
+ <xsl:template match="o:key" mode="define">
+  <xsl:variable name="def">
+   <xsl:call-template name="getdefs">
+    <xsl:with-param name="name" select="@name"/>
+    <xsl:with-param name="separator" select="'|'"/>
+   </xsl:call-template>
+  </xsl:variable>
+  <xsl:variable name="ref">
+   <xsl:call-template name="join">
+    <xsl:with-param name="values" select="o:ref"/>
+    <xsl:with-param name="separator" select="'|'"/>
+   </xsl:call-template>
+  </xsl:variable>
+  <x:template name="check{@name}">
+   <x:param name="stylesfontfaces" />
+   <x:param name="fontfaces" />
+   <x:param name="officestyles" />
+   <x:param name="stylesautostyles" />
+   <x:param name="contentautostyles" />
+   <x:param name="masterstyles" />
+   <x:param name="body" />
+   <x:call-template name="checkReferences">
+    <x:with-param name="name" select="'{@name}'"/>
+    <x:with-param name="definitions" select="{$def}"/>
+    <x:with-param name="references" select="{$ref}"/>
+   </x:call-template>
+  </x:template>
+ </xsl:template>
+
+ <xsl:template match="o:key" mode="call">
+  <x:call-template name="check{@name}">
+   <x:with-param name="stylesfontfaces" select="$stylesfontfaces"/>
+   <x:with-param name="fontfaces" select="$fontfaces"/>
+   <x:with-param name="officestyles" select="$officestyles"/>
+   <x:with-param name="stylesautostyles" select="$stylesautostyles"/>
+   <x:with-param name="contentautostyles" select="$contentautostyles"/>
+   <x:with-param name="masterstyles" select="$masterstyles"/>
+   <x:with-param name="body" select="$body"/>
+  </x:call-template>
+ </xsl:template>
+
+ <xsl:template match="/o:keys">
+  <x:stylesheet version="1.0">
+   <xsl:for-each select="namespace::*"><xsl:copy/></xsl:for-each>
+
+   <xsl:apply-templates select="o:key" mode="define"/>
+
+   <x:template name="check">
+    <x:param name="stylesfontfaces" />
+    <x:param name="fontfaces" />
+    <x:param name="officestyles" />
+    <x:param name="stylesautostyles" />
+    <x:param name="contentautostyles" />
+    <x:param name="masterstyles" />
+    <x:param name="body" />
+    <xsl:apply-templates select="o:key" mode="call"/>
+   </x:template>
+
+   <x:template name="checkuniqueitem">
+    <x:param name="listname"/>
+    <x:param name="list"/>
+    <x:param name="item"/>
+    <x:if test="count($list[.=$item])!=1">
+     <x:message>
+      <x:value-of select="concat('The key with value &quot;', $item, '&quot; is used more than once in ', $listname, '.')"/>
+     </x:message>
+    </x:if>
+   </x:template>
+   
+   <x:template name="checkunique">
+    <x:param name="listname"/>
+    <x:param name="list"/>
+    <x:variable name="count">
+    </x:variable>
+    <x:for-each select="$list">
+     <x:call-template name="checkuniqueitem">
+      <x:with-param name="listname" select="$listname"/>
+      <x:with-param name="list" select="$list"/>
+      <x:with-param name="item" select="."/>
+     </x:call-template>
+    </x:for-each>
+   </x:template>
+   
+   <x:template name="verifyOccurance">
+    <x:param name="name"/>
+    <x:param name="definitions"/>
+    <x:param name="reference"/>
+    <x:if test="count($definitions[.=$reference])=0">
+     <x:message>
+      <x:value-of select="concat('There is no key with value &quot;', $reference, '&quot; in the key list ', $name, '.')"/>
+     </x:message>
+    </x:if>
+   </x:template>
+
+   <x:template name="checkReferences">
+    <x:param name="name"/>
+    <x:param name="definitions"/>
+    <x:param name="references"/>
+   
+    <x:call-template name="checkunique">
+     <x:with-param name="listname" select="$name"/>
+     <x:with-param name="list" select="$definitions"/>
+    </x:call-template>
+   
+    <x:for-each select="$references">
+     <x:call-template name="verifyOccurance">
+      <x:with-param name="name" select="$name"/>
+      <x:with-param name="definitions" select="$definitions"/>
+      <x:with-param name="reference" select="."/>
+     </x:call-template>
+    </x:for-each>
+   </x:template>
+
+   <x:template match="/office:document">
+    <x:call-template name="check">
+     <x:with-param name="stylesfontfaces" select="office:font-face-decls"/>
+     <x:with-param name="fontfaces" select="office:font-face-decls"/>
+     <x:with-param name="officestyles" select="office:styles"/>
+     <x:with-param name="stylesautostyles" select="office:automatic-styles"/>
+     <x:with-param name="contentautostyles" select="office:automatic-styles"/>
+     <x:with-param name="masterstyles" select="office:master-styles"/>
+     <x:with-param name="body" select="office:body"/>
+    </x:call-template>
+   </x:template>
+
+   <x:template match="/office:document-styles">
+    <x:call-template name="check">
+     <x:with-param name="stylesfontfaces" select="office:font-face-decls"/>
+     <x:with-param name="fontfaces" select="office:font-face-decls"/>
+     <x:with-param name="officestyles" select="office:styles"/>
+     <x:with-param name="stylesautostyles" select="office:automatic-styles"/>
+     <x:with-param name="contentautostyles" select="not-available"/>
+     <x:with-param name="masterstyles" select="office:master-styles"/>
+     <x:with-param name="body" select="not-available"/>
+    </x:call-template>
+   </x:template>
+
+   <x:template match="/office:document-content">
+    <x:variable name="stylesxml" select="document('styles.xml', .)/office:document-styles" />
+    <x:variable name="stylesfontfaces" select="$stylesxml/office:font-face-decls" />
+    <x:call-template name="check">
+     <x:with-param name="stylesfontfaces" select="$stylesfontfaces"/>
+     <x:with-param name="fontfaces" select="$stylesfontfaces|office:font-face-decls"/>
+     <x:with-param name="officestyles" select="$stylesxml/office:styles"/>
+     <x:with-param name="stylesautostyles" select="$stylesxml/office:automatic-styles"/>
+     <x:with-param name="contentautostyles" select="office:automatic-styles"/>
+     <x:with-param name="masterstyles" select="$stylesxml/office:master-styles"/>
+     <x:with-param name="body" select="office:body"/>
+    </x:call-template>
+   </x:template>
+  </x:stylesheet>
+ </xsl:template>
+
+</xsl:stylesheet>
diff --git a/apps/files_odfviewer/src/webodf/webodf/tools/refcheck/odfkeys.xml b/apps/files_odfviewer/src/webodf/webodf/tools/refcheck/odfkeys.xml
new file mode 100644
index 0000000000..e2ad06941c
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/tools/refcheck/odfkeys.xml
@@ -0,0 +1,455 @@
+<keys xmlns="urn:odfkeys"
+  xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
+  xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
+  xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0"
+  xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0"
+  xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
+  xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0"
+  xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0"
+  xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
+  >
+ <doc>
+  <h2>ODF reference checker</h2>
+  <p>ODF documents use string keys and references to link different parts of the document. There are quite a few different groups of keys. The description of how these keys work in the specification is not trivial to implement, because not keys behave differently depending on the context in which they are defined. E.g. a style has a family. If the family is 'text', then only certain attributes on certain elements in certain parts of the ODF document may refer to that style.</p>
+  <p>For a beginning and even intermediate ODF developer or document producer, this is quite complicated. Also, there is not currently an easy way to check if all the references are correct. This document aims to make it easier to figure out what groups of keys exist and from which elements they may be linked.</p>
+  <p>The document consists of one &lt;key> element for each group of keys. Each group has a name and is defined by one or more XPath expressions in &lt;def> elements. Any string that matches the XPath expression in a particular document is part of the set of keys of that group. Each key in a set must be unique.</p>
+  <p>In addition, each &lt;key> has a number of &lt;ref> elements that define the positions in the document where a key may be referenced. Each reference must exist in the set of keys that are found via the &lt;def> elements.</p>
+  <p>The format of this document is designed to be easy to read but also to make it easy to use in a reference checker. This document comes with checked implemented in XSL. The XSL is called bootstrap.xsl and is used in two transformation steps. Here is shown how to run the check with <tt>xsltproc</tt>:</p>
+  <pre>xsltproc bootstrap.xsl odfkeys.xml > checkkeys.xsl</pre>
+  <pre>xsltproc checkkeys.xsl content.xml</pre>
+  <p>The check can be run on content.xml files, on styles.xml files and on flat ODF files.</p>
+  <h2>Definitions</h2>
+  <dl>
+   <dt>$stylesfontfaces</dt>
+   <dd>This variable refers to the subset of font face definitions that are available to the style elements. Styles.xml may not refer to font faces defined in content.xml.</dd>
+   <dt>$fontfaces</dt>
+   <dd>This variable refers to all font face definitions.</dd>
+   <dt>$officestyles</dt>
+   <dd>This variable refers to the element office:styles.</dd>
+   <dt>$stylesautostyles</dt>
+   <dd>This variable refers to the element office:automatic-styles in styles.xml.</dd>
+   <dt>$contentautostyles</dt>
+   <dd>This variable refers to the element office:automatic-styles in content.xml. When evaluating a styles.xml document, it is an empty set.</dd>
+   <dt>$masterstyles</dt>
+   <dd>This variable refers to the office:master-styles element.</dd>
+   <dt>$body</dt>
+   <dd>This variable refers to the office:body element. When evaluating a styles.xml document, it is an empty set.</dd>
+  </dl>
+  <h2>TODO</h2> 
+  <ul>
+   <li>implement &lt;refs/> to check refs of type styleNameRefs</li>
+   <li>check for unused automatic styles</li>
+   <li>check that there are no circular dependencies in style inheritance</li>
+  </ul>
+ </doc>
+ <key name="gradient">
+  <def>$officestyles/draw:gradient/@draw:name</def>
+  <def>$officestyles/svg:linearGradient/@draw:name</def>
+  <def>$officestyles/svg:radialGradient/@draw:name</def>
+  <ref>$officestyles//@draw:fill-gradient-name</ref>
+  <ref>$stylesautostyles//@draw:fill-gradient-name</ref>
+  <ref>$contentautostyles//@draw:fill-gradient-name</ref>
+ </key>
+ <key name="hatch">
+  <def>$officestyles/draw:hatch/@draw:name</def>
+  <ref>$officestyles//@draw:fill-hatch-name</ref>
+  <ref>$stylesautostyles//@draw:fill-hatch-name</ref>
+  <ref>$contentautostyles//@draw:fill-hatch-name</ref>
+ </key>
+ <key name="fill-image">
+  <def>$officestyles/draw:fill-image/@draw:name</def>
+  <ref>$officestyles//@draw:fill-image-name</ref>
+  <ref>$stylesautostyles//@draw:fill-image-name</ref>
+  <ref>$contentautostyles//@draw:fill-image-name</ref>
+ </key>
+ <key name="marker">
+  <def>$officestyles/draw:marker/@draw:name</def>
+  <ref>$officestyles//@draw:marker-start</ref>
+  <ref>$officestyles//@draw:marker-end</ref>
+  <ref>$stylesautostyles//@draw:marker-start</ref>
+  <ref>$stylesautostyles//@draw:marker-end</ref>
+  <ref>$contentautostyles//@draw:marker-start</ref>
+  <ref>$contentautostyles//@draw:marker-end</ref>
+ </key>
+ <key name="stroke-dash">
+  <def>$officestyles/draw:stroke-dash/@draw:name</def>
+  <ref>$officestyles//@draw:stroke-dash</ref>
+  <ref>$stylesautostyles//@draw:stroke-dash</ref>
+  <ref>$contentautostyles//@draw:stroke-dash</ref>
+  <refs>$officestyles//@draw:stroke-dash-names</refs>
+  <refs>$stylesautostyles//@draw:stroke-dash-names</refs>
+  <refs>$contentautostyles//@draw:stroke-dash-names</refs>
+ </key>
+ <key name="opacity">
+  <def>$officestyles/draw:opacity/@draw:name</def>
+  <ref>$officestyles//@draw:opacity-name</ref>
+  <ref>$stylesautostyles//@draw:opacity-name</ref>
+  <ref>$contentautostyles//@draw:opacity-name</ref>
+ </key>
+ <key name="styles-font-face">
+  <def>$stylesfontfaces/style:font-face/@style:name</def>
+  <ref>$officestyles//style:text-properties/@style:font-name</ref>
+  <ref>$officestyles//style:text-properties/@style:font-name-asian</ref>
+  <ref>$officestyles//style:text-properties/@style:font-name-complex</ref>
+  <ref>$officestyles//style:list-level-properties/@style:font-name</ref>
+  <ref>$stylesautostyles//style:text-properties/@style:font-name</ref>
+  <ref>$stylesautostyles//style:text-properties/@style:font-name-asian</ref>
+  <ref>$stylesautostyles//style:text-properties/@style:font-name-complex</ref>
+  <ref>$stylesautostyles//style:list-level-properties/@style:font-name</ref>
+ </key>
+ <key name="font-face">
+  <def>$fontfaces/style:font-face/@style:name</def>
+  <ref>$contentautostyles//style:text-properties/@style:font-name</ref>
+  <ref>$contentautostyles//style:text-properties/@style:font-name-asian</ref>
+  <ref>$contentautostyles//style:text-properties/@style:font-name-complex</ref>
+  <ref>$contentautostyles//style:list-level-properties/@style:font-name</ref>
+ </key>
+ <key name="master-page">
+  <def>$masterstyles/style:master-page/@style:name</def>
+  <!--draw:master-page-name-->
+  <ref>$body/office:drawing/draw:page/@draw:master-page-name</ref>
+  <ref>$body/office:presentation/draw:page/@draw:master-page-name</ref>
+  <!--style:master-page-name-->
+  <ref>$officestyles/style:style[@style:family='paragraph']/@style:master-page-name</ref>
+  <ref>$officestyles/style:style[@style:family='table']/@style:master-page-name</ref>
+  <ref>$stylesautostyles/style:style[@style:family='paragraph']/@style:master-page-name</ref>
+  <ref>$stylesautostyles/style:style[@style:family='table']/@style:master-page-name</ref>
+  <ref>$contentautostyles/style:style[@style:family='paragraph']/@style:master-page-name</ref>
+  <ref>$contentautostyles/style:style[@style:family='table']/@style:master-page-name</ref>
+  <!--style:next-style-name-->
+  <ref>$masterstyles/style:master-page/@style:next-style-name</ref>
+  <!--text:master-page-name-->
+  <ref>$officestyles/text:notes-configuration/@text:master-page-name</ref>
+  <ref>$officestyles/style:default-style[@style:family='section']/style:section-properties/text:notes-configuration/@text:master-page-name</ref>
+  <ref>$officestyles/style:style[@style:family='section']/style:section-properties/text:notes-configuration/@text:master-page-name</ref>
+  <ref>$stylesautostyles/style:style[@style:family='section']/style:section-properties/text:notes-configuration/@text:master-page-name</ref>
+  <ref>$contentautostyles/style:style[@style:family='section']/style:section-properties/text:notes-configuration/@text:master-page-name</ref>
+  <ref>$body/office:text/text:page-sequence/text:page/@text:master-page-name</ref>
+  <!--style:parent-style-name: not handled: likely an error in the specification -->
+ </key>
+ <key name="presentation-page-layout">
+  <def>$officestyles/style:presentation-page-layout/@style:name</def>
+  <ref>$masterstyles/style:handout-master/@presentation:presentation-page-layout-name</ref>
+  <ref>$body/office:drawing/draw:page/@presentation:presentation-page-layout-name</ref>
+  <ref>$body/office:presentation/draw:page/@presentation:presentation-page-layout-name</ref>
+ </key>
+ <key name="styles-page-layout">
+  <def>$stylesautostyles/style:page-layout/@style:name</def>
+  <ref>$masterstyles/style:master-page/@style:page-layout-name</ref>
+  <ref>$masterstyles/style:master-page/presentation:notes/@style:page-layout-name</ref>
+  <ref>$masterstyles/style:handout-master/@style:page-layout-name</ref>
+ </key>
+ <key name="content-page-layout">
+  <def>$contentautostyles/style:page-layout/@style:name</def>
+  <ref>$body/office:presentation/draw:page/presentation:notes/@style:page-layout-name</ref>
+ </key>
+ <key name="common-list-styles">
+  <def>$officestyles/text:list-style/@style:name</def>
+  <def>$officestyles//style:graphic-properties/text:list-style/@style:name</def>
+  <ref emptyok="true">$officestyles/style:style/@style:list-style-name</ref>
+ </key>
+ <key name="styles-list-styles" extends="common-list-styles">
+  <def>$stylesautostyles/text:list-style/@style:name</def>
+  <def>$stylesautostyles//style:graphic-properties/text:list-style/@style:name</def>
+  <ref emptyok="true">$stylesautostyles/style:style/@style:list-style-name</ref>
+  <ref>$masterstyles//text:list/@text:style-name</ref>
+  <ref>$masterstyles//text:numbered-paragraphs/@text:style-name</ref>
+  <ref>$masterstyles//text:list-item/@text:style-override</ref>
+ </key>
+ <key name="content-list-styles" extends="common-list-styles">
+  <def>$contentautostyles/text:list-style/@style:name</def>
+  <def>$contentautostyles//style:graphic-properties/text:list-style/@style:name</def>
+  <ref emptyok="true">$contentautostyles/style:style/@style:list-style-name</ref>
+  <ref>$body//text:list/@text:style-name</ref>
+  <ref>$body//text:numbered-paragraphs/@text:style-name</ref>
+  <ref>$body//text:list-item/@text:style-override</ref>
+ </key>
+ <key name="common-data-styles">
+  <def>$officestyles/number:number-style/@style:name</def>
+  <def>$officestyles/number:currency-style/@style:name</def>
+  <def>$officestyles/number:percentage-style/@style:name</def>
+  <def>$officestyles/number:date-style/@style:name</def>
+  <def>$officestyles/number:time-style/@style:name</def>
+  <def>$officestyles/number:boolean-style/@style:name</def>
+  <def>$officestyles/number:text-style/@style:name</def>
+  <ref>$officestyles/style:style/@style:data-style-name</ref>
+  <ref>$officestyles/style:style/@style:percentage-data-style-name</ref>
+ </key>
+ <key name="styles-data-styles" extends="common-data-styles">
+  <def>$stylesautostyles/number:number-style/@style:name</def>
+  <def>$stylesautostyles/number:currency-style/@style:name</def>
+  <def>$stylesautostyles/number:percentage-style/@style:name</def>
+  <def>$stylesautostyles/number:date-style/@style:name</def>
+  <def>$stylesautostyles/number:time-style/@style:name</def>
+  <def>$stylesautostyles/number:boolean-style/@style:name</def>
+  <def>$stylesautostyles/number:text-style/@style:name</def>
+  <ref>$stylesautostyles/style:style/@style:data-style-name</ref>
+  <ref>$stylesautostyles/style:style/@style:percentage-data-style-name</ref>
+  <ref>$masterstyles//text:creation-date/@style:data-style-name</ref>
+  <ref>$masterstyles//text:creation-time/@style:data-style-name</ref>
+  <ref>$masterstyles//text:database-display/@style:data-style-name</ref>
+  <ref>$masterstyles//text:date/@style:data-style-name</ref>
+  <ref>$masterstyles//text:editing-duration/@style:data-style-name</ref>
+  <ref>$masterstyles//text:expression/@style:data-style-name</ref>
+  <ref>$masterstyles//text:meta-field/@style:data-style-name</ref>
+  <ref>$masterstyles//text:modification-date/@style:data-style-name</ref>
+  <ref>$masterstyles//text:modification-time/@style:data-style-name</ref>
+  <ref>$masterstyles//text:print-date/@style:data-style-name</ref>
+  <ref>$masterstyles//text:print-time/@style:data-style-name</ref>
+  <ref>$masterstyles//text:table-formula/@style:data-style-name</ref>
+  <ref>$masterstyles//text:time/@style:data-style-name</ref>
+  <ref>$masterstyles//text:user-defined/@style:data-style-name</ref>
+  <ref>$masterstyles//text:user-field-get/@style:data-style-name</ref>
+  <ref>$masterstyles//text:user-field-input/@style:data-style-name</ref>
+  <ref>$masterstyles//text:variable-get/@style:data-style-name</ref>
+  <ref>$masterstyles//text:variable-input/@style:data-style-name</ref>
+  <ref>$masterstyles//text:variable-set/@style:data-style-name</ref>
+ </key>
+ <key name="content-data-styles" extends="common-data-styles">
+  <def>$contentautostyles/number:number-style/@style:name</def>
+  <def>$contentautostyles/number:currency-style/@style:name</def>
+  <def>$contentautostyles/number:percentage-style/@style:name</def>
+  <def>$contentautostyles/number:date-style/@style:name</def>
+  <def>$contentautostyles/number:time-style/@style:name</def>
+  <def>$contentautostyles/number:boolean-style/@style:name</def>
+  <def>$contentautostyles/number:text-style/@style:name</def>
+  <ref>$contentautostyles/style:style/@style:data-style-name</ref>
+  <ref>$contentautostyles/style:style/@style:percentage-data-style-name</ref>
+  <ref>$body/office:presentation/presentation:date-time-decl/@style:data-style-name</ref>
+  <ref>$body//text:creation-date/@style:data-style-name</ref>
+  <ref>$body//text:creation-time/@style:data-style-name</ref>
+  <ref>$body//text:database-display/@style:data-style-name</ref>
+  <ref>$body//text:date/@style:data-style-name</ref>
+  <ref>$body//text:editing-duration/@style:data-style-name</ref>
+  <ref>$body//text:expression/@style:data-style-name</ref>
+  <ref>$body//text:meta-field/@style:data-style-name</ref>
+  <ref>$body//text:modification-date/@style:data-style-name</ref>
+  <ref>$body//text:modification-time/@style:data-style-name</ref>
+  <ref>$body//text:print-date/@style:data-style-name</ref>
+  <ref>$body//text:print-time/@style:data-style-name</ref>
+  <ref>$body//text:table-formula/@style:data-style-name</ref>
+  <ref>$body//text:time/@style:data-style-name</ref>
+  <ref>$body//text:user-defined/@style:data-style-name</ref>
+  <ref>$body//text:user-field-get/@style:data-style-name</ref>
+  <ref>$body//text:user-field-input/@style:data-style-name</ref>
+  <ref>$body//text:variable-get/@style:data-style-name</ref>
+  <ref>$body//text:variable-input/@style:data-style-name</ref>
+  <ref>$body//text:variable-set/@style:data-style-name</ref>
+ </key>
+ <key name="common-chart-style">
+  <def>$officestyles/style:style[@style:family='chart']/@style:name</def>
+  <ref>$officestyles/style:style[@style:family='chart']/@style:parent-style-name</ref>
+  <ref>$stylesautostyles/style:style[@style:family='chart']/@style:parent-style-name</ref>
+  <ref>$contentautostyles/style:style[@style:family='chart']/@style:parent-style-name</ref>
+ </key>
+ <key name="styles-chart-style" extends="common-chart-style">
+  <def>$stylesautostyles/style:style[@style:family='chart']/@style:name</def>
+  <ref>$masterstyles//chart:axis/@chart:style-name</ref>
+  <ref>$masterstyles//chart:chart/@chart:style-name</ref>
+  <ref>$masterstyles//chart:data-label/@chart:style-name</ref>
+  <ref>$masterstyles//chart:data-point/@chart:style-name</ref>
+  <ref>$masterstyles//chart:equation/@chart:style-name</ref>
+  <ref>$masterstyles//chart:error-indicator/@chart:style-name</ref>
+  <ref>$masterstyles//chart:floor/@chart:style-name</ref>
+  <ref>$masterstyles//chart:footer/@chart:style-name</ref>
+  <ref>$masterstyles//chart:grid/@chart:style-name</ref>
+  <ref>$masterstyles//chart:legend/@chart:style-name</ref>
+  <ref>$masterstyles//chart:mean-value/@chart:style-name</ref>
+  <ref>$masterstyles//chart:plot-area/@chart:style-name</ref>
+  <ref>$masterstyles//chart:regression-curve/@chart:style-name</ref>
+  <ref>$masterstyles//chart:series/@chart:style-name</ref>
+  <ref>$masterstyles//chart:stock-gain-marker/@chart:style-name</ref>
+  <ref>$masterstyles//chart:stock-loss-marker/@chart:style-name</ref>
+  <ref>$masterstyles//chart:stock-range-line/@chart:style-name</ref>
+  <ref>$masterstyles//chart:subtitle/@chart:style-name</ref>
+  <ref>$masterstyles//chart:title/@chart:style-name</ref>
+  <ref>$masterstyles//chart:wall/@chart:style-name</ref>
+ </key>
+ <key name="content-chart-style" extends="common-chart-style">
+  <def>$contentautostyles/style:style[@style:family='chart']/@style:name</def>
+  <ref>$body//chart:axis/@chart:style-name</ref>
+  <ref>$body//chart:chart/@chart:style-name</ref>
+  <ref>$body//chart:data-label/@chart:style-name</ref>
+  <ref>$body//chart:data-point/@chart:style-name</ref>
+  <ref>$body//chart:equation/@chart:style-name</ref>
+  <ref>$body//chart:error-indicator/@chart:style-name</ref>
+  <ref>$body//chart:floor/@chart:style-name</ref>
+  <ref>$body//chart:footer/@chart:style-name</ref>
+  <ref>$body//chart:grid/@chart:style-name</ref>
+  <ref>$body//chart:legend/@chart:style-name</ref>
+  <ref>$body//chart:mean-value/@chart:style-name</ref>
+  <ref>$body//chart:plot-area/@chart:style-name</ref>
+  <ref>$body//chart:regression-curve/@chart:style-name</ref>
+  <ref>$body//chart:series/@chart:style-name</ref>
+  <ref>$body//chart:stock-gain-marker/@chart:style-name</ref>
+  <ref>$body//chart:stock-loss-marker/@chart:style-name</ref>
+  <ref>$body//chart:stock-range-line/@chart:style-name</ref>
+  <ref>$body//chart:subtitle/@chart:style-name</ref>
+  <ref>$body//chart:title/@chart:style-name</ref>
+  <ref>$body//chart:wall/@chart:style-name</ref>
+ </key>
+ <key name="common-ruby-style">
+  <def>$officestyles/style:style[@style:family='ruby']/@style:name</def>
+  <ref>$officestyles/style:style[@style:family='ruby']/@style:parent-style-name</ref>
+  <ref>$stylesautostyles/style:style[@style:family='ruby']/@style:parent-style-name</ref>
+  <ref>$contentautostyles/style:style[@style:family='ruby']/@style:parent-style-name</ref>
+ </key>
+ <key name="styles-ruby-style" extends="common-ruby-style">
+  <def>$stylesautostyles/style:style[@style:family='ruby']/@style:name</def>
+  <ref>$masterstyles//text:ruby/@text:style-name</ref>
+ </key>
+ <key name="content-ruby-style" extends="common-ruby-style">
+  <def>$contentautostyles/style:style[@style:family='ruby']/@style:name</def>
+  <ref>$body//text:ruby/@text:style-name</ref>
+ </key>
+<!-- clearly unfinished below here: more refs needed -->
+ <key name="common-text-style">
+  <def>$officestyles/style:style[@style:family='text']/@style:name</def>
+  <ref>$officestyles/style:style[@style:family='text']/@style:parent-style-name</ref>
+  <ref>$stylesautostyles/style:style[@style:family='text']/@style:parent-style-name</ref>
+  <ref>$contentautostyles/style:style[@style:family='text']/@style:parent-style-name</ref>
+ </key>
+ <key name="styles-text-style" extends="common-text-style">
+  <def>$stylesautostyles/style:style[@style:family='text']/@style:name</def>
+  <ref>$masterstyles//text:span/@text:style-name</ref>
+ </key>
+ <key name="content-text-style" extends="common-text-style">
+  <def>$contentautostyles/style:style[@style:family='text']/@style:name</def>
+  <ref>$body//text:span/@text:style-name</ref>
+ </key>
+ <key name="common-paragraph-style">
+  <def>$officestyles/style:style[@style:family='paragraph']/@style:name</def>
+  <ref>$officestyles/style:style[@style:family='paragraph']/@style:parent-style-name</ref>
+  <ref>$stylesautostyles/style:style[@style:family='paragraph']/@style:parent-style-name</ref>
+  <ref>$contentautostyles/style:style[@style:family='paragraph']/@style:parent-style-name</ref>
+ </key>
+ <key name="styles-paragraph-style" extends="common-paragraph-style">
+  <def>$stylesautostyles/style:style[@style:family='paragraph']/@style:name</def>
+  <ref>$masterstyles//text:p/@text:style-name</ref>
+ </key>
+ <key name="content-paragraph-style" extends="common-paragraph-style">
+  <def>$contentautostyles/style:style[@style:family='paragraph']/@style:name</def>
+  <ref>$body//text:p/@text:style-name</ref>
+ </key>
+ <key name="common-section-style">
+  <def>$officestyles/style:style[@style:family='section']/@style:name</def>
+  <ref>$officestyles/style:style[@style:family='section']/@style:parent-style-name</ref>
+  <ref>$stylesautostyles/style:style[@style:family='section']/@style:parent-style-name</ref>
+  <ref>$contentautostyles/style:style[@style:family='section']/@style:parent-style-name</ref>
+ </key>
+ <key name="styles-section-style" extends="common-section-style">
+  <def>$stylesautostyles/style:style[@style:family='section']/@style:name</def>
+  <ref>$masterstyles//text:alphabetical-index/@text:style-name</ref>
+ </key>
+ <key name="content-section-style" extends="common-section-style">
+  <def>$contentautostyles/style:style[@style:family='section']/@style:name</def>
+  <ref>$body//text:alphabetical-index/@text:style-name</ref>
+ </key>
+
+ <key name="common-table-style">
+  <def>$officestyles/style:style[@style:family='table']/@style:name</def>
+  <ref>$officestyles/style:style[@style:family='table']/@style:parent-style-name</ref>
+  <ref>$stylesautostyles/style:style[@style:family='table']/@style:parent-style-name</ref>
+  <ref>$contentautostyles/style:style[@style:family='table']/@style:parent-style-name</ref>
+ </key>
+ <key name="styles-table-style" extends="common-table-style">
+  <def>$stylesautostyles/style:style[@style:family='table']/@style:name</def>
+  <ref>$masterstyles//table:table/@table:style-name</ref>
+ </key>
+ <key name="content-table-style" extends="common-table-style">
+  <def>$contentautostyles/style:style[@style:family='table']/@style:name</def>
+  <ref>$body//table:table/@table:style-name</ref>
+ </key>
+
+ <key name="common-table-column-style">
+  <def>$officestyles/style:style[@style:family='table-column']/@style:name</def>
+  <ref>$officestyles/style:style[@style:family='table-column']/@style:parent-style-name</ref>
+  <ref>$stylesautostyles/style:style[@style:family='table-column']/@style:parent-style-name</ref>
+  <ref>$contentautostyles/style:style[@style:family='table-column']/@style:parent-style-name</ref>
+ </key>
+ <key name="styles-table-column-style" extends="common-table-column-style">
+  <def>$stylesautostyles/style:style[@style:family='table-column']/@style:name</def>
+  <ref>$masterstyles//table:table-column/@table:style-name</ref>
+ </key>
+ <key name="content-table-column-style" extends="common-table-column-style">
+  <def>$contentautostyles/style:style[@style:family='table-column']/@style:name</def>
+  <ref>$body//table:table-column/@table:style-name</ref>
+ </key>
+
+ <key name="common-table-row-style">
+  <def>$officestyles/style:style[@style:family='table-row']/@style:name</def>
+  <ref>$officestyles/style:style[@style:family='table-row']/@style:parent-style-name</ref>
+  <ref>$stylesautostyles/style:style[@style:family='table-row']/@style:parent-style-name</ref>
+  <ref>$contentautostyles/style:style[@style:family='table-row']/@style:parent-style-name</ref>
+ </key>
+ <key name="styles-table-row-style" extends="common-table-row-style">
+  <def>$stylesautostyles/style:style[@style:family='table-row']/@style:name</def>
+  <ref>$masterstyles//table:table-row/@table:style-name</ref>
+ </key>
+ <key name="content-table-row-style" extends="common-table-row-style">
+  <def>$contentautostyles/style:style[@style:family='table-row']/@style:name</def>
+  <ref>$body//table:table-row/@table:style-name</ref>
+ </key>
+
+ <key name="common-table-cell-style">
+  <def>$officestyles/style:style[@style:family='table-cell']/@style:name</def>
+  <ref>$officestyles/style:style[@style:family='table-cell']/@style:parent-style-name</ref>
+  <ref>$stylesautostyles/style:style[@style:family='table-cell']/@style:parent-style-name</ref>
+  <ref>$contentautostyles/style:style[@style:family='table-cell']/@style:parent-style-name</ref>
+ </key>
+ <key name="styles-table-cell-style" extends="common-table-cell-style">
+  <def>$stylesautostyles/style:style[@style:family='table-cell']/@style:name</def>
+  <ref>$masterstyles//table:table-cell/@table:style-name</ref>
+ </key>
+ <key name="content-table-cell-style" extends="common-table-cell-style">
+  <def>$contentautostyles/style:style[@style:family='table-cell']/@style:name</def>
+  <ref>$body//table:table-cell/@table:style-name</ref>
+ </key>
+
+ <key name="common-graphic-style">
+  <def>$officestyles/style:style[@style:family='graphic']/@style:name</def>
+  <ref>$officestyles/style:style[@style:family='graphic']/@style:parent-style-name</ref>
+  <ref>$stylesautostyles/style:style[@style:family='graphic']/@style:parent-style-name</ref>
+  <ref>$contentautostyles/style:style[@style:family='graphic']/@style:parent-style-name</ref>
+ </key>
+ <key name="styles-graphic-style" extends="common-graphic-style">
+  <def>$stylesautostyles/style:style[@style:family='graphic']/@style:name</def>
+  <ref>$masterstyles//draw:rect/@draw:style-name</ref>
+ </key>
+ <key name="content-graphic-style" extends="common-graphic-style">
+  <def>$contentautostyles/style:style[@style:family='graphic']/@style:name</def>
+  <ref>$body//draw:rect/@draw:style-name</ref>
+ </key>
+
+ <key name="common-presentation-style">
+  <def>$officestyles/style:style[@style:family='presentation']/@style:name</def>
+  <ref>$officestyles/style:style[@style:family='presentation']/@style:parent-style-name</ref>
+  <ref>$stylesautostyles/style:style[@style:family='presentation']/@style:parent-style-name</ref>
+  <ref>$contentautostyles/style:style[@style:family='presentation']/@style:parent-style-name</ref>
+ </key>
+ <key name="styles-presentation-style" extends="common-presentation-style">
+  <def>$stylesautostyles/style:style[@style:family='presentation']/@style:name</def>
+  <ref>$masterstyles//draw:rect/@presentation:style-name</ref>
+ </key>
+ <key name="content-presentation-style" extends="common-presentation-style">
+  <def>$contentautostyles/style:style[@style:family='presentation']/@style:name</def>
+  <ref>$body//draw:rect/@presentation:style-name</ref>
+ </key>
+
+ <key name="common-drawing-page-style">
+  <def>$officestyles/style:style[@style:family='drawing-page']/@style:name</def>
+  <ref>$officestyles/style:style[@style:family='drawing-page']/@style:parent-style-name</ref>
+  <ref>$stylesautostyles/style:style[@style:family='drawing-page']/@style:parent-style-name</ref>
+  <ref>$contentautostyles/style:style[@style:family='drawing-page']/@style:parent-style-name</ref>
+ </key>
+ <key name="styles-drawing-page-style" extends="common-drawing-page-style">
+  <def>$stylesautostyles/style:style[@style:family='drawing-page']/@style:name</def>
+  <ref>$masterstyles/style:handout-master/@draw:style-name</ref>
+ </key>
+ <key name="content-drawing-page-style" extends="common-drawing-page-style">
+  <def>$contentautostyles/style:style[@style:family='drawing-page']/@style:name</def>
+  <ref>$body/office:drawing/draw:page/@draw:style-name</ref>
+  <ref>$body/office:presentation/draw:page/@draw:style-name</ref>
+ </key>
+
+</keys>
diff --git a/apps/files_odfviewer/src/webodf/webodf/tools/runjslint.js b/apps/files_odfviewer/src/webodf/webodf/tools/runjslint.js
new file mode 100644
index 0000000000..c0d28dc77d
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/tools/runjslint.js
@@ -0,0 +1,98 @@
+/**
+ * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
+ * @licstart
+ * The JavaScript code in this page is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU Affero General Public License
+ * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.  The code is distributed
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
+ *
+ * As additional permission under GNU AGPL version 3 section 7, you
+ * may distribute non-source (e.g., minimized or compacted) forms of
+ * that code without the copy of the GNU GPL normally required by
+ * section 4, provided you include this license notice and a URL
+ * through which recipients can access the Corresponding Source.
+ *
+ * As a special exception to the AGPL, any HTML file which merely makes function
+ * calls to this code, and for that purpose includes it by reference shall be
+ * deemed a separate work for copyright law purposes. In addition, the copyright
+ * holders of this code give you permission to combine this code with free
+ * software libraries that are released under the GNU LGPL. You may copy and
+ * distribute such a system following the terms of the GNU AGPL for this code
+ * and the LGPL for the libraries. If you modify this code, you may extend this
+ * exception to your version of the code, but you are not obligated to do so.
+ * If you do not wish to do so, delete this exception statement from your
+ * version.
+ *
+ * This license applies to this entire compilation.
+ * @licend
+ * @source: http://www.webodf.org/
+ * @source: http://gitorious.org/odfkit/webodf/
+ */
+/*global runtime: true, core: true*/
+runtime.loadClass("core.JSLint");
+
+function checkWithJSLINT(file) {
+    "use strict";
+    var i, jslint = new core.JSLint().JSLINT,
+        jslintconfig = {
+            anon:       false, // true, if the space may be omitted in anonymous function declarations
+            bitwise:    false, // if bitwise operators should be allowed
+            browser:    false, // if the standard browser globals should be predefined
+            cap:        false, // if upper case HTML should be allowed
+            'continue': false, // if the continuation statement should be tolerated
+            css:        false, // if CSS workarounds should be tolerated
+            debug:      false, // if debugger statements should be allowed
+            devel:      false, // if logging should be allowed (console, alert, etc.)
+            eqeq:       false, // if == should be allowed
+            es5:        false, // if ES5 syntax should be allowed
+            evil:       false, // if eval should be allowed
+            forin:      false, // if for in statements need not filter
+            fragment:   false, // if HTML fragments should be allowed
+            indent:     4, // the indentation factor
+            maxerr:     10, // the maximum number of errors to allow
+            //maxlen:     300, // the maximum length of a source line
+            newcap:     false, // if constructor names capitalization is ignored
+            node:       false, // if Node.js globals should be predefined
+            nomen:      false, // if names may have dangling _
+            on:         false, // if HTML event handlers should be allowed
+            passfail:   true,  // if the scan should stop on first error
+            plusplus:   false, // if increment/decrement should be allowed
+            properties: false, // if all property names must be declared with /*properties*/
+            regexp:     false, // if the . should be allowed in regexp literals
+            rhino:      false, // if the Rhino environment globals should be predefined
+            undef:      false, // if variables can be declared out of order
+            unparam:    false, // if unused parameters should be tolerated
+            safe:       false, // if use of some browser features should be restricted
+            sloppy:     false, // if the 'use strict'; pragma is optional
+            stupid:     true,  // true if stupid practices are tolerated
+            sub:        false, // if all forms of subscript notation are tolerated
+            vars:       false, // if multiple var statements per function should be allowed
+            white:      true,  // if sloppy whitespace is tolerated
+            widget:     false, // if the Yahoo Widgets globals should be predefined
+            windows:    false  // if MS Windows-specific globals should be predefined
+        },
+        data, result, err;
+
+    // these files are an exception for now
+    if (file === "lib/core/RawInflate.js") {
+        return;
+    }
+
+    data = runtime.readFileSync(file, "utf-8");
+    result = jslint(data, jslintconfig);
+    if (!result) {
+        for (i = 0; i < jslint.errors.length && jslint.errors[i]; i += 1) {
+            err = jslint.errors[i];
+            runtime.log(file + ":" + err.line + ":" + err.character +
+                ": error: " + err.reason);
+        }
+        runtime.exit(1);
+    }
+}
+
+var i;
+for (i = 0; i < arguments.length; i += 1) {
+    checkWithJSLINT(arguments[i]);
+}
diff --git a/apps/files_odfviewer/src/webodf/webodf/webodf.css b/apps/files_odfviewer/src/webodf/webodf/webodf.css
new file mode 100644
index 0000000000..dbd6686a26
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/webodf.css
@@ -0,0 +1,200 @@
+@namespace draw url(urn:oasis:names:tc:opendocument:xmlns:drawing:1.0);
+@namespace fo url(urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0);
+@namespace office url(urn:oasis:names:tc:opendocument:xmlns:office:1.0);
+@namespace presentation url(urn:oasis:names:tc:opendocument:xmlns:presentation:1.0);
+@namespace style url(urn:oasis:names:tc:opendocument:xmlns:style:1.0);
+@namespace svg url(urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0);
+@namespace table url(urn:oasis:names:tc:opendocument:xmlns:table:1.0);
+@namespace text url(urn:oasis:names:tc:opendocument:xmlns:text:1.0);
+@namespace runtimens url(urn:webodf); /* namespace for runtime only */
+
+office|document > *, office|document-content > * {
+  display: none;
+}
+office|body, office|document {
+  display: inline-block;
+  position: relative;
+}
+
+text|p, text|h {
+  display: block;
+  padding: 3px 3px 3px 3px;
+  margin: 5px 5px 5px 5px;
+}
+text|h {
+  font-weight: bold;
+}
+*[runtimens|containsparagraphanchor] {
+  position: relative;
+}
+text|s:before { /* this needs to be the number of spaces given by text:c */
+  content: ' ';
+}
+text|tab:before {
+  display: inline;
+  content: '        ';
+}
+text|line-break {
+  content: " ";
+  display: block;
+}
+text|tracked-changes {
+  /*Consumers that do not support change tracking, should ignore changes.*/
+  display: none;
+}
+office|binary-data {
+  display: none;
+}
+office|text {
+  display: block;
+  width: 216mm; /* default to A4 width */
+  min-height: 279mm;
+  padding-left: 32mm;
+  padding-right: 32mm;
+  padding-top: 25mm;
+  padding-bottom: 13mm;
+  margin: 2px;
+  text-align: left;
+  overflow: hidden;
+}
+office|spreadsheet {
+  display: block;
+  border-collapse: collapse;
+  empty-cells: show;
+  font-family: sans-serif;
+  font-size: 10pt;
+  text-align: left;
+  page-break-inside: avoid;
+  overflow: hidden;
+}
+office|presentation {
+  display: inline-block;
+  text-align: left;
+}
+draw|page {
+  display: block;
+  height: 21cm;
+  width: 28cm;
+  margin: 3px;
+  position: relative;
+  overflow: hidden;
+}
+presentation|notes {
+    display: none;
+}
+@media print {
+  draw|page {
+    border: 1pt solid black;
+    page-break-inside: avoid;
+  }
+  presentation|notes {
+    /*TODO*/
+  }
+}
+office|spreadsheet text|p {
+  border: 0px;
+  padding: 1px;
+  margin: 0px;
+}
+office|spreadsheet table|table {
+  margin: 3px;
+}
+office|spreadsheet table|table:after {
+  /* show sheet name the end of the sheet */
+  /*content: attr(table|name);*/ /* gives parsing error in opera */
+}
+office|spreadsheet table|table-row {
+  counter-increment: row;
+}
+office|spreadsheet table|table-row:before {
+  width: 3em;
+  background: #cccccc;
+  border: 1px solid black;
+  text-align: center;
+  content: counter(row);
+}
+office|spreadsheet table|table-cell {
+  border: 1px solid #cccccc;
+}
+table|table {
+  display: table;
+}
+draw|frame table|table {
+  width: 100%;
+  height: 100%;
+  background: white;
+}
+table|table-row {
+  display: table-row;
+}
+table|table-column {
+  display: table-column;
+}
+table|table-cell {
+  display: table-cell;
+}
+draw|frame {
+  display: block;
+}
+draw|image {
+  display: block;
+  width: 100%;
+  height: 100%;
+  top: 0px;
+  left: 0px;
+  background-repeat: no-repeat;
+  background-size: 100% 100%;
+  -moz-background-size: 100% 100%;
+}
+/* only show the first image in frame */
+draw|frame > draw|image:nth-of-type(n+2) {
+  display: none;
+}
+text|list {
+    display: block;
+    padding-left: 1.5em;
+    counter-reset: list;
+}
+text|list-item {
+    display: block;
+}
+text|list-item:before {
+    display: inline-block;
+    content: '•';
+    counter-increment: list;
+    width: 0.5em;
+    margin-left: -0.5em;
+    padding: 0px;
+    border: 0px;
+}
+text|list-item > *:first-child {
+    display: inline-block;
+}
+text|a {
+    color: blue;
+    text-decoration: underline;
+}
+text|note-citation {
+    vertical-align: super;
+    font-size: smaller;
+}
+text|note-body {
+    display: none;
+}
+text|note:hover text|note-citation {
+    background: #dddddd;
+}
+text|note:hover text|note-body {
+    display: block;
+    left:1em;
+    max-width: 80%;
+    position: absolute;
+    background: #ffffaa;
+}
+svg|title, svg|desc {
+    display: none;
+}
+video {
+  width:100%;
+  height:100%
+}
diff --git a/apps/files_odfviewer/src/webodf/webodf/xmledit/gui.js b/apps/files_odfviewer/src/webodf/webodf/xmledit/gui.js
new file mode 100644
index 0000000000..e38c286aae
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/xmledit/gui.js
@@ -0,0 +1,119 @@
+/**
+ * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
+ * @licstart
+ * The JavaScript code in this page is free software: you can redistribute it
+ * and/or modify it under the terms of the GNU Affero General Public License
+ * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
+ * the License, or (at your option) any later version.  The code is distributed
+ * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
+ *
+ * As additional permission under GNU AGPL version 3 section 7, you
+ * may distribute non-source (e.g., minimized or compacted) forms of
+ * that code without the copy of the GNU GPL normally required by
+ * section 4, provided you include this license notice and a URL
+ * through which recipients can access the Corresponding Source.
+ *
+ * As a special exception to the AGPL, any HTML file which merely makes function
+ * calls to this code, and for that purpose includes it by reference shall be
+ * deemed a separate work for copyright law purposes. In addition, the copyright
+ * holders of this code give you permission to combine this code with free
+ * software libraries that are released under the GNU LGPL. You may copy and
+ * distribute such a system following the terms of the GNU AGPL for this code
+ * and the LGPL for the libraries. If you modify this code, you may extend this
+ * exception to your version of the code, but you are not obligated to do so.
+ * If you do not wish to do so, delete this exception statement from your
+ * version.
+ *
+ * This license applies to this entire compilation.
+ * @licend
+ * @source: http://www.webodf.org/
+ * @source: http://gitorious.org/odfkit/webodf/
+ */
+/*global Ext runtime gui*/
+runtime.loadClass("gui.XMLEdit");
+
+function createXMLEdit(element, url) {
+    var head = element.ownerDocument.getElementsByTagName("head")[0],
+        xmlcss = element.ownerDocument.createElement("style"),
+        xmledt;
+
+    xmlcss.type = "text/css";
+    head.appendChild(xmlcss);
+    xmledt = new gui.XMLEdit(element, xmlcss);
+    runtime.loadXML(url, function (err, xml) {
+        if (xml.documentElement) {
+            xmledt.setXML(xml);
+        }
+    });
+}
+
+function loadXML(url, panel, title) {
+    title = title || url;
+    var tab = panel.find('url', url),
+        newTab;
+    if (tab.length) {
+        panel.setActiveTab(tab[0]);
+        return;
+    }
+    newTab = new Ext.BoxComponent({
+        title: title,
+        tabTip: url,
+        url: url,
+        closable: true,
+        autoEl: {
+            tag: 'div'
+        },
+        region: 'center'
+    });
+    panel.add(newTab);
+    panel.setActiveTab(newTab);
+
+    createXMLEdit(newTab.el.dom, url);
+}
+
+Ext.onReady(function () {
+    var tabpanel, tree, viewport, attributeEditor;
+
+    Ext.QuickTips.init();
+
+    tabpanel = new Ext.TabPanel({
+        tbar: [  ],
+        region: 'center'
+    });
+
+    attributeEditor = new Ext.grid.PropertyGrid({
+        title: 'Attributes',
+        region: 'east',
+        width: 200,
+        split: true,
+        autoScroll: true,
+        collapsible: true,
+        rootVisible: false,
+        enableTabScroll: true,
+        defaults: {autoScroll: true}
+    });
+
+    tree = new Ext.tree.TreePanel({
+        title: 'Documents',
+        region: 'west',
+        width: 200,
+        split: true,
+        autoScroll: true,
+        collapsible: true,
+        rootVisible: false,
+        enableTabScroll: true,
+        defaults: {autoScroll: true},
+        collapsed: true,
+        root: { nodeType: 'node' }
+    });
+
+    viewport = new Ext.Viewport({
+        layout: 'border',
+        items: [ tabpanel, tree, attributeEditor ]
+    });
+
+    // load the xml
+    loadXML('requirements.xml', tabpanel);
+    loadXML('../content.xml', tabpanel);
+});
diff --git a/apps/files_odfviewer/src/webodf/webodf/xmledit/index.html b/apps/files_odfviewer/src/webodf/webodf/xmledit/index.html
new file mode 100644
index 0000000000..dd6ae4942e
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/xmledit/index.html
@@ -0,0 +1,16 @@
+<html>
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8"></meta>
+  <link rel="stylesheet" type="text/css" href="../extjs/resources/css/ext-all.css"/>
+  <!-- requirements -->
+  <script src="../extjs/adapter/ext/ext-base.js" type="text/javascript" charset="utf-8"></script>
+  <script src="../extjs/ext-all-debug.js" type="text/javascript" charset="utf-8"></script>
+  <script src="../lib/runtime.js"></script>
+  <!-- application -->
+  <script src="gui.js" type="text/javascript" charset="utf-8"></script>
+ 
+  <title>XMLEdit</title>
+</head>
+<body>
+</body>
+</html>
diff --git a/apps/files_odfviewer/src/webodf/webodf/xmledit/requirements.dtd b/apps/files_odfviewer/src/webodf/webodf/xmledit/requirements.dtd
new file mode 100644
index 0000000000..82cb8deb8f
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/xmledit/requirements.dtd
@@ -0,0 +1,12 @@
+<!ELEMENT requirements (requirement*, dependency*)>
+<!ATTLIST desc>
+
+<!ELEMENT requirement (desc)>
+<!ATTLIST requirement id ID #REQUIRED>
+
+<!ELEMENT desc (#PCDATA)>
+<!ATTLIST desc>
+
+<!ELEMENT dependency EMPTY>
+<!ATTLIST dependency parent IDREF #REQUIRED
+                     child  IDREF #REQUIRED>
diff --git a/apps/files_odfviewer/src/webodf/webodf/xmledit/requirements.xml b/apps/files_odfviewer/src/webodf/webodf/xmledit/requirements.xml
new file mode 100644
index 0000000000..cbeae4ce7e
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/xmledit/requirements.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE requirements PUBLIC "WebODF requirements XML" "requirements.dtd">
+<!--
+     Designing an XML editor
+
+requirements:
+ - load xml document in a frame and visualize it with specified css
+  - load xml document in another (underwater) frame and show it as XML
+   - parse DTD of the document format into a JSON data structure
+    - edit the text content/character of the XML document
+
+-->
+
+<requirements xmlns="http://www.webodf.org/dtd/requirements" xmlns:hi="hello">
+ <requirement id="r1">
+  <desc>load xml document in a frame</desc>
+ </requirement> 
+ <requirement id="r2">
+  <desc>show xml in a frame with a specified css</desc>
+ </requirement>
+ <dependency parent="r1" child="r2"/>
+</requirements>
diff --git a/apps/files_odfviewer/src/webodf/webodf/xmledit/test.xml b/apps/files_odfviewer/src/webodf/webodf/xmledit/test.xml
new file mode 100644
index 0000000000..cad3f32470
--- /dev/null
+++ b/apps/files_odfviewer/src/webodf/webodf/xmledit/test.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE requirements PUBLIC "WebODF requirements XML" "requirements.dtd">
+<!--
+     Designing an XML editor
+
+requirements:
+ - load xml document in a frame and visualize it with specified css
+  - load xml document in another (underwater) frame and show it as XML
+   - parse DTD of the document format into a JSON data structure
+    - edit the text content/character of the XML document
+
+-->
+
+<requirements>
+ <requirement id="r1">
+  <desc>load xml document in a frame</desc>
+ </requirement> 
+ <requirement id="r2">
+  <desc>show xml in a frame with a specified css</desc>
+ </requirement>
+ <dependency parent="r1" child="r2"/>
+</requirements>

From 746994c2be72672f5c473545ee21f081551cb245 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sun, 10 Jun 2012 12:47:47 +0200
Subject: [PATCH 0106/1224] Fixed merge conflict.

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

diff --git a/apps/contacts/js/loader.js b/apps/contacts/js/loader.js
index 8c79ea8a1d..0e6da10e02 100644
--- a/apps/contacts/js/loader.js
+++ b/apps/contacts/js/loader.js
@@ -48,7 +48,7 @@ Contacts_Import={
 					$('#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');

From 9b2b5e0f6d61b39128d7a2f33b8690ec2b8ae75c 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 0107/1224] 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 4c53dc32f5..3150631cc3 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;
@@ -419,7 +421,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;
@@ -438,7 +440,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;
@@ -489,6 +491,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 2b80102909a1be391717f5ce375bc1d0afd5fe81 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 0108/1224] 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 7aff5eae6c17ea8f7e95ebd200b3362f88e05773 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 0109/1224] 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 63c02fd595b28065de8f328bd4733ca2a5a9995b 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 0110/1224] 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 c67de113c61faa27c819f928578f4d793e7d3123 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 0111/1224] 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 71b4cddd5271ba30365640c5631e19228c266048 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 0112/1224] 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 276aefba818f4c8083360d3a358d124e9f8f1bae 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 0113/1224] 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 c932f93a40a061d355ba69a2526610bdeaa84003 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 0114/1224] 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 9c1cc15c8dee3ac2213f42fb26ee14ace9a3153a 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 0115/1224] 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 6682c60866a0031b031bcaeade0ed77e90698d92 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 0116/1224] pictures: update script and removal some all stuff

---
 apps/gallery/appinfo/update.php |  9 +++++++++
 apps/gallery/appinfo/version    |  2 +-
 apps/gallery/index.php          | 28 ++--------------------------
 3 files changed, 12 insertions(+), 27 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 e47fb3db5d..9d4654a7cc 100644
--- a/apps/gallery/index.php
+++ b/apps/gallery/index.php
@@ -27,30 +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());
-
-  $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 f0f9269161cb8515c915afc02665fe8fabf844ed 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 0117/1224] adding missing file

---
 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 878da48698..c8de44ff8f 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 d1809462f2..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 fe64e625ffe09590eb417140e27f5ad289c87aaf 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 0118/1224] 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 1853a83874cb310c93f4c3588208ef27c004b6b8 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 0119/1224] 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 f6c07094c2cd2e27e87427ef9f8149fef7586168 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 0120/1224] 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 e073cd756cc2c1485292fa78884ad237a5aa8160 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 0121/1224] 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 7ee722e0dafbd9e0b38014e063ec3c425368d2e7 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 0122/1224] 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 3150631cc3..f4c944e10d 100644
--- a/lib/image.php
+++ b/lib/image.php
@@ -400,7 +400,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 e7d1af48fb4695c3fa0fe10b3f2d930e555a648e 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 0123/1224] 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 f4c944e10d..77efc56d8c 100644
--- a/lib/image.php
+++ b/lib/image.php
@@ -400,11 +400,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 f1250a3867f482fd5bae6f16e3fb779c7323f947 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 0124/1224] 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 cac7e8648e..198f00873c 100644
--- a/lib/filesystem.php
+++ b/lib/filesystem.php
@@ -341,6 +341,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 77efc56d8c..f119c99633 100644
--- a/lib/image.php
+++ b/lib/image.php
@@ -402,12 +402,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 2dca0926b031267a8414d4368ea01fae83daf6c8 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 0125/1224] 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 c8de44ff8f..8033774183 100644
--- a/apps/gallery/appinfo/app.php
+++ b/apps/gallery/appinfo/app.php
@@ -55,6 +55,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 de6b683b501795be1717ecfa57fd683ae8270c4b 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 0126/1224] 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 31d48d4ba4652dc46f83825f1d9efe8cd408167f 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 0127/1224] 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 3970be3d7f7ba93db6689494a570d8da43bd7623 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 0128/1224] 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 f119c99633..4d1e7aa4bc 100644
--- a/lib/image.php
+++ b/lib/image.php
@@ -402,7 +402,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 6a44d02898ce184d4947c9455b4297fe6f6a94f0 Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <frank@owncloud.org>
Date: Sun, 10 Jun 2012 19:54:04 +0200
Subject: [PATCH 0129/1224] 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 c14daa258c..f153735f09 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 cfea28101ae484ca0df87402bfd124fe09729128 Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <frank@owncloud.org>
Date: Sun, 10 Jun 2012 20:31:31 +0200
Subject: [PATCH 0130/1224] 4.0.2

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

diff --git a/lib/util.php b/lib/util.php
index 6707139957..6be3e75572 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,00,1);
+		return array(4,00,2);
 	}
 
 	/**
@@ -91,7 +91,7 @@ class OC_Util {
 	 * @return string
 	 */
 	public static function getVersionString(){
-		return '4.0.1';
+		return '4.0.2';
 	}
 
         /**

From c898a8a6c90fd364bf787916c0f6b35d3f6c1c75 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sun, 10 Jun 2012 20:54:52 +0200
Subject: [PATCH 0131/1224] 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 a21fd725d6f59c4ba7730b7bddcfd46a31a75267 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Mon, 11 Jun 2012 03:05:33 +0200
Subject: [PATCH 0132/1224] 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 64c99b1bad..ee357c350d 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 f2216dc9d228116ec1b9e58342cd62e075aff0a9 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Thu, 7 Jun 2012 23:38:50 +0200
Subject: [PATCH 0133/1224] 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 8f09299e2468dfc4f9ec72b05acf47de3ef9d1d7 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@statuscode.ch>
Date: Mon, 11 Jun 2012 00:36:58 +0200
Subject: [PATCH 0134/1224] 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 cc653a8a408adfb4d0cd532145668aacd85ad96c Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@statuscode.ch>
Date: Mon, 11 Jun 2012 00:23:35 +0200
Subject: [PATCH 0135/1224] 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 f8337c9d723039760eecccf68bcb02752551e254 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@statuscode.ch>
Date: Sun, 10 Jun 2012 23:38:26 +0200
Subject: [PATCH 0136/1224] 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 d294373f476c795aaee7dc2444e7edfdea01a606 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@statuscode.ch>
Date: Sun, 10 Jun 2012 23:16:59 +0200
Subject: [PATCH 0137/1224] 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 7f5e8e39c4110d2354cbac42a498f09c236b2e04 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Mon, 11 Jun 2012 12:13:55 +0200
Subject: [PATCH 0138/1224] 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 74eece2620412b374e6aff1103d4cbbb45936f8b Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Mon, 11 Jun 2012 12:55:01 +0200
Subject: [PATCH 0139/1224] 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 6da8689671..97d38397fd 100644
--- a/apps/contacts/ajax/addproperty.php
+++ b/apps/contacts/ajax/addproperty.php
@@ -85,6 +85,7 @@ if(is_array($value)) {
 	$value = strip_tags($value);
 }
 
+/* preprocessing value */
 switch($name) {
 	case 'BDAY':
 		$date = New DateTime($value);
@@ -97,6 +98,8 @@ switch($name) {
 	case 'N':
 	case 'ORG':
 	case 'NOTE':
+		$value = str_replace('\n', ' \\n', $value);
+		break;
 	case 'NICKNAME':
 		// TODO: Escape commas and semicolons.
 		break;
@@ -108,8 +111,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 266c5238c9f1cec067d23ee1433e282829594f23 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Mon, 11 Jun 2012 16:48:43 +0200
Subject: [PATCH 0140/1224] 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 c75a7966de873a01deb542356fa145ac0716bb49 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Mon, 11 Jun 2012 22:00:06 +0200
Subject: [PATCH 0141/1224] 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 e0a5e3e992bc59e3267c0ee3101c470adbb036f9 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Mon, 11 Jun 2012 22:13:45 +0200
Subject: [PATCH 0142/1224] 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 9308e0227e..ce28af5d08 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -842,22 +842,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 210b71502b90e2f64ea2b21725dab7221b5e88c4 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Mon, 11 Jun 2012 22:18:14 +0200
Subject: [PATCH 0143/1224] Fix copy/paste error.

---
 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 ce28af5d08..4f8f3743dc 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -1284,8 +1284,8 @@ Contacts={
 					$('#dialog_holder').load(OC.filePath('contacts', 'ajax', 'chooseaddressbook.php'), function(jsondata){
 						if(jsondata.status != 'error'){
 							$('#chooseaddressbook_dialog').dialog({
-								minWidthwidth : 600,
-								close : function(event, ui) {
+								minWidth: 600,
+								close: function(event, ui) {
 									$(this).dialog('destroy').remove();
 								}
 							}).css('overflow','visible');

From 2473348c5d6c18aff68bb000186796f4793f271d Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Mon, 11 Jun 2012 22:53:20 +0200
Subject: [PATCH 0144/1224] 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 107c2de25de17bcaa144703f4a98239052eb6781 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Tue, 12 Jun 2012 11:22:25 +0200
Subject: [PATCH 0145/1224] 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 4501407283034c094c287ca84aba0bedcd939124 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Tue, 12 Jun 2012 11:39:03 +0200
Subject: [PATCH 0146/1224] 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 cee9d400c0192325c23304770184e95dd817147a Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Tue, 12 Jun 2012 12:31:28 +0200
Subject: [PATCH 0147/1224] 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 ef6b6ac230c7d01c73c90c9e5e0c5fec4010fd8e Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Tue, 12 Jun 2012 14:11:28 +0200
Subject: [PATCH 0148/1224] 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 db29b22275..46dbe28f04 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -448,7 +448,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 635a2f8ec9e99ee1e91d6e00202c3485cf38f27d Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Tue, 12 Jun 2012 16:27:24 +0200
Subject: [PATCH 0149/1224] 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 d54fc6dfd47c769e4f852a118a8fedd9786d90b3 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Tue, 12 Jun 2012 19:52:25 +0200
Subject: [PATCH 0150/1224] 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 48116cf9ab3ae57c50fe3078323e16e36742ad68 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Tue, 12 Jun 2012 19:53:26 +0200
Subject: [PATCH 0151/1224] 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 7868b25dcc81afdefad165b6ca17dd28e791c532 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <GapczynskiM@gmail.com>
Date: Tue, 12 Jun 2012 21:33:05 -0400
Subject: [PATCH 0152/1224] 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 48ee2651705d8a3bdddf1c0254211a208e1f02e5 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Wed, 13 Jun 2012 17:22:28 +0200
Subject: [PATCH 0153/1224] 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 fff7e99a59..b32b56fcb3 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 f589df736613bb50419127e788ee7b391d39e2a4 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Mon, 11 Jun 2012 15:22:58 +0200
Subject: [PATCH 0154/1224] 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 690fc90e75..5042ede2e2 100644
--- a/index.php
+++ b/index.php
@@ -109,6 +109,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 9e7c28835b87843a4d3c4e19936f055f2ca49580 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Mon, 11 Jun 2012 15:21:37 +0200
Subject: [PATCH 0155/1224] 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 6be3e75572..49f658f3c0 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -323,7 +323,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 3e339f3d668e57b76bc9e85e7e7cbb8a1b409d85 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Wed, 13 Jun 2012 19:03:34 +0200
Subject: [PATCH 0156/1224] 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 cb5d68149e..7805db7d64 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">
 Contacts.UI.Addressbooks.loadImportHandlers();

From e543ec6eb6351171322630a19b6974c47729bc35 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Wed, 13 Jun 2012 22:06:22 +0200
Subject: [PATCH 0157/1224] 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 2cd28c0f78..e0035c4df8 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 4ff11308a33289e334caf9e95ef152fe0693b69a Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Wed, 13 Jun 2012 22:12:54 +0200
Subject: [PATCH 0158/1224] 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 3646baf5bb..8d33d6b890 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 92a11011b16b81f452705eb5e05c10d9a0787d85 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Wed, 13 Jun 2012 22:14:40 +0200
Subject: [PATCH 0159/1224] 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 8d33d6b890..416b00f9a3 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 f9af0ef7034c0e781a2ad17f17383ac7359a9c3c Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Wed, 13 Jun 2012 22:20:43 +0200
Subject: [PATCH 0160/1224] 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 416b00f9a3..a4c862ad41 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 b0420ee8bec3146273e633b179f7e10423849434 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Thu, 14 Jun 2012 12:01:16 +0200
Subject: [PATCH 0161/1224] 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 4a47fa255d12fc4cfcd3b675d4664398e0a72730 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Thu, 14 Jun 2012 13:13:17 +0200
Subject: [PATCH 0162/1224] 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 544f97f03423aaee44e57af8bdd39950337e8493 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Thu, 14 Jun 2012 13:17:06 +0200
Subject: [PATCH 0163/1224] 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 cd759aee001e112bc4e31813d5aee72822f206de Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Thu, 14 Jun 2012 13:41:39 +0200
Subject: [PATCH 0164/1224] 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 625cd822c3cd9d7f382d4c80e06a344f34e66d06 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Thu, 14 Jun 2012 13:52:22 +0200
Subject: [PATCH 0165/1224] Backport CSRF prevention.

---
 core/templates/layout.user.php | 10 +++++
 lib/json.php                   | 12 ++++++
 lib/public/json.php            |  7 ++++
 lib/public/util.php            | 16 ++++++++
 lib/template.php               | 11 +++--
 lib/util.php                   | 73 ++++++++++++++++++++++++++++++++++
 6 files changed, 125 insertions(+), 4 deletions(-)

diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index e9d105ed04..f9d8798135 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -24,6 +24,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 439721ac6c..69a6992545 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/public/util.php b/lib/public/util.php
index 2abffba4c4..bffe07da3f 100644
--- a/lib/public/util.php
+++ b/lib/public/util.php
@@ -249,6 +249,22 @@ class Util {
 		return(\OC_Hook::emit( $signalclass, $signalname, $params ));
 	}
 
+	/**
+ 	 * 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/template.php b/lib/template.php
index e908c76bfa..fd2cb34a4a 100644
--- a/lib/template.php
+++ b/lib/template.php
@@ -155,11 +155,13 @@ 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');
-                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);
 	}
 
@@ -355,6 +357,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 49f658f3c0..c47a7e5d84 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -331,4 +331,77 @@ class OC_Util {
 		}
 		exit();
 	}
+
+	/**
+	 * @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
+		$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);
+	}
+
+	/**
+	 * @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 isCallRegistered(){
+		//mamimum time before token exires
+		$maxtime=(60*60);  // 1 hour
+		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.
+			return false;
+		}
+		if(isset($_SESSION['requesttoken-'.$token])) {
+			$timestamp=$_SESSION['requesttoken-'.$token];
+			if($timestamp+$maxtime<time()){
+				return false;
+			}else{
+				//token valid
+				return true;
+			}
+		}else{
+			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 df4737f52accbaa9b74291ec98fa412d1a7bd004 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Thu, 14 Jun 2012 14:17:30 +0200
Subject: [PATCH 0166/1224] 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 60bd2562d89516de382b58e36cd95861059a05a0 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Thu, 14 Jun 2012 15:14:36 +0200
Subject: [PATCH 0167/1224] 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 5b1a14f9ea93d8e4f9d90111fd1e95026a88c512 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Thu, 14 Jun 2012 18:00:13 +0200
Subject: [PATCH 0168/1224] Contacts: Implement CSRF prevention.

---
 apps/contacts/ajax/activation.php          |  1 +
 apps/contacts/ajax/addcontact.php          |  8 +-------
 apps/contacts/ajax/addproperty.php         |  1 +
 apps/contacts/ajax/createaddressbook.php   |  1 +
 apps/contacts/ajax/cropphoto.php           |  4 +++-
 apps/contacts/ajax/deletebook.php          |  1 +
 apps/contacts/ajax/deletecard.php          |  1 +
 apps/contacts/ajax/deleteproperty.php      |  1 +
 apps/contacts/ajax/oc_photo.php            |  1 +
 apps/contacts/ajax/savecrop.php            | 23 ++++++++++++++--------
 apps/contacts/ajax/saveproperty.php        |  1 +
 apps/contacts/ajax/updateaddressbook.php   |  1 +
 apps/contacts/ajax/uploadimport.php        |  6 +-----
 apps/contacts/ajax/uploadphoto.php         | 18 +++++++++--------
 apps/contacts/js/contacts.js               |  4 ++--
 apps/contacts/templates/part.contact.php   |  1 +
 apps/contacts/templates/part.cropphoto.php |  2 ++
 core/templates/layout.user.php             |  2 +-
 18 files changed, 45 insertions(+), 32 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 ee451098f1..d15ad8c621 100644
--- a/apps/contacts/ajax/addcontact.php
+++ b/apps/contacts/ajax/addcontact.php
@@ -27,17 +27,11 @@ function bailOut($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);
-}
+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 97d38397fd..be9e849be7 100644
--- a/apps/contacts/ajax/addproperty.php
+++ b/apps/contacts/ajax/addproperty.php
@@ -26,6 +26,7 @@
 // Check if we are a user
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('contacts');
+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 7b286dbdb5..7006c6fc1f 100644
--- a/apps/contacts/ajax/cropphoto.php
+++ b/apps/contacts/ajax/cropphoto.php
@@ -27,12 +27,14 @@
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('contacts');
 
-$tmp_path = $_GET['tmp_path'];
+$tmp_path = strip_tags($_GET['tmp_path']);
+$requesttoken = strip_tags($_GET['requesttoken']);
 $id = $_GET['id'];
 OCP\Util::writeLog('contacts','ajax/cropphoto.php: tmp_path: '.$tmp_path.', exists: '.file_exists($tmp_path), OCP\Util::DEBUG);
 $tmpl = new OCP\Template("contacts", "part.cropphoto");
 $tmpl->assign('tmp_path', $tmp_path);
 $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 bcf6aa4432..4520374a23 100644
--- a/apps/contacts/ajax/deletebook.php
+++ b/apps/contacts/ajax/deletebook.php
@@ -26,6 +26,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 98ff06ebe7..f998185be4 100644
--- a/apps/contacts/ajax/deletecard.php
+++ b/apps/contacts/ajax/deletecard.php
@@ -31,6 +31,7 @@ function bailOut($msg) {
 // Check if we are a user
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('contacts');
+OCP\JSON::callCheck();
 
 $id = isset($_POST['id'])?$_POST['id']:null;
 if(!$id) {
diff --git a/apps/contacts/ajax/deleteproperty.php b/apps/contacts/ajax/deleteproperty.php
index a137287034..95fd43e0d9 100644
--- a/apps/contacts/ajax/deleteproperty.php
+++ b/apps/contacts/ajax/deleteproperty.php
@@ -26,6 +26,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/oc_photo.php b/apps/contacts/ajax/oc_photo.php
index 184217f2b7..903d2aedfb 100644
--- a/apps/contacts/ajax/oc_photo.php
+++ b/apps/contacts/ajax/oc_photo.php
@@ -24,6 +24,7 @@
 OCP\JSON::setContentTypeHeader('text/plain');
 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/oc_photo.php: '.$msg, OCP\Util::ERROR);
diff --git a/apps/contacts/ajax/savecrop.php b/apps/contacts/ajax/savecrop.php
index fe9e5c5b99..263361bafc 100644
--- a/apps/contacts/ajax/savecrop.php
+++ b/apps/contacts/ajax/savecrop.php
@@ -21,13 +21,26 @@
  * TODO: Translatable strings.
  *       Remember to delete tmp file at some point.
  */
-// Init owncloud
  
-OCP\Util::writeLog('contacts','ajax/savecrop.php: Huzzah!!!', OCP\Util::DEBUG);
+function bailOut($msg) {
+	OCP\JSON::error(array('data' => array('message' => $msg)));
+	OCP\Util::writeLog('contacts','ajax/savecrop.php: '.$msg, OCP\Util::DEBUG);
+	exit();
+}
+function debug($msg) {
+	OCP\Util::writeLog('contacts','ajax/savecrop.php: '.$msg, OCP\Util::DEBUG);
+}
 
 // Check if we are a user
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('contacts');
+foreach($_POST as $key=>$value) {
+	debug('POST: '.$key.'=>'.$value);
+}
+foreach($_GET as $key=>$value) {
+	debug('GET: '.$key.'=>'.$value);
+}
+OCP\JSON::callCheck();
 
 // foreach ($_POST as $key=>$element) {
 // 	OCP\Util::writeLog('contacts','ajax/savecrop.php: '.$key.'=>'.$element, OCP\Util::DEBUG);
@@ -36,12 +49,6 @@ 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/savecrop.php: '.$msg, OCP\Util::DEBUG);
-	exit();
-}
-
 $image = null;
 
 $x1 = (isset($_POST['x1']) && $_POST['x1']) ? $_POST['x1'] : 0;
diff --git a/apps/contacts/ajax/saveproperty.php b/apps/contacts/ajax/saveproperty.php
index 6509ac21f2..96e082d00e 100644
--- a/apps/contacts/ajax/saveproperty.php
+++ b/apps/contacts/ajax/saveproperty.php
@@ -26,6 +26,7 @@
 // Check if we are a user
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('contacts');
+OCP\JSON::callCheck();
 
 function bailOut($msg) {
 	OCP\JSON::error(array('data' => array('message' => $msg)));
diff --git a/apps/contacts/ajax/updateaddressbook.php b/apps/contacts/ajax/updateaddressbook.php
index 19b5b3bddc..68fe8f8121 100644
--- a/apps/contacts/ajax/updateaddressbook.php
+++ b/apps/contacts/ajax/updateaddressbook.php
@@ -11,6 +11,7 @@
 // Check if we are a user
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('contacts');
+OCP\JSON::callCheck();
 
 $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 b11f380fa8..4c3f5eadf0 100644
--- a/apps/contacts/ajax/uploadimport.php
+++ b/apps/contacts/ajax/uploadimport.php
@@ -23,14 +23,12 @@
 // Check if we are a user
 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/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 +37,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 +67,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.'));
diff --git a/apps/contacts/ajax/uploadphoto.php b/apps/contacts/ajax/uploadphoto.php
index dca8ede6d6..2dc93362a1 100644
--- a/apps/contacts/ajax/uploadphoto.php
+++ b/apps/contacts/ajax/uploadphoto.php
@@ -19,14 +19,6 @@
  * 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');
 function bailOut($msg) {
 	OCP\JSON::error(array('data' => array('message' => $msg)));
 	OCP\Util::writeLog('contacts','ajax/uploadphoto.php: '.$msg, OCP\Util::DEBUG);
@@ -35,6 +27,16 @@ function bailOut($msg) {
 function debug($msg) {
 	OCP\Util::writeLog('contacts','ajax/uploadphoto.php: '.$msg, OCP\Util::DEBUG);
 }
+OCP\JSON::setContentTypeHeader('text/plain');
+OCP\JSON::checkLoggedIn();
+OCP\JSON::checkAppEnabled('contacts');
+foreach($_POST as $key=>$value) {
+	debug('POST: '.$key.'=>'.$value);
+}
+foreach($_GET as $key=>$value) {
+	debug('GET: '.$key.'=>'.$value);
+}
+OCP\JSON::callCheck();
 
 // 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);
diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index 4f8f3743dc..4365995686 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -1150,7 +1150,7 @@ 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){
+				$.getJSON(OC.filePath('contacts', 'ajax', 'cropphoto.php'),{'tmp_path':tmp_path,'id':this.id,'requesttoken':requesttoken},function(jsondata){
 					if(jsondata.status == 'success'){
 						//alert(jsondata.data.page);
 						$('#edit_photo_dialog_img').html(jsondata.data.page);
@@ -1637,7 +1637,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));
diff --git a/apps/contacts/templates/part.contact.php b/apps/contacts/templates/part.contact.php
index 74522be37c..9a13aafa5e 100644
--- a/apps/contacts/templates/part.contact.php
+++ b/apps/contacts/templates/part.contact.php
@@ -4,6 +4,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="id" value="<?php echo $_['id'] ?>">
+		<input type="hidden" name="requesttoken" value="<?php echo $_['requesttoken'] ?>">
 		<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 id="file_upload_start" type="file" accept="image/*" name="imagefile" />
diff --git a/apps/contacts/templates/part.cropphoto.php b/apps/contacts/templates/part.cropphoto.php
index 599951d9a9..e107217913 100644
--- a/apps/contacts/templates/part.cropphoto.php
+++ b/apps/contacts/templates/part.cropphoto.php
@@ -1,6 +1,7 @@
 <?php 
 $id = $_['id'];
 $tmp_path = $_['tmp_path'];
+$requesttoken = $_['requesttoken'];
 OCP\Util::writeLog('contacts','templates/part.cropphoto.php: tmp_path: '.$tmp_path.', exists: '.file_exists($tmp_path), OCP\Util::DEBUG);
 ?>
 <script language="Javascript">
@@ -47,6 +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="requesttoken" name="requesttoken" value="<?php echo $requesttoken; ?>" />
 	<input type="hidden" id="tmp_path" name="tmp_path" value="<?php echo $tmp_path; ?>" />
 	<fieldset id="coords">
 	<input type="hidden" id="x1" name="x1" value="" />
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index f9d8798135..25281c452a 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -26,7 +26,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 3b58c7a4070c8098d80b4a2d8c9c50bfbeffdcb9 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Thu, 14 Jun 2012 18:03:50 +0200
Subject: [PATCH 0169/1224] Remove debug statements.

---
 apps/contacts/ajax/savecrop.php    | 13 -------------
 apps/contacts/ajax/uploadphoto.php |  7 -------
 2 files changed, 20 deletions(-)

diff --git a/apps/contacts/ajax/savecrop.php b/apps/contacts/ajax/savecrop.php
index 263361bafc..a5517c5d84 100644
--- a/apps/contacts/ajax/savecrop.php
+++ b/apps/contacts/ajax/savecrop.php
@@ -27,25 +27,12 @@ function bailOut($msg) {
 	OCP\Util::writeLog('contacts','ajax/savecrop.php: '.$msg, OCP\Util::DEBUG);
 	exit();
 }
-function debug($msg) {
-	OCP\Util::writeLog('contacts','ajax/savecrop.php: '.$msg, OCP\Util::DEBUG);
-}
 
 // Check if we are a user
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('contacts');
-foreach($_POST as $key=>$value) {
-	debug('POST: '.$key.'=>'.$value);
-}
-foreach($_GET as $key=>$value) {
-	debug('GET: '.$key.'=>'.$value);
-}
 OCP\JSON::callCheck();
 
-// 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');
 
diff --git a/apps/contacts/ajax/uploadphoto.php b/apps/contacts/ajax/uploadphoto.php
index 2dc93362a1..52e25e4a33 100644
--- a/apps/contacts/ajax/uploadphoto.php
+++ b/apps/contacts/ajax/uploadphoto.php
@@ -30,12 +30,6 @@ function debug($msg) {
 OCP\JSON::setContentTypeHeader('text/plain');
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('contacts');
-foreach($_POST as $key=>$value) {
-	debug('POST: '.$key.'=>'.$value);
-}
-foreach($_GET as $key=>$value) {
-	debug('GET: '.$key.'=>'.$value);
-}
 OCP\JSON::callCheck();
 
 // If it is a Drag'n'Drop transfer it's handled here.
@@ -50,7 +44,6 @@ if ($fn) {
 	$id = $_GET['id'];
 	$tmpfname = tempnam(get_temp_dir(), 'occOrig');
 	file_put_contents($tmpfname, file_get_contents('php://input'));
-	debug($tmpfname.' uploaded');
 	$image = new OC_Image();
 	if($image->loadFromFile($tmpfname)) {
 		if($image->width() > 400 || $image->height() > 400) {

From b025ff8de397a7ee76118dbe6860fe957252b830 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Thu, 14 Jun 2012 18:31:38 +0200
Subject: [PATCH 0170/1224] 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 f9c34942e13c0ea54872fe454a95e8ea20402ce9 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Fri, 15 Jun 2012 10:46:29 +0200
Subject: [PATCH 0171/1224] applied merge request #128: fixed some sorting and
 display issues with gallery app. This also fix bug #872 for the new gallery

---
 apps/gallery/lib/tiles.php       |  4 +-
 apps/gallery/templates/index.php | 67 +++++++++++++++++++++-----------
 2 files changed, 46 insertions(+), 25 deletions(-)

diff --git a/apps/gallery/lib/tiles.php b/apps/gallery/lib/tiles.php
index 5837c752ef..dcdf6aa1bf 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>';
@@ -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);
 		}
 	}
diff --git a/apps/gallery/templates/index.php b/apps/gallery/templates/index.php
index 749f8891f8..1fdbea5957 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">
@@ -43,7 +43,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;
 }
@@ -79,39 +79,60 @@ $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();
+
+$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) {
-		$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(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 (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 && 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;
-    $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);
+// 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();

From 5c6a7172cafc395d38c58d1b5afd6b36efb33ad5 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Fri, 15 Jun 2012 15:55:46 +0200
Subject: [PATCH 0172/1224] 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 0074062b5329c3d43679909fddce2d70608a4475 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Fri, 15 Jun 2012 15:51:06 +0200
Subject: [PATCH 0173/1224] fixed xss vulnerability

---
 index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/index.php b/index.php
index 5042ede2e2..4df62327c4 100644
--- a/index.php
+++ b/index.php
@@ -118,7 +118,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 c1744d2eb625b56f349cde2d575e82f9ea4c65f6 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 0174/1224] 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 ec3033a5ddfe285722e35c73b18264cd9fb6265d Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <GapczynskiM@gmail.com>
Date: Thu, 14 Jun 2012 12:27:30 -0400
Subject: [PATCH 0175/1224] 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 cbe5449f47fe483253c1308c7cac41c3cdf5d848 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Sat, 16 Jun 2012 09:40:03 +0200
Subject: [PATCH 0176/1224] remove a closing php tag in calendar

---
 apps/calendar/ajax/changeview.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/apps/calendar/ajax/changeview.php b/apps/calendar/ajax/changeview.php
index 2c2d09ccb1..951f603ce8 100644
--- a/apps/calendar/ajax/changeview.php
+++ b/apps/calendar/ajax/changeview.php
@@ -19,4 +19,3 @@ switch($view){
 }
 OCP\Config::setUserValue(OCP\USER::getUser(), 'calendar', 'currentview', $view);
 OCP\JSON::success();
-?>

From fc632b57959574c321cf58807f4697a0488c2106 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Sat, 16 Jun 2012 09:48:07 +0200
Subject: [PATCH 0177/1224] fix merge conflicts

---
 apps/calendar/ajax/calendar/activation.php    | 2 +-
 apps/calendar/ajax/calendar/delete.php        | 3 +--
 apps/calendar/ajax/calendar/edit.form.php     | 1 -
 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.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/import.php          | 2 +-
 apps/calendar/ajax/settings/getfirstday.php   | 3 +--
 apps/calendar/ajax/settings/guesstimezone.php | 1 -
 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 +--
 23 files changed, 21 insertions(+), 38 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 7736680931..ae056a524b 100644
--- a/apps/calendar/ajax/calendar/edit.form.php
+++ b/apps/calendar/ajax/calendar/edit.form.php
@@ -17,4 +17,3 @@ $tmpl->assign('new', false);
 $tmpl->assign('calendarcolor_options', $calendarcolor_options);
 $tmpl->assign('calendar', $calendar);
 $tmpl->printPage();
-?>
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.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/import.php b/apps/calendar/ajax/import/import.php
index 202af1eb46..18e93e67b4 100644
--- a/apps/calendar/ajax/import/import.php
+++ b/apps/calendar/ajax/import/import.php
@@ -126,4 +126,4 @@ sleep(3);
 if(is_writable('import_tmp/')){
 	unlink($progressfile);
 }
-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 13092777b7..11c74631d4 100644
--- a/apps/calendar/ajax/settings/guesstimezone.php
+++ b/apps/calendar/ajax/settings/guesstimezone.php
@@ -24,4 +24,3 @@ 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
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 707660b35fcd721116d6a13316a51142066b24ec Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sat, 16 Jun 2012 18:54:55 +0200
Subject: [PATCH 0178/1224] 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 33ab91710f920f42f18dd8489b04798d1460ce6e Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sat, 16 Jun 2012 19:48:33 +0200
Subject: [PATCH 0179/1224] 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 85bbf09362..417d3a073f 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 8d67ca09b55569a201d2067faf870a28065eb1f6 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 0180/1224] 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 d8048414aa270246e5fb54ca0c0db7dd54c337e6 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Mon, 18 Jun 2012 00:39:38 +0200
Subject: [PATCH 0181/1224] Removed erroneous value attributes. Partial fix for
 oc-1029.

---
 apps/contacts/templates/part.contact.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/contacts/templates/part.contact.php b/apps/contacts/templates/part.contact.php
index 9a13aafa5e..266fba7ae1 100644
--- a/apps/contacts/templates/part.contact.php
+++ b/apps/contacts/templates/part.contact.php
@@ -32,13 +32,13 @@ $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="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 9d0cfacd67b92bbbea3fa3ff55743ffec7faa107 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Mon, 18 Jun 2012 09:42:31 +0200
Subject: [PATCH 0182/1224] 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 ca41f2e96aa12ebe88ceb44d301f5b398e9824a4 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Mon, 18 Jun 2012 15:35:22 +0200
Subject: [PATCH 0183/1224] 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 814cab97cff7c45142cf5a351e6471e1a72ffbb5 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Mon, 18 Jun 2012 17:23:54 +0200
Subject: [PATCH 0184/1224] ignore "Shared"-directory when calculating free
 space

Conflicts:

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

diff --git a/lib/fileproxy/quota.php b/lib/fileproxy/quota.php
index 9e4c2d0643..dab41c5e90 100644
--- a/lib/fileproxy/quota.php
+++ b/lib/fileproxy/quota.php
@@ -54,8 +54,10 @@ class OC_FileProxy_Quota extends OC_FileProxy{
 	 * @return int
 	 */
 	private function getFreeSpace(){
-		$rootInfo=OC_FileCache::get('');
-		$usedSpace=$rootInfo['size'];
+		$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 92bb59c95da5d16657cd3b1b31d2b7430dd919b6 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Mon, 18 Jun 2012 17:30:21 +0200
Subject: [PATCH 0185/1224] fixed broken function call

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

diff --git a/lib/fileproxy/quota.php b/lib/fileproxy/quota.php
index dab41c5e90..0b2b584870 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_Cached::get('');
-		$sharedInfo=OC_FileCache_Cached::get('/Shared');
+		$rootInfo=OC_FileCache::get('');
+		$sharedInfo=OC_FileCache::get('/Shared');
 		$usedSpace=isset($rootInfo['size'])?$rootInfo['size']:0;
 		$usedSpace=isset($sharedInfo['size'])?$rootInfo['size']-$sharedInfo['size']:$rootInfo['size'];
 		$totalSpace=$this->getQuota();

From b31962fdc29af0908d9e2eb88b18e053324e409f Mon Sep 17 00:00:00 2001
From: Brice Maron <brice@bmaron.net>
Date: Mon, 18 Jun 2012 20:15:20 +0000
Subject: [PATCH 0186/1224] Hide image with no source (avoid placeholder img)

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

diff --git a/settings/css/settings.css b/settings/css/settings.css
index df1e3cfd3c..6e9d2432e4 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -50,3 +50,5 @@ span.version { margin-left:3em; color:#ddd; }
 
 /* LOF */
 #log { white-space:normal; }
+/* Don't show blank images */
+img[src=""] { display:none}
\ No newline at end of file

From 249190c89bc1c2effd8aaad1052d9a0ccf0bfe37 Mon Sep 17 00:00:00 2001
From: Victor Dubiniuk <victor.dubiniuk@gmail.com>
Date: Tue, 19 Jun 2012 00:19:57 +0300
Subject: [PATCH 0187/1224] Fix mime-type detection

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

diff --git a/lib/helper.php b/lib/helper.php
index 3de7b3fdc1..7a36a8182d 100644
--- a/lib/helper.php
+++ b/lib/helper.php
@@ -376,7 +376,7 @@ class OC_Helper {
 			pclose($fp);
 
 			//trim the character set from the end of the response
-			$mimeType=substr($reply,0,strrpos($reply,' '));
+			$mimeType=substr($reply,0,strrpos($reply,';'));
 		}
 		if ($mimeType=='application/octet-stream') {
 			// Fallback solution: (try to guess the type by the file extension

From db7542b640d092ec22fef28c1c25c32edecc36b2 Mon Sep 17 00:00:00 2001
From: Victor Dubiniuk <victor.dubiniuk@gmail.com>
Date: Tue, 19 Jun 2012 00:56:48 +0300
Subject: [PATCH 0188/1224] Reverting 249190c89bc1c2effd8aaad1052d9a0ccf0bfe37.
 Fixed in master

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

diff --git a/lib/helper.php b/lib/helper.php
index 7a36a8182d..3de7b3fdc1 100644
--- a/lib/helper.php
+++ b/lib/helper.php
@@ -376,7 +376,7 @@ class OC_Helper {
 			pclose($fp);
 
 			//trim the character set from the end of the response
-			$mimeType=substr($reply,0,strrpos($reply,';'));
+			$mimeType=substr($reply,0,strrpos($reply,' '));
 		}
 		if ($mimeType=='application/octet-stream') {
 			// Fallback solution: (try to guess the type by the file extension

From 244920aeb01c8668df5e069732eabb16f1e10c33 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Tue, 19 Jun 2012 01:15:58 +0200
Subject: [PATCH 0189/1224] 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 45be86aff8..4adb70cfa0 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 1b142a11552b373f5e3d16f729a7dac1cb597376 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Tue, 19 Jun 2012 09:35:13 +0200
Subject: [PATCH 0190/1224] 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 0b2b584870..82eca1ce44 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::get('');
 		$sharedInfo=OC_FileCache::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 637f8398ba85870eac5cb0b03a67ef32b494336f 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 0191/1224] fixes oc-668

---
 lib/helper.php | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/lib/helper.php b/lib/helper.php
index 3de7b3fdc1..080df8613e 100644
--- a/lib/helper.php
+++ b/lib/helper.php
@@ -377,6 +377,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 98bc9160166e931ae1eec840277edbabaf9e40b7 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Tue, 5 Jun 2012 17:51:41 +0200
Subject: [PATCH 0192/1224] Make check for writable apps dir configurable

Conflicts:

	config/config.sample.php
---
 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 2205ee1b47..21c728db44 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -31,6 +31,11 @@ $CONFIG = array(
 "loglevel" => "",
 "passwordsalt" => "",
 "updatechecker" => true,
+/* 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 c47a7e5d84..1dd11e7b5c 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -29,7 +29,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 4d627d66a18eea7a0ed2cebab61f3eba616b372e Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Thu, 7 Jun 2012 22:47:18 +0200
Subject: [PATCH 0193/1224] 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 21c728db44..7a48918d8b 100644
--- a/config/config.sample.php
+++ b/config/config.sample.php
@@ -3,31 +3,57 @@
 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" => "",
 "passwordsalt" => "",
 "updatechecker" => true,
@@ -36,6 +62,9 @@ $CONFIG = array(
  * 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 e728635c8adb1078b3465c7134821e70bef65fea Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Fri, 8 Jun 2012 20:26:08 +0200
Subject: [PATCH 0194/1224] 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 a7d1de8b95..b9a17e3b39 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 598a090db41f9c76d347aec0ed996192e8255a36 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Fri, 8 Jun 2012 20:47:11 +0200
Subject: [PATCH 0195/1224] 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 b62bb82c69..93fce38af4 100644
--- a/lib/filesystemview.php
+++ b/lib/filesystemview.php
@@ -23,6 +23,8 @@
 
 class OC_FilesystemView {
 	private $fakeRoot='';
+	private $internal_path_cache=array();
+	private $storage_cache=array();
 
 	public function __construct($root){
 		$this->fakeRoot=$root;
@@ -67,7 +69,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
@@ -75,7 +80,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 bb649dd0d5accbdf1d993cdfbf0e10fd2e4f9f0b Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Fri, 8 Jun 2012 21:08:38 +0200
Subject: [PATCH 0196/1224] Smarter code for OC_FileProxy

Conflicts:

	lib/fileproxy.php
---
 lib/fileproxy.php | 22 ++++++----------------
 1 file changed, 6 insertions(+), 16 deletions(-)

diff --git a/lib/fileproxy.php b/lib/fileproxy.php
index 70db9cca23..9cda94c1c2 100644
--- a/lib/fileproxy.php
+++ b/lib/fileproxy.php
@@ -42,16 +42,7 @@ class OC_FileProxy{
 	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 implement
+	 * fallback function when a proxy operation is not implemented
 	 * @param string $function the name of the proxy operation
 	 * @param mixed
 	 *
@@ -73,11 +64,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;
 			}
 		}
@@ -88,8 +78,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){
@@ -108,8 +98,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);
 		}
@@ -119,4 +109,4 @@ class OC_FileProxy{
 	public static function clearProxies(){
 		self::$proxies=array();
 	}
-}
\ No newline at end of file
+}

From cff1b6e69901c84aadbb7d9f9677756f4c813837 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Fri, 8 Jun 2012 21:23:25 +0200
Subject: [PATCH 0197/1224] 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/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 +-
 13 files changed, 20 insertions(+), 20 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 981eeab58b..c431070e24 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_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;
 		}
 		
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 4adb70cfa0..d7d6e09c9b 100644
--- a/apps/user_ldap/lib_ldap.php
+++ b/apps/user_ldap/lib_ldap.php
@@ -606,7 +606,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;
@@ -722,4 +722,4 @@ class OC_LDAP {
 		return false;
 	}
 
- }
\ No newline at end of file
+ }
diff --git a/lib/app.php b/lib/app.php
index e4ec0fe588..1d046b3bb5 100644
--- a/lib/app.php
+++ b/lib/app.php
@@ -494,7 +494,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 198f00873c..813590b00b 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='';
@@ -311,12 +311,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);
 	}
 
@@ -361,7 +361,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 93fce38af4..d15f91be1e 100644
--- a/lib/filesystemview.php
+++ b/lib/filesystemview.php
@@ -34,7 +34,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 6417ed1c7a..4069f2ab7c 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 a9b01957d4..a69fe49a0b 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 6dec1b050f..ad98048a68 100644
--- a/tests/index.php
+++ b/tests/index.php
@@ -41,7 +41,7 @@ function loadTests($dir=''){
 	$test=isset($_GET['test'])?$_GET['test']:false;
 	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 0d43d6402d13acfc652d050bfb96a7593e2163f6 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Sat, 9 Jun 2012 14:32:51 +0200
Subject: [PATCH 0198/1224] 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 c260db0e9a7fc1b9472e886c48c58c5cae36f282 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Mon, 11 Jun 2012 17:38:40 +0200
Subject: [PATCH 0199/1224] 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 2d4e1b45ce2486d6c44c85bd8463c2a27879d8ab Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Fri, 15 Jun 2012 11:18:38 +0200
Subject: [PATCH 0200/1224] 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 1d046b3bb5..52a1587ae3 100644
--- a/lib/app.php
+++ b/lib/app.php
@@ -567,6 +567,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 0524f6fd3c0c2fdd06a082e4107dad5efc99dacf Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Fri, 15 Jun 2012 17:05:10 +0200
Subject: [PATCH 0201/1224] 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 b9a17e3b39..c824ad0ead 100644
--- a/lib/connector/sabre/node.php
+++ b/lib/connector/sabre/node.php
@@ -129,7 +129,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 311c2bc0d311a70cff9cc73673bcd5f310e9f0a6 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Sat, 16 Jun 2012 00:44:23 +0200
Subject: [PATCH 0202/1224] 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 b0c5587633..8024a5419e 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 = OC_Calendar_App::getCalendar($_GET['calendar_id'], false, false);

From c4d1363419eacf4ae805a65e43f43aef2a06be61 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Wed, 20 Jun 2012 11:35:45 +0200
Subject: [PATCH 0203/1224] don't show other users file if the filesystem is
 not index already

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

diff --git a/lib/filecache.php b/lib/filecache.php
index cef1ea0472..f93430fc9b 100644
--- a/lib/filecache.php
+++ b/lib/filecache.php
@@ -266,6 +266,9 @@ class OC_FileCache{
 		}
 		$path=$root.$path;
 		$parent=self::getFileId($path);
+		if($path==-1){
+			return array();
+		}
     $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)){

From 0289f442a875337ba7aa894abee97799c64ef2c1 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Wed, 20 Jun 2012 12:41:30 +0200
Subject: [PATCH 0204/1224] 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 d7d6e09c9b..f4f75500c0 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 a7f08118297b09838b90803ceaec76db76f1b6e8 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Wed, 20 Jun 2012 16:31:22 +0200
Subject: [PATCH 0205/1224] 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 d9607df26f63a60b7047d078876e004689190707 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Wed, 20 Jun 2012 16:43:31 +0200
Subject: [PATCH 0206/1224] backport of sanitizeHTML() function

---
 lib/public/util.php | 11 +++++++++++
 lib/util.php        | 16 +++++++++++++++-
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/lib/public/util.php b/lib/public/util.php
index bffe07da3f..08394da575 100644
--- a/lib/public/util.php
+++ b/lib/public/util.php
@@ -266,6 +266,17 @@ class Util {
 		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));
+	}
 }
 
 ?>
diff --git a/lib/util.php b/lib/util.php
index 1dd11e7b5c..1eeb70aca6 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -348,7 +348,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
@@ -403,5 +403,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 902c649dad7a0bd1f5f2d0ec87953f0f059a67d8 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Tue, 19 Jun 2012 17:24:55 +0200
Subject: [PATCH 0207/1224] use new sanitize HTML function backported

Conflicts:

	lib/template.php
---
 index.php                | 2 +-
 lib/template.php         | 1 +
 settings/admin.php       | 2 +-
 settings/ajax/getlog.php | 2 +-
 settings/js/log.js       | 2 +-
 5 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/index.php b/index.php
index 4df62327c4..3c38ff760f 100644
--- a/index.php
+++ b/index.php
@@ -118,7 +118,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 fd2cb34a4a..dd5dbad4a9 100644
--- a/lib/template.php
+++ b/lib/template.php
@@ -268,6 +268,7 @@ class OC_Template{
 	 *
 	 * If the key existed before, it will be overwritten
 	 */
+
 	public function assign( $key, $value ){
 		$this->vars[$key] = $value;
 		return true;
diff --git a/settings/admin.php b/settings/admin.php
index a997bad4e3..88aae5bdb6 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);
+$tmpl->assign('entries',OC_Util::sanitizeHTML($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 0e61b5457b0a54cfc3433f07c9d65a14bdb90498 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Wed, 20 Jun 2012 12:23:26 +0200
Subject: [PATCH 0208/1224] 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 8e427d80d3d7622074f2da5fecabc75255b7b275 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Wed, 20 Jun 2012 15:11:14 +0200
Subject: [PATCH 0209/1224] 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 8024a5419e..8618d4a49f 100644
--- a/apps/calendar/ajax/events.php
+++ b/apps/calendar/ajax/events.php
@@ -32,4 +32,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 6e0ff580b1..bc012a68c4 100644
--- a/apps/calendar/js/calendar.js
+++ b/apps/calendar/js/calendar.js
@@ -824,7 +824,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 e71dffcdf094763885e807f2484820fac179daca Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Wed, 20 Jun 2012 15:41:05 +0200
Subject: [PATCH 0210/1224] 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 d0dbc8beabea8203c0f4d047a68cd5a440f3e2ab Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Wed, 20 Jun 2012 20:03:25 +0200
Subject: [PATCH 0211/1224] 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 e3f1507374d9922ab8fc7f4de2e640f5feb5535e Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sat, 9 Jun 2012 17:33:57 +0200
Subject: [PATCH 0212/1224] 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                    | 46 ++++++++++++++++++++---
 4 files changed, 62 insertions(+), 7 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 d15f91be1e..7265b775ea 100644
--- a/lib/filesystemview.php
+++ b/lib/filesystemview.php
@@ -74,6 +74,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
@@ -213,7 +230,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){
@@ -237,7 +261,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);
@@ -352,8 +383,13 @@ class OC_FilesystemView {
 	 * @return mixed
 	 */
 	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);
+		$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){
@@ -370,7 +406,7 @@ class OC_FilesystemView {
 				}else{
 					$result=$storage->$operation($interalPath);
 				}
-				$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 0f2600e9ea950c76777aecff86be8e8136e2aa4e Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Fri, 15 Jun 2012 23:11:33 +0200
Subject: [PATCH 0213/1224] 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
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
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 9ba467d62980e4e397d152e9c38b08da5cf31a99 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Fri, 15 Jun 2012 23:48:39 +0200
Subject: [PATCH 0214/1224] fix encryption for binary files

---
 apps/files_encryption/lib/crypt.php        | 13 +++++++++++--
 apps/files_encryption/lib/cryptstream.php  |  4 +++-
 apps/files_encryption/tests/encryption.php | 19 +++++++++++++++++++
 apps/files_encryption/tests/stream.php     | 17 ++++++++++++++++-
 lib/filesystemview.php                     |  4 ++--
 5 files changed, 51 insertions(+), 6 deletions(-)

diff --git a/apps/files_encryption/lib/crypt.php b/apps/files_encryption/lib/crypt.php
index 37eaedc3fc..62f6a8c236 100644
--- a/apps/files_encryption/lib/crypt.php
+++ b/apps/files_encryption/lib/crypt.php
@@ -44,7 +44,13 @@ 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('/'.$login);
+
 		OC_FileProxy::$enabled=false;
 		if(!$view->file_exists('/encryption.key')){// does key exist?
 			OC_Crypt::createkey($login,$password);
@@ -133,7 +139,7 @@ class OC_Crypt {
 	public static function decrypt( $content, $key='') {
 		$bf = self::getBlowfish($key);
 		$data=$bf->decrypt($content);
-		return rtrim($data, "\0");
+		return $data;
 	}
 
 	/**
@@ -174,6 +180,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);
@@ -202,6 +211,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);
+	}
 }
diff --git a/lib/filesystemview.php b/lib/filesystemview.php
index 7265b775ea..c09f1de546 100644
--- a/lib/filesystemview.php
+++ b/lib/filesystemview.php
@@ -402,9 +402,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,$this->getAbsolutePath($path),$result);
 				if(OC_Filesystem::$loaded and $this->fakeRoot==OC_Filesystem::getRoot()){

From e43d02fadb25c7cfce8e57f542e27b458c147a30 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Wed, 20 Jun 2012 20:18:26 +0200
Subject: [PATCH 0215/1224] fix encrypted flags not being saved correctly

---
 apps/files_encryption/lib/cryptstream.php | 2 +-
 apps/files_encryption/lib/proxy.php       | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/files_encryption/lib/cryptstream.php b/apps/files_encryption/lib/cryptstream.php
index 56331cbf60..c59a520a8d 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);
 	}
diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php
index 9fd57c0f02..052fff0bbb 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'];
 	}
 	
@@ -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 6524f6ad308101a36dc2e8b6dfe275d892a3c7be Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <GapczynskiM@gmail.com>
Date: Wed, 20 Jun 2012 19:24:07 -0400
Subject: [PATCH 0216/1224] Only call OC_FileCache::get('/Shared') if it exists
 in the file cache, prevents premature addition of the Shared folder to the
 file cache

---
 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 82eca1ce44..1d2a1ffcf0 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::get('');
-		$sharedInfo=OC_FileCache::get('/Shared');
+		// TODO Remove after merge of share_api
+		if (OC_FileCache::inCache('/Shared')) {
+			$sharedInfo=OC_FileCache::get('/Shared');
+		} else {
+			$sharedInfo = null;
+		}
 		$usedSpace=isset($rootInfo['size'])?$rootInfo['size']:0;
 		$usedSpace=isset($sharedInfo['size'])?$usedSpace-$sharedInfo['size']:$usedSpace;
 		$totalSpace=$this->getQuota();

From 43674b1759bafb04c917aa11e10dbec6ccc6ed53 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Thu, 21 Jun 2012 09:58:04 +0200
Subject: [PATCH 0217/1224] 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 37ed3b5bd20e516e9b99b024ff9d2ec0426fb1eb Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Thu, 21 Jun 2012 11:35:20 +0200
Subject: [PATCH 0218/1224] 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 f2ea84dd20..0193987889 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 3b4d2a971ac254432cf78570a8442654cdad09c0 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Thu, 21 Jun 2012 11:50:51 +0200
Subject: [PATCH 0219/1224] 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 5212fa3fa76b3cef3fc862e75dfd66fbb5ada688 Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <frank@owncloud.org>
Date: Thu, 21 Jun 2012 14:18:43 +0200
Subject: [PATCH 0220/1224] check if the data directory is accessible via http.
 Show a big security warning if yes

---
 lib/util.php                 | 41 ++++++++++++++++++++++++++++++++++++
 settings/admin.php           |  2 ++
 settings/css/settings.css    |  8 +++++--
 settings/templates/admin.php | 13 ++++++++++++
 4 files changed, 62 insertions(+), 2 deletions(-)

diff --git a/lib/util.php b/lib/util.php
index 1eeb70aca6..58d6ab1be7 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -417,5 +417,46 @@ class OC_Util {
 		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
index 88aae5bdb6..a6928bf82d 100644
--- 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',OC_Util::sanitizeHTML($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 6e9d2432e4..f45fa9bc01 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -48,7 +48,11 @@ 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; }
 /* Don't show blank images */
-img[src=""] { display:none}
\ No newline at end of file
+img[src=""] { display:none}
+
+/* ADMIN */
+span.securitywarning {color:#C33; font-weight:bold; }
+
diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index d167f2780e..9f839cf749 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -4,8 +4,21 @@
  * See the COPYING-README file.
  */
 $levels=array('Debug','Info','Warning','Error','Fatal');
+	
+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 288c5e7581509ed5ec8fdb622cf84544439c46b2 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Thu, 21 Jun 2012 15:19:49 +0200
Subject: [PATCH 0221/1224] 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 e0035c4df8..b575f5b9fd 100644
--- a/apps/calendar/lib/app.php
+++ b/apps/calendar/lib/app.php
@@ -343,6 +343,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 096f5598b43b4e1d60beb14d40ceacce61319ca4 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Thu, 21 Jun 2012 16:23:13 +0200
Subject: [PATCH 0222/1224] 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 8618d4a49f..e00e0cfeb1 100644
--- a/apps/calendar/ajax/events.php
+++ b/apps/calendar/ajax/events.php
@@ -27,7 +27,7 @@ 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);
+$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 7b4cb44af8016893113c0dd4cd6bdab269c98b0e Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Thu, 21 Jun 2012 17:37:53 +0200
Subject: [PATCH 0223/1224] truncate decrypted files based on size

---
 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                          |  22 +++++++--------
 8 files changed, 88 insertions(+), 29 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 62f6a8c236..12be5aefcb 100644
--- a/apps/files_encryption/lib/crypt.php
+++ b/apps/files_encryption/lib/crypt.php
@@ -205,12 +205,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 c59a520a8d..901e8cccbf 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 052fff0bbb..633ae6b93d 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::getCached($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::getCached($path,'/');
+			$data['size']=$cached['size'];
+		}
+		return $data;
+	}
+
+	public function postFileSize($path,$size){
+		if(self::isEncrypted($path)){
+			$cached=OC_FileCache::getCached($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 f93430fc9b..1d22bb34df 100644
--- a/lib/filecache.php
+++ b/lib/filecache.php
@@ -85,24 +85,20 @@ class OC_FileCache{
 			$root='';
 		}
 		$path=$root.$path;
-		if($path=='/'){
-			$parent=-1;
-		}else{
-			$parent=self::getFileId(dirname($path));
-		}
-		$id=self::getFileId($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]);
+		$parent=self::getParentId($path);
+		$id=self::getId($path,'');
+		if(isset(OC_FileCache::$savedData[$path])){
+			$data=array_merge(OC_FileCache::$savedData[$path],$data);
+			unset(OC_FileCache::$savedData[$path]);
 		}
 		if(!isset($data['size']) or !isset($data['mtime'])){//save incomplete data for the next time we write it
 			self::$savedData[$path]=$data;
 			return;
 		}
+		if($id!=-1){
+			self::update($id,$data);
+			return;
+		}
 		if(!isset($data['encrypted'])){
 			$data['encrypted']=false;
 		}

From da9107fe699e6e5dfe0df8921484178fee844f4c Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Thu, 21 Jun 2012 18:07:56 +0200
Subject: [PATCH 0224/1224] 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 901e8cccbf..9949c1896a 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 1d22bb34df..da9baa020a 100644
--- a/lib/filecache.php
+++ b/lib/filecache.php
@@ -91,14 +91,14 @@ class OC_FileCache{
 			$data=array_merge(OC_FileCache::$savedData[$path],$data);
 			unset(OC_FileCache::$savedData[$path]);
 		}
-		if(!isset($data['size']) or !isset($data['mtime'])){//save incomplete data for the next time we write it
-			self::$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
+			self::$savedData[$path]=$data;
+			return;
+		}
 		if(!isset($data['encrypted'])){
 			$data['encrypted']=false;
 		}

From bd8b921de4dac02463fa5b0099a22db4c45cd4f8 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Thu, 21 Jun 2012 18:35:12 +0200
Subject: [PATCH 0225/1224] 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 12be5aefcb..7d39d92667 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 46ad51cbe2501ef37603b186ae07886a5186c342 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Thu, 21 Jun 2012 18:53:10 +0200
Subject: [PATCH 0226/1224] 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 8aa7ed39a55e71cf6c054d40235a2dee99ca1b8a Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Sat, 16 Jun 2012 20:50:52 +0200
Subject: [PATCH 0227/1224] 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 52a1587ae3..e57e1e58a2 100644
--- a/lib/app.php
+++ b/lib/app.php
@@ -514,32 +514,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 71e2ed6388..0e7e370cd6 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -237,6 +237,7 @@ class OC{
 				}
 
 				OC_Config::setValue('version',implode('.',OC_Util::getVersion()));
+				OC_App::checkAppsRequirements();
 			}
 
 			OC_App::updateApps();

From a7e427a3cc85aaff75bffaf79d4a39d1a037946e Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Tue, 19 Jun 2012 17:54:19 +0200
Subject: [PATCH 0228/1224] 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 37e6dcd143..24435eab23 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 bae592d69b59462ed2ed50b132f391fd149d9f76 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Wed, 20 Jun 2012 17:10:17 +0200
Subject: [PATCH 0229/1224] 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 58d6ab1be7..5cd66ca12e 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -326,7 +326,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 dda56c5e3d363619070f18414cec61dcad3e5f3d Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Thu, 21 Jun 2012 18:20:25 +0200
Subject: [PATCH 0230/1224] 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 3cf175e646..596e2e2515 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;}
+.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 d75b5cfdd2e58569d2c9d1e3bc59fe87e51e2b2e Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Thu, 21 Jun 2012 18:21:15 +0200
Subject: [PATCH 0231/1224] 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 9045557258c1e4e2c86210ccfcee9d26b7b057ae Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Thu, 21 Jun 2012 18:21:38 +0200
Subject: [PATCH 0232/1224] 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 596e2e2515..f6333f57b8 100644
--- a/apps/tasks/css/style.css
+++ b/apps/tasks/css/style.css
@@ -57,3 +57,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 d72b85684f6b2dfe2d4103ce6f3d6c604d53c868 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Thu, 21 Jun 2012 20:51:23 +0200
Subject: [PATCH 0233/1224] 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 03516b3b70..8b8b0e0c7e 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 ca6339c480aeaa41dc82d677204abfaf77152f24 Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <frank@owncloud.org>
Date: Fri, 22 Jun 2012 09:25:41 +0200
Subject: [PATCH 0234/1224] 4.0.3

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

diff --git a/lib/util.php b/lib/util.php
index 5cd66ca12e..deda084027 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,00,2);
+		return array(4,00,3);
 	}
 
 	/**
@@ -91,7 +91,7 @@ class OC_Util {
 	 * @return string
 	 */
 	public static function getVersionString(){
-		return '4.0.2';
+		return '4.0.3';
 	}
 
         /**

From e5d458c0683acb409083a0e3f1baa4698ececda6 Mon Sep 17 00:00:00 2001
From: Brice Maron <brice@bmaron.net>
Date: Fri, 22 Jun 2012 10:46:49 +0200
Subject: [PATCH 0235/1224] 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 da9baa020a..b61068e795 100644
--- a/lib/filecache.php
+++ b/lib/filecache.php
@@ -129,6 +129,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 65c14e21ce0ff355366c126debcf88480959a0da Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Fri, 22 Jun 2012 11:30:40 +0200
Subject: [PATCH 0236/1224] 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 bc012a68c4..b05a33360a 100644
--- a/apps/calendar/js/calendar.js
+++ b/apps/calendar/js/calendar.js
@@ -661,10 +661,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 0d9534eb4b7bb0c1f62e32397fc1f7166934a32e Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Fri, 22 Jun 2012 12:42:07 +0200
Subject: [PATCH 0237/1224] 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 e5171da30057253570274f385eb97e411e961f12 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Fri, 22 Jun 2012 12:49:56 +0200
Subject: [PATCH 0238/1224] 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 b6c862b32f3e97df37e2bf06aed715334031daba Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Fri, 22 Jun 2012 13:58:15 +0200
Subject: [PATCH 0239/1224] use sanitizeHTML() function

Conflicts:

	apps/gallery/lib/tiles.php
---
 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 dcdf6aa1bf..53ea97ff05 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">'. \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 e943f6c0c8826315a613105b0313ce977298ebac Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Fri, 22 Jun 2012 16:53:45 +0200
Subject: [PATCH 0240/1224] log messages are looking nicer if they are not
 escaped. (xss prevention happens on another place)

---
 settings/js/log.js           | 2 +-
 settings/templates/admin.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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/>');
diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index 9f839cf749..f8c515369e 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -42,7 +42,7 @@ if(!$_['htaccessworking']) {
 				<?php echo $entry->app;?>
 			</td>
 			<td>
-				<?php echo htmlentities($entry->message);?>
+				<?php echo $entry->message;?>
 			</td>
 			<td>
 				<?php echo OC_Util::formatDate($entry->time);?>

From 60f558cdbb9f41410f2ba639325a6750032f536d Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Fri, 22 Jun 2012 17:16:34 +0200
Subject: [PATCH 0241/1224] 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 b591c830088cbde14d7cad3c205ddf929f07e33c 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 0242/1224] 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 a8868fa007bbf6ed52cf7044bdd1b891084fbab9 Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <frank@owncloud.org>
Date: Sat, 23 Jun 2012 16:20:31 +0200
Subject: [PATCH 0243/1224] work with non existing apps directory. thanks
 toAntonio for the hint

---
 lib/installer.php | 23 ++++++++++++-----------
 1 file changed, 12 insertions(+), 11 deletions(-)

diff --git a/lib/installer.php b/lib/installer.php
index 4069f2ab7c..c5ca0883d7 100644
--- a/lib/installer.php
+++ b/lib/installer.php
@@ -287,22 +287,23 @@ 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');
+		if($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');
+							}
 						}
 					}
 				}
 			}
+			closedir( $dir );
 		}
-		closedir( $dir );
 	}
 
 	/**

From 1c0e72cd5ac80c4ef80bd22cf3f0a3892807db4c 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 0244/1224] 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 f1e4c845ce9ee215d18a059fd53a13e91fbf9d8c Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sat, 23 Jun 2012 23:32:44 +0200
Subject: [PATCH 0245/1224] fix duplicates showing up in the filecache

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

diff --git a/lib/filecache.php b/lib/filecache.php
index b61068e795..68f1aa8fe6 100644
--- a/lib/filecache.php
+++ b/lib/filecache.php
@@ -86,7 +86,7 @@ class OC_FileCache{
 		}
 		$path=$root.$path;
 		$parent=self::getParentId($path);
-		$id=self::getId($path,'');
+		$id=self::getFileId($path);
 		if(isset(OC_FileCache::$savedData[$path])){
 			$data=array_merge(OC_FileCache::$savedData[$path],$data);
 			unset(OC_FileCache::$savedData[$path]);
@@ -130,9 +130,11 @@ 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;
-				else $arguments[] = $data[$attribute];
-				$arguments[]=$data[$attribute];
+				if($data[$attribute] === false){
+					$arguments[] = 0;
+				}else{
+					$arguments[] = $data[$attribute];
+				}
 				$queryParts[]=$attribute.'=?';
 			}
 		}

From 44e36ecf49090b988bf865825c11f70794eba023 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sat, 23 Jun 2012 23:42:54 +0200
Subject: [PATCH 0246/1224] fix 'files' entries showing up in Files before the
 users files are scanned properly

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

diff --git a/lib/filecache.php b/lib/filecache.php
index 68f1aa8fe6..a0ad2be4f7 100644
--- a/lib/filecache.php
+++ b/lib/filecache.php
@@ -267,7 +267,7 @@ class OC_FileCache{
 		}
 		$path=$root.$path;
 		$parent=self::getFileId($path);
-		if($path==-1){
+		if($parent==-1){
 			return array();
 		}
     $query=OC_DB::prepare('SELECT name,ctime,mtime,mimetype,size,encrypted,versioned,writable FROM *PREFIX*fscache WHERE parent=? AND (mimetype LIKE ? OR mimetype = ?)');

From a12557ca4d5f236c40ad3e08193d7fd481b5894b Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Sun, 24 Jun 2012 09:41:37 +0200
Subject: [PATCH 0247/1224] 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 0193987889..e5cf573c71 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 ac358ed1b3a1ecfa25bdaa4be5ca236020457e10 Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <frank@owncloud.org>
Date: Sun, 24 Jun 2012 11:38:54 +0200
Subject: [PATCH 0248/1224] 4.0.3a Two important fixes after 4.0.3

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

diff --git a/lib/util.php b/lib/util.php
index deda084027..d5d0d771a8 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -91,7 +91,7 @@ class OC_Util {
 	 * @return string
 	 */
 	public static function getVersionString(){
-		return '4.0.3';
+		return '4.0.3a';
 	}
 
         /**

From 5b908209de49dad257e016567821a8a5bd018f94 Mon Sep 17 00:00:00 2001
From: Brice Maron <brice@bmaron.net>
Date: Sun, 24 Jun 2012 15:11:58 +0000
Subject: [PATCH 0249/1224] 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 6da926f1c395526dddecda660b8b6972e04ba85e Mon Sep 17 00:00:00 2001
From: Brice Maron <brice@bmaron.net>
Date: Sun, 24 Jun 2012 15:58:51 +0000
Subject: [PATCH 0250/1224] 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 0083dbb3ce569960e564b0d9e48a7db7736e6599 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Mon, 25 Jun 2012 10:11:06 +0200
Subject: [PATCH 0251/1224] 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 9a2dbd3bae..da09c565cb 100644
--- a/apps/gallery/lib/managers.php
+++ b/apps/gallery/lib/managers.php
@@ -88,7 +88,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 85ac75b4f4bbe9f55ac5e959a76027cb1be3a68e Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Mon, 25 Jun 2012 12:38:11 +0200
Subject: [PATCH 0252/1224] xss vulnerability fixed

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

diff --git a/apps/gallery/templates/index.php b/apps/gallery/templates/index.php
index 1fdbea5957..e30052fafa 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 htmlentities($root); ?>";
+var root = "<?php echo $root; ?>";
 
 function explode(element) {
 	$('div', element).each(function(index, elem) {
@@ -64,7 +64,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 594e19bddc42ffcaa248cb55bb3e9a33d7d602c8 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Mon, 25 Jun 2012 13:16:35 +0200
Subject: [PATCH 0253/1224] 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 f4f75500c0..ffe6b3d2e9 100644
--- a/apps/user_ldap/lib_ldap.php
+++ b/apps/user_ldap/lib_ldap.php
@@ -449,7 +449,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;
 		}
@@ -521,7 +521,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]);
 							}
@@ -534,7 +534,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];
@@ -549,6 +549,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 56ed8ba70be35f56e4d34126780d704666089eca Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Mon, 25 Jun 2012 16:21:29 +0200
Subject: [PATCH 0254/1224] Select which address book to add a contact to.
 Fixes oc-1071.

---
 apps/contacts/ajax/selectaddressbook.php      | 24 ++++++++++++
 apps/contacts/js/contacts.js                  | 38 +++++++++++++++++--
 .../templates/part.selectaddressbook.php      | 10 +++++
 3 files changed, 68 insertions(+), 4 deletions(-)
 create mode 100644 apps/contacts/ajax/selectaddressbook.php
 create mode 100644 apps/contacts/templates/part.selectaddressbook.php

diff --git a/apps/contacts/ajax/selectaddressbook.php b/apps/contacts/ajax/selectaddressbook.php
new file mode 100644
index 0000000000..e5527c8e5f
--- /dev/null
+++ b/apps/contacts/ajax/selectaddressbook.php
@@ -0,0 +1,24 @@
+<?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');
+
+$books = OC_Contacts_Addressbook::all(OCP\USER::getUser());
+if(count($books) > 1) {
+	$addressbooks = array();
+	foreach($books as $book) {
+		$addressbooks[] = array('id' => $book['id'], 'name' => $book['displayname']);
+	}
+	$tmpl = new OCP\Template("contacts", "part.selectaddressbook");
+	$tmpl->assign('addressbooks', $addressbooks);
+	$page = $tmpl->fetchPage();
+	OCP\JSON::success(array('data' => array( 'type' => 'dialog', 'page' => $page )));
+} else {
+	OCP\JSON::success(array('data' => array( 'type' => 'result', 'id' => $books[0]['id'] )));
+}
\ No newline at end of file
diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index 4365995686..2a37a7ff9e 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -288,9 +288,39 @@ Contacts={
 				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);
-				Contacts.UI.Card.add(';;;;;', '', '', true);
+				this.id = ''; this.bookid = '', this.fn = ''; this.fullname = ''; this.givname = ''; this.famname = ''; this.addname = ''; this.honpre = ''; this.honsuf = '';
+				self = this;
+				$.getJSON(OC.filePath('contacts', 'ajax', 'selectaddressbook.php'),{},function(jsondata) {
+					if(jsondata.status == 'success') {
+						if(jsondata.data.type == 'dialog') {
+							// Load dialog to select addressbook.
+							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() {
+												Contacts.UI.Card.add(';;;;;', '',$('#selectaddressbook_dialog').find('select').val(), true);
+												$(this).dialog('close');
+											},
+											'Cancel':function() { $(this).dialog('close'); }
+										},
+										close: function(event, ui) {
+											$(this).dialog('destroy').remove();
+										}
+									});
+								});
+							}
+						} else {
+							Contacts.UI.Card.bookid = jsondata.data.id;
+							Contacts.UI.Card.add(';;;;;', '',jsondata.data.id, true);
+						}
+					} else {
+						OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
+					}
+				});
 				return false;
 			},
 			add:function(n, fn, aid, isnew){ // add a new contact
@@ -304,7 +334,7 @@ Contacts={
 								if(jsondata.status == 'success'){
 									Contacts.UI.Card.loadContact(jsondata.data);
 									$('#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 item = $('<li role="button" data-id="'+jsondata.data.id+'" data-book-id="'+aid+'" 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(){
 										if ($(this).text().toLowerCase() > Contacts.UI.Card.fn.toLowerCase()) {
diff --git a/apps/contacts/templates/part.selectaddressbook.php b/apps/contacts/templates/part.selectaddressbook.php
new file mode 100644
index 0000000000..38b8a4b767
--- /dev/null
+++ b/apps/contacts/templates/part.selectaddressbook.php
@@ -0,0 +1,10 @@
+<div id="selectaddressbook_dialog" title="<?php echo $l->t("Select Address Books"); ?>">
+<form>
+<select id="adr_type" name="parameters[ADR][TYPE]" size="1">
+	<?php foreach($_['addressbooks'] as $addressbook) { ?>
+	<option value="<?php echo $addressbook['id']; ?>"><?php echo $addressbook['name']; ?></option>
+	<?php } ?>
+</select>
+</form>
+</div>
+

From 42a5cd21b989c887caed6247941c03cf279f98a1 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Mon, 25 Jun 2012 17:15:33 +0200
Subject: [PATCH 0255/1224] 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 7805db7d64..c7c6555f68 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 ad5aa5ac15e3df759a7044c6e9ecfd6282c2298a Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Mon, 25 Jun 2012 17:16:34 +0200
Subject: [PATCH 0256/1224] Try to conserve some memory. Should fix oc-1106 for
 stable4.

---
 apps/contacts/ajax/contacts.php | 9 ++++++++-
 apps/contacts/index.php         | 8 ++++++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/apps/contacts/ajax/contacts.php b/apps/contacts/ajax/contacts.php
index 37d396cd83..45c54f90bc 100644
--- a/apps/contacts/ajax/contacts.php
+++ b/apps/contacts/ajax/contacts.php
@@ -11,7 +11,14 @@ OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('contacts');
 
 $ids = OC_Contacts_Addressbook::activeIds(OCP\USER::getUser());
-$contacts = OC_Contacts_VCard::all($ids);
+$allcontacts = OC_Contacts_VCard::all($ids);
+$contacts = array();
+foreach($allcontacts as $contact) { // try to conserve some memory
+	$contacts[] = array('id' => $contact['id'], 'addressbookid' => $contact['addressbookid'], 'fullname' => $contact['fullname']);
+}
+unset($allcontacts);
+$addressbooks = OC_Contacts_Addressbook::active(OCP\USER::getUser());
+
 $tmpl = new OCP\Template("contacts", "part.contacts");
 $tmpl->assign('contacts', $contacts);
 $page = $tmpl->fetchPage();
diff --git a/apps/contacts/index.php b/apps/contacts/index.php
index 74b7c43c55..994539e9fc 100644
--- a/apps/contacts/index.php
+++ b/apps/contacts/index.php
@@ -14,8 +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());
-$contacts = OC_Contacts_VCard::all($ids);
-
+$allcontacts = OC_Contacts_VCard::all($ids);
+$contacts = array();
+foreach($allcontacts as $contact) { // try to conserve some memory
+	$contacts[] = array('id' => $contact['id'], 'addressbookid' => $contact['addressbookid'], 'fullname' => $contact['fullname']);
+}
+unset($allcontacts);
 $addressbooks = OC_Contacts_Addressbook::active(OCP\USER::getUser());
 
 // Load the files we need

From 2ad93849ab72ee60ab0605aee043590dd1e24bec Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Mon, 25 Jun 2012 19:33:51 +0200
Subject: [PATCH 0257/1224] Idiot proof dialog ;-)

---
 apps/contacts/js/contacts.js                      |  2 +-
 .../contacts/templates/part.selectaddressbook.php | 15 +++++++++++----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
index 2a37a7ff9e..a87f7ca10d 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -302,7 +302,7 @@ Contacts={
 										modal: true, height: 'auto', width: 'auto',
 										buttons: {
 											'Ok':function() {
-												Contacts.UI.Card.add(';;;;;', '',$('#selectaddressbook_dialog').find('select').val(), true);
+												Contacts.UI.Card.add(';;;;;', '',$('#selectaddressbook_dialog').find('input:checked').val(), true);
 												$(this).dialog('close');
 											},
 											'Cancel':function() { $(this).dialog('close'); }
diff --git a/apps/contacts/templates/part.selectaddressbook.php b/apps/contacts/templates/part.selectaddressbook.php
index 38b8a4b767..4b152a6e1d 100644
--- a/apps/contacts/templates/part.selectaddressbook.php
+++ b/apps/contacts/templates/part.selectaddressbook.php
@@ -1,10 +1,17 @@
 <div id="selectaddressbook_dialog" title="<?php echo $l->t("Select Address Books"); ?>">
 <form>
-<select id="adr_type" name="parameters[ADR][TYPE]" size="1">
-	<?php foreach($_['addressbooks'] as $addressbook) { ?>
-	<option value="<?php echo $addressbook['id']; ?>"><?php echo $addressbook['name']; ?></option>
+<table>
+	<?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['name']; ?></label>
+		</td>
+	</tr>
 	<?php } ?>
-</select>
+</table>
 </form>
 </div>
 

From b1f3364eee449a25e55833bea6d716125e0cb8dd Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Mon, 25 Jun 2012 19:42:38 +0200
Subject: [PATCH 0258/1224] Maybe fix out of memory..?

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

diff --git a/lib/vcategories.php b/lib/vcategories.php
index ee357c350d..ee7a1d2883 100644
--- a/lib/vcategories.php
+++ b/lib/vcategories.php
@@ -135,8 +135,9 @@ class OC_VCategories {
 			$vobject = OC_VObject::parse($object);
 			if(!is_null($vobject)) {
 				$this->loadFromVObject($vobject, $sync);
+				unset($vobject);
 			} else {
-                                OC_Log::write('core','OC_VCategories::rescan, unable to parse. ID: '.', '.substr($object, 0, 100).'(...)', OC_Log::DEBUG);				
+				OC_Log::write('core','OC_VCategories::rescan, unable to parse. ID: '.', '.substr($object, 0, 100).'(...)', OC_Log::DEBUG);				
 			}
 		}
 		$this->save();

From a72eddeef780fbff10d53478d20672255fb78643 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Mon, 25 Jun 2012 20:53:31 +0200
Subject: [PATCH 0259/1224] 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 ffe6b3d2e9..f3b0b993ce 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 595ff468f56488d2df25def17524f528bf5da33d Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Tue, 26 Jun 2012 10:35:19 +0200
Subject: [PATCH 0260/1224] 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 265d7e50f55978a3bebfa077aa8552d5ea1b0c59 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Tue, 26 Jun 2012 12:51:32 +0200
Subject: [PATCH 0261/1224] 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 ae00f40b970b8a0a99413bc210e028d18132c3ca Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Tue, 26 Jun 2012 15:20:29 +0200
Subject: [PATCH 0262/1224] 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 4212bf5a32..2a6ceaf468 100644
--- a/apps/calendar/lib/object.php
+++ b/apps/calendar/lib/object.php
@@ -210,6 +210,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 d163fe02cd05c30a223c757b138acd8a35f898f3 Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <frank@owncloud.org>
Date: Tue, 26 Jun 2012 21:51:32 +0200
Subject: [PATCH 0263/1224] 4.0.4

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

diff --git a/lib/util.php b/lib/util.php
index d5d0d771a8..a16559c54b 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,00,3);
+		return array(4,00,4);
 	}
 
 	/**
@@ -91,7 +91,7 @@ class OC_Util {
 	 * @return string
 	 */
 	public static function getVersionString(){
-		return '4.0.3a';
+		return '4.0.4';
 	}
 
         /**

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 0264/1224] 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 0265/1224] 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 0266/1224] 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 0267/1224] 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 0268/1224] 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 0269/1224] 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 0270/1224] 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 0271/1224] 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 0272/1224] 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 0273/1224] 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 0274/1224] 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 0275/1224] 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 0276/1224] 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 0277/1224] 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 0278/1224] 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 0279/1224] 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 0280/1224] 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 0281/1224] 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 0282/1224] $_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 0283/1224] 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 0284/1224] 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 7af76e36e12a80225a18c1bcd89e3ed1c865aaeb Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Wed, 27 Jun 2012 11:39:49 +0200
Subject: [PATCH 0285/1224] 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 a87f7ca10d..a2a7b1bb38 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 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 0286/1224] 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 c0e86489c9d60625c3d415e45c046afc279fca43 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Wed, 27 Jun 2012 15:56:14 +0200
Subject: [PATCH 0287/1224] 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 1d107c1bda..92ca3ed898 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 895d5707ee63849c8ff5ee2619a2cdaf9f6dc6af Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Wed, 27 Jun 2012 12:07:42 -0400
Subject: [PATCH 0288/1224] 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 3bb6e73035..d46a7d4e70 100644
--- a/apps/files_sharing/sharedstorage.php
+++ b/apps/files_sharing/sharedstorage.php
@@ -81,8 +81,8 @@ class OC_Filestorage_Shared extends OC_Filestorage {
 					$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 45e964c7aae9c6b599f76549a9f69e2103d503f0 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Wed, 27 Jun 2012 20:23:42 -0400
Subject: [PATCH 0289/1224] 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 9c083d3519d29cd4f139cb1b28f2bec0c76634ce Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Thu, 28 Jun 2012 21:26:39 -0400
Subject: [PATCH 0290/1224] 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 0de0d1df3b..6ee7fb04f0 100644
--- a/settings/js/users.js
+++ b/settings/js/users.js
@@ -115,7 +115,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 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 0291/1224] 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 0292/1224] 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 0293/1224] 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 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 0294/1224] 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 0295/1224] 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 0296/1224] 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 0297/1224] 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 0298/1224] 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 fa7d4c2b3966f92963bdfd7ef0cc58659f475f64 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@statuscode.ch>
Date: Sun, 1 Jul 2012 13:45:20 +0200
Subject: [PATCH 0299/1224] Disable mimesniffing

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

diff --git a/lib/json.php b/lib/json.php
index dfc0a7b894..de655ebf33 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;
 		}
 	}
@@ -85,11 +87,11 @@ 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();
 			}
 			echo json_encode($data);
-		}
 	}
 }

From 5121c262e2c900de743637d206b18c2aeb43c25d Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Sun, 1 Jul 2012 11:31:01 -0400
Subject: [PATCH 0300/1224] 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 6ee7fb04f0..b0ca3ad0e1 100644
--- a/settings/js/users.js
+++ b/settings/js/users.js
@@ -213,6 +213,5 @@ $(document).ready(function(){
 				}
 			}
 		);
-	    location.reload();
 	});
 });

From 949cab7ea17ed7e12b27886d46f45e541b138850 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Fri, 29 Jun 2012 16:29:58 -0400
Subject: [PATCH 0301/1224] 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 b0ca3ad0e1..020aff885e 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 dd7d34a40eca404240da6923115d375d041b1bd1 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Fri, 29 Jun 2012 16:44:08 -0400
Subject: [PATCH 0302/1224] 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 ffadbfcef31da78f824161652c9c18aeb57f502d Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Fri, 29 Jun 2012 17:52:24 -0400
Subject: [PATCH 0303/1224] 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 020aff885e..784f8b888c 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 bf93dd4661445560a62281284132e23cd48e9839 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Sun, 1 Jul 2012 11:53:29 -0400
Subject: [PATCH 0304/1224] 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 96c9017dbf..afe31a75d0 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 8b5cae3c6c9ac7c949ab2cec5c2c4f32e35c944f Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Sun, 1 Jul 2012 21:50:53 +0200
Subject: [PATCH 0305/1224] 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 c0ecdbd1b7..868f8881ec 100644
--- a/lib/l10n.php
+++ b/lib/l10n.php
@@ -94,7 +94,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 134d5d93c882812ed5c448421c542a4d7f56dc91 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@statuscode.ch>
Date: Mon, 2 Jul 2012 10:21:38 +0200
Subject: [PATCH 0306/1224] Don't display error messages

---
 lib/l10n.php | 73 +++++++++++++++++++++++++++++++++++++++-------------
 1 file changed, 55 insertions(+), 18 deletions(-)

diff --git a/lib/l10n.php b/lib/l10n.php
index c0ecdbd1b7..c5967109a6 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
@@ -39,6 +39,16 @@ class OC_L10N{
 	 */
 	protected static $language = '';
 	
+	/**
+	 * App of this object
+	 */
+	protected $app;
+
+	/**
+	 * Language of this object
+	 */
+	protected $lang;
+
 	/**
 	 * Translations
 	 */
@@ -77,6 +87,17 @@ class OC_L10N{
 	 * language.
 	 */
 	public function __construct($app, $lang = null){
+		$this->app = $app;
+		$this->lang = $lang;
+	}
+		
+	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);
@@ -92,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($i18ndir.$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
@@ -123,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);
 	}
 
 	/**
@@ -140,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;
 	}
@@ -152,6 +170,7 @@ class OC_L10N{
 	 * Returns an associative array with all translations
 	 */
 	public function getTranslations(){
+		$this->init();
 		return $this->translations;
 	}
 
@@ -178,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
@@ -224,23 +244,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){
@@ -263,8 +289,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/';
@@ -292,4 +318,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 52237248096338ae41b3a0c884ea6cae0ac3fce3 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@statuscode.ch>
Date: Mon, 2 Jul 2012 10:28:11 +0200
Subject: [PATCH 0307/1224] Wrong file - Sorry!

---
 lib/l10n.php | 75 +++++++++++++---------------------------------------
 1 file changed, 19 insertions(+), 56 deletions(-)

diff --git a/lib/l10n.php b/lib/l10n.php
index de8514573d..c0ecdbd1b7 100644
--- a/lib/l10n.php
+++ b/lib/l10n.php
@@ -3,7 +3,7 @@
  * ownCloud
  *
  * @author Jakob Sack
- * @copyright 2012 Frank Karlitschek frank@owncloud.org
+ * @copyright 2010 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
@@ -39,16 +39,6 @@ class OC_L10N{
 	 */
 	protected static $language = '';
 	
-	/**
-	 * App of this object
-	 */
-	protected $app;
-
-	/**
-	 * Language of this object
-	 */
-	protected $lang;
-
 	/**
 	 * Translations
 	 */
@@ -87,17 +77,6 @@ class OC_L10N{
 	 * language.
 	 */
 	public function __construct($app, $lang = null){
-		$this->app = $app;
-		$this->lang = $lang;
-	}
-		
-	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);
@@ -113,13 +92,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((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')) {
+			if(file_exists($i18ndir.$lang.'.php')){
 				// Include the file, save the data from $CONFIG
-				include(strip_tags($i18ndir).strip_tags($lang).'.php');
+				include($i18ndir.$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
@@ -144,7 +123,10 @@ class OC_L10N{
 	 * returned.
 	 */
 	public function t($text, $parameters = array()){
-		return new OC_L10N_String($this, $text, $parameters);
+		if(array_key_exists($text, $this->translations)){
+			return vsprintf($this->translations[$text], $parameters);
+		}
+		return vsprintf($text, $parameters);
 	}
 
 	/**
@@ -158,7 +140,7 @@ class OC_L10N{
 	public function tA($textArray){
 		$result = array();
 		foreach($textArray as $key => $text){
-			$result[$key] = (string)$this->t($text);
+			$result[$key] = $this->t($text);
 		}
 		return $result;
 	}
@@ -170,7 +152,6 @@ class OC_L10N{
 	 * Returns an associative array with all translations
 	 */
 	public function getTranslations(){
-		$this->init();
 		return $this->translations;
 	}
 
@@ -197,7 +178,6 @@ 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
@@ -244,29 +224,23 @@ 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(is_array($app)){
-				$available = $app;
-				$lang_exists = array_search($lang, $available) !== false;
-			}
-			else {
-				$lang_exists = self::languageExists($app, $lang);
-			}
-			if($lang_exists){
+			if(array_search($lang, $available) !== false){
 				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){
@@ -289,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_App::getAppPath($app).'/l10n/')){
-				$i18ndir = OC_App::getAppPath($app).'/l10n/';
+			if(file_exists(OC::$APPSROOT.'/apps/'.$app.'/l10n/')){
+				$i18ndir = OC::$APPSROOT.'/apps/'.$app.'/l10n/';
 			}
 			else{
 				$i18ndir = OC::$SERVERROOT.'/'.$app.'/l10n/';
@@ -318,15 +292,4 @@ 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 e29681e233c46080cb7aebf59bfbb8134d631e4a Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@statuscode.ch>
Date: Mon, 2 Jul 2012 10:29:04 +0200
Subject: [PATCH 0308/1224] Applying the fix

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

diff --git a/lib/l10n.php b/lib/l10n.php
index c0ecdbd1b7..1b761c47d5 100644
--- a/lib/l10n.php
+++ b/lib/l10n.php
@@ -100,7 +100,7 @@ class OC_L10N{
 				}
 			}
 
-			if(file_exists(OC::$SERVERROOT.'/core/l10n/l10n-'.$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(OC::$SERVERROOT.'/core/l10n/l10n-'.$lang.'.php');
 				if(isset($LOCALIZATIONS) && is_array($LOCALIZATIONS)){

From 47bad2013214ddc60a302d9ae807d344534c5004 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@statuscode.ch>
Date: Mon, 2 Jul 2012 10:47:45 +0200
Subject: [PATCH 0309/1224] Restoring stable4...

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

diff --git a/lib/l10n.php b/lib/l10n.php
index 1b761c47d5..d47637d23d 100644
--- a/lib/l10n.php
+++ b/lib/l10n.php
@@ -92,7 +92,7 @@ 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::$APPSROOT."/apps") || 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($i18ndir.$lang.'.php');
 				if(isset($TRANSLATIONS) && is_array($TRANSLATIONS)){
@@ -100,7 +100,7 @@ class OC_L10N{
 				}
 			}
 
-			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')) {
+			if(file_exists(OC::$SERVERROOT.'/core/l10n/l10n-'.$lang.'.php')){
 				// Include the file, save the data from $CONFIG
 				include(OC::$SERVERROOT.'/core/l10n/l10n-'.$lang.'.php');
 				if(isset($LOCALIZATIONS) && is_array($LOCALIZATIONS)){

From 0465129eba282ffcd0739569bb15494b34035b9a Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@statuscode.ch>
Date: Mon, 2 Jul 2012 12:19:48 +0200
Subject: [PATCH 0310/1224] =?UTF-8?q?Remove=20the=20forced=20download?=
 =?UTF-8?q?=C2=A7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/json.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/lib/json.php b/lib/json.php
index de655ebf33..78fbf56436 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 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 0311/1224] 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 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 0312/1224] 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 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 0313/1224] 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 0314/1224] 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 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 0315/1224] 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 0316/1224] 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 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 0317/1224] 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 0318/1224] 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 f72a11f852052ed3c6f2b6385a48b049ae08e01d Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Wed, 4 Jul 2012 13:49:39 +0200
Subject: [PATCH 0319/1224] 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 9aa63f016c..6163c60630 100644
--- a/apps/contacts/css/contacts.css
+++ b/apps/contacts/css/contacts.css
@@ -8,10 +8,10 @@
 #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; }
-#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;*/  -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 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 266fba7ae1..1a10318817 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">
 
@@ -98,19 +94,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="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>
-		<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="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="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>
+			<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="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 5fb9b3e9650fd6935010535197b274027a888243 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Wed, 4 Jul 2012 15:32:41 +0200
Subject: [PATCH 0320/1224] Disable expires header on thumbnail and photo.

---
 apps/contacts/photo.php     | 2 +-
 apps/contacts/thumbnail.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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'));
 }
diff --git a/apps/contacts/thumbnail.php b/apps/contacts/thumbnail.php
index 5b340042a2..a64b09b671 100644
--- a/apps/contacts/thumbnail.php
+++ b/apps/contacts/thumbnail.php
@@ -27,7 +27,7 @@ OCP\JSON::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'));
 }

From b11b6afbb9364b722b5b20213165803f7c2732aa Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Thu, 5 Jul 2012 00:25:38 +0200
Subject: [PATCH 0321/1224] Hopefully fix for drag'n'drop import in oc-813.

---
 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 a2a7b1bb38..c83390b5bf 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -1427,7 +1427,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 0045e64041661004375cff07baee8b8d361ff599 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Fri, 6 Jul 2012 16:38:54 -0400
Subject: [PATCH 0322/1224] 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 89a20a529f..8a60f70e1d 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -519,5 +519,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 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 0323/1224] 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 746eef0d5ccb2b2b235bf2ad7844b1a71e44ed2f Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sun, 8 Jul 2012 14:31:40 +0200
Subject: [PATCH 0324/1224] Format error response correctly.

---
 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 1a07781b9d..3891a6d742 100644
--- a/apps/contacts/import.php
+++ b/apps/contacts/import.php
@@ -108,7 +108,7 @@ if(count($parts) == 1){
 $imported = 0;
 $failed = 0;
 if(!count($importready) > 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($importready as $import){

From 47f96e2d5e73cdf95cf563df8586570e027bb710 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sun, 8 Jul 2012 14:42:33 +0200
Subject: [PATCH 0325/1224] Missing semi-colon.

---
 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 3891a6d742..b2c55bd42a 100644
--- a/apps/contacts/import.php
+++ b/apps/contacts/import.php
@@ -108,7 +108,7 @@ if(count($parts) == 1){
 $imported = 0;
 $failed = 0;
 if(!count($importready) > 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($importready as $import){

From 554cb2d3ab559a2ebfc9f3ffea3e12db7a5c5983 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sun, 8 Jul 2012 14:48:49 +0200
Subject: [PATCH 0326/1224] Add missing requesttoken.

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

diff --git a/apps/contacts/ajax/loadcard.php b/apps/contacts/ajax/loadcard.php
index 4e6f2206fe..09b6bbe0cf 100644
--- a/apps/contacts/ajax/loadcard.php
+++ b/apps/contacts/ajax/loadcard.php
@@ -51,6 +51,7 @@ $email_types = OC_Contacts_App::getTypesOfProperty('EMAIL');
 
 $tmpl = new OCP\Template('contacts','part.contact');
 $tmpl->assign('uploadMaxFilesize', $maxUploadFilesize);
+$tmpl->assign('requesttoken', $_SERVER['HTTP_REQUESTTOKEN']);
 $tmpl->assign('uploadMaxHumanFilesize', OCP\Util::humanFileSize($maxUploadFilesize));
 $tmpl->assign('adr_types',$adr_types);
 $tmpl->assign('phone_types',$phone_types);

From 25b95a9ec7da492e43c26ba5d6f38c773cecd39f Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sun, 8 Jul 2012 15:41:38 +0200
Subject: [PATCH 0327/1224] Improve checking for active addressbooks and
 creating default addressbook.

---
 apps/contacts/lib/addressbook.php | 23 ++++++++++++++++++-----
 apps/contacts/lib/vcard.php       | 16 +++++++++++-----
 2 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/apps/contacts/lib/addressbook.php b/apps/contacts/lib/addressbook.php
index 79445ceeee..73b30e942f 100644
--- a/apps/contacts/lib/addressbook.php
+++ b/apps/contacts/lib/addressbook.php
@@ -169,16 +169,26 @@ class OC_Contacts_Addressbook{
 			$uid = OCP\USER::getUser();
 		}
 		$prefbooks = OCP\Config::getUserValue($uid,'contacts','openaddressbooks',null);
+		$prefbooks = explode(';',$prefbooks);
+		for ($i = 0; $i < count($prefbooks); $i++) {
+			if(!self::find($prefbooks[$i])) {
+				unset($prefbooks[$i]);
+			}
+		}
 		if(!$prefbooks){
+			OCP\Util::writeLog('contacts','OC_Contacts_Addressbook:activeIds:, No active addressbooks',OCP\Util::DEBUG);
 			$addressbooks = OC_Contacts_Addressbook::all($uid);
 			if(count($addressbooks) == 0){
-				OC_Contacts_Addressbook::add($uid,'default','Default Address Book');
+				OCP\Util::writeLog('contacts','OC_Contacts_Addressbook:activeIds:, No addressbooks',OCP\Util::DEBUG);
+				$id = self::add($uid,'default','Default Address Book');
+				OCP\Util::writeLog('contacts','OC_Contacts_Addressbook:activeIds:, Created addressbook: '.$id,OCP\Util::DEBUG);
+				self::setActive($id, true);
 				$addressbooks = OC_Contacts_Addressbook::all($uid);
 			}
-			$prefbooks = $addressbooks[0]['id'];
-			OCP\Config::setUserValue($uid,'contacts','openaddressbooks',$prefbooks);
+			$prefbooks[] = $addressbooks[0]['id'];
+			OCP\Config::setUserValue($uid,'contacts','openaddressbooks',implode(';',$prefbooks));
 		}
-		return explode(';',$prefbooks);
+		return $prefbooks;
 	}
 
 	/**
@@ -189,6 +199,9 @@ class OC_Contacts_Addressbook{
 	public static function active($uid){
 		$active = self::activeIds($uid);
 		$addressbooks = array();
+		if(!$active) {
+			return $addressbooks;
+		}
 		$ids_sql = join(',', array_fill(0, count($active), '?'));
 		$prep = 'SELECT * FROM *PREFIX*contacts_addressbooks WHERE id IN ('.$ids_sql.') ORDER BY displayname';
 		try {
@@ -213,7 +226,7 @@ class OC_Contacts_Addressbook{
 	 * @param integer $name
 	 * @return boolean
 	 */
-	public static function setActive($id,$active){
+	public static function setActive($id,$active=true){
 		// Need these ones for checking uri
 		//$addressbook = self::find($id);
 
diff --git a/apps/contacts/lib/vcard.php b/apps/contacts/lib/vcard.php
index 71a874d783..2868643387 100644
--- a/apps/contacts/lib/vcard.php
+++ b/apps/contacts/lib/vcard.php
@@ -49,25 +49,31 @@ class OC_Contacts_VCard{
 	 */
 	public static function all($id){
 		$result = null;
-		if(is_array($id)) {
+		if(is_array($id) && count($id) > 1) {
 			$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::DEBUG);
-				OCP\Util::writeLog('contacts','OC_Contacts_VCard:all, ids: '.join(',', $id),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: '.count($id).' '.join(',', $id),OCP\Util::DEBUG);
 				OCP\Util::writeLog('contacts','SQL:'.$prep,OCP\Util::DEBUG);
 			}
 		} elseif($id) {
+			if(is_array($id)) {
+				$id = $id[0];
+			}
 			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','OC_Contacts_VCard:all:, exception: '.$e->getMessage(),OCP\Util::ERROR);
+				OCP\Util::writeLog('contacts','OC_Contacts_VCard:all, id: '. $id,OCP\Util::DEBUG);
 			}
+		} else {
+			OCP\Util::writeLog('contacts','OC_Contacts_VCard:all: No ID given.',OCP\Util::ERROR);
+			return array();
 		}
 		$cards = array();
 		if(!is_null($result)) {

From d730d3edd40d6e8ef49022321e40392f6e0be45b Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sun, 8 Jul 2012 16:10:12 +0200
Subject: [PATCH 0328/1224] 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 c83390b5bf..f5ce919b1d 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -628,7 +628,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();
@@ -651,7 +651,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;
@@ -663,7 +663,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 747b7fbbfe54fd8475e317ce52ee7fc3b914f377 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sun, 8 Jul 2012 16:15:52 +0200
Subject: [PATCH 0329/1224] 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 f5ce919b1d..7f260ea54d 100644
--- a/apps/contacts/js/contacts.js
+++ b/apps/contacts/js/contacts.js
@@ -669,7 +669,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;
 						}
@@ -682,13 +682,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 197086a9529b4a4ae778b252248fdffcd7b93c40 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sun, 8 Jul 2012 18:28:55 +0200
Subject: [PATCH 0330/1224] Make it possible to import files using CR as eol.

---
 apps/contacts/import.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/apps/contacts/import.php b/apps/contacts/import.php
index b2c55bd42a..85d4cebeb0 100644
--- a/apps/contacts/import.php
+++ b/apps/contacts/import.php
@@ -10,6 +10,9 @@ ob_start();
  
 OCP\JSON::checkLoggedIn();
 OCP\App::checkAppEnabled('contacts');
+session_write_close();
+
+$cr = "\r";
 $nl = "\n";
 $progressfile = 'import_tmp/' . md5(session_id()) . '.txt';
 
@@ -52,6 +55,10 @@ writeProgress('20');
 $searchfor = array('VCARD');
 $parts = $searchfor;
 $filearr = explode($nl, $file);
+if(count($filearr) == 1) { // Mac eol
+	$filearr = explode($cr, $file);
+}
+
 $inelement = false;
 $parts = array();
 $i = 0;

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 0331/1224] 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 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 0332/1224] 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 539e4a1813b085a2cc42a18304bde5855c5ab2dc Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Thu, 24 May 2012 18:22:33 +0200
Subject: [PATCH 0333/1224] smb filestorage backend

---
 3rdparty/smb4php/smb.php             | 439 +++++++++++++++++++++++++++
 apps/files_external/appinfo/app.php  |   1 +
 apps/files_external/lib/smb.php      | 120 ++++++++
 apps/files_external/tests/config.php |   7 +
 apps/files_external/tests/smb.php    |  30 ++
 5 files changed, 597 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 784ed032d4..fac042232a 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';
+OC::$CLASSPATH['OC_Filestorage_SMB']='apps/files_external/lib/smb.php';
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 8fcce55e76d3201c01cec1eb6024a887696eb800 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Thu, 24 May 2012 19:39:14 +0200
Subject: [PATCH 0334/1224] 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 fac042232a..87846f1713 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 c431070e24..4d5ae670de 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 a1fefea66fb9688435948711910b7d25a47759dd Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Fri, 8 Jun 2012 01:29:46 +0200
Subject: [PATCH 0335/1224] 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 35b5fa0386..1b47618e47 100644
--- a/apps/files_external/tests/config.php
+++ b/apps/files_external/tests/config.php
@@ -34,6 +34,7 @@ return array(
 		'user'=>'test',
 		'password'=>'test',
 		'host'=>'localhost',
-		'root'=>'/test',
+		'share'=>'/test',
+		'root'=>'/test/',
 	),
 );
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 8a902d8f6581dd8a3119e04a6e215d4b3336337d Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sun, 17 Jun 2012 02:54:23 +0200
Subject: [PATCH 0336/1224] 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 f594fbb880..b9bbc0a523 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 aeed130b3a14d2b2ca4ca6c3c8a75488e52d36bf Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sun, 17 Jun 2012 02:59:38 +0200
Subject: [PATCH 0337/1224] 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 b9bbc0a523..801f3d1c88 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 7f57591ef1e2a7528752674595a32b35cfce4cd3 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sun, 17 Jun 2012 03:09:49 +0200
Subject: [PATCH 0338/1224] 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 801f3d1c88..96470002c3 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 b8a6ffe261268603f2ed8e0c1cd91969ea6a1863 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sun, 17 Jun 2012 02:42:40 +0200
Subject: [PATCH 0339/1224] 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 71f9a6c09324f841e0c59d2384ff3ec94b941c82 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Tue, 10 Jul 2012 14:40:25 +0200
Subject: [PATCH 0340/1224] dont throw errors when opening a dir using fopen
 over the smb streamwrapper

---
 3rdparty/smb4php/smb.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/3rdparty/smb4php/smb.php b/3rdparty/smb4php/smb.php
index 12c5890723..c50b26b935 100644
--- a/3rdparty/smb4php/smb.php
+++ b/3rdparty/smb4php/smb.php
@@ -166,6 +166,8 @@ class smb {
 						return false;
 					}elseif(substr($regs[0],0,31)=='NT_STATUS_OBJECT_PATH_NOT_FOUND'){
 						return false;
+					}elseif(substr($regs[0],0,29)=='NT_STATUS_FILE_IS_A_DIRECTORY'){
+						return false;
 					}
 					trigger_error($regs[0].' params('.$params.')', E_USER_ERROR);
 			}

From b470869114f7b6d7550fd8a32f82ea4fb6e361e7 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Tue, 10 Jul 2012 14:42:15 +0200
Subject: [PATCH 0341/1224] when checking for updates in the filecache,
 explicitly state that we are querying a folder

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

diff --git a/lib/filecache.php b/lib/filecache.php
index a0ad2be4f7..57c6f1915c 100644
--- a/lib/filecache.php
+++ b/lib/filecache.php
@@ -256,7 +256,7 @@ class OC_FileCache{
 	 * - versioned
 	 */
   public static function getFolderContent($path,$root='',$mimetype_filter=''){
-		if(self::isUpdated($path,$root)){
+		if(self::isUpdated($path,$root,true)){
 			self::updateFolder($path,$root);
 		}
 		if(!$root){
@@ -633,9 +633,10 @@ class OC_FileCache{
 	 * check if a file or folder is updated outside owncloud
 	 * @param string path
 	 * @param string root (optional)
+	 * @param bool folder (optional)
 	 * @return bool
 	 */
-	public static function isUpdated($path,$root=''){
+	public static function isUpdated($path,$root='',$folder=false){
 		if(!$root){
 			$root=OC_Filesystem::getRoot();
 			$view=OC_Filesystem::getView();
@@ -648,7 +649,7 @@ class OC_FileCache{
 		if(!$view->file_exists($path)){
 			return false;
 		}
-		$mtime=$view->filemtime($path);
+		$mtime=$view->filemtime($path.(($folder)?'/':''));
 		$isDir=$view->is_dir($path);
 		$fullPath=$root.$path;
 		$query=OC_DB::prepare('SELECT mtime FROM *PREFIX*fscache WHERE path_hash=?');

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 0342/1224] 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 0343/1224] 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 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 0344/1224] 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 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 0345/1224] 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 0346/1224] 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 0347/1224] 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 9af74a9c80c074589f2d5efc365b3a9dee3031ed Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Tue, 10 Jul 2012 16:41:20 +0200
Subject: [PATCH 0348/1224] 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 3ba1b3355f..e177946aa4 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 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 0349/1224] 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 0350/1224] 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 0351/1224] 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 d203fa2c50f4b2791e68e2b8ab9a0f8b94f9c9f8 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@statuscode.ch>
Date: Wed, 11 Jul 2012 19:14:04 +0200
Subject: [PATCH 0352/1224] 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 bc3462f022bd564ff26811a9a47a2c17393d655d Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Fri, 6 Jul 2012 15:51:01 -0400
Subject: [PATCH 0353/1224] 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 71491612e3718444617e301bf616a1db903c8573 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Fri, 6 Jul 2012 17:29:45 -0400
Subject: [PATCH 0354/1224] 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 ebcf5bce3c04870730d215f3ffde12cdcf1cc428 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Wed, 11 Jul 2012 15:26:22 -0400
Subject: [PATCH 0355/1224] Sanitize toaddress for emailing private links

Conflicts:
	apps/files_sharing/ajax/email.php
---
 apps/files_sharing/ajax/email.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/apps/files_sharing/ajax/email.php b/apps/files_sharing/ajax/email.php
index bdfa369418..ba74f646e8 100644
--- a/apps/files_sharing/ajax/email.php
+++ b/apps/files_sharing/ajax/email.php
@@ -3,11 +3,10 @@ OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('files_sharing');
 $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($_POST['toaddress'], $_POST['toaddress'], $subject, $text, $fromaddress, $user);
-
-?>
+OCP\Util::sendMail($toaddress, $toaddress, $subject, $text, $fromaddress, $user);
\ No newline at end of file

From e887fd7ba8c0fb4414489cfaf185987d5ac6347a Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Wed, 11 Jul 2012 15:36:27 -0400
Subject: [PATCH 0356/1224] 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 b46f73bd94..e218531afb 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 ac5abc56036bb21150fca5959243be80e0a8ea4a Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@statuscode.ch>
Date: Wed, 11 Jul 2012 21:52:51 +0200
Subject: [PATCH 0357/1224] Handling exceptions

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

diff --git a/lib/mail.php b/lib/mail.php
index e218531afb..0becb182b2 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 632fc6ec619f2bb2c17f85f7bf53db8ba2a91d36 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Wed, 11 Jul 2012 15:41:59 -0400
Subject: [PATCH 0358/1224] 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 0becb182b2..a4e3a39fee 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 7b2ec414773d020b756d84e7bd95e03c0791634d Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Wed, 11 Jul 2012 16:02:43 -0400
Subject: [PATCH 0359/1224] Revert santizing toaddress, because PHPMailer now
 throws exceptions

Conflicts:
	apps/files_sharing/ajax/email.php
---
 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 ba74f646e8..edf9eca431 100644
--- a/apps/files_sharing/ajax/email.php
+++ b/apps/files_sharing/ajax/email.php
@@ -3,10 +3,9 @@ OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('files_sharing');
 $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);
\ No newline at end of file
+OCP\Util::sendMail($_POST['toaddress'], $_POST['toaddress'], $subject, $text, $fromaddress, $user);

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 0360/1224] 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 0361/1224] 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 0362/1224] 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 0363/1224] 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 0364/1224] 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 0365/1224] 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 80ed5412f10beafed0674c9942705f3f11a3c972 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Fri, 13 Jul 2012 11:57:14 +0200
Subject: [PATCH 0366/1224] if the '/Shared' was the modified directory, than
 scan it.

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

diff --git a/lib/filecache.php b/lib/filecache.php
index 57c6f1915c..8d0f3c84f9 100644
--- a/lib/filecache.php
+++ b/lib/filecache.php
@@ -394,7 +394,7 @@ class OC_FileCache{
 		$cachedSize=self::getCachedSize($path,$root);
 		$size=0;
 		if($dir){
-			if(self::inCache($path,$root)){
+			if(self::inCache($path,$root) && $path != '/Shared'){
 				$parent=self::getFileId($fullPath);
 				$query=OC_DB::prepare('SELECT size FROM *PREFIX*fscache WHERE parent=?');
 				$result=$query->execute(array($parent));

From 50eef9a71cfa88ef4b1e5162a288f29410306c95 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Fri, 13 Jul 2012 15:17:36 +0200
Subject: [PATCH 0367/1224] update script to fix fscache

---
 apps/files_sharing/appinfo/update.php | 16 ++++++++++++++++
 apps/files_sharing/appinfo/version    |  2 +-
 2 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 apps/files_sharing/appinfo/update.php

diff --git a/apps/files_sharing/appinfo/update.php b/apps/files_sharing/appinfo/update.php
new file mode 100644
index 0000000000..b43269d69f
--- /dev/null
+++ b/apps/files_sharing/appinfo/update.php
@@ -0,0 +1,16 @@
+<?php
+
+// touch shared directories to trigger one-time re-scan for all users
+$datadir = \OCP\Config::getSystemValue('datadirectory');
+$currentVersion=OC_Appconfig::getValue('files_sharing', 'installed_version');
+if (version_compare($currentVersion, '0.2.2', '<')) {
+	if ($handle = opendir($datadir)) {
+		while (false !== ($entry = readdir($handle))) {
+			$sharedFolder = $datadir.'/'.$entry.'/files/Shared';
+			if ($entry != "." && $entry != ".." && is_dir($sharedFolder)) {
+				touch($sharedFolder);
+			}
+		}
+		closedir($handle);
+	}
+}
\ 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

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 0368/1224] 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 0369/1224] 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 0370/1224] 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 0371/1224] 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 0372/1224] 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 0373/1224] 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 0374/1224] 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 0375/1224] 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 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 0376/1224] 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 0377/1224] 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 225726c8d9fc1d9428ae44c4cc4c355eab487ef3 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Mon, 16 Jul 2012 01:41:45 +0200
Subject: [PATCH 0378/1224] latin1 => utf8. I thought I did this a month ago?

---
 apps/bookmarks/appinfo/database.xml     | 4 ++--
 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, 6 insertions(+), 6 deletions(-)

diff --git a/apps/bookmarks/appinfo/database.xml b/apps/bookmarks/appinfo/database.xml
index f2fc68e4b5..d28857b075 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>
@@ -109,4 +109,4 @@
 		</declaration>
 	</table>
 </database>
-			
\ No newline at end of file
+			
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 d4e2cb6e62f109a0ee15d6b7911cb88cbb529710 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Tue, 3 Jul 2012 13:55:48 +0200
Subject: [PATCH 0379/1224] 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 b05a33360a..efdff52998 100644
--- a/apps/calendar/js/calendar.js
+++ b/apps/calendar/js/calendar.js
@@ -826,7 +826,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 d64300251baee2bca76e6f53043ed200fdcc0063 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Mon, 16 Jul 2012 21:21:37 +0200
Subject: [PATCH 0380/1224] Corrected javascript definition.

---
 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 1a10318817..5b07ba3c33 100644
--- a/apps/contacts/templates/part.contact.php
+++ b/apps/contacts/templates/part.contact.php
@@ -117,7 +117,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 eb2a15d58f69bc54f818a99bb381c358c7cf4b55 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Mon, 16 Jul 2012 23:36:11 +0200
Subject: [PATCH 0381/1224] Format birthday as BDAY;VALUE=DATE:YYYY-MM-DD.
 Fixes oc-1276.

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

diff --git a/apps/contacts/ajax/saveproperty.php b/apps/contacts/ajax/saveproperty.php
index 96e082d00e..a27b5489ce 100644
--- a/apps/contacts/ajax/saveproperty.php
+++ b/apps/contacts/ajax/saveproperty.php
@@ -89,7 +89,7 @@ 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) {
@@ -112,6 +112,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.
+			$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 'FN':
 		case 'N':
 		case 'ORG':

From f4a8c233cf88bb36203b3104cc587a479bdd33c2 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Tue, 17 Jul 2012 03:04:04 +0200
Subject: [PATCH 0382/1224] Added hook for postCreateUser. Probably fix for
 oc-1265.

Conflicts:

	apps/calendar/appinfo/app.php
---
 apps/calendar/appinfo/app.php |  3 +++
 apps/calendar/lib/hooks.php   | 13 ++++++++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/apps/calendar/appinfo/app.php b/apps/calendar/appinfo/app.php
index b02fc602c6..48c346e8ad 100644
--- a/apps/calendar/appinfo/app.php
+++ b/apps/calendar/appinfo/app.php
@@ -7,6 +7,9 @@ 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';
+
+//General Hooks
+OCP\Util::connectHook('OC_User', 'post_createUser', 'OC_Calendar_Hooks', 'createUser');
 OCP\Util::connectHook('OC_User', 'post_deleteUser', 'OC_Calendar_Hooks', 'deleteUser');
 OCP\Util::addscript('calendar','loader');
 OCP\Util::addscript("3rdparty", "chosen/chosen.jquery.min");
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 9326f4f535a094896ef0b94f9a7644c9d2b7c345 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Tue, 17 Jul 2012 10:45:15 +0200
Subject: [PATCH 0383/1224] Added hooks for postCreateUser to add default
 address book and calendar. Fixes oc-1265.

---
 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 20d97697bf..a298857d60 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 e3d5df3d51..3afad1ef7d 100644
--- a/apps/contacts/lib/hooks.php
+++ b/apps/contacts/lib/hooks.php
@@ -24,6 +24,16 @@
  * This class contains all hooks.
  */
 class OC_Contacts_Hooks{
+	/**
+	 * @brief Add default Addressbook for a certain user
+	 * @param paramters parameters from postCreateUser-Hook
+	 * @return array
+	 */
+	static public function createUser($parameters) {
+		OC_Contacts_Addressbook::add($parameters['uid'],'default','Default Address Book');
+		return true;
+	}
+
 	/**
 	 * @brief Deletes all Addressbooks of a certain user
 	 * @param paramters parameters from postDeleteUser-Hook

From 0bd7d14b7aeb5961172ff21c2f046efc94edfaa9 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Tue, 17 Jul 2012 14:09:01 +0200
Subject: [PATCH 0384/1224] Sharing: offer an option to allow sharing with
 everyone, i.e. do not check group memberships

---
 .../ajax/togglesharewitheveryone.php          |  9 +++++
 apps/files_sharing/ajax/userautocomplete.php  | 37 +++++++++++++------
 apps/files_sharing/js/settings.js             |  7 ++++
 apps/files_sharing/lib_share.php              | 31 +++++++++-------
 apps/files_sharing/settings.php               |  1 +
 apps/files_sharing/templates/settings.php     |  6 ++-
 6 files changed, 64 insertions(+), 27 deletions(-)
 create mode 100644 apps/files_sharing/ajax/togglesharewitheveryone.php

diff --git a/apps/files_sharing/ajax/togglesharewitheveryone.php b/apps/files_sharing/ajax/togglesharewitheveryone.php
new file mode 100644
index 0000000000..dc1105f2f3
--- /dev/null
+++ b/apps/files_sharing/ajax/togglesharewitheveryone.php
@@ -0,0 +1,9 @@
+<?php
+
+OCP\JSON::checkAppEnabled('files_sharing');
+OCP\JSON::checkAdminUser();
+if ($_POST['allowSharingWithEveryone'] == true) {
+	OCP\Config::setAppValue('files_sharing', 'allowSharingWithEveryone', 'yes');
+} else {
+	OCP\Config::setAppValue('files_sharing', 'allowSharingWithEveryone', 'no');
+}
\ No newline at end of file
diff --git a/apps/files_sharing/ajax/userautocomplete.php b/apps/files_sharing/ajax/userautocomplete.php
index 0e1bf6d588..23865693a1 100644
--- a/apps/files_sharing/ajax/userautocomplete.php
+++ b/apps/files_sharing/ajax/userautocomplete.php
@@ -6,24 +6,37 @@ 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) {
+if(OCP\Config::getAppValue('files_sharing', 'allowSharingWithEveryone', 'no') == 'yes') {
+	$allGroups = OC_Group::getGroups();
+	foreach($allGroups as $group) {
+	    $groups[] = "<option value='".$group."(group)'>".$group." (group) </option>";
+	}
+	$allUsers = OC_User::getUsers();
+	foreach($allUsers as $user) {
+		if($user != $self) {
 			$users[] = "<option value='".$user."'>".$user."</option>";
-			$userCount++;
+	    }
+	}
+} else {
+	$userGroups = OC_Group::getUserGroups($self);
+	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>";
 		}
 	}
-	// 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 = array_unique($users);
 $users[] = "</optgroup>";
 $groups[] = "</optgroup>";
 $users = array_merge($users, $groups);
diff --git a/apps/files_sharing/js/settings.js b/apps/files_sharing/js/settings.js
index bb7d79fecb..c276521b7b 100644
--- a/apps/files_sharing/js/settings.js
+++ b/apps/files_sharing/js/settings.js
@@ -6,4 +6,11 @@ $(document).ready(function() {
 		}
 		$.post(OC.filePath('files_sharing','ajax','toggleresharing.php'), 'resharing='+checked);
 	});
+	$('#allowSharingWithEveryone').bind('change', function() {
+		var checked = 1;
+		if (!this.checked) {
+			checked = 0;
+		}
+		$.post(OC.filePath('files_sharing','ajax','togglesharewitheveryone.php'), 'allowSharingWithEveryone='+checked);
+	});
 });
\ No newline at end of file
diff --git a/apps/files_sharing/lib_share.php b/apps/files_sharing/lib_share.php
index 31170f07fd..c0d0a1f18b 100644
--- a/apps/files_sharing/lib_share.php
+++ b/apps/files_sharing/lib_share.php
@@ -21,7 +21,7 @@
  */
 
 /**
- * This class manages shared items within the database. 
+ * This class manages shared items within the database.
  */
 class OC_Share {
 
@@ -31,7 +31,7 @@ class OC_Share {
 	const PUBLICLINK = "public";
 
 	private $token;
-      
+
 	/**
 	 * Share an item, adds an entry into the database
 	 * @param $source The source location of the item
@@ -56,17 +56,22 @@ class OC_Share {
 				// 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(OCP\Config::getAppValue('files_sharing', 'allowSharingWithEveryone', 'no') == 'yes') {
+					$gid = null;
+					$uid_shared_with = array($uid_shared_with);
+				} else {
+					$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);
 					}
-				}
-				if (!$inGroup) {
-					throw new Exception("You can't share with ".$uid_shared_with);
 				}
 			} else {
 				throw new Exception($uid_shared_with." is not a user");
@@ -379,7 +384,7 @@ class OC_Share {
 	 * 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 
+	 * @param $newTarget The new target location
 	 */
 	public static function setTarget($oldTarget, $newTarget) {
 		$oldTarget = self::cleanPath($oldTarget);
diff --git a/apps/files_sharing/settings.php b/apps/files_sharing/settings.php
index 7b63a26515..fcae7e0370 100644
--- a/apps/files_sharing/settings.php
+++ b/apps/files_sharing/settings.php
@@ -4,6 +4,7 @@ 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'));
+$tmpl->assign('allowSharingWithEveryone', OCP\Config::getAppValue('files_sharing', 'allowSharingWithEveryone', 'no'));
 return $tmpl->fetchPage();
 
 ?>
\ No newline at end of file
diff --git a/apps/files_sharing/templates/settings.php b/apps/files_sharing/templates/settings.php
index 5b6ba5f33e..533a5c0c0c 100644
--- a/apps/files_sharing/templates/settings.php
+++ b/apps/files_sharing/templates/settings.php
@@ -1,6 +1,8 @@
 <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>
+	<p><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></p>
+	<p><input type="checkbox" name="allowSharingWithEveryone" id="allowSharingWithEveryone" value="1" <?php if ($_['allowSharingWithEveryone'] == 'yes') echo ' checked="checked"'; ?> /> <label for="allowSharingWithEveryone"><?php echo $l->t('Enable sharing with everyone'); ?></label> <br/>
+	<em><?php echo $l->t('Allow users to share files with everyone');?></em></p>
 	</fieldset>
 </form>
\ No newline at end of file

From 3895e3a5aee8faee368e59fb9d830782c96ba127 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Wed, 18 Jul 2012 12:22:30 +0200
Subject: [PATCH 0385/1224] 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 41d6ba41ef..56101157ed 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'])?htmlentities($_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 0386/1224] 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 0387/1224] 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 0388/1224] 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 0389/1224] 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 10bf36a6ae022f54797d12ab756ad78e4a9ffe5a Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <frank@owncloud.org>
Date: Thu, 19 Jul 2012 09:10:18 +0200
Subject: [PATCH 0390/1224] 4.0.5

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

diff --git a/lib/util.php b/lib/util.php
index a16559c54b..884122bbf9 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,00,4);
+		return array(4,00,5);
 	}
 
 	/**
@@ -91,7 +91,7 @@ class OC_Util {
 	 * @return string
 	 */
 	public static function getVersionString(){
-		return '4.0.4';
+		return '4.0.5';
 	}
 
         /**

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 0391/1224] 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 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 0392/1224] 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 0393/1224] 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 0394/1224] 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 0395/1224] 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 e52ab59b404d6d35ed8619da35b1f70404359212 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Thu, 19 Jul 2012 18:13:10 +0200
Subject: [PATCH 0396/1224] Revert "use readfile() instead iof fopen() for file
 download over webdav."

This reverts commit 9af74a9c80c074589f2d5efc365b3a9dee3031ed.
---
 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 e177946aa4..3ba1b3355f 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,'r');
 
 	}
 

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 0397/1224] 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 0398/1224] 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 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 0399/1224] 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 0400/1224] 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 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 0401/1224] 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 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 0402/1224] 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 38271ded753bc9ea9943cef3c2706f8d71f3a58f Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@statuscode.ch>
Date: Fri, 20 Jul 2012 20:12:36 +0200
Subject: [PATCH 0403/1224] Added CSRF checks

---
 apps/bookmarks/ajax/addBookmark.php                 | 1 +
 apps/bookmarks/ajax/delBookmark.php                 | 1 +
 apps/bookmarks/ajax/editBookmark.php                | 1 +
 apps/calendar/ajax/calendar/delete.php              | 1 +
 apps/calendar/ajax/calendar/edit.php                | 1 +
 apps/calendar/ajax/calendar/new.php                 | 1 +
 apps/calendar/ajax/calendar/update.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/import/import.php                | 1 +
 apps/calendar/ajax/settings/setfirstday.php         | 2 ++
 apps/calendar/ajax/settings/settimeformat.php       | 2 ++
 apps/calendar/ajax/share/changepermission.php       | 3 ++-
 apps/calendar/ajax/share/share.php                  | 3 ++-
 apps/calendar/ajax/share/unshare.php                | 3 ++-
 apps/external/ajax/setsites.php                     | 1 +
 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_sharing/ajax/email.php                   | 1 +
 apps/files_sharing/ajax/setpermissions.php          | 1 +
 apps/files_sharing/ajax/share.php                   | 1 +
 apps/files_sharing/ajax/toggleresharing.php         | 2 ++
 apps/files_sharing/ajax/togglesharewitheveryone.php | 2 ++
 apps/files_sharing/ajax/unshare.php                 | 1 +
 apps/files_texteditor/ajax/savefile.php             | 1 +
 apps/files_versions/ajax/rollbackVersion.php        | 1 +
 apps/gallery/ajax/createAlbum.php                   | 1 +
 apps/gallery/ajax/sharing.php                       | 1 +
 apps/tasks/ajax/addtask.php                         | 1 +
 apps/tasks/ajax/addtaskform.php                     | 1 +
 apps/tasks/ajax/delete.php                          | 1 +
 apps/tasks/ajax/edittask.php                        | 1 +
 37 files changed, 44 insertions(+), 3 deletions(-)

diff --git a/apps/bookmarks/ajax/addBookmark.php b/apps/bookmarks/ajax/addBookmark.php
index a2eb506f85..b4d0f33d72 100644
--- a/apps/bookmarks/ajax/addBookmark.php
+++ b/apps/bookmarks/ajax/addBookmark.php
@@ -29,6 +29,7 @@ $RUNTIME_NOSETUPFS=true;
 // Check if we are a user
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('bookmarks');
+OCP\JSON::callCheck();
 
 require_once(OC::$APPSROOT . '/apps/bookmarks/bookmarksHelper.php');
 $id = addBookmark($_POST['url'], $_POST['title'], $_POST['tags']);
diff --git a/apps/bookmarks/ajax/delBookmark.php b/apps/bookmarks/ajax/delBookmark.php
index 5a067701c9..140da2a37d 100644
--- a/apps/bookmarks/ajax/delBookmark.php
+++ b/apps/bookmarks/ajax/delBookmark.php
@@ -29,6 +29,7 @@ $RUNTIME_NOSETUPFS=true;
 // Check if we are a user
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('bookmarks');
+OCP\JSON::callCheck();
 
 $id = $_POST['id'];
 if (!OC_Bookmarks_Bookmarks::deleteUrl($id)){
diff --git a/apps/bookmarks/ajax/editBookmark.php b/apps/bookmarks/ajax/editBookmark.php
index 439b680dc2..36258f7096 100644
--- a/apps/bookmarks/ajax/editBookmark.php
+++ b/apps/bookmarks/ajax/editBookmark.php
@@ -29,6 +29,7 @@ $RUNTIME_NOSETUPFS=true;
 // Check if we are a user
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('bookmarks');
+OCP\JSON::callCheck();
 
 $CONFIG_DBTYPE = OCP\Config::getSystemValue( "dbtype", "sqlite" );
 if( $CONFIG_DBTYPE == 'sqlite' or $CONFIG_DBTYPE == 'sqlite3' ){
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/edit.php b/apps/calendar/ajax/calendar/edit.php
index 82f18fe7f4..3f69666b58 100644
--- a/apps/calendar/ajax/calendar/edit.php
+++ b/apps/calendar/ajax/calendar/edit.php
@@ -9,6 +9,7 @@
  
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('calendar');
+OCP\JSON::callCheck();
 
 $calendarcolor_options = OC_Calendar_Calendar::getCalendarColorOptions();
 $calendar = OC_Calendar_App::getCalendar($_GET['calendarid'], true);
diff --git a/apps/calendar/ajax/calendar/new.php b/apps/calendar/ajax/calendar/new.php
index 278c8e5520..34b056abe8 100644
--- a/apps/calendar/ajax/calendar/new.php
+++ b/apps/calendar/ajax/calendar/new.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/calendar/update.php b/apps/calendar/ajax/calendar/update.php
index 5cf63d396f..740094775f 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/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/import/import.php b/apps/calendar/ajax/import/import.php
index 18e93e67b4..c0cd140376 100644
--- a/apps/calendar/ajax/import/import.php
+++ b/apps/calendar/ajax/import/import.php
@@ -8,6 +8,7 @@
 //check for calendar rights or create new one
 ob_start();
 OCP\JSON::checkLoggedIn();
+OCP\JSON::callCheck();
 OCP\App::checkAppEnabled('calendar');
 $nl="\r\n";
 $comps = array('VEVENT'=>true, 'VTODO'=>true, 'VJOURNAL'=>true);
diff --git a/apps/calendar/ajax/settings/setfirstday.php b/apps/calendar/ajax/settings/setfirstday.php
index 056a603752..97c2488293 100644
--- a/apps/calendar/ajax/settings/setfirstday.php
+++ b/apps/calendar/ajax/settings/setfirstday.php
@@ -7,6 +7,8 @@
  */
  
 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..d09679b927 100644
--- a/apps/calendar/ajax/settings/settimeformat.php
+++ b/apps/calendar/ajax/settings/settimeformat.php
@@ -7,6 +7,8 @@
  */
  
 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/share/changepermission.php b/apps/calendar/ajax/share/changepermission.php
index 2737420c94..f3c628e847 100644
--- a/apps/calendar/ajax/share/changepermission.php
+++ b/apps/calendar/ajax/share/changepermission.php
@@ -5,7 +5,8 @@
  * later.
  * See the COPYING-README file.
  */
- 
+ OCP\JSON::callCheck();
+
 $id = strip_tags($_GET['id']);
 $idtype = strip_tags($_GET['idtype']);
 $permission = (int) strip_tags($_GET['permission']);
diff --git a/apps/calendar/ajax/share/share.php b/apps/calendar/ajax/share/share.php
index 629a7b6b79..babb8ce3f1 100644
--- a/apps/calendar/ajax/share/share.php
+++ b/apps/calendar/ajax/share/share.php
@@ -5,7 +5,8 @@
  * later.
  * See the COPYING-README file.
  */
- 
+ OCP\JSON::callCheck();
+
 $id = strip_tags($_GET['id']);
 $idtype = strip_tags($_GET['idtype']);
 switch($idtype){
diff --git a/apps/calendar/ajax/share/unshare.php b/apps/calendar/ajax/share/unshare.php
index fe7c98452d..09264070dd 100644
--- a/apps/calendar/ajax/share/unshare.php
+++ b/apps/calendar/ajax/share/unshare.php
@@ -5,7 +5,8 @@
  * later.
  * See the COPYING-README file.
  */
- 
+ OCP\JSON::callCheck();
+
 $id = strip_tags($_GET['id']);
 $idtype = strip_tags($_GET['idtype']);
 switch($idtype){
diff --git a/apps/external/ajax/setsites.php b/apps/external/ajax/setsites.php
index f153735f09..0dbac3abb2 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++) {
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_sharing/ajax/email.php b/apps/files_sharing/ajax/email.php
index edf9eca431..e931e5f77e 100644
--- a/apps/files_sharing/ajax/email.php
+++ b/apps/files_sharing/ajax/email.php
@@ -1,5 +1,6 @@
 <?php
 OCP\JSON::checkLoggedIn();
+OCP\JSON::callCheck();
 OCP\JSON::checkAppEnabled('files_sharing');
 $user = OCP\USER::getUser();
 // TODO translations
diff --git a/apps/files_sharing/ajax/setpermissions.php b/apps/files_sharing/ajax/setpermissions.php
index 2f4c5da978..13daab738d 100644
--- a/apps/files_sharing/ajax/setpermissions.php
+++ b/apps/files_sharing/ajax/setpermissions.php
@@ -3,6 +3,7 @@ require_once(OC::$APPSROOT . '/apps/files_sharing/lib_share.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'];
diff --git a/apps/files_sharing/ajax/share.php b/apps/files_sharing/ajax/share.php
index ec3c25998a..fb28caf7b7 100644
--- a/apps/files_sharing/ajax/share.php
+++ b/apps/files_sharing/ajax/share.php
@@ -3,6 +3,7 @@ require_once(OC::$APPSROOT . '/apps/files_sharing/lib_share.php');
 
 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/toggleresharing.php b/apps/files_sharing/ajax/toggleresharing.php
index 673f00c5d1..ab8e82c8c3 100644
--- a/apps/files_sharing/ajax/toggleresharing.php
+++ b/apps/files_sharing/ajax/toggleresharing.php
@@ -1,5 +1,7 @@
 <?php
 
+OCP\JSON::callCheck();
+
 OCP\JSON::checkAppEnabled('files_sharing');
 OCP\JSON::checkAdminUser();
 if ($_POST['resharing'] == true) {
diff --git a/apps/files_sharing/ajax/togglesharewitheveryone.php b/apps/files_sharing/ajax/togglesharewitheveryone.php
index dc1105f2f3..96c43711cb 100644
--- a/apps/files_sharing/ajax/togglesharewitheveryone.php
+++ b/apps/files_sharing/ajax/togglesharewitheveryone.php
@@ -1,5 +1,7 @@
 <?php
 
+OCP\JSON::callCheck();
+
 OCP\JSON::checkAppEnabled('files_sharing');
 OCP\JSON::checkAdminUser();
 if ($_POST['allowSharingWithEveryone'] == true) {
diff --git a/apps/files_sharing/ajax/unshare.php b/apps/files_sharing/ajax/unshare.php
index 9088bf4266..d291b719e3 100644
--- a/apps/files_sharing/ajax/unshare.php
+++ b/apps/files_sharing/ajax/unshare.php
@@ -3,6 +3,7 @@ require_once(OC::$APPSROOT . '/apps/files_sharing/lib_share.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'];
diff --git a/apps/files_texteditor/ajax/savefile.php b/apps/files_texteditor/ajax/savefile.php
index f789112d7d..aa24d07eef 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;
diff --git a/apps/files_versions/ajax/rollbackVersion.php b/apps/files_versions/ajax/rollbackVersion.php
index 127592f3b5..77c6102ea7 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();
 
 require_once('apps/files_versions/versions.php');
 
diff --git a/apps/gallery/ajax/createAlbum.php b/apps/gallery/ajax/createAlbum.php
index 61e2e9ae2e..e13dac6ad1 100644
--- a/apps/gallery/ajax/createAlbum.php
+++ b/apps/gallery/ajax/createAlbum.php
@@ -24,6 +24,7 @@
  
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('gallery');
+OCP\JSON::callCheck();
 
 OC_Gallery_Album::create(OCP\USER::getUser(), $_GET['album_name']);
 
diff --git a/apps/gallery/ajax/sharing.php b/apps/gallery/ajax/sharing.php
index 1223320120..c3d5989ae5 100644
--- a/apps/gallery/ajax/sharing.php
+++ b/apps/gallery/ajax/sharing.php
@@ -22,6 +22,7 @@
 */
 
  
+OCP\JSON::callCheck();
 
 if (!isset($_GET['token']) || !isset($_GET['operation'])) {
   OCP\JSON::error(array('cause' => 'Not enought arguments'));
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/addtaskform.php b/apps/tasks/ajax/addtaskform.php
index d86232e2da..2795f39373 100644
--- a/apps/tasks/ajax/addtaskform.php
+++ b/apps/tasks/ajax/addtaskform.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);
 $category_options = OC_Calendar_App::getCategoryOptions();
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');
 

From 93579d88dcea389205c01ddf6da41f37ad9b8745 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@statuscode.ch>
Date: Fri, 20 Jul 2012 20:39:20 +0200
Subject: [PATCH 0404/1224] CSRF checks

---
 settings/ajax/changepassword.php | 1 +
 settings/ajax/creategroup.php    | 1 +
 settings/ajax/createuser.php     | 1 +
 settings/ajax/disableapp.php     | 1 +
 settings/ajax/enableapp.php      | 1 +
 settings/ajax/lostpassword.php   | 4 +++-
 settings/ajax/removegroup.php    | 1 +
 settings/ajax/removeuser.php     | 1 +
 settings/ajax/setlanguage.php    | 2 +-
 settings/ajax/setloglevel.php    | 1 +
 settings/ajax/setquota.php       | 1 +
 settings/ajax/togglegroups.php   | 1 +
 12 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/settings/ajax/changepassword.php b/settings/ajax/changepassword.php
index 860ea98787..388885b6fc 100644
--- a/settings/ajax/changepassword.php
+++ b/settings/ajax/changepassword.php
@@ -2,6 +2,7 @@
 
 // Init owncloud
 require_once('../../lib/base.php');
+OCP\JSON::callCheck();
 
 $username = isset($_POST["username"]) ? $_POST["username"] : OC_User::getUser();
 $password = $_POST["password"];
diff --git a/settings/ajax/creategroup.php b/settings/ajax/creategroup.php
index 57d82e7bd9..a7fab1c45b 100644
--- a/settings/ajax/creategroup.php
+++ b/settings/ajax/creategroup.php
@@ -2,6 +2,7 @@
 
 // Init owncloud
 require_once('../../lib/base.php');
+OCP\JSON::callCheck();
 
 // Check if we are a user
 if( !OC_User::isLoggedIn() || !OC_Group::inGroup( OC_User::getUser(), 'admin' )){
diff --git a/settings/ajax/createuser.php b/settings/ajax/createuser.php
index 6714711bc8..508b4bf94c 100644
--- a/settings/ajax/createuser.php
+++ b/settings/ajax/createuser.php
@@ -2,6 +2,7 @@
 
 // Init owncloud
 require_once('../../lib/base.php');
+OCP\JSON::callCheck();
 
 // Check if we are a user
 if( !OC_User::isLoggedIn() || !OC_Group::inGroup( OC_User::getUser(), 'admin' )){
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 9c31c9ce8d..976fdff245 100644
--- a/settings/ajax/lostpassword.php
+++ b/settings/ajax/lostpassword.php
@@ -4,11 +4,13 @@
 require_once('../../lib/base.php');
 
 OC_JSON::checkLoggedIn();
+OCP\JSON::callCheck();
 
 $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{
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..bc70d09ac9 100644
--- a/settings/ajax/setlanguage.php
+++ b/settings/ajax/setlanguage.php
@@ -6,7 +6,7 @@ require_once('../../lib/base.php');
 $l=OC_L10N::get('settings');
 
 OC_JSON::checkLoggedIn();
-
+OCP\JSON::callCheck();
 
 // Get data
 if( isset( $_POST['lang'] ) ){
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 f76e22f51d..02b2b6319a 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 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 0405/1224] 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 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 0406/1224] 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 73734c98e06c2189ae9717e66529568d7529cce5 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Mon, 23 Jul 2012 11:00:37 +0200
Subject: [PATCH 0407/1224] - remove namespace from file property name (webdav)
 - update script to fix broken properties in the database

---
 apps/files/appinfo/update.php | 11 +++++++++++
 apps/files/appinfo/version    |  2 +-
 lib/connector/sabre/node.php  |  1 +
 3 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/apps/files/appinfo/update.php b/apps/files/appinfo/update.php
index f9953ba4de..769a1a8e3e 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 update for OC4
+$installedVersion=OCP\Config::getAppValue('files', 'installed_version');
+if (version_compare($installedVersion, '1.1.2', '<')) {
+	$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 8cfbc905b3..8428158dc5 100644
--- a/apps/files/appinfo/version
+++ b/apps/files/appinfo/version
@@ -1 +1 @@
-1.1.1
\ No newline at end of file
+1.1.2
\ No newline at end of file
diff --git a/lib/connector/sabre/node.php b/lib/connector/sabre/node.php
index c824ad0ead..85d2160feb 100644
--- a/lib/connector/sabre/node.php
+++ b/lib/connector/sabre/node.php
@@ -121,6 +121,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); // 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 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 0408/1224] 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 0409/1224] 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 0410/1224] 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 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 0411/1224] 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 0412/1224] 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 0413/1224] 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 0414/1224] 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 0415/1224] 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 0416/1224] 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 0417/1224] 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 9b0870bb91d35b20903a8c23d1348c7beddf8bf8 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Wed, 25 Jul 2012 17:02:19 +0200
Subject: [PATCH 0418/1224] add some calendar sharing hooks in stable4 - bugfix
 for oc-1325

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

diff --git a/apps/calendar/appinfo/app.php b/apps/calendar/appinfo/app.php
index 48c346e8ad..69b556af31 100644
--- a/apps/calendar/appinfo/app.php
+++ b/apps/calendar/appinfo/app.php
@@ -11,6 +11,10 @@ OC::$CLASSPATH['OC_Search_Provider_Calendar'] = 'apps/calendar/lib/search.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');
+//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");

From 3c9919e475484e6c25536fc006c7039d1576d350 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Wed, 25 Jul 2012 18:21:16 +0200
Subject: [PATCH 0419/1224] 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_ldap.php | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/apps/user_ldap/lib_ldap.php b/apps/user_ldap/lib_ldap.php
index f3b0b993ce..39992e81e0 100644
--- a/apps/user_ldap/lib_ldap.php
+++ b/apps/user_ldap/lib_ldap.php
@@ -440,6 +440,10 @@ class OC_LDAP {
 	 */
 	static public function readAttribute($dn, $attr) {
 		$cr = self::getConnectionResource();
+		if(!is_resource($cr)) {
+			//LDAP not available
+			return false;
+		}
 		$rr = ldap_read($cr, $dn, 'objectClass=*', array($attr));
 		$er = ldap_first_entry($cr, $rr);
 		//LDAP attributes are not case sensitive
@@ -495,6 +499,11 @@ class OC_LDAP {
 		if(!is_null($attr) && !is_array($attr)) {
 			$attr = array(strtolower($attr));
 		}
+		$cr = self::getConnectionResource();
+		if(!is_resource($cr)) {
+			//LDAP not available
+			return array();
+		}
 		$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.
@@ -686,11 +695,22 @@ class OC_LDAP {
 	 * Connects and Binds to LDAP
 	 */
 	static private function establishConnection() {
+		static $phpLDAPinstalled = true;
+		if(!$phpLDAPinstalled) {
+			return false;
+		}
 		if(!self::$configured) {
 			OCP\Util::writeLog('ldap', 'Configuration is invalid, cannot connect', OCP\Util::INFO);
 			return false;
 		}
 		if(!self::$ldapConnectionRes) {
+			//check if php-ldap is installed
+			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;
+			}
 			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)) {

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 0420/1224] 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 0421/1224] [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 0422/1224] 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 0423/1224] 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 0424/1224] 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 0425/1224] 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 0426/1224] 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 0427/1224] 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 85a410d7a303b5d35529850fbb67fc82b962c7e1 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@statuscode.ch>
Date: Thu, 26 Jul 2012 00:04:12 +0200
Subject: [PATCH 0428/1224] Remove unused files

---
 core/ajax/grouplist.php    | 49 --------------------------------------
 core/ajax/userlist.php     | 48 -------------------------------------
 core/ajax/validateuser.php | 40 -------------------------------
 3 files changed, 137 deletions(-)
 delete mode 100644 core/ajax/grouplist.php
 delete mode 100644 core/ajax/userlist.php
 delete mode 100644 core/ajax/validateuser.php

diff --git a/core/ajax/grouplist.php b/core/ajax/grouplist.php
deleted file mode 100644
index cc15102bbc..0000000000
--- a/core/ajax/grouplist.php
+++ /dev/null
@@ -1,49 +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);
-
-?>
diff --git a/core/ajax/userlist.php b/core/ajax/userlist.php
deleted file mode 100644
index c8168eaf46..0000000000
--- a/core/ajax/userlist.php
+++ /dev/null
@@ -1,48 +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 258bd50fca..0000000000
--- a/core/ajax/validateuser.php
+++ /dev/null
@@ -1,40 +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 9605e1926c6081e88326bf78a02c1d1b83126c4f Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@statuscode.ch>
Date: Thu, 26 Jul 2012 00:06:51 +0200
Subject: [PATCH 0429/1224] 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 95936024bc2d5b088bc3048fe872c23f9b09d6ab Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@statuscode.ch>
Date: Thu, 26 Jul 2012 01:12:58 +0200
Subject: [PATCH 0430/1224] 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 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 0431/1224] 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 0432/1224] 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 0433/1224] 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 0434/1224] 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 12dfe5868a2287497b63f6cbebac8d25018868b2 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@statuscode.ch>
Date: Thu, 26 Jul 2012 01:38:20 +0200
Subject: [PATCH 0435/1224] 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 0436/1224] [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 0437/1224] [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 0438/1224] 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 8cff0d997f885d4188bc24d1880e6c1cbbf5027e Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Thu, 26 Jul 2012 14:46:03 +0200
Subject: [PATCH 0439/1224] 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 4e62e121a6222cce64f20ab6fa1bbfb77b4a559c Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Thu, 26 Jul 2012 15:12:57 +0200
Subject: [PATCH 0440/1224] mark OCP\App::register as deprecated

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

diff --git a/lib/public/app.php b/lib/public/app.php
index 0df665f9bc..9cadabeca7 100644
--- a/lib/public/app.php
+++ b/lib/public/app.php
@@ -34,22 +34,15 @@ 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.
+         * @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 ){

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 0441/1224] 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 0442/1224] 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 0443/1224] 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 0444/1224] 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 0445/1224] 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 0446/1224] 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 0447/1224] 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 0448/1224] 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 0449/1224] 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 d8aca0c78e729e92a1e09c07b707d8718d81c29b Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Thu, 26 Jul 2012 18:40:12 +0200
Subject: [PATCH 0450/1224] apply fix suggested in oc-1132 - bugfix for oc-1132

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

diff --git a/apps/calendar/lib/app.php b/apps/calendar/lib/app.php
index b575f5b9fd..06f85d3225 100644
--- a/apps/calendar/lib/app.php
+++ b/apps/calendar/lib/app.php
@@ -439,7 +439,7 @@ class OC_Calendar_App{
 					$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);
+					$output['end'] = date('Y-m-d H:i:s', $result->format('U') + $result->format('Z') + $duration);
 				}
 				$return[] = $output;
 			}

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 0451/1224] 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 0452/1224] [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 0453/1224] 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 0454/1224] 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 0455/1224] 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 0456/1224] 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 0457/1224] 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 0458/1224] 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 0459/1224] 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 0460/1224] 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 0461/1224] 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 0462/1224] 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 0463/1224] 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 0464/1224] 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 0465/1224] 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 0466/1224] 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 0467/1224] 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 0468/1224] 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 0469/1224] [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 0470/1224] 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 0471/1224] 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 0472/1224] [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 0473/1224] 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 0474/1224] 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 0475/1224] 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 0476/1224] [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 0477/1224] 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 0478/1224] 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 0479/1224] 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 0480/1224] 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 0481/1224] 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 f91783e9ab622c6ee90affb2a76ff2bef13e8328 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Mon, 30 Jul 2012 12:28:10 +0200
Subject: [PATCH 0482/1224] Fix errors when no addressbook.

---
 apps/contacts/lib/addressbook.php | 24 ++++++++++++++----------
 apps/contacts/lib/vcard.php       |  7 +++++--
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/apps/contacts/lib/addressbook.php b/apps/contacts/lib/addressbook.php
index 73b30e942f..634d59eb9b 100644
--- a/apps/contacts/lib/addressbook.php
+++ b/apps/contacts/lib/addressbook.php
@@ -71,10 +71,15 @@ class OC_Contacts_Addressbook{
 	 * @return associative array
 	 */
 	public static function find($id){
-		$stmt = OCP\DB::prepare( 'SELECT * FROM *PREFIX*contacts_addressbooks WHERE id = ?' );
-		$result = $stmt->execute(array($id));
-
-		return $result->fetchRow();
+		try {
+			$stmt = OCP\DB::prepare( 'SELECT * FROM *PREFIX*contacts_addressbooks WHERE id = ?' );
+			$result = $stmt->execute(array($id));
+			return $result->fetchRow();
+		} 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;
+		}
 	}
 
 	/**
@@ -171,7 +176,7 @@ class OC_Contacts_Addressbook{
 		$prefbooks = OCP\Config::getUserValue($uid,'contacts','openaddressbooks',null);
 		$prefbooks = explode(';',$prefbooks);
 		for ($i = 0; $i < count($prefbooks); $i++) {
-			if(!self::find($prefbooks[$i])) {
+			if(!$prefbooks[$i] || !self::find($prefbooks[$i])) {
 				unset($prefbooks[$i]);
 			}
 		}
@@ -207,16 +212,15 @@ class OC_Contacts_Addressbook{
 		try {
 			$stmt = OCP\DB::prepare( $prep );
 			$result = $stmt->execute($active);
+			while( $row = $result->fetchRow()){
+				$addressbooks[] = $row;
+			}
 		} 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, ids: '.join(',', $active),OCP\Util::DEBUG);
 			OCP\Util::writeLog('contacts','OC_Contacts_Addressbook::active, SQL:'.$prep,OCP\Util::DEBUG);
 		}
 
-		while( $row = $result->fetchRow()){
-			$addressbooks[] = $row;
-		}
-
 		return $addressbooks;
 	}
 
@@ -239,7 +243,7 @@ class OC_Contacts_Addressbook{
 			if(!in_array($id, $openaddressbooks)) {
 				$openaddressbooks[] = $id;
 			}
-		} else { 
+		} else {
 			if(in_array($id, $openaddressbooks)) {
 				unset($openaddressbooks[array_search($id, $openaddressbooks)]);
 			}
diff --git a/apps/contacts/lib/vcard.php b/apps/contacts/lib/vcard.php
index 2868643387..7c8dbd2ee4 100644
--- a/apps/contacts/lib/vcard.php
+++ b/apps/contacts/lib/vcard.php
@@ -62,6 +62,9 @@ class OC_Contacts_VCard{
 			}
 		} elseif($id) {
 			if(is_array($id)) {
+				if(count($id) == 0) {
+					return array();
+				}
 				$id = $id[0];
 			}
 			try {
@@ -110,7 +113,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
@@ -126,7 +129,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 89027545a05bddc11572b233dbcae92d905ec599 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Sun, 15 Jul 2012 15:17:27 -0400
Subject: [PATCH 0483/1224] 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 099b16350fd33f907f55d9894530b934d1be9a7a Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Sun, 15 Jul 2012 15:22:31 -0400
Subject: [PATCH 0484/1224] 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 24435eab23..9e0e82e79f 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 f328f53ec17a53efa3136c192dc035c731d94b7f Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Wed, 25 Jul 2012 16:54:46 -0400
Subject: [PATCH 0485/1224] Fix filesystem hash, no longer using
 basicOperation()

Conflicts:
	lib/filesystemview.php
---
 apps/files_sharing/sharedstorage.php |  2 +-
 lib/filestorage.php                  |  2 +-
 lib/filestorage/common.php           |  2 +-
 lib/filestorage/local.php            |  2 +-
 lib/filesystem.php                   |  4 ++--
 lib/filesystemview.php               | 23 +++++++++++++++++++++--
 6 files changed, 27 insertions(+), 8 deletions(-)

diff --git a/apps/files_sharing/sharedstorage.php b/apps/files_sharing/sharedstorage.php
index d46a7d4e70..41af077b5a 100644
--- a/apps/files_sharing/sharedstorage.php
+++ b/apps/files_sharing/sharedstorage.php
@@ -456,7 +456,7 @@ class OC_Filestorage_Shared extends OC_Filestorage {
 		}
 	}
 	
-	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 fd6497b947..1a33d30463 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 f0bfc064cb..0d3e2c25fd 100644
--- a/lib/filestorage/common.php
+++ b/lib/filestorage/common.php
@@ -110,7 +110,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/filestorage/local.php b/lib/filestorage/local.php
index ea9a907026..1f3fd2e924 100644
--- a/lib/filestorage/local.php
+++ b/lib/filestorage/local.php
@@ -157,7 +157,7 @@ class OC_Filestorage_Local extends OC_Filestorage{
 		return $return;
 	}
 
-	public function hash($type,$path,$raw){
+	public function hash($type,$path,$raw = false){
 		return hash_file($type,$this->datadir.$path,$raw);
 	}
 
diff --git a/lib/filesystem.php b/lib/filesystem.php
index 813590b00b..2c7df5daa3 100644
--- a/lib/filesystem.php
+++ b/lib/filesystem.php
@@ -458,8 +458,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 c09f1de546..f147cf5b24 100644
--- a/lib/filesystemview.php
+++ b/lib/filesystemview.php
@@ -366,8 +366,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'));
+	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 164fc1c981503f0db7a6e0acd210d0a8f43e08c8 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Thu, 26 Jul 2012 10:30:14 -0400
Subject: [PATCH 0486/1224] Fix used space calculation if shared folder does
 not exist, fixes bug oc-1331

Conflicts:
	settings/personal.php
---
 settings/personal.php | 133 ++++++++++++++++++++++--------------------
 1 file changed, 69 insertions(+), 64 deletions(-)

diff --git a/settings/personal.php b/settings/personal.php
index 26a9f601d9..04abd074eb 100644
--- a/settings/personal.php
+++ b/settings/personal.php
@@ -1,65 +1,70 @@
-<?php
-/**
- * Copyright (c) 2011, Robin Appelman <icewind1991@gmail.com>
- * This file is licensed under the Affero General Public License version 3 or later.
- * See the COPYING-README file.
- */
-
-require_once('../lib/base.php');
-OC_Util::checkLoggedIn();
-
-// Highlight navigation entry
-OC_Util::addScript( 'settings', 'personal' );
-OC_Util::addStyle( 'settings', 'settings' );
-OC_Util::addScript( '3rdparty', 'chosen/chosen.jquery.min' );
-OC_Util::addStyle( '3rdparty', 'chosen' );
-OC_App::setActiveNavigationEntry( 'personal' );
-
-// calculate the disc space
-$rootInfo=OC_FileCache::get('');
+<?php
+/**
+ * Copyright (c) 2011, Robin Appelman <icewind1991@gmail.com>
+ * This file is licensed under the Affero General Public License version 3 or later.
+ * See the COPYING-README file.
+ */
+
+require_once('../lib/base.php');
+OC_Util::checkLoggedIn();
+
+// Highlight navigation entry
+OC_Util::addScript( 'settings', 'personal' );
+OC_Util::addStyle( 'settings', 'settings' );
+OC_Util::addScript( '3rdparty', 'chosen/chosen.jquery.min' );
+OC_Util::addStyle( '3rdparty', 'chosen' );
+OC_App::setActiveNavigationEntry( 'personal' );
+
+// calculate the disc space
+$rootInfo=OC_FileCache::get('');
 $sharedInfo=OC_FileCache::get('/Shared');
-$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;
-
-$email=OC_Preferences::getValue(OC_User::getUser(), 'settings','email','');
-
-$lang=OC_Preferences::getValue( OC_User::getUser(), 'core', 'lang', OC_L10N::findLanguage() );
-$languageCodes=OC_L10N::findAvailableLanguages();
-sort ($languageCodes);
-
-//put the current language in the front
-unset($languageCodes[array_search($lang,$languageCodes)]);
-array_unshift($languageCodes,$lang);
-
-$languageNames=include 'languageCodes.php';
-$languages=array();
-foreach($languageCodes as $lang){
-	$l=OC_L10N::get('settings',$lang);
-	if(substr($l->t('__language_name__'),0,1)!='_'){//first check if the language name is in the translation file
-		$languages[]=array('code'=>$lang,'name'=>$l->t('__language_name__'));
-	}elseif(isset($languageNames[$lang])){
-		$languages[]=array('code'=>$lang,'name'=>$languageNames[$lang]);
-	}else{//fallback to language code
-		$languages[]=array('code'=>$lang,'name'=>$lang);
-	}
-}
-
-// Return template
-$tmpl = new OC_Template( 'settings', 'personal', 'user');
-$tmpl->assign('usage',OC_Helper::humanFileSize($used));
-$tmpl->assign('total_space',OC_Helper::humanFileSize($total));
-$tmpl->assign('usage_relative',$relative);
-$tmpl->assign('email',$email);
-$tmpl->assign('languages',$languages);
-
-$forms=OC_App::getForms('personal');
-$tmpl->assign('forms',array());
-foreach($forms as $form){
-	$tmpl->append('forms',$form);
-}
-$tmpl->printPage();
-
-?>
+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
+$relative=round(($used/$total)*10000)/100;
+
+$email=OC_Preferences::getValue(OC_User::getUser(), 'settings','email','');
+
+$lang=OC_Preferences::getValue( OC_User::getUser(), 'core', 'lang', OC_L10N::findLanguage() );
+$languageCodes=OC_L10N::findAvailableLanguages();
+sort ($languageCodes);
+
+//put the current language in the front
+unset($languageCodes[array_search($lang,$languageCodes)]);
+array_unshift($languageCodes,$lang);
+
+$languageNames=include 'languageCodes.php';
+$languages=array();
+foreach($languageCodes as $lang){
+	$l=OC_L10N::get('settings',$lang);
+	if(substr($l->t('__language_name__'),0,1)!='_'){//first check if the language name is in the translation file
+		$languages[]=array('code'=>$lang,'name'=>$l->t('__language_name__'));
+	}elseif(isset($languageNames[$lang])){
+		$languages[]=array('code'=>$lang,'name'=>$languageNames[$lang]);
+	}else{//fallback to language code
+		$languages[]=array('code'=>$lang,'name'=>$lang);
+	}
+}
+
+// Return template
+$tmpl = new OC_Template( 'settings', 'personal', 'user');
+$tmpl->assign('usage',OC_Helper::humanFileSize($used));
+$tmpl->assign('total_space',OC_Helper::humanFileSize($total));
+$tmpl->assign('usage_relative',$relative);
+$tmpl->assign('email',$email);
+$tmpl->assign('languages',$languages);
+
+$forms=OC_App::getForms('personal');
+$tmpl->assign('forms',array());
+foreach($forms as $form){
+	$tmpl->append('forms',$form);
+}
+$tmpl->printPage();
+
+?>

From 41a74e3dd22c3293c65a4d826256678f173820a5 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Thu, 26 Jul 2012 20:45:32 -0400
Subject: [PATCH 0487/1224] Check if size isset, try to fix used space
 calculation again, fixs bug oc-1331

Conflicts:
	settings/personal.php
---
 settings/personal.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/settings/personal.php b/settings/personal.php
index 04abd074eb..eb45c1b3aa 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'];
@@ -67,4 +67,4 @@ foreach($forms as $form){
 }
 $tmpl->printPage();
 
-?>
+?>
\ No newline at end of file

From ea18d70c6075d72e3c1e67b282ba3b2799550f88 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Thu, 26 Jul 2012 22:53:55 -0400
Subject: [PATCH 0488/1224] Run pre and post proxies for file_put_contents()
 streams

Conflicts:
	lib/filesystemview.php
---
 lib/filesystemview.php | 71 +++++++++++++++++++++++++++++-------------
 1 file changed, 49 insertions(+), 22 deletions(-)

diff --git a/lib/filesystemview.php b/lib/filesystemview.php
index f147cf5b24..a363cee0b8 100644
--- a/lib/filesystemview.php
+++ b/lib/filesystemview.php
@@ -198,29 +198,56 @@ class OC_FilesystemView {
 	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));
-			}
-			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){
-					OC_Hook::emit( OC_Filesystem::CLASSNAME, OC_Filesystem::signal_post_create, array( OC_Filesystem::signal_param_path => $path));
+	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)) {
+				$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_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) {
+						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)
+					);
+					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 93c75f46e5dacc59362386ec93c1a59a7e057179 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Thu, 26 Jul 2012 23:10:21 -0400
Subject: [PATCH 0489/1224] 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 a363cee0b8..7e5f156aca 100644
--- a/lib/filesystemview.php
+++ b/lib/filesystemview.php
@@ -201,7 +201,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 6b83470c96a509cddf40232fc77764e6ce591281 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Fri, 27 Jul 2012 09:37:11 -0400
Subject: [PATCH 0490/1224] 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 7e5f156aca..ed52ba1be4 100644
--- a/lib/filesystemview.php
+++ b/lib/filesystemview.php
@@ -243,7 +243,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 f378415377a4afc44a55f4aedec3dfefc87ad890 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Fri, 27 Jul 2012 12:32:03 -0400
Subject: [PATCH 0491/1224] 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 7d17c59a51d06e7aeaf8b52fb5268dc14a7b51dd Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Fri, 27 Jul 2012 15:34:51 -0400
Subject: [PATCH 0492/1224] 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 36ac372cad..852e5a2457 100644
--- a/apps/files_sharing/ajax/getitem.php
+++ b/apps/files_sharing/ajax/getitem.php
@@ -23,8 +23,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 c0d0a1f18b..b939132a9a 100644
--- a/apps/files_sharing/lib_share.php
+++ b/apps/files_sharing/lib_share.php
@@ -182,7 +182,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 d07b8448d1e96f07c6e6b41293797a89a4530c3d Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Fri, 27 Jul 2012 18:05:18 -0400
Subject: [PATCH 0493/1224] 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 f5c91661ab..7c4e1dac3f 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
@@ -144,6 +145,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 3e183b2eeab4ebd1e8df7531c22f1de6ec00cc97 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Fri, 27 Jul 2012 18:10:40 -0400
Subject: [PATCH 0494/1224] Set filter to empty if not set by Ampache client

Conflicts:
	apps/media/lib_ampache.php
---
 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 7c4e1dac3f..63682100d4 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
@@ -268,7 +267,7 @@ class OC_MEDIA_AMPACHE{
 			return;
 		}
 		global $SITEROOT;
-		$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"?>');
@@ -397,7 +396,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 519eb39422ec9ceb2f5d0023723c8e8a678c54af Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Fri, 27 Jul 2012 21:28:25 -0400
Subject: [PATCH 0495/1224] 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 dab708b6255f5ca064c7471f74fa8cd795f093d6 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Sat, 28 Jul 2012 11:06:36 -0400
Subject: [PATCH 0496/1224] 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 b939132a9a..29a69360d3 100644
--- a/apps/files_sharing/lib_share.php
+++ b/apps/files_sharing/lib_share.php
@@ -182,10 +182,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 b9bd54bd981b63b986571b8e90f9809bf8de67dc Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Sun, 29 Jul 2012 18:01:43 -0400
Subject: [PATCH 0497/1224] 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 e931e5f77e..2a81e6f982 100644
--- a/apps/files_sharing/ajax/email.php
+++ b/apps/files_sharing/ajax/email.php
@@ -9,4 +9,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 afe31a75d0..1ad5187354 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 a4e3a39fee..0ecee0f01c 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 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 0498/1224] 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
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
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
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
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
zcmV+`4Ak?9P)<h;3K|Lk000e1NJLTq002M$002P<1^@s6VKt(A00004b3#c}2nYxW
zd<bNS00009a7bBm000yv000zC0dQ>q7ytkZ%}GQ-RCt`#oPTf?)fLA-ci+DEl8_%J
zfe;c%0zriV1q4wVkhFp@V5c%VEmi7|v5xH&wf#eD9juP6Q=Ms@wkWogS{)t!p(8Wx
zw05YqWPA})0}YfS_yY(5glc{O&F}1<{;_Xg_Pw|7?Y@`CkDfPYvU~TObI<wi-Fwfy
zdpAl%xR9ij3Io>zvw#`ERls<lD9Rcz2y_EyfTO?%KpW61A_EuHzY76?Qfe}=7Ptji
z4CFhnhr?llp%9^92mywNh8P+iVrXzM(bN#|9`Gk%n~1dM+}B(Ipp?>q+kyLmWq<-G
zFCWk3DK%6~tfaKGj4MjZ(Di_;jp5;8dV0F)?&{*qnbVx;I8Jw0r&Hwbz^{NeMPwu=
zevcIZrBo1D2Rs2x2N*wL0yAdLVp{!`6ciKy;8}~fpY-<rmm?p4%;7@^>FoU6E<Of4
z3%n*G!(;M)EC48_8iALwo^7VpPiM}&1&p6C!4eoFxQW`IfA$~R_U_@>(NFB64}gb7
z<n3(h$O-_ZR4MRt;BJ7L+Bz0oe<P)3WuCf{>MR2{x;i^)eSbG6I*!{#uL0i`kskk6
zEXo)FrPKmo8&FqJFpe9)u$bDqy4dyH_Nk-B-0U7ZdW3)MZl=G#AD|uhnuxSyQbR@n
zD5dTPHUXh2HMKM>X(SX1`Or+RBR4<^gM))KzuUyg6CGfU8V`!dt9~u`0zfIHfFA(Q
zDy5h^Z$7iGxz^1ew?iM~A??HNf&Fd#YkwQjczy`{SbPNM2|zUX=YdBxO=D5RP1MxZ
zd3)+b8G+@`Zu_w#?0&D=2H`p22`>=*0Pr~QlRzLq!;+;;s;bV&&y<~BCX|8QQzuWb
ztNC3_(*)QcBG0BXofZJ4)IGqfN+}jKETOu3O4`bOQwkNy5kMzS9H(Vhvwivv5qTq(
zYDxf<Qr7{yfY6+I^QoVHrDw(NzU2-e*UmJB<i{T!=D_}aV9hfcL}ZVfoGSoIsUl!6
zFuk^J8uPB3pP8SY!s#`0Wq0qM_w8Ka2rySf&L^ttDa`%?m|j>^#H?$s#ju{IG?nM7
z8?%KoZ#8Zjv#yy#S63%}y}i?bp8^ji$|SV_rBnkDQA*LUWGN*jSH!LbgF#A5OR)xq
z^p(d8SQ5j-!*q3Zc}L@ESA13sJw4s*elKE=3^$3$yUy!zEg(9hdkJ7lZ5@S0#TcfE
zQi`=}*Ro>8Ed+x>UzI0<WYedoPqTURW)2-X<ZdJf36itlDJm|eYVu@Gc60#zQYp1S
zL=5}7mY{nlFeexcQD1*0reR<j25WA+jW6GNE1_TrW&cz%qlmGHxN_yhiG2UD$0#o=
z!!*ofHl1u>ng)iG4R21gSzmt@x~>Dv#agEz2>_*(20RW>H+3q3fEKHK`7O&4+yiow
za{gQZQVNuUyu2_sExpM{P$q^CfSl|GRv-{yN==>Z=9AG_f%r$@E5J-$*QuOTjbT_F
zUoaS?q`1V65P*@9VYYAIPE%78y}iBe%`l2hMMVW`)~sRCqD7+yfbr$yF^$B|)kkNV
z<q%O-RmJi4qZo#9HE=8N2Z#sYL4ZkB)o7Z+G_A+PG&MltDt__Bm)N;;r>}~8db)Z3
z`R91#kw<83Y>bmJO~YqES&Rw^DoP75v9gL&Cp!SXMHB!HKq)l|SPoDzu`<^5>?UM2
zb&F4(I>|fl{LQub#n{ngZCkIu{syC+gw;nFMj9J&9BuM0cAb94^#d+;DkfIgc&t=P
zRl#TrSPN){g++wJ;n>{=Fr%Y@eG}T-kH;R5OzzB?Gp89C=qEovA5e&hm9M)_igGd(
zI1a6oa5#^Gf&%*b`V`js<whHT)c|GX<rsz$XGhbtxXw<*i~}g0&xvX9Xloj60ht8i
zR+uSNW#!}P>pKosKd@1cuG=>N6c?A+v#6M5Q!{an=wh0fQO7f_Tq$dWu<S_8P9kM>
z|9x~O0u&Y&*{4gDQehof2;}LyPAD8sx+?(*SYwyNNK$I-QMts#BsLHTk~+oqY1gd|
zFNttom_Q(aVHjaxz7EU>7&opkzG+7-jtmde9Erq=KR9?W>CXABeE05M<c0G9`0()I
zlr11ryFP_uR8TOE^XJb2%vV@zeBZ99m`LTMDi3=pC-T1Oa<F^)(@*LA{4;>fI&d{W
zFciYDTR_(963L1M1qIx9-+eSRG?1T{@1m8RT_Dz<3=R&`+S<yNEnDdB?)J16vgb1}
zO$TZKbUo<E%shHop8#o^#tT1tf!VWXr?nfKIAuNh36m#RGjHBp?z#6~1_lNaFUL_p
zj{z`6!+JxDQYtA2Ps+n%`FQ%o#m>bW7B@J82j^_b`NPh$Vh8bT&mo+Xt$4BuYisLR
zy=t|mzuKsNxegTCFu9KJZXkLu001y;>Qql*KXym+kd(`JvE%8}>#Y<!ja|oSfesW{
zmEg$mJYDrkD#b|V9Y`vBHg$BI;FVWip{=dWelr9J{r&x(36>+V3+liK5ERqE%y>5D
zad*YUJ*MPB5vOg}b;{UrXJ;pO-E}8t&z|*iH_6|j!9mWRi|GyPKp#*tGGd?w+$+zB
z9O|ZNCa)Q!xXbayE;0@?hYua1JG!*y*W00?A<myW$KYUG2idCwoj}QmF@m0|1-jgI
zKNX8e`eyC+e58_h6koq^Aq#J~fnB?HdD<Nu9H6(ikD;NY-6sH@I&cD**4@=bettgT
zygW25aiz?Q+%vNC=gy%>1D5AAKdPx52!w(`e!FE0&CSj1*|UefzP^~`-o1O-*Vab=
zKtBWC{XvHUeh1v^EDeQ1gu`J%;V_!=1|wB~H8nN7_10UiTVj-3GxurNO~RV83#(SG
zqNSxJ>CsC;zYYNPzzS!nVHgYz4bk6cH66n+5Co+($9kZdyhdoopZE0iaO&hq8XFtY
z13IY(@`OO5BKG*7m;yMn2~8;kFb#vJo_dPy+qe4(+@{wQuoT$oM_MUGAP_*;bpin$
zT@T<`Ure}Tqh}Qr6)ah@gu=o?x67Vnr^40(iZzRr=qeFFUtb@QNQCzGj5m=jQdoIF
z4-oVab|o7WP1Ddc4W;bA%B2JJw~%24C(%(Pnvt4@-)8NX`hhES5$RJ(MSw46V?{(5
z8A-ikO)16f*|S-;Y&nI6<Dxq8{h#&7SY_D+IWRClQ&SVIt*x1;?G%wA6&<R+2fUDR
z%|7U%haTeTr=Rwb<&B*-ZQ8_!4IBK5e@8?%*#Jzz+GLbdFK5o2NhA`vD8bvbX3ZL!
znwq@COrTmsPHO-n(gFN6*Ul_kw(Oz?53pjz3U49!vxuCA_!lEDW9{wD8QHr;FBC;0
z5n5VW;@(ajIB>v^>dW?l6M#Pg9|0~~K`t*E85v>Sx^?W>u_GJxe*=H9Phx|3^p)|C
z#_ryQr${7{ZSVlkh)8VSpP1)v1@>iY`C`$G88av@F3v{vec<=bf;a%8t>EG8U5h7Q
zZ+^0%%F0T1?AXB_cicgBbu}d=B{2?%!>QB+Yh!iXs!ys-QojMdIaWt+zWHXhZQC|h
zGa1qP_3PQXb*tN@mqcWJVqv;nV*7xpV{t|)#n!D`{SHlIrq<S0R<B;o@Nm*61Rny|
ziAd6BhIIP`7XZzGpWV<YDHsg$zylAka^=eS$xsfdzrUZRrY1IS+~`;z9K8(OC?fk^
zl~e8Ii2`#ssn)9hfB36uV@!833c{0@K@i#Uqn`2k06<~wyuQ@IWXjKY#pVkD2M8N3
zgP{EKV}9cD4S)lPd$2YiU+Mr;aX;|&jAF_}I10i-tgkySb+C#25!O(bSv;94L_sLQ
zT1~#xLEF3;D9S39Y?K^8d<i&k2?KA#+5nw>3}aD_f}mr)SNP;22L2(|*Q$Xr`#)9#
z4j=+pd+*-9KtY>W^Z46x5xC74^6T;2vG(FE2J*5r)ekgbeLeoBh@8rehof{s0Enx=
z+J`s~m;=njnqXA`Wmv!nFhKnO4>*W58T+S<@#APO`X3i-lK*(0&no}`002ovPDHLk
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 0499/1224] 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
zcmeF%Wo+flx+v&Chnbl=9cE64nW4kX$qF+wGcz+YtS~1XW@hLxGxP0l?>qNw&1iH+
z8jUnRuI1PEdR<k^<tkaS^@RVD6Gwo>g#`ftL6DRXQT)5#_#2qekbk$8RJTfhci$X^
zB$c86E?&^aVSj(a*hy$Of`GuG{u7{cn?CRV)Nm42cM^6mF>o@swINnEw>AM`WMyDt
zXJBH6h&piiTLS-|5=yoJCszXp6A(dTTSF6KF>?nKS6c^5M`B?mHv6VMb`TISH#-Ma
zHMgt_4QWL%Cgh7L(`gh=FifmJ(5mjB8+CxQDbiMxVH6(!!8OAjlve*70T~Hqv|)uL
z+`A0e+6of*L?8EB7My;b9{#Smgp{`rpN`EM)yhFbrfj*BTDuS5C?$JZ+Y6>|$Zf@<
z=6P<#0uf(WpIk4+d8%Jz*Q6wZzLU#Dn!XqBW_b^VFS7z?VsEiau_5SRmIva6E+2?U
z^z8J9&<>4XO?TWp?byR^l(O^!UqJyj^4((ay~4e(EG2&g6`;%baevJ=y)g(pAxhF$
zeRj+RnSGdjUaBMhTGCv^Z{}iC4<$FvwpusLB%mPRx8H8tHo%l;r5?}3C1-Q^+{)iC
zHKoY3<x+Gds4H2tb()t#*sPSKDpY<J)2dcEua1gQbyM&f0f2X3vrDpk(D}=0CKV7e
zmIJhHW+rgvNnlupmnb^hu$`ah;|R*lktjAlUXe&6x6_<fxXV$?bJem@@27kLi)vKG
z$)5wa5ECcaZ?uM%?V&TvL>amLSFy#Bo?z#o5XVnx3fG|QAlG*kJzwtmfDgLy*zV6>
zb*1aA9{v<^@i%$F4n5y@@3N(jqa1;=SmckBuhiYU+<tG{Z{1)0r$j$pLAC^Z+&@FQ
zp{jw8MXYWA+{o!amS3tF%5k66{*OH_J{C_~d=*;0#R6fUZ*xHbr~D;$bjlE*pVL(5
zpzP?6yP~tR-Z~k%y>ASl520YyM3eHXz*Nl#>9QVHr!!{d?3jb-Hj1PV%n#Yzxqrr0
z`W2P`?Mu~_9&ntIoYr%c@}zADP3)kz>w9$7c92ZS;Uw+aXjg00&b1nx+l38gmRmGj
z{tU8?VI*m@9*6UHu1Z*23W>dLjeY(-{`NQiUoBKcEcqZHk|fra%1VFdwYR0?x>yQ(
zR(SR^p(%i+qv>j??2%ckNyWvE%>RWvqM)dr9zUVMWLddQ06DBFg@JT@j8pTo`-AEY
z>2Ti5ZTjaXh(7?_%CAU-EQ|&$e5m*)Yks=z-rVlW{Oo;Kqt@4JCpP!tF@_<^zO*HN
z?f$dT*J~DfawZ1e(W|ioMdx@A%j(Xnlt3q~gl}sL=TE4;Es#iu)nJ{UC**MnQ~P_t
z*U;wX=3S&J)~8h!5}&S_o~1C|jIKG|<T9VduqNZy>UQ7<lED}EN)N)Dd{caL$wTAQ
z8pR67oRBr^WfM|}+sT7>`){uM4cJZl$}UGQgIF!kYiJUyV}H#LS+26}J__@P7W4VF
z;_T|u#?_T0td;Ybr!7Ck)5c@1Qt?dhX5e<PQJ}qLFD}&iX&_(6C}9WT`gxTR!&AN5
zYpb`uzUvwkxo(NK{%i?2x9m!qmC+8M%5SEND##`OAscflGTP^(KD?<Ei3`o#^v*IC
zWi|O>I1P=|sO^=dudLxS>^NyQk4Ef>P~4Ot=L4P5tZ!T1Z{9LyPA6s#<o>YMZ;rw&
zw^%TR3Oqc+QDx+sQ|6Fyq_@aazhQ#*m;bn5!ACM==4c)>jxu}T7~t3Hp3f86#`yiv
z2cH*oNZp<vuT+n(0QZ>R3mcSUK}0YkBn~!SGi*$KLz@c>y0{~13Tz0YND^b`IMc?A
zE?PYlBaiomF`_eTk<pS9>>?B6L7^%Gc2hVr7diMGBe)4=^e=>QRd@m~#zNGY&BGaM
zWaI8f)i-TOb`Q+&9p9z(Sp#odR}n%oryr(qSI6qoYZ_oRYeto4n8n~F=5KJ~%CZmQ
z&*vEVz**&`NN`qxI?P;QegpLt&_5Kvf#KK_OOjy4lJ+mhx}yv;la4$Ki;12H*Rl@i
znM6C{xZUKNcF-1072hD>bX#fv=ItCR0KEjQ0bnyvT%*jV@k%g)7ya3;e*`B!vLpie
zJssfCY!-$D+VdoJjFaNfs(<YAB6xX>&y5aei1jk2E4wJDi`k)t-*LoP1ms%AXIjY!
zW*?+<0KZv)H#@YNp?>qP2y03cylg2suY=Vc{FI4G$77u6hX~g7P&hWB$Ed3S`GCPs
zHsYZMkGo*>i^|VaK?#*G#fA{gfkiA_HHv>1OfSApE!LQaeA4F=IuksLgTBzo&%oI-
zd^o3u1mG5~;}^0cG%W950^-fV$xZh|wN;JvzC~lLVARjzuyO^8na&);<7NvM(g@uV
z`;(ie7e&AdCJfbJG@91Kd@m&Kbj21z6dq9!InGBXX&O<En1wA0i}*z?6_6xqo(WcV
zhXcA$K|aSRrEdjI9@@9hnC1nUIIVw+Vel#jtCZ;wBmC!KH*2k;BC*ZRIbn|#M3D<J
z(^bd5fqEA`)Q=!4j|!Yy06!?dMOwGd(qfww%olt(7qk7yAD-$S!BN8t6-iY>n|1`w
zjIl~PBzat$Jf)CR!jvuqWm>b<0ETCt9EE8@Txo%uBaocT%rqoSt}G#})0k7sp3s47
zL*chg=Gm@fLE?88V!Fe5Be3`tRnud4eBR;7yi%-Ibk;_d-<H1RE9Jr%rZ$iu)AfHU
zXf#HIniMn1kn!iFe^naG?Aj%-2GILGAo3AVP}OkbQwn>+R}Zi0nI544XLl42ou&Pf
zCvDqQs`pu$dy+}OEt(NMr~kYeJqM8@TOUvCe;G1qRRz!?1KkXbX~J`3<Fiv(un5bL
zx)sr!G@J~f7EQ08;R#(Wo^K?J@AnlASr<e13XMJXc`27Y*=xT^rSd6?-HRNznY~8J
zazkgRCJ9zEa>4YA34@W?<2T>0szRPXns1qoO&bICCeXjFWip$4k#Pvqy%b9;=@q3P
zV<KYZ43zF;P5O22m*l7B&>NspTAc#7*K;z4Go#Bi(+HEG8Uy5p+%o8=$r9pKzb!Ds
z$yfz~uIc+R2S<TU%5WzSF}Wyu)O}6Dr#P{E;=KUpKee3EtwX+NDkk)Y$pms{KyY&L
zxB}d~f;{mhYcdgPvJkkDCX73W^~E#}JE!}+5aZ(4rCD4Ck^&qmOvHn}#}6>5Mw;4(
zbp0?TPjp$L%yLxKwFpcwpAGj>tU~cUCSZiUc%Y;tj)I_88CH*0lvM*HVx!O^@1%iN
zwVwAWK&elar9>%=e(r0OIWVTcD1PVT$2A$Z`>qEn!b&%e_-CKmVhq_>L5k;{r9>i&
zzH5+)N1{!lCk1Q!TBy{hA~-Giw}onztP1QiXR25?<KjeLV<^t|CKEIE)_F+}^Lp!0
zG+L9@7m;sPz$Sx<_NNi(hd17-!guZ%XYdy9wJESy1;a!6a%wP=OQnFBBQ)MY7(6{q
z<oo~!Y)skjkbJ*a_t|L}AuI@PJSfC=Swi@bf#|1yAG*CSY<8lV!9*VBY*Sp7UHih?
zegO_7p!ovol2X1N?26<O+*Ar>=B;`PzmrG$Q9FZI!lP-tDTjX^(3BxVUS8OlJEgHg
z8!7HN<0^k+ORuw*S}Lz_#Lv`?fK7DHt?n0c%P_MuP?3t6HgU`yKOCabmzY~Bpd%S&
zRj8=mC(cV4LIf+&Q5Agyq2X#*-~Uh;ERL4;F-!zJ=Yw@q!{~_rny*q2j;)fnq`mEn
zc2~#P7yw2j{PF`q7Yb+<dP4r?Aztwu&KOzWIa=S?=n|YUS0ZInBlSz)grJhvOH2tc
zwBR)FL{{jP=?-aP*Ur)hV>OTYQ;i>!6p+jSi$%f$SpRerfQt*p8KK3Y)5SD~s{4w%
zO$9FD(t<IIZ|a~D-vP7|I6bBT$CwZ+uK0DP#%|ylGM^IW`rnX%4wlLRkph@%VN#{w
z8iGLTn5FYs>M}x6;d%151-qtJJlh+50;^Gs-EuOU0(-(Zc(`K0`5W>BVI{uuOlL{Q
z6o!46A1=~pGt%wFw;HQL&N))ok_Y<kHcL#=MFUi>F+oAf#Hm5Uj*5ixQtr_w6L$k-
z2baEF@Wdn}$FiXs<Rp)|5I&vS;fvBe#Z>Wj71(k?oeGOMYzw7?iQgg@DRV)hvS&3U
zKQC6S*K%T>Oa)!}!?m`RiZ?80G<4haCVC=iS}AuC)HHz+ZJ9|8875gpJdh=3xf@a>
zYia~91i!edjOp;=RIy*AnsZeniXgigI85@}d#E4_6)BCTF31eX;KIfPUWtp7e2cZW
zaLKBqD#<3RlGXK7i7lq-OKW)WtTd&5XB52TQAr*tRYP8c@ehPlc1(^sb0Z$SAZm1?
z%Y)v#Y2WL5a$~T4K>XNKqORn$aHx<=O_3-jPoY6Pm#$*0554^fva!AM#%;wfdVga~
zHGno@X(mUjh8k$Ya=*yfRVjP;Yug;9rl1$b6Q?4?$dooIK09A+tcJa)RSF|Ly+|tK
zT*_NJC%>dxRBH$l!CR=wB5zZw^&v4!G}MKh43$)coI;V)KwgQVp`6lvAtyS&K_8+f
zOVngbsVbm8cg<2(nIR_-6@S4Cc`t~MCYXV6c&<!J-H3!}q}>BCLm(T{-fY@M5Ur9v
z$|wmAZ-iXl=MPj$u$bk7ypX>-%G(X)<segEV|GUL37p}uAwLWEY*Aysf+Pnp53$&$
zD{d)OtinA<aqHd8<wR<&KTj%#yW`?6Qtp)i9L0a7)V*YH0X8~}c%w8Rp~d(U$x(~5
zm*6ps08%QHSJO0cq-x%Bo}`P=avhLKx)H@~UfzIsqlTOJEttMo3(--l!g<tKCty-_
zu26g?mze4o?hW)Ot%~g(ll?Myj)V9U^URi?9(pQ^b8`;p^&8&#F88&2Wn``XNu65N
z@%=XEqVa(2`v=X+BiQ==ORbS|r^v>)ZJ2g@F(=oyWA<Y*Fi`biwD4yS`~mZ5sTO6l
z+`$3U#obEcZYXUpUJy#ZP%+gHLFC;)5#<IWM2whna`jx8rCJCr!8+Fj`|v3`NUM_#
zn<NLXz2@Hm%@$yd=^z)HevVNx<Y6ph6uConFr-R86Z!p2jtVsf3klW4tKn}4O8(D9
z+RVF5KAm5TroL?DKV>ZB=o)_pEs?phNOb+6+6BVjeE!b*SPWV+7P4Ft$`m#u00SiT
zqQaRr{HsQOn~a$aT_dbe$8>P>=yv_JzXZcY&&H8q0)ai}U6{r9hct;U%_0nuR}3uk
zNCy_8#3<P$S|m={p}f|Xj8-u6nmkN32>VUB03rOJR>dvY)AE`FZa#C0vQDJr?Fw}5
zKWVodHRqA#G&)EBeIc04`N2&yhhd8yi7zKVC|eVs<4^wG<ES){LYd)9vNd!I;c8h_
zciH(P`(*JdUc<MYs7H%zR<}p&7Hd)nt5Rz~w??|H%i+2ojDBRou1ezr`?9K)V8!pF
zbhC0gC4^dY4tV}*+*dT3+1i~Ege<GV%tm%F7FJxvYS_YAMr>J{=S3$2d!xbx<x9Kr
zB3(xqYqU02<IMn5OIF;~BlgYK#YG(gD4+I47gS~3D9pL)=+Sb81$5lZDb7Jkgr9kC
znhRMeCl6<z5y!%@m>-R0=w>Bs2Ck{D<MR*s<z})AHI9SOgFH*6sUO*JJme~z)3<qF
z?y#nr&kXWAAyYHBxIbZ+&15WZMRvqUJ`)Z7r7lk+_DqU9d<WO;IA%kTybz(bAwON%
z10x8)CFY}*;8{;vPL5EKb0~C|2uhzRmer(tf8|fBT)bhN^)t*6)dtN6CQ)z>?4x3&
z%dg{>Kc2K7L~yZ^kj^kp+aAWFq{WH(f6C^r(Q+;#dls>}skXnVRbe5qbPr>ySnk%(
zXBd><D#H3{gY^N8Z?%?WRlk{N+u!9ZVP%;^dCBe|0n^9sowjdoJ68k%qKB<h5sV)F
zduTSf!AdeMgV{<q;VOT7%;}xj;Kiu;0_`I>`$LP3)98HYvdc*wBM9O;SNR~tIgw`Q
zCEm{wc1MHu#dt22q}9NO5WWyP0~np-1|V63>z<7;dnB(ODrh2TWF)Vb+r#;cDA(#s
zYRSU(GCF39HpuDY5aMnKexLi{cKcfZ>w9H*Uv76D$)iNl?%%NhyBo{Qeta1OP_Sj=
zCWM^Nj1eYz!F}e;pW&qgyrj7T<G0t1M{&4w9KhaHE;2ViUqn5P(7t$z-RzYj%@)56
zMR?vH#u8NX+Su|0E`80=H<CB8vx0w~WR&xUOoN{H$+y~y)XF#+=%Hyky&lcP%RXBQ
z!1)A<OKm<p7Co&AyhYVh_v|6aPUE{%IPW`ZeuJDIjQs%f{DIHwZhyt~f<!Tz><b~T
zl|g!6D8C11WKvHAI2`G?$6Z3RaZa=!js28*;}DAfLYq3DKOIG>FF2R+zLj^w<w2X~
z@@w7iNsoGV=h)%neB>931-e?!DqgWvpq(ip9BI(Ex9q9hE3HI`^GzI&B5tHs$MGH3
zt^rKFNAD0;`8MT88Ef>oO<p!d5@ZFLpLTpm@4t?nB^%`;>Oh*uPj)`S2NH9aJ;jf_
zWv1$wO*aZtQGA11Ij`Jq5Ya9y?y!K*%9u$@ObQW5N?gt2O^v4SgX_adm62B_(5Cfd
zZ|U*$i#aIw+9kY5W;$cBJi0LE*}-m~7gdja&tX9nTjbFU-9l1#r8U=av>2a$kbf$i
zN7S+j`3?C8Ox=@?spgO8wPC`T-{f20@LGLC#cU<I@2H3dq3jM}qC6fQ%3FvNpNdjT
z>lmspLhau9w7&57e1w-jk*Y2aqqhauwZvA)T3^|ZP6<b_uL4QS000$$&BBB>i{s=3
z8w*2xx{|Kb<iyy7)qmyu)359RK9aBZs5Kwp1IKI}l@351N5{!YHjd?uPLbN5gOhA5
zG%P@sf48wb(fJMV8NtHRErK#+Iyp90Rkd8D4Rn|sW20e+Pqt6L=vY&u?;Df*C-JW{
zCaNhC*QTn1rd7~t%NR~<YRlR>j!jXOJxgmGQFyh7`e$bv!Y$Mr+RHPG8`}T;^Z3Ex
znTqH?DYe=EBeipQrYYV+eXhMcyLhe*bex<Tf5@s;BipR7bJUSk`}YMigl5+2(QQ^-
zJLpKO-8oE-voSEFrq;@{{VOH=KU34c$E{m2rT7LxMl*GA805G3Kd2p*-E$rd;N3G2
zzQnFOFNNIN(>g@TUxZZFd9rSZ9glc4ILN$ka#<>+xV>pTiH?kEBizsL>*rkt!S1u9
zXWG~8Y#%=_=q_xpVYWfERj&+v{aCh|7JwnY@_|;o!u-Fr6H3~amFEfVWTk-}$DTfu
z&Ipx3ee!LX8lci~I^9oHOV>+3{nwtfi>}OJUCX?u$8UHM1OrtkpS%QUehRhEWjvy<
zg><UfviTyWT=uENn9J1iNk>j-0i7o2*rdM_)IAniz9BVX5odF_og)~L%kxh#_ToOI
zeK_<<QoD4dYO-~)n>P3E@Zh6>lge}K<RT0YM_Kn#oHK2a4sDRd#8N&AZ{;v({h^KG
zKeh7zAwH<)btr0Q!SxiEb`{jhU+B1o_Rdl4&cUYVw#y)()iCXe=Ak`-vU{9UJuN&L
z2n2hM%n^|w43nL}I%5G)|H>qtc~l3#F~jQKqr~pJ(eVB>ZB>Gci<O{{GS~C}CKqlU
zpXnQPWg5QlOU+j*=Z$>R9pMX5^V-C&IKfOS&T!fH{LFpNQjDXWqH@0{7m~Q!eCuV5
zy4*?(CE(u*br6tHF(oeA9qC=(EiH@<3jBbr_pNCDY+o5p%XYEp1bgGOM!5oYjOi`>
z5aHF9=Cyo3lUl#8l-mA%m-qD=ei><mLPmU4vZ`t3Pp;7mD?C??a*`wNk+vjcMbxL_
zWQg0CL+I{IYKX=Zqk$O76R=m3`-WlgPWad@-6)@Q#4&I<A%37)>a@knxfc{8yP|bm
z&a>4De&k(1k?9>vCOTmUS#Zbu(viEf%0JuG%dhq3E!p*kXzb1vy#2I0q8A4V84ig{
zQ|2!WgG#OFBY~SFc6REtM|8ZrAa9O&8SMh5eGggmqD(#Mkl}!5*q2t$uet=)Xvy9v
zUW70q&jA8qN)6m~=ozB$7LfP(_H|Yyo0^Zb-D`gp9t*}5sgbFcM|4wLJ9_Xc!Fk2D
zTz<mh3o(5Foub@%wtt>K<YUC}wE^{$moJzG-qD%k%I5@V?AjqtnquBDmVH?oqt+w+
z$r9Y=9$#RZkyZRD^Wr+@S+d)~6SrZKqRN}JB`I1c!n(^1cql&}U6^tszSyy<?m`g%
z9_T;KS}Z8G6K~!Yc4js&E@wouWLzAJnLF3|ZK-?QC=EG=hvc)Of5tWc1MNU?c}|;`
zLmCf8dYw&rnO5hY+1w+M;`8n3dq?*H$|>F-QvVid=Ev-X+RvJstsDu5ICr3J!^DW%
z%s3M3ncwu=&-jyjp6CdIUg(Jud=-H<n%qN9UXsXQl<eGesA6}NiZWQTyS$qX*dd8R
zZJlh2$fhc7qgap65C=p{bYG*P8>JI<i@>4RpV5PZ14{;|T3R$%THBdXHtlPk7iqh*
zv3u3@e$9&nS$g;vHh&l>d-OAJjB`&otr&c;;j#o|8m}#P8AcdxGhB_jHIG$N3-?^h
zAfJ=;fEg4XG#})XQlF)gokn)n-ZDTB(rS_${s)=|{#3F+(1$D1jT>M0FOhYJ#Hv}#
z2Ckc{L12~6JLEhYA)Nlj9#qy_8EfngXbO3Ku>4B~NHhB+UoqLv%tWvz*@Sb#fUpn}
zOJDAeukm|NU(=@#_}h~!MEXYlXI*+pYj>fP2&O`Hyxd$E^j#R>jr?w%YZUb2Vo}U^
zJpQ-$1(ilDXUk{>a^3BbNL*j)sFw>5b@QKR`J_qSlD7P&=P(EpriUMV&8qZ#p9t=g
zC#A98M@qL--WgpVNfQg+aNb@*9w}e7_As}fvQie>Q!Achrnwu8Ht&dhqqK>XA5h9r
zoCT)*8e#hgX27!3K5{<Rlh=_@_DM_5{lD+t_7hw)hw-H$?a1-xfzt8sE#Xc#qw|Wn
zIhoI39&R{5w4R;0=PU`~IGXnZMcIdg<u>_Std-X_N%FZDF!2qUYJt@uVAP#uF!*zu
z@fGe&2V}kDzz0TVmA;6kLEJq-#YOL{;(eG7SAT9qV#*+tt&)7s5OYt2@I=;ujzPQP
zPzQSTtK53Yo=~fcgpa&)cWY_a!j@7Le~+r0mn_PuAZhrZOvHj+*KAxP*h7gR(_<X#
z_kyzZqGN=vvNKEImx`x9FwT!hw@*A5hA&s~(^yJO=xsQ>li7Vax7BIvc9rxbUFBuZ
zr2x<J$IHBw$|1^XLKw4;3o{n3_-*CBD6KgECrYPzu0_LAncO4ATqxLN8cFi#le>w*
z`>wIQ9?nCp8^I>kqHB-zDK(P0iuOiBigJ*O$#j*-IY!Ee>i}<}sqY|m)RI6h)zU44
zc*U2H0@~w#T8+I-Wd{@KHQLP<&e5*ADhY4>1o*gbzvuw6=yGa(2g~4$Lv?5BCO4KA
zp0YWf0wCg`h^OIllFB=ZhRatM{$?G&dCEfFE$~4tnr)!#pcr*#WmpDUb)%sZS}U0?
z8_WC?zSuz?<tx)}%QLz<G;(-|%RR#~F=b4f05yk8g&v8D0t0yt)4d&ZI_i&J=u**O
z)6DU9$Ud1-qu0*|Fh1S~8UY%gQ?Qs(yQK38c`uq8kdaD49o3Wsm5-e=o)T!YM61?L
z)K8k|>VgT??qOTf&C-tVUvkqTHCtn&Ryyt<OC6P(+-<E*@+wP2WmVa%K`emk>;cZY
z4eHPn42Fl-QI8K}9<V#rkdakRpV~?G==CQyv}Kv9k%81MRGBIXEeLYV3x&zw%l@I8
zGzU9c*H#qh5K#iLyDIK0YA#(${U}W8<M<lY?PNs{CkSDlV1|G!k}T!LHgvij{P@&`
z7Pll<I|)V3CogX!RSadIRVe8P@W)uc!oI?J*dlUHZ<(M&*E<VuMs^dr)6P<sVr-da
z?_pcM-!!Oud4@-GffiI(>l()9c>HTMM#5DKI*IS0=CEpjZ^$(JFu}6C6?yu_x%Q1;
z4pw}*uJE6PCK$;ETGNBM341Qn#k>saNC4?I!&{7&YNDq%n*nCQqDk_jx*cKoYE5NA
zqU)r4JM`o!bGvN!I@KM2tsVSM_ZbZyPJ~AKdj>UDEF1gP>=BOP`@KK&lPONQ7jL<o
zc7sd?aX7h(JX?7L>=*k8mcz(*UA=S}qqO7^oqoQeWE^bpp)=mJZ=aH9ibYOhd*^I}
z1UF_}`4+>n?N4}|0V)6@`O#zP+o}L%FLJRpU~w2r70F;1iV28a4owk@A=T@CDXTgD
zNhjF)zHT%Wo%#iH4RWxq%~U7s*7LS5(YN+xqQ4JU=AP@2n)-(?I%_!1r&xybnTLWh
z^XMnUn7S<At3MDnE=W-OABGplPs%ipyeh4=vt}>g(INbQK5s7JT8A%RBkv-Y=Br7v
zJXY2RC+UeQ<;~x_7uDG+nYK1Jd57NaPs+LwR<QRT<%l@&I?DVq-TI<SS327|TzzH<
ztSGqK&#oD(5n4qCzVKXEIL7B5h_R7kG>@?CqX!);3UT@-b8_@}t_TVASnqGxw-H|%
zVj18G_|AI~ptvvgA_4oJ?V%$GF<g<Y6RnG9gnDUvm---3(cDnrUSV5&_{LEgON;^Y
z$WOx|a6}+4!zFB&HcrS<Hn|*5Z}z_dou({X^WjfUyS#MAqAiQTTTdL<%+;Utu#M}R
zAO^yYo$7n_!%G&uDX;TU@Rpt1w&GYNKW(~#DjRie^h>qQ7^WHiD3F)-`|p+mMwJZk
zaxExxa9uf_D|FqcvpW6t|MX)ZLgxSJ6$=n*Sq_bi&9(lnD-S=9(}LtVT;B?v6X@M8
zb^4Bu&N9sbHx+s@afdMaLiG!fQ;U_Qclojd+eIMYLMXb4hY!ke!nNfn&k^S7l*k@3
z#SYnoV^vxXggZ}%?C~=<d~0n1MVhyK3UB5LJnj$7UkE1m+*tRo#WWiLwZXHq@{A?S
z<5h>kI3aXW;%RUfkOy`*4d>dwTR}<u!6_`caf{f4pR#xLCl>ni-o(1RIl`RXmnO#m
zXfOASY4P~`{fka)QY$K>1=+?ejZOrwCF%?Jo+xV;lDlKEB-6Sn*AUGw3aNDwk}$Yu
z`dTcTFgiKV2ky;nMsHZw(vlR?xRWoB@4WGC;lk9ZFFTOkW{4{Dmh50tE{w1*hqVCk
zdr@3h(la3aoqtAZ>tH>x55*~m^`L%G`M^H0Tq@BVHmY%Ripz%pzqbT5`s^9G8hj0&
z3%t|lNI(0PZJhDse!F#EHmkC>{CaP3|G`JH6-8FolIXDcehtcPZ_4k-%If({Nl)lw
z32^jWHg;g~<UxI%eI0-25LaWYB>zn~P)jNlPs-G5X1x#U=jr(lpsst0edtEiPYdmw
zAY++tt?QwW9O1HWo<zqxm!}KV?<>Vizls*-M8}gix;n#$W9vAtu3MU5Fh(*4q_zs_
z(<JhQ->nS%m@lCWyh6yMm4&#PXM^IW)l+==u)OD6nOIk8qxl8%;o3K001wk}hqXr*
z|0C45VMKz3i<XrT8e(|+NBGFAY{iy_3c4#}+g#>@>NIQD$L0ikH>a6=vLdVBv?zMq
zuh{44=5izGP`sqd_-Zqm`IW<Jgt5!6Z^y@g_f^<O(W9k7i74p}y%Hm+>JKW03}*vx
zU!p}9?_3Gne<B+h!fy%66YhAN7K9g6ps)|c3L5%SR-I3<j@{Mb@DdZku?m@ALMDgp
z7EjJR@u*+Vvq>gLC$n>r#l6PtmN}+n_}#|Nb@al9u@tYz#f_zHW2*t-;7f^JlsgfH
z)jGuqkP=0PJ9+TvGz;luDhat@_S^(ojc{y&H?ywX!Baqc0CVsn3=jjKZ;<s=UW@Rc
zC2(g`T^LnYU_j&GYC`FvCe0|1<qR6;|2D(k<f2Fvzomw5!d^tayhFZhOuoEFzP$gh
zV|5R^SF;eZ%oSQC%zK>ix|+z-`GSjM0}bv|z+@R6TcNNkr*;a?B9@h?%0;ePW>0Z?
z4?|qXUaJC92*6CW(e08<y|Y@EW3_&f^o~qZC{#lz5vP9`FofE##vDA^P{PRW(?q2$
z!-JENkLR#AWQ{i^F1ya&*Z5OoeuxgwO9$h(i+lMJgtPf9U{aCIGWt2%yGR*vzC53Y
z-HJ5>%_5iZJT`dt(pbDhCH65H@4}`}-<8E^a}wUUh47@3d2TX+^rOC-aUrzC5)1J`
z%%u!(HUD#^Z1{C7+W9S^MC>fTlFKQ&L3mjOyS=XtM<&EZH#y6xvx$7~g1rl32P5yd
zY70JvN{(wD#4v{Hu#3T$UVVE;Y}=c1WrXMUj247knPzI2aB6JV(kmZ?<XN7H>T!(L
z1wqBs8aO=ZO0SLY#;NU`;0I#U4snod<ZhDc8I?8r;|s(JrOksGaw8XOqZR>fclBSB
zfV4MY8Kq^l(E|A&C;?gcqQ$(Z5lP>wwT|hA`2swWodEn`<MLl7A-P--i#$Fne)f7d
zYUxLD@~BDr658gyRp1*~ES^04`W??DT2UqkaFQUuEzx>viR3h$ON2#d$@ChwnF8^u
z`Rpd4_b@7=cj!L7U6brj5s{7te}wc-S>SxJQ#9()S-B!t%4A#l2Sak;S02F~3Ee{B
z;$8>gw$$D_E#dZIVn`xOvqqwmHn60@sQoldci%0?mUY>vjc{CzGX<g0jS=rPQ7pbm
zu1Px7xuWZQ#m7nof1@1jh-fp`bg>Hy$u@bOChBU1N^iyqIhj#nj5?~4vNFyIp!&<`
z*x6vvWP;W^!Zd|;oAEdCf;7YF+)ix`n;JkN)x+ah?fj^^bu_Z)BVbNIj0N84ZRa2j
ziGdvtvIR@miUK}g6WNur_6LwfS8M)yH`o}c>Xg144roKm91RcI4R3ZU&~+-9gJss5
zRQjR*1FlZyVBX|xm|S9lN2lFuLX}Ua-J@y@IF1>ctT-V>z7ScR65nGNRoWRX*37y_
z*JM*g-aJmsP7%6-ui*Q4E$Lrb9RMhku@_R;Yp8@zYVy?M+@WOlpNI~yJL*_6)l+5Z
zidYrrbj7VGqdW2$I$9XM;UH(G3R~rr@&8?Q-3>jhR7{!|(#gs%>J^gL6;0`*HUQ)x
zfV#}F7t#Aib$^41XW4`I?*TMV@4@h;1^IVOS+1h+YNaM;jkLuk7g<!wESbqoxvgd2
z?P(J&wkFtJgAV1IHQ30;=Pd!NK~_pUwH|!zCql(mR!T4Dx1%fRqoXVHq}exVV`;aV
z<@v?S5Lj$lNyc#Yh~oNiAK{t8=nLNupe?8*k)k8+XVmd|Sq}@Kf`O@GNOH1BY`nDL
zgn;Wnt#jGd!L1;z#Y{Kt#ca1u0pHylFT~)n6X`;D=;|?tp@5^v2aF8*rSWOZ<#FUx
z4vlx3I@H`o5?`n?j8!>Ccp6!(%nau?>8rh9m^=#fvyN4cl~yZ*01bw2y?l<9f##`1
z`qGy4;ysujaWopuoZiO6C#04pODx!rr*vj%v!$Z7X3uA>R$opBpZ+5Z_D#y?G}vBk
z=*TcY4$|^Lmr$EuJshPzwo{Ah=SZEsG}tHlO`B4f>+M#N)^M2X<C<2rK1Um;8djCp
z*^ZdL(jdNzEXfzwR|H!=KN+$sWgjil&ZV1Hq8%{T@zNEn>n$U_Uuq*hBzlCxe`<Wj
zaF1V$bzi2otRqlQbi;RKKaJ&b<?0*(gS}kz#Y2{(eES9>bRfMRtkyKlGUT<#S$Mf?
z(Cc#s7VXMQCMA``%}!-9lGLbHSKBTO5-I9$4yp%xei??DPSs0|s%EVWT}t}k5B%cm
z>i<qADHYu_ImgJ%aKjw+>YY+~l!q5=TgKW@d-GkK_aj1Tuf4NC@id=*Dc4QyEoH0<
zt!jqIg#TG>2BI#lqPs5B+dyJ>WOQ5g<TWPIVIQ+YhRHN}H@S7-0E?=<N!kmC{)Xz~
ze$(^4T<#E+gJ2l%)Tekmcb){$Nls{Q{YahJm4|YQ#sNGzT#&_Xej2#_!+&Yo?y?Ig
z$z)F~iCI~Y%ut3q0T!z${5~?d-$Gk&;8{-Fv20H_5whc|EpEwSbsDw@WD`y&t&hHl
zm9O97Ix+mzQETmza_%y0!`flHcqA{I;L&=G^njsckxzZufFWm@PDx%=bGJK*Jqd5m
zsvK?e$kLSyItVcS*{5LNFof1q__C18N|0{{USr0>a*A0+X9&*x;OQB1rdrXRDuaD(
z;S;J;oBk4>@k&;xCO4i#K-PH9YNW}o_8htzfwrdh@!RV3<WW=xs!Gj^VkhivFod=r
z+PdY0fv&%7JMs${4d49@@<W8bPS#>~<+m6obAjbEaG^38nd2<znT&iuXBuwfhoYoR
z!E@$TGfrv$q;izukfa?8Ms}Kg!BiIM$3?JB)@M%B$`XdWw$EdxM=Bm9WmeZSstpB@
zk~T@rj-~wwyz>(#ZEXP~z5QnVlU_`qZJsox_)M_Q!nno#oALZA>9&JWi#WJfYFbZ+
z+%!;{y);tRE&kHamp^ZIY10Hx$k;m@^5m84V{D#_tBM4FbqKB5C0zDv<pXWSXX9~o
z8NB%<!HSDp_}1wLo2WVS{0xNQY1k(+pkkB0{+7?hCKBgv^OFQ7$lB%YM_e=?O5dRv
z5fR`^G`DHC<pMOi{-V#%sYzB+nyB$!d@ZMNHQ0YeoYm!V&29!Q>|5-tC+O9l=W9#;
z2hzKDjdlObJE0*cQ6z}lk89pC9)KW!FAksgXO0gtLxAlucy`~D5iUBv{yXCqujVIj
z%%cQiAYmUEG_r8xGEC7Fiv6jtAQ2zP>N|+1=6<b+T{g=F+r7R>Pb8fEwVUrWUymPu
zo{rI)h?P-YG`*Gndfy&*not1({N6`5;_|Y-<#qLF3#K*4lQ}KoQaA(T<`KGW!HOTH
zW~kGISY*_Im}T~3vw5dY<C9wgC<{@NNiR|o;BT1qBJD*NV%{k{<$HR*S+|piWh&Qq
z0LR%|-?n#l2>$G#yjz;p9QwZ<{>~w9EsX6`AOPzH^}-E+I}#W-GBcn1iHQ}4kSpUP
z^d@1>-63OLOn6TA>sYbtFx)+Bp-wg3vf%|jR>6v7uVS@$l11`0-T{={KqlCf^?|&j
zS?xJ2al~8$iRwh+6ekfTi`uYgVs}D(LJp5kHf26rlJ~I4sdCJbU53ngG9`-cLXfOW
zlHdIHaRyfYw2d0f<ceBn=}z{E<iROXZ?p2+X)+`Mdo}i*?(F7A_6U#OyX8Gb&a|S@
zqL%Ub3z8AT#ZR)oZJORX_F)jt*DEI}KS~dddn}z07K4u(djl{|nL1Jb!aAP0_<PdI
zW&|}N6;IKmH8dZXOVr|xRB@hpc}{u1vBF=AAZ&Q)F&!5Ot=6#(KGPnaR)^-KO(!2P
z_DFv*=rt69(p~E7^9y3P?qm=#G_TP-{uBFKFHhYCQG~rM7D1P)$M<M5POV;KqHq#*
z;@7xRjuwM2swf)vVzk(L1q0l9fcb=7y15KZS=!Kj@?07$^k$}zS?b+X*2?iRQKq`5
zod@RcskWx!u=BB3qlxhNdhL&NePs<_5vMV;8H_^5*g_!Uv=1zHBc;G=S=S-u<^d&w
zfbAzNrFX$`fqEdV5+o|yQ3Z0hd%Qk#s30UcFL<H}z#mo{68)l<bwvg;c{H!#Uj&oz
zsUz*0rOTd(#kUXH1;0-G<O#`49EY*zP+v~D9(jlu+~~JzACoHkGQIz<nOwhOA96?-
zYKZI45WF?Z?=CW{Z=+Ru82`P$>@D^f`xn6cfwMMkqF-oA(m>PjO^k&yHgmF6#Jk3K
zX+$+-(kWSG#zD3uAce_LAR}hlPvn9&);Klf21k}BRgk&Cw8Pj588qBT1x2C=`Wy4E
zK!OlGp?FX&(cSkL6S26P(5Q&HP+jw|o-y1b=IdSIX%`KNZ0S8bX0O%Ot^LFoIEYrL
z)(nFY#^2&HMvugO@bfU(fG?1dmo=!~YhYd$9qumnK$n`(bY0SK2;r7-BnR=Mm3(#N
zjuEv-iweZshLz3Tl^rWV)uRkjNG;$@3AU&WaZU#4WEO&^3I8vQdQ6s)kEJ96)xOG=
z+;ApG@DPpGycuZ**sh6UFjb5^e*eON`FIU(18#U?BT6$BZNDOxsDSVC5TUc@^%9?X
z6N=B{b5-Vno{U8K4|&cKL60@RCgE-CJzOxrl~lo&O9US?Ha2OQt$X*Q-s8q2&Li_~
zz&gIO|A)I|F>?|%Bm6P*gDz1yUJBt)1X);A!1a~^^iOyaag_W}#h``nN>pMrao?$h
z$|+$KF^jEr*A(#usx7`p7k(QG(RaX>K@1!<Wqg4r*F!0>En;k<I^rxkc|0qVJM3SS
zjG6Z%ujkj+%BqUs93;^Xm1<-Hj~o}^gBG?;?F?96=obI>8DcROv2iC5g8mxPM#~ot
zMe~Cmb02~gTb2Izm<c`FxB`9=5c7AKDcwfhw;c1tFzmxZs?+RD!9>(X7GV(zWl0fT
z=B#Q?q@M(rWd<#i&Nn}1B~iHJFz-&7{3Wa^S?+maa`pf-^Kja*xN8+VO+Cuz3;7W&
z9N>OO>UN9Cw8r_G<&&t#Dr(xws{b;V*`}c5)9>E0QX}uGA@F6ZT<5%jSFt;2F#@@m
zPZJWK44A+{>J>1iND8s$glC+}m=xCk2dMJfxb7CvolH}d{pbHbP^A@4Sj5x#2gj{x
z=|{^c<r=&wd-0E8l=P4;G!i25(4#5%*jT$*(ott%Uoz0($Ui;m344NaJnQLa+Vl%7
z4!e=K3>9Umri%zAs^q(2lN+Y#inIfO+1xa`|EK9eF*{{CX7(|~Anr}*7HHuNVfCjW
zHk@)rOg(OKM$H5{(|2{^ekO2r`_;fg#JVg6I-J6Uk5S;S1ASVwA`vei*0Gcwk#4Xs
zGtCr&-cgl>B$APWB)4Z%nRreek4Pi8IEQ#2I)?6@V7XysI3}9V#VYm83iNAx`e-kM
ziu6EpBo+~i@fj<-(!~2Y!*xUo^|6M#aOf3)<?l4-t9X>tC(kVL7gzi<NSn9DY>4~9
zfr(s2m4UD=J>*)sEIF<);<vc~XpE%ab!Mnc*Emz;EgJq*zs|yzxtUONneP45ihn_6
z>4Hzy`qQk@zRyTk+AnEbkP+>Ip(nw?KtuFPDZb7F<CzsUB*TSde}6>a)`(!H{Gl6=
zv(i2h{y9aZCm76VXB#SA_`66DI}x{bKJR<kXpps1gPcnC-pakAa$41!6$WPiyhtEi
zrJ{ouede1sJBKc)a6&VtHH>6QxS}-~6lgN53o`OW1NB<zq8%TGyRWjn`CdZqN)e7v
znP07x&@##btL4HB>DfGPq?er$p(+H&O;y1UbYhU;IO3Wa-fu};@zg%wCk$zA9cbyQ
zb@EFZ%N5frQPI^khN<ClXOq&I*fv>pMk%)eIf6J@moj!>>y4sQi?M@Y8V8a6q9akO
z&HRKjV8#ZJ%+g|!sSvB6=ls%3BXoHGou_0dQh8AS-=6Y+d&>XMJY}*cfe!_p$`Z+^
z6nIkJOtI6rfsJ$%eR`F2-KvzwJ@hNu4+tqz!oJ+%Q)@o*OOIZq%VS;0HN5M{U5ApX
zB^D4L-#{HNC_dXAEtnn0!;gkUa#EWJy<XUDJ^f6+FXyO;)UeDy+`il9n*WPNcGcKu
zdhsIeHi{K%RfJC)?gA}tRFJp9>AMNLMsB0jAD{%okWdvyV}2@gmSpIAldJb&T0!(}
zNe+>5wP4p3J9a3H-9)b=!mU-n%mBa|EkUQ4nA3@;D097Vf0IYayfB5r4o`@-g(yfj
z2N+XarpiO?COV9U4L|?eKNcM_mjC?A4v{reHztW65{km6nFrpG93R!tG!tQ}HQ=lf
z^PQisn7q-0*jIhifIS&A+T^S)n3@pzn@2+H`&a7E0!68hdY6t&qcNOW?jmgQ9x_F`
zbaSxZKO!O<McdM2C5OnRQlPTPjec!t$!de5sr`zq3~05X5G0AgZ=TbNI-;O6<l#3j
zCvQhV+bqM}#K*j98}gYDX>?2c2>tn12}5Tr1ZSB)iBjoGaW^md%Z}oPbly4?!g}!=
zHWR2=dd#MDBaCls(f_TC{D}0jX1SXj^8&JLL&|_?C85_ARJXJ>8^S3P@J)+ITc=yN
z$#xh#n=j7fs)zd^h}--z#@j4vLP^V?jk8d}jt=QF)9kA)fs4e$OD=K<l_q=0kT%O4
zDJD6?d@HUycg(ceI6bY20q5Ve;D(__5Q95e8rol=w1AD4HO(?i3c>%yLuVm3e*fz1
zD|(+V9_gd049hy7QP(lvad7fFqufYtvD{`DWJq{6KmIudL6}ILW$Hfj#S;vaeNQd5
z6E-zNh{g|&^sSSxu`5LWlB^dXb9ElPX_(vWF|=;YH2V$37aC{_?#rDiI2Z$3bTUK*
znQ^~<?+61ujmB^mqx7D5R!OE`Hgi<*_z~f}gLNFM)_)>6hK6tG5FRm6Y8|co=CtV`
zN{|tUVwQHqaW?`jBT*>uRU&VVnPm~itBA`(v-v@@6d8)MZ4_C-cC%tWS*Pqy1tCE1
z|3`!Qh3<@;CV;u7)m{D!ZmJQyyW~1_RmQ}l{mRW<*NPbU-BH_A6q|SF2Bu}YpQ>bi
zcdGn(fckHTv$`cU_^`{pzV+mpB~;^PF}WB$>2g)U_JcjkS2&Efk7De-OZ5H>zNSs_
zVm=v1-eBZM3Q_nrxhf{l14O=n*ftYo^-NSXnq5QG#7<N%y@B@~T&UI`(~^VlX1dQ9
zVx0bimrt-N<YSJ?^J0((7r!|0M_z9Q+4G0g&EKK$cR!evdwVwoCT7SXND8}{nIK7Z
zL-<agJVe_Q67O$~QP2hWaykQ7FLL!7IoNNel_C&1%A-X?JnwV<I}XVp@qgivP!j)e
z$l8B6WIWY>a>!fflCHyHAAerdn4HcM*X+*V#Qm|JfI_-Sl-JqP*`WCPl~}QVJmlOW
znvGGS!pMJmNX=0c`@H}3kd*(^L!O9_$X_oe_HSx7*1bhl^uH?CyQf56Ubs!Zqc`uy
zBe8fifIpd><;T86Hmz#t-JT0I%RebGM^!G$X|Qv|8!N?4c)xnT5=qe4u2xX?2l&7$
zul;^Q3#Z^Od5W2OOUp7anQ9fUCH#a|u-m%XB_Lm0JghaiDTk)4HYz|TDsi%kr8b>@
zwrq~2V!_%TN1if-yJy+ctl%X*Zj<pOoS{x4a(6<VtAM?EU)Q(@yg`AH@07*W^9oKn
zl-JoIStWaKgYQ*2i!<fo^%?L9o4%!-RVtY+Z9_#idCawY;;{QdjNXdlIZ)z@K>9O*
zhW&7^qG&5fekI8uZ=k2Sj<oaa-Msd5=p&@&gJ@-C60aw)xg{z`n(<C8E1lcw#Nz*i
z75$TqeA|$g_iN3{(lyf4qchSi0X6AufI~9IyO#NhiP+Lp$mow_?a9RoZR@4KX3=?a
zkxh+(sb#hh!hwIGs%qlDkmD_?BOZffu5N#mB|y~_PzgBvcWdr26JDkn=_Gu$Z5qj$
z7a5tBHZ^T+hlgVuwDEtMYVufAgVN7n+y7lyV`xIp@&a!tTFue!?x8YY3q!ZY^4LPR
z#=Y(E;Nbf9p{hU&!=|S4*y7)f9N67W7suGBthCn@R<5=K&N8Y~Gk03~lAS91$DPS^
z{^5_yot+!-!w(h3|J1ZR`LCMJ)g@XOE;W@W7A`fbZGa>9l{SQBq0v%oVs{{o(b4Ez
zsh&v;_4GVn6p1`=XB#?aSqEAk%Q2ObO>YEj`Zo>|v+Go%vr>QR%}-!O<NR>LlfB$f
z!N|vnQRzhl#PQG6Jm;33t@Dp{t+nkxXx*T#Ra=AUtW$2wiqp74yax>r@E`Dwk{O4(
zO0u54Y;=>C1yHYS%WPRH;QR-g$|V{B=eJ$*_EVKL(v{xRqOUn6cA;xeo%q}H$gF0I
zUei#G38Y0d)#mc~)+3$|s&_~FCxqGue?NSj0vks<|4qs68N!Rzc!jTjd4kTl2M%vB
z0&eer!-H2T#I7=6Wfd8=aF;jDCpO<&Su4tGV=Evp`|-r3%RZM<SVg~GW1lNTwMf4c
zDr|&i(KR^p$*-i2p&|HF0AdaPGQ+*o_T$}UuZyFpXtlgZm8L6QvA4r<m7g1MVI!Y~
zsWU;o?D%>*;NyoCS;6Ke*_C6<ZJqD_8B@GPOrAnf39~;hU_LYFIx{mEcy6%r=vI%q
zV0h`9f9<;cm!<TvlK8BZb>Ubtok+}Q7asu1{I!(Ey7&;JoP3qjU+}ILptmTa!8fxs
zalKUbs2-5~{ZBv<i?T|7vT5(c%gzvA7PSveJgURiltQd0eXn<d*Yr7f`td5C4e(6@
zfAP2Q*Y*_L=^I=38Z_yi(B{pcVt&;>-}h1R)<`4d;dj4-=d9;M=xEb(=W@cWT73H|
zl;78hIPdn~+uB>9Ksv!_VX6iB{rnWY|9<liFnm%doqosQNhOWKx~WM7hT^_qRK7bB
z?cYD6*Dy{*lipsY@=3e2coN6P-HTqxJt+-WZj*hb_iv089;cI=mh&rpX5Z$NKhq=q
za7`~(K`M4toTWsGevZ-bruJZNVj-09<kYgX{T)A|@rO#*JWj#QSd)JDwdp>7ekDQ$
z>7;P5l$GAUl&G(5q{fzt+Ya7UeQ$!Gzl{PtHO1)s$`3_8@i^`6&)QP~QLfRd>0K*C
zRFn+Q5BYfa1VV}Bk>{k97|r~|Y%#(o%I`$+beN96#&>SSXF|<?=%Rdb(r=N?PTZ%#
zeQQ*n(u@gt4_qqVv-^Dgi!|d0@!}4Z%2~(F$Fdh}->PqPb0xgGI`K1U$=_ge?!gZ*
zuiN;sjE$6eAQvz*y=MIi0J+TRImlgkk1y#~6ej#;TdYaO+<Wk_V~$DV7Iz}l<F_Xs
z3wIp*<+Tc`FuWb|WCuQYk9jJbr6~2-gwSY&b*eE?m$K&|Iu~6oGDb&xZk2F(*3M8z
zSmGUc&)ne*D*&EVQ!d2yNTQ*D2ja}8zd-S7fc_t#INm%{NiRNp^{aTAs^`$0OxLr>
zdVbyqDV|nyQQpaR0e635@c4~#*46Rgo?tKT<Vdw%e;XN?)ROx2Ckl;=J^Up&XY5Gg
zve#XPp?0jD&yNK;`zl<PpEPr>iO<}2$wyD|%BFakO)Vl$w!sy0Ib%4f3C|osG6?^O
zy@p&!cWH&_*B4(u!B^^2ZPk+}cXn|Z&l0c=mSt3h)48T#N@bxff=lftazbSTg9T0T
z>YUt!Rafco`)8M1if7pNbN$fWsQTM8=n*dUWVJ_cJ^70YACnV^R_5)Od5DV{y>vC|
zA=m0yXb_=?%3m271@Q&B{Q8D)zP(*qb=W9#`O9}j`<M2%0$C-||H6@nTI4KIe{m$~
zO=VNkzj5SXvVBO13W@%~bU1M!Ln4kSx&P=Bbs63aCW_kHsJ0Y-aBYHb1MLEgL6%mb
z7q*wsWaxCkVPx5MOpmbM)3J}r>2<?%W)J847s~Tcsm3l_#gEr;<9byM>TNSEyCsSU
zj#%>{C%X7~LoYYpo1N<9#97;shSFTV=Bv_u!DrUgcdGKD7tGh^AWn`iy*<>%KO9u$
zvZJ3N_Is|^l7}Q=bG`z%k$32K(p#XTZN>+9*Aoa0k|?o-*0`l82MGujWOijGAe9!g
zZw@EWdT4h;;|cHU3yG!0IeNUrL-y`!X*Dy~^kjv%+0C-U!FCsMon7v%g~LrmK=H^w
z-}bE|D;%+HGo8FsS;3F$@aN$1Ur<hl!g%m9)xUpNg{Bu}>6RVh<#Si9F)TTUJKiyo
zc;wK=%|$bZb_nj#t|;$*=X#R-1k=*v9-Tn<_SfbSrnxj{XnJBb<?0c0^YSKW5GEb{
zlVLn+f3X?Y3btA#$f6*;8y<F8A~W`4C}QtT_tIm*V5f^>{6ueEOEpGYcl1Aqdk?6l
znyq12L`6kGML?9Iq99#F=@1kF=^{;}2?$8<oe%{D1*9WAQEAepcLLIDq=p`(g%Suo
zq@F)K&%O8g?)$BE?_Kx(*80zyb#hK-X3s9O_sr}mXN2N*FI=ql>(Sy$`wi;i%KR5Q
z%q7M$*@R7>Zs|VE?9SCoF+OiZ&yVevoenE1Nse+&1u2?iIh7=zBLg&$r(J$PKgwsY
z0|66_9)2^Y^!Jq#GA!_J(H+hnJ(&>&Mi8^OL#HUDTy!AkPw?zuIKvoq!KIs_^@yY6
zs}fhoJ&x_c#R+p!gG`?j>3qdrMp0RSQp~DoBl(z^4d@~()Ga8=nt6z+*U^Q-Bz&{@
zPF+*vb_U;A(;01wnbrDl%Z}%~>viIGd4&--?3l;knYS75sDF=#;F4d2HUzf?L)k7r
z__5FSdRTGi+%Lw4bU$_&l)ya44DzB0Wn=3aAhlInp7);Bz?79G6ndYjT}!rntGUCy
zSlLxwaei%`*Ecn~JKf&joLM~lP7c)zJ!h7YlrL?=ydeFAWG~Q>#Qjz<Xu|I-doJv@
zbnw0@r=9$=yPU<q%_qf4kQ^1A`0VQ_m5QhkxfVXZ)2}7QmJ<jcWDj}#>^M~$AL^th
z#S&uXgG9K!NT6?4BD}Oe3iF31zMB;Z2dbNFrQpJg)bQtEPQvF+oPKnB-D<pg-s)0S
zaH&5-b9SHh6Yg~UuCR6Z5G63gCQ7j9)Nk{H86I%mY@N<K8!xsQ9`nV7QDw6fN977E
zp+`B?(kn&w@=iYO+Q|dl+TwzVgM&2vU}0g9rbk7m?B<4t3nvKtrE5cwyQqYB_lNpt
zZKkZDtaGp9?|nV2epoeh1G_@#vAx<__;~Zu!43V~OjdSegV-4olW#$ZY7^FP8h3-u
zn)iN5y(%t<R^<mFY=Msrtom8v34YzOBdF@Kr~yNFLG*VunqBrA85h+Dd0~~RR%+<c
zH#|63xz{ZwHU{DLqnM;?9C|IreRe-^#jgy@JFsR`IktX~^Rwk~rp6|K)`EVc-BKCq
z%XNeD{-ELT8|k9!ngYpuB1Gt^ZL-LIy@3H>DzJHbYrlV5!nn&%k}?_$uA{X%m1~$Z
zYGUG1njXQ5n~mXjDK|PV3=J}V+~0wG`$@zq>dDImHy^NT(BR~_T+@d`$N~e=#;A_-
z#6pYCI_YMy99T<iBXipfSjD&RZVqlMDRQ~&ZhQfD4uAgo-OBKk^fDJ5I2akIjoXqB
z$sD*TEH*2<1~vCQIMvCz>}ypWmbNJzC^n}$=XzKM3H;ic(<wZ}v4y2ml(cEA?-eKC
zz?hh$zPPMAP44}^_vggv);Gdo^bCl@T(V}PyoAnixP7-;TBZhX#TC76QQzIfu;mWH
zRBsvER!7)+9+Y|*lTD|qr$B9*Y1G+Mr)kGM+*U>ZCwcikN`$;arpr`_TtnBv8>LJq
zOO}MS=!)#K_-&os=+_ub<?k=NvRe$5px3Bj`1uXU9M<D$G>aqM^Cp@i;^hwzZMA)I
z)w^>yyDpxLmghP^wT}L}Tpo;_$y`D$ypCSHyK+(R&9Qm65i{NxX_c%V;3W9)%b@mv
z*Na#FH}Bmn`4~#opY$jk4zo*tNIUr;N3%`*)YQt)Q&k+YO|*|VhEE+j!An~AAB<lO
zbl53Un(8N?mvyGDwaeI)@9e)A-haiVf?+lJlK~^nxnj)DB_N}z5;q{?Efccx2r?f@
zM`wEQwYn8o!EhM1-Eom`#MgzZuDTkP;}BJEOyrsnlpEVqxes@Eb15d++sAw26eGn4
z8s`1|z@lyUI1NO-Msw;$zst-1$(Vcc=X;uJ+e!{W_Gz>)&VV_wO~(>vO(8UU+n)3;
z9^+P%{kzY!Rr_2X7$iAF`uLnllM_F6ApZJRl@Fn2Vq7WLl}V&#`*NCu&u^CX`nmm$
zeT!qpEl;Y8x;U`sqh2NztGEt9o#*Nn<YuxyeJ%g=(CO5a-F&QgpoE*m=G{`iJ{OOX
zuW!A6P4Y4wUcA5ES|j&7tkW2UQV}h}a{YckhBK$GaJ+c2sF3l1WhgqMv1l<RnnAiE
zJ=N*;jY^A@?H&7Xs+ldXFI7E`cm8}^ai+bNWexC^eTyg!`{erSapIiVKF@lU;fL9z
z#YeHamA6Q@I8si+(4XHTsxw2+HRUY$D$bPT1Quro&kB9>Os@i&-wci$=zH{I;!eoR
zmy@5*J^W*Zi6J}uysjN-_Ga!`(=3VJwx>gBM%Sgi*)D`}n=^cKNw&DKmZ<P9_RE)0
z^IvDPtRG6ugt0Z(T8E0nz_2~84v+os-d8NY<opHTufv@TJ*iHsHT03K>w(&NW04P!
zq}(+f7A4Zvx{T}%a4dMcLOqG+SC6nz_$6rVXNriAnrN<Y9Ol$N{;O0k6ywCdcU7kb
z{7CnG??TfmXaBK5VU@tv*LP?y%7UiOgjzgUxA48)0RO#%3C-dv$Ao@OayJkDeaH5)
zgb8?2zx<lo99Y%wQjfb(uXn=9lFOcNt#a-&QUa=IAC8H!q&IU%=tQ+-rq^G<gl=IR
zR$rr)#m7XS7iO|{O6%g-T`C{GG2U?MyH)}FeNhlYk$X1*`9<k##enE74q&-I|NMRb
zv`LXoLUk_v1d@)-^07|);`$*#tB`EZdPmugnR?n%GxY!_>S0NyTD=UxcQ0TD5nD{h
zbep*o3>6Db*`IKEIrJ{X?0%!;0m_L+swOO>yKlheRmRmjSH<5(XS}>Bi(#$V)=*SX
zEUX!tQ=t*}D`>F@$iO^&F_~aSrzCRjLzYC$*wX6_2X6Kc@qx4xv8m@46`|hnF6iN%
zsR^5(9nUw*3cVi*XVD1vYOV~lPustRM<org;A9Kg**L#X5>J$dg-=C?+cG^STxpXp
zPFG&oT2OR7Eum!<o}AZqta$h2JzDeH=B&w|R9f1pwCE8AsE0`fo&Ns6I!WqpnW=|J
zjf$Q<cKsY}GYJ@Grc-Ho_;lsGgeU#wI6eJi$KH(bckfBlK}e7pnUdY(u3=`_ehTeg
z7BZk5_%DlZ&ZFV{Nb65d+P!n^7!CVh1U>QpFCqR@wj+XC&V(pjR?<=baYDWHvU=&e
zgqTZ$?U#nS+um|r39WJC4n%~M550HwVh^Pk$c}kOLF54CtAHbK0EaSpmsp<1BQHom
z`|NBW>AA?e>jnrC`A56V-F298_3g=$LC7$u+Bu-Ye1TLVp+P{8I)0+)lIUjp+3v2v
zbjzhk1jKoAd|g>RjEy|VMGgOi-hce^W(rI*__oL9UPWEfv14Z||G_7SVcmZW<X<GD
z@+sp}?3Cm=W!)!NRd4X!`ji!OIZpZ66X%#TpWRLRC*4LR98<nx(9yN9tkaji9g890
zJ+6dW{3H0PHbDT&6t**(3*e~d)sG5D`aOZ)`rYaRFENKx@^O<*wq!%8{By0uw+)E-
zgRRe$+WM-fQ5RlFv5MjO0Qn%&_}Hi#WfO3O5cXD)C>K-{nY6Ri3n6?vV680K;o}z>
zSh|9a)gqe|Pa;YuUGVYV8OC-m%tuQt5NZP%6cK4WghIk2#rL%Vq1uFVF;e#|L1;Zn
z*X0x>#gTQ-Vc<5XnrZU*(zOH3qWQg@!;+Ongy`ZUNaeX$k4k2o(PHO=Ir%2(Q2Ap$
zR&t`4iEf~fqK)^#o?G!-G=mffT}Mt<36lGsccc7|tq>ETUah}8H1XWXIDOM~`6uSM
z<YvD^qqt7*x*Jm;_am3go!acq0nfbVDIOJErv1;;ow#z%ZHatFMzeg31gB+Fq@Q3?
zS)tS9b^lP&?zPmv@zPi6N+&8_<p(ks*mV)X8tu#wI8D|Z>csbpec$!2Y}nHwmTjM8
zY<)gxs{f4J%^)Ghx1$3?{h&CnrZ(ZmL=q56*<~@I?3G&}T63Z_dB{GiQ?0Cv4y)W5
zh#0~x(10nPRuk=#6=@Pp?rIX864^jaW+&}bbIt2aDfFO%#JM~`eBh4*g0<JLIW}R?
z>3j6!w$HC~W4uqIb<h=z@dvim9Fym8kDw_mJDZq^6tf<b*WUMqx5WUh*Xzc)CMQr7
zIKVXWmvB%Q_?Ndi4p5U>_eHz(*{U6^?-`lK&6cl26slHfg)s$uDZgFZAc~(!@OTgy
zC9lv)d=6_KKqc?+3XzU24tE208VzGXhyy}eS!qMWUi%a)nlQV1YVYIJnY#A6E8dij
z1UO=SQ9HdSW$zg!9f@zHcw>y!LB<ck*&rdZ&%wr0<%rYZXe=2ltI}n)r2Z}uE(-q8
zkn6Ry?YpeuKbynJsZVLWd+sPawKB$}k!0oJwkC21Z`iEhTvg!ha?Pd)`bK6*E2-7i
z)^>P}G&go;g`x8udb)W}=#km_u7kNPsBh;>i83fXv%KIskT`?%z8e@g9`)<mI7F^9
z_X+%I$L5qR+5=O)Akz7oYdm&a^?au%c{+#{84$aJCODhrg5OqQUo0Oo*7-e#t|#px
zFx9&cRz9o(=;z&#Y{1ZaYcD%jo8uba#!X_W)!hO1UT>qh`0;l7a{&6q4mL1ouGajv
z2;!vRz#hca<V|mPt>3^8YK+LQ?o}BP-%!@E-vb`|B=gl%)lwjUqu^=ZbjgF6dXo*~
z#s$B?*@@#<TG9J$pCmIz5Hp7`+hdDFcyCXsM!+KI55C+zhrVJy=OEV9j1HBrh+8;3
z4!brr-NAb3zj(Ev`|!AVNCv5s^^jzuOIe@~lr821ECb(0xA&kWnwtM!shx!@6Ft{M
z*)1TKK#pxVGsT5O)J1QHqQdb;?&3KrGpva*n|wfpn5>u?l5Xl+RqaoQt-@E1cq>Q?
zPqn?eKwA2e3*@Ht4nbCUp$Gaht!2&Zj+lSn4&q?N>nyA#$8kzPyq<vauGmbIO$kL_
zXe|jl-{c@+3WzukTU|4LN!Fe`!2favHzLtHsqYG~^sy>EsP(AQQ>n-{f6thUHD=zZ
z#d~}Zkc^>Ihx`763=)USqSXOcIgFy}j{y;ylA~j_H*x;HxX6H7p7G8b#P`;<{=$?z
zQaw3?G|W2Eesi#7a3c${cfNK;lyrG)cd=z##TE%{1PBa8(^khpkerT0A6Xi*99U(h
z5i_aW@jb?jz{j<p@wN)%ugc-Nr~*$U(U&Z!V~!P$r4I!32TXLMth=!E#8j0;NUZ3+
z)y}D+5`<exZi=0klMQQ9ygXbOK1!JZ7Z&%g@1z$8K`k(Um)MU~W3LK$n!uLCp{}=E
zVJjB1JXUnzH}D>PmZK3g8ypLX24AWAx|DwPIUen^(Owlh>D>oHE&V{{ZQ&ko0dJ%6
zFQ($Rgxo|vgHYw$a_}|Ti@kk8Rgr1bJ%Xr-<sx8Wxn90%ctY6$h@86VMmhBVLE~No
z*I98nBh}I7o+EhpVY4XLx!=fGhJ7Q~Wm%er52C<WBlHrPD>N<<LAnz#aIF+olBPSf
zkvl`ES19>exrEw>sV`!sxK=hvV_)FiHSrL6MroLHi`XhN`mDJzV9pO&ck=vU<%DTf
zlwWkq0(2=ApETkRFLa)kEd!x1$vS_F9xQRb0sNGg!=YzncN)YyAu{-d&VoG;5^jYu
z{g37<V9vKUGR34FG8;ZaTyy2{MOT6DA|o1Dxq$~z)ZC%}a_3-lN{AKQG^f1mt1p8Y
zVa+jYr{PN?<FC#;Oh_AiDIguh1<UCjp2#$#ar|P(*zSyea8;_LJdYJ>*og?LHj%kJ
z1@fjiM<s34AE4vJt^3@wQG;aouD+#ikT*V;l4(|p(?6#zp?zmHP(}c+i&$0JBi#=K
zjoWN+RRF(mRs5h%_oyVCVG!aT!lhk{@_7Q*L$wCF6e$21^eW1t0G*89*&GX-?nXIX
zei9*mfN^Sm4j2P7YLxfnn4kd<;e|_+w0`M>K#Wt!{fR2==?yG%;3H0;=oJaNgF6&K
zA5PFEQ(7z^P^P-!U4E3AL#+NkRQ_)^@lVTmw?Vk=DN9li;|VSb|JZ=2f{MvJ48Az6
z-m^7(0p+g#97wM8xCfapy@Sf$LDxm8tz)WL>Le4QB6;QK<DM(be{NtH&?zM9kgr;1
z&P}@QMP=;x_<p3vSmOBN;p>|<<~{0xiP5p%1FY9)r$y0GqnZuk7aUGo!>onwb*5nn
z5AZOlq+Je>x>=M`T~^RXsU1YA4z{$|s2HhSEBSdHa*<IBv=k&GEvF`%gq=cBz6xPH
zk8Rhr#rbJHoW0h$YFkfHq(q%D`AyU!&p+=`UrX}f<6SjV2W(A(=F#`SY2q8;k#czT
zZ!BLe=d`n_c0JL3mc#5?AFkX!EGYD5^=1H<>vHWp{+^W28}S78QITK5>@a^J?+t09
z0J#&$+@)@}nl((~Bu5j~jA~0>;EH<ID!;wFT^)ITV<^i}D*AoHC3NBjv?_&tv;@Je
zjnMZOSZUD*Kr)+TCcH-!diqsr5U2O{oK|&O*y9Ye1i!Emy5O3CxAd@|wanh3WG^@;
zXcd?Vd|zEA&>B1YUW+0H$();M1}6qQ>VR^4o+?>QM*42XEQ}U;L_hC_JCsD~7IGPE
zq>)5M(e++xaxQD<RLJlx*@)444PGF#Y*(XjN1Ac*v1yt3w0)sXM#_$@M)LXz{|u25
zf$>J;fT$D{N1glDjN+bVu@TZOC+PQzaXouLv|mI+X7NtH-_<i#C%gO~!gFW$>i1%2
zWrjC>u<r^=-*ieP6*BpEd-xl|6NpcW(|0ku24NPyV!*L4!G!B`@Y|Wxj=tPq9oUcY
z|Ds>|A4gF;u;UhIek!nc{Em3}PU-mx?kg>)BVL~177V_~(tcVznTavIb&Bp`C=g)g
zD=)P;*C{IcX(4&JX=W$jP@90%1nO4JCCKYJkeRbnnp)9)6V^j(T!@~iTJk74+QAw*
z4Ic&-|755o3(28Q66o~DV~8+yMn|x7&=>?}1}9!6TM>WAS7X&T_M@#zZM<<)OJRgg
z-5O%+ivaRM@(fY95kL*EaG|QF2-7Rkl%v4-ACvcgBy?P35Dn-Zxy}D_naaqZzZe-#
z9ijd2FDfIEgP(#GE-MW3y}fjY8e0Ciw;w$STBwgRT!@!=t1+EC({{Vrue-Z>g|Rj`
zbtudxmB(8F@E8WB_dwMWx(LGaeb5&P4{%O;C4p-=&2Ar5Ww|zSVNxHEKdAFHubd3P
zPmB}l4t0T&iR91dATEbl*nDL`p&xZf1q)|e;N<$|V74n46tT+(rO|K59islb8XnMy
zfgwBqF5C6>c_cY)#b31-7c>FXt)WWfnefkn48K8u6Y&PU?Ney=B8c9zfNac;Bw%$#
zlPX9#T=Na8y^!GP+Mv>0fB|e@)g-*90yzqF{}taT?X=_duMEOFZ1$*<@cT;=5t08D
zy#JAjDv2?jPa${Nn=Ni>{JeGD;t~(dnRwTuJ1_Ow;?e+(gNIYp1y1FmcbQ~LH?Fxu
zeK+%cvB2Ho`)*GO)tW%nDoUI@l>?dDb4jB(4a1!X)lTA88f>H!U{`HqCT0JHhBJjj
zHl&48GSwpsn!ypcP(6`(kP$>sv~8=^hQ@fn`OE7dPY61Qw9A}6v~TEY>?iDPPOC&P
z*PU{(hoWfR5au>Gp%R~?|8RK@FoL<wz$%nvA_)kTx^*ngB7t%7zF*`fU?F|Kq&4&a
zZ+smJ_>kAPelNO&V6q?_YJIZ~3V#UU4^jLN9{l@PO14CMd(o}m?L*whjxiwr5<=YD
zf1ml^r=SXfIxuGEJNKUB1C!fzhPIEA7wG06vv--TuE`_oZB-Qz2+H#kdwbh@y9<|2
z{|bR7CAGY~d*$4zkiY-Tfk=e?^(8a{1__*(#^s~uJ+cdrSs&tB0G(BQI7KWFppch_
zbG847z88q!SwbO%o4~{a8SD=U>l1rK73C3P1vC+=y$?SwK1eA(FyGf9cqit>BR5d^
z3{$<G!o?G&R~yZ;dy8#18Uo~9?a>AP>lm&j2b5QBg-ZZuDx=@Yd`gL*^?no)27*v<
z0V_g7<iqU+T%&Jj-FFfC$I^|Qt74BSP@bI+4YjP+1!hlJk^6pYU+lO=v{g9v{7Ih>
z`9LS?Xe=MJc~+X}p=mw1!>yTs5Ho^t%i-=3>(A*xr%tDJqJE|1e8ff?n|R16UCr2)
ztN<&?XQ{Au<*n*%9)6*pEbHMw>T%`U3c<F)ND85kxsU`guo(kZAsG#C`zUKJ-*pXq
zFzo&Y;6dT}5RqT<--F)D8n}DcDaiNS0O6SRGsyTDL@$aBz>2cgv{P1O3Ecaei`kS!
zGMHn&xoTXFqHKJfN@7rG;hxT9#G~D>S}DR?)xrWBv9)H_kXIw<Mv{h$fU!xt&_OPT
zLp^r!{Hp^)NEo)Ca0fg?j$RYrbekdHYT_;j`Tr9Cy!vQ3uiuWf3wzKB+R-2_vGq$7
z-&hdCXq)SRf5B+H_OWX&Y$*0r&XiSSf*drP(bFNjD}s2a*$l*XU~lk(MQHas!d}(=
za=(Y~Ht$p<gaO#H?<DD@yuH;rj=xtEX-Qnt45WX@rA4mhoq(j!?tO6k6!fRnQd{<O
z#4ESA0haodwFzd}m|Jr6&%A-+m6~}c?2Uqsssda7f&3jVeG~s`k}<wQ<>Atp9FtkD
zfV<Z=DWGy)!(eHYL^*@j&j#@U2J%Hi@w=e|d<4#uXy2Ikf$6kHtA#^vJDBTjIqe{O
z3+X29es<GlR?GT?;T@OX!~Aj=GwGYlf9~Gc?V+@7=&>Z04;y9ER)XAZc5Ep?4`(V9
z(J(#9W2~pqfPKOlKeEpcGnnAoe2(W{x-19uDR)hiA^Eh3f;dQ$fbrL>1#`-KLG6Ag
zpA?vABnAC}@PPJESZ3sF#=Qs7nM!yR8}vYrF82V=yyh}@HNmGOP}hdFm^j@s3`>9r
zz{Xbj%Bu%t*jOtteabXTEaeq4(!S@3>*L*>xOqO258Ao|^nPXQ`h@r+?C;GESkw0K
z8CZ+)`V=RiV{KJzQ=;UsYLsHLf9U4fwx$pG^kA>+4$1n0`RYs_QydgD=XmUcH_n_!
z%f*7YQ)tWQJ^|+-C+E2e;XY$LGlcyVBAZyT4l?2Gp;qCRj<q+E>rAvM-S?7?>bipx
zTdOA}gkC6`ZPTtX0~a2!nY7pUFh>l!x~B@+l??5CUB2V9)AOot$P4My+qG8{qR+01
zTQo$wC4_8A7Hy6q(W;s9bQuCkncE6Wm;^@Gls$HxcG&OTE)^@vi==!~#*Rrxe%~4)
zs-f+geg{(_29;5L!nAJ)FLEfo0j%^O#9pCgx(lRjA4zpR%lOo_hYeIQ3`$JeMEbB5
z+$&g@*|G7Leb^Ztiwd{JV9Zw`Xvd3qLT)ds-!F0$Vu%85pD*8$E6FH-r=K#q&*3K~
z2fcm`NHpFPH{T%EP6A@4`egIoO$?TOFCTE2H3dqRA*KMb>`&OU_Q0DcA^FhXFwel%
zLxCi_2b6+oXW$L=cfkP6w(dp0QK0O;sFq)QVW5%(#ewiACAc4;{o*meU&JA88Y#ah
zn~DJBJ`KczwP5{A^;g~wyvIXn*hunAUQ334MXw5b3X4mIUiq{CU3vIdrcFSGlFcfa
zalJ?`E*ixAaie-7XWyuFFnI{^nAx`Az^chsHiEwI;GRHP&6~}MQ8K{0Zdl1&D&7cn
za~_8UK<V69ywEp&sC(b^9QFo;Q#kibzPM*4HaRa{)1D(@N9FY~(aB6fR$<(Fpv-N7
z;&rIs0XCpP2mezrTF@-RO_@XFc{|ZtvQBs`&z9*oQVhJ&RWpBF`zaoRi9Q$Pe0$-w
zKHaR!eTH20;T?10dk^P8L$IDLk1usjeJ@^6d4v4EsuR!rqjj*ThGC~*uTo$koL;u2
z2jCU}i!A8-NIn{P_SziLgIyd9tQQlz!RYka-9$oPD$;2Ubtj;GFvB$?rODfRdg-{&
zuT^7WA;Gs~ok8V0wz7`^k3yLOs8W!v%)TJn88y^MJL%#hS!Y^YK7>r9lps)+5FF68
zxd0+`Y8$LJ$l+^VOqlNubO0R0Om4WhH3{^4#k+Pu%iOR7$S99u&fkZ-&l+jGS)X)~
ziMoLQ0UHo4w=I)$H84w5sSJ`&F*c{BuhG)3*2QtK!I;JV-WE1Mn$athSe=@<>L%j_
z>U1A+y!ni`HALIwvV)oAv9W~c@3h{sH0v)c{p(7~rszy)qJCe#s*Q2Yjw(56$<pL}
zD~M$aT-e0W>9XRVD0XFgF!{Wb`U3q*!GgDb#{k9Dtlq9dtB!GYsm74w;Xyq&b+2dC
zdP2eK@z`a1RF7xdK8Bs%js8=)G+ibfp(OX~y#MX7_b4|!pQ6?Fs1Z%2Qajaw<CaoU
z+~fC5g)H<{!0X%{Ms*WL;_Jev!xwq8r}@pszm~zxN-!ncZj*9Om*o5c)pvIez1s_{
zNgt<7$jR<q;TiX7Dq)>ma#3m90fuWegc;ExBJo6qjNDB1(vC0t<T{fpQN~3<o{*N%
zmAraN&txQuEWoK)8h=WTADhx$5SR>C*;3=su2Jk+qBS(de`fZL5*02_!B&1@lrmR>
z{VL6yKi^0;AiH%^X!apJ3w+)~chKJ#zVyU`5g53!%F>B#JcrNsbl7HR-Eoeoy@ddw
z`4E@AM)ql4j#tP;^Ij-+02$IlIlQ+t!Xaa)#{=`>M-BK8!m3l^rB98Vs>|){v_%$G
z#p_bEzb?>uP?x0GN6)O)VQ;_qWE^DPTk>jkthhRByG$S>eQbNLw$I0O0+9HdkPqv>
ztY0xjOgnH+Y^X+h#WV?6=W3W1T*3~F1!HMk9-2j?e{9OgsXY5y4oW|^>WwKWWf_x^
z#j))91y^5pVTrz_wJCZHUGYIq8kPNY(_n#_2I>XNl&$EzF3VFug0G3G7x*zL=G9yg
zVa4D7oXPIq$!8~5N#Pd>9EdWDG40i<)%uko>K3I^d-_whk9=!wz*6FGdRgWC{oUP9
z11$y=n0wj1M(2rHM;BoH(|B%YV5w7;OIp=&-g!4mOwq=-;fUT%_l%d;5X_pjO)0<}
zy&``0F5P!W|2UY(!&&pPhJq_UHW`O}B}&II)tUU8`ruESMbC<F@3ILr*1#2unF>kp
zDRcCh>Pc9TstH-=02x&303n_7%R_LRR|EDgbU}~(^p_Z$i_P*0(3cN@OsH#Q9o-TO
z(V=!T%%u_}oy9)dTTJd&>}05{-SnC0rh^odV7=?|pkZ}y#FF&GD#|WcNxHggz`Vej
zT_9kP;svzIVM=!4Yt!yu%F}Re{qaqG<)-rTK<}$T@D+i^LlR=?YM@5L`~CU3{ksQ1
zy(o!t)J5HV??|o=w|-N-SB#Icm4080tlO>%&w#!(MB)U+dbJlo1&y&Zrb$gFO{9oV
z-yR}2gZhnsWIAXAr-_DmJB*4Ib5IB0!fB2+Az3JcPfmj{Ia<uE51h!j0EO^+=X-7W
z+%hPQD|EgZKj{5?=T4b>S=~>druab=_Fi7&2VEJ%nus32A<`V7K8Q%zEs}gBLO0Wr
z@fyFPgc$w8mBbq%wdMnYsLKrbO7Hky+p0S$`xz6cP{lZ9Ro;eZEM^YN#TyXj{N_8D
z>FTYhMoeMqbCfQpPru|NI`+gJx8l}Kz?7KDDi^(ak8aN~`q8kpxB=Mu09X3~T2!#}
zjC`khe6_Xr_v{%13d*|Y;DsLh*Y$VzXNX)_3&^W)Mb`J|X5+{L&f7)@h-Jv(qy411
z=;JUww|B+5BnT3qt*0=c5>{o?TCs<aB4Zwe90_6rL>UK$0yxHfoW~FU&8KKSHkFm7
zm5G*oaKH=X`vI|n@)T!@c6$n|E75QlKHy`s<avOtQG)v*@F?TXMx;y#?tLln(h>A`
ztNHgv?r1!*h5LOmU~q!C7uyoV1QZ@LmUj+O&xU{LqH*B&PTtEUuN7ry;`R}vz8eSz
zPGgS^F%l)9-MZdhQvE8pjqN;43Eb*u6ZgTys(iH|!ro=8XvZgDe>9Z9c_D1<+DuuP
z2Jr-5uE5D~Wo@VHo|k#n!KXq%a=hg8(kjf}1q!O4yjJD_neBZ{I7FdJzaBuG8bZlr
zAG#6wy;cScckvf+-c&COa=%(hx)7s1^;KI&7AOQfGDv<&X`5e1z-cs-X-y6v!9j$`
z&C=1pO3k=XEUzS+q8=-y_-mnyz;|OqC?UA-AhPi=R6k`g4~x}F*(ba69^e``P0)}c
zUUZyix}H%D!e=kM&tLfQZnoU_X~V$b?jScg^RG?E{PLSL>!-KT6B9K3ow&~>i=EL9
z6dKQ5tfj8py=7ux_E0IpuR?3m9IRckX^q4uEXOuZMIX$Ow>&lG(sjjQZZ8#qjXryJ
z8*+u%XYStB=^xZVz^Euau)6VNql99LON~c=B=4Kt+%W9zn>Ah9E$pF?v}Ky^@hUW7
z78HU!Rjv(?r0WVu`RIV98LziJlr;$&C(#Jzl@uLQ)KkL@E(7$ndqmyhs3m_>M7BR{
z$b&0`9NRsG6#La~>WyZJ-OQh!@%0&k?#)O~Cdp6wg;S;eb(`_SE&FflK8-9?KLgue
zL)`SEuSor`uOru43)OXY;p8u&mP^kbj-Ps$5EpVX>%`HF`BAtm^PKlb*qqV{(J((+
zY||D#FmC9Dz_DYCEQY<y2SJRG2TF@Rc=Y~f2=OHjx1+20m~fhotZf(BrM;uQK12j{
zgK}%8a)1L+k_Q4Z1|&pX#9IQxFNlyzz^(`dLEIe&5|*0)eLy$A9f16I1kDAAn72im
zErgG{P?-ezi%A(G{~f@8&UNG#({XCOds#t8@y@$Pcit&b!<BarPaoZ>uMe+;2pX`D
z?nvh)ezUHmE}R*WHXlrMy8Z4v)iGw4@Hg+vKe=S4n8f;o%gq3PS;<m75hJt=&Dbkx
z4e{s;>J<Aj3}?_Du<#aQ#Rbt(3W4XFV6wUKptx}0`=ubRAwX0P+v*N<O0AiPS&l7p
zSxBLYg<unS*8W34dOF3S6ssuBSl9Q*i|9VEoq?OekQp4u;EdHCAbFA?u8!i>y_}v3
zYu%7>Y21w_Ao<evqd?gdQ)NKSNi+aXOUMNMEztfmBmVu{mI#>EccSRlN4?eyR8h$O
zC5o^1|33G>PjOUVb<PJry%PGHspa(J>%kWzU!J&0b@x8L8?5u;C2gCZc&uNIt49qW
zi#jlAIXP7?c7+dI>&AXY;V&oeUWqYvRo`l?RK3Ov@`BNXXf;<lP-7szNXekMF?)Ay
zxUAxZe}TULEUpD=JzK{R{Rjefc)h-45LCsu?m=uCF#{x79Bgdire-4`=+6mwaU~KI
zHBpNlA_7ol;IL_C4Dsm?FYh0|-hWTl|COTIyp}eh()UhQf3z6&V{!k7fAJgjYli>(
zi^|8;k521%FPt>}r!^lRK;nm1vW`zCN?#qO(w*~+nJ?{Cyjh77$WC~s#&>ihBXKw!
zWqsX2?L8`_j5A4tcxlyKS06UxEU~n^>j4l51dpIzuUt<3F(LgXh@YR-ICYd$QnUvU
zi9``KuR?!NCSXTI%mFF#^728G$2@49GK&Qwy<5EAkH#J{4>TI3di6<`R}jj*wAh9~
zS%y#LdqmYdvce7R3;;AKmTc~&zNN$kd_>fI5OGiM!)N~dU_PH}tDb0RiY$eu^eY*0
z?pQhY><Sv^!1U6Mu05&OYoZp%P?d%UHa0f4qCS9qb8wv++~9|4*BgfB(+^ZgPy>!$
ziH4+DGaOhx-fjq5S0;pJKU|@}?3MwH3>d1RcK8GHe1oS`ujeUFjI1}yU9yMz&S47_
zZ>e!{jo}>`u5(&1l6kRm;bVuO_x;H(t7yFQn~hS7gLO>WUSpudl~2rg`BXBfGiFc!
z^X*=l0_>&eZ$+eNk!`1gN~jh@WMx4$s&WEnv#T=}Lh=vj+Lj%D)we3X`YOd4FSAlI
z*#l&k=`_)Pb|MA@;2vz;A~zFH*bV0RE?)+0Wjk)|-0U}Nx-GXxD)~cFP~D_SbiXIo
zS_D6quzo%1hXwdrf0F|NH)39S;8zJMlp0CxcI@~6Gz5U1xZ%4hD3ZFvjl#6OU57ip
zQfn%t1<`tV!t9FwXQW_}4xDGxvER;M86Hk9n<jFbkIC+&AN&-n9e_IB!kJ0go=*yp
z;`!lI&eJd@-J7!h(JOl2W-OIZ_v}4RdaO}Hz{#+4k1fW~ER!?0&Hpw|HK}nk`yMQF
zGs)2<lY)40t;z<}<Z%DMuwlAWXob6Qx9AMWKm?OyWd>B=z}>hIz~<Fg*;ApPGqHPh
zq8ea&m_A631yro%RlpQbJHQ4xpu~93r#G@i9f|?n&zXYk8wu%20ml#h^>X(fR%@Ff
zc6xpc$}{20K^_@?(LI61Ra+303Lorgj;x62m}t<w&x258DD0WY&nps#(Z{Y0H(l^>
z!a=w^+@p7r0X*d9?wx(&3{ZX#R$xUz)N;t|1;u#@?QipeL*O5JWvlcLMeA*^R4tOF
z(H0%9^Oop}2LTy}Vz@iei6Ib&?Hf+KPCd|xE+F$BY*)A|$astotb!V-vy2{mt~9Mt
zf<}@jh%KqEKR>S}T8xC$W)UUOJA)Ee5ID55-~Qc61yqE_H73w5G_e*}ss7roQ9-V0
z5B@iW{6i~EHDxaTKfhvS7P-QbqU<MRqSC1*=f_{hJnP_pZ-R~;qZ*;X((}iT=9vMY
zf~Xk!>JHuJ@q{XxBj8QHZZRQe4*#oZvOkc+_^w4T*>i5bD5f?<x_{xG{r>+E?qk30
zLS9}D)uD5{NauEe)$PL3LutcX`s$n;K=>K-Tg5bO;<~2efNtC^)&CK=2Hn`vO;~NT
zRBxpZ4qm5?b1_AFuy=Z-=5!)3SIC06kw!0;-ZELU&b#LzO<|tcGOI*zxrKL8KT)m{
zGAaS5eA+axS`RRgT8Az9XMl+v6Yx5-VRElW6V@C+qWyv<K}ZY$wx06eL}I6^$b>!|
z8cv3n5IB*z0-Qqes1Gq+X%xnRbod8q1l-a0dH=KPPyuunUs&^OlHZ1!Vf8Qe=Ggvc
z0RD9<YSkDMJ^$t|b?xS@>ojMcD4cy36MQ1;_ZQOJ3#V9EuFU#%t0H--73()GiXJ>#
zfoTGcl}#E1+k7GGM)+Gewk?+&RtC$ZSlD|^^n8av%Za0AfFK2!*hA!i{&ms+DprI&
z@>0Q*A5mAR)sk83FQW6#P;>oJZU0s7e-}q3I$fw-C=YR9e6#e)txFM+kCi*BA|G4E
z3dKIZb?GApyPt)?Bl?2s9l9$EID;&6mN9bryqZsn9d0*j$Vbik@l-m;AFr<}<2m4w
zKAk6N^~_xPV)cmB39Ad;zO)=1)+))yB2qgiTMD4hyp@H5r!{l><Xg6T&wM%OC9!ek
zYu3cevbNuz9kn$!TO9OZChEwsl4m0uyeR9d3w6qKSI^C68_~W}pZfwf>V5r$tx;BH
zfAi4n;@*Al<u#d?ykm<AMf#lY##&fIAJay5uYE5@aHn`K-1(>p<*SYI@d|}G-cYtu
z9F(8Yy_9uX%=XO6EC)&;^_|m1=+%bX^gOi8!NbVQ1dJ40vbP&Q_}y$NIxztnt{T>H
zrtsC<@@kyX5KmFgchvi58#5JG8LqC+Y&YJ#1p`;BahOpKnr3pw1R3Xp6|IgxF{N&W
zHsNE-J|?IrkY*M)?Zc39K3l;PCYt1S!r*+f{nic56X~RNEWC4Qf@Q@++{N|MONB=E
z_s~zn&s&1iZJ(bzo0YFW@2EN?V`0{KO#F1^N#h2IruYn%%66f$#^J^?uuot~*B7T>
zawF-o`;W(z5;P=UUXl_wo6tJ3!z3^L>=>R~`?f%Ylif@0xNG{K=)YRmN=Do=8n?zL
zjX>1)sBF`@UTARc#%+PyeYdnkwfTr*=vfaR_c&<0_Soz*RP*Oax|%T<{nI;LPQTyG
zs4Hr`V3iQa($l%7dQmOENv6s0X$MawXI*+@^?<qhJ+l)ubWB$-l@1;_+ntmVx;j%)
zn++<Q{g9WpSc4k#@|YhzGx~xp;W(?SePUfTyovI#%Pemci-D~%W2a3-^l$6F;Bk$)
zV0d#UQY~p&Ptr3#{Rhi2hSkpjo8c8di@VWFPI2yRk8k|CXOM`eA|HF2p_1pe>Q>-E
z$4ReKb}t{k;9_50{*g8Q@xbjF-cZcc^II&-YgyKX&!p6ApYZpRW1Sylxqtq}Cz<&8
z28poC*pVwZUm0@3i)ZPXu{%7`zS~->fZ$&r=z*il`DxQ{H^Wbx_2Q0<dLk2COY5Nc
z`xTPs$%?L<=k?ZCmX5@(UPjlr=^Qyt`b=jfvlpAsYJ5Ri)X4xieM3txm|s62Npj0g
zx3ezavnTRJyJP?5?JucMUcFLfN}zjD?njl~^*nr!Xx>l`^NgA7ijJ}b0s8FpmkX!D
za$fqrL#4AN$u#K1w5okw<?&IBINu|A=}VCjUyog?@wql|fjJ6DGcNzijyabYVe*QF
zFKrX^m}%vk$I^?7rE21r?L1zby!ej$oX4#zz1MtvE;gA&jCR)Px0JG+t4jH_v4W@K
z|E<d1<J9XNAFWmuNa*sw+M}`kyi@YyztT=O=cOIq2-6&~yl7fIX1Nql8}a(fvJ&_E
zG`0To4Xk3nHJ{AwmmuLBm6|Hv)^4?$@>adM8BP1VdE3rW5fz?p5|drlO?GuJD+(<7
zUDfRzi%J>JsJj{H(7)(5HHuDOG|N(*#ztY8d&IfV8bldWX3AekExB_VohwdgE6!$;
zPE~*8!e3#R&je^+wdbc_#C7&8>eqd16^$H{TC7h^57F#h+g~S|t68x<U{VawgSQEc
z0c(NOj}@HL3FY2@Z}86Tj_O0UDD4otd~uESK;FTDXD7<!Yo|<RzGL)6mHRFgQP%fe
z9zA+eT~*-FSMiwevgm@?Z9X3{)j{<jFWJTW+?Mf=_-w8OfT8Er1@;!ZP829@L_}_}
zDE19b#$~)-;clST{*@q~{8<rKrM1d5>Bre>V<%+G^vZ6{k6jrUwY<FHp=R-t4w{*8
ziu(N<o}1&`h;bF2x4K-PpMi>Gt0jZTc=HL>eDyUeiw!-lQGb~&!E~Lv)Ypna_NNTF
zyWe>|L)i8_)GIl4`YRD_6`XLVKZuz&DS>`#o-w&t$+qN3fb((E=O2=|c%4{SSihUv
zW-B_ke&VUTpS03SA9=-!HRapVvdCGd$FUj~Uvef3L|&AXbx1Dtb+eUTWDuP+#{#R1
z_Nw;Py*Y;Oo1b+HM0oV;dBliw`Zafr#kV1bXkNU1b=>W-!Tq8kj@z>s>5shM-?I39
znV-Q2n%qA!nm1L}pN7|e@MYFukQ;rrc;gPE-M2)Q3*al_Pqq^9CpIR&U)^U$Fi3C}
z=qKsEEL+Rrx4Wm>7cXKu^6V|O`f6xpiW`QfoAv}E2MjfpKVGYlc7R`DRYpgYdWx6Q
z4Hv(1NV4y2u}MqQ@yYi%xMltB)9ZJxdq!J7h78>Usp|8C@A$nweoOc-`|JFjV%rsW
z&Ody7!Ck9AErHl>xfZe*j;&@cP=DLlQI1lK(3bbqkBsKM?-{ZApf2}m5SUV(yUKX%
z`c!JHU`zxo7?gd9z*jxJrq(A9Q#ui4D(heQ^_zn`<D+?D14R98#;(Dyr_=Tx`3dqB
z@%iu#AGJAO8<IE~&M8f@Tc{EcSJrO@2<wEn!}y}Fp8CGhU#NT5!p!<-gA&F(o8>W2
z2%Cw3$9=bVBl}{&&0evV5*)}`r<W|4k(YK^@y2S<r_hVr!3;y)R&OrLH2J5m%Rill
zL3ct5)AdeiujmUrz&}#*Dk)<^<p#2xNiTDQHvxzO+lH(xht+ZUG?v((w@tBXuM4la
zXRCIf^lc-fJ{IF8MQye_k$jam1fP0aaCJ7@zItKQ_pYYHrxO=mIr4FWtI7ZIf=R1y
zPs&w@6rXEBkJp#Da$P{n6Qmuf(pq5SKL4e)=j$Dl3LClr3E!OVBZY-T-G9}WRI$E7
zxM@e1yeKKA!tt=$d01%^{&6$uV`=Q#jjJD>G`L%;Z@-}yb5`ovm_pb`xe?z{Ca%$7
z2X}6-N&$&3CFsDR&o?62GVt?o#BTh#twXOfb4S$~8#^hyy*OX8vhr-Hxjj2>4;)6P
zrb?6?B#VnyX+D0`x%E7&un+wQ>~N6E3-0hVuczQGx#+mh*G4(C+@-_MUhq4#_(pWH
zWPdthIS~Inoxg-)_a|^Tx08Vb_xx?f+996pw{j7Pf_Y0sG}BB8lNC37b~{T@D5gn>
z=18prWrv;@EN<^*%7@uev^<yK^4gwo%}DiNHPibE$qRFV#EKJJRQYfJeqvnX-X<)e
zppjnXUIa;B3Cg&lUHU|>@~+SWJOnQICp772{({90UuV0gh(Pj6P|B57p*mIdlFkaf
zlZ3KA0c}6I4IsuJ`N@wHcVow?NNF=!)dhrQ+dOF5GfVmqis0KlDsTJAR9yr8yN0K<
z`GD0oqMc>>+6~su(z3_&**<EM5Ve#e(Q2#kCyg=Zty(Sy3oWBRZgzfjqn`(V=f`_M
zl4a~vJd30M1h)TVL2&ZK@mwCV>>ycIRQ@sUjd*5e6Lb3|44%*WNWYt?Ycg1_-q)Vm
zT%f{1e{|D!x7w6VAYIi^3IuEYQ5aTbP0>Y+Rvg%UjO%TatdajB({uAwgRllnclk)7
zQ?Wy%;kz2e-7{pnZ$xX$K1qeEN;-L^S~vFg|6WL*I!9LG1IVrS9+bOBlGZ8;Ku4Ka
zzG~Z+`V$SVJk2W;?#r23Af_3L-;s1>l^>**bH%#fMWYjr8q!1mtONXFe#T(cqxO$?
zy+a>8c@2|JfqvYq{<v)gam)9tyRos*d#Sm8A)p=2{i(>5VZrE;uxfmL(a*%SxZodg
zc}f^(eH2dz<)U^@iEC)Y)IZ>!(srw#^Ss9!W^Y%e*TTwcZNXC$z`r!rCOK|x5-+_|
z1O1zD_Mhl#4KWmD$CkJ=$Dpl>pAko|Gxy^x{Gqo4)34BevQ?MQjekH8`IGxgPdq|b
z(y`-)KA95Rm1m^l;0^Al3`A+4Q6xp9e817cp4=DXt}XWa$U))#lMC#8Az8<0E{wdc
zm-uFPGrPt1!;Yka*KiC~*WK>F@Po+fTI|HI{rUn^NN?aPI@rnTJE9iJ&CJEyDErk#
z%?sJPI^e5BpBp_xR|II(1r!v&sukdUlo|M_1S$5YBcins5$?$AvKD{uNYl-uM<QaB
zQfFlAKRNQosqOQp4x}HJ34E10qa7S;*}i7*aYyVMh<kB8QtsJPn(W*Y+Hrs617w~J
z6JfXClz&Jt$IUc6=PI)?I=c{#Pp9<~y6L&_U|#BMo!E-)A+767G9@ZTu{7V|F0PKg
zV9|m?z@h41uss-rF*SIy{GMENV|O|^%DCd6+Uj;TD}6&W<ayn$8h#?yKJr{$Kp!}U
z9&ws&qpn}0U~SoHcLRq79^_wG1M&LS%@%wnLL_F?La&2<-1HDNXgA`OdyJJWuuy#_
zNA-?f9D7BNv-P{GoXl_dYTZ~N_QDztLRrY}BYOmI&*ztZ7Is&by}0u{Sv^m4cs{_?
z`ygJkt|lfic{TE8RNMZzyU>`L`HJ>To7QL9in>+;84Fxhc_Wts;vLt<d>y^v-t<jJ
z5V-EybSqFfqw~0NL%2lQ$^z-!>GMmgd7q`?r5(#zx>BV5jDA_&7VSJ@ws)mUe#$dI
z>LIVzA?mhxsO`zrZX9Pbw{^Zr``u+>Gdwnq9b|ZYam2t`AL06-Z+7O_bh-Qv)h6iF
zwdoq0A<m=<+joBbkh+b!WE^_3584+;|21GvZ)k?iJ{Yd<ep!1^18H$RY$#Xufrxm_
zH<}!C7%=d0c~xp3eF95zJZz6skH{z2w}sYC<J@cwD>OUaJ3fbM;eAvGKB|Ss->vr-
zE#GhtDT~G^U2CM8$n<QUZQnVVsnEtX=*gJxbg6()>BPBZ#H<yqX@i!En<LZqeMr)x
z!B(wKUsALg9b)y|Z$IsXN(fb1W1e~AG51ri^WHhWQjzBy?0#~YntPOG4HOW4m*oVQ
z@q0@tsR>4-gvDL@dTh{WKwV|~g2UnP<n}r_`uSy6rF|oF{?PkO+3DJ7-4hFdk)<vd
zj#Eggl-zxrH&07~-RE9Y_yteP_w&|@UHSXjk+D15>nI>KX1{3Qt4!$gMP>C2klTeH
zbW+b+5tq^$L7Q^n1=vJeboK*5>BvFDreGU+F^#^0ys7Sq-q9}yR4zZXVQ{h${g453
zq6pg^vvuH;9wZ{7q6u|4-@RK#!=Eap;xC;!9FY-KZ1kbKsy4t4D*rmRQG$i2Uxwu~
zho+CJy8DykicM3`@|+OJC@JG|$kPsp_Bl-x{_Q40Azc^730@L5z1*Ou!H=*#Enckv
zp9QRQA9qdYFyA)S-mdGOl&^@EUi7Nm=?mG#dttXBs05F#VE5+R9PsORM*6!qPPb?J
z^2eV82skdKC0@hnhDL*RJ8uM$GPFe-j!EkA`EWYtHGD&kf=zS(ET2F0M%d&qkXIw=
zxU@eHmUq@_%^VKk1N%d?SC^H1(ri3&4MRT%?<+mvzW_dsJhZ@W<8#=>ddg|W#qObP
z7kQ)a>b{7~7w+jmo0mYERoUWi{(2N*J2mBTv88$^d^=nir_W)&wL8nLKVm=<o+x0m
z#TM#iC>Don775f%<e8fTjEJxiyQgLoLywWH@wGWO3_6fKLchz0frZ)35g(145G_6&
z0%>YdH4^`XuI-h+Qz4$Jr0ZBdJA|_Amc}?^z=yd^%Le{WO52LAjpPcPq*lzpYhCcz
zN!p)h#v-i8eyP7~9?NF(Che0EWoZ`km&7C@lMkkor!~I9h7-F^-!Fz8aEd*WC11ak
z85n#f$)X}unQ!O1S5Hgk!_v_st>k1E8f+Yb+jhs}S$ehSPoE8sE_gr97!X~27s}f#
zWf^;XZsRsHfE{`4`12B9vw)Px1M)fuxM%QSkr0?3VsJjdOjz0OWMX)oW8?)mwU*sq
zL`PUy*4_*$?QNIU-uJN|%DN`mf6JRDx8|og2q@w-x?K4A?8-A+F>vkB^`gsGpIx_l
zXBP@HA6trWGUg|%KxtFEUXi39Yzw{idwPW8_x%b)^$XSQH0ZU0V9lW*dH3hSgnetQ
z+lTXg7d#L=;Sy$dsy<rs!*Y3U;eYjrT@0cs;LAMyy5q&qSf&-z1wiEf7tT3)TD!fo
z+&8l>8fu9i><6BVu~wGN#ov8UI!|u>9)qWlapoc`dA#kaC)fu#W9X}I%<3D$tjeis
z*COOOW9|N>PC_|6kgw^f{^syV8%5^9QKNieCbhkIUB5=%P?z8KeB1*6t0cM%7>-l3
znFlHNk*T>&f%A82-iLs6KvVN(A@vpnA#maHy}h@C^0GC;n5`k%^e_>!F8W(g&~!jT
zx^hp?+*_Y=&B`Y^l6QtUOTo#heLxP+5gP!F2XheJPa{h=4tv!nqIL6|(TysBv$%jJ
zHrnpO?B1{O9C56TA0~)y_D4o@yH!uoB!h_#J!YpK8XXWlH0pZ8b`|2J+Gv=X!^N_O
z4-|NGX!mE*VZGKD0>ZELPtx{;HFnx-vp)<|4ZlsRCZ`cF>x&)+2kZl|yzZl>Hd^<S
zfQNFs?3JC|MwP7-V)3Vhw;C4O<eo-sO@DAHp#T}FB=4Y9`{$*gQx6w4-)y;IMe97G
z`hv#L%!ADnb#bNdY|ZzG1pwqvqCnaY*h3AbU&X&BRpV-)O4>WN%!nA>9<?;rde57x
zI;4X&0QG0l+PddiVf<GxyZcop3sf_j1bSLrkzW0C6^2#tW0CvBZ!N#@_6UWP)T0hA
zNp|!~U@?toXsFUA0d~9gvwacS(S2%y^(2caKlquQdZZ4Svi28U=eOmg6V!&*v_H0W
z*s2O!a`SDw<A1;2-)?n~6p;9kWxRqXj{+dw_@n+OEa&RHNd%vwp5}1X#2}}@b(}(~
zrBBh?V#vX;;;#6G8<B#gKdTJ^Aket2eqqW{JgwiReB%HApJjlK!u9enTGXt#ojTJ%
zqy3j>wcyRa^P2uA@l?<1==K@v#+K&a%B~5@uJ4pzzdL$xqduIFxXUOkd7CNt-Yl3=
zzDotdPHK~3mrwt{=8U1ci=WGES{I>^T(T;V9BvmuA!iviFcnd@8&+XC0^S*vZO1)q
z#0-XEoH!j=2{gV22~MqZb*cfLSaWwGn&?WME&hasR3GxJaP=tz?h?e^S@be5xt>*q
zOxqp5dEhYU|6Dfr;1gy0GI@%*e3Q_*vx)&b|81v=%73#wVh$^N?ApwiH<o4j0F||F
zf3dc(@jqeRze{uEskivpdiTnk-)hP4RKLGdO@5~)d9+J~|M#u*cdC+SJbwLu?VWi%
zRC^!C30VuJRm_mKi`j&XWo#vh>e{0$W0Ej4jnSwu2vMT4BxG`1B%$S6$`&PcX<W&k
zY!x-xA~IuUo-^vEr{}(&`<!|`|DE&ln%7xAzwQ0|%$c9p`F(%K3YgapEXyYmxwb*P
zA%RGcd%2c%Q=?8UId#S*BY_vvR7qk_S@SF2b{99-qY0x@k9yAJdviMr&%c;a51OCI
z?Jl}-xT19ABd+qod0YN|*AV4~=#g@*tjU$@Tj(o!4ct$!caSYx8CA8+fL$RA6yDNz
z_>bfq=D}i)@`~<}j_whh!(GkCzoWa{y?XRRK<^CcVb%HKqi*~FeN@xv6dyKlovyg>
z_lA*qV>5K%RiC=+Diyt!aXWW<9w-q0@zooyy<4^zF4y%Y^jH!AvS$wd?Z|%u`@dWl
zz}J@#GnO;2N(@s_%TTxs7v8Y7s_|A;wA#Za+h(b~UEXmCd4&>LbRF)U=AzpyM$Vz+
z?Csp~iQx+I30YhHQhpXaGnA7(&UnJdrSsZ<FdRxy*`DLe>I-v&)`||g14jF0uB|1d
z|4Uo`NdvUC&169}u$)KZwj5ExQ=#Or$Zf{+7M%_g9ElHYtp9C=)9I^{Pxu3Cyc?ah
z@193=1S;xUFBTqTr1S2+6@29BAe?hu8XeEQ+0Hjk>+)qKu!ecHm+3_Iz*WIV%lq9f
zFbD72z8w1Yrzyh)eY-MFWEsh_YbOXH2ZvwsMIOCzxkyL3OpQ$Ko8tA$9^v8-0)cNh
zU2Z@V?4Mfjx7XX+Wt1<hlMT%zjsn;7=BSmT{#Fn2BtVUsB@8@c6}dRWr%sv>)T8ew
z7WMjCWA5^P@`07U^2cO-Q&yHN5PSG-cb9TN*70xUU%DHm5Y}sXezv<4!y+x`x_i&E
zZKhJ<m=uk-oV_2ET5J<>1;+z7Tv@m`h1oK-Wj3g6V1(D7QCQ*?a_~BHg0xk;^%)!A
zHAGLJNC4iGH2ZN~?_5i1@tu%Et(Dfz^<A)bO?@x3Y2^u0)48{I@KZA|lmjW8cgh(H
zyh^*7lYkriNIJ>=lKMw(#zI04DB;}IKzB#ZBm>ku=eoNb2#x*u4WQQAm=}RknBNnB
zUm_0pBU_L~x40`<xQkklBlRN`?c%a;tu<J#ty10k%Bn70Je^ULN?`)eFWVSVEzIaa
zw*$Tn;XqtR*=8*3b!CWj-Z_5gWsVUpy5bLdOoxgm@p?y7>8;6CpVssF?MccUo?J-I
zKnX3r;yHGjRIT6}9Or7)ZBdk6!n`HEacui)j`d^viV-Ky)OZB~Gn32YW`A_MApP2J
z>)7@c1%~2A4g6IDT>s$M(CZaq3+=fI{SLfJWD9ROD<qDEFyt*x%IJ(roB2Vjx-;@0
z)Lj&oTH_`P&~}`oU2XRBtY;@Mw3rAc28Q(-uRkVM4PX8TTp=Psf2pa8sHuvKDV!>S
zaXE74#<eaVU$ucd6G|@<ukdSzfuBC0^r!a}vU{I&a583m`M1_0j3#g?Z#oOoo%#4!
zeSU7L=lrw0T6tQiKjRYrGXLPiV#b42S}2{TwlkSeO=y$}Sie$<4(-0n9k=rI@chd`
zBdt6Z@6M-}zq@%lOd4s?_m4kn)hjU^toSgWdewRQ+^{Z<&Pdb74Td6__oi~4eVRf~
z@I^}*XU<I&aI9X4SkiusNKY(G_U_o3tKM*6RVv|KbBJqzS)xC`0fuf4j|C>E8Uu?s
zC8?{daf(>uD!HNNR}CN{Sw-p9?VHtJyF{w@l(g%P8jGKag55rTI8(MUyNM^uPyDx$
z1$Lk&&nxe0O?fDSlgQJHT4Bm(^|cu+KE|6ad+WAOrgRrSScmQQfEXwa47oxJ`G&tU
zIwsizW53bwPF4DHYR5;f(2W#F__q$P8)N{(w-Og_&`7}eI&SSceeU8M+u=#8{f64z
zR-8+`=}6uK>D*!Vz&FFUA7SB6!(k>TG@?>DzCiNkIk<JfKa$<|X#lt_Xu<G7wCbGT
zN3{3KYGI37v1MoFNF;mpRIgUHlfAqt-;eE`zK8AoZs-t;;d7OK?PYuBp+SZ>o5a<c
z{@EE7xUvT^*Vn&tJ^|c;gahXq*c1DGWq;&Ya61f-Jq8R;8{__zUzN3blPPc)R0RGB
z5VaVTP|8~ULZUd_8};n;<VCTZjTJEE=MrMms47%E-suK<nm^_|(XGn`My4T6^zOZ>
zp_KDfc5DBW*r%22+|X06uF;h;GuCpHrotTf*s@K>pA@>jV6O;r;b#R;edPOX?kpKq
zd^29Yqt)zQchvMuLen5HV>ji^0BU4>Pm58$+p{ADbS35b!k`he4%rUDj9r6Nm5-Gi
zCWllMI^TiS9o1O@Bk__(W@qdsr7^038M}Jpid<IGQ_3TlEnnvn{Ypz}9^)qlsBQJI
zf*853g5B-Fd~yuT$IglBWW61WC;1~hyhxq|M36sumb?Kji0py)B~am>1aBXrq3TF!
zr7GOV%TU!(+Zts}HY4o!*?NRRusvd9hd<(r*Yi@v8A%xgVSx<%2~-bwkiQ=>02^ee
zI-4&R*cY5es={X_R9{0?6G4G+C+nSXGZKXW*G8Z;@hBY>TnCLnYi-ok)zyGwP-qkq
zcpD}fqlwnVYGJS_6#UDkY9s~h8Bo0TVShE>@})T7$WV1Zl}g4Uku(|&LDNEzDBei4
zo}Qi{8w^GhP-q4mCQ?0uG>HMLKWFk+KIVh~JjI7h^&t`Af_yzZNr6;DRaHSjU$-yq
z@+W^Sh#2sN9Y7Ho<UvNF5h&!>oPmS}028bkh2TLYQS3-0Kcmkr-{M0d&`1>D0Jxd0
zHXIG4LZA`4a7Q1a7l{^Nfc!qyTs7u0B$#_p2}S@Wj3#QMCR)c1t&P>z!(!08ze)dD
z^j&gml9$iE!~c<d6IM$Hi^hCO{*CBMas#A*%r~TFyFt*%@6P`dK`;DQfaE}m-)uj5
z;gJMCf<J*s4FDjb{~e+i9=nf3@%Nw_`S^Qy6Od%0w*hkQ<bSQ-=UM|k0W6CA>e0Wd
z{<UxaFFSMG|1a5p&J-#H6kG@wgbNe_P-4hk5H3&zK#3uDLAXE>040Xp1>pik0F)SV
z7laEG0Z?MdT@Wr%1VD))cR{#75dbBI+y&tRMF5l-au<XP6ai3T$XyUFPy|4UA$LKz
zKoI~XhTH|=0!09n7;+bc3lsrRV#r+(E>HwOi6M7ExIhsAC5GGu;Q~bflo)asgbNe_
zP-4hk5H3&zK#3uDLAXE>044sf?vk2|`XCU2P!Adq(~&k<t_Lhh?rv#rVh6<6xYhx$
zj+YA=>bPUIVz~+`TvJP=PCj+=aIS+&Pl<)nq>+qC{C$~lW*E~rUg)Ut)S`!@BE||E
zntSZC%qd~D`)D{J>*VM-G}**_Yj{I{|K2i^Qch?f`gQ+NN~QhGtzzL~RcXEc^P@zP
z2nO?V(d`}#M#p@q>y}5+k0a8B<-=p7crQ9LENWL6i(Kqzm648JQLH7eROVaykZMC-
z61Fs~_mJ41V+W;sO3p427wWj%AZC2#@$2#RMDLN^>$fSFVq+f5HFl7Q2PSU)@+Xc~
z{vjmTF1SHDY?;PGlEzr<R{6$QTsHf%#Ae}7imcZxf7BzHwBw6H=IP$-BX4%H8PgbL
zUrQ};xs41f_Q-d%LzgY2^&i|`BxiH{C~9r;QPJU7&s5!OEaT2gzh0&5^!TLY^HIt#
zHE+%wjltbh$SibupYrQIw8`m!c^9Y05xGwm?7W#+FDw*?-q`9H!$qr87(z3mqmmBf
zz_>lJgP&}Jo7KqA)!X~}gwii{3kTmnGMyHev@)L>-?_wZQ#H0<x5zSnd71d=$jdEi
z#(f{e9t?Grvu<eJ=rOzKzHav^51S>yd41y|0c@@*Ir4(cLs(W(*8+5e?aeB-gnE3#
z^87<Na_gSoR3BX3s~A>!datcbpN;k^_r--mqsa}(o0cvrzcE*uoSJ6ejIe$`-y@Ln
zz(DH0Y;ERZSS6}>LcJ_hWmDF&PGp<Cn_egLYz$WQnU(pXg0{&M>wk;(ofgg?oO)QJ
zu%oA<>$M|ZN%>-QV&sx|i~QdB7yKBH@-FuhtPIofnymVOk!Hp-_h?Ra|Hg#mhO_*a
zn;MWV_6vIC2Hl<(tygx@FQSu~SC*)Zo$xORQWb3-)gE$XrK~E2Z#q19<ht3s0`fgA
z56Oc4@e*ljkF0Axl&2k!U=$j=Rc^I?VG&s}cv3PZhINLsEm88oN6|;-stKc|4MXfc
zSesH>LpyO%foN57X4akf3zC_XO>2uKCCkL#|Dxfx$1Zqp%_wGyaWj{#Lak>;NSiDu
zSbE}BzPwzq9#MIn`awxjl;YilB&FT)_?hYfsR#B=B=#<`Y>WIWYFmZ^;#APR3T#ss
zyc&95qVogGKa-;tl`q(1LSDjtWp7oHx*X|Z+1|VA5te!I(lXbRywW`z>=AyKOmNQI
zGF@wiw^r`oE}d6ZeTbr7wPZOH<2X`ga=*nR(ot{W67k&Bu&&eOs<QgL9?=y|CMTCB
z;MOMV&s)MSiE431ym@E#nwHsr=+nmcURS4GU+z3`-1d~~$)_h57K9uTBX?}u|Ln0Y
zb9$-UyD;?cqc7JZ#ORm0+usWPvC??i*&F6|Sv%q;mxgys%ZGmKpQg)XXV&$nj5!7&
z>pzt#_P5n}XAZ4-uV_<66G}$!8!zq)h&Wk&OoFJr_f5*>17@{;r)ET+A1o<S#2cG?
zldVZ{K8Mg!&g2~l8YKg!yh7vIFLT}FHn|;qob`v4HNe*$hTf?%qZX;!FNi*~+-zf>
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 0500/1224] 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 b523366acd42193588fa81089147ddccaba59ae8 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Mon, 30 Jul 2012 17:23:34 +0200
Subject: [PATCH 0501/1224] LDAP: don't die on unexpected collisions, handle
 empty display-name attributes properly

---
 apps/user_ldap/lib_ldap.php  | 23 +++++++++++++++++------
 apps/user_ldap/user_ldap.php | 16 +++++++++++-----
 2 files changed, 28 insertions(+), 11 deletions(-)

diff --git a/apps/user_ldap/lib_ldap.php b/apps/user_ldap/lib_ldap.php
index 39992e81e0..4bd0ff4bbf 100644
--- a/apps/user_ldap/lib_ldap.php
+++ b/apps/user_ldap/lib_ldap.php
@@ -168,7 +168,7 @@ class OC_LDAP {
 	 * @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
 	 */
 	static public function dn2groupname($dn, $ldapname = null) {
 		if(strripos($dn, self::$ldapBaseGroups) !== (strlen($dn)-strlen(self::$ldapBaseGroups))) {
@@ -183,7 +183,7 @@ 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, 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
 	 */
 	static public function dn2username($dn, $ldapname = null) {
 		if(strripos($dn, self::$ldapBaseUsers) !== (strlen($dn)-strlen(self::$ldapBaseUsers))) {
@@ -214,6 +214,11 @@ class OC_LDAP {
 
 		if(is_null($ldapname)) {
 			$ldapname = self::readAttribute($dn, $nameAttribute);
+			//we do not accept empty usernames
+			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 = self::sanitizeUsername($ldapname);
@@ -229,8 +234,8 @@ class OC_LDAP {
 			return $oc_name;
 		}
 
-		//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);
 	}
 
 	/**
@@ -274,6 +279,12 @@ class OC_LDAP {
 				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 = self::sanitizeUsername($ldapObject[$nameAttribute]);
 			if(self::mapComponent($ldapObject['dn'], $ocname, $isUsers)) {
@@ -288,8 +299,8 @@ class OC_LDAP {
 				continue;
 			}
 
-			//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 85b3d88973..da99e167fd 100644
--- a/apps/user_ldap/user_ldap.php
+++ b/apps/user_ldap/user_ldap.php
@@ -96,12 +96,18 @@ class OC_USER_LDAP extends OC_User_Backend {
 			return false;
 		}
 
-		//update some settings, if necessary
-		$this->updateQuota($dn);
-		$this->updateEmail($dn);
+		//do we have a username for him/her?
+		$ocname = OC_LDAP::dn2username($dn);
 
-		//give back the display name
-		return OC_LDAP::dn2username($dn);
+		if($ocname){
+			//update some settings, if necessary
+			$this->updateQuota($dn);
+			$this->updateEmail($dn);
+
+			return $ocname;
+		}
+
+		return false;
 	}
 
 	/**

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 0502/1224] 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 0503/1224] 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 0504/1224] 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 0505/1224] 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 0506/1224] 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 0507/1224] 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 aa60771736b230d82d472a3443f262f7158842ad Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <frank@owncloud.org>
Date: Tue, 31 Jul 2012 10:13:10 +0200
Subject: [PATCH 0508/1224] 4.0.6

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

diff --git a/lib/util.php b/lib/util.php
index 884122bbf9..b7ceee91b5 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,00,5);
+		return array(4,00,6);
 	}
 
 	/**
@@ -91,7 +91,7 @@ class OC_Util {
 	 * @return string
 	 */
 	public static function getVersionString(){
-		return '4.0.5';
+		return '4.0.6';
 	}
 
         /**

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 0509/1224] 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 0510/1224] 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 0511/1224] 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 0512/1224] 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 0513/1224] 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 0514/1224] 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 0515/1224] 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 0516/1224] 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 0517/1224] 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 c03daca712fc63cefadf90765def280c57059e62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= <jfd@butonic.de>
Date: Thu, 19 Jul 2012 12:10:51 +0200
Subject: [PATCH 0518/1224] add oci8 to MDB2

---
 3rdparty/MDB2/Driver/Datatype/oci8.php |  499 +++++++
 3rdparty/MDB2/Driver/Function/oci8.php |  187 +++
 3rdparty/MDB2/Driver/Manager/oci8.php  | 1340 +++++++++++++++++++
 3rdparty/MDB2/Driver/Native/oci8.php   |   60 +
 3rdparty/MDB2/Driver/Reverse/oci8.php  |  621 +++++++++
 3rdparty/MDB2/Driver/oci8.php          | 1647 ++++++++++++++++++++++++
 6 files changed, 4354 insertions(+)
 create mode 100644 3rdparty/MDB2/Driver/Datatype/oci8.php
 create mode 100644 3rdparty/MDB2/Driver/Function/oci8.php
 create mode 100644 3rdparty/MDB2/Driver/Manager/oci8.php
 create mode 100644 3rdparty/MDB2/Driver/Native/oci8.php
 create mode 100644 3rdparty/MDB2/Driver/Reverse/oci8.php
 create mode 100644 3rdparty/MDB2/Driver/oci8.php

diff --git a/3rdparty/MDB2/Driver/Datatype/oci8.php b/3rdparty/MDB2/Driver/Datatype/oci8.php
new file mode 100644
index 0000000000..f633b0e215
--- /dev/null
+++ b/3rdparty/MDB2/Driver/Datatype/oci8.php
@@ -0,0 +1,499 @@
+<?php
+// +----------------------------------------------------------------------+
+// | PHP versions 4 and 5                                                 |
+// +----------------------------------------------------------------------+
+// | Copyright (c) 1998-2007 Manuel Lemos, Tomas V.V.Cox,                 |
+// | Stig. S. Bakken, Lukas Smith                                         |
+// | All rights reserved.                                                 |
+// +----------------------------------------------------------------------+
+// | MDB2 is a merge of PEAR DB and Metabases that provides a unified DB  |
+// | API as well as database abstraction for PHP applications.            |
+// | This LICENSE is in the BSD license style.                            |
+// |                                                                      |
+// | 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 Manuel Lemos, Tomas V.V.Cox, Stig. S. Bakken,    |
+// | Lukas Smith nor the names of his 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      |
+// | REGENTS 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.                                          |
+// +----------------------------------------------------------------------+
+// | Author: Lukas Smith <smith@pooteeweet.org>                           |
+// +----------------------------------------------------------------------+
+
+// $Id: oci8.php 295587 2010-02-28 17:16:38Z quipo $
+
+require_once 'MDB2/Driver/Datatype/Common.php';
+
+/**
+ * MDB2 OCI8 driver
+ *
+ * @package MDB2
+ * @category Database
+ * @author Lukas Smith <smith@pooteeweet.org>
+ */
+class MDB2_Driver_Datatype_oci8 extends MDB2_Driver_Datatype_Common
+{
+    // {{{ _baseConvertResult()
+
+    /**
+     * general type conversion method
+     *
+     * @param mixed   $value refernce to a value to be converted
+     * @param string  $type  specifies which type to convert to
+     * @param boolean $rtrim [optional] when TRUE [default], apply rtrim() to text
+     * @return object a MDB2 error on failure
+     * @access protected
+     */
+    function _baseConvertResult($value, $type, $rtrim = true)
+    {
+        if (null === $value) {
+            return null;
+        }
+        switch ($type) {
+        case 'text':
+            if (is_object($value) && is_a($value, 'OCI-Lob')) {
+                //LOB => fetch into variable
+                $clob = $this->_baseConvertResult($value, 'clob', $rtrim);
+                if (!PEAR::isError($clob) && is_resource($clob)) {
+                    $clob_value = '';
+                    while (!feof($clob)) {
+                        $clob_value .= fread($clob, 8192);
+                    }
+                    $this->destroyLOB($clob);
+                }
+                $value = $clob_value;
+            }
+            if ($rtrim) {
+                $value = rtrim($value);
+            }
+            return $value;
+        case 'date':
+            return substr($value, 0, strlen('YYYY-MM-DD'));
+        case 'time':
+            return substr($value, strlen('YYYY-MM-DD '), strlen('HH:MI:SS'));
+        }
+        return parent::_baseConvertResult($value, $type, $rtrim);
+    }
+
+    // }}}
+    // {{{ getTypeDeclaration()
+
+    /**
+     * Obtain DBMS specific SQL code portion needed to declare an text type
+     * field to be used in statements like CREATE TABLE.
+     *
+     * @param array $field  associative array with the name of the properties
+     *      of the field being declared as array indexes. Currently, the types
+     *      of supported field properties are as follows:
+     *
+     *      length
+     *          Integer value that determines the maximum length of the text
+     *          field. If this argument is missing the field should be
+     *          declared to have the longest length allowed by the DBMS.
+     *
+     *      default
+     *          Text value to be used as default for this field.
+     *
+     *      notnull
+     *          Boolean flag that indicates whether this field is constrained
+     *          to not be set to null.
+     * @return string  DBMS specific SQL code portion that should be used to
+     *      declare the specified field.
+     * @access public
+     */
+    function getTypeDeclaration($field)
+    {
+        $db = $this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        switch ($field['type']) {
+        case 'text':
+            $length = !empty($field['length'])
+                ? $field['length'] : $db->options['default_text_field_length'];
+            $fixed = !empty($field['fixed']) ? $field['fixed'] : false;
+            return $fixed ? 'CHAR('.$length.')' : 'VARCHAR2('.$length.')';
+        case 'clob':
+            return 'CLOB';
+        case 'blob':
+            return 'BLOB';
+        case 'integer':
+            if (!empty($field['length'])) {
+                switch((int)$field['length']) {
+                    case 1:  $digit = 3;  break;
+                    case 2:  $digit = 5;  break;
+                    case 3:  $digit = 8;  break;
+                    case 4:  $digit = 10; break;
+                    case 5:  $digit = 13; break;
+                    case 6:  $digit = 15; break;
+                    case 7:  $digit = 17; break;
+                    case 8:  $digit = 20; break;
+                    default: $digit = 10;
+                }
+                return 'NUMBER('.$digit.')';
+            }
+            return 'INT';
+        case 'boolean':
+            return 'NUMBER(1)';
+        case 'date':
+        case 'time':
+        case 'timestamp':
+            return 'DATE';
+        case 'float':
+            return 'NUMBER';
+        case 'decimal':
+            $scale = !empty($field['scale']) ? $field['scale'] : $db->options['decimal_places'];
+            return 'NUMBER(*,'.$scale.')';
+        }
+    }
+
+    // }}}
+    // {{{ _quoteCLOB()
+
+    /**
+     * Convert a text value into a DBMS specific format that is suitable to
+     * compose query statements.
+     *
+     * @param string $value text string value that is intended to be converted.
+     * @param bool $quote determines if the value should be quoted and escaped
+     * @param bool $escape_wildcards if to escape escape wildcards
+     * @return string text string that represents the given argument value in
+     *        a DBMS specific format.
+     * @access protected
+     */
+    function _quoteCLOB($value, $quote, $escape_wildcards)
+    {
+        return 'EMPTY_CLOB()';
+    }
+
+    // }}}
+    // {{{ _quoteBLOB()
+
+    /**
+     * Convert a text value into a DBMS specific format that is suitable to
+     * compose query statements.
+     *
+     * @param string $value text string value that is intended to be converted.
+     * @param bool $quote determines if the value should be quoted and escaped
+     * @param bool $escape_wildcards if to escape escape wildcards
+     * @return string text string that represents the given argument value in
+     *        a DBMS specific format.
+     * @access protected
+     */
+    function _quoteBLOB($value, $quote, $escape_wildcards)
+    {
+        return 'EMPTY_BLOB()';
+    }
+
+    // }}}
+    // {{{ _quoteDate()
+
+    /**
+     * Convert a text value into a DBMS specific format that is suitable to
+     * compose query statements.
+     *
+     * @param string $value text string value that is intended to be converted.
+     * @param bool $quote determines if the value should be quoted and escaped
+     * @param bool $escape_wildcards if to escape escape wildcards
+     * @return string text string that represents the given argument value in
+     *        a DBMS specific format.
+     * @access protected
+     */
+    function _quoteDate($value, $quote, $escape_wildcards)
+    {
+       return $this->_quoteText("$value 00:00:00", $quote, $escape_wildcards);
+    }
+
+    // }}}
+    // {{{ _quoteTimestamp()
+
+    /**
+     * Convert a text value into a DBMS specific format that is suitable to
+     * compose query statements.
+     *
+     * @param string $value text string value that is intended to be converted.
+     * @param bool $quote determines if the value should be quoted and escaped
+     * @param bool $escape_wildcards if to escape escape wildcards
+     * @return string text string that represents the given argument value in
+     *        a DBMS specific format.
+     * @access protected
+     */
+    function _quoteTimestamp($value, $quote, $escape_wildcards)
+    {
+       return $this->_quoteText($value, $quote, $escape_wildcards);
+    }
+
+    // }}}
+    // {{{ _quoteTime()
+
+    /**
+     * Convert a text value into a DBMS specific format that is suitable to
+     *        compose query statements.
+     *
+     * @param string $value text string value that is intended to be converted.
+     * @param bool $quote determines if the value should be quoted and escaped
+     * @param bool $escape_wildcards if to escape escape wildcards
+     * @return string text string that represents the given argument value in
+     *        a DBMS specific format.
+     * @access protected
+     */
+    function _quoteTime($value, $quote, $escape_wildcards)
+    {
+       return $this->_quoteText("0001-01-01 $value", $quote, $escape_wildcards);
+    }
+
+    // }}}
+    // {{{ writeLOBToFile()
+
+    /**
+     * retrieve LOB from the database
+     *
+     * @param array $lob array
+     * @param string $file name of the file into which the LOb should be fetched
+     * @return mixed MDB2_OK on success, a MDB2 error on failure
+     * @access protected
+     */
+    function writeLOBToFile($lob, $file)
+    {
+        if (preg_match('/^(\w+:\/\/)(.*)$/', $file, $match)) {
+            if ($match[1] == 'file://') {
+                $file = $match[2];
+            }
+        }
+        $lob_data = stream_get_meta_data($lob);
+        $lob_index = $lob_data['wrapper_data']->lob_index;
+        $result = $this->lobs[$lob_index]['resource']->writetofile($file);
+        $this->lobs[$lob_index]['resource']->seek(0);
+        if (!$result) {
+            $db = $this->getDBInstance();
+            if (PEAR::isError($db)) {
+                return $db;
+            }
+
+            return $db->raiseError(null, null, null,
+                'Unable to write LOB to file', __FUNCTION__);
+        }
+        return MDB2_OK;
+    }
+
+    // }}}
+    // {{{ _retrieveLOB()
+
+    /**
+     * retrieve LOB from the database
+     *
+     * @param array $lob array
+     * @return mixed MDB2_OK on success, a MDB2 error on failure
+     * @access protected
+     */
+    function _retrieveLOB(&$lob)
+    {
+        if (!is_object($lob['resource'])) {
+            $db = $this->getDBInstance();
+            if (PEAR::isError($db)) {
+                return $db;
+            }
+
+           return $db->raiseError(MDB2_ERROR_NOT_FOUND, null, null,
+               'attemped to retrieve LOB from non existing or NULL column', __FUNCTION__);
+        }
+
+        if (!$lob['loaded']
+#            && !method_exists($lob['resource'], 'read')
+        ) {
+            $lob['value'] = $lob['resource']->load();
+            $lob['resource']->seek(0);
+        }
+        $lob['loaded'] = true;
+        return MDB2_OK;
+    }
+
+    // }}}
+    // {{{ _readLOB()
+
+    /**
+     * Read data from large object input stream.
+     *
+     * @param array $lob array
+     * @param blob $data reference to a variable that will hold data to be
+     *      read from the large object input stream
+     * @param int $length integer value that indicates the largest ammount of
+     *      data to be read from the large object input stream.
+     * @return mixed length on success, a MDB2 error on failure
+     * @access protected
+     */
+    function _readLOB($lob, $length)
+    {
+        if ($lob['loaded']) {
+            return parent::_readLOB($lob, $length);
+        }
+
+        if (!is_object($lob['resource'])) {
+            $db = $this->getDBInstance();
+            if (PEAR::isError($db)) {
+                return $db;
+            }
+
+           return $db->raiseError(MDB2_ERROR_NOT_FOUND, null, null,
+               'attemped to retrieve LOB from non existing or NULL column', __FUNCTION__);
+        }
+
+        $data = $lob['resource']->read($length);
+        if (!is_string($data)) {
+            $db = $this->getDBInstance();
+            if (PEAR::isError($db)) {
+                return $db;
+            }
+
+            return $db->raiseError(null, null, null,
+                    'Unable to read LOB', __FUNCTION__);
+        }
+        return $data;
+    }
+
+    // }}}
+    // {{{ patternEscapeString()
+
+    /**
+     * build string to define escape pattern string
+     *
+     * @access public
+     *
+     *
+     * @return string define escape pattern
+     */
+    function patternEscapeString()
+    {
+        $db = $this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+        return " ESCAPE '". $db->string_quoting['escape_pattern'] ."'";
+    }
+
+    // }}}
+    // {{{ _mapNativeDatatype()
+
+    /**
+     * Maps a native array description of a field to a MDB2 datatype and length
+     *
+     * @param array  $field native field description
+     * @return array containing the various possible types, length, sign, fixed
+     * @access public
+     */
+    function _mapNativeDatatype($field)
+    {
+        $db_type = strtolower($field['type']);
+        $type = array();
+        $length = $unsigned = $fixed = null;
+        if (!empty($field['length'])) {
+            $length = $field['length'];
+        }
+        switch ($db_type) {
+        case 'integer':
+        case 'pls_integer':
+        case 'binary_integer':
+            $type[] = 'integer';
+            if ($length == '1') {
+                $type[] = 'boolean';
+                if (preg_match('/^(is|has)/', $field['name'])) {
+                    $type = array_reverse($type);
+                }
+            }
+            break;
+        case 'varchar':
+        case 'varchar2':
+        case 'nvarchar2':
+            $fixed = false;
+        case 'char':
+        case 'nchar':
+            $type[] = 'text';
+            if ($length == '1') {
+                $type[] = 'boolean';
+                if (preg_match('/^(is|has)/', $field['name'])) {
+                    $type = array_reverse($type);
+                }
+            }
+            if ($fixed !== false) {
+                $fixed = true;
+            }
+            break;
+        case 'date':
+        case 'timestamp':
+            $type[] = 'timestamp';
+            $length = null;
+            break;
+        case 'float':
+            $type[] = 'float';
+            break;
+        case 'number':
+            if (!empty($field['scale'])) {
+                $type[] = 'decimal';
+                $length = $length.','.$field['scale'];
+            } else {
+                $type[] = 'integer';
+                if ($length == '1') {
+                    $type[] = 'boolean';
+                    if (preg_match('/^(is|has)/', $field['name'])) {
+                        $type = array_reverse($type);
+                    }
+                }
+            }
+            break;
+        case 'long':
+            $type[] = 'text';
+        case 'clob':
+        case 'nclob':
+            $type[] = 'clob';
+            break;
+        case 'blob':
+        case 'raw':
+        case 'long raw':
+        case 'bfile':
+            $type[] = 'blob';
+            $length = null;
+            break;
+        case 'rowid':
+        case 'urowid':
+        default:
+            $db = $this->getDBInstance();
+            if (PEAR::isError($db)) {
+                return $db;
+            }
+
+            return $db->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
+                'unknown database attribute type: '.$db_type, __FUNCTION__);
+        }
+
+        if ((int)$length <= 0) {
+            $length = null;
+        }
+
+        return array($type, $length, $unsigned, $fixed);
+    }
+}
+
+?>
\ No newline at end of file
diff --git a/3rdparty/MDB2/Driver/Function/oci8.php b/3rdparty/MDB2/Driver/Function/oci8.php
new file mode 100644
index 0000000000..757d17fcb8
--- /dev/null
+++ b/3rdparty/MDB2/Driver/Function/oci8.php
@@ -0,0 +1,187 @@
+<?php
+// +----------------------------------------------------------------------+
+// | PHP versions 4 and 5                                                 |
+// +----------------------------------------------------------------------+
+// | Copyright (c) 1998-2008 Manuel Lemos, Tomas V.V.Cox,                 |
+// | Stig. S. Bakken, Lukas Smith                                         |
+// | All rights reserved.                                                 |
+// +----------------------------------------------------------------------+
+// | MDB2 is a merge of PEAR DB and Metabases that provides a unified DB  |
+// | API as well as database abstraction for PHP applications.            |
+// | This LICENSE is in the BSD license style.                            |
+// |                                                                      |
+// | 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 Manuel Lemos, Tomas V.V.Cox, Stig. S. Bakken,    |
+// | Lukas Smith nor the names of his 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      |
+// | REGENTS 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.                                          |
+// +----------------------------------------------------------------------+
+// | Author: Lukas Smith <smith@pooteeweet.org>                           |
+// +----------------------------------------------------------------------+
+
+// $Id: oci8.php 295587 2010-02-28 17:16:38Z quipo $
+
+require_once 'MDB2/Driver/Function/Common.php';
+
+/**
+ * MDB2 oci8 driver for the function modules
+ *
+ * @package MDB2
+ * @category Database
+ * @author Lukas Smith <smith@pooteeweet.org>
+ */
+class MDB2_Driver_Function_oci8 extends MDB2_Driver_Function_Common
+{
+    // {{{ executeStoredProc()
+
+    /**
+     * Execute a stored procedure and return any results
+     *
+     * @param string $name string that identifies the function to execute
+     * @param mixed  $params  array that contains the paramaters to pass the stored proc
+     * @param mixed   $types  array that contains the types of the columns in
+     *                        the result set
+     * @param mixed $result_class string which specifies which result class to use
+     * @param mixed $result_wrap_class string which specifies which class to wrap results in
+     * @return mixed a result handle or MDB2_OK on success, a MDB2 error on failure
+     * @access public
+     */
+    function executeStoredProc($name, $params = null, $types = null, $result_class = true, $result_wrap_class = false)
+    {
+        $db = $this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        $query = 'EXEC '.$name;
+        $query .= $params ? '('.implode(', ', $params).')' : '()';
+        return $db->query($query, $types, $result_class, $result_wrap_class);
+    }
+
+    // }}}
+    // {{{ functionTable()
+
+    /**
+     * return string for internal table used when calling only a function
+     *
+     * @return string for internal table used when calling only a function
+     * @access public
+     */
+    function functionTable()
+    {
+        return ' FROM dual';
+    }
+
+    // }}}
+    // {{{ now()
+
+    /**
+     * Return string to call a variable with the current timestamp inside an SQL statement
+     * There are three special variables for current date and time:
+     * - CURRENT_TIMESTAMP (date and time, TIMESTAMP type)
+     * - CURRENT_DATE (date, DATE type)
+     * - CURRENT_TIME (time, TIME type)
+     *
+     * @return string to call a variable with the current timestamp
+     * @access public
+     */
+    function now($type = 'timestamp')
+    {
+        switch ($type) {
+        case 'date':
+        case 'time':
+        case 'timestamp':
+        default:
+            return 'TO_CHAR(CURRENT_TIMESTAMP, \'YYYY-MM-DD HH24:MI:SS\')';
+        }
+    }
+
+    // }}}
+    // {{{ unixtimestamp()
+
+    /**
+     * return string to call a function to get the unix timestamp from a iso timestamp
+     *
+     * @param string $expression
+     *
+     * @return string to call a variable with the timestamp
+     * @access public
+     */
+    function unixtimestamp($expression)
+    {
+        $utc_offset = 'CAST(SYS_EXTRACT_UTC(SYSTIMESTAMP) AS DATE) - CAST(SYSTIMESTAMP AS DATE)';
+        $epoch_date = 'to_date(\'19700101\', \'YYYYMMDD\')';
+        return '(CAST('.$expression.' AS DATE) - '.$epoch_date.' + '.$utc_offset.') * 86400 seconds';
+    }
+
+    // }}}
+    // {{{ substring()
+
+    /**
+     * return string to call a function to get a substring inside an SQL statement
+     *
+     * @return string to call a function to get a substring
+     * @access public
+     */
+    function substring($value, $position = 1, $length = null)
+    {
+        if (null !== $length) {
+            return "SUBSTR($value, $position, $length)";
+        }
+        return "SUBSTR($value, $position)";
+    }
+
+    // }}}
+    // {{{ random()
+
+    /**
+     * return string to call a function to get random value inside an SQL statement
+     *
+     * @return return string to generate float between 0 and 1
+     * @access public
+     */
+    function random()
+    {
+        return 'dbms_random.value';
+    }
+
+    // }}}}
+    // {{{ guid()
+
+    /**
+     * Returns global unique identifier
+     *
+     * @return string to get global unique identifier
+     * @access public
+     */
+    function guid()
+    {
+        return 'SYS_GUID()';
+    }
+
+    // }}}}
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/MDB2/Driver/Manager/oci8.php b/3rdparty/MDB2/Driver/Manager/oci8.php
new file mode 100644
index 0000000000..90ae8eb230
--- /dev/null
+++ b/3rdparty/MDB2/Driver/Manager/oci8.php
@@ -0,0 +1,1340 @@
+<?php
+// +----------------------------------------------------------------------+
+// | PHP versions 4 and 5                                                 |
+// +----------------------------------------------------------------------+
+// | Copyright (c) 1998-2008 Manuel Lemos, Tomas V.V.Cox,                 |
+// | Stig. S. Bakken, Lukas Smith                                         |
+// | All rights reserved.                                                 |
+// +----------------------------------------------------------------------+
+// | MDB2 is a merge of PEAR DB and Metabases that provides a unified DB  |
+// | API as well as database abstraction for PHP applications.            |
+// | This LICENSE is in the BSD license style.                            |
+// |                                                                      |
+// | 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 Manuel Lemos, Tomas V.V.Cox, Stig. S. Bakken,    |
+// | Lukas Smith nor the names of his 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      |
+// | REGENTS 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.                                          |
+// +----------------------------------------------------------------------+
+// | Author: Lukas Smith <smith@pooteeweet.org>                           |
+// +----------------------------------------------------------------------+
+
+// $Id: oci8.php 295587 2010-02-28 17:16:38Z quipo $
+
+require_once 'MDB2/Driver/Manager/Common.php';
+
+/**
+ * MDB2 oci8 driver for the management modules
+ *
+ * @package MDB2
+ * @category Database
+ * @author Lukas Smith <smith@pooteeweet.org>
+ */
+class MDB2_Driver_Manager_oci8 extends MDB2_Driver_Manager_Common
+{
+    // {{{ createDatabase()
+
+    /**
+     * create a new database
+     *
+     * @param string $name    name of the database that should be created
+     * @param array  $options array with charset, collation info
+     *
+     * @return mixed MDB2_OK on success, a MDB2 error on failure
+     * @access public
+     */
+    function createDatabase($name, $options = array())
+    {
+        $db = $this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        $username = $db->options['database_name_prefix'].$name;
+        $password = $db->dsn['password'] ? $db->dsn['password'] : $name;
+        $tablespace = $db->options['default_tablespace']
+            ? ' DEFAULT TABLESPACE '.$db->options['default_tablespace'] : '';
+
+        $query = 'CREATE USER '.$username.' IDENTIFIED BY '.$password.$tablespace;
+        $result = $db->standaloneQuery($query, null, true);
+        if (PEAR::isError($result)) {
+            return $result;
+        }
+        $query = 'GRANT CREATE SESSION, CREATE TABLE, UNLIMITED TABLESPACE, CREATE SEQUENCE, CREATE TRIGGER TO '.$username;
+        $result = $db->standaloneQuery($query, null, true);
+        if (PEAR::isError($result)) {
+            $query = 'DROP USER '.$username.' CASCADE';
+            $result2 = $db->standaloneQuery($query, null, true);
+            if (PEAR::isError($result2)) {
+                return $db->raiseError($result2, null, null,
+                    'could not setup the database user', __FUNCTION__);
+            }
+            return $result;
+        }
+        return MDB2_OK;
+    }
+
+    // }}}
+    // {{{ alterDatabase()
+
+    /**
+     * alter an existing database
+     *
+     * IMPORTANT: the safe way to change the db charset is to do a full import/export!
+     * If - and only if - the new character set is a strict superset of the current
+     * character set, it is possible to use the ALTER DATABASE CHARACTER SET to
+     * expedite the change in the database character set.
+     *
+     * @param string $name    name of the database that is intended to be changed
+     * @param array  $options array with name, charset info
+     *
+     * @return mixed MDB2_OK on success, a MDB2 error on failure
+     * @access public
+     */
+    function alterDatabase($name, $options = array())
+    {
+        //disabled
+        //return parent::alterDatabase($name, $options);
+
+        $db = $this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        if (!empty($options['name'])) {
+            $query = 'ALTER DATABASE ' . $db->quoteIdentifier($name, true)
+                    .' RENAME GLOBAL_NAME TO ' . $db->quoteIdentifier($options['name'], true);
+            $result = $db->standaloneQuery($query);
+            if (PEAR::isError($result)) {
+                return $result;
+            }
+        }
+
+        if (!empty($options['charset'])) {
+            $queries = array();
+            $queries[] = 'SHUTDOWN IMMEDIATE'; //or NORMAL
+            $queries[] = 'STARTUP MOUNT';
+            $queries[] = 'ALTER SYSTEM ENABLE RESTRICTED SESSION';
+            $queries[] = 'ALTER SYSTEM SET JOB_QUEUE_PROCESSES=0';
+            $queries[] = 'ALTER DATABASE OPEN';
+            $queries[] = 'ALTER DATABASE CHARACTER SET ' . $options['charset'];
+            $queries[] = 'ALTER DATABASE NATIONAL CHARACTER SET ' . $options['charset'];
+            $queries[] = 'SHUTDOWN IMMEDIATE'; //or NORMAL
+            $queries[] = 'STARTUP';
+
+            foreach ($queries as $query) {
+                $result = $db->standaloneQuery($query);
+                if (PEAR::isError($result)) {
+                    return $result;
+                }
+            }
+        }
+
+        return MDB2_OK;
+    }
+
+    // }}}
+    // {{{ dropDatabase()
+
+    /**
+     * drop an existing database
+     *
+     * @param object $db database object that is extended by this class
+     * @param string $name name of the database that should be dropped
+     * @return mixed MDB2_OK on success, a MDB2 error on failure
+     * @access public
+     */
+    function dropDatabase($name)
+    {
+        $db = $this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        $username = $db->options['database_name_prefix'].$name;
+        return $db->standaloneQuery('DROP USER '.$username.' CASCADE', null, true);
+    }
+
+
+    // }}}
+    // {{{ _makeAutoincrement()
+
+    /**
+     * add an autoincrement sequence + trigger
+     *
+     * @param string $name  name of the PK field
+     * @param string $table name of the table
+     * @param string $start start value for the sequence
+     * @return mixed        MDB2_OK on success, a MDB2 error on failure
+     * @access private
+     */
+    function _makeAutoincrement($name, $table, $start = 1)
+    {
+        $db = $this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        $table_uppercase = strtoupper($table);
+        $index_name  = $table_uppercase . '_AI_PK';
+        $definition = array(
+            'primary' => true,
+            'fields' => array($name => true),
+        );
+        $idxname_format = $db->getOption('idxname_format');
+        $db->setOption('idxname_format', '%s');
+        $result = $this->createConstraint($table, $index_name, $definition);
+        $db->setOption('idxname_format', $idxname_format);
+        if (PEAR::isError($result)) {
+            return $db->raiseError($result, null, null,
+                'primary key for autoincrement PK could not be created', __FUNCTION__);
+        }
+
+        if (null === $start) {
+            $db->beginTransaction();
+            $query = 'SELECT MAX(' . $db->quoteIdentifier($name, true) . ') FROM ' . $db->quoteIdentifier($table, true);
+            $start = $this->db->queryOne($query, 'integer');
+            if (PEAR::isError($start)) {
+                return $start;
+            }
+            ++$start;
+            $result = $this->createSequence($table, $start);
+            $db->commit();
+        } else {
+            $result = $this->createSequence($table, $start);
+        }
+        if (PEAR::isError($result)) {
+            return $db->raiseError($result, null, null,
+                'sequence for autoincrement PK could not be created', __FUNCTION__);
+        }
+        $seq_name        = $db->getSequenceName($table);
+        $trigger_name    = $db->quoteIdentifier($table_uppercase . '_AI_PK', true);
+        $seq_name_quoted = $db->quoteIdentifier($seq_name, true);
+        $table = $db->quoteIdentifier($table, true);
+        $name  = $db->quoteIdentifier($name, true);
+        $trigger_sql = '
+CREATE TRIGGER '.$trigger_name.'
+   BEFORE INSERT
+   ON '.$table.'
+   FOR EACH ROW
+DECLARE
+   last_Sequence NUMBER;
+   last_InsertID NUMBER;
+BEGIN
+   SELECT '.$seq_name_quoted.'.NEXTVAL INTO :NEW.'.$name.' FROM DUAL;
+   IF (:NEW.'.$name.' IS NULL OR :NEW.'.$name.' = 0) THEN
+      SELECT '.$seq_name_quoted.'.NEXTVAL INTO :NEW.'.$name.' FROM DUAL;
+   ELSE
+      SELECT NVL(Last_Number, 0) INTO last_Sequence
+        FROM User_Sequences
+       WHERE UPPER(Sequence_Name) = UPPER(\''.$seq_name.'\');
+      SELECT :NEW.'.$name.' INTO last_InsertID FROM DUAL;
+      WHILE (last_InsertID > last_Sequence) LOOP
+         SELECT '.$seq_name_quoted.'.NEXTVAL INTO last_Sequence FROM DUAL;
+      END LOOP;
+   END IF;
+END;
+';
+        $result = $db->exec($trigger_sql);
+        if (PEAR::isError($result)) {
+            return $result;
+        }
+        return MDB2_OK;
+    }
+
+    // }}}
+    // {{{ _dropAutoincrement()
+
+    /**
+     * drop an existing autoincrement sequence + trigger
+     *
+     * @param string $table name of the table
+     * @return mixed        MDB2_OK on success, a MDB2 error on failure
+     * @access private
+     */
+    function _dropAutoincrement($table)
+    {
+        $db = $this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        $table = strtoupper($table);
+        $trigger_name = $table . '_AI_PK';
+        $trigger_name_quoted = $db->quote($trigger_name, 'text');
+        $query = 'SELECT trigger_name FROM user_triggers';
+        $query.= ' WHERE trigger_name='.$trigger_name_quoted.' OR trigger_name='.strtoupper($trigger_name_quoted);
+        $trigger = $db->queryOne($query);
+        if (PEAR::isError($trigger)) {
+            return $trigger;
+        }
+
+        if ($trigger) {
+            $trigger_name  = $db->quoteIdentifier($table . '_AI_PK', true);
+            $trigger_sql = 'DROP TRIGGER ' . $trigger_name;
+            $result = $db->exec($trigger_sql);
+            if (PEAR::isError($result)) {
+                return $db->raiseError($result, null, null,
+                    'trigger for autoincrement PK could not be dropped', __FUNCTION__);
+            }
+
+            $result = $this->dropSequence($table);
+            if (PEAR::isError($result)) {
+                return $db->raiseError($result, null, null,
+                    'sequence for autoincrement PK could not be dropped', __FUNCTION__);
+            }
+
+            $index_name = $table . '_AI_PK';
+            $idxname_format = $db->getOption('idxname_format');
+            $db->setOption('idxname_format', '%s');
+            $result1 = $this->dropConstraint($table, $index_name);
+            $db->setOption('idxname_format', $idxname_format);
+            $result2 = $this->dropConstraint($table, $index_name);
+            if (PEAR::isError($result1) && PEAR::isError($result2)) {
+                return $db->raiseError($result1, null, null,
+                    'primary key for autoincrement PK could not be dropped', __FUNCTION__);
+            }
+        }
+
+        return MDB2_OK;
+    }
+
+    // }}}
+    // {{{ _getTemporaryTableQuery()
+
+    /**
+     * A method to return the required SQL string that fits between CREATE ... TABLE
+     * to create the table as a temporary table.
+     *
+     * @return string The string required to be placed between "CREATE" and "TABLE"
+     *                to generate a temporary table, if possible.
+     */
+    function _getTemporaryTableQuery()
+    {
+        return 'GLOBAL TEMPORARY';
+    }
+
+    // }}}
+    // {{{ _getAdvancedFKOptions()
+
+    /**
+     * Return the FOREIGN KEY query section dealing with non-standard options
+     * as MATCH, INITIALLY DEFERRED, ON UPDATE, ...
+     *
+     * @param array $definition
+     * @return string
+     * @access protected
+     */
+    function _getAdvancedFKOptions($definition)
+    {
+        $query = '';
+        if (!empty($definition['ondelete']) && (strtoupper($definition['ondelete']) != 'NO ACTION')) {
+            $query .= ' ON DELETE '.$definition['ondelete'];
+        }
+        if (!empty($definition['deferrable'])) {
+            $query .= ' DEFERRABLE';
+        } else {
+            $query .= ' NOT DEFERRABLE';
+        }
+        if (!empty($definition['initiallydeferred'])) {
+            $query .= ' INITIALLY DEFERRED';
+        } else {
+            $query .= ' INITIALLY IMMEDIATE';
+        }
+        return $query;
+    }
+
+    // }}}
+    // {{{ createTable()
+
+    /**
+     * create a new table
+     *
+     * @param string $name     Name of the database that should be created
+     * @param array $fields Associative array that contains the definition of each field of the new table
+     *                        The indexes of the array entries are the names of the fields of the table an
+     *                        the array entry values are associative arrays like those that are meant to be
+     *                         passed with the field definitions to get[Type]Declaration() functions.
+     *
+     *                        Example
+     *                        array(
+     *
+     *                            'id' => array(
+     *                                'type' => 'integer',
+     *                                'unsigned' => 1
+     *                                'notnull' => 1
+     *                                'default' => 0
+     *                            ),
+     *                            'name' => array(
+     *                                'type' => 'text',
+     *                                'length' => 12
+     *                            ),
+     *                            'password' => array(
+     *                                'type' => 'text',
+     *                                'length' => 12
+     *                            )
+     *                        );
+     * @param array $options  An associative array of table options:
+     *                          array(
+     *                              'comment' => 'Foo',
+     *                              'temporary' => true|false,
+     *                          );
+     * @return mixed MDB2_OK on success, a MDB2 error on failure
+     * @access public
+     */
+    function createTable($name, $fields, $options = array())
+    {
+        $db = $this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+        $db->beginNestedTransaction();
+        $result = parent::createTable($name, $fields, $options);
+        if (!PEAR::isError($result)) {
+            foreach ($fields as $field_name => $field) {
+                if (!empty($field['autoincrement'])) {
+                    $result = $this->_makeAutoincrement($field_name, $name);
+                }
+            }
+        }
+        $db->completeNestedTransaction();
+        return $result;
+    }
+
+    // }}}
+    // {{{ dropTable()
+
+    /**
+     * drop an existing table
+     *
+     * @param string $name name of the table that should be dropped
+     * @return mixed MDB2_OK on success, a MDB2 error on failure
+     * @access public
+     */
+    function dropTable($name)
+    {
+        $db = $this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+        $db->beginNestedTransaction();
+        $result = $this->_dropAutoincrement($name);
+        if (!PEAR::isError($result)) {
+            $result = parent::dropTable($name);
+        }
+        $db->completeNestedTransaction();
+        return $result;
+    }
+
+    // }}}
+    // {{{ truncateTable()
+
+    /**
+     * Truncate an existing table (if the TRUNCATE TABLE syntax is not supported,
+     * it falls back to a DELETE FROM TABLE query)
+     *
+     * @param string $name name of the table that should be truncated
+     * @return mixed MDB2_OK on success, a MDB2 error on failure
+     * @access public
+     */
+    function truncateTable($name)
+    {
+        $db = $this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        $name = $db->quoteIdentifier($name, true);
+        return $db->exec("TRUNCATE TABLE $name");
+    }
+
+    // }}}
+    // {{{ vacuum()
+
+    /**
+     * Optimize (vacuum) all the tables in the db (or only the specified table)
+     * and optionally run ANALYZE.
+     *
+     * @param string $table table name (all the tables if empty)
+     * @param array  $options an array with driver-specific options:
+     *               - timeout [int] (in seconds) [mssql-only]
+     *               - analyze [boolean] [pgsql and mysql]
+     *               - full [boolean] [pgsql-only]
+     *               - freeze [boolean] [pgsql-only]
+     *
+     * @return mixed MDB2_OK success, a MDB2 error on failure
+     * @access public
+     */
+    function vacuum($table = null, $options = array())
+    {
+        // not needed in Oracle
+        return MDB2_OK;
+    }
+
+    // }}}
+    // {{{ alterTable()
+
+    /**
+     * alter an existing table
+     *
+     * @param string $name         name of the table that is intended to be changed.
+     * @param array $changes     associative array that contains the details of each type
+     *                             of change that is intended to be performed. The types of
+     *                             changes that are currently supported are defined as follows:
+     *
+     *                             name
+     *
+     *                                New name for the table.
+     *
+     *                            add
+     *
+     *                                Associative array with the names of fields to be added as
+     *                                 indexes of the array. The value of each entry of the array
+     *                                 should be set to another associative array with the properties
+     *                                 of the fields to be added. The properties of the fields should
+     *                                 be the same as defined by the MDB2 parser.
+     *
+     *
+     *                            remove
+     *
+     *                                Associative array with the names of fields to be removed as indexes
+     *                                 of the array. Currently the values assigned to each entry are ignored.
+     *                                 An empty array should be used for future compatibility.
+     *
+     *                            rename
+     *
+     *                                Associative array with the names of fields to be renamed as indexes
+     *                                 of the array. The value of each entry of the array should be set to
+     *                                 another associative array with the entry named name with the new
+     *                                 field name and the entry named Declaration that is expected to contain
+     *                                 the portion of the field declaration already in DBMS specific SQL code
+     *                                 as it is used in the CREATE TABLE statement.
+     *
+     *                            change
+     *
+     *                                Associative array with the names of the fields to be changed as indexes
+     *                                 of the array. Keep in mind that if it is intended to change either the
+     *                                 name of a field and any other properties, the change array entries
+     *                                 should have the new names of the fields as array indexes.
+     *
+     *                                The value of each entry of the array should be set to another associative
+     *                                 array with the properties of the fields to that are meant to be changed as
+     *                                 array entries. These entries should be assigned to the new values of the
+     *                                 respective properties. The properties of the fields should be the same
+     *                                 as defined by the MDB2 parser.
+     *
+     *                            Example
+     *                                array(
+     *                                    'name' => 'userlist',
+     *                                    'add' => array(
+     *                                        'quota' => array(
+     *                                            'type' => 'integer',
+     *                                            'unsigned' => 1
+     *                                        )
+     *                                    ),
+     *                                    'remove' => array(
+     *                                        'file_limit' => array(),
+     *                                        'time_limit' => array()
+     *                                    ),
+     *                                    'change' => array(
+     *                                        'name' => array(
+     *                                            'length' => '20',
+     *                                            'definition' => array(
+     *                                                'type' => 'text',
+     *                                                'length' => 20,
+     *                                            ),
+     *                                        )
+     *                                    ),
+     *                                    'rename' => array(
+     *                                        'sex' => array(
+     *                                            'name' => 'gender',
+     *                                            'definition' => array(
+     *                                                'type' => 'text',
+     *                                                'length' => 1,
+     *                                                'default' => 'M',
+     *                                            ),
+     *                                        )
+     *                                    )
+     *                                )
+     *
+     * @param boolean $check     indicates whether the function should just check if the DBMS driver
+     *                             can perform the requested table alterations if the value is true or
+     *                             actually perform them otherwise.
+     * @access public
+     *
+     * @return mixed MDB2_OK on success, a MDB2 error on failure
+     */
+    function alterTable($name, $changes, $check)
+    {
+        $db = $this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        foreach ($changes as $change_name => $change) {
+            switch ($change_name) {
+            case 'add':
+            case 'remove':
+            case 'change':
+            case 'name':
+            case 'rename':
+                break;
+            default:
+                return $db->raiseError(MDB2_ERROR_CANNOT_ALTER, null, null,
+                    'change type "'.$change_name.'" not yet supported', __FUNCTION__);
+            }
+        }
+
+        if ($check) {
+            return MDB2_OK;
+        }
+
+        $name = $db->quoteIdentifier($name, true);
+
+        if (!empty($changes['add']) && is_array($changes['add'])) {
+            $fields = array();
+            foreach ($changes['add'] as $field_name => $field) {
+                $fields[] = $db->getDeclaration($field['type'], $field_name, $field);
+            }
+            $result = $db->exec("ALTER TABLE $name ADD (". implode(', ', $fields).')');
+            if (PEAR::isError($result)) {
+                return $result;
+            }
+        }
+
+        if (!empty($changes['change']) && is_array($changes['change'])) {
+            $fields = array();
+            foreach ($changes['change'] as $field_name => $field) {
+                //fix error "column to be modified to NOT NULL is already NOT NULL" 
+                if (!array_key_exists('notnull', $field)) {
+                    unset($field['definition']['notnull']);
+                }
+                $fields[] = $db->getDeclaration($field['definition']['type'], $field_name, $field['definition']);
+            }
+            $result = $db->exec("ALTER TABLE $name MODIFY (". implode(', ', $fields).')');
+            if (PEAR::isError($result)) {
+                return $result;
+            }
+        }
+
+        if (!empty($changes['rename']) && is_array($changes['rename'])) {
+            foreach ($changes['rename'] as $field_name => $field) {
+                $field_name = $db->quoteIdentifier($field_name, true);
+                $query = "ALTER TABLE $name RENAME COLUMN $field_name TO ".$db->quoteIdentifier($field['name']);
+                $result = $db->exec($query);
+                if (PEAR::isError($result)) {
+                    return $result;
+                }
+            }
+        }
+
+        if (!empty($changes['remove']) && is_array($changes['remove'])) {
+            $fields = array();
+            foreach ($changes['remove'] as $field_name => $field) {
+                $fields[] = $db->quoteIdentifier($field_name, true);
+            }
+            $result = $db->exec("ALTER TABLE $name DROP COLUMN ". implode(', ', $fields));
+            if (PEAR::isError($result)) {
+                return $result;
+            }
+        }
+
+        if (!empty($changes['name'])) {
+            $change_name = $db->quoteIdentifier($changes['name'], true);
+            $result = $db->exec("ALTER TABLE $name RENAME TO ".$change_name);
+            if (PEAR::isError($result)) {
+                return $result;
+            }
+        }
+
+        return MDB2_OK;
+    }
+
+    // }}}
+    // {{{ _fetchCol()
+
+    /**
+     * Utility method to fetch and format a column from a resultset
+     *
+     * @param resource $result
+     * @param boolean $fixname (used when listing indices or constraints)
+     * @return mixed array of names on success, a MDB2 error on failure
+     * @access private
+     */
+    function _fetchCol($result, $fixname = false)
+    {
+        if (PEAR::isError($result)) {
+            return $result;
+        }
+        $col = $result->fetchCol();
+        if (PEAR::isError($col)) {
+            return $col;
+        }
+        $result->free();
+        
+        $db = $this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+        
+        if ($fixname) {
+            foreach ($col as $k => $v) {
+                $col[$k] = $this->_fixIndexName($v);
+            }
+        }
+        
+        if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE
+            && $db->options['field_case'] == CASE_LOWER
+        ) {
+            $col = array_map(($db->options['field_case'] == CASE_LOWER ? 'strtolower' : 'strtoupper'), $col);
+        }
+        return $col;
+    }
+
+    // }}}
+    // {{{ listDatabases()
+
+    /**
+     * list all databases
+     *
+     * @return mixed array of database names on success, a MDB2 error on failure
+     * @access public
+     */
+    function listDatabases()
+    {
+        $db = $this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        if (!$db->options['emulate_database']) {
+            return $db->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
+                'database listing is only supported if the "emulate_database" option is enabled', __FUNCTION__);
+        }
+
+        if ($db->options['database_name_prefix']) {
+            $query = 'SELECT SUBSTR(username, ';
+            $query.= (strlen($db->options['database_name_prefix'])+1);
+            $query.= ") FROM sys.dba_users WHERE username LIKE '";
+            $query.= $db->options['database_name_prefix']."%'";
+        } else {
+            $query = 'SELECT username FROM sys.dba_users';
+        }
+        $result = $db->standaloneQuery($query, array('text'), false);
+        return $this->_fetchCol($result);
+    }
+
+    // }}}
+    // {{{ listUsers()
+
+    /**
+     * list all users
+     *
+     * @return mixed array of user names on success, a MDB2 error on failure
+     * @access public
+     */
+    function listUsers()
+    {
+        $db = $this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        if ($db->options['emulate_database'] && $db->options['database_name_prefix']) {
+            $query = 'SELECT SUBSTR(username, ';
+            $query.= (strlen($db->options['database_name_prefix'])+1);
+            $query.= ") FROM sys.dba_users WHERE username NOT LIKE '";
+            $query.= $db->options['database_name_prefix']."%'";
+        } else {
+            $query = 'SELECT username FROM sys.dba_users';
+        }
+        return $db->queryCol($query);
+    }
+
+    // }}}
+    // {{{ listViews()
+
+    /**
+     * list all views in the current database
+     *
+     * @param string owner, the current is default
+     * @return mixed array of view names on success, a MDB2 error on failure
+     * @access public
+     */
+    function listViews($owner = null)
+    {
+        $db = $this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+        
+        if (empty($owner)) {
+            $owner = $db->dsn['username'];
+        }
+
+        $query = 'SELECT view_name
+                    FROM sys.all_views
+                   WHERE owner=? OR owner=?';
+        $stmt = $db->prepare($query);
+        if (PEAR::isError($stmt)) {
+            return $stmt;
+        }
+        $result = $stmt->execute(array($owner, strtoupper($owner)));
+        return $this->_fetchCol($result);
+    }
+
+    // }}}
+    // {{{ listFunctions()
+
+    /**
+     * list all functions in the current database
+     *
+     * @param string owner, the current is default
+     * @return mixed array of function names on success, a MDB2 error on failure
+     * @access public
+     */
+    function listFunctions($owner = null)
+    {
+        $db = $this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        if (empty($owner)) {
+            $owner = $db->dsn['username'];
+        }
+
+        $query = "SELECT name
+                    FROM sys.all_source
+                   WHERE line = 1
+                     AND type = 'FUNCTION'
+                     AND (owner=? OR owner=?)";
+        $stmt = $db->prepare($query);
+        if (PEAR::isError($stmt)) {
+            return $stmt;
+        }
+        $result = $stmt->execute(array($owner, strtoupper($owner)));
+        return $this->_fetchCol($result);
+    }
+
+    // }}}
+    // {{{ listTableTriggers()
+
+    /**
+     * list all triggers in the database that reference a given table
+     *
+     * @param string table for which all referenced triggers should be found
+     * @return mixed array of trigger names on success, a MDB2 error on failure
+     * @access public
+     */
+    function listTableTriggers($table = null)
+    {
+        $db = $this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        if (empty($owner)) {
+            $owner = $db->dsn['username'];
+        }
+
+        $query = "SELECT trigger_name
+                    FROM sys.all_triggers
+                   WHERE (table_name=? OR table_name=?)
+                     AND (owner=? OR owner=?)";
+        $stmt = $db->prepare($query);
+        if (PEAR::isError($stmt)) {
+            return $stmt;
+        }
+        $args = array(
+            $table,
+            strtoupper($table),
+            $owner,
+            strtoupper($owner),
+        );
+        $result = $stmt->execute($args);
+        return $this->_fetchCol($result);
+    }
+
+    // }}}
+    // {{{ listTables()
+
+    /**
+     * list all tables in the database
+     *
+     * @param string owner, the current is default
+     * @return mixed array of table names on success, a MDB2 error on failure
+     * @access public
+     */
+    function listTables($owner = null)
+    {
+        $db = $this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+        
+        if (empty($owner)) {
+            $owner = $db->dsn['username'];
+        }
+
+        $query = 'SELECT table_name
+                    FROM sys.all_tables
+                   WHERE owner=? OR owner=?';
+        $stmt = $db->prepare($query);
+        if (PEAR::isError($stmt)) {
+            return $stmt;
+        }
+        $result = $stmt->execute(array($owner, strtoupper($owner)));
+        return $this->_fetchCol($result);
+    }
+
+    // }}}
+    // {{{ listTableFields()
+
+    /**
+     * list all fields in a table in the current database
+     *
+     * @param string $table name of table that should be used in method
+     * @return mixed array of field names on success, a MDB2 error on failure
+     * @access public
+     */
+    function listTableFields($table)
+    {
+        $db = $this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+        
+        list($owner, $table) = $this->splitTableSchema($table);
+        if (empty($owner)) {
+            $owner = $db->dsn['username'];
+        }
+
+        $query = 'SELECT column_name
+                    FROM all_tab_columns
+                   WHERE (table_name=? OR table_name=?)
+                     AND (owner=? OR owner=?)
+                ORDER BY column_id';
+        $stmt = $db->prepare($query);
+        if (PEAR::isError($stmt)) {
+            return $stmt;
+        }
+        $args = array(
+            $table,
+            strtoupper($table),
+            $owner,
+            strtoupper($owner),
+        );
+        $result = $stmt->execute($args);
+        return $this->_fetchCol($result);
+    }
+
+    // }}}
+    // {{{ listTableIndexes()
+
+    /**
+     * list all indexes in a table
+     *
+     * @param string $table name of table that should be used in method
+     * @return mixed array of index names on success, a MDB2 error on failure
+     * @access public
+     */
+    function listTableIndexes($table)
+    {
+        $db = $this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+        
+        list($owner, $table) = $this->splitTableSchema($table);
+        if (empty($owner)) {
+            $owner = $db->dsn['username'];
+        }
+        
+        $query = 'SELECT i.index_name name
+                    FROM all_indexes i
+               LEFT JOIN all_constraints c
+                      ON c.index_name = i.index_name
+                     AND c.owner = i.owner
+                     AND c.table_name = i.table_name
+                   WHERE (i.table_name=? OR i.table_name=?)
+                     AND (i.owner=? OR i.owner=?)
+                     AND c.index_name IS NULL
+                     AND i.generated=' .$db->quote('N', 'text');
+        $stmt = $db->prepare($query);
+        if (PEAR::isError($stmt)) {
+            return $stmt;
+        }
+        $args = array(
+            $table,
+            strtoupper($table),
+            $owner,
+            strtoupper($owner),
+        );
+        $result = $stmt->execute($args);
+        return $this->_fetchCol($result, true);
+    }
+
+    // }}}
+    // {{{ createConstraint()
+
+    /**
+     * create a constraint on a table
+     *
+     * @param string    $table        name of the table on which the constraint is to be created
+     * @param string    $name         name of the constraint to be created
+     * @param array     $definition   associative array that defines properties of the constraint to be created.
+     *                                Currently, only one property named FIELDS is supported. This property
+     *                                is also an associative with the names of the constraint fields as array
+     *                                constraints. Each entry of this array is set to another type of associative
+     *                                array that specifies properties of the constraint that are specific to
+     *                                each field.
+     *
+     *                                Example
+     *                                   array(
+     *                                       'fields' => array(
+     *                                           'user_name' => array(),
+     *                                           'last_login' => array()
+     *                                       )
+     *                                   )
+     * @return mixed MDB2_OK on success, a MDB2 error on failure
+     * @access public
+     */
+    function createConstraint($table, $name, $definition)
+    {
+        $result = parent::createConstraint($table, $name, $definition);
+        if (PEAR::isError($result)) {
+            return $result;
+        }
+        if (!empty($definition['foreign'])) {
+            return $this->_createFKTriggers($table, array($name => $definition));
+        }
+        return MDB2_OK;
+    }
+
+    // }}}
+    // {{{ dropConstraint()
+
+    /**
+     * drop existing constraint
+     *
+     * @param string    $table        name of table that should be used in method
+     * @param string    $name         name of the constraint to be dropped
+     * @param string    $primary      hint if the constraint is primary
+     * @return mixed MDB2_OK on success, a MDB2 error on failure
+     * @access public
+     */
+    function dropConstraint($table, $name, $primary = false)
+    {
+        $db = $this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        //is it a FK constraint? If so, also delete the associated triggers
+        $db->loadModule('Reverse', null, true);
+        $definition = $db->reverse->getTableConstraintDefinition($table, $name);
+        if (!PEAR::isError($definition) && !empty($definition['foreign'])) {
+            //first drop the FK enforcing triggers
+            $result = $this->_dropFKTriggers($table, $name, $definition['references']['table']);
+            if (PEAR::isError($result)) {
+                return $result;
+            }
+        }
+
+        return parent::dropConstraint($table, $name, $primary);
+    }
+
+    // }}}
+    // {{{ _createFKTriggers()
+
+    /**
+     * Create triggers to enforce the FOREIGN KEY constraint on the table
+     *
+     * @param string $table        table name
+     * @param array  $foreign_keys FOREIGN KEY definitions
+     *
+     * @return mixed MDB2_OK on success, a MDB2 error on failure
+     * @access private
+     */
+    function _createFKTriggers($table, $foreign_keys)
+    {
+        $db = $this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+        // create triggers to enforce FOREIGN KEY constraints
+        if ($db->supports('triggers') && !empty($foreign_keys)) {
+            $table = $db->quoteIdentifier($table, true);
+            foreach ($foreign_keys as $fkname => $fkdef) {
+                if (empty($fkdef)) {
+                    continue;
+                }
+                $fkdef['onupdate'] = empty($fkdef['onupdate']) ? $db->options['default_fk_action_onupdate'] : strtoupper($fkdef['onupdate']);
+                if ('RESTRICT' == $fkdef['onupdate'] || 'NO ACTION' == $fkdef['onupdate']) {
+                    // already handled by default
+                    continue;
+                }
+
+                $trigger_name = substr(strtolower($fkname.'_pk_upd_trg'), 0, $db->options['max_identifiers_length']);
+                $table_fields = array_keys($fkdef['fields']);
+                $referenced_fields = array_keys($fkdef['references']['fields']);
+
+                //create the ON UPDATE trigger on the primary table
+                $restrict_action = ' IF (SELECT ';
+                $aliased_fields = array();
+                foreach ($table_fields as $field) {
+                    $aliased_fields[] = $table .'.'.$field .' AS '.$field;
+                }
+                $restrict_action .= implode(',', $aliased_fields)
+                       .' FROM '.$table
+                       .' WHERE ';
+                $conditions  = array();
+                $new_values  = array();
+                $null_values = array();
+                for ($i=0; $i<count($table_fields); $i++) {
+                    $conditions[]  = $table_fields[$i] .' = :OLD.'.$referenced_fields[$i];
+                    $new_values[]  = $table_fields[$i] .' = :NEW.'.$referenced_fields[$i];
+                    $null_values[] = $table_fields[$i] .' = NULL';
+                }
+
+                $cascade_action = 'UPDATE '.$table.' SET '.implode(', ', $new_values) .' WHERE '.implode(' AND ', $conditions). ';';
+                $setnull_action = 'UPDATE '.$table.' SET '.implode(', ', $null_values).' WHERE '.implode(' AND ', $conditions). ';';
+
+                if ('SET DEFAULT' == $fkdef['onupdate'] || 'SET DEFAULT' == $fkdef['ondelete']) {
+                    $db->loadModule('Reverse', null, true);
+                    $default_values = array();
+                    foreach ($table_fields as $table_field) {
+                        $field_definition = $db->reverse->getTableFieldDefinition($table, $field);
+                        if (PEAR::isError($field_definition)) {
+                            return $field_definition;
+                        }
+                        $default_values[] = $table_field .' = '. $field_definition[0]['default'];
+                    }
+                    $setdefault_action = 'UPDATE '.$table.' SET '.implode(', ', $default_values).' WHERE '.implode(' AND ', $conditions). ';';
+                }
+
+                $query = 'CREATE TRIGGER %s'
+                        .' %s ON '.$fkdef['references']['table']
+                        .' FOR EACH ROW '
+                        .' BEGIN ';
+
+                if ('CASCADE' == $fkdef['onupdate']) {
+                    $sql_update = sprintf($query, $trigger_name, 'BEFORE UPDATE',  'update') . $cascade_action;
+                } elseif ('SET NULL' == $fkdef['onupdate']) {
+                    $sql_update = sprintf($query, $trigger_name, 'BEFORE UPDATE', 'update') . $setnull_action;
+                } elseif ('SET DEFAULT' == $fkdef['onupdate']) {
+                    $sql_update = sprintf($query, $trigger_name, 'BEFORE UPDATE', 'update') . $setdefault_action;
+                }
+                $sql_update .= ' END;';
+                $result = $db->exec($sql_update);
+                if (PEAR::isError($result)) {
+                    if ($result->getCode() === MDB2_ERROR_ALREADY_EXISTS) {
+                        return MDB2_OK;
+                    }
+                    return $result;
+                }
+            }
+        }
+        return MDB2_OK;
+    }
+
+    // }}}
+    // {{{ _dropFKTriggers()
+
+    /**
+     * Drop the triggers created to enforce the FOREIGN KEY constraint on the table
+     *
+     * @param string $table            table name
+     * @param string $fkname           FOREIGN KEY constraint name
+     * @param string $referenced_table referenced table name
+     *
+     * @return mixed MDB2_OK on success, a MDB2 error on failure
+     * @access private
+     */
+    function _dropFKTriggers($table, $fkname, $referenced_table)
+    {
+        $db = $this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        $triggers  = $this->listTableTriggers($table);
+        $triggers2 = $this->listTableTriggers($referenced_table);
+        if (!PEAR::isError($triggers2) && !PEAR::isError($triggers)) {
+            $triggers = array_merge($triggers, $triggers2);
+            $trigger_name = substr(strtolower($fkname.'_pk_upd_trg'), 0, $db->options['max_identifiers_length']);
+            $pattern = '/^'.$trigger_name.'$/i';
+            foreach ($triggers as $trigger) {
+                if (preg_match($pattern, $trigger)) {
+                    $result = $db->exec('DROP TRIGGER '.$trigger);
+                    if (PEAR::isError($result)) {
+                        return $result;
+                    }
+                }
+            }
+        }
+        return MDB2_OK;
+    }
+
+    // }}}
+    // {{{ listTableConstraints()
+
+    /**
+     * list all constraints in a table
+     *
+     * @param string $table name of table that should be used in method
+     * @return mixed array of constraint names on success, a MDB2 error on failure
+     * @access public
+     */
+    function listTableConstraints($table)
+    {
+        $db = $this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        list($owner, $table) = $this->splitTableSchema($table);
+        if (empty($owner)) {
+            $owner = $db->dsn['username'];
+        }
+
+        $query = 'SELECT constraint_name
+                    FROM all_constraints
+                   WHERE (table_name=? OR table_name=?)
+                     AND (owner=? OR owner=?)';
+        $stmt = $db->prepare($query);
+        if (PEAR::isError($stmt)) {
+            return $stmt;
+        }
+        $args = array(
+            $table,
+            strtoupper($table),
+            $owner,
+            strtoupper($owner),
+        );
+        $result = $stmt->execute($args);
+        return $this->_fetchCol($result, true);
+    }
+
+    // }}}
+    // {{{ createSequence()
+
+    /**
+     * create sequence
+     *
+     * @param object $db database object that is extended by this class
+     * @param string $seq_name name of the sequence to be created
+     * @param string $start start value of the sequence; default is 1
+     * @return mixed MDB2_OK on success, a MDB2 error on failure
+     * @access public
+     */
+    function createSequence($seq_name, $start = 1)
+    {
+        $db = $this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        $sequence_name = $db->quoteIdentifier($db->getSequenceName($seq_name), true);
+        $query = "CREATE SEQUENCE $sequence_name START WITH $start INCREMENT BY 1 NOCACHE";
+        $query.= ($start < 1 ? " MINVALUE $start" : '');
+        return $db->exec($query);
+    }
+
+    // }}}
+    // {{{ dropSequence()
+
+    /**
+     * drop existing sequence
+     *
+     * @param object $db database object that is extended by this class
+     * @param string $seq_name name of the sequence to be dropped
+     * @return mixed MDB2_OK on success, a MDB2 error on failure
+     * @access public
+     */
+    function dropSequence($seq_name)
+    {
+        $db = $this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        $sequence_name = $db->quoteIdentifier($db->getSequenceName($seq_name), true);
+        return $db->exec("DROP SEQUENCE $sequence_name");
+    }
+
+    // }}}
+    // {{{ listSequences()
+
+    /**
+     * list all sequences in the current database
+     *
+     * @param string owner, the current is default
+     * @return mixed array of sequence names on success, a MDB2 error on failure
+     * @access public
+     */
+    function listSequences($owner = null)
+    {
+        $db = $this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        if (empty($owner)) {
+            $owner = $db->dsn['username'];
+        }
+
+        $query = 'SELECT sequence_name
+                    FROM sys.all_sequences
+                   WHERE (sequence_owner=? OR sequence_owner=?)';
+        $stmt = $db->prepare($query);
+        if (PEAR::isError($stmt)) {
+            return $stmt;
+        }
+        $result = $stmt->execute(array($owner, strtoupper($owner)));
+        if (PEAR::isError($result)) {
+            return $result;
+        }
+        $col = $result->fetchCol();
+        if (PEAR::isError($col)) {
+            return $col;
+        }
+        $result->free();
+        
+        foreach ($col as $k => $v) {
+            $col[$k] = $this->_fixSequenceName($v);
+        }
+
+        if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE
+            && $db->options['field_case'] == CASE_LOWER
+        ) {
+            $col = array_map(($db->options['field_case'] == CASE_LOWER ? 'strtolower' : 'strtoupper'), $col);
+        }
+        return $col;
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/MDB2/Driver/Native/oci8.php b/3rdparty/MDB2/Driver/Native/oci8.php
new file mode 100644
index 0000000000..d198f9687a
--- /dev/null
+++ b/3rdparty/MDB2/Driver/Native/oci8.php
@@ -0,0 +1,60 @@
+<?php
+// +----------------------------------------------------------------------+
+// | PHP versions 4 and 5                                                 |
+// +----------------------------------------------------------------------+
+// | Copyright (c) 1998-2006 Manuel Lemos, Tomas V.V.Cox,                 |
+// | Stig. S. Bakken, Lukas Smith, Frank M. Kromann                       |
+// | All rights reserved.                                                 |
+// +----------------------------------------------------------------------+
+// | MDB2 is a merge of PEAR DB and Metabases that provides a unified DB  |
+// | API as well as database abstraction for PHP applications.            |
+// | This LICENSE is in the BSD license style.                            |
+// |                                                                      |
+// | 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 Manuel Lemos, Tomas V.V.Cox, Stig. S. Bakken,    |
+// | Lukas Smith nor the names of his 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      |
+// | REGENTS 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.                                          |
+// +----------------------------------------------------------------------+
+// | Author: Lukas Smith <smith@pooteeweet.org>                           |
+// +----------------------------------------------------------------------+
+//
+// $Id: oci8.php 215004 2006-06-18 21:59:05Z lsmith $
+//
+
+require_once 'MDB2/Driver/Native/Common.php';
+
+/**
+ * MDB2 Oracle driver for the native module
+ *
+ * @package MDB2
+ * @category Database
+ * @author  Lukas Smith <smith@dybnet.de>
+ */
+class MDB2_Driver_Native_oci8 extends MDB2_Driver_Native_Common
+{
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/MDB2/Driver/Reverse/oci8.php b/3rdparty/MDB2/Driver/Reverse/oci8.php
new file mode 100644
index 0000000000..c86847fa6b
--- /dev/null
+++ b/3rdparty/MDB2/Driver/Reverse/oci8.php
@@ -0,0 +1,621 @@
+<?php
+// +----------------------------------------------------------------------+
+// | PHP versions 4 and 5                                                 |
+// +----------------------------------------------------------------------+
+// | Copyright (c) 1998-2007 Manuel Lemos, Tomas V.V.Cox,                 |
+// | Stig. S. Bakken, Lukas Smith, Frank M. Kromann, Lorenzo Alberton     |
+// | All rights reserved.                                                 |
+// +----------------------------------------------------------------------+
+// | MDB2 is a merge of PEAR DB and Metabases that provides a unified DB  |
+// | API as well as database abstraction for PHP applications.            |
+// | This LICENSE is in the BSD license style.                            |
+// |                                                                      |
+// | 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 Manuel Lemos, Tomas V.V.Cox, Stig. S. Bakken,    |
+// | Lukas Smith nor the names of his 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      |
+// | REGENTS 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.                                          |
+// +----------------------------------------------------------------------+
+// | Authors: Lukas Smith <smith@pooteeweet.org>                          |
+// |          Lorenzo Alberton <l.alberton@quipo.it>                      |
+// +----------------------------------------------------------------------+
+//
+// $Id: oci8.php 295587 2010-02-28 17:16:38Z quipo $
+//
+
+require_once 'MDB2/Driver/Reverse/Common.php';
+
+/**
+ * MDB2 Oracle driver for the schema reverse engineering module
+ *
+ * @package MDB2
+ * @category Database
+ * @author  Lukas Smith <smith@dybnet.de>
+ */
+class MDB2_Driver_Reverse_oci8 extends MDB2_Driver_Reverse_Common
+{
+    // {{{ getTableFieldDefinition()
+
+    /**
+     * Get the structure of a field into an array
+     *
+     * @param string $table_name name of table that should be used in method
+     * @param string $field_name name of field that should be used in method
+     * @return mixed data array on success, a MDB2 error on failure
+     * @access public
+     */
+    function getTableFieldDefinition($table_name, $field_name)
+    {
+        $db = $this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        $result = $db->loadModule('Datatype', null, true);
+        if (PEAR::isError($result)) {
+            return $result;
+        }
+
+        list($owner, $table) = $this->splitTableSchema($table_name);
+        if (empty($owner)) {
+            $owner = $db->dsn['username'];
+        }
+
+        $query = 'SELECT column_name name,
+                         data_type "type",
+                         nullable,
+                         data_default "default",
+                         COALESCE(data_precision, data_length) "length",
+                         data_scale "scale"
+                    FROM all_tab_columns
+                   WHERE (table_name=? OR table_name=?)
+                     AND (owner=? OR owner=?)
+                     AND (column_name=? OR column_name=?)
+                ORDER BY column_id';
+        $stmt = $db->prepare($query);
+        if (PEAR::isError($stmt)) {
+            return $stmt;
+        }
+        $args = array(
+            $table,
+            strtoupper($table),
+            $owner,
+            strtoupper($owner),
+            $field_name,
+            strtoupper($field_name)
+        );
+        $result = $stmt->execute($args);
+        if (PEAR::isError($result)) {
+            return $result;
+        }
+        $column = $result->fetchRow(MDB2_FETCHMODE_ASSOC);
+        if (PEAR::isError($column)) {
+            return $column;
+        }
+        $stmt->free();
+        $result->free();
+
+        if (empty($column)) {
+            return $db->raiseError(MDB2_ERROR_NOT_FOUND, null, null,
+                $field_name . ' is not a column in table ' . $table_name, __FUNCTION__);
+        }
+
+        $column = array_change_key_case($column, CASE_LOWER);
+        if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
+            if ($db->options['field_case'] == CASE_LOWER) {
+                $column['name'] = strtolower($column['name']);
+            } else {
+                $column['name'] = strtoupper($column['name']);
+            }
+        }
+        $mapped_datatype = $db->datatype->mapNativeDatatype($column);
+        if (PEAR::isError($mapped_datatype)) {
+            return $mapped_datatype;
+        }
+        list($types, $length, $unsigned, $fixed) = $mapped_datatype;
+        $notnull = false;
+        if (!empty($column['nullable']) && $column['nullable'] == 'N') {
+            $notnull = true;
+        }
+        $default = false;
+        if (array_key_exists('default', $column)) {
+            $default = $column['default'];
+            if ($default === 'NULL') {
+                $default = null;
+            }
+            if ((null === $default) && $notnull) {
+                $default = '';
+            }
+        }
+
+        $definition[0] = array('notnull' => $notnull, 'nativetype' => $column['type']);
+        if (null !== $length) {
+            $definition[0]['length'] = $length;
+        }
+        if (null !== $unsigned) {
+            $definition[0]['unsigned'] = $unsigned;
+        }
+        if (null !== $fixed) {
+            $definition[0]['fixed'] = $fixed;
+        }
+        if ($default !== false) {
+            $definition[0]['default'] = $default;
+        }
+        foreach ($types as $key => $type) {
+            $definition[$key] = $definition[0];
+            if ($type == 'clob' || $type == 'blob') {
+                unset($definition[$key]['default']);
+            }
+            $definition[$key]['type'] = $type;
+            $definition[$key]['mdb2type'] = $type;
+        }
+        if ($type == 'integer') {
+            $query= "SELECT trigger_body
+                       FROM all_triggers
+                      WHERE table_name=?
+                        AND triggering_event='INSERT'
+                        AND trigger_type='BEFORE EACH ROW'";
+			// ^^ pretty reasonable mimic for "auto_increment" in oracle?
+			$stmt = $db->prepare($query);
+            if (PEAR::isError($stmt)) {
+                return $stmt;
+            }
+			$result = $stmt->execute(strtoupper($table));
+	        if (PEAR::isError($result)) {
+	            return $result;
+	        }
+	        while ($triggerstr = $result->fetchOne()) {
+	           	if (preg_match('/.*SELECT\W+(.+)\.nextval +into +\:NEW\.'.$field_name.' +FROM +dual/im', $triggerstr, $matches)) {
+					$definition[0]['autoincrement'] = $matches[1];
+                }
+            }
+	        $stmt->free();
+	        $result->free();
+        }
+        return $definition;
+    }
+
+    // }}}
+    // {{{ getTableIndexDefinition()
+
+    /**
+     * Get the structure of an index into an array
+     *
+     * @param string $table_name name of table that should be used in method
+     * @param string $index_name name of index that should be used in method
+     * @return mixed data array on success, a MDB2 error on failure
+     * @access public
+     */
+    function getTableIndexDefinition($table_name, $index_name)
+    {
+        $db = $this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+        
+        list($owner, $table) = $this->splitTableSchema($table_name);
+        if (empty($owner)) {
+            $owner = $db->dsn['username'];
+        }
+
+        $query = "SELECT aic.column_name,
+                         aic.column_position,
+                         aic.descend,
+                         aic.table_owner,
+                         alc.constraint_type
+                    FROM all_ind_columns aic
+               LEFT JOIN all_constraints alc
+                      ON aic.index_name = alc.constraint_name
+                     AND aic.table_name = alc.table_name
+                     AND aic.table_owner = alc.owner
+                   WHERE (aic.table_name=? OR aic.table_name=?)
+                     AND (aic.index_name=? OR aic.index_name=?)
+                     AND (aic.table_owner=? OR aic.table_owner=?)
+                ORDER BY column_position";
+        $stmt = $db->prepare($query);
+        if (PEAR::isError($stmt)) {
+            return $stmt;
+        }
+        $indexnames = array_unique(array($db->getIndexName($index_name), $index_name));
+        $i = 0;
+        $row = null;
+        while ((null === $row) && array_key_exists($i, $indexnames)) {
+            $args = array(
+                $table,
+                strtoupper($table),
+                $indexnames[$i],
+                strtoupper($indexnames[$i]),
+                $owner,
+                strtoupper($owner)
+            );
+        	$result = $stmt->execute($args);
+        	if (PEAR::isError($result)) {
+                return $result;
+            }
+        	$row = $result->fetchRow(MDB2_FETCHMODE_ASSOC);
+        	if (PEAR::isError($row)) {
+                return $row;
+            }
+        	$i++;
+        }
+        if (null === $row) {
+            return $db->raiseError(MDB2_ERROR_NOT_FOUND, null, null,
+                $index_name. ' is not an index on table '. $table_name, __FUNCTION__);
+        }
+        if ($row['constraint_type'] == 'U' || $row['constraint_type'] == 'P') {
+            return $db->raiseError(MDB2_ERROR_NOT_FOUND, null, null,
+                $index_name. ' is a constraint, not an index on table '. $table_name, __FUNCTION__);
+        }
+
+        $definition = array();
+        while (null !== $row) {
+            $row = array_change_key_case($row, CASE_LOWER);
+            $column_name = $row['column_name'];
+            if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
+                if ($db->options['field_case'] == CASE_LOWER) {
+                    $column_name = strtolower($column_name);
+                } else {
+                    $column_name = strtoupper($column_name);
+                }
+            }
+            $definition['fields'][$column_name] = array(
+                'position' => (int)$row['column_position'],
+            );
+            if (!empty($row['descend'])) {
+                $definition['fields'][$column_name]['sorting'] =
+                    ($row['descend'] == 'ASC' ? 'ascending' : 'descending');
+            }
+            $row = $result->fetchRow(MDB2_FETCHMODE_ASSOC);
+        }
+        $result->free();
+        if (empty($definition['fields'])) {
+            return $db->raiseError(MDB2_ERROR_NOT_FOUND, null, null,
+                $index_name. ' is not an index on table '. $table_name, __FUNCTION__);
+        }
+        return $definition;
+    }
+
+    // }}}
+    // {{{ getTableConstraintDefinition()
+
+    /**
+     * Get the structure of a constraint into an array
+     *
+     * @param string $table_name      name of table that should be used in method
+     * @param string $constraint_name name of constraint that should be used in method
+     * @return mixed data array on success, a MDB2 error on failure
+     * @access public
+     */
+    function getTableConstraintDefinition($table_name, $constraint_name)
+    {
+        $db = $this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+        
+        list($owner, $table) = $this->splitTableSchema($table_name);
+        if (empty($owner)) {
+            $owner = $db->dsn['username'];
+        }
+        
+        $query = 'SELECT alc.constraint_name,
+                         CASE alc.constraint_type WHEN \'P\' THEN 1 ELSE 0 END "primary",
+                         CASE alc.constraint_type WHEN \'R\' THEN 1 ELSE 0 END "foreign",
+                         CASE alc.constraint_type WHEN \'U\' THEN 1 ELSE 0 END "unique",
+                         CASE alc.constraint_type WHEN \'C\' THEN 1 ELSE 0 END "check",
+                         alc.DELETE_RULE "ondelete",
+                         \'NO ACTION\' "onupdate",
+                         \'SIMPLE\' "match",
+                         CASE alc.deferrable WHEN \'NOT DEFERRABLE\' THEN 0 ELSE 1 END "deferrable",
+                         CASE alc.deferred WHEN \'IMMEDIATE\' THEN 0 ELSE 1 END "initiallydeferred",
+                         alc.search_condition,
+                         alc.table_name,
+                         cols.column_name,
+                         cols.position,
+                         r_alc.table_name "references_table",
+                         r_cols.column_name "references_field",
+                         r_cols.position "references_field_position"
+                    FROM all_cons_columns cols
+               LEFT JOIN all_constraints alc
+                      ON alc.constraint_name = cols.constraint_name
+                     AND alc.owner = cols.owner
+               LEFT JOIN all_constraints r_alc
+                      ON alc.r_constraint_name = r_alc.constraint_name
+                     AND alc.r_owner = r_alc.owner
+               LEFT JOIN all_cons_columns r_cols
+                      ON r_alc.constraint_name = r_cols.constraint_name
+                     AND r_alc.owner = r_cols.owner
+                     AND cols.position = r_cols.position
+                   WHERE (alc.constraint_name=? OR alc.constraint_name=?)
+                     AND alc.constraint_name = cols.constraint_name
+                     AND (alc.owner=? OR alc.owner=?)';
+        $tablenames = array();
+        if (!empty($table)) {
+            $query.= ' AND (alc.table_name=? OR alc.table_name=?)';
+            $tablenames = array($table, strtoupper($table));
+        }
+        $stmt = $db->prepare($query);
+        if (PEAR::isError($stmt)) {
+            return $stmt;
+        }
+        
+        $constraintnames = array_unique(array($db->getIndexName($constraint_name), $constraint_name));
+        $c = 0;
+        $row = null;
+        while ((null === $row) && array_key_exists($c, $constraintnames)) {
+            $args = array(
+                $constraintnames[$c],
+                strtoupper($constraintnames[$c]),
+                $owner,
+                strtoupper($owner)
+            );
+            if (!empty($table)) {
+                $args = array_merge($args, $tablenames);
+            }
+            $result = $stmt->execute($args);
+            if (PEAR::isError($result)) {
+                return $result;
+            }
+            $row = $result->fetchRow(MDB2_FETCHMODE_ASSOC);
+            if (PEAR::isError($row)) {
+                return $row;
+            }
+            $c++;
+        }
+
+        $definition = array(
+            'primary' => (boolean)$row['primary'],
+            'unique'  => (boolean)$row['unique'],
+            'foreign' => (boolean)$row['foreign'],
+            'check'   => (boolean)$row['check'],
+            'deferrable' => (boolean)$row['deferrable'],
+            'initiallydeferred' => (boolean)$row['initiallydeferred'],
+            'ondelete' => $row['ondelete'],
+            'onupdate' => $row['onupdate'],
+            'match'    => $row['match'],
+        );
+
+        if ($definition['check']) {
+            // pattern match constraint for check constraint values into enum-style output:
+			$enumregex = '/'.$row['column_name'].' in \((.+?)\)/i';
+			if (preg_match($enumregex, $row['search_condition'], $rangestr)) {
+				$definition['fields'][$column_name] = array();
+				$allowed = explode(',', $rangestr[1]);
+				foreach ($allowed as $val) {
+					$val = trim($val);
+					$val = preg_replace('/^\'/', '', $val);
+					$val = preg_replace('/\'$/', '', $val);
+					array_push($definition['fields'][$column_name], $val);
+				}
+			}
+		}
+        
+        while (null !== $row) {
+            $row = array_change_key_case($row, CASE_LOWER);
+            $column_name = $row['column_name'];
+            if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
+                if ($db->options['field_case'] == CASE_LOWER) {
+                    $column_name = strtolower($column_name);
+                } else {
+                    $column_name = strtoupper($column_name);
+                }
+            }
+            $definition['fields'][$column_name] = array(
+                'position' => (int)$row['position']
+            );
+            if ($row['foreign']) {
+                $ref_column_name = $row['references_field'];
+                $ref_table_name  = $row['references_table'];
+                if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
+                    if ($db->options['field_case'] == CASE_LOWER) {
+                        $ref_column_name = strtolower($ref_column_name);
+                        $ref_table_name  = strtolower($ref_table_name);
+                    } else {
+                        $ref_column_name = strtoupper($ref_column_name);
+                        $ref_table_name  = strtoupper($ref_table_name);
+                    }
+                }
+                $definition['references']['table'] = $ref_table_name;
+                $definition['references']['fields'][$ref_column_name] = array(
+                    'position' => (int)$row['references_field_position']
+                );
+            }
+            $lastrow = $row;
+            $row = $result->fetchRow(MDB2_FETCHMODE_ASSOC);
+        }
+        $result->free();
+        if (empty($definition['fields'])) {
+            return $db->raiseError(MDB2_ERROR_NOT_FOUND, null, null,
+                $constraint_name . ' is not a constraint on table '. $table_name, __FUNCTION__);
+        }
+
+        return $definition;
+    }
+
+    // }}}
+    // {{{ getSequenceDefinition()
+
+    /**
+     * Get the structure of a sequence into an array
+     *
+     * @param string    $sequence   name of sequence that should be used in method
+     * @return mixed data array on success, a MDB2 error on failure
+     * @access public
+     */
+    function getSequenceDefinition($sequence)
+    {
+        $db = $this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        $sequence_name = $db->getSequenceName($sequence);
+        $query = 'SELECT last_number FROM user_sequences';
+        $query.= ' WHERE sequence_name='.$db->quote($sequence_name, 'text');
+        $query.= '    OR sequence_name='.$db->quote(strtoupper($sequence_name), 'text');
+        $start = $db->queryOne($query, 'integer');
+        if (PEAR::isError($start)) {
+            return $start;
+        }
+        $definition = array();
+        if ($start != 1) {
+            $definition = array('start' => $start);
+        }
+        return $definition;
+    }
+
+    // }}}
+    // {{{ getTriggerDefinition()
+
+    /**
+     * Get the structure of a trigger into an array
+     *
+     * EXPERIMENTAL
+     *
+     * WARNING: this function is experimental and may change the returned value
+     * at any time until labelled as non-experimental
+     *
+     * @param string    $trigger    name of trigger that should be used in method
+     * @return mixed data array on success, a MDB2 error on failure
+     * @access public
+     */
+    function getTriggerDefinition($trigger)
+    {
+        $db = $this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        $query = 'SELECT trigger_name,
+                         table_name,
+                         trigger_body,
+                         trigger_type,
+                         triggering_event trigger_event,
+                         description trigger_comment,
+                         1 trigger_enabled,
+                         when_clause
+                    FROM user_triggers
+                   WHERE trigger_name = \''. strtoupper($trigger).'\'';
+        $types = array(
+            'trigger_name'    => 'text',
+            'table_name'      => 'text',
+            'trigger_body'    => 'text',
+            'trigger_type'    => 'text',
+            'trigger_event'   => 'text',
+            'trigger_comment' => 'text',
+            'trigger_enabled' => 'boolean',
+            'when_clause'     => 'text',
+        );
+        $result = $db->queryRow($query, $types, MDB2_FETCHMODE_ASSOC);
+        if (PEAR::isError($result)) {
+            return $result;
+        }
+        if (!empty($result['trigger_type'])) {
+            //$result['trigger_type'] = array_shift(explode(' ', $result['trigger_type']));
+            $result['trigger_type'] = preg_replace('/(\S+).*/', '\\1', $result['trigger_type']);
+        }
+        return $result;
+    }
+
+    // }}}
+    // {{{ tableInfo()
+
+    /**
+     * Returns information about a table or a result set
+     *
+     * NOTE: only supports 'table' and 'flags' if <var>$result</var>
+     * is a table name.
+     *
+     * NOTE: flags won't contain index information.
+     *
+     * @param object|string  $result  MDB2_result object from a query or a
+     *                                 string containing the name of a table.
+     *                                 While this also accepts a query result
+     *                                 resource identifier, this behavior is
+     *                                 deprecated.
+     * @param int            $mode    a valid tableInfo mode
+     *
+     * @return array  an associative array with the information requested.
+     *                 A MDB2_Error object on failure.
+     *
+     * @see MDB2_Driver_Common::tableInfo()
+     */
+    function tableInfo($result, $mode = null)
+    {
+        if (is_string($result)) {
+           return parent::tableInfo($result, $mode);
+        }
+
+        $db = $this->getDBInstance();
+        if (PEAR::isError($db)) {
+            return $db;
+        }
+
+        $resource = MDB2::isResultCommon($result) ? $result->getResource() : $result;
+        if (!is_resource($resource)) {
+            return $db->raiseError(MDB2_ERROR_NEED_MORE_DATA, null, null,
+                'Could not generate result resource', __FUNCTION__);
+        }
+
+        if ($db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
+            if ($db->options['field_case'] == CASE_LOWER) {
+                $case_func = 'strtolower';
+            } else {
+                $case_func = 'strtoupper';
+            }
+        } else {
+            $case_func = 'strval';
+        }
+
+        $count = @OCINumCols($resource);
+        $res = array();
+
+        if ($mode) {
+            $res['num_fields'] = $count;
+        }
+
+        $db->loadModule('Datatype', null, true);
+        for ($i = 0; $i < $count; $i++) {
+            $column = array(
+                'table'  => '',
+                'name'   => $case_func(@OCIColumnName($resource, $i+1)),
+                'type'   => @OCIColumnType($resource, $i+1),
+                'length' => @OCIColumnSize($resource, $i+1),
+                'flags'  => '',
+            );
+            $res[$i] = $column;
+            $res[$i]['mdb2type'] = $db->datatype->mapNativeDatatype($res[$i]);
+            if ($mode & MDB2_TABLEINFO_ORDER) {
+                $res['order'][$res[$i]['name']] = $i;
+            }
+            if ($mode & MDB2_TABLEINFO_ORDERTABLE) {
+                $res['ordertable'][$res[$i]['table']][$res[$i]['name']] = $i;
+            }
+        }
+        return $res;
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/MDB2/Driver/oci8.php b/3rdparty/MDB2/Driver/oci8.php
new file mode 100644
index 0000000000..f61896b4ab
--- /dev/null
+++ b/3rdparty/MDB2/Driver/oci8.php
@@ -0,0 +1,1647 @@
+<?php
+// vim: set et ts=4 sw=4 fdm=marker:
+// +----------------------------------------------------------------------+
+// | PHP versions 4 and 5                                                 |
+// +----------------------------------------------------------------------+
+// | Copyright (c) 1998-2008 Manuel Lemos, Tomas V.V.Cox,                 |
+// | Stig. S. Bakken, Lukas Smith                                         |
+// | All rights reserved.                                                 |
+// +----------------------------------------------------------------------+
+// | MDB2 is a merge of PEAR DB and Metabases that provides a unified DB  |
+// | API as well as database abstraction for PHP applications.            |
+// | This LICENSE is in the BSD license style.                            |
+// |                                                                      |
+// | 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 Manuel Lemos, Tomas V.V.Cox, Stig. S. Bakken,    |
+// | Lukas Smith nor the names of his 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      |
+// | REGENTS 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.                                          |
+// +----------------------------------------------------------------------+
+// | Author: Lukas Smith <smith@pooteeweet.org>                           |
+// +----------------------------------------------------------------------+
+
+// $Id: oci8.php 295587 2010-02-28 17:16:38Z quipo $
+
+/**
+ * MDB2 OCI8 driver
+ *
+ * @package MDB2
+ * @category Database
+ * @author Lukas Smith <smith@pooteeweet.org>
+ */
+class MDB2_Driver_oci8 extends MDB2_Driver_Common
+{
+    // {{{ properties
+    var $string_quoting = array('start' => "'", 'end' => "'", 'escape' => "'", 'escape_pattern' => '@');
+
+    var $identifier_quoting = array('start' => '"', 'end' => '"', 'escape' => '"');
+
+    var $uncommitedqueries = 0;
+    // }}}
+    // {{{ constructor
+
+    /**
+     * Constructor
+     */
+    function __construct()
+    {
+        parent::__construct();
+
+        $this->phptype = 'oci8';
+        $this->dbsyntax = 'oci8';
+
+        $this->supported['sequences'] = true;
+        $this->supported['indexes'] = true;
+        $this->supported['summary_functions'] = true;
+        $this->supported['order_by_text'] = true;
+        $this->supported['current_id'] = true;
+        $this->supported['affected_rows'] = true;
+        $this->supported['transactions'] = true;
+        $this->supported['savepoints'] = true;
+        $this->supported['limit_queries'] = true;
+        $this->supported['LOBs'] = true;
+        $this->supported['replace'] = 'emulated';
+        $this->supported['sub_selects'] = true;
+        $this->supported['triggers'] = true;
+        $this->supported['auto_increment'] = false; // implementation is broken
+        $this->supported['primary_key'] = true;
+        $this->supported['result_introspection'] = true;
+        $this->supported['prepared_statements'] = true;
+        $this->supported['identifier_quoting'] = true;
+        $this->supported['pattern_escaping'] = true;
+        $this->supported['new_link'] = true;
+
+        $this->options['DBA_username'] = false;
+        $this->options['DBA_password'] = false;
+        $this->options['database_name_prefix'] = false;
+        $this->options['emulate_database'] = true;
+        $this->options['default_tablespace'] = false;
+        $this->options['default_text_field_length'] = 2000;
+        $this->options['lob_allow_url_include'] = false;
+        $this->options['result_prefetching'] = false;
+        $this->options['max_identifiers_length'] = 30;
+    }
+
+    // }}}
+    // {{{ errorInfo()
+
+    /**
+     * This method is used to collect information about an error
+     *
+     * @param integer $error
+     * @return array
+     * @access public
+     */
+    function errorInfo($error = null)
+    {
+        if (is_resource($error)) {
+            $error_data = @OCIError($error);
+            $error = null;
+        } elseif ($this->connection) {
+            $error_data = @OCIError($this->connection);
+        } else {
+            $error_data = @OCIError();
+        }
+        $native_code = $error_data['code'];
+        $native_msg  = $error_data['message'];
+        if (null === $error) {
+            static $ecode_map;
+            if (empty($ecode_map)) {
+                $ecode_map = array(
+                    1    => MDB2_ERROR_CONSTRAINT,
+                    900  => MDB2_ERROR_SYNTAX,
+                    904  => MDB2_ERROR_NOSUCHFIELD,
+                    911  => MDB2_ERROR_SYNTAX, //invalid character
+                    913  => MDB2_ERROR_VALUE_COUNT_ON_ROW,
+                    921  => MDB2_ERROR_SYNTAX,
+                    923  => MDB2_ERROR_SYNTAX,
+                    942  => MDB2_ERROR_NOSUCHTABLE,
+                    955  => MDB2_ERROR_ALREADY_EXISTS,
+                    1400 => MDB2_ERROR_CONSTRAINT_NOT_NULL,
+                    1401 => MDB2_ERROR_INVALID,
+                    1407 => MDB2_ERROR_CONSTRAINT_NOT_NULL,
+                    1418 => MDB2_ERROR_NOT_FOUND,
+                    1435 => MDB2_ERROR_NOT_FOUND,
+                    1476 => MDB2_ERROR_DIVZERO,
+                    1722 => MDB2_ERROR_INVALID_NUMBER,
+                    2289 => MDB2_ERROR_NOSUCHTABLE,
+                    2291 => MDB2_ERROR_CONSTRAINT,
+                    2292 => MDB2_ERROR_CONSTRAINT,
+                    2449 => MDB2_ERROR_CONSTRAINT,
+                    4081 => MDB2_ERROR_ALREADY_EXISTS, //trigger already exists
+                    24344 => MDB2_ERROR_SYNTAX, //success with compilation error
+                );
+            }
+            if (isset($ecode_map[$native_code])) {
+                $error = $ecode_map[$native_code];
+            }
+        }
+        return array($error, $native_code, $native_msg);
+    }
+
+    // }}}
+    // {{{ beginTransaction()
+
+    /**
+     * Start a transaction or set a savepoint.
+     *
+     * @param   string  name of a savepoint to set
+     * @return  mixed   MDB2_OK on success, a MDB2 error on failure
+     *
+     * @access  public
+     */
+    function beginTransaction($savepoint = null)
+    {
+        $this->debug('Starting transaction/savepoint', __FUNCTION__, array('is_manip' => true, 'savepoint' => $savepoint));
+        if (null !== $savepoint) {
+            if (!$this->in_transaction) {
+                return $this->raiseError(MDB2_ERROR_INVALID, null, null,
+                    'savepoint cannot be released when changes are auto committed', __FUNCTION__);
+            }
+            $query = 'SAVEPOINT '.$savepoint;
+            return $this->_doQuery($query, true);
+        }
+        if ($this->in_transaction) {
+            return MDB2_OK;  //nothing to do
+        }
+        if (!$this->destructor_registered && $this->opened_persistent) {
+            $this->destructor_registered = true;
+            register_shutdown_function('MDB2_closeOpenTransactions');
+        }
+        $this->in_transaction = true;
+        ++$this->uncommitedqueries;
+        return MDB2_OK;
+    }
+
+    // }}}
+    // {{{ commit()
+
+    /**
+     * Commit the database changes done during a transaction that is in
+     * progress or release a savepoint. This function may only be called when
+     * auto-committing is disabled, otherwise it will fail. Therefore, a new
+     * transaction is implicitly started after committing the pending changes.
+     *
+     * @param   string  name of a savepoint to release
+     * @return  mixed   MDB2_OK on success, a MDB2 error on failure
+     *
+     * @access  public
+     */
+    function commit($savepoint = null)
+    {
+        $this->debug('Committing transaction/savepoint', __FUNCTION__, array('is_manip' => true, 'savepoint' => $savepoint));
+        if (!$this->in_transaction) {
+            return $this->raiseError(MDB2_ERROR_INVALID, null, null,
+                'commit/release savepoint cannot be done changes are auto committed', __FUNCTION__);
+        }
+        if (null !== $savepoint) {
+            return MDB2_OK;
+        }
+
+        if ($this->uncommitedqueries) {
+            $connection = $this->getConnection();
+            if (PEAR::isError($connection)) {
+                return $connection;
+            }
+            if (!@OCICommit($connection)) {
+                return $this->raiseError(null, null, null,
+                'Unable to commit transaction', __FUNCTION__);
+            }
+            $this->uncommitedqueries = 0;
+        }
+        $this->in_transaction = false;
+        return MDB2_OK;
+    }
+
+    // }}}
+    // {{{ rollback()
+
+    /**
+     * Cancel any database changes done during a transaction or since a specific
+     * savepoint that is in progress. This function may only be called when
+     * auto-committing is disabled, otherwise it will fail. Therefore, a new
+     * transaction is implicitly started after canceling the pending changes.
+     *
+     * @param   string  name of a savepoint to rollback to
+     * @return  mixed   MDB2_OK on success, a MDB2 error on failure
+     *
+     * @access  public
+     */
+    function rollback($savepoint = null)
+    {
+        $this->debug('Rolling back transaction/savepoint', __FUNCTION__, array('is_manip' => true, 'savepoint' => $savepoint));
+        if (!$this->in_transaction) {
+            return $this->raiseError(MDB2_ERROR_INVALID, null, null,
+                'rollback cannot be done changes are auto committed', __FUNCTION__);
+        }
+        if (null !== $savepoint) {
+            $query = 'ROLLBACK TO SAVEPOINT '.$savepoint;
+            return $this->_doQuery($query, true);
+        }
+
+        if ($this->uncommitedqueries) {
+            $connection = $this->getConnection();
+            if (PEAR::isError($connection)) {
+                return $connection;
+            }
+            if (!@OCIRollback($connection)) {
+                return $this->raiseError(null, null, null,
+                'Unable to rollback transaction', __FUNCTION__);
+            }
+            $this->uncommitedqueries = 0;
+        }
+        $this->in_transaction = false;
+        return MDB2_OK;
+    }
+
+    // }}}
+    // {{{ function setTransactionIsolation()
+
+    /**
+     * Set the transacton isolation level.
+     *
+     * @param   string  standard isolation level
+     *                  READ UNCOMMITTED (allows dirty reads)
+     *                  READ COMMITTED (prevents dirty reads)
+     *                  REPEATABLE READ (prevents nonrepeatable reads)
+     *                  SERIALIZABLE (prevents phantom reads)
+     * @param   array some transaction options:
+     *                  'wait' => 'WAIT' | 'NO WAIT'
+     *                  'rw'   => 'READ WRITE' | 'READ ONLY'
+     *
+     * @return  mixed   MDB2_OK on success, a MDB2 error on failure
+     *
+     * @access  public
+     * @since   2.1.1
+     */
+    function setTransactionIsolation($isolation, $options = array())
+    {
+        $this->debug('Setting transaction isolation level', __FUNCTION__, array('is_manip' => true));
+        switch ($isolation) {
+        case 'READ UNCOMMITTED':
+            $isolation = 'READ COMMITTED';
+        case 'READ COMMITTED':
+        case 'REPEATABLE READ':
+            $isolation = 'SERIALIZABLE';
+        case 'SERIALIZABLE':
+            break;
+        default:
+            return $this->raiseError(MDB2_ERROR_UNSUPPORTED, null, null,
+                'isolation level is not supported: '.$isolation, __FUNCTION__);
+        }
+
+        $query = "ALTER SESSION ISOLATION LEVEL $isolation";
+        return $this->_doQuery($query, true);
+    }
+
+    // }}}
+    // {{{ _doConnect()
+
+    /**
+     * do the grunt work of the connect
+     *
+     * @return connection on success or MDB2 Error Object on failure
+     * @access protected
+     */
+    function _doConnect($username, $password, $persistent = false)
+    {
+        if (!PEAR::loadExtension($this->phptype)) {
+            return $this->raiseError(MDB2_ERROR_NOT_FOUND, null, null,
+                'extension '.$this->phptype.' is not compiled into PHP', __FUNCTION__);
+        }
+
+        $sid = '';
+
+        if (!empty($this->dsn['service']) && $this->dsn['hostspec']) {
+            //oci8://username:password@foo.example.com[:port]/?service=service
+            // service name is given, it is assumed that hostspec is really a
+            // hostname, we try to construct an oracle connection string from this
+            $port = $this->dsn['port'] ? $this->dsn['port'] : 1521;
+            $sid = sprintf("(DESCRIPTION=(ADDRESS_LIST=(ADDRESS=(PROTOCOL=TCP)
+                            (HOST=%s) (PORT=%s)))
+                            (CONNECT_DATA=(SERVICE_NAME=%s)))",
+                $this->dsn['hostspec'],
+                $port,
+                $this->dsn['service']
+            );
+        } elseif ($this->dsn['hostspec']) {
+            // we are given something like 'oci8://username:password@foo/'
+            // we have hostspec but not a service name, now we assume that
+            // hostspec is a tnsname defined in tnsnames.ora
+            $sid = $this->dsn['hostspec'];
+            if (isset($this->dsn['port']) && $this->dsn['port']) {
+                $sid = $sid.':'.$this->dsn['port'];
+            }
+        } else {
+            // oci://username:password@
+            // if everything fails, we have to rely on environment variables
+            // not before a check to 'emulate_database'
+            if (!$this->options['emulate_database'] && $this->database_name) {
+                $sid = $this->database_name;
+            } elseif (getenv('ORACLE_SID')) {
+                $sid = getenv('ORACLE_SID');
+            } elseif ($sid = getenv('TWO_TASK')) {
+                $sid = getenv('TWO_TASK');
+            } else {
+                return $this->raiseError(MDB2_ERROR_NOT_FOUND, null, null,
+                    'not a valid connection string or environment variable [ORACLE_SID|TWO_TASK] not set',
+                    __FUNCTION__);
+            }
+        }
+
+        if (function_exists('oci_connect')) {
+            if ($this->_isNewLinkSet()) {
+                $connect_function = 'oci_new_connect';
+            } else {
+                $connect_function = $persistent ? 'oci_pconnect' : 'oci_connect';
+            }
+
+            $charset = empty($this->dsn['charset']) ? null : $this->dsn['charset'];
+            $session_mode = empty($this->dsn['session_mode']) ? null : $this->dsn['session_mode'];
+            $connection = @$connect_function($username, $password, $sid, $charset, $session_mode);
+            $error = @OCIError();
+            if (isset($error['code']) && $error['code'] == 12541) {
+                // Couldn't find TNS listener.  Try direct connection.
+                $connection = @$connect_function($username, $password, null, $charset);
+            }
+        } else {
+            $connect_function = $persistent ? 'OCIPLogon' : 'OCILogon';
+            $connection = @$connect_function($username, $password, $sid);
+
+            if (!empty($this->dsn['charset'])) {
+                $result = $this->setCharset($this->dsn['charset'], $connection);
+                if (PEAR::isError($result)) {
+                    return $result;
+                }
+            }
+        }
+
+        if (!$connection) {
+            return $this->raiseError(MDB2_ERROR_CONNECT_FAILED, null, null,
+                'unable to establish a connection', __FUNCTION__);
+        }
+        
+        if (empty($this->dsn['disable_iso_date'])) {
+            $query = "ALTER SESSION SET NLS_DATE_FORMAT='YYYY-MM-DD HH24:MI:SS'";
+            $err =& $this->_doQuery($query, true, $connection);
+            if (PEAR::isError($err)) {
+                $this->disconnect(false);
+                return $err;
+            }
+        }
+        
+        $query = "ALTER SESSION SET NLS_NUMERIC_CHARACTERS='. '";
+        $err =& $this->_doQuery($query, true, $connection);
+        if (PEAR::isError($err)) {
+            $this->disconnect(false);
+            return $err;
+        }
+
+        return $connection;
+    }
+
+    // }}}
+    // {{{ connect()
+
+    /**
+     * Connect to the database
+     *
+     * @return MDB2_OK on success, MDB2 Error Object on failure
+     * @access public
+     */
+    function connect()
+    {
+        if (is_resource($this->connection)) {
+            //if (count(array_diff($this->connected_dsn, $this->dsn)) == 0
+            if (MDB2::areEquals($this->connected_dsn, $this->dsn)
+                && $this->opened_persistent == $this->options['persistent']
+            ) {
+                return MDB2_OK;
+            }
+            $this->disconnect(false);
+        }
+
+        if ($this->database_name && $this->options['emulate_database']) {
+             $this->dsn['username'] = $this->options['database_name_prefix'].$this->database_name;
+        }
+
+        $connection = $this->_doConnect($this->dsn['username'],
+                                        $this->dsn['password'],
+                                        $this->options['persistent']);
+        if (PEAR::isError($connection)) {
+            return $connection;
+        }
+        $this->connection = $connection;
+        $this->connected_dsn = $this->dsn;
+        $this->connected_database_name = '';
+        $this->opened_persistent = $this->options['persistent'];
+        $this->dbsyntax = $this->dsn['dbsyntax'] ? $this->dsn['dbsyntax'] : $this->phptype;
+
+        if ($this->database_name) {
+            if ($this->database_name != $this->connected_database_name) {
+                $query = 'ALTER SESSION SET CURRENT_SCHEMA = "' .strtoupper($this->database_name) .'"';
+                $result = $this->_doQuery($query);
+                if (PEAR::isError($result)) {
+                    $err = $this->raiseError($result, null, null,
+                        'Could not select the database: '.$this->database_name, __FUNCTION__);
+                    return $err;
+                }
+                $this->connected_database_name = $this->database_name;
+            }
+        }
+
+        $this->as_keyword = ' ';
+        $server_info = $this->getServerVersion();
+        if (is_array($server_info)) {
+            if ($server_info['major'] >= '10') {
+                $this->as_keyword = ' AS ';
+            }
+        }
+        return MDB2_OK;
+    }
+
+    // }}}
+    // {{{ databaseExists()
+
+    /**
+     * check if given database name is exists?
+     *
+     * @param string $name    name of the database that should be checked
+     *
+     * @return mixed true/false on success, a MDB2 error on failure
+     * @access public
+     */
+    function databaseExists($name)
+    {
+        $connection = $this->_doConnect($this->dsn['username'],
+                                        $this->dsn['password'],
+                                        $this->options['persistent']);
+        if (PEAR::isError($connection)) {
+            return $connection;
+        }
+
+        $query = 'ALTER SESSION SET CURRENT_SCHEMA = "' .strtoupper($name) .'"';
+        $result = $this->_doQuery($query, true, $connection, false);
+        if (PEAR::isError($result)) {
+            if (!MDB2::isError($result, MDB2_ERROR_NOT_FOUND)) {
+                return $result;
+            }
+            return false;
+        }
+        return true;
+    }
+
+    // }}}
+    // {{{ disconnect()
+
+    /**
+     * Log out and disconnect from the database.
+     *
+     * @param  boolean $force if the disconnect should be forced even if the
+     *                        connection is opened persistently
+     * @return mixed true on success, false if not connected and error
+     *                object on error
+     * @access public
+     */
+    function disconnect($force = true)
+    {
+        if (is_resource($this->connection)) {
+            if ($this->in_transaction) {
+                $dsn = $this->dsn;
+                $database_name = $this->database_name;
+                $persistent = $this->options['persistent'];
+                $this->dsn = $this->connected_dsn;
+                $this->database_name = $this->connected_database_name;
+                $this->options['persistent'] = $this->opened_persistent;
+                $this->rollback();
+                $this->dsn = $dsn;
+                $this->database_name = $database_name;
+                $this->options['persistent'] = $persistent;
+            }
+
+            if (!$this->opened_persistent || $force) {
+                $ok = false;
+                if (function_exists('oci_close')) {
+                    $ok = @oci_close($this->connection);
+                } else {
+                    $ok = @OCILogOff($this->connection);
+                }
+                if (!$ok) {
+                    return $this->raiseError(MDB2_ERROR_DISCONNECT_FAILED,
+                           null, null, null, __FUNCTION__);
+                }
+            }
+            $this->uncommitedqueries = 0;
+        } else {
+            return false;
+        }
+        return parent::disconnect($force);
+    }
+
+    // }}}
+    // {{{ standaloneQuery()
+
+    /**
+     * execute a query as DBA
+     *
+     * @param string $query     the SQL query
+     * @param mixed  $types     array containing the types of the columns in
+     *                          the result set
+     * @param boolean $is_manip if the query is a manipulation query
+     * @return mixed MDB2_OK on success, a MDB2 error on failure
+     * @access public
+     */
+    function standaloneQuery($query, $types = null, $is_manip = false)
+    {
+        $user = $this->options['DBA_username']? $this->options['DBA_username'] : $this->dsn['username'];
+        $pass = $this->options['DBA_password']? $this->options['DBA_password'] : $this->dsn['password'];
+        $connection = $this->_doConnect($user, $pass, $this->options['persistent']);
+        if (PEAR::isError($connection)) {
+            return $connection;
+        }
+
+        $offset = $this->offset;
+        $limit = $this->limit;
+        $this->offset = $this->limit = 0;
+        $query = $this->_modifyQuery($query, $is_manip, $limit, $offset);
+
+        $result = $this->_doQuery($query, $is_manip, $connection, false);
+        if (!PEAR::isError($result)) {
+            if ($is_manip) {
+                $result = $this->_affectedRows($connection, $result);
+            } else {
+                $result = $this->_wrapResult($result, $types, true, false, $limit, $offset);
+            }
+        }
+
+        @OCILogOff($connection);
+        return $result;
+    }
+
+    // }}}
+    // {{{ _modifyQuery()
+
+    /**
+     * Changes a query string for various DBMS specific reasons
+     *
+     * @param string $query  query to modify
+     * @param boolean $is_manip  if it is a DML query
+     * @param integer $limit  limit the number of rows
+     * @param integer $offset  start reading from given offset
+     * @return string modified query
+     * @access protected
+     */
+    function _modifyQuery($query, $is_manip, $limit, $offset)
+    {
+        if (preg_match('/^\s*SELECT/i', $query)) {
+            if (!preg_match('/\sFROM\s/i', $query)) {
+                $query.= " FROM dual";
+            }
+            if ($limit > 0) {
+                // taken from http://svn.ez.no/svn/ezcomponents/packages/Database
+                $max = $offset + $limit;
+                if ($offset > 0) {
+                    $min = $offset + 1;
+                    $query = "SELECT * FROM (SELECT a.*, ROWNUM mdb2rn FROM ($query) a WHERE ROWNUM <= $max) WHERE mdb2rn >= $min";
+                } else {
+                    $query = "SELECT a.* FROM ($query) a WHERE ROWNUM <= $max";
+                }
+            }
+        }
+        return $query;
+    }
+
+    // }}}
+    // {{{ _doQuery()
+
+    /**
+     * Execute a query
+     * @param string $query  query
+     * @param boolean $is_manip  if the query is a manipulation query
+     * @param resource $connection
+     * @param string $database_name
+     * @return result or error object
+     * @access protected
+     */
+    function &_doQuery($query, $is_manip = false, $connection = null, $database_name = null)
+    {
+        $this->last_query = $query;
+        $result = $this->debug($query, 'query', array('is_manip' => $is_manip, 'when' => 'pre'));
+        if ($result) {
+            if (PEAR::isError($result)) {
+                return $result;
+            }
+            $query = $result;
+        }
+        if ($this->getOption('disable_query')) {
+            if ($is_manip) {
+                return 0;
+            }
+            return null;
+        }
+
+        if (null === $connection) {
+            $connection = $this->getConnection();
+            if (PEAR::isError($connection)) {
+                return $connection;
+            }
+        }
+
+        $query = str_replace("\r\n", "\n", $query); //for fixing end-of-line character in the PL/SQL in windows
+        $result = @OCIParse($connection, $query);
+        if (!$result) {
+            $err = $this->raiseError(null, null, null,
+                'Could not create statement', __FUNCTION__);
+            return $err;
+        }
+
+        $mode = $this->in_transaction ? OCI_DEFAULT : OCI_COMMIT_ON_SUCCESS;
+        if (!@OCIExecute($result, $mode)) {
+            $err = $this->raiseError($result, null, null,
+                'Could not execute statement', __FUNCTION__);
+            return $err;
+        }
+
+        if (is_numeric($this->options['result_prefetching'])) {
+            @ocisetprefetch($result, $this->options['result_prefetching']);
+        }
+
+        $this->debug($query, 'query', array('is_manip' => $is_manip, 'when' => 'post', 'result' => $result));
+        return $result;
+    }
+
+    // }}}
+    // {{{ _affectedRows()
+
+    /**
+     * Returns the number of rows affected
+     *
+     * @param resource $result
+     * @param resource $connection
+     * @return mixed MDB2 Error Object or the number of rows affected
+     * @access private
+     */
+    function _affectedRows($connection, $result = null)
+    {
+        if (null === $connection) {
+            $connection = $this->getConnection();
+            if (PEAR::isError($connection)) {
+                return $connection;
+            }
+        }
+        return @OCIRowCount($result);
+    }
+
+    // }}}
+    // {{{ getServerVersion()
+
+    /**
+     * return version information about the server
+     *
+     * @param bool   $native  determines if the raw version string should be returned
+     * @return mixed array/string with version information or MDB2 error object
+     * @access public
+     */
+    function getServerVersion($native = false)
+    {
+        $connection = $this->getConnection();
+        if (PEAR::isError($connection)) {
+            return $connection;
+        }
+        if ($this->connected_server_info) {
+            $server_info = $this->connected_server_info;
+        } else {
+            $server_info = @ociserverversion($connection);
+        }
+        if (!$server_info) {
+            return $this->raiseError(null, null, null,
+                'Could not get server information', __FUNCTION__);
+        }
+        // cache server_info
+        $this->connected_server_info = $server_info;
+        if (!$native) {
+            if (!preg_match('/ (\d+)\.(\d+)\.(\d+)\.([\d\.]+) /', $server_info, $tmp)) {
+                return $this->raiseError(MDB2_ERROR_INVALID, null, null,
+                    'Could not parse version information:'.$server_info, __FUNCTION__);
+            }
+            $server_info = array(
+                'major' => $tmp[1],
+                'minor' => $tmp[2],
+                'patch' => $tmp[3],
+                'extra' => $tmp[4],
+                'native' => $server_info,
+            );
+        }
+        return $server_info;
+    }
+
+    // }}}
+    // {{{ prepare()
+
+    /**
+     * Prepares a query for multiple execution with execute().
+     * With some database backends, this is emulated.
+     * prepare() requires a generic query as string like
+     * 'INSERT INTO numbers VALUES(?,?)' or
+     * 'INSERT INTO numbers VALUES(:foo,:bar)'.
+     * The ? and :name and are placeholders which can be set using
+     * bindParam() and the query can be sent off using the execute() method.
+     * The allowed format for :name can be set with the 'bindname_format' option.
+     *
+     * @param string $query the query to prepare
+     * @param mixed   $types  array that contains the types of the placeholders
+     * @param mixed   $result_types  array that contains the types of the columns in
+     *                        the result set or MDB2_PREPARE_RESULT, if set to
+     *                        MDB2_PREPARE_MANIP the query is handled as a manipulation query
+     * @param mixed   $lobs   key (field) value (parameter) pair for all lob placeholders
+     * @return mixed resource handle for the prepared query on success, a MDB2
+     *        error on failure
+     * @access public
+     * @see bindParam, execute
+     */
+    function prepare($query, $types = null, $result_types = null, $lobs = array())
+    {
+        if ($this->options['emulate_prepared']) {
+            return parent::prepare($query, $types, $result_types, $lobs);
+        }
+        $is_manip = ($result_types === MDB2_PREPARE_MANIP);
+        $offset = $this->offset;
+        $limit = $this->limit;
+        $this->offset = $this->limit = 0;
+        $result = $this->debug($query, __FUNCTION__, array('is_manip' => $is_manip, 'when' => 'pre'));
+        if ($result) {
+            if (PEAR::isError($result)) {
+                return $result;
+            }
+            $query = $result;
+        }
+        $query = $this->_modifyQuery($query, $is_manip, $limit, $offset);
+        $placeholder_type_guess = $placeholder_type = null;
+        $question = '?';
+        $colon = ':';
+        $positions = array();
+        $position = 0;
+        $parameter = -1;
+        while ($position < strlen($query)) {
+            $q_position = strpos($query, $question, $position);
+            $c_position = strpos($query, $colon, $position);
+            if ($q_position && $c_position) {
+                $p_position = min($q_position, $c_position);
+            } elseif ($q_position) {
+                $p_position = $q_position;
+            } elseif ($c_position) {
+                $p_position = $c_position;
+            } else {
+                break;
+            }
+            if (null === $placeholder_type) {
+                $placeholder_type_guess = $query[$p_position];
+            }
+            
+            $new_pos = $this->_skipDelimitedStrings($query, $position, $p_position);
+            if (PEAR::isError($new_pos)) {
+                return $new_pos;
+            }
+            if ($new_pos != $position) {
+                $position = $new_pos;
+                continue; //evaluate again starting from the new position
+            }
+
+            if ($query[$position] == $placeholder_type_guess) {
+                if (null === $placeholder_type) {
+                    $placeholder_type = $query[$p_position];
+                    $question = $colon = $placeholder_type;
+                    if (!empty($types) && is_array($types)) {
+                        if ($placeholder_type == ':') {
+                            if (is_int(key($types))) {
+                                $types_tmp = $types;
+                                $types = array();
+                                $count = -1;
+                            }
+                        } else {
+                            $types = array_values($types);
+                        }
+                    }
+                }
+                if ($placeholder_type == ':') {
+                    $regexp = '/^.{'.($position+1).'}('.$this->options['bindname_format'].').*$/s';
+                    $parameter = preg_replace($regexp, '\\1', $query);
+                    if ($parameter === '') {
+                        $err = $this->raiseError(MDB2_ERROR_SYNTAX, null, null,
+                            'named parameter name must match "bindname_format" option', __FUNCTION__);
+                        return $err;
+                    }
+                    // use parameter name in type array
+                    if (isset($count) && isset($types_tmp[++$count])) {
+                        $types[$parameter] = $types_tmp[$count];
+                    }
+                    $length = strlen($parameter) + 1;
+                } else {
+                    ++$parameter;
+                    //$length = strlen($parameter);
+                    $length = 1; // strlen('?')
+                }
+                if (!in_array($parameter, $positions)) {
+                    $positions[] = $parameter;
+                }
+                if (isset($types[$parameter])
+                    && ($types[$parameter] == 'clob' || $types[$parameter] == 'blob')
+                ) {
+                    if (!isset($lobs[$parameter])) {
+                        $lobs[$parameter] = $parameter;
+                    }
+                    $value = $this->quote(true, $types[$parameter]);
+                    if (PEAR::isError($value)) {
+                        return $value;
+                    }
+                    $query = substr_replace($query, $value, $p_position, $length);
+                    $position = $p_position + strlen($value) - 1;
+                } elseif ($placeholder_type == '?') {
+                    $query = substr_replace($query, ':'.$parameter, $p_position, 1);
+                    $position = $p_position + $length;
+                } else {
+                    $position = $p_position + 1;
+                }
+            } else {
+                $position = $p_position;
+            }
+        }
+        if (is_array($lobs)) {
+            $columns = $variables = '';
+            foreach ($lobs as $parameter => $field) {
+                $columns.= ($columns ? ', ' : ' RETURNING ').$field;
+                $variables.= ($variables ? ', ' : ' INTO ').':'.$parameter;
+            }
+            $query.= $columns.$variables;
+        }
+        $connection = $this->getConnection();
+        if (PEAR::isError($connection)) {
+            return $connection;
+        }
+        $statement = @OCIParse($connection, $query);
+        if (!$statement) {
+            $err = $this->raiseError(null, null, null,
+                'Could not create statement', __FUNCTION__);
+            return $err;
+        }
+
+        $class_name = 'MDB2_Statement_'.$this->phptype;
+        $obj = new $class_name($this, $statement, $positions, $query, $types, $result_types, $is_manip, $limit, $offset);
+        $this->debug($query, __FUNCTION__, array('is_manip' => $is_manip, 'when' => 'post', 'result' => $obj));
+        return $obj;
+    }
+
+    // }}}
+    // {{{ nextID()
+
+    /**
+     * Returns the next free id of a sequence
+     *
+     * @param string $seq_name name of the sequence
+     * @param boolean $ondemand when true the sequence is
+     *                           automatic created, if it
+     *                           not exists
+     * @return mixed MDB2 Error Object or id
+     * @access public
+     */
+    function nextID($seq_name, $ondemand = true)
+    {
+        $sequence_name = $this->quoteIdentifier($this->getSequenceName($seq_name), true);
+        $query = "SELECT $sequence_name.nextval FROM DUAL";
+        $this->pushErrorHandling(PEAR_ERROR_RETURN);
+        $this->expectError(MDB2_ERROR_NOSUCHTABLE);
+        $result = $this->queryOne($query, 'integer');
+        $this->popExpect();
+        $this->popErrorHandling();
+        if (PEAR::isError($result)) {
+            if ($ondemand && $result->getCode() == MDB2_ERROR_NOSUCHTABLE) {
+                $this->loadModule('Manager', null, true);
+                $result = $this->manager->createSequence($seq_name);
+                if (PEAR::isError($result)) {
+                    return $result;
+                }
+                return $this->nextId($seq_name, false);
+            }
+        }
+        return $result;
+    }
+
+    // }}}
+    // {{{ lastInsertID()
+
+    /**
+     * Returns the autoincrement ID if supported or $id or fetches the current
+     * ID in a sequence called: $table.(empty($field) ? '' : '_'.$field)
+     *
+     * @param string $table name of the table into which a new row was inserted
+     * @param string $field name of the field into which a new row was inserted
+     * @return mixed MDB2 Error Object or id
+     * @access public
+     */
+    function lastInsertID($table = null, $field = null)
+    {
+        $old_seq = $table.(empty($field) ? '' : '_'.$field);
+        $sequence_name = $this->quoteIdentifier($this->getSequenceName($table), true);
+        $result = $this->queryOne("SELECT $sequence_name.currval", 'integer');
+        if (PEAR::isError($result)) {
+            $sequence_name = $this->quoteIdentifier($this->getSequenceName($old_seq), true);
+            $result = $this->queryOne("SELECT $sequence_name.currval", 'integer');
+        }
+
+        return $result;
+    }
+
+    // }}}
+    // {{{ currId()
+
+    /**
+     * Returns the current id of a sequence
+     *
+     * @param string $seq_name name of the sequence
+     * @return mixed MDB2_Error or id
+     * @access public
+     */
+    function currId($seq_name)
+    {
+        $sequence_name = $this->getSequenceName($seq_name);
+        $query = 'SELECT (last_number-1) FROM all_sequences';
+        $query.= ' WHERE sequence_name='.$this->quote($sequence_name, 'text');
+        $query.= ' OR sequence_name='.$this->quote(strtoupper($sequence_name), 'text');
+        return $this->queryOne($query, 'integer');
+    }
+}
+
+/**
+ * MDB2 OCI8 result driver
+ *
+ * @package MDB2
+ * @category Database
+ * @author Lukas Smith <smith@pooteeweet.org>
+ */
+class MDB2_Result_oci8 extends MDB2_Result_Common
+{
+    // }}}
+    // {{{ fetchRow()
+
+    /**
+     * Fetch a row and insert the data into an existing array.
+     *
+     * @param int       $fetchmode  how the array data should be indexed
+     * @param int    $rownum    number of the row where the data can be found
+     * @return int data array on success, a MDB2 error on failure
+     * @access public
+     */
+    function fetchRow($fetchmode = MDB2_FETCHMODE_DEFAULT, $rownum = null)
+    {
+        if (null !== $rownum) {
+            $seek = $this->seek($rownum);
+            if (PEAR::isError($seek)) {
+                return $seek;
+            }
+        }
+        if ($fetchmode == MDB2_FETCHMODE_DEFAULT) {
+            $fetchmode = $this->db->fetchmode;
+        }
+        if ($fetchmode & MDB2_FETCHMODE_ASSOC) {
+            @OCIFetchInto($this->result, $row, OCI_ASSOC+OCI_RETURN_NULLS);
+            if (is_array($row)
+                && $this->db->options['portability'] & MDB2_PORTABILITY_FIX_CASE
+            ) {
+                $row = array_change_key_case($row, $this->db->options['field_case']);
+            }
+        } else {
+            @OCIFetchInto($this->result, $row, OCI_RETURN_NULLS);
+        }
+        if (!$row) {
+            if (false === $this->result) {
+                $err = $this->db->raiseError(MDB2_ERROR_NEED_MORE_DATA, null, null,
+                    'resultset has already been freed', __FUNCTION__);
+                return $err;
+            }
+            return null;
+        }
+        // remove additional column at the end
+        if ($this->offset > 0) {
+            array_pop($row);
+        }
+        $mode = 0;
+        $rtrim = false;
+        if ($this->db->options['portability'] & MDB2_PORTABILITY_RTRIM) {
+            if (empty($this->types)) {
+                $mode += MDB2_PORTABILITY_RTRIM;
+            } else {
+                $rtrim = true;
+            }
+        }
+        if ($mode) {
+            $this->db->_fixResultArrayValues($row, $mode);
+        }
+        if (!empty($this->types)) {
+            $row = $this->db->datatype->convertResultRow($this->types, $row, $rtrim);
+        }
+        if (!empty($this->values)) {
+            $this->_assignBindColumns($row);
+        }
+        if ($fetchmode === MDB2_FETCHMODE_OBJECT) {
+            $object_class = $this->db->options['fetch_class'];
+            if ($object_class == 'stdClass') {
+                $row = (object) $row;
+            } else {
+                $rowObj = new $object_class($row);
+                $row = $rowObj;
+            }
+        }
+        ++$this->rownum;
+        return $row;
+    }
+
+    // }}}
+    // {{{ _getColumnNames()
+
+    /**
+     * Retrieve the names of columns returned by the DBMS in a query result.
+     *
+     * @return  mixed   Array variable that holds the names of columns as keys
+     *                  or an MDB2 error on failure.
+     *                  Some DBMS may not return any columns when the result set
+     *                  does not contain any rows.
+     * @access private
+     */
+    function _getColumnNames()
+    {
+        $columns = array();
+        $numcols = $this->numCols();
+        if (PEAR::isError($numcols)) {
+            return $numcols;
+        }
+        for ($column = 0; $column < $numcols; $column++) {
+            $column_name = @OCIColumnName($this->result, $column + 1);
+            $columns[$column_name] = $column;
+        }
+        if ($this->db->options['portability'] & MDB2_PORTABILITY_FIX_CASE) {
+            $columns = array_change_key_case($columns, $this->db->options['field_case']);
+        }
+        return $columns;
+    }
+
+    // }}}
+    // {{{ numCols()
+
+    /**
+     * Count the number of columns returned by the DBMS in a query result.
+     *
+     * @return mixed integer value with the number of columns, a MDB2 error
+     *      on failure
+     * @access public
+     */
+    function numCols()
+    {
+        $cols = @OCINumCols($this->result);
+        if (null === $cols) {
+            if (false === $this->result) {
+                return $this->db->raiseError(MDB2_ERROR_NEED_MORE_DATA, null, null,
+                    'resultset has already been freed', __FUNCTION__);
+            }
+            if (null === $this->result) {
+                return count($this->types);
+            }
+            return $this->db->raiseError(null, null, null,
+                'Could not get column count', __FUNCTION__);
+        }
+        if ($this->offset > 0) {
+            --$cols;
+        }
+        return $cols;
+    }
+
+    // }}}
+    // {{{ free()
+
+    /**
+     * Free the internal resources associated with $result.
+     *
+     * @return boolean true on success, false if $result is invalid
+     * @access public
+     */
+    function free()
+    {
+        if (is_resource($this->result) && $this->db->connection) {
+            $free = @OCIFreeCursor($this->result);
+            if (false === $free) {
+                return $this->db->raiseError(null, null, null,
+                    'Could not free result', __FUNCTION__);
+            }
+        }
+        $this->result = false;
+        return MDB2_OK;
+
+    }
+}
+
+/**
+ * MDB2 OCI8 buffered result driver
+ *
+ * @package MDB2
+ * @category Database
+ * @author Lukas Smith <smith@pooteeweet.org>
+ */
+class MDB2_BufferedResult_oci8 extends MDB2_Result_oci8
+{
+    var $buffer;
+    var $buffer_rownum = - 1;
+
+    // {{{ _fillBuffer()
+
+    /**
+     * Fill the row buffer
+     *
+     * @param int $rownum   row number upto which the buffer should be filled
+                            if the row number is null all rows are ready into the buffer
+     * @return boolean true on success, false on failure
+     * @access protected
+     */
+    function _fillBuffer($rownum = null)
+    {
+        if (isset($this->buffer) && is_array($this->buffer)) {
+            if (null === $rownum) {
+                if (!end($this->buffer)) {
+                    return false;
+                }
+            } elseif (isset($this->buffer[$rownum])) {
+                return (bool)$this->buffer[$rownum];
+            }
+        }
+
+        $row = true;
+        while (((null === $rownum) || $this->buffer_rownum < $rownum)
+            && ($row = @OCIFetchInto($this->result, $buffer, OCI_RETURN_NULLS))
+        ) {
+            ++$this->buffer_rownum;
+            // remove additional column at the end
+            if ($this->offset > 0) {
+                array_pop($buffer);
+            }
+            if (empty($this->types)) {
+                foreach (array_keys($buffer) as $key) {
+                    if (is_a($buffer[$key], 'oci-lob')) {
+                        $buffer[$key] = $buffer[$key]->load();
+                    }
+                }
+            }
+            $this->buffer[$this->buffer_rownum] = $buffer;
+        }
+
+        if (!$row) {
+            ++$this->buffer_rownum;
+            $this->buffer[$this->buffer_rownum] = false;
+            return false;
+        }
+        return true;
+    }
+
+    // }}}
+    // {{{ fetchRow()
+
+    /**
+     * Fetch a row and insert the data into an existing array.
+     *
+     * @param int       $fetchmode  how the array data should be indexed
+     * @param int    $rownum    number of the row where the data can be found
+     * @return int data array on success, a MDB2 error on failure
+     * @access public
+     */
+    function fetchRow($fetchmode = MDB2_FETCHMODE_DEFAULT, $rownum = null)
+    {
+        if (false === $this->result) {
+            $err = $this->db->raiseError(MDB2_ERROR_NEED_MORE_DATA, null, null,
+                'resultset has already been freed', __FUNCTION__);
+            return $err;
+        }
+        if (null === $this->result) {
+            return null;
+        }
+        if (null !== $rownum) {
+            $seek = $this->seek($rownum);
+            if (PEAR::isError($seek)) {
+                return $seek;
+            }
+        }
+        $target_rownum = $this->rownum + 1;
+        if ($fetchmode == MDB2_FETCHMODE_DEFAULT) {
+            $fetchmode = $this->db->fetchmode;
+        }
+        if (!$this->_fillBuffer($target_rownum)) {
+            return null;
+        }
+        $row = $this->buffer[$target_rownum];
+        if ($fetchmode & MDB2_FETCHMODE_ASSOC) {
+            $column_names = $this->getColumnNames();
+            foreach ($column_names as $name => $i) {
+                $column_names[$name] = $row[$i];
+            }
+            $row = $column_names;
+        }
+        $mode = 0;
+        $rtrim = false;
+        if ($this->db->options['portability'] & MDB2_PORTABILITY_RTRIM) {
+            if (empty($this->types)) {
+                $mode += MDB2_PORTABILITY_RTRIM;
+            } else {
+                $rtrim = true;
+            }
+        }
+        if ($mode) {
+            $this->db->_fixResultArrayValues($row, $mode);
+        }
+        if (!empty($this->types)) {
+            $row = $this->db->datatype->convertResultRow($this->types, $row, $rtrim);
+        }
+        if (!empty($this->values)) {
+            $this->_assignBindColumns($row);
+        }
+        if ($fetchmode === MDB2_FETCHMODE_OBJECT) {
+            $object_class = $this->db->options['fetch_class'];
+            if ($object_class == 'stdClass') {
+                $row = (object) $row;
+            } else {
+                $rowObj = new $object_class($row);
+                $row = $rowObj;
+            }
+        }
+        ++$this->rownum;
+        return $row;
+    }
+
+    // }}}
+    // {{{ seek()
+
+    /**
+     * Seek to a specific row in a result set
+     *
+     * @param int    $rownum    number of the row where the data can be found
+     * @return mixed MDB2_OK on success, a MDB2 error on failure
+     * @access public
+     */
+    function seek($rownum = 0)
+    {
+        if (false === $this->result) {
+            return $this->db->raiseError(MDB2_ERROR_NEED_MORE_DATA, null, null,
+                'resultset has already been freed', __FUNCTION__);
+        }
+        $this->rownum = $rownum - 1;
+        return MDB2_OK;
+    }
+
+    // }}}
+    // {{{ valid()
+
+    /**
+     * Check if the end of the result set has been reached
+     *
+     * @return mixed true or false on sucess, a MDB2 error on failure
+     * @access public
+     */
+    function valid()
+    {
+        if (false === $this->result) {
+            return $this->db->raiseError(MDB2_ERROR_NEED_MORE_DATA, null, null,
+                'resultset has already been freed', __FUNCTION__);
+        }
+        if (null === $this->result) {
+            return true;
+        }
+        if ($this->_fillBuffer($this->rownum + 1)) {
+            return true;
+        }
+        return false;
+    }
+
+    // }}}
+    // {{{ numRows()
+
+    /**
+     * Returns the number of rows in a result object
+     *
+     * @return mixed MDB2 Error Object or the number of rows
+     * @access public
+     */
+    function numRows()
+    {
+        if (false === $this->result) {
+            return $this->db->raiseError(MDB2_ERROR_NEED_MORE_DATA, null, null,
+                'resultset has already been freed', __FUNCTION__);
+        }
+        if (null === $this->result) {
+            return 0;
+        }
+        $this->_fillBuffer();
+        return $this->buffer_rownum;
+    }
+
+    // }}}
+    // {{{ free()
+
+    /**
+     * Free the internal resources associated with $result.
+     *
+     * @return boolean true on success, false if $result is invalid
+     * @access public
+     */
+    function free()
+    {
+        $this->buffer = null;
+        $this->buffer_rownum = null;
+        return parent::free();
+    }
+}
+
+/**
+ * MDB2 OCI8 statement driver
+ *
+ * @package MDB2
+ * @category Database
+ * @author Lukas Smith <smith@pooteeweet.org>
+ */
+class MDB2_Statement_oci8 extends MDB2_Statement_Common
+{
+    // {{{ Variables (Properties)
+
+    var $type_maxlengths = array();
+
+    // }}}
+    // {{{ bindParam()
+
+    /**
+     * Bind a variable to a parameter of a prepared query.
+     *
+     * @param   int     $parameter  the order number of the parameter in the query
+     *                               statement. The order number of the first parameter is 1.
+     * @param   mixed   &$value     variable that is meant to be bound to specified
+     *                               parameter. The type of the value depends on the $type argument.
+     * @param   string  $type       specifies the type of the field
+     * @param   int     $maxlength  specifies the maximum length of the field; if set to -1, the
+     *                               current length of $value is used
+     *
+     * @return  mixed   MDB2_OK on success, a MDB2 error on failure
+     *
+     * @access  public
+     */
+    function bindParam($parameter, &$value, $type = null, $maxlength = -1)
+    {
+        if (!is_numeric($parameter)) {
+            $parameter = preg_replace('/^:(.*)$/', '\\1', $parameter);
+        }
+        if (MDB2_OK === ($ret = parent::bindParam($parameter, $value, $type))) {
+            $this->type_maxlengths[$parameter] = $maxlength;
+        }
+
+        return $ret;
+    }
+
+    // }}}
+    // {{{ _execute()
+
+    /**
+     * Execute a prepared query statement helper method.
+     *
+     * @param mixed $result_class string which specifies which result class to use
+     * @param mixed $result_wrap_class string which specifies which class to wrap results in
+     *
+     * @return mixed MDB2_Result or integer (affected rows) on success,
+     *               a MDB2 error on failure
+     * @access private
+     */
+    function _execute($result_class = true, $result_wrap_class = false)
+    {
+        if (null === $this->statement) {
+            return parent::_execute($result_class, $result_wrap_class);
+        }
+        $this->db->last_query = $this->query;
+        $this->db->debug($this->query, 'execute', array('is_manip' => $this->is_manip, 'when' => 'pre', 'parameters' => $this->values));
+        if ($this->db->getOption('disable_query')) {
+            $result = $this->is_manip ? 0 : null;
+            return $result;
+        }
+
+        $connection = $this->db->getConnection();
+        if (PEAR::isError($connection)) {
+            return $connection;
+        }
+
+        $result = MDB2_OK;
+        $lobs = $quoted_values = array();
+        $i = 0;
+        foreach ($this->positions as $parameter) {
+            if (!array_key_exists($parameter, $this->values)) {
+                return $this->db->raiseError(MDB2_ERROR_NOT_FOUND, null, null,
+                    'Unable to bind to missing placeholder: '.$parameter, __FUNCTION__);
+            }
+            $type = array_key_exists($parameter, $this->types) ? $this->types[$parameter] : null;
+            if ($type == 'clob' || $type == 'blob') {
+                $lobs[$i]['file'] = false;
+                if (is_resource($this->values[$parameter])) {
+                    $fp = $this->values[$parameter];
+                    $this->values[$parameter] = '';
+                    while (!feof($fp)) {
+                        $this->values[$parameter] .= fread($fp, 8192);
+                    }
+                } elseif (is_a($this->values[$parameter], 'OCI-Lob')) {
+                    //do nothing
+                } elseif ($this->db->getOption('lob_allow_url_include')
+                          && preg_match('/^(\w+:\/\/)(.*)$/', $this->values[$parameter], $match)
+                ) {
+                    $lobs[$i]['file'] = true;
+                    if ($match[1] == 'file://') {
+                        $this->values[$parameter] = $match[2];
+                    }
+                }
+                $lobs[$i]['value'] = $this->values[$parameter];
+                $lobs[$i]['descriptor'] =& $this->values[$parameter];
+                // Test to see if descriptor has already been created for this
+                // variable (i.e. if it has been bound more than once):
+                if (!is_a($this->values[$parameter], 'OCI-Lob')) {
+                    $this->values[$parameter] = @OCINewDescriptor($connection, OCI_D_LOB);
+                    if (false === $this->values[$parameter]) {
+                        $result = $this->db->raiseError(null, null, null,
+                            'Unable to create descriptor for LOB in parameter: '.$parameter, __FUNCTION__);
+                        break;
+                    }
+                }
+                $lob_type = ($type == 'blob' ? OCI_B_BLOB : OCI_B_CLOB);
+                if (!@OCIBindByName($this->statement, ':'.$parameter, $lobs[$i]['descriptor'], -1, $lob_type)) {
+                    $result = $this->db->raiseError($this->statement, null, null,
+                        'could not bind LOB parameter', __FUNCTION__);
+                    break;
+                }
+            } else if ($type == OCI_B_BFILE) {
+                // Test to see if descriptor has already been created for this
+                // variable (i.e. if it has been bound more than once):
+                if (!is_a($this->values[$parameter], "OCI-Lob")) {
+                    $this->values[$parameter] = @OCINewDescriptor($connection, OCI_D_FILE);
+                    if (false === $this->values[$parameter]) {
+                        $result = $this->db->raiseError(null, null, null,
+                            'Unable to create descriptor for BFILE in parameter: '.$parameter, __FUNCTION__);
+                        break;
+                    }
+                }
+                if (!@OCIBindByName($this->statement, ':'.$parameter, $this->values[$parameter], -1, $type)) {
+                    $result = $this->db->raiseError($this->statement, null, null,
+                        'Could not bind BFILE parameter', __FUNCTION__);
+                    break;
+                }
+            } else if ($type == OCI_B_ROWID) {
+                // Test to see if descriptor has already been created for this
+                // variable (i.e. if it has been bound more than once):
+                if (!is_a($this->values[$parameter], "OCI-Lob")) {
+                    $this->values[$parameter] = @OCINewDescriptor($connection, OCI_D_ROWID);
+                    if (false === $this->values[$parameter]) {
+                        $result = $this->db->raiseError(null, null, null,
+                            'Unable to create descriptor for ROWID in parameter: '.$parameter, __FUNCTION__);
+                        break;
+                    }
+                }
+                if (!@OCIBindByName($this->statement, ':'.$parameter, $this->values[$parameter], -1, $type)) {
+                    $result = $this->db->raiseError($this->statement, null, null,
+                        'Could not bind ROWID parameter', __FUNCTION__);
+                    break;
+                }
+            } else if ($type == OCI_B_CURSOR) {
+                // Test to see if cursor has already been allocated for this
+                // variable (i.e. if it has been bound more than once):
+                if (!is_resource($this->values[$parameter]) || !get_resource_type($this->values[$parameter]) == "oci8 statement") {
+                    $this->values[$parameter] = @OCINewCursor($connection);
+                    if (false === $this->values[$parameter]) {
+                        $result = $this->db->raiseError(null, null, null,
+                        'Unable to allocate cursor for parameter: '.$parameter, __FUNCTION__);
+                    break;
+                    }
+                }
+                if (!@OCIBindByName($this->statement, ':'.$parameter, $this->values[$parameter], -1, $type)) {
+                    $result = $this->db->raiseError($this->statement, null, null,
+                        'Could not bind CURSOR parameter', __FUNCTION__);
+                    break;
+                }
+            } else {
+                $maxlength = array_key_exists($parameter, $this->type_maxlengths) ? $this->type_maxlengths[$parameter] : -1;
+                $this->values[$parameter] = $this->db->quote($this->values[$parameter], $type, false);
+                $quoted_values[$i] =& $this->values[$parameter];
+                if (PEAR::isError($quoted_values[$i])) {
+                    return $quoted_values[$i];
+                }
+                if (!@OCIBindByName($this->statement, ':'.$parameter, $quoted_values[$i], $maxlength)) {
+                    $result = $this->db->raiseError($this->statement, null, null,
+                        'could not bind non-abstract parameter', __FUNCTION__);
+                    break;
+                }
+            }
+            ++$i;
+        }
+
+        $lob_keys = array_keys($lobs);
+        if (!PEAR::isError($result)) {
+            $mode = (!empty($lobs) || $this->db->in_transaction) ? OCI_DEFAULT : OCI_COMMIT_ON_SUCCESS;
+            if (!@OCIExecute($this->statement, $mode)) {
+                $err = $this->db->raiseError($this->statement, null, null,
+                    'could not execute statement', __FUNCTION__);
+                return $err;
+            }
+
+            if (!empty($lobs)) {
+                foreach ($lob_keys as $i) {
+                    if ((null !== $lobs[$i]['value']) && $lobs[$i]['value'] !== '') {
+                        if (is_object($lobs[$i]['value'])) {
+                            // Probably a NULL LOB
+                            // @see http://bugs.php.net/bug.php?id=27485
+                            continue;
+                        }
+                        if ($lobs[$i]['file']) {
+                            $result = $lobs[$i]['descriptor']->savefile($lobs[$i]['value']);
+                        } else {
+                            $result = $lobs[$i]['descriptor']->save($lobs[$i]['value']);
+                        }
+                        if (!$result) {
+                            $result = $this->db->raiseError(null, null, null,
+                                'Unable to save descriptor contents', __FUNCTION__);
+                            break;
+                        }
+                    }
+                }
+
+                if (!PEAR::isError($result)) {
+                    if (!$this->db->in_transaction) {
+                        if (!@OCICommit($connection)) {
+                            $result = $this->db->raiseError(null, null, null,
+                                'Unable to commit transaction', __FUNCTION__);
+                        }
+                    } else {
+                        ++$this->db->uncommitedqueries;
+                    }
+                }
+            }
+        }
+
+        if (PEAR::isError($result)) {
+            return $result;
+        }
+
+        if ($this->is_manip) {
+            $affected_rows = $this->db->_affectedRows($connection, $this->statement);
+            return $affected_rows;
+        }
+
+        $result = $this->db->_wrapResult($this->statement, $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;
+    }
+
+    // }}}
+    // {{{ free()
+
+    /**
+     * Release resources allocated for the specified prepared query.
+     *
+     * @return mixed MDB2_OK on success, a MDB2 error on failure
+     * @access public
+     */
+    function free()
+    {
+        if (null === $this->positions) {
+            return $this->db->raiseError(MDB2_ERROR, null, null,
+                'Prepared statement has already been freed', __FUNCTION__);
+        }
+        $result = MDB2_OK;
+
+        if ((null !== $this->statement) && !@OCIFreeStatement($this->statement)) {
+            $result = $this->db->raiseError(null, null, null,
+                'Could not free statement', __FUNCTION__);
+        }
+
+        parent::free();
+        return $result;
+    }
+}
+?>
\ No newline at end of file

From 3c5670b662ea9e5ee36146f10f63faaadacb8187 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= <jfd@butonic.de>
Date: Thu, 19 Jul 2012 12:12:17 +0200
Subject: [PATCH 0519/1224] comment extra timestamp quotation for oci8. Oracle
 can handle CURRENT_TIMESTAMP pretty well

---
 3rdparty/MDB2/Driver/Datatype/oci8.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/3rdparty/MDB2/Driver/Datatype/oci8.php b/3rdparty/MDB2/Driver/Datatype/oci8.php
index f633b0e215..4d2e792a80 100644
--- a/3rdparty/MDB2/Driver/Datatype/oci8.php
+++ b/3rdparty/MDB2/Driver/Datatype/oci8.php
@@ -241,10 +241,10 @@ class MDB2_Driver_Datatype_oci8 extends MDB2_Driver_Datatype_Common
      *        a DBMS specific format.
      * @access protected
      */
-    function _quoteTimestamp($value, $quote, $escape_wildcards)
-    {
-       return $this->_quoteText($value, $quote, $escape_wildcards);
-    }
+    //function _quoteTimestamp($value, $quote, $escape_wildcards)
+    //{
+    //   return $this->_quoteText($value, $quote, $escape_wildcards);
+    //}
 
     // }}}
     // {{{ _quoteTime()

From ede464f05872574a703c36d8d976b5c97e55c23f Mon Sep 17 00:00:00 2001
From: jfd <jfd@underverse>
Date: Mon, 30 Jul 2012 20:46:14 +0200
Subject: [PATCH 0520/1224] escape all identifiers with backticks

---
 apps/bookmarks/ajax/editBookmark.php     | 37 +++++++++------
 apps/bookmarks/ajax/recordClick.php      | 12 ++---
 apps/bookmarks/appinfo/migrate.php       |  8 ++--
 apps/bookmarks/bookmarksHelper.php       | 10 ++--
 apps/bookmarks/lib/bookmarks.php         | 50 ++++++++++----------
 apps/calendar/appinfo/update.php         |  6 +--
 apps/calendar/lib/calendar.php           | 20 ++++----
 apps/calendar/lib/object.php             | 28 ++++++------
 apps/calendar/lib/share.php              | 36 +++++++--------
 apps/contacts/appinfo/migrate.php        |  4 +-
 apps/contacts/lib/addressbook.php        | 16 +++----
 apps/contacts/lib/vcard.php              | 24 +++++-----
 apps/files/appinfo/update.php            | 18 ++++----
 apps/files_sharing/lib_share.php         | 58 ++++++++++++------------
 apps/files_sharing/sharedstorage.php     |  4 +-
 apps/gallery/appinfo/app.php             |  2 +-
 apps/gallery/appinfo/update.php          |  4 +-
 apps/gallery/lib/album.php               | 26 +++++------
 apps/gallery/lib/managers.php            |  4 +-
 apps/gallery/lib/photo.php               | 24 +++++-----
 apps/gallery/lib/sharing.php             | 14 +++---
 apps/media/lib_ampache.php               | 10 ++--
 apps/media/lib_collection.php            | 50 ++++++++++----------
 apps/media/lib_media.php                 |  4 +-
 apps/remoteStorage/lib_remoteStorage.php | 10 ++--
 apps/user_ldap/appinfo/update.php        |  2 +-
 apps/user_ldap/lib_ldap.php              | 26 +++++------
 apps/user_openid/user_openid.php         |  2 +-
 lib/app.php                              |  4 +-
 lib/appconfig.php                        | 26 +++++------
 lib/connector/sabre/locks.php            | 12 ++---
 lib/connector/sabre/node.php             | 10 ++--
 lib/filecache.php                        | 46 +++++++++----------
 lib/group/database.php                   | 20 ++++----
 lib/migrate.php                          |  2 +-
 lib/migration/content.php                |  4 +-
 lib/preferences.php                      | 22 ++++-----
 lib/user/database.php                    | 10 ++--
 lib/vcategories.php                      |  2 +-
 39 files changed, 337 insertions(+), 330 deletions(-)

diff --git a/apps/bookmarks/ajax/editBookmark.php b/apps/bookmarks/ajax/editBookmark.php
index 36258f7096..8c1b19cf0c 100644
--- a/apps/bookmarks/ajax/editBookmark.php
+++ b/apps/bookmarks/ajax/editBookmark.php
@@ -36,6 +36,8 @@ if( $CONFIG_DBTYPE == 'sqlite' or $CONFIG_DBTYPE == 'sqlite3' ){
 	$_ut = "strftime('%s','now')";
 } elseif($CONFIG_DBTYPE == 'pgsql') {
 	$_ut = 'date_part(\'epoch\',now())::integer';
+} elseif($CONFIG_DBTYPE == 'oci') {
+	$_ut = '(oracletime - to_date(\'19700101\',\'YYYYMMDD\')) * 86400';
 } else {
 	$_ut = "UNIX_TIMESTAMP()";
 }
@@ -43,12 +45,13 @@ 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 = ?
-	AND user_id = ?
-	");
+//TODO check using CURRENT_TIMESTAMP? prepare already does magic when using now()
+$query = OCP\DB::prepare('
+	UPDATE `*PREFIX*bookmarks`
+	SET `url` = ?, `title` = ?, `lastmodified` = '.$_ut.'
+	WHERE `id` = ?
+	AND `user_id` = ?
+	');
 
 $params=array(
 	htmlspecialchars_decode($_POST["url"]),
@@ -63,18 +66,22 @@ $result = $query->execute($params);
 if ($result->numRows() == 0) exit();
 
 # Remove old tags and insert new ones.
-$query = OCP\DB::prepare("
-	DELETE FROM *PREFIX*bookmarks_tags
-	WHERE bookmark_id = $bookmark_id
-	");
+$query = OCP\DB::prepare('
+	DELETE FROM `*PREFIX*bookmarks_tags`
+	WHERE `bookmark_id` = ?
+	');
 
-$query->execute();
+$params=array(
+	$bookmark_id
+	);
 
-$query = OCP\DB::prepare("
-	INSERT INTO *PREFIX*bookmarks_tags
-	(bookmark_id, tag)
+$query->execute($params);
+
+$query = OCP\DB::prepare('
+	INSERT INTO `*PREFIX*bookmarks_tags`
+	(`bookmark_id`, `tag`)
 	VALUES (?, ?)
-	");
+	');
 
 $tags = explode(' ', urldecode($_POST["tags"]));
 foreach ($tags as $tag) {
diff --git a/apps/bookmarks/ajax/recordClick.php b/apps/bookmarks/ajax/recordClick.php
index 1eee1718d1..332d58262e 100644
--- a/apps/bookmarks/ajax/recordClick.php
+++ b/apps/bookmarks/ajax/recordClick.php
@@ -30,12 +30,12 @@ $RUNTIME_NOSETUPFS=true;
 OCP\JSON::checkLoggedIn();
 OCP\JSON::checkAppEnabled('bookmarks');
 
-$query = OCP\DB::prepare("
-	UPDATE *PREFIX*bookmarks
-	SET clickcount = clickcount + 1
-	WHERE user_id = ?
-		AND url LIKE ?
-	");
+$query = OCP\DB::prepare('
+	UPDATE `*PREFIX*bookmarks`
+	SET `clickcount` = `clickcount` + 1
+	WHERE `user_id` = ?
+		AND `url` LIKE ?
+	');
 	
 $params=array(OCP\USER::getUser(), htmlspecialchars_decode($_POST["url"]));
 $bookmarks = $query->execute($params);
diff --git a/apps/bookmarks/appinfo/migrate.php b/apps/bookmarks/appinfo/migrate.php
index e7e572f52d..f14469269a 100644
--- a/apps/bookmarks/appinfo/migrate.php
+++ b/apps/bookmarks/appinfo/migrate.php
@@ -35,23 +35,23 @@ class OC_Migration_Provider_Bookmarks extends OC_Migration_Provider{
 		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 bookmarks WHERE user_id LIKE ?" );
+				$query = $this->content->prepare( "SELECT * FROM `bookmarks` WHERE `user_id` LIKE ?" );
 				$results = $query->execute( array( $this->olduid ) );
 				$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 = 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'] ) );
 					// Map the id
 					$idmap[$row['id']] = OCP\DB::insertid();
 				}
 				// Now tags
 				foreach($idmap as $oldid => $newid){
-					$query = $this->content->prepare( "SELECT * FROM bookmarks_tags WHERE bookmark_id LIKE ?" );
+					$query = $this->content->prepare( "SELECT * FROM `bookmarks_tags` WHERE `bookmark_id` 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*bookmarks_tags(bookmark_id, tag) VALUES (?, ?)" );
+						$query = OCP\DB::prepare( "INSERT INTO `*PREFIX*bookmarks_tags`(`bookmark_id`, `tag`) VALUES (?, ?)" );
 						$query->execute( array( $newid, $row['tag'] ) );	
 					}		
 				}
diff --git a/apps/bookmarks/bookmarksHelper.php b/apps/bookmarks/bookmarksHelper.php
index 01b551111e..cb0ca06c72 100644
--- a/apps/bookmarks/bookmarksHelper.php
+++ b/apps/bookmarks/bookmarksHelper.php
@@ -83,8 +83,8 @@ function addBookmark($url, $title, $tags='') {
 	
 	//FIXME: Detect when user adds a known URL
 	$query = OCP\DB::prepare("
-		INSERT INTO *PREFIX*bookmarks
-		(url, title, user_id, public, added, lastmodified)
+		INSERT INTO `*PREFIX*bookmarks`
+		(`url`, `title`, `user_id`, `public`, `added`, `lastmodified`)
 		VALUES (?, ?, ?, 0, $_ut, $_ut)
 		");
 	
@@ -109,8 +109,8 @@ function addBookmark($url, $title, $tags='') {
 	
 	if($b_id !== false) {
 		$query = OCP\DB::prepare("
-			INSERT INTO *PREFIX*bookmarks_tags
-			(bookmark_id, tag)
+			INSERT INTO `*PREFIX*bookmarks_tags`
+			(`bookmark_id`, `tag`)
 			VALUES (?, ?)
 			");
 	
@@ -126,4 +126,4 @@ function addBookmark($url, $title, $tags='') {
 	
 		return $b_id;
 	}
-}
\ No newline at end of file
+}
diff --git a/apps/bookmarks/lib/bookmarks.php b/apps/bookmarks/lib/bookmarks.php
index e0005968f3..4b9e3d6438 100644
--- a/apps/bookmarks/lib/bookmarks.php
+++ b/apps/bookmarks/lib/bookmarks.php
@@ -71,14 +71,14 @@ class OC_Bookmarks_Bookmarks{
 
 		if($CONFIG_DBTYPE == 'pgsql' ){
 			$query = OCP\DB::prepare('
-				SELECT id, url, title, '.($filterTagOnly?'':'url || title ||').' array_to_string(array_agg(tag), \' \') as tags
-				FROM *PREFIX*bookmarks
-				LEFT JOIN *PREFIX*bookmarks_tags ON *PREFIX*bookmarks.id = *PREFIX*bookmarks_tags.bookmark_id 
+				SELECT `id`, `url`, `title`, '.($filterTagOnly?'':'`url` || `title` ||').' array_to_string(array_agg(`tag`), \' \') as `tags`
+				FROM `*PREFIX*bookmarks`
+				LEFT JOIN `*PREFIX*bookmarks_tags` ON `*PREFIX*bookmarks`.`id` = `*PREFIX*bookmarks_tags`.`bookmark_id` 
 				WHERE 
-					*PREFIX*bookmarks.user_id = ?
-				GROUP BY id, url, title
+					`*PREFIX*bookmarks`.`user_id` = ?
+				GROUP BY `id`, `url`, `title`
 				'.$sqlFilterTag.'
-				ORDER BY *PREFIX*bookmarks.'.$sqlSortColumn.' DESC 
+				ORDER BY `*PREFIX*bookmarks`.`'.$sqlSortColumn.'` DESC 
 				LIMIT 10
 				OFFSET '. $offset);
 		} else {
@@ -88,25 +88,25 @@ class OC_Bookmarks_Bookmarks{
 				$concatFunction = 'Concat(Concat( url, title), ';
 		
 			$query = OCP\DB::prepare('
-				SELECT id, url, title, '
+				SELECT `id`, `url`, `title`, '
 				.($filterTagOnly?'':$concatFunction).
-				'CASE WHEN *PREFIX*bookmarks.id = *PREFIX*bookmarks_tags.bookmark_id
-						THEN GROUP_CONCAT( tag ' .$_gc_separator. ' )
+				'CASE WHEN `*PREFIX*bookmarks`.`id` = `*PREFIX*bookmarks_tags`.`bookmark_id`
+						THEN GROUP_CONCAT( `tag` ' .$_gc_separator. ' )
 						ELSE \' \'
 					END '
 				.($filterTagOnly?'':')').'
-					AS tags
-				FROM *PREFIX*bookmarks
-				LEFT JOIN *PREFIX*bookmarks_tags ON 1=1
-				WHERE (*PREFIX*bookmarks.id = *PREFIX*bookmarks_tags.bookmark_id 
-						OR *PREFIX*bookmarks.id NOT IN (
-							SELECT *PREFIX*bookmarks_tags.bookmark_id FROM *PREFIX*bookmarks_tags
+					AS `tags`
+				FROM `*PREFIX*bookmarks`
+				LEFT JOIN `*PREFIX*bookmarks_tags` ON 1=1
+				WHERE (`*PREFIX*bookmarks`.`id` = `*PREFIX*bookmarks_tags`.`bookmark_id` 
+						OR `*PREFIX*bookmarks`.`id` NOT IN (
+							SELECT `*PREFIX*bookmarks_tags`.`bookmark_id` FROM `*PREFIX*bookmarks_tags`
 						)
 					)
-					AND *PREFIX*bookmarks.user_id = ?
-				GROUP BY url
+					AND `*PREFIX*bookmarks`.`user_id` = ?
+				GROUP BY `url`
 				'.$sqlFilterTag.'
-				ORDER BY *PREFIX*bookmarks.'.$sqlSortColumn.' DESC
+				ORDER BY `*PREFIX*bookmarks`.`'.$sqlSortColumn.'` DESC
 				LIMIT '.$offset.',  10');
 		}
 
@@ -119,9 +119,9 @@ class OC_Bookmarks_Bookmarks{
 		$user = OCP\USER::getUser();
 
 		$query = OCP\DB::prepare("
-				SELECT id FROM *PREFIX*bookmarks
-				WHERE id = ?
-				AND user_id = ?
+				SELECT `id` FROM `*PREFIX*bookmarks`
+				WHERE `id` = ?
+				AND `user_id` = ?
 				");
 
 		$result = $query->execute(array($id, $user));
@@ -131,15 +131,15 @@ class OC_Bookmarks_Bookmarks{
 		}
 
 		$query = OCP\DB::prepare("
-			DELETE FROM *PREFIX*bookmarks
-			WHERE id = $id
+			DELETE FROM `*PREFIX*bookmarks`
+			WHERE `id` = $id
 			");
 
 		$result = $query->execute();
 
 		$query = OCP\DB::prepare("
-			DELETE FROM *PREFIX*bookmarks_tags
-			WHERE bookmark_id = $id
+			DELETE FROM `*PREFIX*bookmarks_tags`
+			WHERE `bookmark_id` = $id
 			");
 
 		$result = $query->execute();
diff --git a/apps/calendar/appinfo/update.php b/apps/calendar/appinfo/update.php
index ce7f304a49..3b5998d998 100644
--- a/apps/calendar/appinfo/update.php
+++ b/apps/calendar/appinfo/update.php
@@ -2,7 +2,7 @@
 
 $installedVersion=OCP\Config::getAppValue('calendar', 'installed_version');
 if (version_compare($installedVersion, '0.2.1', '<')) {
-	$stmt = OCP\DB::prepare( 'SELECT id, calendarcolor FROM *PREFIX*calendar_calendars WHERE calendarcolor IS NOT NULL' );
+	$stmt = OCP\DB::prepare( 'SELECT `id`, `calendarcolor` FROM `*PREFIX*calendar_calendars` WHERE `calendarcolor` IS NOT NULL' );
 	$result = $stmt->execute();
 	while( $row = $result->fetchRow()) {
 		$id = $row['id'];
@@ -11,7 +11,7 @@ if (version_compare($installedVersion, '0.2.1', '<')) {
 			continue;
 		}
 		$color = '#' .$color;
-		$stmt = OCP\DB::prepare( 'UPDATE *PREFIX*calendar_calendars SET calendarcolor=? WHERE id=?' );
+		$stmt = OCP\DB::prepare( 'UPDATE `*PREFIX*calendar_calendars` SET `calendarcolor`=? WHERE `id`=?' );
 		$r = $stmt->execute(array($color,$id));
 	}
-}
\ No newline at end of file
+}
diff --git a/apps/calendar/lib/calendar.php b/apps/calendar/lib/calendar.php
index 869b35e2e1..09cbee204d 100644
--- a/apps/calendar/lib/calendar.php
+++ b/apps/calendar/lib/calendar.php
@@ -51,10 +51,10 @@ class OC_Calendar_Calendar{
 		$values = array($uid);
 		$active_where = '';
 		if (!is_null($active) && $active){
-			$active_where = ' AND active = ?';
+			$active_where = ' AND `active` = ?';
 			$values[] = $active;
 		}
-		$stmt = OCP\DB::prepare( 'SELECT * FROM *PREFIX*calendar_calendars WHERE userid = ?' . $active_where );
+		$stmt = OCP\DB::prepare( 'SELECT * FROM `*PREFIX*calendar_calendars` WHERE `userid` = ?' . $active_where );
 		$result = $stmt->execute($values);
 
 		$calendars = array();
@@ -81,7 +81,7 @@ class OC_Calendar_Calendar{
 	 * @return associative array
 	 */
 	public static function find($id){
-		$stmt = OCP\DB::prepare( 'SELECT * FROM *PREFIX*calendar_calendars WHERE id = ?' );
+		$stmt = OCP\DB::prepare( 'SELECT * FROM `*PREFIX*calendar_calendars` WHERE `id` = ?' );
 		$result = $stmt->execute(array($id));
 
 		return $result->fetchRow();
@@ -106,7 +106,7 @@ class OC_Calendar_Calendar{
 
 		$uri = self::createURI($name, $uris );
 
-		$stmt = OCP\DB::prepare( 'INSERT INTO *PREFIX*calendar_calendars (userid,displayname,uri,ctag,calendarorder,calendarcolor,timezone,components) VALUES(?,?,?,?,?,?,?,?)' );
+		$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');
@@ -126,7 +126,7 @@ class OC_Calendar_Calendar{
 	public static function addCalendarFromDAVData($principaluri,$uri,$name,$components,$timezone,$order,$color){
 		$userid = self::extractUserID($principaluri);
 
-		$stmt = OCP\DB::prepare( 'INSERT INTO *PREFIX*calendar_calendars (userid,displayname,uri,ctag,calendarorder,calendarcolor,timezone,components) VALUES(?,?,?,?,?,?,?,?)' );
+		$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');
@@ -155,7 +155,7 @@ class OC_Calendar_Calendar{
 		if(is_null($order)) $order = $calendar['calendarorder'];
 		if(is_null($color)) $color = $calendar['calendarcolor'];
 
-		$stmt = OCP\DB::prepare( 'UPDATE *PREFIX*calendar_calendars SET displayname=?,calendarorder=?,calendarcolor=?,timezone=?,components=?,ctag=ctag+1 WHERE id=?' );
+		$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));
 
 		return true;
@@ -168,7 +168,7 @@ class OC_Calendar_Calendar{
 	 * @return boolean
 	 */
 	public static function setCalendarActive($id,$active){
-		$stmt = OCP\DB::prepare( 'UPDATE *PREFIX*calendar_calendars SET active = ? WHERE id = ?' );
+		$stmt = OCP\DB::prepare( 'UPDATE `*PREFIX*calendar_calendars` SET `active` = ? WHERE `id` = ?' );
 		$stmt->execute(array($active, $id));
 
 		return true;
@@ -180,7 +180,7 @@ class OC_Calendar_Calendar{
 	 * @return boolean
 	 */
 	public static function touchCalendar($id){
-		$stmt = OCP\DB::prepare( 'UPDATE *PREFIX*calendar_calendars SET ctag = ctag + 1 WHERE id = ?' );
+		$stmt = OCP\DB::prepare( 'UPDATE `*PREFIX*calendar_calendars` SET `ctag` = `ctag` + 1 WHERE `id` = ?' );
 		$stmt->execute(array($id));
 
 		return true;
@@ -192,10 +192,10 @@ class OC_Calendar_Calendar{
 	 * @return boolean
 	 */
 	public static function deleteCalendar($id){
-		$stmt = OCP\DB::prepare( 'DELETE FROM *PREFIX*calendar_calendars WHERE id = ?' );
+		$stmt = OCP\DB::prepare( 'DELETE FROM `*PREFIX*calendar_calendars` WHERE `id` = ?' );
 		$stmt->execute(array($id));
 
-		$stmt = OCP\DB::prepare( 'DELETE FROM *PREFIX*calendar_objects WHERE calendarid = ?' );
+		$stmt = OCP\DB::prepare( 'DELETE FROM `*PREFIX*calendar_objects` WHERE `calendarid` = ?' );
 		$stmt->execute(array($id));
 
 		return true;
diff --git a/apps/calendar/lib/object.php b/apps/calendar/lib/object.php
index 2a6ceaf468..df866bd3c5 100644
--- a/apps/calendar/lib/object.php
+++ b/apps/calendar/lib/object.php
@@ -19,7 +19,7 @@ class OC_Calendar_Object{
 	 * ['calendardata']
 	 */
 	public static function all($id){
-		$stmt = OCP\DB::prepare( 'SELECT * FROM *PREFIX*calendar_objects WHERE calendarid = ?' );
+		$stmt = OCP\DB::prepare( 'SELECT * FROM `*PREFIX*calendar_objects` WHERE `calendarid` = ?' );
 		$result = $stmt->execute(array($id));
 
 		$calendarobjects = array();
@@ -41,10 +41,10 @@ class OC_Calendar_Object{
 	 * in ['calendardata']
 	 */
 	public static function allInPeriod($id, $start, $end){
-		$stmt = OCP\DB::prepare( 'SELECT * FROM *PREFIX*calendar_objects WHERE calendarid = ?'
-		.' AND ((startdate >= ? AND startdate <= ? AND repeating = 0)'
-		.' OR (enddate >= ? AND enddate <= ? AND repeating = 0)'
-		.' OR (startdate <= ? AND repeating = 1))' );
+		$stmt = OCP\DB::prepare( 'SELECT * FROM `*PREFIX*calendar_objects` WHERE `calendarid` = ?'
+		.' AND ((`startdate` >= ? AND `startdate` <= ? AND `repeating` = 0)'
+		.' OR (`enddate` >= ? AND `enddate` <= ? AND `repeating` = 0)'
+		.' OR (`startdate` <= ? AND `repeating` = 1))' );
 		$start = self::getUTCforMDB($start);
 		$end = self::getUTCforMDB($end);
 		$result = $stmt->execute(array($id,
@@ -66,7 +66,7 @@ class OC_Calendar_Object{
 	 * @return associative array
 	 */
 	public static function find($id){
-		$stmt = OCP\DB::prepare( 'SELECT * FROM *PREFIX*calendar_objects WHERE id = ?' );
+		$stmt = OCP\DB::prepare( 'SELECT * FROM `*PREFIX*calendar_objects` WHERE `id` = ?' );
 		$result = $stmt->execute(array($id));
 
 		return $result->fetchRow();
@@ -79,7 +79,7 @@ class OC_Calendar_Object{
 	 * @return associative array
 	 */
 	public static function findWhereDAVDataIs($cid,$uri){
-		$stmt = OCP\DB::prepare( 'SELECT * FROM *PREFIX*calendar_objects WHERE calendarid = ? AND uri = ?' );
+		$stmt = OCP\DB::prepare( 'SELECT * FROM `*PREFIX*calendar_objects` WHERE `calendarid` = ? AND `uri` = ?' );
 		$result = $stmt->execute(array($cid,$uri));
 
 		return $result->fetchRow();
@@ -103,7 +103,7 @@ class OC_Calendar_Object{
 
 		$uri = 'owncloud-'.md5($data.rand().time()).'.ics';
 
-		$stmt = OCP\DB::prepare( 'INSERT INTO *PREFIX*calendar_objects (calendarid,objecttype,startdate,enddate,repeating,summary,calendardata,uri,lastmodified) VALUES(?,?,?,?,?,?,?,?,?)' );
+		$stmt = OCP\DB::prepare( 'INSERT INTO `*PREFIX*calendar_objects` (`calendarid`,`objecttype`,`startdate`,`enddate`,`repeating`,`summary`,`calendardata`,`uri`,`lastmodified`) VALUES(?,?,?,?,?,?,?,?,?)' );
 		$stmt->execute(array($id,$type,$startdate,$enddate,$repeating,$summary,$data,$uri,time()));
 		$object_id = OCP\DB::insertid('*PREFIX*calendar_objects');
 
@@ -123,7 +123,7 @@ class OC_Calendar_Object{
 		$object = OC_VObject::parse($data);
 		list($type,$startdate,$enddate,$summary,$repeating,$uid) = self::extractData($object);
 
-		$stmt = OCP\DB::prepare( 'INSERT INTO *PREFIX*calendar_objects (calendarid,objecttype,startdate,enddate,repeating,summary,calendardata,uri,lastmodified) VALUES(?,?,?,?,?,?,?,?,?)' );
+		$stmt = OCP\DB::prepare( 'INSERT INTO `*PREFIX*calendar_objects` (`calendarid`,`objecttype`,`startdate`,`enddate`,`repeating`,`summary`,`calendardata`,`uri`,`lastmodified`) VALUES(?,?,?,?,?,?,?,?,?)' );
 		$stmt->execute(array($id,$type,$startdate,$enddate,$repeating,$summary,$data,$uri,time()));
 		$object_id = OCP\DB::insertid('*PREFIX*calendar_objects');
 
@@ -145,7 +145,7 @@ class OC_Calendar_Object{
 		OC_Calendar_App::loadCategoriesFromVCalendar($object);
 		list($type,$startdate,$enddate,$summary,$repeating,$uid) = self::extractData($object);
 
-		$stmt = OCP\DB::prepare( 'UPDATE *PREFIX*calendar_objects SET objecttype=?,startdate=?,enddate=?,repeating=?,summary=?,calendardata=?, lastmodified = ? WHERE id = ?' );
+		$stmt = OCP\DB::prepare( 'UPDATE `*PREFIX*calendar_objects` SET `objecttype`=?,`startdate`=?,`enddate`=?,`repeating`=?,`summary`=?,`calendardata`=?,`lastmodified`= ? WHERE `id` = ?' );
 		$stmt->execute(array($type,$startdate,$enddate,$repeating,$summary,$data,time(),$id));
 
 		OC_Calendar_Calendar::touchCalendar($oldobject['calendarid']);
@@ -166,7 +166,7 @@ class OC_Calendar_Object{
 		$object = OC_VObject::parse($data);
 		list($type,$startdate,$enddate,$summary,$repeating,$uid) = self::extractData($object);
 
-		$stmt = OCP\DB::prepare( 'UPDATE *PREFIX*calendar_objects SET objecttype=?,startdate=?,enddate=?,repeating=?,summary=?,calendardata=?, lastmodified = ? WHERE id = ?' );
+		$stmt = OCP\DB::prepare( 'UPDATE `*PREFIX*calendar_objects` SET `objecttype`=?,`startdate`=?,`enddate`=?,`repeating`=?,`summary`=?,`calendardata`=?,`lastmodified`= ? WHERE `id` = ?' );
 		$stmt->execute(array($type,$startdate,$enddate,$repeating,$summary,$data,time(),$oldobject['id']));
 
 		OC_Calendar_Calendar::touchCalendar($oldobject['calendarid']);
@@ -181,7 +181,7 @@ class OC_Calendar_Object{
 	 */
 	public static function delete($id){
 		$oldobject = self::find($id);
-		$stmt = OCP\DB::prepare( 'DELETE FROM *PREFIX*calendar_objects WHERE id = ?' );
+		$stmt = OCP\DB::prepare( 'DELETE FROM `*PREFIX*calendar_objects` WHERE `id` = ?' );
 		$stmt->execute(array($id));
 		OC_Calendar_Calendar::touchCalendar($oldobject['calendarid']);
 
@@ -195,7 +195,7 @@ class OC_Calendar_Object{
 	 * @return boolean
 	 */
 	public static function deleteFromDAVData($cid,$uri){
-		$stmt = OCP\DB::prepare( 'DELETE FROM *PREFIX*calendar_objects WHERE calendarid = ? AND uri=?' );
+		$stmt = OCP\DB::prepare( 'DELETE FROM `*PREFIX*calendar_objects` WHERE `calendarid`= ? AND `uri`=?' );
 		$stmt->execute(array($cid,$uri));
 		OC_Calendar_Calendar::touchCalendar($cid);
 
@@ -203,7 +203,7 @@ class OC_Calendar_Object{
 	}
 
 	public static function moveToCalendar($id, $calendarid){
-		$stmt = OCP\DB::prepare( 'UPDATE *PREFIX*calendar_objects SET calendarid=? WHERE id = ?' );
+		$stmt = OCP\DB::prepare( 'UPDATE `*PREFIX*calendar_objects` SET `calendarid`=? WHERE `id`=?' );
 		$stmt->execute(array($calendarid,$id));
 
 		OC_Calendar_Calendar::touchCalendar($id);
diff --git a/apps/calendar/lib/share.php b/apps/calendar/lib/share.php
index 54c531892f..aba2722165 100644
--- a/apps/calendar/lib/share.php
+++ b/apps/calendar/lib/share.php
@@ -25,7 +25,7 @@ class OC_Calendar_Share{
 		}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);
+		$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()){
@@ -40,7 +40,7 @@ class OC_Calendar_Share{
 	 * @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');
+		$stmt = OCP\DB::prepare('SELECT * FROM `*PREFIX*calendar_share_' . $type . '` WHERE `' . $type . 'id` = ? ORDER BY `share`');
 		$result = $stmt->execute(array($id));
 		$users = array();
 		while( $row = $result->fetchRow()){
@@ -72,7 +72,7 @@ class OC_Calendar_Share{
 		if($sharetype == 'public'){
 			$share = self::generate_token($id, $type);
 		}
-		$stmt = OCP\DB::prepare('INSERT INTO *PREFIX*calendar_share_' . $type . ' (owner,share,sharetype,' . $type . 'id,permissions' . (($type == self::CALENDAR)?', active':'') . ') VALUES(?,?,?,?,0' . (($type == self::CALENDAR)?', 1':'') . ')' );
+		$stmt = OCP\DB::prepare('INSERT INTO `*PREFIX*calendar_share_' . $type . '` (`owner`,`share`,`sharetype`,`' . $type . 'id`,`permissions`' . (($type == self::CALENDAR)?',`active`':'') . ') VALUES(?,?,?,?,0' . (($type == self::CALENDAR)?', 1':'') . ')' );
 		$result = $stmt->execute(array($owner,$share,$sharetype,$id));
 		if($sharetype == 'public'){
 			return $share;
@@ -90,7 +90,7 @@ class OC_Calendar_Share{
 	 * @return (bool)
 	 */
 	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 = ?');
+		$stmt = OCP\DB::prepare('DELETE FROM `*PREFIX*calendar_share_' . $type . '` WHERE `owner` = ? ' . (($sharetype != 'public')?'AND `share` = ?':'') . ' AND `sharetype` = ? AND `' . $type . 'id` = ?');
 		if($sharetype != 'public'){
 			$stmt->execute(array($owner,$share,$sharetype,$id));
 		}else{
@@ -111,7 +111,7 @@ class OC_Calendar_Share{
 		if($sharetype == 'public' && $permission == 1){
 			$permission = 0;
 		}
-		$stmt = OCP\DB::prepare('UPDATE *PREFIX*calendar_share_' . $type . ' SET permissions = ? WHERE share = ? AND sharetype = ? AND ' . $type . 'id = ?');
+		$stmt = OCP\DB::prepare('UPDATE `*PREFIX*calendar_share_' . $type . '` SET `permissions` = ? WHERE `share` = ? AND `sharetype` = ? AND `' . $type . 'id` = ?');
 		$stmt->execute(array($permission, $share, $sharetype, $id));
 		return true;
 	}
@@ -148,7 +148,7 @@ class OC_Calendar_Share{
 	 * @return (bool)
 	 */
 	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 = ?');
+		$stmt = OCP\DB::prepare('SELECT * FROM `*PREFIX*calendar_share_' . $type . '` WHERE `owner` = ? AND `share` = ? AND `sharetype` = ? AND `' . $type . 'id` = ?');
 		$result = $stmt->execute(array($owner, $share, $sharetype, $id));
 		if($result->numRows() > 0){
 			return true;
@@ -160,7 +160,7 @@ class OC_Calendar_Share{
 		$i = 0;
 		foreach($groups as $group){
 			$group_where .= ' OR ';
-			$group_where .= " (share = '" . $group . "' AND sharetype = 'group') ";
+			$group_where .= ' (`share` = \'' . $group . '\' AND `sharetype` = \'group\') ';
 			$i++;
 		}
 		return $group_where;
@@ -168,7 +168,7 @@ class OC_Calendar_Share{
 	private static function permission_sql($permission = null){
 		$permission_where = '';
 		if(!is_null($permission)){
-			$permission_where = ' AND permissions = ';
+			$permission_where = ' AND `permissions` = ';
 			$permission_where .= ($permission=='rw')?"'1'":"'0'";
 		}
 		return $permission_where;
@@ -176,7 +176,7 @@ class OC_Calendar_Share{
 	private static function active_sql($active = null){
 		$active_where = '';
 		if(!is_null($active)){
-			$active_where = 'AND active = ';
+			$active_where = 'AND `active` = ';
 			$active_where .= (!is_null($active) && $active)?'1':'0';
 		}
 		return $active_where;
@@ -191,7 +191,7 @@ class OC_Calendar_Share{
 	public static function is_editing_allowed($share, $id, $type){
 		$group_where = self::group_sql(OC_Group::getUserGroups($share));
 		$permission_where = self::permission_sql('rw');
-		$stmt = OCP\DB::prepare("SELECT * FROM *PREFIX*calendar_share_" . $type . " WHERE ((share = ? AND sharetype = 'user') " . $group_where . ") " . $permission_where);
+		$stmt = OCP\DB::prepare('SELECT * FROM `*PREFIX*calendar_share_' . $type . '` WHERE ((`share` = ? AND `sharetype` = \'user\') ' . $group_where . ') ' . $permission_where);
 		$result = $stmt->execute(array($share));
 		if($result->numRows() == 1){
 			return true;
@@ -211,7 +211,7 @@ class OC_Calendar_Share{
 	 */
 	public static function check_access($share, $id, $type){
 		$group_where = self::group_sql(OC_Group::getUserGroups($share));
-		$stmt = OCP\DB::prepare("SELECT * FROM *PREFIX*calendar_share_" . $type . " WHERE (" . $type . "id = ? AND (share = ? AND sharetype = 'user') " . $group_where . ")");
+		$stmt = OCP\DB::prepare('SELECT * FROM `*PREFIX*calendar_share`_' . $type . '` WHERE (`' . $type . 'id` = ? AND (`share` = ? AND `sharetype` = \'user\') ' . $group_where . ')');
 		$result = $stmt->execute(array($id,$share));
 		$rows =  $result->numRows();
 		if($rows > 0){
@@ -229,9 +229,9 @@ class OC_Calendar_Share{
          * @return: mixed - bool if false, array with type and id if true
          */
         public static function getElementByToken($token){
-            $stmt_calendar = OCP\DB::prepare("SELECT * FROM *PREFIX*calendar_share_" . OC_Calendar_Share::CALENDAR . " WHERE sharetype = 'public' AND share = ?");
+            $stmt_calendar = OCP\DB::prepare("SELECT * FROM `*PREFIX*calendar_share_" . OC_Calendar_Share::CALENDAR . "` WHERE `sharetype` = 'public' AND `share` = ?");
             $result_calendar = $stmt_calendar->execute(array($token));
-            $stmt_event = OCP\DB::prepare("SELECT * FROM *PREFIX*calendar_share_" . OC_Calendar_Share::EVENT . " WHERE sharetype = 'public' AND share = ?");
+            $stmt_event = OCP\DB::prepare("SELECT * FROM `*PREFIX*calendar_share_" . OC_Calendar_Share::EVENT . "` WHERE `sharetype` = 'public' AND `share` = ?");
             $result_event = $stmt_event->execute(array($token));
             $return = array();
             if($result_calendar->numRows() == 0 && $result_event->numRows() == 0){
@@ -253,7 +253,7 @@ class OC_Calendar_Share{
 		 * @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 = ?");
+			$stmt = OCP\DB::prepare("UPDATE `*PREFIX*calendar_share_calendar` SET `active` = ? WHERE `share` = ? AND `sharetype` = 'user' AND `calendarid` = ?");
 			$stmt->execute(array($active, $share, $id));
 		}
 
@@ -263,13 +263,13 @@ class OC_Calendar_Share{
 		 * @return (bool)
 		 */
 		public static function post_userdelete($userid){			
-			$stmt = OCP\DB::prepare('DELETE FROM *PREFIX*calendar_share_calendar WHERE owner = ?');
+			$stmt = OCP\DB::prepare('DELETE FROM `*PREFIX*calendar_share_calendar` WHERE `owner` = ?');
 			$stmt->execute(array($userid));
-			$stmt = OCP\DB::prepare('DELETE FROM *PREFIX*calendar_share_event WHERE owner = ?');
+			$stmt = OCP\DB::prepare('DELETE FROM `*PREFIX*calendar_share_event` WHERE `owner` = ?');
 			$stmt->execute(array($userid));
-			$stmt = OCP\DB::prepare("DELETE FROM *PREFIX*calendar_share_calendar WHERE share = ? AND sharetype = 'user'");
+			$stmt = OCP\DB::prepare("DELETE FROM `*PREFIX*calendar_share_calendar` WHERE `share` = ? AND `sharetype` = 'user'");
 			$stmt->execute(array($userid));
-			$stmt = OCP\DB::prepare("DELETE FROM *PREFIX*calendar_share_event WHERE share = ? AND sharetype = 'user'");
+			$stmt = OCP\DB::prepare("DELETE FROM `*PREFIX*calendar_share_event` WHERE `share` = ? AND `sharetype` = 'user'");
 			$stmt->execute(array($userid));
 			return true;
 		}
diff --git a/apps/contacts/appinfo/migrate.php b/apps/contacts/appinfo/migrate.php
index 1400cdf79d..f43126e5c2 100644
--- a/apps/contacts/appinfo/migrate.php
+++ b/apps/contacts/appinfo/migrate.php
@@ -40,7 +40,7 @@ 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 = 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'] ) );
 					// Map the id
 					$idmap[$row['id']] = OCP\DB::insertid();
@@ -51,7 +51,7 @@ class OC_Migration_Provider_Contacts 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*contacts_cards (`addressbookid`, `fullname`, `carddata`, `uri`, `lastmodified`) VALUES (?, ?, ?, ?, ?)" );
+						$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'] ) );	
 					}		
 				}
diff --git a/apps/contacts/lib/addressbook.php b/apps/contacts/lib/addressbook.php
index 634d59eb9b..1953b29661 100644
--- a/apps/contacts/lib/addressbook.php
+++ b/apps/contacts/lib/addressbook.php
@@ -44,7 +44,7 @@ class OC_Contacts_Addressbook{
 	 * @return array
 	 */
 	public static function all($uid){
-		$stmt = OCP\DB::prepare( 'SELECT * FROM *PREFIX*contacts_addressbooks WHERE userid = ? ORDER BY displayname' );
+		$stmt = OCP\DB::prepare( 'SELECT * FROM `*PREFIX*contacts_addressbooks` WHERE `userid` = ? ORDER BY `displayname`' );
 		$result = $stmt->execute(array($uid));
 
 		$addressbooks = array();
@@ -72,7 +72,7 @@ class OC_Contacts_Addressbook{
 	 */
 	public static function find($id){
 		try {
-			$stmt = OCP\DB::prepare( 'SELECT * FROM *PREFIX*contacts_addressbooks WHERE id = ?' );
+			$stmt = OCP\DB::prepare( 'SELECT * FROM `*PREFIX*contacts_addressbooks` WHERE `id` = ?' );
 			$result = $stmt->execute(array($id));
 			return $result->fetchRow();
 		} catch(Exception $e) {
@@ -98,7 +98,7 @@ class OC_Contacts_Addressbook{
 
 		$uri = self::createURI($name, $uris );
 
-		$stmt = OCP\DB::prepare( 'INSERT INTO *PREFIX*contacts_addressbooks (userid,displayname,uri,description,ctag) VALUES(?,?,?,?,?)' );
+		$stmt = OCP\DB::prepare( 'INSERT INTO `*PREFIX*contacts_addressbooks` (`userid`,`displayname`,`uri`,`description`,`ctag`) VALUES(?,?,?,?,?)' );
 		$result = $stmt->execute(array($userid,$name,$uri,$description,1));
 
 		return OCP\DB::insertid('*PREFIX*contacts_addressbooks');
@@ -115,7 +115,7 @@ class OC_Contacts_Addressbook{
 	public static function addFromDAVData($principaluri,$uri,$name,$description){
 		$userid = self::extractUserID($principaluri);
 
-		$stmt = OCP\DB::prepare( 'INSERT INTO *PREFIX*contacts_addressbooks (userid,displayname,uri,description,ctag) VALUES(?,?,?,?,?)' );
+		$stmt = OCP\DB::prepare( 'INSERT INTO `*PREFIX*contacts_addressbooks` (`userid`,`displayname`,`uri`,`description`,`ctag`) VALUES(?,?,?,?,?)' );
 		$result = $stmt->execute(array($userid,$name,$uri,$description,1));
 
 		return OCP\DB::insertid('*PREFIX*contacts_addressbooks');
@@ -139,7 +139,7 @@ class OC_Contacts_Addressbook{
 			$description = $addressbook['description'];
 		}
 
-		$stmt = OCP\DB::prepare( 'UPDATE *PREFIX*contacts_addressbooks SET displayname=?,description=?, ctag=ctag+1 WHERE id=?' );
+		$stmt = OCP\DB::prepare( 'UPDATE `*PREFIX*contacts_addressbooks` SET `displayname`=?,`description`=?, `ctag`=`ctag`+1 WHERE `id`=?' );
 		$result = $stmt->execute(array($name,$description,$id));
 
 		return true;
@@ -208,7 +208,7 @@ class OC_Contacts_Addressbook{
 			return $addressbooks;
 		}
 		$ids_sql = join(',', array_fill(0, count($active), '?'));
-		$prep = 'SELECT * FROM *PREFIX*contacts_addressbooks WHERE id IN ('.$ids_sql.') ORDER BY displayname';
+		$prep = 'SELECT * FROM `*PREFIX*contacts_addressbooks` WHERE `id` IN ('.$ids_sql.') ORDER BY `displayname`';
 		try {
 			$stmt = OCP\DB::prepare( $prep );
 			$result = $stmt->execute($active);
@@ -275,7 +275,7 @@ class OC_Contacts_Addressbook{
 	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 = OCP\DB::prepare( 'DELETE FROM `*PREFIX*contacts_addressbooks` WHERE `id` = ?' );
 		$stmt->execute(array($id));
 
 		$cards = OC_Contacts_VCard::all($id);
@@ -292,7 +292,7 @@ class OC_Contacts_Addressbook{
 	 * @return boolean
 	 */
 	public static function touch($id){
-		$stmt = OCP\DB::prepare( 'UPDATE *PREFIX*contacts_addressbooks SET ctag = ctag + 1 WHERE id = ?' );
+		$stmt = OCP\DB::prepare( 'UPDATE `*PREFIX*contacts_addressbooks` SET `ctag` = `ctag` + 1 WHERE `id` = ?' );
 		$stmt->execute(array($id));
 
 		return true;
diff --git a/apps/contacts/lib/vcard.php b/apps/contacts/lib/vcard.php
index 7c8dbd2ee4..a0491c6323 100644
--- a/apps/contacts/lib/vcard.php
+++ b/apps/contacts/lib/vcard.php
@@ -51,7 +51,7 @@ class OC_Contacts_VCard{
 		$result = null;
 		if(is_array($id) && count($id) > 1) {
 			$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`';
 			try {
 				$stmt = OCP\DB::prepare( $prep );
 				$result = $stmt->execute($id);
@@ -68,7 +68,7 @@ class OC_Contacts_VCard{
 				$id = $id[0];
 			}
 			try {
-				$stmt = OCP\DB::prepare( 'SELECT * FROM *PREFIX*contacts_cards WHERE addressbookid = ? ORDER BY fullname' );
+				$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::ERROR);
@@ -94,7 +94,7 @@ class OC_Contacts_VCard{
 	 * @return associative array
 	 */
 	public static function find($id){
-		$stmt = OCP\DB::prepare( 'SELECT * FROM *PREFIX*contacts_cards WHERE id = ?' );
+		$stmt = OCP\DB::prepare( 'SELECT * FROM `*PREFIX*contacts_cards` WHERE `id` = ?' );
 		$result = $stmt->execute(array($id));
 
 		return $result->fetchRow();
@@ -107,7 +107,7 @@ class OC_Contacts_VCard{
 	 * @return associative array
 	 */
 	public static function findWhereDAVDataIs($aid,$uri){
-		$stmt = OCP\DB::prepare( 'SELECT * FROM *PREFIX*contacts_cards WHERE addressbookid = ? AND uri = ?' );
+		$stmt = OCP\DB::prepare( 'SELECT * FROM `*PREFIX*contacts_cards` WHERE `addressbookid` = ? AND `uri` = ?' );
 		$result = $stmt->execute(array($aid,$uri));
 
 		return $result->fetchRow();
@@ -156,7 +156,7 @@ class OC_Contacts_VCard{
 	* @returns true if the UID has been changed.
 	*/
 	protected static function trueUID($aid, &$uid) {
-		$stmt = OCP\DB::prepare( 'SELECT * FROM *PREFIX*contacts_cards WHERE addressbookid = ? AND uri = ?' );
+		$stmt = OCP\DB::prepare( 'SELECT * FROM `*PREFIX*contacts_cards` WHERE `addressbookid` = ? AND `uri` = ?' );
 		$uri = $uid.'.vcf';
 		$result = $stmt->execute(array($aid,$uri));
 		if($result->numRows() > 0){
@@ -297,7 +297,7 @@ class OC_Contacts_VCard{
 		}
 
 		$data = $card->serialize();
-		$stmt = OCP\DB::prepare( 'INSERT INTO *PREFIX*contacts_cards (addressbookid,fullname,carddata,uri,lastmodified) VALUES(?,?,?,?,?)' );
+		$stmt = OCP\DB::prepare( 'INSERT INTO `*PREFIX*contacts_cards` (`addressbookid`,`fullname`,`carddata`,`uri`,`lastmodified`) VALUES(?,?,?,?,?)' );
 		$result = $stmt->execute(array($aid,$fn,$data,$uri,time()));
 		$newid = OCP\DB::insertid('*PREFIX*contacts_cards');
 
@@ -323,7 +323,7 @@ class OC_Contacts_VCard{
 	 * @param array $objects  An array of [id, carddata].
 	 */
 	public static function updateDataByID($objects){
-		$stmt = OCP\DB::prepare( 'UPDATE *PREFIX*contacts_cards SET carddata = ?, lastmodified = ? WHERE id = ?' );
+		$stmt = OCP\DB::prepare( 'UPDATE `*PREFIX*contacts_cards` SET `carddata` = ?, `lastmodified` = ? WHERE `id` = ?' );
 		$now = new DateTime;
 		foreach($objects as $object) {
 			$vcard = OC_VObject::parse($object[1]);
@@ -365,7 +365,7 @@ class OC_Contacts_VCard{
 		$card->setString('REV', $now->format(DateTime::W3C));
 
 		$data = $card->serialize();
-		$stmt = OCP\DB::prepare( 'UPDATE *PREFIX*contacts_cards SET fullname = ?,carddata = ?, lastmodified = ? WHERE id = ?' );
+		$stmt = OCP\DB::prepare( 'UPDATE `*PREFIX*contacts_cards` SET `fullname` = ?,`carddata` = ?, `lastmodified` = ? WHERE `id` = ?' );
 		$result = $stmt->execute(array($fn,$data,time(),$id));
 
 		OC_Contacts_Addressbook::touch($oldcard['addressbookid']);
@@ -397,7 +397,7 @@ class OC_Contacts_VCard{
 	 */
 	public static function delete($id){
 		// FIXME: Add error checking.
-		$stmt = OCP\DB::prepare( 'DELETE FROM *PREFIX*contacts_cards WHERE id = ?' );
+		$stmt = OCP\DB::prepare( 'DELETE FROM `*PREFIX*contacts_cards` WHERE `id` = ?' );
 		$stmt->execute(array($id));
 
 		return true;
@@ -411,7 +411,7 @@ class OC_Contacts_VCard{
 	 */
 	public static function deleteFromDAVData($aid,$uri){
 		// FIXME: Add error checking. Deleting a card gives an Kontact/Akonadi error.
-		$stmt = OCP\DB::prepare( 'DELETE FROM *PREFIX*contacts_cards WHERE addressbookid = ? AND uri=?' );
+		$stmt = OCP\DB::prepare( 'DELETE FROM `*PREFIX*contacts_cards` WHERE `addressbookid` = ? AND `uri`=?' );
 		$stmt->execute(array($aid,$uri));
 		OC_Contacts_Addressbook::touch($aid);
 
@@ -546,7 +546,7 @@ class OC_Contacts_VCard{
 		OC_Contacts_App::getAddressbook($aid); // check for user ownership.
 		if(is_array($id)) {
 			$id_sql = join(',', array_fill(0, count($id), '?'));
-			$prep = 'UPDATE *PREFIX*contacts_cards SET addressbookid = ? WHERE id IN ('.$id_sql.')';
+			$prep = 'UPDATE `*PREFIX*contacts_cards` SET `addressbookid` = ? WHERE `id` IN ('.$id_sql.')';
 			try {
 				$stmt = OCP\DB::prepare( $prep );
 				//$aid = array($aid);
@@ -560,7 +560,7 @@ class OC_Contacts_VCard{
 			}
 		} else {
 			try {
-				$stmt = OCP\DB::prepare( 'UPDATE *PREFIX*contacts_cards SET addressbookid = ? WHERE id = ?' );
+				$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);
diff --git a/apps/files/appinfo/update.php b/apps/files/appinfo/update.php
index 769a1a8e3e..c3e51debb5 100644
--- a/apps/files/appinfo/update.php
+++ b/apps/files/appinfo/update.php
@@ -1,14 +1,14 @@
 <?php
 
-// fix webdav properties, remove namespace information between curly bracket update for OC4
-$installedVersion=OCP\Config::getAppValue('files', 'installed_version');
-if (version_compare($installedVersion, '1.1.2', '<')) {
-	$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"] ));
-	}
+// fix webdav properties, remove namespace information between curly bracket update for OC4
+$installedVersion=OCP\Config::getAppValue('files', 'installed_version');
+if (version_compare($installedVersion, '1.1.2', '<')) {
+	$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
diff --git a/apps/files_sharing/lib_share.php b/apps/files_sharing/lib_share.php
index 29a69360d3..05a80b7916 100644
--- a/apps/files_sharing/lib_share.php
+++ b/apps/files_sharing/lib_share.php
@@ -40,7 +40,7 @@ class OC_Share {
 	 */
 	public function __construct($source, $uid_shared_with, $permissions) {
 		$uid_owner = OCP\USER::getUser();
-		$query = OCP\DB::prepare("INSERT INTO *PREFIX*sharing VALUES(?,?,?,?,?)");
+		$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;
@@ -78,7 +78,7 @@ class OC_Share {
 			}
 			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));
+				$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) {
@@ -92,7 +92,7 @@ class OC_Share {
 				// 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");
+				$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, ".")) {
@@ -211,7 +211,7 @@ class OC_Share {
 		$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 = OCP\DB::prepare('INSERT INTO `*PREFIX*sharing` VALUES(?,?,?,?,?)');
 		$query->execute(array($item[0]['uid_owner'], OCP\USER::getUser(), $source, $newTarget, $item[0]['permissions']));
 	}
 
@@ -222,7 +222,7 @@ class OC_Share {
 	 */
 	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");
+		$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();
 	}
 
@@ -233,7 +233,7 @@ class OC_Share {
 	 */
 	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 = ?");
+		$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;
@@ -249,7 +249,7 @@ class OC_Share {
 	 * @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 = ?");
+		$query = OCP\DB::prepare('SELECT `uid_shared_with`, `source`, `permissions` FROM `*PREFIX*sharing` WHERE `uid_owner` = ?');
 		return $query->execute(array(OCP\USER::getUser()))->fetchAll();
 	}
 
@@ -268,7 +268,7 @@ class OC_Share {
 			$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());
+		$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();
 	}
 
@@ -279,7 +279,7 @@ class OC_Share {
 	 */
 	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");
+		$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);
@@ -287,9 +287,9 @@ class OC_Share {
 		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;
-			}
+                            if (count($result) > 0) {
+                                    break;
+                            }
 			$target = dirname($target);
 		}
 		if (count($result) > 0) {
@@ -307,7 +307,7 @@ class OC_Share {
 	 */
 	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");
+		$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'];
@@ -318,12 +318,12 @@ class OC_Share {
 			} 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");
+		$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'];
@@ -340,7 +340,7 @@ class OC_Share {
 	 */
 	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");
+		$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'];
@@ -372,7 +372,7 @@ class OC_Share {
 	 * @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");
+		$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'];
@@ -392,7 +392,7 @@ class OC_Share {
 	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 = OCP\DB::prepare('UPDATE `*PREFIX*sharing` SET `target` = `REPLACE(`target`, ?, ?) WHERE `uid_shared_with` '.self::getUsersAndGroups());
 		$query->execute(array($oldTarget, $newTarget));
 	}
 
@@ -407,7 +407,7 @@ class OC_Share {
 	*/
 	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 = 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()));
 	}
 
@@ -422,7 +422,7 @@ class OC_Share {
 	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 = 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);
 	}
@@ -438,10 +438,10 @@ class OC_Share {
 	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 = 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 = 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));
 		}
 	}
@@ -458,7 +458,7 @@ class OC_Share {
 				self::updateFolder($item['uid_shared_with']);
 			}
 		}
-		$query = OCP\DB::prepare("DELETE FROM *PREFIX*sharing WHERE SUBSTR(source, 1, ?) = ? AND uid_owner = ?");
+		$query = OCP\DB::prepare('DELETE FROM `*PREFIX*sharing` WHERE SUBSTR(`source`, 1, ?) = ? AND `uid_owner` = ?');
 		$query->execute(array(strlen($source), $source, OCP\USER::getUser()));
 	}
 
@@ -469,7 +469,7 @@ class OC_Share {
 	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 = OCP\DB::prepare('UPDATE `*PREFIX*sharing` SET `source` = REPLACE(`source`, ?, ?) WHERE `uid_owner` = ?');
 		$query->execute(array($oldSource, $newSource, OCP\USER::getUser()));
 	}
 
@@ -484,21 +484,21 @@ class OC_Share {
 	}
 
 	public static function removeUser($arguments) {
-		$query = OCP\DB::prepare("SELECT uid_shared_with FROM *PREFIX*sharing WHERE uid_owner = ?");
+		$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 = 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.') = ?');
+		$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) {
@@ -513,7 +513,7 @@ class OC_Share {
 	}
 
 	public static function removeFromGroupShare($arguments) {
-		$query = OCP\DB::prepare('DELETE FROM *PREFIX*sharing WHERE uid_shared_with = ?');
+		$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/sharedstorage.php b/apps/files_sharing/sharedstorage.php
index 41af077b5a..8b19338283 100644
--- a/apps/files_sharing/sharedstorage.php
+++ b/apps/files_sharing/sharedstorage.php
@@ -222,7 +222,7 @@ class OC_Filestorage_Shared extends OC_Filestorage {
 			}
 			if ($size > 0) {
 				$dbpath = rtrim($this->datadir.$path, "/");
-// 				$query = OCP\DB::prepare("INSERT INTO *PREFIX*foldersize VALUES(?,?)");
+// 				$query = OCP\DB::prepare("INSERT INTO `*PREFIX*foldersize` VALUES(?,?)");
 // 				$result = $query->execute(array($dbpath, $size));
 			}
 		}
@@ -236,7 +236,7 @@ class OC_Filestorage_Shared extends OC_Filestorage {
 			$path = dirname($path);
 		}
 		$dbpath = rtrim($this->datadir.$path, "/");
-// 		$query = OCP\DB::prepare("DELETE FROM *PREFIX*/*foldersize*/ WHERE path = ?");
+// 		$query = OCP\DB::prepare("DELETE FROM `*PREFIX*/*foldersize*/` WHERE `path` = ?");
 // 		$result = $query->execute(array($dbpath));
 		if ($path != "/" && $path != "") {
 			$parts = explode("/", $path);
diff --git a/apps/gallery/appinfo/app.php b/apps/gallery/appinfo/app.php
index 8033774183..3d38b85b7e 100644
--- a/apps/gallery/appinfo/app.php
+++ b/apps/gallery/appinfo/app.php
@@ -45,7 +45,7 @@ OCP\App::addNavigationEntry( array(
 
 class OC_GallerySearchProvider extends OC_Search_Provider{
 	function search($query){
-		$stmt = OCP\DB::prepare('SELECT * FROM *PREFIX*gallery_albums WHERE uid_owner = ? AND album_name LIKE ?');
+		$stmt = OCP\DB::prepare('SELECT * FROM `*PREFIX*gallery_albums` WHERE `uid_owner` = ? AND `album_name` LIKE ?');
 		$result = $stmt->execute(array(OCP\USER::getUser(),'%'.$query.'%'));
 		$results=array();
 		while($row=$result->fetchRow()){
diff --git a/apps/gallery/appinfo/update.php b/apps/gallery/appinfo/update.php
index a0997ab5e8..c112bb3f89 100644
--- a/apps/gallery/appinfo/update.php
+++ b/apps/gallery/appinfo/update.php
@@ -2,9 +2,9 @@
 
 $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 = OCP\DB::prepare('DROP TABLE IF EXISTS `*PREFIX*gallery_photos`');
 	$stmt->execute();
-	$stmt = OCP\DB::prepare('DROP TABLE IF EXISTS *PREFIX*gallery_albums');
+	$stmt = OCP\DB::prepare('DROP TABLE IF EXISTS `*PREFIX*gallery_albums`');
 	$stmt->execute();
 
 	\OC_DB::createDbFromStructure(OC::$APPSROOT.'/apps/'.$appid.'/appinfo/database.xml');
diff --git a/apps/gallery/lib/album.php b/apps/gallery/lib/album.php
index 5f962f12f1..b9aa535629 100644
--- a/apps/gallery/lib/album.php
+++ b/apps/gallery/lib/album.php
@@ -23,7 +23,7 @@
 
 class OC_Gallery_Album {
 	public static function create($owner, $name, $path){
-		$stmt = OCP\DB::prepare('INSERT INTO *PREFIX*gallery_albums (uid_owner, album_name, album_path, parent_path) VALUES (?, ?, ?, ?)');
+		$stmt = OCP\DB::prepare('INSERT INTO `*PREFIX*gallery_albums` (`uid_owner`, `album_name`, `album_path`, `parent_path`) ALUES (?, ?, ?, ?)');
 		$stmt->execute(array($owner, $name, $path, self::getParentPath($path)));
 	}
 
@@ -40,18 +40,18 @@ class OC_Gallery_Album {
 	}
 
 	public static function remove($owner, $name=null, $path=null, $parent=null) {
-		$sql = 'DELETE FROM *PREFIX*gallery_albums WHERE uid_owner LIKE ?';
+		$sql = 'DELETE FROM `*PREFIX*gallery_albums` WHERE `uid_owner` LIKE ?';
 		$args = array($owner);
 		if (!is_null($name)){
-			$sql .= ' AND album_name LIKE ?';
+			$sql .= ' AND `album_name` LIKE ?';
 			$args[] = $name;
 		}
 		if (!is_null($path)){
-			$sql .= ' AND album_path LIKE ?';
+			$sql .= ' AND `album_path` LIKE ?';
 			$args[] = $path;
 		}
 		if (!is_null($parent)){
-			$sql .= ' AND parent_path LIKE ?';
+			$sql .= ' AND `parent_path` LIKE ?';
 			$args[] = $parent;
 		}
 		$stmt = OCP\DB::prepare($sql);
@@ -63,29 +63,29 @@ class OC_Gallery_Album {
 	public static function removeByParentPath($owner, $parent) { self::remove($owner, null, null, $parent); }
 	
 	public static function find($owner, $name=null, $path=null, $parent=null){
-		$sql = 'SELECT * FROM *PREFIX*gallery_albums WHERE uid_owner = ?';
+		$sql = 'SELECT * FROM `*PREFIX*gallery_albums` WHERE `uid_owner` = ?';
 		$args = array($owner);
 		if (!is_null($name)){
-			$sql .= ' AND album_name = ?';
+			$sql .= ' AND `album_name` = ?';
 			$args[] = $name;
 		}
 		if (!is_null($path)){
-			$sql .= ' AND album_path = ?';
+			$sql .= ' AND `album_path` = ?';
 			$args[] = $path;
 		}
 		if (!is_null($parent)){
-			$sql .= ' AND parent_path = ?';
+			$sql .= ' AND `parent_path` = ?';
 			$args[] = $parent;
 		}
     $order = OCP\Config::getUserValue($owner, 'gallery', 'order', 'ASC');
-		$sql .= ' ORDER BY album_name ' . $order;
+		$sql .= ' ORDER BY `album_name` ' . $order;
 
 		$stmt = OCP\DB::prepare($sql);
 		return $stmt->execute($args);
 	}
 
 	public static function changePath($oldname, $newname, $owner) {
-		$stmt = OCP\DB::prepare('UPDATE *PREFIX*gallery_albums SET album_path=? WHERE uid_owner=? AND album_path=?');
+		$stmt = OCP\DB::prepare('UPDATE `*PREFIX*gallery_albums` SET `album_path`=? WHERE `uid_owner`=? AND `album_path`=?');
 		$stmt->execute(array($newname, $owner, $oldname));
 	}
 
@@ -96,7 +96,7 @@ class OC_Gallery_Album {
 	}
 
 	public static function getAlbumSize($id){
-    $sql = 'SELECT COUNT(*) as size FROM *PREFIX*gallery_photos WHERE album_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'];
@@ -104,7 +104,7 @@ class OC_Gallery_Album {
 
   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 ?';
+		$sql = 'SELECT COUNT(*) AS `size` FROM `*PREFIX*gallery_photos` AS `photos`, `*PREFIX*gallery_albums` AS `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/apps/gallery/lib/managers.php b/apps/gallery/lib/managers.php
index da09c565cb..82356e54dd 100644
--- a/apps/gallery/lib/managers.php
+++ b/apps/gallery/lib/managers.php
@@ -17,7 +17,7 @@ class DatabaseManager {
 	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 = ?');
+		$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;
@@ -26,7 +26,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 = \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());
 		unset($image);
diff --git a/apps/gallery/lib/photo.php b/apps/gallery/lib/photo.php
index 99384af621..1b4f908773 100644
--- a/apps/gallery/lib/photo.php
+++ b/apps/gallery/lib/photo.php
@@ -23,14 +23,14 @@
 
 class OC_Gallery_Photo {
 	public static function create($albumId, $img){
-		$stmt = OCP\DB::prepare('INSERT INTO *PREFIX*gallery_photos (album_id, file_path) VALUES (?, ?)');
+		$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){
-		$sql = 'SELECT * FROM *PREFIX*gallery_photos WHERE album_id = ?';
+		$sql = 'SELECT * FROM `*PREFIX*gallery_photos` WHERE `album_id` = ?';
 		$args = array($albumId);
 		if (!is_null($img)){
-			$sql .= ' AND file_path = ?';
+			$sql .= ' AND `file_path` = ?';
 			$args[] = $img;
 		}
 		$stmt = OCP\DB::prepare($sql);
@@ -38,31 +38,31 @@ class OC_Gallery_Photo {
 	}
 	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 = ?');
+    $stmt = OCP\DB::prepare('DELETE FROM `*PREFIX*gallery_photos` WHERE `file_path` LIKE ? AND `album_id` = ?');
 		$stmt->execute(array($path, $album_id));
 	}
 
 	public static function removeById($id) {
-		$stmt = OCP\DB::prepare('DELETE FROM *PREFIX*gallery_photos WHERE photo_id = ?');
+		$stmt = OCP\DB::prepare('DELETE FROM `*PREFIX*gallery_photos` WHERE `photo_id` = ?');
 		$stmt->execute(array($id));
 	}
 
 	public static function removeByAlbumId($albumid) {
-		$stmt = OCP\DB::prepare('DELETE FROM *PREFIX*gallery_photos WHERE album_id = ?');
+		$stmt = OCP\DB::prepare('DELETE FROM `*PREFIX*gallery_photos` WHERE `album_id` = ?');
 		$stmt->execute(array($albumid));
 	}
 
 	public static function changePath($oldAlbumId, $newAlbumId, $oldpath, $newpath) {
-		$stmt = OCP\DB::prepare("UPDATE *PREFIX*gallery_photos SET file_path = ?, album_id = ? WHERE album_id = ? and file_path = ?");
+		$stmt = OCP\DB::prepare("UPDATE `*PREFIX*gallery_photos` SET `file_path` = ?, `album_id` = ? WHERE `album_id` = ? AND `file_path` = ?");
 		$stmt->execute(array($newpath, $newAlbumId, $oldAlbumId, $oldpath));
 	}
 
diff --git a/apps/gallery/lib/sharing.php b/apps/gallery/lib/sharing.php
index fffeca032a..e79692392a 100644
--- a/apps/gallery/lib/sharing.php
+++ b/apps/gallery/lib/sharing.php
@@ -23,7 +23,7 @@
 
 class OC_Gallery_Sharing {
   private static function getEntries($token) {
-    $sql = 'SELECT * FROM *PREFIX*gallery_sharing WHERE token = ?';
+    $sql = 'SELECT * FROM `*PREFIX*gallery_sharing` WHERE `token` = ?';
     $stmt = OCP\DB::prepare($sql);
     return $stmt->execute(array($token));
   }
@@ -44,7 +44,7 @@ class OC_Gallery_Sharing {
     $r = self::getEntries($token);
     if ($row = $r->fetchRow()) {
       $galleryId = $row['gallery_id'];
-      $sql = 'SELECT * FROM *PREFIX*gallery_albums WHERE album_id = ?';
+      $sql = 'SELECT * FROM `*PREFIX*gallery_albums` WHERE `album_id` = ?';
       $stmt = OCP\DB::prepare($sql);
       $r = $stmt->execute(array($galleryId));
       if ($row = $r->fetchRow())
@@ -57,7 +57,7 @@ class OC_Gallery_Sharing {
     $r = self::getEntries($token);
     if ($row = $r->fetchRow()) {
       $galleryId = $row['gallery_id'];
-      $sql = 'SELECT * FROM *PREFIX*gallery_albums WHERE album_id = ?';
+      $sql = 'SELECT * FROM `*PREFIX*gallery_albums` WHERE `album_id` = ?';
       $stmt = OCP\DB::prepare($sql);
       $r = $stmt->execute(array($galleryId));
       if ($row = $r->fetchRow())
@@ -66,23 +66,23 @@ class OC_Gallery_Sharing {
   }
 
   public static function updateSharingByToken($token, $recursive) {
-    $stmt = OCP\DB::prepare('UPDATE *PREFIX*gallery_sharing SET recursive = ? WHERE token = ?');
+    $stmt = OCP\DB::prepare('UPDATE `*PREFIX*gallery_sharing` SET `recursive` = ? WHERE `token` = ?');
     $stmt->execute(array($recursive, $token));
   }
 
   public static function getEntryByAlbumId($album_id) {
-    $stmt = OCP\DB::prepare('SELECT * FROM *PREFIX*gallery_sharing WHERE gallery_id = ?');
+    $stmt = OCP\DB::prepare('SELECT * FROM `*PREFIX*gallery_sharing` WHERE `gallery_id` = ?');
     return $stmt->execute(array($album_id));
   }
 
   public static function addShared($token, $albumId, $recursive) {
-    $sql = 'INSERT INTO *PREFIX*gallery_sharing (token, gallery_id, recursive) VALUES (?, ?, ?)';
+    $sql = 'INSERT INTO `*PREFIX*gallery_sharing` (`token`, `gallery_id`, `recursive`) VALUES (?, ?, ?)';
     $stmt = OCP\DB::prepare($sql);
     $stmt->execute(array($token, $albumId, $recursive));
   }
 
   public static function remove($albumId) {
-    $stmt = OCP\DB::prepare('DELETE FROM *PREFIX*gallery_sharing WHERE gallery_id = ?');
+    $stmt = OCP\DB::prepare('DELETE FROM `*PREFIX*gallery_sharing` WHERE `gallery_id` = ?');
     $stmt->execute(array($albumId));
   }
 }
diff --git a/apps/media/lib_ampache.php b/apps/media/lib_ampache.php
index 63682100d4..8f8f1e985a 100644
--- a/apps/media/lib_ampache.php
+++ b/apps/media/lib_ampache.php
@@ -65,7 +65,7 @@ class OC_MEDIA_AMPACHE{
 </root>");
 		}
 		if($auth and $user and $time){
-			$query=OCP\DB::prepare("SELECT user_id, user_password_sha256 from *PREFIX*media_users WHERE user_id=?");
+			$query=OCP\DB::prepare("SELECT `user_id`, `user_password_sha256` FROM `*PREFIX*media_users` WHERE `user_id`=?");
 			$users=$query->execute(array($user))->fetchAll();
 			if(count($users)>0){
 				$pass=$users[0]['user_password_sha256'];
@@ -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` (`session_id`, `token`, `user_id`, `start`) VALUES (NULL, ?, ?, now());");
 					$query->execute(array($token,$user));
 					$expire=date('c',time()+600);
 					echo('<?xml version="1.0" encoding="UTF-8"?>');
@@ -137,10 +137,10 @@ class OC_MEDIA_AMPACHE{
 			}
 		}
 		//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()-600)");
 		$query->execute();
 		
-		$query=OCP\DB::prepare("SELECT user_id from *PREFIX*media_sessions WHERE token=?");
+		$query=OCP\DB::prepare("SELECT `user_id` FROM `*PREFIX*media_sessions` WHERE `token`=?");
 		$users=$query->execute(array($auth))->fetchAll();
 		if(count($users)>0){
 			OC_MEDIA_COLLECTION::$uid=$users[0]['user_id'];
@@ -152,7 +152,7 @@ class OC_MEDIA_AMPACHE{
 	}
 	
 	public static function updateAuth($auth){
-		$query=OCP\DB::prepare("UPDATE *PREFIX*media_sessions SET start=CURRENT_TIMESTAMP WHERE token=?");
+		$query=OCP\DB::prepare("UPDATE `*PREFIX*media_sessions` SET `start`=CURRENT_TIMESTAMP WHERE `token`=?");
 		$query->execute(array($auth));
 	}
 	
diff --git a/apps/media/lib_collection.php b/apps/media/lib_collection.php
index 598c08d32e..b59e6f8210 100644
--- a/apps/media/lib_collection.php
+++ b/apps/media/lib_collection.php
@@ -43,7 +43,7 @@ class OC_MEDIA_COLLECTION{
 		if(isset(self::$artistIdCache[$name])){
 			return self::$artistIdCache[$name];
 		}else{
-			$query=OCP\DB::prepare("SELECT artist_id FROM *PREFIX*media_artists WHERE lower(artist_name) LIKE ?");
+			$query=OCP\DB::prepare("SELECT `artist_id` FROM `*PREFIX*media_artists` WHERE lower(`artist_name`) LIKE ?");
 			$artists=$query->execute(array($name))->fetchAll();
 			if(is_array($artists) and isset($artists[0])){
 				self::$artistIdCache[$name]=$artists[0]['artist_id'];
@@ -71,7 +71,7 @@ class OC_MEDIA_COLLECTION{
 		if(isset(self::$albumIdCache[$artistId][$name])){
 			return self::$albumIdCache[$artistId][$name];
 		}else{
-			$query=OCP\DB::prepare("SELECT album_id FROM *PREFIX*media_albums WHERE lower(album_name) LIKE ? AND album_artist=?");
+			$query=OCP\DB::prepare("SELECT `album_id` FROM `*PREFIX*media_albums` WHERE lower(`album_name`) LIKE ? AND `album_artist`=?");
 			$albums=$query->execute(array($name,$artistId))->fetchAll();
 			if(is_array($albums) and isset($albums[0])){
 				self::$albumIdCache[$artistId][$name]=$albums[0]['album_id'];
@@ -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 lower(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'];
@@ -130,8 +130,8 @@ class OC_MEDIA_COLLECTION{
 		}elseif($search==''){
 			$search='%';
 		}
-		$query=OCP\DB::prepare("SELECT DISTINCT artist_name, artist_id FROM *PREFIX*media_artists
-			INNER JOIN *PREFIX*media_songs ON artist_id=song_artist WHERE artist_name LIKE ? AND song_user=? ORDER BY artist_name");
+		$query=OCP\DB::prepare("SELECT DISTINCT `artist_name`, `artist_id` FROM `*PREFIX*media_artists`
+			INNER JOIN `*PREFIX*media_songs` ON `artist_id`=`song_artist` WHERE `artist_name` LIKE ? AND `song_user`=? ORDER BY `artist_name`");
 		$result=$query->execute(array($search,self::$uid));
 		return $result->fetchAll();
 	}
@@ -168,21 +168,21 @@ class OC_MEDIA_COLLECTION{
 		if(empty($uid)){
 			$uid=self::$uid=$_SESSION['user_id'];
 		}
-		$cmd="SELECT DISTINCT album_name, album_artist, album_id
-			FROM *PREFIX*media_albums INNER JOIN *PREFIX*media_songs ON album_id=song_album WHERE song_user=? ";
+		$cmd="SELECT DISTINCT `album_name`, `album_artist`, `album_id`
+			FROM `*PREFIX*media_albums` INNER JOIN `*PREFIX*media_songs` ON `album_id`=`song_album` WHERE `song_user`=? ";
 		$params=array(self::$uid);
 		if($artist!=0){
-			$cmd.="AND album_artist = ? ";
+			$cmd.="AND `album_artist` = ? ";
 			array_push($params,$artist);
 		}
 		if($search!='%'){
-			$cmd.="AND album_name LIKE ? ";
+			$cmd.="AND `album_name` LIKE ? ";
 			if(!$exact){
 				$search="%$search%";
 			}
 			array_push($params,$search);
 		}
-		$cmd.=' ORDER BY album_name';
+		$cmd.=' ORDER BY `album_name`';
 		$query=OCP\DB::prepare($cmd);
 		return $query->execute($params)->fetchAll();
 	}
@@ -223,13 +223,13 @@ class OC_MEDIA_COLLECTION{
 		}
 		$params=array($uid);
 		if($artist!=0){
-			$artistString="AND song_artist = ?";
+			$artistString="AND `song_artist` = ?";
 			array_push($params,$artist);
 		}else{
 			$artistString='';
 		}
 		if($album!=0){
-			$albumString="AND song_album = ?";
+			$albumString="AND `song_album` = ?";
 			array_push($params,$album);
 		}else{
 			$albumString='';
@@ -238,12 +238,12 @@ class OC_MEDIA_COLLECTION{
 			if(!$exact){
 				$search="%$search%";
 			}
-			$searchString ="AND song_name LIKE ?";
+			$searchString ="AND `song_name` LIKE ?";
 			array_push($params,$search);
 		}else{
 			$searchString='';
 		}
-		$query=OCP\DB::prepare("SELECT * FROM *PREFIX*media_songs WHERE song_user=? $artistString $albumString $searchString ORDER BY song_track, song_name, song_path");
+		$query=OCP\DB::prepare("SELECT * FROM `*PREFIX*media_songs` WHERE `song_user`=? $artistString $albumString $searchString ORDER BY `song_track`, `song_name`, `song_path`");
 		return $query->execute($params)->fetchAll();
 	}
 	
@@ -284,25 +284,25 @@ class OC_MEDIA_COLLECTION{
 	}
 	
 	public static function getSongCount(){
-		$query=OCP\DB::prepare("SELECT COUNT(song_id) AS count FROM *PREFIX*media_songs");
+		$query=OCP\DB::prepare("SELECT COUNT(`song_id`) AS `count` FROM `*PREFIX*media_songs`");
 		$result=$query->execute()->fetchAll();
 		return $result[0]['count'];
 	}
 	
 	public static function getArtistCount(){
-		$query=OCP\DB::prepare("SELECT COUNT(artist_id) AS count FROM *PREFIX*media_artists");
+		$query=OCP\DB::prepare("SELECT COUNT(`artist_id`) AS `count` FROM `*PREFIX*media_artists`");
 		$result=$query->execute()->fetchAll();
 		return $result[0]['count'];
 	}
 	
 	public static function getAlbumCount(){
-		$query=OCP\DB::prepare("SELECT COUNT(album_id) AS count FROM *PREFIX*media_albums");
+		$query=OCP\DB::prepare("SELECT COUNT(`album_id`) AS `count` FROM `*PREFIX*media_albums`");
 		$result=$query->execute()->fetchAll();
 		return $result[0]['count'];
 	}
 	
 	public static function getArtistName($artistId){
-		$query=OCP\DB::prepare("SELECT artist_name FROM *PREFIX*media_artists WHERE artist_id=?");
+		$query=OCP\DB::prepare("SELECT `artist_name` FROM `*PREFIX*media_artists` WHERE `artist_id`=?");
 		$artist=$query->execute(array($artistId))->fetchAll();
 		if(count($artist)>0){
 			return $artist[0]['artist_name'];
@@ -312,7 +312,7 @@ class OC_MEDIA_COLLECTION{
 	}
 	
 	public static function getAlbumName($albumId){
-		$query=OCP\DB::prepare("SELECT album_name FROM *PREFIX*media_albums WHERE album_id=?");
+		$query=OCP\DB::prepare("SELECT `album_name` FROM `*PREFIX*media_albums` WHERE `album_id`=?");
 		$album=$query->execute(array($albumId))->fetchAll();
 		if(count($album)>0){
 			return $album[0]['album_name'];
@@ -322,7 +322,7 @@ class OC_MEDIA_COLLECTION{
 	}
 	
 	public static function getSong($id){
-		$query=OCP\DB::prepare("SELECT * FROM *PREFIX*media_songs WHERE song_id=?");
+		$query=OCP\DB::prepare("SELECT * FROM `*PREFIX*media_songs` WHERE `song_id`=?");
 		$song=$query->execute(array($id))->fetchAll();
 		if(count($song)>0){
 			return $song[0];
@@ -336,7 +336,7 @@ class OC_MEDIA_COLLECTION{
 	 * @param string $path
 	 */
 	public static function getSongCountByPath($path){
-		$query=OCP\DB::prepare("SELECT COUNT(song_id) AS count FROM *PREFIX*media_songs WHERE song_path LIKE ?");
+		$query=OCP\DB::prepare("SELECT COUNT(`song_id`) AS `count` FROM `*PREFIX*media_songs` WHERE `song_path` LIKE ?");
 		$result=$query->execute(array("$path%"))->fetchAll();
 		return $result[0]['count'];
 	}
@@ -348,7 +348,7 @@ class OC_MEDIA_COLLECTION{
 	 * if a path of a folder is passed, all songs stored in the folder will be removed from the database
 	 */
 	public static function deleteSongByPath($path){
-		$query=OCP\DB::prepare("DELETE FROM *PREFIX*media_songs WHERE song_path LIKE ?");
+		$query=OCP\DB::prepare("DELETE FROM `*PREFIX*media_songs` WHERE `song_path` LIKE ?");
 		$query->execute(array("$path%"));
 	}
 
@@ -358,7 +358,7 @@ class OC_MEDIA_COLLECTION{
 	 */
 	public static function registerPlay($songId){
 		$now=time();
-		$query=OCP\DB::prepare('UPDATE *PREFIX*media_songs SET song_playcount=song_playcount+1, song_lastplayed=? WHERE song_id=? AND song_lastplayed<?');
+		$query=OCP\DB::prepare('UPDATE `*PREFIX*media_songs` SET `song_playcount`=`song_playcount`+1, `song_lastplayed`=? WHERE `song_id`=? AND `song_lastplayed`<?');
 		$query->execute(array($now,$songId,$now-60));
 	}
 
@@ -368,7 +368,7 @@ class OC_MEDIA_COLLECTION{
 	 * @return int
 	 */
 	public static function getSongByPath($path){
-		$query=OCP\DB::prepare("SELECT song_id FROM *PREFIX*media_songs WHERE song_path = ?");
+		$query=OCP\DB::prepare("SELECT `song_id` FROM `*PREFIX*media_songs` WHERE `song_path` = ?");
 		$result=$query->execute(array($path));
 		if($row=$result->fetchRow()){
 			return $row['song_id'];
@@ -383,7 +383,7 @@ class OC_MEDIA_COLLECTION{
 	 * @param string $newPath
 	 */
 	public static function moveSong($oldPath,$newPath){
-		$query=OCP\DB::prepare("UPDATE *PREFIX*media_songs SET song_path = ? WHERE song_path = ?");
+		$query=OCP\DB::prepare("UPDATE `*PREFIX*media_songs` SET `song_path` = ? WHERE `song_path` = ?");
 		$query->execute(array($newPath,$oldPath));
 	}
 }
diff --git a/apps/media/lib_media.php b/apps/media/lib_media.php
index 71069fdf4b..f9f10584dd 100644
--- a/apps/media/lib_media.php
+++ b/apps/media/lib_media.php
@@ -41,11 +41,11 @@ class OC_MEDIA{
 	public static function loginListener($params){
 		if(isset($_POST['user']) and $_POST['password']){
 			$name=$_POST['user'];
-			$query=OCP\DB::prepare("SELECT user_id from *PREFIX*media_users WHERE user_id LIKE ?");
+			$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']);
-				$query=OCP\DB::prepare("INSERT INTO *PREFIX*media_users (user_id, user_password_sha256) VALUES (?, ?);");
+				$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..7c7e455d82 100644
--- a/apps/remoteStorage/lib_remoteStorage.php
+++ b/apps/remoteStorage/lib_remoteStorage.php
@@ -2,7 +2,7 @@
 
 class OC_remoteStorage {
 	public static function getValidTokens($ownCloudUser, $category) {
-		$query=OCP\DB::prepare("SELECT token,appUrl,category FROM *PREFIX*authtoken WHERE user=? LIMIT 100");
+		$query=OCP\DB::prepare("SELECT `token`,`appUrl`,`category` FROM `*PREFIX*authtoken` WHERE `user`=? LIMIT 100");
 		$result=$query->execute(array($ownCloudUser));
 		$ret = array();
 		while($row=$result->fetchRow()){
@@ -15,7 +15,7 @@ class OC_remoteStorage {
 
   public static function getTokenFor($appUrl, $categories) {
 		$user=OCP\USER::getUser();
-		$query=OCP\DB::prepare("SELECT token FROM *PREFIX*authtoken WHERE user=? AND appUrl=? AND category=? LIMIT 1");
+		$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()) {
@@ -27,7 +27,7 @@ class OC_remoteStorage {
 
 	public static function getAllTokens() {
 		$user=OCP\USER::getUser();
-		$query=OCP\DB::prepare("SELECT token,appUrl,category FROM *PREFIX*authtoken WHERE user=? LIMIT 100");
+		$query=OCP\DB::prepare("SELECT `token`,`appUrl`,`category` FROM `*PREFIX*authtoken` WHERE `user`=? LIMIT 100");
 		$result=$query->execute(array($user));
 		$ret = array();
 		while($row=$result->fetchRow()){
@@ -41,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=?");
+		$query=OCP\DB::prepare("DELETE FROM `*PREFIX*authtoken` WHERE `token`=? AND `user`=?");
 		$result=$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(?,?,?,?)");
+		$query=OCP\DB::prepare("INSERT INTO `*PREFIX*authtoken` (`token`,`appUrl`,`user`,`category`) VALUES(?,?,?,?)");
 		$result=$query->execute(array($token,$appUrl,$user,$categories));
 	}
 	public static function createCategories($appUrl, $categories) {
diff --git a/apps/user_ldap/appinfo/update.php b/apps/user_ldap/appinfo/update.php
index b3f7a397db..3ebb19c2fc 100644
--- a/apps/user_ldap/appinfo/update.php
+++ b/apps/user_ldap/appinfo/update.php
@@ -14,7 +14,7 @@ if(!is_null($pw)) {
 //it's a bit spaghetti, but hey.
 $state = OCP\Config::getSystemValue('ldapIgnoreNamingRules', 'doCheck');
 if($state == 'doCheck'){
-	$sqlCleanMap = 'DELETE FROM *PREFIX*ldap_user_mapping';
+	$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');
diff --git a/apps/user_ldap/lib_ldap.php b/apps/user_ldap/lib_ldap.php
index 4bd0ff4bbf..ab838812ae 100644
--- a/apps/user_ldap/lib_ldap.php
+++ b/apps/user_ldap/lib_ldap.php
@@ -153,9 +153,9 @@ class OC_LDAP {
 		$table = self::getMapTable($isUser);
 
 		$query = OCP\DB::prepare('
-			SELECT ldap_dn
-			FROM '.$table.'
-			WHERE owncloud_name = ?
+			SELECT `ldap_dn`
+			FROM `'.$table.'`
+			WHERE `owncloud_name` = ?
 		');
 
 		$record = $query->execute(array($name))->fetchOne();
@@ -202,9 +202,9 @@ class OC_LDAP {
 		}
 
 		$query = OCP\DB::prepare('
-			SELECT owncloud_name
-			FROM '.$table.'
-			WHERE ldap_dn = ?
+			SELECT `owncloud_name`
+			FROM `'.$table.'`
+			WHERE `ldap_dn` = ?
 		');
 
 		$component = $query->execute(array($dn))->fetchOne();
@@ -344,8 +344,8 @@ class OC_LDAP {
 		$table = self::getMapTable($isUsers);
 
 		$query = OCP\DB::prepare('
-			SELECT ldap_dn, owncloud_name
-			FROM '. $table
+			SELECT `ldap_dn`, `owncloud_name`
+			FROM `'. $table .'`'
 		);
 
 		return $query->execute()->fetchAll();
@@ -391,18 +391,18 @@ class OC_LDAP {
 		$sqlAdjustment = '';
 		$dbtype = OCP\Config::getSystemValue('dbtype');
 		if($dbtype == 'mysql') {
-			$sqlAdjustment = 'FROM dual';
+			$sqlAdjustment = 'FROM `dual`';
 		}
 
 		$insert = OCP\DB::prepare('
-			INSERT INTO '.$table.' (ldap_dn, owncloud_name)
+			INSERT INTO `'.$table.'` (`ldap_dn`, `owncloud_name`)
 				SELECT ?,?
 				'.$sqlAdjustment.'
 				WHERE NOT EXISTS (
 					SELECT 1
-					FROM '.$table.'
-					WHERE ldap_dn = ?
-						OR owncloud_name = ? )
+					FROM `'.$table.'`
+					WHERE `ldap_dn` = ?
+						OR `owncloud_name` = ? )
 		');
 
 		$res = $insert->execute(array($dn, $ocname, $dn, $ocname));
diff --git a/apps/user_openid/user_openid.php b/apps/user_openid/user_openid.php
index 3267db3fa0..8fb694f75c 100644
--- a/apps/user_openid/user_openid.php
+++ b/apps/user_openid/user_openid.php
@@ -54,7 +54,7 @@ class OC_USER_OPENID extends OC_User_Backend {
 	 * find the user that can be authenticated with an openid identity
 	 */
 	public static function findUserForIdentity($identity){
-		$query=OCP\DB::prepare('SELECT userid FROM *PREFIX*preferences WHERE appid=? AND configkey=? AND configvalue=?');
+		$query=OCP\DB::prepare('SELECT `userid` FROM `*PREFIX*preferences` WHERE `appid`=? AND `configkey`=? AND `configvalue`=?');
 		$result=$query->execute(array('user_openid','identity',$identity))->fetchAll();
 		if(count($result)>0){
 			return $result[0]['userid'];
diff --git a/lib/app.php b/lib/app.php
index e57e1e58a2..f9292b331b 100644
--- a/lib/app.php
+++ b/lib/app.php
@@ -139,7 +139,7 @@ class OC_App{
 	 */
 	public static function getEnabledApps(){
 		$apps=array('files');
-		$query = OC_DB::prepare( 'SELECT appid FROM *PREFIX*appconfig WHERE configkey = \'enabled\' AND configvalue=\'yes\'' );
+		$query = OC_DB::prepare( 'SELECT `appid` FROM `*PREFIX*appconfig` WHERE `configkey` = \'enabled\' AND `configvalue`=\'yes\'' );
 		$result=$query->execute();
 		while($row=$result->fetchRow()){
 			if(array_search($row['appid'],$apps)===false){
@@ -548,7 +548,7 @@ class OC_App{
 	 */
 	public static function getAppVersions(){
 		$versions=array();
-		$query = OC_DB::prepare( 'SELECT appid, configvalue FROM *PREFIX*appconfig WHERE configkey = \'installed_version\'' );
+		$query = OC_DB::prepare( 'SELECT `appid`, `configvalue` FROM `*PREFIX*appconfig` WHERE `configkey` = \'installed_version\'' );
 		$result = $query->execute();
 		while($row = $result->fetchRow()){
 			$versions[$row['appid']]=$row['configvalue'];
diff --git a/lib/appconfig.php b/lib/appconfig.php
index 5aaaadd9c4..2e356225e7 100644
--- a/lib/appconfig.php
+++ b/lib/appconfig.php
@@ -47,7 +47,7 @@ class OC_Appconfig{
 	 */
 	public static function getApps(){
 		// No magic in here!
-		$query = OC_DB::prepare( 'SELECT DISTINCT appid FROM *PREFIX*appconfig' );
+		$query = OC_DB::prepare( 'SELECT DISTINCT `appid` FROM `*PREFIX*appconfig`' );
 		$result = $query->execute();
 
 		$apps = array();
@@ -68,7 +68,7 @@ class OC_Appconfig{
 	 */
 	public static function getKeys( $app ){
 		// No magic in here as well
-		$query = OC_DB::prepare( 'SELECT configkey FROM *PREFIX*appconfig WHERE appid = ?' );
+		$query = OC_DB::prepare( 'SELECT `configkey` FROM `*PREFIX*appconfig` WHERE `appid` = ?' );
 		$result = $query->execute( array( $app ));
 
 		$keys = array();
@@ -91,7 +91,7 @@ class OC_Appconfig{
 	 */
 	public static function getValue( $app, $key, $default = null ){
 		// At least some magic in here :-)
-		$query = OC_DB::prepare( 'SELECT configvalue FROM *PREFIX*appconfig WHERE appid = ? AND configkey = ?' );
+		$query = OC_DB::prepare( 'SELECT `configvalue` FROM `*PREFIX*appconfig` WHERE `appid` = ? AND `configkey` = ?' );
 		$result = $query->execute( array( $app, $key ));
 		$row = $result->fetchRow();
 		if($row){
@@ -124,11 +124,11 @@ class OC_Appconfig{
 	public static function setValue( $app, $key, $value ){
 		// Does the key exist? yes: update. No: insert
 		if(! self::hasKey($app,$key)){
-			$query = OC_DB::prepare( 'INSERT INTO *PREFIX*appconfig ( appid, configkey, configvalue ) VALUES( ?, ?, ? )' );
+			$query = OC_DB::prepare( 'INSERT INTO `*PREFIX*appconfig` ( `appid`, `configkey`, `configvalue` ) VALUES( ?, ?, ? )' );
 			$query->execute( array( $app, $key, $value ));
 		}
 		else{
-			$query = OC_DB::prepare( 'UPDATE *PREFIX*appconfig SET configvalue = ? WHERE appid = ? AND configkey = ?' );
+			$query = OC_DB::prepare( 'UPDATE `*PREFIX*appconfig` SET `configvalue` = :configvalue WHERE `appid` = ? AND `configkey` = ?' );
 			$query->execute( array( $value, $app, $key ));
 		}
 	}
@@ -143,7 +143,7 @@ class OC_Appconfig{
 	 */
 	public static function deleteKey( $app, $key ){
 		// Boring!
-		$query = OC_DB::prepare( 'DELETE FROM *PREFIX*appconfig WHERE appid = ? AND configkey = ?' );
+		$query = OC_DB::prepare( 'DELETE FROM `*PREFIX*appconfig` WHERE `appid` = ? AND `configkey` = ?' );
 		$query->execute( array( $app, $key ));
 
 		return true;
@@ -158,7 +158,7 @@ class OC_Appconfig{
 	 */
 	public static function deleteApp( $app ){
 		// Nothing special
-		$query = OC_DB::prepare( 'DELETE FROM *PREFIX*appconfig WHERE appid = ?' );
+		$query = OC_DB::prepare( 'DELETE FROM `*PREFIX*appconfig` WHERE `appid` = ?' );
 		$query->execute( array( $app ));
 
 		return true;
@@ -175,20 +175,20 @@ class OC_Appconfig{
 			return false;
 		}
 		$where='WHERE';
-		$fields='configvalue';
+		$fields='`configvalue`';
 		$params=array();
 		if($app!==false){
-			$where.=' appid = ?';
-			$fields.=', configkey';
+			$where.=' `appid` = ?';
+			$fields.=', `configkey`';
 			$params[]=$app;
 			$key='configkey';
 		}else{
-			$fields.=', appid';
-			$where.=' configkey = ?';
+			$fields.=', `appid`';
+			$where.=' `configkey` = ?';
 			$params[]=$key;
 			$key='appid';
 		}
-		$queryString='SELECT '.$fields.' FROM *PREFIX*appconfig '.$where;
+		$queryString='SELECT '.$fields.' FROM `*PREFIX*appconfig` '.$where;
 		$query=OC_DB::prepare($queryString);
 		$result=$query->execute($params);
 		$values=array();
diff --git a/lib/connector/sabre/locks.php b/lib/connector/sabre/locks.php
index 94382e68a1..b4878fabc7 100644
--- a/lib/connector/sabre/locks.php
+++ b/lib/connector/sabre/locks.php
@@ -41,7 +41,7 @@ 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 = ?)';
+		$query = 'SELECT * FROM `*PREFIX*locks` WHERE `userid` = ? AND (`created` + `timeout`) > ? AND ((`uri` = ?)';
 		$params = array(OC_User::getUser(),time(),$uri);
 
 		// We need to check locks for every part in the uri.
@@ -57,14 +57,14 @@ class OC_Connector_Sabre_Locks extends Sabre_DAV_Locks_Backend_Abstract {
 			if ($currentPath) $currentPath.='/';
 			$currentPath.=$part;
 
-			$query.=' OR (depth!=0 AND uri = ?)';
+			$query.=' OR (`depth` != 0 AND `uri` = ?)';
 			$params[] = $currentPath;
 
 		}
 
 		if ($returnChildLocks) {
 
-			$query.=' OR (uri LIKE ?)';
+			$query.=' OR (`uri` LIKE ?)';
 			$params[] = $uri . '/%';
 
 		}
@@ -113,10 +113,10 @@ class OC_Connector_Sabre_Locks extends Sabre_DAV_Locks_Backend_Abstract {
 		}
 	
 		if ($exists) {
-			$query = OC_DB::prepare( 'UPDATE *PREFIX*locks SET owner = ?, timeout = ?, scope = ?, depth = ?, uri = ?, created = ? WHERE userid = ? AND token = ?' );
+			$query = OC_DB::prepare( 'UPDATE `*PREFIX*locks` SET `owner` = ?, `timeout` = ?, `scope` = ?, `depth` = ?, `uri` = ?, `created` = ? WHERE `userid` = ? AND `token` = ?' );
 			$result = $query->execute( array($lockInfo->owner,$lockInfo->timeout,$lockInfo->scope,$lockInfo->depth,$uri,$lockInfo->created,OC_User::getUser(),$lockInfo->token));
 		} else {
-			$query = OC_DB::prepare( 'INSERT INTO *PREFIX*locks (userid,owner,timeout,scope,depth,uri,created,token) VALUES (?,?,?,?,?,?,?,?)' );
+			$query = OC_DB::prepare( 'INSERT INTO `*PREFIX*locks` (`userid`,`owner`,`timeout`,`scope`,`depth`,`uri`,`created`,`token`) VALUES (?,?,?,?,?,?,?,?)' );
 			$result = $query->execute( array(OC_User::getUser(),$lockInfo->owner,$lockInfo->timeout,$lockInfo->scope,$lockInfo->depth,$uri,$lockInfo->created,$lockInfo->token));
 		}
 
@@ -133,7 +133,7 @@ class OC_Connector_Sabre_Locks extends Sabre_DAV_Locks_Backend_Abstract {
 	 */
 	public function unlock($uri,Sabre_DAV_Locks_LockInfo $lockInfo) {
 
-		$query = OC_DB::prepare( 'DELETE FROM *PREFIX*locks WHERE userid = ? AND uri=? AND token=?' );
+		$query = OC_DB::prepare( 'DELETE FROM `*PREFIX*locks` WHERE `userid` = ? AND `uri` = ? AND `token` = ?' );
 		$result = $query->execute( array(OC_User::getUser(),$uri,$lockInfo->token));
 
 		return $result->numRows() === 1;
diff --git a/lib/connector/sabre/node.php b/lib/connector/sabre/node.php
index 85d2160feb..ce5cc02208 100644
--- a/lib/connector/sabre/node.php
+++ b/lib/connector/sabre/node.php
@@ -77,7 +77,7 @@ abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IPr
 	
 		$this->path = $newPath;
 		
-		$query = OC_DB::prepare( 'UPDATE *PREFIX*properties SET propertypath = ? WHERE userid = ? AND propertypath = ?' );
+		$query = OC_DB::prepare( 'UPDATE `*PREFIX*properties` SET `propertypath` = ? WHERE `userid` = ? AND `propertypath` = ?' );
 		$query->execute( array( $newPath,OC_User::getUser(), $oldPath ));
 
 	}
@@ -125,7 +125,7 @@ abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IPr
 			// If it was null, we need to delete the property
 			if (is_null($propertyValue)) {
 				if(array_key_exists( $propertyName, $existing )){
-					$query = OC_DB::prepare( 'DELETE FROM *PREFIX*properties WHERE userid = ? AND propertypath = ? AND propertyname = ?' );
+					$query = OC_DB::prepare( 'DELETE FROM `*PREFIX*properties` WHERE `userid` = ? AND `propertypath` = ? AND `propertyname` = ?' );
 					$query->execute( array( OC_User::getUser(), $this->path, $propertyName ));
 				}
 			}
@@ -134,10 +134,10 @@ abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IPr
 					$this->touch($propertyValue);
 				} else {
 					if(!array_key_exists( $propertyName, $existing )){
-						$query = OC_DB::prepare( 'INSERT INTO *PREFIX*properties (userid,propertypath,propertyname,propertyvalue) VALUES(?,?,?,?)' );
+						$query = OC_DB::prepare( 'INSERT INTO `*PREFIX*properties` (`userid`,`propertypath`,`propertyname`,`propertyvalue`) VALUES(?,?,?,?)' );
 						$query->execute( array( OC_User::getUser(), $this->path, $propertyName,$propertyValue ));
 					} else {
-						$query = OC_DB::prepare( 'UPDATE *PREFIX*properties SET propertyvalue = ? WHERE userid = ? AND propertypath = ? AND propertyname = ?' );
+						$query = OC_DB::prepare( 'UPDATE `*PREFIX*properties` SET `propertyvalue` = ? WHERE `userid` = ? AND `propertypath` = ? AND `propertyname` = ?' );
 						$query->execute( array( $propertyValue,OC_User::getUser(), $this->path, $propertyName ));
 					}
 				}
@@ -158,7 +158,7 @@ abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IPr
 	 */
 	function getProperties($properties) {
 		// At least some magic in here :-)
-		$query = OC_DB::prepare( 'SELECT * FROM *PREFIX*properties WHERE userid = ? AND propertypath = ?' );
+		$query = OC_DB::prepare( 'SELECT * FROM `*PREFIX*properties` WHERE `userid` = ? AND `propertypath` = ?' );
 		$result = $query->execute( array( OC_User::getUser(), $this->path ));
 
 		$existing = array();
diff --git a/lib/filecache.php b/lib/filecache.php
index 8d0f3c84f9..e475581f14 100644
--- a/lib/filecache.php
+++ b/lib/filecache.php
@@ -59,7 +59,7 @@ class OC_FileCache{
 			$root='';
 		}
 		$path=$root.$path;
-		$query=OC_DB::prepare('SELECT ctime,mtime,mimetype,size,encrypted,versioned,writable FROM *PREFIX*fscache WHERE path_hash=?');
+		$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;
@@ -112,7 +112,7 @@ class OC_FileCache{
 		$data['encrypted']=(int)$data['encrypted'];
 		$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(?,?,?,?,?,?,?,?,?,?,?,?,?)');
+		$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']));
 		if(OC_DB::isError($result)){
 			OC_Log::write('files','error while writing file('.$path.') to cache',OC_Log::ERROR);
@@ -135,7 +135,7 @@ class OC_FileCache{
 				}else{
 					$arguments[] = $data[$attribute];
 				}
-				$queryParts[]=$attribute.'=?';
+				$queryParts[]='`'.$attribute.'`=?';
 			}
 		}
 		if(isset($data['mimetype'])){
@@ -144,7 +144,7 @@ class OC_FileCache{
 		}
 		$arguments[]=$id;
 		
-		$sql = 'UPDATE *PREFIX*fscache SET '.implode(' , ',$queryParts).' WHERE id=?';
+		$sql = 'UPDATE `*PREFIX*fscache` SET '.implode(' , ',$queryParts).' WHERE `id`=?';
 		$query=OC_DB::prepare($sql);
 		$result=$query->execute($arguments);
 		if(OC_DB::isError($result)){
@@ -168,12 +168,12 @@ class OC_FileCache{
 		$oldPath=$root.$oldPath;
 		$newPath=$root.$newPath;
 		$newParent=self::getParentId($newPath);
-		$query=OC_DB::prepare('UPDATE *PREFIX*fscache SET parent=? ,name=?, path=?, path_hash=? WHERE path_hash=?');
+		$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 ?');
+		$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=?');
+		$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);
@@ -197,12 +197,12 @@ class OC_FileCache{
 			$path=$root.$file;
 			self::delete(self::getFileId($path));
 		}elseif($file!=-1){
-			$query=OC_DB::prepare('SELECT id FROM *PREFIX*fscache WHERE parent=?');
+			$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=OC_DB::prepare('DELETE FROM `*PREFIX*fscache` WHERE `id`=?');
 			$query->execute(array($file));
 		}
 	}
@@ -223,9 +223,9 @@ class OC_FileCache{
 		}
 		$rootLen=strlen($root);
 		if(!$returnData){
-			$query=OC_DB::prepare('SELECT path FROM *PREFIX*fscache WHERE name LIKE ? AND `user`=?');
+			$query=OC_DB::prepare('SELECT `path` FROM `*PREFIX*fscache` WHERE `name` LIKE ? AND `user`=?');
 		}else{
-			$query=OC_DB::prepare('SELECT * FROM *PREFIX*fscache WHERE name LIKE ? AND `user`=?');
+			$query=OC_DB::prepare('SELECT * FROM `*PREFIX*fscache` WHERE `name` LIKE ? AND `user`=?');
 		}
 		$result=$query->execute(array("%$search%",OC_User::getUser()));
 		$names=array();
@@ -270,7 +270,7 @@ class OC_FileCache{
 		if($parent==-1){
 			return array();
 		}
-    $query=OC_DB::prepare('SELECT name,ctime,mtime,mimetype,size,encrypted,versioned,writable FROM *PREFIX*fscache WHERE parent=? AND (mimetype LIKE ? OR mimetype = ?)');
+    $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;
@@ -304,7 +304,7 @@ class OC_FileCache{
 	 * @return int
 	 */
 	private static function getFileId($path){
-		$query=OC_DB::prepare('SELECT id FROM *PREFIX*fscache WHERE path_hash=?');
+		$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;
@@ -350,7 +350,7 @@ class OC_FileCache{
 		if(!$user){
 			$user=OC_User::getUser();
 		}
-		$query=OC_DB::prepare('SELECT path FROM *PREFIX*fscache WHERE id=? AND `user`=?');
+		$query=OC_DB::prepare('SELECT `path` FROM `*PREFIX*fscache` WHERE `id`=? AND `user`=?');
 		$result=$query->execute(array($id,$user));
 		$row=$result->fetchRow();
 		$path=$row['path'];
@@ -396,7 +396,7 @@ class OC_FileCache{
 		if($dir){
 			if(self::inCache($path,$root) && $path != '/Shared'){
 				$parent=self::getFileId($fullPath);
-				$query=OC_DB::prepare('SELECT size FROM *PREFIX*fscache WHERE parent=?');
+				$query=OC_DB::prepare('SELECT `size` FROM `*PREFIX*fscache` WHERE `parent`=?');
 				$result=$query->execute(array($parent));
 				while($row=$result->fetchRow()){
 					$size+=$row['size'];
@@ -424,7 +424,7 @@ class OC_FileCache{
 			}
 		}
 		$path=$root.$path;
-		$query=OC_DB::prepare('SELECT ctime,mtime,mimetype,size,encrypted,versioned,writable FROM *PREFIX*fscache WHERE path_hash=?');
+		$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])){
@@ -450,7 +450,7 @@ class OC_FileCache{
 			}
 		}
 		$path=$root.$path;
-		$query=OC_DB::prepare('SELECT size FROM *PREFIX*fscache WHERE path_hash=?');
+		$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'];
@@ -516,7 +516,7 @@ class OC_FileCache{
 	private static function increaseSize($path,$sizeDiff){
 		if($sizeDiff==0) return;
 		while(($id=self::getFileId($path))!=-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=OC_DB::prepare('UPDATE `*PREFIX*fscache` SET `size`=`size`+? WHERE `id`=?');
 			$query->execute(array($sizeDiff,$id));
 			$path=dirname($path);
 		}
@@ -616,10 +616,10 @@ class OC_FileCache{
 		$root .= '%';
 		$user=OC_User::getUser();
 		if(!$part2){
-			$query=OC_DB::prepare('SELECT path FROM *PREFIX*fscache WHERE mimepart=? AND `user`=? AND path LIKE ?');
+			$query=OC_DB::prepare('SELECT `path` FROM `*PREFIX*fscache` WHERE `mimepart`=? AND `user`=? AND `path` LIKE ?');
 			$result=$query->execute(array($part1,$user, $root));
 		}else{
-			$query=OC_DB::prepare('SELECT path FROM *PREFIX*fscache WHERE mimetype=? AND `user`=? AND path LIKE ? ');
+			$query=OC_DB::prepare('SELECT `path` FROM `*PREFIX*fscache` WHERE `mimetype`=? AND `user`=? AND `path` LIKE ? ');
 			$result=$query->execute(array($part1.'/'.$part2,$user, $root));
 		}
 		$names=array();
@@ -652,7 +652,7 @@ class OC_FileCache{
 		$mtime=$view->filemtime($path.(($folder)?'/':''));
 		$isDir=$view->is_dir($path);
 		$fullPath=$root.$path;
-		$query=OC_DB::prepare('SELECT mtime FROM *PREFIX*fscache WHERE path_hash=?');
+		$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'];
@@ -713,7 +713,7 @@ class OC_FileCache{
 		}
 		//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=?');
+		$query=OC_DB::prepare('SELECT `name` FROM `*PREFIX*fscache` WHERE `parent`=?');
 		$result=$query->execute(array($parent));
 		while($row=$result->fetchRow()){
 			$file=$path.'/'.$row['name'];
@@ -731,7 +731,7 @@ class OC_FileCache{
 	 * clean old pre-path_hash entries
 	 */
 	public static function clean(){
-		$query=OC_DB::prepare('DELETE FROM *PREFIX*fscache WHERE LENGTH(path_hash)<30');
+		$query=OC_DB::prepare('DELETE FROM `*PREFIX*fscache` WHERE LENGTH(`path_hash`)<30');
 		$query->execute();
 	}
 }
diff --git a/lib/group/database.php b/lib/group/database.php
index d401acf43b..5e52432c49 100644
--- a/lib/group/database.php
+++ b/lib/group/database.php
@@ -53,7 +53,7 @@ class OC_Group_Database extends OC_Group_Backend {
 	 */
 	public static function createGroup( $gid ){
 		// Check for existence
-		$query = OC_DB::prepare( "SELECT gid FROM `*PREFIX*groups` WHERE gid = ?" );
+		$query = OC_DB::prepare( 'SELECT `gid` FROM `*PREFIX*groups` WHERE `gid` = ?' );
 		$result = $query->execute( array( $gid ));
 
 		if( $result->fetchRow() ){
@@ -62,7 +62,7 @@ class OC_Group_Database extends OC_Group_Backend {
 		}
 		else{
 			// Add group and exit
-			$query = OC_DB::prepare( "INSERT INTO `*PREFIX*groups` ( `gid` ) VALUES( ? )" );
+			$query = OC_DB::prepare( 'INSERT INTO `*PREFIX*groups` ( `gid` ) VALUES( ? )' );
 			$result = $query->execute( array( $gid ));
 
 			return $result ? true : false;
@@ -78,11 +78,11 @@ class OC_Group_Database extends OC_Group_Backend {
 	 */
 	public static function deleteGroup( $gid ){
 		// Delete the group
-		$query = OC_DB::prepare( "DELETE FROM `*PREFIX*groups` WHERE gid = ?" );
+		$query = OC_DB::prepare( 'DELETE FROM `*PREFIX*groups` WHERE `gid` = ?' );
 		$result = $query->execute( array( $gid ));
 
 		// Delete the group-user relation
-		$query = OC_DB::prepare( "DELETE FROM `*PREFIX*group_user` WHERE gid = ?" );
+		$query = OC_DB::prepare( 'DELETE FROM `*PREFIX*group_user` WHERE `gid` = ?' );
 		$result = $query->execute( array( $gid ));
 
 		return true;
@@ -98,7 +98,7 @@ class OC_Group_Database extends OC_Group_Backend {
 	 */
 	public static function inGroup( $uid, $gid ){
 		// check
-		$query = OC_DB::prepare( "SELECT uid FROM `*PREFIX*group_user` WHERE gid = ? AND uid = ?" );
+		$query = OC_DB::prepare( 'SELECT `uid` FROM `*PREFIX*group_user` WHERE `gid` = ? AND `uid` = ?' );
 		$result = $query->execute( array( $gid, $uid ));
 
 		return $result->fetchRow() ? true : false;
@@ -115,7 +115,7 @@ class OC_Group_Database extends OC_Group_Backend {
 	public static function addToGroup( $uid, $gid ){
 		// No duplicate entries!
 		if( !self::inGroup( $uid, $gid )){
-			$query = OC_DB::prepare( "INSERT INTO `*PREFIX*group_user` ( `uid`, `gid` ) VALUES( ?, ? )" );
+			$query = OC_DB::prepare( 'INSERT INTO `*PREFIX*group_user` ( `uid`, `gid` ) VALUES( ?, ? )' );
 			$result = $query->execute( array( $uid, $gid ));
 			return true;
 		}else{
@@ -132,7 +132,7 @@ class OC_Group_Database extends OC_Group_Backend {
 	 * removes the user from a group.
 	 */
 	public static function removeFromGroup( $uid, $gid ){
-		$query = OC_DB::prepare( "DELETE FROM *PREFIX*group_user WHERE uid = ? AND gid = ?" );
+		$query = OC_DB::prepare( 'DELETE FROM `*PREFIX*group_user` WHERE `uid` = ? AND `gid` = ?' );
 		$result = $query->execute( array( $uid, $gid ));
 
 		return true;
@@ -148,7 +148,7 @@ class OC_Group_Database extends OC_Group_Backend {
 	 */
 	public static function getUserGroups( $uid ){
 		// No magic!
-		$query = OC_DB::prepare( "SELECT gid FROM `*PREFIX*group_user` WHERE uid = ?" );
+		$query = OC_DB::prepare( 'SELECT `gid` FROM `*PREFIX*group_user` WHERE `uid` = ?' );
 		$result = $query->execute( array( $uid ));
 
 		$groups = array();
@@ -166,7 +166,7 @@ class OC_Group_Database extends OC_Group_Backend {
 	 * Returns a list with all groups
 	 */
 	public static function getGroups(){
-		$query = OC_DB::prepare( "SELECT gid FROM `*PREFIX*groups`" );
+		$query = OC_DB::prepare( 'SELECT `gid` FROM `*PREFIX*groups`' );
 		$result = $query->execute();
 
 		$groups = array();
@@ -182,7 +182,7 @@ class OC_Group_Database extends OC_Group_Backend {
 	 * @returns array with user ids
 	 */
 	public static function usersInGroup($gid){
-		$query=OC_DB::prepare('SELECT uid FROM *PREFIX*group_user WHERE gid=?');
+		$query=OC_DB::prepare('SELECT `uid` FROM `*PREFIX*group_user` WHERE `gid`=?');
 		$users=array();
 		$result=$query->execute(array($gid));
 		while($row=$result->fetchRow()){
diff --git a/lib/migrate.php b/lib/migrate.php
index 5939ba32e5..5e1922e10e 100644
--- a/lib/migrate.php
+++ b/lib/migrate.php
@@ -447,7 +447,7 @@ class OC_Migrate{
 					);
 		// Add hash if user export
 		if( self::$exporttype == 'user' ){
-			$query = OC_DB::prepare( "SELECT password FROM *PREFIX*users WHERE uid = ?" );
+			$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;
diff --git a/lib/migration/content.php b/lib/migration/content.php
index 7ef88f36e4..5c89e6bacd 100644
--- a/lib/migration/content.php
+++ b/lib/migration/content.php
@@ -109,7 +109,7 @@ class OC_Migration_Content{
 			
 			foreach( $options['matchval'] as $matchval ){
 				// Run the query for this match value (where x = y value)
-				$sql = "SELECT * FROM *PREFIX*" . $options['table'] . " WHERE " . $options['matchcol'] . " LIKE ?";
+				$sql = 'SELECT * FROM `*PREFIX*' . $options['table'] . '` WHERE `' . $options['matchcol'] . '` LIKE ?';
 				$query = OC_DB::prepare( $sql );
 				$results = $query->execute( array( $matchval ) );
 				$newreturns = $this->insertData( $results, $options );
@@ -118,7 +118,7 @@ class OC_Migration_Content{
 
 		} else {
 			// Just get everything
-			$sql = "SELECT * FROM *PREFIX*" . $options['table'];
+			$sql = 'SELECT * FROM `*PREFIX*' . $options['table'] . '`';
 			$query = OC_DB::prepare( $sql );
 			$results = $query->execute();
 			$return = $this->insertData( $results, $options );
diff --git a/lib/preferences.php b/lib/preferences.php
index 75201f455b..18627d7d2e 100644
--- a/lib/preferences.php
+++ b/lib/preferences.php
@@ -47,7 +47,7 @@ class OC_Preferences{
 	 */
 	public static function getUsers(){
 		// No need for more comments
-		$query = OC_DB::prepare( 'SELECT DISTINCT( userid ) FROM *PREFIX*preferences' );
+		$query = OC_DB::prepare( 'SELECT DISTINCT( `userid` ) FROM `*PREFIX*preferences`' );
 		$result = $query->execute();
 
 		$users = array();
@@ -68,7 +68,7 @@ class OC_Preferences{
 	 */
 	public static function getApps( $user ){
 		// No need for more comments
-		$query = OC_DB::prepare( 'SELECT DISTINCT( appid ) FROM *PREFIX*preferences WHERE userid = ?' );
+		$query = OC_DB::prepare( 'SELECT DISTINCT( `appid` ) FROM `*PREFIX*preferences` WHERE `userid` = ?' );
 		$result = $query->execute( array( $user ));
 
 		$apps = array();
@@ -90,7 +90,7 @@ class OC_Preferences{
 	 */
 	public static function getKeys( $user, $app ){
 		// No need for more comments
-		$query = OC_DB::prepare( 'SELECT configkey FROM *PREFIX*preferences WHERE userid = ? AND appid = ?' );
+		$query = OC_DB::prepare( 'SELECT `configkey` FROM `*PREFIX*preferences` WHERE `userid` = ? AND `appid` = ?' );
 		$result = $query->execute( array( $user, $app ));
 
 		$keys = array();
@@ -114,7 +114,7 @@ class OC_Preferences{
 	 */
 	public static function getValue( $user, $app, $key, $default = null ){
 		// Try to fetch the value, return default if not exists.
-		$query = OC_DB::prepare( 'SELECT configvalue FROM *PREFIX*preferences WHERE userid = ? AND appid = ? AND configkey = ?' );
+		$query = OC_DB::prepare( 'SELECT `configvalue` FROM `*PREFIX*preferences` WHERE `userid` = ? AND `appid` = ? AND `configkey` = ?' );
 		$result = $query->execute( array( $user, $app, $key ));
 		
 		$row = $result->fetchRow();
@@ -138,16 +138,16 @@ class OC_Preferences{
 	 */
 	public static function setValue( $user, $app, $key, $value ){
 		// Check if the key does exist
-		$query = OC_DB::prepare( 'SELECT configvalue FROM *PREFIX*preferences WHERE userid = ? AND appid = ? AND configkey = ?' );
+		$query = OC_DB::prepare( 'SELECT `configvalue` FROM `*PREFIX*preferences` WHERE `userid` = ? AND `appid` = ? AND `configkey` = ?' );
 		$values=$query->execute(array($user,$app,$key))->fetchAll();
 		$exists=(count($values)>0);
 
 		if( !$exists ){
-			$query = OC_DB::prepare( 'INSERT INTO *PREFIX*preferences ( userid, appid, configkey, configvalue ) VALUES( ?, ?, ?, ? )' );
+			$query = OC_DB::prepare( 'INSERT INTO `*PREFIX*preferences` ( `userid`, `appid`, `configkey`, `configvalue` ) VALUES( ?, ?, ?, ? )' );
 			$query->execute( array( $user, $app, $key, $value ));
 		}
 		else{
-			$query = OC_DB::prepare( 'UPDATE *PREFIX*preferences SET configvalue = ? WHERE userid = ? AND appid = ? AND configkey = ?' );
+			$query = OC_DB::prepare( 'UPDATE `*PREFIX*preferences` SET `configvalue` = ? WHERE `userid` = ? AND `appid` = ? AND `configkey` = ?' );
 			$query->execute( array( $value, $user, $app, $key ));
 		}
 	}
@@ -163,7 +163,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 = ?' );
+		$query = OC_DB::prepare( 'DELETE FROM `*PREFIX*preferences` WHERE `userid` = ? AND `appid` = ? AND `configkey` = ?' );
 		$result = $query->execute( array( $user, $app, $key ));
 
 		return true;
@@ -179,7 +179,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 = ?' );
+		$query = OC_DB::prepare( 'DELETE FROM `*PREFIX*preferences` WHERE `userid` = ? AND `appid` = ?' );
 		$result = $query->execute( array( $user, $app ));
 
 		return true;
@@ -194,7 +194,7 @@ class OC_Preferences{
 	 */
 	public static function deleteUser( $user ){
 		// No need for more comments
-		$query = OC_DB::prepare( 'DELETE FROM *PREFIX*preferences WHERE userid = ?' );
+		$query = OC_DB::prepare( 'DELETE FROM `*PREFIX*preferences` WHERE `userid` = ?' );
 		$result = $query->execute( array( $user ));
 
 		return true;
@@ -209,7 +209,7 @@ class OC_Preferences{
 	 */
 	public static function deleteAppFromAllUsers( $app ){
 		// No need for more comments
-		$query = OC_DB::prepare( 'DELETE FROM *PREFIX*preferences WHERE appid = ?' );
+		$query = OC_DB::prepare( 'DELETE FROM `*PREFIX*preferences` WHERE `appid` = ?' );
 		$result = $query->execute( array( $app ));
 
 		return true;
diff --git a/lib/user/database.php b/lib/user/database.php
index a69fe49a0b..5464a4abfa 100644
--- a/lib/user/database.php
+++ b/lib/user/database.php
@@ -86,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 = ?" );
+		$query = OC_DB::prepare( "DELETE FROM `*PREFIX*users` WHERE `uid` = ?" );
 		$result = $query->execute( array( $uid ));
 		return true;
 	}
@@ -103,7 +103,7 @@ class OC_User_Database extends OC_User_Backend {
 		if( $this->userExists($uid) ){
 			$hasher=$this->getHasher();
 			$hash = $hasher->HashPassword($password.OC_Config::getValue('passwordsalt', ''));
-			$query = OC_DB::prepare( "UPDATE *PREFIX*users SET password = ? WHERE uid = ?" );
+			$query = OC_DB::prepare( "UPDATE `*PREFIX*users` SET `password` = ? WHERE `uid` = ?" );
 			$result = $query->execute( array( $hash, $uid ));
 
 			return true;
@@ -123,7 +123,7 @@ class OC_User_Database extends OC_User_Backend {
 	 * returns the user id or false
 	 */
 	public function checkPassword( $uid, $password ){
-		$query = OC_DB::prepare( "SELECT uid, password FROM *PREFIX*users WHERE uid = ?" );
+		$query = OC_DB::prepare( "SELECT `uid`, `password` FROM `*PREFIX*users` WHERE `uid` = ?" );
 		$result = $query->execute( array( $uid));
 
 		$row=$result->fetchRow();
@@ -157,7 +157,7 @@ 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" );
+		$query = OC_DB::prepare( "SELECT `uid` FROM `*PREFIX*users`" );
 		$result = $query->execute();
 
 		$users=array();
@@ -173,7 +173,7 @@ class OC_User_Database extends OC_User_Backend {
 	 * @return boolean
 	 */
 	public function userExists($uid){
-		$query = OC_DB::prepare( "SELECT * FROM `*PREFIX*users` WHERE uid = ?" );
+		$query = OC_DB::prepare( "SELECT * FROM `*PREFIX*users` WHERE `uid` = ?" );
 		$result = $query->execute( array( $uid ));
 		
 		return $result->numRows() > 0;
diff --git a/lib/vcategories.php b/lib/vcategories.php
index ee7a1d2883..724965d0e9 100644
--- a/lib/vcategories.php
+++ b/lib/vcategories.php
@@ -118,7 +118,7 @@ class OC_VCategories {
 	* To get the object array, do something like:
 	*	// For Addressbook:
 	*	$categories = new OC_VCategories('contacts');
-	*	$stmt = OC_DB::prepare( 'SELECT carddata FROM *PREFIX*contacts_cards' );
+	*	$stmt = OC_DB::prepare( 'SELECT `carddata` FROM `*PREFIX*contacts_cards`' );
 	*	$result = $stmt->execute();
 	*	$objects = array();
 	*	if(!is_null($result)) {

From 727f4357fb900eed691167ca9559e3c0771f77af Mon Sep 17 00:00:00 2001
From: jfd <jfd@underverse>
Date: Mon, 30 Jul 2012 20:48:18 +0200
Subject: [PATCH 0521/1224] remove superflous index (already indexed with
 primary key derived from <autoincrement> by MDB2), oracle will bark on this

---
 apps/media/appinfo/database.xml | 30 ------------------------------
 1 file changed, 30 deletions(-)

diff --git a/apps/media/appinfo/database.xml b/apps/media/appinfo/database.xml
index 9b942d282b..067f7bc059 100644
--- a/apps/media/appinfo/database.xml
+++ b/apps/media/appinfo/database.xml
@@ -46,14 +46,6 @@
     <length>200</length>
    </field>
    
-   <index>
-	   <name>album_index</name>
-	   <field>
-		   <name>album_id</name>
-		   <sorting>ascending</sorting>
-	   </field>
-   </index>
-   
    <index>
 	   <name>album_name_index</name>
 	   <field>
@@ -106,21 +98,6 @@
     </field>
    </index>
    
-   <index>
-	   <name>artist_index</name>
-	   <field>
-		   <name>artist_id</name>
-		   <sorting>ascending</sorting>
-	   </field>
-   </index>
-   <index>
-	   <name>artist_name_index</name>
-	   <field>
-		   <name>artist_name</name>
-		   <sorting>ascending</sorting>
-	   </field>
-   </index>
-
   </declaration>
 
  </table>
@@ -263,13 +240,6 @@
 	   <length>4</length>
    </field>
    
-   <index>
-	   <name>song_index</name>
-	   <field>
-		   <name>song_id</name>
-		   <sorting>ascending</sorting>
-	   </field>
-   </index>
    <index>
 	   <name>song_album_index</name>
 	   <field>

From 3aff7a298c23837b070507a0644b89a8a5c026be Mon Sep 17 00:00:00 2001
From: jfd <jfd@underverse>
Date: Mon, 30 Jul 2012 20:52:11 +0200
Subject: [PATCH 0522/1224] use CURRENT_TIMESTAMP in default column definitions
 (sqlite, mysql, postgres and oracle DO understand it), change clob columns to
 text (clob will give sorting and uniqueness problems and in general is not
 what we want)

---
 apps/calendar/appinfo/database.xml |  8 ++++----
 apps/contacts/appinfo/database.xml |  4 ++--
 db_structure.xml                   | 12 ++++++------
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/apps/calendar/appinfo/database.xml b/apps/calendar/appinfo/database.xml
index 5a3ad32dc2..f60319ad43 100644
--- a/apps/calendar/appinfo/database.xml
+++ b/apps/calendar/appinfo/database.xml
@@ -43,14 +43,14 @@
    <field>
     <name>startdate</name>
     <type>timestamp</type>
-    <default>0000-00-00 00:00:00</default>
+    <default>CURRENT_TIMESTAMP</default>
     <notnull>false</notnull>
    </field>
 
    <field>
     <name>enddate</name>
     <type>timestamp</type>
-    <default>0000-00-00 00:00:00</default>
+    <default>CURRENT_TIMESTAMP</default>
     <notnull>false</notnull>
    </field>
 
@@ -72,7 +72,7 @@
 
    <field>
     <name>calendardata</name>
-    <type>clob</type>
+    <type>text</type>
     <notnull>false</notnull>
    </field>
 
@@ -172,7 +172,7 @@
 
    <field>
     <name>timezone</name>
-    <type>clob</type>
+    <type>text</type>
     <notnull>false</notnull>
    </field>
 
diff --git a/apps/contacts/appinfo/database.xml b/apps/contacts/appinfo/database.xml
index 7c8268d71f..f83a04b8f4 100644
--- a/apps/contacts/appinfo/database.xml
+++ b/apps/contacts/appinfo/database.xml
@@ -49,7 +49,7 @@
 
    <field>
     <name>description</name>
-    <type>clob</type>
+    <type>text</type>
     <notnull>false</notnull>
    </field>
 
@@ -101,7 +101,7 @@
 
    <field>
     <name>carddata</name>
-    <type>clob</type>
+    <type>text</type>
     <notnull>false</notnull>
    </field>
 
diff --git a/db_structure.xml b/db_structure.xml
index 94567b4d53..992d1db414 100644
--- a/db_structure.xml
+++ b/db_structure.xml
@@ -31,7 +31,7 @@
 
    <field>
     <name>configvalue</name>
-    <type>clob</type>
+    <type>text</type>
     <notnull>true</notnull>
    </field>
 
@@ -335,7 +335,7 @@
 
    <field>
     <name>uri</name>
-    <type>clob</type>
+    <type>text</type>
     <notnull>false</notnull>
    </field>
 
@@ -362,7 +362,7 @@
    <field>
     <name>moment</name>
     <type>timestamp</type>
-    <default>0000-00-00 00:00:00</default>
+    <default>CURRENT_TIMESTAMP</default>
     <notnull>true</notnull>
    </field>
 
@@ -392,7 +392,7 @@
 
    <field>
     <name>info</name>
-    <type>clob</type>
+    <type>text</type>
     <notnull>true</notnull>
    </field>
 
@@ -432,7 +432,7 @@
 
    <field>
     <name>configvalue</name>
-    <type>clob</type>
+    <type>text</type>
     <notnull>true</notnull>
    </field>
 
@@ -472,7 +472,7 @@
 
    <field>
     <name>propertyvalue</name>
-    <type>clob</type>
+    <type>text</type>
     <notnull>true</notnull>
    </field>
 

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 0523/1224] 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 795e78809f55be762fb07d9a179bbdffa7aefbd9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= <jfd@butonic.de>
Date: Mon, 30 Jul 2012 20:53:21 +0200
Subject: [PATCH 0524/1224] add oracle to install & setup

---
 core/js/setup.js                |   7 ++
 core/templates/installation.php |  25 +++-
 lib/db.php                      |  46 ++++++--
 lib/setup.php                   | 198 +++++++++++++++++++++++++++++++-
 4 files changed, 261 insertions(+), 15 deletions(-)

diff --git a/core/js/setup.js b/core/js/setup.js
index 6e056cc90d..23c705a068 100644
--- a/core/js/setup.js
+++ b/core/js/setup.js
@@ -4,6 +4,7 @@ $(document).ready(function() {
 		sqlite:!!$('#hasSQLite').val(),
 		mysql:!!$('#hasMySQL').val(),
 		postgresql:!!$('#hasPostgreSQL').val(),
+		oracle:!!$('#hasOracle').val(),
 	}
 	
 	$('#selectDbType').buttonset();
@@ -34,6 +35,12 @@ $(document).ready(function() {
 		$('#dbhost').show(250);
 		$('#dbhostlabel').show(250);
 	});
+	
+	$('#oci').click(function() {
+		$('#use_other_db').slideDown(250);
+		$('#dbhost').show(250);
+		$('#dbhostlabel').show(250);
+	});
 
 	$('input[checked]').trigger('click');
 
diff --git a/core/templates/installation.php b/core/templates/installation.php
index 4558f97bc0..1a05c3fb76 100644
--- a/core/templates/installation.php
+++ b/core/templates/installation.php
@@ -1,6 +1,7 @@
 <input type='hidden' id='hasMySQL' value='<?php echo $_['hasMySQL'] ?>'></input>
 <input type='hidden' id='hasSQLite' value='<?php echo $_['hasSQLite'] ?>'></input>
 <input type='hidden' id='hasPostgreSQL' value='<?php echo $_['hasPostgreSQL'] ?>'></input>
+<input type='hidden' id='hasOracle' value='<?php echo $_['hasOracle'] ?>'></input>
 <form action="index.php" method="post">
 
 <input type="hidden" name="install" value="true" />
@@ -40,7 +41,7 @@
 	</fieldset>
 
 	<fieldset id='databaseField'>
-		<?php if($_['hasMySQL'] or $_['hasPostgreSQL']) $hasOtherDB = true; else $hasOtherDB =false; //other than SQLite ?>
+		<?php if($_['hasMySQL'] or $_['hasPostgreSQL'] or $_['hasOracle']) $hasOtherDB = true; else $hasOtherDB =false; //other than SQLite ?>
 		<legend><?php echo $l->t( 'Configure the database' ); ?></legend>
 		<div id="selectDbType">
 		<?php if($_['hasSQLite']): ?>
@@ -56,7 +57,7 @@
 
 		<?php if($_['hasMySQL']): ?>
 		<input type='hidden' id='hasMySQL' value='true'/>
-		<?php if(!$_['hasSQLite'] and !$_['hasPostgreSQL']): ?>
+		<?php if(!$_['hasSQLite'] and !$_['hasPostgreSQL'] and !$_['hasOracle']): ?>
 		<p>MySQL <?php echo $l->t( 'will be used' ); ?>.</p>
 		<input type="hidden" id="dbtype" name="dbtype" value="mysql" />
 		<?php else: ?>
@@ -66,7 +67,7 @@
 		<?php endif; ?>
 
 		<?php if($_['hasPostgreSQL']): ?>
-		<?php if(!$_['hasSQLite'] and !$_['hasMySQL']): ?>
+		<?php if(!$_['hasSQLite'] and !$_['hasMySQL'] and !$_['hasOracle']): ?>
 		<p>PostgreSQL <?php echo $l->t( 'will be used' ); ?>.</p>
 		<input type="hidden" id="dbtype" name="dbtype" value="pgsql" />
 		<?php else: ?>
@@ -74,6 +75,16 @@
 		<input type="radio" name="dbtype" value='pgsql' id="pgsql" <?php OC_Helper::init_radio('dbtype','pgsql', 'sqlite'); ?>/>
 		<?php endif; ?>
 		<?php endif; ?>
+
+		<?php if($_['hasOracle']): ?>
+		<?php if(!$_['hasSQLite'] and !$_['hasMySQL'] and !$_['hasPostgreSQL']): ?>
+		<p>Oracle <?php echo $l->t( 'will be used' ); ?>.</p>
+		<input type="hidden" id="dbtype" name="dbtype" value="oci" />
+		<?php else: ?>
+		<label class="oci" for="oci">Oracle</label>
+		<input type="radio" name="dbtype" value='oci' id="oci" <?php OC_Helper::init_radio('dbtype','oci', 'sqlite'); ?>/>
+		<?php endif; ?>
+		<?php endif; ?>
 		</div>
 
 		<?php if($hasOtherDB): ?>
@@ -92,6 +103,14 @@
 			</p>
 		</div>
 		<?php endif; ?>
+		<?php if($_['hasOracle']): ?>
+		<div id="use_oracle_db">
+			<p class="infield">
+				<label for="dbtablespace" class="infield"><?php echo $l->t( 'Database tablespace' ); ?></label>
+				<input type="text" name="dbtablespace" id="dbtablespace" value="<?php print OC_Helper::init_var('dbtablespace'); ?>" autocomplete="off" />
+			</p>
+		</div>
+		<?php endif; ?>
 		<p class="infield">
 			<label for="dbhost" class="infield"><?php echo $l->t( 'Database host' ); ?></label>
 			<input type="text" name="dbhost" id="dbhost" value="<?php print OC_Helper::init_var('dbhost', 'localhost'); ?>" />
diff --git a/lib/db.php b/lib/db.php
index 08bd06df95..a2dbc5dfac 100644
--- a/lib/db.php
+++ b/lib/db.php
@@ -44,15 +44,18 @@ class OC_DB {
 	 * @return BACKEND_MDB2 or BACKEND_PDO
 	 */
 	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)
 			$type = OC_Config::getValue( "dbtype", "sqlite" );
+                        if($type=='oci') { //oracle also always needs mdb2
+                                return self::BACKEND_MDB2;
+                        }
 			if($type=='sqlite3') $type='sqlite';
 			$drivers=PDO::getAvailableDrivers();
 			if(array_search($type,$drivers)!==false){
-				$backend=self::BACKEND_PDO;
+				return self::BACKEND_PDO;
 			}
 		}
+                return self::BACKEND_MDB2;
 	}
 	
 	/**
@@ -129,7 +132,14 @@ class OC_DB {
 						$dsn='pgsql:dbname='.$name.';host='.$host;
 					}
 					break;
-			}
+                                case 'oci':
+                                        if ($port) {
+                                                $dsn = 'oci:dbname=//' . $host . ':' . $port . '/' . $name;
+                                        } else {
+                                                $dsn = 'oci:dbname=//' . $host . '/' . $name;
+                                        }
+                                        break;
+                        }
 			try{
 				self::$PDO=new PDO($dsn,$user,$pass,$opts);
 			}catch(PDOException $e){
@@ -345,9 +355,17 @@ class OC_DB {
 		$file2 = 'static://db_scheme';
 		$content = str_replace( '*dbname*', $CONFIG_DBNAME, $content );
 		$content = str_replace( '*dbprefix*', $CONFIG_DBTABLEPREFIX, $content );
-		if( $CONFIG_DBTYPE == 'pgsql' ){ //mysql support it too but sqlite doesn't
-			$content = str_replace( '<default>0000-00-00 00:00:00</default>', '<default>CURRENT_TIMESTAMP</default>', $content );
-		}
+                /* FIXME: REMOVE this commented code
+                 * actually mysql, postgresql, sqlite and oracle support CUURENT_TIMESTAMP
+                 * http://dev.mysql.com/doc/refman/5.0/en/timestamp-initialization.html
+                 * http://www.postgresql.org/docs/8.1/static/functions-datetime.html
+                 * http://www.sqlite.org/lang_createtable.html
+                 * http://docs.oracle.com/cd/B19306_01/server.102/b14200/functions037.htm
+
+                 if( $CONFIG_DBTYPE == 'pgsql' ){ //mysql support it too but sqlite doesn't
+                         $content = str_replace( '<default>0000-00-00 00:00:00</default>', '<default>CURRENT_TIMESTAMP</default>', $content );
+                 }
+                 */
 		file_put_contents( $file2, $content );
 
 		// Try to create tables
@@ -363,10 +381,17 @@ class OC_DB {
 // 		if(OC_Config::getValue('dbtype','sqlite')=='sqlite'){
 // 			$definition['overwrite']=true;//always overwrite for sqlite
 // 		}
+                if(OC_Config::getValue('dbtype','sqlite')==='oci'){
+                        unset($definition['charset']); //or MDB2 tries SHUTDOWN IMMEDIATE
+                        $oldname = $definition['name'];
+                        $definition['name']=OC_Config::getValue( "dbuser", $oldname );
+                }
+                
 		$ret=self::$schema->createDatabase( $definition );
 
 		// Die in case something went wrong
 		if( $ret instanceof MDB2_Error ){
+                        echo (self::$MDB2->getDebugOutput());
 			die ($ret->getMessage() . ': ' . $ret->getUserInfo());
 		}
 
@@ -397,9 +422,16 @@ class OC_DB {
 		$file2 = 'static://db_scheme';
 		$content = str_replace( '*dbname*', $previousSchema['name'], $content );
 		$content = str_replace( '*dbprefix*', $CONFIG_DBTABLEPREFIX, $content );
+                /* FIXME: REMOVE this commented code
+                 * actually mysql, postgresql, sqlite and oracle support CUURENT_TIMESTAMP
+                 * http://dev.mysql.com/doc/refman/5.0/en/timestamp-initialization.html
+                 * http://www.postgresql.org/docs/8.1/static/functions-datetime.html
+                 * http://www.sqlite.org/lang_createtable.html
+                 * http://docs.oracle.com/cd/B19306_01/server.102/b14200/functions037.htm
 		if( $CONFIG_DBTYPE == 'pgsql' ){ //mysql support it too but sqlite doesn't
 			$content = str_replace( '<default>0000-00-00 00:00:00</default>', '<default>CURRENT_TIMESTAMP</default>', $content );
 		}
+                 */
 		file_put_contents( $file2, $content );
 		$op = self::$schema->updateDatabase($file2, $previousSchema, array(), false);
 		
@@ -464,7 +496,7 @@ class OC_DB {
 		}elseif( $type == 'mysql' ){
 			$query = str_replace( 'NOW()', 'CURRENT_TIMESTAMP', $query );
 			$query = str_replace( 'now()', 'CURRENT_TIMESTAMP', $query );
-		}elseif( $type == 'pgsql' ){
+		}elseif( $type == 'pgsql' || $type == 'oci'  ){
 			$query = str_replace( '`', '"', $query );
 			$query = str_replace( 'NOW()', 'CURRENT_TIMESTAMP', $query );
 			$query = str_replace( 'now()', 'CURRENT_TIMESTAMP', $query );
diff --git a/lib/setup.php b/lib/setup.php
index 59c3aefbf1..bf7b6e3682 100644
--- a/lib/setup.php
+++ b/lib/setup.php
@@ -3,11 +3,13 @@
 $hasSQLite = (is_callable('sqlite_open') or class_exists('SQLite3'));
 $hasMySQL = is_callable('mysql_connect');
 $hasPostgreSQL = is_callable('pg_connect');
+$hasOracle = is_callable('oci_connect');
 $datadir = OC_Config::getValue('datadirectory', OC::$SERVERROOT.'/data');
 $opts = array(
 	'hasSQLite' => $hasSQLite,
 	'hasMySQL' => $hasMySQL,
 	'hasPostgreSQL' => $hasPostgreSQL,
+        'hasOracle' => $hasOracle,
 	'directory' => $datadir,
 	'errors' => array(),
 );
@@ -46,11 +48,14 @@ class OC_Setup {
 			$error[] = 'Specify a data folder.';
 		}
 
-		if($dbtype=='mysql' or $dbtype=='pgsql') { //mysql and postgresql needs more config options
+		if($dbtype=='mysql' or $dbtype == 'pgsql' or $dbtype == 'oci') { //mysql and postgresql needs more config options
 			if($dbtype=='mysql')
 				$dbprettyname = 'MySQL';
-			else
-				$dbprettyname = 'PostgreSQL';
+                        else if($dbtype=='pgsql')
+                                $dbprettyname = 'PostgreSQL';
+                        else
+                                $dbprettyname = 'Oracle';
+
 
 			if(empty($options['dbuser'])) {
 				$error[] = "$dbprettyname enter the database username.";
@@ -108,7 +113,7 @@ class OC_Setup {
 					if(mysql_query($query, $connection)) {
 						//use the admin login data for the new database user
 
-						//add prefix to the mysql user name to prevent collissions
+						//add prefix to the mysql user name to prevent collisions
 						$dbusername=substr('oc_'.$username,0,16);
 						if($dbusername!=$oldUser){
 							//hash the password so we don't need to store the admin config in the config file
@@ -172,7 +177,7 @@ class OC_Setup {
 					if($result and pg_num_rows($result) > 0) {
 						//use the admin login data for the new database user
 
-						//add prefix to the postgresql user name to prevent collissions
+						//add prefix to the postgresql user name to prevent collisions
 						$dbusername='oc_'.$username;
 						//create a new password so we don't need to store the admin config in the config file
 						$dbpassword=md5(time());
@@ -218,6 +223,116 @@ class OC_Setup {
 					}
 				}
 			}
+                        elseif($dbtype == 'oci') {
+                                $dbuser = $options['dbuser'];
+                                $dbpass = $options['dbpass'];
+                                $dbname = $options['dbname'];
+                                $dbtablespace = $options['dbtablespace'];
+                                $dbhost = $options['dbhost'];
+                                $dbtableprefix = isset($options['dbtableprefix']) ? $options['dbtableprefix'] : 'oc_';
+                                OC_CONFIG::setValue('dbname', $dbname);
+                                OC_CONFIG::setValue('dbtablespace', $dbtablespace);
+                                OC_CONFIG::setValue('dbhost', $dbhost);
+                                OC_CONFIG::setValue('dbtableprefix', $dbtableprefix);
+
+                                $e_host = addslashes($dbhost);
+                                $e_dbname = addslashes($dbname);
+                                //check if the database user has admin right
+                                $connection_string = '//'.$e_host.'/'.$e_dbname;
+                                $connection = @oci_connect($dbuser, $dbpass, $connection_string);
+                                if(!$connection) {
+                                        $e = oci_error();
+                                        $error[] = array(
+                                                'error' => 'Oracle 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 oracle             
+
+                                        $query="SELECT count(*) FROM user_role_privs, role_sys_privs WHERE user_role_privs.granted_role = role_sys_privs.role AND privilege = 'CREATE ROLE'";
+                                        $stmt = oci_parse($connection, $query);
+                                        if (!$stmt) {
+                                                $entry='DB Error: "'.oci_last_error($connection).'"<br />';
+                                                $entry.='Offending command was: '.$query.'<br />';
+                                                echo($entry);
+                                        }
+                                        $result = oci_execute($stmt);
+                                        if($result) {
+                                                $row = oci_fetch_row($stmt);
+                                        }
+                                        if($result and $row[0] > 0) {
+                                                //use the admin login data for the new database user
+
+                                                //add prefix to the oracle user name to prevent collisions
+                                                $dbusername='oc_'.$username;
+                                                //create a new password so we don't need to store the admin config in the config file
+                                                $dbpassword=md5(time().$dbpass);
+
+                                                //oracle passwords are treated as identifiers:
+                                                //  must start with aphanumeric char
+                                                //  needs to be shortened to 30 bytes, as the two " needed to escape the identifier count towards the identifier length.
+                                                $dbpassword=substr($dbpassword, 0, 30);
+
+                                                self::oci_createDBUser($dbusername, $dbpassword, $dbtablespace, $connection);
+
+                                                OC_CONFIG::setValue('dbuser', $dbusername);
+                                                OC_CONFIG::setValue('dbname', $dbusername);
+                                                OC_CONFIG::setValue('dbpassword', $dbpassword);
+
+                                                //create the database not neccessary, oracle implies user = schema
+                                                //self::oci_createDatabase($dbname, $dbusername, $connection);
+                                        } else {
+
+                                                OC_CONFIG::setValue('dbuser', $dbuser);
+                                                OC_CONFIG::setValue('dbpassword', $dbpass);
+
+                                                //create the database not neccessary, oracle implies user = schema
+                                                //self::oci_createDatabase($dbname, $dbuser, $connection);
+                                        }
+
+                                        //FIXME check tablespace exists: select * from user_tablespaces
+
+                                        // the connection to dbname=oracle is not needed anymore
+                                        oci_close($connection);
+
+                                        // connect to the oracle database (schema=$dbuser) an check if the schema needs to be filled
+                                        $dbuser = OC_CONFIG::getValue('dbuser');
+                                        //$dbname = OC_CONFIG::getValue('dbname');
+                                        $dbpass = OC_CONFIG::getValue('dbpassword');
+
+                                        $e_host = addslashes($dbhost);
+                                        $e_dbname = addslashes($dbname);
+
+                                        $connection_string = '//'.$e_host.'/'.$e_dbname;
+                                        $connection = @oci_connect($dbuser, $dbpass, $connection_string);
+                                        if(!$connection) {
+                                                $error[] = array(
+                                                        'error' => 'Oracle username and/or password not valid',
+                                                        'hint' => 'You need to enter either an existing account or the administrator.'
+                                                );
+                                                return $error;
+                                        } else {
+                                                $query = "SELECT count(*) FROM user_tables WHERE table_name = :un";
+                                                $stmt = oci_parse($connection, $query);
+                                                $un = $dbtableprefix.'users';
+                                                oci_bind_by_name($stmt, ':un', $un);
+                                                if (!$stmt) {
+                                                        $entry='DB Error: "'.oci_last_error($connection).'"<br />';
+                                                        $entry.='Offending command was: '.$query.'<br />';
+                                                        echo($entry);
+                                                }
+                                                $result = oci_execute($stmt);
+
+                                                if($result) {
+                                                        $row = oci_fetch_row($stmt);
+                                                }
+                                                if(!$result or $row[0]==0) {
+                                                        OC_DB::createDbFromStructure('db_structure.xml');
+                                                }
+                                        }
+                                }
+                        }                   
 			else {
 				//delete the old sqlite database first, might cause infinte loops otherwise
 				if(file_exists("$datadir/owncloud.db")){
@@ -307,6 +422,79 @@ class OC_Setup {
 			echo($entry);
 		}
 	}
+        /**
+         * 
+         * @param String $name
+         * @param String $password
+         * @param String $tablespace
+         * @param resource $connection
+         */
+        private static function oci_createDBUser($name, $password, $tablespace, $connection) {
+
+                $query = "SELECT * FROM all_users WHERE USERNAME = :un";
+                $stmt = oci_parse($connection, $query);
+                if (!$stmt) {
+                        $entry='DB Error: "'.oci_error($connection).'"<br />';
+                        $entry.='Offending command was: '.$query.'<br />';
+                        echo($entry);
+                }
+                oci_bind_by_name($stmt, ':un', $name);
+                $result = oci_execute($stmt);
+                if(!$result) {
+                        $entry='DB Error: "'.oci_error($connection).'"<br />';
+                        $entry.='Offending command was: '.$query.'<br />';
+                        echo($entry);
+                }
+
+                if(! oci_fetch_row($stmt)) {
+                        //user does not exists let's create it :)
+                        //password must start with alphabetic character in oracle
+                        $query = 'CREATE USER '.$name.' IDENTIFIED BY "'.$password.'" DEFAULT TABLESPACE '.$tablespace; //TODO set default tablespace
+                        $stmt = oci_parse($connection, $query);
+                        if (!$stmt) {
+                                $entry='DB Error: "'.oci_error($connection).'"<br />';
+                                $entry.='Offending command was: '.$query.'<br />';
+                                echo($entry);
+                        }
+                        //oci_bind_by_name($stmt, ':un', $name);
+                        $result = oci_execute($stmt);
+                        if(!$result) {
+                                $entry='DB Error: "'.oci_error($connection).'"<br />';
+                                $entry.='Offending command was: '.$query.', name:'.$name.', password:'.$password.'<br />';
+                                echo($entry);
+                        }
+                } else { // change password of the existing role
+                        $query = "ALTER USER :un IDENTIFIED BY :pw";
+                        $stmt = oci_parse($connection, $query);
+                        if (!$stmt) {
+                                $entry='DB Error: "'.oci_error($connection).'"<br />';
+                                $entry.='Offending command was: '.$query.'<br />';
+                                echo($entry);
+                        }
+                        oci_bind_by_name($stmt, ':un', $name);
+                        oci_bind_by_name($stmt, ':pw', $password);
+                        $result = oci_execute($stmt);
+                        if(!$result) {
+                                $entry='DB Error: "'.oci_error($connection).'"<br />';
+                                $entry.='Offending command was: '.$query.'<br />';
+                                echo($entry);
+                        }
+                }
+                // grant neccessary roles
+                $query = 'GRANT CREATE SESSION, CREATE TABLE, CREATE SEQUENCE, CREATE TRIGGER, UNLIMITED TABLESPACE TO '.$name;
+                $stmt = oci_parse($connection, $query);
+                if (!$stmt) {
+                        $entry='DB Error: "'.oci_error($connection).'"<br />';
+                        $entry.='Offending command was: '.$query.'<br />';
+                        echo($entry);
+                }
+                $result = oci_execute($stmt);
+                if(!$result) {
+                        $entry='DB Error: "'.oci_error($connection).'"<br />';
+                        $entry.='Offending command was: '.$query.', name:'.$name.', password:'.$password.'<br />';
+                        echo($entry);
+                }
+        }
 
 	/**
 	 * create .htaccess files for apache hosts

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 0525/1224] 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 0526/1224] 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 0527/1224] [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 0528/1224] 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 0529/1224] [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 0530/1224] 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 0531/1224] 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 e13f381189788c74fe08a3f3336d961977ff9dc4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= <jfd@butonic.de>
Date: Mon, 30 Jul 2012 22:42:43 +0200
Subject: [PATCH 0532/1224] add limit support to OC_DB & OCP/DB

---
 apps/bookmarks/lib/bookmarks.php         |  9 +++--
 apps/files_sharing/lib_share.php         | 14 ++++----
 apps/remoteStorage/lib_remoteStorage.php |  6 ++--
 lib/db.php                               | 46 ++++++++++++++++++++++--
 lib/public/db.php                        |  4 +--
 5 files changed, 59 insertions(+), 20 deletions(-)

diff --git a/apps/bookmarks/lib/bookmarks.php b/apps/bookmarks/lib/bookmarks.php
index 4b9e3d6438..d569bf528a 100644
--- a/apps/bookmarks/lib/bookmarks.php
+++ b/apps/bookmarks/lib/bookmarks.php
@@ -78,9 +78,8 @@ class OC_Bookmarks_Bookmarks{
 					`*PREFIX*bookmarks`.`user_id` = ?
 				GROUP BY `id`, `url`, `title`
 				'.$sqlFilterTag.'
-				ORDER BY `*PREFIX*bookmarks`.`'.$sqlSortColumn.'` DESC 
-				LIMIT 10
-				OFFSET '. $offset);
+				ORDER BY `*PREFIX*bookmarks`.`'.$sqlSortColumn.'` DESC',
+				10,$offset);
 		} else {
 			if( $CONFIG_DBTYPE == 'sqlite' or $CONFIG_DBTYPE == 'sqlite3' )
 				$concatFunction = '(url || title || ';
@@ -106,8 +105,8 @@ class OC_Bookmarks_Bookmarks{
 					AND `*PREFIX*bookmarks`.`user_id` = ?
 				GROUP BY `url`
 				'.$sqlFilterTag.'
-				ORDER BY `*PREFIX*bookmarks`.`'.$sqlSortColumn.'` DESC
-				LIMIT '.$offset.',  10');
+				ORDER BY `*PREFIX*bookmarks`.`'.$sqlSortColumn.'` DESC',
+				10, $offset);
 		}
 
 		$bookmarks = $query->execute($params)->fetchAll();
diff --git a/apps/files_sharing/lib_share.php b/apps/files_sharing/lib_share.php
index 05a80b7916..fe312ad9ed 100644
--- a/apps/files_sharing/lib_share.php
+++ b/apps/files_sharing/lib_share.php
@@ -92,7 +92,7 @@ class OC_Share {
 				// 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');
+				$checkTarget = OCP\DB::prepare('SELECT `source` FROM `*PREFIX*sharing` WHERE `target` = ? AND `uid_shared_with` '.self::getUsersAndGroups($uid, false),1);
 				$result = $checkTarget->execute(array($target))->fetchAll();
 				if (count($result) > 0) {
 					if ($pos = strrpos($target, ".")) {
@@ -222,7 +222,7 @@ class OC_Share {
 	 */
 	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');
+		$query = OCP\DB::prepare('SELECT `uid_owner`, `source`, `permissions` FROM `*PREFIX*sharing` WHERE `target` = ? AND `uid_shared_with` = ?',1);
 		return $query->execute(array($target, OCP\USER::getUser()))->fetchAll();
 	}
 
@@ -279,7 +279,7 @@ class OC_Share {
 	 */
 	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');
+		$query = OCP\DB::prepare('SELECT `source` FROM `*PREFIX*sharing` WHERE `target` = ? AND `uid_shared_with` '.self::getUsersAndGroups(),1);
 		// Prevent searching for user directory e.g. '/MTGap/files'
 		$userDirectory = substr($target, 0, strpos($target, "files") + 5);
 		$target = dirname($target);
@@ -307,7 +307,7 @@ class OC_Share {
 	 */
 	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');
+		$query = OCP\DB::prepare('SELECT `source` FROM `*PREFIX*sharing` WHERE `target` = ? AND `uid_shared_with` '.self::getUsersAndGroups(),1);
 		$result = $query->execute(array($target))->fetchAll();
 		if (count($result) > 0) {
 			return $result[0]['source'];
@@ -323,7 +323,7 @@ class OC_Share {
 
 	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');
+		$query = OCP\DB::prepare('SELECT `target` FROM `*PREFIX*sharing` WHERE `source` = ? AND `uid_owner` = ',1);
 		$result = $query->execute(array($source, OCP\USER::getUser()))->fetchAll();
 		if (count($result) > 0) {
 			return $result[0]['target'];
@@ -340,7 +340,7 @@ class OC_Share {
 	 */
 	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');
+		$query = OCP\DB::prepare('SELECT `permissions` FROM `*PREFIX*sharing` WHERE `target` = ? AND `uid_shared_with` '.self::getUsersAndGroups(),1);
 		$result = $query->execute(array($target))->fetchAll();
 		if (count($result) > 0) {
 			return $result[0]['permissions'];
@@ -372,7 +372,7 @@ class OC_Share {
 	 * @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');
+		$query = OCP\DB::prepare('SELECT `target` FROM `*PREFIX*sharing` WHERE `source` = ? AND `uid_shared_with` = ? AND `uid_owner` = ?',1);
 		$result = $query->execute(array($source, self::PUBLICLINK, OCP\USER::getUser()))->fetchAll();
 		if (count($result) > 0) {
 			return $result[0]['target'];
diff --git a/apps/remoteStorage/lib_remoteStorage.php b/apps/remoteStorage/lib_remoteStorage.php
index 7c7e455d82..b6934e87d6 100644
--- a/apps/remoteStorage/lib_remoteStorage.php
+++ b/apps/remoteStorage/lib_remoteStorage.php
@@ -2,7 +2,7 @@
 
 class OC_remoteStorage {
 	public static function getValidTokens($ownCloudUser, $category) {
-		$query=OCP\DB::prepare("SELECT `token`,`appUrl`,`category` FROM `*PREFIX*authtoken` WHERE `user`=? LIMIT 100");
+		$query=OCP\DB::prepare("SELECT `token`,`appUrl`,`category` FROM `*PREFIX*authtoken` WHERE `user`=?",100);
 		$result=$query->execute(array($ownCloudUser));
 		$ret = array();
 		while($row=$result->fetchRow()){
@@ -15,7 +15,7 @@ class OC_remoteStorage {
 
   public static function getTokenFor($appUrl, $categories) {
 		$user=OCP\USER::getUser();
-		$query=OCP\DB::prepare("SELECT `token` FROM `*PREFIX*authtoken` WHERE `user`=? AND `appUrl`=? AND `category`=? LIMIT 1");
+		$query=OCP\DB::prepare("SELECT `token` FROM `*PREFIX*authtoken` WHERE `user`=? AND `appUrl`=? AND `category`=?",1);
 		$result=$query->execute(array($user, $appUrl, $categories));
 		$ret = array();
 		if($row=$result->fetchRow()) {
@@ -27,7 +27,7 @@ class OC_remoteStorage {
 
 	public static function getAllTokens() {
 		$user=OCP\USER::getUser();
-		$query=OCP\DB::prepare("SELECT `token`,`appUrl`,`category` FROM `*PREFIX*authtoken` WHERE `user`=? LIMIT 100");
+		$query=OCP\DB::prepare("SELECT `token`,`appUrl`,`category` FROM `*PREFIX*authtoken` WHERE `user`=?",100);
 		$result=$query->execute(array($user));
 		$ret = array();
 		while($row=$result->fetchRow()){
diff --git a/lib/db.php b/lib/db.php
index a2dbc5dfac..0d272f6303 100644
--- a/lib/db.php
+++ b/lib/db.php
@@ -132,7 +132,7 @@ class OC_DB {
 						$dsn='pgsql:dbname='.$name.';host='.$host;
 					}
 					break;
-                                case 'oci':
+                                case 'oci': // Oracle with PDO is unsupported
                                         if ($port) {
                                                 $dsn = 'oci:dbname=//' . $host . ':' . $port . '/' . $name;
                                         } else {
@@ -214,6 +214,19 @@ class OC_DB {
 						'database' => $name
 					);
 					break;
+                                case 'oci':
+                                            $dsn = array(
+                                                    'phptype'  => 'oci8',
+                                                    'username' => $user,
+                                                    'password' => $pass,
+                                            );
+                                            if ($host != '') {
+                                                $dsn['hostspec'] = $host;
+                                                $dsn['database'] = $name;
+                                            } else { // use dbname for hostspec
+                                                $dsn['hostspec'] = $name;
+                                            }
+					break;
 			}
 			
 			// Try to establish connection
@@ -242,8 +255,33 @@ class OC_DB {
 	 *
 	 * SQL query via MDB2 prepare(), needs to be execute()'d!
 	 */
-	static public function prepare( $query ){
-		// Optimize the query
+	static public function prepare( $query , $limit=null, $offset=null ){
+            
+            if (!is_null($limit)) {
+                if (self::$backend == self::BACKEND_MDB2) {
+                    //MDB2 uses or emulates limits & offset internally
+                    self::$MDB2->setLimit($limit, $offset);
+                } else {
+                    //PDO does not handle limit and offset.
+                    //FIXME: check limit notation for other dbs
+                    //the following sql thus might needs to take into account db ways of representing it
+                    //(oracle has no LIMIT / OFFSET)
+                        $limitsql = ' LIMIT ' . $limit;
+                    if (!is_null($offset)) {
+                        $limitsql .= ' OFFSET ' . $offset;
+                    }
+                    //insert limitsql
+                    if (substr($query, -1) == ';') { //if query ends with ;
+                        $query = substr($query, 0, -1) . $limitsql . ';';
+                    } else {
+                        $query.=$limitsql;
+                    }
+                }
+            }
+
+
+
+        // Optimize the query
 		$query = self::processQuery( $query );
 
 		self::connect();
@@ -256,6 +294,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{
@@ -265,6 +304,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);
diff --git a/lib/public/db.php b/lib/public/db.php
index af2e46c9da..39df58bf8c 100644
--- a/lib/public/db.php
+++ b/lib/public/db.php
@@ -43,8 +43,8 @@ class DB {
 	 *
 	 * SQL query via MDB2 prepare(), needs to be execute()'d!
 	 */
-	static public function prepare( $query ){
-		return(\OC_DB::prepare($query));
+	static public function prepare( $query, $limit=null, $offset=null ){
+		return(\OC_DB::prepare($query,$limit,$offset));
 	}
 
 

From ab976863ae6af8ad915c24f0aa5a68af0062dd53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= <jfd@butonic.de>
Date: Wed, 1 Aug 2012 15:00:07 +0200
Subject: [PATCH 0533/1224] fix sql

---
 lib/appconfig.php | 2 +-
 lib/filecache.php | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/appconfig.php b/lib/appconfig.php
index 2e356225e7..f3038e0053 100644
--- a/lib/appconfig.php
+++ b/lib/appconfig.php
@@ -128,7 +128,7 @@ class OC_Appconfig{
 			$query->execute( array( $app, $key, $value ));
 		}
 		else{
-			$query = OC_DB::prepare( 'UPDATE `*PREFIX*appconfig` SET `configvalue` = :configvalue WHERE `appid` = ? AND `configkey` = ?' );
+			$query = OC_DB::prepare( 'UPDATE `*PREFIX*appconfig` SET `configvalue` = ? WHERE `appid` = ? AND `configkey` = ?' );
 			$query->execute( array( $value, $app, $key ));
 		}
 	}
diff --git a/lib/filecache.php b/lib/filecache.php
index e475581f14..d169cb1b56 100644
--- a/lib/filecache.php
+++ b/lib/filecache.php
@@ -140,7 +140,7 @@ class OC_FileCache{
 		}
 		if(isset($data['mimetype'])){
 			$arguments[]=dirname($data['mimetype']);
-			$queryParts[]='mimepart=?';
+			$queryParts[]='`mimepart`=?';
 		}
 		$arguments[]=$id;
 		
@@ -148,7 +148,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('.$id.') in cache',OC_Log::ERROR);
 		}
 	}
 

From c7be0db853e476822d1253889d7f11c543a92a27 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= <jfd@butonic.de>
Date: Wed, 1 Aug 2012 15:00:54 +0200
Subject: [PATCH 0534/1224] use dbname for non privileged user

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

diff --git a/lib/setup.php b/lib/setup.php
index bf7b6e3682..61210560ab 100644
--- a/lib/setup.php
+++ b/lib/setup.php
@@ -285,6 +285,7 @@ class OC_Setup {
                                         } else {
 
                                                 OC_CONFIG::setValue('dbuser', $dbuser);
+                                                OC_CONFIG::setValue('dbname', $dbname);
                                                 OC_CONFIG::setValue('dbpassword', $dbpass);
 
                                                 //create the database not neccessary, oracle implies user = schema

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 0535/1224] 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 0536/1224] 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 0537/1224] 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 417bebd9b77712909c0ab207cdde1dce6cfe9744 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= <jfd@butonic.de>
Date: Wed, 1 Aug 2012 22:37:57 +0200
Subject: [PATCH 0538/1224] dix php strict warnings in mdb2 oci8

---
 3rdparty/MDB2/Driver/oci8.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/3rdparty/MDB2/Driver/oci8.php b/3rdparty/MDB2/Driver/oci8.php
index f61896b4ab..9f4137d610 100644
--- a/3rdparty/MDB2/Driver/oci8.php
+++ b/3rdparty/MDB2/Driver/oci8.php
@@ -406,7 +406,7 @@ class MDB2_Driver_oci8 extends MDB2_Driver_Common
         
         if (empty($this->dsn['disable_iso_date'])) {
             $query = "ALTER SESSION SET NLS_DATE_FORMAT='YYYY-MM-DD HH24:MI:SS'";
-            $err =& $this->_doQuery($query, true, $connection);
+            $err = $this->_doQuery($query, true, $connection);
             if (PEAR::isError($err)) {
                 $this->disconnect(false);
                 return $err;
@@ -414,7 +414,7 @@ class MDB2_Driver_oci8 extends MDB2_Driver_Common
         }
         
         $query = "ALTER SESSION SET NLS_NUMERIC_CHARACTERS='. '";
-        $err =& $this->_doQuery($query, true, $connection);
+        $err = $this->_doQuery($query, true, $connection);
         if (PEAR::isError($err)) {
             $this->disconnect(false);
             return $err;
@@ -646,7 +646,7 @@ class MDB2_Driver_oci8 extends MDB2_Driver_Common
      * @return result or error object
      * @access protected
      */
-    function &_doQuery($query, $is_manip = false, $connection = null, $database_name = null)
+    function _doQuery($query, $is_manip = false, $connection = null, $database_name = null)
     {
         $this->last_query = $query;
         $result = $this->debug($query, 'query', array('is_manip' => $is_manip, 'when' => 'pre'));

From 14c5d08a3f03920ac5372d0ca4eccf9faa0afab4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= <jfd@butonic.de>
Date: Wed, 1 Aug 2012 22:38:27 +0200
Subject: [PATCH 0539/1224] reorder code for readability

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

diff --git a/lib/appconfig.php b/lib/appconfig.php
index f3038e0053..20fbb5313b 100644
--- a/lib/appconfig.php
+++ b/lib/appconfig.php
@@ -174,12 +174,12 @@ class OC_Appconfig{
 		if($app!==false and $key!==false){
 			return false;
 		}
-		$where='WHERE';
 		$fields='`configvalue`';
+		$where='WHERE';
 		$params=array();
 		if($app!==false){
-			$where.=' `appid` = ?';
 			$fields.=', `configkey`';
+			$where.=' `appid` = ?';
 			$params[]=$app;
 			$key='configkey';
 		}else{

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 0540/1224] 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 0541/1224] 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 0542/1224] 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 0543/1224] 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 0544/1224] 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 0545/1224] 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 0546/1224] [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 0547/1224] 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 0548/1224] 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 0549/1224] 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 0550/1224] 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 0551/1224] 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 0552/1224] 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 0553/1224] 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 0554/1224] 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 0555/1224] 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 0556/1224] 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 0557/1224] 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 0558/1224] [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 0559/1224] 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 0560/1224] 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 0561/1224] 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 0562/1224] 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 0563/1224] 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 0564/1224] 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 0565/1224] 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 0566/1224] 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 0567/1224] 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 0568/1224] 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 0569/1224] [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 0570/1224] 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 0571/1224] 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 0572/1224] 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 0573/1224] 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 0574/1224] 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 0575/1224] 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 0576/1224] 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 0577/1224] 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 0578/1224] 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 0579/1224] 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 0580/1224] 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 0581/1224] 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 0582/1224] 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 0583/1224] 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 0584/1224] 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 0585/1224] 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 0586/1224] 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 0587/1224] 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 0588/1224] 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 0589/1224] 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 0590/1224] 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 0591/1224] 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 0592/1224] 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 0593/1224] 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 0594/1224] [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 0595/1224] 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 0596/1224] 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 0597/1224] 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 0598/1224] 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 0599/1224] 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 0600/1224] [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 0601/1224] 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 0602/1224] 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 0603/1224] 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 0604/1224] 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 0605/1224] 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 0606/1224] 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 0607/1224] 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 0608/1224] 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 0609/1224] 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 0610/1224] 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 0611/1224] 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 0612/1224] 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 0613/1224] 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 0614/1224] 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 0615/1224] 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 0616/1224] 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 0617/1224] 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 0618/1224] 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 0619/1224] 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 0620/1224] 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 0621/1224] 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 0622/1224] [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 0623/1224] 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 0624/1224] 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 0625/1224] 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 0626/1224] 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 0627/1224] 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 0628/1224] 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 0629/1224] 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 0630/1224] 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 0631/1224] 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 0632/1224] 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 0633/1224] 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 0634/1224] 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 0635/1224] 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 0636/1224] 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 0637/1224] 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 0638/1224] 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 0639/1224] 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 0640/1224] 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 0641/1224] 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 0642/1224] 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 0643/1224] 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 0644/1224] 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 0645/1224] 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 0646/1224] 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 0647/1224] 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 0648/1224] 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 0649/1224] 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 0650/1224] 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 0651/1224] 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 0652/1224] 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 0653/1224] 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 0654/1224] 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 0655/1224] 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 0656/1224] 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 0657/1224] 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 0658/1224] 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 0659/1224] 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 0660/1224] 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 0661/1224] 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 0662/1224] 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 0663/1224] [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 0664/1224] 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 0665/1224] 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 0666/1224] 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 0667/1224] 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 0668/1224] 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 0669/1224] 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 0670/1224] 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 0671/1224] 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 0672/1224] 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 0673/1224] 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 0674/1224] 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
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 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 0675/1224] 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 0676/1224] 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 0677/1224] 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 0678/1224] 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 0679/1224] 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 0680/1224] 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 0681/1224] 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 0682/1224] 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 0683/1224] 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 0684/1224] 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 0685/1224] 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 0686/1224] 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 0687/1224] 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 0688/1224] 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 0689/1224] 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 0690/1224] 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 0691/1224] 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 0692/1224] 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 0693/1224] 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 0694/1224] 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 0695/1224] 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 0696/1224] 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 0697/1224] 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 0698/1224] 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 0699/1224] 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 0700/1224] 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 0701/1224] 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 0702/1224] 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 0703/1224] 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 0704/1224] 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 0705/1224] 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 0706/1224] 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 0707/1224] 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 0708/1224] 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 0709/1224] 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 0710/1224] 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 0711/1224] 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 0712/1224] 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 0713/1224] 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 0714/1224] 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 0715/1224] 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 0716/1224] 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 0717/1224] 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 0718/1224] [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 0719/1224] 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 0720/1224] 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 0721/1224] 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 0722/1224] 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 0723/1224] 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 0724/1224] 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 0725/1224] 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 0726/1224] 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 0727/1224] 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 0728/1224] 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 0729/1224] 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 0730/1224] 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 0731/1224] 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 0732/1224] 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 0733/1224] 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 0734/1224] 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 0735/1224] 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 0736/1224] [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 0737/1224] 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 0738/1224] 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 0739/1224] 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 0740/1224] 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 0741/1224] 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 0742/1224] 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 0743/1224] 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 0744/1224] 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 0745/1224] 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 0746/1224] 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 0747/1224] 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 0748/1224] 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 0749/1224] 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 0750/1224] 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 0751/1224] 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 0752/1224] 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 0753/1224] 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 0754/1224] 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 0755/1224] 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 0756/1224] 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 0757/1224] 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 0758/1224] 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 0759/1224] 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 0760/1224] [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 0761/1224] [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 0762/1224] 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 0763/1224] 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 0764/1224] 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 0765/1224] 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 0766/1224] 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 0767/1224] 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 0768/1224] 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 0769/1224] 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 0770/1224] 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 0771/1224] 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 0772/1224] 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 0773/1224] 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 0774/1224] [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 0775/1224] 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 0776/1224] 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 0777/1224] 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 0778/1224] 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 0779/1224] [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 0780/1224] 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 0781/1224] 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 0782/1224] [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 0783/1224] 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 0784/1224] [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 0785/1224] 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 0786/1224] 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 0787/1224] 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 0788/1224] 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 0789/1224] [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 0790/1224] 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 0791/1224] 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
zcmV;R2w(T~4)qa`ZGQ-INkl<Zc%1E=f3Q_m6~{mC2k=CGW(hJG3`l_S!*~xt1#*mJ
z%!+<cL=%*0MpOcgW@3X`gXoM6Qd83~8D-RnBPh%?j@n2%gFpfUqN1Yl49p>#C=nG<
zzWwptZ{EF!bM8I&+<PDIIrlTOXYSi)?{(HWXPv#*UVEKaCx3}5G8OnV&;ncl{0rCy
zJO$hh9I58XYjiAiRWhbCfjfbD1=_p<Tm@{bh5|J@o@yA=S-=+HycBH(ECN<kT8SDR
zPdUa^2Mhzw0k#6iL;bzLtP<oL2bzIrvMN%ebCA`T&IeWl9}RyW0e%F$2HclH-Zo$o
z@NO1mYIF|jGk^5y2Rur<Ap!ITP5@VD)T0F$ld*4&PC^!A`YtdirhW^auCmesTmsAi
zMgxsy$f|J~$YM+rW9r@nUI*S^hAz!P_C3IEJayg%G?gK<MhBAR?LV0F`!%2ycp5la
zq~CF1FYu2bV*oH17!Gs;dXjHAO~6gSOkg&!J%g?_I)9KX#<T%A3j7*40E`Dl;eg~(
z9AnDmap3pB1K2=XfDyo2?0CP01DkIH(__vz99WNop8w9EZ;g&ZQkF7T(sPpDRXbml
z^mxwS`y|bfG*;3&Ne2|qtCAj+G+xq_@OK=4mQ<Hf-&*N_Qfh|*@`I0KouujE_oI^f
zO1eqXv44d2QBFv@MbaQi4=1!~spie7m5wu}KJsXj#7Rk$CH+9s2uYg@v@OK8(0^Ub
zvBg<0v<sJ+l7@5wJ&Kj<OYxbO149ZNuLEubJ`em2`#4!>#{Sea?2ir3Id*YInO&Kg
z*jH>l&3Y6gwK07X_(qC$cLPhvZb)r>1XzGqaevE!NAQO5Az%vdeE40X6HzSA)DP$m
z%uOL{EAUUeoUa5o;Bdn{9K?JW$Df|SE64qKg*d)K=R2MB0<Od_;(EMU-sOlhrpxhW
z?MuL6;B3-8u$zIO0Sy(>tpTU8oCSOi$D(riAn;ind0#@;jhKHN*g^YrwiMs@E=TSI
z=zoPD-nVk<-ocURV(BEufK9-JifU(hn`jSm#?cM96;FSc<FuBpKpk)wa3Sy+Jau<z
z+D4`(;7Rfg2^>)DjW4_qF90Kf9u?Kj@<s;TiZKmXSmE<mllgempUiu}kf7a|mJz>e
z-y4ri2a3qqgCpD3pauJ4X;_M*>z$qR@P7hhKJTHln|i$5UQnRT2t3sk;zg>LLNbQ*
z+bCxM*HlT5O0o=xQM#mWlteu+gTm9;mnd#b-SO(G8tey#me9Th_z<uQSO+Y|tI{X~
z@t$BDbBUj_TgcDjYNHP4v)_lO{70}K*FQo21mK~BW2G_<hfg+zvOLs9DRjNL41dPH
zXOwQhcYrl`T5gS$57bjU2kEQ8gZKl0Tn^!E%Q-l0WLpYFv#^c$2be@N@G8C`cVd5V
zJ8)^F-4K$K`4;0*F3L3EW0AT6z+-p;a2GbXg~0!Cxa1R&_5*?c;*ITcS&Sd<4*UYl
z4ZqifW4R0=UGm~6;46{3;ds?N8h`i|P8Av%DTf*<zU&_Wd>>o&ChSM8!#8XZcG?eP
zqZ7rQ^->V_$3~UVr#H|CuK*8X=ly;hznMgS3QZ;W4Stzc<<vbF%6goYIt3dzIOX}-
z3Y>Qq4l6X{Y>hTv#?NO%_`Rmg^E3t-KgDsqMCyV6q!73OTlSan%~=8L#DB&#85`Ot
zoUc?#_J;G861zIUslLe5z#Z5@uOwIEbmdhE$6p414BVbmw~x}M?KpY_nO`U0klHvJ
zj@?fAE9`lAge_=DU}H)%J=Nj;vVJ&FxC(e*q|MjxFkeYl;22CPBwf#+@CZ>!rs7er
z5NmNdavS@Ab15&#IvS6Bg@63i{h`h1GR^~@*8h;EVOnDXJ7DvHi->=-X5$<8mz45~
zu@Tsew^d4Eb3*;=IGZyXNiT<S6#qo)C=Tl8E&`sRyiMzoc=|8Kp3oMY>6*rXyV3sH
zTHCpHr%|dN_$^MqO~b()<)ZY%zQZ;6!Ii^N?2E0Uw1>YB_+`Seo_}~sI#Hf#c{GuK
z<C8c>eoFGKz%R%?1*M%ThlaM`6<C@W+*tBokbS_1(<s&EGkr5nWBfK1@{6Y95$am9
zuU3u&-^MG7xFv29!prkG9|GW0<mZvUfg{jS8u1h!cWglDS1z0J#`RB9w2jkq7hW~?
zEzqxTXtOK){U%;Tj(;uCryjd8xjPP9fiD!%u@7)EH@WE+<)`5$F;&tl1&;qN$QvbT
zYYKU}Y?m}9^uIyQzD&bAl71-ZOvNW|4U!Z4hUe5ZN;)EGWTfrPAahxyzDd#{Nf+eQ
z{WYe4T-hmUV5F{xq{k%PBWI;1^_?f_p_uxGp>JF&b6q&LFn>}%HQeK*`*gFU)sebh
zl3tWFseq14B(05BULt94(i4-kN74jImq~gf=J*atXXMChkW+WxDj-vm-j<EIF`~~z
zNq;ZWcTZ^7An6H7cSsr*`kyW7DoL%9X6e+M@I6USO1dKGJx9`RNmomHR?;F#{lYch
zul5(E62{c_(0{L!^t_}6k}j6iGt#Ch=(JSQxskprC2b7X-#wIxp>Cz(4Q*jK-wfG^
z8{|CwKgv1${bTw}l=PCM8zl|SsqZUi*0xF-68Cv{PrOQL!7+>mJl}4?!OON!nug)D
zlL`3qr3bJB9=Ao%Jq)icw11uQ0(Snl<E8ttgdwyyo`0ey;yBUyq3=^Tqw`+cr_^pZ
zTrnN{3x~rwZX-EUaW;;bofBmK9Dh+W0_SE;#v9(NaS$|jFYVfJ-Nh31uEV}*(iAxq
zXQ*C?<9-)KWcJ6QjY~Pzf4L&)(Uy?76Ie;%2>UqTdK?VyiSOqI{KZjH)<s|ZF94?E
i9frElb{SKU)%t&Z`nzydq|&7T0000<MNUMnLSTZ>oHY{w

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
zWwJUdS}2`)4T$PU2X%BpHxF<SGJe}8<khtpxoB3R#nJl6T+_;wkF#+6R#6$t8ov?Z
zSnNZn+L-TGk!r>LHXLUTMl*~SN6P^}2Y<FA%$Q-@5BW9sZO27?0ST3Hp<8OBZ+|*)
zP#cajXQ4Aji=&Sq;VXO6-?JXiF#%=8Ussv!xQPD;+~PU!Vzf|(3*9%5-vSN;j%&kl
z<_y$hv^Y}0*MY;4<Tqtw7E1PgWq8VL$2od{HIXR=7rLo7h8#Z*>`Rhf>}g|*5r2T{
zj21_01HS~;qTDdxJGSkI{QCBbcpph)aJS?9K&XwjV_VtPz}_V3y^glF80H9Pv^ZJ{
znQZ>=tfYz*YjV71?%R$5-bOwK_dA}bQ%38Q+061D;8ftpB<ZV;Hn$k2C}*@dng`ei
zIDp>pl`_+|S?)U~pbSr$?HJ$<WPgnIkmJd!j?X$}worz94LBG$r47d!Iq=V;N%+bG
zNF3HU3x&x%uJRDcRwmU#7`(W>52OKfq3x(zkMAAXuFJ6?a6FPu;mfob5wJ_NI9d%j
z4p^^HTBVbQFi6?H@7LV79lrpq4LsTZ0lTU;b|THpa)3*a@!O-8=V&oZ(0^B=N%+dI
zkX-dPCbPlyb@r8o?034Qnd(*LnzH+cwmbB_*xspGJ{7o+IQm5!jx&5Aj3(hLdjXFC
z-@&a?`Z}PE##I*D;p<$RZ~6R`sXm6(Y2F_Py=y;|vC7_Mj=6#F0}m5N-)h5gh9Bn2
z!dLD=T&L!@(1dh`Dqrsq34akHX?%5Qguy@<E|fXzZ00lA+Ew<RTr?&Y1Ac>~Q<&_y
zzQqv4Xy6=Vd7~;QW4<!RvmN{PZNKKedHkQkud7p6fhyEf+;<(@+E*NVx!PooA8l9!
z3IAE)!;6&K0vT7^FdKLYF>GB1T&%VJz<P6~?hLrUiOE{)x0F(QAb)|dIX2Z=yQWuc
z_udRRu~4+T*7_0)-Tc5;fenF=1M>pU0=EIvwbl<9^g96m7upUF4n_FI=hkOK&uAoR
zD9EJglE9}61ir7h2_Ib@sb<^9*!MBo`-NX$r#6|#_3NUy)m1FBwX=B6gpWDz1YSps
zJZ~6u^8z1p)CurOB!6wh&cH)Tshzdfw)Nsx^VH!&9-%S8XhV#99@B;`jqB$%36xSh
zA<J`_+Sf!R=5arz)c#uQqYCHd!~bqVF&`qFs=lM1T-P6ud>!6Gf;68fxiFLgt1_KW
zHM7zB>dRHf)I(oq!&9H@{rKKX$VcoxWT~mSf%TCPoKEm5;D0Km)RYeEDZ?fe={NSB
zR7&jz{0{pNC&ygCkxHpkE8e@SFbCCZAr8V9Ao&%aBdjCj2$gD8BwO9h#%N72m#wX~
z^C9oVg`DnjWW9lz$p6t~*5on3ACywvv}8_JN{ufk1Etiez*3&`6A;xc6uT&;hD=%s
zTe`W?z}~>4z<;iYD!DJB7C`l{aR}p4VZZom?ib5UMzg7QIb3RB)8jH<n~Qh>aoBzh
ziPB!Ogx-eh5N{q3rdkY1?NF35O90;hPVm&T9=&R~3vW5fBV+~E3rensa_P4xqPpcs
zk@4Imzz4wRfc@#aR^Cs5DM)IGe>&>@4)R`d%)tFVo`15G%|^5gAG9m4qefQByby_>
zS_jwx`MTOXM2gpyF`$p>Z0E~<&Hen?WHb}5F_o{Z%DBwdE*nh|Ib&UfEKfDnLtBPd
zwbnNqW#=lTW*{jZa%_X2(f*;eo?WvIAPm$5qwQ`SAFj3jN#XeKN~!ySOABRRR!V(J
zYyA-LZ+}~*nE|GV=Pd87NN=Ww|G-C|qijA#BjGSNAQEmx<SR0p?n*V=aaC2XXx{In
zE?eDY&r+r$nsjd=4%-uvTq8FlhJ=v1s=~Cst*(?BWu<HerQ@_reO=dceqqElEyue^
zJYOGZtrOr@qxh3y&Fn5hCq5TK=5MAWY1LK*&VN8ewu!1zt&GWhb^5l@F`Db%zBbsN
zBlJBKX=ei`BMkOuL=8F`_=u&xrtlEG?*>FeS-gw)`>0ZCl@gi_5jE3=WsKveJW}?-
zl4}PAHb(PxkoAx+#@CR<J8L28We@HS=d0Itj*@-z*R`4RXjLVZ?f$m5mOYydA0Qv9
z)qjz3#9oNOqipq@j-kc5)l8!>!A9F4%A{J^`F@P%p?$pM+Cf1bSDty0FpinP1d?=n
zWH5M5cD_nS@pam=y2_Zu$7mt#ER%S3q*)L0Vfq|Nx+|iJ-wNzO?_AVCz?25vzIUgL
zW{!(q@zB0x94}<08enwdGdB^qia0t3cz=u}{VyaRy{RJ?QAes(Wx9N;W8U|*(ZyJy
zlII%WizMkcfY*tm-y!Pa#~k$C#A3#=Ir-f*Cb^~&lu|1LA1%4wGzc{!-3JmTqgCz9
z0N+A<?=~k%XOg5FAyL@(Ip|G<bZT?o{H@DqzItr!aMAgm=^wymB<VEZ?rf>xTYrGB
zc-rM_Z%4?iX2rR!4{%uI8bog9x1s8!_OL`#Uf_!ZrxQnK5=Tptq*oy7<gWDfG70HG
zWlR<-ja-aYr5;zCLZ0V7U^|jDCP{B1jy{1HJC39Nn5YS6`?hiXpw{}m2I?(?i=pNS
zMys+uTF4i7V_-6I^fTbMB<cCY(SJqAyv<(pS6N(j+sd)*W1-KHkI`K7XeO%8m*wRq
z9!K1zE+R=aaWpqF2HT6?lzhJHyMoL_J_Sh+Sj43k@**ZErM&ZKTI<&Xn$VA-GOv;0
z9)+MXuN5D>6V`RrmU)pmj%mcv-X!ULz#oaDbAg?ZrEVvb)bC?DurnUUet+nMwU3E>
zOkrO0Jdz#koDXw-NXD?Ek-3~Y9wM%LhhU0QDmQh{hj@XQcpo^eq@L15uS%&2TI;fL
z-cm}bRkhZ|tYl?o{o#PIh@*iIJw--qbSwaT2Dmbd*glFReHZu@adalI3o^DVdS^Ew
z)ohGbB}^vNt*UtLRb;K~>3<}teEH*Oeq@>8?Px|lH}4<9cppKWhkZC)Ydw%FmTpSl
z^nY`N+6bL>f)G`56!1OZTH<Iu0FrbTNqRK!d1Mm2=w;%oKjfZ88dG)j)dBt6;QR1s
z#GB(-U=m4sT7k*7K;o5bY56+Q6q-g4(Cx&nrjMk_SmyDF&DtEwXn&n{kY#`w#L<bw
zk<4o(=_@4ZA&AlB9K`zNyH8c7t73Ju)#-Zn_mB_7=Sk9ElB90~5Jw*+j{b;vdMr}m
z-3%7<%>`Vjl<F7rWngx|=EC*H@w!>iCQ7N5fTauPK0p=%8ICA>KktQlhIE2rJzF5s
zZR-!uCh7Ae=>f>fFMo;Uej&_ZqpLGv?YbXGM>rdq3p<P?6}?=RsoI5no~#)(@&2zv
zoWa*YOzYpJzX$u$h=-34^J}f=DcM}(v)kx9bubzU&V>Hb>?X>`Iztif1iYVli;ULE
zpISvVngAS09G#u5LL*4hCrHvg5N5p2Q%9&&v!yZ!VJ`DtJ%5N<ej}3fAd<AV<HXS_
zi2C(I#ABvgYGR%1U)5UQoNZTYtxrWlNzOIscI=>CWzfK1jIvFP-yD~9u^oesoYAWO
ziA{8%wSm77N4pb8y_TmWeSjq01u-Pt=DDAbQ9@Klvku#Rt^>9tN%tX1d;RO;XdH2L
z5EA~eQiW&klz#y`dgof}9we@-r%=42QmUK&fF=WN>@e%k5sVgsPX1(92aAwD{u1J7
z%|2Ho>1`zG*O9<HGw(!*WU?7ULYNf9jqJZk(p^c?zA44y=!?i#dMD)lbt<jQ_H-3m
z>*s-IjN&pEs7`Ptz5fMB5bNGZT813YYOU|;VjBh>A%7Frbvi-SFZK$+S;W!Vz>y^B
ztPjs5>Gj0X4aj8cZir#UCWSD5L(Tg|lm7j{@g(Vu{ixz-5oAs7O$eV8t2+NxtfQNg
z+0W3|t9^lP-AHTwx>D*U#LApwKZC4Hn)MjRJ^?W#{UUu0?u5bWKq28bmlH>Qle8qM
z&fL1TKz||!UZ6iCo5w|oW;<Uzegav@W7~dA7Dp;ugZgqxlE+xkiHhCL4r0a;b~_=f
z$w+3Dei@^^XdEx<p*3Uc%xeb)zKq0G(1g^>uU{BAmN+_@IO^-okfc2%=>@>%h?~=^
zMqR~yo7K^zeIAJi`wB^V6-nCn8RBRKByQ{{$bSTIr(@H)W3u56A0xdFTvc-Yzl>ww
zm~#1&YX=3U>e%g$P^FWu53EHT9S@vIlJ=?(vK;LU;^;!eXtEu>U&*{~m+GjHcqR!`
zNz!7pu^^7dAl@rG<989NtLo*~g<hj8)<2}6wZ2;^^$hm0;PqN-S8|^m{TNLtHBM{&
zj(>&r)5h_TV6?g_!$5tR$0GXt4B}|TerJ>P9g_4kM5R0fnM}^_m8(ZZiS{Nkp}ZwY
zdX9t1)&kB)7_F|;b=7N{rX7m7+)-X?ZOrEBo-P!P0e))IDW$%OM6KuOL82%I9j32i
z)96Iv6|b9!7)!+SB1!v(btLH<!12V<41dIjaw>gQ$9IvGV}I;pXemPc6Zb)w*5>0l
zr%J3TN~!)Iq`tUHYhAWz;$`#?(aFn0@C*88>)Kl>wG_g@|3T&mzhzu=j@G){5^a=H
zs%-53q4$1OW@wTwlzuKG<=uwF(P1R%%zhL}`ZDly;^>S*eYXMANK$wBdmL?w<bSR-
zL*`xW8%zcoXr>JDhnzrpl=fA~c&upFe?n_*Cev}@H%Ok!Jjdl+Nch#Z4*DM8kifb-
z!5G}q`op$VQH@||NWCQx>2(DX70`dZ=Olf$ux}=7>4mJzeIPP<KG;hk4P~j;F|tK4
z{!ZUW>)=Uht@V3Z-u?6Fn@H7$9)DmzbFquTL_Xo#G`b=6Ooo&Uv~jcraa65?ihtra
z5NGDk)oe>QXh%9s#;W8EqP4yf@!j;Te)=Y`mDc*`if!vEst)!C3$A<5hxi$8LL435
z$4$zGI9dsjVxPc1xj7uhRkru>Ja9$f_zutYw*W<pU2(4IZ#CMJkIx=8+JEqnK_@<=
zf*#;n<NO_n0W8P!=8d%0_ba7VL_V||AePLz>0P$z`~WLv5f7KN*+fe9chsZwrlX5F
z8GTzQT@~6U>E1_F$%~wi8%H|>-$df%Z0klVM9RC))unBkP602Hq_(K(7DEtK#wCL}
zeki+l3Y>-b)%kE9@>O+7$bTx&IN0xF#E$1iB1Yq1Wu-1c>#TBbS6YEv5&y_10f?jd
zNYcJ5m`Z}2xw2`1!-=Ddk(Eb^lbhXQvO#4CrPOF(k<6LcMe`}@xASSO_1lhmKT@W~
zDW%5I-_t__FKVr8$ERg^Bzr2Vk;Usn+CCo3Vu==fP}S<#EvBSGy?;6Vi@-4?>0g1I
znWh0d5=XHy8NE1g5^?lvAR$TbBaU_i{tHPK<XhNopwK8oDy4Qo(kZM3j8jUz4BQSJ
zrM3R6L4H5=t*$WzqlQvy8zjbUHDGb2)Jwo!z}Z^s-&(F;2ZsxmQtJ7vZ6|20-9rL9
z&O@>me?9a9rPOzjK7X_tu!vIXg{<w<wbnB%mmG{lB9!6joYAUEmZqgu75Y4H{jW*V
zcQT9Pmyz5gxkKq#`Yz-!7D+GgLttCt=y;O!X5df6(bY&gxXtl*_Tu;`6y1<!-a0c0
zb^;P!bT;By^AuwI*#P*9QtB|^$5|eJvT|F!<B+KLA0UZfZGX5syYCnzNzpg6`yLKF
z1}ukIc284EZ3yh_aGlzczH@O4A?s7Gjig*S1K34t{jTr%v$l*v82IHf+Khfa#3gS_
z;Ph;J2}zGQ6*yBV^+jMe%i<ajBKb>wc&{kYhLW_(VP1C|a2QD{nVaHh4TMQ1($_FD
z4`SxckuOE7kbjVz6NsZ*fa6Hghk=8MqYDsgWYN{D4s#W+t3uxtevT|I_*Jd-`Np|p
zv#<8A5b1USfY#b-MJue<d5_lmx{~|uib#*IXsyll&`wlJO-G`;_r<<&`%JC1l`)i3
zQ<0DBy~y*GVO1m>^LVAy5<ay#!w-=RU27QW@BpSOrGGX;CZ!($jxo;93V1iQ)rC48
zsZM9guX_bJkR<&UN%|OZv}~61|1|nWIOp`{8qf34pJ_e^oJkxVOdKsrlHP@Q8T=f0
zyGDEKO1x0|Qd*_dLWm^$sfEb^$Wj_yhIFn*kV(<KfZtn~EWhtxk*r~RD5WYbOQp5W
zGdzDkaDS=Z$;kAD2E5DbX30-?MN;pXOqSpO3S_ym{ghH;Z8T*t8Lit4RJAkaYT{Iq
zG$D=_B#sUQ{zUI`rZ&^JkI{<Pj6zh#i;1J%fUzX$3}ms6OS<qp=5<x*L-1`xWj>{Z
z?nq!wrPOK_+Tg>6h(Y7161tNR<H43S?(s`RN`Gw{KsyOp?dU-~3mj(H3NZ>ESweR(
z5(hUm;QsyKl4#xTIK^vRo%MFaNAU<CC62z0j2FH}ueH=<oP6J8w6PA_BE8fvL7uN?
znYnfV9&xm_6A9fd`qhAIwbpNz(B-*Uma9;=56c6ulqF-;TEBvXt$e)d4Yby;A|Cu7
z3x6P=j4;|vN+cTc4sI@6e?V*f5;D16>z$Q_gbxJ6nb*IHIFD`*JW3pGiKsgNOJ7r}
z+2M=Frg*ohjy8r_5K*ZvB91m7NpC|elSd%xWS!^fMCw(=viKM213+s%3mL;MT}B&-
zrRkrC#D(XPcGiKJf}tOjQp*BMAxw4y@PC;Sb#H0HSJQcpn(r)RjMjv-3PBHWCa^I{
zdLd#pIv+R`vHrN~3{f4&I_PXnr;xAK3B=KKU?NHS2gG&Aw;)8560h#Z>Z4fPmK=DF
zUQhT=u~b%H2>wld27i(AWq>CmLymtS%oZV294;(L_(${&YQD3oo*_+iAlr5)uzwXv
z`cq(W;^;SsxphUyJ<AxzC(&^1+wQRzaBgOJ8AFopjY!(Z9QUt_Ch7o~MYvkFGw_E7
z?g`SF%VO4Y{D=ArTP#Sq$$k=Wx7K==*7{L|v3=vT(ezLL<HCN3wpAH9qYZ?_vf(vk
zj^?Yt%f!)PNc_|14LToFndc!)qJNon`0f)UIVgXCn0RAEowUsd`QVePRj;?<5&A|L
zJE66nskJV1pdD&hit^M1lYwG_rI2x25VY2h)O}|~iPj0z_@tE$J-`fPqV!TEx8pUy
z*4Q0>ZTIrs*JgEe(VOM2=Nf}Zfol;X$?p+s+hrxs-^2$g^!oFF)idw*5r2hjoV5&|
zF{n~%0c5(T7!*7cSVt+<gvL-CHr27o4q~hC9>l!+Bg9nuH(+=At9!2NvFw|4W?iO4
zv(@V=H!(kO5O6i{S(5a7h^teR%OBN!|7RhgCeyRIt&xOXka;nm<M_JB`zkWp4TzUX
z*%DS=Md%o<3FdnP(Ql_BDSzdzL>4SuIPg9pjFN9=-oSC5y2~V+>$;_Z6SGWQvk^D2
zBar+gRnXXnO>6xD;uW$AaJf>dDPzZ=LMinLWPEf=W@dL`GVqL%C*%&~KWRjLtcy;*
zdZ8UcBff7xL#$$FBNjzl3IktWj*vjhoTh9Z&GqYJY#is-0RD^w4}TtpxHTPuNb7E@
zlU8W0A5uz9L8RL~N~vRklREK)A0W)5lq&vj3nNl!UE~A(Fy-!7`9$@H&|0TTsavvo
zY);LcV!Tpn{SumfzK%JX@_D=mF?KwUqzBu|Q@@R|Z0!nRK$q%B;BTl@D`I0rs+|FR
zKl?q5{s}$npb~Rxt$(jqO0AAC`~krJN~zxhM{BL0_Fp|{@U`n2U^AaXu~KSo#7b<Y
z8wXJzr*+mmCsw3?q_~NveV!qme0kqQ{@`gyuKJn4R~+@)>i2bauroz*D;uMQ)Z=Q0
zt&RB>A>QjZBkJ2m$XD3qbr2%)YDqn<^~+l8T@e-cP~^Y3KYvSbGZe84y;-fcMV!S?
zMbaazhn<0n_$;Ey^v{kaWuMA?L7T>%NWv)Jwq_O8G4u~V2T>DaWYVy>Fg(<kW>pX(
z(Xf>Hn5+r|j7K5?c0$H&lM(5bFObm{wb6#mb?FGD)G^5a@*Abp3R>&NoQfO51vc;f
zOi~>P{8%aVuz%M2EXVbek%?#9sx&tumhN>4@L^R-J%(7nZMaHny>sC>)mpz$R%erz
zsr!)-h=qZRfMw}F4s&%b7fn$uEE}U0&%2Bv<~=$cua!xlC6U;$`;h$o(-Fp7&hs2T
z)Miet_4|nT`D4H-N~s&P)@At!2OU|v4^~Po4jiYH`hTk<oMsa6kIW!s*71f?>b{I7
z#991w?1sXv@h`C9gvn@i{>WK~YH|nS;k*{^T#cd9tc=;rUlTrwX5P~!&5C8d@tO@L
z%_@kI<QgQK?nX#hiO)5x5f##e*80>ezUp^Msb#d*p&lKBjoklrOC*`9iAlg^N~yIS
z*FQzMCx1TxT5DUp97?HGsOi<xsYE*$vE+OgQH{!yq1rl2h|!~JYPY(Kmj8yRl32>i
z7-B<YlKxDj!|YA<rJ$O?iHKop3K9`9<e{~GO)2#Nu(EkBb0l5}VZ`k{)x4*aiU#B3
zQaAAPL1YD&ml09CMd4hPFS1W!l-1=MLzT^=g@3fu$7EHW%iKmGb6po8TENaUwBm_U
zYMVf>kXw;4OO<7ThXNkJ-sW|Ybc4&_F-RcBk~IdTr3P#g&G$uq3kmM)L4phCqrViZ
zlFF@2n$=Mop<JRB@9AT5v#faRQzt{D?>IyqdI<@SUknKa8sn%hq|PIOqmd7x6I$z8
zN`I**5kplI_z%+V5X?=u1G0(N>Ax%!2&3ImGIjAnmh5K|ee<8pCcN!qsP2#eRFi0b
zMiQ><gp9>pnWI8FNtr~#b1r1-Wi-i-<x80Ay0@<lw&w_a4<_xR$P~b)h+A6OqI^C)
zgDjXBf<*`qZ7IW>h{JCP7Dt@Po5Z@nO@9G&H`9Nd_6*^nFH0gBkt?H&(G)Txe*~~B
zG7kF~;hm^hPe@0tqTczoqUt!d!@5Ek(^bC<Hrk2E(nJv=nVt!(s|eR(e|>K*&bQ-{
zC54;7i-gCRErBeJ+z6CX^CHQ3`ma0QA2-q873*oj+rBjZiFGG@6V~q{-VIM7Du2$J
z0rgdtW@eeI4jjL(Yl^C)%d%&?uB^<~{?KO)Wt#O7&yw4bIms$&)}z3N0iNocAnN};
z73%h3CNRHJYE>VRQfdjLv)<g$eL<2ejUrs4Ev}R*dh0v_EMMjqnvH!I#=pRZ6D~%(
z5x5T62C+=_xu<8dw$VWo(wWQd=YML$XyPb0!`kwNgh;8XOjh>1zIS5Vw#c@>(3|6<
z48KA&j&HgMlu~mc=^D;%aFM?2kq%hqy|E|aT;AmT-8x9N<d9Sf|3p4qMfLGQBz?wS
zCD-l;JWfq3t;uN5AxyRk;@J^V?Q85~zR=EHm%&_8t?FD=6-M-ZI6~fu3xCCD*c@0E
z`C|J#*U?%(g-o{`k<Iz^tyI#yorU;cTIY)DAe&U)75JJ`>U%aCrPOx7Zos~ow@On8
z9iNf;O5R05eaw>b90&Z5Qp&ohVfIYh1BV8zY-&Yrb$lOTvhjpX>bW|LX>nARb7omt
z$Mabkee-Q&kwJRM99nVT_kSBA<;*hM^OZ5RiG`3a_rDQU-e-8&8yTbCsgyb&k%sRe
z8M3~F{O4b2I=WhGeU(z`DBuL8)YixcyO^o?OGw_w)0?_yrXsI{Wj$*TZU(+!lpTdw
zeP<}8c0eTGlSo>KNr-#b!AP*Li3PJX=svtX8ey{8$XC-uC_}kutA9>LhqzpYPF{~I
z{JNOSJnodqLZ!K{{XV+Ivfnq6|E(Xgul6^TQdb~jvF#Ac<{gL&*vTQjc?HZylHHU-
zYkh!H>O3Sc@1$lt000GlNkl<Zb{b-sc@A;Uo2<3AIsEoy_Xt5s-{)QtSb#u@mf<Gg
zdrGPK^0a)}1ooavsefybv>IC=QvVS|0{)-Y`f5jgA4jwVAD&iv)6ttC8Dw1%sJ6Ap
zT;*lw&2mcieZS_udAu=6`T%h>1<7cfqb{T6zadO!9+#Du)n(##U=Nb?2FLjpLkx3~
zq?aROvc0h{_#N^!4*imwWq8hoNDJR_F43A8qlGet?YTqVlYfiG#J>?wlC@eU8(t7&
zNRp-`>9NR)Bd6j{zvb&}HX2u1Xy>hSZN9mTAt7~|_s2o++AsUqxX!tl?|o!$?UN+w
zZ%NY7^k^-H2>Mzblk_E$^t*^Z*xw3gLchReU-hb;wUe!m)v@gUq3sTRFSd7TmR|y_
zM3U~;Z-K=Y!+!?$d9)<GizHni85llUIOF>Qhca9@7|eEk&S<v8JWbxu_l#v99#=a+
z3<y(5(#=WIT9c$Lh7SBLSV{UP#EJ7D?8!nyI*;$zJXb6;f2%TzX?3j1sJ{D$GN9`n
zxjsrDlc)a+toGq*rY(j&%AJan^gWXFP{b;EW>y-~aet~ZMj1^=9d#Kk<UUx=hwO(i
zm_o+ICj*}#Nlze2YfX%{7@7$8-cQnJNz(0+3A|e=??}F5*M6PNb$yebA!YaVJ&&z@
z=KH!D_zX$98%f%v*F=jUg6e^vvi9>j$b#T6P|jR9&YQG0so|sPRHB8}Q%381rn2|(
zII_6M6n~QRURsP;)QhlAQcaTn5t*4k0-4zlm2T#_CZt*&Mhj_!>p4Q&>w5=pArTQP
zlcX2ZV#K3vDg!~1zD1HAL~rt$s>~BYQ<o8QMw_?BwRPI%+o!O9I`C<d^hlD_>PFRK
z<e`~#b4mIHur+bCJ`$FnCs3*C$5=d9#o^cnmw&IL2^%vM_sue!WV4+!_iqCBB1v!e
zw57!eMQ0MtM3P>Iq?_9vcm;pQYeF3hk!V${j=uJVwAc2m&jLG;r0cazHs_*QMgvIF
z4@lBek<k1T>Gk{`NVO6AS{>`w(FxsqNM_)bNz$_e-(HImisl(DN0PoylJ0|~K)8zL
zq<>mj2hYoGs$)}(TvpF{z$zr^AtY(lRY6;fKy-hxx+HxN*o-*Z1aXXAp>Vd-m@^;d
zE&Q6yY(iDocYPQ@7ChL8B(=p|wU~p^J&9&Q!f`%>EaUVB)ujX#=}ktfQ%C6bA`;5K
zZp&mXY#2C3gFGDPmxxvJcl1iGPSiBlR)5z8tIB;+BxrVJlJxg&_(}^Gl-5nHIamX6
zv^tVmcM|0h)MeR_&9WB|hBj9oX-a*(6xg36ZF24E79$jc%V;^`Xd057bs6jo<x5%M
zDti;LeA?2G*_h2NvyJN%lK*{QlGK$$qD6~-7+BTO1qsJl4M~CaE`GJmR&FaBM}KE(
zqgnTBNV<o$S|)2z6+=U!6%j{EA=2$@h0>~OV~#a(Cm$`7YWe;L$a-8qZ9VH-)Wy(a
zv>b7?4l;gQllqJ{1-R02E`-spLCp2{`y1P$g&#vhb+jQ#^92dMjhN5tSOypJobzo@
z0Mkg)O<E>v(FBGrqd^{yGaXrc?tduyhU0{6i+IjqDVv4lrC*IC4O#2BMT;N|ZAQzH
zq_arU9|Ef*S)oE1ZQ(#VkSx9{lcYzr;VUhgM)zH?nnaR54ooACHbBC0CgPqKgI-4S
zp$%VY(RB<DiDn{6uR)9?dmve(>Zp#-(1x$H7$6K!MuR*Y=M*Fz-bsiVK5T^1-UAMy
z4PR+7fEc>w{i=wgiHP6fmkOn~BUzVooQt?kHMIa=ixxo`IgFMgj;12>Zz}-*LfpD;
z2li|ihG;QZ7<r5a5Jz((<G1aA6M)vUzQv&8{{y=S=41>7A@TqK002ovPDHLkV1f-2
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 0792/1224] 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 0793/1224] 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 0794/1224] 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 0795/1224] 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 0796/1224] 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 0797/1224] 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 0798/1224] 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 0799/1224] 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 0800/1224] 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 0801/1224] 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 0802/1224] 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 0803/1224] 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 0804/1224] 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 0805/1224] 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 0806/1224] [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 0807/1224] [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 0808/1224] 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 0809/1224] 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 0810/1224] 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 0811/1224] 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 0812/1224] 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 0813/1224] [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 0814/1224] 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 0815/1224] 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 0816/1224] 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 0817/1224] 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 0818/1224] 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 0819/1224] 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 0820/1224] 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 0821/1224] 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 0822/1224] [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 0823/1224] 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 0824/1224] 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 0825/1224] 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 0826/1224] 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 0827/1224] 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 0828/1224] 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 0829/1224] 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 0830/1224] 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 0831/1224] 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 0832/1224] 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 0833/1224] 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 0834/1224] 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 0835/1224] 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 0836/1224] 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 0837/1224] 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 0838/1224] 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 0839/1224] 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 0840/1224] [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 0841/1224] 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 0842/1224] 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 0843/1224] 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 0844/1224] 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 0845/1224] 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 0846/1224] 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 0847/1224] 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 0848/1224] 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 0849/1224] 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 0850/1224] 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 0851/1224] 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 0852/1224] 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 0853/1224] [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 0854/1224] 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 0855/1224] 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 0856/1224] 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 0857/1224] 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

From a3b4cb205c8cf95e483decb6c4208789bd98e84c Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Fri, 3 Aug 2012 13:15:15 +0200
Subject: [PATCH 0858/1224] 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 8a60f70e1d..dec6ea047c 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -402,11 +402,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() == '') {
@@ -422,7 +418,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 2af74736514f8bc194239e40a6a04a862db305e0 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Fri, 3 Aug 2012 15:51:25 +0200
Subject: [PATCH 0859/1224] LDAP: sanitize base, user and group trees. fixes
 oc-1302

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

diff --git a/apps/user_ldap/lib_ldap.php b/apps/user_ldap/lib_ldap.php
index ab838812ae..70b4664542 100644
--- a/apps/user_ldap/lib_ldap.php
+++ b/apps/user_ldap/lib_ldap.php
@@ -666,9 +666,9 @@ class OC_LDAP {
 			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::$ldapBase              = self::sanitizeDN(OCP\Config::getAppValue('user_ldap', 'ldap_base', ''));
+			self::$ldapBaseUsers         = self::sanitizeDN(OCP\Config::getAppValue('user_ldap', 'ldap_base_users',self::$ldapBase));
+			self::$ldapBaseGroups        = self::sanitizeDN(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'));

From 646bc1fc24cab27da8f616b439ca6940e31fbbf9 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Fri, 3 Aug 2012 16:11:10 +0200
Subject: [PATCH 0860/1224] Contacts: Fix no active Addressbooks

---
 apps/contacts/lib/addressbook.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/apps/contacts/lib/addressbook.php b/apps/contacts/lib/addressbook.php
index 1953b29661..974ecb4047 100644
--- a/apps/contacts/lib/addressbook.php
+++ b/apps/contacts/lib/addressbook.php
@@ -219,6 +219,7 @@ class OC_Contacts_Addressbook{
 			OCP\Util::writeLog('contacts','OC_Contacts_Addressbook:active:, exception: '.$e->getMessage(),OCP\Util::DEBUG);
 			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);
+			return array();
 		}
 
 		return $addressbooks;

From 5e9f92e5dd83a381c60d2c813dd51a1e07e8f2f7 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Fri, 3 Aug 2012 16:18:33 +0200
Subject: [PATCH 0861/1224] 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 06f85d3225..6c55bd1988 100644
--- a/apps/calendar/lib/app.php
+++ b/apps/calendar/lib/app.php
@@ -383,8 +383,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;

From 28323116406cedb5b7e41d3bc89d9c2fcf1f994a Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Sat, 4 Aug 2012 18:50:05 +0200
Subject: [PATCH 0862/1224] 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 0ac8434670998f712411da01183890725c27d555 Mon Sep 17 00:00:00 2001
From: Bjoern Schiessle <schiessle@owncloud.com>
Date: Wed, 8 Aug 2012 11:47:23 +0200
Subject: [PATCH 0863/1224] fix for bug 879 - add parent directory to file
 cache if it does not exist yet. For example this can happen if the sync
 client is used before the user created the root directory (e.g. through web
 login).

---
 lib/filecache.php | 33 +++++++++++++++++++++------------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/lib/filecache.php b/lib/filecache.php
index d169cb1b56..9e999f1298 100644
--- a/lib/filecache.php
+++ b/lib/filecache.php
@@ -59,7 +59,7 @@ class OC_FileCache{
 			$root='';
 		}
 		$path=$root.$path;
-		$query=OC_DB::prepare('SELECT `ctime`,`mtime`,`mimetype`,`size`,`encrypted`,`versioned`,`writable` FROM `*PREFIX*fscache` WHERE `path_hash`=?');
+		$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;
@@ -84,19 +84,28 @@ class OC_FileCache{
 		if($root=='/'){
 			$root='';
 		}
-		$path=$root.$path;
-		$parent=self::getParentId($path);
-		$id=self::getFileId($path);
-		if(isset(OC_FileCache::$savedData[$path])){
-			$data=array_merge(OC_FileCache::$savedData[$path],$data);
-			unset(OC_FileCache::$savedData[$path]);
+		$fullpath=$root.$path;
+		$parent=self::getParentId($fullpath);
+		$id=self::getFileId($fullpath);
+		if(isset(OC_FileCache::$savedData[$fullpath])){
+			$data=array_merge(OC_FileCache::$savedData[$fullpath],$data);
+			unset(OC_FileCache::$savedData[$fullpath]);
 		}
+		
+		// add parent directory to the file cache if it does not exist yet.
+		if ($parent == -1 && $fullpath != $root) {
+			$parentDir = substr(dirname($path), 0, strrpos(dirname($path), DIRECTORY_SEPARATOR));
+			self::scanFile($parentDir);
+			$parent = self::getParentId($fullpath);
+		}
+		
 		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
-			self::$savedData[$path]=$data;
+			self::$savedData[$fullpath]=$data;
 			return;
 		}
 		if(!isset($data['encrypted'])){
@@ -113,9 +122,9 @@ 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);
 		}
 	}
 
@@ -197,12 +206,12 @@ class OC_FileCache{
 			$path=$root.$file;
 			self::delete(self::getFileId($path));
 		}elseif($file!=-1){
-			$query=OC_DB::prepare('SELECT `id` FROM `*PREFIX*fscache` WHERE `parent`=?');
+			$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=OC_DB::prepare('DELETE FROM *PREFIX*fscache WHERE id=?');
 			$query->execute(array($file));
 		}
 	}

From cb736b42e3fe36e05a1db5615113ed8102ae39e7 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Thu, 9 Aug 2012 17:22:56 +0200
Subject: [PATCH 0864/1224] Fix for broken Mail App in OSX Mountain Lion.
 https://mail.kde.org/pipermail/owncloud/2012-August/004649.html

---
 3rdparty/Sabre/CardDAV/Plugin.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/3rdparty/Sabre/CardDAV/Plugin.php b/3rdparty/Sabre/CardDAV/Plugin.php
index 9ebec243eb..095769fedd 100644
--- a/3rdparty/Sabre/CardDAV/Plugin.php
+++ b/3rdparty/Sabre/CardDAV/Plugin.php
@@ -153,6 +153,9 @@ class Sabre_CardDAV_Plugin extends Sabre_DAV_ServerPlugin {
 
                 // Taking out \r to not screw up the xml output
                 $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 4f7e4c20d27b3a611a5a5939a98086c10a873dbf Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@statuscode.ch>
Date: Thu, 9 Aug 2012 22:14:48 +0200
Subject: [PATCH 0865/1224] Sanitize 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..a9683c0206 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 htmlentities(echo $_GET['token']); ?>';
     </script>
   </head>
   <body>

From 3644517b015bdebfbb22af6f912e87c05fd4251c Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@statuscode.ch>
Date: Thu, 9 Aug 2012 22:17:52 +0200
Subject: [PATCH 0866/1224] Missed an "echo"

---
 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 a9683c0206..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 htmlentities(echo $_GET['token']); ?>';
+      var TOKEN = '<?php echo htmlentities($_GET['token']); ?>';
     </script>
   </head>
   <body>

From 76e0ca785bb473ea63d7811349cc27d6999fde8f Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@statuscode.ch>
Date: Fri, 10 Aug 2012 00:11:04 +0200
Subject: [PATCH 0867/1224] 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 360c22fd2821ed440089d7899d4c6680a0676410 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@statuscode.ch>
Date: Fri, 10 Aug 2012 15:23:04 +0200
Subject: [PATCH 0868/1224] Validate cookie to prevent auth bypasses.

---
 index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/index.php b/index.php
index 3c38ff760f..89eaec7d21 100644
--- a/index.php
+++ b/index.php
@@ -77,7 +77,7 @@ elseif(OC_User::isLoggedIn()) {
 		}
 		// 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 ffb55d5a17dc3a72b33d9ad2cedc0682e1caa567 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Wed, 8 Aug 2012 11:25:24 -0400
Subject: [PATCH 0869/1224] Don't return file handle if the mode supports
 writing and the file is not writable

Conflicts:
	apps/files_sharing/sharedstorage.php
---
 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 8b19338283..a2dfe34402 100644
--- a/apps/files_sharing/sharedstorage.php
+++ b/apps/files_sharing/sharedstorage.php
@@ -416,6 +416,25 @@ class OC_Filestorage_Shared extends OC_Filestorage {
 	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;
+					}
+			}
 			$storage = OC_Filesystem::getStorage($source);
 			return $storage->fopen($this->getInternalPath($source), $mode);
 		}

From 78e8cbd52cd42d1ece5ff0a47177495ad30a8e23 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@statuscode.ch>
Date: Fri, 10 Aug 2012 16:38:32 +0200
Subject: [PATCH 0870/1224] Check if webfinger is enabled

---
 apps/user_webfinger/host-meta.php | 4 ++++
 apps/user_webfinger/webfinger.php | 6 +++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/apps/user_webfinger/host-meta.php b/apps/user_webfinger/host-meta.php
index 32ffb51205..a4f494ce83 100644
--- a/apps/user_webfinger/host-meta.php
+++ b/apps/user_webfinger/host-meta.php
@@ -1,4 +1,8 @@
 <?php
+if (!OCP\App::isEnabled("user_webfinger")) {
+	return;
+}
+
 $hostMetaHeader = array(
 	'Access-Control-Allow-Origin' => '*',
 	'Content-Type' => 'application/xrd+json'
diff --git a/apps/user_webfinger/webfinger.php b/apps/user_webfinger/webfinger.php
index e75c546c2c..0f882a96cf 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
  **/
 // calculate the documentroot
 // modified version of the one in lib/base.php that takes the .well-known symlink into account

From 1dfa6f3d8fd45e45ebd28a745106d3bd6153e6ae Mon Sep 17 00:00:00 2001
From: Jakob Sack <mail@jakobsack.de>
Date: Sun, 12 Aug 2012 09:06:46 +0200
Subject: [PATCH 0871/1224] Fix OC_Connector_Sabre_Locks for SQLite

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

diff --git a/lib/connector/sabre/locks.php b/lib/connector/sabre/locks.php
index b4878fabc7..a12f2a5440 100644
--- a/lib/connector/sabre/locks.php
+++ b/lib/connector/sabre/locks.php
@@ -41,8 +41,10 @@ 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);
+		// Fix: sqlite does not insert time() as a number but as text, making
+		// the equation returning false all the time
+		$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);

From 9917c611d3d586f9e076114b98d158960c74701d Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@statuscode.ch>
Date: Mon, 13 Aug 2012 01:22:53 +0200
Subject: [PATCH 0872/1224] Disable listing of all users

---
 apps/calendar/appinfo/remote.php | 10 +++++++---
 apps/contacts/appinfo/remote.php |  9 ++++++---
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/apps/calendar/appinfo/remote.php b/apps/calendar/appinfo/remote.php
index 3bd8737ee9..93d57b2e40 100644
--- a/apps/calendar/appinfo/remote.php
+++ b/apps/calendar/appinfo/remote.php
@@ -21,10 +21,14 @@ $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);
diff --git a/apps/contacts/appinfo/remote.php b/apps/contacts/appinfo/remote.php
index ef50e4ad39..2a6a3bea2e 100644
--- a/apps/contacts/appinfo/remote.php
+++ b/apps/contacts/appinfo/remote.php
@@ -36,10 +36,13 @@ $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);

From 5cb2d58c9f7b2137bf46160eb11ff6e179bd4615 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@statuscode.ch>
Date: Mon, 13 Aug 2012 01:26:28 +0200
Subject: [PATCH 0873/1224] Also check 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 5e1922e10e..06f88b3779 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 12df81fe0ba5229cd9e80c86a960385efd48e459 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Sat, 11 Aug 2012 11:04:04 -0400
Subject: [PATCH 0874/1224] 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 0e7e370cd6..67f8e7702f 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -434,6 +434,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 2c7df5daa3..2a0c1cea93 100644
--- a/lib/filesystem.php
+++ b/lib/filesystem.php
@@ -372,13 +372,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 1d530192b9b1012d7a450d5b56173ec776ed6f26 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@statuscode.ch>
Date: Tue, 14 Aug 2012 17:19:20 +0200
Subject: [PATCH 0875/1224] 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 93d57b2e40..d500ec1080 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,
 	);
 
 
diff --git a/apps/contacts/appinfo/remote.php b/apps/contacts/appinfo/remote.php
index 2a6a3bea2e..2810358e7f 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 f86f4c8bfd6c57012666f2c705ea8783f687e620 Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <frank@owncloud.org>
Date: Tue, 14 Aug 2012 20:07:58 +0200
Subject: [PATCH 0876/1224] 4.0.7 and remove some ^M while at it

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

diff --git a/lib/util.php b/lib/util.php
index b7ceee91b5..010aa1f7f0 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,00,6);
+		return array(4,00,7);
 	}
 
 	/**
@@ -91,7 +91,7 @@ class OC_Util {
 	 * @return string
 	 */
 	public static function getVersionString(){
-		return '4.0.6';
+		return '4.0.7';
 	}
 
         /**
@@ -408,18 +408,18 @@ 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.
-	 *
-	 * @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;
+	/**
+	 * @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 4d3c45a8263bd394824a7d2368f0b5e83218cbda Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Sat, 4 Aug 2012 17:38:31 +0200
Subject: [PATCH 0877/1224] backport 1bccc80996e270f928c207cdd3090f4284abaea5

---
 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 a6928bf82d..5ef9daee18 100644
--- 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',OC_Util::sanitizeHTML($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 f8c515369e..82ee7e8483 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -50,5 +50,8 @@ 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 4e5291c77aac573860489f83c8ca627e7c793b86 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@statuscode.ch>
Date: Sat, 18 Aug 2012 09:24:35 +0200
Subject: [PATCH 0878/1224] 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 60a3836cb5..077187fbc1 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'].'');
 }
 
 $files = array();

From 9188d2a8448d591aad735302f7a6a2ef9f81f186 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@statuscode.ch>
Date: Sat, 18 Aug 2012 14:57:19 +0200
Subject: [PATCH 0879/1224] Add a missing exit();

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

diff --git a/apps/files/index.php b/apps/files/index.php
index 077187fbc1..f6a1c4bfb4 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['SCRIPT_NAME'].'');
+	exit();
 }
 
 $files = array();

From eadb894effffcec7224f6bd960602e0b7c3f5f60 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Mon, 20 Aug 2012 17:04:57 +0200
Subject: [PATCH 0880/1224] Fix deletion for browser that do not support
 onBeforeUnload, fixes oc-1534

---
 apps/files/js/filelist.js | 30 ++++++++++++++++++------------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 3645258f98..c3eb906f39 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -166,23 +166,15 @@ FileList={
 	},
 	do_delete:function(files){
 		if(FileList.deleteFiles || !FileList.useUndo){//finish any ongoing deletes first
+			if(!FileList.deleteFiles) {
+				FileList.prepareDeletion(files);
+			}
 			FileList.finishDelete(function(){
 				FileList.do_delete(files);
 			});
 			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.prepareDeletion(files);
 		$('#notification').text(t('files','undo deletion'));
 		$('#notification').data('deletefile',true);
 		$('#notification').fadeIn();
@@ -209,6 +201,20 @@ 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;
 	}
 }
 

From 63d6884e23081ad17f9eeb68da7478c4cb7de296 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@statuscode.ch>
Date: Tue, 21 Aug 2012 17:56:20 +0200
Subject: [PATCH 0881/1224] Sanitizing the user input to prevent a reflected
 XSS. Thanks to Nico Golde (ngolde.de)

---
 apps/gallery/templates/index.php | 76 ++++++++++++++++----------------
 1 file changed, 38 insertions(+), 38 deletions(-)

diff --git a/apps/gallery/templates/index.php b/apps/gallery/templates/index.php
index e30052fafa..a41bf3c47b 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) {
@@ -83,56 +83,56 @@ $tl = new \OC\Pictures\TilesLine();
 $ts = new \OC\Pictures\TileStack(array(), '');
 $previous_element = @$images[0];
 
-$root_images = array();
-$second_level_images = array();
-
+$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(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 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]));
+// 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]));
+// 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 0c0ae928dcd483211a92303eb2b202453d02a86e Mon Sep 17 00:00:00 2001
From: jfd <jfd@underverse>
Date: Mon, 30 Jul 2012 20:46:14 +0200
Subject: [PATCH 0882/1224] escape all identifiers with backticks

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

diff --git a/lib/filecache.php b/lib/filecache.php
index 9e999f1298..719f419b37 100644
--- a/lib/filecache.php
+++ b/lib/filecache.php
@@ -59,7 +59,7 @@ class OC_FileCache{
 			$root='';
 		}
 		$path=$root.$path;
-		$query=OC_DB::prepare('SELECT ctime,mtime,mimetype,size,encrypted,versioned,writable FROM *PREFIX*fscache WHERE path_hash=?');
+		$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;
@@ -206,12 +206,12 @@ class OC_FileCache{
 			$path=$root.$file;
 			self::delete(self::getFileId($path));
 		}elseif($file!=-1){
-			$query=OC_DB::prepare('SELECT id FROM *PREFIX*fscache WHERE parent=?');
+			$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=OC_DB::prepare('DELETE FROM `*PREFIX*fscache` WHERE `id`=?');
 			$query->execute(array($file));
 		}
 	}

From 3148edbdefa161f6ff72ccc50387136f185edb7e Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Wed, 22 Aug 2012 20:48:16 -0400
Subject: [PATCH 0883/1224] Fix shared storage rename. Note: You can only
 rename shared files/folders that are inside a shared folder, not individual
 shared files/folders.

---
 apps/files_sharing/lib/sharedstorage.php | 41 +++++++++++++++---------
 1 file changed, 26 insertions(+), 15 deletions(-)

diff --git a/apps/files_sharing/lib/sharedstorage.php b/apps/files_sharing/lib/sharedstorage.php
index 582c9c6617..527cec0afe 100644
--- a/apps/files_sharing/lib/sharedstorage.php
+++ b/apps/files_sharing/lib/sharedstorage.php
@@ -312,21 +312,32 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
 	}
 	
 	public function rename($path1, $path2) {
-		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) {
-				$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 ($this->isUpdatable($path1)) {
+		// Renaming/moving is only allowed within shared folders
+		$pos1 = strpos($path1, '/', 1);
+		$pos2 = strpos($path2, '/', 1);
+		if ($pos1 !== false && $pos2 !== false && ($oldSource = $this->getSourcePath($path1))) {
+			$newSource = $this->getSourcePath(dirname($path2)).'/'.basename($path2);
+			if (dirname($path1) == dirname($path2)) {
+				// Rename the file if UPDATE permission is granted
+				if ($this->isUpdatable($path1)) {
+					$storage = OC_Filesystem::getStorage($oldSource);
+					return $storage->rename($this->getInternalPath($oldSource), $this->getInternalPath($newSource));
+				}
+			} else {
+				// Move the file if DELETE and CREATE permissions are granted
+				if ($this->isDeletable($path1) && $this->isCreatable(dirname($path2))) {
+					// Get the root shared folder
+					$folder1 = substr($path1, 0, $pos1);
+					$folder2 = substr($path2, 0, $pos2);
+					// Copy and unlink the file if it exists in a different shared folder
+					if ($folder1 != $folder2) {
+						if ($this->copy($path1, $path2)) {
+							return $this->unlink($path1);
+						}
+					} else {
+						$storage = OC_Filesystem::getStorage($oldSource);
 						return $storage->rename($this->getInternalPath($oldSource), $this->getInternalPath($newSource));
 					}
-				// Move the file if DELETE and CREATE permissions are granted
-				} else if ($this->isDeletable($path1) && $this->isCreatable(dirname($path2))) {
-					return $storage->rename($this->getInternalPath($oldSource), $this->getInternalPath($newSource));
 				}
 			}
 		}
@@ -335,12 +346,12 @@ 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->isCreatable(dirname($path2))) {
+		if ($this->isCreatable(dirname($path2))) {
 			$source = $this->fopen($path1, 'r');
 			$target = $this->fopen($path2, 'w');
 			return OC_Helper::streamCopy($source, $target);
 		}
-		return true;
+		return false;
 	}
 
 	public function fopen($path, $mode) {

From cfec290ad90f8bce01f37cd0ec1f957219770aad Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Thu, 23 Aug 2012 14:48:35 -0400
Subject: [PATCH 0884/1224] Prevent resharing in UI if share permission not
 granted

---
 apps/files_sharing/js/share.js |   8 +--
 core/js/share.js               | 112 +++++++++++++++++----------------
 2 files changed, 63 insertions(+), 57 deletions(-)

diff --git a/apps/files_sharing/js/share.js b/apps/files_sharing/js/share.js
index bcfd42ce21..12c1a3332c 100644
--- a/apps/files_sharing/js/share.js
+++ b/apps/files_sharing/js/share.js
@@ -2,7 +2,7 @@ $(document).ready(function() {
 
 	if (typeof FileActions !== 'undefined') {
 		OC.Share.loadIcons('file');
-		FileActions.register('all', 'Share', FileActions.PERMISSION_SHARE, function(filename) {
+		FileActions.register('all', 'Share', FileActions.PERMISSION_READ, function(filename) {
 			// Return the correct sharing icon
 			if (scanFiles.scanning) { return; } // workaround to prevent additional http request block scanning feedback
 			if ($('#dir').val() == '/') {
@@ -36,13 +36,13 @@ $(document).ready(function() {
 			} else {
 				var item = $('#dir').val() + '/' + filename;
 			}
-			if ($('tr').filterAttr('data-file', filename).data('type') == 'dir') {
+			var tr = $('tr').filterAttr('data-file', filename);
+			if ($(tr).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 possiblePermissions = $(tr).data('permissions');
 			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) {
diff --git a/core/js/share.js b/core/js/share.js
index e765303a26..1c96cfa223 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -86,65 +86,71 @@ OC.Share={
 			}
 			html += '<br />';
 		}
-		html += '<input id="shareWith" type="text" placeholder="Share with" style="width:90%;"/>';
-		html += '<ul id="shareWithList">';
-		html += '</ul>';
-		if (privateLink) {
-			html += '<div id="privateLink">';
-			html += '<input type="checkbox" name="privateLinkCheckbox" id="privateLinkCheckbox" value="1" /><label for="privateLinkCheckbox">Share with private link</label>';
-			html += '<br />';
-			html += '<input id="privateLinkText" style="display:none; width:90%;" readonly="readonly" />';
+		if (possiblePermissions & OC.Share.PERMISSION_SHARE) {
+			html += '<input id="shareWith" type="text" placeholder="Share with" style="width:90%;"/>';
+			html += '<ul id="shareWithList">';
+			html += '</ul>';
+			if (privateLink) {
+				html += '<div id="privateLink">';
+				html += '<input type="checkbox" name="privateLinkCheckbox" id="privateLinkCheckbox" value="1" /><label for="privateLinkCheckbox">Share with private link</label>';
+				html += '<br />';
+				html += '<input id="privateLinkText" style="display:none; width:90%;" readonly="readonly" />';
+				html += '</div>';
+			}
 			html += '</div>';
-		}
-		html += '</div>';
-		$(html).appendTo(appendTo);
-		// Reset item shares
-		OC.Share.itemShares = [];
-		if (data.shares) {
-			$.each(data.shares, function(index, share) {
-				if (share.share_type == OC.Share.SHARE_TYPE_PRIVATE_LINK) {
-					OC.Share.showPrivateLink(item, share.share_with);
-				} else {
-					OC.Share.addShareWith(share.share_type, share.share_with, share.permissions, possiblePermissions);
-
-				}
-			});
-		}
-		$('#shareWith').autocomplete({minLength: 2, source: function(search, response) {
-// 			if (cache[search.term]) {
-// 				response(cache[search.term]);
-// 			} else {
-				$.get(OC.filePath('core', 'ajax', 'share.php'), { fetch: 'getShareWith', search: search.term, itemShares: OC.Share.itemShares }, function(result) {
-					if (result.status == 'success' && result.data.length > 0) {
-						response(result.data);
+			$(html).appendTo(appendTo);
+			// Reset item shares
+			OC.Share.itemShares = [];
+			if (data.shares) {
+				$.each(data.shares, function(index, share) {
+					if (share.share_type == OC.Share.SHARE_TYPE_PRIVATE_LINK) {
+						OC.Share.showPrivateLink(item, share.share_with);
 					} else {
-						// 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']);
-						}
+						OC.Share.addShareWith(share.share_type, share.share_with, share.permissions, possiblePermissions);
+						
 					}
 				});
-// 			}
-		},
-		focus: function(event, focused) {
-			event.preventDefault();
-		},
-		select: function(event, selected) {
-			var shareType = selected.item.value.shareType;
-			var shareWith = selected.item.value.shareWith;
-			$(this).val(shareWith);
-			// Default permissions are Read and Share
-			var permissions = OC.Share.PERMISSION_READ | OC.Share.PERMISSION_SHARE;
-			OC.Share.share($('#dropdown').data('item-type'), $('#dropdown').data('item-source'), shareType, shareWith, permissions, function() {
-				OC.Share.addShareWith(shareType, shareWith, permissions, possiblePermissions);
-				$('#shareWith').val('');
+			}
+			$('#shareWith').autocomplete({minLength: 2, source: function(search, response) {
+	// 			if (cache[search.term]) {
+	// 				response(cache[search.term]);
+	// 			} else {
+					$.get(OC.filePath('core', 'ajax', 'share.php'), { fetch: 'getShareWith', search: search.term, itemShares: OC.Share.itemShares }, function(result) {
+						if (result.status == 'success' && result.data.length > 0) {
+							response(result.data);
+						} else {
+							// Suggest sharing via email if valid email address
+							var pattern = new RegExp(/^[+a-zA-Z0-9._-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}$/i);
+							if (pattern.test(search.term)) {
+								response([{label: 'Share via email: '+search.term, value: {shareType: OC.Share.SHARE_TYPE_EMAIL, shareWith: search.term}}]);
+							} else {
+								response(['No people found']);
+							}
+						}
+					});
+	// 			}
+			},
+			focus: function(event, focused) {
+				event.preventDefault();
+			},
+			select: function(event, selected) {
+				var shareType = selected.item.value.shareType;
+				var shareWith = selected.item.value.shareWith;
+				$(this).val(shareWith);
+				// Default permissions are Read and Share
+				var permissions = OC.Share.PERMISSION_READ | OC.Share.PERMISSION_SHARE;
+				OC.Share.share($('#dropdown').data('item-type'), $('#dropdown').data('item-source'), shareType, shareWith, permissions, function() {
+					OC.Share.addShareWith(shareType, shareWith, permissions, possiblePermissions);
+					$('#shareWith').val('');
+				});
+				return false;
+			}
 			});
-			return false;
+		} else {
+			html += '<input id="shareWith" type="text" placeholder="Resharing is not allowed" style="width:90%;" disabled="disabled"/>';
+			html += '</div>';
+			$(html).appendTo(appendTo);
 		}
-		});
 		$('#dropdown').show('blind', function() {
 			OC.Share.droppedDown = true;
 		});

From 36487246eddc87342d113de8f133f8fb910c70ad Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Fri, 24 Aug 2012 10:01:01 -0400
Subject: [PATCH 0885/1224] Switch to using file cache ids instead of paths for
 file sharing

---
 apps/files/templates/part.list.php      |  2 +-
 apps/files_sharing/js/share.js          | 10 ++--
 apps/files_sharing/lib/share/file.php   | 26 ++++++---
 apps/files_sharing/lib/share/folder.php |  4 +-
 core/js/share.js                        | 13 ++++-
 lib/filecache/cached.php                |  2 +-
 lib/public/share.php                    | 78 ++++++++++---------------
 7 files changed, 69 insertions(+), 66 deletions(-)

diff --git a/apps/files/templates/part.list.php b/apps/files/templates/part.list.php
index 6667b5488a..8faeae3939 100644
--- a/apps/files/templates/part.list.php
+++ b/apps/files/templates/part.list.php
@@ -9,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-permissions='<?php echo $file['permissions']; ?>'>
+			<tr data-id="<?php echo $file['id']; ?>" 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_sharing/js/share.js b/apps/files_sharing/js/share.js
index 12c1a3332c..8754b16b06 100644
--- a/apps/files_sharing/js/share.js
+++ b/apps/files_sharing/js/share.js
@@ -43,20 +43,20 @@ $(document).ready(function() {
 				var itemType = 'file';
 			}
 			var possiblePermissions = $(tr).data('permissions');
-			var appendTo = $('tr').filterAttr('data-file', filename).find('td.filename');
+			var appendTo = $(tr).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);
+						$(tr).addClass('mouseOver');
+						OC.Share.showDropDown(itemType, $(tr).data('id'), appendTo, true, possiblePermissions);
 					});
 				} else {
 					OC.Share.hideDropDown();
 				}
 			} else {
-				$('tr').filterAttr('data-file',filename).addClass('mouseOver');
-				OC.Share.showDropDown(itemType, item, appendTo, true, possiblePermissions);
+				$(tr).addClass('mouseOver');
+				OC.Share.showDropDown(itemType, $(tr).data('id'), appendTo, true, possiblePermissions);
 			}
 		});
 	}
diff --git a/apps/files_sharing/lib/share/file.php b/apps/files_sharing/lib/share/file.php
index ae6315600f..5005d9a39d 100644
--- a/apps/files_sharing/lib/share/file.php
+++ b/apps/files_sharing/lib/share/file.php
@@ -26,30 +26,40 @@ class OC_Share_Backend_File implements OCP\Share_Backend_File_Dependent {
 	const FORMAT_FILE_APP_ROOT = 2;
 	const FORMAT_OPENDIR = 3;
 
-	public function isValidSource($item, $uid) {
-		if (OC_Filesystem::file_exists($item)) {
+	private $path;
+	
+	public function isValidSource($itemSource, $uidOwner) {
+		$path = OC_FileCache::getPath($itemSource, $uidOwner);
+		if (OC_Filesystem::file_exists($path)) {
+			$this->path = $path;
 			return true;
 		}
 		return false;
 	}
 
-	public function getFilePath($item, $uid) {
-		return $item;
+	public function getFilePath($itemSource, $uidOwner) {
+		if (isset($this->path)) {
+			$path = $this->path;
+			$this->path = null;
+			return $path;
+		}
+		return false;
 	}
 
-	public function generateTarget($item, $uid, $exclude = null) {
+	public function generateTarget($itemSource, $shareWith, $exclude = null) {
 		// TODO Make sure target path doesn't exist already
-		return $item;
+		return $itemSource;
 	}
 
 	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']);
+			return array('path' => $items[key($items)]['path'], 'permissions' => $items[key($items)]['permissions']);
 		} else if ($format == self::FORMAT_FILE_APP) {
 			$files = array();
 			foreach ($items as $item) {
 				$file = array();
+				$file['id'] = $item['file_source'];
 				$file['path'] = $item['file_target'];
 				$file['name'] = basename($item['file_target']);
 				$file['ctime'] = $item['ctime'];
@@ -77,7 +87,7 @@ class OC_Share_Backend_File implements OCP\Share_Backend_File_Dependent {
 				}
 				$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));
+			return array(0 => array('id' => -1, '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) {
diff --git a/apps/files_sharing/lib/share/folder.php b/apps/files_sharing/lib/share/folder.php
index b6db96614f..665583e83a 100644
--- a/apps/files_sharing/lib/share/folder.php
+++ b/apps/files_sharing/lib/share/folder.php
@@ -24,7 +24,7 @@ class OC_Share_Backend_Folder extends OC_Share_Backend_File {
 	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']);
+			return array('path' => $items[key($items)]['path'], '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)];
@@ -33,7 +33,7 @@ class OC_Share_Backend_Folder extends OC_Share_Backend_File {
 			} else {
 				$mimetype_filter = '';
 			}
-			$path = $folder['file_source'].substr($parameters['folder'], 7 + strlen($folder['file_target']));
+			$path = $folder['path'].substr($parameters['folder'], 7 + strlen($folder['file_target']));
 			$files = OC_FileCache::getFolderContent($path, '', $mimetype_filter);
 			foreach ($files as &$file) {
 				$file['directory'] = $parameters['folder'];
diff --git a/core/js/share.js b/core/js/share.js
index 1c96cfa223..810a4e7c0a 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -32,7 +32,18 @@ OC.Share={
 	},
 	loadItem:function(itemType, itemSource) {
 		var data = '';
-		if (typeof OC.Share.statuses[itemSource] === 'undefined') {
+		// Switch file sources to path to check if status is set
+		if (itemType == 'file' || itemType == 'folder') {
+			var filename = $('tr').filterAttr('data-id', String(itemSource)).data('file');
+			if ($('#dir').val() == '/') {
+				var item = $('#dir').val() + filename;
+			} else {
+				var item = $('#dir').val() + '/' + filename;
+			}
+		} else {
+			var item = itemSource;
+		}
+		if (typeof OC.Share.statuses[item] === 'undefined') {
 			checkShares = false;
 		} else {
 			checkShares = true;
diff --git a/lib/filecache/cached.php b/lib/filecache/cached.php
index 17a792a23d..1e17666717 100644
--- a/lib/filecache/cached.php
+++ b/lib/filecache/cached.php
@@ -58,7 +58,7 @@ class OC_FileCache_Cached{
 		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 = ?)');
+		$query=OC_DB::prepare('SELECT id,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;
diff --git a/lib/public/share.php b/lib/public/share.php
index 6221c75763..c894b31763 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -237,8 +237,16 @@ class Share {
 						// Continue scanning into child folders
 						array_push($files, $children);
 					} else {
+						// Check file extension for an equivalent item type to convert to
+						$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;
+								break;
+							}
+						}
 						// 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($itemType, $name, $shareType, $shareWith, $uidOwner, $permissions, $parentFolder);
 					}
 				}
 				return true;
@@ -425,7 +433,7 @@ class Share {
 		} else {
 			$fileDependent = false;
 			$root = '';
-			if ($includeCollections && !isset($item) && $collectionTypes = self::getCollectionItemTypes($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), '?'));
@@ -481,12 +489,11 @@ class Share {
 			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 = ?";
-					$queryArgs[] = $root.$item;
+					$where .= ' AND file_source = ?';
+					$column = 'file_source';
 				} else {
 					$where .= " AND item_source = ?";
 					$column = 'item_source';
-					$queryArgs[] = $item;
 				}
 			} else {
 				if ($itemType == 'file' || $itemType == 'folder') {
@@ -494,8 +501,8 @@ class Share {
 				} else {
 					$where .= " AND item_target = ?";
 				}
-				$queryArgs[] = $item;
 			}
+			$queryArgs[] = $item;
 			if ($includeCollections && $collectionTypes = self::getCollectionItemTypes($itemType)) {
 				// TODO Bart - this doesn't work with only one argument
 // 				$placeholders = join(',', array_fill(0, count($collectionTypes), '?'));
@@ -519,23 +526,23 @@ class Share {
 		// 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';
+				$select = '*PREFIX*share.id, item_type, *PREFIX*share.parent, share_type, file_source, path';
 			} else {
 				$select = 'id, item_type, item_source, parent, share_type';
 			}
 		} 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';
+					$select = '*PREFIX*share.id, item_type, *PREFIX*share.parent, share_type, share_with, file_source, path, permissions, stime';
 				} else {
 					$select = 'id, item_type, item_source, parent, share_type, share_with, permissions, stime, file_source';
 				}
 			} else {
 				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';
+						$select = '*PREFIX*share.id, item_type, *PREFIX*share.parent, share_type, share_with, file_source, path, file_target, permissions, 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, uid_owner, 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, file_source, path, file_target, permissions, stime';
 					}
 				} else {
 					$select = '*';
@@ -580,11 +587,11 @@ class Share {
 				}
 			}
 			// Remove root from file source paths if retrieving own shared items
-			if (isset($uidOwner) && isset($row['file_source'])) {
+			if (isset($uidOwner) && isset($row['path'])) {
 				if (isset($row['parent'])) {
-					$row['file_source'] = '/Shared/'.basename($row['file_source']);
+					$row['path'] = '/Shared/'.basename($row['path']);
 				} else {
-					$row['file_source'] = substr($row['file_source'], $root);
+					$row['path'] = substr($row['path'], $root);
 				}
 			}
 			$items[$row['id']] = $row;
@@ -601,7 +608,7 @@ class Share {
 					}
 				}
 				// 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) {
+				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]);
@@ -636,6 +643,10 @@ class Share {
 				return $items;
 			} else if ($format == self::FORMAT_STATUSES) {
 				$statuses = array();
+				// Switch column to path for files and folders, used for determining statuses inside of folders
+				if ($itemType == 'file' || $itemType == 'folder') {
+					$column = 'path';
+				}
 				foreach ($items as $item) {
 					if ($item['share_type'] == self::SHARE_TYPE_PRIVATE_LINK) {
 						$statuses[$item[$column]] = true;
@@ -664,20 +675,6 @@ class Share {
 	* @return bool Returns true on success or false on failure
 	*/
 	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));
-			foreach (self::$backends 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;
-			}
-		}
 		$backend = self::getBackend($itemType);
 		// Check if this is a reshare
 		if ($checkReshare = self::getItemSharedWithBySource($itemType, $itemSource, self::FORMAT_NONE, null, true)) {
@@ -686,24 +683,6 @@ class Share {
 				$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 = ?');
-					$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);
-				}
 			}
 			// Check if share permissions is granted
 			if ((int)$checkReshare['permissions'] & self::PERMISSION_SHARE) {
@@ -734,9 +713,12 @@ class Share {
 			}
 			$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 ($itemType == 'file' && $itemType == 'folder') {
+					$fileSource = $itemSource;
+				} else {
+					$fileSource = \OC_FileCache::getId($filePath);
+				}
 				if ($fileSource == -1) {
 					$message = 'Sharing '.$itemSource.' failed, because the file could not be found in the file cache';
 					\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);

From ee04b626b4c6c3a74bd0011be921660b5b8e6a66 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Fri, 24 Aug 2012 17:22:43 +0200
Subject: [PATCH 0886/1224] Correct variable name.

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

diff --git a/apps/calendar/lib/sabre/object.php b/apps/calendar/lib/sabre/object.php
index 25954e6ee5..0d1bfa397c 100644
--- a/apps/calendar/lib/sabre/object.php
+++ b/apps/calendar/lib/sabre/object.php
@@ -45,11 +45,11 @@ class OC_Connector_Sabre_CalDAV_CalendarObject extends Sabre_CalDAV_CalendarObje
 		$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)) {
+			$sharedCalendar = OCP\Share::getItemSharedWithBySource('calendar', $this->$calendarInfo['id']);
+			if ($sharedCalendar && ($sharedCalendar['permissions'] & OCP\Share::PERMISSION_READ)) {
 				$readprincipal = 'principals/' . OCP\USER::getUser();
 			}
-			if ($sharedAddressbook && ($sharedAddressbook['permissions'] & OCP\Share::PERMISSION_UPDATE)) {
+			if ($sharedCalendar && ($sharedCalendar['permissions'] & OCP\Share::PERMISSION_UPDATE)) {
 				$writeprincipal = 'principals/' . OCP\USER::getUser();
 			}
 		}

From fedb3641f9cdd0358951e6b794f5d3cb6d6465cb Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Fri, 24 Aug 2012 10:43:42 -0400
Subject: [PATCH 0887/1224] Determine if reshare needs to be checked

---
 core/ajax/share.php | 10 +++++++---
 core/js/share.js    |  6 +++++-
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/core/ajax/share.php b/core/ajax/share.php
index 04294a36ac..806ca9fb98 100644
--- a/core/ajax/share.php
+++ b/core/ajax/share.php
@@ -56,9 +56,13 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo
 			}
 			break;
 		case 'getItem':
-			if (isset($_GET['itemType']) && isset($_GET['itemSource']) && isset($_GET['checkShares'])) {
-				$reshare = OCP\Share::getItemSharedWithBySource($_GET['itemType'], $_GET['itemSource'], OCP\Share::FORMAT_NONE, null, true);
-				if ($_GET['checkShares'] == "true") {
+			if (isset($_GET['itemType']) && isset($_GET['itemSource']) && isset($_GET['checkReshare']) && isset($_GET['checkShares'])) {
+				if ($_GET['checkReshare'] == 'true') {
+					$reshare = OCP\Share::getItemSharedWithBySource($_GET['itemType'], $_GET['itemSource'], OCP\Share::FORMAT_NONE, null, true);
+				} else {
+					$reshare = false;
+				}
+				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 810a4e7c0a..b246849b47 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -32,6 +32,7 @@ OC.Share={
 	},
 	loadItem:function(itemType, itemSource) {
 		var data = '';
+		var checkReshare = true;
 		// Switch file sources to path to check if status is set
 		if (itemType == 'file' || itemType == 'folder') {
 			var filename = $('tr').filterAttr('data-id', String(itemSource)).data('file');
@@ -40,6 +41,9 @@ OC.Share={
 			} else {
 				var item = $('#dir').val() + '/' + filename;
 			}
+			if (item.substring(0, 8) != '/Shared/') {
+				checkReshare = false;
+			}
 		} else {
 			var item = itemSource;
 		}
@@ -48,7 +52,7 @@ OC.Share={
 		} else {
 			checkShares = true;
 		}
-		$.ajax({type: 'GET', url: OC.filePath('core', 'ajax', 'share.php'), data: { fetch: 'getItem', itemType: itemType, itemSource: itemSource, checkShares: checkShares }, async: false, success: function(result) {
+		$.ajax({type: 'GET', url: OC.filePath('core', 'ajax', 'share.php'), data: { fetch: 'getItem', itemType: itemType, itemSource: itemSource, checkReshare: checkReshare, checkShares: checkShares }, async: false, success: function(result) {
 			if (result && result.status === 'success') {
 				data = result.data;
 			} else {

From 7168fa4b05db038e24c649dad5a60cfe2230c476 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Fri, 24 Aug 2012 11:25:20 -0400
Subject: [PATCH 0888/1224] Add padding to the reshared text

---
 core/css/share.css | 3 ++-
 core/js/share.js   | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/core/css/share.css b/core/css/share.css
index a683a24a11..e4b4870dd1 100644
--- a/core/css/share.css
+++ b/core/css/share.css
@@ -2,10 +2,11 @@
  This file is licensed under the Affero General Public License version 3 or later.
  See the COPYING-README file. */
 
-#dropdown { display:block;  position:absolute; z-index:500; width:16em; right:0; margin-right:7em; background:#eee; padding:1em;
+#dropdown { display:block; position:absolute; z-index:500; width:19em; 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; }
+.reshare { padding-left:0.5em; }
 #shareWithList { padding:0.5em; list-style-type: none; }
 #shareWithList li { padding-top:0.1em; }
 #dropdown label { font-weight:normal; }
diff --git a/core/js/share.js b/core/js/share.js
index b246849b47..bd1fa14d3f 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -95,9 +95,9 @@ OC.Share={
 		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;
+				html += '<span class="reshare">Shared with you and the group '+data.reshare.share_with+' by '+data.reshare.uid_owner+'</span>';
 			} else {
-				html += 'Shared with you by '+data.reshare.uid_owner;
+				html += '<span class="reshare">Shared with you by '+data.reshare.uid_owner+'</span>';
 			}
 			html += '<br />';
 		}

From 0c4575db7a3de781231571e26e848441ec040f68 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Fri, 24 Aug 2012 15:11:33 -0400
Subject: [PATCH 0889/1224] Temporary fix to prevent rename action in root of
 Shared directory

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

diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js
index 39e848cec8..89e7bdd7ad 100644
--- a/apps/files/js/fileactions.js
+++ b/apps/files/js/fileactions.js
@@ -77,6 +77,10 @@ FileActions={
 		parent.children('a.name').append('<span class="fileactions" />');
 		var defaultAction=FileActions.getDefault(FileActions.getCurrentMimeType(),FileActions.getCurrentType(), FileActions.getCurrentPermissions());
 		for(name in actions){
+			// NOTE: Temporary fix to prevent rename action in root of Shared directory
+			if (name == 'Rename' && $('#dir').val() == '/Shared') {
+				continue;
+			}
 			if((name=='Download' || actions[name]!=defaultAction) && name!='Delete'){
 				var img=FileActions.icons[name];
 				if(img.call){

From d84b1adf34817b4b261db35e51f72ac78adf8e27 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Fri, 24 Aug 2012 15:32:06 -0400
Subject: [PATCH 0890/1224] Dynamically update shared status icon

---
 core/js/share.js | 39 ++++++++++++++++++++++++++++++++++++---
 1 file changed, 36 insertions(+), 3 deletions(-)

diff --git a/core/js/share.js b/core/js/share.js
index bd1fa14d3f..3db69dc690 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -30,6 +30,34 @@ OC.Share={
 			}
 		});
 	},
+	updateIcon:function(itemType, itemSource) {
+		if (itemType == 'file' || itemType == 'folder') {
+			var filename = $('tr').filterAttr('data-id', String(itemSource)).data('file');
+			if ($('#dir').val() == '/') {
+				itemSource = $('#dir').val() + filename;
+			} else {
+				itemSource = $('#dir').val() + '/' + filename;
+			}
+		}
+		var shares = false;
+		$.each(OC.Share.itemShares, function(index) {
+			if (OC.Share.itemShares[index].length > 0) {
+				shares = true;
+				return;
+			}
+		});
+		if (shares) {
+			$('a.share[data-item="'+itemSource+'"]').css('background', 'url('+OC.imagePath('core', 'actions/shared')+') no-repeat center');
+			if (typeof OC.Share.statuses[itemSource] === 'undefined') {
+				OC.Share.statuses[itemSource] = false;
+			}
+		} else {
+			if (itemType != 'file' && itemType != 'folder') {
+				$('a.share[data-item="'+itemSource+'"]').css('background', 'url('+OC.imagePath('core', 'actions/share')+') no-repeat center');
+			}
+			delete OC.Share.statuses[itemSource];
+		}
+	},
 	loadItem:function(itemType, itemSource) {
 		var data = '';
 		var checkReshare = true;
@@ -122,7 +150,6 @@ OC.Share={
 						OC.Share.showPrivateLink(item, share.share_with);
 					} else {
 						OC.Share.addShareWith(share.share_type, share.share_with, share.permissions, possiblePermissions);
-						
 					}
 				});
 			}
@@ -149,14 +176,17 @@ OC.Share={
 				event.preventDefault();
 			},
 			select: function(event, selected) {
+				var itemType = $('#dropdown').data('item-type');
+				var itemSource = $('#dropdown').data('item-source');
 				var shareType = selected.item.value.shareType;
 				var shareWith = selected.item.value.shareWith;
 				$(this).val(shareWith);
 				// Default permissions are Read and Share
 				var permissions = OC.Share.PERMISSION_READ | OC.Share.PERMISSION_SHARE;
-				OC.Share.share($('#dropdown').data('item-type'), $('#dropdown').data('item-source'), shareType, shareWith, permissions, function() {
+				OC.Share.share(itemType, itemSource, shareType, shareWith, permissions, function() {
 					OC.Share.addShareWith(shareType, shareWith, permissions, possiblePermissions);
 					$('#shareWith').val('');
+					OC.Share.updateIcon(itemType, itemSource);
 				});
 				return false;
 			}
@@ -327,12 +357,15 @@ $(document).ready(function() {
 
 	$('.unshare').live('click', function() {
 		var li = $(this).parent();
+		var itemType = $('#dropdown').data('item-type');
+		var itemSource = $('#dropdown').data('item-source');
 		var shareType = $(li).data('share-type');
 		var shareWith = $(li).data('share-with');
-		OC.Share.unshare($('#dropdown').data('item-type'), $('#dropdown').data('item-source'), shareType, shareWith, function() {
+		OC.Share.unshare(itemType, itemSource, shareType, shareWith, function() {
 			$(li).remove();
 			var index = OC.Share.itemShares[shareType].indexOf(shareWith);
 			OC.Share.itemShares[shareType].splice(index, 1);
+			OC.Share.updateIcon(itemType, itemSource);
 		});
 	});
 

From fa3497f6ed54b6de16dc44ae94721f00b5d5fc6b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= <jfd@butonic.de>
Date: Sat, 25 Aug 2012 01:52:27 +0200
Subject: [PATCH 0891/1224] add backticks to SQL, use limit parameter instead
 of LIMIT SQL

---
 apps/calendar/lib/import.php            |  6 +-
 apps/calendar/lib/repeat.php            | 22 +++----
 apps/calendar/lib/share.php             |  4 +-
 apps/calendar/lib/share/calendar.php    |  2 +-
 apps/calendar/lib/share_backend.php     |  2 +-
 apps/contacts/appinfo/migrate.php       |  8 +--
 apps/contacts/appinfo/update.php        |  8 +--
 apps/contacts/lib/share/addressbook.php |  2 +-
 apps/contacts/lib/vcard.php             |  2 +-
 apps/files/appinfo/update.php           | 12 ++--
 apps/files_sharing_log/index.php        |  2 +-
 apps/files_sharing_log/log.php          |  4 +-
 apps/gallery/appinfo/app.php            |  2 +-
 apps/gallery/appinfo/update.php         |  4 +-
 apps/gallery/lib/photo.php              |  6 +-
 apps/media/lib/share/artist.php         |  6 +-
 apps/media/lib/share/song.php           |  6 +-
 apps/user_ldap/appinfo/update.php       |  4 +-
 apps/user_ldap/lib/access.php           | 38 ++++++------
 apps/user_ldap/lib/jobs.php             | 16 ++---
 lib/backgroundjob/queuedtask.php        | 10 ++--
 lib/connector/sabre/directory.php       |  2 +-
 lib/db.php                              |  2 +-
 lib/filecache/cached.php                |  4 +-
 lib/public/share.php                    | 78 ++++++++++++-------------
 lib/subadmin.php                        | 18 +++---
 tests/lib/share/share.php               |  2 +-
 27 files changed, 135 insertions(+), 137 deletions(-)

diff --git a/apps/calendar/lib/import.php b/apps/calendar/lib/import.php
index 368f8406e7..2e3a729e0c 100644
--- a/apps/calendar/lib/import.php
+++ b/apps/calendar/lib/import.php
@@ -273,9 +273,9 @@ 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
-								 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 = ?');
+		$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){
diff --git a/apps/calendar/lib/repeat.php b/apps/calendar/lib/repeat.php
index b9fbee8fe0..27f1e0481a 100644
--- a/apps/calendar/lib/repeat.php
+++ b/apps/calendar/lib/repeat.php
@@ -16,7 +16,7 @@ class OC_Calendar_Repeat{
 	 * @return (array) 
 	 */
 	public static function get($id){
-		$stmt = OCP\DB::prepare('SELECT * FROM *PREFIX*calendar_repeat WHERE eventid = ?');
+		$stmt = OCP\DB::prepare('SELECT * FROM `*PREFIX*calendar_repeat` WHERE `eventid` = ?');
 		$result = $stmt->execute(array($id));
 		$return = array();
 		while($row = $result->fetchRow()){
@@ -32,9 +32,9 @@ 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 <= ?))');
+		$stmt = OCP\DB::prepare( 'SELECT * FROM `*PREFIX*calendar_repeat` WHERE `eventid` = ?'
+		.' AND ((`startdate` >= ? AND `startdate` <= ?)'
+		.' OR (`enddate` >= ? AND `enddate` <= ?))');
 		$result = $stmt->execute(array($id,
 					OC_Calendar_Object::getUTCforMDB($from), OC_Calendar_Object::getUTCforMDB($until),
 					OC_Calendar_Object::getUTCforMDB($from), OC_Calendar_Object::getUTCforMDB($until)));
@@ -50,7 +50,7 @@ class OC_Calendar_Repeat{
 	 * @return (array) 
 	 */
 	public static function getCalendar($id){
-		$stmt = OCP\DB::prepare('SELECT * FROM *PREFIX*calendar_repeat WHERE calid = ?');
+		$stmt = OCP\DB::prepare('SELECT * FROM `*PREFIX*calendar_repeat` WHERE `calid` = ?');
 		$result = $stmt->execute(array($id));
 		$return = array();
 		while($row = $result->fetchRow()){
@@ -66,9 +66,9 @@ class OC_Calendar_Repeat{
 	 * @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 <= ?))');
+		$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));
@@ -99,7 +99,7 @@ class OC_Calendar_Repeat{
 				continue;
 			}
 			$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 = 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']));
 		}
 		return true;
@@ -189,7 +189,7 @@ class OC_Calendar_Repeat{
 	 * @return (bool)
 	 */
 	public static function clean($id){
-		$stmt = OCP\DB::prepare('DELETE FROM *PREFIX*calendar_repeat WHERE eventid = ?');
+		$stmt = OCP\DB::prepare('DELETE FROM `*PREFIX*calendar_repeat` WHERE `eventid` = ?');
 		$stmt->execute(array($id));
 	}
 	/**
@@ -198,7 +198,7 @@ class OC_Calendar_Repeat{
 	 * @return (bool)
 	 */
 	public static function cleanCalendar($id){
-		$stmt = OCP\DB::prepare('DELETE FROM *PREFIX*calendar_repeat WHERE calid = ?');
+		$stmt = OCP\DB::prepare('DELETE FROM `*PREFIX*calendar_repeat` WHERE `calid` = ?');
 		$stmt->execute(array($id));
 	}
 }
\ No newline at end of file
diff --git a/apps/calendar/lib/share.php b/apps/calendar/lib/share.php
index 23892157fe..bad1082c33 100644
--- a/apps/calendar/lib/share.php
+++ b/apps/calendar/lib/share.php
@@ -226,9 +226,9 @@ class OC_Calendar_Share{
          * @return: mixed - bool if false, array with type and id if true
          */
         public static function getElementByToken($token){
-            $stmt_calendar = OCP\DB::prepare("SELECT * FROM `*PREFIX*calendar_share_" . OC_Calendar_Share::CALENDAR . "` WHERE `sharetype` = 'public' AND `share` = ?");
+            $stmt_calendar = OCP\DB::prepare('SELECT * FROM `*PREFIX*calendar_share_' . OC_Calendar_Share::CALENDAR . '` WHERE `sharetype` = \'public\' AND `share` = ?');
             $result_calendar = $stmt_calendar->execute(array($token));
-            $stmt_event = OCP\DB::prepare("SELECT * FROM `*PREFIX*calendar_share_" . OC_Calendar_Share::EVENT . "` WHERE `sharetype` = 'public' AND `share` = ?");
+            $stmt_event = OCP\DB::prepare('SELECT * FROM `*PREFIX*calendar_share_' . OC_Calendar_Share::EVENT . '` WHERE `sharetype` = \'public\' AND `share` = ?');
             $result_event = $stmt_event->execute(array($token));
             $return = array();
             if($result_calendar->numRows() == 0 && $result_event->numRows() == 0){
diff --git a/apps/calendar/lib/share/calendar.php b/apps/calendar/lib/share/calendar.php
index 7f49829241..bbc43fcca0 100644
--- a/apps/calendar/lib/share/calendar.php
+++ b/apps/calendar/lib/share/calendar.php
@@ -99,7 +99,7 @@ class OC_Share_Backend_Calendar implements OCP\Share_Backend_Collection {
 	}
 
 	public function getChildren($itemSource) {
-		$query = OCP\DB::prepare('SELECT id FROM *PREFIX*calendar_objects WHERE calendarid = ?');
+		$query = OCP\DB::prepare('SELECT `id` FROM `*PREFIX*calendar_objects` WHERE `calendarid` = ?');
 		$result = $query->execute(array($itemSource));
 		$sources = array();
 		while ($object = $result->fetchRow()) {
diff --git a/apps/calendar/lib/share_backend.php b/apps/calendar/lib/share_backend.php
index f937c0d1c3..1ea58ac270 100644
--- a/apps/calendar/lib/share_backend.php
+++ b/apps/calendar/lib/share_backend.php
@@ -22,7 +22,7 @@
 class OC_Share_Backend_Calendar extends OCP\Share_Backend {
 
 	public function getSource($item, $uid) {
-		$query = OCP\DB::prepare('SELECT id FROM *PREFIX*calendar_calendars WHERE userid = ? AND displayname = ? LIMIT 1');
+		$query = OCP\DB::prepare('SELECT `id` FROM `*PREFIX*calendar_calendars` WHERE `userid` = ? AND `displayname` = ?',1);
 		return $query->execute(array($uid, $item))->fetchAll();
 	}
 
diff --git a/apps/contacts/appinfo/migrate.php b/apps/contacts/appinfo/migrate.php
index 2559b4ea45..19c960c75a 100644
--- a/apps/contacts/appinfo/migrate.php
+++ b/apps/contacts/appinfo/migrate.php
@@ -34,12 +34,12 @@ class OC_Migration_Provider_Contacts extends OC_Migration_Provider{
 		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 ?" );
+				$query = $this->content->prepare( 'SELECT * FROM `contacts_addressbooks` WHERE `userid` LIKE ?' );
 				$results = $query->execute( array( $this->olduid ) );
 				$idmap = array();
 				while( $row = $results->fetchRow() ) {
 					// Import each addressbook	
-					$addressbookquery = OCP\DB::prepare( "INSERT INTO *PREFIX*contacts_addressbooks (`userid`, `displayname`, `uri`, `description`, `ctag`) VALUES (?, ?, ?, ?, ?)" );
+					$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('*PREFIX*contacts_addressbooks');
@@ -49,11 +49,11 @@ class OC_Migration_Provider_Contacts extends OC_Migration_Provider{
 				// Now tags
 				foreach($idmap as $oldid => $newid) {
 					
-					$query = $this->content->prepare( "SELECT * FROM contacts_cards WHERE addressbookid LIKE ?" );
+					$query = $this->content->prepare( 'SELECT * FROM `contacts_cards` WHERE `addressbookid` LIKE ?' );
 					$results = $query->execute( array( $oldid ) );
 					while( $row = $results->fetchRow() ){
 						// Import the contacts
-						$contactquery = OCP\DB::prepare( "INSERT INTO *PREFIX*contacts_cards (`addressbookid`, `fullname`, `carddata`, `uri`, `lastmodified`) VALUES (?, ?, ?, ?, ?)" );
+						$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'] ) );	
 					}		
 				}
diff --git a/apps/contacts/appinfo/update.php b/apps/contacts/appinfo/update.php
index 21e736bb44..cc00b325e1 100644
--- a/apps/contacts/appinfo/update.php
+++ b/apps/contacts/appinfo/update.php
@@ -3,15 +3,15 @@
 $installedVersion=OCP\Config::getAppValue('contacts', 'installed_version');
 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' );
+	$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\'' );
+	$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=?' );
+	$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) {
@@ -20,6 +20,6 @@ if (version_compare($installedVersion, '0.2.3', '<')) {
 	}
 	
 	// Remove the old preferences.
-	$stmt = OCP\DB::prepare( 'DELETE FROM *PREFIX*preferences WHERE appid=\'contacts\' AND configkey=\'openaddressbooks\'' );
+	$stmt = OCP\DB::prepare( 'DELETE FROM `*PREFIX*preferences` WHERE `appid`=\'contacts\' AND `configkey`=\'openaddressbooks\'' );
 	$result = $stmt->execute(array());
 }
diff --git a/apps/contacts/lib/share/addressbook.php b/apps/contacts/lib/share/addressbook.php
index d35f0ce9ae..acabeab2ad 100644
--- a/apps/contacts/lib/share/addressbook.php
+++ b/apps/contacts/lib/share/addressbook.php
@@ -82,7 +82,7 @@ class OC_Share_Backend_Addressbook implements OCP\Share_Backend_Collection {
 	}
 
 	public function getChildren($itemSource) {
-		$query = OCP\DB::prepare('SELECT id FROM *PREFIX*contacts_cards WHERE addressbookid = ?');
+		$query = OCP\DB::prepare('SELECT `id` FROM `*PREFIX*contacts_cards` WHERE `addressbookid` = ?');
 		$result = $query->execute(array($itemSource));
 		$sources = array();
 		while ($contact = $result->fetchRow()) {
diff --git a/apps/contacts/lib/vcard.php b/apps/contacts/lib/vcard.php
index fbb1c734f6..042ad1e990 100644
--- a/apps/contacts/lib/vcard.php
+++ b/apps/contacts/lib/vcard.php
@@ -512,7 +512,7 @@ class OC_Contacts_VCard {
 	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 = ?' );
+			$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;
diff --git a/apps/files/appinfo/update.php b/apps/files/appinfo/update.php
index 5514aed197..b2480a58f5 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 (update from OC4 to OC5)
-$installedVersion=OCP\Config::getAppValue('files', 'installed_version');
+$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 = 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"] ));
 	}
 }
 
diff --git a/apps/files_sharing_log/index.php b/apps/files_sharing_log/index.php
index ffacbdd860..8d05e3fbd0 100644
--- a/apps/files_sharing_log/index.php
+++ b/apps/files_sharing_log/index.php
@@ -13,7 +13,7 @@ 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 = ?');
+$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');
diff --git a/apps/files_sharing_log/log.php b/apps/files_sharing_log/log.php
index e6a12b9fb1..a032d635ac 100644
--- a/apps/files_sharing_log/log.php
+++ b/apps/files_sharing_log/log.php
@@ -23,11 +23,11 @@ class OC_Files_Sharing_Log {
 	}
 
 	static public function log($target, $source, $mode) {
-		$query = OCP\DB::prepare("SELECT * FROM *PREFIX*sharing WHERE source = ? AND target = ?");
+		$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 = 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/gallery/appinfo/app.php b/apps/gallery/appinfo/app.php
index 9103f66441..f26f23466b 100644
--- a/apps/gallery/appinfo/app.php
+++ b/apps/gallery/appinfo/app.php
@@ -43,7 +43,7 @@ OCP\App::addNavigationEntry( array(
 
 class OC_GallerySearchProvider extends OC_Search_Provider{
 	function search($query){
-		$stmt = OCP\DB::prepare('SELECT * FROM *PREFIX*gallery_albums WHERE uid_owner = ? AND album_name LIKE ?');
+		$stmt = OCP\DB::prepare('SELECT * FROM `*PREFIX*gallery_albums` WHERE `uid_owner` = ? AND `album_name` LIKE ?');
 		$result = $stmt->execute(array(OCP\USER::getUser(),'%'.$query.'%'));
 		$results=array();
 		while($row=$result->fetchRow()){
diff --git a/apps/gallery/appinfo/update.php b/apps/gallery/appinfo/update.php
index c1d2212742..65e7734c47 100644
--- a/apps/gallery/appinfo/update.php
+++ b/apps/gallery/appinfo/update.php
@@ -2,9 +2,9 @@
 
 $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 = OCP\DB::prepare('DROP TABLE IF EXISTS `*PREFIX*gallery_photos`');
 	$stmt->execute();
-	$stmt = OCP\DB::prepare('DROP TABLE IF EXISTS *PREFIX*gallery_albums');
+	$stmt = OCP\DB::prepare('DROP TABLE IF EXISTS `*PREFIX*gallery_albums`');
 	$stmt->execute();
 
 	\OC_DB::createDbFromStructure(OC_App::getAppPath($appid).'/appinfo/database.xml');
diff --git a/apps/gallery/lib/photo.php b/apps/gallery/lib/photo.php
index f073ac9cbb..1d304ce435 100644
--- a/apps/gallery/lib/photo.php
+++ b/apps/gallery/lib/photo.php
@@ -52,17 +52,17 @@ class OC_Gallery_Photo {
 	}
 
 	public static function removeById($id) {
-		$stmt = OCP\DB::prepare('DELETE FROM *PREFIX*gallery_photos WHERE photo_id = ?');
+		$stmt = OCP\DB::prepare('DELETE FROM `*PREFIX*gallery_photos` WHERE `photo_id` = ?');
 		$stmt->execute(array($id));
 	}
 
 	public static function removeByAlbumId($albumid) {
-		$stmt = OCP\DB::prepare('DELETE FROM *PREFIX*gallery_photos WHERE album_id = ?');
+		$stmt = OCP\DB::prepare('DELETE FROM `*PREFIX*gallery_photos` WHERE `album_id` = ?');
 		$stmt->execute(array($albumid));
 	}
 
 	public static function changePath($oldAlbumId, $newAlbumId, $oldpath, $newpath) {
-		$stmt = OCP\DB::prepare("UPDATE *PREFIX*gallery_photos SET file_path = ?, album_id = ? WHERE album_id = ? and file_path = ?");
+		$stmt = OCP\DB::prepare('UPDATE `*PREFIX*gallery_photos` SET `file_path` = ?, `album_id` = ? WHERE `album_id` = ? AND `file_path` = ?');
 		$stmt->execute(array($newpath, $newAlbumId, $oldAlbumId, $oldpath));
 	}
 
diff --git a/apps/media/lib/share/artist.php b/apps/media/lib/share/artist.php
index 7218fa1a27..d08a53da2a 100644
--- a/apps/media/lib/share/artist.php
+++ b/apps/media/lib/share/artist.php
@@ -22,7 +22,7 @@
 class OC_Share_Backend_Artist extends OCP\Share_Backend {
 
 	public function getSource($item, $uid) {
-		$query = OCP\DB::prepare('SELECT artist_id FROM *PREFIX*media_artists WHERE artist_id = ? AND song_user = ?');
+		$query = OCP\DB::prepare('SELECT `artist_id` FROM `*PREFIX*media_artists` WHERE `artist_id` = ? AND `song_user` = ?');
 		$result = $query->execute(array($item, $uid))->fetchRow();
 		if (is_array($result)) {
 			return array('item' => $item, 'file' => $result['song_path']);
@@ -43,10 +43,10 @@ class OC_Share_Backend_Artist extends OCP\Share_Backend {
 		$ids = "'".implode("','", $ids)."'";
 		switch ($format) {
 			case self::FORMAT_SOURCE_PATH:
-				$query = OCP\DB::prepare('SELECT path FROM *PREFIX*fscache WHERE id IN ('.$ids.')');
+				$query = OCP\DB::prepare('SELECT `path` FROM `*PREFIX*fscache` WHERE `id` IN ('.$ids.')');
 				return $query->execute()->fetchAll();
 			case 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.')');
+				$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()) {
diff --git a/apps/media/lib/share/song.php b/apps/media/lib/share/song.php
index fc69975f35..6594858173 100644
--- a/apps/media/lib/share/song.php
+++ b/apps/media/lib/share/song.php
@@ -22,7 +22,7 @@
 class OC_Share_Backend_Song extends OCP\Share_Backend {
 
 	public function getSource($item, $uid) {
-		$query = OCP\DB::prepare('SELECT song_path FROM *PREFIX*media_songs WHERE song_id = ? AND song_user = ?');
+		$query = OCP\DB::prepare('SELECT `song_path` FROM `*PREFIX*media_songs` WHERE `song_id` = ? AND `song_user` = ?');
 		$result = $query->execute(array($item, $uid))->fetchRow();
 		if (is_array($result)) {
 			return array('item' => $item, 'file' => $result['song_path']);
@@ -43,10 +43,10 @@ class OC_Share_Backend_Song extends OCP\Share_Backend {
 		$ids = "'".implode("','", $ids)."'";
 		switch ($format) {
 			case self::FORMAT_SOURCE_PATH:
-				$query = OCP\DB::prepare('SELECT path FROM *PREFIX*fscache WHERE id IN ('.$ids.')');
+				$query = OCP\DB::prepare('SELECT `path` FROM `*PREFIX*fscache` WHERE `id` IN ('.$ids.')');
 				return $query->execute()->fetchAll();
 			case 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.')');
+				$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()) {
diff --git a/apps/user_ldap/appinfo/update.php b/apps/user_ldap/appinfo/update.php
index 9cf1814cf6..f06655c1dc 100644
--- a/apps/user_ldap/appinfo/update.php
+++ b/apps/user_ldap/appinfo/update.php
@@ -34,8 +34,8 @@ $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 = ?, directory_uuid = ? WHERE ldap_dn = ?';
+	$fetchDNSql = 'SELECT `ldap_dn` FROM `*PREFIX*ldap_'.$object.'_mapping`';
+	$updateSql = 'UPDATE `*PREFIX*ldap_'.$object.'_mapping` SET `ldap_DN` = ?, `directory_uuid` = ? WHERE `ldap_dn` = ?';
 
 	$query = OCP\DB::prepare($fetchDNSql);
 	$res = $query->execute();
diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php
index be9aa21c3d..ec3b526491 100644
--- a/apps/user_ldap/lib/access.php
+++ b/apps/user_ldap/lib/access.php
@@ -165,9 +165,9 @@ abstract class Access {
 		$table = $this->getMapTable($isUser);
 
 		$query = \OCP\DB::prepare('
-			SELECT ldap_dn
-			FROM '.$table.'
-			WHERE owncloud_name = ?
+			SELECT `ldap_dn`
+			FROM `'.$table.'`
+			WHERE `owncloud_name` = ?
 		');
 
 		$record = $query->execute(array($name))->fetchOne();
@@ -223,9 +223,9 @@ abstract class Access {
 		}
 
 		$query = \OCP\DB::prepare('
-			SELECT owncloud_name
-			FROM '.$table.'
-			WHERE ldap_dn = ?
+			SELECT `owncloud_name`
+			FROM `'.$table.'`
+			WHERE `ldap_dn` = ?
 		');
 
 		//let's try to retrieve the ownCloud name from the mappings table
@@ -238,16 +238,16 @@ abstract class Access {
 		$uuid = $this->getUUID($dn);
 		if($uuid) {
 			$query = \OCP\DB::prepare('
-				SELECT owncloud_name
-				FROM '.$table.'
-				WHERE directory_uuid = ?
+				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 = ?
+					UPDATE `'.$table.'`
+					SET `ldap_dn` = ?
+					WHERE `directory_uuid` = ?
 				');
 				$query->execute(array($dn, $uuid));
 				return $component;
@@ -385,8 +385,8 @@ abstract class Access {
 		$table = $this->getMapTable($isUsers);
 
 		$query = \OCP\DB::prepare('
-			SELECT ldap_dn, owncloud_name
-			FROM '. $table
+			SELECT `ldap_dn`, `owncloud_name`
+			FROM `'. $table . '`'
 		);
 
 		return $query->execute()->fetchAll();
@@ -408,18 +408,18 @@ abstract class Access {
 		$sqlAdjustment = '';
 		$dbtype = \OCP\Config::getSystemValue('dbtype');
 		if($dbtype == 'mysql') {
-			$sqlAdjustment = 'FROM dual';
+			$sqlAdjustment = 'FROM `dual`';
 		}
 
 		$insert = \OCP\DB::prepare('
-			INSERT INTO '.$table.' (ldap_dn, owncloud_name, directory_uuid)
+			INSERT INTO `'.$table.'` (`ldap_dn`, `owncloud_name`, `directory_uuid`)
 				SELECT ?,?,?
 				'.$sqlAdjustment.'
 				WHERE NOT EXISTS (
 					SELECT 1
-					FROM '.$table.'
-					WHERE ldap_dn = ?
-						OR owncloud_name = ?)
+					FROM `'.$table.'`
+					WHERE `ldap_dn` = ?
+						OR `owncloud_name` = ?)
 		');
 
 		//feed the DB
diff --git a/apps/user_ldap/lib/jobs.php b/apps/user_ldap/lib/jobs.php
index d478731b84..4224ee9d7e 100644
--- a/apps/user_ldap/lib/jobs.php
+++ b/apps/user_ldap/lib/jobs.php
@@ -64,9 +64,9 @@ class Jobs {
 	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 = ?
+			UPDATE `*PREFIX*ldap_group_members`
+			SET `owncloudusers` = ?
+			WHERE `owncloudname` = ?
 		');
 		foreach($groups as $group) {
 			//we assume, that self::$groupsFromDB has been retrieved already
@@ -94,7 +94,7 @@ class Jobs {
 		\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)
+			INTO `*PREFIX*ldap_group_members` (`owncloudname`, `owncloudusers`)
 			VALUES (?, ?)
 		');
 		foreach($createdGroups as $createdGroup) {
@@ -109,8 +109,8 @@ class Jobs {
 		\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 = ?
+			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);
@@ -143,8 +143,8 @@ class Jobs {
 			return self::$groupsFromDB;
 		}
 		$query = \OCP\DB::prepare('
-			SELECT owncloudname, owncloudusers
-			FROM *PREFIX*ldap_group_members
+			SELECT `owncloudname`, `owncloudusers`
+			FROM `*PREFIX*ldap_group_members`
 		');
 		$result = $query->execute()->fetchAll();
 		self::$groupsFromDB = array();
diff --git a/lib/backgroundjob/queuedtask.php b/lib/backgroundjob/queuedtask.php
index 68ba97c1e3..a7ec3efbf3 100644
--- a/lib/backgroundjob/queuedtask.php
+++ b/lib/backgroundjob/queuedtask.php
@@ -30,7 +30,7 @@ class OC_BackgroundJob_QueuedTask{
 	 * @return associative array
 	 */
 	public static function find( $id ){
-		$stmt = OC_DB::prepare( 'SELECT * FROM *PREFIX*queuedtasks WHERE id = ?' );
+		$stmt = OC_DB::prepare( 'SELECT * FROM `*PREFIX*queuedtasks` WHERE `id` = ?' );
 		$result = $stmt->execute(array($id));
 		return $result->fetchRow();
 	}
@@ -44,7 +44,7 @@ class OC_BackgroundJob_QueuedTask{
 		$return = array();
 
 		// Get Data
-		$stmt = OC_DB::prepare( 'SELECT * FROM *PREFIX*queuedtasks' );
+		$stmt = OC_DB::prepare( 'SELECT * FROM `*PREFIX*queuedtasks`' );
 		$result = $stmt->execute(array());
 		while( $row = $result->fetchRow()){
 			$return[] = $row;
@@ -63,7 +63,7 @@ class OC_BackgroundJob_QueuedTask{
 		$return = array();
 
 		// Get Data
-		$stmt = OC_DB::prepare( 'SELECT * FROM *PREFIX*queuedtasks WHERE app = ?' );
+		$stmt = OC_DB::prepare( 'SELECT * FROM `*PREFIX*queuedtasks` WHERE `app` = ?' );
 		$result = $stmt->execute(array($app));
 		while( $row = $result->fetchRow()){
 			$return[] = $row;
@@ -82,7 +82,7 @@ class OC_BackgroundJob_QueuedTask{
 	 * @return id of task
 	 */
 	public static function add( $app, $klass, $method, $parameters ){
-		$stmt = OC_DB::prepare( 'INSERT INTO *PREFIX*queuedtasks (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 ));
 
 		return OC_DB::insertid();
@@ -96,7 +96,7 @@ class OC_BackgroundJob_QueuedTask{
 	 * Deletes a report
 	 */
 	public static function delete( $id ){
-		$stmt = OC_DB::prepare( 'DELETE FROM *PREFIX*queuedtasks WHERE id = ?' );
+		$stmt = OC_DB::prepare( 'DELETE FROM `*PREFIX*queuedtasks` WHERE `id` = ?' );
 		$result = $stmt->execute(array($id));
 
 		return true;
diff --git a/lib/connector/sabre/directory.php b/lib/connector/sabre/directory.php
index 09c65f19b8..cd3ed60292 100644
--- a/lib/connector/sabre/directory.php
+++ b/lib/connector/sabre/directory.php
@@ -121,7 +121,7 @@ class OC_Connector_Sabre_Directory extends OC_Connector_Sabre_Node implements Sa
 		$properties = array_fill_keys($paths, array());
 		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.')' );
+			$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()) {
diff --git a/lib/db.php b/lib/db.php
index 208e70f4c3..d67cebce58 100644
--- a/lib/db.php
+++ b/lib/db.php
@@ -263,7 +263,7 @@ class OC_DB {
 	 */
 	static public function prepare( $query , $limit=null, $offset=null ){
 		
-		if (!is_null($limit)) {
+		if (!is_null($limit) && limit != -1) {
 			if (self::$backend == self::BACKEND_MDB2) {
 				//MDB2 uses or emulates limits & offset internally
 				self::$MDB2->setLimit($limit, $offset);
diff --git a/lib/filecache/cached.php b/lib/filecache/cached.php
index 1e17666717..95cc0ac300 100644
--- a/lib/filecache/cached.php
+++ b/lib/filecache/cached.php
@@ -18,7 +18,7 @@ class OC_FileCache_Cached{
 			$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=?');
+		$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])){
@@ -58,7 +58,7 @@ class OC_FileCache_Cached{
 		if($parent==-1){
 			return array();
 		}
-		$query=OC_DB::prepare('SELECT id,path,name,ctime,mtime,mimetype,size,encrypted,versioned,writable FROM *PREFIX*fscache WHERE parent=? AND (mimetype LIKE ? OR mimetype = ?)');
+		$query=OC_DB::prepare('SELECT `id`,`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;
diff --git a/lib/public/share.php b/lib/public/share.php
index c894b31763..93820760d1 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -307,7 +307,7 @@ class Share {
 		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');
+				$query = \OC_DB::prepare('SELECT `permissions` FROM `*PREFIX*share` WHERE `id` = ?',1);
 				$result = $query->execute(array($item['parent']))->fetchRow();
 				if (~(int)$result['permissions'] & $permissions) {
 					$message = 'Setting permissions for '.$itemSource.' failed, because the permissions exceed permissions granted to '.\OC_User::getUser();
@@ -315,7 +315,7 @@ class Share {
 					throw new \Exception($message);
 				}
 			}
-			$query = \OC_DB::prepare('UPDATE *PREFIX*share 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 removed
 			if ($item['permissions'] & ~$permissions) {
@@ -327,7 +327,7 @@ class Share {
 					$parents = array($item['id']);
 					while (!empty($parents)) {
 						$parents = "'".implode("','", $parents)."'";
-						$query = \OC_DB::prepare('SELECT id, permissions FROM *PREFIX*share WHERE parent IN ('.$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();
@@ -343,7 +343,7 @@ class Share {
 					// 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 = \OC_DB::prepare('UPDATE `*PREFIX*share` SET `permissions` = `permissions` & ? WHERE `id` IN ('.$ids.')');
 						$query->execute(array($permissions));
 					}
 				}
@@ -424,9 +424,9 @@ class Share {
 		// Get filesystem root to add it to the file target and remove from the file source, match file_source with the file cache
 		if ($itemType == 'file' || $itemType == 'folder') {
 			$root = \OC_Filesystem::getRoot();
-			$where = 'INNER JOIN *PREFIX*fscache ON file_source = *PREFIX*fscache.id ';
+			$where = 'INNER JOIN `*PREFIX*fscache` ON `file_source` = `*PREFIX*fscache`.`id`';
 			if (!isset($item)) {
-				$where .= 'WHERE file_target IS NOT NULL';
+				$where .= ' WHERE `file_target` IS NOT NULL';
 			}
 			$fileDependent = true;
 			$queryArgs = array();
@@ -437,39 +437,39 @@ class Share {
 				// 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."')";
+				$where = ' WHERE `item_type` IN ('.$placeholders.')';
 				$queryArgs = $itemTypes;
 			} else {
-				$where = 'WHERE item_type = ?';
+				$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 (?,?,?)';
+				$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.")";
+				$where .= ' AND `share_with` IN ('.$placeholders.')';
 				$queryArgs = array_merge($queryArgs, $userAndGroups);
 				// Don't include own group shares
-				$where .= ' AND uid_owner != ?';
+				$where .= ' AND `uid_owner` != ?';
 				$queryArgs[] = $shareWith;
 			} else {
-				$where .= ' AND share_type = ? AND share_with = ?';
+				$where .= ' AND `share_type` = ? AND `share_with` = ?';
 				$queryArgs[] = $shareType;
 				$queryArgs[] = $shareWith;
 			}
 		}
 		if (isset($uidOwner)) {
-			$where .= " AND uid_owner = ?";
+			$where .= ' AND `uid_owner` = ?';
 			$queryArgs[] = $uidOwner;
 			if (!isset($shareType)) {
 				// Prevent unique user targets for group shares from being selected
-				$where .= " AND share_type != ?";
+				$where .= ' AND `share_type` != ?';
 				$queryArgs[] = self::$shareTypeGroupUserUnique;
 			}
 			if ($itemType == 'file' || $itemType == 'folder') {
@@ -489,17 +489,17 @@ class Share {
 			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 file_source = ?';
+					$where .= ' AND `file_source` = ?';
 					$column = 'file_source';
 				} else {
-					$where .= " AND item_source = ?";
+					$where .= ' AND `item_source` = ?';
 					$column = 'item_source';
 				}
 			} else {
 				if ($itemType == 'file' || $itemType == 'folder') {
-					$where .= " AND file_target = ?";
+					$where .= ' AND `file_target` = ?';
 				} else {
-					$where .= " AND item_target = ?";
+					$where .= ' AND `item_target` = ?';
 				}
 			}
 			$queryArgs[] = $item;
@@ -514,35 +514,33 @@ class Share {
 			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 .= ' ORDER BY `*PREFIX*share`.`id` DESC';
 			}
 			// The limit must be at least 3, because filtering needs to be done
 			if ($limit < 3) {
-				$where .= ' LIMIT 3';
-			} else {
-				$where .= ' LIMIT '.$limit;
+				$limit = 3;
 			}
 		}
 		// TODO Optimize selects
 		if ($format == self::FORMAT_STATUSES) {
 			if ($itemType == 'file' || $itemType == 'folder') {
-				$select = '*PREFIX*share.id, item_type, *PREFIX*share.parent, share_type, file_source, path';
+				$select = '`*PREFIX*share`.`id`, `item_type`, `*PREFIX*share`.`parent`, `share_type`, `file_source`, `path`';
 			} else {
-				$select = 'id, item_type, item_source, parent, share_type';
+				$select = '`id`, `item_type`, `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, share_with, file_source, path, permissions, stime';
+					$select = '`*PREFIX*share`.`id`, `item_type`, `*PREFIX*share`.`parent`, `share_type`, `share_with`, `file_source`, `path`, `permissions`, `stime`';
 				} else {
-					$select = 'id, item_type, item_source, parent, share_type, share_with, permissions, stime, file_source';
+					$select = '`id`, `item_type`, `item_source`, `parent`, `share_type`, `share_with`, `permissions`, `stime`, `file_source`';
 				}
 			} else {
 				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, file_source, path, file_target, permissions, name, ctime, mtime, mimetype, size, encrypted, versioned, writable';
+						$select = '`*PREFIX*share`.`id`, `item_type`, `*PREFIX*share`.`parent`, `share_type`, `share_with`, `file_source`, `path`, `file_target`, `permissions`, `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, uid_owner, file_source, path, file_target, permissions, stime';
+						$select = '`*PREFIX*share`.`id`, `item_type`, `item_source`, `item_target`, `*PREFIX*share`.`parent`, `share_type`, `share_with`, `uid_owner`, `file_source`, `path`, `file_target`, `permissions`, `stime`';
 					}
 				} else {
 					$select = '*';
@@ -550,7 +548,7 @@ class Share {
 			}
 		}
 		$root = strlen($root);
-		$query = \OC_DB::prepare('SELECT '.$select.' FROM *PREFIX*share '.$where);
+		$query = \OC_DB::prepare('SELECT '.$select.' FROM `*PREFIX*share` '.$where, $limit);
 		$result = $query->execute($queryArgs);
 		$items = array();
 		$targets = array();
@@ -729,7 +727,7 @@ class Share {
 				$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 (?,?,?,?,?,?,?,?,?,?,?)');
+		$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)) {
@@ -871,10 +869,10 @@ class Share {
 					}
 					// Find similar targets to improve backend's chances to generate a unqiue 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 ?");
+						$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 ?");
+						$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()) {
@@ -903,10 +901,10 @@ class Share {
 			$parents = "'".implode("','", $parents)."'";
 			// 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 = ?');
+				$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_target, 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
@@ -914,12 +912,12 @@ 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_target = ? AND share_type IN (?,?,?) AND share_with IN ('".implode("','", $userAndGroups)."') AND uid_owner != ? AND id != ?");
+				$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) {
-						$query = \OC_DB::prepare('UPDATE *PREFIX*share SET parent = ? WHERE id = ?');
+						$query = \OC_DB::prepare('UPDATE `*PREFIX*share` SET `parent` = ? WHERE `id` = ?');
 						$query->execute(array($duplicateParent['id'], $item['id']));
 						continue;
 					}
@@ -933,7 +931,7 @@ class Share {
 		}
 		if (!empty($ids)) {
 			$ids = "'".implode("','", $ids)."'";
-			$query = \OC_DB::prepare('DELETE FROM *PREFIX*share WHERE id IN ('.$ids.')');
+			$query = \OC_DB::prepare('DELETE FROM `*PREFIX*share` WHERE `id` IN ('.$ids.')');
 			$query->execute();
 		}
 	}
@@ -944,10 +942,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 share_with = ? AND share_type = ? OR share_type = ?');
+		$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 = ?');
+		$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']);
@@ -960,7 +958,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 = ?)');
+		$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) {
diff --git a/lib/subadmin.php b/lib/subadmin.php
index 0806f27a6b..8d4f413b10 100644
--- a/lib/subadmin.php
+++ b/lib/subadmin.php
@@ -37,7 +37,7 @@ class OC_SubAdmin{
 	 * @return boolean
 	 */
 	public static function createSubAdmin($uid, $gid){
-		$stmt = OC_DB::prepare('INSERT INTO *PREFIX*group_admin (gid,uid) VALUES(?,?)');
+		$stmt = OC_DB::prepare('INSERT INTO `*PREFIX*group_admin` (`gid`,`uid`) VALUES(?,?)');
 		$result = $stmt->execute(array($gid, $uid));
 		OC_Hook::emit( "OC_SubAdmin", "post_createSubAdmin", array( "gid" => $gid ));
 		return true;
@@ -50,7 +50,7 @@ class OC_SubAdmin{
 	 * @return boolean
 	 */
 	public static function deleteSubAdmin($uid, $gid){
-		$stmt = OC_DB::prepare('DELETE FROM *PREFIX*group_admin WHERE gid = ? AND uid = ?');
+		$stmt = OC_DB::prepare('DELETE FROM `*PREFIX*group_admin` WHERE `gid` = ? AND `uid` = ?');
 		$result = $stmt->execute(array($gid, $uid));
 		OC_Hook::emit( "OC_SubAdmin", "post_deleteSubAdmin", array( "gid" => $gid ));
 		return true;
@@ -62,7 +62,7 @@ class OC_SubAdmin{
 	 * @return array
 	 */
 	public static function getSubAdminsGroups($uid){
-		$stmt = OC_DB::prepare('SELECT gid FROM *PREFIX*group_admin WHERE uid = ?');
+		$stmt = OC_DB::prepare('SELECT `gid` FROM `*PREFIX*group_admin` WHERE `uid` = ?');
 		$result = $stmt->execute(array($uid));
 		$gids = array();
 		while($row = $result->fetchRow()){
@@ -77,7 +77,7 @@ class OC_SubAdmin{
 	 * @return array
 	 */
 	public static function getGroupsSubAdmins($gid){
-		$stmt = OC_DB::prepare('SELECT uid FROM *PREFIX*group_admin WHERE gid = ?');
+		$stmt = OC_DB::prepare('SELECT `uid` FROM `*PREFIX*group_admin` WHERE `gid` = ?');
 		$result = $stmt->execute(array($gid));
 		$uids = array();
 		while($row = $result->fetchRow()){
@@ -91,7 +91,7 @@ class OC_SubAdmin{
 	 * @return array
 	 */
 	public static function getAllSubAdmins(){
-		$stmt = OC_DB::prepare('SELECT * FROM *PREFIX*group_admin');
+		$stmt = OC_DB::prepare('SELECT * FROM `*PREFIX*group_admin`');
 		$result = $stmt->execute();
 		$subadmins = array();
 		while($row = $result->fetchRow()){
@@ -107,7 +107,7 @@ class OC_SubAdmin{
 	 * @return bool
 	 */
 	public static function isSubAdminofGroup($uid, $gid){
-		$stmt = OC_DB::prepare('SELECT COUNT(*) as count FROM *PREFIX*group_admin where uid = ? AND 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){
@@ -122,7 +122,7 @@ class OC_SubAdmin{
 	 * @return bool
 	 */
 	public static function isSubAdmin($uid){
-		$stmt = OC_DB::prepare('SELECT COUNT(*) as count FROM *PREFIX*group_admin WHERE 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){
@@ -163,7 +163,7 @@ class OC_SubAdmin{
 	 * @return boolean
 	 */
 	public static function post_deleteUser($parameters){
-		$stmt = OC_DB::prepare('DELETE FROM *PREFIX*group_admin WHERE uid = ?');
+		$stmt = OC_DB::prepare('DELETE FROM `*PREFIX*group_admin` WHERE `uid` = ?');
 		$result = $stmt->execute(array($parameters['uid']));
 		return true;
 	}
@@ -174,7 +174,7 @@ class OC_SubAdmin{
 	 * @return boolean
 	 */
 	public static function post_deleteGroup($parameters){
-		$stmt = OC_DB::prepare('DELETE FROM *PREFIX*group_admin WHERE gid = ?');
+		$stmt = OC_DB::prepare('DELETE FROM `*PREFIX*group_admin` WHERE `gid` = ?');
 		$result = $stmt->execute(array($parameters['gid']));
 		return true;
 	}
diff --git a/tests/lib/share/share.php b/tests/lib/share/share.php
index 785591829d..303790b486 100644
--- a/tests/lib/share/share.php
+++ b/tests/lib/share/share.php
@@ -57,7 +57,7 @@ class Test_Share extends UnitTestCase {
 	}
 
 	public function tearDown() {
-		$query = OC_DB::prepare('DELETE FROM *PREFIX*share WHERE item_type = ?');
+		$query = OC_DB::prepare('DELETE FROM `*PREFIX*share` WHERE `item_type` = ?');
 		$query->execute(array('test'));
 	}
 

From f57d527a7ce10a0ed48e25d7e2432dae2ec9366a Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <thomas.mueller@tmit.eu>
Date: Sat, 25 Aug 2012 02:08:36 +0200
Subject: [PATCH 0892/1224] [tx-robot] updated from transifex

---
 apps/admin_dependencies_chk/l10n/ru.php   |  14 ++
 apps/admin_migrate/l10n/nl.php            |   5 +
 apps/admin_migrate/l10n/ru.php            |   5 +
 apps/bookmarks/l10n/nl.php                |  11 ++
 apps/bookmarks/l10n/ru.php                |  11 ++
 apps/bookmarks/l10n/zh_CN.php             |  12 ++
 apps/calendar/l10n/nl.php                 |  42 +++++
 apps/calendar/l10n/ru.php                 |  12 +-
 apps/contacts/l10n/ca.php                 |   5 +
 apps/contacts/l10n/cs_CZ.php              |  24 +++
 apps/contacts/l10n/de.php                 |   5 +
 apps/contacts/l10n/el.php                 |   5 +
 apps/contacts/l10n/fr.php                 |   7 +-
 apps/contacts/l10n/it.php                 |   5 +
 apps/contacts/l10n/ja_JP.php              |  25 ++-
 apps/contacts/l10n/nl.php                 | 105 ++++++++++-
 apps/contacts/l10n/ru.php                 |  12 ++
 apps/contacts/l10n/sl.php                 |   5 +
 apps/contacts/l10n/sv.php                 |   5 +
 apps/files/l10n/nl.php                    |   7 +
 apps/files/l10n/pt_BR.php                 |   7 +
 apps/files/l10n/ru.php                    |  18 +-
 apps/files/l10n/zh_CN.php                 |   1 +
 apps/files_encryption/l10n/nl.php         |   6 +
 apps/files_encryption/l10n/ru.php         |   6 +
 apps/files_external/l10n/ru.php           |  18 ++
 apps/files_sharing/l10n/nl.php            |   6 +
 apps/files_sharing/l10n/ru.php            |   6 +
 apps/files_versions/l10n/nl.php           |   4 +
 apps/files_versions/l10n/ru.php           |   4 +
 apps/gallery/l10n/nl.php                  |  13 +-
 apps/tasks/l10n/ru.php                    |  24 +++
 apps/user_ldap/l10n/ru.php                |  26 +++
 apps/user_migrate/l10n/ru.php             |  10 +
 apps/user_openid/l10n/nl.php              |  11 ++
 apps/user_openid/l10n/ru.php              |  11 ++
 l10n/ca/contacts.po                       |  18 +-
 l10n/cs_CZ/contacts.po                    |  58 +++---
 l10n/de/contacts.po                       |  18 +-
 l10n/el/contacts.po                       |  18 +-
 l10n/fr/contacts.po                       |  20 +-
 l10n/it/contacts.po                       |  18 +-
 l10n/ja_JP/contacts.po                    |  38 ++--
 l10n/nl/admin_migrate.po                  |  13 +-
 l10n/nl/bookmarks.po                      |  25 +--
 l10n/nl/calendar.po                       |  93 +++++-----
 l10n/nl/contacts.po                       | 215 +++++++++++-----------
 l10n/nl/files.po                          |  23 +--
 l10n/nl/files_encryption.po               |  15 +-
 l10n/nl/files_sharing.po                  |  15 +-
 l10n/nl/files_versions.po                 |  11 +-
 l10n/nl/gallery.po                        |  85 ++-------
 l10n/nl/lib.po                            |  73 ++++----
 l10n/nl/settings.po                       |  25 +--
 l10n/nl/user_openid.po                    |  25 +--
 l10n/pt_BR/files.po                       |  23 +--
 l10n/pt_BR/settings.po                    |  19 +-
 l10n/ru/admin_dependencies_chk.po         |  31 ++--
 l10n/ru/admin_migrate.po                  |  13 +-
 l10n/ru/bookmarks.po                      |  25 +--
 l10n/ru/calendar.po                       |  20 +-
 l10n/ru/contacts.po                       |  32 ++--
 l10n/ru/files.po                          |  24 +--
 l10n/ru/files_encryption.po               |  15 +-
 l10n/ru/files_external.po                 |  39 ++--
 l10n/ru/files_sharing.po                  |  15 +-
 l10n/ru/files_versions.po                 |  11 +-
 l10n/ru/lib.po                            |  73 ++++----
 l10n/ru/tasks.po                          |  51 ++---
 l10n/ru/user_ldap.po                      |  56 +++---
 l10n/ru/user_migrate.po                   |  23 +--
 l10n/ru/user_openid.po                    |  25 +--
 l10n/sl/contacts.po                       |  18 +-
 l10n/sv/contacts.po                       |  18 +-
 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               |   4 +-
 l10n/templates/core.pot                   |   2 +-
 l10n/templates/files.pot                  |   4 +-
 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/bookmarks.po                   |  27 +--
 l10n/zh_CN/files.po                       |  11 +-
 l10n/zh_TW/settings.po                    |   9 +-
 lib/l10n/nl.php                           |  25 +++
 lib/l10n/ru.php                           |  25 +++
 settings/l10n/nl.php                      |   9 +
 settings/l10n/pt_BR.php                   |   6 +
 settings/l10n/zh_TW.php                   |   2 +-
 101 files changed, 1224 insertions(+), 764 deletions(-)
 create mode 100644 apps/admin_dependencies_chk/l10n/ru.php
 create mode 100644 apps/admin_migrate/l10n/nl.php
 create mode 100644 apps/admin_migrate/l10n/ru.php
 create mode 100644 apps/bookmarks/l10n/nl.php
 create mode 100644 apps/bookmarks/l10n/ru.php
 create mode 100644 apps/bookmarks/l10n/zh_CN.php
 create mode 100644 apps/files_encryption/l10n/nl.php
 create mode 100644 apps/files_encryption/l10n/ru.php
 create mode 100644 apps/files_external/l10n/ru.php
 create mode 100644 apps/files_sharing/l10n/nl.php
 create mode 100644 apps/files_sharing/l10n/ru.php
 create mode 100644 apps/files_versions/l10n/nl.php
 create mode 100644 apps/files_versions/l10n/ru.php
 create mode 100644 apps/tasks/l10n/ru.php
 create mode 100644 apps/user_ldap/l10n/ru.php
 create mode 100644 apps/user_migrate/l10n/ru.php
 create mode 100644 apps/user_openid/l10n/nl.php
 create mode 100644 apps/user_openid/l10n/ru.php
 create mode 100644 lib/l10n/nl.php
 create mode 100644 lib/l10n/ru.php

diff --git a/apps/admin_dependencies_chk/l10n/ru.php b/apps/admin_dependencies_chk/l10n/ru.php
new file mode 100644
index 0000000000..58e699cb48
--- /dev/null
+++ b/apps/admin_dependencies_chk/l10n/ru.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" => "Директива allow_url_fopen в файле php.ini должна быть установлена в 1 для получения базы знаний с серверов OCS",
+"The php-pdo module is needed to store owncloud data into a database." => "Модуль php-pdo необходим для хранения данных ownСloud в базе данных.",
+"Dependencies status" => "Статус зависимостей",
+"Used by :" => "Используется:"
+);
diff --git a/apps/admin_migrate/l10n/nl.php b/apps/admin_migrate/l10n/nl.php
new file mode 100644
index 0000000000..d1a7372c10
--- /dev/null
+++ b/apps/admin_migrate/l10n/nl.php
@@ -0,0 +1,5 @@
+<?php $TRANSLATIONS = array(
+"Export this ownCloud instance" => "Exporteer deze ownCloud instantie",
+"This will create a compressed file that contains the data of this owncloud instance.\n            Please choose the export type:" => "Dit maakt een gecomprimeerd bestand, met de inhoud van deze ownCloud instantie.  Kies het export type:",
+"Export" => "Exporteer"
+);
diff --git a/apps/admin_migrate/l10n/ru.php b/apps/admin_migrate/l10n/ru.php
new file mode 100644
index 0000000000..c862657580
--- /dev/null
+++ b/apps/admin_migrate/l10n/ru.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/nl.php b/apps/bookmarks/l10n/nl.php
new file mode 100644
index 0000000000..e5e0894b51
--- /dev/null
+++ b/apps/bookmarks/l10n/nl.php
@@ -0,0 +1,11 @@
+<?php $TRANSLATIONS = array(
+"Bookmarks" => "Bladwijzers",
+"unnamed" => "geen naam",
+"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Sleep dit naar uw browser bladwijzers en klik erop, wanneer u een webpagina snel wilt voorzien van een bladwijzer:",
+"Read later" => "Lees later",
+"Address" => "Adres",
+"Title" => "Titel",
+"Tags" => "Tags",
+"Save bookmark" => "Bewaar bookmark",
+"You have no bookmarks" => "U heeft geen bookmarks"
+);
diff --git a/apps/bookmarks/l10n/ru.php b/apps/bookmarks/l10n/ru.php
new file mode 100644
index 0000000000..3abc089e3f
--- /dev/null
+++ b/apps/bookmarks/l10n/ru.php
@@ -0,0 +1,11 @@
+<?php $TRANSLATIONS = array(
+"Bookmarks" => "Закладки",
+"unnamed" => "без имени",
+"Read later" => "Прочитать позже",
+"Address" => "Адрес",
+"Title" => "Заголовок",
+"Tags" => "Метки",
+"Save bookmark" => "Сохранить закладки",
+"You have no bookmarks" => "У вас нет закладок",
+"Bookmarklet <br />" => "Букмарклет <br />"
+);
diff --git a/apps/bookmarks/l10n/zh_CN.php b/apps/bookmarks/l10n/zh_CN.php
new file mode 100644
index 0000000000..0510738c97
--- /dev/null
+++ b/apps/bookmarks/l10n/zh_CN.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 />" => "书签应用"
+);
diff --git a/apps/calendar/l10n/nl.php b/apps/calendar/l10n/nl.php
index 834c0ad905..bc0954abe2 100644
--- a/apps/calendar/l10n/nl.php
+++ b/apps/calendar/l10n/nl.php
@@ -1,7 +1,13 @@
 <?php $TRANSLATIONS = array(
+"Not all calendars are completely cached" => "Niet alle agenda's zijn volledig gecached",
+"Everything seems to be completely cached" => "Alles lijkt volledig gecached te zijn",
 "No calendars found." => "Geen kalenders gevonden.",
 "No events found." => "Geen gebeurtenissen gevonden.",
 "Wrong calendar" => "Verkeerde kalender",
+"The file contained either no events or all events are already saved in your calendar." => "Het bestand bevat geen gebeurtenissen of alle gebeurtenissen worden al in uw agenda bewaard.",
+"events has been saved in the new calendar" => "De gebeurtenissen worden in de nieuwe agenda bewaard",
+"Import failed" => "import is gefaald",
+"events has been saved in your calendar" => "de gebeurtenissen zijn in uw agenda opgeslagen ",
 "New Timezone:" => "Nieuwe tijdszone:",
 "Timezone changed" => "Tijdzone is veranderd",
 "Invalid request" => "Ongeldige aanvraag",
@@ -27,6 +33,7 @@
 "Projects" => "Projecten",
 "Questions" => "Vragen",
 "Work" => "Werk",
+"by" => "door",
 "unnamed" => "onbekend",
 "New Calendar" => "Nieuwe Kalender",
 "Does not repeat" => "Wordt niet herhaald",
@@ -73,6 +80,25 @@
 "by day and month" => "per dag en maand",
 "Date" => "Datum",
 "Cal." => "Cal.",
+"Sun." => "Zon.",
+"Mon." => "Maa.",
+"Tue." => "Din.",
+"Wed." => "Woe.",
+"Thu." => "Don.",
+"Fri." => "Vrij.",
+"Sat." => "Zat.",
+"Jan." => "Jan.",
+"Feb." => "Feb.",
+"Mar." => "Maa.",
+"Apr." => "Apr.",
+"May." => "Mei.",
+"Jun." => "Jun.",
+"Jul." => "Jul.",
+"Aug." => "Aug.",
+"Sep." => "Sep.",
+"Oct." => "Okt.",
+"Nov." => "Nov.",
+"Dec." => "Dec.",
 "All day" => "Hele dag",
 "Missing fields" => "missende velden",
 "Title" => "Titel",
@@ -86,6 +112,7 @@
 "Month" => "Maand",
 "List" => "Lijst",
 "Today" => "Vandaag",
+"Settings" => "Instellingen",
 "Your calendars" => "Je kalenders",
 "CalDav Link" => "CalDav Link",
 "Shared calendars" => "Gedeelde kalenders",
@@ -136,7 +163,10 @@
 "occurrences" => "gebeurtenissen",
 "create a new calendar" => "Maak een nieuw agenda",
 "Import a calendar file" => "Importeer een agenda bestand",
+"Please choose a calendar" => "Kies een agenda",
 "Name of new calendar" => "Naam van de nieuwe agenda",
+"Take an available name!" => "Kies een beschikbare naam!",
+"A Calendar with this name already exists. If you continue anyhow, these calendars will be merged." => "Een agenda met deze naam bestaat al.  Als u doorgaat, worden deze agenda's samengevoegd",
 "Import" => "Importeer",
 "Close Dialog" => "Sluit venster",
 "Create a new event" => "Maak een nieuwe afspraak",
@@ -144,9 +174,21 @@
 "No categories selected" => "Geen categorieën geselecteerd",
 "of" => "van",
 "at" => "op",
+"General" => "Algemeen",
 "Timezone" => "Tijdzone",
+"Update timezone automatically" => "Werk de tijdzone automatisch bij",
+"Time format" => "Tijd formaat",
 "24h" => "24uur",
 "12h" => "12uur",
+"Start week on" => "Begin de week op",
+"Cache" => "Cache",
+"Clear cache for repeating events" => "Leeg cache voor repeterende gebeurtenissen",
+"URLs" => "URLs",
+"Calendar CalDAV syncing addresses" => "Agenda CalDAV synchronisatie adres",
+"more info" => "meer informatie",
+"Primary address (Kontact et al)" => "Primary adres (voor Kontact en dergelijke)",
+"iOS/OS X" => "iOS/OS X",
+"Read only iCalendar link(s)" => "Alleen lezen iCalendar link(en)",
 "Users" => "Gebruikers",
 "select users" => "kies gebruikers",
 "Editable" => "Te wijzigen",
diff --git a/apps/calendar/l10n/ru.php b/apps/calendar/l10n/ru.php
index 612a1e2ae2..7535a2868b 100644
--- a/apps/calendar/l10n/ru.php
+++ b/apps/calendar/l10n/ru.php
@@ -22,7 +22,7 @@
 "Business" => "Бизнес",
 "Call" => "Звонить",
 "Clients" => "Клиенты",
-"Deliverer" => "Доставщик",
+"Deliverer" => "Посыльный",
 "Holidays" => "Праздники",
 "Ideas" => "Идеи",
 "Journey" => "Поездка",
@@ -115,13 +115,13 @@
 "Settings" => "Параметры",
 "Your calendars" => "Ваши календари",
 "CalDav Link" => "Ссылка для CalDav",
-"Shared calendars" => "Общие календари",
-"No shared calendars" => "Нет общих календарей",
-"Share Calendar" => "Сделать календарь общим",
+"Shared calendars" => "Опубликованные",
+"No shared calendars" => "Нет опубликованных календарей",
+"Share Calendar" => "Опубликовать",
 "Download" => "Скачать",
 "Edit" => "Редактировать",
 "Delete" => "Удалить",
-"shared with you by" => "с вами поделился",
+"shared with you by" => "опубликовал для вас",
 "New calendar" => "Новый календарь",
 "Edit calendar" => "Редактировать календарь",
 "Displayname" => "Отображаемое имя",
@@ -136,7 +136,7 @@
 "Repeating" => "Повторение",
 "Alarm" => "Сигнал",
 "Attendees" => "Участники",
-"Share" => "Поделиться",
+"Share" => "Опубликовать",
 "Title of the Event" => "Название событие",
 "Category" => "Категория",
 "Separate categories with commas" => "Разделяйте категории запятыми",
diff --git a/apps/contacts/l10n/ca.php b/apps/contacts/l10n/ca.php
index 2004d416b3..5a8b0e018c 100644
--- a/apps/contacts/l10n/ca.php
+++ b/apps/contacts/l10n/ca.php
@@ -52,6 +52,9 @@
 "Not implemented" => "No implementada",
 "Couldn't get a valid address." => "No s'ha pogut obtenir una adreça vàlida.",
 "Error" => "Error",
+"You do not have permission to add contacts to " => "No teniu permisos per afegir contactes a ",
+"Please select one of your own address books." => "Seleccioneu una de les vostres llibretes d'adreces",
+"Permission error" => "Error de permisos",
 "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",
@@ -107,6 +110,8 @@
 "Questions" => "Preguntes",
 "{name}'s Birthday" => "Aniversari de {name}",
 "Contact" => "Contacte",
+"You do not have the permissions to edit this contact." => "No teniu permisos per editar aquest contacte",
+"You do not have the permissions to delete this contact." => "No teniu permisos per esborrar aquest contacte",
 "Add Contact" => "Afegeix un contacte",
 "Import" => "Importa",
 "Settings" => "Configuració",
diff --git a/apps/contacts/l10n/cs_CZ.php b/apps/contacts/l10n/cs_CZ.php
index 966743a13f..cae9ae0c40 100644
--- a/apps/contacts/l10n/cs_CZ.php
+++ b/apps/contacts/l10n/cs_CZ.php
@@ -14,6 +14,8 @@
 "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: ",
+"Missing IM parameter." => "Chybějící parametr IM",
+"Unknown IM: " => "Neznámý IM:",
 "Information about vCard is incorrect. Please reload the page." => "Informace o vCard je nesprávná. Obnovte stránku, prosím.",
 "Missing ID" => "Chybí ID",
 "Error parsing VCard for ID: \"" => "Chyba při parsování VCard pro ID: \"",
@@ -50,6 +52,9 @@
 "Not implemented" => "Neimplementováno",
 "Couldn't get a valid address." => "Nelze získat platnou adresu.",
 "Error" => "Chyba",
+"You do not have permission to add contacts to " => "Nemáte práva přidat kontakt do",
+"Please select one of your own address books." => "Prosím vyberte jeden z vašich adresářů",
+"Permission error" => "Chyba přístupových práv",
 "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",
@@ -59,6 +64,7 @@
 "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.",
+"Do you want to merge these address books?" => "Chcete spojit tyto adresáře?",
 "Result: " => "Výsledek: ",
 " imported, " => "importováno v pořádku,",
 " failed." => "neimportováno.",
@@ -66,6 +72,18 @@
 "Addressbook not found: " => "Adresář nenalezen:",
 "This is not your addressbook." => "Toto není Váš adresář.",
 "Contact could not be found." => "Kontakt nebyl nalezen.",
+"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" => "Pracovní",
 "Home" => "Domácí",
 "Other" => "Ostatní",
@@ -92,6 +110,8 @@
 "Questions" => "Dotazy",
 "{name}'s Birthday" => "Narozeniny {name}",
 "Contact" => "Kontakt",
+"You do not have the permissions to edit this contact." => "Nemáte práva editovat tento kontakt",
+"You do not have the permissions to delete this contact." => "Nemáte práva smazat tento kontakt",
 "Add Contact" => "Přidat kontakt",
 "Import" => "Import",
 "Settings" => "Nastavení",
@@ -134,12 +154,15 @@
 "Delete email address" => "Smazat e-mail",
 "Enter phone number" => "Zadat telefoní číslo",
 "Delete phone number" => "Smazat telefoní číslo",
+"Instant Messenger" => "Instant Messenger",
+"Delete IM" => "Smazat IM",
 "View on map" => "Zobrazit na mapě",
 "Edit address details" => "Upravit podrobnosti adresy",
 "Add notes here." => "Zde můžete připsat poznámky.",
 "Add field" => "Přidat políčko",
 "Phone" => "Telefon",
 "Email" => "Email",
+"Instant Messaging" => "Instant Messaging",
 "Address" => "Adresa",
 "Note" => "Poznámka",
 "Download contact" => "Stáhnout kontakt",
@@ -194,6 +217,7 @@
 "iOS/OS X" => "iOS/OS X",
 "Show CardDav link" => "Zobrazit odklaz CardDAV:",
 "Show read-only VCF link" => "Zobrazit odkaz VCF pouze pro čtení",
+"Share" => "Sdílet",
 "Download" => "Stažení",
 "Edit" => "Editovat",
 "New Address Book" => "Nový adresář",
diff --git a/apps/contacts/l10n/de.php b/apps/contacts/l10n/de.php
index ca65d26cec..c2e8884fc2 100644
--- a/apps/contacts/l10n/de.php
+++ b/apps/contacts/l10n/de.php
@@ -52,6 +52,9 @@
 "Not implemented" => "Nicht verfügbar",
 "Couldn't get a valid address." => "Konnte keine gültige Adresse abrufen.",
 "Error" => "Fehler",
+"You do not have permission to add contacts to " => "Sie besitzen nicht die erforderlichen Rechte, um Kontakte hinzuzufügen",
+"Please select one of your own address books." => "Bitte wählen Sie eines Ihrer Adressbücher aus.",
+"Permission error" => "Berechtigungsfehler",
 "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 melden Sie dies auf bugs.owncloud.org",
@@ -107,6 +110,8 @@
 "Questions" => "Fragen",
 "{name}'s Birthday" => "Geburtstag von {name}",
 "Contact" => "Kontakt",
+"You do not have the permissions to edit this contact." => "Sie besitzen nicht die erforderlichen Rechte, um diesen Kontakt zu bearbeiten.",
+"You do not have the permissions to delete this contact." => "Sie besitzen nicht die erforderlichen Rechte, um diesen Kontakte zu löschen.",
 "Add Contact" => "Kontakt hinzufügen",
 "Import" => "Importieren",
 "Settings" => "Einstellungen",
diff --git a/apps/contacts/l10n/el.php b/apps/contacts/l10n/el.php
index 638085f515..a50dd81e5d 100644
--- a/apps/contacts/l10n/el.php
+++ b/apps/contacts/l10n/el.php
@@ -52,6 +52,9 @@
 "Not implemented" => "Δεν έχει υλοποιηθεί",
 "Couldn't get a valid address." => "Αδυναμία λήψης έγκυρης διεύθυνσης",
 "Error" => "Σφάλμα",
+"You do not have permission to add contacts to " => "Δεν έχετε επαρκή δικαιώματα για προσθέσετε επαφές στο ",
+"Please select one of your own address books." => "Παρακαλούμε επιλέξτε ένα από τα δικάς σας βιβλία διευθύνσεων.",
+"Permission error" => "Σφάλμα δικαιωμάτων",
 "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",
@@ -107,6 +110,8 @@
 "Questions" => "Ερωτήσεις",
 "{name}'s Birthday" => "{name} έχει Γενέθλια",
 "Contact" => "Επαφή",
+"You do not have the permissions to edit this contact." => "Δεν διαθέτε επαρκή δικαιώματα για την επεξεργασία αυτής της επαφής.",
+"You do not have the permissions to delete this contact." => "Δεν διαθέτε επαρκή δικαιώματα για την διαγραφή αυτής της επαφής.",
 "Add Contact" => "Προσθήκη επαφής",
 "Import" => "Εισαγωγή",
 "Settings" => "Ρυθμίσεις",
diff --git a/apps/contacts/l10n/fr.php b/apps/contacts/l10n/fr.php
index 613871706d..787843f0f2 100644
--- a/apps/contacts/l10n/fr.php
+++ b/apps/contacts/l10n/fr.php
@@ -52,6 +52,9 @@
 "Not implemented" => "Pas encore implémenté",
 "Couldn't get a valid address." => "Impossible de trouver une adresse valide.",
 "Error" => "Erreur",
+"You do not have permission to add contacts to " => "Vous n'avez pas l'autorisation d'ajouter des contacts à",
+"Please select one of your own address books." => "Veuillez sélectionner l'un de vos carnets d'adresses.",
+"Permission error" => "Erreur de permission",
 "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",
@@ -82,7 +85,7 @@
 "QQ" => "QQ",
 "GaduGadu" => "GaduGadu",
 "Work" => "Travail",
-"Home" => "Maison",
+"Home" => "Domicile",
 "Other" => "Autre",
 "Mobile" => "Mobile",
 "Text" => "Texte",
@@ -107,6 +110,8 @@
 "Questions" => "Questions",
 "{name}'s Birthday" => "Anniversaire de {name}",
 "Contact" => "Contact",
+"You do not have the permissions to edit this contact." => "Vous n'avez pas l'autorisation de modifier ce contact.",
+"You do not have the permissions to delete this contact." => "Vous n'avez pas l'autorisation de supprimer ce contact.",
 "Add Contact" => "Ajouter un Contact",
 "Import" => "Importer",
 "Settings" => "Paramètres",
diff --git a/apps/contacts/l10n/it.php b/apps/contacts/l10n/it.php
index 99a793d74e..1f0e2e3955 100644
--- a/apps/contacts/l10n/it.php
+++ b/apps/contacts/l10n/it.php
@@ -52,6 +52,9 @@
 "Not implemented" => "Non implementata",
 "Couldn't get a valid address." => "Impossibile ottenere un indirizzo valido.",
 "Error" => "Errore",
+"You do not have permission to add contacts to " => "Non hai i permessi per aggiungere contatti a",
+"Please select one of your own address books." => "Seleziona una delle tue rubriche.",
+"Permission error" => "Errore relativo ai permessi",
 "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",
@@ -107,6 +110,8 @@
 "Questions" => "Domande",
 "{name}'s Birthday" => "Data di nascita di {name}",
 "Contact" => "Contatto",
+"You do not have the permissions to edit this contact." => "Non hai i permessi per modificare questo contatto.",
+"You do not have the permissions to delete this contact." => "Non hai i permessi per eliminare questo contatto.",
 "Add Contact" => "Aggiungi contatto",
 "Import" => "Importa",
 "Settings" => "Impostazioni",
diff --git a/apps/contacts/l10n/ja_JP.php b/apps/contacts/l10n/ja_JP.php
index 8a6cce37cc..9b5874d459 100644
--- a/apps/contacts/l10n/ja_JP.php
+++ b/apps/contacts/l10n/ja_JP.php
@@ -26,13 +26,13 @@
 "Error reading contact photo." => "連絡先写真の読み込みエラー。",
 "Error saving temporary file." => "一時ファイルの保存エラー。",
 "The loading photo is not valid." => "写真の読み込みは無効です。",
-"Contact ID is missing." => "コンタクトIDが見つかりません。",
+"Contact ID is missing." => "連絡先 IDが見つかりません。",
 "No photo path was submitted." => "写真のパスが登録されていません。",
 "File doesn't exist:" => "ファイルが存在しません:",
 "Error loading image." => "画像の読み込みエラー。",
-"Error getting contact object." => "コンタクトオブジェクトの取得エラー。",
+"Error getting contact object." => "連絡先オブジェクトの取得エラー。",
 "Error getting PHOTO property." => "写真属性の取得エラー。",
-"Error saving contact." => "コンタクトの保存エラー。",
+"Error saving contact." => "連絡先の保存エラー。",
 "Error resizing image" => "画像のリサイズエラー",
 "Error cropping image" => "画像の切り抜きエラー",
 "Error creating temporary image" => "一時画像の生成エラー",
@@ -52,6 +52,9 @@
 "Not implemented" => "未実装",
 "Couldn't get a valid address." => "有効なアドレスを取得できませんでした。",
 "Error" => "エラー",
+"You do not have permission to add contacts to " => "連絡先を追加する権限がありません",
+"Please select one of your own address books." => "アドレス帳を一つ選択してください",
+"Permission error" => "権限エラー",
 "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,7 @@
 "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." => "いくつかのコンタクトが削除とマークされていますが、まだ削除されていません。削除するまでお待ちください。",
+"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, " => " をインポート、 ",
@@ -107,6 +110,8 @@
 "Questions" => "質問",
 "{name}'s Birthday" => "{name}の誕生日",
 "Contact" => "連絡先",
+"You do not have the permissions to edit this contact." => "この連絡先を編集する権限がありません",
+"You do not have the permissions to delete this contact." => "この連絡先を削除する権限がありません",
 "Add Contact" => "連絡先の追加",
 "Import" => "インポート",
 "Settings" => "設定",
@@ -114,16 +119,16 @@
 "Close" => "閉じる",
 "Keyboard shortcuts" => "キーボードショートカット",
 "Navigation" => "ナビゲーション",
-"Next contact in list" => "リスト内の次のコンタクト",
-"Previous contact in list" => "リスト内の前のコンタクト",
+"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 contact" => "新しい連絡先を追加",
 "Add new addressbook" => "新しいアドレス帳を追加",
-"Delete current contact" => "現在のコンタクトを削除",
+"Delete current contact" => "現在の連絡先を削除",
 "Drop photo to upload" => "写真をドロップしてアップロード",
 "Delete current photo" => "現在の写真を削除",
 "Edit current photo" => "現在の写真を編集",
@@ -196,11 +201,11 @@
 "Esq." => "Esq.",
 "Jr." => "Jr.",
 "Sn." => "Sn.",
-"Import a contacts file" => "コンタクトファイルをインポート",
+"Import a contacts file" => "連絡先ファイルをインポート",
 "Please choose the addressbook" => "アドレス帳を選択してください",
 "create a new addressbook" => "新しいアドレス帳を作成",
 "Name of new addressbook" => "新しいアドレスブックの名前",
-"Importing contacts" => "コンタクトをインポート",
+"Importing contacts" => "連絡先をインポート",
 "You have no contacts in your addressbook." => "アドレス帳に連絡先が登録されていません。",
 "Add contact" => "連絡先を追加",
 "Select Address Books" => "アドレス帳を選択してください",
diff --git a/apps/contacts/l10n/nl.php b/apps/contacts/l10n/nl.php
index ff499e9249..7c85dd7ce9 100644
--- a/apps/contacts/l10n/nl.php
+++ b/apps/contacts/l10n/nl.php
@@ -10,9 +10,12 @@
 "No contacts found." => "Geen contracten gevonden",
 "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.",
+"Could not parse contact: " => "Kon het contact niet verwerken",
 "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: ",
+"Missing IM parameter." => "IM parameter ontbreekt",
+"Unknown IM: " => "Onbekende IM:",
 "Information about vCard is incorrect. Please reload the page." => "Informatie over de vCard is onjuist. Herlaad de pagina.",
 "Missing ID" => "Ontbrekend ID",
 "Error parsing VCard for ID: \"" => "Fout bij inlezen VCard voor ID: \"",
@@ -27,6 +30,13 @@
 "No photo path was submitted." => "Geen fotopad opgestuurd.",
 "File doesn't exist:" => "Bestand bestaat niet:",
 "Error loading image." => "Fout bij laden plaatje.",
+"Error getting contact object." => "Fout om contact object te verkrijgen",
+"Error getting PHOTO property." => "Fout om PHOTO eigenschap te verkrijgen",
+"Error saving contact." => "Fout om contact op te slaan",
+"Error resizing image" => "Fout tijdens aanpassen plaatje",
+"Error cropping image" => "Fout tijdens aanpassen plaatje",
+"Error creating temporary image" => "Fout om een tijdelijk plaatje te maken",
+"Error finding image: " => "Fout kan plaatje niet vinden:",
 "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",
@@ -34,11 +44,49 @@
 "The uploaded file was only partially uploaded" => "Het bestand is gedeeltelijk geüpload",
 "No file was uploaded" => "Er is geen bestand geüpload",
 "Missing a temporary folder" => "Er ontbreekt een tijdelijke map",
+"Couldn't save temporary image: " => "Kan tijdelijk plaatje niet op slaan:",
+"Couldn't load temporary image: " => "Kan tijdelijk plaatje niet op laden:",
+"No file was uploaded. Unknown error" => "Er was geen bestand geladen.  Onbekende fout",
 "Contacts" => "Contacten",
+"Sorry, this functionality has not been implemented yet" => "Sorry, deze functionaliteit is nog niet geïmplementeerd",
+"Not implemented" => "Niet geïmplementeerd",
+"Couldn't get a valid address." => "Kan geen geldig adres krijgen",
+"Error" => "Fout",
+"You do not have permission to add contacts to " => "U hebt geen permissie om contacten toe te voegen aan",
+"Please select one of your own address books." => "Selecteer één van uw eigen adresboeken",
+"Permission error" => "Permissie fout",
+"This property has to be non-empty." => "Dit veld mag niet leeg blijven",
+"Couldn't serialize elements." => "Kan de elementen niet serializen",
+"'deleteProperty' called without type argument. Please report at bugs.owncloud.org" => "'deleteProperty' aangeroepen zonder type argument. Rapporteer dit a.u.b. via http://bugs.owncloud.org",
+"Edit name" => "Pas naam aan",
+"No files selected for upload." => "Geen bestanden geselecteerd voor upload.",
+"The file you are trying to upload exceed the maximum size for file uploads on this server." => "Het bestand dat u probeert te uploaden overschrijdt de maximale bestand grootte voor bestand uploads voor deze server.",
+"Error loading profile picture." => "Fout profiel plaatje kan niet worden geladen.",
+"Select type" => "Selecteer type",
+"Some contacts are marked for deletion, but not deleted yet. Please wait for them to be deleted." => "Enkele contacten zijn gemarkeerd om verwijderd te worden, maar zijn nog niet verwijderd.  Wacht totdat ze zijn verwijderd.",
+"Do you want to merge these address books?" => "Wilt u deze adresboeken samenvoegen?",
+"Result: " => "Resultaat:",
+" imported, " => "geïmporteerd,",
+" failed." => "gefaald.",
+"Displayname cannot be empty." => "Displaynaam mag niet leeg zijn.",
+"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.",
+"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" => "Werk",
 "Home" => "Thuis",
+"Other" => "Anders",
 "Mobile" => "Mobiel",
 "Text" => "Tekst",
 "Voice" => "Stem",
@@ -48,11 +96,39 @@
 "Pager" => "Pieper",
 "Internet" => "Internet",
 "Birthday" => "Verjaardag",
+"Business" => "Business",
+"Call" => "Bel",
+"Clients" => "Klanten",
+"Deliverer" => "Leverancier",
+"Holidays" => "Vakanties",
+"Ideas" => "Ideeën",
+"Journey" => "Reis",
+"Jubilee" => "Jubileum",
+"Meeting" => "Vergadering",
+"Personal" => "Persoonlijk",
+"Projects" => "Projecten",
+"Questions" => "Vragen",
 "{name}'s Birthday" => "{name}'s verjaardag",
 "Contact" => "Contact",
+"You do not have the permissions to edit this contact." => "U heeft geen permissie om dit contact te bewerken.",
+"You do not have the permissions to delete this contact." => "U heeft geen permissie om dit contact te verwijderen.",
 "Add Contact" => "Contact toevoegen",
 "Import" => "Importeer",
+"Settings" => "Instellingen",
 "Addressbooks" => "Adresboeken",
+"Close" => "Sluiten",
+"Keyboard shortcuts" => "Sneltoetsen",
+"Navigation" => "Navigatie",
+"Next contact in list" => "Volgende contact in de lijst",
+"Previous contact in list" => "Vorige contact in de lijst",
+"Expand/collapse current addressbook" => "Uitklappen / inklappen huidig adresboek",
+"Next addressbook" => "Volgende adresboek",
+"Previous addressbook" => "Vorige adresboek",
+"Actions" => "Acties",
+"Refresh contacts list" => "Vernieuw contact lijst",
+"Add new contact" => "Voeg nieuw contact toe",
+"Add new addressbook" => "Voeg nieuw adresboek toe",
+"Delete current contact" => "Verwijder huidig contact",
 "Drop photo to upload" => "Verwijder foto uit upload",
 "Delete current photo" => "Verwijdere huidige foto",
 "Edit current photo" => "Wijzig huidige foto",
@@ -64,6 +140,9 @@
 "Delete" => "Verwijderen",
 "Nickname" => "Roepnaam",
 "Enter nickname" => "Voer roepnaam in",
+"Web site" => "Website",
+"http://www.somesite.com" => "http://www.willekeurigesite.com",
+"Go to web site" => "Ga naar website",
 "dd-mm-yyyy" => "dd-mm-yyyy",
 "Groups" => "Groepen",
 "Separate groups with commas" => "Gebruik komma bij meerder groepen",
@@ -75,26 +154,41 @@
 "Delete email address" => "Verwijder email adres",
 "Enter phone number" => "Voer telefoonnummer in",
 "Delete phone number" => "Verwijdere telefoonnummer",
+"Instant Messenger" => "Instant Messenger",
+"Delete IM" => "Verwijder IM",
 "View on map" => "Bekijk op een kaart",
 "Edit address details" => "Wijzig adres gegevens",
 "Add notes here." => "Voeg notitie toe",
 "Add field" => "Voeg veld toe",
 "Phone" => "Telefoon",
 "Email" => "E-mail",
+"Instant Messaging" => "Instant Messaging",
 "Address" => "Adres",
 "Note" => "Notitie",
 "Download contact" => "Download contact",
 "Delete contact" => "Verwijder contact",
+"The temporary image has been removed from cache." => "Het tijdelijke plaatje is uit de cache verwijderd.",
 "Edit address" => "Wijzig adres",
 "Type" => "Type",
 "PO Box" => "Postbus",
+"Street address" => "Adres",
+"Street and number" => "Straat en nummer",
 "Extended" => "Uitgebreide",
+"Apartment number etc." => "Apartement nummer",
 "City" => "Stad",
 "Region" => "Regio",
+"E.g. state or province" => "Provincie",
 "Zipcode" => "Postcode",
+"Postal code" => "Postcode",
 "Country" => "Land",
 "Addressbook" => "Adresboek",
 "Hon. prefixes" => "Hon. prefixes",
+"Miss" => "Mw",
+"Ms" => "Mw",
+"Mr" => "M",
+"Sir" => "M",
+"Mrs" => "Mw",
+"Dr" => "M",
 "Given name" => "Voornaam",
 "Additional names" => "Extra namen",
 "Family name" => "Achternaam",
@@ -105,13 +199,22 @@
 "Importing contacts" => "Importeren van contacten",
 "You have no contacts in your addressbook." => "Je hebt geen contacten in je adresboek",
 "Add contact" => "Contactpersoon toevoegen",
+"Select Address Books" => "Selecteer adresboeken",
+"Enter name" => "Naam",
+"Enter description" => "Beschrijving",
 "CardDAV syncing addresses" => "CardDAV synchroniseert de adressen",
 "more info" => "meer informatie",
 "Primary address (Kontact et al)" => "Standaardadres",
 "iOS/OS X" => "IOS/OS X",
+"Show CardDav link" => "Laat CardDav link zien",
+"Show read-only VCF link" => "Laat alleen lezen VCF link zien",
+"Share" => "Deel",
 "Download" => "Download",
 "Edit" => "Bewerken",
 "New Address Book" => "Nieuw Adresboek",
+"Name" => "Naam",
+"Description" => "Beschrijving",
 "Save" => "Opslaan",
-"Cancel" => "Anuleren"
+"Cancel" => "Anuleren",
+"More..." => "Meer..."
 );
diff --git a/apps/contacts/l10n/ru.php b/apps/contacts/l10n/ru.php
index 010c4507f4..eaeb385d3b 100644
--- a/apps/contacts/l10n/ru.php
+++ b/apps/contacts/l10n/ru.php
@@ -14,6 +14,7 @@
 "Cannot add empty property." => "Невозможно добавить пустой параметр.",
 "At least one of the address fields has to be filled out." => "Как минимум одно поле адреса должно быть заполнено.",
 "Trying to add duplicate property: " => "При попытке добавить дубликат:",
+"Missing IM parameter." => "Отсутствует параметр IM.",
 "Unknown IM: " => "Неизвестный IM:",
 "Information about vCard is incorrect. Please reload the page." => "Информация о vCard некорректна. Пожалуйста, обновите страницу.",
 "Missing ID" => "Отсутствует ID",
@@ -51,6 +52,9 @@
 "Not implemented" => "Не реализовано",
 "Couldn't get a valid address." => "Не удалось получить адрес.",
 "Error" => "Ошибка",
+"You do not have permission to add contacts to " => "У вас нет разрешений добавлять контакты в",
+"Please select one of your own address books." => "Выберите одну из ваших собственных адресных книг.",
+"Permission error" => "Ошибка доступа",
 "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",
@@ -95,6 +99,7 @@
 "Business" => "Бизнес",
 "Call" => "Вызов",
 "Clients" => "Клиенты",
+"Deliverer" => "Посыльный",
 "Holidays" => "Праздники",
 "Ideas" => "Идеи",
 "Journey" => "Поездка",
@@ -105,6 +110,8 @@
 "Questions" => "Вопросы",
 "{name}'s Birthday" => "День рождения {name}",
 "Contact" => "Контакт",
+"You do not have the permissions to edit this contact." => "У вас нет разрешений редактировать этот контакт.",
+"You do not have the permissions to delete this contact." => "У вас нет разрешений удалять этот контакт.",
 "Add Contact" => "Добавить Контакт",
 "Import" => "Импорт",
 "Settings" => "Настройки",
@@ -147,6 +154,7 @@
 "Delete email address" => "Удалить адрес электронной почты",
 "Enter phone number" => "Ввести номер телефона",
 "Delete phone number" => "Удалить номер телефона",
+"Instant Messenger" => "Instant Messenger",
 "Delete IM" => "Удалить IM",
 "View on map" => "Показать на карте",
 "Edit address details" => "Ввести детали адреса",
@@ -154,6 +162,7 @@
 "Add field" => "Добавить поле",
 "Phone" => "Телефон",
 "Email" => "Ящик эл. почты",
+"Instant Messaging" => "Быстрые сообщения",
 "Address" => "Адрес",
 "Note" => "Заметка",
 "Download contact" => "Скачать контакт",
@@ -206,6 +215,9 @@
 "more info" => "дополнительная информация",
 "Primary address (Kontact et al)" => "Первичный адрес (Kontact и др.)",
 "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/sl.php b/apps/contacts/l10n/sl.php
index 0ed9766aa3..fe0e8ef16c 100644
--- a/apps/contacts/l10n/sl.php
+++ b/apps/contacts/l10n/sl.php
@@ -52,6 +52,9 @@
 "Not implemented" => "Ni podprto",
 "Couldn't get a valid address." => "Ne morem dobiti veljavnega naslova.",
 "Error" => "Napaka",
+"You do not have permission to add contacts to " => "Nimate dovoljenja za dodajanje stikov v",
+"Please select one of your own address books." => "Prosimo, če izberete enega izmed vaših adresarjev.",
+"Permission error" => "Napaka dovoljenj",
 "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",
@@ -107,6 +110,8 @@
 "Questions" => "Vprašanja",
 "{name}'s Birthday" => "{name} - rojstni dan",
 "Contact" => "Stik",
+"You do not have the permissions to edit this contact." => "Nimate dovoljenj za urejanje tega stika.",
+"You do not have the permissions to delete this contact." => "Nimate dovoljenj za izbris tega stika.",
 "Add Contact" => "Dodaj stik",
 "Import" => "Uvozi",
 "Settings" => "Nastavitve",
diff --git a/apps/contacts/l10n/sv.php b/apps/contacts/l10n/sv.php
index a7721753b4..88aac866f6 100644
--- a/apps/contacts/l10n/sv.php
+++ b/apps/contacts/l10n/sv.php
@@ -52,6 +52,9 @@
 "Not implemented" => "Inte införd",
 "Couldn't get a valid address." => "Kunde inte hitta en giltig adress.",
 "Error" => "Fel",
+"You do not have permission to add contacts to " => "Du saknar behörighet att skapa kontakter i",
+"Please select one of your own address books." => "Välj en av dina egna adressböcker.",
+"Permission error" => "Behörighetsfel",
 "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",
@@ -107,6 +110,8 @@
 "Questions" => "Frågor",
 "{name}'s Birthday" => "{name}'s födelsedag",
 "Contact" => "Kontakt",
+"You do not have the permissions to edit this contact." => "Du saknar behörighet för att ändra denna kontakt.",
+"You do not have the permissions to delete this contact." => "Du saknar behörighet för att radera denna kontakt.",
 "Add Contact" => "Lägg till kontakt",
 "Import" => "Importera",
 "Settings" => "Inställningar",
diff --git a/apps/files/l10n/nl.php b/apps/files/l10n/nl.php
index b093dc3ce1..fb7ea34b9b 100644
--- a/apps/files/l10n/nl.php
+++ b/apps/files/l10n/nl.php
@@ -8,6 +8,13 @@
 "Failed to write to disk" => "Schrijven naar schijf mislukt",
 "Files" => "Bestanden",
 "Delete" => "Verwijder",
+"already exists" => "bestaat al",
+"replace" => "vervang",
+"cancel" => "annuleren",
+"replaced" => "vervangen",
+"with" => "door",
+"undo" => "ongedaan maken",
+"deleted" => "verwijderd",
 "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",
diff --git a/apps/files/l10n/pt_BR.php b/apps/files/l10n/pt_BR.php
index b783c37cb0..09c4f2b026 100644
--- a/apps/files/l10n/pt_BR.php
+++ b/apps/files/l10n/pt_BR.php
@@ -8,6 +8,13 @@
 "Failed to write to disk" => "Falha ao escrever no disco",
 "Files" => "Arquivos",
 "Delete" => "Excluir",
+"already exists" => "já existe",
+"replace" => "substituir",
+"cancel" => "cancelar",
+"replaced" => "substituido ",
+"with" => "com",
+"undo" => "desfazer",
+"deleted" => "deletado",
 "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",
diff --git a/apps/files/l10n/ru.php b/apps/files/l10n/ru.php
index 203a4f81ed..71b30d22df 100644
--- a/apps/files/l10n/ru.php
+++ b/apps/files/l10n/ru.php
@@ -22,30 +22,30 @@
 "Upload cancelled." => "Загрузка отменена.",
 "Invalid name, '/' is not allowed." => "Неверное имя, '/' не допускается.",
 "Size" => "Размер",
-"Modified" => "Изменен",
+"Modified" => "Изменён",
 "folder" => "папка",
 "folders" => "папки",
 "file" => "файл",
 "files" => "файлы",
 "File handling" => "Управление файлами",
-"Maximum upload size" => "Максимальный размер файла",
+"Maximum upload size" => "Максимальный размер загружаемого файла",
 "max. possible: " => "макс. возможно: ",
-"Needed for multi-file and folder downloads." => "Требуется для загрузки нескольких файорв и папок",
-"Enable ZIP-download" => "Включить ZIP-загрузку",
+"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!" => "Здесь ничего нет. Закачайте что-нибудь!",
+"Upload" => "Загрузить",
+"Cancel upload" => "Отмена загрузки",
+"Nothing in here. Upload something!" => "Здесь ничего нет. Загрузите что-нибудь!",
 "Name" => "Название",
-"Share" => "Поделиться",
+"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/files/l10n/zh_CN.php b/apps/files/l10n/zh_CN.php
index 8ef7ff39c8..dc78301884 100644
--- a/apps/files/l10n/zh_CN.php
+++ b/apps/files/l10n/zh_CN.php
@@ -12,6 +12,7 @@
 "replace" => "替换",
 "cancel" => "取消",
 "replaced" => "已经替换",
+"with" => "随着",
 "undo" => "撤销",
 "deleted" => "已经删除",
 "generating ZIP-file, it may take some time." => "正在生成 ZIP 文件，可能需要一些时间",
diff --git a/apps/files_encryption/l10n/nl.php b/apps/files_encryption/l10n/nl.php
new file mode 100644
index 0000000000..1ea56006fc
--- /dev/null
+++ b/apps/files_encryption/l10n/nl.php
@@ -0,0 +1,6 @@
+<?php $TRANSLATIONS = array(
+"Encryption" => "Versleuteling",
+"Exclude the following file types from encryption" => "Versleutel de volgende bestand types niet",
+"None" => "Geen",
+"Enable Encryption" => "Zet versleuteling aan"
+);
diff --git a/apps/files_encryption/l10n/ru.php b/apps/files_encryption/l10n/ru.php
new file mode 100644
index 0000000000..3a7e84b6d0
--- /dev/null
+++ b/apps/files_encryption/l10n/ru.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/ru.php b/apps/files_external/l10n/ru.php
new file mode 100644
index 0000000000..7ee4378662
--- /dev/null
+++ b/apps/files_external/l10n/ru.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_sharing/l10n/nl.php b/apps/files_sharing/l10n/nl.php
new file mode 100644
index 0000000000..d357d66f67
--- /dev/null
+++ b/apps/files_sharing/l10n/nl.php
@@ -0,0 +1,6 @@
+<?php $TRANSLATIONS = array(
+"Size" => "Grootte",
+"Modified" => "Aangepast",
+"Delete all" => "Verwijder alles",
+"Delete" => "Vewijder"
+);
diff --git a/apps/files_sharing/l10n/ru.php b/apps/files_sharing/l10n/ru.php
new file mode 100644
index 0000000000..796403ae99
--- /dev/null
+++ b/apps/files_sharing/l10n/ru.php
@@ -0,0 +1,6 @@
+<?php $TRANSLATIONS = array(
+"Size" => "Размер",
+"Modified" => "Изменён",
+"Delete all" => "Удалить все",
+"Delete" => "Удалить"
+);
diff --git a/apps/files_versions/l10n/nl.php b/apps/files_versions/l10n/nl.php
new file mode 100644
index 0000000000..87e72a3620
--- /dev/null
+++ b/apps/files_versions/l10n/nl.php
@@ -0,0 +1,4 @@
+<?php $TRANSLATIONS = array(
+"Expire all versions" => "Alle versies laten verlopen",
+"Enable Files Versioning" => "Activeer file versioning"
+);
diff --git a/apps/files_versions/l10n/ru.php b/apps/files_versions/l10n/ru.php
new file mode 100644
index 0000000000..6a824779f3
--- /dev/null
+++ b/apps/files_versions/l10n/ru.php
@@ -0,0 +1,4 @@
+<?php $TRANSLATIONS = array(
+"Expire all versions" => "Просрочить все версии",
+"Enable Files Versioning" => "Включить ведение версий файлов"
+);
diff --git a/apps/gallery/l10n/nl.php b/apps/gallery/l10n/nl.php
index 8c987a03d6..df8fcaf72d 100644
--- a/apps/gallery/l10n/nl.php
+++ b/apps/gallery/l10n/nl.php
@@ -1,12 +1,7 @@
 <?php $TRANSLATIONS = array(
 "Pictures" => "Plaatjes",
-"Settings" => "Instellingen",
-"Rescan" => "Opnieuw doorzoeken",
-"Stop" => "Stop",
-"Share" => "Deel",
-"Back" => "Terug",
-"Remove confirmation" => "Verwijder bevestiging",
-"Do you want to remove album" => "Wil je het album verwijderen: ",
-"Change album name" => "Wijzig album naam",
-"New album name" => "Nieuwe album naam"
+"Share gallery" => "Deel gallerie",
+"Error: " => "Fout:",
+"Internal error" => "Interne fout",
+"Slideshow" => "Diashow"
 );
diff --git a/apps/tasks/l10n/ru.php b/apps/tasks/l10n/ru.php
new file mode 100644
index 0000000000..ce208cb071
--- /dev/null
+++ b/apps/tasks/l10n/ru.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 List",
+"Order Complete" => "Заказ выполнен",
+"Order Location" => "Местонахождение заказа",
+"Order Priority" => "Приоритет заказа",
+"Order Label" => "Метка заказа",
+"Loading tasks..." => "Загрузка задач...",
+"Important" => "Важный",
+"More" => "Больше",
+"Less" => "Меньше",
+"Delete" => "Удалить"
+);
diff --git a/apps/user_ldap/l10n/ru.php b/apps/user_ldap/l10n/ru.php
new file mode 100644
index 0000000000..fc89d99806
--- /dev/null
+++ b/apps/user_ldap/l10n/ru.php
@@ -0,0 +1,26 @@
+<?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" => "Вы можете задать Base 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=агент, dc=пример, 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." => "Определяет фильтр для применения при получении группы.",
+"Port" => "Порт",
+"Use TLS" => "Использовать TLS",
+"Do not use it for SSL connections, it will fail." => "Не используйте для соединений SSL",
+"Turn off SSL certificate validation." => "Отключить проверку сертификата SSL.",
+"Not recommended, use for testing only." => "Не рекомендуется, используйте только для тестирования.",
+"in bytes" => "в байтах",
+"in seconds. A change empties the cache." => "в секундах. Изменение очистит кэш.",
+"Help" => "Помощь"
+);
diff --git a/apps/user_migrate/l10n/ru.php b/apps/user_migrate/l10n/ru.php
new file mode 100644
index 0000000000..c8889ad021
--- /dev/null
+++ b/apps/user_migrate/l10n/ru.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",
+"Import" => "Импорт"
+);
diff --git a/apps/user_openid/l10n/nl.php b/apps/user_openid/l10n/nl.php
new file mode 100644
index 0000000000..5b07c6108a
--- /dev/null
+++ b/apps/user_openid/l10n/nl.php
@@ -0,0 +1,11 @@
+<?php $TRANSLATIONS = array(
+"This is an OpenID server endpoint. For more information, see " => "Dit is een OpenID server.  Voor meer informatie, zie",
+"Identity: <b>" => "Identiteit: <b>",
+"Realm: <b>" => "Realm: <b>",
+"User: <b>" => "Gebruiker: <b>",
+"Login" => "Login",
+"Error: <b>No user Selected" => "Fout: <b>Geen gebruiker geselecteerd",
+"you can authenticate to other sites with this address" => "u kan met dit adres bij andere sites authenticeren",
+"Authorized OpenID provider" => "Geautoriseerde OpenID provider",
+"Your address at Wordpress, Identi.ca, &hellip;" => "Uw adres bij Wordpress, Identi.ca, &hellip;"
+);
diff --git a/apps/user_openid/l10n/ru.php b/apps/user_openid/l10n/ru.php
new file mode 100644
index 0000000000..09855c35b7
--- /dev/null
+++ b/apps/user_openid/l10n/ru.php
@@ -0,0 +1,11 @@
+<?php $TRANSLATIONS = array(
+"This is an OpenID server endpoint. For more information, see " => "Это точка подключения сервера OpenID. Для информации смотрите",
+"Identity: <b>" => "Личность: <b>",
+"Realm: <b>" => "Realm: <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/contacts.po b/l10n/ca/contacts.po
index c965efa0c2..d7fbb58469 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-24 02:02+0200\n"
-"PO-Revision-Date: 2012-08-24 00:02+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-25 02:04+0200\n"
+"PO-Revision-Date: 2012-08-24 08:24+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"
@@ -216,7 +216,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:21
+#: appinfo/app.php:25
 msgid "Contacts"
 msgstr "Contactes"
 
@@ -244,15 +244,15 @@ msgstr "Error"
 
 #: js/contacts.js:424
 msgid "You do not have permission to add contacts to "
-msgstr ""
+msgstr "No teniu permisos per afegir contactes a "
 
 #: js/contacts.js:425
 msgid "Please select one of your own address books."
-msgstr ""
+msgstr "Seleccioneu una de les vostres llibretes d'adreces"
 
 #: js/contacts.js:425
 msgid "Permission error"
-msgstr ""
+msgstr "Error de permisos"
 
 #: js/contacts.js:763
 msgid "This property has to be non-empty."
@@ -484,11 +484,11 @@ msgstr "Contacte"
 
 #: lib/vcard.php:408
 msgid "You do not have the permissions to edit this contact."
-msgstr ""
+msgstr "No teniu permisos per editar aquest contacte"
 
 #: lib/vcard.php:483
 msgid "You do not have the permissions to delete this contact."
-msgstr ""
+msgstr "No teniu permisos per esborrar aquest contacte"
 
 #: templates/index.php:14
 msgid "Add Contact"
diff --git a/l10n/cs_CZ/contacts.po b/l10n/cs_CZ/contacts.po
index dabfe51b56..9b1fa750be 100644
--- a/l10n/cs_CZ/contacts.po
+++ b/l10n/cs_CZ/contacts.po
@@ -3,16 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Jan Krejci <krejca85@gmail.com>, 2011.
+# Jan Krejci <krejca85@gmail.com>, 2011, 2012.
 # Martin  <fireball@atlas.cz>, 2011, 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-24 02:02+0200\n"
-"PO-Revision-Date: 2012-08-24 00:02+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-25 02:04+0200\n"
+"PO-Revision-Date: 2012-08-24 07:58+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"
@@ -84,11 +84,11 @@ msgstr "Pokoušíte se přidat duplicitní atribut: "
 
 #: ajax/contact/addproperty.php:115 ajax/contact/saveproperty.php:93
 msgid "Missing IM parameter."
-msgstr ""
+msgstr "Chybějící parametr IM"
 
 #: ajax/contact/addproperty.php:119 ajax/contact/saveproperty.php:97
 msgid "Unknown IM: "
-msgstr ""
+msgstr "Neznámý IM:"
 
 #: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
@@ -217,7 +217,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:21
+#: appinfo/app.php:25
 msgid "Contacts"
 msgstr "Kontakty"
 
@@ -245,15 +245,15 @@ msgstr "Chyba"
 
 #: js/contacts.js:424
 msgid "You do not have permission to add contacts to "
-msgstr ""
+msgstr "Nemáte práva přidat kontakt do"
 
 #: js/contacts.js:425
 msgid "Please select one of your own address books."
-msgstr ""
+msgstr "Prosím vyberte jeden z vašich adresářů"
 
 #: js/contacts.js:425
 msgid "Permission error"
-msgstr ""
+msgstr "Chyba přístupových práv"
 
 #: js/contacts.js:763
 msgid "This property has to be non-empty."
@@ -300,7 +300,7 @@ msgstr "Některé kontakty jsou označeny ke smazání. Počkete prosím na doko
 
 #: js/contacts.js:1649
 msgid "Do you want to merge these address books?"
-msgstr ""
+msgstr "Chcete spojit tyto adresáře?"
 
 #: js/loader.js:49
 msgid "Result: "
@@ -332,51 +332,51 @@ msgstr "Kontakt nebyl nalezen."
 
 #: 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"
@@ -485,11 +485,11 @@ msgstr "Kontakt"
 
 #: lib/vcard.php:408
 msgid "You do not have the permissions to edit this contact."
-msgstr ""
+msgstr "Nemáte práva editovat tento kontakt"
 
 #: lib/vcard.php:483
 msgid "You do not have the permissions to delete this contact."
-msgstr ""
+msgstr "Nemáte práva smazat tento kontakt"
 
 #: templates/index.php:14
 msgid "Add Contact"
@@ -665,11 +665,11 @@ msgstr "Smazat telefoní číslo"
 
 #: templates/part.contact.php:100
 msgid "Instant Messenger"
-msgstr ""
+msgstr "Instant Messenger"
 
 #: templates/part.contact.php:101
 msgid "Delete IM"
-msgstr ""
+msgstr "Smazat IM"
 
 #: templates/part.contact.php:110
 msgid "View on map"
@@ -697,7 +697,7 @@ msgstr "Email"
 
 #: templates/part.contact.php:131
 msgid "Instant Messaging"
-msgstr ""
+msgstr "Instant Messaging"
 
 #: templates/part.contact.php:132
 msgid "Address"
@@ -920,7 +920,7 @@ msgstr "Zobrazit odkaz VCF pouze pro čtení"
 
 #: templates/settings.php:26
 msgid "Share"
-msgstr ""
+msgstr "Sdílet"
 
 #: templates/settings.php:29
 msgid "Download"
diff --git a/l10n/de/contacts.po b/l10n/de/contacts.po
index e326e613c3..74a5bee2a8 100644
--- a/l10n/de/contacts.po
+++ b/l10n/de/contacts.po
@@ -25,9 +25,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\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"
+"POT-Creation-Date: 2012-08-25 02:04+0200\n"
+"PO-Revision-Date: 2012-08-24 08: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"
@@ -232,7 +232,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:21
+#: appinfo/app.php:25
 msgid "Contacts"
 msgstr "Kontakte"
 
@@ -260,15 +260,15 @@ msgstr "Fehler"
 
 #: js/contacts.js:424
 msgid "You do not have permission to add contacts to "
-msgstr ""
+msgstr "Sie besitzen nicht die erforderlichen Rechte, um Kontakte hinzuzufügen"
 
 #: js/contacts.js:425
 msgid "Please select one of your own address books."
-msgstr ""
+msgstr "Bitte wählen Sie eines Ihrer Adressbücher aus."
 
 #: js/contacts.js:425
 msgid "Permission error"
-msgstr ""
+msgstr "Berechtigungsfehler"
 
 #: js/contacts.js:763
 msgid "This property has to be non-empty."
@@ -500,11 +500,11 @@ msgstr "Kontakt"
 
 #: lib/vcard.php:408
 msgid "You do not have the permissions to edit this contact."
-msgstr ""
+msgstr "Sie besitzen nicht die erforderlichen Rechte, um diesen Kontakt zu bearbeiten."
 
 #: lib/vcard.php:483
 msgid "You do not have the permissions to delete this contact."
-msgstr ""
+msgstr "Sie besitzen nicht die erforderlichen Rechte, um diesen Kontakte zu löschen."
 
 #: templates/index.php:14
 msgid "Add Contact"
diff --git a/l10n/el/contacts.po b/l10n/el/contacts.po
index c7086a17c9..ddb35e2e8c 100644
--- a/l10n/el/contacts.po
+++ b/l10n/el/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-24 02:02+0200\n"
-"PO-Revision-Date: 2012-08-24 00:02+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-25 02:04+0200\n"
+"PO-Revision-Date: 2012-08-24 07:34+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"
@@ -221,7 +221,7 @@ msgstr "Δεν ήταν δυνατή η φόρτωση της προσωρινή
 msgid "No file was uploaded. Unknown error"
 msgstr "Δεν ανέβηκε κάποιο αρχείο. Άγνωστο σφάλμα"
 
-#: appinfo/app.php:21
+#: appinfo/app.php:25
 msgid "Contacts"
 msgstr "Επαφές"
 
@@ -249,15 +249,15 @@ msgstr "Σφάλμα"
 
 #: js/contacts.js:424
 msgid "You do not have permission to add contacts to "
-msgstr ""
+msgstr "Δεν έχετε επαρκή δικαιώματα για προσθέσετε επαφές στο "
 
 #: js/contacts.js:425
 msgid "Please select one of your own address books."
-msgstr ""
+msgstr "Παρακαλούμε επιλέξτε ένα από τα δικάς σας βιβλία διευθύνσεων."
 
 #: js/contacts.js:425
 msgid "Permission error"
-msgstr ""
+msgstr "Σφάλμα δικαιωμάτων"
 
 #: js/contacts.js:763
 msgid "This property has to be non-empty."
@@ -489,11 +489,11 @@ msgstr "Επαφή"
 
 #: lib/vcard.php:408
 msgid "You do not have the permissions to edit this contact."
-msgstr ""
+msgstr "Δεν διαθέτε επαρκή δικαιώματα για την επεξεργασία αυτής της επαφής."
 
 #: lib/vcard.php:483
 msgid "You do not have the permissions to delete this contact."
-msgstr ""
+msgstr "Δεν διαθέτε επαρκή δικαιώματα για την διαγραφή αυτής της επαφής."
 
 #: templates/index.php:14
 msgid "Add Contact"
diff --git a/l10n/fr/contacts.po b/l10n/fr/contacts.po
index b1aca8af7a..3415f7b733 100644
--- a/l10n/fr/contacts.po
+++ b/l10n/fr/contacts.po
@@ -19,9 +19,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\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"
+"POT-Creation-Date: 2012-08-25 02:04+0200\n"
+"PO-Revision-Date: 2012-08-24 13:55+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"
@@ -226,7 +226,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:21
+#: appinfo/app.php:25
 msgid "Contacts"
 msgstr "Contacts"
 
@@ -254,15 +254,15 @@ msgstr "Erreur"
 
 #: js/contacts.js:424
 msgid "You do not have permission to add contacts to "
-msgstr ""
+msgstr "Vous n'avez pas l'autorisation d'ajouter des contacts à"
 
 #: js/contacts.js:425
 msgid "Please select one of your own address books."
-msgstr ""
+msgstr "Veuillez sélectionner l'un de vos carnets d'adresses."
 
 #: js/contacts.js:425
 msgid "Permission error"
-msgstr ""
+msgstr "Erreur de permission"
 
 #: js/contacts.js:763
 msgid "This property has to be non-empty."
@@ -393,7 +393,7 @@ msgstr "Travail"
 
 #: lib/app.php:195 lib/app.php:200 lib/app.php:214
 msgid "Home"
-msgstr "Maison"
+msgstr "Domicile"
 
 #: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:593
 msgid "Other"
@@ -494,11 +494,11 @@ msgstr "Contact"
 
 #: lib/vcard.php:408
 msgid "You do not have the permissions to edit this contact."
-msgstr ""
+msgstr "Vous n'avez pas l'autorisation de modifier ce contact."
 
 #: lib/vcard.php:483
 msgid "You do not have the permissions to delete this contact."
-msgstr ""
+msgstr "Vous n'avez pas l'autorisation de supprimer ce contact."
 
 #: templates/index.php:14
 msgid "Add Contact"
diff --git a/l10n/it/contacts.po b/l10n/it/contacts.po
index d6611b80d0..3512cf8d11 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-24 02:02+0200\n"
-"PO-Revision-Date: 2012-08-24 00:02+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-25 02:04+0200\n"
+"PO-Revision-Date: 2012-08-24 05:41+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"
@@ -218,7 +218,7 @@ msgstr "Impossibile caricare l'immagine temporanea: "
 msgid "No file was uploaded. Unknown error"
 msgstr "Nessun file è stato inviato. Errore sconosciuto"
 
-#: appinfo/app.php:21
+#: appinfo/app.php:25
 msgid "Contacts"
 msgstr "Contatti"
 
@@ -246,15 +246,15 @@ msgstr "Errore"
 
 #: js/contacts.js:424
 msgid "You do not have permission to add contacts to "
-msgstr ""
+msgstr "Non hai i permessi per aggiungere contatti a"
 
 #: js/contacts.js:425
 msgid "Please select one of your own address books."
-msgstr ""
+msgstr "Seleziona una delle tue rubriche."
 
 #: js/contacts.js:425
 msgid "Permission error"
-msgstr ""
+msgstr "Errore relativo ai permessi"
 
 #: js/contacts.js:763
 msgid "This property has to be non-empty."
@@ -486,11 +486,11 @@ msgstr "Contatto"
 
 #: lib/vcard.php:408
 msgid "You do not have the permissions to edit this contact."
-msgstr ""
+msgstr "Non hai i permessi per modificare questo contatto."
 
 #: lib/vcard.php:483
 msgid "You do not have the permissions to delete this contact."
-msgstr ""
+msgstr "Non hai i permessi per eliminare questo contatto."
 
 #: templates/index.php:14
 msgid "Add Contact"
diff --git a/l10n/ja_JP/contacts.po b/l10n/ja_JP/contacts.po
index bda5ee92f2..0cf04a8a0a 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-24 02:02+0200\n"
-"PO-Revision-Date: 2012-08-24 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-25 02:04+0200\n"
+"PO-Revision-Date: 2012-08-24 02:39+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"
@@ -132,7 +132,7 @@ msgstr "写真の読み込みは無効です。"
 
 #: ajax/editname.php:31
 msgid "Contact ID is missing."
-msgstr "コンタクトIDが見つかりません。"
+msgstr "連絡先 IDが見つかりません。"
 
 #: ajax/oc_photo.php:32
 msgid "No photo path was submitted."
@@ -148,7 +148,7 @@ msgstr "画像の読み込みエラー。"
 
 #: ajax/savecrop.php:69
 msgid "Error getting contact object."
-msgstr "コンタクトオブジェクトの取得エラー。"
+msgstr "連絡先オブジェクトの取得エラー。"
 
 #: ajax/savecrop.php:79
 msgid "Error getting PHOTO property."
@@ -156,7 +156,7 @@ msgstr "写真属性の取得エラー。"
 
 #: ajax/savecrop.php:98
 msgid "Error saving contact."
-msgstr "コンタクトの保存エラー。"
+msgstr "連絡先の保存エラー。"
 
 #: ajax/savecrop.php:109
 msgid "Error resizing image"
@@ -216,7 +216,7 @@ msgstr "一時的な画像の読み込みができませんでした: "
 msgid "No file was uploaded. Unknown error"
 msgstr "ファイルは何もアップロードされていません。不明なエラー"
 
-#: appinfo/app.php:21
+#: appinfo/app.php:25
 msgid "Contacts"
 msgstr "連絡先"
 
@@ -244,15 +244,15 @@ msgstr "エラー"
 
 #: js/contacts.js:424
 msgid "You do not have permission to add contacts to "
-msgstr ""
+msgstr "連絡先を追加する権限がありません"
 
 #: js/contacts.js:425
 msgid "Please select one of your own address books."
-msgstr ""
+msgstr "アドレス帳を一つ選択してください"
 
 #: js/contacts.js:425
 msgid "Permission error"
-msgstr ""
+msgstr "権限エラー"
 
 #: js/contacts.js:763
 msgid "This property has to be non-empty."
@@ -295,7 +295,7 @@ msgstr "タイプを選択"
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
-msgstr "いくつかのコンタクトが削除とマークされていますが、まだ削除されていません。削除するまでお待ちください。"
+msgstr "いくつかの連絡先が削除とマークされていますが、まだ削除されていません。削除するまでお待ちください。"
 
 #: js/contacts.js:1649
 msgid "Do you want to merge these address books?"
@@ -484,11 +484,11 @@ msgstr "連絡先"
 
 #: lib/vcard.php:408
 msgid "You do not have the permissions to edit this contact."
-msgstr ""
+msgstr "この連絡先を編集する権限がありません"
 
 #: lib/vcard.php:483
 msgid "You do not have the permissions to delete this contact."
-msgstr ""
+msgstr "この連絡先を削除する権限がありません"
 
 #: templates/index.php:14
 msgid "Add Contact"
@@ -520,11 +520,11 @@ 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"
@@ -548,7 +548,7 @@ msgstr "連絡先リストを再読込する"
 
 #: templates/index.php:59
 msgid "Add new contact"
-msgstr "新しいコンタクトを追加"
+msgstr "新しい連絡先を追加"
 
 #: templates/index.php:61
 msgid "Add new addressbook"
@@ -556,7 +556,7 @@ msgstr "新しいアドレス帳を追加"
 
 #: templates/index.php:63
 msgid "Delete current contact"
-msgstr "現在のコンタクトを削除"
+msgstr "現在の連絡先を削除"
 
 #: templates/part.contact.php:17
 msgid "Drop photo to upload"
@@ -855,7 +855,7 @@ msgstr "Sn."
 
 #: templates/part.import.php:1
 msgid "Import a contacts file"
-msgstr "コンタクトファイルをインポート"
+msgstr "連絡先ファイルをインポート"
 
 #: templates/part.import.php:6
 msgid "Please choose the addressbook"
@@ -871,7 +871,7 @@ msgstr "新しいアドレスブックの名前"
 
 #: templates/part.import.php:20
 msgid "Importing contacts"
-msgstr "コンタクトをインポート"
+msgstr "連絡先をインポート"
 
 #: templates/part.no_contacts.php:3
 msgid "You have no contacts in your addressbook."
diff --git a/l10n/nl/admin_migrate.po b/l10n/nl/admin_migrate.po
index ad085a1d15..aa9f340dcd 100644
--- a/l10n/nl/admin_migrate.po
+++ b/l10n/nl/admin_migrate.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Richard Bos <radoeka@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-25 02:04+0200\n"
+"PO-Revision-Date: 2012-08-24 16:56+0000\n"
+"Last-Translator: Richard Bos <radoeka@gmail.com>\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"
@@ -19,14 +20,14 @@ msgstr ""
 
 #: templates/settings.php:3
 msgid "Export this ownCloud instance"
-msgstr ""
+msgstr "Exporteer deze ownCloud instantie"
 
 #: 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 "Dit maakt een gecomprimeerd bestand, met de inhoud van deze ownCloud instantie.  Kies het export type:"
 
 #: templates/settings.php:12
 msgid "Export"
-msgstr ""
+msgstr "Exporteer"
diff --git a/l10n/nl/bookmarks.po b/l10n/nl/bookmarks.po
index 7aa6cc6bfc..598af3f83a 100644
--- a/l10n/nl/bookmarks.po
+++ b/l10n/nl/bookmarks.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Richard Bos <radoeka@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-25 02:04+0200\n"
+"PO-Revision-Date: 2012-08-24 19:06+0000\n"
+"Last-Translator: Richard Bos <radoeka@gmail.com>\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"
@@ -19,41 +20,41 @@ msgstr ""
 
 #: appinfo/app.php:14
 msgid "Bookmarks"
-msgstr ""
+msgstr "Bladwijzers"
 
 #: bookmarksHelper.php:99
 msgid "unnamed"
-msgstr ""
+msgstr "geen naam"
 
 #: templates/bookmarklet.php:5
 msgid ""
 "Drag this to your browser bookmarks and click it, when you want to bookmark "
 "a webpage quickly:"
-msgstr ""
+msgstr "Sleep dit naar uw browser bladwijzers en klik erop, wanneer u een webpagina snel wilt voorzien van een bladwijzer:"
 
 #: templates/bookmarklet.php:7
 msgid "Read later"
-msgstr ""
+msgstr "Lees later"
 
 #: templates/list.php:13
 msgid "Address"
-msgstr ""
+msgstr "Adres"
 
 #: templates/list.php:14
 msgid "Title"
-msgstr ""
+msgstr "Titel"
 
 #: templates/list.php:15
 msgid "Tags"
-msgstr ""
+msgstr "Tags"
 
 #: templates/list.php:16
 msgid "Save bookmark"
-msgstr ""
+msgstr "Bewaar bookmark"
 
 #: templates/list.php:22
 msgid "You have no bookmarks"
-msgstr ""
+msgstr "U heeft geen bookmarks"
 
 #: templates/settings.php:11
 msgid "Bookmarklet <br />"
diff --git a/l10n/nl/calendar.po b/l10n/nl/calendar.po
index 8ef2a74f32..5c283653c4 100644
--- a/l10n/nl/calendar.po
+++ b/l10n/nl/calendar.po
@@ -9,13 +9,14 @@
 #   <georg.stefan.germany@googlemail.com>, 2012.
 #   <jos@gelauff.net>, 2012.
 #   <pietje8501@gmail.com>, 2012.
+# Richard Bos <radoeka@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-25 02:04+0200\n"
+"PO-Revision-Date: 2012-08-24 08:53+0000\n"
+"Last-Translator: Richard Bos <radoeka@gmail.com>\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"
@@ -25,11 +26,11 @@ msgstr ""
 
 #: ajax/cache/status.php:19
 msgid "Not all calendars are completely cached"
-msgstr ""
+msgstr "Niet alle agenda's zijn volledig gecached"
 
 #: ajax/cache/status.php:21
 msgid "Everything seems to be completely cached"
-msgstr ""
+msgstr "Alles lijkt volledig gecached te zijn"
 
 #: ajax/categories/rescan.php:29
 msgid "No calendars found."
@@ -47,19 +48,19 @@ msgstr "Verkeerde kalender"
 msgid ""
 "The file contained either no events or all events are already saved in your "
 "calendar."
-msgstr ""
+msgstr "Het bestand bevat geen gebeurtenissen of alle gebeurtenissen worden al in uw agenda bewaard."
 
 #: ajax/import/dropimport.php:31 ajax/import/import.php:67
 msgid "events has been saved in the new calendar"
-msgstr ""
+msgstr "De gebeurtenissen worden in de nieuwe agenda bewaard"
 
 #: ajax/import/import.php:56
 msgid "Import failed"
-msgstr ""
+msgstr "import is gefaald"
 
 #: ajax/import/import.php:69
 msgid "events has been saved in your calendar"
-msgstr ""
+msgstr "de gebeurtenissen zijn in uw agenda opgeslagen "
 
 #: ajax/settings/guesstimezone.php:25
 msgid "New Timezone:"
@@ -73,7 +74,7 @@ msgstr "Tijdzone is veranderd"
 msgid "Invalid request"
 msgstr "Ongeldige aanvraag"
 
-#: appinfo/app.php:35 templates/calendar.php:15
+#: appinfo/app.php:41 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:33
 msgid "Calendar"
 msgstr "Kalender"
@@ -164,7 +165,7 @@ msgstr "Werk"
 
 #: lib/app.php:351 lib/app.php:361
 msgid "by"
-msgstr ""
+msgstr "door"
 
 #: lib/app.php:359 lib/app.php:399
 msgid "unnamed"
@@ -353,79 +354,79 @@ msgstr "Cal."
 
 #: templates/calendar.php:6
 msgid "Sun."
-msgstr ""
+msgstr "Zon."
 
 #: templates/calendar.php:6
 msgid "Mon."
-msgstr ""
+msgstr "Maa."
 
 #: templates/calendar.php:6
 msgid "Tue."
-msgstr ""
+msgstr "Din."
 
 #: templates/calendar.php:6
 msgid "Wed."
-msgstr ""
+msgstr "Woe."
 
 #: templates/calendar.php:6
 msgid "Thu."
-msgstr ""
+msgstr "Don."
 
 #: templates/calendar.php:6
 msgid "Fri."
-msgstr ""
+msgstr "Vrij."
 
 #: templates/calendar.php:6
 msgid "Sat."
-msgstr ""
+msgstr "Zat."
 
 #: 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 "Maa."
 
 #: templates/calendar.php:8
 msgid "Apr."
-msgstr ""
+msgstr "Apr."
 
 #: templates/calendar.php:8
 msgid "May."
-msgstr ""
+msgstr "Mei."
 
 #: 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 "Aug."
 
 #: 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"
@@ -482,7 +483,7 @@ msgstr "Vandaag"
 
 #: templates/calendar.php:46 templates/calendar.php:47
 msgid "Settings"
-msgstr ""
+msgstr "Instellingen"
 
 #: templates/part.choosecalendar.php:2
 msgid "Your calendars"
@@ -690,7 +691,7 @@ msgstr "Importeer een agenda bestand"
 
 #: templates/part.import.php:24
 msgid "Please choose a calendar"
-msgstr ""
+msgstr "Kies een agenda"
 
 #: templates/part.import.php:36
 msgid "Name of new calendar"
@@ -698,13 +699,13 @@ msgstr "Naam van de nieuwe agenda"
 
 #: templates/part.import.php:44
 msgid "Take an available name!"
-msgstr ""
+msgstr "Kies een beschikbare naam!"
 
 #: templates/part.import.php:45
 msgid ""
 "A Calendar with this name already exists. If you continue anyhow, these "
 "calendars will be merged."
-msgstr ""
+msgstr "Een agenda met deze naam bestaat al.  Als u doorgaat, worden deze agenda's samengevoegd"
 
 #: templates/part.import.php:47
 msgid "Import"
@@ -736,7 +737,7 @@ msgstr "op"
 
 #: templates/settings.php:10
 msgid "General"
-msgstr ""
+msgstr "Algemeen"
 
 #: templates/settings.php:15
 msgid "Timezone"
@@ -744,11 +745,11 @@ msgstr "Tijdzone"
 
 #: templates/settings.php:47
 msgid "Update timezone automatically"
-msgstr ""
+msgstr "Werk de tijdzone automatisch bij"
 
 #: templates/settings.php:52
 msgid "Time format"
-msgstr ""
+msgstr "Tijd formaat"
 
 #: templates/settings.php:57
 msgid "24h"
@@ -760,39 +761,39 @@ msgstr "12uur"
 
 #: templates/settings.php:64
 msgid "Start week on"
-msgstr ""
+msgstr "Begin de week op"
 
 #: templates/settings.php:76
 msgid "Cache"
-msgstr ""
+msgstr "Cache"
 
 #: templates/settings.php:80
 msgid "Clear cache for repeating events"
-msgstr ""
+msgstr "Leeg cache voor repeterende gebeurtenissen"
 
 #: templates/settings.php:85
 msgid "URLs"
-msgstr ""
+msgstr "URLs"
 
 #: templates/settings.php:87
 msgid "Calendar CalDAV syncing addresses"
-msgstr ""
+msgstr "Agenda CalDAV synchronisatie adres"
 
 #: templates/settings.php:87
 msgid "more info"
-msgstr ""
+msgstr "meer informatie"
 
 #: templates/settings.php:89
 msgid "Primary address (Kontact et al)"
-msgstr ""
+msgstr "Primary adres (voor Kontact en dergelijke)"
 
 #: 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 "Alleen lezen iCalendar link(en)"
 
 #: templates/share.dropdown.php:20
 msgid "Users"
diff --git a/l10n/nl/contacts.po b/l10n/nl/contacts.po
index facb131ffa..fd2159c7ac 100644
--- a/l10n/nl/contacts.po
+++ b/l10n/nl/contacts.po
@@ -8,13 +8,14 @@
 # Erik Bent <hj.bent.60@gmail.com>, 2012.
 #   <icewind1991@gmail.com>, 2012.
 #   <koen@vervloesem.eu>, 2012.
+# Richard Bos <radoeka@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\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"
+"POT-Creation-Date: 2012-08-25 02:04+0200\n"
+"PO-Revision-Date: 2012-08-24 16:50+0000\n"
+"Last-Translator: Richard Bos <radoeka@gmail.com>\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"
@@ -70,7 +71,7 @@ msgstr "onderdeel naam is niet opgegeven."
 
 #: ajax/contact/addproperty.php:46
 msgid "Could not parse contact: "
-msgstr ""
+msgstr "Kon het contact niet verwerken"
 
 #: ajax/contact/addproperty.php:56
 msgid "Cannot add empty property."
@@ -86,11 +87,11 @@ msgstr "Eigenschap bestaat al: "
 
 #: ajax/contact/addproperty.php:115 ajax/contact/saveproperty.php:93
 msgid "Missing IM parameter."
-msgstr ""
+msgstr "IM parameter ontbreekt"
 
 #: ajax/contact/addproperty.php:119 ajax/contact/saveproperty.php:97
 msgid "Unknown IM: "
-msgstr ""
+msgstr "Onbekende IM:"
 
 #: ajax/contact/deleteproperty.php:37
 msgid "Information about vCard is incorrect. Please reload the page."
@@ -151,31 +152,31 @@ msgstr "Fout bij laden plaatje."
 
 #: ajax/savecrop.php:69
 msgid "Error getting contact object."
-msgstr ""
+msgstr "Fout om contact object te verkrijgen"
 
 #: ajax/savecrop.php:79
 msgid "Error getting PHOTO property."
-msgstr ""
+msgstr "Fout om PHOTO eigenschap te verkrijgen"
 
 #: ajax/savecrop.php:98
 msgid "Error saving contact."
-msgstr ""
+msgstr "Fout om contact op te slaan"
 
 #: ajax/savecrop.php:109
 msgid "Error resizing image"
-msgstr ""
+msgstr "Fout tijdens aanpassen plaatje"
 
 #: ajax/savecrop.php:112
 msgid "Error cropping image"
-msgstr ""
+msgstr "Fout tijdens aanpassen plaatje"
 
 #: ajax/savecrop.php:115
 msgid "Error creating temporary image"
-msgstr ""
+msgstr "Fout om een tijdelijk plaatje te maken"
 
 #: ajax/savecrop.php:118
 msgid "Error finding image: "
-msgstr ""
+msgstr "Fout kan plaatje niet vinden:"
 
 #: ajax/uploadimport.php:44 ajax/uploadimport.php:76
 msgid "Error uploading contacts to storage."
@@ -209,31 +210,31 @@ msgstr "Er ontbreekt een tijdelijke map"
 
 #: ajax/uploadphoto.php:59 ajax/uploadphoto.php:109
 msgid "Couldn't save temporary image: "
-msgstr ""
+msgstr "Kan tijdelijk plaatje niet op slaan:"
 
 #: ajax/uploadphoto.php:62 ajax/uploadphoto.php:112
 msgid "Couldn't load temporary image: "
-msgstr ""
+msgstr "Kan tijdelijk plaatje niet op laden:"
 
 #: ajax/uploadphoto.php:71
 msgid "No file was uploaded. Unknown error"
-msgstr ""
+msgstr "Er was geen bestand geladen.  Onbekende fout"
 
-#: appinfo/app.php:21
+#: appinfo/app.php:25
 msgid "Contacts"
 msgstr "Contacten"
 
 #: js/contacts.js:71
 msgid "Sorry, this functionality has not been implemented yet"
-msgstr ""
+msgstr "Sorry, deze functionaliteit is nog niet geïmplementeerd"
 
 #: js/contacts.js:71
 msgid "Not implemented"
-msgstr ""
+msgstr "Niet geïmplementeerd"
 
 #: js/contacts.js:76
 msgid "Couldn't get a valid address."
-msgstr ""
+msgstr "Kan geen geldig adres krijgen"
 
 #: js/contacts.js:76 js/contacts.js:365 js/contacts.js:381 js/contacts.js:393
 #: js/contacts.js:723 js/contacts.js:763 js/contacts.js:789 js/contacts.js:921
@@ -243,86 +244,86 @@ msgstr ""
 #: 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 ""
+msgstr "Fout"
 
 #: js/contacts.js:424
 msgid "You do not have permission to add contacts to "
-msgstr ""
+msgstr "U hebt geen permissie om contacten toe te voegen aan"
 
 #: js/contacts.js:425
 msgid "Please select one of your own address books."
-msgstr ""
+msgstr "Selecteer één van uw eigen adresboeken"
 
 #: js/contacts.js:425
 msgid "Permission error"
-msgstr ""
+msgstr "Permissie fout"
 
 #: js/contacts.js:763
 msgid "This property has to be non-empty."
-msgstr ""
+msgstr "Dit veld mag niet leeg blijven"
 
 #: js/contacts.js:789
 msgid "Couldn't serialize elements."
-msgstr ""
+msgstr "Kan de elementen niet serializen"
 
 #: js/contacts.js:921 js/contacts.js:939
 msgid ""
 "'deleteProperty' called without type argument. Please report at "
 "bugs.owncloud.org"
-msgstr ""
+msgstr "'deleteProperty' aangeroepen zonder type argument. Rapporteer dit a.u.b. via http://bugs.owncloud.org"
 
 #: js/contacts.js:958
 msgid "Edit name"
-msgstr ""
+msgstr "Pas naam aan"
 
 #: js/contacts.js:1250
 msgid "No files selected for upload."
-msgstr ""
+msgstr "Geen bestanden geselecteerd voor upload."
 
 #: js/contacts.js:1258
 msgid ""
 "The file you are trying to upload exceed the maximum size for file uploads "
 "on this server."
-msgstr ""
+msgstr "Het bestand dat u probeert te uploaden overschrijdt de maximale bestand grootte voor bestand uploads voor deze server."
 
 #: js/contacts.js:1322
 msgid "Error loading profile picture."
-msgstr ""
+msgstr "Fout profiel plaatje kan niet worden geladen."
 
 #: js/contacts.js:1457 js/contacts.js:1498 js/contacts.js:1517
 #: js/contacts.js:1560
 msgid "Select type"
-msgstr ""
+msgstr "Selecteer type"
 
 #: js/contacts.js:1578
 msgid ""
 "Some contacts are marked for deletion, but not deleted yet. Please wait for "
 "them to be deleted."
-msgstr ""
+msgstr "Enkele contacten zijn gemarkeerd om verwijderd te worden, maar zijn nog niet verwijderd.  Wacht totdat ze zijn verwijderd."
 
 #: js/contacts.js:1649
 msgid "Do you want to merge these address books?"
-msgstr ""
+msgstr "Wilt u deze adresboeken samenvoegen?"
 
 #: js/loader.js:49
 msgid "Result: "
-msgstr ""
+msgstr "Resultaat:"
 
 #: js/loader.js:49
 msgid " imported, "
-msgstr ""
+msgstr "geïmporteerd,"
 
 #: js/loader.js:49
 msgid " failed."
-msgstr ""
+msgstr "gefaald."
 
 #: js/settings.js:68
 msgid "Displayname cannot be empty."
-msgstr ""
+msgstr "Displaynaam mag niet leeg zijn."
 
 #: lib/app.php:36
 msgid "Addressbook not found: "
-msgstr ""
+msgstr "Adresboek niet gevonden:"
 
 #: lib/app.php:52
 msgid "This is not your addressbook."
@@ -334,51 +335,51 @@ msgstr "Contact kon niet worden gevonden."
 
 #: 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 +391,7 @@ msgstr "Thuis"
 
 #: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:593
 msgid "Other"
-msgstr ""
+msgstr "Anders"
 
 #: lib/app.php:201
 msgid "Mobile"
@@ -431,51 +432,51 @@ msgstr "Verjaardag"
 
 #: lib/app.php:253
 msgid "Business"
-msgstr ""
+msgstr "Business"
 
 #: lib/app.php:254
 msgid "Call"
-msgstr ""
+msgstr "Bel"
 
 #: lib/app.php:255
 msgid "Clients"
-msgstr ""
+msgstr "Klanten"
 
 #: lib/app.php:256
 msgid "Deliverer"
-msgstr ""
+msgstr "Leverancier"
 
 #: lib/app.php:257
 msgid "Holidays"
-msgstr ""
+msgstr "Vakanties"
 
 #: lib/app.php:258
 msgid "Ideas"
-msgstr ""
+msgstr "Ideeën"
 
 #: lib/app.php:259
 msgid "Journey"
-msgstr ""
+msgstr "Reis"
 
 #: lib/app.php:260
 msgid "Jubilee"
-msgstr ""
+msgstr "Jubileum"
 
 #: lib/app.php:261
 msgid "Meeting"
-msgstr ""
+msgstr "Vergadering"
 
 #: lib/app.php:263
 msgid "Personal"
-msgstr ""
+msgstr "Persoonlijk"
 
 #: lib/app.php:264
 msgid "Projects"
-msgstr ""
+msgstr "Projecten"
 
 #: lib/app.php:265
 msgid "Questions"
-msgstr ""
+msgstr "Vragen"
 
 #: lib/hooks.php:102
 msgid "{name}'s Birthday"
@@ -487,11 +488,11 @@ msgstr "Contact"
 
 #: lib/vcard.php:408
 msgid "You do not have the permissions to edit this contact."
-msgstr ""
+msgstr "U heeft geen permissie om dit contact te bewerken."
 
 #: lib/vcard.php:483
 msgid "You do not have the permissions to delete this contact."
-msgstr ""
+msgstr "U heeft geen permissie om dit contact te verwijderen."
 
 #: templates/index.php:14
 msgid "Add Contact"
@@ -503,7 +504,7 @@ msgstr "Importeer"
 
 #: templates/index.php:18
 msgid "Settings"
-msgstr ""
+msgstr "Instellingen"
 
 #: templates/index.php:18 templates/settings.php:9
 msgid "Addressbooks"
@@ -511,55 +512,55 @@ msgstr "Adresboeken"
 
 #: templates/index.php:36 templates/part.import.php:24
 msgid "Close"
-msgstr ""
+msgstr "Sluiten"
 
 #: templates/index.php:37
 msgid "Keyboard shortcuts"
-msgstr ""
+msgstr "Sneltoetsen"
 
 #: templates/index.php:39
 msgid "Navigation"
-msgstr ""
+msgstr "Navigatie"
 
 #: templates/index.php:42
 msgid "Next contact in list"
-msgstr ""
+msgstr "Volgende contact in de lijst"
 
 #: templates/index.php:44
 msgid "Previous contact in list"
-msgstr ""
+msgstr "Vorige contact in de lijst"
 
 #: templates/index.php:46
 msgid "Expand/collapse current addressbook"
-msgstr ""
+msgstr "Uitklappen / inklappen huidig adresboek"
 
 #: templates/index.php:48
 msgid "Next addressbook"
-msgstr ""
+msgstr "Volgende adresboek"
 
 #: templates/index.php:50
 msgid "Previous addressbook"
-msgstr ""
+msgstr "Vorige adresboek"
 
 #: templates/index.php:54
 msgid "Actions"
-msgstr ""
+msgstr "Acties"
 
 #: templates/index.php:57
 msgid "Refresh contacts list"
-msgstr ""
+msgstr "Vernieuw contact lijst"
 
 #: templates/index.php:59
 msgid "Add new contact"
-msgstr ""
+msgstr "Voeg nieuw contact toe"
 
 #: templates/index.php:61
 msgid "Add new addressbook"
-msgstr ""
+msgstr "Voeg nieuw adresboek toe"
 
 #: templates/index.php:63
 msgid "Delete current contact"
-msgstr ""
+msgstr "Verwijder huidig contact"
 
 #: templates/part.contact.php:17
 msgid "Drop photo to upload"
@@ -610,15 +611,15 @@ msgstr "Voer roepnaam in"
 
 #: templates/part.contact.php:43 templates/part.contact.php:134
 msgid "Web site"
-msgstr ""
+msgstr "Website"
 
 #: templates/part.contact.php:44
 msgid "http://www.somesite.com"
-msgstr ""
+msgstr "http://www.willekeurigesite.com"
 
 #: templates/part.contact.php:44
 msgid "Go to web site"
-msgstr ""
+msgstr "Ga naar website"
 
 #: templates/part.contact.php:46
 msgid "dd-mm-yyyy"
@@ -667,11 +668,11 @@ msgstr "Verwijdere telefoonnummer"
 
 #: templates/part.contact.php:100
 msgid "Instant Messenger"
-msgstr ""
+msgstr "Instant Messenger"
 
 #: templates/part.contact.php:101
 msgid "Delete IM"
-msgstr ""
+msgstr "Verwijder IM"
 
 #: templates/part.contact.php:110
 msgid "View on map"
@@ -699,7 +700,7 @@ msgstr "E-mail"
 
 #: templates/part.contact.php:131
 msgid "Instant Messaging"
-msgstr ""
+msgstr "Instant Messaging"
 
 #: templates/part.contact.php:132
 msgid "Address"
@@ -719,7 +720,7 @@ msgstr "Verwijder contact"
 
 #: templates/part.cropphoto.php:65
 msgid "The temporary image has been removed from cache."
-msgstr ""
+msgstr "Het tijdelijke plaatje is uit de cache verwijderd."
 
 #: templates/part.edit_address_dialog.php:6
 msgid "Edit address"
@@ -736,11 +737,11 @@ msgstr "Postbus"
 
 #: templates/part.edit_address_dialog.php:24
 msgid "Street address"
-msgstr ""
+msgstr "Adres"
 
 #: templates/part.edit_address_dialog.php:27
 msgid "Street and number"
-msgstr ""
+msgstr "Straat en nummer"
 
 #: templates/part.edit_address_dialog.php:30
 msgid "Extended"
@@ -748,7 +749,7 @@ msgstr "Uitgebreide"
 
 #: templates/part.edit_address_dialog.php:33
 msgid "Apartment number etc."
-msgstr ""
+msgstr "Apartement nummer"
 
 #: templates/part.edit_address_dialog.php:36
 #: templates/part.edit_address_dialog.php:39
@@ -761,7 +762,7 @@ msgstr "Regio"
 
 #: templates/part.edit_address_dialog.php:45
 msgid "E.g. state or province"
-msgstr ""
+msgstr "Provincie"
 
 #: templates/part.edit_address_dialog.php:48
 msgid "Zipcode"
@@ -769,7 +770,7 @@ msgstr "Postcode"
 
 #: templates/part.edit_address_dialog.php:51
 msgid "Postal code"
-msgstr ""
+msgstr "Postcode"
 
 #: templates/part.edit_address_dialog.php:54
 #: templates/part.edit_address_dialog.php:57
@@ -786,27 +787,27 @@ msgstr "Hon. prefixes"
 
 #: templates/part.edit_name_dialog.php:27
 msgid "Miss"
-msgstr ""
+msgstr "Mw"
 
 #: templates/part.edit_name_dialog.php:28
 msgid "Ms"
-msgstr ""
+msgstr "Mw"
 
 #: templates/part.edit_name_dialog.php:29
 msgid "Mr"
-msgstr ""
+msgstr "M"
 
 #: templates/part.edit_name_dialog.php:30
 msgid "Sir"
-msgstr ""
+msgstr "M"
 
 #: templates/part.edit_name_dialog.php:31
 msgid "Mrs"
-msgstr ""
+msgstr "Mw"
 
 #: templates/part.edit_name_dialog.php:32
 msgid "Dr"
-msgstr ""
+msgstr "M"
 
 #: templates/part.edit_name_dialog.php:35
 msgid "Given name"
@@ -886,15 +887,15 @@ msgstr "Contactpersoon toevoegen"
 
 #: templates/part.selectaddressbook.php:1
 msgid "Select Address Books"
-msgstr ""
+msgstr "Selecteer adresboeken"
 
 #: templates/part.selectaddressbook.php:27
 msgid "Enter name"
-msgstr ""
+msgstr "Naam"
 
 #: templates/part.selectaddressbook.php:29
 msgid "Enter description"
-msgstr ""
+msgstr "Beschrijving"
 
 #: templates/settings.php:3
 msgid "CardDAV syncing addresses"
@@ -914,15 +915,15 @@ msgstr "IOS/OS X"
 
 #: templates/settings.php:20
 msgid "Show CardDav link"
-msgstr ""
+msgstr "Laat CardDav link zien"
 
 #: templates/settings.php:23
 msgid "Show read-only VCF link"
-msgstr ""
+msgstr "Laat alleen lezen VCF link zien"
 
 #: templates/settings.php:26
 msgid "Share"
-msgstr ""
+msgstr "Deel"
 
 #: templates/settings.php:29
 msgid "Download"
@@ -938,11 +939,11 @@ msgstr "Nieuw Adresboek"
 
 #: templates/settings.php:44
 msgid "Name"
-msgstr ""
+msgstr "Naam"
 
 #: templates/settings.php:45
 msgid "Description"
-msgstr ""
+msgstr "Beschrijving"
 
 #: templates/settings.php:46
 msgid "Save"
@@ -954,4 +955,4 @@ msgstr "Anuleren"
 
 #: templates/settings.php:52
 msgid "More..."
-msgstr ""
+msgstr "Meer..."
diff --git a/l10n/nl/files.po b/l10n/nl/files.po
index 247cc814a9..ab52fb7028 100644
--- a/l10n/nl/files.po
+++ b/l10n/nl/files.po
@@ -10,13 +10,14 @@
 #   <jos@gelauff.net>, 2012.
 #   <koen@vervloesem.eu>, 2011.
 #   <pietje8501@gmail.com>, 2012.
+# Richard Bos <radoeka@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-25 02:04+0200\n"
+"PO-Revision-Date: 2012-08-24 08:34+0000\n"
+"Last-Translator: Richard Bos <radoeka@gmail.com>\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,37 +59,37 @@ msgstr "Schrijven naar schijf mislukt"
 msgid "Files"
 msgstr "Bestanden"
 
-#: js/fileactions.js:107 templates/index.php:56
+#: js/fileactions.js:111 templates/index.php:56
 msgid "Delete"
 msgstr "Verwijder"
 
 #: js/filelist.js:141
 msgid "already exists"
-msgstr ""
+msgstr "bestaat al"
 
 #: js/filelist.js:141
 msgid "replace"
-msgstr ""
+msgstr "vervang"
 
 #: js/filelist.js:141
 msgid "cancel"
-msgstr ""
+msgstr "annuleren"
 
 #: js/filelist.js:195
 msgid "replaced"
-msgstr ""
+msgstr "vervangen"
 
 #: js/filelist.js:195
 msgid "with"
-msgstr ""
+msgstr "door"
 
 #: js/filelist.js:195 js/filelist.js:246
 msgid "undo"
-msgstr ""
+msgstr "ongedaan maken"
 
 #: js/filelist.js:246
 msgid "deleted"
-msgstr ""
+msgstr "verwijderd"
 
 #: js/files.js:171
 msgid "generating ZIP-file, it may take some time."
diff --git a/l10n/nl/files_encryption.po b/l10n/nl/files_encryption.po
index bae30cdd15..bd80bdcae7 100644
--- a/l10n/nl/files_encryption.po
+++ b/l10n/nl/files_encryption.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Richard Bos <radoeka@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-25 02:04+0200\n"
+"PO-Revision-Date: 2012-08-24 19:11+0000\n"
+"Last-Translator: Richard Bos <radoeka@gmail.com>\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"
@@ -19,16 +20,16 @@ msgstr ""
 
 #: templates/settings.php:3
 msgid "Encryption"
-msgstr ""
+msgstr "Versleuteling"
 
 #: templates/settings.php:4
 msgid "Exclude the following file types from encryption"
-msgstr ""
+msgstr "Versleutel de volgende bestand types niet"
 
 #: templates/settings.php:5
 msgid "None"
-msgstr ""
+msgstr "Geen"
 
 #: templates/settings.php:10
 msgid "Enable Encryption"
-msgstr ""
+msgstr "Zet versleuteling aan"
diff --git a/l10n/nl/files_sharing.po b/l10n/nl/files_sharing.po
index ebeb97ffe9..dc30969ea7 100644
--- a/l10n/nl/files_sharing.po
+++ b/l10n/nl/files_sharing.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Richard Bos <radoeka@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-25 02:04+0200\n"
+"PO-Revision-Date: 2012-08-24 19:16+0000\n"
+"Last-Translator: Richard Bos <radoeka@gmail.com>\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"
@@ -19,16 +20,16 @@ msgstr ""
 
 #: templates/get.php:4
 msgid "Size"
-msgstr ""
+msgstr "Grootte"
 
 #: templates/get.php:5
 msgid "Modified"
-msgstr ""
+msgstr "Aangepast"
 
 #: templates/get.php:5
 msgid "Delete all"
-msgstr ""
+msgstr "Verwijder alles"
 
 #: templates/get.php:5
 msgid "Delete"
-msgstr ""
+msgstr "Vewijder"
diff --git a/l10n/nl/files_versions.po b/l10n/nl/files_versions.po
index 94bdd0d707..cd67120849 100644
--- a/l10n/nl/files_versions.po
+++ b/l10n/nl/files_versions.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Richard Bos <radoeka@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-25 02:04+0200\n"
+"PO-Revision-Date: 2012-08-24 16:58+0000\n"
+"Last-Translator: Richard Bos <radoeka@gmail.com>\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"
@@ -19,8 +20,8 @@ msgstr ""
 
 #: js/settings-personal.js:31
 msgid "Expire all versions"
-msgstr ""
+msgstr "Alle versies laten verlopen"
 
 #: templates/settings.php:3
 msgid "Enable Files Versioning"
-msgstr ""
+msgstr "Activeer file versioning"
diff --git a/l10n/nl/gallery.po b/l10n/nl/gallery.po
index 8548603b7b..4297c4c479 100644
--- a/l10n/nl/gallery.po
+++ b/l10n/nl/gallery.po
@@ -5,92 +5,37 @@
 # Translators:
 # Erik Bent <hj.bent.60@gmail.com>, 2012.
 #   <jos@gelauff.net>, 2012.
+# Richard Bos <radoeka@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-08-25 02:04+0200\n"
+"PO-Revision-Date: 2012-08-24 16:54+0000\n"
+"Last-Translator: Richard Bos <radoeka@gmail.com>\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:37
+#: appinfo/app.php:42
 msgid "Pictures"
 msgstr "Plaatjes"
 
-#: js/album_cover.js:44
+#: js/pictures.js:12
 msgid "Share gallery"
-msgstr ""
+msgstr "Deel gallerie"
 
-#: js/album_cover.js:64 js/album_cover.js:100 js/album_cover.js:133
+#: js/pictures.js:32
 msgid "Error: "
-msgstr ""
+msgstr "Fout:"
 
-#: js/album_cover.js:64 js/album_cover.js:100
+#: js/pictures.js:32
 msgid "Internal error"
-msgstr ""
+msgstr "Interne fout"
 
-#: 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"
-
-#: templates/index.php:17
-msgid "Stop"
-msgstr "Stop"
-
-#: templates/index.php:18
-msgid "Share"
-msgstr "Deel"
-
-#: templates/view_album.php:19
-msgid "Back"
-msgstr "Terug"
-
-#: templates/view_album.php:36
-msgid "Remove confirmation"
-msgstr "Verwijder bevestiging"
-
-#: templates/view_album.php:37
-msgid "Do you want to remove album"
-msgstr "Wil je het album verwijderen: "
-
-#: templates/view_album.php:40
-msgid "Change album name"
-msgstr "Wijzig album naam"
-
-#: templates/view_album.php:43
-msgid "New album name"
-msgstr "Nieuwe album naam"
+#: templates/index.php:27
+msgid "Slideshow"
+msgstr "Diashow"
diff --git a/l10n/nl/lib.po b/l10n/nl/lib.po
index fbe8ced9f7..2715403dba 100644
--- a/l10n/nl/lib.po
+++ b/l10n/nl/lib.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Richard Bos <radoeka@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-25 02:04+0200\n"
+"PO-Revision-Date: 2012-08-24 15:58+0000\n"
+"Last-Translator: Richard Bos <radoeka@gmail.com>\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,96 +18,96 @@ msgstr ""
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: app.php:287
+#: app.php:288
 msgid "Help"
-msgstr ""
+msgstr "Help"
 
-#: app.php:294
+#: app.php:295
 msgid "Personal"
-msgstr ""
+msgstr "Persoonlijk"
 
-#: app.php:299
+#: app.php:300
 msgid "Settings"
-msgstr ""
+msgstr "Instellingen"
 
-#: app.php:304
+#: app.php:305
 msgid "Users"
-msgstr ""
+msgstr "Gebruikers"
 
-#: app.php:311
+#: app.php:312
 msgid "Apps"
-msgstr ""
+msgstr "Apps"
 
-#: app.php:313
+#: app.php:314
 msgid "Admin"
-msgstr ""
+msgstr "Administrator"
 
-#: files.php:245
+#: files.php:276
 msgid "ZIP download is turned off."
-msgstr ""
+msgstr "ZIP download is uitgeschakeld."
 
-#: files.php:246
+#: files.php:277
 msgid "Files need to be downloaded one by one."
-msgstr ""
+msgstr "Bestanden moeten één voor één worden gedownload."
 
-#: files.php:246 files.php:271
+#: files.php:277 files.php:302
 msgid "Back to Files"
-msgstr ""
+msgstr "Terug naar bestanden"
 
-#: files.php:270
+#: files.php:301
 msgid "Selected files too large to generate zip file."
-msgstr ""
+msgstr "De geselecteerde bestanden zijn te groot om een zip bestand te maken."
 
 #: json.php:28
 msgid "Application is not enabled"
-msgstr ""
+msgstr "De applicatie is niet actief"
 
 #: json.php:39 json.php:63 json.php:75
 msgid "Authentication error"
-msgstr ""
+msgstr "Authenticatie fout"
 
 #: json.php:51
 msgid "Token expired. Please reload page."
-msgstr ""
+msgstr "Token verlopen.  Herlaad de pagina."
 
 #: template.php:86
 msgid "seconds ago"
-msgstr ""
+msgstr "seconden geleden"
 
 #: template.php:87
 msgid "1 minute ago"
-msgstr ""
+msgstr "1 minuut geleden"
 
 #: template.php:88
 #, php-format
 msgid "%d minutes ago"
-msgstr ""
+msgstr "%d minuten geleden"
 
 #: template.php:91
 msgid "today"
-msgstr ""
+msgstr "vandaag"
 
 #: template.php:92
 msgid "yesterday"
-msgstr ""
+msgstr "gisteren"
 
 #: template.php:93
 #, php-format
 msgid "%d days ago"
-msgstr ""
+msgstr "%d dagen geleden"
 
 #: template.php:94
 msgid "last month"
-msgstr ""
+msgstr "vorige maand"
 
 #: template.php:95
 msgid "months ago"
-msgstr ""
+msgstr "maanden geleden"
 
 #: template.php:96
 msgid "last year"
-msgstr ""
+msgstr "vorig jaar"
 
 #: template.php:97
 msgid "years ago"
-msgstr ""
+msgstr "jaar geleden"
diff --git a/l10n/nl/settings.po b/l10n/nl/settings.po
index 15427dff1b..7f2741fcf9 100644
--- a/l10n/nl/settings.po
+++ b/l10n/nl/settings.po
@@ -9,13 +9,14 @@
 #   <jos@gelauff.net>, 2012.
 #   <koen@vervloesem.eu>, 2011.
 #   <pietje8501@gmail.com>, 2012.
+# Richard Bos <radoeka@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-25 02:04+0200\n"
+"PO-Revision-Date: 2012-08-24 08:40+0000\n"
+"Last-Translator: Richard Bos <radoeka@gmail.com>\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"
@@ -25,7 +26,7 @@ msgstr ""
 
 #: ajax/apps/ocs.php:23
 msgid "Unable to load list from App Store"
-msgstr ""
+msgstr "Kan de lijst niet van de App store laden"
 
 #: ajax/lostpassword.php:14
 msgid "Email saved"
@@ -45,7 +46,7 @@ msgstr "Ongeldig verzoek"
 
 #: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
 msgid "Authentication error"
-msgstr ""
+msgstr "Authenticatie fout"
 
 #: ajax/setlanguage.php:18
 msgid "Language changed"
@@ -53,7 +54,7 @@ msgstr "Taal aangepast"
 
 #: js/apps.js:18
 msgid "Error"
-msgstr ""
+msgstr "Fout"
 
 #: js/apps.js:39 js/apps.js:73
 msgid "Disable"
@@ -73,23 +74,23 @@ msgstr "Nederlands"
 
 #: templates/admin.php:14
 msgid "Security Warning"
-msgstr ""
+msgstr "Veiligheidswaarschuwing"
 
 #: templates/admin.php:29
 msgid "Cron"
-msgstr ""
+msgstr "Cron"
 
 #: templates/admin.php:31
 msgid "execute one task with each page loaded"
-msgstr ""
+msgstr "Voer 1 taak uit bij elke geladen pagina"
 
 #: templates/admin.php:33
 msgid "cron.php is registered at a webcron service"
-msgstr ""
+msgstr "cron.php is geregistreerd bij een webcron service"
 
 #: templates/admin.php:35
 msgid "use systems cron service"
-msgstr ""
+msgstr "gebruik de systeem cron service"
 
 #: templates/admin.php:39
 msgid "Log"
@@ -233,7 +234,7 @@ msgstr "Andere"
 
 #: templates/users.php:80 templates/users.php:112
 msgid "Group Admin"
-msgstr ""
+msgstr "Groep Administrator"
 
 #: templates/users.php:82
 msgid "Quota"
diff --git a/l10n/nl/user_openid.po b/l10n/nl/user_openid.po
index c046633481..4b7c8f7370 100644
--- a/l10n/nl/user_openid.po
+++ b/l10n/nl/user_openid.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Richard Bos <radoeka@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-25 02:04+0200\n"
+"PO-Revision-Date: 2012-08-24 19:20+0000\n"
+"Last-Translator: Richard Bos <radoeka@gmail.com>\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"
@@ -19,36 +20,36 @@ msgstr ""
 
 #: templates/nomode.php:12
 msgid "This is an OpenID server endpoint. For more information, see "
-msgstr ""
+msgstr "Dit is een OpenID server.  Voor meer informatie, zie"
 
 #: templates/nomode.php:14
 msgid "Identity: <b>"
-msgstr ""
+msgstr "Identiteit: <b>"
 
 #: templates/nomode.php:15
 msgid "Realm: <b>"
-msgstr ""
+msgstr "Realm: <b>"
 
 #: templates/nomode.php:16
 msgid "User: <b>"
-msgstr ""
+msgstr "Gebruiker: <b>"
 
 #: templates/nomode.php:17
 msgid "Login"
-msgstr ""
+msgstr "Login"
 
 #: templates/nomode.php:22
 msgid "Error: <b>No user Selected"
-msgstr ""
+msgstr "Fout: <b>Geen gebruiker geselecteerd"
 
 #: templates/settings.php:4
 msgid "you can authenticate to other sites with this address"
-msgstr ""
+msgstr "u kan met dit adres bij andere sites authenticeren"
 
 #: templates/settings.php:5
 msgid "Authorized OpenID provider"
-msgstr ""
+msgstr "Geautoriseerde OpenID provider"
 
 #: templates/settings.php:6
 msgid "Your address at Wordpress, Identi.ca, &hellip;"
-msgstr ""
+msgstr "Uw adres bij Wordpress, Identi.ca, &hellip;"
diff --git a/l10n/pt_BR/files.po b/l10n/pt_BR/files.po
index 2fedc1a4e0..ccac7b79d1 100644
--- a/l10n/pt_BR/files.po
+++ b/l10n/pt_BR/files.po
@@ -4,6 +4,7 @@
 # 
 # Translators:
 # Guilherme Maluf Balzana <guimalufb@gmail.com>, 2012.
+#   <targinosilveira@gmail.com>, 2012.
 # Thiago Vicente <thiagovice@gmail.com>, 2012.
 # Unforgiving Fallout <>, 2012.
 # Van Der Fran <transifex@vanderland.com>, 2011, 2012.
@@ -11,9 +12,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-25 02:04+0200\n"
+"PO-Revision-Date: 2012-08-24 22:17+0000\n"
+"Last-Translator: targinosilveira <targinosilveira@gmail.com>\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,37 +56,37 @@ msgstr "Falha ao escrever no disco"
 msgid "Files"
 msgstr "Arquivos"
 
-#: js/fileactions.js:107 templates/index.php:56
+#: js/fileactions.js:111 templates/index.php:56
 msgid "Delete"
 msgstr "Excluir"
 
 #: 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 "deletado"
 
 #: js/files.js:171
 msgid "generating ZIP-file, it may take some time."
diff --git a/l10n/pt_BR/settings.po b/l10n/pt_BR/settings.po
index 333a52a86e..901713f7c8 100644
--- a/l10n/pt_BR/settings.po
+++ b/l10n/pt_BR/settings.po
@@ -6,15 +6,16 @@
 #   <duda.nogueira@metasys.com.br>, 2011.
 # Guilherme Maluf Balzana <guimalufb@gmail.com>, 2012.
 # Sandro Venezuela <sandrovenezuela@gmail.com>, 2012.
+#   <targinosilveira@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-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-25 02:04+0200\n"
+"PO-Revision-Date: 2012-08-24 22:19+0000\n"
+"Last-Translator: targinosilveira <targinosilveira@gmail.com>\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"
@@ -44,7 +45,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"
@@ -52,7 +53,7 @@ msgstr "Mudou Idioma"
 
 #: js/apps.js:18
 msgid "Error"
-msgstr ""
+msgstr "Erro"
 
 #: js/apps.js:39 js/apps.js:73
 msgid "Disable"
@@ -72,7 +73,7 @@ msgstr "Português"
 
 #: templates/admin.php:14
 msgid "Security Warning"
-msgstr ""
+msgstr "Aviso de Segurança"
 
 #: templates/admin.php:29
 msgid "Cron"
@@ -80,11 +81,11 @@ msgstr ""
 
 #: templates/admin.php:31
 msgid "execute one task with each page loaded"
-msgstr ""
+msgstr "executar uma tarefa com cada página em aberto"
 
 #: templates/admin.php:33
 msgid "cron.php is registered at a webcron service"
-msgstr ""
+msgstr "cron.php esta registrado no serviço de webcron"
 
 #: templates/admin.php:35
 msgid "use systems cron service"
@@ -232,7 +233,7 @@ msgstr "Outro"
 
 #: templates/users.php:80 templates/users.php:112
 msgid "Group Admin"
-msgstr ""
+msgstr "Grupo Administrativo"
 
 #: templates/users.php:82
 msgid "Quota"
diff --git a/l10n/ru/admin_dependencies_chk.po b/l10n/ru/admin_dependencies_chk.po
index 1d16b4f757..fefbc12755 100644
--- a/l10n/ru/admin_dependencies_chk.po
+++ b/l10n/ru/admin_dependencies_chk.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Denis  <reg.transifex.net@demitel.ru>, 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-25 02:04+0200\n"
+"PO-Revision-Date: 2012-08-24 09:02+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"
@@ -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 "Директива allow_url_fopen в файле php.ini должна быть установлена в 1 для получения базы знаний с серверов OCS"
 
 #: settings.php:87
 msgid "The php-pdo module is needed to store owncloud data into a database."
-msgstr ""
+msgstr "Модуль php-pdo необходим для хранения данных ownСloud в базе данных."
 
 #: templates/settings.php:2
 msgid "Dependencies status"
-msgstr ""
+msgstr "Статус зависимостей"
 
 #: templates/settings.php:7
 msgid "Used by :"
-msgstr ""
+msgstr "Используется:"
diff --git a/l10n/ru/admin_migrate.po b/l10n/ru/admin_migrate.po
index 9f8eb42ef7..c022979b52 100644
--- a/l10n/ru/admin_migrate.po
+++ b/l10n/ru/admin_migrate.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Denis  <reg.transifex.net@demitel.ru>, 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-25 02:04+0200\n"
+"PO-Revision-Date: 2012-08-24 07:51+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"
@@ -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/ru/bookmarks.po b/l10n/ru/bookmarks.po
index 151205b731..96ffd483f1 100644
--- a/l10n/ru/bookmarks.po
+++ b/l10n/ru/bookmarks.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Denis  <reg.transifex.net@demitel.ru>, 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-25 02:04+0200\n"
+"PO-Revision-Date: 2012-08-24 13:15+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"
@@ -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 ""
@@ -33,28 +34,28 @@ 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/ru/calendar.po b/l10n/ru/calendar.po
index 3b4d2ffe82..64d5396094 100644
--- a/l10n/ru/calendar.po
+++ b/l10n/ru/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-08-20 02:01+0200\n"
-"PO-Revision-Date: 2012-08-19 17:21+0000\n"
-"Last-Translator: rasperepodvipodvert <rasperepodvipodvert@gmail.com>\n"
+"POT-Creation-Date: 2012-08-25 02:04+0200\n"
+"PO-Revision-Date: 2012-08-24 14:41+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"
@@ -73,7 +73,7 @@ msgstr "Часовой пояс изменён"
 msgid "Invalid request"
 msgstr "Неверный запрос"
 
-#: appinfo/app.php:35 templates/calendar.php:15
+#: appinfo/app.php:41 templates/calendar.php:15
 #: templates/part.eventform.php:33 templates/part.showevent.php:33
 msgid "Calendar"
 msgstr "Календарь"
@@ -120,7 +120,7 @@ msgstr "Клиенты"
 
 #: lib/app.php:125
 msgid "Deliverer"
-msgstr "Доставщик"
+msgstr "Посыльный"
 
 #: lib/app.php:126
 msgid "Holidays"
@@ -495,15 +495,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"
@@ -520,7 +520,7 @@ msgstr "Удалить"
 
 #: templates/part.choosecalendar.rowfields.shared.php:4
 msgid "shared with you by"
-msgstr "с вами поделился"
+msgstr "опубликовал для вас"
 
 #: templates/part.editcalendar.php:9
 msgid "New calendar"
@@ -581,7 +581,7 @@ msgstr "Участники"
 
 #: templates/part.eventform.php:13
 msgid "Share"
-msgstr "Поделиться"
+msgstr "Опубликовать"
 
 #: templates/part.eventform.php:21
 msgid "Title of the Event"
diff --git a/l10n/ru/contacts.po b/l10n/ru/contacts.po
index e4c51a539b..4476c9a4e1 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-24 02:02+0200\n"
-"PO-Revision-Date: 2012-08-24 00:02+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-25 02:04+0200\n"
+"PO-Revision-Date: 2012-08-24 13:10+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"
@@ -88,7 +88,7 @@ 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: "
@@ -221,7 +221,7 @@ msgstr "Не удалось загрузить временное изображ
 msgid "No file was uploaded. Unknown error"
 msgstr "Файл не был загружен. Неизвестная ошибка"
 
-#: appinfo/app.php:21
+#: appinfo/app.php:25
 msgid "Contacts"
 msgstr "Контакты"
 
@@ -249,15 +249,15 @@ msgstr "Ошибка"
 
 #: js/contacts.js:424
 msgid "You do not have permission to add contacts to "
-msgstr ""
+msgstr "У вас нет разрешений добавлять контакты в"
 
 #: js/contacts.js:425
 msgid "Please select one of your own address books."
-msgstr ""
+msgstr "Выберите одну из ваших собственных адресных книг."
 
 #: js/contacts.js:425
 msgid "Permission error"
-msgstr ""
+msgstr "Ошибка доступа"
 
 #: js/contacts.js:763
 msgid "This property has to be non-empty."
@@ -445,7 +445,7 @@ msgstr "Клиенты"
 
 #: lib/app.php:256
 msgid "Deliverer"
-msgstr ""
+msgstr "Посыльный"
 
 #: lib/app.php:257
 msgid "Holidays"
@@ -489,11 +489,11 @@ msgstr "Контакт"
 
 #: lib/vcard.php:408
 msgid "You do not have the permissions to edit this contact."
-msgstr ""
+msgstr "У вас нет разрешений редактировать этот контакт."
 
 #: lib/vcard.php:483
 msgid "You do not have the permissions to delete this contact."
-msgstr ""
+msgstr "У вас нет разрешений удалять этот контакт."
 
 #: templates/index.php:14
 msgid "Add Contact"
@@ -669,7 +669,7 @@ msgstr "Удалить номер телефона"
 
 #: templates/part.contact.php:100
 msgid "Instant Messenger"
-msgstr ""
+msgstr "Instant Messenger"
 
 #: templates/part.contact.php:101
 msgid "Delete IM"
@@ -701,7 +701,7 @@ msgstr "Ящик эл. почты"
 
 #: templates/part.contact.php:131
 msgid "Instant Messaging"
-msgstr ""
+msgstr "Быстрые сообщения"
 
 #: templates/part.contact.php:132
 msgid "Address"
@@ -916,15 +916,15 @@ 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 "Share"
-msgstr ""
+msgstr "Опубликовать"
 
 #: templates/settings.php:29
 msgid "Download"
diff --git a/l10n/ru/files.po b/l10n/ru/files.po
index dcab1d3890..624859e9c9 100644
--- a/l10n/ru/files.po
+++ b/l10n/ru/files.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-24 02:02+0200\n"
-"PO-Revision-Date: 2012-08-23 17:08+0000\n"
+"POT-Creation-Date: 2012-08-25 02:04+0200\n"
+"PO-Revision-Date: 2012-08-24 13:06+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"
@@ -57,7 +57,7 @@ msgstr "Ошибка записи на диск"
 msgid "Files"
 msgstr "Файлы"
 
-#: js/fileactions.js:107 templates/index.php:56
+#: js/fileactions.js:111 templates/index.php:56
 msgid "Delete"
 msgstr "Удалить"
 
@@ -119,7 +119,7 @@ msgstr "Размер"
 
 #: js/files.js:704 templates/index.php:56
 msgid "Modified"
-msgstr "Изменен"
+msgstr "Изменён"
 
 #: js/files.js:731
 msgid "folder"
@@ -143,7 +143,7 @@ msgstr "Управление файлами"
 
 #: templates/admin.php:7
 msgid "Maximum upload size"
-msgstr "Максимальный размер файла"
+msgstr "Максимальный размер загружаемого файла"
 
 #: templates/admin.php:7
 msgid "max. possible: "
@@ -151,11 +151,11 @@ msgstr "макс. возможно: "
 
 #: templates/admin.php:9
 msgid "Needed for multi-file and folder downloads."
-msgstr "Требуется для загрузки нескольких файорв и папок"
+msgstr "Требуется для скачивания нескольких файлов и папок"
 
 #: templates/admin.php:9
 msgid "Enable ZIP-download"
-msgstr "Включить ZIP-загрузку"
+msgstr "Включить ZIP-скачивание"
 
 #: templates/admin.php:11
 msgid "0 is unlimited"
@@ -183,15 +183,15 @@ 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"
@@ -199,7 +199,7 @@ msgstr "Название"
 
 #: templates/index.php:49
 msgid "Share"
-msgstr "Поделиться"
+msgstr "Опубликовать"
 
 #: templates/index.php:51
 msgid "Download"
@@ -213,7 +213,7 @@ 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."
diff --git a/l10n/ru/files_encryption.po b/l10n/ru/files_encryption.po
index 51c8bc94cc..5ae5f48522 100644
--- a/l10n/ru/files_encryption.po
+++ b/l10n/ru/files_encryption.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Denis  <reg.transifex.net@demitel.ru>, 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-25 02:04+0200\n"
+"PO-Revision-Date: 2012-08-24 07:47+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"
@@ -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/ru/files_external.po b/l10n/ru/files_external.po
index 72084a423c..7e2f7fe861 100644
--- a/l10n/ru/files_external.po
+++ b/l10n/ru/files_external.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Denis  <reg.transifex.net@demitel.ru>, 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-25 02:04+0200\n"
+"PO-Revision-Date: 2012-08-24 07:35+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"
@@ -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/ru/files_sharing.po b/l10n/ru/files_sharing.po
index 915d33bafb..39aaa41151 100644
--- a/l10n/ru/files_sharing.po
+++ b/l10n/ru/files_sharing.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Denis  <reg.transifex.net@demitel.ru>, 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-25 02:04+0200\n"
+"PO-Revision-Date: 2012-08-24 07:48+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"
@@ -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/ru/files_versions.po b/l10n/ru/files_versions.po
index f9d067172c..466c1629db 100644
--- a/l10n/ru/files_versions.po
+++ b/l10n/ru/files_versions.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Denis  <reg.transifex.net@demitel.ru>, 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-25 02:04+0200\n"
+"PO-Revision-Date: 2012-08-24 07:24+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"
@@ -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/ru/lib.po b/l10n/ru/lib.po
index 97723dd617..8c24f83b94 100644
--- a/l10n/ru/lib.po
+++ b/l10n/ru/lib.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Denis  <reg.transifex.net@demitel.ru>, 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-25 02:04+0200\n"
+"PO-Revision-Date: 2012-08-24 09:37+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"
@@ -17,96 +18,96 @@ 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"
 
-#: 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 "Admin"
 
-#: 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 "Токен просрочен. Перезагрузите страницу."
 
 #: 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/ru/tasks.po b/l10n/ru/tasks.po
index 202e76b9a5..d7a46fb6a8 100644
--- a/l10n/ru/tasks.po
+++ b/l10n/ru/tasks.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Denis  <reg.transifex.net@demitel.ru>, 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-25 02:04+0200\n"
+"PO-Revision-Date: 2012-08-24 07:18+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"
@@ -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 "Order List"
 
 #: 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/ru/user_ldap.po b/l10n/ru/user_ldap.po
index 01320218dc..bb1f2d6239 100644
--- a/l10n/ru/user_ldap.po
+++ b/l10n/ru/user_ldap.po
@@ -3,13 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <4671992@gmail.com>, 2012.
+# Denis  <reg.transifex.net@demitel.ru>, 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-25 02:04+0200\n"
+"PO-Revision-Date: 2012-08-24 15:13+0000\n"
+"Last-Translator: wpns <4671992@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"
@@ -19,75 +21,75 @@ 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 "Вы можете задать Base 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=агент, dc=пример, 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\"."
@@ -95,7 +97,7 @@ msgstr ""
 
 #: templates/settings.php:17
 msgid "Port"
-msgstr ""
+msgstr "Порт"
 
 #: templates/settings.php:18
 msgid "Base User Tree"
@@ -111,11 +113,11 @@ 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)"
@@ -123,7 +125,7 @@ msgstr ""
 
 #: templates/settings.php:23
 msgid "Turn off SSL certificate validation."
-msgstr ""
+msgstr "Отключить проверку сертификата SSL."
 
 #: templates/settings.php:23
 msgid ""
@@ -133,7 +135,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,12 +155,12 @@ msgstr ""
 
 #: 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/ru/user_migrate.po b/l10n/ru/user_migrate.po
index bf0f6d4c8b..79fd4f0cfa 100644
--- a/l10n/ru/user_migrate.po
+++ b/l10n/ru/user_migrate.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Denis  <reg.transifex.net@demitel.ru>, 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-25 02:04+0200\n"
+"PO-Revision-Date: 2012-08-24 07:55+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"
@@ -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"
 
 #: templates/settings.php:17
 msgid "Import"
-msgstr ""
+msgstr "Импорт"
diff --git a/l10n/ru/user_openid.po b/l10n/ru/user_openid.po
index 354e17e01d..22feb4f291 100644
--- a/l10n/ru/user_openid.po
+++ b/l10n/ru/user_openid.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Denis  <reg.transifex.net@demitel.ru>, 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-25 02:04+0200\n"
+"PO-Revision-Date: 2012-08-24 07:00+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"
@@ -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 "Realm: <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/sl/contacts.po b/l10n/sl/contacts.po
index c721143614..a31210ca6e 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-24 02:02+0200\n"
-"PO-Revision-Date: 2012-08-24 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-25 02:04+0200\n"
+"PO-Revision-Date: 2012-08-24 09: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"
@@ -217,7 +217,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:21
+#: appinfo/app.php:25
 msgid "Contacts"
 msgstr "Stiki"
 
@@ -245,15 +245,15 @@ msgstr "Napaka"
 
 #: js/contacts.js:424
 msgid "You do not have permission to add contacts to "
-msgstr ""
+msgstr "Nimate dovoljenja za dodajanje stikov v"
 
 #: js/contacts.js:425
 msgid "Please select one of your own address books."
-msgstr ""
+msgstr "Prosimo, če izberete enega izmed vaših adresarjev."
 
 #: js/contacts.js:425
 msgid "Permission error"
-msgstr ""
+msgstr "Napaka dovoljenj"
 
 #: js/contacts.js:763
 msgid "This property has to be non-empty."
@@ -485,11 +485,11 @@ msgstr "Stik"
 
 #: lib/vcard.php:408
 msgid "You do not have the permissions to edit this contact."
-msgstr ""
+msgstr "Nimate dovoljenj za urejanje tega stika."
 
 #: lib/vcard.php:483
 msgid "You do not have the permissions to delete this contact."
-msgstr ""
+msgstr "Nimate dovoljenj za izbris tega stika."
 
 #: templates/index.php:14
 msgid "Add Contact"
diff --git a/l10n/sv/contacts.po b/l10n/sv/contacts.po
index 4e4a64bd2c..635ea51f8e 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-24 02:02+0200\n"
-"PO-Revision-Date: 2012-08-24 00:02+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-25 02:04+0200\n"
+"PO-Revision-Date: 2012-08-24 07:00+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"
@@ -220,7 +220,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:21
+#: appinfo/app.php:25
 msgid "Contacts"
 msgstr "Kontakter"
 
@@ -248,15 +248,15 @@ msgstr "Fel"
 
 #: js/contacts.js:424
 msgid "You do not have permission to add contacts to "
-msgstr ""
+msgstr "Du saknar behörighet att skapa kontakter i"
 
 #: js/contacts.js:425
 msgid "Please select one of your own address books."
-msgstr ""
+msgstr "Välj en av dina egna adressböcker."
 
 #: js/contacts.js:425
 msgid "Permission error"
-msgstr ""
+msgstr "Behörighetsfel"
 
 #: js/contacts.js:763
 msgid "This property has to be non-empty."
@@ -488,11 +488,11 @@ msgstr "Kontakt"
 
 #: lib/vcard.php:408
 msgid "You do not have the permissions to edit this contact."
-msgstr ""
+msgstr "Du saknar behörighet för att ändra denna kontakt."
 
 #: lib/vcard.php:483
 msgid "You do not have the permissions to delete this contact."
-msgstr ""
+msgstr "Du saknar behörighet för att radera denna kontakt."
 
 #: templates/index.php:14
 msgid "Add Contact"
diff --git a/l10n/templates/admin_dependencies_chk.pot b/l10n/templates/admin_dependencies_chk.pot
index c4d46ecc46..ae9512efe8 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-24 02:01+0200\n"
+"POT-Creation-Date: 2012-08-25 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 e72d72e374..78b49fcdb8 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-24 02:01+0200\n"
+"POT-Creation-Date: 2012-08-25 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 9d10db08ba..7668869f08 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-24 02:02+0200\n"
+"POT-Creation-Date: 2012-08-25 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 64b4584db7..b1a31a8a73 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-24 02:02+0200\n"
+"POT-Creation-Date: 2012-08-25 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"
@@ -67,7 +67,7 @@ msgstr ""
 msgid "Invalid request"
 msgstr ""
 
-#: appinfo/app.php:37 templates/calendar.php:15
+#: appinfo/app.php:41 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 6b35ece6d7..0166743621 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-24 02:02+0200\n"
+"POT-Creation-Date: 2012-08-25 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"
@@ -214,7 +214,7 @@ msgstr ""
 msgid "No file was uploaded. Unknown error"
 msgstr ""
 
-#: appinfo/app.php:21
+#: appinfo/app.php:25
 msgid "Contacts"
 msgstr ""
 
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index 2849d9d546..e5769a1a08 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-24 02:02+0200\n"
+"POT-Creation-Date: 2012-08-25 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 3b44bf95e0..603136b53b 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-24 02:02+0200\n"
+"POT-Creation-Date: 2012-08-25 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"
@@ -51,7 +51,7 @@ msgstr ""
 msgid "Files"
 msgstr ""
 
-#: js/fileactions.js:107 templates/index.php:56
+#: js/fileactions.js:111 templates/index.php:56
 msgid "Delete"
 msgstr ""
 
diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot
index 11b30e234d..4abd4bfe4a 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-24 02:02+0200\n"
+"POT-Creation-Date: 2012-08-25 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 bfc76cf3e8..b845f7d27d 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-24 02:02+0200\n"
+"POT-Creation-Date: 2012-08-25 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 9403fd1cb8..d95745ec23 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-24 02:02+0200\n"
+"POT-Creation-Date: 2012-08-25 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 f3d7fe95db..7a55f7e131 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-24 02:02+0200\n"
+"POT-Creation-Date: 2012-08-25 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 974a3600c8..f4431a9c81 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-24 02:02+0200\n"
+"POT-Creation-Date: 2012-08-25 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 9f10129eab..3f4dc1e461 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-24 02:02+0200\n"
+"POT-Creation-Date: 2012-08-25 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 628c493ff3..c3946d4ab8 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-24 02:02+0200\n"
+"POT-Creation-Date: 2012-08-25 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 3ce71ef31c..b8338fb6fc 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-24 02:02+0200\n"
+"POT-Creation-Date: 2012-08-25 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 876cc1deab..5f237d3c50 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-24 02:02+0200\n"
+"POT-Creation-Date: 2012-08-25 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 815e4a59db..808b7c6d3b 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-24 02:02+0200\n"
+"POT-Creation-Date: 2012-08-25 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 50810fb368..6a63226f92 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-24 02:02+0200\n"
+"POT-Creation-Date: 2012-08-25 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 1fe92139e3..144f4bece5 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-24 02:02+0200\n"
+"POT-Creation-Date: 2012-08-25 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/zh_CN/bookmarks.po b/l10n/zh_CN/bookmarks.po
index 1164856a06..65c4c5efc1 100644
--- a/l10n/zh_CN/bookmarks.po
+++ b/l10n/zh_CN/bookmarks.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <appweb.cn@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-25 02:04+0200\n"
+"PO-Revision-Date: 2012-08-24 01:10+0000\n"
+"Last-Translator: hanfeng <appweb.cn@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"
@@ -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 "书签应用"
diff --git a/l10n/zh_CN/files.po b/l10n/zh_CN/files.po
index 84d5ee092d..8698bb536d 100644
--- a/l10n/zh_CN/files.po
+++ b/l10n/zh_CN/files.po
@@ -3,15 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <appweb.cn@gmail.com>, 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-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-25 02:04+0200\n"
+"PO-Revision-Date: 2012-08-24 01:52+0000\n"
+"Last-Translator: hanfeng <appweb.cn@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"
@@ -53,7 +54,7 @@ msgstr "写入磁盘失败"
 msgid "Files"
 msgstr "文件"
 
-#: js/fileactions.js:107 templates/index.php:56
+#: js/fileactions.js:111 templates/index.php:56
 msgid "Delete"
 msgstr "删除"
 
@@ -75,7 +76,7 @@ msgstr "已经替换"
 
 #: js/filelist.js:195
 msgid "with"
-msgstr ""
+msgstr "随着"
 
 #: js/filelist.js:195 js/filelist.js:246
 msgid "undo"
diff --git a/l10n/zh_TW/settings.po b/l10n/zh_TW/settings.po
index 49d33a6153..d333fc726b 100644
--- a/l10n/zh_TW/settings.po
+++ b/l10n/zh_TW/settings.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # Donahue Chuang <soshinwu@gmail.com>, 2012.
+#   <weiyu871@ms14.url.com.tw>, 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-25 02:04+0200\n"
+"PO-Revision-Date: 2012-08-24 03:42+0000\n"
+"Last-Translator: weiyu <weiyu871@ms14.url.com.tw>\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"
@@ -188,7 +189,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"
diff --git a/lib/l10n/nl.php b/lib/l10n/nl.php
new file mode 100644
index 0000000000..01bc4d3e19
--- /dev/null
+++ b/lib/l10n/nl.php
@@ -0,0 +1,25 @@
+<?php $TRANSLATIONS = array(
+"Help" => "Help",
+"Personal" => "Persoonlijk",
+"Settings" => "Instellingen",
+"Users" => "Gebruikers",
+"Apps" => "Apps",
+"Admin" => "Administrator",
+"ZIP download is turned off." => "ZIP download is uitgeschakeld.",
+"Files need to be downloaded one by one." => "Bestanden moeten één voor één worden gedownload.",
+"Back to Files" => "Terug naar bestanden",
+"Selected files too large to generate zip file." => "De geselecteerde bestanden zijn te groot om een zip bestand te maken.",
+"Application is not enabled" => "De applicatie is niet actief",
+"Authentication error" => "Authenticatie fout",
+"Token expired. Please reload page." => "Token verlopen.  Herlaad de pagina.",
+"seconds ago" => "seconden geleden",
+"1 minute ago" => "1 minuut geleden",
+"%d minutes ago" => "%d minuten geleden",
+"today" => "vandaag",
+"yesterday" => "gisteren",
+"%d days ago" => "%d dagen geleden",
+"last month" => "vorige maand",
+"months ago" => "maanden geleden",
+"last year" => "vorig jaar",
+"years ago" => "jaar geleden"
+);
diff --git a/lib/l10n/ru.php b/lib/l10n/ru.php
new file mode 100644
index 0000000000..07dacc598a
--- /dev/null
+++ b/lib/l10n/ru.php
@@ -0,0 +1,25 @@
+<?php $TRANSLATIONS = array(
+"Help" => "Помощь",
+"Personal" => "Личное",
+"Settings" => "Настройки",
+"Users" => "Пользователи",
+"Apps" => "Приложения",
+"Admin" => "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/nl.php b/settings/l10n/nl.php
index a1db0f457f..6048cbd63b 100644
--- a/settings/l10n/nl.php
+++ b/settings/l10n/nl.php
@@ -1,13 +1,21 @@
 <?php $TRANSLATIONS = array(
+"Unable to load list from App Store" => "Kan de lijst niet van de App store laden",
 "Email saved" => "E-mail bewaard",
 "Invalid email" => "Ongeldige e-mail",
 "OpenID Changed" => "OpenID is aangepast",
 "Invalid request" => "Ongeldig verzoek",
+"Authentication error" => "Authenticatie fout",
 "Language changed" => "Taal aangepast",
+"Error" => "Fout",
 "Disable" => "Uitschakelen",
 "Enable" => "Inschakelen",
 "Saving..." => "Aan het bewaren.....",
 "__language_name__" => "Nederlands",
+"Security Warning" => "Veiligheidswaarschuwing",
+"Cron" => "Cron",
+"execute one task with each page loaded" => "Voer 1 taak uit bij elke geladen pagina",
+"cron.php is registered at a webcron service" => "cron.php is geregistreerd bij een webcron service",
+"use systems cron service" => "gebruik de systeem cron service",
 "Log" => "Log",
 "More" => "Meer",
 "Add your App" => "Voeg je App toe",
@@ -43,6 +51,7 @@
 "Create" => "Creëer",
 "Default Quota" => "Standaard limiet",
 "Other" => "Andere",
+"Group Admin" => "Groep Administrator",
 "Quota" => "Limieten",
 "Delete" => "verwijderen"
 );
diff --git a/settings/l10n/pt_BR.php b/settings/l10n/pt_BR.php
index e8154dfca7..57aaa27260 100644
--- a/settings/l10n/pt_BR.php
+++ b/settings/l10n/pt_BR.php
@@ -3,11 +3,16 @@
 "Invalid email" => "Email inválido",
 "OpenID Changed" => "Mudou OpenID",
 "Invalid request" => "Pedido inválido",
+"Authentication error" => "erro de autenticação",
 "Language changed" => "Mudou Idioma",
+"Error" => "Erro",
 "Disable" => "Desabilitado",
 "Enable" => "Habilitado",
 "Saving..." => "Gravando...",
 "__language_name__" => "Português",
+"Security Warning" => "Aviso de Segurança",
+"execute one task with each page loaded" => "executar uma tarefa com cada página em aberto",
+"cron.php is registered at a webcron service" => "cron.php esta registrado no serviço de webcron",
 "Log" => "Log",
 "More" => "Mais",
 "Add your App" => "Adicione seu Aplicativo",
@@ -43,6 +48,7 @@
 "Create" => "Criar",
 "Default Quota" => "Quota Padrão",
 "Other" => "Outro",
+"Group Admin" => "Grupo Administrativo",
 "Quota" => "Cota",
 "Delete" => "Apagar"
 );
diff --git a/settings/l10n/zh_TW.php b/settings/l10n/zh_TW.php
index aeb1db4871..0218133f65 100644
--- a/settings/l10n/zh_TW.php
+++ b/settings/l10n/zh_TW.php
@@ -27,7 +27,7 @@
 "Change password" => "變更密碼",
 "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" => "使用這個位址去連接到你的私有雲檔案管理員",

From 59eb693e5114bc7e2398f876caccba99d39c4316 Mon Sep 17 00:00:00 2001
From: jfd <jfd@lance>
Date: Sat, 25 Aug 2012 02:13:15 +0200
Subject: [PATCH 0893/1224] fix typo in db_structure

---
 db_structure.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/db_structure.xml b/db_structure.xml
index 73ac2c2896..7e4c0bd203 100644
--- a/db_structure.xml
+++ b/db_structure.xml
@@ -498,7 +498,7 @@
 
    <field>
     <name>propertyvalue</name>
-    <type>test</type>
+    <type>text</type>
     <notnull>true</notnull>
    </field>
 

From bc90a34b07f3ab882394d18cf0da17b3b5ea5edc Mon Sep 17 00:00:00 2001
From: jfd <jfd@lance>
Date: Sat, 25 Aug 2012 02:13:32 +0200
Subject: [PATCH 0894/1224] remove duplicate method

---
 lib/filesystem.php | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/lib/filesystem.php b/lib/filesystem.php
index 0a8e698215..82fbf11afd 100644
--- a/lib/filesystem.php
+++ b/lib/filesystem.php
@@ -358,20 +358,6 @@ class OC_Filesystem{
 		return $newpath;
 	}
 	
-	/**
-	* 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

From 379f27ed03fc6cc1b83cfea4921390906ca33514 Mon Sep 17 00:00:00 2001
From: jfd <jfd@lance>
Date: Sat, 25 Aug 2012 02:17:44 +0200
Subject: [PATCH 0895/1224] fix missing $

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

diff --git a/lib/db.php b/lib/db.php
index d67cebce58..5ef67202a1 100644
--- a/lib/db.php
+++ b/lib/db.php
@@ -263,7 +263,7 @@ class OC_DB {
 	 */
 	static public function prepare( $query , $limit=null, $offset=null ){
 		
-		if (!is_null($limit) && limit != -1) {
+		if (!is_null($limit) && $limit != -1) {
 			if (self::$backend == self::BACKEND_MDB2) {
 				//MDB2 uses or emulates limits & offset internally
 				self::$MDB2->setLimit($limit, $offset);

From 1bfe26bb097d163ff1a6e7e1a1aee5dd9c628f79 Mon Sep 17 00:00:00 2001
From: jfd <jfd@lance>
Date: Sat, 25 Aug 2012 02:26:50 +0200
Subject: [PATCH 0896/1224] remove superflous LIMIT

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

diff --git a/lib/user/database.php b/lib/user/database.php
index 1746c4fe0c..dff4d145fc 100644
--- a/lib/user/database.php
+++ b/lib/user/database.php
@@ -155,7 +155,7 @@ class OC_User_Database extends OC_User_Backend {
 	 * Get a list of all users.
 	 */
 	public function getUsers($search = '', $limit = null, $offset = null) {
-		$query = OC_DB::prepare('SELECT `uid` FROM `*PREFIX*users` WHERE `uid` LIKE ? LIMIT',$limit,$offset);
+		$query = OC_DB::prepare('SELECT `uid` FROM `*PREFIX*users` WHERE `uid` LIKE ?',$limit,$offset);
 		$result = $query->execute(array($search.'%'));
 		$users = array();
 		while ($row = $result->fetchRow()) {

From e8ffd5c04249f84770e618eeb57f39c2e93afe35 Mon Sep 17 00:00:00 2001
From: jfd <jfd@lance>
Date: Sat, 25 Aug 2012 02:27:43 +0200
Subject: [PATCH 0897/1224] use limit parameter instead of LIMIT SQL for vcard

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

diff --git a/apps/contacts/lib/vcard.php b/apps/contacts/lib/vcard.php
index 042ad1e990..91a5b806b1 100644
--- a/apps/contacts/lib/vcard.php
+++ b/apps/contacts/lib/vcard.php
@@ -48,31 +48,23 @@ class OC_Contacts_VCard {
 	 * ['carddata']
 	 */
 	public static function all($id, $start=null, $num=null){
-		//FIXME jfd: use limit & offset as OC_DB::prepare parameters for oracle support
-		$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`'.$limitsql;
+			$sql = 'SELECT * FROM `*PREFIX*contacts_cards` WHERE `addressbookid` IN ('.$id_sql.') ORDER BY `fullname`';
 			try {
-				$stmt = OCP\DB::prepare( $prep );
+				$stmt = OCP\DB::prepare( $sql, $num, $start );
 				$result = $stmt->execute($id);
 			} catch(Exception $e) {
 				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);
+				OCP\Util::writeLog('contacts', __METHOD__.'SQL:'.$sql, OCP\Util::DEBUG);
 				return false;
 			}
 		} elseif(is_int($id) || is_string($id)) {
 			try {
-				$sql = 'SELECT * FROM `*PREFIX*contacts_cards` WHERE `addressbookid` = ? ORDER BY `fullname`'.$limitsql;
-				$stmt = OCP\DB::prepare( $sql );
+				$sql = 'SELECT * FROM `*PREFIX*contacts_cards` WHERE `addressbookid` = ? ORDER BY `fullname`';
+				$stmt = OCP\DB::prepare( $sql, $num, $start );
 				$result = $stmt->execute(array($id));
 			} catch(Exception $e) {
 				OCP\Util::writeLog('contacts', __METHOD__.', exception: '.$e->getMessage(), OCP\Util::ERROR);

From dc3bec62113b39254c4488b0502d7852328fdc84 Mon Sep 17 00:00:00 2001
From: jfd <jfd@lance>
Date: Sat, 25 Aug 2012 03:13:59 +0200
Subject: [PATCH 0898/1224] OC_Share no longer exists. remove hooks that would
 trigger require_once / autoloading failures, so i can at least upload files

---
 apps/admin_audit/appinfo/app.php        |  3 ++
 apps/admin_audit/lib/hooks_handlers.php |  3 +-
 apps/files_sharing/get.php              |  2 +
 apps/files_versions/lib/versions.php    | 63 +++++++++++++------------
 4 files changed, 41 insertions(+), 30 deletions(-)

diff --git a/apps/admin_audit/appinfo/app.php b/apps/admin_audit/appinfo/app.php
index e52f633cf1..2cbed5bf57 100644
--- a/apps/admin_audit/appinfo/app.php
+++ b/apps/admin_audit/appinfo/app.php
@@ -13,6 +13,9 @@ OCP\Util::connectHook(OC_Filesystem::CLASSNAME, OC_Filesystem::signal_write, 'OC
 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');
 
+//FIXME OC_Share does no longer exist
+/*
 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');
+*/
\ No newline at end of file
diff --git a/apps/admin_audit/lib/hooks_handlers.php b/apps/admin_audit/lib/hooks_handlers.php
index c5aec97d93..17a553837d 100644
--- a/apps/admin_audit/lib/hooks_handlers.php
+++ b/apps/admin_audit/lib/hooks_handlers.php
@@ -63,7 +63,8 @@ class OC_Admin_Audit_Hooks_Handlers {
 		$permissions = $params['permissions'];
 		$with = $params['with'];
 		$user = OCP\User::getUser();
-		$rw = $permissions & OC_Share::WRITE ? 'w' : 'o';
+		//$rw = $permissions & OC_Share::WRITE ? 'w' : 'o'; //FIXME OC_Share no longer exists, hack to check permissions
+		$rw = $permissions & 1 ? 'w' : 'o';
 		self::log('Shared "'.$path.'" (r'.$rw.') with user "'.$with.'" by '.$user);
 	}
 	static protected function log($msg) {
diff --git a/apps/files_sharing/get.php b/apps/files_sharing/get.php
index 1d219719b2..bcbe5985fb 100644
--- a/apps/files_sharing/get.php
+++ b/apps/files_sharing/get.php
@@ -4,6 +4,7 @@ $RUNTIME_APPTYPES=array('authentication');
 OC_App::loadApps($RUNTIME_APPTYPES);
 
 OCP\JSON::checkAppEnabled('files_sharing');
+//FIXME lib_share / OC_Share no longer exists
 require_once 'lib_share.php';
 
 //get the path of the shared file
@@ -75,6 +76,7 @@ if (isset($_GET['token']) && $source = OC_Share::getSource($_GET['token'])) {
 		header("Content-Length: " . OC_Filesystem::filesize($source));
 		//download the file
 		@ob_clean();
+		//FIXME OC_Share no longer exists
 		OCP\Util::emitHook('OC_Share', 'public-download', array('source'=>$source, 'token'=>$token));
 		OC_Filesystem::readfile($source);
 	}
diff --git a/apps/files_versions/lib/versions.php b/apps/files_versions/lib/versions.php
index f146676757..30f0b93a7f 100644
--- a/apps/files_versions/lib/versions.php
+++ b/apps/files_versions/lib/versions.php
@@ -64,14 +64,15 @@ class Storage {
 			$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);
-				$filename = substr($source, $pos + 6);
-			} else {
+                        
+			//FIXME OC_Share no longer exists
+			//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') .  $this->view->getAbsolutePath('');
 				
@@ -134,13 +135,14 @@ class Storage {
 			$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);
-				$filename = substr($source, $pos + 6);
-			} else {
+			//FIXME OC_Share no longer exists
+			//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();
-			}
+			//}
 				
 			// rollback
 			if( @$users_view->copy('files_versions'.$filename.'.v'.$revision, 'files'.$filename) ) {
@@ -163,10 +165,11 @@ 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);
-				$filename = substr($source, $pos + 6);
-			}
+			//FIXME OC_Share no longer exists
+			//if (\OCP\App::isEnabled('files_sharing') && $source = \OC_Share::getSource('/'.\OCP\User::getUser().'/files'.$filename)) {
+			//	$pos = strpos($source, '/files', 1);
+			//	$filename = substr($source, $pos + 6);
+			//}
 
 			$versionsFolderName=\OCP\Config::getSystemValue('datadirectory'). $versions_fileview->getAbsolutePath('');
 			
@@ -194,13 +197,14 @@ class Storage {
 
 		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 {
+			//FIXME OC_Share no longer exists
+			//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();
-			}
+			//}
 			$versions_fileview = \OCP\Files::getStorage('files_versions');
 			$versionsFolderName = \OCP\Config::getSystemValue('datadirectory'). $versions_fileview->getAbsolutePath('');
 			$versions = array();
@@ -267,13 +271,14 @@ class Storage {
 	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 {
+			//FIXME OC_Share no longer exists
+			//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();
-			}
+			//}
 			$versions_fileview = \OCP\Files::getStorage("files_versions");
 			$versionsFolderName=\OCP\Config::getSystemValue('datadirectory'). $versions_fileview->getAbsolutePath('');
 

From 80374c7cb2f3c98e350c95f92a9785aacef5d2c4 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Sat, 25 Aug 2012 14:35:24 +0200
Subject: [PATCH 0899/1224] fix UI bug with subadmins

---
 settings/js/users.js | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/settings/js/users.js b/settings/js/users.js
index bf0bd10864..6026b22d1a 100644
--- a/settings/js/users.js
+++ b/settings/js/users.js
@@ -88,8 +88,10 @@ UserList={
 		});
 		tr.find('td.groups').append(groupsSelect);
 		UserList.applyMultiplySelect(groupsSelect);
-		tr.find('td.subadmins').append(subadminSelect);
-		UserList.applyMultiplySelect(subadminSelect);
+		if (tr.find('td.subadmins').length > 0) {
+			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) {

From b75802cca7c60afa1bf9ad90c307aa4ae4ffa82e Mon Sep 17 00:00:00 2001
From: Cornelius Schumacher <schumacher@kde.org>
Date: Sun, 26 Aug 2012 00:45:54 +0300
Subject: [PATCH 0900/1224] Fix URL to sources

---
 README | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README b/README
index 77379a4645..b968d13e2b 100644
--- a/README
+++ b/README
@@ -5,7 +5,7 @@ http://ownCloud.org
 
 Installation instructions: http://owncloud.org/support
 
-Source code: http://gitorious.org/owncloud
+Source code: http://github.com/owncloud
 Mailing list: http://mail.kde.org/mailman/listinfo/owncloud
 IRC channel: http://webchat.freenode.net/?channels=owncloud
 Diaspora: https://joindiaspora.com/u/owncloud

From c915998f40ec57fcab4efa63a7e818c12d5c9e00 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@statuscode.ch>
Date: Sun, 26 Aug 2012 00:52:00 +0300
Subject: [PATCH 0901/1224] I like TLS/SSL

---
 README | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/README b/README
index b968d13e2b..7c60e81a7b 100644
--- a/README
+++ b/README
@@ -5,9 +5,9 @@ http://ownCloud.org
 
 Installation instructions: http://owncloud.org/support
 
-Source code: http://github.com/owncloud
-Mailing list: http://mail.kde.org/mailman/listinfo/owncloud
-IRC channel: http://webchat.freenode.net/?channels=owncloud
+Source code: https://github.com/owncloud
+Mailing list: https://mail.kde.org/mailman/listinfo/owncloud
+IRC channel: https://webchat.freenode.net/?channels=owncloud
 Diaspora: https://joindiaspora.com/u/owncloud
-Identi.ca: http://identi.ca/owncloud
+Identi.ca: https://identi.ca/owncloud
 

From c82518cb0e3d0720b4c6fd6fd725ef1eda8af64f Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <thomas.mueller@tmit.eu>
Date: Sun, 26 Aug 2012 00:12:05 +0200
Subject: [PATCH 0902/1224] [tx-robot] updated from transifex

---
 apps/calendar/l10n/da.php                 |  2 --
 apps/calendar/l10n/de.php                 |  3 ---
 apps/calendar/l10n/gl.php                 |  9 -------
 apps/calendar/l10n/hr.php                 |  1 -
 apps/calendar/l10n/ja_JP.php              |  1 -
 apps/calendar/l10n/lb.php                 | 10 ++-----
 apps/calendar/l10n/lt_LT.php              |  6 -----
 apps/calendar/l10n/nb_NO.php              | 13 ---------
 apps/calendar/l10n/pl.php                 |  4 ---
 apps/calendar/l10n/pt_PT.php              |  2 --
 apps/calendar/l10n/ro.php                 |  6 -----
 apps/calendar/l10n/ru.php                 |  2 --
 apps/calendar/l10n/sv.php                 |  4 ---
 apps/calendar/l10n/zh_CN.php              | 11 --------
 apps/calendar/l10n/zh_TW.php              |  7 -----
 apps/contacts/l10n/ca.php                 |  6 -----
 apps/contacts/l10n/cs_CZ.php              |  6 -----
 apps/contacts/l10n/el.php                 |  6 -----
 apps/contacts/l10n/es.php                 |  6 -----
 apps/contacts/l10n/et_EE.php              |  6 -----
 apps/contacts/l10n/eu.php                 |  6 -----
 apps/contacts/l10n/fa.php                 |  6 -----
 apps/contacts/l10n/fr.php                 |  6 -----
 apps/contacts/l10n/ia.php                 |  4 ---
 apps/contacts/l10n/it.php                 |  6 -----
 apps/contacts/l10n/mk.php                 |  6 -----
 apps/contacts/l10n/nb_NO.php              |  7 -----
 apps/contacts/l10n/nl.php                 |  6 -----
 apps/contacts/l10n/sk_SK.php              |  6 -----
 apps/contacts/l10n/sl.php                 |  6 -----
 apps/contacts/l10n/th_TH.php              |  6 -----
 apps/contacts/l10n/tr.php                 |  6 -----
 apps/contacts/l10n/zh_TW.php              |  4 ---
 apps/files/l10n/ar.php                    |  3 ---
 apps/files/l10n/bg_BG.php                 |  3 ---
 apps/files/l10n/ca.php                    |  4 ---
 apps/files/l10n/cs_CZ.php                 |  4 ---
 apps/files/l10n/da.php                    |  3 ---
 apps/files/l10n/de.php                    |  4 ---
 apps/files/l10n/el.php                    |  4 ---
 apps/files/l10n/eo.php                    |  4 ---
 apps/files/l10n/es.php                    |  4 ---
 apps/files/l10n/et_EE.php                 |  4 ---
 apps/files/l10n/eu.php                    |  4 ---
 apps/files/l10n/fa.php                    |  4 ---
 apps/files/l10n/fr.php                    |  4 ---
 apps/files/l10n/gl.php                    |  3 ---
 apps/files/l10n/he.php                    |  3 ---
 apps/files/l10n/hr.php                    |  3 ---
 apps/files/l10n/hu_HU.php                 |  4 ---
 apps/files/l10n/ia.php                    |  3 ---
 apps/files/l10n/id.php                    |  3 ---
 apps/files/l10n/it.php                    |  4 ---
 apps/files/l10n/ja_JP.php                 |  3 ---
 apps/files/l10n/ko.php                    |  4 ---
 apps/files/l10n/lb.php                    |  3 ---
 apps/files/l10n/lt_LT.php                 |  3 ---
 apps/files/l10n/mk.php                    |  4 ---
 apps/files/l10n/ms_MY.php                 |  3 ---
 apps/files/l10n/nb_NO.php                 |  4 ---
 apps/files/l10n/nl.php                    |  4 ---
 apps/files/l10n/nn_NO.php                 |  3 ---
 apps/files/l10n/pl.php                    |  3 ---
 apps/files/l10n/pt_BR.php                 |  4 ---
 apps/files/l10n/pt_PT.php                 |  3 ---
 apps/files/l10n/sk_SK.php                 |  1 -
 apps/files/l10n/sl.php                    |  3 +--
 apps/files/l10n/th_TH.php                 |  1 -
 apps/files/l10n/tr.php                    |  1 -
 apps/files/l10n/zh_CN.php                 |  1 -
 apps/files/l10n/zh_TW.php                 |  1 -
 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               |  8 +++---
 l10n/templates/core.pot                   | 32 +++++++++++++----------
 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 +-
 90 files changed, 42 insertions(+), 339 deletions(-)

diff --git a/apps/calendar/l10n/da.php b/apps/calendar/l10n/da.php
index a193d5e156..ea07fadb73 100644
--- a/apps/calendar/l10n/da.php
+++ b/apps/calendar/l10n/da.php
@@ -166,8 +166,6 @@
 "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",
-"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",
diff --git a/apps/calendar/l10n/de.php b/apps/calendar/l10n/de.php
index d91753ff74..223e80effb 100644
--- a/apps/calendar/l10n/de.php
+++ b/apps/calendar/l10n/de.php
@@ -168,13 +168,10 @@
 "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 bereits. Sollten Sie fortfahren, werden die beiden Kalender zusammengeführt.",
 "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",
 "General" => "Allgemein",
diff --git a/apps/calendar/l10n/gl.php b/apps/calendar/l10n/gl.php
index 00a28cc70f..ff7e4833ad 100644
--- a/apps/calendar/l10n/gl.php
+++ b/apps/calendar/l10n/gl.php
@@ -86,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",
@@ -139,12 +136,8 @@
 "occurrences" => "acontecementos",
 "create a new calendar" => "crear un novo calendario",
 "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",
 "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",
@@ -152,8 +145,6 @@
 "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",
 "Users" => "Usuarios",
diff --git a/apps/calendar/l10n/hr.php b/apps/calendar/l10n/hr.php
index 07512b9605..4ab5b95518 100644
--- a/apps/calendar/l10n/hr.php
+++ b/apps/calendar/l10n/hr.php
@@ -136,7 +136,6 @@
 "of" => "od",
 "at" => "na",
 "Timezone" => "Vremenska zona",
-"Timeformat" => "Format vremena",
 "24h" => "24h",
 "12h" => "12h",
 "Users" => "Korisnici",
diff --git a/apps/calendar/l10n/ja_JP.php b/apps/calendar/l10n/ja_JP.php
index e59f186a0b..3c7793a850 100644
--- a/apps/calendar/l10n/ja_JP.php
+++ b/apps/calendar/l10n/ja_JP.php
@@ -100,7 +100,6 @@
 "Nov." => "11月",
 "Dec." => "12月",
 "All day" => "終日",
-"New Calendar" => "新しくカレンダーを作成する",
 "Missing fields" => "項目がありません",
 "Title" => "タイトル",
 "From Date" => "開始日",
diff --git a/apps/calendar/l10n/lb.php b/apps/calendar/l10n/lb.php
index 6e96b5df18..1ef05b048c 100644
--- a/apps/calendar/l10n/lb.php
+++ b/apps/calendar/l10n/lb.php
@@ -111,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 408718071e..feb8618897 100644
--- a/apps/calendar/l10n/lt_LT.php
+++ b/apps/calendar/l10n/lt_LT.php
@@ -113,19 +113,13 @@
 "End" => "Pabaiga",
 "create a new calendar" => "sukurti naują kalendorių",
 "Import a calendar file" => "Importuoti kalendoriaus failą",
-"Please choose the calendar" => "Pasirinkite kalendorių",
-"create a new calendar" => "sukurti naują kalendorių",
 "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",
 "Timezone" => "Laiko juosta",
-"Check always for changes of the timezone" => "Visada tikrinti laiko zonos pasikeitimus",
-"Timeformat" => "Laiko formatas",
 "24h" => "24val",
 "12h" => "12val",
 "Users" => "Vartotojai",
diff --git a/apps/calendar/l10n/nb_NO.php b/apps/calendar/l10n/nb_NO.php
index 8f736869de..e4b859c737 100644
--- a/apps/calendar/l10n/nb_NO.php
+++ b/apps/calendar/l10n/nb_NO.php
@@ -67,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",
@@ -80,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",
@@ -133,24 +129,15 @@
 "occurrences" => "forekomster",
 "create a new calendar" => "Lag en ny kalender",
 "Import a calendar file" => "Importer en kalenderfil",
-"Please choose the calendar" => "Vennligst velg kalenderen",
-"create a new calendar" => "Lag en ny kalender",
 "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:" => "Kalender CalDAV synkroniseringsadresse",
 "Users" => "Brukere",
 "select users" => "valgte brukere",
 "Editable" => "Redigerbar",
diff --git a/apps/calendar/l10n/pl.php b/apps/calendar/l10n/pl.php
index 0174bef6fc..8fd1c3c2b4 100644
--- a/apps/calendar/l10n/pl.php
+++ b/apps/calendar/l10n/pl.php
@@ -161,8 +161,6 @@
 "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",
@@ -170,8 +168,6 @@
 "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",
 "more info" => "więcej informacji",
diff --git a/apps/calendar/l10n/pt_PT.php b/apps/calendar/l10n/pt_PT.php
index 81bab52e59..d5ead9fd43 100644
--- a/apps/calendar/l10n/pt_PT.php
+++ b/apps/calendar/l10n/pt_PT.php
@@ -168,8 +168,6 @@
 "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",
-"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",
diff --git a/apps/calendar/l10n/ro.php b/apps/calendar/l10n/ro.php
index 696322dd73..528d9ae108 100644
--- a/apps/calendar/l10n/ro.php
+++ b/apps/calendar/l10n/ro.php
@@ -131,12 +131,8 @@
 "occurrences" => "repetiții",
 "create a new calendar" => "crează un calendar nou",
 "Import a calendar file" => "Importă un calendar",
-"Please choose the calendar" => "Alegeți calendarul",
-"create a new calendar" => "crează un calendar nou",
 "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",
@@ -144,8 +140,6 @@
 "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",
 "Users" => "Utilizatori",
diff --git a/apps/calendar/l10n/ru.php b/apps/calendar/l10n/ru.php
index ba0be30df1..7535a2868b 100644
--- a/apps/calendar/l10n/ru.php
+++ b/apps/calendar/l10n/ru.php
@@ -168,8 +168,6 @@
 "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" => "Показать событие",
diff --git a/apps/calendar/l10n/sv.php b/apps/calendar/l10n/sv.php
index 4cea9073a2..7baa0309a6 100644
--- a/apps/calendar/l10n/sv.php
+++ b/apps/calendar/l10n/sv.php
@@ -167,8 +167,6 @@
 "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",
@@ -176,8 +174,6 @@
 "of" => "av",
 "at" => "på",
 "Timezone" => "Tidszon",
-"Check always for changes of the timezone" => "Kontrollera alltid ändringar i tidszon.",
-"Timeformat" => "Tidsformat",
 "24h" => "24h",
 "12h" => "12h",
 "Cache" => "Cache",
diff --git a/apps/calendar/l10n/zh_CN.php b/apps/calendar/l10n/zh_CN.php
index add84588d3..48d00d02d5 100644
--- a/apps/calendar/l10n/zh_CN.php
+++ b/apps/calendar/l10n/zh_CN.php
@@ -82,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" => "共享的日历",
@@ -135,12 +132,8 @@
 "occurrences" => "次",
 "create a new calendar" => "创建新日历",
 "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" => "查看事件",
@@ -148,12 +141,8 @@
 "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 48897b8ca0..c2c03a4d44 100644
--- a/apps/calendar/l10n/zh_TW.php
+++ b/apps/calendar/l10n/zh_TW.php
@@ -131,12 +131,8 @@
 "occurrences" => "事件",
 "create a new calendar" => "建立新日曆",
 "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" => "觀看一個活動",
@@ -144,11 +140,8 @@
 "of" => "於",
 "at" => "於",
 "Timezone" => "時區",
-"Check always for changes of the timezone" => "總是檢查是否變更了時區",
-"Timeformat" => "日期格式",
 "24h" => "24小時制",
 "12h" => "12小時制",
-"Calendar CalDAV syncing address:" => "CalDAV 的日曆同步地址：",
 "Users" => "使用者",
 "select users" => "選擇使用者",
 "Editable" => "可編輯",
diff --git a/apps/contacts/l10n/ca.php b/apps/contacts/l10n/ca.php
index 7ce9d6d456..5a8b0e018c 100644
--- a/apps/contacts/l10n/ca.php
+++ b/apps/contacts/l10n/ca.php
@@ -206,12 +206,6 @@
 "create a new addressbook" => "crea una llibreta d'adreces nova",
 "Name of new addressbook" => "Nom de la nova llibreta d'adreces",
 "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",
 "Select Address Books" => "Selecccioneu llibretes d'adreces",
diff --git a/apps/contacts/l10n/cs_CZ.php b/apps/contacts/l10n/cs_CZ.php
index 5065fd2938..cae9ae0c40 100644
--- a/apps/contacts/l10n/cs_CZ.php
+++ b/apps/contacts/l10n/cs_CZ.php
@@ -206,12 +206,6 @@
 "create a new addressbook" => "vytvořit nový adresář",
 "Name of new addressbook" => "Jméno nového adresáře",
 "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",
 "Select Address Books" => "Vybrat Adresář",
diff --git a/apps/contacts/l10n/el.php b/apps/contacts/l10n/el.php
index edca7d7b96..a50dd81e5d 100644
--- a/apps/contacts/l10n/el.php
+++ b/apps/contacts/l10n/el.php
@@ -206,12 +206,6 @@
 "create a new addressbook" => "Δημιουργία νέου βιβλίου διευθύνσεων",
 "Name of new addressbook" => "Όνομα νέου βιβλίου διευθύνσεων",
 "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" => "Προσθήκη επαφής",
 "Select Address Books" => "Επέλεξε βιβλίο διευθύνσεων",
diff --git a/apps/contacts/l10n/es.php b/apps/contacts/l10n/es.php
index c80c2987e1..543bda3036 100644
--- a/apps/contacts/l10n/es.php
+++ b/apps/contacts/l10n/es.php
@@ -188,12 +188,6 @@
 "create a new addressbook" => "crear una nueva agenda",
 "Name of new addressbook" => "Nombre de la nueva agenda",
 "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",
 "Enter name" => "Introducir nombre",
diff --git a/apps/contacts/l10n/et_EE.php b/apps/contacts/l10n/et_EE.php
index e15ea0c10b..ea0f80ec51 100644
--- a/apps/contacts/l10n/et_EE.php
+++ b/apps/contacts/l10n/et_EE.php
@@ -141,12 +141,6 @@
 "create a new addressbook" => "loo uus aadressiraamat",
 "Name of new addressbook" => "Uue aadressiraamatu nimi",
 "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",
 "CardDAV syncing addresses" => "CardDAV sünkroniseerimise aadressid",
diff --git a/apps/contacts/l10n/eu.php b/apps/contacts/l10n/eu.php
index b676b45c0f..56a4812670 100644
--- a/apps/contacts/l10n/eu.php
+++ b/apps/contacts/l10n/eu.php
@@ -152,12 +152,6 @@
 "create a new addressbook" => "sortu helbide liburu berria",
 "Name of new addressbook" => "Helbide liburuaren izena",
 "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",
 "Select Address Books" => "Hautatu helbide-liburuak",
diff --git a/apps/contacts/l10n/fa.php b/apps/contacts/l10n/fa.php
index 9ee6ee5466..8029cd201e 100644
--- a/apps/contacts/l10n/fa.php
+++ b/apps/contacts/l10n/fa.php
@@ -144,12 +144,6 @@
 "create a new addressbook" => "یک کتابچه نشانی بسازید",
 "Name of new addressbook" => "نام کتابچه نشانی جدید",
 "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" => "افزودن اطلاعات شخص مورد نظر",
 "CardDAV syncing addresses" => "CardDAV syncing addresses ",
diff --git a/apps/contacts/l10n/fr.php b/apps/contacts/l10n/fr.php
index 91df9a4b51..787843f0f2 100644
--- a/apps/contacts/l10n/fr.php
+++ b/apps/contacts/l10n/fr.php
@@ -206,12 +206,6 @@
 "create a new addressbook" => "Créer un nouveau carnet d'adresses",
 "Name of new addressbook" => "Nom du nouveau carnet d'adresses",
 "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",
 "Select Address Books" => "Choix du carnet d'adresses",
diff --git a/apps/contacts/l10n/ia.php b/apps/contacts/l10n/ia.php
index 4d455f7c97..338ceb7154 100644
--- a/apps/contacts/l10n/ia.php
+++ b/apps/contacts/l10n/ia.php
@@ -70,10 +70,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",
-"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 b10130f8d7..1f0e2e3955 100644
--- a/apps/contacts/l10n/it.php
+++ b/apps/contacts/l10n/it.php
@@ -206,12 +206,6 @@
 "create a new addressbook" => "crea una nuova rubrica",
 "Name of new addressbook" => "Nome della nuova rubrica",
 "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",
 "Select Address Books" => "Seleziona rubriche",
diff --git a/apps/contacts/l10n/mk.php b/apps/contacts/l10n/mk.php
index dbdd633e51..093b105777 100644
--- a/apps/contacts/l10n/mk.php
+++ b/apps/contacts/l10n/mk.php
@@ -144,12 +144,6 @@
 "create a new addressbook" => "креирај нов адресар",
 "Name of new addressbook" => "Име на новиот адресар",
 "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" => "Додади контакт",
 "CardDAV syncing addresses" => "Адреса за синхронизација со CardDAV",
diff --git a/apps/contacts/l10n/nb_NO.php b/apps/contacts/l10n/nb_NO.php
index 5f7c49c8b9..905f6fc6a0 100644
--- a/apps/contacts/l10n/nb_NO.php
+++ b/apps/contacts/l10n/nb_NO.php
@@ -116,13 +116,6 @@
 "Ph.D." => "Stipendiat",
 "Jr." => "Jr.",
 "Sn." => "Sr.",
-"New Addressbook" => "Ny adressebok",
-"Edit Addressbook" => "Endre adressebok",
-"Displayname" => "Visningsnavn",
-"Active" => "Aktiv",
-"Save" => "Lagre",
-"Submit" => "Send inn",
-"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",
diff --git a/apps/contacts/l10n/nl.php b/apps/contacts/l10n/nl.php
index a8646e9d4e..7c85dd7ce9 100644
--- a/apps/contacts/l10n/nl.php
+++ b/apps/contacts/l10n/nl.php
@@ -197,12 +197,6 @@
 "create a new addressbook" => "Maak een nieuw adresboek",
 "Name of new addressbook" => "Naam van nieuw adresboek",
 "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",
 "Select Address Books" => "Selecteer adresboeken",
diff --git a/apps/contacts/l10n/sk_SK.php b/apps/contacts/l10n/sk_SK.php
index 54ae324d93..8295b32a6f 100644
--- a/apps/contacts/l10n/sk_SK.php
+++ b/apps/contacts/l10n/sk_SK.php
@@ -163,12 +163,6 @@
 "create a new addressbook" => "vytvoriť nový adresár",
 "Name of new addressbook" => "Meno nového adresára",
 "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",
 "Enter name" => "Zadaj meno",
diff --git a/apps/contacts/l10n/sl.php b/apps/contacts/l10n/sl.php
index f65f0452f1..fe0e8ef16c 100644
--- a/apps/contacts/l10n/sl.php
+++ b/apps/contacts/l10n/sl.php
@@ -206,12 +206,6 @@
 "create a new addressbook" => "Ustvari nov imenik",
 "Name of new addressbook" => "Ime novega imenika",
 "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",
 "Select Address Books" => "Izberite adresarje",
diff --git a/apps/contacts/l10n/th_TH.php b/apps/contacts/l10n/th_TH.php
index 6afc64e61d..facdd62b7b 100644
--- a/apps/contacts/l10n/th_TH.php
+++ b/apps/contacts/l10n/th_TH.php
@@ -184,12 +184,6 @@
 "create a new addressbook" => "สร้างสมุดบันทึกที่อยู่ใหม่",
 "Name of new addressbook" => "กำหนดชื่อของสมุดที่อยู่ที่สร้างใหม่",
 "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" => "เพิ่มชื่อผู้ติดต่อ",
 "Select Address Books" => "เลือกสมุดบันทึกที่อยู่",
diff --git a/apps/contacts/l10n/tr.php b/apps/contacts/l10n/tr.php
index e2a769410f..3abe96998e 100644
--- a/apps/contacts/l10n/tr.php
+++ b/apps/contacts/l10n/tr.php
@@ -176,12 +176,6 @@
 "create a new addressbook" => "Yeni adres defteri oluştur",
 "Name of new addressbook" => "Yeni adres defteri için isim",
 "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",
 "Select Address Books" => "Adres deftelerini seçiniz",
diff --git a/apps/contacts/l10n/zh_TW.php b/apps/contacts/l10n/zh_TW.php
index 0d007ef9c8..c8edacec9e 100644
--- a/apps/contacts/l10n/zh_TW.php
+++ b/apps/contacts/l10n/zh_TW.php
@@ -6,10 +6,6 @@
 "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",
-"Error adding addressbook." => "添加電話簿中發生錯誤",
-"Error activating addressbook." => "啟用電話簿中發生錯誤",
 "Information about vCard is incorrect. Please reload the page." => "有關 vCard 的資訊不正確，請重新載入此頁。",
 "Missing ID" => "遺失ID",
 "No file was uploaded" => "沒有已上傳的檔案",
diff --git a/apps/files/l10n/ar.php b/apps/files/l10n/ar.php
index 724152dc11..52480ce7ff 100644
--- a/apps/files/l10n/ar.php
+++ b/apps/files/l10n/ar.php
@@ -17,9 +17,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 89fc454434..624e08959f 100644
--- a/apps/files/l10n/bg_BG.php
+++ b/apps/files/l10n/bg_BG.php
@@ -28,9 +28,6 @@
 "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." => "Файловете които се опитвате да качите са по-големи от позволеното за сървъра.",
 "Files are being scanned, please wait." => "Файловете се претърсват, изчакайте."
diff --git a/apps/files/l10n/ca.php b/apps/files/l10n/ca.php
index e48148421b..81bbfe03a0 100644
--- a/apps/files/l10n/ca.php
+++ b/apps/files/l10n/ca.php
@@ -44,10 +44,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",
 "Files are being scanned, please wait." => "S'estan escanejant els fitxers, espereu",
diff --git a/apps/files/l10n/cs_CZ.php b/apps/files/l10n/cs_CZ.php
index 38f235343c..4dc4b8b0cb 100644
--- a/apps/files/l10n/cs_CZ.php
+++ b/apps/files/l10n/cs_CZ.php
@@ -44,10 +44,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.",
 "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 8cefa27e64..56af0fa61d 100644
--- a/apps/files/l10n/da.php
+++ b/apps/files/l10n/da.php
@@ -44,9 +44,6 @@
 "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.",
 "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 4a85912d31..5da3a99721 100644
--- a/apps/files/l10n/de.php
+++ b/apps/files/l10n/de.php
@@ -44,10 +44,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.",
 "Files are being scanned, please wait." => "Dateien werden gescannt, bitte warten.",
diff --git a/apps/files/l10n/el.php b/apps/files/l10n/el.php
index 4e93489fd3..3ab4b12094 100644
--- a/apps/files/l10n/el.php
+++ b/apps/files/l10n/el.php
@@ -44,10 +44,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." => "Τα αρχεία που προσπαθείτε να ανεβάσετε υπερβαίνουν το μέγιστο μέγεθος μεταφόρτωσης αρχείων σε αυτόν το διακομιστή.",
 "Files are being scanned, please wait." => "Τα αρχεία ανιχνεύονται, παρακαλώ περιμένετε",
diff --git a/apps/files/l10n/eo.php b/apps/files/l10n/eo.php
index 2976a2127c..acaf06e830 100644
--- a/apps/files/l10n/eo.php
+++ b/apps/files/l10n/eo.php
@@ -44,10 +44,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.",
 "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 6fcf908694..6cd51d60e2 100644
--- a/apps/files/l10n/es.php
+++ b/apps/files/l10n/es.php
@@ -44,10 +44,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.",
 "Files are being scanned, please wait." => "Se están escaneando los archivos, por favor espere.",
diff --git a/apps/files/l10n/et_EE.php b/apps/files/l10n/et_EE.php
index c455a8ffe6..a5dd345f8e 100644
--- a/apps/files/l10n/et_EE.php
+++ b/apps/files/l10n/et_EE.php
@@ -37,10 +37,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.",
 "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 99c918e220..d9c2689d1c 100644
--- a/apps/files/l10n/eu.php
+++ b/apps/files/l10n/eu.php
@@ -44,10 +44,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.",
 "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 78d8d77691..4dac88fc54 100644
--- a/apps/files/l10n/fa.php
+++ b/apps/files/l10n/fa.php
@@ -44,10 +44,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 میتوان این محدودیت را برطرف کرد",
 "Files are being scanned, please wait." => "پرونده ها در حال بازرسی هستند لطفا صبر کنید",
diff --git a/apps/files/l10n/fr.php b/apps/files/l10n/fr.php
index 9f9763636c..6eb4341bd6 100644
--- a/apps/files/l10n/fr.php
+++ b/apps/files/l10n/fr.php
@@ -44,10 +44,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.",
 "Files are being scanned, please wait." => "Les fichiers sont analysés, patientez svp.",
diff --git a/apps/files/l10n/gl.php b/apps/files/l10n/gl.php
index bf86fc9b80..3a36a23f0c 100644
--- a/apps/files/l10n/gl.php
+++ b/apps/files/l10n/gl.php
@@ -44,9 +44,6 @@
 "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",
 "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 5e3df214c4..65d093e366 100644
--- a/apps/files/l10n/he.php
+++ b/apps/files/l10n/he.php
@@ -37,9 +37,6 @@
 "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." => "הקבצים שניסית להעלות חרגו מהגודל המקסימלי להעלאת קבצים על שרת זה.",
 "Files are being scanned, please wait." => "הקבצים נסרקים, נא להמתין.",
diff --git a/apps/files/l10n/hr.php b/apps/files/l10n/hr.php
index a3a6785294..7d5e61b354 100644
--- a/apps/files/l10n/hr.php
+++ b/apps/files/l10n/hr.php
@@ -37,9 +37,6 @@
 "Name" => "Naziv",
 "Share" => "podjeli",
 "Download" => "Preuzmi",
-"Size" => "Veličina",
-"Modified" => "Zadnja promjena",
-"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 0a66cbda4a..8d52765e93 100644
--- a/apps/files/l10n/hu_HU.php
+++ b/apps/files/l10n/hu_HU.php
@@ -44,10 +44,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.",
 "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 40df7af98f..f9205cb5f6 100644
--- a/apps/files/l10n/ia.php
+++ b/apps/files/l10n/ia.php
@@ -13,8 +13,5 @@
 "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 c66f786125..47ce6429c9 100644
--- a/apps/files/l10n/id.php
+++ b/apps/files/l10n/id.php
@@ -25,9 +25,6 @@
 "Name" => "Nama",
 "Share" => "Bagikan",
 "Download" => "Unduh",
-"Size" => "Ukuran",
-"Modified" => "Dimodifikasi",
-"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 9bf02fb188..6fda30a8f3 100644
--- a/apps/files/l10n/it.php
+++ b/apps/files/l10n/it.php
@@ -44,10 +44,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.",
 "Files are being scanned, please wait." => "Scansione dei file in corso, attendi",
diff --git a/apps/files/l10n/ja_JP.php b/apps/files/l10n/ja_JP.php
index 868a2cfe70..8c19e45501 100644
--- a/apps/files/l10n/ja_JP.php
+++ b/apps/files/l10n/ja_JP.php
@@ -44,9 +44,6 @@
 "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." => "アップロードしようとしているファイルは、サーバで規定された最大サイズを超えています。",
 "Files are being scanned, please wait." => "ファイルをスキャンしています、しばらくお待ちください。",
diff --git a/apps/files/l10n/ko.php b/apps/files/l10n/ko.php
index 66b0c65d8c..218dd0ea2d 100644
--- a/apps/files/l10n/ko.php
+++ b/apps/files/l10n/ko.php
@@ -36,10 +36,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." => "이 파일이 서버에서 허용하는 최대 업로드 가능 용량보다 큽니다.",
 "Files are being scanned, please wait." => "파일을 검색중입니다, 기다려 주십시오.",
diff --git a/apps/files/l10n/lb.php b/apps/files/l10n/lb.php
index d3f1207cfb..f7a10fbc5c 100644
--- a/apps/files/l10n/lb.php
+++ b/apps/files/l10n/lb.php
@@ -27,9 +27,6 @@
 "Name" => "Numm",
 "Share" => "Share",
 "Download" => "Eroflueden",
-"Size" => "Gréisst",
-"Modified" => "Geännert",
-"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 9b2b364c9b..90b0314307 100644
--- a/apps/files/l10n/lt_LT.php
+++ b/apps/files/l10n/lt_LT.php
@@ -36,9 +36,6 @@
 "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",
 "Files are being scanned, please wait." => "Skenuojami failai, prašome palaukti.",
diff --git a/apps/files/l10n/mk.php b/apps/files/l10n/mk.php
index b060c08765..4e1eccff25 100644
--- a/apps/files/l10n/mk.php
+++ b/apps/files/l10n/mk.php
@@ -37,10 +37,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." => "Датотеките кои се обидувате да ги подигнете ја надминуваат максималната големина за подигнување датотеки на овој сервер.",
 "Files are being scanned, please wait." => "Се скенираат датотеки, ве молам почекајте.",
diff --git a/apps/files/l10n/ms_MY.php b/apps/files/l10n/ms_MY.php
index 456a30a9d1..de472a7c65 100644
--- a/apps/files/l10n/ms_MY.php
+++ b/apps/files/l10n/ms_MY.php
@@ -43,9 +43,6 @@
 "Name" => "Nama ",
 "Share" => "Kongsi",
 "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",
 "Files are being scanned, please wait." => "Fail sedang diimbas, harap bersabar.",
diff --git a/apps/files/l10n/nb_NO.php b/apps/files/l10n/nb_NO.php
index 4a2bf36fd5..f02de12615 100644
--- a/apps/files/l10n/nb_NO.php
+++ b/apps/files/l10n/nb_NO.php
@@ -33,10 +33,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.",
 "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 98e52faf98..fb7ea34b9b 100644
--- a/apps/files/l10n/nl.php
+++ b/apps/files/l10n/nl.php
@@ -44,10 +44,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.",
 "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 a2263b3df2..d6af730249 100644
--- a/apps/files/l10n/nn_NO.php
+++ b/apps/files/l10n/nn_NO.php
@@ -17,9 +17,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 7b67fd4722..eb791330bf 100644
--- a/apps/files/l10n/pl.php
+++ b/apps/files/l10n/pl.php
@@ -44,9 +44,6 @@
 "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ść.",
 "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 e0da05ba99..09c4f2b026 100644
--- a/apps/files/l10n/pt_BR.php
+++ b/apps/files/l10n/pt_BR.php
@@ -44,10 +44,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.",
 "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 eaf5a69a04..e413d7cbe7 100644
--- a/apps/files/l10n/pt_PT.php
+++ b/apps/files/l10n/pt_PT.php
@@ -44,9 +44,6 @@
 "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.",
 "Files are being scanned, please wait." => "Os ficheiros estão a ser analisados, por favor aguarde.",
diff --git a/apps/files/l10n/sk_SK.php b/apps/files/l10n/sk_SK.php
index 9e9a543d38..8a31c55032 100644
--- a/apps/files/l10n/sk_SK.php
+++ b/apps/files/l10n/sk_SK.php
@@ -37,7 +37,6 @@
 "Name" => "Meno",
 "Share" => "Zdielať",
 "Download" => "Stiahnuť",
-"Delete all" => "Odstrániť všetko",
 "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 b94735c391..f6322b2507 100644
--- a/apps/files/l10n/sl.php
+++ b/apps/files/l10n/sl.php
@@ -43,8 +43,7 @@
 "Nothing in here. Upload something!" => "Tukaj ni ničesar. Naložite kaj!",
 "Name" => "Ime",
 "Share" => "Souporaba",
-"Download" => "Prejmi",
-"Delete all" => "Izbriši vse",
+"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/th_TH.php b/apps/files/l10n/th_TH.php
index eca0e29a18..eed9c36e13 100644
--- a/apps/files/l10n/th_TH.php
+++ b/apps/files/l10n/th_TH.php
@@ -44,7 +44,6 @@
 "Name" => "ชื่อ",
 "Share" => "แชร์",
 "Download" => "ดาวน์โหลด",
-"Delete all" => "ลบทั้งหมด",
 "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 528eede664..224322b24e 100644
--- a/apps/files/l10n/tr.php
+++ b/apps/files/l10n/tr.php
@@ -39,7 +39,6 @@
 "Name" => "Ad",
 "Share" => "Paylaş",
 "Download" => "İndir",
-"Delete all" => "Hepsini 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/zh_CN.php b/apps/files/l10n/zh_CN.php
index ec5ed8ffb4..dc78301884 100644
--- a/apps/files/l10n/zh_CN.php
+++ b/apps/files/l10n/zh_CN.php
@@ -44,7 +44,6 @@
 "Name" => "名称",
 "Share" => "共享",
 "Download" => "下载",
-"Delete all" => "删除所有",
 "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 9151a4805d..bc8aa4ff89 100644
--- a/apps/files/l10n/zh_TW.php
+++ b/apps/files/l10n/zh_TW.php
@@ -27,7 +27,6 @@
 "Name" => "名稱",
 "Share" => "分享",
 "Download" => "下載",
-"Delete all" => "全部刪除",
 "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/l10n/templates/admin_dependencies_chk.pot b/l10n/templates/admin_dependencies_chk.pot
index ae9512efe8..c5b1d9d75b 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-25 02:04+0200\n"
+"POT-Creation-Date: 2012-08-26 00:10+0200\n"
 "PO-Revision-Date: YEAR-MO-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 78b49fcdb8..3f989cc17c 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-25 02:04+0200\n"
+"POT-Creation-Date: 2012-08-26 00:10+0200\n"
 "PO-Revision-Date: YEAR-MO-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 7668869f08..d20b6e6f4e 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-25 02:04+0200\n"
+"POT-Creation-Date: 2012-08-26 00:10+0200\n"
 "PO-Revision-Date: YEAR-MO-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 b1a31a8a73..731de9b44a 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-25 02:04+0200\n"
+"POT-Creation-Date: 2012-08-26 00:10+0200\n"
 "PO-Revision-Date: YEAR-MO-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 0166743621..3fe5e2e363 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-25 02:04+0200\n"
+"POT-Creation-Date: 2012-08-26 00:10+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -383,7 +383,7 @@ msgstr ""
 msgid "Home"
 msgstr ""
 
-#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:593
+#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:586
 msgid "Other"
 msgstr ""
 
@@ -480,11 +480,11 @@ msgstr ""
 msgid "Contact"
 msgstr ""
 
-#: lib/vcard.php:408
+#: lib/vcard.php:401
 msgid "You do not have the permissions to edit this contact."
 msgstr ""
 
-#: lib/vcard.php:483
+#: lib/vcard.php:476
 msgid "You do not have the permissions to delete this contact."
 msgstr ""
 
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index e5769a1a08..970032e269 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-25 02:04+0200\n"
+"POT-Creation-Date: 2012-08-26 00:10+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -129,7 +129,7 @@ msgstr ""
 msgid "Login failed!"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:26
 #: templates/login.php:9
 msgid "Username"
 msgstr ""
@@ -190,48 +190,52 @@ msgstr ""
 msgid "Add"
 msgstr ""
 
-#: templates/installation.php:23
+#: templates/installation.php:24
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
-#: templates/installation.php:29 templates/login.php:13
+#: templates/installation.php:30 templates/login.php:13
 msgid "Password"
 msgstr ""
 
-#: templates/installation.php:35
+#: templates/installation.php:36
 msgid "Advanced"
 msgstr ""
 
-#: templates/installation.php:37
+#: templates/installation.php:38
 msgid "Data folder"
 msgstr ""
 
-#: templates/installation.php:44
+#: templates/installation.php:45
 msgid "Configure the database"
 msgstr ""
 
-#: templates/installation.php:49 templates/installation.php:60
-#: templates/installation.php:70
+#: templates/installation.php:50 templates/installation.php:61
+#: templates/installation.php:71 templates/installation.php:81
 msgid "will be used"
 msgstr ""
 
-#: templates/installation.php:82
+#: templates/installation.php:93
 msgid "Database user"
 msgstr ""
 
-#: templates/installation.php:86
+#: templates/installation.php:97
 msgid "Database password"
 msgstr ""
 
-#: templates/installation.php:90
+#: templates/installation.php:101
 msgid "Database name"
 msgstr ""
 
-#: templates/installation.php:96
+#: templates/installation.php:109
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:115
 msgid "Database host"
 msgstr ""
 
-#: templates/installation.php:101
+#: templates/installation.php:120
 msgid "Finish setup"
 msgstr ""
 
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index 603136b53b..72825221ce 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-25 02:04+0200\n"
+"POT-Creation-Date: 2012-08-26 00:10+0200\n"
 "PO-Revision-Date: YEAR-MO-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 4abd4bfe4a..66663afbbe 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-25 02:04+0200\n"
+"POT-Creation-Date: 2012-08-26 00:10+0200\n"
 "PO-Revision-Date: YEAR-MO-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 b845f7d27d..374f3e104a 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-25 02:04+0200\n"
+"POT-Creation-Date: 2012-08-26 00:10+0200\n"
 "PO-Revision-Date: YEAR-MO-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 d95745ec23..45f9720272 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-25 02:04+0200\n"
+"POT-Creation-Date: 2012-08-26 00:10+0200\n"
 "PO-Revision-Date: YEAR-MO-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 7a55f7e131..4126898622 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-25 02:04+0200\n"
+"POT-Creation-Date: 2012-08-26 00:10+0200\n"
 "PO-Revision-Date: YEAR-MO-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 f4431a9c81..79061f057c 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-25 02:04+0200\n"
+"POT-Creation-Date: 2012-08-26 00:10+0200\n"
 "PO-Revision-Date: YEAR-MO-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 3f4dc1e461..f543bdd73d 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-25 02:04+0200\n"
+"POT-Creation-Date: 2012-08-26 00:10+0200\n"
 "PO-Revision-Date: YEAR-MO-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 c3946d4ab8..b9c061895a 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-25 02:04+0200\n"
+"POT-Creation-Date: 2012-08-26 00:10+0200\n"
 "PO-Revision-Date: YEAR-MO-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 b8338fb6fc..85c415c76a 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-25 02:04+0200\n"
+"POT-Creation-Date: 2012-08-26 00:10+0200\n"
 "PO-Revision-Date: YEAR-MO-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 5f237d3c50..3a52292ee1 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-25 02:04+0200\n"
+"POT-Creation-Date: 2012-08-26 00:10+0200\n"
 "PO-Revision-Date: YEAR-MO-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 808b7c6d3b..867b64355f 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-25 02:04+0200\n"
+"POT-Creation-Date: 2012-08-26 00:10+0200\n"
 "PO-Revision-Date: YEAR-MO-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 6a63226f92..3a7ee623de 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-25 02:04+0200\n"
+"POT-Creation-Date: 2012-08-26 00:10+0200\n"
 "PO-Revision-Date: YEAR-MO-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 144f4bece5..7f94333c35 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-25 02:04+0200\n"
+"POT-Creation-Date: 2012-08-26 00:10+0200\n"
 "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 814cb6bbfa6a0ff6ee0ea3c6606ac84185ae8256 Mon Sep 17 00:00:00 2001
From: Thomas Mueller <thomas.mueller@tmit.eu>
Date: Sun, 26 Aug 2012 00:39:23 +0200
Subject: [PATCH 0903/1224] translation support for text editor and impress
 added

---
 apps/files_texteditor/l10n/.gitkeep |  0
 apps/impress/l10n/.gitkeep          |  0
 l10n/templates/files_texteditor.pot | 44 +++++++++++++++++++++++++++++
 l10n/templates/impress.pot          | 22 +++++++++++++++
 4 files changed, 66 insertions(+)
 create mode 100644 apps/files_texteditor/l10n/.gitkeep
 create mode 100644 apps/impress/l10n/.gitkeep
 create mode 100644 l10n/templates/files_texteditor.pot
 create mode 100644 l10n/templates/impress.pot

diff --git a/apps/files_texteditor/l10n/.gitkeep b/apps/files_texteditor/l10n/.gitkeep
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/apps/impress/l10n/.gitkeep b/apps/impress/l10n/.gitkeep
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/l10n/templates/files_texteditor.pot b/l10n/templates/files_texteditor.pot
new file mode 100644
index 0000000000..2acccaebf2
--- /dev/null
+++ b/l10n/templates/files_texteditor.pot
@@ -0,0 +1,44 @@
+# 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-26 00:31+0200\n"
+"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/aceeditor/mode-coldfusion-uncompressed.js:1568
+#: js/aceeditor/mode-liquid-uncompressed.js:902
+#: js/aceeditor/mode-svg-uncompressed.js:1575
+msgid "regex"
+msgstr ""
+
+#: js/editor.js:72 js/editor.js:156 js/editor.js:163
+msgid "Save"
+msgstr ""
+
+#: js/editor.js:74
+msgid "Close"
+msgstr ""
+
+#: js/editor.js:149
+msgid "Saving..."
+msgstr ""
+
+#: js/editor.js:239
+msgid "An error occurred!"
+msgstr ""
+
+#: js/editor.js:266
+msgid "There were unsaved changes, click here to go back"
+msgstr ""
diff --git a/l10n/templates/impress.pot b/l10n/templates/impress.pot
new file mode 100644
index 0000000000..f5e17c8c6f
--- /dev/null
+++ b/l10n/templates/impress.pot
@@ -0,0 +1,22 @@
+# 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-26 00:31+0200\n"
+"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/presentations.php:7
+msgid "Documentation"
+msgstr ""

From fadd84f9d3c6c10dac9b467d7b61f771bc791d60 Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <thomas.mueller@tmit.eu>
Date: Sun, 26 Aug 2012 00:46:47 +0200
Subject: [PATCH 0904/1224] [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_texteditor.pot       | 2 +-
 l10n/templates/files_versions.pot         | 2 +-
 l10n/templates/gallery.pot                | 2 +-
 l10n/templates/impress.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 +-
 21 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/l10n/templates/admin_dependencies_chk.pot b/l10n/templates/admin_dependencies_chk.pot
index c5b1d9d75b..b528088a64 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-26 00:10+0200\n"
+"POT-Creation-Date: 2012-08-26 00:45+0200\n"
 "PO-Revision-Date: YEAR-MO-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 3f989cc17c..c041bdec77 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-26 00:10+0200\n"
+"POT-Creation-Date: 2012-08-26 00:45+0200\n"
 "PO-Revision-Date: YEAR-MO-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 d20b6e6f4e..5937171bf9 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-26 00:10+0200\n"
+"POT-Creation-Date: 2012-08-26 00:45+0200\n"
 "PO-Revision-Date: YEAR-MO-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 731de9b44a..b2ae946f0e 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-26 00:10+0200\n"
+"POT-Creation-Date: 2012-08-26 00:45+0200\n"
 "PO-Revision-Date: YEAR-MO-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 3fe5e2e363..de724764bc 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-26 00:10+0200\n"
+"POT-Creation-Date: 2012-08-26 00:45+0200\n"
 "PO-Revision-Date: YEAR-MO-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 970032e269..cb68993bdd 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-26 00:10+0200\n"
+"POT-Creation-Date: 2012-08-26 00:45+0200\n"
 "PO-Revision-Date: YEAR-MO-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 72825221ce..a0c9c79e8f 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-26 00:10+0200\n"
+"POT-Creation-Date: 2012-08-26 00:45+0200\n"
 "PO-Revision-Date: YEAR-MO-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 66663afbbe..f66972bcf7 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-26 00:10+0200\n"
+"POT-Creation-Date: 2012-08-26 00:45+0200\n"
 "PO-Revision-Date: YEAR-MO-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 374f3e104a..589f74731f 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-26 00:10+0200\n"
+"POT-Creation-Date: 2012-08-26 00:45+0200\n"
 "PO-Revision-Date: YEAR-MO-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 45f9720272..3432495389 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-26 00:10+0200\n"
+"POT-Creation-Date: 2012-08-26 00:45+0200\n"
 "PO-Revision-Date: YEAR-MO-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_texteditor.pot b/l10n/templates/files_texteditor.pot
index 2acccaebf2..ff299c2ff4 100644
--- a/l10n/templates/files_texteditor.pot
+++ b/l10n/templates/files_texteditor.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-26 00:31+0200\n"
+"POT-Creation-Date: 2012-08-26 00:45+0200\n"
 "PO-Revision-Date: YEAR-MO-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 4126898622..748b5f887c 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-26 00:10+0200\n"
+"POT-Creation-Date: 2012-08-26 00:45+0200\n"
 "PO-Revision-Date: YEAR-MO-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 79061f057c..b37e0a9e43 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-26 00:10+0200\n"
+"POT-Creation-Date: 2012-08-26 00:45+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/impress.pot b/l10n/templates/impress.pot
index f5e17c8c6f..e3b1afb453 100644
--- a/l10n/templates/impress.pot
+++ b/l10n/templates/impress.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-26 00:31+0200\n"
+"POT-Creation-Date: 2012-08-26 00:45+0200\n"
 "PO-Revision-Date: YEAR-MO-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 f543bdd73d..9c787bf6f4 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-26 00:10+0200\n"
+"POT-Creation-Date: 2012-08-26 00:45+0200\n"
 "PO-Revision-Date: YEAR-MO-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 b9c061895a..694cb57205 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-26 00:10+0200\n"
+"POT-Creation-Date: 2012-08-26 00:45+0200\n"
 "PO-Revision-Date: YEAR-MO-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 85c415c76a..41073700ec 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-26 00:10+0200\n"
+"POT-Creation-Date: 2012-08-26 00:45+0200\n"
 "PO-Revision-Date: YEAR-MO-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 3a52292ee1..a50f3b5a23 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-26 00:10+0200\n"
+"POT-Creation-Date: 2012-08-26 00:45+0200\n"
 "PO-Revision-Date: YEAR-MO-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 867b64355f..59af33b7b0 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-26 00:10+0200\n"
+"POT-Creation-Date: 2012-08-26 00:45+0200\n"
 "PO-Revision-Date: YEAR-MO-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 3a7ee623de..7cd45fdf1a 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-26 00:10+0200\n"
+"POT-Creation-Date: 2012-08-26 00:45+0200\n"
 "PO-Revision-Date: YEAR-MO-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 7f94333c35..7c0b25a871 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-26 00:10+0200\n"
+"POT-Creation-Date: 2012-08-26 00:45+0200\n"
 "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 c490e10bc658730e98c0e05183dfec451d33d793 Mon Sep 17 00:00:00 2001
From: Thomas Mueller <thomas.mueller@tmit.eu>
Date: Sun, 26 Aug 2012 00:55:26 +0200
Subject: [PATCH 0905/1224] resources added to transifex

---
 l10n/.tx/config | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/l10n/.tx/config b/l10n/.tx/config
index db4df85793..25c20cb8e7 100644
--- a/l10n/.tx/config
+++ b/l10n/.tx/config
@@ -108,3 +108,15 @@ source_file = templates/user_openid.pot
 source_lang = en
 type = PO
 
+[owncloud.files_texteditor]
+file_filter = <lang>/files_texteditor.po
+source_file = templates/files_texteditor.pot
+source_lang = en
+type = PO
+
+[owncloud.impress]
+file_filter = <lang>/impress.po
+source_file = templates/impress.pot
+source_lang = en
+type = PO
+

From bae07faa3469ff1dcd16c2071946e6a3e7a8b4c2 Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <thomas.mueller@tmit.eu>
Date: Sun, 26 Aug 2012 01:20:16 +0200
Subject: [PATCH 0906/1224] [tx-robot] updated from transifex

---
 apps/admin_dependencies_chk/l10n/nb_NO.php | 14 ++++
 apps/bookmarks/l10n/nb_NO.php              |  3 +-
 apps/files/l10n/nb_NO.php                  | 11 +++
 apps/gallery/l10n/nb_NO.php                | 13 +---
 core/l10n/nb_NO.php                        |  2 +
 l10n/af/files_texteditor.po                | 44 +++++++++++
 l10n/af/impress.po                         | 22 ++++++
 l10n/ar/files_texteditor.po                | 44 +++++++++++
 l10n/ar/impress.po                         | 22 ++++++
 l10n/ar_SA/files_texteditor.po             | 44 +++++++++++
 l10n/ar_SA/impress.po                      | 22 ++++++
 l10n/bg_BG/files_texteditor.po             | 44 +++++++++++
 l10n/bg_BG/impress.po                      | 22 ++++++
 l10n/ca/files_texteditor.po                | 44 +++++++++++
 l10n/ca/impress.po                         | 22 ++++++
 l10n/cs_CZ/files_texteditor.po             | 44 +++++++++++
 l10n/cs_CZ/impress.po                      | 22 ++++++
 l10n/da/files_texteditor.po                | 44 +++++++++++
 l10n/da/impress.po                         | 22 ++++++
 l10n/de/files_texteditor.po                | 44 +++++++++++
 l10n/de/impress.po                         | 22 ++++++
 l10n/el/files_texteditor.po                | 44 +++++++++++
 l10n/el/impress.po                         | 22 ++++++
 l10n/eo/files_texteditor.po                | 44 +++++++++++
 l10n/eo/impress.po                         | 22 ++++++
 l10n/es/files_texteditor.po                | 44 +++++++++++
 l10n/es/impress.po                         | 22 ++++++
 l10n/et_EE/files_texteditor.po             | 44 +++++++++++
 l10n/et_EE/impress.po                      | 22 ++++++
 l10n/eu/files_texteditor.po                | 44 +++++++++++
 l10n/eu/impress.po                         | 22 ++++++
 l10n/eu_ES/files_texteditor.po             | 44 +++++++++++
 l10n/eu_ES/impress.po                      | 22 ++++++
 l10n/fa/files_texteditor.po                | 44 +++++++++++
 l10n/fa/impress.po                         | 22 ++++++
 l10n/fi/files_texteditor.po                | 44 +++++++++++
 l10n/fi/impress.po                         | 22 ++++++
 l10n/fi_FI/files_texteditor.po             | 44 +++++++++++
 l10n/fi_FI/impress.po                      | 22 ++++++
 l10n/fr/files_texteditor.po                | 44 +++++++++++
 l10n/fr/impress.po                         | 22 ++++++
 l10n/gl/files_texteditor.po                | 44 +++++++++++
 l10n/gl/impress.po                         | 22 ++++++
 l10n/he/files_texteditor.po                | 44 +++++++++++
 l10n/he/impress.po                         | 22 ++++++
 l10n/hr/files_texteditor.po                | 44 +++++++++++
 l10n/hr/impress.po                         | 22 ++++++
 l10n/hu_HU/files_texteditor.po             | 44 +++++++++++
 l10n/hu_HU/impress.po                      | 22 ++++++
 l10n/hy/files_texteditor.po                | 44 +++++++++++
 l10n/hy/impress.po                         | 22 ++++++
 l10n/ia/files_texteditor.po                | 44 +++++++++++
 l10n/ia/impress.po                         | 22 ++++++
 l10n/id/files_texteditor.po                | 44 +++++++++++
 l10n/id/impress.po                         | 22 ++++++
 l10n/id_ID/files_texteditor.po             | 44 +++++++++++
 l10n/id_ID/impress.po                      | 22 ++++++
 l10n/it/files_texteditor.po                | 44 +++++++++++
 l10n/it/impress.po                         | 22 ++++++
 l10n/ja_JP/files_texteditor.po             | 44 +++++++++++
 l10n/ja_JP/impress.po                      | 22 ++++++
 l10n/ko/files_texteditor.po                | 44 +++++++++++
 l10n/ko/impress.po                         | 22 ++++++
 l10n/lb/files_texteditor.po                | 44 +++++++++++
 l10n/lb/impress.po                         | 22 ++++++
 l10n/lt_LT/files_texteditor.po             | 44 +++++++++++
 l10n/lt_LT/impress.po                      | 22 ++++++
 l10n/lv/files_texteditor.po                | 44 +++++++++++
 l10n/lv/impress.po                         | 22 ++++++
 l10n/mk/files_texteditor.po                | 44 +++++++++++
 l10n/mk/impress.po                         | 22 ++++++
 l10n/ms_MY/files_texteditor.po             | 44 +++++++++++
 l10n/ms_MY/impress.po                      | 22 ++++++
 l10n/nb_NO/admin_dependencies_chk.po       | 31 ++++----
 l10n/nb_NO/bookmarks.po                    |  9 ++-
 l10n/nb_NO/core.po                         | 65 +++++++++--------
 l10n/nb_NO/files.po                        | 31 ++++----
 l10n/nb_NO/files_texteditor.po             | 44 +++++++++++
 l10n/nb_NO/gallery.po                      | 85 ++++------------------
 l10n/nb_NO/impress.po                      | 22 ++++++
 l10n/nb_NO/lib.po                          |  9 ++-
 l10n/nb_NO/settings.po                     | 25 ++++---
 l10n/nl/files_texteditor.po                | 44 +++++++++++
 l10n/nl/impress.po                         | 22 ++++++
 l10n/nn_NO/files_texteditor.po             | 44 +++++++++++
 l10n/nn_NO/impress.po                      | 22 ++++++
 l10n/pl/files_texteditor.po                | 44 +++++++++++
 l10n/pl/impress.po                         | 22 ++++++
 l10n/pt_BR/files_texteditor.po             | 44 +++++++++++
 l10n/pt_BR/impress.po                      | 22 ++++++
 l10n/pt_PT/files_texteditor.po             | 44 +++++++++++
 l10n/pt_PT/impress.po                      | 22 ++++++
 l10n/ro/files_texteditor.po                | 44 +++++++++++
 l10n/ro/impress.po                         | 22 ++++++
 l10n/ru/files_texteditor.po                | 44 +++++++++++
 l10n/ru/impress.po                         | 22 ++++++
 l10n/sk_SK/files_texteditor.po             | 44 +++++++++++
 l10n/sk_SK/impress.po                      | 22 ++++++
 l10n/sl/files_texteditor.po                | 44 +++++++++++
 l10n/sl/impress.po                         | 22 ++++++
 l10n/so/files_texteditor.po                | 44 +++++++++++
 l10n/so/impress.po                         | 22 ++++++
 l10n/sr/files_texteditor.po                | 44 +++++++++++
 l10n/sr/impress.po                         | 22 ++++++
 l10n/sr@latin/files_texteditor.po          | 44 +++++++++++
 l10n/sr@latin/impress.po                   | 22 ++++++
 l10n/sv/files_texteditor.po                | 44 +++++++++++
 l10n/sv/impress.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                |  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_texteditor.pot        |  2 +-
 l10n/templates/files_versions.pot          |  2 +-
 l10n/templates/gallery.pot                 |  2 +-
 l10n/templates/impress.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/files_texteditor.po             | 44 +++++++++++
 l10n/th_TH/impress.po                      | 22 ++++++
 l10n/tr/files_texteditor.po                | 44 +++++++++++
 l10n/tr/impress.po                         | 22 ++++++
 l10n/uk/files_texteditor.po                | 44 +++++++++++
 l10n/uk/impress.po                         | 22 ++++++
 l10n/vi/files_texteditor.po                | 44 +++++++++++
 l10n/vi/impress.po                         | 22 ++++++
 l10n/zh_CN.GB2312/files_texteditor.po      | 44 +++++++++++
 l10n/zh_CN.GB2312/impress.po               | 22 ++++++
 l10n/zh_CN/files_texteditor.po             | 44 +++++++++++
 l10n/zh_CN/impress.po                      | 22 ++++++
 l10n/zh_TW/files_texteditor.po             | 44 +++++++++++
 l10n/zh_TW/impress.po                      | 22 ++++++
 lib/l10n/nb_NO.php                         |  1 +
 settings/l10n/nb_NO.php                    |  9 +++
 145 files changed, 3799 insertions(+), 181 deletions(-)
 create mode 100644 apps/admin_dependencies_chk/l10n/nb_NO.php
 create mode 100644 l10n/af/files_texteditor.po
 create mode 100644 l10n/af/impress.po
 create mode 100644 l10n/ar/files_texteditor.po
 create mode 100644 l10n/ar/impress.po
 create mode 100644 l10n/ar_SA/files_texteditor.po
 create mode 100644 l10n/ar_SA/impress.po
 create mode 100644 l10n/bg_BG/files_texteditor.po
 create mode 100644 l10n/bg_BG/impress.po
 create mode 100644 l10n/ca/files_texteditor.po
 create mode 100644 l10n/ca/impress.po
 create mode 100644 l10n/cs_CZ/files_texteditor.po
 create mode 100644 l10n/cs_CZ/impress.po
 create mode 100644 l10n/da/files_texteditor.po
 create mode 100644 l10n/da/impress.po
 create mode 100644 l10n/de/files_texteditor.po
 create mode 100644 l10n/de/impress.po
 create mode 100644 l10n/el/files_texteditor.po
 create mode 100644 l10n/el/impress.po
 create mode 100644 l10n/eo/files_texteditor.po
 create mode 100644 l10n/eo/impress.po
 create mode 100644 l10n/es/files_texteditor.po
 create mode 100644 l10n/es/impress.po
 create mode 100644 l10n/et_EE/files_texteditor.po
 create mode 100644 l10n/et_EE/impress.po
 create mode 100644 l10n/eu/files_texteditor.po
 create mode 100644 l10n/eu/impress.po
 create mode 100644 l10n/eu_ES/files_texteditor.po
 create mode 100644 l10n/eu_ES/impress.po
 create mode 100644 l10n/fa/files_texteditor.po
 create mode 100644 l10n/fa/impress.po
 create mode 100644 l10n/fi/files_texteditor.po
 create mode 100644 l10n/fi/impress.po
 create mode 100644 l10n/fi_FI/files_texteditor.po
 create mode 100644 l10n/fi_FI/impress.po
 create mode 100644 l10n/fr/files_texteditor.po
 create mode 100644 l10n/fr/impress.po
 create mode 100644 l10n/gl/files_texteditor.po
 create mode 100644 l10n/gl/impress.po
 create mode 100644 l10n/he/files_texteditor.po
 create mode 100644 l10n/he/impress.po
 create mode 100644 l10n/hr/files_texteditor.po
 create mode 100644 l10n/hr/impress.po
 create mode 100644 l10n/hu_HU/files_texteditor.po
 create mode 100644 l10n/hu_HU/impress.po
 create mode 100644 l10n/hy/files_texteditor.po
 create mode 100644 l10n/hy/impress.po
 create mode 100644 l10n/ia/files_texteditor.po
 create mode 100644 l10n/ia/impress.po
 create mode 100644 l10n/id/files_texteditor.po
 create mode 100644 l10n/id/impress.po
 create mode 100644 l10n/id_ID/files_texteditor.po
 create mode 100644 l10n/id_ID/impress.po
 create mode 100644 l10n/it/files_texteditor.po
 create mode 100644 l10n/it/impress.po
 create mode 100644 l10n/ja_JP/files_texteditor.po
 create mode 100644 l10n/ja_JP/impress.po
 create mode 100644 l10n/ko/files_texteditor.po
 create mode 100644 l10n/ko/impress.po
 create mode 100644 l10n/lb/files_texteditor.po
 create mode 100644 l10n/lb/impress.po
 create mode 100644 l10n/lt_LT/files_texteditor.po
 create mode 100644 l10n/lt_LT/impress.po
 create mode 100644 l10n/lv/files_texteditor.po
 create mode 100644 l10n/lv/impress.po
 create mode 100644 l10n/mk/files_texteditor.po
 create mode 100644 l10n/mk/impress.po
 create mode 100644 l10n/ms_MY/files_texteditor.po
 create mode 100644 l10n/ms_MY/impress.po
 create mode 100644 l10n/nb_NO/files_texteditor.po
 create mode 100644 l10n/nb_NO/impress.po
 create mode 100644 l10n/nl/files_texteditor.po
 create mode 100644 l10n/nl/impress.po
 create mode 100644 l10n/nn_NO/files_texteditor.po
 create mode 100644 l10n/nn_NO/impress.po
 create mode 100644 l10n/pl/files_texteditor.po
 create mode 100644 l10n/pl/impress.po
 create mode 100644 l10n/pt_BR/files_texteditor.po
 create mode 100644 l10n/pt_BR/impress.po
 create mode 100644 l10n/pt_PT/files_texteditor.po
 create mode 100644 l10n/pt_PT/impress.po
 create mode 100644 l10n/ro/files_texteditor.po
 create mode 100644 l10n/ro/impress.po
 create mode 100644 l10n/ru/files_texteditor.po
 create mode 100644 l10n/ru/impress.po
 create mode 100644 l10n/sk_SK/files_texteditor.po
 create mode 100644 l10n/sk_SK/impress.po
 create mode 100644 l10n/sl/files_texteditor.po
 create mode 100644 l10n/sl/impress.po
 create mode 100644 l10n/so/files_texteditor.po
 create mode 100644 l10n/so/impress.po
 create mode 100644 l10n/sr/files_texteditor.po
 create mode 100644 l10n/sr/impress.po
 create mode 100644 l10n/sr@latin/files_texteditor.po
 create mode 100644 l10n/sr@latin/impress.po
 create mode 100644 l10n/sv/files_texteditor.po
 create mode 100644 l10n/sv/impress.po
 create mode 100644 l10n/th_TH/files_texteditor.po
 create mode 100644 l10n/th_TH/impress.po
 create mode 100644 l10n/tr/files_texteditor.po
 create mode 100644 l10n/tr/impress.po
 create mode 100644 l10n/uk/files_texteditor.po
 create mode 100644 l10n/uk/impress.po
 create mode 100644 l10n/vi/files_texteditor.po
 create mode 100644 l10n/vi/impress.po
 create mode 100644 l10n/zh_CN.GB2312/files_texteditor.po
 create mode 100644 l10n/zh_CN.GB2312/impress.po
 create mode 100644 l10n/zh_CN/files_texteditor.po
 create mode 100644 l10n/zh_CN/impress.po
 create mode 100644 l10n/zh_TW/files_texteditor.po
 create mode 100644 l10n/zh_TW/impress.po

diff --git a/apps/admin_dependencies_chk/l10n/nb_NO.php b/apps/admin_dependencies_chk/l10n/nb_NO.php
new file mode 100644
index 0000000000..98fcf4fe2a
--- /dev/null
+++ b/apps/admin_dependencies_chk/l10n/nb_NO.php
@@ -0,0 +1,14 @@
+<?php $TRANSLATIONS = array(
+"The php-json module is needed by the many applications for inter communications" => "Modulen php-jason blir benyttet til inter kommunikasjon",
+"The php-curl modude is needed to fetch the page title when adding a bookmarks" => "Modulen php-curl blir brukt til å hente sidetittelen når bokmerke blir lagt til",
+"The php-gd module is needed to create thumbnails of your images" => "Modulen php-gd blir benyttet til å lage miniatyr av bildene dine",
+"The php-ldap module is needed connect to your ldap server" => "Modulen php-ldap benyttes for å koble til din ldapserver",
+"The php-zip module is needed download multiple files at once" => "Modulen php-zup benyttes til å laste ned flere filer på en gang.",
+"The php-mb_multibyte module is needed to manage correctly the encoding." => "Modulen php-mb_multibyte benyttes til å håndtere korrekt tegnkoding.",
+"The php-ctype module is needed validate data." => "Modulen php-ctype benyttes til å validere data.",
+"The php-xml module is needed to share files with webdav." => "Modulen php-xml benyttes til å dele 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 settes til 1 for å kunne hente kunnskapsbasen fra OCS-servere",
+"The php-pdo module is needed to store owncloud data into a database." => "Modulen php-pdo benyttes til å lagre ownCloud data i en database.",
+"Dependencies status" => "Avhengighetsstatus",
+"Used by :" => "Benyttes av:"
+);
diff --git a/apps/bookmarks/l10n/nb_NO.php b/apps/bookmarks/l10n/nb_NO.php
index 12e63887d2..f0efeaca34 100644
--- a/apps/bookmarks/l10n/nb_NO.php
+++ b/apps/bookmarks/l10n/nb_NO.php
@@ -7,5 +7,6 @@
 "Title" => "Tittel",
 "Tags" => "Etikett",
 "Save bookmark" => "Lagre bokmerke",
-"You have no bookmarks" => "Du har ingen bokmerker"
+"You have no bookmarks" => "Du har ingen bokmerker",
+"Bookmarklet <br />" => "Bokmerke <br />"
 );
diff --git a/apps/files/l10n/nb_NO.php b/apps/files/l10n/nb_NO.php
index f02de12615..92d0c23bfd 100644
--- a/apps/files/l10n/nb_NO.php
+++ b/apps/files/l10n/nb_NO.php
@@ -8,8 +8,19 @@
 "Failed to write to disk" => "Klarte ikke å skrive til disk",
 "Files" => "Filer",
 "Delete" => "Slett",
+"already exists" => "eksisterer allerede",
+"replace" => "erstatt",
+"cancel" => "avbryt",
+"replaced" => "erstattet",
+"with" => "med",
+"undo" => "angre",
+"deleted" => "slettet",
 "generating ZIP-file, it may take some time." => "opprettet ZIP-fil, dette kan ta litt tid",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Kan ikke laste opp filen din siden det er en mappe eller den har 0 bytes",
+"Upload Error" => "Opplasting feilet",
 "Pending" => "Ventende",
+"Upload cancelled." => "Opplasting avbrutt.",
+"Invalid name, '/' is not allowed." => "Ugyldig navn, '/' er ikke tillatt. ",
 "Size" => "Størrelse",
 "Modified" => "Endret",
 "folder" => "mappe",
diff --git a/apps/gallery/l10n/nb_NO.php b/apps/gallery/l10n/nb_NO.php
index 93dcb8372d..532062937f 100644
--- a/apps/gallery/l10n/nb_NO.php
+++ b/apps/gallery/l10n/nb_NO.php
@@ -1,12 +1,7 @@
 <?php $TRANSLATIONS = array(
 "Pictures" => "Bilder",
-"Settings" => "Innstillinger",
-"Rescan" => "Les inn på nytt",
-"Stop" => "Stopp",
-"Share" => "Del",
-"Back" => "Tilbake",
-"Remove confirmation" => "Fjern bekreftelse",
-"Do you want to remove album" => "Ønsker du å slette albumet?",
-"Change album name" => "Endre navn på album",
-"New album name" => "Nytt navn på album"
+"Share gallery" => "Del galleri",
+"Error: " => "Feil:",
+"Internal error" => "Intern feil",
+"Slideshow" => "Lysbildefremvisning"
 );
diff --git a/core/l10n/nb_NO.php b/core/l10n/nb_NO.php
index a8bfebb8a5..892ad2b791 100644
--- a/core/l10n/nb_NO.php
+++ b/core/l10n/nb_NO.php
@@ -2,6 +2,7 @@
 "Application name not provided." => "Applikasjonsnavn ikke angitt.",
 "No category to add?" => "Ingen kategorier å legge til?",
 "This category already exists: " => "Denne kategorien finnes allerede:",
+"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" => "Innstillinger",
 "January" => "Januar",
 "February" => "Februar",
@@ -50,6 +51,7 @@
 "Database user" => "Databasebruker",
 "Database password" => "Databasepassord",
 "Database name" => "Databasenavn",
+"Database tablespace" => "Database tabellområde",
 "Database host" => "Databasevert",
 "Finish setup" => "Fullfør oppsetting",
 "web services under your control" => "nettjenester under din kontroll",
diff --git a/l10n/af/files_texteditor.po b/l10n/af/files_texteditor.po
new file mode 100644
index 0000000000..167f825358
--- /dev/null
+++ b/l10n/af/files_texteditor.po
@@ -0,0 +1,44 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+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/aceeditor/mode-coldfusion-uncompressed.js:1568
+#: js/aceeditor/mode-liquid-uncompressed.js:902
+#: js/aceeditor/mode-svg-uncompressed.js:1575
+msgid "regex"
+msgstr ""
+
+#: js/editor.js:72 js/editor.js:156 js/editor.js:163
+msgid "Save"
+msgstr ""
+
+#: js/editor.js:74
+msgid "Close"
+msgstr ""
+
+#: js/editor.js:149
+msgid "Saving..."
+msgstr ""
+
+#: js/editor.js:239
+msgid "An error occurred!"
+msgstr ""
+
+#: js/editor.js:266
+msgid "There were unsaved changes, click here to go back"
+msgstr ""
diff --git a/l10n/af/impress.po b/l10n/af/impress.po
new file mode 100644
index 0000000000..ad04eff39f
--- /dev/null
+++ b/l10n/af/impress.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+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/presentations.php:7
+msgid "Documentation"
+msgstr ""
diff --git a/l10n/ar/files_texteditor.po b/l10n/ar/files_texteditor.po
new file mode 100644
index 0000000000..ed1f96fd6c
--- /dev/null
+++ b/l10n/ar/files_texteditor.po
@@ -0,0 +1,44 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+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/aceeditor/mode-coldfusion-uncompressed.js:1568
+#: js/aceeditor/mode-liquid-uncompressed.js:902
+#: js/aceeditor/mode-svg-uncompressed.js:1575
+msgid "regex"
+msgstr ""
+
+#: js/editor.js:72 js/editor.js:156 js/editor.js:163
+msgid "Save"
+msgstr ""
+
+#: js/editor.js:74
+msgid "Close"
+msgstr ""
+
+#: js/editor.js:149
+msgid "Saving..."
+msgstr ""
+
+#: js/editor.js:239
+msgid "An error occurred!"
+msgstr ""
+
+#: js/editor.js:266
+msgid "There were unsaved changes, click here to go back"
+msgstr ""
diff --git a/l10n/ar/impress.po b/l10n/ar/impress.po
new file mode 100644
index 0000000000..5bbc9f2fbc
--- /dev/null
+++ b/l10n/ar/impress.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+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/presentations.php:7
+msgid "Documentation"
+msgstr ""
diff --git a/l10n/ar_SA/files_texteditor.po b/l10n/ar_SA/files_texteditor.po
new file mode 100644
index 0000000000..384e4edc4d
--- /dev/null
+++ b/l10n/ar_SA/files_texteditor.po
@@ -0,0 +1,44 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+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/aceeditor/mode-coldfusion-uncompressed.js:1568
+#: js/aceeditor/mode-liquid-uncompressed.js:902
+#: js/aceeditor/mode-svg-uncompressed.js:1575
+msgid "regex"
+msgstr ""
+
+#: js/editor.js:72 js/editor.js:156 js/editor.js:163
+msgid "Save"
+msgstr ""
+
+#: js/editor.js:74
+msgid "Close"
+msgstr ""
+
+#: js/editor.js:149
+msgid "Saving..."
+msgstr ""
+
+#: js/editor.js:239
+msgid "An error occurred!"
+msgstr ""
+
+#: js/editor.js:266
+msgid "There were unsaved changes, click here to go back"
+msgstr ""
diff --git a/l10n/ar_SA/impress.po b/l10n/ar_SA/impress.po
new file mode 100644
index 0000000000..5c3c10d5df
--- /dev/null
+++ b/l10n/ar_SA/impress.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+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/presentations.php:7
+msgid "Documentation"
+msgstr ""
diff --git a/l10n/bg_BG/files_texteditor.po b/l10n/bg_BG/files_texteditor.po
new file mode 100644
index 0000000000..17803a5774
--- /dev/null
+++ b/l10n/bg_BG/files_texteditor.po
@@ -0,0 +1,44 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+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/aceeditor/mode-coldfusion-uncompressed.js:1568
+#: js/aceeditor/mode-liquid-uncompressed.js:902
+#: js/aceeditor/mode-svg-uncompressed.js:1575
+msgid "regex"
+msgstr ""
+
+#: js/editor.js:72 js/editor.js:156 js/editor.js:163
+msgid "Save"
+msgstr ""
+
+#: js/editor.js:74
+msgid "Close"
+msgstr ""
+
+#: js/editor.js:149
+msgid "Saving..."
+msgstr ""
+
+#: js/editor.js:239
+msgid "An error occurred!"
+msgstr ""
+
+#: js/editor.js:266
+msgid "There were unsaved changes, click here to go back"
+msgstr ""
diff --git a/l10n/bg_BG/impress.po b/l10n/bg_BG/impress.po
new file mode 100644
index 0000000000..35269e2e70
--- /dev/null
+++ b/l10n/bg_BG/impress.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+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/presentations.php:7
+msgid "Documentation"
+msgstr ""
diff --git a/l10n/ca/files_texteditor.po b/l10n/ca/files_texteditor.po
new file mode 100644
index 0000000000..9e62b3f7a2
--- /dev/null
+++ b/l10n/ca/files_texteditor.po
@@ -0,0 +1,44 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+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"
+
+#: js/aceeditor/mode-coldfusion-uncompressed.js:1568
+#: js/aceeditor/mode-liquid-uncompressed.js:902
+#: js/aceeditor/mode-svg-uncompressed.js:1575
+msgid "regex"
+msgstr ""
+
+#: js/editor.js:72 js/editor.js:156 js/editor.js:163
+msgid "Save"
+msgstr ""
+
+#: js/editor.js:74
+msgid "Close"
+msgstr ""
+
+#: js/editor.js:149
+msgid "Saving..."
+msgstr ""
+
+#: js/editor.js:239
+msgid "An error occurred!"
+msgstr ""
+
+#: js/editor.js:266
+msgid "There were unsaved changes, click here to go back"
+msgstr ""
diff --git a/l10n/ca/impress.po b/l10n/ca/impress.po
new file mode 100644
index 0000000000..198ff99c6d
--- /dev/null
+++ b/l10n/ca/impress.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+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"
+
+#: templates/presentations.php:7
+msgid "Documentation"
+msgstr ""
diff --git a/l10n/cs_CZ/files_texteditor.po b/l10n/cs_CZ/files_texteditor.po
new file mode 100644
index 0000000000..6c9ac9a372
--- /dev/null
+++ b/l10n/cs_CZ/files_texteditor.po
@@ -0,0 +1,44 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+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/aceeditor/mode-coldfusion-uncompressed.js:1568
+#: js/aceeditor/mode-liquid-uncompressed.js:902
+#: js/aceeditor/mode-svg-uncompressed.js:1575
+msgid "regex"
+msgstr ""
+
+#: js/editor.js:72 js/editor.js:156 js/editor.js:163
+msgid "Save"
+msgstr ""
+
+#: js/editor.js:74
+msgid "Close"
+msgstr ""
+
+#: js/editor.js:149
+msgid "Saving..."
+msgstr ""
+
+#: js/editor.js:239
+msgid "An error occurred!"
+msgstr ""
+
+#: js/editor.js:266
+msgid "There were unsaved changes, click here to go back"
+msgstr ""
diff --git a/l10n/cs_CZ/impress.po b/l10n/cs_CZ/impress.po
new file mode 100644
index 0000000000..0b19a018bc
--- /dev/null
+++ b/l10n/cs_CZ/impress.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+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/presentations.php:7
+msgid "Documentation"
+msgstr ""
diff --git a/l10n/da/files_texteditor.po b/l10n/da/files_texteditor.po
new file mode 100644
index 0000000000..cb994d6b92
--- /dev/null
+++ b/l10n/da/files_texteditor.po
@@ -0,0 +1,44 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+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/aceeditor/mode-coldfusion-uncompressed.js:1568
+#: js/aceeditor/mode-liquid-uncompressed.js:902
+#: js/aceeditor/mode-svg-uncompressed.js:1575
+msgid "regex"
+msgstr ""
+
+#: js/editor.js:72 js/editor.js:156 js/editor.js:163
+msgid "Save"
+msgstr ""
+
+#: js/editor.js:74
+msgid "Close"
+msgstr ""
+
+#: js/editor.js:149
+msgid "Saving..."
+msgstr ""
+
+#: js/editor.js:239
+msgid "An error occurred!"
+msgstr ""
+
+#: js/editor.js:266
+msgid "There were unsaved changes, click here to go back"
+msgstr ""
diff --git a/l10n/da/impress.po b/l10n/da/impress.po
new file mode 100644
index 0000000000..80c9eb2ed8
--- /dev/null
+++ b/l10n/da/impress.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+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/presentations.php:7
+msgid "Documentation"
+msgstr ""
diff --git a/l10n/de/files_texteditor.po b/l10n/de/files_texteditor.po
new file mode 100644
index 0000000000..dfddc7a7da
--- /dev/null
+++ b/l10n/de/files_texteditor.po
@@ -0,0 +1,44 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+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/aceeditor/mode-coldfusion-uncompressed.js:1568
+#: js/aceeditor/mode-liquid-uncompressed.js:902
+#: js/aceeditor/mode-svg-uncompressed.js:1575
+msgid "regex"
+msgstr ""
+
+#: js/editor.js:72 js/editor.js:156 js/editor.js:163
+msgid "Save"
+msgstr ""
+
+#: js/editor.js:74
+msgid "Close"
+msgstr ""
+
+#: js/editor.js:149
+msgid "Saving..."
+msgstr ""
+
+#: js/editor.js:239
+msgid "An error occurred!"
+msgstr ""
+
+#: js/editor.js:266
+msgid "There were unsaved changes, click here to go back"
+msgstr ""
diff --git a/l10n/de/impress.po b/l10n/de/impress.po
new file mode 100644
index 0000000000..a997ed86f7
--- /dev/null
+++ b/l10n/de/impress.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+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/presentations.php:7
+msgid "Documentation"
+msgstr ""
diff --git a/l10n/el/files_texteditor.po b/l10n/el/files_texteditor.po
new file mode 100644
index 0000000000..c449b11184
--- /dev/null
+++ b/l10n/el/files_texteditor.po
@@ -0,0 +1,44 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+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/aceeditor/mode-coldfusion-uncompressed.js:1568
+#: js/aceeditor/mode-liquid-uncompressed.js:902
+#: js/aceeditor/mode-svg-uncompressed.js:1575
+msgid "regex"
+msgstr ""
+
+#: js/editor.js:72 js/editor.js:156 js/editor.js:163
+msgid "Save"
+msgstr ""
+
+#: js/editor.js:74
+msgid "Close"
+msgstr ""
+
+#: js/editor.js:149
+msgid "Saving..."
+msgstr ""
+
+#: js/editor.js:239
+msgid "An error occurred!"
+msgstr ""
+
+#: js/editor.js:266
+msgid "There were unsaved changes, click here to go back"
+msgstr ""
diff --git a/l10n/el/impress.po b/l10n/el/impress.po
new file mode 100644
index 0000000000..f6cd715453
--- /dev/null
+++ b/l10n/el/impress.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+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/presentations.php:7
+msgid "Documentation"
+msgstr ""
diff --git a/l10n/eo/files_texteditor.po b/l10n/eo/files_texteditor.po
new file mode 100644
index 0000000000..6571503162
--- /dev/null
+++ b/l10n/eo/files_texteditor.po
@@ -0,0 +1,44 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+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/aceeditor/mode-coldfusion-uncompressed.js:1568
+#: js/aceeditor/mode-liquid-uncompressed.js:902
+#: js/aceeditor/mode-svg-uncompressed.js:1575
+msgid "regex"
+msgstr ""
+
+#: js/editor.js:72 js/editor.js:156 js/editor.js:163
+msgid "Save"
+msgstr ""
+
+#: js/editor.js:74
+msgid "Close"
+msgstr ""
+
+#: js/editor.js:149
+msgid "Saving..."
+msgstr ""
+
+#: js/editor.js:239
+msgid "An error occurred!"
+msgstr ""
+
+#: js/editor.js:266
+msgid "There were unsaved changes, click here to go back"
+msgstr ""
diff --git a/l10n/eo/impress.po b/l10n/eo/impress.po
new file mode 100644
index 0000000000..930ca99a87
--- /dev/null
+++ b/l10n/eo/impress.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+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/presentations.php:7
+msgid "Documentation"
+msgstr ""
diff --git a/l10n/es/files_texteditor.po b/l10n/es/files_texteditor.po
new file mode 100644
index 0000000000..51dd6d7810
--- /dev/null
+++ b/l10n/es/files_texteditor.po
@@ -0,0 +1,44 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+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/aceeditor/mode-coldfusion-uncompressed.js:1568
+#: js/aceeditor/mode-liquid-uncompressed.js:902
+#: js/aceeditor/mode-svg-uncompressed.js:1575
+msgid "regex"
+msgstr ""
+
+#: js/editor.js:72 js/editor.js:156 js/editor.js:163
+msgid "Save"
+msgstr ""
+
+#: js/editor.js:74
+msgid "Close"
+msgstr ""
+
+#: js/editor.js:149
+msgid "Saving..."
+msgstr ""
+
+#: js/editor.js:239
+msgid "An error occurred!"
+msgstr ""
+
+#: js/editor.js:266
+msgid "There were unsaved changes, click here to go back"
+msgstr ""
diff --git a/l10n/es/impress.po b/l10n/es/impress.po
new file mode 100644
index 0000000000..45ece5e5e6
--- /dev/null
+++ b/l10n/es/impress.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+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/presentations.php:7
+msgid "Documentation"
+msgstr ""
diff --git a/l10n/et_EE/files_texteditor.po b/l10n/et_EE/files_texteditor.po
new file mode 100644
index 0000000000..1349624339
--- /dev/null
+++ b/l10n/et_EE/files_texteditor.po
@@ -0,0 +1,44 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+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/aceeditor/mode-coldfusion-uncompressed.js:1568
+#: js/aceeditor/mode-liquid-uncompressed.js:902
+#: js/aceeditor/mode-svg-uncompressed.js:1575
+msgid "regex"
+msgstr ""
+
+#: js/editor.js:72 js/editor.js:156 js/editor.js:163
+msgid "Save"
+msgstr ""
+
+#: js/editor.js:74
+msgid "Close"
+msgstr ""
+
+#: js/editor.js:149
+msgid "Saving..."
+msgstr ""
+
+#: js/editor.js:239
+msgid "An error occurred!"
+msgstr ""
+
+#: js/editor.js:266
+msgid "There were unsaved changes, click here to go back"
+msgstr ""
diff --git a/l10n/et_EE/impress.po b/l10n/et_EE/impress.po
new file mode 100644
index 0000000000..85746c6484
--- /dev/null
+++ b/l10n/et_EE/impress.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+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/presentations.php:7
+msgid "Documentation"
+msgstr ""
diff --git a/l10n/eu/files_texteditor.po b/l10n/eu/files_texteditor.po
new file mode 100644
index 0000000000..859179f561
--- /dev/null
+++ b/l10n/eu/files_texteditor.po
@@ -0,0 +1,44 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+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/aceeditor/mode-coldfusion-uncompressed.js:1568
+#: js/aceeditor/mode-liquid-uncompressed.js:902
+#: js/aceeditor/mode-svg-uncompressed.js:1575
+msgid "regex"
+msgstr ""
+
+#: js/editor.js:72 js/editor.js:156 js/editor.js:163
+msgid "Save"
+msgstr ""
+
+#: js/editor.js:74
+msgid "Close"
+msgstr ""
+
+#: js/editor.js:149
+msgid "Saving..."
+msgstr ""
+
+#: js/editor.js:239
+msgid "An error occurred!"
+msgstr ""
+
+#: js/editor.js:266
+msgid "There were unsaved changes, click here to go back"
+msgstr ""
diff --git a/l10n/eu/impress.po b/l10n/eu/impress.po
new file mode 100644
index 0000000000..29fd6a225e
--- /dev/null
+++ b/l10n/eu/impress.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+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/presentations.php:7
+msgid "Documentation"
+msgstr ""
diff --git a/l10n/eu_ES/files_texteditor.po b/l10n/eu_ES/files_texteditor.po
new file mode 100644
index 0000000000..f4fbf12ae5
--- /dev/null
+++ b/l10n/eu_ES/files_texteditor.po
@@ -0,0 +1,44 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+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/aceeditor/mode-coldfusion-uncompressed.js:1568
+#: js/aceeditor/mode-liquid-uncompressed.js:902
+#: js/aceeditor/mode-svg-uncompressed.js:1575
+msgid "regex"
+msgstr ""
+
+#: js/editor.js:72 js/editor.js:156 js/editor.js:163
+msgid "Save"
+msgstr ""
+
+#: js/editor.js:74
+msgid "Close"
+msgstr ""
+
+#: js/editor.js:149
+msgid "Saving..."
+msgstr ""
+
+#: js/editor.js:239
+msgid "An error occurred!"
+msgstr ""
+
+#: js/editor.js:266
+msgid "There were unsaved changes, click here to go back"
+msgstr ""
diff --git a/l10n/eu_ES/impress.po b/l10n/eu_ES/impress.po
new file mode 100644
index 0000000000..f3819cec39
--- /dev/null
+++ b/l10n/eu_ES/impress.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+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/presentations.php:7
+msgid "Documentation"
+msgstr ""
diff --git a/l10n/fa/files_texteditor.po b/l10n/fa/files_texteditor.po
new file mode 100644
index 0000000000..2360c9358c
--- /dev/null
+++ b/l10n/fa/files_texteditor.po
@@ -0,0 +1,44 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+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/aceeditor/mode-coldfusion-uncompressed.js:1568
+#: js/aceeditor/mode-liquid-uncompressed.js:902
+#: js/aceeditor/mode-svg-uncompressed.js:1575
+msgid "regex"
+msgstr ""
+
+#: js/editor.js:72 js/editor.js:156 js/editor.js:163
+msgid "Save"
+msgstr ""
+
+#: js/editor.js:74
+msgid "Close"
+msgstr ""
+
+#: js/editor.js:149
+msgid "Saving..."
+msgstr ""
+
+#: js/editor.js:239
+msgid "An error occurred!"
+msgstr ""
+
+#: js/editor.js:266
+msgid "There were unsaved changes, click here to go back"
+msgstr ""
diff --git a/l10n/fa/impress.po b/l10n/fa/impress.po
new file mode 100644
index 0000000000..7f9e9429ff
--- /dev/null
+++ b/l10n/fa/impress.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+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/presentations.php:7
+msgid "Documentation"
+msgstr ""
diff --git a/l10n/fi/files_texteditor.po b/l10n/fi/files_texteditor.po
new file mode 100644
index 0000000000..07f6f6ca27
--- /dev/null
+++ b/l10n/fi/files_texteditor.po
@@ -0,0 +1,44 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+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/aceeditor/mode-coldfusion-uncompressed.js:1568
+#: js/aceeditor/mode-liquid-uncompressed.js:902
+#: js/aceeditor/mode-svg-uncompressed.js:1575
+msgid "regex"
+msgstr ""
+
+#: js/editor.js:72 js/editor.js:156 js/editor.js:163
+msgid "Save"
+msgstr ""
+
+#: js/editor.js:74
+msgid "Close"
+msgstr ""
+
+#: js/editor.js:149
+msgid "Saving..."
+msgstr ""
+
+#: js/editor.js:239
+msgid "An error occurred!"
+msgstr ""
+
+#: js/editor.js:266
+msgid "There were unsaved changes, click here to go back"
+msgstr ""
diff --git a/l10n/fi/impress.po b/l10n/fi/impress.po
new file mode 100644
index 0000000000..60c70f400f
--- /dev/null
+++ b/l10n/fi/impress.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+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/presentations.php:7
+msgid "Documentation"
+msgstr ""
diff --git a/l10n/fi_FI/files_texteditor.po b/l10n/fi_FI/files_texteditor.po
new file mode 100644
index 0000000000..69c3672db6
--- /dev/null
+++ b/l10n/fi_FI/files_texteditor.po
@@ -0,0 +1,44 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+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/aceeditor/mode-coldfusion-uncompressed.js:1568
+#: js/aceeditor/mode-liquid-uncompressed.js:902
+#: js/aceeditor/mode-svg-uncompressed.js:1575
+msgid "regex"
+msgstr ""
+
+#: js/editor.js:72 js/editor.js:156 js/editor.js:163
+msgid "Save"
+msgstr ""
+
+#: js/editor.js:74
+msgid "Close"
+msgstr ""
+
+#: js/editor.js:149
+msgid "Saving..."
+msgstr ""
+
+#: js/editor.js:239
+msgid "An error occurred!"
+msgstr ""
+
+#: js/editor.js:266
+msgid "There were unsaved changes, click here to go back"
+msgstr ""
diff --git a/l10n/fi_FI/impress.po b/l10n/fi_FI/impress.po
new file mode 100644
index 0000000000..ccf18fac85
--- /dev/null
+++ b/l10n/fi_FI/impress.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+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/presentations.php:7
+msgid "Documentation"
+msgstr ""
diff --git a/l10n/fr/files_texteditor.po b/l10n/fr/files_texteditor.po
new file mode 100644
index 0000000000..3b4cb02d2c
--- /dev/null
+++ b/l10n/fr/files_texteditor.po
@@ -0,0 +1,44 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+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/aceeditor/mode-coldfusion-uncompressed.js:1568
+#: js/aceeditor/mode-liquid-uncompressed.js:902
+#: js/aceeditor/mode-svg-uncompressed.js:1575
+msgid "regex"
+msgstr ""
+
+#: js/editor.js:72 js/editor.js:156 js/editor.js:163
+msgid "Save"
+msgstr ""
+
+#: js/editor.js:74
+msgid "Close"
+msgstr ""
+
+#: js/editor.js:149
+msgid "Saving..."
+msgstr ""
+
+#: js/editor.js:239
+msgid "An error occurred!"
+msgstr ""
+
+#: js/editor.js:266
+msgid "There were unsaved changes, click here to go back"
+msgstr ""
diff --git a/l10n/fr/impress.po b/l10n/fr/impress.po
new file mode 100644
index 0000000000..3323106c6e
--- /dev/null
+++ b/l10n/fr/impress.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+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/presentations.php:7
+msgid "Documentation"
+msgstr ""
diff --git a/l10n/gl/files_texteditor.po b/l10n/gl/files_texteditor.po
new file mode 100644
index 0000000000..a6074b2906
--- /dev/null
+++ b/l10n/gl/files_texteditor.po
@@ -0,0 +1,44 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+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/aceeditor/mode-coldfusion-uncompressed.js:1568
+#: js/aceeditor/mode-liquid-uncompressed.js:902
+#: js/aceeditor/mode-svg-uncompressed.js:1575
+msgid "regex"
+msgstr ""
+
+#: js/editor.js:72 js/editor.js:156 js/editor.js:163
+msgid "Save"
+msgstr ""
+
+#: js/editor.js:74
+msgid "Close"
+msgstr ""
+
+#: js/editor.js:149
+msgid "Saving..."
+msgstr ""
+
+#: js/editor.js:239
+msgid "An error occurred!"
+msgstr ""
+
+#: js/editor.js:266
+msgid "There were unsaved changes, click here to go back"
+msgstr ""
diff --git a/l10n/gl/impress.po b/l10n/gl/impress.po
new file mode 100644
index 0000000000..fe806d8cc6
--- /dev/null
+++ b/l10n/gl/impress.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+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/presentations.php:7
+msgid "Documentation"
+msgstr ""
diff --git a/l10n/he/files_texteditor.po b/l10n/he/files_texteditor.po
new file mode 100644
index 0000000000..1992f89c84
--- /dev/null
+++ b/l10n/he/files_texteditor.po
@@ -0,0 +1,44 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+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/aceeditor/mode-coldfusion-uncompressed.js:1568
+#: js/aceeditor/mode-liquid-uncompressed.js:902
+#: js/aceeditor/mode-svg-uncompressed.js:1575
+msgid "regex"
+msgstr ""
+
+#: js/editor.js:72 js/editor.js:156 js/editor.js:163
+msgid "Save"
+msgstr ""
+
+#: js/editor.js:74
+msgid "Close"
+msgstr ""
+
+#: js/editor.js:149
+msgid "Saving..."
+msgstr ""
+
+#: js/editor.js:239
+msgid "An error occurred!"
+msgstr ""
+
+#: js/editor.js:266
+msgid "There were unsaved changes, click here to go back"
+msgstr ""
diff --git a/l10n/he/impress.po b/l10n/he/impress.po
new file mode 100644
index 0000000000..722a7c44e1
--- /dev/null
+++ b/l10n/he/impress.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+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/presentations.php:7
+msgid "Documentation"
+msgstr ""
diff --git a/l10n/hr/files_texteditor.po b/l10n/hr/files_texteditor.po
new file mode 100644
index 0000000000..31c7b3bc4e
--- /dev/null
+++ b/l10n/hr/files_texteditor.po
@@ -0,0 +1,44 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+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/aceeditor/mode-coldfusion-uncompressed.js:1568
+#: js/aceeditor/mode-liquid-uncompressed.js:902
+#: js/aceeditor/mode-svg-uncompressed.js:1575
+msgid "regex"
+msgstr ""
+
+#: js/editor.js:72 js/editor.js:156 js/editor.js:163
+msgid "Save"
+msgstr ""
+
+#: js/editor.js:74
+msgid "Close"
+msgstr ""
+
+#: js/editor.js:149
+msgid "Saving..."
+msgstr ""
+
+#: js/editor.js:239
+msgid "An error occurred!"
+msgstr ""
+
+#: js/editor.js:266
+msgid "There were unsaved changes, click here to go back"
+msgstr ""
diff --git a/l10n/hr/impress.po b/l10n/hr/impress.po
new file mode 100644
index 0000000000..b66fc94ed8
--- /dev/null
+++ b/l10n/hr/impress.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+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/presentations.php:7
+msgid "Documentation"
+msgstr ""
diff --git a/l10n/hu_HU/files_texteditor.po b/l10n/hu_HU/files_texteditor.po
new file mode 100644
index 0000000000..bf2f4e4b51
--- /dev/null
+++ b/l10n/hu_HU/files_texteditor.po
@@ -0,0 +1,44 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+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/aceeditor/mode-coldfusion-uncompressed.js:1568
+#: js/aceeditor/mode-liquid-uncompressed.js:902
+#: js/aceeditor/mode-svg-uncompressed.js:1575
+msgid "regex"
+msgstr ""
+
+#: js/editor.js:72 js/editor.js:156 js/editor.js:163
+msgid "Save"
+msgstr ""
+
+#: js/editor.js:74
+msgid "Close"
+msgstr ""
+
+#: js/editor.js:149
+msgid "Saving..."
+msgstr ""
+
+#: js/editor.js:239
+msgid "An error occurred!"
+msgstr ""
+
+#: js/editor.js:266
+msgid "There were unsaved changes, click here to go back"
+msgstr ""
diff --git a/l10n/hu_HU/impress.po b/l10n/hu_HU/impress.po
new file mode 100644
index 0000000000..4c5473d27e
--- /dev/null
+++ b/l10n/hu_HU/impress.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+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/presentations.php:7
+msgid "Documentation"
+msgstr ""
diff --git a/l10n/hy/files_texteditor.po b/l10n/hy/files_texteditor.po
new file mode 100644
index 0000000000..e9e8f856c9
--- /dev/null
+++ b/l10n/hy/files_texteditor.po
@@ -0,0 +1,44 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+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/aceeditor/mode-coldfusion-uncompressed.js:1568
+#: js/aceeditor/mode-liquid-uncompressed.js:902
+#: js/aceeditor/mode-svg-uncompressed.js:1575
+msgid "regex"
+msgstr ""
+
+#: js/editor.js:72 js/editor.js:156 js/editor.js:163
+msgid "Save"
+msgstr ""
+
+#: js/editor.js:74
+msgid "Close"
+msgstr ""
+
+#: js/editor.js:149
+msgid "Saving..."
+msgstr ""
+
+#: js/editor.js:239
+msgid "An error occurred!"
+msgstr ""
+
+#: js/editor.js:266
+msgid "There were unsaved changes, click here to go back"
+msgstr ""
diff --git a/l10n/hy/impress.po b/l10n/hy/impress.po
new file mode 100644
index 0000000000..78bcd125e1
--- /dev/null
+++ b/l10n/hy/impress.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+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/presentations.php:7
+msgid "Documentation"
+msgstr ""
diff --git a/l10n/ia/files_texteditor.po b/l10n/ia/files_texteditor.po
new file mode 100644
index 0000000000..a7f1af6506
--- /dev/null
+++ b/l10n/ia/files_texteditor.po
@@ -0,0 +1,44 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+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/aceeditor/mode-coldfusion-uncompressed.js:1568
+#: js/aceeditor/mode-liquid-uncompressed.js:902
+#: js/aceeditor/mode-svg-uncompressed.js:1575
+msgid "regex"
+msgstr ""
+
+#: js/editor.js:72 js/editor.js:156 js/editor.js:163
+msgid "Save"
+msgstr ""
+
+#: js/editor.js:74
+msgid "Close"
+msgstr ""
+
+#: js/editor.js:149
+msgid "Saving..."
+msgstr ""
+
+#: js/editor.js:239
+msgid "An error occurred!"
+msgstr ""
+
+#: js/editor.js:266
+msgid "There were unsaved changes, click here to go back"
+msgstr ""
diff --git a/l10n/ia/impress.po b/l10n/ia/impress.po
new file mode 100644
index 0000000000..0f36f5ce30
--- /dev/null
+++ b/l10n/ia/impress.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+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/presentations.php:7
+msgid "Documentation"
+msgstr ""
diff --git a/l10n/id/files_texteditor.po b/l10n/id/files_texteditor.po
new file mode 100644
index 0000000000..754e507299
--- /dev/null
+++ b/l10n/id/files_texteditor.po
@@ -0,0 +1,44 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+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/aceeditor/mode-coldfusion-uncompressed.js:1568
+#: js/aceeditor/mode-liquid-uncompressed.js:902
+#: js/aceeditor/mode-svg-uncompressed.js:1575
+msgid "regex"
+msgstr ""
+
+#: js/editor.js:72 js/editor.js:156 js/editor.js:163
+msgid "Save"
+msgstr ""
+
+#: js/editor.js:74
+msgid "Close"
+msgstr ""
+
+#: js/editor.js:149
+msgid "Saving..."
+msgstr ""
+
+#: js/editor.js:239
+msgid "An error occurred!"
+msgstr ""
+
+#: js/editor.js:266
+msgid "There were unsaved changes, click here to go back"
+msgstr ""
diff --git a/l10n/id/impress.po b/l10n/id/impress.po
new file mode 100644
index 0000000000..dfec96ea44
--- /dev/null
+++ b/l10n/id/impress.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+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/presentations.php:7
+msgid "Documentation"
+msgstr ""
diff --git a/l10n/id_ID/files_texteditor.po b/l10n/id_ID/files_texteditor.po
new file mode 100644
index 0000000000..a94adcdcf3
--- /dev/null
+++ b/l10n/id_ID/files_texteditor.po
@@ -0,0 +1,44 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+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/aceeditor/mode-coldfusion-uncompressed.js:1568
+#: js/aceeditor/mode-liquid-uncompressed.js:902
+#: js/aceeditor/mode-svg-uncompressed.js:1575
+msgid "regex"
+msgstr ""
+
+#: js/editor.js:72 js/editor.js:156 js/editor.js:163
+msgid "Save"
+msgstr ""
+
+#: js/editor.js:74
+msgid "Close"
+msgstr ""
+
+#: js/editor.js:149
+msgid "Saving..."
+msgstr ""
+
+#: js/editor.js:239
+msgid "An error occurred!"
+msgstr ""
+
+#: js/editor.js:266
+msgid "There were unsaved changes, click here to go back"
+msgstr ""
diff --git a/l10n/id_ID/impress.po b/l10n/id_ID/impress.po
new file mode 100644
index 0000000000..d5c0259772
--- /dev/null
+++ b/l10n/id_ID/impress.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+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/presentations.php:7
+msgid "Documentation"
+msgstr ""
diff --git a/l10n/it/files_texteditor.po b/l10n/it/files_texteditor.po
new file mode 100644
index 0000000000..747a70244c
--- /dev/null
+++ b/l10n/it/files_texteditor.po
@@ -0,0 +1,44 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+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/aceeditor/mode-coldfusion-uncompressed.js:1568
+#: js/aceeditor/mode-liquid-uncompressed.js:902
+#: js/aceeditor/mode-svg-uncompressed.js:1575
+msgid "regex"
+msgstr ""
+
+#: js/editor.js:72 js/editor.js:156 js/editor.js:163
+msgid "Save"
+msgstr ""
+
+#: js/editor.js:74
+msgid "Close"
+msgstr ""
+
+#: js/editor.js:149
+msgid "Saving..."
+msgstr ""
+
+#: js/editor.js:239
+msgid "An error occurred!"
+msgstr ""
+
+#: js/editor.js:266
+msgid "There were unsaved changes, click here to go back"
+msgstr ""
diff --git a/l10n/it/impress.po b/l10n/it/impress.po
new file mode 100644
index 0000000000..31e6171b4d
--- /dev/null
+++ b/l10n/it/impress.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+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/presentations.php:7
+msgid "Documentation"
+msgstr ""
diff --git a/l10n/ja_JP/files_texteditor.po b/l10n/ja_JP/files_texteditor.po
new file mode 100644
index 0000000000..ab61c0af52
--- /dev/null
+++ b/l10n/ja_JP/files_texteditor.po
@@ -0,0 +1,44 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+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/aceeditor/mode-coldfusion-uncompressed.js:1568
+#: js/aceeditor/mode-liquid-uncompressed.js:902
+#: js/aceeditor/mode-svg-uncompressed.js:1575
+msgid "regex"
+msgstr ""
+
+#: js/editor.js:72 js/editor.js:156 js/editor.js:163
+msgid "Save"
+msgstr ""
+
+#: js/editor.js:74
+msgid "Close"
+msgstr ""
+
+#: js/editor.js:149
+msgid "Saving..."
+msgstr ""
+
+#: js/editor.js:239
+msgid "An error occurred!"
+msgstr ""
+
+#: js/editor.js:266
+msgid "There were unsaved changes, click here to go back"
+msgstr ""
diff --git a/l10n/ja_JP/impress.po b/l10n/ja_JP/impress.po
new file mode 100644
index 0000000000..360c0eca04
--- /dev/null
+++ b/l10n/ja_JP/impress.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+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/presentations.php:7
+msgid "Documentation"
+msgstr ""
diff --git a/l10n/ko/files_texteditor.po b/l10n/ko/files_texteditor.po
new file mode 100644
index 0000000000..6beeb686b9
--- /dev/null
+++ b/l10n/ko/files_texteditor.po
@@ -0,0 +1,44 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+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/aceeditor/mode-coldfusion-uncompressed.js:1568
+#: js/aceeditor/mode-liquid-uncompressed.js:902
+#: js/aceeditor/mode-svg-uncompressed.js:1575
+msgid "regex"
+msgstr ""
+
+#: js/editor.js:72 js/editor.js:156 js/editor.js:163
+msgid "Save"
+msgstr ""
+
+#: js/editor.js:74
+msgid "Close"
+msgstr ""
+
+#: js/editor.js:149
+msgid "Saving..."
+msgstr ""
+
+#: js/editor.js:239
+msgid "An error occurred!"
+msgstr ""
+
+#: js/editor.js:266
+msgid "There were unsaved changes, click here to go back"
+msgstr ""
diff --git a/l10n/ko/impress.po b/l10n/ko/impress.po
new file mode 100644
index 0000000000..c7be0756da
--- /dev/null
+++ b/l10n/ko/impress.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+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/presentations.php:7
+msgid "Documentation"
+msgstr ""
diff --git a/l10n/lb/files_texteditor.po b/l10n/lb/files_texteditor.po
new file mode 100644
index 0000000000..abffc55df0
--- /dev/null
+++ b/l10n/lb/files_texteditor.po
@@ -0,0 +1,44 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+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/aceeditor/mode-coldfusion-uncompressed.js:1568
+#: js/aceeditor/mode-liquid-uncompressed.js:902
+#: js/aceeditor/mode-svg-uncompressed.js:1575
+msgid "regex"
+msgstr ""
+
+#: js/editor.js:72 js/editor.js:156 js/editor.js:163
+msgid "Save"
+msgstr ""
+
+#: js/editor.js:74
+msgid "Close"
+msgstr ""
+
+#: js/editor.js:149
+msgid "Saving..."
+msgstr ""
+
+#: js/editor.js:239
+msgid "An error occurred!"
+msgstr ""
+
+#: js/editor.js:266
+msgid "There were unsaved changes, click here to go back"
+msgstr ""
diff --git a/l10n/lb/impress.po b/l10n/lb/impress.po
new file mode 100644
index 0000000000..a03f893b0f
--- /dev/null
+++ b/l10n/lb/impress.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+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/presentations.php:7
+msgid "Documentation"
+msgstr ""
diff --git a/l10n/lt_LT/files_texteditor.po b/l10n/lt_LT/files_texteditor.po
new file mode 100644
index 0000000000..bd2a8dbff1
--- /dev/null
+++ b/l10n/lt_LT/files_texteditor.po
@@ -0,0 +1,44 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+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/aceeditor/mode-coldfusion-uncompressed.js:1568
+#: js/aceeditor/mode-liquid-uncompressed.js:902
+#: js/aceeditor/mode-svg-uncompressed.js:1575
+msgid "regex"
+msgstr ""
+
+#: js/editor.js:72 js/editor.js:156 js/editor.js:163
+msgid "Save"
+msgstr ""
+
+#: js/editor.js:74
+msgid "Close"
+msgstr ""
+
+#: js/editor.js:149
+msgid "Saving..."
+msgstr ""
+
+#: js/editor.js:239
+msgid "An error occurred!"
+msgstr ""
+
+#: js/editor.js:266
+msgid "There were unsaved changes, click here to go back"
+msgstr ""
diff --git a/l10n/lt_LT/impress.po b/l10n/lt_LT/impress.po
new file mode 100644
index 0000000000..8aaf1712b0
--- /dev/null
+++ b/l10n/lt_LT/impress.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+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/presentations.php:7
+msgid "Documentation"
+msgstr ""
diff --git a/l10n/lv/files_texteditor.po b/l10n/lv/files_texteditor.po
new file mode 100644
index 0000000000..e0c9f67550
--- /dev/null
+++ b/l10n/lv/files_texteditor.po
@@ -0,0 +1,44 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+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/aceeditor/mode-coldfusion-uncompressed.js:1568
+#: js/aceeditor/mode-liquid-uncompressed.js:902
+#: js/aceeditor/mode-svg-uncompressed.js:1575
+msgid "regex"
+msgstr ""
+
+#: js/editor.js:72 js/editor.js:156 js/editor.js:163
+msgid "Save"
+msgstr ""
+
+#: js/editor.js:74
+msgid "Close"
+msgstr ""
+
+#: js/editor.js:149
+msgid "Saving..."
+msgstr ""
+
+#: js/editor.js:239
+msgid "An error occurred!"
+msgstr ""
+
+#: js/editor.js:266
+msgid "There were unsaved changes, click here to go back"
+msgstr ""
diff --git a/l10n/lv/impress.po b/l10n/lv/impress.po
new file mode 100644
index 0000000000..1685472a3e
--- /dev/null
+++ b/l10n/lv/impress.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+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/presentations.php:7
+msgid "Documentation"
+msgstr ""
diff --git a/l10n/mk/files_texteditor.po b/l10n/mk/files_texteditor.po
new file mode 100644
index 0000000000..0164432b90
--- /dev/null
+++ b/l10n/mk/files_texteditor.po
@@ -0,0 +1,44 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+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/aceeditor/mode-coldfusion-uncompressed.js:1568
+#: js/aceeditor/mode-liquid-uncompressed.js:902
+#: js/aceeditor/mode-svg-uncompressed.js:1575
+msgid "regex"
+msgstr ""
+
+#: js/editor.js:72 js/editor.js:156 js/editor.js:163
+msgid "Save"
+msgstr ""
+
+#: js/editor.js:74
+msgid "Close"
+msgstr ""
+
+#: js/editor.js:149
+msgid "Saving..."
+msgstr ""
+
+#: js/editor.js:239
+msgid "An error occurred!"
+msgstr ""
+
+#: js/editor.js:266
+msgid "There were unsaved changes, click here to go back"
+msgstr ""
diff --git a/l10n/mk/impress.po b/l10n/mk/impress.po
new file mode 100644
index 0000000000..5948fc5ec3
--- /dev/null
+++ b/l10n/mk/impress.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+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/presentations.php:7
+msgid "Documentation"
+msgstr ""
diff --git a/l10n/ms_MY/files_texteditor.po b/l10n/ms_MY/files_texteditor.po
new file mode 100644
index 0000000000..f254925813
--- /dev/null
+++ b/l10n/ms_MY/files_texteditor.po
@@ -0,0 +1,44 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+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/aceeditor/mode-coldfusion-uncompressed.js:1568
+#: js/aceeditor/mode-liquid-uncompressed.js:902
+#: js/aceeditor/mode-svg-uncompressed.js:1575
+msgid "regex"
+msgstr ""
+
+#: js/editor.js:72 js/editor.js:156 js/editor.js:163
+msgid "Save"
+msgstr ""
+
+#: js/editor.js:74
+msgid "Close"
+msgstr ""
+
+#: js/editor.js:149
+msgid "Saving..."
+msgstr ""
+
+#: js/editor.js:239
+msgid "An error occurred!"
+msgstr ""
+
+#: js/editor.js:266
+msgid "There were unsaved changes, click here to go back"
+msgstr ""
diff --git a/l10n/ms_MY/impress.po b/l10n/ms_MY/impress.po
new file mode 100644
index 0000000000..a7a5b4117a
--- /dev/null
+++ b/l10n/ms_MY/impress.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+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/presentations.php:7
+msgid "Documentation"
+msgstr ""
diff --git a/l10n/nb_NO/admin_dependencies_chk.po b/l10n/nb_NO/admin_dependencies_chk.po
index 0a6cff69a0..94de202861 100644
--- a/l10n/nb_NO/admin_dependencies_chk.po
+++ b/l10n/nb_NO/admin_dependencies_chk.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <runesudden@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-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 22:55+0000\n"
+"Last-Translator: runesudden <runesudden@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"
@@ -21,53 +22,53 @@ msgstr ""
 msgid ""
 "The php-json module is needed by the many applications for inter "
 "communications"
-msgstr ""
+msgstr "Modulen php-jason blir benyttet til inter kommunikasjon"
 
 #: settings.php:39
 msgid ""
 "The php-curl modude is needed to fetch the page title when adding a "
 "bookmarks"
-msgstr ""
+msgstr "Modulen php-curl blir brukt til å hente sidetittelen når bokmerke blir lagt til"
 
 #: settings.php:45
 msgid "The php-gd module is needed to create thumbnails of your images"
-msgstr ""
+msgstr "Modulen php-gd blir benyttet til å lage miniatyr av bildene dine"
 
 #: settings.php:51
 msgid "The php-ldap module is needed connect to your ldap server"
-msgstr ""
+msgstr "Modulen php-ldap benyttes for å koble til din ldapserver"
 
 #: settings.php:57
 msgid "The php-zip module is needed download multiple files at once"
-msgstr ""
+msgstr "Modulen php-zup benyttes til å laste ned flere filer på en gang."
 
 #: settings.php:63
 msgid ""
 "The php-mb_multibyte module is needed to manage correctly the encoding."
-msgstr ""
+msgstr "Modulen php-mb_multibyte benyttes til å håndtere korrekt tegnkoding."
 
 #: settings.php:69
 msgid "The php-ctype module is needed validate data."
-msgstr ""
+msgstr "Modulen php-ctype benyttes til å validere data."
 
 #: settings.php:75
 msgid "The php-xml module is needed to share files with webdav."
-msgstr ""
+msgstr "Modulen php-xml benyttes til å dele 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 ""
+msgstr "Direktivet allow_url_fopen i php.ini bør settes til 1 for å kunne hente kunnskapsbasen fra OCS-servere"
 
 #: settings.php:87
 msgid "The php-pdo module is needed to store owncloud data into a database."
-msgstr ""
+msgstr "Modulen php-pdo benyttes til å lagre ownCloud data i en database."
 
 #: templates/settings.php:2
 msgid "Dependencies status"
-msgstr ""
+msgstr "Avhengighetsstatus"
 
 #: templates/settings.php:7
 msgid "Used by :"
-msgstr ""
+msgstr "Benyttes av:"
diff --git a/l10n/nb_NO/bookmarks.po b/l10n/nb_NO/bookmarks.po
index ff93307a65..6ab8bac580 100644
--- a/l10n/nb_NO/bookmarks.po
+++ b/l10n/nb_NO/bookmarks.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # Arvid Nornes <arvid.nornes@gmail.com>, 2012.
+#   <runesudden@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\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"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 22:58+0000\n"
+"Last-Translator: runesudden <runesudden@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"
@@ -58,4 +59,4 @@ msgstr "Du har ingen bokmerker"
 
 #: templates/settings.php:11
 msgid "Bookmarklet <br />"
-msgstr ""
+msgstr "Bokmerke <br />"
diff --git a/l10n/nb_NO/core.po b/l10n/nb_NO/core.po
index 010ea33704..315e85c543 100644
--- a/l10n/nb_NO/core.po
+++ b/l10n/nb_NO/core.po
@@ -7,13 +7,14 @@
 # Christer Eriksson <post@hc3web.com>, 2012.
 # Daniel  <i18n@daniel.priv.no>, 2012.
 #   <itssmail@yahoo.no>, 2012.
+#   <runesudden@gmail.com>, 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-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 22:56+0000\n"
+"Last-Translator: runesudden <runesudden@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"
@@ -35,57 +36,57 @@ 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 ""
+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 "Innstillinger"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "January"
 msgstr "Januar"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "February"
 msgstr "Februar"
 
-#: 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 "Mai"
 
-#: 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 "August"
 
-#: 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 "Desember"
 
@@ -133,7 +134,7 @@ msgstr "Anmodning"
 msgid "Login failed!"
 msgstr "Innloggingen var ikke vellykket."
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:26
 #: templates/login.php:9
 msgid "Username"
 msgstr "Brukernavn"
@@ -194,48 +195,52 @@ msgstr "Rediger kategorier"
 msgid "Add"
 msgstr "Legg til"
 
-#: templates/installation.php:23
+#: templates/installation.php:24
 msgid "Create an <strong>admin account</strong>"
 msgstr "opprett en <strong>administrator-konto</strong>"
 
-#: templates/installation.php:29 templates/login.php:13
+#: templates/installation.php:30 templates/login.php:13
 msgid "Password"
 msgstr "Passord"
 
-#: templates/installation.php:35
+#: templates/installation.php:36
 msgid "Advanced"
 msgstr "Avansert"
 
-#: templates/installation.php:37
+#: templates/installation.php:38
 msgid "Data folder"
 msgstr "Datamappe"
 
-#: templates/installation.php:44
+#: templates/installation.php:45
 msgid "Configure the database"
 msgstr "Konfigurer databasen"
 
-#: templates/installation.php:49 templates/installation.php:60
-#: templates/installation.php:70
+#: templates/installation.php:50 templates/installation.php:61
+#: templates/installation.php:71 templates/installation.php:81
 msgid "will be used"
 msgstr "vil bli brukt"
 
-#: templates/installation.php:82
+#: templates/installation.php:93
 msgid "Database user"
 msgstr "Databasebruker"
 
-#: templates/installation.php:86
+#: templates/installation.php:97
 msgid "Database password"
 msgstr "Databasepassord"
 
-#: templates/installation.php:90
+#: templates/installation.php:101
 msgid "Database name"
 msgstr "Databasenavn"
 
-#: templates/installation.php:96
+#: templates/installation.php:109
+msgid "Database tablespace"
+msgstr "Database tabellområde"
+
+#: templates/installation.php:115
 msgid "Database host"
 msgstr "Databasevert"
 
-#: templates/installation.php:101
+#: templates/installation.php:120
 msgid "Finish setup"
 msgstr "Fullfør oppsetting"
 
diff --git a/l10n/nb_NO/files.po b/l10n/nb_NO/files.po
index b242837904..83cb1a6283 100644
--- a/l10n/nb_NO/files.po
+++ b/l10n/nb_NO/files.po
@@ -7,13 +7,14 @@
 # Arvid Nornes <arvid.nornes@gmail.com>, 2012.
 # Christer Eriksson <post@hc3web.com>, 2012.
 # Daniel  <i18n@daniel.priv.no>, 2012.
+#   <runesudden@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-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:02+0000\n"
+"Last-Translator: runesudden <runesudden@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"
@@ -55,37 +56,37 @@ msgstr "Klarte ikke å skrive til disk"
 msgid "Files"
 msgstr "Filer"
 
-#: js/fileactions.js:107 templates/index.php:56
+#: js/fileactions.js:111 templates/index.php:56
 msgid "Delete"
 msgstr "Slett"
 
 #: js/filelist.js:141
 msgid "already exists"
-msgstr ""
+msgstr "eksisterer allerede"
 
 #: js/filelist.js:141
 msgid "replace"
-msgstr ""
+msgstr "erstatt"
 
 #: js/filelist.js:141
 msgid "cancel"
-msgstr ""
+msgstr "avbryt"
 
 #: 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:246
 msgid "undo"
-msgstr ""
+msgstr "angre"
 
 #: js/filelist.js:246
 msgid "deleted"
-msgstr ""
+msgstr "slettet"
 
 #: js/files.js:171
 msgid "generating ZIP-file, it may take some time."
@@ -93,11 +94,11 @@ msgstr "opprettet ZIP-fil, dette kan ta litt tid"
 
 #: js/files.js:200
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr ""
+msgstr "Kan ikke laste opp filen din siden det er en mappe eller den har 0 bytes"
 
 #: js/files.js:200
 msgid "Upload Error"
-msgstr ""
+msgstr "Opplasting feilet"
 
 #: js/files.js:228 js/files.js:319 js/files.js:348
 msgid "Pending"
@@ -105,11 +106,11 @@ msgstr "Ventende"
 
 #: js/files.js:333
 msgid "Upload cancelled."
-msgstr ""
+msgstr "Opplasting avbrutt."
 
 #: js/files.js:457
 msgid "Invalid name, '/' is not allowed."
-msgstr ""
+msgstr "Ugyldig navn, '/' er ikke tillatt. "
 
 #: js/files.js:703 templates/index.php:55
 msgid "Size"
diff --git a/l10n/nb_NO/files_texteditor.po b/l10n/nb_NO/files_texteditor.po
new file mode 100644
index 0000000000..0086fe9d64
--- /dev/null
+++ b/l10n/nb_NO/files_texteditor.po
@@ -0,0 +1,44 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+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/aceeditor/mode-coldfusion-uncompressed.js:1568
+#: js/aceeditor/mode-liquid-uncompressed.js:902
+#: js/aceeditor/mode-svg-uncompressed.js:1575
+msgid "regex"
+msgstr ""
+
+#: js/editor.js:72 js/editor.js:156 js/editor.js:163
+msgid "Save"
+msgstr ""
+
+#: js/editor.js:74
+msgid "Close"
+msgstr ""
+
+#: js/editor.js:149
+msgid "Saving..."
+msgstr ""
+
+#: js/editor.js:239
+msgid "An error occurred!"
+msgstr ""
+
+#: js/editor.js:266
+msgid "There were unsaved changes, click here to go back"
+msgstr ""
diff --git a/l10n/nb_NO/gallery.po b/l10n/nb_NO/gallery.po
index 4ebdedf453..cf8525c310 100644
--- a/l10n/nb_NO/gallery.po
+++ b/l10n/nb_NO/gallery.po
@@ -6,92 +6,37 @@
 #   <ajarmund@gmail.com>, 2012.
 # Christer Eriksson <post@hc3web.com>, 2012.
 # Daniel  <i18n@daniel.priv.no>, 2012.
+#   <runesudden@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: Norwegian Bokmål (Norway) (http://www.transifex.net/projects/p/owncloud/language/nb_NO/)\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:01+0000\n"
+"Last-Translator: runesudden <runesudden@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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: nb_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: appinfo/app.php:37
+#: appinfo/app.php:42
 msgid "Pictures"
 msgstr "Bilder"
 
-#: js/album_cover.js:44
+#: js/pictures.js:12
 msgid "Share gallery"
-msgstr ""
+msgstr "Del galleri"
 
-#: js/album_cover.js:64 js/album_cover.js:100 js/album_cover.js:133
+#: js/pictures.js:32
 msgid "Error: "
-msgstr ""
+msgstr "Feil:"
 
-#: js/album_cover.js:64 js/album_cover.js:100
+#: js/pictures.js:32
 msgid "Internal error"
-msgstr ""
+msgstr "Intern feil"
 
-#: 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"
-
-#: templates/index.php:17
-msgid "Stop"
-msgstr "Stopp"
-
-#: templates/index.php:18
-msgid "Share"
-msgstr "Del"
-
-#: templates/view_album.php:19
-msgid "Back"
-msgstr "Tilbake"
-
-#: templates/view_album.php:36
-msgid "Remove confirmation"
-msgstr "Fjern bekreftelse"
-
-#: templates/view_album.php:37
-msgid "Do you want to remove album"
-msgstr "Ønsker du å slette albumet?"
-
-#: templates/view_album.php:40
-msgid "Change album name"
-msgstr "Endre navn på album"
-
-#: templates/view_album.php:43
-msgid "New album name"
-msgstr "Nytt navn på album"
+#: templates/index.php:27
+msgid "Slideshow"
+msgstr "Lysbildefremvisning"
diff --git a/l10n/nb_NO/impress.po b/l10n/nb_NO/impress.po
new file mode 100644
index 0000000000..8222542fcc
--- /dev/null
+++ b/l10n/nb_NO/impress.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+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/presentations.php:7
+msgid "Documentation"
+msgstr ""
diff --git a/l10n/nb_NO/lib.po b/l10n/nb_NO/lib.po
index 0d9ea115ad..52b02f78ee 100644
--- a/l10n/nb_NO/lib.po
+++ b/l10n/nb_NO/lib.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # Arvid Nornes <arvid.nornes@gmail.com>, 2012.
+#   <runesudden@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\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"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 22:57+0000\n"
+"Last-Translator: runesudden <runesudden@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"
@@ -68,7 +69,7 @@ msgstr "Autentiseringsfeil"
 
 #: json.php:51
 msgid "Token expired. Please reload page."
-msgstr ""
+msgstr "Symbol utløpt. Vennligst last inn siden på nytt."
 
 #: template.php:86
 msgid "seconds ago"
diff --git a/l10n/nb_NO/settings.po b/l10n/nb_NO/settings.po
index 551c484ea5..a1c8400443 100644
--- a/l10n/nb_NO/settings.po
+++ b/l10n/nb_NO/settings.po
@@ -8,13 +8,14 @@
 # Christer Eriksson <post@hc3web.com>, 2012.
 # Daniel  <i18n@daniel.priv.no>, 2012.
 #   <itssmail@yahoo.no>, 2012.
+#   <runesudden@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-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:00+0000\n"
+"Last-Translator: runesudden <runesudden@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"
@@ -24,7 +25,7 @@ msgstr ""
 
 #: ajax/apps/ocs.php:23
 msgid "Unable to load list from App Store"
-msgstr ""
+msgstr "Lasting av liste fra App Store feilet."
 
 #: ajax/lostpassword.php:14
 msgid "Email saved"
@@ -44,7 +45,7 @@ msgstr "Ugyldig forespørsel"
 
 #: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
 msgid "Authentication error"
-msgstr ""
+msgstr "Autentikasjonsfeil"
 
 #: ajax/setlanguage.php:18
 msgid "Language changed"
@@ -52,7 +53,7 @@ msgstr "Språk endret"
 
 #: js/apps.js:18
 msgid "Error"
-msgstr ""
+msgstr "Feil"
 
 #: js/apps.js:39 js/apps.js:73
 msgid "Disable"
@@ -72,23 +73,23 @@ msgstr "__language_name__"
 
 #: templates/admin.php:14
 msgid "Security Warning"
-msgstr ""
+msgstr "Sikkerhetsadvarsel"
 
 #: 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 oppgave med hver side som blir lastet"
 
 #: templates/admin.php:33
 msgid "cron.php is registered at a webcron service"
-msgstr ""
+msgstr "cron.php er registrert som en webcron tjeneste"
 
 #: templates/admin.php:35
 msgid "use systems cron service"
-msgstr ""
+msgstr "benytt systemets cron tjeneste"
 
 #: templates/admin.php:39
 msgid "Log"
@@ -232,7 +233,7 @@ msgstr "Annet"
 
 #: templates/users.php:80 templates/users.php:112
 msgid "Group Admin"
-msgstr ""
+msgstr "Gruppeadministrator"
 
 #: templates/users.php:82
 msgid "Quota"
diff --git a/l10n/nl/files_texteditor.po b/l10n/nl/files_texteditor.po
new file mode 100644
index 0000000000..c73a062cdb
--- /dev/null
+++ b/l10n/nl/files_texteditor.po
@@ -0,0 +1,44 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+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/aceeditor/mode-coldfusion-uncompressed.js:1568
+#: js/aceeditor/mode-liquid-uncompressed.js:902
+#: js/aceeditor/mode-svg-uncompressed.js:1575
+msgid "regex"
+msgstr ""
+
+#: js/editor.js:72 js/editor.js:156 js/editor.js:163
+msgid "Save"
+msgstr ""
+
+#: js/editor.js:74
+msgid "Close"
+msgstr ""
+
+#: js/editor.js:149
+msgid "Saving..."
+msgstr ""
+
+#: js/editor.js:239
+msgid "An error occurred!"
+msgstr ""
+
+#: js/editor.js:266
+msgid "There were unsaved changes, click here to go back"
+msgstr ""
diff --git a/l10n/nl/impress.po b/l10n/nl/impress.po
new file mode 100644
index 0000000000..2232e10598
--- /dev/null
+++ b/l10n/nl/impress.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+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/presentations.php:7
+msgid "Documentation"
+msgstr ""
diff --git a/l10n/nn_NO/files_texteditor.po b/l10n/nn_NO/files_texteditor.po
new file mode 100644
index 0000000000..1b89b35f6a
--- /dev/null
+++ b/l10n/nn_NO/files_texteditor.po
@@ -0,0 +1,44 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+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/aceeditor/mode-coldfusion-uncompressed.js:1568
+#: js/aceeditor/mode-liquid-uncompressed.js:902
+#: js/aceeditor/mode-svg-uncompressed.js:1575
+msgid "regex"
+msgstr ""
+
+#: js/editor.js:72 js/editor.js:156 js/editor.js:163
+msgid "Save"
+msgstr ""
+
+#: js/editor.js:74
+msgid "Close"
+msgstr ""
+
+#: js/editor.js:149
+msgid "Saving..."
+msgstr ""
+
+#: js/editor.js:239
+msgid "An error occurred!"
+msgstr ""
+
+#: js/editor.js:266
+msgid "There were unsaved changes, click here to go back"
+msgstr ""
diff --git a/l10n/nn_NO/impress.po b/l10n/nn_NO/impress.po
new file mode 100644
index 0000000000..e14be1cd5b
--- /dev/null
+++ b/l10n/nn_NO/impress.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+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/presentations.php:7
+msgid "Documentation"
+msgstr ""
diff --git a/l10n/pl/files_texteditor.po b/l10n/pl/files_texteditor.po
new file mode 100644
index 0000000000..039282380a
--- /dev/null
+++ b/l10n/pl/files_texteditor.po
@@ -0,0 +1,44 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+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/aceeditor/mode-coldfusion-uncompressed.js:1568
+#: js/aceeditor/mode-liquid-uncompressed.js:902
+#: js/aceeditor/mode-svg-uncompressed.js:1575
+msgid "regex"
+msgstr ""
+
+#: js/editor.js:72 js/editor.js:156 js/editor.js:163
+msgid "Save"
+msgstr ""
+
+#: js/editor.js:74
+msgid "Close"
+msgstr ""
+
+#: js/editor.js:149
+msgid "Saving..."
+msgstr ""
+
+#: js/editor.js:239
+msgid "An error occurred!"
+msgstr ""
+
+#: js/editor.js:266
+msgid "There were unsaved changes, click here to go back"
+msgstr ""
diff --git a/l10n/pl/impress.po b/l10n/pl/impress.po
new file mode 100644
index 0000000000..1321f95ef5
--- /dev/null
+++ b/l10n/pl/impress.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+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/presentations.php:7
+msgid "Documentation"
+msgstr ""
diff --git a/l10n/pt_BR/files_texteditor.po b/l10n/pt_BR/files_texteditor.po
new file mode 100644
index 0000000000..f14b622e58
--- /dev/null
+++ b/l10n/pt_BR/files_texteditor.po
@@ -0,0 +1,44 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+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/aceeditor/mode-coldfusion-uncompressed.js:1568
+#: js/aceeditor/mode-liquid-uncompressed.js:902
+#: js/aceeditor/mode-svg-uncompressed.js:1575
+msgid "regex"
+msgstr ""
+
+#: js/editor.js:72 js/editor.js:156 js/editor.js:163
+msgid "Save"
+msgstr ""
+
+#: js/editor.js:74
+msgid "Close"
+msgstr ""
+
+#: js/editor.js:149
+msgid "Saving..."
+msgstr ""
+
+#: js/editor.js:239
+msgid "An error occurred!"
+msgstr ""
+
+#: js/editor.js:266
+msgid "There were unsaved changes, click here to go back"
+msgstr ""
diff --git a/l10n/pt_BR/impress.po b/l10n/pt_BR/impress.po
new file mode 100644
index 0000000000..d411662bd5
--- /dev/null
+++ b/l10n/pt_BR/impress.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+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/presentations.php:7
+msgid "Documentation"
+msgstr ""
diff --git a/l10n/pt_PT/files_texteditor.po b/l10n/pt_PT/files_texteditor.po
new file mode 100644
index 0000000000..1c3a291131
--- /dev/null
+++ b/l10n/pt_PT/files_texteditor.po
@@ -0,0 +1,44 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+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/aceeditor/mode-coldfusion-uncompressed.js:1568
+#: js/aceeditor/mode-liquid-uncompressed.js:902
+#: js/aceeditor/mode-svg-uncompressed.js:1575
+msgid "regex"
+msgstr ""
+
+#: js/editor.js:72 js/editor.js:156 js/editor.js:163
+msgid "Save"
+msgstr ""
+
+#: js/editor.js:74
+msgid "Close"
+msgstr ""
+
+#: js/editor.js:149
+msgid "Saving..."
+msgstr ""
+
+#: js/editor.js:239
+msgid "An error occurred!"
+msgstr ""
+
+#: js/editor.js:266
+msgid "There were unsaved changes, click here to go back"
+msgstr ""
diff --git a/l10n/pt_PT/impress.po b/l10n/pt_PT/impress.po
new file mode 100644
index 0000000000..a3d95463c9
--- /dev/null
+++ b/l10n/pt_PT/impress.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+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/presentations.php:7
+msgid "Documentation"
+msgstr ""
diff --git a/l10n/ro/files_texteditor.po b/l10n/ro/files_texteditor.po
new file mode 100644
index 0000000000..c74fb485a9
--- /dev/null
+++ b/l10n/ro/files_texteditor.po
@@ -0,0 +1,44 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+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/aceeditor/mode-coldfusion-uncompressed.js:1568
+#: js/aceeditor/mode-liquid-uncompressed.js:902
+#: js/aceeditor/mode-svg-uncompressed.js:1575
+msgid "regex"
+msgstr ""
+
+#: js/editor.js:72 js/editor.js:156 js/editor.js:163
+msgid "Save"
+msgstr ""
+
+#: js/editor.js:74
+msgid "Close"
+msgstr ""
+
+#: js/editor.js:149
+msgid "Saving..."
+msgstr ""
+
+#: js/editor.js:239
+msgid "An error occurred!"
+msgstr ""
+
+#: js/editor.js:266
+msgid "There were unsaved changes, click here to go back"
+msgstr ""
diff --git a/l10n/ro/impress.po b/l10n/ro/impress.po
new file mode 100644
index 0000000000..11bb267b33
--- /dev/null
+++ b/l10n/ro/impress.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+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/presentations.php:7
+msgid "Documentation"
+msgstr ""
diff --git a/l10n/ru/files_texteditor.po b/l10n/ru/files_texteditor.po
new file mode 100644
index 0000000000..46b235b469
--- /dev/null
+++ b/l10n/ru/files_texteditor.po
@@ -0,0 +1,44 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+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/aceeditor/mode-coldfusion-uncompressed.js:1568
+#: js/aceeditor/mode-liquid-uncompressed.js:902
+#: js/aceeditor/mode-svg-uncompressed.js:1575
+msgid "regex"
+msgstr ""
+
+#: js/editor.js:72 js/editor.js:156 js/editor.js:163
+msgid "Save"
+msgstr ""
+
+#: js/editor.js:74
+msgid "Close"
+msgstr ""
+
+#: js/editor.js:149
+msgid "Saving..."
+msgstr ""
+
+#: js/editor.js:239
+msgid "An error occurred!"
+msgstr ""
+
+#: js/editor.js:266
+msgid "There were unsaved changes, click here to go back"
+msgstr ""
diff --git a/l10n/ru/impress.po b/l10n/ru/impress.po
new file mode 100644
index 0000000000..4154c7b948
--- /dev/null
+++ b/l10n/ru/impress.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+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/presentations.php:7
+msgid "Documentation"
+msgstr ""
diff --git a/l10n/sk_SK/files_texteditor.po b/l10n/sk_SK/files_texteditor.po
new file mode 100644
index 0000000000..af94e6a125
--- /dev/null
+++ b/l10n/sk_SK/files_texteditor.po
@@ -0,0 +1,44 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+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/aceeditor/mode-coldfusion-uncompressed.js:1568
+#: js/aceeditor/mode-liquid-uncompressed.js:902
+#: js/aceeditor/mode-svg-uncompressed.js:1575
+msgid "regex"
+msgstr ""
+
+#: js/editor.js:72 js/editor.js:156 js/editor.js:163
+msgid "Save"
+msgstr ""
+
+#: js/editor.js:74
+msgid "Close"
+msgstr ""
+
+#: js/editor.js:149
+msgid "Saving..."
+msgstr ""
+
+#: js/editor.js:239
+msgid "An error occurred!"
+msgstr ""
+
+#: js/editor.js:266
+msgid "There were unsaved changes, click here to go back"
+msgstr ""
diff --git a/l10n/sk_SK/impress.po b/l10n/sk_SK/impress.po
new file mode 100644
index 0000000000..940f3f6325
--- /dev/null
+++ b/l10n/sk_SK/impress.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+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/presentations.php:7
+msgid "Documentation"
+msgstr ""
diff --git a/l10n/sl/files_texteditor.po b/l10n/sl/files_texteditor.po
new file mode 100644
index 0000000000..4358bfa979
--- /dev/null
+++ b/l10n/sl/files_texteditor.po
@@ -0,0 +1,44 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+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/aceeditor/mode-coldfusion-uncompressed.js:1568
+#: js/aceeditor/mode-liquid-uncompressed.js:902
+#: js/aceeditor/mode-svg-uncompressed.js:1575
+msgid "regex"
+msgstr ""
+
+#: js/editor.js:72 js/editor.js:156 js/editor.js:163
+msgid "Save"
+msgstr ""
+
+#: js/editor.js:74
+msgid "Close"
+msgstr ""
+
+#: js/editor.js:149
+msgid "Saving..."
+msgstr ""
+
+#: js/editor.js:239
+msgid "An error occurred!"
+msgstr ""
+
+#: js/editor.js:266
+msgid "There were unsaved changes, click here to go back"
+msgstr ""
diff --git a/l10n/sl/impress.po b/l10n/sl/impress.po
new file mode 100644
index 0000000000..5d45e6c4fb
--- /dev/null
+++ b/l10n/sl/impress.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+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/presentations.php:7
+msgid "Documentation"
+msgstr ""
diff --git a/l10n/so/files_texteditor.po b/l10n/so/files_texteditor.po
new file mode 100644
index 0000000000..aa6aad47d7
--- /dev/null
+++ b/l10n/so/files_texteditor.po
@@ -0,0 +1,44 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+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/aceeditor/mode-coldfusion-uncompressed.js:1568
+#: js/aceeditor/mode-liquid-uncompressed.js:902
+#: js/aceeditor/mode-svg-uncompressed.js:1575
+msgid "regex"
+msgstr ""
+
+#: js/editor.js:72 js/editor.js:156 js/editor.js:163
+msgid "Save"
+msgstr ""
+
+#: js/editor.js:74
+msgid "Close"
+msgstr ""
+
+#: js/editor.js:149
+msgid "Saving..."
+msgstr ""
+
+#: js/editor.js:239
+msgid "An error occurred!"
+msgstr ""
+
+#: js/editor.js:266
+msgid "There were unsaved changes, click here to go back"
+msgstr ""
diff --git a/l10n/so/impress.po b/l10n/so/impress.po
new file mode 100644
index 0000000000..47c6506dae
--- /dev/null
+++ b/l10n/so/impress.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+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/presentations.php:7
+msgid "Documentation"
+msgstr ""
diff --git a/l10n/sr/files_texteditor.po b/l10n/sr/files_texteditor.po
new file mode 100644
index 0000000000..d7e1815f9a
--- /dev/null
+++ b/l10n/sr/files_texteditor.po
@@ -0,0 +1,44 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+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/aceeditor/mode-coldfusion-uncompressed.js:1568
+#: js/aceeditor/mode-liquid-uncompressed.js:902
+#: js/aceeditor/mode-svg-uncompressed.js:1575
+msgid "regex"
+msgstr ""
+
+#: js/editor.js:72 js/editor.js:156 js/editor.js:163
+msgid "Save"
+msgstr ""
+
+#: js/editor.js:74
+msgid "Close"
+msgstr ""
+
+#: js/editor.js:149
+msgid "Saving..."
+msgstr ""
+
+#: js/editor.js:239
+msgid "An error occurred!"
+msgstr ""
+
+#: js/editor.js:266
+msgid "There were unsaved changes, click here to go back"
+msgstr ""
diff --git a/l10n/sr/impress.po b/l10n/sr/impress.po
new file mode 100644
index 0000000000..230778dd99
--- /dev/null
+++ b/l10n/sr/impress.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+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/presentations.php:7
+msgid "Documentation"
+msgstr ""
diff --git a/l10n/sr@latin/files_texteditor.po b/l10n/sr@latin/files_texteditor.po
new file mode 100644
index 0000000000..a3902531ee
--- /dev/null
+++ b/l10n/sr@latin/files_texteditor.po
@@ -0,0 +1,44 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+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/aceeditor/mode-coldfusion-uncompressed.js:1568
+#: js/aceeditor/mode-liquid-uncompressed.js:902
+#: js/aceeditor/mode-svg-uncompressed.js:1575
+msgid "regex"
+msgstr ""
+
+#: js/editor.js:72 js/editor.js:156 js/editor.js:163
+msgid "Save"
+msgstr ""
+
+#: js/editor.js:74
+msgid "Close"
+msgstr ""
+
+#: js/editor.js:149
+msgid "Saving..."
+msgstr ""
+
+#: js/editor.js:239
+msgid "An error occurred!"
+msgstr ""
+
+#: js/editor.js:266
+msgid "There were unsaved changes, click here to go back"
+msgstr ""
diff --git a/l10n/sr@latin/impress.po b/l10n/sr@latin/impress.po
new file mode 100644
index 0000000000..7d751ecd40
--- /dev/null
+++ b/l10n/sr@latin/impress.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+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/presentations.php:7
+msgid "Documentation"
+msgstr ""
diff --git a/l10n/sv/files_texteditor.po b/l10n/sv/files_texteditor.po
new file mode 100644
index 0000000000..e29a0d220c
--- /dev/null
+++ b/l10n/sv/files_texteditor.po
@@ -0,0 +1,44 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+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"
+
+#: js/aceeditor/mode-coldfusion-uncompressed.js:1568
+#: js/aceeditor/mode-liquid-uncompressed.js:902
+#: js/aceeditor/mode-svg-uncompressed.js:1575
+msgid "regex"
+msgstr ""
+
+#: js/editor.js:72 js/editor.js:156 js/editor.js:163
+msgid "Save"
+msgstr ""
+
+#: js/editor.js:74
+msgid "Close"
+msgstr ""
+
+#: js/editor.js:149
+msgid "Saving..."
+msgstr ""
+
+#: js/editor.js:239
+msgid "An error occurred!"
+msgstr ""
+
+#: js/editor.js:266
+msgid "There were unsaved changes, click here to go back"
+msgstr ""
diff --git a/l10n/sv/impress.po b/l10n/sv/impress.po
new file mode 100644
index 0000000000..93637c418a
--- /dev/null
+++ b/l10n/sv/impress.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+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"
+
+#: templates/presentations.php:7
+msgid "Documentation"
+msgstr ""
diff --git a/l10n/templates/admin_dependencies_chk.pot b/l10n/templates/admin_dependencies_chk.pot
index b528088a64..9fb39d6a9a 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-26 00:45+0200\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
 "PO-Revision-Date: YEAR-MO-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 c041bdec77..f7b84f90b0 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-26 00:45+0200\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
 "PO-Revision-Date: YEAR-MO-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 5937171bf9..024d1b694d 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-26 00:45+0200\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
 "PO-Revision-Date: YEAR-MO-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 b2ae946f0e..94b30636ca 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-26 00:45+0200\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
 "PO-Revision-Date: YEAR-MO-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 de724764bc..7e00f7f414 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-26 00:45+0200\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
 "PO-Revision-Date: YEAR-MO-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 cb68993bdd..16dca1458b 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-26 00:45+0200\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
 "PO-Revision-Date: YEAR-MO-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 a0c9c79e8f..c90bf2481f 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-26 00:45+0200\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
 "PO-Revision-Date: YEAR-MO-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 f66972bcf7..db83856d91 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-26 00:45+0200\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
 "PO-Revision-Date: YEAR-MO-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 589f74731f..f6147ec37d 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-26 00:45+0200\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
 "PO-Revision-Date: YEAR-MO-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 3432495389..07dd1dbc07 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-26 00:45+0200\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
 "PO-Revision-Date: YEAR-MO-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_texteditor.pot b/l10n/templates/files_texteditor.pot
index ff299c2ff4..c2ea5de8b1 100644
--- a/l10n/templates/files_texteditor.pot
+++ b/l10n/templates/files_texteditor.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-26 00:45+0200\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
 "PO-Revision-Date: YEAR-MO-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 748b5f887c..d54760c941 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-26 00:45+0200\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
 "PO-Revision-Date: YEAR-MO-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 b37e0a9e43..c0bb60f921 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-26 00:45+0200\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/impress.pot b/l10n/templates/impress.pot
index e3b1afb453..cfe2f9dae7 100644
--- a/l10n/templates/impress.pot
+++ b/l10n/templates/impress.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-26 00:45+0200\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
 "PO-Revision-Date: YEAR-MO-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 9c787bf6f4..6d4a022d6f 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-26 00:45+0200\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
 "PO-Revision-Date: YEAR-MO-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 694cb57205..476d2d91c5 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-26 00:45+0200\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
 "PO-Revision-Date: YEAR-MO-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 41073700ec..7844ae4fea 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-26 00:45+0200\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
 "PO-Revision-Date: YEAR-MO-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 a50f3b5a23..c39abd9c05 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-26 00:45+0200\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
 "PO-Revision-Date: YEAR-MO-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 59af33b7b0..77002694b3 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-26 00:45+0200\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
 "PO-Revision-Date: YEAR-MO-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 7cd45fdf1a..2f6547b44f 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-26 00:45+0200\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
 "PO-Revision-Date: YEAR-MO-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 7c0b25a871..31a513880e 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-26 00:45+0200\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
 "PO-Revision-Date: YEAR-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_texteditor.po b/l10n/th_TH/files_texteditor.po
new file mode 100644
index 0000000000..00accf8089
--- /dev/null
+++ b/l10n/th_TH/files_texteditor.po
@@ -0,0 +1,44 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+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/aceeditor/mode-coldfusion-uncompressed.js:1568
+#: js/aceeditor/mode-liquid-uncompressed.js:902
+#: js/aceeditor/mode-svg-uncompressed.js:1575
+msgid "regex"
+msgstr ""
+
+#: js/editor.js:72 js/editor.js:156 js/editor.js:163
+msgid "Save"
+msgstr ""
+
+#: js/editor.js:74
+msgid "Close"
+msgstr ""
+
+#: js/editor.js:149
+msgid "Saving..."
+msgstr ""
+
+#: js/editor.js:239
+msgid "An error occurred!"
+msgstr ""
+
+#: js/editor.js:266
+msgid "There were unsaved changes, click here to go back"
+msgstr ""
diff --git a/l10n/th_TH/impress.po b/l10n/th_TH/impress.po
new file mode 100644
index 0000000000..e360e941e4
--- /dev/null
+++ b/l10n/th_TH/impress.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+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/presentations.php:7
+msgid "Documentation"
+msgstr ""
diff --git a/l10n/tr/files_texteditor.po b/l10n/tr/files_texteditor.po
new file mode 100644
index 0000000000..d1aa8ee65a
--- /dev/null
+++ b/l10n/tr/files_texteditor.po
@@ -0,0 +1,44 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+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/aceeditor/mode-coldfusion-uncompressed.js:1568
+#: js/aceeditor/mode-liquid-uncompressed.js:902
+#: js/aceeditor/mode-svg-uncompressed.js:1575
+msgid "regex"
+msgstr ""
+
+#: js/editor.js:72 js/editor.js:156 js/editor.js:163
+msgid "Save"
+msgstr ""
+
+#: js/editor.js:74
+msgid "Close"
+msgstr ""
+
+#: js/editor.js:149
+msgid "Saving..."
+msgstr ""
+
+#: js/editor.js:239
+msgid "An error occurred!"
+msgstr ""
+
+#: js/editor.js:266
+msgid "There were unsaved changes, click here to go back"
+msgstr ""
diff --git a/l10n/tr/impress.po b/l10n/tr/impress.po
new file mode 100644
index 0000000000..ffbe599886
--- /dev/null
+++ b/l10n/tr/impress.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+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/presentations.php:7
+msgid "Documentation"
+msgstr ""
diff --git a/l10n/uk/files_texteditor.po b/l10n/uk/files_texteditor.po
new file mode 100644
index 0000000000..2c4cf49ae4
--- /dev/null
+++ b/l10n/uk/files_texteditor.po
@@ -0,0 +1,44 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+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/aceeditor/mode-coldfusion-uncompressed.js:1568
+#: js/aceeditor/mode-liquid-uncompressed.js:902
+#: js/aceeditor/mode-svg-uncompressed.js:1575
+msgid "regex"
+msgstr ""
+
+#: js/editor.js:72 js/editor.js:156 js/editor.js:163
+msgid "Save"
+msgstr ""
+
+#: js/editor.js:74
+msgid "Close"
+msgstr ""
+
+#: js/editor.js:149
+msgid "Saving..."
+msgstr ""
+
+#: js/editor.js:239
+msgid "An error occurred!"
+msgstr ""
+
+#: js/editor.js:266
+msgid "There were unsaved changes, click here to go back"
+msgstr ""
diff --git a/l10n/uk/impress.po b/l10n/uk/impress.po
new file mode 100644
index 0000000000..1307d932c3
--- /dev/null
+++ b/l10n/uk/impress.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+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/presentations.php:7
+msgid "Documentation"
+msgstr ""
diff --git a/l10n/vi/files_texteditor.po b/l10n/vi/files_texteditor.po
new file mode 100644
index 0000000000..40a7005281
--- /dev/null
+++ b/l10n/vi/files_texteditor.po
@@ -0,0 +1,44 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+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/aceeditor/mode-coldfusion-uncompressed.js:1568
+#: js/aceeditor/mode-liquid-uncompressed.js:902
+#: js/aceeditor/mode-svg-uncompressed.js:1575
+msgid "regex"
+msgstr ""
+
+#: js/editor.js:72 js/editor.js:156 js/editor.js:163
+msgid "Save"
+msgstr ""
+
+#: js/editor.js:74
+msgid "Close"
+msgstr ""
+
+#: js/editor.js:149
+msgid "Saving..."
+msgstr ""
+
+#: js/editor.js:239
+msgid "An error occurred!"
+msgstr ""
+
+#: js/editor.js:266
+msgid "There were unsaved changes, click here to go back"
+msgstr ""
diff --git a/l10n/vi/impress.po b/l10n/vi/impress.po
new file mode 100644
index 0000000000..af17dc75c4
--- /dev/null
+++ b/l10n/vi/impress.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+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/presentations.php:7
+msgid "Documentation"
+msgstr ""
diff --git a/l10n/zh_CN.GB2312/files_texteditor.po b/l10n/zh_CN.GB2312/files_texteditor.po
new file mode 100644
index 0000000000..2e1dfee3c8
--- /dev/null
+++ b/l10n/zh_CN.GB2312/files_texteditor.po
@@ -0,0 +1,44 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+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/aceeditor/mode-coldfusion-uncompressed.js:1568
+#: js/aceeditor/mode-liquid-uncompressed.js:902
+#: js/aceeditor/mode-svg-uncompressed.js:1575
+msgid "regex"
+msgstr ""
+
+#: js/editor.js:72 js/editor.js:156 js/editor.js:163
+msgid "Save"
+msgstr ""
+
+#: js/editor.js:74
+msgid "Close"
+msgstr ""
+
+#: js/editor.js:149
+msgid "Saving..."
+msgstr ""
+
+#: js/editor.js:239
+msgid "An error occurred!"
+msgstr ""
+
+#: js/editor.js:266
+msgid "There were unsaved changes, click here to go back"
+msgstr ""
diff --git a/l10n/zh_CN.GB2312/impress.po b/l10n/zh_CN.GB2312/impress.po
new file mode 100644
index 0000000000..64aa634938
--- /dev/null
+++ b/l10n/zh_CN.GB2312/impress.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+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/presentations.php:7
+msgid "Documentation"
+msgstr ""
diff --git a/l10n/zh_CN/files_texteditor.po b/l10n/zh_CN/files_texteditor.po
new file mode 100644
index 0000000000..dc16629c11
--- /dev/null
+++ b/l10n/zh_CN/files_texteditor.po
@@ -0,0 +1,44 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+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/aceeditor/mode-coldfusion-uncompressed.js:1568
+#: js/aceeditor/mode-liquid-uncompressed.js:902
+#: js/aceeditor/mode-svg-uncompressed.js:1575
+msgid "regex"
+msgstr ""
+
+#: js/editor.js:72 js/editor.js:156 js/editor.js:163
+msgid "Save"
+msgstr ""
+
+#: js/editor.js:74
+msgid "Close"
+msgstr ""
+
+#: js/editor.js:149
+msgid "Saving..."
+msgstr ""
+
+#: js/editor.js:239
+msgid "An error occurred!"
+msgstr ""
+
+#: js/editor.js:266
+msgid "There were unsaved changes, click here to go back"
+msgstr ""
diff --git a/l10n/zh_CN/impress.po b/l10n/zh_CN/impress.po
new file mode 100644
index 0000000000..47fab23c25
--- /dev/null
+++ b/l10n/zh_CN/impress.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+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/presentations.php:7
+msgid "Documentation"
+msgstr ""
diff --git a/l10n/zh_TW/files_texteditor.po b/l10n/zh_TW/files_texteditor.po
new file mode 100644
index 0000000000..e57c25f279
--- /dev/null
+++ b/l10n/zh_TW/files_texteditor.po
@@ -0,0 +1,44 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+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/aceeditor/mode-coldfusion-uncompressed.js:1568
+#: js/aceeditor/mode-liquid-uncompressed.js:902
+#: js/aceeditor/mode-svg-uncompressed.js:1575
+msgid "regex"
+msgstr ""
+
+#: js/editor.js:72 js/editor.js:156 js/editor.js:163
+msgid "Save"
+msgstr ""
+
+#: js/editor.js:74
+msgid "Close"
+msgstr ""
+
+#: js/editor.js:149
+msgid "Saving..."
+msgstr ""
+
+#: js/editor.js:239
+msgid "An error occurred!"
+msgstr ""
+
+#: js/editor.js:266
+msgid "There were unsaved changes, click here to go back"
+msgstr ""
diff --git a/l10n/zh_TW/impress.po b/l10n/zh_TW/impress.po
new file mode 100644
index 0000000000..c7925b09e3
--- /dev/null
+++ b/l10n/zh_TW/impress.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"PO-Revision-Date: 2012-08-25 23:18+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/presentations.php:7
+msgid "Documentation"
+msgstr ""
diff --git a/lib/l10n/nb_NO.php b/lib/l10n/nb_NO.php
index af9503b7bf..f751a41d5e 100644
--- a/lib/l10n/nb_NO.php
+++ b/lib/l10n/nb_NO.php
@@ -11,6 +11,7 @@
 "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",
+"Token expired. Please reload page." => "Symbol utløpt. Vennligst last inn siden på nytt.",
 "seconds ago" => "sekunder siden",
 "1 minute ago" => "1 minuitt siden",
 "%d minutes ago" => "%d minutter siden",
diff --git a/settings/l10n/nb_NO.php b/settings/l10n/nb_NO.php
index 2a5188a9cc..137e5802a2 100644
--- a/settings/l10n/nb_NO.php
+++ b/settings/l10n/nb_NO.php
@@ -1,13 +1,21 @@
 <?php $TRANSLATIONS = array(
+"Unable to load list from App Store" => "Lasting av liste fra App Store feilet.",
 "Email saved" => "Epost lagret",
 "Invalid email" => "Ugyldig epost",
 "OpenID Changed" => "OpenID endret",
 "Invalid request" => "Ugyldig forespørsel",
+"Authentication error" => "Autentikasjonsfeil",
 "Language changed" => "Språk endret",
+"Error" => "Feil",
 "Disable" => "Slå avBehandle ",
 "Enable" => "Slå på",
 "Saving..." => "Lagrer...",
 "__language_name__" => "__language_name__",
+"Security Warning" => "Sikkerhetsadvarsel",
+"Cron" => "Cron",
+"execute one task with each page loaded" => "utfør en oppgave med hver side som blir lastet",
+"cron.php is registered at a webcron service" => "cron.php er registrert som en webcron tjeneste",
+"use systems cron service" => "benytt systemets cron tjeneste",
 "Log" => "Logg",
 "More" => "Mer",
 "Add your App" => "Legg til din App",
@@ -43,6 +51,7 @@
 "Create" => "Opprett",
 "Default Quota" => "Standard Kvote",
 "Other" => "Annet",
+"Group Admin" => "Gruppeadministrator",
 "Quota" => "Kvote",
 "Delete" => "Slett"
 );

From 27eb6655162743ada7f64ba4157e425ca86ad312 Mon Sep 17 00:00:00 2001
From: Thomas Mueller <thomas.mueller@tmit.eu>
Date: Sun, 26 Aug 2012 01:35:25 +0200
Subject: [PATCH 0907/1224] adding coverage extension for simpletest

---
 .../extensions/coverage/autocoverage.php      |  29 +++
 .../coverage/bin/php-coverage-close.php       |  14 ++
 .../coverage/bin/php-coverage-open.php        |  31 +++
 .../coverage/bin/php-coverage-report.php      |  29 +++
 .../extensions/coverage/coverage.php          | 196 ++++++++++++++++++
 .../coverage/coverage_calculator.php          |  98 +++++++++
 .../coverage/coverage_data_handler.php        | 125 +++++++++++
 .../extensions/coverage/coverage_reporter.php |  68 ++++++
 .../extensions/coverage/coverage_utils.php    | 114 ++++++++++
 .../extensions/coverage/coverage_writer.php   |  16 ++
 .../coverage/simple_coverage_writer.php       |  39 ++++
 .../extensions/coverage/templates/file.php    |  60 ++++++
 .../extensions/coverage/templates/index.php   | 106 ++++++++++
 .../test/coverage_calculator_test.php         |  65 ++++++
 .../test/coverage_data_handler_test.php       |  83 ++++++++
 .../coverage/test/coverage_reporter_test.php  |  22 ++
 .../coverage/test/coverage_test.php           | 109 ++++++++++
 .../coverage/test/coverage_utils_test.php     |  70 +++++++
 .../extensions/coverage/test/sample/code.php  |   4 +
 .../test/simple_coverage_writer_test.php      |  69 ++++++
 .../extensions/coverage/test/test.php         |  14 ++
 21 files changed, 1361 insertions(+)
 create mode 100644 3rdparty/simpletest/extensions/coverage/autocoverage.php
 create mode 100755 3rdparty/simpletest/extensions/coverage/bin/php-coverage-close.php
 create mode 100755 3rdparty/simpletest/extensions/coverage/bin/php-coverage-open.php
 create mode 100755 3rdparty/simpletest/extensions/coverage/bin/php-coverage-report.php
 create mode 100644 3rdparty/simpletest/extensions/coverage/coverage.php
 create mode 100644 3rdparty/simpletest/extensions/coverage/coverage_calculator.php
 create mode 100644 3rdparty/simpletest/extensions/coverage/coverage_data_handler.php
 create mode 100644 3rdparty/simpletest/extensions/coverage/coverage_reporter.php
 create mode 100644 3rdparty/simpletest/extensions/coverage/coverage_utils.php
 create mode 100644 3rdparty/simpletest/extensions/coverage/coverage_writer.php
 create mode 100644 3rdparty/simpletest/extensions/coverage/simple_coverage_writer.php
 create mode 100644 3rdparty/simpletest/extensions/coverage/templates/file.php
 create mode 100644 3rdparty/simpletest/extensions/coverage/templates/index.php
 create mode 100644 3rdparty/simpletest/extensions/coverage/test/coverage_calculator_test.php
 create mode 100644 3rdparty/simpletest/extensions/coverage/test/coverage_data_handler_test.php
 create mode 100644 3rdparty/simpletest/extensions/coverage/test/coverage_reporter_test.php
 create mode 100644 3rdparty/simpletest/extensions/coverage/test/coverage_test.php
 create mode 100644 3rdparty/simpletest/extensions/coverage/test/coverage_utils_test.php
 create mode 100644 3rdparty/simpletest/extensions/coverage/test/sample/code.php
 create mode 100644 3rdparty/simpletest/extensions/coverage/test/simple_coverage_writer_test.php
 create mode 100644 3rdparty/simpletest/extensions/coverage/test/test.php

diff --git a/3rdparty/simpletest/extensions/coverage/autocoverage.php b/3rdparty/simpletest/extensions/coverage/autocoverage.php
new file mode 100644
index 0000000000..9fc961bf43
--- /dev/null
+++ b/3rdparty/simpletest/extensions/coverage/autocoverage.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * @package        SimpleTest
+ * @subpackage     Extensions
+ */
+/**
+ * Include this in any file to start coverage, coverage will automatically end
+ * when process dies.
+ */
+require_once(dirname(__FILE__) .'/coverage.php');
+
+if (CodeCoverage::isCoverageOn()) {
+    $coverage = CodeCoverage::getInstance();
+    $coverage->startCoverage();
+    register_shutdown_function("stop_coverage");
+}
+
+function stop_coverage() {
+    # hack until i can think of a way to run tests first and w/o exiting
+    $autorun = function_exists("run_local_tests");
+    if ($autorun) {
+        $result = run_local_tests();
+    }
+    CodeCoverage::getInstance()->stopCoverage();
+    if ($autorun) {
+        exit($result ? 0 : 1);
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/extensions/coverage/bin/php-coverage-close.php b/3rdparty/simpletest/extensions/coverage/bin/php-coverage-close.php
new file mode 100755
index 0000000000..9a5a52ba13
--- /dev/null
+++ b/3rdparty/simpletest/extensions/coverage/bin/php-coverage-close.php
@@ -0,0 +1,14 @@
+<?php
+/**
+ * Close code coverage data collection, next step is to generate report
+ * @package        SimpleTest
+ * @subpackage     Extensions
+ */
+/**
+ * include coverage files
+ */
+require_once(dirname(__FILE__) . '/../coverage.php');
+$cc = CodeCoverage::getInstance();
+$cc->readSettings();
+$cc->writeUntouched();
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/extensions/coverage/bin/php-coverage-open.php b/3rdparty/simpletest/extensions/coverage/bin/php-coverage-open.php
new file mode 100755
index 0000000000..c04e1fb512
--- /dev/null
+++ b/3rdparty/simpletest/extensions/coverage/bin/php-coverage-open.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * Initialize code coverage data collection, next step is to run your tests
+ * with ini setting auto_prepend_file=autocoverage.php ...
+ *
+ * @package        SimpleTest
+ * @subpackage     Extensions
+ */ 
+# optional arguments:
+#  --include=<some filepath regexp>      these files should be included coverage report
+#  --exclude=<come filepath regexp>      these files should not be included in coverage report
+#  --maxdepth=2                          when considering which file were not touched, scan directories 
+#
+# Example: 
+# php-coverage-open.php --include='.*\.php$' --include='.*\.inc$' --exclude='.*/tests/.*' 
+/**#@+
+ * include coverage files
+ */
+require_once(dirname(__FILE__) . '/../coverage_utils.php');
+CoverageUtils::requireSqlite();
+require_once(dirname(__FILE__) . '/../coverage.php');
+/**#@-*/
+$cc = new CodeCoverage();
+$cc->log = 'coverage.sqlite';
+$args = CoverageUtils::parseArguments($_SERVER['argv'], TRUE);
+$cc->includes = CoverageUtils::issetOr($args['include[]'], array('.*\.php$'));
+$cc->excludes = CoverageUtils::issetOr($args['exclude[]']); 
+$cc->maxDirectoryDepth = (int)CoverageUtils::issetOr($args['maxdepth'], '1');
+$cc->resetLog();
+$cc->writeSettings();
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/extensions/coverage/bin/php-coverage-report.php b/3rdparty/simpletest/extensions/coverage/bin/php-coverage-report.php
new file mode 100755
index 0000000000..d61c822d99
--- /dev/null
+++ b/3rdparty/simpletest/extensions/coverage/bin/php-coverage-report.php
@@ -0,0 +1,29 @@
+<?php
+/**
+ * Generate a code coverage report
+ *
+ * @package        SimpleTest
+ * @subpackage     Extensions
+ */
+# optional arguments:
+#  --reportDir=some/directory    the default is ./coverage-report
+#  --title='My Coverage Report'  title the main page of your report
+
+/**#@+
+ * include coverage files
+ */
+require_once(dirname(__FILE__) . '/../coverage_utils.php');
+require_once(dirname(__FILE__) . '/../coverage.php');
+require_once(dirname(__FILE__) . '/../coverage_reporter.php');
+/**#@-*/
+$cc = CodeCoverage::getInstance();
+$cc->readSettings();
+$handler = new CoverageDataHandler($cc->log);
+$report = new CoverageReporter();
+$args = CoverageUtils::parseArguments($_SERVER['argv']);
+$report->reportDir = CoverageUtils::issetOr($args['reportDir'], 'coverage-report');
+$report->title = CoverageUtils::issetOr($args['title'], "Simpletest Coverage");
+$report->coverage = $handler->read();
+$report->untouched = $handler->readUntouchedFiles();
+$report->generate();
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/extensions/coverage/coverage.php b/3rdparty/simpletest/extensions/coverage/coverage.php
new file mode 100644
index 0000000000..44e5b679b8
--- /dev/null
+++ b/3rdparty/simpletest/extensions/coverage/coverage.php
@@ -0,0 +1,196 @@
+<?php
+/**
+* @package        SimpleTest
+* @subpackage     Extensions
+*/
+/**
+* load coverage data handle
+*/
+require_once dirname(__FILE__) . '/coverage_data_handler.php';
+
+/**
+ * Orchestrates code coverage both in this thread and in subthread under apache
+ * Assumes this is running on same machine as apache.
+ * @package        SimpleTest
+ * @subpackage     Extensions
+ */
+class CodeCoverage  {
+    var $log;
+    var $root;
+    var $includes;
+    var $excludes;
+    var $directoryDepth;
+    var $maxDirectoryDepth = 20; // reasonable, otherwise arbitrary
+    var $title = "Code Coverage";
+
+    # NOTE: This assumes all code shares the same current working directory.
+    var $settingsFile = './code-coverage-settings.dat';
+
+    static $instance;
+
+    function writeUntouched() {
+        $touched = array_flip($this->getTouchedFiles());
+        $untouched = array();
+        $this->getUntouchedFiles($untouched, $touched, '.', '.');
+        $this->includeUntouchedFiles($untouched);
+    }
+
+    function &getTouchedFiles() {
+        $handler = new CoverageDataHandler($this->log);
+        $touched = $handler->getFilenames();
+        return $touched;
+    }
+
+    function includeUntouchedFiles($untouched) {
+        $handler = new CoverageDataHandler($this->log);
+        foreach ($untouched as $file) {
+            $handler->writeUntouchedFile($file);
+        }
+    }
+
+    function getUntouchedFiles(&$untouched, $touched, $parentPath, $rootPath, $directoryDepth = 1) {
+        $parent = opendir($parentPath);
+        while ($file = readdir($parent)) {
+            $path = "$parentPath/$file";
+            if (is_dir($path)) {
+                if ($file != '.' && $file != '..') {
+                    if ($this->isDirectoryIncluded($path, $directoryDepth)) {
+                        $this->getUntouchedFiles($untouched, $touched, $path, $rootPath, $directoryDepth + 1);
+                    }
+                }
+            }
+            else if ($this->isFileIncluded($path)) {
+                $relativePath = CoverageDataHandler::ltrim($rootPath .'/', $path);
+                if (!array_key_exists($relativePath, $touched)) {
+                    $untouched[] = $relativePath;
+                }
+            }
+        }
+        closedir($parent);
+    }
+
+    function resetLog() {
+        error_log('reseting log');
+        $new_file = fopen($this->log, "w");
+        if (!$new_file) {
+            throw new Exception("Could not create ". $this->log);
+        }
+        fclose($new_file);
+        if (!chmod($this->log, 0666)) {
+            throw new Exception("Could not change ownership on file  ". $this->log);
+        }
+        $handler = new CoverageDataHandler($this->log);
+        $handler->createSchema();
+    }
+
+    function startCoverage() {
+        $this->root = getcwd();
+        if(!extension_loaded("xdebug")) {
+            throw new Exception("Could not load xdebug extension");
+        };
+        xdebug_start_code_coverage(XDEBUG_CC_UNUSED | XDEBUG_CC_DEAD_CODE);
+    }
+
+    function stopCoverage() {
+        $cov = xdebug_get_code_coverage();
+        $this->filter($cov);
+        $data = new CoverageDataHandler($this->log);
+        chdir($this->root);
+        $data->write($cov);
+        unset($data); // release sqlite connection
+        xdebug_stop_code_coverage();
+        // make sure we wind up on same current working directory, otherwise
+        // coverage handler writer doesn't know what directory to chop off
+        chdir($this->root);
+    }
+
+    function readSettings() {
+        if (file_exists($this->settingsFile)) {
+            $this->setSettings(file_get_contents($this->settingsFile));
+        } else {
+            error_log("could not find file ". $this->settingsFile);
+        }
+    }
+
+    function writeSettings() {       
+        file_put_contents($this->settingsFile, $this->getSettings());
+    }
+
+    function getSettings() {
+        $data = array(
+    	'log' => realpath($this->log), 
+    	'includes' => $this->includes, 
+    	'excludes' => $this->excludes);
+        return serialize($data);
+    }
+
+    function setSettings($settings) {
+        $data = unserialize($settings);
+        $this->log = $data['log'];
+        $this->includes = $data['includes'];
+        $this->excludes = $data['excludes'];
+    }
+
+    function filter(&$coverage) {
+        foreach ($coverage as $file => $line) {
+            if (!$this->isFileIncluded($file)) {
+                unset($coverage[$file]);
+            }
+        }
+    }
+
+    function isFileIncluded($file)  {
+        if (!empty($this->excludes)) {
+            foreach ($this->excludes as $path) {
+                if (preg_match('|' . $path . '|', $file)) {
+                    return False;
+                }
+            }
+        }
+
+        if (!empty($this->includes)) {
+            foreach ($this->includes as $path) {
+                if (preg_match('|' . $path . '|', $file)) {
+                    return True;
+                }
+            }
+            return False;
+        }
+
+        return True;
+    }
+
+    function isDirectoryIncluded($dir, $directoryDepth)  {
+        if ($directoryDepth >= $this->maxDirectoryDepth) {
+            return false;
+        }
+        if (isset($this->excludes)) {
+            foreach ($this->excludes as $path) {
+                if (preg_match('|' . $path . '|', $dir)) {
+                    return False;
+                }
+            }
+        }
+
+        return True;
+    }
+
+    static function isCoverageOn() {
+        $coverage = self::getInstance();
+        $coverage->readSettings();
+        if (empty($coverage->log) || !file_exists($coverage->log)) {
+            trigger_error('No coverage log');
+            return False;
+        }
+        return True;
+    }
+
+    static function getInstance() {
+        if (self::$instance == NULL) {
+            self::$instance = new CodeCoverage();
+            self::$instance->readSettings();
+        }
+        return self::$instance;
+    }
+}
+?>
diff --git a/3rdparty/simpletest/extensions/coverage/coverage_calculator.php b/3rdparty/simpletest/extensions/coverage/coverage_calculator.php
new file mode 100644
index 0000000000..f1aa57bbab
--- /dev/null
+++ b/3rdparty/simpletest/extensions/coverage/coverage_calculator.php
@@ -0,0 +1,98 @@
+<?php
+/**
+* @package        SimpleTest
+* @subpackage     Extensions
+*/
+/**
+* @package        SimpleTest
+* @subpackage     Extensions
+*/
+class CoverageCalculator {
+
+    function coverageByFileVariables($file, $coverage) {
+        $hnd = fopen($file, 'r');
+        if ($hnd == null) {
+            throw new Exception("File $file is missing");
+        }
+        $lines = array();
+        for ($i = 1; !feof($hnd); $i++) {
+            $line = fgets($hnd);
+            $lineCoverage = $this->lineCoverageCodeToStyleClass($coverage, $i);
+            $lines[$i] = array('lineCoverage' => $lineCoverage, 'code' => $line);
+        }
+
+        fclose($hnd);
+
+        $var = compact('file', 'lines', 'coverage');
+        return $var;
+    }
+
+    function lineCoverageCodeToStyleClass($coverage, $line) {
+        if (!array_key_exists($line, $coverage)) {
+            return "comment";
+        }
+        $code = $coverage[$line];
+        if (empty($code)) {
+            return "comment";
+        }
+        switch ($code) {
+            case -1:
+                return "missed";
+            case -2:
+                return "dead";
+        }
+
+        return "covered";
+    }
+
+    function totalLoc($total, $coverage) {
+        return $total + sizeof($coverage);
+    }
+
+    function lineCoverage($total, $line) {
+        # NOTE: counting dead code as covered, as it's almost always an executable line
+        # strange artifact of xdebug or underlying system
+        return $total + ($line > 0 || $line == -2 ? 1 : 0);
+    }
+
+    function totalCoverage($total, $coverage) {
+        return $total + array_reduce($coverage, array(&$this, "lineCoverage"));
+    }
+
+    static function reportFilename($filename) {
+        return preg_replace('|[/\\\\]|', '_', $filename) . '.html';
+    }
+
+    function percentCoverageByFile($coverage, $file, &$results) {
+        $byFileReport = self::reportFilename($file);
+
+        $loc = sizeof($coverage);
+        if ($loc == 0)
+        return 0;
+        $lineCoverage = array_reduce($coverage, array(&$this, "lineCoverage"));
+        $percentage = 100 * ($lineCoverage / $loc);
+        $results[0][$file] = array('byFileReport' => $byFileReport, 'percentage' => $percentage);
+    }
+
+    function variables($coverage, $untouched) {
+        $coverageByFile = array();
+        array_walk($coverage, array(&$this, "percentCoverageByFile"), array(&$coverageByFile));
+
+        $totalLoc = array_reduce($coverage, array(&$this, "totalLoc"));
+
+        if ($totalLoc > 0) {
+            $totalLinesOfCoverage = array_reduce($coverage, array(&$this, "totalCoverage"));
+            $totalPercentCoverage = 100 * ($totalLinesOfCoverage / $totalLoc);
+        }
+
+        $untouchedPercentageDenominator = sizeof($coverage) + sizeof($untouched);
+        if ($untouchedPercentageDenominator > 0) {
+            $filesTouchedPercentage = 100 * sizeof($coverage) / $untouchedPercentageDenominator;
+        }
+
+        $var = compact('coverageByFile', 'totalPercentCoverage', 'totalLoc', 'totalLinesOfCoverage', 'filesTouchedPercentage');
+        $var['untouched'] = $untouched;
+        return $var;
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/extensions/coverage/coverage_data_handler.php b/3rdparty/simpletest/extensions/coverage/coverage_data_handler.php
new file mode 100644
index 0000000000..bbf81106fc
--- /dev/null
+++ b/3rdparty/simpletest/extensions/coverage/coverage_data_handler.php
@@ -0,0 +1,125 @@
+<?php
+/**
+ * @package        SimpleTest
+ * @subpackage     Extensions
+ */
+/**
+ * @todo	which db abstraction layer is this?
+ */
+require_once 'DB/sqlite.php';
+
+/**
+ * Persists code coverage data into SQLite database and aggregate data for convienent
+ * interpretation in report generator.  Be sure to not to keep an instance longer
+ * than you have, otherwise you risk overwriting database edits from another process
+ * also trying to make updates.
+ * @package        SimpleTest
+ * @subpackage     Extensions
+ */
+class CoverageDataHandler {
+
+    var $db;
+
+    function __construct($filename) {
+        $this->filename = $filename;
+        $this->db = new SQLiteDatabase($filename);
+        if (empty($this->db)) {
+            throw new Exception("Could not create sqlite db ". $filename);
+        }
+    }
+
+    function createSchema() {
+        $this->db->queryExec("create table untouched (filename text)");
+        $this->db->queryExec("create table coverage (name text, coverage text)");
+    }
+
+    function &getFilenames() {
+        $filenames = array();
+        $cursor = $this->db->unbufferedQuery("select distinct name from coverage");
+        while ($row = $cursor->fetch()) {
+            $filenames[] = $row[0];
+        }
+
+        return $filenames;
+    }
+
+    function write($coverage) {
+        foreach ($coverage as $file => $lines) {
+            $coverageStr = serialize($lines);
+            $relativeFilename = self::ltrim(getcwd() . '/', $file);
+            $sql = "insert into coverage (name, coverage) values ('$relativeFilename', '$coverageStr')";
+            # if this fails, check you have write permission
+            $this->db->queryExec($sql);
+        }
+    }
+
+    function read() {
+        $coverage = array_flip($this->getFilenames());
+        foreach($coverage as $file => $garbage) {
+            $coverage[$file] = $this->readFile($file);
+        }
+        return $coverage;
+    }
+
+    function &readFile($file) {
+        $sql = "select coverage from coverage where name = '$file'";
+        $aggregate = array();
+        $result = $this->db->query($sql);
+        while ($result->valid()) {
+            $row = $result->current();
+            $this->aggregateCoverage($aggregate, unserialize($row[0]));
+            $result->next();
+        }
+
+        return $aggregate;
+    }
+
+    function aggregateCoverage(&$total, $next) {
+        foreach ($next as $lineno => $code) {
+            if (!isset($total[$lineno])) {
+                $total[$lineno] = $code;
+            } else {
+                $total[$lineno] = $this->aggregateCoverageCode($total[$lineno], $code);
+            }
+        }
+    }
+
+    function aggregateCoverageCode($code1, $code2) {
+        switch($code1) {
+            case -2: return -2;
+            case -1: return $code2;
+            default:
+                switch ($code2) {
+                    case -2: return -2;
+                    case -1: return $code1;
+                }
+        }
+        return $code1 + $code2;
+    }
+
+    static function ltrim($cruft, $pristine) {
+        if(stripos($pristine, $cruft) === 0) {
+            return substr($pristine, strlen($cruft));
+        }
+        return $pristine;
+    }
+
+    function writeUntouchedFile($file) {
+        $relativeFile = CoverageDataHandler::ltrim('./', $file);
+        $sql = "insert into untouched values ('$relativeFile')";
+        $this->db->queryExec($sql);
+    }
+
+    function &readUntouchedFiles() {
+        $untouched = array();
+        $result = $this->db->query("select filename from untouched order by filename");
+        while ($result->valid()) {
+            $row = $result->current();
+            $untouched[] = $row[0];
+            $result->next();
+        }
+
+        return $untouched;
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/extensions/coverage/coverage_reporter.php b/3rdparty/simpletest/extensions/coverage/coverage_reporter.php
new file mode 100644
index 0000000000..ba4e7161c2
--- /dev/null
+++ b/3rdparty/simpletest/extensions/coverage/coverage_reporter.php
@@ -0,0 +1,68 @@
+<?php
+/**
+ * @package        SimpleTest
+ * @subpackage     Extensions
+ */
+/**#@+
+ * include additional coverage files
+ */
+require_once dirname(__FILE__) .'/coverage_calculator.php';
+require_once dirname(__FILE__) .'/coverage_utils.php';
+require_once dirname(__FILE__) .'/simple_coverage_writer.php';
+/**#@-*/
+
+/**
+ * Take aggregated coverage data and generate reports from it using smarty
+ * templates
+ * @package        SimpleTest
+ * @subpackage     Extensions
+ */
+class CoverageReporter {
+    var $coverage;
+    var $untouched;
+    var $reportDir;
+    var $title = 'Coverage';
+    var $writer;
+    var $calculator;
+
+    function __construct() {
+        $this->writer = new SimpleCoverageWriter();
+        $this->calculator = new CoverageCalculator();
+    }
+
+    function generateSummaryReport($out) {
+        $variables = $this->calculator->variables($this->coverage, $this->untouched);
+        $variables['title'] = $this->title;
+        $report = $this->writer->writeSummary($out, $variables);
+        fwrite($out, $report);
+    }
+
+    function generate() {
+        CoverageUtils::mkdir($this->reportDir);
+
+        $index = $this->reportDir .'/index.html';
+        $hnd = fopen($index, 'w');
+        $this->generateSummaryReport($hnd);
+        fclose($hnd);
+
+        foreach ($this->coverage as $file => $cov) {
+            $byFile = $this->reportDir .'/'. self::reportFilename($file);
+            $byFileHnd = fopen($byFile, 'w');
+            $this->generateCoverageByFile($byFileHnd, $file, $cov);
+            fclose($byFileHnd);
+        }
+
+        echo "generated report $index\n";
+    }
+
+    function generateCoverageByFile($out, $file, $cov) {
+        $variables = $this->calculator->coverageByFileVariables($file, $cov);
+        $variables['title'] = $this->title .' - '. $file;
+        $this->writer->writeByFile($out, $variables);
+    }
+
+    static function reportFilename($filename) {
+        return preg_replace('|[/\\\\]|', '_', $filename) . '.html';
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/extensions/coverage/coverage_utils.php b/3rdparty/simpletest/extensions/coverage/coverage_utils.php
new file mode 100644
index 0000000000..d2c3a635f4
--- /dev/null
+++ b/3rdparty/simpletest/extensions/coverage/coverage_utils.php
@@ -0,0 +1,114 @@
+<?php
+/**
+ * @package        SimpleTest
+ * @subpackage     Extensions
+ */
+/**
+ * @package        SimpleTest
+ * @subpackage     Extensions
+ */
+class CoverageUtils {
+
+    static function mkdir($dir) {
+        if (!file_exists($dir)) {
+            mkdir($dir, 0777, True);
+        } else {
+            if (!is_dir($dir)) {
+                throw new Exception($dir .' exists as a file, not a directory');
+            }
+        }
+    }
+
+    static function requireSqlite() {
+        if (!self::isPackageClassAvailable('DB/sqlite.php', 'SQLiteDatabase')) {
+            echo "sqlite library is required to be installed and available in include_path";
+            exit(1);
+        }
+    }
+
+    static function isPackageClassAvailable($includeFile, $class) {
+        @include_once($includeFile);
+        return class_exists($class);
+    }
+
+    /**
+     * Parses simple parameters from CLI.
+     *
+     * Puts trailing parameters into string array in 'extraArguments'
+     *
+     * Example:
+     * $args = CoverageUtil::parseArguments($_SERVER['argv']);
+     * if ($args['verbose']) echo "Verbose Mode On\n";
+     * $files = $args['extraArguments'];
+     *
+     * Example CLI:
+     *  --foo=blah -x -h  some trailing arguments
+     *
+     * if multiValueMode is true
+     * Example CLI:
+     *  --include=a --include=b --exclude=c
+     * Then
+     *  $args = CoverageUtil::parseArguments($_SERVER['argv']);
+     *  $args['include[]'] will equal array('a', 'b')
+     *  $args['exclude[]'] will equal array('c')
+     *  $args['exclude'] will equal c
+     *  $args['include'] will equal b   NOTE: only keeps last value
+     *
+     * @param unknown_type $argv
+     * @param supportMutliValue - will store 2nd copy of value in an array with key "foo[]"
+     * @return unknown
+     */
+    static public function parseArguments($argv, $mutliValueMode = False) {
+        $args = array();
+        $args['extraArguments'] = array();
+        array_shift($argv); // scriptname
+        foreach ($argv as $arg) {
+            if (ereg('^--([^=]+)=(.*)', $arg, $reg)) {
+                $args[$reg[1]] = $reg[2];
+                if ($mutliValueMode) {
+                    self::addItemAsArray($args, $reg[1], $reg[2]);
+                }
+            } elseif (ereg('^[-]{1,2}([^[:blank:]]+)', $arg, $reg)) {
+                $nonnull = '';
+                $args[$reg[1]] = $nonnull;
+                if ($mutliValueMode) {
+                    self::addItemAsArray($args, $reg[1], $nonnull);
+                }
+            } else {
+                $args['extraArguments'][] = $arg;
+            }
+        }
+
+        return $args;
+    }
+
+    /**
+     * Adds a value as an array of one, or appends to an existing array elements
+     *
+     * @param unknown_type $array
+     * @param unknown_type $item
+     */
+    static function addItemAsArray(&$array, $key, $item) {
+        $array_key = $key .'[]';
+        if (array_key_exists($array_key, $array)) {
+            $array[$array_key][] = $item;
+        } else {
+            $array[$array_key] = array($item);
+        }
+    }
+
+    /**
+     * isset function with default value
+     *
+     * Example:  $z = CoverageUtils::issetOr($array[$key], 'no value given')
+     *
+     * @param unknown_type $val
+     * @param unknown_type $default
+     * @return first value unless value is not set then returns 2nd arg or null if no 2nd arg
+     */
+    static public function issetOr(&$val, $default = null)
+    {
+        return isset($val) ? $val : $default;
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/extensions/coverage/coverage_writer.php b/3rdparty/simpletest/extensions/coverage/coverage_writer.php
new file mode 100644
index 0000000000..0a8519cb50
--- /dev/null
+++ b/3rdparty/simpletest/extensions/coverage/coverage_writer.php
@@ -0,0 +1,16 @@
+<?php
+/**
+ * @package        SimpleTest
+ * @subpackage     Extensions
+ */
+/**
+ * @package        SimpleTest
+ * @subpackage     Extensions
+ */
+interface CoverageWriter {
+
+    function writeSummary($out, $variables);
+
+    function writeByFile($out, $variables);
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/extensions/coverage/simple_coverage_writer.php b/3rdparty/simpletest/extensions/coverage/simple_coverage_writer.php
new file mode 100644
index 0000000000..7eb73fc8ab
--- /dev/null
+++ b/3rdparty/simpletest/extensions/coverage/simple_coverage_writer.php
@@ -0,0 +1,39 @@
+<?php
+/**
+ *  SimpleCoverageWriter class file
+ *  @package    SimpleTest
+ *  @subpackage UnitTester
+ *  @version    $Id: unit_tester.php 1882 2009-07-01 14:30:05Z lastcraft $
+ */
+/**
+ * base coverage writer class
+ */
+require_once dirname(__FILE__) .'/coverage_writer.php';
+
+/**
+ *  SimpleCoverageWriter class
+ *  @package    SimpleTest
+ *  @subpackage UnitTester
+ */
+class SimpleCoverageWriter implements CoverageWriter {
+
+    function writeSummary($out, $variables) {
+        extract($variables);
+        $now = date("F j, Y, g:i a");
+        ob_start();
+        include dirname(__FILE__) . '/templates/index.php';
+        $contents = ob_get_contents();
+        fwrite ($out, $contents);
+        ob_end_clean();
+    }
+
+    function writeByFile($out, $variables) {
+        extract($variables);
+        ob_start();
+        include dirname(__FILE__) . '/templates/file.php';
+        $contents = ob_get_contents();
+        fwrite ($out, $contents);
+        ob_end_clean();
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/extensions/coverage/templates/file.php b/3rdparty/simpletest/extensions/coverage/templates/file.php
new file mode 100644
index 0000000000..70f6903068
--- /dev/null
+++ b/3rdparty/simpletest/extensions/coverage/templates/file.php
@@ -0,0 +1,60 @@
+<html>
+<head>
+<title><?php echo $title ?></title>
+</head>
+<style type="text/css">
+body {
+  font-family: "Gill Sans MT", "Gill Sans", GillSans, Arial, Helvetica, sans-serif;
+}
+h1 {
+  font-size: medium;
+}
+#code {
+  border-spacing: 0;
+}
+.lineNo {
+  color: #ccc;
+}
+.code, .lineNo {
+  white-space: pre;
+  font-family: monospace;
+}
+.covered {
+  color: #090;
+}
+.missed {
+  color: #f00;
+}
+.dead {
+  color: #00f;
+}
+.comment {
+  color: #333;
+}
+</style>
+<body>
+<h1 id="title"><?php echo $title ?></h1>
+<table id="code">
+  <tbody>
+<?php foreach ($lines as $lineNo => $line) { ?>
+    <tr>
+       <td><span class="lineNo"><?php echo $lineNo ?></span></td>
+       <td><span class="<?php echo $line['lineCoverage'] ?> code"><?php echo htmlentities($line['code']) ?></span></td>
+    </tr>
+<?php } ?>
+  </tbody>
+</table>
+<h2>Legend</h2>
+<dl>
+  <dt><span class="missed">Missed</span></dt>
+  <dd>lines code that <strong>were not</strong> excersized during program execution.</dd>
+  <dt><span class="covered">Covered</span></dt>
+  <dd>lines code <strong>were</strong> excersized during program execution.</dd>
+  <dt><span class="comment">Comment/non executable</span></dt>
+  <dd>Comment or non-executable line of code.</dd>
+  <dt><span class="dead">Dead</span></dt>
+  <dd>lines of code that according to xdebug could not be executed.  This is counted as coverage code because 
+  in almost all cases it is code that runnable.</dd>
+</dl>
+</body>
+</html>
diff --git a/3rdparty/simpletest/extensions/coverage/templates/index.php b/3rdparty/simpletest/extensions/coverage/templates/index.php
new file mode 100644
index 0000000000..e4374e2380
--- /dev/null
+++ b/3rdparty/simpletest/extensions/coverage/templates/index.php
@@ -0,0 +1,106 @@
+<html>
+<head>
+<title><?php echo $title ?></title>
+</head>
+<style type="text/css">
+h1 {
+	font-size: medium;
+}
+
+body {
+	font-family: "Gill Sans MT", "Gill Sans", GillSans, Arial, Helvetica,
+		sans-serif;
+}
+
+td.percentage {
+	text-align: right;
+}
+
+caption {
+	border-bottom: thin solid;
+	font-weight: bolder;
+}
+
+dt {
+	font-weight: bolder;
+}
+
+table {
+	margin: 1em;
+}
+</style>
+<body>
+<h1 id="title"><?php echo $title ?></h1>
+<table>
+	<caption>Summary</caption>
+	<tbody>
+		<tr>
+			<td>Total Coverage (<a href="#total-coverage">?</a>) :</td>
+			<td class="percentage"><span class="totalPercentCoverage"><?php echo number_format($totalPercentCoverage, 0) ?>%</span></td>
+		</tr>
+		<tr>
+			<td>Total Files Covered (<a href="#total-files-covered">?</a>) :</td>
+			<td class="percentage"><span class="filesTouchedPercentage"><?php  echo number_format($filesTouchedPercentage, 0) ?>%</span></td>
+		</tr>
+		<tr>
+			<td>Report Generation Date :</td>
+			<td><?php echo $now ?></td>
+		</tr>
+	</tbody>
+</table>
+<table id="covered-files">
+	<caption>Coverage (<a href="#coverage">?</a>)</caption>
+	<thead>
+		<tr>
+			<th>File</th>
+			<th>Coverage</th>
+		</tr>
+	</thead>
+	<tbody>
+		<?php foreach ($coverageByFile as $file => $coverage) { ?>
+		<tr>
+			<td><a class="byFileReportLink" href="<?php echo $coverage['byFileReport']  ?>"><?php echo $file ?></a></td>
+			<td class="percentage"><span class="percentCoverage"><?php echo number_format($coverage['percentage'], 0) ?>%</span></td>
+		</tr>
+		<?php } ?>
+	</tbody>
+</table>
+<table>
+	<caption>Files Not Covered (<a href="#untouched">?</a>)</caption>
+	<tbody>
+		<?php foreach ($untouched as $key => $file) { ?>
+		<tr>
+			<td><span class="untouchedFile"><?php echo $file ?></span></td>
+		</tr>
+		<?php } ?>
+	</tbody>
+</table>
+
+<h2>Glossary</h2>
+<dl>
+	<dt><a name="total-coverage">Total Coverage</a></dt>
+	<dd>Ratio of all the lines of executable code that were executed to the
+	lines of code that were not executed. This does not include the files
+	that were not covered at all.</dd>
+	<dt><a name="total-files-covered">Total Files Covered</a></dt>
+	<dd>This is the ratio of the number of files tested, to the number of
+	files not tested at all.</dd>
+	<dt><a name="coverage">Coverage</a></dt>
+	<dd>These files were parsed and loaded by the php interpreter while
+	running the tests. Percentage is determined by the ratio of number of
+	lines of code executed to the number of possible executable lines of
+	code. "dead" lines of code, or code that could not be executed
+	according to xdebug, are counted as covered because in almost all cases
+	it is the end of a logical loop.</dd>
+	<dt><a name="untouched">Files Not Covered</a></dt>
+	<dd>These files were not loaded by the php interpreter at anytime
+	during a unit test. You could consider these files having 0% coverage,
+	but because it is difficult to determine the total coverage unless you
+	could count the lines for executable code, this is not reflected in the
+	Total Coverage calculation.</dd>
+</dl>
+
+<p>Code coverage generated by <a href="http://www.simpletest.org">SimpleTest</a></p>
+
+</body>
+</html>
diff --git a/3rdparty/simpletest/extensions/coverage/test/coverage_calculator_test.php b/3rdparty/simpletest/extensions/coverage/test/coverage_calculator_test.php
new file mode 100644
index 0000000000..64bd8d463f
--- /dev/null
+++ b/3rdparty/simpletest/extensions/coverage/test/coverage_calculator_test.php
@@ -0,0 +1,65 @@
+<?php
+require_once(dirname(__FILE__) . '/../../../autorun.php');
+
+class CoverageCalculatorTest extends UnitTestCase {
+    function skip() {
+        $this->skipIf(
+        		!file_exists('DB/sqlite.php'),
+                'The Coverage extension needs to have PEAR installed');
+    }
+    
+	function setUp() {
+       	require_once dirname(__FILE__) .'/../coverage_calculator.php';
+        $this->calc = new CoverageCalculator();
+    }
+
+    function testVariables() {
+        $coverage = array('file' => array(1,1,1,1));
+        $untouched = array('missed-file');
+        $variables = $this->calc->variables($coverage, $untouched);
+        $this->assertEqual(4, $variables['totalLoc']);
+        $this->assertEqual(100, $variables['totalPercentCoverage']);
+        $this->assertEqual(4, $variables['totalLinesOfCoverage']);
+        $expected = array('file' => array('byFileReport' => 'file.html', 'percentage' => 100));
+        $this->assertEqual($expected, $variables['coverageByFile']);
+        $this->assertEqual(50, $variables['filesTouchedPercentage']);
+        $this->assertEqual($untouched, $variables['untouched']);
+    }
+
+    function testPercentageCoverageByFile() {
+        $coverage = array(0,0,0,1,1,1);
+        $results = array();
+        $this->calc->percentCoverageByFile($coverage, 'file', $results);
+        $pct = $results[0];
+        $this->assertEqual(50, $pct['file']['percentage']);
+        $this->assertEqual('file.html', $pct['file']['byFileReport']);
+    }
+
+    function testTotalLoc() {
+        $this->assertEqual(13, $this->calc->totalLoc(10, array(1,2,3)));
+    }
+
+    function testLineCoverage() {
+        $this->assertEqual(10, $this->calc->lineCoverage(10, -1));
+        $this->assertEqual(10, $this->calc->lineCoverage(10, 0));
+        $this->assertEqual(11, $this->calc->lineCoverage(10, 1));
+    }
+
+    function testTotalCoverage() {
+        $this->assertEqual(11, $this->calc->totalCoverage(10, array(-1,1)));
+    }
+
+    static function getAttribute($element, $attribute) {
+        $a = $element->attributes();
+        return $a[$attribute];
+    }
+
+    static function dom($stream) {
+        rewind($stream);
+        $actual = stream_get_contents($stream);
+        $html = DOMDocument::loadHTML($actual);
+        return simplexml_import_dom($html);
+    }
+}
+
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/extensions/coverage/test/coverage_data_handler_test.php b/3rdparty/simpletest/extensions/coverage/test/coverage_data_handler_test.php
new file mode 100644
index 0000000000..54c67a4a7b
--- /dev/null
+++ b/3rdparty/simpletest/extensions/coverage/test/coverage_data_handler_test.php
@@ -0,0 +1,83 @@
+<?php
+require_once(dirname(__FILE__) . '/../../../autorun.php');
+
+class CoverageDataHandlerTest extends UnitTestCase {
+    function skip() {
+        $this->skipIf(
+        		!file_exists('DB/sqlite.php'),
+                'The Coverage extension needs to have PEAR installed');
+    }
+    
+	function setUp() {
+       	require_once dirname(__FILE__) .'/../coverage_data_handler.php';
+    }
+
+    function testAggregateCoverageCode() {
+        $handler = new CoverageDataHandler($this->tempdb());
+        $this->assertEqual(-2, $handler->aggregateCoverageCode(-2, -2));
+        $this->assertEqual(-2, $handler->aggregateCoverageCode(-2, 10));
+        $this->assertEqual(-2, $handler->aggregateCoverageCode(10, -2));
+        $this->assertEqual(-1, $handler->aggregateCoverageCode(-1, -1));
+        $this->assertEqual(10, $handler->aggregateCoverageCode(-1, 10));
+        $this->assertEqual(10, $handler->aggregateCoverageCode(10, -1));
+        $this->assertEqual(20, $handler->aggregateCoverageCode(10, 10));
+    }
+
+    function testSimpleWriteRead() {
+        $handler = new CoverageDataHandler($this->tempdb());
+        $handler->createSchema();
+        $coverage = array(10 => -2, 20 => -1, 30 => 0, 40 => 1);
+        $handler->write(array('file' => $coverage));
+
+        $actual = $handler->readFile('file');
+        $expected = array(10 => -2, 20 => -1, 30 => 0, 40 => 1);
+        $this->assertEqual($expected, $actual);
+    }
+
+    function testMultiFileWriteRead() {
+        $handler = new CoverageDataHandler($this->tempdb());
+        $handler->createSchema();
+        $handler->write(array(
+    	'file1' => array(-2, -1, 1), 
+    	'file2' => array(-2, -1, 1)
+        ));
+        $handler->write(array(
+    	'file1' => array(-2, -1, 1)
+        ));
+
+        $expected = array(
+    	'file1' => array(-2, -1, 2),
+    	'file2' => array(-2, -1, 1)
+        );
+        $actual = $handler->read();
+        $this->assertEqual($expected, $actual);
+    }
+
+    function testGetfilenames() {
+        $handler = new CoverageDataHandler($this->tempdb());
+        $handler->createSchema();
+        $rawCoverage = array('file0' => array(), 'file1' => array());
+        $handler->write($rawCoverage);
+        $actual = $handler->getFilenames();
+        $this->assertEqual(array('file0', 'file1'), $actual);
+    }
+
+    function testWriteUntouchedFiles() {
+        $handler = new CoverageDataHandler($this->tempdb());
+        $handler->createSchema();
+        $handler->writeUntouchedFile('bluejay');
+        $handler->writeUntouchedFile('robin');
+        $this->assertEqual(array('bluejay', 'robin'), $handler->readUntouchedFiles());
+    }
+
+    function testLtrim() {
+        $this->assertEqual('ber', CoverageDataHandler::ltrim('goo', 'goober'));
+        $this->assertEqual('some/file', CoverageDataHandler::ltrim('./', './some/file'));
+        $this->assertEqual('/x/y/z/a/b/c', CoverageDataHandler::ltrim('/a/b/', '/x/y/z/a/b/c'));
+    }
+
+    function tempdb() {
+        return tempnam(NULL, 'coverage.test.db');
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/extensions/coverage/test/coverage_reporter_test.php b/3rdparty/simpletest/extensions/coverage/test/coverage_reporter_test.php
new file mode 100644
index 0000000000..a8b09962a0
--- /dev/null
+++ b/3rdparty/simpletest/extensions/coverage/test/coverage_reporter_test.php
@@ -0,0 +1,22 @@
+<?php
+require_once(dirname(__FILE__) . '/../../../autorun.php');
+
+class CoverageReporterTest extends UnitTestCase {
+    function skip() {
+        $this->skipIf(
+        		!file_exists('DB/sqlite.php'),
+                'The Coverage extension needs to have PEAR installed');
+    }
+	
+	function setUp() {
+        require_once dirname(__FILE__) .'/../coverage_reporter.php';
+        new CoverageReporter();
+    }
+
+    function testreportFilename() {
+        $this->assertEqual("parula.php.html", CoverageReporter::reportFilename("parula.php"));
+        $this->assertEqual("warbler_parula.php.html", CoverageReporter::reportFilename("warbler/parula.php"));
+        $this->assertEqual("warbler_parula.php.html", CoverageReporter::reportFilename("warbler\\parula.php"));
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/extensions/coverage/test/coverage_test.php b/3rdparty/simpletest/extensions/coverage/test/coverage_test.php
new file mode 100644
index 0000000000..f09d03f78a
--- /dev/null
+++ b/3rdparty/simpletest/extensions/coverage/test/coverage_test.php
@@ -0,0 +1,109 @@
+<?php
+require_once(dirname(__FILE__) . '/../../../autorun.php');
+require_once(dirname(__FILE__) . '/../../../mock_objects.php');
+
+class CodeCoverageTest extends UnitTestCase {
+    function skip() {
+        $this->skipIf(
+        		!file_exists('DB/sqlite.php'),
+                'The Coverage extension needs to have PEAR installed');
+    }
+	
+	function setUp() {
+        require_once dirname(__FILE__) .'/../coverage.php';
+    }
+	
+    function testIsFileIncluded() {
+        $coverage = new CodeCoverage();
+        $this->assertTrue($coverage->isFileIncluded('aaa'));
+        $coverage->includes = array('a');
+        $this->assertTrue($coverage->isFileIncluded('aaa'));
+        $coverage->includes = array('x');
+        $this->assertFalse($coverage->isFileIncluded('aaa'));
+        $coverage->excludes = array('aa');
+        $this->assertFalse($coverage->isFileIncluded('aaa'));
+    }
+
+    function testIsFileIncludedRegexp() {
+        $coverage = new CodeCoverage();
+        $coverage->includes = array('modules/.*\.php$');
+        $coverage->excludes = array('bad-bunny.php');
+        $this->assertFalse($coverage->isFileIncluded('modules/a.test'));
+        $this->assertFalse($coverage->isFileIncluded('modules/bad-bunny.test'));
+        $this->assertTrue($coverage->isFileIncluded('modules/test.php'));
+        $this->assertFalse($coverage->isFileIncluded('module-bad/good-bunny.php'));
+        $this->assertTrue($coverage->isFileIncluded('modules/good-bunny.php'));
+    }
+
+    function testIsDirectoryIncludedPastMaxDepth() {
+        $coverage = new CodeCoverage();
+        $coverage->maxDirectoryDepth = 5;
+        $this->assertTrue($coverage->isDirectoryIncluded('aaa', 1));
+        $this->assertFalse($coverage->isDirectoryIncluded('aaa', 5));
+    }
+
+    function testIsDirectoryIncluded() {
+        $coverage = new CodeCoverage();
+        $this->assertTrue($coverage->isDirectoryIncluded('aaa', 0));
+        $coverage->excludes = array('b$');
+        $this->assertTrue($coverage->isDirectoryIncluded('aaa', 0));
+        $coverage->includes = array('a$'); // includes are ignore, all dirs are included unless excluded
+        $this->assertTrue($coverage->isDirectoryIncluded('aaa', 0));
+        $coverage->excludes = array('.*a$');
+        $this->assertFalse($coverage->isDirectoryIncluded('aaa', 0));
+    }
+
+    function testFilter() {
+        $coverage = new CodeCoverage();
+        $data = array('a' => 0, 'b' => 0, 'c' => 0);
+        $coverage->includes = array('b');
+        $coverage->filter($data);
+        $this->assertEqual(array('b' => 0), $data);
+    }
+
+    function testUntouchedFiles() {
+        $coverage = new CodeCoverage();
+        $touched = array_flip(array("test/coverage_test.php"));
+        $actual = array();
+        $coverage->includes = array('coverage_test\.php$');
+        $parentDir = realpath(dirname(__FILE__));
+        $coverage->getUntouchedFiles($actual, $touched, $parentDir, $parentDir);
+        $this->assertEqual(array("coverage_test.php"), $actual);
+    }
+
+    function testResetLog() {
+        $coverage = new CodeCoverage();
+        $coverage->log = tempnam(NULL, 'php.xdebug.coverage.test.');
+        $coverage->resetLog();
+        $this->assertTrue(file_exists($coverage->log));
+    }
+
+    function testSettingsSerialization() {
+        $coverage = new CodeCoverage();
+        $coverage->log = '/banana/boat';
+        $coverage->includes = array('apple', 'orange');
+        $coverage->excludes = array('tomato', 'pea');
+        $data = $coverage->getSettings();
+        $this->assertNotNull($data);
+
+        $actual = new CodeCoverage();
+        $actual->setSettings($data);
+        $this->assertEqual('/banana/boat', $actual->log);
+        $this->assertEqual(array('apple', 'orange'), $actual->includes);
+        $this->assertEqual(array('tomato', 'pea'), $actual->excludes);
+    }
+
+    function testSettingsCanBeReadWrittenToDisk() {
+        $settings_file = 'banana-boat-coverage-settings-test.dat';
+        $coverage = new CodeCoverage();
+        $coverage->log = '/banana/boat';
+        $coverage->settingsFile = $settings_file;
+        $coverage->writeSettings();
+
+        $actual = new CodeCoverage();
+        $actual->settingsFile = $settings_file;
+        $actual->readSettings();
+        $this->assertEqual('/banana/boat', $actual->log);
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/extensions/coverage/test/coverage_utils_test.php b/3rdparty/simpletest/extensions/coverage/test/coverage_utils_test.php
new file mode 100644
index 0000000000..b900c5d2c4
--- /dev/null
+++ b/3rdparty/simpletest/extensions/coverage/test/coverage_utils_test.php
@@ -0,0 +1,70 @@
+<?php
+require_once dirname(__FILE__) . '/../../../autorun.php';
+
+class CoverageUtilsTest extends UnitTestCase {
+    function skip() {
+        $this->skipIf(
+        		!file_exists('DB/sqlite.php'),
+                'The Coverage extension needs to have PEAR installed');
+    }
+	
+	function setUp() {
+    	require_once dirname(__FILE__) .'/../coverage_utils.php';
+	}
+	
+    function testMkdir() {
+        CoverageUtils::mkdir(dirname(__FILE__));
+        try {
+            CoverageUtils::mkdir(__FILE__);
+            $this->fail("Should give error about cannot create dir of a file");
+        } catch (Exception $expected) {
+        }
+    }
+
+    function testIsPackageClassAvailable() {
+        $coverageSource = dirname(__FILE__) .'/../coverage_calculator.php';
+        $this->assertTrue(CoverageUtils::isPackageClassAvailable($coverageSource, 'CoverageCalculator'));
+        $this->assertFalse(CoverageUtils::isPackageClassAvailable($coverageSource, 'BogusCoverage'));
+        $this->assertFalse(CoverageUtils::isPackageClassAvailable('bogus-file', 'BogusCoverage'));
+        $this->assertTrue(CoverageUtils::isPackageClassAvailable('bogus-file', 'CoverageUtils'));
+    }
+
+    function testParseArgumentsMultiValue() {
+        $actual = CoverageUtils::parseArguments(array('scriptname', '--a=b', '--a=c'), True);
+        $expected = array('extraArguments' => array(), 'a' => 'c', 'a[]' => array('b', 'c'));
+        $this->assertEqual($expected, $actual);
+    }
+
+    function testParseArguments() {
+        $actual = CoverageUtils::parseArguments(array('scriptname', '--a=b', '-c', 'xxx'));
+        $expected = array('a' => 'b', 'c' => '', 'extraArguments' => array('xxx'));
+        $this->assertEqual($expected, $actual);
+    }
+
+    function testParseDoubleDashNoArguments() {
+        $actual = CoverageUtils::parseArguments(array('scriptname', '--aa'));
+        $this->assertTrue(isset($actual['aa']));
+    }
+
+    function testParseHyphenedExtraArguments() {
+        $actual = CoverageUtils::parseArguments(array('scriptname', '--alpha-beta=b', 'gamma-lambda'));
+        $expected = array('alpha-beta' => 'b', 'extraArguments' => array('gamma-lambda'));
+        $this->assertEqual($expected, $actual);
+    }
+
+    function testAddItemAsArray() {
+        $actual = array();
+        CoverageUtils::addItemAsArray($actual, 'bird', 'duck');
+        $this->assertEqual(array('bird[]' => array('duck')), $actual);
+
+        CoverageUtils::addItemAsArray(&$actual, 'bird', 'pigeon');
+        $this->assertEqual(array('bird[]' => array('duck', 'pigeon')), $actual);
+    }
+
+    function testIssetOr() {
+        $data = array('bird' => 'gull');
+        $this->assertEqual('lab', CoverageUtils::issetOr($data['dog'], 'lab'));
+        $this->assertEqual('gull', CoverageUtils::issetOr($data['bird'], 'sparrow'));
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/extensions/coverage/test/sample/code.php b/3rdparty/simpletest/extensions/coverage/test/sample/code.php
new file mode 100644
index 0000000000..a2438f4bee
--- /dev/null
+++ b/3rdparty/simpletest/extensions/coverage/test/sample/code.php
@@ -0,0 +1,4 @@
+<?php
+// sample code
+$x = 1 + 2;
+if (false) echo "dead";
\ No newline at end of file
diff --git a/3rdparty/simpletest/extensions/coverage/test/simple_coverage_writer_test.php b/3rdparty/simpletest/extensions/coverage/test/simple_coverage_writer_test.php
new file mode 100644
index 0000000000..2c9f9abc18
--- /dev/null
+++ b/3rdparty/simpletest/extensions/coverage/test/simple_coverage_writer_test.php
@@ -0,0 +1,69 @@
+<?php
+require_once(dirname(__FILE__) . '/../../../autorun.php');
+
+class SimpleCoverageWriterTest extends UnitTestCase {
+	function skip() {
+        $this->skipIf(
+        		!file_exists('DB/sqlite.php'),
+                'The Coverage extension needs to have PEAR installed');
+    }
+		
+	function setUp() {
+		require_once dirname(__FILE__) .'/../simple_coverage_writer.php';
+		require_once dirname(__FILE__) .'/../coverage_calculator.php';
+		
+	}
+
+	function testGenerateSummaryReport() {
+        $writer = new SimpleCoverageWriter();
+        $coverage = array('file' => array(0, 1));
+        $untouched = array('missed-file');
+        $calc = new CoverageCalculator();
+        $variables = $calc->variables($coverage, $untouched);
+        $variables['title'] = 'coverage';
+        $out = fopen("php://memory", 'w');
+        $writer->writeSummary($out, $variables);
+        $dom = self::dom($out);
+        $totalPercentCoverage = $dom->elements->xpath("//span[@class='totalPercentCoverage']");
+        $this->assertEqual('50%', (string)$totalPercentCoverage[0]);
+
+        $fileLinks = $dom->elements->xpath("//a[@class='byFileReportLink']");
+        $fileLinkAttr = $fileLinks[0]->attributes();
+        $this->assertEqual('file.html', $fileLinkAttr['href']);
+        $this->assertEqual('file', (string)($fileLinks[0]));
+
+        $untouchedFile = $dom->elements->xpath("//span[@class='untouchedFile']");
+        $this->assertEqual('missed-file', (string)$untouchedFile[0]);
+    }
+
+    function testGenerateCoverageByFile() {
+        $writer = new SimpleCoverageWriter();
+        $cov = array(3 => 1, 4 => -2); // 2 comments, 1 code, 1 dead  (1-based indexes)
+        $out = fopen("php://memory", 'w');
+        $file = dirname(__FILE__) .'/sample/code.php';
+        $calc = new CoverageCalculator();
+        $variables = $calc->coverageByFileVariables($file, $cov);
+        $variables['title'] = 'coverage';
+        $writer->writeByFile($out, $variables);
+        $dom = self::dom($out);
+
+        $cells = $dom->elements->xpath("//table[@id='code']/tbody/tr/td/span");
+        $this->assertEqual("comment code", self::getAttribute($cells[1], 'class'));
+        $this->assertEqual("comment code", self::getAttribute($cells[3], 'class'));
+        $this->assertEqual("covered code", self::getAttribute($cells[5], 'class'));
+        $this->assertEqual("dead code", self::getAttribute($cells[7], 'class'));
+    }
+
+    static function getAttribute($element, $attribute) {
+        $a = $element->attributes();
+        return $a[$attribute];
+    }
+
+    static function dom($stream) {
+        rewind($stream);
+        $actual = stream_get_contents($stream);
+        $html = DOMDocument::loadHTML($actual);
+        return simplexml_import_dom($html);
+    }
+}
+?>
\ No newline at end of file
diff --git a/3rdparty/simpletest/extensions/coverage/test/test.php b/3rdparty/simpletest/extensions/coverage/test/test.php
new file mode 100644
index 0000000000..0af4dbf3e7
--- /dev/null
+++ b/3rdparty/simpletest/extensions/coverage/test/test.php
@@ -0,0 +1,14 @@
+<?php
+// $Id: $
+require_once(dirname(__FILE__) . '/../../../autorun.php');
+
+class CoverageUnitTests extends TestSuite {
+    function CoverageUnitTests() {
+        $this->TestSuite('Coverage Unit tests');
+        $path = dirname(__FILE__) . '/*_test.php';
+        foreach(glob($path) as $test) {
+            $this->addFile($test);
+        }
+    }
+}
+?>
\ No newline at end of file

From bcacf16ba7f803e19293f175bd9b3baf7d3e7bb1 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@statuscode.ch>
Date: Sun, 26 Aug 2012 02:39:42 +0300
Subject: [PATCH 0908/1224] Gitorious => Github

---
 themes/README | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/themes/README b/themes/README
index e348f86a12..4025bc8970 100644
--- a/themes/README
+++ b/themes/README
@@ -2,6 +2,6 @@ This is the themes folder. Themes can be used to customize the look and feel of
 Themes can be placed in this folder with the name of the theme as foldername. The theme can be activated by putting 
 "theme" => 'themename', into the config.php file.
 The folder structure of a theme is exactly the same as the main ownCloud structure. You can override js files and templates with own versions. css files are loaded additionaly to the default files so you can override css properties.
-Themes should be developed here: https://gitorious.org/owncloud/themes
+Themes should be developed here: https://github.com/owncloud/themes
 You can also find a super simple example there
 

From a1a38622747dee803a56df6dea33d47e1cc3907a Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <thomas.mueller@tmit.eu>
Date: Sun, 26 Aug 2012 02:02:48 +0200
Subject: [PATCH 0909/1224] [tx-robot] updated from transifex

---
 apps/files_texteditor/l10n/de.php         |  8 +++++
 apps/impress/l10n/de.php                  |  3 ++
 core/l10n/de.php                          |  1 +
 l10n/de/core.po                           | 37 +++++++++++++----------
 l10n/de/files_texteditor.po               | 19 ++++++------
 l10n/de/impress.po                        |  9 +++---
 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_texteditor.pot       |  2 +-
 l10n/templates/files_versions.pot         |  2 +-
 l10n/templates/gallery.pot                |  2 +-
 l10n/templates/impress.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 +-
 27 files changed, 69 insertions(+), 50 deletions(-)
 create mode 100644 apps/files_texteditor/l10n/de.php
 create mode 100644 apps/impress/l10n/de.php

diff --git a/apps/files_texteditor/l10n/de.php b/apps/files_texteditor/l10n/de.php
new file mode 100644
index 0000000000..b74f67d822
--- /dev/null
+++ b/apps/files_texteditor/l10n/de.php
@@ -0,0 +1,8 @@
+<?php $TRANSLATIONS = array(
+"regex" => "Regulärer Ausdruck",
+"Save" => "Speichern",
+"Close" => "Schliessen",
+"Saving..." => "Speichern...",
+"An error occurred!" => "Ein Fehler ist aufgetreten",
+"There were unsaved changes, click here to go back" => "Einige Änderungen wurde noch nicht gespeichert; klicken Sie hier um zurückzukehren."
+);
diff --git a/apps/impress/l10n/de.php b/apps/impress/l10n/de.php
new file mode 100644
index 0000000000..5d0fa34631
--- /dev/null
+++ b/apps/impress/l10n/de.php
@@ -0,0 +1,3 @@
+<?php $TRANSLATIONS = array(
+"Documentation" => "Dokumentation"
+);
diff --git a/core/l10n/de.php b/core/l10n/de.php
index 9ed2d61782..74ad8cc8f6 100644
--- a/core/l10n/de.php
+++ b/core/l10n/de.php
@@ -51,6 +51,7 @@
 "Database user" => "Datenbank-Benutzer",
 "Database password" => "Datenbank-Passwort",
 "Database name" => "Datenbank-Name",
+"Database tablespace" => "Tablespace der Datenbank",
 "Database host" => "Datenbank-Host",
 "Finish setup" => "Installation abschließen",
 "web services under your control" => "Web-Services unter Ihrer Kontrolle",
diff --git a/l10n/de/core.po b/l10n/de/core.po
index fc4db2d98b..7883db2446 100644
--- a/l10n/de/core.po
+++ b/l10n/de/core.po
@@ -6,6 +6,7 @@
 #   <admin@s-goecker.de>, 2011, 2012.
 #   <alex.hotz@gmail.com>, 2011.
 #   <georg.stefan.germany@googlemail.com>, 2011.
+# I Robot <thomas.mueller@tmit.eu>, 2012.
 # Jan-Christoph Borchardt <JanCBorchardt@fsfe.org>, 2011.
 # Marcel Kühlhorn <susefan93@gmx.de>, 2012.
 #   <m.fresel@sysangels.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-24 02:02+0200\n"
-"PO-Revision-Date: 2012-08-23 20:44+0000\n"
-"Last-Translator: JamFX <niko@nik-o-mat.de>\n"
+"POT-Creation-Date: 2012-08-26 02:01+0200\n"
+"PO-Revision-Date: 2012-08-25 23:28+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"
@@ -139,7 +140,7 @@ msgstr "Angefragt"
 msgid "Login failed!"
 msgstr "Login fehlgeschlagen!"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:26
 #: templates/login.php:9
 msgid "Username"
 msgstr "Benutzername"
@@ -200,48 +201,52 @@ msgstr "Kategorien bearbeiten"
 msgid "Add"
 msgstr "Hinzufügen"
 
-#: templates/installation.php:23
+#: templates/installation.php:24
 msgid "Create an <strong>admin account</strong>"
 msgstr "<strong>Administrator-Konto</strong> anlegen"
 
-#: templates/installation.php:29 templates/login.php:13
+#: templates/installation.php:30 templates/login.php:13
 msgid "Password"
 msgstr "Passwort"
 
-#: templates/installation.php:35
+#: templates/installation.php:36
 msgid "Advanced"
 msgstr "Erweitert"
 
-#: templates/installation.php:37
+#: templates/installation.php:38
 msgid "Data folder"
 msgstr "Datenverzeichnis"
 
-#: templates/installation.php:44
+#: templates/installation.php:45
 msgid "Configure the database"
 msgstr "Datenbank einrichten"
 
-#: templates/installation.php:49 templates/installation.php:60
-#: templates/installation.php:70
+#: templates/installation.php:50 templates/installation.php:61
+#: templates/installation.php:71 templates/installation.php:81
 msgid "will be used"
 msgstr "wird genutzt"
 
-#: templates/installation.php:82
+#: templates/installation.php:93
 msgid "Database user"
 msgstr "Datenbank-Benutzer"
 
-#: templates/installation.php:86
+#: templates/installation.php:97
 msgid "Database password"
 msgstr "Datenbank-Passwort"
 
-#: templates/installation.php:90
+#: templates/installation.php:101
 msgid "Database name"
 msgstr "Datenbank-Name"
 
-#: templates/installation.php:96
+#: templates/installation.php:109
+msgid "Database tablespace"
+msgstr "Tablespace der Datenbank"
+
+#: templates/installation.php:115
 msgid "Database host"
 msgstr "Datenbank-Host"
 
-#: templates/installation.php:101
+#: templates/installation.php:120
 msgid "Finish setup"
 msgstr "Installation abschließen"
 
diff --git a/l10n/de/files_texteditor.po b/l10n/de/files_texteditor.po
index dfddc7a7da..ec62682751 100644
--- a/l10n/de/files_texteditor.po
+++ b/l10n/de/files_texteditor.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# I Robot <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-26 01:17+0200\n"
-"PO-Revision-Date: 2012-08-25 23:18+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-26 02:01+0200\n"
+"PO-Revision-Date: 2012-08-25 23:26+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"
@@ -21,24 +22,24 @@ msgstr ""
 #: js/aceeditor/mode-liquid-uncompressed.js:902
 #: js/aceeditor/mode-svg-uncompressed.js:1575
 msgid "regex"
-msgstr ""
+msgstr "Regulärer Ausdruck"
 
 #: js/editor.js:72 js/editor.js:156 js/editor.js:163
 msgid "Save"
-msgstr ""
+msgstr "Speichern"
 
 #: js/editor.js:74
 msgid "Close"
-msgstr ""
+msgstr "Schliessen"
 
 #: js/editor.js:149
 msgid "Saving..."
-msgstr ""
+msgstr "Speichern..."
 
 #: js/editor.js:239
 msgid "An error occurred!"
-msgstr ""
+msgstr "Ein Fehler ist aufgetreten"
 
 #: js/editor.js:266
 msgid "There were unsaved changes, click here to go back"
-msgstr ""
+msgstr "Einige Änderungen wurde noch nicht gespeichert; klicken Sie hier um zurückzukehren."
diff --git a/l10n/de/impress.po b/l10n/de/impress.po
index a997ed86f7..bdf9e101c8 100644
--- a/l10n/de/impress.po
+++ b/l10n/de/impress.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# I Robot <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-26 01:17+0200\n"
-"PO-Revision-Date: 2012-08-25 23:18+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-26 02:01+0200\n"
+"PO-Revision-Date: 2012-08-25 23:27+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,4 +20,4 @@ msgstr ""
 
 #: templates/presentations.php:7
 msgid "Documentation"
-msgstr ""
+msgstr "Dokumentation"
diff --git a/l10n/templates/admin_dependencies_chk.pot b/l10n/templates/admin_dependencies_chk.pot
index 9fb39d6a9a..2a88c24502 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-26 01:17+0200\n"
+"POT-Creation-Date: 2012-08-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/admin_migrate.pot b/l10n/templates/admin_migrate.pot
index f7b84f90b0..03c9d4d221 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-26 01:17+0200\n"
+"POT-Creation-Date: 2012-08-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/bookmarks.pot b/l10n/templates/bookmarks.pot
index 024d1b694d..7471ca2a06 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-26 01:17+0200\n"
+"POT-Creation-Date: 2012-08-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 94b30636ca..ca06e79598 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-26 01:17+0200\n"
+"POT-Creation-Date: 2012-08-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 7e00f7f414..420c3194c9 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-26 01:17+0200\n"
+"POT-Creation-Date: 2012-08-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 16dca1458b..4b4ca2baf0 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-26 01:17+0200\n"
+"POT-Creation-Date: 2012-08-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 c90bf2481f..0ded59b24f 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-26 01:17+0200\n"
+"POT-Creation-Date: 2012-08-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_encryption.pot b/l10n/templates/files_encryption.pot
index db83856d91..a72e3ece33 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-26 01:17+0200\n"
+"POT-Creation-Date: 2012-08-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_external.pot b/l10n/templates/files_external.pot
index f6147ec37d..ec3427404c 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-26 01:17+0200\n"
+"POT-Creation-Date: 2012-08-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_sharing.pot b/l10n/templates/files_sharing.pot
index 07dd1dbc07..7cef8d0dd3 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-26 01:17+0200\n"
+"POT-Creation-Date: 2012-08-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_texteditor.pot b/l10n/templates/files_texteditor.pot
index c2ea5de8b1..dabf64400a 100644
--- a/l10n/templates/files_texteditor.pot
+++ b/l10n/templates/files_texteditor.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"POT-Creation-Date: 2012-08-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_versions.pot b/l10n/templates/files_versions.pot
index d54760c941..5be07d6743 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-26 01:17+0200\n"
+"POT-Creation-Date: 2012-08-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 c0bb60f921..a33505d687 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-26 01:17+0200\n"
+"POT-Creation-Date: 2012-08-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/impress.pot b/l10n/templates/impress.pot
index cfe2f9dae7..80ed0959cc 100644
--- a/l10n/templates/impress.pot
+++ b/l10n/templates/impress.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-26 01:17+0200\n"
+"POT-Creation-Date: 2012-08-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/lib.pot b/l10n/templates/lib.pot
index 6d4a022d6f..5ec04ba8b8 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-26 01:17+0200\n"
+"POT-Creation-Date: 2012-08-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 476d2d91c5..2880656ce2 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-26 01:17+0200\n"
+"POT-Creation-Date: 2012-08-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 7844ae4fea..af0973d40f 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-26 01:17+0200\n"
+"POT-Creation-Date: 2012-08-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/tasks.pot b/l10n/templates/tasks.pot
index c39abd9c05..f6d7cc5b28 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-26 01:17+0200\n"
+"POT-Creation-Date: 2012-08-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/user_ldap.pot b/l10n/templates/user_ldap.pot
index 77002694b3..7ad9d445b4 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-26 01:17+0200\n"
+"POT-Creation-Date: 2012-08-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/user_migrate.pot b/l10n/templates/user_migrate.pot
index 2f6547b44f..d31d34365d 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-26 01:17+0200\n"
+"POT-Creation-Date: 2012-08-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/user_openid.pot b/l10n/templates/user_openid.pot
index 31a513880e..d40005630b 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-26 01:17+0200\n"
+"POT-Creation-Date: 2012-08-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"

From 8e090d8f67c9a4a641b3e3750d8ebe76e2cd9465 Mon Sep 17 00:00:00 2001
From: Thomas Mueller <thomas.mueller@tmit.eu>
Date: Sun, 26 Aug 2012 02:05:28 +0200
Subject: [PATCH 0910/1224] added translation for odfviewer

---
 apps/files_odfviewer/js/viewer.js    |  2 +-
 apps/files_odfviewer/l10n/ignorelist |  8 ++++++++
 l10n/.tx/config                      |  6 ++++++
 l10n/templates/files_odfviewer.pot   | 22 ++++++++++++++++++++++
 4 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 apps/files_odfviewer/l10n/ignorelist
 create mode 100644 l10n/templates/files_odfviewer.pot

diff --git a/apps/files_odfviewer/js/viewer.js b/apps/files_odfviewer/js/viewer.js
index 586da12687..9455a9a0a0 100644
--- a/apps/files_odfviewer/js/viewer.js
+++ b/apps/files_odfviewer/js/viewer.js
@@ -6,7 +6,7 @@ function viewOdf(dir, file) {
 		// odf action toolbar
 		var odfToolbarHtml = 
 			'<div id="odf-toolbar">' +
-			'<input type="button" id="odf_close" value="Close">' +
+			'<input type="button" id="odf_close">'+t('files_odfviewer','Close')+
 			'</div>';
 		$('#controls').append(odfToolbarHtml);
 
diff --git a/apps/files_odfviewer/l10n/ignorelist b/apps/files_odfviewer/l10n/ignorelist
new file mode 100644
index 0000000000..96ae631a0d
--- /dev/null
+++ b/apps/files_odfviewer/l10n/ignorelist
@@ -0,0 +1,8 @@
+src/webodf/webodf/tests/core/Base64Tests.js
+src/webodf/webodf/tests/core/CursorTests.js
+src/webodf/webodf/tests/gui/CaretTests.js
+src/webodf/webodf/tests/gui/SelectionMoverTests.js
+src/webodf/webodf/tests/core/PointWalkerTests.js
+src/webodf/webodf/tests/core/ZipTests.js
+src/webodf/webodf/tests/xmldom/XPathTests.js
+src/webodf/webodf/tests/core/RuntimeTests.js
diff --git a/l10n/.tx/config b/l10n/.tx/config
index 25c20cb8e7..325eb151d6 100644
--- a/l10n/.tx/config
+++ b/l10n/.tx/config
@@ -120,3 +120,9 @@ source_file = templates/impress.pot
 source_lang = en
 type = PO
 
+[owncloud.impress]
+file_filter = <lang>/files_odfviewer.po
+source_file = templates/files_odfviewer.pot
+source_lang = en
+type = PO
+
diff --git a/l10n/templates/files_odfviewer.pot b/l10n/templates/files_odfviewer.pot
new file mode 100644
index 0000000000..ed33729108
--- /dev/null
+++ b/l10n/templates/files_odfviewer.pot
@@ -0,0 +1,22 @@
+# 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-26 01:49+0200\n"
+"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/viewer.js:9
+msgid "Close"
+msgstr ""

From ad66d6d5e9b1e8c8fa2f29197a72ead63f83fbc8 Mon Sep 17 00:00:00 2001
From: Thomas Mueller <thomas.mueller@tmit.eu>
Date: Sun, 26 Aug 2012 02:14:56 +0200
Subject: [PATCH 0911/1224] translation support for pdfviewer

---
 apps/files_pdfviewer/js/viewer.js  | 15 ++++++++---
 apps/files_pdfviewer/l10n/.gitkeep |  0
 l10n/.tx/config                    |  8 +++++-
 l10n/templates/files_pdfviewer.pot | 42 ++++++++++++++++++++++++++++++
 4 files changed, 61 insertions(+), 4 deletions(-)
 create mode 100644 apps/files_pdfviewer/l10n/.gitkeep
 create mode 100644 l10n/templates/files_pdfviewer.pot

diff --git a/apps/files_pdfviewer/js/viewer.js b/apps/files_pdfviewer/js/viewer.js
index 29db2ea7f2..4f9cc1a0d4 100644
--- a/apps/files_pdfviewer/js/viewer.js
+++ b/apps/files_pdfviewer/js/viewer.js
@@ -18,9 +18,18 @@ function showPDFviewer(dir,filename){
 		function im(path) { return OC.filePath('files_pdfviewer','js','pdfjs/web/images/'+path); }
 		showPDFviewer.oldcode = $("#controls").html();
 		$("#controls").empty();
-		$("#controls").html('<button id="previous" onclick="PDFView.page--;" oncontextmenu="return false;"><img src="'+im('go-up.svg')+'" align="top" height="10"/>Previous</button><button id="next" onclick="PDFView.page++;" oncontextmenu="return false;"><img src="'+im('go-down.svg')+'" align="top" height="10"/>Next</button><div class="separator"></div><input style="width:25px;" type="number" id="pageNumber" onchange="PDFView.page = this.value;" value="1" size="4" min="1" /><span>/</span><span id="numPages">--</span><div class="separator"></div><button id="zoomOut" title="Zoom Out" onclick="PDFView.zoomOut();" oncontextmenu="return false;"><img src="'+im('zoom-out.svg')+'" align="top" height="10"/></button><button id="zoomIn" title="Zoom In" onclick="PDFView.zoomIn();" oncontextmenu="return false;"><img src="'+im('zoom-in.svg')+
-			'" align="top" height="10"/></button><div class="separator"></div><select id="scaleSelect" onchange="PDFView.parseScale(this.value);" oncontextmenu="return false;"><option id="customScaleOption" value="custom"></option><option value="0.5">50%</option><option value="0.75">75%</option><option value="1">100%</option><option value="1.25" selected="selected">125%</option><option value="1.5">150%</option><option value="2">200%</option><option id="pageWidthOption" value="page-width">Page Width</option><option id="pageFitOption" value="page-fit">Page Fit</option></select><div class="separator"></div><button id="print" onclick="window.print();" oncontextmenu="return false;"><img src="'+im('document-print.svg')+'" align="top" height="10"/>Print</button><button id="download" title="Download" onclick="PDFView.download();" oncontextmenu="return false;">'+
-			'<img src="'+im('download.svg')+'" align="top" height="10"/>Download</button><button id="close" title="Close viewer" onclick="hidePDFviewer();" oncontextmenu="return false;">x</button><span id="info">--</span></div>');
+		$("#controls").html(
+			'<button id="previous" onclick="PDFView.page--;" oncontextmenu="return false;"><img src="'+im('go-up.svg')+'" align="top" height="10"/>'+t('files_odfviewer','Previous')+'</button>'+
+			'<button id="next" onclick="PDFView.page++;" oncontextmenu="return false;"><img src="'+im('go-down.svg')+'" align="top" height="10"/>'+t('files_odfviewer','Next')+'</button>'+
+			'<div class="separator"></div><input style="width:25px;" type="number" id="pageNumber" onchange="PDFView.page = this.value;" value="1" size="4" min="1" /><span>/</span><span id="numPages">--</span><div class="separator"></div>'+
+			'<button id="zoomOut" title="Zoom Out" onclick="PDFView.zoomOut();" oncontextmenu="return false;"><img src="'+im('zoom-out.svg')+'" align="top" height="10"/></button>'+
+			'<button id="zoomIn" title="Zoom In" onclick="PDFView.zoomIn();" oncontextmenu="return false;"><img src="'+im('zoom-in.svg')+ '" align="top" height="10"/></button>'+
+			'<div class="separator"></div><select id="scaleSelect" onchange="PDFView.parseScale(this.value);" oncontextmenu="return false;"><option id="customScaleOption" value="custom"></option>'+
+			'<option value="0.5">50%</option><option value="0.75">75%</option><option value="1">100%</option><option value="1.25" selected="selected">125%</option><option value="1.5">150%</option><option value="2">200%</option>'+
+			'<option id="pageWidthOption" value="page-width">'+t('files_odfviewer', 'Page Width')+'</option><option id="pageFitOption" value="page-fit">'+t('files_odfviewer', 'Page Fit')+'</option></select>'+
+			'<div class="separator"></div><button id="print" onclick="window.print();" oncontextmenu="return false;"><img src="'+im('document-print.svg')+'" align="top" height="10"/>'+t('files_odfviewer', 'Print')+'</button>'+
+			'<button id="download" title="Download" onclick="PDFView.download();" oncontextmenu="return false;">'+
+			'<img src="'+im('download.svg')+'" align="top" height="10"/>'+t('files_odfviewer', 'Download')+'</button><button id="close" title="Close viewer" onclick="hidePDFviewer();" oncontextmenu="return false;">x</button><span id="info">--</span></div>');
 		var oldcontent = $("#content").html();
 		$("#content").html(oldcontent+'<div id="loading">Loading... 0%</div><div id="viewer"></div>');
 		showPDFviewer.lastTitle = document.title;
diff --git a/apps/files_pdfviewer/l10n/.gitkeep b/apps/files_pdfviewer/l10n/.gitkeep
new file mode 100644
index 0000000000..e69de29bb2
diff --git a/l10n/.tx/config b/l10n/.tx/config
index 325eb151d6..79a2a733f8 100644
--- a/l10n/.tx/config
+++ b/l10n/.tx/config
@@ -120,9 +120,15 @@ source_file = templates/impress.pot
 source_lang = en
 type = PO
 
-[owncloud.impress]
+[owncloud.files_odfviewer]
 file_filter = <lang>/files_odfviewer.po
 source_file = templates/files_odfviewer.pot
 source_lang = en
 type = PO
 
+[owncloud.files_pdfviewer]
+file_filter = <lang>/files_pdfviewer.po
+source_file = templates/files_pdfviewer.pot
+source_lang = en
+type = PO
+
diff --git a/l10n/templates/files_pdfviewer.pot b/l10n/templates/files_pdfviewer.pot
new file mode 100644
index 0000000000..2d3ec3d324
--- /dev/null
+++ b/l10n/templates/files_pdfviewer.pot
@@ -0,0 +1,42 @@
+# 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-26 02: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"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: js/viewer.js:22
+msgid "Previous"
+msgstr ""
+
+#: js/viewer.js:23
+msgid "Next"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Width"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Fit"
+msgstr ""
+
+#: js/viewer.js:30
+msgid "Print"
+msgstr ""
+
+#: js/viewer.js:32
+msgid "Download"
+msgstr ""

From 922982f0704bf4b088f8582c530ee52ff6c4c758 Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <thomas.mueller@tmit.eu>
Date: Sun, 26 Aug 2012 02:22:02 +0200
Subject: [PATCH 0912/1224] [tx-robot] updated from transifex

---
 apps/files_odfviewer/l10n/de.php          |  3 ++
 apps/files_pdfviewer/l10n/de.php          |  4 +++
 l10n/af/files_odfviewer.po                | 22 ++++++++++++
 l10n/af/files_pdfviewer.po                | 42 ++++++++++++++++++++++
 l10n/ar/files_odfviewer.po                | 22 ++++++++++++
 l10n/ar/files_pdfviewer.po                | 42 ++++++++++++++++++++++
 l10n/ar_SA/files_odfviewer.po             | 22 ++++++++++++
 l10n/ar_SA/files_pdfviewer.po             | 42 ++++++++++++++++++++++
 l10n/bg_BG/files_odfviewer.po             | 22 ++++++++++++
 l10n/bg_BG/files_pdfviewer.po             | 42 ++++++++++++++++++++++
 l10n/ca/files_odfviewer.po                | 22 ++++++++++++
 l10n/ca/files_pdfviewer.po                | 42 ++++++++++++++++++++++
 l10n/cs_CZ/files_odfviewer.po             | 22 ++++++++++++
 l10n/cs_CZ/files_pdfviewer.po             | 42 ++++++++++++++++++++++
 l10n/da/files_odfviewer.po                | 22 ++++++++++++
 l10n/da/files_pdfviewer.po                | 42 ++++++++++++++++++++++
 l10n/de/files_odfviewer.po                | 23 ++++++++++++
 l10n/de/files_pdfviewer.po                | 43 +++++++++++++++++++++++
 l10n/el/files_odfviewer.po                | 22 ++++++++++++
 l10n/el/files_pdfviewer.po                | 42 ++++++++++++++++++++++
 l10n/eo/files_odfviewer.po                | 22 ++++++++++++
 l10n/eo/files_pdfviewer.po                | 42 ++++++++++++++++++++++
 l10n/es/files_odfviewer.po                | 22 ++++++++++++
 l10n/es/files_pdfviewer.po                | 42 ++++++++++++++++++++++
 l10n/et_EE/files_odfviewer.po             | 22 ++++++++++++
 l10n/et_EE/files_pdfviewer.po             | 42 ++++++++++++++++++++++
 l10n/eu/files_odfviewer.po                | 22 ++++++++++++
 l10n/eu/files_pdfviewer.po                | 42 ++++++++++++++++++++++
 l10n/eu_ES/files_odfviewer.po             | 22 ++++++++++++
 l10n/eu_ES/files_pdfviewer.po             | 42 ++++++++++++++++++++++
 l10n/fa/files_odfviewer.po                | 22 ++++++++++++
 l10n/fa/files_pdfviewer.po                | 42 ++++++++++++++++++++++
 l10n/fi/files_odfviewer.po                | 22 ++++++++++++
 l10n/fi/files_pdfviewer.po                | 42 ++++++++++++++++++++++
 l10n/fi_FI/files_odfviewer.po             | 22 ++++++++++++
 l10n/fi_FI/files_pdfviewer.po             | 42 ++++++++++++++++++++++
 l10n/fr/files_odfviewer.po                | 22 ++++++++++++
 l10n/fr/files_pdfviewer.po                | 42 ++++++++++++++++++++++
 l10n/gl/files_odfviewer.po                | 22 ++++++++++++
 l10n/gl/files_pdfviewer.po                | 42 ++++++++++++++++++++++
 l10n/he/files_odfviewer.po                | 22 ++++++++++++
 l10n/he/files_pdfviewer.po                | 42 ++++++++++++++++++++++
 l10n/hr/files_odfviewer.po                | 22 ++++++++++++
 l10n/hr/files_pdfviewer.po                | 42 ++++++++++++++++++++++
 l10n/hu_HU/files_odfviewer.po             | 22 ++++++++++++
 l10n/hu_HU/files_pdfviewer.po             | 42 ++++++++++++++++++++++
 l10n/hy/files_odfviewer.po                | 22 ++++++++++++
 l10n/hy/files_pdfviewer.po                | 42 ++++++++++++++++++++++
 l10n/ia/files_odfviewer.po                | 22 ++++++++++++
 l10n/ia/files_pdfviewer.po                | 42 ++++++++++++++++++++++
 l10n/id/files_odfviewer.po                | 22 ++++++++++++
 l10n/id/files_pdfviewer.po                | 42 ++++++++++++++++++++++
 l10n/id_ID/files_odfviewer.po             | 22 ++++++++++++
 l10n/id_ID/files_pdfviewer.po             | 42 ++++++++++++++++++++++
 l10n/it/files_odfviewer.po                | 22 ++++++++++++
 l10n/it/files_pdfviewer.po                | 42 ++++++++++++++++++++++
 l10n/ja_JP/files_odfviewer.po             | 22 ++++++++++++
 l10n/ja_JP/files_pdfviewer.po             | 42 ++++++++++++++++++++++
 l10n/ko/files_odfviewer.po                | 22 ++++++++++++
 l10n/ko/files_pdfviewer.po                | 42 ++++++++++++++++++++++
 l10n/lb/files_odfviewer.po                | 22 ++++++++++++
 l10n/lb/files_pdfviewer.po                | 42 ++++++++++++++++++++++
 l10n/lt_LT/files_odfviewer.po             | 22 ++++++++++++
 l10n/lt_LT/files_pdfviewer.po             | 42 ++++++++++++++++++++++
 l10n/lv/files_odfviewer.po                | 22 ++++++++++++
 l10n/lv/files_pdfviewer.po                | 42 ++++++++++++++++++++++
 l10n/mk/files_odfviewer.po                | 22 ++++++++++++
 l10n/mk/files_pdfviewer.po                | 42 ++++++++++++++++++++++
 l10n/ms_MY/files_odfviewer.po             | 22 ++++++++++++
 l10n/ms_MY/files_pdfviewer.po             | 42 ++++++++++++++++++++++
 l10n/nb_NO/files_odfviewer.po             | 22 ++++++++++++
 l10n/nb_NO/files_pdfviewer.po             | 42 ++++++++++++++++++++++
 l10n/nl/files_odfviewer.po                | 22 ++++++++++++
 l10n/nl/files_pdfviewer.po                | 42 ++++++++++++++++++++++
 l10n/nn_NO/files_odfviewer.po             | 22 ++++++++++++
 l10n/nn_NO/files_pdfviewer.po             | 42 ++++++++++++++++++++++
 l10n/pl/files_odfviewer.po                | 22 ++++++++++++
 l10n/pl/files_pdfviewer.po                | 42 ++++++++++++++++++++++
 l10n/pt_BR/files_odfviewer.po             | 22 ++++++++++++
 l10n/pt_BR/files_pdfviewer.po             | 42 ++++++++++++++++++++++
 l10n/pt_PT/files_odfviewer.po             | 22 ++++++++++++
 l10n/pt_PT/files_pdfviewer.po             | 42 ++++++++++++++++++++++
 l10n/ro/files_odfviewer.po                | 22 ++++++++++++
 l10n/ro/files_pdfviewer.po                | 42 ++++++++++++++++++++++
 l10n/ru/files_odfviewer.po                | 22 ++++++++++++
 l10n/ru/files_pdfviewer.po                | 42 ++++++++++++++++++++++
 l10n/sk_SK/files_odfviewer.po             | 22 ++++++++++++
 l10n/sk_SK/files_pdfviewer.po             | 42 ++++++++++++++++++++++
 l10n/sl/files_odfviewer.po                | 22 ++++++++++++
 l10n/sl/files_pdfviewer.po                | 42 ++++++++++++++++++++++
 l10n/so/files_odfviewer.po                | 22 ++++++++++++
 l10n/so/files_pdfviewer.po                | 42 ++++++++++++++++++++++
 l10n/sr/files_odfviewer.po                | 22 ++++++++++++
 l10n/sr/files_pdfviewer.po                | 42 ++++++++++++++++++++++
 l10n/sr@latin/files_odfviewer.po          | 22 ++++++++++++
 l10n/sr@latin/files_pdfviewer.po          | 42 ++++++++++++++++++++++
 l10n/sv/files_odfviewer.po                | 22 ++++++++++++
 l10n/sv/files_pdfviewer.po                | 42 ++++++++++++++++++++++
 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_odfviewer.pot        |  2 +-
 l10n/templates/files_pdfviewer.pot        |  2 +-
 l10n/templates/files_sharing.pot          |  2 +-
 l10n/templates/files_texteditor.pot       |  2 +-
 l10n/templates/files_versions.pot         |  2 +-
 l10n/templates/gallery.pot                |  2 +-
 l10n/templates/impress.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/files_odfviewer.po             | 22 ++++++++++++
 l10n/th_TH/files_pdfviewer.po             | 42 ++++++++++++++++++++++
 l10n/tr/files_odfviewer.po                | 22 ++++++++++++
 l10n/tr/files_pdfviewer.po                | 42 ++++++++++++++++++++++
 l10n/uk/files_odfviewer.po                | 22 ++++++++++++
 l10n/uk/files_pdfviewer.po                | 42 ++++++++++++++++++++++
 l10n/vi/files_odfviewer.po                | 22 ++++++++++++
 l10n/vi/files_pdfviewer.po                | 42 ++++++++++++++++++++++
 l10n/zh_CN.GB2312/files_odfviewer.po      | 22 ++++++++++++
 l10n/zh_CN.GB2312/files_pdfviewer.po      | 42 ++++++++++++++++++++++
 l10n/zh_CN/files_odfviewer.po             | 22 ++++++++++++
 l10n/zh_CN/files_pdfviewer.po             | 42 ++++++++++++++++++++++
 l10n/zh_TW/files_odfviewer.po             | 22 ++++++++++++
 l10n/zh_TW/files_pdfviewer.po             | 42 ++++++++++++++++++++++
 135 files changed, 3552 insertions(+), 23 deletions(-)
 create mode 100644 apps/files_odfviewer/l10n/de.php
 create mode 100644 apps/files_pdfviewer/l10n/de.php
 create mode 100644 l10n/af/files_odfviewer.po
 create mode 100644 l10n/af/files_pdfviewer.po
 create mode 100644 l10n/ar/files_odfviewer.po
 create mode 100644 l10n/ar/files_pdfviewer.po
 create mode 100644 l10n/ar_SA/files_odfviewer.po
 create mode 100644 l10n/ar_SA/files_pdfviewer.po
 create mode 100644 l10n/bg_BG/files_odfviewer.po
 create mode 100644 l10n/bg_BG/files_pdfviewer.po
 create mode 100644 l10n/ca/files_odfviewer.po
 create mode 100644 l10n/ca/files_pdfviewer.po
 create mode 100644 l10n/cs_CZ/files_odfviewer.po
 create mode 100644 l10n/cs_CZ/files_pdfviewer.po
 create mode 100644 l10n/da/files_odfviewer.po
 create mode 100644 l10n/da/files_pdfviewer.po
 create mode 100644 l10n/de/files_odfviewer.po
 create mode 100644 l10n/de/files_pdfviewer.po
 create mode 100644 l10n/el/files_odfviewer.po
 create mode 100644 l10n/el/files_pdfviewer.po
 create mode 100644 l10n/eo/files_odfviewer.po
 create mode 100644 l10n/eo/files_pdfviewer.po
 create mode 100644 l10n/es/files_odfviewer.po
 create mode 100644 l10n/es/files_pdfviewer.po
 create mode 100644 l10n/et_EE/files_odfviewer.po
 create mode 100644 l10n/et_EE/files_pdfviewer.po
 create mode 100644 l10n/eu/files_odfviewer.po
 create mode 100644 l10n/eu/files_pdfviewer.po
 create mode 100644 l10n/eu_ES/files_odfviewer.po
 create mode 100644 l10n/eu_ES/files_pdfviewer.po
 create mode 100644 l10n/fa/files_odfviewer.po
 create mode 100644 l10n/fa/files_pdfviewer.po
 create mode 100644 l10n/fi/files_odfviewer.po
 create mode 100644 l10n/fi/files_pdfviewer.po
 create mode 100644 l10n/fi_FI/files_odfviewer.po
 create mode 100644 l10n/fi_FI/files_pdfviewer.po
 create mode 100644 l10n/fr/files_odfviewer.po
 create mode 100644 l10n/fr/files_pdfviewer.po
 create mode 100644 l10n/gl/files_odfviewer.po
 create mode 100644 l10n/gl/files_pdfviewer.po
 create mode 100644 l10n/he/files_odfviewer.po
 create mode 100644 l10n/he/files_pdfviewer.po
 create mode 100644 l10n/hr/files_odfviewer.po
 create mode 100644 l10n/hr/files_pdfviewer.po
 create mode 100644 l10n/hu_HU/files_odfviewer.po
 create mode 100644 l10n/hu_HU/files_pdfviewer.po
 create mode 100644 l10n/hy/files_odfviewer.po
 create mode 100644 l10n/hy/files_pdfviewer.po
 create mode 100644 l10n/ia/files_odfviewer.po
 create mode 100644 l10n/ia/files_pdfviewer.po
 create mode 100644 l10n/id/files_odfviewer.po
 create mode 100644 l10n/id/files_pdfviewer.po
 create mode 100644 l10n/id_ID/files_odfviewer.po
 create mode 100644 l10n/id_ID/files_pdfviewer.po
 create mode 100644 l10n/it/files_odfviewer.po
 create mode 100644 l10n/it/files_pdfviewer.po
 create mode 100644 l10n/ja_JP/files_odfviewer.po
 create mode 100644 l10n/ja_JP/files_pdfviewer.po
 create mode 100644 l10n/ko/files_odfviewer.po
 create mode 100644 l10n/ko/files_pdfviewer.po
 create mode 100644 l10n/lb/files_odfviewer.po
 create mode 100644 l10n/lb/files_pdfviewer.po
 create mode 100644 l10n/lt_LT/files_odfviewer.po
 create mode 100644 l10n/lt_LT/files_pdfviewer.po
 create mode 100644 l10n/lv/files_odfviewer.po
 create mode 100644 l10n/lv/files_pdfviewer.po
 create mode 100644 l10n/mk/files_odfviewer.po
 create mode 100644 l10n/mk/files_pdfviewer.po
 create mode 100644 l10n/ms_MY/files_odfviewer.po
 create mode 100644 l10n/ms_MY/files_pdfviewer.po
 create mode 100644 l10n/nb_NO/files_odfviewer.po
 create mode 100644 l10n/nb_NO/files_pdfviewer.po
 create mode 100644 l10n/nl/files_odfviewer.po
 create mode 100644 l10n/nl/files_pdfviewer.po
 create mode 100644 l10n/nn_NO/files_odfviewer.po
 create mode 100644 l10n/nn_NO/files_pdfviewer.po
 create mode 100644 l10n/pl/files_odfviewer.po
 create mode 100644 l10n/pl/files_pdfviewer.po
 create mode 100644 l10n/pt_BR/files_odfviewer.po
 create mode 100644 l10n/pt_BR/files_pdfviewer.po
 create mode 100644 l10n/pt_PT/files_odfviewer.po
 create mode 100644 l10n/pt_PT/files_pdfviewer.po
 create mode 100644 l10n/ro/files_odfviewer.po
 create mode 100644 l10n/ro/files_pdfviewer.po
 create mode 100644 l10n/ru/files_odfviewer.po
 create mode 100644 l10n/ru/files_pdfviewer.po
 create mode 100644 l10n/sk_SK/files_odfviewer.po
 create mode 100644 l10n/sk_SK/files_pdfviewer.po
 create mode 100644 l10n/sl/files_odfviewer.po
 create mode 100644 l10n/sl/files_pdfviewer.po
 create mode 100644 l10n/so/files_odfviewer.po
 create mode 100644 l10n/so/files_pdfviewer.po
 create mode 100644 l10n/sr/files_odfviewer.po
 create mode 100644 l10n/sr/files_pdfviewer.po
 create mode 100644 l10n/sr@latin/files_odfviewer.po
 create mode 100644 l10n/sr@latin/files_pdfviewer.po
 create mode 100644 l10n/sv/files_odfviewer.po
 create mode 100644 l10n/sv/files_pdfviewer.po
 create mode 100644 l10n/th_TH/files_odfviewer.po
 create mode 100644 l10n/th_TH/files_pdfviewer.po
 create mode 100644 l10n/tr/files_odfviewer.po
 create mode 100644 l10n/tr/files_pdfviewer.po
 create mode 100644 l10n/uk/files_odfviewer.po
 create mode 100644 l10n/uk/files_pdfviewer.po
 create mode 100644 l10n/vi/files_odfviewer.po
 create mode 100644 l10n/vi/files_pdfviewer.po
 create mode 100644 l10n/zh_CN.GB2312/files_odfviewer.po
 create mode 100644 l10n/zh_CN.GB2312/files_pdfviewer.po
 create mode 100644 l10n/zh_CN/files_odfviewer.po
 create mode 100644 l10n/zh_CN/files_pdfviewer.po
 create mode 100644 l10n/zh_TW/files_odfviewer.po
 create mode 100644 l10n/zh_TW/files_pdfviewer.po

diff --git a/apps/files_odfviewer/l10n/de.php b/apps/files_odfviewer/l10n/de.php
new file mode 100644
index 0000000000..61059f05d5
--- /dev/null
+++ b/apps/files_odfviewer/l10n/de.php
@@ -0,0 +1,3 @@
+<?php $TRANSLATIONS = array(
+"Close" => "Schliessen"
+);
diff --git a/apps/files_pdfviewer/l10n/de.php b/apps/files_pdfviewer/l10n/de.php
new file mode 100644
index 0000000000..d2d2312ca7
--- /dev/null
+++ b/apps/files_pdfviewer/l10n/de.php
@@ -0,0 +1,4 @@
+<?php $TRANSLATIONS = array(
+"Previous" => "Zurück",
+"Next" => "Weiter"
+);
diff --git a/l10n/af/files_odfviewer.po b/l10n/af/files_odfviewer.po
new file mode 100644
index 0000000000..ec66648874
--- /dev/null
+++ b/l10n/af/files_odfviewer.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+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/viewer.js:9
+msgid "Close"
+msgstr ""
diff --git a/l10n/af/files_pdfviewer.po b/l10n/af/files_pdfviewer.po
new file mode 100644
index 0000000000..142a114dc5
--- /dev/null
+++ b/l10n/af/files_pdfviewer.po
@@ -0,0 +1,42 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+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/viewer.js:22
+msgid "Previous"
+msgstr ""
+
+#: js/viewer.js:23
+msgid "Next"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Width"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Fit"
+msgstr ""
+
+#: js/viewer.js:30
+msgid "Print"
+msgstr ""
+
+#: js/viewer.js:32
+msgid "Download"
+msgstr ""
diff --git a/l10n/ar/files_odfviewer.po b/l10n/ar/files_odfviewer.po
new file mode 100644
index 0000000000..75c766b017
--- /dev/null
+++ b/l10n/ar/files_odfviewer.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+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/viewer.js:9
+msgid "Close"
+msgstr ""
diff --git a/l10n/ar/files_pdfviewer.po b/l10n/ar/files_pdfviewer.po
new file mode 100644
index 0000000000..91492d720c
--- /dev/null
+++ b/l10n/ar/files_pdfviewer.po
@@ -0,0 +1,42 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+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/viewer.js:22
+msgid "Previous"
+msgstr ""
+
+#: js/viewer.js:23
+msgid "Next"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Width"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Fit"
+msgstr ""
+
+#: js/viewer.js:30
+msgid "Print"
+msgstr ""
+
+#: js/viewer.js:32
+msgid "Download"
+msgstr ""
diff --git a/l10n/ar_SA/files_odfviewer.po b/l10n/ar_SA/files_odfviewer.po
new file mode 100644
index 0000000000..abff78f829
--- /dev/null
+++ b/l10n/ar_SA/files_odfviewer.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00: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"
+
+#: js/viewer.js:9
+msgid "Close"
+msgstr ""
diff --git a/l10n/ar_SA/files_pdfviewer.po b/l10n/ar_SA/files_pdfviewer.po
new file mode 100644
index 0000000000..8a2c2b3fff
--- /dev/null
+++ b/l10n/ar_SA/files_pdfviewer.po
@@ -0,0 +1,42 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00: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"
+
+#: js/viewer.js:22
+msgid "Previous"
+msgstr ""
+
+#: js/viewer.js:23
+msgid "Next"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Width"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Fit"
+msgstr ""
+
+#: js/viewer.js:30
+msgid "Print"
+msgstr ""
+
+#: js/viewer.js:32
+msgid "Download"
+msgstr ""
diff --git a/l10n/bg_BG/files_odfviewer.po b/l10n/bg_BG/files_odfviewer.po
new file mode 100644
index 0000000000..255b592f49
--- /dev/null
+++ b/l10n/bg_BG/files_odfviewer.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+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/viewer.js:9
+msgid "Close"
+msgstr ""
diff --git a/l10n/bg_BG/files_pdfviewer.po b/l10n/bg_BG/files_pdfviewer.po
new file mode 100644
index 0000000000..e38e0c3fcb
--- /dev/null
+++ b/l10n/bg_BG/files_pdfviewer.po
@@ -0,0 +1,42 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+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/viewer.js:22
+msgid "Previous"
+msgstr ""
+
+#: js/viewer.js:23
+msgid "Next"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Width"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Fit"
+msgstr ""
+
+#: js/viewer.js:30
+msgid "Print"
+msgstr ""
+
+#: js/viewer.js:32
+msgid "Download"
+msgstr ""
diff --git a/l10n/ca/files_odfviewer.po b/l10n/ca/files_odfviewer.po
new file mode 100644
index 0000000000..e41b59b03c
--- /dev/null
+++ b/l10n/ca/files_odfviewer.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+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"
+
+#: js/viewer.js:9
+msgid "Close"
+msgstr ""
diff --git a/l10n/ca/files_pdfviewer.po b/l10n/ca/files_pdfviewer.po
new file mode 100644
index 0000000000..9645c269dd
--- /dev/null
+++ b/l10n/ca/files_pdfviewer.po
@@ -0,0 +1,42 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+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"
+
+#: js/viewer.js:22
+msgid "Previous"
+msgstr ""
+
+#: js/viewer.js:23
+msgid "Next"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Width"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Fit"
+msgstr ""
+
+#: js/viewer.js:30
+msgid "Print"
+msgstr ""
+
+#: js/viewer.js:32
+msgid "Download"
+msgstr ""
diff --git a/l10n/cs_CZ/files_odfviewer.po b/l10n/cs_CZ/files_odfviewer.po
new file mode 100644
index 0000000000..68d6062835
--- /dev/null
+++ b/l10n/cs_CZ/files_odfviewer.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+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/viewer.js:9
+msgid "Close"
+msgstr ""
diff --git a/l10n/cs_CZ/files_pdfviewer.po b/l10n/cs_CZ/files_pdfviewer.po
new file mode 100644
index 0000000000..87f8e0f3ff
--- /dev/null
+++ b/l10n/cs_CZ/files_pdfviewer.po
@@ -0,0 +1,42 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+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/viewer.js:22
+msgid "Previous"
+msgstr ""
+
+#: js/viewer.js:23
+msgid "Next"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Width"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Fit"
+msgstr ""
+
+#: js/viewer.js:30
+msgid "Print"
+msgstr ""
+
+#: js/viewer.js:32
+msgid "Download"
+msgstr ""
diff --git a/l10n/da/files_odfviewer.po b/l10n/da/files_odfviewer.po
new file mode 100644
index 0000000000..755f4010e9
--- /dev/null
+++ b/l10n/da/files_odfviewer.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+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/viewer.js:9
+msgid "Close"
+msgstr ""
diff --git a/l10n/da/files_pdfviewer.po b/l10n/da/files_pdfviewer.po
new file mode 100644
index 0000000000..781bfdac2e
--- /dev/null
+++ b/l10n/da/files_pdfviewer.po
@@ -0,0 +1,42 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+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/viewer.js:22
+msgid "Previous"
+msgstr ""
+
+#: js/viewer.js:23
+msgid "Next"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Width"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Fit"
+msgstr ""
+
+#: js/viewer.js:30
+msgid "Print"
+msgstr ""
+
+#: js/viewer.js:32
+msgid "Download"
+msgstr ""
diff --git a/l10n/de/files_odfviewer.po b/l10n/de/files_odfviewer.po
new file mode 100644
index 0000000000..8d81b0d266
--- /dev/null
+++ b/l10n/de/files_odfviewer.po
@@ -0,0 +1,23 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# I Robot <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-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:21+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"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/viewer.js:9
+msgid "Close"
+msgstr "Schliessen"
diff --git a/l10n/de/files_pdfviewer.po b/l10n/de/files_pdfviewer.po
new file mode 100644
index 0000000000..a792a00b21
--- /dev/null
+++ b/l10n/de/files_pdfviewer.po
@@ -0,0 +1,43 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# I Robot <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-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:21+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"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: de\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: js/viewer.js:22
+msgid "Previous"
+msgstr "Zurück"
+
+#: js/viewer.js:23
+msgid "Next"
+msgstr "Weiter"
+
+#: js/viewer.js:29
+msgid "Page Width"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Fit"
+msgstr ""
+
+#: js/viewer.js:30
+msgid "Print"
+msgstr ""
+
+#: js/viewer.js:32
+msgid "Download"
+msgstr ""
diff --git a/l10n/el/files_odfviewer.po b/l10n/el/files_odfviewer.po
new file mode 100644
index 0000000000..5e6d54efe4
--- /dev/null
+++ b/l10n/el/files_odfviewer.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+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/viewer.js:9
+msgid "Close"
+msgstr ""
diff --git a/l10n/el/files_pdfviewer.po b/l10n/el/files_pdfviewer.po
new file mode 100644
index 0000000000..ccc6193a0b
--- /dev/null
+++ b/l10n/el/files_pdfviewer.po
@@ -0,0 +1,42 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+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/viewer.js:22
+msgid "Previous"
+msgstr ""
+
+#: js/viewer.js:23
+msgid "Next"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Width"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Fit"
+msgstr ""
+
+#: js/viewer.js:30
+msgid "Print"
+msgstr ""
+
+#: js/viewer.js:32
+msgid "Download"
+msgstr ""
diff --git a/l10n/eo/files_odfviewer.po b/l10n/eo/files_odfviewer.po
new file mode 100644
index 0000000000..ebc4993230
--- /dev/null
+++ b/l10n/eo/files_odfviewer.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+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/viewer.js:9
+msgid "Close"
+msgstr ""
diff --git a/l10n/eo/files_pdfviewer.po b/l10n/eo/files_pdfviewer.po
new file mode 100644
index 0000000000..14fae82ce8
--- /dev/null
+++ b/l10n/eo/files_pdfviewer.po
@@ -0,0 +1,42 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+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/viewer.js:22
+msgid "Previous"
+msgstr ""
+
+#: js/viewer.js:23
+msgid "Next"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Width"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Fit"
+msgstr ""
+
+#: js/viewer.js:30
+msgid "Print"
+msgstr ""
+
+#: js/viewer.js:32
+msgid "Download"
+msgstr ""
diff --git a/l10n/es/files_odfviewer.po b/l10n/es/files_odfviewer.po
new file mode 100644
index 0000000000..aaf62e020a
--- /dev/null
+++ b/l10n/es/files_odfviewer.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+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/viewer.js:9
+msgid "Close"
+msgstr ""
diff --git a/l10n/es/files_pdfviewer.po b/l10n/es/files_pdfviewer.po
new file mode 100644
index 0000000000..1b4c74ef32
--- /dev/null
+++ b/l10n/es/files_pdfviewer.po
@@ -0,0 +1,42 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+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/viewer.js:22
+msgid "Previous"
+msgstr ""
+
+#: js/viewer.js:23
+msgid "Next"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Width"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Fit"
+msgstr ""
+
+#: js/viewer.js:30
+msgid "Print"
+msgstr ""
+
+#: js/viewer.js:32
+msgid "Download"
+msgstr ""
diff --git a/l10n/et_EE/files_odfviewer.po b/l10n/et_EE/files_odfviewer.po
new file mode 100644
index 0000000000..986289e67a
--- /dev/null
+++ b/l10n/et_EE/files_odfviewer.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+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/viewer.js:9
+msgid "Close"
+msgstr ""
diff --git a/l10n/et_EE/files_pdfviewer.po b/l10n/et_EE/files_pdfviewer.po
new file mode 100644
index 0000000000..3354f9e2cc
--- /dev/null
+++ b/l10n/et_EE/files_pdfviewer.po
@@ -0,0 +1,42 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+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/viewer.js:22
+msgid "Previous"
+msgstr ""
+
+#: js/viewer.js:23
+msgid "Next"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Width"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Fit"
+msgstr ""
+
+#: js/viewer.js:30
+msgid "Print"
+msgstr ""
+
+#: js/viewer.js:32
+msgid "Download"
+msgstr ""
diff --git a/l10n/eu/files_odfviewer.po b/l10n/eu/files_odfviewer.po
new file mode 100644
index 0000000000..3f9ec980ab
--- /dev/null
+++ b/l10n/eu/files_odfviewer.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+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/viewer.js:9
+msgid "Close"
+msgstr ""
diff --git a/l10n/eu/files_pdfviewer.po b/l10n/eu/files_pdfviewer.po
new file mode 100644
index 0000000000..f45d8ef655
--- /dev/null
+++ b/l10n/eu/files_pdfviewer.po
@@ -0,0 +1,42 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+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/viewer.js:22
+msgid "Previous"
+msgstr ""
+
+#: js/viewer.js:23
+msgid "Next"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Width"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Fit"
+msgstr ""
+
+#: js/viewer.js:30
+msgid "Print"
+msgstr ""
+
+#: js/viewer.js:32
+msgid "Download"
+msgstr ""
diff --git a/l10n/eu_ES/files_odfviewer.po b/l10n/eu_ES/files_odfviewer.po
new file mode 100644
index 0000000000..ae252d7f3c
--- /dev/null
+++ b/l10n/eu_ES/files_odfviewer.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00: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"
+
+#: js/viewer.js:9
+msgid "Close"
+msgstr ""
diff --git a/l10n/eu_ES/files_pdfviewer.po b/l10n/eu_ES/files_pdfviewer.po
new file mode 100644
index 0000000000..9dace38e40
--- /dev/null
+++ b/l10n/eu_ES/files_pdfviewer.po
@@ -0,0 +1,42 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00: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"
+
+#: js/viewer.js:22
+msgid "Previous"
+msgstr ""
+
+#: js/viewer.js:23
+msgid "Next"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Width"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Fit"
+msgstr ""
+
+#: js/viewer.js:30
+msgid "Print"
+msgstr ""
+
+#: js/viewer.js:32
+msgid "Download"
+msgstr ""
diff --git a/l10n/fa/files_odfviewer.po b/l10n/fa/files_odfviewer.po
new file mode 100644
index 0000000000..9a3288832d
--- /dev/null
+++ b/l10n/fa/files_odfviewer.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+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/viewer.js:9
+msgid "Close"
+msgstr ""
diff --git a/l10n/fa/files_pdfviewer.po b/l10n/fa/files_pdfviewer.po
new file mode 100644
index 0000000000..bf8f950d5e
--- /dev/null
+++ b/l10n/fa/files_pdfviewer.po
@@ -0,0 +1,42 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+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/viewer.js:22
+msgid "Previous"
+msgstr ""
+
+#: js/viewer.js:23
+msgid "Next"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Width"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Fit"
+msgstr ""
+
+#: js/viewer.js:30
+msgid "Print"
+msgstr ""
+
+#: js/viewer.js:32
+msgid "Download"
+msgstr ""
diff --git a/l10n/fi/files_odfviewer.po b/l10n/fi/files_odfviewer.po
new file mode 100644
index 0000000000..e64ad21053
--- /dev/null
+++ b/l10n/fi/files_odfviewer.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00: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"
+
+#: js/viewer.js:9
+msgid "Close"
+msgstr ""
diff --git a/l10n/fi/files_pdfviewer.po b/l10n/fi/files_pdfviewer.po
new file mode 100644
index 0000000000..7e2c2ec648
--- /dev/null
+++ b/l10n/fi/files_pdfviewer.po
@@ -0,0 +1,42 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00: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"
+
+#: js/viewer.js:22
+msgid "Previous"
+msgstr ""
+
+#: js/viewer.js:23
+msgid "Next"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Width"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Fit"
+msgstr ""
+
+#: js/viewer.js:30
+msgid "Print"
+msgstr ""
+
+#: js/viewer.js:32
+msgid "Download"
+msgstr ""
diff --git a/l10n/fi_FI/files_odfviewer.po b/l10n/fi_FI/files_odfviewer.po
new file mode 100644
index 0000000000..b6ab6054fe
--- /dev/null
+++ b/l10n/fi_FI/files_odfviewer.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+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/viewer.js:9
+msgid "Close"
+msgstr ""
diff --git a/l10n/fi_FI/files_pdfviewer.po b/l10n/fi_FI/files_pdfviewer.po
new file mode 100644
index 0000000000..cdccaec4c7
--- /dev/null
+++ b/l10n/fi_FI/files_pdfviewer.po
@@ -0,0 +1,42 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+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/viewer.js:22
+msgid "Previous"
+msgstr ""
+
+#: js/viewer.js:23
+msgid "Next"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Width"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Fit"
+msgstr ""
+
+#: js/viewer.js:30
+msgid "Print"
+msgstr ""
+
+#: js/viewer.js:32
+msgid "Download"
+msgstr ""
diff --git a/l10n/fr/files_odfviewer.po b/l10n/fr/files_odfviewer.po
new file mode 100644
index 0000000000..43bbf42f0f
--- /dev/null
+++ b/l10n/fr/files_odfviewer.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+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/viewer.js:9
+msgid "Close"
+msgstr ""
diff --git a/l10n/fr/files_pdfviewer.po b/l10n/fr/files_pdfviewer.po
new file mode 100644
index 0000000000..ce9bb24515
--- /dev/null
+++ b/l10n/fr/files_pdfviewer.po
@@ -0,0 +1,42 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+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/viewer.js:22
+msgid "Previous"
+msgstr ""
+
+#: js/viewer.js:23
+msgid "Next"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Width"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Fit"
+msgstr ""
+
+#: js/viewer.js:30
+msgid "Print"
+msgstr ""
+
+#: js/viewer.js:32
+msgid "Download"
+msgstr ""
diff --git a/l10n/gl/files_odfviewer.po b/l10n/gl/files_odfviewer.po
new file mode 100644
index 0000000000..8508ffbb8e
--- /dev/null
+++ b/l10n/gl/files_odfviewer.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+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/viewer.js:9
+msgid "Close"
+msgstr ""
diff --git a/l10n/gl/files_pdfviewer.po b/l10n/gl/files_pdfviewer.po
new file mode 100644
index 0000000000..c9dc9eb36b
--- /dev/null
+++ b/l10n/gl/files_pdfviewer.po
@@ -0,0 +1,42 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+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/viewer.js:22
+msgid "Previous"
+msgstr ""
+
+#: js/viewer.js:23
+msgid "Next"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Width"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Fit"
+msgstr ""
+
+#: js/viewer.js:30
+msgid "Print"
+msgstr ""
+
+#: js/viewer.js:32
+msgid "Download"
+msgstr ""
diff --git a/l10n/he/files_odfviewer.po b/l10n/he/files_odfviewer.po
new file mode 100644
index 0000000000..e493bf5cb5
--- /dev/null
+++ b/l10n/he/files_odfviewer.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+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/viewer.js:9
+msgid "Close"
+msgstr ""
diff --git a/l10n/he/files_pdfviewer.po b/l10n/he/files_pdfviewer.po
new file mode 100644
index 0000000000..5ae16f8b58
--- /dev/null
+++ b/l10n/he/files_pdfviewer.po
@@ -0,0 +1,42 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+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/viewer.js:22
+msgid "Previous"
+msgstr ""
+
+#: js/viewer.js:23
+msgid "Next"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Width"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Fit"
+msgstr ""
+
+#: js/viewer.js:30
+msgid "Print"
+msgstr ""
+
+#: js/viewer.js:32
+msgid "Download"
+msgstr ""
diff --git a/l10n/hr/files_odfviewer.po b/l10n/hr/files_odfviewer.po
new file mode 100644
index 0000000000..ad4066e3f6
--- /dev/null
+++ b/l10n/hr/files_odfviewer.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+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/viewer.js:9
+msgid "Close"
+msgstr ""
diff --git a/l10n/hr/files_pdfviewer.po b/l10n/hr/files_pdfviewer.po
new file mode 100644
index 0000000000..711c71bc86
--- /dev/null
+++ b/l10n/hr/files_pdfviewer.po
@@ -0,0 +1,42 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+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/viewer.js:22
+msgid "Previous"
+msgstr ""
+
+#: js/viewer.js:23
+msgid "Next"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Width"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Fit"
+msgstr ""
+
+#: js/viewer.js:30
+msgid "Print"
+msgstr ""
+
+#: js/viewer.js:32
+msgid "Download"
+msgstr ""
diff --git a/l10n/hu_HU/files_odfviewer.po b/l10n/hu_HU/files_odfviewer.po
new file mode 100644
index 0000000000..159ec87452
--- /dev/null
+++ b/l10n/hu_HU/files_odfviewer.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+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/viewer.js:9
+msgid "Close"
+msgstr ""
diff --git a/l10n/hu_HU/files_pdfviewer.po b/l10n/hu_HU/files_pdfviewer.po
new file mode 100644
index 0000000000..1499ece9d1
--- /dev/null
+++ b/l10n/hu_HU/files_pdfviewer.po
@@ -0,0 +1,42 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+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/viewer.js:22
+msgid "Previous"
+msgstr ""
+
+#: js/viewer.js:23
+msgid "Next"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Width"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Fit"
+msgstr ""
+
+#: js/viewer.js:30
+msgid "Print"
+msgstr ""
+
+#: js/viewer.js:32
+msgid "Download"
+msgstr ""
diff --git a/l10n/hy/files_odfviewer.po b/l10n/hy/files_odfviewer.po
new file mode 100644
index 0000000000..bdc26a3a67
--- /dev/null
+++ b/l10n/hy/files_odfviewer.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+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/viewer.js:9
+msgid "Close"
+msgstr ""
diff --git a/l10n/hy/files_pdfviewer.po b/l10n/hy/files_pdfviewer.po
new file mode 100644
index 0000000000..7b725e07b8
--- /dev/null
+++ b/l10n/hy/files_pdfviewer.po
@@ -0,0 +1,42 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+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/viewer.js:22
+msgid "Previous"
+msgstr ""
+
+#: js/viewer.js:23
+msgid "Next"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Width"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Fit"
+msgstr ""
+
+#: js/viewer.js:30
+msgid "Print"
+msgstr ""
+
+#: js/viewer.js:32
+msgid "Download"
+msgstr ""
diff --git a/l10n/ia/files_odfviewer.po b/l10n/ia/files_odfviewer.po
new file mode 100644
index 0000000000..566f1c5b67
--- /dev/null
+++ b/l10n/ia/files_odfviewer.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+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/viewer.js:9
+msgid "Close"
+msgstr ""
diff --git a/l10n/ia/files_pdfviewer.po b/l10n/ia/files_pdfviewer.po
new file mode 100644
index 0000000000..46c46d9c81
--- /dev/null
+++ b/l10n/ia/files_pdfviewer.po
@@ -0,0 +1,42 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+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/viewer.js:22
+msgid "Previous"
+msgstr ""
+
+#: js/viewer.js:23
+msgid "Next"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Width"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Fit"
+msgstr ""
+
+#: js/viewer.js:30
+msgid "Print"
+msgstr ""
+
+#: js/viewer.js:32
+msgid "Download"
+msgstr ""
diff --git a/l10n/id/files_odfviewer.po b/l10n/id/files_odfviewer.po
new file mode 100644
index 0000000000..7680253aef
--- /dev/null
+++ b/l10n/id/files_odfviewer.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+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/viewer.js:9
+msgid "Close"
+msgstr ""
diff --git a/l10n/id/files_pdfviewer.po b/l10n/id/files_pdfviewer.po
new file mode 100644
index 0000000000..a9fc081e18
--- /dev/null
+++ b/l10n/id/files_pdfviewer.po
@@ -0,0 +1,42 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+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/viewer.js:22
+msgid "Previous"
+msgstr ""
+
+#: js/viewer.js:23
+msgid "Next"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Width"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Fit"
+msgstr ""
+
+#: js/viewer.js:30
+msgid "Print"
+msgstr ""
+
+#: js/viewer.js:32
+msgid "Download"
+msgstr ""
diff --git a/l10n/id_ID/files_odfviewer.po b/l10n/id_ID/files_odfviewer.po
new file mode 100644
index 0000000000..0f3cc53112
--- /dev/null
+++ b/l10n/id_ID/files_odfviewer.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00: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"
+
+#: js/viewer.js:9
+msgid "Close"
+msgstr ""
diff --git a/l10n/id_ID/files_pdfviewer.po b/l10n/id_ID/files_pdfviewer.po
new file mode 100644
index 0000000000..395dc8b4c1
--- /dev/null
+++ b/l10n/id_ID/files_pdfviewer.po
@@ -0,0 +1,42 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00: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"
+
+#: js/viewer.js:22
+msgid "Previous"
+msgstr ""
+
+#: js/viewer.js:23
+msgid "Next"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Width"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Fit"
+msgstr ""
+
+#: js/viewer.js:30
+msgid "Print"
+msgstr ""
+
+#: js/viewer.js:32
+msgid "Download"
+msgstr ""
diff --git a/l10n/it/files_odfviewer.po b/l10n/it/files_odfviewer.po
new file mode 100644
index 0000000000..0fae9bc23f
--- /dev/null
+++ b/l10n/it/files_odfviewer.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+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/viewer.js:9
+msgid "Close"
+msgstr ""
diff --git a/l10n/it/files_pdfviewer.po b/l10n/it/files_pdfviewer.po
new file mode 100644
index 0000000000..3f4595ffe2
--- /dev/null
+++ b/l10n/it/files_pdfviewer.po
@@ -0,0 +1,42 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+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/viewer.js:22
+msgid "Previous"
+msgstr ""
+
+#: js/viewer.js:23
+msgid "Next"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Width"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Fit"
+msgstr ""
+
+#: js/viewer.js:30
+msgid "Print"
+msgstr ""
+
+#: js/viewer.js:32
+msgid "Download"
+msgstr ""
diff --git a/l10n/ja_JP/files_odfviewer.po b/l10n/ja_JP/files_odfviewer.po
new file mode 100644
index 0000000000..75c2c65bbf
--- /dev/null
+++ b/l10n/ja_JP/files_odfviewer.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+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/viewer.js:9
+msgid "Close"
+msgstr ""
diff --git a/l10n/ja_JP/files_pdfviewer.po b/l10n/ja_JP/files_pdfviewer.po
new file mode 100644
index 0000000000..910d096359
--- /dev/null
+++ b/l10n/ja_JP/files_pdfviewer.po
@@ -0,0 +1,42 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+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/viewer.js:22
+msgid "Previous"
+msgstr ""
+
+#: js/viewer.js:23
+msgid "Next"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Width"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Fit"
+msgstr ""
+
+#: js/viewer.js:30
+msgid "Print"
+msgstr ""
+
+#: js/viewer.js:32
+msgid "Download"
+msgstr ""
diff --git a/l10n/ko/files_odfviewer.po b/l10n/ko/files_odfviewer.po
new file mode 100644
index 0000000000..2be8c176ae
--- /dev/null
+++ b/l10n/ko/files_odfviewer.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+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/viewer.js:9
+msgid "Close"
+msgstr ""
diff --git a/l10n/ko/files_pdfviewer.po b/l10n/ko/files_pdfviewer.po
new file mode 100644
index 0000000000..a29b407be8
--- /dev/null
+++ b/l10n/ko/files_pdfviewer.po
@@ -0,0 +1,42 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+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/viewer.js:22
+msgid "Previous"
+msgstr ""
+
+#: js/viewer.js:23
+msgid "Next"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Width"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Fit"
+msgstr ""
+
+#: js/viewer.js:30
+msgid "Print"
+msgstr ""
+
+#: js/viewer.js:32
+msgid "Download"
+msgstr ""
diff --git a/l10n/lb/files_odfviewer.po b/l10n/lb/files_odfviewer.po
new file mode 100644
index 0000000000..1ce99cf81a
--- /dev/null
+++ b/l10n/lb/files_odfviewer.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+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/viewer.js:9
+msgid "Close"
+msgstr ""
diff --git a/l10n/lb/files_pdfviewer.po b/l10n/lb/files_pdfviewer.po
new file mode 100644
index 0000000000..a7665ab24e
--- /dev/null
+++ b/l10n/lb/files_pdfviewer.po
@@ -0,0 +1,42 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+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/viewer.js:22
+msgid "Previous"
+msgstr ""
+
+#: js/viewer.js:23
+msgid "Next"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Width"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Fit"
+msgstr ""
+
+#: js/viewer.js:30
+msgid "Print"
+msgstr ""
+
+#: js/viewer.js:32
+msgid "Download"
+msgstr ""
diff --git a/l10n/lt_LT/files_odfviewer.po b/l10n/lt_LT/files_odfviewer.po
new file mode 100644
index 0000000000..9fdcfb4a0c
--- /dev/null
+++ b/l10n/lt_LT/files_odfviewer.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+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/viewer.js:9
+msgid "Close"
+msgstr ""
diff --git a/l10n/lt_LT/files_pdfviewer.po b/l10n/lt_LT/files_pdfviewer.po
new file mode 100644
index 0000000000..e224f4ccb5
--- /dev/null
+++ b/l10n/lt_LT/files_pdfviewer.po
@@ -0,0 +1,42 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+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/viewer.js:22
+msgid "Previous"
+msgstr ""
+
+#: js/viewer.js:23
+msgid "Next"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Width"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Fit"
+msgstr ""
+
+#: js/viewer.js:30
+msgid "Print"
+msgstr ""
+
+#: js/viewer.js:32
+msgid "Download"
+msgstr ""
diff --git a/l10n/lv/files_odfviewer.po b/l10n/lv/files_odfviewer.po
new file mode 100644
index 0000000000..ef357e02f1
--- /dev/null
+++ b/l10n/lv/files_odfviewer.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00: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"
+
+#: js/viewer.js:9
+msgid "Close"
+msgstr ""
diff --git a/l10n/lv/files_pdfviewer.po b/l10n/lv/files_pdfviewer.po
new file mode 100644
index 0000000000..06441aecda
--- /dev/null
+++ b/l10n/lv/files_pdfviewer.po
@@ -0,0 +1,42 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00: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"
+
+#: js/viewer.js:22
+msgid "Previous"
+msgstr ""
+
+#: js/viewer.js:23
+msgid "Next"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Width"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Fit"
+msgstr ""
+
+#: js/viewer.js:30
+msgid "Print"
+msgstr ""
+
+#: js/viewer.js:32
+msgid "Download"
+msgstr ""
diff --git a/l10n/mk/files_odfviewer.po b/l10n/mk/files_odfviewer.po
new file mode 100644
index 0000000000..77205c755f
--- /dev/null
+++ b/l10n/mk/files_odfviewer.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+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/viewer.js:9
+msgid "Close"
+msgstr ""
diff --git a/l10n/mk/files_pdfviewer.po b/l10n/mk/files_pdfviewer.po
new file mode 100644
index 0000000000..a6cb756a0a
--- /dev/null
+++ b/l10n/mk/files_pdfviewer.po
@@ -0,0 +1,42 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+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/viewer.js:22
+msgid "Previous"
+msgstr ""
+
+#: js/viewer.js:23
+msgid "Next"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Width"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Fit"
+msgstr ""
+
+#: js/viewer.js:30
+msgid "Print"
+msgstr ""
+
+#: js/viewer.js:32
+msgid "Download"
+msgstr ""
diff --git a/l10n/ms_MY/files_odfviewer.po b/l10n/ms_MY/files_odfviewer.po
new file mode 100644
index 0000000000..0aa22023e5
--- /dev/null
+++ b/l10n/ms_MY/files_odfviewer.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+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/viewer.js:9
+msgid "Close"
+msgstr ""
diff --git a/l10n/ms_MY/files_pdfviewer.po b/l10n/ms_MY/files_pdfviewer.po
new file mode 100644
index 0000000000..b0e03a94e5
--- /dev/null
+++ b/l10n/ms_MY/files_pdfviewer.po
@@ -0,0 +1,42 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+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/viewer.js:22
+msgid "Previous"
+msgstr ""
+
+#: js/viewer.js:23
+msgid "Next"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Width"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Fit"
+msgstr ""
+
+#: js/viewer.js:30
+msgid "Print"
+msgstr ""
+
+#: js/viewer.js:32
+msgid "Download"
+msgstr ""
diff --git a/l10n/nb_NO/files_odfviewer.po b/l10n/nb_NO/files_odfviewer.po
new file mode 100644
index 0000000000..61ad61a7fe
--- /dev/null
+++ b/l10n/nb_NO/files_odfviewer.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+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/viewer.js:9
+msgid "Close"
+msgstr ""
diff --git a/l10n/nb_NO/files_pdfviewer.po b/l10n/nb_NO/files_pdfviewer.po
new file mode 100644
index 0000000000..e036a75c1b
--- /dev/null
+++ b/l10n/nb_NO/files_pdfviewer.po
@@ -0,0 +1,42 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+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/viewer.js:22
+msgid "Previous"
+msgstr ""
+
+#: js/viewer.js:23
+msgid "Next"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Width"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Fit"
+msgstr ""
+
+#: js/viewer.js:30
+msgid "Print"
+msgstr ""
+
+#: js/viewer.js:32
+msgid "Download"
+msgstr ""
diff --git a/l10n/nl/files_odfviewer.po b/l10n/nl/files_odfviewer.po
new file mode 100644
index 0000000000..5825a94a3f
--- /dev/null
+++ b/l10n/nl/files_odfviewer.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+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/viewer.js:9
+msgid "Close"
+msgstr ""
diff --git a/l10n/nl/files_pdfviewer.po b/l10n/nl/files_pdfviewer.po
new file mode 100644
index 0000000000..ff6e8c5e20
--- /dev/null
+++ b/l10n/nl/files_pdfviewer.po
@@ -0,0 +1,42 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+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/viewer.js:22
+msgid "Previous"
+msgstr ""
+
+#: js/viewer.js:23
+msgid "Next"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Width"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Fit"
+msgstr ""
+
+#: js/viewer.js:30
+msgid "Print"
+msgstr ""
+
+#: js/viewer.js:32
+msgid "Download"
+msgstr ""
diff --git a/l10n/nn_NO/files_odfviewer.po b/l10n/nn_NO/files_odfviewer.po
new file mode 100644
index 0000000000..dfc0447df6
--- /dev/null
+++ b/l10n/nn_NO/files_odfviewer.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+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/viewer.js:9
+msgid "Close"
+msgstr ""
diff --git a/l10n/nn_NO/files_pdfviewer.po b/l10n/nn_NO/files_pdfviewer.po
new file mode 100644
index 0000000000..4933207f3a
--- /dev/null
+++ b/l10n/nn_NO/files_pdfviewer.po
@@ -0,0 +1,42 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+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/viewer.js:22
+msgid "Previous"
+msgstr ""
+
+#: js/viewer.js:23
+msgid "Next"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Width"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Fit"
+msgstr ""
+
+#: js/viewer.js:30
+msgid "Print"
+msgstr ""
+
+#: js/viewer.js:32
+msgid "Download"
+msgstr ""
diff --git a/l10n/pl/files_odfviewer.po b/l10n/pl/files_odfviewer.po
new file mode 100644
index 0000000000..0c090a229f
--- /dev/null
+++ b/l10n/pl/files_odfviewer.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+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/viewer.js:9
+msgid "Close"
+msgstr ""
diff --git a/l10n/pl/files_pdfviewer.po b/l10n/pl/files_pdfviewer.po
new file mode 100644
index 0000000000..00b45cf929
--- /dev/null
+++ b/l10n/pl/files_pdfviewer.po
@@ -0,0 +1,42 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+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/viewer.js:22
+msgid "Previous"
+msgstr ""
+
+#: js/viewer.js:23
+msgid "Next"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Width"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Fit"
+msgstr ""
+
+#: js/viewer.js:30
+msgid "Print"
+msgstr ""
+
+#: js/viewer.js:32
+msgid "Download"
+msgstr ""
diff --git a/l10n/pt_BR/files_odfviewer.po b/l10n/pt_BR/files_odfviewer.po
new file mode 100644
index 0000000000..0fdf643ce9
--- /dev/null
+++ b/l10n/pt_BR/files_odfviewer.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+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/viewer.js:9
+msgid "Close"
+msgstr ""
diff --git a/l10n/pt_BR/files_pdfviewer.po b/l10n/pt_BR/files_pdfviewer.po
new file mode 100644
index 0000000000..5d57e4d21e
--- /dev/null
+++ b/l10n/pt_BR/files_pdfviewer.po
@@ -0,0 +1,42 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+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/viewer.js:22
+msgid "Previous"
+msgstr ""
+
+#: js/viewer.js:23
+msgid "Next"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Width"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Fit"
+msgstr ""
+
+#: js/viewer.js:30
+msgid "Print"
+msgstr ""
+
+#: js/viewer.js:32
+msgid "Download"
+msgstr ""
diff --git a/l10n/pt_PT/files_odfviewer.po b/l10n/pt_PT/files_odfviewer.po
new file mode 100644
index 0000000000..01ea436b98
--- /dev/null
+++ b/l10n/pt_PT/files_odfviewer.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+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/viewer.js:9
+msgid "Close"
+msgstr ""
diff --git a/l10n/pt_PT/files_pdfviewer.po b/l10n/pt_PT/files_pdfviewer.po
new file mode 100644
index 0000000000..67aaa183ab
--- /dev/null
+++ b/l10n/pt_PT/files_pdfviewer.po
@@ -0,0 +1,42 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+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/viewer.js:22
+msgid "Previous"
+msgstr ""
+
+#: js/viewer.js:23
+msgid "Next"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Width"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Fit"
+msgstr ""
+
+#: js/viewer.js:30
+msgid "Print"
+msgstr ""
+
+#: js/viewer.js:32
+msgid "Download"
+msgstr ""
diff --git a/l10n/ro/files_odfviewer.po b/l10n/ro/files_odfviewer.po
new file mode 100644
index 0000000000..3fa223c661
--- /dev/null
+++ b/l10n/ro/files_odfviewer.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+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/viewer.js:9
+msgid "Close"
+msgstr ""
diff --git a/l10n/ro/files_pdfviewer.po b/l10n/ro/files_pdfviewer.po
new file mode 100644
index 0000000000..5425afad63
--- /dev/null
+++ b/l10n/ro/files_pdfviewer.po
@@ -0,0 +1,42 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+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/viewer.js:22
+msgid "Previous"
+msgstr ""
+
+#: js/viewer.js:23
+msgid "Next"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Width"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Fit"
+msgstr ""
+
+#: js/viewer.js:30
+msgid "Print"
+msgstr ""
+
+#: js/viewer.js:32
+msgid "Download"
+msgstr ""
diff --git a/l10n/ru/files_odfviewer.po b/l10n/ru/files_odfviewer.po
new file mode 100644
index 0000000000..566e295112
--- /dev/null
+++ b/l10n/ru/files_odfviewer.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+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/viewer.js:9
+msgid "Close"
+msgstr ""
diff --git a/l10n/ru/files_pdfviewer.po b/l10n/ru/files_pdfviewer.po
new file mode 100644
index 0000000000..48f6bdb06a
--- /dev/null
+++ b/l10n/ru/files_pdfviewer.po
@@ -0,0 +1,42 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+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/viewer.js:22
+msgid "Previous"
+msgstr ""
+
+#: js/viewer.js:23
+msgid "Next"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Width"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Fit"
+msgstr ""
+
+#: js/viewer.js:30
+msgid "Print"
+msgstr ""
+
+#: js/viewer.js:32
+msgid "Download"
+msgstr ""
diff --git a/l10n/sk_SK/files_odfviewer.po b/l10n/sk_SK/files_odfviewer.po
new file mode 100644
index 0000000000..b5e846e37f
--- /dev/null
+++ b/l10n/sk_SK/files_odfviewer.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+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/viewer.js:9
+msgid "Close"
+msgstr ""
diff --git a/l10n/sk_SK/files_pdfviewer.po b/l10n/sk_SK/files_pdfviewer.po
new file mode 100644
index 0000000000..aee04e4ec7
--- /dev/null
+++ b/l10n/sk_SK/files_pdfviewer.po
@@ -0,0 +1,42 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+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/viewer.js:22
+msgid "Previous"
+msgstr ""
+
+#: js/viewer.js:23
+msgid "Next"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Width"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Fit"
+msgstr ""
+
+#: js/viewer.js:30
+msgid "Print"
+msgstr ""
+
+#: js/viewer.js:32
+msgid "Download"
+msgstr ""
diff --git a/l10n/sl/files_odfviewer.po b/l10n/sl/files_odfviewer.po
new file mode 100644
index 0000000000..700c0daba9
--- /dev/null
+++ b/l10n/sl/files_odfviewer.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+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/viewer.js:9
+msgid "Close"
+msgstr ""
diff --git a/l10n/sl/files_pdfviewer.po b/l10n/sl/files_pdfviewer.po
new file mode 100644
index 0000000000..3a16e21f40
--- /dev/null
+++ b/l10n/sl/files_pdfviewer.po
@@ -0,0 +1,42 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+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/viewer.js:22
+msgid "Previous"
+msgstr ""
+
+#: js/viewer.js:23
+msgid "Next"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Width"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Fit"
+msgstr ""
+
+#: js/viewer.js:30
+msgid "Print"
+msgstr ""
+
+#: js/viewer.js:32
+msgid "Download"
+msgstr ""
diff --git a/l10n/so/files_odfviewer.po b/l10n/so/files_odfviewer.po
new file mode 100644
index 0000000000..614758a322
--- /dev/null
+++ b/l10n/so/files_odfviewer.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00: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"
+
+#: js/viewer.js:9
+msgid "Close"
+msgstr ""
diff --git a/l10n/so/files_pdfviewer.po b/l10n/so/files_pdfviewer.po
new file mode 100644
index 0000000000..05e648c741
--- /dev/null
+++ b/l10n/so/files_pdfviewer.po
@@ -0,0 +1,42 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00: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"
+
+#: js/viewer.js:22
+msgid "Previous"
+msgstr ""
+
+#: js/viewer.js:23
+msgid "Next"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Width"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Fit"
+msgstr ""
+
+#: js/viewer.js:30
+msgid "Print"
+msgstr ""
+
+#: js/viewer.js:32
+msgid "Download"
+msgstr ""
diff --git a/l10n/sr/files_odfviewer.po b/l10n/sr/files_odfviewer.po
new file mode 100644
index 0000000000..9b251f5769
--- /dev/null
+++ b/l10n/sr/files_odfviewer.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+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/viewer.js:9
+msgid "Close"
+msgstr ""
diff --git a/l10n/sr/files_pdfviewer.po b/l10n/sr/files_pdfviewer.po
new file mode 100644
index 0000000000..2cd94b83aa
--- /dev/null
+++ b/l10n/sr/files_pdfviewer.po
@@ -0,0 +1,42 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+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/viewer.js:22
+msgid "Previous"
+msgstr ""
+
+#: js/viewer.js:23
+msgid "Next"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Width"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Fit"
+msgstr ""
+
+#: js/viewer.js:30
+msgid "Print"
+msgstr ""
+
+#: js/viewer.js:32
+msgid "Download"
+msgstr ""
diff --git a/l10n/sr@latin/files_odfviewer.po b/l10n/sr@latin/files_odfviewer.po
new file mode 100644
index 0000000000..3bd414595d
--- /dev/null
+++ b/l10n/sr@latin/files_odfviewer.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+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/viewer.js:9
+msgid "Close"
+msgstr ""
diff --git a/l10n/sr@latin/files_pdfviewer.po b/l10n/sr@latin/files_pdfviewer.po
new file mode 100644
index 0000000000..c63e430bcb
--- /dev/null
+++ b/l10n/sr@latin/files_pdfviewer.po
@@ -0,0 +1,42 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+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/viewer.js:22
+msgid "Previous"
+msgstr ""
+
+#: js/viewer.js:23
+msgid "Next"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Width"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Fit"
+msgstr ""
+
+#: js/viewer.js:30
+msgid "Print"
+msgstr ""
+
+#: js/viewer.js:32
+msgid "Download"
+msgstr ""
diff --git a/l10n/sv/files_odfviewer.po b/l10n/sv/files_odfviewer.po
new file mode 100644
index 0000000000..35b60c1eb8
--- /dev/null
+++ b/l10n/sv/files_odfviewer.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+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"
+
+#: js/viewer.js:9
+msgid "Close"
+msgstr ""
diff --git a/l10n/sv/files_pdfviewer.po b/l10n/sv/files_pdfviewer.po
new file mode 100644
index 0000000000..674a9273ca
--- /dev/null
+++ b/l10n/sv/files_pdfviewer.po
@@ -0,0 +1,42 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+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"
+
+#: js/viewer.js:22
+msgid "Previous"
+msgstr ""
+
+#: js/viewer.js:23
+msgid "Next"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Width"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Fit"
+msgstr ""
+
+#: js/viewer.js:30
+msgid "Print"
+msgstr ""
+
+#: js/viewer.js:32
+msgid "Download"
+msgstr ""
diff --git a/l10n/templates/admin_dependencies_chk.pot b/l10n/templates/admin_dependencies_chk.pot
index 2a88c24502..92c994186e 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-26 02:01+0200\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
 "PO-Revision-Date: YEAR-MO-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 03c9d4d221..1fa0cf44ea 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-26 02:01+0200\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
 "PO-Revision-Date: YEAR-MO-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 7471ca2a06..5e82726479 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-26 02:01+0200\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
 "PO-Revision-Date: YEAR-MO-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 ca06e79598..278c81d390 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-26 02:01+0200\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
 "PO-Revision-Date: YEAR-MO-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 420c3194c9..1172f960c2 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-26 02:01+0200\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
 "PO-Revision-Date: YEAR-MO-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 4b4ca2baf0..67016dbb6f 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-26 02:01+0200\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
 "PO-Revision-Date: YEAR-MO-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 0ded59b24f..af4b2cbc6a 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-26 02:01+0200\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
 "PO-Revision-Date: YEAR-MO-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 a72e3ece33..bbbe0f1303 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-26 02:01+0200\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
 "PO-Revision-Date: YEAR-MO-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 ec3427404c..11a62be5ff 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-26 02:01+0200\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
 "PO-Revision-Date: YEAR-MO-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_odfviewer.pot b/l10n/templates/files_odfviewer.pot
index ed33729108..2552f49e78 100644
--- a/l10n/templates/files_odfviewer.pot
+++ b/l10n/templates/files_odfviewer.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-26 01:49+0200\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
 "PO-Revision-Date: YEAR-MO-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_pdfviewer.pot b/l10n/templates/files_pdfviewer.pot
index 2d3ec3d324..9eab4ed5f5 100644
--- a/l10n/templates/files_pdfviewer.pot
+++ b/l10n/templates/files_pdfviewer.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-26 02:12+0200\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
 "PO-Revision-Date: YEAR-MO-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 7cef8d0dd3..7116f39d69 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-26 02:01+0200\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
 "PO-Revision-Date: YEAR-MO-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_texteditor.pot b/l10n/templates/files_texteditor.pot
index dabf64400a..c2f6c82b6d 100644
--- a/l10n/templates/files_texteditor.pot
+++ b/l10n/templates/files_texteditor.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-26 02:01+0200\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
 "PO-Revision-Date: YEAR-MO-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 5be07d6743..5f3e376707 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-26 02:01+0200\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
 "PO-Revision-Date: YEAR-MO-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 a33505d687..caecc6defc 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-26 02:01+0200\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/l10n/templates/impress.pot b/l10n/templates/impress.pot
index 80ed0959cc..0830dabf4e 100644
--- a/l10n/templates/impress.pot
+++ b/l10n/templates/impress.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-08-26 02:01+0200\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
 "PO-Revision-Date: YEAR-MO-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 5ec04ba8b8..2f9a28cc2b 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-26 02:01+0200\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
 "PO-Revision-Date: YEAR-MO-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 2880656ce2..f2b64570f3 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-26 02:01+0200\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
 "PO-Revision-Date: YEAR-MO-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 af0973d40f..5b2d1fb3a7 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-26 02:01+0200\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
 "PO-Revision-Date: YEAR-MO-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 f6d7cc5b28..4568a33138 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-26 02:01+0200\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
 "PO-Revision-Date: YEAR-MO-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 7ad9d445b4..07c0d399e6 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-26 02:01+0200\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
 "PO-Revision-Date: YEAR-MO-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 d31d34365d..d6d566d3ab 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-26 02:01+0200\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
 "PO-Revision-Date: YEAR-MO-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 d40005630b..3ca434abcd 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-26 02:01+0200\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
 "PO-Revision-Date: YEAR-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_odfviewer.po b/l10n/th_TH/files_odfviewer.po
new file mode 100644
index 0000000000..652cc1125e
--- /dev/null
+++ b/l10n/th_TH/files_odfviewer.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+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/viewer.js:9
+msgid "Close"
+msgstr ""
diff --git a/l10n/th_TH/files_pdfviewer.po b/l10n/th_TH/files_pdfviewer.po
new file mode 100644
index 0000000000..354985befa
--- /dev/null
+++ b/l10n/th_TH/files_pdfviewer.po
@@ -0,0 +1,42 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+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/viewer.js:22
+msgid "Previous"
+msgstr ""
+
+#: js/viewer.js:23
+msgid "Next"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Width"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Fit"
+msgstr ""
+
+#: js/viewer.js:30
+msgid "Print"
+msgstr ""
+
+#: js/viewer.js:32
+msgid "Download"
+msgstr ""
diff --git a/l10n/tr/files_odfviewer.po b/l10n/tr/files_odfviewer.po
new file mode 100644
index 0000000000..81c300af47
--- /dev/null
+++ b/l10n/tr/files_odfviewer.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+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/viewer.js:9
+msgid "Close"
+msgstr ""
diff --git a/l10n/tr/files_pdfviewer.po b/l10n/tr/files_pdfviewer.po
new file mode 100644
index 0000000000..8f66b76939
--- /dev/null
+++ b/l10n/tr/files_pdfviewer.po
@@ -0,0 +1,42 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+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/viewer.js:22
+msgid "Previous"
+msgstr ""
+
+#: js/viewer.js:23
+msgid "Next"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Width"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Fit"
+msgstr ""
+
+#: js/viewer.js:30
+msgid "Print"
+msgstr ""
+
+#: js/viewer.js:32
+msgid "Download"
+msgstr ""
diff --git a/l10n/uk/files_odfviewer.po b/l10n/uk/files_odfviewer.po
new file mode 100644
index 0000000000..f7dfc7c8de
--- /dev/null
+++ b/l10n/uk/files_odfviewer.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+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/viewer.js:9
+msgid "Close"
+msgstr ""
diff --git a/l10n/uk/files_pdfviewer.po b/l10n/uk/files_pdfviewer.po
new file mode 100644
index 0000000000..5fb83eac03
--- /dev/null
+++ b/l10n/uk/files_pdfviewer.po
@@ -0,0 +1,42 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+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/viewer.js:22
+msgid "Previous"
+msgstr ""
+
+#: js/viewer.js:23
+msgid "Next"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Width"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Fit"
+msgstr ""
+
+#: js/viewer.js:30
+msgid "Print"
+msgstr ""
+
+#: js/viewer.js:32
+msgid "Download"
+msgstr ""
diff --git a/l10n/vi/files_odfviewer.po b/l10n/vi/files_odfviewer.po
new file mode 100644
index 0000000000..21d7de16b0
--- /dev/null
+++ b/l10n/vi/files_odfviewer.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+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/viewer.js:9
+msgid "Close"
+msgstr ""
diff --git a/l10n/vi/files_pdfviewer.po b/l10n/vi/files_pdfviewer.po
new file mode 100644
index 0000000000..f8265b4455
--- /dev/null
+++ b/l10n/vi/files_pdfviewer.po
@@ -0,0 +1,42 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+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/viewer.js:22
+msgid "Previous"
+msgstr ""
+
+#: js/viewer.js:23
+msgid "Next"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Width"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Fit"
+msgstr ""
+
+#: js/viewer.js:30
+msgid "Print"
+msgstr ""
+
+#: js/viewer.js:32
+msgid "Download"
+msgstr ""
diff --git a/l10n/zh_CN.GB2312/files_odfviewer.po b/l10n/zh_CN.GB2312/files_odfviewer.po
new file mode 100644
index 0000000000..c46ade9153
--- /dev/null
+++ b/l10n/zh_CN.GB2312/files_odfviewer.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00: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"
+
+#: js/viewer.js:9
+msgid "Close"
+msgstr ""
diff --git a/l10n/zh_CN.GB2312/files_pdfviewer.po b/l10n/zh_CN.GB2312/files_pdfviewer.po
new file mode 100644
index 0000000000..a8c53c751d
--- /dev/null
+++ b/l10n/zh_CN.GB2312/files_pdfviewer.po
@@ -0,0 +1,42 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00: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"
+
+#: js/viewer.js:22
+msgid "Previous"
+msgstr ""
+
+#: js/viewer.js:23
+msgid "Next"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Width"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Fit"
+msgstr ""
+
+#: js/viewer.js:30
+msgid "Print"
+msgstr ""
+
+#: js/viewer.js:32
+msgid "Download"
+msgstr ""
diff --git a/l10n/zh_CN/files_odfviewer.po b/l10n/zh_CN/files_odfviewer.po
new file mode 100644
index 0000000000..fc8d8333ac
--- /dev/null
+++ b/l10n/zh_CN/files_odfviewer.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+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/viewer.js:9
+msgid "Close"
+msgstr ""
diff --git a/l10n/zh_CN/files_pdfviewer.po b/l10n/zh_CN/files_pdfviewer.po
new file mode 100644
index 0000000000..86e0af9519
--- /dev/null
+++ b/l10n/zh_CN/files_pdfviewer.po
@@ -0,0 +1,42 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+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/viewer.js:22
+msgid "Previous"
+msgstr ""
+
+#: js/viewer.js:23
+msgid "Next"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Width"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Fit"
+msgstr ""
+
+#: js/viewer.js:30
+msgid "Print"
+msgstr ""
+
+#: js/viewer.js:32
+msgid "Download"
+msgstr ""
diff --git a/l10n/zh_TW/files_odfviewer.po b/l10n/zh_TW/files_odfviewer.po
new file mode 100644
index 0000000000..2327d1c14a
--- /dev/null
+++ b/l10n/zh_TW/files_odfviewer.po
@@ -0,0 +1,22 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+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/viewer.js:9
+msgid "Close"
+msgstr ""
diff --git a/l10n/zh_TW/files_pdfviewer.po b/l10n/zh_TW/files_pdfviewer.po
new file mode 100644
index 0000000000..9bccfd7d92
--- /dev/null
+++ b/l10n/zh_TW/files_pdfviewer.po
@@ -0,0 +1,42 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-26 02:18+0200\n"
+"PO-Revision-Date: 2012-08-26 00:19+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/viewer.js:22
+msgid "Previous"
+msgstr ""
+
+#: js/viewer.js:23
+msgid "Next"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Width"
+msgstr ""
+
+#: js/viewer.js:29
+msgid "Page Fit"
+msgstr ""
+
+#: js/viewer.js:30
+msgid "Print"
+msgstr ""
+
+#: js/viewer.js:32
+msgid "Download"
+msgstr ""

From 9822cd30c0db25f14ee1a96de24cbfc6a6d5a6e1 Mon Sep 17 00:00:00 2001
From: jfd <jfd@lance>
Date: Sun, 26 Aug 2012 14:57:33 +0200
Subject: [PATCH 0913/1224] fix sharing bug introduced with oracle support

---
 lib/public/share.php | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/lib/public/share.php b/lib/public/share.php
index 93820760d1..070d69d05a 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -516,10 +516,6 @@ class Share {
 				// If the limit is not 1, the filtering can be done later
 				$where .= ' ORDER BY `*PREFIX*share`.`id` DESC';
 			}
-			// The limit must be at least 3, because filtering needs to be done
-			if ($limit < 3) {
-				$limit = 3;
-			}
 		}
 		// TODO Optimize selects
 		if ($format == self::FORMAT_STATUSES) {
@@ -548,7 +544,8 @@ class Share {
 			}
 		}
 		$root = strlen($root);
-		$query = \OC_DB::prepare('SELECT '.$select.' FROM `*PREFIX*share` '.$where, $limit);
+                // The limit must be at least 3, because filtering needs to be done
+		$query = \OC_DB::prepare('SELECT '.$select.' FROM `*PREFIX*share` '.$where, ($limit < 3 ? 3 : $limit));
 		$result = $query->execute($queryArgs);
 		$items = array();
 		$targets = array();

From 726be04e5f047ff9b98b7d84bf4244d1908a3e33 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@statuscode.ch>
Date: Sun, 26 Aug 2012 15:41:41 +0200
Subject: [PATCH 0914/1224] Use sanitizeHTML instead of strip_tags

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

diff --git a/apps/impress/player.php b/apps/impress/player.php
index 12497de54c..cd534757fb 100755
--- a/apps/impress/player.php
+++ b/apps/impress/player.php
@@ -26,8 +26,8 @@ require_once('lib/impress.php');
 // Check if we are a user
 OCP\User::checkLoggedIn();
 
-$filename = strip_tags($_GET['file']);
-$title = strip_tags($_GET['name']);
+$filename = OCP\Util::sanitizeHTML($_GET['file']);
+$title = OCP\Util::sanitizeHTML($_GET['name']);
 
 if(!OC_Filesystem::file_exists($filename)){
 	header("HTTP/1.0 404 Not Found");

From bcd86bfd02d4ec07a3fcadf5507d7dcdbb1f6638 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@statuscode.ch>
Date: Sun, 26 Aug 2012 15:43:34 +0200
Subject: [PATCH 0915/1224] Remove some empty lines

---
 apps/impress/templates/presentations.php | 21 ++++-----------------
 1 file changed, 4 insertions(+), 17 deletions(-)

diff --git a/apps/impress/templates/presentations.php b/apps/impress/templates/presentations.php
index ab75802b35..532d3660df 100755
--- a/apps/impress/templates/presentations.php
+++ b/apps/impress/templates/presentations.php
@@ -1,30 +1,17 @@
 <?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('<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>');
-	
-	
-	
-}
-
-
+}
\ No newline at end of file

From 4885a52ba44ffa13aac9df0ba5c889feb477b467 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@statuscode.ch>
Date: Sun, 26 Aug 2012 16:05:40 +0200
Subject: [PATCH 0916/1224] Check if app is enabled

---
 apps/impress/documentation.php | 1 +
 apps/impress/index.php         | 1 +
 apps/impress/player.php        | 1 +
 3 files changed, 3 insertions(+)

diff --git a/apps/impress/documentation.php b/apps/impress/documentation.php
index 17a97432a4..1047262a67 100755
--- a/apps/impress/documentation.php
+++ b/apps/impress/documentation.php
@@ -24,6 +24,7 @@
 require_once('lib/impress.php');
 
 OCP\User::checkLoggedIn();
+OCP\JSON::checkAppEnabled('impress');
 OCP\App::setActiveNavigationEntry( 'impress_index' );
 
 
diff --git a/apps/impress/index.php b/apps/impress/index.php
index c7213d8661..8648cb27e7 100755
--- a/apps/impress/index.php
+++ b/apps/impress/index.php
@@ -24,6 +24,7 @@
 require_once('lib/impress.php');
 
 OCP\User::checkLoggedIn();
+OCP\JSON::checkAppEnabled('impress');
 OCP\App::setActiveNavigationEntry( 'impress_index' );
 
 
diff --git a/apps/impress/player.php b/apps/impress/player.php
index cd534757fb..1f2423d856 100755
--- a/apps/impress/player.php
+++ b/apps/impress/player.php
@@ -25,6 +25,7 @@ require_once('lib/impress.php');
 
 // Check if we are a user
 OCP\User::checkLoggedIn();
+OCP\JSON::checkAppEnabled('impress');
 
 $filename = OCP\Util::sanitizeHTML($_GET['file']);
 $title = OCP\Util::sanitizeHTML($_GET['name']);

From 2028c8116122f56d8087716e42162fdc651819d3 Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@statuscode.ch>
Date: Sun, 26 Aug 2012 16:08:58 +0200
Subject: [PATCH 0917/1224] OC_Util is better thank OCP\JSON because it'll
 redirect the user to the index.php instead of displaying an error

---
 apps/impress/documentation.php | 2 +-
 apps/impress/index.php         | 2 +-
 apps/impress/player.php        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/impress/documentation.php b/apps/impress/documentation.php
index 1047262a67..5a153deb4c 100755
--- a/apps/impress/documentation.php
+++ b/apps/impress/documentation.php
@@ -24,7 +24,7 @@
 require_once('lib/impress.php');
 
 OCP\User::checkLoggedIn();
-OCP\JSON::checkAppEnabled('impress');
+OC_Util::checkAppEnabled('impress');
 OCP\App::setActiveNavigationEntry( 'impress_index' );
 
 
diff --git a/apps/impress/index.php b/apps/impress/index.php
index 8648cb27e7..59960ba96f 100755
--- a/apps/impress/index.php
+++ b/apps/impress/index.php
@@ -24,7 +24,7 @@
 require_once('lib/impress.php');
 
 OCP\User::checkLoggedIn();
-OCP\JSON::checkAppEnabled('impress');
+OC_Util::checkAppEnabled('impress');
 OCP\App::setActiveNavigationEntry( 'impress_index' );
 
 
diff --git a/apps/impress/player.php b/apps/impress/player.php
index 1f2423d856..074badf5df 100755
--- a/apps/impress/player.php
+++ b/apps/impress/player.php
@@ -25,7 +25,7 @@ require_once('lib/impress.php');
 
 // Check if we are a user
 OCP\User::checkLoggedIn();
-OCP\JSON::checkAppEnabled('impress');
+OC_Util::checkAppEnabled('impress');
 
 $filename = OCP\Util::sanitizeHTML($_GET['file']);
 $title = OCP\Util::sanitizeHTML($_GET['name']);

From 5a4854079fbf9c6b359c1c9afdaeb5c6e19609e8 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Sun, 26 Aug 2012 16:24:25 +0200
Subject: [PATCH 0918/1224] implement getHome in OC_User

---
 lib/user.php           | 21 +++++++++++++++++++++
 lib/user/backend.php   | 11 +++++++++++
 lib/user/database.php  | 13 +++++++++++++
 lib/user/example.php   | 10 ++++++++++
 lib/user/http.php      | 13 +++++++++++++
 lib/user/interface.php |  7 +++++++
 6 files changed, 75 insertions(+)

diff --git a/lib/user.php b/lib/user.php
index 06a56b7f4a..97ec0c1050 100644
--- a/lib/user.php
+++ b/lib/user.php
@@ -332,6 +332,27 @@ class OC_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 static function getHome($uid){
+		foreach(self::$_usedBackends as $backend){
+			if($backend->implementsActions(OC_USER_BACKEND_GET_HOME)){
+				$result=$backend->getHome($uid);
+				if($result){
+					return $result;
+				}
+			}
+		}
+		return OC_Config::getValue( "datadirectory", OC::$SERVERROOT."/data" ) . '/' . $user;
+	}
+
 	/**
 	 * @brief Get a list of all users
 	 * @returns array with all uids
diff --git a/lib/user/backend.php b/lib/user/backend.php
index f67908cdac..36e4bd9f76 100644
--- a/lib/user/backend.php
+++ b/lib/user/backend.php
@@ -34,6 +34,7 @@ define('OC_USER_BACKEND_NOT_IMPLEMENTED',   -501);
 define('OC_USER_BACKEND_CREATE_USER',       0x000001);
 define('OC_USER_BACKEND_SET_PASSWORD',      0x000010);
 define('OC_USER_BACKEND_CHECK_PASSWORD',    0x000100);
+define('OC_USER_BACKEND_GET_HOME',			0x001000);
 
 
 /**
@@ -48,6 +49,7 @@ abstract class OC_User_Backend implements OC_User_Interface {
 		OC_USER_BACKEND_CREATE_USER => 'createUser',
 		OC_USER_BACKEND_SET_PASSWORD => 'setPassword',
 		OC_USER_BACKEND_CHECK_PASSWORD => 'checkPassword',
+		OC_USER_BACKEND_GET_HOME => 'getHome',
 	);
 
 	/**
@@ -109,4 +111,13 @@ abstract class OC_User_Backend implements OC_User_Interface {
 	public function userExists($uid){
 		return false;
 	}
+
+	/**
+	* @brief get the user's home directory
+	* @param string $uid the username
+	* @return boolean
+	*/
+	public function getHome($uid){
+		return false;
+	}
 }
diff --git a/lib/user/database.php b/lib/user/database.php
index dff4d145fc..12cd804641 100644
--- a/lib/user/database.php
+++ b/lib/user/database.php
@@ -175,4 +175,17 @@ class OC_User_Database extends OC_User_Backend {
 		
 		return $result->numRows() > 0;
 	}
+
+	/**
+	* @brief get the user's home directory
+	* @param string $uid the username
+	* @return boolean
+	*/
+	public function getHome($uid){
+		if($this->userExists($uid)){
+			return OC_Config::getValue( "datadirectory", OC::$SERVERROOT."/data" ) . '/' . $user;
+		}else{
+			return false;
+		}
+	}
 }
diff --git a/lib/user/example.php b/lib/user/example.php
index 77246d8136..b2d0dc2541 100644
--- a/lib/user/example.php
+++ b/lib/user/example.php
@@ -57,4 +57,14 @@ abstract class OC_User_Example extends OC_User_Backend {
 		* returns the user id or false
 		*/
 	abstract public function checkPassword($uid, $password);
+
+	/**
+		* @brief get the user's home directory
+		* @param $uid The username
+		* @returns string
+		*
+		* get the user's home directory
+		* returns the path or false
+		*/
+	abstract public function getHome($uid);
 }
diff --git a/lib/user/http.php b/lib/user/http.php
index 009aa30c6f..87f3347a23 100644
--- a/lib/user/http.php
+++ b/lib/user/http.php
@@ -90,4 +90,17 @@ class OC_User_HTTP extends OC_User_Backend {
 	public function userExists($uid){
 		return $this->matchUrl($uid);
 	}
+
+	/**
+	* @brief get the user's home directory
+	* @param string $uid the username
+	* @return boolean
+	*/
+	public function getHome($uid){
+		if($this->userExists($uid)){
+			return OC_Config::getValue( "datadirectory", OC::$SERVERROOT."/data" ) . '/' . $user;
+		}else{
+			return false;
+		}
+	}
 }
\ No newline at end of file
diff --git a/lib/user/interface.php b/lib/user/interface.php
index a4903898fb..5e5efe0010 100644
--- a/lib/user/interface.php
+++ b/lib/user/interface.php
@@ -57,4 +57,11 @@ interface OC_User_Interface {
 	*/
 	public function userExists($uid);
 
+	/**
+	* @brief get the user's home directory
+	* @param string $uid the username
+	* @return boolean
+	*/
+	public function getHome($uid);
+
 }
\ No newline at end of file

From 8c8496aff9fb634aa98a7e49999cdf2e724a35a1 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Sun, 26 Aug 2012 16:29:10 +0200
Subject: [PATCH 0919/1224] don't allow group admins to change admin's accounts

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

diff --git a/lib/subadmin.php b/lib/subadmin.php
index 8d4f413b10..718fe922ff 100644
--- a/lib/subadmin.php
+++ b/lib/subadmin.php
@@ -141,6 +141,9 @@ class OC_SubAdmin{
 		if(!self::isSubAdmin($subadmin)){
 			return false;
 		}
+		if(OC_Group::inGroup($user, 'admin')){
+			return false;
+		}
 		$accessiblegroups = self::getSubAdminsGroups($subadmin);
 		foreach($accessiblegroups as $accessiblegroup){
 			if(OC_Group::inGroup($user, $accessiblegroup)){

From 32bad688bdb4fea55eba9d4255fc55f1c60a0aca Mon Sep 17 00:00:00 2001
From: Lukas Reschke <lukas@statuscode.ch>
Date: Sun, 26 Aug 2012 17:22:37 +0200
Subject: [PATCH 0920/1224] Wrong function

https://github.com/owncloud/core/commit/2028c8116122f56d8087716e42162fdc
651819d3#commitcomment-1766755
---
 apps/impress/documentation.php | 2 +-
 apps/impress/index.php         | 2 +-
 apps/impress/player.php        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/impress/documentation.php b/apps/impress/documentation.php
index 5a153deb4c..1047262a67 100755
--- a/apps/impress/documentation.php
+++ b/apps/impress/documentation.php
@@ -24,7 +24,7 @@
 require_once('lib/impress.php');
 
 OCP\User::checkLoggedIn();
-OC_Util::checkAppEnabled('impress');
+OCP\JSON::checkAppEnabled('impress');
 OCP\App::setActiveNavigationEntry( 'impress_index' );
 
 
diff --git a/apps/impress/index.php b/apps/impress/index.php
index 59960ba96f..8648cb27e7 100755
--- a/apps/impress/index.php
+++ b/apps/impress/index.php
@@ -24,7 +24,7 @@
 require_once('lib/impress.php');
 
 OCP\User::checkLoggedIn();
-OC_Util::checkAppEnabled('impress');
+OCP\JSON::checkAppEnabled('impress');
 OCP\App::setActiveNavigationEntry( 'impress_index' );
 
 
diff --git a/apps/impress/player.php b/apps/impress/player.php
index 074badf5df..1f2423d856 100755
--- a/apps/impress/player.php
+++ b/apps/impress/player.php
@@ -25,7 +25,7 @@ require_once('lib/impress.php');
 
 // Check if we are a user
 OCP\User::checkLoggedIn();
-OC_Util::checkAppEnabled('impress');
+OCP\JSON::checkAppEnabled('impress');
 
 $filename = OCP\Util::sanitizeHTML($_GET['file']);
 $title = OCP\Util::sanitizeHTML($_GET['name']);

From 72e9a2ce57ee88503db83614cec5ccda71f0b58e Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <frank@owncloud.org>
Date: Sun, 26 Aug 2012 17:30:07 +0200
Subject: [PATCH 0921/1224] moved to apps repository

---
 apps/admin_audit/appinfo/app.php              |    21 -
 apps/admin_audit/appinfo/info.xml             |    11 -
 apps/admin_audit/lib/hooks_handlers.php       |    73 -
 apps/admin_dependencies_chk/appinfo/app.php   |     4 -
 apps/admin_dependencies_chk/appinfo/info.xml  |    10 -
 apps/admin_dependencies_chk/appinfo/version   |     1 -
 apps/admin_dependencies_chk/css/style.css     |     9 -
 apps/admin_dependencies_chk/l10n/.gitkeep     |     0
 apps/admin_dependencies_chk/l10n/ca.php       |    14 -
 apps/admin_dependencies_chk/l10n/cs_CZ.php    |    14 -
 apps/admin_dependencies_chk/l10n/de.php       |    14 -
 apps/admin_dependencies_chk/l10n/el.php       |     4 -
 apps/admin_dependencies_chk/l10n/eo.php       |    14 -
 apps/admin_dependencies_chk/l10n/es.php       |     4 -
 apps/admin_dependencies_chk/l10n/et_EE.php    |    14 -
 apps/admin_dependencies_chk/l10n/fi_FI.php    |     9 -
 apps/admin_dependencies_chk/l10n/fr.php       |    14 -
 apps/admin_dependencies_chk/l10n/it.php       |    14 -
 apps/admin_dependencies_chk/l10n/ja_JP.php    |    14 -
 apps/admin_dependencies_chk/l10n/lt_LT.php    |    14 -
 apps/admin_dependencies_chk/l10n/nb_NO.php    |    14 -
 apps/admin_dependencies_chk/l10n/pl.php       |    14 -
 apps/admin_dependencies_chk/l10n/ru.php       |    14 -
 apps/admin_dependencies_chk/l10n/sl.php       |    14 -
 apps/admin_dependencies_chk/l10n/sv.php       |    14 -
 apps/admin_dependencies_chk/l10n/th_TH.php    |    14 -
 apps/admin_dependencies_chk/settings.php      |   102 -
 .../templates/settings.php                    |    16 -
 apps/admin_migrate/appinfo/app.php            |    33 -
 apps/admin_migrate/appinfo/info.xml           |    11 -
 apps/admin_migrate/appinfo/version            |     1 -
 apps/admin_migrate/l10n/.gitkeep              |     0
 apps/admin_migrate/l10n/ca.php                |     5 -
 apps/admin_migrate/l10n/cs_CZ.php             |     5 -
 apps/admin_migrate/l10n/da.php                |     4 -
 apps/admin_migrate/l10n/de.php                |     5 -
 apps/admin_migrate/l10n/el.php                |     4 -
 apps/admin_migrate/l10n/eo.php                |     5 -
 apps/admin_migrate/l10n/es.php                |     5 -
 apps/admin_migrate/l10n/et_EE.php             |     5 -
 apps/admin_migrate/l10n/fi_FI.php             |     4 -
 apps/admin_migrate/l10n/fr.php                |     5 -
 apps/admin_migrate/l10n/gl.php                |     5 -
 apps/admin_migrate/l10n/it.php                |     5 -
 apps/admin_migrate/l10n/ja_JP.php             |     5 -
 apps/admin_migrate/l10n/lt_LT.php             |     5 -
 apps/admin_migrate/l10n/nb_NO.php             |     5 -
 apps/admin_migrate/l10n/nl.php                |     5 -
 apps/admin_migrate/l10n/pl.php                |     5 -
 apps/admin_migrate/l10n/ru.php                |     5 -
 apps/admin_migrate/l10n/sl.php                |     5 -
 apps/admin_migrate/l10n/sv.php                |     5 -
 apps/admin_migrate/l10n/th_TH.php             |     5 -
 apps/admin_migrate/settings.php               |    57 -
 apps/admin_migrate/templates/settings.php     |    31 -
 apps/bookmarks/addBm.php                      |    33 -
 apps/bookmarks/ajax/addBookmark.php           |    37 -
 apps/bookmarks/ajax/delBookmark.php           |    37 -
 apps/bookmarks/ajax/editBookmark.php          |    90 -
 apps/bookmarks/ajax/recordClick.php           |    39 -
 apps/bookmarks/ajax/updateList.php            |    45 -
 apps/bookmarks/appinfo/app.php                |    19 -
 apps/bookmarks/appinfo/database.xml           |   112 -
 apps/bookmarks/appinfo/info.xml               |    11 -
 apps/bookmarks/appinfo/migrate.php            |    68 -
 apps/bookmarks/appinfo/version                |     1 -
 apps/bookmarks/bookmarksHelper.php            |   130 -
 apps/bookmarks/css/bookmarks.css              |    87 -
 apps/bookmarks/img/bookmarks.png              |   Bin 398 -> 0 bytes
 apps/bookmarks/index.php                      |    37 -
 apps/bookmarks/js/addBm.js                    |    16 -
 apps/bookmarks/js/bookmarks.js                |   201 -
 apps/bookmarks/js/bookmarksearch.js           |    23 -
 apps/bookmarks/l10n/bg_BG.php                 |    12 -
 apps/bookmarks/l10n/ca.php                    |    12 -
 apps/bookmarks/l10n/cs_CZ.php                 |    12 -
 apps/bookmarks/l10n/de.php                    |    12 -
 apps/bookmarks/l10n/el.php                    |    12 -
 apps/bookmarks/l10n/eo.php                    |    11 -
 apps/bookmarks/l10n/es.php                    |    12 -
 apps/bookmarks/l10n/et_EE.php                 |    10 -
 apps/bookmarks/l10n/fa.php                    |     8 -
 apps/bookmarks/l10n/fi_FI.php                 |    12 -
 apps/bookmarks/l10n/fr.php                    |    12 -
 apps/bookmarks/l10n/it.php                    |    12 -
 apps/bookmarks/l10n/lt_LT.php                 |     3 -
 apps/bookmarks/l10n/nb_NO.php                 |    12 -
 apps/bookmarks/l10n/nl.php                    |    11 -
 apps/bookmarks/l10n/ru.php                    |    11 -
 apps/bookmarks/l10n/sl.php                    |    12 -
 apps/bookmarks/l10n/sv.php                    |    12 -
 apps/bookmarks/l10n/th_TH.php                 |    12 -
 apps/bookmarks/l10n/xgettextfiles             |     5 -
 apps/bookmarks/l10n/zh_CN.php                 |    12 -
 apps/bookmarks/lib/bookmarks.php              |   147 -
 apps/bookmarks/lib/search.php                 |    47 -
 apps/bookmarks/settings.php                   |    11 -
 apps/bookmarks/templates/addBm.php            |    11 -
 apps/bookmarks/templates/bookmarklet.php      |     8 -
 apps/bookmarks/templates/list.php             |    26 -
 apps/bookmarks/templates/settings.php         |    17 -
 apps/calendar/ajax/cache/rescan.php           |    15 -
 apps/calendar/ajax/cache/status.php           |    22 -
 apps/calendar/ajax/calendar/activation.php    |    25 -
 apps/calendar/ajax/calendar/delete.php        |    25 -
 apps/calendar/ajax/calendar/edit.form.php     |    19 -
 apps/calendar/ajax/calendar/edit.php          |    24 -
 apps/calendar/ajax/calendar/new.form.php      |    22 -
 apps/calendar/ajax/calendar/new.php           |    42 -
 apps/calendar/ajax/calendar/overview.php      |    12 -
 apps/calendar/ajax/calendar/update.php        |    49 -
 apps/calendar/ajax/categories/rescan.php      |    43 -
 apps/calendar/ajax/changeview.php             |    21 -
 apps/calendar/ajax/event/delete.php           |    21 -
 apps/calendar/ajax/event/edit.form.php        |   272 -
 apps/calendar/ajax/event/edit.php             |    46 -
 apps/calendar/ajax/event/move.php             |    47 -
 apps/calendar/ajax/event/new.form.php         |    75 -
 apps/calendar/ajax/event/new.php              |    25 -
 apps/calendar/ajax/event/resize.php           |    39 -
 apps/calendar/ajax/events.php                 |    30 -
 apps/calendar/ajax/import/calendarcheck.php   |    18 -
 apps/calendar/ajax/import/dialog.php          |    13 -
 apps/calendar/ajax/import/dropimport.php      |    32 -
 apps/calendar/ajax/import/import.php          |   151 -
 apps/calendar/ajax/settings/getfirstday.php   |    11 -
 .../ajax/settings/gettimezonedetection.php    |    11 -
 apps/calendar/ajax/settings/guesstimezone.php |    26 -
 apps/calendar/ajax/settings/setfirstday.php   |    16 -
 apps/calendar/ajax/settings/settimeformat.php |    16 -
 apps/calendar/ajax/settings/settimezone.php   |    26 -
 apps/calendar/ajax/settings/timeformat.php    |    11 -
 .../ajax/settings/timezonedetection.php       |    16 -
 apps/calendar/ajax/share/activation.php       |    11 -
 apps/calendar/ajax/share/changepermission.php |    50 -
 apps/calendar/ajax/share/dropdown.php         |    18 -
 apps/calendar/ajax/share/share.php            |    61 -
 apps/calendar/ajax/share/unshare.php          |    53 -
 apps/calendar/appinfo/app.php                 |    44 -
 apps/calendar/appinfo/database.xml            |   345 -
 apps/calendar/appinfo/info.xml                |    19 -
 apps/calendar/appinfo/remote.php              |    46 -
 apps/calendar/appinfo/update.php              |    24 -
 apps/calendar/appinfo/version                 |     1 -
 apps/calendar/caldav.php                      |     6 -
 apps/calendar/calendar.php                    |    12 -
 apps/calendar/css/import.css                  |    14 -
 apps/calendar/css/style.css                   |   142 -
 apps/calendar/export.php                      |    30 -
 apps/calendar/img/Icon License                |     2 -
 apps/calendar/img/icon.png                    |   Bin 360 -> 0 bytes
 apps/calendar/img/icon.svg                    |    54 -
 apps/calendar/index.php                       |    71 -
 apps/calendar/js/calendar.js                  |   935 -
 apps/calendar/js/geo.js                       |    20 -
 apps/calendar/js/loader.js                    |   179 -
 apps/calendar/js/settings.js                  |    66 -
 apps/calendar/l10n/ar.php                     |   171 -
 apps/calendar/l10n/bg_BG.php                  |    84 -
 apps/calendar/l10n/ca.php                     |   198 -
 apps/calendar/l10n/cs_CZ.php                  |   198 -
 apps/calendar/l10n/da.php                     |   188 -
 apps/calendar/l10n/de.php                     |   198 -
 apps/calendar/l10n/el.php                     |   192 -
 apps/calendar/l10n/eo.php                     |   198 -
 apps/calendar/l10n/es.php                     |   192 -
 apps/calendar/l10n/et_EE.php                  |   156 -
 apps/calendar/l10n/eu.php                     |   183 -
 apps/calendar/l10n/fa.php                     |   156 -
 apps/calendar/l10n/fi_FI.php                  |   159 -
 apps/calendar/l10n/fr.php                     |   192 -
 apps/calendar/l10n/gl.php                     |   156 -
 apps/calendar/l10n/he.php                     |   156 -
 apps/calendar/l10n/hr.php                     |   147 -
 apps/calendar/l10n/hu_HU.php                  |   156 -
 apps/calendar/l10n/hy.php                     |    11 -
 apps/calendar/l10n/ia.php                     |   110 -
 apps/calendar/l10n/id.php                     |    37 -
 apps/calendar/l10n/it.php                     |   198 -
 apps/calendar/l10n/ja_JP.php                  |   198 -
 apps/calendar/l10n/ko.php                     |   156 -
 apps/calendar/l10n/lb.php                     |   123 -
 apps/calendar/l10n/lt_LT.php                  |   131 -
 apps/calendar/l10n/mk.php                     |   156 -
 apps/calendar/l10n/ms_MY.php                  |   156 -
 apps/calendar/l10n/nb_NO.php                  |   147 -
 apps/calendar/l10n/nl.php                     |   198 -
 apps/calendar/l10n/nn_NO.php                  |   125 -
 apps/calendar/l10n/pl.php                     |   182 -
 apps/calendar/l10n/pt_BR.php                  |   156 -
 apps/calendar/l10n/pt_PT.php                  |   198 -
 apps/calendar/l10n/ro.php                     |   151 -
 apps/calendar/l10n/ru.php                     |   198 -
 apps/calendar/l10n/sk_SK.php                  |   156 -
 apps/calendar/l10n/sl.php                     |   198 -
 apps/calendar/l10n/sr.php                     |    60 -
 apps/calendar/l10n/sr@latin.php               |    60 -
 apps/calendar/l10n/sv.php                     |   192 -
 apps/calendar/l10n/th_TH.php                  |   198 -
 apps/calendar/l10n/tr.php                     |   192 -
 apps/calendar/l10n/uk.php                     |    98 -
 apps/calendar/l10n/vi.php                     |   131 -
 apps/calendar/l10n/xgettextfiles              |    12 -
 apps/calendar/l10n/zh_CN.GB2312.php           |   121 -
 apps/calendar/l10n/zh_CN.php                  |   152 -
 apps/calendar/l10n/zh_TW.php                  |   151 -
 apps/calendar/lib/alarm.php                   |    13 -
 apps/calendar/lib/app.php                     |   436 -
 apps/calendar/lib/attendees.php               |    13 -
 apps/calendar/lib/calendar.php                |   308 -
 apps/calendar/lib/export.php                  |    94 -
 apps/calendar/lib/hooks.php                   |    40 -
 apps/calendar/lib/import.php                  |   336 -
 apps/calendar/lib/object.php                  |   937 -
 apps/calendar/lib/repeat.php                  |   204 -
 apps/calendar/lib/sabre/backend.php           |   318 -
 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 -
 apps/calendar/lib/search.php                  |    49 -
 apps/calendar/lib/share.php                   |   295 -
 apps/calendar/lib/share/calendar.php          |   111 -
 apps/calendar/lib/share/event.php             |    40 -
 apps/calendar/lib/share_backend.php           |    44 -
 apps/calendar/settings.php                    |    17 -
 apps/calendar/share.php                       |    31 -
 apps/calendar/templates/calendar.php          |    57 -
 .../templates/part.choosecalendar.php         |    52 -
 .../part.choosecalendar.rowfields.php         |    21 -
 .../part.choosecalendar.rowfields.shared.php  |     4 -
 apps/calendar/templates/part.editcalendar.php |    44 -
 apps/calendar/templates/part.editevent.php    |    13 -
 apps/calendar/templates/part.eventform.php    |   251 -
 apps/calendar/templates/part.import.php       |    58 -
 apps/calendar/templates/part.newevent.php     |     9 -
 apps/calendar/templates/part.showevent.php    |   243 -
 apps/calendar/templates/settings.php          |   101 -
 apps/calendar/templates/share.dropdown.php    |    77 -
 apps/contacts/ajax/addressbook/activate.php   |    32 -
 apps/contacts/ajax/addressbook/add.php        |    37 -
 apps/contacts/ajax/addressbook/delete.php     |    36 -
 apps/contacts/ajax/addressbook/update.php     |    39 -
 .../ajax/categories/categoriesfor.php         |    34 -
 apps/contacts/ajax/categories/delete.php      |    48 -
 apps/contacts/ajax/categories/list.php        |    15 -
 apps/contacts/ajax/categories/rescan.php      |    17 -
 apps/contacts/ajax/contact/add.php            |    62 -
 apps/contacts/ajax/contact/addproperty.php    |   168 -
 apps/contacts/ajax/contact/delete.php         |    44 -
 apps/contacts/ajax/contact/deleteproperty.php |    54 -
 apps/contacts/ajax/contact/details.php        |    62 -
 apps/contacts/ajax/contact/list.php           |    97 -
 apps/contacts/ajax/contact/move.php           |    29 -
 apps/contacts/ajax/contact/saveproperty.php   |   176 -
 apps/contacts/ajax/cropphoto.php              |    36 -
 apps/contacts/ajax/currentphoto.php           |    53 -
 apps/contacts/ajax/editaddress.php            |    41 -
 apps/contacts/ajax/editname.php               |    34 -
 apps/contacts/ajax/importdialog.php           |    15 -
 apps/contacts/ajax/loadcard.php               |    58 -
 apps/contacts/ajax/loadintro.php              |    31 -
 apps/contacts/ajax/loghandler.php             |    44 -
 apps/contacts/ajax/oc_photo.php               |    62 -
 apps/contacts/ajax/savecrop.php               |   121 -
 apps/contacts/ajax/selectaddressbook.php      |    24 -
 apps/contacts/ajax/uploadimport.php           |    80 -
 apps/contacts/ajax/uploadphoto.php            |   116 -
 apps/contacts/appinfo/app.php                 |    31 -
 apps/contacts/appinfo/database.xml            |   137 -
 apps/contacts/appinfo/info.xml                |    16 -
 apps/contacts/appinfo/migrate.php             |    70 -
 apps/contacts/appinfo/remote.php              |    61 -
 apps/contacts/appinfo/update.php              |    25 -
 apps/contacts/appinfo/version                 |     1 -
 apps/contacts/carddav.php                     |     6 -
 apps/contacts/css/contacts.css                |   155 -
 apps/contacts/css/jquery.Jcrop.css            |    84 -
 apps/contacts/css/jquery.combobox.css         |     3 -
 apps/contacts/export.php                      |    38 -
 apps/contacts/img/Jcrop.gif                   |   Bin 329 -> 0 bytes
 apps/contacts/img/contact-new.png             |   Bin 525 -> 0 bytes
 apps/contacts/img/contact-new.svg             |   129 -
 apps/contacts/img/globe.svg                   |   102 -
 apps/contacts/img/person.png                  |   Bin 852 -> 0 bytes
 apps/contacts/img/person.svg                  |   175 -
 apps/contacts/img/person_large.png            |   Bin 6993 -> 0 bytes
 apps/contacts/import.php                      |   150 -
 apps/contacts/index.php                       |    74 -
 apps/contacts/js/LICENSE.jquery.inview        |    41 -
 apps/contacts/js/contacts.js                  |  2277 --
 apps/contacts/js/expanding.js                 |   118 -
 apps/contacts/js/jquery.Jcrop.js              |  1765 -
 apps/contacts/js/jquery.Jcrop.min.js          |   255 -
 apps/contacts/js/jquery.combobox.js           |   158 -
 apps/contacts/js/jquery.inview.js             |   134 -
 apps/contacts/js/jquery.inview.txt            |    15 -
 apps/contacts/js/jquery.multi-autocomplete.js |    94 -
 apps/contacts/js/loader.js                    |    86 -
 apps/contacts/js/settings.js                  |   196 -
 apps/contacts/l10n/.gitkeep                   |     0
 apps/contacts/l10n/ar.php                     |    44 -
 apps/contacts/l10n/ca.php                     |   229 -
 apps/contacts/l10n/cs_CZ.php                  |   229 -
 apps/contacts/l10n/da.php                     |   158 -
 apps/contacts/l10n/de.php                     |   229 -
 apps/contacts/l10n/el.php                     |   229 -
 apps/contacts/l10n/eo.php                     |   190 -
 apps/contacts/l10n/es.php                     |   208 -
 apps/contacts/l10n/et_EE.php                  |   155 -
 apps/contacts/l10n/eu.php                     |   169 -
 apps/contacts/l10n/fa.php                     |   158 -
 apps/contacts/l10n/fi_FI.php                  |   159 -
 apps/contacts/l10n/fr.php                     |   229 -
 apps/contacts/l10n/gl.php                     |   157 -
 apps/contacts/l10n/he.php                     |   135 -
 apps/contacts/l10n/hr.php                     |    93 -
 apps/contacts/l10n/hu_HU.php                  |   158 -
 apps/contacts/l10n/ia.php                     |    81 -
 apps/contacts/l10n/it.php                     |   229 -
 apps/contacts/l10n/ja_JP.php                  |   229 -
 apps/contacts/l10n/ko.php                     |   155 -
 apps/contacts/l10n/lb.php                     |    86 -
 apps/contacts/l10n/lt_LT.php                  |    53 -
 apps/contacts/l10n/mk.php                     |   158 -
 apps/contacts/l10n/ms_MY.php                  |   178 -
 apps/contacts/l10n/nb_NO.php                  |   134 -
 apps/contacts/l10n/nl.php                     |   220 -
 apps/contacts/l10n/nn_NO.php                  |    44 -
 apps/contacts/l10n/pl.php                     |   219 -
 apps/contacts/l10n/pt_BR.php                  |   158 -
 apps/contacts/l10n/pt_PT.php                  |   224 -
 apps/contacts/l10n/ro.php                     |    76 -
 apps/contacts/l10n/ru.php                     |   229 -
 apps/contacts/l10n/sk_SK.php                  |   178 -
 apps/contacts/l10n/sl.php                     |   229 -
 apps/contacts/l10n/sr.php                     |    39 -
 apps/contacts/l10n/sr@latin.php               |    27 -
 apps/contacts/l10n/sv.php                     |   229 -
 apps/contacts/l10n/th_TH.php                  |   207 -
 apps/contacts/l10n/tr.php                     |   193 -
 apps/contacts/l10n/uk.php                     |    24 -
 apps/contacts/l10n/vi.php                     |    41 -
 apps/contacts/l10n/xgettextfiles              |    18 -
 apps/contacts/l10n/zh_CN.php                  |   158 -
 apps/contacts/l10n/zh_TW.php                  |    75 -
 apps/contacts/lib/addressbook.php             |   341 -
 apps/contacts/lib/app.php                     |   331 -
 apps/contacts/lib/hooks.php                   |   116 -
 apps/contacts/lib/sabre/addressbook.php       |   128 -
 apps/contacts/lib/sabre/addressbookroot.php   |    45 -
 apps/contacts/lib/sabre/backend.php           |   210 -
 apps/contacts/lib/sabre/card.php              |    94 -
 apps/contacts/lib/sabre/useraddressbooks.php  |    45 -
 apps/contacts/lib/sabre/vcfexportplugin.php   |   100 -
 apps/contacts/lib/search.php                  |    21 -
 apps/contacts/lib/share/addressbook.php       |    94 -
 apps/contacts/lib/share/contact.php           |    53 -
 apps/contacts/lib/vcard.php                   |   733 -
 apps/contacts/photo.php                       |    83 -
 apps/contacts/settings.php                    |     6 -
 apps/contacts/templates/index.php             |    74 -
 apps/contacts/templates/part.contact.php      |   145 -
 apps/contacts/templates/part.cropphoto.php    |    67 -
 .../templates/part.edit_address_dialog.php    |    63 -
 .../templates/part.edit_name_dialog.php       |    58 -
 apps/contacts/templates/part.import.php       |    27 -
 apps/contacts/templates/part.no_contacts.php  |     7 -
 .../templates/part.selectaddressbook.php      |    34 -
 apps/contacts/templates/settings.php          |    55 -
 apps/contacts/thumbnail.php                   |    98 -
 apps/contacts/tmpphoto.php                    |    34 -
 apps/external/ajax/setsites.php               |    25 -
 apps/external/appinfo/app.php                 |    33 -
 apps/external/appinfo/info.xml                |    10 -
 apps/external/appinfo/version                 |     1 -
 apps/external/css/style.css                   |    14 -
 apps/external/img/external.png                |   Bin 412 -> 0 bytes
 apps/external/img/external.svg                |   292 -
 apps/external/index.php                       |    42 -
 apps/external/js/admin.js                     |    57 -
 apps/external/lib/external.php                |    34 -
 apps/external/settings.php                    |     9 -
 apps/external/templates/frame.php             |    26 -
 apps/external/templates/settings.php          |    21 -
 apps/files_archive/appinfo/app.php            |    13 -
 apps/files_archive/appinfo/info.xml           |    14 -
 apps/files_archive/appinfo/version            |     1 -
 apps/files_archive/js/archive.js              |    19 -
 apps/files_archive/lib/storage.php            |   174 -
 apps/files_archive/tests/data/data.tar.gz     |   Bin 4195 -> 0 bytes
 apps/files_archive/tests/data/data.zip        |   Bin 4705 -> 0 bytes
 apps/files_archive/tests/data/lorem.txt       |     4 -
 apps/files_archive/tests/storage.php          |    39 -
 apps/files_imageviewer/appinfo/app.php        |     6 -
 apps/files_imageviewer/appinfo/info.xml       |    11 -
 apps/files_imageviewer/appinfo/version        |     1 -
 .../css/jquery.fancybox-1.3.4.css             |   359 -
 apps/files_imageviewer/img/blank.gif          |   Bin 43 -> 0 bytes
 apps/files_imageviewer/img/fancy_close.png    |   Bin 1517 -> 0 bytes
 apps/files_imageviewer/img/fancy_loading.png  |   Bin 10195 -> 0 bytes
 apps/files_imageviewer/img/fancy_nav_left.png |   Bin 1446 -> 0 bytes
 .../files_imageviewer/img/fancy_nav_right.png |   Bin 1454 -> 0 bytes
 apps/files_imageviewer/img/fancy_shadow_e.png |   Bin 107 -> 0 bytes
 apps/files_imageviewer/img/fancy_shadow_n.png |   Bin 106 -> 0 bytes
 .../files_imageviewer/img/fancy_shadow_ne.png |   Bin 347 -> 0 bytes
 .../files_imageviewer/img/fancy_shadow_nw.png |   Bin 324 -> 0 bytes
 apps/files_imageviewer/img/fancy_shadow_s.png |   Bin 111 -> 0 bytes
 .../files_imageviewer/img/fancy_shadow_se.png |   Bin 352 -> 0 bytes
 .../files_imageviewer/img/fancy_shadow_sw.png |   Bin 340 -> 0 bytes
 apps/files_imageviewer/img/fancy_shadow_w.png |   Bin 103 -> 0 bytes
 .../img/fancy_title_left.png                  |   Bin 503 -> 0 bytes
 .../img/fancy_title_main.png                  |   Bin 96 -> 0 bytes
 .../img/fancy_title_over.png                  |   Bin 70 -> 0 bytes
 .../img/fancy_title_right.png                 |   Bin 506 -> 0 bytes
 apps/files_imageviewer/img/fancybox-x.png     |   Bin 203 -> 0 bytes
 apps/files_imageviewer/img/fancybox-y.png     |   Bin 166 -> 0 bytes
 apps/files_imageviewer/img/fancybox.png       |   Bin 15287 -> 0 bytes
 .../js/jquery.fancybox-1.3.4.js               |  1156 -
 .../js/jquery.fancybox-1.3.4.pack.js          |     1 -
 .../js/jquery.mousewheel-3.0.4.js             |    78 -
 .../js/jquery.mousewheel-3.0.4.pack.js        |    14 -
 apps/files_imageviewer/js/lightbox.js         |    31 -
 apps/files_odfviewer/appinfo/app.php          |     5 -
 apps/files_odfviewer/appinfo/info.xml         |    12 -
 apps/files_odfviewer/css/odfviewer.css        |    20 -
 apps/files_odfviewer/css/webodf.css           |   196 -
 apps/files_odfviewer/js/viewer.js             |    60 -
 apps/files_odfviewer/js/webodf-debug.js       |  7124 ----
 apps/files_odfviewer/js/webodf.js             |   343 -
 apps/files_odfviewer/l10n/de.php              |     3 -
 apps/files_odfviewer/l10n/ignorelist          |     8 -
 apps/files_odfviewer/src/.gitignore           |     1 -
 apps/files_odfviewer/src/update.sh            |     9 -
 apps/files_odfviewer/src/webodf/.gitignore    |    17 -
 apps/files_odfviewer/src/webodf/.gitmodules   |     9 -
 .../files_odfviewer/src/webodf/CMakeLists.txt |   160 -
 .../src/webodf/JSCoverage.patch               |    13 -
 apps/files_odfviewer/src/webodf/packwebodf.js |    93 -
 .../src/webodf/programs/CMakeLists.txt        |    30 -
 .../programs/android/AndroidManifest.xml      |    42 -
 .../webodf/programs/android/CMakeLists.txt    |    41 -
 .../programs/android/assets/www/config.xml    |    25 -
 .../programs/android/assets/www/icon.png      |   Bin 3793 -> 0 bytes
 .../programs/android/assets/www/index.html    |    46 -
 .../android/assets/www/phonegap-1.4.1.js      |  4586 ---
 .../programs/android/assets/www/scripts.js    |  4123 --
 .../programs/android/libs/phonegap-1.4.1.jar  |   Bin 155233 -> 0 bytes
 .../android/res/drawable-hdpi/ic_launcher.png |   Bin 4147 -> 0 bytes
 .../android/res/drawable-ldpi/ic_launcher.png |   Bin 1723 -> 0 bytes
 .../android/res/drawable-mdpi/ic_launcher.png |   Bin 2574 -> 0 bytes
 .../programs/android/res/drawable/icon.png    |   Bin 3535 -> 0 bytes
 .../programs/android/res/layout/listitem.xml  |     7 -
 .../programs/android/res/layout/main.xml      |    12 -
 .../programs/android/res/layout/selector.xml  |    17 -
 .../programs/android/res/values/strings.xml   |     7 -
 .../programs/android/res/xml/phonegap.xml     |     5 -
 .../programs/android/res/xml/plugins.xml      |    19 -
 .../src/org/webodf/WebODFActivity.java        |    33 -
 .../webodf/programs/android/updateWebODF.sh   |     3 -
 .../webodf/programs/docnosis/CMakeLists.txt   |     0
 .../OpenDocument-manifest-schema-v1.0-os.rng  |   111 -
 .../OpenDocument-manifest-schema-v1.1.rng     |   111 -
 .../docnosis/OpenDocument-schema-v1.0-os.rng  | 17666 --------
 .../docnosis/OpenDocument-schema-v1.1.rng     | 17891 --------
 .../OpenDocument-strict-schema-v1.0-os.rng    |    61 -
 .../OpenDocument-strict-schema-v1.1.rng       |    61 -
 .../OpenDocument-v1.2-cos01-dsig-schema.rng   |    84 -
 ...penDocument-v1.2-cos01-manifest-schema.rng |   224 -
 .../OpenDocument-v1.2-cos01-schema.rng        | 18127 ---------
 ...on-vnd.oasis.opendocument.presentation.png |   Bin 6617 -> 0 bytes
 ...ion-vnd.oasis.opendocument.spreadsheet.png |   Bin 7002 -> 0 bytes
 ...pplication-vnd.oasis.opendocument.text.png |   Bin 6723 -> 0 bytes
 .../src/webodf/programs/docnosis/docnosis.js  |   779 -
 .../src/webodf/programs/docnosis/index.html   |    27 -
 .../programs/firefoxextension/CMakeLists.txt  |    35 -
 .../programs/firefoxextension/bootstrap.js    |    36 -
 .../programs/firefoxextension/chrome.manifest |    13 -
 .../components/odfContentHandler.js           |   196 -
 .../firefoxextension/content/odf.html         |    89 -
 .../programs/firefoxextension/install.rdf.in  |    34 -
 .../firefoxextension/packextension.js         |    77 -
 .../firefoxextension/skin/default/icon.png    |   Bin 44606 -> 0 bytes
 .../programs/ios/Default-Landscape~ipad.png   |   Bin 52135 -> 0 bytes
 .../programs/ios/Default-Portrait~ipad.png    |   Bin 51794 -> 0 bytes
 .../ios/WebODF.xcodeproj/project.pbxproj      |   512 -
 .../programs/ios/WebODF/Classes/AppDelegate.h |    52 -
 .../programs/ios/WebODF/Classes/AppDelegate.m |   202 -
 .../ios/WebODF/Classes/MainViewController.h   |    17 -
 .../ios/WebODF/Classes/MainViewController.m   |    47 -
 .../ios/WebODF/Classes/MainViewController.xib |   118 -
 .../ios/WebODF/Classes/NSData+Base64.h        |    33 -
 .../ios/WebODF/Classes/NSData+Base64.m        |   299 -
 .../programs/ios/WebODF/Classes/NativeZip.h   |    13 -
 .../programs/ios/WebODF/Classes/NativeZip.m   |    79 -
 .../ios/WebODF/Classes/WebViewCache.h         |    15 -
 .../ios/WebODF/Classes/WebViewCache.m         |    72 -
 .../ios/WebODF/Classes/minizip/crypt.h        |   132 -
 .../ios/WebODF/Classes/minizip/ioapi.c        |   177 -
 .../ios/WebODF/Classes/minizip/ioapi.h        |    75 -
 .../ios/WebODF/Classes/minizip/mztools.c      |    28 -
 .../ios/WebODF/Classes/minizip/mztools.h      |    31 -
 .../ios/WebODF/Classes/minizip/unzip.c        |  1597 -
 .../ios/WebODF/Classes/minizip/unzip.h        |   354 -
 .../webodf/programs/ios/WebODF/Classes/zip.h  |    15 -
 .../webodf/programs/ios/WebODF/PhoneGap.plist |    57 -
 .../Resources/en.lproj/Localizable.strings    |    25 -
 .../ios/WebODF/Resources/icons/icon-72.png    |   Bin 8844 -> 0 bytes
 .../ios/WebODF/Resources/icons/icon.png       |   Bin 6106 -> 0 bytes
 .../ios/WebODF/Resources/icons/icon@2x.png    |   Bin 19269 -> 0 bytes
 .../splash/Default-Landscape~ipad.png         |   Bin 52135 -> 0 bytes
 .../splash/Default-Portrait~ipad.png          |   Bin 51794 -> 0 bytes
 .../ios/WebODF/Resources/splash/Default.png   |   Bin 46308 -> 0 bytes
 .../WebODF/Resources/splash/Default@2x.png    |   Bin 50982 -> 0 bytes
 .../programs/ios/WebODF/WebODF-Info.plist     |   122 -
 .../programs/ios/WebODF/WebODF-Prefix.pch     |     7 -
 .../ios/WebODF/en.lproj/InfoPlist.strings     |     2 -
 .../src/webodf/programs/ios/WebODF/main.m     |    32 -
 .../src/webodf/programs/ios/www/index.html    |    52 -
 .../src/webodf/programs/ios/www/nativezip.js  |    84 -
 .../webodf/programs/ios/www/phonegap-1.4.1.js |  4123 --
 .../programs/nativeQtClient/CMakeLists.txt    |    39 -
 .../src/webodf/programs/nativeQtClient/README |     1 -
 .../programs/nativeQtClient/application.qrc   |    18 -
 .../webodf/programs/nativeQtClient/main.cpp   |    10 -
 .../programs/nativeQtClient/mainwindow.cpp    |   173 -
 .../programs/nativeQtClient/mainwindow.h      |    46 -
 .../programs/nativeQtClient/mainwindow.ui     |    46 -
 .../programs/nativeQtClient/odfpage.cpp       |     1 -
 .../webodf/programs/nativeQtClient/odfpage.h  |    15 -
 .../programs/nativeQtClient/odfview.cpp       |    83 -
 .../webodf/programs/nativeQtClient/odfview.h  |    29 -
 .../webodf/programs/nativeQtClient/scripts.js |    93 -
 .../webodf/programs/playbook/CMakeLists.txt   |     0
 .../webodf/programs/playbook/build_sign.bat   |    23 -
 .../src/webodf/programs/playbook/config.xml   |    26 -
 .../js/common/custom_filereader_dispatcher.js |    17 -
 .../js/common/custom_filereader_ns.js         |     8 -
 .../blackberry.custom.filereader/library.xml  |    22 -
 .../custom/filereader/CustomFileReader.as     |    34 -
 .../src/webodf/programs/playbook/icon.png     |   Bin 19269 -> 0 bytes
 .../src/webodf/programs/playbook/index.html   |    28 -
 .../src/webodf/programs/playbook/scripts.js   |   146 -
 .../programs/qtjsruntime/CMakeLists.txt       |     4 -
 .../src/webodf/programs/qtjsruntime/nam.h     |    48 -
 .../webodf/programs/qtjsruntime/nativeio.cpp  |   106 -
 .../webodf/programs/qtjsruntime/nativeio.h    |    41 -
 .../programs/qtjsruntime/pagerunner.cpp       |   191 -
 .../webodf/programs/qtjsruntime/pagerunner.h  |    68 -
 .../programs/qtjsruntime/qtjsruntime.cpp      |    20 -
 .../webodf/programs/touchui/CMakeLists.txt    |     7 -
 .../src/webodf/programs/touchui/ZoomIn.png    |   Bin 670 -> 0 bytes
 .../src/webodf/programs/touchui/ZoomOut.png   |   Bin 607 -> 0 bytes
 .../src/webodf/programs/touchui/app/app.js    |    40 -
 .../programs/touchui/app/controller/Files.js  |    82 -
 .../programs/touchui/app/model/FileSystem.js  |   265 -
 .../programs/touchui/app/store/FileStore.js   |    30 -
 .../programs/touchui/app/views/FileDetail.js  |   122 -
 .../programs/touchui/app/views/FilesList.js   |    47 -
 .../programs/touchui/app/views/OdfView.js     |   170 -
 .../programs/touchui/app/views/Viewport.js    |    54 -
 .../src/webodf/programs/touchui/go-next.png   |   Bin 1473 -> 0 bytes
 .../webodf/programs/touchui/go-previous.png   |   Bin 1536 -> 0 bytes
 .../src/webodf/programs/touchui/index.html    |    22 -
 .../src/webodf/programs/touchui/scripts.js    |   130 -
 .../webodf/programs/touchui/sencha-touch.css  |     1 -
 .../webodf/programs/touchui/sencha-touch.js   |    15 -
 .../src/webodf/programs/touchui/welcome.odt   |   Bin 62780 -> 0 bytes
 .../webodf/programs/touchui/zoom-fit-best.png |   Bin 932 -> 0 bytes
 .../programs/touchui/zoom-fit-height.png      |   Bin 947 -> 0 bytes
 .../programs/touchui/zoom-fit-width.png       |   Bin 934 -> 0 bytes
 .../simplerevisionserver/webdavserver.py      |    77 -
 .../src/webodf/webodf/APPNOTE.txt             |  3218 --
 .../src/webodf/webodf/CMakeLists.txt          |   201 -
 apps/files_odfviewer/src/webodf/webodf/README |    43 -
 .../src/webodf/webodf/compare.html            |    34 -
 .../src/webodf/webodf/compare.js              |    45 -
 .../src/webodf/webodf/deflateinmozilla.txt    |    69 -
 .../src/webodf/webodf/embedodf.html           |     2 -
 .../src/webodf/webodf/filelist.js             |    66 -
 .../src/webodf/webodf/filelister.html         |    42 -
 .../src/webodf/webodf/filelister.js           |   200 -
 .../src/webodf/webodf/flashput/Makefile       |     2 -
 .../src/webodf/webodf/flashput/PUT.as         |    18 -
 .../src/webodf/webodf/flashput/PUT.swf        |   Bin 18031 -> 0 bytes
 .../src/webodf/webodf/flashput/Request.as     |    83 -
 .../src/webodf/webodf/flashput/test.html      |    96 -
 apps/files_odfviewer/src/webodf/webodf/gui.js |   263 -
 .../src/webodf/webodf/httpserver.js           |   213 -
 .../src/webodf/webodf/index.html              |    17 -
 .../src/webodf/webodf/lib/core/Async.js       |    65 -
 .../src/webodf/webodf/lib/core/Base64.js      |   362 -
 .../src/webodf/webodf/lib/core/ByteArray.js   |    68 -
 .../webodf/webodf/lib/core/ByteArrayWriter.js |   101 -
 .../src/webodf/webodf/lib/core/Cursor.js      |   213 -
 .../src/webodf/webodf/lib/core/JSLint.js      |  6403 ---
 .../src/webodf/webodf/lib/core/PointWalker.js |   197 -
 .../src/webodf/webodf/lib/core/RawDeflate.js  |  1833 -
 .../src/webodf/webodf/lib/core/RawInflate.js  |   790 -
 .../src/webodf/webodf/lib/core/UnitTester.js  |   255 -
 .../src/webodf/webodf/lib/core/Zip.js         |   600 -
 .../webodf/webodf/lib/core/dummyxmlmodel.js_  |    21 -
 .../src/webodf/webodf/lib/export.js           |    39 -
 .../src/webodf/webodf/lib/gui/Caret.js        |    65 -
 .../src/webodf/webodf/lib/gui/PresenterUI.js  |   246 -
 .../webodf/webodf/lib/gui/SelectionMover.js   |   217 -
 .../src/webodf/webodf/lib/gui/XMLEdit.js      |   330 -
 .../src/webodf/webodf/lib/manifest.js         |    34 -
 .../src/webodf/webodf/lib/odf/FontLoader.js   |   135 -
 .../src/webodf/webodf/lib/odf/Formatting.js   |   153 -
 .../src/webodf/webodf/lib/odf/OdfCanvas.js    |   912 -
 .../src/webodf/webodf/lib/odf/OdfContainer.js |   672 -
 .../src/webodf/webodf/lib/odf/Style2CSS.js    |   632 -
 .../src/webodf/webodf/lib/odf/StyleInfo.js    |   424 -
 .../src/webodf/webodf/lib/packages.js         |    48 -
 .../src/webodf/webodf/lib/runtime.js          |  1117 -
 .../webodf/webodf/lib/xmldom/LSSerializer.js  |   197 -
 .../webodf/lib/xmldom/LSSerializerFilter.js   |    40 -
 .../lib/xmldom/OperationalTransformDOM.js     |   115 -
 .../xmldom/OperationalTransformInterface.js   |    97 -
 .../src/webodf/webodf/lib/xmldom/RelaxNG.js   |   691 -
 .../src/webodf/webodf/lib/xmldom/RelaxNG2.js  |   416 -
 .../webodf/webodf/lib/xmldom/RelaxNGParser.js |   452 -
 .../src/webodf/webodf/lib/xmldom/XPath.js     |   383 -
 .../webodf/webodf/misctests/carettest.html    |   135 -
 .../webodf/webodf/misctests/selection.html    |    27 -
 .../webodf/misctests/testselection.html       |    61 -
 .../src/webodf/webodf/misctests/testzip.js    |   181 -
 .../src/webodf/webodf/misctests/writetest.zip |   Bin 153 -> 0 bytes
 apps/files_odfviewer/src/webodf/webodf/notes  |   137 -
 .../src/webodf/webodf/odf.html                |    44 -
 .../src/webodf/webodf/odfedit.html            |    27 -
 .../src/webodf/webodf/odfedit.js              |   314 -
 .../src/webodf/webodf/relaxngToCPP.js         |   463 -
 .../src/webodf/webodf/relaxngtests/test01.rng |    36 -
 .../src/webodf/webodf/relaxngtests/test01.xml |     8 -
 .../src/webodf/webodf/relaxngtests/test02.rng |    80 -
 .../src/webodf/webodf/relaxngtests/test02.xml |    12 -
 .../src/webodf/webodf/relaxngtests/test03.rng |    16 -
 .../src/webodf/webodf/relaxngtests/test03.xml |     6 -
 .../src/webodf/webodf/relaxngtests/test04.rng |    18 -
 .../src/webodf/webodf/relaxngtests/test04.xml |     5 -
 .../src/webodf/webodf/relaxngtests/test05.rng |    42 -
 .../src/webodf/webodf/relaxngtests/test05.xml |     9 -
 .../src/webodf/webodf/relaxngtests/test06.rng |    11 -
 .../src/webodf/webodf/relaxngtests/test06.xml |     4 -
 .../src/webodf/webodf/relaxngtests/test07.rng |    52 -
 .../src/webodf/webodf/relaxngtests/test07.xml |    14 -
 .../src/webodf/webodf/relaxngtests/test08.rng |    52 -
 .../src/webodf/webodf/relaxngtests/test08.xml |    14 -
 .../src/webodf/webodf/relaxngtests/test09.rng |    30 -
 .../src/webodf/webodf/relaxngtests/test09.xml |    14 -
 .../src/webodf/webodf/relaxngtests/test10.rng |    50 -
 .../src/webodf/webodf/relaxngtests/test10.xml |    13 -
 .../src/webodf/webodf/relaxngtests/test11.rng |    75 -
 .../src/webodf/webodf/relaxngtests/test11.xml |    12 -
 .../src/webodf/webodf/relaxngtests/test12.rng |    97 -
 .../src/webodf/webodf/relaxngtests/test12.xml |    15 -
 .../src/webodf/webodf/relaxngtests/test13.rng |    71 -
 .../src/webodf/webodf/relaxngtests/test13.xml |    17 -
 .../src/webodf/webodf/relaxngtests/test14.rng |    45 -
 .../src/webodf/webodf/relaxngtests/test14.xml |    12 -
 .../src/webodf/webodf/relaxngtests/test15.rng |    47 -
 .../src/webodf/webodf/relaxngtests/test15.xml |    18 -
 .../src/webodf/webodf/relaxngtests/test16.rng |    46 -
 .../src/webodf/webodf/relaxngtests/test16.xml |    18 -
 .../src/webodf/webodf/relaxngtests/test17.rng |    51 -
 .../src/webodf/webodf/relaxngtests/test17.xml |    17 -
 .../src/webodf/webodf/relaxngtests/test18.rng |    25 -
 .../src/webodf/webodf/relaxngtests/test18.xml |     6 -
 .../src/webodf/webodf/relaxngtests/test19.rng |    43 -
 .../src/webodf/webodf/relaxngtests/test19.xml |    11 -
 .../src/webodf/webodf/relaxngtests/test20.rng |    32 -
 .../src/webodf/webodf/relaxngtests/test20.xml |    11 -
 .../src/webodf/webodf/relaxngtests/test21.rng |    47 -
 .../src/webodf/webodf/relaxngtests/test21.xml |    11 -
 .../src/webodf/webodf/relaxngtests/test22.rng |    32 -
 .../src/webodf/webodf/relaxngtests/test22.xml |    11 -
 .../src/webodf/webodf/relaxngtests/test23.rng |    33 -
 .../src/webodf/webodf/relaxngtests/test23.xml |     4 -
 .../src/webodf/webodf/roundtripodf.js         |    71 -
 .../src/webodf/webodf/roundtripzip.js         |    64 -
 .../src/webodf/webodf/styleNameRef            |   272 -
 .../src/webodf/webodf/styleNameRefs           |    57 -
 .../src/webodf/webodf/testrelaxng.js          |    91 -
 .../webodf/webodf/tests/core/Base64Tests.js   |   105 -
 .../webodf/webodf/tests/core/CursorTests.js   |   238 -
 .../webodf/tests/core/PointWalkerTests.js     |   135 -
 .../webodf/webodf/tests/core/RuntimeTests.js  |   119 -
 .../src/webodf/webodf/tests/core/ZipTests.js  |   141 -
 .../webodf/tests/core/hi-compressed.zip       |   Bin 172 -> 0 bytes
 .../webodf/tests/core/hi-uncompressed.zip     |   Bin 176 -> 0 bytes
 .../src/webodf/webodf/tests/gui/CaretTests.js |    82 -
 .../webodf/tests/gui/SelectionMoverTests.js   |   109 -
 .../webodf/webodf/tests/gui/XMLEditTests.js   |   156 -
 .../src/webodf/webodf/tests/manifest.js       |    16 -
 .../webodf/tests/resources/js-test-style.css  |    12 -
 .../src/webodf/webodf/tests/tests.html        |    22 -
 .../src/webodf/webodf/tests/tests.js          |    94 -
 .../xmldom/OperationalTransformDOMTests.js    |    79 -
 .../webodf/webodf/tests/xmldom/XPathTests.js  |   112 -
 .../webodf/tools/clippingTestImage.html       |    39 -
 .../src/webodf/webodf/tools/externs.js        |   348 -
 .../src/webodf/webodf/tools/extjsexterns.js   |   171 -
 .../src/webodf/webodf/tools/fixLicenses.py    |    81 -
 .../webodf/tools/refcheck/bootstrap.xsl       |   193 -
 .../webodf/webodf/tools/refcheck/odfkeys.xml  |   455 -
 .../src/webodf/webodf/tools/runjslint.js      |    98 -
 .../src/webodf/webodf/webodf.css              |   200 -
 .../src/webodf/webodf/xmledit/gui.js          |   119 -
 .../src/webodf/webodf/xmledit/index.html      |    16 -
 .../webodf/webodf/xmledit/requirements.dtd    |    12 -
 .../webodf/webodf/xmledit/requirements.xml    |    22 -
 .../src/webodf/webodf/xmledit/test.xml        |    22 -
 apps/files_pdfviewer/appinfo/app.php          |     8 -
 apps/files_pdfviewer/appinfo/info.xml         |    11 -
 apps/files_pdfviewer/appinfo/version          |     1 -
 apps/files_pdfviewer/css/history.png          |   Bin 539 -> 0 bytes
 apps/files_pdfviewer/css/viewer.css           |   267 -
 apps/files_pdfviewer/js/pdfjs/LICENSE         |    30 -
 apps/files_pdfviewer/js/pdfjs/README          |     7 -
 apps/files_pdfviewer/js/pdfjs/build/pdf.js    | 33830 ----------------
 .../files_pdfviewer/js/pdfjs/compatibility.js |   340 -
 apps/files_pdfviewer/js/pdfjs/update.sh       |     6 -
 apps/files_pdfviewer/js/pdfjs/viewer.js       |  1873 -
 .../js/pdfjs/web/images/bookmark.svg          |   662 -
 .../js/pdfjs/web/images/check.svg             |     3 -
 .../js/pdfjs/web/images/comment.svg           |     3 -
 .../js/pdfjs/web/images/document-print.svg    |   533 -
 .../js/pdfjs/web/images/download.svg          |   620 -
 .../js/pdfjs/web/images/go-down.svg           |   201 -
 .../js/pdfjs/web/images/go-up.svg             |   197 -
 .../js/pdfjs/web/images/nav-outline.svg       |   202 -
 .../js/pdfjs/web/images/nav-thumbs.svg        |   283 -
 .../js/pdfjs/web/images/pin-down.svg          |   297 -
 .../js/pdfjs/web/images/pin-up.svg            |   230 -
 .../js/pdfjs/web/images/zoom-in.svg           |   437 -
 .../js/pdfjs/web/images/zoom-out.svg          |   425 -
 apps/files_pdfviewer/js/pdfview.js            |   762 -
 apps/files_pdfviewer/js/viewer.js             |    59 -
 apps/files_pdfviewer/l10n/.gitkeep            |     0
 apps/files_pdfviewer/l10n/de.php              |     4 -
 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 -
 apps/files_texteditor/ajax/loadfile.php       |    51 -
 apps/files_texteditor/ajax/mtime.php          |    49 -
 apps/files_texteditor/ajax/savefile.php       |    76 -
 apps/files_texteditor/appinfo/app.php         |     6 -
 apps/files_texteditor/appinfo/info.xml        |    11 -
 apps/files_texteditor/appinfo/version         |     1 -
 .../DroidSansMono/DroidSansMono-webfont.eot   |   Bin 78034 -> 0 bytes
 .../DroidSansMono/DroidSansMono-webfont.svg   |   630 -
 .../DroidSansMono/DroidSansMono-webfont.ttf   |   Bin 77800 -> 0 bytes
 .../DroidSansMono/DroidSansMono-webfont.woff  |   Bin 46192 -> 0 bytes
 .../DroidSansMono/Google Android License.txt  |    18 -
 .../css/DroidSansMono/demo.html               |    33 -
 .../css/DroidSansMono/stylesheet.css          |    15 -
 apps/files_texteditor/css/style.css           |    11 -
 apps/files_texteditor/js/aceeditor/LICENSE    |   476 -
 .../js/aceeditor/ace-compat-uncompressed.js   |   480 -
 .../js/aceeditor/ace-compat.js                |     1 -
 .../js/aceeditor/ace-uncompressed.js          | 16616 --------
 apps/files_texteditor/js/aceeditor/ace.js     |     9 -
 .../keybinding-emacs-uncompressed.js          |   150 -
 .../js/aceeditor/keybinding-emacs.js          |     1 -
 .../aceeditor/keybinding-vim-uncompressed.js  |   138 -
 .../js/aceeditor/keybinding-vim.js            |     1 -
 .../js/aceeditor/mode-c_cpp-uncompressed.js   |   920 -
 .../js/aceeditor/mode-c_cpp.js                |     1 -
 .../js/aceeditor/mode-clojure-uncompressed.js |   422 -
 .../js/aceeditor/mode-clojure.js              |     1 -
 .../js/aceeditor/mode-coffee-uncompressed.js  |   605 -
 .../js/aceeditor/mode-coffee.js               |     1 -
 .../aceeditor/mode-coldfusion-uncompressed.js |  2433 --
 .../js/aceeditor/mode-coldfusion.js           |     1 -
 .../js/aceeditor/mode-csharp-uncompressed.js  |   770 -
 .../js/aceeditor/mode-csharp.js               |     1 -
 .../js/aceeditor/mode-css-uncompressed.js     |   640 -
 .../files_texteditor/js/aceeditor/mode-css.js |     1 -
 .../js/aceeditor/mode-groovy-uncompressed.js  |  1370 -
 .../js/aceeditor/mode-groovy.js               |     1 -
 .../js/aceeditor/mode-haxe-uncompressed.js    |   770 -
 .../js/aceeditor/mode-haxe.js                 |     1 -
 .../js/aceeditor/mode-html-uncompressed.js    |  2449 --
 .../js/aceeditor/mode-html.js                 |     1 -
 .../js/aceeditor/mode-java-uncompressed.js    |  1372 -
 .../js/aceeditor/mode-java.js                 |     1 -
 .../aceeditor/mode-javascript-uncompressed.js |  1203 -
 .../js/aceeditor/mode-javascript.js           |     1 -
 .../js/aceeditor/mode-json-uncompressed.js    |   698 -
 .../js/aceeditor/mode-json.js                 |     1 -
 .../js/aceeditor/mode-latex-uncompressed.js   |    95 -
 .../js/aceeditor/mode-latex.js                |     1 -
 .../js/aceeditor/mode-less-uncompressed.js    |   654 -
 .../js/aceeditor/mode-less.js                 |     1 -
 .../js/aceeditor/mode-liquid-uncompressed.js  |  1332 -
 .../js/aceeditor/mode-liquid.js               |     1 -
 .../js/aceeditor/mode-lua-uncompressed.js     |   523 -
 .../files_texteditor/js/aceeditor/mode-lua.js |     1 -
 .../aceeditor/mode-markdown-uncompressed.js   |  2897 --
 .../js/aceeditor/mode-markdown.js             |     1 -
 .../js/aceeditor/mode-ocaml-uncompressed.js   |   539 -
 .../js/aceeditor/mode-ocaml.js                |     1 -
 .../js/aceeditor/mode-perl-uncompressed.js    |   573 -
 .../js/aceeditor/mode-perl.js                 |     1 -
 .../js/aceeditor/mode-pgsql-uncompressed.js   |  1107 -
 .../js/aceeditor/mode-pgsql.js                |     1 -
 .../js/aceeditor/mode-php-uncompressed.js     |  1886 -
 .../files_texteditor/js/aceeditor/mode-php.js |     1 -
 .../aceeditor/mode-powershell-uncompressed.js |   708 -
 .../js/aceeditor/mode-powershell.js           |     1 -
 .../js/aceeditor/mode-python-uncompressed.js  |   506 -
 .../js/aceeditor/mode-python.js               |     1 -
 .../js/aceeditor/mode-ruby-uncompressed.js    |   391 -
 .../js/aceeditor/mode-ruby.js                 |     1 -
 .../js/aceeditor/mode-scad-uncompressed.js    |   908 -
 .../js/aceeditor/mode-scad.js                 |     1 -
 .../js/aceeditor/mode-scala-uncompressed.js   |  1372 -
 .../js/aceeditor/mode-scala.js                |     1 -
 .../js/aceeditor/mode-scss-uncompressed.js    |   678 -
 .../js/aceeditor/mode-scss.js                 |     1 -
 .../js/aceeditor/mode-sh-uncompressed.js      |   281 -
 apps/files_texteditor/js/aceeditor/mode-sh.js |     1 -
 .../js/aceeditor/mode-sql-uncompressed.js     |   159 -
 .../files_texteditor/js/aceeditor/mode-sql.js |     1 -
 .../js/aceeditor/mode-svg-uncompressed.js     |  2112 -
 .../files_texteditor/js/aceeditor/mode-svg.js |     1 -
 .../js/aceeditor/mode-text-uncompressed.js    |     0
 .../js/aceeditor/mode-text.js                 |     0
 .../js/aceeditor/mode-textile-uncompressed.js |   254 -
 .../js/aceeditor/mode-textile.js              |     1 -
 .../js/aceeditor/mode-xml-uncompressed.js     |  1009 -
 .../files_texteditor/js/aceeditor/mode-xml.js |     1 -
 .../js/aceeditor/mode-xquery-uncompressed.js  |   540 -
 .../js/aceeditor/mode-xquery.js               |     1 -
 .../js/aceeditor/theme-clouds-uncompressed.js |   155 -
 .../js/aceeditor/theme-clouds.js              |     1 -
 .../js/aceeditor/worker-coffee.js             |  7477 ----
 .../js/aceeditor/worker-css.js                | 11714 ------
 .../js/aceeditor/worker-javascript.js         | 10614 -----
 .../js/aceeditor/worker-json.js               |  3083 --
 apps/files_texteditor/js/editor.js            |   339 -
 apps/files_texteditor/l10n/.gitkeep           |     0
 apps/files_texteditor/l10n/de.php             |     8 -
 apps/gallery/ajax/createAlbum.php             |    31 -
 apps/gallery/ajax/galleryOp.php               |   188 -
 apps/gallery/ajax/sharing.php                 |   118 -
 apps/gallery/ajax/thumbnail.php               |    36 -
 apps/gallery/ajax/viewImage.php               |    32 -
 apps/gallery/appinfo/app.php                  |    58 -
 apps/gallery/appinfo/database.xml             |    60 -
 apps/gallery/appinfo/info.xml                 |    15 -
 apps/gallery/appinfo/update.php               |    11 -
 apps/gallery/appinfo/version                  |     1 -
 apps/gallery/css/sharing.css                  |     8 -
 apps/gallery/css/styles.css                   |    14 -
 apps/gallery/css/supersized.css               |    25 -
 apps/gallery/css/supersized.shutter.css       |    74 -
 apps/gallery/img/breadcrumb.png               |   Bin 201 -> 0 bytes
 apps/gallery/img/delete.png                   |   Bin 240 -> 0 bytes
 apps/gallery/img/loading.gif                  |   Bin 1849 -> 0 bytes
 apps/gallery/img/rename.png                   |   Bin 267 -> 0 bytes
 apps/gallery/img/share.png                    |   Bin 338 -> 0 bytes
 apps/gallery/img/supersized/back.png          |   Bin 2319 -> 0 bytes
 apps/gallery/img/supersized/bg-black.png      |   Bin 1065 -> 0 bytes
 apps/gallery/img/supersized/bg-hover.png      |   Bin 960 -> 0 bytes
 .../img/supersized/button-tray-down.png       |   Bin 1464 -> 0 bytes
 .../gallery/img/supersized/button-tray-up.png |   Bin 1451 -> 0 bytes
 apps/gallery/img/supersized/forward.png       |   Bin 2316 -> 0 bytes
 apps/gallery/img/supersized/nav-bg.png        |   Bin 993 -> 0 bytes
 apps/gallery/img/supersized/nav-dot.png       |   Bin 1640 -> 0 bytes
 apps/gallery/img/supersized/pause.png         |   Bin 1124 -> 0 bytes
 apps/gallery/img/supersized/play.png          |   Bin 1549 -> 0 bytes
 apps/gallery/img/supersized/progress-back.png |   Bin 924 -> 0 bytes
 apps/gallery/img/supersized/progress-bar.png  |   Bin 924 -> 0 bytes
 apps/gallery/img/supersized/progress.gif      |   Bin 2608 -> 0 bytes
 .../img/supersized/supersized-logo.png        |   Bin 3488 -> 0 bytes
 apps/gallery/img/supersized/thumb-back.png    |   Bin 2010 -> 0 bytes
 apps/gallery/img/supersized/thumb-forward.png |   Bin 2007 -> 0 bytes
 apps/gallery/index.php                        |   105 -
 apps/gallery/js/albums.js                     |   101 -
 apps/gallery/js/jquery.easing.min.js          |    71 -
 apps/gallery/js/pictures.js                   |    68 -
 apps/gallery/js/scanner.js                    |    34 -
 apps/gallery/js/sharing.js                    |    57 -
 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/l10n/ar.php                      |     4 -
 apps/gallery/l10n/ca.php                      |    12 -
 apps/gallery/l10n/cs_CZ.php                   |     7 -
 apps/gallery/l10n/da.php                      |    12 -
 apps/gallery/l10n/de.php                      |    12 -
 apps/gallery/l10n/el.php                      |    12 -
 apps/gallery/l10n/eo.php                      |    12 -
 apps/gallery/l10n/es.php                      |    12 -
 apps/gallery/l10n/et_EE.php                   |    12 -
 apps/gallery/l10n/eu.php                      |    12 -
 apps/gallery/l10n/fa.php                      |    12 -
 apps/gallery/l10n/fi_FI.php                   |    12 -
 apps/gallery/l10n/fr.php                      |    12 -
 apps/gallery/l10n/gl.php                      |    12 -
 apps/gallery/l10n/hr.php                      |    12 -
 apps/gallery/l10n/hu_HU.php                   |    12 -
 apps/gallery/l10n/ia.php                      |     4 -
 apps/gallery/l10n/id.php                      |    12 -
 apps/gallery/l10n/it.php                      |    12 -
 apps/gallery/l10n/ja_JP.php                   |    12 -
 apps/gallery/l10n/ko.php                      |    12 -
 apps/gallery/l10n/lb.php                      |    12 -
 apps/gallery/l10n/lt_LT.php                   |    12 -
 apps/gallery/l10n/mk.php                      |    12 -
 apps/gallery/l10n/ms_MY.php                   |     4 -
 apps/gallery/l10n/nb_NO.php                   |     7 -
 apps/gallery/l10n/nl.php                      |     7 -
 apps/gallery/l10n/nn_NO.php                   |     4 -
 apps/gallery/l10n/pl.php                      |    12 -
 apps/gallery/l10n/pt_BR.php                   |    12 -
 apps/gallery/l10n/pt_PT.php                   |     7 -
 apps/gallery/l10n/ro.php                      |    12 -
 apps/gallery/l10n/ru.php                      |     7 -
 apps/gallery/l10n/sk_SK.php                   |    12 -
 apps/gallery/l10n/sl.php                      |    12 -
 apps/gallery/l10n/sr.php                      |     4 -
 apps/gallery/l10n/sv.php                      |    12 -
 apps/gallery/l10n/th_TH.php                   |     7 -
 apps/gallery/l10n/tr.php                      |    12 -
 apps/gallery/l10n/uk.php                      |     4 -
 apps/gallery/l10n/vi.php                      |    11 -
 apps/gallery/l10n/zh_CN.php                   |     7 -
 apps/gallery/l10n/zh_TW.php                   |    12 -
 apps/gallery/lib/album.php                    |   111 -
 apps/gallery/lib/hooks_handlers.php           |    40 -
 apps/gallery/lib/images_utils.php             |    62 -
 apps/gallery/lib/managers.php                 |   133 -
 apps/gallery/lib/photo.php                    |   136 -
 apps/gallery/lib/scanner.php                  |   150 -
 apps/gallery/lib/share.php                    |    42 -
 apps/gallery/lib/sharing.php                  |    89 -
 apps/gallery/lib/tiles.php                    |   176 -
 apps/gallery/lib/tiles_test.php               |    85 -
 apps/gallery/sharing.php                      |    47 -
 apps/gallery/templates/index.php              |    84 -
 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                |    35 -
 apps/impress/img/impress.png                  |   Bin 387 -> 0 bytes
 apps/impress/img/impress.svg                  |  1718 -
 apps/impress/img/impressbig.png               |   Bin 503 -> 0 bytes
 apps/impress/img/impressbig.svg               |  1730 -
 apps/impress/index.php                        |    38 -
 apps/impress/js/impress.js                    |   800 -
 apps/impress/l10n/.gitkeep                    |     0
 apps/impress/l10n/de.php                      |     3 -
 apps/impress/lib/impress.php                  |   118 -
 apps/impress/player.php                       |    50 -
 apps/impress/templates/documentation.php      |   223 -
 apps/impress/templates/presentations.php      |    17 -
 apps/media/ajax/api.php                       |   133 -
 apps/media/ajax/autoupdate.php                |    32 -
 apps/media/appinfo/app.php                    |    47 -
 apps/media/appinfo/database.xml               |   298 -
 apps/media/appinfo/info.xml                   |    15 -
 apps/media/appinfo/version                    |     1 -
 apps/media/css/music.css                      |    48 -
 apps/media/css/player.css                     |    23 -
 apps/media/index.php                          |    42 -
 apps/media/js/Jplayer.swf                     |   Bin 7679 -> 0 bytes
 apps/media/js/collection.js                   |   368 -
 .../js/jQuery.jPlayer.2.1.0.source/Jplayer.as |   415 -
 .../jQuery.jPlayer.2.1.0.source/Jplayer.fla   |   Bin 61952 -> 0 bytes
 .../add-on/jplayer.playlist.js                |   452 -
 .../add-on/jquery.jplayer.inspector.js        |   331 -
 .../happyworm/jPlayer/JplayerEvent.as         |    69 -
 .../happyworm/jPlayer/JplayerMp3.as           |   328 -
 .../happyworm/jPlayer/JplayerMp4.as           |   413 -
 .../happyworm/jPlayer/JplayerStatus.as        |   101 -
 .../jquery.jplayer.js                         |  2349 --
 apps/media/js/jquery.jplayer.min.js           |     2 -
 apps/media/js/loader.js                       |    59 -
 apps/media/js/music.js                        |    57 -
 apps/media/js/player.js                       |   214 -
 apps/media/js/playlist.js                     |    57 -
 apps/media/js/scanner.js                      |    44 -
 apps/media/l10n/ar.php                        |    14 -
 apps/media/l10n/bg_BG.php                     |    14 -
 apps/media/l10n/ca.php                        |    13 -
 apps/media/l10n/cs_CZ.php                     |    13 -
 apps/media/l10n/da.php                        |    13 -
 apps/media/l10n/de.php                        |    13 -
 apps/media/l10n/el.php                        |    13 -
 apps/media/l10n/eo.php                        |    14 -
 apps/media/l10n/es.php                        |    13 -
 apps/media/l10n/et_EE.php                     |    13 -
 apps/media/l10n/eu.php                        |    13 -
 apps/media/l10n/fa.php                        |    13 -
 apps/media/l10n/fi_FI.php                     |    13 -
 apps/media/l10n/fr.php                        |    14 -
 apps/media/l10n/gl.php                        |    13 -
 apps/media/l10n/he.php                        |    13 -
 apps/media/l10n/hr.php                        |    13 -
 apps/media/l10n/hu_HU.php                     |    13 -
 apps/media/l10n/ia.php                        |    13 -
 apps/media/l10n/id.php                        |    13 -
 apps/media/l10n/it.php                        |    13 -
 apps/media/l10n/ja_JP.php                     |    13 -
 apps/media/l10n/ko.php                        |    13 -
 apps/media/l10n/lb.php                        |    13 -
 apps/media/l10n/lt_LT.php                     |    13 -
 apps/media/l10n/mk.php                        |    13 -
 apps/media/l10n/ms_MY.php                     |    13 -
 apps/media/l10n/nb_NO.php                     |    13 -
 apps/media/l10n/nl.php                        |    13 -
 apps/media/l10n/nn_NO.php                     |    13 -
 apps/media/l10n/pl.php                        |    13 -
 apps/media/l10n/pt_BR.php                     |    13 -
 apps/media/l10n/pt_PT.php                     |    13 -
 apps/media/l10n/ro.php                        |    13 -
 apps/media/l10n/ru.php                        |    13 -
 apps/media/l10n/sk_SK.php                     |    13 -
 apps/media/l10n/sl.php                        |    13 -
 apps/media/l10n/sr.php                        |    13 -
 apps/media/l10n/sr@latin.php                  |    13 -
 apps/media/l10n/sv.php                        |    14 -
 apps/media/l10n/th_TH.php                     |    13 -
 apps/media/l10n/tr.php                        |    13 -
 apps/media/l10n/uk.php                        |    14 -
 apps/media/l10n/vi.php                        |    14 -
 apps/media/l10n/xgettextfiles                 |     6 -
 apps/media/l10n/zh_CN.GB2312.php              |    14 -
 apps/media/l10n/zh_CN.php                     |    13 -
 apps/media/l10n/zh_TW.php                     |    13 -
 apps/media/lib/share/album.php                |     0
 apps/media/lib/share/artist.php               |    65 -
 apps/media/lib/share/song.php                 |    65 -
 apps/media/lib_ampache.php                    |   421 -
 apps/media/lib_collection.php                 |   388 -
 apps/media/lib_media.php                      |    97 -
 apps/media/lib_scanner.php                    |   138 -
 apps/media/remote.php                         |    11 -
 apps/media/server/xml.server.php              |    79 -
 apps/media/settings.php                       |     5 -
 apps/media/templates/music.php                |    52 -
 apps/media/templates/player.php               |    16 -
 apps/media/templates/settings.php             |     7 -
 apps/remoteStorage/BearerAuth.php             |    61 -
 apps/remoteStorage/ajax/revokeToken.php       |    35 -
 apps/remoteStorage/appinfo/app.php            |     2 -
 apps/remoteStorage/appinfo/database.xml       |    52 -
 apps/remoteStorage/appinfo/info.xml           |    13 -
 apps/remoteStorage/appinfo/version            |     1 -
 apps/remoteStorage/appinfo/webfinger.php      |     8 -
 apps/remoteStorage/auth.php                   |    79 -
 apps/remoteStorage/img/remoteStorage.png      |   Bin 1024 -> 0 bytes
 apps/remoteStorage/lib_remoteStorage.php      |    68 -
 apps/remoteStorage/oauth_ro_auth.php          |    70 -
 apps/remoteStorage/settings.php               |     6 -
 apps/remoteStorage/templates/auth.php         |    28 -
 apps/remoteStorage/templates/settings.php     |    22 -
 apps/remoteStorage/webdav.php                 |    87 -
 apps/tasks/ajax/addtask.php                   |    28 -
 apps/tasks/ajax/delete.php                    |    32 -
 apps/tasks/ajax/gettasks.php                  |    36 -
 apps/tasks/ajax/update_property.php           |    69 -
 apps/tasks/appinfo/app.php                    |    11 -
 apps/tasks/appinfo/info.xml                   |    11 -
 apps/tasks/css/style.css                      |    62 -
 apps/tasks/img/icon.png                       |   Bin 372 -> 0 bytes
 apps/tasks/img/icon.svg                       |   101 -
 apps/tasks/index.php                          |    33 -
 apps/tasks/js/tasks.js                        |   473 -
 apps/tasks/l10n/.gitkeep                      |     0
 apps/tasks/l10n/ca.php                        |    24 -
 apps/tasks/l10n/cs_CZ.php                     |    15 -
 apps/tasks/l10n/da.php                        |    16 -
 apps/tasks/l10n/de.php                        |    24 -
 apps/tasks/l10n/el.php                        |    18 -
 apps/tasks/l10n/eo.php                        |    24 -
 apps/tasks/l10n/es.php                        |    24 -
 apps/tasks/l10n/et_EE.php                     |    24 -
 apps/tasks/l10n/fa.php                        |    11 -
 apps/tasks/l10n/fi_FI.php                     |    17 -
 apps/tasks/l10n/fr.php                        |    24 -
 apps/tasks/l10n/it.php                        |    24 -
 apps/tasks/l10n/ja_JP.php                     |    24 -
 apps/tasks/l10n/lt_LT.php                     |    10 -
 apps/tasks/l10n/nb_NO.php                     |    17 -
 apps/tasks/l10n/pl.php                        |    24 -
 apps/tasks/l10n/ro.php                        |    24 -
 apps/tasks/l10n/ru.php                        |    24 -
 apps/tasks/l10n/sl.php                        |    24 -
 apps/tasks/l10n/sv.php                        |    24 -
 apps/tasks/l10n/th_TH.php                     |    24 -
 apps/tasks/lib/app.php                        |   188 -
 apps/tasks/lib/vtodo.php                      |    27 -
 apps/tasks/templates/tasks.php                |    34 -
 apps/user_external/appinfo/app.php            |     4 -
 apps/user_external/appinfo/info.xml           |    13 -
 apps/user_external/appinfo/version            |     1 -
 apps/user_external/lib/ftp.php                |    45 -
 apps/user_external/lib/imap.php               |    40 -
 apps/user_external/lib/smb.php                |    43 -
 apps/user_external/tests/config.php           |    28 -
 apps/user_external/tests/ftp.php              |    34 -
 apps/user_external/tests/imap.php             |    34 -
 apps/user_external/tests/smb.php              |    34 -
 apps/user_migrate/ajax/export.php             |    62 -
 apps/user_migrate/appinfo/app.php             |    33 -
 apps/user_migrate/appinfo/info.xml            |    11 -
 apps/user_migrate/appinfo/version             |     1 -
 apps/user_migrate/js/export.js                |    27 -
 apps/user_migrate/l10n/.gitkeep               |     0
 apps/user_migrate/l10n/ca.php                 |    10 -
 apps/user_migrate/l10n/cs_CZ.php              |    10 -
 apps/user_migrate/l10n/de.php                 |    10 -
 apps/user_migrate/l10n/el.php                 |     8 -
 apps/user_migrate/l10n/eo.php                 |    10 -
 apps/user_migrate/l10n/es.php                 |     5 -
 apps/user_migrate/l10n/fi_FI.php              |     9 -
 apps/user_migrate/l10n/fr.php                 |    10 -
 apps/user_migrate/l10n/it.php                 |    10 -
 apps/user_migrate/l10n/ja_JP.php              |    10 -
 apps/user_migrate/l10n/lt_LT.php              |    10 -
 apps/user_migrate/l10n/pl.php                 |    10 -
 apps/user_migrate/l10n/ru.php                 |    10 -
 apps/user_migrate/l10n/sl.php                 |    10 -
 apps/user_migrate/l10n/sv.php                 |    10 -
 apps/user_migrate/l10n/th_TH.php              |    10 -
 apps/user_migrate/settings.php                |    89 -
 apps/user_migrate/templates/settings.php      |    19 -
 apps/user_openid/appinfo/app.php              |    52 -
 apps/user_openid/appinfo/info.xml             |    14 -
 apps/user_openid/appinfo/version              |     1 -
 apps/user_openid/js/settings.js               |    10 -
 apps/user_openid/l10n/.gitkeep                |     0
 apps/user_openid/l10n/ca.php                  |    11 -
 apps/user_openid/l10n/cs_CZ.php               |    11 -
 apps/user_openid/l10n/de.php                  |    11 -
 apps/user_openid/l10n/el.php                  |     8 -
 apps/user_openid/l10n/eo.php                  |    11 -
 apps/user_openid/l10n/es.php                  |     5 -
 apps/user_openid/l10n/et_EE.php               |     5 -
 apps/user_openid/l10n/fi_FI.php               |     7 -
 apps/user_openid/l10n/fr.php                  |    11 -
 apps/user_openid/l10n/it.php                  |    11 -
 apps/user_openid/l10n/ja_JP.php               |    11 -
 apps/user_openid/l10n/nl.php                  |    11 -
 apps/user_openid/l10n/pl.php                  |    11 -
 apps/user_openid/l10n/ru.php                  |    11 -
 apps/user_openid/l10n/sl.php                  |    11 -
 apps/user_openid/l10n/sv.php                  |    11 -
 apps/user_openid/l10n/th_TH.php               |    11 -
 apps/user_openid/settings.php                 |    10 -
 apps/user_openid/templates/nomode.php         |    28 -
 apps/user_openid/templates/settings.php       |     8 -
 apps/user_openid/user.php                     |    47 -
 apps/user_openid/user_openid.php              |    65 -
 apps/user_webfinger/.htaccess                 |     5 -
 apps/user_webfinger/appinfo/app.php           |     1 -
 apps/user_webfinger/appinfo/info.xml          |    14 -
 apps/user_webfinger/appinfo/version           |     1 -
 apps/user_webfinger/host-meta.php             |    31 -
 apps/user_webfinger/webfinger.php             |    64 -
 1174 files changed, 297345 deletions(-)
 delete mode 100644 apps/admin_audit/appinfo/app.php
 delete mode 100644 apps/admin_audit/appinfo/info.xml
 delete mode 100644 apps/admin_audit/lib/hooks_handlers.php
 delete mode 100644 apps/admin_dependencies_chk/appinfo/app.php
 delete mode 100644 apps/admin_dependencies_chk/appinfo/info.xml
 delete mode 100644 apps/admin_dependencies_chk/appinfo/version
 delete mode 100644 apps/admin_dependencies_chk/css/style.css
 delete mode 100644 apps/admin_dependencies_chk/l10n/.gitkeep
 delete mode 100644 apps/admin_dependencies_chk/l10n/ca.php
 delete mode 100644 apps/admin_dependencies_chk/l10n/cs_CZ.php
 delete mode 100644 apps/admin_dependencies_chk/l10n/de.php
 delete mode 100644 apps/admin_dependencies_chk/l10n/el.php
 delete mode 100644 apps/admin_dependencies_chk/l10n/eo.php
 delete mode 100644 apps/admin_dependencies_chk/l10n/es.php
 delete mode 100644 apps/admin_dependencies_chk/l10n/et_EE.php
 delete mode 100644 apps/admin_dependencies_chk/l10n/fi_FI.php
 delete mode 100644 apps/admin_dependencies_chk/l10n/fr.php
 delete mode 100644 apps/admin_dependencies_chk/l10n/it.php
 delete mode 100644 apps/admin_dependencies_chk/l10n/ja_JP.php
 delete mode 100644 apps/admin_dependencies_chk/l10n/lt_LT.php
 delete mode 100644 apps/admin_dependencies_chk/l10n/nb_NO.php
 delete mode 100644 apps/admin_dependencies_chk/l10n/pl.php
 delete mode 100644 apps/admin_dependencies_chk/l10n/ru.php
 delete mode 100644 apps/admin_dependencies_chk/l10n/sl.php
 delete mode 100644 apps/admin_dependencies_chk/l10n/sv.php
 delete mode 100644 apps/admin_dependencies_chk/l10n/th_TH.php
 delete mode 100644 apps/admin_dependencies_chk/settings.php
 delete mode 100644 apps/admin_dependencies_chk/templates/settings.php
 delete mode 100644 apps/admin_migrate/appinfo/app.php
 delete mode 100644 apps/admin_migrate/appinfo/info.xml
 delete mode 100644 apps/admin_migrate/appinfo/version
 delete mode 100644 apps/admin_migrate/l10n/.gitkeep
 delete mode 100644 apps/admin_migrate/l10n/ca.php
 delete mode 100644 apps/admin_migrate/l10n/cs_CZ.php
 delete mode 100644 apps/admin_migrate/l10n/da.php
 delete mode 100644 apps/admin_migrate/l10n/de.php
 delete mode 100644 apps/admin_migrate/l10n/el.php
 delete mode 100644 apps/admin_migrate/l10n/eo.php
 delete mode 100644 apps/admin_migrate/l10n/es.php
 delete mode 100644 apps/admin_migrate/l10n/et_EE.php
 delete mode 100644 apps/admin_migrate/l10n/fi_FI.php
 delete mode 100644 apps/admin_migrate/l10n/fr.php
 delete mode 100644 apps/admin_migrate/l10n/gl.php
 delete mode 100644 apps/admin_migrate/l10n/it.php
 delete mode 100644 apps/admin_migrate/l10n/ja_JP.php
 delete mode 100644 apps/admin_migrate/l10n/lt_LT.php
 delete mode 100644 apps/admin_migrate/l10n/nb_NO.php
 delete mode 100644 apps/admin_migrate/l10n/nl.php
 delete mode 100644 apps/admin_migrate/l10n/pl.php
 delete mode 100644 apps/admin_migrate/l10n/ru.php
 delete mode 100644 apps/admin_migrate/l10n/sl.php
 delete mode 100644 apps/admin_migrate/l10n/sv.php
 delete mode 100644 apps/admin_migrate/l10n/th_TH.php
 delete mode 100644 apps/admin_migrate/settings.php
 delete mode 100644 apps/admin_migrate/templates/settings.php
 delete mode 100644 apps/bookmarks/addBm.php
 delete mode 100644 apps/bookmarks/ajax/addBookmark.php
 delete mode 100644 apps/bookmarks/ajax/delBookmark.php
 delete mode 100644 apps/bookmarks/ajax/editBookmark.php
 delete mode 100644 apps/bookmarks/ajax/recordClick.php
 delete mode 100644 apps/bookmarks/ajax/updateList.php
 delete mode 100644 apps/bookmarks/appinfo/app.php
 delete mode 100644 apps/bookmarks/appinfo/database.xml
 delete mode 100644 apps/bookmarks/appinfo/info.xml
 delete mode 100644 apps/bookmarks/appinfo/migrate.php
 delete mode 100644 apps/bookmarks/appinfo/version
 delete mode 100644 apps/bookmarks/bookmarksHelper.php
 delete mode 100644 apps/bookmarks/css/bookmarks.css
 delete mode 100644 apps/bookmarks/img/bookmarks.png
 delete mode 100644 apps/bookmarks/index.php
 delete mode 100644 apps/bookmarks/js/addBm.js
 delete mode 100644 apps/bookmarks/js/bookmarks.js
 delete mode 100644 apps/bookmarks/js/bookmarksearch.js
 delete mode 100644 apps/bookmarks/l10n/bg_BG.php
 delete mode 100644 apps/bookmarks/l10n/ca.php
 delete mode 100644 apps/bookmarks/l10n/cs_CZ.php
 delete mode 100644 apps/bookmarks/l10n/de.php
 delete mode 100644 apps/bookmarks/l10n/el.php
 delete mode 100644 apps/bookmarks/l10n/eo.php
 delete mode 100644 apps/bookmarks/l10n/es.php
 delete mode 100644 apps/bookmarks/l10n/et_EE.php
 delete mode 100644 apps/bookmarks/l10n/fa.php
 delete mode 100644 apps/bookmarks/l10n/fi_FI.php
 delete mode 100644 apps/bookmarks/l10n/fr.php
 delete mode 100644 apps/bookmarks/l10n/it.php
 delete mode 100644 apps/bookmarks/l10n/lt_LT.php
 delete mode 100644 apps/bookmarks/l10n/nb_NO.php
 delete mode 100644 apps/bookmarks/l10n/nl.php
 delete mode 100644 apps/bookmarks/l10n/ru.php
 delete mode 100644 apps/bookmarks/l10n/sl.php
 delete mode 100644 apps/bookmarks/l10n/sv.php
 delete mode 100644 apps/bookmarks/l10n/th_TH.php
 delete mode 100644 apps/bookmarks/l10n/xgettextfiles
 delete mode 100644 apps/bookmarks/l10n/zh_CN.php
 delete mode 100644 apps/bookmarks/lib/bookmarks.php
 delete mode 100644 apps/bookmarks/lib/search.php
 delete mode 100644 apps/bookmarks/settings.php
 delete mode 100644 apps/bookmarks/templates/addBm.php
 delete mode 100644 apps/bookmarks/templates/bookmarklet.php
 delete mode 100644 apps/bookmarks/templates/list.php
 delete mode 100644 apps/bookmarks/templates/settings.php
 delete mode 100644 apps/calendar/ajax/cache/rescan.php
 delete mode 100644 apps/calendar/ajax/cache/status.php
 delete mode 100644 apps/calendar/ajax/calendar/activation.php
 delete mode 100644 apps/calendar/ajax/calendar/delete.php
 delete mode 100644 apps/calendar/ajax/calendar/edit.form.php
 delete mode 100644 apps/calendar/ajax/calendar/edit.php
 delete mode 100644 apps/calendar/ajax/calendar/new.form.php
 delete mode 100644 apps/calendar/ajax/calendar/new.php
 delete mode 100644 apps/calendar/ajax/calendar/overview.php
 delete mode 100644 apps/calendar/ajax/calendar/update.php
 delete mode 100644 apps/calendar/ajax/categories/rescan.php
 delete mode 100644 apps/calendar/ajax/changeview.php
 delete mode 100644 apps/calendar/ajax/event/delete.php
 delete mode 100644 apps/calendar/ajax/event/edit.form.php
 delete mode 100644 apps/calendar/ajax/event/edit.php
 delete mode 100644 apps/calendar/ajax/event/move.php
 delete mode 100644 apps/calendar/ajax/event/new.form.php
 delete mode 100644 apps/calendar/ajax/event/new.php
 delete mode 100644 apps/calendar/ajax/event/resize.php
 delete mode 100644 apps/calendar/ajax/events.php
 delete mode 100644 apps/calendar/ajax/import/calendarcheck.php
 delete mode 100644 apps/calendar/ajax/import/dialog.php
 delete mode 100644 apps/calendar/ajax/import/dropimport.php
 delete mode 100644 apps/calendar/ajax/import/import.php
 delete mode 100644 apps/calendar/ajax/settings/getfirstday.php
 delete mode 100644 apps/calendar/ajax/settings/gettimezonedetection.php
 delete mode 100644 apps/calendar/ajax/settings/guesstimezone.php
 delete mode 100644 apps/calendar/ajax/settings/setfirstday.php
 delete mode 100644 apps/calendar/ajax/settings/settimeformat.php
 delete mode 100644 apps/calendar/ajax/settings/settimezone.php
 delete mode 100644 apps/calendar/ajax/settings/timeformat.php
 delete mode 100644 apps/calendar/ajax/settings/timezonedetection.php
 delete mode 100644 apps/calendar/ajax/share/activation.php
 delete mode 100644 apps/calendar/ajax/share/changepermission.php
 delete mode 100644 apps/calendar/ajax/share/dropdown.php
 delete mode 100644 apps/calendar/ajax/share/share.php
 delete mode 100644 apps/calendar/ajax/share/unshare.php
 delete mode 100644 apps/calendar/appinfo/app.php
 delete mode 100644 apps/calendar/appinfo/database.xml
 delete mode 100644 apps/calendar/appinfo/info.xml
 delete mode 100644 apps/calendar/appinfo/remote.php
 delete mode 100644 apps/calendar/appinfo/update.php
 delete mode 100644 apps/calendar/appinfo/version
 delete mode 100644 apps/calendar/caldav.php
 delete mode 100644 apps/calendar/calendar.php
 delete mode 100644 apps/calendar/css/import.css
 delete mode 100644 apps/calendar/css/style.css
 delete mode 100644 apps/calendar/export.php
 delete mode 100644 apps/calendar/img/Icon License
 delete mode 100644 apps/calendar/img/icon.png
 delete mode 100644 apps/calendar/img/icon.svg
 delete mode 100644 apps/calendar/index.php
 delete mode 100644 apps/calendar/js/calendar.js
 delete mode 100644 apps/calendar/js/geo.js
 delete mode 100644 apps/calendar/js/loader.js
 delete mode 100644 apps/calendar/js/settings.js
 delete mode 100644 apps/calendar/l10n/ar.php
 delete mode 100644 apps/calendar/l10n/bg_BG.php
 delete mode 100644 apps/calendar/l10n/ca.php
 delete mode 100644 apps/calendar/l10n/cs_CZ.php
 delete mode 100644 apps/calendar/l10n/da.php
 delete mode 100644 apps/calendar/l10n/de.php
 delete mode 100644 apps/calendar/l10n/el.php
 delete mode 100644 apps/calendar/l10n/eo.php
 delete mode 100644 apps/calendar/l10n/es.php
 delete mode 100644 apps/calendar/l10n/et_EE.php
 delete mode 100644 apps/calendar/l10n/eu.php
 delete mode 100644 apps/calendar/l10n/fa.php
 delete mode 100644 apps/calendar/l10n/fi_FI.php
 delete mode 100644 apps/calendar/l10n/fr.php
 delete mode 100644 apps/calendar/l10n/gl.php
 delete mode 100644 apps/calendar/l10n/he.php
 delete mode 100644 apps/calendar/l10n/hr.php
 delete mode 100644 apps/calendar/l10n/hu_HU.php
 delete mode 100644 apps/calendar/l10n/hy.php
 delete mode 100644 apps/calendar/l10n/ia.php
 delete mode 100644 apps/calendar/l10n/id.php
 delete mode 100644 apps/calendar/l10n/it.php
 delete mode 100644 apps/calendar/l10n/ja_JP.php
 delete mode 100644 apps/calendar/l10n/ko.php
 delete mode 100644 apps/calendar/l10n/lb.php
 delete mode 100644 apps/calendar/l10n/lt_LT.php
 delete mode 100644 apps/calendar/l10n/mk.php
 delete mode 100644 apps/calendar/l10n/ms_MY.php
 delete mode 100644 apps/calendar/l10n/nb_NO.php
 delete mode 100644 apps/calendar/l10n/nl.php
 delete mode 100644 apps/calendar/l10n/nn_NO.php
 delete mode 100644 apps/calendar/l10n/pl.php
 delete mode 100644 apps/calendar/l10n/pt_BR.php
 delete mode 100644 apps/calendar/l10n/pt_PT.php
 delete mode 100644 apps/calendar/l10n/ro.php
 delete mode 100644 apps/calendar/l10n/ru.php
 delete mode 100644 apps/calendar/l10n/sk_SK.php
 delete mode 100644 apps/calendar/l10n/sl.php
 delete mode 100644 apps/calendar/l10n/sr.php
 delete mode 100644 apps/calendar/l10n/sr@latin.php
 delete mode 100644 apps/calendar/l10n/sv.php
 delete mode 100644 apps/calendar/l10n/th_TH.php
 delete mode 100644 apps/calendar/l10n/tr.php
 delete mode 100644 apps/calendar/l10n/uk.php
 delete mode 100644 apps/calendar/l10n/vi.php
 delete mode 100644 apps/calendar/l10n/xgettextfiles
 delete mode 100644 apps/calendar/l10n/zh_CN.GB2312.php
 delete mode 100644 apps/calendar/l10n/zh_CN.php
 delete mode 100644 apps/calendar/l10n/zh_TW.php
 delete mode 100644 apps/calendar/lib/alarm.php
 delete mode 100644 apps/calendar/lib/app.php
 delete mode 100644 apps/calendar/lib/attendees.php
 delete mode 100644 apps/calendar/lib/calendar.php
 delete mode 100644 apps/calendar/lib/export.php
 delete mode 100644 apps/calendar/lib/hooks.php
 delete mode 100644 apps/calendar/lib/import.php
 delete mode 100644 apps/calendar/lib/object.php
 delete mode 100644 apps/calendar/lib/repeat.php
 delete mode 100644 apps/calendar/lib/sabre/backend.php
 delete mode 100644 apps/calendar/lib/sabre/calendar.php
 delete mode 100644 apps/calendar/lib/sabre/calendarroot.php
 delete mode 100644 apps/calendar/lib/sabre/object.php
 delete mode 100644 apps/calendar/lib/sabre/usercalendars.php
 delete mode 100644 apps/calendar/lib/search.php
 delete mode 100644 apps/calendar/lib/share.php
 delete mode 100644 apps/calendar/lib/share/calendar.php
 delete mode 100644 apps/calendar/lib/share/event.php
 delete mode 100644 apps/calendar/lib/share_backend.php
 delete mode 100644 apps/calendar/settings.php
 delete mode 100644 apps/calendar/share.php
 delete mode 100644 apps/calendar/templates/calendar.php
 delete mode 100644 apps/calendar/templates/part.choosecalendar.php
 delete mode 100644 apps/calendar/templates/part.choosecalendar.rowfields.php
 delete mode 100644 apps/calendar/templates/part.choosecalendar.rowfields.shared.php
 delete mode 100644 apps/calendar/templates/part.editcalendar.php
 delete mode 100644 apps/calendar/templates/part.editevent.php
 delete mode 100644 apps/calendar/templates/part.eventform.php
 delete mode 100644 apps/calendar/templates/part.import.php
 delete mode 100644 apps/calendar/templates/part.newevent.php
 delete mode 100644 apps/calendar/templates/part.showevent.php
 delete mode 100644 apps/calendar/templates/settings.php
 delete mode 100644 apps/calendar/templates/share.dropdown.php
 delete mode 100644 apps/contacts/ajax/addressbook/activate.php
 delete mode 100644 apps/contacts/ajax/addressbook/add.php
 delete mode 100644 apps/contacts/ajax/addressbook/delete.php
 delete mode 100644 apps/contacts/ajax/addressbook/update.php
 delete mode 100644 apps/contacts/ajax/categories/categoriesfor.php
 delete mode 100644 apps/contacts/ajax/categories/delete.php
 delete mode 100644 apps/contacts/ajax/categories/list.php
 delete mode 100644 apps/contacts/ajax/categories/rescan.php
 delete mode 100644 apps/contacts/ajax/contact/add.php
 delete mode 100644 apps/contacts/ajax/contact/addproperty.php
 delete mode 100644 apps/contacts/ajax/contact/delete.php
 delete mode 100644 apps/contacts/ajax/contact/deleteproperty.php
 delete mode 100644 apps/contacts/ajax/contact/details.php
 delete mode 100644 apps/contacts/ajax/contact/list.php
 delete mode 100644 apps/contacts/ajax/contact/move.php
 delete mode 100644 apps/contacts/ajax/contact/saveproperty.php
 delete mode 100644 apps/contacts/ajax/cropphoto.php
 delete mode 100644 apps/contacts/ajax/currentphoto.php
 delete mode 100644 apps/contacts/ajax/editaddress.php
 delete mode 100644 apps/contacts/ajax/editname.php
 delete mode 100644 apps/contacts/ajax/importdialog.php
 delete mode 100644 apps/contacts/ajax/loadcard.php
 delete mode 100644 apps/contacts/ajax/loadintro.php
 delete mode 100644 apps/contacts/ajax/loghandler.php
 delete mode 100644 apps/contacts/ajax/oc_photo.php
 delete mode 100644 apps/contacts/ajax/savecrop.php
 delete mode 100644 apps/contacts/ajax/selectaddressbook.php
 delete mode 100644 apps/contacts/ajax/uploadimport.php
 delete mode 100644 apps/contacts/ajax/uploadphoto.php
 delete mode 100644 apps/contacts/appinfo/app.php
 delete mode 100644 apps/contacts/appinfo/database.xml
 delete mode 100644 apps/contacts/appinfo/info.xml
 delete mode 100644 apps/contacts/appinfo/migrate.php
 delete mode 100644 apps/contacts/appinfo/remote.php
 delete mode 100644 apps/contacts/appinfo/update.php
 delete mode 100644 apps/contacts/appinfo/version
 delete mode 100644 apps/contacts/carddav.php
 delete mode 100644 apps/contacts/css/contacts.css
 delete mode 100644 apps/contacts/css/jquery.Jcrop.css
 delete mode 100644 apps/contacts/css/jquery.combobox.css
 delete mode 100644 apps/contacts/export.php
 delete mode 100644 apps/contacts/img/Jcrop.gif
 delete mode 100644 apps/contacts/img/contact-new.png
 delete mode 100644 apps/contacts/img/contact-new.svg
 delete mode 100644 apps/contacts/img/globe.svg
 delete mode 100644 apps/contacts/img/person.png
 delete mode 100644 apps/contacts/img/person.svg
 delete mode 100644 apps/contacts/img/person_large.png
 delete mode 100644 apps/contacts/import.php
 delete mode 100644 apps/contacts/index.php
 delete mode 100644 apps/contacts/js/LICENSE.jquery.inview
 delete mode 100644 apps/contacts/js/contacts.js
 delete mode 100644 apps/contacts/js/expanding.js
 delete mode 100644 apps/contacts/js/jquery.Jcrop.js
 delete mode 100644 apps/contacts/js/jquery.Jcrop.min.js
 delete mode 100644 apps/contacts/js/jquery.combobox.js
 delete mode 100644 apps/contacts/js/jquery.inview.js
 delete mode 100644 apps/contacts/js/jquery.inview.txt
 delete mode 100644 apps/contacts/js/jquery.multi-autocomplete.js
 delete mode 100644 apps/contacts/js/loader.js
 delete mode 100644 apps/contacts/js/settings.js
 delete mode 100644 apps/contacts/l10n/.gitkeep
 delete mode 100644 apps/contacts/l10n/ar.php
 delete mode 100644 apps/contacts/l10n/ca.php
 delete mode 100644 apps/contacts/l10n/cs_CZ.php
 delete mode 100644 apps/contacts/l10n/da.php
 delete mode 100644 apps/contacts/l10n/de.php
 delete mode 100644 apps/contacts/l10n/el.php
 delete mode 100644 apps/contacts/l10n/eo.php
 delete mode 100644 apps/contacts/l10n/es.php
 delete mode 100644 apps/contacts/l10n/et_EE.php
 delete mode 100644 apps/contacts/l10n/eu.php
 delete mode 100644 apps/contacts/l10n/fa.php
 delete mode 100644 apps/contacts/l10n/fi_FI.php
 delete mode 100644 apps/contacts/l10n/fr.php
 delete mode 100644 apps/contacts/l10n/gl.php
 delete mode 100644 apps/contacts/l10n/he.php
 delete mode 100644 apps/contacts/l10n/hr.php
 delete mode 100644 apps/contacts/l10n/hu_HU.php
 delete mode 100644 apps/contacts/l10n/ia.php
 delete mode 100644 apps/contacts/l10n/it.php
 delete mode 100644 apps/contacts/l10n/ja_JP.php
 delete mode 100644 apps/contacts/l10n/ko.php
 delete mode 100644 apps/contacts/l10n/lb.php
 delete mode 100644 apps/contacts/l10n/lt_LT.php
 delete mode 100644 apps/contacts/l10n/mk.php
 delete mode 100644 apps/contacts/l10n/ms_MY.php
 delete mode 100644 apps/contacts/l10n/nb_NO.php
 delete mode 100644 apps/contacts/l10n/nl.php
 delete mode 100644 apps/contacts/l10n/nn_NO.php
 delete mode 100644 apps/contacts/l10n/pl.php
 delete mode 100644 apps/contacts/l10n/pt_BR.php
 delete mode 100644 apps/contacts/l10n/pt_PT.php
 delete mode 100644 apps/contacts/l10n/ro.php
 delete mode 100644 apps/contacts/l10n/ru.php
 delete mode 100644 apps/contacts/l10n/sk_SK.php
 delete mode 100644 apps/contacts/l10n/sl.php
 delete mode 100644 apps/contacts/l10n/sr.php
 delete mode 100644 apps/contacts/l10n/sr@latin.php
 delete mode 100644 apps/contacts/l10n/sv.php
 delete mode 100644 apps/contacts/l10n/th_TH.php
 delete mode 100644 apps/contacts/l10n/tr.php
 delete mode 100644 apps/contacts/l10n/uk.php
 delete mode 100644 apps/contacts/l10n/vi.php
 delete mode 100644 apps/contacts/l10n/xgettextfiles
 delete mode 100644 apps/contacts/l10n/zh_CN.php
 delete mode 100644 apps/contacts/l10n/zh_TW.php
 delete mode 100644 apps/contacts/lib/addressbook.php
 delete mode 100644 apps/contacts/lib/app.php
 delete mode 100644 apps/contacts/lib/hooks.php
 delete mode 100644 apps/contacts/lib/sabre/addressbook.php
 delete mode 100644 apps/contacts/lib/sabre/addressbookroot.php
 delete mode 100644 apps/contacts/lib/sabre/backend.php
 delete mode 100644 apps/contacts/lib/sabre/card.php
 delete mode 100644 apps/contacts/lib/sabre/useraddressbooks.php
 delete mode 100644 apps/contacts/lib/sabre/vcfexportplugin.php
 delete mode 100644 apps/contacts/lib/search.php
 delete mode 100644 apps/contacts/lib/share/addressbook.php
 delete mode 100644 apps/contacts/lib/share/contact.php
 delete mode 100644 apps/contacts/lib/vcard.php
 delete mode 100644 apps/contacts/photo.php
 delete mode 100644 apps/contacts/settings.php
 delete mode 100644 apps/contacts/templates/index.php
 delete mode 100644 apps/contacts/templates/part.contact.php
 delete mode 100644 apps/contacts/templates/part.cropphoto.php
 delete mode 100644 apps/contacts/templates/part.edit_address_dialog.php
 delete mode 100644 apps/contacts/templates/part.edit_name_dialog.php
 delete mode 100644 apps/contacts/templates/part.import.php
 delete mode 100644 apps/contacts/templates/part.no_contacts.php
 delete mode 100644 apps/contacts/templates/part.selectaddressbook.php
 delete mode 100644 apps/contacts/templates/settings.php
 delete mode 100644 apps/contacts/thumbnail.php
 delete mode 100644 apps/contacts/tmpphoto.php
 delete mode 100644 apps/external/ajax/setsites.php
 delete mode 100644 apps/external/appinfo/app.php
 delete mode 100644 apps/external/appinfo/info.xml
 delete mode 100644 apps/external/appinfo/version
 delete mode 100644 apps/external/css/style.css
 delete mode 100644 apps/external/img/external.png
 delete mode 100644 apps/external/img/external.svg
 delete mode 100644 apps/external/index.php
 delete mode 100644 apps/external/js/admin.js
 delete mode 100644 apps/external/lib/external.php
 delete mode 100644 apps/external/settings.php
 delete mode 100644 apps/external/templates/frame.php
 delete mode 100644 apps/external/templates/settings.php
 delete mode 100644 apps/files_archive/appinfo/app.php
 delete mode 100644 apps/files_archive/appinfo/info.xml
 delete mode 100644 apps/files_archive/appinfo/version
 delete mode 100644 apps/files_archive/js/archive.js
 delete mode 100644 apps/files_archive/lib/storage.php
 delete mode 100644 apps/files_archive/tests/data/data.tar.gz
 delete mode 100644 apps/files_archive/tests/data/data.zip
 delete mode 100644 apps/files_archive/tests/data/lorem.txt
 delete mode 100644 apps/files_archive/tests/storage.php
 delete mode 100644 apps/files_imageviewer/appinfo/app.php
 delete mode 100644 apps/files_imageviewer/appinfo/info.xml
 delete mode 100644 apps/files_imageviewer/appinfo/version
 delete mode 100644 apps/files_imageviewer/css/jquery.fancybox-1.3.4.css
 delete mode 100644 apps/files_imageviewer/img/blank.gif
 delete mode 100644 apps/files_imageviewer/img/fancy_close.png
 delete mode 100644 apps/files_imageviewer/img/fancy_loading.png
 delete mode 100644 apps/files_imageviewer/img/fancy_nav_left.png
 delete mode 100644 apps/files_imageviewer/img/fancy_nav_right.png
 delete mode 100644 apps/files_imageviewer/img/fancy_shadow_e.png
 delete mode 100644 apps/files_imageviewer/img/fancy_shadow_n.png
 delete mode 100644 apps/files_imageviewer/img/fancy_shadow_ne.png
 delete mode 100644 apps/files_imageviewer/img/fancy_shadow_nw.png
 delete mode 100644 apps/files_imageviewer/img/fancy_shadow_s.png
 delete mode 100644 apps/files_imageviewer/img/fancy_shadow_se.png
 delete mode 100644 apps/files_imageviewer/img/fancy_shadow_sw.png
 delete mode 100644 apps/files_imageviewer/img/fancy_shadow_w.png
 delete mode 100644 apps/files_imageviewer/img/fancy_title_left.png
 delete mode 100644 apps/files_imageviewer/img/fancy_title_main.png
 delete mode 100644 apps/files_imageviewer/img/fancy_title_over.png
 delete mode 100644 apps/files_imageviewer/img/fancy_title_right.png
 delete mode 100644 apps/files_imageviewer/img/fancybox-x.png
 delete mode 100644 apps/files_imageviewer/img/fancybox-y.png
 delete mode 100644 apps/files_imageviewer/img/fancybox.png
 delete mode 100644 apps/files_imageviewer/js/jquery.fancybox-1.3.4.js
 delete mode 100644 apps/files_imageviewer/js/jquery.fancybox-1.3.4.pack.js
 delete mode 100644 apps/files_imageviewer/js/jquery.mousewheel-3.0.4.js
 delete mode 100644 apps/files_imageviewer/js/jquery.mousewheel-3.0.4.pack.js
 delete mode 100644 apps/files_imageviewer/js/lightbox.js
 delete mode 100644 apps/files_odfviewer/appinfo/app.php
 delete mode 100644 apps/files_odfviewer/appinfo/info.xml
 delete mode 100644 apps/files_odfviewer/css/odfviewer.css
 delete mode 100644 apps/files_odfviewer/css/webodf.css
 delete mode 100644 apps/files_odfviewer/js/viewer.js
 delete mode 100644 apps/files_odfviewer/js/webodf-debug.js
 delete mode 100644 apps/files_odfviewer/js/webodf.js
 delete mode 100644 apps/files_odfviewer/l10n/de.php
 delete mode 100644 apps/files_odfviewer/l10n/ignorelist
 delete mode 100644 apps/files_odfviewer/src/.gitignore
 delete mode 100755 apps/files_odfviewer/src/update.sh
 delete mode 100644 apps/files_odfviewer/src/webodf/.gitignore
 delete mode 100644 apps/files_odfviewer/src/webodf/.gitmodules
 delete mode 100644 apps/files_odfviewer/src/webodf/CMakeLists.txt
 delete mode 100644 apps/files_odfviewer/src/webodf/JSCoverage.patch
 delete mode 100644 apps/files_odfviewer/src/webodf/packwebodf.js
 delete mode 100644 apps/files_odfviewer/src/webodf/programs/CMakeLists.txt
 delete mode 100644 apps/files_odfviewer/src/webodf/programs/android/AndroidManifest.xml
 delete mode 100644 apps/files_odfviewer/src/webodf/programs/android/CMakeLists.txt
 delete mode 100644 apps/files_odfviewer/src/webodf/programs/android/assets/www/config.xml
 delete mode 100644 apps/files_odfviewer/src/webodf/programs/android/assets/www/icon.png
 delete mode 100644 apps/files_odfviewer/src/webodf/programs/android/assets/www/index.html
 delete mode 100644 apps/files_odfviewer/src/webodf/programs/android/assets/www/phonegap-1.4.1.js
 delete mode 100644 apps/files_odfviewer/src/webodf/programs/android/assets/www/scripts.js
 delete mode 100644 apps/files_odfviewer/src/webodf/programs/android/libs/phonegap-1.4.1.jar
 delete mode 100644 apps/files_odfviewer/src/webodf/programs/android/res/drawable-hdpi/ic_launcher.png
 delete mode 100644 apps/files_odfviewer/src/webodf/programs/android/res/drawable-ldpi/ic_launcher.png
 delete mode 100644 apps/files_odfviewer/src/webodf/programs/android/res/drawable-mdpi/ic_launcher.png
 delete mode 100644 apps/files_odfviewer/src/webodf/programs/android/res/drawable/icon.png
 delete mode 100644 apps/files_odfviewer/src/webodf/programs/android/res/layout/listitem.xml
 delete mode 100644 apps/files_odfviewer/src/webodf/programs/android/res/layout/main.xml
 delete mode 100644 apps/files_odfviewer/src/webodf/programs/android/res/layout/selector.xml
 delete mode 100644 apps/files_odfviewer/src/webodf/programs/android/res/values/strings.xml
 delete mode 100755 apps/files_odfviewer/src/webodf/programs/android/res/xml/phonegap.xml
 delete mode 100644 apps/files_odfviewer/src/webodf/programs/android/res/xml/plugins.xml
 delete mode 100644 apps/files_odfviewer/src/webodf/programs/android/src/org/webodf/WebODFActivity.java
 delete mode 100755 apps/files_odfviewer/src/webodf/programs/android/updateWebODF.sh
 delete mode 100644 apps/files_odfviewer/src/webodf/programs/docnosis/CMakeLists.txt
 delete mode 100644 apps/files_odfviewer/src/webodf/programs/docnosis/OpenDocument-manifest-schema-v1.0-os.rng
 delete mode 100644 apps/files_odfviewer/src/webodf/programs/docnosis/OpenDocument-manifest-schema-v1.1.rng
 delete mode 100644 apps/files_odfviewer/src/webodf/programs/docnosis/OpenDocument-schema-v1.0-os.rng
 delete mode 100644 apps/files_odfviewer/src/webodf/programs/docnosis/OpenDocument-schema-v1.1.rng
 delete mode 100644 apps/files_odfviewer/src/webodf/programs/docnosis/OpenDocument-strict-schema-v1.0-os.rng
 delete mode 100644 apps/files_odfviewer/src/webodf/programs/docnosis/OpenDocument-strict-schema-v1.1.rng
 delete mode 100644 apps/files_odfviewer/src/webodf/programs/docnosis/OpenDocument-v1.2-cos01-dsig-schema.rng
 delete mode 100644 apps/files_odfviewer/src/webodf/programs/docnosis/OpenDocument-v1.2-cos01-manifest-schema.rng
 delete mode 100644 apps/files_odfviewer/src/webodf/programs/docnosis/OpenDocument-v1.2-cos01-schema.rng
 delete mode 100644 apps/files_odfviewer/src/webodf/programs/docnosis/application-vnd.oasis.opendocument.presentation.png
 delete mode 100644 apps/files_odfviewer/src/webodf/programs/docnosis/application-vnd.oasis.opendocument.spreadsheet.png
 delete mode 100644 apps/files_odfviewer/src/webodf/programs/docnosis/application-vnd.oasis.opendocument.text.png
 delete mode 100644 apps/files_odfviewer/src/webodf/programs/docnosis/docnosis.js
 delete mode 100644 apps/files_odfviewer/src/webodf/programs/docnosis/index.html
 delete mode 100644 apps/files_odfviewer/src/webodf/programs/firefoxextension/CMakeLists.txt
 delete mode 100644 apps/files_odfviewer/src/webodf/programs/firefoxextension/bootstrap.js
 delete mode 100644 apps/files_odfviewer/src/webodf/programs/firefoxextension/chrome.manifest
 delete mode 100644 apps/files_odfviewer/src/webodf/programs/firefoxextension/components/odfContentHandler.js
 delete mode 100644 apps/files_odfviewer/src/webodf/programs/firefoxextension/content/odf.html
 delete mode 100644 apps/files_odfviewer/src/webodf/programs/firefoxextension/install.rdf.in
 delete mode 100644 apps/files_odfviewer/src/webodf/programs/firefoxextension/packextension.js
 delete mode 100644 apps/files_odfviewer/src/webodf/programs/firefoxextension/skin/default/icon.png
 delete mode 100644 apps/files_odfviewer/src/webodf/programs/ios/Default-Landscape~ipad.png
 delete mode 100644 apps/files_odfviewer/src/webodf/programs/ios/Default-Portrait~ipad.png
 delete mode 100644 apps/files_odfviewer/src/webodf/programs/ios/WebODF.xcodeproj/project.pbxproj
 delete mode 100644 apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/AppDelegate.h
 delete mode 100644 apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/AppDelegate.m
 delete mode 100644 apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/MainViewController.h
 delete mode 100644 apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/MainViewController.m
 delete mode 100644 apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/MainViewController.xib
 delete mode 100644 apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/NSData+Base64.h
 delete mode 100644 apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/NSData+Base64.m
 delete mode 100644 apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/NativeZip.h
 delete mode 100644 apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/NativeZip.m
 delete mode 100644 apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/WebViewCache.h
 delete mode 100644 apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/WebViewCache.m
 delete mode 100644 apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/minizip/crypt.h
 delete mode 100644 apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/minizip/ioapi.c
 delete mode 100644 apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/minizip/ioapi.h
 delete mode 100644 apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/minizip/mztools.c
 delete mode 100644 apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/minizip/mztools.h
 delete mode 100644 apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/minizip/unzip.c
 delete mode 100644 apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/minizip/unzip.h
 delete mode 100644 apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/zip.h
 delete mode 100644 apps/files_odfviewer/src/webodf/programs/ios/WebODF/PhoneGap.plist
 delete mode 100644 apps/files_odfviewer/src/webodf/programs/ios/WebODF/Resources/en.lproj/Localizable.strings
 delete mode 100644 apps/files_odfviewer/src/webodf/programs/ios/WebODF/Resources/icons/icon-72.png
 delete mode 100644 apps/files_odfviewer/src/webodf/programs/ios/WebODF/Resources/icons/icon.png
 delete mode 100644 apps/files_odfviewer/src/webodf/programs/ios/WebODF/Resources/icons/icon@2x.png
 delete mode 100644 apps/files_odfviewer/src/webodf/programs/ios/WebODF/Resources/splash/Default-Landscape~ipad.png
 delete mode 100644 apps/files_odfviewer/src/webodf/programs/ios/WebODF/Resources/splash/Default-Portrait~ipad.png
 delete mode 100755 apps/files_odfviewer/src/webodf/programs/ios/WebODF/Resources/splash/Default.png
 delete mode 100755 apps/files_odfviewer/src/webodf/programs/ios/WebODF/Resources/splash/Default@2x.png
 delete mode 100644 apps/files_odfviewer/src/webodf/programs/ios/WebODF/WebODF-Info.plist
 delete mode 100644 apps/files_odfviewer/src/webodf/programs/ios/WebODF/WebODF-Prefix.pch
 delete mode 100644 apps/files_odfviewer/src/webodf/programs/ios/WebODF/en.lproj/InfoPlist.strings
 delete mode 100644 apps/files_odfviewer/src/webodf/programs/ios/WebODF/main.m
 delete mode 100644 apps/files_odfviewer/src/webodf/programs/ios/www/index.html
 delete mode 100644 apps/files_odfviewer/src/webodf/programs/ios/www/nativezip.js
 delete mode 100644 apps/files_odfviewer/src/webodf/programs/ios/www/phonegap-1.4.1.js
 delete mode 100644 apps/files_odfviewer/src/webodf/programs/nativeQtClient/CMakeLists.txt
 delete mode 100644 apps/files_odfviewer/src/webodf/programs/nativeQtClient/README
 delete mode 100644 apps/files_odfviewer/src/webodf/programs/nativeQtClient/application.qrc
 delete mode 100644 apps/files_odfviewer/src/webodf/programs/nativeQtClient/main.cpp
 delete mode 100644 apps/files_odfviewer/src/webodf/programs/nativeQtClient/mainwindow.cpp
 delete mode 100644 apps/files_odfviewer/src/webodf/programs/nativeQtClient/mainwindow.h
 delete mode 100644 apps/files_odfviewer/src/webodf/programs/nativeQtClient/mainwindow.ui
 delete mode 100644 apps/files_odfviewer/src/webodf/programs/nativeQtClient/odfpage.cpp
 delete mode 100644 apps/files_odfviewer/src/webodf/programs/nativeQtClient/odfpage.h
 delete mode 100644 apps/files_odfviewer/src/webodf/programs/nativeQtClient/odfview.cpp
 delete mode 100644 apps/files_odfviewer/src/webodf/programs/nativeQtClient/odfview.h
 delete mode 100644 apps/files_odfviewer/src/webodf/programs/nativeQtClient/scripts.js
 delete mode 100644 apps/files_odfviewer/src/webodf/programs/playbook/CMakeLists.txt
 delete mode 100644 apps/files_odfviewer/src/webodf/programs/playbook/build_sign.bat
 delete mode 100644 apps/files_odfviewer/src/webodf/programs/playbook/config.xml
 delete mode 100644 apps/files_odfviewer/src/webodf/programs/playbook/ext/blackberry.custom.filereader/js/common/custom_filereader_dispatcher.js
 delete mode 100644 apps/files_odfviewer/src/webodf/programs/playbook/ext/blackberry.custom.filereader/js/common/custom_filereader_ns.js
 delete mode 100644 apps/files_odfviewer/src/webodf/programs/playbook/ext/blackberry.custom.filereader/library.xml
 delete mode 100644 apps/files_odfviewer/src/webodf/programs/playbook/ext/blackberry.custom.filereader/src/AIR/CustomFileReader/src/blackberry/custom/filereader/CustomFileReader.as
 delete mode 100644 apps/files_odfviewer/src/webodf/programs/playbook/icon.png
 delete mode 100644 apps/files_odfviewer/src/webodf/programs/playbook/index.html
 delete mode 100644 apps/files_odfviewer/src/webodf/programs/playbook/scripts.js
 delete mode 100644 apps/files_odfviewer/src/webodf/programs/qtjsruntime/CMakeLists.txt
 delete mode 100644 apps/files_odfviewer/src/webodf/programs/qtjsruntime/nam.h
 delete mode 100644 apps/files_odfviewer/src/webodf/programs/qtjsruntime/nativeio.cpp
 delete mode 100644 apps/files_odfviewer/src/webodf/programs/qtjsruntime/nativeio.h
 delete mode 100644 apps/files_odfviewer/src/webodf/programs/qtjsruntime/pagerunner.cpp
 delete mode 100644 apps/files_odfviewer/src/webodf/programs/qtjsruntime/pagerunner.h
 delete mode 100644 apps/files_odfviewer/src/webodf/programs/qtjsruntime/qtjsruntime.cpp
 delete mode 100644 apps/files_odfviewer/src/webodf/programs/touchui/CMakeLists.txt
 delete mode 100644 apps/files_odfviewer/src/webodf/programs/touchui/ZoomIn.png
 delete mode 100644 apps/files_odfviewer/src/webodf/programs/touchui/ZoomOut.png
 delete mode 100644 apps/files_odfviewer/src/webodf/programs/touchui/app/app.js
 delete mode 100644 apps/files_odfviewer/src/webodf/programs/touchui/app/controller/Files.js
 delete mode 100644 apps/files_odfviewer/src/webodf/programs/touchui/app/model/FileSystem.js
 delete mode 100644 apps/files_odfviewer/src/webodf/programs/touchui/app/store/FileStore.js
 delete mode 100644 apps/files_odfviewer/src/webodf/programs/touchui/app/views/FileDetail.js
 delete mode 100644 apps/files_odfviewer/src/webodf/programs/touchui/app/views/FilesList.js
 delete mode 100644 apps/files_odfviewer/src/webodf/programs/touchui/app/views/OdfView.js
 delete mode 100644 apps/files_odfviewer/src/webodf/programs/touchui/app/views/Viewport.js
 delete mode 100644 apps/files_odfviewer/src/webodf/programs/touchui/go-next.png
 delete mode 100644 apps/files_odfviewer/src/webodf/programs/touchui/go-previous.png
 delete mode 100644 apps/files_odfviewer/src/webodf/programs/touchui/index.html
 delete mode 100644 apps/files_odfviewer/src/webodf/programs/touchui/scripts.js
 delete mode 100644 apps/files_odfviewer/src/webodf/programs/touchui/sencha-touch.css
 delete mode 100644 apps/files_odfviewer/src/webodf/programs/touchui/sencha-touch.js
 delete mode 100644 apps/files_odfviewer/src/webodf/programs/touchui/welcome.odt
 delete mode 100644 apps/files_odfviewer/src/webodf/programs/touchui/zoom-fit-best.png
 delete mode 100644 apps/files_odfviewer/src/webodf/programs/touchui/zoom-fit-height.png
 delete mode 100644 apps/files_odfviewer/src/webodf/programs/touchui/zoom-fit-width.png
 delete mode 100755 apps/files_odfviewer/src/webodf/simplerevisionserver/webdavserver.py
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/APPNOTE.txt
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/CMakeLists.txt
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/README
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/compare.html
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/compare.js
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/deflateinmozilla.txt
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/embedodf.html
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/filelist.js
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/filelister.html
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/filelister.js
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/flashput/Makefile
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/flashput/PUT.as
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/flashput/PUT.swf
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/flashput/Request.as
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/flashput/test.html
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/gui.js
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/httpserver.js
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/index.html
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/lib/core/Async.js
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/lib/core/Base64.js
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/lib/core/ByteArray.js
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/lib/core/ByteArrayWriter.js
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/lib/core/Cursor.js
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/lib/core/JSLint.js
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/lib/core/PointWalker.js
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/lib/core/RawDeflate.js
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/lib/core/RawInflate.js
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/lib/core/UnitTester.js
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/lib/core/Zip.js
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/lib/core/dummyxmlmodel.js_
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/lib/export.js
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/lib/gui/Caret.js
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/lib/gui/PresenterUI.js
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/lib/gui/SelectionMover.js
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/lib/gui/XMLEdit.js
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/lib/manifest.js
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/lib/odf/FontLoader.js
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/lib/odf/Formatting.js
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/lib/odf/OdfCanvas.js
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/lib/odf/OdfContainer.js
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/lib/odf/Style2CSS.js
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/lib/odf/StyleInfo.js
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/lib/packages.js
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/lib/runtime.js
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/lib/xmldom/LSSerializer.js
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/lib/xmldom/LSSerializerFilter.js
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/lib/xmldom/OperationalTransformDOM.js
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/lib/xmldom/OperationalTransformInterface.js
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/lib/xmldom/RelaxNG.js
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/lib/xmldom/RelaxNG2.js
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/lib/xmldom/RelaxNGParser.js
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/lib/xmldom/XPath.js
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/misctests/carettest.html
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/misctests/selection.html
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/misctests/testselection.html
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/misctests/testzip.js
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/misctests/writetest.zip
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/notes
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/odf.html
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/odfedit.html
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/odfedit.js
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/relaxngToCPP.js
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/relaxngtests/test01.rng
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/relaxngtests/test01.xml
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/relaxngtests/test02.rng
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/relaxngtests/test02.xml
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/relaxngtests/test03.rng
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/relaxngtests/test03.xml
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/relaxngtests/test04.rng
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/relaxngtests/test04.xml
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/relaxngtests/test05.rng
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/relaxngtests/test05.xml
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/relaxngtests/test06.rng
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/relaxngtests/test06.xml
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/relaxngtests/test07.rng
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/relaxngtests/test07.xml
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/relaxngtests/test08.rng
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/relaxngtests/test08.xml
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/relaxngtests/test09.rng
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/relaxngtests/test09.xml
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/relaxngtests/test10.rng
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/relaxngtests/test10.xml
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/relaxngtests/test11.rng
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/relaxngtests/test11.xml
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/relaxngtests/test12.rng
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/relaxngtests/test12.xml
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/relaxngtests/test13.rng
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/relaxngtests/test13.xml
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/relaxngtests/test14.rng
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/relaxngtests/test14.xml
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/relaxngtests/test15.rng
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/relaxngtests/test15.xml
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/relaxngtests/test16.rng
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/relaxngtests/test16.xml
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/relaxngtests/test17.rng
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/relaxngtests/test17.xml
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/relaxngtests/test18.rng
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/relaxngtests/test18.xml
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/relaxngtests/test19.rng
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/relaxngtests/test19.xml
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/relaxngtests/test20.rng
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/relaxngtests/test20.xml
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/relaxngtests/test21.rng
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/relaxngtests/test21.xml
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/relaxngtests/test22.rng
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/relaxngtests/test22.xml
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/relaxngtests/test23.rng
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/relaxngtests/test23.xml
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/roundtripodf.js
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/roundtripzip.js
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/styleNameRef
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/styleNameRefs
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/testrelaxng.js
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/tests/core/Base64Tests.js
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/tests/core/CursorTests.js
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/tests/core/PointWalkerTests.js
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/tests/core/RuntimeTests.js
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/tests/core/ZipTests.js
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/tests/core/hi-compressed.zip
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/tests/core/hi-uncompressed.zip
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/tests/gui/CaretTests.js
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/tests/gui/SelectionMoverTests.js
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/tests/gui/XMLEditTests.js
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/tests/manifest.js
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/tests/resources/js-test-style.css
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/tests/tests.html
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/tests/tests.js
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/tests/xmldom/OperationalTransformDOMTests.js
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/tests/xmldom/XPathTests.js
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/tools/clippingTestImage.html
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/tools/externs.js
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/tools/extjsexterns.js
 delete mode 100755 apps/files_odfviewer/src/webodf/webodf/tools/fixLicenses.py
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/tools/refcheck/bootstrap.xsl
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/tools/refcheck/odfkeys.xml
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/tools/runjslint.js
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/webodf.css
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/xmledit/gui.js
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/xmledit/index.html
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/xmledit/requirements.dtd
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/xmledit/requirements.xml
 delete mode 100644 apps/files_odfviewer/src/webodf/webodf/xmledit/test.xml
 delete mode 100644 apps/files_pdfviewer/appinfo/app.php
 delete mode 100644 apps/files_pdfviewer/appinfo/info.xml
 delete mode 100644 apps/files_pdfviewer/appinfo/version
 delete mode 100644 apps/files_pdfviewer/css/history.png
 delete mode 100644 apps/files_pdfviewer/css/viewer.css
 delete mode 100644 apps/files_pdfviewer/js/pdfjs/LICENSE
 delete mode 100644 apps/files_pdfviewer/js/pdfjs/README
 delete mode 100644 apps/files_pdfviewer/js/pdfjs/build/pdf.js
 delete mode 100644 apps/files_pdfviewer/js/pdfjs/compatibility.js
 delete mode 100755 apps/files_pdfviewer/js/pdfjs/update.sh
 delete mode 100644 apps/files_pdfviewer/js/pdfjs/viewer.js
 delete mode 100644 apps/files_pdfviewer/js/pdfjs/web/images/bookmark.svg
 delete mode 100644 apps/files_pdfviewer/js/pdfjs/web/images/check.svg
 delete mode 100644 apps/files_pdfviewer/js/pdfjs/web/images/comment.svg
 delete mode 100644 apps/files_pdfviewer/js/pdfjs/web/images/document-print.svg
 delete mode 100644 apps/files_pdfviewer/js/pdfjs/web/images/download.svg
 delete mode 100644 apps/files_pdfviewer/js/pdfjs/web/images/go-down.svg
 delete mode 100644 apps/files_pdfviewer/js/pdfjs/web/images/go-up.svg
 delete mode 100644 apps/files_pdfviewer/js/pdfjs/web/images/nav-outline.svg
 delete mode 100644 apps/files_pdfviewer/js/pdfjs/web/images/nav-thumbs.svg
 delete mode 100644 apps/files_pdfviewer/js/pdfjs/web/images/pin-down.svg
 delete mode 100644 apps/files_pdfviewer/js/pdfjs/web/images/pin-up.svg
 delete mode 100644 apps/files_pdfviewer/js/pdfjs/web/images/zoom-in.svg
 delete mode 100644 apps/files_pdfviewer/js/pdfjs/web/images/zoom-out.svg
 delete mode 100644 apps/files_pdfviewer/js/pdfview.js
 delete mode 100644 apps/files_pdfviewer/js/viewer.js
 delete mode 100644 apps/files_pdfviewer/l10n/.gitkeep
 delete mode 100644 apps/files_pdfviewer/l10n/de.php
 delete mode 100644 apps/files_sharing_log/appinfo/app.php
 delete mode 100644 apps/files_sharing_log/appinfo/database.xml
 delete mode 100644 apps/files_sharing_log/appinfo/info.xml
 delete mode 100644 apps/files_sharing_log/appinfo/version
 delete mode 100644 apps/files_sharing_log/css/style.css
 delete mode 100644 apps/files_sharing_log/index.php
 delete mode 100644 apps/files_sharing_log/log.php
 delete mode 100644 apps/files_sharing_log/templates/index.php
 delete mode 100644 apps/files_texteditor/ajax/loadfile.php
 delete mode 100644 apps/files_texteditor/ajax/mtime.php
 delete mode 100644 apps/files_texteditor/ajax/savefile.php
 delete mode 100644 apps/files_texteditor/appinfo/app.php
 delete mode 100644 apps/files_texteditor/appinfo/info.xml
 delete mode 100644 apps/files_texteditor/appinfo/version
 delete mode 100644 apps/files_texteditor/css/DroidSansMono/DroidSansMono-webfont.eot
 delete mode 100644 apps/files_texteditor/css/DroidSansMono/DroidSansMono-webfont.svg
 delete mode 100644 apps/files_texteditor/css/DroidSansMono/DroidSansMono-webfont.ttf
 delete mode 100644 apps/files_texteditor/css/DroidSansMono/DroidSansMono-webfont.woff
 delete mode 100644 apps/files_texteditor/css/DroidSansMono/Google Android License.txt
 delete mode 100644 apps/files_texteditor/css/DroidSansMono/demo.html
 delete mode 100644 apps/files_texteditor/css/DroidSansMono/stylesheet.css
 delete mode 100644 apps/files_texteditor/css/style.css
 delete mode 100644 apps/files_texteditor/js/aceeditor/LICENSE
 delete mode 100644 apps/files_texteditor/js/aceeditor/ace-compat-uncompressed.js
 delete mode 100644 apps/files_texteditor/js/aceeditor/ace-compat.js
 delete mode 100644 apps/files_texteditor/js/aceeditor/ace-uncompressed.js
 delete mode 100644 apps/files_texteditor/js/aceeditor/ace.js
 delete mode 100644 apps/files_texteditor/js/aceeditor/keybinding-emacs-uncompressed.js
 delete mode 100644 apps/files_texteditor/js/aceeditor/keybinding-emacs.js
 delete mode 100644 apps/files_texteditor/js/aceeditor/keybinding-vim-uncompressed.js
 delete mode 100644 apps/files_texteditor/js/aceeditor/keybinding-vim.js
 delete mode 100644 apps/files_texteditor/js/aceeditor/mode-c_cpp-uncompressed.js
 delete mode 100644 apps/files_texteditor/js/aceeditor/mode-c_cpp.js
 delete mode 100644 apps/files_texteditor/js/aceeditor/mode-clojure-uncompressed.js
 delete mode 100644 apps/files_texteditor/js/aceeditor/mode-clojure.js
 delete mode 100644 apps/files_texteditor/js/aceeditor/mode-coffee-uncompressed.js
 delete mode 100644 apps/files_texteditor/js/aceeditor/mode-coffee.js
 delete mode 100644 apps/files_texteditor/js/aceeditor/mode-coldfusion-uncompressed.js
 delete mode 100644 apps/files_texteditor/js/aceeditor/mode-coldfusion.js
 delete mode 100644 apps/files_texteditor/js/aceeditor/mode-csharp-uncompressed.js
 delete mode 100644 apps/files_texteditor/js/aceeditor/mode-csharp.js
 delete mode 100644 apps/files_texteditor/js/aceeditor/mode-css-uncompressed.js
 delete mode 100644 apps/files_texteditor/js/aceeditor/mode-css.js
 delete mode 100644 apps/files_texteditor/js/aceeditor/mode-groovy-uncompressed.js
 delete mode 100644 apps/files_texteditor/js/aceeditor/mode-groovy.js
 delete mode 100644 apps/files_texteditor/js/aceeditor/mode-haxe-uncompressed.js
 delete mode 100644 apps/files_texteditor/js/aceeditor/mode-haxe.js
 delete mode 100644 apps/files_texteditor/js/aceeditor/mode-html-uncompressed.js
 delete mode 100644 apps/files_texteditor/js/aceeditor/mode-html.js
 delete mode 100644 apps/files_texteditor/js/aceeditor/mode-java-uncompressed.js
 delete mode 100644 apps/files_texteditor/js/aceeditor/mode-java.js
 delete mode 100644 apps/files_texteditor/js/aceeditor/mode-javascript-uncompressed.js
 delete mode 100644 apps/files_texteditor/js/aceeditor/mode-javascript.js
 delete mode 100644 apps/files_texteditor/js/aceeditor/mode-json-uncompressed.js
 delete mode 100644 apps/files_texteditor/js/aceeditor/mode-json.js
 delete mode 100644 apps/files_texteditor/js/aceeditor/mode-latex-uncompressed.js
 delete mode 100644 apps/files_texteditor/js/aceeditor/mode-latex.js
 delete mode 100644 apps/files_texteditor/js/aceeditor/mode-less-uncompressed.js
 delete mode 100644 apps/files_texteditor/js/aceeditor/mode-less.js
 delete mode 100644 apps/files_texteditor/js/aceeditor/mode-liquid-uncompressed.js
 delete mode 100644 apps/files_texteditor/js/aceeditor/mode-liquid.js
 delete mode 100644 apps/files_texteditor/js/aceeditor/mode-lua-uncompressed.js
 delete mode 100644 apps/files_texteditor/js/aceeditor/mode-lua.js
 delete mode 100644 apps/files_texteditor/js/aceeditor/mode-markdown-uncompressed.js
 delete mode 100644 apps/files_texteditor/js/aceeditor/mode-markdown.js
 delete mode 100644 apps/files_texteditor/js/aceeditor/mode-ocaml-uncompressed.js
 delete mode 100644 apps/files_texteditor/js/aceeditor/mode-ocaml.js
 delete mode 100644 apps/files_texteditor/js/aceeditor/mode-perl-uncompressed.js
 delete mode 100644 apps/files_texteditor/js/aceeditor/mode-perl.js
 delete mode 100644 apps/files_texteditor/js/aceeditor/mode-pgsql-uncompressed.js
 delete mode 100644 apps/files_texteditor/js/aceeditor/mode-pgsql.js
 delete mode 100644 apps/files_texteditor/js/aceeditor/mode-php-uncompressed.js
 delete mode 100644 apps/files_texteditor/js/aceeditor/mode-php.js
 delete mode 100644 apps/files_texteditor/js/aceeditor/mode-powershell-uncompressed.js
 delete mode 100644 apps/files_texteditor/js/aceeditor/mode-powershell.js
 delete mode 100644 apps/files_texteditor/js/aceeditor/mode-python-uncompressed.js
 delete mode 100644 apps/files_texteditor/js/aceeditor/mode-python.js
 delete mode 100644 apps/files_texteditor/js/aceeditor/mode-ruby-uncompressed.js
 delete mode 100644 apps/files_texteditor/js/aceeditor/mode-ruby.js
 delete mode 100644 apps/files_texteditor/js/aceeditor/mode-scad-uncompressed.js
 delete mode 100644 apps/files_texteditor/js/aceeditor/mode-scad.js
 delete mode 100644 apps/files_texteditor/js/aceeditor/mode-scala-uncompressed.js
 delete mode 100644 apps/files_texteditor/js/aceeditor/mode-scala.js
 delete mode 100644 apps/files_texteditor/js/aceeditor/mode-scss-uncompressed.js
 delete mode 100644 apps/files_texteditor/js/aceeditor/mode-scss.js
 delete mode 100644 apps/files_texteditor/js/aceeditor/mode-sh-uncompressed.js
 delete mode 100644 apps/files_texteditor/js/aceeditor/mode-sh.js
 delete mode 100644 apps/files_texteditor/js/aceeditor/mode-sql-uncompressed.js
 delete mode 100644 apps/files_texteditor/js/aceeditor/mode-sql.js
 delete mode 100644 apps/files_texteditor/js/aceeditor/mode-svg-uncompressed.js
 delete mode 100644 apps/files_texteditor/js/aceeditor/mode-svg.js
 delete mode 100644 apps/files_texteditor/js/aceeditor/mode-text-uncompressed.js
 delete mode 100644 apps/files_texteditor/js/aceeditor/mode-text.js
 delete mode 100644 apps/files_texteditor/js/aceeditor/mode-textile-uncompressed.js
 delete mode 100644 apps/files_texteditor/js/aceeditor/mode-textile.js
 delete mode 100644 apps/files_texteditor/js/aceeditor/mode-xml-uncompressed.js
 delete mode 100644 apps/files_texteditor/js/aceeditor/mode-xml.js
 delete mode 100644 apps/files_texteditor/js/aceeditor/mode-xquery-uncompressed.js
 delete mode 100644 apps/files_texteditor/js/aceeditor/mode-xquery.js
 delete mode 100644 apps/files_texteditor/js/aceeditor/theme-clouds-uncompressed.js
 delete mode 100644 apps/files_texteditor/js/aceeditor/theme-clouds.js
 delete mode 100644 apps/files_texteditor/js/aceeditor/worker-coffee.js
 delete mode 100644 apps/files_texteditor/js/aceeditor/worker-css.js
 delete mode 100644 apps/files_texteditor/js/aceeditor/worker-javascript.js
 delete mode 100644 apps/files_texteditor/js/aceeditor/worker-json.js
 delete mode 100644 apps/files_texteditor/js/editor.js
 delete mode 100644 apps/files_texteditor/l10n/.gitkeep
 delete mode 100644 apps/files_texteditor/l10n/de.php
 delete mode 100644 apps/gallery/ajax/createAlbum.php
 delete mode 100644 apps/gallery/ajax/galleryOp.php
 delete mode 100644 apps/gallery/ajax/sharing.php
 delete mode 100644 apps/gallery/ajax/thumbnail.php
 delete mode 100644 apps/gallery/ajax/viewImage.php
 delete mode 100644 apps/gallery/appinfo/app.php
 delete mode 100644 apps/gallery/appinfo/database.xml
 delete mode 100644 apps/gallery/appinfo/info.xml
 delete mode 100644 apps/gallery/appinfo/update.php
 delete mode 100644 apps/gallery/appinfo/version
 delete mode 100644 apps/gallery/css/sharing.css
 delete mode 100644 apps/gallery/css/styles.css
 delete mode 100644 apps/gallery/css/supersized.css
 delete mode 100644 apps/gallery/css/supersized.shutter.css
 delete mode 100644 apps/gallery/img/breadcrumb.png
 delete mode 100644 apps/gallery/img/delete.png
 delete mode 100644 apps/gallery/img/loading.gif
 delete mode 100644 apps/gallery/img/rename.png
 delete mode 100644 apps/gallery/img/share.png
 delete mode 100644 apps/gallery/img/supersized/back.png
 delete mode 100644 apps/gallery/img/supersized/bg-black.png
 delete mode 100644 apps/gallery/img/supersized/bg-hover.png
 delete mode 100644 apps/gallery/img/supersized/button-tray-down.png
 delete mode 100644 apps/gallery/img/supersized/button-tray-up.png
 delete mode 100644 apps/gallery/img/supersized/forward.png
 delete mode 100644 apps/gallery/img/supersized/nav-bg.png
 delete mode 100644 apps/gallery/img/supersized/nav-dot.png
 delete mode 100644 apps/gallery/img/supersized/pause.png
 delete mode 100644 apps/gallery/img/supersized/play.png
 delete mode 100644 apps/gallery/img/supersized/progress-back.png
 delete mode 100644 apps/gallery/img/supersized/progress-bar.png
 delete mode 100644 apps/gallery/img/supersized/progress.gif
 delete mode 100644 apps/gallery/img/supersized/supersized-logo.png
 delete mode 100644 apps/gallery/img/supersized/thumb-back.png
 delete mode 100644 apps/gallery/img/supersized/thumb-forward.png
 delete mode 100644 apps/gallery/index.php
 delete mode 100644 apps/gallery/js/albums.js
 delete mode 100644 apps/gallery/js/jquery.easing.min.js
 delete mode 100644 apps/gallery/js/pictures.js
 delete mode 100644 apps/gallery/js/scanner.js
 delete mode 100644 apps/gallery/js/sharing.js
 delete mode 100644 apps/gallery/js/slideshow.js
 delete mode 100644 apps/gallery/js/supersized.3.2.7.js
 delete mode 100644 apps/gallery/js/supersized.3.2.7.min.js
 delete mode 100644 apps/gallery/js/supersized.shutter.js
 delete mode 100644 apps/gallery/js/supersized.shutter.min.js
 delete mode 100644 apps/gallery/l10n/ar.php
 delete mode 100644 apps/gallery/l10n/ca.php
 delete mode 100644 apps/gallery/l10n/cs_CZ.php
 delete mode 100644 apps/gallery/l10n/da.php
 delete mode 100644 apps/gallery/l10n/de.php
 delete mode 100644 apps/gallery/l10n/el.php
 delete mode 100644 apps/gallery/l10n/eo.php
 delete mode 100644 apps/gallery/l10n/es.php
 delete mode 100644 apps/gallery/l10n/et_EE.php
 delete mode 100644 apps/gallery/l10n/eu.php
 delete mode 100644 apps/gallery/l10n/fa.php
 delete mode 100644 apps/gallery/l10n/fi_FI.php
 delete mode 100644 apps/gallery/l10n/fr.php
 delete mode 100644 apps/gallery/l10n/gl.php
 delete mode 100644 apps/gallery/l10n/hr.php
 delete mode 100644 apps/gallery/l10n/hu_HU.php
 delete mode 100644 apps/gallery/l10n/ia.php
 delete mode 100644 apps/gallery/l10n/id.php
 delete mode 100644 apps/gallery/l10n/it.php
 delete mode 100644 apps/gallery/l10n/ja_JP.php
 delete mode 100644 apps/gallery/l10n/ko.php
 delete mode 100644 apps/gallery/l10n/lb.php
 delete mode 100644 apps/gallery/l10n/lt_LT.php
 delete mode 100644 apps/gallery/l10n/mk.php
 delete mode 100644 apps/gallery/l10n/ms_MY.php
 delete mode 100644 apps/gallery/l10n/nb_NO.php
 delete mode 100644 apps/gallery/l10n/nl.php
 delete mode 100644 apps/gallery/l10n/nn_NO.php
 delete mode 100644 apps/gallery/l10n/pl.php
 delete mode 100644 apps/gallery/l10n/pt_BR.php
 delete mode 100644 apps/gallery/l10n/pt_PT.php
 delete mode 100644 apps/gallery/l10n/ro.php
 delete mode 100644 apps/gallery/l10n/ru.php
 delete mode 100644 apps/gallery/l10n/sk_SK.php
 delete mode 100644 apps/gallery/l10n/sl.php
 delete mode 100644 apps/gallery/l10n/sr.php
 delete mode 100644 apps/gallery/l10n/sv.php
 delete mode 100644 apps/gallery/l10n/th_TH.php
 delete mode 100644 apps/gallery/l10n/tr.php
 delete mode 100644 apps/gallery/l10n/uk.php
 delete mode 100644 apps/gallery/l10n/vi.php
 delete mode 100644 apps/gallery/l10n/zh_CN.php
 delete mode 100644 apps/gallery/l10n/zh_TW.php
 delete mode 100644 apps/gallery/lib/album.php
 delete mode 100644 apps/gallery/lib/hooks_handlers.php
 delete mode 100644 apps/gallery/lib/images_utils.php
 delete mode 100644 apps/gallery/lib/managers.php
 delete mode 100644 apps/gallery/lib/photo.php
 delete mode 100644 apps/gallery/lib/scanner.php
 delete mode 100644 apps/gallery/lib/share.php
 delete mode 100644 apps/gallery/lib/sharing.php
 delete mode 100644 apps/gallery/lib/tiles.php
 delete mode 100644 apps/gallery/lib/tiles_test.php
 delete mode 100644 apps/gallery/sharing.php
 delete mode 100644 apps/gallery/templates/index.php
 delete mode 100644 apps/impress/appinfo/app.php
 delete mode 100644 apps/impress/appinfo/info.xml
 delete mode 100644 apps/impress/appinfo/version
 delete mode 100644 apps/impress/css/player.css
 delete mode 100755 apps/impress/css/style.css
 delete mode 100755 apps/impress/documentation.php
 delete mode 100644 apps/impress/img/impress.png
 delete mode 100755 apps/impress/img/impress.svg
 delete mode 100644 apps/impress/img/impressbig.png
 delete mode 100755 apps/impress/img/impressbig.svg
 delete mode 100755 apps/impress/index.php
 delete mode 100644 apps/impress/js/impress.js
 delete mode 100644 apps/impress/l10n/.gitkeep
 delete mode 100644 apps/impress/l10n/de.php
 delete mode 100755 apps/impress/lib/impress.php
 delete mode 100755 apps/impress/player.php
 delete mode 100755 apps/impress/templates/documentation.php
 delete mode 100755 apps/impress/templates/presentations.php
 delete mode 100644 apps/media/ajax/api.php
 delete mode 100644 apps/media/ajax/autoupdate.php
 delete mode 100644 apps/media/appinfo/app.php
 delete mode 100644 apps/media/appinfo/database.xml
 delete mode 100644 apps/media/appinfo/info.xml
 delete mode 100644 apps/media/appinfo/version
 delete mode 100644 apps/media/css/music.css
 delete mode 100644 apps/media/css/player.css
 delete mode 100644 apps/media/index.php
 delete mode 100644 apps/media/js/Jplayer.swf
 delete mode 100644 apps/media/js/collection.js
 delete mode 100644 apps/media/js/jQuery.jPlayer.2.1.0.source/Jplayer.as
 delete mode 100644 apps/media/js/jQuery.jPlayer.2.1.0.source/Jplayer.fla
 delete mode 100644 apps/media/js/jQuery.jPlayer.2.1.0.source/add-on/jplayer.playlist.js
 delete mode 100644 apps/media/js/jQuery.jPlayer.2.1.0.source/add-on/jquery.jplayer.inspector.js
 delete mode 100644 apps/media/js/jQuery.jPlayer.2.1.0.source/happyworm/jPlayer/JplayerEvent.as
 delete mode 100644 apps/media/js/jQuery.jPlayer.2.1.0.source/happyworm/jPlayer/JplayerMp3.as
 delete mode 100644 apps/media/js/jQuery.jPlayer.2.1.0.source/happyworm/jPlayer/JplayerMp4.as
 delete mode 100644 apps/media/js/jQuery.jPlayer.2.1.0.source/happyworm/jPlayer/JplayerStatus.as
 delete mode 100644 apps/media/js/jQuery.jPlayer.2.1.0.source/jquery.jplayer.js
 delete mode 100644 apps/media/js/jquery.jplayer.min.js
 delete mode 100644 apps/media/js/loader.js
 delete mode 100644 apps/media/js/music.js
 delete mode 100644 apps/media/js/player.js
 delete mode 100644 apps/media/js/playlist.js
 delete mode 100644 apps/media/js/scanner.js
 delete mode 100644 apps/media/l10n/ar.php
 delete mode 100644 apps/media/l10n/bg_BG.php
 delete mode 100644 apps/media/l10n/ca.php
 delete mode 100644 apps/media/l10n/cs_CZ.php
 delete mode 100644 apps/media/l10n/da.php
 delete mode 100644 apps/media/l10n/de.php
 delete mode 100644 apps/media/l10n/el.php
 delete mode 100644 apps/media/l10n/eo.php
 delete mode 100644 apps/media/l10n/es.php
 delete mode 100644 apps/media/l10n/et_EE.php
 delete mode 100644 apps/media/l10n/eu.php
 delete mode 100644 apps/media/l10n/fa.php
 delete mode 100644 apps/media/l10n/fi_FI.php
 delete mode 100644 apps/media/l10n/fr.php
 delete mode 100644 apps/media/l10n/gl.php
 delete mode 100644 apps/media/l10n/he.php
 delete mode 100644 apps/media/l10n/hr.php
 delete mode 100644 apps/media/l10n/hu_HU.php
 delete mode 100644 apps/media/l10n/ia.php
 delete mode 100644 apps/media/l10n/id.php
 delete mode 100644 apps/media/l10n/it.php
 delete mode 100644 apps/media/l10n/ja_JP.php
 delete mode 100644 apps/media/l10n/ko.php
 delete mode 100644 apps/media/l10n/lb.php
 delete mode 100644 apps/media/l10n/lt_LT.php
 delete mode 100644 apps/media/l10n/mk.php
 delete mode 100644 apps/media/l10n/ms_MY.php
 delete mode 100644 apps/media/l10n/nb_NO.php
 delete mode 100644 apps/media/l10n/nl.php
 delete mode 100644 apps/media/l10n/nn_NO.php
 delete mode 100644 apps/media/l10n/pl.php
 delete mode 100644 apps/media/l10n/pt_BR.php
 delete mode 100644 apps/media/l10n/pt_PT.php
 delete mode 100644 apps/media/l10n/ro.php
 delete mode 100644 apps/media/l10n/ru.php
 delete mode 100644 apps/media/l10n/sk_SK.php
 delete mode 100644 apps/media/l10n/sl.php
 delete mode 100644 apps/media/l10n/sr.php
 delete mode 100644 apps/media/l10n/sr@latin.php
 delete mode 100644 apps/media/l10n/sv.php
 delete mode 100644 apps/media/l10n/th_TH.php
 delete mode 100644 apps/media/l10n/tr.php
 delete mode 100644 apps/media/l10n/uk.php
 delete mode 100644 apps/media/l10n/vi.php
 delete mode 100644 apps/media/l10n/xgettextfiles
 delete mode 100644 apps/media/l10n/zh_CN.GB2312.php
 delete mode 100644 apps/media/l10n/zh_CN.php
 delete mode 100644 apps/media/l10n/zh_TW.php
 delete mode 100644 apps/media/lib/share/album.php
 delete mode 100644 apps/media/lib/share/artist.php
 delete mode 100644 apps/media/lib/share/song.php
 delete mode 100644 apps/media/lib_ampache.php
 delete mode 100644 apps/media/lib_collection.php
 delete mode 100644 apps/media/lib_media.php
 delete mode 100644 apps/media/lib_scanner.php
 delete mode 100644 apps/media/remote.php
 delete mode 100644 apps/media/server/xml.server.php
 delete mode 100644 apps/media/settings.php
 delete mode 100644 apps/media/templates/music.php
 delete mode 100644 apps/media/templates/player.php
 delete mode 100644 apps/media/templates/settings.php
 delete mode 100644 apps/remoteStorage/BearerAuth.php
 delete mode 100644 apps/remoteStorage/ajax/revokeToken.php
 delete mode 100644 apps/remoteStorage/appinfo/app.php
 delete mode 100644 apps/remoteStorage/appinfo/database.xml
 delete mode 100644 apps/remoteStorage/appinfo/info.xml
 delete mode 100644 apps/remoteStorage/appinfo/version
 delete mode 100644 apps/remoteStorage/appinfo/webfinger.php
 delete mode 100644 apps/remoteStorage/auth.php
 delete mode 100644 apps/remoteStorage/img/remoteStorage.png
 delete mode 100644 apps/remoteStorage/lib_remoteStorage.php
 delete mode 100644 apps/remoteStorage/oauth_ro_auth.php
 delete mode 100644 apps/remoteStorage/settings.php
 delete mode 100644 apps/remoteStorage/templates/auth.php
 delete mode 100644 apps/remoteStorage/templates/settings.php
 delete mode 100644 apps/remoteStorage/webdav.php
 delete mode 100644 apps/tasks/ajax/addtask.php
 delete mode 100644 apps/tasks/ajax/delete.php
 delete mode 100644 apps/tasks/ajax/gettasks.php
 delete mode 100644 apps/tasks/ajax/update_property.php
 delete mode 100644 apps/tasks/appinfo/app.php
 delete mode 100644 apps/tasks/appinfo/info.xml
 delete mode 100644 apps/tasks/css/style.css
 delete mode 100644 apps/tasks/img/icon.png
 delete mode 100644 apps/tasks/img/icon.svg
 delete mode 100644 apps/tasks/index.php
 delete mode 100644 apps/tasks/js/tasks.js
 delete mode 100644 apps/tasks/l10n/.gitkeep
 delete mode 100644 apps/tasks/l10n/ca.php
 delete mode 100644 apps/tasks/l10n/cs_CZ.php
 delete mode 100644 apps/tasks/l10n/da.php
 delete mode 100644 apps/tasks/l10n/de.php
 delete mode 100644 apps/tasks/l10n/el.php
 delete mode 100644 apps/tasks/l10n/eo.php
 delete mode 100644 apps/tasks/l10n/es.php
 delete mode 100644 apps/tasks/l10n/et_EE.php
 delete mode 100644 apps/tasks/l10n/fa.php
 delete mode 100644 apps/tasks/l10n/fi_FI.php
 delete mode 100644 apps/tasks/l10n/fr.php
 delete mode 100644 apps/tasks/l10n/it.php
 delete mode 100644 apps/tasks/l10n/ja_JP.php
 delete mode 100644 apps/tasks/l10n/lt_LT.php
 delete mode 100644 apps/tasks/l10n/nb_NO.php
 delete mode 100644 apps/tasks/l10n/pl.php
 delete mode 100644 apps/tasks/l10n/ro.php
 delete mode 100644 apps/tasks/l10n/ru.php
 delete mode 100644 apps/tasks/l10n/sl.php
 delete mode 100644 apps/tasks/l10n/sv.php
 delete mode 100644 apps/tasks/l10n/th_TH.php
 delete mode 100644 apps/tasks/lib/app.php
 delete mode 100644 apps/tasks/lib/vtodo.php
 delete mode 100644 apps/tasks/templates/tasks.php
 delete mode 100644 apps/user_external/appinfo/app.php
 delete mode 100644 apps/user_external/appinfo/info.xml
 delete mode 100644 apps/user_external/appinfo/version
 delete mode 100644 apps/user_external/lib/ftp.php
 delete mode 100644 apps/user_external/lib/imap.php
 delete mode 100644 apps/user_external/lib/smb.php
 delete mode 100644 apps/user_external/tests/config.php
 delete mode 100644 apps/user_external/tests/ftp.php
 delete mode 100644 apps/user_external/tests/imap.php
 delete mode 100644 apps/user_external/tests/smb.php
 delete mode 100644 apps/user_migrate/ajax/export.php
 delete mode 100644 apps/user_migrate/appinfo/app.php
 delete mode 100644 apps/user_migrate/appinfo/info.xml
 delete mode 100644 apps/user_migrate/appinfo/version
 delete mode 100644 apps/user_migrate/js/export.js
 delete mode 100644 apps/user_migrate/l10n/.gitkeep
 delete mode 100644 apps/user_migrate/l10n/ca.php
 delete mode 100644 apps/user_migrate/l10n/cs_CZ.php
 delete mode 100644 apps/user_migrate/l10n/de.php
 delete mode 100644 apps/user_migrate/l10n/el.php
 delete mode 100644 apps/user_migrate/l10n/eo.php
 delete mode 100644 apps/user_migrate/l10n/es.php
 delete mode 100644 apps/user_migrate/l10n/fi_FI.php
 delete mode 100644 apps/user_migrate/l10n/fr.php
 delete mode 100644 apps/user_migrate/l10n/it.php
 delete mode 100644 apps/user_migrate/l10n/ja_JP.php
 delete mode 100644 apps/user_migrate/l10n/lt_LT.php
 delete mode 100644 apps/user_migrate/l10n/pl.php
 delete mode 100644 apps/user_migrate/l10n/ru.php
 delete mode 100644 apps/user_migrate/l10n/sl.php
 delete mode 100644 apps/user_migrate/l10n/sv.php
 delete mode 100644 apps/user_migrate/l10n/th_TH.php
 delete mode 100644 apps/user_migrate/settings.php
 delete mode 100644 apps/user_migrate/templates/settings.php
 delete mode 100644 apps/user_openid/appinfo/app.php
 delete mode 100644 apps/user_openid/appinfo/info.xml
 delete mode 100644 apps/user_openid/appinfo/version
 delete mode 100644 apps/user_openid/js/settings.js
 delete mode 100644 apps/user_openid/l10n/.gitkeep
 delete mode 100644 apps/user_openid/l10n/ca.php
 delete mode 100644 apps/user_openid/l10n/cs_CZ.php
 delete mode 100644 apps/user_openid/l10n/de.php
 delete mode 100644 apps/user_openid/l10n/el.php
 delete mode 100644 apps/user_openid/l10n/eo.php
 delete mode 100644 apps/user_openid/l10n/es.php
 delete mode 100644 apps/user_openid/l10n/et_EE.php
 delete mode 100644 apps/user_openid/l10n/fi_FI.php
 delete mode 100644 apps/user_openid/l10n/fr.php
 delete mode 100644 apps/user_openid/l10n/it.php
 delete mode 100644 apps/user_openid/l10n/ja_JP.php
 delete mode 100644 apps/user_openid/l10n/nl.php
 delete mode 100644 apps/user_openid/l10n/pl.php
 delete mode 100644 apps/user_openid/l10n/ru.php
 delete mode 100644 apps/user_openid/l10n/sl.php
 delete mode 100644 apps/user_openid/l10n/sv.php
 delete mode 100644 apps/user_openid/l10n/th_TH.php
 delete mode 100644 apps/user_openid/settings.php
 delete mode 100644 apps/user_openid/templates/nomode.php
 delete mode 100644 apps/user_openid/templates/settings.php
 delete mode 100644 apps/user_openid/user.php
 delete mode 100644 apps/user_openid/user_openid.php
 delete mode 100644 apps/user_webfinger/.htaccess
 delete mode 100644 apps/user_webfinger/appinfo/app.php
 delete mode 100644 apps/user_webfinger/appinfo/info.xml
 delete mode 100644 apps/user_webfinger/appinfo/version
 delete mode 100644 apps/user_webfinger/host-meta.php
 delete mode 100644 apps/user_webfinger/webfinger.php

diff --git a/apps/admin_audit/appinfo/app.php b/apps/admin_audit/appinfo/app.php
deleted file mode 100644
index 2cbed5bf57..0000000000
--- a/apps/admin_audit/appinfo/app.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-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');
-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');
-
-//FIXME OC_Share does no longer exist
-/*
-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');
-*/
\ No newline at end of file
diff --git a/apps/admin_audit/appinfo/info.xml b/apps/admin_audit/appinfo/info.xml
deleted file mode 100644
index 4fa013162f..0000000000
--- a/apps/admin_audit/appinfo/info.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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>4</require>
-	<description>Audit user actions in Owncloud</description>
-	<shipped>true</shipped>
-</info>
diff --git a/apps/admin_audit/lib/hooks_handlers.php b/apps/admin_audit/lib/hooks_handlers.php
deleted file mode 100644
index 17a553837d..0000000000
--- a/apps/admin_audit/lib/hooks_handlers.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-
-class OC_Admin_Audit_Hooks_Handlers {
-	static public function pre_login($params) {
-		$path = $params['uid'];
-		self::log('Trying login '.$user);
-	}
-	static public function post_login($params) {
-		$path = $params['uid'];
-		self::log('Login '.$user);
-	}
-	static public function logout($params) {
-		$user = OCP\User::getUser();
-		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();
-		self::log('Rename "'.$oldpath.'" to "'.$newpath.'" by '.$user);
-	}
-	static public function create($params) {
-		$path = $params[OC_Filesystem::signal_param_path];
-		$user = OCP\User::getUser();
-		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();
-		self::log('Copy "'.$oldpath.'" to "'.$newpath.'" by '.$user);
-	}
-	static public function write($params) {
-		$path = $params[OC_Filesystem::signal_param_path];
-		$user = OCP\User::getUser();
-		self::log('Write "'.$path.'" by '.$user);
-	}
-	static public function read($params) {
-		$path = $params[OC_Filesystem::signal_param_path];
-		$user = OCP\User::getUser();
-		self::log('Read "'.$path.'" by '.$user);
-	}
-	static public function delete($params) {
-		$path = $params[OC_Filesystem::signal_param_path];
-		$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'; //FIXME OC_Share no longer exists, hack to check permissions
-		$rw = $permissions & 1 ? '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/admin_dependencies_chk/appinfo/app.php b/apps/admin_dependencies_chk/appinfo/app.php
deleted file mode 100644
index 62b26342d2..0000000000
--- a/apps/admin_dependencies_chk/appinfo/app.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php
-$l=OC_L10N::get('admin_dependencies_chk');
-
-OCP\App::registerAdmin('admin_dependencies_chk','settings');
diff --git a/apps/admin_dependencies_chk/appinfo/info.xml b/apps/admin_dependencies_chk/appinfo/info.xml
deleted file mode 100644
index 90ea72bf4b..0000000000
--- a/apps/admin_dependencies_chk/appinfo/info.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0"?> 
-<info>
-	<id>admin_dependencies_chk</id>
-	<name>ownCloud dependencies info</name>
-	<licence>AGPL</licence>
-	<author>Brice Maron (eMerzh)</author>
-	<require>4</require>
-	<shipped>true</shipped>
-	<description>Display OwnCloud's dependencies informations (missings modules, ...)</description>
-</info>
diff --git a/apps/admin_dependencies_chk/appinfo/version b/apps/admin_dependencies_chk/appinfo/version
deleted file mode 100644
index d1c6331b31..0000000000
--- a/apps/admin_dependencies_chk/appinfo/version
+++ /dev/null
@@ -1 +0,0 @@
-0.01
\ No newline at end of file
diff --git a/apps/admin_dependencies_chk/css/style.css b/apps/admin_dependencies_chk/css/style.css
deleted file mode 100644
index 30f204be7b..0000000000
--- a/apps/admin_dependencies_chk/css/style.css
+++ /dev/null
@@ -1,9 +0,0 @@
-#status_list legend { font-weight: bold; color: #888888; }
-.state > li { margin-bottom: 3px; padding-left: 0.5em; list-style-type: circle; }
-.state .state_module {  font-weight:bold; text-shadow: 0 1px 0 #DDD; cursor:help;}
-
-.state_used ul,  .state_used li { display:inline;   }
-
-.state_ok .state_module	{ color: #009700; }
-.state_warning .state_module	{ color: #FF9B29; }
-.state_error .state_module	{ color: #FF3B3B; }
diff --git a/apps/admin_dependencies_chk/l10n/.gitkeep b/apps/admin_dependencies_chk/l10n/.gitkeep
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/apps/admin_dependencies_chk/l10n/ca.php b/apps/admin_dependencies_chk/l10n/ca.php
deleted file mode 100644
index 08f4ec8078..0000000000
--- a/apps/admin_dependencies_chk/l10n/ca.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?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/cs_CZ.php b/apps/admin_dependencies_chk/l10n/cs_CZ.php
deleted file mode 100644
index f750f13aef..0000000000
--- a/apps/admin_dependencies_chk/l10n/cs_CZ.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?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/admin_dependencies_chk/l10n/de.php b/apps/admin_dependencies_chk/l10n/de.php
deleted file mode 100644
index 7877e7d679..0000000000
--- a/apps/admin_dependencies_chk/l10n/de.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?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/el.php b/apps/admin_dependencies_chk/l10n/el.php
deleted file mode 100644
index 9dd455b670..0000000000
--- a/apps/admin_dependencies_chk/l10n/el.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Dependencies status" => "Κατάσταση εξαρτήσεων",
-"Used by :" => "Χρησιμοποιήθηκε από:"
-);
diff --git a/apps/admin_dependencies_chk/l10n/eo.php b/apps/admin_dependencies_chk/l10n/eo.php
deleted file mode 100644
index 65896831f7..0000000000
--- a/apps/admin_dependencies_chk/l10n/eo.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?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/es.php b/apps/admin_dependencies_chk/l10n/es.php
deleted file mode 100644
index cbf13951ac..0000000000
--- a/apps/admin_dependencies_chk/l10n/es.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Dependencies status" => "Estado de las dependencias",
-"Used by :" => "Usado por:"
-);
diff --git a/apps/admin_dependencies_chk/l10n/et_EE.php b/apps/admin_dependencies_chk/l10n/et_EE.php
deleted file mode 100644
index 529c8e78d1..0000000000
--- a/apps/admin_dependencies_chk/l10n/et_EE.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?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/fi_FI.php b/apps/admin_dependencies_chk/l10n/fi_FI.php
deleted file mode 100644
index 85e33cfe8c..0000000000
--- a/apps/admin_dependencies_chk/l10n/fi_FI.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?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_dependencies_chk/l10n/fr.php b/apps/admin_dependencies_chk/l10n/fr.php
deleted file mode 100644
index 1b195b78bb..0000000000
--- a/apps/admin_dependencies_chk/l10n/fr.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?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
deleted file mode 100644
index f51286966e..0000000000
--- a/apps/admin_dependencies_chk/l10n/it.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?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 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_dependencies_chk/l10n/ja_JP.php b/apps/admin_dependencies_chk/l10n/ja_JP.php
deleted file mode 100644
index 0770b92db1..0000000000
--- a/apps/admin_dependencies_chk/l10n/ja_JP.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?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/lt_LT.php b/apps/admin_dependencies_chk/l10n/lt_LT.php
deleted file mode 100644
index 4fed2ab93d..0000000000
--- a/apps/admin_dependencies_chk/l10n/lt_LT.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?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_dependencies_chk/l10n/nb_NO.php b/apps/admin_dependencies_chk/l10n/nb_NO.php
deleted file mode 100644
index 98fcf4fe2a..0000000000
--- a/apps/admin_dependencies_chk/l10n/nb_NO.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php $TRANSLATIONS = array(
-"The php-json module is needed by the many applications for inter communications" => "Modulen php-jason blir benyttet til inter kommunikasjon",
-"The php-curl modude is needed to fetch the page title when adding a bookmarks" => "Modulen php-curl blir brukt til å hente sidetittelen når bokmerke blir lagt til",
-"The php-gd module is needed to create thumbnails of your images" => "Modulen php-gd blir benyttet til å lage miniatyr av bildene dine",
-"The php-ldap module is needed connect to your ldap server" => "Modulen php-ldap benyttes for å koble til din ldapserver",
-"The php-zip module is needed download multiple files at once" => "Modulen php-zup benyttes til å laste ned flere filer på en gang.",
-"The php-mb_multibyte module is needed to manage correctly the encoding." => "Modulen php-mb_multibyte benyttes til å håndtere korrekt tegnkoding.",
-"The php-ctype module is needed validate data." => "Modulen php-ctype benyttes til å validere data.",
-"The php-xml module is needed to share files with webdav." => "Modulen php-xml benyttes til å dele 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 settes til 1 for å kunne hente kunnskapsbasen fra OCS-servere",
-"The php-pdo module is needed to store owncloud data into a database." => "Modulen php-pdo benyttes til å lagre ownCloud data i en database.",
-"Dependencies status" => "Avhengighetsstatus",
-"Used by :" => "Benyttes av:"
-);
diff --git a/apps/admin_dependencies_chk/l10n/pl.php b/apps/admin_dependencies_chk/l10n/pl.php
deleted file mode 100644
index e40d23cb7e..0000000000
--- a/apps/admin_dependencies_chk/l10n/pl.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?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_dependencies_chk/l10n/ru.php b/apps/admin_dependencies_chk/l10n/ru.php
deleted file mode 100644
index 58e699cb48..0000000000
--- a/apps/admin_dependencies_chk/l10n/ru.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?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" => "Директива allow_url_fopen в файле php.ini должна быть установлена в 1 для получения базы знаний с серверов OCS",
-"The php-pdo module is needed to store owncloud data into a database." => "Модуль php-pdo необходим для хранения данных ownСloud в базе данных.",
-"Dependencies status" => "Статус зависимостей",
-"Used by :" => "Используется:"
-);
diff --git a/apps/admin_dependencies_chk/l10n/sl.php b/apps/admin_dependencies_chk/l10n/sl.php
deleted file mode 100644
index 0d36aa379c..0000000000
--- a/apps/admin_dependencies_chk/l10n/sl.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php $TRANSLATIONS = array(
-"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/sv.php b/apps/admin_dependencies_chk/l10n/sv.php
deleted file mode 100644
index 07868f3c03..0000000000
--- a/apps/admin_dependencies_chk/l10n/sv.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?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_dependencies_chk/l10n/th_TH.php b/apps/admin_dependencies_chk/l10n/th_TH.php
deleted file mode 100644
index 01d5c36366..0000000000
--- a/apps/admin_dependencies_chk/l10n/th_TH.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?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" => "คำสั่ง 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/admin_dependencies_chk/settings.php b/apps/admin_dependencies_chk/settings.php
deleted file mode 100644
index 4e0803f791..0000000000
--- a/apps/admin_dependencies_chk/settings.php
+++ /dev/null
@@ -1,102 +0,0 @@
-<?php
-
-/**
- * ownCloud - user_ldap
- *
- * @author Brice Maron
- * @copyright 2011 Brice Maron brice __from__ bmaron _DOT_ 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/>.
- *
- */
-$l=OC_L10N::get('admin_dependencies_chk');
-$tmpl = new OCP\Template( 'admin_dependencies_chk', 'settings');
-
-$modules = array();
-
-//Possible status are : ok, error, warning
-$modules[] =array(
-	'status' => function_exists('json_encode') ? 'ok' : 'error',
-	'part'=> 'php-json',
-	'modules'=> array('core'),
-	'message'=> $l->t('The php-json module is needed by the many applications for inter communications'));
-
-$modules[] =array(
-	'status' => function_exists('curl_init') ? 'ok' : 'error',
-	'part'=> 'php-curl',
-	'modules'=> array('bookmarks'),
-	'message'=> $l->t('The php-curl modude is needed to fetch the page title when adding a bookmarks'));
-
-$modules[] =array(
-	'status' => function_exists('imagepng') ? 'ok' : 'error',
-	'part'=> 'php-gd',
-	'modules'=> array('gallery'),
-	'message'=> $l->t('The php-gd module is needed to create thumbnails of your images'));
-
-$modules[] =array(
-	'status' => function_exists("ldap_bind") ? 'ok' : 'error',
-	'part'=> 'php-ldap',
-	'modules'=> array('user_ldap'),
-	'message'=> $l->t('The php-ldap module is needed connect to your ldap server'));
-
-$modules[] =array(
-	'status' => class_exists('ZipArchive') ? 'ok' : 'warning',
-	'part'=> 'php-zip',
-	'modules'=> array('admin_export','core'),
-	'message'=> $l->t('The php-zip module is needed download multiple files at once'));
-
-$modules[] =array(
-	'status' => function_exists('mb_detect_encoding') ? 'ok' : 'error',
-	'part'=> 'php-mb_multibyte ',
-	'modules'=> array('core'),
-	'message'=> $l->t('The php-mb_multibyte module is needed to manage correctly the encoding.'));
-
-$modules[] =array(
-	'status' => function_exists('ctype_digit') ? 'ok' : 'error',
-	'part'=> 'php-ctype',
-	'modules'=> array('core'),
-	'message'=> $l->t('The php-ctype module is needed validate data.'));
-
-$modules[] =array(
-	'status' => class_exists('DOMDocument') ? 'ok' : 'error',
-	'part'=> 'php-xml',
-	'modules'=> array('core'),
-	'message'=> $l->t('The php-xml module is needed to share files with webdav.'));
-
-$modules[] =array(
-	'status' => ini_get('allow_url_fopen') == '1' ? 'ok' : 'error',
-	'part'=> 'allow_url_fopen',
-	'modules'=> array('core'),
-	'message'=> $l->t('The allow_url_fopen directive of your php.ini should be set to 1 to retrieve knowledge base from OCS servers'));
-
-$modules[] =array(
-	'status' => class_exists('PDO') ? 'ok' : 'warning',
-	'part'=> 'php-pdo',
-	'modules'=> array('core'),
-	'message'=> $l->t('The php-pdo module is needed to store owncloud data into a database.'));
-
-foreach($modules as $key => $module) {
-	$enabled = false ;
-	foreach($module['modules'] as $app) {
-		if(OCP\App::isEnabled($app) || $app=='core'){
-				$enabled = true;
-		}
-	}
-	if($enabled == false) unset($modules[$key]);
-}
-
-OCP\UTIL::addStyle('admin_dependencies_chk', 'style');
-$tmpl->assign( 'items', $modules );
-
-return $tmpl->fetchPage();
diff --git a/apps/admin_dependencies_chk/templates/settings.php b/apps/admin_dependencies_chk/templates/settings.php
deleted file mode 100644
index 8ff27ebb18..0000000000
--- a/apps/admin_dependencies_chk/templates/settings.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<fieldset id="status_list" class="personalblock">
-	<legend><?php echo $l->t('Dependencies status');?></legend>
-	<ul class="state">
-		<?php foreach($_['items'] as $item):?>
-			<li class="state_<?php echo $item['status'];?>">
-				<span class="state_module" title="<?php echo $item['message'];?>"><?php echo $item['part'];?></span>
-				<div class="state_used"><?php echo $l->t('Used by :');?>
-					<ul>
-						<?php foreach($item['modules'] as $module):?>
-							<li><?php echo $module;?></li>
-						<?php endforeach;?>
-					</ul>
-			</li>
-		<?php endforeach;?>
-	</ul>
-</fieldset>
\ No newline at end of file
diff --git a/apps/admin_migrate/appinfo/app.php b/apps/admin_migrate/appinfo/app.php
deleted file mode 100644
index 7a12a32856..0000000000
--- a/apps/admin_migrate/appinfo/app.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-/**
-* ownCloud - admin_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\App::registerAdmin('admin_migrate','settings');
-
-// add settings page to navigation
-$entry = array(
-	'id' => "admin_migrate_settings",
-	'order'=>1,
-	'href' => OCP\Util::linkTo( "admin_migrate", "settings.php" ),
-	'name' => 'Export'
-);
diff --git a/apps/admin_migrate/appinfo/info.xml b/apps/admin_migrate/appinfo/info.xml
deleted file mode 100644
index f48c666ffe..0000000000
--- a/apps/admin_migrate/appinfo/info.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0"?>
-<info>
-	<id>admin_migrate</id>
-	<name>ownCloud Instance Migration</name>
-	<description>Import/Export your owncloud instance</description>
-	<licence>AGPL</licence>
-	<author>Thomas Schmidt and Tom Needham</author>
-	<require>4</require>
-	<shipped>true</shipped>
-	<default_enable/>
-</info>
diff --git a/apps/admin_migrate/appinfo/version b/apps/admin_migrate/appinfo/version
deleted file mode 100644
index ceab6e11ec..0000000000
--- a/apps/admin_migrate/appinfo/version
+++ /dev/null
@@ -1 +0,0 @@
-0.1
\ No newline at end of file
diff --git a/apps/admin_migrate/l10n/.gitkeep b/apps/admin_migrate/l10n/.gitkeep
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/apps/admin_migrate/l10n/ca.php b/apps/admin_migrate/l10n/ca.php
deleted file mode 100644
index 8743b39760..0000000000
--- a/apps/admin_migrate/l10n/ca.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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/cs_CZ.php b/apps/admin_migrate/l10n/cs_CZ.php
deleted file mode 100644
index 0dc1a61d5d..0000000000
--- a/apps/admin_migrate/l10n/cs_CZ.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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/da.php b/apps/admin_migrate/l10n/da.php
deleted file mode 100644
index a33635cdc1..0000000000
--- a/apps/admin_migrate/l10n/da.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Export this ownCloud instance" => "Eksporter ownCloud instans",
-"Export" => "Eksporter"
-);
diff --git a/apps/admin_migrate/l10n/de.php b/apps/admin_migrate/l10n/de.php
deleted file mode 100644
index d42179b75a..0000000000
--- a/apps/admin_migrate/l10n/de.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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/el.php b/apps/admin_migrate/l10n/el.php
deleted file mode 100644
index 95034c46a4..0000000000
--- a/apps/admin_migrate/l10n/el.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?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/eo.php b/apps/admin_migrate/l10n/eo.php
deleted file mode 100644
index a37be76425..0000000000
--- a/apps/admin_migrate/l10n/eo.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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/es.php b/apps/admin_migrate/l10n/es.php
deleted file mode 100644
index cb6699b1d9..0000000000
--- a/apps/admin_migrate/l10n/es.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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/et_EE.php b/apps/admin_migrate/l10n/et_EE.php
deleted file mode 100644
index ee92f9fe21..0000000000
--- a/apps/admin_migrate/l10n/et_EE.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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/fi_FI.php b/apps/admin_migrate/l10n/fi_FI.php
deleted file mode 100644
index 2484eab7d3..0000000000
--- a/apps/admin_migrate/l10n/fi_FI.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Export this ownCloud instance" => "Vie tämä ownCloud-istanssi",
-"Export" => "Vie"
-);
diff --git a/apps/admin_migrate/l10n/fr.php b/apps/admin_migrate/l10n/fr.php
deleted file mode 100644
index 0cf0a444b0..0000000000
--- a/apps/admin_migrate/l10n/fr.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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/gl.php b/apps/admin_migrate/l10n/gl.php
deleted file mode 100644
index 9d18e13493..0000000000
--- a/apps/admin_migrate/l10n/gl.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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/it.php b/apps/admin_migrate/l10n/it.php
deleted file mode 100644
index 94ba191ba6..0000000000
--- a/apps/admin_migrate/l10n/it.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php $TRANSLATIONS = array(
-"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/admin_migrate/l10n/ja_JP.php b/apps/admin_migrate/l10n/ja_JP.php
deleted file mode 100644
index f8e5944a6a..0000000000
--- a/apps/admin_migrate/l10n/ja_JP.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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/lt_LT.php b/apps/admin_migrate/l10n/lt_LT.php
deleted file mode 100644
index f78263da75..0000000000
--- a/apps/admin_migrate/l10n/lt_LT.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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/admin_migrate/l10n/nb_NO.php b/apps/admin_migrate/l10n/nb_NO.php
deleted file mode 100644
index 31f4c030bd..0000000000
--- a/apps/admin_migrate/l10n/nb_NO.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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/admin_migrate/l10n/nl.php b/apps/admin_migrate/l10n/nl.php
deleted file mode 100644
index d1a7372c10..0000000000
--- a/apps/admin_migrate/l10n/nl.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Export this ownCloud instance" => "Exporteer deze ownCloud instantie",
-"This will create a compressed file that contains the data of this owncloud instance.\n            Please choose the export type:" => "Dit maakt een gecomprimeerd bestand, met de inhoud van deze ownCloud instantie.  Kies het export type:",
-"Export" => "Exporteer"
-);
diff --git a/apps/admin_migrate/l10n/pl.php b/apps/admin_migrate/l10n/pl.php
deleted file mode 100644
index 292601daa2..0000000000
--- a/apps/admin_migrate/l10n/pl.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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/ru.php b/apps/admin_migrate/l10n/ru.php
deleted file mode 100644
index c862657580..0000000000
--- a/apps/admin_migrate/l10n/ru.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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
deleted file mode 100644
index b8d1118bfe..0000000000
--- a/apps/admin_migrate/l10n/sl.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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/admin_migrate/l10n/sv.php b/apps/admin_migrate/l10n/sv.php
deleted file mode 100644
index 57866e897e..0000000000
--- a/apps/admin_migrate/l10n/sv.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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/admin_migrate/l10n/th_TH.php b/apps/admin_migrate/l10n/th_TH.php
deleted file mode 100644
index 9dfaca15b5..0000000000
--- a/apps/admin_migrate/l10n/th_TH.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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/settings.php b/apps/admin_migrate/settings.php
deleted file mode 100644
index daa56390af..0000000000
--- a/apps/admin_migrate/settings.php
+++ /dev/null
@@ -1,57 +0,0 @@
-<?php
-
-/**
- * ownCloud - admin_migrate
- *
- * @author Thomas Schmidt
- * @copyright 2011 Thomas Schmidt tom@opensuse.org
- * @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('admin_migrate');
-
-// Export?
-if (isset($_POST['admin_export'])) {
-	// Create the export zip
-	$response = json_decode( OC_Migrate::export( null, $_POST['export_type'] ) );
-	if( !$response->success ){
-		// Error
-		die('error');	
-	} else {
-		$path = $response->data;
-		// Download it
-		header("Content-Type: application/zip");
-		header("Content-Disposition: attachment; filename=" . basename($path));
-		header("Content-Length: " . filesize($path));
-		@ob_end_clean();
-		readfile( $path );
-		unlink( $path );
-	}
-// Import?
-} else if( isset($_POST['admin_import']) ){
-	$from = $_FILES['owncloud_import']['tmp_name'];
-
-	if( !OC_Migrate::import( $from, 'instance' ) ){
-		die('failed');	
-	}
-		
-} else {
-// fill template
-    $tmpl = new OCP\Template('admin_migrate', 'settings');
-    return $tmpl->fetchPage();
-}
\ No newline at end of file
diff --git a/apps/admin_migrate/templates/settings.php b/apps/admin_migrate/templates/settings.php
deleted file mode 100644
index f81c9199ec..0000000000
--- a/apps/admin_migrate/templates/settings.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<form id="export" action="#" method="post">
-    <fieldset class="personalblock">
-        <legend><strong><?php echo $l->t('Export this ownCloud instance');?></strong></legend>
-        <p><?php echo $l->t('This will create a compressed file that contains the data of this owncloud instance.
-            Please choose the export type:');?>
-        </p>
-        <h3>What would you like to export?</h3>
-        <p>
-        <input type="radio" name="export_type" value="instance" style="width:20px;" /> ownCloud instance (suitable for import )<br />
-	<input type="radio" name="export_type" value="system" style="width:20px;" /> ownCloud system files<br />
-	<input type="radio" name="export_type" value="userfiles" style="width:20px;" /> Just user files<br />
-        <input type="submit" name="admin_export" value="<?php echo $l->t('Export'); ?>" />
-    </fieldset>
-</form>
-<?php 
-/* 
- * EXPERIMENTAL
-?>
-<form id="import" action="#" method="post" enctype="multipart/form-data">
-    <fieldset class="personalblock">
-        <legend><strong><?php echo $l->t('Import an ownCloud instance. THIS WILL DELETE ALL CURRENT OWNCLOUD DATA');?></strong></legend>
-        <p><?php echo $l->t('All current ownCloud data will be replaced by the ownCloud instance that is uploaded.');?>
-        </p>
-        <p><input type="file" id="owncloud_import" name="owncloud_import"><label for="owncloud_import"><?php echo $l->t('ownCloud Export Zip File');?></label>
-        </p>
-        <input type="submit" name="admin_import" value="<?php echo $l->t('Import'); ?>" />
-    </fieldset>
-</form>
-<?php 
-*/ 
-?>
diff --git a/apps/bookmarks/addBm.php b/apps/bookmarks/addBm.php
deleted file mode 100644
index 4df93c8b05..0000000000
--- a/apps/bookmarks/addBm.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-/**
-* ownCloud - bookmarks plugin
-*
-* @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
-* 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/>.
-*
-*/
-
-
-
-// Check if we are a user
-OCP\User::checkLoggedIn();
-OCP\App::checkAppEnabled('bookmarks');
-
-require_once('bookmarksHelper.php');
-addBookmark($_GET['url'], '', 'Read-Later');
-
-include 'templates/addBm.php';
diff --git a/apps/bookmarks/ajax/addBookmark.php b/apps/bookmarks/ajax/addBookmark.php
deleted file mode 100644
index baf3a288c1..0000000000
--- a/apps/bookmarks/ajax/addBookmark.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-/**
-* ownCloud - bookmarks plugin
-*
-* @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 
-* 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/>.
-* 
-*/
-
-//no apps or filesystem
-$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');
-$id = addBookmark($_POST['url'], $_POST['title'], $_POST['tags']);
-OCP\JSON::success(array('data' => $id));
diff --git a/apps/bookmarks/ajax/delBookmark.php b/apps/bookmarks/ajax/delBookmark.php
deleted file mode 100644
index 26437ea0c8..0000000000
--- a/apps/bookmarks/ajax/delBookmark.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-/**
-* ownCloud - bookmarks plugin
-*
-* @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 
-* 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/>.
-* 
-*/
-
-// Check if we are a user
-OCP\JSON::checkLoggedIn();
-OCP\JSON::callCheck();
-
-OCP\JSON::checkAppEnabled('bookmarks');
-OCP\JSON::callCheck();
-
-$id = $_POST['id'];
-if (!OC_Bookmarks_Bookmarks::deleteUrl($id)){
-	OC_JSON::error();
-	exit();
-}
-
-OCP\JSON::success();
diff --git a/apps/bookmarks/ajax/editBookmark.php b/apps/bookmarks/ajax/editBookmark.php
deleted file mode 100644
index 617021e412..0000000000
--- a/apps/bookmarks/ajax/editBookmark.php
+++ /dev/null
@@ -1,90 +0,0 @@
-<?php
-
-/**
-* ownCloud - bookmarks plugin - edit bookmark script
-*
-* @author Golnaz Nilieh
-* @copyright 2011 Golnaz Nilieh <golnaz.nilieh@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/>.
-* 
-*/
-
-// Check if we are a user
-OCP\JSON::checkLoggedIn();
-OCP\JSON::callCheck();
-
-OCP\JSON::checkAppEnabled('bookmarks');
-
-$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';
-} elseif($CONFIG_DBTYPE == 'oci') {
-	$_ut = '(oracletime - to_date(\'19700101\',\'YYYYMMDD\')) * 86400';
-} else {
-	$_ut = "UNIX_TIMESTAMP()";
-}
-
-$bookmark_id = (int)$_POST["id"];
-$user_id = OCP\USER::getUser();
-
-//TODO check using CURRENT_TIMESTAMP? prepare already does magic when using now()
-$query = OCP\DB::prepare('
-	UPDATE `*PREFIX*bookmarks`
-	SET `url` = ?, `title` = ?, `lastmodified` = '.$_ut.'
-	WHERE `id` = ?
-	AND `user_id` = ?
-	');
-
-$params=array(
-	htmlspecialchars_decode($_POST["url"]),
-	htmlspecialchars_decode($_POST["title"]),
-	$bookmark_id,
-	$user_id,
-	);
-
-$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('
-	DELETE FROM `*PREFIX*bookmarks_tags`
-	WHERE `bookmark_id` = ?
-	');
-
-$params=array(
-	$bookmark_id
-	);
-
-$query->execute($params);
-
-$query = OCP\DB::prepare('
-	INSERT INTO `*PREFIX*bookmarks_tags`
-	(`bookmark_id`, `tag`)
-	VALUES (?, ?)
-	');
-
-$tags = explode(' ', urldecode($_POST["tags"]));
-foreach ($tags as $tag) {
-	if(empty($tag)) {
-		//avoid saving blankspaces
-		continue;
-	}
-	$params = array($bookmark_id, trim($tag));
-	$query->execute($params);
-}
diff --git a/apps/bookmarks/ajax/recordClick.php b/apps/bookmarks/ajax/recordClick.php
deleted file mode 100644
index 785056dc11..0000000000
--- a/apps/bookmarks/ajax/recordClick.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-
-/**
-* ownCloud - bookmarks plugin
-*
-* @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 
-* 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/>.
-* 
-*/
-
-// Check if we are a user
-OCP\JSON::checkLoggedIn();
-OCP\JSON::checkAppEnabled('bookmarks');
-
-$query = OCP\DB::prepare('
-	UPDATE `*PREFIX*bookmarks`
-	SET `clickcount` = `clickcount` + 1
-	WHERE `user_id` = ?
-		AND `url` LIKE ?
-	');
-	
-$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
deleted file mode 100644
index cf9a2cf918..0000000000
--- a/apps/bookmarks/ajax/updateList.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-
-/**
-* ownCloud - bookmarks plugin
-*
-* @author Arthur Schiwon
-* @copyright 2011 Arthur Schiwon blizzz@arthur-schiwon.de
-* @copyright 2012 David Iwanowitsch <david at unclouded dot 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 Lesser 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('bookmarks');
-
-
-//Filter for tag?
-$filterTag = isset($_POST['tag']) ? htmlspecialchars_decode($_POST['tag']) : false;
-
-$offset = isset($_POST['page']) ? intval($_POST['page']) * 10 : 0;
-
-$sort = isset($_POST['sort']) ? ($_POST['sort']) : 'bookmarks_sorting_recent';
-if($sort == 'bookmarks_sorting_clicks') {
-	$sqlSortColumn = 'clickcount';
-} else {
-	$sqlSortColumn = 'id';
-}
-
-
-$bookmarks = OC_Bookmarks_Bookmarks::findBookmarks($offset, $sqlSortColumn, $filterTag, true);
-
-OCP\JSON::success(array('data' => $bookmarks));
diff --git a/apps/bookmarks/appinfo/app.php b/apps/bookmarks/appinfo/app.php
deleted file mode 100644
index f4bca9df70..0000000000
--- a/apps/bookmarks/appinfo/app.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<?php
-/**
-* Copyright (c) 2011 Marvin Thomas Rabe <mrabe@marvinrabe.de>
-* Copyright (c) 2011 Arthur Schiwon <blizzz@arthur-schiwon.de>
-* This file is licensed under the Affero General Public License version 3 or
-* later.
-* See the COPYING-README file.
-*/
-
-OC::$CLASSPATH['OC_Bookmarks_Bookmarks'] = 'apps/bookmarks/lib/bookmarks.php';
-OC::$CLASSPATH['OC_Search_Provider_Bookmarks'] = 'apps/bookmarks/lib/search.php';
-
-$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')));
-
-OCP\App::registerPersonal('bookmarks', 'settings');
-OCP\Util::addscript('bookmarks','bookmarksearch');
-
-OC_Search::registerProvider('OC_Search_Provider_Bookmarks');
diff --git a/apps/bookmarks/appinfo/database.xml b/apps/bookmarks/appinfo/database.xml
deleted file mode 100644
index d28857b075..0000000000
--- a/apps/bookmarks/appinfo/database.xml
+++ /dev/null
@@ -1,112 +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*bookmarks</name>
-		<declaration>
-			<field>
-				<name>id</name>
-				<type>integer</type>
-				<autoincrement>1</autoincrement>
-				<default>0</default>
-				<notnull>true</notnull>
-				<length>4</length>
-			</field>
-			<field>
-				<name>url</name>
-				<type>text</type>
-				<default></default>
-				<notnull>true</notnull>
-				<length>4096</length>
-			</field>
-			<field>
-				<name>title</name>
-				<type>text</type>
-				<default></default>
-				<notnull>true</notnull>
-				<length>140</length>
-			</field>
-			<field>
-				<name>user_id</name>
-				<type>text</type>
-				<default></default>
-				<notnull>true</notnull>
-				<length>64</length>
-			</field>
-			<field>
-				<name>public</name>
-				<type>integer</type>
-				<default>0</default>
-				<length>1</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>clickcount</name>
-				<type>integer</type>
-				<default>0</default>
-				<notnull>true</notnull>
-				<unsigned>true</unsigned>
-				<length>4</length>
-			</field>
-			
-			<index>
-				<name>id</name>
-				<unique>true</unique>
-				<field>
-					<name>id</name>
-					<sorting>descending</sorting>
-				</field>
-			</index>
-		</declaration>
-	</table>
-	
-	<table>
-		<name>*dbprefix*bookmarks_tags</name>
-		<declaration>
-			<field>
-				<name>bookmark_id</name>
-				<type>integer</type>
-				<length>64</length>
-			</field>
-			
-			<field>
-				<name>tag</name>
-				<type>text</type>
-				<default></default>
-				<notnull>true</notnull>
-				<length>255</length>
-			</field>
-			<index>
-				<name>bookmark_tag</name>
-				<unique>true</unique>
-				<field>
-					<name>bookmark_id</name>
-					<sorting>ascending</sorting>
-				</field>
-				<field>
-					<name>tag</name>
-					<sorting>ascending</sorting>
-				</field>
-			</index>
-		</declaration>
-	</table>
-</database>
-			
diff --git a/apps/bookmarks/appinfo/info.xml b/apps/bookmarks/appinfo/info.xml
deleted file mode 100644
index 93510815f5..0000000000
--- a/apps/bookmarks/appinfo/info.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0"?>
-<info>
-	<id>bookmarks</id>
-	<name>Bookmarks</name>
-	<description>Bookmark manager for ownCloud</description>
-	<licence>AGPL</licence>
-	<author>Arthur Schiwon, Marvin Thomas Rabe</author>
-	<standalone/>
-	<require>4</require>
-	<shipped>true</shipped>
-</info>
diff --git a/apps/bookmarks/appinfo/migrate.php b/apps/bookmarks/appinfo/migrate.php
deleted file mode 100644
index f14469269a..0000000000
--- a/apps/bookmarks/appinfo/migrate.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-class OC_Migration_Provider_Bookmarks extends OC_Migration_Provider{
-	
-	// Create the xml for the user supplied
-	function export( ){
-		$options = array(
-			'table'=>'bookmarks',
-			'matchcol'=>'user_id',
-			'matchval'=>$this->uid,
-			'idcol'=>'id'
-		);
-		$ids = $this->content->copyRows( $options );
-
-		$options = array(
-			'table'=>'bookmarks_tags',
-			'matchcol'=>'bookmark_id',
-			'matchval'=>$ids
-		);
-		
-		// Export tags
-		$ids2 = $this->content->copyRows( $options );
-		
-		// If both returned some ids then they worked
-		if( is_array( $ids ) && is_array( $ids2 ) )
-		{
-			return true;	
-		} else {
-			return false;
-		}
-		
-	}
-	
-	// Import function for bookmarks
-	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 `bookmarks` WHERE `user_id` LIKE ?" );
-				$results = $query->execute( array( $this->olduid ) );
-				$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'] ) );
-					// Map the id
-					$idmap[$row['id']] = OCP\DB::insertid();
-				}
-				// Now tags
-				foreach($idmap as $oldid => $newid){
-					$query = $this->content->prepare( "SELECT * FROM `bookmarks_tags` WHERE `bookmark_id` 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*bookmarks_tags`(`bookmark_id`, `tag`) VALUES (?, ?)" );
-						$query->execute( array( $newid, $row['tag'] ) );	
-					}		
-				}
-				// All done!
-			break;
-		}
-		
-		return true;
-	}
-	
-}
-
-// Load the provider
-new OC_Migration_Provider_Bookmarks( 'bookmarks' );
\ No newline at end of file
diff --git a/apps/bookmarks/appinfo/version b/apps/bookmarks/appinfo/version
deleted file mode 100644
index 2f4536184b..0000000000
--- a/apps/bookmarks/appinfo/version
+++ /dev/null
@@ -1 +0,0 @@
-0.2
\ No newline at end of file
diff --git a/apps/bookmarks/bookmarksHelper.php b/apps/bookmarks/bookmarksHelper.php
deleted file mode 100644
index 988042fc0e..0000000000
--- a/apps/bookmarks/bookmarksHelper.php
+++ /dev/null
@@ -1,130 +0,0 @@
-<?php
-
-// Source: http://www.php.net/manual/de/function.curl-setopt.php#102121
-// This works around a safe_mode/open_basedir restriction
-function curl_exec_follow(/*resource*/ $ch, /*int*/ &$maxredirect = null) {
-	$mr = $maxredirect === null ? 5 : intval($maxredirect);
-	if (ini_get('open_basedir') == '' && ini_get('safe_mode' == 'Off')) {
-		curl_setopt($ch, CURLOPT_FOLLOWLOCATION, $mr > 0);
-		curl_setopt($ch, CURLOPT_MAXREDIRS, $mr);
-	} else {
-		curl_setopt($ch, CURLOPT_FOLLOWLOCATION, false);
-		if ($mr > 0) {
-			$newurl = curl_getinfo($ch, CURLINFO_EFFECTIVE_URL);
-
-			$rch = curl_copy_handle($ch);
-			curl_setopt($rch, CURLOPT_HEADER, true);
-			curl_setopt($rch, CURLOPT_NOBODY, true);
-			curl_setopt($rch, CURLOPT_FORBID_REUSE, false);
-			curl_setopt($rch, CURLOPT_RETURNTRANSFER, true);
-			do {
-				curl_setopt($rch, CURLOPT_URL, $newurl);
-				$header = curl_exec($rch);
-				if (curl_errno($rch)) {
-					$code = 0;
-				} else {
-					$code = curl_getinfo($rch, CURLINFO_HTTP_CODE);
-					if ($code == 301 || $code == 302) {
-						preg_match('/Location:(.*?)\n/', $header, $matches);
-						$newurl = trim(array_pop($matches));
-					} else {
-						$code = 0;
-					}
-				}
-			} while ($code && --$mr);
-			curl_close($rch);
-			if (!$mr) {
-				if ($maxredirect === null) {
-					trigger_error('Too many redirects. When following redirects, libcurl hit the maximum amount.', E_USER_WARNING);
-				} else {
-					$maxredirect = 0;
-				}
-				return false;
-			}
-			curl_setopt($ch, CURLOPT_URL, $newurl);
-		}
-	}
-	return curl_exec($ch);
-}
-
-function getURLMetadata($url) {
-	//allow only http(s) and (s)ftp
-	$protocols = '/^[hs]{0,1}[tf]{0,1}tp[s]{0,1}\:\/\//i';
-	//if not (allowed) protocol is given, assume http
-	if(preg_match($protocols, $url) == 0) {
-		$url = 'http://' . $url;
-	} 
-	$metadata['url'] = $url;
-
-	if (!function_exists('curl_init')){
-		return $metadata;
-	}
-	$ch = curl_init();
-	curl_setopt($ch, CURLOPT_URL, $url);
-	curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
-	$page = curl_exec_follow($ch);
-	curl_close($ch);
-
-	@preg_match( "/<title>(.*)<\/title>/si", $page, $match );
-	$metadata['title'] = htmlspecialchars_decode(@$match[1]); 
-
-	return $metadata;
-}
-
-function addBookmark($url, $title, $tags='') {
-	$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()";
-	}
-	
-	//FIXME: Detect when user adds a known URL
-	$query = OCP\DB::prepare("
-		INSERT INTO `*PREFIX*bookmarks`
-		(`url`, `title`, `user_id`, `public`, `added`, `lastmodified`)
-		VALUES (?, ?, ?, 0, $_ut, $_ut)
-		");
-	
-	if(empty($title)) {
-		$metadata = getURLMetadata($url);
-		if(isset($metadata['title'])) // Check for problems fetching the title
-			$title = $metadata['title'];
-	}
-	
-	if(empty($title)) {
-		$l = OC_L10N::get('bookmarks');
-		$title = $l->t('unnamed');
-	}
-	
-	$params=array(
-	htmlspecialchars_decode($url),
-	htmlspecialchars_decode($title),
-	OCP\USER::getUser()
-	);
-	$query->execute($params);
-	
-	$b_id = OCP\DB::insertid('*PREFIX*bookmarks');
-	
-	if($b_id !== false) {
-		$query = OCP\DB::prepare("
-			INSERT INTO `*PREFIX*bookmarks_tags`
-			(`bookmark_id`, `tag`)
-			VALUES (?, ?)
-			");
-	
-		$tags = explode(' ', urldecode($tags));
-		foreach ($tags as $tag) {
-			if(empty($tag)) {
-				//avoid saving blankspaces
-				continue;
-			}
-			$params = array($b_id, trim($tag));
-			$query->execute($params);
-		}
-	
-		return $b_id;
-	}
-}
diff --git a/apps/bookmarks/css/bookmarks.css b/apps/bookmarks/css/bookmarks.css
deleted file mode 100644
index a67afcd44f..0000000000
--- a/apps/bookmarks/css/bookmarks.css
+++ /dev/null
@@ -1,87 +0,0 @@
-#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; 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; }
-
-.bookmarks_headline {
-	font-size: large;
-	font-weight: bold;
-	margin-left: 2em;
-	padding: 2.5ex 0.5ex;
-}
-
-.bookmarks_menu {
-	margin-left: 1.5em;
-	padding: 0.5ex;
-}
-
-.bookmarks_list {
-	overflow: auto;
-	position: fixed;
-	top: 6.5em;
-}
-
-.bookmarks_addBml {
-	text-decoration: underline;
-}
-
-.bookmarks_label {
-	width: 7em;
-	display: inline-block;
-	text-align: right;
-}
-
-.bookmarks_input {
-	width: 8em;
-}
-
-.bookmark_actions {
-	position: absolute;
-	right: 1em;
-	top: 0.7em;
-	display: none;
-}
-.bookmark_actions span { margin: 0 0.4em; }
-.bookmark_actions img { opacity: 0.3; }
-.bookmark_actions img:hover { opacity: 1; cursor: pointer; }
-
-.bookmark_single {
-	position: relative;
-	padding: 0.5em 1em;
-	border-bottom: 1px solid #DDD;
-	-webkit-transition:background-color 500ms; -moz-transition:background-color 500ms; -o-transition:background-color 500ms; transition:background-color 500ms;
-}
-
-.bookmark_single:hover {
-	background-color:#f8f8f8
-}
-
-.bookmark_single:hover .bookmark_actions {
-	display: block;
-}
-
-.bookmark_title { font-weight: bold; display: inline-block; margin-right: 0.8em; }
-.bookmark_url { display: none; color: #999; }
-.bookmark_single:hover .bookmark_url { display: inline; }
-.bookmark_tags {
-	position: absolute;
-	top: 0.5em;
-	right: 6em;
-	text-align: right;
-}
-.bookmark_tag {
-	display: inline-block;
-	color: white;
-	margin: 0 0.2em;
-	padding: 0 0.4em;
-	background-color: #1D2D44;
-	border-radius: 0.4em;
-	opacity: 0.2;
-}
-.bookmark_tag:hover { opacity: 0.5; }
-
-.loading_meta {
-	display: none;
-	margin-left: 5px;
-}
diff --git a/apps/bookmarks/img/bookmarks.png b/apps/bookmarks/img/bookmarks.png
deleted file mode 100644
index 3e8eed2380f0fca5157ef091fed59508e30ef93b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 398
zcmV;90df9`P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00041Nkl<ZILl*T
zpaw8AGfT0zx4&&+VG-x#<P_rT>sz9tqQZu*PFq`>4X7r?#>VEpsi|ogTmq<hYI}S8
z|DvLz&(6-yA8TuC{|5vF9EQp3>FIF+HC5Qz**(w7%KBVYRrTM>%Bm5?fN9gF{olWT
z|NrLZ=KuBe_5Z`e!+!%^1Jcy!;NbAGxVZTH!i5X}FI%?ke@jaXZUfrd+Q0??UGqOR
zHT7#mM8x+cOO}8&!Z6VWw6?bXkB^T>(L8DZtqcIhcjwfpQ{m~LuC5NR0U$Nj*48D+
zNm;?w)%7V*!_O^SwtzKeW@cg-07^(DB_-b-9UUJV8yicYq;qp~b3R*J+h(BT^XlsA
zuRC_^fEzGx-n{?W+1Xz~Ng0@=tAKfe2WQ3tCR+}mqC6n|*xTFtCy@RL)c6qS<P1<|
sB07hLhK4c$of%?cV&VtnGT~AO0Otah%WiD=o&W#<07*qoM6N<$g2m^-7ytkO

diff --git a/apps/bookmarks/index.php b/apps/bookmarks/index.php
deleted file mode 100644
index a4ce022987..0000000000
--- a/apps/bookmarks/index.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-
-/**
-* ownCloud - bookmarks plugin
-*
-* @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 
-* 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/>.
-* 
-*/
-
-
-
-// Check if we are a user
-OCP\User::checkLoggedIn();
-OCP\App::checkAppEnabled('bookmarks');
-
-OCP\App::setActiveNavigationEntry( 'bookmarks_index' );
-
-OCP\Util::addscript('bookmarks','bookmarks');
-OCP\Util::addStyle('bookmarks', 'bookmarks');
-
-$tmpl = new OCP\Template( 'bookmarks', 'list', 'user' );
-
-$tmpl->printPage();
diff --git a/apps/bookmarks/js/addBm.js b/apps/bookmarks/js/addBm.js
deleted file mode 100644
index 625ac8420a..0000000000
--- a/apps/bookmarks/js/addBm.js
+++ /dev/null
@@ -1,16 +0,0 @@
-$(document).ready(function() {
-	$('#bookmark_add_submit').click(addBookmark);
-});
-
-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){ 
-			window.close();
-		}
-	});
-}
\ No newline at end of file
diff --git a/apps/bookmarks/js/bookmarks.js b/apps/bookmarks/js/bookmarks.js
deleted file mode 100644
index 7f3104e812..0000000000
--- a/apps/bookmarks/js/bookmarks.js
+++ /dev/null
@@ -1,201 +0,0 @@
-var bookmarks_page = 0;
-var bookmarks_loading = false;
-
-var bookmarks_sorting = 'bookmarks_sorting_recent';
-
-$(document).ready(function() {
-	$('#bookmark_add_submit').click(addOrEditBookmark);
-	$(window).resize(function () {
-		fillWindow($('.bookmarks_list'));
-	});
-	$(window).resize();
-	$('.bookmarks_list').scroll(updateOnBottom).empty().width($('#content').width());
-	getBookmarks();
-});
-
-function getBookmarks() {
-	if(bookmarks_loading) {
-		//have patience :)
-		return;
-	}
-
-	$.ajax({
-		  type: 'POST',
-		url: OC.filePath('bookmarks', 'ajax', 'updateList.php'),
-		data: 'tag=' + encodeURIComponent($('#bookmarkFilterTag').val()) + '&page=' + bookmarks_page + '&sort=' + bookmarks_sorting,
-		success: function(bookmarks){
-			if (bookmarks.data.length) {
-				bookmarks_page += 1;
-			}
-			$('.bookmark_link').unbind('click', recordClick);
-			$('.bookmark_delete').unbind('click', delBookmark);
-			$('.bookmark_edit').unbind('click', showBookmark);
-
-			for(var i in bookmarks.data) {
-				updateBookmarksList(bookmarks.data[i]);
-				$("#firstrun").hide();
-			}
-			if($('.bookmarks_list').is(':empty')) {
-				$("#firstrun").show();
-			}
-
-			$('.bookmark_link').click(recordClick);
-			$('.bookmark_delete').click(delBookmark);
-			$('.bookmark_edit').click(showBookmark);
-
-			bookmarks_loading = false;
-			if (bookmarks.data.length) {
-				updateOnBottom()
-			}
-		}
-	});
-}
-
-// function addBookmark() {
-// Instead of creating editBookmark() function, Converted the one above to
-// addOrEditBookmark() to make .js file more compact.
-
-function addOrEditBookmark(event) {
-	var id = $('#bookmark_add_id').val();
-	var url = encodeEntities($('#bookmark_add_url').val());
-	var title = encodeEntities($('#bookmark_add_title').val());
-	var tags = encodeEntities($('#bookmark_add_tags').val());
-	$("#firstrun").hide();
-	if($.trim(url) == '') {
-		OC.dialogs.alert('A valid bookmark url must be provided', 'Error creating bookmark');
-		return false;
-	}
-	if($.trim(title) == '') {
-		OC.dialogs.alert('A valid bookmark title must be provided', 'Error creating bookmark');
-		return false;
-	}
-	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){
-				$('.bookmarks_input').val('');
-				$('.bookmarks_list').empty();
-				bookmarks_page = 0;
-				getBookmarks();
-			}
-		});
-	}
-	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(){
-				$('.bookmarks_input').val('');
-				$('#bookmark_add_id').val('0');
-				$('.bookmarks_list').empty();
-				bookmarks_page = 0;
-				getBookmarks();
-			}
-		});
-	}
-
-}
-
-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){
-			if (data.status == 'success') {
-				record.remove();
-				if($('.bookmarks_list').is(':empty')) {
-					$("#firstrun").show();
-				}
-			}
-		}
-	});
-}
-
-function showBookmark(event) {
-	var record = $(this).parent().parent();
-	$('#bookmark_add_id').val(record.attr('data-id'));
-	$('#bookmark_add_url').val(record.children('.bookmark_url:first').text());
-	$('#bookmark_add_title').val(record.children('.bookmark_title:first').text());
-	$('#bookmark_add_tags').val(record.children('.bookmark_tags:first').text());
-
-	if ($('.bookmarks_add').css('display') == 'none') {
-		$('.bookmarks_add').slideToggle();
-	}
-}
-
-function replaceQueryString(url,param,value) {
-    var re = new RegExp("([?|&])" + param + "=.*?(&|$)","i");
-    if (url.match(re))
-        return url.replace(re,'$1' + param + "=" + value + '$2');
-    else
-        return url + '&' + param + "=" + value;
-}
-
-function updateBookmarksList(bookmark) {
-	var tags = encodeEntities(bookmark.tags).split(' ');
-	var taglist = '';
-	for ( var i=0, len=tags.length; i<len; ++i ){
-		if(tags[i] != '')
-			taglist = taglist + '<a class="bookmark_tag" href="'+replaceQueryString( String(window.location), 'tag', encodeURIComponent(tags[i])) + '">' + tags[i] + '</a> ';
-	}
-	if(!hasProtocol(bookmark.url)) {
-		bookmark.url = 'http://' + bookmark.url;
-	}
-	if(bookmark.title == '') bookmark.title = bookmark.url;
-	$('.bookmarks_list').append(
-		'<div class="bookmark_single" data-id="' + bookmark.id +'" >' +
-			'<p class="bookmark_actions">' +
-				'<span class="bookmark_edit">' +
-					'<img class="svg" src="'+OC.imagePath('core', 'actions/rename')+'" title="Edit">' +
-				'</span>' +
-				'<span class="bookmark_delete">' +
-					'<img class="svg" src="'+OC.imagePath('core', 'actions/delete')+'" title="Delete">' +
-				'</span>&nbsp;' +
-			'</p>' +
-			'<p class="bookmark_title">'+
-				'<a href="' + encodeEntities(bookmark.url) + '" target="_blank" class="bookmark_link">' + encodeEntities(bookmark.title) + '</a>' +
-			'</p>' +
-			'<p class="bookmark_url"><a href="' + encodeEntities(bookmark.url) + '" target="_blank" class="bookmark_link">' + encodeEntities(bookmark.url) + '</a></p>' +
-		'</div>'
-	);
-	if(taglist != '') {
-		$('div[data-id="'+ bookmark.id +'"]').append('<p class="bookmark_tags">' + taglist + '</p>');
-	}
-}
-
-function updateOnBottom() {
-	//check wether user is on bottom of the page
-	var top = $('.bookmarks_list>:last-child').position().top;
-	var height = $('.bookmarks_list').height();
-	// use a bit of margin to begin loading before we are really at the
-	// bottom
-	if (top < height * 1.2) {
-		getBookmarks();
-	}
-}
-
-function recordClick(event) {
-	$.ajax({
-		type: 'POST',
-		url: OC.filePath('bookmarks', 'ajax', 'recordClick.php'),
-		data: 'url=' + encodeURIComponent($(this).attr('href')),
-	});
-}
-
-function encodeEntities(s){
-	try {
-		return $('<div/>').text(s).html();
-	} catch (ex) {
-		return "";
-	}
-}
-
-function hasProtocol(url) {
-    var regexp = /(ftp|http|https|sftp)/;
-    return regexp.test(url);
-}
diff --git a/apps/bookmarks/js/bookmarksearch.js b/apps/bookmarks/js/bookmarksearch.js
deleted file mode 100644
index e8f5363c93..0000000000
--- a/apps/bookmarks/js/bookmarksearch.js
+++ /dev/null
@@ -1,23 +0,0 @@
-/**
- * Copyright (c) 2012 David Iwanowitsch <david at unclouded dot de>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-$(document).ready(function(){
-	OC.search.customResults['Bookm.'] = function(row,item){
-		var a=row.find('a');
-		a.attr('target','_blank');
-		a.click(recordClick);
-	}
-});
-
-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')),
-	});	
-}
diff --git a/apps/bookmarks/l10n/bg_BG.php b/apps/bookmarks/l10n/bg_BG.php
deleted file mode 100644
index 04d731b107..0000000000
--- a/apps/bookmarks/l10n/bg_BG.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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/ca.php b/apps/bookmarks/l10n/ca.php
deleted file mode 100644
index cf90d9a887..0000000000
--- a/apps/bookmarks/l10n/ca.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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/cs_CZ.php b/apps/bookmarks/l10n/cs_CZ.php
deleted file mode 100644
index 2251969a26..0000000000
--- a/apps/bookmarks/l10n/cs_CZ.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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/bookmarks/l10n/de.php b/apps/bookmarks/l10n/de.php
deleted file mode 100644
index 14a54f1cce..0000000000
--- a/apps/bookmarks/l10n/de.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Bookmarks" => "Lesezeichen",
-"unnamed" => "unbenannt",
-"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" => "Titel",
-"Tags" => "Tags",
-"Save bookmark" => "Lesezeichen speichern",
-"You have no bookmarks" => "Sie haben keine Lesezeichen",
-"Bookmarklet <br />" => "Bookmarklet <br />"
-);
diff --git a/apps/bookmarks/l10n/el.php b/apps/bookmarks/l10n/el.php
deleted file mode 100644
index f282a1bbf8..0000000000
--- a/apps/bookmarks/l10n/el.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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/eo.php b/apps/bookmarks/l10n/eo.php
deleted file mode 100644
index 808cda8a04..0000000000
--- a/apps/bookmarks/l10n/eo.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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/bookmarks/l10n/es.php b/apps/bookmarks/l10n/es.php
deleted file mode 100644
index 071b0dda70..0000000000
--- a/apps/bookmarks/l10n/es.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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/et_EE.php b/apps/bookmarks/l10n/et_EE.php
deleted file mode 100644
index da9e4d92a6..0000000000
--- a/apps/bookmarks/l10n/et_EE.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?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/fa.php b/apps/bookmarks/l10n/fa.php
deleted file mode 100644
index b46ce911d4..0000000000
--- a/apps/bookmarks/l10n/fa.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Bookmarks" => "نشانک‌ها",
-"unnamed" => "بدون‌نام",
-"Address" => "آدرس",
-"Title" => "عنوان",
-"Save bookmark" => "ذخیره نشانک",
-"You have no bookmarks" => "شما هیچ نشانکی ندارید"
-);
diff --git a/apps/bookmarks/l10n/fi_FI.php b/apps/bookmarks/l10n/fi_FI.php
deleted file mode 100644
index c814747411..0000000000
--- a/apps/bookmarks/l10n/fi_FI.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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/bookmarks/l10n/fr.php b/apps/bookmarks/l10n/fr.php
deleted file mode 100644
index 508c82369f..0000000000
--- a/apps/bookmarks/l10n/fr.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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
deleted file mode 100644
index 862d75bde4..0000000000
--- a/apps/bookmarks/l10n/it.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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/bookmarks/l10n/lt_LT.php b/apps/bookmarks/l10n/lt_LT.php
deleted file mode 100644
index 58faddc233..0000000000
--- a/apps/bookmarks/l10n/lt_LT.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php $TRANSLATIONS = array(
-"unnamed" => "be pavadinimo"
-);
diff --git a/apps/bookmarks/l10n/nb_NO.php b/apps/bookmarks/l10n/nb_NO.php
deleted file mode 100644
index f0efeaca34..0000000000
--- a/apps/bookmarks/l10n/nb_NO.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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",
-"Bookmarklet <br />" => "Bokmerke <br />"
-);
diff --git a/apps/bookmarks/l10n/nl.php b/apps/bookmarks/l10n/nl.php
deleted file mode 100644
index e5e0894b51..0000000000
--- a/apps/bookmarks/l10n/nl.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Bookmarks" => "Bladwijzers",
-"unnamed" => "geen naam",
-"Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:" => "Sleep dit naar uw browser bladwijzers en klik erop, wanneer u een webpagina snel wilt voorzien van een bladwijzer:",
-"Read later" => "Lees later",
-"Address" => "Adres",
-"Title" => "Titel",
-"Tags" => "Tags",
-"Save bookmark" => "Bewaar bookmark",
-"You have no bookmarks" => "U heeft geen bookmarks"
-);
diff --git a/apps/bookmarks/l10n/ru.php b/apps/bookmarks/l10n/ru.php
deleted file mode 100644
index 3abc089e3f..0000000000
--- a/apps/bookmarks/l10n/ru.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Bookmarks" => "Закладки",
-"unnamed" => "без имени",
-"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
deleted file mode 100644
index 32a4162908..0000000000
--- a/apps/bookmarks/l10n/sl.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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/bookmarks/l10n/sv.php b/apps/bookmarks/l10n/sv.php
deleted file mode 100644
index 689bd452f1..0000000000
--- a/apps/bookmarks/l10n/sv.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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/bookmarks/l10n/th_TH.php b/apps/bookmarks/l10n/th_TH.php
deleted file mode 100644
index 64a148efab..0000000000
--- a/apps/bookmarks/l10n/th_TH.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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/bookmarks/l10n/xgettextfiles b/apps/bookmarks/l10n/xgettextfiles
deleted file mode 100644
index cd55543239..0000000000
--- a/apps/bookmarks/l10n/xgettextfiles
+++ /dev/null
@@ -1,5 +0,0 @@
-../appinfo/app.php
-../lib/search.php
-../templates/settings.php
-../templates/addBm.php
-../templates/list.php
diff --git a/apps/bookmarks/l10n/zh_CN.php b/apps/bookmarks/l10n/zh_CN.php
deleted file mode 100644
index 0510738c97..0000000000
--- a/apps/bookmarks/l10n/zh_CN.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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 />" => "书签应用"
-);
diff --git a/apps/bookmarks/lib/bookmarks.php b/apps/bookmarks/lib/bookmarks.php
deleted file mode 100644
index e1e1338890..0000000000
--- a/apps/bookmarks/lib/bookmarks.php
+++ /dev/null
@@ -1,147 +0,0 @@
-<?php
-/**
- * ownCloud - bookmarks plugin
- *
- * @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
- * 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 bookmarks
- */
-class OC_Bookmarks_Bookmarks{
-
-	/**
-	 * @brief Finds all bookmarks, matching the filter
-	 * @param offset result offset
-	 * @param sqlSortColumn sort result with this column
-	 * @param filter can be: empty -> no filter, a string -> filter this, a string array -> filter for all strings
-	 * @param filterTagOnly if true, filter affacts only tags, else filter affects url, title and tags
-	 * @return void
-	 */
-	public static function findBookmarks($offset, $sqlSortColumn, $filter, $filterTagOnly){
-		//OCP\Util::writeLog('bookmarks', 'findBookmarks ' .$offset. ' '.$sqlSortColumn.' '. $filter.' '. $filterTagOnly ,OCP\Util::DEBUG);
-		$CONFIG_DBTYPE = OCP\Config::getSystemValue( 'dbtype', 'sqlite' );
-	
-		$params=array(OCP\USER::getUser());
-	
-		if( $CONFIG_DBTYPE == 'sqlite' or $CONFIG_DBTYPE == 'sqlite3' ){
-			$_gc_separator = ', \' \'';
-		} else {
-			$_gc_separator = 'SEPARATOR \' \'';
-		}
-
-		if($filter){
-			if($CONFIG_DBTYPE == 'pgsql' )
-				$tagString = 'array_to_string(array_agg(tag), \' \')';
-			else
-				$tagString = 'tags';
-
-			$sqlFilterTag = 'HAVING ';
-			if(is_array($filter)){
-				$first = true;
-				$filterstring = '';
-				foreach ($filter as $singleFilter){
-					$filterstring = $filterstring . ($first?'':' AND ') . $tagString.' LIKE ? ';
-					$params[] = '%'.$singleFilter.'%';
-					$first=false;
-				}
-				$sqlFilterTag = $sqlFilterTag . $filterstring;
-			} else{
-				$sqlFilterTag = $sqlFilterTag .$tagString.' LIKE ? ';
-				$params[] = '%'.$filter.'%';
-			}
-		} else {
-			$sqlFilterTag = '';
-		}
-
-		if($CONFIG_DBTYPE == 'pgsql' ){
-			$query = OCP\DB::prepare('
-				SELECT `id`, `url`, `title`, '.($filterTagOnly?'':'`url` || `title` ||').' array_to_string(array_agg(`tag`), \' \') as `tags`
-				FROM `*PREFIX*bookmarks`
-				LEFT JOIN `*PREFIX*bookmarks_tags` ON `*PREFIX*bookmarks`.`id` = `*PREFIX*bookmarks_tags`.`bookmark_id` 
-				WHERE 
-					`*PREFIX*bookmarks`.`user_id` = ?
-				GROUP BY `id`, `url`, `title`
-				'.$sqlFilterTag.'
-				ORDER BY `*PREFIX*bookmarks`.`'.$sqlSortColumn.'` DESC',
-				10,$offset);
-		} else {
-			if( $CONFIG_DBTYPE == 'sqlite' or $CONFIG_DBTYPE == 'sqlite3' )
-				$concatFunction = '(url || title || ';
-			else
-				$concatFunction = 'Concat(Concat( url, title), ';
-		
-			$query = OCP\DB::prepare('
-				SELECT `id`, `url`, `title`, '
-				.($filterTagOnly?'':$concatFunction).
-				'CASE WHEN `*PREFIX*bookmarks`.`id` = `*PREFIX*bookmarks_tags`.`bookmark_id`
-						THEN GROUP_CONCAT( `tag` ' .$_gc_separator. ' )
-						ELSE \' \'
-					END '
-				.($filterTagOnly?'':')').'
-					AS `tags`
-				FROM `*PREFIX*bookmarks`
-				LEFT JOIN `*PREFIX*bookmarks_tags` ON 1=1
-				WHERE (`*PREFIX*bookmarks`.`id` = `*PREFIX*bookmarks_tags`.`bookmark_id` 
-						OR `*PREFIX*bookmarks`.`id` NOT IN (
-							SELECT `*PREFIX*bookmarks_tags`.`bookmark_id` FROM `*PREFIX*bookmarks_tags`
-						)
-					)
-					AND `*PREFIX*bookmarks`.`user_id` = ?
-				GROUP BY `url`
-				'.$sqlFilterTag.'
-				ORDER BY `*PREFIX*bookmarks`.`'.$sqlSortColumn.'` DESC',
-				10, $offset);
-		}
-
-		$bookmarks = $query->execute($params)->fetchAll();
-		return $bookmarks;
-	}
-
-	public static function deleteUrl($id)
-	{
-		$user = OCP\USER::getUser();
-
-		$query = OCP\DB::prepare("
-				SELECT `id` FROM `*PREFIX*bookmarks`
-				WHERE `id` = ?
-				AND `user_id` = ?
-				");
-
-		$result = $query->execute(array($id, $user));
-		$id = $result->fetchOne();
-		if ($id === false) {
-			return false;
-		}
-
-		$query = OCP\DB::prepare("
-			DELETE FROM `*PREFIX*bookmarks`
-			WHERE `id` = $id
-			");
-
-		$result = $query->execute();
-
-		$query = OCP\DB::prepare("
-			DELETE FROM `*PREFIX*bookmarks_tags`
-			WHERE `bookmark_id` = $id
-			");
-
-		$result = $query->execute();
-		return true;
-	}
-}
diff --git a/apps/bookmarks/lib/search.php b/apps/bookmarks/lib/search.php
deleted file mode 100644
index 1e6a3ce910..0000000000
--- a/apps/bookmarks/lib/search.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-/**
- * ownCloud - bookmarks plugin
- *
- * @author David Iwanowitsch
- * @copyright 2012 David Iwanowitsch <david at unclouded dot 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/>.
- *
- */
-
-class OC_Search_Provider_Bookmarks extends OC_Search_Provider{
-	function search($query){
-		$results=array();
-		
-		$offset = 0;
-		$sqlSortColumn = 'id';
-		
-		$searchquery=array();
-		if(substr_count($query, ' ') > 0){
-			$searchquery = explode(' ', $query);
-		}else{
-			$searchquery = $query;
-		}
-		
-//		OCP\Util::writeLog('bookmarks', 'search ' .$query ,OCP\Util::DEBUG);
-		$bookmarks = OC_Bookmarks_Bookmarks::findBookmarks($offset, $sqlSortColumn, $searchquery, false);
-//		OCP\Util::writeLog('bookmarks', 'found ' .count($bookmarks) ,OCP\Util::DEBUG);
-		//$l = new OC_l10n('bookmarks'); //resulttype can't be localized, javascript relies on that type
-		foreach($bookmarks as $bookmark){
-			$results[]=new OC_Search_Result($bookmark['title'],'', $bookmark['url'],'Bookm.');
-		}
-		
-		return $results;
-	}
-}
diff --git a/apps/bookmarks/settings.php b/apps/bookmarks/settings.php
deleted file mode 100644
index 6db3617633..0000000000
--- a/apps/bookmarks/settings.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-/**
- * Copyright (c) 2011 Marvin Thomas Rabe <mrabe@marvinrabe.de>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
-$tmpl = new OCP\Template( 'bookmarks', 'settings');
-
-return $tmpl->fetchPage();
diff --git a/apps/bookmarks/templates/addBm.php b/apps/bookmarks/templates/addBm.php
deleted file mode 100644
index 357e0a18f2..0000000000
--- a/apps/bookmarks/templates/addBm.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<!DOCTYPE html>  
-<html lang="en">  
-  <head>  
-    <meta charset="utf-8">  
-    <title>Read later - ownCloud</title>  
-  </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
diff --git a/apps/bookmarks/templates/bookmarklet.php b/apps/bookmarks/templates/bookmarklet.php
deleted file mode 100644
index 1802814d4b..0000000000
--- a/apps/bookmarks/templates/bookmarklet.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-function createBookmarklet() {
-	$l = OC_L10N::get('bookmarks');
-	echo '<small>' . $l->t('Drag this to your browser bookmarks and click it, when you want to bookmark a webpage quickly:') . '</small>'
-	. '<a class="button bookmarklet" href="javascript:(function(){var a=window,b=document,c=encodeURIComponent,d=a.open(\'' . OCP\Util::linkToAbsolute('bookmarks', 'addBm.php') . '?output=popup&url=\'+c(b.location),\'bkmk_popup\',\'left=\'+((a.screenX||a.screenLeft)+10)+\',top=\'+((a.screenY||a.screenTop)+10)+\',height=230px,width=230px,resizable=1,alwaysRaised=1\');a.setTimeout(function(){d.focus()},300);})();">'
-	. $l->t('Read later') . '</a>';
-} 
diff --git a/apps/bookmarks/templates/list.php b/apps/bookmarks/templates/list.php
deleted file mode 100644
index 4b84b43890..0000000000
--- a/apps/bookmarks/templates/list.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php 
-/**
- * Copyright (c) 2011 Marvin Thomas Rabe <mrabe@marvinrabe.de>
- * Copyright (c) 2011 Arthur Schiwon <blizzz@arthur-schiwon.de>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-?>
-<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" />
-	<input type="text" id="bookmark_add_title" placeholder="<?php echo $l->t('Title'); ?>" class="bookmarks_input" />
-	<input type="text" id="bookmark_add_tags" placeholder="<?php echo $l->t('Tags'); ?>" class="bookmarks_input" />
-	<input type="submit" value="<?php echo $l->t('Save bookmark'); ?>" id="bookmark_add_submit" />
-</div>
-<div class="bookmarks_list">
-</div>
-<div id="firstrun" style="display: none;">
-	<?php
-		echo $l->t('You have no bookmarks');
-		require_once(OC_App::getAppPath('bookmarks') .'/templates/bookmarklet.php');
-		createBookmarklet(); 
-	?>
-</div>
diff --git a/apps/bookmarks/templates/settings.php b/apps/bookmarks/templates/settings.php
deleted file mode 100644
index 31edf7478b..0000000000
--- a/apps/bookmarks/templates/settings.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-/**
- * Copyright (c) 2011 Marvin Thomas Rabe <mrabe@marvinrabe.de>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-?>
-<form id="bookmarks">
-		<fieldset class="personalblock">
-			<span class="bold"><?php echo $l->t('Bookmarklet <br />');?></span>
-			<?php
-			    require_once('bookmarklet.php');
-			    createBookmarklet(); 
-			?>
-		</fieldset>
-</form>
diff --git a/apps/calendar/ajax/cache/rescan.php b/apps/calendar/ajax/cache/rescan.php
deleted file mode 100644
index 3417f1ae4b..0000000000
--- a/apps/calendar/ajax/cache/rescan.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?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());
-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
deleted file mode 100644
index d2806d4789..0000000000
--- a/apps/calendar/ajax/cache/status.php
+++ /dev/null
@@ -1,22 +0,0 @@
-<?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/ajax/calendar/activation.php b/apps/calendar/ajax/calendar/activation.php
deleted file mode 100644
index f4aadc5b01..0000000000
--- a/apps/calendar/ajax/calendar/activation.php
+++ /dev/null
@@ -1,25 +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('calendar');
-OCP\JSON::callCheck();
-
-$calendarid = $_POST['calendarid'];
-$calendar = OC_Calendar_App::getCalendar($calendarid, true);
-if(!$calendar){
-	OCP\JSON::error(array('message'=>'permission denied'));
-	exit;
-}
-OC_Calendar_Calendar::setCalendarActive($calendarid, $_POST['active']);
-$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
deleted file mode 100644
index 089255cae3..0000000000
--- a/apps/calendar/ajax/calendar/delete.php
+++ /dev/null
@@ -1,25 +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.
- */
- 
-
-OCP\JSON::checkLoggedIn();
-OCP\JSON::checkAppEnabled('calendar');
-OCP\JSON::callCheck();
-
-$cal = $_POST["calendarid"];
-$calendar = OC_Calendar_App::getCalendar($cal, true);
-if(!$calendar){
-	OCP\JSON::error(array('message'=>'permission denied'));
-	exit;
-}
-$del = OC_Calendar_Calendar::deleteCalendar($cal);
-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
deleted file mode 100644
index 3916c52763..0000000000
--- a/apps/calendar/ajax/calendar/edit.form.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('calendar');
-
-$calendarcolor_options = OC_Calendar_Calendar::getCalendarColorOptions();
-$calendar = OC_Calendar_App::getCalendar($_POST['calendarid']);
-$tmpl = new OCP\Template("calendar", "part.editcalendar");
-$tmpl->assign('new', false);
-$tmpl->assign('calendarcolor_options', $calendarcolor_options);
-$tmpl->assign('calendar', $calendar);
-$tmpl->printPage();
\ No newline at end of file
diff --git a/apps/calendar/ajax/calendar/edit.php b/apps/calendar/ajax/calendar/edit.php
deleted file mode 100644
index 3f69666b58..0000000000
--- a/apps/calendar/ajax/calendar/edit.php
+++ /dev/null
@@ -1,24 +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('calendar');
-OCP\JSON::callCheck();
-
-$calendarcolor_options = OC_Calendar_Calendar::getCalendarColorOptions();
-$calendar = OC_Calendar_App::getCalendar($_GET['calendarid'], true);
-if(!$calendar){
-	OCP\JSON::error(array('message'=>'permission denied'));
-	exit;
-}
-$tmpl = new OCP\Template("calendar", "part.editcalendar");
-$tmpl->assign('new', false);
-$tmpl->assign('calendarcolor_options', $calendarcolor_options);
-$tmpl->assign('calendar', $calendar);
-$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
deleted file mode 100644
index 0783b6168f..0000000000
--- a/apps/calendar/ajax/calendar/new.form.php
+++ /dev/null
@@ -1,22 +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('calendar');
-$calendarcolor_options = OC_Calendar_Calendar::getCalendarColorOptions();
-$calendar = array(
-	'id' => 'new',
-	'displayname' => '',
-	'calendarcolor' => '',
-);
-$tmpl = new OCP\Template('calendar', 'part.editcalendar');
-$tmpl->assign('new', true);
-$tmpl->assign('calendarcolor_options', $calendarcolor_options);
-$tmpl->assign('calendar', $calendar);
-$tmpl->printPage();
\ No newline at end of file
diff --git a/apps/calendar/ajax/calendar/new.php b/apps/calendar/ajax/calendar/new.php
deleted file mode 100644
index 67d1282237..0000000000
--- a/apps/calendar/ajax/calendar/new.php
+++ /dev/null
@@ -1,42 +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.
- */
-
-// 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'));
-	exit;
-}
-$calendars = OC_Calendar_Calendar::allCalendars(OCP\USER::getUser());
-foreach($calendars as $cal){
-	if($cal['displayname'] == $_POST['name']){
-		OCP\JSON::error(array('message'=>'namenotavailable'));
-		exit;
-	}
-}
-
-$userid = OCP\USER::getUser();
-$calendarid = OC_Calendar_Calendar::addCalendar($userid, strip_tags($_POST['name']), 'VEVENT,VTODO,VJOURNAL', null, 0, $_POST['color']);
-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),
-));
diff --git a/apps/calendar/ajax/calendar/overview.php b/apps/calendar/ajax/calendar/overview.php
deleted file mode 100644
index 1d8e49ea5f..0000000000
--- a/apps/calendar/ajax/calendar/overview.php
+++ /dev/null
@@ -1,12 +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.
- */ 
-$l10n = OC_L10N::get('calendar');
-OCP\JSON::checkLoggedIn();
-OCP\JSON::checkAppEnabled('calendar');
-$output = new OCP\Template("calendar", "part.choosecalendar");
-$output -> printpage();
\ No newline at end of file
diff --git a/apps/calendar/ajax/calendar/update.php b/apps/calendar/ajax/calendar/update.php
deleted file mode 100644
index c09b1008c9..0000000000
--- a/apps/calendar/ajax/calendar/update.php
+++ /dev/null
@@ -1,49 +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.
- */
-
- 
-
-// 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'));
-	exit;
-}
-$calendars = OC_Calendar_Calendar::allCalendars(OCP\USER::getUser());
-foreach($calendars as $cal){
-	if($cal['displayname'] == $_POST['name'] && $cal['id'] != $_POST['id']){
-		OCP\JSON::error(array('message'=>'namenotavailable'));
-		exit;
-	}
-}
-
-$calendarid = $_POST['id'];
-$calendar = OC_Calendar_App::getCalendar($calendarid, true);
-if(!$calendar){
-	OCP\JSON::error(array('message'=>'permission denied'));
-	exit;
-}
-OC_Calendar_Calendar::editCalendar($calendarid, strip_tags($_POST['name']), null, null, null, $_POST['color']);
-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),
-));
diff --git a/apps/calendar/ajax/categories/rescan.php b/apps/calendar/ajax/categories/rescan.php
deleted file mode 100644
index 08c32865b6..0000000000
--- a/apps/calendar/ajax/categories/rescan.php
+++ /dev/null
@@ -1,43 +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('calendar');
-OCP\JSON::callCheck();
-
-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('calendar','ajax/categories/rescan.php: '.$msg, OCP\Util::DEBUG);
-	exit();
-}
-function debug($msg) {
-	OCP\Util::writeLog('calendar','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/calendar/ajax/changeview.php b/apps/calendar/ajax/changeview.php
deleted file mode 100644
index 819025543a..0000000000
--- a/apps/calendar/ajax/changeview.php
+++ /dev/null
@@ -1,21 +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\JSON::checkAppEnabled('calendar');
-$view = $_POST['v'];
-switch($view){
-	case 'agendaWeek':
-	case 'month';
-	case 'list':
-		break;
-	default:
-		OCP\JSON::error(array('message'=>'unexpected parameter: ' . $view));
-		exit;
-}
-OCP\Config::setUserValue(OCP\USER::getUser(), 'calendar', 'currentview', $view);
-OCP\JSON::success();
\ No newline at end of file
diff --git a/apps/calendar/ajax/event/delete.php b/apps/calendar/ajax/event/delete.php
deleted file mode 100644
index 17e45c001e..0000000000
--- a/apps/calendar/ajax/event/delete.php
+++ /dev/null
@@ -1,21 +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('calendar');
-OCP\JSON::callCheck();
-
-$id = $_POST['id'];
-$access = OC_Calendar_App::getaccess($id, OC_Calendar_App::EVENT);
-if($access != 'owner' && $access != 'rw'){
-	OCP\JSON::error(array('message'=>'permission denied'));
-	exit;
-}
-$result = OC_Calendar_Object::delete($id);
-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
deleted file mode 100644
index 2751248153..0000000000
--- a/apps/calendar/ajax/event/edit.form.php
+++ /dev/null
@@ -1,272 +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.
- */
-
- 
-
-if(!OCP\User::isLoggedIn()) {
-	die('<script type="text/javascript">document.location = oc_webroot;</script>');
-}
-OCP\JSON::checkAppEnabled('calendar');
-
-$id = $_POST['id'];
-$data = OC_Calendar_App::getEventObject($id, true, true);
-
-if(!$data){
-	OCP\JSON::error(array('data' => array('message' => self::$l10n->t('Wrong calendar'))));
-	exit;
-}
-$access = OC_Calendar_App::getaccess($id, OC_Calendar_Share::EVENT);
-$object = OC_VObject::parse($data['calendardata']);
-$vevent = $object->VEVENT;
-
-$dtstart = $vevent->DTSTART;
-$dtend = OC_Calendar_Object::getDTEndFromVEvent($vevent);
-switch($dtstart->getDateType()) {
-	case Sabre_VObject_Property_DateTime::UTC:
-		$timeOffset = $_SESSION['timezone']*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');
-		$starttime = $dtstart->getDateTime()->format('H:i');
-		$enddate = $dtend->getDateTime()->format('d-m-Y');
-		$endtime = $dtend->getDateTime()->format('H:i');
-		$allday = false;
-		break;
-	case Sabre_VObject_Property_DateTime::DATE:
-		$startdate = $dtstart->getDateTime()->format('d-m-Y');
-		$starttime = '';
-		$dtend->getDateTime()->modify('-1 day');
-		$enddate = $dtend->getDateTime()->format('d-m-Y');
-		$endtime = '';
-		$allday = true;
-		break;
-}
-
-$summary = $vevent->getAsString('SUMMARY');
-$location = $vevent->getAsString('LOCATION');
-$categories = $vevent->getAsString('CATEGORIES');
-$description = $vevent->getAsString('DESCRIPTION');
-$last_modified = $vevent->__get('LAST-MODIFIED');
-if ($last_modified){
-	$lastmodified = $last_modified->getDateTime()->format('U');
-}else{
-	$lastmodified = 0;
-}
-if($data['repeating'] == 1){
-	$rrule = explode(';', $vevent->getAsString('RRULE'));
-	$rrulearr = array();
-	foreach($rrule as $rule){
-		list($attr, $val) = explode('=', $rule);
-		$rrulearr[$attr] = $val;
-	}
-	if(!isset($rrulearr['INTERVAL']) || $rrulearr['INTERVAL'] == ''){
-		$rrulearr['INTERVAL'] = 1;
-	}
-	if(array_key_exists('BYDAY', $rrulearr)){
-		if(substr_count($rrulearr['BYDAY'], ',') == 0){
-			if(strlen($rrulearr['BYDAY']) == 2){
-				$repeat['weekdays'] = array($rrulearr['BYDAY']);
-			}elseif(strlen($rrulearr['BYDAY']) == 3){
-				$repeat['weekofmonth'] = substr($rrulearr['BYDAY'], 0, 1);
-				$repeat['weekdays'] = array(substr($rrulearr['BYDAY'], 1, 2));
-			}elseif(strlen($rrulearr['BYDAY']) == 4){
-				$repeat['weekofmonth'] = substr($rrulearr['BYDAY'], 0, 2);
-				$repeat['weekdays'] = array(substr($rrulearr['BYDAY'], 2, 2));
-			}
-		}else{
-			$byday_days = explode(',', $rrulearr['BYDAY']);
-			foreach($byday_days as $byday_day){
-				if(strlen($byday_day) == 2){
-					$repeat['weekdays'][] = $byday_day;
-				}elseif(strlen($byday_day) == 3){
-					$repeat['weekofmonth'] = substr($byday_day , 0, 1);
-					$repeat['weekdays'][] = substr($byday_day , 1, 2);
-				}elseif(strlen($byday_day) == 4){
-					$repeat['weekofmonth'] = substr($byday_day , 0, 2);
-					$repeat['weekdays'][] = substr($byday_day , 2, 2);
-				}
-			}
-		}
-	}
-	if(array_key_exists('BYMONTHDAY', $rrulearr)){
-		if(substr_count($rrulearr['BYMONTHDAY'], ',') == 0){
-			$repeat['bymonthday'][] = $rrulearr['BYMONTHDAY'];
-		}else{
-			$bymonthdays = explode(',', $rrulearr['BYMONTHDAY']);
-			foreach($bymonthdays as $bymonthday){
-				$repeat['bymonthday'][] = $bymonthday;
-			}
-		}
-	}
-	if(array_key_exists('BYYEARDAY', $rrulearr)){
-		if(substr_count($rrulearr['BYYEARDAY'], ',') == 0){
-			$repeat['byyearday'][] = $rrulearr['BYYEARDAY'];
-		}else{
-			$byyeardays = explode(',', $rrulearr['BYYEARDAY']);
-			foreach($byyeardays  as $yearday){
-				$repeat['byyearday'][] = $yearday;
-			}
-		}
-	}
-	if(array_key_exists('BYWEEKNO', $rrulearr)){
-		if(substr_count($rrulearr['BYWEEKNO'], ',') == 0){
-			$repeat['byweekno'][] = (string) $rrulearr['BYWEEKNO'];
-		}else{
-			$byweekno = explode(',', $rrulearr['BYWEEKNO']);
-			foreach($byweekno as $weekno){
-				$repeat['byweekno'][] = (string) $weekno;
-			}
-		}
-	}
-	if(array_key_exists('BYMONTH', $rrulearr)){
-		$months = OC_Calendar_App::getByMonthOptions();
-		if(substr_count($rrulearr['BYMONTH'], ',') == 0){
-			$repeat['bymonth'][] = $months[$month];
-		}else{
-			$bymonth = explode(',', $rrulearr['BYMONTH']);
-			foreach($bymonth as $month){
-				$repeat['bymonth'][] = $months[$month];
-			}
-		}
-	}
-	switch($rrulearr['FREQ']){
-		case 'DAILY':
-			$repeat['repeat'] = 'daily';
-			break;
-		case 'WEEKLY':
-			if($rrulearr['INTERVAL'] % 2 == 0){
-				$repeat['repeat'] = 'biweekly';
-				$rrulearr['INTERVAL'] = $rrulearr['INTERVAL'] / 2;
-			}elseif($rrulearr['BYDAY'] == 'MO,TU,WE,TH,FR'){
-				$repeat['repeat'] = 'weekday';
-			}else{
-				$repeat['repeat'] = 'weekly';
-			}
-			break;
-		case 'MONTHLY':
-			$repeat['repeat'] = 'monthly';
-			if(array_key_exists('BYDAY', $rrulearr)){
-				$repeat['month'] = 'weekday';
-			}else{
-				$repeat['month'] = 'monthday';
-			}
-			break;
-		case 'YEARLY':
-			$repeat['repeat'] = 'yearly';
-			if(array_key_exists('BYMONTH', $rrulearr)){
-				$repeat['year'] = 'bydaymonth';
-			}elseif(array_key_exists('BYWEEKNO', $rrulearr)){
-				$repeat['year'] = 'byweekno';
-			}else{
-				$repeat['year'] = 'byyearday';
-			}
-	}
-	$repeat['interval'] = $rrulearr['INTERVAL'];
-	if(array_key_exists('COUNT', $rrulearr)){
-		$repeat['end'] = 'count';
-		$repeat['count'] = $rrulearr['COUNT'];
-	}elseif(array_key_exists('UNTIL', $rrulearr)){
-		$repeat['end'] = 'date';
-		$endbydate_day = substr($rrulearr['UNTIL'], 6, 2);
-		$endbydate_month = substr($rrulearr['UNTIL'], 4, 2);
-		$endbydate_year = substr($rrulearr['UNTIL'], 0, 4);
-		$repeat['date'] = $endbydate_day . '-' .  $endbydate_month . '-' . $endbydate_year;
-	}else{
-		$repeat['end'] = 'never';
-	}
-	if(array_key_exists('weekdays', $repeat)){
-		$repeat_weekdays_ = array();
-		$days = OC_Calendar_App::getWeeklyOptions();
-		foreach($repeat['weekdays'] as $weekday){
-			$repeat_weekdays_[] = $days[$weekday];
-		}
-		$repeat['weekdays'] = $repeat_weekdays_;
-	}
-}else{
-	$repeat['repeat'] = 'doesnotrepeat';
-}
-if($access == 'owner'){
-	$calendar_options = OC_Calendar_Calendar::allCalendars(OCP\USER::getUser());
-}else{
-	$calendar_options = array(OC_Calendar_App::getCalendar($data['calendarid'], false));
-}
-$category_options = OC_Calendar_App::getCategoryOptions();
-$repeat_options = OC_Calendar_App::getRepeatOptions();
-$repeat_end_options = OC_Calendar_App::getEndOptions();
-$repeat_month_options = OC_Calendar_App::getMonthOptions();
-$repeat_year_options = OC_Calendar_App::getYearOptions();
-$repeat_weekly_options = OC_Calendar_App::getWeeklyOptions();
-$repeat_weekofmonth_options = OC_Calendar_App::getWeekofMonth();
-$repeat_byyearday_options = OC_Calendar_App::getByYearDayOptions();
-$repeat_bymonth_options = OC_Calendar_App::getByMonthOptions();
-$repeat_byweekno_options = OC_Calendar_App::getByWeekNoOptions();
-$repeat_bymonthday_options = OC_Calendar_App::getByMonthDayOptions();
-
-if($access == 'owner' || $access == 'rw'){
-	$tmpl = new OCP\Template('calendar', 'part.editevent');
-}elseif($access == 'r'){
-	$tmpl = new OCP\Template('calendar', 'part.showevent');
-}
-
-$tmpl->assign('eventid', $id);
-$tmpl->assign('access', $access);
-$tmpl->assign('lastmodified', $lastmodified);
-$tmpl->assign('calendar_options', $calendar_options);
-$tmpl->assign('repeat_options', $repeat_options);
-$tmpl->assign('repeat_month_options', $repeat_month_options);
-$tmpl->assign('repeat_weekly_options', $repeat_weekly_options);
-$tmpl->assign('repeat_end_options', $repeat_end_options);
-$tmpl->assign('repeat_year_options', $repeat_year_options);
-$tmpl->assign('repeat_byyearday_options', $repeat_byyearday_options);
-$tmpl->assign('repeat_bymonth_options', $repeat_bymonth_options);
-$tmpl->assign('repeat_byweekno_options', $repeat_byweekno_options);
-$tmpl->assign('repeat_bymonthday_options', $repeat_bymonthday_options);
-$tmpl->assign('repeat_weekofmonth_options', $repeat_weekofmonth_options);
-
-$tmpl->assign('title', $summary);
-$tmpl->assign('location', $location);
-$tmpl->assign('categories', $categories);
-$tmpl->assign('calendar', $data['calendarid']);
-$tmpl->assign('allday', $allday);
-$tmpl->assign('startdate', $startdate);
-$tmpl->assign('starttime', $starttime);
-$tmpl->assign('enddate', $enddate);
-$tmpl->assign('endtime', $endtime);
-$tmpl->assign('description', $description);
-
-$tmpl->assign('repeat', $repeat['repeat']);
-if($repeat['repeat'] != 'doesnotrepeat'){
-	$tmpl->assign('repeat_month', $repeat['month']);
-	$tmpl->assign('repeat_weekdays', $repeat['weekdays']);
-	$tmpl->assign('repeat_interval', $repeat['interval']);
-	$tmpl->assign('repeat_end', $repeat['end']);
-	$tmpl->assign('repeat_count', $repeat['count']);
-	$tmpl->assign('repeat_weekofmonth', $repeat['weekofmonth']);
-	$tmpl->assign('repeat_date', $repeat['date']);
-	$tmpl->assign('repeat_year', $repeat['year']);
-	$tmpl->assign('repeat_byyearday', $repeat['byyearday']);
-	$tmpl->assign('repeat_bymonthday', $repeat['bymonthday']);
-	$tmpl->assign('repeat_bymonth', $repeat['bymonth']);
-	$tmpl->assign('repeat_byweekno', $repeat['byweekno']);
-} else {
-	$tmpl->assign('repeat_month', 'monthday');
-	$tmpl->assign('repeat_weekdays', array());
-	$tmpl->assign('repeat_interval', 1);
-	$tmpl->assign('repeat_end', 'never');
-	$tmpl->assign('repeat_count', '10');
-	$tmpl->assign('repeat_weekofmonth', 'auto');
-	$tmpl->assign('repeat_date', '');
-	$tmpl->assign('repeat_year', 'bydate');
-}
-$tmpl->printpage();
diff --git a/apps/calendar/ajax/event/edit.php b/apps/calendar/ajax/event/edit.php
deleted file mode 100644
index db78bf6e5e..0000000000
--- a/apps/calendar/ajax/event/edit.php
+++ /dev/null
@@ -1,46 +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('calendar');
-OCP\JSON::callCheck();
-
-$id = $_POST['id'];
-
-if(!array_key_exists('calendar', $_POST)){
-	$cal = OC_Calendar_Object::getCalendarid($id);
-	$_POST['calendar'] = $cal;
-}else{
-	$cal = $_POST['calendar'];
-}
-
-$access = OC_Calendar_App::getaccess($id, OC_Calendar_App::EVENT);
-if($access != 'owner' && $access != 'rw'){
-	OCP\JSON::error(array('message'=>'permission denied'));
-	exit;
-}
-
-$errarr = OC_Calendar_Object::validateRequest($_POST);
-if($errarr){
-	//show validate errors
-	OCP\JSON::error($errarr);
-	exit;
-}else{
-	$data = OC_Calendar_App::getEventObject($id, false, false);
-	$vcalendar = OC_VObject::parse($data['calendardata']);
-
-	OC_Calendar_App::isNotModified($vcalendar->VEVENT, $_POST['lastmodified']);
-	OC_Calendar_Object::updateVCalendarFromRequest($_POST, $vcalendar);
-
-	OC_Calendar_Object::edit($id, $vcalendar->serialize());
-	if ($data['calendarid'] != $cal) {
-		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
deleted file mode 100644
index f4e2b36376..0000000000
--- a/apps/calendar/ajax/event/move.php
+++ /dev/null
@@ -1,47 +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::callCheck();
-
-$id = $_POST['id'];
-$access = OC_Calendar_App::getaccess($id, OC_Calendar_App::EVENT);
-if($access != 'owner' && $access != 'rw'){
-	OCP\JSON::error(array('message'=>'permission denied'));
-	exit;
-}
-$vcalendar = OC_Calendar_App::getVCalendar($id, false, false);
-$vevent = $vcalendar->VEVENT;
-
-$allday = $_POST['allDay'];
-$delta = new DateInterval('P0D');
-$delta->d = $_POST['dayDelta'];
-$delta->i = $_POST['minuteDelta'];
-OC_Calendar_App::isNotModified($vevent, $_POST['lastmodified']);
-
-$dtstart = $vevent->DTSTART;
-$dtend = OC_Calendar_Object::getDTEndFromVEvent($vevent);
-$start_type = $dtstart->getDateType();
-$end_type = $dtend->getDateType();
-if ($allday && $start_type != Sabre_VObject_Property_DateTime::DATE){
-	$start_type = $end_type = Sabre_VObject_Property_DateTime::DATE;
-	$dtend->setDateTime($dtend->getDateTime()->modify('+1 day'), $end_type);
-}
-if (!$allday && $start_type == Sabre_VObject_Property_DateTime::DATE){
-	$start_type = $end_type = Sabre_VObject_Property_DateTime::LOCALTZ;
-}
-$dtstart->setDateTime($dtstart->getDateTime()->add($delta), $start_type);
-$dtend->setDateTime($dtend->getDateTime()->add($delta), $end_type);
-unset($vevent->DURATION);
-
-$vevent->setDateTime('LAST-MODIFIED', 'now', Sabre_VObject_Property_DateTime::UTC);
-$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')));
\ No newline at end of file
diff --git a/apps/calendar/ajax/event/new.form.php b/apps/calendar/ajax/event/new.form.php
deleted file mode 100644
index db04cdf2d4..0000000000
--- a/apps/calendar/ajax/event/new.form.php
+++ /dev/null
@@ -1,75 +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.
- */
-
- 
-
-if(!OCP\User::isLoggedIn()) {
-	die('<script type="text/javascript">document.location = oc_webroot;</script>');
-}
-OCP\JSON::checkAppEnabled('calendar');
-
-if (!isset($_POST['start'])){
-	OCP\JSON::error();
-	die;
-}
-$start = $_POST['start'];
-$end = $_POST['end'];
-$allday = $_POST['allday'];
-
-if (!$end){
-	$duration = OCP\Config::getUserValue( OCP\USER::getUser(), 'calendar', 'duration', '60');
-	$end = $start + ($duration * 60);
-}
-$start = new DateTime('@'.$start);
-$end = new DateTime('@'.$end);
-$timezone = OC_Calendar_App::getTimezone();
-$start->setTimezone(new DateTimeZone($timezone));
-$end->setTimezone(new DateTimeZone($timezone));
-
-$calendar_options = OC_Calendar_Calendar::allCalendars(OCP\USER::getUser());
-$repeat_options = OC_Calendar_App::getRepeatOptions();
-$repeat_end_options = OC_Calendar_App::getEndOptions();
-$repeat_month_options = OC_Calendar_App::getMonthOptions();
-$repeat_year_options = OC_Calendar_App::getYearOptions();
-$repeat_weekly_options = OC_Calendar_App::getWeeklyOptions();
-$repeat_weekofmonth_options = OC_Calendar_App::getWeekofMonth();
-$repeat_byyearday_options = OC_Calendar_App::getByYearDayOptions();
-$repeat_bymonth_options = OC_Calendar_App::getByMonthOptions();
-$repeat_byweekno_options = OC_Calendar_App::getByWeekNoOptions();
-$repeat_bymonthday_options = OC_Calendar_App::getByMonthDayOptions();
-
-$tmpl = new OCP\Template('calendar', 'part.newevent');
-$tmpl->assign('access', 'owner');
-$tmpl->assign('calendar_options', $calendar_options);
-$tmpl->assign('repeat_options', $repeat_options);
-$tmpl->assign('repeat_month_options', $repeat_month_options);
-$tmpl->assign('repeat_weekly_options', $repeat_weekly_options);
-$tmpl->assign('repeat_end_options', $repeat_end_options);
-$tmpl->assign('repeat_year_options', $repeat_year_options);
-$tmpl->assign('repeat_byyearday_options', $repeat_byyearday_options);
-$tmpl->assign('repeat_bymonth_options', $repeat_bymonth_options);
-$tmpl->assign('repeat_byweekno_options', $repeat_byweekno_options);
-$tmpl->assign('repeat_bymonthday_options', $repeat_bymonthday_options);
-$tmpl->assign('repeat_weekofmonth_options', $repeat_weekofmonth_options);
-
-$tmpl->assign('eventid', 'new');
-$tmpl->assign('startdate', $start->format('d-m-Y'));
-$tmpl->assign('starttime', $start->format('H:i'));
-$tmpl->assign('enddate', $end->format('d-m-Y'));
-$tmpl->assign('endtime', $end->format('H:i'));
-$tmpl->assign('allday', $allday);
-$tmpl->assign('repeat', 'doesnotrepeat');
-$tmpl->assign('repeat_month', 'monthday');
-$tmpl->assign('repeat_weekdays', array());
-$tmpl->assign('repeat_interval', 1);
-$tmpl->assign('repeat_end', 'never');
-$tmpl->assign('repeat_count', '10');
-$tmpl->assign('repeat_weekofmonth', 'auto');
-$tmpl->assign('repeat_date', '');
-$tmpl->assign('repeat_year', 'bydate');
-$tmpl->printpage();
\ No newline at end of file
diff --git a/apps/calendar/ajax/event/new.php b/apps/calendar/ajax/event/new.php
deleted file mode 100644
index bc0439cc31..0000000000
--- a/apps/calendar/ajax/event/new.php
+++ /dev/null
@@ -1,25 +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.
- */
-
- 
-
-OCP\JSON::checkLoggedIn();
-OCP\JSON::checkAppEnabled('calendar');
-OCP\JSON::callCheck();
-
-$errarr = OC_Calendar_Object::validateRequest($_POST);
-if($errarr){
-	//show validate errors
-	OCP\JSON::error($errarr);
-	exit;
-}else{
-	$cal = $_POST['calendar'];
-	$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
deleted file mode 100644
index 15b687b55d..0000000000
--- a/apps/calendar/ajax/event/resize.php
+++ /dev/null
@@ -1,39 +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::callCheck();
-
-$id = $_POST['id'];
-
-$access = OC_Calendar_App::getaccess($id, OC_Calendar_App::EVENT);
-if($access != 'owner' && $access != 'rw'){
-	OCP\JSON::error(array('message'=>'permission denied'));
-	exit;
-}
-
-$vcalendar = OC_Calendar_App::getVCalendar($id, false, false);
-$vevent = $vcalendar->VEVENT;
-
-$delta = new DateInterval('P0D');
-$delta->d = $_POST['dayDelta'];
-$delta->i = $_POST['minuteDelta'];
-
-OC_Calendar_App::isNotModified($vevent, $_POST['lastmodified']);
-
-$dtend = OC_Calendar_Object::getDTEndFromVEvent($vevent);
-$end_type = $dtend->getDateType();
-$dtend->setDateTime($dtend->getDateTime()->add($delta), $end_type);
-unset($vevent->DURATION);
-
-$vevent->setDateTime('LAST-MODIFIED', 'now', Sabre_VObject_Property_DateTime::UTC);
-$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')));
\ No newline at end of file
diff --git a/apps/calendar/ajax/events.php b/apps/calendar/ajax/events.php
deleted file mode 100644
index ae55cbc02d..0000000000
--- a/apps/calendar/ajax/events.php
+++ /dev/null
@@ -1,30 +0,0 @@
-<?php
-/**
- * Copyright (c) 2011, 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\JSON::checkAppEnabled('calendar');
-session_write_close();
-
-// Look for the calendar id
-$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;
-	}
-}
-$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']);
-$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));
-}
-OCP\JSON::encodedPrint(OCP\Util::sanitizeHTML($output));
diff --git a/apps/calendar/ajax/import/calendarcheck.php b/apps/calendar/ajax/import/calendarcheck.php
deleted file mode 100644
index a91bab7057..0000000000
--- a/apps/calendar/ajax/import/calendarcheck.php
+++ /dev/null
@@ -1,18 +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('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/dialog.php b/apps/calendar/ajax/import/dialog.php
deleted file mode 100644
index 18fe226172..0000000000
--- a/apps/calendar/ajax/import/dialog.php
+++ /dev/null
@@ -1,13 +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('calendar');
-$tmpl = new OCP\Template('calendar', 'part.import');
-$tmpl->assign('path', $_POST['path']);
-$tmpl->assign('filename', $_POST['filename']);
-$tmpl->printpage();
\ No newline at end of file
diff --git a/apps/calendar/ajax/import/dropimport.php b/apps/calendar/ajax/import/dropimport.php
deleted file mode 100644
index f46e731409..0000000000
--- a/apps/calendar/ajax/import/dropimport.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?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');
-$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;
-}
-$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();
-$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 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
deleted file mode 100644
index b1dfc464d0..0000000000
--- a/apps/calendar/ajax/import/import.php
+++ /dev/null
@@ -1,151 +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('calendar');
-OCP\JSON::callCheck();
-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'));
-}
-$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;
-}
-$newcal = false;
-if($_POST['method'] == 'new'){
-	$calendars = OC_Calendar_Calendar::allCalendars(OCP\User::getUser());
-	foreach($calendars as $calendar){
-		if($calendar['displayname'] == $_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,strip_tags($_POST['calcolor']));
-		OC_Calendar_Calendar::setCalendarActive($id, 1);
-	}
-}else{
-	$calendar = OC_Calendar_App::getCalendar($_POST['id']);
-	if($calendar['userid'] != OCP\USER::getUser()){
-		OCP\JSON::error(array('error'=>'missingcalendarrights'));
-		exit();
-	}
-	$id = $_POST['id'];
-}
-$import->setCalendarID($id);
-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){
-		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 calendar.')));
-}else{
-	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');
-// normalize the newlines
-$file = str_replace(array("\r","\n\n"), array("\n","\n"), $file);
-$lines = explode("\n", $file);
-unset($file);
-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# )
-//   $caldata is used to create prefix/suffix strings when building import text
-// $uids is array of component arrays, keys are $uid, ie array( $uid => array( $beginlineno => $component ) )
-//   $component is array( 'end' => end line#, 'cal'=> $cal )
-$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++;
-}
-// import the calendar
-writeProgress('60');
-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);
-	}
-}
-// finished import
-writeProgress('100');
-sleep(3);
-OC_Cache::remove($progresskey);
-OCP\JSON::success();*/
diff --git a/apps/calendar/ajax/settings/getfirstday.php b/apps/calendar/ajax/settings/getfirstday.php
deleted file mode 100644
index bc995f7d6e..0000000000
--- a/apps/calendar/ajax/settings/getfirstday.php
+++ /dev/null
@@ -1,11 +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();
-$firstday = OCP\Config::getUserValue( OCP\USER::getUser(), 'calendar', 'firstday', 'mo');
-OCP\JSON::encodedPrint(array('firstday' => $firstday));
\ No newline at end of file
diff --git a/apps/calendar/ajax/settings/gettimezonedetection.php b/apps/calendar/ajax/settings/gettimezonedetection.php
deleted file mode 100644
index 6bc9a07a1e..0000000000
--- a/apps/calendar/ajax/settings/gettimezonedetection.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-/**
- * Copyright (c) 2011, 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\JSON::checkAppEnabled('calendar');
-OCP\JSON::success(array('detection' => OCP\Config::getUserValue(OCP\USER::getUser(), 'calendar', 'timezonedetection')));
\ No newline at end of file
diff --git a/apps/calendar/ajax/settings/guesstimezone.php b/apps/calendar/ajax/settings/guesstimezone.php
deleted file mode 100644
index 6b6b8bef9c..0000000000
--- a/apps/calendar/ajax/settings/guesstimezone.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-/**
- * Copyright (c) 2011, 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\JSON::checkAppEnabled('calendar');
-
-$l = OC_L10N::get('calendar');
-
-$lat = $_POST['lat'];
-$lng = $_POST['lng'];
-
-$timezone =  OC_Geo::timezone($lat, $lng);
-
-if($timezone == OCP\Config::getUserValue(OCP\USER::getUser(), 'calendar', 'timezone')){
-	OCP\JSON::success();
-	exit;
-}
-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
diff --git a/apps/calendar/ajax/settings/setfirstday.php b/apps/calendar/ajax/settings/setfirstday.php
deleted file mode 100644
index 73cf0c19b7..0000000000
--- a/apps/calendar/ajax/settings/setfirstday.php
+++ /dev/null
@@ -1,16 +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\JSON::callCheck();
-if(isset($_POST["firstday"])){
-	OCP\Config::setUserValue(OCP\USER::getUser(), 'calendar', 'firstday', $_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
deleted file mode 100644
index 6136857e2f..0000000000
--- a/apps/calendar/ajax/settings/settimeformat.php
+++ /dev/null
@@ -1,16 +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.
- */
- 
-OCP\JSON::checkLoggedIn();
-OCP\JSON::callCheck();
-if(isset($_POST["timeformat"])){
-	OCP\Config::setUserValue(OCP\USER::getUser(), 'calendar', 'timeformat', $_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
deleted file mode 100644
index 06db66d578..0000000000
--- a/apps/calendar/ajax/settings/settimezone.php
+++ /dev/null
@@ -1,26 +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.
- */
-
-// Init owncloud
- 
-
-$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'] ) ){
-	$timezone=$_POST['timezone'];
-	OCP\Config::setUserValue( OCP\USER::getUser(), 'calendar', 'timezone', $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
deleted file mode 100644
index eebb687dfa..0000000000
--- a/apps/calendar/ajax/settings/timeformat.php
+++ /dev/null
@@ -1,11 +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.
- */
- 
-OCP\JSON::checkLoggedIn();
-$timeformat = OCP\Config::getUserValue( OCP\USER::getUser(), 'calendar', 'timeformat', "24");
-OCP\JSON::encodedPrint(array("timeformat" => $timeformat));
\ No newline at end of file
diff --git a/apps/calendar/ajax/settings/timezonedetection.php b/apps/calendar/ajax/settings/timezonedetection.php
deleted file mode 100644
index 5f03f647b3..0000000000
--- a/apps/calendar/ajax/settings/timezonedetection.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-/**
- * Copyright (c) 2011, 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\JSON::checkAppEnabled('calendar');
-if(array_key_exists('timezonedetection', $_POST) && $_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();
\ No newline at end of file
diff --git a/apps/calendar/ajax/share/activation.php b/apps/calendar/ajax/share/activation.php
deleted file mode 100644
index bce8693577..0000000000
--- a/apps/calendar/ajax/share/activation.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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.
- */
-$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
deleted file mode 100644
index 5aff7666f7..0000000000
--- a/apps/calendar/ajax/share/changepermission.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?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.
- */
-
-OCP\JSON::callCheck();
-
-$id = strip_tags($_POST['id']);
-$idtype = strip_tags($_POST['idtype']);
-$permission = (int) strip_tags($_POST['permission']);
-switch($idtype){
-	case 'calendar':
-	case 'event':
-		break;
-	default:
-		OCP\JSON::error(array('message'=>'unexspected parameter'));
-		exit;
-}
-if($idtype == 'calendar' && !OC_Calendar_App::getCalendar($id)){
-	OCP\JSON::error(array('message'=>'permission denied'));
-	exit;
-}
-if($idtype == 'event' && !OC_Calendar_App::getEventObject($id)){
-	OCP\JSON::error(array('message'=>'permission denied'));
-	exit;
-}
-$sharewith = $_POST['sharewith'];
-$sharetype = strip_tags($_POST['sharetype']);
-switch($sharetype){
-	case 'user':
-	case 'group':
-	case 'public':
-		break;
-	default:
-		OCP\JSON::error(array('message'=>'unexspected parameter'));
-		exit;
-}
-if($sharetype == 'user' && !OCP\User::userExists($sharewith)){
-	OCP\JSON::error(array('message'=>'user not found'));
-	exit;
-}
-if($sharetype == 'group' && !OC_Group::groupExists($sharewith)){
-	OCP\JSON::error(array('message'=>'group not found'));
-	exit;
-}
-$success = OC_Calendar_Share::changepermission($sharewith, $sharetype, $id, $permission, (($idtype=='calendar') ? OC_Calendar_Share::CALENDAR : OC_Calendar_Share::EVENT));
-OCP\JSON::success();
\ No newline at end of file
diff --git a/apps/calendar/ajax/share/dropdown.php b/apps/calendar/ajax/share/dropdown.php
deleted file mode 100644
index 86cf4ac090..0000000000
--- a/apps/calendar/ajax/share/dropdown.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?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.
- */
- 
-$user = OCP\USER::getUser();
-$calid = $_POST['calid'];
-$calendar = OC_Calendar_Calendar::find($calid);
-if($calendar['userid'] != $user){
-	OCP\JSON::error();
-	exit;
-}
-$tmpl = new OCP\Template('calendar', 'share.dropdown');
-$tmpl->assign('calid', $calid);
-$tmpl->printPage();
\ No newline at end of file
diff --git a/apps/calendar/ajax/share/share.php b/apps/calendar/ajax/share/share.php
deleted file mode 100644
index 77e1ab9d65..0000000000
--- a/apps/calendar/ajax/share/share.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?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.
- */
- 
-OCP\JSON::callCheck();
-
-$id = strip_tags($_POST['id']);
-$idtype = strip_tags($_POST['idtype']);
-switch($idtype){
-	case 'calendar':
-	case 'event':
-		break;
-	default:
-		OCP\JSON::error(array('message'=>'unexpected parameter'));
-		exit;
-}
-if($idtype == 'calendar' && !OC_Calendar_App::getCalendar($id)){
-	OCP\JSON::error(array('message'=>'permission denied'));
-	exit;
-}
-if($idtype == 'event' && !OC_Calendar_App::getEventObject($id)){
-	OCP\JSON::error(array('message'=>'permission denied'));
-	exit;
-}
-$sharewith = $_POST['sharewith'];
-$sharetype = strip_tags($_POST['sharetype']);
-switch($sharetype){
-	case 'user':
-	case 'group':
-	case 'public':
-		break;
-	default:
-		OCP\JSON::error(array('message'=>'unexpected parameter'));
-		exit;
-}
-if($sharetype == 'user' && !OCP\User::userExists($sharewith)){
-	OCP\JSON::error(array('message'=>'user not found'));
-	exit;
-}
-if($sharetype == 'group' && !OC_Group::groupExists($sharewith)){
-	OCP\JSON::error(array('message'=>'group not found'));
-	exit;
-}
-if($sharetype == 'user' && OCP\USER::getUser() == $sharewith){
-	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){
-	if($sharetype == 'public'){
-		OCP\JSON::success(array('message'=>$success));
-	}else{
-		OCP\JSON::success(array('message'=>'shared'));
-	}
-}else{
-	OCP\JSON::error(array('message'=>'can not share'));
-	exit;
-}
\ No newline at end of file
diff --git a/apps/calendar/ajax/share/unshare.php b/apps/calendar/ajax/share/unshare.php
deleted file mode 100644
index c7c0611318..0000000000
--- a/apps/calendar/ajax/share/unshare.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?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.
- */
-
-OCP\JSON::callCheck();
-
-$id = strip_tags($_POST['id']);
-$idtype = strip_tags($_POST['idtype']);
-switch($idtype){
-	case 'calendar':
-	case 'event':
-		break;
-	default:
-		OCP\JSON::error(array('message'=>'unexspected parameter'));
-		exit;
-}
-if($idtype == 'calendar' && !OC_Calendar_App::getCalendar($id)){
-	OCP\JSON::error(array('message'=>'permission denied'));
-	exit;
-}
-if($idtype == 'event' && !OC_Calendar_App::getEventObject($id)){
-	OCP\JSON::error(array('message'=>'permission denied'));
-	exit;
-}
-$sharewith = $_POST['sharewith'];
-$sharetype = strip_tags($_POST['sharetype']);
-switch($sharetype){
-	case 'user':
-	case 'group':
-	case 'public':
-		break;
-	default:
-		OCP\JSON::error(array('message'=>'unexspected parameter'));
-		exit;
-}
-if($sharetype == 'user' && !OCP\User::userExists($sharewith)){
-	OCP\JSON::error(array('message'=>'user not found'));
-	exit;
-}elseif($sharetype == 'group' && !OC_Group::groupExists($sharewith)){
-	OCP\JSON::error(array('message'=>'group not found'));
-	exit;
-}
-$success = OC_Calendar_Share::unshare(OCP\USER::getUser(), $sharewith, $sharetype, $id, (($idtype=='calendar') ? OC_Calendar_Share::CALENDAR : OC_Calendar_Share::EVENT));
-if($success){
-	OCP\JSON::success();
-}else{
-	OCP\JSON::error(array('message'=>'can not unshare'));
-	exit;
-}
\ No newline at end of file
diff --git a/apps/calendar/appinfo/app.php b/apps/calendar/appinfo/app.php
deleted file mode 100644
index 0078705578..0000000000
--- a/apps/calendar/appinfo/app.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-$l=OC_L10N::get('calendar');
-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/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';
-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');
-//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");
-OCP\Util::addStyle('3rdparty/miniColors', 'jquery.miniColors');
-OCP\Util::addscript('3rdparty/miniColors', 'jquery.miniColors.min');
-OCP\App::addNavigationEntry( array(
-  'id' => 'calendar_index',
-  'order' => 10,
-  'href' => OCP\Util::linkTo( 'calendar', 'index.php' ),
-  'icon' => OCP\Util::imagePath( 'calendar', 'icon.svg' ),
-  'name' => $l->t('Calendar')));
-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/appinfo/database.xml b/apps/calendar/appinfo/database.xml
deleted file mode 100644
index 16e10010d5..0000000000
--- a/apps/calendar/appinfo/database.xml
+++ /dev/null
@@ -1,345 +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*calendar_objects</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>calendarid</name>
-    <type>integer</type>
-    <default></default>
-    <notnull>true</notnull>
-    <unsigned>true</unsigned>
-    <length>4</length>
-   </field>
-
-   <field>
-    <name>objecttype</name>
-    <type>text</type>
-    <default></default>
-    <notnull>true</notnull>
-    <length>40</length>
-   </field>
-
-   <field>
-    <name>startdate</name>
-    <type>timestamp</type>
-    <default>CURRENT_TIMESTAMP</default>
-    <notnull>false</notnull>
-   </field>
-
-   <field>
-    <name>enddate</name>
-    <type>timestamp</type>
-    <default>CURRENT_TIMESTAMP</default>
-    <notnull>false</notnull>
-   </field>
-
-   <field>
-    <name>repeating</name>
-    <type>integer</type>
-    <default></default>
-    <notnull>false</notnull>
-    <length>4</length>
-   </field>
-
-   <field>
-    <name>summary</name>
-    <type>text</type>
-    <default></default>
-    <notnull>false</notnull>
-    <length>255</length>
-   </field>
-
-   <field>
-    <name>calendardata</name>
-    <type>text</type>
-    <notnull>false</notnull>
-   </field>
-
-   <field>
-    <name>uri</name>
-    <type>text</type>
-    <default></default>
-    <notnull>false</notnull>
-    <length>255</length>
-   </field>
-
-   <field>
-    <name>lastmodified</name>
-    <type>integer</type>
-    <default></default>
-    <notnull>false</notnull>
-    <length>4</length>
-   </field>
-
-  </declaration>
-
- </table>
-
- <table>
-
-  <name>*dbprefix*calendar_calendars</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>userid</name>
-    <type>text</type>
-    <default></default>
-    <notnull>false</notnull>
-    <length>255</length>
-   </field>
-
-   <field>
-    <name>displayname</name>
-    <type>text</type>
-    <default></default>
-    <notnull>false</notnull>
-    <length>100</length>
-   </field>
-
-   <field>
-    <name>uri</name>
-    <type>text</type>
-    <default></default>
-    <notnull>false</notnull>
-    <length>255</length>
-   </field>
-
-   <field>
-    <name>active</name>
-    <type>integer</type>
-    <default>1</default>
-    <notnull>true</notnull>
-    <length>4</length>
-   </field>
-
-   <field>
-    <name>ctag</name>
-    <type>integer</type>
-    <default>0</default>
-    <notnull>true</notnull>
-    <unsigned>true</unsigned>
-    <length>4</length>
-   </field>
-
-   <field>
-    <name>calendarorder</name>
-    <type>integer</type>
-    <default>0</default>
-    <notnull>true</notnull>
-    <unsigned>true</unsigned>
-    <length>4</length>
-   </field>
-
-   <field>
-    <name>calendarcolor</name>
-    <type>text</type>
-    <default></default>
-    <notnull>false</notnull>
-    <length>10</length>
-   </field>
-
-   <field>
-    <name>timezone</name>
-    <type>text</type>
-    <notnull>false</notnull>
-   </field>
-
-   <field>
-    <name>components</name>
-    <type>text</type>
-    <default></default>
-    <notnull>false</notnull>
-    <length>100</length>
-   </field>
-
-  </declaration>
-
- </table>
- 
- <table>
-
-  <name>*dbprefix*calendar_share_event</name>
-
-  <declaration>
-  
-   <field>
-    <name>owner</name>
-    <type>text</type>
-    <notnull>true</notnull>
-    <length>255</length>
-   </field>
-  
-   <field>
-    <name>share</name>
-    <type>text</type>
-    <notnull>true</notnull>
-    <length>255</length>
-   </field>
-  
-   <field>
-    <name>sharetype</name>
-    <type>text</type>
-    <notnull>true</notnull>
-    <length>6</length>
-   </field>
-
-   <field>
-    <name>eventid</name>
-    <type>integer</type>
-    <default></default>
-    <notnull>true</notnull>
-    <unsigned>true</unsigned>
-    <length>11</length>
-   </field>
-
-   <field>
-    <name>permissions</name>
-    <type>integer</type>
-    <notnull>true</notnull>
-    <length>1</length>
-   </field>
-
-  </declaration>
-
- </table>
- 
- <table>
-
-  <name>*dbprefix*calendar_share_calendar</name>
-
-  <declaration>
-  
-   <field>
-    <name>owner</name>
-    <type>text</type>
-    <notnull>true</notnull>
-    <length>255</length>
-   </field>
-  
-   <field>
-    <name>share</name>
-    <type>text</type>
-    <notnull>true</notnull>
-    <length>255</length>
-   </field>
-  
-   <field>
-    <name>sharetype</name>
-    <type>text</type>
-    <notnull>true</notnull>
-    <length>6</length>
-   </field>
-
-   <field>
-    <name>calendarid</name>
-    <type>integer</type>
-    <default></default>
-    <notnull>true</notnull>
-    <unsigned>true</unsigned>
-    <length>11</length>
-   </field>
-
-   <field>
-    <name>permissions</name>
-    <type>integer</type>
-    <notnull>true</notnull>
-    <length>1</length>
-   </field>
-
-   <field>
-    <name>active</name>
-    <type>integer</type>
-    <default>1</default>
-    <notnull>true</notnull>
-    <length>4</length>
-   </field>
-
-  </declaration>
-
- </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/appinfo/info.xml b/apps/calendar/appinfo/info.xml
deleted file mode 100644
index dde0260f07..0000000000
--- a/apps/calendar/appinfo/info.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0"?> 
-<info>
-	<id>calendar</id>
-	<name>Calendar</name>
-	<licence>AGPL</licence>
-	<author>Georg Ehrke, Bart Visscher, Jakob Sack</author>
-	<require>4</require>
-	<shipped>true</shipped>
-	<description>Calendar with CalDAV support</description>
-	<default_enable/>
-	<remote>
-		<calendar>appinfo/remote.php</calendar>
-		<caldav>appinfo/remote.php</caldav>
-	</remote>
-	<public>
-		<calendar>share.php</calendar>
-		<caldav>share.php</caldav>
-	</public>
-</info>
diff --git a/apps/calendar/appinfo/remote.php b/apps/calendar/appinfo/remote.php
deleted file mode 100644
index f499d90966..0000000000
--- a/apps/calendar/appinfo/remote.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?php
-/**
- * Copyright (c) 2011 Jakob Sack <mail@jakobsack.de>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-OCP\App::checkAppEnabled('calendar');
-
-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
-$RUNTIME_APPTYPES=array('authentication');
-OC_App::loadApps($RUNTIME_APPTYPES);
-
-// Backends
-$authBackend = new OC_Connector_Sabre_Auth();
-$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->disableListing = true; // Disable listening
-
-$calendarRoot = new OC_Connector_Sabre_CalDAV_CalendarRoot($principalBackend, $caldavBackend);
-$calendarRoot->disableListing = true; // Disable listening
-
-$nodes = array(
-	$Sabre_CalDAV_Principal_Collection,
-	$calendarRoot,
-	);
-
-// Fire up server
-$server = new Sabre_DAV_Server($nodes);
-$server->setBaseUri($baseuri);
-// Add plugins
-$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/appinfo/update.php b/apps/calendar/appinfo/update.php
deleted file mode 100644
index 0e11c99884..0000000000
--- a/apps/calendar/appinfo/update.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php
-
-$installedVersion=OCP\Config::getAppValue('calendar', 'installed_version');
-if (version_compare($installedVersion, '0.2.1', '<')) {
-	$stmt = OCP\DB::prepare( 'SELECT `id`, `calendarcolor` FROM `*PREFIX*calendar_calendars` WHERE `calendarcolor` IS NOT NULL' );
-	$result = $stmt->execute();
-	while( $row = $result->fetchRow()) {
-		$id = $row['id'];
-		$color = $row['calendarcolor'];
-		if ($color[0] == '#' || strlen($color) < 6) {
-			continue;
-		}
-		$color = '#' .$color;
-		$stmt = OCP\DB::prepare( 'UPDATE `*PREFIX*calendar_calendars` SET `calendarcolor`=? WHERE `id`=?' );
-		$r = $stmt->execute(array($color,$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
diff --git a/apps/calendar/appinfo/version b/apps/calendar/appinfo/version
deleted file mode 100644
index cb0c939a93..0000000000
--- a/apps/calendar/appinfo/version
+++ /dev/null
@@ -1 +0,0 @@
-0.5.2
diff --git a/apps/calendar/caldav.php b/apps/calendar/caldav.php
deleted file mode 100644
index 7b811d3cdf..0000000000
--- a/apps/calendar/caldav.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-if(!file_exists('../../lib/base.php')){
-	die('Please update the path to /lib/base.php in caldav.php or make use of /remote.php/caldav/');
-}
-require_once('../../lib/base.php');
-require_once('appinfo/remote.php');
\ No newline at end of file
diff --git a/apps/calendar/calendar.php b/apps/calendar/calendar.php
deleted file mode 100644
index 2c0bee9d23..0000000000
--- a/apps/calendar/calendar.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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/import.css b/apps/calendar/css/import.css
deleted file mode 100644
index fd82006072..0000000000
--- a/apps/calendar/css/import.css
+++ /dev/null
@@ -1,14 +0,0 @@
-/**
- * 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: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;margin-top: 5px;}
\ No newline at end of file
diff --git a/apps/calendar/css/style.css b/apps/calendar/css/style.css
deleted file mode 100644
index 64a779b9a9..0000000000
--- a/apps/calendar/css/style.css
+++ /dev/null
@@ -1,142 +0,0 @@
-/**
- * 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.
- */
-
-#view { float: left; font-size: 12px; height: 100%;}
-#datecontrol {text-align: center;}
-#datecontrol_left{font-size: 12px;}
-#datecontrol_right{font-size: 12px;}
-#datecontrol_date_label {margin: 0; padding: 0; font-size: 12px;}
-#choosecalendar {margin-right: 170px; float: right; font-size: 12px;}
-
-#choosecalendar_dialog {display: none;}
-#newentry_dialog {display: none;}
-#editentry_dialog {display: none;}
-#parsingfail_dialog{display: none;}
-
-#loading { display: none;margin: 0;padding:0;margin-top:5px;}
-
-#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;}
-#listview #events {width:25em;padding: 4px;}
-#listview #events .day {width:auto;padding-left:10px;border-bottom: 2px solid #EEEEEE;text-align:left;}
-
-.actions {height: 33px;	min-width: 800px;}
-.controls {min-width: 800px;}
-.center {text-align: center;}
-.dateinfo {height: 20px;width: 100%; overflow: hidden; margin-top: 0; padding: 0; font-size: 12px;background: #F7F7F7;}
-.events {width: 100%; margin: 0; padding: 0;min-height: 100px;}
-.calendar_row {height: 20px; text-align: center;background: #ffffff;}
-#oneweekview .calendar_row {width: 13.5%;}
-.calendar_time {height: 20px; width: 50px; text-align:right;background: #ffffff;}
-.day {text-align: center; background: #ffffff; margin: 0; padding: 0; vertical-align: top; width: 14%; height: 22%;}
-.weekend {background: #F3F3F3; }
-.weekend_thead, .weekend_row{height: 20px;text-align: center;text-align: center;background: #F3F3F3;}
-.thisday{background: #FFFABC;}
-.event {position:relative;}
-.event.colored {border-bottom: 1px solid white;}
-
-input[type="button"].active {color: #6193CF}
-#fromtime, #totime {
-color:#333;
-}
-#fromtime.disabled, #totime.disabled {
-color:#A9A9A9;
-}
-select#category{width:140px;}
-button.category{margin:0 3px;}
-
-.calendar-colorpicker-color{display:inline-block;width:20px;height:20px;margin-right:2px;cursor:pointer;border:2px solid transparent;}
-.calendar-colorpicker-color.active{border:2px solid black;}
-
-#event {padding: 0;margin: 0;margin-top:-5px}
-
-.calendar_share_dropdown{ display:block;  position:absolute; z-index:100; width:16em; right:0; margin-right:7em; background:#F8F8F8; 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:0 0 1em 1em; -webkit-border-radius:0 0 1em 1em; border-radius:0 0 1em 1em;}
-
-.fc-list-table
-{
-    margin: 10px;
-    border-style: hidden;
-    border-width: 10px;
-    padding: 10px;
-    vertical-align: top;
-    width: 100%;
-}
-.fc-list-table tr:hover
-{
-    color: #0000FF;
-    background-color: #CCFFCC;
-}
-
-
-.fc-list-date
-{
-    margin: 16px;
-    white-space: nowrap;
-    text-align: left;
-    width: 100%;
-    background-color: #808080;
-    color: #FFFFFF;
-    font-weight: bold;
-    font-family: Arial, Helvetica, sans-serif;
-}
-.fc-list-time
-{
-    text-align: center;
-    white-space: nowrap;
-    width: 1%;
-}
-
-.fc-list-event
-{
-     text-align: left;
-}
-
-.fc-list-event .fc-event-title
-{
-     cursor: pointer;
-}
-.tipsy-event .tipsy-inner{
-background-color:#0098E4;
-border:2px solid #1d2d44;
-max-width:400px;
-padding:0;
-}
-.tipsy-event .tipsy-arrow-s{
-border-top-color:#1d2d44;
-}
-.tipsy-event .tipsy-arrow-n{
-border-bottom-color:#1d2d44;
-}
-.tipsy-event .summary,
-.tipsy-event .timespan,
-.tipsy-event .description{
-padding:0 8px;
-}
-.tipsy-event .summary{
-background-color:#1d2d44;
-font-size:1.2em;
-font-weight:bold;
-text-align:left;
-padding:0 8px 2px;
-}
-.tipsy-event .description{
-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/export.php b/apps/calendar/export.php
deleted file mode 100644
index 1374c49cc0..0000000000
--- a/apps/calendar/export.php
+++ /dev/null
@@ -1,30 +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\User::checkLoggedIn();
-OCP\App::checkAppEnabled('calendar');
-$cal = isset($_GET['calid']) ? $_GET['calid'] : NULL;
-$event = isset($_GET['eventid']) ? $_GET['eventid'] : NULL;
-if(isset($cal)){
-	$calendar = OC_Calendar_App::getCalendar($cal, true);
-	if(!$calendar){
-		header('HTTP/1.0 404 Not Found');
-		exit;
-	}
-	header('Content-Type: text/Calendar');
-	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);
-	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($event, OC_Calendar_Export::EVENT);
-}
\ No newline at end of file
diff --git a/apps/calendar/img/Icon License b/apps/calendar/img/Icon License
deleted file mode 100644
index b1b292ace6..0000000000
--- a/apps/calendar/img/Icon License	
+++ /dev/null
@@ -1,2 +0,0 @@
-http://thenounproject.com/noun/calendar/#icon-No404
-Creative Commons BY 3.0
\ No newline at end of file
diff --git a/apps/calendar/img/icon.png b/apps/calendar/img/icon.png
deleted file mode 100644
index 267efd997f362de92545b177071eeaac0cb5bdf5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 360
zcmeAS@N?(olHy`uVBq!ia0vp^d_XL~!3HGNrubO_DaPU;cPEB*=VV?2Ic!PZ?k)`f
zL2$v|<&%LToCO|{#X#-XL734=V|E2lkiEpy*OmPaBM+~X`r$+yd7#h>PZ!4!jq^({
z*?KuUO0+&q=Z<Xfz0>$|i?9B-q=kx86O@+(7^H5v<mMrL$8pOkJ&_XetP}j4URx}W
zN-#SaeK_><o+b0)JEz~5cE{FVm&*&Qh+grCvG>U&w{NRnHo4b47S^vg7xSqlye9SC
zVWq>?euX<9J#hVIXQaO%w4i6R>h&(`$fA4Kjz~<saM15l;))}sUH2s1j=tWuac+&k
zk*(eLIMOoO>f{!6?!M6TT70jhPawaojB0#qRm}PqzUI4Lv249?wC+>oile37_gJ1C
z-7fjSYNvQqVe=yM`!7}<Hs#}cSa)>)Px-y_mHm0VU-W~;fqrK2boFyt=akR{0A(SP
A{Qv*}

diff --git a/apps/calendar/img/icon.svg b/apps/calendar/img/icon.svg
deleted file mode 100644
index 211f74df06..0000000000
--- a/apps/calendar/img/icon.svg
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-
-<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"
-   version="1.1"
-   id="Layer_1"
-   x="0px"
-   y="0px"
-   width="14px"
-   height="16px"
-   viewBox="0 0 88 100"
-   enable-background="new 0 0 88 100"
-   xml:space="preserve"
-   inkscape:version="0.48.1 r9760"
-   sodipodi:docname="icon.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><defs
-   id="defs9" /><sodipodi:namedview
-   pagecolor="#ffffff"
-   bordercolor="#666666"
-   borderopacity="1"
-   objecttolerance="10"
-   gridtolerance="10"
-   guidetolerance="10"
-   inkscape:pageopacity="0"
-   inkscape:pageshadow="2"
-   inkscape:window-width="1680"
-   inkscape:window-height="1004"
-   id="namedview7"
-   showgrid="false"
-   inkscape:zoom="19.125"
-   inkscape:cx="7"
-   inkscape:cy="8"
-   inkscape:window-x="-2"
-   inkscape:window-y="23"
-   inkscape:window-maximized="1"
-   inkscape:current-layer="Layer_1" />
-<path
-   d="M0,32v59.906C0,96.377,3.582,100,8,100h72c4.418,0,8-3.623,8-8.094V32H0z M22,94H6V78h16V94z M22,74H6V58h16V74z M22,54H6  V38h16V54z M42,94H26V78h16V94z M42,74H26V58h16V74z M42,54H26V38h16V54z M62,94H46V78h16V94z M62,74H46V58h16V74z M62,54H46V38h16  V54z M82,94H66V78h16V94z M82,74H66V58h16V74z M82,54H66V38h16V54z"
-   id="path3"
-   style="fill:#4d4d4d" />
-<path
-   d="M80,12H67V3c0-1.657-1.344-3-3-3c-1.657,0-3,1.343-3,3v9H27V3c0-1.657-1.344-3-3-3c-1.657,0-3,1.343-3,3v9H8  c-4.418,0-8,3.623-8,8.093V27v0v1h88v-1v0v-6.907C88,15.623,84.418,12,80,12z M24,26c-3.313,0-6-2.687-6-6  c0-2.219,1.209-4.152,3-5.19V20c0,1.657,1.343,3,3,3c1.656,0,3-1.343,3-3v-5.191c1.792,1.038,3,2.972,3,5.191  C30,23.313,27.314,26,24,26z M64,26c-3.313,0-6-2.687-6-6c0-2.219,1.209-4.152,3-5.19V20c0,1.657,1.343,3,3,3c1.656,0,3-1.343,3-3  v-5.191c1.792,1.038,3,2.972,3,5.191C70,23.313,67.314,26,64,26z"
-   id="path5"
-   style="fill:#4d4d4d" />
-</svg>
\ No newline at end of file
diff --git a/apps/calendar/index.php b/apps/calendar/index.php
deleted file mode 100644
index a8ad4ab335..0000000000
--- a/apps/calendar/index.php
+++ /dev/null
@@ -1,71 +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.
- */
-OCP\User::checkLoggedIn();
-OCP\App::checkAppEnabled('calendar');
-
-// Create default calendar ...
-$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);
-}
-
-$eventSources = array();
-foreach($calendars as $calendar){
-	if($calendar['active'] == 1) {
-		$eventSources[] = OC_Calendar_Calendar::getEventSourceInfo($calendar);
-	}
-}
-
-$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();
-
-//Fix currentview for fullcalendar
-if(OCP\Config::getUserValue(OCP\USER::getUser(), 'calendar', 'currentview', 'month') == "oneweekview"){
-	OCP\Config::setUserValue(OCP\USER::getUser(), "calendar", "currentview", "agendaWeek");
-}
-if(OCP\Config::getUserValue(OCP\USER::getUser(), 'calendar', 'currentview', 'month') == "onemonthview"){
-	OCP\Config::setUserValue(OCP\USER::getUser(), "calendar", "currentview", "month");
-}
-if(OCP\Config::getUserValue(OCP\USER::getUser(), 'calendar', 'currentview', 'month') == "listview"){
-	OCP\Config::setUserValue(OCP\USER::getUser(), "calendar", "currentview", "list");
-}
-
-OCP\Util::addscript('3rdparty/fullcalendar', 'fullcalendar');
-OCP\Util::addStyle('3rdparty/fullcalendar', 'fullcalendar');
-OCP\Util::addscript('3rdparty/timepicker', 'jquery.ui.timepicker');
-OCP\Util::addStyle('3rdparty/timepicker', 'jquery.ui.timepicker');
-if(OCP\Config::getUserValue(OCP\USER::getUser(), "calendar", "timezone") == null || OCP\Config::getUserValue(OCP\USER::getUser(), 'calendar', 'timezonedetection') == 'true'){
-	OCP\Util::addscript('calendar', 'geo');
-}
-OCP\Util::addscript('calendar', 'calendar');
-OCP\Util::addStyle('calendar', 'style');
-OCP\Util::addscript('', 'jquery.multiselect');
-OCP\Util::addStyle('', 'jquery.multiselect');
-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,false);
-$tmpl->assign('categories', $categories);
-if(array_key_exists('showevent', $_GET)){
-	$tmpl->assign('showevent', $_GET['showevent'], false);
-}
-$tmpl->printPage();
diff --git a/apps/calendar/js/calendar.js b/apps/calendar/js/calendar.js
deleted file mode 100644
index 23846c89b8..0000000000
--- a/apps/calendar/js/calendar.js
+++ /dev/null
@@ -1,935 +0,0 @@
-/**
- * Copyright (c) 2012 Georg Ehrke <ownclouddev at georgswebsite dot de>
- * 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.
- */
-
-Calendar={
-	UI:{
-		loading: function(isLoading){
-			if (isLoading){
-				$('#loading').show();
-			}else{
-				$('#loading').hide();
-			}
-		},
-		startEventDialog:function(){
-			Calendar.UI.loading(false);
-			$('.tipsy').remove();
-			$('#fullcalendar').fullCalendar('unselect');
-			Calendar.UI.lockTime();
-			$( "#from" ).datepicker({
-				dateFormat : 'dd-mm-yy'
-			});
-			$( "#to" ).datepicker({
-				dateFormat : 'dd-mm-yy'
-			});
-			$('#fromtime').timepicker({
-			    showPeriodLabels: false
-			});
-			$('#totime').timepicker({
-			    showPeriodLabels: false
-			});
-			$('#category').multiple_autocomplete({source: categories});
-			Calendar.UI.repeat('init');
-			$('#end').change(function(){
-				Calendar.UI.repeat('end');
-			});
-			$('#repeat').change(function(){
-				Calendar.UI.repeat('repeat');
-			});
-			$('#advanced_year').change(function(){
-				Calendar.UI.repeat('year');
-			});
-			$('#advanced_month').change(function(){
-				Calendar.UI.repeat('month');
-			});
-			$( "#event" ).tabs({ selected: 0});
-			$('#event').dialog({
-				width : 500,
-				height: 600,
-				close : function(event, ui) {
-					$(this).dialog('destroy').remove();
-				}
-			});
-		},
-		newEvent:function(start, end, allday){
-			start = Math.round(start.getTime()/1000);
-			if (end){
-				end = Math.round(end.getTime()/1000);
-			}
-			if($('#event').dialog('isOpen') == true){
-				// TODO: save event
-				$('#event').dialog('destroy').remove();
-			}else{
-				Calendar.UI.loading(true);
-				$('#dialog_holder').load(OC.filePath('calendar', 'ajax/event', 'new.form.php'), {start:start, end:end, allday:allday?1:0}, Calendar.UI.startEventDialog);
-			}
-		},
-		editEvent:function(calEvent, jsEvent, view){
-			if (calEvent.editable == false || calEvent.source.editable == false) {
-				return;
-			}
-			var id = calEvent.id;
-			if($('#event').dialog('isOpen') == true){
-				// TODO: save event
-				$('#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);
-			}
-		},
-		submitDeleteEventForm:function(url){
-			var post = $( '#event_form' ).serialize();
-			$('#errorbox').empty();
-			Calendar.UI.loading(true);
-			$.post(url, post, function(data){
-					Calendar.UI.loading(false);
-					if(data.status == 'success'){
-						$('#fullcalendar').fullCalendar('removeEvents', $('#event_form input[name=id]').val());
-						$('#event').dialog('destroy').remove();
-					} else {
-						$('#errorbox').html(t('calendar', 'Deletion failed'));
-					}
-
-			}, "json");
-		},
-		validateEventForm:function(url){
-			var post = $( "#event_form" ).serialize();
-			$("#errorbox").empty();
-			Calendar.UI.loading(true);
-			$.post(url, post,
-				function(data){
-					Calendar.UI.loading(false);
-					if(data.status == "error"){
-						var output = missing_field + ": <br />";
-						if(data.title == "true"){
-							output = output + missing_field_title + "<br />";
-						}
-						if(data.cal == "true"){
-							output = output + missing_field_calendar + "<br />";
-						}
-						if(data.from == "true"){
-							output = output + missing_field_fromdate + "<br />";
-						}
-						if(data.fromtime == "true"){
-							output = output + missing_field_fromtime + "<br />";
-						}
-						if(data.to == "true"){
-							output = output + missing_field_todate + "<br />";
-						}
-						if(data.totime == "true"){
-							output = output + missing_field_totime + "<br />";
-						}
-						if(data.endbeforestart == "true"){
-							output = output + missing_field_startsbeforeends + "!<br/>";
-						}
-						if(data.dberror == "true"){
-							output = "There was a database fail!";
-						}
-						$("#errorbox").html(output);
-					} else
-					if(data.status == 'success'){
-						$('#event').dialog('destroy').remove();
-						$('#fullcalendar').fullCalendar('refetchEvents');
-					}
-				},"json");
-		},
-		moveEvent:function(event, dayDelta, minuteDelta, allDay, revertFunc){
-			$('.tipsy').remove();
-			Calendar.UI.loading(true);
-			$.post(OC.filePath('calendar', 'ajax/event', 'move.php'), { id: event.id, dayDelta: dayDelta, minuteDelta: minuteDelta, allDay: allDay?1:0, lastmodified: event.lastmodified},
-			function(data) {
-				Calendar.UI.loading(false);
-				if (data.status == 'success'){
-					event.lastmodified = data.lastmodified;
-					console.log("Event moved successfully");
-				}else{
-					revertFunc();
-					$('#fullcalendar').fullCalendar('refetchEvents');
-				}
-			});
-		},
-		resizeEvent:function(event, dayDelta, minuteDelta, revertFunc){
-			$('.tipsy').remove();
-			Calendar.UI.loading(true);
-			$.post(OC.filePath('calendar', 'ajax/event', 'resize.php'), { id: event.id, dayDelta: dayDelta, minuteDelta: minuteDelta, lastmodified: event.lastmodified},
-			function(data) {
-				Calendar.UI.loading(false);
-				if (data.status == 'success'){
-					event.lastmodified = data.lastmodified;
-					console.log("Event resized successfully");
-				}else{
-					revertFunc();
-					$('#fullcalendar').fullCalendar('refetchEvents');
-				}
-			});
-		},
-		showadvancedoptions:function(){
-			$("#advanced_options").slideDown('slow');
-			$("#advanced_options_button").css("display", "none");
-		},
-		showadvancedoptionsforrepeating:function(){
-			if($("#advanced_options_repeating").is(":hidden")){
-				$('#advanced_options_repeating').slideDown('slow');
-			}else{
-				$('#advanced_options_repeating').slideUp('slow');
-			}
-		},
-		getEventPopupText:function(event){
-			if (event.allDay){
-				var timespan = $.fullCalendar.formatDates(event.start, event.end, 'ddd d MMMM[ yyyy]{ -[ddd d] MMMM yyyy}', {monthNamesShort: monthNamesShort, monthNames: monthNames, dayNames: dayNames, dayNamesShort: dayNamesShort}); //t('calendar', "ddd d MMMM[ yyyy]{ -[ddd d] MMMM yyyy}")
-			}else{
-				var timespan = $.fullCalendar.formatDates(event.start, event.end, 'ddd d MMMM[ yyyy] ' + defaulttime + '{ -[ ddd d MMMM yyyy]' + defaulttime + '}', {monthNamesShort: monthNamesShort, monthNames: monthNames, dayNames: dayNames, dayNamesShort: dayNamesShort}); //t('calendar', "ddd d MMMM[ yyyy] HH:mm{ -[ ddd d MMMM yyyy] HH:mm}")
-				// Tue 18 October 2011 08:00 - 16:00
-			}
-			var html =
-				'<div class="summary">' + event.title + '</div>' +
-				'<div class="timespan">' + timespan + '</div>';
-			if (event.description){
-				html += '<div class="description">' + event.description + '</div>';
-			}
-			return html;
-		},
-		lockTime:function(){
-			if($('#allday_checkbox').is(':checked')) {
-				$("#fromtime").attr('disabled', true)
-					.addClass('disabled');
-				$("#totime").attr('disabled', true)
-					.addClass('disabled');
-			} else {
-				$("#fromtime").attr('disabled', false)
-					.removeClass('disabled');
-				$("#totime").attr('disabled', false)
-					.removeClass('disabled');
-			}
-		},
-		showCalDAVUrl:function(username, calname){
-			$('#caldav_url').val(totalurl + '/' + username + '/' + decodeURIComponent(calname));
-			$('#caldav_url').show();
-			$("#caldav_url_close").show();
-		},
-		initScroll:function(){
-			if(window.addEventListener)
-				document.addEventListener('DOMMouseScroll', Calendar.UI.scrollCalendar, false);
-			//}else{
-				document.onmousewheel = Calendar.UI.scrollCalendar;
-			//}
-		},
-		scrollCalendar:function(event){
-			$('.tipsy').remove();
-			var direction;
-			if(event.detail){
-				if(event.detail < 0){
-					direction = 'top';
-				}else{
-					direction = 'down';
-				}
-			}
-			if (event.wheelDelta){
-				if(event.wheelDelta > 0){
-					direction = 'top';
-				}else{
-					direction = 'down';
-				}
-			}
-			var scroll = $(document).scrollTop(),
-				doc_height = $(document).height(),
-				win_height = $(window).height();
-			if(direction == 'down' && win_height == (doc_height - scroll)){
-				$('#fullcalendar').fullCalendar('next');
-				$(document).scrollTop(0);
-				event.preventDefault();
-			}else if (direction == 'top' && scroll == 0) {
-				$('#fullcalendar').fullCalendar('prev');
-				$(document).scrollTop(win_height);
-				event.preventDefault();
-			}
-		},
-		repeat:function(task){
-			if(task=='init'){
-				$('#byweekno').multiselect({
-					header: false,
-					noneSelectedText: $('#advanced_byweekno').attr('title'),
-					selectedList: 2,
-					minWidth:'auto'
-				});
-				$('#weeklyoptions').multiselect({
-					header: false,
-					noneSelectedText: $('#weeklyoptions').attr('title'),
-					selectedList: 2,
-					minWidth:'auto'
-				});
-				$('input[name="bydate"]').datepicker({
-					dateFormat : 'dd-mm-yy'
-				});
-				$('#byyearday').multiselect({
-					header: false,
-					noneSelectedText: $('#byyearday').attr('title'),
-					selectedList: 2,
-					minWidth:'auto'
-				});
-				$('#bymonth').multiselect({
-					header: false,
-					noneSelectedText: $('#bymonth').attr('title'),
-					selectedList: 2,
-					minWidth:'auto'
-				});
-				$('#bymonthday').multiselect({
-					header: false,
-					noneSelectedText: $('#bymonthday').attr('title'),
-					selectedList: 2,
-					minWidth:'auto'
-				});
-				Calendar.UI.repeat('end');
-				Calendar.UI.repeat('month');
-				Calendar.UI.repeat('year');
-				Calendar.UI.repeat('repeat');
-			}
-			if(task == 'end'){
-				$('#byoccurrences').css('display', 'none');
-				$('#bydate').css('display', 'none');
-				if($('#end option:selected').val() == 'count'){
-					$('#byoccurrences').css('display', 'block');
-				}
-				if($('#end option:selected').val() == 'date'){
-					$('#bydate').css('display', 'block');
-				}
-			}
-			if(task == 'repeat'){
-				$('#advanced_month').css('display', 'none');
-				$('#advanced_weekday').css('display', 'none');
-				$('#advanced_weekofmonth').css('display', 'none');
-				$('#advanced_byyearday').css('display', 'none');
-				$('#advanced_bymonth').css('display', 'none');
-				$('#advanced_byweekno').css('display', 'none');
-				$('#advanced_year').css('display', 'none');
-				$('#advanced_bymonthday').css('display', 'none');
-				if($('#repeat option:selected').val() == 'monthly'){
-					$('#advanced_month').css('display', 'block');
-					Calendar.UI.repeat('month');
-				}
-				if($('#repeat option:selected').val() == 'weekly'){
-					$('#advanced_weekday').css('display', 'block');
-				}
-				if($('#repeat option:selected').val() == 'yearly'){
-					$('#advanced_year').css('display', 'block');
-					Calendar.UI.repeat('year');
-				}
-				if($('#repeat option:selected').val() == 'doesnotrepeat'){
-					$('#advanced_options_repeating').slideUp('slow');
-				}
-			}
-			if(task == 'month'){
-				$('#advanced_weekday').css('display', 'none');
-				$('#advanced_weekofmonth').css('display', 'none');
-				if($('#advanced_month_select option:selected').val() == 'weekday'){
-					$('#advanced_weekday').css('display', 'block');
-					$('#advanced_weekofmonth').css('display', 'block');
-				}
-			}
-			if(task == 'year'){
-				$('#advanced_weekday').css('display', 'none');
-				$('#advanced_byyearday').css('display', 'none');
-				$('#advanced_bymonth').css('display', 'none');
-				$('#advanced_byweekno').css('display', 'none');
-				$('#advanced_bymonthday').css('display', 'none');
-				if($('#advanced_year_select option:selected').val() == 'byyearday'){
-					//$('#advanced_byyearday').css('display', 'block');
-				}
-				if($('#advanced_year_select option:selected').val() == 'byweekno'){
-					$('#advanced_byweekno').css('display', 'block');
-				}
-				if($('#advanced_year_select option:selected').val() == 'bydaymonth'){
-					$('#advanced_bymonth').css('display', 'block');
-					$('#advanced_bymonthday').css('display', 'block');
-					$('#advanced_weekday').css('display', 'block');
-				}
-			}
-			
-		},
-		setViewActive: function(view){
-			$('#view input[type="button"]').removeClass('active');
-			var id;
-			switch (view) {
-				case 'agendaWeek':
-					id = 'oneweekview_radio';
-					break;
-				case 'month':
-					id = 'onemonthview_radio';
-					break;
-				case 'list':
-					id = 'listview_radio';
-					break;
-			}
-			$('#'+id).addClass('active');
-		},
-		categoriesChanged:function(newcategories){
-			categories = $.map(newcategories, function(v) {return v;});
-			console.log('Calendar categories changed to: ' + categories);
-			$('#category').multiple_autocomplete('option', 'source', categories);
-		},
-		Calendar:{
-			overview:function(){
-				if($('#choosecalendar_dialog').dialog('isOpen') == true){
-					$('#choosecalendar_dialog').dialog('moveToTop');
-				}else{
-					Calendar.UI.loading(true);
-					$('#dialog_holder').load(OC.filePath('calendar', 'ajax/calendar', 'overview.php'), function(){
-						$('#choosecalendar_dialog').dialog({
-							width : 600,
-							height: 400,
-							close : function(event, ui) {
-								$(this).dialog('destroy').remove();
-							}
-						});
-						Calendar.UI.loading(false);
-					});
-				}
-			},
-			activation:function(checkbox, calendarid)
-			{
-				Calendar.UI.loading(true);
-				$.post(OC.filePath('calendar', 'ajax/calendar', 'activation.php'), { calendarid: calendarid, active: checkbox.checked?1:0 },
-				  function(data) {
-					Calendar.UI.loading(false);
-					if (data.status == 'success'){
-						checkbox.checked = data.active == 1;
-						if (data.active == 1){
-							$('#fullcalendar').fullCalendar('addEventSource', data.eventSource);
-						}else{
-							$('#fullcalendar').fullCalendar('removeEventSource', data.eventSource.url);
-						}
-					}
-				  });
-			},
-			newCalendar:function(object){
-				var tr = $(document.createElement('tr'))
-					.load(OC.filePath('calendar', 'ajax/calendar', 'new.form.php'),
-						function(){Calendar.UI.Calendar.colorPicker(this)});
-				$(object).closest('tr').after(tr).hide();
-			},
-			edit:function(object, calendarid){
-				var tr = $(document.createElement('tr'))
-					.load(OC.filePath('calendar', 'ajax/calendar', 'edit.form.php'), {calendarid: calendarid},
-						function(){Calendar.UI.Calendar.colorPicker(this)});
-				$(object).closest('tr').after(tr).hide();
-			},
-			deleteCalendar:function(calid){
-				var check = confirm("Do you really want to delete this calendar?");
-				if(check == false){
-					return false;
-				}else{
-					$.post(OC.filePath('calendar', 'ajax/calendar', 'delete.php'), { calendarid: calid},
-					  function(data) {
-						if (data.status == 'success'){
-							var url = 'ajax/events.php?calendar_id='+calid;
-							$('#fullcalendar').fullCalendar('removeEventSource', url);
-							$('#choosecalendar_dialog').dialog('destroy').remove();
-							Calendar.UI.Calendar.overview();
-							$('#fullcalendar').fullCalendar('refetchEvents');
-						}
-					  });
-				}
-			},
-			submit:function(button, calendarid){
-				var displayname = $.trim($("#displayname_"+calendarid).val());
-				var active = $("#edit_active_"+calendarid+":checked").length;
-				var description = $("#description_"+calendarid).val();
-				var calendarcolor = $("#calendarcolor_"+calendarid).val();
-				if(displayname == ''){
-					$("#displayname_"+calendarid).css('background-color', '#FF2626');
-					$("#displayname_"+calendarid).focus(function(){
-						$("#displayname_"+calendarid).css('background-color', '#F8F8F8');
-					});
-				}
-				
-				var url;
-				if (calendarid == 'new'){
-					url = OC.filePath('calendar', 'ajax/calendar', 'new.php');
-				}else{
-					url = OC.filePath('calendar', 'ajax/calendar', 'update.php');
-				}
-				$.post(url, { id: calendarid, name: displayname, active: active, description: description, color: calendarcolor },
-					function(data){
-						if(data.status == 'success'){
-							$(button).closest('tr').prev().html(data.page).show().next().remove();
-							$('#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>');
-							}
-						}else{
-							$("#displayname_"+calendarid).css('background-color', '#FF2626');
-							$("#displayname_"+calendarid).focus(function(){
-								$("#displayname_"+calendarid).css('background-color', '#F8F8F8');
-							});
-						}
-					}, 'json');
-			},
-			cancel:function(button, calendarid){
-				$(button).closest('tr').prev().show().next().remove();
-			},
-			colorPicker:function(container){
-				// based on jquery-colorpicker at jquery.webspirited.com
-				var obj = $('.colorpicker', container);
-				var picker = $('<div class="calendar-colorpicker"></div>');
-				//build an array of colors
-				var colors = {};
-				$(obj).children('option').each(function(i, elm) {
-					colors[i] = {};
-					colors[i].color = $(elm).val();
-					colors[i].label = $(elm).text();
-				});
-				for (var i in colors) {
-					picker.append('<span class="calendar-colorpicker-color ' + (colors[i].color == $(obj).children(":selected").val() ? ' active' : '') + '" rel="' + colors[i].label + '" style="background-color: ' + colors[i].color + ';"></span>');
-				}
-				picker.delegate(".calendar-colorpicker-color", "click", function() {
-					$(obj).val($(this).attr('rel'));
-					$(obj).change();
-					picker.children('.calendar-colorpicker-color.active').removeClass('active');
-					$(this).addClass('active');
-				});
-				$(obj).after(picker);
-				$(obj).css({
-					position: 'absolute',
-					left: -10000
-				});
-			}
-		},
-		Share:{
-			currentid: 'false',
-			idtype: '',
-			activation:function(object,owner,id){
-				$.post(OC.filePath('calendar', 'ajax/share', 'activation.php'),{id:id, idtype:'calendar', activation:object.checked?1:0});
-				$('#fullcalendar').fullCalendar('refetchEvents');
-			},
-			dropdown:function(userid, calid){
-				$('.calendar_share_dropdown').remove();
-				var element = document.getElementById(userid+'_'+calid);
-				$('<div class="calendar_share_dropdown"></div>').appendTo(element);
-				$.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();
-					$('#share_group').chosen();
-				});
-				Calendar.UI.Share.currentid = calid;
-				Calendar.UI.Share.idtype = 'calendar';
-			},
-			share:function(id, idtype, sharewith, sharetype){
-				$.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');
-					}
-				});
-			},
-			unshare:function(id, idtype, sharewith, sharetype){
-				$.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');
-					}
-				});
-			},
-			changepermission:function(id, idtype, sharewith, sharetype, permission){
-				$.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(){
-					$('.calendar_share_dropdown').hide('blind', function(){
-						$('.calendar_share_dropdown').remove();
-					});
-				});
-				$('#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.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');
-							Calendar.UI.Share.unshare(Calendar.UI.Share.currentid, Calendar.UI.Share.idtype, $(this).parent().text(), 'user' );
-							$("#share_user").trigger("liszt:updated");
-							$(this).parent().remove();
-						});
-						$('#share_user option:selected').attr('disabled', 'disabled');
-						$("#share_user").trigger("liszt:updated");
-					}
-				});
-				$('#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.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');
-							Calendar.UI.Share.unshare(Calendar.UI.Share.currentid, Calendar.UI.Share.idtype, $(this).parent().text(), 'group');
-							$("#share_group").trigger("liszt:updated");
-							$(this).parent().remove();
-						});
-						$('#share_group option:selected').attr('disabled', 'disabled');
-						$("#share_group").trigger("liszt:updated");
-					}
-				});
-				$('#sharewithuser_list > li > input:checkbox').live('change', function(){
-					Calendar.UI.Share.changepermission(Calendar.UI.Share.currentid, Calendar.UI.Share.idtype, $(this).parent().text(), 'user', this.checked);
-				});
-				$('#sharewithgroup_list > li > input:checkbox').live('change', function(){
-					Calendar.UI.Share.changepermission(Calendar.UI.Share.currentid, Calendar.UI.Share.idtype, $(this).parent().text(), 'group', this.checked);
-				});
-				$('#publish').live('change', function(){
-					if(this.checked == 1){
-						Calendar.UI.Share.share(Calendar.UI.Share.currentid, Calendar.UI.Share.idtype, '', 'public');
-					}else{
-						Calendar.UI.Share.unshare(Calendar.UI.Share.currentid, Calendar.UI.Share.idtype, '', 'public');
-					}
-				});
-				$('#sharewithuser_list').live('mouseenter', function(){
-					$('#sharewithuser_list > li > img').css('display', 'block');
-					$('#sharewithuser_list > li > input').css('visibility', 'visible');
-				});
-				$('#sharewithuser_list').live('mouseleave', function(){
-					$('#sharewithuser_list > li > img').css('display', 'none');
-					$('#sharewithuser_list > li > input').css('visibility', 'hidden');
-				});
-				$('#sharewithgroup_list').live('mouseenter', function(){
-					$('#sharewithgroup_list > li > img').css('display', 'block');
-					$('#sharewithgroup_list > li > input').css('visibility', 'visible');
-				});
-				$('#sharewithgroup_list').live('mouseleave', function(){
-					$('#sharewithgroup_list > li > img').css('display', 'none');
-					$('#sharewithgroup_list > li > input').css('visibility', 'hidden');
-				});
-				/*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('fullcalendar');
-				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){
-						Calendar.UI.Drop.import(event.target.result);
-						$('#fullcalendar').fullCalendar('refetchEvents');
-					}
-					reader.readAsDataURL(file);
-				}
-			},
-			import:function(data){
-				$.post(OC.filePath('calendar', 'ajax/import', 'dropimport.php'), {'data':data},function(result) {
-					if(result.status == 'success'){
-						$('#fullcalendar').fullCalendar('addEventSource', result.eventSource);
-						$('#notification').html(result.message);
-						$('#notification').slideDown();
-						window.setTimeout(function(){$('#notification').slideUp();}, 5000);
-						return true;
-					}else{
-						$('#notification').html(result.message);
-						$('#notification').slideDown();
-						window.setTimeout(function(){$('#notification').slideUp();}, 5000);
-					}
-				});
-			}
-		}
-	},
-	Settings:{
-		//
-	},
-	
-}
-$.fullCalendar.views.list = ListView;
-function ListView(element, calendar) {
-	var t = this;
-
-	// imports
-	jQuery.fullCalendar.views.month.call(t, element, calendar);
-	var opt = t.opt;
-	var trigger = t.trigger;
-	var eventElementHandlers = t.eventElementHandlers;
-	var reportEventElement = t.reportEventElement;
-	var formatDate = calendar.formatDate;
-	var formatDates = calendar.formatDates;
-	var addDays = $.fullCalendar.addDays;
-	var cloneDate = $.fullCalendar.cloneDate;
-	function skipWeekend(date, inc, excl) {
-		inc = inc || 1;
-		while (!date.getDay() || (excl && date.getDay()==1 || !excl && date.getDay()==6)) {
-			addDays(date, inc);
-		}
-		return date;
-	}
-
-	// overrides
-	t.name='list';
-	t.render=render;
-	t.renderEvents=renderEvents;
-	t.setHeight=setHeight;
-	t.setWidth=setWidth;
-	t.clearEvents=clearEvents;
-
-	function setHeight(height, dateChanged) {
-	}
-
-	function setWidth(width) {
-	}
-
-	function clearEvents() {
-		this.reportEventClear();
-	}
-
-	// main
-	function sortEvent(a, b) {
-		return a.start - b.start;
-	}
-
-	function render(date, delta) {
-		if (!t.start){
-			t.start = addDays(cloneDate(date, true), -7);
-			t.end = addDays(cloneDate(date, true), 7);
-		}
-		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);
-				}
-			}
-		}
-		t.title = formatDates(
-			t.start,
-			t.end,
-			opt('titleFormat', 'week')
-		);
-		t.visStart = cloneDate(t.start);
-		t.visEnd = cloneDate(t.end);
-	}
-
-	function eventsOfThisDay(events, theDate) {
-		var start = cloneDate(theDate, true);
-		var end = addDays(cloneDate(start), 1);
-		var retArr = new Array();
-		for (i in events) {
-			var event_end = t.eventEnd(events[i]);
-			if (events[i].start < end && event_end >= start) {
-				retArr.push(events[i]);
-			}
-		}
-		return retArr;
-	}
-
-	function renderEvent(event) {
-		if (event.allDay) { //all day event
-			var time = opt('allDayText');
-		}
-		else {
-			var time = formatDates(event.start, event.end, opt('timeFormat', 'agenda'));
-		}
-		var classes = ['fc-event', 'fc-list-event'];
-		classes = classes.concat(event.className);
-		if (event.source) {
-			classes = classes.concat(event.source.className || []);
-		}
-		var html = '<tr>' +
-			'<td>&nbsp;</td>' +
-			'<td class="fc-list-time">' +
-			time +
-			'</td>' +
-			'<td>&nbsp;</td>' +
-			'<td class="fc-list-event">' +
-			'<span id="list' + event.id + '"' +
-			' class="' + classes.join(' ') + '"' +
-			'>' +
-			'<span class="fc-event-title">' +
-			event.title +
-			'</span>' +
-			'</span>' +
-			'</td>' +
-			'</tr>';
-		return html;
-	}
-
-	function renderDay(date, events) {
-		var dayRows = $('<tr>' +
-			'<td colspan="4" class="fc-list-date">' +
-			'<span>' +
-			formatDate(date, opt('titleFormat', 'day')) +
-			'</span>' +
-			'</td>' +
-			'</tr>');
-		for (i in events) {
-			var event = events[i];
-			var eventElement = $(renderEvent(event));
-			triggerRes = trigger('eventRender', event, event, eventElement);
-			if (triggerRes === false) {
-				eventElement.remove();
-			}else{
-				if (triggerRes && triggerRes !== true) {
-					eventElement.remove();
-					eventElement = $(triggerRes);
-				}
-				$.merge(dayRows, eventElement);
-				eventElementHandlers(event, eventElement);
-				reportEventElement(event, eventElement);
-			}
-		}
-		return dayRows;
-	}
-
-	function renderEvents(events, modifiedEventId) {
-		events = events.sort(sortEvent);
-
-		var table = $('<table class="fc-list-table"></table>');
-		var total = events.length;
-		if (total > 0) {
-			var date = cloneDate(t.visStart);
-			while (date <= t.visEnd) {
-				var dayEvents = eventsOfThisDay(events, date);
-				if (dayEvents.length > 0) {
-					table.append(renderDay(date, dayEvents));
-				}
-				date=addDays(date, 1);
-			}
-		}
-
-		this.element.html(table);
-	}
-}
-$(document).ready(function(){
-	Calendar.UI.initScroll();
-	$('#fullcalendar').fullCalendar({
-		header: false,
-		firstDay: firstDay,
-		editable: true,
-		defaultView: defaultView,
-		timeFormat: {
-			agenda: agendatime,
-			'': defaulttime
-			},
-		columnFormat: {
-			month: t('calendar', 'ddd'),    // Mon
-			week: t('calendar', 'ddd M/d'), // Mon 9/7
-			day: t('calendar', 'dddd M/d')  // Monday 9/7
-			},
-		titleFormat: {
-			month: t('calendar', 'MMMM yyyy'),
-					// September 2009
-			week: t('calendar', "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}"),
-					// Sep 7 - 13 2009
-			day: t('calendar', 'dddd, MMM d, yyyy'),
-					// Tuesday, Sep 8, 2009
-			},
-		axisFormat: defaulttime,
-		monthNames: monthNames,
-		monthNamesShort: monthNamesShort,
-		dayNames: dayNames,
-		dayNamesShort: dayNamesShort,
-		allDayText: allDayText,
-		viewDisplay: function(view) {
-			$('#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;
-			}
-			Calendar.UI.setViewActive(view.name);
-			if (view.name == 'agendaWeek') {
-				$('#fullcalendar').fullCalendar('option', 'aspectRatio', 0.1);
-			}
-			else {
-				$('#fullcalendar').fullCalendar('option', 'aspectRatio', 1.35);
-			}
-		},
-		columnFormat: {
-		    week: 'ddd d. MMM'
-		},
-		selectable: true,
-		selectHelper: true,
-		select: Calendar.UI.newEvent,
-		eventClick: Calendar.UI.editEvent,
-		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.tipsy({
-				className: 'tipsy-event',
-				opacity: 0.9,
-				gravity:$.fn.tipsy.autoBounds(150, 's'),
-				fade:true,
-				delayIn: 400,
-				html:true,
-				title:function() {
-					return Calendar.UI.getEventPopupText(event);
-				}
-			});
-		},
-		loading: Calendar.UI.loading,
-		eventSources: eventSources
-	});
-	$('#datecontrol_date').datepicker({
-		changeMonth: true,
-		changeYear: true,
-		showButtonPanel: true,
-		beforeShow: function(input, inst) {
-			var calendar_holder = $('#fullcalendar');
-			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');
-			$('#fullcalendar').fullCalendar('gotoDate', date);
-		}
-	});
-	fillWindow($('#content'));
-	OCCategories.changed = Calendar.UI.categoriesChanged;
-	OCCategories.app = 'calendar';
-	$('#oneweekview_radio').click(function(){
-		$('#fullcalendar').fullCalendar('changeView', 'agendaWeek');
-	});
-	$('#onemonthview_radio').click(function(){
-		$('#fullcalendar').fullCalendar('changeView', 'month');
-	});
-	$('#listview_radio').click(function(){
-		$('#fullcalendar').fullCalendar('changeView', 'list');
-	});
-	$('#today_input').click(function(){
-		$('#fullcalendar').fullCalendar('today');
-	});
-	$('#datecontrol_left').click(function(){
-		$('#fullcalendar').fullCalendar('prev');
-	});
-	$('#datecontrol_right').click(function(){
-		$('#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/geo.js b/apps/calendar/js/geo.js
deleted file mode 100644
index 99290d940e..0000000000
--- a/apps/calendar/js/geo.js
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * 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.
- */
-if (navigator.geolocation) { 
-	navigator.geolocation.getCurrentPosition(function(position) {
-		$.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);
-				$('#notification').slideDown();
-				window.setTimeout(function(){$('#notification').slideUp();}, 5000);
-			}else{
-				console.log('Can\'t set new timezone.');
-			}
-		});
-	});
-}
\ No newline at end of file
diff --git a/apps/calendar/js/loader.js b/apps/calendar/js/loader.js
deleted file mode 100644
index 253abafc42..0000000000
--- a/apps/calendar/js/loader.js
+++ /dev/null
@@ -1,179 +0,0 @@
-/**
- * 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={
-	Store:{
-		file: '',
-		path: '',
-		id: 0,
-		method: '',
-		calname: '',
-		calcolor: '',
-		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>');
-			$('#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(){
-			Calendar_Import.reset();
-			$(this).dialog('destroy').remove();
-			$('#calendar_import_dialog').remove();
-		},
-		init: function(){
-			//init dialog
-			$('#calendar_import_dialog').dialog({
-				width : 500,
-				resizable: false,
-				close : function() {
-					Calendar_Import.Dialog.close();
-				}
-			});
-			//init buttons
-			$('#calendar_import_done').click(function(){
-				Calendar_Import.Dialog.close();
-			});
-			$('#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');
-					Calendar_Import.Dialog.mergewarning($('#calendar_import_newcalendar').val());
-				}else{
-					$('#calendar_import_newcalform').slideUp('slow');
-					$('#calendar_import_mergewarning').slideUp('slow');
-				}
-			});
-			$('#calendar_import_newcalendar').keyup(function(){
-				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});
-			Calendar_Import.Store.progresskey = $('#calendar_import_progresskey').val();
-		},
-		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(){
-			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{
-					$('#calendar_import_progressbar').progressbar('option', 'value', 100);
-					$('#calendar_import_progressbar > div').css('background-color', '#FF2626');
-					$('#calendar_import_status').html(data.message);
-				}
-			});
-			return 0;
-		},
-		warning: function(selector){
-			$(selector).addClass('calendar_import_warning');
-			$(selector).focus(function(){
-				$(selector).removeClass('calendar_import_warning');
-			});
-		}
-	},
-	Core:{
-		process: function(){
-			var validation = Calendar_Import.Core.prepare();
-			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(){
-			$.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), calcolor: String (Calendar_Import.Store.calcolor)}, 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_status').html(data.message);
-				}
-			});
-		},
-		prepare: function(){
-			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($('#calendar_import_newcalendar').val());
-				if(Calendar_Import.Store.calname == ''){
-					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';
-			}
-			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','importCalendar',  FileActions.PERMISSION_READ, '', Calendar_Import.Dialog.open); 
-		FileActions.setDefault('text/calendar','importCalendar');
-	};
-});
diff --git a/apps/calendar/js/settings.js b/apps/calendar/js/settings.js
deleted file mode 100644
index 20753a7b8f..0000000000
--- a/apps/calendar/js/settings.js
+++ /dev/null
@@ -1,66 +0,0 @@
-$(document).ready(function(){
-	$('#timezone').change( function(){
-		var post = $( '#timezone' ).serialize();
-		$.post( OC.filePath('calendar', 'ajax/settings', 'settimezone.php'), post, function(data){return;});
-		return false;
-	});
-	$('#timezone').chosen();
-	$('#timeformat').change( function(){
-		var data = $('#timeformat').serialize();
-		$.post( OC.filePath('calendar', 'ajax/settings', 'settimeformat.php'), data, function(data){
-			if(data == 'error'){
-				console.log('saving timeformat failed');
-			}
-		});
-	});
-	$('#firstday').change( function(){
-		var data = $('#firstday').serialize();
-		$.post( OC.filePath('calendar', 'ajax/settings', 'setfirstday.php'), data, function(data){
-			if(data == 'error'){
-				console.log('saving firstday failed');
-			}
-		});
-	});
-	$('#timezonedetection').change( function(){
-		var post = $('#timezonedetection').serialize();
-		$.post( OC.filePath('calendar', 'ajax/settings', 'timezonedetection.php'), post, function(data){
-			
-		});
-	});
-	$.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'){
-			$('#timezonedetection').attr('checked', 'checked');
-		}
-	});
-	$.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(){
-			calendarcachecheck();
-		});
-	});
-	calendarcachecheck();
-	
-});
-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', '#F8F8F8');
-			$('#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
diff --git a/apps/calendar/l10n/ar.php b/apps/calendar/l10n/ar.php
deleted file mode 100644
index 1ca5e0ead5..0000000000
--- a/apps/calendar/l10n/ar.php
+++ /dev/null
@@ -1,171 +0,0 @@
-<?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" => "إتصال",
-"Clients" => "الزبائن",
-"Deliverer" => "المرسل",
-"Holidays" => "عطلة",
-"Ideas" => "أفكار",
-"Journey" => "رحلة",
-"Jubilee" => "يوبيل",
-"Meeting" => "إجتماع",
-"Other" => "شيء آخر",
-"Personal" => "شخصي",
-"Projects" => "مشاريع",
-"Questions" => "اسئلة",
-"Work" => "العمل",
-"by" => "من قبل",
-"unnamed" => "غير مسمى",
-"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." => "تقويم",
-"Sun." => "أحد",
-"Mon." => "أثن.",
-"Tue." => "ثلا.",
-"Wed." => "أرب.",
-"Thu." => "خمي.",
-"Fri." => "جمع.",
-"Sat." => "سبت",
-"Jan." => "ك2",
-"Feb." => "شبا.",
-"Mar." => "آذا.",
-"Apr." => "نيس.",
-"May." => "أيا.",
-"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" => "اليوم",
-"Your calendars" => "جداولك الزمنيه",
-"CalDav Link" => "وصلة CalDav",
-"Shared calendars" => "جداول زمنيه مشتركه",
-"No shared calendars" => "لا يوجد جداول زمنيه مشتركه",
-"Share Calendar" => "شارك الجدول الزمني",
-"Download" => "تحميل",
-"Edit" => "تعديل",
-"Delete" => "حذف",
-"shared with you by" => "مشاركه من قبل",
-"New calendar" => "جدول زمني جديد",
-"Edit calendar" => "عادل الجدول الزمني",
-"Displayname" => "الاسم المرئي",
-"Active" => "حالي",
-"Calendar color" => "لون الجدول الزمني",
-"Save" => "إحفظ",
-"Submit" => "أرسل",
-"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" => "الاحداث",
-"create a new calendar" => "انشاء جدول زمني جديد",
-"Import a calendar file" => "أدخل ملف التقويم",
-"Name of new calendar" => "أسم الجدول الزمني الجديد",
-"Import" => "إدخال",
-"Close Dialog" => "أغلق الحوار",
-"Create a new event" => "إضافة حدث جديد",
-"View an event" => "شاهد الحدث",
-"No categories selected" => "لم يتم اختيار الفئات",
-"of" => "من",
-"at" => "في",
-"Timezone" => "المنطقة الزمنية",
-"24h" => "24 ساعة",
-"12h" => "12 ساعة",
-"Users" => "المستخدمين",
-"select users" => "اختر المستخدمين",
-"Editable" => "يمكن تعديله",
-"Groups" => "مجموعات",
-"select groups" => "اختر المجموعات",
-"make public" => "حدث عام"
-);
diff --git a/apps/calendar/l10n/bg_BG.php b/apps/calendar/l10n/bg_BG.php
deleted file mode 100644
index fc353ebef9..0000000000
--- a/apps/calendar/l10n/bg_BG.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<?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" => "Седмично",
-"Every Weekday" => "Всеки делничен ден",
-"Bi-Weekly" => "Двуседмично",
-"Monthly" => "Месечно",
-"Yearly" => "Годишно",
-"never" => "никога",
-"Monday" => "Понеделник",
-"Tuesday" => "Вторник",
-"Wednesday" => "Сряда",
-"Thursday" => "Четвъртък",
-"Friday" => "Петък",
-"Saturday" => "Събота",
-"Sunday" => "Неделя",
-"All day" => "Всички дни",
-"Missing fields" => "Липсват полета",
-"Title" => "Заглавие",
-"Week" => "Седмица",
-"Month" => "Месец",
-"List" => "Списък",
-"Today" => "Днес",
-"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" => "Ново събитие",
-"View an event" => "Преглед на събитие",
-"No categories selected" => "Няма избрани категории",
-"Timezone" => "Часова зона",
-"Groups" => "Групи"
-);
diff --git a/apps/calendar/l10n/ca.php b/apps/calendar/l10n/ca.php
deleted file mode 100644
index 9e267604e6..0000000000
--- a/apps/calendar/l10n/ca.php
+++ /dev/null
@@ -1,198 +0,0 @@
-<?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",
-"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",
-"Clients" => "Clients",
-"Deliverer" => "Remitent",
-"Holidays" => "Vacances",
-"Ideas" => "Idees",
-"Journey" => "Viatge",
-"Jubilee" => "Sant",
-"Meeting" => "Reunió",
-"Other" => "Altres",
-"Personal" => "Personal",
-"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",
-"Every Weekday" => "Cada setmana",
-"Bi-Weekly" => "Bisetmanalment",
-"Monthly" => "Mensualment",
-"Yearly" => "Cada any",
-"never" => "mai",
-"by occurrences" => "per aparicions",
-"by date" => "per data",
-"by monthday" => "per dia del mes",
-"by weekday" => "per dia de la setmana",
-"Monday" => "Dilluns",
-"Tuesday" => "Dimarts",
-"Wednesday" => "Dimecres",
-"Thursday" => "Dijous",
-"Friday" => "Divendres",
-"Saturday" => "Dissabte",
-"Sunday" => "Diumenge",
-"events week of month" => "esdeveniments la setmana del mes",
-"first" => "primer",
-"second" => "segon",
-"third" => "tercer",
-"fourth" => "quart",
-"fifth" => "cinquè",
-"last" => "últim",
-"January" => "Gener",
-"February" => "Febrer",
-"March" => "Març",
-"April" => "Abril",
-"May" => "Maig",
-"June" => "Juny",
-"July" => "Juliol",
-"August" => "Agost",
-"September" => "Setembre",
-"October" => "Octubre",
-"November" => "Novembre",
-"December" => "Desembre",
-"by events date" => "per data d'esdeveniments",
-"by yearday(s)" => "per ahir(s)",
-"by weeknumber(s)" => "per número(s) de la setmana",
-"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",
-"Missing fields" => "Els camps que falten",
-"Title" => "Títol",
-"From Date" => "Des de la data",
-"From Time" => "Des de l'hora",
-"To Date" => "Fins a la data",
-"To Time" => "Fins a l'hora",
-"The event ends before it starts" => "L'esdeveniment acaba abans que comenci",
-"There was a database fail" => "Hi ha un error de base de dades",
-"Week" => "Setmana",
-"Month" => "Mes",
-"List" => "Llista",
-"Today" => "Avui",
-"Settings" => "Configuració",
-"Your calendars" => "Els vostres calendaris",
-"CalDav Link" => "Enllaç CalDav",
-"Shared calendars" => "Calendaris compartits",
-"No shared calendars" => "No hi ha calendaris compartits",
-"Share Calendar" => "Comparteix el calendari",
-"Download" => "Baixa",
-"Edit" => "Edita",
-"Delete" => "Suprimeix",
-"shared with you by" => "compartit amb vós",
-"New calendar" => "Calendari nou",
-"Edit calendar" => "Edita el calendari",
-"Displayname" => "Mostra el nom",
-"Active" => "Actiu",
-"Calendar color" => "Color del calendari",
-"Save" => "Desa",
-"Submit" => "Envia",
-"Cancel" => "Cancel·la",
-"Edit an event" => "Edició d'un esdeveniment",
-"Export" => "Exporta",
-"Eventinfo" => "Eventinfo",
-"Repeating" => "Repetició",
-"Alarm" => "Alarma",
-"Attendees" => "Assistents",
-"Share" => "Comparteix",
-"Title of the Event" => "Títol de l'esdeveniment",
-"Category" => "Categoria",
-"Separate categories with commas" => "Separeu les categories amb comes",
-"Edit categories" => "Edita categories",
-"All Day Event" => "Esdeveniment de tot el dia",
-"From" => "Des de",
-"To" => "Fins a",
-"Advanced options" => "Opcions avançades",
-"Location" => "Ubicació",
-"Location of the Event" => "Ubicació de l'esdeveniment",
-"Description" => "Descripció",
-"Description of the Event" => "Descripció de l'esdeveniment",
-"Repeat" => "Repetició",
-"Advanced" => "Avançat",
-"Select weekdays" => "Dies de la setmana seleccionats",
-"Select days" => "Seleccionar dies",
-"and the events day of year." => "i dies d'esdeveniment de l'any.",
-"and the events day of month." => "i dies d'esdeveniment del mes.",
-"Select months" => "Seleccionar mesos",
-"Select weeks" => "Seleccionar setmanes",
-"and the events week of year." => "i setmanes d'esdeveniment de l'any.",
-"Interval" => "Interval",
-"End" => "Final",
-"occurrences" => "aparicions",
-"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",
-"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",
-"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)",
-"iOS/OS X" => "IOS/OS X",
-"Read only iCalendar link(s)" => "Enllaç(os) iCalendar només de lectura",
-"Users" => "Usuaris",
-"select users" => "seleccioneu usuaris",
-"Editable" => "Editable",
-"Groups" => "Grups",
-"select groups" => "seleccioneu grups",
-"make public" => "fes-ho public"
-);
diff --git a/apps/calendar/l10n/cs_CZ.php b/apps/calendar/l10n/cs_CZ.php
deleted file mode 100644
index ab76cc49d1..0000000000
--- a/apps/calendar/l10n/cs_CZ.php
+++ /dev/null
@@ -1,198 +0,0 @@
-<?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",
-"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",
-"Clients" => "Klienti",
-"Deliverer" => "Doručovatel",
-"Holidays" => "Prázdniny",
-"Ideas" => "Nápady",
-"Journey" => "Cesta",
-"Jubilee" => "Výročí",
-"Meeting" => "Schůzka",
-"Other" => "Další",
-"Personal" => "Osobní",
-"Projects" => "Projekty",
-"Questions" => "Dotazy",
-"Work" => "Pracovní",
-"by" => "od",
-"unnamed" => "nepojmenováno",
-"New Calendar" => "Nový kalendář",
-"Does not repeat" => "Neopakuje se",
-"Daily" => "Denně",
-"Weekly" => "Týdně",
-"Every Weekday" => "Každý všední den",
-"Bi-Weekly" => "Jednou za dva týdny",
-"Monthly" => "Měsíčně",
-"Yearly" => "Ročně",
-"never" => "nikdy",
-"by occurrences" => "podle výskytu",
-"by date" => "podle data",
-"by monthday" => "podle dne v měsíci",
-"by weekday" => "podle dne v týdnu",
-"Monday" => "Pondělí",
-"Tuesday" => "Úterý",
-"Wednesday" => "Středa",
-"Thursday" => "Čtvrtek",
-"Friday" => "Pátek",
-"Saturday" => "Sobota",
-"Sunday" => "Neděle",
-"events week of month" => "týdenní události v měsíci",
-"first" => "první",
-"second" => "druhý",
-"third" => "třetí",
-"fourth" => "čtvrtý",
-"fifth" => "pátý",
-"last" => "poslední",
-"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",
-"by events date" => "podle data události",
-"by yearday(s)" => "po dni (dnech)",
-"by weeknumber(s)" => "podle čísel týdnů",
-"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",
-"From Date" => "Od data",
-"From Time" => "Od",
-"To Date" => "Do data",
-"To Time" => "Do",
-"The event ends before it starts" => "Akce končí před zahájením",
-"There was a database fail" => "Chyba v databázi",
-"Week" => "týden",
-"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",
-"No shared calendars" => "Žádné sdílené kalendáře",
-"Share Calendar" => "Sdílet kalendář",
-"Download" => "Stáhnout",
-"Edit" => "Editovat",
-"Delete" => "Odstranit",
-"shared with you by" => "sdíleno s vámi uživatelem",
-"New calendar" => "Nový kalendář",
-"Edit calendar" => "Editovat kalendář",
-"Displayname" => "Zobrazované jméno",
-"Active" => "Aktivní",
-"Calendar color" => "Barva kalendáře",
-"Save" => "Uložit",
-"Submit" => "Potvrdit",
-"Cancel" => "Storno",
-"Edit an event" => "Editovat událost",
-"Export" => "Export",
-"Eventinfo" => "Informace o události",
-"Repeating" => "Opakující se",
-"Alarm" => "Alarm",
-"Attendees" => "Účastníci",
-"Share" => "Sdílet",
-"Title of the Event" => "Název události",
-"Category" => "Kategorie",
-"Separate categories with commas" => "Kategorie oddělené čárkami",
-"Edit categories" => "Upravit kategorie",
-"All Day Event" => "Celodenní událost",
-"From" => "od",
-"To" => "do",
-"Advanced options" => "Pokročilé volby",
-"Location" => "Umístění",
-"Location of the Event" => "Místo konání události",
-"Description" => "Popis",
-"Description of the Event" => "Popis události",
-"Repeat" => "Opakování",
-"Advanced" => "Pokročilé",
-"Select weekdays" => "Vybrat dny v týdnu",
-"Select days" => "Vybrat dny",
-"and the events day of year." => "a denní události v roce",
-"and the events day of month." => "a denní události v měsíci",
-"Select months" => "Vybrat měsíce",
-"Select weeks" => "Vybrat týdny",
-"and the events week of year." => "a týden s událostmi v roce",
-"Interval" => "Interval",
-"End" => "Konec",
-"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",
-"View an event" => "Zobrazit událost",
-"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é",
-"Groups" => "Skupiny",
-"select groups" => "vybrat skupiny",
-"make public" => "zveřejnit"
-);
diff --git a/apps/calendar/l10n/da.php b/apps/calendar/l10n/da.php
deleted file mode 100644
index ea07fadb73..0000000000
--- a/apps/calendar/l10n/da.php
+++ /dev/null
@@ -1,188 +0,0 @@
-<?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",
-"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",
-"Clients" => "Kunder",
-"Deliverer" => "Leverance",
-"Holidays" => "Helligdage",
-"Ideas" => "Ideér",
-"Journey" => "Rejse",
-"Jubilee" => "Jubilæum",
-"Meeting" => "Møde",
-"Other" => "Andet",
-"Personal" => "Privat",
-"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",
-"Every Weekday" => "Alle hverdage",
-"Bi-Weekly" => "Hver anden uge",
-"Monthly" => "Månedlig",
-"Yearly" => "Årlig",
-"never" => "aldrig",
-"by occurrences" => "efter forekomster",
-"by date" => "efter dato",
-"by monthday" => "efter dag i måneden",
-"by weekday" => "efter ugedag",
-"Monday" => "Mandag",
-"Tuesday" => "Tirsdag",
-"Wednesday" => "Onsdag",
-"Thursday" => "Torsdag",
-"Friday" => "Fredag",
-"Saturday" => "Lørdag",
-"Sunday" => "øndag",
-"events week of month" => "begivenhedens uge i måneden",
-"first" => "første",
-"second" => "anden",
-"third" => "tredje",
-"fourth" => "fjerde",
-"fifth" => "femte",
-"last" => "sidste",
-"January" => "Januar",
-"February" => "Februar",
-"March" => "Marts",
-"April" => "April",
-"May" => "Maj",
-"June" => "Juni",
-"July" => "Juli",
-"August" => "August",
-"September" => "September",
-"October" => "Oktober",
-"November" => "November",
-"December" => "December",
-"by events date" => "efter begivenheders dato",
-"by yearday(s)" => "efter dag(e) i året",
-"by weeknumber(s)" => "efter ugenummer/-numre",
-"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",
-"Missing fields" => "Manglende felter",
-"Title" => "Titel",
-"From Date" => "Fra dato",
-"From Time" => "Fra tidspunkt",
-"To Date" => "Til dato",
-"To Time" => "Til tidspunkt",
-"The event ends before it starts" => "Begivenheden slutter, inden den begynder",
-"There was a database fail" => "Der var en fejl i databasen",
-"Week" => "Uge",
-"Month" => "Måned",
-"List" => "Liste",
-"Today" => "I dag",
-"Settings" => "Indstillinger",
-"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",
-"Active" => "Aktiv",
-"Calendar color" => "Kalenderfarve",
-"Save" => "Gem",
-"Submit" => "Send",
-"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",
-"Advanced options" => "Avancerede indstillinger",
-"Location" => "Sted",
-"Location of the Event" => "Placering af begivenheden",
-"Description" => "Beskrivelse",
-"Description of the Event" => "Beskrivelse af begivenheden",
-"Repeat" => "Gentag",
-"Advanced" => "Avanceret",
-"Select weekdays" => "Vælg ugedage",
-"Select days" => "Vælg dage",
-"and the events day of year." => "og begivenhedens dag i året.",
-"and the events day of month." => "og begivenhedens sag på måneden",
-"Select months" => "Vælg måneder",
-"Select weeks" => "Vælg uger",
-"and the events week of year." => "og begivenhedens uge i året.",
-"Interval" => "Interval",
-"End" => "Afslutning",
-"occurrences" => "forekomster",
-"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",
-"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",
-"View an event" => "Vis en begivenhed",
-"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",
-"iOS/OS X" => "iOS/OS X",
-"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
deleted file mode 100644
index 223e80effb..0000000000
--- a/apps/calendar/l10n/de.php
+++ /dev/null
@@ -1,198 +0,0 @@
-<?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 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.",
-"New Timezone:" => "Neue Zeitzone:",
-"Timezone changed" => "Zeitzone geändert",
-"Invalid request" => "Fehlerhafte Anfrage",
-"Calendar" => "Kalender",
-"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",
-"Clients" => "Kunden",
-"Deliverer" => "Lieferant",
-"Holidays" => "Urlaub",
-"Ideas" => "Ideen",
-"Journey" => "Reise",
-"Jubilee" => "Jubiläum",
-"Meeting" => "Treffen",
-"Other" => "Anderes",
-"Personal" => "Persönlich",
-"Projects" => "Projekte",
-"Questions" => "Fragen",
-"Work" => "Arbeit",
-"by" => "von",
-"unnamed" => "unbenannt",
-"New Calendar" => "Neuer Kalender",
-"Does not repeat" => "einmalig",
-"Daily" => "täglich",
-"Weekly" => "wöchentlich",
-"Every Weekday" => "jeden Wochentag",
-"Bi-Weekly" => "jede zweite Woche",
-"Monthly" => "monatlich",
-"Yearly" => "jährlich",
-"never" => "niemals",
-"by occurrences" => "nach Terminen",
-"by date" => "nach Datum",
-"by monthday" => "an einem Monatstag",
-"by weekday" => "an einem Wochentag",
-"Monday" => "Montag",
-"Tuesday" => "Dienstag",
-"Wednesday" => "Mittwoch",
-"Thursday" => "Donnerstag",
-"Friday" => "Freitag",
-"Saturday" => "Samstag",
-"Sunday" => "Sonntag",
-"events week of month" => "Woche des Monats vom Termin",
-"first" => "erste",
-"second" => "zweite",
-"third" => "dritte",
-"fourth" => "vierte",
-"fifth" => "fünfte",
-"last" => "letzte",
-"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",
-"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.",
-"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",
-"Missing fields" => "fehlende Felder",
-"Title" => "Titel",
-"From Date" => "Startdatum",
-"From Time" => "Startzeit",
-"To Date" => "Enddatum",
-"To Time" => "Endzeit",
-"The event ends before it starts" => "Der Termin hört auf, bevor er angefangen hat.",
-"There was a database fail" => "Datenbankfehler",
-"Week" => "Woche",
-"Month" => "Monat",
-"List" => "Liste",
-"Today" => "Heute",
-"Settings" => "Einstellungen",
-"Your calendars" => "Deine Kalender",
-"CalDav Link" => "CalDAV-Link",
-"Shared calendars" => "Geteilte Kalender",
-"No shared calendars" => "Keine geteilten Kalender",
-"Share Calendar" => "Kalender teilen",
-"Download" => "Herunterladen",
-"Edit" => "Bearbeiten",
-"Delete" => "Löschen",
-"shared with you by" => "Geteilt mit dir von",
-"New calendar" => "Neuer Kalender",
-"Edit calendar" => "Kalender bearbeiten",
-"Displayname" => "Anzeigename",
-"Active" => "Aktiv",
-"Calendar color" => "Kalenderfarbe",
-"Save" => "Speichern",
-"Submit" => "Bestätigen",
-"Cancel" => "Abbrechen",
-"Edit an event" => "Ereignis bearbeiten",
-"Export" => "Exportieren",
-"Eventinfo" => "Termininfo",
-"Repeating" => "Wiederholen",
-"Alarm" => "Alarm",
-"Attendees" => "Teilnehmer",
-"Share" => "Teilen",
-"Title of the Event" => "Name",
-"Category" => "Kategorie",
-"Separate categories with commas" => "Kategorien mit Kommas trennen",
-"Edit categories" => "Kategorien ändern",
-"All Day Event" => "Ganztägiges Ereignis",
-"From" => "von",
-"To" => "bis",
-"Advanced options" => "Erweiterte Optionen",
-"Location" => "Ort",
-"Location of the Event" => "Ort",
-"Description" => "Beschreibung",
-"Description of the Event" => "Beschreibung",
-"Repeat" => "wiederholen",
-"Advanced" => "Erweitert",
-"Select weekdays" => "Wochentage auswählen",
-"Select days" => "Tage auswählen",
-"and the events day of year." => "und den Tag des Jahres vom Termin",
-"and the events day of month." => "und den Tag des Monats vom Termin",
-"Select months" => "Monate auswählen",
-"Select weeks" => "Wochen auswählen",
-"and the events week of year." => "und den Tag des Jahres vom Termin",
-"Interval" => "Intervall",
-"End" => "Ende",
-"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 bereits. Sollten Sie fortfahren, werden die beiden Kalender zusammengeführt.",
-"Import" => "Importieren",
-"Close Dialog" => "Dialog schließen",
-"Create a new event" => "Neues Ereignis",
-"View an event" => "Termin öffnen",
-"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" => "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",
-"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.)",
-"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",
-"Groups" => "Gruppen",
-"select groups" => "Gruppen auswählen",
-"make public" => "Veröffentlichen"
-);
diff --git a/apps/calendar/l10n/el.php b/apps/calendar/l10n/el.php
deleted file mode 100644
index ad07d7b585..0000000000
--- a/apps/calendar/l10n/el.php
+++ /dev/null
@@ -1,192 +0,0 @@
-<?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" => "το συμβάν αποθηκεύτηκε στο ημερολογιό σου",
-"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" => "Προμηθευτής",
-"Holidays" => "Διακοπές",
-"Ideas" => "Ιδέες",
-"Journey" => "Ταξίδι",
-"Jubilee" => "Γιορτή",
-"Meeting" => "Συνάντηση",
-"Other" => "Άλλο",
-"Personal" => "Προσωπικό",
-"Projects" => "Έργα",
-"Questions" => "Ερωτήσεις",
-"Work" => "Εργασία",
-"by" => "από",
-"unnamed" => "ανώνυμο",
-"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." => "Ημερ.",
-"Sun." => "Κυρ.",
-"Mon." => "Δευ.",
-"Tue." => "Τρί.",
-"Wed." => "Τετ.",
-"Thu." => "Πέμ.",
-"Fri." => "Παρ.",
-"Sat." => "Σάβ.",
-"Jan." => "Ιαν.",
-"Feb." => "Φεβ.",
-"Mar." => "Μάρ.",
-"Apr." => "Απρ.",
-"May." => "Μαΐ.",
-"Jun." => "Ιούν.",
-"Jul." => "Ιούλ.",
-"Aug." => "Αύγ.",
-"Sep." => "Σεπ.",
-"Oct." => "Οκτ.",
-"Nov." => "Νοέ.",
-"Dec." => "Δεκ.",
-"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" => "Σήμερα",
-"Your calendars" => "Τα ημερολόγια σου",
-"CalDav Link" => "Σύνδεση CalDAV",
-"Shared calendars" => "Κοινόχρηστα ημερολόγια",
-"No shared calendars" => "Δεν υπάρχουν κοινόχρηστα ημερολόγια",
-"Share Calendar" => "Διαμοίρασε ένα ημερολόγιο",
-"Download" => "Λήψη",
-"Edit" => "Επεξεργασία",
-"Delete" => "Διαγραφή",
-"shared with you by" => "μοιράστηκε μαζί σας από ",
-"New calendar" => "Νέο ημερολόγιο",
-"Edit calendar" => "Επεξεργασία ημερολογίου",
-"Displayname" => "Προβολή ονόματος",
-"Active" => "Ενεργό",
-"Calendar color" => "Χρώμα ημερολογίου",
-"Save" => "Αποθήκευση",
-"Submit" => "Υποβολή",
-"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" => "περιστατικά",
-"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." => "Ένα ημερολόγιο με αυτό το όνομα υπάρχει ήδη. Εάν θέλετε να συνεχίσετε, αυτά τα 2 ημερολόγια θα συγχωνευθούν.",
-"Import" => "Εισαγωγή",
-"Close Dialog" => "Κλείσιμο Διαλόγου",
-"Create a new event" => "Δημιουργήστε ένα νέο συμβάν",
-"View an event" => "Εμφάνισε ένα γεγονός",
-"No categories selected" => "Δεν επελέγησαν  κατηγορίες",
-"of" => "του",
-"at" => "στο",
-"Timezone" => "Ζώνη ώρας",
-"24h" => "24ω",
-"12h" => "12ω",
-"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",
-"Read only iCalendar link(s)" => " iCalendar link(s) μόνο για ανάγνωση",
-"Users" => "Χρήστες",
-"select users" => "επέλεξε χρήστες",
-"Editable" => "Επεξεργάσιμο",
-"Groups" => "Ομάδες",
-"select groups" => "Επέλεξε ομάδες",
-"make public" => "κάνε το δημόσιο"
-);
diff --git a/apps/calendar/l10n/eo.php b/apps/calendar/l10n/eo.php
deleted file mode 100644
index be3db9bfae..0000000000
--- a/apps/calendar/l10n/eo.php
+++ /dev/null
@@ -1,198 +0,0 @@
-<?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 horozono:",
-"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",
-"Clients" => "Klientoj",
-"Deliverer" => "Livero",
-"Holidays" => "Ferioj",
-"Ideas" => "Ideoj",
-"Journey" => "Vojaĝo",
-"Jubilee" => "Jubileo",
-"Meeting" => "Rendevuo",
-"Other" => "Alia",
-"Personal" => "Persona",
-"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",
-"Every Weekday" => "Labortage",
-"Bi-Weekly" => "Semajnduope",
-"Monthly" => "Monate",
-"Yearly" => "Jare",
-"never" => "neniam",
-"by occurrences" => "laŭ aperoj",
-"by date" => "laŭ dato",
-"by monthday" => "laŭ monattago",
-"by weekday" => "laŭ semajntago",
-"Monday" => "lundo",
-"Tuesday" => "mardo",
-"Wednesday" => "merkredo",
-"Thursday" => "ĵaŭdo",
-"Friday" => "vendredo",
-"Saturday" => "sabato",
-"Sunday" => "dimanĉo",
-"events week of month" => "la monatsemajno de la okazaĵo",
-"first" => "unua",
-"second" => "dua",
-"third" => "tria",
-"fourth" => "kvara",
-"fifth" => "kvina",
-"last" => "lasta",
-"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",
-"by events date" => "laŭ okazaĵdato",
-"by yearday(s)" => "laŭ jartago(j)",
-"by weeknumber(s)" => "laŭ semajnnumero(j)",
-"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",
-"Missing fields" => "Mankas iuj kampoj",
-"Title" => "Titolo",
-"From Date" => "ekde la dato",
-"From Time" => "ekde la horo",
-"To Date" => "ĝis la dato",
-"To Time" => "ĝis la horo",
-"The event ends before it starts" => "La okazaĵo finas antaŭ komenci",
-"There was a database fail" => "Datumbaza malsukceso okazis",
-"Week" => "Semajno",
-"Month" => "Monato",
-"List" => "Listo",
-"Today" => "Hodiaŭ",
-"Settings" => "Agordo",
-"Your calendars" => "Viaj kalendaroj",
-"CalDav Link" => "CalDav-a ligilo",
-"Shared calendars" => "Kunhavigitaj kalendaroj",
-"No shared calendars" => "Neniu kunhavigita kalendaro",
-"Share Calendar" => "Kunhavigi kalendaron",
-"Download" => "Elŝuti",
-"Edit" => "Redakti",
-"Delete" => "Forigi",
-"shared with you by" => "kunhavigita kun vi fare de",
-"New calendar" => "Nova kalendaro",
-"Edit calendar" => "Redakti la kalendaron",
-"Displayname" => "Montrota nomo",
-"Active" => "Aktiva",
-"Calendar color" => "Kalendarokoloro",
-"Save" => "Konservi",
-"Submit" => "Sendi",
-"Cancel" => "Nuligi",
-"Edit an event" => "Redakti okazaĵon",
-"Export" => "Elporti",
-"Eventinfo" => "Informo de okazaĵo",
-"Repeating" => "Ripetata",
-"Alarm" => "Alarmo",
-"Attendees" => "Ĉeestontoj",
-"Share" => "Kunhavigi",
-"Title of the Event" => "Okazaĵotitolo",
-"Category" => "Kategorio",
-"Separate categories with commas" => "Disigi kategoriojn per komoj",
-"Edit categories" => "Redakti kategoriojn",
-"All Day Event" => "La tuta tago",
-"From" => "Ekde",
-"To" => "Ĝis",
-"Advanced options" => "Altnivela agordo",
-"Location" => "Loko",
-"Location of the Event" => "Loko de okazaĵo",
-"Description" => "Priskribo",
-"Description of the Event" => "Okazaĵopriskribo",
-"Repeat" => "Ripeti",
-"Advanced" => "Altnivelo",
-"Select weekdays" => "Elekti semajntagojn",
-"Select days" => "Elekti tagojn",
-"and the events day of year." => "kaj la jartago de la okazaĵo.",
-"and the events day of month." => "kaj la monattago de la okazaĵo.",
-"Select months" => "Elekti monatojn",
-"Select weeks" => "Elekti semajnojn",
-"and the events week of year." => "kaj la jarsemajno de la okazaĵo.",
-"Interval" => "Intervalo",
-"End" => "Fino",
-"occurrences" => "aperoj",
-"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",
-"Close Dialog" => "Fermi la dialogon",
-"Create a new event" => "Krei okazaĵon",
-"View an event" => "Vidi okazaĵon",
-"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)",
-"iOS/OS X" => "iOS/OS X",
-"Read only iCalendar link(s)" => "Nurlegebla(j) iCalendar-ligilo(j)",
-"Users" => "Uzantoj",
-"select users" => "elekti uzantojn",
-"Editable" => "Redaktebla",
-"Groups" => "Grupoj",
-"select groups" => "elekti grupojn",
-"make public" => "publikigi"
-);
diff --git a/apps/calendar/l10n/es.php b/apps/calendar/l10n/es.php
deleted file mode 100644
index 3ebcd2e943..0000000000
--- a/apps/calendar/l10n/es.php
+++ /dev/null
@@ -1,192 +0,0 @@
-<?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",
-"Clients" => "Clientes",
-"Deliverer" => "Entrega",
-"Holidays" => "Festivos",
-"Ideas" => "Ideas",
-"Journey" => "Viaje",
-"Jubilee" => "Aniversario",
-"Meeting" => "Reunión",
-"Other" => "Otro",
-"Personal" => "Personal",
-"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",
-"Every Weekday" => "Días de semana laboral",
-"Bi-Weekly" => "Cada 2 semanas",
-"Monthly" => "Mensualmente",
-"Yearly" => "Anualmente",
-"never" => "nunca",
-"by occurrences" => "por ocurrencias",
-"by date" => "por fecha",
-"by monthday" => "por día del mes",
-"by weekday" => "por día de la semana",
-"Monday" => "Lunes",
-"Tuesday" => "Martes",
-"Wednesday" => "Miércoles",
-"Thursday" => "Jueves",
-"Friday" => "Viernes",
-"Saturday" => "Sábado",
-"Sunday" => "Domingo",
-"events week of month" => "eventos de la semana del mes",
-"first" => "primer",
-"second" => "segundo",
-"third" => "tercer",
-"fourth" => "cuarto",
-"fifth" => "quinto",
-"last" => "último",
-"January" => "Enero",
-"February" => "Febrero",
-"March" => "Marzo",
-"April" => "Abril",
-"May" => "Mayo",
-"June" => "Junio",
-"July" => "Julio",
-"August" => "Agosto",
-"September" => "Septiembre",
-"October" => "Octubre",
-"November" => "Noviembre",
-"December" => "Diciembre",
-"by events date" => "por fecha de los eventos",
-"by yearday(s)" => "por día(s) del año",
-"by weeknumber(s)" => "por número(s) de semana",
-"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",
-"Missing fields" => "Los campos que faltan",
-"Title" => "Título",
-"From Date" => "Desde la fecha",
-"From Time" => "Desde la hora",
-"To Date" => "Hasta la fecha",
-"To Time" => "Hasta la hora",
-"The event ends before it starts" => "El evento termina antes de que comience",
-"There was a database fail" => "Se ha producido un error en la base de datos",
-"Week" => "Semana",
-"Month" => "Mes",
-"List" => "Lista",
-"Today" => "Hoy",
-"Your calendars" => "Tus calendarios",
-"CalDav Link" => "Enlace a CalDav",
-"Shared calendars" => "Calendarios compartidos",
-"No shared calendars" => "Calendarios no compartidos",
-"Share Calendar" => "Compartir calendario",
-"Download" => "Descargar",
-"Edit" => "Editar",
-"Delete" => "Eliminar",
-"shared with you by" => "compartido contigo por",
-"New calendar" => "Nuevo calendario",
-"Edit calendar" => "Editar calendario",
-"Displayname" => "Nombre",
-"Active" => "Activo",
-"Calendar color" => "Color del calendario",
-"Save" => "Guardar",
-"Submit" => "Guardar",
-"Cancel" => "Cancelar",
-"Edit an event" => "Editar un evento",
-"Export" => "Exportar",
-"Eventinfo" => "Información del evento",
-"Repeating" => "Repetición",
-"Alarm" => "Alarma",
-"Attendees" => "Asistentes",
-"Share" => "Compartir",
-"Title of the Event" => "Título del evento",
-"Category" => "Categoría",
-"Separate categories with commas" => "Separar categorías con comas",
-"Edit categories" => "Editar categorías",
-"All Day Event" => "Todo el día",
-"From" => "Desde",
-"To" => "Hasta",
-"Advanced options" => "Opciones avanzadas",
-"Location" => "Lugar",
-"Location of the Event" => "Lugar del evento",
-"Description" => "Descripción",
-"Description of the Event" => "Descripción del evento",
-"Repeat" => "Repetir",
-"Advanced" => "Avanzado",
-"Select weekdays" => "Seleccionar días de la semana",
-"Select days" => "Seleccionar días",
-"and the events day of year." => "y el día del año de los eventos.",
-"and the events day of month." => "y el día del mes de los eventos.",
-"Select months" => "Seleccionar meses",
-"Select weeks" => "Seleccionar semanas",
-"and the events week of year." => "y la semana del año de los eventos.",
-"Interval" => "Intervalo",
-"End" => "Fin",
-"occurrences" => "ocurrencias",
-"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",
-"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",
-"of" => "de",
-"at" => "a las",
-"Timezone" => "Zona horaria",
-"24h" => "24h",
-"12h" => "12h",
-"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",
-"Groups" => "Grupos",
-"select groups" => "seleccionar grupos",
-"make public" => "hacerlo público"
-);
diff --git a/apps/calendar/l10n/et_EE.php b/apps/calendar/l10n/et_EE.php
deleted file mode 100644
index 59f494f8ab..0000000000
--- a/apps/calendar/l10n/et_EE.php
+++ /dev/null
@@ -1,156 +0,0 @@
-<?php $TRANSLATIONS = array(
-"No calendars found." => "Kalendreid ei leitud.",
-"No events found." => "Üritusi ei leitud.",
-"Wrong calendar" => "Vale kalender",
-"New Timezone:" => "Uus ajavöönd:",
-"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",
-"Clients" => "Kliendid",
-"Deliverer" => "Kohaletoimetaja",
-"Holidays" => "Pühad",
-"Ideas" => "Ideed",
-"Journey" => "Reis",
-"Jubilee" => "Juubel",
-"Meeting" => "Kohtumine",
-"Other" => "Muu",
-"Personal" => "Isiklik",
-"Projects" => "Projektid",
-"Questions" => "Küsimused",
-"Work" => "Töö",
-"unnamed" => "nimetu",
-"New Calendar" => "Uus kalender",
-"Does not repeat" => "Ei kordu",
-"Daily" => "Iga päev",
-"Weekly" => "Iga nädal",
-"Every Weekday" => "Igal nädalapäeval",
-"Bi-Weekly" => "Üle nädala",
-"Monthly" => "Igal kuul",
-"Yearly" => "Igal aastal",
-"never" => "mitte kunagi",
-"by occurrences" => "toimumiskordade järgi",
-"by date" => "kuupäeva järgi",
-"by monthday" => "kuu päeva järgi",
-"by weekday" => "nädalapäeva järgi",
-"Monday" => "Esmaspäev",
-"Tuesday" => "Teisipäev",
-"Wednesday" => "Kolmapäev",
-"Thursday" => "Neljapäev",
-"Friday" => "Reede",
-"Saturday" => "Laupäev",
-"Sunday" => "Pühapäev",
-"events week of month" => "ürituse kuu nädal",
-"first" => "esimene",
-"second" => "teine",
-"third" => "kolmas",
-"fourth" => "neljas",
-"fifth" => "viies",
-"last" => "viimane",
-"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",
-"by events date" => "ürituste kuupäeva järgi",
-"by yearday(s)" => "aasta päeva(de) järgi",
-"by weeknumber(s)" => "nädala numbri(te) järgi",
-"by day and month" => "kuu ja päeva järgi",
-"Date" => "Kuupäev",
-"Cal." => "Kal.",
-"All day" => "Kogu päev",
-"Missing fields" => "Puuduvad väljad",
-"Title" => "Pealkiri",
-"From Date" => "Alates kuupäevast",
-"From Time" => "Alates kellaajast",
-"To Date" => "Kuni kuupäevani",
-"To Time" => "Kuni kellaajani",
-"The event ends before it starts" => "Üritus lõpeb enne, kui see algab",
-"There was a database fail" => "Tekkis andmebaasi viga",
-"Week" => "Nädal",
-"Month" => "Kuu",
-"List" => "Nimekiri",
-"Today" => "Täna",
-"Your calendars" => "Sinu kalendrid",
-"CalDav Link" => "CalDav Link",
-"Shared calendars" => "Jagatud kalendrid",
-"No shared calendars" => "Jagatud kalendreid pole",
-"Share Calendar" => "Jaga kalendrit",
-"Download" => "Lae alla",
-"Edit" => "Muuda",
-"Delete" => "Kustuta",
-"shared with you by" => "jagas sinuga",
-"New calendar" => "Uus kalender",
-"Edit calendar" => "Muuda kalendrit",
-"Displayname" => "Näidatav nimi",
-"Active" => "Aktiivne",
-"Calendar color" => "Kalendri värv",
-"Save" => "Salvesta",
-"Submit" => "OK",
-"Cancel" => "Loobu",
-"Edit an event" => "Muuda sündmust",
-"Export" => "Ekspordi",
-"Eventinfo" => "Ürituse info",
-"Repeating" => "Kordamine",
-"Alarm" => "Alarm",
-"Attendees" => "Osalejad",
-"Share" => "Jaga",
-"Title of the Event" => "Sündmuse pealkiri",
-"Category" => "Kategooria",
-"Separate categories with commas" => "Eralda kategooriad komadega",
-"Edit categories" => "Muuda kategooriaid",
-"All Day Event" => "Kogu päeva sündmus",
-"From" => "Alates",
-"To" => "Kuni",
-"Advanced options" => "Lisavalikud",
-"Location" => "Asukoht",
-"Location of the Event" => "Sündmuse toimumiskoht",
-"Description" => "Kirjeldus",
-"Description of the Event" => "Sündmuse kirjeldus",
-"Repeat" => "Korda",
-"Advanced" => "Täpsem",
-"Select weekdays" => "Vali nädalapäevad",
-"Select days" => "Vali päevad",
-"and the events day of year." => "ja ürituse päev aastas.",
-"and the events day of month." => "ja ürituse päev kuus.",
-"Select months" => "Vali kuud",
-"Select weeks" => "Vali nädalad",
-"and the events week of year." => "ja ürituse nädal aastas.",
-"Interval" => "Intervall",
-"End" => "Lõpp",
-"occurrences" => "toimumiskordi",
-"create a new calendar" => "loo uus kalender",
-"Import a calendar file" => "Impordi kalendrifail",
-"Name of new calendar" => "Uue kalendri nimi",
-"Import" => "Impordi",
-"Close Dialog" => "Sulge dialoogiaken",
-"Create a new event" => "Loo sündmus",
-"View an event" => "Vaata üritust",
-"No categories selected" => "Ühtegi kategooriat pole valitud",
-"of" => "/",
-"at" => "kell",
-"Timezone" => "Ajavöönd",
-"24h" => "24h",
-"12h" => "12h",
-"Users" => "Kasutajad",
-"select users" => "valitud kasutajad",
-"Editable" => "Muudetav",
-"Groups" => "Grupid",
-"select groups" => "valitud grupid",
-"make public" => "tee avalikuks"
-);
diff --git a/apps/calendar/l10n/eu.php b/apps/calendar/l10n/eu.php
deleted file mode 100644
index 5ebce09c58..0000000000
--- a/apps/calendar/l10n/eu.php
+++ /dev/null
@@ -1,183 +0,0 @@
-<?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",
-"Clients" => "Bezeroak",
-"Deliverer" => "Banatzailea",
-"Holidays" => "Oporrak",
-"Ideas" => "Ideiak",
-"Journey" => "Bidaia",
-"Jubilee" => "Urteurrena",
-"Meeting" => "Bilera",
-"Other" => "Bestelakoa",
-"Personal" => "Pertsonala",
-"Projects" => "Proiektuak",
-"Questions" => "Galderak",
-"Work" => "Lana",
-"unnamed" => "izengabea",
-"New Calendar" => "Egutegi berria",
-"Does not repeat" => "Ez da errepikatzen",
-"Daily" => "Egunero",
-"Weekly" => "Astero",
-"Every Weekday" => "Asteko egun guztietan",
-"Bi-Weekly" => "Bi-Astero",
-"Monthly" => "Hilabetero",
-"Yearly" => "Urtero",
-"never" => "inoiz",
-"by occurrences" => "errepikapen kopuruagatik",
-"by date" => "dataren arabera",
-"by monthday" => "hileko egunaren arabera",
-"by weekday" => "asteko egunaren arabera",
-"Monday" => "Astelehena",
-"Tuesday" => "Asteartea",
-"Wednesday" => "Asteazkena",
-"Thursday" => "Osteguna",
-"Friday" => "Ostirala",
-"Saturday" => "Larunbata",
-"Sunday" => "Igandea",
-"events week of month" => "gertaeraren hilabeteko astea",
-"first" => "lehenengoa",
-"second" => "bigarrean",
-"third" => "hirugarrena",
-"fourth" => "laugarrena",
-"fifth" => "bostgarrena",
-"last" => "azkena",
-"January" => "Urtarrila",
-"February" => "Otsaila",
-"March" => "Martxoa",
-"April" => "Apirila",
-"May" => "Maiatza",
-"June" => "Ekaina",
-"July" => "Uztaila",
-"August" => "Abuztua",
-"September" => "Iraila",
-"October" => "Urria",
-"November" => "Azaroa",
-"December" => "Abendua",
-"by events date" => "gertaeren dataren arabera",
-"by yearday(s)" => "urteko egunaren arabera",
-"by weeknumber(s)" => "aste zenbaki(ar)en arabera",
-"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",
-"Missing fields" => "Eremuak faltan",
-"Title" => "Izenburua",
-"From Date" => "Hasierako Data",
-"From Time" => "Hasierako Ordua",
-"To Date" => "Bukaerako Data",
-"To Time" => "Bukaerako Ordua",
-"The event ends before it starts" => "Gertaera hasi baino lehen bukatzen da",
-"There was a database fail" => "Datu-baseak huts egin du",
-"Week" => "Astea",
-"Month" => "Hilabetea",
-"List" => "Zerrenda",
-"Today" => "Gaur",
-"Your calendars" => "Zure egutegiak",
-"CalDav Link" => "CalDav lotura",
-"Shared calendars" => "Elkarbanatutako egutegiak",
-"No shared calendars" => "Ez dago elkarbanatutako egutegirik",
-"Share Calendar" => "Elkarbanatu egutegia",
-"Download" => "Deskargatu",
-"Edit" => "Editatu",
-"Delete" => "Ezabatu",
-"shared with you by" => "honek zurekin elkarbanatu du",
-"New calendar" => "Egutegi berria",
-"Edit calendar" => "Editatu egutegia",
-"Displayname" => "Bistaratzeko izena",
-"Active" => "Aktiboa",
-"Calendar color" => "Egutegiaren kolorea",
-"Save" => "Gorde",
-"Submit" => "Bidali",
-"Cancel" => "Ezeztatu",
-"Edit an event" => "Editatu gertaera",
-"Export" => "Exportatu",
-"Eventinfo" => "Gertaeraren informazioa",
-"Repeating" => "Errepikapena",
-"Alarm" => "Alarma",
-"Attendees" => "Partaideak",
-"Share" => "Elkarbanatu",
-"Title of the Event" => "Gertaeraren izenburua",
-"Category" => "Kategoria",
-"Separate categories with commas" => "Banatu kategoriak komekin",
-"Edit categories" => "Editatu kategoriak",
-"All Day Event" => "Egun osoko gertaera",
-"From" => "Hasiera",
-"To" => "Bukaera",
-"Advanced options" => "Aukera aurreratuak",
-"Location" => "Kokalekua",
-"Location of the Event" => "Gertaeraren kokalekua",
-"Description" => "Deskribapena",
-"Description of the Event" => "Gertaeraren deskribapena",
-"Repeat" => "Errepikatu",
-"Advanced" => "Aurreratua",
-"Select weekdays" => "Hautatu asteko egunak",
-"Select days" => "Hautatu egunak",
-"and the events day of year." => "eta gertaeraren urteko eguna.",
-"and the events day of month." => "eta gertaeraren hilabeteko eguna.",
-"Select months" => "Hautatu hilabeteak",
-"Select weeks" => "Hautatu asteak",
-"and the events week of year." => "eta gertaeraren urteko astea.",
-"Interval" => "Tartea",
-"End" => "Amaiera",
-"occurrences" => "errepikapenak",
-"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",
-"Close Dialog" => "Itxi lehioa",
-"Create a new event" => "Sortu gertaera berria",
-"View an event" => "Ikusi gertaera bat",
-"No categories selected" => "Ez da kategoriarik hautatu",
-"Timezone" => "Ordu-zonaldea",
-"24h" => "24h",
-"12h" => "12h",
-"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",
-"Groups" => "Taldeak",
-"select groups" => "hautatutako taldeak",
-"make public" => "publikoa egin"
-);
diff --git a/apps/calendar/l10n/fa.php b/apps/calendar/l10n/fa.php
deleted file mode 100644
index 9235460834..0000000000
--- a/apps/calendar/l10n/fa.php
+++ /dev/null
@@ -1,156 +0,0 @@
-<?php $TRANSLATIONS = array(
-"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" => "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" => "تماس گرفتن",
-"Clients" => "مشتریان",
-"Deliverer" => "نجات",
-"Holidays" => "روزهای تعطیل",
-"Ideas" => "ایده ها",
-"Journey" => "سفر",
-"Jubilee" => "سالگرد",
-"Meeting" => "ملاقات",
-"Other" => "دیگر",
-"Personal" => "شخصی",
-"Projects" => "پروژه ها",
-"Questions" => "سوالات",
-"Work" => "کار",
-"unnamed" => "نام گذاری نشده",
-"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." => "تقویم.",
-"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" => "امروز",
-"Your calendars" => "تقویم های شما",
-"CalDav Link" => "CalDav Link",
-"Shared calendars" => "تقویمهای به اشترک گذاری شده",
-"No shared calendars" => "هیچ تقویمی به  اشتراک گذارده نشده",
-"Share Calendar" => "تقویم را به اشتراک بگذارید",
-"Download" => "بارگیری",
-"Edit" => "ویرایش",
-"Delete" => "پاک کردن",
-"shared with you by" => "به اشتراک گذارده شده به وسیله",
-"New calendar" => "تقویم جدید",
-"Edit calendar" => "ویرایش تقویم",
-"Displayname" => "نام برای نمایش",
-"Active" => "فعال",
-"Calendar color" => "رنگ تقویم",
-"Save" => "ذخیره سازی",
-"Submit" => "ارسال",
-"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" => "ظهور",
-"create a new calendar" => "یک تقویم جدید ایجاد کنید",
-"Import a calendar file" => "یک پرونده حاوی تقویم وارد کنید",
-"Name of new calendar" => "نام تقویم جدید",
-"Import" => "ورودی دادن",
-"Close Dialog" => "بستن دیالوگ",
-"Create a new event" => "یک رویداد ایجاد کنید",
-"View an event" => "دیدن یک رویداد",
-"No categories selected" => "هیچ گروهی انتخاب نشده",
-"of" => "از",
-"at" => "در",
-"Timezone" => "زمان محلی",
-"24h" => "24 ساعت",
-"12h" => "12 ساعت",
-"Users" => "کاربرها",
-"select users" => "انتخاب شناسه ها",
-"Editable" => "قابل ویرایش",
-"Groups" => "گروه ها",
-"select groups" => "انتخاب گروه ها",
-"make public" => "عمومی سازی"
-);
diff --git a/apps/calendar/l10n/fi_FI.php b/apps/calendar/l10n/fi_FI.php
deleted file mode 100644
index c4c9df3588..0000000000
--- a/apps/calendar/l10n/fi_FI.php
+++ /dev/null
@@ -1,159 +0,0 @@
-<?php $TRANSLATIONS = array(
-"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:",
-"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",
-"New Calendar" => "Uusi kalenteri",
-"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ä",
-"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ä",
-"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",
-"Settings" => "Asetukset",
-"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",
-"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",
-"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",
-"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",
-"Editable" => "Muoktattava",
-"Groups" => "Ryhmät",
-"select groups" => "valitse ryhmät",
-"make public" => "aseta julkiseksi"
-);
diff --git a/apps/calendar/l10n/fr.php b/apps/calendar/l10n/fr.php
deleted file mode 100644
index 90ba903b87..0000000000
--- a/apps/calendar/l10n/fr.php
+++ /dev/null
@@ -1,192 +0,0 @@
-<?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" => "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" => "Anniversaire",
-"Business" => "Professionnel",
-"Call" => "Appel",
-"Clients" => "Clientèle",
-"Deliverer" => "Livraison",
-"Holidays" => "Vacances",
-"Ideas" => "Idées",
-"Journey" => "Déplacement",
-"Jubilee" => "Jubilé",
-"Meeting" => "Meeting",
-"Other" => "Autre",
-"Personal" => "Personnel",
-"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",
-"Every Weekday" => "Quotidien",
-"Bi-Weekly" => "Bi-hebdomadaire",
-"Monthly" => "Mensuel",
-"Yearly" => "Annuel",
-"never" => "jamais",
-"by occurrences" => "par occurrences",
-"by date" => "par date",
-"by monthday" => "par jour du mois",
-"by weekday" => "par jour de la semaine",
-"Monday" => "Lundi",
-"Tuesday" => "Mardi",
-"Wednesday" => "Mercredi",
-"Thursday" => "Jeudi",
-"Friday" => "Vendredi",
-"Saturday" => "Samedi",
-"Sunday" => "Dimanche",
-"events week of month" => "événements du mois par semaine",
-"first" => "premier",
-"second" => "deuxième",
-"third" => "troisième",
-"fourth" => "quatrième",
-"fifth" => "cinquième",
-"last" => "dernier",
-"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",
-"by events date" => "par date d’événements",
-"by yearday(s)" => "par jour(s) de l'année",
-"by weeknumber(s)" => "par numéro de semaine(s)",
-"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",
-"Missing fields" => "Champs manquants",
-"Title" => "Titre",
-"From Date" => "De la date",
-"From Time" => "De l'heure",
-"To Date" => "A la date",
-"To Time" => "A l'heure",
-"The event ends before it starts" => "L'évènement s'est terminé avant qu'il ne commence",
-"There was a database fail" => "Il y a eu un échec dans la base de donnée",
-"Week" => "Semaine",
-"Month" => "Mois",
-"List" => "Liste",
-"Today" => "Aujourd'hui",
-"Your calendars" => "Vos calendriers",
-"CalDav Link" => "Lien CalDav",
-"Shared calendars" => "Calendriers partagés",
-"No shared calendars" => "Aucun calendrier partagé",
-"Share Calendar" => "Partager le calendrier",
-"Download" => "Télécharger",
-"Edit" => "Éditer",
-"Delete" => "Supprimer",
-"shared with you by" => "partagé avec vous par",
-"New calendar" => "Nouveau calendrier",
-"Edit calendar" => "Éditer le calendrier",
-"Displayname" => "Nom d'affichage",
-"Active" => "Actif",
-"Calendar color" => "Couleur du calendrier",
-"Save" => "Sauvegarder",
-"Submit" => "Soumettre",
-"Cancel" => "Annuler",
-"Edit an event" => "Éditer un événement",
-"Export" => "Exporter",
-"Eventinfo" => "Événement",
-"Repeating" => "Occurences",
-"Alarm" => "Alarmes",
-"Attendees" => "Participants",
-"Share" => "Partage",
-"Title of the Event" => "Titre de l'événement",
-"Category" => "Catégorie",
-"Separate categories with commas" => "Séparer les catégories par des virgules",
-"Edit categories" => "Modifier les catégories",
-"All Day Event" => "Journée entière",
-"From" => "De",
-"To" => "À",
-"Advanced options" => "Options avancées",
-"Location" => "Emplacement",
-"Location of the Event" => "Emplacement de l'événement",
-"Description" => "Description",
-"Description of the Event" => "Description de l'événement",
-"Repeat" => "Répétition",
-"Advanced" => "Avancé",
-"Select weekdays" => "Sélection des jours de la semaine",
-"Select days" => "Sélection des jours",
-"and the events day of year." => "et les événements de l'année par jour.",
-"and the events day of month." => "et les événements du mois par jour.",
-"Select months" => "Sélection des mois",
-"Select weeks" => "Sélection des semaines",
-"and the events week of year." => "et les événements de l'année par semaine.",
-"Interval" => "Intervalle",
-"End" => "Fin",
-"occurrences" => "occurrences",
-"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",
-"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",
-"of" => "de",
-"at" => "à",
-"Timezone" => "Fuseau horaire",
-"24h" => "24h",
-"12h" => "12h",
-"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",
-"Groups" => "Groupes",
-"select groups" => "sélectionner les groupes",
-"make public" => "rendre public"
-);
diff --git a/apps/calendar/l10n/gl.php b/apps/calendar/l10n/gl.php
deleted file mode 100644
index ff7e4833ad..0000000000
--- a/apps/calendar/l10n/gl.php
+++ /dev/null
@@ -1,156 +0,0 @@
-<?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",
-"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",
-"Clients" => "Clientes",
-"Deliverer" => "Remitente",
-"Holidays" => "Vacacións",
-"Ideas" => "Ideas",
-"Journey" => "Viaxe",
-"Jubilee" => "Aniversario especial",
-"Meeting" => "Reunión",
-"Other" => "Outro",
-"Personal" => "Persoal",
-"Projects" => "Proxectos",
-"Questions" => "Preguntas",
-"Work" => "Traballo",
-"unnamed" => "sen nome",
-"New Calendar" => "Novo calendario",
-"Does not repeat" => "Non se repite",
-"Daily" => "A diario",
-"Weekly" => "Semanalmente",
-"Every Weekday" => "Todas as semanas",
-"Bi-Weekly" => "Cada dúas semanas",
-"Monthly" => "Mensual",
-"Yearly" => "Anual",
-"never" => "nunca",
-"by occurrences" => "por acontecementos",
-"by date" => "por data",
-"by monthday" => "por día do mes",
-"by weekday" => "por día da semana",
-"Monday" => "Luns",
-"Tuesday" => "Martes",
-"Wednesday" => "Mércores",
-"Thursday" => "Xoves",
-"Friday" => "Venres",
-"Saturday" => "Sábado",
-"Sunday" => "Domingo",
-"events week of month" => "semana dos eventos no mes",
-"first" => "primeiro",
-"second" => "segundo",
-"third" => "terceiro",
-"fourth" => "cuarto",
-"fifth" => "quinto",
-"last" => "último",
-"January" => "Xaneiro",
-"February" => "Febreiro",
-"March" => "Marzo",
-"April" => "Abril",
-"May" => "Maio",
-"June" => "Xuño",
-"July" => "Xullo",
-"August" => "Agosto",
-"September" => "Setembro",
-"October" => "Outubro",
-"November" => "Novembro",
-"December" => "Decembro",
-"by events date" => "por data dos eventos",
-"by yearday(s)" => "por dia(s) do ano",
-"by weeknumber(s)" => "por número(s) de semana",
-"by day and month" => "por día e mes",
-"Date" => "Data",
-"Cal." => "Cal.",
-"All day" => "Todo o dia",
-"Missing fields" => "Faltan campos",
-"Title" => "Título",
-"From Date" => "Desde a data",
-"From Time" => "Desde a hora",
-"To Date" => "á data",
-"To Time" => "á hora",
-"The event ends before it starts" => "O evento remata antes de iniciarse",
-"There was a database fail" => "Produciuse un erro na base de datos",
-"Week" => "Semana",
-"Month" => "Mes",
-"List" => "Lista",
-"Today" => "Hoxe",
-"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",
-"Active" => "Activo",
-"Calendar color" => "Cor do calendario",
-"Save" => "Gardar",
-"Submit" => "Enviar",
-"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",
-"Advanced options" => "Opcións avanzadas",
-"Location" => "Localización",
-"Location of the Event" => "Localización do evento",
-"Description" => "Descrición",
-"Description of the Event" => "Descrición do evento",
-"Repeat" => "Repetir",
-"Advanced" => "Avanzado",
-"Select weekdays" => "Seleccionar días da semana",
-"Select days" => "Seleccionar días",
-"and the events day of year." => "e día dos eventos no ano.",
-"and the events day of month." => "e día dos eventos no mes.",
-"Select months" => "Seleccione meses",
-"Select weeks" => "Seleccionar semanas",
-"and the events week of year." => "e semana dos eventos no ano.",
-"Interval" => "Intervalo",
-"End" => "Fin",
-"occurrences" => "acontecementos",
-"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",
-"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",
-"of" => "de",
-"at" => "a",
-"Timezone" => "Fuso horario",
-"24h" => "24h",
-"12h" => "12h",
-"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
deleted file mode 100644
index d5c0b2b2e5..0000000000
--- a/apps/calendar/l10n/he.php
+++ /dev/null
@@ -1,156 +0,0 @@
-<?php $TRANSLATIONS = array(
-"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" => "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" => "שיחה",
-"Clients" => "לקוחות",
-"Deliverer" => "משלוח",
-"Holidays" => "חגים",
-"Ideas" => "רעיונות",
-"Journey" => "מסע",
-"Jubilee" => "יובל",
-"Meeting" => "פגישה",
-"Other" => "אחר",
-"Personal" => "אישי",
-"Projects" => "פרוייקטים",
-"Questions" => "שאלות",
-"Work" => "עבודה",
-"unnamed" => "ללא שם",
-"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." => "לוח שנה",
-"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" => "היום",
-"Your calendars" => "לוחות השנה שלך",
-"CalDav Link" => "קישור CalDav",
-"Shared calendars" => "לוחות שנה מושתפים",
-"No shared calendars" => "אין לוחות שנה משותפים",
-"Share Calendar" => "שיתוף לוח שנה",
-"Download" => "הורדה",
-"Edit" => "עריכה",
-"Delete" => "מחיקה",
-"shared with you by" => "שותף אתך על ידי",
-"New calendar" => "לוח שנה חדש",
-"Edit calendar" => "עריכת לוח שנה",
-"Displayname" => "שם תצוגה",
-"Active" => "פעיל",
-"Calendar color" => "צבע לוח שנה",
-"Save" => "שמירה",
-"Submit" => "שליחה",
-"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" => "מופעים",
-"create a new calendar" => "יצירת לוח שנה חדש",
-"Import a calendar file" => "יבוא קובץ לוח שנה",
-"Name of new calendar" => "שם לוח השנה החדש",
-"Import" => "יבוא",
-"Close Dialog" => "סגירת הדו־שיח",
-"Create a new event" => "יצירת אירוע חדש",
-"View an event" => "צפייה באירוע",
-"No categories selected" => "לא נבחרו קטגוריות",
-"of" => "מתוך",
-"at" => "בשנה",
-"Timezone" => "אזור זמן",
-"24h" => "24 שעות",
-"12h" => "12 שעות",
-"Users" => "משתמשים",
-"select users" => "נא לבחור במשתמשים",
-"Editable" => "ניתן לעריכה",
-"Groups" => "קבוצות",
-"select groups" => "בחירת קבוצות",
-"make public" => "הפיכה לציבורי"
-);
diff --git a/apps/calendar/l10n/hr.php b/apps/calendar/l10n/hr.php
deleted file mode 100644
index 4ab5b95518..0000000000
--- a/apps/calendar/l10n/hr.php
+++ /dev/null
@@ -1,147 +0,0 @@
-<?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" => "Praznici",
-"Ideas" => "Ideje",
-"Journey" => "Putovanje",
-"Jubilee" => "Obljetnica",
-"Meeting" => "Sastanak",
-"Other" => "Ostalo",
-"Personal" => "Osobno",
-"Projects" => "Projekti",
-"Questions" => "Pitanja",
-"Work" => "Posao",
-"unnamed" => "bezimeno",
-"New Calendar" => "Novi kalendar",
-"Does not repeat" => "Ne ponavlja se",
-"Daily" => "Dnevno",
-"Weekly" => "Tjedno",
-"Every Weekday" => "Svakog radnog dana",
-"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",
-"Missing fields" => "Nedostaju polja",
-"Title" => "Naslov",
-"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",
-"Month" => "Mjesec",
-"List" => "Lista",
-"Today" => "Danas",
-"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",
-"Active" => "Aktivan",
-"Calendar color" => "Boja kalendara",
-"Save" => "Spremi",
-"Submit" => "Potvrdi",
-"Cancel" => "Odustani",
-"Edit an event" => "Uredi događaj",
-"Export" => "Izvoz",
-"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",
-"Description" => "Opis",
-"Description of the Event" => "Opis događaja",
-"Repeat" => "Ponavljanje",
-"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",
-"create a new calendar" => "stvori novi kalendar",
-"Import a calendar file" => "Uvozite datoteku kalendara",
-"Name of new calendar" => "Ime novog kalendara",
-"Import" => "Uvoz",
-"Close Dialog" => "Zatvori dijalog",
-"Create a new event" => "Unesi novi događaj",
-"View an event" => "Vidjeti događaj",
-"No categories selected" => "Nema odabranih kategorija",
-"of" => "od",
-"at" => "na",
-"Timezone" => "Vremenska zona",
-"24h" => "24h",
-"12h" => "12h",
-"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/hu_HU.php b/apps/calendar/l10n/hu_HU.php
deleted file mode 100644
index 3ef4b9675b..0000000000
--- a/apps/calendar/l10n/hu_HU.php
+++ /dev/null
@@ -1,156 +0,0 @@
-<?php $TRANSLATIONS = array(
-"No calendars found." => "Nem található naptár",
-"No events found." => "Nem található esemény",
-"Wrong calendar" => "Hibás naptár",
-"New Timezone:" => "Új időzóna",
-"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",
-"Clients" => "Kliensek",
-"Deliverer" => "Szállító",
-"Holidays" => "Ünnepek",
-"Ideas" => "Ötletek",
-"Journey" => "Utazás",
-"Jubilee" => "Évforduló",
-"Meeting" => "Találkozó",
-"Other" => "Egyéb",
-"Personal" => "Személyes",
-"Projects" => "Projektek",
-"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",
-"Every Weekday" => "Minden hétköznap",
-"Bi-Weekly" => "Kéthetente",
-"Monthly" => "Havi",
-"Yearly" => "Évi",
-"never" => "soha",
-"by occurrences" => "előfordulás szerint",
-"by date" => "dátum szerint",
-"by monthday" => "hónap napja szerint",
-"by weekday" => "hét napja szerint",
-"Monday" => "Hétfő",
-"Tuesday" => "Kedd",
-"Wednesday" => "Szerda",
-"Thursday" => "Csütörtök",
-"Friday" => "Péntek",
-"Saturday" => "Szombat",
-"Sunday" => "Vasárnap",
-"events week of month" => "hónap heteinek sorszáma",
-"first" => "első",
-"second" => "második",
-"third" => "harmadik",
-"fourth" => "negyedik",
-"fifth" => "ötödik",
-"last" => "utolsó",
-"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",
-"by events date" => "az esemény napja szerint",
-"by yearday(s)" => "az év napja(i) szerint",
-"by weeknumber(s)" => "a hét sorszáma szerint",
-"by day and month" => "nap és hónap szerint",
-"Date" => "Dátum",
-"Cal." => "Naptár",
-"All day" => "Egész nap",
-"Missing fields" => "Hiányzó mezők",
-"Title" => "Cím",
-"From Date" => "Napjától",
-"From Time" => "Időtől",
-"To Date" => "Napig",
-"To Time" => "Ideig",
-"The event ends before it starts" => "Az esemény véget ér a kezdés előtt.",
-"There was a database fail" => "Adatbázis hiba történt",
-"Week" => "Hét",
-"Month" => "Hónap",
-"List" => "Lista",
-"Today" => "Ma",
-"Your calendars" => "Naptárjaid",
-"CalDav Link" => "CalDAV link",
-"Shared calendars" => "Megosztott naptárak",
-"No shared calendars" => "Nincs megosztott naptár",
-"Share Calendar" => "Naptármegosztás",
-"Download" => "Letöltés",
-"Edit" => "Szerkesztés",
-"Delete" => "Törlés",
-"shared with you by" => "megosztotta veled: ",
-"New calendar" => "Új naptár",
-"Edit calendar" => "Naptár szerkesztése",
-"Displayname" => "Megjelenítési név",
-"Active" => "Aktív",
-"Calendar color" => "Naptár szín",
-"Save" => "Mentés",
-"Submit" => "Beküldés",
-"Cancel" => "Mégse",
-"Edit an event" => "Esemény szerkesztése",
-"Export" => "Export",
-"Eventinfo" => "Eseményinfó",
-"Repeating" => "Ismétlődő",
-"Alarm" => "Riasztás",
-"Attendees" => "Résztvevők",
-"Share" => "Megosztás",
-"Title of the Event" => "Az esemény címe",
-"Category" => "Kategória",
-"Separate categories with commas" => "Vesszővel válaszd el a kategóriákat",
-"Edit categories" => "Kategóriák szerkesztése",
-"All Day Event" => "Egész napos esemény",
-"From" => "Ettől",
-"To" => "Eddig",
-"Advanced options" => "Haladó beállítások",
-"Location" => "Hely",
-"Location of the Event" => "Az esemény helyszíne",
-"Description" => "Leírás",
-"Description of the Event" => "Az esemény leírása",
-"Repeat" => "Ismétlés",
-"Advanced" => "Haladó",
-"Select weekdays" => "Hétköznapok kiválasztása",
-"Select days" => "Napok kiválasztása",
-"and the events day of year." => "és az éves esemény napja.",
-"and the events day of month." => "és a havi esemény napja.",
-"Select months" => "Hónapok kiválasztása",
-"Select weeks" => "Hetek kiválasztása",
-"and the events week of year." => "és az heti esemény napja.",
-"Interval" => "Időköz",
-"End" => "Vége",
-"occurrences" => "előfordulások",
-"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",
-"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",
-"of" => ", tulaj ",
-"at" => ", ",
-"Timezone" => "Időzóna",
-"24h" => "24h",
-"12h" => "12h",
-"Users" => "Felhasználók",
-"select users" => "válassz felhasználókat",
-"Editable" => "Szerkeszthető",
-"Groups" => "Csoportok",
-"select groups" => "válassz csoportokat",
-"make public" => "nyilvánossá tétel"
-);
diff --git a/apps/calendar/l10n/hy.php b/apps/calendar/l10n/hy.php
deleted file mode 100644
index 3b675693b0..0000000000
--- a/apps/calendar/l10n/hy.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Calendar" => "Օրացույց",
-"Other" => "Այլ",
-"Month" => "Ամիս",
-"Today" => "Այսօր",
-"Download" => "Բեռնել",
-"Delete" => "Ջնջել",
-"Save" => "Պահպանել",
-"Submit" => "Հաստատել",
-"Description" => "Նկարագրություն"
-);
diff --git a/apps/calendar/l10n/ia.php b/apps/calendar/l10n/ia.php
deleted file mode 100644
index 84c36536b9..0000000000
--- a/apps/calendar/l10n/ia.php
+++ /dev/null
@@ -1,110 +0,0 @@
-<?php $TRANSLATIONS = array(
-"No calendars found." => "Necun calendarios trovate.",
-"No events found." => "Nulle eventos trovate.",
-"New Timezone:" => "Nove fuso horari",
-"Invalid request" => "Requesta invalide.",
-"Calendar" => "Calendario",
-"Birthday" => "Anniversario de nativitate",
-"Business" => "Affaires",
-"Call" => "Appello",
-"Clients" => "Clientes",
-"Holidays" => "Dies feriate",
-"Meeting" => "Incontro",
-"Other" => "Altere",
-"Personal" => "Personal",
-"Projects" => "Projectos",
-"Questions" => "Demandas",
-"Work" => "Travalio",
-"unnamed" => "sin nomine",
-"New Calendar" => "Nove calendario",
-"Does not repeat" => "Non repite",
-"Daily" => "Quotidian",
-"Weekly" => "Septimanal",
-"Every Weekday" => "Cata die",
-"Monthly" => "Mensual",
-"Yearly" => "Cata anno",
-"never" => "nunquam",
-"by date" => "per data",
-"Monday" => "Lunedi",
-"Tuesday" => "Martedi",
-"Wednesday" => "Mercuridi",
-"Thursday" => "Jovedi",
-"Friday" => "Venerdi",
-"Saturday" => "Sabbato",
-"Sunday" => "Dominica",
-"first" => "prime",
-"second" => "secunde",
-"third" => "tertie",
-"last" => "ultime",
-"January" => "januario",
-"February" => "Februario",
-"March" => "Martio",
-"April" => "April",
-"May" => "Mai",
-"June" => "Junio",
-"July" => "Julio",
-"August" => "Augusto",
-"September" => "Septembre",
-"October" => "Octobre",
-"November" => "Novembre",
-"December" => "Decembre",
-"by events date" => "per data de eventos",
-"by day and month" => "per dia e mense",
-"Date" => "Data",
-"All day" => "Omne die",
-"Missing fields" => "Campos incomplete",
-"Title" => "Titulo",
-"From Date" => "Data de initio",
-"From Time" => "Hora de initio",
-"To Date" => "Data de fin",
-"To Time" => "Hora de fin",
-"Week" => "Septimana",
-"Month" => "Mense",
-"List" => "Lista",
-"Today" => "Hodie",
-"Your calendars" => "Tu calendarios",
-"Download" => "Discarga",
-"Edit" => "Modificar",
-"Delete" => "Deler",
-"New calendar" => "Nove calendario",
-"Edit calendar" => "Modificar calendario",
-"Active" => "Active",
-"Calendar color" => "Color de calendario",
-"Save" => "Salveguardar",
-"Submit" => "Inviar",
-"Cancel" => "Cancellar",
-"Edit an event" => "Modificar evento",
-"Export" => "Exportar",
-"Share" => "Compartir",
-"Title of the Event" => "Titulo del evento.",
-"Category" => "Categoria",
-"Edit categories" => "Modificar categorias",
-"From" => "Ab",
-"To" => "A",
-"Advanced options" => "Optiones avantiate",
-"Location" => "Loco",
-"Location of the Event" => "Loco del evento.",
-"Description" => "Description",
-"Description of the Event" => "Description del evento",
-"Repeat" => "Repeter",
-"Advanced" => "Avantiate",
-"Select weekdays" => "Seliger dies del septimana",
-"Select days" => "Seliger dies",
-"Select months" => "Seliger menses",
-"Select weeks" => "Seliger septimanas",
-"Interval" => "Intervallo",
-"End" => "Fin",
-"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",
-"of" => "de",
-"at" => "in",
-"Timezone" => "Fuso horari",
-"Users" => "Usatores",
-"Groups" => "Gruppos"
-);
diff --git a/apps/calendar/l10n/id.php b/apps/calendar/l10n/id.php
deleted file mode 100644
index 865c2118fa..0000000000
--- a/apps/calendar/l10n/id.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Timezone changed" => "Zona waktu telah diubah",
-"Invalid request" => "Permintaan tidak sah",
-"Calendar" => "Kalender",
-"Does not repeat" => "Tidak akan mengulangi",
-"Daily" => "Harian",
-"Weekly" => "Mingguan",
-"Every Weekday" => "Setiap Hari Minggu",
-"Bi-Weekly" => "Dwi-mingguan",
-"Monthly" => "Bulanan",
-"Yearly" => "Tahunan",
-"All day" => "Semua Hari",
-"Title" => "Judul",
-"Week" => "Minggu",
-"Month" => "Bulan",
-"Today" => "Hari ini",
-"Download" => "Unduh",
-"Edit" => "Sunting",
-"Edit calendar" => "Sunting kalender",
-"Displayname" => "Namatampilan",
-"Active" => "Aktif",
-"Calendar color" => "Warna kalender",
-"Submit" => "Sampaikan",
-"Edit an event" => "Sunting agenda",
-"Title of the Event" => "Judul Agenda",
-"Category" => "Kategori",
-"All Day Event" => "Agenda di Semua Hari",
-"From" => "Dari",
-"To" => "Ke",
-"Location" => "Lokasi",
-"Location of the Event" => "Lokasi Agenda",
-"Description" => "Deskripsi",
-"Description of the Event" => "Deskripsi dari Agenda",
-"Repeat" => "Ulangi",
-"Create a new event" => "Buat agenda baru",
-"Timezone" => "Zonawaktu"
-);
diff --git a/apps/calendar/l10n/it.php b/apps/calendar/l10n/it.php
deleted file mode 100644
index 04e10b582b..0000000000
--- a/apps/calendar/l10n/it.php
+++ /dev/null
@@ -1,198 +0,0 @@
-<?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" => "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" => "Compleanno",
-"Business" => "Azienda",
-"Call" => "Chiama",
-"Clients" => "Clienti",
-"Deliverer" => "Consegna",
-"Holidays" => "Vacanze",
-"Ideas" => "Idee",
-"Journey" => "Viaggio",
-"Jubilee" => "Anniversario",
-"Meeting" => "Riunione",
-"Other" => "Altro",
-"Personal" => "Personale",
-"Projects" => "Progetti",
-"Questions" => "Domande",
-"Work" => "Lavoro",
-"by" => "da",
-"unnamed" => "senza nome",
-"New Calendar" => "Nuovo calendario",
-"Does not repeat" => "Non ripetere",
-"Daily" => "Giornaliero",
-"Weekly" => "Settimanale",
-"Every Weekday" => "Ogni giorno della settimana",
-"Bi-Weekly" => "Ogni due settimane",
-"Monthly" => "Mensile",
-"Yearly" => "Annuale",
-"never" => "mai",
-"by occurrences" => "per occorrenze",
-"by date" => "per data",
-"by monthday" => "per giorno del mese",
-"by weekday" => "per giorno della settimana",
-"Monday" => "Lunedì",
-"Tuesday" => "Martedì",
-"Wednesday" => "Mercoledì",
-"Thursday" => "Giovedì",
-"Friday" => "Venerdì",
-"Saturday" => "Sabato",
-"Sunday" => "Domenica",
-"events week of month" => "settimana del mese degli eventi",
-"first" => "primo",
-"second" => "secondo",
-"third" => "terzo",
-"fourth" => "quarto",
-"fifth" => "quinto",
-"last" => "ultimo",
-"January" => "Gennaio",
-"February" => "Febbraio",
-"March" => "Marzo",
-"April" => "Aprile",
-"May" => "Maggio",
-"June" => "Giugno",
-"July" => "Luglio",
-"August" => "Agosto",
-"September" => "Settembre",
-"October" => "Ottobre",
-"November" => "Novembre",
-"December" => "Dicembre",
-"by events date" => "per data evento",
-"by yearday(s)" => "per giorno/i dell'anno",
-"by weeknumber(s)" => "per numero/i settimana",
-"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",
-"Missing fields" => "Campi mancanti",
-"Title" => "Titolo",
-"From Date" => "Dal giorno",
-"From Time" => "Ora iniziale",
-"To Date" => "Al giorno",
-"To Time" => "Ora finale",
-"The event ends before it starts" => "L'evento finisce prima d'iniziare",
-"There was a database fail" => "Si è verificato un errore del database",
-"Week" => "Settimana",
-"Month" => "Mese",
-"List" => "Elenco",
-"Today" => "Oggi",
-"Settings" => "Impostazioni",
-"Your calendars" => "I tuoi calendari",
-"CalDav Link" => "Collegamento CalDav",
-"Shared calendars" => "Calendari condivisi",
-"No shared calendars" => "Nessun calendario condiviso",
-"Share Calendar" => "Condividi calendario",
-"Download" => "Scarica",
-"Edit" => "Modifica",
-"Delete" => "Elimina",
-"shared with you by" => "condiviso con te da",
-"New calendar" => "Nuovo calendario",
-"Edit calendar" => "Modifica calendario",
-"Displayname" => "Nome visualizzato",
-"Active" => "Attivo",
-"Calendar color" => "Colore calendario",
-"Save" => "Salva",
-"Submit" => "Invia",
-"Cancel" => "Annulla",
-"Edit an event" => "Modifica un evento",
-"Export" => "Esporta",
-"Eventinfo" => "Informazioni evento",
-"Repeating" => "Ripetizione",
-"Alarm" => "Avviso",
-"Attendees" => "Partecipanti",
-"Share" => "Condividi",
-"Title of the Event" => "Titolo dell'evento",
-"Category" => "Categoria",
-"Separate categories with commas" => "Categorie separate da virgole",
-"Edit categories" => "Modifica le categorie",
-"All Day Event" => "Evento che occupa tutta la giornata",
-"From" => "Da",
-"To" => "A",
-"Advanced options" => "Opzioni avanzate",
-"Location" => "Luogo",
-"Location of the Event" => "Luogo dell'evento",
-"Description" => "Descrizione",
-"Description of the Event" => "Descrizione dell'evento",
-"Repeat" => "Ripeti",
-"Advanced" => "Avanzato",
-"Select weekdays" => "Seleziona i giorni della settimana",
-"Select days" => "Seleziona i giorni",
-"and the events day of year." => "e il giorno dell'anno degli eventi.",
-"and the events day of month." => "e il giorno del mese degli eventi.",
-"Select months" => "Seleziona i mesi",
-"Select weeks" => "Seleziona le settimane",
-"and the events week of year." => "e la settimana dell'anno degli eventi.",
-"Interval" => "Intervallo",
-"End" => "Fine",
-"occurrences" => "occorrenze",
-"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",
-"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",
-"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)",
-"iOS/OS X" => "iOS/OS X",
-"Read only iCalendar link(s)" => "Collegamento(i) iCalendar sola lettura",
-"Users" => "Utenti",
-"select users" => "seleziona utenti",
-"Editable" => "Modificabile",
-"Groups" => "Gruppi",
-"select groups" => "seleziona gruppi",
-"make public" => "rendi pubblico"
-);
diff --git a/apps/calendar/l10n/ja_JP.php b/apps/calendar/l10n/ja_JP.php
deleted file mode 100644
index 3c7793a850..0000000000
--- a/apps/calendar/l10n/ja_JP.php
+++ /dev/null
@@ -1,198 +0,0 @@
-<?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" => "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" => "電話をかける",
-"Clients" => "顧客",
-"Deliverer" => "運送会社",
-"Holidays" => "休日",
-"Ideas" => "アイデア",
-"Journey" => "旅行",
-"Jubilee" => "記念祭",
-"Meeting" => "ミーティング",
-"Other" => "その他",
-"Personal" => "個人",
-"Projects" => "プロジェクト",
-"Questions" => "質問事項",
-"Work" => "週の始まり",
-"by" => "による",
-"unnamed" => "無名",
-"New Calendar" => "新しくカレンダーを作成",
-"Does not repeat" => "繰り返さない",
-"Daily" => "毎日",
-"Weekly" => "毎週",
-"Every Weekday" => "毎平日",
-"Bi-Weekly" => "2週間ごと",
-"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" => "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" => "終日",
-"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" => "今日",
-"Settings" => "設定",
-"Your calendars" => "あなたのカレンダー",
-"CalDav Link" => "CalDavへのリンク",
-"Shared calendars" => "共有カレンダー",
-"No shared calendars" => "共有カレンダーはありません",
-"Share Calendar" => "カレンダーを共有する",
-"Download" => "ダウンロード",
-"Edit" => "編集",
-"Delete" => "削除",
-"shared with you by" => "共有者",
-"New calendar" => "新しいカレンダー",
-"Edit calendar" => "カレンダーを編集",
-"Displayname" => "表示名",
-"Active" => "アクティブ",
-"Calendar color" => "カレンダーの色",
-"Save" => "保存",
-"Submit" => "完了",
-"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" => "回繰り返す",
-"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" => "新しいイベントを作成",
-"View an event" => "イベントを閲覧",
-"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)" => "プライマリアドレス（コンタクト等）",
-"iOS/OS X" => "iOS/OS X",
-"Read only iCalendar link(s)" => "読み取り専用のiCalendarリンク",
-"Users" => "ユーザ",
-"select users" => "ユーザを選択",
-"Editable" => "編集可能",
-"Groups" => "グループ",
-"select groups" => "グループを選択",
-"make public" => "公開する"
-);
diff --git a/apps/calendar/l10n/ko.php b/apps/calendar/l10n/ko.php
deleted file mode 100644
index 77e421d4aa..0000000000
--- a/apps/calendar/l10n/ko.php
+++ /dev/null
@@ -1,156 +0,0 @@
-<?php $TRANSLATIONS = array(
-"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" => "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" => "배송",
-"Holidays" => "공휴일",
-"Ideas" => "생각",
-"Journey" => "여행",
-"Jubilee" => "기념일",
-"Meeting" => "미팅",
-"Other" => "기타",
-"Personal" => "개인",
-"Projects" => "프로젝트",
-"Questions" => "질문",
-"Work" => "작업",
-"unnamed" => "익명의",
-"New Calendar" => "새로운 달력",
-"Does not repeat" => "반복 없음",
-"Daily" => "매일",
-"Weekly" => "매주",
-"Every Weekday" => "매주 특정 요일",
-"Bi-Weekly" => "2주마다",
-"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" => "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." => "달력",
-"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" => "오늘",
-"Your calendars" => "내 달력",
-"CalDav Link" => "CalDav 링크",
-"Shared calendars" => "공유 달력",
-"No shared calendars" => "달력 공유하지 않음",
-"Share Calendar" => "달력 공유",
-"Download" => "다운로드",
-"Edit" => "편집",
-"Delete" => "삭제",
-"shared with you by" => "로 인해 당신과 함께 공유",
-"New calendar" => "새로운 달력",
-"Edit calendar" => "달력 편집",
-"Displayname" => "표시 이름",
-"Active" => "활성",
-"Calendar color" => "달력 색상",
-"Save" => "저장",
-"Submit" => "보내기",
-"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" => "번 이후",
-"create a new calendar" => "새 달력 만들기",
-"Import a calendar file" => "달력 파일 가져오기",
-"Name of new calendar" => "새 달력 이름",
-"Import" => "입력",
-"Close Dialog" => "대화 마침",
-"Create a new event" => "새 이벤트 만들기",
-"View an event" => "일정 보기",
-"No categories selected" => "선택된 카테고리 없음",
-"of" => "의",
-"at" => "에서",
-"Timezone" => "시간대",
-"24h" => "24시간",
-"12h" => "12시간",
-"Users" => "사용자",
-"select users" => "사용자 선택",
-"Editable" => "편집 가능",
-"Groups" => "그룹",
-"select groups" => "선택 그룹",
-"make public" => "공개"
-);
diff --git a/apps/calendar/l10n/lb.php b/apps/calendar/l10n/lb.php
deleted file mode 100644
index 1ef05b048c..0000000000
--- a/apps/calendar/l10n/lb.php
+++ /dev/null
@@ -1,123 +0,0 @@
-<?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",
-"Clients" => "Clienten",
-"Deliverer" => "Liwwerant",
-"Holidays" => "Vakanzen",
-"Ideas" => "Ideeën",
-"Journey" => "Dag",
-"Jubilee" => "Jubiläum",
-"Meeting" => "Meeting",
-"Other" => "Aner",
-"Personal" => "Perséinlech",
-"Projects" => "Projeten",
-"Questions" => "Froen",
-"Work" => "Aarbecht",
-"New Calendar" => "Neien Kalenner",
-"Does not repeat" => "Widderhëlt sech net",
-"Daily" => "Deeglech",
-"Weekly" => "All Woch",
-"Every Weekday" => "All Wochendag",
-"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",
-"Missing fields" => "Felder déi feelen",
-"Title" => "Titel",
-"From Date" => "Vun Datum",
-"From Time" => "Vun Zäit",
-"To Date" => "Bis Datum",
-"To Time" => "Bis Zäit",
-"The event ends before it starts" => "D'Evenement hält op ier et ufänkt",
-"There was a database fail" => "En Datebank Feeler ass opgetrueden",
-"Week" => "Woch",
-"Month" => "Mount",
-"List" => "Lescht",
-"Today" => "Haut",
-"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",
-"New calendar" => "Neien Kalenner",
-"Edit calendar" => "Kalenner editéieren",
-"Displayname" => "Numm",
-"Active" => "Aktiv",
-"Calendar color" => "Fuerf vum Kalenner",
-"Save" => "Späicheren",
-"Submit" => "Fortschécken",
-"Cancel" => "Ofbriechen",
-"Edit an event" => "Evenement editéieren",
-"Export" => "Export",
-"Title of the Event" => "Titel vum Evenement",
-"Category" => "Kategorie",
-"All Day Event" => "Ganz-Dag Evenement",
-"From" => "Vun",
-"To" => "Fir",
-"Advanced options" => "Avancéiert Optiounen",
-"Location" => "Uert",
-"Location of the Event" => "Uert vum Evenement",
-"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",
-"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",
-"Close Dialog" => "Dialog zoumaachen",
-"Create a new event" => "En Evenement maachen",
-"Timezone" => "Zäitzon",
-"24h" => "24h",
-"12h" => "12h"
-);
diff --git a/apps/calendar/l10n/lt_LT.php b/apps/calendar/l10n/lt_LT.php
deleted file mode 100644
index feb8618897..0000000000
--- a/apps/calendar/l10n/lt_LT.php
+++ /dev/null
@@ -1,131 +0,0 @@
-<?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",
-"Clients" => "Klientai",
-"Deliverer" => "Vykdytojas",
-"Holidays" => "Išeiginės",
-"Ideas" => "Idėjos",
-"Journey" => "Kelionė",
-"Jubilee" => "Jubiliejus",
-"Meeting" => "Susitikimas",
-"Other" => "Kiti",
-"Personal" => "Asmeniniai",
-"Projects" => "Projektai",
-"Questions" => "Klausimai",
-"Work" => "Darbas",
-"unnamed" => "be pavadinimo",
-"New Calendar" => "Naujas kalendorius",
-"Does not repeat" => "Nekartoti",
-"Daily" => "Kasdien",
-"Weekly" => "Kiekvieną savaitę",
-"Every Weekday" => "Kiekvieną savaitės dieną",
-"Bi-Weekly" => "Kas dvi savaites",
-"Monthly" => "Kiekvieną mėnesį",
-"Yearly" => "Kiekvienais metais",
-"never" => "niekada",
-"by date" => "pagal datą",
-"by monthday" => "pagal mėnesio dieną",
-"by weekday" => "pagal savaitės dieną",
-"Monday" => "Pirmadienis",
-"Tuesday" => "Antradienis",
-"Wednesday" => "Trečiadienis",
-"Thursday" => "Ketvirtadienis",
-"Friday" => "Penktadienis",
-"Saturday" => "Šeštadienis",
-"Sunday" => "Sekmadienis",
-"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",
-"Date" => "Data",
-"Cal." => "Kal.",
-"All day" => "Visa diena",
-"Missing fields" => "Trūkstami laukai",
-"Title" => "Pavadinimas",
-"From Date" => "Nuo datos",
-"From Time" => "Nuo laiko",
-"To Date" => "Iki datos",
-"To Time" => "Iki laiko",
-"The event ends before it starts" => "Įvykis baigiasi anksčiau nei jis prasideda",
-"There was a database fail" => "Įvyko duomenų bazės klaida",
-"Week" => "Savaitė",
-"Month" => "Mėnuo",
-"List" => "Sąrašas",
-"Today" => "Šiandien",
-"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",
-"New calendar" => "Naujas kalendorius",
-"Edit calendar" => "Taisyti kalendorių",
-"Displayname" => "Pavadinimas",
-"Active" => "Naudojamas",
-"Calendar color" => "Kalendoriaus spalva",
-"Save" => "Išsaugoti",
-"Submit" => "Išsaugoti",
-"Cancel" => "Atšaukti",
-"Edit an event" => "Taisyti įvykį",
-"Export" => "Eksportuoti",
-"Eventinfo" => "Informacija",
-"Repeating" => "Pasikartojantis",
-"Alarm" => "Priminimas",
-"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",
-"Advanced options" => "Papildomi nustatymai",
-"Location" => "Vieta",
-"Location of the Event" => "Įvykio vieta",
-"Description" => "Aprašymas",
-"Description of the Event" => "Įvykio aprašymas",
-"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",
-"create a new calendar" => "sukurti naują kalendorių",
-"Import a calendar file" => "Importuoti kalendoriaus failą",
-"Name of new calendar" => "Naujo kalendoriaus pavadinimas",
-"Import" => "Importuoti",
-"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",
-"Timezone" => "Laiko juosta",
-"24h" => "24val",
-"12h" => "12val",
-"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/mk.php b/apps/calendar/l10n/mk.php
deleted file mode 100644
index 1a03101fe5..0000000000
--- a/apps/calendar/l10n/mk.php
+++ /dev/null
@@ -1,156 +0,0 @@
-<?php $TRANSLATIONS = array(
-"No calendars found." => "Не се најдени календари.",
-"No events found." => "Не се најдени настани.",
-"Wrong 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" => "Повикај",
-"Clients" => "Клиенти",
-"Deliverer" => "Доставувач",
-"Holidays" => "Празници",
-"Ideas" => "Идеи",
-"Journey" => "Патување",
-"Jubilee" => "Јубилеј",
-"Meeting" => "Состанок",
-"Other" => "Останато",
-"Personal" => "Лично",
-"Projects" => "Проекти",
-"Questions" => "Прашања",
-"Work" => "Работа",
-"unnamed" => "неименувано",
-"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." => "Кал.",
-"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" => "Денеска",
-"Your calendars" => "Ваши календари",
-"CalDav Link" => "Врска за CalDav",
-"Shared calendars" => "Споделени календари",
-"No shared calendars" => "Нема споделени календари",
-"Share Calendar" => "Сподели календар",
-"Download" => "Преземи",
-"Edit" => "Уреди",
-"Delete" => "Избриши",
-"shared with you by" => "Споделен со вас од",
-"New calendar" => "Нов календар",
-"Edit calendar" => "Уреди календар",
-"Displayname" => "Име за приказ",
-"Active" => "Активен",
-"Calendar color" => "Боја на календарот",
-"Save" => "Сними",
-"Submit" => "Прати",
-"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" => "повторувања",
-"create a new calendar" => "создади нов календар",
-"Import a calendar file" => "Внеси календар од датотека ",
-"Name of new calendar" => "Име на новиот календар",
-"Import" => "Увези",
-"Close Dialog" => "Затвори дијалог",
-"Create a new event" => "Создади нов настан",
-"View an event" => "Погледај настан",
-"No categories selected" => "Нема избрано категории",
-"of" => "од",
-"at" => "на",
-"Timezone" => "Временска зона",
-"24h" => "24ч",
-"12h" => "12ч",
-"Users" => "Корисници",
-"select users" => "избери корисници",
-"Editable" => "Изменливо",
-"Groups" => "Групи",
-"select groups" => "избери групи",
-"make public" => "направи јавно"
-);
diff --git a/apps/calendar/l10n/ms_MY.php b/apps/calendar/l10n/ms_MY.php
deleted file mode 100644
index 4be91a4019..0000000000
--- a/apps/calendar/l10n/ms_MY.php
+++ /dev/null
@@ -1,156 +0,0 @@
-<?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",
-"Clients" => "Klien",
-"Deliverer" => "Penghantar",
-"Holidays" => "Cuti",
-"Ideas" => "Idea",
-"Journey" => "Perjalanan",
-"Jubilee" => "Jubli",
-"Meeting" => "Perjumpaan",
-"Other" => "Lain",
-"Personal" => "Peribadi",
-"Projects" => "Projek",
-"Questions" => "Soalan",
-"Work" => "Kerja",
-"unnamed" => "tiada nama",
-"New Calendar" => "Kalendar baru",
-"Does not repeat" => "Tidak berulang",
-"Daily" => "Harian",
-"Weekly" => "Mingguan",
-"Every Weekday" => "Setiap hari minggu",
-"Bi-Weekly" => "Dua kali seminggu",
-"Monthly" => "Bulanan",
-"Yearly" => "Tahunan",
-"never" => "jangan",
-"by occurrences" => "dari kekerapan",
-"by date" => "dari tarikh",
-"by monthday" => "dari haribulan",
-"by weekday" => "dari hari minggu",
-"Monday" => "Isnin",
-"Tuesday" => "Selasa",
-"Wednesday" => "Rabu",
-"Thursday" => "Khamis",
-"Friday" => "Jumaat",
-"Saturday" => "Sabtu",
-"Sunday" => "Ahad",
-"events week of month" => "event minggu dari bulan",
-"first" => "pertama",
-"second" => "kedua",
-"third" => "ketiga",
-"fourth" => "keempat",
-"fifth" => "kelima",
-"last" => "akhir",
-"January" => "Januari",
-"February" => "Februari",
-"March" => "Mac",
-"April" => "April",
-"May" => "Mei",
-"June" => "Jun",
-"July" => "Julai",
-"August" => "Ogos",
-"September" => "September",
-"October" => "Oktober",
-"November" => "November",
-"December" => "Disember",
-"by events date" => "dari tarikh event",
-"by yearday(s)" => "dari tahun",
-"by weeknumber(s)" => "dari nombor minggu",
-"by day and month" => "dari hari dan bulan",
-"Date" => "Tarikh",
-"Cal." => "Kalendar",
-"All day" => "Sepanjang hari",
-"Missing fields" => "Ruangan tertinggal",
-"Title" => "Tajuk",
-"From Date" => "Dari tarikh",
-"From Time" => "Masa Dari",
-"To Date" => "Sehingga kini",
-"To Time" => "Semasa",
-"The event ends before it starts" => "Peristiwa berakhir sebelum bermula",
-"There was a database fail" => "Terdapat kegagalan pada pengkalan data",
-"Week" => "Minggu",
-"Month" => "Bulan",
-"List" => "Senarai",
-"Today" => "Hari ini",
-"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",
-"Active" => "Aktif",
-"Calendar color" => "Warna kalendar",
-"Save" => "Simpan",
-"Submit" => "Hantar",
-"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",
-"Advanced options" => "Pilihan maju",
-"Location" => "Lokasi",
-"Location of the Event" => "Lokasi agenda",
-"Description" => "Huraian",
-"Description of the Event" => "Huraian agenda",
-"Repeat" => "Ulang",
-"Advanced" => "Maju",
-"Select weekdays" => "Pilih hari minggu",
-"Select days" => "Pilih hari",
-"and the events day of year." => "dan hari event dalam tahun.",
-"and the events day of month." => "dan hari event dalam bulan.",
-"Select months" => "Pilih bulan",
-"Select weeks" => "Pilih minggu",
-"and the events week of year." => "dan event mingguan dalam setahun.",
-"Interval" => "Tempoh",
-"End" => "Tamat",
-"occurrences" => "Peristiwa",
-"create a new calendar" => "Cipta kalendar baru",
-"Import a calendar file" => "Import fail kalendar",
-"Name of new calendar" => "Nama kalendar baru",
-"Import" => "Import",
-"Close Dialog" => "Tutup dialog",
-"Create a new event" => "Buat agenda baru",
-"View an event" => "Papar peristiwa",
-"No categories selected" => "Tiada kategori dipilih",
-"of" => "dari",
-"at" => "di",
-"Timezone" => "Zon waktu",
-"24h" => "24h",
-"12h" => "12h",
-"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
deleted file mode 100644
index e4b859c737..0000000000
--- a/apps/calendar/l10n/nb_NO.php
+++ /dev/null
@@ -1,147 +0,0 @@
-<?php $TRANSLATIONS = array(
-"No calendars found." => "Ingen kalendere funnet",
-"No events found." => "Ingen hendelser funnet",
-"Wrong calendar" => "Feil kalender",
-"New Timezone:" => "Ny tidssone:",
-"Timezone changed" => "Tidssone endret",
-"Invalid request" => "Ugyldig forespørsel",
-"Calendar" => "Kalender",
-"Birthday" => "Bursdag",
-"Business" => "Forretninger",
-"Call" => "Ring",
-"Clients" => "Kunder",
-"Holidays" => "Ferie",
-"Ideas" => "Ideér",
-"Journey" => "Reise",
-"Jubilee" => "Jubileum",
-"Meeting" => "Møte",
-"Other" => "Annet",
-"Personal" => "ersonlig",
-"Projects" => "Prosjekter",
-"Questions" => "Spørsmål",
-"Work" => "Arbeid",
-"unnamed" => "uten navn",
-"New Calendar" => "Ny kalender",
-"Does not repeat" => "Gjentas ikke",
-"Daily" => "Daglig",
-"Weekly" => "Ukentlig",
-"Every Weekday" => "Hver ukedag",
-"Bi-Weekly" => "Annenhver uke",
-"Monthly" => "Månedlig",
-"Yearly" => "Årlig",
-"never" => "aldri",
-"by occurrences" => "etter hyppighet",
-"by date" => "etter dato",
-"by monthday" => "etter dag i måned",
-"by weekday" => "etter ukedag",
-"Monday" => "Mandag",
-"Tuesday" => "Tirsdag",
-"Wednesday" => "Onsdag",
-"Thursday" => "Torsdag",
-"Friday" => "Fredag",
-"Saturday" => "Lørdag",
-"Sunday" => "Søndag",
-"events week of month" => "begivenhetens uke denne måneden",
-"first" => "første",
-"second" => "andre",
-"third" => "tredje",
-"fourth" => "fjerde",
-"fifth" => "femte",
-"last" => "siste",
-"January" => "Januar",
-"February" => "Februar",
-"March" => "Mars",
-"April" => "April",
-"May" => "Mai",
-"June" => "Juni",
-"July" => "Juli",
-"August" => "August",
-"September" => "September",
-"October" => "Oktober",
-"November" => "November",
-"December" => "Desember",
-"by events date" => "etter hendelsenes dato",
-"by yearday(s)" => "etter dag i året",
-"by weeknumber(s)" => "etter ukenummer/-numre",
-"by day and month" => "etter dag og måned",
-"Date" => "Dato",
-"Cal." => "Kal.",
-"All day" => "Hele dagen ",
-"Missing fields" => "Manglende felt",
-"Title" => "Tittel",
-"From Date" => "Fra dato",
-"From Time" => "Fra tidspunkt",
-"To Date" => "Til dato",
-"To Time" => "Til tidspunkt",
-"The event ends before it starts" => "En hendelse kan ikke slutte før den har begynt.",
-"There was a database fail" => "Det oppstod en databasefeil.",
-"Week" => "Uke",
-"Month" => "ned",
-"List" => "Liste",
-"Today" => "I dag",
-"Your calendars" => "Dine kalendere",
-"CalDav Link" => "CalDav-lenke",
-"Shared calendars" => "Delte kalendere",
-"No shared calendars" => "Ingen delte kalendere",
-"Share Calendar" => "Del Kalender",
-"Download" => "Last ned",
-"Edit" => "Endre",
-"Delete" => "Slett",
-"shared with you by" => "delt med deg",
-"New calendar" => "Ny kalender",
-"Edit calendar" => "Rediger kalender",
-"Displayname" => "Visningsnavn",
-"Active" => "Aktiv",
-"Calendar color" => "Kalenderfarge",
-"Save" => "Lagre",
-"Submit" => "Lagre",
-"Cancel" => "Avbryt",
-"Edit an event" => "Rediger en hendelse",
-"Export" => "Eksporter",
-"Eventinfo" => "Hendelsesinformasjon",
-"Repeating" => "Gjentas",
-"Alarm" => "Alarm",
-"Attendees" => "Deltakere",
-"Share" => "Del",
-"Title of the Event" => "Hendelsestittel",
-"Category" => "Kategori",
-"Separate categories with commas" => "Separer kategorier med komma",
-"Edit categories" => "Rediger kategorier",
-"All Day Event" => "Hele dagen-hendelse",
-"From" => "Fra",
-"To" => "Til",
-"Advanced options" => "Avanserte innstillinger",
-"Location" => "Sted",
-"Location of the Event" => "Hendelsessted",
-"Description" => "Beskrivelse",
-"Description of the Event" => "Hendelesebeskrivelse",
-"Repeat" => "Gjenta",
-"Advanced" => "Avansert",
-"Select weekdays" => "Velg ukedager",
-"Select days" => "Velg dager",
-"and the events day of year." => "og hendelsenes dag i året.",
-"and the events day of month." => "og hendelsenes dag i måneden.",
-"Select months" => "Velg måneder",
-"Select weeks" => "Velg uker",
-"and the events week of year." => "og hendelsenes uke i året.",
-"Interval" => "Intervall",
-"End" => "Slutt",
-"occurrences" => "forekomster",
-"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",
-"Close Dialog" => "Lukk dialog",
-"Create a new event" => "Opprett en ny hendelse",
-"View an event" => "Se på hendelse",
-"No categories selected" => "Ingen kategorier valgt",
-"Timezone" => "Tidssone",
-"24h" => "24 t",
-"12h" => "12 t",
-"Users" => "Brukere",
-"select users" => "valgte brukere",
-"Editable" => "Redigerbar",
-"Groups" => "Grupper",
-"select groups" => "velg grupper",
-"make public" => "gjør offentlig"
-);
diff --git a/apps/calendar/l10n/nl.php b/apps/calendar/l10n/nl.php
deleted file mode 100644
index bc0954abe2..0000000000
--- a/apps/calendar/l10n/nl.php
+++ /dev/null
@@ -1,198 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Not all calendars are completely cached" => "Niet alle agenda's zijn volledig gecached",
-"Everything seems to be completely cached" => "Alles lijkt volledig gecached te zijn",
-"No calendars found." => "Geen kalenders gevonden.",
-"No events found." => "Geen gebeurtenissen gevonden.",
-"Wrong calendar" => "Verkeerde kalender",
-"The file contained either no events or all events are already saved in your calendar." => "Het bestand bevat geen gebeurtenissen of alle gebeurtenissen worden al in uw agenda bewaard.",
-"events has been saved in the new calendar" => "De gebeurtenissen worden in de nieuwe agenda bewaard",
-"Import failed" => "import is gefaald",
-"events has been saved in your calendar" => "de gebeurtenissen zijn in uw agenda opgeslagen ",
-"New Timezone:" => "Nieuwe tijdszone:",
-"Timezone changed" => "Tijdzone is veranderd",
-"Invalid request" => "Ongeldige aanvraag",
-"Calendar" => "Kalender",
-"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",
-"Clients" => "Klanten",
-"Deliverer" => "Leverancier",
-"Holidays" => "Vakantie",
-"Ideas" => "Ideeën",
-"Journey" => "Reis",
-"Jubilee" => "Jubileum",
-"Meeting" => "Vergadering",
-"Other" => "Ander",
-"Personal" => "Persoonlijk",
-"Projects" => "Projecten",
-"Questions" => "Vragen",
-"Work" => "Werk",
-"by" => "door",
-"unnamed" => "onbekend",
-"New Calendar" => "Nieuwe Kalender",
-"Does not repeat" => "Wordt niet herhaald",
-"Daily" => "Dagelijks",
-"Weekly" => "Wekelijks",
-"Every Weekday" => "Elke weekdag",
-"Bi-Weekly" => "Tweewekelijks",
-"Monthly" => "Maandelijks",
-"Yearly" => "Jaarlijks",
-"never" => "nooit meer",
-"by occurrences" => "volgens gebeurtenissen",
-"by date" => "op datum",
-"by monthday" => "per dag van de maand",
-"by weekday" => "op weekdag",
-"Monday" => "Maandag",
-"Tuesday" => "Dinsdag",
-"Wednesday" => "Woensdag",
-"Thursday" => "Donderdag",
-"Friday" => "Vrijdag",
-"Saturday" => "Zaterdag",
-"Sunday" => "Zondag",
-"events week of month" => "gebeurtenissen week van maand",
-"first" => "eerste",
-"second" => "tweede",
-"third" => "derde",
-"fourth" => "vierde",
-"fifth" => "vijfde",
-"last" => "laatste",
-"January" => "Januari",
-"February" => "Februari",
-"March" => "Maart",
-"April" => "April",
-"May" => "Mei",
-"June" => "Juni",
-"July" => "Juli",
-"August" => "Augustus",
-"September" => "September",
-"October" => "Oktober",
-"November" => "November",
-"December" => "December",
-"by events date" => "volgens evenementsdatum",
-"by yearday(s)" => "volgens jaardag(en)",
-"by weeknumber(s)" => "volgens weeknummer(s)",
-"by day and month" => "per dag en maand",
-"Date" => "Datum",
-"Cal." => "Cal.",
-"Sun." => "Zon.",
-"Mon." => "Maa.",
-"Tue." => "Din.",
-"Wed." => "Woe.",
-"Thu." => "Don.",
-"Fri." => "Vrij.",
-"Sat." => "Zat.",
-"Jan." => "Jan.",
-"Feb." => "Feb.",
-"Mar." => "Maa.",
-"Apr." => "Apr.",
-"May." => "Mei.",
-"Jun." => "Jun.",
-"Jul." => "Jul.",
-"Aug." => "Aug.",
-"Sep." => "Sep.",
-"Oct." => "Okt.",
-"Nov." => "Nov.",
-"Dec." => "Dec.",
-"All day" => "Hele dag",
-"Missing fields" => "missende velden",
-"Title" => "Titel",
-"From Date" => "Begindatum",
-"From Time" => "Begintijd",
-"To Date" => "Einddatum",
-"To Time" => "Eindtijd",
-"The event ends before it starts" => "Het evenement eindigt voordat het begint",
-"There was a database fail" => "Er was een databasefout",
-"Week" => "Week",
-"Month" => "Maand",
-"List" => "Lijst",
-"Today" => "Vandaag",
-"Settings" => "Instellingen",
-"Your calendars" => "Je kalenders",
-"CalDav Link" => "CalDav Link",
-"Shared calendars" => "Gedeelde kalenders",
-"No shared calendars" => "Geen gedeelde kalenders",
-"Share Calendar" => "Deel kalender",
-"Download" => "Download",
-"Edit" => "Bewerken",
-"Delete" => "Verwijderen",
-"shared with you by" => "gedeeld met jou door",
-"New calendar" => "Nieuwe kalender",
-"Edit calendar" => "Bewerk kalender",
-"Displayname" => "Weergavenaam",
-"Active" => "Actief",
-"Calendar color" => "Kalender kleur",
-"Save" => "Opslaan",
-"Submit" => "Opslaan",
-"Cancel" => "Annuleren",
-"Edit an event" => "Bewerken van een afspraak",
-"Export" => "Exporteren",
-"Eventinfo" => "Geberurtenisinformatie",
-"Repeating" => "Herhalend",
-"Alarm" => "Alarm",
-"Attendees" => "Deelnemers",
-"Share" => "Delen",
-"Title of the Event" => "Titel van de afspraak",
-"Category" => "Categorie",
-"Separate categories with commas" => "Gescheiden door komma's",
-"Edit categories" => "Wijzig categorieën",
-"All Day Event" => "Hele dag",
-"From" => "Van",
-"To" => "Aan",
-"Advanced options" => "Geavanceerde opties",
-"Location" => "Locatie",
-"Location of the Event" => "Locatie van de afspraak",
-"Description" => "Beschrijving",
-"Description of the Event" => "Beschrijving van het evenement",
-"Repeat" => "Herhalen",
-"Advanced" => "Geavanceerd",
-"Select weekdays" => "Selecteer weekdagen",
-"Select days" => "Selecteer dagen",
-"and the events day of year." => "en de gebeurtenissen dag van het jaar",
-"and the events day of month." => "en de gebeurtenissen dag van de maand",
-"Select months" => "Selecteer maanden",
-"Select weeks" => "Selecteer weken",
-"and the events week of year." => "en de gebeurtenissen week van het jaar",
-"Interval" => "Interval",
-"End" => "Einde",
-"occurrences" => "gebeurtenissen",
-"create a new calendar" => "Maak een nieuw agenda",
-"Import a calendar file" => "Importeer een agenda bestand",
-"Please choose a calendar" => "Kies een agenda",
-"Name of new calendar" => "Naam van de nieuwe agenda",
-"Take an available name!" => "Kies een beschikbare naam!",
-"A Calendar with this name already exists. If you continue anyhow, these calendars will be merged." => "Een agenda met deze naam bestaat al.  Als u doorgaat, worden deze agenda's samengevoegd",
-"Import" => "Importeer",
-"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",
-"of" => "van",
-"at" => "op",
-"General" => "Algemeen",
-"Timezone" => "Tijdzone",
-"Update timezone automatically" => "Werk de tijdzone automatisch bij",
-"Time format" => "Tijd formaat",
-"24h" => "24uur",
-"12h" => "12uur",
-"Start week on" => "Begin de week op",
-"Cache" => "Cache",
-"Clear cache for repeating events" => "Leeg cache voor repeterende gebeurtenissen",
-"URLs" => "URLs",
-"Calendar CalDAV syncing addresses" => "Agenda CalDAV synchronisatie adres",
-"more info" => "meer informatie",
-"Primary address (Kontact et al)" => "Primary adres (voor Kontact en dergelijke)",
-"iOS/OS X" => "iOS/OS X",
-"Read only iCalendar link(s)" => "Alleen lezen iCalendar link(en)",
-"Users" => "Gebruikers",
-"select users" => "kies gebruikers",
-"Editable" => "Te wijzigen",
-"Groups" => "Groepen",
-"select groups" => "kies groep",
-"make public" => "maak publiek"
-);
diff --git a/apps/calendar/l10n/nn_NO.php b/apps/calendar/l10n/nn_NO.php
deleted file mode 100644
index 3330cc562b..0000000000
--- a/apps/calendar/l10n/nn_NO.php
+++ /dev/null
@@ -1,125 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Wrong calendar" => "Feil kalender",
-"New Timezone:" => "Ny tidssone:",
-"Timezone changed" => "Endra tidssone",
-"Invalid request" => "Ugyldig førespurnad",
-"Calendar" => "Kalender",
-"Birthday" => "Bursdag",
-"Business" => "Forretning",
-"Call" => "Telefonsamtale",
-"Clients" => "Klientar",
-"Deliverer" => "Forsending",
-"Holidays" => "Høgtid",
-"Ideas" => "Idear",
-"Journey" => "Reise",
-"Jubilee" => "Jubileum",
-"Meeting" => "Møte",
-"Other" => "Anna",
-"Personal" => "Personleg",
-"Projects" => "Prosjekt",
-"Questions" => "Spørsmål",
-"Work" => "Arbeid",
-"New Calendar" => "Ny kalender",
-"Does not repeat" => "Ikkje gjenta",
-"Daily" => "Kvar dag",
-"Weekly" => "Kvar veke",
-"Every Weekday" => "Kvar vekedag",
-"Bi-Weekly" => "Annakvar veke",
-"Monthly" => "Kvar månad",
-"Yearly" => "Kvart år",
-"never" => "aldri",
-"by occurrences" => "av førekomstar",
-"by date" => "av dato",
-"by monthday" => "av månadsdag",
-"by weekday" => "av vekedag",
-"Monday" => "Måndag",
-"Tuesday" => "Tysdag",
-"Wednesday" => "Onsdag",
-"Thursday" => "Torsdag",
-"Friday" => "Fredag",
-"Saturday" => "Laurdag",
-"Sunday" => "Søndag",
-"events week of month" => "hendingas veke av månad",
-"first" => "første",
-"second" => "andre",
-"third" => "tredje",
-"fourth" => "fjerde",
-"fifth" => "femte",
-"last" => "siste",
-"January" => "Januar",
-"February" => "Februar",
-"March" => "Mars",
-"April" => "April",
-"May" => "Mai",
-"June" => "Juni",
-"July" => "Juli",
-"August" => "August",
-"September" => "September",
-"October" => "Oktober",
-"November" => "November",
-"December" => "Desember",
-"by events date" => "av hendingsdato",
-"by yearday(s)" => "av årsdag(ar)",
-"by weeknumber(s)" => "av vekenummer",
-"by day and month" => "av dag og månad",
-"Date" => "Dato",
-"Cal." => "Kal.",
-"All day" => "Heile dagen",
-"Missing fields" => "Manglande felt",
-"Title" => "Tittel",
-"From Date" => "Frå dato",
-"From Time" => "Frå tid",
-"To Date" => "Til dato",
-"To Time" => "Til tid",
-"The event ends before it starts" => "Hendinga endar før den startar",
-"There was a database fail" => "Det oppstod ein databasefeil",
-"Week" => "Veke",
-"Month" => "Månad",
-"List" => "Liste",
-"Today" => "I dag",
-"CalDav Link" => "CalDav-lenkje",
-"Download" => "Last ned",
-"Edit" => "Endra",
-"Delete" => "Slett",
-"New calendar" => "Ny kalender",
-"Edit calendar" => "Endra kalendarar",
-"Displayname" => "Visingsnamn",
-"Active" => "Aktiv",
-"Calendar color" => "Kalenderfarge",
-"Save" => "Lagra",
-"Submit" => "Lagra",
-"Cancel" => "Avbryt",
-"Edit an event" => "Endra ein hending",
-"Export" => "Eksporter",
-"Title of the Event" => "Tittel på hendinga",
-"Category" => "Kategori",
-"All Day Event" => "Heildagshending",
-"From" => "Frå",
-"To" => "Til",
-"Advanced options" => "Avanserte alternativ",
-"Location" => "Stad",
-"Location of the Event" => "Stad for hendinga",
-"Description" => "Skildring",
-"Description of the Event" => "Skildring av hendinga",
-"Repeat" => "Gjenta",
-"Advanced" => "Avansert",
-"Select weekdays" => "Vel vekedagar",
-"Select days" => "Vel dagar",
-"and the events day of year." => "og hendingane dag for år.",
-"and the events day of month." => "og hendingane dag for månad.",
-"Select months" => "Vel månedar",
-"Select weeks" => "Vel veker",
-"and the events week of year." => "og hendingane veke av året.",
-"Interval" => "Intervall",
-"End" => "Ende",
-"occurrences" => "førekomstar",
-"create a new calendar" => "Lag ny kalender",
-"Import a calendar file" => "Importer ei kalenderfil",
-"Name of new calendar" => "Namn for ny kalender",
-"Import" => "Importer",
-"Close Dialog" => "Steng dialog",
-"Create a new event" => "Opprett ei ny hending",
-"Timezone" => "Tidssone",
-"24h" => "24t",
-"12h" => "12t"
-);
diff --git a/apps/calendar/l10n/pl.php b/apps/calendar/l10n/pl.php
deleted file mode 100644
index 8fd1c3c2b4..0000000000
--- a/apps/calendar/l10n/pl.php
+++ /dev/null
@@ -1,182 +0,0 @@
-<?php $TRANSLATIONS = array(
-"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",
-"Clients" => "Klienci",
-"Deliverer" => "Dostawcy",
-"Holidays" => "Święta",
-"Ideas" => "Pomysły",
-"Journey" => "Podróże",
-"Jubilee" => "Jubileusze",
-"Meeting" => "Spotkania",
-"Other" => "Inne",
-"Personal" => "Osobiste",
-"Projects" => "Projekty",
-"Questions" => "Pytania",
-"Work" => "Zawodowe",
-"by" => "przez",
-"unnamed" => "nienazwany",
-"New Calendar" => "Nowy kalendarz",
-"Does not repeat" => "Brak",
-"Daily" => "Codziennie",
-"Weekly" => "Tygodniowo",
-"Every Weekday" => "Każdego dnia tygodnia",
-"Bi-Weekly" => "Dwa razy w tygodniu",
-"Monthly" => "Miesięcznie",
-"Yearly" => "Rocznie",
-"never" => "nigdy",
-"by occurrences" => "przez wydarzenia",
-"by date" => "po dacie",
-"by monthday" => "miesięcznie",
-"by weekday" => "tygodniowo",
-"Monday" => "Poniedziałek",
-"Tuesday" => "Wtorek",
-"Wednesday" => "Środa",
-"Thursday" => "Czwartek",
-"Friday" => "Piątek",
-"Saturday" => "Sobota",
-"Sunday" => "Niedziela",
-"events week of month" => "wydarzenia miesiąca",
-"first" => "pierwszy",
-"second" => "drugi",
-"third" => "trzeci",
-"fourth" => "czwarty",
-"fifth" => "piąty",
-"last" => "ostatni",
-"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ń",
-"by events date" => "po datach wydarzeń",
-"by yearday(s)" => "po dniach roku",
-"by weeknumber(s)" => "po tygodniach",
-"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ń",
-"Missing fields" => "Brakujące pola",
-"Title" => "Nazwa",
-"From Date" => "Od daty",
-"From Time" => "Od czasu",
-"To Date" => "Do daty",
-"To Time" => "Do czasu",
-"The event ends before it starts" => "Wydarzenie kończy się przed rozpoczęciem",
-"There was a database fail" => "Awaria bazy danych",
-"Week" => "Tydzień",
-"Month" => "Miesiąc",
-"List" => "Lista",
-"Today" => "Dzisiaj",
-"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",
-"Active" => "Aktywny",
-"Calendar color" => "Kolor",
-"Save" => "Zapisz",
-"Submit" => "Prześlij",
-"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",
-"Advanced options" => "Opcje zaawansowane",
-"Location" => "Lokalizacja",
-"Location of the Event" => "Lokalizacja wydarzenia",
-"Description" => "Opis",
-"Description of the Event" => "Opis wydarzenia",
-"Repeat" => "Powtarzanie",
-"Advanced" => "Zaawansowane",
-"Select weekdays" => "Wybierz dni powszechne",
-"Select days" => "Wybierz dni",
-"and the events day of year." => "oraz wydarzenia roku",
-"and the events day of month." => "oraz wydarzenia miesiąca",
-"Select months" => "Wybierz miesiące",
-"Select weeks" => "Wybierz tygodnie",
-"and the events week of year." => "oraz wydarzenia roku.",
-"Interval" => "Interwał",
-"End" => "Koniec",
-"occurrences" => "wystąpienia",
-"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",
-"Close Dialog" => "Zamknij okno",
-"Create a new event" => "Tworzenie nowego wydarzenia",
-"View an event" => "Zobacz wydarzenie",
-"No categories selected" => "nie zaznaczono kategorii",
-"of" => "z",
-"at" => "w",
-"Timezone" => "Strefa czasowa",
-"24h" => "24h",
-"12h" => "12h",
-"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",
-"Groups" => "Grupy",
-"select groups" => "wybierz grupy",
-"make public" => "uczyń publicznym"
-);
diff --git a/apps/calendar/l10n/pt_BR.php b/apps/calendar/l10n/pt_BR.php
deleted file mode 100644
index b636c19bfe..0000000000
--- a/apps/calendar/l10n/pt_BR.php
+++ /dev/null
@@ -1,156 +0,0 @@
-<?php $TRANSLATIONS = array(
-"No calendars found." => "Nenhum calendário encontrado.",
-"No events found." => "Nenhum evento encontrado.",
-"Wrong calendar" => "Calendário incorreto",
-"New Timezone:" => "Novo fuso horário",
-"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",
-"Clients" => "Clientes",
-"Deliverer" => "Entrega",
-"Holidays" => "Feriados",
-"Ideas" => "Idéias",
-"Journey" => "Jornada",
-"Jubilee" => "Jubileu",
-"Meeting" => "Reunião",
-"Other" => "Outros",
-"Personal" => "Pessoal",
-"Projects" => "Projetos",
-"Questions" => "Perguntas",
-"Work" => "Trabalho",
-"unnamed" => "sem nome",
-"New Calendar" => "Novo Calendário",
-"Does not repeat" => "Não repetir",
-"Daily" => "Diariamente",
-"Weekly" => "Semanal",
-"Every Weekday" => "Cada dia da semana",
-"Bi-Weekly" => "De duas em duas semanas",
-"Monthly" => "Mensal",
-"Yearly" => "Anual",
-"never" => "nunca",
-"by occurrences" => "por ocorrências",
-"by date" => "por data",
-"by monthday" => "por dia do mês",
-"by weekday" => "por dia da semana",
-"Monday" => "Segunda-feira",
-"Tuesday" => "Terça-feira",
-"Wednesday" => "Quarta-feira",
-"Thursday" => "Quinta-feira",
-"Friday" => "Sexta-feira",
-"Saturday" => "Sábado",
-"Sunday" => "Domingo",
-"events week of month" => "semana do evento no mês",
-"first" => "primeiro",
-"second" => "segundo",
-"third" => "terceiro",
-"fourth" => "quarto",
-"fifth" => "quinto",
-"last" => "último",
-"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",
-"by events date" => "eventos por data",
-"by yearday(s)" => "por dia(s) do ano",
-"by weeknumber(s)" => "por número(s) da semana",
-"by day and month" => "por dia e mês",
-"Date" => "Data",
-"Cal." => "Cal.",
-"All day" => "Todo o dia",
-"Missing fields" => "Campos incompletos",
-"Title" => "Título",
-"From Date" => "Desde a Data",
-"From Time" => "Desde a Hora",
-"To Date" => "Até a Data",
-"To Time" => "Até a Hora",
-"The event ends before it starts" => "O evento termina antes de começar",
-"There was a database fail" => "Houve uma falha de banco de dados",
-"Week" => "Semana",
-"Month" => "Mês",
-"List" => "Lista",
-"Today" => "Hoje",
-"Your calendars" => "Meus Calendários",
-"CalDav Link" => "Link para CalDav",
-"Shared calendars" => "Calendários Compartilhados",
-"No shared calendars" => "Nenhum Calendário Compartilhado",
-"Share Calendar" => "Compartilhar Calendário",
-"Download" => "Baixar",
-"Edit" => "Editar",
-"Delete" => "Excluir",
-"shared with you by" => "compartilhado com você por",
-"New calendar" => "Novo calendário",
-"Edit calendar" => "Editar calendário",
-"Displayname" => "Mostrar Nome",
-"Active" => "Ativo",
-"Calendar color" => "Cor do Calendário",
-"Save" => "Salvar",
-"Submit" => "Submeter",
-"Cancel" => "Cancelar",
-"Edit an event" => "Editar um evento",
-"Export" => "Exportar",
-"Eventinfo" => "Info de Evento",
-"Repeating" => "Repetindo",
-"Alarm" => "Alarme",
-"Attendees" => "Participantes",
-"Share" => "Compartilhar",
-"Title of the Event" => "Título do evento",
-"Category" => "Categoria",
-"Separate categories with commas" => "Separe as categorias por vírgulas",
-"Edit categories" => "Editar categorias",
-"All Day Event" => "Evento de dia inteiro",
-"From" => "De",
-"To" => "Para",
-"Advanced options" => "Opções avançadas",
-"Location" => "Local",
-"Location of the Event" => "Local do evento",
-"Description" => "Descrição",
-"Description of the Event" => "Descrição do Evento",
-"Repeat" => "Repetir",
-"Advanced" => "Avançado",
-"Select weekdays" => "Selecionar dias da semana",
-"Select days" => "Selecionar dias",
-"and the events day of year." => "e o dia do evento no ano.",
-"and the events day of month." => "e o dia do evento no mês.",
-"Select months" => "Selecionar meses",
-"Select weeks" => "Selecionar semanas",
-"and the events week of year." => "e a semana do evento no ano.",
-"Interval" => "Intervalo",
-"End" => "Final",
-"occurrences" => "ocorrências",
-"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",
-"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",
-"of" => "de",
-"at" => "para",
-"Timezone" => "Fuso horário",
-"24h" => "24h",
-"12h" => "12h",
-"Users" => "Usuários",
-"select users" => "Selecione usuários",
-"Editable" => "Editável",
-"Groups" => "Grupos",
-"select groups" => "Selecione grupos",
-"make public" => "Tornar público"
-);
diff --git a/apps/calendar/l10n/pt_PT.php b/apps/calendar/l10n/pt_PT.php
deleted file mode 100644
index d5ead9fd43..0000000000
--- a/apps/calendar/l10n/pt_PT.php
+++ /dev/null
@@ -1,198 +0,0 @@
-<?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",
-"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",
-"Clients" => "Clientes",
-"Deliverer" => "Entregar",
-"Holidays" => "Férias",
-"Ideas" => "Ideias",
-"Journey" => "Jornada",
-"Jubilee" => "Jublieu",
-"Meeting" => "Encontro",
-"Other" => "Outro",
-"Personal" => "Pessoal",
-"Projects" => "Projetos",
-"Questions" => "Perguntas",
-"Work" => "Trabalho",
-"by" => "por",
-"unnamed" => "não definido",
-"New Calendar" => "Novo calendário",
-"Does not repeat" => "Não repete",
-"Daily" => "Diário",
-"Weekly" => "Semanal",
-"Every Weekday" => "Todos os dias da semana",
-"Bi-Weekly" => "Bi-semanal",
-"Monthly" => "Mensal",
-"Yearly" => "Anual",
-"never" => "nunca",
-"by occurrences" => "por ocorrências",
-"by date" => "por data",
-"by monthday" => "por dia do mês",
-"by weekday" => "por dia da semana",
-"Monday" => "Segunda",
-"Tuesday" => "Terça",
-"Wednesday" => "Quarta",
-"Thursday" => "Quinta",
-"Friday" => "Sexta",
-"Saturday" => "Sábado",
-"Sunday" => "Domingo",
-"events week of month" => "Eventos da semana do mês",
-"first" => "primeiro",
-"second" => "segundo",
-"third" => "terçeiro",
-"fourth" => "quarto",
-"fifth" => "quinto",
-"last" => "último",
-"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",
-"by events date" => "por data de evento",
-"by yearday(s)" => "por dia(s) do ano",
-"by weeknumber(s)" => "por número(s) da semana",
-"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",
-"From Date" => "Da data",
-"From Time" => "Da hora",
-"To Date" => "Para data",
-"To Time" => "Para hora",
-"The event ends before it starts" => "O evento acaba antes de começar",
-"There was a database fail" => "Houve uma falha de base de dados",
-"Week" => "Semana",
-"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",
-"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",
-"Active" => "Ativo",
-"Calendar color" => "Cor do calendário",
-"Save" => "Guardar",
-"Submit" => "Submeter",
-"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",
-"Advanced options" => "Opções avançadas",
-"Location" => "Localização",
-"Location of the Event" => "Localização do evento",
-"Description" => "Descrição",
-"Description of the Event" => "Descrição do evento",
-"Repeat" => "Repetir",
-"Advanced" => "Avançado",
-"Select weekdays" => "Seleciona os dias da semana",
-"Select days" => "Seleciona os dias",
-"and the events day of year." => "e o dia de eventos do ano.",
-"and the events day of month." => "e o dia de eventos do mês.",
-"Select months" => "Seleciona os meses",
-"Select weeks" => "Seleciona as semanas",
-"and the events week of year." => "e a semana de eventos do ano.",
-"Interval" => "Intervalo",
-"End" => "Fim",
-"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",
-"View an event" => "Ver um evento",
-"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",
-"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
deleted file mode 100644
index 528d9ae108..0000000000
--- a/apps/calendar/l10n/ro.php
+++ /dev/null
@@ -1,151 +0,0 @@
-<?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ă",
-"Clients" => "Clienți",
-"Deliverer" => "Curier",
-"Holidays" => "Sărbători",
-"Ideas" => "Idei",
-"Journey" => "Călătorie",
-"Jubilee" => "Aniversare",
-"Meeting" => "Întâlnire",
-"Other" => "Altele",
-"Personal" => "Personal",
-"Projects" => "Proiecte",
-"Questions" => "Întrebări",
-"Work" => "Servici",
-"unnamed" => "fără nume",
-"New Calendar" => "Calendar nou",
-"Does not repeat" => "Nerepetabil",
-"Daily" => "Zilnic",
-"Weekly" => "Săptămânal",
-"Every Weekday" => "În fiecare zii a săptămânii",
-"Bi-Weekly" => "La fiecare două săptămâni",
-"Monthly" => "Lunar",
-"Yearly" => "Anual",
-"never" => "niciodată",
-"by occurrences" => "după repetiție",
-"by date" => "după dată",
-"by monthday" => "după ziua lunii",
-"by weekday" => "după ziua săptămânii",
-"Monday" => "Luni",
-"Tuesday" => "Marți",
-"Wednesday" => "Miercuri",
-"Thursday" => "Joi",
-"Friday" => "Vineri",
-"Saturday" => "Sâmbătă",
-"Sunday" => "Duminică",
-"events week of month" => "evenimentele săptămânii din luna",
-"first" => "primul",
-"second" => "al doilea",
-"third" => "al treilea",
-"fourth" => "al patrulea",
-"fifth" => "al cincilea",
-"last" => "ultimul",
-"January" => "Ianuarie",
-"February" => "Februarie",
-"March" => "Martie",
-"April" => "Aprilie",
-"May" => "Mai",
-"June" => "Iunie",
-"July" => "Iulie",
-"August" => "August",
-"September" => "Septembrie",
-"October" => "Octombrie",
-"November" => "Noiembrie",
-"December" => "Decembrie",
-"by events date" => "după data evenimentului",
-"by yearday(s)" => "după ziua(zilele) anului",
-"by weeknumber(s)" => "după numărul săptămânii",
-"by day and month" => "după zi și lună",
-"Date" => "Data",
-"Cal." => "Cal.",
-"All day" => "Toată ziua",
-"Missing fields" => "Câmpuri lipsă",
-"Title" => "Titlu",
-"From Date" => "Începând cu",
-"From Time" => "De la",
-"To Date" => "Până pe",
-"To Time" => "La",
-"The event ends before it starts" => "Evenimentul se termină înainte să înceapă",
-"There was a database fail" => "A avut loc o eroare a bazei de date",
-"Week" => "Săptămâna",
-"Month" => "Luna",
-"List" => "Listă",
-"Today" => "Astăzi",
-"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",
-"Active" => "Activ",
-"Calendar color" => "Culoarea calendarului",
-"Save" => "Salveză",
-"Submit" => "Trimite",
-"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",
-"Advanced options" => "Opțiuni avansate",
-"Location" => "Locație",
-"Location of the Event" => "Locația evenimentului",
-"Description" => "Descriere",
-"Description of the Event" => "Descrierea evenimentului",
-"Repeat" => "Repetă",
-"Advanced" => "Avansat",
-"Select weekdays" => "Selectează zilele săptămânii",
-"Select days" => "Selectează zilele",
-"and the events day of year." => "și evenimentele de zi cu zi ale anului.",
-"and the events day of month." => "și evenimentele de zi cu zi ale lunii.",
-"Select months" => "Selectează lunile",
-"Select weeks" => "Selectează săptămânile",
-"and the events week of year." => "și evenimentele săptămânale ale anului.",
-"Interval" => "Interval",
-"End" => "Sfârșit",
-"occurrences" => "repetiții",
-"create a new calendar" => "crează un calendar nou",
-"Import a calendar file" => "Importă un calendar",
-"Name of new calendar" => "Numele noului calendar",
-"Import" => "Importă",
-"Close Dialog" => "Închide",
-"Create a new event" => "Crează un eveniment nou",
-"View an event" => "Vizualizează un eveniment",
-"No categories selected" => "Nici o categorie selectată",
-"of" => "din",
-"at" => "la",
-"Timezone" => "Fus orar",
-"24h" => "24h",
-"12h" => "12h",
-"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
deleted file mode 100644
index 7535a2868b..0000000000
--- a/apps/calendar/l10n/ru.php
+++ /dev/null
@@ -1,198 +0,0 @@
-<?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" => "Звонить",
-"Clients" => "Клиенты",
-"Deliverer" => "Посыльный",
-"Holidays" => "Праздники",
-"Ideas" => "Идеи",
-"Journey" => "Поездка",
-"Jubilee" => "Юбилей",
-"Meeting" => "Встреча",
-"Other" => "Другое",
-"Personal" => "Личное",
-"Projects" => "Проекты",
-"Questions" => "Вопросы",
-"Work" => "Работа",
-"by" => "до свидания",
-"unnamed" => "без имени",
-"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." => "Кал.",
-"Sun." => "Вс.",
-"Mon." => "Пн.",
-"Tue." => "Вт.",
-"Wed." => "Ср.",
-"Thu." => "Чт.",
-"Fri." => "Пт.",
-"Sat." => "Сб.",
-"Jan." => "Янв.",
-"Feb." => "Фев.",
-"Mar." => "Мар.",
-"Apr." => "Апр.",
-"May." => "Май.",
-"Jun." => "Июн.",
-"Jul." => "Июл.",
-"Aug." => "Авг.",
-"Sep." => "Сен.",
-"Oct." => "Окт.",
-"Nov." => "Ноя.",
-"Dec." => "Дек.",
-"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" => "Сегодня",
-"Settings" => "Параметры",
-"Your calendars" => "Ваши календари",
-"CalDav Link" => "Ссылка для CalDav",
-"Shared calendars" => "Опубликованные",
-"No shared calendars" => "Нет опубликованных календарей",
-"Share Calendar" => "Опубликовать",
-"Download" => "Скачать",
-"Edit" => "Редактировать",
-"Delete" => "Удалить",
-"shared with you by" => "опубликовал для вас",
-"New calendar" => "Новый календарь",
-"Edit calendar" => "Редактировать календарь",
-"Displayname" => "Отображаемое имя",
-"Active" => "Активен",
-"Calendar color" => "Цвет календаря",
-"Save" => "Сохранить",
-"Submit" => "Отправить",
-"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" => "повторений",
-"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" => "Создать новое событие",
-"View an event" => "Показать событие",
-"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" => "Редактируемо",
-"Groups" => "Группы",
-"select groups" => "выбрать группы",
-"make public" => "селать публичным"
-);
diff --git a/apps/calendar/l10n/sk_SK.php b/apps/calendar/l10n/sk_SK.php
deleted file mode 100644
index 65400c496d..0000000000
--- a/apps/calendar/l10n/sk_SK.php
+++ /dev/null
@@ -1,156 +0,0 @@
-<?php $TRANSLATIONS = array(
-"No calendars found." => "Nenašiel sa žiadny kalendár.",
-"No events found." => "Nenašla sa žiadna udalosť.",
-"Wrong calendar" => "Zlý kalendár",
-"New Timezone:" => "Nová časová zóna:",
-"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",
-"Clients" => "Klienti",
-"Deliverer" => "Doručovateľ",
-"Holidays" => "Prázdniny",
-"Ideas" => "Nápady",
-"Journey" => "Cesta",
-"Jubilee" => "Jubileá",
-"Meeting" => "Stretnutia",
-"Other" => "Ostatné",
-"Personal" => "Osobné",
-"Projects" => "Projekty",
-"Questions" => "Otázky",
-"Work" => "Práca",
-"unnamed" => "nepomenovaný",
-"New Calendar" => "Nový kalendár",
-"Does not repeat" => "Neopakovať",
-"Daily" => "Denne",
-"Weekly" => "Týždenne",
-"Every Weekday" => "Každý deň v týždni",
-"Bi-Weekly" => "Každý druhý týždeň",
-"Monthly" => "Mesačne",
-"Yearly" => "Ročne",
-"never" => "nikdy",
-"by occurrences" => "podľa výskytu",
-"by date" => "podľa dátumu",
-"by monthday" => "podľa dňa v mesiaci",
-"by weekday" => "podľa dňa v týždni",
-"Monday" => "Pondelok",
-"Tuesday" => "Utorok",
-"Wednesday" => "Streda",
-"Thursday" => "Štvrtok",
-"Friday" => "Piatok",
-"Saturday" => "Sobota",
-"Sunday" => "Nedeľa",
-"events week of month" => "týždenné udalosti v mesiaci",
-"first" => "prvý",
-"second" => "druhý",
-"third" => "tretí",
-"fourth" => "štvrtý",
-"fifth" => "piaty",
-"last" => "posledný",
-"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",
-"by events date" => "podľa dátumu udalosti",
-"by yearday(s)" => "po dňoch",
-"by weeknumber(s)" => "podľa čísel týždňov",
-"by day and month" => "podľa dňa a mesiaca",
-"Date" => "Dátum",
-"Cal." => "Kal.",
-"All day" => "Celý deň",
-"Missing fields" => "Nevyplnené položky",
-"Title" => "Nadpis",
-"From Date" => "Od dátumu",
-"From Time" => "Od času",
-"To Date" => "Do dátumu",
-"To Time" => "Do času",
-"The event ends before it starts" => "Udalosť končí ešte pred tým než začne",
-"There was a database fail" => "Nastala chyba databázy",
-"Week" => "Týždeň",
-"Month" => "Mesiac",
-"List" => "Zoznam",
-"Today" => "Dnes",
-"Your calendars" => "Vaše kalendáre",
-"CalDav Link" => "CalDav odkaz",
-"Shared calendars" => "Zdielané kalendáre",
-"No shared calendars" => "Žiadne zdielané kalendáre",
-"Share Calendar" => "Zdielať kalendár",
-"Download" => "Stiahnuť",
-"Edit" => "Upraviť",
-"Delete" => "Odstrániť",
-"shared with you by" => "zdielané s vami používateľom",
-"New calendar" => "Nový kalendár",
-"Edit calendar" => "Upraviť kalendár",
-"Displayname" => "Zobrazené meno",
-"Active" => "Aktívne",
-"Calendar color" => "Farba kalendáru",
-"Save" => "Uložiť",
-"Submit" => "Odoslať",
-"Cancel" => "Zrušiť",
-"Edit an event" => "Upraviť udalosť",
-"Export" => "Exportovať",
-"Eventinfo" => "Informácie o udalosti",
-"Repeating" => "Opakovanie",
-"Alarm" => "Alarm",
-"Attendees" => "Účastníci",
-"Share" => "Zdielať",
-"Title of the Event" => "Nadpis udalosti",
-"Category" => "Kategória",
-"Separate categories with commas" => "Kategórie oddelené čiarkami",
-"Edit categories" => "Úprava kategórií",
-"All Day Event" => "Celodenná udalosť",
-"From" => "Od",
-"To" => "Do",
-"Advanced options" => "Pokročilé možnosti",
-"Location" => "Poloha",
-"Location of the Event" => "Poloha udalosti",
-"Description" => "Popis",
-"Description of the Event" => "Popis udalosti",
-"Repeat" => "Opakovať",
-"Advanced" => "Pokročilé",
-"Select weekdays" => "Do času",
-"Select days" => "Vybrať dni",
-"and the events day of year." => "a denné udalosti v roku.",
-"and the events day of month." => "a denné udalosti v mesiaci.",
-"Select months" => "Vybrať mesiace",
-"Select weeks" => "Vybrať týždne",
-"and the events week of year." => "a týždenné udalosti v roku.",
-"Interval" => "Interval",
-"End" => "Koniec",
-"occurrences" => "výskyty",
-"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ť",
-"Close Dialog" => "Zatvoriť dialóg",
-"Create a new event" => "Vytvoriť udalosť",
-"View an event" => "Zobraziť udalosť",
-"No categories selected" => "Žiadne vybraté kategórie",
-"of" => "z",
-"at" => "v",
-"Timezone" => "Časová zóna",
-"24h" => "24h",
-"12h" => "12h",
-"Users" => "Používatelia",
-"select users" => "vybrať používateľov",
-"Editable" => "Upravovateľné",
-"Groups" => "Skupiny",
-"select groups" => "vybrať skupiny",
-"make public" => "zverejniť"
-);
diff --git a/apps/calendar/l10n/sl.php b/apps/calendar/l10n/sl.php
deleted file mode 100644
index 585132314b..0000000000
--- a/apps/calendar/l10n/sl.php
+++ /dev/null
@@ -1,198 +0,0 @@
-<?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",
-"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",
-"Clients" => "Stranke",
-"Deliverer" => "Dobavitelj",
-"Holidays" => "Dopust",
-"Ideas" => "Ideje",
-"Journey" => "Potovanje",
-"Jubilee" => "Obletnica",
-"Meeting" => "Sestanek",
-"Other" => "Ostalo",
-"Personal" => "Osebno",
-"Projects" => "Projekt",
-"Questions" => "Vprašanja",
-"Work" => "Delo",
-"by" => "od",
-"unnamed" => "neimenovan",
-"New Calendar" => "Nov koledar",
-"Does not repeat" => "Se ne ponavlja",
-"Daily" => "Dnevno",
-"Weekly" => "Tedensko",
-"Every Weekday" => "Vsak dan v tednu",
-"Bi-Weekly" => "Dvakrat tedensko",
-"Monthly" => "Mesečno",
-"Yearly" => "Letno",
-"never" => "nikoli",
-"by occurrences" => "po številu dogodkov",
-"by date" => "po datumu",
-"by monthday" => "po dnevu v mesecu",
-"by weekday" => "po dnevu v tednu",
-"Monday" => "ponedeljek",
-"Tuesday" => "torek",
-"Wednesday" => "sreda",
-"Thursday" => "četrtek",
-"Friday" => "petek",
-"Saturday" => "sobota",
-"Sunday" => "nedelja",
-"events week of month" => "dogodki tedna v mesecu",
-"first" => "prvi",
-"second" => "drugi",
-"third" => "tretji",
-"fourth" => "četrti",
-"fifth" => "peti",
-"last" => "zadnji",
-"January" => "januar",
-"February" => "februar",
-"March" => "marec",
-"April" => "april",
-"May" => "maj",
-"June" => "junij",
-"July" => "julij",
-"August" => "avgust",
-"September" => "september",
-"October" => "oktober",
-"November" => "november",
-"December" => "december",
-"by events date" => "po datumu dogodka",
-"by yearday(s)" => "po številu let",
-"by weeknumber(s)" => "po tednu v letu",
-"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",
-"From Date" => "od Datum",
-"From Time" => "od Čas",
-"To Date" => "do Datum",
-"To Time" => "do Čas",
-"The event ends before it starts" => "Dogodek se konča preden se začne",
-"There was a database fail" => "Napaka v podatkovni zbirki",
-"Week" => "Teden",
-"Month" => "Mesec",
-"List" => "Seznam",
-"Today" => "Danes",
-"Settings" => "Nastavitve",
-"Your calendars" => "Vaši koledarji",
-"CalDav Link" => "CalDav povezava",
-"Shared calendars" => "Koledarji v souporabi",
-"No shared calendars" => "Ni koledarjev v souporabi",
-"Share Calendar" => "Daj koledar v souporabo",
-"Download" => "Prenesi",
-"Edit" => "Uredi",
-"Delete" => "Izbriši",
-"shared with you by" => "z vami souporablja",
-"New calendar" => "Nov koledar",
-"Edit calendar" => "Uredi koledar",
-"Displayname" => "Ime za prikaz",
-"Active" => "Aktivno",
-"Calendar color" => "Barva koledarja",
-"Save" => "Shrani",
-"Submit" => "Potrdi",
-"Cancel" => "Prekliči",
-"Edit an event" => "Uredi dogodek",
-"Export" => "Izvozi",
-"Eventinfo" => "Informacije od dogodku",
-"Repeating" => "Ponavljanja",
-"Alarm" => "Alarm",
-"Attendees" => "Udeleženci",
-"Share" => "Souporaba",
-"Title of the Event" => "Naslov dogodka",
-"Category" => "Kategorija",
-"Separate categories with commas" => "Kategorije ločite z vejico",
-"Edit categories" => "Uredi kategorije",
-"All Day Event" => "Celodnevni dogodek",
-"From" => "Od",
-"To" => "Do",
-"Advanced options" => "Napredne možnosti",
-"Location" => "Kraj",
-"Location of the Event" => "Kraj dogodka",
-"Description" => "Opis",
-"Description of the Event" => "Opis dogodka",
-"Repeat" => "Ponovi",
-"Advanced" => "Napredno",
-"Select weekdays" => "Izberite dneve v tednu",
-"Select days" => "Izberite dneve",
-"and the events day of year." => "in dnevu dogodka v letu.",
-"and the events day of month." => "in dnevu dogodka v mesecu.",
-"Select months" => "Izberite mesece",
-"Select weeks" => "Izberite tedne",
-"and the events week of year." => "in tednu dogodka v letu.",
-"Interval" => "Časovni razmik",
-"End" => "Konec",
-"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",
-"View an event" => "Poglej dogodek",
-"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",
-"Groups" => "Skupine",
-"select groups" => "izberite skupine",
-"make public" => "objavi"
-);
diff --git a/apps/calendar/l10n/sr.php b/apps/calendar/l10n/sr.php
deleted file mode 100644
index 4ec60e20cb..0000000000
--- a/apps/calendar/l10n/sr.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Wrong calendar" => "Погрешан календар",
-"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" => "годишње",
-"All day" => "Цео дан",
-"Title" => "Наслов",
-"Week" => "Недеља",
-"Month" => "Месец",
-"List" => "Списак",
-"Today" => "Данас",
-"CalDav Link" => "КалДав веза",
-"Download" => "Преузми",
-"Edit" => "Уреди",
-"Delete" => "Обриши",
-"New calendar" => "Нови календар",
-"Edit calendar" => "Уреди календар",
-"Displayname" => "Приказаноиме",
-"Active" => "Активан",
-"Calendar color" => "Боја календара",
-"Save" => "Сними",
-"Submit" => "Пошаљи",
-"Cancel" => "Откажи",
-"Edit an event" => "Уреди догађај",
-"Title of the Event" => "Наслов догађаја",
-"Category" => "Категорија",
-"All Day Event" => "Целодневни догађај",
-"From" => "Од",
-"To" => "До",
-"Location" => "Локација",
-"Location of the Event" => "Локација догађаја",
-"Description" => "Опис",
-"Description of the Event" => "Опис догађаја",
-"Repeat" => "Понављај",
-"Create a new event" => "Направи нови догађај",
-"Timezone" => "Временска зона"
-);
diff --git a/apps/calendar/l10n/sr@latin.php b/apps/calendar/l10n/sr@latin.php
deleted file mode 100644
index 4ceabcbae5..0000000000
--- a/apps/calendar/l10n/sr@latin.php
+++ /dev/null
@@ -1,60 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Wrong calendar" => "Pogrešan kalendar",
-"Timezone changed" => "Vremenska zona je promenjena",
-"Invalid request" => "Neispravan zahtev",
-"Calendar" => "Kalendar",
-"Birthday" => "Rođendan",
-"Business" => "Posao",
-"Call" => "Poziv",
-"Clients" => "Klijenti",
-"Deliverer" => "Dostavljač",
-"Holidays" => "Praznici",
-"Ideas" => "Ideje",
-"Journey" => "putovanje",
-"Jubilee" => "jubilej",
-"Meeting" => "Sastanak",
-"Other" => "Drugo",
-"Personal" => "Lično",
-"Projects" => "Projekti",
-"Questions" => "Pitanja",
-"Work" => "Posao",
-"New Calendar" => "Novi kalendar",
-"Does not repeat" => "Ne ponavlja se",
-"Daily" => "dnevno",
-"Weekly" => "nedeljno",
-"Every Weekday" => "svakog dana u nedelji",
-"Bi-Weekly" => "dvonedeljno",
-"Monthly" => "mesečno",
-"Yearly" => "godišnje",
-"All day" => "Ceo dan",
-"Title" => "Naslov",
-"Week" => "Nedelja",
-"Month" => "Mesec",
-"List" => "Spisak",
-"Today" => "Danas",
-"CalDav Link" => "KalDav veza",
-"Download" => "Preuzmi",
-"Edit" => "Uredi",
-"Delete" => "Obriši",
-"New calendar" => "Novi kalendar",
-"Edit calendar" => "Uredi kalendar",
-"Displayname" => "Prikazanoime",
-"Active" => "Aktivan",
-"Calendar color" => "Boja kalendara",
-"Save" => "Snimi",
-"Submit" => "Pošalji",
-"Cancel" => "Otkaži",
-"Edit an event" => "Uredi događaj",
-"Title of the Event" => "Naslov događaja",
-"Category" => "Kategorija",
-"All Day Event" => "Celodnevni događaj",
-"From" => "Od",
-"To" => "Do",
-"Location" => "Lokacija",
-"Location of the Event" => "Lokacija događaja",
-"Description" => "Opis",
-"Description of the Event" => "Opis događaja",
-"Repeat" => "Ponavljaj",
-"Create a new event" => "Napravi novi događaj",
-"Timezone" => "Vremenska zona"
-);
diff --git a/apps/calendar/l10n/sv.php b/apps/calendar/l10n/sv.php
deleted file mode 100644
index 7baa0309a6..0000000000
--- a/apps/calendar/l10n/sv.php
+++ /dev/null
@@ -1,192 +0,0 @@
-<?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",
-"Clients" => "Klienter",
-"Deliverer" => "Leverantör",
-"Holidays" => "Semester",
-"Ideas" => "Idéer",
-"Journey" => "Resa",
-"Jubilee" => "Jubileum",
-"Meeting" => "Möte",
-"Other" => "Annat",
-"Personal" => "Personlig",
-"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",
-"Every Weekday" => "Varje vardag",
-"Bi-Weekly" => "Varannan vecka",
-"Monthly" => "Varje månad",
-"Yearly" => "Årligen",
-"never" => "aldrig",
-"by occurrences" => "efter händelser",
-"by date" => "efter datum",
-"by monthday" => "efter dag i månaden",
-"by weekday" => "efter veckodag",
-"Monday" => "Måndag",
-"Tuesday" => "Tisdag",
-"Wednesday" => "Onsdag",
-"Thursday" => "Torsdag",
-"Friday" => "Fredag",
-"Saturday" => "Lördag",
-"Sunday" => "Söndag",
-"events week of month" => "händelse vecka av månad",
-"first" => "första",
-"second" => "andra",
-"third" => "tredje",
-"fourth" => "fjärde",
-"fifth" => "femte",
-"last" => "sist",
-"January" => "Januari",
-"February" => "Februari",
-"March" => "Mars",
-"April" => "April",
-"May" => "Maj",
-"June" => "Juni",
-"July" => "Juli",
-"August" => "Augusti",
-"September" => "September",
-"October" => "Oktober",
-"November" => "November",
-"December" => "December",
-"by events date" => "efter händelsedatum",
-"by yearday(s)" => "efter årsdag(ar)",
-"by weeknumber(s)" => "efter veckonummer",
-"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",
-"Missing fields" => "Saknade fält",
-"Title" => "Rubrik",
-"From Date" => "Från datum",
-"From Time" => "Från tid",
-"To Date" => "Till datum",
-"To Time" => "Till tid",
-"The event ends before it starts" => "Händelsen slutar innan den börjar",
-"There was a database fail" => "Det blev ett databasfel",
-"Week" => "Vecka",
-"Month" => "Månad",
-"List" => "Lista",
-"Today" => "Idag",
-"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",
-"Active" => "Aktiv",
-"Calendar color" => "Kalender-färg",
-"Save" => "Spara",
-"Submit" => "Lägg till",
-"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",
-"Advanced options" => "Avancerade alternativ",
-"Location" => "Plats",
-"Location of the Event" => "Platsen för händelsen",
-"Description" => "Beskrivning",
-"Description of the Event" => "Beskrivning av händelse",
-"Repeat" => "Upprepa",
-"Advanced" => "Avancerad",
-"Select weekdays" => "Välj veckodagar",
-"Select days" => "Välj dagar",
-"and the events day of year." => "och händelsedagen för året.",
-"and the events day of month." => "och händelsedagen för månaden.",
-"Select months" => "Välj månader",
-"Select weeks" => "Välj veckor",
-"and the events week of year." => "och händelsevecka för året.",
-"Interval" => "Hur ofta",
-"End" => "Slut",
-"occurrences" => "Händelser",
-"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",
-"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",
-"of" => "av",
-"at" => "på",
-"Timezone" => "Tidszon",
-"24h" => "24h",
-"12h" => "12h",
-"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",
-"Groups" => "Grupper",
-"select groups" => "Välj grupper",
-"make public" => "Gör offentlig"
-);
diff --git a/apps/calendar/l10n/th_TH.php b/apps/calendar/l10n/th_TH.php
deleted file mode 100644
index 0b92a623d4..0000000000
--- a/apps/calendar/l10n/th_TH.php
+++ /dev/null
@@ -1,198 +0,0 @@
-<?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",
-"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" => "จัดส่ง",
-"Holidays" => "วันหยุด",
-"Ideas" => "ไอเดีย",
-"Journey" => "การเดินทาง",
-"Jubilee" => "งานเลี้ยง",
-"Meeting" => "นัดประชุม",
-"Other" => "อื่นๆ",
-"Personal" => "ส่วนตัว",
-"Projects" => "โครงการ",
-"Questions" => "คำถาม",
-"Work" => "งาน",
-"by" => "โดย",
-"unnamed" => "ไม่มีชื่อ",
-"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." => "คำนวณ",
-"Sun." => "อา.",
-"Mon." => "จ.",
-"Tue." => "อ.",
-"Wed." => "พ.",
-"Thu." => "พฤ.",
-"Fri." => "ศ.",
-"Sat." => "ส.",
-"Jan." => "ม.ค.",
-"Feb." => "ก.พ.",
-"Mar." => "มี.ค.",
-"Apr." => "เม.ย.",
-"May." => "พ.ค.",
-"Jun." => "มิ.ย.",
-"Jul." => "ก.ค.",
-"Aug." => "ส.ค.",
-"Sep." => "ก.ย.",
-"Oct." => "ต.ค.",
-"Nov." => "พ.ย.",
-"Dec." => "ธ.ค.",
-"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" => "วันนี้",
-"Settings" => "ตั้งค่า",
-"Your calendars" => "ปฏิทินของคุณ",
-"CalDav Link" => "ลิงค์ CalDav",
-"Shared calendars" => "ปฏิทินที่เปิดแชร์",
-"No shared calendars" => "ไม่มีปฏิทินที่เปิดแชร์ไว้",
-"Share Calendar" => "เปิดแชร์ปฏิทิน",
-"Download" => "ดาวน์โหลด",
-"Edit" => "แก้ไข",
-"Delete" => "ลบ",
-"shared with you by" => "แชร์ให้คุณโดย",
-"New calendar" => "สร้างปฏิทินใหม่",
-"Edit calendar" => "แก้ไขปฏิทิน",
-"Displayname" => "ชื่อที่ต้องการให้แสดง",
-"Active" => "ใช้งาน",
-"Calendar color" => "สีของปฏิทิน",
-"Save" => "บันทึก",
-"Submit" => "ส่งข้อมูล",
-"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" => "จำนวนที่ปรากฏ",
-"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" => "สร้างกิจกรรมใหม่",
-"View an event" => "ดูกิจกรรม",
-"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" => "สามารถแก้ไขได้",
-"Groups" => "กลุ่ม",
-"select groups" => "เลือกกลุ่ม",
-"make public" => "กำหนดเป็นสาธารณะ"
-);
diff --git a/apps/calendar/l10n/tr.php b/apps/calendar/l10n/tr.php
deleted file mode 100644
index b9256eb619..0000000000
--- a/apps/calendar/l10n/tr.php
+++ /dev/null
@@ -1,192 +0,0 @@
-<?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",
-"Clients" => "Müşteriler",
-"Deliverer" => "Teslimatçı",
-"Holidays" => "Tatil günleri",
-"Ideas" => "Fikirler",
-"Journey" => "Seyahat",
-"Jubilee" => "Yıl dönümü",
-"Meeting" => "Toplantı",
-"Other" => "Diğer",
-"Personal" => "Kişisel",
-"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ı",
-"Every Weekday" => "Haftaiçi Her gün",
-"Bi-Weekly" => "İki haftada bir",
-"Monthly" => "Aylık",
-"Yearly" => "Yıllı",
-"never" => "asla",
-"by occurrences" => "sıklığa göre",
-"by date" => "tarihe göre",
-"by monthday" => "ay günlerine göre",
-"by weekday" => "hafta günlerine göre",
-"Monday" => "Pazartesi",
-"Tuesday" => "Salı",
-"Wednesday" => "Çarşamba",
-"Thursday" => "Perşembe",
-"Friday" => "Cuma",
-"Saturday" => "Cumartesi",
-"Sunday" => "Pazar",
-"events week of month" => "ayın etkinlikler haftası",
-"first" => "birinci",
-"second" => "ikinci",
-"third" => "üçüncü",
-"fourth" => "dördüncü",
-"fifth" => "beşinci",
-"last" => "sonuncu",
-"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",
-"by events date" => "olay tarihine göre",
-"by yearday(s)" => "yıl gün(ler)ine göre",
-"by weeknumber(s)" => "hafta sayı(lar)ına göre",
-"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",
-"Missing fields" => "Eksik alanlar",
-"Title" => "Başlık",
-"From Date" => "Bu Tarihten",
-"From Time" => "Bu Saatten",
-"To Date" => "Bu Tarihe",
-"To Time" => "Bu Saate",
-"The event ends before it starts" => "Olay başlamadan önce bitiyor",
-"There was a database fail" => "Bir veritabanı başarısızlığı oluştu",
-"Week" => "Hafta",
-"Month" => "Ay",
-"List" => "Liste",
-"Today" => "Bugün",
-"Your calendars" => "Takvimleriniz",
-"CalDav Link" => "CalDav Bağlantısı",
-"Shared calendars" => "Paylaşılan",
-"No shared calendars" => "Paylaşılan takvim yok",
-"Share Calendar" => "Takvimi paylaş",
-"Download" => "İndir",
-"Edit" => "Düzenle",
-"Delete" => "Sil",
-"shared with you by" => "sizinle paylaşılmış",
-"New calendar" => "Yeni takvim",
-"Edit calendar" => "Takvimi düzenle",
-"Displayname" => "Görünüm adı",
-"Active" => "Aktif",
-"Calendar color" => "Takvim rengi",
-"Save" => "Kaydet",
-"Submit" => "Gönder",
-"Cancel" => "İptal",
-"Edit an event" => "Bir olay düzenle",
-"Export" => "Dışa aktar",
-"Eventinfo" => "Etkinlik bilgisi",
-"Repeating" => "Tekrarlama",
-"Alarm" => "Alarm",
-"Attendees" => "Katılanlar",
-"Share" => "Paylaş",
-"Title of the Event" => "Olayın Başlığı",
-"Category" => "Kategori",
-"Separate categories with commas" => "Kategorileri virgülle ayırın",
-"Edit categories" => "Kategorileri düzenle",
-"All Day Event" => "Tüm Gün Olay",
-"From" => "Kimden",
-"To" => "Kime",
-"Advanced options" => "Gelişmiş opsiyonlar",
-"Location" => "Konum",
-"Location of the Event" => "Olayın Konumu",
-"Description" => "Açıklama",
-"Description of the Event" => "Olayın Açıklaması",
-"Repeat" => "Tekrar",
-"Advanced" => "Gelişmiş",
-"Select weekdays" => "Hafta günlerini seçin",
-"Select days" => "Günleri seçin",
-"and the events day of year." => "ve yılın etkinlikler günü.",
-"and the events day of month." => "ve ayın etkinlikler günü.",
-"Select months" => "Ayları seç",
-"Select weeks" => "Haftaları seç",
-"and the events week of year." => "ve yılın etkinkinlikler haftası.",
-"Interval" => "Aralık",
-"End" => "Son",
-"occurrences" => "olaylar",
-"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",
-"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",
-"of" => "nın",
-"at" => "üzerinde",
-"Timezone" => "Zaman dilimi",
-"24h" => "24s",
-"12h" => "12s",
-"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",
-"Groups" => "Gruplar",
-"select groups" => "grupları seç",
-"make public" => "kamuyla paylaş"
-);
diff --git a/apps/calendar/l10n/uk.php b/apps/calendar/l10n/uk.php
deleted file mode 100644
index 2911307e58..0000000000
--- a/apps/calendar/l10n/uk.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php $TRANSLATIONS = array(
-"New Timezone:" => "Новий часовий пояс",
-"Timezone changed" => "Часовий пояс змінено",
-"Calendar" => "Календар",
-"Birthday" => "День народження",
-"Business" => "Справи",
-"Call" => "Подзвонити",
-"Clients" => "Клієнти",
-"Holidays" => "Свята",
-"Ideas" => "Ідеї",
-"Journey" => "Поїздка",
-"Jubilee" => "Ювілей",
-"Meeting" => "Зустріч",
-"Other" => "Інше",
-"Personal" => "Особисте",
-"Projects" => "Проекти",
-"Questions" => "Запитання",
-"Work" => "Робота",
-"New Calendar" => "новий Календар",
-"Does not repeat" => "Не повторювати",
-"Daily" => "Щоденно",
-"Weekly" => "Щотижня",
-"Every Weekday" => "По будням",
-"Bi-Weekly" => "Кожні дві неділі",
-"Monthly" => "Щомісяця",
-"Yearly" => "Щорічно",
-"never" => "ніколи",
-"Monday" => "Понеділок",
-"Tuesday" => "Вівторок",
-"Wednesday" => "Середа",
-"Thursday" => "Четвер",
-"Friday" => "П'ятниця",
-"Saturday" => "Субота",
-"Sunday" => "Неділя",
-"first" => "перший",
-"second" => "другий",
-"third" => "третій",
-"fourth" => "четвертий",
-"fifth" => "п'ятий",
-"last" => "останній",
-"January" => "Січень",
-"February" => "Лютий",
-"March" => "Березень",
-"April" => "Квітень",
-"May" => "Травень",
-"June" => "Червень",
-"July" => "Липень",
-"August" => "Серпень",
-"September" => "Вересень",
-"October" => "Жовтень",
-"November" => "Листопад",
-"December" => "Грудень",
-"Date" => "Дата",
-"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" => "Сьогодні",
-"Your calendars" => "Ваші календарі",
-"Download" => "Завантажити",
-"Edit" => "Редагувати",
-"Delete" => "Видалити",
-"New calendar" => "Новий календар",
-"Edit calendar" => "Редагувати календар",
-"Active" => "Активний",
-"Calendar color" => "Колір календаря",
-"Save" => "Зберегти",
-"Cancel" => "Відмінити",
-"Export" => "Експорт",
-"Title of the Event" => "Назва події",
-"Category" => "Категорія",
-"From" => "З",
-"To" => "По",
-"Location" => "Місце",
-"Location of the Event" => "Місце події",
-"Description" => "Опис",
-"Description of the Event" => "Опис події",
-"Repeat" => "Повторювати",
-"create a new calendar" => "створити новий календар",
-"Import a calendar file" => "Імпортувати файл календаря",
-"Name of new calendar" => "Назва нового календаря",
-"Import" => "Імпорт",
-"Create a new event" => "Створити нову подію",
-"Timezone" => "Часовий пояс",
-"24h" => "24г",
-"12h" => "12г",
-"Users" => "Користувачі",
-"Groups" => "Групи"
-);
diff --git a/apps/calendar/l10n/vi.php b/apps/calendar/l10n/vi.php
deleted file mode 100644
index 3594a095eb..0000000000
--- a/apps/calendar/l10n/vi.php
+++ /dev/null
@@ -1,131 +0,0 @@
-<?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",
-"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ờ",
-"24h" => "24h",
-"12h" => "12h"
-);
diff --git a/apps/calendar/l10n/xgettextfiles b/apps/calendar/l10n/xgettextfiles
deleted file mode 100644
index a8c2601045..0000000000
--- a/apps/calendar/l10n/xgettextfiles
+++ /dev/null
@@ -1,12 +0,0 @@
-../appinfo/app.php
-../lib/object.php
-../templates/calendar.php
-../templates/part.choosecalendar.php
-../templates/part.choosecalendar.rowfields.php
-../templates/part.editcalendar.php
-../templates/part.editevent.php
-../templates/part.eventform.php
-../templates/part.import.php
-../templates/part.newevent.php
-../templates/settings.php
-../templates/lAfix.php
\ No newline at end of file
diff --git a/apps/calendar/l10n/zh_CN.GB2312.php b/apps/calendar/l10n/zh_CN.GB2312.php
deleted file mode 100644
index 38f039e661..0000000000
--- a/apps/calendar/l10n/zh_CN.GB2312.php
+++ /dev/null
@@ -1,121 +0,0 @@
-<?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/calendar/l10n/zh_CN.php b/apps/calendar/l10n/zh_CN.php
deleted file mode 100644
index 48d00d02d5..0000000000
--- a/apps/calendar/l10n/zh_CN.php
+++ /dev/null
@@ -1,152 +0,0 @@
-<?php $TRANSLATIONS = array(
-"No calendars found." => "无法找到日历。",
-"No events found." => "无法找到事件。",
-"Wrong calendar" => "错误的日历",
-"New Timezone:" => "新时区：",
-"Timezone changed" => "时区已修改",
-"Invalid request" => "非法请求",
-"Calendar" => "日历",
-"ddd" => "ddd",
-"MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}" => "MMM d[ yyyy]{ '&#8212;'[ MMM] d yyyy}",
-"Birthday" => "生日",
-"Business" => "商务",
-"Call" => "呼叫",
-"Clients" => "客户",
-"Deliverer" => "派送",
-"Holidays" => "节日",
-"Ideas" => "想法",
-"Journey" => "旅行",
-"Jubilee" => "周年纪念",
-"Meeting" => "会议",
-"Other" => "其他",
-"Personal" => "个人",
-"Projects" => "项目",
-"Questions" => "问题",
-"Work" => "工作",
-"unnamed" => "未命名",
-"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." => "日历",
-"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" => "今天",
-"Your calendars" => "您的日历",
-"CalDav Link" => "CalDav 链接",
-"Shared calendars" => "共享的日历",
-"No shared calendars" => "无共享的日历",
-"Share Calendar" => "共享日历",
-"Download" => "下载",
-"Edit" => "编辑",
-"Delete" => "删除",
-"shared with you by" => "                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                               ",
-"New calendar" => "新日历",
-"Edit calendar" => "编辑日历",
-"Displayname" => "显示名称",
-"Active" => "激活",
-"Calendar color" => "日历颜色",
-"Save" => "保存",
-"Submit" => "提交",
-"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" => "次",
-"create a new calendar" => "创建新日历",
-"Import a calendar file" => "导入日历文件",
-"Name of new calendar" => "新日历名称",
-"Import" => "导入",
-"Close Dialog" => "关闭对话框",
-"Create a new event" => "创建新事件",
-"View an event" => "查看事件",
-"No categories selected" => "无选中分类",
-"of" => "在",
-"at" => "在",
-"Timezone" => "时区",
-"24h" => "24小时",
-"12h" => "12小时",
-"Users" => "用户",
-"select users" => "选中用户",
-"Editable" => "可编辑",
-"Groups" => "分组",
-"select groups" => "选中分组",
-"make public" => "公开"
-);
diff --git a/apps/calendar/l10n/zh_TW.php b/apps/calendar/l10n/zh_TW.php
deleted file mode 100644
index c2c03a4d44..0000000000
--- a/apps/calendar/l10n/zh_TW.php
+++ /dev/null
@@ -1,151 +0,0 @@
-<?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" => "呼叫",
-"Clients" => "客戶",
-"Deliverer" => "遞送者",
-"Holidays" => "節日",
-"Ideas" => "主意",
-"Journey" => "旅行",
-"Jubilee" => "周年慶",
-"Meeting" => "會議",
-"Other" => "其他",
-"Personal" => "個人",
-"Projects" => "計畫",
-"Questions" => "問題",
-"Work" => "工作",
-"unnamed" => "無名稱的",
-"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." => "行事曆",
-"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" => "今日",
-"Your calendars" => "你的行事曆",
-"CalDav Link" => "CalDav 聯結",
-"Shared calendars" => "分享的行事曆",
-"No shared calendars" => "不分享的行事曆",
-"Share Calendar" => "分享行事曆",
-"Download" => "下載",
-"Edit" => "編輯",
-"Delete" => "刪除",
-"shared with you by" => "分享給你由",
-"New calendar" => "新日曆",
-"Edit calendar" => "編輯日曆",
-"Displayname" => "顯示名稱",
-"Active" => "作用中",
-"Calendar color" => "日曆顏色",
-"Save" => "儲存",
-"Submit" => "提出",
-"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" => "事件",
-"create a new calendar" => "建立新日曆",
-"Import a calendar file" => "匯入日曆檔案",
-"Name of new calendar" => "新日曆名稱",
-"Import" => "匯入",
-"Close Dialog" => "關閉對話",
-"Create a new event" => "建立一個新事件",
-"View an event" => "觀看一個活動",
-"No categories selected" => "沒有選擇分類",
-"of" => "於",
-"at" => "於",
-"Timezone" => "時區",
-"24h" => "24小時制",
-"12h" => "12小時制",
-"Users" => "使用者",
-"select users" => "選擇使用者",
-"Editable" => "可編輯",
-"Groups" => "群組",
-"select groups" => "選擇群組",
-"make public" => "公開"
-);
diff --git a/apps/calendar/lib/alarm.php b/apps/calendar/lib/alarm.php
deleted file mode 100644
index a71cc08682..0000000000
--- a/apps/calendar/lib/alarm.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?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 reminders for calendars
- */
-class OC_Calendar_Alarm{
-	
-}
\ No newline at end of file
diff --git a/apps/calendar/lib/app.php b/apps/calendar/lib/app.php
deleted file mode 100644
index 8bdb54f486..0000000000
--- a/apps/calendar/lib/app.php
+++ /dev/null
@@ -1,436 +0,0 @@
-<?php
-/**
- * Copyright (c) 2011 Bart Visscher <bartv@thisnet.nl>
- * 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.
- * 
- * This class manages our app actions
- */
-OC_Calendar_App::$l10n = new OC_L10N('calendar');
-OC_Calendar_App::$tz = OC_Calendar_App::getTimezone();
-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
-	 * @param bool $shared - check if the user got access via sharing
-	 * @return mixed - bool / array
-	 */
-	public static function getCalendar($id, $security = true, $shared = false){
-		if(! is_numeric($id)){
-			return false;
-		}
-		$calendar = OC_Calendar_Calendar::find($id);
-		if($shared === true){
-			if(OC_Calendar_Share::check_access(OCP\USER::getUser(), $id, OC_Calendar_Share::CALENDAR)){
-				return $calendar;
-			}
-		}
-		if($security === true){
-			if($calendar['userid'] != OCP\USER::getUser()){
-				return false;
-			}
-		}
-		return $calendar;
-	}
-	
-	/**
-	 * @brief returns informations about an event
-	 * @param int $id - id of the event
-	 * @param bool $security - check access rights or not
-	 * @param bool $shared - check if the user got access via sharing
-	 * @return mixed - bool / array
-	 */
-	public static function getEventObject($id, $security = true, $shared = false){
-		$event = OC_Calendar_Object::find($id);
-		if($shared === true){
-			if(OC_Calendar_Share::check_access(OCP\USER::getUser(), $id, OC_Calendar_Share::EVENT)){
-				return $event;
-			}
-		}
-		if($security === true){
-			$calendar = self::getCalendar($event['calendarid'], false);
-			if($calendar['userid'] != OCP\USER::getUser()){
-				return false;
-			}
-		}
-		if($event === false){
-			return false;
-		}
-		return $event;
-	}
-	
-	/**
-	 * @brief returns the parsed calendar data
-	 * @param int $id - id of the event
-	 * @param bool $security - check access rights or not
-	 * @return mixed - bool / object
-	 */
-	public static function getVCalendar($id, $security = true, $shared = false){
-		$event_object = self::getEventObject($id, $security, $shared);
-		if($event_object === false){
-			return false;
-		}
-		$vobject = OC_VObject::parse($event_object['calendardata']);
-		if(is_null($vobject)){
-			return false;
-		}
-		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
-	 * @return (bool)
-	 */
-	public static function isNotModified($vevent, $lastmodified){
-		$last_modified = $vevent->__get('LAST-MODIFIED');
-		if($last_modified && $lastmodified != $last_modified->getDateTime()->format('U')){
-			OCP\JSON::error(array('modified'=>true));
-			exit;
-		}
-		return true;
-	}
-	
-	/**
-	 * @brief returns the default categories of ownCloud
-	 * @return (array) $categories
-	 */
-	protected static function getDefaultCategories(){
-		return array(
-			self::$l10n->t('Birthday'),
-			self::$l10n->t('Business'),
-			self::$l10n->t('Call'),
-			self::$l10n->t('Clients'),
-			self::$l10n->t('Deliverer'),
-			self::$l10n->t('Holidays'),
-			self::$l10n->t('Ideas'),
-			self::$l10n->t('Journey'),
-			self::$l10n->t('Jubilee'),
-			self::$l10n->t('Meeting'),
-			self::$l10n->t('Other'),
-			self::$l10n->t('Personal'),
-			self::$l10n->t('Projects'),
-			self::$l10n->t('Questions'),
-			self::$l10n->t('Work'),
-		);
-	}
-	
-	/**
-	 * @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', null, self::getDefaultCategories());
-		}
-		return self::$categories;
-	}
-	
-	/**
-	 * @brief returns the categories of the vcategories object
-	 * @return (array) $categories
-	 */
-	public static function getCategoryOptions(){
-		$categories = self::getVCategories()->categories();
-		return $categories;
-	}
-
-	/**
-	 * scan events for categories.
-	 * @param $events VEVENTs to scan. null to check all events for the current user.
-	 */
-	public static function scanCategories($events = null) {
-		if (is_null($events)) {
-			$calendars = OC_Calendar_Calendar::allCalendars(OCP\USER::getUser());
-			if(count($calendars) > 0) {
-				$events = array();
-				foreach($calendars as $calendar) {
-					$calendar_events = OC_Calendar_Object::all($calendar['id']);
-					$events = $events + $calendar_events;
-				}
-			}
-		}
-		if(is_array($events) && count($events) > 0) {
-			$vcategories = self::getVCategories();
-			$vcategories->delete($vcategories->categories());
-			foreach($events as $event) {
-				$vobject = OC_VObject::parse($event['calendardata']);
-				if(!is_null($vobject)) {
-					self::loadCategoriesFromVCalendar($vobject);
-				}
-			}
-		}
-	}
-
-	/**
-	 * check VEvent for new categories.
-	 * @see OC_VCategories::loadFromVObject
-	 */
-	public static function loadCategoriesFromVCalendar(OC_VObject $calendar) {
-		$object = null;
-		if (isset($calendar->VEVENT)) {
-			$object = $calendar->VEVENT;
-		} else
-		if (isset($calendar->VTODO)) {
-			$object = $calendar->VTODO;
-		} else
-		if (isset($calendar->VJOURNAL)) {
-			$object = $calendar->VJOURNAL;
-		}
-		if ($object) {
-			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
-	 */
-	public static function getEndOptions(){
-		return OC_Calendar_Object::getEndOptions(self::$l10n);
-	}
-	
-	/**
-	 * @brief returns the options for an monthly repeating event
-	 * @return array - valid inputs for monthly repeating events
-	 */
-	public static function getMonthOptions(){
-		return OC_Calendar_Object::getMonthOptions(self::$l10n);
-	}
-	
-	/**
-	 * @brief returns the options for an weekly repeating event
-	 * @return array - valid inputs for weekly repeating events
-	 */
-	public static function getWeeklyOptions(){
-		return OC_Calendar_Object::getWeeklyOptions(self::$l10n);
-	}
-	
-	/**
-	 * @brief returns the options for an yearly repeating event
-	 * @return array - valid inputs for yearly repeating events
-	 */
-	public static function getYearOptions(){
-		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
-	 */
-	public static function getByYearDayOptions(){
-		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
-	 */
-	public static function getByMonthOptions(){
-		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
-	 */
-	public static function getByWeekNoOptions(){
-		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
-	 */
-	public static function getByMonthDayOptions(){
-		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
-	 */
-	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
-	 * @param (string) $type - type of the id (calendar/event)
-	 * @return (string) $access - level of access
-	 */
-	public static function getaccess($id, $type){
-		if($type == self::CALENDAR){
-			$calendar = self::getCalendar($id, false, false);
-			if($calendar['userid'] == OCP\USER::getUser()){
-				return 'owner';
-			}
-			$isshared = OC_Calendar_Share::check_access(OCP\USER::getUser(), $id, OC_Calendar_Share::CALENDAR);
-			if($isshared){
-				$writeaccess = OC_Calendar_Share::is_editing_allowed(OCP\USER::getUser(), $id, OC_Calendar_Share::CALENDAR);
-				if($writeaccess){
-					return 'rw';
-				}else{
-					return 'r';
-				}
-			}else{
-				return false;
-			}
-		}elseif($type == self::EVENT){
-			if(OC_Calendar_Object::getowner($id) == OCP\USER::getUser()){
-				return 'owner';
-			}
-			$isshared = OC_Calendar_Share::check_access(OCP\USER::getUser(), $id, OC_Calendar_Share::EVENT);
-			if($isshared){
-				$writeaccess = OC_Calendar_Share::is_editing_allowed(OCP\USER::getUser(), $id, OC_Calendar_Share::EVENT);
-				if($writeaccess){
-					return 'rw';
-				}else{
-					return 'r';
-				}
-			}else{
-				return false;
-			}
-		}
-	}
-	
-	/**
-	 * @brief analyses the parameter for calendar parameter and returns the objects
-	 * @param (string) $calendarid - calendarid
-	 * @param (int) $start - unixtimestamp of start
-	 * @param (int) $end - unixtimestamp of end
-	 * @return (array) $events 
-	 */
-	public static function getrequestedEvents($calendarid, $start, $end){
-		$events = array();
-		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']);
-				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;
-			}
-		}else{
-			if (is_numeric($calendarid)) {
-				$calendar = self::getCalendar($calendarid);
-				OCP\Response::enableCaching(0);
-				OCP\Response::setETagHeader($calendar['ctag']);
-				$events = OC_Calendar_Object::allInPeriod($calendarid, $start, $end);
-			} else {
-				OCP\Util::emitHook('OC_Calendar', 'getEvents', array('calendar_id' => $calendarid, 'events' => &$events));
-			}
-		}
-		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
-	 * @param (int) $end - DateTime object of end
-	 * @return (array) $output - readable output
-	 */
-	public static function generateEventOutput($event, $start, $end){
-		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;
-		$last_modified = @$vevent->__get('LAST-MODIFIED');
-		$lastmodified = ($last_modified)?$last_modified->getDateTime()->format('U'):0;
-		$staticoutput = array('id'=>(int)$event['id'],
-						'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)){
-			$cachedinperiod = OC_Calendar_Repeat::get_inperiod($id, $start, $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');
-				}
-				$return[] = array_merge($staticoutput, $dynamicoutput);
-			}
-		}else{
-			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;
-				}
-				$dynamicoutput = OC_Calendar_Object::generateStartEndDate($singleevent->DTSTART, OC_Calendar_Object::getDTEndFromVEvent($singleevent), $allday, self::$tz);
-				$return[] = array_merge($staticoutput, $dynamicoutput);			
-			}
-		}
-		return $return;
-	}
-}
diff --git a/apps/calendar/lib/attendees.php b/apps/calendar/lib/attendees.php
deleted file mode 100644
index ac30e11b3b..0000000000
--- a/apps/calendar/lib/attendees.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?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 Attendees for calendars
- */
-class OC_Calendar_Attendees{
-	
-}
\ No newline at end of file
diff --git a/apps/calendar/lib/calendar.php b/apps/calendar/lib/calendar.php
deleted file mode 100644
index f8f5aab363..0000000000
--- a/apps/calendar/lib/calendar.php
+++ /dev/null
@@ -1,308 +0,0 @@
-<?php
-/**
- * Copyright (c) 2011 Jakob Sack <mail@jakobsack.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!
- *
- * CREATE TABLE calendar_calendars (
- *     id INTEGER UNSIGNED NOT NULL PRIMARY KEY AUTO_INCREMENT,
- *     userid VARCHAR(255),
- *     displayname VARCHAR(100),
- *     uri VARCHAR(100),
- *     active INTEGER UNSIGNED NOT NULL DEFAULT '0',
- *     ctag INTEGER UNSIGNED NOT NULL DEFAULT '0',
- *     calendarorder INTEGER UNSIGNED NOT NULL DEFAULT '0',
- *     calendarcolor VARCHAR(10),
- *     timezone TEXT,
- *     components VARCHAR(20)
- * );
- *
- */
-
-/**
- * This class manages our calendars
- */
-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
-	 * @return array
-	 */
-	public static function allCalendars($uid, $active=false){
-		$values = array($uid);
-		$active_where = '';
-		if (!is_null($active) && $active){
-			$active_where = ' AND `active` = ?';
-			$values[] = $active;
-		}
-		$stmt = OCP\DB::prepare( 'SELECT * FROM `*PREFIX*calendar_calendars` WHERE `userid` = ?' . $active_where );
-		$result = $stmt->execute($values);
-
-		$calendars = array();
-		while( $row = $result->fetchRow()){
-			$calendars[] = $row;
-		}
-
-		return $calendars;
-	}
-
-	/**
-	 * @brief Returns the list of calendars for a principal (DAV term of user)
-	 * @param string $principaluri
-	 * @return array
-	 */
-	public static function allCalendarsWherePrincipalURIIs($principaluri){
-		$uid = self::extractUserID($principaluri);
-		return self::allCalendars($uid);
-	}
-
-	/**
-	 * @brief Gets the data of one calendar
-	 * @param integer $id
-	 * @return associative array
-	 */
-	public static function find($id){
-		$stmt = OCP\DB::prepare( 'SELECT * FROM `*PREFIX*calendar_calendars` WHERE `id` = ?' );
-		$result = $stmt->execute(array($id));
-
-		return $result->fetchRow();
-	}
-
-	/**
-	 * @brief Creates a new calendar
-	 * @param string $userid
-	 * @param string $name
-	 * @param string $components Default: "VEVENT,VTODO,VJOURNAL"
-	 * @param string $timezone Default: null
-	 * @param integer $order Default: 1
-	 * @param string $color Default: null, format: '#RRGGBB(AA)'
-	 * @return insertid
-	 */
-	public static function addCalendar($userid,$name,$components='VEVENT,VTODO,VJOURNAL',$timezone=null,$order=0,$color=null){
-		$all = self::allCalendars($userid);
-		$uris = array();
-		foreach($all as $i){
-			$uris[] = $i['uri'];
-		}
-
-		$uri = self::createURI($name, $uris );
-
-		$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));
-
-		$insertid = OCP\DB::insertid('*PREFIX*calendar_calendars');
-		OCP\Util::emitHook('OC_Calendar', 'addCalendar', $insertid);
-
-		return $insertid;
-	}
-
-	/**
-	 * @brief Creates a new calendar from the data sabredav provides
-	 * @param string $principaluri
-	 * @param string $uri
-	 * @param string $name
-	 * @param string $components
-	 * @param string $timezone
-	 * @param integer $order
-	 * @param string $color format: '#RRGGBB(AA)'
-	 * @return insertid
-	 */
-	public static function addCalendarFromDAVData($principaluri,$uri,$name,$components,$timezone,$order,$color){
-		$userid = self::extractUserID($principaluri);
-
-		$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));
-
-		$insertid = OCP\DB::insertid('*PREFIX*calendar_calendars');
-		OCP\Util::emitHook('OC_Calendar', 'addCalendar', $insertid);
-
-		return $insertid;
-	}
-
-	/**
-	 * @brief Edits a calendar
-	 * @param integer $id
-	 * @param string $name Default: null
-	 * @param string $components Default: null
-	 * @param string $timezone Default: null
-	 * @param integer $order Default: null
-	 * @param string $color Default: null, format: '#RRGGBB(AA)'
-	 * @return boolean
-	 *
-	 * Values not null will be set
-	 */
-	public static function editCalendar($id,$name=null,$components=null,$timezone=null,$order=null,$color=null){
-		// Need these ones for checking uri
-		$calendar = self::find($id);
-
-		// Keep old stuff
-		if(is_null($name)) $name = $calendar['displayname'];
-		if(is_null($components)) $components = $calendar['components'];
-		if(is_null($timezone)) $timezone = $calendar['timezone'];
-		if(is_null($order)) $order = $calendar['calendarorder'];
-		if(is_null($color)) $color = $calendar['calendarcolor'];
-
-		$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', $id);
-		return true;
-	}
-
-	/**
-	 * @brief Sets a calendar (in)active
-	 * @param integer $id
-	 * @param boolean $active
-	 * @return boolean
-	 */
-	public static function setCalendarActive($id,$active){
-		$stmt = OCP\DB::prepare( 'UPDATE `*PREFIX*calendar_calendars` SET `active` = ? WHERE `id` = ?' );
-		$stmt->execute(array($active, $id));
-
-		return true;
-	}
-
-	/**
-	 * @brief Updates ctag for calendar
-	 * @param integer $id
-	 * @return boolean
-	 */
-	public static function touchCalendar($id){
-		$stmt = OCP\DB::prepare( 'UPDATE `*PREFIX*calendar_calendars` SET `ctag` = `ctag` + 1 WHERE `id` = ?' );
-		$stmt->execute(array($id));
-
-		return true;
-	}
-
-	/**
-	 * @brief removes a calendar
-	 * @param integer $id
-	 * @return boolean
-	 */
-	public static function deleteCalendar($id){
-		$stmt = OCP\DB::prepare( 'DELETE FROM `*PREFIX*calendar_calendars` WHERE `id` = ?' );
-		$stmt->execute(array($id));
-
-		$stmt = OCP\DB::prepare( 'DELETE FROM `*PREFIX*calendar_objects` WHERE `calendarid` = ?' );
-		$stmt->execute(array($id));
-
-		OCP\Util::emitHook('OC_Calendar', 'deleteCalendar', $id);
-		if(count(self::allCalendars(OCP\USER::getUser())) == 0) {
-			self::addCalendar(OCP\USER::getUser(),'Default 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
-	 * @param array  $existing existing calendar URIs
-	 * @return string uri
-	 */
-	public static function createURI($name,$existing){
-		$name = strtolower($name);
-		$newname = $name;
-		$i = 1;
-		while(in_array($newname,$existing)){
-			$newname = $name.$i;
-			$i = $i + 1;
-		}
-		return $newname;
-	}
-
-	/**
-	 * @brief gets the userid from a principal path
-	 * @return string
-	 */
-	public static function extractUserID($principaluri){
-		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"
-			'#b3dc6c', // "Green"
-			'#ffff00', // "Yellow"
-			'#808000', // "Olive"
-			'#ffa500', // "Orange"
-			'#ff7f50', // "Coral"
-			'#ee82ee', // "Violet"
-			'#9fc6e7', // "light blue"
-		);
-	}
-
-	/**
-	 * @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'],
-			'backgroundColor' => $calendar['calendarcolor'],
-			'borderColor' => '#888',
-			'textColor' => self::generateTextColor($calendar['calendarcolor']),
-			'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;
-	}
-	
-	/*
-	 * @brief generates the text color for the calendar
-	 * @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){
-		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)?'#000000':'#FAFAFA';
-	}
-}
diff --git a/apps/calendar/lib/export.php b/apps/calendar/lib/export.php
deleted file mode 100644
index 8f26891f36..0000000000
--- a/apps/calendar/lib/export.php
+++ /dev/null
@@ -1,94 +0,0 @@
-<?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 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
-	 * @return string
-	 */
-	public static function export($id, $type){
-		if($type == self::EVENT){
-			$return = self::event($id);
-		}else{
-			$return = self::calendar($id);
-		}
-		return self::fixLineBreaks($return);
-	}
-
-	/**
-	 * @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);
-		$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);
-		}
-		$return .= "END:VCALENDAR";
-		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') . "\nX-WR-CALNAME:" . $event['summary'] . "\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;
-	}
-}
diff --git a/apps/calendar/lib/hooks.php b/apps/calendar/lib/hooks.php
deleted file mode 100644
index bc0b02c62b..0000000000
--- a/apps/calendar/lib/hooks.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?php
-/**
- * Copyright (c) 2011 Jakob Sack <mail@jakobsack.de>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
-/**
- * This class contains all hooks.
- */
-class OC_Calendar_Hooks{
-	/**
-	 * @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
-	 */
-	public static function deleteUser($parameters) {
-		$calendars = OC_Calendar_Calendar::allCalendars($parameters['uid']);
-
-		foreach($calendars as $calendar) {
-			OC_Calendar_Calendar::deleteCalendar($calendar['id']);
-		}
-
-		OC_Calendar_Share::post_userdelete($parameters['uid']);
-
-		return true;
-	}
-}
diff --git a/apps/calendar/lib/import.php b/apps/calendar/lib/import.php
deleted file mode 100644
index 2e3a729e0c..0000000000
--- a/apps/calendar/lib/import.php
+++ /dev/null
@@ -1,336 +0,0 @@
-<?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 counts the absolute number of parsed elements
-	 */
-	private $abscount;
-	
-	/*
-	 * @brief var saves if the percentage should be saved with OC_Cache
-	 */
-	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 counts the number of imported elements
-	 */
-	private $count;
-	
-	/*
-	 * @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 calendar id for import
-	 */
-	private $id;
-	
-	/*
-	 * @brief var saves the percentage of the import's progress
-	 */
-	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
-	 */
-	private $tz;
-	
-	/*
-	 * @brief var saves the userid
-	 */
-	private $userid;
-
-	/*
-	 * public methods 
-	 */
-	
-	/*
-	 * @brief does general initialization for import object
-	 * @param string $calendar content of ical file
-	 * @param string $tz timezone of the user
-	 * @return boolean
-	 */
-	public function __construct($ical){
-		$this->error = null;
-		$this->ical = $ical;
-		$this->abscount = 0;
-		$this->count = 0;
-		try{
-			$this->calobject = OC_VObject::parse($this->ical);
-		}catch(Exception $e){
-			//MISSING: write some log
-			$this->error = true;
-			return false;
-		}
-		return true;
-	}
-	
-	/*
-	 * @brief imports a calendar
-	 * @return boolean
-	 */
-	public function 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;
-			}
-			$dtend = OC_Calendar_Object::getDTEndFromVEvent($object);
-			$object->DTSTART->getDateTime()->setTimezone(new DateTimeZone($this->tz));
-			$object->DTEND->setDateTime($dtend->getDateTime(), $object->DTSTART->getDateType());
-			$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->updateProgress(intval(($this->abscount / $numofcomponents)*100));
-		}
-		OC_Cache::remove($this->progresskey);
-		return true;
-	}
-	
-	/*
-	 * @brief sets the timezone
-	 * @return boolean
-	 */
-	public function setTimeZone($tz){
-		$this->tz = $tz;
-		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
-	 */
-	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;
-	}
-	
-	/*
-	 * @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;
-	}
-	
-	/*
-	 * @brief generates a new calendar name
-	 * @return string
-	 */
-	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, $this->userid)){
-			$calendarname = $guessedcalendarname . ' (' . $i . ')';
-			$i++;
-		}
-		return $calendarname;
-	}
-	
-	/*
-	 * @brief generates a new calendar color
-	 * @return string
-	 */
-	public function createCalendarColor(){
-		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 function setCalendarID($id){
-		$this->id = $id;
-		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;
-	}
-	
-	/*
-	 * @brief returns the private 
-	 * @param string $id of the user
-	 * @return boolean
-	 */
-	public function getCount(){
-		return $this->count;
-	}
-
-	/*
-	 * 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 checks if an event already exists in the user's calendars
-	 * @param integer $insertid id of the new object
-	 * @return boolean
-	 */
-	private function isDuplicate($insertid){
-		$newobject = OC_Calendar_Object::find($insertid);
-		$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;
-		}
-		return false;
-	}
-	
-	/*
-	 * @brief updates the progress var
-	 * @param integer $percentage
-	 * @return boolean
-	 */
-	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
-	 */
-	
-	/*
-	 * @brief guesses the calendar color
-	 * @return mixed - string or boolean
-	 */
-	public function guessCalendarColor(){
-		if(!is_null($this->calobject->__get('X-APPLE-CALENDAR-COLOR'))){
-			return $this->calobject->__get('X-APPLE-CALENDAR-COLOR');
-		}
-		return null;
-	}
-	
-	/*
-	 * @brief guesses the calendar description
-	 * @return mixed - string or boolean
-	 */
-	public function guessCalendarDescription(){
-		if(!is_null($this->calobject->__get('X-WR-CALDESC'))){
-			return $this->calobject->__get('X-WR-CALDESC');
-		}
-		return null;
-	}
-	
-	/*
-	 * @brief guesses the calendar name
-	 * @return mixed - string or boolean
-	 */
-	public function guessCalendarName(){
-		if(!is_null($this->calobject->__get('X-WR-CALNAME'))){
-			return $this->calobject->__get('X-WR-CALNAME');
-		}
-		return null;
-	}
-}
diff --git a/apps/calendar/lib/object.php b/apps/calendar/lib/object.php
deleted file mode 100644
index 8020d7c2e5..0000000000
--- a/apps/calendar/lib/object.php
+++ /dev/null
@@ -1,937 +0,0 @@
-<?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!
- *
- * 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
- */
-class OC_Calendar_Object{
-	/**
-	 * @brief Returns all objects of a calendar
-	 * @param integer $id
-	 * @return array
-	 *
-	 * The objects are associative arrays. You'll find the original vObject in
-	 * ['calendardata']
-	 */
-	public static function all($id){
-		$stmt = OCP\DB::prepare( 'SELECT * FROM `*PREFIX*calendar_objects` WHERE `calendarid` = ?' );
-		$result = $stmt->execute(array($id));
-
-		$calendarobjects = array();
-		while( $row = $result->fetchRow()){
-			$calendarobjects[] = $row;
-		}
-
-		return $calendarobjects;
-	}
-
-	/**
-	 * @brief Returns all objects of a calendar between $start and $end
-	 * @param integer $id
-	 * @param DateTime $start
-	 * @param DateTime $end
-	 * @return array
-	 *
-	 * The objects are associative arrays. You'll find the original vObject
-	 * in ['calendardata']
-	 */
-	public static function allInPeriod($id, $start, $end){
-		$stmt = OCP\DB::prepare( 'SELECT * FROM `*PREFIX*calendar_objects` WHERE `calendarid` = ?'
-		.' AND ((`startdate` >= ? AND `startdate` <= ? AND `repeating` = 0)'
-		.' OR (`enddate` >= ? AND `enddate` <= ? AND `repeating` = 0)'
-		.' OR (`startdate` <= ? AND `repeating` = 1))' );
-		$start = self::getUTCforMDB($start);
-		$end = self::getUTCforMDB($end);
-		$result = $stmt->execute(array($id,
-					$start, $end,
-					$start, $end,
-					$end));
-
-		$calendarobjects = array();
-		while( $row = $result->fetchRow()){
-			$calendarobjects[] = $row;
-		}
-
-		return $calendarobjects;
-	}
-
-	/**
-	 * @brief Returns an object
-	 * @param integer $id
-	 * @return associative array
-	 */
-	public static function find($id){
-		$stmt = OCP\DB::prepare( 'SELECT * FROM `*PREFIX*calendar_objects` WHERE `id` = ?' );
-		$result = $stmt->execute(array($id));
-
-		return $result->fetchRow();
-	}
-
-	/**
-	 * @brief finds an object by its DAV Data
-	 * @param integer $cid Calendar id
-	 * @param string $uri the uri ('filename')
-	 * @return associative array
-	 */
-	public static function findWhereDAVDataIs($cid,$uri){
-		$stmt = OCP\DB::prepare( 'SELECT * FROM `*PREFIX*calendar_objects` WHERE `calendarid` = ? AND `uri` = ?' );
-		$result = $stmt->execute(array($cid,$uri));
-
-		return $result->fetchRow();
-	}
-
-	/**
-	 * @brief Adds an object
-	 * @param integer $id Calendar id
-	 * @param string $data  object
-	 * @return insertid
-	 */
-	public static function add($id,$data){
-		$object = OC_VObject::parse($data);
-		OC_Calendar_App::loadCategoriesFromVCalendar($object);
-		list($type,$startdate,$enddate,$summary,$repeating,$uid) = self::extractData($object);
-
-		if(is_null($uid)){
-			$object->setUID();
-			$data = $object->serialize();
-		}
-
-		$uri = 'owncloud-'.md5($data.rand().time()).'.ics';
-
-		$stmt = OCP\DB::prepare( 'INSERT INTO `*PREFIX*calendar_objects` (`calendarid`,`objecttype`,`startdate`,`enddate`,`repeating`,`summary`,`calendardata`,`uri`,`lastmodified`) VALUES(?,?,?,?,?,?,?,?,?)' );
-		$stmt->execute(array($id,$type,$startdate,$enddate,$repeating,$summary,$data,$uri,time()));
-		$object_id = OCP\DB::insertid('*PREFIX*calendar_objects');
-
-		OC_Calendar_Calendar::touchCalendar($id);
-		OCP\Util::emitHook('OC_Calendar', 'addEvent', $object_id);
-		return $object_id;
-	}
-
-	/**
-	 * @brief Adds an object with the data provided by sabredav
-	 * @param integer $id Calendar id
-	 * @param string $uri   the uri the card will have
-	 * @param string $data  object
-	 * @return insertid
-	 */
-	public static function addFromDAVData($id,$uri,$data){
-		$object = OC_VObject::parse($data);
-		list($type,$startdate,$enddate,$summary,$repeating,$uid) = self::extractData($object);
-
-		$stmt = OCP\DB::prepare( 'INSERT INTO `*PREFIX*calendar_objects` (`calendarid`,`objecttype`,`startdate`,`enddate`,`repeating`,`summary`,`calendardata`,`uri`,`lastmodified`) VALUES(?,?,?,?,?,?,?,?,?)' );
-		$stmt->execute(array($id,$type,$startdate,$enddate,$repeating,$summary,$data,$uri,time()));
-		$object_id = OCP\DB::insertid('*PREFIX*calendar_objects');
-
-		OC_Calendar_Calendar::touchCalendar($id);
-		OCP\Util::emitHook('OC_Calendar', 'addEvent', $object_id);
-		return $object_id;
-	}
-
-	/**
-	 * @brief edits an object
-	 * @param integer $id id of object
-	 * @param string $data  object
-	 * @return boolean
-	 */
-	public static function edit($id, $data){
-		$oldobject = self::find($id);
-
-		$object = OC_VObject::parse($data);
-		OC_Calendar_App::loadCategoriesFromVCalendar($object);
-		list($type,$startdate,$enddate,$summary,$repeating,$uid) = self::extractData($object);
-
-		$stmt = OCP\DB::prepare( 'UPDATE `*PREFIX*calendar_objects` SET `objecttype`=?,`startdate`=?,`enddate`=?,`repeating`=?,`summary`=?,`calendardata`=?,`lastmodified`= ? WHERE `id` = ?' );
-		$stmt->execute(array($type,$startdate,$enddate,$repeating,$summary,$data,time(),$id));
-
-		OC_Calendar_Calendar::touchCalendar($oldobject['calendarid']);
-		OCP\Util::emitHook('OC_Calendar', 'editEvent', $id);
-
-		return true;
-	}
-
-	/**
-	 * @brief edits an object with the data provided by sabredav
-	 * @param integer $id calendar id
-	 * @param string $uri   the uri of the object
-	 * @param string $data  object
-	 * @return boolean
-	 */
-	public static function editFromDAVData($cid,$uri,$data){
-		$oldobject = self::findWhereDAVDataIs($cid,$uri);
-
-		$object = OC_VObject::parse($data);
-		list($type,$startdate,$enddate,$summary,$repeating,$uid) = self::extractData($object);
-
-		$stmt = OCP\DB::prepare( 'UPDATE `*PREFIX*calendar_objects` SET `objecttype`=?,`startdate`=?,`enddate`=?,`repeating`=?,`summary`=?,`calendardata`=?,`lastmodified`= ? WHERE `id` = ?' );
-		$stmt->execute(array($type,$startdate,$enddate,$repeating,$summary,$data,time(),$oldobject['id']));
-
-		OC_Calendar_Calendar::touchCalendar($oldobject['calendarid']);
-		OCP\Util::emitHook('OC_Calendar', 'editEvent', $oldobject['id']);
-
-		return true;
-	}
-
-	/**
-	 * @brief deletes an object
-	 * @param integer $id id of object
-	 * @return boolean
-	 */
-	public static function delete($id){
-		$oldobject = self::find($id);
-		$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', $id);
-
-		return true;
-	}
-
-	/**
-	 * @brief deletes an  object with the data provided by sabredav
-	 * @param integer $cid calendar id
-	 * @param string $uri the uri of the 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', $oldobject['id']);
-
-		return true;
-	}
-
-	public static function moveToCalendar($id, $calendarid){
-		$stmt = OCP\DB::prepare( 'UPDATE `*PREFIX*calendar_objects` SET `calendarid`=? WHERE `id`=?' );
-		$stmt->execute(array($calendarid,$id));
-
-		OC_Calendar_Calendar::touchCalendar($id);
-		OCP\Util::emitHook('OC_Calendar', 'moveEvent', $id);
-
-		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
-	 * @param Sabre_VObject $object
-	 * @return array
-	 *
-	 * [type, start, end, summary, repeating, uid]
-	 */
-	protected static function extractData($object){
-		$return = array('',null,null,'',0,null);
-
-		// Child to use
-		$children = 0;
-		$use = null;
-		foreach($object->children as $property){
-			if($property->name == 'VEVENT'){
-				$children++;
-				$thisone = true;
-
-				foreach($property->children as &$element){
-					if($element->name == 'RECURRENCE-ID'){
-						$thisone = false;
-					}
-				} unset($element);
-
-				if($thisone){
-					$use = $property;
-				}
-			}
-			elseif($property->name == 'VTODO' || $property->name == 'VJOURNAL'){
-				$return[0] = $property->name;
-				foreach($property->children as &$element){
-					if($element->name == 'SUMMARY'){
-						$return[3] = $element->value;
-					}
-					elseif($element->name == 'UID'){
-						$return[5] = $element->value;
-					}
-				};
-
-				// Only one VTODO or VJOURNAL per object
-				// (only one UID per object but a UID is required by a VTODO =>
-				//    one VTODO per object)
-				break;
-			}
-		}
-
-		// find the data
-		if(!is_null($use)){
-			$return[0] = $use->name;
-			foreach($use->children as $property){
-				if($property->name == 'DTSTART'){
-					$return[1] = self::getUTCforMDB($property->getDateTime());
-				}
-				elseif($property->name == 'DTEND'){
-					$return[2] = self::getUTCforMDB($property->getDateTime());
-				}
-				elseif($property->name == 'SUMMARY'){
-					$return[3] = $property->value;
-				}
-				elseif($property->name == 'RRULE'){
-					$return[4] = 1;
-				}
-				elseif($property->name == 'UID'){
-					$return[5] = $property->value;
-				}
-			}
-		}
-
-		// More than one child means reoccuring!
-		if($children > 1){
-			$return[4] = 1;
-		}
-		return $return;
-	}
-
-	/**
-	 * @brief DateTime to UTC string
-	 * @param DateTime $datetime The date to convert
-	 * @returns date as YYYY-MM-DD hh:mm
-	 *
-	 * This function creates a date string that can be used by MDB2.
-	 * Furthermore it converts the time to UTC.
-	 */
-	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;
-		}else{
-			$dtend = clone $vevent->DTSTART;
-			// clone creates a shallow copy, also clone DateTime
-			$dtend->setDateTime(clone $dtend->getDateTime(), $dtend->getDateType());
-			if ($vevent->DURATION){
-				$duration = strval($vevent->DURATION);
-				$invert = 0;
-				if ($duration[0] == '-'){
-					$duration = substr($duration, 1);
-					$invert = 1;
-				}
-				if ($duration[0] == '+'){
-					$duration = substr($duration, 1);
-				}
-				$interval = new DateInterval($duration);
-				$interval->invert = $invert;
-				$dtend->getDateTime()->add($interval);
-			}
-		}
-		return $dtend;
-	}
-	
-	/**
-	 * @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'),
-			'weekly'        => $l10n->t('Weekly'),
-			'weekday'       => $l10n->t('Every Weekday'),
-			'biweekly'      => $l10n->t('Bi-Weekly'),
-			'monthly'       => $l10n->t('Monthly'),
-			'yearly'        => $l10n->t('Yearly')
-		);
-	}
-	
-	/**
-	 * @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')
-		);
-	}
-	
-	/**
-	 * @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')
-		);
-	}
-	
-	/**
-	 * @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'),
-			'WE' => $l10n->t('Wednesday'),
-			'TH' => $l10n->t('Thursday'),
-			'FR' => $l10n->t('Friday'),
-			'SA' => $l10n->t('Saturday'),
-			'SU' => $l10n->t('Sunday')
-		);
-	}
-	
-	/**
-	 * @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'),
-			'2' => $l10n->t('second'),
-			'3' => $l10n->t('third'),
-			'4' => $l10n->t('fourth'),
-			'5' => $l10n->t('fifth'),
-			'-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){
-			$return[(string) $num] = (string) $num;
-		}
-		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){
-			$return[(string) $num] = (string) $num;
-		}
-		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'),
-			'2'  => $l10n->t('February'),
-			'3'  => $l10n->t('March'),
-			'4'  => $l10n->t('April'),
-			'5'  => $l10n->t('May'),
-			'6'  => $l10n->t('June'),
-			'7'  => $l10n->t('July'),
-			'8'  => $l10n->t('August'),
-			'9'  => $l10n->t('September'),
-			'10' => $l10n->t('October'),
-			'11' => $l10n->t('November'),
-			'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'),
-			'byyearday' => $l10n->t('by yearday(s)'),
-			'byweekno'  => $l10n->t('by weeknumber(s)'),
-			'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);
-	}
-	
-	/**
-	 * @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'] == ''){
-			$errarr['title'] = 'true';
-			$errnum++;
-		}
-
-		$fromday = substr($request['from'], 0, 2);
-		$frommonth = substr($request['from'], 3, 2);
-		$fromyear = substr($request['from'], 6, 4);
-		if(!checkdate($frommonth, $fromday, $fromyear)){
-			$errarr['from'] = 'true';
-			$errnum++;
-		}
-		$allday = isset($request['allday']);
-		if(!$allday && self::checkTime(urldecode($request['fromtime']))) {
-			$errarr['fromtime'] = 'true';
-			$errnum++;
-		}
-
-		$today = substr($request['to'], 0, 2);
-		$tomonth = substr($request['to'], 3, 2);
-		$toyear = substr($request['to'], 6, 4);
-		if(!checkdate($tomonth, $today, $toyear)){
-			$errarr['to'] = 'true';
-			$errnum++;
-		}
-		if($request['repeat'] != 'doesnotrepeat'){
-			if(is_nan($request['interval']) && $request['interval'] != ''){
-				$errarr['interval'] = 'true';
-				$errnum++;
-			}
-			if(array_key_exists('repeat', $request) && !array_key_exists($request['repeat'], self::getRepeatOptions(OC_Calendar_App::$l10n))){
-				$errarr['repeat'] = 'true';
-				$errnum++;
-			}
-			if(array_key_exists('advanced_month_select', $request) && !array_key_exists($request['advanced_month_select'], self::getMonthOptions(OC_Calendar_App::$l10n))){
-				$errarr['advanced_month_select'] = 'true';
-				$errnum++;
-			}
-			if(array_key_exists('advanced_year_select', $request) && !array_key_exists($request['advanced_year_select'], self::getYearOptions(OC_Calendar_App::$l10n))){
-				$errarr['advanced_year_select'] = 'true';
-				$errnum++;
-			}
-			if(array_key_exists('weekofmonthoptions', $request) && !array_key_exists($request['weekofmonthoptions'], self::getWeekofMonth(OC_Calendar_App::$l10n))){
-				$errarr['weekofmonthoptions'] = 'true';
-				$errnum++;
-			}
-			if($request['end'] != 'never'){
-				if(!array_key_exists($request['end'], self::getEndOptions(OC_Calendar_App::$l10n))){
-					$errarr['end'] = 'true';
-					$errnum++;
-				}
-				if($request['end'] == 'count' && is_nan($request['byoccurrences'])){
-					$errarr['byoccurrences'] = 'true';
-					$errnum++;
-				}
-				if($request['end'] == 'date'){
-					list($bydate_day, $bydate_month, $bydate_year) = explode('-', $request['bydate']);
-					if(!checkdate($bydate_month, $bydate_day, $bydate_year)){
-						$errarr['bydate'] = 'true';
-						$errnum++;
-					}
-				}
-			}
-			if(array_key_exists('weeklyoptions', $request)){
-				foreach($request['weeklyoptions'] as $option){
-					if(!in_array($option, self::getWeeklyOptions(OC_Calendar_App::$l10n))){
-						$errarr['weeklyoptions'] = 'true';
-						$errnum++;
-					}
-				}
-			}
-			if(array_key_exists('byyearday', $request)){
-				foreach($request['byyearday'] as $option){
-					if(!array_key_exists($option, self::getByYearDayOptions())){
-						$errarr['byyearday'] = 'true';
-						$errnum++;
-					}
-				}
-			}
-			if(array_key_exists('weekofmonthoptions', $request)){
-				if(is_nan((double)$request['weekofmonthoptions'])){
-					$errarr['weekofmonthoptions'] = 'true';
-					$errnum++;
-				}
-			}
-			if(array_key_exists('bymonth', $request)){
-				foreach($request['bymonth'] as $option){
-					if(!in_array($option, self::getByMonthOptions(OC_Calendar_App::$l10n))){
-						$errarr['bymonth'] = 'true';
-						$errnum++;
-					}
-				}
-			}
-			if(array_key_exists('byweekno', $request)){
-				foreach($request['byweekno'] as $option){
-					if(!array_key_exists($option, self::getByWeekNoOptions())){
-						$errarr['byweekno'] = 'true';
-						$errnum++;
-					}
-				}
-			}
-			if(array_key_exists('bymonthday', $request)){
-				foreach($request['bymonthday'] as $option){
-					if(!array_key_exists($option, self::getByMonthDayOptions())){
-						$errarr['bymonthday'] = 'true';
-						$errnum++;
-					}
-				}
-			}
-		}
-		if(!$allday && self::checkTime(urldecode($request['totime']))) {
-			$errarr['totime'] = 'true';
-			$errnum++;
-		}
-		if($today < $fromday && $frommonth == $tomonth && $fromyear == $toyear){
-			$errarr['endbeforestart'] = 'true';
-			$errnum++;
-		}
-		if($today == $fromday && $frommonth > $tomonth && $fromyear == $toyear){
-			$errarr['endbeforestart'] = 'true';
-			$errnum++;
-		}
-		if($today == $fromday && $frommonth == $tomonth && $fromyear > $toyear){
-			$errarr['endbeforestart'] = 'true';
-			$errnum++;
-		}
-		if(!$allday && $fromday == $today && $frommonth == $tomonth && $fromyear == $toyear){
-			list($tohours, $tominutes) = explode(':', $request['totime']);
-			list($fromhours, $fromminutes) = explode(':', $request['fromtime']);
-			if($tohours < $fromhours){
-				$errarr['endbeforestart'] = 'true';
-				$errnum++;
-			}
-			if($tohours == $fromhours && $tominutes < $fromminutes){
-				$errarr['endbeforestart'] = 'true';
-				$errnum++;
-			}
-		}
-		if ($errnum)
-		{
-			return $errarr;
-		}
-		return false;
-	}
-	
-	/**
-	 * @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;
-	}
-	
-	/**
-	 * @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');
-
-		$vevent = new OC_VObject('VEVENT');
-		$vcalendar->add($vevent);
-
-		$vevent->setDateTime('CREATED', 'now', Sabre_VObject_Property_DateTime::UTC);
-
-		$vevent->setUID();
-		return self::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"];
-		$allday = isset($request["allday"]);
-		$from = $request["from"];
-		$to  = $request["to"];
-		if (!$allday){
-			$fromtime = $request['fromtime'];
-			$totime = $request['totime'];
-		}
-		$vevent = $vcalendar->VEVENT;
-		$description = $request["description"];
-		$repeat = $request["repeat"];
-		if($repeat != 'doesnotrepeat'){
-			$rrule = '';
-			$interval = $request['interval'];
-			$end = $request['end'];
-			$byoccurrences = $request['byoccurrences'];
-			switch($repeat){
-				case 'daily':
-					$rrule .= 'FREQ=DAILY';
-					break;
-				case 'weekly':
-					$rrule .= 'FREQ=WEEKLY';
-					if(array_key_exists('weeklyoptions', $request)){
-						$byday = '';
-						$daystrings = array_flip(self::getWeeklyOptions(OC_Calendar_App::$l10n));
-						foreach($request['weeklyoptions'] as $days){
-							if($byday == ''){
-								$byday .= $daystrings[$days];
-							}else{
-								$byday .= ',' .$daystrings[$days];
-							}
-						}
-						$rrule .= ';BYDAY=' . $byday;
-					}
-					break;
-				case 'weekday':
-					$rrule .= 'FREQ=WEEKLY';
-					$rrule .= ';BYDAY=MO,TU,WE,TH,FR';
-					break;
-				case 'biweekly':
-					$rrule .= 'FREQ=WEEKLY';
-					$interval = $interval * 2;
-					break;
-				case 'monthly':
-					$rrule .= 'FREQ=MONTHLY';
-					if($request['advanced_month_select'] == 'monthday'){
-						break;
-					}elseif($request['advanced_month_select'] == 'weekday'){
-						if($request['weekofmonthoptions'] == 'auto'){
-							list($_day, $_month, $_year) = explode('-', $from);
-							$weekofmonth = floor($_day/7);
-						}else{
-							$weekofmonth = $request['weekofmonthoptions'];
-						}
-						$days = array_flip(self::getWeeklyOptions(OC_Calendar_App::$l10n));
-						$byday = '';
-						foreach($request['weeklyoptions'] as $day){
-							if($byday == ''){
-								$byday .= $weekofmonth . $days[$day];
-							}else{
-								$byday .= ',' . $weekofmonth . $days[$day];
-							}
-						}
-						if($byday == ''){
-							$byday = 'MO,TU,WE,TH,FR,SA,SU';
-						}
-						$rrule .= ';BYDAY=' . $byday;
-					}
-					break;
-				case 'yearly':
-					$rrule .= 'FREQ=YEARLY';
-					if($request['advanced_year_select'] == 'bydate'){
-						
-					}elseif($request['advanced_year_select'] == 'byyearday'){
-						list($_day, $_month, $_year) = explode('-', $from);
-						$byyearday = date('z', mktime(0,0,0, $_month, $_day, $_year)) + 1;
-						if(array_key_exists('byyearday', $request)){
-							foreach($request['byyearday'] as $yearday){
-								$byyearday .= ',' . $yearday;
-							}
-						}
-						$rrule .= ';BYYEARDAY=' . $byyearday;
-					}elseif($request['advanced_year_select'] == 'byweekno'){
-						list($_day, $_month, $_year) = explode('-', $from);
-						$rrule .= ';BYDAY=' . strtoupper(substr(date('l', mktime(0,0,0, $_month, $_day, $_year)), 0, 2));
-						$byweekno = '';
-						foreach($request['byweekno'] as $weekno){
-							if($byweekno == ''){
-								$byweekno = $weekno;
-							}else{
-								$byweekno .= ',' . $weekno;
-							}
-						}
-						$rrule .= ';BYWEEKNO=' . $byweekno;
-					}elseif($request['advanced_year_select'] == 'bydaymonth'){
-						if(array_key_exists('weeklyoptions', $request)){
-							$days = array_flip(self::getWeeklyOptions(OC_Calendar_App::$l10n));
-							$byday = '';
-							foreach($request['weeklyoptions'] as $day){
-								if($byday == ''){
-								      $byday .= $days[$day];
-								}else{
-								      $byday .= ',' . $days[$day];
-								}
-							}
-							$rrule .= ';BYDAY=' . $byday;
-						}
-						if(array_key_exists('bymonth', $request)){
-							$monthes = array_flip(self::getByMonthOptions(OC_Calendar_App::$l10n));
-							$bymonth = '';
-							foreach($request['bymonth'] as $month){
-								if($bymonth == ''){
-								      $bymonth .= $monthes[$month];
-								}else{
-								      $bymonth .= ',' . $monthes[$month];
-								}
-							}
-							$rrule .= ';BYMONTH=' . $bymonth;
-							
-						}
-						if(array_key_exists('bymonthday', $request)){
-							$bymonthday = '';
-							foreach($request['bymonthday'] as $monthday){
-								if($bymonthday == ''){
-								      $bymonthday .= $monthday;
-								}else{
-								      $bymonthday .= ',' . $monthday;
-								}
-							}
-							$rrule .= ';BYMONTHDAY=' . $bymonthday;
-							
-						}
-					}
-					break;
-				default:
-					break;
-			}
-			if($interval != ''){
-				$rrule .= ';INTERVAL=' . $interval;
-			}
-			if($end == 'count'){
-				$rrule .= ';COUNT=' . $byoccurrences;
-			}
-			if($end == 'date'){
-				list($bydate_day, $bydate_month, $bydate_year) = explode('-', $request['bydate']);
-				$rrule .= ';UNTIL=' . $bydate_year . $bydate_month . $bydate_day;
-			}
-			$vevent->setString('RRULE', $rrule);
-			$repeat = "true";
-		}else{
-			$repeat = "false";
-		}
-
-
-		$vevent->setDateTime('LAST-MODIFIED', 'now', Sabre_VObject_Property_DateTime::UTC);
-		$vevent->setDateTime('DTSTAMP', 'now', Sabre_VObject_Property_DateTime::UTC);
-		$vevent->setString('SUMMARY', $title);
-
-		if($allday){
-			$start = new DateTime($from);
-			$end = new DateTime($to.' +1 day');
-			$vevent->setDateTime('DTSTART', $start, Sabre_VObject_Property_DateTime::DATE);
-			$vevent->setDateTime('DTEND', $end, Sabre_VObject_Property_DateTime::DATE);
-		}else{
-			$timezone = OC_Calendar_App::getTimezone();
-			$timezone = new DateTimeZone($timezone);
-			$start = new DateTime($from.' '.$fromtime, $timezone);
-			$end = new DateTime($to.' '.$totime, $timezone);
-			$vevent->setDateTime('DTSTART', $start, Sabre_VObject_Property_DateTime::LOCALTZ);
-			$vevent->setDateTime('DTEND', $end, Sabre_VObject_Property_DateTime::LOCALTZ);
-		}
-		unset($vevent->DURATION);
-
-		$vevent->setString('LOCATION', $location);
-		$vevent->setString('DESCRIPTION', $description);
-		$vevent->setString('CATEGORIES', $categories);
-
-		/*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();
-		$return = array();
-		if($allday){
-			$return['start'] = $start_dt->format('Y-m-d');
-			$end_dt->modify('-1 minute');
-			while($start_dt >= $end_dt){
-				$end_dt->modify('+1 day');
-			}
-			$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
deleted file mode 100644
index 27f1e0481a..0000000000
--- a/apps/calendar/lib/repeat.php
+++ /dev/null
@@ -1,204 +0,0 @@
-<?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
-	 * @param (int) $id - id of the event
-	 * @return (array) 
-	 */
-	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 (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){
-		$stmt = OCP\DB::prepare( 'SELECT * FROM `*PREFIX*calendar_repeat` WHERE `eventid` = ?'
-		.' AND ((`startdate` >= ? AND `startdate` <= ?)'
-		.' OR (`enddate` >= ? AND `enddate` <= ?))');
-		$result = $stmt->execute(array($id,
-					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;
-		}
-		return $return;
-	}
-	/**
-	 * @brief returns the cache of all repeating events of a calendar
-	 * @param (int) $id - id of the calendar
-	 * @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('01-01-' . date('Y') . ' 00:00:00', new DateTimeZone('UTC'));
-		$start->modify('-5 years');
-		$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){
-			if(!($vevent instanceof Sabre_VObject_Component_VEvent)){
-				continue;
-			}
-			$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']));
-		}
-		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)
-	 */
-	public static function generateCalendar($id){
-		$allobjects = OC_Calendar_Object::all($id);
-		foreach($allobjects as $event){
-			self::generate($event['id']);
-		}
-		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)) != 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 (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){
-		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
-	 * @return (bool)
-	 */
-	public static function is_calendar_cached($id){
-		$cachedevents = count(self::getCalendar($id));
-		$repeatingevents = 0;
-		$allevents = OC_Calendar_Object::all($id);
-		foreach($allevents as $event){
-			if($event['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
diff --git a/apps/calendar/lib/sabre/backend.php b/apps/calendar/lib/sabre/backend.php
deleted file mode 100644
index ac3b26ceb3..0000000000
--- a/apps/calendar/lib/sabre/backend.php
+++ /dev/null
@@ -1,318 +0,0 @@
-<?php
-
-class OC_Connector_Sabre_CalDAV extends Sabre_CalDAV_Backend_Abstract {
-	/**
-	 * 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-timezone'	=> 'timezone',
-		'{http://apple.com/ns/ical/}calendar-order'  => 'calendarorder',
-		'{http://apple.com/ns/ical/}calendar-color'  => 'calendarcolor',
-	);
-
-	/**
-	 * 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) {
-		$raw = OC_Calendar_Calendar::allCalendarsWherePrincipalURIIs($principalUri);
-		
-		$calendars = array();
-		foreach( $raw as $row ){
-			$components = explode(',',$row['components']);
-
-			$calendar = array(
-				'id' => $row['id'],
-				'uri' => $row['uri'],
-				'principaluri' => 'principals/'.$row['userid'],
-				'{' . 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 mixed
-	 */
-	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])) {
-
-				$myValue = $properties[$xmlName];
-				$values[':' . $dbName] = $properties[$xmlName];
-				$fieldNames[] = $dbName;
-			}
-		}
-
-		if(!isset($newValues['displayname'])) $newValues['displayname'] = 'unnamed';
-		if(!isset($newValues['components'])) $newValues['components'] = 'VEVENT,VTODO';
-		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']);
-	}
-
-	/**
-	 * Updates a calendars properties
-	 *
-	 * 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-existant property is always succesful.
-	 *
-	 * 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 $properties
-	 * @return bool|array
-	 */
-	public function updateCalendar($calendarId, array $properties) {
-
-		$newValues = array();
-		$result = array(
-			200 => array(), // Ok
-			403 => array(), // Forbidden
-			424 => array(), // Failed Dependency
-		);
-
-		$hasError = false;
-
-		foreach($properties as $propertyName=>$propertyValue) {
-
-			// We don't know about this property.
-			if (!isset($this->propertyMap[$propertyName])) {
-				$hasError = true;
-				$result[403][$propertyName] = null;
-				unset($properties[$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($properties 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
-		if(!isset($newValues['displayname'])) $newValues['displayname'] = null;
-		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;
-
-	}
-
-	/**
-	 * Delete a calendar and all it's objects
-	 *
-	 * @param string $calendarId
-	 * @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);
-	}
-
-	/**
-	 * Returns all calendar objects within a calendar object.
-	 *
-	 * Every item contains an array with the following keys:
-	 *   * id - unique identifier which will be used for subsequent updates
-	 *   * calendardata - The iCalendar-compatible calnedar 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.
-	 *
-	 * 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.
-	 *
-	 * @param string $calendarId
-	 * @return array
-	 */
-	public function getCalendarObjects($calendarId) {
-		$data = array();
-		foreach(OC_Calendar_Object::all($calendarId) as $row){
-			$data[] = $this->OCAddETag($row);
-		}
-		return $data;
-	}
-
-	/**
-	 * 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) {
-		$data = OC_Calendar_Object::findWhereDAVDataIs($calendarId,$objectUri);
-		if(is_array($data)){
-			$data = $this->OCAddETag($data);
-		}
-		return $data;
-	}
-
-	/**
-	 * Creates a new calendar object.
-	 *
-	 * @param string $calendarId
-	 * @param string $objectUri
-	 * @param string $calendarData
-	 * @return void
-	 */
-	public function createCalendarObject($calendarId,$objectUri,$calendarData) {
-		OC_Calendar_Object::addFromDAVData($calendarId,$objectUri,$calendarData);
-	}
-
-	/**
-	 * 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){
-		OC_Calendar_Object::editFromDAVData($calendarId,$objectUri,$calendarData);
-	}
-
-	/**
-	 * Deletes an existing calendar object.
-	 *
-	 * @param string $calendarId
-	 * @param string $objectUri
-	 * @return void
-	 */
-	public function deleteCalendarObject($calendarId,$objectUri){
-		OC_Calendar_Object::deleteFromDAVData($calendarId,$objectUri);
-	}
-	
-	/**
-	 * @brief Creates a etag
-	 * @param array $row Database result
-	 * @returns associative array
-	 *
-	 * Adds a key "etag" to the row
-	 */
-	private function OCAddETag($row){
-		$row['etag'] = '"'.md5($row['calendarid'].$row['uri'].$row['calendardata'].$row['lastmodified']).'"';
-		return $row;
-	}
-}
diff --git a/apps/calendar/lib/sabre/calendar.php b/apps/calendar/lib/sabre/calendar.php
deleted file mode 100644
index 179be1b281..0000000000
--- a/apps/calendar/lib/sabre/calendar.php
+++ /dev/null
@@ -1,127 +0,0 @@
-<?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
deleted file mode 100644
index e09731c95b..0000000000
--- a/apps/calendar/lib/sabre/calendarroot.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?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
deleted file mode 100644
index 0d1bfa397c..0000000000
--- a/apps/calendar/lib/sabre/object.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?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()) {
-			$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,
-			),
-		);
-
-	}
-
-}
\ No newline at end of file
diff --git a/apps/calendar/lib/sabre/usercalendars.php b/apps/calendar/lib/sabre/usercalendars.php
deleted file mode 100644
index 919f6b27e1..0000000000
--- a/apps/calendar/lib/sabre/usercalendars.php
+++ /dev/null
@@ -1,46 +0,0 @@
-<?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
diff --git a/apps/calendar/lib/search.php b/apps/calendar/lib/search.php
deleted file mode 100644
index 551489672b..0000000000
--- a/apps/calendar/lib/search.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-class OC_Search_Provider_Calendar 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;
-		}
-		$user_timezone = OC_Calendar_App::getTimezone();
-		$l = new OC_l10n('calendar');
-		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;
-					$dtstart = $vevent->DTSTART;
-					$dtend = OC_Calendar_Object::getDTEndFromVEvent($vevent);
-					$start_dt = $dtstart->getDateTime();
-					$start_dt->setTimezone(new DateTimeZone($user_timezone));
-					$end_dt = $dtend->getDateTime();
-					$end_dt->setTimezone(new DateTimeZone($user_timezone));
-					if ($dtstart->getDateType() == Sabre_VObject_Property_DateTime::DATE){
-						$end_dt->modify('-1 sec');
-						if($start_dt->format('d.m.Y') != $end_dt->format('d.m.Y')){
-							$info = $l->t('Date') . ': ' . $start_dt->format('d.m.Y') . ' - ' . $end_dt->format('d.m.Y');
-						}else{
-							$info = $l->t('Date') . ': ' . $start_dt->format('d.m.Y');
-						}
-					}else{
-						$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,(string)$l->t('Cal.'));//$name,$text,$link,$type
-				}
-			}
-		}
-		return $results;
-	}
-}
diff --git a/apps/calendar/lib/share.php b/apps/calendar/lib/share.php
deleted file mode 100644
index bad1082c33..0000000000
--- a/apps/calendar/lib/share.php
+++ /dev/null
@@ -1,295 +0,0 @@
-<?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 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
-	 * @return: array $return - information about calendars
-	 */
-	public static function allSharedwithuser($userid, $type, $active=null, $permission=null){
-		$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;
-	}
-	/**
-	 * @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
-	 * @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`');
-		$result = $stmt->execute(array($id));
-		$users = array();
-		while( $row = $result->fetchRow()){
-			$users[] = $row;
-		}
-		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)
-	 * @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){
-		if(self::is_already_shared($owner, $share, $sharetype, $id, $type)){
-			return false;
-		}
-		switch($sharetype){
-			case 'user':
-			case 'group':
-			case 'public':
-				break;
-			default:
-				return false;
-		}
-		if($sharetype == 'public'){
-			$share = self::generate_token($id, $type);
-		}
-		$stmt = OCP\DB::prepare('INSERT INTO `*PREFIX*calendar_share_' . $type . '` (`owner`,`share`,`sharetype`,`' . $type . 'id`,`permissions`' . (($type == self::CALENDAR)?',`active`':'') . ') VALUES(?,?,?,?,0' . (($type == self::CALENDAR)?', 1':'') . ')' );
-		$result = $stmt->execute(array($owner,$share,$sharetype,$id));
-		if($sharetype == 'public'){
-			return $share;
-		}else{
-			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)
-	 * @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` = ?');
-		if($sharetype != 'public'){
-			$stmt->execute(array($owner,$share,$sharetype,$id));
-		}else{
-			$stmt->execute(array($owner,$sharetype,$id));
-		}
-		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)
-	 * @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){
-			$permission = 0;
-		}
-		$stmt = OCP\DB::prepare('UPDATE `*PREFIX*calendar_share_' . $type . '` SET `permissions` = ? WHERE `share` = ? AND `sharetype` = ? AND `' . $type . 'id` = ?');
-		$stmt->execute(array($permission, $share, $sharetype, $id));
-		return true;
-	}
-	/**
-	 * @brief: generates a token for public calendars / events
-	 * @return: string $token
-	 */
-	private static function generate_token($id, $type){
-		$uniqid = uniqid();
-		if($type == self::CALENDAR){
-			$events = OC_Calendar_Object::all($id);
-			$string = '';
-			foreach($events as $event){
-				$string .= $event['calendardata'];
-			}
-		}else{
-			$string = OC_Calendar_Object::find($id);
-		}
-		$string = sha1($string['calendardata']);
-		$id = sha1($id);
-		$array = array($uniqid,$string,$id);
-		shuffle($array);
-		$string = implode('', $array);
-		$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)
-	 * @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` = ?');
-		$result = $stmt->execute(array($owner, $share, $sharetype, $id));
-		if($result->numRows() > 0){
-			return true;
-		}
-		return false;
-	}
-	private static function group_sql($groups){
-		$group_where = '';
-		$i = 0;
-		foreach($groups as $group){
-			$group_where .= ' OR ';
-			$group_where .= ' (`share` = \'' . $group . '\' AND `sharetype` = \'group\') ';
-			$i++;
-		}
-		return $group_where;
-	}
-	private static function permission_sql($permission = null){
-		$permission_where = '';
-		if(!is_null($permission)){
-			$permission_where = ' AND `permissions` = ';
-			$permission_where .= ($permission=='rw')?"'1'":"'0'";
-		}
-		return $permission_where;
-	}
-	private static function active_sql($active = null){
-		$active_where = '';
-		if(!is_null($active)){
-			$active_where = 'AND `active` = ';
-			$active_where .= (!is_null($active) && $active)?'1':'0';
-		}
-		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
-	 * @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));
-		$permission_where = self::permission_sql('rw');
-		$stmt = OCP\DB::prepare('SELECT * FROM `*PREFIX*calendar_share_' . $type . '` WHERE ((`share` = ? AND `sharetype` = \'user\') ' . $group_where . ') ' . $permission_where);
-		$result = $stmt->execute(array($share));
-		if($result->numRows() == 1){
-			return true;
-		}
-		if($type == self::EVENT){
-			$event = OC_Calendar_App::getEventObject($id, false, false);
-			return self::is_editing_allowed($share, $event['calendarid'], self::CALENDAR);
-		}
-		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
-	 * @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));
-		$stmt = OCP\DB::prepare('SELECT * FROM `*PREFIX*calendar_share_' . $type . '` WHERE (`' . $type . 'id` = ? AND (`share` = ? AND `sharetype` = \'user\') ' . $group_where . ')');
-		$result = $stmt->execute(array($id,$share));
-		$rows =  $result->numRows();
-		if($rows > 0){
-			return true;
-		}elseif($type == self::EVENT){
-			$event = OC_Calendar_App::getEventObject($id, false, false);
-			return self::check_access($share, $event['calendarid'], self::CALENDAR);
-		}else{
-			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
-         */
-        public static function getElementByToken($token){
-            $stmt_calendar = OCP\DB::prepare('SELECT * FROM `*PREFIX*calendar_share_' . OC_Calendar_Share::CALENDAR . '` WHERE `sharetype` = \'public\' AND `share` = ?');
-            $result_calendar = $stmt_calendar->execute(array($token));
-            $stmt_event = OCP\DB::prepare('SELECT * FROM `*PREFIX*calendar_share_' . OC_Calendar_Share::EVENT . '` WHERE `sharetype` = \'public\' AND `share` = ?');
-            $result_event = $stmt_event->execute(array($token));
-            $return = array();
-            if($result_calendar->numRows() == 0 && $result_event->numRows() == 0){
-                return false;
-            }elseif($result_calendar->numRows() != 0){
-                $return ['type'] = 'calendar';
-                $calendar = $result_calendar->fetchRow();
-                $return ['id'] = $calendar['calendarid'];
-            }else{
-                $return ['type'] = 'event';
-                $event = $result_event->fetchRow();
-                $return ['id'] = $event['eventid'];
-            }
-			return $return;
-        }
-		
-		/**
-		 * @brief sets the active status of the calendar
-		 * @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` = ?");
-			$stmt->execute(array($active, $share, $id));
-		}
-
-		/**
-		 * @brief deletes all shared calendars / events after a user was deleted
-		 * @param string $userid
-		 * @return boolean
-		 */
-		public static function post_userdelete($userid){			
-			$stmt = OCP\DB::prepare('DELETE FROM `*PREFIX*calendar_share_calendar` WHERE `owner` = ?');
-			$stmt->execute(array($userid));
-			$stmt = OCP\DB::prepare('DELETE FROM `*PREFIX*calendar_share_event` WHERE `owner` = ?');
-			$stmt->execute(array($userid));
-			$stmt = OCP\DB::prepare("DELETE FROM `*PREFIX*calendar_share_calendar` WHERE `share` = ? AND `sharetype` = 'user'");
-			$stmt->execute(array($userid));
-			$stmt = OCP\DB::prepare("DELETE FROM `*PREFIX*calendar_share_event` WHERE `share` = ? AND `sharetype` = 'user'");
-			$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
diff --git a/apps/calendar/lib/share/calendar.php b/apps/calendar/lib/share/calendar.php
deleted file mode 100644
index bbc43fcca0..0000000000
--- a/apps/calendar/lib/share/calendar.php
+++ /dev/null
@@ -1,111 +0,0 @@
-<?php
-/**
-* ownCloud
-*
-* @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
-* 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 = 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($itemSource, $uidOwner) {
-		$calendar = OC_Calendar_App::getCalendar( $itemSource );
-		if ($calendar || $calendar['userid'] != $uidOwner) {
-			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) {
-		$calendar = OC_Calendar_App::getCalendar( $itemSource );
-		$user_calendars = array();
-		foreach(OC_Contacts_Addressbook::all($uid) as $user_calendar) {
-			$user_calendars[] = $user_calendar['displayname'];
-		}
-		$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) {
-			foreach ($items as $item) {
-				$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;
-			}
-		}
-		return $calendars;
-	}
-
-	public function getChildren($itemSource) {
-		$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
diff --git a/apps/calendar/lib/share/event.php b/apps/calendar/lib/share/event.php
deleted file mode 100644
index 5bb72ee6c9..0000000000
--- a/apps/calendar/lib/share/event.php
+++ /dev/null
@@ -1,40 +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_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;
-	}
-
-}
diff --git a/apps/calendar/lib/share_backend.php b/apps/calendar/lib/share_backend.php
deleted file mode 100644
index 1ea58ac270..0000000000
--- a/apps/calendar/lib/share_backend.php
+++ /dev/null
@@ -1,44 +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_Calendar extends OCP\Share_Backend {
-
-	public function getSource($item, $uid) {
-		$query = OCP\DB::prepare('SELECT `id` FROM `*PREFIX*calendar_calendars` WHERE `userid` = ? AND `displayname` = ?',1);
-		return $query->execute(array($uid, $item))->fetchAll();
-	}
-
-	public function generateTarget($item, $uid) {
-		
-	}
-
-	public function getItems($sources) {
-		
-	}
-
-}
-
-class OC_Share_Backend_Event extends OCP\Share_Backend {
-
-}
-
-
-?>
\ No newline at end of file
diff --git a/apps/calendar/settings.php b/apps/calendar/settings.php
deleted file mode 100644
index f563518046..0000000000
--- a/apps/calendar/settings.php
+++ /dev/null
@@ -1,17 +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.
- */
-
-$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');
-
-$tmpl->printPage();
\ No newline at end of file
diff --git a/apps/calendar/share.php b/apps/calendar/share.php
deleted file mode 100644
index bffcf0b470..0000000000
--- a/apps/calendar/share.php
+++ /dev/null
@@ -1,31 +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.
- */
-$token = strip_tags($_GET['t']);
-$shared = OC_Calendar_Share::getElementByToken($token);
-if($shared['type'] == OC_Calendar_Share::CALENDAR){
-	$calendar = OC_Calendar_App::getCalendar($shared['id'], false);
-	if(!$calendar){
-		header('HTTP/1.0 404 Not Found');
-		exit;
-	}
-	header('Content-Type: text/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;
-	}
-	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('HTTP/1.0 404 Not Found');
-	exit;
-}
diff --git a/apps/calendar/templates/calendar.php b/apps/calendar/templates/calendar.php
deleted file mode 100644
index 15891aafd9..0000000000
--- a/apps/calendar/templates/calendar.php
+++ /dev/null
@@ -1,57 +0,0 @@
-				<script type='text/javascript'>
-				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 = 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')) ?>';
-				var newcalendar = '<?php echo addslashes($l->t('New Calendar')) ?>';
-				var missing_field = '<?php echo addslashes($l->t('Missing fields')) ?>';
-				var missing_field_title = '<?php echo addslashes($l->t('Title')) ?>';
-				var missing_field_calendar = '<?php echo addslashes($l->t('Calendar')) ?>';
-				var missing_field_fromdate = '<?php echo addslashes($l->t('From Date')) ?>';
-				var missing_field_fromtime = '<?php echo addslashes($l->t('From Time')) ?>';
-				var missing_field_todate = '<?php echo addslashes($l->t('To Date')) ?>';
-				var missing_field_totime = '<?php echo addslashes($l->t('To Time')) ?>';
-				var missing_field_startsbeforeends = '<?php echo addslashes($l->t('The event ends before it starts')) ?>';
-				var missing_field_dberror = '<?php echo addslashes($l->t('There was a database fail')) ?>';
-				var totalurl = '<?php echo OCP\Util::linkToRemote('caldav'); ?>calendars';
-				var firstDay = '<?php echo (OCP\Config::getUserValue(OCP\USER::getUser(), 'calendar', 'firstday', 'mo') == 'mo' ? '1' : '0'); ?>';
-				$(document).ready(function() {
-				<?php
-				if(array_key_exists('showevent', $_)){
-					$data = OC_Calendar_App::getEventObject($_['showevent']);
-					$date = substr($data['startdate'], 0, 10);
-					list($year, $month, $day) = explode('-', $date);
-					echo '$(\'#calendar_holder\').fullCalendar(\'gotoDate\', ' . $year . ', ' . --$month . ', ' . $day . ');';
-					echo '$(\'#dialog_holder\').load(OC.filePath(\'calendar\', \'ajax\', \'editeventform.php\') + \'?id=\' +  ' . $_['showevent'] . ' , Calendar.UI.startEventDialog);';
-				}
-				?>
-				});
-				</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"/>
-						<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");?>"/>-->
-						<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="<?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"/>
-						<input type="button" value="" id="datecontrol_date"/>
-						<input type="button" value="&nbsp;&gt;&nbsp;" id="datecontrol_right"/>
-					</form>
-				</div>
-				<div id="fullcalendar"></div>
-				<div id="dialog_holder"></div>
-				<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
deleted file mode 100644
index ad2f9e753f..0000000000
--- a/apps/calendar/templates/part.choosecalendar.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<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>";
-	}
-	?>
-	<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/part.choosecalendar.rowfields.php b/apps/calendar/templates/part.choosecalendar.rowfields.php
deleted file mode 100644
index 64aaa79719..0000000000
--- a/apps/calendar/templates/part.choosecalendar.rowfields.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<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="#" 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>
-</td>
-<td width="20px">
-  <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>
-</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>
diff --git a/apps/calendar/templates/part.choosecalendar.rowfields.shared.php b/apps/calendar/templates/part.choosecalendar.rowfields.shared.php
deleted file mode 100644
index 6a212858a2..0000000000
--- a/apps/calendar/templates/part.choosecalendar.rowfields.shared.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?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 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.editcalendar.php b/apps/calendar/templates/part.editcalendar.php
deleted file mode 100644
index b4ff573ec8..0000000000
--- a/apps/calendar/templates/part.editcalendar.php
+++ /dev/null
@@ -1,44 +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' ?>calendar_dialog" title="<?php echo $_['new'] ? $l->t("New calendar") : $l->t("Edit calendar"); ?>" colspan="6">
-<table width="100%" style="border: 0;">
-<tr>
-	<th><?php echo $l->t('Displayname') ?></th>
-	<td>
-		<input id="displayname_<?php echo $_['calendar']['id'] ?>" type="text" value="<?php echo $_['calendar']['displayname'] ?>">
-	</td>
-</tr>
-<?php if (!$_['new']): ?>
-<tr>
-	<td></td>
-	<td>
-		<input id="edit_active_<?php echo $_['calendar']['id'] ?>" type="checkbox"<?php echo $_['calendar']['active'] ? ' checked="checked"' : '' ?>>
-		<label for="edit_active_<?php echo $_['calendar']['id'] ?>">
-			<?php echo $l->t('Active') ?>
-		</label>
-	</td>
-</tr>
-<?php endif; ?>
-<tr>
-	<th><?php echo $l->t('Calendar color') ?></th>
-	<td>
-		<select id="calendarcolor_<?php echo $_['calendar']['id'] ?>" class="colorpicker">
-			<?php
-			if (!isset($_['calendar']['calendarcolor'])) {$_['calendar']['calendarcolor'] = false;}
-			foreach($_['calendarcolor_options'] as $color){
-				echo '<option value="' . $color . '"' . ($_['calendar']['calendarcolor'] == $color ? ' selected="selected"' : '') . '>' . $color . '</option>';
-			}
-			?>
-		</select>
-	</td>
-</tr>
-</table>
-<input style="float: left;" type="button" onclick="Calendar.UI.Calendar.submit(this, <?php echo $_['new'] ? "'new'" : $_['calendar']['id'] ?>);" value="<?php echo $_['new'] ? $l->t("Save") : $l->t("Submit"); ?>">
-<input style="float: left;" type="button" onclick="Calendar.UI.Calendar.cancel(this, <?php echo $_['new'] ? "'new'" : $_['calendar']['id'] ?>);" value="<?php echo $l->t("Cancel"); ?>">
-</td>
diff --git a/apps/calendar/templates/part.editevent.php b/apps/calendar/templates/part.editevent.php
deleted file mode 100644
index ea91192cc6..0000000000
--- a/apps/calendar/templates/part.editevent.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<div id="event" title="<?php echo $l->t("Edit an event");?>">
-	<form id="event_form">
-		<input type="hidden" name="id" value="<?php echo $_['eventid'] ?>">
-		<input type="hidden" name="lastmodified" value="<?php echo $_['lastmodified'] ?>">
-<?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('<?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.eventform.php b/apps/calendar/templates/part.eventform.php
deleted file mode 100644
index 95eecf2622..0000000000
--- a/apps/calendar/templates/part.eventform.php
+++ /dev/null
@@ -1,251 +0,0 @@
-<script type="text/javascript">
-<?php
-echo 'Calendar.UI.Share.idtype = "event";' . "\n" . 'Calendar.UI.Share.currentid = "' . $_['eventid'] . '";';
-?>
-</script>
-
-<ul>
-	<li><a href="#tabs-1"><?php echo $l->t('Eventinfo'); ?></a></li>
-	<li><a href="#tabs-2"><?php echo $l->t('Repeating'); ?></a></li>
-	<!--<li><a href="#tabs-3"><?php echo $l->t('Alarm'); ?></a></li>
-	<li><a href="#tabs-4"><?php echo $l->t('Attendees'); ?></a></li>-->
-	<?php if($_['access'] == 'owner' && $_['eventid'] != 'new') { ?>
-	<li><a href="#tabs-5"><?php echo $l->t('Share'); ?></a></li>
-	<?php } ?>
-</ul>
-<div id="tabs-1">
-	<table width="100%">
-		<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']) ? $_['title'] : '' ?>" maxlength="100" name="title"/>
-			</td>
-		</tr>
-	</table>
-	<table width="100%">
-		<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']) ? $_['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) { ?>
-			<th width="75px">&nbsp;&nbsp;&nbsp;<?php echo $l->t("Calendar");?>:</th>
-			<td>
-				<select style="width:140px;" name="calendar">
-					<?php
-					if (!isset($_['calendar'])) {$_['calendar'] = false;}
-					echo OCP\html_select_options($_['calendar_options'], $_['calendar'], array('value'=>'id', 'label'=>'displayname'));
-					?>
-				</select>
-			</td>
-			<?php } else { ?>
-			<th width="75px">&nbsp;</th>
-			<td>
-				<input type="hidden" name="calendar" value="<?php echo $_['calendar_options'][0]['id']; ?>">
-			</td>
-			<?php } ?>
-		</tr>
-	</table>
-	<hr>
-	<table width="100%">
-		<tr>
-			<th width="75px"></th>
-			<td>
-				<input onclick="Calendar.UI.lockTime();" type="checkbox"<?php if($_['allday']){echo 'checked="checked"';} ?> id="allday_checkbox" name="allday">
-				<label for="allday_checkbox"><?php echo $l->t("All Day Event");?></label>
-			</td>
-		</tr>
-		<tr>
-			<th width="75px"><?php echo $l->t("From");?>:</th>
-			<td>
-				<input type="text" value="<?php echo $_['startdate'];?>" name="from" id="from">
-				&nbsp;&nbsp;
-				<input type="time" value="<?php echo $_['starttime'];?>" name="fromtime" id="fromtime">
-			</td>
-		</tr>
-		<tr>
-			<th width="75px"><?php echo $l->t("To");?>:</th>
-			<td>
-				<input type="text" value="<?php echo $_['enddate'];?>" name="to" id="to">
-				&nbsp;&nbsp;
-				<input type="time" value="<?php echo $_['endtime'];?>" name="totime" id="totime">
-			</td>
-		</tr>
-	</table>
-	<input type="button" class="submit" value="<?php echo $l->t("Advanced options"); ?>" onclick="Calendar.UI.showadvancedoptions();" id="advanced_options_button">
-	<div id="advanced_options" style="display: none;">
-		<hr>
-		<table>
-			<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']) ? $_['location'] : '' ?>" maxlength="100"  name="location" />
-				</td>
-			</tr>
-		</table>
-		<table>
-			<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']) ? $_['description'] : '' ?></textarea>
-				</td>
-			</tr>
-		</table>
-	</div>
-	</div>
-<div id="tabs-2">
-	<table style="width:100%">
-			<tr>
-				<th width="75px"><?php echo $l->t("Repeat");?>:</th>
-				<td>
-				<select id="repeat" name="repeat">
-					<?php
-					echo OCP\html_select_options($_['repeat_options'], $_['repeat']);
-					?>
-				</select></td>
-				<td><input type="button" style="float:right;" class="submit" value="<?php echo $l->t("Advanced"); ?>" onclick="Calendar.UI.showadvancedoptionsforrepeating();" id="advanced_options_button"></td>
-			</tr>
-		</table>
-		<div id="advanced_options_repeating" style="display:none;">
-			<table style="width:100%">
-				<tr id="advanced_month" style="display:none;">
-					<th width="75px"></th>
-					<td>
-						<select id="advanced_month_select" name="advanced_month_select">
-							<?php
-							echo OCP\html_select_options($_['repeat_month_options'], $_['repeat_month']);
-							?>
-						</select>
-					</td>
-				</tr>
-			</table>
-			<table style="width:100%">
-				<tr id="advanced_year" style="display:none;">
-					<th width="75px"></th>
-					<td>
-						<select id="advanced_year_select" name="advanced_year_select">
-							<?php
-							echo OCP\html_select_options($_['repeat_year_options'], $_['repeat_year']);
-							?>
-						</select>
-					</td>
-				</tr>
-			</table>
-			<table style="width:100%">
-				<tr id="advanced_weekofmonth" style="display:none;">
-					<th width="75px"></th>
-					<td id="weekofmonthcheckbox">
-						<select id="weekofmonthoptions" name="weekofmonthoptions">
-							<?php
-							echo OCP\html_select_options($_['repeat_weekofmonth_options'], $_['repeat_weekofmonth']);
-							?>
-						</select>
-					</td>
-				</tr>
-			</table>
-			<table style="width:100%">
-				<tr id="advanced_weekday" style="display:none;">
-					<th width="75px"></th>
-					<td id="weeklycheckbox">
-						<select id="weeklyoptions" name="weeklyoptions[]" multiple="multiple" style="width: 150px;" title="<?php echo $l->t("Select weekdays") ?>">
-							<?php
-							if (!isset($_['weekdays'])) {$_['weekdays'] = array();}
-							echo OCP\html_select_options($_['repeat_weekly_options'], $_['repeat_weekdays'], array('combine'=>true));
-							?>
-						</select>
-					</td>
-				</tr>
-			</table>
-			<table style="width:100%">
-				<tr id="advanced_byyearday" style="display:none;">
-					<th width="75px"></th>
-					<td id="byyeardaycheckbox">
-						<select id="byyearday" name="byyearday[]" multiple="multiple" title="<?php echo $l->t("Select days") ?>">
-							<?php
-							if (!isset($_['repeat_byyearday'])) {$_['repeat_byyearday'] = array();}
-							echo OCP\html_select_options($_['repeat_byyearday_options'], $_['repeat_byyearday'], array('combine'=>true));
-							?>
-						</select><?php echo $l->t('and the events day of year.'); ?>
-					</td>
-				</tr>
-			</table>
-			<table style="width:100%">
-				<tr id="advanced_bymonthday" style="display:none;">
-					<th width="75px"></th>
-					<td id="bymonthdaycheckbox">
-						<select id="bymonthday" name="bymonthday[]" multiple="multiple" title="<?php echo $l->t("Select days") ?>">
-							<?php
-							if (!isset($_['repeat_bymonthday'])) {$_['repeat_bymonthday'] = array();}
-							echo OCP\html_select_options($_['repeat_bymonthday_options'], $_['repeat_bymonthday'], array('combine'=>true));
-							?>
-						</select><?php echo $l->t('and the events day of month.'); ?>
-					</td>
-				</tr>
-			</table>
-			<table style="width:100%">
-				<tr id="advanced_bymonth" style="display:none;">
-					<th width="75px"></th>
-					<td id="bymonthcheckbox">
-						<select id="bymonth" name="bymonth[]" multiple="multiple" title="<?php echo $l->t("Select months") ?>">
-							<?php
-							if (!isset($_['repeat_bymonth'])) {$_['repeat_bymonth'] = array();}
-							echo OCP\html_select_options($_['repeat_bymonth_options'], $_['repeat_bymonth'], array('combine'=>true));
-							?>
-						</select>
-					</td>
-				</tr>
-			</table>
-			<table style="width:100%">
-				<tr id="advanced_byweekno" style="display:none;">
-					<th width="75px"></th>
-					<td id="bymonthcheckbox">
-						<select id="byweekno" name="byweekno[]" multiple="multiple" title="<?php echo $l->t("Select weeks") ?>">
-							<?php
-							if (!isset($_['repeat_byweekno'])) {$_['repeat_byweekno'] = array();}
-							echo OCP\html_select_options($_['repeat_byweekno_options'], $_['repeat_byweekno'], array('combine'=>true));
-							?>
-						</select><?php echo $l->t('and the events week of year.'); ?>
-					</td>
-				</tr>
-			</table>
-			<table style="width:100%">
-				<tr>
-					<th width="75px"><?php echo $l->t('Interval'); ?>:</th>
-					<td>
-						<input style="width:350px;" type="number" min="1" size="4" max="1000" value="<?php echo isset($_['repeat_interval']) ? $_['repeat_interval'] : '1'; ?>" name="interval">
-					</td>
-				</tr>
-				<tr>
-					<th width="75px"><?php echo $l->t('End'); ?>:</th>
-					<td>
-						<select id="end" name="end">
-							<?php
-							if($_['repeat_end'] == '') $_['repeat_end'] = 'never';
-							echo OCP\html_select_options($_['repeat_end_options'], $_['repeat_end']); 
-							?>
-						</select>
-					</td>
-				</tr>
-				<tr>
-					<th></th>
-					<td id="byoccurrences" style="display:none;">
-						<input type="number" min="1" max="99999" id="until_count" name="byoccurrences" value="<?php echo $_['repeat_count']; ?>"><?php echo $l->t('occurrences'); ?>
-					</td>
-				</tr>
-				<tr>
-					<th></th>
-					<td id="bydate" style="display:none;">
-						<input type="text" name="bydate" value="<?php echo $_['repeat_date']; ?>">
-					</td>
-				</tr>
-			</table>
-		</div>
-</div>
-<!--<div id="tabs-3">//Alarm</div>
-<div id="tabs-4">//Attendees</div>-->
-<?php if($_['access'] == 'owner') { ?>
-<div id="tabs-5">
-	<?php if($_['eventid'] != 'new'){ echo $this->inc('share.dropdown'); } ?>
-</div>
-<?php } ?>
diff --git a/apps/calendar/templates/part.import.php b/apps/calendar/templates/part.import.php
deleted file mode 100644
index 2ce3cc3423..0000000000
--- a/apps/calendar/templates/part.import.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?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);
-$import->setUserID(OCP\User::getUser());
-$newcalendarname = strip_tags($import->createCalendarName());
-$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">
-	<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() ?>">
-		<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
-		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>
-		<br><br>
-		<div id="calendar_import_newcalform">
-			<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>
-		<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">
-	<div id="calendar_import_process_message"></div>
-	<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
diff --git a/apps/calendar/templates/part.newevent.php b/apps/calendar/templates/part.newevent.php
deleted file mode 100644
index a4f48aecbc..0000000000
--- a/apps/calendar/templates/part.newevent.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<div id="event" title="<?php echo $l->t("Create a new event");?>">
-	<form id="event_form">
-<?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('<?php echo OCP\Util::linkTo('calendar', 'ajax/event/new.php') ?>');">
-	</span>
-	</form>
-</div>
diff --git a/apps/calendar/templates/part.showevent.php b/apps/calendar/templates/part.showevent.php
deleted file mode 100644
index 59684d831e..0000000000
--- a/apps/calendar/templates/part.showevent.php
+++ /dev/null
@@ -1,243 +0,0 @@
-<div id="event" title="<?php echo $l->t("View an event");?>">
-<ul>
-	<li><a href="#tabs-1"><?php echo $l->t('Eventinfo'); ?></a></li>
-	<li><a href="#tabs-2"><?php echo $l->t('Repeating'); ?></a></li>
-	<!--<li><a href="#tabs-3"><?php echo $l->t('Alarm'); ?></a></li>
-	<li><a href="#tabs-4"><?php echo $l->t('Attendees'); ?></a></li>-->
-</ul>
-<div id="tabs-1">
-	<table width="100%">
-		<tr>
-			<th width="75px"><?php echo $l->t("Title");?>:</th>
-			<td>
-				<?php echo isset($_['title']) ? $_['title'] : '' ?>
-			</td>
-		</tr>
-	</table>
-	<table width="100%">
-		<tr>
-			<th width="75px"><?php echo $l->t("Category");?>:</th>
-			<td>
-				<?php
-				if(count($_['categories']) == 0 || $_['categories'] == ''){
-					echo $l->t('No categories selected');
-				}else{
-					echo '<ul>';
-					foreach($_['categories'] as $categorie){
-						echo '<li>' . $categorie . '</li>';
-					}
-					echo '</ul>';
-				}
-				?>
-			</td>
-			<th width="75px">&nbsp;&nbsp;&nbsp;<?php echo $l->t("Calendar");?>:</th>
-			<td>
-			<?php
-			$calendar = OC_Calendar_App::getCalendar($_['calendar'], false, false);
-			echo $calendar['displayname'] . ' ' . $l->t('of') . ' ' . $calendar['userid'];
-			?>
-			</td>
-			<th width="75px">&nbsp;</th>
-			<td>
-				<input type="hidden" name="calendar" value="<?php echo $_['calendar_options'][0]['id'] ?>">
-			</td>
-		</tr>
-	</table>
-	<hr>
-	<table width="100%">
-		<tr>
-			<th width="75px"></th>
-			<td>
-				<input onclick="Calendar.UI.lockTime();" type="checkbox"<?php if($_['allday']){echo 'checked="checked"';} ?> id="allday_checkbox" name="allday" disabled="disabled">
-				<?php echo $l->t("All Day Event");?>
-			</td>
-		</tr>
-		<tr>
-			<th width="75px"><?php echo $l->t("From");?>:</th>
-			<td>
-				<?php echo $_['startdate'];?>
-				&nbsp;&nbsp; <?php echo (!$_['allday'])?$l->t('at'):''; ?> &nbsp;&nbsp;
-				<?php echo $_['starttime'];?>
-			</td>
-		</tr>
-		<tr>
-			<th width="75px"><?php echo $l->t("To");?>:</th>
-			<td>
-				<?php echo $_['enddate'];?>
-				&nbsp;&nbsp; <?php echo (!$_['allday'])?$l->t('at'):''; ?> &nbsp;&nbsp;
-				<?php echo $_['endtime'];?>
-			</td>
-		</tr>
-	</table>
-	<input type="button" class="submit" value="<?php echo $l->t("Advanced options"); ?>" onclick="Calendar.UI.showadvancedoptions();" id="advanced_options_button">
-	<div id="advanced_options" style="display: none;">
-		<hr>
-		<table>
-			<tr>
-				<th width="85px"><?php echo $l->t("Location");?>:</th>
-				<td>
-					<?php echo isset($_['location']) ? $_['location'] : '' ?>
-				</td>
-			</tr>
-		</table>
-		<table>
-			<tr>
-				<th width="85px" style="vertical-align: top;"><?php echo $l->t("Description");?>:</th>
-				<td>
-					<?php echo isset($_['description']) ? $_['description'] : '' ?></textarea>
-			</tr>
-		</table>
-	</div>
-	</div>
-<div id="tabs-2">
-	<table style="width:100%">
-			<tr>
-				<th width="75px"><?php echo $l->t("Repeat");?>:</th>
-				<td>
-				<select id="repeat" name="repeat">
-					<?php
-					echo OCP\html_select_options(array($_['repeat_options'][$_['repeat']]), $_['repeat']);
-					?>
-				</select></td>
-				<td><input type="button" style="float:right;" class="submit" value="<?php echo $l->t("Advanced"); ?>" onclick="Calendar.UI.showadvancedoptionsforrepeating();" id="advanced_options_button"></td>
-			</tr>
-		</table>
-		<div id="advanced_options_repeating" style="display:none;">
-			<table style="width:100%">
-				<tr id="advanced_month" style="display:none;">
-					<th width="75px"></th>
-					<td>
-						<select id="advanced_month_select" name="advanced_month_select">
-							<?php
-							echo OCP\html_select_options(array($_['repeat_month_options'][$_['repeat_month']]), $_['repeat_month']);
-							?>
-						</select>
-					</td>
-				</tr>
-			</table>
-			<table style="width:100%">
-				<tr id="advanced_year" style="display:none;">
-					<th width="75px"></th>
-					<td>
-						<select id="advanced_year_select" name="advanced_year_select">
-							<?php
-							echo OCP\html_select_options(array($_['repeat_year_options'][$_['repeat_year']]), $_['repeat_year']);
-							?>
-						</select>
-					</td>
-				</tr>
-			</table>
-			<table style="width:100%">
-				<tr id="advanced_weekofmonth" style="display:none;">
-					<th width="75px"></th>
-					<td id="weekofmonthcheckbox">
-						<select id="weekofmonthoptions" name="weekofmonthoptions">
-							<?php
-							echo OCP\html_select_options(array($_['repeat_weekofmonth_options'][$_['repeat_weekofmonth']]), $_['repeat_weekofmonth']);
-							?>
-						</select>
-					</td>
-				</tr>
-			</table>
-			<table style="width:100%">
-				<tr id="advanced_weekday" style="display:none;">
-					<th width="75px"></th>
-					<td id="weeklycheckbox">
-						<select id="weeklyoptions" name="weeklyoptions[]" multiple="multiple" style="width: 150px;" title="<?php echo $l->t("Select weekdays") ?>">
-							<?php
-							if (!isset($_['weekdays'])) {$_['weekdays'] = array();}
-							echo OCP\html_select_options(array($_['repeat_weekly_options'][$_['repeat_weekdays']]), $_['repeat_weekdays'], array('combine'=>true));
-							?>
-						</select>
-					</td>
-				</tr>
-			</table>
-			<table style="width:100%">
-				<tr id="advanced_byyearday" style="display:none;">
-					<th width="75px"></th>
-					<td id="byyeardaycheckbox">
-						<select id="byyearday" name="byyearday[]" multiple="multiple" title="<?php echo $l->t("Select days") ?>">
-							<?php
-							if (!isset($_['repeat_byyearday'])) {$_['repeat_byyearday'] = array();}
-							echo OCP\html_select_options(array($_['repeat_byyearday_options'][$_['repeat_byyearday']]), $_['repeat_byyearday'], array('combine'=>true));
-							?>
-						</select><?php echo $l->t('and the events day of year.'); ?>
-					</td>
-				</tr>
-			</table>
-			<table style="width:100%">
-				<tr id="advanced_bymonthday" style="display:none;">
-					<th width="75px"></th>
-					<td id="bymonthdaycheckbox">
-						<select id="bymonthday" name="bymonthday[]" multiple="multiple" title="<?php echo $l->t("Select days") ?>">
-							<?php
-							if (!isset($_['repeat_bymonthday'])) {$_['repeat_bymonthday'] = array();}
-							echo OCP\html_select_options(array($_['repeat_bymonthday_options'][$_['repeat_bymonthday']]), $_['repeat_bymonthday'], array('combine'=>true));
-							?>
-						</select><?php echo $l->t('and the events day of month.'); ?>
-					</td>
-				</tr>
-			</table>
-			<table style="width:100%">
-				<tr id="advanced_bymonth" style="display:none;">
-					<th width="75px"></th>
-					<td id="bymonthcheckbox">
-						<select id="bymonth" name="bymonth[]" multiple="multiple" title="<?php echo $l->t("Select months") ?>">
-							<?php
-							if (!isset($_['repeat_bymonth'])) {$_['repeat_bymonth'] = array();}
-							echo OCP\html_select_options(array($_['repeat_bymonth_options'][$_['repeat_bymonth']]), $_['repeat_bymonth'], array('combine'=>true));
-							?>
-						</select>
-					</td>
-				</tr>
-			</table>
-			<table style="width:100%">
-				<tr id="advanced_byweekno" style="display:none;">
-					<th width="75px"></th>
-					<td id="bymonthcheckbox">
-						<select id="byweekno" name="byweekno[]" multiple="multiple" title="<?php echo $l->t("Select weeks") ?>">
-							<?php
-							if (!isset($_['repeat_byweekno'])) {$_['repeat_byweekno'] = array();}
-							echo OCP\html_select_options(array($_['repeat_byweekno_options'][$_['repeat_byweekno']]), $_['repeat_byweekno'], array('combine'=>true));
-							?>
-						</select><?php echo $l->t('and the events week of year.'); ?>
-					</td>
-				</tr>
-			</table>
-			<table style="width:100%">
-				<tr>
-					<th width="75px"><?php echo $l->t('Interval'); ?>:</th>
-					<td>
-						<?php echo isset($_['repeat_interval']) ? $_['repeat_interval'] : '1'; ?>
-					</td>
-				</tr>
-				<tr>
-					<th width="75px"><?php echo $l->t('End'); ?>:</th>
-					<td>
-						<select id="end" name="end">
-							<?php
-							if($_['repeat_end'] == '') $_['repeat_end'] = 'never';
-							echo OCP\html_select_options(array($_['repeat_end_options'][$_['repeat_end']]), $_['repeat_end']); 
-							?>
-						</select>
-					</td>
-				</tr>
-				<tr>
-					<th></th>
-					<td id="byoccurrences" style="display:none;">
-						<?php echo $_['repeat_count'] . ' ' . $l->t('occurrences'); ?>
-					</td>
-				</tr>
-				<tr>
-					<th></th>
-					<td id="bydate" style="display:none;">
-						<?php echo $_['repeat_date']; ?>
-					</td>
-				</tr>
-			</table>
-		</div>
-</div>
-<!--<div id="tabs-3">//Alarm</div>
-<div id="tabs-4">//Attendees</div>-->
-
-</div>
\ No newline at end of file
diff --git a/apps/calendar/templates/settings.php b/apps/calendar/templates/settings.php
deleted file mode 100644
index 56a6a42ee0..0000000000
--- a/apps/calendar/templates/settings.php
+++ /dev/null
@@ -1,101 +0,0 @@
-<?php
-/**
- * Copyright (c) 2011 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.
- */
-?>
-<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):
-					$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>';
-					var_dump($_['timezone']);
-				endforeach;?>
-				</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('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 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>
-		<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>
-	</div>
-</div>
\ No newline at end of file
diff --git a/apps/calendar/templates/share.dropdown.php b/apps/calendar/templates/share.dropdown.php
deleted file mode 100644
index 391ae83765..0000000000
--- a/apps/calendar/templates/share.dropdown.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-if(array_key_exists('calid', $_)){
-	$id = $_['calid'];
-	$sharedelements = OC_Calendar_Share::allUsersSharedwith($_['calid'], OC_Calendar_Share::CALENDAR);
-}else{
-	$sharedelements = OC_Calendar_Share::allUsersSharedwith($_['eventid'], OC_Calendar_Share::EVENT);
-	$id = $_['eventid'];
-}
-$users = array();$groups = array();$public = array();
-foreach($sharedelements as $sharedelement){
-	if($sharedelement['sharetype'] == 'user'){
-		$users[] = $sharedelement;
-	}elseif($sharedelement['sharetype'] == 'group'){
-		$groups[] = $sharedelement;
-	}elseif($sharedelement['sharetype'] == 'public'){
-		$public = $sharedelement;
-	}
-}
-?>
-<strong><?php echo $l->t('Users');?>:</strong><br>
-<select id="share_user" title="<?php echo $l->t('select users');?>" data-placeholder="<?php echo $l->t('select users'); ?>">
-<option value=""></option>
-<?php
-$allocusers = OCP\USER::getUsers();
-$allusers = array();
-foreach($allocusers as $ocuser){
-	$allusers[$ocuser] = $ocuser;
-}
-unset($allusers[OCP\USER::getUser()]);
-$allusers = array_flip($allusers);
-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 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');
-			Calendar.UI.Share.unshare(<?php echo $id; ?>, '<?php echo (array_key_exists('calid', $_)?'calendar':'event');?>', '<?php echo $user['share']; ?>', 'user');
-			$('#sharewithuser_<?php echo $user['share']; ?>').remove();
-			$("#share_user").trigger("liszt:updated");
-		});
-		$('#share_user option[value="<?php echo $user['share']; ?>"]').attr('disabled', 'disabled');
-	</script>
-<?php endforeach; ?>
-</ul>
-<strong><?php echo $l->t('Groups');?>:</strong><br>
-<select id="share_group" title="<?php echo $l->t('select groups');?>" data-placeholder="<?php echo $l->t('select groups'); ?>">
-<option value=""></option> 
-<?php
-$allocgroups = OC_Group::getGroups();
-$allgroups = array();
-foreach($allocgroups as $ocgroup){
-	$allgroups[$ocgroup] = $ocgroup;
-}
-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 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');
-			Calendar.UI.Share.unshare(<?php echo $id; ?>, '<?php echo (array_key_exists('calid', $_)?'calendar':'event');?>', '<?php echo $group['share']; ?>', 'group');
-			$('#sharewithgroup_<?php echo $group['share']; ?>').remove();
-			$("#share_group").trigger("liszt:updated");
-		});
-		$('#share_group option[value="<?php echo $group['share']; ?>"]').attr('disabled', 'disabled');
-	</script>
-<?php endforeach; ?>
-</ul>
-<div id="public">
-	<input type="checkbox" id="publish" <?php echo (array_key_exists('share', $public))?'checked="checked"':'' ?>><label for="publish"><?php echo $l->t('make public'); ?></label><br>
-	<input type="text" id="public_token" value="<?php if(array_key_exists('share', $public)){echo OCP\Util::linkToAbsolute('', 'public.php').'?service=calendar&t=' . $public['share']; } ?>" onmouseover="$('#public_token').select();" style="<?php echo (!array_key_exists('share', $public))?'display:none':'' ?>">
-</div>
\ No newline at end of file
diff --git a/apps/contacts/ajax/addressbook/activate.php b/apps/contacts/ajax/addressbook/activate.php
deleted file mode 100644
index a8dec21dac..0000000000
--- a/apps/contacts/ajax/addressbook/activate.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();
-
-$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/ajax/addressbook/add.php b/apps/contacts/ajax/addressbook/add.php
deleted file mode 100644
index 65077743ed..0000000000
--- a/apps/contacts/ajax/addressbook/add.php
+++ /dev/null
@@ -1,37 +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  __DIR__.'/../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' => array('addressbook' => $addressbook)));
diff --git a/apps/contacts/ajax/addressbook/delete.php b/apps/contacts/ajax/addressbook/delete.php
deleted file mode 100644
index f59c605f4e..0000000000
--- a/apps/contacts/ajax/addressbook/delete.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?php
-/**
- * ownCloud - Addressbook
- *
- * @author Jakob Sack
- * @copyright 2011 Jakob Sack mail@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/>.
- *
- */
-
-// Check if we are a user
-OCP\JSON::checkLoggedIn();
-OCP\JSON::checkAppEnabled('contacts');
-OCP\JSON::callCheck();
-require_once  __DIR__.'/../loghandler.php';
-
-$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);
-OCP\JSON::success(array('data' => array( 'id' => $id )));
diff --git a/apps/contacts/ajax/addressbook/update.php b/apps/contacts/ajax/addressbook/update.php
deleted file mode 100644
index 0fc66c3a3b..0000000000
--- a/apps/contacts/ajax/addressbook/update.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php
-/**
- * Copyright (c) 2011-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\JSON::checkLoggedIn();
-OCP\JSON::checkAppEnabled('contacts');
-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($id, $name, $description)) {
-	bailOut(OC_Contacts_App::$l10n->t('Error updating addressbook.'));
-}
-
-if(!OC_Contacts_Addressbook::setActive($id, $_POST['active'])) {
-	bailOut(OC_Contacts_App::$l10n->t('Error (de)activating addressbook.'));
-}
-
-OC_Contacts_App::getAddressbook($id); // is owner access check
-$addressbook = OC_Contacts_App::getAddressbook($id);
-OCP\JSON::success(array(
-	'addressbook' => $addressbook,
-));
diff --git a/apps/contacts/ajax/categories/categoriesfor.php b/apps/contacts/ajax/categories/categoriesfor.php
deleted file mode 100644
index 8391b14b54..0000000000
--- a/apps/contacts/ajax/categories/categoriesfor.php
+++ /dev/null
@@ -1,34 +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){
-	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/contacts/ajax/categories/delete.php b/apps/contacts/ajax/categories/delete.php
deleted file mode 100644
index bc9f3e14e8..0000000000
--- a/apps/contacts/ajax/categories/delete.php
+++ /dev/null
@@ -1,48 +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();
-
-require_once __DIR__.'/../loghandler.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/contacts/ajax/categories/list.php b/apps/contacts/ajax/categories/list.php
deleted file mode 100644
index f234116ba8..0000000000
--- a/apps/contacts/ajax/categories/list.php
+++ /dev/null
@@ -1,15 +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');
-
-$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
deleted file mode 100644
index a06e780395..0000000000
--- a/apps/contacts/ajax/categories/rescan.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('contacts');
-OCP\JSON::callCheck();
-
-OC_Contacts_App::scanCategories();
-$categories = OC_Contacts_App::getCategories();
-
-OCP\JSON::success(array('data' => array('categories'=>$categories)));
diff --git a/apps/contacts/ajax/contact/add.php b/apps/contacts/ajax/contact/add.php
deleted file mode 100644
index c7cec7d946..0000000000
--- a/apps/contacts/ajax/contact/add.php
+++ /dev/null
@@ -1,62 +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');
-OCP\JSON::callCheck();
-
-$aid = isset($_POST['aid'])?$_POST['aid']:null;
-if(!$aid) {
-	$aid = min(OC_Contacts_Addressbook::activeIds()); // first active addressbook.
-}
-OC_Contacts_App::getAddressbook( $aid ); // is owner access check
-
-$isnew = isset($_POST['isnew'])?$_POST['isnew']:false;
-$fn = trim($_POST['fn']);
-$n = trim($_POST['n']);
-
-$vcard = new OC_VObject('VCARD');
-$vcard->setUID();
-$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);
-	exit();
-}
-
-$lastmodified = OC_Contacts_App::lastModified($vcard);
-if(!$lastmodified) {
-	$lastmodified = new DateTime();
-}
-OCP\JSON::success(array(
-	'data' => array(
-		'id' => $id,
-		'aid' => $aid,
-		'lastmodified' => $lastmodified->format('U')
-	)
-));
diff --git a/apps/contacts/ajax/contact/addproperty.php b/apps/contacts/ajax/contact/addproperty.php
deleted file mode 100644
index 2b80ebd58b..0000000000
--- a/apps/contacts/ajax/contact/addproperty.php
+++ /dev/null
@@ -1,168 +0,0 @@
-<?php
-/**
- * ownCloud - Addressbook
- *
- * @author Jakob Sack
- * @copyright 2011 Jakob Sack mail@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/>.
- *
- */
-
-// Check if we are a user
-OCP\JSON::checkLoggedIn();
-OCP\JSON::checkAppEnabled('contacts');
-OCP\JSON::callCheck();
-
-require_once __DIR__.'/../loghandler.php';
-
-$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']:array();
-
-$vcard = OC_Contacts_App::getContactVCard($id);
-$l10n = OC_Contacts_App::$l10n;
-
-if(!$name) {
-	bailOut($l10n->t('element name is not set.'));
-}
-if(!$id) {
-	bailOut($l10n->t('id is not set.'));
-}
-
-if(!$vcard) {
-	bailOut($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'))
-	) {
-		bailOut($l10n->t('Cannot add empty property.'));
-	}
-} elseif($name === 'ADR') { // only add if non-empty elements.
-	$empty = true;
-	foreach($value as $part) {
-		if(trim($part) != '') {
-			$empty = false;
-			break;
-		}
-	}
-	if($empty) {
-		bailOut($l10n->t('At least one of the address fields has to be filled out.'));
-	}
-}
-
-// Prevent setting a duplicate entry
-$current = $vcard->select($name);
-foreach($current as $item) {
-	$tmpvalue = (is_array($value)?implode(';', $value):$value);
-	if($tmpvalue == $item->value) {
-		bailOut($l10n->t('Trying to add duplicate property: '.$name.': '.$tmpvalue));
-	}
-}
-
-if(is_array($value)) {
-	// 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);
-}
-
-/* preprocessing value */
-switch($name) {
-	case 'BDAY':
-		$date = New DateTime($value);
-		$value = $date->format(DateTime::ATOM);
-	case 'FN':
-		if(!$value) {
-			// create a method thats returns an alternative for FN.
-			//$value = getOtherValue();
-		}
-	case 'N':
-	case 'ORG':
-	case 'NOTE':
-		$value = str_replace('\n', ' \\n', $value);
-		break;
-	case 'NICKNAME':
-		// TODO: Escape commas and semicolons.
-		break;
-	case 'EMAIL':
-		$value = strtolower($value);
-		break;
-	case 'TEL':
-	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;
-}
-
-switch($name) {
-	case 'NOTE':
-		$vcard->setString('NOTE', $value);
-		break;
-	default:
-		$property = $vcard->addProperty($name, $value); //, $parameters);
-		break;
-}
-
-$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'*/) {
-		// 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(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());
-
-try {
-	OC_Contacts_VCard::edit($id, $vcard);
-} catch(Exception $e) {
-	bailOut($e->getMessage());
-}
-
-OCP\JSON::success(array(
-	'data' => array(
-		'checksum' => $checksum,
-		'lastmodified' => OC_Contacts_App::lastModified($vcard)->format('U'))
-	)
-);
diff --git a/apps/contacts/ajax/contact/delete.php b/apps/contacts/ajax/contact/delete.php
deleted file mode 100644
index e73f34f898..0000000000
--- a/apps/contacts/ajax/contact/delete.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-/**
- * ownCloud - Addressbook
- *
- * @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
- * 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');
-OCP\JSON::callCheck();
-
-require_once __DIR__.'/../loghandler.php';
-
-$id = isset($_POST['id'])?$_POST['id']:null;
-if(!$id) {
-	bailOut(OC_Contacts_App::$l10n->t('id is not set.'));
-}
-
-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
deleted file mode 100644
index b76b6e55ed..0000000000
--- a/apps/contacts/ajax/contact/deleteproperty.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-/**
- * ownCloud - Addressbook
- *
- * @author Jakob Sack
- * @copyright 2011 Jakob Sack mail@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/>.
- *
- */
-
-// Check if we are a user
-OCP\JSON::checkLoggedIn();
-OCP\JSON::checkAppEnabled('contacts');
-OCP\JSON::callCheck();
-
-require_once __DIR__.'/../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($l10n->t('Information about vCard is incorrect. Please reload the page.'));
-	exit();
-}
-
-unset($vcard->children[$line]);
-
-try {
-	OC_Contacts_VCard::edit($id, $vcard);
-} catch(Exception $e) {
-	bailOut($e->getMessage());
-}
-
-OCP\JSON::success(array(
-	'data' => array(
-		'id' => $id,
-		'lastmodified' => OC_Contacts_App::lastModified($vcard)->format('U'),
-	)
-));
diff --git a/apps/contacts/ajax/contact/details.php b/apps/contacts/ajax/contact/details.php
deleted file mode 100644
index 5bf337e645..0000000000
--- a/apps/contacts/ajax/contact/details.php
+++ /dev/null
@@ -1,62 +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/>.
- *
- */
-
-require_once __DIR__.'/../loghandler.php';
-
-// Check if we are a user
-OCP\JSON::checkLoggedIn();
-OCP\JSON::checkAppEnabled('contacts');
-
-$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_VObject::parse($card['carddata']);
-if(is_null($vcard)) {
-	bailOut(OC_Contacts_App::$l10n->t('Error parsing VCard for ID: "'.$id.'"'));
-}
-$details = OC_Contacts_VCard::structureContact($vcard);
-
-// Make up for not supporting the 'N' field in earlier version.
-if(!isset($details['N'])) {
-	$details['N'] = array();
-	$details['N'][0] = array($details['FN'][0]['value'],'','','','');
-}
-
-// Don't wanna transfer the photo in a json string.
-if(isset($details['PHOTO'])) {
-	$details['PHOTO'] = true;
-	//unset($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'] = $lastmodified->format('U');
-OC_Contacts_App::setLastModifiedHeader($vcard);
-OCP\JSON::success(array('data' => $details));
diff --git a/apps/contacts/ajax/contact/list.php b/apps/contacts/ajax/contact/list.php
deleted file mode 100644
index 4e2509d8d5..0000000000
--- a/apps/contacts/ajax/contact/list.php
+++ /dev/null
@@ -1,97 +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.
- */
-
-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');
-
-$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('type' => 'book',));
-		$contacts_addressbook[$addressbook['id']]['displayname']
-				= $addressbook['displayname'];
-		$contacts_addressbook[$addressbook['id']]['permissions']
-				= isset($addressbook['permissions'])
-				? $addressbook['permissions']
-				: '0';
-	}
-}
-
-$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) {
-		// 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]';
-			}
-		}
-		$contacts_addressbook[$contact['addressbookid']]['contacts'][] = array(
-			'type' => 'contact',
-			'id' => $contact['id'],
-			'addressbookid' => $contact['addressbookid'],
-			'displayname' => htmlspecialchars($display),
-			'permissions' =>
-				isset($contacts_addressbook[$contact['addressbookid']]['permissions'])
-					? $contacts_addressbook[$contact['addressbookid']]['permissions']
-					: '0',
-		);
-	}
-}
-unset($contacts_alphabet);
-uasort($contacts_addressbook, 'cmp');
-
-OCP\JSON::success(array('data' => array('entries' => $contacts_addressbook)));
-
diff --git a/apps/contacts/ajax/contact/move.php b/apps/contacts/ajax/contact/move.php
deleted file mode 100644
index 053343c47e..0000000000
--- a/apps/contacts/ajax/contact/move.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?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();
-
-$id = intval($_POST['id']);
-$aid = intval($_POST['aid']);
-$isaddressbook = isset($_POST['isaddressbook']) ? true: false;
-
-// Ownership checking
-OC_Contacts_App::getAddressbook($aid);
-try {
-	OC_Contacts_VCard::moveToAddressBook($aid, $id, $isaddressbook);
-}  catch (Exception $e) {
-	$msg = $e->getMessage();
-	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' => $id,)));
\ No newline at end of file
diff --git a/apps/contacts/ajax/contact/saveproperty.php b/apps/contacts/ajax/contact/saveproperty.php
deleted file mode 100644
index 7ae183538b..0000000000
--- a/apps/contacts/ajax/contact/saveproperty.php
+++ /dev/null
@@ -1,176 +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/>.
- *
- */
-
-require_once __DIR__.'/../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;
-$parameters = isset($_POST['parameters'])?$_POST['parameters']:null;
-$checksum = isset($_POST['checksum'])?$_POST['checksum']:null;
-
-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(!$checksum) {
-	bailOut(OC_Contacts_App::$l10n->t('checksum is not set.'));
-}
-if(is_array($value)) {
-	$value = array_map('strip_tags', $value);
-	// 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 {
-		$value = OC_Contacts_VCard::escapeDelimiters($value, ';');
-	//}
-} else {
-	$value = trim(strip_tags($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
-	);
-}
-$element = $vcard->children[$line]->name;
-
-if($element != $name) {
-	bailOut(OC_Contacts_App::$l10n->t(
-		'Something went FUBAR. ').$name.' != '.$element
-	);
-}
-
-/* preprocessing value */
-switch($element) {
-	case 'BDAY':
-		$date = New DateTime($value);
-		$value = $date->format('Y-m-d');
-		break;
-	case 'FN':
-		if(!$value) {
-			// create a method thats returns an alternative for FN.
-			//$value = getOtherValue();
-		}
-		break;
-	case 'NOTE':
-		$value = str_replace('\n', '\\n', $value);
-		break;
-	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) {
-	unset($vcard->children[$line]);
-	$checksum = '';
-} 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);
-			break;
-		case 'EMAIL':
-		case 'TEL':
-		case 'ADR':
-		case 'IMPP':
-			debug('Setting element: (EMAIL/TEL/ADR)'.$element);
-			$vcard->children[$line]->setValue($value);
-			$vcard->children[$line]->parameters = array();
-			if(!is_null($parameters)) {
-				debug('Setting parameters: '.$parameters);
-				foreach($parameters as $key => $parameter) {
-					debug('Adding parameter: '.$key);
-					if(is_array($parameter)) {
-						foreach($parameter as $val) {
-							if(trim($val)) {
-								debug('Adding parameter: '.$key.'=>'.$val);
-								$vcard->children[$line]->add(new Sabre_VObject_Parameter(
-									$key,
-									strtoupper(strip_tags($val)))
-								);
-							}
-						}
-					} else {
-						if(trim($parameter)) {
-							$vcard->children[$line]->add(new Sabre_VObject_Parameter(
-								$key,
-								strtoupper(strip_tags($parameter)))
-							);
-						}
-					}
-				}
-			}
-			break;
-		default:
-			debug('Setting string:'.$name.' '.$value);
-			$vcard->setString($name, $value);
-			break;
-	}
-	// Do checksum and be happy
-	$checksum = md5($vcard->children[$line]->serialize());
-}
-//debug('New checksum: '.$checksum);
-
-try {
-	OC_Contacts_VCard::edit($id, $vcard);
-} catch(Exception $e) {
-	bailOut($e->getMessage());
-}
-
-OCP\JSON::success(array('data' => array(
-	'line' => $line,
-	'checksum' => $checksum,
-	'oldchecksum' => $_POST['checksum'],
-	'lastmodified' => OC_Contacts_App::lastModified($vcard)->format('U'),
-)));
diff --git a/apps/contacts/ajax/cropphoto.php b/apps/contacts/ajax/cropphoto.php
deleted file mode 100644
index eb9f1fcdb5..0000000000
--- a/apps/contacts/ajax/cropphoto.php
+++ /dev/null
@@ -1,36 +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');
-
-$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/currentphoto.php b/apps/contacts/ajax/currentphoto.php
deleted file mode 100644
index 96080e661e..0000000000
--- a/apps/contacts/ajax/currentphoto.php
+++ /dev/null
@@ -1,53 +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/>.
- *
- */
-
-// 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';
-
-if (!isset($_GET['id'])) {
-	bailOut(OC_Contacts_App::$l10n->t('No contact ID was submitted.'));
-}
-
-$contact = OC_Contacts_App::getContactVCard($_GET['id']);
-// 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()) {
-		$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();
-		} else {
-			bailOut(OC_Contacts_App::$l10n->t('Error saving temporary file.'));
-		}
-	} else {
-		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
deleted file mode 100644
index b5e4b72ed5..0000000000
--- a/apps/contacts/ajax/editaddress.php
+++ /dev/null
@@ -1,41 +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');
-
-$id = $_GET['id'];
-$checksum = isset($_GET['checksum'])?$_GET['checksum']:'';
-$vcard = OC_Contacts_App::getContactVCard($id);
-$adr_types = OC_Contacts_App::getTypesOfProperty('ADR');
-
-$tmpl = new OCP\Template("contacts", "part.edit_address_dialog");
-if($checksum) {
-	$line = OC_Contacts_App::getPropertyLineByChecksum($vcard, $checksum);
-	$element = $vcard->children[$line];
-	$adr = OC_Contacts_VCard::structureProperty($element);
-	$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);
-$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
deleted file mode 100644
index eb55634011..0000000000
--- a/apps/contacts/ajax/editname.php
+++ /dev/null
@@ -1,34 +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');
-require_once 'loghandler.php';
-
-$tmpl = new OCP\Template("contacts", "part.edit_name_dialog");
-
-$id = isset($_GET['id'])?$_GET['id']:'';
-
-if($id) {
-	$vcard = OC_Contacts_App::getContactVCard($id);
-	$name = array('', '', '', '', '');
-	if($vcard->__isset('N')) {
-		$property = $vcard->__get('N');
-		if($property) {
-			$name = OC_Contacts_VCard::structureProperty($property);
-		}
-	}
-	$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.'));
-}
-$page = $tmpl->fetchPage();
-OCP\JSON::success(array('data' => array('page'=>$page)));
diff --git a/apps/contacts/ajax/importdialog.php b/apps/contacts/ajax/importdialog.php
deleted file mode 100644
index 691522538f..0000000000
--- a/apps/contacts/ajax/importdialog.php
+++ /dev/null
@@ -1,15 +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');
-$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/loadcard.php b/apps/contacts/ajax/loadcard.php
deleted file mode 100644
index 82501ffd2f..0000000000
--- a/apps/contacts/ajax/loadcard.php
+++ /dev/null
@@ -1,58 +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');
-
-$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);
-$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);
-$tmpl->assign('requesttoken', $_SERVER['HTTP_REQUESTTOKEN']);
-$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('impp_types', $impp_types, false);
-$tmpl->assign('im_protocols', $im_protocols, false);
-$tmpl->assign('requesttoken', $requesttoken);
-$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
deleted file mode 100644
index 1da08950ca..0000000000
--- a/apps/contacts/ajax/loadintro.php
+++ /dev/null
@@ -1,31 +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');
-
-
-$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/loghandler.php b/apps/contacts/ajax/loghandler.php
deleted file mode 100644
index be4b98c111..0000000000
--- a/apps/contacts/ajax/loghandler.php
+++ /dev/null
@@ -1,44 +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('contacts', 
-			$call['file'].'. Line: '.$call['line'].': '.$msg, 
-			$debuglevel);
-	}
-}
diff --git a/apps/contacts/ajax/oc_photo.php b/apps/contacts/ajax/oc_photo.php
deleted file mode 100644
index fe37b530f8..0000000000
--- a/apps/contacts/ajax/oc_photo.php
+++ /dev/null
@@ -1,62 +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';
-
-if(!isset($_GET['id'])) {
-	bailOut(OC_Contacts_App::$l10n->t('No contact ID was submitted.'));
-}
-
-if(!isset($_GET['path'])) {
-	bailOut(OC_Contacts_App::$l10n->t('No photo path was submitted.'));
-}
-
-$localpath = OC_Filesystem::getLocalFile($_GET['path']);
-$tmpkey = 'contact-photo-'.$_GET['id'];
-
-if(!file_exists($localpath)) {
-	bailOut(OC_Contacts_App::$l10n->t('File doesn\'t exist:').$localpath);
-}
-
-$image = new OC_Image();
-if(!$image) {
-	bailOut(OC_Contacts_App::$l10n->t('Error loading image.'));
-}
-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.
-	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)));
-	exit();
-} else {
-	bailOut('Couldn\'t save temporary image: '.$tmpkey);
-}
diff --git a/apps/contacts/ajax/savecrop.php b/apps/contacts/ajax/savecrop.php
deleted file mode 100644
index 2483d0f712..0000000000
--- a/apps/contacts/ajax/savecrop.php
+++ /dev/null
@@ -1,121 +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');
-OCP\JSON::callCheck();
-
-// Firefox and Konqueror tries to download application/json for me.  --Arthur
-OCP\JSON::setContentTypeHeader('text/plain; charset=utf-8');
-
-require_once 'loghandler.php';
-
-$image = null;
-
-$x1 = (isset($_POST['x1']) && $_POST['x1']) ? $_POST['x1'] : 0;
-//$x2 = isset($_POST['x2']) ? $_POST['x2'] : -1;
-$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;
-$tmpkey = isset($_POST['tmpkey']) ? $_POST['tmpkey'] : '';
-$id = isset($_POST['id']) ? $_POST['id'] : '';
-
-if($tmpkey == '') {
-	bailOut('Missing key to temporary file.');
-}
-
-if($id == '') {
-	bailOut('Missing contact id.');
-}
-
-OCP\Util::writeLog('contacts', 'savecrop.php: key: '.$tmpkey, OCP\Util::DEBUG);
-
-$data = OC_Cache::get($tmpkey);
-if($data) {
-	$image = new OC_Image();
-	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)) {
-				$vcard = OC_Contacts_App::getContactVCard($id);
-				if(!$vcard) {
-					OC_Cache::remove($tmpkey);
-					bailOut(OC_Contacts_App::$l10n
-						->t('Error getting contact object.'));
-				}
-				if($vcard->__isset('PHOTO')) {
-					OCP\Util::writeLog('contacts',
-						'savecrop.php: PHOTO property exists.',
-						OCP\Util::DEBUG);
-					$property = $vcard->__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());
-					$vcard->__set('PHOTO', $property);
-				} else {
-					OCP\Util::writeLog('contacts',
-						'savecrop.php: files: Adding PHOTO property.',
-						OCP\Util::DEBUG);
-					$vcard->addProperty('PHOTO',
-						$image->__toString(), array('ENCODING' => 'b',
-						'TYPE' => $image->mimeType()));
-				}
-				$now = new DateTime;
-				$vcard->setString('REV', $now->format(DateTime::W3C));
-				if(!OC_Contacts_VCard::edit($id, $vcard)) {
-					bailOut(OC_Contacts_App::$l10n->t('Error saving contact.'));
-				}
-				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'));
-			}
-		} else {
-			bailOut(OC_Contacts_App::$l10n->t('Error cropping image'));
-		}
-	} else {
-		bailOut(OC_Contacts_App::$l10n->t('Error creating temporary image'));
-	}
-} else {
-	bailOut(OC_Contacts_App::$l10n->t('Error finding image: ').$tmpkey);
-}
-
-OC_Cache::remove($tmpkey);
diff --git a/apps/contacts/ajax/selectaddressbook.php b/apps/contacts/ajax/selectaddressbook.php
deleted file mode 100644
index e5527c8e5f..0000000000
--- a/apps/contacts/ajax/selectaddressbook.php
+++ /dev/null
@@ -1,24 +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');
-
-$books = OC_Contacts_Addressbook::all(OCP\USER::getUser());
-if(count($books) > 1) {
-	$addressbooks = array();
-	foreach($books as $book) {
-		$addressbooks[] = array('id' => $book['id'], 'name' => $book['displayname']);
-	}
-	$tmpl = new OCP\Template("contacts", "part.selectaddressbook");
-	$tmpl->assign('addressbooks', $addressbooks);
-	$page = $tmpl->fetchPage();
-	OCP\JSON::success(array('data' => array( 'type' => 'dialog', 'page' => $page )));
-} else {
-	OCP\JSON::success(array('data' => array( 'type' => 'result', 'id' => $books[0]['id'] )));
-}
\ No newline at end of file
diff --git a/apps/contacts/ajax/uploadimport.php b/apps/contacts/ajax/uploadimport.php
deleted file mode 100644
index 87032b731a..0000000000
--- a/apps/contacts/ajax/uploadimport.php
+++ /dev/null
@@ -1,80 +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');
-OCP\JSON::callCheck();
-require_once 'loghandler.php';
-
-$l10n = OC_Contacts_App::$l10n;
-
-$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('/imports/'.$fn, file_get_contents('php://input'))) {
-		OCP\JSON::success(array('data' => array('file'=>$tmpfile, 'name'=>$fn)));
-		exit();
-	} else {
-		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' )));
-	exit();
-}
-$error = $_FILES['importfile']['error'];
-if($error !== UPLOAD_ERR_OK) {
-	$errors = array(
-		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]);
-}
-$file=$_FILES['importfile'];
-
-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($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
deleted file mode 100644
index 34830b291d..0000000000
--- a/apps/contacts/ajax/uploadphoto.php
+++ /dev/null
@@ -1,116 +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');
-OCP\JSON::callCheck();
-
-// Firefox and Konqueror tries to download application/json for me.  --Arthur
-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.
-$fn = (isset($_SERVER['HTTP_X_FILE_NAME']) ? $_SERVER['HTTP_X_FILE_NAME'] : false);
-if ($fn) {
-	if (!isset($_GET['id'])) {
-		bailOut($l10n->t('No contact ID was submitted.'));
-	}
-	$id = $_GET['id'];
-	$tmpkey = 'contact-photo-'.md5($fn);
-	$data = file_get_contents('php://input');
-	$image = new OC_Image();
-	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: '.$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)));
-			exit();
-		} else {
-			bailOut($l10n->t('Couldn\'t save temporary image: ').$tmpkey);
-		}
-	} else {
-		bailOut($l10n->t('Couldn\'t load temporary image: ').$tmpkey);
-	}
-}
-
-// Uploads from file dialog are handled here.
-if (!isset($_POST['id'])) {
-	bailOut($l10n->t('No contact ID was submitted.'));
-}
-if (!isset($_FILES['imagefile'])) {
-	bailOut($l10n->t('No file was uploaded. Unknown error'));
-}
-
-$error = $_FILES['imagefile']['error'];
-if($error !== UPLOAD_ERR_OK) {
-	$errors = array(
-		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]);
-}
-$file=$_FILES['imagefile'];
-
-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: '.$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,
-					)));
-			exit();
-		} else {
-			bailOut($l10n->t('Couldn\'t save temporary image: ').$tmpkey);
-		}
-	} else {
-		bailOut($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/appinfo/app.php b/apps/contacts/appinfo/app.php
deleted file mode 100644
index 102c04705a..0000000000
--- a/apps/contacts/appinfo/app.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-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_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/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');
-OCP\Util::connectHook('OC_Calendar', 'getEvents', 'OC_Contacts_Hooks', 'getBirthdayEvents');
-OCP\Util::connectHook('OC_Calendar', 'getSources', 'OC_Contacts_Hooks', 'getCalenderSources');
-
-OCP\App::addNavigationEntry( array(
-  'id' => 'contacts_index',
-  'order' => 10,
-  'href' => OCP\Util::linkTo( 'contacts', 'index.php' ),
-  'icon' => OCP\Util::imagePath( 'settings', 'users.svg' ),
-  'name' => OC_L10N::get('contacts')->t('Contacts') ));
-
-OCP\Util::addscript('contacts', 'loader');
-OC_Search::registerProvider('OC_Search_Provider_Contacts');
-OCP\Share::registerBackend('contact', 'OC_Share_Backend_Contact');
-OCP\Share::registerBackend('addressbook', 'OC_Share_Backend_Addressbook', 'contact');
-
diff --git a/apps/contacts/appinfo/database.xml b/apps/contacts/appinfo/database.xml
deleted file mode 100644
index 1e2e097e49..0000000000
--- a/apps/contacts/appinfo/database.xml
+++ /dev/null
@@ -1,137 +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*contacts_addressbooks</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>userid</name>
-    <type>text</type>
-    <default></default>
-    <notnull>true</notnull>
-    <length>255</length>
-   </field>
-
-   <field>
-    <name>displayname</name>
-    <type>text</type>
-    <default></default>
-    <notnull>false</notnull>
-    <length>255</length>
-   </field>
-
-   <field>
-    <name>uri</name>
-    <type>text</type>
-    <default></default>
-    <notnull>false</notnull>
-    <length>200</length>
-   </field>
-
-   <field>
-    <name>description</name>
-    <type>text</type>
-    <notnull>false</notnull>
-   </field>
-
-   <field>
-    <name>ctag</name>
-    <type>integer</type>
-    <default>1</default>
-    <notnull>true</notnull>
-    <unsigned>true</unsigned>
-    <length>4</length>
-   </field>
-
-   <field>
-    <name>active</name>
-    <type>integer</type>
-    <default>1</default>
-    <notnull>true</notnull>
-    <length>4</length>
-   </field>
-
-  </declaration>
-
- </table>
-
- <table>
-
-  <name>*dbprefix*contacts_cards</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>addressbookid</name>
-    <type>integer</type>
-    <default></default>
-    <notnull>true</notnull>
-    <unsigned>true</unsigned>
-    <length>4</length>
-   </field>
-
-   <field>
-    <name>fullname</name>
-    <type>text</type>
-    <default></default>
-    <notnull>false</notnull>
-    <length>255</length>
-   </field>
-
-   <field>
-    <name>carddata</name>
-    <type>text</type>
-    <notnull>false</notnull>
-   </field>
-
-   <field>
-    <name>uri</name>
-    <type>text</type>
-    <default></default>
-    <notnull>false</notnull>
-    <length>200</length>
-   </field>
-
-   <field>
-    <name>lastmodified</name>
-    <type>integer</type>
-    <default></default>
-    <notnull>false</notnull>
-    <unsigned>true</unsigned>
-    <length>4</length>
-   </field>
-
-  </declaration>
-
- </table>
-
-</database>
diff --git a/apps/contacts/appinfo/info.xml b/apps/contacts/appinfo/info.xml
deleted file mode 100644
index 74fd6b012d..0000000000
--- a/apps/contacts/appinfo/info.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0"?>
-<info>
-	<id>contacts</id>
-	<name>Contacts</name>
-	<licence>AGPL</licence>
-	<author>Jakob Sack</author>
-	<require>4</require>
-	<shipped>true</shipped>
-	<description>Address book with CardDAV support.</description>
-	<standalone/>
-	<default_enable/>
-	<remote>
-		<contacts>appinfo/remote.php</contacts>
-		<carddav>appinfo/remote.php</carddav>
-	</remote>
-</info>
diff --git a/apps/contacts/appinfo/migrate.php b/apps/contacts/appinfo/migrate.php
deleted file mode 100644
index 19c960c75a..0000000000
--- a/apps/contacts/appinfo/migrate.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-class OC_Migration_Provider_Contacts extends OC_Migration_Provider{
-	
-	// Create the xml for the user supplied
-	function export( ) {
-		$options = array(
-			'table'=>'contacts_addressbooks',
-			'matchcol'=>'userid',
-			'matchval'=>$this->uid,
-			'idcol'=>'id'
-		);
-		$ids = $this->content->copyRows( $options );
-
-		$options = array(
-			'table'=>'contacts_cards',
-			'matchcol'=>'addressbookid',
-			'matchval'=>$ids
-		);
-		
-		// Export tags
-		$ids2 = $this->content->copyRows( $options );
-		
-		// If both returned some ids then they worked
-		if(is_array($ids) && is_array($ids2)) {
-			return true;
-		} else {
-			return false;
-		}
-		
-	}
-	
-	// Import function for contacts
-	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() ) {
-					// 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('*PREFIX*contacts_addressbooks');
-					// Make the addressbook active
-					OC_Contacts_Addressbook::setActive($idmap[$row['id']], true);
-				}
-				// 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 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'] ) );	
-					}		
-				}
-				// All done!
-			break;
-		}
-		
-		return true;
-	}
-	
-}
-
-// Load the provider
-new OC_Migration_Provider_Contacts( 'contacts' );
\ No newline at end of file
diff --git a/apps/contacts/appinfo/remote.php b/apps/contacts/appinfo/remote.php
deleted file mode 100644
index d8677d7f73..0000000000
--- a/apps/contacts/appinfo/remote.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-/**
- * ownCloud - Addressbook
- *
- * @author Jakob Sack
- * @copyright 2011 Jakob Sack mail@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/>.
- *
- */
-
-OCP\App::checkAppEnabled('contacts');
-
-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
-$RUNTIME_APPTYPES=array('authentication');
-OC_App::loadApps($RUNTIME_APPTYPES);
-
-// Backends
-$authBackend = new OC_Connector_Sabre_Auth();
-$principalBackend = new OC_Connector_Sabre_Principal();
-$carddavBackend   = new OC_Connector_Sabre_CardDAV();
-
-// Root nodes
-$principalCollection = new Sabre_CalDAV_Principal_Collection($principalBackend);
-$principalCollection->disableListing = true; // Disable listening
-
-$addressBookRoot = new OC_Connector_Sabre_CardDAV_AddressBookRoot($principalBackend, $carddavBackend);
-$addressBookRoot->disableListing = true; // Disable listening
-
-$nodes = array(
-	$principalCollection,
-	$addressBookRoot,
-	);
-
-// Fire up server
-$server = new Sabre_DAV_Server($nodes);
-$server->setBaseUri($baseuri);
-// Add plugins
-$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());
-
-// And off we go!
-$server->exec();
diff --git a/apps/contacts/appinfo/update.php b/apps/contacts/appinfo/update.php
deleted file mode 100644
index cc00b325e1..0000000000
--- a/apps/contacts/appinfo/update.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-$installedVersion=OCP\Config::getAppValue('contacts', 'installed_version');
-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());
-	
-	// 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());
-}
diff --git a/apps/contacts/appinfo/version b/apps/contacts/appinfo/version
deleted file mode 100644
index 72f9fa8202..0000000000
--- a/apps/contacts/appinfo/version
+++ /dev/null
@@ -1 +0,0 @@
-0.2.4
\ No newline at end of file
diff --git a/apps/contacts/carddav.php b/apps/contacts/carddav.php
deleted file mode 100644
index 264eb30836..0000000000
--- a/apps/contacts/carddav.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?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
diff --git a/apps/contacts/css/contacts.css b/apps/contacts/css/contacts.css
deleted file mode 100644
index bc1a57756a..0000000000
--- a/apps/contacts/css/contacts.css
+++ /dev/null
@@ -1,155 +0,0 @@
-/*dl > dt {
-	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; }
-#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; 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; }
-.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; }
-#uploadprogressbar { display: none; padding: 0; bottom: 3em; height:2em; width: 20em; margin:0; background:#eee; border:1px solid #ccc; position:fixed; }
-#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; }
-#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; }
-#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; 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; }
-
-#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, #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; }
-label:hover, dt:hover { color: #333; }
-/*::-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; }
-.ui-autocomplete-loading { background: url('%webroot%/core/img/loading.gif') right center no-repeat; }
-.ui-autocomplete-input { margin-top: 0.5em; } /* Ugly hack */
-.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, .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; }
-.cloud { background:url('%webroot%/core/img/places/picture.svg') no-repeat center; }
-/*.globe { background:url('../img/globe.svg') no-repeat center; }*/
-.globe { background:url('%webroot%/core/img/actions/public.svg') no-repeat center; }
-.transparent{ opacity: 0.6; }
-#edit_name_dialog { padding:0; }
-#edit_name_dialog > input { width: 15em; }
-#edit_address_dialog { /*width: 30em;*/ }
-#edit_address_dialog > input { width: 15em; }
-#edit_photo_dialog_img { display: block; min-width: 150; min-height: 200; }
-#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 { float: left; margin: 1em; }
-#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: 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; }
-#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; }
-#phototools li a:hover { opacity: 0.8; }
-
-/* Address editor */
-#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: #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 {}
-#adr_street {}
-#adr_city {}
-#adr_region {}
-#adr_zipcode {}
-#adr_country {}
-
-#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: 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; }
-.propertycontainer dd { float: left; width: 25em; }
-/*.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: -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; }
-.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; }
-#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; }
-.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; }
-.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/css/jquery.Jcrop.css b/apps/contacts/css/jquery.Jcrop.css
deleted file mode 100644
index a9ba4746e0..0000000000
--- a/apps/contacts/css/jquery.Jcrop.css
+++ /dev/null
@@ -1,84 +0,0 @@
-/* jquery.Jcrop.css
-   The code contained in this file is free software under MIT License
-   Copyright (c)2008-2011 Tapmodo Interactive LLC
-*/
-
-/*
-  The outer-most container in a typical Jcrop instance
-  If you are having difficulty with formatting related to styles
-  on a parent element, place any fixes here or in a like selector
-*/
-.jcrop-holder {
-  direction: ltr;
-  text-align: left;
-}
-
-.jcrop-vline, .jcrop-hline {
-	background: white url('%appswebroot%/contacts/img/Jcrop.gif') top left repeat;
-	font-size: 0px;
-	position: absolute;
-}
-
-.jcrop-vline {
-  height: 100%;
-  width: 1px !important;
-}
-
-.jcrop-hline {
-  width: 100%;
-  height: 1px !important;
-}
-
-.jcrop-vline.right {
-  right: 0px;
-}
-
-.jcrop-hline.bottom {
-  bottom: 0px;
-}
-
-.jcrop-handle {
-	background-color: #333;
-	border: 1px #eee solid;
-	font-size: 1px;
-}
-
-.jcrop-tracker {
-  height: 100%; 
-  -webkit-tap-highlight-color: transparent; /* "turn off" link highlight */
-  -webkit-touch-callout: none;              /* disable callout, image save panel */
-  -webkit-user-select: none;                /* disable cut copy paste */
-  width: 100%;
-}
-
-/*
-*/
-
-.jcrop-light .jcrop-vline, .jcrop-light .jcrop-hline {
-	background: white;
-  filter: Alpha(opacity=70) !important;
-  opacity: .70 !important;
-}
-
-.jcrop-light .jcrop-handle {
-	background-color: black;
-	border-color: white;
-  border-radius: 3px;
-	-moz-border-radius: 3px;
-	-webkit-border-radius: 3px;
-}
-
-.jcrop-dark .jcrop-vline, .jcrop-dark .jcrop-hline {
-	background: black;
-  filter: Alpha(opacity=70) !important;
-  opacity: 0.70 !important;
-}
-
-.jcrop-dark .jcrop-handle {
-	background-color: white;
-	border-color: black;
-  border-radius: 3px;
-	-moz-border-radius: 3px;
-	-webkit-border-radius: 3px;
-}
-
diff --git a/apps/contacts/css/jquery.combobox.css b/apps/contacts/css/jquery.combobox.css
deleted file mode 100644
index 59294235d2..0000000000
--- a/apps/contacts/css/jquery.combobox.css
+++ /dev/null
@@ -1,3 +0,0 @@
-.combo-button { background:url('../../../core/img/actions/triangle-s.svg') no-repeat center; margin-left: -1px; float: left; border: none; }
-.ui-button-icon-only .ui-button-text { padding: 0.35em; } 
-.ui-autocomplete-input { margin: 0; padding: 0.48em 0 0.47em 0.45em; }
diff --git a/apps/contacts/export.php b/apps/contacts/export.php
deleted file mode 100644
index 161ca8047a..0000000000
--- a/apps/contacts/export.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/**
- * Copyright (c) 2011-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\User::checkLoggedIn();
-OCP\App::checkAppEnabled('contacts');
-$bookid = isset($_GET['bookid']) ? $_GET['bookid'] : null;
-$contactid = isset($_GET['contactid']) ? $_GET['contactid'] : null;
-$nl = "\n";
-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'); 
-
-	$start = 0;
-	$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)) {
-	$data = OC_Contacts_App::getContactObject($contactid);
-	header('Content-Type: text/vcard');
-	header('Content-Disposition: inline; filename=' 
-		. str_replace(' ', '_', $data['fullname']) . '.vcf'); 
-	echo $data['carddata'];
-}
diff --git a/apps/contacts/img/Jcrop.gif b/apps/contacts/img/Jcrop.gif
deleted file mode 100644
index 72ea7ccb5321d5384d70437cfaac73011237901e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 329
zcmZ?wbhEHb<Y3@nn8?7eYSpU$|Nk?9f#QE|Ki808XU70nBRvCVMxdbLPZmxtAgu#Z
z0Mf$1#5;wRb9wgJ5Fhr7kxzB7so-zXTQDQ*d0g~`g(u!D-HO!|ewLP`>9b#5NV>2k
zBC~b@b~P=nNfWAe-b%_i6tS^-1y(h@EsB~1TqDA_h@fkxG$bHgvj}VxE1JLgr!*!^
ILUxTc0Q$^Q5C8xG

diff --git a/apps/contacts/img/contact-new.png b/apps/contacts/img/contact-new.png
deleted file mode 100644
index a91f2e620faf75e9aeec40bdd19e1d18f402bd86..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 525
zcmV+o0`mQdP)<h;3K|Lk000e1NJLTq000yK000yS1^@s6jfou%00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10g6dPK~y-)wUoVU!cY*vGZ@Gq_(2EV9J3``vUPFjsNm+}5G060
z2ofE;g;<<)cPoxk_u}HmB2u~pp%61=5TX4CuI~Z~Nn={mrVoC++&%6`-X$Cb092Y#
zsSC+c2v!Q*dcyl|w+p6e`b;Jh=yW=;-EL!16a}k;-1$PXAh_o9ITQ*7s8lMk6pO`V
zLO~EfmSvY_v*{Mq>vca@tyYr>u>kXkcRfjx{9L2aNG2?o%fR#eMZSol!d|Zjj^p@D
zr&DOR+pt_NFY=?1VHn8g^H-6{WFVKzL95mB!8j!B_xoU3)>Vk22rSFOY&L^ht>*3+
zhlJT|7D}a31e&HVUJnJ>cYMY@B2-m1^kaK)92XLe$7A=67K;T81_L*TJI3qv+O%!^
z(G|utIRbwD@6LC--3tnD2<$cN_xm@m9oQz61lvW<UlUCda;1mE;qY`k9-j@vIHOS4
z^>>UhkLSM~Q|xFoa!@!N4o?{Wbsn;t&E}+O+Q(|OI;SCI2x0){-zN4ai4t~Wc^UZ4
P00000NkvXXu0mjf<nP^T

diff --git a/apps/contacts/img/contact-new.svg b/apps/contacts/img/contact-new.svg
deleted file mode 100644
index 8322414dac..0000000000
--- a/apps/contacts/img/contact-new.svg
+++ /dev/null
@@ -1,129 +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://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"
-   version="1.1"
-   width="20"
-   height="20"
-   id="svg3796"
-   inkscape:version="0.48.2 r9819"
-   sodipodi:docname="contact-new.svg">
-  <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="namedview18"
-     showgrid="false"
-     inkscape:zoom="11.8"
-     inkscape:cx="10"
-     inkscape:cy="10"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0"
-     inkscape:current-layer="svg3796" />
-  <defs
-     id="defs3798">
-    <linearGradient
-       id="linearGradient4338">
-      <stop
-         id="stop4340"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-    </linearGradient>
-  </defs>
-  <metadata
-     id="metadata3801">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     transform="matrix(1.2460746,0,0,1.2420314,-0.12303732,-0.51608095)">
-    <g
-       transform="matrix(1.0633871,0,0,1.0633871,-0.03169354,-0.53733376)"
-       id="g4344">
-      <rect
-         width="13.408871"
-         height="9.1084709"
-         x="0.5"
-         y="2.5104902"
-         id="rect3804"
-         style="fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
-      <rect
-         width="3.168951"
-         height="4.3600798"
-         x="1.2451615"
-         y="3.2825413"
-         id="rect4314"
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
-      <rect
-         width="6.1161237"
-         height="0.70080578"
-         x="5.001205"
-         y="3.3217869"
-         id="rect4316"
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
-      <rect
-         width="2.5802398"
-         height="0.70080578"
-         x="5.001205"
-         y="5.1219902"
-         id="rect4318"
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
-      <rect
-         width="8.1389055"
-         height="0.70080578"
-         x="1.2264099"
-         y="8.4221916"
-         id="rect4322"
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
-      <rect
-         width="4.3481827"
-         height="0.70080578"
-         x="1.2264099"
-         y="9.9221954"
-         id="rect4326"
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
-      <rect
-         width="2.5802398"
-         height="0.70080578"
-         x="8.6010017"
-         y="5.1219902"
-         id="rect4328"
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
-      <rect
-         width="4.9374957"
-         height="0.70080578"
-         x="5.001205"
-         y="6.8221936"
-         id="rect4330"
-         style="fill:#ffffff;fill-opacity:1;stroke:#ffffff;stroke-width:0;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0" />
-      <path
-         d="m 10.823783,8.4435567 1.999999,0 0,1.9999993 2,0 0,2 -2,0 0,2 -1.999999,0 0,-2 -2.0000004,0 0,-2 2.0000004,0 z"
-         id="path4336"
-         style="fill:#000000;fill-opacity:1;stroke:#ffffff;stroke-width:0.5;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-         inkscape:connector-curvature="0" />
-    </g>
-  </g>
-</svg>
diff --git a/apps/contacts/img/globe.svg b/apps/contacts/img/globe.svg
deleted file mode 100644
index 4e43cfba10..0000000000
--- a/apps/contacts/img/globe.svg
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-<svg
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   version="1.0"
-   width="16"
-   height="16"
-   id="svg2485">
-  <defs
-     id="defs2487">
-    <linearGradient
-       id="linearGradient3707-319-631">
-      <stop
-         id="stop4637"
-         style="stop-color:#254b6d;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4639"
-         style="stop-color:#415b73;stop-opacity:1"
-         offset="0.5" />
-      <stop
-         id="stop4641"
-         style="stop-color:#6195b5;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="20"
-       y1="43"
-       x2="20"
-       y2="2.6887112"
-       id="linearGradient2483"
-       xlink:href="#linearGradient3707-319-631"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.3769285,0,0,0.3769199,-1.196178,-0.8960149)" />
-    <linearGradient
-       id="linearGradient2867-449-88-871-390-598-476-591-434-148">
-      <stop
-         id="stop4627"
-         style="stop-color:#51cfee;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4629"
-         style="stop-color:#49a3d2;stop-opacity:1"
-         offset="0.26238" />
-      <stop
-         id="stop4631"
-         style="stop-color:#3470b4;stop-opacity:1"
-         offset="0.704952" />
-      <stop
-         id="stop4633"
-         style="stop-color:#273567;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <radialGradient
-       cx="61.240059"
-       cy="-8.7256308"
-       r="9.7552834"
-       fx="61.240059"
-       fy="-8.7256308"
-       id="radialGradient2481"
-       xlink:href="#linearGradient2867-449-88-871-390-598-476-591-434-148"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0,1.3551574,-1.3551567,0,-3.824604,-80.384092)" />
-    <linearGradient
-       id="linearGradient4873">
-      <stop
-         id="stop4875"
-         style="stop-color:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop4877"
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="63.397362"
-       y1="-12.489107"
-       x2="63.397362"
-       y2="5.4675598"
-       id="linearGradient2464"
-       xlink:href="#linearGradient4873"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.7432394,0,0,0.7432224,-38.229789,10.609333)" />
-  </defs>
-  <g
-     id="layer1">
-    <path
-       d="M 15.5,7.999735 C 15.5,12.142003 12.141888,15.5 8.000094,15.5 C 3.857922,15.5 0.5,12.141965 0.5,7.999735 C 0.5,3.8576552 3.857922,0.4999997 8.000094,0.4999997 C 12.141888,0.4999997 15.5,3.8576552 15.5,7.999735 L 15.5,7.999735 z"
-       id="path6495"
-       style="fill:url(#radialGradient2481);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient2483);stroke-width:0.99999994;stroke-miterlimit:4;stroke-dasharray:none" />
-    <path
-       d="M 8.1022062,0.95621712 L 7.236144,1.0568701 L 6.2834735,1.3210847 C 6.3646244,1.2921995 6.446834,1.2606694 6.5309208,1.2330132 L 6.4195696,1.0317069 L 6.048401,1.0946151 L 5.8628152,1.2707582 L 5.5782512,1.3085031 L 5.318433,1.4343196 L 5.1947098,1.4972277 L 5.157592,1.5475543 L 4.9720082,1.5852992 L 4.8606579,1.8243504 L 4.712189,1.522391 L 4.6626994,1.6482076 L 4.6874462,1.9879118 L 4.4523728,2.1892181 L 4.3162766,2.5540857 L 4.6008407,2.5540857 L 4.712191,2.3150345 L 4.7493088,2.2269631 C 4.8744282,2.136984 4.9930427,2.0367771 5.1204782,1.9501669 L 5.4174142,2.05082 C 5.6107409,2.1843878 5.8054259,2.3200676 5.9989133,2.4534326 L 6.2834735,2.1892181 L 5.9617936,2.05082 L 5.8133266,1.7488605 L 5.2689442,1.6859524 L 5.2565714,1.6230443 L 5.4916438,1.6733709 L 5.6277409,1.5349726 L 5.9246759,1.4720643 C 5.9949454,1.4373108 6.06407,1.4122795 6.1350055,1.3839929 L 5.9494207,1.560136 L 6.6175262,2.0256568 L 6.6175262,2.302453 L 6.357707,2.5666673 L 6.7041325,3.2712399 L 6.9392071,3.1328408 L 7.2361431,2.6673207 C 7.6536127,2.5360677 8.0298636,2.383337 8.423888,2.2017997 L 8.3991411,2.3779426 L 8.5970969,2.5163408 L 8.9435226,2.2772895 L 8.7703107,2.0759833 L 8.5352353,2.2143814 L 8.4610018,2.1892185 C 8.4780536,2.1812953 8.4933662,2.1721092 8.5104914,2.1640557 L 8.8569181,1.2581766 L 8.1022062,0.95621712 z M 4.712189,2.3150345 L 4.9967521,2.5163408 L 5.2318265,2.5163408 L 5.2318265,2.2772895 L 4.9472634,2.1514733 L 4.712189,2.3150345 L 4.712189,2.3150345 z M 11.281895,2.1514733 L 10.774628,2.2772895 L 10.452951,2.4911776 L 10.452951,2.6799019 L 9.9456829,3.0070243 L 10.044661,3.4977095 L 10.341597,3.2838208 L 10.527183,3.4977095 L 10.737514,3.6235259 L 10.873608,3.2586575 L 10.799375,3.0447699 L 10.873608,2.8937896 L 11.170544,2.6169941 L 11.30664,2.6169941 L 11.170544,2.9189543 L 11.170544,3.1957496 C 11.292932,3.1618717 11.416467,3.1486778 11.541713,3.1328408 L 11.195288,3.3844746 L 11.170543,3.5354537 L 10.774628,3.8751588 L 10.366341,3.7745049 L 10.366341,3.5354537 L 10.180756,3.6612703 L 10.267364,3.8751588 L 9.9704267,3.8751588 L 9.8095868,4.1519548 L 9.61163,4.3784244 L 9.2528324,4.4539139 L 9.463162,4.6678019 L 9.5126507,4.88169 L 9.2528324,4.88169 L 8.9064068,5.0704143 L 8.9064068,5.6240059 L 9.0672458,5.6240059 L 9.2157146,5.7875676 L 9.5497684,5.6240059 L 9.6734907,5.2843013 L 9.920937,5.1333218 L 9.9704267,5.0075057 L 10.366341,4.9068526 L 10.589042,5.1584854 L 10.824117,5.2843013 L 10.688021,5.5610979 L 10.898351,5.49819 L 11.009701,5.2213934 L 10.737512,4.9068526 L 10.848862,4.9068526 L 11.121054,5.1333218 L 11.170543,5.4352821 L 11.405615,5.7120781 L 11.467479,5.3094657 L 11.591202,5.2465566 C 11.722897,5.3855865 11.826706,5.5556097 11.937626,5.7120781 L 12.345913,5.7372433 L 12.580987,5.8882234 L 12.469637,6.0517841 L 12.234564,6.2656727 L 11.888135,6.2656727 L 11.430361,6.1146942 L 11.195287,6.1398593 L 11.022074,6.3411657 L 10.527181,5.8378996 L 10.180756,5.7372462 L 9.6734907,5.8001547 L 9.2280866,5.9259711 C 8.974001,6.2188978 8.7138634,6.5150518 8.4733747,6.8192683 L 8.1888107,7.5238405 L 8.3249076,7.6748196 L 8.0774604,8.0396877 L 8.3496515,8.6813514 C 8.5761437,8.9418962 8.8039678,9.2006825 9.030129,9.461412 L 9.3641827,9.1720348 L 9.5002778,9.3481795 L 9.8590764,9.1091277 L 9.9827973,9.2475248 L 10.341595,9.2475248 L 10.551927,9.4865757 L 10.428203,9.914352 L 10.675649,10.203731 L 10.663275,10.706995 L 10.848861,11.071864 L 10.712766,11.386405 C 10.699498,11.611997 10.68802,11.827605 10.68802,12.053231 C 10.79718,12.358902 10.906621,12.663823 11.0097,12.971693 L 11.083934,13.462375 L 11.083934,13.714009 L 11.281891,13.714009 L 11.566453,13.525283 L 11.91288,13.525283 L 12.432517,12.933947 L 12.370656,12.732639 L 12.717083,12.418101 L 12.457262,12.128722 L 12.76657,11.877089 L 13.063506,11.688364 L 13.199602,11.537384 L 13.112995,11.19768 C 13.112995,10.911684 13.112996,10.628161 13.112995,10.342127 L 13.348069,9.8136993 L 13.645006,9.4865757 L 13.966685,8.6813514 L 13.966685,8.467463 C 13.806607,8.4879689 13.653171,8.506459 13.496537,8.5177905 L 13.818218,8.1906678 L 14.263621,7.8887078 L 14.498696,7.6119125 L 14.498696,7.3099534 C 14.445379,7.2077028 14.391536,7.0976601 14.337854,6.9954116 L 14.127525,7.2470431 L 13.966685,7.0583197 L 13.731609,6.8695964 L 13.731609,6.4795648 L 14.003802,6.7941047 L 14.313111,6.75636 C 14.452648,6.8851798 14.586636,6.9997236 14.709024,7.1463926 L 14.906986,6.9199159 C 14.906986,6.6761022 14.63695,5.4724677 14.053296,4.4539139 C 13.46964,3.4356954 12.444894,2.5037591 12.444895,2.5037591 L 12.370661,2.6421572 L 12.098469,2.9441167 L 11.752043,2.579249 L 12.098469,2.579249 L 12.259308,2.4031061 L 11.615949,2.2772895 L 11.281895,2.1514733 z M 3.8461259,2.3150345 L 3.7224027,2.6421572 C 3.7224027,2.6421572 3.5057941,2.6785236 3.4502116,2.6924839 C 2.7403769,3.3576613 1.3089548,4.8004591 0.97574709,7.5112538 C 0.98894063,7.5741032 1.2108206,7.9390292 1.2108206,7.9390292 L 1.7552039,8.2661509 L 2.2995852,8.417131 L 2.5346596,8.7065091 L 2.8934573,8.9833054 L 3.1037868,8.9455608 L 3.2522558,9.0210508 L 3.2522558,9.0713763 L 3.0542972,9.6375498 L 2.8934573,9.8766016 L 2.942946,9.9898366 L 2.8192238,10.442776 L 3.2769996,11.298327 L 3.7471476,11.713522 L 3.957476,12.015482 L 3.9327303,12.644563 L 4.0811982,12.99685 L 3.9327303,13.67626 C 3.9327303,13.67626 3.9129189,13.670673 3.9327303,13.739167 C 3.9527179,13.807695 4.759781,14.268689 4.8111654,14.22985 C 4.8623746,14.190288 4.9101447,14.154361 4.9101447,14.154361 L 4.860656,14.00338 L 5.0709847,13.802075 L 5.1452191,13.588188 L 5.4792709,13.474953 L 5.7390901,12.820706 L 5.6648567,12.644563 L 5.8380694,12.367767 L 6.2339838,12.279695 L 6.4319415,11.801593 L 6.3824509,11.210255 L 6.6917597,10.769898 L 6.7412484,10.316959 C 6.3168632,10.102948 5.9004921,9.8830534 5.4792709,9.6627135 L 5.2689423,9.2475198 L 4.8853999,9.1594491 L 4.6750703,8.5932746 L 4.1678047,8.6561827 L 3.7224017,8.32906 L 3.2522529,8.7442535 L 3.2522529,8.8071626 C 3.1114329,8.7658292 2.9446126,8.7597462 2.8192238,8.6813464 L 2.7202454,8.3793874 L 2.7202454,8.0522637 L 2.3985655,8.0900083 C 2.4244522,7.8816386 2.4591052,7.6692598 2.485171,7.4609265 L 2.2995852,7.4609265 L 2.1140005,7.6999783 L 1.9407887,7.7880501 L 1.6809694,7.6370692 L 1.6562245,7.3099456 L 1.7057143,6.9576606 L 2.0892557,6.6557005 L 2.3985645,6.6557005 L 2.4604271,6.4795582 L 2.8439686,6.5676288 L 3.1285316,6.932497 L 3.1780203,6.3285781 L 3.672914,5.9133853 L 3.8461259,5.4730269 L 4.2172963,5.3220476 L 4.415253,5.0200879 L 4.8854018,4.9320161 L 5.1204763,4.57973 C 4.8878,4.57973 4.6479303,4.57973 4.415253,4.57973 L 4.8606579,4.3658421 L 5.1699649,4.3658421 L 5.5658793,4.2274443 L 5.6401139,4.6174752 L 5.8133266,4.3406788 L 5.615369,4.2022808 L 5.6648596,4.0387201 L 5.5040187,3.8877395 L 5.3308048,3.8374132 L 5.3802955,3.6486888 L 5.2441994,3.3844746 L 4.9348905,3.5102908 L 4.9843801,3.2712399 L 4.6255827,3.0573516 L 4.3410204,3.5606172 L 4.3657663,3.7367603 L 4.0812032,3.8625768 L 3.9079904,4.2526078 L 3.821384,3.8877395 L 3.3388631,3.6864335 L 3.2522568,3.4096375 L 3.9079904,3.0321885 L 4.1925535,2.755392 L 4.2173002,2.4282694 L 4.0564593,2.3401977 L 3.8461298,2.315035 L 3.8461259,2.3150345 z M 9.1538541,2.9189543 L 9.1538541,3.1202592 L 9.2652062,3.246076 L 9.2652062,3.5480356 L 9.2033438,3.9506479 L 9.5250246,3.8877395 L 9.760098,3.6486888 L 9.5497694,3.4473819 C 9.4815603,3.2626763 9.4124355,3.0961113 9.3270669,2.9189543 L 9.1538541,2.9189543 z M 8.881662,3.3215656 L 8.6837063,3.3844746 L 8.7331959,3.7493421 L 8.9930152,3.6109428 L 8.881662,3.3215656 L 8.881662,3.3215656 z M 12.506754,6.6305386 L 12.803691,6.9828228 L 13.162489,7.7628866 L 13.385189,8.0145183 L 13.273839,8.2787347 L 13.471797,8.5177846 C 13.380952,8.5238987 13.292977,8.5303684 13.199605,8.5303684 C 13.029984,8.1679096 12.895741,7.802374 12.766575,7.4231829 L 12.543871,7.1715503 L 12.420149,6.7186111 L 12.506754,6.6305399 L 12.506754,6.6305386 z"
-       id="path6534"
-       style="opacity:0.4;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none" />
-    <path
-       d="M 14.500001,7.9997709 C 14.500001,11.589737 11.589636,14.5 8.0000818,14.5 C 4.4101984,14.5 1.5000001,11.589705 1.5000001,7.9997709 C 1.5000001,4.4099703 4.4101984,1.5000014 8.0000818,1.5000014 C 11.589636,1.5000014 14.500001,4.4099703 14.500001,7.9997709 L 14.500001,7.9997709 z"
-       id="path2451"
-       style="opacity:0.4;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient2464);stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-  </g>
-</svg>
diff --git a/apps/contacts/img/person.png b/apps/contacts/img/person.png
deleted file mode 100644
index e88bb5653af5088fec4a8564cba752c91aa87b85..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 852
zcmV-a1FQUrP)<h;3K|Lk000e1NJLTq000&M000&U1^@s6#I$TX00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10?|oCK~y-)rIbrgT2T<k?WT`aS54Ya(I#DV)x@OVrK_gjpc~VK
zU{EY^!^#B`!3SU<Dw<#-XhHx%KtOqjA}_<6@VK{>>HJSh)95W}ZWoie=bV|}nS0Ls
z&kPaGOtYPxohN&HdtdkW_p@%dTZYFN^V9OCLf6;VpD`pAjYfy<cAG|{5w%(^Iy*ZX
z?(XiUu&xU1a=G;3a99Gc-|thS(GXxsk|+=eNLW_|b~>F!fQG{%q2gMtMx|0o_`AD1
z!n!K3-ENnAy`F%gTEL3MBHiBJipp&^o2(XG0IXiGQ?**9a=A=}LO~ed3@)ewZ*6UP
zGMS916rh`%8@jr>5<Znm(dOo+M-_N&ZS7ky7#!nV0nFucluoB9pU;!u?;m4b71(4l
zy|-GeGOEsIvvhHBL6?`8!ZtQGq}A2c530a0i^XDO2qlxr-{x>Qi0AF91p;Fs%x-UQ
z%Y0FEa&khfI6!}JtIhrwm}UIV=ks-V0|3zp<nefVEbTX{zy}8h&$+rUY;C?Ux!G)r
zbB0eO5>Q=(tNz5Ye*8~h4t&ACu4C(+o}P*~;@A5?M@L5#i9`e(eSLg<JmB-L@n3vi
zSy_4dS1|YOD;7nQFG%imIy4vz#2eA=b_IMQ6to|D8yn!8H|%pym$|5yieT=`xlkzd
z9rCSIDgpukY@$3!8p=a2<7nV9&wVYM&E`2pF!!Y+9*@)Y^|eTXARvs1I53BvMju0Y
zeAa|`eB-E)uL$OIO2%R_IzK-ruAK1wr}4Y|zz~OcY=C@4u+eDjq6$E8QA(iuhB(9{
z5BW;qN6X90g~P)`;`f30B19ER)lTNHjyQhw(c6T4a2`~=u(0sjU@*j&mX^ADy}r+v
zIp%&Quh%O!0~8)(%(Gy|i;IhW#3K*+Qw5^YXx_4YoS&c9aIk}uqdJ|guGMNs@EBtr
e>xe`Aea24}ALCOkF#vA>0000<MNUMnLSTYvt&4>K

diff --git a/apps/contacts/img/person.svg b/apps/contacts/img/person.svg
deleted file mode 100644
index c4842c5916..0000000000
--- a/apps/contacts/img/person.svg
+++ /dev/null
@@ -1,175 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   xmlns:svg="http://www.w3.org/2000/svg"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:xlink="http://www.w3.org/1999/xlink"
-   version="1.0"
-   width="22"
-   height="22"
-   id="svg11300">
-  <defs
-     id="defs3">
-    <linearGradient
-       id="linearGradient3785">
-      <stop
-         id="stop3787"
-         style="stop-color:#b8b8b8;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:#ffffff;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3345"
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5060">
-      <stop
-         id="stop5062"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop5064"
-         style="stop-color:#000000;stop-opacity:0"
-         offset="1" />
-    </linearGradient>
-    <radialGradient
-       cx="24.999998"
-       cy="28.659998"
-       r="16"
-       fx="24.999998"
-       fy="28.659998"
-       id="radialGradient2871"
-       xlink:href="#linearGradient6954"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.67742373,0,0,0.19285627,-5.0162555,9.9977318)" />
-    <linearGradient
-       x1="30"
-       y1="25.084745"
-       x2="30"
-       y2="45"
-       id="linearGradient2873"
-       xlink:href="#linearGradient3785"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.51613236,0,0,0.51667107,-0.98397254,-0.49180897)" />
-    <linearGradient
-       x1="29.996229"
-       y1="21.440447"
-       x2="29.996229"
-       y2="43.531425"
-       id="linearGradient2875"
-       xlink:href="#linearGradient3341"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.51613236,0,0,0.51667107,-0.98397254,-0.49180897)" />
-    <radialGradient
-       cx="26.375898"
-       cy="12.31301"
-       r="8"
-       fx="26.375898"
-       fy="12.31301"
-       id="radialGradient2877"
-       xlink:href="#linearGradient6954"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.86552039,-0.07102871,0.06760608,0.84907396,-11.038912,-4.204803)" />
-    <linearGradient
-       x1="30"
-       y1="5"
-       x2="30"
-       y2="44.678879"
-       id="linearGradient2879"
-       xlink:href="#linearGradient3785"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.52770326,0,0,0.53573244,-1.3310981,-1.4043014)" />
-    <linearGradient
-       x1="22"
-       y1="39"
-       x2="17"
-       y2="37.4375"
-       id="linearGradient2881"
-       xlink:href="#linearGradient5060"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.74999995,0,0,0.43478262,-5.1276295,2.9173914)" />
-    <radialGradient
-       cx="30"
-       cy="33.1875"
-       r="4.6875"
-       fx="30"
-       fy="33.1875"
-       id="radialGradient2883"
-       xlink:href="#linearGradient5060"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.81491924,-3.8844793e-7,1.136461e-7,0.25340272,-9.9475804,6.5902095)" />
-    <linearGradient
-       x1="22"
-       y1="39"
-       x2="17"
-       y2="37.4375"
-       id="linearGradient2885"
-       xlink:href="#linearGradient5060"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.74999995,0,0,0.43478262,34.15,2.9173914)" />
-    <linearGradient
-       x1="30.00001"
-       y1="6.333993"
-       x2="30.00001"
-       y2="24.913183"
-       id="linearGradient2887"
-       xlink:href="#linearGradient3341"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.52770326,0,0,0.53573244,-1.3310981,-1.4043014)" />
-  </defs>
-  <g
-     transform="translate(-3,-1.0000003)"
-     id="g3758">
-    <path
-       d="m 12.177403,10.099947 c 0.23753,1.124653 0.370116,1.975373 0.177421,3.100026 -1.502303,1.247697 -5.3445034,1.80835 -5.3387447,3.100025 l -0.5161321,3.875036 c 0,1.284073 3.5817448,2.325019 8.0000528,2.325019 4.418307,0 8.000053,-1.040946 8.000053,-2.325019 l -0.516134,-3.875036 c -0.0061,-1.105498 -3.870993,-1.808346 -5.354873,-3.100025 -0.126751,-1.043848 -0.02586,-2.056174 0.193549,-3.100026 l -4.645192,0 z"
-       id="path3766"
-       style="fill:url(#radialGradient2871);fill-opacity:1;stroke:url(#linearGradient2873);stroke-width:0.99989432;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-    <path
-       d="m 13.21875,11.09375 c 0.08722,0.856711 0.3354,1.801007 -0.04818,2.615857 -0.642554,0.728465 -1.594602,1.093826 -2.46738,1.472715 C 9.3226847,15.510467 7.7137266,16 7.9252179,16.998373 7.7834779,18.061416 7.641739,19.124458 7.5,20.1875 c 0.3063993,0.160613 1.0809439,0.584904 1.625,0.6875 2.520767,0.666947 5.16785,0.725367 7.754874,0.519516 1.511711,-0.166212 3.088649,-0.352665 4.432626,-1.113266 0.335436,-0.07362 0.107122,-0.316411 0.114936,-0.654915 -0.132062,-1.021278 -0.264124,-2.042557 -0.396186,-3.063835 -0.587648,-0.5027 -1.391296,-0.753519 -2.106391,-1.064577 -1.082782,-0.447299 -2.251468,-0.853003 -3.086912,-1.707994 -0.391617,-0.689558 -0.161473,-1.538743 -0.107324,-2.28649 0.259681,-0.52835 -0.223399,-0.401903 -0.552932,-0.409689 -0.652981,0 -1.305961,0 -1.958941,0 z"
-       id="path3742"
-       style="fill:none;stroke:url(#linearGradient2875);stroke-width:0.99989432;stroke-miterlimit:4;stroke-opacity:1" />
-    <path
-       d="m 14.5,1.5422262 c -2.185818,0 -3.957774,1.67899 -3.957774,3.7501272 0.01713,0.7664876 0.08155,1.6770462 0.527701,3.750127 0.263852,0.8035986 2.617283,2.9465296 2.638517,3.2143946 0.511701,0.267865 1.319258,0.267865 1.846964,0 0,-0.267865 2.110813,-2.410796 2.374664,-3.2143946 0.502046,-2.1545496 0.500773,-2.9465283 0.527702,-3.750127 0,-2.0711372 -1.771956,-3.7501272 -3.957774,-3.7501272 z"
-       id="path3764"
-       style="fill:url(#radialGradient2877);fill-opacity:1;stroke:url(#linearGradient2879);stroke-width:1.08445191;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-    <path
-       d="M 10.62237,21.7 C 8.8506083,20.838176 9.6954668,18.924844 9.8723695,17.7 9.1223696,18.569566 9.5000001,21 8,21 c 1,0.355621 1.6845389,0.59817 2.62237,0.7 z"
-       id="path3848"
-       style="opacity:0.5;fill:url(#linearGradient2881);fill-opacity:1;stroke:none" />
-    <path
-       d="M 12,13.35048 C 12.366027,14.309818 13.343418,15 14.5,15 c 1.156582,0 2.133972,-0.690182 2.5,-1.64952 l -5,0 z"
-       id="path3833"
-       style="opacity:0.3;fill:url(#radialGradient2883);fill-opacity:1;stroke:none" />
-    <path
-       d="m 18.4,21.7 c 1.771762,-0.861824 0.926903,-2.775156 0.750001,-4 C 19.9,18.569566 19.52237,21 21.02237,21 c -1,0.355621 -1.684539,0.59817 -2.62237,0.7 z"
-       id="path3720"
-       style="opacity:0.5;fill:url(#linearGradient2885);fill-opacity:1;stroke:none" />
-    <path
-       d="m 14.5,2.53125 c -1.666616,0 -2.9513,1.2303173 -2.96875,2.71875 1.39e-4,0.00624 -1.45e-4,0.024997 0,0.03125 0.01647,0.7081029 0.08609,1.5272795 0.5,3.46875 -0.0051,-0.03667 0.09671,0.2041393 0.3125,0.46875 0.232433,0.2850235 0.566603,0.6083312 0.875,0.9375 0.308397,0.329169 0.598847,0.668975 0.84375,0.9375 0.09435,0.103448 0.171956,0.186905 0.25,0.28125 0.166811,0.03524 0.415249,0.03212 0.625,0 0.06182,-0.08397 0.114751,-0.159431 0.1875,-0.25 0.218248,-0.271707 0.473896,-0.575993 0.75,-0.90625 0.276104,-0.3302573 0.569207,-0.6813941 0.78125,-0.96875 0.197562,-0.2677316 0.307312,-0.503144 0.3125,-0.5 0.460701,-1.9997828 0.473735,-2.6695721 0.5,-3.46875 0,-0.010182 1.19e-4,-0.021091 0,-0.03125 C 17.4513,3.7615673 16.166616,2.53125 14.5,2.53125 z"
-       id="path3730"
-       style="fill:none;stroke:url(#linearGradient2887);stroke-width:1.08445191;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
-  </g>
-</svg>
diff --git a/apps/contacts/img/person_large.png b/apps/contacts/img/person_large.png
deleted file mode 100644
index 8293df61829471e682d7d2292972253ff1791cde..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6993
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

diff --git a/apps/contacts/import.php b/apps/contacts/import.php
deleted file mode 100644
index 1986d79f6d..0000000000
--- a/apps/contacts/import.php
+++ /dev/null
@@ -1,150 +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.
- */
-//check for addressbooks rights or create new one
-ob_start();
- 
-OCP\JSON::checkLoggedIn();
-OCP\App::checkAppEnabled('contacts');
-session_write_close();
-
-$nl = "\n";
-
-global $progresskey;
-$progresskey = 'contacts.import-' . (isset($_GET['progresskey'])?$_GET['progresskey']:'');
-
-if (isset($_GET['progress']) && $_GET['progress']) {
-	echo OC_Cache::get($progresskey);
-	die;
-}
-
-function writeProgress($pct) {
-	global $progresskey;
-	OC_Cache::set($progresskey, $pct, 300);
-}
-writeProgress('10');
-$view = $file = null;
-if(isset($_POST['fstype']) && $_POST['fstype'] == 'OC_FilesystemView') {
-	$view = OCP\Files::getStorage('contacts');
-	$file = $view->file_get_contents('/imports/' . $_POST['file']);
-} else {
-	$file = OC_Filesystem::file_get_contents($_POST['path'] . '/' . $_POST['file']);
-}
-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(!$id) {
-		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']
-				)
-			)
-		);
-		exit();
-	}
-	OC_Contacts_App::getAddressbook($id); // is owner access check
-}
-//analyse the contacts file
-writeProgress('40');
-$file = str_replace(array("\r","\n\n"), array("\n","\n"), $file);
-$lines = explode($nl, $file);
-
-$inelement = false;
-$parts = array();
-$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;
-	}
-}
-//import the contacts
-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']
-			)
-		)
-	);
-	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){
-	$card = OC_VObject::parse($part);
-	if (!$card) {
-		$failed += 1;
-		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);
-		$failed += 1;
-	}
-}
-//done the import
-writeProgress('100');
-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\JSON::success(
-	array(
-		'data' => array(
-			'imported'=>$imported, 
-			'failed'=>$failed, 
-			'file'=>$_POST['file'],
-		)
-	)
-);
diff --git a/apps/contacts/index.php b/apps/contacts/index.php
deleted file mode 100644
index f16d6f5641..0000000000
--- a/apps/contacts/index.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<?php
-/**
- * Copyright (c) 2012 Thomas Tanghus <thomas@tanghus.net>
- * Copyright (c) 2011 Jakob Sack mail@jakobsack.de
- * 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('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($has_contacts === false) {
-	OCP\Util::writeLog('contacts',
-		'index.html: No contacts found.',
-		OCP\Util::DEBUG);
-}
-
-// Load the files we need
-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'));
-$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);
-
-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');
-
-$tmpl = new OCP\Template( "contacts", "index", "user" );
-$tmpl->assign('uploadMaxFilesize', $maxUploadFilesize, false);
-$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/LICENSE.jquery.inview b/apps/contacts/js/LICENSE.jquery.inview
deleted file mode 100644
index 1ed340edbe..0000000000
--- a/apps/contacts/js/LICENSE.jquery.inview
+++ /dev/null
@@ -1,41 +0,0 @@
-Attribution-Non-Commercial-Share Alike 2.0 UK: England & Wales
-
-http://creativecommons.org/licenses/by-nc-sa/2.0/uk/
-
-You are free:
-
-    * to copy, distribute, display, and perform the work
-    * to make derivative works
-
-
-Under the following conditions:
-
-    * Attribution — You must give the original author credit.
-      Attribute this work:
-      Information
-      What does "Attribute this work" mean?
-      The page you came from contained embedded licensing metadata, 
-      including how the creator wishes to be attributed for re-use. 
-      You can use the HTML here to cite the work. Doing so will 
-      also include metadata on your page so that others can find the 
-      original work as well.
-
-    * Non-Commercial — You may not use this work for commercial 
-      purposes.
-    * Share Alike — If you alter, transform, or build upon this 
-      work, you may distribute the resulting work only under a 
-      licence identical to this one.
-
-With the understanding that:
-
-    * Waiver — Any of the above conditions can be waived if you get 
-      permission from the copyright holder.
-    * Other Rights — In no way are any of the following rights 
-      affected by the license:
-          o Your fair dealing or fair use rights;
-          o The author's moral rights;
-          o Rights other persons may have either in the work itself 
-            or in how the work is used, such as publicity or privacy rights.
-    * Notice — For any reuse or distribution, you must make clear to 
-      others the licence terms of this work.
-
diff --git a/apps/contacts/js/contacts.js b/apps/contacts/js/contacts.js
deleted file mode 100644
index 09cf26bf7f..0000000000
--- a/apps/contacts/js/contacts.js
+++ /dev/null
@@ -1,2277 +0,0 @@
-function ucwords (str) {
-	return (str + '').replace(/^([a-z])|\s+([a-z])/g, function ($1) {
-		return $1.toUpperCase();
-	});
-}
-
-String.prototype.strip_tags = function(){
-	tags = this;
-	stripped = tags.replace(/<(.|\n)*?>/g, '');
-	return stripped;
-};
-
-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');
-			}
-			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);
-		}
-		if(params.clickhandler && $.isFunction(params.clickhandler)) {
-			self.notifier.on('click', function() {
-				if(!self || !self.notifier) {
-					var self = OC.Contacts;
-					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 = 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() {});
-			}
-		);
-	},
-	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();
-			}
-		}
-
-		$('#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);
-			}
-		);
-		$('#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'), 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');
-				}
-			},
-			{
-				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="'+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;
-		});
-
-		$('#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();
-			}
-			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();
-			}
-		});
-		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').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'));
-				}
-			} 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', 'contact/details.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);
-			}
-		},
-		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
-			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
-			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', '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', '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});
-								if(isnew) { // add some default properties
-									OC.Contacts.Card.addProperty('EMAIL');
-									OC.Contacts.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() {
-							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(parseInt(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 {
-						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() + '"',
-				//timeout:5,
-				timeouthandler:function(contact) {
-					console.log('timeout');
-					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});
-					OC.Contacts.notify({message:t('contacts', 'Cancelled deletion of: "') + curlistitem.find('a').text() + '"'});
-					window.onbeforeunload = null;
-				}
-			});
-		},
-		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);
-				}
-				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);
-				if(typeof cb == 'function') {
-					cb(true);
-				}
-				return;
-			}
-			$.post(OC.filePath('contacts', 'ajax', 'contact/delete.php'), {'id':id},function(jsondata) {
-				if(jsondata.status == '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;
-			this.id = this.data.id;
-			this.bookid = bookid;
-			$('#rightcontent').data('id',this.id);
-			this.populateNameFields();
-			this.loadPhoto();
-			this.loadMails();
-			this.loadPhones();
-			this.loadIMs();
-			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);
-				$('#contact_note').show();
-				textarea.expandingTextarea();
-				$('#contacts_propertymenu_dropdown a[data-type="NOTE"]').parent().hide();
-			} else {
-				note.removeData('checksum');
-				note.find('textarea').val('');
-				$('#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'];
-			// 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();
-				} 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('');
-				}
-			});
-
-			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;
-					}
-				}
-			}
-			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 {
-						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);
-				}
-			});
-					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.
-			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 + ';;;;');
-						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', '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);
-							OC.Contacts.loading(obj, false);
-							$(obj).removeAttr('disabled');
-							return true;
-						}
-						else{
-							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');
-			} else { // add
-					console.log('Adding: ' + q);
-					$(obj).attr('disabled', 'disabled');
-					$.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
-							//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'));
-							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();
-					$('#note').find('textarea').expandingTextarea().show().focus();
-					$('#contact_note').show();
-					break;
-				case 'EMAIL':
-					if($('#emaillist>li').length == 1) {
-						$('#emails').show();
-					}
-					OC.Contacts.Card.addMail();
-					break;
-				case 'TEL':
-					if($('#phonelist>li').length == 1) {
-						$('#phones').show();
-					}
-					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();
-					}
-					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');
-			if(!this.enabled) {
-				return;
-			}
-			OC.Contacts.loading(obj, true);
-			var checksum = OC.Contacts.checksumFor(obj);
-			if(checksum) {
-				$.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();
-						} 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();
-								} else if(proptype == 'NOTE') {
-									$('#note').find('textarea').val('');
-									$('#contact_note').hide();
-									OC.Contacts.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();
-							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() {
-			if(!this.enabled) {
-				return;
-			}
-			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
-							}
-						});
-					} else {
-						OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
-					}
-				});
-			}
-		},
-		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];
-			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();
-			$('#addresses dl.propertycontainer').remove();
-			var addresscontainer = $('#addresses');
-			for(var adr in this.data.ADR) {
-				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'];
-				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();
-			}
-			return false;
-		},
-		editAddress:function(obj, isnew){
-			if(!this.enabled) {
-				return;
-			}
-			var container = undefined;
-			var params = {id: this.id};
-			if(obj === 'new') {
-				isnew = true;
-				$('#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);
-			}
-			/* 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, $('#addresses 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(!this.enabled) {
-				return;
-			}
-			if(isnew) {
-				container = $('#addresses 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(!this.enabled) {
-				return;
-			}
-			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(){
-			var self = this;
-			var refreshstr = '&refresh='+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.css('width', $(this).get(0).width + 10);
-				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(){
-			if(!this.enabled) {
-				return;
-			}
-			$.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){
-			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'){
-					//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() {
-			if(!this.enabled) {
-				return;
-			}
-			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();
-					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);
-		},
-		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() {
-			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() {
-			$('#emails').hide();
-			$('#emaillist li.propertycontainer').remove();
-			var emaillist = $('#emaillist');
-			for(var mail in this.data.EMAIL) {
-				this.addMail();
-				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']) {
-					if(param.toUpperCase() == 'PREF') {
-						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];
-							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();
-			}
-			$('#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();
-				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') {
-						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];
-							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');
-									found = true;
-								}
-							});
-							if(!found) {
-								curphone.find('select option:last-child').after('<option class="custom" value="'+pt+'" selected="selected">'+pt+'</option>');
-							}
-						}
-					}
-				}
-				curphone.find('select').multiselect({
-										noneSelectedText: t('contacts', 'Select type'),
-										header: false,
-										selectedList: 4,
-										classes: 'typelist'
-									});
-			}
-			if(phonelist.find('li').length > 1) {
-				$('#phones').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', 'contact/move.php'),
-				{
-					id: 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) {
-			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,
-		 * '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;
-		},
-		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') {
-						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){
-					if(jsondata.status != 'success'){
-						OC.Contacts.notify({message:jsondata.data.message});
-					}
-			});
-			return false;
-		},
-		next:function(reverse) {
-			var curlistitem = this.getContact(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);
-		},
-		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 = {}; }
-			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', 'contact/list.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 + '" 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 + '" 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()) {
-											$(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 = OC.Contacts.Card.categoriesChanged;
-	OCCategories.app = 'contacts';
-
-	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);
-		}
-	});
-	$('#bottomcontrols .import').click(function() {
-		$('#import_upload_start').trigger('click');
-	});
-	$('#contacts_newcontact').on('click keydown', OC.Contacts.Card.editNew);
-
-	ninjahelp.find('.close').on('click keydown',function() {
-		ninjahelp.hide();
-	});
-
-	$(document).on('keyup', function(event) {
-		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-a: add addressbook
-		 * u (85): hide/show leftcontent
-		 * f (70): add field
-		 */
-		switch(event.which) {
-			case 27: // Esc
-				ninjahelp.hide();
-				break;
-			case 46: // Delete
-				if(event.shiftKey) {
-					OC.Contacts.Card.delayedDelete();
-				}
-				break;
-			case 40: // down
-			case 74: // j
-				OC.Contacts.Contacts.next();
-				break;
-			case 65: // a
-				if(event.shiftKey) {
-					// add addressbook
-					OC.Contacts.notImplemented();
-					break;
-				}
-				OC.Contacts.Card.editNew();
-				break;
-			case 38: // up
-			case 75: // k
-				OC.Contacts.Contacts.previous();
-				break;
-			case 34: // PageDown
-			case 78: // n
-				// next addressbook
-				OC.Contacts.Contacts.nextAddressbook();
-				break;
-			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.Contacts.previousAddressbook();
-				break;
-			case 82: // r
-				OC.Contacts.Contacts.update({cid:OC.Contacts.Card.id});
-				break;
-			case 191: // ?
-				ninjahelp.toggle('fast');
-				break;
-		}
-
-	});
-
-	//$(window).on('beforeunload', OC.Contacts.Contacts.deleteFilesInQueue);
-
-	// Load a contact.
-	$('.contacts').keydown(function(event) {
-		if(event.which == 13 || event.which == 32) {
-			$('.contacts').click();
-		}
-	});
-	$(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();
-			var id = item.data('id');
-			var bookid = item.data('bookid');
-			item.addClass('active');
-			var oldid = $('#rightcontent').data('id');
-			if(oldid != 0){
-				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', 'contact/details.php'),{'id':id},function(jsondata){
-				if(jsondata.status == 'success'){
-					OC.Contacts.Card.loadContact(jsondata.data, bookid);
-				}
-				else{
-					OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
-				}
-			});
-		}
-		return false;
-	});
-
-	$('.contacts_property').live('change', function(){
-		OC.Contacts.Card.saveProperty(this);
-	});
-
-	$(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) {
-							OC.Contacts.Card.editPhoto(response.data.id, response.data.tmp);
-						} else {
-							OC.dialogs.alert(xhr.status + ': ' + xhr.responseText, 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='+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));
-			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
-	});
-
-	//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() {
-		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,
-			add: function(e, data) {
-				var files = data.files;
-				var totalSize=0;
-				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;
-						}
-						totalSize+=files[i].size;
-					}
-				}
-				if(totalSize>$('#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'));
-					numfiles = uploadedfiles = retries = aid = 0;
-					uploadingFiles = {};
-					return;
-				}else{
-					if($.support.xhrFileUpload) {
-						for(var i=0;i<files.length;i++){
-							var fileName = files[i].name;
-							var dropTarget;
-							if($(e.originalEvent.target).is('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.
-								aid = dropTarget.attr('data-id');
-							} else {
-								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 {
-										OC.Contacts.notify({message:jsondata.data.message});
-									}
-									return false;
-								})
-								.error(function(jqXHR, textStatus, errorThrown) {
-									console.log(textStatus);
-									OC.Contacts.notify({message:errorThrown + ': ' + textStatus,});
-								});
-							uploadingFiles[fileName] = 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 {
-								OC.Contacts.notify({message:response.data.message});
-							}
-						});
-					}
-				}
-			},
-			fail: function(e, data) {
-				console.log('fail');
-				OC.Contacts.notify({message:data.errorThrown + ': ' + data.textStatus});
-				// TODO: Remove file from upload queue.
-			},
-			progressall: function(e, data) {
-				var progress = (data.loaded/data.total)*50;
-				$('#uploadprogressbar').progressbar('value',progress);
-			},
-			start: function(e, data) {
-				$('#uploadprogressbar').progressbar({value:0});
-				$('#uploadprogressbar').fadeIn();
-				if(data.dataType != 'iframe ') {
-					$('#upload input.stop').show();
-				}
-			},
-			stop: function(e, data) {
-				// 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) {
-						OC.Contacts.notify({message:t('contacts', 'Not all files uploaded. Retrying...')});
-						retries += 1;
-						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;
-						}
-						setTimeout(function() { // Just to let any uploads finish
-							importFiles(aid, uploadingFiles);
-						}, 1000);
-					}
-					$('#uploadprogressbar').progressbar('value',50);
-					var todo = uploadedfiles;
-					$.each(fileList, function(fileName, data) {
-						OC.Contacts.Contacts.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() {
-						OC.Contacts.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($) {
-									var select_dlg = $('#selectaddressbook_dialog');
-									select_dlg.dialog({
-										modal: true, height: 'auto', width: 'auto',
-										buttons: {
-											'Ok':function() {
-												aid = select_dlg.find('input:checked').val();
-												if(aid == 'new') {
-													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;
-													}
-													$(this).dialog('close');
-													OC.Contacts.Contacts.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 {
-							$('#uploadprogressbar').fadeOut();
-							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();
-				}
-			}
-		})
-	});
-
-	OC.Contacts.loadHandlers();
-	OC.Contacts.Contacts.update({cid:id});
-});
diff --git a/apps/contacts/js/expanding.js b/apps/contacts/js/expanding.js
deleted file mode 100644
index 17139f27ff..0000000000
--- a/apps/contacts/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/contacts/js/jquery.Jcrop.js b/apps/contacts/js/jquery.Jcrop.js
deleted file mode 100644
index 36f9a0f08f..0000000000
--- a/apps/contacts/js/jquery.Jcrop.js
+++ /dev/null
@@ -1,1765 +0,0 @@
-/**
- * jquery.Jcrop.js v0.9.9 {{{
- *
- * jQuery Image Cropping Plugin - released under MIT License 
- * Author: Kelly Hallman <khallman@gmail.com>
- * http://github.com/tapmodo/Jcrop
- *
- * }}}
- * Copyright (c) 2008-2012 Tapmodo Interactive LLC {{{
- *
- * 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.
- *
- * }}}
- */
-
-(function ($) {
-
-  $.Jcrop = function (obj, opt) {
-    var options = $.extend({}, $.Jcrop.defaults),
-        docOffset, lastcurs, ie6mode = false;
-
-    // Internal Methods {{{
-    function px(n) {
-      return parseInt(n, 10) + 'px';
-    }
-    function cssClass(cl) {
-      return options.baseClass + '-' + cl;
-    }
-    function supportsColorFade() {
-      return $.fx.step.hasOwnProperty('backgroundColor');
-    }
-    function getPos(obj) //{{{
-    {
-      var pos = $(obj).offset();
-      return [pos.left, pos.top];
-    }
-    //}}}
-    function mouseAbs(e) //{{{
-    {
-      return [(e.pageX - docOffset[0]), (e.pageY - docOffset[1])];
-    }
-    //}}}
-    function setOptions(opt) //{{{
-    {
-      if (typeof(opt) !== 'object') opt = {};
-      options = $.extend(options, opt);
-
-      $.each(['onChange','onSelect','onRelease','onDblClick'],function(i,e) {
-        if (typeof(options[e]) !== 'function') options[e] = function () {};
-      });
-    }
-    //}}}
-    function startDragMode(mode, pos) //{{{
-    {
-      docOffset = getPos($img);
-      Tracker.setCursor(mode === 'move' ? mode : mode + '-resize');
-
-      if (mode === 'move') {
-        return Tracker.activateHandlers(createMover(pos), doneSelect);
-      }
-
-      var fc = Coords.getFixed();
-      var opp = oppLockCorner(mode);
-      var opc = Coords.getCorner(oppLockCorner(opp));
-
-      Coords.setPressed(Coords.getCorner(opp));
-      Coords.setCurrent(opc);
-
-      Tracker.activateHandlers(dragmodeHandler(mode, fc), doneSelect);
-    }
-    //}}}
-    function dragmodeHandler(mode, f) //{{{
-    {
-      return function (pos) {
-        if (!options.aspectRatio) {
-          switch (mode) {
-          case 'e':
-            pos[1] = f.y2;
-            break;
-          case 'w':
-            pos[1] = f.y2;
-            break;
-          case 'n':
-            pos[0] = f.x2;
-            break;
-          case 's':
-            pos[0] = f.x2;
-            break;
-          }
-        } else {
-          switch (mode) {
-          case 'e':
-            pos[1] = f.y + 1;
-            break;
-          case 'w':
-            pos[1] = f.y + 1;
-            break;
-          case 'n':
-            pos[0] = f.x + 1;
-            break;
-          case 's':
-            pos[0] = f.x + 1;
-            break;
-          }
-        }
-        Coords.setCurrent(pos);
-        Selection.update();
-      };
-    }
-    //}}}
-    function createMover(pos) //{{{
-    {
-      var lloc = pos;
-      KeyManager.watchKeys();
-
-      return function (pos) {
-        Coords.moveOffset([pos[0] - lloc[0], pos[1] - lloc[1]]);
-        lloc = pos;
-
-        Selection.update();
-      };
-    }
-    //}}}
-    function oppLockCorner(ord) //{{{
-    {
-      switch (ord) {
-      case 'n':
-        return 'sw';
-      case 's':
-        return 'nw';
-      case 'e':
-        return 'nw';
-      case 'w':
-        return 'ne';
-      case 'ne':
-        return 'sw';
-      case 'nw':
-        return 'se';
-      case 'se':
-        return 'nw';
-      case 'sw':
-        return 'ne';
-      }
-    }
-    //}}}
-    function createDragger(ord) //{{{
-    {
-      return function (e) {
-        if (options.disabled) {
-          return false;
-        }
-        if ((ord === 'move') && !options.allowMove) {
-          return false;
-        }
-        
-        // Fix position of crop area when dragged the very first time.
-        // Necessary when crop image is in a hidden element when page is loaded.
-        docOffset = getPos($img);
-
-        btndown = true;
-        startDragMode(ord, mouseAbs(e));
-        e.stopPropagation();
-        e.preventDefault();
-        return false;
-      };
-    }
-    //}}}
-    function presize($obj, w, h) //{{{
-    {
-      var nw = $obj.width(),
-          nh = $obj.height();
-      if ((nw > w) && w > 0) {
-        nw = w;
-        nh = (w / $obj.width()) * $obj.height();
-      }
-      if ((nh > h) && h > 0) {
-        nh = h;
-        nw = (h / $obj.height()) * $obj.width();
-      }
-      xscale = $obj.width() / nw;
-      yscale = $obj.height() / nh;
-      $obj.width(nw).height(nh);
-    }
-    //}}}
-    function unscale(c) //{{{
-    {
-      return {
-        x: parseInt(c.x * xscale, 10),
-        y: parseInt(c.y * yscale, 10),
-        x2: parseInt(c.x2 * xscale, 10),
-        y2: parseInt(c.y2 * yscale, 10),
-        w: parseInt(c.w * xscale, 10),
-        h: parseInt(c.h * yscale, 10)
-      };
-    }
-    //}}}
-    function doneSelect(pos) //{{{
-    {
-      var c = Coords.getFixed();
-      if ((c.w > options.minSelect[0]) && (c.h > options.minSelect[1])) {
-        Selection.enableHandles();
-        Selection.done();
-      } else {
-        Selection.release();
-      }
-      Tracker.setCursor(options.allowSelect ? 'crosshair' : 'default');
-    }
-    //}}}
-    function newSelection(e) //{{{
-    {
-      if (options.disabled) {
-        return false;
-      }
-      if (!options.allowSelect) {
-        return false;
-      }
-      btndown = true;
-      docOffset = getPos($img);
-      Selection.disableHandles();
-      Tracker.setCursor('crosshair');
-      var pos = mouseAbs(e);
-      Coords.setPressed(pos);
-      Selection.update();
-      Tracker.activateHandlers(selectDrag, doneSelect);
-      KeyManager.watchKeys();
-
-      e.stopPropagation();
-      e.preventDefault();
-      return false;
-    }
-    //}}}
-    function selectDrag(pos) //{{{
-    {
-      Coords.setCurrent(pos);
-      Selection.update();
-    }
-    //}}}
-    function newTracker() //{{{
-    {
-      var trk = $('<div></div>').addClass(cssClass('tracker'));
-      if ($.browser.msie) {
-        trk.css({
-          opacity: 0,
-          backgroundColor: 'white'
-        });
-      }
-      return trk;
-    }
-    //}}}
-
-    // }}}
-    // Initialization {{{
-    // Sanitize some options {{{
-    if ($.browser.msie && ($.browser.version.split('.')[0] === '6')) {
-      ie6mode = true;
-    }
-    if (typeof(obj) !== 'object') {
-      obj = $(obj)[0];
-    }
-    if (typeof(opt) !== 'object') {
-      opt = {};
-    }
-    // }}}
-    setOptions(opt);
-    // Initialize some jQuery objects {{{
-    // The values are SET on the image(s) for the interface
-    // If the original image has any of these set, they will be reset
-    // However, if you destroy() the Jcrop instance the original image's
-    // character in the DOM will be as you left it.
-    var img_css = {
-      border: 'none',
-      visibility: 'visible',
-      margin: 0,
-      padding: 0,
-      position: 'absolute',
-      top: 0,
-      left: 0
-    };
-
-    var $origimg = $(obj),
-      img_mode = true;
-
-    if (obj.tagName == 'IMG') {
-      // Fix size of crop image.
-      // Necessary when crop image is within a hidden element when page is loaded.
-      if ($origimg[0].width != 0 && $origimg[0].height != 0) {
-        // Obtain dimensions from contained img element.
-        $origimg.width($origimg[0].width);
-        $origimg.height($origimg[0].height);
-      } else {
-        // Obtain dimensions from temporary image in case the original is not loaded yet (e.g. IE 7.0). 
-        var tempImage = new Image();
-        tempImage.src = $origimg[0].src;
-        $origimg.width(tempImage.width);
-        $origimg.height(tempImage.height);
-      } 
-
-      var $img = $origimg.clone().removeAttr('id').css(img_css).show();
-
-      $img.width($origimg.width());
-      $img.height($origimg.height());
-      $origimg.after($img).hide();
-
-    } else {
-      $img = $origimg.css(img_css).show();
-      img_mode = false;
-      if (options.shade === null) { options.shade = true; }
-    }
-
-    presize($img, options.boxWidth, options.boxHeight);
-
-    var boundx = $img.width(),
-        boundy = $img.height(),
-        
-        
-        $div = $('<div />').width(boundx).height(boundy).addClass(cssClass('holder')).css({
-        position: 'relative',
-        backgroundColor: options.bgColor
-      }).insertAfter($origimg).append($img);
-
-    if (options.addClass) {
-      $div.addClass(options.addClass);
-    }
-
-    var $img2 = $('<div />'),
-
-        $img_holder = $('<div />') 
-        .width('100%').height('100%').css({
-          zIndex: 310,
-          position: 'absolute',
-          overflow: 'hidden'
-        }),
-
-        $hdl_holder = $('<div />') 
-        .width('100%').height('100%').css('zIndex', 320), 
-
-        $sel = $('<div />') 
-        .css({
-          position: 'absolute',
-          zIndex: 600
-        }).dblclick(function(){
-          var c = Coords.getFixed();
-          options.onDblClick.call(api,c);
-        }).insertBefore($img).append($img_holder, $hdl_holder); 
-
-    if (img_mode) {
-
-      $img2 = $('<img />')
-          .attr('src', $img.attr('src')).css(img_css).width(boundx).height(boundy),
-
-      $img_holder.append($img2);
-
-    }
-
-    if (ie6mode) {
-      $sel.css({
-        overflowY: 'hidden'
-      });
-    }
-
-    var bound = options.boundary;
-    var $trk = newTracker().width(boundx + (bound * 2)).height(boundy + (bound * 2)).css({
-      position: 'absolute',
-      top: px(-bound),
-      left: px(-bound),
-      zIndex: 290
-    }).mousedown(newSelection);
-
-    /* }}} */
-    // Set more variables {{{
-    var bgcolor = options.bgColor,
-        bgopacity = options.bgOpacity,
-        xlimit, ylimit, xmin, ymin, xscale, yscale, enabled = true,
-        btndown, animating, shift_down;
-
-    docOffset = getPos($img);
-    // }}}
-    // }}}
-    // Internal Modules {{{
-    // Touch Module {{{ 
-    var Touch = (function () {
-      // Touch support detection function adapted (under MIT License)
-      // from code by Jeffrey Sambells - http://github.com/iamamused/
-      function hasTouchSupport() {
-        var support = {},
-            events = ['touchstart', 'touchmove', 'touchend'],
-            el = document.createElement('div'), i;
-
-        try {
-          for(i=0; i<events.length; i++) {
-            var eventName = events[i];
-            eventName = 'on' + eventName;
-            var isSupported = (eventName in el);
-            if (!isSupported) {
-              el.setAttribute(eventName, 'return;');
-              isSupported = typeof el[eventName] == 'function';
-            }
-            support[events[i]] = isSupported;
-          }
-          return support.touchstart && support.touchend && support.touchmove;
-        }
-        catch(err) {
-          return false;
-        }
-      }
-
-      function detectSupport() {
-        if ((options.touchSupport === true) || (options.touchSupport === false)) return options.touchSupport;
-          else return hasTouchSupport();
-      }
-      return {
-        createDragger: function (ord) {
-          return function (e) {
-            e.pageX = e.originalEvent.changedTouches[0].pageX;
-            e.pageY = e.originalEvent.changedTouches[0].pageY;
-            if (options.disabled) {
-              return false;
-            }
-            if ((ord === 'move') && !options.allowMove) {
-              return false;
-            }
-            btndown = true;
-            startDragMode(ord, mouseAbs(e));
-            e.stopPropagation();
-            e.preventDefault();
-            return false;
-          };
-        },
-        newSelection: function (e) {
-          e.pageX = e.originalEvent.changedTouches[0].pageX;
-          e.pageY = e.originalEvent.changedTouches[0].pageY;
-          return newSelection(e);
-        },
-        isSupported: hasTouchSupport,
-        support: detectSupport()
-      };
-    }());
-    // }}}
-    // Coords Module {{{
-    var Coords = (function () {
-      var x1 = 0,
-          y1 = 0,
-          x2 = 0,
-          y2 = 0,
-          ox, oy;
-
-      function setPressed(pos) //{{{
-      {
-        pos = rebound(pos);
-        x2 = x1 = pos[0];
-        y2 = y1 = pos[1];
-      }
-      //}}}
-      function setCurrent(pos) //{{{
-      {
-        pos = rebound(pos);
-        ox = pos[0] - x2;
-        oy = pos[1] - y2;
-        x2 = pos[0];
-        y2 = pos[1];
-      }
-      //}}}
-      function getOffset() //{{{
-      {
-        return [ox, oy];
-      }
-      //}}}
-      function moveOffset(offset) //{{{
-      {
-        var ox = offset[0],
-            oy = offset[1];
-
-        if (0 > x1 + ox) {
-          ox -= ox + x1;
-        }
-        if (0 > y1 + oy) {
-          oy -= oy + y1;
-        }
-
-        if (boundy < y2 + oy) {
-          oy += boundy - (y2 + oy);
-        }
-        if (boundx < x2 + ox) {
-          ox += boundx - (x2 + ox);
-        }
-
-        x1 += ox;
-        x2 += ox;
-        y1 += oy;
-        y2 += oy;
-      }
-      //}}}
-      function getCorner(ord) //{{{
-      {
-        var c = getFixed();
-        switch (ord) {
-        case 'ne':
-          return [c.x2, c.y];
-        case 'nw':
-          return [c.x, c.y];
-        case 'se':
-          return [c.x2, c.y2];
-        case 'sw':
-          return [c.x, c.y2];
-        }
-      }
-      //}}}
-      function getFixed() //{{{
-      {
-        if (!options.aspectRatio) {
-          return getRect();
-        }
-        // This function could use some optimization I think...
-        var aspect = options.aspectRatio,
-            min_x = options.minSize[0] / xscale,
-            
-            
-            //min_y = options.minSize[1]/yscale,
-            max_x = options.maxSize[0] / xscale,
-            max_y = options.maxSize[1] / yscale,
-            rw = x2 - x1,
-            rh = y2 - y1,
-            rwa = Math.abs(rw),
-            rha = Math.abs(rh),
-            real_ratio = rwa / rha,
-            xx, yy, w, h;
-
-        if (max_x === 0) {
-          max_x = boundx * 10;
-        }
-        if (max_y === 0) {
-          max_y = boundy * 10;
-        }
-        if (real_ratio < aspect) {
-          yy = y2;
-          w = rha * aspect;
-          xx = rw < 0 ? x1 - w : w + x1;
-
-          if (xx < 0) {
-            xx = 0;
-            h = Math.abs((xx - x1) / aspect);
-            yy = rh < 0 ? y1 - h : h + y1;
-          } else if (xx > boundx) {
-            xx = boundx;
-            h = Math.abs((xx - x1) / aspect);
-            yy = rh < 0 ? y1 - h : h + y1;
-          }
-        } else {
-          xx = x2;
-          h = rwa / aspect;
-          yy = rh < 0 ? y1 - h : y1 + h;
-          if (yy < 0) {
-            yy = 0;
-            w = Math.abs((yy - y1) * aspect);
-            xx = rw < 0 ? x1 - w : w + x1;
-          } else if (yy > boundy) {
-            yy = boundy;
-            w = Math.abs(yy - y1) * aspect;
-            xx = rw < 0 ? x1 - w : w + x1;
-          }
-        }
-
-        // Magic %-)
-        if (xx > x1) { // right side
-          if (xx - x1 < min_x) {
-            xx = x1 + min_x;
-          } else if (xx - x1 > max_x) {
-            xx = x1 + max_x;
-          }
-          if (yy > y1) {
-            yy = y1 + (xx - x1) / aspect;
-          } else {
-            yy = y1 - (xx - x1) / aspect;
-          }
-        } else if (xx < x1) { // left side
-          if (x1 - xx < min_x) {
-            xx = x1 - min_x;
-          } else if (x1 - xx > max_x) {
-            xx = x1 - max_x;
-          }
-          if (yy > y1) {
-            yy = y1 + (x1 - xx) / aspect;
-          } else {
-            yy = y1 - (x1 - xx) / aspect;
-          }
-        }
-
-        if (xx < 0) {
-          x1 -= xx;
-          xx = 0;
-        } else if (xx > boundx) {
-          x1 -= xx - boundx;
-          xx = boundx;
-        }
-
-        if (yy < 0) {
-          y1 -= yy;
-          yy = 0;
-        } else if (yy > boundy) {
-          y1 -= yy - boundy;
-          yy = boundy;
-        }
-
-        return makeObj(flipCoords(x1, y1, xx, yy));
-      }
-      //}}}
-      function rebound(p) //{{{
-      {
-        if (p[0] < 0) {
-          p[0] = 0;
-        }
-        if (p[1] < 0) {
-          p[1] = 0;
-        }
-
-        if (p[0] > boundx) {
-          p[0] = boundx;
-        }
-        if (p[1] > boundy) {
-          p[1] = boundy;
-        }
-
-        return [p[0], p[1]];
-      }
-      //}}}
-      function flipCoords(x1, y1, x2, y2) //{{{
-      {
-        var xa = x1,
-            xb = x2,
-            ya = y1,
-            yb = y2;
-        if (x2 < x1) {
-          xa = x2;
-          xb = x1;
-        }
-        if (y2 < y1) {
-          ya = y2;
-          yb = y1;
-        }
-        return [Math.round(xa), Math.round(ya), Math.round(xb), Math.round(yb)];
-      }
-      //}}}
-      function getRect() //{{{
-      {
-        var xsize = x2 - x1,
-            ysize = y2 - y1,
-            delta;
-
-        if (xlimit && (Math.abs(xsize) > xlimit)) {
-          x2 = (xsize > 0) ? (x1 + xlimit) : (x1 - xlimit);
-        }
-        if (ylimit && (Math.abs(ysize) > ylimit)) {
-          y2 = (ysize > 0) ? (y1 + ylimit) : (y1 - ylimit);
-        }
-
-        if (ymin / yscale && (Math.abs(ysize) < ymin / yscale)) {
-          y2 = (ysize > 0) ? (y1 + ymin / yscale) : (y1 - ymin / yscale);
-        }
-        if (xmin / xscale && (Math.abs(xsize) < xmin / xscale)) {
-          x2 = (xsize > 0) ? (x1 + xmin / xscale) : (x1 - xmin / xscale);
-        }
-
-        if (x1 < 0) {
-          x2 -= x1;
-          x1 -= x1;
-        }
-        if (y1 < 0) {
-          y2 -= y1;
-          y1 -= y1;
-        }
-        if (x2 < 0) {
-          x1 -= x2;
-          x2 -= x2;
-        }
-        if (y2 < 0) {
-          y1 -= y2;
-          y2 -= y2;
-        }
-        if (x2 > boundx) {
-          delta = x2 - boundx;
-          x1 -= delta;
-          x2 -= delta;
-        }
-        if (y2 > boundy) {
-          delta = y2 - boundy;
-          y1 -= delta;
-          y2 -= delta;
-        }
-        if (x1 > boundx) {
-          delta = x1 - boundy;
-          y2 -= delta;
-          y1 -= delta;
-        }
-        if (y1 > boundy) {
-          delta = y1 - boundy;
-          y2 -= delta;
-          y1 -= delta;
-        }
-
-        return makeObj(flipCoords(x1, y1, x2, y2));
-      }
-      //}}}
-      function makeObj(a) //{{{
-      {
-        return {
-          x: a[0],
-          y: a[1],
-          x2: a[2],
-          y2: a[3],
-          w: a[2] - a[0],
-          h: a[3] - a[1]
-        };
-      }
-      //}}}
-
-      return {
-        flipCoords: flipCoords,
-        setPressed: setPressed,
-        setCurrent: setCurrent,
-        getOffset: getOffset,
-        moveOffset: moveOffset,
-        getCorner: getCorner,
-        getFixed: getFixed
-      };
-    }());
-
-    //}}}
-    // Shade Module {{{
-    var Shade = (function() {
-      var enabled = false,
-          holder = $('<div />').css({
-            position: 'absolute',
-            zIndex: 240,
-            opacity: 0
-          }),
-          shades = {
-            top: createShade(),
-            left: createShade().height(boundy),
-            right: createShade().height(boundy),
-            bottom: createShade()
-          };
-
-      function resizeShades(w,h) {
-        shades.left.css({ height: px(h) });
-        shades.right.css({ height: px(h) });
-      }
-      function updateAuto()
-      {
-        return updateShade(Coords.getFixed());
-      }
-      function updateShade(c)
-      {
-        shades.top.css({
-          left: px(c.x),
-          width: px(c.w),
-          height: px(c.y)
-        });
-        shades.bottom.css({
-          top: px(c.y2),
-          left: px(c.x),
-          width: px(c.w),
-          height: px(boundy-c.y2)
-        });
-        shades.right.css({
-          left: px(c.x2),
-          width: px(boundx-c.x2)
-        });
-        shades.left.css({
-          width: px(c.x)
-        });
-      }
-      function createShade() {
-        return $('<div />').css({
-          position: 'absolute',
-          backgroundColor: options.shadeColor||options.bgColor
-        }).appendTo(holder);
-      }
-      function enableShade() {
-        if (!enabled) {
-          enabled = true;
-          holder.insertBefore($img);
-          updateAuto();
-          Selection.setBgOpacity(1,0,1);
-          $img2.hide();
-
-          setBgColor(options.shadeColor||options.bgColor,1);
-          if (Selection.isAwake())
-          {
-            setOpacity(options.bgOpacity,1);
-          }
-            else setOpacity(1,1);
-        }
-      }
-      function setBgColor(color,now) {
-        colorChangeMacro(getShades(),color,now);
-      }
-      function disableShade() {
-        if (enabled) {
-          holder.remove();
-          $img2.show();
-          enabled = false;
-          if (Selection.isAwake()) {
-            Selection.setBgOpacity(options.bgOpacity,1,1);
-          } else {
-            Selection.setBgOpacity(1,1,1);
-            Selection.disableHandles();
-          }
-          colorChangeMacro($div,0,1);
-        }
-      }
-      function setOpacity(opacity,now) {
-        if (enabled) {
-          if (options.bgFade && !now) {
-            holder.animate({
-              opacity: 1-opacity
-            },{
-              queue: false,
-              duration: options.fadeTime
-            });
-          }
-          else holder.css({opacity:1-opacity});
-        }
-      }
-      function refreshAll() {
-        options.shade ? enableShade() : disableShade();
-        if (Selection.isAwake()) setOpacity(options.bgOpacity);
-      }
-      function getShades() {
-        return holder.children();
-      }
-
-      return {
-        update: updateAuto,
-        updateRaw: updateShade,
-        getShades: getShades,
-        setBgColor: setBgColor,
-        enable: enableShade,
-        disable: disableShade,
-        resize: resizeShades,
-        refresh: refreshAll,
-        opacity: setOpacity
-      };
-    }());
-    // }}}
-    // Selection Module {{{
-    var Selection = (function () {
-      var awake, hdep = 370;
-      var borders = {};
-      var handle = {};
-      var seehandles = false;
-      var hhs = options.handleOffset;
-
-      // Private Methods
-      function insertBorder(type) //{{{
-      {
-        var jq = $('<div />').css({
-          position: 'absolute',
-          opacity: options.borderOpacity
-        }).addClass(cssClass(type));
-        $img_holder.append(jq);
-        return jq;
-      }
-      //}}}
-      function dragDiv(ord, zi) //{{{
-      {
-        var jq = $('<div />').mousedown(createDragger(ord)).css({
-          cursor: ord + '-resize',
-          position: 'absolute',
-          zIndex: zi
-        }).addClass('ord-'+ord);
-
-        if (Touch.support) {
-          jq.bind('touchstart.jcrop', Touch.createDragger(ord));
-        }
-
-        $hdl_holder.append(jq);
-        return jq;
-      }
-      //}}}
-      function insertHandle(ord) //{{{
-      {
-        var hs = options.handleSize;
-        return dragDiv(ord, hdep++).css({
-          top: px(-hhs + 1),
-          left: px(-hhs + 1),
-          opacity: options.handleOpacity
-        }).width(hs).height(hs).addClass(cssClass('handle'));
-      }
-      //}}}
-      function insertDragbar(ord) //{{{
-      {
-        var s = options.handleSize,
-            h = s,
-            w = s,
-            t = hhs,
-            l = hhs;
-
-        switch (ord) {
-        case 'n':
-        case 's':
-          w = '100%';
-          break;
-        case 'e':
-        case 'w':
-          h = '100%';
-          break;
-        }
-
-        return dragDiv(ord, hdep++).width(w).height(h).css({
-          top: px(-t + 1),
-          left: px(-l + 1)
-        });
-      }
-      //}}}
-      function createHandles(li) //{{{
-      {
-        var i;
-        for (i = 0; i < li.length; i++) {
-          handle[li[i]] = insertHandle(li[i]);
-        }
-      }
-      //}}}
-      function moveHandles(c) //{{{
-      {
-        var midvert = Math.round((c.h / 2) - hhs),
-            midhoriz = Math.round((c.w / 2) - hhs),
-            north = -hhs + 1,
-            west = -hhs + 1,
-            east = c.w - hhs,
-            south = c.h - hhs,
-            x, y;
-
-        if (handle.e) {
-          handle.e.css({
-            top: px(midvert),
-            left: px(east)
-          });
-          handle.w.css({
-            top: px(midvert)
-          });
-          handle.s.css({
-            top: px(south),
-            left: px(midhoriz)
-          });
-          handle.n.css({
-            left: px(midhoriz)
-          });
-        }
-        if (handle.ne) {
-          handle.ne.css({
-            left: px(east)
-          });
-          handle.se.css({
-            top: px(south),
-            left: px(east)
-          });
-          handle.sw.css({
-            top: px(south)
-          });
-        }
-        if (handle.b) {
-          handle.b.css({
-            top: px(south)
-          });
-          handle.r.css({
-            left: px(east)
-          });
-        }
-      }
-      //}}}
-      function moveto(x, y) //{{{
-      {
-        if (!options.shade) {
-          $img2.css({
-            top: px(-y),
-            left: px(-x)
-          });
-        }
-        $sel.css({
-          top: px(y),
-          left: px(x)
-        });
-      }
-      //}}}
-      function resize(w, h) //{{{
-      {
-        $sel.width(w).height(h);
-      }
-      //}}}
-      function refresh() //{{{
-      {
-        var c = Coords.getFixed();
-
-        Coords.setPressed([c.x, c.y]);
-        Coords.setCurrent([c.x2, c.y2]);
-
-        updateVisible();
-      }
-      //}}}
-
-      // Internal Methods
-      function updateVisible(select) //{{{
-      {
-        if (awake) {
-          return update(select);
-        }
-      }
-      //}}}
-      function update(select) //{{{
-      {
-        var c = Coords.getFixed();
-
-        resize(c.w, c.h);
-        moveto(c.x, c.y);
-        if (options.shade) Shade.updateRaw(c);
-
-        if (seehandles) {
-          moveHandles(c);
-        }
-        if (!awake) {
-          show();
-        }
-
-        if (select) {
-          options.onSelect.call(api, unscale(c));
-        } else {
-          options.onChange.call(api, unscale(c));
-        }
-      }
-      //}}}
-      function setBgOpacity(opacity,force,now)
-      {
-        if (!awake && !force) return;
-        if (options.bgFade && !now) {
-          $img.animate({
-            opacity: opacity
-          },{
-            queue: false,
-            duration: options.fadeTime
-          });
-        } else {
-          $img.css('opacity', opacity);
-        }
-      }
-      function show() //{{{
-      {
-        $sel.show();
-
-        if (options.shade) Shade.opacity(bgopacity);
-          else setBgOpacity(bgopacity,true);
-
-        awake = true;
-      }
-      //}}}
-      function release() //{{{
-      {
-        disableHandles();
-        $sel.hide();
-
-        if (options.shade) Shade.opacity(1);
-          else setBgOpacity(1);
-
-        awake = false;
-        options.onRelease.call(api);
-      }
-      //}}}
-      function showHandles() //{{{
-      {
-        if (seehandles) {
-          moveHandles(Coords.getFixed());
-          $hdl_holder.show();
-        }
-      }
-      //}}}
-      function enableHandles() //{{{
-      {
-        seehandles = true;
-        if (options.allowResize) {
-          moveHandles(Coords.getFixed());
-          $hdl_holder.show();
-          return true;
-        }
-      }
-      //}}}
-      function disableHandles() //{{{
-      {
-        seehandles = false;
-        $hdl_holder.hide();
-      } 
-      //}}}
-      function animMode(v) //{{{
-      {
-        if (animating === v) {
-          disableHandles();
-        } else {
-          enableHandles();
-        }
-      } 
-      //}}}
-      function done() //{{{
-      {
-        animMode(false);
-        refresh();
-      } 
-      //}}}
-      /* Insert draggable elements {{{*/
-
-      // Insert border divs for outline
-      if (options.drawBorders) {
-        borders = {
-          top: insertBorder('hline'),
-          bottom: insertBorder('hline bottom'),
-          left: insertBorder('vline'),
-          right: insertBorder('vline right')
-        };
-      }
-
-      // Insert handles on edges
-      if (options.dragEdges) {
-        handle.t = insertDragbar('n');
-        handle.b = insertDragbar('s');
-        handle.r = insertDragbar('e');
-        handle.l = insertDragbar('w');
-      }
-
-      // Insert side and corner handles
-      if (options.sideHandles) {
-        createHandles(['n', 's', 'e', 'w']);
-      }
-      if (options.cornerHandles) {
-        createHandles(['sw', 'nw', 'ne', 'se']);
-      }
-      //}}}
-
-      // This is a hack for iOS5 to support drag/move touch functionality
-      $(document).bind('touchstart.jcrop-ios',function(e) {
-        if ($(e.currentTarget).hasClass('jcrop-tracker')) e.stopPropagation();
-      });
-
-      var $track = newTracker().mousedown(createDragger('move')).css({
-        cursor: 'move',
-        position: 'absolute',
-        zIndex: 360
-      });
-
-      if (Touch.support) {
-        $track.bind('touchstart.jcrop', Touch.createDragger('move'));
-      }
-
-      $img_holder.append($track);
-      disableHandles();
-
-      return {
-        updateVisible: updateVisible,
-        update: update,
-        release: release,
-        refresh: refresh,
-        isAwake: function () {
-          return awake;
-        },
-        setCursor: function (cursor) {
-          $track.css('cursor', cursor);
-        },
-        enableHandles: enableHandles,
-        enableOnly: function () {
-          seehandles = true;
-        },
-        showHandles: showHandles,
-        disableHandles: disableHandles,
-        animMode: animMode,
-        setBgOpacity: setBgOpacity,
-        done: done
-      };
-    }());
-    
-    //}}}
-    // Tracker Module {{{
-    var Tracker = (function () {
-      var onMove = function () {},
-          onDone = function () {},
-          trackDoc = options.trackDocument;
-
-      function toFront() //{{{
-      {
-        $trk.css({
-          zIndex: 450
-        });
-        if (Touch.support) {
-          $(document)
-            .bind('touchmove.jcrop', trackTouchMove)
-            .bind('touchend.jcrop', trackTouchEnd);
-        }
-        if (trackDoc) {
-          $(document)
-            .bind('mousemove.jcrop',trackMove)
-            .bind('mouseup.jcrop',trackUp);
-        }
-      } 
-      //}}}
-      function toBack() //{{{
-      {
-        $trk.css({
-          zIndex: 290
-        });
-        $(document).unbind('.jcrop');
-      } 
-      //}}}
-      function trackMove(e) //{{{
-      {
-        onMove(mouseAbs(e));
-        return false;
-      } 
-      //}}}
-      function trackUp(e) //{{{
-      {
-        e.preventDefault();
-        e.stopPropagation();
-
-        if (btndown) {
-          btndown = false;
-
-          onDone(mouseAbs(e));
-
-          if (Selection.isAwake()) {
-            options.onSelect.call(api, unscale(Coords.getFixed()));
-          }
-
-          toBack();
-          onMove = function () {};
-          onDone = function () {};
-        }
-
-        return false;
-      }
-      //}}}
-      function activateHandlers(move, done) //{{{
-      {
-        btndown = true;
-        onMove = move;
-        onDone = done;
-        toFront();
-        return false;
-      }
-      //}}}
-      function trackTouchMove(e) //{{{
-      {
-        e.pageX = e.originalEvent.changedTouches[0].pageX;
-        e.pageY = e.originalEvent.changedTouches[0].pageY;
-        return trackMove(e);
-      }
-      //}}}
-      function trackTouchEnd(e) //{{{
-      {
-        e.pageX = e.originalEvent.changedTouches[0].pageX;
-        e.pageY = e.originalEvent.changedTouches[0].pageY;
-        return trackUp(e);
-      }
-      //}}}
-      function setCursor(t) //{{{
-      {
-        $trk.css('cursor', t);
-      }
-      //}}}
-
-      if (!trackDoc) {
-        $trk.mousemove(trackMove).mouseup(trackUp).mouseout(trackUp);
-      }
-
-      $img.before($trk);
-      return {
-        activateHandlers: activateHandlers,
-        setCursor: setCursor
-      };
-    }());
-    //}}}
-    // KeyManager Module {{{
-    var KeyManager = (function () {
-      var $keymgr = $('<input type="radio" />').css({
-        position: 'fixed',
-        left: '-120px',
-        width: '12px'
-      }),
-          $keywrap = $('<div />').css({
-          position: 'absolute',
-          overflow: 'hidden'
-        }).append($keymgr);
-
-      function watchKeys() //{{{
-      {
-        if (options.keySupport) {
-          $keymgr.show();
-          $keymgr.focus();
-        }
-      }
-      //}}}
-      function onBlur(e) //{{{
-      {
-        $keymgr.hide();
-      }
-      //}}}
-      function doNudge(e, x, y) //{{{
-      {
-        if (options.allowMove) {
-          Coords.moveOffset([x, y]);
-          Selection.updateVisible(true);
-        }
-        e.preventDefault();
-        e.stopPropagation();
-      }
-      //}}}
-      function parseKey(e) //{{{
-      {
-        if (e.ctrlKey || e.metaKey) {
-          return true;
-        }
-        shift_down = e.shiftKey ? true : false;
-        var nudge = shift_down ? 10 : 1;
-
-        switch (e.keyCode) {
-        case 37:
-          doNudge(e, -nudge, 0);
-          break;
-        case 39:
-          doNudge(e, nudge, 0);
-          break;
-        case 38:
-          doNudge(e, 0, -nudge);
-          break;
-        case 40:
-          doNudge(e, 0, nudge);
-          break;
-        case 27:
-          if (options.allowSelect) Selection.release();
-          break;
-        case 9:
-          return true;
-        }
-
-        return false;
-      }
-      //}}}
-
-      if (options.keySupport) {
-        $keymgr.keydown(parseKey).blur(onBlur);
-        if (ie6mode || !options.fixedSupport) {
-          $keymgr.css({
-            position: 'absolute',
-            left: '-20px'
-          });
-          $keywrap.append($keymgr).insertBefore($img);
-        } else {
-          $keymgr.insertBefore($img);
-        }
-      }
-
-
-      return {
-        watchKeys: watchKeys
-      };
-    }());
-    //}}}
-    // }}}
-    // API methods {{{
-    function setClass(cname) //{{{
-    {
-      $div.removeClass().addClass(cssClass('holder')).addClass(cname);
-    }
-    //}}}
-    function animateTo(a, callback) //{{{
-    {
-      var x1 = parseInt(a[0], 10) / xscale,
-          y1 = parseInt(a[1], 10) / yscale,
-          x2 = parseInt(a[2], 10) / xscale,
-          y2 = parseInt(a[3], 10) / yscale;
-
-      if (animating) {
-        return;
-      }
-
-      var animto = Coords.flipCoords(x1, y1, x2, y2),
-          c = Coords.getFixed(),
-          initcr = [c.x, c.y, c.x2, c.y2],
-          animat = initcr,
-          interv = options.animationDelay,
-          ix1 = animto[0] - initcr[0],
-          iy1 = animto[1] - initcr[1],
-          ix2 = animto[2] - initcr[2],
-          iy2 = animto[3] - initcr[3],
-          pcent = 0,
-          velocity = options.swingSpeed;
-
-      x = animat[0];
-      y = animat[1];
-      x2 = animat[2];
-      y2 = animat[3];
-
-      Selection.animMode(true);
-      var anim_timer;
-
-      function queueAnimator() {
-        window.setTimeout(animator, interv);
-      }
-      var animator = (function () {
-        return function () {
-          pcent += (100 - pcent) / velocity;
-
-          animat[0] = x + ((pcent / 100) * ix1);
-          animat[1] = y + ((pcent / 100) * iy1);
-          animat[2] = x2 + ((pcent / 100) * ix2);
-          animat[3] = y2 + ((pcent / 100) * iy2);
-
-          if (pcent >= 99.8) {
-            pcent = 100;
-          }
-          if (pcent < 100) {
-            setSelectRaw(animat);
-            queueAnimator();
-          } else {
-            Selection.done();
-            if (typeof(callback) === 'function') {
-              callback.call(api);
-            }
-          }
-        };
-      }());
-      queueAnimator();
-    }
-    //}}}
-    function setSelect(rect) //{{{
-    {
-      setSelectRaw([parseInt(rect[0], 10) / xscale, parseInt(rect[1], 10) / yscale, parseInt(rect[2], 10) / xscale, parseInt(rect[3], 10) / yscale]);
-      options.onSelect.call(api, unscale(Coords.getFixed()));
-      Selection.enableHandles();
-    }
-    //}}}
-    function setSelectRaw(l) //{{{
-    {
-      Coords.setPressed([l[0], l[1]]);
-      Coords.setCurrent([l[2], l[3]]);
-      Selection.update();
-    }
-    //}}}
-    function tellSelect() //{{{
-    {
-      return unscale(Coords.getFixed());
-    }
-    //}}}
-    function tellScaled() //{{{
-    {
-      return Coords.getFixed();
-    }
-    //}}}
-    function setOptionsNew(opt) //{{{
-    {
-      setOptions(opt);
-      interfaceUpdate();
-    }
-    //}}}
-    function disableCrop() //{{{
-    {
-      options.disabled = true;
-      Selection.disableHandles();
-      Selection.setCursor('default');
-      Tracker.setCursor('default');
-    }
-    //}}}
-    function enableCrop() //{{{
-    {
-      options.disabled = false;
-      interfaceUpdate();
-    }
-    //}}}
-    function cancelCrop() //{{{
-    {
-      Selection.done();
-      Tracker.activateHandlers(null, null);
-    }
-    //}}}
-    function destroy() //{{{
-    {
-      $div.remove();
-      $origimg.show();
-      $(obj).removeData('Jcrop');
-    }
-    //}}}
-    function setImage(src, callback) //{{{
-    {
-      Selection.release();
-      disableCrop();
-      var img = new Image();
-      img.onload = function () {
-        var iw = img.width;
-        var ih = img.height;
-        var bw = options.boxWidth;
-        var bh = options.boxHeight;
-        $img.width(iw).height(ih);
-        $img.attr('src', src);
-        $img2.attr('src', src);
-        presize($img, bw, bh);
-        boundx = $img.width();
-        boundy = $img.height();
-        $img2.width(boundx).height(boundy);
-        $trk.width(boundx + (bound * 2)).height(boundy + (bound * 2));
-        $div.width(boundx).height(boundy);
-        Shade.resize(boundx,boundy);
-        enableCrop();
-
-        if (typeof(callback) === 'function') {
-          callback.call(api);
-        }
-      };
-      img.src = src;
-    }
-    //}}}
-    function colorChangeMacro($obj,color,now) {
-      var mycolor = color || options.bgColor;
-      if (options.bgFade && supportsColorFade() && options.fadeTime && !now) {
-        $obj.animate({
-          backgroundColor: mycolor
-        }, {
-          queue: false,
-          duration: options.fadeTime
-        });
-      } else {
-        $obj.css('backgroundColor', mycolor);
-      }
-    }
-    function interfaceUpdate(alt) //{{{
-    // This method tweaks the interface based on options object.
-    // Called when options are changed and at end of initialization.
-    {
-      if (options.allowResize) {
-        if (alt) {
-          Selection.enableOnly();
-        } else {
-          Selection.enableHandles();
-        }
-      } else {
-        Selection.disableHandles();
-      }
-
-      Tracker.setCursor(options.allowSelect ? 'crosshair' : 'default');
-      Selection.setCursor(options.allowMove ? 'move' : 'default');
-
-      if (options.hasOwnProperty('trueSize')) {
-        xscale = options.trueSize[0] / boundx;
-        yscale = options.trueSize[1] / boundy;
-      }
-
-      if (options.hasOwnProperty('setSelect')) {
-        setSelect(options.setSelect);
-        Selection.done();
-        delete(options.setSelect);
-      }
-
-      Shade.refresh();
-
-      if (options.bgColor != bgcolor) {
-        colorChangeMacro(
-          options.shade? Shade.getShades(): $div,
-          options.shade?
-            (options.shadeColor || options.bgColor):
-            options.bgColor
-        );
-        bgcolor = options.bgColor;
-      }
-
-      if (bgopacity != options.bgOpacity) {
-        bgopacity = options.bgOpacity;
-        if (options.shade) Shade.refresh();
-          else Selection.setBgOpacity(bgopacity);
-      }
-
-      xlimit = options.maxSize[0] || 0;
-      ylimit = options.maxSize[1] || 0;
-      xmin = options.minSize[0] || 0;
-      ymin = options.minSize[1] || 0;
-
-      if (options.hasOwnProperty('outerImage')) {
-        $img.attr('src', options.outerImage);
-        delete(options.outerImage);
-      }
-
-      Selection.refresh();
-    }
-    //}}}
-    //}}}
-
-    if (Touch.support) $trk.bind('touchstart.jcrop', Touch.newSelection);
-
-    $hdl_holder.hide();
-    interfaceUpdate(true);
-
-    var api = {
-      setImage: setImage,
-      animateTo: animateTo,
-      setSelect: setSelect,
-      setOptions: setOptionsNew,
-      tellSelect: tellSelect,
-      tellScaled: tellScaled,
-      setClass: setClass,
-
-      disable: disableCrop,
-      enable: enableCrop,
-      cancel: cancelCrop,
-      release: Selection.release,
-      destroy: destroy,
-
-      focus: KeyManager.watchKeys,
-
-      getBounds: function () {
-        return [boundx * xscale, boundy * yscale];
-      },
-      getWidgetSize: function () {
-        return [boundx, boundy];
-      },
-      getScaleFactor: function () {
-        return [xscale, yscale];
-      },
-
-      ui: {
-        holder: $div,
-        selection: $sel
-      }
-    };
-
-    if ($.browser.msie) {
-      $div.bind('selectstart', function () {
-        return false;
-      });
-    }
-
-    $origimg.data('Jcrop', api);
-    return api;
-  };
-  $.fn.Jcrop = function (options, callback) //{{{
-  {
-    var api;
-    // Iterate over each object, attach Jcrop
-    this.each(function () {
-      // If we've already attached to this object
-      if ($(this).data('Jcrop')) {
-        // The API can be requested this way (undocumented)
-        if (options === 'api') return $(this).data('Jcrop');
-        // Otherwise, we just reset the options...
-        else $(this).data('Jcrop').setOptions(options);
-      }
-      // If we haven't been attached, preload and attach
-      else {
-        if (this.tagName == 'IMG')
-          $.Jcrop.Loader(this,function(){
-            $(this).css({display:'block',visibility:'hidden'});
-            api = $.Jcrop(this, options);
-            if ($.isFunction(callback)) callback.call(api);
-          });
-        else {
-          $(this).css({display:'block',visibility:'hidden'});
-          api = $.Jcrop(this, options);
-          if ($.isFunction(callback)) callback.call(api);
-        }
-      }
-    });
-
-    // Return "this" so the object is chainable (jQuery-style)
-    return this;
-  };
-  //}}}
-  // $.Jcrop.Loader - basic image loader {{{
-
-  $.Jcrop.Loader = function(imgobj,success,error){
-    var $img = $(imgobj), img = $img[0];
-
-    function completeCheck(){
-      if (img.complete) {
-        $img.unbind('.jcloader');
-        if ($.isFunction(success)) success.call(img);
-      }
-      else window.setTimeout(completeCheck,50);
-    }
-
-    $img
-      .bind('load.jcloader',completeCheck)
-      .bind('error.jcloader',function(e){
-        $img.unbind('.jcloader');
-        if ($.isFunction(error)) error.call(img);
-      });
-
-    if (img.complete && $.isFunction(success)){
-      $img.unbind('.jcloader');
-      success.call(img);
-    }
-  };
-
-  //}}}
-  // Global Defaults {{{
-  $.Jcrop.defaults = {
-
-    // Basic Settings
-    allowSelect: true,
-    allowMove: true,
-    allowResize: true,
-
-    trackDocument: true,
-
-    // Styling Options
-    baseClass: 'jcrop',
-    addClass: null,
-    bgColor: 'black',
-    bgOpacity: 0.6,
-    bgFade: false,
-    borderOpacity: 0.4,
-    handleOpacity: 0.5,
-    handleSize: 7,
-    handleOffset: 5,
-
-    aspectRatio: 0,
-    keySupport: true,
-    cornerHandles: true,
-    sideHandles: true,
-    drawBorders: true,
-    dragEdges: true,
-    fixedSupport: true,
-    touchSupport: null,
-
-    shade: null,
-
-    boxWidth: 0,
-    boxHeight: 0,
-    boundary: 2,
-    fadeTime: 400,
-    animationDelay: 20,
-    swingSpeed: 3,
-
-    minSelect: [0, 0],
-    maxSize: [0, 0],
-    minSize: [0, 0],
-
-    // Callbacks / Event Handlers
-    onChange: function () {},
-    onSelect: function () {},
-    onDblClick: function () {},
-    onRelease: function () {}
-  };
-
-  // }}}
-}(jQuery));
diff --git a/apps/contacts/js/jquery.Jcrop.min.js b/apps/contacts/js/jquery.Jcrop.min.js
deleted file mode 100644
index 0c05d67c22..0000000000
--- a/apps/contacts/js/jquery.Jcrop.min.js
+++ /dev/null
@@ -1,255 +0,0 @@
-/**
- * jquery.Jcrop.min.js v0.9.9 {{{ (build:20120102)
- * jQuery Image Cropping Plugin - released under MIT License
- * Copyright (c) 2008-2012 Tapmodo Interactive LLC
- * https://github.com/tapmodo/Jcrop
- */
-
-(function($){$.Jcrop=function(obj,opt){var options=$.extend({},$.Jcrop.defaults),docOffset,lastcurs,ie6mode=false;function px(n){return parseInt(n,10)+'px';}
-function cssClass(cl){return options.baseClass+'-'+cl;}
-function supportsColorFade(){return $.fx.step.hasOwnProperty('backgroundColor');}
-function getPos(obj)
-{var pos=$(obj).offset();return[pos.left,pos.top];}
-function mouseAbs(e)
-{return[(e.pageX-docOffset[0]),(e.pageY-docOffset[1])];}
-function setOptions(opt)
-{if(typeof(opt)!=='object')opt={};options=$.extend(options,opt);$.each(['onChange','onSelect','onRelease','onDblClick'],function(i,e){if(typeof(options[e])!=='function')options[e]=function(){};});}
-function startDragMode(mode,pos)
-{docOffset=getPos($img);Tracker.setCursor(mode==='move'?mode:mode+'-resize');if(mode==='move'){return Tracker.activateHandlers(createMover(pos),doneSelect);}
-var fc=Coords.getFixed();var opp=oppLockCorner(mode);var opc=Coords.getCorner(oppLockCorner(opp));Coords.setPressed(Coords.getCorner(opp));Coords.setCurrent(opc);Tracker.activateHandlers(dragmodeHandler(mode,fc),doneSelect);}
-function dragmodeHandler(mode,f)
-{return function(pos){if(!options.aspectRatio){switch(mode){case'e':pos[1]=f.y2;break;case'w':pos[1]=f.y2;break;case'n':pos[0]=f.x2;break;case's':pos[0]=f.x2;break;}}else{switch(mode){case'e':pos[1]=f.y+1;break;case'w':pos[1]=f.y+1;break;case'n':pos[0]=f.x+1;break;case's':pos[0]=f.x+1;break;}}
-Coords.setCurrent(pos);Selection.update();};}
-function createMover(pos)
-{var lloc=pos;KeyManager.watchKeys();return function(pos){Coords.moveOffset([pos[0]-lloc[0],pos[1]-lloc[1]]);lloc=pos;Selection.update();};}
-function oppLockCorner(ord)
-{switch(ord){case'n':return'sw';case's':return'nw';case'e':return'nw';case'w':return'ne';case'ne':return'sw';case'nw':return'se';case'se':return'nw';case'sw':return'ne';}}
-function createDragger(ord)
-{return function(e){if(options.disabled){return false;}
-if((ord==='move')&&!options.allowMove){return false;}
-docOffset=getPos($img);btndown=true;startDragMode(ord,mouseAbs(e));e.stopPropagation();e.preventDefault();return false;};}
-function presize($obj,w,h)
-{var nw=$obj.width(),nh=$obj.height();if((nw>w)&&w>0){nw=w;nh=(w/$obj.width())*$obj.height();}
-if((nh>h)&&h>0){nh=h;nw=(h/$obj.height())*$obj.width();}
-xscale=$obj.width()/nw;yscale=$obj.height()/nh;$obj.width(nw).height(nh);}
-function unscale(c)
-{return{x:parseInt(c.x*xscale,10),y:parseInt(c.y*yscale,10),x2:parseInt(c.x2*xscale,10),y2:parseInt(c.y2*yscale,10),w:parseInt(c.w*xscale,10),h:parseInt(c.h*yscale,10)};}
-function doneSelect(pos)
-{var c=Coords.getFixed();if((c.w>options.minSelect[0])&&(c.h>options.minSelect[1])){Selection.enableHandles();Selection.done();}else{Selection.release();}
-Tracker.setCursor(options.allowSelect?'crosshair':'default');}
-function newSelection(e)
-{if(options.disabled){return false;}
-if(!options.allowSelect){return false;}
-btndown=true;docOffset=getPos($img);Selection.disableHandles();Tracker.setCursor('crosshair');var pos=mouseAbs(e);Coords.setPressed(pos);Selection.update();Tracker.activateHandlers(selectDrag,doneSelect);KeyManager.watchKeys();e.stopPropagation();e.preventDefault();return false;}
-function selectDrag(pos)
-{Coords.setCurrent(pos);Selection.update();}
-function newTracker()
-{var trk=$('<div></div>').addClass(cssClass('tracker'));if($.browser.msie){trk.css({opacity:0,backgroundColor:'white'});}
-return trk;}
-if($.browser.msie&&($.browser.version.split('.')[0]==='6')){ie6mode=true;}
-if(typeof(obj)!=='object'){obj=$(obj)[0];}
-if(typeof(opt)!=='object'){opt={};}
-setOptions(opt);var img_css={border:'none',visibility:'visible',margin:0,padding:0,position:'absolute',top:0,left:0};var $origimg=$(obj),img_mode=true;if(obj.tagName=='IMG'){if($origimg[0].width!=0&&$origimg[0].height!=0){$origimg.width($origimg[0].width);$origimg.height($origimg[0].height);}else{var tempImage=new Image();tempImage.src=$origimg[0].src;$origimg.width(tempImage.width);$origimg.height(tempImage.height);}
-var $img=$origimg.clone().removeAttr('id').css(img_css).show();$img.width($origimg.width());$img.height($origimg.height());$origimg.after($img).hide();}else{$img=$origimg.css(img_css).show();img_mode=false;if(options.shade===null){options.shade=true;}}
-presize($img,options.boxWidth,options.boxHeight);var boundx=$img.width(),boundy=$img.height(),$div=$('<div />').width(boundx).height(boundy).addClass(cssClass('holder')).css({position:'relative',backgroundColor:options.bgColor}).insertAfter($origimg).append($img);if(options.addClass){$div.addClass(options.addClass);}
-var $img2=$('<div />'),$img_holder=$('<div />').width('100%').height('100%').css({zIndex:310,position:'absolute',overflow:'hidden'}),$hdl_holder=$('<div />').width('100%').height('100%').css('zIndex',320),$sel=$('<div />').css({position:'absolute',zIndex:600}).dblclick(function(){var c=Coords.getFixed();options.onDblClick.call(api,c);}).insertBefore($img).append($img_holder,$hdl_holder);if(img_mode){$img2=$('<img />').attr('src',$img.attr('src')).css(img_css).width(boundx).height(boundy),$img_holder.append($img2);}
-if(ie6mode){$sel.css({overflowY:'hidden'});}
-var bound=options.boundary;var $trk=newTracker().width(boundx+(bound*2)).height(boundy+(bound*2)).css({position:'absolute',top:px(-bound),left:px(-bound),zIndex:290}).mousedown(newSelection);var bgcolor=options.bgColor,bgopacity=options.bgOpacity,xlimit,ylimit,xmin,ymin,xscale,yscale,enabled=true,btndown,animating,shift_down;docOffset=getPos($img);var Touch=(function(){function hasTouchSupport(){var support={},events=['touchstart','touchmove','touchend'],el=document.createElement('div'),i;try{for(i=0;i<events.length;i++){var eventName=events[i];eventName='on'+eventName;var isSupported=(eventName in el);if(!isSupported){el.setAttribute(eventName,'return;');isSupported=typeof el[eventName]=='function';}
-support[events[i]]=isSupported;}
-return support.touchstart&&support.touchend&&support.touchmove;}
-catch(err){return false;}}
-function detectSupport(){if((options.touchSupport===true)||(options.touchSupport===false))return options.touchSupport;else return hasTouchSupport();}
-return{createDragger:function(ord){return function(e){e.pageX=e.originalEvent.changedTouches[0].pageX;e.pageY=e.originalEvent.changedTouches[0].pageY;if(options.disabled){return false;}
-if((ord==='move')&&!options.allowMove){return false;}
-btndown=true;startDragMode(ord,mouseAbs(e));e.stopPropagation();e.preventDefault();return false;};},newSelection:function(e){e.pageX=e.originalEvent.changedTouches[0].pageX;e.pageY=e.originalEvent.changedTouches[0].pageY;return newSelection(e);},isSupported:hasTouchSupport,support:detectSupport()};}());var Coords=(function(){var x1=0,y1=0,x2=0,y2=0,ox,oy;function setPressed(pos)
-{pos=rebound(pos);x2=x1=pos[0];y2=y1=pos[1];}
-function setCurrent(pos)
-{pos=rebound(pos);ox=pos[0]-x2;oy=pos[1]-y2;x2=pos[0];y2=pos[1];}
-function getOffset()
-{return[ox,oy];}
-function moveOffset(offset)
-{var ox=offset[0],oy=offset[1];if(0>x1+ox){ox-=ox+x1;}
-if(0>y1+oy){oy-=oy+y1;}
-if(boundy<y2+oy){oy+=boundy-(y2+oy);}
-if(boundx<x2+ox){ox+=boundx-(x2+ox);}
-x1+=ox;x2+=ox;y1+=oy;y2+=oy;}
-function getCorner(ord)
-{var c=getFixed();switch(ord){case'ne':return[c.x2,c.y];case'nw':return[c.x,c.y];case'se':return[c.x2,c.y2];case'sw':return[c.x,c.y2];}}
-function getFixed()
-{if(!options.aspectRatio){return getRect();}
-var aspect=options.aspectRatio,min_x=options.minSize[0]/xscale,max_x=options.maxSize[0]/xscale,max_y=options.maxSize[1]/yscale,rw=x2-x1,rh=y2-y1,rwa=Math.abs(rw),rha=Math.abs(rh),real_ratio=rwa/rha,xx,yy,w,h;if(max_x===0){max_x=boundx*10;}
-if(max_y===0){max_y=boundy*10;}
-if(real_ratio<aspect){yy=y2;w=rha*aspect;xx=rw<0?x1-w:w+x1;if(xx<0){xx=0;h=Math.abs((xx-x1)/aspect);yy=rh<0?y1-h:h+y1;}else if(xx>boundx){xx=boundx;h=Math.abs((xx-x1)/aspect);yy=rh<0?y1-h:h+y1;}}else{xx=x2;h=rwa/aspect;yy=rh<0?y1-h:y1+h;if(yy<0){yy=0;w=Math.abs((yy-y1)*aspect);xx=rw<0?x1-w:w+x1;}else if(yy>boundy){yy=boundy;w=Math.abs(yy-y1)*aspect;xx=rw<0?x1-w:w+x1;}}
-if(xx>x1){if(xx-x1<min_x){xx=x1+min_x;}else if(xx-x1>max_x){xx=x1+max_x;}
-if(yy>y1){yy=y1+(xx-x1)/aspect;}else{yy=y1-(xx-x1)/aspect;}}else if(xx<x1){if(x1-xx<min_x){xx=x1-min_x;}else if(x1-xx>max_x){xx=x1-max_x;}
-if(yy>y1){yy=y1+(x1-xx)/aspect;}else{yy=y1-(x1-xx)/aspect;}}
-if(xx<0){x1-=xx;xx=0;}else if(xx>boundx){x1-=xx-boundx;xx=boundx;}
-if(yy<0){y1-=yy;yy=0;}else if(yy>boundy){y1-=yy-boundy;yy=boundy;}
-return makeObj(flipCoords(x1,y1,xx,yy));}
-function rebound(p)
-{if(p[0]<0){p[0]=0;}
-if(p[1]<0){p[1]=0;}
-if(p[0]>boundx){p[0]=boundx;}
-if(p[1]>boundy){p[1]=boundy;}
-return[p[0],p[1]];}
-function flipCoords(x1,y1,x2,y2)
-{var xa=x1,xb=x2,ya=y1,yb=y2;if(x2<x1){xa=x2;xb=x1;}
-if(y2<y1){ya=y2;yb=y1;}
-return[Math.round(xa),Math.round(ya),Math.round(xb),Math.round(yb)];}
-function getRect()
-{var xsize=x2-x1,ysize=y2-y1,delta;if(xlimit&&(Math.abs(xsize)>xlimit)){x2=(xsize>0)?(x1+xlimit):(x1-xlimit);}
-if(ylimit&&(Math.abs(ysize)>ylimit)){y2=(ysize>0)?(y1+ylimit):(y1-ylimit);}
-if(ymin/yscale&&(Math.abs(ysize)<ymin/yscale)){y2=(ysize>0)?(y1+ymin/yscale):(y1-ymin/yscale);}
-if(xmin/xscale&&(Math.abs(xsize)<xmin/xscale)){x2=(xsize>0)?(x1+xmin/xscale):(x1-xmin/xscale);}
-if(x1<0){x2-=x1;x1-=x1;}
-if(y1<0){y2-=y1;y1-=y1;}
-if(x2<0){x1-=x2;x2-=x2;}
-if(y2<0){y1-=y2;y2-=y2;}
-if(x2>boundx){delta=x2-boundx;x1-=delta;x2-=delta;}
-if(y2>boundy){delta=y2-boundy;y1-=delta;y2-=delta;}
-if(x1>boundx){delta=x1-boundy;y2-=delta;y1-=delta;}
-if(y1>boundy){delta=y1-boundy;y2-=delta;y1-=delta;}
-return makeObj(flipCoords(x1,y1,x2,y2));}
-function makeObj(a)
-{return{x:a[0],y:a[1],x2:a[2],y2:a[3],w:a[2]-a[0],h:a[3]-a[1]};}
-return{flipCoords:flipCoords,setPressed:setPressed,setCurrent:setCurrent,getOffset:getOffset,moveOffset:moveOffset,getCorner:getCorner,getFixed:getFixed};}());var Shade=(function(){var enabled=false,holder=$('<div />').css({position:'absolute',zIndex:240,opacity:0}),shades={top:createShade(),left:createShade().height(boundy),right:createShade().height(boundy),bottom:createShade()};function resizeShades(w,h){shades.left.css({height:px(h)});shades.right.css({height:px(h)});}
-function updateAuto()
-{return updateShade(Coords.getFixed());}
-function updateShade(c)
-{shades.top.css({left:px(c.x),width:px(c.w),height:px(c.y)});shades.bottom.css({top:px(c.y2),left:px(c.x),width:px(c.w),height:px(boundy-c.y2)});shades.right.css({left:px(c.x2),width:px(boundx-c.x2)});shades.left.css({width:px(c.x)});}
-function createShade(){return $('<div />').css({position:'absolute',backgroundColor:options.shadeColor||options.bgColor}).appendTo(holder);}
-function enableShade(){if(!enabled){enabled=true;holder.insertBefore($img);updateAuto();Selection.setBgOpacity(1,0,1);$img2.hide();setBgColor(options.shadeColor||options.bgColor,1);if(Selection.isAwake())
-{setOpacity(options.bgOpacity,1);}
-else setOpacity(1,1);}}
-function setBgColor(color,now){colorChangeMacro(getShades(),color,now);}
-function disableShade(){if(enabled){holder.remove();$img2.show();enabled=false;if(Selection.isAwake()){Selection.setBgOpacity(options.bgOpacity,1,1);}else{Selection.setBgOpacity(1,1,1);Selection.disableHandles();}
-colorChangeMacro($div,0,1);}}
-function setOpacity(opacity,now){if(enabled){if(options.bgFade&&!now){holder.animate({opacity:1-opacity},{queue:false,duration:options.fadeTime});}
-else holder.css({opacity:1-opacity});}}
-function refreshAll(){options.shade?enableShade():disableShade();if(Selection.isAwake())setOpacity(options.bgOpacity);}
-function getShades(){return holder.children();}
-return{update:updateAuto,updateRaw:updateShade,getShades:getShades,setBgColor:setBgColor,enable:enableShade,disable:disableShade,resize:resizeShades,refresh:refreshAll,opacity:setOpacity};}());var Selection=(function(){var awake,hdep=370;var borders={};var handle={};var seehandles=false;var hhs=options.handleOffset;function insertBorder(type)
-{var jq=$('<div />').css({position:'absolute',opacity:options.borderOpacity}).addClass(cssClass(type));$img_holder.append(jq);return jq;}
-function dragDiv(ord,zi)
-{var jq=$('<div />').mousedown(createDragger(ord)).css({cursor:ord+'-resize',position:'absolute',zIndex:zi}).addClass('ord-'+ord);if(Touch.support){jq.bind('touchstart.jcrop',Touch.createDragger(ord));}
-$hdl_holder.append(jq);return jq;}
-function insertHandle(ord)
-{var hs=options.handleSize;return dragDiv(ord,hdep++).css({top:px(-hhs+1),left:px(-hhs+1),opacity:options.handleOpacity}).width(hs).height(hs).addClass(cssClass('handle'));}
-function insertDragbar(ord)
-{var s=options.handleSize,h=s,w=s,t=hhs,l=hhs;switch(ord){case'n':case's':w='100%';break;case'e':case'w':h='100%';break;}
-return dragDiv(ord,hdep++).width(w).height(h).css({top:px(-t+1),left:px(-l+1)});}
-function createHandles(li)
-{var i;for(i=0;i<li.length;i++){handle[li[i]]=insertHandle(li[i]);}}
-function moveHandles(c)
-{var midvert=Math.round((c.h/2)-hhs),midhoriz=Math.round((c.w/2)-hhs),north=-hhs+1,west=-hhs+1,east=c.w-hhs,south=c.h-hhs,x,y;if(handle.e){handle.e.css({top:px(midvert),left:px(east)});handle.w.css({top:px(midvert)});handle.s.css({top:px(south),left:px(midhoriz)});handle.n.css({left:px(midhoriz)});}
-if(handle.ne){handle.ne.css({left:px(east)});handle.se.css({top:px(south),left:px(east)});handle.sw.css({top:px(south)});}
-if(handle.b){handle.b.css({top:px(south)});handle.r.css({left:px(east)});}}
-function moveto(x,y)
-{if(!options.shade){$img2.css({top:px(-y),left:px(-x)});}
-$sel.css({top:px(y),left:px(x)});}
-function resize(w,h)
-{$sel.width(w).height(h);}
-function refresh()
-{var c=Coords.getFixed();Coords.setPressed([c.x,c.y]);Coords.setCurrent([c.x2,c.y2]);updateVisible();}
-function updateVisible(select)
-{if(awake){return update(select);}}
-function update(select)
-{var c=Coords.getFixed();resize(c.w,c.h);moveto(c.x,c.y);if(options.shade)Shade.updateRaw(c);if(seehandles){moveHandles(c);}
-if(!awake){show();}
-if(select){options.onSelect.call(api,unscale(c));}else{options.onChange.call(api,unscale(c));}}
-function setBgOpacity(opacity,force,now)
-{if(!awake&&!force)return;if(options.bgFade&&!now){$img.animate({opacity:opacity},{queue:false,duration:options.fadeTime});}else{$img.css('opacity',opacity);}}
-function show()
-{$sel.show();if(options.shade)Shade.opacity(bgopacity);else setBgOpacity(bgopacity,true);awake=true;}
-function release()
-{disableHandles();$sel.hide();if(options.shade)Shade.opacity(1);else setBgOpacity(1);awake=false;options.onRelease.call(api);}
-function showHandles()
-{if(seehandles){moveHandles(Coords.getFixed());$hdl_holder.show();}}
-function enableHandles()
-{seehandles=true;if(options.allowResize){moveHandles(Coords.getFixed());$hdl_holder.show();return true;}}
-function disableHandles()
-{seehandles=false;$hdl_holder.hide();}
-function animMode(v)
-{if(animating===v){disableHandles();}else{enableHandles();}}
-function done()
-{animMode(false);refresh();}
-if(options.drawBorders){borders={top:insertBorder('hline'),bottom:insertBorder('hline bottom'),left:insertBorder('vline'),right:insertBorder('vline right')};}
-if(options.dragEdges){handle.t=insertDragbar('n');handle.b=insertDragbar('s');handle.r=insertDragbar('e');handle.l=insertDragbar('w');}
-if(options.sideHandles){createHandles(['n','s','e','w']);}
-if(options.cornerHandles){createHandles(['sw','nw','ne','se']);}
-$(document).bind('touchstart.jcrop-ios',function(e){if($(e.currentTarget).hasClass('jcrop-tracker'))e.stopPropagation();});var $track=newTracker().mousedown(createDragger('move')).css({cursor:'move',position:'absolute',zIndex:360});if(Touch.support){$track.bind('touchstart.jcrop',Touch.createDragger('move'));}
-$img_holder.append($track);disableHandles();return{updateVisible:updateVisible,update:update,release:release,refresh:refresh,isAwake:function(){return awake;},setCursor:function(cursor){$track.css('cursor',cursor);},enableHandles:enableHandles,enableOnly:function(){seehandles=true;},showHandles:showHandles,disableHandles:disableHandles,animMode:animMode,setBgOpacity:setBgOpacity,done:done};}());var Tracker=(function(){var onMove=function(){},onDone=function(){},trackDoc=options.trackDocument;function toFront()
-{$trk.css({zIndex:450});if(Touch.support){$(document).bind('touchmove.jcrop',trackTouchMove).bind('touchend.jcrop',trackTouchEnd);}
-if(trackDoc){$(document).bind('mousemove.jcrop',trackMove).bind('mouseup.jcrop',trackUp);}}
-function toBack()
-{$trk.css({zIndex:290});$(document).unbind('.jcrop');}
-function trackMove(e)
-{onMove(mouseAbs(e));return false;}
-function trackUp(e)
-{e.preventDefault();e.stopPropagation();if(btndown){btndown=false;onDone(mouseAbs(e));if(Selection.isAwake()){options.onSelect.call(api,unscale(Coords.getFixed()));}
-toBack();onMove=function(){};onDone=function(){};}
-return false;}
-function activateHandlers(move,done)
-{btndown=true;onMove=move;onDone=done;toFront();return false;}
-function trackTouchMove(e)
-{e.pageX=e.originalEvent.changedTouches[0].pageX;e.pageY=e.originalEvent.changedTouches[0].pageY;return trackMove(e);}
-function trackTouchEnd(e)
-{e.pageX=e.originalEvent.changedTouches[0].pageX;e.pageY=e.originalEvent.changedTouches[0].pageY;return trackUp(e);}
-function setCursor(t)
-{$trk.css('cursor',t);}
-if(!trackDoc){$trk.mousemove(trackMove).mouseup(trackUp).mouseout(trackUp);}
-$img.before($trk);return{activateHandlers:activateHandlers,setCursor:setCursor};}());var KeyManager=(function(){var $keymgr=$('<input type="radio" />').css({position:'fixed',left:'-120px',width:'12px'}),$keywrap=$('<div />').css({position:'absolute',overflow:'hidden'}).append($keymgr);function watchKeys()
-{if(options.keySupport){$keymgr.show();$keymgr.focus();}}
-function onBlur(e)
-{$keymgr.hide();}
-function doNudge(e,x,y)
-{if(options.allowMove){Coords.moveOffset([x,y]);Selection.updateVisible(true);}
-e.preventDefault();e.stopPropagation();}
-function parseKey(e)
-{if(e.ctrlKey||e.metaKey){return true;}
-shift_down=e.shiftKey?true:false;var nudge=shift_down?10:1;switch(e.keyCode){case 37:doNudge(e,-nudge,0);break;case 39:doNudge(e,nudge,0);break;case 38:doNudge(e,0,-nudge);break;case 40:doNudge(e,0,nudge);break;case 27:if(options.allowSelect)Selection.release();break;case 9:return true;}
-return false;}
-if(options.keySupport){$keymgr.keydown(parseKey).blur(onBlur);if(ie6mode||!options.fixedSupport){$keymgr.css({position:'absolute',left:'-20px'});$keywrap.append($keymgr).insertBefore($img);}else{$keymgr.insertBefore($img);}}
-return{watchKeys:watchKeys};}());function setClass(cname)
-{$div.removeClass().addClass(cssClass('holder')).addClass(cname);}
-function animateTo(a,callback)
-{var x1=parseInt(a[0],10)/xscale,y1=parseInt(a[1],10)/yscale,x2=parseInt(a[2],10)/xscale,y2=parseInt(a[3],10)/yscale;if(animating){return;}
-var animto=Coords.flipCoords(x1,y1,x2,y2),c=Coords.getFixed(),initcr=[c.x,c.y,c.x2,c.y2],animat=initcr,interv=options.animationDelay,ix1=animto[0]-initcr[0],iy1=animto[1]-initcr[1],ix2=animto[2]-initcr[2],iy2=animto[3]-initcr[3],pcent=0,velocity=options.swingSpeed;x=animat[0];y=animat[1];x2=animat[2];y2=animat[3];Selection.animMode(true);var anim_timer;function queueAnimator(){window.setTimeout(animator,interv);}
-var animator=(function(){return function(){pcent+=(100-pcent)/velocity;animat[0]=x+((pcent/100)*ix1);animat[1]=y+((pcent/100)*iy1);animat[2]=x2+((pcent/100)*ix2);animat[3]=y2+((pcent/100)*iy2);if(pcent>=99.8){pcent=100;}
-if(pcent<100){setSelectRaw(animat);queueAnimator();}else{Selection.done();if(typeof(callback)==='function'){callback.call(api);}}};}());queueAnimator();}
-function setSelect(rect)
-{setSelectRaw([parseInt(rect[0],10)/xscale,parseInt(rect[1],10)/yscale,parseInt(rect[2],10)/xscale,parseInt(rect[3],10)/yscale]);options.onSelect.call(api,unscale(Coords.getFixed()));Selection.enableHandles();}
-function setSelectRaw(l)
-{Coords.setPressed([l[0],l[1]]);Coords.setCurrent([l[2],l[3]]);Selection.update();}
-function tellSelect()
-{return unscale(Coords.getFixed());}
-function tellScaled()
-{return Coords.getFixed();}
-function setOptionsNew(opt)
-{setOptions(opt);interfaceUpdate();}
-function disableCrop()
-{options.disabled=true;Selection.disableHandles();Selection.setCursor('default');Tracker.setCursor('default');}
-function enableCrop()
-{options.disabled=false;interfaceUpdate();}
-function cancelCrop()
-{Selection.done();Tracker.activateHandlers(null,null);}
-function destroy()
-{$div.remove();$origimg.show();$(obj).removeData('Jcrop');}
-function setImage(src,callback)
-{Selection.release();disableCrop();var img=new Image();img.onload=function(){var iw=img.width;var ih=img.height;var bw=options.boxWidth;var bh=options.boxHeight;$img.width(iw).height(ih);$img.attr('src',src);$img2.attr('src',src);presize($img,bw,bh);boundx=$img.width();boundy=$img.height();$img2.width(boundx).height(boundy);$trk.width(boundx+(bound*2)).height(boundy+(bound*2));$div.width(boundx).height(boundy);Shade.resize(boundx,boundy);enableCrop();if(typeof(callback)==='function'){callback.call(api);}};img.src=src;}
-function colorChangeMacro($obj,color,now){var mycolor=color||options.bgColor;if(options.bgFade&&supportsColorFade()&&options.fadeTime&&!now){$obj.animate({backgroundColor:mycolor},{queue:false,duration:options.fadeTime});}else{$obj.css('backgroundColor',mycolor);}}
-function interfaceUpdate(alt)
-{if(options.allowResize){if(alt){Selection.enableOnly();}else{Selection.enableHandles();}}else{Selection.disableHandles();}
-Tracker.setCursor(options.allowSelect?'crosshair':'default');Selection.setCursor(options.allowMove?'move':'default');if(options.hasOwnProperty('trueSize')){xscale=options.trueSize[0]/boundx;yscale=options.trueSize[1]/boundy;}
-if(options.hasOwnProperty('setSelect')){setSelect(options.setSelect);Selection.done();delete(options.setSelect);}
-Shade.refresh();if(options.bgColor!=bgcolor){colorChangeMacro(options.shade?Shade.getShades():$div,options.shade?(options.shadeColor||options.bgColor):options.bgColor);bgcolor=options.bgColor;}
-if(bgopacity!=options.bgOpacity){bgopacity=options.bgOpacity;if(options.shade)Shade.refresh();else Selection.setBgOpacity(bgopacity);}
-xlimit=options.maxSize[0]||0;ylimit=options.maxSize[1]||0;xmin=options.minSize[0]||0;ymin=options.minSize[1]||0;if(options.hasOwnProperty('outerImage')){$img.attr('src',options.outerImage);delete(options.outerImage);}
-Selection.refresh();}
-if(Touch.support)$trk.bind('touchstart.jcrop',Touch.newSelection);$hdl_holder.hide();interfaceUpdate(true);var api={setImage:setImage,animateTo:animateTo,setSelect:setSelect,setOptions:setOptionsNew,tellSelect:tellSelect,tellScaled:tellScaled,setClass:setClass,disable:disableCrop,enable:enableCrop,cancel:cancelCrop,release:Selection.release,destroy:destroy,focus:KeyManager.watchKeys,getBounds:function(){return[boundx*xscale,boundy*yscale];},getWidgetSize:function(){return[boundx,boundy];},getScaleFactor:function(){return[xscale,yscale];},ui:{holder:$div,selection:$sel}};if($.browser.msie){$div.bind('selectstart',function(){return false;});}
-$origimg.data('Jcrop',api);return api;};$.fn.Jcrop=function(options,callback)
-{var api;this.each(function(){if($(this).data('Jcrop')){if(options==='api')return $(this).data('Jcrop');else $(this).data('Jcrop').setOptions(options);}
-else{if(this.tagName=='IMG')
-$.Jcrop.Loader(this,function(){$(this).css({display:'block',visibility:'hidden'});api=$.Jcrop(this,options);if($.isFunction(callback))callback.call(api);});else{$(this).css({display:'block',visibility:'hidden'});api=$.Jcrop(this,options);if($.isFunction(callback))callback.call(api);}}});return this;};$.Jcrop.Loader=function(imgobj,success,error){var $img=$(imgobj),img=$img[0];function completeCheck(){if(img.complete){$img.unbind('.jcloader');if($.isFunction(success))success.call(img);}
-else window.setTimeout(completeCheck,50);}
-$img.bind('load.jcloader',completeCheck).bind('error.jcloader',function(e){$img.unbind('.jcloader');if($.isFunction(error))error.call(img);});if(img.complete&&$.isFunction(success)){$img.unbind('.jcloader');success.call(img);}};$.Jcrop.defaults={allowSelect:true,allowMove:true,allowResize:true,trackDocument:true,baseClass:'jcrop',addClass:null,bgColor:'black',bgOpacity:0.6,bgFade:false,borderOpacity:0.4,handleOpacity:0.5,handleSize:7,handleOffset:5,aspectRatio:0,keySupport:true,cornerHandles:true,sideHandles:true,drawBorders:true,dragEdges:true,fixedSupport:true,touchSupport:null,shade:null,boxWidth:0,boxHeight:0,boundary:2,fadeTime:400,animationDelay:20,swingSpeed:3,minSelect:[0,0],maxSize:[0,0],minSize:[0,0],onChange:function(){},onSelect:function(){},onDblClick:function(){},onRelease:function(){}};}(jQuery));
\ No newline at end of file
diff --git a/apps/contacts/js/jquery.combobox.js b/apps/contacts/js/jquery.combobox.js
deleted file mode 100644
index d9959eb6cd..0000000000
--- a/apps/contacts/js/jquery.combobox.js
+++ /dev/null
@@ -1,158 +0,0 @@
-/**
- * Inspired by http://jqueryui.com/demos/autocomplete/#combobox
- */
-
-(function( $ ) {
-	$.widget('ui.combobox', {
-		options: { 
-			id: null,
-			name: null,
-			showButton: false,
-			editable: true
-		},
-		_create: function() {
-			var self = this,
-				select = this.element.hide(),
-				selected = select.children(':selected'),
-				value = selected.val() ? selected.text() : '';
-			var input = this.input = $('<input type="text">')
-				.insertAfter( select )
-				.val( value )
-				.autocomplete({
-					delay: 0,
-					minLength: 0,
-					source: function( request, response ) {
-						var matcher = new RegExp( $.ui.autocomplete.escapeRegex(request.term), "i" );
-						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>'),
-									value: text,
-									option: this
-								};
-						}) );
-					},
-					select: function( event, ui ) {
-						self.input.val($(ui.item.option).text());
-						self.input.trigger('change');
-						ui.item.option.selected = true;
-						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' ),
-								valid = false;
-							self.input.val($(this).val());
-							//self.input.trigger('change');
-							select.children('option').each(function() {
-								if ( $( this ).text().match( matcher ) ) {
-									this.selected = valid = true;
-									return false;
-								}
-							});
-							if ( !self.options['editable'] && !valid ) {
-								// remove invalid value, as it didn't match anything
-								$( this ).val( "" );
-								select.val( "" );
-								input.data('autocomplete').term = '';
-								return false;
-							}
-						}
-					}
-				})
-				.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>')
-					.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')
-					.insertAfter( input )
-					.addClass('svg')
-					.addClass('action')
-					.addClass('combo-button')
-					.click(function() {
-						// close if already visible
-						if ( input.autocomplete('widget').is(':visible') ) {
-							input.autocomplete('close');
-							return;
-						}
-
-						// work around a bug (likely same cause as #5265)
-						$( this ).blur();
-
-						// pass empty string as value to search for, displaying all results
-						input.autocomplete('search', '');
-						input.focus();
-					});
-			}
-		},
-		destroy: function() {
-			this.input.remove();
-			//this.button.remove();
-			this.element.show();
-			$.Widget.prototype.destroy.call( this );
-		},
-		value: function(val) {
-			if(val != undefined) {
-				this.input.val(val);
-			} else {
-				return this.input.val();
-			}
-		},
-		_setOption: function( key, value ) {
-			switch( key ) {
-				case 'id':
-					this.options['id'] = value;
-					this.input.attr('id', value);
-					break;
-				case 'name':
-					this.options['name'] = value;
-					this.input.attr('name', value);
-					break;
-				case 'attributes':
-					var input = this.input;
-					$.each(this.options['attributes'], function(key, value) {
-						input.attr(key, value);
-					});
-					break;
-				case 'classes':
-					var input = this.input;
-					$.each(this.options['classes'], function(key, value) {
-						input.addClass(value);
-					});
-					break;
-				case 'editable':
-				case 'showButton':
-					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 );
-		}
-	});
-})( jQuery );
diff --git a/apps/contacts/js/jquery.inview.js b/apps/contacts/js/jquery.inview.js
deleted file mode 100644
index 9687cd8336..0000000000
--- a/apps/contacts/js/jquery.inview.js
+++ /dev/null
@@ -1,134 +0,0 @@
-/**
- * author Christopher Blum
- *    - based on the idea of Remy Sharp, http://remysharp.com/2009/01/26/element-in-view-event-plugin/
- *    - forked from http://github.com/zuk/jquery.inview/
- */
-(function ($) {
-  var inviewObjects = {}, viewportSize, viewportOffset,
-      d = document, w = window, documentElement = d.documentElement, expando = $.expando, isFiring = false, $elements = {};
-
-  $.event.special.inview = {
-    add: function(data) {
-      var inviewObject = { data: data, $element: $(this) }
-      inviewObjects[data.guid + "-" + this[expando]] = inviewObject;
-      var selector  = inviewObject.data.selector,
-      $element  = inviewObject.$element;
-      var hash = parseInt(getHash( data.guid + this[expando]));
-      $elements[hash] =  selector ? $element.find(selector) : $element;
-    },
-
-    remove: function(data) {
-      try { delete inviewObjects[data.guid + "-" + this[expando]]; } catch(e) {}
-      try {
-        var hash = parseInt(getHash(data.guid + this[expando])); 
-	delete($elements[hash]);
-      } catch (e){}
-    }
-  };
-
-  
-  function getHash(str){
-    str = str+'';
-    var hash = 0;
-    if (str.length == 0) return hash;
-    for (i = 0; i < str.length; i++) {
-        char = str.charCodeAt(i);
-        hash = ((hash<<5)-hash)+char;
-        hash = hash & hash; // Convert to 32bit integer
-    }
-    return Math.abs(hash);
-  }
-  
-  function getViewportSize() {
-    var mode, domObject, size = { height: w.innerHeight, width: w.innerWidth };
-
-    // if this is correct then return it. iPad has compat Mode, so will
-    // go into check clientHeight/clientWidth (which has the wrong value).
-    if (!size.height) {
-      mode = d.compatMode;
-      if (mode || !$.support.boxModel) { // IE, Gecko
-        domObject = mode === 'CSS1Compat' ?
-          documentElement : // Standards
-          d.body; // Quirks
-        size = {
-          height: domObject.clientHeight,
-          width:  domObject.clientWidth
-        };
-      }
-    }
-
-    return size;
-  }
-
-  function getViewportOffset() {
-    return {
-      top:  w.pageYOffset || documentElement.scrollTop   || (d.body?d.body.scrollTop:0),
-      left: w.pageXOffset || documentElement.scrollLeft  || (d.body?d.body.scrollLeft:0)
-    };
-  }
-
-  function checkInView() {
-    if (isFiring){
-      return;
-    }
-    isFiring = true;
-      viewportSize   = viewportSize   || getViewportSize();
-      viewportOffset = viewportOffset || getViewportOffset();
-      
-      for (var i in $elements) {
-        if (isNaN(parseInt(i))) {
-          continue;
-        }
-
-        var $element      = $($elements[i]),
-            elementSize   = { height: $element.height(), width: $element.width() },
-            elementOffset = $element.offset(),
-            inView        = $element.data('inview'),
-            visiblePartX,
-            visiblePartY,
-            visiblePartsMerged;
-
-        // Don't ask me why because I haven't figured out yet:
-        // viewportOffset and viewportSize are sometimes suddenly null in Firefox 5.
-        // Even though it sounds weird:
-        // It seems that the execution of this function is interferred by the onresize/onscroll event
-        // where viewportOffset and viewportSize are unset
-        if (!viewportOffset || !viewportSize) {
-	  isFiring = false;
-          return;
-        }
-        
-        if (elementOffset.top + elementSize.height > viewportOffset.top &&
-            elementOffset.top < viewportOffset.top + viewportSize.height &&
-            elementOffset.left + elementSize.width > viewportOffset.left &&
-            elementOffset.left < viewportOffset.left + viewportSize.width) {
-          visiblePartX = (viewportOffset.left > elementOffset.left ?
-            'right' : (viewportOffset.left + viewportSize.width) < (elementOffset.left + elementSize.width) ?
-            'left' : 'both');
-          visiblePartY = (viewportOffset.top > elementOffset.top ?
-            'bottom' : (viewportOffset.top + viewportSize.height) < (elementOffset.top + elementSize.height) ?
-            'top' : 'both');
-          visiblePartsMerged = visiblePartX + "-" + visiblePartY;
-          if (!inView || inView !== visiblePartsMerged) {
-            $element.data('inview', visiblePartsMerged).trigger('inview', [true, visiblePartX, visiblePartY]);
-          }
-        } else if (inView) {
-          $element.data('inview', false).trigger('inview', [false]);
-        }
-      }
-      isFiring = false;
-  }
-
-  $(w).bind("scroll resize", function() {
-    viewportSize = viewportOffset = null;
-  });
-
-  // Use setInterval in order to also make sure this captures elements within
-  // "overflow:scroll" elements or elements that appeared in the dom tree due to
-  // dom manipulation and reflow
-  // old: $(window).scroll(checkInView);
-  //
-  // By the way, iOS (iPad, iPhone, ...) seems to not execute, or at least delays
-  // intervals while the user scrolls. Therefore the inview event might fire a bit late there
-  setInterval(checkInView, 250);
-})(jQuery);
\ No newline at end of file
diff --git a/apps/contacts/js/jquery.inview.txt b/apps/contacts/js/jquery.inview.txt
deleted file mode 100644
index c53dbd1d97..0000000000
--- a/apps/contacts/js/jquery.inview.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-jQuery.inview is licensed Attribution-Non-Commercial-Share Alike 2.0 but the
-conditions has been waived by the author in the following tweet:
-
-https://twitter.com/#!/ChristopherBlum/status/148382899887013888 
-
-Saying:
-
-Thomas Tanghus @tanghus 18 Dec. 2011
-
-@ChristopherBlum Hi. Is it OK if I use https://github.com/protonet/jquery.inview in ownCloud? Preferably under an AGPL license ;-) owncloud.org
-
-
-Christopher Blum Christopher Blum @ChristopherBlum 18 Dec. 2011
-
-@tanghus Feel free to! :)
diff --git a/apps/contacts/js/jquery.multi-autocomplete.js b/apps/contacts/js/jquery.multi-autocomplete.js
deleted file mode 100644
index 5516a74b03..0000000000
--- a/apps/contacts/js/jquery.multi-autocomplete.js
+++ /dev/null
@@ -1,94 +0,0 @@
-/**
- * Inspired by http://jqueryui.com/demos/autocomplete/#multiple
- */
-
-(function( $ ) {
-	$.widget('ui.multiple_autocomplete', {
-		_create: function() {
-			var self = this;
-			function split( val ) {
-				return val.split( /,\s*/ );
-			}
-			function extractLast( term ) {
-				return split( term ).pop();
-			}
-			function showOptions() {
-				if(!self.element.autocomplete('widget').is(':visible') && self.element.val().trim() == '') {
-					self.element.autocomplete('search', '');
-				}
-			}
-			//console.log('_create: ' + this.options['id']);
-			this.element.bind('click', function( event ) {
-				showOptions();
-			});
-			this.element.bind('input', function( event ) {
-				showOptions();
-			});
-			this.element.bind('blur', function( event ) {
-				var tmp = self.element.val().trim();
-				if(tmp[tmp.length-1] == ',') {
-					self.element.val(tmp.substring(0, tmp.length-1));
-				} else {
-					self.element.val(tmp);
-				}
-				if(self.element.val().trim() != '') {
-					self.element.trigger('change'); // Changes wasn't saved when only using the dropdown.
-				}
-			});
-			this.element.bind( "keydown", function( event ) {
-				if ( event.keyCode === $.ui.keyCode.TAB &&
-						$( this ).data( "autocomplete" ).menu.active ) {
-					event.preventDefault();
-				}
-			})
-			.autocomplete({
-				minLength: 0,
-				source: function( request, response ) {
-					// delegate back to autocomplete, but extract the last term
-					response( $.ui.autocomplete.filter(
-						self.options.source, extractLast( request.term ) ) );
-				},
-				focus: function() {
-					// prevent value inserted on focus
-					return false;
-				},
-				select: function( event, ui ) {
-					var terms = split( this.value );
-					// remove the current input
-					terms.pop();
-					// add the selected item
-					terms.push( ui.item.value );
-					// add placeholder to get the comma-and-space at the end
-					terms.push( "" );
-					this.value = terms.join( ", " );
-					return false;
-				}
-			});
-			/*this.button = $( "<button type='button'>&nbsp;</button>" )
-				.attr( "tabIndex", -1 )
-				.attr( "title", "Show All Items" )
-				.insertAfter( this.element )
-				.addClass('svg')
-				.addClass('action')
-				.addClass('combo-button')
-				.click(function() {
-					// close if already visible
-					if ( self.element.autocomplete( "widget" ).is( ":visible" ) ) {
-						self.element.autocomplete( "close" );
-						return;
-					}
-
-					// work around a bug (likely same cause as #5265)
-					$( this ).blur();
-
-					var tmp = self.element.val().trim();
-					if(tmp[tmp.length-1] != ',') {
-						self.element.val(tmp+', ');
-					}
-					// pass empty string as value to search for, displaying all results
-					self.element.autocomplete( "search", "" );
-					self.element.focus();
-				});*/
-		},
-	});
-})( jQuery );
diff --git a/apps/contacts/js/loader.js b/apps/contacts/js/loader.js
deleted file mode 100644
index 3b1f407048..0000000000
--- a/apps/contacts/js/loader.js
+++ /dev/null
@@ -1,86 +0,0 @@
-/**
- * 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.
- */
-Contacts_Import={
-	importdialog: function(filename){
-		var path = $('#dir').val();
-		$('body').append('<div id="contacts_import"></div>');
-		$('#contacts_import').load(OC.filePath('contacts', 'ajax', 'importdialog.php'), {filename:filename, path:path},	function(){Contacts_Import.initdialog(filename);});
-	},
-	initdialog: function(filename){
-		$('#contacts_import_dialog').dialog({
-			width : 500,
-			close : function() {
-				$(this).dialog('destroy').remove();
-				$('#contacts_import').remove();
-			}
-		});
-		$('#import_done_button').click(function(){
-			$('#contacts_import_dialog').dialog('destroy').remove();
-			$('#contacts_import').remove();
-		});
-		$('#progressbar').progressbar({value: 0});
-		$('#startimport').click(function(){
-			var filename = $('#filename').val();
-			var path = $('#path').val();
-			var method = 'old';
-			var addressbookid = $('#contacts option:selected').val();
-			if($('#contacts option:selected').val() == 'newaddressbook'){
-				var method = 'new';
-				var addressbookname = $('#newaddressbook').val();
-				var addressbookname = $.trim(addressbookname);
-				if(addressbookname == ''){
-					$('#newaddressbook').css('background-color', '#FF2626');
-					$('#newaddressbook').focus(function(){
-						$('#newaddressbook').css('background-color', '#F8F8F8');
-					});
-					return false;
-				}
-			}
-			$('#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){
-				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.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);
-		});
-		$('#contacts').change(function(){
-			if($('#contacts option:selected').val() == 'newaddressbook'){
-				$('#newaddressbookform').slideDown('slow');
-			}else{
-				$('#newaddressbookform').slideUp('slow');
-			}
-		});
-	},
-	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);
-			}else{
-				$('#import_done').css('display', 'block');
-			}
-		});
-	}
-}
-$(document).ready(function(){
-	if(typeof FileActions !== 'undefined'){
-		FileActions.register('text/vcard','importaddressbook', FileActions.PERMISSION_READ, '', Contacts_Import.importdialog);
-		FileActions.setDefault('text/vcard','importaddressbook');
-		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/contacts/js/settings.js b/apps/contacts/js/settings.js
deleted file mode 100644
index 69cf473e06..0000000000
--- a/apps/contacts/js/settings.js
+++ /dev/null
@@ -1,196 +0,0 @@
-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);
-		OC.Share.loadIcons('addressbook');
-	},
-	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 {
-						OC.Contacts.Contacts.update();
-					}
-				} else {
-					console.log('Error:', jsondata.data.message);
-					OC.Contacts.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()
-						OC.Contacts.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.data.addressbook.active));
-						if(id == 'new') {
-							self.adrsettings.find('table')
-								.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.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="'+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>');
-						} 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.data.addressbook.displayname);
-							row.find('td.description').text(jsondata.data.addressbook.description);
-						}
-						OC.Contacts.Contacts.update();
-					} else {
-						OC.dialogs.alert(jsondata.data.message, t('contacts', 'Error'));
-					}
-			});
-		},
-		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.showLink(id, row, totalurl+'/'+encodeURIComponent(oc_current_user));
-		},
-		showVCF:function(id) {
-			console.log('showVCF: ', id);
-			var row = this.adrsettings.find('tr[data-id="'+id+'"]');
-			var link = totalurl+'/'+encodeURIComponent(oc_current_user)+'/'+encodeURIComponent(row.data('uri'))+'?export';
-			console.log(link);
-			this.showLink(id, row, link);
-		}
-	}
-};
-
-
-$(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');
-			}
-		}
-	});
-});
diff --git a/apps/contacts/l10n/.gitkeep b/apps/contacts/l10n/.gitkeep
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/apps/contacts/l10n/ar.php b/apps/contacts/l10n/ar.php
deleted file mode 100644
index 2b28d6ca6d..0000000000
--- a/apps/contacts/l10n/ar.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?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." => "يجب ملء على الاقل خانه واحده من العنوان.",
-"Information about vCard is incorrect. Please reload the page." => "المعلومات الموجودة في ال vCard غير صحيحة. الرجاء إعادة تحديث الصفحة.",
-"Contacts" => "المعارف",
-"This is not your addressbook." => "هذا ليس دفتر عناوينك.",
-"Contact could not be found." => "لم يتم العثور على الشخص.",
-"Work" => "الوظيفة",
-"Home" => "البيت",
-"Mobile" => "الهاتف المحمول",
-"Text" => "معلومات إضافية",
-"Voice" => "صوت",
-"Fax" => "الفاكس",
-"Video" => "الفيديو",
-"Pager" => "الرنان",
-"Birthday" => "تاريخ الميلاد",
-"Contact" => "معرفه",
-"Add Contact" => "أضف شخص ",
-"Addressbooks" => "كتب العناوين",
-"Organization" => "المؤسسة",
-"Delete" => "حذف",
-"Preferred" => "مفضل",
-"Phone" => "الهاتف",
-"Email" => "البريد الالكتروني",
-"Address" => "عنوان",
-"Download contact" => "انزال المعرفه",
-"Delete contact" => "امحي المعرفه",
-"Type" => "نوع",
-"PO Box" => "العنوان البريدي",
-"Extended" => "إضافة",
-"City" => "المدينة",
-"Region" => "المنطقة",
-"Zipcode" => "رقم المنطقة",
-"Country" => "البلد",
-"Addressbook" => "كتاب العناوين",
-"Download" => "انزال",
-"Edit" => "تعديل",
-"New Address Book" => "كتاب عناوين جديد",
-"Save" => "حفظ",
-"Cancel" => "الغاء"
-);
diff --git a/apps/contacts/l10n/ca.php b/apps/contacts/l10n/ca.php
deleted file mode 100644
index 5a8b0e018c..0000000000
--- a/apps/contacts/l10n/ca.php
+++ /dev/null
@@ -1,229 +0,0 @@
-<?php $TRANSLATIONS = array(
-"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",
-"Error setting checksum." => "Error en establir la suma de verificació.",
-"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:",
-"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.",
-"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.",
-"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.",
-"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:",
-"Error loading image." => "Error en carregar la imatge.",
-"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:",
-"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",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "El fitxer carregat supera la directiva MAX_FILE_SIZE especificada al formulari HTML",
-"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",
-"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",
-"You do not have permission to add contacts to " => "No teniu permisos per afegir contactes a ",
-"Please select one of your own address books." => "Seleccioneu una de les vostres llibretes d'adreces",
-"Permission error" => "Error de permisos",
-"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.",
-"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.",
-"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.",
-"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",
-"Mobile" => "Mòbil",
-"Text" => "Text",
-"Voice" => "Veu",
-"Message" => "Missatge",
-"Fax" => "Fax",
-"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ó",
-"Personal" => "Personal",
-"Projects" => "Projectes",
-"Questions" => "Preguntes",
-"{name}'s Birthday" => "Aniversari de {name}",
-"Contact" => "Contacte",
-"You do not have the permissions to edit this contact." => "No teniu permisos per editar aquest contacte",
-"You do not have the permissions to delete this contact." => "No teniu permisos per esborrar aquest contacte",
-"Add Contact" => "Afegeix un contacte",
-"Import" => "Importa",
-"Settings" => "Configuració",
-"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 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",
-"Add new addressbook" => "Afegeix una llibreta d'adreces nova",
-"Delete current contact" => "Esborra 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",
-"Organization" => "Organització",
-"Delete" => "Suprimeix",
-"Nickname" => "Sobrenom",
-"Enter nickname" => "Escriviu el sobrenom",
-"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",
-"Edit groups" => "Edita els grups",
-"Preferred" => "Preferit",
-"Please specify a valid email address." => "Especifiqueu una adreça de correu electrònic correcta",
-"Enter email address" => "Escriviu una adreça de correu electrònic",
-"Mail to address" => "Envia per correu electrònic a l'adreça",
-"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",
-"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",
-"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",
-"Addressbook" => "Llibreta d'adreces",
-"Hon. prefixes" => "Prefix honorífic:",
-"Miss" => "Srta",
-"Ms" => "Sra",
-"Mr" => "Sr",
-"Sir" => "Senyor",
-"Mrs" => "Sra",
-"Dr" => "Dr",
-"Given name" => "Nom específic",
-"Additional names" => "Noms addicionals",
-"Family name" => "Nom de familia",
-"Hon. suffixes" => "Sufix honorífic:",
-"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.",
-"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",
-"Name of new addressbook" => "Nom de la nova llibreta d'adreces",
-"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",
-"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",
-"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",
-"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
deleted file mode 100644
index cae9ae0c40..0000000000
--- a/apps/contacts/l10n/cs_CZ.php
+++ /dev/null
@@ -1,229 +0,0 @@
-<?php $TRANSLATIONS = array(
-"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",
-"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í.",
-"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.",
-"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: ",
-"Missing IM parameter." => "Chybějící parametr IM",
-"Unknown IM: " => "Neznámý IM:",
-"Information about vCard is incorrect. Please reload the page." => "Informace o vCard je nesprávná. Obnovte stránku, prosím.",
-"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. ",
-"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á.",
-"Contact ID is missing." => "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.",
-"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:",
-"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",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Nahrávaný soubor překračuje nastavení MAX_FILE_SIZE z voleb HTML formuláře",
-"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",
-"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",
-"You do not have permission to add contacts to " => "Nemáte práva přidat kontakt do",
-"Please select one of your own address books." => "Prosím vyberte jeden z vašich adresářů",
-"Permission error" => "Chyba přístupových práv",
-"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.",
-"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.",
-"Do you want to merge these address books?" => "Chcete spojit tyto adresáře?",
-"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.",
-"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" => "Pracovní",
-"Home" => "Domácí",
-"Other" => "Ostatní",
-"Mobile" => "Mobil",
-"Text" => "Text",
-"Voice" => "Hlas",
-"Message" => "Zpráva",
-"Fax" => "Fax",
-"Video" => "Video",
-"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",
-"Personal" => "Osobní",
-"Projects" => "Projekty",
-"Questions" => "Dotazy",
-"{name}'s Birthday" => "Narozeniny {name}",
-"Contact" => "Kontakt",
-"You do not have the permissions to edit this contact." => "Nemáte práva editovat tento kontakt",
-"You do not have the permissions to delete this contact." => "Nemáte práva smazat tento 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",
-"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",
-"Organization" => "Organizace",
-"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",
-"Edit groups" => "Upravit skupiny",
-"Preferred" => "Preferovaný",
-"Please specify a valid email address." => "Prosím zadejte platnou e-mailovou adresu",
-"Enter email address" => "Zadat e-mailovou adresu",
-"Mail to address" => "Odeslat na adresu",
-"Delete email address" => "Smazat e-mail",
-"Enter phone number" => "Zadat telefoní číslo",
-"Delete phone number" => "Smazat telefoní číslo",
-"Instant Messenger" => "Instant Messenger",
-"Delete IM" => "Smazat IM",
-"View on map" => "Zobrazit na mapě",
-"Edit address details" => "Upravit podrobnosti adresy",
-"Add notes here." => "Zde můžete připsat poznámky.",
-"Add field" => "Přidat políčko",
-"Phone" => "Telefon",
-"Email" => "Email",
-"Instant Messaging" => "Instant Messaging",
-"Address" => "Adresa",
-"Note" => "Poznámka",
-"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",
-"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",
-"Miss" => "Slečna",
-"Ms" => "Ms",
-"Mr" => "Pan",
-"Sir" => "Sir",
-"Mrs" => "Paní",
-"Dr" => "Dr",
-"Given name" => "Křestní jméno",
-"Additional names" => "Další jména",
-"Family name" => "Příjmení",
-"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.",
-"Sn." => "st.",
-"Import a contacts file" => "Importovat soubor kontaktů",
-"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",
-"Importing contacts" => "Importování kontaktů",
-"You have no contacts in your addressbook." => "Nemáte žádné kontakty v adresáři.",
-"Add contact" => "Přidat kontakt",
-"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í",
-"Share" => "Sdílet",
-"Download" => "Stažení",
-"Edit" => "Editovat",
-"New Address Book" => "Nový adresář",
-"Name" => "Název",
-"Description" => "Popis",
-"Save" => "Uložit",
-"Cancel" => "Storno",
-"More..." => "Více..."
-);
diff --git a/apps/contacts/l10n/da.php b/apps/contacts/l10n/da.php
deleted file mode 100644
index 97c5f1307c..0000000000
--- a/apps/contacts/l10n/da.php
+++ /dev/null
@@ -1,158 +0,0 @@
-<?php $TRANSLATIONS = array(
-"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",
-"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.",
-"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.",
-"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. ",
-"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.",
-"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:",
-"Error loading image." => "Kunne ikke indlæse billede.",
-"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: ",
-"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.",
-"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",
-"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",
-"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.",
-"This is not your addressbook." => "Dette er ikke din adressebog.",
-"Contact could not be found." => "Kontaktperson kunne ikke findes.",
-"Work" => "Arbejde",
-"Home" => "Hjemme",
-"Mobile" => "Mobil",
-"Text" => "SMS",
-"Voice" => "Telefonsvarer",
-"Message" => "Besked",
-"Fax" => "Fax",
-"Video" => "Video",
-"Pager" => "Personsøger",
-"Internet" => "Internet",
-"Birthday" => "Fødselsdag",
-"{name}'s Birthday" => "{name}s fødselsdag",
-"Contact" => "Kontaktperson",
-"Add Contact" => "Tilføj kontaktperson",
-"Import" => "Importer",
-"Addressbooks" => "Adressebøger",
-"Close" => "Luk",
-"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.",
-"Organization" => "Organisation",
-"Delete" => "Slet",
-"Nickname" => "Kaldenavn",
-"Enter nickname" => "Indtast kaldenavn",
-"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",
-"Phone" => "Telefon",
-"Email" => "Email",
-"Address" => "Adresse",
-"Note" => "Note",
-"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",
-"City" => "By",
-"Region" => "Region",
-"Zipcode" => "Postnummer",
-"Country" => "Land",
-"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.",
-"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",
-"Importing contacts" => "Importerer kontaktpersoner",
-"You have no contacts in your addressbook." => "Du har ingen kontaktpersoner i din adressebog.",
-"Add contact" => "Tilføj kontaktpeson.",
-"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",
-"Download" => "Download",
-"Edit" => "Rediger",
-"New Address Book" => "Ny adressebog",
-"Save" => "Gem",
-"Cancel" => "Fortryd"
-);
diff --git a/apps/contacts/l10n/de.php b/apps/contacts/l10n/de.php
deleted file mode 100644
index c2e8884fc2..0000000000
--- a/apps/contacts/l10n/de.php
+++ /dev/null
@@ -1,229 +0,0 @@
-<?php $TRANSLATIONS = array(
-"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",
-"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.",
-"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: ",
-"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. ",
-"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.",
-"Contact ID is missing." => "Keine Kontakt-ID angegeben.",
-"No photo path was submitted." => "Kein Foto-Pfad übermittelt.",
-"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 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 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",
-"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",
-"You do not have permission to add contacts to " => "Sie besitzen nicht die erforderlichen Rechte, um Kontakte hinzuzufügen",
-"Please select one of your own address books." => "Bitte wählen Sie eines Ihrer Adressbücher aus.",
-"Permission error" => "Berechtigungsfehler",
-"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 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 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ö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 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",
-"Mobile" => "Mobil",
-"Text" => "Text",
-"Voice" => "Anruf",
-"Message" => "Mitteilung",
-"Fax" => "Fax",
-"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",
-"Personal" => "Persönlich",
-"Projects" => "Projekte",
-"Questions" => "Fragen",
-"{name}'s Birthday" => "Geburtstag von {name}",
-"Contact" => "Kontakt",
-"You do not have the permissions to edit this contact." => "Sie besitzen nicht die erforderlichen Rechte, um diesen Kontakt zu bearbeiten.",
-"You do not have the permissions to delete this contact." => "Sie besitzen nicht die erforderlichen Rechte, um diesen Kontakte zu löschen.",
-"Add Contact" => "Kontakt hinzufügen",
-"Import" => "Importieren",
-"Settings" => "Einstellungen",
-"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 addressbook" => "Nächstes Adressbuch",
-"Previous addressbook" => "Vorheriges 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",
-"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",
-"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",
-"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 getrennt",
-"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",
-"Mail to address" => "E-Mail an diese Adresse schreiben",
-"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",
-"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",
-"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",
-"Addressbook" => "Adressbuch",
-"Hon. prefixes" => "Höflichkeitspräfixe",
-"Miss" => "Frau",
-"Ms" => "Frau",
-"Mr" => "Herr",
-"Sir" => "Herr",
-"Mrs" => "Frau",
-"Dr" => "Dr.",
-"Given name" => "Vorname",
-"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",
-"Import a contacts file" => "Kontaktdatei importieren",
-"Please choose the addressbook" => "Bitte Adressbuch auswählen",
-"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." => "Sie haben keine Kontakte im Adressbuch.",
-"Add contact" => "Kontakt hinzufügen",
-"Select Address Books" => "Wähle Adressbuch",
-"Enter name" => "Name eingeben",
-"Enter description" => "Beschreibung eingeben",
-"CardDAV syncing addresses" => "CardDAV Sync-Adressen",
-"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",
-"Share" => "Teilen",
-"Download" => "Herunterladen",
-"Edit" => "Bearbeiten",
-"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
deleted file mode 100644
index a50dd81e5d..0000000000
--- a/apps/contacts/l10n/el.php
+++ /dev/null
@@ -1,229 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Error (de)activating addressbook." => "Σφάλμα (απ)ενεργοποίησης βιβλίου διευθύνσεων",
-"id is not set." => "δεν ορίστηκε id",
-"Cannot update addressbook with an empty name." => "Δε μπορεί να γίνει αλλαγή βιβλίου διευθύνσεων χωρίς όνομα",
-"Error updating addressbook." => "Σφάλμα ενημέρωσης βιβλίου διευθύνσεων.",
-"No ID provided" => "Δε δόθηκε ID",
-"Error setting checksum." => "Λάθος κατά τον ορισμό checksum ",
-"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: " => "Προσπάθεια προσθήκης διπλότυπης ιδιότητας:",
-"Missing IM parameter." => "Λείπει IM παράμετρος.",
-"Unknown IM: " => "Άγνωστο IM:",
-"Information about vCard is incorrect. Please reload the page." => "Οι πληροφορίες σχετικά με vCard είναι εσφαλμένες. Παρακαλώ επαναφορτώστε τη σελίδα.",
-"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. " => "Κάτι χάθηκε στο άγνωστο. ",
-"No contact ID was submitted." => "Δε υπεβλήθει ID επαφής",
-"Error reading contact photo." => "Σφάλμα ανάγνωσης εικόνας επαφής",
-"Error saving temporary file." => "Σφάλμα αποθήκευσης προσωρινού αρχείου",
-"The loading photo is not valid." => "Η φορτωμένη φωτογραφία δεν είναι έγκυρη",
-"Contact ID is missing." => "Λείπει 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: " => "Σφάλμα κατά την εύρεση της εικόνας: ",
-"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" => "Λείπει ο προσωρινός φάκελος",
-"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" => "Σφάλμα",
-"You do not have permission to add contacts to " => "Δεν έχετε επαρκή δικαιώματα για προσθέσετε επαφές στο ",
-"Please select one of your own address books." => "Παρακαλούμε επιλέξτε ένα από τα δικάς σας βιβλία διευθύνσεων.",
-"Permission error" => "Σφάλμα δικαιωμάτων",
-"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.",
-"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" => "Ομιλία",
-"Message" => "Μήνυμα",
-"Fax" => "Φαξ",
-"Video" => "Βίντεο",
-"Pager" => "Βομβητής",
-"Internet" => "Διαδίκτυο",
-"Birthday" => "Γενέθλια",
-"Business" => "Επιχείρηση",
-"Call" => "Κάλεσε",
-"Clients" => "Πελάτες",
-"Deliverer" => "Προμηθευτής",
-"Holidays" => "Διακοπές",
-"Ideas" => "Ιδέες",
-"Journey" => "Ταξίδι",
-"Jubilee" => "Ιωβηλαίο",
-"Meeting" => "Συνάντηση",
-"Personal" => "Προσωπικό",
-"Projects" => "Έργα",
-"Questions" => "Ερωτήσεις",
-"{name}'s Birthday" => "{name} έχει Γενέθλια",
-"Contact" => "Επαφή",
-"You do not have the permissions to edit this contact." => "Δεν διαθέτε επαρκή δικαιώματα για την επεξεργασία αυτής της επαφής.",
-"You do not have the permissions to delete this 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" => "Επεξεργασία τρέχουσας φωτογραφίας",
-"Upload new photo" => "Ανέβασε νέα φωτογραφία",
-"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" => "Εισάγετε παρατσούκλι",
-"Web site" => "Ιστότοπος",
-"http://www.somesite.com" => "http://www.somesite.com",
-"Go to web site" => "Πήγαινε στον ιστότοπο",
-"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" => "Διαγραφή διεύθυνση 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" => "Λήψη επαφής",
-"Delete contact" => "Διαγραφή επαφής",
-"The temporary image has been removed from cache." => "Η προσωρινή εικόνα αφαιρέθηκε από την κρυφή μνήμη.",
-"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" => "προθέματα",
-"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.",
-"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" => "Προσθήκη επαφής",
-"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 μόνο για ανάγνωση",
-"Share" => "Μοιράσου",
-"Download" => "Λήψη",
-"Edit" => "Επεξεργασία",
-"New Address Book" => "Νέο βιβλίο διευθύνσεων",
-"Name" => "Όνομα",
-"Description" => "Περιγραφή",
-"Save" => "Αποθήκευση",
-"Cancel" => "Ακύρωση",
-"More..." => "Περισσότερα..."
-);
diff --git a/apps/contacts/l10n/eo.php b/apps/contacts/l10n/eo.php
deleted file mode 100644
index e4eb06db2a..0000000000
--- a/apps/contacts/l10n/eo.php
+++ /dev/null
@@ -1,190 +0,0 @@
-<?php $TRANSLATIONS = array(
-"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.",
-"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.",
-"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:",
-"Information about vCard is incorrect. Please reload the page." => "Informo pri vCard estas malĝusta. Bonvolu reŝargi la paĝon.",
-"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.",
-"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.",
-"Contact ID is missing." => "Kontaktidentigilo mankas.",
-"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.",
-"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: ",
-"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.",
-"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",
-"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",
-"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.",
-"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.",
-"Work" => "Laboro",
-"Home" => "Hejmo",
-"Other" => "Alia",
-"Mobile" => "Poŝtelefono",
-"Text" => "Teksto",
-"Voice" => "Voĉo",
-"Message" => "Mesaĝo",
-"Fax" => "Fakso",
-"Video" => "Videaĵo",
-"Pager" => "Televokilo",
-"Internet" => "Interreto",
-"Birthday" => "Naskiĝotago",
-"Business" => "Negoco",
-"Call" => "Voko",
-"Clients" => "Klientoj",
-"Deliverer" => "Liveranto",
-"Holidays" => "Ferioj",
-"Ideas" => "Ideoj",
-"Journey" => "Vojaĝo",
-"Jubilee" => "Jubileo",
-"Meeting" => "Kunveno",
-"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" => "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",
-"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",
-"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",
-"Organization" => "Organizaĵo",
-"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",
-"Edit groups" => "Redakti grupojn",
-"Preferred" => "Preferata",
-"Please specify a valid email address." => "Bonvolu specifi validan retpoŝtadreson.",
-"Enter email address" => "Enigi retpoŝtadreson",
-"Mail to address" => "Retpoŝtmesaĝo al adreso",
-"Delete email address" => "Forigi retpoŝþadreson",
-"Enter phone number" => "Enigi telefonnumeron",
-"Delete phone number" => "Forigi telefonnumeron",
-"View on map" => "Vidi en mapo",
-"Edit address details" => "Redakti detalojn de adreso",
-"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",
-"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",
-"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",
-"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",
-"Import a contacts file" => "Enporti kontaktodosieron",
-"Please choose the addressbook" => "Bonvolu elekti adresaron",
-"create a new addressbook" => "krei novan adresaron",
-"Name of new addressbook" => "Nomo de nova adresaro",
-"Importing contacts" => "Enportante kontaktojn",
-"You have no contacts in your addressbook." => "Vi ne havas kontaktojn en via adresaro",
-"Add contact" => "Aldoni kontakton",
-"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",
-"More..." => "Pli..."
-);
diff --git a/apps/contacts/l10n/es.php b/apps/contacts/l10n/es.php
deleted file mode 100644
index 543bda3036..0000000000
--- a/apps/contacts/l10n/es.php
+++ /dev/null
@@ -1,208 +0,0 @@
-<?php $TRANSLATIONS = array(
-"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",
-"Error setting checksum." => "Error al establecer la suma de verificación.",
-"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: ",
-"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.",
-"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.",
-"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.",
-"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:",
-"Error loading image." => "Error cargando imagen.",
-"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",
-"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",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "El archivo subido sobrepasa la directiva MAX_FILE_SIZE especificada en el formulario HTML",
-"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",
-"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",
-"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.",
-"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",
-"Mobile" => "Móvil",
-"Text" => "Texto",
-"Voice" => "Voz",
-"Message" => "Mensaje",
-"Fax" => "Fax",
-"Video" => "Vídeo",
-"Pager" => "Localizador",
-"Internet" => "Internet",
-"Birthday" => "Cumpleaños",
-"Business" => "Negocio",
-"Call" => "Llamada",
-"Clients" => "Clientes",
-"Holidays" => "Vacaciones",
-"Ideas" => "Ideas",
-"Journey" => "Jornada",
-"Meeting" => "Reunión",
-"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",
-"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",
-"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",
-"Organization" => "Organización",
-"Delete" => "Borrar",
-"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",
-"Edit groups" => "Editar grupos",
-"Preferred" => "Preferido",
-"Please specify a valid email address." => "Por favor especifica una dirección de correo electrónico válida.",
-"Enter email address" => "Introduce una dirección de correo electrónico",
-"Mail to address" => "Enviar por correo a la dirección",
-"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",
-"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",
-"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",
-"Addressbook" => "Libreta de direcciones",
-"Hon. prefixes" => "Prefijos honoríficos",
-"Miss" => "Srta",
-"Ms" => "Sra.",
-"Mr" => "Sr.",
-"Sir" => "Señor",
-"Mrs" => "Sra",
-"Dr" => "Dr",
-"Given name" => "Nombre",
-"Additional names" => "Nombres adicionales",
-"Family name" => "Apellido",
-"Hon. suffixes" => "Sufijos honoríficos",
-"J.D." => "J.D.",
-"M.D." => "M.D.",
-"D.O." => "D.O.",
-"D.C." => "D.C.",
-"Ph.D." => "Dr",
-"Esq." => "Don",
-"Jr." => "Jr.",
-"Sn." => "Sn.",
-"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",
-"Name of new addressbook" => "Nombre de la nueva agenda",
-"Importing contacts" => "Importando contactos",
-"You have no contacts in your addressbook." => "No hay contactos en tu agenda.",
-"Add contact" => "Añadir contacto",
-"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",
-"Name" => "Nombre",
-"Description" => "Descripción",
-"Save" => "Guardar",
-"Cancel" => "Cancelar",
-"More..." => "Más..."
-);
diff --git a/apps/contacts/l10n/et_EE.php b/apps/contacts/l10n/et_EE.php
deleted file mode 100644
index ea0f80ec51..0000000000
--- a/apps/contacts/l10n/et_EE.php
+++ /dev/null
@@ -1,155 +0,0 @@
-<?php $TRANSLATIONS = array(
-"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",
-"Error setting checksum." => "Viga kontrollsumma määramisel.",
-"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.",
-"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.",
-"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.",
-"Contact ID is missing." => "Kontakti ID puudub.",
-"No photo path was submitted." => "Foto asukohta pole määratud.",
-"File doesn't exist:" => "Faili pole olemas:",
-"Error loading image." => "Viga pildi laadimisel.",
-"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: ",
-"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",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Üleslaetud fail ületab MAX_FILE_SIZE suuruse, mis on HTML vormi jaoks määratud",
-"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",
-"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",
-"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.",
-"This is not your addressbook." => "See pole sinu aadressiraamat.",
-"Contact could not be found." => "Kontakti ei leitud.",
-"Work" => "Töö",
-"Home" => "Kodu",
-"Mobile" => "Mobiil",
-"Text" => "Tekst",
-"Voice" => "Hääl",
-"Message" => "Sõnum",
-"Fax" => "Faks",
-"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",
-"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",
-"Organization" => "Organisatsioon",
-"Delete" => "Kustuta",
-"Nickname" => "Hüüdnimi",
-"Enter nickname" => "Sisesta hüüdnimi",
-"dd-mm-yyyy" => "dd.mm.yyyy",
-"Groups" => "Grupid",
-"Separate groups with commas" => "Eralda grupid komadega",
-"Edit groups" => "Muuda gruppe",
-"Preferred" => "Eelistatud",
-"Please specify a valid email address." => "Palun sisesta korrektne e-posti aadress.",
-"Enter email address" => "Sisesta e-posti aadress",
-"Mail to address" => "Kiri aadressile",
-"Delete email address" => "Kustuta e-posti aadress",
-"Enter phone number" => "Sisesta telefoninumber",
-"Delete phone number" => "Kustuta telefoninumber",
-"View on map" => "Vaata kaardil",
-"Edit address details" => "Muuda aaressi infot",
-"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",
-"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",
-"City" => "Linn",
-"Region" => "Piirkond",
-"Zipcode" => "Postiindeks",
-"Country" => "Riik",
-"Addressbook" => "Aadressiraamat",
-"Hon. prefixes" => "Eesliited",
-"Miss" => "Preili",
-"Ms" => "Pr",
-"Mr" => "Hr",
-"Sir" => "Härra",
-"Mrs" => "Proua",
-"Dr" => "Dr",
-"Given name" => "Eesnimi",
-"Additional names" => "Lisanimed",
-"Family name" => "Perekonnanimi",
-"Hon. suffixes" => "Järelliited",
-"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." => "Senior.",
-"Import a contacts file" => "Impordi kontaktifail",
-"Please choose the addressbook" => "Palun vali aadressiraamat",
-"create a new addressbook" => "loo uus aadressiraamat",
-"Name of new addressbook" => "Uue aadressiraamatu nimi",
-"Importing contacts" => "Kontaktide importimine",
-"You have no contacts in your addressbook." => "Sinu aadressiraamatus pole ühtegi kontakti.",
-"Add contact" => "Lisa kontakt",
-"CardDAV syncing addresses" => "CardDAV sünkroniseerimise aadressid",
-"more info" => "lisainfo",
-"Primary address (Kontact et al)" => "Peamine aadress",
-"iOS/OS X" => "iOS/OS X",
-"Download" => "Lae alla",
-"Edit" => "Muuda",
-"New Address Book" => "Uus aadressiraamat",
-"Save" => "Salvesta",
-"Cancel" => "Loobu"
-);
diff --git a/apps/contacts/l10n/eu.php b/apps/contacts/l10n/eu.php
deleted file mode 100644
index 56a4812670..0000000000
--- a/apps/contacts/l10n/eu.php
+++ /dev/null
@@ -1,169 +0,0 @@
-<?php $TRANSLATIONS = array(
-"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",
-"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.",
-"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:",
-"Information about vCard is incorrect. Please reload the page." => "vCard-aren inguruko informazioa okerra da. Mesedez birkargatu orrialdea.",
-"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:",
-"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.",
-"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:",
-"Error loading image." => "Errore bat izan da irudia kargatzearkoan.",
-"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:",
-"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",
-"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",
-"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.",
-"This is not your addressbook." => "Hau ez da zure helbide liburua.",
-"Contact could not be found." => "Ezin izan da kontaktua aurkitu.",
-"Work" => "Lana",
-"Home" => "Etxea",
-"Other" => "Bestelakoa",
-"Mobile" => "Mugikorra",
-"Text" => "Testua",
-"Voice" => "Ahotsa",
-"Message" => "Mezua",
-"Fax" => "Fax-a",
-"Video" => "Bideoa",
-"Pager" => "Bilagailua",
-"Internet" => "Internet",
-"Birthday" => "Jaioteguna",
-"Call" => "Deia",
-"Clients" => "Bezeroak",
-"Holidays" => "Oporrak",
-"Ideas" => "Ideiak",
-"Journey" => "Bidaia",
-"Meeting" => "Bilera",
-"Personal" => "Pertsonala",
-"Projects" => "Proiektuak",
-"Questions" => "Galderak",
-"{name}'s Birthday" => "{name}ren jaioteguna",
-"Contact" => "Kontaktua",
-"Add Contact" => "Gehitu kontaktua",
-"Import" => "Inportatu",
-"Settings" => "Ezarpenak",
-"Addressbooks" => "Helbide Liburuak",
-"Close" => "Itxi",
-"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",
-"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",
-"Organization" => "Erakundea",
-"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",
-"Edit groups" => "Editatu taldeak",
-"Preferred" => "Hobetsia",
-"Please specify a valid email address." => "Mesedez sartu eposta helbide egoki bat",
-"Enter email address" => "Sartu eposta helbidea",
-"Mail to address" => "Bidali helbidera",
-"Delete email address" => "Ezabatu eposta helbidea",
-"Enter phone number" => "Sartu telefono zenbakia",
-"Delete phone number" => "Ezabatu telefono zenbakia",
-"View on map" => "Ikusi mapan",
-"Edit address details" => "Editatu helbidearen zehaztasunak",
-"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",
-"The temporary image has been removed from cache." => "Aldi bateko irudia cachetik ezabatu da.",
-"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",
-"Import a contacts file" => "Inporatu kontaktuen fitxategia",
-"Please choose the addressbook" => "Mesedez, aukeratu helbide liburua",
-"create a new addressbook" => "sortu helbide liburu berria",
-"Name of new addressbook" => "Helbide liburuaren izena",
-"Importing contacts" => "Kontaktuak inportatzen",
-"You have no contacts in your addressbook." => "Ez duzu kontakturik zure helbide liburuan.",
-"Add contact" => "Gehitu kontaktua",
-"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",
-"Download" => "Deskargatu",
-"Edit" => "Editatu",
-"New Address Book" => "Helbide-liburu berria",
-"Save" => "Gorde",
-"Cancel" => "Ezeztatu"
-);
diff --git a/apps/contacts/l10n/fa.php b/apps/contacts/l10n/fa.php
deleted file mode 100644
index 8029cd201e..0000000000
--- a/apps/contacts/l10n/fa.php
+++ /dev/null
@@ -1,158 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Error (de)activating addressbook." => "خطا در (غیر) فعال سازی کتابچه نشانه ها",
-"id is not set." => "شناسه تعیین نشده",
-"Cannot update addressbook with an empty name." => "نمی توانید کتابچه نشانی ها را با یک نام خالی بروزرسانی کنید",
-"Error updating addressbook." => "خطا در هنگام بروزرسانی کتابچه نشانی ها",
-"No ID provided" => "هیچ شناسه ای ارائه نشده",
-"Error setting checksum." => "خطا در تنظیم checksum",
-"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 شما اشتباه است لطفا صفحه را دوباره بار گذاری کنید",
-"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 رفتند",
-"No contact ID was submitted." => "هیچ اطلاعاتی راجع به شناسه ارسال نشده",
-"Error reading contact photo." => "خطا در خواندن اطلاعات تصویر",
-"Error saving temporary file." => "خطا در ذخیره پرونده موقت",
-"The loading photo is not valid." => "بارگزاری تصویر امکان پذیر نیست",
-"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" => "خطا در تغییر دادن اندازه تصویر",
-"Error cropping image" => "خطا در برداشت تصویر",
-"Error creating temporary image" => "خطا در ساخت تصویر  temporary",
-"Error finding image: " => "خطا در پیدا کردن تصویر:",
-"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 تعیین می شود",
-"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." => "Couldn't get a valid address.",
-"Error" => "خطا",
-"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." => "ناموفق",
-"This is not your addressbook." => "این کتابچه ی نشانه های شما نیست",
-"Contact could not be found." => "اتصال ویا تماسی یافت نشد",
-"Work" => "کار",
-"Home" => "خانه",
-"Mobile" => "موبایل",
-"Text" => "متن",
-"Voice" => "صدا",
-"Message" => "پیغام",
-"Fax" => "دورنگار:",
-"Video" => "رسانه تصویری",
-"Pager" => "صفحه",
-"Internet" => "اینترنت",
-"Birthday" => "روزتولد",
-"{name}'s Birthday" => "روز تولد {name} است",
-"Contact" => "اشخاص",
-"Add Contact" => "افزودن اطلاعات شخص مورد نظر",
-"Import" => "وارد کردن",
-"Addressbooks" => "کتابچه ی نشانی ها",
-"Close" => "بستن",
-"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" => "ویرایش نام جزئیات",
-"Organization" => "نهاد(ارگان)",
-"Delete" => "پاک کردن",
-"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" => "شماره تلفن",
-"Email" => "نشانی پست الکترنیک",
-"Address" => "نشانی",
-"Note" => "یادداشت",
-"Download contact" => "دانلود مشخصات اشخاص",
-"Delete contact" => "پاک کردن  اطلاعات شخص مورد نظر",
-"The temporary image has been removed from cache." => "تصویر موقت از کش پاک شد.",
-"Edit address" => "ویرایش نشانی",
-"Type" => "نوع",
-"PO Box" => "صندوق پستی",
-"Extended" => "تمدید شده",
-"City" => "شهر",
-"Region" => "ناحیه",
-"Zipcode" => "کد پستی",
-"Country" => "کشور",
-"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." => "دکتری",
-"Esq." => "Esq.",
-"Jr." => "Jr.",
-"Sn." => "Sn.",
-"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" => "افزودن اطلاعات شخص مورد نظر",
-"CardDAV syncing addresses" => "CardDAV syncing addresses ",
-"more info" => "اطلاعات بیشتر",
-"Primary address (Kontact et al)" => "نشانی اولیه",
-"iOS/OS X" => "iOS/OS X ",
-"Download" => "بارگیری",
-"Edit" => "ویرایش",
-"New Address Book" => "کتابچه نشانه های جدید",
-"Save" => "ذخیره سازی",
-"Cancel" => "انصراف"
-);
diff --git a/apps/contacts/l10n/fi_FI.php b/apps/contacts/l10n/fi_FI.php
deleted file mode 100644
index 23cafe44dc..0000000000
--- a/apps/contacts/l10n/fi_FI.php
+++ /dev/null
@@ -1,159 +0,0 @@
-<?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.",
-"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 parsing VCard for ID: \"" => "Virhe jäsennettäessä vCardia tunnisteelle: \"",
-"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.",
-"Error resizing image" => "Virhe asettaessa kuvaa uuteen kokoon",
-"Error cropping image" => "Virhe rajatessa kuvaa",
-"Error creating temporary image" => "Virhe luotaessa väliaikaista kuvaa",
-"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",
-"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.",
-"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: ",
-" 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.",
-"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",
-"Mobile" => "Mobiili",
-"Text" => "Teksti",
-"Voice" => "Ääni",
-"Message" => "Viesti",
-"Fax" => "Faksi",
-"Video" => "Video",
-"Pager" => "Hakulaite",
-"Internet" => "Internet",
-"Birthday" => "Syntymäpäivä",
-"Business" => "Työ",
-"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 addressbook" => "Seuraava osoitekirja",
-"Previous addressbook" => "Edellinen osoitekirja",
-"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",
-"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",
-"Organization" => "Organisaatio",
-"Delete" => "Poista",
-"Nickname" => "Kutsumanimi",
-"Enter nickname" => "Anna kutsumanimi",
-"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ä",
-"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.",
-"Add field" => "Lisää kenttä",
-"Phone" => "Puhelin",
-"Email" => "Sähköposti",
-"Address" => "Osoite",
-"Note" => "Huomio",
-"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",
-"Apartment number etc." => "Asunnon numero jne.",
-"City" => "Paikkakunta",
-"Region" => "Alue",
-"Zipcode" => "Postinumero",
-"Postal code" => "Postinumero",
-"Country" => "Maa",
-"Addressbook" => "Osoitekirja",
-"Given name" => "Etunimi",
-"Additional names" => "Lisänimet",
-"Family name" => "Sukunimi",
-"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",
-"Importing contacts" => "Tuodaan yhteystietoja",
-"You have no contacts in your addressbook." => "Osoitekirjassasi ei ole yhteystietoja.",
-"Add contact" => "Lisää yhteystieto",
-"Select Address Books" => "Valitse osoitekirjat",
-"Enter name" => "Anna nimi",
-"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",
-"Share" => "Jaa",
-"Download" => "Lataa",
-"Edit" => "Muokkaa",
-"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
deleted file mode 100644
index 787843f0f2..0000000000
--- a/apps/contacts/l10n/fr.php
+++ /dev/null
@@ -1,229 +0,0 @@
-<?php $TRANSLATIONS = array(
-"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",
-"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.",
-"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:",
-"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.",
-"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.",
-"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.",
-"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:",
-"Error loading image." => "Erreur lors du chargement de l'image.",
-"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 :",
-"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",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Le fichier envoyé dépasse la directive MAX_FILE_SIZE qui est spécifiée dans le formulaire HTML.",
-"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",
-"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",
-"You do not have permission to add contacts to " => "Vous n'avez pas l'autorisation d'ajouter des contacts à",
-"Please select one of your own address books." => "Veuillez sélectionner l'un de vos carnets d'adresses.",
-"Permission error" => "Erreur de permission",
-"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 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 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é,",
-" 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é.",
-"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" => "Domicile",
-"Other" => "Autre",
-"Mobile" => "Mobile",
-"Text" => "Texte",
-"Voice" => "Voix",
-"Message" => "Message",
-"Fax" => "Fax",
-"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",
-"Personal" => "Personnel",
-"Projects" => "Projets",
-"Questions" => "Questions",
-"{name}'s Birthday" => "Anniversaire de {name}",
-"Contact" => "Contact",
-"You do not have the permissions to edit this contact." => "Vous n'avez pas l'autorisation de modifier ce contact.",
-"You do not have the permissions to delete this contact." => "Vous n'avez pas l'autorisation de supprimer ce contact.",
-"Add Contact" => "Ajouter un Contact",
-"Import" => "Importer",
-"Settings" => "Paramètres",
-"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 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",
-"Add new addressbook" => "Ajouter un nouveau carnet d'adresses",
-"Delete current contact" => "Effacer le contact sélectionné",
-"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",
-"Organization" => "Société",
-"Delete" => "Supprimer",
-"Nickname" => "Surnom",
-"Enter nickname" => "Entrer un surnom",
-"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",
-"Edit groups" => "Editer les groupes",
-"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",
-"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",
-"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",
-"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",
-"Addressbook" => "Carnet d'adresses",
-"Hon. prefixes" => "Préfixe hon.",
-"Miss" => "Mlle",
-"Ms" => "Mme",
-"Mr" => "M.",
-"Sir" => "Sir",
-"Mrs" => "Mme",
-"Dr" => "Dr",
-"Given name" => "Prénom",
-"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.",
-"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",
-"Name of new addressbook" => "Nom du nouveau carnet d'adresses",
-"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",
-"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",
-"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",
-"Name" => "Nom",
-"Description" => "Description",
-"Save" => "Sauvegarder",
-"Cancel" => "Annuler",
-"More..." => "Plus…"
-);
diff --git a/apps/contacts/l10n/gl.php b/apps/contacts/l10n/gl.php
deleted file mode 100644
index f25219b22c..0000000000
--- a/apps/contacts/l10n/gl.php
+++ /dev/null
@@ -1,157 +0,0 @@
-<?php $TRANSLATIONS = array(
-"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",
-"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.",
-"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.",
-"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: ",
-"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.",
-"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: ",
-"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",
-"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.",
-"This is not your addressbook." => "Esta non é a súa axenda.",
-"Contact could not be found." => "Non se atopou o contacto.",
-"Work" => "Traballo",
-"Home" => "Casa",
-"Mobile" => "Móbil",
-"Text" => "Texto",
-"Voice" => "Voz",
-"Message" => "Mensaxe",
-"Fax" => "Fax",
-"Video" => "Vídeo",
-"Pager" => "Paxinador",
-"Internet" => "Internet",
-"Birthday" => "Aniversario",
-"{name}'s Birthday" => "Cumpleanos de {name}",
-"Contact" => "Contacto",
-"Add Contact" => "Engadir contacto",
-"Import" => "Importar",
-"Addressbooks" => "Axendas",
-"Close" => "Pechar",
-"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",
-"Organization" => "Organización",
-"Delete" => "Eliminar",
-"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",
-"Email" => "Correo electrónico",
-"Address" => "Enderezo",
-"Note" => "Nota",
-"Download contact" => "Descargar contacto",
-"Delete contact" => "Borrar contacto",
-"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",
-"City" => "Cidade",
-"Region" => "Autonomía",
-"Zipcode" => "Código postal",
-"Country" => "País",
-"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.",
-"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",
-"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",
-"Download" => "Descargar",
-"Edit" => "Editar",
-"New Address Book" => "Nova axenda",
-"Save" => "Gardar",
-"Cancel" => "Cancelar"
-);
diff --git a/apps/contacts/l10n/he.php b/apps/contacts/l10n/he.php
deleted file mode 100644
index b224403ad2..0000000000
--- a/apps/contacts/l10n/he.php
+++ /dev/null
@@ -1,135 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Error (de)activating addressbook." => "שגיאה בהפעלה או בנטרול פנקס הכתובות.",
-"id is not set." => "מספר מזהה לא נקבע.",
-"Cannot update addressbook with an empty name." => "אי אפשר לעדכן ספר כתובות ללא שם",
-"Error updating addressbook." => "שגיאה בעדכון פנקס הכתובות.",
-"No ID provided" => "לא צוין מזהה",
-"Error setting checksum." => "שגיאה בהגדרת נתוני הביקורת.",
-"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 אינו נכון. נא לטעון מחדש את הדף.",
-"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. " => "משהו לא התנהל כצפוי.",
-"No contact ID was submitted." => "מספר מזהה של אישר הקשר לא נשלח.",
-"Error reading contact photo." => "שגיאה בקריאת תמונת איש הקשר.",
-"Error saving temporary file." => "שגיאה בשמירת קובץ זמני.",
-"The loading photo is not valid." => "התמונה הנטענת אינה תקנית.",
-"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" => "שגיאה בשינוי גודל התמונה",
-"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" => "אנשי קשר",
-"This is not your addressbook." => "זהו אינו ספר הכתובות שלך",
-"Contact could not be found." => "לא ניתן לאתר איש קשר",
-"Work" => "עבודה",
-"Home" => "בית",
-"Mobile" => "נייד",
-"Text" => "טקסט",
-"Voice" => "קולי",
-"Message" => "הודעה",
-"Fax" => "פקס",
-"Video" => "וידאו",
-"Pager" => "זימונית",
-"Internet" => "אינטרנט",
-"Birthday" => "יום הולדת",
-"{name}'s Birthday" => "יום ההולדת של {name}",
-"Contact" => "איש קשר",
-"Add Contact" => "הוספת איש קשר",
-"Import" => "יבא",
-"Addressbooks" => "פנקסי כתובות",
-"Drop photo to upload" => "גרור ושחרר תמונה בשביל להעלות",
-"Delete current photo" => "מחק תמונה נוכחית",
-"Edit current photo" => "ערוך תמונה נוכחית",
-"Upload new photo" => "העלה תמונה חדשה",
-"Select photo from ownCloud" => "בחר תמונה מ ownCloud",
-"Edit name details" => "ערוך פרטי שם",
-"Organization" => "ארגון",
-"Delete" => "מחיקה",
-"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" => "טלפון",
-"Email" => "דואר אלקטרוני",
-"Address" => "כתובת",
-"Note" => "הערה",
-"Download contact" => "הורדת איש קשר",
-"Delete contact" => "מחיקת איש קשר",
-"Edit address" => "ערוך כתובת",
-"Type" => "סוג",
-"PO Box" => "תא דואר",
-"Extended" => "מורחב",
-"City" => "עיר",
-"Region" => "אזור",
-"Zipcode" => "מיקוד",
-"Country" => "מדינה",
-"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.",
-"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" => "הוסף איש קשר",
-"CardDAV syncing addresses" => "CardDAV מסנכרן כתובות",
-"more info" => "מידע נוסף",
-"Primary address (Kontact et al)" => "כתובת ראשית",
-"iOS/OS X" => "iOS/OS X",
-"Download" => "הורדה",
-"Edit" => "עריכה",
-"New Address Book" => "פנקס כתובות חדש",
-"Save" => "שמירה",
-"Cancel" => "ביטול"
-);
diff --git a/apps/contacts/l10n/hr.php b/apps/contacts/l10n/hr.php
deleted file mode 100644
index 769a6ced0f..0000000000
--- a/apps/contacts/l10n/hr.php
+++ /dev/null
@@ -1,93 +0,0 @@
-<?php $TRANSLATIONS = array(
-"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",
-"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.",
-"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.",
-"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...",
-"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",
-"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",
-"This is not your addressbook." => "Ovo nije vaš adresar.",
-"Contact could not be found." => "Kontakt ne postoji.",
-"Work" => "Posao",
-"Home" => "Kuća",
-"Mobile" => "Mobitel",
-"Text" => "Tekst",
-"Voice" => "Glasovno",
-"Message" => "Poruka",
-"Fax" => "Fax",
-"Video" => "Video",
-"Pager" => "Pager",
-"Internet" => "Internet",
-"Birthday" => "Rođendan",
-"{name}'s Birthday" => "{name} Rođendan",
-"Contact" => "Kontakt",
-"Add Contact" => "Dodaj kontakt",
-"Import" => "Uvezi",
-"Addressbooks" => "Adresari",
-"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",
-"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",
-"Edit address details" => "Uredi detalje adrese",
-"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",
-"Edit address" => "Uredi adresu",
-"Type" => "Tip",
-"PO Box" => "Poštanski Pretinac",
-"Extended" => "Prošireno",
-"City" => "Grad",
-"Region" => "Regija",
-"Zipcode" => "Poštanski broj",
-"Country" => "Država",
-"Addressbook" => "Adresar",
-"Download" => "Preuzimanje",
-"Edit" => "Uredi",
-"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
deleted file mode 100644
index 4febe9c29f..0000000000
--- a/apps/contacts/l10n/hu_HU.php
+++ /dev/null
@@ -1,158 +0,0 @@
-<?php $TRANSLATIONS = array(
-"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",
-"Error setting checksum." => "Hiba az ellenőrzőösszeg beállításakor",
-"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.",
-"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.",
-"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",
-"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:",
-"Error loading image." => "Kép betöltése sikertelen",
-"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ó",
-"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",
-"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",
-"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",
-"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",
-"This is not your addressbook." => "Ez nem a te címjegyzéked.",
-"Contact could not be found." => "Kapcsolat nem található.",
-"Work" => "Munkahelyi",
-"Home" => "Otthoni",
-"Mobile" => "Mobiltelefonszám",
-"Text" => "Szöveg",
-"Voice" => "Hang",
-"Message" => "Üzenet",
-"Fax" => "Fax",
-"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",
-"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",
-"Organization" => "Szervezet",
-"Delete" => "Törlés",
-"Nickname" => "Becenév",
-"Enter nickname" => "Becenév megadása",
-"dd-mm-yyyy" => "yyyy-mm-dd",
-"Groups" => "Csoportok",
-"Separate groups with commas" => "Vesszővel válassza el a csoportokat",
-"Edit groups" => "Csoportok szerkesztése",
-"Preferred" => "Előnyben részesített",
-"Please specify a valid email address." => "Adjon meg érvényes email címet",
-"Enter email address" => "Adja meg az email címet",
-"Mail to address" => "Postai cím",
-"Delete email address" => "Email cím törlése",
-"Enter phone number" => "Adja meg a telefonszámot",
-"Delete phone number" => "Telefonszám törlése",
-"View on map" => "Megtekintés a térképen",
-"Edit address details" => "Cím részleteinek szerkesztése",
-"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",
-"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",
-"City" => "Város",
-"Region" => "Megye",
-"Zipcode" => "Irányítószám",
-"Country" => "Ország",
-"Addressbook" => "Címlista",
-"Hon. prefixes" => "Előtag",
-"Miss" => "Miss",
-"Ms" => "Ms",
-"Mr" => "Mr",
-"Sir" => "Sir",
-"Mrs" => "Mrs",
-"Dr" => "Dr.",
-"Given name" => "Teljes név",
-"Additional names" => "További nevek",
-"Family name" => "Családnév",
-"Hon. suffixes" => "Utótag",
-"J.D." => "J.D.",
-"M.D." => "M.D.",
-"D.O." => "D.O.",
-"D.C." => "D.C.",
-"Ph.D." => "Ph.D.",
-"Esq." => "Esq.",
-"Jr." => "Ifj.",
-"Sn." => "Id.",
-"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",
-"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",
-"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",
-"Download" => "Letöltés",
-"Edit" => "Szerkesztés",
-"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
deleted file mode 100644
index 338ceb7154..0000000000
--- a/apps/contacts/l10n/ia.php
+++ /dev/null
@@ -1,81 +0,0 @@
-<?php $TRANSLATIONS = array(
-"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.",
-"Missing a temporary folder" => "Manca un dossier temporari",
-"Contacts" => "Contactos",
-"This is not your addressbook." => "Iste non es tu libro de adresses",
-"Contact could not be found." => "Contacto non poterea esser legite",
-"Work" => "Travalio",
-"Home" => "Domo",
-"Mobile" => "Mobile",
-"Text" => "Texto",
-"Voice" => "Voce",
-"Message" => "Message",
-"Fax" => "Fax",
-"Video" => "Video",
-"Pager" => "Pager",
-"Internet" => "Internet",
-"Birthday" => "Anniversario",
-"Contact" => "Contacto",
-"Add Contact" => "Adder contacto",
-"Import" => "Importar",
-"Addressbooks" => "Adressarios",
-"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",
-"Organization" => "Organisation",
-"Delete" => "Deler",
-"Nickname" => "Pseudonymo",
-"Enter nickname" => "Inserer pseudonymo",
-"Groups" => "Gruppos",
-"Edit groups" => "Modificar gruppos",
-"Preferred" => "Preferite",
-"Enter email address" => "Entrar un adresse de e-posta",
-"Delete email address" => "Deler adresse de E-posta",
-"Enter phone number" => "Entrar un numero de telephono",
-"Delete phone number" => "Deler numero de telephono",
-"View on map" => "Vider in un carta",
-"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",
-"Edit address" => "Modificar adresses",
-"Type" => "Typo",
-"PO Box" => "Cassa postal",
-"Extended" => "Extendite",
-"City" => "Citate",
-"Region" => "Region",
-"Zipcode" => "Codice postal",
-"Country" => "Pais",
-"Addressbook" => "Adressario",
-"Hon. prefixes" => "Prefixos honorific",
-"Miss" => "Senioretta",
-"Mr" => "Sr.",
-"Mrs" => "Sra.",
-"Dr" => "Dr.",
-"Given name" => "Nomine date",
-"Additional names" => "Nomines additional",
-"Family name" => "Nomine de familia",
-"Hon. suffixes" => "Suffixos honorific",
-"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",
-"Name of new addressbook" => "Nomine del nove gruppo:",
-"Add contact" => "Adder adressario",
-"more info" => "plus info",
-"iOS/OS X" => "iOS/OS X",
-"Download" => "Discargar",
-"Edit" => "Modificar",
-"New Address Book" => "Nove adressario",
-"Save" => "Salveguardar",
-"Cancel" => "Cancellar"
-);
diff --git a/apps/contacts/l10n/it.php b/apps/contacts/l10n/it.php
deleted file mode 100644
index 1f0e2e3955..0000000000
--- a/apps/contacts/l10n/it.php
+++ /dev/null
@@ -1,229 +0,0 @@
-<?php $TRANSLATIONS = array(
-"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",
-"Error setting checksum." => "Errore di impostazione del codice di controllo.",
-"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",
-"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.",
-"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. ",
-"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.",
-"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:",
-"Error loading image." => "Errore di caricamento immagine.",
-"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: ",
-"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",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Il file inviato supera la direttiva MAX_FILE_SIZE specificata nel modulo HTML",
-"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",
-"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",
-"You do not have permission to add contacts to " => "Non hai i permessi per aggiungere contatti a",
-"Please select one of your own address books." => "Seleziona una delle tue rubriche.",
-"Permission error" => "Errore relativo ai permessi",
-"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.",
-"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.",
-"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.",
-"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",
-"Mobile" => "Cellulare",
-"Text" => "Testo",
-"Voice" => "Voce",
-"Message" => "Messaggio",
-"Fax" => "Fax",
-"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",
-"Personal" => "Personale",
-"Projects" => "Progetti",
-"Questions" => "Domande",
-"{name}'s Birthday" => "Data di nascita di {name}",
-"Contact" => "Contatto",
-"You do not have the permissions to edit this contact." => "Non hai i permessi per modificare questo contatto.",
-"You do not have the permissions to delete this contact." => "Non hai i permessi per eliminare questo contatto.",
-"Add Contact" => "Aggiungi contatto",
-"Import" => "Importa",
-"Settings" => "Impostazioni",
-"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 addressbook" => "Rubrica successiva",
-"Previous addressbook" => "Rubrica 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",
-"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",
-"Organization" => "Organizzazione",
-"Delete" => "Elimina",
-"Nickname" => "Pseudonimo",
-"Enter nickname" => "Inserisci pseudonimo",
-"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",
-"Edit groups" => "Modifica gruppi",
-"Preferred" => "Preferito",
-"Please specify a valid email address." => "Specifica un indirizzo email valido",
-"Enter email address" => "Inserisci indirizzo email",
-"Mail to address" => "Invia per email",
-"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",
-"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",
-"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",
-"Addressbook" => "Rubrica",
-"Hon. prefixes" => "Prefissi onorifici",
-"Miss" => "Sig.na",
-"Ms" => "Sig.ra",
-"Mr" => "Sig.",
-"Sir" => "Sig.",
-"Mrs" => "Sig.ra",
-"Dr" => "Dott.",
-"Given name" => "Nome",
-"Additional names" => "Nomi aggiuntivi",
-"Family name" => "Cognome",
-"Hon. suffixes" => "Suffissi onorifici",
-"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.",
-"Import a contacts file" => "Importa un file di contatti",
-"Please choose the addressbook" => "Scegli la rubrica",
-"create a new addressbook" => "crea una nuova rubrica",
-"Name of new addressbook" => "Nome della nuova rubrica",
-"Importing contacts" => "Importazione contatti",
-"You have no contacts in your addressbook." => "Non hai contatti nella rubrica.",
-"Add contact" => "Aggiungi contatto",
-"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",
-"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",
-"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
deleted file mode 100644
index 9b5874d459..0000000000
--- a/apps/contacts/l10n/ja_JP.php
+++ /dev/null
@@ -1,229 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Error (de)activating addressbook." => "アドレス帳の有効／無効化に失敗しました。",
-"id is not set." => "idが設定されていません。",
-"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 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: " => "重複する属性を追加: ",
-"Missing IM parameter." => "IMのパラメータが不足しています。",
-"Unknown IM: " => "不明なIM:",
-"Information about vCard is incorrect. Please reload the page." => "vCardの情報に誤りがあります。ページをリロードして下さい。",
-"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へ移動しました。",
-"No contact ID was submitted." => "連絡先IDは登録されませんでした。",
-"Error reading contact photo." => "連絡先写真の読み込みエラー。",
-"Error saving temporary file." => "一時ファイルの保存エラー。",
-"The loading photo is not valid." => "写真の読み込みは無効です。",
-"Contact ID is missing." => "連絡先 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: " => "画像検索エラー: ",
-"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" => "エラー",
-"You do not have permission to add contacts to " => "連絡先を追加する権限がありません",
-"Please select one of your own address books." => "アドレス帳を一つ選択してください",
-"Permission error" => "権限エラー",
-"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." => "アップロードしようとしているファイルは、このサーバの最大ファイルアップロードサイズを超えています。",
-"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" => "Googleトーク",
-"Facebook" => "Facebook",
-"XMPP" => "XMPP",
-"ICQ" => "ICQ",
-"Yahoo" => "Yahoo",
-"Skype" => "Skype",
-"QQ" => "QQ",
-"GaduGadu" => "GaduGadu",
-"Work" => "勤務先",
-"Home" => "住居",
-"Other" => "その他",
-"Mobile" => "携帯電話",
-"Text" => "TTY TDD",
-"Voice" => "音声番号",
-"Message" => "メッセージ",
-"Fax" => "FAX",
-"Video" => "テレビ電話",
-"Pager" => "ポケベル",
-"Internet" => "インターネット",
-"Birthday" => "誕生日",
-"Business" => "ビジネス",
-"Call" => "電話",
-"Clients" => "顧客",
-"Deliverer" => "運送会社",
-"Holidays" => "休日",
-"Ideas" => "アイデア",
-"Journey" => "旅行",
-"Jubilee" => "記念祭",
-"Meeting" => "打ち合わせ",
-"Personal" => "個人",
-"Projects" => "プロジェクト",
-"Questions" => "質問",
-"{name}'s Birthday" => "{name}の誕生日",
-"Contact" => "連絡先",
-"You do not have the permissions to edit this contact." => "この連絡先を編集する権限がありません",
-"You do not have the permissions to delete this 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" => "現在の写真を編集",
-"Upload new photo" => "新しい写真をアップロード",
-"Select photo from ownCloud" => "ownCloudから写真を選択",
-"Format custom, Short name, Full name, Reverse or Reverse with comma" => "編集フォーマット、ショートネーム、フルネーム、逆順、カンマ区切りの逆順",
-"Edit name details" => "名前の詳細を編集",
-"Organization" => "所属",
-"Delete" => "削除",
-"Nickname" => "ニックネーム",
-"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" => "コンマでグループを分割",
-"Edit groups" => "グループを編集",
-"Preferred" => "推奨",
-"Please specify a valid email address." => "有効なメールアドレスを指定してください。",
-"Enter email address" => "メールアドレスを入力",
-"Mail to address" => "アドレスへメールを送る",
-"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" => "連絡先のダウンロード",
-"Delete contact" => "連絡先の削除",
-"The temporary image has been removed from cache." => "一時画像はキャッシュから削除されました。",
-"Edit address" => "住所を編集",
-"Type" => "種類",
-"PO Box" => "私書箱",
-"Street address" => "住所1",
-"Street and number" => "番地",
-"Extended" => "住所2",
-"Apartment number etc." => "アパート名等",
-"City" => "都市",
-"Region" => "都道府県",
-"E.g. state or province" => "例：東京都、大阪府",
-"Zipcode" => "郵便番号",
-"Postal code" => "郵便番号",
-"Country" => "国名",
-"Addressbook" => "アドレス帳",
-"Hon. prefixes" => "敬称",
-"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.",
-"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" => "連絡先を追加",
-"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リンクを表示",
-"Share" => "共有",
-"Download" => "ダウンロード",
-"Edit" => "編集",
-"New Address Book" => "新規のアドレス帳",
-"Name" => "名前",
-"Description" => "説明",
-"Save" => "保存",
-"Cancel" => "取り消し",
-"More..." => "もっと..."
-);
diff --git a/apps/contacts/l10n/ko.php b/apps/contacts/l10n/ko.php
deleted file mode 100644
index 4349224f53..0000000000
--- a/apps/contacts/l10n/ko.php
+++ /dev/null
@@ -1,155 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Error (de)activating addressbook." => "주소록을 (비)활성화하는 데 실패했습니다.",
-"id is not set." => "아이디가 설정되어 있지 않습니다. ",
-"Cannot update addressbook with an empty name." => "주소록에 이름란이 비어있으면 업데이트를 할 수 없습니다. ",
-"Error updating addressbook." => "주소록을 업데이트할 수 없습니다.",
-"No ID provided" => "제공되는 아이디 없음",
-"Error setting checksum." => "오류 검사합계 설정",
-"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 정보가 올바르지 않습니다. 페이지를 새로 고치십시오.",
-"Missing ID" => "아이디 분실",
-"Error parsing VCard for ID: \"" => "아이디에 대한 VCard 분석 오류",
-"checksum is not set." => "체크섬이 설정되지 않았습니다.",
-"Information about vCard is incorrect. Please reload the page: " => " vCard에 대한 정보가 잘못되었습니다. 페이지를 다시 로드하세요:",
-"No contact ID was submitted." => "접속 아이디가 기입되지 않았습니다.",
-"Error reading contact photo." => "사진 읽기 오류",
-"Error saving temporary file." => "임시 파일을 저장하는 동안 오류가 발생했습니다. ",
-"The loading photo is not valid." => "로딩 사진이 유효하지 않습니다. ",
-"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" => "이미지 크기 조정 중 오류가 발생했습니다.",
-"Error cropping image" => "이미지를 자르던 중 오류가 발생했습니다.",
-"Error creating temporary image" => "임시 이미지를 생성 중 오류가 발생했습니다.",
-"Error finding image: " => "이미지를 찾던 중 오류가 발생했습니다:",
-"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" => "오류",
-"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." => "실패.",
-"This is not your addressbook." => "내 주소록이 아닙니다.",
-"Contact could not be found." => "연락처를 찾을 수 없습니다.",
-"Work" => "직장",
-"Home" => "자택",
-"Mobile" => "휴대폰",
-"Text" => "문자 번호",
-"Voice" => "음성 번호",
-"Message" => "메세지",
-"Fax" => "팩스 번호",
-"Video" => "영상 번호",
-"Pager" => "호출기",
-"Internet" => "인터넷",
-"Birthday" => "생일",
-"{name}'s Birthday" => "{이름}의 생일",
-"Contact" => "연락처",
-"Add Contact" => "연락처 추가",
-"Import" => "입력",
-"Addressbooks" => "주소록",
-"Close" => "닫기",
-"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" => "이름 세부사항을 편집합니다. ",
-"Organization" => "조직",
-"Delete" => "삭제",
-"Nickname" => "별명",
-"Enter nickname" => "별명 입력",
-"dd-mm-yyyy" => "일-월-년",
-"Groups" => "그룹",
-"Separate groups with commas" => "쉼표로 그룹 구분",
-"Edit groups" => "그룹 편집",
-"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" => "전화 번호",
-"Email" => "전자 우편",
-"Address" => "주소",
-"Note" => "노트",
-"Download contact" => "연락처 다운로드",
-"Delete contact" => "연락처 삭제",
-"The temporary image has been removed from cache." => "임시 이미지가 캐시에서 제거 되었습니다. ",
-"Edit address" => "주소 수정",
-"Type" => "종류",
-"PO Box" => "사서함",
-"Extended" => "확장",
-"City" => "도시",
-"Region" => "지역",
-"Zipcode" => "우편 번호",
-"Country" => "국가",
-"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.",
-"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" => "연락처 추가",
-"CardDAV syncing addresses" => "CardDAV 주소 동기화",
-"more info" => "더 많은 정보",
-"Primary address (Kontact et al)" => "기본 주소 (Kontact et al)",
-"iOS/OS X" => "iOS/OS X",
-"Download" => "다운로드",
-"Edit" => "편집",
-"New Address Book" => "새 주소록",
-"Save" => "저장",
-"Cancel" => "취소"
-);
diff --git a/apps/contacts/l10n/lb.php b/apps/contacts/l10n/lb.php
deleted file mode 100644
index 22ca20e751..0000000000
--- a/apps/contacts/l10n/lb.php
+++ /dev/null
@@ -1,86 +0,0 @@
-<?php $TRANSLATIONS = array(
-"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.",
-"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.",
-"Contact ID is missing." => "Kontakt ID fehlt.",
-"File doesn't exist:" => "Fichier existéiert net:",
-"Error loading image." => "Fehler beim lueden vum Bild.",
-"No file was uploaded" => "Et ass kee Fichier ropgeluede ginn",
-"Contacts" => "Kontakter",
-"Error" => "Fehler",
-"Result: " => "Resultat: ",
-" 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.",
-"Work" => "Aarbecht",
-"Home" => "Doheem",
-"Mobile" => "GSM",
-"Text" => "SMS",
-"Voice" => "Voice",
-"Message" => "Message",
-"Fax" => "Fax",
-"Video" => "Video",
-"Pager" => "Pager",
-"Internet" => "Internet",
-"Birthday" => "Gebuertsdag",
-"{name}'s Birthday" => "{name} säi Gebuertsdag",
-"Contact" => "Kontakt",
-"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",
-"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",
-"Email" => "Email",
-"Address" => "Adress",
-"Note" => "Note",
-"Download contact" => "Kontakt eroflueden",
-"Delete contact" => "Kontakt läschen",
-"Type" => "Typ",
-"PO Box" => "Postleetzuel",
-"Extended" => "Erweidert",
-"City" => "Staat",
-"Region" => "Regioun",
-"Zipcode" => "Postleetzuel",
-"Country" => "Land",
-"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.",
-"iOS/OS X" => "iOS/OS X",
-"Download" => "Download",
-"Edit" => "Editéieren",
-"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
deleted file mode 100644
index 3b31aa7931..0000000000
--- a/apps/contacts/l10n/lt_LT.php
+++ /dev/null
@@ -1,53 +0,0 @@
-<?php $TRANSLATIONS = array(
-"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.",
-"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",
-"This is not your addressbook." => "Tai ne jūsų adresų knygelė.",
-"Contact could not be found." => "Kontaktas nerastas",
-"Work" => "Darbo",
-"Home" => "Namų",
-"Mobile" => "Mobilusis",
-"Text" => "Žinučių",
-"Voice" => "Balso",
-"Message" => "Žinutė",
-"Fax" => "Faksas",
-"Video" => "Vaizdo",
-"Pager" => "Pranešimų gaviklis",
-"Internet" => "Internetas",
-"Birthday" => "Gimtadienis",
-"Contact" => "Kontaktas",
-"Add Contact" => "Pridėti kontaktą",
-"Addressbooks" => "Adresų knygos",
-"Organization" => "Organizacija",
-"Delete" => "Trinti",
-"Nickname" => "Slapyvardis",
-"Enter nickname" => "Įveskite slapyvardį",
-"Phone" => "Telefonas",
-"Email" => "El. paštas",
-"Address" => "Adresas",
-"Download contact" => "Atsisųsti kontaktą",
-"Delete contact" => "Ištrinti kontaktą",
-"Type" => "Tipas",
-"PO Box" => "Pašto dėžutė",
-"City" => "Miestas",
-"Region" => "Regionas",
-"Zipcode" => "Pašto indeksas",
-"Country" => "Šalis",
-"Addressbook" => "Adresų knyga",
-"Download" => "Atsisiųsti",
-"Edit" => "Keisti",
-"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
deleted file mode 100644
index 093b105777..0000000000
--- a/apps/contacts/l10n/mk.php
+++ /dev/null
@@ -1,158 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Error (de)activating addressbook." => "Грешка (де)активирање на адресарот.",
-"id is not set." => "ид не е поставено.",
-"Cannot update addressbook with an empty name." => "Неможе да се ажурира адресар со празно име.",
-"Error updating addressbook." => "Грешка при ажурирање на адресарот.",
-"No ID provided" => "Нема доставено ИД",
-"Error setting checksum." => "Грешка во поставување сума за проверка.",
-"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 не е точна. Ве молам превчитајте ја страницава.",
-"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. " => "Нешто се расипа.",
-"No contact ID was submitted." => "Не беше доставено ИД за контакт.",
-"Error reading contact photo." => "Грешка во читање на контакт фотографија.",
-"Error saving temporary file." => "Грешка во снимање на привремена датотека.",
-"The loading photo is not valid." => "Фотографијата која се вчитува е невалидна.",
-"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" => "Грешка при скалирање на фотографијата",
-"Error cropping image" => "Грешка при сечење на фотографијата",
-"Error creating temporary image" => "Грешка при креирањето на привремената фотографија",
-"Error finding image: " => "Грешка при наоѓањето на фотографијата:",
-"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" => "Недостасува привремена папка",
-"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" => "Грешка",
-"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." => "неуспешно.",
-"This is not your addressbook." => "Ова не е во Вашиот адресар.",
-"Contact could not be found." => "Контактот неможе да биде најден.",
-"Work" => "Работа",
-"Home" => "Дома",
-"Mobile" => "Мобилен",
-"Text" => "Текст",
-"Voice" => "Глас",
-"Message" => "Порака",
-"Fax" => "Факс",
-"Video" => "Видео",
-"Pager" => "Пејџер",
-"Internet" => "Интернет",
-"Birthday" => "Роденден",
-"{name}'s Birthday" => "Роденден на {name}",
-"Contact" => "Контакт",
-"Add Contact" => "Додади контакт",
-"Import" => "Внеси",
-"Addressbooks" => "Адресари",
-"Close" => "Затвои",
-"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" => "Уреди детали за име",
-"Organization" => "Организација",
-"Delete" => "Избриши",
-"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" => "Телефон",
-"Email" => "Е-пошта",
-"Address" => "Адреса",
-"Note" => "Забелешка",
-"Download contact" => "Преземи го контактот",
-"Delete contact" => "Избриши го контактот",
-"The temporary image has been removed from cache." => "Привремената слика е отстранета од кешот.",
-"Edit address" => "Уреди адреса",
-"Type" => "Тип",
-"PO Box" => "Поштенски фах",
-"Extended" => "Дополнително",
-"City" => "Град",
-"Region" => "Регион",
-"Zipcode" => "Поштенски код",
-"Country" => "Држава",
-"Addressbook" => "Адресар",
-"Hon. prefixes" => "Префикси за титула",
-"Miss" => "Г-ца",
-"Ms" => "Г-ѓа",
-"Mr" => "Г-дин",
-"Sir" => "Сер",
-"Mrs" => "Г-ѓа",
-"Dr" => "Др",
-"Given name" => "Лично име",
-"Additional names" => "Дополнителни имиња",
-"Family name" => "Презиме",
-"Hon. suffixes" => "Суфикси за титула",
-"J.D." => "J.D.",
-"M.D." => "Д.М.",
-"D.O." => "D.O.",
-"D.C." => "D.C.",
-"Ph.D." => "Д-р",
-"Esq." => "Esq.",
-"Jr." => "Помлад.",
-"Sn." => "Постар.",
-"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" => "Додади контакт",
-"CardDAV syncing addresses" => "Адреса за синхронизација со CardDAV",
-"more info" => "повеќе информации",
-"Primary address (Kontact et al)" => "Примарна адреса",
-"iOS/OS X" => "iOS/OS X",
-"Download" => "Преземи",
-"Edit" => "Уреди",
-"New Address Book" => "Нов адресар",
-"Save" => "Сними",
-"Cancel" => "Откажи"
-);
diff --git a/apps/contacts/l10n/ms_MY.php b/apps/contacts/l10n/ms_MY.php
deleted file mode 100644
index 3fce9eae5a..0000000000
--- a/apps/contacts/l10n/ms_MY.php
+++ /dev/null
@@ -1,178 +0,0 @@
-<?php $TRANSLATIONS = array(
-"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",
-"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.",
-"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.",
-"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.",
-"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.",
-"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: ",
-"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",
-"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 ditemui:",
-"This is not your addressbook." => "Ini bukan buku alamat anda.",
-"Contact could not be found." => "Hubungan tidak dapat ditemui",
-"Work" => "Kerja",
-"Home" => "Rumah",
-"Other" => "Lain",
-"Mobile" => "Mudah alih",
-"Text" => "Teks",
-"Voice" => "Suara",
-"Message" => "Mesej",
-"Fax" => "Fax",
-"Video" => "Video",
-"Pager" => "Alat Kelui",
-"Internet" => "Internet",
-"Birthday" => "Hari lahir",
-"Business" => "Perniagaan",
-"Clients" => "klien",
-"Holidays" => "Hari kelepasan",
-"Ideas" => "Idea",
-"Journey" => "Perjalanan",
-"Jubilee" => "Jubli",
-"Meeting" => "Mesyuarat",
-"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",
-"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",
-"Organization" => "Organisasi",
-"Delete" => "Padam",
-"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",
-"Email" => "Emel",
-"Address" => "Alamat",
-"Note" => "Nota",
-"Download contact" => "Muat turun hubungan",
-"Delete contact" => "Padam hubungan",
-"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",
-"City" => "bandar",
-"Region" => "Wilayah",
-"Zipcode" => "Poskod",
-"Country" => "Negara",
-"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.",
-"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",
-"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",
-"iOS/OS X" => "iOS/OS X",
-"Download" => "Muat naik",
-"Edit" => "Sunting",
-"New Address Book" => "Buku Alamat Baru",
-"Name" => "Nama",
-"Description" => "Keterangan",
-"Save" => "Simpan",
-"Cancel" => "Batal",
-"More..." => "Lagi..."
-);
diff --git a/apps/contacts/l10n/nb_NO.php b/apps/contacts/l10n/nb_NO.php
deleted file mode 100644
index 905f6fc6a0..0000000000
--- a/apps/contacts/l10n/nb_NO.php
+++ /dev/null
@@ -1,134 +0,0 @@
-<?php $TRANSLATIONS = array(
-"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.",
-"Missing ID" => "Manglende ID",
-"Something went FUBAR. " => "Noe gikk fryktelig galt.",
-"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.",
-"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:",
-"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",
-"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.",
-"This is not your addressbook." => "Dette er ikke dine adressebok.",
-"Contact could not be found." => "Kontakten ble ikke funnet.",
-"Work" => "Arbeid",
-"Home" => "Hjem",
-"Mobile" => "Mobil",
-"Text" => "Tekst",
-"Voice" => "Svarer",
-"Message" => "Melding",
-"Fax" => "Faks",
-"Video" => "Video",
-"Pager" => "Pager",
-"Internet" => "Internett",
-"Birthday" => "Bursdag",
-"{name}'s Birthday" => "{name}s bursdag",
-"Contact" => "Kontakt",
-"Add Contact" => "Ny kontakt",
-"Import" => "Importer",
-"Addressbooks" => "Adressebøker",
-"Close" => "Lukk",
-"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",
-"Organization" => "Organisasjon",
-"Delete" => "Slett",
-"Nickname" => "Kallenavn",
-"Enter nickname" => "Skriv inn kallenavn",
-"dd-mm-yyyy" => "dd-mm-åååå",
-"Groups" => "Grupper",
-"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",
-"View on map" => "Se på kart",
-"Edit address details" => "Endre detaljer rundt adresse",
-"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",
-"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",
-"City" => "By",
-"Region" => "Området",
-"Zipcode" => "Postnummer",
-"Country" => "Land",
-"Addressbook" => "Adressebok",
-"Hon. prefixes" => "Ærestitler",
-"Miss" => "Frøken",
-"Mr" => "Herr",
-"Mrs" => "Fru",
-"Dr" => "Dr",
-"Given name" => "Fornavn",
-"Additional names" => "Ev. mellomnavn",
-"Family name" => "Etternavn",
-"Hon. suffixes" => "Titler",
-"Ph.D." => "Stipendiat",
-"Jr." => "Jr.",
-"Sn." => "Sr.",
-"Import a contacts file" => "Importer en fil med kontakter.",
-"Please choose the addressbook" => "Vennligst velg adressebok",
-"create a new addressbook" => "Lag ny adressebok",
-"Name of new addressbook" => "Navn på ny adressebok",
-"Importing contacts" => "Importerer kontakter",
-"You have no contacts in your addressbook." => "Du har ingen kontakter i din adressebok",
-"Add contact" => "Ny kontakt",
-"CardDAV syncing addresses" => "Synkroniseringsadresse for CardDAV",
-"more info" => "mer info",
-"iOS/OS X" => "iOS/OS X",
-"Download" => "Hent ned",
-"Edit" => "Rediger",
-"New Address Book" => "Ny adressebok",
-"Save" => "Lagre",
-"Cancel" => "Avbryt"
-);
diff --git a/apps/contacts/l10n/nl.php b/apps/contacts/l10n/nl.php
deleted file mode 100644
index 7c85dd7ce9..0000000000
--- a/apps/contacts/l10n/nl.php
+++ /dev/null
@@ -1,220 +0,0 @@
-<?php $TRANSLATIONS = array(
-"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",
-"Error setting checksum." => "Instellen controlegetal mislukt",
-"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",
-"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.",
-"Could not parse contact: " => "Kon het contact niet verwerken",
-"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: ",
-"Missing IM parameter." => "IM parameter ontbreekt",
-"Unknown IM: " => "Onbekende IM:",
-"Information about vCard is incorrect. Please reload the page." => "Informatie over de vCard is onjuist. Herlaad de pagina.",
-"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. ",
-"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 getting contact object." => "Fout om contact object te verkrijgen",
-"Error getting PHOTO property." => "Fout om PHOTO eigenschap te verkrijgen",
-"Error saving contact." => "Fout om contact op te slaan",
-"Error resizing image" => "Fout tijdens aanpassen plaatje",
-"Error cropping image" => "Fout tijdens aanpassen plaatje",
-"Error creating temporary image" => "Fout om een tijdelijk plaatje te maken",
-"Error finding image: " => "Fout kan plaatje niet vinden:",
-"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",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Het bestand overschrijdt de MAX_FILE_SIZE instelling dat is opgegeven in het HTML formulier",
-"The uploaded file was only partially uploaded" => "Het bestand is gedeeltelijk geüpload",
-"No file was uploaded" => "Er is geen bestand geüpload",
-"Missing a temporary folder" => "Er ontbreekt een tijdelijke map",
-"Couldn't save temporary image: " => "Kan tijdelijk plaatje niet op slaan:",
-"Couldn't load temporary image: " => "Kan tijdelijk plaatje niet op laden:",
-"No file was uploaded. Unknown error" => "Er was geen bestand geladen.  Onbekende fout",
-"Contacts" => "Contacten",
-"Sorry, this functionality has not been implemented yet" => "Sorry, deze functionaliteit is nog niet geïmplementeerd",
-"Not implemented" => "Niet geïmplementeerd",
-"Couldn't get a valid address." => "Kan geen geldig adres krijgen",
-"Error" => "Fout",
-"You do not have permission to add contacts to " => "U hebt geen permissie om contacten toe te voegen aan",
-"Please select one of your own address books." => "Selecteer één van uw eigen adresboeken",
-"Permission error" => "Permissie fout",
-"This property has to be non-empty." => "Dit veld mag niet leeg blijven",
-"Couldn't serialize elements." => "Kan de elementen niet serializen",
-"'deleteProperty' called without type argument. Please report at bugs.owncloud.org" => "'deleteProperty' aangeroepen zonder type argument. Rapporteer dit a.u.b. via http://bugs.owncloud.org",
-"Edit name" => "Pas naam aan",
-"No files selected for upload." => "Geen bestanden geselecteerd voor upload.",
-"The file you are trying to upload exceed the maximum size for file uploads on this server." => "Het bestand dat u probeert te uploaden overschrijdt de maximale bestand grootte voor bestand uploads voor deze server.",
-"Error loading profile picture." => "Fout profiel plaatje kan niet worden geladen.",
-"Select type" => "Selecteer type",
-"Some contacts are marked for deletion, but not deleted yet. Please wait for them to be deleted." => "Enkele contacten zijn gemarkeerd om verwijderd te worden, maar zijn nog niet verwijderd.  Wacht totdat ze zijn verwijderd.",
-"Do you want to merge these address books?" => "Wilt u deze adresboeken samenvoegen?",
-"Result: " => "Resultaat:",
-" imported, " => "geïmporteerd,",
-" failed." => "gefaald.",
-"Displayname cannot be empty." => "Displaynaam mag niet leeg zijn.",
-"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.",
-"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" => "Werk",
-"Home" => "Thuis",
-"Other" => "Anders",
-"Mobile" => "Mobiel",
-"Text" => "Tekst",
-"Voice" => "Stem",
-"Message" => "Bericht",
-"Fax" => "Fax",
-"Video" => "Video",
-"Pager" => "Pieper",
-"Internet" => "Internet",
-"Birthday" => "Verjaardag",
-"Business" => "Business",
-"Call" => "Bel",
-"Clients" => "Klanten",
-"Deliverer" => "Leverancier",
-"Holidays" => "Vakanties",
-"Ideas" => "Ideeën",
-"Journey" => "Reis",
-"Jubilee" => "Jubileum",
-"Meeting" => "Vergadering",
-"Personal" => "Persoonlijk",
-"Projects" => "Projecten",
-"Questions" => "Vragen",
-"{name}'s Birthday" => "{name}'s verjaardag",
-"Contact" => "Contact",
-"You do not have the permissions to edit this contact." => "U heeft geen permissie om dit contact te bewerken.",
-"You do not have the permissions to delete this contact." => "U heeft geen permissie om dit contact te verwijderen.",
-"Add Contact" => "Contact toevoegen",
-"Import" => "Importeer",
-"Settings" => "Instellingen",
-"Addressbooks" => "Adresboeken",
-"Close" => "Sluiten",
-"Keyboard shortcuts" => "Sneltoetsen",
-"Navigation" => "Navigatie",
-"Next contact in list" => "Volgende contact in de lijst",
-"Previous contact in list" => "Vorige contact in de lijst",
-"Expand/collapse current addressbook" => "Uitklappen / inklappen huidig adresboek",
-"Next addressbook" => "Volgende adresboek",
-"Previous addressbook" => "Vorige adresboek",
-"Actions" => "Acties",
-"Refresh contacts list" => "Vernieuw contact lijst",
-"Add new contact" => "Voeg nieuw contact toe",
-"Add new addressbook" => "Voeg nieuw adresboek toe",
-"Delete current contact" => "Verwijder huidig 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",
-"Organization" => "Organisatie",
-"Delete" => "Verwijderen",
-"Nickname" => "Roepnaam",
-"Enter nickname" => "Voer roepnaam in",
-"Web site" => "Website",
-"http://www.somesite.com" => "http://www.willekeurigesite.com",
-"Go to web site" => "Ga naar website",
-"dd-mm-yyyy" => "dd-mm-yyyy",
-"Groups" => "Groepen",
-"Separate groups with commas" => "Gebruik komma bij meerder groepen",
-"Edit groups" => "Wijzig groepen",
-"Preferred" => "Voorkeur",
-"Please specify a valid email address." => "Geef een geldig email adres op.",
-"Enter email address" => "Voer email adres in",
-"Mail to address" => "Mail naar adres",
-"Delete email address" => "Verwijder email adres",
-"Enter phone number" => "Voer telefoonnummer in",
-"Delete phone number" => "Verwijdere telefoonnummer",
-"Instant Messenger" => "Instant Messenger",
-"Delete IM" => "Verwijder IM",
-"View on map" => "Bekijk op een kaart",
-"Edit address details" => "Wijzig adres gegevens",
-"Add notes here." => "Voeg notitie toe",
-"Add field" => "Voeg veld toe",
-"Phone" => "Telefoon",
-"Email" => "E-mail",
-"Instant Messaging" => "Instant Messaging",
-"Address" => "Adres",
-"Note" => "Notitie",
-"Download contact" => "Download contact",
-"Delete contact" => "Verwijder contact",
-"The temporary image has been removed from cache." => "Het tijdelijke plaatje is uit de cache verwijderd.",
-"Edit address" => "Wijzig adres",
-"Type" => "Type",
-"PO Box" => "Postbus",
-"Street address" => "Adres",
-"Street and number" => "Straat en nummer",
-"Extended" => "Uitgebreide",
-"Apartment number etc." => "Apartement nummer",
-"City" => "Stad",
-"Region" => "Regio",
-"E.g. state or province" => "Provincie",
-"Zipcode" => "Postcode",
-"Postal code" => "Postcode",
-"Country" => "Land",
-"Addressbook" => "Adresboek",
-"Hon. prefixes" => "Hon. prefixes",
-"Miss" => "Mw",
-"Ms" => "Mw",
-"Mr" => "M",
-"Sir" => "M",
-"Mrs" => "Mw",
-"Dr" => "M",
-"Given name" => "Voornaam",
-"Additional names" => "Extra namen",
-"Family name" => "Achternaam",
-"Import a contacts file" => "Importeer een contacten bestand",
-"Please choose the addressbook" => "Kies een adresboek",
-"create a new addressbook" => "Maak een nieuw adresboek",
-"Name of new addressbook" => "Naam van nieuw adresboek",
-"Importing contacts" => "Importeren van contacten",
-"You have no contacts in your addressbook." => "Je hebt geen contacten in je adresboek",
-"Add contact" => "Contactpersoon toevoegen",
-"Select Address Books" => "Selecteer adresboeken",
-"Enter name" => "Naam",
-"Enter description" => "Beschrijving",
-"CardDAV syncing addresses" => "CardDAV synchroniseert de adressen",
-"more info" => "meer informatie",
-"Primary address (Kontact et al)" => "Standaardadres",
-"iOS/OS X" => "IOS/OS X",
-"Show CardDav link" => "Laat CardDav link zien",
-"Show read-only VCF link" => "Laat alleen lezen VCF link zien",
-"Share" => "Deel",
-"Download" => "Download",
-"Edit" => "Bewerken",
-"New Address Book" => "Nieuw Adresboek",
-"Name" => "Naam",
-"Description" => "Beschrijving",
-"Save" => "Opslaan",
-"Cancel" => "Anuleren",
-"More..." => "Meer..."
-);
diff --git a/apps/contacts/l10n/nn_NO.php b/apps/contacts/l10n/nn_NO.php
deleted file mode 100644
index 2e3ab16da3..0000000000
--- a/apps/contacts/l10n/nn_NO.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?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.",
-"Information about vCard is incorrect. Please reload the page." => "Informasjonen om vCard-et er feil, ver venleg og last sida på nytt.",
-"Contacts" => "Kotaktar",
-"This is not your addressbook." => "Dette er ikkje di adressebok.",
-"Contact could not be found." => "Fann ikkje kontakten.",
-"Work" => "Arbeid",
-"Home" => "Heime",
-"Mobile" => "Mobil",
-"Text" => "Tekst",
-"Voice" => "Tale",
-"Fax" => "Faks",
-"Video" => "Video",
-"Pager" => "Personsøkjar",
-"Birthday" => "Bursdag",
-"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",
-"PO Box" => "Postboks",
-"Extended" => "Utvida",
-"City" => "Stad",
-"Region" => "Region/fylke",
-"Zipcode" => "Postnummer",
-"Country" => "Land",
-"Addressbook" => "Adressebok",
-"Download" => "Last ned",
-"Edit" => "Endra",
-"New Address Book" => "Ny adressebok",
-"Save" => "Lagre",
-"Cancel" => "Kanseller"
-);
diff --git a/apps/contacts/l10n/pl.php b/apps/contacts/l10n/pl.php
deleted file mode 100644
index 924622ebb0..0000000000
--- a/apps/contacts/l10n/pl.php
+++ /dev/null
@@ -1,219 +0,0 @@
-<?php $TRANSLATIONS = array(
-"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 ",
-"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.",
-"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:",
-"Information about vCard is incorrect. Please reload the page." => "Informacje o vCard są nieprawidłowe. Proszę odświeżyć stronę.",
-"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.",
-"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.",
-"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:",
-"Error loading image." => "Błąd ładowania obrazu.",
-"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: ",
-"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",
-"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",
-"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",
-"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.",
-"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.",
-"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",
-"Mobile" => "Komórka",
-"Text" => "Połączenie tekstowe",
-"Voice" => "Połączenie głosowe",
-"Message" => "Wiadomość",
-"Fax" => "Faks",
-"Video" => "Połączenie wideo",
-"Pager" => "Pager",
-"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",
-"Personal" => "Osobiste",
-"Projects" => "Projekty",
-"Questions" => "Pytania",
-"{name}'s Birthday" => "{name} Urodzony",
-"Contact" => "Kontakt",
-"Add Contact" => "Dodaj kontakt",
-"Import" => "Import",
-"Settings" => "Ustawienia",
-"Addressbooks" => "Książki adresowe",
-"Close" => "Zamknij",
-"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",
-"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",
-"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",
-"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",
-"Organization" => "Organizacja",
-"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",
-"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",
-"Phone" => "Telefon",
-"Email" => "E-mail",
-"Address" => "Adres",
-"Note" => "Uwaga",
-"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",
-"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",
-"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.",
-"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",
-"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",
-"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",
-"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",
-"Name" => "Nazwa",
-"Description" => "Opis",
-"Save" => "Zapisz",
-"Cancel" => "Anuluj",
-"More..." => "Więcej..."
-);
diff --git a/apps/contacts/l10n/pt_BR.php b/apps/contacts/l10n/pt_BR.php
deleted file mode 100644
index de43e6cbb0..0000000000
--- a/apps/contacts/l10n/pt_BR.php
+++ /dev/null
@@ -1,158 +0,0 @@
-<?php $TRANSLATIONS = array(
-"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",
-"Error setting checksum." => "Erro ajustando checksum.",
-"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.",
-"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. ",
-"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.",
-"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:",
-"Error loading image." => "Erro ao carregar imagem.",
-"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:",
-"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",
-"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",
-"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",
-"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.",
-"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.",
-"Work" => "Trabalho",
-"Home" => "Home",
-"Mobile" => "Móvel",
-"Text" => "Texto",
-"Voice" => "Voz",
-"Message" => "Mensagem",
-"Fax" => "Fax",
-"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.",
-"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",
-"Organization" => "Organização",
-"Delete" => "Excluir",
-"Nickname" => "Apelido",
-"Enter nickname" => "Digite o apelido",
-"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",
-"Phone" => "Telefone",
-"Email" => "E-mail",
-"Address" => "Endereço",
-"Note" => "Nota",
-"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",
-"City" => "Cidade",
-"Region" => "Região",
-"Zipcode" => "CEP",
-"Country" => "País",
-"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.",
-"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",
-"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",
-"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",
-"Download" => "Baixar",
-"Edit" => "Editar",
-"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
deleted file mode 100644
index 38708c8620..0000000000
--- a/apps/contacts/l10n/pt_PT.php
+++ /dev/null
@@ -1,224 +0,0 @@
-<?php $TRANSLATIONS = array(
-"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",
-"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.",
-"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",
-"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. ",
-"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.",
-"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:",
-"Error loading image." => "Erro a carregar a imagem.",
-"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: ",
-"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",
-"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.",
-"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",
-"Message" => "Mensagem",
-"Fax" => "Fax",
-"Video" => "Vídeo",
-"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",
-"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",
-"Organization" => "Organização",
-"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",
-"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",
-"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",
-"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",
-"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",
-"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.",
-"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",
-"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",
-"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",
-"More..." => "Mais..."
-);
diff --git a/apps/contacts/l10n/ro.php b/apps/contacts/l10n/ro.php
deleted file mode 100644
index 291e8d54f7..0000000000
--- a/apps/contacts/l10n/ro.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php $TRANSLATIONS = array(
-"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.",
-"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ă.",
-"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ă.",
-"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.",
-"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.",
-"Work" => "Servicu",
-"Home" => "Acasă",
-"Mobile" => "Mobil",
-"Text" => "Text",
-"Voice" => "Voce",
-"Message" => "Mesaj",
-"Fax" => "Fax",
-"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",
-"Edit name details" => "Introdu detalii despre nume",
-"Organization" => "Organizație",
-"Delete" => "Șterge",
-"Nickname" => "Pseudonim",
-"Enter nickname" => "Introdu pseudonim",
-"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",
-"Email" => "Email",
-"Address" => "Adresă",
-"Download contact" => "Descarcă acest contact",
-"Delete contact" => "Șterge contact",
-"Type" => "Tip",
-"PO Box" => "CP",
-"Extended" => "Extins",
-"City" => "Oraș",
-"Region" => "Regiune",
-"Zipcode" => "Cod poștal",
-"Country" => "Țară",
-"Addressbook" => "Agendă",
-"Download" => "Descarcă",
-"Edit" => "Editează",
-"New Address Book" => "Agendă nouă",
-"Save" => "Salvează",
-"Cancel" => "Anulează"
-);
diff --git a/apps/contacts/l10n/ru.php b/apps/contacts/l10n/ru.php
deleted file mode 100644
index eaeb385d3b..0000000000
--- a/apps/contacts/l10n/ru.php
+++ /dev/null
@@ -1,229 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Error (de)activating addressbook." => "Ошибка (де)активации адресной книги.",
-"id is not set." => "id не установлен.",
-"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 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: " => "При попытке добавить дубликат:",
-"Missing IM parameter." => "Отсутствует параметр IM.",
-"Unknown IM: " => "Неизвестный IM:",
-"Information about vCard is incorrect. Please reload the page." => "Информация о vCard некорректна. Пожалуйста, обновите страницу.",
-"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.",
-"No contact ID was submitted." => "Нет контакта ID",
-"Error reading contact photo." => "Ошибка чтения фотографии контакта.",
-"Error saving temporary file." => "Ошибка сохранения временного файла.",
-"The loading photo is not valid." => "Загружаемая фотография испорчена.",
-"Contact ID is missing." => "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: " => "Ошибка поиска изображений:",
-"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" => "Отсутствует временная папка",
-"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" => "Ошибка",
-"You do not have permission to add contacts to " => "У вас нет разрешений добавлять контакты в",
-"Please select one of your own address books." => "Выберите одну из ваших собственных адресных книг.",
-"Permission error" => "Ошибка доступа",
-"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." => "Файл, который вы пытаетесь загрузить превышать максимальный размер загружаемых файлов на этом сервере.",
-"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" => "Голос",
-"Message" => "Сообщение",
-"Fax" => "Факс",
-"Video" => "Видео",
-"Pager" => "Пейджер",
-"Internet" => "Интернет",
-"Birthday" => "День рождения",
-"Business" => "Бизнес",
-"Call" => "Вызов",
-"Clients" => "Клиенты",
-"Deliverer" => "Посыльный",
-"Holidays" => "Праздники",
-"Ideas" => "Идеи",
-"Journey" => "Поездка",
-"Jubilee" => "Юбилей",
-"Meeting" => "Встреча",
-"Personal" => "Личный",
-"Projects" => "Проекты",
-"Questions" => "Вопросы",
-"{name}'s Birthday" => "День рождения {name}",
-"Contact" => "Контакт",
-"You do not have the permissions to edit this contact." => "У вас нет разрешений редактировать этот контакт.",
-"You do not have the permissions to delete this 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" => "Редактировать текущую фотографию",
-"Upload new photo" => "Загрузить новую фотографию",
-"Select photo from ownCloud" => "Выбрать фотографию из ownCloud",
-"Format custom, Short name, Full name, Reverse or Reverse with comma" => "Формат Краткое имя, Полное имя",
-"Edit name details" => "Изменить детали имени",
-"Organization" => "Организация",
-"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" => "Разделить группы запятыми",
-"Edit groups" => "Редактировать группы",
-"Preferred" => "Предпочитаемый",
-"Please specify a valid email address." => "Укажите действительный адрес электронной почты.",
-"Enter email address" => "Укажите адрес электронной почты",
-"Mail to address" => "Написать по адресу",
-"Delete email address" => "Удалить адрес электронной почты",
-"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" => "Ящик эл. почты",
-"Instant Messaging" => "Быстрые сообщения",
-"Address" => "Адрес",
-"Note" => "Заметка",
-"Download contact" => "Скачать контакт",
-"Delete contact" => "Удалить контакт",
-"The temporary image has been removed from cache." => "Временный образ был удален из кэша.",
-"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" => "Уважительные префиксы",
-"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.",
-"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" => "Добавить контакт",
-"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" => "Показать ссылку CardDav",
-"Show read-only VCF link" => "Показать нередактируемую ссылку VCF",
-"Share" => "Опубликовать",
-"Download" => "Скачать",
-"Edit" => "Редактировать",
-"New Address Book" => "Новая адресная книга",
-"Name" => "Имя",
-"Description" => "Описание",
-"Save" => "Сохранить",
-"Cancel" => "Отменить",
-"More..." => "Ещё..."
-);
diff --git a/apps/contacts/l10n/sk_SK.php b/apps/contacts/l10n/sk_SK.php
deleted file mode 100644
index 8295b32a6f..0000000000
--- a/apps/contacts/l10n/sk_SK.php
+++ /dev/null
@@ -1,178 +0,0 @@
-<?php $TRANSLATIONS = array(
-"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é",
-"Error setting checksum." => "Chyba pri nastavovaní kontrolného súčtu.",
-"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.",
-"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.",
-"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á.",
-"Contact ID is missing." => "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.",
-"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: ",
-"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",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Ukladaný súbor prekračuje nastavenie MAX_FILE_SIZE z volieb HTML formulára.",
-"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",
-"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",
-"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.",
-"This is not your addressbook." => "Toto nie je váš adresár.",
-"Contact could not be found." => "Kontakt nebol nájdený.",
-"Work" => "Práca",
-"Home" => "Domov",
-"Other" => "Iné",
-"Mobile" => "Mobil",
-"Text" => "SMS",
-"Voice" => "Odkazová schránka",
-"Message" => "Správa",
-"Fax" => "Fax",
-"Video" => "Video",
-"Pager" => "Pager",
-"Internet" => "Internet",
-"Birthday" => "Narodeniny",
-"Business" => "Biznis",
-"Clients" => "Klienti",
-"Holidays" => "Prázdniny",
-"Meeting" => "Stretnutie",
-"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",
-"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",
-"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",
-"Organization" => "Organizácia",
-"Delete" => "Odstrániť",
-"Nickname" => "Prezývka",
-"Enter nickname" => "Zadajte prezývku",
-"dd-mm-yyyy" => "dd. mm. yyyy",
-"Groups" => "Skupiny",
-"Separate groups with commas" => "Oddelte skupiny čiarkami",
-"Edit groups" => "Úprava skupín",
-"Preferred" => "Uprednostňované",
-"Please specify a valid email address." => "Prosím zadajte platnú e-mailovú adresu.",
-"Enter email address" => "Zadajte e-mailové adresy",
-"Mail to address" => "Odoslať na adresu",
-"Delete email address" => "Odstrániť e-mailové adresy",
-"Enter phone number" => "Zadajte telefónne číslo",
-"Delete phone number" => "Odstrániť telefónne číslo",
-"View on map" => "Zobraziť na mape",
-"Edit address details" => "Upraviť podrobnosti adresy",
-"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",
-"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é",
-"City" => "Mesto",
-"Region" => "Región",
-"Zipcode" => "PSČ",
-"Postal code" => "PSČ",
-"Country" => "Krajina",
-"Addressbook" => "Adresár",
-"Hon. prefixes" => "Tituly pred",
-"Miss" => "Slečna",
-"Ms" => "Pani",
-"Mr" => "Pán",
-"Sir" => "Sir",
-"Mrs" => "Pani",
-"Dr" => "Dr.",
-"Given name" => "Krstné meno",
-"Additional names" => "Ďalšie mená",
-"Family name" => "Priezvisko",
-"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.",
-"Sn." => "st.",
-"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",
-"Name of new addressbook" => "Meno nového adresára",
-"Importing contacts" => "Importovanie kontaktov",
-"You have no contacts in your addressbook." => "Nemáte žiadne kontakty v adresári.",
-"Add contact" => "Pridať kontakt",
-"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)",
-"iOS/OS X" => "iOS/OS X",
-"Download" => "Stiahnuť",
-"Edit" => "Upraviť",
-"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
deleted file mode 100644
index fe0e8ef16c..0000000000
--- a/apps/contacts/l10n/sl.php
+++ /dev/null
@@ -1,229 +0,0 @@
-<?php $TRANSLATIONS = array(
-"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",
-"Error setting checksum." => "Napaka pri nastavljanju nadzorne vsote.",
-"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.",
-"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:",
-"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.",
-"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. ",
-"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.",
-"Contact ID is missing." => "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.",
-"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: ",
-"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",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Naložena datoteka presega velikost, ki jo določa parameter MAX_FILE_SIZE v HTML obrazcu",
-"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",
-"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",
-"You do not have permission to add contacts to " => "Nimate dovoljenja za dodajanje stikov v",
-"Please select one of your own address books." => "Prosimo, če izberete enega izmed vaših adresarjev.",
-"Permission error" => "Napaka dovoljenj",
-"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.",
-"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.",
-"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.",
-"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",
-"Mobile" => "Mobilni telefon",
-"Text" => "Besedilo",
-"Voice" => "Glas",
-"Message" => "Sporočilo",
-"Fax" => "Faks",
-"Video" => "Video",
-"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",
-"Personal" => "Osebno",
-"Projects" => "Projekti",
-"Questions" => "Vprašanja",
-"{name}'s Birthday" => "{name} - rojstni dan",
-"Contact" => "Stik",
-"You do not have the permissions to edit this contact." => "Nimate dovoljenj za urejanje tega stika.",
-"You do not have the permissions to delete this contact." => "Nimate dovoljenj za izbris tega stika.",
-"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",
-"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",
-"Organization" => "Organizacija",
-"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",
-"Edit groups" => "Uredi skupine",
-"Preferred" => "Prednosten",
-"Please specify a valid email address." => "Prosimo, če navedete veljaven e-poštni naslov.",
-"Enter email address" => "Vnesite e-poštni naslov",
-"Mail to address" => "E-pošta naslovnika",
-"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",
-"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",
-"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",
-"Miss" => "gdč.",
-"Ms" => "ga.",
-"Mr" => "g.",
-"Sir" => "g.",
-"Mrs" => "ga.",
-"Dr" => "dr.",
-"Given name" => "Ime",
-"Additional names" => "Dodatna imena",
-"Family name" => "Priimek",
-"Hon. suffixes" => "Pripone",
-"J.D." => "univ. dipl. prav.",
-"M.D." => "dr. med.",
-"D.O." => "dr. med., spec. spl. med.",
-"D.C." => "dr. med., spec. kiropraktike",
-"Ph.D." => "dr.",
-"Esq." => "Esq.",
-"Jr." => "mlajši",
-"Sn." => "starejši",
-"Import a contacts file" => "Uvozi datoteko s stiki",
-"Please choose the addressbook" => "Prosimo, če izberete imenik",
-"create a new addressbook" => "Ustvari nov imenik",
-"Name of new addressbook" => "Ime novega imenika",
-"Importing contacts" => "Uvažam stike",
-"You have no contacts in your addressbook." => "V vašem imeniku ni stikov.",
-"Add contact" => "Dodaj stik",
-"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",
-"Share" => "Souporaba",
-"Download" => "Prenesi",
-"Edit" => "Uredi",
-"New Address Book" => "Nov imenik",
-"Name" => "Ime",
-"Description" => "Opis",
-"Save" => "Shrani",
-"Cancel" => "Prekliči",
-"More..." => "Več..."
-);
diff --git a/apps/contacts/l10n/sr.php b/apps/contacts/l10n/sr.php
deleted file mode 100644
index f54741c182..0000000000
--- a/apps/contacts/l10n/sr.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Information about vCard is incorrect. Please reload the page." => "Подаци о вКарти су неисправни. Поново учитајте страницу.",
-"Contacts" => "Контакти",
-"This is not your addressbook." => "Ово није ваш адресар.",
-"Contact could not be found." => "Контакт се не може наћи.",
-"Work" => "Посао",
-"Home" => "Кућа",
-"Mobile" => "Мобилни",
-"Text" => "Текст",
-"Voice" => "Глас",
-"Fax" => "Факс",
-"Video" => "Видео",
-"Pager" => "Пејџер",
-"Birthday" => "Рођендан",
-"Contact" => "Контакт",
-"Add Contact" => "Додај контакт",
-"Addressbooks" => "Адресар",
-"Organization" => "Организација",
-"Delete" => "Обриши",
-"Preferred" => "Пожељан",
-"Phone" => "Телефон",
-"Email" => "Е-маил",
-"Address" => "Адреса",
-"Download contact" => "Преузми контакт",
-"Delete contact" => "Обриши контакт",
-"Type" => "Тип",
-"PO Box" => "Поштански број",
-"Extended" => "Прошири",
-"City" => "Град",
-"Region" => "Регија",
-"Zipcode" => "Зип код",
-"Country" => "Земља",
-"Addressbook" => "Адресар",
-"Download" => "Преузимање",
-"Edit" => "Уреди",
-"New Address Book" => "Нови адресар",
-"Save" => "Сними",
-"Cancel" => "Откажи"
-);
diff --git a/apps/contacts/l10n/sr@latin.php b/apps/contacts/l10n/sr@latin.php
deleted file mode 100644
index f06539ab43..0000000000
--- a/apps/contacts/l10n/sr@latin.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php $TRANSLATIONS = array(
-"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.",
-"Work" => "Posao",
-"Home" => "Kuća",
-"Mobile" => "Mobilni",
-"Text" => "Tekst",
-"Voice" => "Glas",
-"Fax" => "Faks",
-"Video" => "Video",
-"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",
-"Region" => "Regija",
-"Zipcode" => "Zip kod",
-"Country" => "Zemlja",
-"Edit" => "Uredi"
-);
diff --git a/apps/contacts/l10n/sv.php b/apps/contacts/l10n/sv.php
deleted file mode 100644
index 88aac866f6..0000000000
--- a/apps/contacts/l10n/sv.php
+++ /dev/null
@@ -1,229 +0,0 @@
-<?php $TRANSLATIONS = array(
-"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.",
-"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 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.",
-"Trying to add duplicate property: " => "Försöker lägga till dubblett:",
-"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.",
-"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.",
-"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.",
-"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 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",
-"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",
-"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",
-"You do not have permission to add contacts to " => "Du saknar behörighet att skapa kontakter i",
-"Please select one of your own address books." => "Välj en av dina egna adressböcker.",
-"Permission error" => "Behörighetsfel",
-"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.",
-"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.",
-"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.",
-"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",
-"Mobile" => "Mobil",
-"Text" => "Text",
-"Voice" => "Röst",
-"Message" => "Meddelande",
-"Fax" => "Fax",
-"Video" => "Video",
-"Pager" => "Personsökare",
-"Internet" => "Internet",
-"Birthday" => "Födelsedag",
-"Business" => "Företag",
-"Call" => "Ring",
-"Clients" => "Kunder",
-"Deliverer" => "Leverera",
-"Holidays" => "Helgdagar",
-"Ideas" => "Idéer",
-"Journey" => "Resa",
-"Jubilee" => "Jubileum",
-"Meeting" => "Möte",
-"Personal" => "Privat",
-"Projects" => "Projekt",
-"Questions" => "Frågor",
-"{name}'s Birthday" => "{name}'s födelsedag",
-"Contact" => "Kontakt",
-"You do not have the permissions to edit this contact." => "Du saknar behörighet för att ändra denna kontakt.",
-"You do not have the permissions to delete this contact." => "Du saknar behörighet för att radera denna 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",
-"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",
-"Organization" => "Organisation",
-"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.",
-"Enter email address" => "Ange e-postadress",
-"Mail to address" => "Posta till adress.",
-"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",
-"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",
-"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",
-"Hon. prefixes" => "Ledande titlar",
-"Miss" => "Fröken",
-"Ms" => "Fru",
-"Mr" => "Herr",
-"Sir" => "Herr",
-"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",
-"Name of new addressbook" => "Namn för ny adressbok",
-"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",
-"Select Address Books" => "Välj adressböcker",
-"Enter name" => "Ange namn",
-"Enter description" => "Ange beskrivning",
-"CardDAV syncing addresses" => "CardDAV synkningsadresser",
-"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",
-"Share" => "Dela",
-"Download" => "Nedladdning",
-"Edit" => "Redigera",
-"New Address Book" => "Ny adressbok",
-"Name" => "Namn",
-"Description" => "Beskrivning",
-"Save" => "Spara",
-"Cancel" => "Avbryt",
-"More..." => "Mer..."
-);
diff --git a/apps/contacts/l10n/th_TH.php b/apps/contacts/l10n/th_TH.php
deleted file mode 100644
index facdd62b7b..0000000000
--- a/apps/contacts/l10n/th_TH.php
+++ /dev/null
@@ -1,207 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Error (de)activating addressbook." => "เกิดข้อผิดพลาดใน (ยกเลิก)การเปิดใช้งานสมุดบันทึกที่อยู่",
-"id is not set." => "ยังไม่ได้กำหนดรหัส",
-"Cannot update addressbook with an empty name." => "ไม่สามารถอัพเดทสมุดบันทึกที่อยู่โดยไม่มีชื่อได้",
-"Error updating addressbook." => "เกิดข้อผิดพลาดในการอัพเดทสมุดบันทึกที่อยู่",
-"No ID provided" => "ยังไม่ได้ใส่รหัส",
-"Error setting checksum." => "เกิดข้อผิดพลาดในการตั้งค่า checksum",
-"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: " => "พยายามที่จะเพิ่มทรัพยากรที่ซ้ำซ้อนกัน: ",
-"Information about vCard is incorrect. Please reload the page." => "ข้อมูลเกี่ยวกับ vCard ไม่ถูกต้อง กรุณาโหลดหน้าเวปใหม่อีกครั้ง",
-"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. ",
-"No contact ID was submitted." => "ไม่มีรหัสข้อมูลการติดต่อถูกส่งมา",
-"Error reading contact photo." => "เกิดข้อผิดพลาดในการอ่านรูปภาพของข้อมูลการติดต่อ",
-"Error saving temporary file." => "เกิดข้อผิดพลาดในการบันทึกไฟล์ชั่วคราว",
-"The loading photo is not valid." => "โหลดรูปภาพไม่ถูกต้อง",
-"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" => "เกิดข้อผิดพลาดในการปรับขนาดรูปภาพ",
-"Error cropping image" => "เกิดข้อผิดพลาดในการครอบตัดภาพ",
-"Error creating temporary image" => "เกิดข้อผิดพลาดในการสร้างรูปภาพชั่วคราว",
-"Error finding image: " => "เกิดข้อผิดพลาดในการค้นหารูปภาพ: ",
-"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" => "โฟลเดอร์ชั่วคราวเกิดการสูญหาย",
-"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" => "พบข้อผิดพลาด",
-"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." => "ไฟล์ที่คุณกำลังพยายามที่จะอัพโหลดมีขนาดเกินจำนวนสูงสุดที่สามารถอัพโหลดได้สำหรับเซิร์ฟเวอร์นี้",
-"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." => "ไม่พบข้อมูลการติดต่อ",
-"Work" => "ที่ทำงาน",
-"Home" => "บ้าน",
-"Other" => "อื่นๆ",
-"Mobile" => "มือถือ",
-"Text" => "ข้อความ",
-"Voice" => "เสียงพูด",
-"Message" => "ข้อความ",
-"Fax" => "โทรสาร",
-"Video" => "วีดีโอ",
-"Pager" => "เพจเจอร์",
-"Internet" => "อินเทอร์เน็ต",
-"Birthday" => "วันเกิด",
-"Business" => "ธุรกิจ",
-"Call" => "โทร",
-"Clients" => "ลูกค้า",
-"Deliverer" => "ผู้จัดส่ง",
-"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" => "แก้ไขรูปภาพปัจจุบัน",
-"Upload new photo" => "อัพโหลดรูปภาพใหม่",
-"Select photo from ownCloud" => "เลือกรูปภาพจาก ownCloud",
-"Format custom, Short name, Full name, Reverse or Reverse with comma" => "กำหนดรูปแบบของชื่อย่อ, ชื่อจริง, ย้อนค่ากลัีบด้วยคอมม่าเอง",
-"Edit name details" => "แก้ไขรายละเอียดของชื่อ",
-"Organization" => "หน่วยงาน",
-"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" => "คั่นระหว่างรายชื่อกลุ่มด้วยเครื่องหมายจุลภาีคหรือคอมม่า",
-"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" => "โทรศัพท์",
-"Email" => "อีเมล์",
-"Address" => "ที่อยู่",
-"Note" => "หมายเหตุ",
-"Download contact" => "ดาวน์โหลดข้อมูลการติดต่อ",
-"Delete contact" => "ลบข้อมูลการติดต่อ",
-"The temporary image has been removed from cache." => "รูปภาพชั่วคราวดังกล่าวได้ถูกลบออกจากหน่วยความจำแคชแล้ว",
-"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" => "คำนำหน้าชื่อคนรัก",
-"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." => "ปริญญาเอก",
-"Esq." => "Esq.",
-"Jr." => "จูเนียร์",
-"Sn." => "ซีเนียร์",
-"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" => "เพิ่มชื่อผู้ติดต่อ",
-"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 สำหรับอ่านเท่านั้น",
-"Share" => "แชร์",
-"Download" => "ดาวน์โหลด",
-"Edit" => "แก้ไข",
-"New Address Book" => "สร้างสมุดบันทึกข้อมูลการติดต่อใหม่",
-"Name" => "ชื่อ",
-"Description" => "คำอธิบาย",
-"Save" => "บันทึก",
-"Cancel" => "ยกเลิก",
-"More..." => "เพิ่มเติม..."
-);
diff --git a/apps/contacts/l10n/tr.php b/apps/contacts/l10n/tr.php
deleted file mode 100644
index 3abe96998e..0000000000
--- a/apps/contacts/l10n/tr.php
+++ /dev/null
@@ -1,193 +0,0 @@
-<?php $TRANSLATIONS = array(
-"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",
-"Error setting checksum." => "İmza oluşturulurken hata.",
-"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: ",
-"Information about vCard is incorrect. Please reload the page." => "vCard bilgileri doğru değil. Lütfen sayfayı yenileyin.",
-"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.",
-"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.",
-"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:",
-"Error loading image." => "İmaj yükleme hatası.",
-"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:",
-"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",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Yüklenecek dosyanın boyutu HTML formunda belirtilen MAX_FILE_SIZE limitini aşıyor",
-"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",
-"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",
-"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ı.",
-"This is not your addressbook." => "Bu sizin adres defteriniz değil.",
-"Contact could not be found." => "Kişi bulunamadı.",
-"Work" => "İş",
-"Home" => "Ev",
-"Other" => "Diğer",
-"Mobile" => "Mobil",
-"Text" => "Metin",
-"Voice" => "Ses",
-"Message" => "mesaj",
-"Fax" => "Faks",
-"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ı",
-"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",
-"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",
-"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",
-"Organization" => "Organizasyon",
-"Delete" => "Sil",
-"Nickname" => "Takma ad",
-"Enter nickname" => "Takma adı girin",
-"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",
-"Edit groups" => "Grupları düzenle",
-"Preferred" => "Tercih edilen",
-"Please specify a valid email address." => "Lütfen geçerli bir eposta adresi belirtin.",
-"Enter email address" => "Eposta adresini girin",
-"Mail to address" => "Eposta adresi",
-"Delete email address" => "Eposta adresini sil",
-"Enter phone number" => "Telefon numarasını gir",
-"Delete phone number" => "Telefon numarasını sil",
-"View on map" => "Haritada gör",
-"Edit address details" => "Adres detaylarını düzenle",
-"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",
-"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ış",
-"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",
-"Addressbook" => "Adres defteri",
-"Hon. prefixes" => "Kısaltmalar",
-"Miss" => "Bayan",
-"Ms" => "Bayan",
-"Mr" => "Bay",
-"Sir" => "Bay",
-"Mrs" => "Bayan",
-"Dr" => "Dr",
-"Given name" => "Verilen isim",
-"Additional names" => "İlave isimler",
-"Family name" => "Soyad",
-"Hon. suffixes" => "Kısaltmalar",
-"J.D." => "J.D.",
-"M.D." => "Dr.",
-"D.O." => "D.O.",
-"D.C." => "D.C.",
-"Ph.D." => "Dr.",
-"Esq." => "Esq.",
-"Jr." => "Jr.",
-"Sn." => "Sn.",
-"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",
-"Name of new addressbook" => "Yeni adres defteri için isim",
-"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",
-"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",
-"Download" => "İndir",
-"Edit" => "Düzenle",
-"New Address Book" => "Yeni Adres Defteri",
-"Save" => "Kaydet",
-"Cancel" => "İptal"
-);
diff --git a/apps/contacts/l10n/uk.php b/apps/contacts/l10n/uk.php
deleted file mode 100644
index dcd9efff34..0000000000
--- a/apps/contacts/l10n/uk.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?php $TRANSLATIONS = array(
-"At least one of the address fields has to be filled out." => "Має бути заповнено щонайменше одне поле.",
-"This is not your addressbook." => "Це не ваша адресна книга.",
-"Mobile" => "Мобільний",
-"Text" => "Текст",
-"Voice" => "Голос",
-"Fax" => "Факс",
-"Video" => "Відео",
-"Pager" => "Пейджер",
-"Birthday" => "День народження",
-"Add Contact" => "Додати контакт",
-"Organization" => "Організація",
-"Delete" => "Видалити",
-"Phone" => "Телефон",
-"Email" => "Ел.пошта",
-"Address" => "Адреса",
-"Delete contact" => "Видалити контакт",
-"Extended" => "Розширено",
-"City" => "Місто",
-"Zipcode" => "Поштовий індекс",
-"Country" => "Країна",
-"Download" => "Завантажити",
-"New Address Book" => "Нова адресна книга"
-);
diff --git a/apps/contacts/l10n/vi.php b/apps/contacts/l10n/vi.php
deleted file mode 100644
index d484fb405c..0000000000
--- a/apps/contacts/l10n/vi.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php $TRANSLATIONS = array(
-"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ệ.",
-"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",
-"Work" => "Công việc",
-"Home" => "Nhà",
-"Mobile" => "Di động",
-"Fax" => "Fax",
-"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ỉ",
-"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ố",
-"Region" => "Vùng/miền",
-"Zipcode" => "Mã bưu điện",
-"Country" => "Quốc gia",
-"Addressbook" => "Sổ địa chỉ",
-"Download" => "Tải về",
-"Edit" => "Sửa",
-"Save" => "Lưu",
-"Cancel" => "Hủy"
-);
diff --git a/apps/contacts/l10n/xgettextfiles b/apps/contacts/l10n/xgettextfiles
deleted file mode 100644
index e291074fba..0000000000
--- a/apps/contacts/l10n/xgettextfiles
+++ /dev/null
@@ -1,18 +0,0 @@
-../appinfo/app.php
-../ajax/activation.php
-../ajax/addbook.php
-../ajax/addproperty.php
-../ajax/createaddressbook.php
-../ajax/deletebook.php
-../ajax/deleteproperty.php
-../ajax/contactdetails.php
-../ajax/saveproperty.php
-../ajax/updateaddressbook.php
-../lib/app.php
-../templates/index.php
-../templates/part.chooseaddressbook.php
-../templates/part.chooseaddressbook.rowfields.php
-../templates/part.editaddressbook.php
-../templates/part.property.php
-../templates/part.setpropertyform.php
-../templates/settings.php
diff --git a/apps/contacts/l10n/zh_CN.php b/apps/contacts/l10n/zh_CN.php
deleted file mode 100644
index b3bac7aedf..0000000000
--- a/apps/contacts/l10n/zh_CN.php
+++ /dev/null
@@ -1,158 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Error (de)activating addressbook." => "(取消)激活地址簿错误。",
-"id is not set." => "没有设置 id。",
-"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 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 的信息不正确。请重新加载页面。",
-"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. " => "有一些信息无法被处理。",
-"No contact ID was submitted." => "未提交联系人 ID。",
-"Error reading contact photo." => "读取联系人照片错误。",
-"Error saving temporary file." => "保存临时文件错误。",
-"The loading photo is not valid." => "装入的照片不正确。",
-"Contact ID is missing." => "缺少联系人 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: " => "查找图像时出错: ",
-"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" => "错误",
-"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." => " 失败。",
-"This is not your addressbook." => "这不是您的地址簿。",
-"Contact could not be found." => "无法找到联系人。",
-"Work" => "工作",
-"Home" => "家庭",
-"Mobile" => "移动电话",
-"Text" => "文本",
-"Voice" => "语音",
-"Message" => "消息",
-"Fax" => "传真",
-"Video" => "视频",
-"Pager" => "传呼机",
-"Internet" => "互联网",
-"Birthday" => "生日",
-"{name}'s Birthday" => "{name} 的生日",
-"Contact" => "联系人",
-"Add Contact" => "添加联系人",
-"Import" => "导入",
-"Addressbooks" => "地址簿",
-"Close" => "关闭",
-"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" => "编辑名称详情",
-"Organization" => "组织",
-"Delete" => "删除",
-"Nickname" => "昵称",
-"Enter nickname" => "输入昵称",
-"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" => "添加字段",
-"Phone" => "电话",
-"Email" => "电子邮件",
-"Address" => "地址",
-"Note" => "注释",
-"Download contact" => "下载联系人",
-"Delete contact" => "删除联系人",
-"The temporary image has been removed from cache." => "临时图像文件已从缓存中删除",
-"Edit address" => "编辑地址",
-"Type" => "类型",
-"PO Box" => "邮箱",
-"Extended" => "扩展",
-"City" => "城市",
-"Region" => "地区",
-"Zipcode" => "邮编",
-"Country" => "国家",
-"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." => "老",
-"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" => "添加联系人",
-"CardDAV syncing addresses" => "CardDAV 同步地址",
-"more info" => "更多信息",
-"Primary address (Kontact et al)" => "首选地址 (Kontact 等)",
-"iOS/OS X" => "iOS/OS X",
-"Download" => "下载",
-"Edit" => "编辑",
-"New Address Book" => "新建地址簿",
-"Save" => "保存",
-"Cancel" => "取消"
-);
diff --git a/apps/contacts/l10n/zh_TW.php b/apps/contacts/l10n/zh_TW.php
deleted file mode 100644
index c8edacec9e..0000000000
--- a/apps/contacts/l10n/zh_TW.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Error (de)activating addressbook." => "在啟用或關閉電話簿時發生錯誤",
-"Error updating addressbook." => "電話簿更新中發生錯誤",
-"No ID provided" => "未提供 ID",
-"No contacts found." => "沒有找到聯絡人",
-"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 的資訊不正確，請重新載入此頁。",
-"Missing ID" => "遺失ID",
-"No file was uploaded" => "沒有已上傳的檔案",
-"Contacts" => "通訊錄",
-"This is not your addressbook." => "這不是你的電話簿",
-"Contact could not be found." => "通訊錄未發現",
-"Work" => "公司",
-"Home" => "住宅",
-"Mobile" => "行動電話",
-"Text" => "文字",
-"Voice" => "語音",
-"Message" => "訊息",
-"Fax" => "傳真",
-"Video" => "影片",
-"Pager" => "呼叫器",
-"Internet" => "網際網路",
-"Birthday" => "生日",
-"{name}'s Birthday" => "{name}的生日",
-"Contact" => "通訊錄",
-"Add Contact" => "添加通訊錄",
-"Addressbooks" => "電話簿",
-"Edit name details" => "編輯姓名詳細資訊",
-"Organization" => "組織",
-"Delete" => "刪除",
-"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" => "刪除電話號碼",
-"Edit address details" => "電子郵件住址詳細資訊",
-"Add notes here." => "在這裡新增註解",
-"Add field" => "新增欄位",
-"Phone" => "電話",
-"Email" => "電子郵件",
-"Address" => "地址",
-"Note" => "註解",
-"Download contact" => "下載通訊錄",
-"Delete contact" => "刪除通訊錄",
-"Type" => "類型",
-"PO Box" => "通訊地址",
-"Extended" => "分機",
-"City" => "城市",
-"Region" => "地區",
-"Zipcode" => "郵遞區號",
-"Country" => "國家",
-"Addressbook" => "電話簿",
-"Mr" => "先生",
-"Sir" => "先生",
-"Mrs" => "小姐",
-"Dr" => "博士（醫生）",
-"Given name" => "給定名（名）",
-"Additional names" => "額外名",
-"Family name" => "家族名（姓）",
-"Download" => "下載",
-"Edit" => "編輯",
-"New Address Book" => "新電話簿",
-"Save" => "儲存",
-"Cancel" => "取消"
-);
diff --git a/apps/contacts/lib/addressbook.php b/apps/contacts/lib/addressbook.php
deleted file mode 100644
index b487260d32..0000000000
--- a/apps/contacts/lib/addressbook.php
+++ /dev/null
@@ -1,341 +0,0 @@
-<?php
-/**
- * ownCloud - Addressbook
- *
- * @author Jakob Sack
- * @copyright 2011 Jakob Sack mail@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/>.
- *
- */
-/*
- *
- * The following SQL statement is just a help for developers and will not be
- * executed!
- *
- * CREATE TABLE contacts_addressbooks (
- * id INT(11) UNSIGNED NOT NULL PRIMARY KEY AUTO_INCREMENT,
- * userid VARCHAR(255) NOT NULL,
- * displayname VARCHAR(255),
- * uri VARCHAR(100),
- * description TEXT,
- * ctag INT(11) UNSIGNED NOT NULL DEFAULT '1'
- * );
- *
- */
-/**
- * This class manages our addressbooks.
- */
-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) {
-		$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` = ? ' . $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;
-		}
-		$addressbooks = array_merge($addressbooks, OCP\Share::getItemsSharedWith('addressbook', OC_Share_Backend_Addressbook::FORMAT_ADDRESSBOOKS));
-		if(!$active && !count($addressbooks)) {
-			$id = self::addDefault($uid);
-			return array(self::find($id),);
-		}
-		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['id'];
-		}
-		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
-	 * @return array
-	 */
-	public static function allWherePrincipalURIIs($principaluri){
-		$uid = self::extractUserID($principaluri);
-		return self::all($uid);
-	}
-
-	/**
-	 * @brief Gets the data of one address book
-	 * @param integer $id
-	 * @return associative array or false.
-	 */
-	public static function find($id) {
-		try {
-			$stmt = OCP\DB::prepare( 'SELECT * FROM `*PREFIX*contacts_addressbooks` WHERE `id` = ?' );
-			$result = $stmt->execute(array($id));
-			return $result->fetchRow();
-		} 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, 'Contacts', 'Default Address Book');
-		if($id !== false) {
-			self::setActive($id, true);
-		}
-		return $id;
-	}
-
-	/**
-	 * @brief Creates a new address book
-	 * @param string $userid
-	 * @param string $name
-	 * @param string $description
-	 * @return insertid
-	 */
-	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);
-			return false;
-		}
-		$uris = array();
-		while($row = $result->fetchRow()){
-			$uris[] = $row['uri'];
-		}
-
-		$uri = self::createURI($name, $uris );
-		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');
-	}
-
-	/**
-	 * @brief Creates a new address book from the data sabredav provides
-	 * @param string $principaluri
-	 * @param string $uri
-	 * @param string $name
-	 * @param string $description
-	 * @return insertid or false
-	 */
-	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);
-			return false;
-		}
-
-		return OCP\DB::insertid('*PREFIX*contacts_addressbooks');
-	}
-
-	/**
-	 * @brief Edits an addressbook
-	 * @param integer $id
-	 * @param string $name
-	 * @param string $description
-	 * @return boolean
-	 */
-	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'];
-		}
-		if(is_null($description)) {
-			$description = $addressbook['description'];
-		}
-
-		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;
-	}
-
-	/**
-	 * @brief Activates an addressbook
-	 * @param integer $id
-	 * @param boolean $active
-	 * @return boolean
-	 */
-	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);
-		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;
-		}
-	}
-
-	/**
-	 * @brief Checks if an addressbook is active.
-	 * @param integer $id ID of the address book.
-	 * @return boolean
-	 */
-	public static function isActive($id) {
-		$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);
-		}
-	}
-
-	/**
-	 * @brief removes an address book
-	 * @param integer $id
-	 * @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` = ?' );
-			$stmt->execute(array($id));
-		} catch(Exception $e) {
-			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']);
-		}
-
-		return true;
-	}
-
-	/**
-	 * @brief Updates ctag for addressbook
-	 * @param integer $id
-	 * @return boolean
-	 */
-	public static function touch($id) {
-		$stmt = OCP\DB::prepare( 'UPDATE `*PREFIX*contacts_addressbooks` SET `ctag` = `ctag` + 1 WHERE `id` = ?' );
-		$stmt->execute(array($id));
-
-		return true;
-	}
-
-	/**
-	 * @brief Creates a URI for Addressbook
-	 * @param string $name name of the addressbook
-	 * @param array  $existing existing addressbook URIs
-	 * @return string new name
-	 */
-	public static function createURI($name,$existing) {
-		$name = str_replace(' ', '_', strtolower($name));
-		$newname = $name;
-		$i = 1;
-		while(in_array($newname, $existing)) {
-			$newname = $name.$i;
-			$i = $i + 1;
-		}
-		return $newname;
-	}
-
-	/**
-	 * @brief gets the userid from a principal path
-	 * @return string
-	 */
-	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
deleted file mode 100644
index e8e1937404..0000000000
--- a/apps/contacts/lib/app.php
+++ /dev/null
@@ -1,331 +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.
- */
-
-/**
- * This class manages our app actions
- */
-OC_Contacts_App::$l10n = OC_L10N::get('contacts');
-class OC_Contacts_App {
-	/*
-	 * @brief language object for calendar app
-	 */
-
-	public static $l10n;
-	/*
-	 * @brief categories of the user
-	 */
-	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: ' . $id)
-						)
-					)
-				);
-			} 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;
-	}
-
-	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)
-					)
-				)
-			);
-			exit();
-		}
-
-		self::getAddressbook( $card['addressbookid'] );//access check
-		return $card;
-	}
-
-	/**
-	 * @brief Gets the VCard as an OC_VObject
-	 * @returns The card or null if the card could not be parsed.
-	 */
-	public static function getContactVCard($id) {
-		$card = self::getContactObject( $id );
-
-		$vcard = OC_VObject::parse($card['carddata']);
-		if (!is_null($vcard) && !isset($vcard->REV)) {
-			$rev = new DateTime('@'.$card['lastmodified']);
-			$vcard->setString('REV', $rev->format(DateTime::W3C));
-		}
-		return $vcard;
-	}
-
-	public static function getPropertyLineByChecksum($vcard, $checksum) {
-		$line = null;
-		for($i=0;$i<count($vcard->children);$i++) {
-			if(md5($vcard->children[$i]->serialize()) == $checksum ) {
-				$line = $i;
-				break;
-			}
-		}
-		return $line;
-	}
-
-	/**
-	 * @return array of vcard prop => label
-	 */
-	public static function getIMOptions($im = null) {
-		$l10n = self::$l10n;
-		$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;
-		}
-	}
-
-	/**
-	 * @return types for property $prop
-	 */
-	public static function getTypesOfProperty($prop) {
-		$l = self::$l10n;
-		switch($prop) {
-			case 'ADR':
-			case 'IMPP':
-				return array(
-					'WORK' => $l->t('Work'),
-					'HOME' => $l->t('Home'),
-					'OTHER' =>  $l->t('Other'),
-				);
-			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'),
-					'OTHER' =>  $l->t('Other'),
-				);
-			case 'EMAIL':
-				return array(
-					'WORK' => $l->t('Work'),
-					'HOME' => $l->t('Home'),
-					'INTERNET' => $l->t('Internet'),
-				);
-		}
-	}
-
-	/**
-	 * @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',
-				null,
-				self::getDefaultCategories());
-		}
-		return self::$categories;
-	}
-
-	/**
-	 * @brief returns the categories for the user
-	 * @return (Array) $categories
-	 */
-	public static function getCategories() {
-		$categories = self::getVCategories()->categories();
-		if(count($categories) == 0) {
-			self::scanCategories();
-			$categories = self::$categories->categories();
-		}
-		return ($categories ? $categories : self::getDefaultCategories());
-	}
-
-	/**
-	 * @brief returns the default categories of ownCloud
-	 * @return (array) $categories
-	 */
-	public 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.
-	 */
-	public static function scanCategories($vccontacts = null) {
-		if (is_null($vccontacts)) {
-			$vcaddressbooks = OC_Contacts_Addressbook::all(OCP\USER::getUser());
-			if(count($vcaddressbooks) > 0) {
-				$vcaddressbookids = array();
-				foreach($vcaddressbooks as $vcaddressbook) {
-					$vcaddressbookids[] = $vcaddressbook['id'];
-				}
-				$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;
-				}
-			}
-		}
-	}
-
-	/**
-	 * check VCard for new categories.
-	 * @see OC_VCategories::loadFromVObject
-	 */
-	public static function loadCategoriesFromVCard(OC_VObject $contact) {
-		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) {
-			$rev = DateTime::createFromFormat(DateTime::W3C, $rev);
-			OCP\Response::setLastModifiedHeader($rev);
-		}
-	}
-}
diff --git a/apps/contacts/lib/hooks.php b/apps/contacts/lib/hooks.php
deleted file mode 100644
index 8b7adc60f2..0000000000
--- a/apps/contacts/lib/hooks.php
+++ /dev/null
@@ -1,116 +0,0 @@
-<?php
-/**
- * ownCloud - Addressbook
- *
- * @author Jakob Sack
- * @copyright 2011 Jakob Sack mail@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/>.
- *
- */
-
-/**
- * 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.
- */
-class OC_Contacts_Hooks{
-	/**
-	 * @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']);
-		return true;
-	}
-
-	/**
-	 * @brief Deletes all Addressbooks of a certain user
-	 * @param paramters parameters from postDeleteUser-Hook
-	 * @return array
-	 */
-	static public function deleteUser($parameters) {
-		$addressbooks = OC_Contacts_Addressbook::all($parameters['uid']);
-
-		foreach($addressbooks as $addressbook) {
-			OC_Contacts_Addressbook::delete($addressbook['id']);
-		}
-
-		return true;
-	}
-
-	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(
-					'url' => $base_url.'birthday_'. $addressbook['id'],
-					'backgroundColor' => '#cccccc',
-					'borderColor' => '#888',
-					'textColor' => 'black',
-					'cache' => true,
-					'editable' => false,
-				);
-		}
-	}
-
-	static public function getBirthdayEvents($parameters) {
-		$name = $parameters['calendar_id'];
-		if (strpos($name, 'birthday_') != 0) {
-			return;
-		}
-		$info = explode('_', $name);
-		$aid = $info[1];
-		OC_Contacts_App::getAddressbook($aid);
-		foreach(OC_Contacts_VCard::all($aid) as $card){
-			$vcard = OC_VObject::parse($card['carddata']);
-			if (!$vcard) {
-				continue;
-			}
-			$birthday = $vcard->BDAY;
-			if ($birthday) {
-				$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->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'));
-				$parameters['events'][] = array(
-					'id' => 0,//$card['id'],
-					'vevent' => $vevent,
-					'repeating' => true,
-					'summary' => $title,
-					'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/sabre/addressbook.php b/apps/contacts/lib/sabre/addressbook.php
deleted file mode 100644
index e9eb77472b..0000000000
--- a/apps/contacts/lib/sabre/addressbook.php
+++ /dev/null
@@ -1,128 +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/>.
- *
- */
-
-/**
- * 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
deleted file mode 100644
index 69cd602128..0000000000
--- a/apps/contacts/lib/sabre/addressbookroot.php
+++ /dev/null
@@ -1,45 +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/>.
- *
- */
-
-/**
- * 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/sabre/backend.php b/apps/contacts/lib/sabre/backend.php
deleted file mode 100644
index 04737eb3ab..0000000000
--- a/apps/contacts/lib/sabre/backend.php
+++ /dev/null
@@ -1,210 +0,0 @@
-<?php
-/**
- * ownCloud - Addressbook
- *
- * @author Jakob Sack
- * @copyright 2011 Jakob Sack mail@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 CardDAV backend uses PDO to store addressbooks
- */
-class OC_Connector_Sabre_CardDAV extends Sabre_CardDAV_Backend_Abstract {
-	/**
-	 * Returns the list of addressbooks for a specific user.
-	 *
-	 * @param string $principaluri
-	 * @return array
-	 */
-	public function getAddressBooksForUser($principaluri) {
-		$data = OC_Contacts_Addressbook::allWherePrincipalURIIs($principaluri);
-		$addressbooks = array();
-
-		foreach($data as $i) {
-			$addressbooks[] = array(
-				'id'  => $i['id'],
-				'uri' => $i['uri'],
-				'principaluri' => 'principals/'.$i['userid'],
-				'{DAV:}displayname' => $i['displayname'],
-				'{' . Sabre_CardDAV_Plugin::NS_CARDDAV . '}addressbook-description'
-						=> $i['description'],
-				'{http://calendarserver.org/ns/}getctag' => $i['ctag'],
-			);
-		}
-
-		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) {
-		$name = null;
-		$description = null;
-
-		foreach($mutations as $property=>$newvalue) {
-			switch($property) {
-				case '{DAV:}displayname' :
-					$name = $newvalue;
-					break;
-				case '{' . Sabre_CardDAV_Plugin::NS_CARDDAV
-						. '}addressbook-description' :
-					$description = $newvalue;
-					break;
-				default :
-					// If any unsupported values were being updated, we must
-					// let the entire request fail.
-					return false;
-			}
-		}
-
-		OC_Contacts_Addressbook::edit($addressbookid, $name, $description);
-
-		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) {
-
-		$displayname = null;
-		$description = null;
-
-		foreach($properties as $property=>$newvalue) {
-
-			switch($property) {
-				case '{DAV:}displayname' :
-					$displayname = $newvalue;
-					break;
-				case '{' . Sabre_CardDAV_Plugin::NS_CARDDAV
-						. '}addressbook-description' :
-					$description = $newvalue;
-					break;
-				default :
-					throw new Sabre_DAV_Exception_BadRequest('Unknown property: '
-						. $property);
-			}
-
-		}
-
-		OC_Contacts_Addressbook::addFromDAVData(
-					$principaluri,
-					$url,
-					$name,
-					$description
-		);
-	}
-
-	/**
-	 * Deletes an entire addressbook and all its contents
-	 *
-	 * @param int $addressbookid
-	 * @return void
-	 */
-	public function deleteAddressBook($addressbookid) {
-		OC_Contacts_Addressbook::delete($addressbookid);
-	}
-
-	/**
-	 * Returns all cards for a specific addressbook id.
-	 *
-	 * @param mixed $addressbookid
-	 * @return array
-	 */
-	public function getCards($addressbookid) {
-		$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'],
-				'size' => strlen($i['carddata']),
-				'etag' => md5($i['carddata']),
-				'uri' => $i['uri'],
-				'lastmodified' => $i['lastmodified'] );
-		}
-
-		return $cards;
-	}
-
-	/**
-	 * Returns a specfic card
-	 *
-	 * @param mixed $addressbookid
-	 * @param string $carduri
-	 * @return array
-	 */
-	public function getCard($addressbookid, $carduri) {
-		return OC_Contacts_VCard::findWhereDAVDataIs($addressbookid, $carduri);
-
-	}
-
-	/**
-	 * Creates a new card
-	 *
-	 * @param mixed $addressbookid
-	 * @param string $carduri
-	 * @param string $carddata
-	 * @return bool
-	 */
-	public function createCard($addressbookid, $carduri, $carddata) {
-		OC_Contacts_VCard::addFromDAVData($addressbookid, $carduri, $carddata);
-		return true;
-	}
-
-	/**
-	 * Updates a card
-	 *
-	 * @param mixed $addressbookid
-	 * @param string $carduri
-	 * @param string $carddata
-	 * @return bool
-	 */
-	public function updateCard($addressbookid, $carduri, $carddata) {
-		return OC_Contacts_VCard::editFromDAVData(
-			$addressbookid, $carduri, $carddata
-		);
-	}
-
-	/**
-	 * Deletes a card
-	 *
-	 * @param mixed $addressbookid
-	 * @param string $carduri
-	 * @return bool
-	 */
-	public function deleteCard($addressbookid, $carduri) {
-		return OC_Contacts_VCard::deleteFromDAVData($addressbookid, $carduri);
-	}
-}
diff --git a/apps/contacts/lib/sabre/card.php b/apps/contacts/lib/sabre/card.php
deleted file mode 100644
index f4414a25f7..0000000000
--- a/apps/contacts/lib/sabre/card.php
+++ /dev/null
@@ -1,94 +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/>.
- *
- */
-
-/**
- * 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
deleted file mode 100644
index 328b433bd6..0000000000
--- a/apps/contacts/lib/sabre/useraddressbooks.php
+++ /dev/null
@@ -1,45 +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/>.
- *
- */
-
-/**
- * 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/sabre/vcfexportplugin.php b/apps/contacts/lib/sabre/vcfexportplugin.php
deleted file mode 100644
index f0ba60b303..0000000000
--- a/apps/contacts/lib/sabre/vcfexportplugin.php
+++ /dev/null
@@ -1,100 +0,0 @@
-<?php
-
-/**
- * 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
- * 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 OC_Connector_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_IAddressBook)) 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'];
-            $objects[] = $nodeData;
-
-        }
-
-        return implode("\r\n", $objects);
-
-    }
-
-}
diff --git a/apps/contacts/lib/search.php b/apps/contacts/lib/search.php
deleted file mode 100644
index 53aa2b4849..0000000000
--- a/apps/contacts/lib/search.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-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')) {
-			return array();
-		}
-		$results=array();
-		$l = new OC_l10n('contacts');
-		foreach($addressbooks as $addressbook){
-			$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']);
-					$results[]=new OC_Search_Result($vcard['fullname'], '', $link, (string)$l->t('Contact'));//$name,$text,$link,$type
-				}
-			}
-		}
-		return $results;
-	}
-}
diff --git a/apps/contacts/lib/share/addressbook.php b/apps/contacts/lib/share/addressbook.php
deleted file mode 100644
index acabeab2ad..0000000000
--- a/apps/contacts/lib/share/addressbook.php
+++ /dev/null
@@ -1,94 +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_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($itemSource, $uidOwner) {
-		$addressbook = OC_Contacts_Addressbook::find( $itemSource );
-		if( $addressbook === false || $addressbook['userid'] != $uidOwner) {
-			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) {
-		$addressbook = OC_Contacts_Addressbook::find( $itemSource );
-		$user_addressbooks = array();
-		foreach(OC_Contacts_Addressbook::all($shareWith) 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();
-		if ($format == self::FORMAT_ADDRESSBOOKS) {
-			foreach ($items as $item) {
-				$addressbook = OC_Contacts_Addressbook::find($item['item_source']);
-				if ($addressbook) {
-					$addressbook['displayname'] = $item['item_target'];
-					$addressbook['permissions'] = $item['permissions'];
-					$addressbooks[] = $addressbook;
-				}
-			}
-		}
-		return $addressbooks;
-	}
-
-	public function getChildren($itemSource) {
-		$query = OCP\DB::prepare('SELECT `id` FROM `*PREFIX*contacts_cards` WHERE `addressbookid` = ?');
-		$result = $query->execute(array($itemSource));
-		$sources = array();
-		while ($contact = $result->fetchRow()) {
-			$sources[] = $contact['id'];
-		}
-		return $sources;
-	}
-
-}
diff --git a/apps/contacts/lib/share/contact.php b/apps/contacts/lib/share/contact.php
deleted file mode 100644
index 718c8f9025..0000000000
--- a/apps/contacts/lib/share/contact.php
+++ /dev/null
@@ -1,53 +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_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
diff --git a/apps/contacts/lib/vcard.php b/apps/contacts/lib/vcard.php
deleted file mode 100644
index 91a5b806b1..0000000000
--- a/apps/contacts/lib/vcard.php
+++ /dev/null
@@ -1,733 +0,0 @@
-<?php
-/**
- * ownCloud - Addressbook
- *
- * @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
- * 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 following SQL statement is just a help for developers and will not be
- * executed!
- *
- * CREATE TABLE contacts_cards (
- * id INT(11) UNSIGNED NOT NULL PRIMARY KEY AUTO_INCREMENT,
- * addressbookid INT(11) UNSIGNED NOT NULL,
- * fullname VARCHAR(255),
- * carddata TEXT,
- * uri VARCHAR(100),
- * lastmodified INT(11) UNSIGNED
- * );
- */
-
-/**
- * This class manages our vCards
- */
-class OC_Contacts_VCard {
-	/**
-	 * @brief Returns all cards of an address book
-	 * @param integer $id
-	 * @return array|false
-	 *
-	 * The cards are associative arrays. You'll find the original vCard in
-	 * ['carddata']
-	 */
-	public static function all($id, $start=null, $num=null){
-		$result = null;
-		if(is_array($id) && count($id)) {
-			$id_sql = join(',', array_fill(0, count($id), '?'));
-			$sql = 'SELECT * FROM `*PREFIX*contacts_cards` WHERE `addressbookid` IN ('.$id_sql.') ORDER BY `fullname`';
-			try {
-				$stmt = OCP\DB::prepare( $sql, $num, $start );
-				$result = $stmt->execute($id);
-			} catch(Exception $e) {
-				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:'.$sql, OCP\Util::DEBUG);
-				return false;
-			}
-		} elseif(is_int($id) || is_string($id)) {
-			try {
-				$sql = 'SELECT * FROM `*PREFIX*contacts_cards` WHERE `addressbookid` = ? ORDER BY `fullname`';
-				$stmt = OCP\DB::prepare( $sql, $num, $start );
-				$result = $stmt->execute(array($id));
-			} catch(Exception $e) {
-				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', __METHOD__.'. Addressbook id(s) argument is empty: '. print_r($id, true), OCP\Util::DEBUG);
-			return false;
-		}
-		$cards = array();
-		if(!is_null($result)) {
-			while( $row = $result->fetchRow()){
-				$cards[] = $row;
-			}
-		}
-
-		return $cards;
-	}
-
-	/**
-	 * @brief Returns a card
-	 * @param integer $id
-	 * @return associative array or false.
-	 */
-	public static function find($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', __METHOD__.', exception: '.$e->getMessage(), OCP\Util::ERROR);
-			OCP\Util::writeLog('contacts', __METHOD__.', id: '. $id, OCP\Util::DEBUG);
-			return false;
-		}
-
-		return $result->fetchRow();
-	}
-
-	/**
-	 * @brief finds a card by its DAV Data
-	 * @param integer $aid Addressbook id
-	 * @param string $uri the uri ('filename')
-	 * @return associative array or false.
-	 */
-	public static function findWhereDAVDataIs($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', __METHOD__.', exception: '.$e->getMessage(), OCP\Util::ERROR);
-			OCP\Util::writeLog('contacts', __METHOD__.', aid: '.$aid.' uri'.$uri, OCP\Util::DEBUG);
-			return false;
-		}
-
-		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
-	* This has to be changed to either TEL;TYPE=HOME,CELL:123456789 or TEL;TYPE=HOME;TYPE=CELL:123456789 - both are valid.
-	*/
-	public static function formatPropertyTypes(&$property) {
-		foreach($property->parameters as $key=>&$parameter){
-			$types = OC_Contacts_App::getTypesOfProperty($property->name);
-			if(is_array($types) && in_array(strtoupper($parameter->name), array_keys($types)) || strtoupper($parameter->name) == 'PREF') {
-				$property->parameters[] = new Sabre_VObject_Parameter('TYPE', $parameter->name);
-			}
-			unset($property->parameters[$key]);
-		}
-	}
-
-	/**
-	* @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
-	* must therefor be decoded and the parameters removed.
-	*/
-	public static function decodeProperty(&$property) {
-		// Check out for encoded string and decode them :-[
-		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);
-					unset($property->parameters[$key]);
-				}
-			} elseif(strtoupper($parameter->name) == 'CHARSET') {
-					unset($property->parameters[$key]);
-			}
-		}
-	}
-
-	/**
-	* @brief Checks if a contact with the same UID already exist in the address book.
-	* @param $aid Address book ID.
-	* @param $uid UID (passed by reference).
-	* @returns true if the UID has been changed.
-	*/
-	protected static function trueUID($aid, &$uid) {
-		$stmt = OCP\DB::prepare( 'SELECT * FROM `*PREFIX*contacts_cards` WHERE `addressbookid` = ? AND `uri` = ?' );
-		$uri = $uid.'.vcf';
-		try {
-			$result = $stmt->execute(array($aid,$uri));
-		} catch(Exception $e) {
-			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) {
-			while(true) {
-				$tmpuid = substr(md5(rand().time()), 0, 10);
-				$uri = $tmpuid.'.vcf';
-				$result = $stmt->execute(array($aid, $uri));
-				if($result->numRows() > 0) {
-					continue;
-				} else {
-					$uid = $tmpuid;
-					return true;
-				}
-			}
-		} else {
-			return false;
-		}
-	}
-
-	/**
-	* @brief Tries to update imported VCards to adhere to rfc2426 (VERSION: 3.0) and add mandatory fields if missing.
-	* @param aid Address book id.
-	* @param vcard An OC_VObject of type VCARD (passed by reference).
-	*/
-	protected static function updateValuesFromAdd($aid, &$vcard) { // any suggestions for a better method name? ;-)
-		$stringprops = array('N', 'FN', 'ORG', 'NICK', 'ADR', 'NOTE');
-		$typeprops = array('ADR', 'TEL', 'EMAIL');
-		$upgrade = false;
-		$fn = $n = $uid = $email = $org = null;
-		$version = $vcard->getAsString('VERSION');
-		// 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);
-		}
-		foreach($vcard->children as &$property){
-			// Decode string properties and remove obsolete properties.
-			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);
-			}
-			// 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);
-				self::formatPropertyTypes($property);
-				OCP\Util::writeLog('contacts', 'OC_Contacts_VCard::updateValuesFromAdd. after: '.$property->serialize(), OCP\Util::DEBUG);
-			}
-			if($property->name == 'FN') {
-				$fn = $property->value;
-			}
-			if($property->name == 'N') {
-				$n = $property->value;
-			}
-			if($property->name == 'UID') {
-				$uid = $property->value;
-			}
-			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.
-				$email = $property->value;
-			}
-		}
-		// Check for missing 'N', 'FN' and 'UID' properties
-		if(!$fn) {
-			if($n && $n != ';;;;') {
-				$fn = join(' ', array_reverse(array_slice(explode(';', $n), 0, 2)));
-			} elseif($email) {
-				$fn = $email;
-			} elseif($org) {
-				$fn = $org;
-			} else {
-				$fn = 'Unknown Name';
-			}
-			$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 ;-)
-			$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);
-		}
-		if(!$uid) {
-			$vcard->setUID();
-			$uid = $vcard->getAsString('UID');
-			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);
-		}
-		$now = new DateTime;
-		$vcard->setString('REV', $now->format(DateTime::W3C));
-	}
-
-	/**
-	 * @brief Adds a card
-	 * @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, $isChecked=false){
-		if(is_null($card)) {
-			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 || !($sharedAddressbook['permissions'] & OCP\Share::PERMISSION_CREATE)) {
-				return false;
-			}
-		}
-		if(!$isChecked) {
-			OC_Contacts_App::loadCategoriesFromVCard($card);
-			self::updateValuesFromAdd($aid, $card);
-		}
-		$card->setString('VERSION', '3.0');
-		// Add product ID is missing.
-		$prodid = trim($card->getAsString('PRODID'));
-		if(!$prodid) {
-			$appinfo = OCP\App::getAppInfo('contacts');
-			$appversion = OCP\App::getAppVersion('contacts');
-			$prodid = '-//ownCloud//NONSGML '.$appinfo['name'].' '.$appversion.'//EN';
-			$card->setString('PRODID', $prodid);
-		}
-
-		$fn = $card->getAsString('FN');
-		if (empty($fn)) {
-			$fn = '';
-		}
-
-		if (!$uri) {
-			$uid = $card->getAsString('UID');
-			$uri = $uid.'.vcf';
-		}
-
-		$data = $card->serialize();
-		$stmt = OCP\DB::prepare( 'INSERT INTO `*PREFIX*contacts_cards` (`addressbookid`,`fullname`,`carddata`,`uri`,`lastmodified`) VALUES(?,?,?,?,?)' );
-		try {
-			$result = $stmt->execute(array($aid,$fn,$data,$uri,time()));
-		} catch(Exception $e) {
-			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');
-
-		OC_Contacts_Addressbook::touch($aid);
-		OC_Hook::emit('OC_Contacts_VCard', 'post_createVCard', $newid);
-		return $newid;
-	}
-
-	/**
-	 * @brief Adds a card with the data provided by sabredav
-	 * @param integer $id Addressbook id
-	 * @param string $uri   the uri the card will have
-	 * @param string $data  vCard file
-	 * @return insertid
-	 */
-	public static function addFromDAVData($id,$uri,$data){
-		$card = OC_VObject::parse($data);
-		return self::add($id, $card, $uri);
-	}
-
-	/**
-	 * @brief Mass updates an array of cards
-	 * @param array $objects  An array of [id, carddata].
-	 */
-	public static function updateDataByID($objects){
-		$stmt = OCP\DB::prepare( 'UPDATE `*PREFIX*contacts_cards` SET `carddata` = ?, `lastmodified` = ? WHERE `id` = ?' );
-		$now = new DateTime;
-		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 {
-					$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', __METHOD__.', exception: '.$e->getMessage(), OCP\Util::ERROR);
-					OCP\Util::writeLog('contacts', __METHOD__.', id: '.$object[0], OCP\Util::DEBUG);
-				}
-			}
-		}
-	}
-
-	/**
-	 * @brief edits a card
-	 * @param integer $id id of card
-	 * @param OC_VObject $card  vCard file
-	 * @return boolean
-	 */
-	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)) {
-				throw new Exception(OC_Contacts_App::$l10n->t('You do not have the permissions to edit this contact.'));
-			}
-		}
-		OC_Contacts_App::loadCategoriesFromVCard($card);
-
-		$fn = $card->getAsString('FN');
-		if (empty($fn)) {
-			$fn = null;
-		}
-
-		$now = new DateTime;
-		$card->setString('REV', $now->format(DateTime::W3C));
-
-		$data = $card->serialize();
-		$stmt = OCP\DB::prepare( 'UPDATE `*PREFIX*contacts_cards` SET `fullname` = ?,`carddata` = ?, `lastmodified` = ? WHERE `id` = ?' );
-		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__.', id'.$id, OCP\Util::DEBUG);
-			return false;
-		}
-
-		OC_Contacts_Addressbook::touch($oldcard['addressbookid']);
-		OC_Hook::emit('OC_Contacts_VCard', 'post_updateVCard', $id);
-		return true;
-	}
-
-	/**
-	 * @brief edits a card with the data provided by sabredav
-	 * @param integer $id Addressbook id
-	 * @param string $uri   the uri of the card
-	 * @param string $data  vCard file
-	 * @return boolean
-	 */
-	public static function editFromDAVData($aid, $uri, $data){
-		$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);
-			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;
-		}
-	}
-
-	/**
-	 * @brief deletes a card
-	 * @param integer $id id of card
-	 * @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)) {
-				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` = ?');
-		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);
-			return false;
-		}
-
-		return true;
-	}
-
-	/**
-	 * @brief deletes a card with the data provided by sabredav
-	 * @param integer $aid Addressbook id
-	 * @param string $uri the uri of the card
-	 * @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 {
-			$stmt->execute(array($aid,$uri));
-		} catch(Exception $e) {
-			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);
-
-		return true;
-	}
-
-	/**
-	 * @brief Escapes delimiters from an array and returns a string.
-	 * @param array $value
-	 * @param char $delimiter
-	 * @return string
-	 */
-	public static function escapeDelimiters($value, $delimiter=';') {
-		foreach($value as &$i ) {
-			$i = implode("\\$delimiter", explode($delimiter, $i));
-		}
-		return implode($delimiter, $value);
-	}
-
-
-	/**
-	 * @brief Creates an array out of a multivalue property
-	 * @param string $value
-	 * @param char $delimiter
-	 * @return array
-	 */
-	public static function unescapeDelimiters($value, $delimiter=';') {
-		$array = explode($delimiter, $value);
-		for($i=0;$i<count($array);$i++) {
-			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]);
-				} else {
-					$array[$i] = substr($array[$i], 0, count($array[$i])-2).$delimiter;
-				}
-				$i = $i - 1;
-			}
-		}
-		$array = array_map('trim', $array);
-		return $array;
-	}
-
-	/**
-	 * @brief Data structure of vCard
-	 * @param object $property
-	 * @return associative array
-	 *
-	 * look at code ...
-	 */
-	public static function structureContact($object) {
-		$details = array();
-
-		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($pname, $details)) {
-					$details[$pname][] = $temp;
-				}
-				else{
-					$details[$pname] = array($temp);
-				}
-			}
-		}
-		return $details;
-	}
-
-	/**
-	 * @brief Data structure of properties
-	 * @param object $property
-	 * @return associative array
-	 *
-	 * returns an associative array with
-	 * ['name'] name of property
-	 * ['value'] htmlspecialchars escaped value of property
-	 * ['parameters'] associative array name=>value
-	 * ['checksum'] checksum of whole property
-	 * 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) {
-		$value = $property->value;
-		//$value = htmlspecialchars($value);
-		if($property->name == 'ADR' || $property->name == 'N') {
-			$value = self::unescapeDelimiters($value);
-		} elseif($property->name == 'BDAY') {
-			if(strpos($value, '-') === false) {
-				if(strlen($value) >= 8) {
-					$value = substr($value, 0, 4).'-'.substr($value, 4, 2).'-'.substr($value, 6, 2);
-				} else {
-					return null; // Badly malformed :-(
-				}
-			}
-		}
-		if(is_string($value)) {
-			$value = strtr($value, array('\,' => ',', '\;' => ';'));
-		}
-		$temp = array(
-			'name' => $property->name,
-			'value' => $value,
-			'parameters' => array(),
-			'checksum' => md5($property->serialize()));
-		foreach($property->parameters as $parameter){
-			// 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' && strtoupper($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])) {
-					$temp['parameters'][$parameter->name][] = $parameter->value;
-				}
-				else {
-					$temp['parameters'][$parameter->name] = array($parameter->value);
-				}
-			}
-			else{
-				$temp['parameters'][$parameter->name] = $parameter->value;
-			}
-		}
-		return $temp;
-	}
-
-	/**
-	 * @brief Move card(s) to an address book
-	 * @param integer $aid Address book id
-	 * @param $id Array or integer of cards to be moved.
-	 * @return boolean
-	 *
-	 */
-	public static function moveToAddressBook($aid, $id, $isAddressbook = false) {
-		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 {
-				$stmt = OCP\DB::prepare( $prep );
-				//$aid = array($aid);
-				$vals = array_merge((array)$aid, $id);
-				$result = $stmt->execute($vals);
-			} catch(Exception $e) {
-				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 {
-			$stmt = null;
-			if($isAddressbook) {
-				$stmt = OCP\DB::prepare( 'UPDATE `*PREFIX*contacts_cards` SET `addressbookid` = ? WHERE `addressbookid` = ?' );
-			} 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;
-					}
-				}
-				$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', __METHOD__.', exception: '.$e->getMessage(), OCP\Util::DEBUG);
-				OCP\Util::writeLog('contacts', __METHOD__.' id: '.$id, OCP\Util::DEBUG);
-				return false;
-			}
-		}
-		OC_Hook::emit('OC_Contacts_VCard', 'post_moveToAddressbook', array('aid' => $aid, 'id' => $id));
-		OC_Contacts_Addressbook::touch($aid);
-		return true;
-	}
-}
diff --git a/apps/contacts/photo.php b/apps/contacts/photo.php
deleted file mode 100644
index f5c8e6fe4b..0000000000
--- a/apps/contacts/photo.php
+++ /dev/null
@@ -1,83 +0,0 @@
-<?php
-/**
- * Copyright (c) 2012 Thomas Tanghus <thomas@tanghus.net>
- * Copyright (c) 2011, 2012 Bart Visscher <bartv@thisnet.nl>
- * Copyright (c) 2011 Jakob Sack mail@jakobsack.de
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
-// Init owncloud
-
-OCP\User::checkLoggedIn();
-OCP\App::checkAppEnabled('contacts');
-
-function getStandardImage() {
-	//OCP\Response::setExpiresHeader('P10D');
-	OCP\Response::enableCaching();
-	OCP\Response::redirect(OCP\Util::imagePath('contacts', 'person_large.png'));
-}
-
-$id = isset($_GET['id']) ? $_GET['id'] : null;
-$etag = null;
-$caching = null;
-
-if(is_null($id)) {
-	getStandardImage();
-}
-
-if(!extension_loaded('gd') || !function_exists('gd_info')) {
-	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) {
-	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);
-} else {
-	// Photo :-)
-	if ($image->loadFromBase64($contact->getAsString('PHOTO'))) {
-		// OK
-		$etag = md5($contact->getAsString('PHOTO'));
-	}
-	else
-	// Logo :-/
-	if ($image->loadFromBase64($contact->getAsString('LOGO'))) {
-		// OK
-		$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);
-		}
-	}
-}
-if (!$image->valid()) {
-	// Not found :-(
-	getStandardImage();
-}
-header('Content-Type: '.$image->mimeType());
-$image->show();
-
diff --git a/apps/contacts/settings.php b/apps/contacts/settings.php
deleted file mode 100644
index 5f639399c9..0000000000
--- a/apps/contacts/settings.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-$tmpl = new OCP\Template( 'contacts', 'settings');
-$tmpl->assign('addressbooks', OC_Contacts_Addressbook::all(OCP\USER::getUser()), false);
-
-$tmpl->printPage();
diff --git a/apps/contacts/templates/index.php b/apps/contacts/templates/index.php
deleted file mode 100644
index 744381026a..0000000000
--- a/apps/contacts/templates/index.php
+++ /dev/null
@@ -1,74 +0,0 @@
-<div id='notification'></div>
-<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">
-	<div class="hidden" id="statusbar"></div>
-	<div id="contacts">
-	</div>
-	<div id="uploadprogressbar"></div>
-	<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="<?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="<?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">
-		</form>
-		<iframe name="import_upload_target" id='import_upload_target' src=""></iframe>
-	</div>
-</div>
-<div id="rightcontent" class="rightcontent" data-id="<?php echo $_['id']; ?>">
-	<?php
-		if($_['has_contacts']) {
-			echo $this->inc('part.contact');
-		}
-		else{
-			echo $this->inc('part.no_contacts');
-		}
-	?>
-	<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>
-			<dl>
-				<dt>j/Down</dt>
-				<dd><?php echo $l->t('Next contact in list'); ?></dd>
-				<dt>k/Up</dt>
-				<dd><?php echo $l->t('Previous contact in list'); ?></dd>
-				<dt>o</dt>
-				<dd><?php echo $l->t('Expand/collapse current 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">
-			<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>
-<!-- End of Dialogs -->
-<menu type="context" id="addressbookmenu">
-	<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/contacts/templates/part.contact.php b/apps/contacts/templates/part.contact.php
deleted file mode 100644
index 87ed07c0ec..0000000000
--- a/apps/contacts/templates/part.contact.php
+++ /dev/null
@@ -1,145 +0,0 @@
-<div id="appsettings" class="popup bottomleft hidden"></div>
-<?php
-$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']; ?>)">
-		<input id="file_upload_start" type="file" accept="image/*" name="imagefile" />
-	</form>
-
-	<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">
-	<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>
-	</div> <!-- contact_photo -->
-
-	<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">
-	<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">
-	<select class="float" id="fn_select" title="<?php echo $l->t('Format custom, Short name, Full name, Reverse or Reverse with comma'); ?>">
-	</select><a role="button" id="edit_name" class="action edit" title="<?php echo $l->t('Edit name details'); ?>"></a>
-	</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" 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" 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" 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" 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>
-	</fieldset>
-	</div> <!-- contact_identity -->
-
-	<!-- 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" 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 -->
-
-	<!-- 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>
-		<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 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>
-	</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>
-		<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="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>
-			<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 -->
-<div id="edit_photo_dialog" title="Edit photo">
-		<div id="edit_photo_dialog_img"></div>
-</div>
diff --git a/apps/contacts/templates/part.cropphoto.php b/apps/contacts/templates/part.cropphoto.php
deleted file mode 100644
index 3f5817622b..0000000000
--- a/apps/contacts/templates/part.cropphoto.php
+++ /dev/null
@@ -1,67 +0,0 @@
-<?php 
-$id = $_['id'];
-$tmpkey = $_['tmpkey'];
-$requesttoken = $_['requesttoken'];
-?>
-<script type="text/javascript">
-	jQuery(function($) {
-		$('#cropbox').Jcrop({
-			onChange:	showCoords,
-			onSelect:	showCoords,
-			onRelease:	clearCoords,
-			maxSize:	[399, 399],
-			bgColor:	'black',
-			bgOpacity:	.4,
-			boxWidth: 	400,
-			boxHeight:	400,
-			setSelect:	[ 100, 130, 50, 50 ]//,
-			//aspectRatio: 0.8
-		});
-	});
-	// Simple event handler, called from onChange and onSelect
-	// event handlers, as per the Jcrop invocation above
-	function showCoords(c) {
-		$('#x1').val(c.x);
-		$('#y1').val(c.y);
-		$('#x2').val(c.x2);
-		$('#y2').val(c.y2);
-		$('#w').val(c.w);
-		$('#h').val(c.h);
-	};
-
-	function clearCoords() {
-		$('#coords input').val('');
-	};
-	/*
-	$('#coords').submit(function() {
-		alert('Handler for .submit() called.');
-		return true;
-	});*/
-</script>
-<?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"
-	enctype="multipart/form-data"
-	target="crop_target"
-	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 $requesttoken; ?>">
-	<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="" />
-	<input type="hidden" id="x2" name="x2" value="" />
-	<input type="hidden" id="y2" name="y2" value="" />
-	<input type="hidden" id="w" name="w" value="" />
-	<input type="hidden" id="h" name="h" value="" />
-	</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/templates/part.edit_address_dialog.php b/apps/contacts/templates/part.edit_address_dialog.php
deleted file mode 100644
index 81e24ba4d0..0000000000
--- a/apps/contacts/templates/part.edit_address_dialog.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-$adr = isset($_['adr'])?$_['adr']:array();
-$id = isset($_['id'])?$_['id']:array();
-$types = isset($_['types'])?$_['types']:array();
-?>
-<div id="edit_address_dialog" title="<?php echo $l->t('Edit address'); ?>">
-	<fieldset id="address">
-		<dl class="form">
-			<dt>
-				<label class="label" for="adr_type"><?php echo $l->t('Type'); ?></label>
-			</dt>
-			<dd>
-				<select id="adr_type" name="parameters[ADR][TYPE]" size="1">
-					<?php echo OCP\html_select_options($_['adr_types'], $types) ?>
-				</select>
-			</dd>
-			<dt>
-				<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[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[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[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[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[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[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[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.edit_name_dialog.php b/apps/contacts/templates/part.edit_name_dialog.php
deleted file mode 100644
index f984c232a3..0000000000
--- a/apps/contacts/templates/part.edit_name_dialog.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-$name = isset($_['name'])?$_['name']:'';
-//print_r($name);
-$id = isset($_['id'])?$_['id']:'';
-$addressbooks = isset($_['addressbooks'])?$_['addressbooks']:null;
-?>
-<div id="edit_name_dialog" title="Edit name">
-	<form>
-	<fieldset>
-	<dl class="form">
-		<?php if(!is_null($addressbooks)) { 
-			if(count($_['addressbooks'])==1) {
-		?>
-			<input type="hidden" id="aid" name="aid" value="<?php echo $_['addressbooks'][0]['id']; ?>">
-		<?php } else { ?>
-		<dt><label for="addressbook"><?php echo $l->t('Addressbook'); ?></label></dt>
-		<dd>
-			<select id="aid" name="aid" size="1">
-				<?php echo OCP\html_select_options($_['addressbooks'], null, array('value'=>'id', 'label'=>'displayname')); ?>
-			</select>
-		</dd>
-		<?php }} ?>
-		<dt><label for="pre"><?php echo $l->t('Hon. prefixes'); ?></label></dt>
-		<dd>
-			<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'); ?>">
-				<option value="<?php echo $l->t('Mr'); ?>">
-				<option value="<?php echo $l->t('Sir'); ?>">
-				<option value="<?php echo $l->t('Mrs'); ?>">
-				<option value="<?php echo $l->t('Dr'); ?>">
-			</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[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[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[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[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.'); ?>">
-				<option value="<?php echo $l->t('D.O.'); ?>">
-				<option value="<?php echo $l->t('D.C.'); ?>">
-				<option value="<?php echo $l->t('Ph.D.'); ?>">
-				<option value="<?php echo $l->t('Esq.'); ?>">
-				<option value="<?php echo $l->t('Jr.'); ?>">
-				<option value="<?php echo $l->t('Sn.'); ?>">
-			</datalist>
-		</dd>
-	</dl>
-	</fieldset>
-	</form>
-</div>
diff --git a/apps/contacts/templates/part.import.php b/apps/contacts/templates/part.import.php
deleted file mode 100644
index 32c8dc50dd..0000000000
--- a/apps/contacts/templates/part.import.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<div id="contacts_import_dialog" title="<?php echo $l->t("Import a contacts 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 class="bold" style="text-align:center;"><?php echo $l->t('Please choose the addressbook'); ?></p>
-		<select style="width:100%;" id="contacts" name="contacts">
-		<?php
-		$contacts_options = OC_Contacts_Addressbook::all(OCP\USER::getUser());
-		$contacts_options[] = array('id'=>'newaddressbook', 'displayname'=>$l->t('create a new addressbook'));
-		echo OCP\html_select_options($contacts_options, $contacts_options[0]['id'], array('value'=>'id', 'label'=>'displayname'));
-		?>
-		</select>
-		<div id="newaddressbookform" style="display: none;">
-			<input type="text" style="width: 97%;" placeholder="<?php echo $l->t('Name of new addressbook'); ?>" id="newaddressbook" name="newaddressbook">
-		</div>
-		<input type="button" value="<?php echo $l->t("Import");?>!" id="startimport">
-	</div>
-<div id="progressbar_container" style="display: none">
-	<p style="text-align:center;"><?php echo $l->t('Importing contacts'); ?></p>
-	<div id="progressbar"></div>
-		<div id="import_done" style="display: none;">
-			<p style="text-align:center;"></p>
-			<input type="button" value="<?php echo $l->t('Close'); ?>" id="import_done_button">
-		</div>
-	</div>
-</div>
\ No newline at end of file
diff --git a/apps/contacts/templates/part.no_contacts.php b/apps/contacts/templates/part.no_contacts.php
deleted file mode 100644
index 1802939483..0000000000
--- a/apps/contacts/templates/part.no_contacts.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<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">
-		<input type="button" value="<?php echo $l->t('Add contact') ?>" onclick="OC.Contacts.Card.editNew()" />
-	</div>
-</div>
diff --git a/apps/contacts/templates/part.selectaddressbook.php b/apps/contacts/templates/part.selectaddressbook.php
deleted file mode 100644
index 812a3b891f..0000000000
--- a/apps/contacts/templates/part.selectaddressbook.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<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) { ?>
-	<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>
-
diff --git a/apps/contacts/templates/settings.php b/apps/contacts/templates/settings.php
deleted file mode 100644
index e3536c7b46..0000000000
--- a/apps/contacts/templates/settings.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<form id="contacts-settings">
-	<fieldset class="personalblock">
-		<?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>
-		<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 class="hidden"><?php echo $l->t('Addressbooks'); ?></dt>
-		<dd class="addressbooks-settings hidden">
-			<table>
-			<?php foreach($_['addressbooks'] as $addressbook) { ?>
-			<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 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::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>
-				</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'); ?>" />
-				<button class="save hidden"><?php echo $l->t('Save') ?></button>
-				<button class="cancel hidden"><?php echo $l->t('Cancel') ?></button>
-			</div>
-		</dd>
-		</dl>
-		<div style="width: 100%; clear: both;">
-			<button class="moreless"><?php echo $l->t('More...') ?></button>
-		</div>
-	</fieldset>
-</form>
diff --git a/apps/contacts/thumbnail.php b/apps/contacts/thumbnail.php
deleted file mode 100644
index 1e3714ae6c..0000000000
--- a/apps/contacts/thumbnail.php
+++ /dev/null
@@ -1,98 +0,0 @@
-<?php
-/**
- * ownCloud - Addressbook
- *
- * @author Thomas Tanghus
- * @copyright 2011-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\User::checkLoggedIn();
-OCP\App::checkAppEnabled('contacts');
-session_write_close();
-
-function getStandardImage() {
-	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);
-	getStandardImage();
-	exit();
-}
-
-$id = $_GET['id'];
-$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::ERROR);
-	getStandardImage();
-	exit();
-}
-OCP\Response::enableCaching($caching);
-OC_Contacts_App::setLastModifiedHeader($contact);
-
-$thumbnail_size = 23;
-
-// Find the photo from VCard.
-$image = new OC_Image();
-$photo = $contact->getAsString('PHOTO');
-if($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::ERROR);
-				}
-			} else {
-				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);
-		}
-	} else {
-		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
deleted file mode 100644
index 156d5c8030..0000000000
--- a/apps/contacts/tmpphoto.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-/**
- * ownCloud - Image generator for contacts.
- *
- * @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/>.
- *
- */
-
-$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);
-
-$image = new OC_Image();
-$image->loadFromData(OC_Cache::get($tmpkey));
-if($maxsize != -1) {
-	$image->resize($maxsize);
-}
-$image();
diff --git a/apps/external/ajax/setsites.php b/apps/external/ajax/setsites.php
deleted file mode 100644
index 0f9e061d0e..0000000000
--- a/apps/external/ajax/setsites.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-
-/**
- * 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.
- */
-
- 
-OCP\User::checkAdminUser();
-OCP\JSON::callCheck();
-
-$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(strip_tags($_POST['site_name'][$i]), strip_tags($_POST['site_url'][$i])));
-	}
-}
-
-if (sizeof($sites) == 0)
-	OC_Appconfig::deleteKey('external', 'sites');
-else
-	OCP\Config::setAppValue('external', 'sites', json_encode($sites));
-
-echo 'true';
diff --git a/apps/external/appinfo/app.php b/apps/external/appinfo/app.php
deleted file mode 100644
index 1a02f3a1be..0000000000
--- a/apps/external/appinfo/app.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-/**
- * ownCloud - External plugin
- *
- * @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/>.
- * 
- */
-
-OC::$CLASSPATH['OC_External'] = 'apps/external/lib/external.php';
-OCP\Util::addStyle( 'external', 'style');
-
-OCP\App::registerAdmin('external', 'settings');
-
-$sites = OC_External::getSites();
-for ($i = 0; $i < sizeof($sites); $i++) {
-	OCP\App::addNavigationEntry(
-			array('id' => 'external_index' . ($i + 1), 'order' => 80 + $i, 'href' => OCP\Util::linkTo('external', 'index.php') . '?id=' . ($i + 1), 'icon' => OCP\Util::imagePath('external', 'external.png'), 'name' => $sites[$i][0]));
-}
diff --git a/apps/external/appinfo/info.xml b/apps/external/appinfo/info.xml
deleted file mode 100644
index c4d0b55481..0000000000
--- a/apps/external/appinfo/info.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0"?>
-<info>
-	<id>external</id>
-	<name>External</name>
-	<description>Show external Application in the ownCloud menu</description>
-	<licence>AGPL</licence>
-	<author>Frank Karlitschek</author>
-	<require>4</require>
-	<shipped>true</shipped>
-</info>
diff --git a/apps/external/appinfo/version b/apps/external/appinfo/version
deleted file mode 100644
index 9f8e9b69a3..0000000000
--- a/apps/external/appinfo/version
+++ /dev/null
@@ -1 +0,0 @@
-1.0
\ No newline at end of file
diff --git a/apps/external/css/style.css b/apps/external/css/style.css
deleted file mode 100644
index f891cb4bc5..0000000000
--- a/apps/external/css/style.css
+++ /dev/null
@@ -1,14 +0,0 @@
-/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- /
-/* vim: set shiftwidth=4 tabstop=8 autoindent cindent expandtab: */
-
-.site_url {
-    width: 250px;
-}
-
-.delete_button {
-    display: none;
-}
-
-.external_sites {
-    width: 450px;
-}
diff --git a/apps/external/img/external.png b/apps/external/img/external.png
deleted file mode 100644
index 9e56f2919fdfe4b42fc74894cbb4364e9a9c2b28..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 412
zcmV;N0b~A&P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H10U1d|K~y-)rPEC-gi#d0@t<NbjXj(B2KE-3vXiBSWTPbI6HGQz
zK7=UWV8ZN_loheCV5y$iJR8|l8rSAbUC%sTVsYx;bME<{*DIyuKQgSKi4KlXqQG(J
zn%@G@#tk-chJ;t_VjYKQ*8;-1kHxspV-+g_n#2h9a!8(bf&I9*uz_=I;TZ>EYoIqM
zX8`C#ltz}(I37ZuaGlv^(a8Zlr0hW}dXX}@!)VxN(9Hp5JerP%Jyo0&-Z7B{xu^r|
z;I_s&p{z{oYN&)v?rQ)qn8I9?*sW_~!fEK1@%TkHC)Fkn#+Y!Kr8$P}8bI-BjFm-7
zSjzNk73coYB2^$o%zq)a?yVBJ{oBvfi|Lec{`oWgMLq!V-J4Ny8w&&g0000<MNUMn
GLSTZoov<wc

diff --git a/apps/external/img/external.svg b/apps/external/img/external.svg
deleted file mode 100644
index b47305fbd0..0000000000
--- a/apps/external/img/external.svg
+++ /dev/null
@@ -1,292 +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://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="svg2457"
-   inkscape:version="0.48.1 r9760"
-   sodipodi:docname="world.svg"
-   inkscape:export-filename="/home/jancborchardt/owncloud-sharing/core/img/actions/settings.png"
-   inkscape:export-xdpi="90"
-   inkscape:export-ydpi="90">
-  <metadata
-     id="metadata23">
-    <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="1280"
-     inkscape:window-height="776"
-     id="namedview21"
-     showgrid="false"
-     inkscape:zoom="17.875"
-     inkscape:cx="-12.837249"
-     inkscape:cy="5.7622378"
-     inkscape:window-x="0"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1"
-     inkscape:current-layer="svg2457" />
-  <defs
-     id="defs2459">
-    <linearGradient
-       id="linearGradient5128">
-      <stop
-         id="stop5130"
-         style="stop-color:#e5e5e5;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop5132"
-         style="stop-color:#ababab;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="86.132919"
-       y1="105.105"
-       x2="84.63858"
-       y2="20.895"
-       id="linearGradient3260"
-       xlink:href="#linearGradient5128"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(9.6142312e-2,0,0,9.6142312e-2,1.8468935,1.9430362)" />
-    <linearGradient
-       id="linearGradient3397">
-      <stop
-         id="stop3399"
-         style="stop-color:#aaaaaa;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3401"
-         style="stop-color:#8c8c8c;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="21"
-       y1="0"
-       x2="21"
-       y2="16.004715"
-       id="linearGradient3264"
-       xlink:href="#linearGradient3397"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-17.058189,0)" />
-    <linearGradient
-       x1="63.9995"
-       y1="3.1001"
-       x2="63.9995"
-       y2="122.8994"
-       id="linearGradient3309"
-       gradientUnits="userSpaceOnUse">
-      <stop
-         id="stop3311"
-         style="stop-color:#f6f6f6;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3313"
-         style="stop-color:#cccccc;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       x1="25"
-       y1="0"
-       x2="25"
-       y2="16.000105"
-       id="linearGradient3262"
-       xlink:href="#linearGradient3309"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-17.058189,0)" />
-    <linearGradient
-       id="linearGradient3678">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3680" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3682" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3309-5"
-       id="linearGradient3066-2"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-17.058189,0)"
-       x1="25"
-       y1="0"
-       x2="25"
-       y2="16.000105" />
-    <linearGradient
-       x1="63.9995"
-       y1="3.1001"
-       x2="63.9995"
-       y2="122.8994"
-       id="linearGradient3309-5"
-       gradientUnits="userSpaceOnUse">
-      <stop
-         id="stop3311-3"
-         style="stop-color:#f6f6f6;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3313-3"
-         style="stop-color:#cccccc;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3678"
-       id="linearGradient3920"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-17.058189,-0.444)"
-       x1="25"
-       y1="0"
-       x2="25"
-       y2="16.000105" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3678-0"
-       id="linearGradient3920-6"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-17.058189,-0.444)"
-       x1="25"
-       y1="0"
-       x2="25"
-       y2="16.000105" />
-    <linearGradient
-       id="linearGradient3678-0">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop3680-5" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1;"
-         offset="1"
-         id="stop3682-7" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-5-7"
-       id="linearGradient3784"
-       x1="0.5"
-       y1="7.5560002"
-       x2="15.5"
-       y2="7.5560002"
-       gradientUnits="userSpaceOnUse" />
-    <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
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-5-7"
-       id="linearGradient3810"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.4100229,0,0,0.5447147,28.02322,-5.9219706)"
-       x1="46.395508"
-       y1="12.707516"
-       x2="46.395508"
-       y2="38.409042" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-5-7"
-       id="linearGradient3813"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-0.4100229,0,0,0.5447147,10.462268,-5.974418)"
-       x1="46.395508"
-       y1="12.707516"
-       x2="46.395508"
-       y2="38.409042" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-5-7"
-       id="linearGradient3816"
-       gradientUnits="userSpaceOnUse"
-       x1="7.4930072"
-       y1="0.0035526801"
-       x2="7.4930072"
-       y2="14.998127" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-5-7"
-       id="linearGradient3798"
-       x1="8.8461542"
-       y1="0.89504272"
-       x2="8.8461542"
-       y2="15.048951"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3587-6-5-3-5-7-2"
-       id="linearGradient3798-6"
-       x1="8.8461542"
-       y1="0.89504272"
-       x2="8.8461542"
-       y2="15.048951"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient3587-6-5-3-5-7-2">
-      <stop
-         id="stop3589-9-2-2-6-2-9"
-         style="stop-color:#000000;stop-opacity:1"
-         offset="0" />
-      <stop
-         id="stop3591-7-4-73-5-1-7"
-         style="stop-color:#363636;stop-opacity:1"
-         offset="1" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="translate(-1,-1)"
-       y2="15.048951"
-       x2="8.8461542"
-       y1="0.89504272"
-       x1="8.8461542"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient3815"
-       xlink:href="#linearGradient3587-6-5-3-5-7-2"
-       inkscape:collect="always" />
-  </defs>
-  <path
-     inkscape:connector-curvature="0"
-     style="opacity:1;fill:#000000;fill-opacity:1;stroke:none"
-     d="M 8,1 C 4.1340071,1 1,4.134007 1,7.9999999 1,11.865994 4.1340071,15 8,15 11.865994,15 15,11.865994 15,7.9999999 15,4.134007 11.865994,1 8,1 z m 0.8020833,0.8932295 c 1.2010717,0.026708 2.2624547,0.7482116 3.3359377,1.2213541 L 13.869792,5.511719 13.596354,6.5416669 14.125,6.8697919 14.1159,8.0911458 c -0.0121,0.349374 0.005,0.6992101 -0.0091,1.048177 -0.166346,0.6623539 -0.550627,1.2665712 -0.875,1.8684892 -0.219888,0.108406 0.02005,-0.7185 -0.11849,-0.97526 C 13.14504,9.4386408 12.642422,9.4660089 12.302112,9.7955727 11.881413,10.041226 10.955977,10.114914 10.92581,9.4492183 10.687264,8.6490761 10.891165,7.7966268 11.217384,7.0520835 L 10.679623,6.3958335 10.87103,4.7096354 10.014259,3.8437502 10.21478,2.8958336 9.2121752,2.3307295 C 9.0145444,2.1755339 8.6384357,2.114115 8.5559252,1.902344 8.6372992,1.897654 8.7219474,1.891447 8.8020189,1.893224 z m -2.4609375,0.00912 c 0.031442,0.00459 0.069992,0.026431 0.1276042,0.072917 C 6.8067806,2.1608975 6.3863479,2.3716106 6.2864583,2.5677086 5.7466682,2.9328038 6.4524911,3.2318365 6.6875,3.5247398 7.0642392,3.4164892 7.4410308,2.8779535 7.9908854,3.0416669 8.6942527,2.8222093 8.5821719,3.630807 8.984375,3.9895836 9.036567,4.1585309 9.8643709,4.7080895 9.3671875,4.5273437 8.9577408,4.2098855 8.5022772,4.2337911 8.2096354,4.6914062 7.4187262,5.1199798 7.8867869,3.8662153 7.5078125,3.5611981 6.9348738,2.9219861 7.1750002,4.0387484 7.1067708,4.3723957 6.7342944,4.364267 6.0387231,4.0858224 5.6575521,4.5364583 L 6.03125,5.1471356 6.4778646,4.4635416 C 6.5864179,4.2161129 6.7226128,4.6558348 6.8424479,4.736979 6.9855355,5.0129459 7.6653536,5.4804485 7.1523438,5.6119794 6.3917179,6.0339397 5.7934201,6.6737624 5.1471354,7.2434895 4.9290953,7.7034971 4.4841468,7.6508764 4.2083333,7.2708332 3.5410706,6.8603335 3.5906422,7.9274218 3.625,8.3281249 l 0.5833333,-0.3645833 0,0.6015625 C 4.19179,8.6789089 4.2058787,8.7972867 4.1992147,8.9114582 3.790491,9.3384813 3.3785344,8.3120287 3.0234334,8.0820311 L 2.9960896,6.5781252 C 3.0089957,6.1556005 2.9197821,5.7229754 3.0052082,5.3111981 3.8089547,4.4486619 4.6253679,3.5550749 5.1015624,2.4583336 l 0.7838542,0 C 6.4331575,2.7236662 6.1210544,1.8701843 6.3411457,1.902344 z M 5.1835938,9.722656 c 0.095099,-0.010145 0.2032823,0.011573 0.3190103,0.072921 0.7379441,0.1056226 1.289687,0.640901 1.8776042,1.048178 0.4687224,0.464525 1.4828124,0.315782 1.5950521,1.102865 -0.1706086,0.853749 -1.0104785,1.312191 -1.75,1.61328 C 7.0406658,13.662851 6.8423351,13.744732 6.6328125,13.77865 5.9471995,13.950405 5.6507787,13.2474 5.5117188,12.721359 5.2012551,12.071255 4.4254987,11.578795 4.5364583,10.779953 4.5547311,10.382752 4.7714976,9.7666104 5.1835938,9.7226607 z"
-     id="path3002" />
-</svg>
diff --git a/apps/external/index.php b/apps/external/index.php
deleted file mode 100644
index 3b6f06e1bf..0000000000
--- a/apps/external/index.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-/**
- * ownCloud - External plugin
- *
- * @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/>.
- * 
- */
-
-require_once('lib/external.php');
-
-OCP\User::checkLoggedIn();
-
-if (isset($_GET['id'])) {
-
-	$id = $_GET['id'];
-	$id = (int) $id;
-
-	$sites = OC_External::getSites();
-	if (sizeof($sites) >= $id) {
-		$url = $sites[$id - 1][1];
-		OCP\App::setActiveNavigationEntry('external_index' . $id);
-
-		$tmpl = new OCP\Template('external', 'frame', 'user');
-		$tmpl->assign('url', $url);
-		$tmpl->printPage();
-	}
-}
diff --git a/apps/external/js/admin.js b/apps/external/js/admin.js
deleted file mode 100644
index 0caaabd0b9..0000000000
--- a/apps/external/js/admin.js
+++ /dev/null
@@ -1,57 +0,0 @@
-$(document).ready(function(){
-    	newSiteHtml = '<li><input type="text" class="site_name" name="site_name[]" value="" placeholder="Name" />\n\
-    <input type="text" name="site_url[]" class="site_url" value=""  placeholder="URL" />\n\
-<img class="svg action delete_button" src="'+OC.imagePath("core", "actions/delete") +'" title="Remove site" /></li>';
-
-	// Handler functions
-	function addSiteEventHandler(event) {
-		event.preventDefault();
-		
-		saveSites();
-	}
-
-	function deleteButtonEventHandler(event) {
-		event.preventDefault();
-
-		$(this).tipsy('hide');
-		$(this).parent().remove();
-
-		saveSites();
-	}
-
-	function saveSites() {
-		var post = $('#external').serialize();
-		$.post( OC.filePath('external','ajax','setsites.php') , post, function(data) {
-			// OC.msg.finishedSaving('#site_name .msg', data); 
-		});
-	}
-
-	function showDeleteButton(event) {
-		$(this).find('img.delete_button').fadeIn(100);
-	} 
-
-	function hideDeleteButton(event) {
-		$(this).find('img.delete_button').fadeOut(100);
-	}
-
-	// Initialize events
-	$('input[name^=site_]').change(addSiteEventHandler);
-	$('img.delete_button').click(deleteButtonEventHandler);
-	$('img.delete_button').tipsy();
-
-	$('#external li').hover(showDeleteButton, hideDeleteButton);
-
-	$('#add_external_site').click(function(event) {
-		event.preventDefault();
-		$('#external ul').append(newSiteHtml);
-
-		$('input.site_url:last').prev('input.site_name').andSelf().change(addSiteEventHandler);
-		$('img.delete_button').click(deleteButtonEventHandler);
-		$('img.delete_button:last').tipsy();
-		$('#external li:last').hover(showDeleteButton, hideDeleteButton);
-		
-	});
-
-});
-
-
diff --git a/apps/external/lib/external.php b/apps/external/lib/external.php
deleted file mode 100644
index d13a7cf6dd..0000000000
--- a/apps/external/lib/external.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?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/>.
- * 
- */
-
-class OC_External {
-
-	public static function getSites() {
-		if (($sites = json_decode(OCP\Config::getAppValue("external", "sites", ''))) != NULL) {
-			return $sites;	
-		}
-
-		return array();
-	}
-
-}
diff --git a/apps/external/settings.php b/apps/external/settings.php
deleted file mode 100644
index 488444c119..0000000000
--- a/apps/external/settings.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?php
-
-OCP\User::checkAdminUser();
-
-OCP\Util::addscript( "external", "admin" );
-
-$tmpl = new OCP\Template( 'external', 'settings');
-
-return $tmpl->fetchPage();
diff --git a/apps/external/templates/frame.php b/apps/external/templates/frame.php
deleted file mode 100644
index 38b4008353..0000000000
--- a/apps/external/templates/frame.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<iframe src="<?php echo $_['url']; ?>" width="100%" id="ifm" ></iframe>
-
-
-<script language="JavaScript">
-<!--
-
-function pageY(elem) {
-    return elem.offsetParent ? (elem.offsetTop + pageY(elem.offsetParent)) : elem.offsetTop;
-}
-var buffer = 5; //scroll bar buffer
-function resizeIframe() {
-    var height = document.documentElement.clientHeight;
-    height -= pageY(document.getElementById('ifm'))+ buffer ;
-    height = (height < 0) ? 0 : height;
-    document.getElementById('ifm').style.height = height + 'px';
-}
-
-document.getElementById('ifm').onload=resizeIframe;
-window.onresize = resizeIframe;
-
-//-->
-</script>
-
-
-
-
diff --git a/apps/external/templates/settings.php b/apps/external/templates/settings.php
deleted file mode 100644
index b8139727eb..0000000000
--- a/apps/external/templates/settings.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<form id="external">
-	<fieldset class="personalblock">
-		<strong>External Sites</strong><br />
-		<ul class="external_sites">
-
-		<?php
-		$sites = OC_External::getSites();
-		for($i = 0; $i < sizeof($sites); $i++) {
-			echo '<li><input type="text" name="site_name[]" class="site_name" value="'.$sites[$i][0].'" placeholder="'.$l->t('Name').'" />
-			<input type="text" class="site_url" name="site_url[]"  value="'.$sites[$i][1].'"  placeholder="'.$l->t('URL').'" />
-			<img class="svg action delete_button" src="'.OCP\image_path("", "actions/delete.svg") .'" title="'.$l->t("Remove site").'" />
-			</li>';
-		}
-		?>
-
-		</ul>
-
-        <input type="button" id="add_external_site" value="Add" />
-		<span class="msg"></span>
-	</fieldset>
-</form>
diff --git a/apps/files_archive/appinfo/app.php b/apps/files_archive/appinfo/app.php
deleted file mode 100644
index 67376c4a03..0000000000
--- a/apps/files_archive/appinfo/app.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?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.
- */
-
-OC::$CLASSPATH['OC_Filestorage_Archive']='apps/files_archive/lib/storage.php';
-
-OCP\Util::connectHook('OC_Filesystem','get_mountpoint','OC_Filestorage_Archive','autoMount');
-
-OCP\Util::addscript( 'files_archive', 'archive' );
diff --git a/apps/files_archive/appinfo/info.xml b/apps/files_archive/appinfo/info.xml
deleted file mode 100644
index 93ec68ee10..0000000000
--- a/apps/files_archive/appinfo/info.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<info>
-	<id>files_archive</id>
-	<name>Archive support</name>
-	<description>Transparent opening of archives</description>
-	<licence>AGPL</licence>
-	<author>Robin Appelman</author>
-	<require>4</require>
-	<shipped>true</shipped>
-	<types>
-		<filesystem/>
-	</types>
-	<default_enable/>
-</info>
diff --git a/apps/files_archive/appinfo/version b/apps/files_archive/appinfo/version
deleted file mode 100644
index 2f4536184b..0000000000
--- a/apps/files_archive/appinfo/version
+++ /dev/null
@@ -1 +0,0 @@
-0.2
\ No newline at end of file
diff --git a/apps/files_archive/js/archive.js b/apps/files_archive/js/archive.js
deleted file mode 100644
index 6bcbe09266..0000000000
--- a/apps/files_archive/js/archive.js
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * 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.
- */
-
-$(document).ready(function() {
-	if(typeof FileActions!=='undefined'){
-		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', 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_archive/lib/storage.php b/apps/files_archive/lib/storage.php
deleted file mode 100644
index 3c14c3e1fd..0000000000
--- a/apps/files_archive/lib/storage.php
+++ /dev/null
@@ -1,174 +0,0 @@
-<?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_Filestorage_Archive extends OC_Filestorage_Common{
-	/**
-	 * underlying local storage used for missing functions
-	 * @var OC_Archive
-	 */
-	private $archive;
-	private $path;
-	private static $mounted=array();
-	private static $enableAutomount=true;
-	private static $rootView;
-	
-	private function stripPath($path){//files should never start with /
-		if(!$path || $path[0]=='/'){
-			$path=substr($path,1);
-		}
-		return $path;
-	}
-	
-	public function __construct($params){
-		$this->archive=OC_Archive::open($params['archive']);
-		$this->path=$params['archive'];
-	}
-
-	public function mkdir($path){
-		$path=$this->stripPath($path);
-		return $this->archive->addFolder($path);
-	}
-	public function rmdir($path){
-		$path=$this->stripPath($path);
-		return $this->archive->remove($path.'/');
-	}
-	public function opendir($path){
-		if(substr($path,-1)!=='/'){
-			$path.='/';
-		}
-		$path=$this->stripPath($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;
-		return opendir('fakedir://'.$id);
-	}
-	public function stat($path){
-		$ctime=-1;
-		$path=$this->stripPath($path);
-		if($path==''){
-			$stat=stat($this->path);
-			$stat['size']=0;
-		}else{
-			if($this->is_dir($path)){
-				$stat=array('size'=>0);
-				$stat['mtime']=filemtime($this->path);
-			}else{
-				$stat=array();
-				$stat['mtime']=$this->archive->mtime($path);
-				$stat['size']=$this->archive->filesize($path);
-				if(!$stat['mtime']){
-					$stat['mtime']=time();
-				}
-			}
-		}
-		$stat['ctime']=$ctime;
-		return $stat;
-	}
-	public function filetype($path){
-		$path=$this->stripPath($path);
-		if($path==''){
-			return 'dir';
-		}
-		if(substr($path,-1)=='/'){
-			return $this->archive->fileExists($path)?'dir':'file';
-		}else{
-			return $this->archive->fileExists($path.'/')?'dir':'file';
-		}
-	}
-	public function isReadable($path){
-		return is_readable($this->path);
-	}
-	public function isUpdatable($path){
-		return is_writable($this->path);
-	}
-	public function file_exists($path){
-		$path=$this->stripPath($path);
-		if($path==''){
-			return file_exists($this->path);
-		}
-		return $this->archive->fileExists($path);
-	}
-	public function unlink($path){
-		$path=$this->stripPath($path);
-		return $this->archive->remove($path);
-	}
-	public function fopen($path,$mode){
-		$path=$this->stripPath($path);
-		return $this->archive->getStream($path,$mode);
-	}
-	public function free_space($path){
-		return 0;
-	}
-	public function touch($path, $mtime=null){
-		if(is_null($mtime)){
-			$tmpFile=OCP\Files::tmpFile();
-			$this->archive->extractFile($path,$tmpFile);
-			$this->archive->addfile($path,$tmpFile);
-		}else{
-			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
-	 * @param aray params
-	 */
-	public static function autoMount($params){
-		if(!self::$enableAutomount){
-			return;
-		}
-		$path=$params['path'];
-		if(!self::$rootView){
-			self::$rootView=new OC_FilesystemView('');
-		}
-		self::$enableAutomount=false;//prevent recursion
-		$supported=array('zip','tar.gz','tar.bz2','tgz');
-		foreach($supported as $type){
-			$ext='.'.$type.'/';
-			if(($pos=strpos(strtolower($path),$ext))!==false){
-				$archive=substr($path,0,$pos+strlen($ext)-1);
-				if(self::$rootView->file_exists($archive) and  array_search($archive,self::$mounted)===false){
-					$localArchive=self::$rootView->getLocalFile($archive);
-					OC_Filesystem::mount('OC_Filestorage_Archive',array('archive'=>$localArchive),$archive.'/');
-					self::$mounted[]=$archive;
-				}
-			}
-		}
-		self::$enableAutomount=true;
-	}
-
-	public function rename($path1,$path2){
-		return $this->archive->rename($path1,$path2);
-	}
-
-	public function hasUpdated($path,$time){
-		return $this->filemtime($this->path)>$time;
-	}
-}
diff --git a/apps/files_archive/tests/data/data.tar.gz b/apps/files_archive/tests/data/data.tar.gz
deleted file mode 100644
index 39f2cdada026961896bd35542d4a99c387b87fba..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4195
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

diff --git a/apps/files_archive/tests/data/data.zip b/apps/files_archive/tests/data/data.zip
deleted file mode 100644
index eccef53eb4ee2d8694102fe36c4cb063091b8374..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4705
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

diff --git a/apps/files_archive/tests/data/lorem.txt b/apps/files_archive/tests/data/lorem.txt
deleted file mode 100644
index b62c3fb2ff..0000000000
--- a/apps/files_archive/tests/data/lorem.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-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.
\ No newline at end of file
diff --git a/apps/files_archive/tests/storage.php b/apps/files_archive/tests/storage.php
deleted file mode 100644
index 74ddf22870..0000000000
--- a/apps/files_archive/tests/storage.php
+++ /dev/null
@@ -1,39 +0,0 @@
-<?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_Filestorage_Archive_Zip extends Test_FileStorage {
-	/**
-	 * @var string tmpDir
-	 */
-	private $tmpFile;
-	
-	public function setUp(){
-		$this->tmpFile=OCP\Files::tmpFile('.zip');
-		$this->instance=new OC_Filestorage_Archive(array('archive'=>$this->tmpFile));
-	}
-
-	public function tearDown(){
-		unlink($this->tmpFile);
-	}
-}
-
-class Test_Filestorage_Archive_Tar extends Test_FileStorage {
-	/**
-	 * @var string tmpDir
-	 */
-	private $tmpFile;
-
-	public function setUp(){
-		$this->tmpFile=OCP\Files::tmpFile('.tar.gz');
-		$this->instance=new OC_Filestorage_Archive(array('archive'=>$this->tmpFile));
-	}
-
-	public function tearDown(){
-		unlink($this->tmpFile);
-	}
-}
diff --git a/apps/files_imageviewer/appinfo/app.php b/apps/files_imageviewer/appinfo/app.php
deleted file mode 100644
index 6184585cff..0000000000
--- a/apps/files_imageviewer/appinfo/app.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-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_imageviewer/appinfo/info.xml b/apps/files_imageviewer/appinfo/info.xml
deleted file mode 100644
index 1e3192f6ed..0000000000
--- a/apps/files_imageviewer/appinfo/info.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0"?>
-<info>
-	<id>files_imageviewer</id>
-	<name>Image Viewer</name>
-	<description>Simple image viewer for owncloud</description>
-	<licence>AGPL</licence>
-	<author>Robin Appelman</author>
-	<require>4</require>
-	<shipped>true</shipped>
-	<default_enable/>
-</info>
diff --git a/apps/files_imageviewer/appinfo/version b/apps/files_imageviewer/appinfo/version
deleted file mode 100644
index 9f8e9b69a3..0000000000
--- a/apps/files_imageviewer/appinfo/version
+++ /dev/null
@@ -1 +0,0 @@
-1.0
\ No newline at end of file
diff --git a/apps/files_imageviewer/css/jquery.fancybox-1.3.4.css b/apps/files_imageviewer/css/jquery.fancybox-1.3.4.css
deleted file mode 100644
index 6e982805a4..0000000000
--- a/apps/files_imageviewer/css/jquery.fancybox-1.3.4.css
+++ /dev/null
@@ -1,359 +0,0 @@
-/*
- * 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
- */
-
-#fancybox-loading {
-	position: fixed;
-	top: 50%;
-	left: 50%;
-	width: 40px;
-	height: 40px;
-	margin-top: -20px;
-	margin-left: -20px;
-	cursor: pointer;
-	overflow: hidden;
-	z-index: 1104;
-	display: none;
-}
-
-#fancybox-loading div {
-	position: absolute;
-	top: 0;
-	left: 0;
-	width: 40px;
-	height: 480px;
-	background-image: url('%appswebroot%/files_imageviewer/img/fancybox.png');
-}
-
-#fancybox-overlay {
-	position: absolute;
-	top: 0;
-	left: 0;
-	width: 100%;
-	z-index: 1100;
-	display: none;
-}
-
-#fancybox-tmp {
-	padding: 0;
-	margin: 0;
-	border: 0;
-	overflow: auto;
-	display: none;
-}
-
-#fancybox-wrap {
-	position: absolute;
-	top: 0;
-	left: 0;
-	padding: 20px;
-	z-index: 1101;
-	outline: none;
-	display: none;
-}
-
-#fancybox-outer {
-	position: relative;
-	width: 100%;
-	height: 100%;
-	background: #fff;
-}
-
-#fancybox-content {
-	width: 0;
-	height: 0;
-	padding: 0;
-	outline: none;
-	position: relative;
-	overflow: hidden;
-	z-index: 1102;
-	border: 0px solid #fff;
-}
-
-#fancybox-hide-sel-frame {
-	position: absolute;
-	top: 0;
-	left: 0;
-	width: 100%;
-	height: 100%;
-	background: transparent;
-	z-index: 1101;
-}
-
-#fancybox-close {
-	position: absolute;
-	top: -15px;
-	right: -15px;
-	width: 30px;
-	height: 30px;
-	background: transparent url('%appswebroot%/files_imageviewer/img/fancybox.png') -40px 0px;
-	cursor: pointer;
-	z-index: 1103;
-	display: none;
-}
-
-#fancybox-error {
-	color: #444;
-	font: normal 12px/20px Arial;
-	padding: 14px;
-	margin: 0;
-}
-
-#fancybox-img {
-	width: 100%;
-	height: 100%;
-	padding: 0;
-	margin: 0;
-	border: none;
-	outline: none;
-	line-height: 0;
-	vertical-align: top;
-}
-
-#fancybox-frame {
-	width: 100%;
-	height: 100%;
-	border: none;
-	display: block;
-}
-
-#fancybox-left, #fancybox-right {
-	position: absolute;
-	bottom: 0px;
-	height: 100%;
-	width: 35%;
-	cursor: pointer;
-	outline: none;
-	background: transparent url('%appswebroot%/files_imageviewer/img/blank.gif');
-	z-index: 1102;
-	display: none;
-}
-
-#fancybox-left {
-	left: 0px;
-}
-
-#fancybox-right {
-	right: 0px;
-}
-
-#fancybox-left-ico, #fancybox-right-ico {
-	position: absolute;
-	top: 50%;
-	left: -9999px;
-	width: 30px;
-	height: 30px;
-	margin-top: -15px;
-	cursor: pointer;
-	z-index: 1102;
-	display: block;
-}
-
-#fancybox-left-ico {
-	background-image: url('%appswebroot%/files_imageviewer/img/fancybox.png');
-	background-position: -40px -30px;
-}
-
-#fancybox-right-ico {
-	background-image: url('%appswebroot%/files_imageviewer/img/fancybox.png');
-	background-position: -40px -60px;
-}
-
-#fancybox-left:hover, #fancybox-right:hover {
-	visibility: visible; /* IE6 */
-}
-
-#fancybox-left:hover span {
-	left: 20px;
-}
-
-#fancybox-right:hover span {
-	left: auto;
-	right: 20px;
-}
-
-.fancybox-bg {
-	position: absolute;
-	padding: 0;
-	margin: 0;
-	border: 0;
-	width: 20px;
-	height: 20px;
-	z-index: 1001;
-}
-
-#fancybox-bg-n {
-	top: -20px;
-	left: 0;
-	width: 100%;
-	background-image: url('%appswebroot%/files_imageviewer/img/fancybox-x.png');
-}
-
-#fancybox-bg-ne {
-	top: -20px;
-	right: -20px;
-	background-image: url('%appswebroot%/files_imageviewer/img/fancybox.png');
-	background-position: -40px -162px;
-}
-
-#fancybox-bg-e {
-	top: 0;
-	right: -20px;
-	height: 100%;
-	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%/files_imageviewer/img/fancybox.png');
-	background-position: -40px -182px; 
-}
-
-#fancybox-bg-s {
-	bottom: -20px;
-	left: 0;
-	width: 100%;
-	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%/files_imageviewer/img/fancybox.png');
-	background-position: -40px -142px;
-}
-
-#fancybox-bg-w {
-	top: 0;
-	left: -20px;
-	height: 100%;
-	background-image: url('%appswebroot%/files_imageviewer/img/fancybox-y.png');
-}
-
-#fancybox-bg-nw {
-	top: -20px;
-	left: -20px;
-	background-image: url('%appswebroot%/files_imageviewer/img/fancybox.png');
-	background-position: -40px -122px;
-}
-
-#fancybox-title {
-	font-family: Helvetica;
-	font-size: 12px;
-	z-index: 1102;
-}
-
-.fancybox-title-inside {
-	padding-bottom: 10px;
-	text-align: center;
-	color: #333;
-	background: #fff;
-	position: relative;
-}
-
-.fancybox-title-outside {
-	padding-top: 10px;
-	color: #fff;
-}
-
-.fancybox-title-over {
-	position: absolute;
-	bottom: 0;
-	left: 0;
-	color: #FFF;
-	text-align: left;
-}
-
-#fancybox-title-over {
-	padding: 10px;
-	background-image: url('%appswebroot%/files_imageviewer/img/fancy_title_over.png');
-	display: block;
-}
-
-.fancybox-title-float {
-	position: absolute;
-	left: 0;
-	bottom: -20px;
-	height: 32px;
-}
-
-#fancybox-title-float-wrap {
-	border: none;
-	border-collapse: collapse;
-	width: auto;
-}
-
-#fancybox-title-float-wrap td {
-	border: none;
-	white-space: nowrap;
-}
-
-#fancybox-title-float-left {
-	padding: 0 0 0 15px;
-	background: url('%appswebroot%/files_imageviewer/img/fancybox.png') -40px -90px no-repeat;
-}
-
-#fancybox-title-float-main {
-	color: #FFF;
-	line-height: 29px;
-	font-weight: bold;
-	padding: 0 0 3px 0;
-	background: url('%appswebroot%/files_imageviewer/img/fancybox-x.png') 0px -40px;
-}
-
-#fancybox-title-float-right {
-	padding: 0 0 0 15px;
-	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%/files_imageviewer/img/fancy_close.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%/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");
-}
-
-#fancybox-loading.fancybox-ie6 {
-	position: absolute; margin-top: 0;
-	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%/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%/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_imageviewer/img/blank.gif b/apps/files_imageviewer/img/blank.gif
deleted file mode 100644
index 35d42e808f0a8017b8d52a06be2f8fec0b466a66..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 43
scmZ?wbhEHbWMp7uXkcLY|NlP&1B2pE7Dgb&paUX6G7L;iE{qJ;0LZEa`2YX_

diff --git a/apps/files_imageviewer/img/fancy_close.png b/apps/files_imageviewer/img/fancy_close.png
deleted file mode 100644
index 07035307ad435f8f2f8eedf0bce50f7ec8a858c2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1517
zcmV<J1rqv+P)<h;3K|Lk000e1NJLTq0015U0015c1^@s6J20-I000HFNkl<ZNXMO5
zYfO_@7>1To%f)hA(E>uTT$~N#GA0orBqo9-jKM;POccZrXJjTzge4|Sa0ca~7y<+{
z2m7~>41(Jqf9L`mBM6zAjf4;hkjP@@B~d6Xz385|dB5iCM=Ro&JZZmk-uHdZd2i=@
zK0a@Md;u9DFE7t8BO^nxckf<*y<V?uYikSa?(PnvcLL3kj3CdtTYgAM4k&<aNl8h;
zr%s*HT)TEHuBD|#UsqSR`|8!JANTe3?aR!}jH#}!j=6B*LNtCqz!O9|tSjHj0!WZn
zt|TLe4js~5zkc0t_wHTe)2C0bSgqEHH<HI@v)zC3;>C?SckUFGmX^jwM@NV80+eiP
zQ*s##s^a3}Ldwd@cHO*r^T5i=%Fj}=Cr_R@78e&C((#usU;YFS>C)2Dw4tG)YO=*P
zWt;6ZfL46;=u!R1$jGM-hhvcpVyCa+S}Q!T2ALHx;BHe#M~BsHHos=s2iW})#C?}q
ztqvud-gYjKs<v<69+sb<uOA#7EP;)6GIaa)ZF_8N?5dPdisa;E)AaPTUD!SJzQ9-<
zldC+D%Q+tEl#~=*YinzP-ELnZ<^KMDt6VN$*^E>G$zHm2X<Z=i?d>hmYPB(Bn>kzw
z=gS!w6cG`jJ$?H00VK+=!cMnBDn?IFkCkj7KmNq~hrkZvU@n=EP}|7Gxw*M}1_lPI
zNx@_?IS^|%_ok<(o3gXBH^f+@(X7_g)K~%n0$gMM{{Ab=%gZ*hH99)_Eo>!VJd8_C
zE)WMoNsBB#u&}W3BMEnPby>y64F-cra9>kX)4DJoA0KZ5fitNn`NTT4wY3%+fA;Lz
zZ+K4ucJi+Mg!m%<>Ug8kSg^LX_JD-5va;NEM#+V_H)8UHgaj8UJ?LiZVx92t@KxlB
zb1oz#Bo|{kAO!IDVfOII$VfwRad8C+y?XV^;VEu~g@tQka>%(zhlYl1p7P=0!-vj9
zYiMYw3l0uW##jWq+eZ-;6r@4F%{+PX<X0p#H#cYZmNZ0eu~^)ihBs2ety{O&IlHd}
z1_pkFu}Cg09|hvO6EWP6URzH>Gcz;xx78|Q_F7Eb+}ynGO@4TI*h!27r4#SzfR=K~
zhtpe&%-o-olT$}R&!0cHdm}}wbdd`2lO~)PlarHXnm>2$+(ng2^$EtJ+=vwl#Xg-*
zSA%x<9|=lJ3CXuACMEY46&1O~{LGm%7HKm<?{=0H8q=5H*g(7!gPDl)@%j1rF%mp`
z_N<!`%5qOJ6(=0ptWB&#eVq@Kzwv$q$dI~P1LD-g#Kdx(v){9@P23QKx};r66NwH9
za<$Y;V`F2^+W!R)-b(?u<Z_l1ut%v>8lhZ|+Pv?nF1LcJswy+L%zshO4HzpR4skij
zxq<8a{QPpl!oq4$R(*n7$-q`gsjcF2;NWZ?##l9wBW)lu_Bpk)RJgGO&Ey+2dDr3J
z*x2~aJFl#)G^5U)q~qh`_b^ru6q9Xf%arlfse$W(T#z5f?cqE0>k)x`c6QcMUS4jN
z#$B996B84z1O(|{7{3S{Bb#j7?T~OCi+pq$fP9eGqJ%Evk~i}B@#8tcAnk_QAg)9f
z!qn81MJO5W0n6>}?Q|$y25QL`+uU$0x?KbSI<(UOBavf=wCW!^J3Ie)^yty-8!yk&
z($YLG4fjwT{k&5mHL@*_7Xi1c4?x$HT^y5qc2zyPPCG3CUKl!f@Zj&~&!7K?fD>&z
zDk^G(=74sN=`q$#Wm{gaK5myi7K~vRQ8s=CoB+NC8j<}iKpXzI(SMmt*2r@wST=`s
zW7t-}X4hPqXy<B<%Whsd89NMo4pab@j0zq*%rdF0vx9AHdcBo?MJTz<LfJ?xkjOhp
z<&!3z{~LHNmSsa(SNT3)6TTu3DA<UK-4-Z80M98|)=%{P^j_ako))ti-s$-tv=1s~
TaV>3W00000NkvXXu0mjftFGKG

diff --git a/apps/files_imageviewer/img/fancy_loading.png b/apps/files_imageviewer/img/fancy_loading.png
deleted file mode 100644
index 2503017960b3972499d3aa92f89953935ae40934..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 10195
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

diff --git a/apps/files_imageviewer/img/fancy_nav_left.png b/apps/files_imageviewer/img/fancy_nav_left.png
deleted file mode 100644
index ebaa6a4fd34e51575a01da366312c20618985cbc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1446
zcmV;X1zGxuP)<h;3K|Lk000e1NJLTq0015U0015c1^@s6J20-I000GTNkl<ZNXM;L
zYe<_{7}ms?#!KUEvBqoG%-S_LFLRZ)N>R`@usIzf?P{x4#0gFqr~|<XPHerjinPTs
ztNS;EP3-o^A3Ah%Vq4bMtstVPphH#_YRtu$*gbD}Khc<&wA+D)<ec-K_c`aio%4Bk
z9Ns(u5#jv#^Iplx$&yp2PI;@<YH4e0tM8pVcl@YNpgEEe<azCDH(DeHB*2jqCr<d6
zmzOJU-@YBw+}y0LtgJkK>(;IJySuwjr=+Ar78e&sHZ(Lu;P)*wKU%|U#jmpg5~Q6=
zNl8{#mZGz>Q!_F$qJ8n=#Z9x>Jn_n|ZEtTsSzllOW_Wn`!@Rt_=!l4jAl`tKb-5%L
zv7js_CMF<1KR>Fcr{|nbr~AR4Y-MG|y0EZdwI6@^^5yrikSZ}TQ5hH*C?{R4Q{?KT
zKD6U2SFWfB2M0g0TCEGD5GUP%Y0a>J0W!M1fVuVU?d@ix(YV91PjUK7@OzY8E)OJ~
z&Q30n%8njA8kC)#t?uvd&xMXHQZzI)WQmTB-n1vQM_gQ-{_*3-7UA?*_bJ9=m|W(F
zT+IHE$H&L3T3T8zSS*%BTHM>)YZi;eI#;9uNVch|X-go#ckf=VQmKq2-ORBYaGo52
zejy<t%8H7La|o25g_F7>g&!SS;_ltMX3~N9_#ORsfn&tMTp}T$j*yAd)6-A(_4O6g
z0=-^ug|9bVkxorbSsNQ0x9sP<y}fnI%gfuOYjkw<E9iO$<3XHiVu9G#$HzyBC_Xno
zKmQ#GcXf4{4<k)VO42VbF4}^LejUk_m6e%jesy*A7xd$SFg~@H;9vM({<c=Dy<jjH
zo|15CYO3KdQl!ler_T=c9mxd;2X7))Y`zW%2uR163J3taJ(xW>G&EF`laq6qgf=!d
ztnQGKnVtDqz_Vx1Y=Kr=TU+Vx?;nS;5H`1m#Lv%9fqI)#T3Y%!3C+yRSpE-E!h;77
zwm7<P`uh65hp|vjEe{F&8>Z1{&Y;%TkkIqz&m9sAKBbnCkzsHry#@vbY{a-wI?zu7
zloV4Q9NtQWLUAT7Ev=G-*4EZ6|HZd^F*!MDB>C#<>PDGN_5sGi_Yq4ZlG7@css!ck
z9};wyN<s>`LrygSGPaaLVfqXl2Z+Nkm;ygvo12>(Bf+YwDwC`Hbwy5foiCI>(Z2*F
z+nZVe;)K}P*aF<M-?H#Fe6Mqd+*uxvjg9GP{wFl_^MHN9WlJaEq*N-^!o)SGI8SH+
zUKv~NRIZYek^|N$Dk?H^$^0AnT#K;_#IZM>#9Y8tUS3{lK|w(!NULrkdP#x17leSb
zXU`h&IIwaw4`8eqNV6{>BDOh|vjhZ0E{e&QDDu0Pe|>%Zmb;{dg@s0w$z&rPA0K~+
zu^J$UblaCq5g(ljxEe?Y`8AmFYt-vOfqZ&;+Eh?bV07kp3Z#jN34<UH(mycX2wWwd
ztb5-jv3o7@)ujQlL0*RXeFKlY!KJ0889^bPhRPtGL?*(cM~_TG%5V)>Zfk3!OW_7k
zM!Hz%fopN!Lja&lI}y+lIZjBszTeT&@!Ra|?DQ)q4Us*EN5ey8M=zh0NVTlX;X`2G
z(+8kuN)-Dfn@v@Ns?$arfE9ks%*_0?uCDGc0&cYN@bK_KngiO{r&oDx0_$@6^x5~=
zW5Gx^5k=$2z;)mYpdQiR47B2ZEBzOVMD;v(on_N_Z6xdRarMj<?K!!e{c@alPRcF<
zp8%JELdIntyT~#Lyyh6|aQVEo|B8@ungz0wXdsqPlE61j693omTr|rD@>=Ped`)=n
zv4Dh?$k=SYcJSdjDa(58`F?t%ZzxBbaRs;9zaA#)un(S!5dZ)H07*qoM6N<$g4RXF
AD*ylh

diff --git a/apps/files_imageviewer/img/fancy_nav_right.png b/apps/files_imageviewer/img/fancy_nav_right.png
deleted file mode 100644
index 873294e969db9160f5ddd4e1ab498ff60b080e3f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1454
zcmV;f1yTBmP)<h;3K|Lk000e1NJLTq0015U0015c1^@s6J20-I000GbNkl<ZNXMmD
zZAhC}6t;;mjnT$L7i;{?nyH<^`7u|iRZ0tL1DmU(NS(H|E#d?xOw>Wa6<o3PyNHUT
zo$lWdHnH2E{?Ji3C;ecpZi0xSLLD-zP&FUMq}_AEc}3I2r0ok2$-VEn&vWm&=bU?A
zAD_LSeSnB?{P=O-)YMc-LPCO{PN$PLH8sgQJ39lYO`vyVBiQrU*M4Y_7?1$_<Kp51
z%gV~sZEbBa4Gj&tii(Out*xye_Vn}|NlQzMEGa38yn6L&1b*Ma6F_5ltoU^%K!!AP
zDUoDnXRB}Cyr~}^9yTm5FW<0Qtz$2po~^B|$E&NW-wh27eVm`49~}`9q2dWhnaiWN
zhz(^iF)=}B&YX$5ef##Y_4W0ioW+)wmhAKM^LFR{=g*)22oGtKlan<{rBXp$%qjA;
zQh%CpQBjd@aB%PwyWKudgjnedxYh~}m|(NM6L7b&rKQDcHk)6t?Gvp2EcQK0p-?D^
z)7{DiQQ3h52UIyZIlBJ-{?p*tB%-@_@7kiHqc@xdoe>`&Z+!IVkxf`V#(j>y7#5eg
z5*PD+C=wGBwT+F9xi*_^fd=>X_FBba@wz8b0c3ma+O<tVyt}*mv__+eByQH&4!C_B
zfdL^QA)4~?@?!{;Uxk&r62;za5cZltS67#nI1nFyqWwN_kTh6JBm~rca&cBx*5SUs
zz7iT>G#c&LYnSBp_4S(*6BG8m#QpsI))yBSw}|WBy?ft)>pk?VIMu|0u-xC@UxO$<
zHa9o-0~vR8bXeVyB61x;<Vn1=wA4a&&z?Q|4edlAj92X|>@W6T@vgyO$TgWvPslhu
zJ>BGvFeN3$D2UT9wO!c-2M2E;RvddB6cm(&J}nRg`1!DUaA;_#J})n?kc`&W*6f~w
z$XoI8@o`6>)z;Ql1O^7iqc4Qr?IQ^Y2vDQmrd_^#`AagIo}RXO6Tw=o)=2K&OZ?8A
zJDVKcH{^2p2j~ms)bf#Ff5Y^8{ZZ7~8Zw%koV0nHJ||9`FbS!%u(0sL`TfAafI}Du
zN;}#qfQDkqhr?T=R;!O@W@c89(aOq-SHe5pO)Do4INRL6f8R{+tE;Q)Wir`E=nLN^
zERjf#VBjT`yZ^}0T`IW~brs!I17PDwDHNtJpz(@u7&_Ci&*x`nXGh4eva-_hHlhTo
z>wKX6jrLg})!Ef*2q(qH#unh5y~V~`*!#E2<B^dOBia3e2km@dS8zGf2{<g3N)2#v
z4JyuK8h~5IrYpj#swxY(w)PUeaN&ZPOXk1G=UVjTlE%(-5_199`uh52s#K~=NUI(p
zQi;IZ2p5o%kzvB+z|PS;fW8tS)470%*ymKvk`NH5QB1x@k>5W2>+0$@y%jAkE;d^%
z7KiBQ=;#CV)c|?K?OZZNymTtyIv@+;=i$b0QLhID@u{gPOF=<_+1<WVAdQWUZRa#Z
z|3ZH~aE>^cd)FbceJt|Pr3Z2#UW)pC9hbbpr%#_w3xu>9DucKZSqKjwKC}oa!!=;B
zxw)ARh3h~maWUsB$KtMw06>R!GGHKatdM5?eS3TRA2TyEQ!m{-s9LkQG(13d^zuqc
z)WBRWF9N%+J^)=)qIgeo*i|*CI?Xfzc;V-hCr|!<<;s<R2sqJ3!^6V|=^fC_dwPz?
zCNY=WtIw{>9veooizpgD1ug<#0d<J}2A~Q5o9MqtB&y?g7uhzG$3`-jzo%=iXvfMG
zyf24%=0tW1_zWlniW!C6cZzM2c+5fO@OZs-{)&)tnkkti8i?hUB=Jd;!vFRBE}CtX
zJXZQ9UlaRwctFA=GIpEX3I6;}%C^2czMtOc8_LyWJi)8ye+F~v<)btZr2qf`07*qo
IM6N<$g1U{<%>V!Z

diff --git a/apps/files_imageviewer/img/fancy_shadow_e.png b/apps/files_imageviewer/img/fancy_shadow_e.png
deleted file mode 100644
index 2eda0893649371f8d92b92976d8542cdd1b601ed..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 107
zcmeAS@N?(olHy`uVBq!ia0vp^B0$W@!3HGnP3ltxQbwLGjv*Y^lSRZuw<aVc{9r!v
zzu||u!2i}q_dR~t3;b_b^^^VS|K?ZB8~^XG_{w!8oq^%4vdDkV`fo3Qx*0rO{an^L
HB{Ts5hz}+y

diff --git a/apps/files_imageviewer/img/fancy_shadow_n.png b/apps/files_imageviewer/img/fancy_shadow_n.png
deleted file mode 100644
index 69aa10e233b039077e7dc600177ddb1eb46217e3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 106
zcmeAS@N?(olHy`uVBq!ia0vp^j6f{H!3HFK_`(+gDML>e#}JO|p{EaWGAM`~zK|Yh
zF7SQ+m+Ig>B0@o-N8?trihfzZ+Vp1~`{zf0o*#X0$hUAi%N$P)W1wCJ22WQ%mvv4F
FO#q)zAp-ya

diff --git a/apps/files_imageviewer/img/fancy_shadow_ne.png b/apps/files_imageviewer/img/fancy_shadow_ne.png
deleted file mode 100644
index 79f6980a3ba5c43de120d963dbba2516b8f27ac7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 347
zcmV-h0i^zkP)<h;3K|Lk000e1NJLTq000yK000yS1^@s6jfou%0003ZNkl<ZILob+
zYmUP(2!scm9HHv{Z@20hg4sW&`WCrWD{Ukze&AtXz?PZ%&(H3+n@gIzGf7{0`*}Q6
zU?$1ez5~p@W$0it0aj-To6dgw9c$1i7D%OG!a>dR9Yb&V8f!h)aDezHAsc|y@|hdQ
zYJb}?8~~zFbQ)ku!Ey)KSukutuvdZ@MKMX|x|A3tPyx?YVhN^6z!Mi4Mj2f#%<;nh
z2{>?YAzu|{u^;Oq!;f7Z4tPBpJEmZ+^GZ#$=9nz(K+UmK7}|u&EPi%aRt_C3qOFB_
zHc`~N>51%{?ijG?xsHt>MwRChgk=x_z0gh3O2xSL)-6?+2LKZL74~Q>MZjWtwukkA
tvjRC=&j+0R$&bLyT7MhBcTXDISHC&xXU0&5CWHV0002ovPDHLkV1fX+la~Mh

diff --git a/apps/files_imageviewer/img/fancy_shadow_nw.png b/apps/files_imageviewer/img/fancy_shadow_nw.png
deleted file mode 100644
index 7182cd938ae98e7e28c65a0bc55df576042ff9f5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 324
zcmV-K0lWT*P)<h;3K|Lk000e1NJLTq000yK000yS1^@s6jfou%0003CNkl<ZILob+
z0SbdK3`LtX^$4>2-&4CO{qhKP$XKD&mgeXEM77>~`RA}h@U^Z##eQZVtM>a-K?QT4
z&(8BFf(rD5V61)2I__wHYuRwoaDIqw5Vdr_JSDVr){#J@r;{vbDL|tRyCiirf~4OF
zX-l=Ecm>@yR)1nSMt~dy90Zb`^`)TQbhf8jR@fA!l6V$musRyB9Y{p$SCW}!$3==V
zk)fW)Xo{s^ez$t+XhmZj;ts)!kTok<c^04|Sp~$jhS^pDUB$D=oTAxsnTV<p4fKK4
zNSd2c)Ay-YB9Np_#01msEE@t?H_Zjs10X&l++nv(x=EqHe!2VGMEci7vK?tQ04#6s
W>vmM>z)zt70000<MNUMnLSTa1AdgxA

diff --git a/apps/files_imageviewer/img/fancy_shadow_s.png b/apps/files_imageviewer/img/fancy_shadow_s.png
deleted file mode 100644
index d8858bfb78efb8d7268736920efa1eae8873f89c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 111
zcmeAS@N?(olHy`uVBq!ia0vp^j6f{H!3HFK_`(+gDKk$O#}JO|uBQ(2HW&yTIgq$g
zagp$^d~T7VKYI4JH)Z!&uXw<ncKMol#jdq^(f#w%3)s9ve=?Ts5l(saxU?N;0)wZk
KpUXO@geCxTMkF=>

diff --git a/apps/files_imageviewer/img/fancy_shadow_se.png b/apps/files_imageviewer/img/fancy_shadow_se.png
deleted file mode 100644
index 541e3ffd3e88224b34a4d2097c66a780e6060aeb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 352
zcmV-m0iXVfP)<h;3K|Lk000e1NJLTq000yK000yS1^@s6jfou%0003eNkl<ZILnPx
zQEo#q2s6B1q1rim{|imM!P*4&1D)scq(+LOB-pV5#lEiB8-QK&0U!bV)PB|M`vmZ;
zH30+wt2=z(@9-jd)}axQ0SUnIH@v3N9sqC=f<^lfV$h>{pM9=`y8<_<TSUg>I<ghE
zvLrB*Cs__s16iX97ZIUy8iUPEkD0_6=WtQ=I#6vcQP-=HgBRh0z@R+sfj}*%Ch|fA
zaZ<S;u-=(Gic47q0ha_XDu|PlvD!^|NMI{HNTu2|ItwN=Nxn&icM<p5L8LJ$<bLCz
zC@`e?T@?QtE<G4z#i<8FESgmNO(83Ll3J%+Zo=8rGEE3lX_PM$5|_3bNqtDHf~Ik*
y(1(B+eif5_o;>vWD02WY@RZ<9dgjNmAB|sYF}Xw>7Sq@O0000<MNUMnLSTa0oRGBu

diff --git a/apps/files_imageviewer/img/fancy_shadow_sw.png b/apps/files_imageviewer/img/fancy_shadow_sw.png
deleted file mode 100644
index b451689fa7b57b7432820e4c06d0864c143c79ab..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 340
zcmV-a0jvIrP)<h;3K|Lk000e1NJLTq000yK000yS1^@s6jfou%0003SNkl<ZILob*
zQEmev3`Cz{H@QL7``>eMf9z;FC21=)67q_`W0*0KnS4AR00W2`RGn3i8UfsEegLO@
zPhds?2e1Tm)FK3=bymIAx?X=YFo3Mdh7W<X(zEJK)}8{4uq!tx`w9X?=5(B*cqp(p
zTm}e%&W*2n=vLvZs$Q<TW?CS;3Z)fx5NRq?x}af0)IB@IL(%r>?@I#8s#svp!&PB>
zwah<EovWVO9S&@jSlX>@Ngd|l0N4SCfzvjtQnd$dZ0yM)N$X+lqdtN!Pt{Wn*_<zW
zvsH)K(f`E`h=emGB(+1;sh{6~*cFFuSfb|Iq|Q5_2eK@Xw7K;TxND=>`0U}m1^#r1
mwpaW{;a?9KKt^WrpTAEd?0j1W(3L*`0000<MNUMnLSTYY!jj4W

diff --git a/apps/files_imageviewer/img/fancy_shadow_w.png b/apps/files_imageviewer/img/fancy_shadow_w.png
deleted file mode 100644
index 8a4e4a887f18384a204563c0048c9cd1328f7faa..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 103
zcmeAS@N?(olHy`uVBq!ia0vp^B0$W@!3HGnP3ltxQhJ^)jv*Y^lmGnxZ_mu((a~wh
zq?x9`cF~7N-~dyqv9qD|6t>P{ho=rRL|66mGO)=r*Hk83F#~lnc)I$ztaD0e0sy?&
B8X5oq

diff --git a/apps/files_imageviewer/img/fancy_title_left.png b/apps/files_imageviewer/img/fancy_title_left.png
deleted file mode 100644
index 6049223d1ec6af46e100499c01f6489c9e2c6240..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 503
zcmV<T0SNwyP)<h;3K|Lk000e1NJLTq000jF001Be1ONa4XC>+)0005LNkl<ZD9??P
zO(?^07{|Z%W=v)qQ^LF)MiS+%ykt&Z4;<VmvK^enX*E(xaly@TC*>qcp<H&*;%GUH
zSSwb<w5iEU9?#$Z?`8Y{SAM_S|MPpE|MPsG?*qtB245A_&_F9kD*mj49tPwhFBPd7
zWy82^54mI8&w*s9MHa_c?>9&~$uJw{{r<S0=$-bSoRQY>Uub~E?-XJ#Upm4Fe%-Gl
z!u%tb0N102a|s5;SPlQvJlFCTBbvYaK@wIW6Gjx@?i20AlVDJcHNfh25WRlbF6CIq
zv9_ZnqOH`}ppaUR0@%ZcM9zpDt2uQM>f+Z#wIMmyuui3DeoYXWE|hQ{D$te=Yhgkq
zIvyj+$t8T|S1wITzUftNOe(E+Qjn$kDotY;I5}1lRgwi=?K26ke)djLR5W2|!7CVH
z<stJtbtHwTf&-(z6S*D4ftH{iJ(zHLPj7@AyYVr}OrjkuC`TjuFagg&AlZtdnF_f7
z26STt(=}_WK40h}`fWwQ-#PrCj9cu)AjUBT4;FuoEIeSZqL_<p<T3{^j8XX-7-3}<
t?VP0<?MnN_ON4w@(#E6u{|YKB@F!Z~63BzUt+@aI002ovPDHLkV1h7a;{N~u

diff --git a/apps/files_imageviewer/img/fancy_title_main.png b/apps/files_imageviewer/img/fancy_title_main.png
deleted file mode 100644
index 8044271f29b5d4e4471570e75cdce90bf9a1497c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 96
zcmeAS@N?(olHy`uVBq!ia0vp^j6kfw!2%>J-`tuAq|`lK978y+CnqGNCkUke_%Gig
ukvFM-ftpWh!il7Wg7kz7Y?7xB@G*olNlgoj4E_Yv!r<xZ=d#Wzp$Pzd&l|D;

diff --git a/apps/files_imageviewer/img/fancy_title_over.png b/apps/files_imageviewer/img/fancy_title_over.png
deleted file mode 100644
index d9f458f4bb8770466e44ba97dd8fe1f2936090db..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 70
zcmeAS@N?(olHy`uVBq!ia0vp^j3CUx1|;Q0k92}1TpU9<t|uoXBt-BqFsxu$a&+Mg
Q1)v0jr>mdKI;Vst0Ha3^zyJUM

diff --git a/apps/files_imageviewer/img/fancy_title_right.png b/apps/files_imageviewer/img/fancy_title_right.png
deleted file mode 100644
index e36d9db2a7c6e570aec993d3665cbc13620115e2..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 506
zcmV<W0R{evP)<h;3K|Lk000e1NJLTq000jF001Be1ONa4XC>+)0005ONkl<ZD9?RU
zODKd<7(HgjV~o6q62@bJB+9EiGFF}o7IqXF3oEfwNGZhzJIh%qD^Ut%GYd^D$zq6U
ziYfBQsF6pmbIm{cXa0ZOZ+Xu5-FwbG9}o`{j4&XMrE}7e3Ja2uK$<~Ac{_XA_D(OC
zAq~l-7^5gcIS(7i;T$tBQxlqe4*%Zk7YPCPeh)G^BZA<O)#|%?mowZBWbq{`f+tj#
zi}fc-I2uE?LQuo9=I@30e3@(H6=v#)i-O_V2?%kwk9_J#4E0CAwyTeCA*StAVF~qn
zB5RBNM@z7=KS2j}_=WHtq6}6#Y0$t`UOI4tYUFXeQ3GdO3h@y{0}AP(DHhy}5`LCR
zclfg(ttdqX&Cz?>xjQB-g>5=x46nGBwseihc$zfz<QToW!e;p;!C=c2+BLQ$UaUOI
zP%JpnkNPN6!*Ot(U<h`UBUky7Cf~4sHz4~?Z^xV%MJH-d@b{tNC?1?)hF~}9P|QGu
z<8b-p@~*ln*D#4ebfA`ct?Do>vTFh(=tCRj6cJ4M&ASrCAq-HbokPnRBAHVa2(-|l
wYU(UxfYLN;K<jOEC|g+~&7S?gg8wh@4{Jmc$jZ#sod5s;07*qoM6N<$f@3$_C;$Ke

diff --git a/apps/files_imageviewer/img/fancybox-x.png b/apps/files_imageviewer/img/fancybox-x.png
deleted file mode 100644
index c2130f8698f682d68b1550bffedecfe19eaa1a81..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 203
zcmeAS@N?(olHy`uVBq!ia0vp^j6m$c!3HGFo#yKTDajJoh?3y^w370~qErUQl>DSr
z1<%~X^wgl##FWaylc_d9MY*0Xjv*Ddw)7kFH5l+P-xcE$W)3=fYI&uMKVzWNT*W|n
zhqlRY)q0r(8Mg&Fu_zpISivgz+b7g)c6G&O{~njE??Y{u-MM!p^=9_W+X-j8mhfK?
zj`H2Yy;kp%)!V-M3;EVThyB(Z@o88wpMja-vy^g)SgE!<&|(HpS3j3^P6<r_$?-(w

diff --git a/apps/files_imageviewer/img/fancybox-y.png b/apps/files_imageviewer/img/fancybox-y.png
deleted file mode 100644
index 62f317619985442079767e6914d07bb0b7949766..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 166
zcmeAS@N?(olHy`uVBq!ia0vp^8bHj*!3HGP#J-sfq$EpRBT9nv(@M${i&7aJQ}UBi
z6+Ckj(^G>|6H_V+Po~-c6?u5NIEHY@vL0;bZ7|?rFeo?BbNEv)`-;^=m$U4oPeFXR
zqq8GxNr;JwOvVd~z`%_Q6Wo&&4L&|ReB_ABBUgn996BnWB$Xeq8+u6m-!|W-5NIZY
Mr>mdKI;Vst0E*Bu=>Px#

diff --git a/apps/files_imageviewer/img/fancybox.png b/apps/files_imageviewer/img/fancybox.png
deleted file mode 100644
index 65e14f68fd83b87f75c22c0c074e7b20bf20a133..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 15287
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
ZMt7F5hocMxav&E)U0Fw|QQ>vO{{ZOG+C=~W

diff --git a/apps/files_imageviewer/js/jquery.fancybox-1.3.4.js b/apps/files_imageviewer/js/jquery.fancybox-1.3.4.js
deleted file mode 100644
index e5493cd939..0000000000
--- a/apps/files_imageviewer/js/jquery.fancybox-1.3.4.js
+++ /dev/null
@@ -1,1156 +0,0 @@
-/*
- * 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($) {
-	var tmp, loading, overlay, wrap, outer, content, close, title, nav_left, nav_right,
-
-		selectedIndex = 0, selectedOpts = {}, selectedArray = [], currentIndex = 0, currentOpts = {}, currentArray = [],
-
-		ajaxLoader = null, imgPreloader = new Image(), imgRegExp = /\.(jpg|gif|png|bmp|jpeg)(.*)?$/i, swfRegExp = /[^\.]\.(swf)\s*$/i,
-
-		loadingTimer, loadingFrame = 1,
-
-		titleHeight = 0, titleStr = '', start_pos, final_pos, busy = false, fx = $.extend($('<div/>')[0], { prop: 0 }),
-
-		isIE6 = $.browser.msie && $.browser.version < 7 && !window.XMLHttpRequest,
-
-		/*
-		 * Private methods 
-		 */
-
-		_abort = function() {
-			loading.hide();
-
-			imgPreloader.onerror = imgPreloader.onload = null;
-
-			if (ajaxLoader) {
-				ajaxLoader.abort();
-			}
-
-			tmp.empty();
-		},
-
-		_error = function() {
-			if (false === selectedOpts.onError(selectedArray, selectedIndex, selectedOpts)) {
-				loading.hide();
-				busy = false;
-				return;
-			}
-
-			selectedOpts.titleShow = false;
-
-			selectedOpts.width = 'auto';
-			selectedOpts.height = 'auto';
-
-			tmp.html( '<p id="fancybox-error">The requested content cannot be loaded.<br />Please try again later.</p>' );
-
-			_process_inline();
-		},
-
-		_start = function() {
-			var obj = selectedArray[ selectedIndex ],
-				href, 
-				type, 
-				title,
-				str,
-				emb,
-				ret;
-
-			_abort();
-
-			selectedOpts = $.extend({}, $.fn.fancybox.defaults, (typeof $(obj).data('fancybox') == 'undefined' ? selectedOpts : $(obj).data('fancybox')));
-
-			ret = selectedOpts.onStart(selectedArray, selectedIndex, selectedOpts);
-
-			if (ret === false) {
-				busy = false;
-				return;
-			} else if (typeof ret == 'object') {
-				selectedOpts = $.extend(selectedOpts, ret);
-			}
-
-			title = selectedOpts.title || (obj.nodeName ? $(obj).attr('title') : obj.title) || '';
-			
-			if (obj.nodeName && !selectedOpts.orig) {
-				selectedOpts.orig = $(obj).children("img:first").length ? $(obj).children("img:first") : $(obj);
-			}
-
-			if (title === '' && selectedOpts.orig && selectedOpts.titleFromAlt) {
-				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 == '#') {
-				href = null;
-			}
-
-			if (selectedOpts.type) {
-				type = selectedOpts.type;
-
-				if (!href) {
-					href = selectedOpts.content;
-				}
-
-			} else if (selectedOpts.content) {
-				type = 'html';
-
-			} else if (href) {
-				if (href.match(imgRegExp)) {
-					type = 'image';
-
-				} else if (href.match(swfRegExp)) {
-					type = 'swf';
-
-				} else if ($(obj).hasClass("iframe")) {
-					type = 'iframe';
-
-				} else if (href.indexOf("#") === 0) {
-					type = 'inline';
-
-				} 
-			}
-
-			if (!type) {
-				_error();
-				return;
-			}
-
-			if (type == 'inline') {
-				obj	= href.substr(href.indexOf("#"));
-				type = $(obj).length > 0 ? 'inline' : 'ajax';
-			}
-
-			selectedOpts.type = type;
-			selectedOpts.href = href;
-			selectedOpts.title = title;
-
-			if (selectedOpts.autoDimensions) {
-				if (selectedOpts.type == 'html' || selectedOpts.type == 'inline' || selectedOpts.type == 'ajax') {
-					selectedOpts.width = 'auto';
-					selectedOpts.height = 'auto';
-				} else {
-					selectedOpts.autoDimensions = false;	
-				}
-			}
-
-			if (selectedOpts.modal) {
-				selectedOpts.overlayShow = true;
-				selectedOpts.hideOnOverlayClick = false;
-				selectedOpts.hideOnContentClick = false;
-				selectedOpts.enableEscapeButton = false;
-				selectedOpts.showCloseButton = false;
-			}
-
-			selectedOpts.padding = parseInt(selectedOpts.padding, 10);
-			selectedOpts.margin = parseInt(selectedOpts.margin, 10);
-
-			tmp.css('padding', (selectedOpts.padding + selectedOpts.margin));
-
-			$('.fancybox-inline-tmp').unbind('fancybox-cancel').bind('fancybox-change', function() {
-				$(this).replaceWith(content.children());				
-			});
-
-			switch (type) {
-				case 'html' :
-					tmp.html( selectedOpts.content );
-					_process_inline();
-				break;
-
-				case 'inline' :
-					if ( $(obj).parent().is('#fancybox-content') === true) {
-						busy = false;
-						return;
-					}
-
-					$('<div class="fancybox-inline-tmp" />')
-						.hide()
-						.insertBefore( $(obj) )
-						.bind('fancybox-cleanup', function() {
-							$(this).replaceWith(content.children());
-						}).bind('fancybox-cancel', function() {
-							$(this).replaceWith(tmp.children());
-						});
-
-					$(obj).appendTo(tmp);
-
-					_process_inline();
-				break;
-
-				case 'image':
-					busy = false;
-
-					$.fancybox.showActivity();
-
-					imgPreloader = new Image();
-
-					imgPreloader.onerror = function() {
-						_error();
-					};
-
-					imgPreloader.onload = function() {
-						busy = true;
-
-						imgPreloader.onerror = imgPreloader.onload = null;
-
-						_process_image();
-					};
-
-					imgPreloader.src = href;
-				break;
-
-				case 'swf':
-					selectedOpts.scrolling = 'no';
-
-					str = '<object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000" width="' + selectedOpts.width + '" height="' + selectedOpts.height + '"><param name="movie" value="' + href + '"></param>';
-					emb = '';
-
-					$.each(selectedOpts.swf, function(name, val) {
-						str += '<param name="' + name + '" value="' + val + '"></param>';
-						emb += ' ' + name + '="' + val + '"';
-					});
-
-					str += '<embed src="' + href + '" type="application/x-shockwave-flash" width="' + selectedOpts.width + '" height="' + selectedOpts.height + '"' + emb + '></embed></object>';
-
-					tmp.html(str);
-
-					_process_inline();
-				break;
-
-				case 'ajax':
-					busy = false;
-
-					$.fancybox.showActivity();
-
-					selectedOpts.ajax.win = selectedOpts.ajax.success;
-
-					ajaxLoader = $.ajax($.extend({}, selectedOpts.ajax, {
-						url	: href,
-						data : selectedOpts.ajax.data || {},
-						error : function(XMLHttpRequest, textStatus, errorThrown) {
-							if ( XMLHttpRequest.status > 0 ) {
-								_error();
-							}
-						},
-						success : function(data, textStatus, XMLHttpRequest) {
-							var o = typeof XMLHttpRequest == 'object' ? XMLHttpRequest : ajaxLoader;
-							if (o.status == 200) {
-								if ( typeof selectedOpts.ajax.win == 'function' ) {
-									ret = selectedOpts.ajax.win(href, data, textStatus, XMLHttpRequest);
-
-									if (ret === false) {
-										loading.hide();
-										return;
-									} else if (typeof ret == 'string' || typeof ret == 'object') {
-										data = ret;
-									}
-								}
-
-								tmp.html( data );
-								_process_inline();
-							}
-						}
-					}));
-
-				break;
-
-				case 'iframe':
-					_show();
-				break;
-			}
-		},
-
-		_process_inline = function() {
-			var
-				w = selectedOpts.width,
-				h = selectedOpts.height;
-
-			if (w.toString().indexOf('%') > -1) {
-				w = parseInt( ($(window).width() - (selectedOpts.margin * 2)) * parseFloat(w) / 100, 10) + 'px';
-
-			} else {
-				w = w == 'auto' ? 'auto' : w + 'px';	
-			}
-
-			if (h.toString().indexOf('%') > -1) {
-				h = parseInt( ($(window).height() - (selectedOpts.margin * 2)) * parseFloat(h) / 100, 10) + 'px';
-
-			} else {
-				h = h == 'auto' ? 'auto' : h + 'px';	
-			}
-
-			tmp.wrapInner('<div style="width:' + w + ';height:' + h + ';overflow: ' + (selectedOpts.scrolling == 'auto' ? 'auto' : (selectedOpts.scrolling == 'yes' ? 'scroll' : 'hidden')) + ';position:relative;"></div>');
-
-			selectedOpts.width = tmp.width();
-			selectedOpts.height = tmp.height();
-
-			_show();
-		},
-
-		_process_image = function() {
-			selectedOpts.width = imgPreloader.width;
-			selectedOpts.height = imgPreloader.height;
-
-			$("<img />").attr({
-				'id' : 'fancybox-img',
-				'src' : imgPreloader.src,
-				'alt' : selectedOpts.title
-			}).appendTo( tmp );
-
-			_show();
-		},
-
-		_show = function() {
-			var pos, equal;
-
-			loading.hide();
-
-			if (wrap.is(":visible") && false === currentOpts.onCleanup(currentArray, currentIndex, currentOpts)) {
-				$.event.trigger('fancybox-cancel');
-
-				busy = false;
-				return;
-			}
-
-			busy = true;
-
-			$(content.add( overlay )).unbind();
-
-			$(window).unbind("resize.fb scroll.fb");
-			$(document).unbind('keydown.fb');
-
-			if (wrap.is(":visible") && currentOpts.titlePosition !== 'outside') {
-				wrap.css('height', wrap.height());
-			}
-
-			currentArray = selectedArray;
-			currentIndex = selectedIndex;
-			currentOpts = selectedOpts;
-
-			if (currentOpts.overlayShow) {
-				overlay.css({
-					'background-color' : currentOpts.overlayColor,
-					'opacity' : currentOpts.overlayOpacity,
-					'cursor' : currentOpts.hideOnOverlayClick ? 'pointer' : 'auto',
-					'height' : $(document).height()
-				});
-
-				if (!overlay.is(':visible')) {
-					if (isIE6) {
-						$('select:not(#fancybox-tmp select)').filter(function() {
-							return this.style.visibility !== 'hidden';
-						}).css({'visibility' : 'hidden'}).one('fancybox-cleanup', function() {
-							this.style.visibility = 'inherit';
-						});
-					}
-
-					overlay.show();
-				}
-			} else {
-				overlay.hide();
-			}
-
-			final_pos = _get_zoom_to();
-
-			_process_title();
-
-			if (wrap.is(":visible")) {
-				$( close.add( nav_left ).add( nav_right ) ).hide();
-
-				pos = wrap.position(),
-
-				start_pos = {
-					top	 : pos.top,
-					left : pos.left,
-					width : wrap.width(),
-					height : wrap.height()
-				};
-
-				equal = (start_pos.width == final_pos.width && start_pos.height == final_pos.height);
-
-				content.fadeTo(currentOpts.changeFade, 0.3, function() {
-					var finish_resizing = function() {
-						content.html( tmp.contents() ).fadeTo(currentOpts.changeFade, 1, _finish);
-					};
-
-					$.event.trigger('fancybox-change');
-
-					content
-						.empty()
-						.removeAttr('filter')
-						.css({
-							'border-width' : currentOpts.padding,
-							'width'	: final_pos.width - currentOpts.padding * 2,
-							'height' : selectedOpts.autoDimensions ? 'auto' : final_pos.height - titleHeight - currentOpts.padding * 2
-						});
-
-					if (equal) {
-						finish_resizing();
-
-					} else {
-						fx.prop = 0;
-
-						$(fx).animate({prop: 1}, {
-							 duration : currentOpts.changeSpeed,
-							 easing : currentOpts.easingChange,
-							 step : _draw,
-							 complete : finish_resizing
-						});
-					}
-				});
-
-				return;
-			}
-
-			wrap.removeAttr("style");
-
-			content.css('border-width', currentOpts.padding);
-
-			if (currentOpts.transitionIn == 'elastic') {
-				start_pos = _get_zoom_from();
-
-				content.html( tmp.contents() );
-
-				wrap.show();
-
-				if (currentOpts.opacity) {
-					final_pos.opacity = 0;
-				}
-
-				fx.prop = 0;
-
-				$(fx).animate({prop: 1}, {
-					 duration : currentOpts.speedIn,
-					 easing : currentOpts.easingIn,
-					 step : _draw,
-					 complete : _finish
-				});
-
-				return;
-			}
-
-			if (currentOpts.titlePosition == 'inside' && titleHeight > 0) {	
-				title.show();	
-			}
-
-			content
-				.css({
-					'width' : final_pos.width - currentOpts.padding * 2,
-					'height' : selectedOpts.autoDimensions ? 'auto' : final_pos.height - titleHeight - currentOpts.padding * 2
-				})
-				.html( tmp.contents() );
-
-			wrap
-				.css(final_pos)
-				.fadeIn( currentOpts.transitionIn == 'none' ? 0 : currentOpts.speedIn, _finish );
-		},
-
-		_format_title = function(title) {
-			if (title && title.length) {
-				if (currentOpts.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">' + title + '</td><td id="fancybox-title-float-right"></td></tr></table>';
-				}
-
-				return '<div id="fancybox-title-' + currentOpts.titlePosition + '">' + title + '</div>';
-			}
-
-			return false;
-		},
-
-		_process_title = function() {
-			titleStr = currentOpts.title || '';
-			titleHeight = 0;
-
-			title
-				.empty()
-				.removeAttr('style')
-				.removeClass();
-
-			if (currentOpts.titleShow === false) {
-				title.hide();
-				return;
-			}
-
-			titleStr = $.isFunction(currentOpts.titleFormat) ? currentOpts.titleFormat(titleStr, currentArray, currentIndex, currentOpts) : _format_title(titleStr);
-
-			if (!titleStr || titleStr === '') {
-				title.hide();
-				return;
-			}
-
-			title
-				.addClass('fancybox-title-' + currentOpts.titlePosition)
-				.html( titleStr )
-				.appendTo( 'body' )
-				.show();
-
-			switch (currentOpts.titlePosition) {
-				case 'inside':
-					title
-						.css({
-							'width' : final_pos.width - (currentOpts.padding * 2),
-							'marginLeft' : currentOpts.padding,
-							'marginRight' : currentOpts.padding
-						});
-
-					titleHeight = title.outerHeight(true);
-
-					title.appendTo( outer );
-
-					final_pos.height += titleHeight;
-				break;
-
-				case 'over':
-					title
-						.css({
-							'marginLeft' : currentOpts.padding,
-							'width'	: final_pos.width - (currentOpts.padding * 2),
-							'bottom' : currentOpts.padding
-						})
-						.appendTo( outer );
-				break;
-
-				case 'float':
-					title
-						.css('left', parseInt((title.width() - final_pos.width - 40)/ 2, 10) * -1)
-						.appendTo( wrap );
-				break;
-
-				default:
-					title
-						.css({
-							'width' : final_pos.width - (currentOpts.padding * 2),
-							'paddingLeft' : currentOpts.padding,
-							'paddingRight' : currentOpts.padding
-						})
-						.appendTo( wrap );
-				break;
-			}
-
-			title.hide();
-		},
-
-		_set_navigation = function() {
-			if (currentOpts.enableEscapeButton || currentOpts.enableKeyboardNav) {
-				$(document).bind('keydown.fb', function(e) {
-					if (e.keyCode == 27 && currentOpts.enableEscapeButton) {
-						e.preventDefault();
-						$.fancybox.close();
-
-					} else if ((e.keyCode == 37 || e.keyCode == 39) && currentOpts.enableKeyboardNav && e.target.tagName !== 'INPUT' && e.target.tagName !== 'TEXTAREA' && e.target.tagName !== 'SELECT') {
-						e.preventDefault();
-						$.fancybox[ e.keyCode == 37 ? 'prev' : 'next']();
-					}
-				});
-			}
-
-			if (!currentOpts.showNavArrows) { 
-				nav_left.hide();
-				nav_right.hide();
-				return;
-			}
-
-			if ((currentOpts.cyclic && currentArray.length > 1) || currentIndex !== 0) {
-				nav_left.show();
-			}
-
-			if ((currentOpts.cyclic && currentArray.length > 1) || currentIndex != (currentArray.length -1)) {
-				nav_right.show();
-			}
-		},
-
-		_finish = function () {
-			if (!$.support.opacity) {
-				content.get(0).style.removeAttribute('filter');
-				wrap.get(0).style.removeAttribute('filter');
-			}
-
-			if (selectedOpts.autoDimensions) {
-				content.css('height', 'auto');
-			}
-
-			wrap.css('height', 'auto');
-
-			if (titleStr && titleStr.length) {
-				title.show();
-			}
-
-			if (currentOpts.showCloseButton) {
-				close.show();
-			}
-
-			_set_navigation();
-	
-			if (currentOpts.hideOnContentClick)	{
-				content.bind('click', $.fancybox.close);
-			}
-
-			if (currentOpts.hideOnOverlayClick)	{
-				overlay.bind('click', $.fancybox.close);
-			}
-
-			$(window).bind("resize.fb", $.fancybox.resize);
-
-			if (currentOpts.centerOnScroll) {
-				$(window).bind("scroll.fb", $.fancybox.center);
-			}
-
-			if (currentOpts.type == 'iframe') {
-				$('<iframe id="fancybox-frame" name="fancybox-frame' + new Date().getTime() + '" frameborder="0" hspace="0" ' + ($.browser.msie ? 'allowtransparency="true""' : '') + ' scrolling="' + selectedOpts.scrolling + '" src="' + currentOpts.href + '"></iframe>').appendTo(content);
-			}
-
-			wrap.show();
-
-			busy = false;
-
-			$.fancybox.center();
-
-			currentOpts.onComplete(currentArray, currentIndex, currentOpts);
-
-			_preload_images();
-		},
-
-		_preload_images = function() {
-			var href, 
-				objNext;
-
-			if ((currentArray.length -1) > currentIndex) {
-				href = currentArray[ currentIndex + 1 ].href;
-
-				if (typeof href !== 'undefined' && href.match(imgRegExp)) {
-					objNext = new Image();
-					objNext.src = href;
-				}
-			}
-
-			if (currentIndex > 0) {
-				href = currentArray[ currentIndex - 1 ].href;
-
-				if (typeof href !== 'undefined' && href.match(imgRegExp)) {
-					objNext = new Image();
-					objNext.src = href;
-				}
-			}
-		},
-
-		_draw = function(pos) {
-			var dim = {
-				width : parseInt(start_pos.width + (final_pos.width - start_pos.width) * pos, 10),
-				height : parseInt(start_pos.height + (final_pos.height - start_pos.height) * pos, 10),
-
-				top : parseInt(start_pos.top + (final_pos.top - start_pos.top) * pos, 10),
-				left : parseInt(start_pos.left + (final_pos.left - start_pos.left) * pos, 10)
-			};
-
-			if (typeof final_pos.opacity !== 'undefined') {
-				dim.opacity = pos < 0.5 ? 0.5 : pos;
-			}
-
-			wrap.css(dim);
-
-			content.css({
-				'width' : dim.width - currentOpts.padding * 2,
-				'height' : dim.height - (titleHeight * pos) - currentOpts.padding * 2
-			});
-		},
-
-		_get_viewport = function() {
-			return [
-				$(window).width() - (currentOpts.margin * 2),
-				$(window).height() - (currentOpts.margin * 2),
-				$(document).scrollLeft() + currentOpts.margin,
-				$(document).scrollTop() + currentOpts.margin
-			];
-		},
-
-		_get_zoom_to = function () {
-			var view = _get_viewport(),
-				to = {},
-				resize = currentOpts.autoScale,
-				double_padding = currentOpts.padding * 2,
-				ratio;
-
-			if (currentOpts.width.toString().indexOf('%') > -1) {
-				to.width = parseInt((view[0] * parseFloat(currentOpts.width)) / 100, 10);
-			} else {
-				to.width = currentOpts.width + double_padding;
-			}
-
-			if (currentOpts.height.toString().indexOf('%') > -1) {
-				to.height = parseInt((view[1] * parseFloat(currentOpts.height)) / 100, 10);
-			} else {
-				to.height = currentOpts.height + double_padding;
-			}
-
-			if (resize && (to.width > view[0] || to.height > view[1])) {
-				if (selectedOpts.type == 'image' || selectedOpts.type == 'swf') {
-					ratio = (currentOpts.width ) / (currentOpts.height );
-
-					if ((to.width ) > view[0]) {
-						to.width = view[0];
-						to.height = parseInt(((to.width - double_padding) / ratio) + double_padding, 10);
-					}
-
-					if ((to.height) > view[1]) {
-						to.height = view[1];
-						to.width = parseInt(((to.height - double_padding) * ratio) + double_padding, 10);
-					}
-
-				} else {
-					to.width = Math.min(to.width, view[0]);
-					to.height = Math.min(to.height, view[1]);
-				}
-			}
-
-			to.top = parseInt(Math.max(view[3] - 20, view[3] + ((view[1] - to.height - 40) * 0.5)), 10);
-			to.left = parseInt(Math.max(view[2] - 20, view[2] + ((view[0] - to.width - 40) * 0.5)), 10);
-
-			return to;
-		},
-
-		_get_obj_pos = function(obj) {
-			var pos = obj.offset();
-
-			pos.top += parseInt( obj.css('paddingTop'), 10 ) || 0;
-			pos.left += parseInt( obj.css('paddingLeft'), 10 ) || 0;
-
-			pos.top += parseInt( obj.css('border-top-width'), 10 ) || 0;
-			pos.left += parseInt( obj.css('border-left-width'), 10 ) || 0;
-
-			pos.width = obj.width();
-			pos.height = obj.height();
-
-			return pos;
-		},
-
-		_get_zoom_from = function() {
-			var orig = selectedOpts.orig ? $(selectedOpts.orig) : false,
-				from = {},
-				pos,
-				view;
-
-			if (orig && orig.length) {
-				pos = _get_obj_pos(orig);
-
-				from = {
-					width : pos.width + (currentOpts.padding * 2),
-					height : pos.height + (currentOpts.padding * 2),
-					top	: pos.top - currentOpts.padding - 20,
-					left : pos.left - currentOpts.padding - 20
-				};
-
-			} else {
-				view = _get_viewport();
-
-				from = {
-					width : currentOpts.padding * 2,
-					height : currentOpts.padding * 2,
-					top	: parseInt(view[3] + view[1] * 0.5, 10),
-					left : parseInt(view[2] + view[0] * 0.5, 10)
-				};
-			}
-
-			return from;
-		},
-
-		_animate_loading = function() {
-			if (!loading.is(':visible')){
-				clearInterval(loadingTimer);
-				return;
-			}
-
-			$('div', loading).css('top', (loadingFrame * -40) + 'px');
-
-			loadingFrame = (loadingFrame + 1) % 12;
-		};
-
-	/*
-	 * Public methods 
-	 */
-
-	$.fn.fancybox = function(options) {
-		if (!$(this).length) {
-			return this;
-		}
-
-		$(this)
-			.data('fancybox', $.extend({}, options, ($.metadata ? $(this).metadata() : {})))
-			.unbind('click.fb')
-			.bind('click.fb', function(e) {
-				e.preventDefault();
-
-				if (busy) {
-					return;
-				}
-
-				busy = true;
-
-				$(this).blur();
-
-				selectedArray = [];
-				selectedIndex = 0;
-
-				var rel = $(this).attr('rel') || '';
-
-				if (!rel || rel == '' || rel === 'nofollow') {
-					selectedArray.push(this);
-
-				} else {
-					selectedArray = $("a[rel=" + rel + "], area[rel=" + rel + "]");
-					selectedIndex = selectedArray.index( this );
-				}
-
-				_start();
-
-				return;
-			});
-
-		return this;
-	};
-
-	$.fancybox = function(obj) {
-		var opts;
-
-		if (busy) {
-			return;
-		}
-
-		busy = true;
-		opts = typeof arguments[1] !== 'undefined' ? arguments[1] : {};
-
-		selectedArray = [];
-		selectedIndex = parseInt(opts.index, 10) || 0;
-
-		if ($.isArray(obj)) {
-			for (var i = 0, j = obj.length; i < j; i++) {
-				if (typeof obj[i] == 'object') {
-					$(obj[i]).data('fancybox', $.extend({}, opts, obj[i]));
-				} else {
-					obj[i] = $({}).data('fancybox', $.extend({content : obj[i]}, opts));
-				}
-			}
-
-			selectedArray = jQuery.merge(selectedArray, obj);
-
-		} else {
-			if (typeof obj == 'object') {
-				$(obj).data('fancybox', $.extend({}, opts, obj));
-			} else {
-				obj = $({}).data('fancybox', $.extend({content : obj}, opts));
-			}
-
-			selectedArray.push(obj);
-		}
-
-		if (selectedIndex > selectedArray.length || selectedIndex < 0) {
-			selectedIndex = 0;
-		}
-
-		_start();
-	};
-
-	$.fancybox.showActivity = function() {
-		clearInterval(loadingTimer);
-
-		loading.show();
-		loadingTimer = setInterval(_animate_loading, 66);
-	};
-
-	$.fancybox.hideActivity = function() {
-		loading.hide();
-	};
-
-	$.fancybox.next = function() {
-		return $.fancybox.pos( currentIndex + 1);
-	};
-
-	$.fancybox.prev = function() {
-		return $.fancybox.pos( currentIndex - 1);
-	};
-
-	$.fancybox.pos = function(pos) {
-		if (busy) {
-			return;
-		}
-
-		pos = parseInt(pos);
-
-		selectedArray = currentArray;
-
-		if (pos > -1 && pos < currentArray.length) {
-			selectedIndex = pos;
-			_start();
-
-		} else if (currentOpts.cyclic && currentArray.length > 1) {
-			selectedIndex = pos >= currentArray.length ? 0 : currentArray.length - 1;
-			_start();
-		}
-
-		return;
-	};
-
-	$.fancybox.cancel = function() {
-		if (busy) {
-			return;
-		}
-
-		busy = true;
-
-		$.event.trigger('fancybox-cancel');
-
-		_abort();
-
-		selectedOpts.onCancel(selectedArray, selectedIndex, selectedOpts);
-
-		busy = false;
-	};
-
-	// Note: within an iframe use - parent.$.fancybox.close();
-	$.fancybox.close = function() {
-		if (busy || wrap.is(':hidden')) {
-			return;
-		}
-
-		busy = true;
-
-		if (currentOpts && false === currentOpts.onCleanup(currentArray, currentIndex, currentOpts)) {
-			busy = false;
-			return;
-		}
-
-		_abort();
-
-		$(close.add( nav_left ).add( nav_right )).hide();
-
-		$(content.add( overlay )).unbind();
-
-		$(window).unbind("resize.fb scroll.fb");
-		$(document).unbind('keydown.fb');
-
-		content.find('iframe').attr('src', isIE6 && /^https/i.test(window.location.href || '') ? 'javascript:void(false)' : 'about:blank');
-
-		if (currentOpts.titlePosition !== 'inside') {
-			title.empty();
-		}
-
-		wrap.stop();
-
-		function _cleanup() {
-			overlay.fadeOut('fast');
-
-			title.empty().hide();
-			wrap.hide();
-
-			$.event.trigger('fancybox-cleanup');
-
-			content.empty();
-
-			currentOpts.onClosed(currentArray, currentIndex, currentOpts);
-
-			currentArray = selectedOpts	= [];
-			currentIndex = selectedIndex = 0;
-			currentOpts = selectedOpts	= {};
-
-			busy = false;
-		}
-
-		if (currentOpts.transitionOut == 'elastic') {
-			start_pos = _get_zoom_from();
-
-			var pos = wrap.position();
-
-			final_pos = {
-				top	 : pos.top ,
-				left : pos.left,
-				width :	wrap.width(),
-				height : wrap.height()
-			};
-
-			if (currentOpts.opacity) {
-				final_pos.opacity = 1;
-			}
-
-			title.empty().hide();
-
-			fx.prop = 1;
-
-			$(fx).animate({ prop: 0 }, {
-				 duration : currentOpts.speedOut,
-				 easing : currentOpts.easingOut,
-				 step : _draw,
-				 complete : _cleanup
-			});
-
-		} else {
-			wrap.fadeOut( currentOpts.transitionOut == 'none' ? 0 : currentOpts.speedOut, _cleanup);
-		}
-	};
-
-	$.fancybox.resize = function() {
-		if (overlay.is(':visible')) {
-			overlay.css('height', $(document).height());
-		}
-
-		$.fancybox.center(true);
-	};
-
-	$.fancybox.center = function() {
-		var view, align;
-
-		if (busy) {
-			return;	
-		}
-
-		align = arguments[0] === true ? 1 : 0;
-		view = _get_viewport();
-
-		if (!align && (wrap.width() > view[0] || wrap.height() > view[1])) {
-			return;	
-		}
-
-		wrap
-			.stop()
-			.animate({
-				'top' : parseInt(Math.max(view[3] - 20, view[3] + ((view[1] - content.height() - 40) * 0.5) - currentOpts.padding)),
-				'left' : parseInt(Math.max(view[2] - 20, view[2] + ((view[0] - content.width() - 40) * 0.5) - currentOpts.padding))
-			}, typeof arguments[0] == 'number' ? arguments[0] : 200);
-	};
-
-	$.fancybox.init = function() {
-		if ($("#fancybox-wrap").length) {
-			return;
-		}
-
-		$('body').append(
-			tmp	= $('<div id="fancybox-tmp"></div>'),
-			loading	= $('<div id="fancybox-loading"><div></div></div>'),
-			overlay	= $('<div id="fancybox-overlay"></div>'),
-			wrap = $('<div id="fancybox-wrap"></div>')
-		);
-
-		outer = $('<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( wrap );
-
-		outer.append(
-			content = $('<div id="fancybox-content"></div>'),
-			close = $('<a id="fancybox-close"></a>'),
-			title = $('<div id="fancybox-title"></div>'),
-
-			nav_left = $('<a href="javascript:;" id="fancybox-left"><span class="fancy-ico" id="fancybox-left-ico"></span></a>'),
-			nav_right = $('<a href="javascript:;" id="fancybox-right"><span class="fancy-ico" id="fancybox-right-ico"></span></a>')
-		);
-
-		close.click($.fancybox.close);
-		loading.click($.fancybox.cancel);
-
-		nav_left.click(function(e) {
-			e.preventDefault();
-			$.fancybox.prev();
-		});
-
-		nav_right.click(function(e) {
-			e.preventDefault();
-			$.fancybox.next();
-		});
-
-		if ($.fn.mousewheel) {
-			wrap.bind('mousewheel.fb', function(e, delta) {
-				if (busy) {
-					e.preventDefault();
-
-				} else if ($(e.target).get(0).clientHeight == 0 || $(e.target).get(0).scrollHeight === $(e.target).get(0).clientHeight) {
-					e.preventDefault();
-					$.fancybox[ delta > 0 ? 'prev' : 'next']();
-				}
-			});
-		}
-
-		if (!$.support.opacity) {
-			wrap.addClass('fancybox-ie');
-		}
-
-		if (isIE6) {
-			loading.addClass('fancybox-ie6');
-			wrap.addClass('fancybox-ie6');
-
-			$('<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(outer);
-		}
-	};
-
-	$.fn.fancybox.defaults = {
-		padding : 10,
-		margin : 40,
-		opacity : false,
-		modal : false,
-		cyclic : false,
-		scrolling : 'auto',	// 'auto', 'yes' or 'no'
-
-		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', // 'float', 'outside', 'inside' or 'over'
-		titleFormat : null,
-		titleFromAlt : false,
-
-		transitionIn : 'fade', // 'elastic', 'fade' or 'none'
-		transitionOut : 'fade', // 'elastic', 'fade' or 'none'
-
-		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(){}
-	};
-
-	$(document).ready(function() {
-		$.fancybox.init();
-	});
-
-})(jQuery);
\ No newline at end of file
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
deleted file mode 100644
index 260f2c2d46..0000000000
--- a/apps/files_imageviewer/js/jquery.fancybox-1.3.4.pack.js
+++ /dev/null
@@ -1 +0,0 @@
-(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
diff --git a/apps/files_imageviewer/js/jquery.mousewheel-3.0.4.js b/apps/files_imageviewer/js/jquery.mousewheel-3.0.4.js
deleted file mode 100644
index b7932415ce..0000000000
--- a/apps/files_imageviewer/js/jquery.mousewheel-3.0.4.js
+++ /dev/null
@@ -1,78 +0,0 @@
-/*! Copyright (c) 2010 Brandon Aaron (http://brandonaaron.net)
- * Licensed under the MIT License (LICENSE.txt).
- *
- * Thanks to: http://adomas.org/javascript-mouse-wheel/ for some pointers.
- * Thanks to: Mathias Bank(http://www.mathias-bank.de) for a scope bug fix.
- * Thanks to: Seamus Leahy for adding deltaX and deltaY
- *
- * Version: 3.0.4
- * 
- * Requires: 1.2.2+
- */
-
-(function($) {
-
-var types = ['DOMMouseScroll', 'mousewheel'];
-
-$.event.special.mousewheel = {
-    setup: function() {
-        if ( this.addEventListener ) {
-            for ( var i=types.length; i; ) {
-                this.addEventListener( types[--i], handler, false );
-            }
-        } else {
-            this.onmousewheel = handler;
-        }
-    },
-    
-    teardown: function() {
-        if ( this.removeEventListener ) {
-            for ( var i=types.length; i; ) {
-                this.removeEventListener( types[--i], handler, false );
-            }
-        } else {
-            this.onmousewheel = null;
-        }
-    }
-};
-
-$.fn.extend({
-    mousewheel: function(fn) {
-        return fn ? this.bind("mousewheel", fn) : this.trigger("mousewheel");
-    },
-    
-    unmousewheel: function(fn) {
-        return this.unbind("mousewheel", fn);
-    }
-});
-
-
-function handler(event) {
-    var orgEvent = event || window.event, args = [].slice.call( arguments, 1 ), delta = 0, returnValue = true, deltaX = 0, deltaY = 0;
-    event = $.event.fix(orgEvent);
-    event.type = "mousewheel";
-    
-    // Old school scrollwheel delta
-    if ( event.wheelDelta ) { delta = event.wheelDelta/120; }
-    if ( event.detail     ) { delta = -event.detail/3; }
-    
-    // New school multidimensional scroll (touchpads) deltas
-    deltaY = delta;
-    
-    // Gecko
-    if ( orgEvent.axis !== undefined && orgEvent.axis === orgEvent.HORIZONTAL_AXIS ) {
-        deltaY = 0;
-        deltaX = -1*delta;
-    }
-    
-    // Webkit
-    if ( orgEvent.wheelDeltaY !== undefined ) { deltaY = orgEvent.wheelDeltaY/120; }
-    if ( orgEvent.wheelDeltaX !== undefined ) { deltaX = -1*orgEvent.wheelDeltaX/120; }
-    
-    // Add event and delta to the front of the arguments
-    args.unshift(event, delta, deltaX, deltaY);
-    
-    return $.event.handle.apply(this, args);
-}
-
-})(jQuery);
\ No newline at end of file
diff --git a/apps/files_imageviewer/js/jquery.mousewheel-3.0.4.pack.js b/apps/files_imageviewer/js/jquery.mousewheel-3.0.4.pack.js
deleted file mode 100644
index cb66588e29..0000000000
--- a/apps/files_imageviewer/js/jquery.mousewheel-3.0.4.pack.js
+++ /dev/null
@@ -1,14 +0,0 @@
-/*! Copyright (c) 2010 Brandon Aaron (http://brandonaaron.net)
-* Licensed under the MIT License (LICENSE.txt).
-*
-* Thanks to: http://adomas.org/javascript-mouse-wheel/ for some pointers.
-* Thanks to: Mathias Bank(http://www.mathias-bank.de) for a scope bug fix.
-* Thanks to: Seamus Leahy for adding deltaX and deltaY
-*
-* Version: 3.0.4
-*
-* Requires: 1.2.2+
-*/
-
-(function(d){function g(a){var b=a||window.event,i=[].slice.call(arguments,1),c=0,h=0,e=0;a=d.event.fix(b);a.type="mousewheel";if(a.wheelDelta)c=a.wheelDelta/120;if(a.detail)c=-a.detail/3;e=c;if(b.axis!==undefined&&b.axis===b.HORIZONTAL_AXIS){e=0;h=-1*c}if(b.wheelDeltaY!==undefined)e=b.wheelDeltaY/120;if(b.wheelDeltaX!==undefined)h=-1*b.wheelDeltaX/120;i.unshift(a,c,h,e);return d.event.handle.apply(this,i)}var f=["DOMMouseScroll","mousewheel"];d.event.special.mousewheel={setup:function(){if(this.addEventListener)for(var a=
-f.length;a;)this.addEventListener(f[--a],g,false);else this.onmousewheel=g},teardown:function(){if(this.removeEventListener)for(var a=f.length;a;)this.removeEventListener(f[--a],g,false);else this.onmousewheel=null}};d.fn.extend({mousewheel:function(a){return a?this.bind("mousewheel",a):this.trigger("mousewheel")},unmousewheel:function(a){return this.unbind("mousewheel",a)}})})(jQuery);
\ No newline at end of file
diff --git a/apps/files_imageviewer/js/lightbox.js b/apps/files_imageviewer/js/lightbox.js
deleted file mode 100644
index ff12d808bc..0000000000
--- a/apps/files_imageviewer/js/lightbox.js
+++ /dev/null
@@ -1,31 +0,0 @@
-$(document).ready(function() {
-	if(typeof FileActions!=='undefined'){
-		FileActions.register('image','View', FileActions.PERMISSION_READ, '',function(filename){
-			viewImage($('#dir').val(),filename);
-		});
-		FileActions.setDefault('image','View');
-	}
-	OC.search.customResults.Images=function(row,item){
-		var image=item.link.substr(item.link.indexOf('?file=')+6);
-		var a=row.find('a');
-		a.attr('href','#');
-		a.click(function(){
-			var pos=image.lastIndexOf('/')
-			var file=image.substr(pos + 1);
-			var dir=image.substr(0,pos);
-			viewImage(dir,file);
-		});
-	}
-});
-
-function viewImage(dir, file) {
-	if(file.indexOf('.psd')>0){//can't view those
-		return;
-	}
-	var location=OC.filePath('files','ajax','download.php')+encodeURIComponent('?files='+encodeURIComponent(file)+'&dir='+encodeURIComponent(dir));
-	$.fancybox({
-		"href": location,
-		"title": file.replace(/</, "&lt;").replace(/>/, "&gt;"),
-		"titlePosition": "inside"
-	});
-}
diff --git a/apps/files_odfviewer/appinfo/app.php b/apps/files_odfviewer/appinfo/app.php
deleted file mode 100644
index f5fe338c0e..0000000000
--- a/apps/files_odfviewer/appinfo/app.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-OCP\Util::addStyle( 'files_odfviewer', 'webodf' );
-OCP\Util::addStyle( 'files_odfviewer', 'odfviewer' );
-OCP\Util::addScript('files_odfviewer', 'viewer' );
-OCP\Util::addScript('files_odfviewer', 'webodf');
diff --git a/apps/files_odfviewer/appinfo/info.xml b/apps/files_odfviewer/appinfo/info.xml
deleted file mode 100644
index 5d93058eeb..0000000000
--- a/apps/files_odfviewer/appinfo/info.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0"?>
-<info>
-	<id>files_odfviewer</id>
-	<name>ODF Viewer</name>
-	<description>Simple ODF viewer for owncloud</description>
-	<version>0.1</version>
-	<licence>AGPL</licence>
-	<author>Thomas Müller</author>
-	<require>4</require>
-	<shipped>true</shipped>
-	<default_enable/>
-</info>
diff --git a/apps/files_odfviewer/css/odfviewer.css b/apps/files_odfviewer/css/odfviewer.css
deleted file mode 100644
index 097276a00f..0000000000
--- a/apps/files_odfviewer/css/odfviewer.css
+++ /dev/null
@@ -1,20 +0,0 @@
-#odf-canvas{
-  position: relative;
-  top: 37px;
-  left: 1px;
-  border:1px solid darkgray; 
-  box-shadow: 0px 4px 10px #000;
-  -moz-box-shadow: 0px 4px 10px #000;
-  -webkit-box-shadow: 0px 4px 10px #000;
-}
-
-#odf_close{
-	margin-left: auto;
-	margin-right: 167px;	
-	float: right;
-}
-
-#odf-toolbar{
-    padding: 0 0 0 1em
-}
-
diff --git a/apps/files_odfviewer/css/webodf.css b/apps/files_odfviewer/css/webodf.css
deleted file mode 100644
index 0ceca2f851..0000000000
--- a/apps/files_odfviewer/css/webodf.css
+++ /dev/null
@@ -1,196 +0,0 @@
-@namespace draw url(urn:oasis:names:tc:opendocument:xmlns:drawing:1.0);
-@namespace fo url(urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0);
-@namespace office url(urn:oasis:names:tc:opendocument:xmlns:office:1.0);
-@namespace presentation url(urn:oasis:names:tc:opendocument:xmlns:presentation:1.0);
-@namespace style url(urn:oasis:names:tc:opendocument:xmlns:style:1.0);
-@namespace svg url(urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0);
-@namespace table url(urn:oasis:names:tc:opendocument:xmlns:table:1.0);
-@namespace text url(urn:oasis:names:tc:opendocument:xmlns:text:1.0);
-@namespace runtimens url(urn:webodf); /* namespace for runtime only */
-
-office|document > *, office|document-content > * {
-  display: none;
-}
-office|body, office|document {
-  display: inline-block;
-  position: relative;
-}
-
-text|p, text|h {
-  display: block;
-  padding: 3px 3px 3px 3px;
-  margin: 5px 5px 5px 5px;
-}
-text|h {
-  font-weight: bold;
-}
-*[runtimens|containsparagraphanchor] {
-  position: relative;
-}
-text|s:before { /* this needs to be the number of spaces given by text:c */
-  content: ' ';
-}
-text|tab:before {
-  display: inline;
-  content: '        ';
-}
-text|line-break {
-  content: " ";
-  display: block;
-}
-text|tracked-changes {
-  /*Consumers that do not support change tracking, should ignore changes.*/
-  display: none;
-}
-office|binary-data {
-  display: none;
-}
-office|text {
-  display: block;
-  width: 216mm; /* default to A4 width */
-  min-height: 279mm;
-  padding-left: 32mm;
-  padding-right: 32mm;
-  padding-top: 25mm;
-  padding-bottom: 13mm;
-  margin: 2px;
-  text-align: left;
-  overflow: hidden;
-}
-office|spreadsheet {
-  display: block;
-  border-collapse: collapse;
-  empty-cells: show;
-  font-family: sans-serif;
-  font-size: 10pt;
-  text-align: left;
-  page-break-inside: avoid;
-  overflow: hidden;
-}
-office|presentation {
-  display: inline-block;
-  text-align: left;
-}
-draw|page {
-  display: block;
-  height: 21cm;
-  width: 28cm;
-  margin: 3px;
-  position: relative;
-  overflow: hidden;
-}
-presentation|notes {
-    display: none;
-}
-@media print {
-  draw|page {
-    border: 1pt solid black;
-    page-break-inside: avoid;
-  }
-  presentation|notes {
-    /*TODO*/
-  }
-}
-office|spreadsheet text|p {
-  border: 0px;
-  padding: 1px;
-  margin: 0px;
-}
-office|spreadsheet table|table {
-  margin: 3px;
-}
-office|spreadsheet table|table:after {
-  /* show sheet name the end of the sheet */
-  /*content: attr(table|name);*/ /* gives parsing error in opera */
-}
-office|spreadsheet table|table-row {
-  counter-increment: row;
-}
-office|spreadsheet table|table-row:before {
-  width: 3em;
-  background: #cccccc;
-  border: 1px solid black;
-  text-align: center;
-  content: counter(row);
-}
-office|spreadsheet table|table-cell {
-  border: 1px solid #cccccc;
-}
-table|table {
-  display: table;
-}
-draw|frame table|table {
-  width: 100%;
-  height: 100%;
-  background: white;
-}
-table|table-row {
-  display: table-row;
-}
-table|table-column {
-  display: table-column;
-}
-table|table-cell {
-  display: table-cell;
-}
-draw|frame {
-  display: block;
-}
-draw|image {
-  display: block;
-  width: 100%;
-  height: 100%;
-  top: 0px;
-  left: 0px;
-  background-repeat: no-repeat;
-  background-size: 100% 100%;
-  -moz-background-size: 100% 100%;
-}
-/* only show the first image in frame */
-draw|frame > draw|image:nth-of-type(n+2) {
-  display: none;
-}
-text|list {
-    display: block;
-    padding-left: 1.5em;
-    counter-reset: list;
-}
-text|list-item {
-    display: block;
-}
-text|list-item:before {
-    display: inline-block;
-    content: '•';
-    counter-increment: list;
-    width: 0.5em;
-    margin-left: -0.5em;
-    padding: 0px;
-    border: 0px;
-}
-text|list-item > *:first-child {
-    display: inline-block;
-}
-text|a {
-    color: blue;
-    text-decoration: underline;
-}
-text|note-citation {
-    vertical-align: super;
-    font-size: smaller;
-}
-text|note-body {
-    display: none;
-}
-text|note:hover text|note-citation {
-    background: #dddddd;
-}
-text|note:hover text|note-body {
-    display: block;
-    left:1em;
-    max-width: 80%;
-    position: absolute;
-    background: #ffffaa;
-}
-svg|title, svg|desc {
-    display: none;
-}
diff --git a/apps/files_odfviewer/js/viewer.js b/apps/files_odfviewer/js/viewer.js
deleted file mode 100644
index 9455a9a0a0..0000000000
--- a/apps/files_odfviewer/js/viewer.js
+++ /dev/null
@@ -1,60 +0,0 @@
-function viewOdf(dir, file) {
-	var location=OC.filePath('files','ajax','download.php')+'?files='+file+'&dir='+dir;
-
-	// fade out files menu and add odf menu
-	$('.actions,#file_action_panel').fadeOut('slow').promise().done(function() {
-		// odf action toolbar
-		var odfToolbarHtml = 
-			'<div id="odf-toolbar">' +
-			'<input type="button" id="odf_close">'+t('files_odfviewer','Close')+
-			'</div>';
-		$('#controls').append(odfToolbarHtml);
-
-	});
-
-	// fade out file list and show pdf canvas
-	$('table').fadeOut('slow').promise().done(function(){;
-		var canvashtml = '<div id="odf-canvas"></div>';
-		$('table').after(canvashtml);
-
-		var odfelement = document.getElementById("odf-canvas");
-		var odfcanvas = new odf.OdfCanvas(odfelement);
-		odfcanvas.load(location);
-	});
-}
-
-function closeOdfViewer(){
-	// Fade out odf-toolbar
-	$('#odf-toolbar').fadeOut('slow');
-	// Fade out editor
-	$('#odf-canvas').fadeOut('slow', function(){
-		$('#odf-toolbar').remove();
-		$('#odf-canvas').remove();
-		$('.actions,#file_access_panel').fadeIn('slow');
-		$('table').fadeIn('slow');	
-	});
-	is_editor_shown = false;
-}
-
-$(document).ready(function() {
-	if(typeof FileActions!=='undefined'){
-
-		var supportedMimes = new Array(
-			'application/vnd.oasis.opendocument.text', 
-			'application/vnd.oasis.opendocument.spreadsheet',
-			'application/vnd.oasis.opendocument.graphics',
-			'application/vnd.oasis.opendocument.presentation');
-		for (var i = 0; i < supportedMimes.length; ++i){
-			var mime = supportedMimes[i];
-			FileActions.register(mime,'View','',function(filename){
-				viewOdf($('#dir').val(),filename);
-			});
-			FileActions.setDefault(mime,'View');
-		}
-	}
-	
-	$('#odf_close').live('click',function() {
-		closeOdfViewer();	
-	});
-});
-
diff --git a/apps/files_odfviewer/js/webodf-debug.js b/apps/files_odfviewer/js/webodf-debug.js
deleted file mode 100644
index 6c7c7e1d6f..0000000000
--- a/apps/files_odfviewer/js/webodf-debug.js
+++ /dev/null
@@ -1,7124 +0,0 @@
-/*
-
- @licstart
- The JavaScript code in this page is free software: you can redistribute it
- and/or modify it under the terms of the GNU Affero General Public License
- (GNU AGPL) as published by the Free Software Foundation, either version 3 of
- the License, or (at your option) any later version.  The code is distributed
- WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
-
- As additional permission under GNU AGPL version 3 section 7, you
- may distribute non-source (e.g., minimized or compacted) forms of
- that code without the copy of the GNU GPL normally required by
- section 4, provided you include this license notice and a URL
- through which recipients can access the Corresponding Source.
-
- As a special exception to the AGPL, any HTML file which merely makes function
- calls to this code, and for that purpose includes it by reference shall be
- deemed a separate work for copyright law purposes. In addition, the copyright
- holders of this code give you permission to combine this code with free
- software libraries that are released under the GNU LGPL. You may copy and
- distribute such a system following the terms of the GNU AGPL for this code
- and the LGPL for the libraries. If you modify this code, you may extend this
- exception to your version of the code, but you are not obligated to do so.
- If you do not wish to do so, delete this exception statement from your
- version.
-
- This license applies to this entire compilation.
- @licend
- @source: http://www.webodf.org/
- @source: http://gitorious.org/odfkit/webodf/
-*/
-var core = {};
-var gui = {};
-var xmldom = {};
-var odf = {};
-function Runtime() {
-}
-Runtime.ByteArray = function(size) {
-};
-Runtime.ByteArray.prototype.slice = function(start, end) {
-};
-Runtime.prototype.byteArrayFromArray = function(array) {
-};
-Runtime.prototype.byteArrayFromString = function(string, encoding) {
-};
-Runtime.prototype.byteArrayToString = function(bytearray, encoding) {
-};
-Runtime.prototype.concatByteArrays = function(bytearray1, bytearray2) {
-};
-Runtime.prototype.read = function(path, offset, length, callback) {
-};
-Runtime.prototype.readFile = function(path, encoding, callback) {
-};
-Runtime.prototype.readFileSync = function(path, encoding) {
-};
-Runtime.prototype.loadXML = function(path, callback) {
-};
-Runtime.prototype.writeFile = function(path, data, callback) {
-};
-Runtime.prototype.isFile = function(path, callback) {
-};
-Runtime.prototype.getFileSize = function(path, callback) {
-};
-Runtime.prototype.deleteFile = function(path, callback) {
-};
-Runtime.prototype.log = function(msgOrCategory, msg) {
-};
-Runtime.prototype.setTimeout = function(callback, milliseconds) {
-};
-Runtime.prototype.libraryPaths = function() {
-};
-Runtime.prototype.type = function() {
-};
-Runtime.prototype.getDOMImplementation = function() {
-};
-Runtime.prototype.getWindow = function() {
-};
-var IS_COMPILED_CODE = false;
-Runtime.byteArrayToString = function(bytearray, encoding) {
-  function byteArrayToString(bytearray) {
-    var s = "", i, l = bytearray.length;
-    for(i = 0;i < l;i += 1) {
-      s += String.fromCharCode(bytearray[i] & 255)
-    }
-    return s
-  }
-  function utf8ByteArrayToString(bytearray) {
-    var s = "", i, l = bytearray.length, c0, c1, c2;
-    for(i = 0;i < l;i += 1) {
-      c0 = bytearray[i];
-      if(c0 < 128) {
-        s += String.fromCharCode(c0)
-      }else {
-        i += 1;
-        c1 = bytearray[i];
-        if(c0 < 224) {
-          s += String.fromCharCode((c0 & 31) << 6 | c1 & 63)
-        }else {
-          i += 1;
-          c2 = bytearray[i];
-          s += String.fromCharCode((c0 & 15) << 12 | (c1 & 63) << 6 | c2 & 63)
-        }
-      }
-    }
-    return s
-  }
-  var result;
-  if(encoding === "utf8") {
-    result = utf8ByteArrayToString(bytearray)
-  }else {
-    if(encoding !== "binary") {
-      this.log("Unsupported encoding: " + encoding)
-    }
-    result = byteArrayToString(bytearray)
-  }
-  return result
-};
-Runtime.getFunctionName = function getFunctionName(f) {
-  var m;
-  if(f.name === undefined) {
-    m = (new RegExp("function\\s+(\\w+)")).exec(f);
-    return m && m[1]
-  }
-  return f.name
-};
-function BrowserRuntime(logoutput) {
-  var self = this, cache = {}, useNativeArray = window.ArrayBuffer && window.Uint8Array;
-  this.ByteArray = useNativeArray ? function ByteArray(size) {
-    Uint8Array.prototype.slice = function(begin, end) {
-      if(end === undefined) {
-        if(begin === undefined) {
-          begin = 0
-        }
-        end = this.length
-      }
-      var view = this.subarray(begin, end), array, i;
-      end -= begin;
-      array = new Uint8Array(new ArrayBuffer(end));
-      for(i = 0;i < end;i += 1) {
-        array[i] = view[i]
-      }
-      return array
-    };
-    return new Uint8Array(new ArrayBuffer(size))
-  } : function ByteArray(size) {
-    var a = [];
-    a.length = size;
-    return a
-  };
-  this.concatByteArrays = useNativeArray ? function(bytearray1, bytearray2) {
-    var i, l1 = bytearray1.length, l2 = bytearray2.length, a = new this.ByteArray(l1 + l2);
-    for(i = 0;i < l1;i += 1) {
-      a[i] = bytearray1[i]
-    }
-    for(i = 0;i < l2;i += 1) {
-      a[i + l1] = bytearray2[i]
-    }
-    return a
-  } : function(bytearray1, bytearray2) {
-    return bytearray1.concat(bytearray2)
-  };
-  function utf8ByteArrayFromString(string) {
-    var l = string.length, bytearray, i, n, j = 0;
-    for(i = 0;i < l;i += 1) {
-      n = string.charCodeAt(i);
-      j += 1 + (n > 128) + (n > 2048)
-    }
-    bytearray = new self.ByteArray(j);
-    j = 0;
-    for(i = 0;i < l;i += 1) {
-      n = string.charCodeAt(i);
-      if(n < 128) {
-        bytearray[j] = n;
-        j += 1
-      }else {
-        if(n < 2048) {
-          bytearray[j] = 192 | n >>> 6;
-          bytearray[j + 1] = 128 | n & 63;
-          j += 2
-        }else {
-          bytearray[j] = 224 | n >>> 12 & 15;
-          bytearray[j + 1] = 128 | n >>> 6 & 63;
-          bytearray[j + 2] = 128 | n & 63;
-          j += 3
-        }
-      }
-    }
-    return bytearray
-  }
-  function byteArrayFromString(string) {
-    var l = string.length, a = new self.ByteArray(l), i;
-    for(i = 0;i < l;i += 1) {
-      a[i] = string.charCodeAt(i) & 255
-    }
-    return a
-  }
-  this.byteArrayFromArray = function(array) {
-    return array.slice()
-  };
-  this.byteArrayFromString = function(string, encoding) {
-    var result;
-    if(encoding === "utf8") {
-      result = utf8ByteArrayFromString(string)
-    }else {
-      if(encoding !== "binary") {
-        self.log("unknown encoding: " + encoding)
-      }
-      result = byteArrayFromString(string)
-    }
-    return result
-  };
-  this.byteArrayToString = Runtime.byteArrayToString;
-  function log(msgOrCategory, msg) {
-    var node, doc, category;
-    if(msg) {
-      category = msgOrCategory
-    }else {
-      msg = msgOrCategory
-    }
-    if(logoutput) {
-      doc = logoutput.ownerDocument;
-      if(category) {
-        node = doc.createElement("span");
-        node.className = category;
-        node.appendChild(doc.createTextNode(category));
-        logoutput.appendChild(node);
-        logoutput.appendChild(doc.createTextNode(" "))
-      }
-      node = doc.createElement("span");
-      node.appendChild(doc.createTextNode(msg));
-      logoutput.appendChild(node);
-      logoutput.appendChild(doc.createElement("br"))
-    }else {
-      if(console) {
-        console.log(msg)
-      }
-    }
-  }
-  function readFile(path, encoding, callback) {
-    if(cache.hasOwnProperty(path)) {
-      callback(null, cache[path]);
-      return
-    }
-    var xhr = new XMLHttpRequest;
-    function handleResult() {
-      var data;
-      if(xhr.readyState === 4) {
-        if(xhr.status === 0 && !xhr.responseText) {
-          callback("File " + path + " is empty.")
-        }else {
-          if(xhr.status === 200 || xhr.status === 0) {
-            if(encoding === "binary") {
-              if(typeof VBArray !== "undefined") {
-                data = (new VBArray(xhr.responseBody)).toArray()
-              }else {
-                data = self.byteArrayFromString(xhr.responseText, "binary")
-              }
-            }else {
-              data = xhr.responseText
-            }
-            cache[path] = data;
-            callback(null, data)
-          }else {
-            callback(xhr.responseText || xhr.statusText)
-          }
-        }
-      }
-    }
-    xhr.open("GET", path, true);
-    xhr.onreadystatechange = handleResult;
-    if(xhr.overrideMimeType) {
-      if(encoding !== "binary") {
-        xhr.overrideMimeType("text/plain; charset=" + encoding)
-      }else {
-        xhr.overrideMimeType("text/plain; charset=x-user-defined")
-      }
-    }
-    try {
-      xhr.send(null)
-    }catch(e) {
-      callback(e.message)
-    }
-  }
-  function read(path, offset, length, callback) {
-    if(cache.hasOwnProperty(path)) {
-      callback(null, cache[path].slice(offset, offset + length));
-      return
-    }
-    var xhr = new XMLHttpRequest;
-    function handleResult() {
-      var data;
-      if(xhr.readyState === 4) {
-        if(xhr.status === 0 && !xhr.responseText) {
-          callback("File " + path + " is empty.")
-        }else {
-          if(xhr.status === 200 || xhr.status === 0) {
-            if(typeof VBArray !== "undefined") {
-              data = (new VBArray(xhr.responseBody)).toArray()
-            }else {
-              data = self.byteArrayFromString(xhr.responseText, "binary")
-            }
-            cache[path] = data;
-            callback(null, data.slice(offset, offset + length))
-          }else {
-            callback(xhr.responseText || xhr.statusText)
-          }
-        }
-      }
-    }
-    xhr.open("GET", path, true);
-    xhr.onreadystatechange = handleResult;
-    if(xhr.overrideMimeType) {
-      xhr.overrideMimeType("text/plain; charset=x-user-defined")
-    }
-    try {
-      xhr.send(null)
-    }catch(e) {
-      callback(e.message)
-    }
-  }
-  function readFileSync(path, encoding) {
-    var xhr = new XMLHttpRequest, result;
-    xhr.open("GET", path, false);
-    if(xhr.overrideMimeType) {
-      if(encoding !== "binary") {
-        xhr.overrideMimeType("text/plain; charset=" + encoding)
-      }else {
-        xhr.overrideMimeType("text/plain; charset=x-user-defined")
-      }
-    }
-    try {
-      xhr.send(null);
-      if(xhr.status === 200 || xhr.status === 0) {
-        result = xhr.responseText
-      }
-    }catch(e) {
-    }
-    return result
-  }
-  function writeFile(path, data, callback) {
-    cache[path] = data;
-    var xhr = new XMLHttpRequest;
-    function handleResult() {
-      if(xhr.readyState === 4) {
-        if(xhr.status === 0 && !xhr.responseText) {
-          callback("File " + path + " is empty.")
-        }else {
-          if(xhr.status >= 200 && xhr.status < 300 || xhr.status === 0) {
-            callback(null)
-          }else {
-            callback("Status " + String(xhr.status) + ": " + xhr.responseText || xhr.statusText)
-          }
-        }
-      }
-    }
-    xhr.open("PUT", path, true);
-    xhr.onreadystatechange = handleResult;
-    if(data.buffer && !xhr.sendAsBinary) {
-      data = data.buffer
-    }else {
-      data = self.byteArrayToString(data, "binary")
-    }
-    try {
-      if(xhr.sendAsBinary) {
-        xhr.sendAsBinary(data)
-      }else {
-        xhr.send(data)
-      }
-    }catch(e) {
-      self.log("HUH? " + e + " " + data);
-      callback(e.message)
-    }
-  }
-  function deleteFile(path, callback) {
-    var xhr = new XMLHttpRequest;
-    xhr.open("DELETE", path, true);
-    xhr.onreadystatechange = function() {
-      if(xhr.readyState === 4) {
-        if(xhr.status < 200 && xhr.status >= 300) {
-          callback(xhr.responseText)
-        }else {
-          callback(null)
-        }
-      }
-    };
-    xhr.send(null)
-  }
-  function loadXML(path, callback) {
-    var xhr = new XMLHttpRequest;
-    function handleResult() {
-      if(xhr.readyState === 4) {
-        if(xhr.status === 0 && !xhr.responseText) {
-          callback("File " + path + " is empty.")
-        }else {
-          if(xhr.status === 200 || xhr.status === 0) {
-            callback(null, xhr.responseXML)
-          }else {
-            callback(xhr.responseText)
-          }
-        }
-      }
-    }
-    xhr.open("GET", path, true);
-    if(xhr.overrideMimeType) {
-      xhr.overrideMimeType("text/xml")
-    }
-    xhr.onreadystatechange = handleResult;
-    try {
-      xhr.send(null)
-    }catch(e) {
-      callback(e.message)
-    }
-  }
-  function isFile(path, callback) {
-    self.getFileSize(path, function(size) {
-      callback(size !== -1)
-    })
-  }
-  function getFileSize(path, callback) {
-    var xhr = new XMLHttpRequest;
-    xhr.open("HEAD", path, true);
-    xhr.onreadystatechange = function() {
-      if(xhr.readyState !== 4) {
-        return
-      }
-      var cl = xhr.getResponseHeader("Content-Length");
-      if(cl) {
-        callback(parseInt(cl, 10))
-      }else {
-        callback(-1)
-      }
-    };
-    xhr.send(null)
-  }
-  function wrap(nativeFunction, nargs) {
-    if(!nativeFunction) {
-      return null
-    }
-    return function() {
-      cache = {};
-      var callback = arguments[nargs], args = Array.prototype.slice.call(arguments, 0, nargs), callbackname = "callback" + String(Math.random()).substring(2);
-      window[callbackname] = function() {
-        delete window[callbackname];
-        callback.apply(this, arguments)
-      };
-      args.push(callbackname);
-      nativeFunction.apply(this, args)
-    }
-  }
-  this.readFile = readFile;
-  this.read = read;
-  this.readFileSync = readFileSync;
-  this.writeFile = writeFile;
-  this.deleteFile = deleteFile;
-  this.loadXML = loadXML;
-  this.isFile = isFile;
-  this.getFileSize = getFileSize;
-  this.log = log;
-  this.setTimeout = function(f, msec) {
-    setTimeout(function() {
-      f()
-    }, msec)
-  };
-  this.libraryPaths = function() {
-    return["lib"]
-  };
-  this.setCurrentDirectory = function(dir) {
-  };
-  this.type = function() {
-    return"BrowserRuntime"
-  };
-  this.getDOMImplementation = function() {
-    return window.document.implementation
-  };
-  this.exit = function(exitCode) {
-    log("Calling exit with code " + String(exitCode) + ", but exit() is not implemented.")
-  };
-  this.getWindow = function() {
-    return window
-  }
-}
-function NodeJSRuntime() {
-  var self = this, fs = require("fs"), currentDirectory = "";
-  this.ByteArray = function(size) {
-    return new Buffer(size)
-  };
-  this.byteArrayFromArray = function(array) {
-    var ba = new Buffer(array.length), i, l = array.length;
-    for(i = 0;i < l;i += 1) {
-      ba[i] = array[i]
-    }
-    return ba
-  };
-  this.concatByteArrays = function(a, b) {
-    var ba = new Buffer(a.length + b.length);
-    a.copy(ba, 0, 0);
-    b.copy(ba, a.length, 0);
-    return ba
-  };
-  this.byteArrayFromString = function(string, encoding) {
-    return new Buffer(string, encoding)
-  };
-  this.byteArrayToString = function(bytearray, encoding) {
-    return bytearray.toString(encoding)
-  };
-  function isFile(path, callback) {
-    if(currentDirectory) {
-      path = currentDirectory + "/" + path
-    }
-    fs.stat(path, function(err, stats) {
-      callback(!err && stats.isFile())
-    })
-  }
-  function loadXML(path, callback) {
-    throw"Not implemented.";
-  }
-  this.readFile = function(path, encoding, callback) {
-    if(encoding !== "binary") {
-      fs.readFile(path, encoding, callback)
-    }else {
-      fs.readFile(path, null, callback)
-    }
-  };
-  this.writeFile = function(path, data, callback) {
-    fs.writeFile(path, data, "binary", function(err) {
-      callback(err || null)
-    })
-  };
-  this.deleteFile = fs.unlink;
-  this.read = function(path, offset, length, callback) {
-    if(currentDirectory) {
-      path = currentDirectory + "/" + path
-    }
-    fs.open(path, "r+", 666, function(err, fd) {
-      if(err) {
-        callback(err);
-        return
-      }
-      var buffer = new Buffer(length);
-      fs.read(fd, buffer, 0, length, offset, function(err, bytesRead) {
-        fs.close(fd);
-        callback(err, buffer)
-      })
-    })
-  };
-  this.readFileSync = function(path, encoding) {
-    if(!encoding) {
-      return""
-    }
-    return fs.readFileSync(path, encoding)
-  };
-  this.loadXML = loadXML;
-  this.isFile = isFile;
-  this.getFileSize = function(path, callback) {
-    if(currentDirectory) {
-      path = currentDirectory + "/" + path
-    }
-    fs.stat(path, function(err, stats) {
-      if(err) {
-        callback(-1)
-      }else {
-        callback(stats.size)
-      }
-    })
-  };
-  this.log = function(msg) {
-    process.stderr.write(msg + "\n")
-  };
-  this.setTimeout = function(f, msec) {
-    setTimeout(function() {
-      f()
-    }, msec)
-  };
-  this.libraryPaths = function() {
-    return[__dirname]
-  };
-  this.setCurrentDirectory = function(dir) {
-    currentDirectory = dir
-  };
-  this.currentDirectory = function() {
-    return currentDirectory
-  };
-  this.type = function() {
-    return"NodeJSRuntime"
-  };
-  this.getDOMImplementation = function() {
-    return null
-  };
-  this.exit = process.exit;
-  this.getWindow = function() {
-    return null
-  }
-}
-function RhinoRuntime() {
-  var self = this, dom = Packages.javax.xml.parsers.DocumentBuilderFactory.newInstance(), builder, entityresolver, currentDirectory = "";
-  dom.setValidating(false);
-  dom.setNamespaceAware(true);
-  dom.setExpandEntityReferences(false);
-  dom.setSchema(null);
-  entityresolver = Packages.org.xml.sax.EntityResolver({resolveEntity:function(publicId, systemId) {
-    var file, open = function(path) {
-      var reader = new Packages.java.io.FileReader(path), source = new Packages.org.xml.sax.InputSource(reader);
-      return source
-    };
-    file = systemId;
-    return open(file)
-  }});
-  builder = dom.newDocumentBuilder();
-  builder.setEntityResolver(entityresolver);
-  this.ByteArray = function ByteArray(size) {
-    return[size]
-  };
-  this.byteArrayFromArray = function(array) {
-    return array
-  };
-  this.byteArrayFromString = function(string, encoding) {
-    var a = [], i, l = string.length;
-    for(i = 0;i < l;i += 1) {
-      a[i] = string.charCodeAt(i) & 255
-    }
-    return a
-  };
-  this.byteArrayToString = Runtime.byteArrayToString;
-  this.concatByteArrays = function(bytearray1, bytearray2) {
-    return bytearray1.concat(bytearray2)
-  };
-  function loadXML(path, callback) {
-    var file = new Packages.java.io.File(path), document;
-    try {
-      document = builder.parse(file)
-    }catch(err) {
-      print(err);
-      callback(err);
-      return
-    }
-    callback(null, document)
-  }
-  function runtimeReadFile(path, encoding, callback) {
-    var file = new Packages.java.io.File(path), data, rhinoencoding = encoding === "binary" ? "latin1" : encoding;
-    if(!file.isFile()) {
-      callback(path + " is not a file.")
-    }else {
-      data = readFile(path, rhinoencoding);
-      if(encoding === "binary") {
-        data = self.byteArrayFromString(data, "binary")
-      }
-      callback(null, data)
-    }
-  }
-  function runtimeReadFileSync(path, encoding) {
-    var file = new Packages.java.io.File(path), data, i;
-    if(!file.isFile()) {
-      return null
-    }
-    if(encoding === "binary") {
-      encoding = "latin1"
-    }
-    return readFile(path, encoding)
-  }
-  function isFile(path, callback) {
-    if(currentDirectory) {
-      path = currentDirectory + "/" + path
-    }
-    var file = new Packages.java.io.File(path);
-    callback(file.isFile())
-  }
-  this.loadXML = loadXML;
-  this.readFile = runtimeReadFile;
-  this.writeFile = function(path, data, callback) {
-    var out = new Packages.java.io.FileOutputStream(path), i, l = data.length;
-    for(i = 0;i < l;i += 1) {
-      out.write(data[i])
-    }
-    out.close();
-    callback(null)
-  };
-  this.deleteFile = function(path, callback) {
-    var file = new Packages.java.io.File(path);
-    if(file["delete"]()) {
-      callback(null)
-    }else {
-      callback("Could not delete " + path)
-    }
-  };
-  this.read = function(path, offset, length, callback) {
-    if(currentDirectory) {
-      path = currentDirectory + "/" + path
-    }
-    var data = runtimeReadFileSync(path, "binary");
-    if(data) {
-      callback(null, this.byteArrayFromString(data.substring(offset, offset + length), "binary"))
-    }else {
-      callback("Cannot read " + path)
-    }
-  };
-  this.readFileSync = function(path, encoding) {
-    if(!encoding) {
-      return""
-    }
-    return readFile(path, encoding)
-  };
-  this.isFile = isFile;
-  this.getFileSize = function(path, callback) {
-    if(currentDirectory) {
-      path = currentDirectory + "/" + path
-    }
-    var file = new Packages.java.io.File(path);
-    callback(file.length())
-  };
-  this.log = print;
-  this.setTimeout = function(f, msec) {
-    f()
-  };
-  this.libraryPaths = function() {
-    return["lib"]
-  };
-  this.setCurrentDirectory = function(dir) {
-    currentDirectory = dir
-  };
-  this.currentDirectory = function() {
-    return currentDirectory
-  };
-  this.type = function() {
-    return"RhinoRuntime"
-  };
-  this.getDOMImplementation = function() {
-    return builder.getDOMImplementation()
-  };
-  this.exit = quit;
-  this.getWindow = function() {
-    return null
-  }
-}
-var runtime = function() {
-  var result;
-  if(typeof window !== "undefined") {
-    result = new BrowserRuntime(window.document.getElementById("logoutput"))
-  }else {
-    if(typeof require !== "undefined") {
-      result = new NodeJSRuntime
-    }else {
-      result = new RhinoRuntime
-    }
-  }
-  return result
-}();
-(function() {
-  var cache = {}, dircontents = {};
-  function getOrDefinePackage(packageNameComponents) {
-    var topname = packageNameComponents[0], i, pkg;
-    pkg = eval("if (typeof " + topname + " === 'undefined') {" + "eval('" + topname + " = {};');}" + topname);
-    for(i = 1;i < packageNameComponents.length - 1;i += 1) {
-      if(!pkg.hasOwnProperty(packageNameComponents[i])) {
-        pkg = pkg[packageNameComponents[i]] = {}
-      }
-    }
-    return pkg[packageNameComponents[packageNameComponents.length - 1]]
-  }
-  runtime.loadClass = function(classpath) {
-    if(IS_COMPILED_CODE) {
-      return
-    }
-    if(cache.hasOwnProperty(classpath)) {
-      return
-    }
-    var names = classpath.split("."), impl;
-    impl = getOrDefinePackage(names);
-    if(impl) {
-      cache[classpath] = true;
-      return
-    }
-    function getPathFromManifests(classpath) {
-      var path = classpath.replace(".", "/") + ".js", dirs = runtime.libraryPaths(), i, dir, code;
-      if(runtime.currentDirectory) {
-        dirs.push(runtime.currentDirectory())
-      }
-      for(i = 0;i < dirs.length;i += 1) {
-        dir = dirs[i];
-        if(!dircontents.hasOwnProperty(dir)) {
-          code = runtime.readFileSync(dirs[i] + "/manifest.js", "utf8");
-          if(code && code.length) {
-            try {
-              dircontents[dir] = eval(code)
-            }catch(e1) {
-              dircontents[dir] = null;
-              runtime.log("Cannot load manifest for " + dir + ".")
-            }
-          }else {
-            dircontents[dir] = null
-          }
-        }
-        code = null;
-        dir = dircontents[dir];
-        if(dir && dir.indexOf && dir.indexOf(path) !== -1) {
-          return dirs[i] + "/" + path
-        }
-      }
-      return null
-    }
-    function load(classpath) {
-      var code, path;
-      path = getPathFromManifests(classpath);
-      if(!path) {
-        throw classpath + " is not listed in any manifest.js.";
-      }
-      try {
-        code = runtime.readFileSync(path, "utf8")
-      }catch(e2) {
-        runtime.log("Error loading " + classpath + " " + e2);
-        throw e2;
-      }
-      if(code === undefined) {
-        throw"Cannot load class " + classpath;
-      }
-      try {
-        code = eval(classpath + " = eval(code);")
-      }catch(e4) {
-        runtime.log("Error loading " + classpath + " " + e4);
-        throw e4;
-      }
-      return code
-    }
-    impl = load(classpath);
-    if(!impl || Runtime.getFunctionName(impl) !== names[names.length - 1]) {
-      runtime.log("Loaded code is not for " + names[names.length - 1]);
-      throw"Loaded code is not for " + names[names.length - 1];
-    }
-    cache[classpath] = true
-  }
-})();
-(function(args) {
-  args = Array.prototype.slice.call(args);
-  function run(argv) {
-    if(!argv.length) {
-      return
-    }
-    var script = argv[0];
-    runtime.readFile(script, "utf8", function(err, code) {
-      var path = "", paths = runtime.libraryPaths();
-      if(script.indexOf("/") !== -1) {
-        path = script.substring(0, script.indexOf("/"))
-      }
-      runtime.setCurrentDirectory(path);
-      function run() {
-        var script, path, paths, args, argv, result;
-        result = eval(code);
-        if(result) {
-          runtime.exit(result)
-        }
-        return
-      }
-      if(err) {
-        runtime.log(err);
-        runtime.exit(1)
-      }else {
-        run.apply(null, argv)
-      }
-    })
-  }
-  if(runtime.type() === "NodeJSRuntime") {
-    run(process.argv.slice(2))
-  }else {
-    if(runtime.type() === "RhinoRuntime") {
-      run(args)
-    }else {
-      run(args.slice(1))
-    }
-  }
-})(typeof arguments !== "undefined" && arguments);
-core.Base64 = function() {
-  var b64chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/", b64charcodes = function() {
-    var a = [], i, codeA = "A".charCodeAt(0), codea = "a".charCodeAt(0), code0 = "0".charCodeAt(0);
-    for(i = 0;i < 26;i += 1) {
-      a.push(codeA + i)
-    }
-    for(i = 0;i < 26;i += 1) {
-      a.push(codea + i)
-    }
-    for(i = 0;i < 10;i += 1) {
-      a.push(code0 + i)
-    }
-    a.push("+".charCodeAt(0));
-    a.push("/".charCodeAt(0));
-    return a
-  }(), b64tab = function(bin) {
-    var t = {}, i, l;
-    for(i = 0, l = bin.length;i < l;i += 1) {
-      t[bin.charAt(i)] = i
-    }
-    return t
-  }(b64chars), convertUTF16StringToBase64, convertBase64ToUTF16String, btoa, atob;
-  function stringToArray(s) {
-    var a = [], i, l = s.length;
-    for(i = 0;i < l;i += 1) {
-      a[i] = s.charCodeAt(i) & 255
-    }
-    return a
-  }
-  function convertUTF8ArrayToBase64(bin) {
-    var n, b64 = "", i, l = bin.length - 2;
-    for(i = 0;i < l;i += 3) {
-      n = bin[i] << 16 | bin[i + 1] << 8 | bin[i + 2];
-      b64 += b64chars[n >>> 18];
-      b64 += b64chars[n >>> 12 & 63];
-      b64 += b64chars[n >>> 6 & 63];
-      b64 += b64chars[n & 63]
-    }
-    if(i === l + 1) {
-      n = bin[i] << 4;
-      b64 += b64chars[n >>> 6];
-      b64 += b64chars[n & 63];
-      b64 += "=="
-    }else {
-      if(i === l) {
-        n = bin[i] << 10 | bin[i + 1] << 2;
-        b64 += b64chars[n >>> 12];
-        b64 += b64chars[n >>> 6 & 63];
-        b64 += b64chars[n & 63];
-        b64 += "="
-      }
-    }
-    return b64
-  }
-  function convertBase64ToUTF8Array(b64) {
-    b64 = b64.replace(/[^A-Za-z0-9+\/]+/g, "");
-    var bin = [], padlen = b64.length % 4, i, l = b64.length, n;
-    for(i = 0;i < l;i += 4) {
-      n = (b64tab[b64.charAt(i)] || 0) << 18 | (b64tab[b64.charAt(i + 1)] || 0) << 12 | (b64tab[b64.charAt(i + 2)] || 0) << 6 | (b64tab[b64.charAt(i + 3)] || 0);
-      bin.push(n >> 16, n >> 8 & 255, n & 255)
-    }
-    bin.length -= [0, 0, 2, 1][padlen];
-    return bin
-  }
-  function convertUTF16ArrayToUTF8Array(uni) {
-    var bin = [], i, l = uni.length, n;
-    for(i = 0;i < l;i += 1) {
-      n = uni[i];
-      if(n < 128) {
-        bin.push(n)
-      }else {
-        if(n < 2048) {
-          bin.push(192 | n >>> 6, 128 | n & 63)
-        }else {
-          bin.push(224 | n >>> 12 & 15, 128 | n >>> 6 & 63, 128 | n & 63)
-        }
-      }
-    }
-    return bin
-  }
-  function convertUTF8ArrayToUTF16Array(bin) {
-    var uni = [], i, l = bin.length, c0, c1, c2;
-    for(i = 0;i < l;i += 1) {
-      c0 = bin[i];
-      if(c0 < 128) {
-        uni.push(c0)
-      }else {
-        i += 1;
-        c1 = bin[i];
-        if(c0 < 224) {
-          uni.push((c0 & 31) << 6 | c1 & 63)
-        }else {
-          i += 1;
-          c2 = bin[i];
-          uni.push((c0 & 15) << 12 | (c1 & 63) << 6 | c2 & 63)
-        }
-      }
-    }
-    return uni
-  }
-  function convertUTF8StringToBase64(bin) {
-    return convertUTF8ArrayToBase64(stringToArray(bin))
-  }
-  function convertBase64ToUTF8String(b64) {
-    return String.fromCharCode.apply(String, convertBase64ToUTF8Array(b64))
-  }
-  function convertUTF8StringToUTF16Array(bin) {
-    return convertUTF8ArrayToUTF16Array(stringToArray(bin))
-  }
-  function convertUTF8ArrayToUTF16String(bin) {
-    var b = convertUTF8ArrayToUTF16Array(bin), r = "", i = 0, chunksize = 45E3;
-    while(i < b.length) {
-      r += String.fromCharCode.apply(String, b.slice(i, i + chunksize));
-      i += chunksize
-    }
-    return r
-  }
-  function convertUTF8StringToUTF16String_internal(bin, i, end) {
-    var str = "", c0, c1, c2, j;
-    for(j = i;j < end;j += 1) {
-      c0 = bin.charCodeAt(j) & 255;
-      if(c0 < 128) {
-        str += String.fromCharCode(c0)
-      }else {
-        j += 1;
-        c1 = bin.charCodeAt(j) & 255;
-        if(c0 < 224) {
-          str += String.fromCharCode((c0 & 31) << 6 | c1 & 63)
-        }else {
-          j += 1;
-          c2 = bin.charCodeAt(j) & 255;
-          str += String.fromCharCode((c0 & 15) << 12 | (c1 & 63) << 6 | c2 & 63)
-        }
-      }
-    }
-    return str
-  }
-  function convertUTF8StringToUTF16String(bin, callback) {
-    var partsize = 1E5, numparts = bin.length / partsize, str = "", pos = 0;
-    if(bin.length < partsize) {
-      callback(convertUTF8StringToUTF16String_internal(bin, 0, bin.length), true);
-      return
-    }
-    if(typeof bin !== "string") {
-      bin = bin.slice()
-    }
-    function f() {
-      var end = pos + partsize;
-      if(end > bin.length) {
-        end = bin.length
-      }
-      str += convertUTF8StringToUTF16String_internal(bin, pos, end);
-      pos = end;
-      end = pos === bin.length;
-      if(callback(str, end) && !end) {
-        runtime.setTimeout(f, 0)
-      }
-    }
-    f()
-  }
-  function convertUTF16StringToUTF8Array(uni) {
-    return convertUTF16ArrayToUTF8Array(stringToArray(uni))
-  }
-  function convertUTF16ArrayToUTF8String(uni) {
-    return String.fromCharCode.apply(String, convertUTF16ArrayToUTF8Array(uni))
-  }
-  function convertUTF16StringToUTF8String(uni) {
-    return String.fromCharCode.apply(String, convertUTF16ArrayToUTF8Array(stringToArray(uni)))
-  }
-  btoa = runtime.getWindow() && runtime.getWindow().btoa;
-  if(btoa) {
-    convertUTF16StringToBase64 = function(uni) {
-      return btoa(convertUTF16StringToUTF8String(uni))
-    }
-  }else {
-    btoa = convertUTF8StringToBase64;
-    convertUTF16StringToBase64 = function(uni) {
-      return convertUTF8ArrayToBase64(convertUTF16StringToUTF8Array(uni))
-    }
-  }
-  atob = runtime.getWindow() && runtime.getWindow().atob;
-  if(atob) {
-    convertBase64ToUTF16String = function(b64) {
-      var b = atob(b64);
-      return convertUTF8StringToUTF16String_internal(b, 0, b.length)
-    }
-  }else {
-    atob = convertBase64ToUTF8String;
-    convertBase64ToUTF16String = function(b64) {
-      return convertUTF8ArrayToUTF16String(convertBase64ToUTF8Array(b64))
-    }
-  }
-  function Base64() {
-    this.convertUTF8ArrayToBase64 = convertUTF8ArrayToBase64;
-    this.convertByteArrayToBase64 = convertUTF8ArrayToBase64;
-    this.convertBase64ToUTF8Array = convertBase64ToUTF8Array;
-    this.convertBase64ToByteArray = convertBase64ToUTF8Array;
-    this.convertUTF16ArrayToUTF8Array = convertUTF16ArrayToUTF8Array;
-    this.convertUTF16ArrayToByteArray = convertUTF16ArrayToUTF8Array;
-    this.convertUTF8ArrayToUTF16Array = convertUTF8ArrayToUTF16Array;
-    this.convertByteArrayToUTF16Array = convertUTF8ArrayToUTF16Array;
-    this.convertUTF8StringToBase64 = convertUTF8StringToBase64;
-    this.convertBase64ToUTF8String = convertBase64ToUTF8String;
-    this.convertUTF8StringToUTF16Array = convertUTF8StringToUTF16Array;
-    this.convertUTF8ArrayToUTF16String = convertUTF8ArrayToUTF16String;
-    this.convertByteArrayToUTF16String = convertUTF8ArrayToUTF16String;
-    this.convertUTF8StringToUTF16String = convertUTF8StringToUTF16String;
-    this.convertUTF16StringToUTF8Array = convertUTF16StringToUTF8Array;
-    this.convertUTF16StringToByteArray = convertUTF16StringToUTF8Array;
-    this.convertUTF16ArrayToUTF8String = convertUTF16ArrayToUTF8String;
-    this.convertUTF16StringToUTF8String = convertUTF16StringToUTF8String;
-    this.convertUTF16StringToBase64 = convertUTF16StringToBase64;
-    this.convertBase64ToUTF16String = convertBase64ToUTF16String;
-    this.fromBase64 = convertBase64ToUTF8String;
-    this.toBase64 = convertUTF8StringToBase64;
-    this.atob = atob;
-    this.btoa = btoa;
-    this.utob = convertUTF16StringToUTF8String;
-    this.btou = convertUTF8StringToUTF16String;
-    this.encode = convertUTF16StringToBase64;
-    this.encodeURI = function(u) {
-      return convertUTF16StringToBase64(u).replace(/[+\/]/g, function(m0) {
-        return m0 === "+" ? "-" : "_"
-      }).replace(/\\=+$/, "")
-    };
-    this.decode = function(a) {
-      return convertBase64ToUTF16String(a.replace(/[\-_]/g, function(m0) {
-        return m0 === "-" ? "+" : "/"
-      }))
-    }
-  }
-  return Base64
-}();
-core.RawDeflate = function() {
-  var zip_WSIZE = 32768, zip_STORED_BLOCK = 0, zip_STATIC_TREES = 1, zip_DYN_TREES = 2, zip_DEFAULT_LEVEL = 6, zip_FULL_SEARCH = true, zip_INBUFSIZ = 32768, zip_INBUF_EXTRA = 64, zip_OUTBUFSIZ = 1024 * 8, zip_window_size = 2 * zip_WSIZE, zip_MIN_MATCH = 3, zip_MAX_MATCH = 258, zip_BITS = 16, zip_LIT_BUFSIZE = 8192, zip_HASH_BITS = 13, zip_DIST_BUFSIZE = zip_LIT_BUFSIZE, zip_HASH_SIZE = 1 << zip_HASH_BITS, zip_HASH_MASK = zip_HASH_SIZE - 1, zip_WMASK = zip_WSIZE - 1, zip_NIL = 0, zip_TOO_FAR = 4096, 
-  zip_MIN_LOOKAHEAD = zip_MAX_MATCH + zip_MIN_MATCH + 1, zip_MAX_DIST = zip_WSIZE - zip_MIN_LOOKAHEAD, zip_SMALLEST = 1, zip_MAX_BITS = 15, zip_MAX_BL_BITS = 7, zip_LENGTH_CODES = 29, zip_LITERALS = 256, zip_END_BLOCK = 256, zip_L_CODES = zip_LITERALS + 1 + zip_LENGTH_CODES, zip_D_CODES = 30, zip_BL_CODES = 19, zip_REP_3_6 = 16, zip_REPZ_3_10 = 17, zip_REPZ_11_138 = 18, zip_HEAP_SIZE = 2 * zip_L_CODES + 1, zip_H_SHIFT = parseInt((zip_HASH_BITS + zip_MIN_MATCH - 1) / zip_MIN_MATCH, 10), zip_free_queue, 
-  zip_qhead, zip_qtail, zip_initflag, zip_outbuf = null, zip_outcnt, zip_outoff, zip_complete, zip_window, zip_d_buf, zip_l_buf, zip_prev, zip_bi_buf, zip_bi_valid, zip_block_start, zip_ins_h, zip_hash_head, zip_prev_match, zip_match_available, zip_match_length, zip_prev_length, zip_strstart, zip_match_start, zip_eofile, zip_lookahead, zip_max_chain_length, zip_max_lazy_match, zip_compr_level, zip_good_match, zip_nice_match, zip_dyn_ltree, zip_dyn_dtree, zip_static_ltree, zip_static_dtree, zip_bl_tree, 
-  zip_l_desc, zip_d_desc, zip_bl_desc, zip_bl_count, zip_heap, zip_heap_len, zip_heap_max, zip_depth, zip_length_code, zip_dist_code, zip_base_length, zip_base_dist, zip_flag_buf, zip_last_lit, zip_last_dist, zip_last_flags, zip_flags, zip_flag_bit, zip_opt_len, zip_static_len, zip_deflate_data, zip_deflate_pos, zip_extra_lbits = [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5, 0], zip_extra_dbits = [0, 0, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 
-  9, 10, 10, 11, 11, 12, 12, 13, 13], zip_extra_blbits = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 3, 7], zip_bl_order = [16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15], zip_configuration_table;
-  if(zip_LIT_BUFSIZE > zip_INBUFSIZ) {
-    runtime.log("error: zip_INBUFSIZ is too small")
-  }
-  if(zip_WSIZE << 1 > 1 << zip_BITS) {
-    runtime.log("error: zip_WSIZE is too large")
-  }
-  if(zip_HASH_BITS > zip_BITS - 1) {
-    runtime.log("error: zip_HASH_BITS is too large")
-  }
-  if(zip_HASH_BITS < 8 || zip_MAX_MATCH !== 258) {
-    runtime.log("error: Code too clever")
-  }
-  function Zip_DeflateCT() {
-    this.fc = 0;
-    this.dl = 0
-  }
-  function Zip_DeflateTreeDesc() {
-    this.dyn_tree = null;
-    this.static_tree = null;
-    this.extra_bits = null;
-    this.extra_base = 0;
-    this.elems = 0;
-    this.max_length = 0;
-    this.max_code = 0
-  }
-  function Zip_DeflateConfiguration(a, b, c, d) {
-    this.good_length = a;
-    this.max_lazy = b;
-    this.nice_length = c;
-    this.max_chain = d
-  }
-  function Zip_DeflateBuffer() {
-    this.next = null;
-    this.len = 0;
-    this.ptr = [];
-    this.ptr.length = zip_OUTBUFSIZ;
-    this.off = 0
-  }
-  zip_configuration_table = [new Zip_DeflateConfiguration(0, 0, 0, 0), new Zip_DeflateConfiguration(4, 4, 8, 4), new Zip_DeflateConfiguration(4, 5, 16, 8), new Zip_DeflateConfiguration(4, 6, 32, 32), new Zip_DeflateConfiguration(4, 4, 16, 16), new Zip_DeflateConfiguration(8, 16, 32, 32), new Zip_DeflateConfiguration(8, 16, 128, 128), new Zip_DeflateConfiguration(8, 32, 128, 256), new Zip_DeflateConfiguration(32, 128, 258, 1024), new Zip_DeflateConfiguration(32, 258, 258, 4096)];
-  function zip_deflate_start(level) {
-    var i;
-    if(!level) {
-      level = zip_DEFAULT_LEVEL
-    }else {
-      if(level < 1) {
-        level = 1
-      }else {
-        if(level > 9) {
-          level = 9
-        }
-      }
-    }
-    zip_compr_level = level;
-    zip_initflag = false;
-    zip_eofile = false;
-    if(zip_outbuf !== null) {
-      return
-    }
-    zip_free_queue = zip_qhead = zip_qtail = null;
-    zip_outbuf = [];
-    zip_outbuf.length = zip_OUTBUFSIZ;
-    zip_window = [];
-    zip_window.length = zip_window_size;
-    zip_d_buf = [];
-    zip_d_buf.length = zip_DIST_BUFSIZE;
-    zip_l_buf = [];
-    zip_l_buf.length = zip_INBUFSIZ + zip_INBUF_EXTRA;
-    zip_prev = [];
-    zip_prev.length = 1 << zip_BITS;
-    zip_dyn_ltree = [];
-    zip_dyn_ltree.length = zip_HEAP_SIZE;
-    for(i = 0;i < zip_HEAP_SIZE;i++) {
-      zip_dyn_ltree[i] = new Zip_DeflateCT
-    }
-    zip_dyn_dtree = [];
-    zip_dyn_dtree.length = 2 * zip_D_CODES + 1;
-    for(i = 0;i < 2 * zip_D_CODES + 1;i++) {
-      zip_dyn_dtree[i] = new Zip_DeflateCT
-    }
-    zip_static_ltree = [];
-    zip_static_ltree.length = zip_L_CODES + 2;
-    for(i = 0;i < zip_L_CODES + 2;i++) {
-      zip_static_ltree[i] = new Zip_DeflateCT
-    }
-    zip_static_dtree = [];
-    zip_static_dtree.length = zip_D_CODES;
-    for(i = 0;i < zip_D_CODES;i++) {
-      zip_static_dtree[i] = new Zip_DeflateCT
-    }
-    zip_bl_tree = [];
-    zip_bl_tree.length = 2 * zip_BL_CODES + 1;
-    for(i = 0;i < 2 * zip_BL_CODES + 1;i++) {
-      zip_bl_tree[i] = new Zip_DeflateCT
-    }
-    zip_l_desc = new Zip_DeflateTreeDesc;
-    zip_d_desc = new Zip_DeflateTreeDesc;
-    zip_bl_desc = new Zip_DeflateTreeDesc;
-    zip_bl_count = [];
-    zip_bl_count.length = zip_MAX_BITS + 1;
-    zip_heap = [];
-    zip_heap.length = 2 * zip_L_CODES + 1;
-    zip_depth = [];
-    zip_depth.length = 2 * zip_L_CODES + 1;
-    zip_length_code = [];
-    zip_length_code.length = zip_MAX_MATCH - zip_MIN_MATCH + 1;
-    zip_dist_code = [];
-    zip_dist_code.length = 512;
-    zip_base_length = [];
-    zip_base_length.length = zip_LENGTH_CODES;
-    zip_base_dist = [];
-    zip_base_dist.length = zip_D_CODES;
-    zip_flag_buf = [];
-    zip_flag_buf.length = parseInt(zip_LIT_BUFSIZE / 8, 10)
-  }
-  var zip_deflate_end = function() {
-    zip_free_queue = zip_qhead = zip_qtail = null;
-    zip_outbuf = null;
-    zip_window = null;
-    zip_d_buf = null;
-    zip_l_buf = null;
-    zip_prev = null;
-    zip_dyn_ltree = null;
-    zip_dyn_dtree = null;
-    zip_static_ltree = null;
-    zip_static_dtree = null;
-    zip_bl_tree = null;
-    zip_l_desc = null;
-    zip_d_desc = null;
-    zip_bl_desc = null;
-    zip_bl_count = null;
-    zip_heap = null;
-    zip_depth = null;
-    zip_length_code = null;
-    zip_dist_code = null;
-    zip_base_length = null;
-    zip_base_dist = null;
-    zip_flag_buf = null
-  };
-  var zip_reuse_queue = function(p) {
-    p.next = zip_free_queue;
-    zip_free_queue = p
-  };
-  var zip_new_queue = function() {
-    var p;
-    if(zip_free_queue !== null) {
-      p = zip_free_queue;
-      zip_free_queue = zip_free_queue.next
-    }else {
-      p = new Zip_DeflateBuffer
-    }
-    p.next = null;
-    p.len = p.off = 0;
-    return p
-  };
-  var zip_head1 = function(i) {
-    return zip_prev[zip_WSIZE + i]
-  };
-  var zip_head2 = function(i, val) {
-    zip_prev[zip_WSIZE + i] = val;
-    return val
-  };
-  var zip_qoutbuf = function() {
-    var q, i;
-    if(zip_outcnt !== 0) {
-      q = zip_new_queue();
-      if(zip_qhead === null) {
-        zip_qhead = zip_qtail = q
-      }else {
-        zip_qtail = zip_qtail.next = q
-      }
-      q.len = zip_outcnt - zip_outoff;
-      for(i = 0;i < q.len;i++) {
-        q.ptr[i] = zip_outbuf[zip_outoff + i]
-      }
-      zip_outcnt = zip_outoff = 0
-    }
-  };
-  var zip_put_byte = function(c) {
-    zip_outbuf[zip_outoff + zip_outcnt++] = c;
-    if(zip_outoff + zip_outcnt === zip_OUTBUFSIZ) {
-      zip_qoutbuf()
-    }
-  };
-  var zip_put_short = function(w) {
-    w &= 65535;
-    if(zip_outoff + zip_outcnt < zip_OUTBUFSIZ - 2) {
-      zip_outbuf[zip_outoff + zip_outcnt++] = w & 255;
-      zip_outbuf[zip_outoff + zip_outcnt++] = w >>> 8
-    }else {
-      zip_put_byte(w & 255);
-      zip_put_byte(w >>> 8)
-    }
-  };
-  var zip_INSERT_STRING = function() {
-    zip_ins_h = (zip_ins_h << zip_H_SHIFT ^ zip_window[zip_strstart + zip_MIN_MATCH - 1] & 255) & zip_HASH_MASK;
-    zip_hash_head = zip_head1(zip_ins_h);
-    zip_prev[zip_strstart & zip_WMASK] = zip_hash_head;
-    zip_head2(zip_ins_h, zip_strstart)
-  };
-  var zip_Buf_size = 16;
-  var zip_send_bits = function(value, length) {
-    if(zip_bi_valid > zip_Buf_size - length) {
-      zip_bi_buf |= value << zip_bi_valid;
-      zip_put_short(zip_bi_buf);
-      zip_bi_buf = value >> zip_Buf_size - zip_bi_valid;
-      zip_bi_valid += length - zip_Buf_size
-    }else {
-      zip_bi_buf |= value << zip_bi_valid;
-      zip_bi_valid += length
-    }
-  };
-  var zip_SEND_CODE = function(c, tree) {
-    zip_send_bits(tree[c].fc, tree[c].dl)
-  };
-  var zip_D_CODE = function(dist) {
-    return(dist < 256 ? zip_dist_code[dist] : zip_dist_code[256 + (dist >> 7)]) & 255
-  };
-  var zip_SMALLER = function(tree, n, m) {
-    return tree[n].fc < tree[m].fc || tree[n].fc === tree[m].fc && zip_depth[n] <= zip_depth[m]
-  };
-  var zip_read_buff = function(buff, offset, n) {
-    var i;
-    for(i = 0;i < n && zip_deflate_pos < zip_deflate_data.length;i++) {
-      buff[offset + i] = zip_deflate_data.charCodeAt(zip_deflate_pos++) & 255
-    }
-    return i
-  };
-  var zip_fill_window = function() {
-    var n, m;
-    var more = zip_window_size - zip_lookahead - zip_strstart;
-    if(more === -1) {
-      more--
-    }else {
-      if(zip_strstart >= zip_WSIZE + zip_MAX_DIST) {
-        for(n = 0;n < zip_WSIZE;n++) {
-          zip_window[n] = zip_window[n + zip_WSIZE]
-        }
-        zip_match_start -= zip_WSIZE;
-        zip_strstart -= zip_WSIZE;
-        zip_block_start -= zip_WSIZE;
-        for(n = 0;n < zip_HASH_SIZE;n++) {
-          m = zip_head1(n);
-          zip_head2(n, m >= zip_WSIZE ? m - zip_WSIZE : zip_NIL)
-        }
-        for(n = 0;n < zip_WSIZE;n++) {
-          m = zip_prev[n];
-          zip_prev[n] = m >= zip_WSIZE ? m - zip_WSIZE : zip_NIL
-        }
-        more += zip_WSIZE
-      }
-    }
-    if(!zip_eofile) {
-      n = zip_read_buff(zip_window, zip_strstart + zip_lookahead, more);
-      if(n <= 0) {
-        zip_eofile = true
-      }else {
-        zip_lookahead += n
-      }
-    }
-  };
-  var zip_lm_init = function() {
-    var j;
-    for(j = 0;j < zip_HASH_SIZE;j++) {
-      zip_prev[zip_WSIZE + j] = 0
-    }
-    zip_max_lazy_match = zip_configuration_table[zip_compr_level].max_lazy;
-    zip_good_match = zip_configuration_table[zip_compr_level].good_length;
-    if(!zip_FULL_SEARCH) {
-      zip_nice_match = zip_configuration_table[zip_compr_level].nice_length
-    }
-    zip_max_chain_length = zip_configuration_table[zip_compr_level].max_chain;
-    zip_strstart = 0;
-    zip_block_start = 0;
-    zip_lookahead = zip_read_buff(zip_window, 0, 2 * zip_WSIZE);
-    if(zip_lookahead <= 0) {
-      zip_eofile = true;
-      zip_lookahead = 0;
-      return
-    }
-    zip_eofile = false;
-    while(zip_lookahead < zip_MIN_LOOKAHEAD && !zip_eofile) {
-      zip_fill_window()
-    }
-    zip_ins_h = 0;
-    for(j = 0;j < zip_MIN_MATCH - 1;j++) {
-      zip_ins_h = (zip_ins_h << zip_H_SHIFT ^ zip_window[j] & 255) & zip_HASH_MASK
-    }
-  };
-  var zip_longest_match = function(cur_match) {
-    var chain_length = zip_max_chain_length;
-    var scanp = zip_strstart;
-    var matchp;
-    var len;
-    var best_len = zip_prev_length;
-    var limit = zip_strstart > zip_MAX_DIST ? zip_strstart - zip_MAX_DIST : zip_NIL;
-    var strendp = zip_strstart + zip_MAX_MATCH;
-    var scan_end1 = zip_window[scanp + best_len - 1];
-    var scan_end = zip_window[scanp + best_len];
-    if(zip_prev_length >= zip_good_match) {
-      chain_length >>= 2
-    }
-    do {
-      matchp = cur_match;
-      if(zip_window[matchp + best_len] !== scan_end || zip_window[matchp + best_len - 1] !== scan_end1 || zip_window[matchp] !== zip_window[scanp] || zip_window[++matchp] !== zip_window[scanp + 1]) {
-        continue
-      }
-      scanp += 2;
-      matchp++;
-      do {
-        ++scanp
-      }while(zip_window[scanp] === zip_window[++matchp] && zip_window[++scanp] === zip_window[++matchp] && zip_window[++scanp] === zip_window[++matchp] && zip_window[++scanp] === zip_window[++matchp] && zip_window[++scanp] === zip_window[++matchp] && zip_window[++scanp] === zip_window[++matchp] && zip_window[++scanp] === zip_window[++matchp] && zip_window[++scanp] === zip_window[++matchp] && scanp < strendp);
-      len = zip_MAX_MATCH - (strendp - scanp);
-      scanp = strendp - zip_MAX_MATCH;
-      if(len > best_len) {
-        zip_match_start = cur_match;
-        best_len = len;
-        if(zip_FULL_SEARCH) {
-          if(len >= zip_MAX_MATCH) {
-            break
-          }
-        }else {
-          if(len >= zip_nice_match) {
-            break
-          }
-        }
-        scan_end1 = zip_window[scanp + best_len - 1];
-        scan_end = zip_window[scanp + best_len]
-      }
-    }while((cur_match = zip_prev[cur_match & zip_WMASK]) > limit && --chain_length !== 0);
-    return best_len
-  };
-  var zip_ct_tally = function(dist, lc) {
-    zip_l_buf[zip_last_lit++] = lc;
-    if(dist === 0) {
-      zip_dyn_ltree[lc].fc++
-    }else {
-      dist--;
-      zip_dyn_ltree[zip_length_code[lc] + zip_LITERALS + 1].fc++;
-      zip_dyn_dtree[zip_D_CODE(dist)].fc++;
-      zip_d_buf[zip_last_dist++] = dist;
-      zip_flags |= zip_flag_bit
-    }
-    zip_flag_bit <<= 1;
-    if((zip_last_lit & 7) === 0) {
-      zip_flag_buf[zip_last_flags++] = zip_flags;
-      zip_flags = 0;
-      zip_flag_bit = 1
-    }
-    if(zip_compr_level > 2 && (zip_last_lit & 4095) === 0) {
-      var out_length = zip_last_lit * 8;
-      var in_length = zip_strstart - zip_block_start;
-      var dcode;
-      for(dcode = 0;dcode < zip_D_CODES;dcode++) {
-        out_length += zip_dyn_dtree[dcode].fc * (5 + zip_extra_dbits[dcode])
-      }
-      out_length >>= 3;
-      if(zip_last_dist < parseInt(zip_last_lit / 2, 10) && out_length < parseInt(in_length / 2, 10)) {
-        return true
-      }
-    }
-    return zip_last_lit === zip_LIT_BUFSIZE - 1 || zip_last_dist === zip_DIST_BUFSIZE
-  };
-  var zip_pqdownheap = function(tree, k) {
-    var v = zip_heap[k];
-    var j = k << 1;
-    while(j <= zip_heap_len) {
-      if(j < zip_heap_len && zip_SMALLER(tree, zip_heap[j + 1], zip_heap[j])) {
-        j++
-      }
-      if(zip_SMALLER(tree, v, zip_heap[j])) {
-        break
-      }
-      zip_heap[k] = zip_heap[j];
-      k = j;
-      j <<= 1
-    }
-    zip_heap[k] = v
-  };
-  var zip_gen_bitlen = function(desc) {
-    var tree = desc.dyn_tree;
-    var extra = desc.extra_bits;
-    var base = desc.extra_base;
-    var max_code = desc.max_code;
-    var max_length = desc.max_length;
-    var stree = desc.static_tree;
-    var h;
-    var n, m;
-    var bits;
-    var xbits;
-    var f;
-    var overflow = 0;
-    for(bits = 0;bits <= zip_MAX_BITS;bits++) {
-      zip_bl_count[bits] = 0
-    }
-    tree[zip_heap[zip_heap_max]].dl = 0;
-    for(h = zip_heap_max + 1;h < zip_HEAP_SIZE;h++) {
-      n = zip_heap[h];
-      bits = tree[tree[n].dl].dl + 1;
-      if(bits > max_length) {
-        bits = max_length;
-        overflow++
-      }
-      tree[n].dl = bits;
-      if(n > max_code) {
-        continue
-      }
-      zip_bl_count[bits]++;
-      xbits = 0;
-      if(n >= base) {
-        xbits = extra[n - base]
-      }
-      f = tree[n].fc;
-      zip_opt_len += f * (bits + xbits);
-      if(stree !== null) {
-        zip_static_len += f * (stree[n].dl + xbits)
-      }
-    }
-    if(overflow === 0) {
-      return
-    }
-    do {
-      bits = max_length - 1;
-      while(zip_bl_count[bits] === 0) {
-        bits--
-      }
-      zip_bl_count[bits]--;
-      zip_bl_count[bits + 1] += 2;
-      zip_bl_count[max_length]--;
-      overflow -= 2
-    }while(overflow > 0);
-    for(bits = max_length;bits !== 0;bits--) {
-      n = zip_bl_count[bits];
-      while(n !== 0) {
-        m = zip_heap[--h];
-        if(m > max_code) {
-          continue
-        }
-        if(tree[m].dl !== bits) {
-          zip_opt_len += (bits - tree[m].dl) * tree[m].fc;
-          tree[m].fc = bits
-        }
-        n--
-      }
-    }
-  };
-  var zip_bi_reverse = function(code, len) {
-    var res = 0;
-    do {
-      res |= code & 1;
-      code >>= 1;
-      res <<= 1
-    }while(--len > 0);
-    return res >> 1
-  };
-  var zip_gen_codes = function(tree, max_code) {
-    var next_code = [];
-    next_code.length = zip_MAX_BITS + 1;
-    var code = 0;
-    var bits;
-    var n;
-    for(bits = 1;bits <= zip_MAX_BITS;bits++) {
-      code = code + zip_bl_count[bits - 1] << 1;
-      next_code[bits] = code
-    }
-    for(n = 0;n <= max_code;n++) {
-      var len = tree[n].dl;
-      if(len === 0) {
-        continue
-      }
-      tree[n].fc = zip_bi_reverse(next_code[len]++, len)
-    }
-  };
-  var zip_build_tree = function(desc) {
-    var tree = desc.dyn_tree;
-    var stree = desc.static_tree;
-    var elems = desc.elems;
-    var n, m;
-    var max_code = -1;
-    var node = elems;
-    zip_heap_len = 0;
-    zip_heap_max = zip_HEAP_SIZE;
-    for(n = 0;n < elems;n++) {
-      if(tree[n].fc !== 0) {
-        zip_heap[++zip_heap_len] = max_code = n;
-        zip_depth[n] = 0
-      }else {
-        tree[n].dl = 0
-      }
-    }
-    while(zip_heap_len < 2) {
-      var xnew = zip_heap[++zip_heap_len] = max_code < 2 ? ++max_code : 0;
-      tree[xnew].fc = 1;
-      zip_depth[xnew] = 0;
-      zip_opt_len--;
-      if(stree !== null) {
-        zip_static_len -= stree[xnew].dl
-      }
-    }
-    desc.max_code = max_code;
-    for(n = zip_heap_len >> 1;n >= 1;n--) {
-      zip_pqdownheap(tree, n)
-    }
-    do {
-      n = zip_heap[zip_SMALLEST];
-      zip_heap[zip_SMALLEST] = zip_heap[zip_heap_len--];
-      zip_pqdownheap(tree, zip_SMALLEST);
-      m = zip_heap[zip_SMALLEST];
-      zip_heap[--zip_heap_max] = n;
-      zip_heap[--zip_heap_max] = m;
-      tree[node].fc = tree[n].fc + tree[m].fc;
-      if(zip_depth[n] > zip_depth[m] + 1) {
-        zip_depth[node] = zip_depth[n]
-      }else {
-        zip_depth[node] = zip_depth[m] + 1
-      }
-      tree[n].dl = tree[m].dl = node;
-      zip_heap[zip_SMALLEST] = node++;
-      zip_pqdownheap(tree, zip_SMALLEST)
-    }while(zip_heap_len >= 2);
-    zip_heap[--zip_heap_max] = zip_heap[zip_SMALLEST];
-    zip_gen_bitlen(desc);
-    zip_gen_codes(tree, max_code)
-  };
-  var zip_scan_tree = function(tree, max_code) {
-    var n;
-    var prevlen = -1;
-    var curlen;
-    var nextlen = tree[0].dl;
-    var count = 0;
-    var max_count = 7;
-    var min_count = 4;
-    if(nextlen === 0) {
-      max_count = 138;
-      min_count = 3
-    }
-    tree[max_code + 1].dl = 65535;
-    for(n = 0;n <= max_code;n++) {
-      curlen = nextlen;
-      nextlen = tree[n + 1].dl;
-      if(++count < max_count && curlen === nextlen) {
-        continue
-      }else {
-        if(count < min_count) {
-          zip_bl_tree[curlen].fc += count
-        }else {
-          if(curlen !== 0) {
-            if(curlen !== prevlen) {
-              zip_bl_tree[curlen].fc++
-            }
-            zip_bl_tree[zip_REP_3_6].fc++
-          }else {
-            if(count <= 10) {
-              zip_bl_tree[zip_REPZ_3_10].fc++
-            }else {
-              zip_bl_tree[zip_REPZ_11_138].fc++
-            }
-          }
-        }
-      }
-      count = 0;
-      prevlen = curlen;
-      if(nextlen === 0) {
-        max_count = 138;
-        min_count = 3
-      }else {
-        if(curlen === nextlen) {
-          max_count = 6;
-          min_count = 3
-        }else {
-          max_count = 7;
-          min_count = 4
-        }
-      }
-    }
-  };
-  var zip_build_bl_tree = function() {
-    var max_blindex;
-    zip_scan_tree(zip_dyn_ltree, zip_l_desc.max_code);
-    zip_scan_tree(zip_dyn_dtree, zip_d_desc.max_code);
-    zip_build_tree(zip_bl_desc);
-    for(max_blindex = zip_BL_CODES - 1;max_blindex >= 3;max_blindex--) {
-      if(zip_bl_tree[zip_bl_order[max_blindex]].dl !== 0) {
-        break
-      }
-    }
-    zip_opt_len += 3 * (max_blindex + 1) + 5 + 5 + 4;
-    return max_blindex
-  };
-  var zip_bi_windup = function() {
-    if(zip_bi_valid > 8) {
-      zip_put_short(zip_bi_buf)
-    }else {
-      if(zip_bi_valid > 0) {
-        zip_put_byte(zip_bi_buf)
-      }
-    }
-    zip_bi_buf = 0;
-    zip_bi_valid = 0
-  };
-  var zip_compress_block = function(ltree, dtree) {
-    var dist;
-    var lc;
-    var lx = 0;
-    var dx = 0;
-    var fx = 0;
-    var flag = 0;
-    var code;
-    var extra;
-    if(zip_last_lit !== 0) {
-      do {
-        if((lx & 7) === 0) {
-          flag = zip_flag_buf[fx++]
-        }
-        lc = zip_l_buf[lx++] & 255;
-        if((flag & 1) === 0) {
-          zip_SEND_CODE(lc, ltree)
-        }else {
-          code = zip_length_code[lc];
-          zip_SEND_CODE(code + zip_LITERALS + 1, ltree);
-          extra = zip_extra_lbits[code];
-          if(extra !== 0) {
-            lc -= zip_base_length[code];
-            zip_send_bits(lc, extra)
-          }
-          dist = zip_d_buf[dx++];
-          code = zip_D_CODE(dist);
-          zip_SEND_CODE(code, dtree);
-          extra = zip_extra_dbits[code];
-          if(extra !== 0) {
-            dist -= zip_base_dist[code];
-            zip_send_bits(dist, extra)
-          }
-        }
-        flag >>= 1
-      }while(lx < zip_last_lit)
-    }
-    zip_SEND_CODE(zip_END_BLOCK, ltree)
-  };
-  var zip_send_tree = function(tree, max_code) {
-    var n;
-    var prevlen = -1;
-    var curlen;
-    var nextlen = tree[0].dl;
-    var count = 0;
-    var max_count = 7;
-    var min_count = 4;
-    if(nextlen === 0) {
-      max_count = 138;
-      min_count = 3
-    }
-    for(n = 0;n <= max_code;n++) {
-      curlen = nextlen;
-      nextlen = tree[n + 1].dl;
-      if(++count < max_count && curlen === nextlen) {
-        continue
-      }else {
-        if(count < min_count) {
-          do {
-            zip_SEND_CODE(curlen, zip_bl_tree)
-          }while(--count !== 0)
-        }else {
-          if(curlen !== 0) {
-            if(curlen !== prevlen) {
-              zip_SEND_CODE(curlen, zip_bl_tree);
-              count--
-            }
-            zip_SEND_CODE(zip_REP_3_6, zip_bl_tree);
-            zip_send_bits(count - 3, 2)
-          }else {
-            if(count <= 10) {
-              zip_SEND_CODE(zip_REPZ_3_10, zip_bl_tree);
-              zip_send_bits(count - 3, 3)
-            }else {
-              zip_SEND_CODE(zip_REPZ_11_138, zip_bl_tree);
-              zip_send_bits(count - 11, 7)
-            }
-          }
-        }
-      }
-      count = 0;
-      prevlen = curlen;
-      if(nextlen === 0) {
-        max_count = 138;
-        min_count = 3
-      }else {
-        if(curlen === nextlen) {
-          max_count = 6;
-          min_count = 3
-        }else {
-          max_count = 7;
-          min_count = 4
-        }
-      }
-    }
-  };
-  var zip_send_all_trees = function(lcodes, dcodes, blcodes) {
-    var rank;
-    zip_send_bits(lcodes - 257, 5);
-    zip_send_bits(dcodes - 1, 5);
-    zip_send_bits(blcodes - 4, 4);
-    for(rank = 0;rank < blcodes;rank++) {
-      zip_send_bits(zip_bl_tree[zip_bl_order[rank]].dl, 3)
-    }
-    zip_send_tree(zip_dyn_ltree, lcodes - 1);
-    zip_send_tree(zip_dyn_dtree, dcodes - 1)
-  };
-  var zip_init_block = function() {
-    var n;
-    for(n = 0;n < zip_L_CODES;n++) {
-      zip_dyn_ltree[n].fc = 0
-    }
-    for(n = 0;n < zip_D_CODES;n++) {
-      zip_dyn_dtree[n].fc = 0
-    }
-    for(n = 0;n < zip_BL_CODES;n++) {
-      zip_bl_tree[n].fc = 0
-    }
-    zip_dyn_ltree[zip_END_BLOCK].fc = 1;
-    zip_opt_len = zip_static_len = 0;
-    zip_last_lit = zip_last_dist = zip_last_flags = 0;
-    zip_flags = 0;
-    zip_flag_bit = 1
-  };
-  var zip_flush_block = function(eof) {
-    var opt_lenb, static_lenb;
-    var max_blindex;
-    var stored_len;
-    stored_len = zip_strstart - zip_block_start;
-    zip_flag_buf[zip_last_flags] = zip_flags;
-    zip_build_tree(zip_l_desc);
-    zip_build_tree(zip_d_desc);
-    max_blindex = zip_build_bl_tree();
-    opt_lenb = zip_opt_len + 3 + 7 >> 3;
-    static_lenb = zip_static_len + 3 + 7 >> 3;
-    if(static_lenb <= opt_lenb) {
-      opt_lenb = static_lenb
-    }
-    if(stored_len + 4 <= opt_lenb && zip_block_start >= 0) {
-      var i;
-      zip_send_bits((zip_STORED_BLOCK << 1) + eof, 3);
-      zip_bi_windup();
-      zip_put_short(stored_len);
-      zip_put_short(~stored_len);
-      for(i = 0;i < stored_len;i++) {
-        zip_put_byte(zip_window[zip_block_start + i])
-      }
-    }else {
-      if(static_lenb === opt_lenb) {
-        zip_send_bits((zip_STATIC_TREES << 1) + eof, 3);
-        zip_compress_block(zip_static_ltree, zip_static_dtree)
-      }else {
-        zip_send_bits((zip_DYN_TREES << 1) + eof, 3);
-        zip_send_all_trees(zip_l_desc.max_code + 1, zip_d_desc.max_code + 1, max_blindex + 1);
-        zip_compress_block(zip_dyn_ltree, zip_dyn_dtree)
-      }
-    }
-    zip_init_block();
-    if(eof !== 0) {
-      zip_bi_windup()
-    }
-  };
-  var zip_deflate_fast = function() {
-    while(zip_lookahead !== 0 && zip_qhead === null) {
-      var flush;
-      zip_INSERT_STRING();
-      if(zip_hash_head !== zip_NIL && zip_strstart - zip_hash_head <= zip_MAX_DIST) {
-        zip_match_length = zip_longest_match(zip_hash_head);
-        if(zip_match_length > zip_lookahead) {
-          zip_match_length = zip_lookahead
-        }
-      }
-      if(zip_match_length >= zip_MIN_MATCH) {
-        flush = zip_ct_tally(zip_strstart - zip_match_start, zip_match_length - zip_MIN_MATCH);
-        zip_lookahead -= zip_match_length;
-        if(zip_match_length <= zip_max_lazy_match) {
-          zip_match_length--;
-          do {
-            zip_strstart++;
-            zip_INSERT_STRING()
-          }while(--zip_match_length !== 0);
-          zip_strstart++
-        }else {
-          zip_strstart += zip_match_length;
-          zip_match_length = 0;
-          zip_ins_h = zip_window[zip_strstart] & 255;
-          zip_ins_h = (zip_ins_h << zip_H_SHIFT ^ zip_window[zip_strstart + 1] & 255) & zip_HASH_MASK
-        }
-      }else {
-        flush = zip_ct_tally(0, zip_window[zip_strstart] & 255);
-        zip_lookahead--;
-        zip_strstart++
-      }
-      if(flush) {
-        zip_flush_block(0);
-        zip_block_start = zip_strstart
-      }
-      while(zip_lookahead < zip_MIN_LOOKAHEAD && !zip_eofile) {
-        zip_fill_window()
-      }
-    }
-  };
-  var zip_deflate_better = function() {
-    while(zip_lookahead !== 0 && zip_qhead === null) {
-      zip_INSERT_STRING();
-      zip_prev_length = zip_match_length;
-      zip_prev_match = zip_match_start;
-      zip_match_length = zip_MIN_MATCH - 1;
-      if(zip_hash_head !== zip_NIL && zip_prev_length < zip_max_lazy_match && zip_strstart - zip_hash_head <= zip_MAX_DIST) {
-        zip_match_length = zip_longest_match(zip_hash_head);
-        if(zip_match_length > zip_lookahead) {
-          zip_match_length = zip_lookahead
-        }
-        if(zip_match_length === zip_MIN_MATCH && zip_strstart - zip_match_start > zip_TOO_FAR) {
-          zip_match_length--
-        }
-      }
-      if(zip_prev_length >= zip_MIN_MATCH && zip_match_length <= zip_prev_length) {
-        var flush;
-        flush = zip_ct_tally(zip_strstart - 1 - zip_prev_match, zip_prev_length - zip_MIN_MATCH);
-        zip_lookahead -= zip_prev_length - 1;
-        zip_prev_length -= 2;
-        do {
-          zip_strstart++;
-          zip_INSERT_STRING()
-        }while(--zip_prev_length !== 0);
-        zip_match_available = 0;
-        zip_match_length = zip_MIN_MATCH - 1;
-        zip_strstart++;
-        if(flush) {
-          zip_flush_block(0);
-          zip_block_start = zip_strstart
-        }
-      }else {
-        if(zip_match_available !== 0) {
-          if(zip_ct_tally(0, zip_window[zip_strstart - 1] & 255)) {
-            zip_flush_block(0);
-            zip_block_start = zip_strstart
-          }
-          zip_strstart++;
-          zip_lookahead--
-        }else {
-          zip_match_available = 1;
-          zip_strstart++;
-          zip_lookahead--
-        }
-      }
-      while(zip_lookahead < zip_MIN_LOOKAHEAD && !zip_eofile) {
-        zip_fill_window()
-      }
-    }
-  };
-  var zip_ct_init = function() {
-    var n;
-    var bits;
-    var length;
-    var code;
-    var dist;
-    if(zip_static_dtree[0].dl !== 0) {
-      return
-    }
-    zip_l_desc.dyn_tree = zip_dyn_ltree;
-    zip_l_desc.static_tree = zip_static_ltree;
-    zip_l_desc.extra_bits = zip_extra_lbits;
-    zip_l_desc.extra_base = zip_LITERALS + 1;
-    zip_l_desc.elems = zip_L_CODES;
-    zip_l_desc.max_length = zip_MAX_BITS;
-    zip_l_desc.max_code = 0;
-    zip_d_desc.dyn_tree = zip_dyn_dtree;
-    zip_d_desc.static_tree = zip_static_dtree;
-    zip_d_desc.extra_bits = zip_extra_dbits;
-    zip_d_desc.extra_base = 0;
-    zip_d_desc.elems = zip_D_CODES;
-    zip_d_desc.max_length = zip_MAX_BITS;
-    zip_d_desc.max_code = 0;
-    zip_bl_desc.dyn_tree = zip_bl_tree;
-    zip_bl_desc.static_tree = null;
-    zip_bl_desc.extra_bits = zip_extra_blbits;
-    zip_bl_desc.extra_base = 0;
-    zip_bl_desc.elems = zip_BL_CODES;
-    zip_bl_desc.max_length = zip_MAX_BL_BITS;
-    zip_bl_desc.max_code = 0;
-    length = 0;
-    for(code = 0;code < zip_LENGTH_CODES - 1;code++) {
-      zip_base_length[code] = length;
-      for(n = 0;n < 1 << zip_extra_lbits[code];n++) {
-        zip_length_code[length++] = code
-      }
-    }
-    zip_length_code[length - 1] = code;
-    dist = 0;
-    for(code = 0;code < 16;code++) {
-      zip_base_dist[code] = dist;
-      for(n = 0;n < 1 << zip_extra_dbits[code];n++) {
-        zip_dist_code[dist++] = code
-      }
-    }
-    dist >>= 7;
-    n = code;
-    for(code = n;code < zip_D_CODES;code++) {
-      zip_base_dist[code] = dist << 7;
-      for(n = 0;n < 1 << zip_extra_dbits[code] - 7;n++) {
-        zip_dist_code[256 + dist++] = code
-      }
-    }
-    for(bits = 0;bits <= zip_MAX_BITS;bits++) {
-      zip_bl_count[bits] = 0
-    }
-    n = 0;
-    while(n <= 143) {
-      zip_static_ltree[n++].dl = 8;
-      zip_bl_count[8]++
-    }
-    while(n <= 255) {
-      zip_static_ltree[n++].dl = 9;
-      zip_bl_count[9]++
-    }
-    while(n <= 279) {
-      zip_static_ltree[n++].dl = 7;
-      zip_bl_count[7]++
-    }
-    while(n <= 287) {
-      zip_static_ltree[n++].dl = 8;
-      zip_bl_count[8]++
-    }
-    zip_gen_codes(zip_static_ltree, zip_L_CODES + 1);
-    for(n = 0;n < zip_D_CODES;n++) {
-      zip_static_dtree[n].dl = 5;
-      zip_static_dtree[n].fc = zip_bi_reverse(n, 5)
-    }
-    zip_init_block()
-  };
-  var zip_init_deflate = function() {
-    if(zip_eofile) {
-      return
-    }
-    zip_bi_buf = 0;
-    zip_bi_valid = 0;
-    zip_ct_init();
-    zip_lm_init();
-    zip_qhead = null;
-    zip_outcnt = 0;
-    zip_outoff = 0;
-    if(zip_compr_level <= 3) {
-      zip_prev_length = zip_MIN_MATCH - 1;
-      zip_match_length = 0
-    }else {
-      zip_match_length = zip_MIN_MATCH - 1;
-      zip_match_available = 0
-    }
-    zip_complete = false
-  };
-  var zip_qcopy = function(buff, off, buff_size) {
-    var n, i, j;
-    n = 0;
-    while(zip_qhead !== null && n < buff_size) {
-      i = buff_size - n;
-      if(i > zip_qhead.len) {
-        i = zip_qhead.len
-      }
-      for(j = 0;j < i;j++) {
-        buff[off + n + j] = zip_qhead.ptr[zip_qhead.off + j]
-      }
-      zip_qhead.off += i;
-      zip_qhead.len -= i;
-      n += i;
-      if(zip_qhead.len === 0) {
-        var p;
-        p = zip_qhead;
-        zip_qhead = zip_qhead.next;
-        zip_reuse_queue(p)
-      }
-    }
-    if(n === buff_size) {
-      return n
-    }
-    if(zip_outoff < zip_outcnt) {
-      i = buff_size - n;
-      if(i > zip_outcnt - zip_outoff) {
-        i = zip_outcnt - zip_outoff
-      }
-      for(j = 0;j < i;j++) {
-        buff[off + n + j] = zip_outbuf[zip_outoff + j]
-      }
-      zip_outoff += i;
-      n += i;
-      if(zip_outcnt === zip_outoff) {
-        zip_outcnt = zip_outoff = 0
-      }
-    }
-    return n
-  };
-  var zip_deflate_internal = function(buff, off, buff_size) {
-    var n;
-    if(!zip_initflag) {
-      zip_init_deflate();
-      zip_initflag = true;
-      if(zip_lookahead === 0) {
-        zip_complete = true;
-        return 0
-      }
-    }
-    if((n = zip_qcopy(buff, off, buff_size)) === buff_size) {
-      return buff_size
-    }
-    if(zip_complete) {
-      return n
-    }
-    if(zip_compr_level <= 3) {
-      zip_deflate_fast()
-    }else {
-      zip_deflate_better()
-    }
-    if(zip_lookahead === 0) {
-      if(zip_match_available !== 0) {
-        zip_ct_tally(0, zip_window[zip_strstart - 1] & 255)
-      }
-      zip_flush_block(1);
-      zip_complete = true
-    }
-    return n + zip_qcopy(buff, n + off, buff_size - n)
-  };
-  var zip_deflate = function(str, level) {
-    var i, j;
-    zip_deflate_data = str;
-    zip_deflate_pos = 0;
-    if(typeof level === "undefined") {
-      level = zip_DEFAULT_LEVEL
-    }
-    zip_deflate_start(level);
-    var buff = new Array(1024);
-    var aout = [];
-    while((i = zip_deflate_internal(buff, 0, buff.length)) > 0) {
-      var cbuf = [];
-      cbuf.length = i;
-      for(j = 0;j < i;j++) {
-        cbuf[j] = String.fromCharCode(buff[j])
-      }
-      aout[aout.length] = cbuf.join("")
-    }
-    zip_deflate_data = null;
-    return aout.join("")
-  };
-  this.deflate = zip_deflate
-};
-core.ByteArray = function ByteArray(data) {
-  this.pos = 0;
-  this.data = data;
-  this.readUInt32LE = function() {
-    var data = this.data, pos = this.pos += 4;
-    return data[--pos] << 24 | data[--pos] << 16 | data[--pos] << 8 | data[--pos]
-  };
-  this.readUInt16LE = function() {
-    var data = this.data, pos = this.pos += 2;
-    return data[--pos] << 8 | data[--pos]
-  }
-};
-core.ByteArrayWriter = function ByteArrayWriter(encoding) {
-  var self = this, data = new runtime.ByteArray(0);
-  this.appendByteArrayWriter = function(writer) {
-    data = runtime.concatByteArrays(data, writer.getByteArray())
-  };
-  this.appendByteArray = function(array) {
-    data = runtime.concatByteArrays(data, array)
-  };
-  this.appendArray = function(array) {
-    data = runtime.concatByteArrays(data, runtime.byteArrayFromArray(array))
-  };
-  this.appendUInt16LE = function(value) {
-    self.appendArray([value & 255, value >> 8 & 255])
-  };
-  this.appendUInt32LE = function(value) {
-    self.appendArray([value & 255, value >> 8 & 255, value >> 16 & 255, value >> 24 & 255])
-  };
-  this.appendString = function(string) {
-    data = runtime.concatByteArrays(data, runtime.byteArrayFromString(string, encoding))
-  };
-  this.getLength = function() {
-    return data.length
-  };
-  this.getByteArray = function() {
-    return data
-  }
-};
-core.RawInflate = function RawInflate() {
-  var zip_WSIZE = 32768;
-  var zip_STORED_BLOCK = 0;
-  var zip_STATIC_TREES = 1;
-  var zip_DYN_TREES = 2;
-  var zip_lbits = 9;
-  var zip_dbits = 6;
-  var zip_INBUFSIZ = 32768;
-  var zip_INBUF_EXTRA = 64;
-  var zip_slide;
-  var zip_wp;
-  var zip_fixed_tl = null;
-  var zip_fixed_td;
-  var zip_fixed_bl, fixed_bd;
-  var zip_bit_buf;
-  var zip_bit_len;
-  var zip_method;
-  var zip_eof;
-  var zip_copy_leng;
-  var zip_copy_dist;
-  var zip_tl, zip_td;
-  var zip_bl, zip_bd;
-  var zip_inflate_data;
-  var zip_inflate_pos;
-  var zip_MASK_BITS = new Array(0, 1, 3, 7, 15, 31, 63, 127, 255, 511, 1023, 2047, 4095, 8191, 16383, 32767, 65535);
-  var zip_cplens = new Array(3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31, 35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0);
-  var zip_cplext = new Array(0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5, 0, 99, 99);
-  var zip_cpdist = new Array(1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193, 257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145, 8193, 12289, 16385, 24577);
-  var zip_cpdext = new Array(0, 0, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9, 10, 10, 11, 11, 12, 12, 13, 13);
-  var zip_border = new Array(16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15);
-  var zip_HuftList = function() {
-    this.next = null;
-    this.list = null
-  };
-  var zip_HuftNode = function() {
-    this.e = 0;
-    this.b = 0;
-    this.n = 0;
-    this.t = null
-  };
-  var zip_HuftBuild = function(b, n, s, d, e, mm) {
-    this.BMAX = 16;
-    this.N_MAX = 288;
-    this.status = 0;
-    this.root = null;
-    this.m = 0;
-    var a;
-    var c = new Array(this.BMAX + 1);
-    var el;
-    var f;
-    var g;
-    var h;
-    var i;
-    var j;
-    var k;
-    var lx = new Array(this.BMAX + 1);
-    var p;
-    var pidx;
-    var q;
-    var r = new zip_HuftNode;
-    var u = new Array(this.BMAX);
-    var v = new Array(this.N_MAX);
-    var w;
-    var x = new Array(this.BMAX + 1);
-    var xp;
-    var y;
-    var z;
-    var o;
-    var tail;
-    tail = this.root = null;
-    for(i = 0;i < c.length;i++) {
-      c[i] = 0
-    }
-    for(i = 0;i < lx.length;i++) {
-      lx[i] = 0
-    }
-    for(i = 0;i < u.length;i++) {
-      u[i] = null
-    }
-    for(i = 0;i < v.length;i++) {
-      v[i] = 0
-    }
-    for(i = 0;i < x.length;i++) {
-      x[i] = 0
-    }
-    el = n > 256 ? b[256] : this.BMAX;
-    p = b;
-    pidx = 0;
-    i = n;
-    do {
-      c[p[pidx]]++;
-      pidx++
-    }while(--i > 0);
-    if(c[0] == n) {
-      this.root = null;
-      this.m = 0;
-      this.status = 0;
-      return
-    }
-    for(j = 1;j <= this.BMAX;j++) {
-      if(c[j] != 0) {
-        break
-      }
-    }
-    k = j;
-    if(mm < j) {
-      mm = j
-    }
-    for(i = this.BMAX;i != 0;i--) {
-      if(c[i] != 0) {
-        break
-      }
-    }
-    g = i;
-    if(mm > i) {
-      mm = i
-    }
-    for(y = 1 << j;j < i;j++, y <<= 1) {
-      if((y -= c[j]) < 0) {
-        this.status = 2;
-        this.m = mm;
-        return
-      }
-    }
-    if((y -= c[i]) < 0) {
-      this.status = 2;
-      this.m = mm;
-      return
-    }
-    c[i] += y;
-    x[1] = j = 0;
-    p = c;
-    pidx = 1;
-    xp = 2;
-    while(--i > 0) {
-      x[xp++] = j += p[pidx++]
-    }
-    p = b;
-    pidx = 0;
-    i = 0;
-    do {
-      if((j = p[pidx++]) != 0) {
-        v[x[j]++] = i
-      }
-    }while(++i < n);
-    n = x[g];
-    x[0] = i = 0;
-    p = v;
-    pidx = 0;
-    h = -1;
-    w = lx[0] = 0;
-    q = null;
-    z = 0;
-    for(;k <= g;k++) {
-      a = c[k];
-      while(a-- > 0) {
-        while(k > w + lx[1 + h]) {
-          w += lx[1 + h];
-          h++;
-          z = (z = g - w) > mm ? mm : z;
-          if((f = 1 << (j = k - w)) > a + 1) {
-            f -= a + 1;
-            xp = k;
-            while(++j < z) {
-              if((f <<= 1) <= c[++xp]) {
-                break
-              }
-              f -= c[xp]
-            }
-          }
-          if(w + j > el && w < el) {
-            j = el - w
-          }
-          z = 1 << j;
-          lx[1 + h] = j;
-          q = new Array(z);
-          for(o = 0;o < z;o++) {
-            q[o] = new zip_HuftNode
-          }
-          if(tail == null) {
-            tail = this.root = new zip_HuftList
-          }else {
-            tail = tail.next = new zip_HuftList
-          }
-          tail.next = null;
-          tail.list = q;
-          u[h] = q;
-          if(h > 0) {
-            x[h] = i;
-            r.b = lx[h];
-            r.e = 16 + j;
-            r.t = q;
-            j = (i & (1 << w) - 1) >> w - lx[h];
-            u[h - 1][j].e = r.e;
-            u[h - 1][j].b = r.b;
-            u[h - 1][j].n = r.n;
-            u[h - 1][j].t = r.t
-          }
-        }
-        r.b = k - w;
-        if(pidx >= n) {
-          r.e = 99
-        }else {
-          if(p[pidx] < s) {
-            r.e = p[pidx] < 256 ? 16 : 15;
-            r.n = p[pidx++]
-          }else {
-            r.e = e[p[pidx] - s];
-            r.n = d[p[pidx++] - s]
-          }
-        }
-        f = 1 << k - w;
-        for(j = i >> w;j < z;j += f) {
-          q[j].e = r.e;
-          q[j].b = r.b;
-          q[j].n = r.n;
-          q[j].t = r.t
-        }
-        for(j = 1 << k - 1;(i & j) != 0;j >>= 1) {
-          i ^= j
-        }
-        i ^= j;
-        while((i & (1 << w) - 1) != x[h]) {
-          w -= lx[h];
-          h--
-        }
-      }
-    }
-    this.m = lx[1];
-    this.status = y != 0 && g != 1 ? 1 : 0
-  };
-  var zip_GET_BYTE = function() {
-    if(zip_inflate_data.length == zip_inflate_pos) {
-      return-1
-    }
-    return zip_inflate_data[zip_inflate_pos++]
-  };
-  var zip_NEEDBITS = function(n) {
-    while(zip_bit_len < n) {
-      zip_bit_buf |= zip_GET_BYTE() << zip_bit_len;
-      zip_bit_len += 8
-    }
-  };
-  var zip_GETBITS = function(n) {
-    return zip_bit_buf & zip_MASK_BITS[n]
-  };
-  var zip_DUMPBITS = function(n) {
-    zip_bit_buf >>= n;
-    zip_bit_len -= n
-  };
-  var zip_inflate_codes = function(buff, off, size) {
-    var e;
-    var t;
-    var n;
-    if(size == 0) {
-      return 0
-    }
-    n = 0;
-    for(;;) {
-      zip_NEEDBITS(zip_bl);
-      t = zip_tl.list[zip_GETBITS(zip_bl)];
-      e = t.e;
-      while(e > 16) {
-        if(e == 99) {
-          return-1
-        }
-        zip_DUMPBITS(t.b);
-        e -= 16;
-        zip_NEEDBITS(e);
-        t = t.t[zip_GETBITS(e)];
-        e = t.e
-      }
-      zip_DUMPBITS(t.b);
-      if(e == 16) {
-        zip_wp &= zip_WSIZE - 1;
-        buff[off + n++] = zip_slide[zip_wp++] = t.n;
-        if(n == size) {
-          return size
-        }
-        continue
-      }
-      if(e == 15) {
-        break
-      }
-      zip_NEEDBITS(e);
-      zip_copy_leng = t.n + zip_GETBITS(e);
-      zip_DUMPBITS(e);
-      zip_NEEDBITS(zip_bd);
-      t = zip_td.list[zip_GETBITS(zip_bd)];
-      e = t.e;
-      while(e > 16) {
-        if(e == 99) {
-          return-1
-        }
-        zip_DUMPBITS(t.b);
-        e -= 16;
-        zip_NEEDBITS(e);
-        t = t.t[zip_GETBITS(e)];
-        e = t.e
-      }
-      zip_DUMPBITS(t.b);
-      zip_NEEDBITS(e);
-      zip_copy_dist = zip_wp - t.n - zip_GETBITS(e);
-      zip_DUMPBITS(e);
-      while(zip_copy_leng > 0 && n < size) {
-        zip_copy_leng--;
-        zip_copy_dist &= zip_WSIZE - 1;
-        zip_wp &= zip_WSIZE - 1;
-        buff[off + n++] = zip_slide[zip_wp++] = zip_slide[zip_copy_dist++]
-      }
-      if(n == size) {
-        return size
-      }
-    }
-    zip_method = -1;
-    return n
-  };
-  var zip_inflate_stored = function(buff, off, size) {
-    var n;
-    n = zip_bit_len & 7;
-    zip_DUMPBITS(n);
-    zip_NEEDBITS(16);
-    n = zip_GETBITS(16);
-    zip_DUMPBITS(16);
-    zip_NEEDBITS(16);
-    if(n != (~zip_bit_buf & 65535)) {
-      return-1
-    }
-    zip_DUMPBITS(16);
-    zip_copy_leng = n;
-    n = 0;
-    while(zip_copy_leng > 0 && n < size) {
-      zip_copy_leng--;
-      zip_wp &= zip_WSIZE - 1;
-      zip_NEEDBITS(8);
-      buff[off + n++] = zip_slide[zip_wp++] = zip_GETBITS(8);
-      zip_DUMPBITS(8)
-    }
-    if(zip_copy_leng == 0) {
-      zip_method = -1
-    }
-    return n
-  };
-  var zip_fixed_bd;
-  var zip_inflate_fixed = function(buff, off, size) {
-    if(zip_fixed_tl == null) {
-      var i;
-      var l = new Array(288);
-      var h;
-      for(i = 0;i < 144;i++) {
-        l[i] = 8
-      }
-      for(;i < 256;i++) {
-        l[i] = 9
-      }
-      for(;i < 280;i++) {
-        l[i] = 7
-      }
-      for(;i < 288;i++) {
-        l[i] = 8
-      }
-      zip_fixed_bl = 7;
-      h = new zip_HuftBuild(l, 288, 257, zip_cplens, zip_cplext, zip_fixed_bl);
-      if(h.status != 0) {
-        alert("HufBuild error: " + h.status);
-        return-1
-      }
-      zip_fixed_tl = h.root;
-      zip_fixed_bl = h.m;
-      for(i = 0;i < 30;i++) {
-        l[i] = 5
-      }
-      zip_fixed_bd = 5;
-      h = new zip_HuftBuild(l, 30, 0, zip_cpdist, zip_cpdext, zip_fixed_bd);
-      if(h.status > 1) {
-        zip_fixed_tl = null;
-        alert("HufBuild error: " + h.status);
-        return-1
-      }
-      zip_fixed_td = h.root;
-      zip_fixed_bd = h.m
-    }
-    zip_tl = zip_fixed_tl;
-    zip_td = zip_fixed_td;
-    zip_bl = zip_fixed_bl;
-    zip_bd = zip_fixed_bd;
-    return zip_inflate_codes(buff, off, size)
-  };
-  var zip_inflate_dynamic = function(buff, off, size) {
-    var i;
-    var j;
-    var l;
-    var n;
-    var t;
-    var nb;
-    var nl;
-    var nd;
-    var ll = new Array(286 + 30);
-    var h;
-    for(i = 0;i < ll.length;i++) {
-      ll[i] = 0
-    }
-    zip_NEEDBITS(5);
-    nl = 257 + zip_GETBITS(5);
-    zip_DUMPBITS(5);
-    zip_NEEDBITS(5);
-    nd = 1 + zip_GETBITS(5);
-    zip_DUMPBITS(5);
-    zip_NEEDBITS(4);
-    nb = 4 + zip_GETBITS(4);
-    zip_DUMPBITS(4);
-    if(nl > 286 || nd > 30) {
-      return-1
-    }
-    for(j = 0;j < nb;j++) {
-      zip_NEEDBITS(3);
-      ll[zip_border[j]] = zip_GETBITS(3);
-      zip_DUMPBITS(3)
-    }
-    for(;j < 19;j++) {
-      ll[zip_border[j]] = 0
-    }
-    zip_bl = 7;
-    h = new zip_HuftBuild(ll, 19, 19, null, null, zip_bl);
-    if(h.status != 0) {
-      return-1
-    }
-    zip_tl = h.root;
-    zip_bl = h.m;
-    n = nl + nd;
-    i = l = 0;
-    while(i < n) {
-      zip_NEEDBITS(zip_bl);
-      t = zip_tl.list[zip_GETBITS(zip_bl)];
-      j = t.b;
-      zip_DUMPBITS(j);
-      j = t.n;
-      if(j < 16) {
-        ll[i++] = l = j
-      }else {
-        if(j == 16) {
-          zip_NEEDBITS(2);
-          j = 3 + zip_GETBITS(2);
-          zip_DUMPBITS(2);
-          if(i + j > n) {
-            return-1
-          }
-          while(j-- > 0) {
-            ll[i++] = l
-          }
-        }else {
-          if(j == 17) {
-            zip_NEEDBITS(3);
-            j = 3 + zip_GETBITS(3);
-            zip_DUMPBITS(3);
-            if(i + j > n) {
-              return-1
-            }
-            while(j-- > 0) {
-              ll[i++] = 0
-            }
-            l = 0
-          }else {
-            zip_NEEDBITS(7);
-            j = 11 + zip_GETBITS(7);
-            zip_DUMPBITS(7);
-            if(i + j > n) {
-              return-1
-            }
-            while(j-- > 0) {
-              ll[i++] = 0
-            }
-            l = 0
-          }
-        }
-      }
-    }
-    zip_bl = zip_lbits;
-    h = new zip_HuftBuild(ll, nl, 257, zip_cplens, zip_cplext, zip_bl);
-    if(zip_bl == 0) {
-      h.status = 1
-    }
-    if(h.status != 0) {
-      return-1
-    }
-    zip_tl = h.root;
-    zip_bl = h.m;
-    for(i = 0;i < nd;i++) {
-      ll[i] = ll[i + nl]
-    }
-    zip_bd = zip_dbits;
-    h = new zip_HuftBuild(ll, nd, 0, zip_cpdist, zip_cpdext, zip_bd);
-    zip_td = h.root;
-    zip_bd = h.m;
-    if(zip_bd == 0 && nl > 257) {
-      return-1
-    }
-    if(h.status != 0) {
-      return-1
-    }
-    return zip_inflate_codes(buff, off, size)
-  };
-  var zip_inflate_start = function() {
-    var i;
-    if(zip_slide == null) {
-      zip_slide = new Array(2 * zip_WSIZE)
-    }
-    zip_wp = 0;
-    zip_bit_buf = 0;
-    zip_bit_len = 0;
-    zip_method = -1;
-    zip_eof = false;
-    zip_copy_leng = zip_copy_dist = 0;
-    zip_tl = null
-  };
-  var zip_inflate_internal = function(buff, off, size) {
-    var n, i;
-    n = 0;
-    while(n < size) {
-      if(zip_eof && zip_method == -1) {
-        return n
-      }
-      if(zip_copy_leng > 0) {
-        if(zip_method != zip_STORED_BLOCK) {
-          while(zip_copy_leng > 0 && n < size) {
-            zip_copy_leng--;
-            zip_copy_dist &= zip_WSIZE - 1;
-            zip_wp &= zip_WSIZE - 1;
-            buff[off + n++] = zip_slide[zip_wp++] = zip_slide[zip_copy_dist++]
-          }
-        }else {
-          while(zip_copy_leng > 0 && n < size) {
-            zip_copy_leng--;
-            zip_wp &= zip_WSIZE - 1;
-            zip_NEEDBITS(8);
-            buff[off + n++] = zip_slide[zip_wp++] = zip_GETBITS(8);
-            zip_DUMPBITS(8)
-          }
-          if(zip_copy_leng == 0) {
-            zip_method = -1
-          }
-        }
-        if(n == size) {
-          return n
-        }
-      }
-      if(zip_method == -1) {
-        if(zip_eof) {
-          break
-        }
-        zip_NEEDBITS(1);
-        if(zip_GETBITS(1) != 0) {
-          zip_eof = true
-        }
-        zip_DUMPBITS(1);
-        zip_NEEDBITS(2);
-        zip_method = zip_GETBITS(2);
-        zip_DUMPBITS(2);
-        zip_tl = null;
-        zip_copy_leng = 0
-      }
-      switch(zip_method) {
-        case 0:
-          i = zip_inflate_stored(buff, off + n, size - n);
-          break;
-        case 1:
-          if(zip_tl != null) {
-            i = zip_inflate_codes(buff, off + n, size - n)
-          }else {
-            i = zip_inflate_fixed(buff, off + n, size - n)
-          }
-          break;
-        case 2:
-          if(zip_tl != null) {
-            i = zip_inflate_codes(buff, off + n, size - n)
-          }else {
-            i = zip_inflate_dynamic(buff, off + n, size - n)
-          }
-          break;
-        default:
-          i = -1;
-          break
-      }
-      if(i == -1) {
-        if(zip_eof) {
-          return 0
-        }
-        return-1
-      }
-      n += i
-    }
-    return n
-  };
-  var zip_inflate = function(data, size) {
-    var i, j;
-    zip_inflate_start();
-    zip_inflate_data = data;
-    zip_inflate_pos = 0;
-    var buff = new runtime.ByteArray(size);
-    zip_inflate_internal(buff, 0, size);
-    zip_inflate_data = null;
-    return buff
-  };
-  this.inflate = zip_inflate
-};
-core.Cursor = function Cursor(selection, document) {
-  var cursorns, cursorNode;
-  cursorns = "urn:webodf:names:cursor";
-  cursorNode = document.createElementNS(cursorns, "cursor");
-  function putCursorIntoTextNode(container, offset) {
-    var len, ref, textnode, parent;
-    parent = container.parentNode;
-    if(offset === 0) {
-      parent.insertBefore(cursorNode, container)
-    }else {
-      if(offset === container.length) {
-        parent.appendChild(cursorNode)
-      }else {
-        len = container.length;
-        ref = container.nextSibling;
-        textnode = document.createTextNode(container.substringData(offset, len));
-        container.deleteData(offset, len);
-        if(ref) {
-          parent.insertBefore(textnode, ref)
-        }else {
-          parent.appendChild(textnode)
-        }
-        parent.insertBefore(cursorNode, textnode)
-      }
-    }
-  }
-  function putCursorIntoContainer(container, offset) {
-    var node;
-    node = container.firstChild;
-    while(node && offset) {
-      node = node.nextSibling;
-      offset -= 1
-    }
-    container.insertBefore(cursorNode, node)
-  }
-  function getPotentialParentOrNode(parent, node) {
-    var n = node;
-    while(n && n !== parent) {
-      n = n.parentNode
-    }
-    return n || node
-  }
-  function removeCursorFromSelectionRange(range, cursorpos) {
-    var cursorParent, start, end;
-    cursorParent = cursorNode.parentNode;
-    start = getPotentialParentOrNode(cursorNode, range.startContainer);
-    end = getPotentialParentOrNode(cursorNode, range.endContainer);
-    if(start === cursorNode) {
-      range.setStart(cursorParent, cursorpos)
-    }else {
-      if(start === cursorParent && range.startOffset > cursorpos) {
-        range.setStart(cursorParent, range.startOffset - 1)
-      }
-    }
-    if(range.endContainer === cursorNode) {
-      range.setEnd(cursorParent, cursorpos)
-    }else {
-      if(range.endContainer === cursorParent && range.endOffset > cursorpos) {
-        range.setEnd(cursorParent, range.endOffset - 1)
-      }
-    }
-  }
-  function adaptRangeToMergedText(range, prev, textnodetomerge, cursorpos) {
-    var diff = prev.length - textnodetomerge.length;
-    if(range.startContainer === textnodetomerge) {
-      range.setStart(prev, diff + range.startOffset)
-    }else {
-      if(range.startContainer === prev.parentNode && range.startOffset === cursorpos) {
-        range.setStart(prev, diff)
-      }
-    }
-    if(range.endContainer === textnodetomerge) {
-      range.setEnd(prev, diff + range.endOffset)
-    }else {
-      if(range.endContainer === prev.parentNode && range.endOffset === cursorpos) {
-        range.setEnd(prev, diff)
-      }
-    }
-  }
-  function removeCursor() {
-    var i, cursorpos, node, textnodetoremove, range;
-    if(!cursorNode.parentNode) {
-      return
-    }
-    cursorpos = 0;
-    node = cursorNode.parentNode.firstChild;
-    while(node && node !== cursorNode) {
-      cursorpos += 1;
-      node = node.nextSibling
-    }
-    if(cursorNode.previousSibling && cursorNode.previousSibling.nodeType === 3 && cursorNode.nextSibling && cursorNode.nextSibling.nodeType === 3) {
-      textnodetoremove = cursorNode.nextSibling;
-      cursorNode.previousSibling.appendData(textnodetoremove.nodeValue)
-    }
-    for(i = 0;i < selection.rangeCount;i += 1) {
-      removeCursorFromSelectionRange(selection.getRangeAt(i), cursorpos)
-    }
-    if(textnodetoremove) {
-      for(i = 0;i < selection.rangeCount;i += 1) {
-        adaptRangeToMergedText(selection.getRangeAt(i), cursorNode.previousSibling, textnodetoremove, cursorpos)
-      }
-      textnodetoremove.parentNode.removeChild(textnodetoremove)
-    }
-    cursorNode.parentNode.removeChild(cursorNode)
-  }
-  function putCursor(container, offset) {
-    if(container.nodeType === 3) {
-      putCursorIntoTextNode(container, offset)
-    }else {
-      if(container.nodeType !== 9) {
-        putCursorIntoContainer(container, offset)
-      }
-    }
-  }
-  this.getNode = function() {
-    return cursorNode
-  };
-  this.updateToSelection = function() {
-    var range;
-    removeCursor();
-    if(selection.focusNode) {
-      putCursor(selection.focusNode, selection.focusOffset)
-    }
-  };
-  this.remove = function() {
-    removeCursor()
-  }
-};
-core.UnitTest = function UnitTest() {
-};
-core.UnitTest.prototype.setUp = function() {
-};
-core.UnitTest.prototype.tearDown = function() {
-};
-core.UnitTest.prototype.description = function() {
-};
-core.UnitTest.prototype.tests = function() {
-};
-core.UnitTest.prototype.asyncTests = function() {
-};
-core.UnitTestRunner = function UnitTestRunner() {
-  var failedTests = 0;
-  function debug(msg) {
-    runtime.log(msg)
-  }
-  function testFailed(msg) {
-    failedTests += 1;
-    runtime.log("fail", msg)
-  }
-  function testPassed(msg) {
-    runtime.log("pass", msg)
-  }
-  function areArraysEqual(a, b) {
-    var i;
-    try {
-      if(a.length !== b.length) {
-        return false
-      }
-      for(i = 0;i < a.length;i += 1) {
-        if(a[i] !== b[i]) {
-          return false
-        }
-      }
-    }catch(ex) {
-      return false
-    }
-    return true
-  }
-  function isResultCorrect(actual, expected) {
-    if(expected === 0) {
-      return actual === expected && 1 / actual === 1 / expected
-    }
-    if(actual === expected) {
-      return true
-    }
-    if(typeof expected === "number" && isNaN(expected)) {
-      return typeof actual === "number" && isNaN(actual)
-    }
-    if(Object.prototype.toString.call(expected) === Object.prototype.toString.call([])) {
-      return areArraysEqual(actual, expected)
-    }
-    return false
-  }
-  function stringify(v) {
-    if(v === 0 && 1 / v < 0) {
-      return"-0"
-    }
-    return String(v)
-  }
-  function shouldBe(t, a, b) {
-    if(typeof a !== "string" || typeof b !== "string") {
-      debug("WARN: shouldBe() expects string arguments")
-    }
-    var exception, av, bv;
-    try {
-      av = eval(a)
-    }catch(e) {
-      exception = e
-    }
-    bv = eval(b);
-    if(exception) {
-      testFailed(a + " should be " + bv + ". Threw exception " + exception)
-    }else {
-      if(isResultCorrect(av, bv)) {
-        testPassed(a + " is " + b)
-      }else {
-        if(typeof av === typeof bv) {
-          testFailed(a + " should be " + bv + ". Was " + stringify(av) + ".")
-        }else {
-          testFailed(a + " should be " + bv + " (of type " + typeof bv + "). Was " + av + " (of type " + typeof av + ").")
-        }
-      }
-    }
-  }
-  function shouldBeNonNull(t, a) {
-    var exception, av;
-    try {
-      av = eval(a)
-    }catch(e) {
-      exception = e
-    }
-    if(exception) {
-      testFailed(a + " should be non-null. Threw exception " + exception)
-    }else {
-      if(av !== null) {
-        testPassed(a + " is non-null.")
-      }else {
-        testFailed(a + " should be non-null. Was " + av)
-      }
-    }
-  }
-  function shouldBeNull(t, a) {
-    shouldBe(t, a, "null")
-  }
-  this.shouldBeNull = shouldBeNull;
-  this.shouldBeNonNull = shouldBeNonNull;
-  this.shouldBe = shouldBe;
-  this.countFailedTests = function() {
-    return failedTests
-  }
-};
-core.UnitTester = function UnitTester() {
-  var failedTests = 0, results = {};
-  this.runTests = function(TestClass, callback) {
-    var testName = Runtime.getFunctionName(TestClass), tname, runner = new core.UnitTestRunner, test = new TestClass(runner), testResults = {}, i, t, tests, lastFailCount;
-    if(testName.hasOwnProperty(results)) {
-      runtime.log("Test " + testName + " has already run.");
-      return
-    }
-    runtime.log("Running " + testName + ": " + test.description());
-    tests = test.tests();
-    for(i = 0;i < tests.length;i += 1) {
-      t = tests[i];
-      tname = Runtime.getFunctionName(t);
-      runtime.log("Running " + tname);
-      lastFailCount = runner.countFailedTests();
-      test.setUp();
-      t();
-      test.tearDown();
-      testResults[tname] = lastFailCount === runner.countFailedTests()
-    }
-    function runAsyncTests(todo) {
-      if(todo.length === 0) {
-        results[testName] = testResults;
-        failedTests += runner.countFailedTests();
-        callback();
-        return
-      }
-      t = todo[0];
-      var tname = Runtime.getFunctionName(t);
-      runtime.log("Running " + tname);
-      lastFailCount = runner.countFailedTests();
-      test.setUp();
-      t(function() {
-        test.tearDown();
-        testResults[tname] = lastFailCount === runner.countFailedTests();
-        runAsyncTests(todo.slice(1))
-      })
-    }
-    runAsyncTests(test.asyncTests())
-  };
-  this.countFailedTests = function() {
-    return failedTests
-  };
-  this.results = function() {
-    return results
-  }
-};
-core.PointWalker = function PointWalker(node) {
-  var currentNode = node, before = null, after = node && node.firstChild, root = node, pos = 0;
-  function getPosition(node) {
-    var p = -1, n = node;
-    while(n) {
-      n = n.previousSibling;
-      p += 1
-    }
-    return p
-  }
-  this.setPoint = function(node, position) {
-    currentNode = node;
-    pos = position;
-    if(currentNode.nodeType === 3) {
-      after = null;
-      before = null
-    }else {
-      after = currentNode.firstChild;
-      while(position) {
-        position -= 1;
-        after = after.nextSibling
-      }
-      if(after) {
-        before = after.previousSibling
-      }else {
-        before = currentNode.lastChild
-      }
-    }
-  };
-  this.stepForward = function() {
-    var len;
-    if(currentNode.nodeType === 3) {
-      if(typeof currentNode.nodeValue.length === "number") {
-        len = currentNode.nodeValue.length
-      }else {
-        len = currentNode.nodeValue.length()
-      }
-      if(pos < len) {
-        pos += 1;
-        return true
-      }
-    }
-    if(after) {
-      if(after.nodeType === 1) {
-        currentNode = after;
-        before = null;
-        after = currentNode.firstChild;
-        pos = 0
-      }else {
-        if(after.nodeType === 3) {
-          currentNode = after;
-          before = null;
-          after = null;
-          pos = 0
-        }else {
-          before = after;
-          after = after.nextSibling;
-          pos += 1
-        }
-      }
-      return true
-    }
-    if(currentNode !== root) {
-      before = currentNode;
-      after = before.nextSibling;
-      currentNode = currentNode.parentNode;
-      pos = getPosition(before) + 1;
-      return true
-    }
-    return false
-  };
-  this.stepBackward = function() {
-    if(currentNode.nodeType === 3) {
-      if(pos > 0) {
-        pos -= 1;
-        return true
-      }
-    }
-    if(before) {
-      if(before.nodeType === 1) {
-        currentNode = before;
-        before = currentNode.lastChild;
-        after = null;
-        pos = getPosition(before) + 1
-      }else {
-        if(before.nodeType === 3) {
-          currentNode = before;
-          before = null;
-          after = null;
-          if(typeof currentNode.nodeValue.length === "number") {
-            pos = currentNode.nodeValue.length
-          }else {
-            pos = currentNode.nodeValue.length()
-          }
-        }else {
-          after = before;
-          before = before.previousSibling;
-          pos -= 1
-        }
-      }
-      return true
-    }
-    if(currentNode !== root) {
-      after = currentNode;
-      before = after.previousSibling;
-      currentNode = currentNode.parentNode;
-      pos = getPosition(after);
-      return true
-    }
-    return false
-  };
-  this.node = function() {
-    return currentNode
-  };
-  this.position = function() {
-    return pos
-  };
-  this.precedingSibling = function() {
-    return before
-  };
-  this.followingSibling = function() {
-    return after
-  }
-};
-core.Async = function Async() {
-  this.forEach = function(items, f, callback) {
-    var i, l = items.length, itemsDone = 0;
-    function end(err) {
-      if(itemsDone !== l) {
-        if(err) {
-          itemsDone = l;
-          callback(err)
-        }else {
-          itemsDone += 1;
-          if(itemsDone === l) {
-            callback(null)
-          }
-        }
-      }
-    }
-    for(i = 0;i < l;i += 1) {
-      f(items[i], end)
-    }
-  }
-};
-runtime.loadClass("core.RawInflate");
-runtime.loadClass("core.ByteArray");
-runtime.loadClass("core.ByteArrayWriter");
-runtime.loadClass("core.Base64");
-core.Zip = function Zip(url, entriesReadCallback) {
-  var entries, filesize, nEntries, inflate = (new core.RawInflate).inflate, zip = this, base64 = new core.Base64;
-  function crc32(data) {
-    var table = [0, 1996959894, 3993919788, 2567524794, 124634137, 1886057615, 3915621685, 2657392035, 249268274, 2044508324, 3772115230, 2547177864, 162941995, 2125561021, 3887607047, 2428444049, 498536548, 1789927666, 4089016648, 2227061214, 450548861, 1843258603, 4107580753, 2211677639, 325883990, 1684777152, 4251122042, 2321926636, 335633487, 1661365465, 4195302755, 2366115317, 997073096, 1281953886, 3579855332, 2724688242, 1006888145, 1258607687, 3524101629, 2768942443, 901097722, 1119000684, 
-    3686517206, 2898065728, 853044451, 1172266101, 3705015759, 2882616665, 651767980, 1373503546, 3369554304, 3218104598, 565507253, 1454621731, 3485111705, 3099436303, 671266974, 1594198024, 3322730930, 2970347812, 795835527, 1483230225, 3244367275, 3060149565, 1994146192, 31158534, 2563907772, 4023717930, 1907459465, 112637215, 2680153253, 3904427059, 2013776290, 251722036, 2517215374, 3775830040, 2137656763, 141376813, 2439277719, 3865271297, 1802195444, 476864866, 2238001368, 4066508878, 1812370925, 
-    453092731, 2181625025, 4111451223, 1706088902, 314042704, 2344532202, 4240017532, 1658658271, 366619977, 2362670323, 4224994405, 1303535960, 984961486, 2747007092, 3569037538, 1256170817, 1037604311, 2765210733, 3554079995, 1131014506, 879679996, 2909243462, 3663771856, 1141124467, 855842277, 2852801631, 3708648649, 1342533948, 654459306, 3188396048, 3373015174, 1466479909, 544179635, 3110523913, 3462522015, 1591671054, 702138776, 2966460450, 3352799412, 1504918807, 783551873, 3082640443, 3233442989, 
-    3988292384, 2596254646, 62317068, 1957810842, 3939845945, 2647816111, 81470997, 1943803523, 3814918930, 2489596804, 225274430, 2053790376, 3826175755, 2466906013, 167816743, 2097651377, 4027552580, 2265490386, 503444072, 1762050814, 4150417245, 2154129355, 426522225, 1852507879, 4275313526, 2312317920, 282753626, 1742555852, 4189708143, 2394877945, 397917763, 1622183637, 3604390888, 2714866558, 953729732, 1340076626, 3518719985, 2797360999, 1068828381, 1219638859, 3624741850, 2936675148, 906185462, 
-    1090812512, 3747672003, 2825379669, 829329135, 1181335161, 3412177804, 3160834842, 628085408, 1382605366, 3423369109, 3138078467, 570562233, 1426400815, 3317316542, 2998733608, 733239954, 1555261956, 3268935591, 3050360625, 752459403, 1541320221, 2607071920, 3965973030, 1969922972, 40735498, 2617837225, 3943577151, 1913087877, 83908371, 2512341634, 3803740692, 2075208622, 213261112, 2463272603, 3855990285, 2094854071, 198958881, 2262029012, 4057260610, 1759359992, 534414190, 2176718541, 4139329115, 
-    1873836001, 414664567, 2282248934, 4279200368, 1711684554, 285281116, 2405801727, 4167216745, 1634467795, 376229701, 2685067896, 3608007406, 1308918612, 956543938, 2808555105, 3495958263, 1231636301, 1047427035, 2932959818, 3654703836, 1088359270, 936918E3, 2847714899, 3736837829, 1202900863, 817233897, 3183342108, 3401237130, 1404277552, 615818150, 3134207493, 3453421203, 1423857449, 601450431, 3009837614, 3294710456, 1567103746, 711928724, 3020668471, 3272380065, 1510334235, 755167117], crc = 
-    0, i, iTop = data.length, x = 0, y = 0;
-    crc = crc ^ -1;
-    for(i = 0;i < iTop;i += 1) {
-      y = (crc ^ data[i]) & 255;
-      x = table[y];
-      crc = crc >>> 8 ^ x
-    }
-    return crc ^ -1
-  }
-  function dosTime2Date(dostime) {
-    var year = (dostime >> 25 & 127) + 1980, month = (dostime >> 21 & 15) - 1, mday = dostime >> 16 & 31, hour = dostime >> 11 & 15, min = dostime >> 5 & 63, sec = (dostime & 31) << 1, d = new Date(year, month, mday, hour, min, sec);
-    return d
-  }
-  function date2DosTime(date) {
-    var y = date.getFullYear();
-    return y < 1980 ? 0 : y - 1980 << 25 | date.getMonth() + 1 << 21 | date.getDate() << 16 | date.getHours() << 11 | date.getMinutes() << 5 | date.getSeconds() >> 1
-  }
-  function ZipEntry(url, stream) {
-    var sig, namelen, extralen, commentlen, compressionMethod, compressedSize, uncompressedSize, offset, crc, entry = this;
-    function handleEntryData(data, callback) {
-      var stream = new core.ByteArray(data), sig = stream.readUInt32LE(), filenamelen, extralen;
-      if(sig !== 67324752) {
-        callback("File entry signature is wrong." + sig.toString() + " " + data.length.toString(), null);
-        return
-      }
-      stream.pos += 22;
-      filenamelen = stream.readUInt16LE();
-      extralen = stream.readUInt16LE();
-      stream.pos += filenamelen + extralen;
-      if(compressionMethod) {
-        data = data.slice(stream.pos, stream.pos + compressedSize);
-        if(compressedSize !== data.length) {
-          callback("The amount of compressed bytes read was " + data.length.toString() + " instead of " + compressedSize.toString() + " for " + entry.filename + " in " + url + ".", null);
-          return
-        }
-        data = inflate(data, uncompressedSize)
-      }else {
-        data = data.slice(stream.pos, stream.pos + uncompressedSize)
-      }
-      if(uncompressedSize !== data.length) {
-        callback("The amount of bytes read was " + data.length.toString() + " instead of " + uncompressedSize.toString() + " for " + entry.filename + " in " + url + ".", null);
-        return
-      }
-      entry.data = data;
-      callback(null, data)
-    }
-    function load(callback) {
-      if(entry.data !== undefined) {
-        callback(null, entry.data);
-        return
-      }
-      var size = compressedSize + 34 + namelen + extralen + 256;
-      if(size + offset > filesize) {
-        size = filesize - offset
-      }
-      runtime.read(url, offset, size, function(err, data) {
-        if(err) {
-          callback(err, data)
-        }else {
-          handleEntryData(data, callback)
-        }
-      })
-    }
-    this.load = load;
-    function set(filename, data, compressed, date) {
-      entry.filename = filename;
-      entry.data = data;
-      entry.compressed = compressed;
-      entry.date = date
-    }
-    this.set = set;
-    this.error = null;
-    if(!stream) {
-      return
-    }
-    sig = stream.readUInt32LE();
-    if(sig !== 33639248) {
-      this.error = "Central directory entry has wrong signature at position " + (stream.pos - 4).toString() + ' for file "' + url + '": ' + stream.data.length.toString();
-      return
-    }
-    stream.pos += 6;
-    compressionMethod = stream.readUInt16LE();
-    this.date = dosTime2Date(stream.readUInt32LE());
-    crc = stream.readUInt32LE();
-    compressedSize = stream.readUInt32LE();
-    uncompressedSize = stream.readUInt32LE();
-    namelen = stream.readUInt16LE();
-    extralen = stream.readUInt16LE();
-    commentlen = stream.readUInt16LE();
-    stream.pos += 8;
-    offset = stream.readUInt32LE();
-    this.filename = runtime.byteArrayToString(stream.data.slice(stream.pos, stream.pos + namelen), "utf8");
-    stream.pos += namelen + extralen + commentlen
-  }
-  function handleCentralDirectory(data, callback) {
-    var stream = new core.ByteArray(data), i, e;
-    entries = [];
-    for(i = 0;i < nEntries;i += 1) {
-      e = new ZipEntry(url, stream);
-      if(e.error) {
-        callback(e.error, zip);
-        return
-      }
-      entries[entries.length] = e
-    }
-    callback(null, zip)
-  }
-  function handleCentralDirectoryEnd(data, callback) {
-    if(data.length !== 22) {
-      callback("Central directory length should be 22.", zip);
-      return
-    }
-    var stream = new core.ByteArray(data), sig, disk, cddisk, diskNEntries, cdsSize, cdsOffset;
-    sig = stream.readUInt32LE();
-    if(sig !== 101010256) {
-      callback("Central directory signature is wrong: " + sig.toString(), zip);
-      return
-    }
-    disk = stream.readUInt16LE();
-    if(disk !== 0) {
-      callback("Zip files with non-zero disk numbers are not supported.", zip);
-      return
-    }
-    cddisk = stream.readUInt16LE();
-    if(cddisk !== 0) {
-      callback("Zip files with non-zero disk numbers are not supported.", zip);
-      return
-    }
-    diskNEntries = stream.readUInt16LE();
-    nEntries = stream.readUInt16LE();
-    if(diskNEntries !== nEntries) {
-      callback("Number of entries is inconsistent.", zip);
-      return
-    }
-    cdsSize = stream.readUInt32LE();
-    cdsOffset = stream.readUInt16LE();
-    cdsOffset = filesize - 22 - cdsSize;
-    runtime.read(url, cdsOffset, filesize - cdsOffset, function(err, data) {
-      handleCentralDirectory(data, callback)
-    })
-  }
-  function load(filename, callback) {
-    var entry = null, end = filesize, e, i;
-    for(i = 0;i < entries.length;i += 1) {
-      e = entries[i];
-      if(e.filename === filename) {
-        entry = e;
-        break
-      }
-    }
-    if(entry) {
-      if(entry.data) {
-        callback(null, entry.data)
-      }else {
-        entry.load(callback)
-      }
-    }else {
-      callback(filename + " not found.", null)
-    }
-  }
-  function loadAsString(filename, callback) {
-    load(filename, function(err, data) {
-      if(err) {
-        return callback(err, null)
-      }
-      data = runtime.byteArrayToString(data, "utf8");
-      callback(null, data)
-    })
-  }
-  function loadContentXmlAsFragments(filename, handler) {
-    loadAsString(filename, function(err, data) {
-      if(err) {
-        return handler.rootElementReady(err)
-      }
-      handler.rootElementReady(null, data, true)
-    })
-  }
-  function loadAsDataURL(filename, mimetype, callback) {
-    load(filename, function(err, data) {
-      if(err) {
-        return callback(err, null)
-      }
-      var p = data, chunksize = 45E3, i = 0, url;
-      if(!mimetype) {
-        if(p[1] === 80 && p[2] === 78 && p[3] === 71) {
-          mimetype = "image/png"
-        }else {
-          if(p[0] === 255 && p[1] === 216 && p[2] === 255) {
-            mimetype = "image/jpeg"
-          }else {
-            if(p[0] === 71 && p[1] === 73 && p[2] === 70) {
-              mimetype = "image/gif"
-            }else {
-              mimetype = ""
-            }
-          }
-        }
-      }
-      url = "data:" + mimetype + ";base64,";
-      while(i < data.length) {
-        url += base64.convertUTF8ArrayToBase64(p.slice(i, Math.min(i + chunksize, p.length)));
-        i += chunksize
-      }
-      callback(null, url)
-    })
-  }
-  function loadAsDOM(filename, callback) {
-    loadAsString(filename, function(err, xmldata) {
-      if(err) {
-        callback(err, null);
-        return
-      }
-      var parser = new DOMParser;
-      xmldata = parser.parseFromString(xmldata, "text/xml");
-      callback(null, xmldata)
-    })
-  }
-  function save(filename, data, compressed, date) {
-    var i, entry;
-    for(i = 0;i < entries.length;i += 1) {
-      entry = entries[i];
-      if(entry.filename === filename) {
-        entry.set(filename, data, compressed, date);
-        return
-      }
-    }
-    entry = new ZipEntry(url);
-    entry.set(filename, data, compressed, date);
-    entries.push(entry)
-  }
-  function writeEntry(entry) {
-    var data = new core.ByteArrayWriter("utf8"), length = 0;
-    data.appendArray([80, 75, 3, 4, 20, 0, 0, 0, 0, 0]);
-    if(entry.data) {
-      length = entry.data.length
-    }
-    data.appendUInt32LE(date2DosTime(entry.date));
-    data.appendUInt32LE(crc32(entry.data));
-    data.appendUInt32LE(length);
-    data.appendUInt32LE(length);
-    data.appendUInt16LE(entry.filename.length);
-    data.appendUInt16LE(0);
-    data.appendString(entry.filename);
-    if(entry.data) {
-      data.appendByteArray(entry.data)
-    }
-    return data
-  }
-  function writeCODEntry(entry, offset) {
-    var data = new core.ByteArrayWriter("utf8"), length = 0;
-    data.appendArray([80, 75, 1, 2, 20, 0, 20, 0, 0, 0, 0, 0]);
-    if(entry.data) {
-      length = entry.data.length
-    }
-    data.appendUInt32LE(date2DosTime(entry.date));
-    data.appendUInt32LE(crc32(entry.data));
-    data.appendUInt32LE(length);
-    data.appendUInt32LE(length);
-    data.appendUInt16LE(entry.filename.length);
-    data.appendArray([0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]);
-    data.appendUInt32LE(offset);
-    data.appendString(entry.filename);
-    return data
-  }
-  function loadAllEntries(position, callback) {
-    if(position === entries.length) {
-      callback(null);
-      return
-    }
-    var entry = entries[position];
-    if(entry.data !== undefined) {
-      loadAllEntries(position + 1, callback);
-      return
-    }
-    entry.load(function(err) {
-      if(err) {
-        callback(err);
-        return
-      }
-      loadAllEntries(position + 1, callback)
-    })
-  }
-  function write(callback) {
-    loadAllEntries(0, function(err) {
-      if(err) {
-        callback(err);
-        return
-      }
-      var data = new core.ByteArrayWriter("utf8"), i, e, codoffset, codsize, offsets = [0];
-      for(i = 0;i < entries.length;i += 1) {
-        data.appendByteArrayWriter(writeEntry(entries[i]));
-        offsets.push(data.getLength())
-      }
-      codoffset = data.getLength();
-      for(i = 0;i < entries.length;i += 1) {
-        e = entries[i];
-        data.appendByteArrayWriter(writeCODEntry(e, offsets[i]))
-      }
-      codsize = data.getLength() - codoffset;
-      data.appendArray([80, 75, 5, 6, 0, 0, 0, 0]);
-      data.appendUInt16LE(entries.length);
-      data.appendUInt16LE(entries.length);
-      data.appendUInt32LE(codsize);
-      data.appendUInt32LE(codoffset);
-      data.appendArray([0, 0]);
-      runtime.writeFile(url, data.getByteArray(), callback)
-    })
-  }
-  this.load = load;
-  this.save = save;
-  this.write = write;
-  this.loadContentXmlAsFragments = loadContentXmlAsFragments;
-  this.loadAsString = loadAsString;
-  this.loadAsDOM = loadAsDOM;
-  this.loadAsDataURL = loadAsDataURL;
-  this.getEntries = function() {
-    return entries.slice()
-  };
-  filesize = -1;
-  if(entriesReadCallback === null) {
-    entries = [];
-    return
-  }
-  runtime.getFileSize(url, function(size) {
-    filesize = size;
-    if(filesize < 0) {
-      entriesReadCallback("File '" + url + "' cannot be read.", zip)
-    }else {
-      runtime.read(url, filesize - 22, 22, function(err, data) {
-        if(err || entriesReadCallback === null) {
-          entriesReadCallback(err, zip)
-        }else {
-          handleCentralDirectoryEnd(data, entriesReadCallback)
-        }
-      })
-    }
-  })
-};
-xmldom.LSSerializerFilter = function LSSerializerFilter() {
-};
-if(typeof Object.create !== "function") {
-  Object["create"] = function(o) {
-    var F = function() {
-    };
-    F.prototype = o;
-    return new F
-  }
-}
-xmldom.LSSerializer = function LSSerializer() {
-  var self = this;
-  function serializeAttribute(prefix, attr) {
-    var s = prefix + attr.localName + '="' + attr.nodeValue + '"';
-    return s
-  }
-  function attributePrefix(nsmap, prefix, ns) {
-    if(nsmap.hasOwnProperty(ns)) {
-      return nsmap[ns] + ":"
-    }
-    if(nsmap[ns] !== prefix) {
-      nsmap[ns] = prefix
-    }
-    return prefix + ":"
-  }
-  function startNode(nsmap, node) {
-    var s = "", atts = node.attributes, length, i, attr, attstr = "", accept, prefix;
-    if(atts) {
-      if(nsmap[node.namespaceURI] !== node.prefix) {
-        nsmap[node.namespaceURI] = node.prefix
-      }
-      s += "<" + node.nodeName;
-      length = atts.length;
-      for(i = 0;i < length;i += 1) {
-        attr = atts.item(i);
-        if(attr.namespaceURI !== "http://www.w3.org/2000/xmlns/") {
-          accept = self.filter ? self.filter.acceptNode(attr) : 1;
-          if(accept === 1) {
-            if(attr.namespaceURI) {
-              prefix = attributePrefix(nsmap, attr.prefix, attr.namespaceURI)
-            }else {
-              prefix = ""
-            }
-            attstr += " " + serializeAttribute(prefix, attr)
-          }
-        }
-      }
-      for(i in nsmap) {
-        if(nsmap.hasOwnProperty(i)) {
-          prefix = nsmap[i];
-          if(!prefix) {
-            s += ' xmlns="' + i + '"'
-          }else {
-            if(prefix !== "xmlns") {
-              s += " xmlns:" + nsmap[i] + '="' + i + '"'
-            }
-          }
-        }
-      }
-      s += attstr + ">"
-    }
-    return s
-  }
-  function endNode(node) {
-    var s = "";
-    if(node.nodeType === 1) {
-      s += "</" + node.nodeName + ">"
-    }
-    return s
-  }
-  function serializeNode(parentnsmap, node) {
-    var s = "", nsmap = Object.create(parentnsmap), accept = self.filter ? self.filter.acceptNode(node) : 1, child;
-    if(accept === 1) {
-      s += startNode(nsmap, node)
-    }
-    if(accept === 1 || accept === 3) {
-      child = node.firstChild;
-      while(child) {
-        s += serializeNode(nsmap, child);
-        child = child.nextSibling
-      }
-      if(node.nodeValue) {
-        s += node.nodeValue
-      }
-    }
-    if(accept === 1) {
-      s += endNode(node)
-    }
-    return s
-  }
-  function invertMap(map) {
-    var m = {}, i;
-    for(i in map) {
-      if(map.hasOwnProperty(i)) {
-        m[map[i]] = i
-      }
-    }
-    return m
-  }
-  this.filter = null;
-  this.writeToString = function(node, nsmap) {
-    if(!node) {
-      return""
-    }
-    nsmap = nsmap ? invertMap(nsmap) : {};
-    return serializeNode(nsmap, node)
-  }
-};
-xmldom.RelaxNGParser = function RelaxNGParser() {
-  var self = this, rngns = "http://relaxng.org/ns/structure/1.0", xmlnsns = "http://www.w3.org/2000/xmlns/", start, nsmap = {"http://www.w3.org/XML/1998/namespace":"xml"}, parse;
-  function RelaxNGParseError(error, context) {
-    this.message = function() {
-      if(context) {
-        error += context.nodeType === 1 ? " Element " : " Node ";
-        error += context.nodeName;
-        if(context.nodeValue) {
-          error += " with value '" + context.nodeValue + "'"
-        }
-        error += "."
-      }
-      return error
-    }
-  }
-  function splitToDuos(e) {
-    if(e.e.length <= 2) {
-      return e
-    }
-    var o = {name:e.name, e:e.e.slice(0, 2)};
-    return splitToDuos({name:e.name, e:[o].concat(e.e.slice(2))})
-  }
-  function splitQName(name) {
-    var r = name.split(":", 2), prefix = "", i;
-    if(r.length === 1) {
-      r = ["", r[0]]
-    }else {
-      prefix = r[0]
-    }
-    for(i in nsmap) {
-      if(nsmap[i] === prefix) {
-        r[0] = i
-      }
-    }
-    return r
-  }
-  function splitQNames(def) {
-    var i, l = def.names ? def.names.length : 0, name, localnames = def.localnames = [l], namespaces = def.namespaces = [l];
-    for(i = 0;i < l;i += 1) {
-      name = splitQName(def.names[i]);
-      namespaces[i] = name[0];
-      localnames[i] = name[1]
-    }
-  }
-  function trim(str) {
-    str = str.replace(/^\s\s*/, "");
-    var ws = /\s/, i = str.length - 1;
-    while(ws.test(str.charAt(i))) {
-      i -= 1
-    }
-    return str.slice(0, i + 1)
-  }
-  function copyAttributes(atts, name, names) {
-    var a = {}, i, att;
-    for(i = 0;i < atts.length;i += 1) {
-      att = atts.item(i);
-      if(!att.namespaceURI) {
-        if(att.localName === "name" && (name === "element" || name === "attribute")) {
-          names.push(att.value)
-        }
-        if(att.localName === "name" || att.localName === "combine" || att.localName === "type") {
-          att.value = trim(att.value)
-        }
-        a[att.localName] = att.value
-      }else {
-        if(att.namespaceURI === xmlnsns) {
-          nsmap[att.value] = att.localName
-        }
-      }
-    }
-    return a
-  }
-  function parseChildren(c, e, elements, names) {
-    var text = "", ce;
-    while(c) {
-      if(c.nodeType === 1 && c.namespaceURI === rngns) {
-        ce = parse(c, elements, e);
-        if(ce) {
-          if(ce.name === "name") {
-            names.push(nsmap[ce.a.ns] + ":" + ce.text);
-            e.push(ce)
-          }else {
-            if(ce.name === "choice" && ce.names && ce.names.length) {
-              names = names.concat(ce.names);
-              delete ce.names;
-              e.push(ce)
-            }else {
-              e.push(ce)
-            }
-          }
-        }
-      }else {
-        if(c.nodeType === 3) {
-          text += c.nodeValue
-        }
-      }
-      c = c.nextSibling
-    }
-    return text
-  }
-  function combineDefines(combine, name, e, siblings) {
-    var i, ce;
-    for(i = 0;siblings && i < siblings.length;i += 1) {
-      ce = siblings[i];
-      if(ce.name === "define" && ce.a && ce.a.name === name) {
-        ce.e = [{name:combine, e:ce.e.concat(e)}];
-        return ce
-      }
-    }
-    return null
-  }
-  parse = function parse(element, elements, siblings) {
-    var e = [], a, ce, i, text, name = element.localName, names = [];
-    a = copyAttributes(element.attributes, name, names);
-    a.combine = a.combine || undefined;
-    text = parseChildren(element.firstChild, e, elements, names);
-    if(name !== "value" && name !== "param") {
-      text = /^\s*([\s\S]*\S)?\s*$/.exec(text)[1]
-    }
-    if(name === "value" && a.type === undefined) {
-      a.type = "token";
-      a.datatypeLibrary = ""
-    }
-    if((name === "attribute" || name === "element") && a.name !== undefined) {
-      i = splitQName(a.name);
-      e = [{name:"name", text:i[1], a:{ns:i[0]}}].concat(e);
-      delete a.name
-    }
-    if(name === "name" || name === "nsName" || name === "value") {
-      if(a.ns === undefined) {
-        a.ns = ""
-      }
-    }else {
-      delete a.ns
-    }
-    if(name === "name") {
-      i = splitQName(text);
-      a.ns = i[0];
-      text = i[1]
-    }
-    if(e.length > 1 && (name === "define" || name === "oneOrMore" || name === "zeroOrMore" || name === "optional" || name === "list" || name === "mixed")) {
-      e = [{name:"group", e:splitToDuos({name:"group", e:e}).e}]
-    }
-    if(e.length > 2 && name === "element") {
-      e = [e[0]].concat({name:"group", e:splitToDuos({name:"group", e:e.slice(1)}).e})
-    }
-    if(e.length === 1 && name === "attribute") {
-      e.push({name:"text", text:text})
-    }
-    if(e.length === 1 && (name === "choice" || name === "group" || name === "interleave")) {
-      name = e[0].name;
-      names = e[0].names;
-      a = e[0].a;
-      text = e[0].text;
-      e = e[0].e
-    }else {
-      if(e.length > 2 && (name === "choice" || name === "group" || name === "interleave")) {
-        e = splitToDuos({name:name, e:e}).e
-      }
-    }
-    if(name === "mixed") {
-      name = "interleave";
-      e = [e[0], {name:"text"}]
-    }
-    if(name === "optional") {
-      name = "choice";
-      e = [e[0], {name:"empty"}]
-    }
-    if(name === "zeroOrMore") {
-      name = "choice";
-      e = [{name:"oneOrMore", e:[e[0]]}, {name:"empty"}]
-    }
-    if(name === "define" && a.combine) {
-      ce = combineDefines(a.combine, a.name, e, siblings);
-      if(ce) {
-        return
-      }
-    }
-    ce = {name:name};
-    if(e && e.length > 0) {
-      ce.e = e
-    }
-    for(i in a) {
-      if(a.hasOwnProperty(i)) {
-        ce.a = a;
-        break
-      }
-    }
-    if(text !== undefined) {
-      ce.text = text
-    }
-    if(names && names.length > 0) {
-      ce.names = names
-    }
-    if(name === "element") {
-      ce.id = elements.length;
-      elements.push(ce);
-      ce = {name:"elementref", id:ce.id}
-    }
-    return ce
-  };
-  function resolveDefines(def, defines) {
-    var i = 0, e, defs, end, name = def.name;
-    while(def.e && i < def.e.length) {
-      e = def.e[i];
-      if(e.name === "ref") {
-        defs = defines[e.a.name];
-        if(!defs) {
-          throw e.a.name + " was not defined.";
-        }
-        end = def.e.slice(i + 1);
-        def.e = def.e.slice(0, i);
-        def.e = def.e.concat(defs.e);
-        def.e = def.e.concat(end)
-      }else {
-        i += 1;
-        resolveDefines(e, defines)
-      }
-    }
-    e = def.e;
-    if(name === "choice") {
-      if(!e || !e[1] || e[1].name === "empty") {
-        if(!e || !e[0] || e[0].name === "empty") {
-          delete def.e;
-          def.name = "empty"
-        }else {
-          e[1] = e[0];
-          e[0] = {name:"empty"}
-        }
-      }
-    }
-    if(name === "group" || name === "interleave") {
-      if(e[0].name === "empty") {
-        if(e[1].name === "empty") {
-          delete def.e;
-          def.name = "empty"
-        }else {
-          name = def.name = e[1].name;
-          def.names = e[1].names;
-          e = def.e = e[1].e
-        }
-      }else {
-        if(e[1].name === "empty") {
-          name = def.name = e[0].name;
-          def.names = e[0].names;
-          e = def.e = e[0].e
-        }
-      }
-    }
-    if(name === "oneOrMore" && e[0].name === "empty") {
-      delete def.e;
-      def.name = "empty"
-    }
-    if(name === "attribute") {
-      splitQNames(def)
-    }
-    if(name === "interleave") {
-      if(e[0].name === "interleave") {
-        if(e[1].name === "interleave") {
-          e = def.e = e[0].e.concat(e[1].e)
-        }else {
-          e = def.e = [e[1]].concat(e[0].e)
-        }
-      }else {
-        if(e[1].name === "interleave") {
-          e = def.e = [e[0]].concat(e[1].e)
-        }
-      }
-    }
-  }
-  function resolveElements(def, elements) {
-    var i = 0, e, name;
-    while(def.e && i < def.e.length) {
-      e = def.e[i];
-      if(e.name === "elementref") {
-        e.id = e.id || 0;
-        def.e[i] = elements[e.id]
-      }else {
-        if(e.name !== "element") {
-          resolveElements(e, elements)
-        }
-      }
-      i += 1
-    }
-  }
-  function main(dom, callback) {
-    var elements = [], grammar = parse(dom && dom.documentElement, elements, undefined), i, e, defines = {};
-    for(i = 0;i < grammar.e.length;i += 1) {
-      e = grammar.e[i];
-      if(e.name === "define") {
-        defines[e.a.name] = e
-      }else {
-        if(e.name === "start") {
-          start = e
-        }
-      }
-    }
-    if(!start) {
-      return[new RelaxNGParseError("No Relax NG start element was found.")]
-    }
-    resolveDefines(start, defines);
-    for(i in defines) {
-      if(defines.hasOwnProperty(i)) {
-        resolveDefines(defines[i], defines)
-      }
-    }
-    for(i = 0;i < elements.length;i += 1) {
-      resolveDefines(elements[i], defines)
-    }
-    if(callback) {
-      self.rootPattern = callback(start.e[0], elements)
-    }
-    resolveElements(start, elements);
-    for(i = 0;i < elements.length;i += 1) {
-      resolveElements(elements[i], elements)
-    }
-    self.start = start;
-    self.elements = elements;
-    self.nsmap = nsmap;
-    return null
-  }
-  this.parseRelaxNGDOM = main
-};
-runtime.loadClass("xmldom.RelaxNGParser");
-xmldom.RelaxNG = function RelaxNG() {
-  var xmlnsns = "http://www.w3.org/2000/xmlns/", createChoice, createInterleave, createGroup, createAfter, createOneOrMore, createValue, createAttribute, createNameClass, createData, makePattern, notAllowed = {type:"notAllowed", nullable:false, hash:"notAllowed", textDeriv:function() {
-    return notAllowed
-  }, startTagOpenDeriv:function() {
-    return notAllowed
-  }, attDeriv:function() {
-    return notAllowed
-  }, startTagCloseDeriv:function() {
-    return notAllowed
-  }, endTagDeriv:function() {
-    return notAllowed
-  }}, empty = {type:"empty", nullable:true, hash:"empty", textDeriv:function() {
-    return notAllowed
-  }, startTagOpenDeriv:function() {
-    return notAllowed
-  }, attDeriv:function(context, attribute) {
-    return notAllowed
-  }, startTagCloseDeriv:function() {
-    return empty
-  }, endTagDeriv:function() {
-    return notAllowed
-  }}, text = {type:"text", nullable:true, hash:"text", textDeriv:function() {
-    return text
-  }, startTagOpenDeriv:function() {
-    return notAllowed
-  }, attDeriv:function() {
-    return notAllowed
-  }, startTagCloseDeriv:function() {
-    return text
-  }, endTagDeriv:function() {
-    return notAllowed
-  }}, applyAfter, childDeriv, rootPattern;
-  function memoize0arg(func) {
-    return function() {
-      var cache;
-      return function() {
-        if(cache === undefined) {
-          cache = func()
-        }
-        return cache
-      }
-    }()
-  }
-  function memoize1arg(type, func) {
-    return function() {
-      var cache = {}, cachecount = 0;
-      return function(a) {
-        var ahash = a.hash || a.toString(), v;
-        v = cache[ahash];
-        if(v !== undefined) {
-          return v
-        }
-        cache[ahash] = v = func(a);
-        v.hash = type + cachecount.toString();
-        cachecount += 1;
-        return v
-      }
-    }()
-  }
-  function memoizeNode(func) {
-    return function() {
-      var cache = {};
-      return function(node) {
-        var v, m;
-        m = cache[node.localName];
-        if(m === undefined) {
-          cache[node.localName] = m = {}
-        }else {
-          v = m[node.namespaceURI];
-          if(v !== undefined) {
-            return v
-          }
-        }
-        m[node.namespaceURI] = v = func(node);
-        return v
-      }
-    }()
-  }
-  function memoize2arg(type, fastfunc, func) {
-    return function() {
-      var cache = {}, cachecount = 0;
-      return function(a, b) {
-        var v = fastfunc && fastfunc(a, b), ahash, bhash, m;
-        if(v !== undefined) {
-          return v
-        }
-        ahash = a.hash || a.toString();
-        bhash = b.hash || b.toString();
-        m = cache[ahash];
-        if(m === undefined) {
-          cache[ahash] = m = {}
-        }else {
-          v = m[bhash];
-          if(v !== undefined) {
-            return v
-          }
-        }
-        m[bhash] = v = func(a, b);
-        v.hash = type + cachecount.toString();
-        cachecount += 1;
-        return v
-      }
-    }()
-  }
-  function unorderedMemoize2arg(type, fastfunc, func) {
-    return function() {
-      var cache = {}, cachecount = 0;
-      return function(a, b) {
-        var v = fastfunc && fastfunc(a, b), ahash, bhash, m;
-        if(v !== undefined) {
-          return v
-        }
-        ahash = a.hash || a.toString();
-        bhash = b.hash || b.toString();
-        if(ahash < bhash) {
-          m = ahash;
-          ahash = bhash;
-          bhash = m;
-          m = a;
-          a = b;
-          b = m
-        }
-        m = cache[ahash];
-        if(m === undefined) {
-          cache[ahash] = m = {}
-        }else {
-          v = m[bhash];
-          if(v !== undefined) {
-            return v
-          }
-        }
-        m[bhash] = v = func(a, b);
-        v.hash = type + cachecount.toString();
-        cachecount += 1;
-        return v
-      }
-    }()
-  }
-  function getUniqueLeaves(leaves, pattern) {
-    if(pattern.p1.type === "choice") {
-      getUniqueLeaves(leaves, pattern.p1)
-    }else {
-      leaves[pattern.p1.hash] = pattern.p1
-    }
-    if(pattern.p2.type === "choice") {
-      getUniqueLeaves(leaves, pattern.p2)
-    }else {
-      leaves[pattern.p2.hash] = pattern.p2
-    }
-  }
-  createChoice = memoize2arg("choice", function(p1, p2) {
-    if(p1 === notAllowed) {
-      return p2
-    }
-    if(p2 === notAllowed) {
-      return p1
-    }
-    if(p1 === p2) {
-      return p1
-    }
-  }, function(p1, p2) {
-    function makeChoice(p1, p2) {
-      return{type:"choice", p1:p1, p2:p2, nullable:p1.nullable || p2.nullable, textDeriv:function(context, text) {
-        return createChoice(p1.textDeriv(context, text), p2.textDeriv(context, text))
-      }, startTagOpenDeriv:memoizeNode(function(node) {
-        return createChoice(p1.startTagOpenDeriv(node), p2.startTagOpenDeriv(node))
-      }), attDeriv:function(context, attribute) {
-        return createChoice(p1.attDeriv(context, attribute), p2.attDeriv(context, attribute))
-      }, startTagCloseDeriv:memoize0arg(function() {
-        return createChoice(p1.startTagCloseDeriv(), p2.startTagCloseDeriv())
-      }), endTagDeriv:memoize0arg(function() {
-        return createChoice(p1.endTagDeriv(), p2.endTagDeriv())
-      })}
-    }
-    var leaves = {}, i;
-    getUniqueLeaves(leaves, {p1:p1, p2:p2});
-    p1 = undefined;
-    p2 = undefined;
-    for(i in leaves) {
-      if(leaves.hasOwnProperty(i)) {
-        if(p1 === undefined) {
-          p1 = leaves[i]
-        }else {
-          if(p2 === undefined) {
-            p2 = leaves[i]
-          }else {
-            p2 = createChoice(p2, leaves[i])
-          }
-        }
-      }
-    }
-    return makeChoice(p1, p2)
-  });
-  createInterleave = unorderedMemoize2arg("interleave", function(p1, p2) {
-    if(p1 === notAllowed || p2 === notAllowed) {
-      return notAllowed
-    }
-    if(p1 === empty) {
-      return p2
-    }
-    if(p2 === empty) {
-      return p1
-    }
-  }, function(p1, p2) {
-    return{type:"interleave", p1:p1, p2:p2, nullable:p1.nullable && p2.nullable, textDeriv:function(context, text) {
-      return createChoice(createInterleave(p1.textDeriv(context, text), p2), createInterleave(p1, p2.textDeriv(context, text)))
-    }, startTagOpenDeriv:memoizeNode(function(node) {
-      return createChoice(applyAfter(function(p) {
-        return createInterleave(p, p2)
-      }, p1.startTagOpenDeriv(node)), applyAfter(function(p) {
-        return createInterleave(p1, p)
-      }, p2.startTagOpenDeriv(node)))
-    }), attDeriv:function(context, attribute) {
-      return createChoice(createInterleave(p1.attDeriv(context, attribute), p2), createInterleave(p1, p2.attDeriv(context, attribute)))
-    }, startTagCloseDeriv:memoize0arg(function() {
-      return createInterleave(p1.startTagCloseDeriv(), p2.startTagCloseDeriv())
-    })}
-  });
-  createGroup = memoize2arg("group", function(p1, p2) {
-    if(p1 === notAllowed || p2 === notAllowed) {
-      return notAllowed
-    }
-    if(p1 === empty) {
-      return p2
-    }
-    if(p2 === empty) {
-      return p1
-    }
-  }, function(p1, p2) {
-    return{type:"group", p1:p1, p2:p2, nullable:p1.nullable && p2.nullable, textDeriv:function(context, text) {
-      var p = createGroup(p1.textDeriv(context, text), p2);
-      if(p1.nullable) {
-        return createChoice(p, p2.textDeriv(context, text))
-      }
-      return p
-    }, startTagOpenDeriv:function(node) {
-      var x = applyAfter(function(p) {
-        return createGroup(p, p2)
-      }, p1.startTagOpenDeriv(node));
-      if(p1.nullable) {
-        return createChoice(x, p2.startTagOpenDeriv(node))
-      }
-      return x
-    }, attDeriv:function(context, attribute) {
-      return createChoice(createGroup(p1.attDeriv(context, attribute), p2), createGroup(p1, p2.attDeriv(context, attribute)))
-    }, startTagCloseDeriv:memoize0arg(function() {
-      return createGroup(p1.startTagCloseDeriv(), p2.startTagCloseDeriv())
-    })}
-  });
-  createAfter = memoize2arg("after", function(p1, p2) {
-    if(p1 === notAllowed || p2 === notAllowed) {
-      return notAllowed
-    }
-  }, function(p1, p2) {
-    return{type:"after", p1:p1, p2:p2, nullable:false, textDeriv:function(context, text) {
-      return createAfter(p1.textDeriv(context, text), p2)
-    }, startTagOpenDeriv:memoizeNode(function(node) {
-      return applyAfter(function(p) {
-        return createAfter(p, p2)
-      }, p1.startTagOpenDeriv(node))
-    }), attDeriv:function(context, attribute) {
-      return createAfter(p1.attDeriv(context, attribute), p2)
-    }, startTagCloseDeriv:memoize0arg(function() {
-      return createAfter(p1.startTagCloseDeriv(), p2)
-    }), endTagDeriv:memoize0arg(function() {
-      return p1.nullable ? p2 : notAllowed
-    })}
-  });
-  createOneOrMore = memoize1arg("oneormore", function(p) {
-    if(p === notAllowed) {
-      return notAllowed
-    }
-    return{type:"oneOrMore", p:p, nullable:p.nullable, textDeriv:function(context, text) {
-      return createGroup(p.textDeriv(context, text), createChoice(this, empty))
-    }, startTagOpenDeriv:function(node) {
-      var oneOrMore = this;
-      return applyAfter(function(pf) {
-        return createGroup(pf, createChoice(oneOrMore, empty))
-      }, p.startTagOpenDeriv(node))
-    }, attDeriv:function(context, attribute) {
-      var oneOrMore = this;
-      return createGroup(p.attDeriv(context, attribute), createChoice(oneOrMore, empty))
-    }, startTagCloseDeriv:memoize0arg(function() {
-      return createOneOrMore(p.startTagCloseDeriv())
-    })}
-  });
-  function createElement(nc, p) {
-    return{type:"element", nc:nc, nullable:false, textDeriv:function() {
-      return notAllowed
-    }, startTagOpenDeriv:function(node) {
-      if(nc.contains(node)) {
-        return createAfter(p, empty)
-      }
-      return notAllowed
-    }, attDeriv:function(context, attribute) {
-      return notAllowed
-    }, startTagCloseDeriv:function() {
-      return this
-    }}
-  }
-  function valueMatch(context, pattern, text) {
-    return pattern.nullable && /^\s+$/.test(text) || pattern.textDeriv(context, text).nullable
-  }
-  createAttribute = memoize2arg("attribute", undefined, function(nc, p) {
-    return{type:"attribute", nullable:false, nc:nc, p:p, attDeriv:function(context, attribute) {
-      if(nc.contains(attribute) && valueMatch(context, p, attribute.nodeValue)) {
-        return empty
-      }
-      return notAllowed
-    }, startTagCloseDeriv:function() {
-      return notAllowed
-    }}
-  });
-  function createList() {
-    return{type:"list", nullable:false, hash:"list", textDeriv:function(context, text) {
-      return empty
-    }}
-  }
-  createValue = memoize1arg("value", function(value) {
-    return{type:"value", nullable:false, value:value, textDeriv:function(context, text) {
-      return text === value ? empty : notAllowed
-    }, attDeriv:function() {
-      return notAllowed
-    }, startTagCloseDeriv:function() {
-      return this
-    }}
-  });
-  createData = memoize1arg("data", function(type) {
-    return{type:"data", nullable:false, dataType:type, textDeriv:function() {
-      return empty
-    }, attDeriv:function() {
-      return notAllowed
-    }, startTagCloseDeriv:function() {
-      return this
-    }}
-  });
-  function createDataExcept() {
-    return{type:"dataExcept", nullable:false, hash:"dataExcept"}
-  }
-  applyAfter = function applyAfter(f, p) {
-    var result;
-    if(p.type === "after") {
-      result = createAfter(p.p1, f(p.p2))
-    }else {
-      if(p.type === "choice") {
-        result = createChoice(applyAfter(f, p.p1), applyAfter(f, p.p2))
-      }else {
-        result = p
-      }
-    }
-    return result
-  };
-  function attsDeriv(context, pattern, attributes, position) {
-    if(pattern === notAllowed) {
-      return notAllowed
-    }
-    if(position >= attributes.length) {
-      return pattern
-    }
-    if(position === 0) {
-      position = 0
-    }
-    var a = attributes.item(position);
-    while(a.namespaceURI === xmlnsns) {
-      position += 1;
-      if(position >= attributes.length) {
-        return pattern
-      }
-      a = attributes.item(position)
-    }
-    a = attsDeriv(context, pattern.attDeriv(context, attributes.item(position)), attributes, position + 1);
-    return a
-  }
-  function childrenDeriv(context, pattern, walker) {
-    var element = walker.currentNode, childNode = walker.firstChild(), numberOfTextNodes = 0, childNodes = [], i, p;
-    while(childNode) {
-      if(childNode.nodeType === 1) {
-        childNodes.push(childNode)
-      }else {
-        if(childNode.nodeType === 3 && !/^\s*$/.test(childNode.nodeValue)) {
-          childNodes.push(childNode.nodeValue);
-          numberOfTextNodes += 1
-        }
-      }
-      childNode = walker.nextSibling()
-    }
-    if(childNodes.length === 0) {
-      childNodes = [""]
-    }
-    p = pattern;
-    for(i = 0;p !== notAllowed && i < childNodes.length;i += 1) {
-      childNode = childNodes[i];
-      if(typeof childNode === "string") {
-        if(/^\s*$/.test(childNode)) {
-          p = createChoice(p, p.textDeriv(context, childNode))
-        }else {
-          p = p.textDeriv(context, childNode)
-        }
-      }else {
-        walker.currentNode = childNode;
-        p = childDeriv(context, p, walker)
-      }
-    }
-    walker.currentNode = element;
-    return p
-  }
-  childDeriv = function childDeriv(context, pattern, walker) {
-    var childNode = walker.currentNode, p;
-    p = pattern.startTagOpenDeriv(childNode);
-    p = attsDeriv(context, p, childNode.attributes, 0);
-    p = p.startTagCloseDeriv();
-    p = childrenDeriv(context, p, walker);
-    p = p.endTagDeriv();
-    return p
-  };
-  function addNames(name, ns, pattern) {
-    if(pattern.e[0].a) {
-      name.push(pattern.e[0].text);
-      ns.push(pattern.e[0].a.ns)
-    }else {
-      addNames(name, ns, pattern.e[0])
-    }
-    if(pattern.e[1].a) {
-      name.push(pattern.e[1].text);
-      ns.push(pattern.e[1].a.ns)
-    }else {
-      addNames(name, ns, pattern.e[1])
-    }
-  }
-  createNameClass = function createNameClass(pattern) {
-    var name, ns, hash, i, result;
-    if(pattern.name === "name") {
-      name = pattern.text;
-      ns = pattern.a.ns;
-      result = {name:name, ns:ns, hash:"{" + ns + "}" + name, contains:function(node) {
-        return node.namespaceURI === ns && node.localName === name
-      }}
-    }else {
-      if(pattern.name === "choice") {
-        name = [];
-        ns = [];
-        addNames(name, ns, pattern);
-        hash = "";
-        for(i = 0;i < name.length;i += 1) {
-          hash += "{" + ns[i] + "}" + name[i] + ","
-        }
-        result = {hash:hash, contains:function(node) {
-          var i;
-          for(i = 0;i < name.length;i += 1) {
-            if(name[i] === node.localName && ns[i] === node.namespaceURI) {
-              return true
-            }
-          }
-          return false
-        }}
-      }else {
-        result = {hash:"anyName", contains:function() {
-          return true
-        }}
-      }
-    }
-    return result
-  };
-  function resolveElement(pattern, elements) {
-    var element, p, i, hash;
-    hash = "element" + pattern.id.toString();
-    p = elements[pattern.id] = {hash:hash};
-    element = createElement(createNameClass(pattern.e[0]), makePattern(pattern.e[1], elements));
-    for(i in element) {
-      if(element.hasOwnProperty(i)) {
-        p[i] = element[i]
-      }
-    }
-    return p
-  }
-  makePattern = function makePattern(pattern, elements) {
-    var p, i;
-    if(pattern.name === "elementref") {
-      p = pattern.id || 0;
-      pattern = elements[p];
-      if(pattern.name !== undefined) {
-        return resolveElement(pattern, elements)
-      }
-      return pattern
-    }
-    switch(pattern.name) {
-      case "empty":
-        return empty;
-      case "notAllowed":
-        return notAllowed;
-      case "text":
-        return text;
-      case "choice":
-        return createChoice(makePattern(pattern.e[0], elements), makePattern(pattern.e[1], elements));
-      case "interleave":
-        p = makePattern(pattern.e[0], elements);
-        for(i = 1;i < pattern.e.length;i += 1) {
-          p = createInterleave(p, makePattern(pattern.e[i], elements))
-        }
-        return p;
-      case "group":
-        return createGroup(makePattern(pattern.e[0], elements), makePattern(pattern.e[1], elements));
-      case "oneOrMore":
-        return createOneOrMore(makePattern(pattern.e[0], elements));
-      case "attribute":
-        return createAttribute(createNameClass(pattern.e[0]), makePattern(pattern.e[1], elements));
-      case "value":
-        return createValue(pattern.text);
-      case "data":
-        p = pattern.a && pattern.a.type;
-        if(p === undefined) {
-          p = ""
-        }
-        return createData(p);
-      case "list":
-        return createList()
-    }
-    throw"No support for " + pattern.name;
-  };
-  this.makePattern = function(pattern, elements) {
-    var copy = {}, i;
-    for(i in elements) {
-      if(elements.hasOwnProperty(i)) {
-        copy[i] = elements[i]
-      }
-    }
-    i = makePattern(pattern, copy);
-    return i
-  };
-  this.validate = function validate(walker, callback) {
-    var errors;
-    walker.currentNode = walker.root;
-    errors = childDeriv(null, rootPattern, walker);
-    if(!errors.nullable) {
-      runtime.log("Error in Relax NG validation: " + errors);
-      callback(["Error in Relax NG validation: " + errors])
-    }else {
-      callback(null)
-    }
-  };
-  this.init = function init(rootPattern1) {
-    rootPattern = rootPattern1
-  }
-};
-runtime.loadClass("xmldom.RelaxNGParser");
-xmldom.RelaxNG2 = function RelaxNG2() {
-  var start, validateNonEmptyPattern, nsmap, depth = 0, p = "                                                                ";
-  function RelaxNGParseError(error, context) {
-    this.message = function() {
-      if(context) {
-        error += context.nodeType === 1 ? " Element " : " Node ";
-        error += context.nodeName;
-        if(context.nodeValue) {
-          error += " with value '" + context.nodeValue + "'"
-        }
-        error += "."
-      }
-      return error
-    }
-  }
-  function validateOneOrMore(elementdef, walker, element) {
-    var node, i = 0, err;
-    do {
-      node = walker.currentNode;
-      err = validateNonEmptyPattern(elementdef.e[0], walker, element);
-      i += 1
-    }while(!err && node !== walker.currentNode);
-    if(i > 1) {
-      walker.currentNode = node;
-      return null
-    }
-    return err
-  }
-  function qName(node) {
-    return nsmap[node.namespaceURI] + ":" + node.localName
-  }
-  function isWhitespace(node) {
-    return node && node.nodeType === 3 && /^\s+$/.test(node.nodeValue)
-  }
-  function validatePattern(elementdef, walker, element, data) {
-    if(elementdef.name === "empty") {
-      return null
-    }
-    return validateNonEmptyPattern(elementdef, walker, element, data)
-  }
-  function validateAttribute(elementdef, walker, element) {
-    if(elementdef.e.length !== 2) {
-      throw"Attribute with wrong # of elements: " + elementdef.e.length;
-    }
-    var att, a, l = elementdef.localnames.length, i;
-    for(i = 0;i < l;i += 1) {
-      a = element.getAttributeNS(elementdef.namespaces[i], elementdef.localnames[i]);
-      if(a === "" && !element.hasAttributeNS(elementdef.namespaces[i], elementdef.localnames[i])) {
-        a = undefined
-      }
-      if(att !== undefined && a !== undefined) {
-        return[new RelaxNGParseError("Attribute defined too often.", element)]
-      }
-      att = a
-    }
-    if(att === undefined) {
-      return[new RelaxNGParseError("Attribute not found: " + elementdef.names, element)]
-    }
-    return validatePattern(elementdef.e[1], walker, element, att)
-  }
-  function validateTop(elementdef, walker, element) {
-    return validatePattern(elementdef, walker, element)
-  }
-  function validateElement(elementdef, walker, element) {
-    if(elementdef.e.length !== 2) {
-      throw"Element with wrong # of elements: " + elementdef.e.length;
-    }
-    depth += 1;
-    var node = walker.currentNode, type = node ? node.nodeType : 0, error = null;
-    while(type > 1) {
-      if(type !== 8 && (type !== 3 || !/^\s+$/.test(walker.currentNode.nodeValue))) {
-        depth -= 1;
-        return[new RelaxNGParseError("Not allowed node of type " + type + ".")]
-      }
-      node = walker.nextSibling();
-      type = node ? node.nodeType : 0
-    }
-    if(!node) {
-      depth -= 1;
-      return[new RelaxNGParseError("Missing element " + elementdef.names)]
-    }
-    if(elementdef.names && elementdef.names.indexOf(qName(node)) === -1) {
-      depth -= 1;
-      return[new RelaxNGParseError("Found " + node.nodeName + " instead of " + elementdef.names + ".", node)]
-    }
-    if(walker.firstChild()) {
-      error = validateTop(elementdef.e[1], walker, node);
-      while(walker.nextSibling()) {
-        type = walker.currentNode.nodeType;
-        if(!isWhitespace(walker.currentNode) && type !== 8) {
-          depth -= 1;
-          return[new RelaxNGParseError("Spurious content.", walker.currentNode)]
-        }
-      }
-      if(walker.parentNode() !== node) {
-        depth -= 1;
-        return[new RelaxNGParseError("Implementation error.")]
-      }
-    }else {
-      error = validateTop(elementdef.e[1], walker, node)
-    }
-    depth -= 1;
-    node = walker.nextSibling();
-    return error
-  }
-  function validateChoice(elementdef, walker, element, data) {
-    if(elementdef.e.length !== 2) {
-      throw"Choice with wrong # of options: " + elementdef.e.length;
-    }
-    var node = walker.currentNode, err;
-    if(elementdef.e[0].name === "empty") {
-      err = validateNonEmptyPattern(elementdef.e[1], walker, element, data);
-      if(err) {
-        walker.currentNode = node
-      }
-      return null
-    }
-    err = validatePattern(elementdef.e[0], walker, element, data);
-    if(err) {
-      walker.currentNode = node;
-      err = validateNonEmptyPattern(elementdef.e[1], walker, element, data)
-    }
-    return err
-  }
-  function validateInterleave(elementdef, walker, element) {
-    var l = elementdef.e.length, n = [l], err, i, todo = l, donethisround, node, subnode, e;
-    while(todo > 0) {
-      donethisround = 0;
-      node = walker.currentNode;
-      for(i = 0;i < l;i += 1) {
-        subnode = walker.currentNode;
-        if(n[i] !== true && n[i] !== subnode) {
-          e = elementdef.e[i];
-          err = validateNonEmptyPattern(e, walker, element);
-          if(err) {
-            walker.currentNode = subnode;
-            if(n[i] === undefined) {
-              n[i] = false
-            }
-          }else {
-            if(subnode === walker.currentNode || e.name === "oneOrMore" || e.name === "choice" && (e.e[0].name === "oneOrMore" || e.e[1].name === "oneOrMore")) {
-              donethisround += 1;
-              n[i] = subnode
-            }else {
-              donethisround += 1;
-              n[i] = true
-            }
-          }
-        }
-      }
-      if(node === walker.currentNode && donethisround === todo) {
-        return null
-      }
-      if(donethisround === 0) {
-        for(i = 0;i < l;i += 1) {
-          if(n[i] === false) {
-            return[new RelaxNGParseError("Interleave does not match.", element)]
-          }
-        }
-        return null
-      }
-      todo = 0;
-      for(i = 0;i < l;i += 1) {
-        if(n[i] !== true) {
-          todo += 1
-        }
-      }
-    }
-    return null
-  }
-  function validateGroup(elementdef, walker, element) {
-    if(elementdef.e.length !== 2) {
-      throw"Group with wrong # of members: " + elementdef.e.length;
-    }
-    return validateNonEmptyPattern(elementdef.e[0], walker, element) || validateNonEmptyPattern(elementdef.e[1], walker, element)
-  }
-  function validateText(elementdef, walker, element) {
-    var node = walker.currentNode, type = node ? node.nodeType : 0, error = null;
-    while(node !== element && type !== 3) {
-      if(type === 1) {
-        return[new RelaxNGParseError("Element not allowed here.", node)]
-      }
-      node = walker.nextSibling();
-      type = node ? node.nodeType : 0
-    }
-    walker.nextSibling();
-    return null
-  }
-  validateNonEmptyPattern = function validateNonEmptyPattern(elementdef, walker, element, data) {
-    var name = elementdef.name, err = null;
-    if(name === "text") {
-      err = validateText(elementdef, walker, element)
-    }else {
-      if(name === "data") {
-        err = null
-      }else {
-        if(name === "value") {
-          if(data !== elementdef.text) {
-            err = [new RelaxNGParseError("Wrong value, should be '" + elementdef.text + "', not '" + data + "'", element)]
-          }
-        }else {
-          if(name === "list") {
-            err = null
-          }else {
-            if(name === "attribute") {
-              err = validateAttribute(elementdef, walker, element)
-            }else {
-              if(name === "element") {
-                err = validateElement(elementdef, walker, element)
-              }else {
-                if(name === "oneOrMore") {
-                  err = validateOneOrMore(elementdef, walker, element)
-                }else {
-                  if(name === "choice") {
-                    err = validateChoice(elementdef, walker, element, data)
-                  }else {
-                    if(name === "group") {
-                      err = validateGroup(elementdef, walker, element)
-                    }else {
-                      if(name === "interleave") {
-                        err = validateInterleave(elementdef, walker, element)
-                      }else {
-                        throw name + " not allowed in nonEmptyPattern.";
-                      }
-                    }
-                  }
-                }
-              }
-            }
-          }
-        }
-      }
-    }
-    return err
-  };
-  this.validate = function validate(walker, callback) {
-    walker.currentNode = walker.root;
-    var errors = validatePattern(start.e[0], walker, walker.root);
-    callback(errors)
-  };
-  this.init = function init(start1, nsmap1) {
-    start = start1;
-    nsmap = nsmap1
-  }
-};
-xmldom.OperationalTransformInterface = function() {
-};
-xmldom.OperationalTransformInterface.prototype.retain = function(amount) {
-};
-xmldom.OperationalTransformInterface.prototype.insertCharacters = function(chars) {
-};
-xmldom.OperationalTransformInterface.prototype.insertElementStart = function(tagname, attributes) {
-};
-xmldom.OperationalTransformInterface.prototype.insertElementEnd = function() {
-};
-xmldom.OperationalTransformInterface.prototype.deleteCharacters = function(amount) {
-};
-xmldom.OperationalTransformInterface.prototype.deleteElementStart = function() {
-};
-xmldom.OperationalTransformInterface.prototype.deleteElementEnd = function() {
-};
-xmldom.OperationalTransformInterface.prototype.replaceAttributes = function(atts) {
-};
-xmldom.OperationalTransformInterface.prototype.updateAttributes = function(atts) {
-};
-xmldom.OperationalTransformDOM = function OperationalTransformDOM(root, serializer) {
-  var pos, length;
-  function retain(amount) {
-  }
-  function insertCharacters(chars) {
-  }
-  function insertElementStart(tagname, attributes) {
-  }
-  function insertElementEnd() {
-  }
-  function deleteCharacters(amount) {
-  }
-  function deleteElementStart() {
-  }
-  function deleteElementEnd() {
-  }
-  function replaceAttributes(atts) {
-  }
-  function updateAttributes(atts) {
-  }
-  function atEnd() {
-    return pos === length
-  }
-  this.retain = retain;
-  this.insertCharacters = insertCharacters;
-  this.insertElementStart = insertElementStart;
-  this.insertElementEnd = insertElementEnd;
-  this.deleteCharacters = deleteCharacters;
-  this.deleteElementStart = deleteElementStart;
-  this.deleteElementEnd = deleteElementEnd;
-  this.replaceAttributes = replaceAttributes;
-  this.updateAttributes = updateAttributes;
-  this.atEnd = atEnd
-};
-xmldom.XPath = function() {
-  var createXPathPathIterator, parsePredicates;
-  function isSmallestPositive(a, b, c) {
-    return a !== -1 && (a < b || b === -1) && (a < c || c === -1)
-  }
-  function parseXPathStep(xpath, pos, end, steps) {
-    var location = "", predicates = [], value, brapos = xpath.indexOf("[", pos), slapos = xpath.indexOf("/", pos), eqpos = xpath.indexOf("=", pos), depth = 0, start = 0;
-    if(isSmallestPositive(slapos, brapos, eqpos)) {
-      location = xpath.substring(pos, slapos);
-      pos = slapos + 1
-    }else {
-      if(isSmallestPositive(brapos, slapos, eqpos)) {
-        location = xpath.substring(pos, brapos);
-        pos = parsePredicates(xpath, brapos, predicates)
-      }else {
-        if(isSmallestPositive(eqpos, slapos, brapos)) {
-          location = xpath.substring(pos, eqpos);
-          pos = eqpos
-        }else {
-          location = xpath.substring(pos, end);
-          pos = end
-        }
-      }
-    }
-    steps.push({location:location, predicates:predicates});
-    return pos
-  }
-  function parseXPath(xpath) {
-    var steps = [], p = 0, end = xpath.length, value;
-    while(p < end) {
-      p = parseXPathStep(xpath, p, end, steps);
-      if(p < end && xpath[p] === "=") {
-        value = xpath.substring(p + 1, end);
-        if(value.length > 2 && (value[0] === "'" || value[0] === '"')) {
-          value = value.slice(1, value.length - 1)
-        }else {
-          try {
-            value = parseInt(value, 10)
-          }catch(e) {
-          }
-        }
-        p = end
-      }
-    }
-    return{steps:steps, value:value}
-  }
-  parsePredicates = function parsePredicates(xpath, start, predicates) {
-    var pos = start, l = xpath.length, selector, depth = 0;
-    while(pos < l) {
-      if(xpath[pos] === "]") {
-        depth -= 1;
-        if(depth <= 0) {
-          predicates.push(parseXPath(xpath.substring(start, pos)))
-        }
-      }else {
-        if(xpath[pos] === "[") {
-          if(depth <= 0) {
-            start = pos + 1
-          }
-          depth += 1
-        }
-      }
-      pos += 1
-    }
-    return pos
-  };
-  function XPathIterator() {
-  }
-  XPathIterator.prototype.next = function() {
-  };
-  XPathIterator.prototype.reset = function() {
-  };
-  function NodeIterator() {
-    var node, done = false;
-    this.setNode = function setNode(n) {
-      node = n
-    };
-    this.reset = function() {
-      done = false
-    };
-    this.next = function next() {
-      var val = done ? null : node;
-      done = true;
-      return val
-    }
-  }
-  function AttributeIterator(it, namespace, localName) {
-    this.reset = function reset() {
-      it.reset()
-    };
-    this.next = function next() {
-      var node = it.next(), attr;
-      while(node) {
-        node = node.getAttributeNodeNS(namespace, localName);
-        if(node) {
-          return node
-        }
-        node = it.next()
-      }
-      return node
-    }
-  }
-  function AllChildElementIterator(it, recurse) {
-    var root = it.next(), node = null;
-    this.reset = function reset() {
-      it.reset();
-      root = it.next();
-      node = null
-    };
-    this.next = function next() {
-      while(root) {
-        if(node) {
-          if(recurse && node.firstChild) {
-            node = node.firstChild
-          }else {
-            while(!node.nextSibling && node !== root) {
-              node = node.parentNode
-            }
-            if(node === root) {
-              root = it.next()
-            }else {
-              node = node.nextSibling
-            }
-          }
-        }else {
-          do {
-            node = root.firstChild;
-            if(!node) {
-              root = it.next()
-            }
-          }while(root && !node)
-        }
-        if(node && node.nodeType === 1) {
-          return node
-        }
-      }
-      return null
-    }
-  }
-  function ConditionIterator(it, condition) {
-    this.reset = function reset() {
-      it.reset()
-    };
-    this.next = function next() {
-      var n = it.next();
-      while(n && !condition(n)) {
-        n = it.next()
-      }
-      return n
-    }
-  }
-  function createNodenameFilter(it, name, namespaceResolver) {
-    var s = name.split(":", 2), namespace = namespaceResolver(s[0]), localName = s[1];
-    return new ConditionIterator(it, function(node) {
-      return node.localName === localName && node.namespaceURI === namespace
-    })
-  }
-  function createPredicateFilteredIterator(it, p, namespaceResolver) {
-    var nit = new NodeIterator, pit = createXPathPathIterator(nit, p, namespaceResolver), value = p.value;
-    if(value === undefined) {
-      return new ConditionIterator(it, function(node) {
-        nit.setNode(node);
-        pit.reset();
-        return pit.next()
-      })
-    }
-    return new ConditionIterator(it, function(node) {
-      nit.setNode(node);
-      pit.reset();
-      var n = pit.next();
-      return n && n.nodeValue === value
-    })
-  }
-  createXPathPathIterator = function createXPathPathIterator(it, xpath, namespaceResolver) {
-    var i, j, step, location, namespace, localName, prefix, p;
-    for(i = 0;i < xpath.steps.length;i += 1) {
-      step = xpath.steps[i];
-      location = step.location;
-      if(location === "") {
-        it = new AllChildElementIterator(it, false)
-      }else {
-        if(location[0] === "@") {
-          p = location.slice(1).split(":", 2);
-          it = new AttributeIterator(it, namespaceResolver(p[0]), p[1])
-        }else {
-          if(location !== ".") {
-            it = new AllChildElementIterator(it, false);
-            if(location.indexOf(":") !== -1) {
-              it = createNodenameFilter(it, location, namespaceResolver)
-            }
-          }
-        }
-      }
-      for(j = 0;j < step.predicates.length;j += 1) {
-        p = step.predicates[j];
-        it = createPredicateFilteredIterator(it, p, namespaceResolver)
-      }
-    }
-    return it
-  };
-  function fallback(node, xpath, namespaceResolver) {
-    var it = new NodeIterator, i, nodelist, parsedXPath, pos;
-    it.setNode(node);
-    parsedXPath = parseXPath(xpath);
-    it = createXPathPathIterator(it, parsedXPath, namespaceResolver);
-    nodelist = [];
-    i = it.next();
-    while(i) {
-      nodelist.push(i);
-      i = it.next()
-    }
-    return nodelist
-  }
-  function getODFElementsWithXPath(node, xpath, namespaceResolver) {
-    var doc = node.ownerDocument, nodes, elements = [], n = null;
-    if(!doc || !doc.evaluate || !n) {
-      elements = fallback(node, xpath, namespaceResolver)
-    }else {
-      nodes = doc.evaluate(xpath, node, namespaceResolver, XPathResult.UNORDERED_NODE_ITERATOR_TYPE, null);
-      n = nodes.iterateNext();
-      while(n !== null) {
-        if(n.nodeType === 1) {
-          elements.push(n)
-        }
-        n = nodes.iterateNext()
-      }
-    }
-    return elements
-  }
-  xmldom.XPath = function XPath() {
-    this.getODFElementsWithXPath = getODFElementsWithXPath
-  };
-  return xmldom.XPath
-}();
-odf.StyleInfo = function StyleInfo() {
-  var chartns = "urn:oasis:names:tc:opendocument:xmlns:chart:1.0", dbns = "urn:oasis:names:tc:opendocument:xmlns:database:1.0", dr3dns = "urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0", drawns = "urn:oasis:names:tc:opendocument:xmlns:drawing:1.0", fons = "urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0", formns = "urn:oasis:names:tc:opendocument:xmlns:form:1.0", numberns = "urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0", officens = "urn:oasis:names:tc:opendocument:xmlns:office:1.0", 
-  presentationns = "urn:oasis:names:tc:opendocument:xmlns:presentation:1.0", stylens = "urn:oasis:names:tc:opendocument:xmlns:style:1.0", svgns = "urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0", tablens = "urn:oasis:names:tc:opendocument:xmlns:table:1.0", textns = "urn:oasis:names:tc:opendocument:xmlns:text:1.0", elementstyles = {"text":[{ens:stylens, en:"tab-stop", ans:stylens, a:"leader-text-style"}, {ens:stylens, en:"drop-cap", ans:stylens, a:"style-name"}, {ens:textns, en:"notes-configuration", 
-  ans:textns, a:"citation-body-style-name"}, {ens:textns, en:"notes-configuration", ans:textns, a:"citation-style-name"}, {ens:textns, en:"a", ans:textns, a:"style-name"}, {ens:textns, en:"alphabetical-index", ans:textns, a:"style-name"}, {ens:textns, en:"linenumbering-configuration", ans:textns, a:"style-name"}, {ens:textns, en:"list-level-style-number", ans:textns, a:"style-name"}, {ens:textns, en:"ruby-text", ans:textns, a:"style-name"}, {ens:textns, en:"span", ans:textns, a:"style-name"}, {ens:textns, 
-  en:"a", ans:textns, a:"visited-style-name"}, {ens:stylens, en:"text-properties", ans:stylens, a:"text-line-through-text-style"}, {ens:textns, en:"alphabetical-index-source", ans:textns, a:"main-entry-style-name"}, {ens:textns, en:"index-entry-bibliography", ans:textns, a:"style-name"}, {ens:textns, en:"index-entry-chapter", ans:textns, a:"style-name"}, {ens:textns, en:"index-entry-link-end", ans:textns, a:"style-name"}, {ens:textns, en:"index-entry-link-start", ans:textns, a:"style-name"}, {ens:textns, 
-  en:"index-entry-page-number", ans:textns, a:"style-name"}, {ens:textns, en:"index-entry-span", ans:textns, a:"style-name"}, {ens:textns, en:"index-entry-tab-stop", ans:textns, a:"style-name"}, {ens:textns, en:"index-entry-text", ans:textns, a:"style-name"}, {ens:textns, en:"index-title-template", ans:textns, a:"style-name"}, {ens:textns, en:"list-level-style-bullet", ans:textns, a:"style-name"}, {ens:textns, en:"outline-level-style", ans:textns, a:"style-name"}], "paragraph":[{ens:drawns, en:"caption", 
-  ans:drawns, a:"text-style-name"}, {ens:drawns, en:"circle", ans:drawns, a:"text-style-name"}, {ens:drawns, en:"connector", ans:drawns, a:"text-style-name"}, {ens:drawns, en:"control", ans:drawns, a:"text-style-name"}, {ens:drawns, en:"custom-shape", ans:drawns, a:"text-style-name"}, {ens:drawns, en:"ellipse", ans:drawns, a:"text-style-name"}, {ens:drawns, en:"frame", ans:drawns, a:"text-style-name"}, {ens:drawns, en:"line", ans:drawns, a:"text-style-name"}, {ens:drawns, en:"measure", ans:drawns, 
-  a:"text-style-name"}, {ens:drawns, en:"path", ans:drawns, a:"text-style-name"}, {ens:drawns, en:"polygon", ans:drawns, a:"text-style-name"}, {ens:drawns, en:"polyline", ans:drawns, a:"text-style-name"}, {ens:drawns, en:"rect", ans:drawns, a:"text-style-name"}, {ens:drawns, en:"regular-polygon", ans:drawns, a:"text-style-name"}, {ens:officens, en:"annotation", ans:drawns, a:"text-style-name"}, {ens:formns, en:"column", ans:formns, a:"text-style-name"}, {ens:stylens, en:"style", ans:stylens, a:"next-style-name"}, 
-  {ens:tablens, en:"body", ans:tablens, a:"paragraph-style-name"}, {ens:tablens, en:"even-columns", ans:tablens, a:"paragraph-style-name"}, {ens:tablens, en:"even-rows", ans:tablens, a:"paragraph-style-name"}, {ens:tablens, en:"first-column", ans:tablens, a:"paragraph-style-name"}, {ens:tablens, en:"first-row", ans:tablens, a:"paragraph-style-name"}, {ens:tablens, en:"last-column", ans:tablens, a:"paragraph-style-name"}, {ens:tablens, en:"last-row", ans:tablens, a:"paragraph-style-name"}, {ens:tablens, 
-  en:"odd-columns", ans:tablens, a:"paragraph-style-name"}, {ens:tablens, en:"odd-rows", ans:tablens, a:"paragraph-style-name"}, {ens:textns, en:"notes-configuration", ans:textns, a:"default-style-name"}, {ens:textns, en:"alphabetical-index-entry-template", ans:textns, a:"style-name"}, {ens:textns, en:"bibliography-entry-template", ans:textns, a:"style-name"}, {ens:textns, en:"h", ans:textns, a:"style-name"}, {ens:textns, en:"illustration-index-entry-template", ans:textns, a:"style-name"}, {ens:textns, 
-  en:"index-source-style", ans:textns, a:"style-name"}, {ens:textns, en:"object-index-entry-template", ans:textns, a:"style-name"}, {ens:textns, en:"p", ans:textns, a:"style-name"}, {ens:textns, en:"table-index-entry-template", ans:textns, a:"style-name"}, {ens:textns, en:"table-of-content-entry-template", ans:textns, a:"style-name"}, {ens:textns, en:"table-index-entry-template", ans:textns, a:"style-name"}, {ens:textns, en:"user-index-entry-template", ans:textns, a:"style-name"}, {ens:stylens, en:"page-layout-properties", 
-  ans:stylens, a:"register-truth-ref-style-name"}], "chart":[{ens:chartns, en:"axis", ans:chartns, a:"style-name"}, {ens:chartns, en:"chart", ans:chartns, a:"style-name"}, {ens:chartns, en:"data-label", ans:chartns, a:"style-name"}, {ens:chartns, en:"data-point", ans:chartns, a:"style-name"}, {ens:chartns, en:"equation", ans:chartns, a:"style-name"}, {ens:chartns, en:"error-indicator", ans:chartns, a:"style-name"}, {ens:chartns, en:"floor", ans:chartns, a:"style-name"}, {ens:chartns, en:"footer", 
-  ans:chartns, a:"style-name"}, {ens:chartns, en:"grid", ans:chartns, a:"style-name"}, {ens:chartns, en:"legend", ans:chartns, a:"style-name"}, {ens:chartns, en:"mean-value", ans:chartns, a:"style-name"}, {ens:chartns, en:"plot-area", ans:chartns, a:"style-name"}, {ens:chartns, en:"regression-curve", ans:chartns, a:"style-name"}, {ens:chartns, en:"series", ans:chartns, a:"style-name"}, {ens:chartns, en:"stock-gain-marker", ans:chartns, a:"style-name"}, {ens:chartns, en:"stock-loss-marker", ans:chartns, 
-  a:"style-name"}, {ens:chartns, en:"stock-range-line", ans:chartns, a:"style-name"}, {ens:chartns, en:"subtitle", ans:chartns, a:"style-name"}, {ens:chartns, en:"title", ans:chartns, a:"style-name"}, {ens:chartns, en:"wall", ans:chartns, a:"style-name"}], "section":[{ens:textns, en:"alphabetical-index", ans:textns, a:"style-name"}, {ens:textns, en:"bibliography", ans:textns, a:"style-name"}, {ens:textns, en:"illustration-index", ans:textns, a:"style-name"}, {ens:textns, en:"index-title", ans:textns, 
-  a:"style-name"}, {ens:textns, en:"object-index", ans:textns, a:"style-name"}, {ens:textns, en:"section", ans:textns, a:"style-name"}, {ens:textns, en:"table-of-content", ans:textns, a:"style-name"}, {ens:textns, en:"table-index", ans:textns, a:"style-name"}, {ens:textns, en:"user-index", ans:textns, a:"style-name"}], "ruby":[{ens:textns, en:"ruby", ans:textns, a:"style-name"}], "table":[{ens:dbns, en:"query", ans:dbns, a:"style-name"}, {ens:dbns, en:"table-representation", ans:dbns, a:"style-name"}, 
-  {ens:tablens, en:"background", ans:tablens, a:"style-name"}, {ens:tablens, en:"table", ans:tablens, a:"style-name"}], "table-column":[{ens:dbns, en:"column", ans:dbns, a:"style-name"}, {ens:tablens, en:"table-column", ans:tablens, a:"style-name"}], "table-row":[{ens:dbns, en:"query", ans:dbns, a:"default-row-style-name"}, {ens:dbns, en:"table-representation", ans:dbns, a:"default-row-style-name"}, {ens:tablens, en:"table-row", ans:tablens, a:"style-name"}], "table-cell":[{ens:dbns, en:"column", 
-  ans:dbns, a:"default-cell-style-name"}, {ens:tablens, en:"table-column", ans:tablens, a:"default-cell-style-name"}, {ens:tablens, en:"table-row", ans:tablens, a:"default-cell-style-name"}, {ens:tablens, en:"body", ans:tablens, a:"style-name"}, {ens:tablens, en:"covered-table-cell", ans:tablens, a:"style-name"}, {ens:tablens, en:"even-columns", ans:tablens, a:"style-name"}, {ens:tablens, en:"covered-table-cell", ans:tablens, a:"style-name"}, {ens:tablens, en:"even-columns", ans:tablens, a:"style-name"}, 
-  {ens:tablens, en:"even-rows", ans:tablens, a:"style-name"}, {ens:tablens, en:"first-column", ans:tablens, a:"style-name"}, {ens:tablens, en:"first-row", ans:tablens, a:"style-name"}, {ens:tablens, en:"last-column", ans:tablens, a:"style-name"}, {ens:tablens, en:"last-row", ans:tablens, a:"style-name"}, {ens:tablens, en:"odd-columns", ans:tablens, a:"style-name"}, {ens:tablens, en:"odd-rows", ans:tablens, a:"style-name"}, {ens:tablens, en:"table-cell", ans:tablens, a:"style-name"}], "graphic":[{ens:dr3dns, 
-  en:"cube", ans:drawns, a:"style-name"}, {ens:dr3dns, en:"extrude", ans:drawns, a:"style-name"}, {ens:dr3dns, en:"rotate", ans:drawns, a:"style-name"}, {ens:dr3dns, en:"scene", ans:drawns, a:"style-name"}, {ens:dr3dns, en:"sphere", ans:drawns, a:"style-name"}, {ens:drawns, en:"caption", ans:drawns, a:"style-name"}, {ens:drawns, en:"circle", ans:drawns, a:"style-name"}, {ens:drawns, en:"connector", ans:drawns, a:"style-name"}, {ens:drawns, en:"control", ans:drawns, a:"style-name"}, {ens:drawns, en:"custom-shape", 
-  ans:drawns, a:"style-name"}, {ens:drawns, en:"ellipse", ans:drawns, a:"style-name"}, {ens:drawns, en:"frame", ans:drawns, a:"style-name"}, {ens:drawns, en:"g", ans:drawns, a:"style-name"}, {ens:drawns, en:"line", ans:drawns, a:"style-name"}, {ens:drawns, en:"measure", ans:drawns, a:"style-name"}, {ens:drawns, en:"page-thumbnail", ans:drawns, a:"style-name"}, {ens:drawns, en:"path", ans:drawns, a:"style-name"}, {ens:drawns, en:"polygon", ans:drawns, a:"style-name"}, {ens:drawns, en:"polyline", ans:drawns, 
-  a:"style-name"}, {ens:drawns, en:"rect", ans:drawns, a:"style-name"}, {ens:drawns, en:"regular-polygon", ans:drawns, a:"style-name"}, {ens:officens, en:"annotation", ans:drawns, a:"style-name"}], "presentation":[{ens:dr3dns, en:"cube", ans:presentationns, a:"style-name"}, {ens:dr3dns, en:"extrude", ans:presentationns, a:"style-name"}, {ens:dr3dns, en:"rotate", ans:presentationns, a:"style-name"}, {ens:dr3dns, en:"scene", ans:presentationns, a:"style-name"}, {ens:dr3dns, en:"sphere", ans:presentationns, 
-  a:"style-name"}, {ens:drawns, en:"caption", ans:presentationns, a:"style-name"}, {ens:drawns, en:"circle", ans:presentationns, a:"style-name"}, {ens:drawns, en:"connector", ans:presentationns, a:"style-name"}, {ens:drawns, en:"control", ans:presentationns, a:"style-name"}, {ens:drawns, en:"custom-shape", ans:presentationns, a:"style-name"}, {ens:drawns, en:"ellipse", ans:presentationns, a:"style-name"}, {ens:drawns, en:"frame", ans:presentationns, a:"style-name"}, {ens:drawns, en:"g", ans:presentationns, 
-  a:"style-name"}, {ens:drawns, en:"line", ans:presentationns, a:"style-name"}, {ens:drawns, en:"measure", ans:presentationns, a:"style-name"}, {ens:drawns, en:"page-thumbnail", ans:presentationns, a:"style-name"}, {ens:drawns, en:"path", ans:presentationns, a:"style-name"}, {ens:drawns, en:"polygon", ans:presentationns, a:"style-name"}, {ens:drawns, en:"polyline", ans:presentationns, a:"style-name"}, {ens:drawns, en:"rect", ans:presentationns, a:"style-name"}, {ens:drawns, en:"regular-polygon", 
-  ans:presentationns, a:"style-name"}, {ens:officens, en:"annotation", ans:presentationns, a:"style-name"}], "drawing-page":[{ens:drawns, en:"page", ans:drawns, a:"style-name"}, {ens:presentationns, en:"notes", ans:drawns, a:"style-name"}, {ens:stylens, en:"handout-master", ans:drawns, a:"style-name"}, {ens:stylens, en:"master-page", ans:drawns, a:"style-name"}], "list-style":[{ens:textns, en:"list", ans:textns, a:"style-name"}, {ens:textns, en:"numbered-paragraph", ans:textns, a:"style-name"}, {ens:textns, 
-  en:"list-item", ans:textns, a:"style-override"}, {ens:stylens, en:"style", ans:stylens, a:"list-style-name"}, {ens:stylens, en:"style", ans:stylens, a:"data-style-name"}, {ens:stylens, en:"style", ans:stylens, a:"percentage-data-style-name"}, {ens:presentationns, en:"date-time-decl", ans:stylens, a:"data-style-name"}, {ens:textns, en:"creation-date", ans:stylens, a:"data-style-name"}, {ens:textns, en:"creation-time", ans:stylens, a:"data-style-name"}, {ens:textns, en:"database-display", ans:stylens, 
-  a:"data-style-name"}, {ens:textns, en:"date", ans:stylens, a:"data-style-name"}, {ens:textns, en:"editing-duration", ans:stylens, a:"data-style-name"}, {ens:textns, en:"expression", ans:stylens, a:"data-style-name"}, {ens:textns, en:"meta-field", ans:stylens, a:"data-style-name"}, {ens:textns, en:"modification-date", ans:stylens, a:"data-style-name"}, {ens:textns, en:"modification-time", ans:stylens, a:"data-style-name"}, {ens:textns, en:"print-date", ans:stylens, a:"data-style-name"}, {ens:textns, 
-  en:"print-time", ans:stylens, a:"data-style-name"}, {ens:textns, en:"table-formula", ans:stylens, a:"data-style-name"}, {ens:textns, en:"time", ans:stylens, a:"data-style-name"}, {ens:textns, en:"user-defined", ans:stylens, a:"data-style-name"}, {ens:textns, en:"user-field-get", ans:stylens, a:"data-style-name"}, {ens:textns, en:"user-field-input", ans:stylens, a:"data-style-name"}, {ens:textns, en:"variable-get", ans:stylens, a:"data-style-name"}, {ens:textns, en:"variable-input", ans:stylens, 
-  a:"data-style-name"}, {ens:textns, en:"variable-set", ans:stylens, a:"data-style-name"}], "data":[{ens:stylens, en:"style", ans:stylens, a:"data-style-name"}, {ens:stylens, en:"style", ans:stylens, a:"percentage-data-style-name"}, {ens:presentationns, en:"date-time-decl", ans:stylens, a:"data-style-name"}, {ens:textns, en:"creation-date", ans:stylens, a:"data-style-name"}, {ens:textns, en:"creation-time", ans:stylens, a:"data-style-name"}, {ens:textns, en:"database-display", ans:stylens, a:"data-style-name"}, 
-  {ens:textns, en:"date", ans:stylens, a:"data-style-name"}, {ens:textns, en:"editing-duration", ans:stylens, a:"data-style-name"}, {ens:textns, en:"expression", ans:stylens, a:"data-style-name"}, {ens:textns, en:"meta-field", ans:stylens, a:"data-style-name"}, {ens:textns, en:"modification-date", ans:stylens, a:"data-style-name"}, {ens:textns, en:"modification-time", ans:stylens, a:"data-style-name"}, {ens:textns, en:"print-date", ans:stylens, a:"data-style-name"}, {ens:textns, en:"print-time", 
-  ans:stylens, a:"data-style-name"}, {ens:textns, en:"table-formula", ans:stylens, a:"data-style-name"}, {ens:textns, en:"time", ans:stylens, a:"data-style-name"}, {ens:textns, en:"user-defined", ans:stylens, a:"data-style-name"}, {ens:textns, en:"user-field-get", ans:stylens, a:"data-style-name"}, {ens:textns, en:"user-field-input", ans:stylens, a:"data-style-name"}, {ens:textns, en:"variable-get", ans:stylens, a:"data-style-name"}, {ens:textns, en:"variable-input", ans:stylens, a:"data-style-name"}, 
-  {ens:textns, en:"variable-set", ans:stylens, a:"data-style-name"}], "page-layout":[{ens:presentationns, en:"notes", ans:stylens, a:"page-layout-name"}, {ens:stylens, en:"handout-master", ans:stylens, a:"page-layout-name"}, {ens:stylens, en:"master-page", ans:stylens, a:"page-layout-name"}]}, elements;
-  function canElementHaveStyle(family, element) {
-    var elname = elements[element.localName], elns = elname && elname[element.namespaceURI], length = elns ? elns.length : 0, i;
-    return elns && elns.length > 0
-  }
-  function getStyleRef(family, element) {
-    var elname = elements[element.localName], elns = elname && elname[element.namespaceURI], length = elns ? elns.length : 0, i, attr;
-    for(i = 0;i < length;i += 1) {
-      attr = element.getAttributeNS(elns[i].ns, elns[i].localname)
-    }
-    return null
-  }
-  function getUsedStylesForAutomatic(element, keys) {
-    var elname = elements[element.localName], elns = elname && elname[element.namespaceURI], length = elns ? elns.length : 0, i, attr, group, map, e;
-    for(i = 0;i < length;i += 1) {
-      attr = element.getAttributeNS(elns[i].ns, elns[i].localname);
-      if(attr) {
-        group = elns[i].keygroup;
-        map = keys[group];
-        if(!map) {
-          map = keys[group] = {}
-        }
-        map[attr] = 1
-      }
-    }
-    i = element.firstChild;
-    while(i) {
-      if(i.nodeType === 1) {
-        e = i;
-        getUsedStylesForAutomatic(e, keys)
-      }
-      i = i.nextSibling
-    }
-  }
-  function inverse(elementstyles) {
-    var keyname, i, list, item, l, elements = {}, map, array;
-    for(keyname in elementstyles) {
-      if(elementstyles.hasOwnProperty(keyname)) {
-        list = elementstyles[keyname];
-        l = list.length;
-        for(i = 0;i < l;i += 1) {
-          item = list[i];
-          map = elements[item.en] = elements[item.en] || {};
-          array = map[item.ens] = map[item.ens] || [];
-          array.push({ns:item.ans, localname:item.a, keygroup:keyname})
-        }
-      }
-    }
-    return elements
-  }
-  this.UsedKeysList = function(element) {
-    var usedKeys = {};
-    this.uses = function(element) {
-      var localName = element.localName, name = element.getAttributeNS(drawns, "name") || element.getAttributeNS(stylens, "name"), keyName, map;
-      if(localName === "style") {
-        keyName = element.getAttributeNS(stylens, "family")
-      }else {
-        if(element.namespaceURI === numberns) {
-          keyName = "data"
-        }else {
-          keyName = localName
-        }
-      }
-      map = usedKeys[keyName];
-      return map ? map[name] > 0 : false
-    };
-    getUsedStylesForAutomatic(element, usedKeys)
-  };
-  this.canElementHaveStyle = canElementHaveStyle;
-  elements = inverse(elementstyles)
-};
-odf.Style2CSS = function Style2CSS() {
-  var xlinkns = "http://www.w3.org/1999/xlink", drawns = "urn:oasis:names:tc:opendocument:xmlns:drawing:1.0", fons = "urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0", officens = "urn:oasis:names:tc:opendocument:xmlns:office:1.0", presentationns = "urn:oasis:names:tc:opendocument:xmlns:presentation:1.0", stylens = "urn:oasis:names:tc:opendocument:xmlns:style:1.0", svgns = "urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0", tablens = "urn:oasis:names:tc:opendocument:xmlns:table:1.0", 
-  textns = "urn:oasis:names:tc:opendocument:xmlns:text:1.0", namespaces = {"draw":drawns, "fo":fons, "office":officens, "presentation":presentationns, "style":stylens, "svg":svgns, "table":tablens, "text":textns, "xlink":xlinkns}, familynamespaceprefixes = {"graphic":"draw", "paragraph":"text", "presentation":"presentation", "ruby":"text", "section":"text", "table":"table", "table-cell":"table", "table-column":"table", "table-row":"table", "text":"text", "list":"text"}, familytagnames = {"graphic":["circle", 
-  "connected", "control", "custom-shape", "ellipse", "frame", "g", "line", "measure", "page", "page-thumbnail", "path", "polygon", "polyline", "rect", "regular-polygon"], "paragraph":["alphabetical-index-entry-template", "h", "illustration-index-entry-template", "index-source-style", "object-index-entry-template", "p", "table-index-entry-template", "table-of-content-entry-template", "user-index-entry-template"], "presentation":["caption", "circle", "connector", "control", "custom-shape", "ellipse", 
-  "frame", "g", "line", "measure", "page-thumbnail", "path", "polygon", "polyline", "rect", "regular-polygon"], "ruby":["ruby", "ruby-text"], "section":["alphabetical-index", "bibliography", "illustration-index", "index-title", "object-index", "section", "table-of-content", "table-index", "user-index"], "table":["background", "table"], "table-cell":["body", "covered-table-cell", "even-columns", "even-rows", "first-column", "first-row", "last-column", "last-row", "odd-columns", "odd-rows", "table-cell"], 
-  "table-column":["table-column"], "table-row":["table-row"], "text":["a", "index-entry-chapter", "index-entry-link-end", "index-entry-link-start", "index-entry-page-number", "index-entry-span", "index-entry-tab-stop", "index-entry-text", "index-title-template", "linenumbering-configuration", "list-level-style-number", "list-level-style-bullet", "outline-level-style", "span"], "list":["list-item"]}, textPropertySimpleMapping = [[fons, "color", "color"], [fons, "background-color", "background-color"], 
-  [fons, "font-weight", "font-weight"], [fons, "font-style", "font-style"], [fons, "font-size", "font-size"]], bgImageSimpleMapping = [[stylens, "repeat", "background-repeat"]], paragraphPropertySimpleMapping = [[fons, "background-color", "background-color"], [fons, "text-align", "text-align"], [fons, "padding-left", "padding-left"], [fons, "padding-right", "padding-right"], [fons, "padding-top", "padding-top"], [fons, "padding-bottom", "padding-bottom"], [fons, "border-left", "border-left"], [fons, 
-  "border-right", "border-right"], [fons, "border-top", "border-top"], [fons, "border-bottom", "border-bottom"], [fons, "margin-left", "margin-left"], [fons, "margin-right", "margin-right"], [fons, "margin-top", "margin-top"], [fons, "margin-bottom", "margin-bottom"], [fons, "border", "border"]], graphicPropertySimpleMapping = [[drawns, "fill-color", "background-color"], [drawns, "fill", "background"], [fons, "min-height", "min-height"], [drawns, "stroke", "border"], [svgns, "stroke-color", "border-color"]], 
-  tablecellPropertySimpleMapping = [[fons, "background-color", "background-color"], [fons, "border-left", "border-left"], [fons, "border-right", "border-right"], [fons, "border-top", "border-top"], [fons, "border-bottom", "border-bottom"]];
-  function namespaceResolver(prefix) {
-    return namespaces[prefix] || null
-  }
-  function getStyleMap(doc, stylesnode) {
-    var stylemap = {}, node, name, family, map;
-    if(!stylesnode) {
-      return stylemap
-    }
-    node = stylesnode.firstChild;
-    while(node) {
-      if(node.namespaceURI === stylens && node.localName === "style") {
-        family = node.getAttributeNS(stylens, "family")
-      }else {
-        if(node.namespaceURI === textns && node.localName === "list-style") {
-          family = "list"
-        }
-      }
-      name = family && node.getAttributeNS && node.getAttributeNS(stylens, "name");
-      if(name) {
-        if(!stylemap[family]) {
-          stylemap[family] = {}
-        }
-        stylemap[family][name] = node
-      }
-      node = node.nextSibling
-    }
-    return stylemap
-  }
-  function findStyle(stylestree, name) {
-    if(!name || !stylestree) {
-      return null
-    }
-    if(stylestree[name]) {
-      return stylestree[name]
-    }
-    var derivedStyles = stylestree.derivedStyles, n, style;
-    for(n in stylestree) {
-      if(stylestree.hasOwnProperty(n)) {
-        style = findStyle(stylestree[n].derivedStyles, name);
-        if(style) {
-          return style
-        }
-      }
-    }
-    return null
-  }
-  function addStyleToStyleTree(stylename, stylesmap, stylestree) {
-    var style = stylesmap[stylename], parentname, parentstyle;
-    if(!style) {
-      return
-    }
-    parentname = style.getAttributeNS(stylens, "parent-style-name");
-    parentstyle = null;
-    if(parentname) {
-      parentstyle = findStyle(stylestree, parentname);
-      if(!parentstyle && stylesmap[parentname]) {
-        addStyleToStyleTree(parentname, stylesmap, stylestree);
-        parentstyle = stylesmap[parentname];
-        stylesmap[parentname] = null
-      }
-    }
-    if(parentstyle) {
-      if(!parentstyle.derivedStyles) {
-        parentstyle.derivedStyles = {}
-      }
-      parentstyle.derivedStyles[stylename] = style
-    }else {
-      stylestree[stylename] = style
-    }
-  }
-  function addStyleMapToStyleTree(stylesmap, stylestree) {
-    var name;
-    for(name in stylesmap) {
-      if(stylesmap.hasOwnProperty(name)) {
-        addStyleToStyleTree(name, stylesmap, stylestree);
-        stylesmap[name] = null
-      }
-    }
-  }
-  function createSelector(family, name) {
-    var prefix = familynamespaceprefixes[family], namepart, selector = "", first = true;
-    if(prefix === null) {
-      return null
-    }
-    namepart = "[" + prefix + '|style-name="' + name + '"]';
-    if(prefix === "presentation") {
-      prefix = "draw";
-      namepart = '[presentation|style-name="' + name + '"]'
-    }
-    return prefix + "|" + familytagnames[family].join(namepart + "," + prefix + "|") + namepart
-  }
-  function getSelectors(family, name, node) {
-    var selectors = [], n, ss, s;
-    selectors.push(createSelector(family, name));
-    for(n in node.derivedStyles) {
-      if(node.derivedStyles.hasOwnProperty(n)) {
-        ss = getSelectors(family, n, node.derivedStyles[n]);
-        for(s in ss) {
-          if(ss.hasOwnProperty(s)) {
-            selectors.push(ss[s])
-          }
-        }
-      }
-    }
-    return selectors
-  }
-  function getDirectChild(node, ns, name) {
-    if(!node) {
-      return null
-    }
-    var c = node.firstChild, e;
-    while(c) {
-      if(c.namespaceURI === ns && c.localName === name) {
-        e = c;
-        return e
-      }
-      c = c.nextSibling
-    }
-    return null
-  }
-  function applySimpleMapping(props, mapping) {
-    var rule = "", r, value;
-    for(r in mapping) {
-      if(mapping.hasOwnProperty(r)) {
-        r = mapping[r];
-        value = props.getAttributeNS(r[0], r[1]);
-        if(value) {
-          rule += r[2] + ":" + value + ";"
-        }
-      }
-    }
-    return rule
-  }
-  function getFontDeclaration(name) {
-    return'"' + name + '"'
-  }
-  function getTextProperties(props) {
-    var rule = "", value;
-    rule += applySimpleMapping(props, textPropertySimpleMapping);
-    value = props.getAttributeNS(stylens, "text-underline-style");
-    if(value === "solid") {
-      rule += "text-decoration: underline;"
-    }
-    value = props.getAttributeNS(stylens, "font-name");
-    if(value) {
-      value = getFontDeclaration(value);
-      if(value) {
-        rule += "font-family: " + value + ";"
-      }
-    }
-    return rule
-  }
-  function getParagraphProperties(props) {
-    var rule = "", imageProps, url, element;
-    rule += applySimpleMapping(props, paragraphPropertySimpleMapping);
-    imageProps = props.getElementsByTagNameNS(stylens, "background-image");
-    if(imageProps.length > 0) {
-      url = imageProps.item(0).getAttributeNS(xlinkns, "href");
-      if(url) {
-        rule += "background-image: url('odfkit:" + url + "');";
-        element = imageProps.item(0);
-        rule += applySimpleMapping(element, bgImageSimpleMapping)
-      }
-    }
-    return rule
-  }
-  function getGraphicProperties(props) {
-    var rule = "";
-    rule += applySimpleMapping(props, graphicPropertySimpleMapping);
-    return rule
-  }
-  function getTableCellProperties(props) {
-    var rule = "";
-    rule += applySimpleMapping(props, tablecellPropertySimpleMapping);
-    return rule
-  }
-  function addStyleRule(sheet, family, name, node) {
-    var selectors = getSelectors(family, name, node), selector = selectors.join(","), rule = "", properties = getDirectChild(node, stylens, "text-properties");
-    if(properties) {
-      rule += getTextProperties(properties)
-    }
-    properties = getDirectChild(node, stylens, "paragraph-properties");
-    if(properties) {
-      rule += getParagraphProperties(properties)
-    }
-    properties = getDirectChild(node, stylens, "graphic-properties");
-    if(properties) {
-      rule += getGraphicProperties(properties)
-    }
-    properties = getDirectChild(node, stylens, "table-cell-properties");
-    if(properties) {
-      rule += getTableCellProperties(properties)
-    }
-    if(rule.length === 0) {
-      return
-    }
-    rule = selector + "{" + rule + "}";
-    try {
-      sheet.insertRule(rule, sheet.cssRules.length)
-    }catch(e) {
-      throw e;
-    }
-  }
-  function getNumberRule(node) {
-    var style = node.getAttributeNS(stylens, "num-format"), suffix = node.getAttributeNS(stylens, "num-suffix"), prefix = node.getAttributeNS(stylens, "num-prefix"), rule = "", stylemap = {1:"decimal", "a":"lower-latin", "A":"upper-latin", "i":"lower-roman", "I":"upper-roman"}, content = "";
-    content = prefix || "";
-    if(stylemap.hasOwnProperty(style)) {
-      content += " counter(list, " + stylemap[style] + ")"
-    }else {
-      if(style) {
-        content += "'" + style + "';"
-      }else {
-        content += " ''"
-      }
-    }
-    if(suffix) {
-      content += " '" + suffix + "'"
-    }
-    rule = "content: " + content + ";";
-    return rule
-  }
-  function getImageRule(node) {
-    var rule = "content: none;";
-    return rule
-  }
-  function getBulletRule(node) {
-    var rule = "", bulletChar = node.getAttributeNS(textns, "bullet-char");
-    return"content: '" + bulletChar + "';"
-  }
-  function addListStyleRule(sheet, name, node, itemrule) {
-    var selector = 'text|list[text|style-name="' + name + '"]', level = node.getAttributeNS(textns, "level"), rule = "";
-    level = level && parseInt(level, 10);
-    while(level > 1) {
-      selector += " > text|list-item > text|list";
-      level -= 1
-    }
-    selector += " > list-item:before";
-    rule = itemrule;
-    rule = selector + "{" + rule + "}";
-    try {
-      sheet.insertRule(rule, sheet.cssRules.length)
-    }catch(e) {
-      throw e;
-    }
-  }
-  function addListStyleRules(sheet, name, node) {
-    var n = node.firstChild, e, itemrule;
-    while(n) {
-      if(n.namespaceURI === textns) {
-        e = n;
-        if(n.localName === "list-level-style-number") {
-          itemrule = getNumberRule(e);
-          addListStyleRule(sheet, name, e, itemrule)
-        }else {
-          if(n.localName === "list-level-style-image") {
-            itemrule = getImageRule(e);
-            addListStyleRule(sheet, name, e, itemrule)
-          }else {
-            if(n.localName === "list-level-style-bullet") {
-              itemrule = getBulletRule(e);
-              addListStyleRule(sheet, name, e, itemrule)
-            }
-          }
-        }
-      }
-      n = n.nextSibling
-    }
-  }
-  function addRule(sheet, family, name, node) {
-    if(family === "list") {
-      addListStyleRules(sheet, name, node)
-    }else {
-      addStyleRule(sheet, family, name, node)
-    }
-  }
-  function addRules(sheet, family, name, node) {
-    addRule(sheet, family, name, node);
-    var n;
-    for(n in node.derivedStyles) {
-      if(node.derivedStyles.hasOwnProperty(n)) {
-        addRules(sheet, family, n, node.derivedStyles[n])
-      }
-    }
-  }
-  this.namespaces = namespaces;
-  this.namespaceResolver = namespaceResolver;
-  this.namespaceResolver.lookupNamespaceURI = this.namespaceResolver;
-  this.style2css = function(stylesheet, styles, autostyles) {
-    var doc, prefix, styletree, tree, name, rule, family, stylenodes, styleautonodes;
-    while(stylesheet.cssRules.length) {
-      stylesheet.deleteRule(stylesheet.cssRules.length - 1)
-    }
-    doc = null;
-    if(styles) {
-      doc = styles.ownerDocument
-    }
-    if(autostyles) {
-      doc = autostyles.ownerDocument
-    }
-    if(!doc) {
-      return
-    }
-    for(prefix in namespaces) {
-      if(namespaces.hasOwnProperty(prefix)) {
-        rule = "@namespace " + prefix + " url(" + namespaces[prefix] + ");";
-        try {
-          stylesheet.insertRule(rule, stylesheet.cssRules.length)
-        }catch(e) {
-        }
-      }
-    }
-    stylenodes = getStyleMap(doc, styles);
-    styleautonodes = getStyleMap(doc, autostyles);
-    styletree = {};
-    for(family in familynamespaceprefixes) {
-      if(familynamespaceprefixes.hasOwnProperty(family)) {
-        tree = styletree[family] = {};
-        addStyleMapToStyleTree(stylenodes[family], tree);
-        addStyleMapToStyleTree(styleautonodes[family], tree);
-        for(name in tree) {
-          if(tree.hasOwnProperty(name)) {
-            addRules(stylesheet, family, name, tree[name])
-          }
-        }
-      }
-    }
-  }
-};
-runtime.loadClass("core.Base64");
-runtime.loadClass("xmldom.XPath");
-runtime.loadClass("odf.Style2CSS");
-odf.FontLoader = function() {
-  var style2CSS = new odf.Style2CSS, xpath = new xmldom.XPath, base64 = new core.Base64;
-  function getEmbeddedFontDeclarations(fontFaceDecls) {
-    var decls = {}, fonts, i, font, name, uris, href;
-    if(!fontFaceDecls) {
-      return decls
-    }
-    fonts = xpath.getODFElementsWithXPath(fontFaceDecls, "style:font-face[svg:font-face-src]", style2CSS.namespaceResolver);
-    for(i = 0;i < fonts.length;i += 1) {
-      font = fonts[i];
-      name = font.getAttributeNS(style2CSS.namespaces["style"], "name");
-      uris = xpath.getODFElementsWithXPath(font, "svg:font-face-src/svg:font-face-uri", style2CSS.namespaceResolver);
-      if(uris.length > 0) {
-        href = uris[0].getAttributeNS(style2CSS.namespaces["xlink"], "href");
-        decls[name] = {href:href}
-      }
-    }
-    return decls
-  }
-  function addFontToCSS(name, font, fontdata, stylesheet) {
-    stylesheet = document.styleSheets[0];
-    var rule = '@font-face { font-family: "' + name + '"; src: ' + "url(data:application/x-font-ttf;charset=binary;base64," + base64.convertUTF8ArrayToBase64(fontdata) + ') format("truetype"); }';
-    try {
-      stylesheet.insertRule(rule, stylesheet.cssRules.length)
-    }catch(e) {
-      runtime.log("Problem inserting rule in CSS: " + rule)
-    }
-  }
-  function loadFontIntoCSS(embeddedFontDeclarations, zip, pos, stylesheet, callback) {
-    var name, i = 0, n;
-    for(n in embeddedFontDeclarations) {
-      if(embeddedFontDeclarations.hasOwnProperty(n)) {
-        if(i === pos) {
-          name = n
-        }
-        i += 1
-      }
-    }
-    if(!name) {
-      return callback()
-    }
-    zip.load(embeddedFontDeclarations[name].href, function(err, fontdata) {
-      if(err) {
-        runtime.log(err)
-      }else {
-        addFontToCSS(name, embeddedFontDeclarations[name], fontdata, stylesheet)
-      }
-      return loadFontIntoCSS(embeddedFontDeclarations, zip, pos + 1, stylesheet, callback)
-    })
-  }
-  function loadFontsIntoCSS(embeddedFontDeclarations, zip, stylesheet) {
-    loadFontIntoCSS(embeddedFontDeclarations, zip, 0, stylesheet, function() {
-    })
-  }
-  odf.FontLoader = function FontLoader() {
-    var self = this;
-    this.loadFonts = function(fontFaceDecls, zip, stylesheet) {
-      var embeddedFontDeclarations = getEmbeddedFontDeclarations(fontFaceDecls);
-      loadFontsIntoCSS(embeddedFontDeclarations, zip, stylesheet)
-    }
-  };
-  return odf.FontLoader
-}();
-runtime.loadClass("core.Base64");
-runtime.loadClass("core.Zip");
-runtime.loadClass("xmldom.LSSerializer");
-runtime.loadClass("odf.StyleInfo");
-runtime.loadClass("odf.Style2CSS");
-runtime.loadClass("odf.FontLoader");
-odf.OdfContainer = function() {
-  var styleInfo = new odf.StyleInfo, style2CSS = new odf.Style2CSS, namespaces = style2CSS.namespaces, officens = "urn:oasis:names:tc:opendocument:xmlns:office:1.0", manifestns = "urn:oasis:names:tc:opendocument:xmlns:manifest:1.0", nodeorder = ["meta", "settings", "scripts", "font-face-decls", "styles", "automatic-styles", "master-styles", "body"], base64 = new core.Base64, fontLoader = new odf.FontLoader, partMimetypes = {};
-  function getDirectChild(node, ns, name) {
-    node = node ? node.firstChild : null;
-    while(node) {
-      if(node.localName === name && node.namespaceURI === ns) {
-        return node
-      }
-      node = node.nextSibling
-    }
-    return null
-  }
-  function getNodePosition(child) {
-    var childpos = 0, i, l = nodeorder.length;
-    for(i = 0;i < l;i += 1) {
-      if(child.namespaceURI === officens && child.localName === nodeorder[i]) {
-        return i
-      }
-    }
-    return-1
-  }
-  function OdfNodeFilter(odfroot, usedStylesElement) {
-    var automaticStyles = odfroot.automaticStyles, usedKeysList;
-    if(usedStylesElement) {
-      usedKeysList = new styleInfo.UsedKeysList(usedStylesElement)
-    }
-    this.acceptNode = function(node) {
-      var styleName, styleFamily, result;
-      if(node.namespaceURI === "http://www.w3.org/1999/xhtml") {
-        result = 3
-      }else {
-        if(usedKeysList && node.parentNode === automaticStyles && node.nodeType === 1) {
-          if(usedKeysList.uses(node)) {
-            result = 1
-          }else {
-            result = 2
-          }
-        }else {
-          result = 1
-        }
-      }
-      return result
-    }
-  }
-  function setChild(node, child) {
-    if(!child) {
-      return
-    }
-    var childpos = getNodePosition(child), pos, c = node.firstChild;
-    if(childpos === -1) {
-      return
-    }
-    while(c) {
-      pos = getNodePosition(c);
-      if(pos !== -1 && pos > childpos) {
-        break
-      }
-      c = c.nextSibling
-    }
-    node.insertBefore(child, c)
-  }
-  function ODFElement() {
-  }
-  function ODFDocumentElement(odfcontainer) {
-    this.OdfContainer = odfcontainer
-  }
-  ODFDocumentElement.prototype = new ODFElement;
-  ODFDocumentElement.prototype.constructor = ODFDocumentElement;
-  ODFDocumentElement.namespaceURI = officens;
-  ODFDocumentElement.localName = "document";
-  function OdfPart(name, container, zip) {
-    var self = this, privatedata;
-    this.size = 0;
-    this.type = null;
-    this.name = name;
-    this.container = container;
-    this.url = null;
-    this.mimetype = null;
-    this.document = null;
-    this.onreadystatechange = null;
-    this.onchange = null;
-    this.EMPTY = 0;
-    this.LOADING = 1;
-    this.DONE = 2;
-    this.state = this.EMPTY;
-    this.load = function() {
-      var mimetype = partMimetypes[name];
-      this.mimetype = mimetype;
-      zip.loadAsDataURL(name, mimetype, function(err, url) {
-        self.url = url;
-        if(self.onchange) {
-          self.onchange(self)
-        }
-        if(self.onstatereadychange) {
-          self.onstatereadychange(self)
-        }
-      })
-    };
-    this.abort = function() {
-    }
-  }
-  OdfPart.prototype.load = function() {
-  };
-  OdfPart.prototype.getUrl = function() {
-    if(this.data) {
-      return"data:;base64," + base64.toBase64(this.data)
-    }
-    return null
-  };
-  function OdfPartList(odfcontainer) {
-    var self = this;
-    this.length = 0;
-    this.item = function(index) {
-    }
-  }
-  odf.OdfContainer = function OdfContainer(url, onstatereadychange) {
-    var self = this, zip = null, contentXmlCompletelyLoaded = false;
-    this.onstatereadychange = onstatereadychange;
-    this.onchange = null;
-    this.state = null;
-    this.rootElement = null;
-    this.parts = null;
-    function removeProcessingInstructions(element) {
-      var n = element.firstChild, next, e;
-      while(n) {
-        next = n.nextSibling;
-        if(n.nodeType === 1) {
-          e = n;
-          removeProcessingInstructions(e)
-        }else {
-          if(n.nodeType === 7) {
-            element.removeChild(n)
-          }
-        }
-        n = next
-      }
-    }
-    function importRootNode(xmldoc) {
-      var doc = self.rootElement.ownerDocument, node;
-      if(xmldoc) {
-        removeProcessingInstructions(xmldoc.documentElement);
-        try {
-          node = doc.importNode(xmldoc.documentElement, true)
-        }catch(e) {
-        }
-      }
-      return node
-    }
-    function setState(state) {
-      self.state = state;
-      if(self.onchange) {
-        self.onchange(self)
-      }
-      if(self.onstatereadychange) {
-        self.onstatereadychange(self)
-      }
-    }
-    function handleFlatXml(xmldoc) {
-      var root = importRootNode(xmldoc);
-      if(!root || root.localName !== "document" || root.namespaceURI !== officens) {
-        setState(OdfContainer.INVALID);
-        return
-      }
-      self.rootElement = root;
-      root.fontFaceDecls = getDirectChild(root, officens, "font-face-decls");
-      root.styles = getDirectChild(root, officens, "styles");
-      root.automaticStyles = getDirectChild(root, officens, "automatic-styles");
-      root.masterStyles = getDirectChild(root, officens, "master-styles");
-      root.body = getDirectChild(root, officens, "body");
-      root.meta = getDirectChild(root, officens, "meta");
-      setState(OdfContainer.DONE)
-    }
-    function handleStylesXml(xmldoc) {
-      var node = importRootNode(xmldoc), root = self.rootElement;
-      if(!node || node.localName !== "document-styles" || node.namespaceURI !== officens) {
-        setState(OdfContainer.INVALID);
-        return
-      }
-      root.fontFaceDecls = getDirectChild(node, officens, "font-face-decls");
-      setChild(root, root.fontFaceDecls);
-      root.styles = getDirectChild(node, officens, "styles");
-      setChild(root, root.styles);
-      root.automaticStyles = getDirectChild(node, officens, "automatic-styles");
-      setChild(root, root.automaticStyles);
-      root.masterStyles = getDirectChild(node, officens, "master-styles");
-      setChild(root, root.masterStyles);
-      fontLoader.loadFonts(root.fontFaceDecls, zip, null)
-    }
-    function handleContentXml(xmldoc) {
-      var node = importRootNode(xmldoc), root, automaticStyles, fontFaceDecls, c;
-      if(!node || node.localName !== "document-content" || node.namespaceURI !== officens) {
-        setState(OdfContainer.INVALID);
-        return
-      }
-      root = self.rootElement;
-      fontFaceDecls = getDirectChild(node, officens, "font-face-decls");
-      if(root.fontFaceDecls && fontFaceDecls) {
-        c = fontFaceDecls.firstChild;
-        while(c) {
-          root.fontFaceDecls.appendChild(c);
-          c = fontFaceDecls.firstChild
-        }
-      }else {
-        if(fontFaceDecls) {
-          root.fontFaceDecls = fontFaceDecls;
-          setChild(root, fontFaceDecls)
-        }
-      }
-      automaticStyles = getDirectChild(node, officens, "automatic-styles");
-      if(root.automaticStyles && automaticStyles) {
-        c = automaticStyles.firstChild;
-        while(c) {
-          root.automaticStyles.appendChild(c);
-          c = automaticStyles.firstChild
-        }
-      }else {
-        if(automaticStyles) {
-          root.automaticStyles = automaticStyles;
-          setChild(root, automaticStyles)
-        }
-      }
-      root.body = getDirectChild(node, officens, "body");
-      setChild(root, root.body)
-    }
-    function handleMetaXml(xmldoc) {
-      var node = importRootNode(xmldoc), root;
-      if(!node || node.localName !== "document-meta" || node.namespaceURI !== officens) {
-        return
-      }
-      root = self.rootElement;
-      root.meta = getDirectChild(node, officens, "meta");
-      setChild(root, root.meta)
-    }
-    function handleSettingsXml(xmldoc) {
-      var node = importRootNode(xmldoc), root;
-      if(!node || node.localName !== "document-settings" || node.namespaceURI !== officens) {
-        return
-      }
-      root = self.rootElement;
-      root.settings = getDirectChild(node, officens, "settings");
-      setChild(root, root.settings)
-    }
-    function handleManifestXml(xmldoc) {
-      var node = importRootNode(xmldoc), root, n;
-      if(!node || node.localName !== "manifest" || node.namespaceURI !== manifestns) {
-        return
-      }
-      root = self.rootElement;
-      root.manifest = node;
-      n = root.manifest.firstChild;
-      while(n) {
-        if(n.nodeType === 1 && n.localName === "file-entry" && n.namespaceURI === manifestns) {
-          partMimetypes[n.getAttributeNS(manifestns, "full-path")] = n.getAttributeNS(manifestns, "media-type")
-        }
-        n = n.nextSibling
-      }
-    }
-    function getContentXmlNode(callback) {
-      var handler = {rootElementReady:function(err, rootxml, done) {
-        contentXmlCompletelyLoaded = err || done;
-        if(err) {
-          return callback(err, null)
-        }
-        var parser = new DOMParser;
-        rootxml = parser.parseFromString(rootxml, "text/xml");
-        callback(null, rootxml)
-      }, bodyChildElementsReady:function(err, nodes, done) {
-      }};
-      zip.loadContentXmlAsFragments("content.xml", handler)
-    }
-    function getXmlNode(filepath, callback) {
-      zip.loadAsDOM(filepath, callback)
-    }
-    function loadComponents() {
-      getXmlNode("styles.xml", function(err, xmldoc) {
-        handleStylesXml(xmldoc);
-        if(self.state === OdfContainer.INVALID) {
-          return
-        }
-        getXmlNode("content.xml", function(err, xmldoc) {
-          handleContentXml(xmldoc);
-          if(self.state === OdfContainer.INVALID) {
-            return
-          }
-          getXmlNode("meta.xml", function(err, xmldoc) {
-            handleMetaXml(xmldoc);
-            if(self.state === OdfContainer.INVALID) {
-              return
-            }
-            getXmlNode("settings.xml", function(err, xmldoc) {
-              if(xmldoc) {
-                handleSettingsXml(xmldoc)
-              }
-              getXmlNode("META-INF/manifest.xml", function(err, xmldoc) {
-                if(xmldoc) {
-                  handleManifestXml(xmldoc)
-                }
-                if(self.state !== OdfContainer.INVALID) {
-                  setState(OdfContainer.DONE)
-                }
-              })
-            })
-          })
-        })
-      })
-    }
-    function documentElement(name, map) {
-      var s = "", i;
-      for(i in map) {
-        if(map.hasOwnProperty(i)) {
-          s += " xmlns:" + i + '="' + map[i] + '"'
-        }
-      }
-      return'<?xml version="1.0" encoding="UTF-8"?><office:' + name + " " + s + ' office:version="1.2">'
-    }
-    function serializeMetaXml() {
-      var nsmap = style2CSS.namespaces, serializer = new xmldom.LSSerializer, s = documentElement("document-meta", nsmap);
-      serializer.filter = new OdfNodeFilter(self.rootElement);
-      s += serializer.writeToString(self.rootElement.meta, nsmap);
-      s += "</office:document-meta>";
-      return s
-    }
-    function serializeSettingsXml() {
-      var nsmap = style2CSS.namespaces, serializer = new xmldom.LSSerializer, s = documentElement("document-settings", nsmap);
-      serializer.filter = new OdfNodeFilter(self.rootElement);
-      s += serializer.writeToString(self.rootElement.settings, nsmap);
-      s += "</office:document-settings>";
-      return s
-    }
-    function serializeStylesXml() {
-      var nsmap = style2CSS.namespaces, serializer = new xmldom.LSSerializer, s = documentElement("document-styles", nsmap);
-      serializer.filter = new OdfNodeFilter(self.rootElement, self.rootElement.masterStyles);
-      s += serializer.writeToString(self.rootElement.fontFaceDecls, nsmap);
-      s += serializer.writeToString(self.rootElement.styles, nsmap);
-      s += serializer.writeToString(self.rootElement.automaticStyles, nsmap);
-      s += serializer.writeToString(self.rootElement.masterStyles, nsmap);
-      s += "</office:document-styles>";
-      return s
-    }
-    function serializeContentXml() {
-      var nsmap = style2CSS.namespaces, serializer = new xmldom.LSSerializer, s = documentElement("document-content", nsmap);
-      serializer.filter = new OdfNodeFilter(self.rootElement, self.rootElement.body);
-      s += serializer.writeToString(self.rootElement.automaticStyles, nsmap);
-      s += serializer.writeToString(self.rootElement.body, nsmap);
-      s += "</office:document-content>";
-      return s
-    }
-    function createElement(Type) {
-      var original = document.createElementNS(Type.namespaceURI, Type.localName), method, iface = new Type;
-      for(method in iface) {
-        if(iface.hasOwnProperty(method)) {
-          original[method] = iface[method]
-        }
-      }
-      return original
-    }
-    function loadFromXML(url, callback) {
-      runtime.loadXML(url, function(err, dom) {
-        if(err) {
-          callback(err)
-        }else {
-          handleFlatXml(dom)
-        }
-      })
-    }
-    this.getPart = function(partname) {
-      return new OdfPart(partname, self, zip)
-    };
-    this.save = function(callback) {
-      var data;
-      data = runtime.byteArrayFromString(serializeSettingsXml(), "utf8");
-      zip.save("settings.xml", data, true, new Date);
-      data = runtime.byteArrayFromString(serializeMetaXml(), "utf8");
-      zip.save("meta.xml", data, true, new Date);
-      data = runtime.byteArrayFromString(serializeStylesXml(), "utf8");
-      zip.save("styles.xml", data, true, new Date);
-      data = runtime.byteArrayFromString(serializeContentXml(), "utf8");
-      zip.save("content.xml", data, true, new Date);
-      zip.write(function(err) {
-        callback(err)
-      })
-    };
-    this.state = OdfContainer.LOADING;
-    this.rootElement = createElement(ODFDocumentElement);
-    this.parts = new OdfPartList(this);
-    zip = new core.Zip(url, function(err, zipobject) {
-      zip = zipobject;
-      if(err) {
-        loadFromXML(url, function(xmlerr) {
-          if(err) {
-            zip.error = err + "\n" + xmlerr;
-            setState(OdfContainer.INVALID)
-          }
-        })
-      }else {
-        loadComponents()
-      }
-    })
-  };
-  odf.OdfContainer.EMPTY = 0;
-  odf.OdfContainer.LOADING = 1;
-  odf.OdfContainer.DONE = 2;
-  odf.OdfContainer.INVALID = 3;
-  odf.OdfContainer.SAVING = 4;
-  odf.OdfContainer.MODIFIED = 5;
-  odf.OdfContainer.getContainer = function(url) {
-    return new odf.OdfContainer(url, null)
-  };
-  return odf.OdfContainer
-}();
-odf.Formatting = function Formatting() {
-  var odfContainer, styleInfo = new odf.StyleInfo;
-  function RangeElementIterator(range) {
-    function getNthChild(parent, n) {
-      var c = parent && parent.firstChild;
-      while(c && n) {
-        c = c.nextSibling;
-        n -= 1
-      }
-      return c
-    }
-    var start = getNthChild(range.startContainer, range.startOffset), end = getNthChild(range.endContainer, range.endOffset), current = start;
-    this.next = function() {
-      var c = current;
-      if(c === null) {
-        return c
-      }
-      return null
-    }
-  }
-  function getParentStyle(element) {
-    var n = element.firstChild, e;
-    if(n.nodeType === 1) {
-      e = n;
-      return e
-    }
-    return null
-  }
-  function getParagraphStyles(range) {
-    var iter = new RangeElementIterator(range), e, styles = [];
-    e = iter.next();
-    while(e) {
-      if(styleInfo.canElementHaveStyle("paragraph", e)) {
-        styles.push(e)
-      }
-    }
-    return styles
-  }
-  this.setOdfContainer = function(odfcontainer) {
-    odfContainer = odfcontainer
-  };
-  this.isCompletelyBold = function(selection) {
-    return false
-  };
-  this.getAlignment = function(selection) {
-    var styles = this.getParagraphStyles(selection), i, l = styles.length;
-    return undefined
-  };
-  this.getParagraphStyles = function(selection) {
-    var i, j, s, styles = [];
-    for(i = 0;i < selection.length;i += 0) {
-      s = getParagraphStyles(selection[i]);
-      for(j = 0;j < s.length;j += 1) {
-        if(styles.indexOf(s[j]) === -1) {
-          styles.push(s[j])
-        }
-      }
-    }
-    return styles
-  };
-  this.getTextStyles = function(selection) {
-    return[]
-  }
-};
-runtime.loadClass("odf.OdfContainer");
-runtime.loadClass("odf.Formatting");
-runtime.loadClass("xmldom.XPath");
-odf.OdfCanvas = function() {
-  function LoadingQueue() {
-    var queue = [], taskRunning = false;
-    function run(task) {
-      taskRunning = true;
-      runtime.setTimeout(function() {
-        try {
-          task()
-        }catch(e) {
-          runtime.log(e)
-        }
-        taskRunning = false;
-        if(queue.length > 0) {
-          run(queue.pop())
-        }
-      }, 10)
-    }
-    this.clearQueue = function() {
-      queue.length = 0
-    };
-    this.addToQueue = function(loadingTask) {
-      if(queue.length === 0 && !taskRunning) {
-        return run(loadingTask)
-      }
-      queue.push(loadingTask)
-    }
-  }
-  function PageSwitcher(css) {
-    var sheet = css.sheet, position = 1;
-    function updateCSS() {
-      while(sheet.cssRules.length > 0) {
-        sheet.deleteRule(0)
-      }
-      sheet.insertRule("office|presentation draw|page {display:none;}", 0);
-      sheet.insertRule("office|presentation draw|page:nth-child(" + position + ") {display:block;}", 1)
-    }
-    this.showNextPage = function() {
-      position += 1;
-      updateCSS()
-    };
-    this.showPreviousPage = function() {
-      if(position > 1) {
-        position -= 1;
-        updateCSS()
-      }
-    };
-    this.css = css
-  }
-  function listenEvent(eventTarget, eventType, eventHandler) {
-    if(eventTarget.addEventListener) {
-      eventTarget.addEventListener(eventType, eventHandler, false)
-    }else {
-      if(eventTarget.attachEvent) {
-        eventType = "on" + eventType;
-        eventTarget.attachEvent(eventType, eventHandler)
-      }else {
-        eventTarget["on" + eventType] = eventHandler
-      }
-    }
-  }
-  function SelectionWatcher(element) {
-    var selection = [], count = 0, listeners = [];
-    function isAncestorOf(ancestor, descendant) {
-      while(descendant) {
-        if(descendant === ancestor) {
-          return true
-        }
-        descendant = descendant.parentNode
-      }
-      return false
-    }
-    function fallsWithin(element, range) {
-      return isAncestorOf(element, range.startContainer) && isAncestorOf(element, range.endContainer)
-    }
-    function getCurrentSelection() {
-      var s = [], selection = runtime.getWindow().getSelection(), i, r;
-      for(i = 0;i < selection.rangeCount;i += 1) {
-        r = selection.getRangeAt(i);
-        if(r !== null && fallsWithin(element, r)) {
-          s.push(r)
-        }
-      }
-      return s
-    }
-    function rangesNotEqual(rangeA, rangeB) {
-      if(rangeA === rangeB) {
-        return false
-      }
-      if(rangeA === null || rangeB === null) {
-        return true
-      }
-      return rangeA.startContainer !== rangeB.startContainer || rangeA.startOffset !== rangeB.startOffset || rangeA.endContainer !== rangeB.endContainer || rangeA.endOffset !== rangeB.endOffset
-    }
-    function emitNewSelection() {
-      var i, l = listeners.length;
-      for(i = 0;i < l;i += 1) {
-        listeners[i](element, selection)
-      }
-    }
-    function copySelection(selection) {
-      var s = [selection.length], i, oldr, r, doc = element.ownerDocument;
-      for(i = 0;i < selection.length;i += 1) {
-        oldr = selection[i];
-        r = doc.createRange();
-        r.setStart(oldr.startContainer, oldr.startOffset);
-        r.setEnd(oldr.endContainer, oldr.endOffset);
-        s[i] = r
-      }
-      return s
-    }
-    function checkSelection() {
-      var s = getCurrentSelection(), i;
-      if(s.length === selection.length) {
-        for(i = 0;i < s.length;i += 1) {
-          if(rangesNotEqual(s[i], selection[i])) {
-            break
-          }
-        }
-        if(i === s.length) {
-          return
-        }
-      }
-      selection = s;
-      selection = copySelection(s);
-      emitNewSelection()
-    }
-    this.addListener = function(eventName, handler) {
-      var i, l = listeners.length;
-      for(i = 0;i < l;i += 1) {
-        if(listeners[i] === handler) {
-          return
-        }
-      }
-      listeners.push(handler)
-    };
-    listenEvent(element, "mouseup", checkSelection);
-    listenEvent(element, "keyup", checkSelection);
-    listenEvent(element, "keydown", checkSelection)
-  }
-  var style2CSS = new odf.Style2CSS, namespaces = style2CSS.namespaces, drawns = namespaces.draw, fons = namespaces.fo, officens = namespaces.office, svgns = namespaces.svg, textns = namespaces.text, xlinkns = namespaces.xlink, window = runtime.getWindow(), xpath = new xmldom.XPath, eventHandlers = {}, editparagraph, loadingQueue = new LoadingQueue;
-  function addEventListener(eventType, eventHandler) {
-    var handlers = eventHandlers[eventType];
-    if(handlers === undefined) {
-      handlers = eventHandlers[eventType] = []
-    }
-    if(eventHandler && handlers.indexOf(eventHandler) === -1) {
-      handlers.push(eventHandler)
-    }
-  }
-  function fireEvent(eventType, args) {
-    if(!eventHandlers.hasOwnProperty(eventType)) {
-      return
-    }
-    var handlers = eventHandlers[eventType], i;
-    for(i = 0;i < handlers.length;i += 1) {
-      handlers[i](args)
-    }
-  }
-  function clear(element) {
-    while(element.firstChild) {
-      element.removeChild(element.firstChild)
-    }
-  }
-  function handleStyles(odfelement, stylesxmlcss) {
-    var style2css = new odf.Style2CSS;
-    style2css.style2css(stylesxmlcss.sheet, odfelement.styles, odfelement.automaticStyles)
-  }
-  function setFramePosition(id, frame, stylesheet) {
-    frame.setAttribute("styleid", id);
-    var rule, anchor = frame.getAttributeNS(textns, "anchor-type"), x = frame.getAttributeNS(svgns, "x"), y = frame.getAttributeNS(svgns, "y"), width = frame.getAttributeNS(svgns, "width"), height = frame.getAttributeNS(svgns, "height"), minheight = frame.getAttributeNS(fons, "min-height"), minwidth = frame.getAttributeNS(fons, "min-width");
-    if(anchor === "as-char") {
-      rule = "display: inline-block;"
-    }else {
-      if(anchor || x || y) {
-        rule = "position: absolute;"
-      }else {
-        if(width || height || minheight || minwidth) {
-          rule = "display: block;"
-        }
-      }
-    }
-    if(x) {
-      rule += "left: " + x + ";"
-    }
-    if(y) {
-      rule += "top: " + y + ";"
-    }
-    if(width) {
-      rule += "width: " + width + ";"
-    }
-    if(height) {
-      rule += "height: " + height + ";"
-    }
-    if(minheight) {
-      rule += "min-height: " + minheight + ";"
-    }
-    if(minwidth) {
-      rule += "min-width: " + minwidth + ";"
-    }
-    if(rule) {
-      rule = "draw|" + frame.localName + '[styleid="' + id + '"] {' + rule + "}";
-      stylesheet.insertRule(rule, stylesheet.cssRules.length)
-    }
-  }
-  function getUrlFromBinaryDataElement(image) {
-    var node = image.firstChild;
-    while(node) {
-      if(node.namespaceURI === officens && node.localName === "binary-data") {
-        return"data:image/png;base64," + node.textContent
-      }
-      node = node.nextSibling
-    }
-    return""
-  }
-  function setImage(id, container, image, stylesheet) {
-    image.setAttribute("styleid", id);
-    var url = image.getAttributeNS(xlinkns, "href"), part, node;
-    function callback(url) {
-      var rule = "background-image: url(" + url + ");";
-      rule = 'draw|image[styleid="' + id + '"] {' + rule + "}";
-      stylesheet.insertRule(rule, stylesheet.cssRules.length)
-    }
-    if(url) {
-      try {
-        if(container.getPartUrl) {
-          url = container.getPartUrl(url);
-          callback(url)
-        }else {
-          part = container.getPart(url);
-          part.onchange = function(part) {
-            callback(part.url)
-          };
-          part.load()
-        }
-      }catch(e) {
-        runtime.log("slight problem: " + e)
-      }
-    }else {
-      url = getUrlFromBinaryDataElement(image);
-      callback(url)
-    }
-  }
-  function formatParagraphAnchors(odfbody) {
-    var runtimens = "urn:webodf", n, i, nodes = xpath.getODFElementsWithXPath(odfbody, ".//*[*[@text:anchor-type='paragraph']]", style2CSS.namespaceResolver);
-    for(i = 0;i < nodes.length;i += 1) {
-      n = nodes[i];
-      if(n.setAttributeNS) {
-        n.setAttributeNS(runtimens, "containsparagraphanchor", true)
-      }
-    }
-  }
-  function modifyImages(container, odfbody, stylesheet) {
-    var node, frames, i, images;
-    function namespaceResolver(prefix) {
-      return namespaces[prefix]
-    }
-    frames = [];
-    node = odfbody.firstChild;
-    while(node && node !== odfbody) {
-      if(node.namespaceURI === drawns) {
-        frames[frames.length] = node
-      }
-      if(node.firstChild) {
-        node = node.firstChild
-      }else {
-        while(node && node !== odfbody && !node.nextSibling) {
-          node = node.parentNode
-        }
-        if(node && node.nextSibling) {
-          node = node.nextSibling
-        }
-      }
-    }
-    for(i = 0;i < frames.length;i += 1) {
-      node = frames[i];
-      setFramePosition("frame" + String(i), node, stylesheet)
-    }
-    formatParagraphAnchors(odfbody)
-  }
-  function loadImages(container, odffragment, stylesheet) {
-    var i, images, node;
-    function loadImage(name, container, node, stylesheet) {
-      loadingQueue.addToQueue(function() {
-        setImage(name, container, node, stylesheet)
-      })
-    }
-    images = odffragment.getElementsByTagNameNS(drawns, "image");
-    for(i = 0;i < images.length;i += 1) {
-      node = images.item(i);
-      loadImage("image" + String(i), container, node, stylesheet)
-    }
-  }
-  function setVideo(id, container, plugin, stylesheet) {
-    var video, source, url, videoType, doc = plugin.ownerDocument, part, node;
-    url = plugin.getAttributeNS(xlinkns, "href");
-    function callback(url, mimetype) {
-      if(mimetype.substr(0, 6) === "video/") {
-        video = doc.createElementNS(doc.documentElement.namespaceURI, "video");
-        video.setAttribute("controls", "controls");
-        source = doc.createElement("source");
-        source.setAttribute("src", url);
-        source.setAttribute("type", mimetype);
-        video.appendChild(source);
-        plugin.parentNode.appendChild(video)
-      }else {
-        plugin.innerHtml = "Unrecognised Plugin"
-      }
-    }
-    if(url) {
-      try {
-        if(container.getPartUrl) {
-          url = container.getPartUrl(url);
-          callback(url, "video/mp4")
-        }else {
-          part = container.getPart(url);
-          part.onchange = function(part) {
-            callback(part.url, part.mimetype)
-          };
-          part.load()
-        }
-      }catch(e) {
-        runtime.log("slight problem: " + e)
-      }
-    }else {
-      runtime.log("using MP4 data fallback");
-      url = getUrlFromBinaryDataElement(plugin);
-      callback(url, "video/mp4")
-    }
-  }
-  function loadVideos(container, odffragment, stylesheet) {
-    var i, plugins, node;
-    function loadVideo(name, container, node, stylesheet) {
-      loadingQueue.addToQueue(function() {
-        setVideo(name, container, node, stylesheet)
-      })
-    }
-    plugins = odffragment.getElementsByTagNameNS(drawns, "plugin");
-    runtime.log("Loading Videos:");
-    for(i = 0;i < plugins.length;i += 1) {
-      runtime.log("...Found a video.");
-      node = plugins.item(i);
-      loadVideo("video" + String(i), container, node, stylesheet)
-    }
-  }
-  function addStyleSheet(document) {
-    var styles = document.getElementsByTagName("style"), head = document.getElementsByTagName("head")[0], text = "", prefix, a = "", b;
-    if(styles && styles.length > 0) {
-      styles = styles[0].cloneNode(false)
-    }else {
-      styles = document.createElement("style")
-    }
-    for(prefix in namespaces) {
-      if(namespaces.hasOwnProperty(prefix) && prefix) {
-        text += "@namespace " + prefix + " url(" + namespaces[prefix] + ");\n"
-      }
-    }
-    styles.appendChild(document.createTextNode(text));
-    head.appendChild(styles);
-    return styles
-  }
-  odf.OdfCanvas = function OdfCanvas(element) {
-    var self = this, document = element.ownerDocument, odfcontainer, formatting = new odf.Formatting, selectionWatcher = new SelectionWatcher(element), slidecssindex = 0, pageSwitcher = new PageSwitcher(addStyleSheet(document)), stylesxmlcss = addStyleSheet(document), positioncss = addStyleSheet(document), editable = false, zoomLevel = 1;
-    function fixContainerSize() {
-      var sizer = element.firstChild, odfdoc = sizer.firstChild;
-      if(!odfdoc) {
-        return
-      }
-      element.style.WebkitTransform = "scale(" + zoomLevel + ")";
-      element.style.WebkitTransformOrigin = "left top";
-      element.style.width = Math.round(zoomLevel * odfdoc.offsetWidth) + "px";
-      element.style.height = Math.round(zoomLevel * odfdoc.offsetHeight) + "px"
-    }
-    function handleContent(container, odfnode) {
-      var css = positioncss.sheet, sizer;
-      modifyImages(container, odfnode.body, css);
-      css.insertRule("draw|page { background-color:#fff; }", css.cssRules.length);
-      clear(element);
-      sizer = document.createElement("div");
-      sizer.style.display = "inline-block";
-      sizer.style.background = "white";
-      sizer.appendChild(odfnode);
-      element.appendChild(sizer);
-      loadImages(container, odfnode.body, css);
-      loadVideos(container, odfnode.body, css);
-      fixContainerSize()
-    }
-    function refreshOdf(container) {
-      if(odfcontainer !== container) {
-        return
-      }
-      function callback() {
-        clear(element);
-        element.style.display = "inline-block";
-        var odfnode = container.rootElement;
-        element.ownerDocument.importNode(odfnode, true);
-        formatting.setOdfContainer(container);
-        handleStyles(odfnode, stylesxmlcss);
-        handleContent(container, odfnode);
-        fireEvent("statereadychange")
-      }
-      if(odfcontainer.state === odf.OdfContainer.DONE) {
-        callback()
-      }else {
-        odfcontainer.onchange = callback
-      }
-    }
-    this.odfContainer = function() {
-      return odfcontainer
-    };
-    this.slidevisibilitycss = function() {
-      return pageSwitcher.css
-    };
-    this["load"] = this.load = function(url) {
-      loadingQueue.clearQueue();
-      element.innerHTML = "loading " + url;
-      odfcontainer = new odf.OdfContainer(url, function(container) {
-        odfcontainer = container;
-        refreshOdf(container)
-      });
-      odfcontainer.onstatereadychange = refreshOdf
-    };
-    function stopEditing() {
-      if(!editparagraph) {
-        return
-      }
-      var fragment = editparagraph.ownerDocument.createDocumentFragment();
-      while(editparagraph.firstChild) {
-        fragment.insertBefore(editparagraph.firstChild, null)
-      }
-      editparagraph.parentNode.replaceChild(fragment, editparagraph)
-    }
-    this.save = function(callback) {
-      stopEditing();
-      odfcontainer.save(callback)
-    };
-    function cancelPropagation(event) {
-      if(event.stopPropagation) {
-        event.stopPropagation()
-      }else {
-        event.cancelBubble = true
-      }
-    }
-    function cancelEvent(event) {
-      if(event.preventDefault) {
-        event.preventDefault();
-        event.stopPropagation()
-      }else {
-        event.returnValue = false;
-        event.cancelBubble = true
-      }
-    }
-    this.setEditable = function(iseditable) {
-      editable = iseditable;
-      if(!editable) {
-        stopEditing()
-      }
-    };
-    function processClick(evt) {
-      evt = evt || window.event;
-      var e = evt.target, selection = window.getSelection(), range = selection.rangeCount > 0 ? selection.getRangeAt(0) : null, startContainer = range && range.startContainer, startOffset = range && range.startOffset, endContainer = range && range.endContainer, endOffset = range && range.endOffset;
-      while(e && !((e.localName === "p" || e.localName === "h") && e.namespaceURI === textns)) {
-        e = e.parentNode
-      }
-      if(!editable) {
-        return
-      }
-      if(!e || e.parentNode === editparagraph) {
-        return
-      }
-      if(!editparagraph) {
-        editparagraph = e.ownerDocument.createElement("p");
-        if(!editparagraph.style) {
-          editparagraph = e.ownerDocument.createElementNS("http://www.w3.org/1999/xhtml", "p")
-        }
-        editparagraph.style.margin = "0px";
-        editparagraph.style.padding = "0px";
-        editparagraph.style.border = "0px";
-        editparagraph.setAttribute("contenteditable", true)
-      }else {
-        if(editparagraph.parentNode) {
-          stopEditing()
-        }
-      }
-      e.parentNode.replaceChild(editparagraph, e);
-      editparagraph.appendChild(e);
-      editparagraph.focus();
-      if(range) {
-        selection.removeAllRanges();
-        range = e.ownerDocument.createRange();
-        range.setStart(startContainer, startOffset);
-        range.setEnd(endContainer, endOffset);
-        selection.addRange(range)
-      }
-      cancelEvent(evt)
-    }
-    this.addListener = function(eventName, handler) {
-      if(eventName === "selectionchange") {
-        selectionWatcher.addListener(eventName, handler)
-      }else {
-        addEventListener(eventName, handler)
-      }
-    };
-    this.getFormatting = function() {
-      return formatting
-    };
-    this.setZoomLevel = function(zoom) {
-      zoomLevel = zoom;
-      fixContainerSize()
-    };
-    this.getZoomLevel = function() {
-      return zoomLevel
-    };
-    this.fitToContainingElement = function(width, height) {
-      var realWidth = element.offsetWidth / zoomLevel, realHeight = element.offsetHeight / zoomLevel;
-      zoomLevel = width / realWidth;
-      if(height / realHeight < zoomLevel) {
-        zoomLevel = height / realHeight
-      }
-      fixContainerSize()
-    };
-    this.fitToWidth = function(width) {
-      var realWidth = element.offsetWidth / zoomLevel;
-      zoomLevel = width / realWidth;
-      fixContainerSize()
-    };
-    this.fitToHeight = function(height) {
-      var realHeight = element.offsetHeight / zoomLevel;
-      zoomLevel = height / realHeight;
-      fixContainerSize()
-    };
-    this.showNextPage = function() {
-      pageSwitcher.showNextPage()
-    };
-    this.showPreviousPage = function() {
-      pageSwitcher.showPreviousPage()
-    };
-    this.showAllPages = function() {
-    };
-    listenEvent(element, "click", processClick)
-  };
-  return odf.OdfCanvas
-}();
-runtime.loadClass("xmldom.XPath");
-runtime.loadClass("odf.Style2CSS");
-gui.PresenterUI = function() {
-  var s2css = new odf.Style2CSS, xpath = new xmldom.XPath, nsResolver = s2css.namespaceResolver;
-  return function PresenterUI(odf_element) {
-    var self = this;
-    self.setInitialSlideMode = function() {
-      self.startSlideMode("single")
-    };
-    self.keyDownHandler = function(ev) {
-      if(ev.target.isContentEditable) {
-        return
-      }
-      if(ev.target.nodeName === "input") {
-        return
-      }
-      switch(ev.keyCode) {
-        case 84:
-          self.toggleToolbar();
-          break;
-        case 37:
-        ;
-        case 8:
-          self.prevSlide();
-          break;
-        case 39:
-        ;
-        case 32:
-          self.nextSlide();
-          break;
-        case 36:
-          self.firstSlide();
-          break;
-        case 35:
-          self.lastSlide();
-          break
-      }
-    };
-    self.root = function() {
-      return self.odf_canvas.odfContainer().rootElement
-    };
-    self.firstSlide = function() {
-      self.slideChange(function(old, pc) {
-        return 0
-      })
-    };
-    self.lastSlide = function() {
-      self.slideChange(function(old, pc) {
-        return pc - 1
-      })
-    };
-    self.nextSlide = function() {
-      self.slideChange(function(old, pc) {
-        return old + 1 < pc ? old + 1 : -1
-      })
-    };
-    self.prevSlide = function() {
-      self.slideChange(function(old, pc) {
-        return old < 1 ? -1 : old - 1
-      })
-    };
-    self.slideChange = function(indexChanger) {
-      var pages = self.getPages(self.odf_canvas.odfContainer().rootElement), last = -1, i = 0, newidx, pagelist;
-      pages.forEach(function(tuple) {
-        var name = tuple[0], node = tuple[1];
-        if(node.hasAttribute("slide_current")) {
-          last = i;
-          node.removeAttribute("slide_current")
-        }
-        i += 1
-      });
-      newidx = indexChanger(last, pages.length);
-      if(newidx === -1) {
-        newidx = last
-      }
-      pages[newidx][1].setAttribute("slide_current", "1");
-      pagelist = document.getElementById("pagelist");
-      pagelist.selectedIndex = newidx;
-      if(self.slide_mode === "cont") {
-        window.scrollBy(0, pages[newidx][1].getBoundingClientRect().top - 30)
-      }
-    };
-    self.selectSlide = function(idx) {
-      self.slideChange(function(old, pc) {
-        if(idx >= pc) {
-          return-1
-        }
-        if(idx < 0) {
-          return-1
-        }
-        return idx
-      })
-    };
-    self.scrollIntoContView = function(idx) {
-      var pages = self.getPages(self.odf_canvas.odfContainer().rootElement);
-      if(pages.length === 0) {
-        return
-      }
-      window.scrollBy(0, pages[idx][1].getBoundingClientRect().top - 30)
-    };
-    self.getPages = function(root) {
-      var pagenodes = root.getElementsByTagNameNS(nsResolver("draw"), "page"), pages = [], i;
-      for(i = 0;i < pagenodes.length;i += 1) {
-        pages.push([pagenodes[i].getAttribute("draw:name"), pagenodes[i]])
-      }
-      return pages
-    };
-    self.fillPageList = function(odfdom_root, html_select) {
-      var pages = self.getPages(odfdom_root), i, html_option, res, page_denom;
-      while(html_select.firstChild) {
-        html_select.removeChild(html_select.firstChild)
-      }
-      for(i = 0;i < pages.length;i += 1) {
-        html_option = document.createElement("option");
-        res = xpath.getODFElementsWithXPath(pages[i][1], './draw:frame[@presentation:class="title"]//draw:text-box/text:p', xmldom.XPath);
-        page_denom = res.length > 0 ? res[0].textContent : pages[i][0];
-        html_option.textContent = i + 1 + ": " + page_denom;
-        html_select.appendChild(html_option)
-      }
-    };
-    self.startSlideMode = function(mode) {
-      var pagelist = document.getElementById("pagelist"), css = self.odf_canvas.slidevisibilitycss().sheet;
-      self.slide_mode = mode;
-      while(css.cssRules.length > 0) {
-        css.deleteRule(0)
-      }
-      self.selectSlide(0);
-      if(self.slide_mode === "single") {
-        css.insertRule("draw|page { position:fixed; left:0px;top:30px; z-index:1; }", 0);
-        css.insertRule("draw|page[slide_current]  { z-index:2;}", 1);
-        css.insertRule("draw|page  { -webkit-transform: scale(1);}", 2);
-        self.fitToWindow();
-        window.addEventListener("resize", self.fitToWindow, false)
-      }else {
-        if(self.slide_mode === "cont") {
-          window.removeEventListener("resize", self.fitToWindow, false)
-        }
-      }
-      self.fillPageList(self.odf_canvas.odfContainer().rootElement, pagelist)
-    };
-    self.toggleToolbar = function() {
-      var css, found, i;
-      css = self.odf_canvas.slidevisibilitycss().sheet;
-      found = -1;
-      for(i = 0;i < css.cssRules.length;i += 1) {
-        if(css.cssRules[i].cssText.substring(0, 8) === ".toolbar") {
-          found = i;
-          break
-        }
-      }
-      if(found > -1) {
-        css.deleteRule(found)
-      }else {
-        css.insertRule(".toolbar { position:fixed; left:0px;top:-200px; z-index:0; }", 0)
-      }
-    };
-    self.fitToWindow = function() {
-      function ruleByFactor(f) {
-        return"draw|page { \n" + "-moz-transform: scale(" + f + "); \n" + "-moz-transform-origin: 0% 0%; " + "-webkit-transform-origin: 0% 0%; -webkit-transform: scale(" + f + "); " + "-o-transform-origin: 0% 0%; -o-transform: scale(" + f + "); " + "-ms-transform-origin: 0% 0%; -ms-transform: scale(" + f + "); " + "}"
-      }
-      var pages = self.getPages(self.root()), factorVert = (window.innerHeight - 40) / pages[0][1].clientHeight, factorHoriz = (window.innerWidth - 10) / pages[0][1].clientWidth, factor = factorVert < factorHoriz ? factorVert : factorHoriz, css = self.odf_canvas.slidevisibilitycss().sheet;
-      css.deleteRule(2);
-      css.insertRule(ruleByFactor(factor), 2)
-    };
-    self.load = function(url) {
-      self.odf_canvas.load(url)
-    };
-    self.odf_element = odf_element;
-    self.odf_canvas = new odf.OdfCanvas(self.odf_element);
-    self.odf_canvas.addListener("statereadychange", self.setInitialSlideMode);
-    self.slide_mode = "undefined";
-    document.addEventListener("keydown", self.keyDownHandler, false)
-  }
-}();
-gui.Caret = function Caret(selection, rootNode) {
-  var document = rootNode.ownerDocument, cursorns, cursorNode;
-  cursorns = "urn:webodf:names:cursor";
-  cursorNode = document.createElementNS(cursorns, "cursor");
-  this.updateToSelection = function() {
-    var range;
-    if(selection.rangeCount === 1) {
-      range = selection.getRangeAt(0)
-    }
-  }
-};
-runtime.loadClass("core.Cursor");
-gui.SelectionMover = function SelectionMover(selection, pointWalker) {
-  var doc = pointWalker.node().ownerDocument, cursor = new core.Cursor(selection, doc);
-  function getActiveRange(node) {
-    var range;
-    if(selection.rangeCount === 0) {
-      selection.addRange(node.ownerDocument.createRange())
-    }
-    return selection.getRangeAt(selection.rangeCount - 1)
-  }
-  function setStart(node, offset) {
-    var ranges = [], i, range;
-    for(i = 0;i < selection.rangeCount;i += 1) {
-      ranges[i] = selection.getRangeAt(i)
-    }
-    selection.removeAllRanges();
-    if(ranges.length === 0) {
-      ranges[0] = node.ownerDocument.createRange()
-    }
-    ranges[ranges.length - 1].setStart(pointWalker.node(), pointWalker.position());
-    for(i = 0;i < ranges.length;i += 1) {
-      selection.addRange(ranges[i])
-    }
-  }
-  function doMove(extend, move) {
-    if(selection.rangeCount === 0) {
-      return
-    }
-    var range = selection.getRangeAt(0), element;
-    if(!range.startContainer || range.startContainer.nodeType !== 1) {
-      return
-    }
-    element = range.startContainer;
-    pointWalker.setPoint(element, range.startOffset);
-    move();
-    setStart(pointWalker.node(), pointWalker.position())
-  }
-  function doMoveForward(extend, move) {
-    if(selection.rangeCount === 0) {
-      return
-    }
-    move();
-    var range = selection.getRangeAt(0), element;
-    if(!range.startContainer || range.startContainer.nodeType !== 1) {
-      return
-    }
-    element = range.startContainer;
-    pointWalker.setPoint(element, range.startOffset)
-  }
-  function moveCursor(node, offset, selectMode) {
-    if(selectMode) {
-      selection.extend(node, offset)
-    }else {
-      selection.collapse(node, offset)
-    }
-    cursor.updateToSelection()
-  }
-  function moveCursorLeft() {
-    var element;
-    if(!selection.focusNode || selection.focusNode.nodeType !== 1) {
-      return
-    }
-    element = selection.focusNode;
-    pointWalker.setPoint(element, selection.focusOffset);
-    pointWalker.stepBackward();
-    moveCursor(pointWalker.node(), pointWalker.position(), false)
-  }
-  function moveCursorRight() {
-    cursor.remove();
-    var element;
-    if(!selection.focusNode || selection.focusNode.nodeType !== 1) {
-      return
-    }
-    element = selection.focusNode;
-    pointWalker.setPoint(element, selection.focusOffset);
-    pointWalker.stepForward();
-    moveCursor(pointWalker.node(), pointWalker.position(), false)
-  }
-  function moveCursorUp() {
-    var rect = cursor.getNode().getBoundingClientRect(), x = rect.left, y = rect.top, arrived = false, left = 200;
-    while(!arrived && left) {
-      left -= 1;
-      moveCursorLeft();
-      rect = cursor.getNode().getBoundingClientRect();
-      arrived = rect.top !== y && rect.left < x
-    }
-  }
-  function moveCursorDown() {
-    cursor.updateToSelection();
-    var rect = cursor.getNode().getBoundingClientRect(), x = rect.left, y = rect.top, arrived = false, left = 200;
-    while(!arrived) {
-      left -= 1;
-      moveCursorRight();
-      rect = cursor.getNode().getBoundingClientRect();
-      arrived = rect.top !== y && rect.left > x
-    }
-  }
-  this.movePointForward = function(extend) {
-    doMove(extend, pointWalker.stepForward)
-  };
-  this.movePointBackward = function(extend) {
-    doMove(extend, pointWalker.stepBackward)
-  };
-  this.moveLineForward = function(extend) {
-    if(selection.modify) {
-      selection.modify(extend ? "extend" : "move", "forward", "line")
-    }else {
-      doMove(extend, moveCursorDown)
-    }
-  };
-  this.moveLineBackward = function(extend) {
-    if(selection.modify) {
-      selection.modify(extend ? "extend" : "move", "backward", "line")
-    }else {
-      doMove(extend, function() {
-      })
-    }
-  };
-  return this
-};
-runtime.loadClass("core.PointWalker");
-runtime.loadClass("core.Cursor");
-gui.XMLEdit = function XMLEdit(element, stylesheet) {
-  var simplecss, cssprefix, documentElement, customNS = "customns", walker = null;
-  if(!element.id) {
-    element.id = "xml" + String(Math.random()).substring(2)
-  }
-  cssprefix = "#" + element.id + " ";
-  function installHandlers() {
-  }
-  simplecss = cssprefix + "*," + cssprefix + ":visited, " + cssprefix + ":link {display:block; margin: 0px; margin-left: 10px; font-size: medium; color: black; background: white; font-variant: normal; font-weight: normal; font-style: normal; font-family: sans-serif; text-decoration: none; white-space: pre-wrap; height: auto; width: auto}\n" + cssprefix + ":before {color: blue; content: '<' attr(customns_name) attr(customns_atts) '>';}\n" + cssprefix + ":after {color: blue; content: '</' attr(customns_name) '>';}\n" + 
-  cssprefix + "{overflow: auto;}\n";
-  function listenEvent(eventTarget, eventType, eventHandler) {
-    if(eventTarget.addEventListener) {
-      eventTarget.addEventListener(eventType, eventHandler, false)
-    }else {
-      if(eventTarget.attachEvent) {
-        eventType = "on" + eventType;
-        eventTarget.attachEvent(eventType, eventHandler)
-      }else {
-        eventTarget["on" + eventType] = eventHandler
-      }
-    }
-  }
-  function cancelEvent(event) {
-    if(event.preventDefault) {
-      event.preventDefault()
-    }else {
-      event.returnValue = false
-    }
-  }
-  function isCaretMoveCommand(charCode) {
-    if(charCode >= 16 && charCode <= 20) {
-      return true
-    }
-    if(charCode >= 33 && charCode <= 40) {
-      return true
-    }
-    return false
-  }
-  function syncSelectionWithWalker() {
-    var sel = element.ownerDocument.defaultView.getSelection(), r;
-    if(!sel || sel.rangeCount <= 0 || !walker) {
-      return
-    }
-    r = sel.getRangeAt(0);
-    walker.setPoint(r.startContainer, r.startOffset)
-  }
-  function syncWalkerWithSelection() {
-    var sel = element.ownerDocument.defaultView.getSelection(), n, r;
-    sel.removeAllRanges();
-    if(!walker || !walker.node()) {
-      return
-    }
-    n = walker.node();
-    r = n.ownerDocument.createRange();
-    r.setStart(n, walker.position());
-    r.collapse(true);
-    sel.addRange(r)
-  }
-  function handleKeyDown(event) {
-    var charCode = event.charCode || event.keyCode;
-    walker = null;
-    if(walker && charCode === 39) {
-      syncSelectionWithWalker();
-      walker.stepForward();
-      syncWalkerWithSelection()
-    }else {
-      if(walker && charCode === 37) {
-        syncSelectionWithWalker();
-        walker.stepBackward();
-        syncWalkerWithSelection()
-      }else {
-        if(isCaretMoveCommand(charCode)) {
-          return
-        }
-      }
-    }
-    cancelEvent(event)
-  }
-  function handleKeyPress(event) {
-  }
-  function handleClick(event) {
-    var sel = element.ownerDocument.defaultView.getSelection(), r = sel.getRangeAt(0), n = r.startContainer;
-    cancelEvent(event)
-  }
-  function initElement(element) {
-    listenEvent(element, "click", handleClick);
-    listenEvent(element, "keydown", handleKeyDown);
-    listenEvent(element, "keypress", handleKeyPress);
-    listenEvent(element, "drop", cancelEvent);
-    listenEvent(element, "dragend", cancelEvent);
-    listenEvent(element, "beforepaste", cancelEvent);
-    listenEvent(element, "paste", cancelEvent)
-  }
-  function cleanWhitespace(node) {
-    var n = node.firstChild, p, re = /^\s*$/;
-    while(n && n !== node) {
-      p = n;
-      n = n.nextSibling || n.parentNode;
-      if(p.nodeType === 3 && re.test(p.nodeValue)) {
-        p.parentNode.removeChild(p)
-      }
-    }
-  }
-  function setCssHelperAttributes(node) {
-    var atts, attsv, a, i;
-    atts = node.attributes;
-    attsv = "";
-    for(i = atts.length - 1;i >= 0;i -= 1) {
-      a = atts.item(i);
-      attsv = attsv + " " + a.nodeName + '="' + a.nodeValue + '"'
-    }
-    node.setAttribute("customns_name", node.nodeName);
-    node.setAttribute("customns_atts", attsv)
-  }
-  function addExplicitAttributes(node) {
-    var n = node.firstChild;
-    while(n && n !== node) {
-      if(n.nodeType === 1) {
-        addExplicitAttributes(n)
-      }
-      n = n.nextSibling || n.parentNode
-    }
-    setCssHelperAttributes(node);
-    cleanWhitespace(node)
-  }
-  function getNamespacePrefixes(node, prefixes) {
-    var n = node.firstChild, atts, att, i;
-    while(n && n !== node) {
-      if(n.nodeType === 1) {
-        getNamespacePrefixes(n, prefixes);
-        atts = n.attributes;
-        for(i = atts.length - 1;i >= 0;i -= 1) {
-          att = atts.item(i);
-          if(att.namespaceURI === "http://www.w3.org/2000/xmlns/") {
-            if(!prefixes[att.nodeValue]) {
-              prefixes[att.nodeValue] = att.localName
-            }
-          }
-        }
-      }
-      n = n.nextSibling || n.parentNode
-    }
-  }
-  function generateUniquePrefixes(prefixes) {
-    var taken = {}, ns, p, n = 0;
-    for(ns in prefixes) {
-      if(prefixes.hasOwnProperty(ns) && ns) {
-        p = prefixes[ns];
-        if(!p || taken.hasOwnProperty(p) || p === "xmlns") {
-          do {
-            p = "ns" + n;
-            n += 1
-          }while(taken.hasOwnProperty(p));
-          prefixes[ns] = p
-        }
-        taken[p] = true
-      }
-    }
-  }
-  function createCssFromXmlInstance(node) {
-    var prefixes = {}, css = "@namespace customns url(customns);\n", name, pre, ns, names, csssel;
-    getNamespacePrefixes(node, prefixes);
-    generateUniquePrefixes(prefixes);
-    return css
-  }
-  function updateCSS() {
-    var css = element.ownerDocument.createElement("style"), text = createCssFromXmlInstance(element);
-    css.type = "text/css";
-    text = text + simplecss;
-    css.appendChild(element.ownerDocument.createTextNode(text));
-    stylesheet = stylesheet.parentNode.replaceChild(css, stylesheet)
-  }
-  function getXML() {
-    return documentElement
-  }
-  function setXML(xml) {
-    var node = xml.documentElement || xml;
-    node = element.ownerDocument.importNode(node, true);
-    documentElement = node;
-    addExplicitAttributes(node);
-    while(element.lastChild) {
-      element.removeChild(element.lastChild)
-    }
-    element.appendChild(node);
-    updateCSS();
-    walker = new core.PointWalker(node)
-  }
-  initElement(element);
-  this.updateCSS = updateCSS;
-  this.setXML = setXML;
-  this.getXML = getXML
-};
-(function() {
-  return["core/Async.js", "core/Base64.js", "core/ByteArray.js", "core/ByteArrayWriter.js", "core/Cursor.js", "core/JSLint.js", "core/PointWalker.js", "core/RawDeflate.js", "core/RawInflate.js", "core/UnitTester.js", "core/Zip.js", "gui/Caret.js", "gui/SelectionMover.js", "gui/XMLEdit.js", "gui/PresenterUI.js", "odf/FontLoader.js", "odf/Formatting.js", "odf/OdfCanvas.js", "odf/OdfContainer.js", "odf/Style2CSS.js", "odf/StyleInfo.js", "xmldom/LSSerializer.js", "xmldom/LSSerializerFilter.js", "xmldom/OperationalTransformDOM.js", 
-  "xmldom/OperationalTransformInterface.js", "xmldom/RelaxNG.js", "xmldom/RelaxNG2.js", "xmldom/RelaxNGParser.js", "xmldom/XPath.js"]
-})();
-
diff --git a/apps/files_odfviewer/js/webodf.js b/apps/files_odfviewer/js/webodf.js
deleted file mode 100644
index 1b85527260..0000000000
--- a/apps/files_odfviewer/js/webodf.js
+++ /dev/null
@@ -1,343 +0,0 @@
-// Input 0
-/*
-
- @licstart
- The JavaScript code in this page is free software: you can redistribute it
- and/or modify it under the terms of the GNU Affero General Public License
- (GNU AGPL) as published by the Free Software Foundation, either version 3 of
- the License, or (at your option) any later version.  The code is distributed
- WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
-
- As additional permission under GNU AGPL version 3 section 7, you
- may distribute non-source (e.g., minimized or compacted) forms of
- that code without the copy of the GNU GPL normally required by
- section 4, provided you include this license notice and a URL
- through which recipients can access the Corresponding Source.
-
- As a special exception to the AGPL, any HTML file which merely makes function
- calls to this code, and for that purpose includes it by reference shall be
- deemed a separate work for copyright law purposes. In addition, the copyright
- holders of this code give you permission to combine this code with free
- software libraries that are released under the GNU LGPL. You may copy and
- distribute such a system following the terms of the GNU AGPL for this code
- and the LGPL for the libraries. If you modify this code, you may extend this
- exception to your version of the code, but you are not obligated to do so.
- If you do not wish to do so, delete this exception statement from your
- version.
-
- This license applies to this entire compilation.
- @licend
- @source: http://www.webodf.org/
- @source: http://gitorious.org/odfkit/webodf/
-*/
-var core={},gui={},xmldom={},odf={};
-// Input 1
-function Runtime(){}Runtime.ByteArray=function(){};Runtime.ByteArray.prototype.slice=function(){};Runtime.prototype.byteArrayFromArray=function(){};Runtime.prototype.byteArrayFromString=function(){};Runtime.prototype.byteArrayToString=function(){};Runtime.prototype.concatByteArrays=function(){};Runtime.prototype.read=function(){};Runtime.prototype.readFile=function(){};Runtime.prototype.readFileSync=function(){};Runtime.prototype.loadXML=function(){};Runtime.prototype.writeFile=function(){};
-Runtime.prototype.isFile=function(){};Runtime.prototype.getFileSize=function(){};Runtime.prototype.deleteFile=function(){};Runtime.prototype.log=function(){};Runtime.prototype.setTimeout=function(){};Runtime.prototype.libraryPaths=function(){};Runtime.prototype.type=function(){};Runtime.prototype.getDOMImplementation=function(){};Runtime.prototype.getWindow=function(){};var IS_COMPILED_CODE=!0;
-Runtime.byteArrayToString=function(j,l){function f(c){var b="",d,a=c.length;for(d=0;d<a;d+=1)b+=String.fromCharCode(c[d]&255);return b}function g(c){var b="",d,a=c.length,e,i,h;for(d=0;d<a;d+=1)e=c[d],128>e?b+=String.fromCharCode(e):(d+=1,i=c[d],224>e?b+=String.fromCharCode((e&31)<<6|i&63):(d+=1,h=c[d],b+=String.fromCharCode((e&15)<<12|(i&63)<<6|h&63)));return b}var a;"utf8"===l?a=g(j):("binary"!==l&&this.log("Unsupported encoding: "+l),a=f(j));return a};
-Runtime.getFunctionName=function(j){return void 0===j.name?(j=/function\s+(\w+)/.exec(j))&&j[1]:j.name};
-function BrowserRuntime(j){function l(c,b){var d,a,e;b?e=c:b=c;j?(a=j.ownerDocument,e&&(d=a.createElement("span"),d.className=e,d.appendChild(a.createTextNode(e)),j.appendChild(d),j.appendChild(a.createTextNode(" "))),d=a.createElement("span"),d.appendChild(a.createTextNode(b)),j.appendChild(d),j.appendChild(a.createElement("br"))):console&&console.log(b)}var f=this,g={},a=window.ArrayBuffer&&window.Uint8Array;this.ByteArray=a?function(c){Uint8Array.prototype.slice=function(b,c){void 0===c&&(void 0===
-b&&(b=0),c=this.length);var a=this.subarray(b,c),e,i,c=c-b;e=new Uint8Array(new ArrayBuffer(c));for(i=0;i<c;i+=1)e[i]=a[i];return e};return new Uint8Array(new ArrayBuffer(c))}:function(c){var b=[];b.length=c;return b};this.concatByteArrays=a?function(c,b){var d,a=c.length,e=b.length,i=new this.ByteArray(a+e);for(d=0;d<a;d+=1)i[d]=c[d];for(d=0;d<e;d+=1)i[d+a]=b[d];return i}:function(c,b){return c.concat(b)};this.byteArrayFromArray=function(c){return c.slice()};this.byteArrayFromString=function(c,b){var d;
-if("utf8"===b){d=c.length;var a,e,i,h=0;for(e=0;e<d;e+=1)i=c.charCodeAt(e),h+=1+(128<i)+(2048<i);a=new f.ByteArray(h);for(e=h=0;e<d;e+=1)i=c.charCodeAt(e),128>i?(a[h]=i,h+=1):2048>i?(a[h]=192|i>>>6,a[h+1]=128|i&63,h+=2):(a[h]=224|i>>>12&15,a[h+1]=128|i>>>6&63,a[h+2]=128|i&63,h+=3)}else{"binary"!==b&&f.log("unknown encoding: "+b);d=c.length;a=new f.ByteArray(d);for(e=0;e<d;e+=1)a[e]=c.charCodeAt(e)&255}return d=a};this.byteArrayToString=Runtime.byteArrayToString;this.readFile=function(c,b,d){if(g.hasOwnProperty(c))d(null,
-g[c]);else{var a=new XMLHttpRequest;a.open("GET",c,!0);a.onreadystatechange=function(){var e;4===a.readyState&&(0===a.status&&!a.responseText?d("File "+c+" is empty."):200===a.status||0===a.status?(e="binary"===b?"undefined"!==typeof VBArray?(new VBArray(a.responseBody)).toArray():f.byteArrayFromString(a.responseText,"binary"):a.responseText,g[c]=e,d(null,e)):d(a.responseText||a.statusText))};a.overrideMimeType&&("binary"!==b?a.overrideMimeType("text/plain; charset="+b):a.overrideMimeType("text/plain; charset=x-user-defined"));
-try{a.send(null)}catch(e){d(e.message)}}};this.read=function(c,b,a,k){if(g.hasOwnProperty(c))k(null,g[c].slice(b,b+a));else{var e=new XMLHttpRequest;e.open("GET",c,!0);e.onreadystatechange=function(){var i;4===e.readyState&&(0===e.status&&!e.responseText?k("File "+c+" is empty."):200===e.status||0===e.status?(i="undefined"!==typeof VBArray?(new VBArray(e.responseBody)).toArray():f.byteArrayFromString(e.responseText,"binary"),g[c]=i,k(null,i.slice(b,b+a))):k(e.responseText||e.statusText))};e.overrideMimeType&&
-e.overrideMimeType("text/plain; charset=x-user-defined");try{e.send(null)}catch(i){k(i.message)}}};this.readFileSync=function(c,b){var a=new XMLHttpRequest,k;a.open("GET",c,!1);a.overrideMimeType&&("binary"!==b?a.overrideMimeType("text/plain; charset="+b):a.overrideMimeType("text/plain; charset=x-user-defined"));try{if(a.send(null),200===a.status||0===a.status)k=a.responseText}catch(e){}return k};this.writeFile=function(c,b,a){g[c]=b;var k=new XMLHttpRequest;k.open("PUT",c,!0);k.onreadystatechange=
-function(){4===k.readyState&&(0===k.status&&!k.responseText?a("File "+c+" is empty."):200<=k.status&&300>k.status||0===k.status?a(null):a("Status "+k.status+": "+k.responseText||k.statusText))};b=b.buffer&&!k.sendAsBinary?b.buffer:f.byteArrayToString(b,"binary");try{k.sendAsBinary?k.sendAsBinary(b):k.send(b)}catch(e){f.log("HUH? "+e+" "+b),a(e.message)}};this.deleteFile=function(a,b){var d=new XMLHttpRequest;d.open("DELETE",a,!0);d.onreadystatechange=function(){4===d.readyState&&(200>d.status&&300<=
-d.status?b(d.responseText):b(null))};d.send(null)};this.loadXML=function(a,b){var d=new XMLHttpRequest;d.open("GET",a,!0);d.overrideMimeType&&d.overrideMimeType("text/xml");d.onreadystatechange=function(){4===d.readyState&&(0===d.status&&!d.responseText?b("File "+a+" is empty."):200===d.status||0===d.status?b(null,d.responseXML):b(d.responseText))};try{d.send(null)}catch(k){b(k.message)}};this.isFile=function(a,b){f.getFileSize(a,function(a){b(-1!==a)})};this.getFileSize=function(a,b){var d=new XMLHttpRequest;
-d.open("HEAD",a,!0);d.onreadystatechange=function(){if(4===d.readyState){var a=d.getResponseHeader("Content-Length");a?b(parseInt(a,10)):b(-1)}};d.send(null)};this.log=l;this.setTimeout=function(a,b){setTimeout(function(){a()},b)};this.libraryPaths=function(){return["lib"]};this.setCurrentDirectory=function(){};this.type=function(){return"BrowserRuntime"};this.getDOMImplementation=function(){return window.document.implementation};this.exit=function(a){l("Calling exit with code "+a+", but exit() is not implemented.")};
-this.getWindow=function(){return window}}
-function NodeJSRuntime(){var j=require("fs"),l="";this.ByteArray=function(f){return new Buffer(f)};this.byteArrayFromArray=function(f){var g=new Buffer(f.length),a,c=f.length;for(a=0;a<c;a+=1)g[a]=f[a];return g};this.concatByteArrays=function(f,g){var a=new Buffer(f.length+g.length);f.copy(a,0,0);g.copy(a,f.length,0);return a};this.byteArrayFromString=function(f,g){return new Buffer(f,g)};this.byteArrayToString=function(f,g){return f.toString(g)};this.readFile=function(f,g,a){"binary"!==g?j.readFile(f,
-g,a):j.readFile(f,null,a)};this.writeFile=function(f,g,a){j.writeFile(f,g,"binary",function(c){a(c||null)})};this.deleteFile=j.unlink;this.read=function(f,g,a,c){l&&(f=l+"/"+f);j.open(f,"r+",666,function(b,d){if(b)c(b);else{var k=new Buffer(a);j.read(d,k,0,a,g,function(a){j.close(d);c(a,k)})}})};this.readFileSync=function(f,g){return!g?"":j.readFileSync(f,g)};this.loadXML=function(){throw"Not implemented.";};this.isFile=function(f,g){l&&(f=l+"/"+f);j.stat(f,function(a,c){g(!a&&c.isFile())})};this.getFileSize=
-function(f,g){l&&(f=l+"/"+f);j.stat(f,function(a,c){a?g(-1):g(c.size)})};this.log=function(f){process.stderr.write(f+"\n")};this.setTimeout=function(f,g){setTimeout(function(){f()},g)};this.libraryPaths=function(){return[__dirname]};this.setCurrentDirectory=function(f){l=f};this.currentDirectory=function(){return l};this.type=function(){return"NodeJSRuntime"};this.getDOMImplementation=function(){return null};this.exit=process.exit;this.getWindow=function(){return null}}
-function RhinoRuntime(){var j=this,l=Packages.javax.xml.parsers.DocumentBuilderFactory.newInstance(),f,g,a="";l.setValidating(!1);l.setNamespaceAware(!0);l.setExpandEntityReferences(!1);l.setSchema(null);g=Packages.org.xml.sax.EntityResolver({resolveEntity:function(a,b){var d=new Packages.java.io.FileReader(b);return new Packages.org.xml.sax.InputSource(d)}});f=l.newDocumentBuilder();f.setEntityResolver(g);this.ByteArray=function(a){return[a]};this.byteArrayFromArray=function(a){return a};this.byteArrayFromString=
-function(a){var b=[],d,k=a.length;for(d=0;d<k;d+=1)b[d]=a.charCodeAt(d)&255;return b};this.byteArrayToString=Runtime.byteArrayToString;this.concatByteArrays=function(a,b){return a.concat(b)};this.loadXML=function(a,b){var d=new Packages.java.io.File(a),k;try{k=f.parse(d)}catch(e){print(e);b(e);return}b(null,k)};this.readFile=function(a,b,d){var k=new Packages.java.io.File(a),e="binary"===b?"latin1":b;k.isFile()?(a=readFile(a,e),"binary"===b&&(a=j.byteArrayFromString(a,"binary")),d(null,a)):d(a+" is not a file.")};
-this.writeFile=function(a,b,d){var a=new Packages.java.io.FileOutputStream(a),k,e=b.length;for(k=0;k<e;k+=1)a.write(b[k]);a.close();d(null)};this.deleteFile=function(a,b){(new Packages.java.io.File(a))["delete"]()?b(null):b("Could not delete "+a)};this.read=function(c,b,d,k){a&&(c=a+"/"+c);var e;e=c;var i="binary";(new Packages.java.io.File(e)).isFile()?("binary"===i&&(i="latin1"),e=readFile(e,i)):e=null;e?k(null,this.byteArrayFromString(e.substring(b,b+d),"binary")):k("Cannot read "+c)};this.readFileSync=
-function(a,b){return!b?"":readFile(a,b)};this.isFile=function(c,b){a&&(c=a+"/"+c);var d=new Packages.java.io.File(c);b(d.isFile())};this.getFileSize=function(c,b){a&&(c=a+"/"+c);var d=new Packages.java.io.File(c);b(d.length())};this.log=print;this.setTimeout=function(a){a()};this.libraryPaths=function(){return["lib"]};this.setCurrentDirectory=function(c){a=c};this.currentDirectory=function(){return a};this.type=function(){return"RhinoRuntime"};this.getDOMImplementation=function(){return f.getDOMImplementation()};
-this.exit=quit;this.getWindow=function(){return null}}var runtime=function(){return"undefined"!==typeof window?new BrowserRuntime(window.document.getElementById("logoutput")):"undefined"!==typeof require?new NodeJSRuntime:new RhinoRuntime}();
-(function(){function j(f){var a=f[0],c;c=eval("if (typeof "+a+" === 'undefined') {eval('"+a+" = {};');}"+a);for(a=1;a<f.length-1;a+=1)c.hasOwnProperty(f[a])||(c=c[f[a]]={});return c[f[f.length-1]]}var l={},f={};runtime.loadClass=function(g){function a(a){var a=a.replace(".","/")+".js",b=runtime.libraryPaths(),e,c,h;runtime.currentDirectory&&b.push(runtime.currentDirectory());for(e=0;e<b.length;e+=1){c=b[e];if(!f.hasOwnProperty(c))if((h=runtime.readFileSync(b[e]+"/manifest.js","utf8"))&&h.length)try{f[c]=
-eval(h)}catch(n){f[c]=null,runtime.log("Cannot load manifest for "+c+".")}else f[c]=null;if((c=f[c])&&c.indexOf&&-1!==c.indexOf(a))return b[e]+"/"+a}return null}if(!IS_COMPILED_CODE&&!l.hasOwnProperty(g)){var c=g.split("."),b;b=j(c);if(!b&&(b=function(b){var c,e;e=a(b);if(!e)throw b+" is not listed in any manifest.js.";try{c=runtime.readFileSync(e,"utf8")}catch(i){throw runtime.log("Error loading "+b+" "+i),i;}if(void 0===c)throw"Cannot load class "+b;try{c=eval(b+" = eval(code);")}catch(h){throw runtime.log("Error loading "+
-b+" "+h),h;}return c}(g),!b||Runtime.getFunctionName(b)!==c[c.length-1]))throw runtime.log("Loaded code is not for "+c[c.length-1]),"Loaded code is not for "+c[c.length-1];l[g]=!0}}})();
-(function(j){function l(f){if(f.length){var g=f[0];runtime.readFile(g,"utf8",function(a,c){function b(){var a;(a=eval(c))&&runtime.exit(a)}var d="";runtime.libraryPaths();-1!==g.indexOf("/")&&(d=g.substring(0,g.indexOf("/")));runtime.setCurrentDirectory(d);a?(runtime.log(a),runtime.exit(1)):b.apply(null,f)})}}j=Array.prototype.slice.call(j);"NodeJSRuntime"===runtime.type()?l(process.argv.slice(2)):"RhinoRuntime"===runtime.type()?l(j):l(j.slice(1))})("undefined"!==typeof arguments&&arguments);
-// Input 2
-core.Base64=function(){function j(a){var b=[],c,e=a.length;for(c=0;c<e;c+=1)b[c]=a.charCodeAt(c)&255;return b}function l(a){var b,c="",e,d=a.length-2;for(e=0;e<d;e+=3)b=a[e]<<16|a[e+1]<<8|a[e+2],c+=u[b>>>18],c+=u[b>>>12&63],c+=u[b>>>6&63],c+=u[b&63];e===d+1?(b=a[e]<<4,c+=u[b>>>6],c+=u[b&63],c+="=="):e===d&&(b=a[e]<<10|a[e+1]<<2,c+=u[b>>>12],c+=u[b>>>6&63],c+=u[b&63],c+="=");return c}function f(a){var a=a.replace(/[^A-Za-z0-9+\/]+/g,""),b=[],c=a.length%4,e,d=a.length,i;for(e=0;e<d;e+=4)i=(s[a.charAt(e)]||
-0)<<18|(s[a.charAt(e+1)]||0)<<12|(s[a.charAt(e+2)]||0)<<6|(s[a.charAt(e+3)]||0),b.push(i>>16,i>>8&255,i&255);b.length-=[0,0,2,1][c];return b}function g(a){var b=[],c,e=a.length,d;for(c=0;c<e;c+=1)d=a[c],128>d?b.push(d):2048>d?b.push(192|d>>>6,128|d&63):b.push(224|d>>>12&15,128|d>>>6&63,128|d&63);return b}function a(a){var b=[],c,e=a.length,d,i,m;for(c=0;c<e;c+=1)d=a[c],128>d?b.push(d):(c+=1,i=a[c],224>d?b.push((d&31)<<6|i&63):(c+=1,m=a[c],b.push((d&15)<<12|(i&63)<<6|m&63)));return b}function c(a){return l(j(a))}
-function b(a){return String.fromCharCode.apply(String,f(a))}function d(b){return a(j(b))}function k(b){for(var b=a(b),c="",e=0;e<b.length;)c+=String.fromCharCode.apply(String,b.slice(e,e+45E3)),e+=45E3;return c}function e(a,b,c){var e="",d,i,m;for(m=b;m<c;m+=1)b=a.charCodeAt(m)&255,128>b?e+=String.fromCharCode(b):(m+=1,d=a.charCodeAt(m)&255,224>b?e+=String.fromCharCode((b&31)<<6|d&63):(m+=1,i=a.charCodeAt(m)&255,e+=String.fromCharCode((b&15)<<12|(d&63)<<6|i&63)));return e}function i(a,b){function c(){var m=
-n+d;m>a.length&&(m=a.length);i+=e(a,n,m);n=m;m=n===a.length;b(i,m)&&!m&&runtime.setTimeout(c,0)}var d=1E5,i="",n=0;a.length<d?b(e(a,0,a.length),!0):("string"!==typeof a&&(a=a.slice()),c())}function h(a){return g(j(a))}function n(a){return String.fromCharCode.apply(String,g(a))}function o(a){return String.fromCharCode.apply(String,g(j(a)))}var u="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";(function(){var a=[],b;for(b=0;26>b;b+=1)a.push(65+b);for(b=0;26>b;b+=1)a.push(97+b);for(b=
-0;10>b;b+=1)a.push(48+b);a.push(43);a.push(47);return a})();var s=function(a){var b={},c,e;c=0;for(e=a.length;c<e;c+=1)b[a.charAt(c)]=c;return b}(u),p,w,B,A;(B=runtime.getWindow()&&runtime.getWindow().btoa)?p=function(a){return B(o(a))}:(B=c,p=function(a){return l(h(a))});(A=runtime.getWindow()&&runtime.getWindow().atob)?w=function(a){a=A(a);return e(a,0,a.length)}:(A=b,w=function(a){return k(f(a))});return function(){this.convertByteArrayToBase64=this.convertUTF8ArrayToBase64=l;this.convertBase64ToByteArray=
-this.convertBase64ToUTF8Array=f;this.convertUTF16ArrayToByteArray=this.convertUTF16ArrayToUTF8Array=g;this.convertByteArrayToUTF16Array=this.convertUTF8ArrayToUTF16Array=a;this.convertUTF8StringToBase64=c;this.convertBase64ToUTF8String=b;this.convertUTF8StringToUTF16Array=d;this.convertByteArrayToUTF16String=this.convertUTF8ArrayToUTF16String=k;this.convertUTF8StringToUTF16String=i;this.convertUTF16StringToByteArray=this.convertUTF16StringToUTF8Array=h;this.convertUTF16ArrayToUTF8String=n;this.convertUTF16StringToUTF8String=
-o;this.convertUTF16StringToBase64=p;this.convertBase64ToUTF16String=w;this.fromBase64=b;this.toBase64=c;this.atob=A;this.btoa=B;this.utob=o;this.btou=i;this.encode=p;this.encodeURI=function(a){return p(a).replace(/[+\/]/g,function(a){return a==="+"?"-":"_"}).replace(/\\=+$/,"")};this.decode=function(a){return w(a.replace(/[\-_]/g,function(a){return a==="-"?"+":"/"}))}}}();
-// Input 3
-core.RawDeflate=function(){function j(){this.dl=this.fc=0}function l(){this.extra_bits=this.static_tree=this.dyn_tree=null;this.max_code=this.max_length=this.elems=this.extra_base=0}function f(a,b,c,e){this.good_length=a;this.max_lazy=b;this.nice_length=c;this.max_chain=e}function g(){this.next=null;this.len=0;this.ptr=[];this.ptr.length=a;this.off=0}var a=8192,c,b,d,k,e=null,i,h,n,o,u,s,p,w,B,A,q,x,E,C,z,F,m,t,r,y,L,T,O,N,v,J,G,R,K,H,D,U,M,I,V,Z,S,$,Y,ha,ca,da,P,ia,pa,aa,ea,W,ba,ja,qa,ra=[0,0,0,
-0,0,0,0,0,1,1,1,1,2,2,2,2,3,3,3,3,4,4,4,4,5,5,5,5,0],fa=[0,0,0,0,1,1,2,2,3,3,4,4,5,5,6,6,7,7,8,8,9,9,10,10,11,11,12,12,13,13],Ha=[0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,2,3,7],va=[16,17,18,0,8,7,9,6,10,5,11,4,12,3,13,2,14,1,15],ka;ka=[new f(0,0,0,0),new f(4,4,8,4),new f(4,5,16,8),new f(4,6,32,32),new f(4,4,16,16),new f(8,16,32,32),new f(8,16,128,128),new f(8,32,128,256),new f(32,128,258,1024),new f(32,258,258,4096)];var la=function(m){e[h+i++]=m;if(h+i===a){var r;if(0!==i){null!==c?(m=c,c=c.next):m=new g;
-m.next=null;m.len=m.off=0;null===b?b=d=m:d=d.next=m;m.len=i-h;for(r=0;r<m.len;r++)m.ptr[r]=e[h+r];i=h=0}}},ma=function(b){b&=65535;h+i<a-2?(e[h+i++]=b&255,e[h+i++]=b>>>8):(la(b&255),la(b>>>8))},na=function(){q=(q<<5^o[m+3-1]&255)&8191;x=p[32768+q];p[m&32767]=x;p[32768+q]=m},Q=function(a,b){B>16-b?(w|=a<<B,ma(w),w=a>>16-B,B+=b-16):(w|=a<<B,B+=b)},X=function(a,b){Q(b[a].fc,b[a].dl)},wa=function(a,b,c){return a[b].fc<a[c].fc||a[b].fc===a[c].fc&&S[b]<=S[c]},xa=function(a,b,c){var e;for(e=0;e<c&&qa<ja.length;e++)a[b+
-e]=ja.charCodeAt(qa++)&255;return e},sa=function(){var a,b,c=65536-y-m;if(-1===c)c--;else if(65274<=m){for(a=0;32768>a;a++)o[a]=o[a+32768];t-=32768;m-=32768;A-=32768;for(a=0;8192>a;a++)b=p[32768+a],p[32768+a]=32768<=b?b-32768:0;for(a=0;32768>a;a++)b=p[a],p[a]=32768<=b?b-32768:0;c+=32768}r||(a=xa(o,m+y,c),0>=a?r=!0:y+=a)},ya=function(a){var b=L,c=m,e,d=F,i=32506<m?m-32506:0,r=m+258,n=o[c+d-1],h=o[c+d];F>=N&&(b>>=2);do if(e=a,!(o[e+d]!==h||o[e+d-1]!==n||o[e]!==o[c]||o[++e]!==o[c+1])){c+=2;e++;do++c;
-while(o[c]===o[++e]&&o[++c]===o[++e]&&o[++c]===o[++e]&&o[++c]===o[++e]&&o[++c]===o[++e]&&o[++c]===o[++e]&&o[++c]===o[++e]&&o[++c]===o[++e]&&c<r);e=258-(r-c);c=r-258;if(e>d){t=a;d=e;if(258<=e)break;n=o[c+d-1];h=o[c+d]}}while((a=p[a&32767])>i&&0!==--b);return d},ga=function(a,b){s[P++]=b;0===a?v[b].fc++:(a--,v[$[b]+256+1].fc++,J[(256>a?Y[a]:Y[256+(a>>7)])&255].fc++,u[ia++]=a,aa|=ea);ea<<=1;0===(P&7)&&(da[pa++]=aa,aa=0,ea=1);if(2<O&&0===(P&4095)){var c=8*P,e=m-A,d;for(d=0;30>d;d++)c+=J[d].fc*(5+fa[d]);
-c>>=3;if(ia<parseInt(P/2,10)&&c<parseInt(e/2,10))return!0}return 8191===P||8192===ia},ta=function(a,b){for(var c=I[b],e=b<<1;e<=V;){e<V&&wa(a,I[e+1],I[e])&&e++;if(wa(a,c,I[e]))break;I[b]=I[e];b=e;e<<=1}I[b]=c},za=function(a,b){var c=0;do c|=a&1,a>>=1,c<<=1;while(0<--b);return c>>1},Aa=function(a,b){var c=[];c.length=16;var e=0,d;for(d=1;15>=d;d++)e=e+M[d-1]<<1,c[d]=e;for(e=0;e<=b;e++)d=a[e].dl,0!==d&&(a[e].fc=za(c[d]++,d))},ua=function(a){var b=a.dyn_tree,c=a.static_tree,e=a.elems,d,m=-1,i=e;V=0;
-Z=573;for(d=0;d<e;d++)0!==b[d].fc?(I[++V]=m=d,S[d]=0):b[d].dl=0;for(;2>V;)d=I[++V]=2>m?++m:0,b[d].fc=1,S[d]=0,W--,null!==c&&(ba-=c[d].dl);a.max_code=m;for(d=V>>1;1<=d;d--)ta(b,d);do d=I[1],I[1]=I[V--],ta(b,1),c=I[1],I[--Z]=d,I[--Z]=c,b[i].fc=b[d].fc+b[c].fc,S[i]=S[d]>S[c]+1?S[d]:S[c]+1,b[d].dl=b[c].dl=i,I[1]=i++,ta(b,1);while(2<=V);I[--Z]=I[1];i=a.dyn_tree;d=a.extra_bits;var e=a.extra_base,c=a.max_code,r=a.max_length,n=a.static_tree,t,h,f,k,q=0;for(h=0;15>=h;h++)M[h]=0;i[I[Z]].dl=0;for(a=Z+1;573>
-a;a++)if(t=I[a],h=i[i[t].dl].dl+1,h>r&&(h=r,q++),i[t].dl=h,!(t>c))M[h]++,f=0,t>=e&&(f=d[t-e]),k=i[t].fc,W+=k*(h+f),null!==n&&(ba+=k*(n[t].dl+f));if(0!==q){do{for(h=r-1;0===M[h];)h--;M[h]--;M[h+1]+=2;M[r]--;q-=2}while(0<q);for(h=r;0!==h;h--)for(t=M[h];0!==t;)d=I[--a],d>c||(i[d].dl!==h&&(W+=(h-i[d].dl)*i[d].fc,i[d].fc=h),t--)}Aa(b,m)},Ba=function(a,b){var c,e=-1,d,m=a[0].dl,i=0,h=7,r=4;0===m&&(h=138,r=3);a[b+1].dl=65535;for(c=0;c<=b;c++)if(d=m,m=a[c+1].dl,!(++i<h&&d===m))(i<r?K[d].fc+=i:0!==d?(d!==
-e&&K[d].fc++,K[16].fc++):10>=i?K[17].fc++:K[18].fc++,i=0,e=d,0===m)?(h=138,r=3):d===m?(h=6,r=3):(h=7,r=4)},Ca=function(){8<B?ma(w):0<B&&la(w);B=w=0},Da=function(a,b){var c,e=0,d=0,m=0,i=0,h,r;if(0!==P){do{0===(e&7)&&(i=da[m++]);c=s[e++]&255;if(0===(i&1))X(c,a);else if(h=$[c],X(h+256+1,a),r=ra[h],0!==r&&(c-=ha[h],Q(c,r)),c=u[d++],h=(256>c?Y[c]:Y[256+(c>>7)])&255,X(h,b),r=fa[h],0!==r)c-=ca[h],Q(c,r);i>>=1}while(e<P)}X(256,a)},Ea=function(a,b){var c,e=-1,d,m=a[0].dl,i=0,h=7,r=4;0===m&&(h=138,r=3);for(c=
-0;c<=b;c++)if(d=m,m=a[c+1].dl,!(++i<h&&d===m)){if(i<r){do X(d,K);while(0!==--i)}else 0!==d?(d!==e&&(X(d,K),i--),X(16,K),Q(i-3,2)):10>=i?(X(17,K),Q(i-3,3)):(X(18,K),Q(i-11,7));i=0;e=d;0===m?(h=138,r=3):d===m?(h=6,r=3):(h=7,r=4)}},Fa=function(){var a;for(a=0;286>a;a++)v[a].fc=0;for(a=0;30>a;a++)J[a].fc=0;for(a=0;19>a;a++)K[a].fc=0;v[256].fc=1;aa=P=ia=pa=W=ba=0;ea=1},oa=function(a){var b,c,e,d;d=m-A;da[pa]=aa;ua(H);ua(D);Ba(v,H.max_code);Ba(J,D.max_code);ua(U);for(e=18;3<=e&&0===K[va[e]].dl;e--);W+=
-3*(e+1)+14;b=W+3+7>>3;c=ba+3+7>>3;c<=b&&(b=c);if(d+4<=b&&0<=A){Q(0+a,3);Ca();ma(d);ma(~d);for(e=0;e<d;e++)la(o[A+e])}else if(c===b)Q(2+a,3),Da(G,R);else{Q(4+a,3);d=H.max_code+1;b=D.max_code+1;e+=1;Q(d-257,5);Q(b-1,5);Q(e-4,4);for(c=0;c<e;c++)Q(K[va[c]].dl,3);Ea(v,d-1);Ea(J,b-1);Da(v,J)}Fa();0!==a&&Ca()},Ga=function(a,d,m){var r,t,n;for(r=0;null!==b&&r<m;){t=m-r;t>b.len&&(t=b.len);for(n=0;n<t;n++)a[d+r+n]=b.ptr[b.off+n];b.off+=t;b.len-=t;r+=t;0===b.len&&(t=b,b=b.next,t.next=c,c=t)}if(r===m)return r;
-if(h<i){t=m-r;t>i-h&&(t=i-h);for(n=0;n<t;n++)a[d+r+n]=e[h+n];h+=t;r+=t;i===h&&(i=h=0)}return r},Ia=function(a,c,e){var d;if(!k){if(!r){B=w=0;var f,g;if(0===R[0].dl){H.dyn_tree=v;H.static_tree=G;H.extra_bits=ra;H.extra_base=257;H.elems=286;H.max_length=15;H.max_code=0;D.dyn_tree=J;D.static_tree=R;D.extra_bits=fa;D.extra_base=0;D.elems=30;D.max_length=15;D.max_code=0;U.dyn_tree=K;U.static_tree=null;U.extra_bits=Ha;U.extra_base=0;U.elems=19;U.max_length=7;for(g=f=U.max_code=0;28>g;g++){ha[g]=f;for(d=
-0;d<1<<ra[g];d++)$[f++]=g}$[f-1]=g;for(g=f=0;16>g;g++){ca[g]=f;for(d=0;d<1<<fa[g];d++)Y[f++]=g}for(f>>=7;30>g;g++){ca[g]=f<<7;for(d=0;d<1<<fa[g]-7;d++)Y[256+f++]=g}for(d=0;15>=d;d++)M[d]=0;for(d=0;143>=d;)G[d++].dl=8,M[8]++;for(;255>=d;)G[d++].dl=9,M[9]++;for(;279>=d;)G[d++].dl=7,M[7]++;for(;287>=d;)G[d++].dl=8,M[8]++;Aa(G,287);for(d=0;30>d;d++)R[d].dl=5,R[d].fc=za(d,5);Fa()}for(d=0;8192>d;d++)p[32768+d]=0;T=ka[O].max_lazy;N=ka[O].good_length;L=ka[O].max_chain;A=m=0;y=xa(o,0,65536);if(0>=y)r=!0,y=
-0;else{for(r=!1;262>y&&!r;)sa();for(d=q=0;2>d;d++)q=(q<<5^o[d]&255)&8191}b=null;h=i=0;3>=O?(F=2,z=0):(z=2,C=0);n=!1}k=!0;if(0===y)return n=!0,0}if((d=Ga(a,c,e))===e)return e;if(n)return d;if(3>=O)for(;0!==y&&null===b;){na();0!==x&&32506>=m-x&&(z=ya(x),z>y&&(z=y));if(3<=z)if(g=ga(m-t,z-3),y-=z,z<=T){z--;do m++,na();while(0!==--z);m++}else m+=z,z=0,q=o[m]&255,q=(q<<5^o[m+1]&255)&8191;else g=ga(0,o[m]&255),y--,m++;g&&(oa(0),A=m);for(;262>y&&!r;)sa()}else for(;0!==y&&null===b;){na();F=z;E=t;z=2;0!==x&&
-F<T&&32506>=m-x&&(z=ya(x),z>y&&(z=y),3===z&&4096<m-t&&z--);if(3<=F&&z<=F){g=ga(m-1-E,F-3);y-=F-1;F-=2;do m++,na();while(0!==--F);C=0;z=2;m++;g&&(oa(0),A=m)}else 0!==C?ga(0,o[m-1]&255)&&(oa(0),A=m):C=1,m++,y--;for(;262>y&&!r;)sa()}0===y&&(0!==C&&ga(0,o[m-1]&255),oa(1),n=!0);return d+Ga(a,d+c,e-d)};this.deflate=function(m,i){var h,t;ja=m;qa=0;"undefined"===typeof i&&(i=6);(h=i)?1>h?h=1:9<h&&(h=9):h=6;O=h;r=k=!1;if(null===e){c=b=d=null;e=[];e.length=a;o=[];o.length=65536;u=[];u.length=8192;s=[];s.length=
-32832;p=[];p.length=65536;v=[];v.length=573;for(h=0;573>h;h++)v[h]=new j;J=[];J.length=61;for(h=0;61>h;h++)J[h]=new j;G=[];G.length=288;for(h=0;288>h;h++)G[h]=new j;R=[];R.length=30;for(h=0;30>h;h++)R[h]=new j;K=[];K.length=39;for(h=0;39>h;h++)K[h]=new j;H=new l;D=new l;U=new l;M=[];M.length=16;I=[];I.length=573;S=[];S.length=573;$=[];$.length=256;Y=[];Y.length=512;ha=[];ha.length=29;ca=[];ca.length=30;da=[];da.length=1024}for(var n=Array(1024),f=[];0<(h=Ia(n,0,n.length));){var g=[];g.length=h;for(t=
-0;t<h;t++)g[t]=String.fromCharCode(n[t]);f[f.length]=g.join("")}ja=null;return f.join("")}};
-// Input 4
-core.ByteArray=function(j){this.pos=0;this.data=j;this.readUInt32LE=function(){var j=this.data,f=this.pos+=4;return j[--f]<<24|j[--f]<<16|j[--f]<<8|j[--f]};this.readUInt16LE=function(){var j=this.data,f=this.pos+=2;return j[--f]<<8|j[--f]}};
-// Input 5
-core.ByteArrayWriter=function(j){var l=this,f=new runtime.ByteArray(0);this.appendByteArrayWriter=function(g){f=runtime.concatByteArrays(f,g.getByteArray())};this.appendByteArray=function(g){f=runtime.concatByteArrays(f,g)};this.appendArray=function(g){f=runtime.concatByteArrays(f,runtime.byteArrayFromArray(g))};this.appendUInt16LE=function(f){l.appendArray([f&255,f>>8&255])};this.appendUInt32LE=function(f){l.appendArray([f&255,f>>8&255,f>>16&255,f>>24&255])};this.appendString=function(g){f=runtime.concatByteArrays(f,
-runtime.byteArrayFromString(g,j))};this.getLength=function(){return f.length};this.getByteArray=function(){return f}};
-// Input 6
-core.RawInflate=function(){var j,l,f=null,g,a,c,b,d,k,e,i,h,n,o,u,s,p,w=[0,1,3,7,15,31,63,127,255,511,1023,2047,4095,8191,16383,32767,65535],B=[3,4,5,6,7,8,9,10,11,13,15,17,19,23,27,31,35,43,51,59,67,83,99,115,131,163,195,227,258,0,0],A=[0,0,0,0,0,0,0,0,1,1,1,1,2,2,2,2,3,3,3,3,4,4,4,4,5,5,5,5,0,99,99],q=[1,2,3,4,5,7,9,13,17,25,33,49,65,97,129,193,257,385,513,769,1025,1537,2049,3073,4097,6145,8193,12289,16385,24577],x=[0,0,0,0,1,1,2,2,3,3,4,4,5,5,6,6,7,7,8,8,9,9,10,10,11,11,12,12,13,13],E=[16,17,18,
-0,8,7,9,6,10,5,11,4,12,3,13,2,14,1,15],C=function(){this.list=this.next=null},z=function(){this.n=this.b=this.e=0;this.t=null},F=function(a,b,c,d,e,m){this.BMAX=16;this.N_MAX=288;this.status=0;this.root=null;this.m=0;var h=Array(this.BMAX+1),i,r,t,n,f,k,g,q=Array(this.BMAX+1),o,j,p,y=new z,x=Array(this.BMAX);n=Array(this.N_MAX);var E,s=Array(this.BMAX+1),B,A,u;u=this.root=null;for(f=0;f<h.length;f++)h[f]=0;for(f=0;f<q.length;f++)q[f]=0;for(f=0;f<x.length;f++)x[f]=null;for(f=0;f<n.length;f++)n[f]=
-0;for(f=0;f<s.length;f++)s[f]=0;i=256<b?a[256]:this.BMAX;o=a;j=0;f=b;do h[o[j]]++,j++;while(0<--f);if(h[0]==b)this.root=null,this.status=this.m=0;else{for(k=1;k<=this.BMAX&&0==h[k];k++);g=k;m<k&&(m=k);for(f=this.BMAX;0!=f&&0==h[f];f--);t=f;m>f&&(m=f);for(B=1<<k;k<f;k++,B<<=1)if(0>(B-=h[k])){this.status=2;this.m=m;return}if(0>(B-=h[f]))this.status=2,this.m=m;else{h[f]+=B;s[1]=k=0;o=h;j=1;for(p=2;0<--f;)s[p++]=k+=o[j++];o=a;f=j=0;do if(0!=(k=o[j++]))n[s[k]++]=f;while(++f<b);b=s[t];s[0]=f=0;o=n;j=0;
-n=-1;E=q[0]=0;p=null;for(A=0;g<=t;g++)for(a=h[g];0<a--;){for(;g>E+q[1+n];){E+=q[1+n];n++;A=(A=t-E)>m?m:A;if((r=1<<(k=g-E))>a+1){r-=a+1;for(p=g;++k<A&&!((r<<=1)<=h[++p]);)r-=h[p]}E+k>i&&E<i&&(k=i-E);A=1<<k;q[1+n]=k;p=Array(A);for(r=0;r<A;r++)p[r]=new z;u=null==u?this.root=new C:u.next=new C;u.next=null;u.list=p;x[n]=p;0<n&&(s[n]=f,y.b=q[n],y.e=16+k,y.t=p,k=(f&(1<<E)-1)>>E-q[n],x[n-1][k].e=y.e,x[n-1][k].b=y.b,x[n-1][k].n=y.n,x[n-1][k].t=y.t)}y.b=g-E;j>=b?y.e=99:o[j]<c?(y.e=256>o[j]?16:15,y.n=o[j++]):
-(y.e=e[o[j]-c],y.n=d[o[j++]-c]);r=1<<g-E;for(k=f>>E;k<A;k+=r)p[k].e=y.e,p[k].b=y.b,p[k].n=y.n,p[k].t=y.t;for(k=1<<g-1;0!=(f&k);k>>=1)f^=k;for(f^=k;(f&(1<<E)-1)!=s[n];)E-=q[n],n--}this.m=q[1];this.status=0!=B&&1!=t?1:0}}},m=function(a){for(;b<a;)c|=(s.length==p?-1:s[p++])<<b,b+=8},t=function(a){return c&w[a]},r=function(a){c>>=a;b-=a},y=function(a,b,c){var f,k,g;if(0==c)return 0;for(g=0;;){m(o);k=h.list[t(o)];for(f=k.e;16<f;){if(99==f)return-1;r(k.b);f-=16;m(f);k=k.t[t(f)];f=k.e}r(k.b);if(16==f)l&=
-32767,a[b+g++]=j[l++]=k.n;else{if(15==f)break;m(f);e=k.n+t(f);r(f);m(u);k=n.list[t(u)];for(f=k.e;16<f;){if(99==f)return-1;r(k.b);f-=16;m(f);k=k.t[t(f)];f=k.e}r(k.b);m(f);i=l-k.n-t(f);for(r(f);0<e&&g<c;)e--,i&=32767,l&=32767,a[b+g++]=j[l++]=j[i++]}if(g==c)return c}d=-1;return g},L,T=function(a,b,c){var d,e,f,i,k,g,j,p=Array(316);for(d=0;d<p.length;d++)p[d]=0;m(5);g=257+t(5);r(5);m(5);j=1+t(5);r(5);m(4);d=4+t(4);r(4);if(286<g||30<j)return-1;for(e=0;e<d;e++)m(3),p[E[e]]=t(3),r(3);for(;19>e;e++)p[E[e]]=
-0;o=7;e=new F(p,19,19,null,null,o);if(0!=e.status)return-1;h=e.root;o=e.m;i=g+j;for(d=f=0;d<i;)if(m(o),k=h.list[t(o)],e=k.b,r(e),e=k.n,16>e)p[d++]=f=e;else if(16==e){m(2);e=3+t(2);r(2);if(d+e>i)return-1;for(;0<e--;)p[d++]=f}else{17==e?(m(3),e=3+t(3),r(3)):(m(7),e=11+t(7),r(7));if(d+e>i)return-1;for(;0<e--;)p[d++]=0;f=0}o=9;e=new F(p,g,257,B,A,o);0==o&&(e.status=1);if(0!=e.status)return-1;h=e.root;o=e.m;for(d=0;d<j;d++)p[d]=p[d+g];u=6;e=new F(p,j,0,q,x,u);n=e.root;u=e.m;return 0==u&&257<g||0!=e.status?
--1:y(a,b,c)};this.inflate=function(E,C){null==j&&(j=Array(65536));b=c=l=0;d=-1;k=!1;e=i=0;h=null;s=E;p=0;var z=new runtime.ByteArray(C);a:{var w,G;for(w=0;w<C&&!(k&&-1==d);){if(0<e){if(0!=d)for(;0<e&&w<C;)e--,i&=32767,l&=32767,z[0+w++]=j[l++]=j[i++];else{for(;0<e&&w<C;)e--,l&=32767,m(8),z[0+w++]=j[l++]=t(8),r(8);0==e&&(d=-1)}if(w==C)break}if(-1==d){if(k)break;m(1);0!=t(1)&&(k=!0);r(1);m(2);d=t(2);r(2);h=null;e=0}switch(d){case 0:G=z;var R=0+w,K=C-w,H=void 0,H=b&7;r(H);m(16);H=t(16);r(16);m(16);if(H!=
-(~c&65535))G=-1;else{r(16);e=H;for(H=0;0<e&&H<K;)e--,l&=32767,m(8),G[R+H++]=j[l++]=t(8),r(8);0==e&&(d=-1);G=H}break;case 1:if(null!=h)G=y(z,0+w,C-w);else b:{G=z;R=0+w;K=C-w;if(null==f){for(var D=void 0,H=Array(288),D=void 0,D=0;144>D;D++)H[D]=8;for(;256>D;D++)H[D]=9;for(;280>D;D++)H[D]=7;for(;288>D;D++)H[D]=8;a=7;D=new F(H,288,257,B,A,a);if(0!=D.status){alert("HufBuild error: "+D.status);G=-1;break b}f=D.root;a=D.m;for(D=0;30>D;D++)H[D]=5;L=5;D=new F(H,30,0,q,x,L);if(1<D.status){f=null;alert("HufBuild error: "+
-D.status);G=-1;break b}g=D.root;L=D.m}h=f;n=g;o=a;u=L;G=y(G,R,K)}break;case 2:G=null!=h?y(z,0+w,C-w):T(z,0+w,C-w);break;default:G=-1}if(-1==G)break a;w+=G}}s=null;return z}};
-// Input 7
-core.Cursor=function(j,l){function f(a,b){for(var d=b;d&&d!==a;)d=d.parentNode;return d||b}function g(){var c,b,d;if(a.parentNode){b=0;for(c=a.parentNode.firstChild;c&&c!==a;)b+=1,c=c.nextSibling;a.previousSibling&&3===a.previousSibling.nodeType&&a.nextSibling&&3===a.nextSibling.nodeType&&(d=a.nextSibling,a.previousSibling.appendData(d.nodeValue));for(c=0;c<j.rangeCount;c+=1){var k=j.getRangeAt(c),e=b,i=void 0,h=void 0,i=a.parentNode,h=f(a,k.startContainer);f(a,k.endContainer);h===a?k.setStart(i,
-e):h===i&&k.startOffset>e&&k.setStart(i,k.startOffset-1);k.endContainer===a?k.setEnd(i,e):k.endContainer===i&&k.endOffset>e&&k.setEnd(i,k.endOffset-1)}if(d){for(c=0;c<j.rangeCount;c+=1){var k=j.getRangeAt(c),e=a.previousSibling,i=d,h=b,n=e.length-i.length;k.startContainer===i?k.setStart(e,n+k.startOffset):k.startContainer===e.parentNode&&k.startOffset===h&&k.setStart(e,n);k.endContainer===i?k.setEnd(e,n+k.endOffset):k.endContainer===e.parentNode&&k.endOffset===h&&k.setEnd(e,n)}d.parentNode.removeChild(d)}a.parentNode.removeChild(a)}}
-var a;a=l.createElementNS("urn:webodf:names:cursor","cursor");this.getNode=function(){return a};this.updateToSelection=function(){g();if(j.focusNode){var c=j.focusNode,b=j.focusOffset;if(3===c.nodeType){var d,f,e,i;i=c.parentNode;0===b?i.insertBefore(a,c):b===c.length?i.appendChild(a):(d=c.length,f=c.nextSibling,e=l.createTextNode(c.substringData(b,d)),c.deleteData(b,d),f?i.insertBefore(e,f):i.appendChild(e),i.insertBefore(a,e))}else if(9!==c.nodeType){for(d=c.firstChild;d&&b;)d=d.nextSibling,b-=
-1;c.insertBefore(a,d)}}};this.remove=function(){g()}};
-// Input 8
-core.UnitTest=function(){};core.UnitTest.prototype.setUp=function(){};core.UnitTest.prototype.tearDown=function(){};core.UnitTest.prototype.description=function(){};core.UnitTest.prototype.tests=function(){};core.UnitTest.prototype.asyncTests=function(){};
-core.UnitTestRunner=function(){function j(a){g+=1;runtime.log("fail",a)}function l(a,c){var b;try{if(a.length!==c.length)return!1;for(b=0;b<a.length;b+=1)if(a[b]!==c[b])return!1}catch(d){return!1}return!0}function f(a,c,b){("string"!==typeof c||"string"!==typeof b)&&runtime.log("WARN: shouldBe() expects string arguments");var d,f;try{f=eval(c)}catch(e){d=e}a=eval(b);d?j(c+" should be "+a+". Threw exception "+d):(0===a?f===a&&1/f===1/a:f===a||("number"===typeof a&&isNaN(a)?"number"===typeof f&&isNaN(f):
-Object.prototype.toString.call(a)===Object.prototype.toString.call([])&&l(f,a)))?runtime.log("pass",c+" is "+b):typeof f===typeof a?j(c+" should be "+a+". Was "+(0===f&&0>1/f?"-0":""+f)+"."):j(c+" should be "+a+" (of type "+typeof a+"). Was "+f+" (of type "+typeof f+").")}var g=0;this.shouldBeNull=function(a,c){f(a,c,"null")};this.shouldBeNonNull=function(a,c){var b,d;try{d=eval(c)}catch(f){b=f}b?j(c+" should be non-null. Threw exception "+b):null!==d?runtime.log("pass",c+" is non-null."):j(c+" should be non-null. Was "+
-d)};this.shouldBe=f;this.countFailedTests=function(){return g}};
-core.UnitTester=function(){var j=0,l={};this.runTests=function(f,g){function a(b){if(0===b.length)l[c]=e,j+=d.countFailedTests(),g();else{h=b[0];var f=Runtime.getFunctionName(h);runtime.log("Running "+f);o=d.countFailedTests();k.setUp();h(function(){k.tearDown();e[f]=o===d.countFailedTests();a(b.slice(1))})}}var c=Runtime.getFunctionName(f),b,d=new core.UnitTestRunner,k=new f(d),e={},i,h,n,o;if(c.hasOwnProperty(l))runtime.log("Test "+c+" has already run.");else{runtime.log("Running "+c+": "+k.description());
-n=k.tests();for(i=0;i<n.length;i+=1)h=n[i],b=Runtime.getFunctionName(h),runtime.log("Running "+b),o=d.countFailedTests(),k.setUp(),h(),k.tearDown(),e[b]=o===d.countFailedTests();a(k.asyncTests())}};this.countFailedTests=function(){return j};this.results=function(){return l}};
-// Input 9
-core.PointWalker=function(j){function l(a){for(var c=-1;a;)a=a.previousSibling,c+=1;return c}var f=j,g=null,a=j&&j.firstChild,c=0;this.setPoint=function(b,d){f=b;c=d;if(3===f.nodeType)g=a=null;else{for(a=f.firstChild;d;)d-=1,a=a.nextSibling;g=a?a.previousSibling:f.lastChild}};this.stepForward=function(){var b;return 3===f.nodeType&&(b="number"===typeof f.nodeValue.length?f.nodeValue.length:f.nodeValue.length(),c<b)?(c+=1,!0):a?(1===a.nodeType?(f=a,g=null,a=f.firstChild,c=0):3===a.nodeType?(f=a,a=
-g=null,c=0):(g=a,a=a.nextSibling,c+=1),!0):f!==j?(g=f,a=g.nextSibling,f=f.parentNode,c=l(g)+1,!0):!1};this.stepBackward=function(){return 3===f.nodeType&&0<c?(c-=1,!0):g?(1===g.nodeType?(f=g,g=f.lastChild,a=null,c=l(g)+1):3===g.nodeType?(f=g,a=g=null,c="number"===typeof f.nodeValue.length?f.nodeValue.length:f.nodeValue.length()):(a=g,g=g.previousSibling,c-=1),!0):f!==j?(a=f,g=a.previousSibling,f=f.parentNode,c=l(a),!0):!1};this.node=function(){return f};this.position=function(){return c};this.precedingSibling=
-function(){return g};this.followingSibling=function(){return a}};
-// Input 10
-core.Async=function(){this.forEach=function(j,l,f){function g(a){b!==c&&(a?(b=c,f(a)):(b+=1,b===c&&f(null)))}var a,c=j.length,b=0;for(a=0;a<c;a+=1)l(j[a],g)}};
-// Input 11
-runtime.loadClass("core.RawInflate");runtime.loadClass("core.ByteArray");runtime.loadClass("core.ByteArrayWriter");runtime.loadClass("core.Base64");
-core.Zip=function(j,l){function f(a){var b=[0,1996959894,3993919788,2567524794,124634137,1886057615,3915621685,2657392035,249268274,2044508324,3772115230,2547177864,162941995,2125561021,3887607047,2428444049,498536548,1789927666,4089016648,2227061214,450548861,1843258603,4107580753,2211677639,325883990,1684777152,4251122042,2321926636,335633487,1661365465,4195302755,2366115317,997073096,1281953886,3579855332,2724688242,1006888145,1258607687,3524101629,2768942443,901097722,1119000684,3686517206,2898065728,
-853044451,1172266101,3705015759,2882616665,651767980,1373503546,3369554304,3218104598,565507253,1454621731,3485111705,3099436303,671266974,1594198024,3322730930,2970347812,795835527,1483230225,3244367275,3060149565,1994146192,31158534,2563907772,4023717930,1907459465,112637215,2680153253,3904427059,2013776290,251722036,2517215374,3775830040,2137656763,141376813,2439277719,3865271297,1802195444,476864866,2238001368,4066508878,1812370925,453092731,2181625025,4111451223,1706088902,314042704,2344532202,
-4240017532,1658658271,366619977,2362670323,4224994405,1303535960,984961486,2747007092,3569037538,1256170817,1037604311,2765210733,3554079995,1131014506,879679996,2909243462,3663771856,1141124467,855842277,2852801631,3708648649,1342533948,654459306,3188396048,3373015174,1466479909,544179635,3110523913,3462522015,1591671054,702138776,2966460450,3352799412,1504918807,783551873,3082640443,3233442989,3988292384,2596254646,62317068,1957810842,3939845945,2647816111,81470997,1943803523,3814918930,2489596804,
-225274430,2053790376,3826175755,2466906013,167816743,2097651377,4027552580,2265490386,503444072,1762050814,4150417245,2154129355,426522225,1852507879,4275313526,2312317920,282753626,1742555852,4189708143,2394877945,397917763,1622183637,3604390888,2714866558,953729732,1340076626,3518719985,2797360999,1068828381,1219638859,3624741850,2936675148,906185462,1090812512,3747672003,2825379669,829329135,1181335161,3412177804,3160834842,628085408,1382605366,3423369109,3138078467,570562233,1426400815,3317316542,
-2998733608,733239954,1555261956,3268935591,3050360625,752459403,1541320221,2607071920,3965973030,1969922972,40735498,2617837225,3943577151,1913087877,83908371,2512341634,3803740692,2075208622,213261112,2463272603,3855990285,2094854071,198958881,2262029012,4057260610,1759359992,534414190,2176718541,4139329115,1873836001,414664567,2282248934,4279200368,1711684554,285281116,2405801727,4167216745,1634467795,376229701,2685067896,3608007406,1308918612,956543938,2808555105,3495958263,1231636301,1047427035,
-2932959818,3654703836,1088359270,936918E3,2847714899,3736837829,1202900863,817233897,3183342108,3401237130,1404277552,615818150,3134207493,3453421203,1423857449,601450431,3009837614,3294710456,1567103746,711928724,3020668471,3272380065,1510334235,755167117],c,e,d=a.length,f=0,f=0;c=-1;for(e=0;e<d;e+=1)f=(c^a[e])&255,f=b[f],c=c>>>8^f;return c^-1}function g(a){return new Date((a>>25&127)+1980,(a>>21&15)-1,a>>16&31,a>>11&15,a>>5&63,(a&31)<<1)}function a(a){var b=a.getFullYear();return 1980>b?0:b-1980<<
-25|a.getMonth()+1<<21|a.getDate()<<16|a.getHours()<<11|a.getMinutes()<<5|a.getSeconds()>>1}function c(a,b){var c,e,d,f,h,i,m,n=this;this.load=function(b){if(void 0!==n.data)b(null,n.data);else{var d=h+34+c+e+256;d+m>o&&(d=o-m);runtime.read(a,m,d,function(c,e){if(c)b(c,e);else a:{var d=e,m=new core.ByteArray(d),k=m.readUInt32LE(),g;if(67324752!==k)b("File entry signature is wrong."+k.toString()+" "+d.length.toString(),null);else{m.pos+=22;k=m.readUInt16LE();g=m.readUInt16LE();m.pos+=k+g;if(f){d=d.slice(m.pos,
-m.pos+h);if(h!==d.length){b("The amount of compressed bytes read was "+d.length.toString()+" instead of "+h.toString()+" for "+n.filename+" in "+a+".",null);break a}d=s(d,i)}else d=d.slice(m.pos,m.pos+i);i!==d.length?b("The amount of bytes read was "+d.length.toString()+" instead of "+i.toString()+" for "+n.filename+" in "+a+".",null):(n.data=d,b(null,d))}}})}};this.set=function(a,b,c,e){n.filename=a;n.data=b;n.compressed=c;n.date=e};this.error=null;b&&(33639248!==b.readUInt32LE()?this.error="Central directory entry has wrong signature at position "+
-(b.pos-4).toString()+' for file "'+a+'": '+b.data.length.toString():(b.pos+=6,f=b.readUInt16LE(),this.date=g(b.readUInt32LE()),b.readUInt32LE(),h=b.readUInt32LE(),i=b.readUInt32LE(),c=b.readUInt16LE(),e=b.readUInt16LE(),d=b.readUInt16LE(),b.pos+=8,m=b.readUInt32LE(),this.filename=runtime.byteArrayToString(b.data.slice(b.pos,b.pos+c),"utf8"),b.pos+=c+e+d))}function b(a,b){if(22!==a.length)b("Central directory length should be 22.",p);else{var e=new core.ByteArray(a),d;d=e.readUInt32LE();101010256!==
-d?b("Central directory signature is wrong: "+d.toString(),p):0!==e.readUInt16LE()?b("Zip files with non-zero disk numbers are not supported.",p):0!==e.readUInt16LE()?b("Zip files with non-zero disk numbers are not supported.",p):(d=e.readUInt16LE(),u=e.readUInt16LE(),d!==u?b("Number of entries is inconsistent.",p):(d=e.readUInt32LE(),e=e.readUInt16LE(),e=o-22-d,runtime.read(j,e,o-e,function(a,e){a:{var d=new core.ByteArray(e),f,m;n=[];for(f=0;f<u;f+=1){m=new c(j,d);if(m.error){b(m.error,p);break a}n[n.length]=
-m}b(null,p)}})))}}function d(a,b){var c=null,e,d;for(d=0;d<n.length;d+=1)if(e=n[d],e.filename===a){c=e;break}c?c.data?b(null,c.data):c.load(b):b(a+" not found.",null)}function k(a,b){d(a,function(a,c){if(a)return b(a,null);c=runtime.byteArrayToString(c,"utf8");b(null,c)})}function e(b){var c=new core.ByteArrayWriter("utf8"),e=0;c.appendArray([80,75,3,4,20,0,0,0,0,0]);b.data&&(e=b.data.length);c.appendUInt32LE(a(b.date));c.appendUInt32LE(f(b.data));c.appendUInt32LE(e);c.appendUInt32LE(e);c.appendUInt16LE(b.filename.length);
-c.appendUInt16LE(0);c.appendString(b.filename);b.data&&c.appendByteArray(b.data);return c}function i(b,c){var e=new core.ByteArrayWriter("utf8"),d=0;e.appendArray([80,75,1,2,20,0,20,0,0,0,0,0]);b.data&&(d=b.data.length);e.appendUInt32LE(a(b.date));e.appendUInt32LE(f(b.data));e.appendUInt32LE(d);e.appendUInt32LE(d);e.appendUInt16LE(b.filename.length);e.appendArray([0,0,0,0,0,0,0,0,0,0,0,0]);e.appendUInt32LE(c);e.appendString(b.filename);return e}function h(a,b){if(a===n.length)b(null);else{var c=n[a];
-void 0!==c.data?h(a+1,b):c.load(function(c){c?b(c):h(a+1,b)})}}var n,o,u,s=(new core.RawInflate).inflate,p=this,w=new core.Base64;this.load=d;this.save=function(a,b,e,d){var f,h;for(f=0;f<n.length;f+=1)if(h=n[f],h.filename===a){h.set(a,b,e,d);return}h=new c(j);h.set(a,b,e,d);n.push(h)};this.write=function(a){h(0,function(b){if(b)a(b);else{var b=new core.ByteArrayWriter("utf8"),c,d,f,h=[0];for(c=0;c<n.length;c+=1)b.appendByteArrayWriter(e(n[c])),h.push(b.getLength());f=b.getLength();for(c=0;c<n.length;c+=
-1)d=n[c],b.appendByteArrayWriter(i(d,h[c]));c=b.getLength()-f;b.appendArray([80,75,5,6,0,0,0,0]);b.appendUInt16LE(n.length);b.appendUInt16LE(n.length);b.appendUInt32LE(c);b.appendUInt32LE(f);b.appendArray([0,0]);runtime.writeFile(j,b.getByteArray(),a)}})};this.loadContentXmlAsFragments=function(a,b){k(a,function(a,c){if(a)return b.rootElementReady(a);b.rootElementReady(null,c,!0)})};this.loadAsString=k;this.loadAsDOM=function(a,b){k(a,function(a,c){a?b(a,null):(c=(new DOMParser).parseFromString(c,
-"text/xml"),b(null,c))})};this.loadAsDataURL=function(a,b,c){d(a,function(a,e){if(a)return c(a,null);var d=0,f;b||(b=80===e[1]&&78===e[2]&&71===e[3]?"image/png":255===e[0]&&216===e[1]&&255===e[2]?"image/jpeg":71===e[0]&&73===e[1]&&70===e[2]?"image/gif":"");for(f="data:"+b+";base64,";d<e.length;)f+=w.convertUTF8ArrayToBase64(e.slice(d,Math.min(d+45E3,e.length))),d+=45E3;c(null,f)})};this.getEntries=function(){return n.slice()};o=-1;null===l?n=[]:runtime.getFileSize(j,function(a){o=a;0>o?l("File '"+
-j+"' cannot be read.",p):runtime.read(j,o-22,22,function(a,c){a||null===l?l(a,p):b(c,l)})})};
-// Input 12
-xmldom.LSSerializerFilter=function(){};
-// Input 13
-"function"!==typeof Object.create&&(Object.create=function(j){var l=function(){};l.prototype=j;return new l});
-xmldom.LSSerializer=function(){function j(f,g){var a="",c=Object.create(f),b=l.filter?l.filter.acceptNode(g):1,d;if(1===b){d="";var k=g.attributes,e,i,h,n="",o;if(k){c[g.namespaceURI]!==g.prefix&&(c[g.namespaceURI]=g.prefix);d+="<"+g.nodeName;e=k.length;for(i=0;i<e;i+=1)if(h=k.item(i),"http://www.w3.org/2000/xmlns/"!==h.namespaceURI&&(o=l.filter?l.filter.acceptNode(h):1,1===o)){if(h.namespaceURI){o=h.prefix;var u=h.namespaceURI;c.hasOwnProperty(u)?o=c[u]+":":(c[u]!==o&&(c[u]=o),o+=":")}else o="";
-n+=" "+(o+h.localName+'="'+h.nodeValue+'"')}for(i in c)c.hasOwnProperty(i)&&((o=c[i])?"xmlns"!==o&&(d+=" xmlns:"+c[i]+'="'+i+'"'):d+=' xmlns="'+i+'"');d+=n+">"}a+=d}if(1===b||3===b){for(d=g.firstChild;d;)a+=j(c,d),d=d.nextSibling;g.nodeValue&&(a+=g.nodeValue)}1===b&&(c="",1===g.nodeType&&(c+="</"+g.nodeName+">"),a+=c);return a}var l=this;this.filter=null;this.writeToString=function(f,g){if(!f)return"";var a;if(g){a=g;var c={},b;for(b in a)a.hasOwnProperty(b)&&(c[a[b]]=b);a=c}else a={};return j(a,
-f)}};
-// Input 14
-xmldom.RelaxNGParser=function(){function j(a,b){this.message=function(){b&&(a+=1===b.nodeType?" Element ":" Node ",a+=b.nodeName,b.nodeValue&&(a+=" with value '"+b.nodeValue+"'"),a+=".");return a}}function l(a){if(2>=a.e.length)return a;var b={name:a.name,e:a.e.slice(0,2)};return l({name:a.name,e:[b].concat(a.e.slice(2))})}function f(a){var a=a.split(":",2),b="",c;1===a.length?a=["",a[0]]:b=a[0];for(c in d)d[c]===b&&(a[0]=c);return a}function g(a,b){for(var c=0,d,k,j=a.name;a.e&&c<a.e.length;)if(d=
-a.e[c],"ref"===d.name){k=b[d.a.name];if(!k)throw d.a.name+" was not defined.";d=a.e.slice(c+1);a.e=a.e.slice(0,c);a.e=a.e.concat(k.e);a.e=a.e.concat(d)}else c+=1,g(d,b);d=a.e;if("choice"===j&&(!d||!d[1]||"empty"===d[1].name))!d||!d[0]||"empty"===d[0].name?(delete a.e,a.name="empty"):(d[1]=d[0],d[0]={name:"empty"});if("group"===j||"interleave"===j)"empty"===d[0].name?"empty"===d[1].name?(delete a.e,a.name="empty"):(j=a.name=d[1].name,a.names=d[1].names,d=a.e=d[1].e):"empty"===d[1].name&&(j=a.name=
-d[0].name,a.names=d[0].names,d=a.e=d[0].e);"oneOrMore"===j&&"empty"===d[0].name&&(delete a.e,a.name="empty");if("attribute"===j){k=a.names?a.names.length:0;for(var s,p=a.localnames=[k],w=a.namespaces=[k],c=0;c<k;c+=1)s=f(a.names[c]),w[c]=s[0],p[c]=s[1]}"interleave"===j&&("interleave"===d[0].name?"interleave"===d[1].name?a.e=d[0].e.concat(d[1].e):a.e=[d[1]].concat(d[0].e):"interleave"===d[1].name&&(a.e=[d[0]].concat(d[1].e)))}function a(b,c){for(var d=0,f;b.e&&d<b.e.length;)f=b.e[d],"elementref"===
-f.name?(f.id=f.id||0,b.e[d]=c[f.id]):"element"!==f.name&&a(f,c),d+=1}var c=this,b,d={"http://www.w3.org/XML/1998/namespace":"xml"},k;k=function(a,b,c){var g=[],j,u,s=a.localName,p=[];j=a.attributes;var w=s,B=p,A={},q,x;for(q=0;q<j.length;q+=1)if(x=j.item(q),x.namespaceURI)"http://www.w3.org/2000/xmlns/"===x.namespaceURI&&(d[x.value]=x.localName);else{"name"===x.localName&&("element"===w||"attribute"===w)&&B.push(x.value);if("name"===x.localName||"combine"===x.localName||"type"===x.localName){var E=
-x,C;C=x.value;C=C.replace(/^\s\s*/,"");for(var z=/\s/,F=C.length-1;z.test(C.charAt(F));)F-=1;C=C.slice(0,F+1);E.value=C}A[x.localName]=x.value}j=A;j.combine=j.combine||void 0;a=a.firstChild;w=g;B=p;for(A="";a;){if(1===a.nodeType&&"http://relaxng.org/ns/structure/1.0"===a.namespaceURI){if(q=k(a,b,w))"name"===q.name?B.push(d[q.a.ns]+":"+q.text):"choice"===q.name&&q.names&&q.names.length&&(B=B.concat(q.names),delete q.names),w.push(q)}else 3===a.nodeType&&(A+=a.nodeValue);a=a.nextSibling}a=A;"value"!==
-s&&"param"!==s&&(a=/^\s*([\s\S]*\S)?\s*$/.exec(a)[1]);"value"===s&&void 0===j.type&&(j.type="token",j.datatypeLibrary="");if(("attribute"===s||"element"===s)&&void 0!==j.name)u=f(j.name),g=[{name:"name",text:u[1],a:{ns:u[0]}}].concat(g),delete j.name;"name"===s||"nsName"===s||"value"===s?void 0===j.ns&&(j.ns=""):delete j.ns;"name"===s&&(u=f(a),j.ns=u[0],a=u[1]);if(1<g.length&&("define"===s||"oneOrMore"===s||"zeroOrMore"===s||"optional"===s||"list"===s||"mixed"===s))g=[{name:"group",e:l({name:"group",
-e:g}).e}];2<g.length&&"element"===s&&(g=[g[0]].concat({name:"group",e:l({name:"group",e:g.slice(1)}).e}));1===g.length&&"attribute"===s&&g.push({name:"text",text:a});if(1===g.length&&("choice"===s||"group"===s||"interleave"===s))s=g[0].name,p=g[0].names,j=g[0].a,a=g[0].text,g=g[0].e;else if(2<g.length&&("choice"===s||"group"===s||"interleave"===s))g=l({name:s,e:g}).e;"mixed"===s&&(s="interleave",g=[g[0],{name:"text"}]);"optional"===s&&(s="choice",g=[g[0],{name:"empty"}]);"zeroOrMore"===s&&(s="choice",
-g=[{name:"oneOrMore",e:[g[0]]},{name:"empty"}]);if("define"===s&&j.combine){a:{w=j.combine;B=j.name;A=g;for(q=0;c&&q<c.length;q+=1)if(x=c[q],"define"===x.name&&x.a&&x.a.name===B){x.e=[{name:w,e:x.e.concat(A)}];c=x;break a}c=null}if(c)return}c={name:s};g&&0<g.length&&(c.e=g);for(u in j)if(j.hasOwnProperty(u)){c.a=j;break}void 0!==a&&(c.text=a);p&&0<p.length&&(c.names=p);"element"===s&&(c.id=b.length,b.push(c),c={name:"elementref",id:c.id});return c};this.parseRelaxNGDOM=function(e,f){var h=[],n=k(e&&
-e.documentElement,h,void 0),o,l,s={};for(o=0;o<n.e.length;o+=1)l=n.e[o],"define"===l.name?s[l.a.name]=l:"start"===l.name&&(b=l);if(!b)return[new j("No Relax NG start element was found.")];g(b,s);for(o in s)s.hasOwnProperty(o)&&g(s[o],s);for(o=0;o<h.length;o+=1)g(h[o],s);f&&(c.rootPattern=f(b.e[0],h));a(b,h);for(o=0;o<h.length;o+=1)a(h[o],h);c.start=b;c.elements=h;c.nsmap=d;return null}};
-// Input 15
-runtime.loadClass("xmldom.RelaxNGParser");
-xmldom.RelaxNG=function(){function j(a){return function(){var b;return function(){void 0===b&&(b=a());return b}}()}function l(a,b){return function(){var c={},d=0;return function(e){var f=e.hash||e.toString(),h;h=c[f];if(void 0!==h)return h;c[f]=h=b(e);h.hash=a+d.toString();d+=1;return h}}()}function f(a){return function(){var b={};return function(c){var d,e;e=b[c.localName];if(void 0===e)b[c.localName]=e={};else if(d=e[c.namespaceURI],void 0!==d)return d;return e[c.namespaceURI]=d=a(c)}}()}function g(a,
-b,c){return function(){var d={},e=0;return function(f,h){var i=b&&b(f,h),g,k;if(void 0!==i)return i;i=f.hash||f.toString();g=h.hash||h.toString();k=d[i];if(void 0===k)d[i]=k={};else if(i=k[g],void 0!==i)return i;k[g]=i=c(f,h);i.hash=a+e.toString();e+=1;return i}}()}function a(b,c){"choice"===c.p1.type?a(b,c.p1):b[c.p1.hash]=c.p1;"choice"===c.p2.type?a(b,c.p2):b[c.p2.hash]=c.p2}function c(a,b){return{type:"element",nc:a,nullable:!1,textDeriv:function(){return q},startTagOpenDeriv:function(c){return a.contains(c)?
-o(b,x):q},attDeriv:function(){return q},startTagCloseDeriv:function(){return this}}}function b(){return{type:"list",nullable:!1,hash:"list",textDeriv:function(){return x}}}function d(a,b,c,f){if(b===q)return q;if(f>=c.length)return b;0===f&&(f=0);for(var h=c.item(f);h.namespaceURI===e;){f+=1;if(f>=c.length)return b;h=c.item(f)}return h=d(a,b.attDeriv(a,c.item(f)),c,f+1)}function k(a,b,c){c.e[0].a?(a.push(c.e[0].text),b.push(c.e[0].a.ns)):k(a,b,c.e[0]);c.e[1].a?(a.push(c.e[1].text),b.push(c.e[1].a.ns)):
-k(a,b,c.e[1])}var e="http://www.w3.org/2000/xmlns/",i,h,n,o,u,s,p,w,B,A,q={type:"notAllowed",nullable:!1,hash:"notAllowed",textDeriv:function(){return q},startTagOpenDeriv:function(){return q},attDeriv:function(){return q},startTagCloseDeriv:function(){return q},endTagDeriv:function(){return q}},x={type:"empty",nullable:!0,hash:"empty",textDeriv:function(){return q},startTagOpenDeriv:function(){return q},attDeriv:function(){return q},startTagCloseDeriv:function(){return x},endTagDeriv:function(){return q}},
-E={type:"text",nullable:!0,hash:"text",textDeriv:function(){return E},startTagOpenDeriv:function(){return q},attDeriv:function(){return q},startTagCloseDeriv:function(){return E},endTagDeriv:function(){return q}},C,z,F;i=g("choice",function(a,b){if(a===q)return b;if(b===q||a===b)return a},function(b,c){var d={},e;a(d,{p1:b,p2:c});c=b=void 0;for(e in d)d.hasOwnProperty(e)&&(void 0===b?b=d[e]:c=void 0===c?d[e]:i(c,d[e]));return function(a,b){return{type:"choice",p1:a,p2:b,nullable:a.nullable||b.nullable,
-textDeriv:function(c,d){return i(a.textDeriv(c,d),b.textDeriv(c,d))},startTagOpenDeriv:f(function(c){return i(a.startTagOpenDeriv(c),b.startTagOpenDeriv(c))}),attDeriv:function(c,d){return i(a.attDeriv(c,d),b.attDeriv(c,d))},startTagCloseDeriv:j(function(){return i(a.startTagCloseDeriv(),b.startTagCloseDeriv())}),endTagDeriv:j(function(){return i(a.endTagDeriv(),b.endTagDeriv())})}}(b,c)});h=function(a,b,c){return function(){var d={},e=0;return function(f,h){var i=b&&b(f,h),k,g;if(void 0!==i)return i;
-i=f.hash||f.toString();k=h.hash||h.toString();i<k&&(g=i,i=k,k=g,g=f,f=h,h=g);g=d[i];if(void 0===g)d[i]=g={};else if(i=g[k],void 0!==i)return i;g[k]=i=c(f,h);i.hash=a+e.toString();e+=1;return i}}()}("interleave",function(a,b){if(a===q||b===q)return q;if(a===x)return b;if(b===x)return a},function(a,b){return{type:"interleave",p1:a,p2:b,nullable:a.nullable&&b.nullable,textDeriv:function(c,d){return i(h(a.textDeriv(c,d),b),h(a,b.textDeriv(c,d)))},startTagOpenDeriv:f(function(c){return i(C(function(a){return h(a,
-b)},a.startTagOpenDeriv(c)),C(function(b){return h(a,b)},b.startTagOpenDeriv(c)))}),attDeriv:function(c,d){return i(h(a.attDeriv(c,d),b),h(a,b.attDeriv(c,d)))},startTagCloseDeriv:j(function(){return h(a.startTagCloseDeriv(),b.startTagCloseDeriv())})}});n=g("group",function(a,b){if(a===q||b===q)return q;if(a===x)return b;if(b===x)return a},function(a,b){return{type:"group",p1:a,p2:b,nullable:a.nullable&&b.nullable,textDeriv:function(c,d){var e=n(a.textDeriv(c,d),b);return a.nullable?i(e,b.textDeriv(c,
-d)):e},startTagOpenDeriv:function(c){var d=C(function(a){return n(a,b)},a.startTagOpenDeriv(c));return a.nullable?i(d,b.startTagOpenDeriv(c)):d},attDeriv:function(c,d){return i(n(a.attDeriv(c,d),b),n(a,b.attDeriv(c,d)))},startTagCloseDeriv:j(function(){return n(a.startTagCloseDeriv(),b.startTagCloseDeriv())})}});o=g("after",function(a,b){if(a===q||b===q)return q},function(a,b){return{type:"after",p1:a,p2:b,nullable:!1,textDeriv:function(c,d){return o(a.textDeriv(c,d),b)},startTagOpenDeriv:f(function(c){return C(function(a){return o(a,
-b)},a.startTagOpenDeriv(c))}),attDeriv:function(c,d){return o(a.attDeriv(c,d),b)},startTagCloseDeriv:j(function(){return o(a.startTagCloseDeriv(),b)}),endTagDeriv:j(function(){return a.nullable?b:q})}});u=l("oneormore",function(a){return a===q?q:{type:"oneOrMore",p:a,nullable:a.nullable,textDeriv:function(b,c){return n(a.textDeriv(b,c),i(this,x))},startTagOpenDeriv:function(b){var c=this;return C(function(a){return n(a,i(c,x))},a.startTagOpenDeriv(b))},attDeriv:function(b,c){return n(a.attDeriv(b,
-c),i(this,x))},startTagCloseDeriv:j(function(){return u(a.startTagCloseDeriv())})}});p=g("attribute",void 0,function(a,b){return{type:"attribute",nullable:!1,nc:a,p:b,attDeriv:function(c,d){return a.contains(d)&&(b.nullable&&/^\s+$/.test(d.nodeValue)||b.textDeriv(c,d.nodeValue).nullable)?x:q},startTagCloseDeriv:function(){return q}}});s=l("value",function(a){return{type:"value",nullable:!1,value:a,textDeriv:function(b,c){return c===a?x:q},attDeriv:function(){return q},startTagCloseDeriv:function(){return this}}});
-B=l("data",function(a){return{type:"data",nullable:!1,dataType:a,textDeriv:function(){return x},attDeriv:function(){return q},startTagCloseDeriv:function(){return this}}});C=function t(a,b){return"after"===b.type?o(b.p1,a(b.p2)):"choice"===b.type?i(t(a,b.p1),t(a,b.p2)):b};z=function(a,b,c){for(var e=c.currentNode,b=b.startTagOpenDeriv(e),b=d(a,b,e.attributes,0),f=b=b.startTagCloseDeriv(),e=c.currentNode,b=c.firstChild(),h=[],g;b;)1===b.nodeType?h.push(b):3===b.nodeType&&!/^\s*$/.test(b.nodeValue)&&
-h.push(b.nodeValue),b=c.nextSibling();0===h.length&&(h=[""]);g=f;for(f=0;g!==q&&f<h.length;f+=1)b=h[f],"string"===typeof b?g=/^\s*$/.test(b)?i(g,g.textDeriv(a,b)):g.textDeriv(a,b):(c.currentNode=b,g=z(a,g,c));c.currentNode=e;return b=g.endTagDeriv()};w=function(a){var b,c,d;if("name"===a.name)b=a.text,c=a.a.ns,a={name:b,ns:c,hash:"{"+c+"}"+b,contains:function(a){return a.namespaceURI===c&&a.localName===b}};else if("choice"===a.name){b=[];c=[];k(b,c,a);a="";for(d=0;d<b.length;d+=1)a+="{"+c[d]+"}"+
-b[d]+",";a={hash:a,contains:function(a){var d;for(d=0;d<b.length;d+=1)if(b[d]===a.localName&&c[d]===a.namespaceURI)return!0;return!1}}}else a={hash:"anyName",contains:function(){return!0}};return a};A=function r(a,d){var e,f;if("elementref"===a.name){e=a.id||0;a=d[e];if(void 0!==a.name){var g=a;e=d[g.id]={hash:"element"+g.id.toString()};g=c(w(g.e[0]),A(g.e[1],d));for(f in g)g.hasOwnProperty(f)&&(e[f]=g[f]);f=e}else f=a;return f}switch(a.name){case "empty":return x;case "notAllowed":return q;case "text":return E;
-case "choice":return i(r(a.e[0],d),r(a.e[1],d));case "interleave":e=r(a.e[0],d);for(f=1;f<a.e.length;f+=1)e=h(e,r(a.e[f],d));return e;case "group":return n(r(a.e[0],d),r(a.e[1],d));case "oneOrMore":return u(r(a.e[0],d));case "attribute":return p(w(a.e[0]),r(a.e[1],d));case "value":return s(a.text);case "data":return e=a.a&&a.a.type,void 0===e&&(e=""),B(e);case "list":return b()}throw"No support for "+a.name;};this.makePattern=function(a,b){var c={},d;for(d in b)b.hasOwnProperty(d)&&(c[d]=b[d]);return d=
-A(a,c)};this.validate=function(a,b){var c;a.currentNode=a.root;c=z(null,F,a);c.nullable?b(null):(runtime.log("Error in Relax NG validation: "+c),b(["Error in Relax NG validation: "+c]))};this.init=function(a){F=a}};
-// Input 16
-runtime.loadClass("xmldom.RelaxNGParser");
-xmldom.RelaxNG2=function(){function j(a,c){this.message=function(){c&&(a+=1===c.nodeType?" Element ":" Node ",a+=c.nodeName,c.nodeValue&&(a+=" with value '"+c.nodeValue+"'"),a+=".");return a}}function l(b,c,f,e){return"empty"===b.name?null:a(b,c,f,e)}function f(a,d){if(2!==a.e.length)throw"Element with wrong # of elements: "+a.e.length;for(var f=d.currentNode,e=f?f.nodeType:0,g=null;1<e;){if(8!==e&&(3!==e||!/^\s+$/.test(d.currentNode.nodeValue)))return[new j("Not allowed node of type "+e+".")];e=
-(f=d.nextSibling())?f.nodeType:0}if(!f)return[new j("Missing element "+a.names)];if(a.names&&-1===a.names.indexOf(c[f.namespaceURI]+":"+f.localName))return[new j("Found "+f.nodeName+" instead of "+a.names+".",f)];if(d.firstChild()){for(g=l(a.e[1],d,f);d.nextSibling();)if(e=d.currentNode.nodeType,(!d.currentNode||!(3===d.currentNode.nodeType&&/^\s+$/.test(d.currentNode.nodeValue)))&&8!==e)return[new j("Spurious content.",d.currentNode)];if(d.parentNode()!==f)return[new j("Implementation error.")]}else g=
-l(a.e[1],d,f);d.nextSibling();return g}var g,a,c;a=function(b,c,g,e){var i=b.name,h=null;if("text"===i)a:{for(var n=(b=c.currentNode)?b.nodeType:0;b!==g&&3!==n;){if(1===n){h=[new j("Element not allowed here.",b)];break a}n=(b=c.nextSibling())?b.nodeType:0}c.nextSibling();h=null}else if("data"===i)h=null;else if("value"===i)e!==b.text&&(h=[new j("Wrong value, should be '"+b.text+"', not '"+e+"'",g)]);else if("list"===i)h=null;else if("attribute"===i)a:{if(2!==b.e.length)throw"Attribute with wrong # of elements: "+
-b.e.length;i=b.localnames.length;for(h=0;h<i;h+=1){e=g.getAttributeNS(b.namespaces[h],b.localnames[h]);""===e&&!g.hasAttributeNS(b.namespaces[h],b.localnames[h])&&(e=void 0);if(void 0!==n&&void 0!==e){h=[new j("Attribute defined too often.",g)];break a}n=e}h=void 0===n?[new j("Attribute not found: "+b.names,g)]:l(b.e[1],c,g,n)}else if("element"===i)h=f(b,c,g);else if("oneOrMore"===i){e=0;do n=c.currentNode,i=a(b.e[0],c,g),e+=1;while(!i&&n!==c.currentNode);1<e?(c.currentNode=n,h=null):h=i}else if("choice"===
-i){if(2!==b.e.length)throw"Choice with wrong # of options: "+b.e.length;n=c.currentNode;if("empty"===b.e[0].name){if(i=a(b.e[1],c,g,e))c.currentNode=n;h=null}else{if(i=l(b.e[0],c,g,e))c.currentNode=n,i=a(b.e[1],c,g,e);h=i}}else if("group"===i){if(2!==b.e.length)throw"Group with wrong # of members: "+b.e.length;h=a(b.e[0],c,g)||a(b.e[1],c,g)}else if("interleave"===i)a:{for(var n=b.e.length,e=[n],o=n,u,s,p,w;0<o;){u=0;s=c.currentNode;for(h=0;h<n;h+=1)p=c.currentNode,!0!==e[h]&&e[h]!==p&&(w=b.e[h],(i=
-a(w,c,g))?(c.currentNode=p,void 0===e[h]&&(e[h]=!1)):p===c.currentNode||"oneOrMore"===w.name||"choice"===w.name&&("oneOrMore"===w.e[0].name||"oneOrMore"===w.e[1].name)?(u+=1,e[h]=p):(u+=1,e[h]=!0));if(s===c.currentNode&&u===o)break;if(0===u){for(h=0;h<n;h+=1)if(!1===e[h]){h=[new j("Interleave does not match.",g)];break a}break}for(h=o=0;h<n;h+=1)!0!==e[h]&&(o+=1)}h=null}else throw i+" not allowed in nonEmptyPattern.";return h};this.validate=function(a,c){a.currentNode=a.root;var f=l(g.e[0],a,a.root);
-c(f)};this.init=function(a,d){g=a;c=d}};
-// Input 17
-xmldom.OperationalTransformInterface=function(){};xmldom.OperationalTransformInterface.prototype.retain=function(){};xmldom.OperationalTransformInterface.prototype.insertCharacters=function(){};xmldom.OperationalTransformInterface.prototype.insertElementStart=function(){};xmldom.OperationalTransformInterface.prototype.insertElementEnd=function(){};xmldom.OperationalTransformInterface.prototype.deleteCharacters=function(){};xmldom.OperationalTransformInterface.prototype.deleteElementStart=function(){};
-xmldom.OperationalTransformInterface.prototype.deleteElementEnd=function(){};xmldom.OperationalTransformInterface.prototype.replaceAttributes=function(){};xmldom.OperationalTransformInterface.prototype.updateAttributes=function(){};
-// Input 18
-xmldom.OperationalTransformDOM=function(){this.retain=function(){};this.insertCharacters=function(){};this.insertElementStart=function(){};this.insertElementEnd=function(){};this.deleteCharacters=function(){};this.deleteElementStart=function(){};this.deleteElementEnd=function(){};this.replaceAttributes=function(){};this.updateAttributes=function(){};this.atEnd=function(){return!0}};
-// Input 19
-xmldom.XPath=function(){function j(a,b,c){return-1!==a&&(a<b||-1===b)&&(a<c||-1===c)}function l(a){for(var b=[],c=0,d=a.length,e;c<d;){var f=a,g=d,i=b,k="",l=[],E=f.indexOf("[",c),C=f.indexOf("/",c),z=f.indexOf("=",c);j(C,E,z)?(k=f.substring(c,C),c=C+1):j(E,C,z)?(k=f.substring(c,E),c=h(f,E,l)):j(z,C,E)?(k=f.substring(c,z),c=z):(k=f.substring(c,g),c=g);i.push({location:k,predicates:l});if(c<d&&"="===a[c]){e=a.substring(c+1,d);if(2<e.length&&("'"===e[0]||'"'===e[0]))e=e.slice(1,e.length-1);else try{e=
-parseInt(e,10)}catch(F){}c=d}}return{steps:b,value:e}}function f(){}function g(){var a,c=!1;this.setNode=function(c){a=c};this.reset=function(){c=!1};this.next=function(){var b=c?null:a;c=!0;return b}}function a(a,c,b){this.reset=function(){a.reset()};this.next=function(){for(var d=a.next();d&&!(d=d.getAttributeNodeNS(c,b));)d=a.next();return d}}function c(a,c){var b=a.next(),d=null;this.reset=function(){a.reset();b=a.next();d=null};this.next=function(){for(;b;){if(d)if(c&&d.firstChild)d=d.firstChild;
-else{for(;!d.nextSibling&&d!==b;)d=d.parentNode;d===b?b=a.next():d=d.nextSibling}else{do(d=b.firstChild)||(b=a.next());while(b&&!d)}if(d&&1===d.nodeType)return d}return null}}function b(a,c){this.reset=function(){a.reset()};this.next=function(){for(var b=a.next();b&&!c(b);)b=a.next();return b}}function d(a,c,d){var c=c.split(":",2),e=d(c[0]),f=c[1];return new b(a,function(a){return a.localName===f&&a.namespaceURI===e})}function k(a,c,d){var e=new g,f=i(e,c,d),h=c.value;return void 0===h?new b(a,function(a){e.setNode(a);
-f.reset();return f.next()}):new b(a,function(a){e.setNode(a);f.reset();return(a=f.next())&&a.nodeValue===h})}function e(a,c,b){var d=a.ownerDocument,e=[],e=new g;e.setNode(a);a=l(c);e=i(e,a,b);a=[];for(b=e.next();b;)a.push(b),b=e.next();return e=a}var i,h;h=function(a,c,b){for(var d=c,e=a.length,f=0;d<e;)"]"===a[d]?(f-=1,0>=f&&b.push(l(a.substring(c,d)))):"["===a[d]&&(0>=f&&(c=d+1),f+=1),d+=1;return d};f.prototype.next=function(){};f.prototype.reset=function(){};i=function(b,e,f){var g,h,i,j;for(g=
-0;g<e.steps.length;g+=1){i=e.steps[g];h=i.location;""===h?b=new c(b,!1):"@"===h[0]?(j=h.slice(1).split(":",2),b=new a(b,f(j[0]),j[1])):"."!==h&&(b=new c(b,!1),-1!==h.indexOf(":")&&(b=d(b,h,f)));for(h=0;h<i.predicates.length;h+=1)j=i.predicates[h],b=k(b,j,f)}return b};xmldom.XPath=function(){this.getODFElementsWithXPath=e};return xmldom.XPath}();
-// Input 20
-odf.StyleInfo=function(){function j(f,g){for(var a=l[f.localName],c=a&&a[f.namespaceURI],b=c?c.length:0,d,k,e,a=0;a<b;a+=1)if(d=f.getAttributeNS(c[a].ns,c[a].localname))k=c[a].keygroup,(e=g[k])||(e=g[k]={}),e[d]=1;for(a=f.firstChild;a;)1===a.nodeType&&(c=a,j(c,g)),a=a.nextSibling}var l;this.UsedKeysList=function(f){var g={};this.uses=function(a){var c=a.localName,b=a.getAttributeNS("urn:oasis:names:tc:opendocument:xmlns:drawing:1.0","name")||a.getAttributeNS("urn:oasis:names:tc:opendocument:xmlns:style:1.0",
-"name"),a="style"===c?a.getAttributeNS("urn:oasis:names:tc:opendocument:xmlns:style:1.0","family"):"urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0"===a.namespaceURI?"data":c;return(a=g[a])?0<a[b]:!1};j(f,g)};this.canElementHaveStyle=function(f,g){var a=l[g.localName];return(a=a&&a[g.namespaceURI])&&0<a.length};l=function(f){var g,a,c,b,d,j={},e;for(g in f)if(f.hasOwnProperty(g)){c=f[g];d=c.length;for(a=0;a<d;a+=1)b=c[a],e=j[b.en]=j[b.en]||{},e=e[b.ens]=e[b.ens]||[],e.push({ns:b.ans,localname:b.a,
-keygroup:g})}return j}({text:[{ens:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",en:"tab-stop",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"leader-text-style"},{ens:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",en:"drop-cap",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"notes-configuration",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",a:"citation-body-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",
-en:"notes-configuration",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",a:"citation-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"a",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"alphabetical-index",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"linenumbering-configuration",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",
-a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"list-level-style-number",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"ruby-text",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"span",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"a",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",
-a:"visited-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",en:"text-properties",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"text-line-through-text-style"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"alphabetical-index-source",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",a:"main-entry-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"index-entry-bibliography",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",a:"style-name"},
-{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"index-entry-chapter",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"index-entry-link-end",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"index-entry-link-start",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",
-en:"index-entry-page-number",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"index-entry-span",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"index-entry-tab-stop",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"index-entry-text",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",
-a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"index-title-template",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"list-level-style-bullet",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"outline-level-style",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",a:"style-name"}],paragraph:[{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",
-en:"caption",ans:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",a:"text-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",en:"circle",ans:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",a:"text-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",en:"connector",ans:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",a:"text-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",en:"control",ans:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",
-a:"text-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",en:"custom-shape",ans:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",a:"text-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",en:"ellipse",ans:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",a:"text-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",en:"frame",ans:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",a:"text-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",
-en:"line",ans:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",a:"text-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",en:"measure",ans:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",a:"text-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",en:"path",ans:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",a:"text-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",en:"polygon",ans:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",
-a:"text-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",en:"polyline",ans:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",a:"text-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",en:"rect",ans:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",a:"text-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",en:"regular-polygon",ans:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",a:"text-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:office:1.0",
-en:"annotation",ans:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",a:"text-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:form:1.0",en:"column",ans:"urn:oasis:names:tc:opendocument:xmlns:form:1.0",a:"text-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",en:"style",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"next-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",en:"body",ans:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",a:"paragraph-style-name"},
-{ens:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",en:"even-columns",ans:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",a:"paragraph-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",en:"even-rows",ans:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",a:"paragraph-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",en:"first-column",ans:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",a:"paragraph-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",
-en:"first-row",ans:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",a:"paragraph-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",en:"last-column",ans:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",a:"paragraph-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",en:"last-row",ans:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",a:"paragraph-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",en:"odd-columns",ans:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",
-a:"paragraph-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",en:"odd-rows",ans:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",a:"paragraph-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"notes-configuration",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",a:"default-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"alphabetical-index-entry-template",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",
-en:"bibliography-entry-template",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"h",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"illustration-index-entry-template",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"index-source-style",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",
-a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"object-index-entry-template",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"p",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"table-index-entry-template",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",
-en:"table-of-content-entry-template",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"table-index-entry-template",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"user-index-entry-template",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",en:"page-layout-properties",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",
-a:"register-truth-ref-style-name"}],chart:[{ens:"urn:oasis:names:tc:opendocument:xmlns:chart:1.0",en:"axis",ans:"urn:oasis:names:tc:opendocument:xmlns:chart:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:chart:1.0",en:"chart",ans:"urn:oasis:names:tc:opendocument:xmlns:chart:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:chart:1.0",en:"data-label",ans:"urn:oasis:names:tc:opendocument:xmlns:chart:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:chart:1.0",
-en:"data-point",ans:"urn:oasis:names:tc:opendocument:xmlns:chart:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:chart:1.0",en:"equation",ans:"urn:oasis:names:tc:opendocument:xmlns:chart:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:chart:1.0",en:"error-indicator",ans:"urn:oasis:names:tc:opendocument:xmlns:chart:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:chart:1.0",en:"floor",ans:"urn:oasis:names:tc:opendocument:xmlns:chart:1.0",a:"style-name"},
-{ens:"urn:oasis:names:tc:opendocument:xmlns:chart:1.0",en:"footer",ans:"urn:oasis:names:tc:opendocument:xmlns:chart:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:chart:1.0",en:"grid",ans:"urn:oasis:names:tc:opendocument:xmlns:chart:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:chart:1.0",en:"legend",ans:"urn:oasis:names:tc:opendocument:xmlns:chart:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:chart:1.0",en:"mean-value",ans:"urn:oasis:names:tc:opendocument:xmlns:chart:1.0",
-a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:chart:1.0",en:"plot-area",ans:"urn:oasis:names:tc:opendocument:xmlns:chart:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:chart:1.0",en:"regression-curve",ans:"urn:oasis:names:tc:opendocument:xmlns:chart:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:chart:1.0",en:"series",ans:"urn:oasis:names:tc:opendocument:xmlns:chart:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:chart:1.0",en:"stock-gain-marker",
-ans:"urn:oasis:names:tc:opendocument:xmlns:chart:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:chart:1.0",en:"stock-loss-marker",ans:"urn:oasis:names:tc:opendocument:xmlns:chart:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:chart:1.0",en:"stock-range-line",ans:"urn:oasis:names:tc:opendocument:xmlns:chart:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:chart:1.0",en:"subtitle",ans:"urn:oasis:names:tc:opendocument:xmlns:chart:1.0",a:"style-name"},
-{ens:"urn:oasis:names:tc:opendocument:xmlns:chart:1.0",en:"title",ans:"urn:oasis:names:tc:opendocument:xmlns:chart:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:chart:1.0",en:"wall",ans:"urn:oasis:names:tc:opendocument:xmlns:chart:1.0",a:"style-name"}],section:[{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"alphabetical-index",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"bibliography",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",
-a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"illustration-index",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"index-title",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"object-index",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"section",
-ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"table-of-content",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"table-index",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"user-index",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",a:"style-name"}],ruby:[{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",
-en:"ruby",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",a:"style-name"}],table:[{ens:"urn:oasis:names:tc:opendocument:xmlns:database:1.0",en:"query",ans:"urn:oasis:names:tc:opendocument:xmlns:database:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:database:1.0",en:"table-representation",ans:"urn:oasis:names:tc:opendocument:xmlns:database:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",en:"background",ans:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",
-a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",en:"table",ans:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",a:"style-name"}],"table-column":[{ens:"urn:oasis:names:tc:opendocument:xmlns:database:1.0",en:"column",ans:"urn:oasis:names:tc:opendocument:xmlns:database:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",en:"table-column",ans:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",a:"style-name"}],"table-row":[{ens:"urn:oasis:names:tc:opendocument:xmlns:database:1.0",
-en:"query",ans:"urn:oasis:names:tc:opendocument:xmlns:database:1.0",a:"default-row-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:database:1.0",en:"table-representation",ans:"urn:oasis:names:tc:opendocument:xmlns:database:1.0",a:"default-row-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",en:"table-row",ans:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",a:"style-name"}],"table-cell":[{ens:"urn:oasis:names:tc:opendocument:xmlns:database:1.0",en:"column",ans:"urn:oasis:names:tc:opendocument:xmlns:database:1.0",
-a:"default-cell-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",en:"table-column",ans:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",a:"default-cell-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",en:"table-row",ans:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",a:"default-cell-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",en:"body",ans:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",
-en:"covered-table-cell",ans:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",en:"even-columns",ans:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",en:"covered-table-cell",ans:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",en:"even-columns",ans:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",
-a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",en:"even-rows",ans:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",en:"first-column",ans:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",en:"first-row",ans:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",en:"last-column",
-ans:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",en:"last-row",ans:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",en:"odd-columns",ans:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",en:"odd-rows",ans:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",
-en:"table-cell",ans:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",a:"style-name"}],graphic:[{ens:"urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0",en:"cube",ans:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0",en:"extrude",ans:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0",en:"rotate",ans:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",a:"style-name"},
-{ens:"urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0",en:"scene",ans:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0",en:"sphere",ans:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",en:"caption",ans:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",en:"circle",ans:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",
-a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",en:"connector",ans:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",en:"control",ans:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",en:"custom-shape",ans:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",
-en:"ellipse",ans:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",en:"frame",ans:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",en:"g",ans:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",en:"line",ans:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",
-en:"measure",ans:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",en:"page-thumbnail",ans:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",en:"path",ans:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",en:"polygon",ans:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",a:"style-name"},
-{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",en:"polyline",ans:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",en:"rect",ans:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",en:"regular-polygon",ans:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:office:1.0",en:"annotation",
-ans:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",a:"style-name"}],presentation:[{ens:"urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0",en:"cube",ans:"urn:oasis:names:tc:opendocument:xmlns:presentation:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0",en:"extrude",ans:"urn:oasis:names:tc:opendocument:xmlns:presentation:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0",en:"rotate",ans:"urn:oasis:names:tc:opendocument:xmlns:presentation:1.0",a:"style-name"},
-{ens:"urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0",en:"scene",ans:"urn:oasis:names:tc:opendocument:xmlns:presentation:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0",en:"sphere",ans:"urn:oasis:names:tc:opendocument:xmlns:presentation:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",en:"caption",ans:"urn:oasis:names:tc:opendocument:xmlns:presentation:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",en:"circle",
-ans:"urn:oasis:names:tc:opendocument:xmlns:presentation:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",en:"connector",ans:"urn:oasis:names:tc:opendocument:xmlns:presentation:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",en:"control",ans:"urn:oasis:names:tc:opendocument:xmlns:presentation:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",en:"custom-shape",ans:"urn:oasis:names:tc:opendocument:xmlns:presentation:1.0",
-a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",en:"ellipse",ans:"urn:oasis:names:tc:opendocument:xmlns:presentation:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",en:"frame",ans:"urn:oasis:names:tc:opendocument:xmlns:presentation:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",en:"g",ans:"urn:oasis:names:tc:opendocument:xmlns:presentation:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",
-en:"line",ans:"urn:oasis:names:tc:opendocument:xmlns:presentation:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",en:"measure",ans:"urn:oasis:names:tc:opendocument:xmlns:presentation:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",en:"page-thumbnail",ans:"urn:oasis:names:tc:opendocument:xmlns:presentation:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",en:"path",ans:"urn:oasis:names:tc:opendocument:xmlns:presentation:1.0",
-a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",en:"polygon",ans:"urn:oasis:names:tc:opendocument:xmlns:presentation:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",en:"polyline",ans:"urn:oasis:names:tc:opendocument:xmlns:presentation:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",en:"rect",ans:"urn:oasis:names:tc:opendocument:xmlns:presentation:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",
-en:"regular-polygon",ans:"urn:oasis:names:tc:opendocument:xmlns:presentation:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:office:1.0",en:"annotation",ans:"urn:oasis:names:tc:opendocument:xmlns:presentation:1.0",a:"style-name"}],"drawing-page":[{ens:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",en:"page",ans:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:presentation:1.0",en:"notes",ans:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",
-a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",en:"handout-master",ans:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",en:"master-page",ans:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",a:"style-name"}],"list-style":[{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"list",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",
-en:"numbered-paragraph",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",a:"style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"list-item",ans:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",a:"style-override"},{ens:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",en:"style",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"list-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",en:"style",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"data-style-name"},
-{ens:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",en:"style",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"percentage-data-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:presentation:1.0",en:"date-time-decl",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"data-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"creation-date",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"data-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",
-en:"creation-time",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"data-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"database-display",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"data-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"date",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"data-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"editing-duration",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",
-a:"data-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"expression",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"data-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"meta-field",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"data-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"modification-date",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"data-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",
-en:"modification-time",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"data-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"print-date",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"data-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"print-time",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"data-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"table-formula",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",
-a:"data-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"time",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"data-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"user-defined",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"data-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"user-field-get",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"data-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",
-en:"user-field-input",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"data-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"variable-get",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"data-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"variable-input",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"data-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"variable-set",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",
-a:"data-style-name"}],data:[{ens:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",en:"style",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"data-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",en:"style",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"percentage-data-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:presentation:1.0",en:"date-time-decl",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"data-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",
-en:"creation-date",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"data-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"creation-time",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"data-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"database-display",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"data-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"date",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",
-a:"data-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"editing-duration",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"data-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"expression",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"data-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"meta-field",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"data-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",
-en:"modification-date",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"data-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"modification-time",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"data-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"print-date",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"data-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"print-time",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",
-a:"data-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"table-formula",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"data-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"time",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"data-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"user-defined",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"data-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",
-en:"user-field-get",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"data-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"user-field-input",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"data-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"variable-get",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"data-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"variable-input",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",
-a:"data-style-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:text:1.0",en:"variable-set",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"data-style-name"}],"page-layout":[{ens:"urn:oasis:names:tc:opendocument:xmlns:presentation:1.0",en:"notes",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"page-layout-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",en:"handout-master",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"page-layout-name"},{ens:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",
-en:"master-page",ans:"urn:oasis:names:tc:opendocument:xmlns:style:1.0",a:"page-layout-name"}]})};
-// Input 21
-odf.Style2CSS=function(){function j(a,b){var c={},d,e,f;if(!b)return c;for(d=b.firstChild;d;){d.namespaceURI===h&&"style"===d.localName?f=d.getAttributeNS(h,"family"):d.namespaceURI===n&&"list-style"===d.localName&&(f="list");if(e=f&&d.getAttributeNS&&d.getAttributeNS(h,"name"))c[f]||(c[f]={}),c[f][e]=d;d=d.nextSibling}return c}function l(a,c){if(!c||!a)return null;if(a[c])return a[c];var b,d;for(b in a)if(a.hasOwnProperty(b)&&(d=l(a[b].derivedStyles,c)))return d;return null}function f(a,c,b){var d=
-c[a],e,g;d&&((e=d.getAttributeNS(h,"parent-style-name"),g=null,e&&(g=l(b,e),!g&&c[e]&&(f(e,c,b),g=c[e],c[e]=null)),g)?(g.derivedStyles||(g.derivedStyles={}),g.derivedStyles[a]=d):b[a]=d)}function g(a,c){for(var b in a)a.hasOwnProperty(b)&&(f(b,a,c),a[b]=null)}function a(a,c){var b=u[a],d;if(null===b)return null;d="["+b+'|style-name="'+c+'"]';"presentation"===b&&(b="draw",d='[presentation|style-name="'+c+'"]');return b+"|"+s[a].join(d+","+b+"|")+d}function c(b,d,e){var f=[],g,h;f.push(a(b,d));for(g in e.derivedStyles)if(e.derivedStyles.hasOwnProperty(g))for(h in d=
-c(b,g,e.derivedStyles[g]),d)d.hasOwnProperty(h)&&f.push(d[h]);return f}function b(a,b,c){if(!a)return null;for(a=a.firstChild;a;){if(a.namespaceURI===b&&a.localName===c)return b=a;a=a.nextSibling}return null}function d(a,b){var c="",d,e;for(d in b)b.hasOwnProperty(d)&&(d=b[d],(e=a.getAttributeNS(d[0],d[1]))&&(c+=d[2]+":"+e+";"));return c}function k(a,b,c,d){b='text|list[text|style-name="'+b+'"]';for(c=(c=c.getAttributeNS(n,"level"))&&parseInt(c,10);1<c;)b+=" > text|list-item > text|list",c-=1;try{a.insertRule(b+
-" > list-item:before{"+d+"}",a.cssRules.length)}catch(e){throw e;}}function e(a,f,g,j){if("list"===f)for(var l=j.firstChild,m,t;l;){if(l.namespaceURI===n)if(m=l,"list-level-style-number"===l.localName){t=m;var r=t.getAttributeNS(h,"num-format"),o=t.getAttributeNS(h,"num-suffix"),s="",s={1:"decimal",a:"lower-latin",A:"upper-latin",i:"lower-roman",I:"upper-roman"},u="",u=t.getAttributeNS(h,"num-prefix")||"",u=s.hasOwnProperty(r)?u+(" counter(list, "+s[r]+")"):r?u+("'"+r+"';"):u+" ''";o&&(u+=" '"+o+
-"'");t=s="content: "+u+";";k(a,g,m,t)}else"list-level-style-image"===l.localName?(t="content: none;",k(a,g,m,t)):"list-level-style-bullet"===l.localName&&(t="content: '"+m.getAttributeNS(n,"bullet-char")+"';",k(a,g,m,t));l=l.nextSibling}else{g=c(f,g,j).join(",");l="";if(m=b(j,h,"text-properties")){t=""+d(m,p);r=m.getAttributeNS(h,"text-underline-style");"solid"===r&&(t+="text-decoration: underline;");if(r=m.getAttributeNS(h,"font-name"))(r='"'+r+'"')&&(t+="font-family: "+r+";");l+=t}if(m=b(j,h,"paragraph-properties")){t=
-m;m=""+d(t,B);t=t.getElementsByTagNameNS(h,"background-image");if(0<t.length&&(r=t.item(0).getAttributeNS(i,"href")))m+="background-image: url('odfkit:"+r+"');",t=t.item(0),m+=d(t,w);l+=m}if(m=b(j,h,"graphic-properties"))m=""+d(m,A),l+=m;if(m=b(j,h,"table-cell-properties"))m=""+d(m,q),l+=m;if(0!==l.length)try{a.insertRule(g+"{"+l+"}",a.cssRules.length)}catch(O){throw O;}}for(var N in j.derivedStyles)j.derivedStyles.hasOwnProperty(N)&&e(a,f,N,j.derivedStyles[N])}var i="http://www.w3.org/1999/xlink",
-h="urn:oasis:names:tc:opendocument:xmlns:style:1.0",n="urn:oasis:names:tc:opendocument:xmlns:text:1.0",o={draw:"urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",fo:"urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0",office:"urn:oasis:names:tc:opendocument:xmlns:office:1.0",presentation:"urn:oasis:names:tc:opendocument:xmlns:presentation:1.0",style:h,svg:"urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0",table:"urn:oasis:names:tc:opendocument:xmlns:table:1.0",text:n,xlink:i},u=
-{graphic:"draw",paragraph:"text",presentation:"presentation",ruby:"text",section:"text",table:"table","table-cell":"table","table-column":"table","table-row":"table",text:"text",list:"text"},s={graphic:"circle,connected,control,custom-shape,ellipse,frame,g,line,measure,page,page-thumbnail,path,polygon,polyline,rect,regular-polygon".split(","),paragraph:"alphabetical-index-entry-template,h,illustration-index-entry-template,index-source-style,object-index-entry-template,p,table-index-entry-template,table-of-content-entry-template,user-index-entry-template".split(","),
-presentation:"caption,circle,connector,control,custom-shape,ellipse,frame,g,line,measure,page-thumbnail,path,polygon,polyline,rect,regular-polygon".split(","),ruby:["ruby","ruby-text"],section:"alphabetical-index,bibliography,illustration-index,index-title,object-index,section,table-of-content,table-index,user-index".split(","),table:["background","table"],"table-cell":"body,covered-table-cell,even-columns,even-rows,first-column,first-row,last-column,last-row,odd-columns,odd-rows,table-cell".split(","),
-"table-column":["table-column"],"table-row":["table-row"],text:"a,index-entry-chapter,index-entry-link-end,index-entry-link-start,index-entry-page-number,index-entry-span,index-entry-tab-stop,index-entry-text,index-title-template,linenumbering-configuration,list-level-style-number,list-level-style-bullet,outline-level-style,span".split(","),list:["list-item"]},p=[["urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0","color","color"],["urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0",
-"background-color","background-color"],["urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0","font-weight","font-weight"],["urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0","font-style","font-style"],["urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0","font-size","font-size"]],w=[[h,"repeat","background-repeat"]],B=[["urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0","background-color","background-color"],["urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0",
-"text-align","text-align"],["urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0","padding-left","padding-left"],["urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0","padding-right","padding-right"],["urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0","padding-top","padding-top"],["urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0","padding-bottom","padding-bottom"],["urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0","border-left","border-left"],["urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0",
-"border-right","border-right"],["urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0","border-top","border-top"],["urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0","border-bottom","border-bottom"],["urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0","margin-left","margin-left"],["urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0","margin-right","margin-right"],["urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0","margin-top","margin-top"],["urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0",
-"margin-bottom","margin-bottom"],["urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0","border","border"]],A=[["urn:oasis:names:tc:opendocument:xmlns:drawing:1.0","fill-color","background-color"],["urn:oasis:names:tc:opendocument:xmlns:drawing:1.0","fill","background"],["urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0","min-height","min-height"],["urn:oasis:names:tc:opendocument:xmlns:drawing:1.0","stroke","border"],["urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0",
-"stroke-color","border-color"]],q=[["urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0","background-color","background-color"],["urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0","border-left","border-left"],["urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0","border-right","border-right"],["urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0","border-top","border-top"],["urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0","border-bottom","border-bottom"]];
-this.namespaces=o;this.namespaceResolver=function(a){return o[a]||null};this.namespaceResolver.lookupNamespaceURI=this.namespaceResolver;this.style2css=function(a,b,c){for(var d,f,h,i,k;a.cssRules.length;)a.deleteRule(a.cssRules.length-1);d=null;b&&(d=b.ownerDocument);c&&(d=c.ownerDocument);if(d){for(f in o)if(o.hasOwnProperty(f)){i="@namespace "+f+" url("+o[f]+");";try{a.insertRule(i,a.cssRules.length)}catch(p){}}b=j(d,b);f=j(d,c);c={};for(k in u)if(u.hasOwnProperty(k))for(h in d=c[k]={},g(b[k],
-d),g(f[k],d),d)d.hasOwnProperty(h)&&e(a,k,h,d[h])}}};
-// Input 22
-runtime.loadClass("core.Base64");runtime.loadClass("xmldom.XPath");runtime.loadClass("odf.Style2CSS");
-odf.FontLoader=function(){function j(c,b,d,f,e){var g,h=0,l;for(l in c)c.hasOwnProperty(l)&&(h===d&&(g=l),h+=1);if(!g)return e();b.load(c[g].href,function(h,l){if(h)runtime.log(h);else{var n=f,n=document.styleSheets[0],p='@font-face { font-family: "'+g+'"; src: url(data:application/x-font-ttf;charset=binary;base64,'+a.convertUTF8ArrayToBase64(l)+') format("truetype"); }';try{n.insertRule(p,n.cssRules.length)}catch(w){runtime.log("Problem inserting rule in CSS: "+p)}}return j(c,b,d+1,f,e)})}function l(a,
-b,d){j(a,b,0,d,function(){})}var f=new odf.Style2CSS,g=new xmldom.XPath,a=new core.Base64;odf.FontLoader=function(){this.loadFonts=function(a,b,d){var j={},e,i,h;if(a){a=g.getODFElementsWithXPath(a,"style:font-face[svg:font-face-src]",f.namespaceResolver);for(e=0;e<a.length;e+=1)i=a[e],h=i.getAttributeNS(f.namespaces.style,"name"),i=g.getODFElementsWithXPath(i,"svg:font-face-src/svg:font-face-uri",f.namespaceResolver),0<i.length&&(i=i[0].getAttributeNS(f.namespaces.xlink,"href"),j[h]={href:i})}l(j,
-b,d)}};return odf.FontLoader}();
-// Input 23
-runtime.loadClass("core.Base64");runtime.loadClass("core.Zip");runtime.loadClass("xmldom.LSSerializer");runtime.loadClass("odf.StyleInfo");runtime.loadClass("odf.Style2CSS");runtime.loadClass("odf.FontLoader");
-odf.OdfContainer=function(){function j(a,b,c){for(a=a?a.firstChild:null;a;){if(a.localName===c&&a.namespaceURI===b)return a;a=a.nextSibling}return null}function l(a){var b,c=h.length;for(b=0;b<c;b+=1)if(a.namespaceURI===e&&a.localName===h[b])return b;return-1}function f(a,b){var c=a.automaticStyles,e;b&&(e=new d.UsedKeysList(b));this.acceptNode=function(a){return"http://www.w3.org/1999/xhtml"===a.namespaceURI?3:e&&a.parentNode===c&&1===a.nodeType?e.uses(a)?1:2:1}}function g(a,b){if(b){var c=l(b),
-d,e=a.firstChild;if(-1!==c){for(;e;){d=l(e);if(-1!==d&&d>c)break;e=e.nextSibling}a.insertBefore(b,e)}}}function a(a){this.OdfContainer=a}function c(a,b,c){var d=this;this.size=0;this.type=null;this.name=a;this.container=b;this.onchange=this.onreadystatechange=this.document=this.mimetype=this.url=null;this.EMPTY=0;this.LOADING=1;this.DONE=2;this.state=this.EMPTY;this.load=function(){var b=u[a];this.mimetype=b;c.loadAsDataURL(a,b,function(a,b){d.url=b;if(d.onchange)d.onchange(d);if(d.onstatereadychange)d.onstatereadychange(d)})};
-this.abort=function(){}}function b(){this.length=0;this.item=function(){}}var d=new odf.StyleInfo,k=new odf.Style2CSS,e="urn:oasis:names:tc:opendocument:xmlns:office:1.0",i="urn:oasis:names:tc:opendocument:xmlns:manifest:1.0",h="meta,settings,scripts,font-face-decls,styles,automatic-styles,master-styles,body".split(","),n=new core.Base64,o=new odf.FontLoader,u={};a.prototype=new function(){};a.prototype.constructor=a;a.namespaceURI=e;a.localName="document";c.prototype.load=function(){};c.prototype.getUrl=
-function(){return this.data?"data:;base64,"+n.toBase64(this.data):null};odf.OdfContainer=function p(d,h){function l(a){for(var b=a.firstChild,c;b;)c=b.nextSibling,1===b.nodeType?l(b):7===b.nodeType&&a.removeChild(b),b=c}function n(a){var b=v.rootElement.ownerDocument,c;if(a){l(a.documentElement);try{c=b.importNode(a.documentElement,!0)}catch(d){}}return c}function x(a){v.state=a;if(v.onchange)v.onchange(v);if(v.onstatereadychange)v.onstatereadychange(v)}function E(a){var a=n(a),b=v.rootElement;!a||
-"document-styles"!==a.localName||a.namespaceURI!==e?x(p.INVALID):(b.fontFaceDecls=j(a,e,"font-face-decls"),g(b,b.fontFaceDecls),b.styles=j(a,e,"styles"),g(b,b.styles),b.automaticStyles=j(a,e,"automatic-styles"),g(b,b.automaticStyles),b.masterStyles=j(a,e,"master-styles"),g(b,b.masterStyles),o.loadFonts(b.fontFaceDecls,J,null))}function C(a){var a=n(a),b,c,d;if(!a||"document-content"!==a.localName||a.namespaceURI!==e)x(p.INVALID);else{b=v.rootElement;c=j(a,e,"font-face-decls");if(b.fontFaceDecls&&
-c)for(d=c.firstChild;d;)b.fontFaceDecls.appendChild(d),d=c.firstChild;else c&&(b.fontFaceDecls=c,g(b,c));c=j(a,e,"automatic-styles");if(b.automaticStyles&&c)for(d=c.firstChild;d;)b.automaticStyles.appendChild(d),d=c.firstChild;else c&&(b.automaticStyles=c,g(b,c));b.body=j(a,e,"body");g(b,b.body)}}function z(a){var a=n(a),b;if(a&&!("document-meta"!==a.localName||a.namespaceURI!==e))b=v.rootElement,b.meta=j(a,e,"meta"),g(b,b.meta)}function F(a){var a=n(a),b;if(a&&!("document-settings"!==a.localName||
-a.namespaceURI!==e))b=v.rootElement,b.settings=j(a,e,"settings"),g(b,b.settings)}function m(a,b){J.loadAsDOM(a,b)}function t(){m("styles.xml",function(a,b){E(b);v.state!==p.INVALID&&m("content.xml",function(a,b){C(b);v.state!==p.INVALID&&m("meta.xml",function(a,b){z(b);v.state!==p.INVALID&&m("settings.xml",function(a,b){b&&F(b);m("META-INF/manifest.xml",function(a,b){if(b){var c=n(b),d;if(c&&!("manifest"!==c.localName||c.namespaceURI!==i)){d=v.rootElement;d.manifest=c;for(c=d.manifest.firstChild;c;)1===
-c.nodeType&&"file-entry"===c.localName&&c.namespaceURI===i&&(u[c.getAttributeNS(i,"full-path")]=c.getAttributeNS(i,"media-type")),c=c.nextSibling}}v.state!==p.INVALID&&x(p.DONE)})})})})})}function r(a,b){var c="",d;for(d in b)b.hasOwnProperty(d)&&(c+=" xmlns:"+d+'="'+b[d]+'"');return'<?xml version="1.0" encoding="UTF-8"?><office:'+a+" "+c+' office:version="1.2">'}function y(){var a=k.namespaces,b=new xmldom.LSSerializer,c=r("document-meta",a);b.filter=new f(v.rootElement);c+=b.writeToString(v.rootElement.meta,
-a);return c+"</office:document-meta>"}function L(){var a=k.namespaces,b=new xmldom.LSSerializer,c=r("document-settings",a);b.filter=new f(v.rootElement);c+=b.writeToString(v.rootElement.settings,a);return c+"</office:document-settings>"}function T(){var a=k.namespaces,b=new xmldom.LSSerializer,c=r("document-styles",a);b.filter=new f(v.rootElement,v.rootElement.masterStyles);c+=b.writeToString(v.rootElement.fontFaceDecls,a);c+=b.writeToString(v.rootElement.styles,a);c+=b.writeToString(v.rootElement.automaticStyles,
-a);c+=b.writeToString(v.rootElement.masterStyles,a);return c+"</office:document-styles>"}function O(){var a=k.namespaces,b=new xmldom.LSSerializer,c=r("document-content",a);b.filter=new f(v.rootElement,v.rootElement.body);c+=b.writeToString(v.rootElement.automaticStyles,a);c+=b.writeToString(v.rootElement.body,a);return c+"</office:document-content>"}function N(a,b){runtime.loadXML(a,function(a,c){if(a)b(a);else{var d=n(c);!d||"document"!==d.localName||d.namespaceURI!==e?x(p.INVALID):(v.rootElement=
-d,d.fontFaceDecls=j(d,e,"font-face-decls"),d.styles=j(d,e,"styles"),d.automaticStyles=j(d,e,"automatic-styles"),d.masterStyles=j(d,e,"master-styles"),d.body=j(d,e,"body"),d.meta=j(d,e,"meta"),x(p.DONE))}})}var v=this,J=null;this.onstatereadychange=h;this.parts=this.rootElement=this.state=this.onchange=null;this.getPart=function(a){return new c(a,v,J)};this.save=function(a){var b;b=runtime.byteArrayFromString(L(),"utf8");J.save("settings.xml",b,!0,new Date);b=runtime.byteArrayFromString(y(),"utf8");
-J.save("meta.xml",b,!0,new Date);b=runtime.byteArrayFromString(T(),"utf8");J.save("styles.xml",b,!0,new Date);b=runtime.byteArrayFromString(O(),"utf8");J.save("content.xml",b,!0,new Date);J.write(function(b){a(b)})};this.state=p.LOADING;this.rootElement=function(a){var b=document.createElementNS(a.namespaceURI,a.localName),c,a=new a;for(c in a)a.hasOwnProperty(c)&&(b[c]=a[c]);return b}(a);this.parts=new b(this);J=new core.Zip(d,function(a,b){J=b;a?N(d,function(b){a&&(J.error=a+"\n"+b,x(p.INVALID))}):
-t()})};odf.OdfContainer.EMPTY=0;odf.OdfContainer.LOADING=1;odf.OdfContainer.DONE=2;odf.OdfContainer.INVALID=3;odf.OdfContainer.SAVING=4;odf.OdfContainer.MODIFIED=5;odf.OdfContainer.getContainer=function(a){return new odf.OdfContainer(a,null)};return odf.OdfContainer}();
-// Input 24
-odf.Formatting=function(){function j(f){function g(a,b){for(var d=a&&a.firstChild;d&&b;)d=d.nextSibling,b-=1;return d}var a=g(f.startContainer,f.startOffset);g(f.endContainer,f.endOffset);this.next=function(){return null===a?a:null}}var l=new odf.StyleInfo;this.setOdfContainer=function(){};this.isCompletelyBold=function(){return!1};this.getAlignment=function(f){this.getParagraphStyles(f)};this.getParagraphStyles=function(f){var g,a,c,b=[];for(g=0;g<f.length;g+=0){a=void 0;c=[];for(a=(new j(f[g])).next();a;)l.canElementHaveStyle("paragraph",
-a)&&c.push(a);for(a=0;a<c.length;a+=1)-1===b.indexOf(c[a])&&b.push(c[a])}return b};this.getTextStyles=function(){return[]}};
-// Input 25
-runtime.loadClass("odf.OdfContainer");runtime.loadClass("odf.Formatting");runtime.loadClass("xmldom.XPath");
-odf.OdfCanvas=function(){function j(a){function b(){for(;0<c.cssRules.length;)c.deleteRule(0);c.insertRule("office|presentation draw|page {display:none;}",0);c.insertRule("office|presentation draw|page:nth-child("+d+") {display:block;}",1)}var c=a.sheet,d=1;this.showNextPage=function(){d+=1;b()};this.showPreviousPage=function(){1<d&&(d-=1,b())};this.css=a}function l(a,b,c){a.addEventListener?a.addEventListener(b,c,!1):a.attachEvent?a.attachEvent("on"+b,c):a["on"+b]=c}function f(a){function b(a,c){for(;c;){if(c===
-a)return!0;c=c.parentNode}return!1}function c(){var f=[],g=runtime.getWindow().getSelection(),h,i;for(h=0;h<g.rangeCount;h+=1)i=g.getRangeAt(h),null!==i&&b(a,i.startContainer)&&b(a,i.endContainer)&&f.push(i);if(f.length===d.length){for(g=0;g<f.length&&!(f[g]===d[g]?0:null===f[g]||null===d[g]||f[g].startContainer!==d[g].startContainer||f[g].startOffset!==d[g].startOffset||f[g].endContainer!==d[g].endContainer||f[g].endOffset!==d[g].endOffset);g+=1);if(g===f.length)return}d=f;var g=[f.length],j,k=a.ownerDocument;
-for(h=0;h<f.length;h+=1)i=f[h],j=k.createRange(),j.setStart(i.startContainer,i.startOffset),j.setEnd(i.endContainer,i.endOffset),g[h]=j;d=g;g=e.length;for(f=0;f<g;f+=1)e[f](a,d)}var d=[],e=[];this.addListener=function(a,b){var c,d=e.length;for(c=0;c<d;c+=1)if(e[c]===b)return;e.push(b)};l(a,"mouseup",c);l(a,"keyup",c);l(a,"keydown",c)}function g(a){for(a=a.firstChild;a;){if(a.namespaceURI===o&&"binary-data"===a.localName)return"data:image/png;base64,"+a.textContent;a=a.nextSibling}return""}function a(a,
-b,c,d){function e(b){b='draw|image[styleid="'+a+'"] {'+("background-image: url("+b+");")+"}";d.insertRule(b,d.cssRules.length)}c.setAttribute("styleid",a);var f=c.getAttributeNS(p,"href"),h;if(f)try{b.getPartUrl?(f=b.getPartUrl(f),e(f)):(h=b.getPart(f),h.onchange=function(a){e(a.url)},h.load())}catch(i){runtime.log("slight problem: "+i)}else f=g(c),e(f)}function c(b,c,d){function e(b,c,d,f){x.addToQueue(function(){a(b,c,d,f)})}var f,g;f=c.getElementsByTagNameNS(h,"image");for(c=0;c<f.length;c+=1)g=
-f.item(c),e("image"+c,b,g,d)}function b(a,b,c){function d(a,b){"video/"===b.substr(0,6)?(e=h.createElementNS(h.documentElement.namespaceURI,"video"),e.setAttribute("controls","controls"),f=h.createElement("source"),f.setAttribute("src",a),f.setAttribute("type",b),e.appendChild(f),c.parentNode.appendChild(e)):c.innerHtml="Unrecognised Plugin"}var e,f,h=c.ownerDocument,i;if(a=c.getAttributeNS(p,"href"))try{b.getPartUrl?(a=b.getPartUrl(a),d(a,"video/mp4")):(i=b.getPart(a),i.onchange=function(a){d(a.url,
-a.mimetype)},i.load())}catch(j){runtime.log("slight problem: "+j)}else runtime.log("using MP4 data fallback"),a=g(c),d(a,"video/mp4")}function d(a,c,d){function e(a,c,d,f){x.addToQueue(function(){b(a,c,d,f)})}var f,g;f=c.getElementsByTagNameNS(h,"plugin");runtime.log("Loading Videos:");for(c=0;c<f.length;c+=1)runtime.log("...Found a video."),g=f.item(c),e("video"+c,a,g,d)}function k(a){var b=a.getElementsByTagName("style"),c=a.getElementsByTagName("head")[0],d="",e,b=b&&0<b.length?b[0].cloneNode(!1):
-a.createElement("style");for(e in i)i.hasOwnProperty(e)&&e&&(d+="@namespace "+e+" url("+i[e]+");\n");b.appendChild(a.createTextNode(d));c.appendChild(b);return b}var e=new odf.Style2CSS,i=e.namespaces,h=i.draw,n=i.fo,o=i.office,u=i.svg,s=i.text,p=i.xlink,w=runtime.getWindow(),B=new xmldom.XPath,A={},q,x=new function(){function a(d){c=!0;runtime.setTimeout(function(){try{d()}catch(e){runtime.log(e)}c=!1;0<b.length&&a(b.pop())},10)}var b=[],c=!1;this.clearQueue=function(){b.length=0};this.addToQueue=
-function(d){if(0===b.length&&!c)return a(d);b.push(d)}};odf.OdfCanvas=function(a){function b(){var c=a.firstChild.firstChild;c&&(a.style.WebkitTransform="scale("+v+")",a.style.WebkitTransformOrigin="left top",a.style.width=Math.round(v*c.offsetWidth)+"px",a.style.height=Math.round(v*c.offsetHeight)+"px")}function g(f){function i(){for(var g=a;g.firstChild;)g.removeChild(g.firstChild);a.style.display="inline-block";g=f.rootElement;a.ownerDocument.importNode(g,!0);o.setOdfContainer(f);var j=T;(new odf.Style2CSS).style2css(j.sheet,
-g.styles,g.automaticStyles);var j=f,k=O.sheet,l;l=g.body;var p,q,w;q=[];for(p=l.firstChild;p&&p!==l;)if(p.namespaceURI===h&&(q[q.length]=p),p.firstChild)p=p.firstChild;else{for(;p&&p!==l&&!p.nextSibling;)p=p.parentNode;p&&p.nextSibling&&(p=p.nextSibling)}for(w=0;w<q.length;w+=1){p=q[w];var t="frame"+w,x=k;p.setAttribute("styleid",t);var v=void 0,y=p.getAttributeNS(s,"anchor-type"),G=p.getAttributeNS(u,"x"),z=p.getAttributeNS(u,"y"),F=p.getAttributeNS(u,"width"),L=p.getAttributeNS(u,"height"),P=p.getAttributeNS(n,
-"min-height"),N=p.getAttributeNS(n,"min-width");if("as-char"===y)v="display: inline-block;";else if(y||G||z)v="position: absolute;";else if(F||L||P||N)v="display: block;";G&&(v+="left: "+G+";");z&&(v+="top: "+z+";");F&&(v+="width: "+F+";");L&&(v+="height: "+L+";");P&&(v+="min-height: "+P+";");N&&(v+="min-width: "+N+";");v&&(v="draw|"+p.localName+'[styleid="'+t+'"] {'+v+"}",x.insertRule(v,x.cssRules.length))}w=B.getODFElementsWithXPath(l,".//*[*[@text:anchor-type='paragraph']]",e.namespaceResolver);
-for(q=0;q<w.length;q+=1)l=w[q],l.setAttributeNS&&l.setAttributeNS("urn:webodf","containsparagraphanchor",!0);k.insertRule("draw|page { background-color:#fff; }",k.cssRules.length);for(l=a;l.firstChild;)l.removeChild(l.firstChild);l=m.createElement("div");l.style.display="inline-block";l.style.background="white";l.appendChild(g);a.appendChild(l);c(j,g.body,k);d(j,g.body,k);b();if(A.hasOwnProperty("statereadychange")){g=A.statereadychange;for(j=0;j<g.length;j+=1)g[j](void 0)}}p===f&&(p.state===odf.OdfContainer.DONE?
-i():p.onchange=i)}function i(){if(q){for(var a=q.ownerDocument.createDocumentFragment();q.firstChild;)a.insertBefore(q.firstChild,null);q.parentNode.replaceChild(a,q)}}var m=a.ownerDocument,p,o=new odf.Formatting,y=new f(a),L=new j(k(m)),T=k(m),O=k(m),N=!1,v=1;this.odfContainer=function(){return p};this.slidevisibilitycss=function(){return L.css};this.load=this.load=function(b){x.clearQueue();a.innerHTML="loading "+b;p=new odf.OdfContainer(b,function(a){p=a;g(a)});p.onstatereadychange=g};this.save=
-function(a){i();p.save(a)};this.setEditable=function(a){(N=a)||i()};this.addListener=function(a,b){if("selectionchange"===a)y.addListener(a,b);else{var c=A[a];void 0===c&&(c=A[a]=[]);b&&-1===c.indexOf(b)&&c.push(b)}};this.getFormatting=function(){return o};this.setZoomLevel=function(a){v=a;b()};this.getZoomLevel=function(){return v};this.fitToContainingElement=function(c,d){var e=a.offsetHeight/v;v=c/(a.offsetWidth/v);d/e<v&&(v=d/e);b()};this.fitToWidth=function(c){v=c/(a.offsetWidth/v);b()};this.fitToHeight=
-function(c){v=c/(a.offsetHeight/v);b()};this.showNextPage=function(){L.showNextPage()};this.showPreviousPage=function(){L.showPreviousPage()};this.showAllPages=function(){};l(a,"click",function(a){for(var a=a||w.event,b=a.target,c=w.getSelection(),d=0<c.rangeCount?c.getRangeAt(0):null,e=d&&d.startContainer,f=d&&d.startOffset,g=d&&d.endContainer,h=d&&d.endOffset;b&&!(("p"===b.localName||"h"===b.localName)&&b.namespaceURI===s);)b=b.parentNode;N&&b&&b.parentNode!==q&&((q?q.parentNode&&i():(q=b.ownerDocument.createElement("p"),
-q.style||(q=b.ownerDocument.createElementNS("http://www.w3.org/1999/xhtml","p")),q.style.margin="0px",q.style.padding="0px",q.style.border="0px",q.setAttribute("contenteditable",!0)),b.parentNode.replaceChild(q,b),q.appendChild(b),q.focus(),d&&(c.removeAllRanges(),d=b.ownerDocument.createRange(),d.setStart(e,f),d.setEnd(g,h),c.addRange(d)),a.preventDefault)?(a.preventDefault(),a.stopPropagation()):(a.returnValue=!1,a.cancelBubble=!0))})};return odf.OdfCanvas}();
-// Input 26
-runtime.loadClass("xmldom.XPath");runtime.loadClass("odf.Style2CSS");
-gui.PresenterUI=function(){var j=new odf.Style2CSS,l=new xmldom.XPath,f=j.namespaceResolver;return function(g){var a=this;a.setInitialSlideMode=function(){a.startSlideMode("single")};a.keyDownHandler=function(c){if(!(c.target.isContentEditable||"input"===c.target.nodeName))switch(c.keyCode){case 84:a.toggleToolbar();break;case 37:case 8:a.prevSlide();break;case 39:case 32:a.nextSlide();break;case 36:a.firstSlide();break;case 35:a.lastSlide()}};a.root=function(){return a.odf_canvas.odfContainer().rootElement};
-a.firstSlide=function(){a.slideChange(function(){return 0})};a.lastSlide=function(){a.slideChange(function(a,b){return b-1})};a.nextSlide=function(){a.slideChange(function(a,b){return a+1<b?a+1:-1})};a.prevSlide=function(){a.slideChange(function(a){return 1>a?-1:a-1})};a.slideChange=function(c){var b=a.getPages(a.odf_canvas.odfContainer().rootElement),d=-1,f=0;b.forEach(function(a){a=a[1];a.hasAttribute("slide_current")&&(d=f,a.removeAttribute("slide_current"));f+=1});c=c(d,b.length);-1===c&&(c=d);
-b[c][1].setAttribute("slide_current","1");document.getElementById("pagelist").selectedIndex=c;"cont"===a.slide_mode&&window.scrollBy(0,b[c][1].getBoundingClientRect().top-30)};a.selectSlide=function(c){a.slideChange(function(a,d){return c>=d||0>c?-1:c})};a.scrollIntoContView=function(c){var b=a.getPages(a.odf_canvas.odfContainer().rootElement);0!==b.length&&window.scrollBy(0,b[c][1].getBoundingClientRect().top-30)};a.getPages=function(a){var a=a.getElementsByTagNameNS(f("draw"),"page"),b=[],d;for(d=
-0;d<a.length;d+=1)b.push([a[d].getAttribute("draw:name"),a[d]]);return b};a.fillPageList=function(c,b){for(var d=a.getPages(c),f,e,g;b.firstChild;)b.removeChild(b.firstChild);for(f=0;f<d.length;f+=1)e=document.createElement("option"),g=l.getODFElementsWithXPath(d[f][1],'./draw:frame[@presentation:class="title"]//draw:text-box/text:p',xmldom.XPath),g=0<g.length?g[0].textContent:d[f][0],e.textContent=f+1+": "+g,b.appendChild(e)};a.startSlideMode=function(c){var b=document.getElementById("pagelist"),
-d=a.odf_canvas.slidevisibilitycss().sheet;for(a.slide_mode=c;0<d.cssRules.length;)d.deleteRule(0);a.selectSlide(0);"single"===a.slide_mode?(d.insertRule("draw|page { position:fixed; left:0px;top:30px; z-index:1; }",0),d.insertRule("draw|page[slide_current]  { z-index:2;}",1),d.insertRule("draw|page  { -webkit-transform: scale(1);}",2),a.fitToWindow(),window.addEventListener("resize",a.fitToWindow,!1)):"cont"===a.slide_mode&&window.removeEventListener("resize",a.fitToWindow,!1);a.fillPageList(a.odf_canvas.odfContainer().rootElement,
-b)};a.toggleToolbar=function(){var c,b,d;c=a.odf_canvas.slidevisibilitycss().sheet;b=-1;for(d=0;d<c.cssRules.length;d+=1)if(".toolbar"===c.cssRules[d].cssText.substring(0,8)){b=d;break}-1<b?c.deleteRule(b):c.insertRule(".toolbar { position:fixed; left:0px;top:-200px; z-index:0; }",0)};a.fitToWindow=function(){var c=a.getPages(a.root()),b=(window.innerHeight-40)/c[0][1].clientHeight,c=(window.innerWidth-10)/c[0][1].clientWidth,b=b<c?b:c,c=a.odf_canvas.slidevisibilitycss().sheet;c.deleteRule(2);c.insertRule("draw|page { \n-moz-transform: scale("+
-b+"); \n-moz-transform-origin: 0% 0%; -webkit-transform-origin: 0% 0%; -webkit-transform: scale("+b+"); -o-transform-origin: 0% 0%; -o-transform: scale("+b+"); -ms-transform-origin: 0% 0%; -ms-transform: scale("+b+"); }",2)};a.load=function(c){a.odf_canvas.load(c)};a.odf_element=g;a.odf_canvas=new odf.OdfCanvas(a.odf_element);a.odf_canvas.addListener("statereadychange",a.setInitialSlideMode);a.slide_mode="undefined";document.addEventListener("keydown",a.keyDownHandler,!1)}}();
-// Input 27
-gui.Caret=function(j,l){l.ownerDocument.createElementNS("urn:webodf:names:cursor","cursor");this.updateToSelection=function(){1===j.rangeCount&&j.getRangeAt(0)}};
-// Input 28
-runtime.loadClass("core.Cursor");
-gui.SelectionMover=function(j,l){function f(a,c){if(0!==j.rangeCount){var f=j.getRangeAt(0);if(f.startContainer&&1===f.startContainer.nodeType){l.setPoint(f.startContainer,f.startOffset);c();f=l.node();l.position();var e=[],g;for(g=0;g<j.rangeCount;g+=1)e[g]=j.getRangeAt(g);j.removeAllRanges();0===e.length&&(e[0]=f.ownerDocument.createRange());e[e.length-1].setStart(l.node(),l.position());for(g=0;g<e.length;g+=1)j.addRange(e[g])}}}function g(){c.updateToSelection();for(var a=c.getNode().getBoundingClientRect(),
-d=a.left,f=a.top,a=!1;!a;){c.remove();if(j.focusNode&&1===j.focusNode.nodeType){l.setPoint(j.focusNode,j.focusOffset);l.stepForward();var a=l.node(),e=l.position();j.collapse(a,e);c.updateToSelection()}a=c.getNode().getBoundingClientRect();a=a.top!==f&&a.left>d}}var a=l.node().ownerDocument,c=new core.Cursor(j,a);this.movePointForward=function(a){f(a,l.stepForward)};this.movePointBackward=function(a){f(a,l.stepBackward)};this.moveLineForward=function(a){j.modify?j.modify(a?"extend":"move","forward",
-"line"):f(a,g)};this.moveLineBackward=function(a){j.modify?j.modify(a?"extend":"move","backward","line"):f(a,function(){})};return this};
-// Input 29
-runtime.loadClass("core.PointWalker");runtime.loadClass("core.Cursor");
-gui.XMLEdit=function(j,l){function f(a,b,c){a.addEventListener?a.addEventListener(b,c,!1):a.attachEvent?a.attachEvent("on"+b,c):a["on"+b]=c}function g(a){a.preventDefault?a.preventDefault():a.returnValue=!1}function a(){var a=j.ownerDocument.defaultView.getSelection();a&&!(0>=a.rangeCount)&&s&&(a=a.getRangeAt(0),s.setPoint(a.startContainer,a.startOffset))}function c(){var a=j.ownerDocument.defaultView.getSelection(),b,c;a.removeAllRanges();s&&s.node()&&(b=s.node(),c=b.ownerDocument.createRange(),
-c.setStart(b,s.position()),c.collapse(!0),a.addRange(c))}function b(b){var d=b.charCode||b.keyCode;if(s=null,s&&37===d)a(),s.stepBackward(),c();else if(16<=d&&20>=d||33<=d&&40>=d)return;g(b)}function d(){}function k(a){j.ownerDocument.defaultView.getSelection().getRangeAt(0);g(a)}function e(a){for(var b=a.firstChild;b&&b!==a;)1===b.nodeType&&e(b),b=b.nextSibling||b.parentNode;var c,d,f,b=a.attributes;c="";for(f=b.length-1;0<=f;f-=1)d=b.item(f),c=c+" "+d.nodeName+'="'+d.nodeValue+'"';a.setAttribute("customns_name",
-a.nodeName);a.setAttribute("customns_atts",c);b=a.firstChild;for(d=/^\s*$/;b&&b!==a;)c=b,b=b.nextSibling||b.parentNode,3===c.nodeType&&d.test(c.nodeValue)&&c.parentNode.removeChild(c)}function i(a,b){for(var c=a.firstChild,d,e,f;c&&c!==a;){if(1===c.nodeType){i(c,b);d=c.attributes;for(f=d.length-1;0<=f;f-=1)e=d.item(f),"http://www.w3.org/2000/xmlns/"===e.namespaceURI&&!b[e.nodeValue]&&(b[e.nodeValue]=e.localName)}c=c.nextSibling||c.parentNode}}function h(){var a=j.ownerDocument.createElement("style"),
-b;b={};i(j,b);var c={},d,e,f=0;for(d in b)if(b.hasOwnProperty(d)&&d){e=b[d];if(!e||c.hasOwnProperty(e)||"xmlns"===e){do e="ns"+f,f+=1;while(c.hasOwnProperty(e));b[d]=e}c[e]=!0}a.type="text/css";b="@namespace customns url(customns);\n"+n;a.appendChild(j.ownerDocument.createTextNode(b));l=l.parentNode.replaceChild(a,l)}var n,o,u,s=null;j.id||(j.id="xml"+(""+Math.random()).substring(2));o="#"+j.id+" ";n=o+"*,"+o+":visited, "+o+":link {display:block; margin: 0px; margin-left: 10px; font-size: medium; color: black; background: white; font-variant: normal; font-weight: normal; font-style: normal; font-family: sans-serif; text-decoration: none; white-space: pre-wrap; height: auto; width: auto}\n"+
-o+":before {color: blue; content: '<' attr(customns_name) attr(customns_atts) '>';}\n"+o+":after {color: blue; content: '</' attr(customns_name) '>';}\n"+o+"{overflow: auto;}\n";(function(a){f(a,"click",k);f(a,"keydown",b);f(a,"keypress",d);f(a,"drop",g);f(a,"dragend",g);f(a,"beforepaste",g);f(a,"paste",g)})(j);this.updateCSS=h;this.setXML=function(a){a=a.documentElement||a;u=a=j.ownerDocument.importNode(a,true);for(e(a);j.lastChild;)j.removeChild(j.lastChild);j.appendChild(a);h();s=new core.PointWalker(a)};
-this.getXML=function(){return u}};
-// Input 30
-(function(){return"core/Async.js,core/Base64.js,core/ByteArray.js,core/ByteArrayWriter.js,core/Cursor.js,core/JSLint.js,core/PointWalker.js,core/RawDeflate.js,core/RawInflate.js,core/UnitTester.js,core/Zip.js,gui/Caret.js,gui/SelectionMover.js,gui/XMLEdit.js,gui/PresenterUI.js,odf/FontLoader.js,odf/Formatting.js,odf/OdfCanvas.js,odf/OdfContainer.js,odf/Style2CSS.js,odf/StyleInfo.js,xmldom/LSSerializer.js,xmldom/LSSerializerFilter.js,xmldom/OperationalTransformDOM.js,xmldom/OperationalTransformInterface.js,xmldom/RelaxNG.js,xmldom/RelaxNG2.js,xmldom/RelaxNGParser.js,xmldom/XPath.js".split(",")})();
diff --git a/apps/files_odfviewer/l10n/de.php b/apps/files_odfviewer/l10n/de.php
deleted file mode 100644
index 61059f05d5..0000000000
--- a/apps/files_odfviewer/l10n/de.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Close" => "Schliessen"
-);
diff --git a/apps/files_odfviewer/l10n/ignorelist b/apps/files_odfviewer/l10n/ignorelist
deleted file mode 100644
index 96ae631a0d..0000000000
--- a/apps/files_odfviewer/l10n/ignorelist
+++ /dev/null
@@ -1,8 +0,0 @@
-src/webodf/webodf/tests/core/Base64Tests.js
-src/webodf/webodf/tests/core/CursorTests.js
-src/webodf/webodf/tests/gui/CaretTests.js
-src/webodf/webodf/tests/gui/SelectionMoverTests.js
-src/webodf/webodf/tests/core/PointWalkerTests.js
-src/webodf/webodf/tests/core/ZipTests.js
-src/webodf/webodf/tests/xmldom/XPathTests.js
-src/webodf/webodf/tests/core/RuntimeTests.js
diff --git a/apps/files_odfviewer/src/.gitignore b/apps/files_odfviewer/src/.gitignore
deleted file mode 100644
index 378eac25d3..0000000000
--- a/apps/files_odfviewer/src/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-build
diff --git a/apps/files_odfviewer/src/update.sh b/apps/files_odfviewer/src/update.sh
deleted file mode 100755
index dad9bf35fb..0000000000
--- a/apps/files_odfviewer/src/update.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-cd webodf
-git pull
-cd ..
-rm -Rf build
-mkdir build
-cd build
-cmake ../webodf
-make webodf.js webodf-debug.js
-cp webodf/webodf*.js ../../js/
diff --git a/apps/files_odfviewer/src/webodf/.gitignore b/apps/files_odfviewer/src/webodf/.gitignore
deleted file mode 100644
index 5f9afa1071..0000000000
--- a/apps/files_odfviewer/src/webodf/.gitignore
+++ /dev/null
@@ -1,17 +0,0 @@
-#android/bin
-#android/gen
-nativeQtClient/nativeQtClient.pro.user
-programs/firefoxextension/content/webodf.js
-programs/firefoxextension/content/webodf.css
-programs/firefoxextension/install.rdf
-programs/ios/WebODF.xcodeproj/project.xcworkspace
-programs/ios/WebODF.xcodeproj/xcuserdata
-programs/ios/www/ZoomIn.png
-programs/ios/www/ZoomOut.png
-programs/ios/www/app/
-programs/ios/www/sencha-touch.css
-programs/ios/www/sencha-touch.js
-programs/ios/www/webodf.css
-programs/ios/www/webodf.js
-.DS_Store
-programs/ios/build/
diff --git a/apps/files_odfviewer/src/webodf/.gitmodules b/apps/files_odfviewer/src/webodf/.gitmodules
deleted file mode 100644
index 0d440b2a36..0000000000
--- a/apps/files_odfviewer/src/webodf/.gitmodules
+++ /dev/null
@@ -1,9 +0,0 @@
-[submodule "webodf/extjs"]
-	path = webodf/extjs
-	url = git://github.com/probonogeek/extjs.git
-[submodule "simplerevisionserver/pywebdav"]
-	path = simplerevisionserver/pywebdav
-	url = ssh://vandenoever@heap.kogmbh.net/srv/git/pywebdav
-[submodule "extjs"]
-	path = extjs
-	url = git://github.com/probonogeek/extjs.git
diff --git a/apps/files_odfviewer/src/webodf/CMakeLists.txt b/apps/files_odfviewer/src/webodf/CMakeLists.txt
deleted file mode 100644
index dfac345df1..0000000000
--- a/apps/files_odfviewer/src/webodf/CMakeLists.txt
+++ /dev/null
@@ -1,160 +0,0 @@
-# WebODF is mostly a JavaScript project. CMake needs to know about the C++ parts
-project (WebODF C CXX)
-# version 2.8.2 is needed to have support for zip files in external projects
-cmake_minimum_required(VERSION 2.8.2)
-
-# At this point, the version number that is used throughout is defined
-set(WEBODF_VERSION 0.3.0)
-
-# This makefile 'compiles' WebODF using various tools, instruments the code and
-# builds and packages programs that use WebODF.
-
-# Find installed dependencies
-find_package(Qt4 4.7.0 COMPONENTS QtCore QtGui QtXml QtNetwork QtWebKit)
-if (NOT QT4_FOUND)
-  message(WARNING "Qt4 with modules QtCore QtGui QtXml QtNetwork QtWebKit was not found. qtjsruntime will no be built.")
-endif (NOT QT4_FOUND)
-
-# java runtime is needed for Closure Compiler
-find_package(Java COMPONENTS Runtime)
-
-if (CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR)
-  message(FATAL_ERROR "Compiling in the source directortory is not supported. Use for example 'mkdir build; cd build; cmake ..'.")
-endif (CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR)
-
-# Tools must be obtained to work with:
-include (ExternalProject)
-
-if(Java_JAVA_EXECUTABLE)
-    # Closure Compiler
-    ExternalProject_Add(
-        ClosureCompiler
-        URL "http://closure-compiler.googlecode.com/files/compiler-20120305.tar.gz"
-        URL_MD5 513344df6f18bfa00b17f034cabf897d
-        CONFIGURE_COMMAND ""
-        BUILD_COMMAND ""
-        INSTALL_COMMAND ""
-    )
-    set(CLOSURE_JAR ${CMAKE_BINARY_DIR}/ClosureCompiler-prefix/src/ClosureCompiler/compiler.jar)
-endif(Java_JAVA_EXECUTABLE)
-
-# Rhino
-if(Java_JAVA_EXECUTABLE)
-    ExternalProject_Add(
-        Rhino
-        URL "http://ftp.mozilla.org/pub/js/rhino1_7R3.zip"
-        URL_MD5 99d94103662a8d0b571e247a77432ac5
-        CONFIGURE_COMMAND ""
-        BUILD_COMMAND ""
-        INSTALL_COMMAND ""
-    )
-    set(RHINO ${CMAKE_BINARY_DIR}/Rhino-prefix/src/Rhino/js.jar)
-endif(Java_JAVA_EXECUTABLE)
-
-# JSDoc
-ExternalProject_Add(
-    JsDoc
-    URL "http://jsdoc-toolkit.googlecode.com/files/jsdoc_toolkit-2.4.0.zip"
-    URL_MD5 a8f78f5ecd24b54501147b2af341a231
-    CONFIGURE_COMMAND ""
-    BUILD_COMMAND ""
-    INSTALL_COMMAND ""
-)
-set(JSDOCDIR ${CMAKE_BINARY_DIR}/JsDoc-prefix/src/JsDoc/jsdoc-toolkit)
-
-# Node.JS
-ExternalProject_Add(
-    NodeJS
-    URL "http://nodejs.org/dist/v0.6.15/node-v0.6.15.tar.gz"
-    URL_MD5 852cfb1ed8125a4cdba456446d869d19
-    CONFIGURE_COMMAND "./configure"
-    BUILD_IN_SOURCE 1
-    INSTALL_COMMAND ""
-)
-set(NODE ${CMAKE_BINARY_DIR}/NodeJS-prefix/src/NodeJS/out/Release/node)
-
-# JSCoverage
-ExternalProject_Add(
-    JSCoverage
-    URL "http://siliconforks.com/jscoverage/download/jscoverage-0.5.1.tar.bz2"
-    URL_MD5 a70d79a6759367fbcc0bcc18d6866ff3
-    PATCH_COMMAND patch -p0 < ${CMAKE_CURRENT_SOURCE_DIR}/JSCoverage.patch
-    CONFIGURE_COMMAND "./configure"
-    BUILD_IN_SOURCE 1
-    INSTALL_COMMAND ""
-)
-set(JSCOVERAGE ${CMAKE_BINARY_DIR}/JSCoverage-prefix/src/JSCoverage/jscoverage)
-
-# Android
-if (NOT ANDROID_SDK_DIR)
-  find_path(ANDROID_SDK_DIR platform-tools/aapt)
-endif(NOT ANDROID_SDK_DIR)
-if (NOT ANT)
-  find_file(ANT NAMES ant ant.exe /usr/bin /usr/local/bin)
-endif(NOT ANT)
-
-
-
-set(LIBJSFILES lib/packages.js lib/runtime.js lib/core/Base64.js
-    lib/core/RawDeflate.js lib/core/ByteArray.js
-    lib/core/ByteArrayWriter.js lib/core/RawInflate.js
-    lib/core/Cursor.js lib/core/UnitTester.js
-    lib/core/PointWalker.js lib/core/Async.js
-    lib/core/Zip.js
-
-    lib/xmldom/LSSerializerFilter.js lib/xmldom/LSSerializer.js
-    lib/xmldom/RelaxNGParser.js lib/xmldom/RelaxNG.js
-    lib/xmldom/RelaxNG2.js lib/xmldom/OperationalTransformInterface.js
-    lib/xmldom/OperationalTransformDOM.js
-    lib/xmldom/XPath.js
-
-    lib/odf/StyleInfo.js lib/odf/Style2CSS.js
-    lib/odf/FontLoader.js lib/odf/OdfContainer.js
-    lib/odf/Formatting.js lib/odf/OdfCanvas.js
-
-    lib/gui/PresenterUI.js lib/gui/Caret.js
-    lib/gui/SelectionMover.js lib/gui/XMLEdit.js
-
-    lib/manifest.js
-)
-
-set(HTML5UIFILES
-  app/app.js app/controller/Files.js app/model/FileSystem.js
-  app/views/FileDetail.js app/views/FilesList.js app/views/OdfView.js
-  app/views/Viewport.js sencha-touch.css sencha-touch.js
-  app/store/FileStore.js
-  ZoomOut.png ZoomIn.png go-previous.png go-next.png
-  zoom-fit-width.png zoom-fit-best.png zoom-fit-height.png
-)
-
-add_subdirectory(webodf)
-add_subdirectory(programs)
-
-# package webodf
-set(WEBODFZIP webodf-${WEBODF_VERSION}.zip)
-set(WEBODFZIP_FILES
-  ${CMAKE_BINARY_DIR}/webodf/webodf-debug.js
-  ${CMAKE_BINARY_DIR}/webodf/webodf.js
-  ${CMAKE_SOURCE_DIR}/webodf/webodf.css
-)
-add_custom_command(
-    OUTPUT ${WEBODFZIP}
-    # zip using javascript code running in node.js
-    COMMAND ${NODE} ARGS webodf/lib/runtime.js packwebodf.js
-        ${CMAKE_BINARY_DIR}/${WEBODFZIP}
-#input files
-        ${WEBODFZIP_FILES}
-#output files
-        webodf-debug.js
-        webodf.js
-        webodf.css
-    DEPENDS NodeJS
-        packwebodf.js
-        ${WEBODFZIP_FILES}
-        webodf-debug.js
-        webodf.js
-    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
-)
-add_custom_target(zip ALL DEPENDS ${WEBODFZIP})
-
-# vim:expandtab
diff --git a/apps/files_odfviewer/src/webodf/JSCoverage.patch b/apps/files_odfviewer/src/webodf/JSCoverage.patch
deleted file mode 100644
index b769f40b9d..0000000000
--- a/apps/files_odfviewer/src/webodf/JSCoverage.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- ./util.c_	2011-04-20 11:22:46.558521731 +0200
-+++ ./util.c	2011-04-20 11:23:23.999880771 +0200
-@@ -478,6 +478,10 @@
-         p->next = head;
-         head = p;
-       }
-+    else if (S_ISDIR(buf.st_mode)) {
-+      head = recursive_dir_list(root, entry_wrt_root, head);
-+      free(entry_wrt_root);
-+    }
-       else {
-         fatal("refusing to follow symbolic link: %s", entry);
-       }
diff --git a/apps/files_odfviewer/src/webodf/packwebodf.js b/apps/files_odfviewer/src/webodf/packwebodf.js
deleted file mode 100644
index 3a0d76c692..0000000000
--- a/apps/files_odfviewer/src/webodf/packwebodf.js
+++ /dev/null
@@ -1,93 +0,0 @@
-/**
- * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
- * @licstart
- * The JavaScript code in this page is free software: you can redistribute it
- * and/or modify it under the terms of the GNU Affero General Public License
- * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.  The code is distributed
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
- *
- * As additional permission under GNU AGPL version 3 section 7, you
- * may distribute non-source (e.g., minimized or compacted) forms of
- * that code without the copy of the GNU GPL normally required by
- * section 4, provided you include this license notice and a URL
- * through which recipients can access the Corresponding Source.
- *
- * As a special exception to the AGPL, any HTML file which merely makes function
- * calls to this code, and for that purpose includes it by reference shall be
- * deemed a separate work for copyright law purposes. In addition, the copyright
- * holders of this code give you permission to combine this code with free
- * software libraries that are released under the GNU LGPL. You may copy and
- * distribute such a system following the terms of the GNU AGPL for this code
- * and the LGPL for the libraries. If you modify this code, you may extend this
- * exception to your version of the code, but you are not obligated to do so.
- * If you do not wish to do so, delete this exception statement from your
- * version.
- *
- * This license applies to this entire compilation.
- * @licend
- * @source: http://www.webodf.org/
- * @source: http://gitorious.org/odfkit/webodf/
- */
-/*global runtime: true, core: true*/
-runtime.loadClass("core.Zip");
-runtime.loadClass("core.Base64");
-
-function addFiles(zip, pos, inputfiles, zipfiles, callback) {
-    "use strict";
-    if (inputfiles.length !== zipfiles.length) {
-        return callback(
-                "Arrays inputfiles and zipfiles should have the same length.");
-    }
-    if (pos >= inputfiles.length) {
-        zip.write(function (err) {
-            return callback(err);
-        });
-        return;
-    }
-    var inputfile = inputfiles[pos],
-        zipmemberpath = zipfiles[pos];
-    runtime.readFile(inputfile, "binary", function (err, data) {
-        var base64;
-        if (err) {
-            return callback(err);
-        }
-        zip.save(zipmemberpath, data, false, new Date());
-        addFiles(zip, pos + 1, inputfiles, zipfiles, callback);
-    });
-}
-
-function usage() {
-    "use strict";
-    runtime.log("Usage:");
-}
-
-/**
- * This script takes 1+2n arguments
- * First argument is the name of the target zip file.
- * The next n arguments are the input files. The last n arguments are the
- * names of the files in the zip file.
- */
-if (arguments.length % 2 !== 0) {
-    runtime.log("Wrong number of arguments.");
-    usage();
-    runtime.exit(1);
-}
-var args = arguments,
-    n = (args.length - 2) / 2,
-    zipfilename = args[1],
-    inputmembers = [],
-    zipmembers = [],
-    i,
-    zip = new core.Zip(zipfilename, null);
-for (i = 0; i < n; i += 1) {
-    inputmembers[i] = args[2 + i];
-    zipmembers[i] = args[2 + n + i];
-}
-addFiles(zip, 0, inputmembers, zipmembers, function (err) {
-    "use strict";
-    if (err) {
-        runtime.log(err);
-    }
-});
diff --git a/apps/files_odfviewer/src/webodf/programs/CMakeLists.txt b/apps/files_odfviewer/src/webodf/programs/CMakeLists.txt
deleted file mode 100644
index 4621a25d67..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/CMakeLists.txt
+++ /dev/null
@@ -1,30 +0,0 @@
-macro(COPY_FILES _varname _srcdir _tgtdir)
-  foreach(_file ${ARGN})
-    GET_FILENAME_COMPONENT(_subdir ${_file} PATH)
-    FILE(MAKE_DIRECTORY ${_tgtdir}/${_subdir})
-    add_custom_command(
-      OUTPUT ${_tgtdir}/${_file}
-      COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different
-        ${_srcdir}/${_file}
-        ${_tgtdir}/${_file}
-      DEPENDS
-        ${_srcdir}/${_file}
-    )
-    set(${_varname} ${${_varname}} ${_tgtdir}/${_file})
-  endforeach(_file)
-endmacro(COPY_FILES _directory _files)
-
-if(QT4_FOUND)
-  add_subdirectory(qtjsruntime)
-  add_subdirectory(nativeQtClient)
-  add_subdirectory(docnosis)
-endif(QT4_FOUND)
-
-if(ANDROID_SDK_DIR AND ANT)
-  add_subdirectory(android)
-endif(ANDROID_SDK_DIR AND ANT)
-
-add_subdirectory(firefoxextension)
-
-add_subdirectory(touchui)
-add_subdirectory(playbook)
diff --git a/apps/files_odfviewer/src/webodf/programs/android/AndroidManifest.xml b/apps/files_odfviewer/src/webodf/programs/android/AndroidManifest.xml
deleted file mode 100644
index 491bbb80a2..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/android/AndroidManifest.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-	package="org.webodf" android:versionCode="1" android:versionName="1.0">
-	<supports-screens android:largeScreens="true"
-		android:normalScreens="true" android:smallScreens="true"
-		android:resizeable="true" android:anyDensity="true" />
-	<uses-sdk android:minSdkVersion="4" android:targetSdkVersion="4" />
-	<application android:icon="@drawable/icon"
-		android:label="@string/app_name">
-		<activity android:label="@string/app_name" android:name=".WebODFActivity"
-			android:configChanges="orientation|keyboardHidden">
-			<intent-filter>
-				<action android:name="android.intent.action.MAIN" />
-				<category android:name="android.intent.category.LAUNCHER" />
-			</intent-filter>
-			<intent-filter>
-				<action android:name="android.intent.action.VIEW" />
-				<category android:name="android.intent.category.DEFAULT" />
-				<category android:name="android.intent.category.BROWSABLE" />
-				<data android:mimeType="application/vnd.oasis.opendocument.text" />
-			</intent-filter>
-			<intent-filter>
-				<action android:name="android.intent.action.VIEW" />
-				<category android:name="android.intent.category.DEFAULT" />
-				<category android:name="android.intent.category.BROWSABLE" />
-				<data android:mimeType="application/vnd.oasis.opendocument.presentation" />
-			</intent-filter>
-			<intent-filter>
-				<action android:name="android.intent.action.VIEW" />
-				<category android:name="android.intent.category.DEFAULT" />
-				<category android:name="android.intent.category.BROWSABLE" />
-				<data android:mimeType="application/vnd.oasis.opendocument.spreadsheet" />
-			</intent-filter>
-		</activity>
-		<activity android:name="com.phonegap.DroidGap" android:label="@string/app_name"
-			android:configChanges="orientation|keyboardHidden">
-			<intent-filter>
-			</intent-filter>
-		</activity>
-	</application>
-
-</manifest>
diff --git a/apps/files_odfviewer/src/webodf/programs/android/CMakeLists.txt b/apps/files_odfviewer/src/webodf/programs/android/CMakeLists.txt
deleted file mode 100644
index b16c5a2f69..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/android/CMakeLists.txt
+++ /dev/null
@@ -1,41 +0,0 @@
-set(ANDROID_JAR ${ANDROID_SDK_DIR}/platforms/android-8/android.jar)
-
-COPY_FILES(APKDEPS ${CMAKE_SOURCE_DIR}/programs/touchui
-    ${CMAKE_CURRENT_BINARY_DIR}/assets/www ${HTML5UIFILES})
-COPY_FILES(APKDEPS ${CMAKE_CURRENT_SOURCE_DIR}/assets/www
-    ${CMAKE_CURRENT_BINARY_DIR}/assets/www
-    index.html icon.png phonegap-1.4.1.js)
-COPY_FILES(APKDEPS ${CMAKE_CURRENT_SOURCE_DIR}/res
-    ${CMAKE_CURRENT_BINARY_DIR}/res
-    drawable-hdpi/ic_launcher.png drawable-ldpi/ic_launcher.png
-    drawable/icon.png drawable-mdpi/ic_launcher.png values/strings.xml
-    xml/phonegap.xml xml/plugins.xml layout/selector.xml
-    layout/main.xml layout/listitem.xml)
-COPY_FILES(APKDEPS ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}
-    src/org/webodf/WebODFActivity.java libs/phonegap-1.4.1.jar
-    AndroidManifest.xml)
-COPY_FILES(APKDEPS ${CMAKE_SOURCE_DIR}/webodf
-    ${CMAKE_CURRENT_BINARY_DIR}/assets/www webodf.css)
-COPY_FILES(APKDEPS ${CMAKE_BINARY_DIR}/webodf
-    ${CMAKE_CURRENT_BINARY_DIR}/assets/www webodf.js)
-
-set(WEBODFAPK ${CMAKE_CURRENT_BINARY_DIR}/bin/WebODF-debug.apk)
-add_custom_command(
-    OUTPUT ${WEBODFAPK}
-    COMMAND ${ANDROID_SDK_DIR}/tools/android
-        ARGS update project --path . --target android-7 --name WebODF
-    COMMAND ${ANT}
-        ARGS -lib ${CMAKE_CURRENT_SOURCE_DIR}/libs/phonegap-1.4.1.jar debug
-    DEPENDS ${APKDEPS}
-    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-)
-add_custom_target(apk ALL DEPENDS ${WEBODFAPK})
-set(WEBODFRELEASEAPK ${CMAKE_CURRENT_BINARY_DIR}/bin/WebODF-release.apk)
-add_custom_command(
-    OUTPUT ${WEBODFRELEASEAPK}
-    COMMAND ${ANT}
-        ARGS -lib ${CMAKE_CURRENT_SOURCE_DIR}/libs/phonegap-1.4.1.jar release
-    DEPENDS ${WEBODFAPK} webodf.js
-    WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
-)
-add_custom_target(releaseapk ALL DEPENDS ${WEBODFRELEASEAPK})
diff --git a/apps/files_odfviewer/src/webodf/programs/android/assets/www/config.xml b/apps/files_odfviewer/src/webodf/programs/android/assets/www/config.xml
deleted file mode 100644
index 21b5ca9ecc..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/android/assets/www/config.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<widget xmlns		= "http://www.w3.org/ns/widgets"
-	xmlns:gap	= "http://phonegap.com/ns/1.0"
-	id		= "org.webodf.phonegap.one"
-	version 	= "1.0.0">
-
-	<name>WebODF: online/offline office</name>
-	<description>
-		A viewer for ODF files.
-	</description>
-	<author href="http://webodf.org/"
-		email="jos.van.den.oever@kogmbh.com">
-		Jos van den Oever
-	</author>
-	<gap:platforms>
-		<gap:platform name="android" minVersion="2.1" />
-		<gap:platform name="webos" />
-		<gap:platform name="symbian.wrt" />
-		<gap:platform name="blackberry" project="widgets"/>
-	</gap:platforms>
-	<icon src="icon.png" gap:role="default" />
-    <feature name="http://api.phonegap.com/1.0/file"/>
-	<preference name="autorotate" value="false" readonly="true"/>
-	<preference name="orientation" value="default"/>
-</widget>
diff --git a/apps/files_odfviewer/src/webodf/programs/android/assets/www/icon.png b/apps/files_odfviewer/src/webodf/programs/android/assets/www/icon.png
deleted file mode 100644
index 2993aa9f146d3aa5775b1d80bae7109f8cc93fb6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3793
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
Hu0mjf{LD+l

diff --git a/apps/files_odfviewer/src/webodf/programs/android/assets/www/index.html b/apps/files_odfviewer/src/webodf/programs/android/assets/www/index.html
deleted file mode 100644
index d9a299d24d..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/android/assets/www/index.html
+++ /dev/null
@@ -1,46 +0,0 @@
-<!DOCTYPE html>
-<html>
- <head>
-  <title>WebODF</title>
-  <link href="sencha-touch.css" rel="stylesheet" type="text/css" />
-  <link href="webodf.css" rel="stylesheet" type="text/css" />
-  <script type="text/javascript" src="phonegap-1.4.1.js"></script>
-  <script type="text/javascript" src="sencha-touch.js"></script>
-  <script type="text/javascript" src="webodf.js"></script>
-  <script type="text/javascript" src="app/app.js"></script>
-  <script type="text/javascript" src="app/controller/Files.js"></script>
-  <script type="text/javascript" src="app/model/FileSystem.js"></script>
-  <script type="text/javascript" src="app/store/FileStore.js"></script>
-  <script type="text/javascript" src="app/views/FileDetail.js"></script>
-  <script type="text/javascript" src="app/views/FilesList.js"></script>
-  <script type="text/javascript" src="app/views/OdfView.js"></script>
-  <script type="text/javascript" src="app/views/Viewport.js"></script>
-  <script type="text/javascript">
-var applicationReady = false,
-    deviceReady = false,
-    startScanningDirectories;
-document.addEventListener("deviceready", function () {
-    deviceReady = true;
-    if (applicationReady) {
-        startScanningDirectories();
-    }
-}, false);
-/**
- * Override this function so it waits until the device is ready.
- */
-onApplicationLaunch = function (app) {
-    "use strict";
-    applicationReady = true;
-    startScanningDirectories = function () {
-        if (typeof invokeString !== "undefined" && invokeString) {
-            app.openUrl(invokeString);
-        }
-        app.startScanningDirectories();
-    };
-    if (deviceReady) {
-        startScanningDirectories();
-    }
-};
-  </script>
- </head><body></body>
-</html>
diff --git a/apps/files_odfviewer/src/webodf/programs/android/assets/www/phonegap-1.4.1.js b/apps/files_odfviewer/src/webodf/programs/android/assets/www/phonegap-1.4.1.js
deleted file mode 100644
index 908b8a8a21..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/android/assets/www/phonegap-1.4.1.js
+++ /dev/null
@@ -1,4586 +0,0 @@
-/*
- *     Licensed to the Apache Software Foundation (ASF) under one
- *     or more contributor license agreements.  See the NOTICE file
- *     distributed with this work for additional information
- *     regarding copyright ownership.  The ASF licenses this file
- *     to you 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.
- */
-
-// Version 1.2.0
-
-if (typeof PhoneGap === "undefined") {
-
-/**
- * The order of events during page load and PhoneGap startup is as follows:
- *
- * onDOMContentLoaded         Internal event that is received when the web page is loaded and parsed.
- * window.onload              Body onload event.
- * onNativeReady              Internal event that indicates the PhoneGap native side is ready.
- * onPhoneGapInit             Internal event that kicks off creation of all PhoneGap JavaScript objects (runs constructors).
- * onPhoneGapReady            Internal event fired when all PhoneGap JavaScript objects have been created
- * onPhoneGapInfoReady        Internal event fired when device properties are available
- * onDeviceReady              User event fired to indicate that PhoneGap is ready
- * onResume                   User event fired to indicate a start/resume lifecycle event
- * onPause                    User event fired to indicate a pause lifecycle event
- * onDestroy                  Internal event fired when app is being destroyed (User should use window.onunload event, not this one).
- *
- * The only PhoneGap events that user code should register for are:
- *      deviceready           PhoneGap native code is initialized and PhoneGap APIs can be called from JavaScript
- *      pause                 App has moved to background
- *      resume                App has returned to foreground
- *
- * Listeners can be registered as:
- *      document.addEventListener("deviceready", myDeviceReadyListener, false);
- *      document.addEventListener("resume", myResumeListener, false);
- *      document.addEventListener("pause", myPauseListener, false);
- *
- * The DOM lifecycle events should be used for saving and restoring state
- *      window.onload
- *      window.onunload
- */
-
-/**
- * This represents the PhoneGap API itself, and provides a global namespace for accessing
- * information about the state of PhoneGap.
- * @class
- */
-var PhoneGap = {
-    documentEventHandler: {},   // Collection of custom document event handlers
-    windowEventHandler: {}      // Collection of custom window event handlers
-};
-
-/**
- * List of resource files loaded by PhoneGap.
- * This is used to ensure JS and other files are loaded only once.
- */
-PhoneGap.resources = {base: true};
-
-/**
- * Determine if resource has been loaded by PhoneGap
- *
- * @param name
- * @return
- */
-PhoneGap.hasResource = function(name) {
-    return PhoneGap.resources[name];
-};
-
-/**
- * Add a resource to list of loaded resources by PhoneGap
- *
- * @param name
- */
-PhoneGap.addResource = function(name) {
-    PhoneGap.resources[name] = true;
-};
-
-/**
- * Custom pub-sub channel that can have functions subscribed to it
- * @constructor
- */
-PhoneGap.Channel = function (type)
-{
-    this.type = type;
-    this.handlers = {};
-    this.guid = 0;
-    this.fired = false;
-    this.enabled = true;
-};
-
-/**
- * Subscribes the given function to the channel. Any time that
- * Channel.fire is called so too will the function.
- * Optionally specify an execution context for the function
- * and a guid that can be used to stop subscribing to the channel.
- * Returns the guid.
- */
-PhoneGap.Channel.prototype.subscribe = function(f, c, g) {
-    // need a function to call
-    if (f === null) { return; }
-
-    var func = f;
-    if (typeof c === "object" && typeof f === "function") { func = PhoneGap.close(c, f); }
-
-    g = g || func.observer_guid || f.observer_guid || this.guid++;
-    func.observer_guid = g;
-    f.observer_guid = g;
-    this.handlers[g] = func;
-    return g;
-};
-
-/**
- * Like subscribe but the function is only called once and then it
- * auto-unsubscribes itself.
- */
-PhoneGap.Channel.prototype.subscribeOnce = function(f, c) {
-    var g = null;
-    var _this = this;
-    var m = function() {
-        f.apply(c || null, arguments);
-        _this.unsubscribe(g);
-    };
-    if (this.fired) {
-        if (typeof c === "object" && typeof f === "function") { f = PhoneGap.close(c, f); }
-        f.apply(this, this.fireArgs);
-    } else {
-        g = this.subscribe(m);
-    }
-    return g;
-};
-
-/**
- * Unsubscribes the function with the given guid from the channel.
- */
-PhoneGap.Channel.prototype.unsubscribe = function(g) {
-    if (typeof g === "function") { g = g.observer_guid; }
-    this.handlers[g] = null;
-    delete this.handlers[g];
-};
-
-/**
- * Calls all functions subscribed to this channel.
- */
-PhoneGap.Channel.prototype.fire = function(e) {
-    if (this.enabled) {
-        var fail = false;
-        var item, handler, rv;
-        for (item in this.handlers) {
-            if (this.handlers.hasOwnProperty(item)) {
-                handler = this.handlers[item];
-                if (typeof handler === "function") {
-                    rv = (handler.apply(this, arguments) === false);
-                    fail = fail || rv;
-                }
-            }
-        }
-        this.fired = true;
-        this.fireArgs = arguments;
-        return !fail;
-    }
-    return true;
-};
-
-/**
- * Calls the provided function only after all of the channels specified
- * have been fired.
- */
-PhoneGap.Channel.join = function(h, c) {
-    var i = c.length;
-    var f = function() {
-        if (!(--i)) {
-            h();
-        }
-    };
-    var len = i;
-    var j;
-    for (j=0; j<len; j++) {
-        if (!c[j].fired) {
-            c[j].subscribeOnce(f);
-        }
-        else {
-            i--;
-        }
-    }
-    if (!i) {
-        h();
-    }
-};
-
-/**
- * Add an initialization function to a queue that ensures it will run and initialize
- * application constructors only once PhoneGap has been initialized.
- * @param {Function} func The function callback you want run once PhoneGap is initialized
- */
-PhoneGap.addConstructor = function(func) {
-    PhoneGap.onPhoneGapInit.subscribeOnce(function() {
-        try {
-            func();
-        } catch(e) {
-            console.log("Failed to run constructor: " + e);
-        }
-    });
-};
-
-/**
- * Plugins object
- */
-if (!window.plugins) {
-    window.plugins = {};
-}
-
-/**
- * Adds a plugin object to window.plugins.
- * The plugin is accessed using window.plugins.<name>
- *
- * @param name          The plugin name
- * @param obj           The plugin object
- */
-PhoneGap.addPlugin = function(name, obj) {
-    if (!window.plugins[name]) {
-        window.plugins[name] = obj;
-    }
-    else {
-        console.log("Error: Plugin "+name+" already exists.");
-    }
-};
-
-/**
- * onDOMContentLoaded channel is fired when the DOM content
- * of the page has been parsed.
- */
-PhoneGap.onDOMContentLoaded = new PhoneGap.Channel('onDOMContentLoaded');
-
-/**
- * onNativeReady channel is fired when the PhoneGap native code
- * has been initialized.
- */
-PhoneGap.onNativeReady = new PhoneGap.Channel('onNativeReady');
-
-/**
- * onPhoneGapInit channel is fired when the web page is fully loaded and
- * PhoneGap native code has been initialized.
- */
-PhoneGap.onPhoneGapInit = new PhoneGap.Channel('onPhoneGapInit');
-
-/**
- * onPhoneGapReady channel is fired when the JS PhoneGap objects have been created.
- */
-PhoneGap.onPhoneGapReady = new PhoneGap.Channel('onPhoneGapReady');
-
-/**
- * onPhoneGapInfoReady channel is fired when the PhoneGap device properties
- * has been set.
- */
-PhoneGap.onPhoneGapInfoReady = new PhoneGap.Channel('onPhoneGapInfoReady');
-
-/**
- * onPhoneGapConnectionReady channel is fired when the PhoneGap connection properties
- * has been set.
- */
-PhoneGap.onPhoneGapConnectionReady = new PhoneGap.Channel('onPhoneGapConnectionReady');
-
-/**
- * onDestroy channel is fired when the PhoneGap native code
- * is destroyed.  It is used internally.
- * Window.onunload should be used by the user.
- */
-PhoneGap.onDestroy = new PhoneGap.Channel('onDestroy');
-PhoneGap.onDestroy.subscribeOnce(function() {
-    PhoneGap.shuttingDown = true;
-});
-PhoneGap.shuttingDown = false;
-
-// _nativeReady is global variable that the native side can set
-// to signify that the native code is ready. It is a global since
-// it may be called before any PhoneGap JS is ready.
-if (typeof _nativeReady !== 'undefined') { PhoneGap.onNativeReady.fire(); }
-
-/**
- * onDeviceReady is fired only after all PhoneGap objects are created and
- * the device properties are set.
- */
-PhoneGap.onDeviceReady = new PhoneGap.Channel('onDeviceReady');
-
-
-// Array of channels that must fire before "deviceready" is fired
-PhoneGap.deviceReadyChannelsArray = [ PhoneGap.onPhoneGapReady, PhoneGap.onPhoneGapInfoReady, PhoneGap.onPhoneGapConnectionReady];
-
-// Hashtable of user defined channels that must also fire before "deviceready" is fired
-PhoneGap.deviceReadyChannelsMap = {};
-
-/**
- * Indicate that a feature needs to be initialized before it is ready to be used.
- * This holds up PhoneGap's "deviceready" event until the feature has been initialized
- * and PhoneGap.initComplete(feature) is called.
- *
- * @param feature {String}     The unique feature name
- */
-PhoneGap.waitForInitialization = function(feature) {
-    if (feature) {
-        var channel = new PhoneGap.Channel(feature);
-        PhoneGap.deviceReadyChannelsMap[feature] = channel;
-        PhoneGap.deviceReadyChannelsArray.push(channel);
-    }
-};
-
-/**
- * Indicate that initialization code has completed and the feature is ready to be used.
- *
- * @param feature {String}     The unique feature name
- */
-PhoneGap.initializationComplete = function(feature) {
-    var channel = PhoneGap.deviceReadyChannelsMap[feature];
-    if (channel) {
-        channel.fire();
-    }
-};
-
-/**
- * Create all PhoneGap objects once page has fully loaded and native side is ready.
- */
-PhoneGap.Channel.join(function() {
-
-    // Start listening for XHR callbacks
-    setTimeout(function() {
-            if (PhoneGap.UsePolling) {
-                PhoneGap.JSCallbackPolling();
-            }
-            else {
-                var polling = prompt("usePolling", "gap_callbackServer:");
-                PhoneGap.UsePolling = polling;
-                if (polling == "true") {
-                    PhoneGap.UsePolling = true;
-                    PhoneGap.JSCallbackPolling();
-                }
-                else {
-                    PhoneGap.UsePolling = false;
-                    PhoneGap.JSCallback();
-                }
-            }
-        }, 1);
-
-    // Run PhoneGap constructors
-    PhoneGap.onPhoneGapInit.fire();
-
-    // Fire event to notify that all objects are created
-    PhoneGap.onPhoneGapReady.fire();
-
-    // Fire onDeviceReady event once all constructors have run and PhoneGap info has been
-    // received from native side, and any user defined initialization channels.
-    PhoneGap.Channel.join(function() {
-        // Let native code know we are inited on JS side
-        prompt("", "gap_init:");
-
-        PhoneGap.onDeviceReady.fire();
-    }, PhoneGap.deviceReadyChannelsArray);
-
-}, [ PhoneGap.onDOMContentLoaded, PhoneGap.onNativeReady ]);
-
-// Listen for DOMContentLoaded and notify our channel subscribers
-document.addEventListener('DOMContentLoaded', function() {
-    PhoneGap.onDOMContentLoaded.fire();
-}, false);
-
-// Intercept calls to document.addEventListener and watch for deviceready
-PhoneGap.m_document_addEventListener = document.addEventListener;
-
-// Intercept calls to window.addEventListener
-PhoneGap.m_window_addEventListener = window.addEventListener;
-
-/**
- * Add a custom window event handler.
- *
- * @param {String} event            The event name that callback handles
- * @param {Function} callback       The event handler
- */
-PhoneGap.addWindowEventHandler = function(event, callback) {
-    PhoneGap.windowEventHandler[event] = callback;
-};
-
-/**
- * Add a custom document event handler.
- *
- * @param {String} event            The event name that callback handles
- * @param {Function} callback       The event handler
- */
-PhoneGap.addDocumentEventHandler = function(event, callback) {
-    PhoneGap.documentEventHandler[event] = callback;
-};
-
-/**
- * Intercept adding document event listeners and handle our own
- *
- * @param {Object} evt
- * @param {Function} handler
- * @param capture
- */
-document.addEventListener = function(evt, handler, capture) {
-    var e = evt.toLowerCase();
-    if (e === 'deviceready') {
-        PhoneGap.onDeviceReady.subscribeOnce(handler);
-    }
-    else {
-        // If subscribing to Android backbutton
-        if (e === 'backbutton') {
-            PhoneGap.exec(null, null, "App", "overrideBackbutton", [true]);
-        }
-        
-        // If subscribing to an event that is handled by a plugin
-        else if (typeof PhoneGap.documentEventHandler[e] !== "undefined") {
-            if (PhoneGap.documentEventHandler[e](e, handler, true)) {
-                return; // Stop default behavior
-            }
-        }
-        
-        PhoneGap.m_document_addEventListener.call(document, evt, handler, capture);
-    }
-};
-
-/**
- * Intercept adding window event listeners and handle our own
- *
- * @param {Object} evt
- * @param {Function} handler
- * @param capture
- */
-window.addEventListener = function(evt, handler, capture) {
-    var e = evt.toLowerCase();
-        
-    // If subscribing to an event that is handled by a plugin
-    if (typeof PhoneGap.windowEventHandler[e] !== "undefined") {
-        if (PhoneGap.windowEventHandler[e](e, handler, true)) {
-            return; // Stop default behavior
-        }
-    }
-        
-    PhoneGap.m_window_addEventListener.call(window, evt, handler, capture);
-};
-
-// Intercept calls to document.removeEventListener and watch for events that
-// are generated by PhoneGap native code
-PhoneGap.m_document_removeEventListener = document.removeEventListener;
-
-// Intercept calls to window.removeEventListener
-PhoneGap.m_window_removeEventListener = window.removeEventListener;
-
-/**
- * Intercept removing document event listeners and handle our own
- *
- * @param {Object} evt
- * @param {Function} handler
- * @param capture
- */
-document.removeEventListener = function(evt, handler, capture) {
-    var e = evt.toLowerCase();
-
-    // If unsubscribing to Android backbutton
-    if (e === 'backbutton') {
-        PhoneGap.exec(null, null, "App", "overrideBackbutton", [false]);
-    }
-
-    // If unsubcribing from an event that is handled by a plugin
-    if (typeof PhoneGap.documentEventHandler[e] !== "undefined") {
-        if (PhoneGap.documentEventHandler[e](e, handler, false)) {
-            return; // Stop default behavior
-        }
-    }
-
-    PhoneGap.m_document_removeEventListener.call(document, evt, handler, capture);
-};
-
-/**
- * Intercept removing window event listeners and handle our own
- *
- * @param {Object} evt
- * @param {Function} handler
- * @param capture
- */
-window.removeEventListener = function(evt, handler, capture) {
-    var e = evt.toLowerCase();
-
-    // If unsubcribing from an event that is handled by a plugin
-    if (typeof PhoneGap.windowEventHandler[e] !== "undefined") {
-        if (PhoneGap.windowEventHandler[e](e, handler, false)) {
-            return; // Stop default behavior
-        }
-    }
-
-    PhoneGap.m_window_removeEventListener.call(window, evt, handler, capture);
-};
-
-/**
- * Method to fire document event
- *
- * @param {String} type             The event type to fire
- * @param {Object} data             Data to send with event
- */
-PhoneGap.fireDocumentEvent = function(type, data) {
-    var e = document.createEvent('Events');
-    e.initEvent(type);
-    if (data) {
-        for (var i in data) {
-            e[i] = data[i];
-        }
-    }
-    document.dispatchEvent(e);
-};
-
-/**
- * Method to fire window event
- *
- * @param {String} type             The event type to fire
- * @param {Object} data             Data to send with event
- */
-PhoneGap.fireWindowEvent = function(type, data) {
-    var e = document.createEvent('Events');
-    e.initEvent(type);
-    if (data) {
-        for (var i in data) {
-            e[i] = data[i];
-        }
-    }
-    window.dispatchEvent(e);
-};
-
-/**
- * Does a deep clone of the object.
- *
- * @param obj
- * @return {Object}
- */
-PhoneGap.clone = function(obj) {
-    var i, retVal;
-    if(!obj) { 
-        return obj;
-    }
-    
-    if(obj instanceof Array){
-        retVal = [];
-        for(i = 0; i < obj.length; ++i){
-            retVal.push(PhoneGap.clone(obj[i]));
-        }
-        return retVal;
-    }
-    
-    if (typeof obj === "function") {
-        return obj;
-    }
-    
-    if(!(obj instanceof Object)){
-        return obj;
-    }
-    
-    if (obj instanceof Date) {
-        return obj;
-    }
-    
-    retVal = {};
-    for(i in obj){
-        if(!(i in retVal) || retVal[i] !== obj[i]) {
-            retVal[i] = PhoneGap.clone(obj[i]);
-        }
-    }
-    return retVal;
-};
-
-PhoneGap.callbackId = 0;
-PhoneGap.callbacks = {};
-PhoneGap.callbackStatus = {
-    NO_RESULT: 0,
-    OK: 1,
-    CLASS_NOT_FOUND_EXCEPTION: 2,
-    ILLEGAL_ACCESS_EXCEPTION: 3,
-    INSTANTIATION_EXCEPTION: 4,
-    MALFORMED_URL_EXCEPTION: 5,
-    IO_EXCEPTION: 6,
-    INVALID_ACTION: 7,
-    JSON_EXCEPTION: 8,
-    ERROR: 9
-    };
-
-
-/**
- * Execute a PhoneGap command.  It is up to the native side whether this action is synch or async.
- * The native side can return:
- *      Synchronous: PluginResult object as a JSON string
- *      Asynchrounous: Empty string ""
- * If async, the native side will PhoneGap.callbackSuccess or PhoneGap.callbackError,
- * depending upon the result of the action.
- *
- * @param {Function} success    The success callback
- * @param {Function} fail       The fail callback
- * @param {String} service      The name of the service to use
- * @param {String} action       Action to be run in PhoneGap
- * @param {Array.<String>} [args]     Zero or more arguments to pass to the method
- */
-PhoneGap.exec = function(success, fail, service, action, args) {
-    try {
-        var callbackId = service + PhoneGap.callbackId++;
-        if (success || fail) {
-            PhoneGap.callbacks[callbackId] = {success:success, fail:fail};
-        }
-
-        var r = prompt(JSON.stringify(args), "gap:"+JSON.stringify([service, action, callbackId, true]));
-
-        // If a result was returned
-        if (r.length > 0) {
-            eval("var v="+r+";");
-
-            // If status is OK, then return value back to caller
-            if (v.status === PhoneGap.callbackStatus.OK) {
-
-                // If there is a success callback, then call it now with
-                // returned value
-                if (success) {
-                    try {
-                        success(v.message);
-                    } catch (e) {
-                        console.log("Error in success callback: " + callbackId  + " = " + e);
-                    }
-
-                    // Clear callback if not expecting any more results
-                    if (!v.keepCallback) {
-                        delete PhoneGap.callbacks[callbackId];
-                    }
-                }
-                return v.message;
-            }
-
-            // If no result
-            else if (v.status === PhoneGap.callbackStatus.NO_RESULT) {
-
-                // Clear callback if not expecting any more results
-                if (!v.keepCallback) {
-                    delete PhoneGap.callbacks[callbackId];
-                }
-            }
-
-            // If error, then display error
-            else {
-                console.log("Error: Status="+v.status+" Message="+v.message);
-
-                // If there is a fail callback, then call it now with returned value
-                if (fail) {
-                    try {
-                        fail(v.message);
-                    }
-                    catch (e1) {
-                        console.log("Error in error callback: "+callbackId+" = "+e1);
-                    }
-
-                    // Clear callback if not expecting any more results
-                    if (!v.keepCallback) {
-                        delete PhoneGap.callbacks[callbackId];
-                    }
-                }
-                return null;
-            }
-        }
-    } catch (e2) {
-        console.log("Error: "+e2);
-    }
-};
-
-/**
- * Called by native code when returning successful result from an action.
- *
- * @param callbackId
- * @param args
- */
-PhoneGap.callbackSuccess = function(callbackId, args) {
-    if (PhoneGap.callbacks[callbackId]) {
-
-        // If result is to be sent to callback
-        if (args.status === PhoneGap.callbackStatus.OK) {
-            try {
-                if (PhoneGap.callbacks[callbackId].success) {
-                    PhoneGap.callbacks[callbackId].success(args.message);
-                }
-            }
-            catch (e) {
-                console.log("Error in success callback: "+callbackId+" = "+e);
-            }
-        }
-
-        // Clear callback if not expecting any more results
-        if (!args.keepCallback) {
-            delete PhoneGap.callbacks[callbackId];
-        }
-    }
-};
-
-/**
- * Called by native code when returning error result from an action.
- *
- * @param callbackId
- * @param args
- */
-PhoneGap.callbackError = function(callbackId, args) {
-    if (PhoneGap.callbacks[callbackId]) {
-        try {
-            if (PhoneGap.callbacks[callbackId].fail) {
-                PhoneGap.callbacks[callbackId].fail(args.message);
-            }
-        }
-        catch (e) {
-            console.log("Error in error callback: "+callbackId+" = "+e);
-        }
-
-        // Clear callback if not expecting any more results
-        if (!args.keepCallback) {
-            delete PhoneGap.callbacks[callbackId];
-        }
-    }
-};
-
-PhoneGap.JSCallbackPort = null;
-PhoneGap.JSCallbackToken = null;
-
-/**
- * This is only for Android.
- *
- * Internal function that uses XHR to call into PhoneGap Java code and retrieve
- * any JavaScript code that needs to be run.  This is used for callbacks from
- * Java to JavaScript.
- */
-PhoneGap.JSCallback = function() {
-
-    // Exit if shutting down app
-    if (PhoneGap.shuttingDown) {
-        return;
-    }
-
-    // If polling flag was changed, start using polling from now on
-    if (PhoneGap.UsePolling) {
-        PhoneGap.JSCallbackPolling();
-        return;
-    }
-
-    var xmlhttp = new XMLHttpRequest();
-
-    // Callback function when XMLHttpRequest is ready
-    xmlhttp.onreadystatechange=function(){
-        if(xmlhttp.readyState === 4){
-
-            // Exit if shutting down app
-            if (PhoneGap.shuttingDown) {
-                return;
-            }
-
-            // If callback has JavaScript statement to execute
-            if (xmlhttp.status === 200) {
-
-                // Need to url decode the response
-                var msg = decodeURIComponent(xmlhttp.responseText);
-                setTimeout(function() {
-                    try {
-                        var t = eval(msg);
-                    }
-                    catch (e) {
-                        // If we're getting an error here, seeing the message will help in debugging
-                        console.log("JSCallback: Message from Server: " + msg);
-                        console.log("JSCallback Error: "+e);
-                    }
-                }, 1);
-                setTimeout(PhoneGap.JSCallback, 1);
-            }
-
-            // If callback ping (used to keep XHR request from timing out)
-            else if (xmlhttp.status === 404) {
-                setTimeout(PhoneGap.JSCallback, 10);
-            }
-
-            // If security error
-            else if (xmlhttp.status === 403) {
-                console.log("JSCallback Error: Invalid token.  Stopping callbacks.");
-            }
-
-            // If server is stopping
-            else if (xmlhttp.status === 503) {
-                console.log("JSCallback Server Closed: Stopping callbacks.");
-            }
-
-            // If request wasn't GET
-            else if (xmlhttp.status === 400) {
-                console.log("JSCallback Error: Bad request.  Stopping callbacks.");
-            }
-
-            // If error, revert to polling
-            else {
-                console.log("JSCallback Error: Request failed.");
-                PhoneGap.UsePolling = true;
-                PhoneGap.JSCallbackPolling();
-            }
-        }
-    };
-
-    if (PhoneGap.JSCallbackPort === null) {
-        PhoneGap.JSCallbackPort = prompt("getPort", "gap_callbackServer:");
-    }
-    if (PhoneGap.JSCallbackToken === null) {
-        PhoneGap.JSCallbackToken = prompt("getToken", "gap_callbackServer:");
-    }
-    xmlhttp.open("GET", "http://127.0.0.1:"+PhoneGap.JSCallbackPort+"/"+PhoneGap.JSCallbackToken , true);
-    xmlhttp.send();
-};
-
-/**
- * The polling period to use with JSCallbackPolling.
- * This can be changed by the application.  The default is 50ms.
- */
-PhoneGap.JSCallbackPollingPeriod = 50;
-
-/**
- * Flag that can be set by the user to force polling to be used or force XHR to be used.
- */
-PhoneGap.UsePolling = false;    // T=use polling, F=use XHR
-
-/**
- * This is only for Android.
- *
- * Internal function that uses polling to call into PhoneGap Java code and retrieve
- * any JavaScript code that needs to be run.  This is used for callbacks from
- * Java to JavaScript.
- */
-PhoneGap.JSCallbackPolling = function() {
-
-    // Exit if shutting down app
-    if (PhoneGap.shuttingDown) {
-        return;
-    }
-
-    // If polling flag was changed, stop using polling from now on
-    if (!PhoneGap.UsePolling) {
-        PhoneGap.JSCallback();
-        return;
-    }
-
-    var msg = prompt("", "gap_poll:");
-    if (msg) {
-        setTimeout(function() {
-            try {
-                var t = eval(""+msg);
-            }
-            catch (e) {
-                console.log("JSCallbackPolling: Message from Server: " + msg);
-                console.log("JSCallbackPolling Error: "+e);
-            }
-        }, 1);
-        setTimeout(PhoneGap.JSCallbackPolling, 1);
-    }
-    else {
-        setTimeout(PhoneGap.JSCallbackPolling, PhoneGap.JSCallbackPollingPeriod);
-    }
-};
-
-/**
- * Create a UUID
- *
- * @return {String}
- */
-PhoneGap.createUUID = function() {
-    return PhoneGap.UUIDcreatePart(4) + '-' +
-        PhoneGap.UUIDcreatePart(2) + '-' +
-        PhoneGap.UUIDcreatePart(2) + '-' +
-        PhoneGap.UUIDcreatePart(2) + '-' +
-        PhoneGap.UUIDcreatePart(6);
-};
-
-PhoneGap.UUIDcreatePart = function(length) {
-    var uuidpart = "";
-    var i, uuidchar;
-    for (i=0; i<length; i++) {
-        uuidchar = parseInt((Math.random() * 256),0).toString(16);
-        if (uuidchar.length === 1) {
-            uuidchar = "0" + uuidchar;
-        }
-        uuidpart += uuidchar;
-    }
-    return uuidpart;
-};
-
-PhoneGap.close = function(context, func, params) {
-    if (typeof params === 'undefined') {
-        return function() {
-            return func.apply(context, arguments);
-        };
-    } else {
-        return function() {
-            return func.apply(context, params);
-        };
-    }
-};
-
-/**
- * Load a JavaScript file after page has loaded.
- *
- * @param {String} jsfile               The url of the JavaScript file to load.
- * @param {Function} successCallback    The callback to call when the file has been loaded.
- */
-PhoneGap.includeJavascript = function(jsfile, successCallback) {
-    var id = document.getElementsByTagName("head")[0];
-    var el = document.createElement('script');
-    el.type = 'text/javascript';
-    if (typeof successCallback === 'function') {
-        el.onload = successCallback;
-    }
-    el.src = jsfile;
-    id.appendChild(el);
-};
-
-}
-/*
- *     Licensed to the Apache Software Foundation (ASF) under one
- *     or more contributor license agreements.  See the NOTICE file
- *     distributed with this work for additional information
- *     regarding copyright ownership.  The ASF licenses this file
- *     to you 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.
- */
-
-if (!PhoneGap.hasResource("device")) {
-PhoneGap.addResource("device");
-
-/**
- * This represents the mobile device, and provides properties for inspecting the model, version, UUID of the
- * phone, etc.
- * @constructor
- */
-var Device = function() {
-    this.available = PhoneGap.available;
-    this.platform = null;
-    this.version = null;
-    this.name = null;
-    this.uuid = null;
-    this.phonegap = null;
-
-    var me = this;
-    this.getInfo(
-        function(info) {
-            me.available = true;
-            me.platform = info.platform;
-            me.version = info.version;
-            me.name = info.name;
-            me.uuid = info.uuid;
-            me.phonegap = info.phonegap;
-            PhoneGap.onPhoneGapInfoReady.fire();
-        },
-        function(e) {
-            me.available = false;
-            console.log("Error initializing PhoneGap: " + e);
-            alert("Error initializing PhoneGap: "+e);
-        });
-};
-
-/**
- * Get device info
- *
- * @param {Function} successCallback The function to call when the heading data is available
- * @param {Function} errorCallback The function to call when there is an error getting the heading data. (OPTIONAL)
- */
-Device.prototype.getInfo = function(successCallback, errorCallback) {
-
-    // successCallback required
-    if (typeof successCallback !== "function") {
-        console.log("Device Error: successCallback is not a function");
-        return;
-    }
-
-    // errorCallback optional
-    if (errorCallback && (typeof errorCallback !== "function")) {
-        console.log("Device Error: errorCallback is not a function");
-        return;
-    }
-
-    // Get info
-    PhoneGap.exec(successCallback, errorCallback, "Device", "getDeviceInfo", []);
-};
-
-PhoneGap.addConstructor(function() {
-    if (typeof navigator.device === "undefined") {
-        navigator.device = window.device = new Device();
-    }
-});
-}
-/*
- *     Licensed to the Apache Software Foundation (ASF) under one
- *     or more contributor license agreements.  See the NOTICE file
- *     distributed with this work for additional information
- *     regarding copyright ownership.  The ASF licenses this file
- *     to you 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.
- */
-
-if (!PhoneGap.hasResource("accelerometer")) {
-PhoneGap.addResource("accelerometer");
-
-/** @constructor */
-var Acceleration = function(x, y, z) {
-  this.x = x;
-  this.y = y;
-  this.z = z;
-  this.timestamp = new Date().getTime();
-};
-
-/**
- * This class provides access to device accelerometer data.
- * @constructor
- */
-var Accelerometer = function() {
-
-    /**
-     * The last known acceleration.  type=Acceleration()
-     */
-    this.lastAcceleration = null;
-
-    /**
-     * List of accelerometer watch timers
-     */
-    this.timers = {};
-};
-
-Accelerometer.ERROR_MSG = ["Not running", "Starting", "", "Failed to start"];
-
-/**
- * Asynchronously aquires the current acceleration.
- *
- * @param {Function} successCallback    The function to call when the acceleration data is available
- * @param {Function} errorCallback      The function to call when there is an error getting the acceleration data. (OPTIONAL)
- * @param {AccelerationOptions} options The options for getting the accelerometer data such as timeout. (OPTIONAL)
- */
-Accelerometer.prototype.getCurrentAcceleration = function(successCallback, errorCallback, options) {
-
-    // successCallback required
-    if (typeof successCallback !== "function") {
-        console.log("Accelerometer Error: successCallback is not a function");
-        return;
-    }
-
-    // errorCallback optional
-    if (errorCallback && (typeof errorCallback !== "function")) {
-        console.log("Accelerometer Error: errorCallback is not a function");
-        return;
-    }
-
-    // Get acceleration
-    PhoneGap.exec(successCallback, errorCallback, "Accelerometer", "getAcceleration", []);
-};
-
-/**
- * Asynchronously aquires the acceleration repeatedly at a given interval.
- *
- * @param {Function} successCallback    The function to call each time the acceleration data is available
- * @param {Function} errorCallback      The function to call when there is an error getting the acceleration data. (OPTIONAL)
- * @param {AccelerationOptions} options The options for getting the accelerometer data such as timeout. (OPTIONAL)
- * @return String                       The watch id that must be passed to #clearWatch to stop watching.
- */
-Accelerometer.prototype.watchAcceleration = function(successCallback, errorCallback, options) {
-
-    // Default interval (10 sec)
-    var frequency = (options !== undefined)? options.frequency : 10000;
-
-    // successCallback required
-    if (typeof successCallback !== "function") {
-        console.log("Accelerometer Error: successCallback is not a function");
-        return;
-    }
-
-    // errorCallback optional
-    if (errorCallback && (typeof errorCallback !== "function")) {
-        console.log("Accelerometer Error: errorCallback is not a function");
-        return;
-    }
-
-    // Make sure accelerometer timeout > frequency + 10 sec
-    PhoneGap.exec(
-        function(timeout) {
-            if (timeout < (frequency + 10000)) {
-                PhoneGap.exec(null, null, "Accelerometer", "setTimeout", [frequency + 10000]);
-            }
-        },
-        function(e) { }, "Accelerometer", "getTimeout", []);
-
-    // Start watch timer
-    var id = PhoneGap.createUUID();
-    navigator.accelerometer.timers[id] = setInterval(function() {
-        PhoneGap.exec(successCallback, errorCallback, "Accelerometer", "getAcceleration", []);
-    }, (frequency ? frequency : 1));
-
-    return id;
-};
-
-/**
- * Clears the specified accelerometer watch.
- *
- * @param {String} id       The id of the watch returned from #watchAcceleration.
- */
-Accelerometer.prototype.clearWatch = function(id) {
-
-    // Stop javascript timer & remove from timer list
-    if (id && navigator.accelerometer.timers[id] !== undefined) {
-        clearInterval(navigator.accelerometer.timers[id]);
-        delete navigator.accelerometer.timers[id];
-    }
-};
-
-PhoneGap.addConstructor(function() {
-    if (typeof navigator.accelerometer === "undefined") {
-        navigator.accelerometer = new Accelerometer();
-    }
-});
-}
-/*
- *     Licensed to the Apache Software Foundation (ASF) under one
- *     or more contributor license agreements.  See the NOTICE file
- *     distributed with this work for additional information
- *     regarding copyright ownership.  The ASF licenses this file
- *     to you 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.
- */
-
-if (!PhoneGap.hasResource("app")) {
-PhoneGap.addResource("app");
-(function() {
-
-/**
- * Constructor
- * @constructor
- */
-var App = function() {};
-
-/**
- * Clear the resource cache.
- */
-App.prototype.clearCache = function() {
-    PhoneGap.exec(null, null, "App", "clearCache", []);
-};
-
-/**
- * Load the url into the webview or into new browser instance.
- *
- * @param url           The URL to load
- * @param props         Properties that can be passed in to the activity:
- *      wait: int                           => wait msec before loading URL
- *      loadingDialog: "Title,Message"      => display a native loading dialog
- *      loadUrlTimeoutValue: int            => time in msec to wait before triggering a timeout error
- *      clearHistory: boolean              => clear webview history (default=false)
- *      openExternal: boolean              => open in a new browser (default=false)
- *
- * Example:
- *      navigator.app.loadUrl("http://server/myapp/index.html", {wait:2000, loadingDialog:"Wait,Loading App", loadUrlTimeoutValue: 60000});
- */
-App.prototype.loadUrl = function(url, props) {
-    PhoneGap.exec(null, null, "App", "loadUrl", [url, props]);
-};
-
-/**
- * Cancel loadUrl that is waiting to be loaded.
- */
-App.prototype.cancelLoadUrl = function() {
-    PhoneGap.exec(null, null, "App", "cancelLoadUrl", []);
-};
-
-/**
- * Clear web history in this web view.
- * Instead of BACK button loading the previous web page, it will exit the app.
- */
-App.prototype.clearHistory = function() {
-    PhoneGap.exec(null, null, "App", "clearHistory", []);
-};
-
-/**
- * Go to previous page displayed.
- * This is the same as pressing the backbutton on Android device.
- */
-App.prototype.backHistory = function() {
-    PhoneGap.exec(null, null, "App", "backHistory", []);
-};
-
-/**
- * Exit and terminate the application.
- */
-App.prototype.exitApp = function() {
-	return PhoneGap.exec(null, null, "App", "exitApp", []);
-};
-
-PhoneGap.addConstructor(function() {
-    navigator.app = new App();
-});
-}());
-}
-/*
- *     Licensed to the Apache Software Foundation (ASF) under one
- *     or more contributor license agreements.  See the NOTICE file
- *     distributed with this work for additional information
- *     regarding copyright ownership.  The ASF licenses this file
- *     to you 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.
- */
-
-if (!PhoneGap.hasResource("battery")) {
-PhoneGap.addResource("battery");
-
-/**
- * This class contains information about the current battery status.
- * @constructor
- */
-var Battery = function() {
-    this._level = null;
-    this._isPlugged = null;
-    this._batteryListener = [];
-    this._lowListener = [];
-    this._criticalListener = [];
-};
-
-/**
- * Registers as an event producer for battery events.
- * 
- * @param {Object} eventType
- * @param {Object} handler
- * @param {Object} add
- */
-Battery.prototype.eventHandler = function(eventType, handler, add) {
-    var me = navigator.battery;
-    if (add) {
-        // If there are no current registered event listeners start the battery listener on native side.
-        if (me._batteryListener.length === 0 && me._lowListener.length === 0 && me._criticalListener.length === 0) {
-            PhoneGap.exec(me._status, me._error, "Battery", "start", []);
-        }
-        
-        // Register the event listener in the proper array
-        if (eventType === "batterystatus") {
-            if (me._batteryListener.indexOf(handler) === -1) {
-                me._batteryListener.push(handler);
-            }
-        } else if (eventType === "batterylow") {
-            if (me._lowListener.indexOf(handler) === -1) {
-                me._lowListener.push(handler);
-            }
-        } else if (eventType === "batterycritical") {
-            if (me._criticalListener.indexOf(handler) === -1) {
-                me._criticalListener.push(handler);
-            }
-        }
-    } else {
-        var pos = -1;
-        // Remove the event listener from the proper array
-        if (eventType === "batterystatus") {
-            pos = me._batteryListener.indexOf(handler);
-            if (pos > -1) {
-                me._batteryListener.splice(pos, 1);        
-            }
-        } else if (eventType === "batterylow") {
-            pos = me._lowListener.indexOf(handler);
-            if (pos > -1) {
-                me._lowListener.splice(pos, 1);        
-            }
-        } else if (eventType === "batterycritical") {
-            pos = me._criticalListener.indexOf(handler);
-            if (pos > -1) {
-                me._criticalListener.splice(pos, 1);        
-            }
-        }
-        
-        // If there are no more registered event listeners stop the battery listener on native side.
-        if (me._batteryListener.length === 0 && me._lowListener.length === 0 && me._criticalListener.length === 0) {
-            PhoneGap.exec(null, null, "Battery", "stop", []);
-        }
-    }
-};
-
-/**
- * Callback for battery status
- * 
- * @param {Object} info			keys: level, isPlugged
- */
-Battery.prototype._status = function(info) {
-	if (info) {
-		var me = this;
-        var level = info.level;
-		if (me._level !== level || me._isPlugged !== info.isPlugged) {
-			// Fire batterystatus event
-			PhoneGap.fireWindowEvent("batterystatus", info);
-
-			// Fire low battery event
-			if (level === 20 || level === 5) {
-				if (level === 20) {
-					PhoneGap.fireWindowEvent("batterylow", info);
-				}
-				else {
-					PhoneGap.fireWindowEvent("batterycritical", info);
-				}
-			}
-		}
-		me._level = level;
-		me._isPlugged = info.isPlugged;	
-	}
-};
-
-/**
- * Error callback for battery start
- */
-Battery.prototype._error = function(e) {
-    console.log("Error initializing Battery: " + e);
-};
-
-PhoneGap.addConstructor(function() {
-    if (typeof navigator.battery === "undefined") {
-        navigator.battery = new Battery();
-        PhoneGap.addWindowEventHandler("batterystatus", navigator.battery.eventHandler);
-        PhoneGap.addWindowEventHandler("batterylow", navigator.battery.eventHandler);
-        PhoneGap.addWindowEventHandler("batterycritical", navigator.battery.eventHandler);
-    }
-});
-}
-/*
- *     Licensed to the Apache Software Foundation (ASF) under one
- *     or more contributor license agreements.  See the NOTICE file
- *     distributed with this work for additional information
- *     regarding copyright ownership.  The ASF licenses this file
- *     to you 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.
- */
-
-if (!PhoneGap.hasResource("camera")) {
-PhoneGap.addResource("camera");
-
-/**
- * This class provides access to the device camera.
- *
- * @constructor
- */
-var Camera = function() {
-    this.successCallback = null;
-    this.errorCallback = null;
-    this.options = null;
-};
-
-/**
- * Format of image that returned from getPicture.
- *
- * Example: navigator.camera.getPicture(success, fail,
- *              { quality: 80,
- *                destinationType: Camera.DestinationType.DATA_URL,
- *                sourceType: Camera.PictureSourceType.PHOTOLIBRARY})
- */
-Camera.DestinationType = {
-    DATA_URL: 0,                // Return base64 encoded string
-    FILE_URI: 1                 // Return file uri (content://media/external/images/media/2 for Android)
-};
-Camera.prototype.DestinationType = Camera.DestinationType;
-
-/**
- * Encoding of image returned from getPicture.
- *
- * Example: navigator.camera.getPicture(success, fail,
- *              { quality: 80,
- *                destinationType: Camera.DestinationType.DATA_URL,
- *                sourceType: Camera.PictureSourceType.CAMERA,
- *                encodingType: Camera.EncodingType.PNG})
-*/
-Camera.EncodingType = {
-    JPEG: 0,                    // Return JPEG encoded image
-    PNG: 1                      // Return PNG encoded image
-};
-Camera.prototype.EncodingType = Camera.EncodingType;
-
-/**
- * Type of pictures to select from.  Only applicable when
- *      PictureSourceType is PHOTOLIBRARY or SAVEDPHOTOALBUM
- *
- * Example: navigator.camera.getPicture(success, fail,
- *              { quality: 80,
- *                destinationType: Camera.DestinationType.DATA_URL,
- *                sourceType: Camera.PictureSourceType.PHOTOLIBRARY,
- *                mediaType: Camera.MediaType.PICTURE})
- */
-Camera.MediaType = {
-       PICTURE: 0,      // allow selection of still pictures only. DEFAULT. Will return format specified via DestinationType
-       VIDEO: 1,        // allow selection of video only, ONLY RETURNS URL
-       ALLMEDIA : 2     // allow selection from all media types
-};
-Camera.prototype.MediaType = Camera.MediaType;
-
-
-/**
- * Source to getPicture from.
- *
- * Example: navigator.camera.getPicture(success, fail,
- *              { quality: 80,
- *                destinationType: Camera.DestinationType.DATA_URL,
- *                sourceType: Camera.PictureSourceType.PHOTOLIBRARY})
- */
-Camera.PictureSourceType = {
-    PHOTOLIBRARY : 0,           // Choose image from picture library (same as SAVEDPHOTOALBUM for Android)
-    CAMERA : 1,                 // Take picture from camera
-    SAVEDPHOTOALBUM : 2         // Choose image from picture library (same as PHOTOLIBRARY for Android)
-};
-Camera.prototype.PictureSourceType = Camera.PictureSourceType;
-
-/**
- * Gets a picture from source defined by "options.sourceType", and returns the
- * image as defined by the "options.destinationType" option.
-
- * The defaults are sourceType=CAMERA and destinationType=DATA_URL.
- *
- * @param {Function} successCallback
- * @param {Function} errorCallback
- * @param {Object} options
- */
-Camera.prototype.getPicture = function(successCallback, errorCallback, options) {
-
-    // successCallback required
-    if (typeof successCallback !== "function") {
-        console.log("Camera Error: successCallback is not a function");
-        return;
-    }
-
-    // errorCallback optional
-    if (errorCallback && (typeof errorCallback !== "function")) {
-        console.log("Camera Error: errorCallback is not a function");
-        return;
-    }
-    
-    if (options === null || typeof options === "undefined") {
-        options = {};
-    }
-    if (options.quality === null || typeof options.quality === "undefined") {
-        options.quality = 80;
-    }
-    if (options.maxResolution === null || typeof options.maxResolution === "undefined") {
-        options.maxResolution = 0;
-    }
-    if (options.destinationType === null || typeof options.destinationType === "undefined") {
-        options.destinationType = Camera.DestinationType.FILE_URI;
-    }
-    if (options.sourceType === null || typeof options.sourceType === "undefined") {
-        options.sourceType = Camera.PictureSourceType.CAMERA;
-    }
-    if (options.encodingType === null || typeof options.encodingType === "undefined") {
-        options.encodingType = Camera.EncodingType.JPEG;
-    }
-    if (options.mediaType === null || typeof options.mediaType === "undefined") {
-        options.mediaType = Camera.MediaType.PICTURE;
-    }
-    if (options.targetWidth === null || typeof options.targetWidth === "undefined") {
-        options.targetWidth = -1;
-    } 
-    else if (typeof options.targetWidth === "string") {
-        var width = new Number(options.targetWidth);
-        if (isNaN(width) === false) {
-            options.targetWidth = width.valueOf();
-        }
-    }
-    if (options.targetHeight === null || typeof options.targetHeight === "undefined") {
-        options.targetHeight = -1;
-    } 
-    else if (typeof options.targetHeight === "string") {
-        var height = new Number(options.targetHeight);
-        if (isNaN(height) === false) {
-            options.targetHeight = height.valueOf();
-        }
-    }
-    
-    PhoneGap.exec(successCallback, errorCallback, "Camera", "takePicture", [options]);
-};
-
-PhoneGap.addConstructor(function() {
-    if (typeof navigator.camera === "undefined") {
-        navigator.camera = new Camera();
-    }
-});
-}
-/*
- *     Licensed to the Apache Software Foundation (ASF) under one
- *     or more contributor license agreements.  See the NOTICE file
- *     distributed with this work for additional information
- *     regarding copyright ownership.  The ASF licenses this file
- *     to you 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.
- */
-
-if (!PhoneGap.hasResource("capture")) {
-PhoneGap.addResource("capture");
-	
-/**
- * Represents a single file.
- *
- * name {DOMString} name of the file, without path information
- * fullPath {DOMString} the full path of the file, including the name
- * type {DOMString} mime type
- * lastModifiedDate {Date} last modified date
- * size {Number} size of the file in bytes
- */
-var MediaFile = function(name, fullPath, type, lastModifiedDate, size){
-	this.name = name || null;
-	this.fullPath = fullPath || null;
-	this.type = type || null;
-	this.lastModifiedDate = lastModifiedDate || null;
-	this.size = size || 0;
-};
-
-/**
- * Launch device camera application for recording video(s).
- *
- * @param {Function} successCB
- * @param {Function} errorCB
- */
-MediaFile.prototype.getFormatData = function(successCallback, errorCallback){
-	PhoneGap.exec(successCallback, errorCallback, "Capture", "getFormatData", [this.fullPath, this.type]);
-};
-
-/**
- * MediaFileData encapsulates format information of a media file.
- *
- * @param {DOMString} codecs
- * @param {long} bitrate
- * @param {long} height
- * @param {long} width
- * @param {float} duration
- */
-var MediaFileData = function(codecs, bitrate, height, width, duration){
-	this.codecs = codecs || null;
-	this.bitrate = bitrate || 0;
-	this.height = height || 0;
-	this.width = width || 0;
-	this.duration = duration || 0;
-};
-
-/**
- * The CaptureError interface encapsulates all errors in the Capture API.
- */
-var CaptureError = function(){
-	this.code = null;
-};
-
-// Capture error codes
-CaptureError.CAPTURE_INTERNAL_ERR = 0;
-CaptureError.CAPTURE_APPLICATION_BUSY = 1;
-CaptureError.CAPTURE_INVALID_ARGUMENT = 2;
-CaptureError.CAPTURE_NO_MEDIA_FILES = 3;
-CaptureError.CAPTURE_NOT_SUPPORTED = 20;
-
-/**
- * The Capture interface exposes an interface to the camera and microphone of the hosting device.
- */
-var Capture = function(){
-	this.supportedAudioModes = [];
-	this.supportedImageModes = [];
-	this.supportedVideoModes = [];
-};
-
-/**
- * Launch audio recorder application for recording audio clip(s).
- *
- * @param {Function} successCB
- * @param {Function} errorCB
- * @param {CaptureAudioOptions} options
- */
-Capture.prototype.captureAudio = function(successCallback, errorCallback, options){
-	PhoneGap.exec(successCallback, errorCallback, "Capture", "captureAudio", [options]);
-};
-
-/**
- * Launch camera application for taking image(s).
- *
- * @param {Function} successCB
- * @param {Function} errorCB
- * @param {CaptureImageOptions} options
- */
-Capture.prototype.captureImage = function(successCallback, errorCallback, options){
-	PhoneGap.exec(successCallback, errorCallback, "Capture", "captureImage", [options]);
-};
-
-/**
- * Launch camera application for taking image(s).
- *
- * @param {Function} successCB
- * @param {Function} errorCB
- * @param {CaptureImageOptions} options
- */
-Capture.prototype._castMediaFile = function(pluginResult){
-	var mediaFiles = [];
-	var i;
-	for (i = 0; i < pluginResult.message.length; i++) {
-		var mediaFile = new MediaFile();
-		mediaFile.name = pluginResult.message[i].name;
-		mediaFile.fullPath = pluginResult.message[i].fullPath;
-		mediaFile.type = pluginResult.message[i].type;
-		mediaFile.lastModifiedDate = pluginResult.message[i].lastModifiedDate;
-		mediaFile.size = pluginResult.message[i].size;
-		mediaFiles.push(mediaFile);
-	}
-	pluginResult.message = mediaFiles;
-	return pluginResult;
-};
-
-/**
- * Launch device camera application for recording video(s).
- *
- * @param {Function} successCB
- * @param {Function} errorCB
- * @param {CaptureVideoOptions} options
- */
-Capture.prototype.captureVideo = function(successCallback, errorCallback, options){
-	PhoneGap.exec(successCallback, errorCallback, "Capture", "captureVideo", [options]);
-};
-
-/**
- * Encapsulates a set of parameters that the capture device supports.
- */
-var ConfigurationData = function(){
-	// The ASCII-encoded string in lower case representing the media type. 
-	this.type = null;
-	// The height attribute represents height of the image or video in pixels. 
-	// In the case of a sound clip this attribute has value 0. 
-	this.height = 0;
-	// The width attribute represents width of the image or video in pixels. 
-	// In the case of a sound clip this attribute has value 0
-	this.width = 0;
-};
-
-/**
- * Encapsulates all image capture operation configuration options.
- */
-var CaptureImageOptions = function(){
-	// Upper limit of images user can take. Value must be equal or greater than 1.
-	this.limit = 1;
-	// The selected image mode. Must match with one of the elements in supportedImageModes array.
-	this.mode = null;
-};
-
-/**
- * Encapsulates all video capture operation configuration options.
- */
-var CaptureVideoOptions = function(){
-	// Upper limit of videos user can record. Value must be equal or greater than 1.
-	this.limit = 1;
-	// Maximum duration of a single video clip in seconds.
-	this.duration = 0;
-	// The selected video mode. Must match with one of the elements in supportedVideoModes array.
-	this.mode = null;
-};
-
-/**
- * Encapsulates all audio capture operation configuration options.
- */
-var CaptureAudioOptions = function(){
-	// Upper limit of sound clips user can record. Value must be equal or greater than 1.
-	this.limit = 1;
-	// Maximum duration of a single sound clip in seconds.
-	this.duration = 0;
-	// The selected audio mode. Must match with one of the elements in supportedAudioModes array.
-	this.mode = null;
-};
-
-PhoneGap.addConstructor(function(){
-	if (typeof navigator.device.capture === "undefined") {
-		navigator.device.capture = window.device.capture = new Capture();
-	}
-});
-}
-/*
- *     Licensed to the Apache Software Foundation (ASF) under one
- *     or more contributor license agreements.  See the NOTICE file
- *     distributed with this work for additional information
- *     regarding copyright ownership.  The ASF licenses this file
- *     to you 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.
- */
-
-if (!PhoneGap.hasResource("compass")) {
-PhoneGap.addResource("compass");
-
-var CompassError = function(){
-    this.code = null;
-};
-
-// Capture error codes
-CompassError.COMPASS_INTERNAL_ERR = 0;
-CompassError.COMPASS_NOT_SUPPORTED = 20;
-
-var CompassHeading = function() {
-    this.magneticHeading = null;
-    this.trueHeading = null;
-    this.headingAccuracy = null;
-    this.timestamp = null;
-};
-
-/**
- * This class provides access to device Compass data.
- * @constructor
- */
-var Compass = function() {
-    /**
-     * The last known Compass position.
-     */
-    this.lastHeading = null;
-
-    /**
-     * List of compass watch timers
-     */
-    this.timers = {};
-};
-
-Compass.ERROR_MSG = ["Not running", "Starting", "", "Failed to start"];
-
-/**
- * Asynchronously aquires the current heading.
- *
- * @param {Function} successCallback The function to call when the heading data is available
- * @param {Function} errorCallback The function to call when there is an error getting the heading data. (OPTIONAL)
- * @param {PositionOptions} options The options for getting the heading data such as timeout. (OPTIONAL)
- */
-Compass.prototype.getCurrentHeading = function(successCallback, errorCallback, options) {
-
-    // successCallback required
-    if (typeof successCallback !== "function") {
-        console.log("Compass Error: successCallback is not a function");
-        return;
-    }
-
-    // errorCallback optional
-    if (errorCallback && (typeof errorCallback !== "function")) {
-        console.log("Compass Error: errorCallback is not a function");
-        return;
-    }
-
-    // Get heading
-    PhoneGap.exec(successCallback, errorCallback, "Compass", "getHeading", []);
-};
-
-/**
- * Asynchronously aquires the heading repeatedly at a given interval.
- *
- * @param {Function} successCallback    The function to call each time the heading data is available
- * @param {Function} errorCallback      The function to call when there is an error getting the heading data. (OPTIONAL)
- * @param {HeadingOptions} options      The options for getting the heading data such as timeout and the frequency of the watch. (OPTIONAL)
- * @return String                       The watch id that must be passed to #clearWatch to stop watching.
- */
-Compass.prototype.watchHeading= function(successCallback, errorCallback, options) {
-
-    // Default interval (100 msec)
-    var frequency = (options !== undefined) ? options.frequency : 100;
-
-    // successCallback required
-    if (typeof successCallback !== "function") {
-        console.log("Compass Error: successCallback is not a function");
-        return;
-    }
-
-    // errorCallback optional
-    if (errorCallback && (typeof errorCallback !== "function")) {
-        console.log("Compass Error: errorCallback is not a function");
-        return;
-    }
-
-    // Make sure compass timeout > frequency + 10 sec
-    PhoneGap.exec(
-        function(timeout) {
-            if (timeout < (frequency + 10000)) {
-                PhoneGap.exec(null, null, "Compass", "setTimeout", [frequency + 10000]);
-            }
-        },
-        function(e) { }, "Compass", "getTimeout", []);
-
-    // Start watch timer to get headings
-    var id = PhoneGap.createUUID();
-    navigator.compass.timers[id] = setInterval(
-        function() {
-            PhoneGap.exec(successCallback, errorCallback, "Compass", "getHeading", []);
-        }, (frequency ? frequency : 1));
-
-    return id;
-};
-
-
-/**
- * Clears the specified heading watch.
- *
- * @param {String} id       The ID of the watch returned from #watchHeading.
- */
-Compass.prototype.clearWatch = function(id) {
-
-    // Stop javascript timer & remove from timer list
-    if (id && navigator.compass.timers[id]) {
-        clearInterval(navigator.compass.timers[id]);
-        delete navigator.compass.timers[id];
-    }
-};
-
-Compass.prototype._castDate = function(pluginResult) {
-    if (pluginResult.message.timestamp) {
-        var timestamp = new Date(pluginResult.message.timestamp);
-        pluginResult.message.timestamp = timestamp;
-    }
-    return pluginResult;
-};
-
-PhoneGap.addConstructor(function() {
-    if (typeof navigator.compass === "undefined") {
-        navigator.compass = new Compass();
-    }
-});
-}
-/*
- *     Licensed to the Apache Software Foundation (ASF) under one
- *     or more contributor license agreements.  See the NOTICE file
- *     distributed with this work for additional information
- *     regarding copyright ownership.  The ASF licenses this file
- *     to you 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.
- */
-
-if (!PhoneGap.hasResource("contact")) {
-PhoneGap.addResource("contact");
-
-/**
-* Contains information about a single contact.
-* @constructor
-* @param {DOMString} id unique identifier
-* @param {DOMString} displayName
-* @param {ContactName} name
-* @param {DOMString} nickname
-* @param {Array.<ContactField>} phoneNumbers array of phone numbers
-* @param {Array.<ContactField>} emails array of email addresses
-* @param {Array.<ContactAddress>} addresses array of addresses
-* @param {Array.<ContactField>} ims instant messaging user ids
-* @param {Array.<ContactOrganization>} organizations
-* @param {DOMString} birthday contact's birthday
-* @param {DOMString} note user notes about contact
-* @param {Array.<ContactField>} photos
-* @param {Array.<ContactField>} categories
-* @param {Array.<ContactField>} urls contact's web sites
-*/
-var Contact = function (id, displayName, name, nickname, phoneNumbers, emails, addresses,
-    ims, organizations, birthday, note, photos, categories, urls) {
-    this.id = id || null;
-    this.rawId = null;
-    this.displayName = displayName || null;
-    this.name = name || null; // ContactName
-    this.nickname = nickname || null;
-    this.phoneNumbers = phoneNumbers || null; // ContactField[]
-    this.emails = emails || null; // ContactField[]
-    this.addresses = addresses || null; // ContactAddress[]
-    this.ims = ims || null; // ContactField[]
-    this.organizations = organizations || null; // ContactOrganization[]
-    this.birthday = birthday || null;
-    this.note = note || null;
-    this.photos = photos || null; // ContactField[]
-    this.categories = categories || null; // ContactField[]
-    this.urls = urls || null; // ContactField[]
-};
-
-/**
- *  ContactError.
- *  An error code assigned by an implementation when an error has occurreds
- * @constructor
- */
-var ContactError = function() {
-    this.code=null;
-};
-
-/**
- * Error codes
- */
-ContactError.UNKNOWN_ERROR = 0;
-ContactError.INVALID_ARGUMENT_ERROR = 1;
-ContactError.TIMEOUT_ERROR = 2;
-ContactError.PENDING_OPERATION_ERROR = 3;
-ContactError.IO_ERROR = 4;
-ContactError.NOT_SUPPORTED_ERROR = 5;
-ContactError.PERMISSION_DENIED_ERROR = 20;
-
-/**
-* Removes contact from device storage.
-* @param successCB success callback
-* @param errorCB error callback
-*/
-Contact.prototype.remove = function(successCB, errorCB) {
-    if (this.id === null) {
-        var errorObj = new ContactError();
-        errorObj.code = ContactError.UNKNOWN_ERROR;
-        errorCB(errorObj);
-    }
-    else {
-        PhoneGap.exec(successCB, errorCB, "Contacts", "remove", [this.id]);
-    }
-};
-
-/**
-* Creates a deep copy of this Contact.
-* With the contact ID set to null.
-* @return copy of this Contact
-*/
-Contact.prototype.clone = function() {
-    var clonedContact = PhoneGap.clone(this);
-    var i;
-    clonedContact.id = null;
-    clonedContact.rawId = null;
-    // Loop through and clear out any id's in phones, emails, etc.
-    if (clonedContact.phoneNumbers) {
-        for (i = 0; i < clonedContact.phoneNumbers.length; i++) {
-            clonedContact.phoneNumbers[i].id = null;
-        }
-    }
-    if (clonedContact.emails) {
-        for (i = 0; i < clonedContact.emails.length; i++) {
-            clonedContact.emails[i].id = null;
-        }
-    }
-    if (clonedContact.addresses) {
-        for (i = 0; i < clonedContact.addresses.length; i++) {
-            clonedContact.addresses[i].id = null;
-        }
-    }
-    if (clonedContact.ims) {
-        for (i = 0; i < clonedContact.ims.length; i++) {
-            clonedContact.ims[i].id = null;
-        }
-    }
-    if (clonedContact.organizations) {
-        for (i = 0; i < clonedContact.organizations.length; i++) {
-            clonedContact.organizations[i].id = null;
-        }
-    }
-    if (clonedContact.tags) {
-        for (i = 0; i < clonedContact.tags.length; i++) {
-            clonedContact.tags[i].id = null;
-        }
-    }
-    if (clonedContact.photos) {
-        for (i = 0; i < clonedContact.photos.length; i++) {
-            clonedContact.photos[i].id = null;
-        }
-    }
-    if (clonedContact.urls) {
-        for (i = 0; i < clonedContact.urls.length; i++) {
-            clonedContact.urls[i].id = null;
-        }
-    }
-    return clonedContact;
-};
-
-/**
-* Persists contact to device storage.
-* @param successCB success callback
-* @param errorCB error callback
-*/
-Contact.prototype.save = function(successCB, errorCB) {
-    PhoneGap.exec(successCB, errorCB, "Contacts", "save", [this]);
-};
-
-/**
-* Contact name.
-* @constructor
-* @param formatted
-* @param familyName
-* @param givenName
-* @param middle
-* @param prefix
-* @param suffix
-*/
-var ContactName = function(formatted, familyName, givenName, middle, prefix, suffix) {
-    this.formatted = formatted || null;
-    this.familyName = familyName || null;
-    this.givenName = givenName || null;
-    this.middleName = middle || null;
-    this.honorificPrefix = prefix || null;
-    this.honorificSuffix = suffix || null;
-};
-
-/**
-* Generic contact field.
-* @constructor
-* @param {DOMString} id unique identifier, should only be set by native code
-* @param type
-* @param value
-* @param pref
-*/
-var ContactField = function(type, value, pref) {
-	this.id = null;
-    this.type = type || null;
-    this.value = value || null;
-    this.pref = pref || null;
-};
-
-/**
-* Contact address.
-* @constructor
-* @param {DOMString} id unique identifier, should only be set by native code
-* @param formatted
-* @param streetAddress
-* @param locality
-* @param region
-* @param postalCode
-* @param country
-*/
-var ContactAddress = function(pref, type, formatted, streetAddress, locality, region, postalCode, country) {
-	this.id = null;
-    this.pref = pref || null;
-    this.type = type || null;
-    this.formatted = formatted || null;
-    this.streetAddress = streetAddress || null;
-    this.locality = locality || null;
-    this.region = region || null;
-    this.postalCode = postalCode || null;
-    this.country = country || null;
-};
-
-/**
-* Contact organization.
-* @constructor
-* @param {DOMString} id unique identifier, should only be set by native code
-* @param name
-* @param dept
-* @param title
-* @param startDate
-* @param endDate
-* @param location
-* @param desc
-*/
-var ContactOrganization = function(pref, type, name, dept, title) {
-	this.id = null;
-    this.pref = pref || null;
-    this.type = type || null;
-    this.name = name || null;
-    this.department = dept || null;
-    this.title = title || null;
-};
-
-/**
-* Represents a group of Contacts.
-* @constructor
-*/
-var Contacts = function() {
-    this.inProgress = false;
-    this.records = [];
-};
-/**
-* Returns an array of Contacts matching the search criteria.
-* @param fields that should be searched
-* @param successCB success callback
-* @param errorCB error callback
-* @param {ContactFindOptions} options that can be applied to contact searching
-* @return array of Contacts matching search criteria
-*/
-Contacts.prototype.find = function(fields, successCB, errorCB, options) {
-    if (successCB === null) {
-        throw new TypeError("You must specify a success callback for the find command.");
-    }
-    if (fields === null || fields === "undefined" || fields.length === "undefined" || fields.length <= 0) {
-        if (typeof errorCB === "function") {
-            errorCB({"code": ContactError.INVALID_ARGUMENT_ERROR});
-        }
-    } else {
-        PhoneGap.exec(successCB, errorCB, "Contacts", "search", [fields, options]);        
-    }
-};
-
-/**
-* This function creates a new contact, but it does not persist the contact
-* to device storage. To persist the contact to device storage, invoke
-* contact.save().
-* @param properties an object who's properties will be examined to create a new Contact
-* @returns new Contact object
-*/
-Contacts.prototype.create = function(properties) {
-    var i;
-	var contact = new Contact();
-    for (i in properties) {
-        if (contact[i] !== 'undefined') {
-            contact[i] = properties[i];
-        }
-    }
-    return contact;
-};
-
-/**
-* This function returns and array of contacts.  It is required as we need to convert raw
-* JSON objects into concrete Contact objects.  Currently this method is called after
-* navigator.contacts.find but before the find methods success call back.
-*
-* @param jsonArray an array of JSON Objects that need to be converted to Contact objects.
-* @returns an array of Contact objects
-*/
-Contacts.prototype.cast = function(pluginResult) {
-	var contacts = [];
-	var i;
-	for (i=0; i<pluginResult.message.length; i++) {
-		contacts.push(navigator.contacts.create(pluginResult.message[i]));
-	}
-	pluginResult.message = contacts;
-	return pluginResult;
-};
-
-/**
- * ContactFindOptions.
- * @constructor
- * @param filter used to match contacts against
- * @param multiple boolean used to determine if more than one contact should be returned
- */
-var ContactFindOptions = function(filter, multiple) {
-    this.filter = filter || '';
-    this.multiple = multiple || false;
-};
-
-/**
- * Add the contact interface into the browser.
- */
-PhoneGap.addConstructor(function() {
-    if(typeof navigator.contacts === "undefined") {
-        navigator.contacts = new Contacts();
-    }
-});
-}
-/*
- *     Licensed to the Apache Software Foundation (ASF) under one
- *     or more contributor license agreements.  See the NOTICE file
- *     distributed with this work for additional information
- *     regarding copyright ownership.  The ASF licenses this file
- *     to you 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.
- */
-
-// TODO: Needs to be commented
-
-if (!PhoneGap.hasResource("crypto")) {
-PhoneGap.addResource("crypto");
-
-/**
-* @constructor
-*/
-var Crypto = function() {
-};
-
-Crypto.prototype.encrypt = function(seed, string, callback) {
-    this.encryptWin = callback;
-    PhoneGap.exec(null, null, "Crypto", "encrypt", [seed, string]);
-};
-
-Crypto.prototype.decrypt = function(seed, string, callback) {
-    this.decryptWin = callback;
-    PhoneGap.exec(null, null, "Crypto", "decrypt", [seed, string]);
-};
-
-Crypto.prototype.gotCryptedString = function(string) {
-    this.encryptWin(string);
-};
-
-Crypto.prototype.getPlainString = function(string) {
-    this.decryptWin(string);
-};
-
-PhoneGap.addConstructor(function() {
-    if (typeof navigator.Crypto === "undefined") {
-        navigator.Crypto = new Crypto();
-    }
-});
-}
-/*
- *     Licensed to the Apache Software Foundation (ASF) under one
- *     or more contributor license agreements.  See the NOTICE file
- *     distributed with this work for additional information
- *     regarding copyright ownership.  The ASF licenses this file
- *     to you 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.
- */
-
-if (!PhoneGap.hasResource("file")) {
-PhoneGap.addResource("file");
-
-/**
- * This class provides some useful information about a file.
- * @constructor
- */
-var FileProperties = function(filePath) {
-    this.filePath = filePath;
-    this.size = 0;
-    this.lastModifiedDate = null;
-};
-
-/**
- * Represents a single file.
- *
- * @constructor
- * @param name {DOMString} name of the file, without path information
- * @param fullPath {DOMString} the full path of the file, including the name
- * @param type {DOMString} mime type
- * @param lastModifiedDate {Date} last modified date
- * @param size {Number} size of the file in bytes
- */
-var File = function(name, fullPath, type, lastModifiedDate, size) {
-    this.name = name || null;
-    this.fullPath = fullPath || null;
-    this.type = type || null;
-    this.lastModifiedDate = lastModifiedDate || null;
-    this.size = size || 0;
-};
-
-/** @constructor */
-var FileError = function() {
-   this.code = null;
-};
-
-// File error codes
-// Found in DOMException
-FileError.NOT_FOUND_ERR = 1;
-FileError.SECURITY_ERR = 2;
-FileError.ABORT_ERR = 3;
-
-// Added by this specification
-FileError.NOT_READABLE_ERR = 4;
-FileError.ENCODING_ERR = 5;
-FileError.NO_MODIFICATION_ALLOWED_ERR = 6;
-FileError.INVALID_STATE_ERR = 7;
-FileError.SYNTAX_ERR = 8;
-FileError.INVALID_MODIFICATION_ERR = 9;
-FileError.QUOTA_EXCEEDED_ERR = 10;
-FileError.TYPE_MISMATCH_ERR = 11;
-FileError.PATH_EXISTS_ERR = 12;
-
-//-----------------------------------------------------------------------------
-// File Reader
-//-----------------------------------------------------------------------------
-
-/**
- * This class reads the mobile device file system.
- *
- * For Android:
- *      The root directory is the root of the file system.
- *      To read from the SD card, the file name is "sdcard/my_file.txt"
- * @constructor
- */
-var FileReader = function() {
-    this.fileName = "";
-
-    this.readyState = 0;
-
-    // File data
-    this.result = null;
-
-    // Error
-    this.error = null;
-
-    // Event handlers
-    this.onloadstart = null;    // When the read starts.
-    this.onprogress = null;     // While reading (and decoding) file or fileBlob data, and reporting partial file data (progess.loaded/progress.total)
-    this.onload = null;         // When the read has successfully completed.
-    this.onerror = null;        // When the read has failed (see errors).
-    this.onloadend = null;      // When the request has completed (either in success or failure).
-    this.onabort = null;        // When the read has been aborted. For instance, by invoking the abort() method.
-};
-
-// States
-FileReader.EMPTY = 0;
-FileReader.LOADING = 1;
-FileReader.DONE = 2;
-
-/**
- * Abort reading file.
- */
-FileReader.prototype.abort = function() {
-    var evt;
-    this.readyState = FileReader.DONE;
-    this.result = null;
-
-    // set error
-    var error = new FileError();
-    error.code = error.ABORT_ERR;
-    this.error = error;
-
-    // If error callback
-    if (typeof this.onerror === "function") {
-        this.onerror({"type":"error", "target":this});
-    }
-    // If abort callback
-    if (typeof this.onabort === "function") {
-        this.onabort({"type":"abort", "target":this});
-    }
-    // If load end callback
-    if (typeof this.onloadend === "function") {
-        this.onloadend({"type":"loadend", "target":this});
-    }
-};
-
-/**
- * Read text file.
- *
- * @param file          {File} File object containing file properties
- * @param encoding      [Optional] (see http://www.iana.org/assignments/character-sets)
- */
-FileReader.prototype.readAsText = function(file, encoding) {
-    this.fileName = "";
-    if (typeof file.fullPath === "undefined") {
-        this.fileName = file;
-    } else {
-        this.fileName = file.fullPath;
-    }
-
-    // LOADING state
-    this.readyState = FileReader.LOADING;
-
-    // If loadstart callback
-    if (typeof this.onloadstart === "function") {
-        this.onloadstart({"type":"loadstart", "target":this});
-    }
-
-    // Default encoding is UTF-8
-    var enc = encoding ? encoding : "UTF-8";
-
-    var me = this;
-
-    // Read file
-    PhoneGap.exec(
-        // Success callback
-        function(r) {
-            var evt;
-
-            // If DONE (cancelled), then don't do anything
-            if (me.readyState === FileReader.DONE) {
-                return;
-            }
-
-            // Save result
-            me.result = r;
-
-            // If onload callback
-            if (typeof me.onload === "function") {
-                me.onload({"type":"load", "target":me});
-            }
-
-            // DONE state
-            me.readyState = FileReader.DONE;
-
-            // If onloadend callback
-            if (typeof me.onloadend === "function") {
-                me.onloadend({"type":"loadend", "target":me});
-            }
-        },
-        // Error callback
-        function(e) {
-            var evt;
-            // If DONE (cancelled), then don't do anything
-            if (me.readyState === FileReader.DONE) {
-                return;
-            }
-
-            // Save error
-            me.error = e;
-
-            // If onerror callback
-            if (typeof me.onerror === "function") {
-                me.onerror({"type":"error", "target":me});
-            }
-
-            // DONE state
-            me.readyState = FileReader.DONE;
-
-            // If onloadend callback
-            if (typeof me.onloadend === "function") {
-                me.onloadend({"type":"loadend", "target":me});
-            }
-        }, "File", "readAsText", [this.fileName, enc]);
-};
-
-
-/**
- * Read file and return data as a base64 encoded data url.
- * A data url is of the form:
- *      data:[<mediatype>][;base64],<data>
- *
- * @param file          {File} File object containing file properties
- */
-FileReader.prototype.readAsDataURL = function(file) {
-    this.fileName = "";
-    if (typeof file.fullPath === "undefined") {
-        this.fileName = file;
-    } else {
-        this.fileName = file.fullPath;
-    }
-
-    // LOADING state
-    this.readyState = FileReader.LOADING;
-
-    // If loadstart callback
-    if (typeof this.onloadstart === "function") {
-        this.onloadstart({"type":"loadstart", "target":this});
-    }
-
-    var me = this;
-
-    // Read file
-    PhoneGap.exec(
-        // Success callback
-        function(r) {
-            var evt;
-
-            // If DONE (cancelled), then don't do anything
-            if (me.readyState === FileReader.DONE) {
-                return;
-            }
-
-            // Save result
-            me.result = r;
-
-            // If onload callback
-            if (typeof me.onload === "function") {
-                me.onload({"type":"load", "target":me});
-            }
-
-            // DONE state
-            me.readyState = FileReader.DONE;
-
-            // If onloadend callback
-            if (typeof me.onloadend === "function") {
-                me.onloadend({"type":"loadend", "target":me});
-            }
-        },
-        // Error callback
-        function(e) {
-            var evt;
-            // If DONE (cancelled), then don't do anything
-            if (me.readyState === FileReader.DONE) {
-                return;
-            }
-
-            // Save error
-            me.error = e;
-
-            // If onerror callback
-            if (typeof me.onerror === "function") {
-                me.onerror({"type":"error", "target":me});
-            }
-
-            // DONE state
-            me.readyState = FileReader.DONE;
-
-            // If onloadend callback
-            if (typeof me.onloadend === "function") {
-                me.onloadend({"type":"loadend", "target":me});
-            }
-        }, "File", "readAsDataURL", [this.fileName]);
-};
-
-/**
- * Read file and return data as a binary data.
- *
- * @param file          {File} File object containing file properties
- */
-FileReader.prototype.readAsBinaryString = function(file) {
-    // TODO - Can't return binary data to browser.
-    this.fileName = file;
-};
-
-/**
- * Read file and return data as a binary data.
- *
- * @param file          {File} File object containing file properties
- */
-FileReader.prototype.readAsArrayBuffer = function(file) {
-    // TODO - Can't return binary data to browser.
-    this.fileName = file;
-};
-
-//-----------------------------------------------------------------------------
-// File Writer
-//-----------------------------------------------------------------------------
-
-/**
- * This class writes to the mobile device file system.
- *
- * For Android:
- *      The root directory is the root of the file system.
- *      To write to the SD card, the file name is "sdcard/my_file.txt"
- *
- * @constructor
- * @param file {File} File object containing file properties
- * @param append if true write to the end of the file, otherwise overwrite the file
- */
-var FileWriter = function(file) {
-    this.fileName = "";
-    this.length = 0;
-    if (file) {
-        this.fileName = file.fullPath || file;
-        this.length = file.size || 0;
-    }
-    // default is to write at the beginning of the file
-    this.position = 0;
-
-    this.readyState = 0; // EMPTY
-
-    this.result = null;
-
-    // Error
-    this.error = null;
-
-    // Event handlers
-    this.onwritestart = null;   // When writing starts
-    this.onprogress = null;     // While writing the file, and reporting partial file data
-    this.onwrite = null;        // When the write has successfully completed.
-    this.onwriteend = null;     // When the request has completed (either in success or failure).
-    this.onabort = null;        // When the write has been aborted. For instance, by invoking the abort() method.
-    this.onerror = null;        // When the write has failed (see errors).
-};
-
-// States
-FileWriter.INIT = 0;
-FileWriter.WRITING = 1;
-FileWriter.DONE = 2;
-
-/**
- * Abort writing file.
- */
-FileWriter.prototype.abort = function() {
-    // check for invalid state
-    if (this.readyState === FileWriter.DONE || this.readyState === FileWriter.INIT) {
-        throw FileError.INVALID_STATE_ERR;
-    }
-
-    // set error
-    var error = new FileError(), evt;
-    error.code = error.ABORT_ERR;
-    this.error = error;
-
-    // If error callback
-    if (typeof this.onerror === "function") {
-        this.onerror({"type":"error", "target":this});
-    }
-    // If abort callback
-    if (typeof this.onabort === "function") {
-        this.onabort({"type":"abort", "target":this});
-    }
-
-    this.readyState = FileWriter.DONE;
-
-    // If write end callback
-    if (typeof this.onwriteend === "function") {
-        this.onwriteend({"type":"writeend", "target":this});
-    }
-};
-
-/**
- * Writes data to the file
- *
- * @param text to be written
- */
-FileWriter.prototype.write = function(text) {
-    // Throw an exception if we are already writing a file
-    if (this.readyState === FileWriter.WRITING) {
-        throw FileError.INVALID_STATE_ERR;
-    }
-
-    // WRITING state
-    this.readyState = FileWriter.WRITING;
-
-    var me = this;
-
-    // If onwritestart callback
-    if (typeof me.onwritestart === "function") {
-        me.onwritestart({"type":"writestart", "target":me});
-    }
-
-    // Write file
-    PhoneGap.exec(
-        // Success callback
-        function(r) {
-            var evt;
-            // If DONE (cancelled), then don't do anything
-            if (me.readyState === FileWriter.DONE) {
-                return;
-            }
-
-            // position always increases by bytes written because file would be extended
-            me.position += r;
-            // The length of the file is now where we are done writing.
-            me.length = me.position;
-
-            // If onwrite callback
-            if (typeof me.onwrite === "function") {
-                me.onwrite({"type":"write", "target":me});
-            }
-
-            // DONE state
-            me.readyState = FileWriter.DONE;
-
-            // If onwriteend callback
-            if (typeof me.onwriteend === "function") {
-                me.onwriteend({"type":"writeend", "target":me});
-            }
-        },
-        // Error callback
-        function(e) {
-            var evt;
-
-            // If DONE (cancelled), then don't do anything
-            if (me.readyState === FileWriter.DONE) {
-                return;
-            }
-
-            // Save error
-            me.error = e;
-
-            // If onerror callback
-            if (typeof me.onerror === "function") {
-                me.onerror({"type":"error", "target":me});
-            }
-
-            // DONE state
-            me.readyState = FileWriter.DONE;
-
-            // If onwriteend callback
-            if (typeof me.onwriteend === "function") {
-                me.onwriteend({"type":"writeend", "target":me});
-            }
-        }, "File", "write", [this.fileName, text, this.position]);
-};
-
-/**
- * Moves the file pointer to the location specified.
- *
- * If the offset is a negative number the position of the file
- * pointer is rewound.  If the offset is greater than the file
- * size the position is set to the end of the file.
- *
- * @param offset is the location to move the file pointer to.
- */
-FileWriter.prototype.seek = function(offset) {
-    // Throw an exception if we are already writing a file
-    if (this.readyState === FileWriter.WRITING) {
-        throw FileError.INVALID_STATE_ERR;
-    }
-
-    if (!offset) {
-        return;
-    }
-
-    // See back from end of file.
-    if (offset < 0) {
-        this.position = Math.max(offset + this.length, 0);
-    }
-    // Offset is bigger then file size so set position
-    // to the end of the file.
-    else if (offset > this.length) {
-        this.position = this.length;
-    }
-    // Offset is between 0 and file size so set the position
-    // to start writing.
-    else {
-        this.position = offset;
-    }
-};
-
-/**
- * Truncates the file to the size specified.
- *
- * @param size to chop the file at.
- */
-FileWriter.prototype.truncate = function(size) {
-    // Throw an exception if we are already writing a file
-    if (this.readyState === FileWriter.WRITING) {
-        throw FileError.INVALID_STATE_ERR;
-    }
-
-    // WRITING state
-    this.readyState = FileWriter.WRITING;
-
-    var me = this;
-
-    // If onwritestart callback
-    if (typeof me.onwritestart === "function") {
-        me.onwritestart({"type":"writestart", "target":this});
-    }
-
-    // Write file
-    PhoneGap.exec(
-        // Success callback
-        function(r) {
-            var evt;
-            // If DONE (cancelled), then don't do anything
-            if (me.readyState === FileWriter.DONE) {
-                return;
-            }
-
-            // Update the length of the file
-            me.length = r;
-            me.position = Math.min(me.position, r);
-
-            // If onwrite callback
-            if (typeof me.onwrite === "function") {
-                me.onwrite({"type":"write", "target":me});
-            }
-
-            // DONE state
-            me.readyState = FileWriter.DONE;
-
-            // If onwriteend callback
-            if (typeof me.onwriteend === "function") {
-                me.onwriteend({"type":"writeend", "target":me});
-            }
-        },
-        // Error callback
-        function(e) {
-            var evt;
-            // If DONE (cancelled), then don't do anything
-            if (me.readyState === FileWriter.DONE) {
-                return;
-            }
-
-            // Save error
-            me.error = e;
-
-            // If onerror callback
-            if (typeof me.onerror === "function") {
-                me.onerror({"type":"error", "target":me});
-            }
-
-            // DONE state
-            me.readyState = FileWriter.DONE;
-
-            // If onwriteend callback
-            if (typeof me.onwriteend === "function") {
-                me.onwriteend({"type":"writeend", "target":me});
-            }
-        }, "File", "truncate", [this.fileName, size]);
-};
-
-/**
- * Information about the state of the file or directory
- *
- * @constructor
- * {Date} modificationTime (readonly)
- */
-var Metadata = function() {
-    this.modificationTime=null;
-};
-
-/**
- * Supplies arguments to methods that lookup or create files and directories
- *
- * @constructor
- * @param {boolean} create file or directory if it doesn't exist
- * @param {boolean} exclusive if true the command will fail if the file or directory exists
- */
-var Flags = function(create, exclusive) {
-    this.create = create || false;
-    this.exclusive = exclusive || false;
-};
-
-/**
- * An interface representing a file system
- *
- * @constructor
- * {DOMString} name the unique name of the file system (readonly)
- * {DirectoryEntry} root directory of the file system (readonly)
- */
-var FileSystem = function() {
-    this.name = null;
-    this.root = null;
-};
-
-/**
- * An interface that lists the files and directories in a directory.
- * @constructor
- */
-var DirectoryReader = function(fullPath){
-    this.fullPath = fullPath || null;
-};
-
-/**
- * Returns a list of entries from a directory.
- *
- * @param {Function} successCallback is called with a list of entries
- * @param {Function} errorCallback is called with a FileError
- */
-DirectoryReader.prototype.readEntries = function(successCallback, errorCallback) {
-    PhoneGap.exec(successCallback, errorCallback, "File", "readEntries", [this.fullPath]);
-};
-
-/**
- * An interface representing a directory on the file system.
- *
- * @constructor
- * {boolean} isFile always false (readonly)
- * {boolean} isDirectory always true (readonly)
- * {DOMString} name of the directory, excluding the path leading to it (readonly)
- * {DOMString} fullPath the absolute full path to the directory (readonly)
- * {FileSystem} filesystem on which the directory resides (readonly)
- */
-var DirectoryEntry = function() {
-    this.isFile = false;
-    this.isDirectory = true;
-    this.name = null;
-    this.fullPath = null;
-    this.filesystem = null;
-};
-
-/**
- * Copies a directory to a new location
- *
- * @param {DirectoryEntry} parent the directory to which to copy the entry
- * @param {DOMString} newName the new name of the entry, defaults to the current name
- * @param {Function} successCallback is called with the new entry
- * @param {Function} errorCallback is called with a FileError
- */
-DirectoryEntry.prototype.copyTo = function(parent, newName, successCallback, errorCallback) {
-    PhoneGap.exec(successCallback, errorCallback, "File", "copyTo", [this.fullPath, parent, newName]);
-};
-
-/**
- * Looks up the metadata of the entry
- *
- * @param {Function} successCallback is called with a Metadata object
- * @param {Function} errorCallback is called with a FileError
- */
-DirectoryEntry.prototype.getMetadata = function(successCallback, errorCallback) {
-    PhoneGap.exec(successCallback, errorCallback, "File", "getMetadata", [this.fullPath]);
-};
-
-/**
- * Gets the parent of the entry
- *
- * @param {Function} successCallback is called with a parent entry
- * @param {Function} errorCallback is called with a FileError
- */
-DirectoryEntry.prototype.getParent = function(successCallback, errorCallback) {
-    PhoneGap.exec(successCallback, errorCallback, "File", "getParent", [this.fullPath]);
-};
-
-/**
- * Moves a directory to a new location
- *
- * @param {DirectoryEntry} parent the directory to which to move the entry
- * @param {DOMString} newName the new name of the entry, defaults to the current name
- * @param {Function} successCallback is called with the new entry
- * @param {Function} errorCallback is called with a FileError
- */
-DirectoryEntry.prototype.moveTo = function(parent, newName, successCallback, errorCallback) {
-    PhoneGap.exec(successCallback, errorCallback, "File", "moveTo", [this.fullPath, parent, newName]);
-};
-
-/**
- * Removes the entry
- *
- * @param {Function} successCallback is called with no parameters
- * @param {Function} errorCallback is called with a FileError
- */
-DirectoryEntry.prototype.remove = function(successCallback, errorCallback) {
-    PhoneGap.exec(successCallback, errorCallback, "File", "remove", [this.fullPath]);
-};
-
-/**
- * Returns a URI that can be used to identify this entry.
- *
- * @param {DOMString} mimeType for a FileEntry, the mime type to be used to interpret the file, when loaded through this URI.
- * @return uri
- */
-DirectoryEntry.prototype.toURI = function(mimeType) {
-    return "file://" + this.fullPath;
-};
-
-/**
- * Creates a new DirectoryReader to read entries from this directory
- */
-DirectoryEntry.prototype.createReader = function(successCallback, errorCallback) {
-    return new DirectoryReader(this.fullPath);
-};
-
-/**
- * Creates or looks up a directory
- *
- * @param {DOMString} path either a relative or absolute path from this directory in which to look up or create a directory
- * @param {Flags} options to create or excluively create the directory
- * @param {Function} successCallback is called with the new entry
- * @param {Function} errorCallback is called with a FileError
- */
-DirectoryEntry.prototype.getDirectory = function(path, options, successCallback, errorCallback) {
-    PhoneGap.exec(successCallback, errorCallback, "File", "getDirectory", [this.fullPath, path, options]);
-};
-
-/**
- * Creates or looks up a file
- *
- * @param {DOMString} path either a relative or absolute path from this directory in which to look up or create a file
- * @param {Flags} options to create or excluively create the file
- * @param {Function} successCallback is called with the new entry
- * @param {Function} errorCallback is called with a FileError
- */
-DirectoryEntry.prototype.getFile = function(path, options, successCallback, errorCallback) {
-    PhoneGap.exec(successCallback, errorCallback, "File", "getFile", [this.fullPath, path, options]);
-};
-
-/**
- * Deletes a directory and all of it's contents
- *
- * @param {Function} successCallback is called with no parameters
- * @param {Function} errorCallback is called with a FileError
- */
-DirectoryEntry.prototype.removeRecursively = function(successCallback, errorCallback) {
-    PhoneGap.exec(successCallback, errorCallback, "File", "removeRecursively", [this.fullPath]);
-};
-
-/**
- * An interface representing a directory on the file system.
- *
- * @constructor
- * {boolean} isFile always true (readonly)
- * {boolean} isDirectory always false (readonly)
- * {DOMString} name of the file, excluding the path leading to it (readonly)
- * {DOMString} fullPath the absolute full path to the file (readonly)
- * {FileSystem} filesystem on which the directory resides (readonly)
- */
-var FileEntry = function() {
-    this.isFile = true;
-    this.isDirectory = false;
-    this.name = null;
-    this.fullPath = null;
-    this.filesystem = null;
-};
-
-/**
- * Copies a file to a new location
- *
- * @param {DirectoryEntry} parent the directory to which to copy the entry
- * @param {DOMString} newName the new name of the entry, defaults to the current name
- * @param {Function} successCallback is called with the new entry
- * @param {Function} errorCallback is called with a FileError
- */
-FileEntry.prototype.copyTo = function(parent, newName, successCallback, errorCallback) {
-    PhoneGap.exec(successCallback, errorCallback, "File", "copyTo", [this.fullPath, parent, newName]);
-};
-
-/**
- * Looks up the metadata of the entry
- *
- * @param {Function} successCallback is called with a Metadata object
- * @param {Function} errorCallback is called with a FileError
- */
-FileEntry.prototype.getMetadata = function(successCallback, errorCallback) {
-    PhoneGap.exec(successCallback, errorCallback, "File", "getMetadata", [this.fullPath]);
-};
-
-/**
- * Gets the parent of the entry
- *
- * @param {Function} successCallback is called with a parent entry
- * @param {Function} errorCallback is called with a FileError
- */
-FileEntry.prototype.getParent = function(successCallback, errorCallback) {
-    PhoneGap.exec(successCallback, errorCallback, "File", "getParent", [this.fullPath]);
-};
-
-/**
- * Moves a directory to a new location
- *
- * @param {DirectoryEntry} parent the directory to which to move the entry
- * @param {DOMString} newName the new name of the entry, defaults to the current name
- * @param {Function} successCallback is called with the new entry
- * @param {Function} errorCallback is called with a FileError
- */
-FileEntry.prototype.moveTo = function(parent, newName, successCallback, errorCallback) {
-    PhoneGap.exec(successCallback, errorCallback, "File", "moveTo", [this.fullPath, parent, newName]);
-};
-
-/**
- * Removes the entry
- *
- * @param {Function} successCallback is called with no parameters
- * @param {Function} errorCallback is called with a FileError
- */
-FileEntry.prototype.remove = function(successCallback, errorCallback) {
-    PhoneGap.exec(successCallback, errorCallback, "File", "remove", [this.fullPath]);
-};
-
-/**
- * Returns a URI that can be used to identify this entry.
- *
- * @param {DOMString} mimeType for a FileEntry, the mime type to be used to interpret the file, when loaded through this URI.
- * @return uri
- */
-FileEntry.prototype.toURI = function(mimeType) {
-    return "file://" + this.fullPath;
-};
-
-/**
- * Creates a new FileWriter associated with the file that this FileEntry represents.
- *
- * @param {Function} successCallback is called with the new FileWriter
- * @param {Function} errorCallback is called with a FileError
- */
-FileEntry.prototype.createWriter = function(successCallback, errorCallback) {
-    this.file(function(filePointer) {
-        var writer = new FileWriter(filePointer);
-    
-        if (writer.fileName === null || writer.fileName === "") {
-            if (typeof errorCallback === "function") {
-                errorCallback({
-                    "code": FileError.INVALID_STATE_ERR
-                });
-            }
-        }
-    
-        if (typeof successCallback === "function") {
-            successCallback(writer);
-        }       
-    }, errorCallback);
-};
-
-/**
- * Returns a File that represents the current state of the file that this FileEntry represents.
- *
- * @param {Function} successCallback is called with the new File object
- * @param {Function} errorCallback is called with a FileError
- */
-FileEntry.prototype.file = function(successCallback, errorCallback) {
-    PhoneGap.exec(successCallback, errorCallback, "File", "getFileMetadata", [this.fullPath]);
-};
-
-/** @constructor */
-var LocalFileSystem = function() {
-};
-
-// File error codes
-LocalFileSystem.TEMPORARY = 0;
-LocalFileSystem.PERSISTENT = 1;
-LocalFileSystem.RESOURCE = 2;
-LocalFileSystem.APPLICATION = 3;
-
-/**
- * Requests a filesystem in which to store application data.
- *
- * @param {int} type of file system being requested
- * @param {Function} successCallback is called with the new FileSystem
- * @param {Function} errorCallback is called with a FileError
- */
-LocalFileSystem.prototype.requestFileSystem = function(type, size, successCallback, errorCallback) {
-    if (type < 0 || type > 3) {
-        if (typeof errorCallback === "function") {
-            errorCallback({
-                "code": FileError.SYNTAX_ERR
-            });
-        }
-    }
-    else {
-        PhoneGap.exec(successCallback, errorCallback, "File", "requestFileSystem", [type, size]);
-    }
-};
-
-/**
- *
- * @param {DOMString} uri referring to a local file in a filesystem
- * @param {Function} successCallback is called with the new entry
- * @param {Function} errorCallback is called with a FileError
- */
-LocalFileSystem.prototype.resolveLocalFileSystemURI = function(uri, successCallback, errorCallback) {
-    PhoneGap.exec(successCallback, errorCallback, "File", "resolveLocalFileSystemURI", [uri]);
-};
-
-/**
-* This function returns and array of contacts.  It is required as we need to convert raw
-* JSON objects into concrete Contact objects.  Currently this method is called after
-* navigator.service.contacts.find but before the find methods success call back.
-*
-* @param a JSON Objects that need to be converted to DirectoryEntry or FileEntry objects.
-* @returns an entry
-*/
-LocalFileSystem.prototype._castFS = function(pluginResult) {
-    var entry = null;
-    entry = new DirectoryEntry();
-    entry.isDirectory = pluginResult.message.root.isDirectory;
-    entry.isFile = pluginResult.message.root.isFile;
-    entry.name = pluginResult.message.root.name;
-    entry.fullPath = pluginResult.message.root.fullPath;
-    pluginResult.message.root = entry;
-    return pluginResult;
-};
-
-LocalFileSystem.prototype._castEntry = function(pluginResult) {
-    var entry = null;
-    if (pluginResult.message.isDirectory) {
-        entry = new DirectoryEntry();
-    }
-    else if (pluginResult.message.isFile) {
-        entry = new FileEntry();
-    }
-    entry.isDirectory = pluginResult.message.isDirectory;
-    entry.isFile = pluginResult.message.isFile;
-    entry.name = pluginResult.message.name;
-    entry.fullPath = pluginResult.message.fullPath;
-    pluginResult.message = entry;
-    return pluginResult;
-};
-
-LocalFileSystem.prototype._castEntries = function(pluginResult) {
-    var entries = pluginResult.message;
-    var retVal = [];
-    for (var i=0; i<entries.length; i++) {
-        retVal.push(window.localFileSystem._createEntry(entries[i]));
-    }
-    pluginResult.message = retVal;
-    return pluginResult;
-};
-
-LocalFileSystem.prototype._createEntry = function(castMe) {
-    var entry = null;
-    if (castMe.isDirectory) {
-        entry = new DirectoryEntry();
-    }
-    else if (castMe.isFile) {
-        entry = new FileEntry();
-    }
-    entry.isDirectory = castMe.isDirectory;
-    entry.isFile = castMe.isFile;
-    entry.name = castMe.name;
-    entry.fullPath = castMe.fullPath;
-    return entry;
-};
-
-LocalFileSystem.prototype._castDate = function(pluginResult) {
-    if (pluginResult.message.modificationTime) {
-        var modTime = new Date(pluginResult.message.modificationTime);
-        pluginResult.message.modificationTime = modTime;
-    }
-    else if (pluginResult.message.lastModifiedDate) {
-        var file = new File();
-        file.size = pluginResult.message.size;
-        file.type = pluginResult.message.type;
-        file.name = pluginResult.message.name;
-        file.fullPath = pluginResult.message.fullPath;
-        file.lastModifiedDate = new Date(pluginResult.message.lastModifiedDate);
-        pluginResult.message = file;
-    }
-    return pluginResult;
-};
-
-/**
- * Add the FileSystem interface into the browser.
- */
-PhoneGap.addConstructor(function() {
-    var pgLocalFileSystem = new LocalFileSystem();
-    // Needed for cast methods
-    if (typeof window.localFileSystem === "undefined") {
-        window.localFileSystem = pgLocalFileSystem;
-    }
-    if (typeof window.requestFileSystem === "undefined") {
-        window.requestFileSystem = pgLocalFileSystem.requestFileSystem;
-    }
-    if (typeof window.resolveLocalFileSystemURI === "undefined") {
-        window.resolveLocalFileSystemURI = pgLocalFileSystem.resolveLocalFileSystemURI;
-    }
-});
-}/*
- *     Licensed to the Apache Software Foundation (ASF) under one
- *     or more contributor license agreements.  See the NOTICE file
- *     distributed with this work for additional information
- *     regarding copyright ownership.  The ASF licenses this file
- *     to you 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.
- */
-
-if (!PhoneGap.hasResource("filetransfer")) {
-PhoneGap.addResource("filetransfer");
-
-/**
- * FileTransfer uploads a file to a remote server.
- * @constructor
- */
-var FileTransfer = function() {};
-
-/**
- * FileUploadResult
- * @constructor
- */
-var FileUploadResult = function() {
-    this.bytesSent = 0;
-    this.responseCode = null;
-    this.response = null;
-};
-
-/**
- * FileTransferError
- * @constructor
- */
-var FileTransferError = function() {
-    this.code = null;
-};
-
-FileTransferError.FILE_NOT_FOUND_ERR = 1;
-FileTransferError.INVALID_URL_ERR = 2;
-FileTransferError.CONNECTION_ERR = 3;
-
-/**
-* Given an absolute file path, uploads a file on the device to a remote server
-* using a multipart HTTP request.
-* @param filePath {String}           Full path of the file on the device
-* @param server {String}             URL of the server to receive the file
-* @param successCallback (Function}  Callback to be invoked when upload has completed
-* @param errorCallback {Function}    Callback to be invoked upon error
-* @param options {FileUploadOptions} Optional parameters such as file name and mimetype
-*/
-FileTransfer.prototype.upload = function(filePath, server, successCallback, errorCallback, options, debug) {
-
-    // check for options
-    var fileKey = null;
-    var fileName = null;
-    var mimeType = null;
-    var params = null;
-    var chunkedMode = true;
-    if (options) {
-        fileKey = options.fileKey;
-        fileName = options.fileName;
-        mimeType = options.mimeType;
-        if (options.chunkedMode !== null || typeof options.chunkedMode !== "undefined") {
-            chunkedMode = options.chunkedMode;
-        }
-        if (options.params) {
-            params = options.params;
-        }
-        else {
-            params = {};
-        }
-    }
-
-    PhoneGap.exec(successCallback, errorCallback, 'FileTransfer', 'upload', [filePath, server, fileKey, fileName, mimeType, params, debug, chunkedMode]);
-};
-
-/**
- * Downloads a file form a given URL and saves it to the specified directory.
- * @param source {String}          URL of the server to receive the file
- * @param target {String}         Full path of the file on the device
- * @param successCallback (Function}  Callback to be invoked when upload has completed
- * @param errorCallback {Function}    Callback to be invoked upon error
- */
-FileTransfer.prototype.download = function(source, target, successCallback, errorCallback) {
-    PhoneGap.exec(successCallback, errorCallback, 'FileTransfer', 'download', [source, target]);
-};
-
-/**
- * Options to customize the HTTP request used to upload files.
- * @constructor
- * @param fileKey {String}   Name of file request parameter.
- * @param fileName {String}  Filename to be used by the server. Defaults to image.jpg.
- * @param mimeType {String}  Mimetype of the uploaded file. Defaults to image/jpeg.
- * @param params {Object}    Object with key: value params to send to the server.
- */
-var FileUploadOptions = function(fileKey, fileName, mimeType, params) {
-    this.fileKey = fileKey || null;
-    this.fileName = fileName || null;
-    this.mimeType = mimeType || null;
-    this.params = params || null;
-};
-}
-/*
- *     Licensed to the Apache Software Foundation (ASF) under one
- *     or more contributor license agreements.  See the NOTICE file
- *     distributed with this work for additional information
- *     regarding copyright ownership.  The ASF licenses this file
- *     to you 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.
- */
-
-if (!PhoneGap.hasResource("geolocation")) {
-PhoneGap.addResource("geolocation");
-
-/**
- * This class provides access to device GPS data.
- * @constructor
- */
-var Geolocation = function() {
-
-    // The last known GPS position.
-    this.lastPosition = null;
-
-    // Geolocation listeners
-    this.listeners = {};
-};
-
-/**
- * Position error object
- *
- * @constructor
- * @param code
- * @param message
- */
-var PositionError = function(code, message) {
-    this.code = code;
-    this.message = message;
-};
-
-PositionError.PERMISSION_DENIED = 1;
-PositionError.POSITION_UNAVAILABLE = 2;
-PositionError.TIMEOUT = 3;
-
-/**
- * Asynchronously aquires the current position.
- *
- * @param {Function} successCallback    The function to call when the position data is available
- * @param {Function} errorCallback      The function to call when there is an error getting the heading position. (OPTIONAL)
- * @param {PositionOptions} options     The options for getting the position data. (OPTIONAL)
- */
-Geolocation.prototype.getCurrentPosition = function(successCallback, errorCallback, options) {
-    if (navigator._geo.listeners.global) {
-        console.log("Geolocation Error: Still waiting for previous getCurrentPosition() request.");
-        try {
-            errorCallback(new PositionError(PositionError.TIMEOUT, "Geolocation Error: Still waiting for previous getCurrentPosition() request."));
-        } catch (e) {
-        }
-        return;
-    }
-    var maximumAge = 10000;
-    var enableHighAccuracy = false;
-    var timeout = 10000;
-    if (typeof options !== "undefined") {
-        if (typeof options.maximumAge !== "undefined") {
-            maximumAge = options.maximumAge;
-        }
-        if (typeof options.enableHighAccuracy !== "undefined") {
-            enableHighAccuracy = options.enableHighAccuracy;
-        }
-        if (typeof options.timeout !== "undefined") {
-            timeout = options.timeout;
-        }
-    }
-    navigator._geo.listeners.global = {"success" : successCallback, "fail" : errorCallback };
-    PhoneGap.exec(null, null, "Geolocation", "getCurrentLocation", [enableHighAccuracy, timeout, maximumAge]);
-};
-
-/**
- * Asynchronously watches the geolocation for changes to geolocation.  When a change occurs,
- * the successCallback is called with the new location.
- *
- * @param {Function} successCallback    The function to call each time the location data is available
- * @param {Function} errorCallback      The function to call when there is an error getting the location data. (OPTIONAL)
- * @param {PositionOptions} options     The options for getting the location data such as frequency. (OPTIONAL)
- * @return String                       The watch id that must be passed to #clearWatch to stop watching.
- */
-Geolocation.prototype.watchPosition = function(successCallback, errorCallback, options) {
-    var maximumAge = 10000;
-    var enableHighAccuracy = false;
-    var timeout = 10000;
-    if (typeof options !== "undefined") {
-        if (typeof options.frequency  !== "undefined") {
-            maximumAge = options.frequency;
-        }
-        if (typeof options.maximumAge !== "undefined") {
-            maximumAge = options.maximumAge;
-        }
-        if (typeof options.enableHighAccuracy !== "undefined") {
-            enableHighAccuracy = options.enableHighAccuracy;
-        }
-        if (typeof options.timeout !== "undefined") {
-            timeout = options.timeout;
-        }
-    }
-    var id = PhoneGap.createUUID();
-    navigator._geo.listeners[id] = {"success" : successCallback, "fail" : errorCallback };
-    PhoneGap.exec(null, null, "Geolocation", "start", [id, enableHighAccuracy, timeout, maximumAge]);
-    return id;
-};
-
-/*
- * Native callback when watch position has a new position.
- * PRIVATE METHOD
- *
- * @param {String} id
- * @param {Number} lat
- * @param {Number} lng
- * @param {Number} alt
- * @param {Number} altacc
- * @param {Number} head
- * @param {Number} vel
- * @param {Number} stamp
- */
-Geolocation.prototype.success = function(id, lat, lng, alt, altacc, head, vel, stamp) {
-    var coords = new Coordinates(lat, lng, alt, altacc, head, vel);
-    var loc = new Position(coords, stamp);
-    try {
-        if (lat === "undefined" || lng === "undefined") {
-            navigator._geo.listeners[id].fail(new PositionError(PositionError.POSITION_UNAVAILABLE, "Lat/Lng are undefined."));
-        }
-        else {
-            navigator._geo.lastPosition = loc;
-            navigator._geo.listeners[id].success(loc);
-        }
-    }
-    catch (e) {
-        console.log("Geolocation Error: Error calling success callback function.");
-    }
-
-    if (id === "global") {
-        delete navigator._geo.listeners.global;
-    }
-};
-
-/**
- * Native callback when watch position has an error.
- * PRIVATE METHOD
- *
- * @param {String} id       The ID of the watch
- * @param {Number} code     The error code
- * @param {String} msg      The error message
- */
-Geolocation.prototype.fail = function(id, code, msg) {
-    try {
-        navigator._geo.listeners[id].fail(new PositionError(code, msg));
-    }
-    catch (e) {
-        console.log("Geolocation Error: Error calling error callback function.");
-    }
-};
-
-/**
- * Clears the specified heading watch.
- *
- * @param {String} id       The ID of the watch returned from #watchPosition
- */
-Geolocation.prototype.clearWatch = function(id) {
-    PhoneGap.exec(null, null, "Geolocation", "stop", [id]);
-    delete navigator._geo.listeners[id];
-};
-
-/**
- * Force the PhoneGap geolocation to be used instead of built-in.
- */
-Geolocation.usingPhoneGap = false;
-Geolocation.usePhoneGap = function() {
-    if (Geolocation.usingPhoneGap) {
-        return;
-    }
-    Geolocation.usingPhoneGap = true;
-
-    // Set built-in geolocation methods to our own implementations
-    // (Cannot replace entire geolocation, but can replace individual methods)
-    navigator.geolocation.setLocation = navigator._geo.setLocation;
-    navigator.geolocation.getCurrentPosition = navigator._geo.getCurrentPosition;
-    navigator.geolocation.watchPosition = navigator._geo.watchPosition;
-    navigator.geolocation.clearWatch = navigator._geo.clearWatch;
-    navigator.geolocation.start = navigator._geo.start;
-    navigator.geolocation.stop = navigator._geo.stop;
-};
-
-PhoneGap.addConstructor(function() {
-    navigator._geo = new Geolocation();
-
-    // No native geolocation object for Android 1.x, so use PhoneGap geolocation
-    if (typeof navigator.geolocation === 'undefined') {
-        navigator.geolocation = navigator._geo;
-        Geolocation.usingPhoneGap = true;
-    }
-});
-}
-/*
- *     Licensed to the Apache Software Foundation (ASF) under one
- *     or more contributor license agreements.  See the NOTICE file
- *     distributed with this work for additional information
- *     regarding copyright ownership.  The ASF licenses this file
- *     to you 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.
- */
-
-if (!PhoneGap.hasResource("media")) {
-PhoneGap.addResource("media");
-
-/**
- * This class provides access to the device media, interfaces to both sound and video
- *
- * @constructor
- * @param src                   The file name or url to play
- * @param successCallback       The callback to be called when the file is done playing or recording.
- *                                  successCallback() - OPTIONAL
- * @param errorCallback         The callback to be called if there is an error.
- *                                  errorCallback(int errorCode) - OPTIONAL
- * @param statusCallback        The callback to be called when media status has changed.
- *                                  statusCallback(int statusCode) - OPTIONAL
- * @param positionCallback      The callback to be called when media position has changed.
- *                                  positionCallback(long position) - OPTIONAL
- */
-var Media = function(src, successCallback, errorCallback, statusCallback, positionCallback) {
-
-    // successCallback optional
-    if (successCallback && (typeof successCallback !== "function")) {
-        console.log("Media Error: successCallback is not a function");
-        return;
-    }
-
-    // errorCallback optional
-    if (errorCallback && (typeof errorCallback !== "function")) {
-        console.log("Media Error: errorCallback is not a function");
-        return;
-    }
-
-    // statusCallback optional
-    if (statusCallback && (typeof statusCallback !== "function")) {
-        console.log("Media Error: statusCallback is not a function");
-        return;
-    }
-
-    // statusCallback optional
-    if (positionCallback && (typeof positionCallback !== "function")) {
-        console.log("Media Error: positionCallback is not a function");
-        return;
-    }
-
-    this.id = PhoneGap.createUUID();
-    PhoneGap.mediaObjects[this.id] = this;
-    this.src = src;
-    this.successCallback = successCallback;
-    this.errorCallback = errorCallback;
-    this.statusCallback = statusCallback;
-    this.positionCallback = positionCallback;
-    this._duration = -1;
-    this._position = -1;
-};
-
-// Media messages
-Media.MEDIA_STATE = 1;
-Media.MEDIA_DURATION = 2;
-Media.MEDIA_POSITION = 3;
-Media.MEDIA_ERROR = 9;
-
-// Media states
-Media.MEDIA_NONE = 0;
-Media.MEDIA_STARTING = 1;
-Media.MEDIA_RUNNING = 2;
-Media.MEDIA_PAUSED = 3;
-Media.MEDIA_STOPPED = 4;
-Media.MEDIA_MSG = ["None", "Starting", "Running", "Paused", "Stopped"];
-
-// TODO: Will MediaError be used?
-/**
- * This class contains information about any Media errors.
- * @constructor
- */
-var MediaError = function() {
-    this.code = null;
-    this.message = "";
-};
-
-MediaError.MEDIA_ERR_NONE_ACTIVE    = 0;
-MediaError.MEDIA_ERR_ABORTED        = 1;
-MediaError.MEDIA_ERR_NETWORK        = 2;
-MediaError.MEDIA_ERR_DECODE         = 3;
-MediaError.MEDIA_ERR_NONE_SUPPORTED = 4;
-
-/**
- * Start or resume playing audio file.
- */
-Media.prototype.play = function() {
-    PhoneGap.exec(null, null, "Media", "startPlayingAudio", [this.id, this.src]);
-};
-
-/**
- * Stop playing audio file.
- */
-Media.prototype.stop = function() {
-    return PhoneGap.exec(null, null, "Media", "stopPlayingAudio", [this.id]);
-};
-
-/**
- * Seek or jump to a new time in the track..
- */
-Media.prototype.seekTo = function(milliseconds) {
-    PhoneGap.exec(null, null, "Media", "seekToAudio", [this.id, milliseconds]);
-};
-
-/**
- * Pause playing audio file.
- */
-Media.prototype.pause = function() {
-    PhoneGap.exec(null, null, "Media", "pausePlayingAudio", [this.id]);
-};
-
-/**
- * Get duration of an audio file.
- * The duration is only set for audio that is playing, paused or stopped.
- *
- * @return      duration or -1 if not known.
- */
-Media.prototype.getDuration = function() {
-    return this._duration;
-};
-
-/**
- * Get position of audio.
- */
-Media.prototype.getCurrentPosition = function(success, fail) {
-    PhoneGap.exec(success, fail, "Media", "getCurrentPositionAudio", [this.id]);
-};
-
-/**
- * Start recording audio file.
- */
-Media.prototype.startRecord = function() {
-    PhoneGap.exec(null, null, "Media", "startRecordingAudio", [this.id, this.src]);
-};
-
-/**
- * Stop recording audio file.
- */
-Media.prototype.stopRecord = function() {
-    PhoneGap.exec(null, null, "Media", "stopRecordingAudio", [this.id]);
-};
-
-/**
- * Release the resources.
- */
-Media.prototype.release = function() {
-    PhoneGap.exec(null, null, "Media", "release", [this.id]);
-};
-
-/**
- * Adjust the volume.
- */
-Media.prototype.setVolume = function(volume) {
-    PhoneGap.exec(null, null, "Media", "setVolume", [this.id, volume]);
-};
-
-/**
- * List of media objects.
- * PRIVATE
- */
-PhoneGap.mediaObjects = {};
-
-/**
- * Object that receives native callbacks.
- * PRIVATE
- * @constructor
- */
-PhoneGap.Media = function() {};
-
-/**
- * Get the media object.
- * PRIVATE
- *
- * @param id            The media object id (string)
- */
-PhoneGap.Media.getMediaObject = function(id) {
-    return PhoneGap.mediaObjects[id];
-};
-
-/**
- * Audio has status update.
- * PRIVATE
- *
- * @param id            The media object id (string)
- * @param status        The status code (int)
- * @param msg           The status message (string)
- */
-PhoneGap.Media.onStatus = function(id, msg, value) {
-    var media = PhoneGap.mediaObjects[id];
-    // If state update
-    if (msg === Media.MEDIA_STATE) {
-        if (value === Media.MEDIA_STOPPED) {
-            if (media.successCallback) {
-                media.successCallback();
-            }
-        }
-        if (media.statusCallback) {
-            media.statusCallback(value);
-        }
-    }
-    else if (msg === Media.MEDIA_DURATION) {
-        media._duration = value;
-    }
-    else if (msg === Media.MEDIA_ERROR) {
-        if (media.errorCallback) {
-            media.errorCallback({"code":value});
-        }
-    }
-    else if (msg === Media.MEDIA_POSITION) {
-        media._position = value;
-    }
-};
-}
-/*
- *     Licensed to the Apache Software Foundation (ASF) under one
- *     or more contributor license agreements.  See the NOTICE file
- *     distributed with this work for additional information
- *     regarding copyright ownership.  The ASF licenses this file
- *     to you 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.
- */
-
-
-if (!PhoneGap.hasResource("network")) {
-PhoneGap.addResource("network");
-
-/**
- * This class contains information about the current network Connection.
- * @constructor
- */
-var Connection = function() {
-    this.type = null;
-    this._firstRun = true;
-    this._timer = null;
-    this.timeout = 500;
-
-    var me = this;
-    this.getInfo(
-        function(type) {
-            // Need to send events if we are on or offline
-            if (type === "none") {
-                // set a timer if still offline at the end of timer send the offline event
-                me._timer = setTimeout(function(){
-                    me.type = type;
-                    PhoneGap.fireDocumentEvent('offline');
-                    me._timer = null;
-                    }, me.timeout);
-            } else {
-                // If there is a current offline event pending clear it
-                if (me._timer !== null) {
-                    clearTimeout(me._timer);
-                    me._timer = null;
-                }
-                me.type = type;
-                PhoneGap.fireDocumentEvent('online');
-            }
-            
-            // should only fire this once
-            if (me._firstRun) {
-                me._firstRun = false;
-                PhoneGap.onPhoneGapConnectionReady.fire();
-            }            
-        },
-        function(e) {
-            // If we can't get the network info we should still tell PhoneGap
-            // to fire the deviceready event.
-            if (me._firstRun) {
-                me._firstRun = false;
-                PhoneGap.onPhoneGapConnectionReady.fire();
-            }            
-            console.log("Error initializing Network Connection: " + e);
-        });
-};
-
-Connection.UNKNOWN = "unknown";
-Connection.ETHERNET = "ethernet";
-Connection.WIFI = "wifi";
-Connection.CELL_2G = "2g";
-Connection.CELL_3G = "3g";
-Connection.CELL_4G = "4g";
-Connection.NONE = "none";
-
-/**
- * Get connection info
- *
- * @param {Function} successCallback The function to call when the Connection data is available
- * @param {Function} errorCallback The function to call when there is an error getting the Connection data. (OPTIONAL)
- */
-Connection.prototype.getInfo = function(successCallback, errorCallback) {
-    // Get info
-    PhoneGap.exec(successCallback, errorCallback, "Network Status", "getConnectionInfo", []);
-};
-
-
-PhoneGap.addConstructor(function() {
-    if (typeof navigator.network === "undefined") {
-        navigator.network = {};
-    }
-    if (typeof navigator.network.connection === "undefined") {
-        navigator.network.connection = new Connection();
-    }
-});
-}
-/*
- *     Licensed to the Apache Software Foundation (ASF) under one
- *     or more contributor license agreements.  See the NOTICE file
- *     distributed with this work for additional information
- *     regarding copyright ownership.  The ASF licenses this file
- *     to you 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.
- */
-
-if (!PhoneGap.hasResource("notification")) {
-PhoneGap.addResource("notification");
-
-/**
- * This class provides access to notifications on the device.
- * @constructor
- */
-var Notification = function() {
-};
-
-/**
- * Open a native alert dialog, with a customizable title and button text.
- *
- * @param {String} message              Message to print in the body of the alert
- * @param {Function} completeCallback   The callback that is called when user clicks on a button.
- * @param {String} title                Title of the alert dialog (default: Alert)
- * @param {String} buttonLabel          Label of the close button (default: OK)
- */
-Notification.prototype.alert = function(message, completeCallback, title, buttonLabel) {
-    var _title = (title || "Alert");
-    var _buttonLabel = (buttonLabel || "OK");
-    PhoneGap.exec(completeCallback, null, "Notification", "alert", [message,_title,_buttonLabel]);
-};
-
-/**
- * Open a native confirm dialog, with a customizable title and button text.
- * The result that the user selects is returned to the result callback.
- *
- * @param {String} message              Message to print in the body of the alert
- * @param {Function} resultCallback     The callback that is called when user clicks on a button.
- * @param {String} title                Title of the alert dialog (default: Confirm)
- * @param {String} buttonLabels         Comma separated list of the labels of the buttons (default: 'OK,Cancel')
- */
-Notification.prototype.confirm = function(message, resultCallback, title, buttonLabels) {
-    var _title = (title || "Confirm");
-    var _buttonLabels = (buttonLabels || "OK,Cancel");
-    PhoneGap.exec(resultCallback, null, "Notification", "confirm", [message,_title,_buttonLabels]);
-};
-
-/**
- * Start spinning the activity indicator on the statusbar
- */
-Notification.prototype.activityStart = function() {
-    PhoneGap.exec(null, null, "Notification", "activityStart", ["Busy","Please wait..."]);
-};
-
-/**
- * Stop spinning the activity indicator on the statusbar, if it's currently spinning
- */
-Notification.prototype.activityStop = function() {
-    PhoneGap.exec(null, null, "Notification", "activityStop", []);
-};
-
-/**
- * Display a progress dialog with progress bar that goes from 0 to 100.
- *
- * @param {String} title        Title of the progress dialog.
- * @param {String} message      Message to display in the dialog.
- */
-Notification.prototype.progressStart = function(title, message) {
-    PhoneGap.exec(null, null, "Notification", "progressStart", [title, message]);
-};
-
-/**
- * Set the progress dialog value.
- *
- * @param {Number} value         0-100
- */
-Notification.prototype.progressValue = function(value) {
-    PhoneGap.exec(null, null, "Notification", "progressValue", [value]);
-};
-
-/**
- * Close the progress dialog.
- */
-Notification.prototype.progressStop = function() {
-    PhoneGap.exec(null, null, "Notification", "progressStop", []);
-};
-
-/**
- * Causes the device to blink a status LED.
- *
- * @param {Integer} count       The number of blinks.
- * @param {String} colour       The colour of the light.
- */
-Notification.prototype.blink = function(count, colour) {
-    // NOT IMPLEMENTED
-};
-
-/**
- * Causes the device to vibrate.
- *
- * @param {Integer} mills       The number of milliseconds to vibrate for.
- */
-Notification.prototype.vibrate = function(mills) {
-    PhoneGap.exec(null, null, "Notification", "vibrate", [mills]);
-};
-
-/**
- * Causes the device to beep.
- * On Android, the default notification ringtone is played "count" times.
- *
- * @param {Integer} count       The number of beeps.
- */
-Notification.prototype.beep = function(count) {
-    PhoneGap.exec(null, null, "Notification", "beep", [count]);
-};
-
-PhoneGap.addConstructor(function() {
-    if (typeof navigator.notification === "undefined") {
-        navigator.notification = new Notification();
-    }
-});
-}
-/*
- *     Licensed to the Apache Software Foundation (ASF) under one
- *     or more contributor license agreements.  See the NOTICE file
- *     distributed with this work for additional information
- *     regarding copyright ownership.  The ASF licenses this file
- *     to you 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.
- */
-
-if (!PhoneGap.hasResource("position")) {
-PhoneGap.addResource("position");
-
-/**
- * This class contains position information.
- * @param {Object} lat
- * @param {Object} lng
- * @param {Object} acc
- * @param {Object} alt
- * @param {Object} altacc
- * @param {Object} head
- * @param {Object} vel
- * @constructor
- */
-var Position = function(coords, timestamp) {
-	this.coords = coords;
-	this.timestamp = (timestamp !== 'undefined') ? timestamp : new Date().getTime();
-};
-
-/** @constructor */
-var Coordinates = function(lat, lng, alt, acc, head, vel, altacc) {
-	/**
-	 * The latitude of the position.
-	 */
-	this.latitude = lat;
-	/**
-	 * The longitude of the position,
-	 */
-	this.longitude = lng;
-	/**
-	 * The accuracy of the position.
-	 */
-	this.accuracy = acc;
-	/**
-	 * The altitude of the position.
-	 */
-	this.altitude = alt;
-	/**
-	 * The direction the device is moving at the position.
-	 */
-	this.heading = head;
-	/**
-	 * The velocity with which the device is moving at the position.
-	 */
-	this.speed = vel;
-	/**
-	 * The altitude accuracy of the position.
-	 */
-	this.altitudeAccuracy = (altacc !== 'undefined') ? altacc : null;
-};
-
-/**
- * This class specifies the options for requesting position data.
- * @constructor
- */
-var PositionOptions = function() {
-	/**
-	 * Specifies the desired position accuracy.
-	 */
-	this.enableHighAccuracy = true;
-	/**
-	 * The timeout after which if position data cannot be obtained the errorCallback
-	 * is called.
-	 */
-	this.timeout = 10000;
-};
-
-/**
- * This class contains information about any GSP errors.
- * @constructor
- */
-var PositionError = function() {
-	this.code = null;
-	this.message = "";
-};
-
-PositionError.UNKNOWN_ERROR = 0;
-PositionError.PERMISSION_DENIED = 1;
-PositionError.POSITION_UNAVAILABLE = 2;
-PositionError.TIMEOUT = 3;
-}
-/*
- *     Licensed to the Apache Software Foundation (ASF) under one
- *     or more contributor license agreements.  See the NOTICE file
- *     distributed with this work for additional information
- *     regarding copyright ownership.  The ASF licenses this file
- *     to you 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 is purely for the Android 1.5/1.6 HTML 5 Storage
- * I was hoping that Android 2.0 would deprecate this, but given the fact that
- * most manufacturers ship with Android 1.5 and do not do OTA Updates, this is required
- */
-
-if (!PhoneGap.hasResource("storage")) {
-PhoneGap.addResource("storage");
-
-/**
- * SQL result set object
- * PRIVATE METHOD
- * @constructor
- */
-var DroidDB_Rows = function() {
-    this.resultSet = [];    // results array
-    this.length = 0;        // number of rows
-};
-
-/**
- * Get item from SQL result set
- *
- * @param row           The row number to return
- * @return              The row object
- */
-DroidDB_Rows.prototype.item = function(row) {
-    return this.resultSet[row];
-};
-
-/**
- * SQL result set that is returned to user.
- * PRIVATE METHOD
- * @constructor
- */
-var DroidDB_Result = function() {
-    this.rows = new DroidDB_Rows();
-};
-
-/**
- * Storage object that is called by native code when performing queries.
- * PRIVATE METHOD
- * @constructor
- */
-var DroidDB = function() {
-    this.queryQueue = {};
-};
-
-/**
- * Callback from native code when query is complete.
- * PRIVATE METHOD
- *
- * @param id                Query id
- */
-DroidDB.prototype.completeQuery = function(id, data) {
-    var query = this.queryQueue[id];
-    if (query) {
-        try {
-            delete this.queryQueue[id];
-
-            // Get transaction
-            var tx = query.tx;
-
-            // If transaction hasn't failed
-            // Note: We ignore all query results if previous query
-            //       in the same transaction failed.
-            if (tx && tx.queryList[id]) {
-
-                // Save query results
-                var r = new DroidDB_Result();
-                r.rows.resultSet = data;
-                r.rows.length = data.length;
-                try {
-                    if (typeof query.successCallback === 'function') {
-                        query.successCallback(query.tx, r);
-                    }
-                } catch (ex) {
-                    console.log("executeSql error calling user success callback: "+ex);
-                }
-
-                tx.queryComplete(id);
-            }
-        } catch (e) {
-            console.log("executeSql error: "+e);
-        }
-    }
-};
-
-/**
- * Callback from native code when query fails
- * PRIVATE METHOD
- *
- * @param reason            Error message
- * @param id                Query id
- */
-DroidDB.prototype.fail = function(reason, id) {
-    var query = this.queryQueue[id];
-    if (query) {
-        try {
-            delete this.queryQueue[id];
-
-            // Get transaction
-            var tx = query.tx;
-
-            // If transaction hasn't failed
-            // Note: We ignore all query results if previous query
-            //       in the same transaction failed.
-            if (tx && tx.queryList[id]) {
-                tx.queryList = {};
-
-                try {
-                    if (typeof query.errorCallback === 'function') {
-                        query.errorCallback(query.tx, reason);
-                    }
-                } catch (ex) {
-                    console.log("executeSql error calling user error callback: "+ex);
-                }
-
-                tx.queryFailed(id, reason);
-            }
-
-        } catch (e) {
-            console.log("executeSql error: "+e);
-        }
-    }
-};
-
-/**
- * SQL query object
- * PRIVATE METHOD
- *
- * @constructor
- * @param tx                The transaction object that this query belongs to
- */
-var DroidDB_Query = function(tx) {
-
-    // Set the id of the query
-    this.id = PhoneGap.createUUID();
-
-    // Add this query to the queue
-    droiddb.queryQueue[this.id] = this;
-
-    // Init result
-    this.resultSet = [];
-
-    // Set transaction that this query belongs to
-    this.tx = tx;
-
-    // Add this query to transaction list
-    this.tx.queryList[this.id] = this;
-
-    // Callbacks
-    this.successCallback = null;
-    this.errorCallback = null;
-
-};
-
-/**
- * Transaction object
- * PRIVATE METHOD
- * @constructor
- */
-var DroidDB_Tx = function() {
-
-    // Set the id of the transaction
-    this.id = PhoneGap.createUUID();
-
-    // Callbacks
-    this.successCallback = null;
-    this.errorCallback = null;
-
-    // Query list
-    this.queryList = {};
-};
-
-/**
- * Mark query in transaction as complete.
- * If all queries are complete, call the user's transaction success callback.
- *
- * @param id                Query id
- */
-DroidDB_Tx.prototype.queryComplete = function(id) {
-    delete this.queryList[id];
-
-    // If no more outstanding queries, then fire transaction success
-    if (this.successCallback) {
-        var count = 0;
-        var i;
-        for (i in this.queryList) {
-            if (this.queryList.hasOwnProperty(i)) {
-                count++;
-            }
-        }
-        if (count === 0) {
-            try {
-                this.successCallback();
-            } catch(e) {
-                console.log("Transaction error calling user success callback: " + e);
-            }
-        }
-    }
-};
-
-/**
- * Mark query in transaction as failed.
- *
- * @param id                Query id
- * @param reason            Error message
- */
-DroidDB_Tx.prototype.queryFailed = function(id, reason) {
-
-    // The sql queries in this transaction have already been run, since
-    // we really don't have a real transaction implemented in native code.
-    // However, the user callbacks for the remaining sql queries in transaction
-    // will not be called.
-    this.queryList = {};
-
-    if (this.errorCallback) {
-        try {
-            this.errorCallback(reason);
-        } catch(e) {
-            console.log("Transaction error calling user error callback: " + e);
-        }
-    }
-};
-
-/**
- * Execute SQL statement
- *
- * @param sql                   SQL statement to execute
- * @param params                Statement parameters
- * @param successCallback       Success callback
- * @param errorCallback         Error callback
- */
-DroidDB_Tx.prototype.executeSql = function(sql, params, successCallback, errorCallback) {
-
-    // Init params array
-    if (typeof params === 'undefined') {
-        params = [];
-    }
-
-    // Create query and add to queue
-    var query = new DroidDB_Query(this);
-    droiddb.queryQueue[query.id] = query;
-
-    // Save callbacks
-    query.successCallback = successCallback;
-    query.errorCallback = errorCallback;
-
-    // Call native code
-    PhoneGap.exec(null, null, "Storage", "executeSql", [sql, params, query.id]);
-};
-
-var DatabaseShell = function() {
-};
-
-/**
- * Start a transaction.
- * Does not support rollback in event of failure.
- *
- * @param process {Function}            The transaction function
- * @param successCallback {Function}
- * @param errorCallback {Function}
- */
-DatabaseShell.prototype.transaction = function(process, errorCallback, successCallback) {
-    var tx = new DroidDB_Tx();
-    tx.successCallback = successCallback;
-    tx.errorCallback = errorCallback;
-    try {
-        process(tx);
-    } catch (e) {
-        console.log("Transaction error: "+e);
-        if (tx.errorCallback) {
-            try {
-                tx.errorCallback(e);
-            } catch (ex) {
-                console.log("Transaction error calling user error callback: "+e);
-            }
-        }
-    }
-};
-
-/**
- * Open database
- *
- * @param name              Database name
- * @param version           Database version
- * @param display_name      Database display name
- * @param size              Database size in bytes
- * @return                  Database object
- */
-var DroidDB_openDatabase = function(name, version, display_name, size) {
-    PhoneGap.exec(null, null, "Storage", "openDatabase", [name, version, display_name, size]);
-    var db = new DatabaseShell();
-    return db;
-};
-
-/**
- * For browsers with no localStorage we emulate it with SQLite. Follows the w3c api.
- * TODO: Do similar for sessionStorage.
- */
-
-/**
- * @constructor
- */
-var CupcakeLocalStorage = function() {
-    try {
-
-      this.db = openDatabase('localStorage', '1.0', 'localStorage', 2621440);
-      var storage = {};
-      this.length = 0;
-      function setLength (length) {
-        this.length = length;
-        localStorage.length = length;
-      }
-      this.db.transaction(
-        function (transaction) {
-            var i;
-          transaction.executeSql('CREATE TABLE IF NOT EXISTS storage (id NVARCHAR(40) PRIMARY KEY, body NVARCHAR(255))');
-          transaction.executeSql('SELECT * FROM storage', [], function(tx, result) {
-            for(var i = 0; i < result.rows.length; i++) {
-              storage[result.rows.item(i)['id']] =  result.rows.item(i)['body'];
-            }
-            setLength(result.rows.length);
-            PhoneGap.initializationComplete("cupcakeStorage");
-          });
-
-        },
-        function (err) {
-          alert(err.message);
-        }
-      );
-      this.setItem = function(key, val) {
-        if (typeof(storage[key])=='undefined') {
-          this.length++;
-        }
-        storage[key] = val;
-        this.db.transaction(
-          function (transaction) {
-            transaction.executeSql('CREATE TABLE IF NOT EXISTS storage (id NVARCHAR(40) PRIMARY KEY, body NVARCHAR(255))');
-            transaction.executeSql('REPLACE INTO storage (id, body) values(?,?)', [key,val]);
-          }
-        );
-      };
-      this.getItem = function(key) {
-        return storage[key];
-      };
-      this.removeItem = function(key) {
-        delete storage[key];
-        this.length--;
-        this.db.transaction(
-          function (transaction) {
-            transaction.executeSql('CREATE TABLE IF NOT EXISTS storage (id NVARCHAR(40) PRIMARY KEY, body NVARCHAR(255))');
-            transaction.executeSql('DELETE FROM storage where id=?', [key]);
-          }
-        );
-      };
-      this.clear = function() {
-        storage = {};
-        this.length = 0;
-        this.db.transaction(
-          function (transaction) {
-            transaction.executeSql('CREATE TABLE IF NOT EXISTS storage (id NVARCHAR(40) PRIMARY KEY, body NVARCHAR(255))');
-            transaction.executeSql('DELETE FROM storage', []);
-          }
-        );
-      };
-      this.key = function(index) {
-        var i = 0;
-        for (var j in storage) {
-          if (i==index) {
-            return j;
-          } else {
-            i++;
-          }
-        }
-        return null;
-      };
-
-    } catch(e) {
-      alert("Database error "+e+".");
-        return;
-    }
-};
-
-PhoneGap.addConstructor(function() {
-    var setupDroidDB = function() {
-        navigator.openDatabase = window.openDatabase = DroidDB_openDatabase;
-        window.droiddb = new DroidDB();
-    }
-    if (typeof window.openDatabase === "undefined") {
-        setupDroidDB();
-    } else {
-        window.openDatabase_orig = window.openDatabase;
-        window.openDatabase = function(name, version, desc, size){
-            // Some versions of Android will throw a SECURITY_ERR so we need 
-            // to catch the exception and seutp our own DB handling.
-            var db = null;
-            try {
-                db = window.openDatabase_orig(name, version, desc, size);
-            } 
-            catch (ex) {
-                db = null;
-            }
-
-            if (db == null) {
-                setupDroidDB();
-                return DroidDB_openDatabase(name, version, desc, size);
-            }
-            else {
-                return db;
-            }
-        };
-    }
-    
-    if ((typeof window.localStorage == "undefined") || (window.localStorage == null)) {
-        navigator.localStorage = window.localStorage = new CupcakeLocalStorage();
-        PhoneGap.waitForInitialization("cupcakeStorage");
-    }
-});
-}
diff --git a/apps/files_odfviewer/src/webodf/programs/android/assets/www/scripts.js b/apps/files_odfviewer/src/webodf/programs/android/assets/www/scripts.js
deleted file mode 100644
index dd3b76fb99..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/android/assets/www/scripts.js
+++ /dev/null
@@ -1,4123 +0,0 @@
-/*     PhoneGap v1.4.0 */
-/*
-       Licensed to the Apache Software Foundation (ASF) under one
-       or more contributor license agreements.  See the NOTICE file
-       distributed with this work for additional information
-       regarding copyright ownership.  The ASF licenses this file
-       to you 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.
-*/
-
-
-/*
- * Some base contributions
- * Copyright (c) 2011, Proyectos Equis Ka, S.L.
- */
-
-if (typeof PhoneGap === "undefined") {
-
-if (typeof(DeviceInfo) !== 'object'){
-    DeviceInfo = {};
-}
-/**
- * This represents the PhoneGap API itself, and provides a global namespace for accessing
- * information about the state of PhoneGap.
- * @class
- */
-PhoneGap = {
-    // This queue holds the currently executing command and all pending
-    // commands executed with PhoneGap.exec().
-    commandQueue: [],
-    // Indicates if we're currently in the middle of flushing the command
-    // queue on the native side.
-    commandQueueFlushing: false,
-    _constructors: [],
-    documentEventHandler: {},   // Collection of custom document event handlers
-    windowEventHandler: {} 
-};
-
-/**
- * List of resource files loaded by PhoneGap.
- * This is used to ensure JS and other files are loaded only once.
- */
-PhoneGap.resources = {base: true};
-
-/**
- * Determine if resource has been loaded by PhoneGap
- *
- * @param name
- * @return
- */
-PhoneGap.hasResource = function(name) {
-    return PhoneGap.resources[name];
-};
-
-/**
- * Add a resource to list of loaded resources by PhoneGap
- *
- * @param name
- */
-PhoneGap.addResource = function(name) {
-    PhoneGap.resources[name] = true;
-};
-
-/**
- * Boolean flag indicating if the PhoneGap API is available and initialized.
- */ // TODO: Remove this, it is unused here ... -jm
-PhoneGap.available = DeviceInfo.uuid != undefined;
-
-/**
- * Add an initialization function to a queue that ensures it will run and initialize
- * application constructors only once PhoneGap has been initialized.
- * @param {Function} func The function callback you want run once PhoneGap is initialized
- */
-PhoneGap.addConstructor = function(func) {
-    var state = document.readyState;
-    if ( ( state == 'loaded' || state == 'complete' ) && DeviceInfo.uuid != null )
-    {
-        func();
-    }
-    else
-    {
-        PhoneGap._constructors.push(func);
-    }
-};
-
-(function() 
- {
-    var timer = setInterval(function()
-    {
-                            
-        var state = document.readyState;
-                            
-        if ( ( state == 'loaded' || state == 'complete' ) && DeviceInfo.uuid != null )
-        {
-            clearInterval(timer); // stop looking
-            // run our constructors list
-            while (PhoneGap._constructors.length > 0) 
-            {
-                var constructor = PhoneGap._constructors.shift();
-                try 
-                {
-                    constructor();
-                } 
-                catch(e) 
-                {
-                    if (typeof(console['log']) == 'function')
-                    {
-                        console.log("Failed to run constructor: " + console.processMessage(e));
-                    }
-                    else
-                    {
-                        alert("Failed to run constructor: " + e.message);
-                    }
-                }
-            }
-            // all constructors run, now fire the deviceready event
-            var e = document.createEvent('Events'); 
-            e.initEvent('deviceready');
-            document.dispatchEvent(e);
-        }
-    }, 1);
-})();
-
-// session id for calls
-PhoneGap.sessionKey = 0;
-
-// centralized callbacks
-PhoneGap.callbackId = 0;
-PhoneGap.callbacks = {};
-PhoneGap.callbackStatus = {
-    NO_RESULT: 0,
-    OK: 1,
-    CLASS_NOT_FOUND_EXCEPTION: 2,
-    ILLEGAL_ACCESS_EXCEPTION: 3,
-    INSTANTIATION_EXCEPTION: 4,
-    MALFORMED_URL_EXCEPTION: 5,
-    IO_EXCEPTION: 6,
-    INVALID_ACTION: 7,
-    JSON_EXCEPTION: 8,
-    ERROR: 9
-    };
-
-/**
- * Creates a gap bridge iframe used to notify the native code about queued
- * commands.
- *
- * @private
- */
-PhoneGap.createGapBridge = function() {
-    gapBridge = document.createElement("iframe");
-    gapBridge.setAttribute("style", "display:none;");
-    gapBridge.setAttribute("height","0px");
-    gapBridge.setAttribute("width","0px");
-    gapBridge.setAttribute("frameborder","0");
-    document.documentElement.appendChild(gapBridge);
-    return gapBridge;
-}
-
-/** 
- * Execute a PhoneGap command by queuing it and letting the native side know
- * there are queued commands. The native side will then request all of the
- * queued commands and execute them.
- *
- * Arguments may be in one of two formats:
- *
- * FORMAT ONE (preferable)
- * The native side will call PhoneGap.callbackSuccess or
- * PhoneGap.callbackError, depending upon the result of the action.
- *
- * @param {Function} success    The success callback
- * @param {Function} fail       The fail callback
- * @param {String} service      The name of the service to use
- * @param {String} action       The name of the action to use
- * @param {String[]} [args]     Zero or more arguments to pass to the method
- *      
- * FORMAT TWO
- * @param {String} command    Command to be run in PhoneGap, e.g.
- *                            "ClassName.method"
- * @param {String[]} [args]   Zero or more arguments to pass to the method
- *                            object parameters are passed as an array object
- *                            [object1, object2] each object will be passed as
- *                            JSON strings 
- */
-PhoneGap.exec = function() { 
-    if (!PhoneGap.available) {
-        alert("ERROR: Attempting to call PhoneGap.exec()"
-              +" before 'deviceready'. Ignoring.");
-        return;
-    }
-
-    var successCallback, failCallback, service, action, actionArgs;
-    var callbackId = null;
-    if (typeof arguments[0] !== "string") {
-        // FORMAT ONE
-        successCallback = arguments[0];
-        failCallback = arguments[1];
-        service = arguments[2];
-        action = arguments[3];
-        actionArgs = arguments[4];
-
-        // Since we need to maintain backwards compatibility, we have to pass
-        // an invalid callbackId even if no callback was provided since plugins
-        // will be expecting it. The PhoneGap.exec() implementation allocates
-        // an invalid callbackId and passes it even if no callbacks were given.
-        callbackId = 'INVALID';
-    } else {
-        // FORMAT TWO
-        splitCommand = arguments[0].split(".");
-        action = splitCommand.pop();
-        service = splitCommand.join(".");
-        actionArgs = Array.prototype.splice.call(arguments, 1);
-    }
-    
-    // Start building the command object.
-    var command = {
-        className: service,
-        methodName: action,
-        arguments: []
-    };
-
-    // Register the callbacks and add the callbackId to the positional
-    // arguments if given.
-    if (successCallback || failCallback) {
-        callbackId = service + PhoneGap.callbackId++;
-        PhoneGap.callbacks[callbackId] = 
-            {success:successCallback, fail:failCallback};
-    }
-    if (callbackId != null) {
-        command.arguments.push(callbackId);
-    }
-
-    for (var i = 0; i < actionArgs.length; ++i) {
-        var arg = actionArgs[i];
-        if (arg == undefined || arg == null) {
-            continue;
-        } else if (typeof(arg) == 'object') {
-            command.options = arg;
-        } else {
-            command.arguments.push(arg);
-        }
-    }
-
-    // Stringify and queue the command. We stringify to command now to
-    // effectively clone the command arguments in case they are mutated before
-    // the command is executed.
-    PhoneGap.commandQueue.push(JSON.stringify(command));
-
-    // If the queue length is 1, then that means it was empty before we queued
-    // the given command, so let the native side know that we have some
-    // commands to execute, unless the queue is currently being flushed, in
-    // which case the command will be picked up without notification.
-    if (PhoneGap.commandQueue.length == 1 && !PhoneGap.commandQueueFlushing) {
-        if (!PhoneGap.gapBridge) {
-            PhoneGap.gapBridge = PhoneGap.createGapBridge();
-        }
-
-        PhoneGap.gapBridge.src = "gap://ready";
-    }
-}
-
-/**
- * Called by native code to retrieve all queued commands and clear the queue.
- */
-PhoneGap.getAndClearQueuedCommands = function() {
-  json = JSON.stringify(PhoneGap.commandQueue);
-  PhoneGap.commandQueue = [];
-  return json;
-}
-
-/**
- * Called by native code when returning successful result from an action.
- *
- * @param callbackId
- * @param args
- *        args.status - PhoneGap.callbackStatus
- *        args.message - return value
- *        args.keepCallback - 0 to remove callback, 1 to keep callback in PhoneGap.callbacks[]
- */
-PhoneGap.callbackSuccess = function(callbackId, args) {
-    if (PhoneGap.callbacks[callbackId]) {
-
-        // If result is to be sent to callback
-        if (args.status == PhoneGap.callbackStatus.OK) {
-            try {
-                if (PhoneGap.callbacks[callbackId].success) {
-                       PhoneGap.callbacks[callbackId].success(args.message);
-                }
-            }
-            catch (e) {
-                console.log("Error in success callback: "+callbackId+" = "+e);
-            }
-        }
-    
-        // Clear callback if not expecting any more results
-        if (!args.keepCallback) {
-            delete PhoneGap.callbacks[callbackId];
-        }
-    }
-};
-
-/**
- * Called by native code when returning error result from an action.
- *
- * @param callbackId
- * @param args
- */
-PhoneGap.callbackError = function(callbackId, args) {
-    if (PhoneGap.callbacks[callbackId]) {
-        try {
-            if (PhoneGap.callbacks[callbackId].fail) {
-                PhoneGap.callbacks[callbackId].fail(args.message);
-            }
-        }
-        catch (e) {
-            console.log("Error in error callback: "+callbackId+" = "+e);
-        }
-        
-        // Clear callback if not expecting any more results
-        if (!args.keepCallback) {
-            delete PhoneGap.callbacks[callbackId];
-        }
-    }
-};
-
-
-/**
- * Does a deep clone of the object.
- *
- * @param obj
- * @return
- */
-PhoneGap.clone = function(obj) {
-    if(!obj) { 
-        return obj;
-    }
-
-    if(obj instanceof Array){
-        var retVal = new Array();
-        for(var i = 0; i < obj.length; ++i){
-            retVal.push(PhoneGap.clone(obj[i]));
-        }
-        return retVal;
-    }
-
-    if (obj instanceof Function) {
-        return obj;
-    }
-
-    if(!(obj instanceof Object)){
-        return obj;
-    }
-    
-    if (obj instanceof Date) {
-        return obj;
-    }
-
-    retVal = new Object();
-    for(i in obj){
-        if(!(i in retVal) || retVal[i] != obj[i]) {
-            retVal[i] = PhoneGap.clone(obj[i]);
-        }
-    }
-    return retVal;
-};
-
-// Intercept calls to document.addEventListener 
-PhoneGap.m_document_addEventListener = document.addEventListener;
-
-// Intercept calls to window.addEventListener
-PhoneGap.m_window_addEventListener = window.addEventListener;
-
-/**
- * Add a custom window event handler.
- *
- * @param {String} event            The event name that callback handles
- * @param {Function} callback       The event handler
- */
-PhoneGap.addWindowEventHandler = function(event, callback) {
-    PhoneGap.windowEventHandler[event] = callback;
-}
-
-/**
- * Add a custom document event handler.
- *
- * @param {String} event            The event name that callback handles
- * @param {Function} callback       The event handler
- */
-PhoneGap.addDocumentEventHandler = function(event, callback) {
-    PhoneGap.documentEventHandler[event] = callback;
-}
-
-/**
- * Intercept adding document event listeners and handle our own
- *
- * @param {Object} evt
- * @param {Function} handler
- * @param capture
- */
-document.addEventListener = function(evt, handler, capture) {
-    var e = evt.toLowerCase();
-           
-    // If subscribing to an event that is handled by a plugin
-    if (typeof PhoneGap.documentEventHandler[e] !== "undefined") {
-        if (PhoneGap.documentEventHandler[e](e, handler, true)) {
-            return; // Stop default behavior
-        }
-    }
-    
-    PhoneGap.m_document_addEventListener.call(document, evt, handler, capture); 
-};
-
-/**
- * Intercept adding window event listeners and handle our own
- *
- * @param {Object} evt
- * @param {Function} handler
- * @param capture
- */
-window.addEventListener = function(evt, handler, capture) {
-    var e = evt.toLowerCase();
-        
-    // If subscribing to an event that is handled by a plugin
-    if (typeof PhoneGap.windowEventHandler[e] !== "undefined") {
-        if (PhoneGap.windowEventHandler[e](e, handler, true)) {
-            return; // Stop default behavior
-        }
-    }
-        
-    PhoneGap.m_window_addEventListener.call(window, evt, handler, capture);
-};
-
-// Intercept calls to document.removeEventListener and watch for events that
-// are generated by PhoneGap native code
-PhoneGap.m_document_removeEventListener = document.removeEventListener;
-
-// Intercept calls to window.removeEventListener
-PhoneGap.m_window_removeEventListener = window.removeEventListener;
-
-/**
- * Intercept removing document event listeners and handle our own
- *
- * @param {Object} evt
- * @param {Function} handler
- * @param capture
- */
-document.removeEventListener = function(evt, handler, capture) {
-    var e = evt.toLowerCase();
-
-    // If unsubcribing from an event that is handled by a plugin
-    if (typeof PhoneGap.documentEventHandler[e] !== "undefined") {
-        if (PhoneGap.documentEventHandler[e](e, handler, false)) {
-            return; // Stop default behavior
-        }
-    }
-
-    PhoneGap.m_document_removeEventListener.call(document, evt, handler, capture);
-};
-
-/**
- * Intercept removing window event listeners and handle our own
- *
- * @param {Object} evt
- * @param {Function} handler
- * @param capture
- */
-window.removeEventListener = function(evt, handler, capture) {
-    var e = evt.toLowerCase();
-
-    // If unsubcribing from an event that is handled by a plugin
-    if (typeof PhoneGap.windowEventHandler[e] !== "undefined") {
-        if (PhoneGap.windowEventHandler[e](e, handler, false)) {
-            return; // Stop default behavior
-        }
-    }
-
-    PhoneGap.m_window_removeEventListener.call(window, evt, handler, capture);
-};
-
-/**
- * Method to fire document event
- *
- * @param {String} type             The event type to fire
- * @param {Object} data             Data to send with event
- */
-PhoneGap.fireDocumentEvent = function(type, data) {
-    var e = document.createEvent('Events');
-    e.initEvent(type);
-    if (data) {
-        for (var i in data) {
-            e[i] = data[i];
-        }
-    }
-    document.dispatchEvent(e);
-};
-
-/**
- * Method to fire window event
- *
- * @param {String} type             The event type to fire
- * @param {Object} data             Data to send with event
- */
-PhoneGap.fireWindowEvent = function(type, data) {
-    var e = document.createEvent('Events');
-    e.initEvent(type);
-    if (data) {
-        for (var i in data) {
-            e[i] = data[i];
-        }
-    }
-    window.dispatchEvent(e);
-};
-
-/**
- * Method to fire event from native code
- * Leaving this generic version to handle problems with iOS 3.x. Is currently used by orientation and battery events
- * Remove when iOS 3.x no longer supported and call fireWindowEvent or fireDocumentEvent directly
- */
-PhoneGap.fireEvent = function(type, target, data) {
-    var e = document.createEvent('Events');
-    e.initEvent(type);
-    if (data) {
-        for (var i in data) {
-            e[i] = data[i];
-        }
-    }
-    target = target || document;
-    if (target.dispatchEvent === undefined) { // ie window.dispatchEvent is undefined in iOS 3.x
-        target = document;
-    } 
-
-    target.dispatchEvent(e);
-};
-/**
- * Create a UUID
- *
- * @return
- */
-PhoneGap.createUUID = function() {
-    return PhoneGap.UUIDcreatePart(4) + '-' +
-        PhoneGap.UUIDcreatePart(2) + '-' +
-        PhoneGap.UUIDcreatePart(2) + '-' +
-        PhoneGap.UUIDcreatePart(2) + '-' +
-        PhoneGap.UUIDcreatePart(6);
-};
-
-PhoneGap.UUIDcreatePart = function(length) {
-    var uuidpart = "";
-    for (var i=0; i<length; i++) {
-        var uuidchar = parseInt((Math.random() * 256)).toString(16);
-        if (uuidchar.length == 1) {
-            uuidchar = "0" + uuidchar;
-        }
-        uuidpart += uuidchar;
-    }
-    return uuidpart;
-};
-};
-
-
-if (!PhoneGap.hasResource("debugconsole")) {
-	PhoneGap.addResource("debugconsole");
-	
-/**
- * This class provides access to the debugging console.
- * @constructor
- */
-var DebugConsole = function() {
-    this.winConsole = window.console;
-    this.logLevel = DebugConsole.INFO_LEVEL;
-}
-
-// from most verbose, to least verbose
-DebugConsole.ALL_LEVEL    = 1; // same as first level
-DebugConsole.INFO_LEVEL   = 1;
-DebugConsole.WARN_LEVEL   = 2;
-DebugConsole.ERROR_LEVEL  = 4;
-DebugConsole.NONE_LEVEL   = 8;
-													
-DebugConsole.prototype.setLevel = function(level) {
-    this.logLevel = level;
-};
-
-/**
- * Utility function for rendering and indenting strings, or serializing
- * objects to a string capable of being printed to the console.
- * @param {Object|String} message The string or object to convert to an indented string
- * @private
- */
-DebugConsole.prototype.processMessage = function(message, maxDepth) {
-	if (maxDepth === undefined) maxDepth = 0;
-    if (typeof(message) != 'object') {
-        return (this.isDeprecated ? "WARNING: debug object is deprecated, please use console object \n" + message : message);
-    } else {
-        /**
-         * @function
-         * @ignore
-         */
-        function indent(str) {
-            return str.replace(/^/mg, "    ");
-        }
-        /**
-         * @function
-         * @ignore
-         */
-        function makeStructured(obj, depth) {
-            var str = "";
-            for (var i in obj) {
-                try {
-                    if (typeof(obj[i]) == 'object' && depth < maxDepth) {
-                        str += i + ":\n" + indent(makeStructured(obj[i])) + "\n";
-                    } else {
-                        str += i + " = " + indent(String(obj[i])).replace(/^    /, "") + "\n";
-                    }
-                } catch(e) {
-                    str += i + " = EXCEPTION: " + e.message + "\n";
-                }
-            }
-            return str;
-        }
-        
-        return ("Object:\n" + makeStructured(message, maxDepth));
-    }
-};
-
-/**
- * Print a normal log message to the console
- * @param {Object|String} message Message or object to print to the console
- */
-DebugConsole.prototype.log = function(message, maxDepth) {
-    if (PhoneGap.available && this.logLevel <= DebugConsole.INFO_LEVEL)
-        PhoneGap.exec(null, null, 'com.phonegap.debugconsole', 'log',
-            [ this.processMessage(message, maxDepth), { logLevel: 'INFO' } ]
-        );
-    else
-        this.winConsole.log(message);
-};
-
-/**
- * Print a warning message to the console
- * @param {Object|String} message Message or object to print to the console
- */
-DebugConsole.prototype.warn = function(message, maxDepth) {
-    if (PhoneGap.available && this.logLevel <= DebugConsole.WARN_LEVEL)
-    	PhoneGap.exec(null, null, 'com.phonegap.debugconsole', 'log',
-            [ this.processMessage(message, maxDepth), { logLevel: 'WARN' } ]
-        );
-    else
-        this.winConsole.error(message);
-};
-
-/**
- * Print an error message to the console
- * @param {Object|String} message Message or object to print to the console
- */
-DebugConsole.prototype.error = function(message, maxDepth) {
-    if (PhoneGap.available && this.logLevel <= DebugConsole.ERROR_LEVEL)
-		PhoneGap.exec(null, null, 'com.phonegap.debugconsole', 'log',
-            [ this.processMessage(message, maxDepth), { logLevel: 'ERROR' } ]
-        );
-    else
-        this.winConsole.error(message);
-};
-
-PhoneGap.addConstructor(function() {
-    window.console = new DebugConsole();
-});
-};
-if (!PhoneGap.hasResource("position")) {
-	PhoneGap.addResource("position");
-
-/**
- * This class contains position information.
- * @param {Object} lat
- * @param {Object} lng
- * @param {Object} acc
- * @param {Object} alt
- * @param {Object} altAcc
- * @param {Object} head
- * @param {Object} vel
- * @constructor
- */
-Position = function(coords, timestamp) {
-	this.coords = Coordinates.cloneFrom(coords);
-    this.timestamp = timestamp || new Date().getTime();
-};
-
-Position.prototype.equals = function(other) {
-    return (this.coords && other && other.coords &&
-            this.coords.latitude == other.coords.latitude &&
-            this.coords.longitude == other.coords.longitude);
-};
-
-Position.prototype.clone = function()
-{
-    return new Position(
-        this.coords? this.coords.clone() : null,
-        this.timestamp? this.timestamp : new Date().getTime()
-    );
-}
-
-Coordinates = function(lat, lng, alt, acc, head, vel, altAcc) {
-	/**
-	 * The latitude of the position.
-	 */
-	this.latitude = lat;
-	/**
-	 * The longitude of the position,
-	 */
-	this.longitude = lng;
-	/**
-	 * The altitude of the position.
-	 */
-	this.altitude = alt;
-	/**
-	 * The accuracy of the position.
-	 */
-	this.accuracy = acc;
-	/**
-	 * The direction the device is moving at the position.
-	 */
-	this.heading = head;
-	/**
-	 * The velocity with which the device is moving at the position.
-	 */
-	this.speed = vel;
-	/**
-	 * The altitude accuracy of the position.
-	 */
-	this.altitudeAccuracy = (altAcc != 'undefined') ? altAcc : null; 
-};
-
-Coordinates.prototype.clone = function()
-{
-    return new Coordinates(
-        this.latitude,
-        this.longitude,
-        this.altitude,
-        this.accuracy,
-        this.heading,
-        this.speed,
-        this.altitudeAccuracy
-    );
-};
-
-Coordinates.cloneFrom = function(obj)
-{
-    return new Coordinates(
-        obj.latitude,
-        obj.longitude,
-        obj.altitude,
-        obj.accuracy,
-        obj.heading,
-        obj.speed,
-        obj.altitudeAccuracy
-    );
-};
-
-/**
- * This class specifies the options for requesting position data.
- * @constructor
- */
-PositionOptions = function(enableHighAccuracy, timeout, maximumAge) {
-	/**
-	 * Specifies the desired position accuracy.
-	 */
-	this.enableHighAccuracy = enableHighAccuracy || false;
-	/**
-	 * The timeout after which if position data cannot be obtained the errorCallback
-	 * is called.
-	 */
-	this.timeout = timeout || 10000;
-	/**
-     * The age of a cached position whose age is no greater than the specified time 
-     * in milliseconds. 
-     */
-	this.maximumAge = maximumAge || 0;
-	
-	if (this.maximumAge < 0) {
-		this.maximumAge = 0;
-	}
-};
-
-/**
- * This class contains information about any GPS errors.
- * @constructor
- */
-PositionError = function(code, message) {
-	this.code = code || 0;
-	this.message = message || "";
-};
-
-PositionError.UNKNOWN_ERROR = 0;
-PositionError.PERMISSION_DENIED = 1;
-PositionError.POSITION_UNAVAILABLE = 2;
-PositionError.TIMEOUT = 3;
-
-};if (!PhoneGap.hasResource("acceleration")) {
-	PhoneGap.addResource("acceleration");
- 	
-
-/**
- * This class contains acceleration information
- * @constructor
- * @param {Number} x The force applied by the device in the x-axis.
- * @param {Number} y The force applied by the device in the y-axis.
- * @param {Number} z The force applied by the device in the z-axis.
- */
-Acceleration = function(x, y, z) {
-	/**
-	 * The force applied by the device in the x-axis.
-	 */
-	this.x = x;
-	/**
-	 * The force applied by the device in the y-axis.
-	 */
-	this.y = y;
-	/**
-	 * The force applied by the device in the z-axis.
-	 */
-	this.z = z;
-	/**
-	 * The time that the acceleration was obtained.
-	 */
-	this.timestamp = new Date().getTime();
-}
-
-/**
- * This class specifies the options for requesting acceleration data.
- * @constructor
- */
-AccelerationOptions = function() {
-	/**
-	 * The timeout after which if acceleration data cannot be obtained the errorCallback
-	 * is called.
-	 */
-	this.timeout = 10000;
-}
-};if (!PhoneGap.hasResource("accelerometer")) {
-	PhoneGap.addResource("accelerometer");
-
-/**
- * This class provides access to device accelerometer data.
- * @constructor
- */
-Accelerometer = function() 
-{
-	/**
-	 * The last known acceleration.
-	 */
-	this.lastAcceleration = new Acceleration(0,0,0);
-}
-
-/**
- * Asynchronously aquires the current acceleration.
- * @param {Function} successCallback The function to call when the acceleration
- * data is available
- * @param {Function} errorCallback The function to call when there is an error 
- * getting the acceleration data.
- * @param {AccelerationOptions} options The options for getting the accelerometer data
- * such as timeout.
- */
-Accelerometer.prototype.getCurrentAcceleration = function(successCallback, errorCallback, options) {
-	// If the acceleration is available then call success
-	// If the acceleration is not available then call error
-	
-	// Created for iPhone, Iphone passes back _accel obj litteral
-	if (typeof successCallback == "function") {
-		successCallback(this.lastAcceleration);
-	}
-};
-
-// private callback called from Obj-C by name
-Accelerometer.prototype._onAccelUpdate = function(x,y,z)
-{
-   this.lastAcceleration = new Acceleration(x,y,z);
-};
-
-/**
- * Asynchronously aquires the acceleration repeatedly at a given interval.
- * @param {Function} successCallback The function to call each time the acceleration
- * data is available
- * @param {Function} errorCallback The function to call when there is an error 
- * getting the acceleration data.
- * @param {AccelerationOptions} options The options for getting the accelerometer data
- * such as timeout.
- */
-
-Accelerometer.prototype.watchAcceleration = function(successCallback, errorCallback, options) {
-	//this.getCurrentAcceleration(successCallback, errorCallback, options);
-	// TODO: add the interval id to a list so we can clear all watches
- 	var frequency = (options != undefined && options.frequency != undefined) ? options.frequency : 10000;
-	var updatedOptions = {
-		desiredFrequency:frequency 
-	}
-	PhoneGap.exec(null, null, "com.phonegap.accelerometer", "start", [options]);
-
-	return setInterval(function() {
-		navigator.accelerometer.getCurrentAcceleration(successCallback, errorCallback, options);
-	}, frequency);
-};
-
-/**
- * Clears the specified accelerometer watch.
- * @param {String} watchId The ID of the watch returned from #watchAcceleration.
- */
-Accelerometer.prototype.clearWatch = function(watchId) {
-	PhoneGap.exec(null, null, "com.phonegap.accelerometer", "stop", []);
-	clearInterval(watchId);
-};
-
-Accelerometer.install = function()
-{
-    if (typeof navigator.accelerometer == "undefined") {
-		navigator.accelerometer = new Accelerometer();
-	}
-};
-
-Accelerometer.installDeviceMotionHandler = function()
-{
-	if (!(window.DeviceMotionEvent == undefined)) {
-		// supported natively, so we don't have to add support
-		return;
-	}	
-	
-	var self = this;
-	var devicemotionEvent = 'devicemotion';
-	self.deviceMotionWatchId = null;
-	self.deviceMotionListenerCount = 0;
-	self.deviceMotionLastEventTimestamp = 0;
-	
-	// backup original `window.addEventListener`, `window.removeEventListener`
-    var _addEventListener = window.addEventListener;
-    var _removeEventListener = window.removeEventListener;
-													
-	var windowDispatchAvailable = !(window.dispatchEvent === undefined); // undefined in iOS 3.x
-													
-	var accelWin = function(acceleration) {
-		var evt = document.createEvent('Events');
-	    evt.initEvent(devicemotionEvent);
-	
-		evt.acceleration = null; // not all devices have gyroscope, don't care for now if we actually have it.
-		evt.rotationRate = null; // not all devices have gyroscope, don't care for now if we actually have it:
-		evt.accelerationIncludingGravity = acceleration; // accelerometer, all iOS devices have it
-		
-		var currentTime = new Date().getTime();
-		evt.interval =  (self.deviceMotionLastEventTimestamp == 0) ? 0 : (currentTime - self.deviceMotionLastEventTimestamp);
-		self.deviceMotionLastEventTimestamp = currentTime;
-		
-		if (windowDispatchAvailable) {
-			window.dispatchEvent(evt);
-		} else {
-			document.dispatchEvent(evt);
-		}
-	};
-	
-	var accelFail = function() {
-		
-	};
-													
-    // override `window.addEventListener`
-    window.addEventListener = function() {
-        if (arguments[0] === devicemotionEvent) {
-            ++(self.deviceMotionListenerCount);
-			if (self.deviceMotionListenerCount == 1) { // start
-				self.deviceMotionWatchId = navigator.accelerometer.watchAcceleration(accelWin, accelFail, { frequency:500});
-			}
-		} 
-													
-		if (!windowDispatchAvailable) {
-			return document.addEventListener.apply(this, arguments);
-		} else {
-			return _addEventListener.apply(this, arguments);
-		}
-    };	
-
-    // override `window.removeEventListener'
-    window.removeEventListener = function() {
-        if (arguments[0] === devicemotionEvent) {
-            --(self.deviceMotionListenerCount);
-			if (self.deviceMotionListenerCount == 0) { // stop
-				navigator.accelerometer.clearWatch(self.deviceMotionWatchId);
-			}
-		} 
-		
-		if (!windowDispatchAvailable) {
-			return document.removeEventListener.apply(this, arguments);
-		} else {
-			return _removeEventListener.apply(this, arguments);
-		}
-    };	
-};
-
-
-PhoneGap.addConstructor(Accelerometer.install);
-PhoneGap.addConstructor(Accelerometer.installDeviceMotionHandler);
-
-};
-if (!PhoneGap.hasResource("battery")) {
-PhoneGap.addResource("battery");
-
-/**
- * This class contains information about the current battery status.
- * @constructor
- */
-var Battery = function() {
-    this._level = null;
-    this._isPlugged = null;
-    this._batteryListener = [];
-    this._lowListener = [];
-    this._criticalListener = [];
-};
-
-/**
- * Registers as an event producer for battery events.
- * 
- * @param {Object} eventType
- * @param {Object} handler
- * @param {Object} add
- */
-Battery.prototype.eventHandler = function(eventType, handler, add) {
-    var me = navigator.battery;
-    if (add) {
-        // If there are no current registered event listeners start the battery listener on native side.
-        if (me._batteryListener.length === 0 && me._lowListener.length === 0 && me._criticalListener.length === 0) {
-            PhoneGap.exec(me._status, me._error, "com.phonegap.battery", "start", []);
-        }
-        
-        // Register the event listener in the proper array
-        if (eventType === "batterystatus") {
-            var pos = me._batteryListener.indexOf(handler);
-            if (pos === -1) {
-            	me._batteryListener.push(handler);
-            }
-        } else if (eventType === "batterylow") {
-            var pos = me._lowListener.indexOf(handler);
-            if (pos === -1) {
-            	me._lowListener.push(handler);
-            }
-        } else if (eventType === "batterycritical") {
-            var pos = me._criticalListener.indexOf(handler);
-            if (pos === -1) {
-            	me._criticalListener.push(handler);
-            }
-        }
-    } else {
-        // Remove the event listener from the proper array
-        if (eventType === "batterystatus") {
-            var pos = me._batteryListener.indexOf(handler);
-            if (pos > -1) {
-                me._batteryListener.splice(pos, 1);        
-            }
-        } else if (eventType === "batterylow") {
-            var pos = me._lowListener.indexOf(handler);
-            if (pos > -1) {
-                me._lowListener.splice(pos, 1);        
-            }
-        } else if (eventType === "batterycritical") {
-            var pos = me._criticalListener.indexOf(handler);
-            if (pos > -1) {
-                me._criticalListener.splice(pos, 1);        
-            }
-        }
-        
-        // If there are no more registered event listeners stop the battery listener on native side.
-        if (me._batteryListener.length === 0 && me._lowListener.length === 0 && me._criticalListener.length === 0) {
-            PhoneGap.exec(null, null, "com.phonegap.battery", "stop", []);
-        }
-    }
-};
-
-/**
- * Callback for battery status
- * 
- * @param {Object} info			keys: level, isPlugged
- */
-Battery.prototype._status = function(info) {
-	if (info) {
-		var me = this;
-		if (me._level != info.level || me._isPlugged != info.isPlugged) {
-			// Fire batterystatus event
-			//PhoneGap.fireWindowEvent("batterystatus", info);
-			// use this workaround since iOS 3.x does have window.dispatchEvent
-			PhoneGap.fireEvent("batterystatus", window, info);	
-
-			// Fire low battery event
-			if (info.level == 20 || info.level == 5) {
-				if (info.level == 20) {
-					//PhoneGap.fireWindowEvent("batterylow", info);
-					// use this workaround since iOS 3.x does not have window.dispatchEvent
-					PhoneGap.fireEvent("batterylow", window, info);
-				}
-				else {
-					//PhoneGap.fireWindowEvent("batterycritical", info);
-					// use this workaround since iOS 3.x does not have window.dispatchEvent
-					PhoneGap.fireEvent("batterycritical", window, info);
-				}
-			}
-		}
-		me._level = info.level;
-		me._isPlugged = info.isPlugged;	
-	}
-};
-
-/**
- * Error callback for battery start
- */
-Battery.prototype._error = function(e) {
-    console.log("Error initializing Battery: " + e);
-};
-
-PhoneGap.addConstructor(function() {
-    if (typeof navigator.battery === "undefined") {
-        navigator.battery = new Battery();
-        PhoneGap.addWindowEventHandler("batterystatus", navigator.battery.eventHandler);
-        PhoneGap.addWindowEventHandler("batterylow", navigator.battery.eventHandler);
-        PhoneGap.addWindowEventHandler("batterycritical", navigator.battery.eventHandler);
-    }
-});
-}if (!PhoneGap.hasResource("camera")) {
-	PhoneGap.addResource("camera");
-	
-
-/**
- * This class provides access to the device camera.
- * @constructor
- */
-Camera = function() {
-	
-}
-/**
- *  Available Camera Options
- *  {boolean} allowEdit - true to allow editing image, default = false
- *	{number} quality 0-100 (low to high) default =  100
- *  {Camera.DestinationType} destinationType default = DATA_URL
- *	{Camera.PictureSourceType} sourceType default = CAMERA
- *	{number} targetWidth - width in pixels to scale image default = 0 (no scaling)
- *  {number} targetHeight - height in pixels to scale image default = 0 (no scaling)
- *  {Camera.EncodingType} - encodingType default = JPEG
- *  {boolean} correctOrientation - Rotate the image to correct for the orientation of the device during capture (iOS only)
- *  {boolean} saveToPhotoAlbum - Save the image to the photo album on the device after capture (iOS only)
- */
-/**
- * Format of image that is returned from getPicture.
- *
- * Example: navigator.camera.getPicture(success, fail,
- *              { quality: 80,
- *                destinationType: Camera.DestinationType.DATA_URL,
- *                sourceType: Camera.PictureSourceType.PHOTOLIBRARY})
- */
-Camera.DestinationType = {
-    DATA_URL: 0,                // Return base64 encoded string
-    FILE_URI: 1                 // Return file uri 
-};
-Camera.prototype.DestinationType = Camera.DestinationType;
-
-/**
- * Source to getPicture from.
- *
- * Example: navigator.camera.getPicture(success, fail,
- *              { quality: 80,
- *                destinationType: Camera.DestinationType.DATA_URL,
- *                sourceType: Camera.PictureSourceType.PHOTOLIBRARY})
- */
-Camera.PictureSourceType = {
-    PHOTOLIBRARY : 0,           // Choose image from picture library 
-    CAMERA : 1,                 // Take picture from camera
-    SAVEDPHOTOALBUM : 2         // Choose image from picture library 
-};
-Camera.prototype.PictureSourceType = Camera.PictureSourceType;
-
-/** 
- * Encoding of image returned from getPicture. 
- * 
- * Example: navigator.camera.getPicture(success, fail, 
- *              { quality: 80, 
- *                destinationType: Camera.DestinationType.DATA_URL, 
- *                sourceType: Camera.PictureSourceType.CAMERA, 
- *                encodingType: Camera.EncodingType.PNG}) 
- */ 
-Camera.EncodingType = { 
-	JPEG: 0,                    // Return JPEG encoded image 
-	PNG: 1                      // Return PNG encoded image 
-};
-Camera.prototype.EncodingType = Camera.EncodingType;
-
-/** 
- * Type of pictures to select from.  Only applicable when
- *	PictureSourceType is PHOTOLIBRARY or SAVEDPHOTOALBUM 
- * 
- * Example: navigator.camera.getPicture(success, fail, 
- *              { quality: 80, 
- *                destinationType: Camera.DestinationType.DATA_URL, 
- *                sourceType: Camera.PictureSourceType.PHOTOLIBRARY, 
- *                mediaType: Camera.MediaType.PICTURE}) 
- */ 
-Camera.MediaType = { 
-	PICTURE: 0,             // allow selection of still pictures only. DEFAULT. Will return format specified via DestinationType
-	VIDEO: 1,                // allow selection of video only, ONLY RETURNS URL
-	ALLMEDIA : 2			// allow selection from all media types
-};
-Camera.prototype.MediaType = Camera.MediaType;
-
-/**
- * Gets a picture from source defined by "options.sourceType", and returns the
- * image as defined by the "options.destinationType" option.
-
- * The defaults are sourceType=CAMERA and destinationType=DATA_URL.
- *
- * @param {Function} successCallback
- * @param {Function} errorCallback
- * @param {Object} options
- */
-Camera.prototype.getPicture = function(successCallback, errorCallback, options) {
-	// successCallback required
-	if (typeof successCallback != "function") {
-        console.log("Camera Error: successCallback is not a function");
-        return;
-    }
-
-    // errorCallback optional
-    if (errorCallback && (typeof errorCallback != "function")) {
-        console.log("Camera Error: errorCallback is not a function");
-        return;
-    }
-	
-	PhoneGap.exec(successCallback, errorCallback, "com.phonegap.camera","getPicture",[options]);
-};
-
-
-
-PhoneGap.addConstructor(function() {
-    if (typeof navigator.camera == "undefined") navigator.camera = new Camera();
-});
-};
-
-if (!PhoneGap.hasResource("device")) {
-	PhoneGap.addResource("device");
-
-/**
- * this represents the mobile device, and provides properties for inspecting the model, version, UUID of the
- * phone, etc.
- * @constructor
- */
-Device = function() 
-{
-    this.platform = null;
-    this.version  = null;
-    this.name     = null;
-    this.phonegap      = null;
-    this.uuid     = null;
-    try 
-	{      
-		this.platform = DeviceInfo.platform;
-		this.version  = DeviceInfo.version;
-		this.name     = DeviceInfo.name;
-		this.phonegap = DeviceInfo.gap;
-		this.uuid     = DeviceInfo.uuid;
-
-    } 
-	catch(e) 
-	{
-        // TODO: 
-    }
-	this.available = PhoneGap.available = this.uuid != null;
-}
-
-PhoneGap.addConstructor(function() {
-	if (typeof navigator.device === "undefined") {
-    	navigator.device = window.device = new Device();
-	}
-});
-};
-if (!PhoneGap.hasResource("capture")) {
-	PhoneGap.addResource("capture");
-/**
- * The CaptureError interface encapsulates all errors in the Capture API.
- */
-function CaptureError() {
-   this.code = null;
-};
-
-// Capture error codes
-CaptureError.CAPTURE_INTERNAL_ERR = 0;
-CaptureError.CAPTURE_APPLICATION_BUSY = 1;
-CaptureError.CAPTURE_INVALID_ARGUMENT = 2;
-CaptureError.CAPTURE_NO_MEDIA_FILES = 3;
-CaptureError.CAPTURE_NOT_SUPPORTED = 20;
-
-/**
- * The Capture interface exposes an interface to the camera and microphone of the hosting device.
- */
-function Capture() {
-	this.supportedAudioModes = [];
-	this.supportedImageModes = [];
-	this.supportedVideoModes = [];
-};
-
-/**
- * Launch audio recorder application for recording audio clip(s).
- * 
- * @param {Function} successCB
- * @param {Function} errorCB
- * @param {CaptureAudioOptions} options
- *
- * No audio recorder to launch for iOS - return CAPTURE_NOT_SUPPORTED
- */
-Capture.prototype.captureAudio = function(successCallback, errorCallback, options) {
-	/*if (errorCallback && typeof errorCallback === "function") {
-		errorCallback({
-				"code": CaptureError.CAPTURE_NOT_SUPPORTED
-			});
-	}*/
-    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.mediacapture", "captureAudio", [options]);
-};
-
-/**
- * Launch camera application for taking image(s).
- * 
- * @param {Function} successCB
- * @param {Function} errorCB
- * @param {CaptureImageOptions} options
- */
-Capture.prototype.captureImage = function(successCallback, errorCallback, options) {
-    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.mediacapture", "captureImage", [options]);
-};
-
-/**
- * Casts a PluginResult message property  (array of objects) to an array of MediaFile objects
- * (used in Objective-C)
- *
- * @param {PluginResult} pluginResult
- */
-Capture.prototype._castMediaFile = function(pluginResult) {
-    var mediaFiles = [];
-    var i;
-    for (i=0; i<pluginResult.message.length; i++) {
-        var mediaFile = new MediaFile();
-	    mediaFile.name = pluginResult.message[i].name;
-	    mediaFile.fullPath = pluginResult.message[i].fullPath;
-	    mediaFile.type = pluginResult.message[i].type;
-	    mediaFile.lastModifiedDate = pluginResult.message[i].lastModifiedDate;
-	    mediaFile.size = pluginResult.message[i].size;
-        mediaFiles.push(mediaFile);
-    }
-    pluginResult.message = mediaFiles;
-    return pluginResult;
-};
-
-/**
- * Launch device camera application for recording video(s).
- * 
- * @param {Function} successCB
- * @param {Function} errorCB
- * @param {CaptureVideoOptions} options
- */
-Capture.prototype.captureVideo = function(successCallback, errorCallback, options) {
-    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.mediacapture", "captureVideo", [options]);
-};
-
-/**
- * Encapsulates a set of parameters that the capture device supports.
- */
-function ConfigurationData() {
-    // The ASCII-encoded string in lower case representing the media type. 
-    this.type; 
-    // The height attribute represents height of the image or video in pixels. 
-    // In the case of a sound clip this attribute has value 0. 
-    this.height = 0;
-    // The width attribute represents width of the image or video in pixels. 
-    // In the case of a sound clip this attribute has value 0
-    this.width = 0;
-};
-
-/**
- * Encapsulates all image capture operation configuration options.
- */
-var CaptureImageOptions = function() {
-    // Upper limit of images user can take. Value must be equal or greater than 1.
-    this.limit = 1; 
-    // The selected image mode. Must match with one of the elements in supportedImageModes array.
-    this.mode = null; 
-};
-
-/**
- * Encapsulates all video capture operation configuration options.
- */
-var CaptureVideoOptions = function() {
-    // Upper limit of videos user can record. Value must be equal or greater than 1.
-    this.limit = 1;
-    // Maximum duration of a single video clip in seconds.
-    this.duration = 0;
-    // The selected video mode. Must match with one of the elements in supportedVideoModes array.
-    this.mode = null;
-};
-
-/**
- * Encapsulates all audio capture operation configuration options.
- */
-var CaptureAudioOptions = function() {
-    // Upper limit of sound clips user can record. Value must be equal or greater than 1.
-    this.limit = 1;
-    // Maximum duration of a single sound clip in seconds.
-    this.duration = 0;
-    // The selected audio mode. Must match with one of the elements in supportedAudioModes array.
-    this.mode = null;
-};
-
-/**
- * Represents a single file.
- * 
- * name {DOMString} name of the file, without path information
- * fullPath {DOMString} the full path of the file, including the name
- * type {DOMString} mime type
- * lastModifiedDate {Date} last modified date
- * size {Number} size of the file in bytes
- */
-function MediaFile(name, fullPath, type, lastModifiedDate, size) {
-    this.name = name || null;
-    this.fullPath = fullPath || null;
-    this.type = type || null;
-    this.lastModifiedDate = lastModifiedDate || null;
-    this.size = size || 0;
-}
-
-/**
- * Request capture format data for a specific file and type
- * 
- * @param {Function} successCB
- * @param {Function} errorCB
- */
-MediaFile.prototype.getFormatData = function(successCallback, errorCallback) {
-	if (typeof this.fullPath === "undefined" || this.fullPath === null) {
-		errorCallback({
-				"code": CaptureError.CAPTURE_INVALID_ARGUMENT
-			});
-	} else {
-    	PhoneGap.exec(successCallback, errorCallback, "com.phonegap.mediacapture", "getFormatData", [this.fullPath, this.type]);
-	}	
-};
-
-/**
- * MediaFileData encapsulates format information of a media file.
- * 
- * @param {DOMString} codecs
- * @param {long} bitrate
- * @param {long} height
- * @param {long} width
- * @param {float} duration
- */
-function MediaFileData(codecs, bitrate, height, width, duration) {
-    this.codecs = codecs || null;
-    this.bitrate = bitrate || 0;
-    this.height = height || 0;
-    this.width = width || 0;
-    this.duration = duration || 0;
-}
-
-PhoneGap.addConstructor(function() {
-    if (typeof navigator.device === "undefined") {
-        navigator.device = window.device = new Device();
-    }
-    if (typeof navigator.device.capture === "undefined") {
-        navigator.device.capture = window.device.capture = new Capture();
-    }
-});
-};
-if (!PhoneGap.hasResource("contact")) {
-	PhoneGap.addResource("contact");
-
-
-/**
-* Contains information about a single contact.
-* @param {DOMString} id unique identifier
-* @param {DOMString} displayName
-* @param {ContactName} name
-* @param {DOMString} nickname
-* @param {ContactField[]} phoneNumbers array of phone numbers
-* @param {ContactField[]} emails array of email addresses
-* @param {ContactAddress[]} addresses array of addresses
-* @param {ContactField[]} ims instant messaging user ids
-* @param {ContactOrganization[]} organizations
-* @param {DOMString} birthday contact's birthday
-* @param {DOMString} note user notes about contact
-* @param {ContactField[]} photos
-* @param {Array.<ContactField>} categories
-* @param {ContactField[]} urls contact's web sites
-*/
-var Contact = function(id, displayName, name, nickname, phoneNumbers, emails, addresses,
-    ims, organizations, birthday, note, photos, categories, urls) {
-    this.id = id || null;
-    this.displayName = displayName || null;
-    this.name = name || null; // ContactName
-    this.nickname = nickname || null;
-    this.phoneNumbers = phoneNumbers || null; // ContactField[]
-    this.emails = emails || null; // ContactField[]
-    this.addresses = addresses || null; // ContactAddress[]
-    this.ims = ims || null; // ContactField[]
-    this.organizations = organizations || null; // ContactOrganization[]
-    this.birthday = birthday || null; // JS Date
-    this.note = note || null;
-    this.photos = photos || null; // ContactField[]
-    this.categories = categories || null; 
-    this.urls = urls || null; // ContactField[]
-};
-
-/**
-* Converts Dates to milliseconds before sending to iOS
-*/
-Contact.prototype.convertDatesOut = function()
-{
-	var dates = new Array("birthday");
-	for (var i=0; i<dates.length; i++){
-		var value = this[dates[i]];
-		if (value){
-			if (!value instanceof Date){
-				try {
-					value = new Date(value);
-				} catch(exception){
-					value = null;
-				}
-			}
-			if (value instanceof Date){
-				value = value.valueOf();
-			}
-			this[dates[i]] = value;
-		}
-	}
-	
-};
-/**
-* Converts milliseconds to JS Date when returning from iOS
-*/
-Contact.prototype.convertDatesIn = function()
-{
-	var dates = new Array("birthday");
-	for (var i=0; i<dates.length; i++){
-		var value = this[dates[i]];
-		if (value){
-			try {
-				this[dates[i]] = new Date(parseFloat(value));
-			} catch (exception){
-				console.log("exception creating date");
-			}
-		}
-	}
-};
-/**
-* Removes contact from device storage.
-* @param successCB success callback
-* @param errorCB error callback (optional)
-*/
-Contact.prototype.remove = function(successCB, errorCB) {
-	if (this.id == null) {
-        var errorObj = new ContactError();
-        errorObj.code = ContactError.UNKNOWN_ERROR;
-        errorCB(errorObj);
-    }
-    else {
-        PhoneGap.exec(successCB, errorCB, "com.phonegap.contacts", "remove", [{ "contact": this}]);
-    }
-};
-/**
-* iOS ONLY
-* displays contact via iOS UI
-*	NOT part of W3C spec so no official documentation
-*
-* @param errorCB error callback
-* @param options object
-*	allowsEditing: boolean AS STRING
-*		"true" to allow editing the contact
-*		"false" (default) display contact
-*/
-Contact.prototype.display = function(errorCB, options) { 
-	if (this.id == null) {
-        if (typeof errorCB == "function") {
-        	var errorObj = new ContactError();
-        	errorObj.code = ContactError.UNKNOWN_ERROR;
-        	errorCB(errorObj);
-		}
-    }
-    else {
-        PhoneGap.exec(null, errorCB, "com.phonegap.contacts","displayContact", [this.id, options]);
-    }
-};
-
-/**
-* Creates a deep copy of this Contact.
-* With the contact ID set to null.
-* @return copy of this Contact
-*/
-Contact.prototype.clone = function() {
-    var clonedContact = PhoneGap.clone(this);
-    clonedContact.id = null;
-    // Loop through and clear out any id's in phones, emails, etc.
-    if (clonedContact.phoneNumbers) {
-    	for (i=0; i<clonedContact.phoneNumbers.length; i++) {
-    		clonedContact.phoneNumbers[i].id = null;
-    	}
-    }
-    if (clonedContact.emails) {
-    	for (i=0; i<clonedContact.emails.length; i++) {
-    		clonedContact.emails[i].id = null;
-    	}
-    }
-    if (clonedContact.addresses) {
-    	for (i=0; i<clonedContact.addresses.length; i++) {
-    		clonedContact.addresses[i].id = null;
-    	}
-    }
-    if (clonedContact.ims) {
-    	for (i=0; i<clonedContact.ims.length; i++) {
-    		clonedContact.ims[i].id = null;
-    	}
-    }
-    if (clonedContact.organizations) {
-    	for (i=0; i<clonedContact.organizations.length; i++) {
-    		clonedContact.organizations[i].id = null;
-    	}
-    }
-    if (clonedContact.photos) {
-    	for (i=0; i<clonedContact.photos.length; i++) {
-    		clonedContact.photos[i].id = null;
-    	}
-    }
-    if (clonedContact.urls) {
-    	for (i=0; i<clonedContact.urls.length; i++) {
-    		clonedContact.urls[i].id = null;
-    	}
-    }
-    return clonedContact;
-};
-
-/**
-* Persists contact to device storage.
-* @param successCB success callback
-* @param errorCB error callback - optional
-*/
-Contact.prototype.save = function(successCB, errorCB) {
-	// don't modify the original contact
-	var cloned = PhoneGap.clone(this);
-	cloned.convertDatesOut(); 
-	PhoneGap.exec(successCB, errorCB, "com.phonegap.contacts","save", [{"contact": cloned}]);
-};
-
-/**
-* Contact name.
-* @param formatted
-* @param familyName
-* @param givenName
-* @param middle
-* @param prefix
-* @param suffix
-*/
-var ContactName = function(formatted, familyName, givenName, middle, prefix, suffix) {
-    this.formatted = formatted != "undefined" ? formatted : null;
-    this.familyName = familyName != "undefined" ? familyName : null;
-    this.givenName = givenName != "undefined" ? givenName : null;
-    this.middleName = middle != "undefined" ? middle : null;
-    this.honorificPrefix = prefix != "undefined" ? prefix : null;
-    this.honorificSuffix = suffix != "undefined" ? suffix : null;
-};
-
-/**
-* Generic contact field.
-* @param type
-* @param value
-* @param pref
-* @param id
-*/
-var ContactField = function(type, value, pref, id) {
-    this.type = type != "undefined" ? type : null;
-    this.value = value != "undefined" ? value : null;
-    this.pref = pref != "undefined" ? pref : null;
-    this.id = id != "undefined" ? id : null;
-};
-
-/**
-* Contact address.
-* @param pref - boolean is primary / preferred address
-* @param type - string - work, home…..
-* @param formatted
-* @param streetAddress
-* @param locality
-* @param region
-* @param postalCode
-* @param country
-*/
-var ContactAddress = function(pref, type, formatted, streetAddress, locality, region, postalCode, country, id) {
-	this.pref = pref != "undefined" ? pref : null;
-	this.type = type != "undefined" ? type : null;
-    this.formatted = formatted != "undefined" ? formatted : null;
-    this.streetAddress = streetAddress != "undefined" ? streetAddress : null;
-    this.locality = locality != "undefined" ? locality : null;
-    this.region = region != "undefined" ? region : null;
-    this.postalCode = postalCode != "undefined" ? postalCode : null;
-    this.country = country != "undefined" ? country : null;
-    this.id = id != "undefined" ? id : null;
-};
-
-/**
-* Contact organization.
-* @param pref - boolean is primary / preferred address
-* @param type - string - work, home…..
-* @param name
-* @param dept
-* @param title
-*/
-var ContactOrganization = function(pref, type, name, dept, title) {
-	this.pref = pref != "undefined" ? pref : null;
-	this.type = type != "undefined" ? type : null;
-    this.name = name != "undefined" ? name : null;
-    this.department = dept != "undefined" ? dept : null;
-    this.title = title != "undefined" ? title : null;
-};
-
-/**
-* Contact account.
-* @param domain
-* @param username
-* @param userid
-*/
-/*var ContactAccount = function(domain, username, userid) {
-    this.domain = domain != "undefined" ? domain : null;
-    this.username = username != "undefined" ? username : null;
-    this.userid = userid != "undefined" ? userid : null;
-}*/
-
-/**
-* Represents a group of Contacts.
-*/
-var Contacts = function() {
-    this.inProgress = false;
-    this.records = new Array();
-};
-/**
-* Returns an array of Contacts matching the search criteria.
-* @param fields that should be searched
-* @param successCB success callback
-* @param errorCB error callback (optional)
-* @param {ContactFindOptions} options that can be applied to contact searching
-* @return array of Contacts matching search criteria
-*/
-Contacts.prototype.find = function(fields, successCB, errorCB, options) {
-	if (successCB === null) {
-        throw new TypeError("You must specify a success callback for the find command.");
-    }
-    if (fields === null || fields === "undefined" || fields.length === "undefined" || fields.length <= 0) {
-    	if (typeof errorCB === "function") {
-			errorCB({"code": ContactError.INVALID_ARGUMENT_ERROR});
-    	}
-    } else {
-		PhoneGap.exec(successCB, errorCB, "com.phonegap.contacts","search", [{"fields":fields, "findOptions":options}]);
-    }
-};
-/**
-* need to turn the array of JSON strings representing contact objects into actual objects
-* @param array of JSON strings with contact data
-* @return call results callback with array of Contact objects
-*  This function is called from objective C Contacts.search() method.
-*/
-Contacts.prototype._findCallback = function(pluginResult) {
-	var contacts = new Array();
-	try {
-		for (var i=0; i<pluginResult.message.length; i++) {
-			var newContact = navigator.contacts.create(pluginResult.message[i]); 
-			newContact.convertDatesIn();
-			contacts.push(newContact);
-		}
-		pluginResult.message = contacts;
-	} catch(e){
-			console.log("Error parsing contacts: " +e);
-	}
-	return pluginResult;
-}
-
-/**
-* need to turn the JSON string representing contact object into actual object
-* @param JSON string with contact data
-* Call stored results function with  Contact object
-*  This function is called from objective C Contacts remove and save methods
-*/
-Contacts.prototype._contactCallback = function(pluginResult)
-{
-	var newContact = null;
-	if (pluginResult.message){
-		try {
-			newContact = navigator.contacts.create(pluginResult.message);
-			newContact.convertDatesIn();
-		} catch(e){
-			console.log("Error parsing contact");
-		}
-	}
-	pluginResult.message = newContact;
-	return pluginResult;
-	
-};
-/** 
-* Need to return an error object rather than just a single error code
-* @param error code
-* Call optional error callback if found.
-* Called from objective c find, remove, and save methods on error.
-*/
-Contacts.prototype._errCallback = function(pluginResult)
-{
-	var errorObj = new ContactError();
-   	errorObj.code = pluginResult.message;
-	pluginResult.message = errorObj;
-	return pluginResult;
-};
-// iPhone only api to create a new contact via the GUI
-Contacts.prototype.newContactUI = function(successCallback) { 
-    PhoneGap.exec(successCallback, null, "com.phonegap.contacts","newContact", []);
-};
-// iPhone only api to select a contact via the GUI
-Contacts.prototype.chooseContact = function(successCallback, options) {
-    PhoneGap.exec(successCallback, null, "com.phonegap.contacts","chooseContact", options);
-};
-
-
-/**
-* This function creates a new contact, but it does not persist the contact
-* to device storage. To persist the contact to device storage, invoke
-* contact.save().
-* @param properties an object who's properties will be examined to create a new Contact
-* @returns new Contact object
-*/
-Contacts.prototype.create = function(properties) {
-    var i;
-    var contact = new Contact();
-    for (i in properties) {
-        if (contact[i] !== 'undefined') {
-            contact[i] = properties[i];
-        }
-    }
-    return contact;
-};
-
-/**
- * ContactFindOptions.
- * @param filter used to match contacts against
- * @param multiple boolean used to determine if more than one contact should be returned
- */
-var ContactFindOptions = function(filter, multiple, updatedSince) {
-    this.filter = filter || '';
-    this.multiple = multiple || false;
-};
-
-/**
- *  ContactError.
- *  An error code assigned by an implementation when an error has occurred
- */
-var ContactError = function() {
-    this.code=null;
-};
-
-/**
- * Error codes
- */
-ContactError.UNKNOWN_ERROR = 0;
-ContactError.INVALID_ARGUMENT_ERROR = 1;
-ContactError.TIMEOUT_ERROR = 2;
-ContactError.PENDING_OPERATION_ERROR = 3;
-ContactError.IO_ERROR = 4;
-ContactError.NOT_SUPPORTED_ERROR = 5;
-ContactError.PERMISSION_DENIED_ERROR = 20;
-
-/**
- * Add the contact interface into the browser.
- */
-PhoneGap.addConstructor(function() { 
-    if(typeof navigator.contacts == "undefined") {
-    	navigator.contacts = new Contacts();
-    }
-});
-};
-if (!PhoneGap.hasResource("file")) {
-	PhoneGap.addResource("file");
-
-/**
- * This class provides generic read and write access to the mobile device file system.
- * They are not used to read files from a server.
- */
-
-/**
- * This class provides some useful information about a file.
- * This is the fields returned when navigator.fileMgr.getFileProperties() 
- * is called.
- */
-FileProperties = function(filePath) {
-    this.filePath = filePath;
-    this.size = 0;
-    this.lastModifiedDate = null;
-}
-/**
- * Represents a single file.
- * 
- * name {DOMString} name of the file, without path information
- * fullPath {DOMString} the full path of the file, including the name
- * type {DOMString} mime type
- * lastModifiedDate {Date} last modified date
- * size {Number} size of the file in bytes
- */
-File = function(name, fullPath, type, lastModifiedDate, size) {
-	this.name = name || null;
-    this.fullPath = fullPath || null;
-	this.type = type || null;
-    this.lastModifiedDate = lastModifiedDate || null;
-    this.size = size || 0;
-}
-/**
- * Create an event object since we can't set target on DOM event.
- *
- * @param type
- * @param target
- *
- */
-File._createEvent = function(type, target) {
-    // Can't create event object, since we can't set target (its readonly)
-    //var evt = document.createEvent('Events');
-    //evt.initEvent("onload", false, false);
-    var evt = {"type": type};
-    evt.target = target;
-    return evt;
-};
-
-FileError = function() {
-   this.code = null;
-}
-
-// File error codes
-// Found in DOMException
-FileError.NOT_FOUND_ERR = 1;
-FileError.SECURITY_ERR = 2;
-FileError.ABORT_ERR = 3;
-
-// Added by this specification
-FileError.NOT_READABLE_ERR = 4;
-FileError.ENCODING_ERR = 5;
-FileError.NO_MODIFICATION_ALLOWED_ERR = 6;
-FileError.INVALID_STATE_ERR = 7;
-FileError.SYNTAX_ERR = 8;
-FileError.INVALID_MODIFICATION_ERR = 9;
-FileError.QUOTA_EXCEEDED_ERR = 10;
-FileError.TYPE_MISMATCH_ERR = 11;
-FileError.PATH_EXISTS_ERR = 12;
-
-//-----------------------------------------------------------------------------
-// File manager
-//-----------------------------------------------------------------------------
-
-FileMgr = function() {
-}
-
-FileMgr.prototype.testFileExists = function(fileName, successCallback, errorCallback) {
-    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "testFileExists", [fileName]);
-};
-
-FileMgr.prototype.testDirectoryExists = function(dirName, successCallback, errorCallback) {
-    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "testDirectoryExists", [dirName]);
-};
-
-FileMgr.prototype.getFreeDiskSpace = function(successCallback, errorCallback) {
-    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "getFreeDiskSpace", []);
-};
-
-FileMgr.prototype.write = function(fileName, data, position, successCallback, errorCallback) {
-    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "write", [fileName, data, position]);
-};
-
-FileMgr.prototype.truncate = function(fileName, size, successCallback, errorCallback) {
-    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "truncateFile", [fileName, size]);
-};
-
-FileMgr.prototype.readAsText = function(fileName, encoding, successCallback, errorCallback) {
-    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "readFile", [fileName, encoding]);
-};
-
-FileMgr.prototype.readAsDataURL = function(fileName, successCallback, errorCallback) {
-	PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "readAsDataURL", [fileName]);
-};
-
-PhoneGap.addConstructor(function() {
-    if (typeof navigator.fileMgr === "undefined") {
-        navigator.fileMgr = new FileMgr();
-    }
-});
-
-
-//-----------------------------------------------------------------------------
-// File Reader
-//-----------------------------------------------------------------------------
-
-/**
- * This class reads the mobile device file system.
- *
- */
-FileReader = function() {
-    this.fileName = "";
-
-    this.readyState = 0;
-
-    // File data
-    this.result = null;
-
-    // Error
-    this.error = null;
-
-    // Event handlers
-    this.onloadstart = null;    // When the read starts.
-    this.onprogress = null;     // While reading (and decoding) file or fileBlob data, and reporting partial file data (progess.loaded/progress.total)
-    this.onload = null;         // When the read has successfully completed.
-    this.onerror = null;        // When the read has failed (see errors).
-    this.onloadend = null;      // When the request has completed (either in success or failure).
-    this.onabort = null;        // When the read has been aborted. For instance, by invoking the abort() method.
-}
-
-// States
-FileReader.EMPTY = 0;
-FileReader.LOADING = 1;
-FileReader.DONE = 2;
-
-/**
- * Abort reading file.
- */
-FileReader.prototype.abort = function() {
-    var evt;
-    this.readyState = FileReader.DONE;
-    this.result = null;
-
-    // set error
-    var error = new FileError();
-    error.code = error.ABORT_ERR;
-    this.error = error;
-   
-    // If error callback
-    if (typeof this.onerror === "function") {
-        evt = File._createEvent("error", this);
-        this.onerror(evt);
-    }
-    // If abort callback
-    if (typeof this.onabort === "function") {
-        evt = File._createEvent("abort", this);
-        this.onabort(evt);
-    }
-    // If load end callback
-    if (typeof this.onloadend === "function") {
-        evt = File._createEvent("loadend", this);
-        this.onloadend(evt);
-    }
-};
-
-/**
- * Read text file.
- *
- * @param file          The name of the file
- * @param encoding      [Optional] (see http://www.iana.org/assignments/character-sets)
- */
-FileReader.prototype.readAsText = function(file, encoding) {
-    this.fileName = "";
-	if (typeof file.fullPath === "undefined") {
-		this.fileName = file;
-	} else {
-		this.fileName = file.fullPath;
-	}
-
-    // LOADING state
-    this.readyState = FileReader.LOADING;
-
-    // If loadstart callback
-    if (typeof this.onloadstart === "function") {
-        var evt = File._createEvent("loadstart", this);
-        this.onloadstart(evt);
-    }
-
-    // Default encoding is UTF-8
-    var enc = encoding ? encoding : "UTF-8";
-
-    var me = this;
-
-    // Read file
-    navigator.fileMgr.readAsText(this.fileName, enc,
-
-        // Success callback
-        function(r) {
-            var evt;
-
-            // If DONE (cancelled), then don't do anything
-            if (me.readyState === FileReader.DONE) {
-                return;
-            }
-
-            // Save result
-            me.result = decodeURIComponent(r);
-
-            // If onload callback
-            if (typeof me.onload === "function") {
-                evt = File._createEvent("load", me);
-                me.onload(evt);
-            }
-
-            // DONE state
-            me.readyState = FileReader.DONE;
-
-            // If onloadend callback
-            if (typeof me.onloadend === "function") {
-                evt = File._createEvent("loadend", me);
-                me.onloadend(evt);
-            }
-        },
-
-        // Error callback
-        function(e) {
-            var evt;
-            // If DONE (cancelled), then don't do anything
-            if (me.readyState === FileReader.DONE) {
-                return;
-            }
-
-            // Save error
-            me.error = e;
-
-            // If onerror callback
-            if (typeof me.onerror === "function") {
-                evt = File._createEvent("error", me);
-                me.onerror(evt);
-            }
-
-            // DONE state
-            me.readyState = FileReader.DONE;
-
-            // If onloadend callback
-            if (typeof me.onloadend === "function") {
-                evt = File._createEvent("loadend", me);
-                me.onloadend(evt);
-            }
-        }
-        );
-};
-
-
-/**
- * Read file and return data as a base64 encoded data url.
- * A data url is of the form:
- *      data:[<mediatype>][;base64],<data>
- *
- * @param file          {File} File object containing file properties
- */
-FileReader.prototype.readAsDataURL = function(file) {
-    this.fileName = "";
-    
-    if (typeof file.fullPath === "undefined") {
-        this.fileName = file;
-    } else {
-        this.fileName = file.fullPath;
-    }
-
-    // LOADING state
-    this.readyState = FileReader.LOADING;
-
-    // If loadstart callback
-    if (typeof this.onloadstart === "function") {
-        var evt = File._createEvent("loadstart", this);
-        this.onloadstart(evt);
-    }
-
-    var me = this;
-
-    // Read file
-    navigator.fileMgr.readAsDataURL(this.fileName,
-
-        // Success callback
-        function(r) {
-            var evt;
-
-            // If DONE (cancelled), then don't do anything
-            if (me.readyState === FileReader.DONE) {
-                return;
-            }
-
-            // Save result
-            me.result = r;
-
-            // If onload callback
-            if (typeof me.onload === "function") {
-                evt = File._createEvent("load", me);
-                me.onload(evt);
-            }
-
-            // DONE state
-            me.readyState = FileReader.DONE;
-
-            // If onloadend callback
-            if (typeof me.onloadend === "function") {
-                evt = File._createEvent("loadend", me);
-                me.onloadend(evt);
-            }
-        },
-
-        // Error callback
-        function(e) {
-            var evt;
-            // If DONE (cancelled), then don't do anything
-            if (me.readyState === FileReader.DONE) {
-                return;
-            }
-
-            // Save error
-            me.error = e;
-
-            // If onerror callback
-            if (typeof me.onerror === "function") {
-                evt = File._createEvent("error", me);
-                me.onerror(evt);
-            }
-
-            // DONE state
-            me.readyState = FileReader.DONE;
-
-            // If onloadend callback
-            if (typeof me.onloadend === "function") {
-                evt = File._createEvent("loadend", me);
-                me.onloadend(evt);
-            }
-        }
-        );
-};
-
-/**
- * Read file and return data as a binary data.
- *
- * @param file          The name of the file
- */
-FileReader.prototype.readAsBinaryString = function(file) {
-    // TODO - Can't return binary data to browser.
-    this.fileName = file;
-};
-
-/**
- * Read file and return data as a binary data.
- *
- * @param file          The name of the file
- */
-FileReader.prototype.readAsArrayBuffer = function(file) {
-    // TODO - Can't return binary data to browser.
-    this.fileName = file;
-};
-
-//-----------------------------------------------------------------------------
-// File Writer
-//-----------------------------------------------------------------------------
-
-/**
- * This class writes to the mobile device file system.
- *
-  @param file {File} a File object representing a file on the file system
-*/
-FileWriter = function(file) {
-    this.fileName = "";
-    this.length = 0;
-	if (file) {
-	    this.fileName = file.fullPath || file;
-	    this.length = file.size || 0;
-	}
-	
-	// default is to write at the beginning of the file
-    this.position = 0;
-    
-    this.readyState = 0; // EMPTY
-
-    this.result = null;
-
-    // Error
-    this.error = null;
-
-    // Event handlers
-    this.onwritestart = null;	// When writing starts
-    this.onprogress = null;		// While writing the file, and reporting partial file data
-    this.onwrite = null;		// When the write has successfully completed.
-    this.onwriteend = null;		// When the request has completed (either in success or failure).
-    this.onabort = null;		// When the write has been aborted. For instance, by invoking the abort() method.
-    this.onerror = null;		// When the write has failed (see errors).
-}
-
-// States
-FileWriter.INIT = 0;
-FileWriter.WRITING = 1;
-FileWriter.DONE = 2;
-
-/**
- * Abort writing file.
- */
-FileWriter.prototype.abort = function() {
-    // check for invalid state
-	if (this.readyState === FileWriter.DONE || this.readyState === FileWriter.INIT) {
-		throw FileError.INVALID_STATE_ERR;
-	} 
-
-    // set error
-    var error = new FileError(), evt;
-    error.code = error.ABORT_ERR;
-    this.error = error;
-    
-    // If error callback
-    if (typeof this.onerror === "function") {
-        evt = File._createEvent("error", this);
-        this.onerror(evt);
-    }
-    // If abort callback
-    if (typeof this.onabort === "function") {
-        evt = File._createEvent("abort", this);
-        this.onabort(evt);
-    }
-    
-    this.readyState = FileWriter.DONE;
-
-    // If write end callback
-    if (typeof this.onwriteend == "function") {
-        evt = File._createEvent("writeend", this);
-        this.onwriteend(evt);
-    }
-};
-
-/**
- * @Deprecated: use write instead
- * 
- * @param file to write the data to
- * @param text to be written
- * @param bAppend if true write to end of file, otherwise overwrite the file
- */
-FileWriter.prototype.writeAsText = function(file, text, bAppend) {
-	// Throw an exception if we are already writing a file
-	if (this.readyState === FileWriter.WRITING) {
-		throw FileError.INVALID_STATE_ERR;
-	}
-
-	if (bAppend !== true) {
-        bAppend = false; // for null values
-    }
-
-    this.fileName = file;
-
-    // WRITING state
-    this.readyState = FileWriter.WRITING;
-
-    var me = this;
-
-    // If onwritestart callback
-    if (typeof me.onwritestart === "function") {
-        var evt = File._createEvent("writestart", me);
-        me.onwritestart(evt);
-    }
-	
-	
-    // Write file 
-	navigator.fileMgr.writeAsText(file, text, bAppend,
-        // Success callback
-        function(r) {
-            var evt;
-
-            // If DONE (cancelled), then don't do anything
-            if (me.readyState === FileWriter.DONE) {
-                return;
-            }
-
-            // Save result
-            me.result = r;
-
-            // If onwrite callback
-            if (typeof me.onwrite === "function") {
-                evt = File._createEvent("write", me);
-                me.onwrite(evt);
-            }
-
-            // DONE state
-            me.readyState = FileWriter.DONE;
-
-            // If onwriteend callback
-            if (typeof me.onwriteend === "function") {
-                evt = File._createEvent("writeend", me);
-                me.onwriteend(evt);
-            }
-        },
-
-        // Error callback
-        function(e) {
-            var evt;
-
-            // If DONE (cancelled), then don't do anything
-            if (me.readyState === FileWriter.DONE) {
-                return;
-            }
-
-            // Save error
-            me.error = e;
-
-            // If onerror callback
-            if (typeof me.onerror === "function") {
-                evt = File._createEvent("error", me);
-                me.onerror(evt);
-            }
-
-            // DONE state
-            me.readyState = FileWriter.DONE;
-
-            // If onwriteend callback
-            if (typeof me.onwriteend === "function") {
-                evt = File._createEvent("writeend", me);
-                me.onwriteend(evt);
-            }
-        }
-    );
-};
-
-/**
- * Writes data to the file
- *  
- * @param text to be written
- */
-FileWriter.prototype.write = function(text) {
-	// Throw an exception if we are already writing a file
-	if (this.readyState === FileWriter.WRITING) {
-		throw FileError.INVALID_STATE_ERR;
-	}
-
-    // WRITING state
-    this.readyState = FileWriter.WRITING;
-
-    var me = this;
-
-    // If onwritestart callback
-    if (typeof me.onwritestart === "function") {
-        var evt = File._createEvent("writestart", me);
-        me.onwritestart(evt);
-    }
-
-    // Write file
-    navigator.fileMgr.write(this.fileName, text, this.position,
-
-        // Success callback
-        function(r) {
-            var evt;
-            // If DONE (cancelled), then don't do anything
-            if (me.readyState === FileWriter.DONE) {
-                return;
-            }
-
-            
-            // position always increases by bytes written because file would be extended
-            me.position += r;
-			// The length of the file is now where we are done writing.
-			me.length = me.position;
-            
-            // If onwrite callback
-            if (typeof me.onwrite === "function") {
-                evt = File._createEvent("write", me);
-                me.onwrite(evt);
-            }
-
-            // DONE state
-            me.readyState = FileWriter.DONE;
-
-            // If onwriteend callback
-            if (typeof me.onwriteend === "function") {
-                evt = File._createEvent("writeend", me);
-                me.onwriteend(evt);
-            }
-        },
-
-        // Error callback
-        function(e) {
-            var evt;
-
-            // If DONE (cancelled), then don't do anything
-            if (me.readyState === FileWriter.DONE) {
-                return;
-            }
-
-            // Save error
-            me.error = e;
-
-            // If onerror callback
-            if (typeof me.onerror === "function") {
-                evt = File._createEvent("error", me);
-                me.onerror(evt);
-            }
-
-            // DONE state
-            me.readyState = FileWriter.DONE;
-
-            // If onwriteend callback
-            if (typeof me.onwriteend === "function") {
-                evt = File._createEvent("writeend", me);
-                me.onwriteend(evt);
-            }
-        }
-        );
-
-};
-
-/** 
- * Moves the file pointer to the location specified.
- * 
- * If the offset is a negative number the position of the file 
- * pointer is rewound.  If the offset is greater than the file 
- * size the position is set to the end of the file.  
- * 
- * @param offset is the location to move the file pointer to.
- */
-FileWriter.prototype.seek = function(offset) {
-    // Throw an exception if we are already writing a file
-    if (this.readyState === FileWriter.WRITING) {
-        throw FileError.INVALID_STATE_ERR;
-    }
-
-    if (!offset) {
-        return;
-    }
-    
-    // See back from end of file.
-    if (offset < 0) {
-		this.position = Math.max(offset + this.length, 0);
-	}
-    // Offset is bigger then file size so set position 
-    // to the end of the file.
-	else if (offset > this.length) {
-		this.position = this.length;
-	}
-    // Offset is between 0 and file size so set the position
-    // to start writing.
-	else {
-		this.position = offset;
-	}	
-};
-
-/** 
- * Truncates the file to the size specified.
- * 
- * @param size to chop the file at.
- */
-FileWriter.prototype.truncate = function(size) {
-	// Throw an exception if we are already writing a file
-	if (this.readyState === FileWriter.WRITING) {
-		throw FileError.INVALID_STATE_ERR;
-	}
-	// what if no size specified? 
-
-    // WRITING state
-    this.readyState = FileWriter.WRITING;
-
-    var me = this;
-
-    // If onwritestart callback
-    if (typeof me.onwritestart === "function") {
-        var evt = File._createEvent("writestart", me);
-        me.onwritestart(evt);
-    }
-
-    // Write file
-    navigator.fileMgr.truncate(this.fileName, size,
-
-        // Success callback
-        function(r) {
-            var evt;
-            // If DONE (cancelled), then don't do anything
-            if (me.readyState === FileWriter.DONE) {
-                return;
-            }
-
-            // Update the length of the file
-            me.length = r;
-            me.position = Math.min(me.position, r);
-
-            // If onwrite callback
-            if (typeof me.onwrite === "function") {
-                evt = File._createEvent("write", me);
-                me.onwrite(evt);
-            }
-
-            // DONE state
-            me.readyState = FileWriter.DONE;
-
-            // If onwriteend callback
-            if (typeof me.onwriteend === "function") {
-                evt = File._createEvent("writeend", me);
-                me.onwriteend(evt);
-            }
-        },
-
-        // Error callback
-        function(e) {
-            var evt;
-            // If DONE (cancelled), then don't do anything
-            if (me.readyState === FileWriter.DONE) {
-                return;
-            }
-
-            // Save error
-            me.error = e;
-
-            // If onerror callback
-            if (typeof me.onerror === "function") {
-                evt = File._createEvent("error", me);
-                me.onerror(evt);
-            }
-
-            // DONE state
-            me.readyState = FileWriter.DONE;
-
-            // If onwriteend callback
-            if (typeof me.onwriteend === "function") {
-                evt = File._createEvent("writeend", me);
-                me.onwriteend(evt);
-            }
-        }
-    );
-};
-
-LocalFileSystem = function() {
-};
-
-// File error codes
-LocalFileSystem.TEMPORARY = 0;
-LocalFileSystem.PERSISTENT = 1;
-LocalFileSystem.RESOURCE = 2;
-LocalFileSystem.APPLICATION = 3;
-
-/**
- * Requests a filesystem in which to store application data.
- * 
- * @param {int} type of file system being requested
- * @param {Function} successCallback is called with the new FileSystem
- * @param {Function} errorCallback is called with a FileError
- */
-LocalFileSystem.prototype.requestFileSystem = function(type, size, successCallback, errorCallback) {
-	if (type < 0 || type > 3) {
-		if (typeof errorCallback == "function") {
-			errorCallback({
-				"code": FileError.SYNTAX_ERR
-			});
-		}
-	}
-	else {
-		PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "requestFileSystem", [type, size]);
-	}
-};
-
-/**
- * 
- * @param {DOMString} uri referring to a local file in a filesystem
- * @param {Function} successCallback is called with the new entry
- * @param {Function} errorCallback is called with a FileError
- */
-LocalFileSystem.prototype.resolveLocalFileSystemURI = function(uri, successCallback, errorCallback) {
-    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "resolveLocalFileSystemURI", [uri]);
-};
-
-/**
-* This function  is required as we need to convert raw 
-* JSON objects into concrete File and Directory objects.  
-* 
-* @param a JSON Objects that need to be converted to DirectoryEntry or FileEntry objects.
-* @returns an entry 
-*/
-LocalFileSystem.prototype._castFS = function(pluginResult) {
-    var entry = null;
-    entry = new DirectoryEntry();
-    entry.isDirectory = pluginResult.message.root.isDirectory;
-    entry.isFile = pluginResult.message.root.isFile;
-    entry.name = pluginResult.message.root.name;
-    entry.fullPath = pluginResult.message.root.fullPath;
-    pluginResult.message.root = entry;
-    return pluginResult;    
-}
-
-LocalFileSystem.prototype._castEntry = function(pluginResult) {
-    var entry = null;
-    if (pluginResult.message.isDirectory) {
-        entry = new DirectoryEntry();
-    }
-    else if (pluginResult.message.isFile) {
-		entry = new FileEntry();
-    }
-    entry.isDirectory = pluginResult.message.isDirectory;
-    entry.isFile = pluginResult.message.isFile;
-    entry.name = pluginResult.message.name;
-    entry.fullPath = pluginResult.message.fullPath;
-    pluginResult.message = entry;
-    return pluginResult;    
-}
-
-LocalFileSystem.prototype._castEntries = function(pluginResult) {
-    var entries = pluginResult.message;
-	var retVal = []; 
-	for (i=0; i<entries.length; i++) {
-		retVal.push(window.localFileSystem._createEntry(entries[i]));
-	}
-    pluginResult.message = retVal;
-    return pluginResult;    
-}
-
-LocalFileSystem.prototype._createEntry = function(castMe) {
-	var entry = null;
-    if (castMe.isDirectory) {
-        entry = new DirectoryEntry();
-    }
-    else if (castMe.isFile) {
-        entry = new FileEntry();
-    }
-    entry.isDirectory = castMe.isDirectory;
-    entry.isFile = castMe.isFile;
-    entry.name = castMe.name;
-    entry.fullPath = castMe.fullPath;
-    return entry;    
-
-}
-
-LocalFileSystem.prototype._castDate = function(pluginResult) {
-	if (pluginResult.message.modificationTime) {
-		var metadataObj = new Metadata();
-		
-	    metadataObj.modificationTime = new Date(pluginResult.message.modificationTime);
-	    pluginResult.message = metadataObj;
-	}
-	else if (pluginResult.message.lastModifiedDate) {
-		var file = new File();
-        file.size = pluginResult.message.size;
-        file.type = pluginResult.message.type;
-        file.name = pluginResult.message.name;
-        file.fullPath = pluginResult.message.fullPath;
-		file.lastModifiedDate = new Date(pluginResult.message.lastModifiedDate);
-	    pluginResult.message = file;		
-	}
-
-    return pluginResult;	
-}
-LocalFileSystem.prototype._castError = function(pluginResult) {
-	var fileError = new FileError();
-	fileError.code = pluginResult.message;
-	pluginResult.message = fileError;
-	return pluginResult;
-}
-
-/**
- * Information about the state of the file or directory
- * 
- * {Date} modificationTime (readonly)
- */
-Metadata = function() {
-    this.modificationTime=null;
-};
-
-/**
- * Supplies arguments to methods that lookup or create files and directories
- * 
- * @param {boolean} create file or directory if it doesn't exist 
- * @param {boolean} exclusive if true the command will fail if the file or directory exists
- */
-Flags = function(create, exclusive) {
-    this.create = create || false;
-    this.exclusive = exclusive || false;
-};
-
-/**
- * An interface representing a file system
- * 
- * {DOMString} name the unique name of the file system (readonly)
- * {DirectoryEntry} root directory of the file system (readonly)
- */
-FileSystem = function() {
-    this.name = null;
-    this.root = null;
-};
-
-/**
- * An interface representing a directory on the file system.
- * 
- * {boolean} isFile always false (readonly)
- * {boolean} isDirectory always true (readonly)
- * {DOMString} name of the directory, excluding the path leading to it (readonly)
- * {DOMString} fullPath the absolute full path to the directory (readonly)
- * {FileSystem} filesystem on which the directory resides (readonly)
- */
-DirectoryEntry = function() {
-    this.isFile = false;
-    this.isDirectory = true;
-    this.name = null;
-    this.fullPath = null;
-    this.filesystem = null;
-};
-
-/**
- * Copies a directory to a new location
- * 
- * @param {DirectoryEntry} parent the directory to which to copy the entry
- * @param {DOMString} newName the new name of the entry, defaults to the current name
- * @param {Function} successCallback is called with the new entry
- * @param {Function} errorCallback is called with a FileError
- */
-DirectoryEntry.prototype.copyTo = function(parent, newName, successCallback, errorCallback) {
-    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "copyTo", [this.fullPath, parent, newName]);
-};
-
-/**
- * Looks up the metadata of the entry
- * 
- * @param {Function} successCallback is called with a Metadata object
- * @param {Function} errorCallback is called with a FileError
- */
-DirectoryEntry.prototype.getMetadata = function(successCallback, errorCallback) {
-    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "getMetadata", [this.fullPath]);
-};
-
-/**
- * Gets the parent of the entry
- * 
- * @param {Function} successCallback is called with a parent entry
- * @param {Function} errorCallback is called with a FileError
- */
-DirectoryEntry.prototype.getParent = function(successCallback, errorCallback) {
-    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "getParent", [this.fullPath]);
-};
-
-/**
- * Moves a directory to a new location
- * 
- * @param {DirectoryEntry} parent the directory to which to move the entry
- * @param {DOMString} newName the new name of the entry, defaults to the current name
- * @param {Function} successCallback is called with the new entry
- * @param {Function} errorCallback is called with a FileError
- */
-DirectoryEntry.prototype.moveTo = function(parent, newName, successCallback, errorCallback) {
-    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "moveTo", [this.fullPath, parent, newName]);
-};
-
-/**
- * Removes the entry
- * 
- * @param {Function} successCallback is called with no parameters
- * @param {Function} errorCallback is called with a FileError
- */
-DirectoryEntry.prototype.remove = function(successCallback, errorCallback) {
-    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "remove", [this.fullPath]);
-};
-
-/**
- * Returns a URI that can be used to identify this entry.
- * 
- * @param {DOMString} mimeType for a FileEntry, the mime type to be used to interpret the file, when loaded through this URI.
- * @param {Function} successCallback is called with the new entry
- * @param {Function} errorCallback is called with a FileError
- */
-DirectoryEntry.prototype.toURI = function(mimeType, successCallback, errorCallback) {
-    return "file://localhost" + this.fullPath;
-    //PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "toURI", [this.fullPath, mimeType]);
-};
-
-/**
- * Creates a new DirectoryReader to read entries from this directory
- */
-DirectoryEntry.prototype.createReader = function(successCallback, errorCallback) {
-    return new DirectoryReader(this.fullPath);
-};
-
-/**
- * Creates or looks up a directory
- * 
- * @param {DOMString} path either a relative or absolute path from this directory in which to look up or create a directory
- * @param {Flags} options to create or excluively create the directory
- * @param {Function} successCallback is called with the new entry
- * @param {Function} errorCallback is called with a FileError
- */
-DirectoryEntry.prototype.getDirectory = function(path, options, successCallback, errorCallback) {
-    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "getDirectory", [this.fullPath, path, options]);
-};
-
-/**
- * Creates or looks up a file
- * 
- * @param {DOMString} path either a relative or absolute path from this directory in which to look up or create a file
- * @param {Flags} options to create or excluively create the file
- * @param {Function} successCallback is called with the new entry
- * @param {Function} errorCallback is called with a FileError
- */
-DirectoryEntry.prototype.getFile = function(path, options, successCallback, errorCallback) {
-    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "getFile", [this.fullPath, path, options]);
-};
-
-/**
- * Deletes a directory and all of it's contents
- * 
- * @param {Function} successCallback is called with no parameters
- * @param {Function} errorCallback is called with a FileError
- */
-DirectoryEntry.prototype.removeRecursively = function(successCallback, errorCallback) {
-    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "removeRecursively", [this.fullPath]);
-};
-
-/**
- * An interface that lists the files and directories in a directory.
- */
-DirectoryReader = function(fullPath){
-	this.fullPath = fullPath || null;    
-};
-
-/**
- * Returns a list of entries from a directory.
- * 
- * @param {Function} successCallback is called with a list of entries
- * @param {Function} errorCallback is called with a FileError
- */
-DirectoryReader.prototype.readEntries = function(successCallback, errorCallback) {
-    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "readEntries", [this.fullPath]);
-}
- 
-/**
- * An interface representing a directory on the file system.
- * 
- * {boolean} isFile always true (readonly)
- * {boolean} isDirectory always false (readonly)
- * {DOMString} name of the file, excluding the path leading to it (readonly)
- * {DOMString} fullPath the absolute full path to the file (readonly)
- * {FileSystem} filesystem on which the directory resides (readonly)
- */
-FileEntry = function() {
-    this.isFile = true;
-    this.isDirectory = false;
-    this.name = null;
-    this.fullPath = null;
-    this.filesystem = null;
-};
-
-/**
- * Copies a file to a new location
- * 
- * @param {DirectoryEntry} parent the directory to which to copy the entry
- * @param {DOMString} newName the new name of the entry, defaults to the current name
- * @param {Function} successCallback is called with the new entry
- * @param {Function} errorCallback is called with a FileError
- */
-FileEntry.prototype.copyTo = function(parent, newName, successCallback, errorCallback) {
-    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "copyTo", [this.fullPath, parent, newName]);
-};
-
-/**
- * Looks up the metadata of the entry
- * 
- * @param {Function} successCallback is called with a Metadata object
- * @param {Function} errorCallback is called with a FileError
- */
-FileEntry.prototype.getMetadata = function(successCallback, errorCallback) {
-    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "getMetadata", [this.fullPath]);
-};
-
-/**
- * Gets the parent of the entry
- * 
- * @param {Function} successCallback is called with a parent entry
- * @param {Function} errorCallback is called with a FileError
- */
-FileEntry.prototype.getParent = function(successCallback, errorCallback) {
-    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "getParent", [this.fullPath]);
-};
-
-/**
- * Moves a directory to a new location
- * 
- * @param {DirectoryEntry} parent the directory to which to move the entry
- * @param {DOMString} newName the new name of the entry, defaults to the current name
- * @param {Function} successCallback is called with the new entry
- * @param {Function} errorCallback is called with a FileError
- */
-FileEntry.prototype.moveTo = function(parent, newName, successCallback, errorCallback) {
-    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "moveTo", [this.fullPath, parent, newName]);
-};
-
-/**
- * Removes the entry
- * 
- * @param {Function} successCallback is called with no parameters
- * @param {Function} errorCallback is called with a FileError
- */
-FileEntry.prototype.remove = function(successCallback, errorCallback) {
-    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "remove", [this.fullPath]);
-};
-
-/**
- * Returns a URI that can be used to identify this entry.
- * 
- * @param {DOMString} mimeType for a FileEntry, the mime type to be used to interpret the file, when loaded through this URI.
- * @param {Function} successCallback is called with the new entry
- * @param {Function} errorCallback is called with a FileError
- */
-FileEntry.prototype.toURI = function(mimeType, successCallback, errorCallback) {
-    return "file://localhost" + this.fullPath;
-    //PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "toURI", [this.fullPath, mimeType]);
-};
-
-/**
- * Creates a new FileWriter associated with the file that this FileEntry represents.
- * 
- * @param {Function} successCallback is called with the new FileWriter
- * @param {Function} errorCallback is called with a FileError
- */
-FileEntry.prototype.createWriter = function(successCallback, errorCallback) {
-	this.file(function(filePointer) {	
-		var writer = new FileWriter(filePointer);
-		if (writer.fileName == null || writer.fileName == "") {
-			if (typeof errorCallback == "function") {
-				errorCallback({
-					"code": FileError.INVALID_STATE_ERR
-				});
-		}
-		}
-		if (typeof successCallback == "function") {
-			successCallback(writer);
-		}       
-	}, errorCallback);
-};
-
-/**
- * Returns a File that represents the current state of the file that this FileEntry represents.
- * 
- * @param {Function} successCallback is called with the new File object
- * @param {Function} errorCallback is called with a FileError
- */
-FileEntry.prototype.file = function(successCallback, errorCallback) {
-    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "getFileMetadata", [this.fullPath]);
-};
-
-/**
- * Add the FileSystem interface into the browser.
- */
-PhoneGap.addConstructor(function() {
-	var pgLocalFileSystem = new LocalFileSystem();
-	// Needed for cast methods
-    if(typeof window.localFileSystem == "undefined") window.localFileSystem  = pgLocalFileSystem;
-    if(typeof window.requestFileSystem == "undefined") window.requestFileSystem  = pgLocalFileSystem.requestFileSystem;
-    if(typeof window.resolveLocalFileSystemURI == "undefined") window.resolveLocalFileSystemURI = pgLocalFileSystem.resolveLocalFileSystemURI;
-});
-};
-
-
-
-
-/*
- * Copyright (c) 2011, Matt Kane
- */
-
-if (!PhoneGap.hasResource("filetransfer")) {
-	PhoneGap.addResource("filetransfer");
-
-/**
- * FileTransfer uploads a file to a remote server.
- */
-FileTransfer = function() {}
-
-/**
- * FileUploadResult
- */
-FileUploadResult = function() {
-    this.bytesSent = 0;
-    this.responseCode = null;
-    this.response = null;
-}
-
-/**
- * FileTransferError
- */
-FileTransferError = function(errorCode) {
-    this.code = errorCode || null;
-}
-
-FileTransferError.FILE_NOT_FOUND_ERR = 1;
-FileTransferError.INVALID_URL_ERR = 2;
-FileTransferError.CONNECTION_ERR = 3;
-
-/**
-* Given an absolute file path, uploads a file on the device to a remote server 
-* using a multipart HTTP request.
-* @param filePath {String}           Full path of the file on the device
-* @param server {String}             URL of the server to receive the file
-* @param successCallback (Function}  Callback to be invoked when upload has completed
-* @param errorCallback {Function}    Callback to be invoked upon error
-* @param options {FileUploadOptions} Optional parameters such as file name and mimetype           
-*/
-FileTransfer.prototype.upload = function(filePath, server, successCallback, errorCallback, options) {
-	if(!options.params) {
-		options.params = {};
-	}
-	options.filePath = filePath;
-	options.server = server;
-	if(!options.fileKey) {
-		options.fileKey = 'file';
-	}
-	if(!options.fileName) {
-		options.fileName = 'image.jpg';
-	}
-	if(!options.mimeType) {
-		options.mimeType = 'image/jpeg';
-	}
-	
-	// successCallback required
-	if (typeof successCallback != "function") {
-        console.log("FileTransfer Error: successCallback is not a function");
-        return;
-    }
-
-
-    // errorCallback optional
-    if (errorCallback && (typeof errorCallback != "function")) {
-        console.log("FileTransfer Error: errorCallback is not a function");
-        return;
-    }
-	
-    PhoneGap.exec(successCallback, errorCallback, 'com.phonegap.filetransfer', 'upload', [options]);
-};
-
-FileTransfer.prototype._castTransferError = function(pluginResult) {
-	var fileError = new FileTransferError(pluginResult.message);
-	//fileError.code = pluginResult.message;
-	pluginResult.message = fileError;
-	return pluginResult;
-}
-
-FileTransfer.prototype._castUploadResult = function(pluginResult) {
-	var result = new FileUploadResult();
-	result.bytesSent = pluginResult.message.bytesSent;
-	result.responseCode = pluginResult.message.responseCode;
-	result.response = decodeURIComponent(pluginResult.message.response);
-	pluginResult.message = result;
-	return pluginResult;
-}
-
-/**
- * Downloads a file form a given URL and saves it to the specified directory.
- * @param source {String}          URL of the server to receive the file
- * @param target {String}         Full path of the file on the device
- * @param successCallback (Function}  Callback to be invoked when upload has completed
- * @param errorCallback {Function}    Callback to be invoked upon error
- */
-FileTransfer.prototype.download = function(source, target, successCallback, errorCallback) {
-	PhoneGap.exec(successCallback, errorCallback, 'com.phonegap.filetransfer', 'download', [source, target]);
-};
-
-/**
- * Options to customize the HTTP request used to upload files.
- * @param fileKey {String}   Name of file request parameter.
- * @param fileName {String}  Filename to be used by the server. Defaults to image.jpg.
- * @param mimeType {String}  Mimetype of the uploaded file. Defaults to image/jpeg.
- * @param params {Object}    Object with key: value params to send to the server.
- */
-FileUploadOptions = function(fileKey, fileName, mimeType, params) {
-    this.fileKey = fileKey || null;
-    this.fileName = fileName || null;
-    this.mimeType = mimeType || null;
-    this.params = params || null;
-}
-
-
-PhoneGap.addConstructor(function() {
-    if (typeof navigator.fileTransfer == "undefined") navigator.fileTransfer = new FileTransfer();
-});
-};
-if (!PhoneGap.hasResource("geolocation")) {
-	PhoneGap.addResource("geolocation");
-
-/**
- * This class provides access to device GPS data.
- * @constructor
- */
-Geolocation = function() {
-    // The last known GPS position.
-    this.lastPosition = null;
-    this.listener = null;
-    this.timeoutTimerId = 0;
-
-};
-
-
-/**
- * Asynchronously aquires the current position.
- * @param {Function} successCallback The function to call when the position
- * data is available
- * @param {Function} errorCallback The function to call when there is an error 
- * getting the position data.
- * @param {PositionOptions} options The options for getting the position data
- * such as timeout.
- * PositionOptions.forcePrompt:Bool default false, 
- * - tells iPhone to prompt the user to turn on location services.
- * - may cause your app to exit while the user is sent to the Settings app
- * PositionOptions.distanceFilter:double aka Number
- * - used to represent a distance in meters.
-PositionOptions
-{
-   desiredAccuracy:Number
-   - a distance in meters 
-		< 10   = best accuracy  ( Default value )
-		< 100  = Nearest Ten Meters
-		< 1000 = Nearest Hundred Meters
-		< 3000 = Accuracy Kilometers
-		3000+  = Accuracy 3 Kilometers
-		
-	forcePrompt:Boolean default false ( iPhone Only! )
-    - tells iPhone to prompt the user to turn on location services.
-	- may cause your app to exit while the user is sent to the Settings app
-	
-	distanceFilter:Number
-	- The minimum distance (measured in meters) a device must move laterally before an update event is generated.
-	- measured relative to the previously delivered location
-	- default value: null ( all movements will be reported )
-	
-}
-
- */
- 
-Geolocation.prototype.getCurrentPosition = function(successCallback, errorCallback, options) 
-{
-    // create an always valid local success callback
-    var win = successCallback;
-    if (!win || typeof(win) != 'function')
-    {
-        win = function(position) {};
-    }
-    
-    // create an always valid local error callback
-    var fail = errorCallback;
-    if (!fail || typeof(fail) != 'function')
-    {
-        fail = function(positionError) {};
-    }	
-
-    var self = this;
-    var totalTime = 0;
-	var timeoutTimerId;
-	
-	// set params to our default values
-	var params = new PositionOptions();
-	
-    if (options) 
-    {
-        if (options.maximumAge) 
-        {
-            // special case here if we have a cached value that is younger than maximumAge
-            if(this.lastPosition)
-            {
-                var now = new Date().getTime();
-                if((now - this.lastPosition.timestamp) < options.maximumAge)
-                {
-                    win(this.lastPosition); // send cached position immediately 
-                    return;                 // Note, execution stops here -jm
-                }
-            }
-            params.maximumAge = options.maximumAge;
-        }
-        if (options.enableHighAccuracy) 
-        {
-            params.enableHighAccuracy = (options.enableHighAccuracy == true); // make sure it's truthy
-        }
-        if (options.timeout) 
-        {
-            params.timeout = options.timeout;
-        }
-    }
-
-    var successListener = win;
-    var failListener = fail;
-    if (!this.locationRunning)
-    {
-        successListener = function(position)
-        { 
-            win(position);
-            self.stop();
-        };
-        errorListener = function(positionError)
-        { 
-            fail(positionError);
-            self.stop();
-        };
-    }
-    
-    this.listener = {"success":successListener,"fail":failListener};
-    this.start(params);
-	
-	var onTimeout = function()
-	{
-	    self.setError(new PositionError(PositionError.TIMEOUT,"Geolocation Error: Timeout."));
-	};
-
-    clearTimeout(this.timeoutTimerId);
-    this.timeoutTimerId = setTimeout(onTimeout, params.timeout); 
-};
-
-/**
- * Asynchronously aquires the position repeatedly at a given interval.
- * @param {Function} successCallback The function to call each time the position
- * data is available
- * @param {Function} errorCallback The function to call when there is an error 
- * getting the position data.
- * @param {PositionOptions} options The options for getting the position data
- * such as timeout and the frequency of the watch.
- */
-Geolocation.prototype.watchPosition = function(successCallback, errorCallback, options) {
-	// Invoke the appropriate callback with a new Position object every time the implementation 
-	// determines that the position of the hosting device has changed. 
-
-	var self = this; // those == this & that
-	
-	var params = new PositionOptions();
-
-    if(options)
-    {
-        if (options.maximumAge) {
-            params.maximumAge = options.maximumAge;
-        }
-        if (options.enableHighAccuracy) {
-            params.enableHighAccuracy = options.enableHighAccuracy;
-        }
-        if (options.timeout) {
-            params.timeout = options.timeout;
-        }
-    }
-
-	var that = this;
-    var lastPos = that.lastPosition? that.lastPosition.clone() : null;
-    
-	var intervalFunction = function() {
-        
-		var filterFun = function(position) {
-            if (lastPos == null || !position.equals(lastPos)) {
-                // only call the success callback when there is a change in position, per W3C
-                successCallback(position);
-            }
-            
-            // clone the new position, save it as our last position (internal var)
-            lastPos = position.clone();
-        };
-		
-		that.getCurrentPosition(filterFun, errorCallback, params);
-	};
-	
-    // Retrieve location immediately and schedule next retrieval afterwards
-	intervalFunction();
-	
-	return setInterval(intervalFunction, params.timeout);
-};
-
-
-/**
- * Clears the specified position watch.
- * @param {String} watchId The ID of the watch returned from #watchPosition.
- */
-Geolocation.prototype.clearWatch = function(watchId) {
-	clearInterval(watchId);
-};
-
-/**
- * Called by the geolocation framework when the current location is found.
- * @param {PositionOptions} position The current position.
- */
-Geolocation.prototype.setLocation = function(position) 
-{
-    var _position = new Position(position.coords, position.timestamp);
-
-    if(this.timeoutTimerId)
-    {
-        clearTimeout(this.timeoutTimerId);
-        this.timeoutTimerId = 0;
-    }
-    
-	this.lastError = null;
-    this.lastPosition = _position;
-    
-    if(this.listener && typeof(this.listener.success) == 'function')
-    {
-        this.listener.success(_position);
-    }
-    
-    this.listener = null;
-};
-
-/**
- * Called by the geolocation framework when an error occurs while looking up the current position.
- * @param {String} message The text of the error message.
- */
-Geolocation.prototype.setError = function(error) 
-{
-	var _error = new PositionError(error.code, error.message);
-
-    this.locationRunning = false
-	
-    if(this.timeoutTimerId)
-    {
-        clearTimeout(this.timeoutTimerId);
-        this.timeoutTimerId = 0;
-    }
-    
-    this.lastError = _error;
-    // call error handlers directly
-    if(this.listener && typeof(this.listener.fail) == 'function')
-    {
-        this.listener.fail(_error);
-    }
-    this.listener = null;
-
-};
-
-Geolocation.prototype.start = function(positionOptions) 
-{
-    PhoneGap.exec(null, null, "com.phonegap.geolocation", "startLocation", [positionOptions]);
-    this.locationRunning = true
-
-};
-
-Geolocation.prototype.stop = function() 
-{
-    PhoneGap.exec(null, null, "com.phonegap.geolocation", "stopLocation", []);
-    this.locationRunning = false
-};
-
-
-PhoneGap.addConstructor(function() 
-{
-    if (typeof navigator._geo == "undefined") 
-    {
-        // replace origObj's functions ( listed in funkList ) with the same method name on proxyObj
-        // this is a workaround to prevent UIWebView/MobileSafari default implementation of GeoLocation
-        // because it includes the full page path as the title of the alert prompt
-        var __proxyObj = function (origObj,proxyObj,funkList)
-        {
-            var replaceFunk = function(org,proxy,fName)
-            { 
-                org[fName] = function()
-                { 
-                   return proxy[fName].apply(proxy,arguments); 
-                }; 
-            };
-
-            for(var v in funkList) { replaceFunk(origObj,proxyObj,funkList[v]);}
-        }
-        navigator._geo = new Geolocation();
-        __proxyObj(navigator.geolocation, navigator._geo,
-                 ["setLocation","getCurrentPosition","watchPosition",
-                  "clearWatch","setError","start","stop"]);
-
-    }
-
-});
-};
-if (!PhoneGap.hasResource("compass")) {
-	PhoneGap.addResource("compass");
-
-CompassError = function(){
-   this.code = null;
-};
-
-// Capture error codes
-CompassError.COMPASS_INTERNAL_ERR = 0;
-CompassError.COMPASS_NOT_SUPPORTED = 20;
-
-CompassHeading = function() {
-	this.magneticHeading = null;
-	this.trueHeading = null;
-	this.headingAccuracy = null;
-	this.timestamp = null;
-}	
-/**
- * This class provides access to device Compass data.
- * @constructor
- */
-Compass = function() {
-    /**
-     * List of compass watch timers
-     */
-    this.timers = {};
-};
-
-/**
- * Asynchronously acquires the current heading.
- * @param {Function} successCallback The function to call when the heading
- * data is available
- * @param {Function} errorCallback The function to call when there is an error 
- * getting the heading data.
- * @param {PositionOptions} options The options for getting the heading data (not used).
- */
-Compass.prototype.getCurrentHeading = function(successCallback, errorCallback, options) {
- 	// successCallback required
-    if (typeof successCallback !== "function") {
-        console.log("Compass Error: successCallback is not a function");
-        return;
-    }
-
-    // errorCallback optional
-    if (errorCallback && (typeof errorCallback !== "function")) {
-        console.log("Compass Error: errorCallback is not a function");
-        return;
-    }
-
-    // Get heading
-    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.geolocation", "getCurrentHeading", []);
-};
-
-/**
- * Asynchronously acquires the heading repeatedly at a given interval.
- * @param {Function} successCallback The function to call each time the heading
- * data is available
- * @param {Function} errorCallback The function to call when there is an error 
- * getting the heading data.
- * @param {HeadingOptions} options The options for getting the heading data
- * such as timeout and the frequency of the watch.
- */
-Compass.prototype.watchHeading= function(successCallback, errorCallback, options) 
-{
-	// Default interval (100 msec)
-    var frequency = (options !== undefined) ? options.frequency : 100;
-
-    // successCallback required
-    if (typeof successCallback !== "function") {
-        console.log("Compass Error: successCallback is not a function");
-        return;
-    }
-
-    // errorCallback optional
-    if (errorCallback && (typeof errorCallback !== "function")) {
-        console.log("Compass Error: errorCallback is not a function");
-        return;
-    }
-
-    // Start watch timer to get headings
-    var id = PhoneGap.createUUID();
-    navigator.compass.timers[id] = setInterval(
-        function() {
-            PhoneGap.exec(successCallback, errorCallback, "com.phonegap.geolocation", "getCurrentHeading", [{repeats: 1}]);
-        }, frequency);
-
-    return id;
-};
-
-
-/**
- * Clears the specified heading watch.
- * @param {String} watchId The ID of the watch returned from #watchHeading.
- */
-Compass.prototype.clearWatch = function(id) 
-{
-	// Stop javascript timer & remove from timer list
-    if (id && navigator.compass.timers[id]) {
-        clearInterval(navigator.compass.timers[id]);
-        delete navigator.compass.timers[id];
-    }
-    if (navigator.compass.timers.length == 0) {
-    	// stop the 
-    	PhoneGap.exec(null, null, "com.phonegap.geolocation", "stopHeading", []);
-    }
-};
-
-/** iOS only
- * Asynchronously fires when the heading changes from the last reading.  The amount of distance 
- * required to trigger the event is specified in the filter paramter.
- * @param {Function} successCallback The function to call each time the heading
- * data is available
- * @param {Function} errorCallback The function to call when there is an error 
- * getting the heading data.
- * @param {HeadingOptions} options The options for getting the heading data
- * 			@param {filter} number of degrees change to trigger a callback with heading data (float)
- *
- * In iOS this function is more efficient than calling watchHeading  with a frequency for updates.
- * Only one watchHeadingFilter can be in effect at one time.  If a watchHeadingFilter is in effect, calling
- * getCurrentHeading or watchHeading will use the existing filter value for specifying heading change. 
-  */
-Compass.prototype.watchHeadingFilter = function(successCallback, errorCallback, options) 
-{
- 
- 	if (options === undefined || options.filter === undefined) {
- 		console.log("Compass Error:  options.filter not specified");
- 		return;
- 	}
-
-    // successCallback required
-    if (typeof successCallback !== "function") {
-        console.log("Compass Error: successCallback is not a function");
-        return;
-    }
-
-    // errorCallback optional
-    if (errorCallback && (typeof errorCallback !== "function")) {
-        console.log("Compass Error: errorCallback is not a function");
-        return;
-    }
-    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.geolocation", "watchHeadingFilter", [options]);
-}
-Compass.prototype.clearWatchFilter = function() 
-{
-    	PhoneGap.exec(null, null, "com.phonegap.geolocation", "stopHeading", []);
-};
-
-PhoneGap.addConstructor(function() 
-{
-    if (typeof navigator.compass == "undefined") 
-    {
-        navigator.compass = new Compass();
-    }
-});
-};
-
-if (!PhoneGap.hasResource("media")) {
-	PhoneGap.addResource("media");
-
-/**
- * List of media objects.
- * PRIVATE
- */
-PhoneGap.mediaObjects = {};
-
-/**
- * Object that receives native callbacks.
- * PRIVATE
- */
-PhoneGap.Media = function() {};
-
-
-/**
- * Get the media object.
- * PRIVATE
- *
- * @param id            The media object id (string)
- */
-PhoneGap.Media.getMediaObject = function(id) {
-    return PhoneGap.mediaObjects[id];
-};
-
-/**
- * Audio has status update.
- * PRIVATE
- *
- * @param id            The media object id (string)
- * @param msg           The status message (int)
- * @param value        The status code (int)
- */
-PhoneGap.Media.onStatus = function(id, msg, value) {
-    var media = PhoneGap.mediaObjects[id];
-
-    // If state update
-    if (msg == Media.MEDIA_STATE) {
-        if (value == Media.MEDIA_STOPPED) {
-            if (media.successCallback) {
-                media.successCallback();
-            }
-        }
-        if (media.statusCallback) {
-            media.statusCallback(value);
-        }
-    }
-    else if (msg == Media.MEDIA_DURATION) {
-        media._duration = value;
-    }
-    else if (msg == Media.MEDIA_ERROR) {
-        if (media.errorCallback) {
-            media.errorCallback(value);
-        }
-    }
-    else if (msg == Media.MEDIA_POSITION) {
-    	media._position = value;
-    }
-};
-
-/**
- * This class provides access to the device media, interfaces to both sound and video
- *
- * @param src                   The file name or url to play
- * @param successCallback       The callback to be called when the file is done playing or recording.
- *                                  successCallback() - OPTIONAL
- * @param errorCallback         The callback to be called if there is an error.
- *                                  errorCallback(int errorCode) - OPTIONAL
- * @param statusCallback        The callback to be called when media status has changed.
- *                                  statusCallback(int statusCode) - OPTIONAL
- * @param positionCallback      The callback to be called when media position has changed.
- *                                  positionCallback(long position) - OPTIONAL
- */
-Media = function(src, successCallback, errorCallback, statusCallback, positionCallback) {
-
-    // successCallback optional
-    if (successCallback && (typeof successCallback != "function")) {
-        console.log("Media Error: successCallback is not a function");
-        return;
-    }
-
-    // errorCallback optional
-    if (errorCallback && (typeof errorCallback != "function")) {
-        console.log("Media Error: errorCallback is not a function");
-        return;
-    }
-
-    // statusCallback optional
-    if (statusCallback && (typeof statusCallback != "function")) {
-        console.log("Media Error: statusCallback is not a function");
-        return;
-    }
-
-    // positionCallback optional -- NOT SUPPORTED
-    if (positionCallback && (typeof positionCallback != "function")) {
-        console.log("Media Error: positionCallback is not a function");
-        return;
-    }
-
-    this.id = PhoneGap.createUUID();
-    PhoneGap.mediaObjects[this.id] = this;
-    this.src = src;
-    this.successCallback = successCallback;
-    this.errorCallback = errorCallback;
-    this.statusCallback = statusCallback;
-    this.positionCallback = positionCallback;
-    this._duration = -1;
-    this._position = -1;
-};
-
-// Media messages
-Media.MEDIA_STATE = 1;
-Media.MEDIA_DURATION = 2;
-Media.MEDIA_POSITION = 3;
-Media.MEDIA_ERROR = 9;
-
-// Media states
-Media.MEDIA_NONE = 0;
-Media.MEDIA_STARTING = 1;
-Media.MEDIA_RUNNING = 2;
-Media.MEDIA_PAUSED = 3;
-Media.MEDIA_STOPPED = 4;
-Media.MEDIA_MSG = ["None", "Starting", "Running", "Paused", "Stopped"];
-
-// TODO: Will MediaError be used?
-/**
- * This class contains information about any Media errors.
- * @constructor
- */
-
-MediaError = function() {
-	this.code = null,
-	this.message = "";
-}
-
-MediaError.MEDIA_ERR_ABORTED        = 1;
-MediaError.MEDIA_ERR_NETWORK        = 2;
-MediaError.MEDIA_ERR_DECODE         = 3;
-MediaError.MEDIA_ERR_NONE_SUPPORTED = 4;
-
-/**
- * Start or resume playing audio file.
- */
-Media.prototype.play = function(options) {
-    PhoneGap.exec(null, null, "com.phonegap.media", "play", [this.id, this.src, options]);
-};
-
-/**
- * Stop playing audio file.
- */
-Media.prototype.stop = function() {
-    PhoneGap.exec(null, null, "com.phonegap.media","stop", [this.id, this.src]);
-};
-
-/**
- * Pause playing audio file.
- */
-Media.prototype.pause = function() {
-    PhoneGap.exec(null, null, "com.phonegap.media","pause", [this.id, this.src]);
-};
-
-/**
- * Seek or jump to a new time in the track..
- */
-Media.prototype.seekTo = function(milliseconds) {
-    PhoneGap.exec(null, null, "com.phonegap.media", "seekTo", [this.id, this.src, milliseconds]);
-};
-
-/**
- * Get duration of an audio file.
- * The duration is only set for audio that is playing, paused or stopped.
- *
- * @return      duration or -1 if not known.
- */
-Media.prototype.getDuration = function() {
-    return this._duration;
-};
-
-/**
- * Get position of audio.
- *
- * @return
- */
-Media.prototype.getCurrentPosition = function(successCB, errorCB) {
-	var errCallback = (errorCB == undefined || errorCB == null) ? null : errorCB;
-    PhoneGap.exec(successCB, errorCB, "com.phonegap.media", "getCurrentPosition", [this.id, this.src]);
-};
-
-// iOS only.  prepare/load the audio in preparation for playing
-Media.prototype.prepare = function(successCB, errorCB) {
-	PhoneGap.exec(successCB, errorCB, "com.phonegap.media", "prepare", [this.id, this.src]);
-}
-
-/**
- * Start recording audio file.
- */
-Media.prototype.startRecord = function() {
-    PhoneGap.exec(null, null, "com.phonegap.media","startAudioRecord", [this.id, this.src]);
-};
-
-/**
- * Stop recording audio file.
- */
-Media.prototype.stopRecord = function() {
-    PhoneGap.exec(null, null, "com.phonegap.media","stopAudioRecord", [this.id, this.src]);
-};
-
-/**
- * Release the resources.
- */
-Media.prototype.release = function() {
-    PhoneGap.exec(null, null, "com.phonegap.media","release", [this.id, this.src]);
-};
-
-};
-if (!PhoneGap.hasResource("notification")) {
-	PhoneGap.addResource("notification");
-
-/**
- * This class provides access to notifications on the device.
- */
-Notification = function() {
-};
-
-/**
- * Open a native alert dialog, with a customizable title and button text.
- *
- * @param {String} message              Message to print in the body of the alert
- * @param {Function} completeCallback   The callback that is called when user clicks on a button.
- * @param {String} title                Title of the alert dialog (default: Alert)
- * @param {String} buttonLabel          Label of the close button (default: OK)
- */
-Notification.prototype.alert = function(message, completeCallback, title, buttonLabel) {
-    var _title = title;
-    if (title == null || typeof title === 'undefined') {
-        _title = "Alert";
-    }
-    var _buttonLabel = (buttonLabel || "OK");
-    PhoneGap.exec(completeCallback, null, "com.phonegap.notification", "alert", [message,{ "title": _title, "buttonLabel": _buttonLabel}]);
-};
-
-/**
- * Open a native confirm dialog, with a customizable title and button text.
- * The result that the user selects is returned to the result callback.
- *
- * @param {String} message              Message to print in the body of the alert
- * @param {Function} resultCallback     The callback that is called when user clicks on a button.
- * @param {String} title                Title of the alert dialog (default: Confirm)
- * @param {String} buttonLabels         Comma separated list of the labels of the buttons (default: 'OK,Cancel')
- */
-Notification.prototype.confirm = function(message, resultCallback, title, buttonLabels) {
-    var _title = (title || "Confirm");
-    var _buttonLabels = (buttonLabels || "OK,Cancel");
-    this.alert(message, resultCallback, _title, _buttonLabels);
-};
-
-/**
- * Causes the device to blink a status LED.
- * @param {Integer} count The number of blinks.
- * @param {String} colour The colour of the light.
- */
-Notification.prototype.blink = function(count, colour) {
-// NOT IMPLEMENTED	
-};
-
-Notification.prototype.vibrate = function(mills) {
-	PhoneGap.exec(null, null, "com.phonegap.notification", "vibrate", []);
-};
-
-Notification.prototype.beep = function(count, volume) {
-	// No Volume yet for the iphone interface
-	// We can use a canned beep sound and call that
-	new Media('beep.wav').play();
-};
-
-PhoneGap.addConstructor(function() {
-    if (typeof navigator.notification == "undefined") navigator.notification = new Notification();
-});
-};
-if (!PhoneGap.hasResource("orientation")) {
-	PhoneGap.addResource("orientation");
-
-/**
- * This class provides access to the device orientation.
- * @constructor
- */
-Orientation  = function() {
-	/**
-	 * The current orientation, or null if the orientation hasn't changed yet.
-	 */
-	this.currentOrientation = null;
-}
-
-/**
- * Set the current orientation of the phone.  This is called from the device automatically.
- * 
- * When the orientation is changed, the DOMEvent \c orientationChanged is dispatched against
- * the document element.  The event has the property \c orientation which can be used to retrieve
- * the device's current orientation, in addition to the \c Orientation.currentOrientation class property.
- *
- * @param {Number} orientation The orientation to be set
- */
-Orientation.prototype.setOrientation = function(orientation) {
-    Orientation.currentOrientation = orientation;
-    var e = document.createEvent('Events');
-    e.initEvent('orientationChanged', 'false', 'false');
-    e.orientation = orientation;
-    document.dispatchEvent(e);
-};
-
-/**
- * Asynchronously aquires the current orientation.
- * @param {Function} successCallback The function to call when the orientation
- * is known.
- * @param {Function} errorCallback The function to call when there is an error 
- * getting the orientation.
- */
-Orientation.prototype.getCurrentOrientation = function(successCallback, errorCallback) {
-	// If the position is available then call success
-	// If the position is not available then call error
-};
-
-/**
- * Asynchronously aquires the orientation repeatedly at a given interval.
- * @param {Function} successCallback The function to call each time the orientation
- * data is available.
- * @param {Function} errorCallback The function to call when there is an error 
- * getting the orientation data.
- */
-Orientation.prototype.watchOrientation = function(successCallback, errorCallback) {
-	// Invoke the appropriate callback with a new Position object every time the implementation 
-	// determines that the position of the hosting device has changed. 
-	this.getCurrentPosition(successCallback, errorCallback);
-	return setInterval(function() {
-		navigator.orientation.getCurrentOrientation(successCallback, errorCallback);
-	}, 10000);
-};
-
-/**
- * Clears the specified orientation watch.
- * @param {String} watchId The ID of the watch returned from #watchOrientation.
- */
-Orientation.prototype.clearWatch = function(watchId) {
-	clearInterval(watchId);
-};
-
-Orientation.install = function()
-{
-    if (typeof navigator.orientation == "undefined") { 
-		navigator.orientation = new Orientation();
-	}
-	
-	var windowDispatchAvailable = !(window.dispatchEvent === undefined); // undefined in iOS 3.x
-	if (windowDispatchAvailable) {
-		return;
-	} 
-	
-	// the code below is to capture window.add/remove eventListener calls on window
-	// this is for iOS 3.x where listening on 'orientationchange' events don't work on document/window (don't know why)
-	// however, window.onorientationchange DOES handle the 'orientationchange' event (sent through document), so...
-	// then we multiplex the window.onorientationchange event (consequently - people shouldn't overwrite this)
-	
-	var self = this;
-	var orientationchangeEvent = 'orientationchange';
-	var newOrientationchangeEvent = 'orientationchange_pg';
-	
-	// backup original `window.addEventListener`, `window.removeEventListener`
-    var _addEventListener = window.addEventListener;
-    var _removeEventListener = window.removeEventListener;
-
-	window.onorientationchange = function() {
-		PhoneGap.fireEvent(newOrientationchangeEvent, window);
-	}
-	
-    // override `window.addEventListener`
-    window.addEventListener = function() {
-        if (arguments[0] === orientationchangeEvent) {
-			arguments[0] = newOrientationchangeEvent; 
-		} 
-													
-		if (!windowDispatchAvailable) {
-			return document.addEventListener.apply(this, arguments);
-		} else {
-			return _addEventListener.apply(this, arguments);
-		}
-    };	
-
-    // override `window.removeEventListener'
-    window.removeEventListener = function() {
-        if (arguments[0] === orientationchangeEvent) {
-			arguments[0] = newOrientationchangeEvent; 
-		} 
-		
-		if (!windowDispatchAvailable) {
-			return document.removeEventListener.apply(this, arguments);
-		} else {
-			return _removeEventListener.apply(this, arguments);
-		}
-    };	
-};
-
-PhoneGap.addConstructor(Orientation.install);
-
-};
-if (!PhoneGap.hasResource("sms")) {
-	PhoneGap.addResource("sms");
-
-/**
- * This class provides access to the device SMS functionality.
- * @constructor
- */
-Sms = function() {
-
-}
-
-/**
- * Sends an SMS message.
- * @param {Integer} number The phone number to send the message to.
- * @param {String} message The contents of the SMS message to send.
- * @param {Function} successCallback The function to call when the SMS message is sent.
- * @param {Function} errorCallback The function to call when there is an error sending the SMS message.
- * @param {PositionOptions} options The options for accessing the GPS location such as timeout and accuracy.
- */
-Sms.prototype.send = function(number, message, successCallback, errorCallback, options) {
-	// not sure why this is here when it does nothing????
-};
-
-PhoneGap.addConstructor(function() {
-    if (typeof navigator.sms == "undefined") navigator.sms = new Sms();
-});
-};
-if (!PhoneGap.hasResource("telephony")) {
-	PhoneGap.addResource("telephony");
-
-/**
- * This class provides access to the telephony features of the device.
- * @constructor
- */
-Telephony = function() {
-	
-}
-
-/**
- * Calls the specifed number.
- * @param {Integer} number The number to be called.
- */
-Telephony.prototype.call = function(number) {
-	// not sure why this is here when it does nothing????
-};
-
-PhoneGap.addConstructor(function() {
-    if (typeof navigator.telephony == "undefined") navigator.telephony = new Telephony();
-});
-};if (!PhoneGap.hasResource("network")) {
-	PhoneGap.addResource("network");
-
-// //////////////////////////////////////////////////////////////////
-
-Connection = function() {
-	/*
-	 * One of the connection constants below.
-	 */
-	this.type = Connection.UNKNOWN;
-
-	/* initialize from the extended DeviceInfo properties */
-    try {      
-		this.type	= DeviceInfo.connection.type;
-    } 
-	catch(e) {
-    }
-};
-
-Connection.UNKNOWN = "unknown"; // Unknown connection type
-Connection.ETHERNET = "ethernet";
-Connection.WIFI = "wifi";
-Connection.CELL_2G = "2g"; // the default for iOS, for any cellular connection
-Connection.CELL_3G = "3g";
-Connection.CELL_4G = "4g";
-Connection.NONE = "none"; // NO connectivity
-
-
-PhoneGap.addConstructor(function() {
-    if (typeof navigator.network == "undefined") navigator.network = {};
-    if (typeof navigator.network.connection == "undefined") navigator.network.connection = new Connection();
-});
-
-};if (!PhoneGap.hasResource("splashscreen")) {
-	PhoneGap.addResource("splashscreen");
-
-/**
- * This class provides access to the splashscreen
- */
-SplashScreen = function() {
-};
-
-SplashScreen.prototype.show = function() {
-    PhoneGap.exec(null, null, "com.phonegap.splashscreen", "show", []);
-};
-
-SplashScreen.prototype.hide = function() {
-    PhoneGap.exec(null, null, "com.phonegap.splashscreen", "hide", []);
-};
-
-PhoneGap.addConstructor(function() {
-    if (typeof navigator.splashscreen == "undefined") navigator.splashscreen = new SplashScreen();
-});
-
-};
diff --git a/apps/files_odfviewer/src/webodf/programs/android/libs/phonegap-1.4.1.jar b/apps/files_odfviewer/src/webodf/programs/android/libs/phonegap-1.4.1.jar
deleted file mode 100644
index a30e0218e2b672d8aecb49513a2f7d243a01e276..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 155233
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

diff --git a/apps/files_odfviewer/src/webodf/programs/android/res/drawable-hdpi/ic_launcher.png b/apps/files_odfviewer/src/webodf/programs/android/res/drawable-hdpi/ic_launcher.png
deleted file mode 100644
index 8074c4c571b8cd19e27f4ee5545df367420686d7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4147
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

diff --git a/apps/files_odfviewer/src/webodf/programs/android/res/drawable-ldpi/ic_launcher.png b/apps/files_odfviewer/src/webodf/programs/android/res/drawable-ldpi/ic_launcher.png
deleted file mode 100644
index 1095584ec21f71cd0afc9e0993aa2209671b590c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1723
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
Rn%e*X002ovPDHLkV1g`*Fem^3

diff --git a/apps/files_odfviewer/src/webodf/programs/android/res/drawable-mdpi/ic_launcher.png b/apps/files_odfviewer/src/webodf/programs/android/res/drawable-mdpi/ic_launcher.png
deleted file mode 100644
index a07c69fa5a0f4da5d5efe96eea12a543154dbab6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2574
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

diff --git a/apps/files_odfviewer/src/webodf/programs/android/res/drawable/icon.png b/apps/files_odfviewer/src/webodf/programs/android/res/drawable/icon.png
deleted file mode 100644
index 13ee5e8612c886a9605b147d3e3c9e0fcd0e326a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3535
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
JPDHLkV1lAbd;S0b

diff --git a/apps/files_odfviewer/src/webodf/programs/android/res/layout/listitem.xml b/apps/files_odfviewer/src/webodf/programs/android/res/layout/listitem.xml
deleted file mode 100644
index f0958d609d..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/android/res/layout/listitem.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:padding="10dp"
-    android:textSize="16sp" >
-</TextView>
\ No newline at end of file
diff --git a/apps/files_odfviewer/src/webodf/programs/android/res/layout/main.xml b/apps/files_odfviewer/src/webodf/programs/android/res/layout/main.xml
deleted file mode 100644
index bc12cd8231..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/android/res/layout/main.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:orientation="vertical" >
-
-    <TextView
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:text="@string/hello" />
-
-</LinearLayout>
\ No newline at end of file
diff --git a/apps/files_odfviewer/src/webodf/programs/android/res/layout/selector.xml b/apps/files_odfviewer/src/webodf/programs/android/res/layout/selector.xml
deleted file mode 100644
index 4af1380e95..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/android/res/layout/selector.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent" >
-
-    <ScrollView
-        android:layout_width="fill_parent" 
-        android:layout_height="fill_parent">
-        
-        <TextView android:id="@+id/noteview"  
-	          android:layout_width="fill_parent" 
-            android:layout_height="fill_parent"
-            android:textSize="10pt" />
-	  </ScrollView>
-
-</LinearLayout>
\ No newline at end of file
diff --git a/apps/files_odfviewer/src/webodf/programs/android/res/values/strings.xml b/apps/files_odfviewer/src/webodf/programs/android/res/values/strings.xml
deleted file mode 100644
index 44673ed78b..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/android/res/values/strings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <string name="hello">Hello World, WebODFActivity!</string>
-    <string name="app_name">WebODF</string>
-
-</resources>
\ No newline at end of file
diff --git a/apps/files_odfviewer/src/webodf/programs/android/res/xml/phonegap.xml b/apps/files_odfviewer/src/webodf/programs/android/res/xml/phonegap.xml
deleted file mode 100755
index 97f31ea110..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/android/res/xml/phonegap.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<phonegap>
-    <access origin="http://127.0.0.1*"/>
-    <log level="DEBUG"/>
-</phonegap>
diff --git a/apps/files_odfviewer/src/webodf/programs/android/res/xml/plugins.xml b/apps/files_odfviewer/src/webodf/programs/android/res/xml/plugins.xml
deleted file mode 100644
index 3d8d48d838..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/android/res/xml/plugins.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<plugins>
-    <plugin name="App" value="com.phonegap.App"/>
-    <plugin name="Geolocation" value="com.phonegap.GeoBroker"/>
-    <plugin name="Device" value="com.phonegap.Device"/>
-    <plugin name="Accelerometer" value="com.phonegap.AccelListener"/>
-    <plugin name="Compass" value="com.phonegap.CompassListener"/>
-    <plugin name="Media" value="com.phonegap.AudioHandler"/>
-    <plugin name="Camera" value="com.phonegap.CameraLauncher"/>
-    <plugin name="Contacts" value="com.phonegap.ContactManager"/>
-    <plugin name="Crypto" value="com.phonegap.CryptoHandler"/>
-    <plugin name="File" value="com.phonegap.FileUtils"/>
-    <plugin name="Network Status" value="com.phonegap.NetworkManager"/>
-    <plugin name="Notification" value="com.phonegap.Notification"/>
-    <plugin name="Storage" value="com.phonegap.Storage"/>
-    <plugin name="Temperature" value="com.phonegap.TempListener"/>
-    <plugin name="FileTransfer" value="com.phonegap.FileTransfer"/>
-    <plugin name="Capture" value="com.phonegap.Capture"/>
-</plugins>
\ No newline at end of file
diff --git a/apps/files_odfviewer/src/webodf/programs/android/src/org/webodf/WebODFActivity.java b/apps/files_odfviewer/src/webodf/programs/android/src/org/webodf/WebODFActivity.java
deleted file mode 100644
index 9c826c9210..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/android/src/org/webodf/WebODFActivity.java
+++ /dev/null
@@ -1,33 +0,0 @@
-package org.webodf;
-
-import android.os.Bundle;
-
-import com.phonegap.DroidGap;
-
-public class WebODFActivity extends DroidGap {
-
-	private String path;
-
-	/** Called when the activity is first created. */
-	@Override
-	public void onCreate(Bundle savedInstanceState) {
-		super.onCreate(savedInstanceState);
-		path = null;
-		if (getIntent() != null && getIntent().getData() != null) {
-			path = getIntent().getData().getPath();
-		}
-		setContentView(R.layout.main);
-		super.loadUrl("file:///android_asset/www/index.html");
-	}
-
-	@Override
-	protected void onResume() {
-		super.onResume();
-		if (path == null) {
-			return;
-		}
-		String escapedPath = "file://" + path.replace("'", "\\'");
-		sendJavascript("invokeString = '" + escapedPath + "';");
-	}
-
-}
\ No newline at end of file
diff --git a/apps/files_odfviewer/src/webodf/programs/android/updateWebODF.sh b/apps/files_odfviewer/src/webodf/programs/android/updateWebODF.sh
deleted file mode 100755
index b51e94290b..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/android/updateWebODF.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-# /bin/bash
-cd assets
-for f in `find . -type f`; do cp ../../webodf/$f $f; done
diff --git a/apps/files_odfviewer/src/webodf/programs/docnosis/CMakeLists.txt b/apps/files_odfviewer/src/webodf/programs/docnosis/CMakeLists.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/apps/files_odfviewer/src/webodf/programs/docnosis/OpenDocument-manifest-schema-v1.0-os.rng b/apps/files_odfviewer/src/webodf/programs/docnosis/OpenDocument-manifest-schema-v1.0-os.rng
deleted file mode 100644
index 97fe580eab..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/docnosis/OpenDocument-manifest-schema-v1.0-os.rng
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    OASIS OpenDocument v1.0
-    OASIS standard, 1 May 2005
-    Relax-NG Manifest Schema
-
-    $Id$
-
-    © 2002-2005 OASIS Open
-    © 1999-2005 Sun Microsystems, Inc.
--->
-
-<grammar 
-    xmlns="http://relaxng.org/ns/structure/1.0"
-
-    datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
-
-    xmlns:manifest="urn:oasis:names:tc:opendocument:xmlns:manifest:1.0">
-<define name="manifest">
-    <element name="manifest:manifest">
-        <oneOrMore>
-            <ref name="file-entry"/>
-        </oneOrMore>
-    </element>
-</define>
-
-<start>
-    <choice>
-        <ref name="manifest"/>
-    </choice>
-</start>
-<define name="file-entry">
-    <element name="manifest:file-entry">
-        <ref name="file-entry-attlist"/>
-        <optional>
-            <ref name="encryption-data"/>
-        </optional>
-    </element>
-</define>
-<define name="file-entry-attlist" combine="interleave">
-    <attribute name="manifest:full-path">
-        <data type="string"/>
-    </attribute>
-</define>
-<define name="file-entry-attlist" combine="interleave">
-    <optional>
-        <attribute name="manifest:size">
-            <data type="nonNegativeInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="file-entry-attlist" combine="interleave">
-    <attribute name="manifest:media-type">
-        <data type="string"/>
-    </attribute>
-</define>
-<define name="encryption-data">
-    <element name="manifest:encryption-data">
-        <ref name="encryption-data-attlist"/>
-        <ref name="algorithm"/>
-        <ref name="key-derivation"/>
-    </element>
-</define>
-<define name="encryption-data-attlist" combine="interleave">
-    <attribute name="manifest:checksum-type">
-        <data type="string"/>
-    </attribute>
-</define>
-<define name="encryption-data-attlist" combine="interleave">
-    <attribute name="manifest:checksum">
-        <data type="base64Binary"/>
-    </attribute>
-</define>
-<define name="algorithm">
-    <element name="manifest:algorithm">
-        <ref name="algorithm-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="algorithm-attlist" combine="interleave">
-    <attribute name="manifest:algorithm-name">
-        <data type="string"/>
-    </attribute>
-</define>
-<define name="algorithm-attlist" combine="interleave">
-    <attribute name="manifest:initialisation-vector">
-        <data type="base64Binary"/>
-    </attribute>
-</define>
-<define name="key-derivation">
-    <element name="manifest:key-derivation">
-        <ref name="key-derivation-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="key-derivation-attlist" combine="interleave">
-    <attribute name="manifest:key-derivation-name">
-        <data type="string"/>
-    </attribute>
-</define>
-<define name="key-derivation-attlist" combine="interleave">
-    <attribute name="manifest:salt">
-        <data type="base64Binary"/>
-    </attribute>
-</define>
-<define name="key-derivation-attlist" combine="interleave">
-    <attribute name="manifest:iteration-count">
-            <data type="nonNegativeInteger"/>
-        </attribute>
-</define>
-</grammar>
diff --git a/apps/files_odfviewer/src/webodf/programs/docnosis/OpenDocument-manifest-schema-v1.1.rng b/apps/files_odfviewer/src/webodf/programs/docnosis/OpenDocument-manifest-schema-v1.1.rng
deleted file mode 100644
index 4082d4ba95..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/docnosis/OpenDocument-manifest-schema-v1.1.rng
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    OASIS OpenDocument v1.1
-    OASIS Standard, 1 Feb 2007
-    Relax-NG Manifest Schema
-
-    $Id$
-
-    © 2002-2007 OASIS Open
-    © 1999-2007 Sun Microsystems, Inc.
--->
-
-<grammar 
-    xmlns="http://relaxng.org/ns/structure/1.0"
-
-    datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
-
-    xmlns:manifest="urn:oasis:names:tc:opendocument:xmlns:manifest:1.0">
-<define name="manifest">
-    <element name="manifest:manifest">
-        <oneOrMore>
-            <ref name="file-entry"/>
-        </oneOrMore>
-    </element>
-</define>
-
-<start>
-    <choice>
-        <ref name="manifest"/>
-    </choice>
-</start>
-<define name="file-entry">
-    <element name="manifest:file-entry">
-        <ref name="file-entry-attlist"/>
-        <optional>
-            <ref name="encryption-data"/>
-        </optional>
-    </element>
-</define>
-<define name="file-entry-attlist" combine="interleave">
-    <attribute name="manifest:full-path">
-        <data type="string"/>
-    </attribute>
-</define>
-<define name="file-entry-attlist" combine="interleave">
-    <optional>
-        <attribute name="manifest:size">
-            <data type="nonNegativeInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="file-entry-attlist" combine="interleave">
-    <attribute name="manifest:media-type">
-        <data type="string"/>
-    </attribute>
-</define>
-<define name="encryption-data">
-    <element name="manifest:encryption-data">
-        <ref name="encryption-data-attlist"/>
-        <ref name="algorithm"/>
-        <ref name="key-derivation"/>
-    </element>
-</define>
-<define name="encryption-data-attlist" combine="interleave">
-    <attribute name="manifest:checksum-type">
-        <data type="string"/>
-    </attribute>
-</define>
-<define name="encryption-data-attlist" combine="interleave">
-    <attribute name="manifest:checksum">
-        <data type="base64Binary"/>
-    </attribute>
-</define>
-<define name="algorithm">
-    <element name="manifest:algorithm">
-        <ref name="algorithm-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="algorithm-attlist" combine="interleave">
-    <attribute name="manifest:algorithm-name">
-        <data type="string"/>
-    </attribute>
-</define>
-<define name="algorithm-attlist" combine="interleave">
-    <attribute name="manifest:initialisation-vector">
-        <data type="base64Binary"/>
-    </attribute>
-</define>
-<define name="key-derivation">
-    <element name="manifest:key-derivation">
-        <ref name="key-derivation-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="key-derivation-attlist" combine="interleave">
-    <attribute name="manifest:key-derivation-name">
-        <data type="string"/>
-    </attribute>
-</define>
-<define name="key-derivation-attlist" combine="interleave">
-    <attribute name="manifest:salt">
-        <data type="base64Binary"/>
-    </attribute>
-</define>
-<define name="key-derivation-attlist" combine="interleave">
-    <attribute name="manifest:iteration-count">
-            <data type="nonNegativeInteger"/>
-        </attribute>
-</define>
-</grammar>
diff --git a/apps/files_odfviewer/src/webodf/programs/docnosis/OpenDocument-schema-v1.0-os.rng b/apps/files_odfviewer/src/webodf/programs/docnosis/OpenDocument-schema-v1.0-os.rng
deleted file mode 100644
index cf4ee51741..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/docnosis/OpenDocument-schema-v1.0-os.rng
+++ /dev/null
@@ -1,17666 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    OASIS OpenDocument v1.0
-    OASIS Standard, 1 May 2005
-    Relax-NG Schema
-
-    $Id$
-
-    © 2002-2005 OASIS Open
-    © 1999-2005 Sun Microsystems, Inc.
--->
-
-<grammar
-    xmlns="http://relaxng.org/ns/structure/1.0"
-    xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
-
-    datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
-
-    xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
-    xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0"
-    xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0"
-    xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
-    xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0"
-    xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
-    xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0"
-    xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0"
-    xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
-    xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0"
-    xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0"
-    xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
-    xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0"
-    xmlns:anim="urn:oasis:names:tc:opendocument:xmlns:animation:1.0"
-
-    xmlns:dc="http://purl.org/dc/elements/1.1/"
-    xmlns:xlink="http://www.w3.org/1999/xlink"
-    xmlns:math="http://www.w3.org/1998/Math/MathML"
-    xmlns:xforms="http://www.w3.org/2002/xforms"
-
-    xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0"
-    xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0"
-    xmlns:smil="urn:oasis:names:tc:opendocument:xmlns:smil-compatible:1.0"
->
-<define name="office-process-content">
-    <optional>
-        <attribute name="office:process-content" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<start>
-    <choice>
-        <ref name="office-document"/>
-        <ref name="office-document-content"/>
-        <ref name="office-document-styles"/>
-        <ref name="office-document-meta"/>
-        <ref name="office-document-settings"/>
-    </choice>
-</start>
-<define name="office-document">
-    <element name="office:document">
-        <ref name="office-document-attrs"/>
-        <ref name="office-document-common-attrs"/>
-        <ref name="office-meta"/>
-        <ref name="office-settings"/>
-        <ref name="office-scripts"/>
-        <ref name="office-font-face-decls"/>
-        <ref name="office-styles"/>
-        <ref name="office-automatic-styles"/>
-        <ref name="office-master-styles"/>
-        <ref name="office-body"/>
-    </element>
-</define>
-<define name="office-document-content">
-    <element name="office:document-content">
-        <ref name="office-document-common-attrs"/>
-        <ref name="office-scripts"/>
-        <ref name="office-font-face-decls"/>
-        <ref name="office-automatic-styles"/>
-        <ref name="office-body"/>
-    </element>
-</define>
-<define name="office-document-styles">
-    <element name="office:document-styles">
-        <ref name="office-document-common-attrs"/>
-        <ref name="office-font-face-decls"/>
-        <ref name="office-styles"/>
-        <ref name="office-automatic-styles"/>
-        <ref name="office-master-styles"/>
-    </element>
-</define>
-<define name="office-document-meta">
-    <element name="office:document-meta">
-        <ref name="office-document-common-attrs"/>
-        <ref name="office-meta"/>
-    </element>
-</define>
-<define name="office-document-settings">
-    <element name="office:document-settings">
-        <ref name="office-document-common-attrs"/>
-        <ref name="office-settings"/>
-    </element>
-</define>
-<define name="office-document-common-attrs" combine="interleave">
-    <optional>
-        <attribute name="office:version">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="office-document-attrs" combine="interleave">
-    <attribute name="office:mimetype">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="office-meta">
-    <optional>
-        <element name="office:meta">
-            <ref name="office-meta-content"/>
-        </element>
-    </optional>
-</define>
-
-<define name="office-meta-content">
-    <ref name="anyElements"/>
-</define>
-
-<define name="office-meta-content-strict">
-    <zeroOrMore>
-        <ref name="office-meta-data"/>
-    </zeroOrMore>
-</define>
-<define name="office-body">
-    <element name="office:body">
-        <ref name="office-body-content"/>
-    </element>
-</define>
-<define name="office-body-content" combine="choice">
-    <element name="office:text">
-        <ref name="office-text-attlist"/>
-        <ref name="office-text-content-prelude"/>
-        <zeroOrMore>
-            <ref name="office-text-content-main"/>
-        </zeroOrMore>
-        <ref name="office-text-content-epilogue"/>
-    </element>
-</define>
-<define name="office-text-content-prelude">
-    <ref name="office-forms"/>
-    <ref name="text-tracked-changes"/>
-    <ref name="text-decls"/>
-    <ref name="table-decls"/>
-</define>
-<define name="office-text-content-main">
-    <choice>
-        <zeroOrMore>
-            <ref name="text-content"/>
-        </zeroOrMore>
-        <group>
-            <ref name="text-page-sequence"/>
-            <zeroOrMore>
-                <choice>
-                    <ref name="draw-a"/>
-                    <ref name="shape"/>
-                </choice>
-            </zeroOrMore>
-        </group>
-    </choice>
-</define>
-
-<define name="text-content">
-    <choice>
-        <ref name="text-h"/>
-        <ref name="text-p"/>
-        <ref name="text-list"/>
-        <ref name="text-numbered-paragraph"/>
-        <ref name="table-table"/>
-        <ref name="draw-a"/>
-        <ref name="text-section"/>
-        <ref name="text-table-of-content"/>
-        <ref name="text-illustration-index"/>
-        <ref name="text-table-index"/>
-        <ref name="text-object-index"/>
-        <ref name="text-user-index"/>
-        <ref name="text-alphabetical-index"/>
-        <ref name="text-bibliography"/>
-        <ref name="shape"/>
-        <ref name="change-marks"/>
-    </choice>
-</define>
-<define name="office-text-content-epilogue">
-    <ref name="table-functions"/>
-</define>
-<define name="office-text-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:global" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="office-body-content" combine="choice">
-    <element name="office:drawing">
-        <ref name="office-drawing-attlist"/>
-        <ref name="office-drawing-content-prelude"/>
-        <ref name="office-drawing-content-main"/>
-        <ref name="office-drawing-content-epilogue"/>
-    </element>
-</define>
-
-<define name="office-drawing-attlist">
-    <empty/>
-</define>
-<define name="office-drawing-content-prelude">
-    <ref name="text-decls"/>
-    <ref name="table-decls"/>
-</define>
-<define name="office-drawing-content-main">
-    <zeroOrMore>
-        <ref name="draw-page"/>
-    </zeroOrMore>
-</define>
-<define name="office-drawing-content-epilogue">
-    <ref name="table-functions"/>
-</define>
-<define name="office-body-content" combine="choice">
-    <element name="office:presentation">
-        <ref name="office-presentation-attlist"/>
-        <ref name="office-presentation-content-prelude"/>
-        <ref name="office-presentation-content-main"/>
-        <ref name="office-presentation-content-epilogue"/>
-    </element>
-</define>
-
-<define name="office-presentation-attlist">
-    <empty/>
-</define>
-<define name="office-presentation-content-prelude">
-    <ref name="text-decls"/>
-    <ref name="table-decls"/>
-    <ref name="presentation-decls"/>
-</define>
-<define name="office-presentation-content-main">
-    <zeroOrMore>
-        <ref name="draw-page"/>
-    </zeroOrMore>
-</define>
-<define name="office-presentation-content-epilogue">
-    <ref name="presentation-settings"/>
-    <ref name="table-functions"/>
-</define>
-<define name="office-body-content" combine="choice">
-    <element name="office:spreadsheet">
-        <ref name="office-spreadsheet-attlist"/>
-        <ref name="office-spreadsheet-content-prelude"/>
-        <ref name="office-spreadsheet-content-main"/>
-        <ref name="office-spreadsheet-content-epilogue"/>
-    </element>
-</define>
-<define name="office-spreadsheet-content-prelude">
-    <optional>
-        <ref name="table-tracked-changes"/>    
-    </optional>
-    <ref name="text-decls"/>
-    <ref name="table-decls"/>
-</define>
-
-<define name="table-decls">
-    <optional>
-        <ref name="table-calculation-settings"/>    
-    </optional>
-    <optional>
-        <ref name="table-content-validations"/>    
-    </optional>
-    <optional>
-        <ref name="table-label-ranges"/>    
-    </optional>
-</define>
-<define name="office-spreadsheet-content-main">
-    <zeroOrMore>
-        <ref name="table-table"/>
-    </zeroOrMore>
-</define>
-<define name="office-spreadsheet-content-epilogue">
-    <ref name="table-functions"/>    
-</define>
-
-<define name="table-functions">
-    <optional>
-        <ref name="table-named-expressions"/>    
-    </optional>
-    <optional>
-        <ref name="table-database-ranges"/>    
-    </optional>
-    <optional>
-        <ref name="table-data-pilot-tables"/>    
-    </optional>
-    <optional>
-        <ref name="table-consolidation"/>    
-    </optional>
-    <optional>
-        <ref name="table-dde-links"/>    
-    </optional>
-</define>
-<define name="office-body-content" combine="choice">
-    <element name="office:chart">
-        <ref name="office-chart-attlist"/>
-        <ref name="office-chart-content-prelude"/>
-        <ref name="office-chart-content-main"/>
-        <ref name="office-chart-content-epilogue"/>
-    </element>
-</define>
-
-<define name="office-chart-attlist">
-    <empty/>
-</define>
-<define name="office-chart-content-prelude">
-    <ref name="text-decls"/>
-    <ref name="table-decls"/>
-</define>
-<define name="office-chart-content-main">
-    <ref name="chart-chart"/>
-</define>
-<define name="office-chart-content-epilogue">
-    <ref name="table-functions"/>    
-</define>
-<define name="office-body-content" combine="choice">
-    <element name="office:image">
-        <ref name="office-image-attlist"/>
-        <ref name="office-image-content-prelude"/>
-        <ref name="office-image-content-main"/>
-        <ref name="office-image-content-epilogue"/>
-    </element>
-</define>
-
-<define name="office-image-attlist">
-    <empty/>
-</define>
-<define name="office-image-content-prelude">
-    <empty/>
-</define>
-<define name="office-image-content-main">
-    <ref name="draw-frame"/>
-</define>
-<define name="office-image-content-epilogue">
-    <empty/>
-</define>
-<define name="office-settings">
-    <optional>
-        <element name="office:settings">
-            <oneOrMore>
-                <ref name="config-config-item-set"/>
-            </oneOrMore>
-        </element>
-    </optional>
-</define>
-<define name="config-config-item-set">
-    <element name="config:config-item-set">
-        <ref name="config-config-item-set-attlist"/>
-        <ref name="config-items"/>
-    </element>
-</define>
-
-<define name="config-items">
-    <oneOrMore>
-        <choice>
-            <ref name="config-config-item"/>
-            <ref name="config-config-item-set"/>
-            <ref name="config-config-item-map-named"/>
-            <ref name="config-config-item-map-indexed"/>
-        </choice>
-    </oneOrMore>
-</define>
-<define name="config-config-item-set-attlist" combine="interleave">
-    <attribute name="config:name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="config-config-item">
-    <element name="config:config-item">
-        <ref name="config-config-item-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="config-config-item-attlist" combine="interleave">
-    <attribute name="config:name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="config-config-item-attlist" combine="interleave">
-    <attribute name="config:type">
-        <choice>
-            <value>boolean</value>
-            <value>short</value>
-            <value>int</value>
-            <value>long</value>
-            <value>double</value>
-            <value>string</value>
-            <value>datetime</value>
-            <value>base64Binary</value>
-        </choice>
-    </attribute>
-</define>
-<define name="config-config-item-map-indexed">
-    <element name="config:config-item-map-indexed">
-        <ref name="config-config-item-map-indexed-attlist"/>
-        <oneOrMore>
-            <ref name="config-config-item-map-entry"/>
-        </oneOrMore>
-    </element>
-</define>
-<define name="config-config-item-map-indexed-attlist" combine="interleave">
-    <attribute name="config:name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="config-config-item-map-entry">
-    <element name="config:config-item-map-entry">
-        <ref name="config-config-item-map-entry-attlist"/>
-        <ref name="config-items"/>
-    </element>
-</define>
-<define name="config-config-item-map-entry-attlist" combine="interleave">
-    <optional>
-        <attribute name="config:name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="config-config-item-map-named">
-    <element name="config:config-item-map-named">
-        <ref name="config-config-item-map-named-attlist"/>
-        <oneOrMore>
-            <ref name="config-config-item-map-entry"/>
-        </oneOrMore>
-    </element>
-</define>
-<define name="config-config-item-map-named-attlist" combine="interleave">
-    <attribute name="config:name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="office-scripts">
-    <optional>
-        <element name="office:scripts">
-            <zeroOrMore>
-                <ref name="office-script"/>
-            </zeroOrMore>
-            <optional>
-                <ref name="office-event-listeners"/>
-            </optional>
-        </element>
-    </optional>
-</define>
-<define name="office-script">
-    <element name="office:script">
-        <ref name="office-script-attlist"/>
-        <mixed>
-            <ref name="anyElements"/>
-        </mixed>
-    </element>
-</define>
-<define name="office-script-attlist">
-    <attribute name="script:language">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="office-font-face-decls">
-    <optional>
-        <element name="office:font-face-decls">
-            <zeroOrMore>
-                <ref name="style-font-face"/>
-            </zeroOrMore>
-        </element>
-    </optional>
-</define>
-<define name="office-styles">
-    <optional>
-        <element name="office:styles">
-            <interleave>
-                <ref name="styles"/>
-                <zeroOrMore>
-                    <ref name="style-default-style"/>
-                </zeroOrMore>
-                <optional>
-                    <ref name="text-outline-style"/>
-                </optional>
-                <zeroOrMore>
-                    <ref name="text-notes-configuration"/>
-                </zeroOrMore>
-                <optional>
-                    <ref name="text-bibliography-configuration"/>
-                </optional>
-                <optional>
-                    <ref name="text-linenumbering-configuration"/>
-                </optional>
-                <zeroOrMore>
-                    <ref name="draw-gradient"/>
-                </zeroOrMore>
-                <zeroOrMore>
-                    <ref name="svg-linearGradient"/>
-                </zeroOrMore>
-                <zeroOrMore>
-                    <ref name="svg-radialGradient"/>
-                </zeroOrMore>
-                <zeroOrMore>
-                    <ref name="draw-hatch"/>
-                </zeroOrMore>
-                <zeroOrMore>
-                    <ref name="draw-fill-image"/>
-                </zeroOrMore>
-                <zeroOrMore>
-                    <ref name="draw-marker"/>
-                </zeroOrMore>
-                <zeroOrMore>
-                    <ref name="draw-stroke-dash"/>
-                </zeroOrMore>
-                <zeroOrMore>
-                    <ref name="draw-opacity"/>
-                </zeroOrMore>
-                <zeroOrMore>
-                    <ref name="style-presentation-page-layout"/>
-                </zeroOrMore>
-            </interleave>
-        </element>
-    </optional>
-</define>
-<define name="office-automatic-styles">
-    <optional>
-        <element name="office:automatic-styles">
-            <interleave>
-                <ref name="styles"/>
-                <zeroOrMore>
-                    <ref name="style-page-layout"/>
-                </zeroOrMore>
-            </interleave>
-        </element>
-    </optional>
-</define>
-<define name="office-master-styles">
-    <optional>
-        <element name="office:master-styles">
-            <interleave>
-                <zeroOrMore>
-                    <ref name="style-master-page"/>
-                </zeroOrMore>
-                <optional>
-                    <ref name="style-handout-master"/>
-                </optional>
-                <optional>
-                    <ref name="draw-layer-set"/>
-                </optional>
-            </interleave>
-        </element>
-    </optional>
-</define>
-
-<define name="styles">
-    <interleave>
-        <zeroOrMore>
-            <ref name="style-style"/>
-        </zeroOrMore>
-        <zeroOrMore>
-            <ref name="text-list-style"/>
-        </zeroOrMore>
-        <zeroOrMore>
-            <ref name="number-number-style"/>
-        </zeroOrMore>
-        <zeroOrMore>
-            <ref name="number-currency-style"/>
-        </zeroOrMore>
-        <zeroOrMore>
-            <ref name="number-percentage-style"/>
-        </zeroOrMore>
-        <zeroOrMore>
-            <ref name="number-date-style"/>
-        </zeroOrMore>
-        <zeroOrMore>
-            <ref name="number-time-style"/>
-        </zeroOrMore>
-        <zeroOrMore>
-            <ref name="number-boolean-style"/>
-        </zeroOrMore>
-        <zeroOrMore>
-            <ref name="number-text-style"/>
-        </zeroOrMore>
-    </interleave>
-</define>
-<define name="office-meta-data" combine="choice">
-    <element name="meta:generator">
-        <ref name="string"/>
-    </element>
-</define>
-<define name="office-meta-data" combine="choice">
-    <element name="dc:title">
-        <ref name="string"/>
-    </element>
-</define>
-<define name="office-meta-data" combine="choice">
-    <element name="dc:description">
-        <ref name="string"/>
-    </element>
-</define>
-<define name="office-meta-data" combine="choice">
-    <element name="dc:subject">
-        <ref name="string"/>
-    </element>
-</define>
-<define name="office-meta-data" combine="choice">
-    <element name="meta:keyword">
-        <ref name="string"/>
-    </element>
-</define>
-<define name="office-meta-data" combine="choice">
-    <element name="meta:initial-creator">
-        <ref name="string"/>
-    </element>
-</define>
-<define name="office-meta-data" combine="choice">
-    <ref name="dc-creator"/>
-</define>
-<define name="dc-creator">
-    <element name="dc:creator">
-        <ref name="string"/>
-    </element>
-</define>
-<define name="office-meta-data" combine="choice">
-    <element name="meta:printed-by">
-        <ref name="string"/>
-    </element>
-</define>
-<define name="office-meta-data" combine="choice">
-    <element name="meta:creation-date">
-        <ref name="dateTime"/>
-    </element>
-</define>
-<define name="office-meta-data" combine="choice">
-    <ref name="dc-date"/>
-</define>
-<define name="dc-date">
-    <element name="dc:date">
-        <ref name="dateTime"/>
-    </element>
-</define>
-<define name="office-meta-data" combine="choice">
-    <element name="meta:print-date">
-        <ref name="dateTime"/>
-    </element>
-</define>
-<define name="office-meta-data" combine="choice">
-    <element name="meta:template">
-        <attribute name="xlink:href">
-            <ref name="anyURI"/>
-        </attribute>
-        <optional>
-            <attribute name="xlink:type" a:defaultValue="simple">
-                <value>simple</value>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="xlink:actuate" a:defaultValue="onRequest">
-                <value>onRequest</value>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="xlink:title">
-                <ref name="string"/>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="meta:date">
-                <ref name="dateTime"/>
-            </attribute>
-        </optional>
-    </element>
-</define>
-<define name="office-meta-data" combine="choice">
-    <element name="meta:auto-reload">
-        <optional>
-            <attribute name="xlink:type" a:defaultValue="simple">
-                <value>simple</value>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="xlink:show" a:defaultValue="replace">
-                <value>replace</value>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="xlink:actuate" a:defaultValue="onLoad">
-                <value>onLoad</value>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="xlink:href">
-                <ref name="anyURI"/>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="meta:delay">
-                <ref name="duration"/>
-            </attribute>
-        </optional>
-    </element>
-</define>
-<define name="office-meta-data" combine="choice">
-    <element name="meta:hyperlink-behaviour">
-        <optional>
-            <attribute name="office:target-frame-name">
-                <ref name="targetFrameName"/>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="xlink:show">
-                <choice>
-                    <value>new</value>
-                    <value>replace</value>
-                </choice>
-            </attribute>
-        </optional>
-    </element>
-</define>
-<define name="office-meta-data" combine="choice">
-    <element name="dc:language">
-        <ref name="language"/>
-    </element>
-</define>
-<define name="office-meta-data" combine="choice">
-    <element name="meta:editing-cycles">
-        <ref name="nonNegativeInteger"/>
-    </element>
-</define>
-<define name="office-meta-data" combine="choice">
-    <element name="meta:editing-duration">
-        <ref name="duration"/>
-    </element>
-</define>
-<define name="office-meta-data" combine="choice">
-    <element name="meta:document-statistic">
-        <optional>
-            <attribute name="meta:page-count">
-                <ref name="nonNegativeInteger"/>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="meta:table-count">
-                <ref name="nonNegativeInteger"/>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="meta:draw-count">
-                <ref name="nonNegativeInteger"/>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="meta:image-count">
-                <ref name="nonNegativeInteger"/>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="meta:ole-object-count">
-                <ref name="nonNegativeInteger"/>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="meta:paragraph-count">
-                <ref name="nonNegativeInteger"/>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="meta:word-count">
-                <ref name="nonNegativeInteger"/>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="meta:character-count">
-                <ref name="nonNegativeInteger"/>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="frame-count">
-                <ref name="nonNegativeInteger"/>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="sentence-count">
-                <ref name="nonNegativeInteger"/>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="syllable-count">
-                <ref name="nonNegativeInteger"/>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="non-whitespace-character-count">
-                <ref name="nonNegativeInteger"/>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="meta:row-count">
-                <ref name="nonNegativeInteger"/>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="meta:cell-count">
-                <ref name="nonNegativeInteger"/>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="meta:object-count">
-                <ref name="nonNegativeInteger"/>
-            </attribute>
-        </optional>
-    </element>
-</define>
-<define name="office-meta-data" combine="choice">
-    <element name="meta:user-defined">
-        <attribute name="meta:name">
-            <ref name="string"/>
-        </attribute>
-        <choice>
-            <group>
-                <attribute name="meta:value-type">
-                    <value>float</value>
-                </attribute>
-                <ref name="double"/>
-            </group>
-            <group>
-                <attribute name="meta:value-type">
-                    <value>date</value>
-                </attribute>
-                <ref name="dateOrDateTime"/>
-            </group>
-            <group>
-                <attribute name="meta:value-type">
-                    <value>time</value>
-                </attribute>
-                <ref name="duration"/>
-            </group>
-            <group>
-                <attribute name="meta:value-type">
-                    <value>boolean</value>
-                </attribute>
-                <ref name="boolean"/>
-            </group>
-            <group>
-                <attribute name="meta:value-type">
-                    <value>string</value>
-                </attribute>
-                <ref name="string"/>
-            </group>
-            <text/>
-        </choice>
-    </element>
-</define>
-<define name="text-h">
-    <element name="text:h">
-        <ref name="heading-attrs"/>
-        <ref name="paragraph-attrs"/>
-        <optional>
-            <ref name="text-number"/>
-        </optional>
-        <zeroOrMore>
-            <ref name="paragraph-content"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="heading-attrs" combine="interleave">
-    <attribute name="text:outline-level">
-        <ref name="positiveInteger"/>
-    </attribute>
-</define>
-<define name="heading-attrs" combine="interleave">
-    <optional>
-        <attribute name="text:restart-numbering" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="heading-attrs" combine="interleave">
-    <optional>
-        <attribute name="text:start-value">
-            <ref name="nonNegativeInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="heading-attrs" combine="interleave">
-    <optional>
-        <attribute name="text:is-list-header" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-number">
-    <element name="text:number">
-        <ref name="string"/>
-    </element>
-</define>
-<define name="text-p">
-    <element name="text:p">
-        <ref name="paragraph-attrs"/>
-        <zeroOrMore>
-            <ref name="paragraph-content"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="paragraph-attrs">
-    <optional>
-        <attribute name="text:style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="text:class-names">
-            <ref name="styleNameRefs"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="text:cond-style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="paragraph-attrs" combine="interleave">
-    <optional>
-        <ref name="text-id"/>
-    </optional>
-</define>
-<define name="text-page-sequence">
-    <element name="text:page-sequence">
-        <oneOrMore>
-            <ref name="text-page"/>
-        </oneOrMore>
-    </element>
-</define>
-<define name="text-page">
-    <element name="text:page">
-        <ref name="text-page-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="text-page-attlist">
-    <attribute name="text:master-page-name">
-        <ref name="styleNameRef"/>
-    </attribute>
-</define>
-<define name="text-list">
-    <element name="text:list">
-        <ref name="text-list-attr"/>
-        <optional>
-            <ref name="text-list-header"/>
-        </optional>
-        <zeroOrMore>
-            <ref name="text-list-item"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="text-list-attr" combine="interleave">
-    <optional>
-        <attribute name="text:style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-list-attr" combine="interleave">
-    <optional>
-        <attribute name="text:continue-numbering">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-list-item">
-    <element name="text:list-item">
-        <ref name="text-list-item-attr"/>
-        <ref name="text-list-item-content"/>
-    </element>
-</define>
-<define name="text-list-item-content">
-    <optional>
-        <ref name="text-number"/>
-    </optional>
-    <zeroOrMore>
-        <choice>
-            <ref name="text-p"/>
-            <ref name="text-h"/>
-            <ref name="text-list"/>
-        </choice>
-    </zeroOrMore>
-</define>
-<define name="text-list-item-attr" combine="interleave">
-    <optional>
-        <attribute name="text:start-value">
-            <ref name="nonNegativeInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-list-header">
-    <element name="text:list-header">
-        <ref name="text-list-item-content"/>
-    </element>
-</define>
-<define name="text-numbered-paragraph">
-    <element name="text:numbered-paragraph">
-        <ref name="text-numbered-paragraph-attr"/>
-        <optional>
-            <ref name="text-number"/>
-        </optional>
-        <choice>
-            <ref name="text-p"/>
-            <ref name="text-h"/>
-        </choice>
-    </element>
-</define>
-<define name="text-numbered-paragraph-attr" combine="interleave">
-    <optional>
-        <attribute name="text:level" a:defaultValue="1">
-            <ref name="positiveInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-numbered-paragraph-attr" combine="interleave">
-    <ref name="text-list-attr"/>
-</define>
-<define name="text-numbered-paragraph-attr" combine="interleave">
-    <ref name="text-list-item-attr"/>
-</define>
-<define name="text-section">
-    <element name="text:section">
-        <ref name="text-section-attr"/>
-        <choice>
-            <ref name="text-section-source"/>
-            <ref name="text-section-source-dde"/>
-            <empty/>
-        </choice>
-        <zeroOrMore>
-            <ref name="text-content"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="text-section-attr" combine="interleave">
-    <ref name="sectionAttr"/>
-</define>
-<define name="sectionAttr" combine="interleave">
-    <optional>
-        <attribute name="text:style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="sectionAttr" combine="interleave">
-    <attribute name="text:name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="sectionAttr" combine="interleave">
-    <optional>
-        <attribute name="text:protected">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="sectionAttr" combine="interleave">
-    <optional>
-        <attribute name="text:protection-key">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-section-attr" combine="interleave">
-    <choice>
-        <attribute name="text:display">
-            <choice>
-                <value>true</value>
-                <value>none</value>
-            </choice>
-        </attribute>
-        <group>
-            <attribute name="text:display">
-                <value>condition</value>
-            </attribute>
-            <attribute name="text:condition">
-                <ref name="string"/>
-            </attribute>
-        </group>
-        <empty/>
-    </choice>
-</define>
-<define name="text-section-source">
-    <element name="text:section-source">
-        <ref name="text-section-source-attr"/>
-    </element>
-</define>
-<define name="text-section-source-attr" combine="interleave">
-    <optional>
-        <attribute name="xlink:href">
-            <ref name="anyURI"/>
-        </attribute>
-        <optional>
-            <attribute name="xlink:type" a:defaultValue="simple">
-                <value>simple</value>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="xlink:show" a:defaultValue="embed">
-                <value>embed</value>
-            </attribute>
-        </optional>
-    </optional>
-</define>
-<define name="text-section-source-attr" combine="interleave">
-    <optional>
-        <attribute name="text:section-name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-section-source-attr" combine="interleave">
-    <optional>
-        <attribute name="text:filter-name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-section-source-dde">
-    <ref name="office-dde-source"/>
-</define>
-<define name="text-tracked-changes">
-    <optional>
-        <element name="text:tracked-changes">
-            <ref name="text-tracked-changes-attr"/>
-            <zeroOrMore>
-                <ref name="text-changed-region"/>
-            </zeroOrMore>
-        </element>
-    </optional>
-</define>
-<define name="text-tracked-changes-attr" combine="interleave">
-    <optional>
-        <attribute name="text:track-changes" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-changed-region">
-    <element name="text:changed-region">
-        <ref name="text-changed-region-attr"/>
-        <ref name="text-changed-region-content"/>
-    </element>
-</define>
-<define name="text-changed-region-attr" combine="interleave">
-    <attribute name="text:id">
-        <ref name="ID"/>
-    </attribute>
-</define>
-<define name="text-changed-region-content" combine="choice">
-    <element name="text:insertion">
-        <ref name="office-change-info"/>
-    </element>
-</define>
-<define name="text-changed-region-content" combine="choice">
-    <element name="text:deletion">
-        <ref name="office-change-info"/>
-        <zeroOrMore>
-            <ref name="text-content"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="text-changed-region-content" combine="choice">
-    <element name="text:format-change">
-        <ref name="office-change-info"/>
-    </element>
-</define>
-<define name="change-marks">
-    <choice>
-        <element name="text:change">
-            <ref name="change-mark-attr"/>
-        </element>
-        <element name="text:change-start">
-            <ref name="change-mark-attr"/>
-        </element>
-        <element name="text:change-end">
-            <ref name="change-mark-attr"/>
-        </element>
-    </choice>
-</define>
-<define name="change-mark-attr">
-    <attribute name="text:change-id">
-        <ref name="IDREF"/>
-    </attribute>
-</define>
-<define name="text-decls">
-    <optional>
-        <element name="text:variable-decls">
-            <zeroOrMore>
-                <ref name="text-variable-decl"/>
-            </zeroOrMore>
-        </element>
-    </optional>
-    <optional>
-        <element name="text:sequence-decls">
-            <zeroOrMore>
-                <ref name="text-sequence-decl"/>
-            </zeroOrMore>
-        </element>
-    </optional>
-    <optional>
-        <element name="text:user-field-decls">
-            <zeroOrMore>
-                <ref name="text-user-field-decl"/>
-            </zeroOrMore>
-        </element>
-    </optional>
-    <optional>
-        <element name="text:dde-connection-decls">
-            <zeroOrMore>
-                <ref name="text-dde-connection-decl"/>
-            </zeroOrMore>
-        </element>
-    </optional>
-    <optional>
-        <ref name="text-alphabetical-index-auto-mark-file"/>
-    </optional>
-</define>
-<define name="paragraph-content" combine="choice">
-    <text/>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:s">
-        <optional>
-            <attribute name="text:c">
-                <ref name="nonNegativeInteger"/>
-            </attribute>
-        </optional>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:tab">
-        <ref name="text-tab-attr"/>
-    </element>
-</define>
-<define name="text-tab-attr">
-    <optional>
-        <attribute name="text:tab-ref">
-            <ref name="nonNegativeInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:line-break">
-        <empty/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:span">
-        <optional>
-            <attribute name="text:style-name">
-                <ref name="styleNameRef"/>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="text:class-names">
-                <ref name="styleNameRefs"/>
-            </attribute>
-        </optional>
-        <zeroOrMore>
-            <ref name="paragraph-content"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:a">
-        <ref name="text-a-attlist"/>
-        <optional>
-            <ref name="office-event-listeners"/>
-        </optional>
-        <zeroOrMore>
-            <ref name="paragraph-content"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="text-a-attlist" combine="interleave">
-    <optional>
-        <attribute name="office:name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-a-attlist" combine="interleave">
-    <attribute name="xlink:href">
-        <ref name="anyURI"/>
-    </attribute>
-    <optional>
-        <attribute name="xlink:type" a:defaultValue="simple">
-            <value>simple</value>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="xlink:actuate" a:defaultValue="onRequest">
-            <value>onRequest</value>
-        </attribute>
-    </optional>
-</define>
-<define name="text-a-attlist" combine="interleave">
-    <optional>
-        <attribute name="office:target-frame-name">
-            <ref name="targetFrameName"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="xlink:show">
-            <choice>
-                <value>new</value>
-                <value>replace</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="text-a-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="text:visited-style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="paragraph-content" combine="choice">
-    <choice>
-        <element name="text:bookmark">
-            <attribute name="text:name">
-                <ref name="string"/>
-            </attribute>
-        </element>
-        <element name="text:bookmark-start">
-            <attribute name="text:name">
-                <ref name="string"/>
-            </attribute>
-        </element>
-        <element name="text:bookmark-end">
-            <attribute name="text:name">
-                <ref name="string"/>
-            </attribute>
-        </element>
-    </choice>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:reference-mark">
-        <attribute name="text:name">
-            <ref name="string"/>
-        </attribute>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <choice>
-        <element name="text:reference-mark-start">
-            <attribute name="text:name">
-                <ref name="string"/>
-            </attribute>
-        </element>
-        <element name="text:reference-mark-end">
-            <attribute name="text:name">
-                <ref name="string"/>
-            </attribute>
-        </element>
-    </choice>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:note">
-        <ref name="text-note-class"/>
-        <optional>
-            <attribute name="text:id">
-                <ref name="string"/>
-            </attribute>
-        </optional>
-        <element name="text:note-citation">
-            <optional>
-                <attribute name="text:label">
-                    <ref name="string"/>
-                </attribute>
-            </optional>
-            <text/>
-        </element>
-        <element name="text:note-body">
-            <zeroOrMore>
-                <ref name="text-content"/>
-            </zeroOrMore>
-        </element>
-    </element>
-</define>
-<define name="text-note-class">
-    <attribute name="text:note-class">
-        <choice>
-            <value>footnote</value>
-            <value>endnote</value>
-        </choice>
-    </attribute>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:ruby">
-        <optional>
-            <attribute name="text:style-name">
-                <ref name="styleNameRef"/>
-            </attribute>
-        </optional>
-        <element name="text:ruby-base">
-            <ref name="paragraph-content"/>
-        </element>
-        <element name="text:ruby-text">
-            <optional>
-                <attribute name="text:style-name">
-                    <ref name="styleNameRef"/>
-                </attribute>
-            </optional>
-            <text/>
-        </element>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <ref name="office-annotation"/>
-</define>
-<define name="paragraph-content" combine="choice">
-    <ref name="change-marks"/>
-</define>
-<define name="paragraph-content" combine="choice">
-    <choice>
-        <ref name="shape"/>
-        <ref name="draw-a"/>
-    </choice>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:date">
-        <ref name="text-date-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="text-date-attlist" combine="interleave">
-    <interleave>
-        <ref name="common-field-fixed-attlist"/>
-        <ref name="common-field-data-style-name-attlist"/>
-    </interleave>
-</define>
-<define name="text-date-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:date-value">
-            <ref name="dateOrDateTime"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-date-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:date-adjust">
-            <ref name="duration"/>
-        </attribute>
-    </optional>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:time">
-        <ref name="text-time-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="text-time-attlist" combine="interleave">
-    <interleave>
-        <ref name="common-field-fixed-attlist"/>
-        <ref name="common-field-data-style-name-attlist"/>
-    </interleave>
-</define>
-<define name="text-time-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:time-value">
-            <ref name="timeOrDateTime"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-time-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:time-adjust">
-            <ref name="duration"/>
-        </attribute>
-    </optional>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:page-number">
-        <ref name="text-page-number-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="text-page-number-attlist" combine="interleave">
-    <interleave>
-        <ref name="common-field-num-format-attlist"/>
-        <ref name="common-field-fixed-attlist"/>
-    </interleave>
-</define>
-<define name="text-page-number-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:page-adjust">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-page-number-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:select-page">
-            <choice>
-                <value>previous</value>
-                <value>current</value>
-                <value>next</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:page-continuation">
-        <ref name="text-page-continuation-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="text-page-continuation-attlist" combine="interleave">
-    <attribute name="text:select-page">
-        <choice>
-            <value>previous</value>
-            <value>next</value>
-        </choice>
-    </attribute>
-</define>
-<define name="text-page-continuation-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:string-value">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:sender-firstname">
-        <ref name="common-field-fixed-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:sender-lastname">
-        <ref name="common-field-fixed-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:sender-initials">
-        <ref name="common-field-fixed-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:sender-title">
-        <ref name="common-field-fixed-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:sender-position">
-        <ref name="common-field-fixed-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:sender-email">
-        <ref name="common-field-fixed-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:sender-phone-private">
-        <ref name="common-field-fixed-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:sender-fax">
-        <ref name="common-field-fixed-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:sender-company">
-        <ref name="common-field-fixed-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:sender-phone-work">
-        <ref name="common-field-fixed-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:sender-street">
-        <ref name="common-field-fixed-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:sender-city">
-        <ref name="common-field-fixed-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:sender-postal-code">
-        <ref name="common-field-fixed-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:sender-country">
-        <ref name="common-field-fixed-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:sender-state-or-province">
-        <ref name="common-field-fixed-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:author-name">
-        <ref name="common-field-fixed-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:author-initials">
-        <ref name="common-field-fixed-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:chapter">
-        <ref name="text-chapter-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="text-chapter-attlist" combine="interleave">
-    <attribute name="text:display">
-        <choice>
-            <value>name</value>
-            <value>number</value>
-            <value>number-and-name</value>
-            <value>plain-number-and-name</value>
-            <value>plain-number</value>
-        </choice>
-    </attribute>
-</define>
-<define name="text-chapter-attlist" combine="interleave">
-    <attribute name="text:outline-level">
-        <ref name="nonNegativeInteger"/>
-    </attribute>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:file-name">
-        <ref name="text-file-name-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="text-file-name-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:display">
-            <choice>
-                <value>full</value>
-                <value>path</value>
-                <value>name</value>
-                <value>name-and-extension</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="text-file-name-attlist" combine="interleave">
-    <ref name="common-field-fixed-attlist"/>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:template-name">
-        <ref name="text-template-name-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="text-template-name-attlist">
-    <optional>
-        <attribute name="text:display">
-            <choice>
-                <value>full</value>
-                <value>path</value>
-                <value>name</value>
-                <value>name-and-extension</value>
-                <value>area</value>
-                <value>title</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:sheet-name">
-        <text/>
-    </element>
-</define>
-<define name="text-variable-decl">
-    <element name="text:variable-decl">
-        <ref name="common-field-name-attlist"/>
-        <ref name="common-value-type-attlist"/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:variable-set">
-        <interleave>
-            <ref name="common-field-name-attlist"/>
-            <ref name="common-field-formula-attlist"/>
-            <ref name="common-value-and-type-attlist"/>
-            <ref name="common-field-display-value-none-attlist"/>
-            <ref name="common-field-data-style-name-attlist"/>
-        </interleave>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:variable-get">
-        <interleave>
-            <ref name="common-field-name-attlist"/>
-            <ref name="common-field-display-value-formula-attlist"/>
-            <ref name="common-field-data-style-name-attlist"/>
-        </interleave>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:variable-input">
-        <interleave>
-            <ref name="common-field-name-attlist"/>
-            <ref name="common-field-description-attlist"/>
-            <ref name="common-value-type-attlist"/>
-            <ref name="common-field-display-value-none-attlist"/>
-            <ref name="common-field-data-style-name-attlist"/>
-        </interleave>
-        <text/>
-    </element>
-</define>
-<define name="text-user-field-decl">
-    <element name="text:user-field-decl">
-        <ref name="common-field-name-attlist"/>
-        <optional>
-            <ref name="common-field-formula-attlist"/>
-        </optional>
-        <ref name="common-value-and-type-attlist"/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:user-field-get">
-        <interleave>
-            <ref name="common-field-name-attlist"/>
-            <ref name="common-field-display-value-formula-none-attlist"/>
-            <ref name="common-field-data-style-name-attlist"/>
-        </interleave>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:user-field-input">
-        <interleave>
-            <ref name="common-field-name-attlist"/>
-            <ref name="common-field-description-attlist"/>
-            <ref name="common-field-data-style-name-attlist"/>
-        </interleave>
-        <text/>
-    </element>
-</define>
-<define name="text-sequence-decl">
-    <element name="text:sequence-decl">
-        <ref name="text-sequence-decl-attlist"/>
-    </element>
-</define>
-<define name="text-sequence-decl-attlist" combine="interleave">
-    <ref name="common-field-name-attlist"/>
-</define>
-<define name="text-sequence-decl-attlist" combine="interleave">
-    <attribute name="text:display-outline-level">
-        <ref name="nonNegativeInteger"/>
-    </attribute>
-</define>
-<define name="text-sequence-decl-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:separation-character">
-            <ref name="character"/>
-        </attribute>
-    </optional>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:sequence">
-        <interleave>
-            <ref name="common-field-name-attlist"/>
-            <ref name="common-field-formula-attlist"/>
-            <ref name="common-field-num-format-attlist"/>
-            <ref name="text-sequence-ref-name"/>
-        </interleave>
-        <text/>
-    </element>
-</define>
-<define name="text-sequence-ref-name">
-    <optional>
-        <attribute name="text:ref-name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:expression">
-        <interleave>
-            <ref name="common-field-formula-attlist"/>
-            <optional>
-                <ref name="common-value-and-type-attlist"/>
-            </optional>
-            <ref name="common-field-display-value-formula-attlist"/>
-            <ref name="common-field-data-style-name-attlist"/>
-        </interleave>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:text-input">
-        <ref name="common-field-description-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:initial-creator">
-        <ref name="common-field-fixed-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:creation-date">
-        <interleave>
-            <ref name="common-field-fixed-attlist"/>
-            <ref name="common-field-data-style-name-attlist"/>
-            <optional>
-                <attribute name="text:date-value">
-                    <ref name="dateOrDateTime"/>
-                </attribute>
-            </optional>
-        </interleave>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:creation-time">
-        <interleave>
-            <ref name="common-field-fixed-attlist"/>
-            <ref name="common-field-data-style-name-attlist"/>
-            <optional>
-                <attribute name="text:time-value">
-                    <ref name="timeOrDateTime"/>
-                </attribute>
-            </optional>
-        </interleave>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:description">
-        <ref name="common-field-fixed-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:user-defined">
-        <interleave>
-            <ref name="common-field-fixed-attlist"/>
-            <attribute name="text:name">
-                <ref name="string"/>
-            </attribute>
-            <ref name="common-field-data-style-name-attlist"/>
-            <optional>
-                <attribute name="office:value">
-                    <ref name="double"/>
-                </attribute>
-            </optional>
-            <optional>
-                <attribute name="office:date-value">
-                    <ref name="dateOrDateTime"/>
-                </attribute>
-            </optional>
-            <optional>
-                <attribute name="office:time-value">
-                    <ref name="duration"/>
-                </attribute>
-            </optional>
-            <optional>
-                <attribute name="office:boolean-value">
-                    <ref name="boolean"/>
-                </attribute>
-            </optional>
-            <optional>
-                <attribute name="office:string-value">
-                    <ref name="string"/>
-                </attribute>
-            </optional>
-        </interleave>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:print-time">
-        <interleave>
-            <ref name="common-field-fixed-attlist"/>
-            <ref name="common-field-data-style-name-attlist"/>
-            <optional>
-                <attribute name="text:time-value">
-                    <ref name="time"/>
-                </attribute>
-            </optional>
-        </interleave>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:print-date">
-        <interleave>
-            <ref name="common-field-fixed-attlist"/>
-            <ref name="common-field-data-style-name-attlist"/>
-            <optional>
-                <attribute name="text:date-value">
-                    <ref name="date"/>
-                </attribute>
-            </optional>
-        </interleave>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:printed-by">
-        <ref name="common-field-fixed-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:title">
-        <ref name="common-field-fixed-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:subject">
-        <ref name="common-field-fixed-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:keywords">
-        <ref name="common-field-fixed-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:editing-cycles">
-        <ref name="common-field-fixed-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:editing-duration">
-        <interleave>
-            <ref name="common-field-fixed-attlist"/>
-            <ref name="common-field-data-style-name-attlist"/>
-            <optional>
-                <attribute name="text:duration">
-                    <ref name="duration"/>
-                </attribute>
-            </optional>
-        </interleave>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:modification-time">
-        <interleave>
-            <ref name="common-field-fixed-attlist"/>
-            <ref name="common-field-data-style-name-attlist"/>
-            <optional>
-                <attribute name="text:time-value">
-                    <ref name="time"/>
-                </attribute>
-            </optional>
-        </interleave>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:modification-date">
-        <interleave>
-            <ref name="common-field-fixed-attlist"/>
-            <ref name="common-field-data-style-name-attlist"/>
-            <optional>
-                <attribute name="text:date-value">
-                    <ref name="date"/>
-                </attribute>
-            </optional>
-        </interleave>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:creator">
-        <ref name="common-field-fixed-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element>
-        <choice>
-            <name>text:page-count</name>
-            <name>text:paragraph-count</name>
-            <name>text:word-count</name>
-            <name>text:character-count</name>
-            <name>text:table-count</name>
-            <name>text:image-count</name>
-            <name>text:object-count</name>
-        </choice>
-        <ref name="common-field-num-format-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="common-field-database-table">
-    <ref name="common-field-database-table-attlist"/>
-    <ref name="common-field-database-name"/>
-</define>
-<define name="common-field-database-name" combine="choice">
-    <optional>
-        <attribute name="text:database-name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-field-database-name" combine="choice">
-    <ref name="form-connection-resource"/>
-</define>
-<define name="common-field-database-table-attlist" combine="interleave">
-    <attribute name="text:table-name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="common-field-database-table-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:table-type">
-            <choice>
-                <value>table</value>
-                <value>query</value>
-                <value>command</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:database-display">
-        <ref name="text-database-display-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="text-database-display-attlist" combine="interleave">
-    <ref name="common-field-database-table"/>
-</define>
-<define name="text-database-display-attlist" combine="interleave">
-    <ref name="common-field-data-style-name-attlist"/>
-</define>
-<define name="text-database-display-attlist" combine="interleave">
-    <attribute name="text:column-name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:database-next">
-        <ref name="text-database-next-attlist"/>
-    </element>
-</define>
-<define name="text-database-next-attlist" combine="interleave">
-    <ref name="common-field-database-table"/>
-</define>
-<define name="text-database-next-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:condition">
-            <ref name="formula"/>
-        </attribute>
-    </optional>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:database-row-select">
-        <ref name="text-database-row-select-attlist"/>
-    </element>
-</define>
-<define name="text-database-row-select-attlist" combine="interleave">
-    <ref name="common-field-database-table"/>
-</define>
-<define name="text-database-row-select-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:condition">
-            <ref name="formula"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-database-row-select-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:row-number">
-            <ref name="nonNegativeInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:database-row-number">
-        <interleave>
-            <ref name="common-field-database-table"/>
-            <ref name="common-field-num-format-attlist"/>
-            <optional>
-                <attribute name="text:value">
-                    <ref name="nonNegativeInteger"/>
-                </attribute>
-            </optional>
-        </interleave>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:database-name">
-        <ref name="common-field-database-table"/>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:page-variable-set">
-        <ref name="text-set-page-variable-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="text-set-page-variable-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:active">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-set-page-variable-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:page-adjust">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:page-variable-get">
-        <ref name="text-get-page-variable-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="text-get-page-variable-attlist" combine="interleave">
-    <ref name="common-field-num-format-attlist"/>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:placeholder">
-        <ref name="text-placeholder-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="text-placeholder-attlist" combine="interleave">
-    <attribute name="text:placeholder-type">
-        <choice>
-            <value>text</value>
-            <value>table</value>
-            <value>text-box</value>
-            <value>image</value>
-            <value>object</value>
-        </choice>
-    </attribute>
-</define>
-<define name="text-placeholder-attlist" combine="interleave">
-    <ref name="common-field-description-attlist"/>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:conditional-text">
-        <ref name="text-conditional-text-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="text-conditional-text-attlist" combine="interleave">
-    <attribute name="text:condition">
-        <ref name="formula"/>
-    </attribute>
-</define>
-<define name="text-conditional-text-attlist" combine="interleave">
-    <attribute name="text:string-value-if-true">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="text-conditional-text-attlist" combine="interleave">
-    <attribute name="text:string-value-if-false">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="text-conditional-text-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:current-value">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:hidden-text">
-        <ref name="text-hidden-text-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="text-hidden-text-attlist" combine="interleave">
-    <attribute name="text:condition">
-        <ref name="formula"/>
-    </attribute>
-</define>
-<define name="text-hidden-text-attlist" combine="interleave">
-    <attribute name="text:string-value">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="text-hidden-text-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:is-hidden">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element>
-        <choice>
-            <name>text:reference-ref</name>
-            <name>text:bookmark-ref</name>
-        </choice>
-        <interleave>
-            <ref name="text-common-ref-content"/>
-            <ref name="text-ref-content"/>
-        </interleave>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:note-ref">
-        <interleave>
-            <ref name="text-common-ref-content"/>
-            <ref name="text-note-ref-content"/>
-            <ref name="text-ref-content"/>
-        </interleave>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:sequence-ref">
-        <interleave>
-            <ref name="text-common-ref-content"/>
-            <ref name="text-sequence-ref-content"/>
-        </interleave>
-    </element>
-</define>
-<define name="text-common-ref-content" combine="interleave">
-    <text/>
-</define>
-<define name="text-common-ref-content" combine="interleave">
-    <optional>
-        <attribute name="text:ref-name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-note-ref-content" combine="interleave">
-    <ref name="text-note-class"/>
-</define>
-<define name="text-ref-content" combine="interleave">
-    <optional>
-        <attribute name="text:reference-format">
-            <choice>
-                <value>page</value>
-                <value>chapter</value>
-                <value>direction</value>
-                <value>text</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="text-sequence-ref-content" combine="interleave">
-    <optional>
-        <attribute name="text:reference-format">
-            <choice>
-                <value>page</value>
-                <value>chapter</value>
-                <value>direction</value>
-                <value>text</value>
-                <value>category-and-value</value>
-                <value>caption</value>
-                <value>value</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:script">
-        <interleave>
-            <choice>
-                <group>
-                    <attribute name="xlink:href">
-                        <ref name="anyURI"/>
-                    </attribute>
-                    <optional>
-                        <attribute name="xlink:type" a:defaultValue="simple">
-                            <value>simple</value>
-                        </attribute>
-                    </optional>
-                </group>    
-                <text/>
-            </choice>
-            <optional>
-                <attribute name="script:language">
-                    <ref name="string"/>
-                </attribute>
-            </optional>
-        </interleave>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:execute-macro">
-        <optional>
-            <attribute name="text:name">
-                <ref name="string"/>
-            </attribute>
-        </optional>
-        <optional>
-            <ref name="office-event-listeners"/>
-        </optional>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:hidden-paragraph">
-        <ref name="text-hidden-paragraph-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="text-hidden-paragraph-attlist" combine="interleave">
-    <attribute name="text:condition">
-        <ref name="formula"/>
-    </attribute>
-</define>
-<define name="text-hidden-paragraph-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:is-hidden">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:dde-connection">
-        <attribute name="text:connection-name">
-            <ref name="string"/>
-        </attribute>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:measure">
-        <attribute name="text:kind">
-            <choice>
-                <value>value</value>
-                <value>unit</value>
-                <value>gap</value>
-            </choice>
-        </attribute>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:table-formula">
-        <interleave>
-            <ref name="common-field-formula-attlist"/>
-            <ref name="common-field-display-value-formula-attlist"/>
-            <ref name="common-field-data-style-name-attlist"/>
-        </interleave>
-        <text/>
-    </element>
-</define>
-<define name="common-value-type-attlist">
-    <attribute name="office:value-type">
-        <ref name="valueType"/>
-    </attribute>
-</define>
-<define name="common-value-and-type-attlist">
-    <choice>
-        <group>
-            <attribute name="office:value-type">
-                <value>float</value>
-            </attribute>
-            <attribute name="office:value">
-                <ref name="double"/>
-            </attribute>
-        </group>
-        <group>
-            <attribute name="office:value-type">
-                <value>percentage</value>
-            </attribute>
-            <attribute name="office:value">
-                <ref name="double"/>
-            </attribute>
-        </group>
-        <group>
-            <attribute name="office:value-type">
-                <value>currency</value>
-            </attribute>
-            <attribute name="office:value">
-                <ref name="double"/>
-            </attribute>
-            <optional>
-                <attribute name="office:currency">
-                    <ref name="string"/>
-                </attribute>
-            </optional>
-        </group>
-        <group>
-            <attribute name="office:value-type">
-                <value>date</value>
-            </attribute>
-            <attribute name="office:date-value">
-                <ref name="dateOrDateTime"/>
-            </attribute>
-        </group>
-        <group>
-            <attribute name="office:value-type">
-                <value>time</value>
-            </attribute>
-            <attribute name="office:time-value">
-                <ref name="duration"/>
-            </attribute>
-        </group>
-        <group>
-            <attribute name="office:value-type">
-                <value>boolean</value>
-            </attribute>
-            <attribute name="office:boolean-value">
-                <ref name="boolean"/>
-            </attribute>
-        </group>
-        <group>
-            <attribute name="office:value-type">
-                <value>string</value>
-            </attribute>
-            <optional>
-                <attribute name="office:string-value">
-                    <ref name="string"/>
-                </attribute>
-            </optional>
-        </group>
-    </choice>
-</define>
-<define name="common-field-fixed-attlist">
-    <optional>
-        <attribute name="text:fixed">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-field-name-attlist">
-    <attribute name="text:name">
-        <ref name="variableName"/>
-    </attribute>
-</define>
-<define name="common-field-description-attlist">
-    <optional>
-        <attribute name="text:description">
-            <text/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-field-display-value-none-attlist">
-    <optional>
-        <attribute name="text:display">
-            <choice>
-                <value>value</value>
-                <value>none</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="common-field-display-value-formula-none-attlist">
-    <optional>
-        <attribute name="text:display">
-            <choice>
-                <value>value</value>
-                <value>formula</value>
-                <value>none</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="common-field-display-value-formula-attlist">
-    <optional>
-        <attribute name="text:display">
-            <choice>
-                <value>value</value>
-                <value>formula</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="common-field-formula-attlist">
-    <optional>
-        <attribute name="text:formula">
-            <ref name="formula"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-field-data-style-name-attlist">
-    <optional>
-        <attribute name="style:data-style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-field-num-format-attlist">
-    <optional>
-        <ref name="common-num-format-attlist"/>
-    </optional>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:toc-mark-start">
-        <ref name="text-toc-mark-start-attrs"/>
-    </element>
-</define>
-<define name="text-toc-mark-start-attrs">
-    <ref name="text-id"/>
-    <ref name="text-outline-level"/>
-</define>
-<define name="text-outline-level">
-    <optional>
-        <attribute name="text:outline-level">
-            <ref name="positiveInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-id">
-    <attribute name="text:id">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:toc-mark-end">
-        <ref name="text-id"/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:toc-mark">
-        <attribute name="text:string-value">
-            <ref name="string"/>
-        </attribute>
-        <ref name="text-outline-level"/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:user-index-mark-start">
-        <ref name="text-id"/>
-        <ref name="text-outline-level"/>
-        <ref name="text-index-name"/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:user-index-mark-end">
-        <ref name="text-id"/>
-        <ref name="text-outline-level"/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:user-index-mark">
-        <attribute name="text:string-value">
-            <ref name="string"/>
-        </attribute>
-        <ref name="text-outline-level"/>
-        <ref name="text-index-name"/>
-    </element>
-</define>
-<define name="text-index-name">
-    <attribute name="text:index-name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:alphabetical-index-mark-start">
-        <ref name="text-id"/>
-        <ref name="text-alphabetical-index-mark-attrs"/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:alphabetical-index-mark-end">
-        <ref name="text-id"/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:alphabetical-index-mark">
-        <attribute name="text:string-value">
-            <ref name="string"/>
-        </attribute>
-        <ref name="text-alphabetical-index-mark-attrs"/>
-    </element>
-</define>
-<define name="text-alphabetical-index-mark-attrs" combine="interleave">
-    <optional>
-        <attribute name="text:key1">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="text:key2">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-alphabetical-index-mark-attrs" combine="interleave">
-    <optional>
-        <attribute name="text:string-value-phonetic">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="text:key1-phonetic">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="text:key2-phonetic">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-alphabetical-index-mark-attrs" combine="interleave">
-    <optional>
-        <attribute name="text:main-entry" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:bibliography-mark">
-        <attribute name="text:bibliography-type">
-            <ref name="text-bibliography-types"/>
-        </attribute>
-        <zeroOrMore>
-            <attribute>
-                <choice>
-                    <name>text:identifier</name>
-                    <name>text:address</name>
-                    <name>text:annote</name>
-                    <name>text:author</name>
-                    <name>text:booktitle</name>
-                    <name>text:chapter</name>
-                    <name>text:edition</name>
-                    <name>text:editor</name>
-                    <name>text:howpublished</name>
-                    <name>text:institution</name>
-                    <name>text:journal</name>
-                    <name>text:month</name>
-                    <name>text:note</name>
-                    <name>text:number</name>
-                    <name>text:organizations</name>
-                    <name>text:pages</name>
-                    <name>text:publisher</name>
-                    <name>text:school</name>
-                    <name>text:series</name>
-                    <name>text:title</name>
-                    <name>text:report-type</name>
-                    <name>text:volume</name>
-                    <name>text:year</name>
-                    <name>text:url</name>
-                    <name>text:custom1</name>
-                    <name>text:custom2</name>
-                    <name>text:custom3</name>
-                    <name>text:custom4</name>
-                    <name>text:custom5</name>
-                    <name>text:isbn</name>
-                    <name>text:issn</name>
-                </choice>
-                <ref name="string"/>
-            </attribute>
-        </zeroOrMore>
-        <text/>
-    </element>
-</define>
-<define name="text-bibliography-types">
-    <choice>
-        <value>article</value>
-        <value>book</value>
-        <value>booklet</value>
-        <value>conference</value>
-        <value>custom1</value>
-        <value>custom2</value>
-        <value>custom3</value>
-        <value>custom4</value>
-        <value>custom5</value>
-        <value>email</value>
-        <value>inbook</value>
-        <value>incollection</value>
-        <value>inproceedings</value>
-        <value>journal</value>
-        <value>manual</value>
-        <value>mastersthesis</value>
-        <value>misc</value>
-        <value>phdthesis</value>
-        <value>proceedings</value>
-        <value>techreport</value>
-        <value>unpublished</value>
-        <value>www</value>
-    </choice>
-</define>
-<define name="text-index-body">
-    <element name="text:index-body">
-        <zeroOrMore>
-            <ref name="index-content-main"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="index-content-main">
-    <choice>
-        <ref name="text-content"/>
-        <ref name="text-index-title"/>
-    </choice>
-</define>
-<define name="text-index-title">
-    <element name="text:index-title">
-        <ref name="sectionAttr"/>
-        <zeroOrMore>
-            <ref name="index-content-main"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="text-table-of-content">
-    <element name="text:table-of-content">
-        <ref name="sectionAttr"/>
-        <ref name="text-table-of-content-source"/>
-        <ref name="text-index-body"/>
-    </element>
-</define>
-<define name="text-table-of-content-source">
-    <element name="text:table-of-content-source">
-        <ref name="text-table-of-content-source-attlist"/>
-        <optional>
-            <ref name="text-index-title-template"/>
-        </optional>
-        <zeroOrMore>
-            <ref name="text-table-of-content-entry-template"/>
-        </zeroOrMore>
-        <zeroOrMore>
-            <ref name="text-index-source-styles"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="text-table-of-content-source-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:outline-level">
-            <choice>
-                <ref name="positiveInteger"/>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="text-table-of-content-source-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:use-outline-level" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-table-of-content-source-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:use-index-marks">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-table-of-content-source-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:use-index-source-styles">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-table-of-content-source-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:index-scope">
-            <choice>
-                <value>document</value>
-                <value>chapter</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="text-table-of-content-source-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:relative-tab-stop-position">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-table-of-content-entry-template">
-    <element name="text:table-of-content-entry-template">
-        <ref name="text-table-of-content-entry-template-attlist"/>
-        <zeroOrMore>
-            <ref name="text-table-of-content-children"/>
-
-        </zeroOrMore>
-    </element>
-</define>
-<define name="text-table-of-content-children">
-    <choice>
-        <ref name="text-index-entry-chapter"/>
-        <ref name="text-index-entry-page-number"/>
-        <ref name="text-index-entry-text"/>
-        <ref name="text-index-entry-span"/>
-        <ref name="text-index-entry-tab-stop"/>
-        <ref name="text-index-entry-link-start"/>
-        <ref name="text-index-entry-link-end"/>
-    </choice>
-</define>
-<define name="text-table-of-content-entry-template-attlist"
-        combine="interleave">
-    <attribute name="text:outline-level">
-        <ref name="positiveInteger"/>
-    </attribute>
-</define>
-<define name="text-table-of-content-entry-template-attlist"
-        combine="interleave">
-    <attribute name="text:style-name">
-        <ref name="styleNameRef"/>
-    </attribute>
-</define>
-<define name="text-illustration-index">
-    <element name="text:illustration-index">
-        <ref name="sectionAttr"/>
-        <ref name="text-illustration-index-source"/>
-        <ref name="text-index-body"/>
-    </element>
-</define>
-<define name="text-illustration-index-source">
-    <element name="text:illustration-index-source">
-        <ref name="text-illustration-index-source-attrs"/>
-        <optional>
-            <ref name="text-index-title-template"/>
-        </optional>
-        <optional>
-            <ref name="text-illustration-index-entry-template"/>
-        </optional>
-    </element>
-</define>
-<define name="text-illustration-index-source-attrs" combine="interleave">
-    <ref name="text-index-scope-attr"/>
-</define>
-<define name="text-index-scope-attr">
-    <optional>
-        <attribute name="text:index-scope" a:defaultValue="document">
-            <choice>
-                <value>document</value>
-                <value>chapter</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="text-illustration-index-source-attrs" combine="interleave">
-    <ref name="text-relative-tab-stop-position-attr"/>
-</define>
-<define name="text-relative-tab-stop-position-attr">
-    <optional>
-        <attribute name="text:relative-tab-stop-position"
-                   a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-illustration-index-source-attrs" combine="interleave">
-    <optional>
-        <attribute name="text:use-caption" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-illustration-index-source-attrs" combine="interleave">
-    <optional>
-        <attribute name="text:caption-sequence-name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-illustration-index-source-attrs" combine="interleave">
-    <optional>
-        <attribute name="text:caption-sequence-format">
-            <choice>
-                <value>text</value>
-                <value>category-and-value</value>
-                <value>caption</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="text-illustration-index-entry-template">
-    <element name="text:illustration-index-entry-template">
-        <ref name="text-illustration-index-entry-content"/>
-    </element>
-</define>
-<define name="text-illustration-index-entry-content">
-    <ref name="text-illustration-index-entry-template-attrs"/>
-    <zeroOrMore>
-        <choice>
-            <ref name="text-index-entry-page-number"/>
-            <ref name="text-index-entry-text"/>
-            <ref name="text-index-entry-span"/>
-            <ref name="text-index-entry-tab-stop"/>
-        </choice>
-    </zeroOrMore>
-</define>
-<define name="text-illustration-index-entry-template-attrs">
-    <attribute name="text:style-name">
-        <ref name="styleNameRef"/>
-    </attribute>
-</define>
-<define name="text-table-index">
-    <element name="text:table-index">
-        <ref name="sectionAttr"/>
-        <ref name="text-table-index-source"/>
-        <ref name="text-index-body"/>
-    </element>
-</define>
-<define name="text-table-index-source">
-    <element name="text:table-index-source">
-        <ref name="text-illustration-index-source-attrs"/>
-        <optional>
-            <ref name="text-index-title-template"/>
-        </optional>
-        <optional>
-            <ref name="text-table-index-entry-template"/>
-        </optional>
-    </element>
-</define>
-<define name="text-table-index-entry-template">
-    <element name="text:table-index-entry-template">
-        <ref name="text-illustration-index-entry-content"/>
-    </element>
-</define>
-<define name="text-object-index">
-    <element name="text:object-index">
-        <ref name="sectionAttr"/>
-        <ref name="text-object-index-source"/>
-        <ref name="text-index-body"/>
-    </element>
-</define>
-<define name="text-object-index-source">
-    <element name="text:object-index-source">
-        <ref name="text-object-index-source-attrs"/>
-        <optional>
-            <ref name="text-index-title-template"/>
-        </optional>
-        <optional>
-            <ref name="text-object-index-entry-template"/>
-        </optional>
-    </element>
-</define>
-<define name="text-object-index-source-attrs" combine="interleave">
-    <ref name="text-index-scope-attr"/>
-</define>
-<define name="text-object-index-source-attrs" combine="interleave">
-    <ref name="text-relative-tab-stop-position-attr"/>
-</define>
-<define name="text-object-index-source-attrs" combine="interleave">
-    <optional>
-        <attribute name="text:use-spreadsheet-objects" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-object-index-source-attrs" combine="interleave">
-    <optional>
-        <attribute name="text:use-math-objects" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-object-index-source-attrs" combine="interleave">
-    <optional>
-        <attribute name="text:use-draw-objects" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-object-index-source-attrs" combine="interleave">
-    <optional>
-        <attribute name="text:use-chart-objects" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-object-index-source-attrs" combine="interleave">
-    <optional>
-        <attribute name="text:use-other-objects" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-object-index-entry-template">
-    <element name="text:object-index-entry-template">
-        <ref name="text-illustration-index-entry-content"/>
-    </element>
-</define>
-<define name="text-user-index">
-    <element name="text:user-index">
-        <ref name="sectionAttr"/>
-        <ref name="text-user-index-source"/>
-        <ref name="text-index-body"/>
-    </element>
-</define>
-<define name="text-user-index-source">
-    <element name="text:user-index-source">
-        <ref name="text-user-index-source-attr"/>
-        <optional>
-            <ref name="text-index-title-template"/>
-        </optional>
-        <zeroOrMore>
-            <ref name="text-user-index-entry-template"/>
-        </zeroOrMore>
-        <zeroOrMore>
-            <ref name="text-index-source-styles"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="text-user-index-source-attr" combine="interleave">
-    <ref name="text-index-scope-attr"/>
-    <ref name="text-relative-tab-stop-position-attr"/>
-    <attribute name="text:index-name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="text-user-index-source-attr" combine="interleave">
-    <optional>
-        <attribute name="text:use-index-marks" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="text:use-graphics" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="text:use-tables" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="text:use-floating-frames"
-                     a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="text:use-objects" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-user-index-source-attr" combine="interleave">
-    <optional>
-        <attribute name="text:copy-outline-levels"
-                     a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-user-index-entry-template">
-    <element name="text:user-index-entry-template">
-        <ref name="text-user-index-entry-template-attrs"/>
-        <zeroOrMore>
-            <choice>
-                <ref name="text-index-entry-chapter"/>
-                <ref name="text-index-entry-page-number"/>
-                <ref name="text-index-entry-text"/>
-                <ref name="text-index-entry-span"/>
-                <ref name="text-index-entry-tab-stop"/>
-            </choice>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="text-user-index-entry-template-attrs" combine="interleave">
-    <attribute name="text:outline-level">
-        <ref name="positiveInteger"/>
-    </attribute>
-</define>
-<define name="text-user-index-entry-template-attrs" combine="interleave">
-    <attribute name="text:style-name">
-        <ref name="styleNameRef"/>
-    </attribute>
-</define>
-<define name="text-alphabetical-index">
-    <element name="text:alphabetical-index">
-        <ref name="sectionAttr"/>
-        <ref name="text-alphabetical-index-source"/>
-        <ref name="text-index-body"/>
-    </element>
-</define>
-<define name="text-alphabetical-index-source">
-    <element name="text:alphabetical-index-source">
-        <ref name="text-alphabetical-index-source-attrs"/>
-        <optional>
-            <ref name="text-index-title-template"/>
-        </optional>
-        <zeroOrMore>
-            <ref name="text-alphabetical-index-entry-template"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="text-alphabetical-index-source-attrs" combine="interleave">
-    <ref name="text-index-scope-attr"/>
-    <ref name="text-relative-tab-stop-position-attr"/>
-</define>
-<define name="text-alphabetical-index-source-attrs" combine="interleave">
-    <optional>
-        <attribute name="text:ignore-case" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-alphabetical-index-source-attrs" combine="interleave">
-    <optional>
-        <attribute name="text:main-entry-style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-alphabetical-index-source-attrs" combine="interleave">
-    <optional>
-        <attribute name="text:alphabetical-separators" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-alphabetical-index-source-attrs" combine="interleave">
-    <optional>
-        <attribute name="text:combine-entries" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="text:combine-entries-with-dash"
-                   a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="text:combine-entries-with-pp" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-alphabetical-index-source-attrs" combine="interleave">
-    <optional>
-        <attribute name="text:use-keys-as-entries" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-alphabetical-index-source-attrs" combine="interleave">
-    <optional>
-        <attribute name="text:capitalize-entries" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-alphabetical-index-source-attrs" combine="interleave">
-    <optional>
-        <attribute name="text:comma-separated" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-alphabetical-index-source-attrs" combine="interleave">
-    <optional>
-        <attribute name="fo:language">
-            <ref name="languageCode"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-alphabetical-index-source-attrs" combine="interleave">
-    <optional>
-        <attribute name="fo:country">
-            <ref name="countryCode"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-alphabetical-index-source-attrs" combine="interleave">
-    <optional>
-        <attribute name="text:sort-algorithm">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-alphabetical-index-auto-mark-file">
-    <element name="text:alphabetical-index-auto-mark-file">
-        <attribute name="xlink:href">
-            <ref name="anyURI"/>
-        </attribute>
-        <optional>
-            <attribute name="xlink:type" a:defaultValue="simple">
-                <value>simple</value>
-            </attribute>
-        </optional>
-    </element>
-</define>
-<define name="text-alphabetical-index-entry-template">
-    <element name="text:alphabetical-index-entry-template">
-        <ref name="text-alphabetical-index-entry-template-attrs"/>
-        <zeroOrMore>
-            <choice>
-                <ref name="text-index-entry-chapter"/>
-                <ref name="text-index-entry-page-number"/>
-                <ref name="text-index-entry-text"/>
-                <ref name="text-index-entry-span"/>
-                <ref name="text-index-entry-tab-stop"/>
-            </choice>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="text-alphabetical-index-entry-template-attrs"
-        combine="interleave">
-    <attribute name="text:outline-level">
-        <choice>
-            <value>1</value>
-            <value>2</value>
-            <value>3</value>
-            <value>separator</value>
-        </choice>
-    </attribute>
-</define>
-<define name="text-alphabetical-index-entry-template-attrs"
-        combine="interleave">
-    <attribute name="text:style-name">
-        <ref name="styleNameRef"/>
-    </attribute>
-</define>
-<define name="text-bibliography">
-    <element name="text:bibliography">
-        <ref name="sectionAttr"/>
-        <ref name="text-bibliography-source"/>
-        <ref name="text-index-body"/>
-    </element>
-</define>
-<define name="text-bibliography-source">
-    <element name="text:bibliography-source">
-        <optional>
-            <ref name="text-index-title-template"/>
-        </optional>
-        <zeroOrMore>
-            <ref name="text-bibliography-entry-template"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="text-bibliography-entry-template">
-    <element name="text:bibliography-entry-template">
-        <ref name="text-bibliography-entry-template-attrs"/>
-        <zeroOrMore>
-            <choice>
-                <ref name="text-index-entry-span"/>
-                <ref name="text-index-entry-tab-stop"/>
-                <ref name="text-index-entry-bibliography"/>
-            </choice>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="text-bibliography-entry-template-attrs" combine="interleave">
-    <attribute name="text:bibliography-type">
-        <ref name="text-bibliography-types"/>
-    </attribute>
-</define>
-<define name="text-bibliography-entry-template-attrs" combine="interleave">
-    <attribute name="text:style-name">
-        <ref name="styleNameRef"/>
-    </attribute>
-</define>
-<define name="text-index-source-styles">
-    <element name="text:index-source-styles">
-        <attribute name="text:outline-level">
-            <ref name="positiveInteger"/>
-        </attribute>
-        <zeroOrMore>
-            <ref name="text-index-source-style"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="text-index-source-style">
-    <element name="text:index-source-style">
-        <attribute name="text:style-name">
-            <ref name="styleName"/>
-        </attribute>
-        <empty/>
-    </element>
-</define>
-<define name="text-index-title-template">
-    <element name="text:index-title-template">
-        <optional>
-            <attribute name="text:style-name">
-                <ref name="styleNameRef"/>
-            </attribute>
-        </optional>
-        <text/>
-    </element>
-</define>
-<define name="text-index-entry-chapter">
-    <element name="text:index-entry-chapter">
-        <optional>
-            <attribute name="text:style-name">
-                <ref name="styleNameRef"/>
-            </attribute>
-        </optional>
-        <ref name="text-index-entry-chapter-attrs"/>
-    </element>
-</define>
-<define name="text-index-entry-chapter-attrs">
-    <optional>
-        <attribute name="text:display" a:defaultValue="number">
-            <choice>
-                <value>name</value>
-                <value>number</value>
-                <value>number-and-name</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="text-index-entry-text">
-    <element name="text:index-entry-text">
-        <optional>
-            <attribute name="text:style-name">
-                <ref name="styleNameRef"/>
-            </attribute>
-        </optional>
-    </element>
-</define>
-<define name="text-index-entry-page-number">
-    <element name="text:index-entry-page-number">
-        <optional>
-            <attribute name="text:style-name">
-                <ref name="styleNameRef"/>
-            </attribute>
-        </optional>
-    </element>
-</define>
-<define name="text-index-entry-span">
-    <element name="text:index-entry-span">
-        <optional>
-            <attribute name="text:style-name">
-                <ref name="styleNameRef"/>
-            </attribute>
-        </optional>
-        <text/>
-    </element>
-</define>
-<define name="text-index-entry-bibliography">
-    <element name="text:index-entry-bibliography">
-        <ref name="text-index-entry-bibliography-attrs"/>
-    </element>
-</define>
-<define name="text-index-entry-bibliography-attrs" combine="interleave">
-    <optional>
-        <attribute name="text:style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-index-entry-bibliography-attrs" combine="interleave">
-    <attribute name="text:bibliography-data-field">
-        <choice>
-            <value>address</value>
-            <value>annote</value>
-            <value>author</value>
-            <value>bibliography-type</value>
-            <value>booktitle</value>
-            <value>chapter</value>
-            <value>custom1</value>
-            <value>custom2</value>
-            <value>custom3</value>
-            <value>custom4</value>
-            <value>custom5</value>
-            <value>edition</value>
-            <value>editor</value>
-            <value>howpublished</value>
-            <value>identifier</value>
-            <value>institution</value>
-            <value>isbn</value>
-            <value>issn</value>
-            <value>journal</value>
-            <value>month</value>
-            <value>note</value>
-            <value>number</value>
-            <value>organizations</value>
-            <value>pages</value>
-            <value>publisher</value>
-            <value>report-type</value>
-            <value>school</value>
-            <value>series</value>
-            <value>title</value>
-            <value>url</value>
-            <value>volume</value>
-            <value>year</value>
-        </choice>
-    </attribute>
-</define>
-<define name="text-index-entry-tab-stop">
-    <element name="text:index-entry-tab-stop">
-        <optional>
-            <attribute name="text:style-name">
-                <ref name="styleNameRef"/>
-            </attribute>
-        </optional>
-        <ref name="text-index-entry-tab-stop-attrs"/>
-    </element>
-</define>
-<define name="text-index-entry-tab-stop-attrs" combine="interleave">
-    <optional>
-        <attribute name="style:leader-char">
-            <ref name="character"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-index-entry-tab-stop-attrs" combine="interleave">
-    <choice>
-        <attribute name="style:type">
-            <value>right</value>
-        </attribute>
-        <group>
-            <attribute name="style:type">
-                <value>left</value>
-            </attribute>
-            <attribute name="style:position">
-                <ref name="length"/>
-            </attribute>
-        </group>
-    </choice>
-</define>
-<define name="text-index-entry-link-start">
-    <element name="text:index-entry-link-start">
-        <optional>
-            <attribute name="text:style-name">
-                <ref name="styleNameRef"/>
-            </attribute>
-        </optional>
-    </element>
-</define>
-<define name="text-index-entry-link-end">
-    <element name="text:index-entry-link-end">
-        <optional>
-            <attribute name="text:style-name">
-                <ref name="styleNameRef"/>
-            </attribute>
-        </optional>
-    </element>
-</define>
-<define name="table-table">
-    <element name="table:table">
-        <ref name="table-table-attlist"/>
-        <optional>
-            <ref name="table-table-source"/>
-        </optional>
-        <optional>
-            <ref name="office-dde-source"/>
-        </optional>
-        <optional>
-            <ref name="table-scenario"/>
-        </optional>
-        <optional>
-            <ref name="office-forms"/>
-        </optional>
-        <optional>
-            <ref name="table-shapes"/>
-        </optional>
-        <ref name="table-columns-and-groups"/>
-        <ref name="table-rows-and-groups"/>
-    </element>
-</define>
-<define name="table-columns-and-groups">
-    <oneOrMore>
-        <choice>
-            <ref name="table-table-column-group"/>
-            <ref name="table-columns-no-group"/>
-        </choice>
-    </oneOrMore>
-</define>
-
-<define name="table-columns-no-group">
-    <choice>
-        <group>
-            <ref name="table-columns"/>
-            <optional>
-                <ref name="table-table-header-columns"/>
-                <optional>
-                    <ref name="table-columns"/>
-                </optional>
-            </optional>
-        </group>
-        <group>
-            <ref name="table-table-header-columns"/>
-            <optional>
-                <ref name="table-columns"/>
-            </optional>
-        </group>
-    </choice>
-</define>
-
-<define name="table-columns">
-    <choice>
-        <ref name="table-table-columns"/>
-        <oneOrMore>
-                <ref name="table-table-column"/>
-        </oneOrMore>
-    </choice>
-</define>
-
-<define name="table-rows-and-groups">
-    <oneOrMore>
-        <choice>
-            <ref name="table-table-row-group"/>
-            <ref name="table-rows-no-group"/>
-        </choice>
-    </oneOrMore>
-</define>
-
-<define name="table-rows-no-group">
-    <choice>
-        <group>
-            <ref name="table-rows"/>
-            <optional>
-                <ref name="table-table-header-rows"/>
-                <optional>
-                    <ref name="table-rows"/>
-                </optional>
-            </optional>
-        </group>
-        <group>
-            <ref name="table-table-header-rows"/>
-            <optional>
-                <ref name="table-rows"/>
-            </optional>
-        </group>
-    </choice>
-</define>
-
-<define name="table-rows">
-    <choice>
-        <ref name="table-table-rows"/>
-        <oneOrMore>
-                <ref name="table-table-row"/>
-        </oneOrMore>
-    </choice>
-</define>
-<define name="table-table-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-table-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-table-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:protected" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="table:protection-key">
-            <text/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-table-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:print" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-table-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:print-ranges">
-            <ref name="cellRangeAddressList"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-table-row">
-    <element name="table:table-row">
-        <ref name="table-table-row-attlist"/>
-        <oneOrMore>
-            <choice>
-                <ref name="table-table-cell"/>
-                <ref name="table-covered-table-cell"/>
-            </choice>
-        </oneOrMore>
-    </element>
-</define>
-<define name="table-table-row-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:number-rows-repeated" a:defaultValue="1">
-            <ref name="positiveInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-table-row-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-table-row-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:default-cell-style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-table-row-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:visibility" a:defaultValue="visible">
-            <ref name="table-visibility-value"/>
-        </attribute>
-    </optional>
-</define>
-
-<define name="table-visibility-value">
-    <choice>
-        <value>visible</value>
-        <value>collapse</value>
-        <value>filter</value>
-    </choice>
-</define>
-<define name="table-table-cell">
-    <element name="table:table-cell">
-        <ref name="table-table-cell-attlist"/>
-        <ref name="table-table-cell-attlist-extra"/>
-        <ref name="table-table-cell-content"/>
-    </element>
-</define>
-
-<define name="table-covered-table-cell">
-    <element name="table:covered-table-cell">
-        <ref name="table-table-cell-attlist"/>
-        <ref name="table-table-cell-content"/>
-    </element>
-</define>
-
-<define name="table-table-cell-content">
-    <optional>
-        <ref name="table-cell-range-source"/>
-    </optional>
-    <optional>
-        <ref name="office-annotation"/>
-    </optional>
-    <optional>
-        <ref name="table-detective"/>
-    </optional>
-    <zeroOrMore>
-        <ref name="text-content"/>
-    </zeroOrMore>
-</define>
-<define name="table-table-cell-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:number-columns-repeated" a:defaultValue="1">
-            <ref name="positiveInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-table-cell-attlist-extra" combine="interleave">
-    <optional>
-        <attribute name="table:number-columns-spanned" a:defaultValue="1">
-            <ref name="positiveInteger"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="table:number-rows-spanned" a:defaultValue="1">
-            <ref name="positiveInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-table-cell-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-table-cell-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:content-validation-name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-table-cell-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:formula">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-table-cell-attlist-extra" combine="interleave">
-    <optional>
-        <attribute name="table:number-matrix-columns-spanned">
-            <ref name="positiveInteger"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="table:number-matrix-rows-spanned">
-            <ref name="positiveInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-table-cell-attlist" combine="interleave">
-    <optional>
-        <ref name="common-value-and-type-attlist"/>
-    </optional>
-</define>
-<define name="table-table-cell-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:protect" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-table-column">
-    <element name="table:table-column">
-        <ref name="table-table-column-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="table-table-column-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:number-columns-repeated" a:defaultValue="1">
-            <ref name="positiveInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-table-column-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-table-column-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:visibility" a:defaultValue="visible">
-            <ref name="table-visibility-value"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-table-column-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:default-cell-style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-table-header-columns">
-    <element name="table:table-header-columns">
-        <oneOrMore>
-            <ref name="table-table-column"/>
-        </oneOrMore>
-    </element>
-</define>
-
-<define name="table-table-columns">
-    <element name="table:table-columns">
-        <oneOrMore>
-            <ref name="table-table-column"/>
-        </oneOrMore>
-    </element>
-</define>
-<define name="table-table-column-group">
-    <element name="table:table-column-group">
-        <ref name="table-table-column-group-attlist"/>
-        <ref name="table-columns-and-groups"/>
-    </element>
-</define>
-<define name="table-table-column-group-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:display" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-table-header-rows">
-    <element name="table:table-header-rows">
-        <oneOrMore>
-            <ref name="table-table-row"/>
-        </oneOrMore>
-    </element>
-</define>
-
-<define name="table-table-rows">
-    <element name="table:table-rows">
-        <oneOrMore>
-            <ref name="table-table-row"/>
-        </oneOrMore>
-    </element>
-</define>
-<define name="table-table-row-group">
-    <element name="table:table-row-group">
-        <ref name="table-table-row-group-attlist"/>
-        <ref name="table-rows-and-groups"/>
-    </element>
-</define>
-<define name="table-table-row-group-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:display" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-table-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:is-sub-table" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="cellAddress">
-    <data type="string">
-        <param name="pattern">($?([^\. ']+|'[^']+'))?\.$?[A-Z]+$?[0-9]+</param>
-    </data>
-</define>
-<define name="cellRangeAddress">
-    <data type="string">
-        <param name="pattern">($?([^\. ']+|'[^']+'))?\.$?[A-Z]+$?[0-9]+(:($?([^\. ']+|'[^']+'))?\.$?[A-Z]+$?[0-9]+)?</param>
-
-    </data>
-</define>
-<define name="cellRangeAddressList">
-    <!-- Value is a space separated list of "cellRangeAddress" patterns -->
-    <data type="string"/> 
-</define>
-<define name="table-table-source">
-    <element name="table:table-source">
-        <ref name="table-table-source-attlist"/>
-        <ref name="table-linked-source-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="table-table-source-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:mode" a:defaultValue="copy-all">
-            <choice>
-                <value>copy-all</value>
-                <value>copy-results-only</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="table-table-source-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:table-name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-linked-source-attlist" combine="interleave">
-    <optional>
-        <attribute name="xlink:type" a:defaultValue="simple">
-            <value>simple</value>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="xlink:actuate" a:defaultValue="onRequest">
-            <value>onRequest</value>
-        </attribute>
-    </optional>
-    <attribute name="xlink:href">
-        <ref name="anyURI"/>
-    </attribute>
-</define>
-<define name="table-linked-source-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:filter-name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-linked-source-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:filter-options">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-linked-source-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:refresh-delay">
-            <ref name="duration"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-scenario">
-    <element name="table:scenario">
-        <ref name="table-scenario-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="table-scenario-attlist" combine="interleave">
-    <attribute name="table:scenario-ranges">
-        <ref name="cellRangeAddressList"/>
-    </attribute>
-</define>
-<define name="table-scenario-attlist" combine="interleave">
-    <attribute name="table:is-active">
-        <ref name="boolean"/>
-    </attribute>
-</define>
-<define name="table-scenario-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:display-border" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-scenario-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:border-color">
-            <ref name="color"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-scenario-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:copy-back" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-scenario-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:copy-styles" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-scenario-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:copy-formulas" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-scenario-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:comment">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-scenario-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:protected">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-shapes">
-    <element name="table:shapes">
-        <oneOrMore>
-            <ref name="shape"/>
-        </oneOrMore>
-    </element>
-</define>
-<define name="table-cell-range-source">
-    <element name="table:cell-range-source">
-        <ref name="table-table-cell-range-source-attlist"/>
-        <ref name="table-linked-source-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="table-table-cell-range-source-attlist" combine="interleave">
-    <attribute name="table:name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="table-table-cell-range-source-attlist" combine="interleave">
-    <attribute name="table:last-column-spanned">
-        <ref name="positiveInteger"/>
-    </attribute>
-    <attribute name="table:last-row-spanned">
-        <ref name="positiveInteger"/>
-    </attribute>
-</define>
-<define name="table-detective">
-    <element name="table:detective">
-        <zeroOrMore>
-            <ref name="table-highlighted-range"/>
-        </zeroOrMore>
-        <zeroOrMore>
-            <ref name="table-operation"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="table-operation">
-    <element name="table:operation">
-        <ref name="table-operation-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="table-operation-attlist" combine="interleave">
-    <attribute name="table:name">
-        <choice>
-            <value>trace-dependents</value>
-            <value>remove-dependents</value>
-            <value>trace-precedents</value>
-            <value>remove-precedents</value>
-            <value>trace-errors</value>
-        </choice>
-    </attribute>
-</define>
-<define name="table-operation-attlist" combine="interleave">
-    <attribute name="table:index">
-        <ref name="nonNegativeInteger"/>
-    </attribute>
-</define>
-<define name="table-highlighted-range">
-    <element name="table:highlighted-range">
-        <choice>
-            <group>
-                <ref name="table-highlighted-range-attlist"/>
-            </group>
-            <group>
-                <ref name="table-highlighted-range-attlist-invalid"/>
-            </group>
-        </choice>
-        <empty/>
-    </element>
-</define>
-<define name="table-highlighted-range-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:cell-range-address">
-            <ref name="cellRangeAddress"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-highlighted-range-attlist" combine="interleave">
-    <attribute name="table:direction">
-        <choice>
-            <value>from-another-table</value>
-            <value>to-another-table</value>
-            <value>from-same-table</value>
-        </choice>
-    </attribute>
-</define>
-<define name="table-highlighted-range-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:contains-error" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-highlighted-range-attlist-invalid" combine="interleave">
-    <attribute name="table:marked-invalid">
-        <ref name="boolean"/>
-    </attribute>
-</define>
-<define name="office-spreadsheet-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:structure-protected" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="table:protection-key">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-calculation-settings">
-    <element name="table:calculation-settings">
-        <ref name="table-calculation-setting-attlist"/>
-        <optional>
-            <ref name="table-null-date"/>
-        </optional>
-        <optional>
-            <ref name="table-iteration"/>
-        </optional>
-    </element>
-</define>
-<define name="table-calculation-setting-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:case-sensitive" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-calculation-setting-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:precision-as-shown" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-calculation-setting-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:search-criteria-must-apply-to-whole-cell"
-                     a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-calculation-setting-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:automatic-find-labels" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-calculation-setting-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:use-regular-expressions"
-                     a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-calculation-setting-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:null-year" a:defaultValue="1930">
-            <ref name="positiveInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-null-date">
-    <element name="table:null-date">
-        <optional>
-            <attribute name="table:value-type" a:defaultValue="date">
-                <ref name="valueType"/>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="table:date-value-type" 
-                         a:defaultValue="1899-12-30">
-                <ref name="date"/>
-            </attribute>
-        </optional>
-        <empty/>
-    </element>
-</define>
-<define name="table-iteration">
-    <element name="table:iteration">
-        <optional>
-            <attribute name="table:status" a:defaultValue="disable">
-                <choice>
-                    <value>enable</value>
-                    <value>disable</value>
-                </choice>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="table:steps" a:defaultValue="100">
-                <ref name="positiveInteger"/>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="table:maximum-difference"
-                         a:defaultValue="0.001">
-                <ref name="double"/>
-            </attribute>
-        </optional>
-        <empty/>
-    </element>
-</define>
-<define name="table-content-validations">
-    <element name="table:content-validations">
-        <oneOrMore>
-            <ref name="table-content-validation"/>
-        </oneOrMore>
-    </element>
-</define>
-
-<define name="table-content-validation">
-    <element name="table:content-validation">
-        <ref name="table-validation-attlist"/>
-        <optional>
-            <ref name="table-help-message"/>
-        </optional>
-        <optional>
-            <choice>
-                <ref name="table-error-message"/>
-                <group>
-                    <ref name="table-error-macro"/>
-                    <optional>
-                        <ref name="office-event-listeners"/>
-                    </optional>
-                </group>
-            </choice>
-        </optional>
-    </element>
-</define>
-<define name="table-validation-attlist" combine="interleave">
-    <attribute name="table:name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="table-validation-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:condition">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-validation-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:base-cell-address">
-            <ref name="cellAddress"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-validation-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:allow-empty-cell" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-validation-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:display-list" a:defaultValue="unsorted">
-            <choice>
-                <value>none</value>
-                <value>unsorted</value>
-                <value>sort-ascending</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="table-help-message">
-    <element name="table:help-message">
-        <optional>
-            <attribute name="table:title">
-                <ref name="string"/>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="table:display" a:defaultValue="false">
-                <ref name="boolean"/>
-            </attribute>
-        </optional>
-        <zeroOrMore>
-            <ref name="text-p"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="table-error-message">
-    <element name="table:error-message">
-        <optional>
-            <attribute name="table:title">
-                <ref name="string"/>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="table:display" a:defaultValue="false">
-                <ref name="boolean"/>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="table:message-type" a:defaultValue="stop">
-                <choice>
-                    <value>stop</value>
-                    <value>warning</value>
-                    <value>information</value>
-                </choice>
-            </attribute>
-        </optional>
-        <zeroOrMore>
-            <ref name="text-p"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="table-error-macro">
-    <element name="table:error-macro">
-        <optional>
-            <attribute name="table:execute" a:defaultValue="true">
-                <ref name="boolean"/>
-            </attribute>
-        </optional>
-    </element>
-</define>
-<define name="table-label-ranges">
-    <element name="table:label-ranges">
-        <zeroOrMore>
-            <ref name="table-label-range"/>
-        </zeroOrMore>
-    </element>
-</define>
-
-<define name="table-label-range">
-    <element name="table:label-range">
-        <ref name="table-label-range-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="table-label-range-attlist" combine="interleave">
-    <attribute name="table:label-cell-range-address">
-        <ref name="cellRangeAddress"/>
-    </attribute>
-</define>
-<define name="table-label-range-attlist" combine="interleave">
-    <attribute name="table:data-cell-range-address">
-        <ref name="cellRangeAddress"/>
-    </attribute>
-</define>
-<define name="table-label-range-attlist" combine="interleave">
-    <attribute name="table:orientation">
-        <choice>
-            <value>column</value>
-            <value>row</value>
-        </choice>
-    </attribute>
-</define>
-<define name="table-named-expressions">
-    <element name="table:named-expressions">
-        <zeroOrMore>
-            <choice>
-                <ref name="table-named-range"/>
-                <ref name="table-named-expression"/>
-            </choice>
-        </zeroOrMore>
-    </element>
-</define>
-
-<define name="table-named-range">
-    <element name="table:named-range">
-        <ref name="table-named-range-attlist"/>
-        <empty/>
-    </element>
-</define>
-
-<define name="table-named-range-attlist" combine="interleave">
-    <attribute name="table:name">
-        <ref name="string"/>
-    </attribute>
-    <attribute name="table:cell-range-address">
-        <ref name="cellRangeAddress"/>
-    </attribute>
-    <optional>
-        <attribute name="table:base-cell-address">
-            <ref name="cellAddress"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="table:range-usable-as" a:defaultValue="none">
-            <choice>
-                <value>none</value>
-                <list>
-                    <oneOrMore>
-                        <choice>
-                            <value>print-range</value>
-                            <value>filter</value>
-                            <value>repeat-row</value>
-                            <value>repeat-column</value>
-                        </choice>
-                    </oneOrMore>
-                </list>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="table-named-expression">
-    <element name="table:named-expression">
-        <ref name="table-named-expression-attlist"/>
-        <empty/>
-    </element>
-</define>
-
-<define name="table-named-expression-attlist" combine="interleave">
-    <attribute name="table:name">
-        <ref name="string"/>
-    </attribute>
-    <attribute name="table:expression">
-        <ref name="string"/>
-    </attribute>
-    <optional>
-        <attribute name="table:base-cell-address">
-            <ref name="cellAddress"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-database-ranges">
-    <element name="table:database-ranges">
-        <zeroOrMore>
-            <ref name="table-database-range"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="table-database-range">
-    <element name="table:database-range">
-        <ref name="table-database-range-attlist"/>
-        <optional>
-            <choice>
-                <ref name="table-database-source-sql"/>
-                <ref name="table-database-source-table"/>
-                <ref name="table-database-source-query"/>
-            </choice>
-        </optional>
-        <optional>
-            <ref name="table-filter"/>
-        </optional>
-        <optional>
-            <ref name="table-sort"/>
-        </optional>
-        <optional>
-            <ref name="table-subtotal-rules"/>
-        </optional>
-    </element>
-</define>
-<define name="table-database-range-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-database-range-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:is-selection" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-database-range-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:on-update-keep-styles" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-database-range-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:on-update-keep-size" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-database-range-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:has-persistent-data" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-database-range-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:orientation" a:defaultValue="row">
-            <choice>
-                <value>column</value>
-                <value>row</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="table-database-range-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:contains-header" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-database-range-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:display-filter-buttons"
-                   a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-database-range-attlist" combine="interleave">
-    <attribute name="table:target-range-address">
-        <ref name="cellRangeAddress"/>
-    </attribute>
-</define>
-<define name="table-database-range-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:refresh-delay">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-database-source-sql">
-    <element name="table:database-source-sql">
-        <ref name="table-database-source-sql-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="table-database-source-sql-attlist" combine="interleave">
-    <attribute name="table:database-name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="table-database-source-sql-attlist" combine="interleave">
-    <attribute name="table:sql-statement">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="table-database-source-sql-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:parse-sql-statement" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-database-source-query">
-    <element name="table:database-source-table">
-        <ref name="table-database-source-table-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="table-database-source-table-attlist" combine="interleave">
-    <attribute name="table:database-name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="table-database-source-table-attlist" combine="interleave">
-    <attribute name="table:database-table-name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="table-database-source-table">
-    <element name="table:database-source-query">
-        <ref name="table-database-source-query-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="table-database-source-query-attlist" combine="interleave">
-    <attribute name="table:database-name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="table-database-source-query-attlist" combine="interleave">
-    <attribute name="table:query-name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="table-sort">
-    <element name="table:sort">
-        <ref name="table-sort-attlist"/>
-        <oneOrMore>
-            <ref name="table-sort-by"/>
-        </oneOrMore>
-    </element>
-</define>
-<define name="table-sort-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:bind-styles-to-content" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-sort-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:target-range-address">
-            <ref name="cellRangeAddress"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-sort-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:case-sensitive" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-sort-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:language">
-            <ref name="languageCode"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-sort-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:country">
-            <ref name="countryCode"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-sort-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:algorithm">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-sort-by">
-    <element name="table:sort-by">
-        <ref name="table-sort-by-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="table-sort-by-attlist" combine="interleave">
-    <attribute name="table:field-number">
-        <ref name="nonNegativeInteger"/>
-    </attribute>
-</define>
-<define name="table-sort-by-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:data-type" a:defaultValue="automatic">
-            <choice>
-                <value>text</value>
-                <value>number</value>
-                <value>automatic</value>
-                <ref name="string"/>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="table-sort-by-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:order" a:defaultValue="ascending">
-            <choice>
-                <value>ascending</value>
-                <value>descending</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="table-subtotal-rules">
-    <element name="table:subtotal-rules">
-        <ref name="table-subtotal-rules-attlist"/>
-        <optional>
-            <ref name="table-sort-groups"/>
-        </optional>
-        <zeroOrMore>
-            <ref name="table-subtotal-rule"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="table-subtotal-rules-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:bind-styles-to-content" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-subtotal-rules-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:case-sensitive" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-subtotal-rules-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:page-breaks-on-group-change"
-                   a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-sort-groups">
-    <element name="table:sort-groups">
-        <ref name="table-sort-groups-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="table-sort-groups-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:data-type" a:defaultValue="automatic">
-            <choice>
-                <value>text</value>
-                <value>number</value>
-                <value>automatic</value>
-                <ref name="string"/>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="table-sort-groups-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:order" a:defaultValue="ascending">
-            <choice>
-                <value>ascending</value>
-                <value>descending</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="table-subtotal-rule">
-    <element name="table:subtotal-rule">
-        <ref name="table-subtotal-rule-attlist"/>
-        <zeroOrMore>
-            <ref name="table-subtotal-field"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="table-subtotal-rule-attlist" combine="interleave">
-    <attribute name="table:group-by-field-number">
-        <ref name="nonNegativeInteger"/>
-    </attribute>
-</define>
-<define name="table-subtotal-field">
-    <element name="table:subtotal-field">
-        <ref name="table-subtotal-field-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="table-subtotal-field-attlist" combine="interleave">
-    <attribute name="table:field-number">
-        <ref name="nonNegativeInteger"/>
-    </attribute>
-</define>
-<define name="table-subtotal-field-attlist" combine="interleave">
-    <attribute name="table:function">
-        <choice>
-            <value>auto</value>
-            <value>average</value>
-            <value>count</value>
-            <value>countnums</value>
-            <value>max</value>
-            <value>min</value>
-            <value>product</value>
-            <value>stdev</value>
-            <value>stdevp</value>
-            <value>sum</value>
-            <value>var</value>
-            <value>varp</value>
-            <ref name="string"/>
-        </choice>
-    </attribute>
-</define>
-<define name="table-filter">
-    <element name="table:filter">
-        <ref name="table-filter-attlist"/>
-        <choice>
-            <ref name="table-filter-condition"/>
-            <ref name="table-filter-and"/>
-            <ref name="table-filter-or"/>
-        </choice>
-    </element>
-</define>
-<define name="table-filter-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:target-range-address">
-            <ref name="cellRangeAddress"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-filter-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:condition-source" a:defaultValue="self">
-            <choice>
-                <value>self</value>
-                <value>cell-range</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="table-filter-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:condition-source-range-address">
-            <ref name="cellRangeAddress"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-filter-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:display-duplicates" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-filter-and">
-    <element name="table:filter-and">
-        <oneOrMore>
-            <choice>
-                <ref name="table-filter-or"/>
-                <ref name="table-filter-condition"/>
-            </choice>
-        </oneOrMore>
-    </element>
-</define>
-<define name="table-filter-or">
-    <element name="table:filter-or">
-        <oneOrMore>
-            <choice>
-                <ref name="table-filter-and"/>
-                <ref name="table-filter-condition"/>
-            </choice>
-        </oneOrMore>
-    </element>
-</define>
-<define name="table-filter-condition">
-    <element name="table:filter-condition">
-        <ref name="table-filter-condition-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="table-filter-condition-attlist" combine="interleave">
-    <attribute name="table:field-number">    
-        <ref name="nonNegativeInteger"/>
-    </attribute>
-</define>
-<define name="table-filter-condition-attlist" combine="interleave">
-    <attribute name="table:value">    
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="table-filter-condition-attlist" combine="interleave">
-    <attribute name="table:operator">    
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="table-filter-condition-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:case-sensitive" a:defaultValue="false">    
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-filter-condition-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:data-type" a:defaultValue="text">
-            <choice>
-                <value>text</value>
-                <value>number</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="table-data-pilot-tables">
-    <element name="table:data-pilot-tables">
-        <zeroOrMore>
-            <ref name="table-data-pilot-table"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="table-data-pilot-table">
-    <element name="table:data-pilot-table">
-        <ref name="table-data-pilot-table-attlist"/>
-        <optional>
-            <choice>
-                <ref name="table-database-source-sql"/>
-                <ref name="table-database-source-table"/>
-                <ref name="table-database-source-query"/>
-                <ref name="table-source-service"/>
-                <ref name="table-source-cell-range"/>
-            </choice>
-        </optional>
-        <oneOrMore>
-            <ref name="table-data-pilot-field"/>
-        </oneOrMore>
-    </element>
-</define>
-<define name="table-data-pilot-table-attlist" combine="interleave">
-    <attribute name="table:name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="table-data-pilot-table-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:application-data">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-data-pilot-table-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:grand-total" a:defaultValue="both">
-            <choice>
-                <value>none</value>
-                <value>row</value>
-                <value>column</value>
-                <value>both</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="table-data-pilot-table-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:ignore-empty-rows" a:defaultValue="false">    
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-data-pilot-table-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:identify-categories" a:defaultValue="false">    
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-data-pilot-table-attlist" combine="interleave">
-    <attribute name="table:target-range-address">    
-        <ref name="cellRangeAddress"/>
-    </attribute>
-</define>
-<define name="table-data-pilot-table-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:buttons">    
-            <ref name="cellRangeAddressList"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-data-pilot-table-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:show-filter-button" a:defaultValue="true">    
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-data-pilot-table-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:drill-down-on-double-click"
-                   a:defaultValue="true">    
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-source-cell-range">
-    <element name="table:source-cell-range">
-        <ref name="table-source-cell-range-attlist"/>
-        <optional>
-            <ref name="table-filter"/>
-        </optional>
-    </element>
-</define>
-<define name="table-source-cell-range-attlist" combine="interleave">
-    <attribute name="table:cell-range-address">    
-        <ref name="cellRangeAddress"/>
-    </attribute>
-</define>
-<define name="table-source-service">
-    <element name="table:source-service">
-        <ref name="table-source-service-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="table-source-service-attlist" combine="interleave">
-    <attribute name="table:name">    
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="table-source-service-attlist" combine="interleave">
-    <attribute name="table:source-name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="table-source-service-attlist" combine="interleave">
-    <attribute name="table:object-name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="table-source-service-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:user-name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-source-service-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:password">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-data-pilot-field">
-    <element name="table:data-pilot-field">
-        <ref name="table-data-pilot-field-attlist"/>
-        <optional>
-            <ref name="table-data-pilot-level"/>
-        </optional>
-        <optional>
-            <ref name="table-data-pilot-field-reference"/>
-        </optional>
-        <optional>
-            <ref name="table-data-pilot-groups"/>
-        </optional>
-    </element>
-</define>
-<define name="table-data-pilot-field-attlist" combine="interleave">
-    <attribute name="table:source-field-name">    
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="table-data-pilot-field-attlist" combine="interleave">
-    <choice>
-        <attribute name="table:orientation">    
-            <choice>
-                <value>row</value>
-                <value>column</value>
-                <value>data</value>
-                <value>hidden</value>
-            </choice>
-        </attribute>
-        <group>
-            <attribute name="table:orientation">
-                <value>page</value>
-            </attribute>
-            <attribute name="table:selected-page">
-                <ref name="string"/>
-            </attribute>
-        </group>
-    </choice>
-</define>
-<define name="table-data-pilot-field-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:is-data-layout-field" a:defaultValue="false">    
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-data-pilot-field-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:function">
-            <choice>
-                <value>auto</value>
-                <value>average</value>
-                <value>count</value>
-                <value>countnums</value>
-                <value>max</value>
-                <value>min</value>
-                <value>product</value>
-                <value>stdev</value>
-                <value>stdevp</value>
-                <value>sum</value>
-                <value>var</value>
-                <value>varp</value>
-                <ref name="string"/>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="table-data-pilot-field-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:used-hierarchy" a:defaultValue="-1">    
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-data-pilot-level">
-    <element name="table:data-pilot-level">
-        <ref name="table-data-pilot-level-attlist"/>
-        <optional>
-            <ref name="table-data-pilot-subtotals"/>
-        </optional>
-        <optional>
-            <ref name="table-data-pilot-members"/>
-        </optional>
-        <optional>
-            <ref name="table-data-pilot-display-info"/>
-        </optional>
-        <optional>
-            <ref name="table-data-pilot-sort-info"/>
-        </optional>
-        <optional>
-            <ref name="table-data-pilot-layout-info"/>
-        </optional>
-    </element>
-</define>
-<define name="table-data-pilot-level-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:show-empty">    
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-data-pilot-subtotals">
-    <element name="table:data-pilot-subtotals">
-        <zeroOrMore>
-            <ref name="table-data-pilot-subtotal"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="table-data-pilot-subtotal">
-    <element name="table:data-pilot-subtotal">
-        <ref name="table-data-pilot-subtotal-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="table-data-pilot-subtotal-attlist" combine="interleave">
-    <attribute name="table:function">
-        <choice>
-            <value>auto</value>
-            <value>average</value>
-            <value>count</value>
-            <value>countnums</value>
-            <value>max</value>
-            <value>min</value>
-            <value>product</value>
-            <value>stdev</value>
-            <value>stdevp</value>
-            <value>sum</value>
-            <value>var</value>
-            <value>varp</value>
-            <ref name="string"/>
-        </choice>
-    </attribute>
-</define>
-<define name="table-data-pilot-members">
-    <element name="table:data-pilot-members">
-        <zeroOrMore>
-            <ref name="table-data-pilot-member"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="table-data-pilot-member">
-    <element name="table:data-pilot-member">
-        <ref name="table-data-pilot-member-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="table-data-pilot-member-attlist" combine="interleave">
-    <attribute name="table:name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="table-data-pilot-member-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:display">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-data-pilot-member-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:show-details">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-data-pilot-display-info">
-    <element name="table:data-pilot-display-info">
-        <ref name="table-data-pilot-display-info-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="table-data-pilot-display-info-attlist" combine="interleave">
-    <attribute name="table:enabled">
-        <ref name="boolean"/>
-    </attribute>
-</define>
-<define name="table-data-pilot-display-info-attlist" combine="interleave">
-    <attribute name="table:data-field">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="table-data-pilot-display-info-attlist" combine="interleave">
-    <attribute name="table:member-count">
-        <ref name="nonNegativeInteger"/>
-    </attribute>
-</define>
-<define name="table-data-pilot-display-info-attlist" combine="interleave">
-    <attribute name="table:display-member-mode">
-        <choice>
-            <value>from-top</value>
-            <value>from-bottom</value>
-        </choice>
-    </attribute>
-</define>
-<define name="table-data-pilot-sort-info">
-    <element name="table:data-pilot-sort-info">
-        <ref name="table-data-pilot-sort-info-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="table-data-pilot-sort-info-attlist" combine="interleave">
-    <choice>
-        <group>
-            <attribute name="table:sort-mode">
-                <value>data</value>
-            </attribute>
-            <attribute name="table:data-field">
-                <ref name="string"/>
-            </attribute>
-        </group>
-        <attribute name="table:sort-mode">
-            <choice>
-                <value>none</value>
-                <value>manual</value>
-                <value>name</value>
-            </choice>
-        </attribute>
-    </choice>
-</define>
-<define name="table-data-pilot-sort-info-attlist" combine="interleave">
-    <attribute name="table:order">
-        <choice>
-            <value>ascending</value>
-            <value>descending</value>
-        </choice>
-    </attribute>
-</define>
-<define name="table-data-pilot-layout-info">
-    <element name="table:data-pilot-layout-info">
-        <ref name="table-data-pilot-layout-info-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="table-data-pilot-layout-info-attlist" combine="interleave">
-    <attribute name="table:layout-mode">
-        <choice>
-            <value>tabular-layout</value>
-            <value>outline-subtotals-top</value>
-            <value>outline-subtotals-bottom</value>
-        </choice>
-    </attribute>
-</define>
-<define name="table-data-pilot-layout-info-attlist" combine="interleave">
-    <attribute name="table:add-empty-lines">
-        <ref name="boolean"/>
-    </attribute>
-</define>
-<define name="table-data-pilot-field-reference">
-    <element name="table:data-pilot-field-reference">
-        <ref name="table-data-pilot-field-reference-attlist"/>
-    </element>
-</define>
-<define name="table-data-pilot-field-reference-attlist" combine="interleave">
-    <attribute name="table:field-name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="table-data-pilot-field-reference-attlist" combine="interleave">
-    <choice>
-        <group>
-            <attribute name="table:member-type">
-                <value>named</value>
-            </attribute>
-            <attribute name="table:member-name">
-                <ref name="string"/>
-            </attribute>
-        </group>
-        <attribute name="table:member-type">
-            <choice>
-                <value>previous</value>
-                <value>next</value>
-            </choice>
-        </attribute>
-    </choice>
-</define>
-<define name="table-data-pilot-field-reference-attlist" combine="interleave">
-    <attribute name="table:type">
-        <choice>
-            <value>none</value>
-            <value>member-difference</value>
-            <value>member-percentage</value>
-            <value>member-percentage-difference</value>
-            <value>running-total</value>
-            <value>row-percentage</value>
-            <value>column-percentage</value>
-            <value>total-percentage</value>
-            <value>index</value>
-        </choice>
-    </attribute>
-</define>
-<define name="table-data-pilot-groups">
-    <element name="table:data-pilot-groups">
-        <ref name="table-data-pilot-groups-attlist"/>
-        <oneOrMore>
-            <ref name="table-data-pilot-group"/>
-        </oneOrMore>
-    </element>
-</define>
-<define name="table-data-pilot-groups-attlist" combine="interleave">
-    <attribute name="table:source-field-name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="table-data-pilot-groups-attlist" combine="interleave">
-    <choice>
-        <attribute name="table:date-start">
-            <choice>
-                <ref name="dateOrDateTime"/>
-                <value>auto</value>
-            </choice>
-        </attribute>
-        <attribute name="table:start">
-            <choice>
-                <ref name="double"/>
-                <value>auto</value>
-            </choice>
-        </attribute>
-    </choice>
-</define>
-<define name="table-data-pilot-groups-attlist" combine="interleave">
-    <choice>
-        <attribute name="table:date-end">
-            <choice>
-                <ref name="dateOrDateTime"/>
-                <value>auto</value>
-            </choice>
-        </attribute>
-        <attribute name="table:end">
-            <choice>
-                <ref name="double"/>
-                <value>auto</value>
-            </choice>
-        </attribute>
-    </choice>
-</define>
-<define name="table-data-pilot-groups-attlist" combine="interleave">
-    <attribute name="table:step">
-        <ref name="double"/>
-    </attribute>
-</define>
-<define name="table-data-pilot-groups-attlist" combine="interleave">
-    <attribute name="table:grouped-by">
-        <choice>
-            <value>seconds</value>
-            <value>minutes</value>
-            <value>hours</value>
-            <value>days</value>
-            <value>months</value>
-            <value>quarters</value>
-            <value>years</value>
-        </choice>
-    </attribute>
-</define>
-<define name="table-data-pilot-group">
-    <element name="table:data-pilot-group">
-        <ref name="table-data-pilot-group-attlist"/>
-        <oneOrMore>
-            <ref name="table-data-pilot-group-member"/>
-        </oneOrMore>
-    </element>
-</define>
-<define name="table-data-pilot-group-attlist" combine="interleave">
-    <attribute name="table:name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="table-data-pilot-group-member">
-    <element name="table:data-pilot-group-member">
-        <ref name="table-data-pilot-group-member-attlist"/>
-    </element>
-</define>
-<define name="table-data-pilot-group-member-attlist" combine="interleave">
-    <attribute name="table:name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="table-consolidation">
-    <element name="table:consolidation">
-        <ref name="table-consolidation-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="table-consolidation-attlist" combine="interleave">
-    <attribute name="table:function">    
-        <choice>
-            <value>auto</value>
-            <value>average</value>
-            <value>count</value>
-            <value>countnums</value>
-            <value>max</value>
-            <value>min</value>
-            <value>product</value>
-            <value>stdev</value>
-            <value>stdevp</value>
-            <value>sum</value>
-            <value>var</value>
-            <value>varp</value>
-            <ref name="string"/>
-        </choice>
-    </attribute>
-</define>
-<define name="table-consolidation-attlist" combine="interleave">
-    <attribute name="table:source-cell-range-addresses">    
-        <ref name="cellRangeAddressList"/>
-    </attribute>
-</define>
-<define name="table-consolidation-attlist" combine="interleave">
-    <attribute name="table:target-cell-address">    
-        <ref name="cellAddress"/>
-    </attribute>
-</define>
-<define name="table-consolidation-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:use-labels" a:defaultValue="none">
-            <choice>
-                <value>none</value>
-                <value>row</value>
-                <value>column</value>
-                <value>both</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="table-consolidation-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:link-to-source-data" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-dde-links">
-    <element name="table:dde-links">
-        <oneOrMore>
-            <ref name="table-dde-link"/>
-        </oneOrMore>
-    </element>
-</define>
-<define name="table-tracked-changes">
-    <element name="table:tracked-changes">
-        <ref name="table-tracked-changes-attlist"/>
-        <zeroOrMore>
-            <choice>
-                <ref name="table-cell-content-change"/>
-                <ref name="table-insertion"/>
-                <ref name="table-deletion"/>
-                <ref name="table-movement"/>
-            </choice>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="table-tracked-changes-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:track-changes" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-insertion">
-    <element name="table:insertion">
-        <ref name="table-insertion-attlist"/>
-        <ref name="common-table-change-attlist"/>
-        <ref name="office-change-info"/>
-        <optional>
-            <ref name="table-dependencies"/>
-        </optional>
-        <optional>
-            <ref name="table-deletions"/>
-        </optional>
-    </element>
-</define>
-<define name="table-insertion-attlist" combine="interleave">
-    <attribute name="table:type">
-        <choice>
-            <value>row</value>
-            <value>column</value>
-            <value>table</value>
-        </choice>
-    </attribute>
-</define>
-<define name="table-insertion-attlist" combine="interleave">
-    <attribute name="table:position">
-        <ref name="integer"/>
-    </attribute>
-</define>
-<define name="table-insertion-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:count" a:defaultValue="1">
-            <ref name="positiveInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-insertion-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:table">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-dependencies">
-    <element name="table:dependencies">
-        <oneOrMore>
-            <ref name="table-dependency"/>
-        </oneOrMore>
-    </element>
-</define>
-<define name="table-dependency">
-    <element name="table:dependency">
-        <attribute name="table:id">
-            <ref name="string"/>
-        </attribute>
-        <empty/>
-    </element>
-</define>
-<define name="table-deletions">
-    <element name="table:deletions">
-        <oneOrMore>
-            <choice>
-                <ref name="table-cell-content-deletion"/>
-                <ref name="table-change-deletion"/>
-            </choice>
-        </oneOrMore>
-    </element>
-</define>
-<define name="table-cell-content-deletion">
-    <element name="table:cell-content-deletion">
-        <optional>
-            <attribute name="table:id">
-                <ref name="string"/>
-            </attribute>
-        </optional>
-        <optional>
-            <ref name="table-cell-address"/>
-        </optional>
-        <optional>
-            <ref name="table-change-track-table-cell"/>
-        </optional>
-    </element>
-</define>
-<define name="table-change-deletion">
-    <element name="table:change-deletion">
-        <optional>
-            <attribute name="table:id">
-                <ref name="string"/>
-            </attribute>
-        </optional>
-        <empty/>
-    </element>
-</define>
-<define name="table-deletion">
-    <element name="table:deletion">
-        <ref name="table-deletion-attlist"/>
-        <ref name="common-table-change-attlist"/>
-        <ref name="office-change-info"/>
-        <optional>
-            <ref name="table-dependencies"/>
-        </optional>
-        <optional>
-            <ref name="table-deletions"/>
-        </optional>
-        <optional>
-            <ref name="table-cut-offs"/>
-        </optional>
-    </element>
-</define>
-<define name="table-deletion-attlist" combine="interleave">
-    <attribute name="table:type">
-        <choice>
-            <value>row</value>
-            <value>column</value>
-            <value>table</value>
-        </choice>
-    </attribute>
-</define>
-<define name="table-deletion-attlist" combine="interleave">
-    <attribute name="table:position">
-        <ref name="integer"/>
-    </attribute>
-</define>
-<define name="table-deletion-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:table">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-deletion-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:multi-deletion-spanned">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-cut-offs">
-    <element name="table:cut-offs">
-        <choice>
-            <oneOrMore>
-                <ref name="table-movement-cut-off"/>
-            </oneOrMore>
-            <group>
-                <ref name="table-insertion-cut-off"/>
-                <zeroOrMore>
-                    <ref name="table-movement-cut-off"/>
-                </zeroOrMore>
-            </group>
-        </choice>
-    </element>
-</define>
-<define name="table-insertion-cut-off">
-    <element name="table:insertion-cut-off">
-        <ref name="table-insertion-cut-off-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="table-insertion-cut-off-attlist" combine="interleave">
-    <attribute name="table:id">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="table-insertion-cut-off-attlist" combine="interleave">
-    <attribute name="table:position">
-        <ref name="integer"/>
-    </attribute>
-</define>
-<define name="table-movement-cut-off">
-    <element name="table:movement-cut-off">
-        <ref name="table-movement-cut-off-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="table-movement-cut-off-attlist" combine="interleave">
-    <choice>
-        <attribute name="table:position">
-            <ref name="integer"/>
-        </attribute>
-        <group>
-            <attribute name="table:start-position">
-                <ref name="integer"/>
-            </attribute>
-            <attribute name="table:end-position">
-                <ref name="integer"/>
-            </attribute>
-        </group>
-    </choice>
-</define>
-<define name="table-movement">
-    <element name="table:movement">
-        <ref name="common-table-change-attlist"/>
-        <ref name="table-source-range-address"/>
-        <ref name="table-target-range-address"/>
-        <ref name="office-change-info"/>
-        <optional>
-            <ref name="table-dependencies"/>
-        </optional>
-        <optional>
-            <ref name="table-deletions"/>
-        </optional>
-    </element>
-</define>
-<define name="table-source-range-address">
-    <element name="table:source-range-address">
-        <ref name="common-table-range-attlist"/>
-        <empty/>
-    </element>
-</define>
-
-<define name="table-target-range-address">
-    <element name="table:target-range-address">
-        <ref name="common-table-range-attlist"/>
-        <empty/>
-    </element>
-</define>
-
-
-<define name="common-table-range-attlist" combine="interleave">
-    <choice>
-        <group>
-            <ref name="common-table-cell-address-attlist"/>
-        </group>
-        <group>
-            <ref name="common-table-cell-range-address-attlist"/>
-        </group>
-    </choice>
-</define>
-<define name="common-table-cell-address-attlist" combine="interleave">
-    <attribute name="table:column">
-        <ref name="integer"/>
-    </attribute>
-    <attribute name="table:row">
-        <ref name="integer"/>
-    </attribute>
-    <attribute name="table:table">
-        <ref name="integer"/>
-    </attribute>
-</define>
-<define name="common-table-cell-range-address-attlist" combine="interleave">
-    <attribute name="table:start-column">
-        <ref name="integer"/>
-    </attribute>
-    <attribute name="table:start-row">
-        <ref name="integer"/>
-    </attribute>
-    <attribute name="table:start-table">
-        <ref name="integer"/>
-    </attribute>
-    <attribute name="table:end-column">
-        <ref name="integer"/>
-    </attribute>
-    <attribute name="table:end-row">
-        <ref name="integer"/>
-    </attribute>
-    <attribute name="table:end-table">
-        <ref name="integer"/>
-    </attribute>
-</define>
-<define name="table-change-track-table-cell" combine="interleave">
-    <element name="table:change-track-table-cell">
-        <ref name="table-change-track-table-cell-attlist"/>
-        <zeroOrMore>
-            <ref name="text-p"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="table-change-track-table-cell-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:cell-address">
-            <ref name="cellAddress"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-change-track-table-cell-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:matrix-covered" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-change-track-table-cell-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:formula">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="table:number-matrix-columns-spanned">
-            <ref name="positiveInteger"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="table:number-matrix-rows-spanned">
-            <ref name="positiveInteger"/>
-        </attribute>
-    </optional>
-    <optional>
-        <ref name="common-value-and-type-attlist"/>
-    </optional>
-</define>
-<define name="table-cell-content-change">
-    <element name="table:cell-content-change">
-        <ref name="common-table-change-attlist"/>
-        <ref name="table-cell-address"/>
-        <ref name="office-change-info"/>
-        <optional>
-            <ref name="table-dependencies"/>
-        </optional>
-        <optional>
-            <ref name="table-deletions"/>
-        </optional>
-        <ref name="table-previous"/>
-    </element>
-</define>
-<define name="table-cell-address">
-    <element name="table:cell-address">
-        <ref name="common-table-cell-address-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="table-previous">
-    <element name="table:previous">
-        <optional>
-            <attribute name="table:id">
-                <ref name="string"/>
-            </attribute>
-        </optional>
-        <ref name="table-change-track-table-cell"/>
-    </element>
-</define>
-<define name="common-table-change-attlist" combine="interleave">
-    <attribute name="table:id">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="common-table-change-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:acceptance-state" a:defaultValue="pending">
-            <choice>
-                <value>accepted</value>
-                <value>rejected</value>
-                <value>pending</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="common-table-change-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:rejecting-change-id">
-            <ref name="string"/> 
-        </attribute>
-    </optional>
-</define>
-<define name="style-handout-master">
-    <element name="style:handout-master">
-        <ref name="common-presentation-header-footer-attlist"/>
-        <ref name="style-handout-master-attlist"/>
-        <zeroOrMore>
-            <ref name="shape"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="style-handout-master-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:presentation-page-layout-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-handout-master-attlist" combine="interleave">
-    <attribute name="style:page-layout-name">
-        <ref name="styleNameRef"/>
-    </attribute>
-</define>
-<define name="style-handout-master-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-layer-set">
-    <element name="draw:layer-set">
-        <zeroOrMore>
-            <ref name="draw-layer"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="draw-layer">
-    <element name="draw:layer">
-        <ref name="draw-layer-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="draw-layer-attlist" combine="interleave">
-    <attribute name="draw:name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="draw-layer-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:protected" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-layer-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:display" a:defaultValue="always">
-            <choice>
-                <value>always</value>
-                <value>screen</value>
-                <value>printer</value>
-                <value>none</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-page">
-    <element name="draw:page">
-        <ref name="common-presentation-header-footer-attlist"/>
-        <ref name="draw-page-attlist"/>
-        <optional>
-            <ref name="office-forms"/>
-        </optional>
-        <zeroOrMore>
-            <ref name="shape"/>
-        </zeroOrMore>
-        <optional>
-            <choice>
-                <ref name="presentation-animations"/>
-                <ref name="animation-element"/>
-            </choice>
-        </optional>
-        <optional>
-            <ref name="presentation-notes"/>
-        </optional>
-    </element>
-</define>
-<define name="draw-page-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-page-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-page-attlist" combine="interleave">
-    <attribute name="draw:master-page-name">
-        <ref name="styleNameRef"/>
-    </attribute>
-</define>
-<define name="draw-page-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:presentation-page-layout-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-presentation-header-footer-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:use-header-name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-presentation-header-footer-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:use-footer-name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-presentation-header-footer-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:use-date-time-name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-page-attlist">
-    <optional>
-        <attribute name="draw:id">
-            <ref name="ID"/>
-        </attribute>
-    </optional>
-</define>
-<define name="shape">
-    <choice>
-        <ref name="draw-rect"/>
-        <ref name="draw-line"/>
-        <ref name="draw-polyline"/>
-        <ref name="draw-polygon"/>
-        <ref name="draw-regular-polygon"/>
-        <ref name="draw-path"/>
-        <ref name="draw-circle"/>
-        <ref name="draw-ellipse"/>
-        <ref name="draw-g"/>
-        <ref name="draw-page-thumbnail"/>
-        <ref name="draw-frame"/>
-        <ref name="draw-measure"/>
-        <ref name="draw-caption"/>
-        <ref name="draw-connector"/>
-        <ref name="draw-control"/>
-        <ref name="dr3d-scene"/>
-        <ref name="draw-custom-shape"/>
-    </choice>
-</define>
-<define name="draw-rect">
-    <element name="draw:rect">
-        <ref name="draw-rect-attlist"/>
-        <ref name="common-draw-position-attlist"/>
-        <ref name="common-draw-size-attlist"/>
-        <ref name="common-draw-shape-with-text-and-styles-attlist"/>
-        <optional>
-            <ref name="office-event-listeners"/>
-        </optional>
-        <zeroOrMore>
-            <ref name="draw-glue-point"/>
-        </zeroOrMore>
-        <ref name="draw-text"/>
-    </element>
-</define>
-<define name="draw-rect-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:corner-radius">
-            <ref name="nonNegativeLength"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-line">
-    <element name="draw:line">
-        <ref name="draw-line-attlist"/>
-        <ref name="common-draw-shape-with-text-and-styles-attlist"/>
-        <optional>
-            <ref name="office-event-listeners"/>
-        </optional>
-        <zeroOrMore>
-            <ref name="draw-glue-point"/>
-        </zeroOrMore>
-        <ref name="draw-text"/>
-    </element>
-</define>
-<define name="draw-line-attlist" combine="interleave">
-    <attribute name="svg:x1">
-        <ref name="coordinate"/>
-    </attribute>
-    <attribute name="svg:y1">
-        <ref name="coordinate"/>
-    </attribute>
-</define>
-<define name="draw-line-attlist" combine="interleave">
-    <attribute name="svg:x2">
-        <ref name="coordinate"/>
-    </attribute>
-    <attribute name="svg:y2">
-        <ref name="coordinate"/>
-    </attribute>
-</define>
-<define name="draw-polyline">
-    <element name="draw:polyline">
-        <ref name="common-draw-points-attlist"/>
-        <ref name="common-draw-position-attlist"/>
-        <ref name="common-draw-size-attlist"/>
-        <ref name="common-draw-viewbox-attlist"/>
-        <ref name="common-draw-shape-with-text-and-styles-attlist"/>
-        <optional>
-            <ref name="office-event-listeners"/>
-        </optional>
-        <zeroOrMore>
-            <ref name="draw-glue-point"/>
-        </zeroOrMore>
-        <ref name="draw-text"/>
-    </element>
-</define>
-<define name="common-draw-points-attlist">
-    <attribute name="draw:points">
-        <ref name="points"/>
-    </attribute>
-</define>
-<define name="draw-polygon">
-    <element name="draw:polygon">
-        <ref name="common-draw-points-attlist"/>
-        <ref name="common-draw-position-attlist"/>
-        <ref name="common-draw-size-attlist"/>
-        <ref name="common-draw-viewbox-attlist"/>
-        <ref name="common-draw-shape-with-text-and-styles-attlist"/>
-        <optional>
-            <ref name="office-event-listeners"/>
-        </optional>
-        <zeroOrMore>
-            <ref name="draw-glue-point"/>
-        </zeroOrMore>
-        <ref name="draw-text"/>
-    </element>
-</define>
-<define name="draw-regular-polygon">
-    <element name="draw:regular-polygon">
-        <ref name="draw-regular-polygon-attlist"/>
-        <ref name="common-draw-position-attlist"/>
-        <ref name="common-draw-size-attlist"/>
-        <ref name="common-draw-shape-with-text-and-styles-attlist"/>
-        <optional>
-            <ref name="office-event-listeners"/>
-        </optional>
-        <zeroOrMore>
-            <ref name="draw-glue-point"/>
-        </zeroOrMore>
-        <ref name="draw-text"/>
-    </element>
-</define>
-<define name="draw-regular-polygon-attlist" combine="interleave">
-    <choice>
-        <attribute name="draw:concave">
-            <value>false</value>
-        </attribute>
-        <group>
-            <attribute name="draw:concave">
-                <value>true</value>
-            </attribute>
-            <ref name="draw-regular-polygon-sharpness-attlist"/>
-        </group>
-    </choice>
-</define>
-<define name="draw-regular-polygon-attlist" combine="interleave">
-    <attribute name="draw:corners">
-        <ref name="positiveInteger"/>
-    </attribute>
-</define>
-<define name="draw-regular-polygon-sharpness-attlist">
-    <attribute name="draw:sharpness">
-        <ref name="percent"/>
-    </attribute>
-</define>
-<define name="draw-path">
-    <element name="draw:path">
-        <ref name="common-draw-path-data-attlist"/>
-        <ref name="common-draw-position-attlist"/>
-        <ref name="common-draw-size-attlist"/>
-        <ref name="common-draw-viewbox-attlist"/>
-        <ref name="common-draw-shape-with-text-and-styles-attlist"/>
-        <optional>
-            <ref name="office-event-listeners"/>
-        </optional>
-        <zeroOrMore>
-            <ref name="draw-glue-point"/>
-        </zeroOrMore>
-        <ref name="draw-text"/>
-    </element>
-</define>
-<define name="common-draw-path-data-attlist">
-    <attribute name="svg:d">
-        <ref name="pathData"/>
-    </attribute>
-</define>
-<define name="draw-circle">
-    <element name="draw:circle">
-        <ref name="draw-circle-attlist"/>
-        <ref name="common-draw-circle-ellipse-attlist"/>
-        <ref name="common-draw-position-attlist"/>
-        <ref name="common-draw-size-attlist"/>
-        <ref name="common-draw-shape-with-text-and-styles-attlist"/>
-        <optional>
-            <ref name="office-event-listeners"/>
-        </optional>
-        <zeroOrMore>
-            <ref name="draw-glue-point"/>
-        </zeroOrMore>
-        <ref name="draw-text"/>
-    </element>
-</define>
-<define name="common-draw-circle-ellipse-attlist" combine="interleave">
-    <optional>
-        <attribute name="svg:cx">
-            <ref name="coordinate"/>
-        </attribute>
-        <attribute name="svg:cy">
-            <ref name="coordinate"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-circle-attlist" combine="interleave">
-    <optional>
-        <attribute name="svg:r">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-draw-circle-ellipse-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:kind" a:defaultValue="full">
-            <choice>
-                <value>full</value>
-                <value>section</value>
-                <value>cut</value>
-                <value>arc</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="common-draw-circle-ellipse-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:start-angle">
-            <ref name="double"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-draw-circle-ellipse-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:end-angle">
-            <ref name="double"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-ellipse">
-    <element name="draw:ellipse">
-        <ref name="common-draw-circle-ellipse-attlist"/>
-        <ref name="draw-ellipse-attlist"/>
-        <ref name="common-draw-position-attlist"/>
-        <ref name="common-draw-size-attlist"/>
-        <ref name="common-draw-shape-with-text-and-styles-attlist"/>
-        <optional>
-            <ref name="office-event-listeners"/>
-        </optional>
-        <zeroOrMore>
-            <ref name="draw-glue-point"/>
-        </zeroOrMore>
-        <ref name="draw-text"/>
-    </element>
-</define>
-<define name="draw-ellipse-attlist" combine="interleave">
-    <optional>
-        <attribute name="svg:rx">
-            <ref name="length"/>
-        </attribute>
-        <attribute name="svg:ry">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-connector">
-    <element name="draw:connector">
-        <ref name="draw-connector-attlist"/>
-        <ref name="common-draw-shape-with-text-and-styles-attlist"/>
-        <optional>
-            <ref name="office-event-listeners"/>
-        </optional>
-        <zeroOrMore>
-            <ref name="draw-glue-point"/>
-        </zeroOrMore>
-        <ref name="draw-text"/>
-    </element>
-</define>
-<define name="draw-connector-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:type" a:defaultValue="standard">
-            <choice>
-                <value>standard</value>
-                <value>lines</value>
-                <value>line</value>
-                <value>curve</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-connector-attlist" combine="interleave">
-    <optional>
-        <attribute name="svg:x1">
-            <ref name="coordinate"/>
-        </attribute>
-        <attribute name="svg:y1">
-            <ref name="coordinate"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-connector-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:start-shape">
-            <ref name="IDREF"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-connector-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:start-glue-point">
-            <ref name="nonNegativeInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-connector-attlist" combine="interleave">
-    <optional>
-        <attribute name="svg:x2">
-            <ref name="coordinate"/>
-        </attribute>
-        <attribute name="svg:y2">
-            <ref name="coordinate"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-connector-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:end-shape">
-            <ref name="IDREF"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-connector-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:end-glue-point">
-            <ref name="nonNegativeInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-connector-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:line-skew">
-            <list>
-                <ref name="length"/>
-                <optional>
-                    <ref name="length"/>
-                    <optional>
-                        <ref name="length"/>
-                    </optional>
-                </optional>
-            </list>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-caption">
-    <element name="draw:caption">
-        <ref name="draw-caption-attlist"/>
-        <ref name="common-draw-position-attlist"/>
-        <ref name="common-draw-size-attlist"/>
-        <ref name="common-draw-shape-with-text-and-styles-attlist"/>    
-        <optional>
-            <ref name="office-event-listeners"/>
-        </optional>
-        <zeroOrMore>
-            <ref name="draw-glue-point"/>
-        </zeroOrMore>
-        <ref name="draw-text"/>
-    </element>
-</define>
-<define name="draw-caption-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:caption-point-x">
-            <ref name="coordinate"/>
-        </attribute>
-        <attribute name="draw:caption-point-y">
-            <ref name="coordinate"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-caption-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:corner-radius">
-            <ref name="nonNegativeLength"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-measure">
-    <element name="draw:measure">
-        <ref name="draw-measure-attlist"/>
-        <ref name="common-draw-shape-with-text-and-styles-attlist"/>
-        <optional>
-            <ref name="office-event-listeners"/>
-        </optional>
-        <zeroOrMore>
-            <ref name="draw-glue-point"/>
-        </zeroOrMore>
-        <ref name="draw-text"/>
-    </element>
-</define>
-<define name="draw-measure-attlist" combine="interleave">
-    <attribute name="svg:x1">
-        <ref name="coordinate"/>
-    </attribute>
-    <attribute name="svg:y1">
-        <ref name="coordinate"/>
-    </attribute>
-</define>
-<define name="draw-measure-attlist" combine="interleave">
-    <attribute name="svg:x2">
-        <ref name="coordinate"/>
-    </attribute>
-    <attribute name="svg:y2">
-        <ref name="coordinate"/>
-    </attribute>
-</define>
-<define name="draw-control">
-    <element name="draw:control">
-        <ref name="draw-control-attlist"/>
-        <ref name="common-draw-position-attlist"/>
-        <ref name="common-draw-size-attlist"/>
-        <ref name="common-draw-shape-with-text-and-styles-attlist"/>    
-        <zeroOrMore>
-            <ref name="draw-glue-point"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="draw-control-attlist" combine="interleave">
-    <attribute name="draw:control">
-        <ref name="IDREF"/>
-    </attribute>
-</define>
-<define name="draw-page-thumbnail">
-    <element name="draw:page-thumbnail">
-        <ref name="draw-page-thumbnail-attlist"/>
-        <ref name="common-draw-position-attlist"/>
-        <ref name="common-draw-size-attlist"/>
-        <ref name="presentation-shape-attlist"/>
-        <ref name="common-draw-shape-with-styles-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="draw-page-thumbnail-attlist">
-    <optional>
-        <attribute name="draw:page-number">
-            <ref name="positiveInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-g">
-    <element name="draw:g">
-        <ref name="draw-g-attlist"/>
-        <ref name="common-draw-z-index-attlist"/>
-        <ref name="common-draw-name-attlist"/>
-        <ref name="common-draw-id-attlist"/>
-        <ref name="common-draw-style-name-attlist"/>
-        <ref name="common-text-spreadsheet-shape-attlist"/>
-        <optional>
-            <ref name="office-event-listeners"/>
-        </optional>
-        <zeroOrMore>
-            <ref name="draw-glue-point"/>
-        </zeroOrMore>
-        <zeroOrMore>
-            <ref name="shape"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="draw-g-attlist" combine="interleave">
-    <optional>
-        <attribute name="svg:y">
-            <ref name="coordinate"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-draw-name-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-draw-position-attlist">
-    <optional>
-        <attribute name="svg:x">
-            <ref name="coordinate"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:y">
-            <ref name="coordinate"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-draw-size-attlist">
-    <optional>
-        <attribute name="svg:width">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:height">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-draw-transform-attlist">
-    <optional>
-        <attribute name="draw:transform">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-draw-viewbox-attlist">
-    <attribute name="svg:viewBox">
-        <list>
-            <ref name="integer"/>
-            <ref name="integer"/>
-            <ref name="integer"/>
-            <ref name="integer"/>
-        </list>
-    </attribute>
-</define>
-<define name="common-draw-style-name-attlist">
-    <choice>
-        <group>
-            <optional>
-                <attribute name="draw:style-name">
-                    <ref name="styleNameRef"/>
-                </attribute>
-            </optional>
-            <optional>
-                <attribute name="draw:class-names">
-                    <ref name="styleNameRefs"/>
-                </attribute>
-            </optional>
-        </group>
-        <group>
-            <optional>
-                <attribute name="presentation:style-name">
-                    <ref name="styleNameRef"/>
-                </attribute>
-            </optional>
-            <optional>
-                <attribute name="presentation:class-names">
-                    <ref name="styleNameRefs"/>
-                </attribute>
-            </optional>
-        </group>
-    </choice>
-</define>
-<define name="common-draw-text-style-name-attlist">
-    <optional>
-        <attribute name="draw:text-style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-draw-layer-name-attlist">
-    <optional>
-        <attribute name="draw:layer">
-            <data type="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-draw-id-attlist">
-    <optional>
-        <attribute name="draw:id">
-            <ref name="ID"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-draw-z-index-attlist">
-    <optional>
-        <attribute name="draw:z-index">
-            <ref name="nonNegativeInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-text-spreadsheet-shape-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:end-cell-address">
-            <ref name="cellAddress"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="table:end-x">
-            <ref name="coordinate"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="table:end-y">
-            <ref name="coordinate"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-text-spreadsheet-shape-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:table-background">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-text-spreadsheet-shape-attlist" combine="interleave">
-    <ref name="common-text-anchor-attlist"/>
-</define>
-
-<define name="common-text-anchor-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:anchor-type">
-            <choice>
-                <value>page</value>
-                <value>frame</value>
-                <value>paragraph</value>
-                <value>char</value>
-                <value>as-char</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="common-text-anchor-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:anchor-page-number">
-            <ref name="positiveInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-text">
-    <zeroOrMore>
-        <choice>
-            <ref name="text-p"/>
-            <ref name="text-list"/>
-        </choice>
-    </zeroOrMore>
-</define>
-<define name="common-draw-shape-with-styles-attlist">
-    <ref name="common-draw-z-index-attlist"/>
-    <ref name="common-draw-id-attlist"/>
-    <ref name="common-draw-layer-name-attlist"/>
-    <ref name="common-draw-style-name-attlist"/>
-    <ref name="common-draw-transform-attlist"/>
-    <ref name="common-draw-name-attlist"/>
-    <ref name="common-text-spreadsheet-shape-attlist"/>
-</define>
-<define name="common-draw-shape-with-text-and-styles-attlist">
-    <ref name="common-draw-shape-with-styles-attlist"/>
-    <ref name="common-draw-text-style-name-attlist"/>
-</define>
-<define name="draw-glue-point">
-    <element name="draw:glue-point">
-        <ref name="draw-glue-point-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="draw-glue-point-attlist" combine="interleave">
-    <attribute name="draw:id">
-        <ref name="nonNegativeInteger"/>
-    </attribute>
-</define>
-<define name="draw-glue-point-attlist" combine="interleave">
-    <attribute name="svg:x">
-        <choice>
-            <ref name="distance"/> 
-            <ref name="percent"/>
-        </choice>
-    </attribute>
-    <attribute name="svg:y">
-        <choice>
-            <ref name="distance"/> 
-            <ref name="percent"/>
-        </choice>
-    </attribute>
-</define>
-<define name="draw-glue-point-attlist" combine="interleave">
-    <attribute name="draw:align">
-        <choice>
-            <value>top-left</value>
-            <value>top</value>
-            <value>top-right</value>
-            <value>left</value>
-            <value>center</value>
-            <value>right</value>
-            <value>bottom-left</value>
-            <value>bottom-right</value>
-        </choice>
-    </attribute>
-</define>
-<define name="draw-glue-points-attlist" combine="interleave">
-    <attribute name="draw:escape-direction">
-        <choice>
-            <value>auto</value>
-            <value>left</value>
-            <value>right</value>
-            <value>up</value>
-            <value>down</value>
-            <value>horizontal</value>
-            <value>vertical</value>
-        </choice>
-    </attribute>
-</define>
-<define name="draw-frame">
-    <element name="draw:frame">
-        <ref name="common-draw-shape-with-text-and-styles-attlist"/>
-        <ref name="common-draw-position-attlist"/>
-        <ref name="common-draw-rel-size-attlist"/>
-        <ref name="presentation-shape-attlist"/>
-        <ref name="draw-frame-attlist"/>
-        <zeroOrMore>
-            <choice>
-                <ref name="draw-text-box"/>
-                <ref name="draw-image"/>
-                <ref name="draw-object"/>
-                <ref name="draw-object-ole"/>
-                <ref name="draw-applet"/>
-                <ref name="draw-floating-frame"/>
-                <ref name="draw-plugin"/>
-            </choice>
-        </zeroOrMore>
-        <optional>
-            <ref name="office-event-listeners"/>
-        </optional>
-        <zeroOrMore>
-            <ref name="draw-glue-point"/>
-        </zeroOrMore>
-        <optional>
-            <ref name="draw-image-map"/>
-        </optional>
-        <optional>
-            <ref name="svg-desc"/>
-        </optional>
-        <optional>
-            <choice>
-                <ref name="draw-contour-polygon"/>
-                <ref name="draw-contour-path"/>
-            </choice>
-        </optional>
-    </element>
-</define>
-<define name="common-draw-rel-size-attlist">
-    <ref name="common-draw-size-attlist"/>
-    <optional>
-        <attribute name="style:rel-width">
-            <choice>
-                <ref name="percent"/>
-                <value>scale</value>
-                <value>scale-min</value>
-            </choice>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:rel-height">
-            <choice>
-                <ref name="percent"/>
-                <value>scale</value>
-                <value>scale-min</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-frame-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:copy-of">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-text-box">
-    <element name="draw:text-box">
-        <ref name="draw-text-box-attlist"/>
-        <zeroOrMore>
-            <ref name="text-content"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="draw-text-box-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:chain-next-name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-text-box-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:corner-radius">
-            <ref name="nonNegativeLength"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-text-box-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:min-height">
-            <choice>
-                <ref name="length"/>
-                <ref name="percent"/>
-            </choice>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="fo:min-width">
-            <choice>
-                <ref name="length"/>
-                <ref name="percent"/>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-text-box-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:max-height">
-            <choice>
-                <ref name="length"/>
-                <ref name="percent"/>
-            </choice>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="fo:max-width">
-            <choice>
-                <ref name="length"/>
-                <ref name="percent"/>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-image">
-    <element name="draw:image">
-        <ref name="draw-image-attlist"/>
-        <choice>
-            <ref name="common-draw-data-attlist"/>
-            <ref name="office-binary-data"/>
-        </choice>
-        <ref name="draw-text"/>
-    </element>
-</define>
-<define name="common-draw-data-attlist" combine="interleave">
-    <group>
-        <attribute name="xlink:href">
-            <ref name="anyURI"/>
-        </attribute>
-        <optional>
-            <attribute name="xlink:type" a:defaultValue="simple">
-                <choice>
-                    <value>simple</value>
-                </choice>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="xlink:show" a:defaultValue="embed">
-                <choice>
-                    <value>embed</value>
-                </choice>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="xlink:actuate" a:defaultValue="onLoad">
-                <choice>
-                    <value>onLoad</value>
-                </choice>
-            </attribute>
-        </optional>
-    </group>
-</define>
-
-<define name="office-binary-data">
-    <element name="office:binary-data">
-        <ref name="base64Binary"/>
-    </element>
-</define>
-<define name="draw-image-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:filter-name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-object">
-    <element name="draw:object">
-        <ref name="draw-object-attlist"/>
-        <choice>
-            <ref name="common-draw-data-attlist"/>
-            <ref name="office-document"/>
-            <ref name="math-math"/>
-        </choice>
-    </element>
-</define>
-
-<define name="draw-object-ole">
-    <element name="draw:object-ole">
-        <ref name="draw-object-ole-attlist"/>
-        <choice>
-            <ref name="common-draw-data-attlist"/>
-            <ref name="office-binary-data"/>
-        </choice>
-    </element>
-</define>
-<define name="draw-object-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:notify-on-update-of-ranges">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-object-ole-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:class-id"/>
-    </optional>
-</define>
-<define name="draw-applet">
-    <element name="draw:applet">
-        <ref name="draw-applet-attlist"/>
-        <optional>
-            <ref name="common-draw-data-attlist"/>
-        </optional>
-        <zeroOrMore>
-            <ref name="draw-param"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="draw-applet-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:code"/>
-    </optional>
-</define>
-<define name="draw-applet-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:object"/>
-    </optional>
-</define>
-<define name="draw-applet-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:archive"/>
-    </optional>
-</define>
-<define name="draw-applet-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:may-script" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-plugin">
-    <element name="draw:plugin">
-        <ref name="draw-plugin-attlist"/>
-        <ref name="common-draw-data-attlist"/>
-        <zeroOrMore>
-            <ref name="draw-param"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="draw-plugin-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:mime-type"/>
-    </optional>
-</define>
-<define name="draw-param">
-    <element name="draw:param">
-        <ref name="draw-param-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="draw-param-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:name"/>
-    </optional>
-</define>
-<define name="draw-param-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:value"/>
-    </optional>
-</define>
-<define name="draw-floating-frame">
-    <element name="draw:floating-frame">
-        <ref name="draw-floating-frame-attlist"/>
-        <ref name="common-draw-data-attlist"/>
-    </element>
-</define>
-<define name="draw-floating-frame-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:frame-name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-contour-polygon">
-    <element name="draw:contour-polygon">
-        <ref name="common-contour-attlist"/>
-        <ref name="common-draw-size-attlist"/>
-        <ref name="common-draw-viewbox-attlist"/>
-        <ref name="common-draw-points-attlist"/>
-        <empty/>
-    </element>
-</define>
-
-<define name="draw-contour-path">
-    <element name="draw:contour-path">
-        <ref name="common-contour-attlist"/>
-        <ref name="common-draw-size-attlist"/>
-        <ref name="common-draw-viewbox-attlist"/>
-        <ref name="common-draw-path-data-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="common-contour-attlist" combine="interleave">
-    <attribute name="draw:recreate-on-edit">
-        <ref name="boolean"/>
-    </attribute>
-</define>
-<define name="svg-desc">
-    <element name="svg:desc">
-        <text/>
-    </element>
-</define>
-<define name="draw-a">
-    <element name="draw:a">
-        <ref name="draw-a-attlist"/>
-        <ref name="draw-frame"/>
-    </element>
-</define>
-<define name="draw-a-attlist" combine="interleave">
-    <attribute name="xlink:href">
-        <ref name="anyURI"/>
-    </attribute>
-    <optional>
-        <attribute name="xlink:type" a:defaultValue="simple">
-            <value>simple</value>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="xlink:actuate" a:defaultValue="onRequest">
-            <choice>
-                <value>onRequest</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-a-attlist" combine="interleave">
-    <optional>
-        <attribute name="office:target-frame-name">
-            <ref name="targetFrameName"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="xlink:show">
-            <choice>
-                <value>new</value>
-                <value>replace</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-a-attlist" combine="interleave">
-    <optional>
-        <attribute name="office:name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-a-attlist" combine="interleave">
-    <optional>
-        <attribute name="office:server-map" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-image-map">
-    <element name="draw:image-map">
-        <zeroOrMore>
-            <choice>
-                <ref name="draw-area-rectangle"/>
-                <ref name="draw-area-circle"/>
-                <ref name="draw-area-polygon"/>
-            </choice>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="draw-area-rectangle">
-    <element name="draw:area-rectangle">
-        <ref name="common-draw-area-attlist"/>
-        <attribute name="svg:x">
-            <ref name="coordinate"/>
-        </attribute>
-        <attribute name="svg:y">
-            <ref name="coordinate"/>
-        </attribute>
-        <attribute name="svg:width">
-            <ref name="length"/>
-        </attribute>
-        <attribute name="svg:height">
-            <ref name="length"/>
-        </attribute>
-        <optional>
-            <ref name="svg-desc"/>
-        </optional>
-        <optional>
-            <ref name="office-event-listeners"/>
-        </optional>
-    </element>
-</define>
-<define name="draw-area-circle">
-    <element name="draw:area-circle">
-        <ref name="common-draw-area-attlist"/>
-        <attribute name="svg:cx">
-            <ref name="coordinate"/>
-        </attribute>
-        <attribute name="svg:cy">
-            <ref name="coordinate"/>
-        </attribute>
-        <attribute name="svg:r">
-            <ref name="length"/>
-        </attribute>
-        <optional>
-            <ref name="svg-desc"/>
-        </optional>
-        <optional>
-            <ref name="office-event-listeners"/>
-        </optional>
-    </element>
-</define>
-<define name="draw-area-polygon">
-    <element name="draw:area-polygon">
-        <ref name="common-draw-area-attlist"/>
-        <attribute name="svg:x">
-            <ref name="coordinate"/>
-        </attribute>
-        <attribute name="svg:y">
-            <ref name="coordinate"/>
-        </attribute>
-        <attribute name="svg:width">
-            <ref name="length"/>
-        </attribute>
-        <attribute name="svg:height">
-            <ref name="length"/>
-        </attribute>
-        <ref name="common-draw-viewbox-attlist"/>
-        <ref name="common-draw-points-attlist"/>
-        <optional>
-            <ref name="svg-desc"/>
-        </optional>
-        <optional>
-            <ref name="office-event-listeners"/>
-        </optional>
-    </element>
-</define>
-<define name="common-draw-area-attlist" combine="interleave">
-    <optional>
-        <attribute name="xlink:href">
-            <ref name="anyURI"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="xlink:type" a:defaultValue="simple">
-            <choice>
-                <value>simple</value>
-            </choice>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="office:target-frame-name">
-            <ref name="targetFrameName"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="xlink:show">
-            <choice>
-                <value>new</value>
-                <value>replace</value>
-            </choice>
-            </attribute>
-    </optional>
-</define>
-<define name="common-draw-area-attlist" combine="interleave">
-    <optional>
-        <attribute name="office:name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-draw-area-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:nohref">
-            <choice>
-                <value>nohref</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="dr3d-scene">
-    <element name="dr3d:scene">
-        <ref name="dr3d-scene-attlist"/>
-        <ref name="common-draw-position-attlist"/>
-        <ref name="common-draw-size-attlist"/>
-        <ref name="common-draw-style-name-attlist"/>
-        <ref name="common-draw-z-index-attlist"/>
-        <ref name="common-draw-id-attlist"/>
-        <ref name="common-draw-layer-name-attlist"/>
-        <ref name="common-text-spreadsheet-shape-attlist"/>
-        <ref name="common-dr3d-transform-attlist"/>
-        <zeroOrMore>
-            <ref name="dr3d-light"/>
-        </zeroOrMore>
-        <zeroOrMore>
-            <ref name="shapes3d"/>
-        </zeroOrMore>
-    </element>
-</define>
-
-<define name="shapes3d">
-    <choice>
-        <ref name="dr3d-scene"/>
-        <ref name="dr3d-extrude"/>
-        <ref name="dr3d-sphere"/>
-        <ref name="dr3d-rotate"/>
-        <ref name="dr3d-cube"/>
-    </choice>
-</define>
-<define name="dr3d-scene-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:vrp">
-            <ref name="vector3D"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="dr3d:vpn">
-            <ref name="vector3D"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="dr3d:vup">
-            <ref name="vector3D"/>
-        </attribute>
-    </optional>
-</define>
-<define name="dr3d-scene-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:projection">
-            <choice>
-                <value>parallel</value>
-                <value>perspective</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="dr3d-scene-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:distance">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="dr3d-scene-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:focal-length">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="dr3d-scene-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:shadow-slant">
-            <ref name="nonNegativeInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="dr3d-scene-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:shade-mode">
-            <choice>
-                <value>flat</value>
-                <value>phong</value>
-                <value>gouraud</value>
-                <value>draft</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="dr3d-scene-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:ambient-color">
-            <ref name="color"/>
-        </attribute>
-    </optional>
-</define>
-<define name="dr3d-scene-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:lighting-mode">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-dr3d-transform-attlist">
-    <optional>
-        <attribute name="dr3d:transform"/>
-    </optional>
-</define>
-<define name="dr3d-light">
-    <element name="dr3d:light">
-        <ref name="dr3d-light-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="dr3d-light-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:diffuse-color">
-            <ref name="color"/>
-        </attribute>
-    </optional>
-</define>
-<define name="dr3d-light-attlist" combine="interleave">
-    <attribute name="dr3d:direction">
-        <ref name="vector3D"/>
-    </attribute>
-</define>
-<define name="dr3d-light-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:enabled">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="dr3d-light-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:specular">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="dr3d-cube">
-    <element name="dr3d:cube">
-        <ref name="dr3d-cube-attlist"/>
-        <ref name="common-draw-z-index-attlist"/>
-        <ref name="common-draw-id-attlist"/>
-        <ref name="common-draw-layer-name-attlist"/>
-        <ref name="common-draw-style-name-attlist"/>
-        <ref name="common-dr3d-transform-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="dr3d-cube-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:min-edge">
-            <ref name="vector3D"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="dr3d:max-edge">
-            <ref name="vector3D"/>
-        </attribute>
-    </optional>
-</define>
-<define name="dr3d-sphere">
-    <element name="dr3d:sphere">
-        <ref name="dr3d-sphere-attlist"/>
-        <ref name="common-draw-z-index-attlist"/>
-        <ref name="common-draw-id-attlist"/>
-        <ref name="common-draw-layer-name-attlist"/>
-        <ref name="common-draw-style-name-attlist"/>
-        <ref name="common-dr3d-transform-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="dr3d-sphere-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:center">
-            <ref name="vector3D"/>
-        </attribute>
-    </optional>
-</define>
-<define name="dr3d-sphere-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:size">
-            <ref name="vector3D"/>
-        </attribute>
-    </optional>
-</define>
-<define name="dr3d-extrude">
-    <element name="dr3d:extrude">
-        <ref name="common-draw-path-data-attlist"/>
-        <ref name="common-draw-viewbox-attlist"/>
-        <ref name="common-draw-id-attlist"/>
-        <ref name="common-draw-z-index-attlist"/>
-        <ref name="common-draw-layer-name-attlist"/>
-        <ref name="common-draw-style-name-attlist"/>
-        <ref name="common-dr3d-transform-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="dr3d-rotate">
-    <element name="dr3d:rotate">
-        <ref name="common-draw-viewbox-attlist"/>
-        <ref name="common-draw-path-data-attlist"/>
-        <ref name="common-draw-z-index-attlist"/>
-        <ref name="common-draw-id-attlist"/>
-        <ref name="common-draw-layer-name-attlist"/>
-        <ref name="common-draw-style-name-attlist"/>
-        <ref name="common-dr3d-transform-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="draw-custom-shape">
-    <element name="draw:custom-shape">
-        <ref name="draw-custom-shape-attlist"/>
-        <ref name="common-draw-position-attlist"/>
-        <ref name="common-draw-size-attlist"/>
-        <ref name="common-draw-shape-with-text-and-styles-attlist"/>
-        <optional>
-            <ref name="office-event-listeners"/>
-        </optional>
-        <zeroOrMore>
-            <ref name="draw-glue-point"/>
-        </zeroOrMore>
-        <ref name="draw-text"/>
-        <optional>
-            <ref name="draw-enhanced-geometry"/>
-        </optional>
-    </element>
-</define>
-<define name="draw-custom-shape-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:engine">
-            <ref name="namespacedToken"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-custom-shape-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:data">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry">
-    <element name="draw:enhanced-geometry">
-        <ref name="draw-enhanced-geometry-attlist"/>
-        <zeroOrMore>
-            <ref name="draw-equation"/>
-        </zeroOrMore>
-        <zeroOrMore>
-            <ref name="draw-handle"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:type" a:defaultValue="non-primitive">
-            <ref name="custom-shape-type"/>
-        </attribute>
-    </optional>
-</define>
-
-<define name="custom-shape-type">
-    <choice>
-        <value>non-primitive</value>
-        <ref name="string"/>
-    </choice>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="svg:viewBox">
-            <list>
-                <ref name="integer"/>
-                <ref name="integer"/>
-                <ref name="integer"/>
-                <ref name="integer"/>
-            </list>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:mirror-vertical" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="draw:mirror-horizontal" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:text-rotate-angle" a:defaultValue="0">
-            <ref name="double"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:extrusion-allowed" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:text-path-allowed" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:concentric-gradient-fill-allowed"
-                    a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:extrusion" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:extrusion-brightness" a:defaultValue="33%">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:extrusion-depth" a:defaultValue="36pt 0">
-            <list>
-                <ref name="length"/>
-                <ref name="double"/>
-            </list>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:extrusion-diffusion" a:defaultValue="0%">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:extrusion-number-of-line-segments"
-                   a:defaultValue="30">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:extrusion-light-face" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:extrusion-first-light-harsh"
-                   a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:extrusion-second-light-harsh"
-                   a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:extrusion-first-light-level"
-                   a:defaultValue="66%">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:extrusion-second-light-level"
-                   a:defaultValue="66%">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:extrusion-first-light-direction"
-                   a:defaultValue="(5 0 1)">
-            <ref name="vector3D"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:extrusion-second-light-direction"
-                   a:defaultValue="(-5 0 1)">
-            <ref name="vector3D"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:extrusion-metal" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:shade-mode" a:defaultValue="flat">
-            <choice>
-                <value>flat</value>
-                <value>phong</value>
-                <value>gouraud</value>
-                <value>draft</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:extrusion-rotation-angle" a:defaultValue="0 0">
-            <list>
-                <ref name="double"/>
-                <ref name="double"/>
-            </list>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:extrusion-rotation-center">
-            <ref name="vector3D"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:extrusion-shininess" a:defaultValue="50%">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:extrusion-skew" a:defaultValue="50 45">
-            <list>
-                <ref name="double"/>
-                <ref name="double"/>
-            </list>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:extrusion-specularity" a:defaultValue="0%">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:projection" a:defaultValue="parallel">
-            <choice>
-                <value>parallel</value>
-                <value>perspective</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:extrusion-viewpoint" 
-                   a:defaultValue="3.5cm -3.5cm 25cm">
-            <ref name="point3D"/>
-        </attribute>
-    </optional>
-</define>
-
-<define name="point3D">
-    <data type="string"/>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:extrusion-origin" a:defaultValue="0.5 -0.5">
-            <list>
-                <ref name="double"/>
-                <ref name="double"/>
-            </list>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:extrusion-color" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:enhanced-path">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:path-stretchpoint-x" a:defaultValue="0">
-            <ref name="double"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="draw:path-stretchpoint-y" a:defaultValue="0">
-            <ref name="double"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:text-areas">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:glue-points">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:glue-point-type" a:defaultValue="none">
-            <choice>
-                <value>none</value>
-                <value>segments</value>
-                <value>rectangle</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:glue-point-leaving-directions"/>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:text-path" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:text-path-mode" a:defaultValue="normal">
-            <choice>
-                <value>normal</value>
-                <value>path</value>
-                <value>shape</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:text-path-scale" a:defaultValue="path">
-            <choice>
-                <value>path</value>
-                <value>shape</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:text-path-same-letter-heights"
-                   a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:modifiers">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-equation">
-    <element name="draw:equation">
-        <ref name="draw-equation-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="draw-equation-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-equation-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:formula">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-handle">
-    <element name="draw:handle">
-        <ref name="draw-handle-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="draw-handle-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:handle-mirror-vertical" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-handle-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:handle-mirror-horizontal" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-handle-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:handle-switched" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-handle-attlist" combine="interleave">
-    <attribute name="draw:handle-position">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="draw-handle-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:handle-range-x-minimum">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-handle-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:handle-range-x-maximum">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-handle-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:handle-range-y-minimum">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-handle-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:handle-range-y-maximum">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-handle-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:handle-polar">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-handle-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:handle-radius-range-minimum">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-handle-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:handle-radius-range-maximum">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="presentation-shape-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:class">
-            <ref name="presentation-classes"/>
-        </attribute>
-    </optional>
-</define>
-<define name="presentation-classes">
-    <choice>
-        <value>title</value>
-        <value>outline</value>
-        <value>subtitle</value>
-        <value>text</value>
-        <value>graphic</value>
-        <value>object</value>
-        <value>chart</value>
-        <value>table</value>
-        <value>orgchart</value>
-        <value>page</value>
-        <value>notes</value>
-        <value>handout</value>
-        <value>header</value>
-        <value>footer</value>
-        <value>date-time</value>
-        <value>page-number</value>
-    </choice>
-</define>
-<define name="presentation-shape-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:placeholder">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="presentation-shape-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:user-transformed">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="presentation-animations">
-    <element name="presentation:animations">
-        <zeroOrMore>
-            <choice>
-                <ref name="presentation-animation-elements"/>
-                <ref name="presentation-animation-group"/>
-            </choice>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="presentation-animation-elements">
-    <choice>
-        <ref name="presentation-show-shape"/>
-        <ref name="presentation-show-text"/>
-        <ref name="presentation-hide-shape"/>
-        <ref name="presentation-hide-text"/>
-        <ref name="presentation-dim"/>
-        <ref name="presentation-play"/>
-    </choice>
-</define>
-<define name="presentation-sound">
-    <element name="presentation:sound">
-        <ref name="presentation-sound-attlist"/>
-        <attribute name="xlink:href">
-            <ref name="anyURI"/>
-        </attribute>
-        <optional>
-            <attribute name="xlink:type" a:defaultValue="simple">
-                <choice>
-                    <value>simple</value>
-                </choice>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="xlink:actuate" a:defaultValue="onRequest">
-                <choice>
-                    <value>onRequest</value>
-                </choice>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="xlink:show">
-                <choice>
-                    <value>new</value>
-                    <value>replace</value>
-                </choice>
-            </attribute>
-        </optional>
-        <empty/>
-    </element>
-</define>
-<define name="presentation-sound-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:play-full">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="presentation-show-shape">
-    <element name="presentation:show-shape">
-        <ref name="common-presentation-effect-attlist"/>
-        <optional>
-            <ref name="presentation-sound"/>
-        </optional>
-    </element>
-</define>
-<define name="common-presentation-effect-attlist" combine="interleave">
-    <attribute name="draw:shape-id">
-        <ref name="IDREF"/>
-    </attribute>
-</define>
-<define name="common-presentation-effect-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:effect" a:defaultValue="none">
-            <ref name="presentationEffects"/>
-        </attribute>
-    </optional>
-</define>
-<define name="presentationEffects">
-    <choice>
-        <value>none</value>
-        <value>fade</value>
-        <value>move</value>
-        <value>stripes</value>
-        <value>open</value>
-        <value>close</value>
-        <value>dissolve</value>
-        <value>wavyline</value>
-        <value>random</value>
-        <value>lines</value>
-        <value>laser</value>
-        <value>appear</value>
-        <value>hide</value>
-        <value>move-short</value>
-        <value>checkerboard</value>
-        <value>rotate</value>
-        <value>stretch</value>
-    </choice>
-</define>
-<define name="common-presentation-effect-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:direction" a:defaultValue="none">
-            <ref name="presentationEffectDirections"/>
-        </attribute>
-    </optional>
-</define>
-<define name="presentationEffectDirections">
-    <choice>
-        <value>none</value>
-        <value>from-left</value>
-        <value>from-top</value>
-        <value>from-right</value>
-        <value>from-bottom</value>
-        <value>from-center</value>
-        <value>from-upper-left</value>
-        <value>from-upper-right</value>
-        <value>from-lower-left</value>
-        <value>from-lower-right</value>
-        <value>to-left</value>
-        <value>to-top</value>
-        <value>to-right</value>
-        <value>to-bottom</value>
-        <value>to-upper-left</value>
-        <value>to-upper-right</value>
-        <value>to-lower-right</value>
-        <value>to-lower-left</value>
-        <value>path</value>
-        <value>spiral-inward-left</value>
-        <value>spiral-inward-right</value>
-        <value>spiral-outward-left</value>
-        <value>spiral-outward-right</value>
-        <value>vertical</value>
-        <value>horizontal</value>
-        <value>to-center</value>
-        <value>clockwise</value>
-        <value>counter-clockwise</value>
-    </choice>
-</define>
-<define name="common-presentation-effect-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:speed" a:defaultValue="medium">
-            <ref name="presentationSpeeds"/>
-        </attribute>
-    </optional>
-</define>
-<define name="presentationSpeeds">
-    <choice>
-        <value>slow</value>
-        <value>medium</value>
-        <value>fast</value>
-    </choice>
-</define>
-<define name="common-presentation-effect-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:delay">
-            <ref name="duration"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-presentation-effect-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:start-scale" a:defaultValue="100%">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-presentation-effect-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:path-id"/>
-    </optional>
-</define>
-<define name="presentation-show-text">
-    <element name="presentation:show-text">
-        <ref name="common-presentation-effect-attlist"/>
-        <optional>
-            <ref name="presentation-sound"/>
-        </optional>
-    </element>
-</define>
-<define name="presentation-hide-shape">
-    <element name="presentation:hide-shape">
-        <ref name="common-presentation-effect-attlist"/>
-        <optional>
-            <ref name="presentation-sound"/>
-        </optional>
-    </element>
-</define>
-<define name="presentation-hide-text">
-    <element name="presentation:hide-text">
-        <ref name="common-presentation-effect-attlist"/>
-        <optional>
-            <ref name="presentation-sound"/>
-        </optional>
-    </element>
-</define>
-<define name="presentation-dim">
-    <element name="presentation:dim">
-        <ref name="presentation-dim-attlist"/>
-        <optional>
-            <ref name="presentation-sound"/>
-        </optional>
-    </element>
-</define>
-<define name="presentation-dim-attlist" combine="interleave">
-    <attribute name="draw:shape-id">
-        <ref name="IDREF"/>
-    </attribute>
-</define>
-<define name="presentation-dim-attlist" combine="interleave">
-    <attribute name="draw:color">
-        <ref name="color"/>
-    </attribute>
-</define>
-<define name="presentation-play">
-    <element name="presentation:play">
-        <ref name="presentation-play-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="presentation-play-attlist" combine="interleave">
-    <attribute name="draw:shape-id">
-        <ref name="IDREF"/>
-    </attribute>
-    <optional>
-        <attribute name="presentation:speed" a:defaultValue="medium">
-            <ref name="presentationSpeeds"/>
-        </attribute>
-    </optional>
-</define>
-<define name="presentation-animation-group">
-    <element name="presentation:animation-group">
-        <zeroOrMore>
-            <ref name="presentation-animation-elements"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="common-anim-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:node-type" a:defaultValue="default">
-            <choice>
-                <value>default</value>
-                <value>on-click</value>
-                <value>with-previous</value>
-                <value>after-previous</value>
-                <value>timing-root</value>
-                <value>main-sequence</value>
-                <value>interactive-sequence</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="common-anim-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:preset-id">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-anim-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:preset-sub-type">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-anim-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:preset-class" a:defaultValue="custom">
-            <choice>
-                <value>custom</value>
-                <value>entrance</value>
-                <value>exit</value>
-                <value>emphasis</value>
-                <value>motion-path</value>
-                <value>ole-action</value>
-                <value>media-call</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="common-anim-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:master-element">
-            <ref name="IDREF"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-anim-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:group-id">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="presentation-event-listener">
-    <element name="presentation:event-listener">
-        <ref name="presentation-event-listener-attlist"/>
-        <optional>
-            <ref name="presentation-sound"/>
-        </optional>
-    </element>
-</define>
-<define name="presentation-event-listener-attlist" combine="interleave">
-    <attribute name="script:event-name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="presentation-event-listener-attlist" combine="interleave">
-    <attribute name="presentation:action">
-        <choice>
-            <value>none</value>
-            <value>previous-page</value>
-            <value>next-page</value>
-            <value>first-page</value>
-            <value>last-page</value>
-            <value>hide</value>
-            <value>stop</value>
-            <value>execute</value>
-            <value>show</value>
-            <value>verb</value>
-            <value>fade-out</value>
-            <value>sound</value>
-        </choice>
-    </attribute>
-</define>
-<define name="presentation-event-listener-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:effect" a:defaultValue="none">
-            <ref name="presentationEffects"/>
-        </attribute>
-    </optional>
-</define>
-<define name="presentation-event-listener-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:direction" a:defaultValue="none">
-            <ref name="presentationEffectDirections"/>
-        </attribute>
-    </optional>
-</define>
-<define name="presentation-event-listener-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:speed" a:defaultValue="medium">
-            <ref name="presentationSpeeds"/>
-        </attribute>
-    </optional>
-</define>
-<define name="presentation-event-listener-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:start-scale" a:defaultValue="100%">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-</define>
-<define name="presentation-event-listener-attlist" combine="interleave">
-    <optional>
-        <attribute name="xlink:href">
-            <ref name="anyURI"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="xlink:type" a:defaultValue="simple">
-            <choice>
-                <value>simple</value>
-            </choice>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="xlink:show" a:defaultValue="embed">
-            <choice>
-                <value>embed</value>
-            </choice>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="xlink:actuate" a:defaultValue="onRequest">
-            <choice>
-                <value>onRequest</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="presentation-event-listener-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:verb">
-            <ref name="nonNegativeInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="presentation:header">
-        <empty/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="presentation:footer">
-        <empty/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="presentation:date-time">
-        <empty/>
-    </element>
-</define>
-<define name="presentation-decls">
-    <zeroOrMore>
-        <ref name="presentation-decl"/>
-    </zeroOrMore>
-</define>
-<define name="presentation-decl" combine="choice">
-    <element name="presentation:header-decl">
-        <ref name="presentation-header-decl-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="presentation-header-decl-attlist" combine="interleave">
-    <attribute name="presentation:name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="presentation-decl" combine="choice">
-    <element name="presentation:footer-decl">
-        <ref name="presentation-footer-decl-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="presentation-footer-decl-attlist" combine="interleave">
-    <attribute name="presentation:name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="presentation-decl" combine="choice">
-    <element name="presentation:date-time-decl">
-        <ref name="presentation-date-time-decl-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="presentation-date-time-decl-attlist" combine="interleave">
-    <attribute name="presentation:name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="presentation-date-time-decl-attlist" combine="interleave">
-    <attribute name="presentation:source">
-        <choice>
-            <value>fixed</value>
-            <value>current-date</value>
-        </choice>
-    </attribute>
-</define>
-<define name="presentation-date-time-decl-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:data-style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="presentation-settings">
-    <optional>
-        <element name="presentation:settings">
-            <ref name="presentation-settings-attlist"/>
-            <zeroOrMore>
-                <ref name="presentation-show"/>
-            </zeroOrMore>
-        </element>
-    </optional>
-</define>
-<define name="presentation-settings-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:start-page">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="presentation-settings-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:show">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="presentation-settings-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:full-screen" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="presentation-settings-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:endless" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="presentation-settings-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:pause">
-            <ref name="duration"/>
-        </attribute>
-    </optional>
-</define>
-<define name="presentation-settings-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:show-logo" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="presentation-settings-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:force-manual" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="presentation-settings-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:mouse-visible" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="presentation-settings-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:mouse-as-pen" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="presentation-settings-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:start-with-navigator"
-                   a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="presentation-settings-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:animations" a:defaultValue="enabled">
-            <choice>
-                <value>enabled</value>
-                <value>disabled</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="presentation-settings-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:transition-on-click"
-                   a:defaultValue="enabled">
-            <choice>
-                <value>enabled</value>
-                <value>disabled</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="presentation-settings-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:stay-on-top" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="presentation-show">
-    <element name="presentation:show">
-        <ref name="presentation-show-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="presentation-show-attlist" combine="interleave">
-    <attribute name="presentation:name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="presentation-show-attlist" combine="interleave">
-    <attribute name="presentation:pages"/>
-</define>
-<define name="chart-chart">
-    <element name="chart:chart">
-        <ref name="chart-chart-attlist"/>
-        <optional>
-            <ref name="chart-title"/>
-        </optional>
-        <optional>
-            <ref name="chart-subtitle"/>
-        </optional>
-        <optional>
-            <ref name="chart-footer"/>
-        </optional>
-        <optional>
-            <ref name="chart-legend"/>
-        </optional>
-        <ref name="chart-plot-area"/>
-        <optional>
-            <ref name="table-table"/>
-        </optional>
-    </element>
-</define>
-<define name="chart-chart-attlist" combine="interleave">
-    <attribute name="chart:class">
-        <ref name="namespacedToken"/>
-    </attribute>
-</define>
-<define name="chart-chart-attlist" combine="interleave">
-    <ref name="common-draw-size-attlist"/>
-</define>
-<define name="chart-chart-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:column-mapping">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="chart-chart-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:row-mapping">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="chart-chart-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="chart-title">
-    <element name="chart:title">
-        <ref name="chart-title-attlist"/>
-        <optional>
-            <ref name="text-p"/>
-        </optional>
-    </element>
-</define>
-<define name="chart-title-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:cell-range">
-            <ref name="cellAddress"/>
-        </attribute>
-    </optional>
-</define>
-<define name="chart-title-attlist" combine="interleave">
-    <ref name="common-draw-position-attlist"/>
-</define>
-<define name="chart-title-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="chart-subtitle">
-    <element name="chart:subtitle">
-        <ref name="chart-title-attlist"/>
-        <optional>
-            <ref name="text-p"/>
-        </optional>
-    </element>
-</define>
-<define name="chart-footer">
-    <element name="chart:footer">
-        <ref name="chart-title-attlist"/>
-        <optional>
-            <ref name="text-p"/>
-        </optional>
-    </element>
-</define>
-<define name="chart-legend">
-    <element name="chart:legend">
-        <ref name="chart-legend-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="chart-legend-attlist" combine="interleave">
-    <choice>
-        <group>
-            <attribute name="chart:legend-position">
-                <choice>
-                    <value>start</value>
-                    <value>end</value>
-                    <value>top</value>
-                    <value>bottom</value>
-                </choice>
-            </attribute>
-            <optional>
-                <attribute name="chart:legend-align">
-                    <choice>
-                        <value>start</value>
-                        <value>center</value>
-                        <value>end</value>
-                    </choice>
-                </attribute>
-            </optional>
-        </group>
-        <attribute name="chart:legend-position">
-            <choice>
-                <value>top-start</value>
-                <value>bottom-start</value>
-                <value>top-end</value>
-                <value>bottom-end</value>
-            </choice>
-        </attribute>
-        <empty/>
-    </choice>
-</define>
-<define name="chart-legend-attlist" combine="interleave">
-    <ref name="common-draw-position-attlist"/>
-</define>
-<define name="chart-legend-attlist" combine="interleave">
-    <choice>
-        <attribute name="style:legend-expansion">
-            <choice>
-                <value>wide</value>
-                <value>high</value>
-                <value>balanced</value>
-            </choice>
-        </attribute>
-        <group>
-            <attribute name="style:legend-expansion">
-                <value>custom</value>
-            </attribute>
-            <attribute name="style:legend-expansion-aspect-ratio">
-                <ref name="double"/>
-            </attribute>
-        </group>
-        <empty/>
-    </choice>
-</define>
-<define name="chart-legend-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="chart-plot-area">
-    <element name="chart:plot-area">
-        <ref name="chart-plot-area-attlist"/>
-        <zeroOrMore>
-            <ref name="dr3d-light"/>
-        </zeroOrMore>
-        <zeroOrMore>
-            <ref name="chart-axis"/>
-        </zeroOrMore>
-        <zeroOrMore>
-            <ref name="chart-series"/>
-        </zeroOrMore>
-        <optional>
-            <ref name="chart-stock-gain-marker"/>
-        </optional>
-        <optional>
-            <ref name="chart-stock-loss-marker"/>
-        </optional>
-        <optional>
-            <ref name="chart-stock-range-line"/>
-        </optional>
-        <optional>
-            <ref name="chart-wall"/>
-        </optional>
-        <optional>
-            <ref name="chart-floor"/>
-        </optional>
-    </element>
-</define>
-<define name="chart-plot-area-attlist" combine="interleave">
-    <ref name="common-draw-position-attlist"/>
-    <ref name="common-draw-size-attlist"/>
-</define>
-<define name="chart-plot-area-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="chart-plot-area-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:cell-range-address">
-            <ref name="cellRangeAddress"/>
-        </attribute>
-    </optional>
-</define>
-<define name="chart-plot-area-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:data-source-has-labels" a:defaultValue="none">
-            <choice>
-                <value>none</value>
-                <value>row</value>
-                <value>column</value>
-                <value>both</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="chart-plot-area-attlist" combine="interleave">
-    <ref name="dr3d-scene-attlist"/>
-    <ref name="common-dr3d-transform-attlist"/>
-</define>
-<define name="chart-wall">
-    <element name="chart:wall">
-        <ref name="chart-wall-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="chart-wall-attlist" combine="interleave">
-    <optional>
-        <attribute name="svg:width">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="chart-wall-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="chart-floor">
-    <element name="chart:floor">
-        <ref name="chart-floor-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="chart-floor-attlist" combine="interleave">
-    <optional>
-        <attribute name="svg:width">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="chart-floor-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="chart-axis">
-    <element name="chart:axis">
-        <ref name="chart-axis-attlist"/>
-        <optional>
-            <ref name="chart-title"/>
-        </optional>
-        <optional>
-            <ref name="chart-categories"/>
-        </optional>
-        <zeroOrMore>
-            <ref name="chart-grid"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="chart-axis-attlist" combine="interleave">
-    <attribute name="chart:dimension">
-        <choice>
-            <value>x</value>
-            <value>y</value>
-            <value>z</value>
-        </choice>
-    </attribute>
-</define>
-<define name="chart-axis-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="chart-axis-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="chart-grid">
-    <element name="chart:grid">
-        <ref name="chart-grid-attlist"/>
-    </element>
-</define>
-<define name="chart-grid-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:class" a:defaultValue="major">
-            <choice>
-                <value>major</value>
-                <value>minor</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="chart-grid-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="chart-series">
-    <element name="chart:series">
-        <ref name="chart-series-attlist"/>
-        <zeroOrMore>
-            <ref name="chart-domain"/>
-        </zeroOrMore>
-        <optional>
-            <ref name="chart-mean-value"/>
-        </optional>
-        <optional>
-            <ref name="chart-regression-curve"/>
-        </optional>
-        <optional>
-            <ref name="chart-error-indicator"/>
-        </optional>
-        <zeroOrMore>
-            <ref name="chart-data-point"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="chart-series-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:values-cell-range-address">
-            <ref name="cellRangeAddress"/>
-        </attribute>
-    </optional>
-</define>
-<define name="chart-series-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:label-cell-address">
-            <ref name="cellAddress"/>
-        </attribute>
-    </optional>
-</define>
-<define name="chart-series-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:class">
-            <ref name="namespacedToken"/>
-        </attribute>
-    </optional>
-</define>
-<define name="chart-series-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:attached-axis">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="chart-series-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="chart-domain">
-    <element name="chart:domain">
-    <optional>
-        <attribute name="table:cell-range-address">
-            <ref name="cellRangeAddress"/>
-        </attribute>
-    </optional>
-    </element>
-</define>
-<define name="chart-categories">
-    <element name="chart:categories">
-    <optional>
-        <attribute name="table:cell-range-address">
-            <ref name="cellRangeAddress"/>
-        </attribute>
-    </optional>
-    </element>
-</define>
-<define name="chart-data-point">
-    <element name="chart:data-point">
-        <ref name="chart-data-point-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="chart-data-point-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:repeated">
-            <ref name="nonNegativeInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="chart-data-point-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-
-<define name="chart-mean-value">
-    <element name="chart:mean-value">
-        <ref name="chart-mean-value-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="chart-mean-value-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="chart-error-indicator">
-    <element name="chart:error-indicator">
-        <ref name="chart-error-indicator-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="chart-error-indicator-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="chart-regression-curve">
-    <element name="chart:regression-curve">
-        <ref name="chart-regression-curve-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="chart-regression-curve-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="chart-stock-gain-marker">
-    <element name="chart:stock-gain-marker">
-        <ref name="common-stock-marker-attlist"/>
-    </element>
-</define>
-<define name="chart-stock-loss-marker">
-    <element name="chart:stock-loss-marker">
-        <ref name="common-stock-marker-attlist"/>
-    </element>
-</define>
-<define name="chart-stock-range-line">
-    <element name="chart:stock-range-line">
-        <ref name="common-stock-marker-attlist"/>
-    </element>
-</define>
-<define name="common-stock-marker-attlist">
-    <optional>
-        <attribute name="chart:style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="office-forms">
-    <optional>
-        <element name="office:forms">
-            <ref name="office-forms-attlist"/>
-            <zeroOrMore>
-                <choice>
-                    <ref name="form-form"/>
-                    <ref name="xforms-model"/>
-                </choice>
-            </zeroOrMore>
-        </element>
-    </optional>
-</define>
-<define name="office-forms-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:automatic-focus" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="office-forms-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:apply-design-mode" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-form">
-    <element name="form:form">
-        <ref name="common-form-control-attlist"/>
-        <ref name="form-form-attlist"/>
-        <optional>
-            <ref name="form-properties"/>
-        </optional>
-        <optional>
-            <ref name="office-event-listeners"/>
-        </optional>
-        <zeroOrMore>
-            <choice>
-                <ref name="controls"/>
-                <ref name="form-form"/>
-            </choice>
-        </zeroOrMore>
-        <optional>
-            <ref name="form-connection-resource"/>
-        </optional>
-    </element>
-</define>
-<define name="form-form-attlist" combine="interleave">
-    <optional>
-        <attribute name="xlink:href">
-            <ref name="anyURI"/>
-        </attribute>
-        <optional>
-            <attribute name="xlink:type" a:defaultValue="simple">
-                <value>simple</value>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="xlink:actuate" a:defaultValue="onRequest">
-                <value>onRequest</value>
-            </attribute>
-        </optional>
-    </optional>
-</define>
-<define name="form-form-attlist" combine="interleave">
-    <optional>
-        <attribute name="office:target-frame" a:defaultValue="_blank">
-            <ref name="targetFrameName"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-form-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:method" a:defaultValue="get">
-            <choice>
-                <value>get</value>
-                <value>post</value>
-                <ref name="string"/>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="form-form-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:enctype" 
-                    a:defaultValue="application/x-www-form-urlencoded">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-form-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:allow-deletes" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-form-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:allow-inserts" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-form-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:allow-updates" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-form-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:apply-filter" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-form-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:command-type" a:defaultValue="command">
-            <choice>
-                <value>table</value>
-                <value>query</value>
-                <value>command</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="form-form-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:command"/>
-    </optional>
-</define>
-<define name="form-form-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:datasource">
-            <choice>
-                <ref name="anyURI"/>
-                <ref name="string"/>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="form-form-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:master-fields">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-form-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:detail-fields">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-form-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:escape-processing" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-form-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:filter">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-form-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:ignore-result" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-form-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:navigation-mode">
-            <ref name="navigation"/>
-        </attribute>
-    </optional>
-</define>
-
-<define name="navigation">
-    <choice>
-        <value>none</value>
-        <value>current</value>
-        <value>parent</value>
-    </choice>
-</define>
-<define name="form-form-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:order">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-form-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:tab-cycle">
-            <ref name="tab-cycles"/>
-        </attribute>
-    </optional>
-</define>
-<define name="tab-cycles">
-    <choice>
-        <value>records</value>
-        <value>current</value>
-        <value>page</value>
-    </choice>
-</define>
-<define name="form-connection-resource">
-    <element name="form:connection-resource">
-        <attribute name="xlink:href">
-            <ref name="anyURI"/>
-        </attribute>
-        <empty/>
-    </element>
-</define>
-<define name="xforms-model">
-    <element name="xforms:model">
-        <ref name="anyAttListOrElements"/>
-    </element>
-</define>
-<define name="column-controls" combine="choice">
-    <element name="form:text">
-        <ref name="form-text-attlist"/>
-        <ref name="common-form-control-content"/>
-    </element>
-</define>
-<define name="controls" combine="choice">
-    <ref name="column-controls"/>
-</define>
-<define name="form-text-attlist">
-    <ref name="form-control-attlist"/>
-    <ref name="common-current-value-attlist"/>
-    <ref name="common-disabled-attlist"/>
-    <ref name="common-maxlength-attlist"/>
-    <ref name="common-printable-attlist"/>
-    <ref name="common-readonly-attlist"/>
-    <ref name="common-tab-attlist"/>
-    <ref name="common-title-attlist"/>
-    <ref name="common-value-attlist"/>
-    <ref name="common-convert-empty-attlist"/>
-    <ref name="common-data-field-attlist"/>
-</define>
-<define name="form-control-attlist">
-    <ref name="common-form-control-attlist"/>
-    <ref name="common-control-id-attlist"/>
-    <ref name="xforms-bind-attlist"/>
-</define>
-<define name="common-form-control-content">
-    <optional>
-        <ref name="form-properties"/>
-    </optional>
-    <optional>
-        <ref name="office-event-listeners"/>
-    </optional>
-</define>
-<define name="column-controls" combine="choice">
-    <element name="form:textarea">
-        <ref name="form-textarea-attlist"/>
-        <ref name="common-form-control-content"/>
-        <zeroOrMore>
-            <ref name="text-p"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="form-textarea-attlist">
-    <ref name="form-control-attlist"/>
-    <ref name="common-current-value-attlist"/>
-    <ref name="common-disabled-attlist"/>
-    <ref name="common-maxlength-attlist"/>
-    <ref name="common-printable-attlist"/>
-    <ref name="common-readonly-attlist"/>
-    <ref name="common-tab-attlist"/>
-    <ref name="common-title-attlist"/>
-    <ref name="common-value-attlist"/>
-    <ref name="common-convert-empty-attlist"/>
-    <ref name="common-data-field-attlist"/>
-</define>
-<define name="controls" combine="choice">
-    <element name="form:password">
-        <ref name="form-password-attlist"/>
-        <ref name="common-form-control-content"/>
-    </element>
-</define>
-<define name="form-password-attlist" combine="interleave">
-    <ref name="form-control-attlist"/>
-    <ref name="common-disabled-attlist"/>
-    <ref name="common-maxlength-attlist"/>
-    <ref name="common-printable-attlist"/>
-    <ref name="common-tab-attlist"/>
-    <ref name="common-title-attlist"/>
-    <ref name="common-value-attlist"/>
-    <ref name="common-convert-empty-attlist"/>
-</define>
-<define name="form-password-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:echo-char" a:defaultValue="*">
-            <ref name="character"/>
-        </attribute>
-    </optional>
-</define>
-<define name="controls" combine="choice">
-    <element name="form:file">
-        <ref name="form-file-attlist"/>
-        <ref name="common-form-control-content"/>
-    </element>
-</define>
-<define name="form-file-attlist" combine="interleave">
-    <ref name="form-control-attlist"/>
-    <ref name="common-current-value-attlist"/>
-    <ref name="common-disabled-attlist"/>
-    <ref name="common-maxlength-attlist"/>
-    <ref name="common-printable-attlist"/>
-    <ref name="common-readonly-attlist"/>
-    <ref name="common-tab-attlist"/>
-    <ref name="common-title-attlist"/>
-    <ref name="common-value-attlist"/>
-</define>
-<define name="column-controls" combine="choice">
-    <element name="form:formatted-text">
-        <ref name="form-formatted-text-attlist"/>
-        <ref name="common-form-control-content"/>
-    </element>
-</define>
-<define name="form-formatted-text-attlist" combine="interleave">
-    <ref name="form-control-attlist"/>
-    <ref name="common-current-value-attlist"/>
-    <ref name="common-disabled-attlist"/>
-    <ref name="common-maxlength-attlist"/>
-    <ref name="common-printable-attlist"/>
-    <ref name="common-readonly-attlist"/>
-    <ref name="common-tab-attlist"/>
-    <ref name="common-title-attlist"/>
-    <ref name="common-value-attlist"/>
-    <ref name="common-convert-empty-attlist"/>
-    <ref name="common-data-field-attlist"/>
-</define>
-<define name="form-formatted-text-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:max-value">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-formatted-text-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:min-value">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-formatted-text-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:validation" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="column-controls" combine="choice">
-    <element name="form:number">
-        <ref name="form-number-attlist"/>
-        <ref name="common-numeric-control-attlist"/>
-        <ref name="common-form-control-content"/>
-    </element>
-</define>
-<define name="common-numeric-control-attlist">
-    <ref name="form-control-attlist"/>
-    <ref name="common-disabled-attlist"/>
-    <ref name="common-maxlength-attlist"/>
-    <ref name="common-printable-attlist"/>
-    <ref name="common-readonly-attlist"/>
-    <ref name="common-tab-attlist"/>
-    <ref name="common-title-attlist"/>
-    <ref name="common-convert-empty-attlist"/>
-    <ref name="common-data-field-attlist"/>
-</define>
-<define name="form-number-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:value">
-            <ref name="double"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-number-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:current-value">
-            <ref name="double"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-number-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:min-value">
-            <ref name="double"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-number-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:max-value">
-            <ref name="double"/>
-        </attribute>
-    </optional>
-</define>
-<define name="column-controls" combine="choice">
-    <element name="form:date">
-        <ref name="form-date-attlist"/>
-        <ref name="common-numeric-control-attlist"/>
-        <ref name="common-form-control-content"/>
-    </element>
-</define>
-<define name="controls" combine="choice">
-    <element name="form:time">
-        <ref name="form-time-attlist"/>
-        <ref name="common-numeric-control-attlist"/>
-        <ref name="common-form-control-content"/>
-    </element>
-</define>
-<define name="form-date-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:value">
-            <ref name="date"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-time-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:value">
-            <ref name="time"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-date-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:current-value">
-            <ref name="date"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-time-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:current-value">
-            <ref name="time"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-date-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:min-value">
-            <ref name="date"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-time-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:min-value">
-            <ref name="time"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-date-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:max-value">
-            <ref name="date"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-time-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:max-value">
-            <ref name="time"/>
-        </attribute>
-    </optional>
-</define>
-<define name="controls" combine="choice">
-    <element name="form:fixed-text">
-        <ref name="form-fixed-text-attlist"/>
-        <ref name="common-form-control-content"/>
-    </element>
-</define>
-<define name="form-fixed-text-attlist" combine="interleave">
-    <ref name="form-control-attlist"/>
-    <ref name="for"/>
-    <ref name="common-disabled-attlist"/>
-    <ref name="label"/>
-    <ref name="common-printable-attlist"/>
-    <ref name="common-title-attlist"/>
-</define>
-<define name="form-fixed-text-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:multi-line" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="column-controls" combine="choice">
-    <element name="form:combobox">
-        <ref name="form-combobox-attlist"/>
-        <ref name="common-form-control-content"/>
-        <zeroOrMore>
-            <ref name="form-item"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="form-combobox-attlist" combine="interleave">
-    <ref name="form-control-attlist"/>
-    <ref name="common-current-value-attlist"/>
-    <ref name="common-disabled-attlist"/>
-    <ref name="dropdown"/>
-    <ref name="common-maxlength-attlist"/>
-    <ref name="common-printable-attlist"/>
-    <ref name="common-readonly-attlist"/>
-    <ref name="size"/>
-    <ref name="common-tab-attlist"/>
-    <ref name="common-title-attlist"/>
-    <ref name="common-value-attlist"/>
-    <ref name="common-convert-empty-attlist"/>
-    <ref name="common-data-field-attlist"/>
-    <ref name="list-source"/>
-    <ref name="list-source-type"/>
-</define>
-<define name="form-combobox-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:auto-complete">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-item">
-    <element name="form:item">
-        <ref name="form-item-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="form-item-attlist" combine="interleave">
-    <ref name="label"/>
-</define>
-<define name="column-controls" combine="choice">
-    <element name="form:listbox">
-        <ref name="form-listbox-attlist"/>
-        <ref name="common-form-control-content"/>
-        <zeroOrMore>
-            <ref name="form-option"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="form-listbox-attlist" combine="interleave">
-    <ref name="form-control-attlist"/>
-    <ref name="common-disabled-attlist"/>
-    <ref name="dropdown"/>
-    <ref name="common-printable-attlist"/>
-    <ref name="size"/>
-    <ref name="common-tab-attlist"/>
-    <ref name="common-title-attlist"/>
-    <ref name="bound-column"/>
-    <ref name="common-data-field-attlist"/>
-    <ref name="list-source"/>
-    <ref name="list-source-type"/>
-</define>
-<define name="form-listbox-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:multiple" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-listbox-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:xforms-list-source">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-option">
-    <element name="form:option">
-        <ref name="form-option-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="form-option-attlist" combine="interleave">
-    <ref name="current-selected"/>
-    <ref name="selected"/>
-    <ref name="label"/>
-    <ref name="common-value-attlist"/>
-</define>
-<define name="controls" combine="choice">
-    <element name="form:button">
-        <ref name="form-button-attlist"/>
-        <ref name="common-form-control-content"/>
-    </element>
-</define>
-<define name="form-button-attlist" combine="interleave">
-    <ref name="form-control-attlist"/>
-    <ref name="button-type"/>
-    <ref name="common-disabled-attlist"/>
-    <ref name="label"/>
-    <ref name="image-data"/>
-    <ref name="common-printable-attlist"/>
-    <ref name="common-tab-attlist"/>
-    <ref name="target-frame"/>
-    <ref name="target-location"/>
-    <ref name="common-title-attlist"/>
-    <ref name="common-value-attlist"/>
-    <ref name="common-form-relative-image-position-attlist"/>
-</define>
-<define name="form-button-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:default-button" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-button-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:toggle" a:default-value="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-button-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:focus-on-click">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-button-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:xforms-submission">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="controls" combine="choice">
-    <element name="form:image">
-        <ref name="form-image-attlist"/>
-        <ref name="common-form-control-content"/>
-    </element>
-</define>
-<define name="form-image-attlist" combine="interleave">
-    <ref name="form-control-attlist"/>
-    <ref name="button-type"/>
-    <ref name="common-disabled-attlist"/>
-    <ref name="image-data"/>
-    <ref name="common-printable-attlist"/>
-    <ref name="common-tab-attlist"/>
-    <ref name="target-frame"/>
-    <ref name="target-location"/>
-    <ref name="common-title-attlist"/>
-    <ref name="common-value-attlist"/>
-</define>
-<define name="column-controls" combine="choice">
-    <element name="form:checkbox">
-        <ref name="form-checkbox-attlist"/>
-        <ref name="common-form-control-content"/>
-    </element>
-</define>
-<define name="form-checkbox-attlist" combine="interleave">
-    <ref name="form-control-attlist"/>
-    <ref name="common-disabled-attlist"/>
-    <ref name="label"/>
-    <ref name="common-printable-attlist"/>
-    <ref name="common-tab-attlist"/>
-    <ref name="common-title-attlist"/>
-    <ref name="common-value-attlist"/>
-    <ref name="common-data-field-attlist"/>
-    <ref name="common-form-visual-effect-attlist"/>
-    <ref name="common-form-relative-image-position-attlist"/>
-</define>
-<define name="states">
-    <choice>
-        <value>unchecked</value>
-        <value>checked</value>
-        <value>unknown</value>
-    </choice>
-</define>
-<define name="form-checkbox-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:current-state">
-            <ref name="states"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-checkbox-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:is-tristate" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-checkbox-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:state" a:defaultValue="unchecked">
-            <ref name="states"/>
-        </attribute>
-    </optional>
-</define>
-<define name="controls" combine="choice">
-    <element name="form:radio">
-        <ref name="form-radio-attlist"/>
-        <ref name="common-form-control-content"/>
-    </element>
-</define>
-<define name="form-radio-attlist" combine="interleave">
-    <ref name="form-control-attlist"/>
-    <ref name="current-selected"/>
-    <ref name="common-disabled-attlist"/>
-    <ref name="label"/>
-    <ref name="common-printable-attlist"/>
-    <ref name="selected"/>
-    <ref name="common-tab-attlist"/>
-    <ref name="common-title-attlist"/>
-    <ref name="common-value-attlist"/>
-    <ref name="common-data-field-attlist"/>
-    <ref name="common-form-visual-effect-attlist"/>
-    <ref name="common-form-relative-image-position-attlist"/>
-</define>
-<define name="controls" combine="choice">
-    <element name="form:frame">
-        <ref name="form-frame-attlist"/>
-        <ref name="common-form-control-content"/>
-    </element>
-</define>
-<define name="form-frame-attlist" combine="interleave">
-    <ref name="form-control-attlist"/>
-    <ref name="common-disabled-attlist"/>
-    <ref name="for"/>
-    <ref name="label"/>
-    <ref name="common-printable-attlist"/>
-    <ref name="common-title-attlist"/>
-</define>
-<define name="controls" combine="choice">
-    <element name="form:image-frame">
-        <ref name="form-image-frame-attlist"/>
-        <ref name="common-form-control-content"/>
-    </element>
-</define>
-<define name="form-image-frame-attlist" combine="interleave">
-    <ref name="form-control-attlist"/>
-    <ref name="common-disabled-attlist"/>
-    <ref name="image-data"/>
-    <ref name="common-printable-attlist"/>
-    <ref name="common-readonly-attlist"/>
-    <ref name="common-title-attlist"/>
-    <ref name="common-data-field-attlist"/>
-</define>
-<define name="controls" combine="choice">
-    <element name="form:hidden">
-        <ref name="form-hidden-attlist"/>
-        <ref name="common-form-control-content"/>
-    </element>
-</define>
-<define name="form-hidden-attlist" combine="interleave">
-    <ref name="form-control-attlist"/>
-    <ref name="common-value-attlist"/>
-</define>
-<define name="controls" combine="choice">
-    <element name="form:grid">
-        <ref name="form-grid-attlist"/>
-        <ref name="common-form-control-content"/>
-        <zeroOrMore>
-            <ref name="form-column"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="form-grid-attlist" combine="interleave">
-    <ref name="form-control-attlist"/>
-    <ref name="common-disabled-attlist"/>
-    <ref name="common-printable-attlist"/>
-    <ref name="common-tab-attlist"/>
-    <ref name="common-title-attlist"/>
-</define>
-<define name="form-column">
-    <element name="form:column">
-        <ref name="form-column-attlist"/>
-        <oneOrMore>
-            <ref name="column-controls"/>
-        </oneOrMore>
-    </element>
-</define>
-<define name="form-column-attlist" combine="interleave">
-    <ref name="common-form-control-attlist"/>
-    <ref name="label"/>
-    <ref name="text-style-name"/>
-</define>
-<define name="text-style-name">
-    <optional>
-        <attribute name="form:text-style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="controls" combine="choice">
-    <element name="form:value-range">
-        <ref name="form-value-range-attlist"/>
-        <ref name="common-form-control-content"/>
-    </element>
-</define>
-<define name="form-value-range-attlist" combine="interleave">
-    <ref name="form-control-attlist"/>
-    <ref name="common-disabled-attlist"/>
-    <ref name="common-printable-attlist"/>
-    <ref name="common-tab-attlist"/>
-    <ref name="common-title-attlist"/>
-    <ref name="common-value-attlist"/>
-</define>
-<define name="form-value-range-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:max-value">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-value-range-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:min-value">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-value-range-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:step-size" a:defaultName="1">
-            <ref name="positiveInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-value-range-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:page-step-size">
-            <ref name="positiveInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-value-range-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:delay-for-repeat">
-            <ref name="duration"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-value-range-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:orientation">
-            <choice>
-                <value>horizontal</value>
-                <value>vertical</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="controls" combine="choice">
-    <element name="form:generic-control">
-        <ref name="form-generic-control-attlist"/>
-        <ref name="common-form-control-content"/>
-    </element>
-</define>
-<define name="form-generic-control-attlist" combine="interleave">
-    <ref name="form-control-attlist"/>
-</define>
-<define name="common-form-control-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-form-control-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:control-implementation">
-            <ref name="namespacedToken"/>
-        </attribute>
-    </optional>
-</define>
-<define name="xforms-bind-attlist">
-    <optional>
-        <attribute name="xforms:bind">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="types">
-    <choice>
-        <value>submit</value>
-        <value>reset</value>
-        <value>push</value>
-        <value>url</value>
-    </choice>
-</define>
-<define name="button-type">
-    <optional>
-        <attribute name="form:button-type" a:defaultValue="push">
-            <ref name="types"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-control-id-attlist">
-    <attribute name="form:id">
-        <ref name="ID"/>
-    </attribute>
-</define>
-<define name="current-selected">
-    <optional>
-        <attribute name="form:current-selected" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-value-attlist">
-    <optional>
-        <attribute name="form:value">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-current-value-attlist">
-    <optional>
-        <attribute name="form:current-value">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-disabled-attlist">
-    <optional>
-        <attribute name="form:disabled" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="dropdown">
-    <optional>
-        <attribute name="form:dropdown" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="for">
-    <optional>
-        <attribute name="form:for">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="image-data">
-    <optional>
-        <attribute name="form:image-data">
-            <ref name="anyURI"/>
-        </attribute>
-    </optional>
-</define>
-<define name="label">
-    <optional>
-        <attribute name="form:label">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-maxlength-attlist">
-    <optional>
-        <attribute name="form:max-length">
-            <ref name="nonNegativeInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-printable-attlist">
-    <optional>
-        <attribute name="form:printable" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-readonly-attlist">
-    <optional>
-        <attribute name="form:readonly" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="selected">
-    <optional>
-        <attribute name="form:selected" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="size">
-    <optional>
-        <attribute name="form:size">
-            <ref name="nonNegativeInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-tab-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:tab-index" a:defaultValue="0">
-            <ref name="nonNegativeInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-tab-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:tab-stop" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="target-frame">
-    <optional>
-        <attribute name="office:target-frame" a:defaultValue="_blank">
-            <ref name="targetFrameName"/>
-        </attribute>
-    </optional>
-</define>
-<define name="target-location">
-    <optional>
-        <attribute name="xlink:href">
-            <ref name="anyURI"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-title-attlist">
-    <optional>
-        <attribute name="form:title"/>
-    </optional>
-</define>
-<define name="common-form-visual-effect-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:visual-effect">
-            <choice>
-                <value>flat</value>
-                <value>3d</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="common-form-relative-image-position-attlist"
-        combine="interleave">
-    <choice>
-        <optional>
-            <attribute name="form:image-position" a:defaultValue="center">
-                <value>center</value>
-            </attribute>
-        </optional>
-        <group>
-            <attribute name="form:image-position">
-                <choice>
-                    <value>start</value>
-                    <value>end</value>
-                    <value>top</value>
-                    <value>bottom</value>
-                </choice>
-            </attribute>
-            <optional>
-                <attribute name="form:image-align" a:defaultValue="center">
-                    <choice>
-                        <value>start</value>
-                        <value>center</value>
-                        <value>end</value>
-                    </choice>
-                </attribute>
-            </optional>
-        </group>
-    </choice>
-</define>
-<define name="bound-column">
-    <optional>
-        <attribute name="form:bound-column">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-convert-empty-attlist">
-    <optional>
-        <attribute name="form:convert-empty-to-null" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-data-field-attlist">
-    <optional>
-        <attribute name="form:data-field">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="list-source">
-    <optional>
-        <attribute name="form:list-source">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="list-source-type">
-    <optional>
-        <attribute name="form:list-source-type">
-            <choice>
-                <value>table</value>
-                <value>query</value>
-                <value>sql</value>
-                <value>sql-pass-through</value>
-                <value>value-list</value>
-                <value>table-fields</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="form-properties">
-    <element name="form:properties">
-        <oneOrMore>
-            <ref name="form-property"/>
-        </oneOrMore>
-    </element>
-</define>
-<define name="form-property" combine="choice">
-    <element name="form:property">
-        <ref name="form-property-name"/>
-        <ref name="form-property-value-and-type-attlist"/>
-    </element>
-</define>
-<define name="form-property-name" combine="interleave">
-    <attribute name="form:property-name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="form-property-value-and-type-attlist" combine="interleave">
-    <choice>
-        <ref name="common-value-and-type-attlist"/>
-        <attribute name="office:value-type">
-            <value>void</value>
-        </attribute>
-    </choice>
-</define>
-<define name="form-property" combine="choice">
-    <element name="form:list-property">
-        <ref name="form-property-name"/>
-        <ref name="form-property-type-and-value-list"/>
-    </element>
-</define>
-<define name="form-property-type-and-value-list">
-    <choice>
-        <group>
-            <attribute name="office:value-type">
-                <value>float</value>
-            </attribute>
-            <zeroOrMore>
-                <element name="form:list-value">
-                    <attribute name="office:value">
-                        <ref name="double"/>
-                    </attribute>
-                </element>
-            </zeroOrMore>
-        </group>
-        <group>
-            <attribute name="office:value-type">
-                <value>percentage</value>
-            </attribute>
-            <zeroOrMore>
-                <element name="form:list-value">
-                    <attribute name="office:value">
-                        <ref name="double"/>
-                    </attribute>
-                </element>
-            </zeroOrMore>
-        </group>
-        <group>
-            <attribute name="office:value-type">
-                <value>currency</value>
-            </attribute>
-            <zeroOrMore>
-                <element name="form:list-value">
-                    <attribute name="office:value">
-                        <ref name="double"/>
-                    </attribute>
-                    <optional>
-                        <attribute name="office:currency">
-                            <ref name="string"/>
-                        </attribute>
-                    </optional>
-                </element>
-            </zeroOrMore>
-        </group>
-        <group>
-            <attribute name="office:value-type">
-                <value>date</value>
-            </attribute>
-            <zeroOrMore>
-                <element name="form:list-value">
-                    <attribute name="office:date-value">
-                        <ref name="dateOrDateTime"/>
-                    </attribute>
-                </element>
-            </zeroOrMore>
-        </group>
-        <group>
-            <attribute name="office:value-type">
-                <value>time</value>
-            </attribute>
-            <zeroOrMore>
-                <element name="form:list-value">
-                    <attribute name="office:time-value">
-                        <ref name="duration"/>
-                    </attribute>
-                </element>
-            </zeroOrMore>
-        </group>
-        <group>
-            <attribute name="office:value-type">
-                <value>boolean</value>
-            </attribute>
-            <zeroOrMore>
-                <element name="form:list-value">
-                    <attribute name="office:boolean-value">
-                        <ref name="boolean"/>
-                    </attribute>
-                </element>
-            </zeroOrMore>
-        </group>
-        <group>
-            <attribute name="office:value-type">
-                <value>string</value>
-            </attribute>
-            <zeroOrMore>
-                <element name="form:list-value">
-                    <attribute name="office:string-value">
-                        <ref name="string"/>
-                    </attribute>
-                </element>
-            </zeroOrMore>
-        </group>
-        <attribute name="office:value-type">
-            <value>void</value>
-        </attribute>
-    </choice>
-</define>
-<define name="office-annotation">
-    <element name="office:annotation">
-        <ref name="office-annotation-attlist"/>
-        <ref name="draw-caption-attlist"/>
-        <ref name="common-draw-position-attlist"/>
-        <ref name="common-draw-size-attlist"/>
-        <ref name="common-draw-shape-with-text-and-styles-attlist"/>
-        <optional>
-            <ref name="dc-creator"/>
-        </optional>
-        <optional>
-            <ref name="dc-date"/>
-        </optional>
-        <optional>
-            <ref name="meta-date-string"/>
-        </optional>
-        <zeroOrMore>
-            <choice>
-                <ref name="text-p"/>
-                <ref name="text-list"/>
-            </choice>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="office-annotation-attlist" combine="interleave">
-    <optional>
-        <attribute name="office:display">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="meta-date-string">
-    <element name="meta:date-string">
-        <ref name="string"/>
-    </element>
-</define>
-<define name="common-num-format-prefix-suffix-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:num-prefix">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:num-suffix">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-num-format-attlist" combine="interleave">
-    <choice>
-        <attribute name="style:num-format">
-            <choice>
-                <value>1</value>
-                <value>i</value>
-                <value>I</value>
-                <ref name="string"/>
-                <empty/>
-            </choice>
-        </attribute>
-        <group>
-            <attribute name="style:num-format">
-                <choice>
-                    <value>a</value>
-                    <value>A</value>
-                </choice>
-            </attribute>
-            <ref name="style-num-letter-sync-attlist"/>
-        </group>
-        <empty/>
-    </choice>
-</define>
-<define name="style-num-letter-sync-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:num-letter-sync">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="office-change-info">
-    <element name="office:change-info">
-        <ref name="dc-creator"/>
-        <ref name="dc-date"/>
-        <zeroOrMore>
-            <ref name="text-p"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="office-event-listeners">
-    <element name="office:event-listeners">
-        <zeroOrMore>
-            <choice>
-                <ref name="script-event-listener"/>
-                <ref name="presentation-event-listener"/>
-            </choice>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="script-event-listener" combine="interleave">
-    <element name="script:event-listener">
-        <ref name="script-event-listener-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="script-event-listener-attlist" combine="interleave">
-    <attribute name="script:event-name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="script-event-listener-attlist" combine="interleave">
-    <attribute name="script:language">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="script-event-listener-attlist" combine="interleave">
-    <choice>
-        <attribute name="script:macro-name">
-            <ref name="string"/>
-        </attribute>
-        <group>
-            <attribute name="xlink:href">
-                <ref name="anyURI"/>
-            </attribute>
-            <optional>
-                <attribute name="xlink:type" a:defaultValue="simple">
-                    <value>simple</value>
-                </attribute>
-            </optional>
-            <optional>
-                <attribute name="xlink:actuate" a:defaultValue="onRequest">
-                    <value>onRequest</value>
-                </attribute>
-            </optional>
-        </group>
-    </choice>
-</define>
-<define name="math-math">
-    <element name="math:math">
-        <ref name="mathMarkup"/>
-    </element>
-</define>
-
-<!-- To avoid inclusion of the complete MathML schema, anything -->
-<!-- is allowed within a math:math top-level element            -->
-<define name="mathMarkup">
-    <zeroOrMore>
-        <choice>
-            <attribute>
-                <anyName/>
-            </attribute>
-            <text/>
-            <element>
-                <anyName/>
-                <ref name="mathMarkup"/>
-            </element>
-        </choice>
-    </zeroOrMore>
-</define>
-<define name="text-dde-connection-decl">
-    <element name="text:dde-connection-decl">
-        <ref name="text-dde-connection-decl-attlist"/>
-        <ref name="common-dde-connection-decl-attlist"/>
-    </element>
-</define>
-<define name="text-dde-connection-decl-attlist" combine="interleave">
-    <attribute name="office:name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="common-dde-connection-decl-attlist" combine="interleave">
-    <attribute name="office:dde-application">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="common-dde-connection-decl-attlist" combine="interleave">
-    <attribute name="office:dde-topic">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="common-dde-connection-decl-attlist" combine="interleave">
-    <attribute name="office:dde-item">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="common-dde-connection-decl-attlist" combine="interleave">
-    <optional>
-        <attribute name="office:automatic-update" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-dde-link">
-    <element name="table:dde-link">
-        <ref name="office-dde-source"/>
-        <ref name="table-table"/>
-    </element>
-</define>
-<define name="office-dde-source">
-    <element name="office:dde-source">
-        <ref name="office-dde-source-attlist"/>
-        <ref name="common-dde-connection-decl-attlist"/>
-    </element>
-</define>
-<define name="office-dde-source-attlist" combine="interleave">
-    <optional>
-        <attribute name="office:name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="office-dde-source-attlist" combine="interleave">
-    <optional>
-        <attribute name="office:conversion-mode" 
-                    a:defaultValue="into-default-style-data-style">
-            <choice>
-                <value>into-default-style-data-style</value>
-                <value>into-english-number</value>
-                <value>keep-text</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="animation-element" combine="choice">
-    <element name="anim:animate">
-        <ref name="common-anim-target-attlist"/>
-        <ref name="common-anim-named-target-attlist"/>
-        <ref name="common-anim-values-attlist"/>
-        <ref name="common-anim-spline-mode-attlist"/>
-        <ref name="common-spline-anim-value-attlist"/>
-        <ref name="common-repeat-timing-attlist"/>
-        <ref name="common-fill-timing-attlist"/>
-        <ref name="common-anim-add-accum-attlist"/>
-    </element>
-</define>
-<define name="animation-element" combine="choice">
-    <element name="anim:set">
-        <ref name="common-anim-target-attlist"/>
-        <ref name="common-anim-named-target-attlist"/>
-        <ref name="common-anim-set-values-attlist"/>
-        <ref name="common-fill-timing-attlist"/>
-        <ref name="common-anim-add-accum-attlist"/>
-    </element>
-</define>
-<define name="animation-element" combine="choice">
-    <element name="anim:animateMotion">
-        <ref name="anim-animate-motion-attlist"/>
-        <ref name="common-anim-target-attlist"/>
-        <ref name="common-anim-named-target-attlist"/>
-        <ref name="common-anim-add-accum-attlist"/>
-        <ref name="common-anim-values-attlist"/>
-        <ref name="common-fill-timing-attlist"/>
-        <ref name="common-spline-anim-value-attlist"/>
-    </element>
-</define>
-<define name="anim-animate-motion-attlist" combine="interleave">
-    <optional>
-        <attribute name="svg:path">
-            <ref name="pathData"/>
-        </attribute>
-    </optional>
-</define>
-<define name="anim-animate-motion-attlist" combine="interleave">
-    <optional>
-        <attribute name="svg:origin">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="anim-animate-motion-attlist" combine="interleave">
-    <optional>
-        <attribute name="smil:calcMode" a:defaultValue="paced">   
-            <choice>
-                <value>discrete</value>
-                <value>linear</value>
-                <value>paced</value>
-                <value>spline</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="animation-element" combine="choice">
-    <element name="anim:animateColor">
-        <ref name="common-anim-target-attlist"/>
-        <ref name="common-anim-named-target-attlist"/>
-        <ref name="common-anim-add-accum-attlist"/>
-        <ref name="common-anim-values-attlist"/>
-        <ref name="common-anim-spline-mode-attlist"/>
-        <ref name="common-spline-anim-value-attlist"/>
-        <ref name="anim-animate-color-attlist"/>
-        <ref name="common-fill-timing-attlist"/>
-    </element>
-</define>
-<define name="anim-animate-color-attlist" combine="interleave">
-    <optional>
-        <attribute name="anim:color-interpolation" a:defaultValue="rgb">
-            <choice>
-                <value>rgb</value>
-                <value>hsl</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="anim-animate-color-attlist" combine="interleave">
-    <optional>
-        <attribute name="anim:color-interpolation-direction"     
-                                   a:defaultValue="clockwise">
-            <choice>
-                <value>clockwise</value>
-                <value>counter-clockwise</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="animation-element" combine="choice">
-    <element name="anim:animateTransform">
-        <ref name="common-anim-target-attlist"/>
-        <ref name="common-anim-named-target-attlist"/>
-        <ref name="common-anim-add-accum-attlist"/>
-        <ref name="common-anim-values-attlist"/>
-        <ref name="anim-animate-transform-attlist"/>
-        <ref name="common-fill-timing-attlist"/>
-    </element>
-</define>
-<define name="anim-animate-transform-attlist" combine="interleave">
-    <attribute name="svg:type">
-        <choice>
-            <value>translate</value>
-            <value>scale</value>
-            <value>rotate</value>
-            <value>skewX</value>
-            <value>skewY</value> 
-        </choice>
-    </attribute>
-</define>
-<define name="animation-element" combine="choice">
-    <element name="anim:transitionFilter">
-        <ref name="common-anim-target-attlist"/>
-        <ref name="common-anim-add-accum-attlist"/>
-        <ref name="common-anim-values-attlist"/>
-        <ref name="common-anim-spline-mode-attlist "/>
-        <ref name="anim-transition-filter-attlist"/>
-        <ref name="common-fill-timing-attlist"/>
-    </element>
-</define>
-<define name="anim-transition-filter-attlist" combine="interleave">
-    <attribute name="smil:type">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="anim-transition-filter-attlist" combine="interleave">
-    <optional>
-        <attribute name="smil:subtype">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="anim-transition-filter-attlist" combine="interleave">
-    <optional>
-        <attribute name="smil:direction" a:defaultValue="forward">
-            <choice>
-                <value>forward</value>
-                <value>reverse</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="anim-transition-filter-attlist" combine="interleave">
-    <optional>
-        <attribute name="smil:fadeColor">
-            <choice>
-                <value>forward</value>
-                <value>reverse</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="anim-transition-filter-attlist" combine="interleave">
-    <optional>
-        <attribute name="smil:mode" a:defaultValue="in">
-            <choice>
-                <value>in</value>
-                <value>out</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="common-anim-attlist" combine="interleave">
-    <optional>
-        <attribute name="anim:id">
-            <ref name="ID"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-anim-target-attlist" combine="interleave">
-    <optional>
-        <attribute name="smil:targetElement">
-            <ref name="IDREF"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-anim-named-target-attlist" combine="interleave">
-    <attribute name="smil:attributeName">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="common-anim-target-attlist" combine="interleave">
-    <optional>
-        <attribute name="anim:sub-item">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-anim-values-attlist" combine="interleave">
-    <optional>
-        <attribute name="smil:values">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-anim-spline-mode-attlist" combine="interleave">
-    <optional>
-        <attribute name="smil:calcMode" a:defaultValue="discrete">   
-            <choice>
-                <value>discrete</value>
-                <value>linear</value>
-                <value>paced</value>
-                <value>spline</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="common-spline-anim-value-attlist" combine="interleave">
-    <optional>
-        <attribute name="smil:keyTimes">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-spline-anim-value-attlist" combine="interleave">
-    <optional>
-        <attribute name="smil:keySplines">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-anim-add-accum-attlist" combine="interleave">
-    <optional>
-        <attribute name="smil:accumulate">
-            <choice>
-                <value>none</value>
-                <value>sum</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="common-anim-add-accum-attlist" combine="interleave">
-    <optional>
-        <attribute name="smil:additive">
-            <choice>
-                <value>replace</value>
-                <value>sum</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="common-anim-values-attlist" combine="interleave">
-    <optional>
-        <attribute name="anim:formula">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-anim-set-values-attlist" combine="interleave">
-    <optional>
-        <attribute name="smil:to">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-
-<define name="common-anim-values-attlist" combine="interleave">
-    <ref name="common-anim-set-values-attlist"/>
-    <optional>
-        <attribute name="smil:from">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="smil:by">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-begin-end-timing-attlist" combine="interleave">
-    <optional>
-        <attribute name="smil:begin">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-begin-end-timing-attlist" combine="interleave">
-    <optional>
-        <attribute name="smil:end">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-dur-timing-attlist" combine="interleave">
-    <optional>
-        <attribute name="smil:dur">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-endsync-timing-attlist" combine="interleave">
-    <optional>
-        <attribute name="smil:endsync">
-            <choice>
-                <value>first</value>
-                <value>last</value>
-                <value>all</value>
-                <value>media</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="common-repeat-timing-attlist" combine="interleave">
-    <optional>
-        <attribute name="smil:repeatDur">
-            <ref name="string"/>
-        </attribute>
-        <attribute name="smil:repeatCount">
-            <ref name="nonNegativeInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-fill-timing-attlist" combine="interleave">
-    <optional>
-        <attribute name="smil:fill">
-            <choice>
-                <value>remove</value>
-                <value>freeze</value>
-                <value>hold</value>
-                <value>auto</value>
-                <value>default</value>
-                <value>transition</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="common-fill-default-attlist" combine="interleave">
-    <optional>
-        <attribute name="smil:fillDefault">
-            <choice>
-                <value>remove</value>
-                <value>freeze</value>
-                <value>hold</value>
-                <value>transition</value>
-                <value>auto</value>
-                <value>inherit</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="common-restart-timing-attlist" combine="interleave">
-    <optional>
-        <attribute name="smil:restart" a:defaultValue="default">
-            <choice>
-                <value>never</value>
-                <value>always</value>
-                <value>whenNotActive</value>
-                <value>default</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="common-restart-default-attlist" combine="interleave">
-    <optional>
-        <attribute name="smil:restartDefault" a:defaultValue="inherit">
-            <choice>
-                <value>never</value>
-                <value>always</value>
-                <value>whenNotActive</value>
-                <value>inherit</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="common-time-manip-attlist" combine="interleave">
-    <optional>    
-        <attribute name="smil:accelerate" a:defaultValue="0.0">
-            <ref name="double"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-time-manip-attlist" combine="interleave">
-    <optional>
-        <attribute name="smil:decelerate" a:defaultValue="0.0">
-            <ref name="double"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-time-manip-attlist" combine="interleave">
-    <optional>
-        <attribute name="smil:autoReverse" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="animation-element" combine="choice">
-    <element name="anim:par">
-        <ref name="common-anim-attlist"/>
-        <ref name="common-timing-attlist"/>
-        <ref name="common-endsync-timing-attlist"/>
-        <zeroOrMore>
-            <ref name="animation-element"/>
-        </zeroOrMore>
-    </element>
-</define>
-
-<define name="common-basic-timing-attlist" combine="interleave">
-   <ref name="common-begin-end-timing-attlist"/>
-   <ref name="common-dur-timing-attlist"/>
-   <ref name="common-repeat-timing-attlist"/>
-</define>
-
-<define name="common-timing-attlist" combine="interleave">
-   <ref name="common-basic-timing-attlist"/>
-   <ref name="common-restart-timing-attlist"/>
-   <ref name="common-restart-default-attlist"/>
-   <ref name="common-fill-timing-attlist"/>
-   <ref name="common-fill-default-attlist"/>
-   <ref name="common-time-manip-attlist"/>
-</define>
-<define name="animation-element" combine="choice">
-    <element name="anim:seq">
-        <ref name="common-anim-attlist"/>
-        <ref name="common-endsync-timing-attlist"/>
-        <ref name="common-timing-attlist"/>
-    </element>
-</define>
-<define name="animation-element" combine="choice">
-    <element name="anim:iterate">
-        <ref name="common-anim-attlist"/>
-        <ref name="anin-iterate-attlist"/>
-        <ref name="common-timing-attlist"/>
-        <ref name="common-endsync-timing-attlist"/>
-        <zeroOrMore>
-            <ref name="animation-element"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="anin-iterate-attlist" combine="interleave">
-    <optional>
-        <attribute name="smil:targetElement">
-            <ref name="IDREF"/>
-        </attribute>
-    </optional>
-</define>
-<define name="anin-iterate-attlist" combine="interleave">
-    <optional>
-        <attribute name="anim:iterate-type">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="anin-iterate-attlist" combine="interleave">
-    <optional>
-        <attribute name="anim:iterate-interval">
-            <ref name="duration"/>
-        </attribute>
-    </optional>
-</define>
-<define name="animation-element" combine="choice">
-    <element name="anim:audio">
-        <ref name="common-anim-attlist"/>
-        <ref name="anim-audio-attlist"/>
-        <ref name="common-basic-timing-attlist"/>
-    </element>
-</define>
-<define name="anim-audio-attlist" combine="interleave">
-    <optional>
-        <attribute name="xlink:href">
-            <ref name="anyURI"/>
-        </attribute>
-    </optional>
-</define>
-<define name="anim-audio-attlist" combine="interleave">
-    <optional>
-        <attribute name="anim:audio-level">
-            <ref name="double"/>
-        </attribute>
-    </optional>
-</define>
-<define name="animation-element" combine="choice">
-    <element name="anim:command">
-        <ref name="common-anim-attlist"/>
-        <ref name="anim-command-attlist"/>
-        <ref name="common-begin-end-timing-attlist"/>
-        <ref name="common-anim-target-attlist"/>
-        <zeroOrMore>
-            <element name="anim:param">
-                <attribute name="anim:name"/>
-                <attribute name="anim:value"/>
-            </element>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="anim-command-attlist" combine="interleave">
-    <attribute name="anim:command">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="style-style">
-    <element name="style:style">
-        <ref name="style-style-attlist"/>
-        <ref name="style-style-content"/>
-        <zeroOrMore>
-            <ref name="style-map"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="style-style-attlist" combine="interleave">
-    <attribute name="style:name">
-        <ref name="styleName"/>
-    </attribute>
-</define>
-<define name="style-style-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:display-name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-style-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:parent-style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-style-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:next-style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-style-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:list-style-name">
-            <choice>
-                <ref name="styleName"/>
-                <empty/>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-style-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:master-page-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-style-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:auto-update" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-style-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:data-style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-style-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:class">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-style-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:default-outline-level">
-            <ref name="positiveInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-map">
-    <element name="style:map">
-        <ref name="style-map-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="style-map-attlist" combine="interleave">
-    <attribute name="style:condition">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="style-map-attlist" combine="interleave">
-    <attribute name="style:apply-style-name">
-        <ref name="styleNameRef"/>
-    </attribute>
-</define>
-<define name="style-map-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:base-cell-address">
-            <ref name="cellAddress"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-default-style">
-    <element name="style:default-style">
-        <ref name="style-style-content"/>
-    </element>
-</define>
-<define name="style-page-layout">
-    <element name="style:page-layout">
-        <ref name="style-page-layout-attlist"/>
-        <optional>
-            <ref name="style-page-layout-properties"/>
-        </optional>
-        <optional>
-            <ref name="style-header-style"/>
-        </optional>
-        <optional>
-            <ref name="style-footer-style"/>
-        </optional>
-    </element>
-</define>
-<define name="style-page-layout-attlist" combine="interleave">
-    <attribute name="style:name">
-        <ref name="styleName"/>
-    </attribute>
-</define>
-<define name="style-page-layout-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:page-usage" a:defaultValue="all">
-            <choice>
-                <value>all</value>
-                <value>left</value>
-                <value>right</value>
-                <value>mirrored</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-header-style">
-    <element name="style:header-style">
-        <optional>
-            <ref name="style-header-footer-properties"/>
-        </optional>
-    </element>
-</define>
-<define name="style-footer-style">
-    <element name="style:footer-style">
-        <optional>
-            <ref name="style-header-footer-properties"/>
-        </optional>
-    </element>
-</define>
-<define name="style-master-page">
-    <element name="style:master-page">
-        <ref name="style-master-page-attlist"/>
-        <optional>
-            <ref name="style-header"/>
-            <optional>
-                <ref name="style-header-left"/>
-            </optional>
-        </optional>
-        <optional>
-            <ref name="style-footer"/>
-            <optional>
-                <ref name="style-footer-left"/>
-            </optional>
-        </optional>
-        <optional>
-            <ref name="office-forms"/>
-        </optional>
-        <zeroOrMore>
-            <ref name="style-style"/>
-        </zeroOrMore>
-        <zeroOrMore>
-            <ref name="shape"/>
-        </zeroOrMore>
-        <optional>
-            <ref name="presentation-notes"/>
-        </optional>
-    </element>
-</define>
-<define name="style-master-page-attlist" combine="interleave">
-    <attribute name="style:name">
-        <ref name="styleName"/>
-    </attribute>
-</define>
-<define name="style-master-page-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:display-name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-master-page-attlist" combine="interleave">
-    <attribute name="style:page-layout-name">
-        <ref name="styleNameRef"/>
-    </attribute>
-</define>
-<define name="style-master-page-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-master-page-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:next-style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-header">
-    <element name="style:header">
-        <ref name="common-style-header-footer-attlist"/>
-        <ref name="header-footer-content"/>
-    </element>
-</define>
-<define name="style-footer">
-    <element name="style:footer">
-        <ref name="common-style-header-footer-attlist"/>
-        <ref name="header-footer-content"/>
-    </element>
-</define>
-<define name="style-header-left">
-    <element name="style:header-left">
-        <ref name="common-style-header-footer-attlist"/>
-        <ref name="header-footer-content"/>
-    </element>
-</define>
-<define name="style-footer-left">
-    <element name="style:footer-left">
-        <ref name="common-style-header-footer-attlist"/>
-        <ref name="header-footer-content"/>
-    </element>
-</define>
-<define name="header-footer-content">
-    <choice>
-        <group>
-            <ref name="text-decls"/>
-            <zeroOrMore>
-                <choice>
-                    <ref name="text-h"/>
-                    <ref name="text-p"/>
-                    <ref name="text-list"/>
-                    <ref name="table-table"/>
-                    <ref name="text-section"/>
-                    <ref name="text-table-of-content"/>
-                    <ref name="text-illustration-index"/>
-                    <ref name="text-table-index"/>
-                    <ref name="text-object-index"/>
-                    <ref name="text-user-index"/>
-                    <ref name="text-alphabetical-index"/>
-                    <ref name="text-bibliography"/>
-                    <ref name="text-index-title"/>
-                    <ref name="change-marks"/>
-                </choice>
-            </zeroOrMore>
-        </group>
-        <group>
-            <optional>
-                <ref name="style-region-left"/>
-            </optional>
-            <optional>
-                <ref name="style-region-center"/>
-            </optional>
-            <optional>
-                <ref name="style-region-right"/>
-            </optional>
-        </group>
-    </choice>
-</define>
-<define name="common-style-header-footer-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:display" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-region-left">
-    <element name="style:region-left">
-        <ref name="region-content"/>
-    </element>
-</define>
-<define name="style-region-center">
-    <element name="style:region-center">
-        <ref name="region-content"/>
-    </element>
-</define>
-<define name="style-region-right">
-    <element name="style:region-right">
-        <ref name="region-content"/>
-    </element>
-</define>
-
-<define name="region-content">
-    <zeroOrMore>
-        <ref name="text-p"/>
-    </zeroOrMore>
-</define>
-<define name="presentation-notes">
-    <element name="presentation:notes">
-        <ref name="common-presentation-header-footer-attlist"/>
-        <ref name="presentation-notes-attlist"/>
-        <zeroOrMore>
-            <ref name="shape"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="presentation-notes-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:page-layout-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="presentation-notes-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-table-template">
-    <element name="table:table-template">
-        <ref name="table-table-template-attlist"/>
-        <optional>
-            <ref name="table-first-row"/>
-        </optional>
-        <optional>
-            <ref name="table-last-row"/>
-        </optional>
-        <optional>
-            <ref name="table-first-column"/>
-        </optional>
-        <optional>
-            <ref name="table-last-column"/>
-        </optional>
-        <choice>
-            <ref name="table-body"/>
-            <group>
-                <ref name="table-even-rows"/>
-                <ref name="table-odd-rows"/>
-            </group>
-            <group>
-                <ref name="table-even-columns"/>
-                <ref name="table-odd-columns"/>
-            </group>
-        </choice>
-    </element>
-</define>
-<define name="table-table-template-attlist" combine="interleave">
-    <attribute name="text:name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="table-table-template-attlist" combine="interleave">
-    <attribute name="text:first-row-start-column">
-        <ref name="rowOrCol"/>
-    </attribute>
-</define>
-
-<define name="table-table-template-attlist" combine="interleave">
-    <attribute name="text:first-row-end-column">
-        <ref name="rowOrCol"/>
-    </attribute>
-</define>
-
-<define name="table-table-template-attlist" combine="interleave">
-    <attribute name="text:last-row-start-column">
-        <ref name="rowOrCol"/>
-    </attribute>
-</define>
-
-<define name="table-table-template-attlist" combine="interleave">
-    <attribute name="text:last-row-end-column">
-        <ref name="rowOrCol"/>
-    </attribute>
-</define>
-
-<define name="rowOrCol">
-    <choice>
-        <value>row</value>
-        <value>column</value>
-    </choice>
-</define>
-<define name="table-first-row">
-    <element name="table:first-row">
-        <ref name="common-table-template-attlist"/>
-        <empty/>
-    </element>
-</define>
-
-<define name="table-last-row">
-    <element name="table:last-row">
-        <ref name="common-table-template-attlist"/>
-        <empty/>
-    </element>
-</define>
-
-<define name="table-first-column">
-    <element name="table:first-column">
-        <ref name="common-table-template-attlist"/>
-        <empty/>
-    </element>
-</define>
-
-<define name="table-last-column">
-    <element name="table:last-column">
-        <ref name="common-table-template-attlist"/>
-        <empty/>
-    </element>
-</define>
-
-<define name="table-body">
-    <element name="table:body">
-        <ref name="common-table-template-attlist"/>
-        <empty/>
-    </element>
-</define>
-
-<define name="table-even-rows">
-    <element name="table:even-rows">
-        <ref name="common-table-template-attlist"/>
-        <empty/>
-    </element>
-</define>
-
-<define name="table-odd-rows">
-    <element name="table:odd-rows">
-        <ref name="common-table-template-attlist"/>
-        <empty/>
-    </element>
-</define>
-
-<define name="table-even-columns">
-    <element name="table:even-columns">
-        <ref name="common-table-template-attlist"/>
-        <empty/>
-    </element>
-</define>
-
-<define name="table-odd-columns">
-    <element name="table:odd-columns">
-        <ref name="common-table-template-attlist"/>
-        <empty/>
-    </element>
-</define>
-
-<define name="common-table-template-attlist" combine="interleave">
-    <attribute name="text:style-name">
-        <ref name="styleNameRef"/>
-    </attribute>
-</define>
-<define name="style-font-face">
-    <element name="style:font-face">
-        <ref name="style-font-face-attlist"/>
-        <optional>
-            <ref name="svg-font-face-src"/>
-        </optional>
-        <optional>
-            <ref name="svg-definition-src"/>
-        </optional>
-    </element>
-</define>
-<define name="style-font-face-attlist" combine="interleave">
-    <optional>
-        <attribute name="svg:font-family">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:font-style">
-            <ref name="fontStyle"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:font-variant">
-            <ref name="fontVariant"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:font-weight">
-            <ref name="fontWeight"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:font-stretch">
-            <choice>
-                <value>normal</value>
-                <value>ultra-condensed</value>
-                <value>extra-condensed</value>
-                <value>condensed</value>
-                <value>semi-condensed</value>
-                <value>semi-expanded</value>
-                <value>expanded</value>
-                <value>extra-expanded</value>
-                <value>ultra-expanded</value>
-            </choice>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:font-size">
-            <ref name="positiveLength"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:unicode-range"/>
-    </optional>
-    <optional>
-        <attribute name="svg:units-per-em">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:panose-1"/>
-    </optional>
-    <optional>
-        <attribute name="svg:stemv">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:stemh">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:slope">
-            <ref name="integer"/>
-        </attribute>
-        </optional>
-    <optional>
-        <attribute name="svg:cap-height">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:x-height">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:accent-height">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:ascent">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:descent">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:widths"/>
-    </optional>
-    <optional>
-        <attribute name="svg:bbox"/>
-    </optional>
-    <optional>
-        <attribute name="svg:ideographic">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:alphabetic">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:mathematical">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:hanging">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:v-ideographic">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:v-alphabetic">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:v-mathematical">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:v-hanging">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:underline-position">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:underline-thickness">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:strikethrough-position">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:strikethrough-thickness">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:overline-position">
-            <ref name="integer"/>
-        </attribute>
-        </optional>
-    <optional>
-        <attribute name="svg:overline-thickness">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-</define>
-
-<define name="svg-font-face-src">
-    <element name="svg:font-face-src">
-        <oneOrMore>
-            <choice>
-                <ref name="svg-font-face-uri"/>
-                <ref name="svg-font-face-name"/>
-            </choice>
-        </oneOrMore>
-    </element>
-</define>
-
-<define name="svg-font-face-uri">
-    <element name="svg:font-face-uri">
-        <ref name="common-svg-font-face-xlink-attlist"/>
-        <zeroOrMore>
-            <ref name="svg-font-face-format"/>
-        </zeroOrMore>
-    </element>
-</define>
-
-<define name="svg-font-face-format">
-    <element name="svg:font-face-format">
-        <optional>
-            <attribute name="svg:string"/>
-        </optional>
-        <empty/>
-    </element>
-</define>
-<define name="svg-font-face-name">
-    <element name="svg:font-face-name">
-        <optional>
-            <attribute name="name"/>
-        </optional>
-        <empty/>
-    </element>
-</define>
-
-<define name="svg-definition-src">
-    <element name="svg:definition-src">
-        <ref name="common-svg-font-face-xlink-attlist"/>
-    <empty/>
-    </element>
-</define>
-
-<define name="common-svg-font-face-xlink-attlist" combine="interleave">
-    <attribute name="xlink:href">
-        <ref name="anyURI"/>
-    </attribute>
-    <optional>
-        <attribute name="xlink:type" a:defaultValue="simple">
-            <value>simple</value>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="xlink:actuate" a:defaultValue="onRequest">
-            <value>onRequest</value>
-        </attribute>
-    </optional>
-</define>
-<define name="style-font-face-attlist" combine="interleave">
-    <attribute name="style:name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="style-font-face-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:font-adornments">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-font-face-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:font-family-generic">
-            <ref name="fontFamilyGeneric"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-font-face-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:font-pitch">
-            <ref name="fontPitch"/>
-        </attribute>
-    </optional>
-</define>
-
-<define name="style-font-face-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:font-charset">
-            <ref name="textEncoding"/>
-        </attribute>
-    </optional>
-</define>
-<define name="number-number-style">
-    <element name="number:number-style">
-        <ref name="common-data-style-attlist"/>
-        <optional>
-            <ref name="style-text-properties"/>
-        </optional>
-        <optional>
-            <ref name="number-text"/>
-        </optional>
-        <optional>
-            <ref name="any-number"/>
-            <optional>
-                <ref name="number-text"/>
-            </optional>
-        </optional>
-        <zeroOrMore>
-            <ref name="style-map"/>
-        </zeroOrMore>
-    </element>
-</define>
-
-<define name="any-number">
-    <choice>
-        <ref name="number-number"/>
-        <ref name="number-scientific-number"/>
-        <ref name="number-fraction"/>
-    </choice>
-</define>
-<define name="number-number">
-    <element name="number:number">
-        <ref name="number-number-attlist"/>
-        <ref name="common-decimal-places-attlist"/>
-        <ref name="common-number-attlist"/>
-        <zeroOrMore>
-            <ref name="number-embedded-text"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="number-number-attlist" combine="interleave">
-    <optional>
-        <attribute name="number:decimal-replacement"/>
-    </optional>
-</define>
-<define name="number-number-attlist" combine="interleave">
-    <optional>
-        <attribute name="number:display-factor" a:defaultValue="1">
-            <ref name="double"/>
-        </attribute>
-    </optional>
-</define>
-<define name="number-embedded-text">
-    <element name="number:embedded-text">
-        <ref name="number-embedded-text-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="number-embedded-text-attlist" combine="interleave">
-    <attribute name="number:position">
-        <ref name="integer"/>
-    </attribute>
-</define>
-<define name="number-scientific-number">
-    <element name="number:scientific-number">
-        <ref name="number-scientific-number-attlist"/>
-        <ref name="common-decimal-places-attlist"/>
-        <ref name="common-number-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="number-scientific-number-attlist" combine="interleave">
-    <optional>
-        <attribute name="number:min-exponent-digits">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-</define>
-<define name="number-fraction">
-    <element name="number:fraction">
-        <ref name="number-fraction-attlist"/>
-        <ref name="common-number-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="number-fraction-attlist" combine="interleave">
-    <optional>
-        <attribute name="number:min-numerator-digits">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-</define>
-<define name="number-fraction-attlist" combine="interleave">
-    <optional>
-        <attribute name="number:min-denominator-digits">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-</define>
-<define name="number-fraction-attlist" combine="interleave">
-    <optional>
-        <attribute name="number:denominator-value">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-</define>
-<define name="number-currency-style">
-    <element name="number:currency-style">
-        <ref name="common-data-style-attlist"/>
-        <ref name="common-auto-reorder-attlist"/>
-        <optional>
-            <ref name="style-text-properties"/>
-        </optional>
-        <optional>
-            <ref name="number-text"/>
-        </optional>
-        <optional>
-            <choice>
-                <group>
-                    <ref name="number-and-text"/>
-                    <optional>
-                        <ref name="currency-symbol-and-text"/>
-                    </optional>
-                </group>
-                <group>
-                    <ref name="currency-symbol-and-text"/>
-                    <optional>
-                        <ref name="number-and-text"/>
-                    </optional>
-                </group>
-            </choice>
-        </optional>
-        <zeroOrMore>
-            <ref name="style-map"/>
-        </zeroOrMore>
-    </element>
-</define>
-
-<define name="currency-symbol-and-text">
-    <ref name="number-currency-symbol"/>
-    <optional>
-        <ref name="number-text"/>
-    </optional>
-</define>
-<define name="number-and-text">
-    <ref name="number-number"/>
-    <optional>
-        <ref name="number-text"/>
-    </optional>
-</define>
-<define name="number-currency-symbol">
-    <element name="number:currency-symbol">
-        <ref name="number-currency-symbol-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="number-currency-symbol-attlist" combine="interleave">
-    <optional>
-        <attribute name="number:language">
-            <ref name="languageCode"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="number:country">
-            <ref name="countryCode"/>
-        </attribute>
-    </optional>
-</define>
-<define name="number-percentage-style">
-    <element name="number:percentage-style">
-        <ref name="common-data-style-attlist"/>
-        <optional>
-            <ref name="style-text-properties"/>
-        </optional>
-        <optional>
-            <ref name="number-text"/>
-        </optional>
-        <optional>
-            <ref name="number-and-text"/>
-        </optional>
-        <zeroOrMore>
-            <ref name="style-map"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="number-date-style">
-    <element name="number:date-style">
-        <ref name="common-data-style-attlist"/>
-        <ref name="common-auto-reorder-attlist"/>
-        <ref name="common-format-source-attlist"/>
-        <optional>
-            <ref name="style-text-properties"/>
-        </optional>
-        <!-- This DTD does not reflect the fact that some elements must not -->
-        <!-- occur more than once. -->
-        <optional>
-            <ref name="number-text"/>
-        </optional>
-        <oneOrMore>
-            <ref name="any-date"/>
-            <optional>
-                <ref name="number-text"/>
-            </optional>
-        </oneOrMore>
-        <zeroOrMore>
-            <ref name="style-map"/>
-        </zeroOrMore>
-    </element>
-</define>
-
-<define name="any-date">
-    <choice>
-        <ref name="number-day"/>
-        <ref name="number-month"/>
-        <ref name="number-year"/>
-        <ref name="number-era"/>
-        <ref name="number-day-of-week"/>
-        <ref name="number-week-of-year"/>
-        <ref name="number-quarter"/>
-        <ref name="number-hours"/>
-        <ref name="number-am-pm"/>
-        <ref name="number-minutes"/>
-        <ref name="number-seconds"/>
-    </choice>
-</define>
-<define name="number-day">
-    <element name="number:day">
-        <ref name="number-day-attlist"/>
-        <ref name="common-calendar-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="number-day-attlist" combine="interleave">
-    <optional>
-        <attribute name="number:style" a:defaultValue="short">
-            <choice>
-                <value>short</value>
-                <value>long</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="number-month">
-    <element name="number:month">
-        <ref name="number-month-attlist"/>
-        <ref name="common-calendar-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="number-month-attlist" combine="interleave">
-    <optional>
-        <attribute name="number:textual" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="number-month-attlist" combine="interleave">
-    <optional>
-        <attribute name="number:possessive-form" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="number-month-attlist" combine="interleave">
-    <optional>
-        <attribute name="number:style" a:defaultValue="short">
-            <choice>
-                <value>short</value>
-                <value>long</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="number-year">
-    <element name="number:year">
-        <ref name="number-year-attlist"/>
-        <ref name="common-calendar-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="number-year-attlist" combine="interleave">
-    <optional>
-        <attribute name="number:style" a:defaultValue="short">
-            <choice>
-                <value>short</value>
-                <value>long</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="number-era">
-    <element name="number:era">
-        <ref name="number-era-attlist"/>
-        <ref name="common-calendar-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="number-era-attlist" combine="interleave">
-    <optional>
-        <attribute name="number:style" a:defaultValue="short">
-            <choice>
-                <value>short</value>
-                <value>long</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="number-day-of-week">
-    <element name="number:day-of-week">
-        <ref name="number-day-of-week-attlist"/>
-        <ref name="common-calendar-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="number-day-of-week-attlist" combine="interleave">
-    <optional>
-        <attribute name="number:style" a:defaultValue="short">
-            <choice>
-                <value>short</value>
-                <value>long</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="number-week-of-year">
-    <element name="number:week-of-year">
-        <ref name="common-calendar-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="number-quarter">
-    <element name="number:quarter">
-        <ref name="number-quarter-attlist"/>
-        <ref name="common-calendar-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="number-quarter-attlist" combine="interleave">
-    <optional>
-        <attribute name="number:style" a:defaultValue="short">
-            <choice>
-                <value>short</value>
-                <value>long</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="number-time-style">
-    <element name="number:time-style">
-        <ref name="number-time-style-attlist"/>
-        <ref name="common-data-style-attlist"/>
-        <ref name="common-format-source-attlist"/>
-        <optional>
-            <ref name="style-text-properties"/>
-        </optional>
-        <!-- This DTD does not reflect the fact that some elements must not -->
-        <!-- occur more than once. -->
-        <optional>
-            <ref name="number-text"/>
-        </optional>
-        <oneOrMore>
-            <ref name="any-time"/>
-            <optional>
-                <ref name="number-text"/>
-            </optional>
-        </oneOrMore>
-        <zeroOrMore>
-            <ref name="style-map"/>
-        </zeroOrMore>
-    </element>
-</define>
-
-<define name="any-time">
-    <choice>
-        <ref name="number-hours"/>
-        <ref name="number-am-pm"/>
-        <ref name="number-minutes"/>
-        <ref name="number-seconds"/>
-    </choice>
-</define>
-<define name="number-time-style-attlist" combine="interleave">
-    <optional>
-        <attribute name="number:truncate-on-overflow" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="number-hours">
-    <element name="number:hours">
-        <ref name="number-hours-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="number-hours-attlist" combine="interleave">
-    <optional>
-        <attribute name="number:style" a:defaultValue="short">
-            <choice>
-                <value>short</value>
-                <value>long</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="number-minutes">
-    <element name="number:minutes">
-        <ref name="number-minutes-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="number-minutes-attlist" combine="interleave">
-    <optional>
-        <attribute name="number:style" a:defaultValue="short">
-            <choice>
-                <value>short</value>
-                <value>long</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="number-seconds">
-    <element name="number:seconds">
-        <ref name="number-seconds-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="number-seconds-attlist" combine="interleave">
-    <optional>
-        <attribute name="number:style" a:defaultValue="short">
-            <choice>
-                <value>short</value>
-                <value>long</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="number-seconds-attlist" combine="interleave">
-    <optional>
-        <attribute name="number:decimal-places" a:defaultValue="0">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-</define>
-<define name="number-am-pm">
-    <element name="number:am-pm">
-        <empty/>
-    </element>
-</define>
-<define name="number-boolean-style">
-    <element name="number:boolean-style">
-        <ref name="common-data-style-attlist"/>
-        <optional>
-            <ref name="style-text-properties"/>
-        </optional>
-        <optional>
-            <ref name="number-text"/>
-        </optional>
-        <optional>
-            <ref name="number-boolean"/>
-            <optional>
-                <ref name="number-text"/>
-            </optional>
-        </optional>
-        <zeroOrMore>
-            <ref name="style-map"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="number-boolean">
-    <element name="number:boolean">
-        <empty/>
-    </element>
-</define>
-<define name="number-text-style">
-    <element name="number:text-style">
-        <ref name="common-data-style-attlist"/>
-        <optional>
-            <ref name="style-text-properties"/>
-        </optional>
-        <optional>
-            <ref name="number-text"/>
-        </optional>
-        <zeroOrMore>
-            <ref name="number-text-content"/>
-            <optional>
-                <ref name="number-text"/>
-            </optional>
-        </zeroOrMore>
-        <zeroOrMore>
-            <ref name="style-map"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="number-text">
-    <element name="number:text">
-        <text/>
-    </element>
-</define>
-<define name="number-text-content">
-    <element name="number:text-content">
-        <empty/>
-    </element>
-</define>
-<define name="common-data-style-attlist" combine="interleave">
-    <attribute name="style:name">
-        <ref name="styleName"/>
-    </attribute>
-</define>
-<define name="style-data-style-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:display-name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-data-style-attlist" combine="interleave">
-    <optional>
-        <attribute name="number:language">
-            <ref name="languageCode"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-data-style-attlist" combine="interleave">
-    <optional>
-        <attribute name="number:country">
-            <ref name="countryCode"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-data-style-attlist" combine="interleave">
-    <optional>
-        <attribute name="number:title"/>
-    </optional>
-</define>
-<define name="common-data-style-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:volatile">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-auto-reorder-attlist" combine="interleave">
-    <optional>
-        <attribute name="number:automatic-order" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-format-source-attlist">
-    <optional>
-        <attribute name="number:format-source" a:defaultValue="fixed">
-            <choice>
-                <value>fixed</value>
-                <value>language</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="common-data-style-attlist" combine="interleave">
-    <optional>
-        <attribute name="number:transliteration-format" a:defaultValue="1">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-data-style-attlist" combine="interleave">
-    <optional>
-        <attribute name="number:transliteration-language">
-            <ref name="countryCode"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-data-style-attlist" combine="interleave">
-    <optional>
-        <attribute name="number:transliteration-country">
-            <ref name="countryCode"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-data-style-attlist" combine="interleave">
-    <optional>
-        <attribute name="number:transliteration-style" a:defaultValue="short">
-            <choice>
-                <value>short</value>
-                <value>medium</value>
-                <value>long</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="common-decimal-places-attlist">
-    <optional>
-        <attribute name="number:decimal-places">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-number-attlist" combine="interleave">
-    <optional>
-        <attribute name="number:min-integer-digits">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-number-attlist" combine="interleave">
-    <optional>
-        <attribute name="number:grouping" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-calendar-attlist" combine="interleave">
-    <optional>
-        <attribute name="number:calendar">
-            <choice>
-                <value>gregorian</value>
-                <value>gengou</value>
-                <value>ROC</value>
-                <value>hanja_yoil</value>
-                <value>hanja</value>
-                <value>hijri</value>
-                <value>jewish</value>
-                <value>buddhist</value>
-                <ref name="string"/>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-style-content" combine="choice">
-    <group>
-        <attribute name="style:family">
-            <value>text</value>
-        </attribute>
-        <optional>
-            <ref name="style-text-properties"/>
-        </optional>
-    </group>
-</define>
-<define name="style-style-content" combine="choice">
-    <group>
-        <attribute name="style:family">
-            <value>paragraph</value>
-        </attribute>
-        <optional>
-            <ref name="style-paragraph-properties"/>
-        </optional>
-        <optional>
-            <ref name="style-text-properties"/>
-        </optional>
-    </group>
-</define>
-<define name="style-style-content" combine="choice">
-    <group>
-        <attribute name="style:family">
-            <value>section</value>
-        </attribute>
-        <optional>
-            <ref name="style-section-properties"/>
-        </optional>
-    </group>
-</define>
-<define name="style-style-content" combine="choice">
-    <group>
-        <attribute name="style:family">
-            <value>ruby</value>
-        </attribute>
-        <optional>
-            <ref name="style-ruby-properties"/>
-        </optional>
-    </group>
-</define>
-<define name="text-linenumbering-configuration">
-    <element name="text:linenumbering-configuration">
-        <ref name="text-linenumbering-configuration-attlist"/>
-        <optional>
-            <ref name="text-linenumbering-separator"/>
-        </optional>
-    </element>
-</define>
-<define name="text-linenumbering-configuration-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:number-lines" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-linenumbering-configuration-attlist" combine="interleave">
-    <optional>
-        <ref name="common-num-format-attlist"/>
-    </optional>
-</define>
-<define name="text-linenumbering-configuration-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-linenumbering-configuration-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:increment">
-            <ref name="nonNegativeInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-linenumbering-configuration-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:number-position" a:defaultValue="left">
-            <choice>
-                <value>left</value>
-                <value>rigth</value>
-                <value>inner</value>
-                <value>outer</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="text-linenumbering-configuration-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:offset">
-            <ref name="nonNegativeLength"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-linenumbering-configuration-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:count-empty-lines" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-linenumbering-configuration-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:count-in-text-boxes" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-linenumbering-configuration-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:restart-on-page" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-linenumbering-separator">
-    <element name="text:linenumbering-separator">
-        <optional>
-            <attribute name="text:increment">
-                <ref name="nonNegativeInteger"/>
-            </attribute>
-        </optional>
-        <text/>
-    </element>
-</define>
-<define name="text-notes-configuration">
-    <element name="text:notes-configuration">
-        <ref name="text-notes-configuration-content"/>
-    </element>
-</define>
-<define name="text-notes-configuration-content" combine="interleave">
-    <ref name="text-note-class"/>
-</define>
-<define name="text-notes-configuration-content" combine="interleave">
-    <optional>
-        <attribute name="text:citation-style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-notes-configuration-content" combine="interleave">
-    <optional>
-        <attribute name="text:citation-body-style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-notes-configuration-content" combine="interleave">
-    <optional>
-        <attribute name="text:default-style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-notes-configuration-content" combine="interleave">
-    <optional>
-        <attribute name="text:master-page-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-notes-configuration-content" combine="interleave">
-    <optional>
-        <attribute name="text:start-value">
-            <ref name="nonNegativeInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-notes-configuration-content" combine="interleave">
-    <ref name="common-num-format-prefix-suffix-attlist"/>
-    <optional>
-        <ref name="common-num-format-attlist"/>
-    </optional>
-</define>
-<define name="text-notes-configuration-content" combine="interleave">
-    <optional>
-        <attribute name="text:start-numbering-at">
-            <choice>
-                <value>document</value>
-                <value>chapter</value>
-                <value>page</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="text-notes-configuration-content" combine="interleave">
-    <optional>
-        <attribute name="text:footnotes-position">
-            <choice>
-                <value>text</value>
-                <value>page</value>
-                <value>section</value>
-                <value>document</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="text-notes-configuration-content" combine="interleave">
-    <optional>
-        <element name="text:note-continuation-notice-forward">
-            <text/>
-        </element>
-    </optional>
-</define>
-<define name="text-notes-configuration-content" combine="interleave">
-    <optional>
-        <element name="text:note-continuation-notice-backward">
-            <text/>
-        </element>
-    </optional>
-</define>
-<define name="text-bibliography-configuration">
-    <element name="text:bibliography-configuration">
-        <ref name="text-bibliography-configuration-attlist"/>
-        <zeroOrMore>
-            <ref name="text-sort-key"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="text-bibliography-configuration-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:prefix">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="text:suffix">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-bibliography-configuration-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:numbered-entries" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-bibliography-configuration-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:sort-by-position" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="fo:language">
-            <ref name="languageCode"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="fo:country">
-            <ref name="countryCode"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="text:sort-algorithm">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-sort-key">
-    <element name="text:sort-key">
-        <ref name="text-sort-key-attlist"/>
-        <empty/>
-    </element>
-</define>
-
-<define name="text-sort-key-attlist" combine="interleave">
-    <attribute name="text:key">
-        <choice>
-            <value>address</value>
-            <value>annote</value>
-            <value>author</value>
-            <value>bibliography-type</value>
-            <value>booktitle</value>
-            <value>chapter</value>
-            <value>custom1</value>
-            <value>custom2</value>
-            <value>custom3</value>
-            <value>custom4</value>
-            <value>custom5</value>
-            <value>edition</value>
-            <value>editor</value>
-            <value>howpublished</value>
-            <value>identifier</value>
-            <value>institution</value>
-            <value>isbn</value>
-            <value>issn</value>
-            <value>journal</value>
-            <value>month</value>
-            <value>note</value>
-            <value>number</value>
-            <value>organizations</value>
-            <value>pages</value>
-            <value>publisher</value>
-            <value>report-type</value>
-            <value>school</value>
-            <value>series</value>
-            <value>title</value>
-            <value>url</value>
-            <value>volume</value>
-            <value>year</value>
-        </choice>
-    </attribute>
-    <optional>
-        <attribute name="text:sort-ascending" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-list-style">
-    <element name="text:list-style">
-        <ref name="text-list-style-attr"/>
-        <zeroOrMore>
-            <ref name="text-list-style-content"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="text-list-style-attr" combine="interleave">
-    <attribute name="style:name">
-        <ref name="styleName"/>
-    </attribute>
-</define>
-<define name="text-list-style-attr" combine="interleave">
-    <optional>
-        <attribute name="style:display-name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-list-style-attr" combine="interleave">
-    <optional>
-        <attribute name="text:consecutive-numbering" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-list-level-style-attr">
-    <attribute name="text:level">
-        <ref name="positiveInteger"/>
-    </attribute>
-</define>
-<define name="text-list-style-content" combine="choice">
-    <element name="text:list-level-style-number">
-        <ref name="text-list-level-style-attr"/>
-        <ref name="text-list-level-style-number-attr"/>
-        <optional>
-            <ref name="style-list-level-properties"/>
-        </optional>
-        <optional>
-            <ref name="style-text-properties"/>
-        </optional>
-    </element>
-</define>
-<define name="text-list-level-style-number-attr" combine="interleave">
-    <optional>
-        <attribute name="text:style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-list-level-style-number-attr" combine="interleave">
-    <ref name="common-num-format-attlist"/>
-    <ref name="common-num-format-prefix-suffix-attlist"/>
-</define>
-<define name="text-list-level-style-number-attr" combine="interleave">
-    <optional>
-        <attribute name="text:display-levels" a:defaultValue="1">
-            <ref name="positiveInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-list-level-style-number-attr" combine="interleave">
-    <optional>
-        <attribute name="text:start-value" a:defaultValue="1">
-            <ref name="positiveInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-list-style-content" combine="choice">
-    <element name="text:list-level-style-bullet">
-        <ref name="text-list-level-style-attr"/>
-        <ref name="text-list-level-style-bullet-attr"/>
-        <optional>
-            <ref name="style-list-level-properties"/>
-        </optional>
-        <optional>
-            <ref name="style-text-properties"/>
-        </optional>
-    </element>
-</define>
-<define name="text-list-level-style-bullet-attr" combine="interleave">
-    <optional>
-        <attribute name="text:style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-list-level-style-bullet-attr" combine="interleave">
-    <attribute name="text:bullet-char">
-        <ref name="character"/>
-    </attribute>
-</define>
-<define name="text-list-level-style-bullet-attr" combine="interleave">
-    <ref name="common-num-format-prefix-suffix-attlist"/>
-</define>
-<define name="text-list-level-style-bullet-attr" combine="interleave">
-    <optional>
-        <attribute name="text:bullet-relative-size">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-list-style-content" combine="choice">
-    <element name="text:list-level-style-image">
-        <ref name="text-list-level-style-attr"/>
-        <ref name="text-list-level-style-image-attr"/>
-        <optional>
-            <ref name="style-list-level-properties"/>
-        </optional>
-    </element>
-</define>
-<define name="text-list-level-style-image-attr" combine="interleave">
-    <choice>
-        <ref name="common-draw-data-attlist"/>
-        <ref name="office-binary-data"/>
-    </choice>
-</define>
-<define name="text-outline-style">
-    <element name="text:outline-style">
-        <oneOrMore>
-            <ref name="text-outline-level-style"/>
-        </oneOrMore>
-    </element>
-</define>
-<define name="text-outline-level-style">
-    <element name="text:outline-level-style">
-        <ref name="text-outline-level-style-attlist"/>
-        <optional>
-            <ref name="style-list-level-properties"/>
-        </optional>
-        <optional>
-            <ref name="style-text-properties"/>
-        </optional>
-    </element>
-</define>
-<define name="text-outline-level-style-attlist" combine="interleave">
-    <attribute name="text:level">
-        <ref name="positiveInteger"/>
-    </attribute>
-</define>
-<define name="text-outline-level-style-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-outline-level-style-attlist" combine="interleave">
-    <ref name="common-num-format-attlist"/>
-    <ref name="common-num-format-prefix-suffix-attlist"/>
-</define>
-<define name="text-outline-level-style-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:display-levels" a:defaultValue="1">
-            <ref name="positiveInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-outline-level-style-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:start-value" a:defaultValue="1">
-            <ref name="positiveInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-style-content" combine="choice">
-    <group>
-        <attribute name="style:family">
-            <value>table</value>
-        </attribute>
-        <optional>
-            <ref name="style-table-properties"/>
-        </optional>
-    </group>
-</define>
-<define name="style-style-content" combine="choice">
-    <group>
-        <attribute name="style:family">
-            <value>table-column</value>
-        </attribute>
-        <optional>
-            <ref name="style-table-column-properties"/>
-        </optional>
-    </group>
-</define>
-<define name="style-style-content" combine="choice">
-    <group>
-        <attribute name="style:family">
-            <value>table-row</value>
-        </attribute>
-        <optional>
-            <ref name="style-table-row-properties"/>
-        </optional>
-    </group>
-</define>
-<define name="style-style-content" combine="choice">
-    <group>
-        <attribute name="style:family">
-            <value>table-cell</value>
-        </attribute>
-        <optional>
-            <ref name="style-table-cell-properties"/>
-        </optional>
-        <optional>
-            <ref name="style-paragraph-properties"/>
-        </optional>
-        <optional>
-            <ref name="style-text-properties"/>
-        </optional>
-    </group>
-</define>
-<define name="style-style-content" combine="choice">
-    <group>
-        <attribute name="style:family">
-            <choice>
-                <value>graphic</value>
-                <value>presentation</value>
-            </choice>
-        </attribute>
-        <optional>
-            <ref name="style-graphic-properties"/>
-        </optional>
-        <optional>
-            <ref name="style-paragraph-properties"/>
-        </optional>
-        <optional>
-            <ref name="style-text-properties"/>
-        </optional>
-    </group>
-</define>
-
-<define name="style-graphic-properties">
-    <element name="style:graphic-properties">
-        <ref name="style-graphic-properties-content"/>
-    </element>
-</define>
-
-<define name="style-graphic-properties-content">
-    <ref name="style-properties-content"/>
-</define>
-
-<define name="style-graphic-properties-content-strict">
-    <ref name="style-graphic-properties-attlist"/>
-    <ref name="style-graphic-fill-properties-attlist"/>
-    <ref name="style-graphic-properties-elements"/>
-</define>
-
-<define name=" style-graphic-properties-elements">
-    <empty/>
-</define>
-<define name="style-style-content" combine="choice">
-    <group>
-        <attribute name="style:family">
-            <value>drawing-page</value>
-        </attribute>
-        <optional>
-            <ref name="style-drawing-page-properties"/>
-        </optional>
-    </group>
-</define>
-
-<define name="style-drawing-page-properties">
-    <element name="style:drawing-page-properties">
-        <ref name="style-drawing-page-properties-content"/>
-    </element>
-</define>
-
-<define name="style-drawing-page-properties-content">
-    <ref name="style-properties-content"/>
-</define>
-
-<define name="style-drawing-page-properties-content-strict">
-    <ref name="style-graphic-fill-properties-attlist"/>
-    <ref name="style-drawing-page-properties-attlist"/>
-    <ref name="style-drawing-page-properties-elements"/>
-</define>
-<define name="draw-gradient">
-    <element name="draw:gradient">
-        <ref name="common-draw-gradient-attlist"/>
-        <ref name="draw-gradient-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="common-draw-gradient-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:name">
-            <ref name="styleName"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-draw-gradient-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:display-name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-draw-gradient-attlist" combine="interleave">
-    <attribute name="draw:style">
-        <ref name="gradient-style"/>
-    </attribute>
-</define>
-<define name="gradient-style">
-    <choice>
-        <value>linear</value>
-        <value>axial</value>
-        <value>radial</value>
-        <value>ellipsoid</value>
-        <value>square</value>
-        <value>rectangular</value>
-    </choice>
-</define>
-<define name="common-draw-gradient-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:cx">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="draw:cy">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-gradient-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:start-color">
-            <ref name="color"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="draw:end-color">
-            <ref name="color"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-gradient-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:start-intensity">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="draw:end-intensity">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-draw-gradient-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:angle">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-draw-gradient-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:border">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-</define>
-<define name="svg-linearGradient">
-    <element name="svg:linearGradient">
-        <ref name="common-svg-gradient-attlist"/>
-        <optional>
-            <attribute name="svg:x1" a:defaultValue="0%">
-                <choice>
-                    <ref name="coordinate"/>
-                    <ref name="percent"/>
-                </choice>                
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="svg:y1" a:defaultValue="0%">
-                <choice>
-                    <ref name="coordinate"/>
-                    <ref name="percent"/>
-                </choice>                
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="svg:x2" a:defaultValue="100%">
-                <choice>
-                    <ref name="coordinate"/>
-                    <ref name="percent"/>
-                </choice>                
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="svg:y2" a:defaultValue="100%">
-                <choice>
-                    <ref name="coordinate"/>
-                    <ref name="percent"/>
-                </choice>                
-            </attribute>
-        </optional>
-        <zeroOrMore>
-            <ref name="svg-stop"/>
-        </zeroOrMore>
-    </element>
-</define>
-
-<define name="svg-radialGradient">
-    <element name="svg:radialGradient">
-        <ref name="common-svg-gradient-attlist"/>
-        <optional>
-            <attribute name="svg:cx" a:defaultValue="50%">
-                <choice>
-                    <ref name="coordinate"/>
-                    <ref name="percent"/>
-                </choice>                
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="svg:cy" a:defaultValue="50%">
-                <choice>
-                    <ref name="coordinate"/>
-                    <ref name="percent"/>
-                </choice>                
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="svg:r" a:defaultValue="50%">
-                <choice>
-                    <ref name="coordinate"/>
-                    <ref name="percent"/>
-                </choice>                
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="svg:fx">
-                <choice>
-                    <ref name="coordinate"/>
-                    <ref name="percent"/>
-                </choice>                
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="svg:fy">
-                <choice>
-                    <ref name="coordinate"/>
-                    <ref name="percent"/>
-                </choice>                
-            </attribute>
-        </optional>
-        <zeroOrMore>
-            <ref name="svg-stop"/>
-        </zeroOrMore>
-    </element>
-</define>
-
-<define name="svg-stop">
-    <element name="svg:stop">
-        <attribute name="svg:offset">
-            <choice>
-                <ref name="double"/>
-                <ref name="percent"/>
-            </choice>
-        </attribute>
-        <optional>
-            <attribute name="svg:stop-color">
-                <ref name="color"/>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="svg:stop-opacity">
-                <ref name="double"/>
-            </attribute>
-        </optional>
-    </element>
-</define>
-
-<define name="common-svg-gradient-attlist" combine="interleave">
-    <optional>
-        <attribute name="svg:gradientUnits" a:defaultValue="objectBoundingBox">
-            <value>objectBoundingBox</value>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:gradientTransform">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:spreadMethod" a:defaultValue="pad">
-            <choice>
-                <value>pad</value>
-                <value>reflect</value>
-                <value>repeat</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="common-svg-gradient-attlist" combine="interleave">
-    <attribute name="draw:name">
-        <ref name="styleName"/>
-    </attribute>
-</define>
-<define name="common-svg-gradient-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:display-name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-hatch">
-    <element name="draw:hatch">
-        <ref name="draw-hatch-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="draw-hatch-attlist" combine="interleave">
-    <attribute name="draw:name">
-        <ref name="styleName"/>
-    </attribute>
-</define>
-<define name="draw-hatch-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:display-name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-hatch-attlist" combine="interleave">
-    <attribute name="draw:style">
-        <choice>
-            <value>single</value>
-            <value>double</value>
-            <value>triple</value>
-        </choice>
-    </attribute>
-</define>
-<define name="draw-hatch-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:color">
-            <ref name="color"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-hatch-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:distance">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-hatch-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:rotation">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-fill-image">
-    <element name="draw:fill-image">
-        <ref name="draw-fill-image-attlist"/>
-        <attribute name="xlink:href">
-            <ref name="anyURI"/>
-        </attribute>
-        <optional>
-            <attribute name="xlink:type" a:defaultValue="simple">
-                <choice>
-                    <value>simple</value>
-                </choice>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="xlink:show" a:defaultValue="embed">
-                <choice>
-                    <value>embed</value>
-                </choice>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="xlink:actuate" a:defaultValue="onLoad">
-                <choice>
-                    <value>onLoad</value>
-                </choice>
-            </attribute>
-        </optional>
-        <empty/>
-    </element>
-</define>
-<define name="draw-fill-image-attlist" combine="interleave">
-    <attribute name="draw:name">
-        <ref name="styleName"/>
-    </attribute>
-</define>
-<define name="draw-fill-image-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:display-name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-fill-image-attlist" combine="interleave">
-    <optional>
-        <attribute name="svg:width">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:height">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-opacity">
-    <element name="draw:opacity">
-        <ref name="common-draw-gradient-attlist"/>
-        <ref name="draw-opacity-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="draw-opacity-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:start">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="draw:end">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-marker">
-    <element name="draw:marker">
-        <ref name="draw-marker-attlist"/>
-        <ref name="common-draw-viewbox-attlist"/>
-        <ref name="common-draw-path-data-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="draw-marker-attlist" combine="interleave">
-    <attribute name="draw:name">
-        <ref name="styleName"/>
-    </attribute>
-</define>
-<define name="draw-marker-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:display-name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-stroke-dash">
-    <element name="draw:stroke-dash">
-        <ref name="draw-stroke-dash-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="draw-stroke-dash-attlist" combine="interleave">
-    <attribute name="draw:name">
-        <ref name="styleName"/>
-    </attribute>
-</define>
-<define name="draw-stroke-dash-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:display-name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-stroke-dash-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:style">
-            <choice>
-                <value>rect</value>
-                <value>round</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-stroke-dash-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:dots1">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="draw:dots1-length">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="draw:dots2">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="draw:dots2-length">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-stroke-dash-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:distance">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-presentation-page-layout">
-    <element name="style:presentation-page-layout">
-        <attribute name="style:name">
-            <ref name="styleName"/>
-        </attribute>
-        <optional>
-            <attribute name="style:display-name">
-                <ref name="string"/>
-            </attribute>
-        </optional>
-        <zeroOrMore>
-            <ref name="presentation-placeholder"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="presentation-placeholder">
-    <element name="presentation:placeholder">
-        <attribute name="presentation:object">
-            <ref name="presentation-classes"/>
-        </attribute>
-        <attribute name="svg:x">
-            <choice>
-                <ref name="coordinate"/>
-                <ref name="percent"/>
-            </choice>
-        </attribute>
-        <attribute name="svg:y">
-            <choice>
-                <ref name="coordinate"/>
-                <ref name="percent"/>
-            </choice>
-        </attribute>
-        <attribute name="svg:width">
-            <choice>
-                <ref name="length"/>
-                <ref name="percent"/>
-            </choice>
-        </attribute>
-        <attribute name="svg:height">
-            <choice>
-                <ref name="length"/>
-                <ref name="percent"/>
-            </choice>
-        </attribute>
-        <empty/>
-    </element>
-</define>
-<define name="style-style-content" combine="choice">
-    <group>
-        <attribute name="style:family">
-            <value>chart</value>
-        </attribute>
-        <optional>
-            <ref name="style-chart-properties"/>
-        </optional>
-        <optional>
-            <ref name="style-graphic-properties"/>
-        </optional>
-        <optional>
-            <ref name="style-paragraph-properties"/>
-        </optional>
-        <optional>
-            <ref name="style-text-properties"/>
-        </optional>
-    </group>
-</define>
-<define name="style-properties-content">
-    <ref name="anyAttListOrElements"/>
-</define>
-<define name="style-page-layout-properties">
-    <element name="style:page-layout-properties">
-        <ref name="style-page-layout-properties-content"/>
-    </element>
-</define>
-
-<define name="style-page-layout-properties-content">
-    <ref name="style-properties-content"/>
-</define>
-
-<define name="style-page-layout-properties-content-strict">
-    <ref name="style-page-layout-properties-attlist"/>
-    <ref name="style-page-layout-properties-elements"/>
-</define>
-<define name="style-page-layout-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:page-width">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="fo:page-height">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-page-layout-properties-attlist" combine="interleave">
-    <optional>
-        <ref name="common-num-format-attlist"/>
-    </optional>
-    <ref name="common-num-format-prefix-suffix-attlist"/>
-</define>
-<define name="style-page-layout-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:paper-tray-name">
-            <choice>
-                <value>default</value>
-                <ref name="string"/>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-page-layout-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:print-orientation">
-            <choice>
-                <value>portrait</value>
-                <value>landscape</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-page-layout-properties-attlist" combine="interleave">
-    <ref name="common-horizontal-margin-attlist"/>
-    <ref name="common-vertical-margin-attlist"/>
-    <ref name="common-margin-attlist"/>
-</define>
-<define name="style-page-layout-properties-attlist" combine="interleave">
-    <ref name="common-border-attlist"/>
-</define>
-<define name="style-page-layout-properties-attlist" combine="interleave">
-    <ref name="common-border-line-width-attlist"/>
-</define>
-<define name="style-page-layout-properties-attlist" combine="interleave">
-    <ref name="common-padding-attlist"/>
-</define>
-<define name="style-page-layout-properties-attlist" combine="interleave">
-    <ref name="common-shadow-attlist"/>
-</define>
-<define name="style-page-layout-properties-attlist" combine="interleave">
-    <ref name="common-background-color-attlist"/>
-</define>
-<define name="style-page-layout-properties-elements" combine="interleave">
-    <ref name="style-background-image"/>
-</define>
-<define name="style-page-layout-properties-elements" combine="interleave">
-    <ref name="style-columns"/>
-</define>
-<define name="style-page-layout-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:register-truth-ref-style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-page-layout-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:print">
-            <list>
-                <zeroOrMore>
-                    <choice>
-                        <value>headers</value>
-                        <value>grid</value>
-                        <value>annotations</value>
-                        <value>objects</value>
-                        <value>charts</value>
-                        <value>drawings</value>
-                        <value>formulas</value>
-                        <value>zero-values</value>
-                    </choice>
-                </zeroOrMore>
-            </list>
-        </attribute>
-    </optional>
-</define>
-<define name="style-page-layout-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:print-page-order">
-            <choice>
-                <value>ttb</value>
-                <value>ltr</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-page-layout-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:first-page-number">
-            <choice>
-                <ref name="positiveInteger"/>
-                <value>continue</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-page-layout-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:scale-to">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:scale-to-pages">
-            <ref name="positiveInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-page-layout-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:table-centering">
-            <choice>
-                <value>horizontal</value>
-                <value>vertical</value>
-                <value>both</value>
-                <value>none</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-page-layout-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:footnote-max-height">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-page-layout-properties-attlist" combine="interleave">
-    <ref name="common-writing-mode-attlist"/>
-</define>
-<define name="style-page-layout-properties-elements" combine="interleave">
-    <ref name="style-footnote-sep"/>
-</define>
-
-<define name="style-footnote-sep">
-    <optional>
-        <element name="style:footnote-sep">
-            <ref name="style-footnote-sep-attlist"/>
-            <empty/>
-        </element>
-    </optional>
-</define>
-<define name="style-footnote-sep-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:width">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:rel-width">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:color">
-            <ref name="color"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:line-style">
-            <ref name="lineStyle"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:adjustment" a:defaultValue="left">
-            <choice>
-                <value>left</value>
-                <value>center</value>
-                <value>right</value>
-            </choice>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:distance-before-sep">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:distance-after-sep">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-page-layout-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:layout-grid-mode">
-            <choice>
-                <value>none</value>
-                <value>line</value>
-                <value>both</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-page-layout-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:layout-grid-base-height">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-page-layout-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:layout-grid-ruby-height">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-page-layout-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:layout-grid-lines">
-            <ref name="positiveInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-page-layout-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:layout-grid-color">
-            <ref name="color"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-page-layout-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:layout-grid-ruby-below">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-page-layout-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:layout-grid-print">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-page-layout-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:layout-grid-display">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-header-footer-properties">
-    <element name="style:header-footer-properties">
-        <ref name="style-header-footer-properties-content"/>
-    </element>
-</define>
-
-<define name="style-header-footer-properties-content">
-    <ref name="style-properties-content"/>
-</define>
-
-<define name="style-header-footer-properties-content-strict">
-        <ref name="style-header-footer-properties-attlist"/>
-        <ref name="style-header-footer-properties-elements"/>
-</define>
-<define name="style-header-footer-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="svg:height">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="fo:min-height">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-header-footer-properties-attlist" combine="interleave">
-    <ref name="common-horizontal-margin-attlist"/>
-    <ref name="common-vertical-margin-attlist"/>
-    <ref name="common-margin-attlist"/>
-</define>
-<define name="style-header-footer-properties-attlist" combine="interleave">
-    <ref name="common-border-attlist"/>
-</define>
-<define name="style-header-footer-properties-attlist" combine="interleave">
-    <ref name="common-border-line-width-attlist"/>
-</define>
-<define name="style-header-footer-properties-attlist" combine="interleave">
-    <ref name="common-padding-attlist"/>
-</define>
-<define name="style-header-footer-properties-attlist" combine="interleave">
-    <ref name="common-background-color-attlist"/>
-</define>
-<define name="style-header-footer-properties-elements" combine="interleave">
-    <ref name="style-background-image"/>
-</define>
-<define name="style-header-footer-properties-attlist" combine="interleave">
-    <ref name="common-shadow-attlist"/>
-</define>
-<define name="style-header-footer-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:dynamic-spacing">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties">
-    <element name="style:text-properties">
-        <ref name="style-text-properties-content"/>
-    </element>
-</define>
-
-<define name="style-text-properties-content">
-    <ref name="style-properties-content"/>
-</define>
-
-<define name="style-text-properties-content-strict">
-    <ref name="style-text-properties-attlist"/>
-    <ref name="style-text-properties-elements"/>
-</define>
-
-<define name="style-text-properties-elements">
-    <empty/>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:font-variant">
-            <ref name="fontVariant"/>
-        </attribute>
-    </optional>
-</define>
-
-<define name="fontVariant">
-    <choice>
-        <value>normal</value>
-        <value>small-caps</value>
-    </choice>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:text-transform">
-            <choice>
-                <value>none</value>
-                <value>lowercase</value>
-                <value>uppercase</value>
-                <value>capitalize</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-            <attribute name="fo:color">
-            <ref name="color"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:use-window-font-color">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:text-outline">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:text-line-through-type">
-            <ref name="lineType"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:text-line-through-style">
-            <ref name="lineStyle"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:text-line-through-width">
-            <ref name="lineWidth"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:text-line-through-color">
-            <choice>
-                <value>font-color</value>
-                <ref name="color"/>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:text-line-through-text">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:text-line-through-text-style">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:text-position">
-            <list>
-                <choice>
-                    <ref name="percent"/>
-                    <value>super</value>
-                    <value>sub</value>
-                </choice>
-                <optional>
-                    <ref name="percent"/>
-                </optional>
-            </list>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:font-name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:font-name-asian">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:font-name-complex">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:font-family">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:font-family-asian">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:font-family-complex">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:font-family-generic">
-            <ref name="fontFamilyGeneric"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:font-family-generic-asian">
-            <ref name="fontFamilyGeneric"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:font-family-generic-complex">
-            <ref name="fontFamilyGeneric"/>
-        </attribute>
-    </optional>
-</define>
-
-<define name="fontFamilyGeneric">
-    <choice>
-        <value>roman</value>
-        <value>swiss</value>
-        <value>modern</value>
-        <value>decorative</value>
-        <value>script</value>
-        <value>system</value>
-    </choice>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:font-style-name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:font-style-name-asian">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:font-style-name-complex">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:font-pitch">
-            <ref name="fontPitch"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:font-pitch-asian">
-            <ref name="fontPitch"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:font-pitch-complex">
-            <ref name="fontPitch"/>
-        </attribute>
-    </optional>
-</define>
-
-<define name="fontPitch">
-    <choice>
-        <value>fixed</value>
-        <value>variable</value>
-    </choice>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:font-charset">
-            <ref name="textEncoding"/>
-        </attribute>
-    </optional>
-</define>
-
-<define name="textEncoding">
-    <data type="string">
-        <param name="pattern">[A-Za-z][A-Za-z0-9._\-]*</param>
-    </data>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:font-size">
-            <choice>
-                <ref name="positiveLength"/>
-                <ref name="percent"/>
-            </choice>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:font-size-asian">
-            <choice>
-                <ref name="positiveLength"/>
-                <ref name="percent"/>
-            </choice>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:font-size-complex">
-            <choice>
-                <ref name="positiveLength"/>
-                <ref name="percent"/>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:font-size-rel">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:font-size-rel-asian">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:font-size-rel-complex">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:script-type">
-            <choice>
-                <value>latin</value>
-                <value>asian</value>
-                <value>complex</value>
-                <value>ignore</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:letter-spacing">
-            <choice>
-                <ref name="length"/>
-                <value>normal</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:language">
-            <ref name="languageCode"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:language-asian">
-            <ref name="languageCode"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:language-complex">
-            <ref name="languageCode"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:country">
-            <ref name="countryCode"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:country-asian">
-            <ref name="countryCode"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:country-complex">
-            <ref name="countryCode"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:font-style">
-            <ref name="fontStyle"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:font-style-asian">
-            <ref name="fontStyle"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:font-style-complex">
-            <ref name="fontStyle"/>
-        </attribute>
-    </optional>
-</define>
-
-<define name="fontStyle">
-    <choice>
-        <value>normal</value>
-        <value>italic</value>
-        <value>oblique</value>
-    </choice>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:font-relief">
-            <choice>
-            <value>none</value>
-                <value>embossed</value>
-                <value>engraved</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:text-shadow">
-            <ref name="shadowType"/>
-        </attribute>
-    </optional>
-</define>
-
-<define name="shadowType">
-    <choice>
-        <value>none</value>
-        <!-- The follwing string must match an XSL shadow decl -->
-        <ref name="string"/>
-    </choice>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:text-underline-type">
-            <ref name="lineType"/>
-        </attribute>
-    </optional>
-</define>
-
-<define name="lineType">
-    <choice>
-        <value>none</value>
-        <value>single</value>
-        <value>double</value>
-    </choice>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:text-underline-style">
-            <ref name="lineStyle"/>
-        </attribute>
-    </optional>
-</define>
-
-<define name="lineStyle">
-    <choice>
-        <value>none</value>
-        <value>solid</value>
-        <value>dotted</value>
-        <value>dash</value>
-        <value>long-dash</value>
-        <value>dot-dash</value>
-        <value>dot-dot-dash</value>
-        <value>wave</value>
-    </choice>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:text-underline-width">
-            <ref name="lineWidth"/>
-        </attribute>
-    </optional>
-</define>
-
-<define name="lineWidth">
-    <choice>
-        <value>auto</value>
-        <value>normal</value>
-        <value>bold</value>
-        <value>thin</value>
-        <value>dash</value>
-        <value>medium</value>
-        <value>thick</value>
-        <ref name="positiveInteger"/>
-        <ref name="percent"/>
-        <ref name="positiveLength"/>
-    </choice>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:text-underline-color">
-            <choice>
-                <value>font-color</value>
-                <ref name="color"/>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:font-weight">
-            <ref name="fontWeight"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:font-weight-asian">
-            <ref name="fontWeight"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:font-weight-complex">
-            <ref name="fontWeight"/>
-        </attribute>
-    </optional>
-</define>
-
-<define name="fontWeight">
-    <choice>
-        <value>normal</value>
-        <value>bold</value>
-        <value>100</value>
-        <value>200</value>
-        <value>300</value>
-        <value>400</value>
-        <value>500</value>
-        <value>600</value>
-        <value>700</value>
-        <value>800</value>
-        <value>900</value>
-    </choice>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:text-underline-mode">
-            <ref name="lineMode"/>
-        </attribute>
-    </optional>
-</define>
-
-<define name="lineMode">
-    <choice>
-        <value>continuous</value>
-        <value>skip-white-space</value>
-    </choice>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:text-line-through-mode">
-            <ref name="lineMode"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:letter-kerning">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:text-blinking">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <ref name="common-background-color-attlist"/>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:text-combine">
-            <choice>
-                <value>none</value>
-                <value>letters</value>
-                <value>lines</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:text-combine-start-char">
-            <ref name="character"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:text-combine-end-char">
-            <ref name="character"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:text-emphasize">
-            <choice>
-                <value>none</value>
-                <list>
-                    <choice>
-                        <value>none</value>
-                        <value>accent</value>
-                        <value>dot</value>
-                        <value>circle</value>
-                        <value>disc</value>
-                    </choice>
-                    <choice>
-                        <value>above</value>
-                        <value>below</value>
-                    </choice>
-                </list>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:text-scale">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:text-rotation-angle">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:text-rotation-scale">
-            <choice>
-                <value>fixed</value>
-                <value>line-height</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:hyphenate">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:hyphenation-remain-char-count">
-            <ref name="positiveInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:hyphenation-push-char-count">
-            <ref name="positiveInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <choice>
-        <attribute name="text:display">
-            <value>true</value>
-        </attribute>
-        <attribute name="text:display">
-            <value>none</value>
-        </attribute>
-        <group>
-            <attribute name="text:display">
-                <value>condition</value>
-            </attribute>
-            <attribute name="text:condition">
-                <value>none</value>
-            </attribute>
-        </group>
-        <empty/>
-    </choice>
-</define>
-<define name="style-paragraph-properties">
-    <element name="style:paragraph-properties">
-        <ref name="style-paragraph-properties-content"/>
-    </element>
-</define>
-
-<define name="style-paragraph-properties-content">
-    <ref name="style-properties-content"/>
-</define>
-
-<define name="style-paragraph-properties-content-strict">
-    <ref name="style-paragraph-properties-attlist"/>
-    <ref name="style-paragraph-properties-elements"/>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:line-height">
-            <choice>
-                <value>normal</value>
-                <ref name="nonNegativeLength"/>
-                <ref name="percent"/>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:line-height-at-least">
-            <ref name="nonNegativeLength"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:line-spacing">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:font-independent-line-spacing">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <ref name="common-text-align"/>
-</define>
-
-<define name="common-text-align">
-    <optional>
-        <attribute name="fo:text-align">
-            <choice>
-                <value>start</value>
-                <value>end</value>
-                <value>left</value>
-                <value>right</value>
-                <value>center</value>
-                <value>justify</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:text-align-last">
-            <choice>
-                <value>start</value>
-                <value>center</value>
-                <value>justify</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:justify-single-word">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:keep-together">
-            <choice>
-                <value>auto</value>
-                <value>always</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:widows">
-            <ref name="nonNegativeInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:orphans">
-            <ref name="nonNegativeInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-elements" combine="interleave">
-    <ref name="style-tab-stops"/>
-</define>
-
-<define name="style-tab-stops">
-    <optional>
-        <element name="style:tab-stops">
-            <zeroOrMore>
-                <ref name="style-tab-stop"/>
-            </zeroOrMore>
-        </element>
-    </optional>
-</define>
-
-<define name="style-tab-stop">
-    <element name="style:tab-stop">
-        <ref name="style-tab-stop-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="style-tab-stop-attlist" combine="interleave">
-    <attribute name="style:position">
-        <ref name="nonNegativeLength"/>
-    </attribute>
-</define>
-<define name="style-tab-stop-attlist" combine="interleave">
-    <choice>
-        <optional>
-            <attribute name="style:type" a:defaultValue="left">
-                <choice>
-                    <value>left</value>
-                    <value>center</value>
-                    <value>right</value>
-                </choice>
-            </attribute>
-        </optional>
-        <group>
-            <attribute name="style:type">
-                <value>char</value>
-            </attribute>
-            <ref name="style-tab-stop-char-attlist"/>
-        </group>
-    </choice>
-</define>
-<define name="style-tab-stop-char-attlist" combine="interleave">
-    <attribute name="style:char">
-        <ref name="character"/>
-    </attribute>
-</define>
-<define name="style-tab-stop-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:leader-type">
-            <ref name="lineType"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-tab-stop-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:leader-style">
-            <ref name="lineStyle"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-tab-stop-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:leader-width">
-            <ref name="lineWidth"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-tab-stop-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:leader-color">
-            <choice>
-                <value>font-color</value>
-                <ref name="color"/>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-tab-stop-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:leader-text" a:defaultValue=" ">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-tab-stop-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:leader-text-style">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:tab-stop-distance">
-            <ref name="nonNegativeLength"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:hyphenation-keep">
-            <choice>
-                <value>auto</value>
-                <value>page</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:hyphenation-ladder-count">
-            <choice>
-                <value>no-limit</value>
-                <ref name="positiveInteger"/>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-elements" combine="interleave">
-    <ref name="style-drop-cap"/>
-</define>
-
-<define name="style-drop-cap">
-    <optional>
-        <element name="style:drop-cap">
-            <ref name="style-drop-cap-attlist"/>
-            <empty/>
-        </element>
-    </optional>
-</define>
-<define name="style-drop-cap-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:length" a:defaultValue="1">
-            <choice>
-                <value>word</value>
-                <ref name="positiveInteger"/>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-drop-cap-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:lines" a:defaultValue="1">
-            <ref name="positiveInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-drop-cap-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:distance" a:defaultValue="0cm">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-drop-cap-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-        <optional>
-            <attribute name="style:register-true">
-                <ref name="boolean"/>
-            </attribute>
-        </optional>
-    </define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <ref name="common-horizontal-margin-attlist"/>
-</define>
-
-<define name="common-horizontal-margin-attlist">
-    <optional>
-        <attribute name="fo:margin-left">
-            <choice>
-                <ref name="length"/>
-                <ref name="percent"/>
-            </choice>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="fo:margin-right">
-            <choice>
-                <ref name="length"/>
-                <ref name="percent"/>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:text-indent">
-            <choice>
-                <ref name="length"/>
-                <ref name="percent"/>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:auto-text-indent">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <ref name="common-vertical-margin-attlist"/>
-</define>
-
-<define name="common-vertical-margin-attlist">
-    <optional>
-        <attribute name="fo:margin-top">
-            <choice>
-                <ref name="nonNegativeLength"/>
-                <ref name="percent"/>
-            </choice>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="fo:margin-bottom">
-            <choice>
-                <ref name="nonNegativeLength"/>
-                <ref name="percent"/>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <ref name="common-margin-attlist"/>
-</define>
-
-<define name="common-margin-attlist">
-    <optional>
-        <attribute name="fo:margin">
-            <choice>
-                <ref name="nonNegativeLength"/>
-                <ref name="percent"/>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <ref name="common-break-attlist"/>
-</define>
-
-<define name="common-break-attlist">
-    <optional>
-        <attribute name="fo:break-before">
-            <choice>
-                <value>auto</value>
-                <value>column</value>
-                <value>page</value>
-            </choice>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="fo:break-after">
-            <choice>
-                <value>auto</value>
-                <value>column</value>
-                <value>page</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <ref name="common-background-color-attlist"/>
-</define>
-
-<define name="common-background-color-attlist">
-    <optional>
-        <attribute name="fo:background-color">
-            <choice>
-                <value>transparent</value>
-                <ref name="color"/>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-elements" combine="interleave">
-    <ref name="style-background-image"/>
-</define>
-
-<define name="style-background-image">
-    <optional>
-        <element name="style:background-image">
-            <ref name="style-background-image-attlist"/>
-            <choice>
-                <ref name="common-draw-data-attlist"/>
-                <ref name="office-binary-data"/>
-                <empty/>
-            </choice>
-        </element>
-    </optional>
-</define>
-<define name="style-background-image-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:repeat" a:defaultValue="repeat">
-            <choice>
-                <value>no-repeat</value>
-                <value>repeat</value>
-                <value>stretch</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-background-image-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:position" a:defaultValue="center">
-            <choice>
-                <value>left</value>
-                <value>center</value>
-                <value>right</value>
-                <value>top</value>
-                <value>bottom</value>
-                <list>
-                    <ref name="horiBackPos"/>
-                    <ref name="vertBackPos"/>
-                </list>
-                <list>
-                    <ref name="vertBackPos"/>
-                    <ref name="horiBackPos"/>
-                </list>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-
-<define name="horiBackPos">
-    <choice>
-        <value>left</value>
-        <value>center</value>
-        <value>right</value>
-    </choice>
-</define>
-<define name="vertBackPos">
-    <choice>
-        <value>top</value>
-        <value>center</value>
-        <value>bottom</value>
-    </choice>
-</define>
-<define name="style-background-image-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:filter-name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-background-image-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:opacity">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <ref name="common-border-attlist"/>
-</define>
-
-<define name="common-border-attlist">
-    <optional>
-        <attribute name="fo:border">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="fo:border-top">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="fo:border-bottom">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="fo:border-left">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="fo:border-right">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <ref name="common-border-line-width-attlist"/>
-</define>
-
-<define name="common-border-line-width-attlist">
-    <optional>
-        <attribute name="style:border-line-width">
-            <ref name="borderWidths"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:border-line-width-top">
-            <ref name="borderWidths"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:border-line-width-bottom">
-            <ref name="borderWidths"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:border-line-width-left">
-            <ref name="borderWidths"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:border-line-width-right">
-            <ref name="borderWidths"/>
-        </attribute>
-    </optional>
-</define>
-
-<define name="borderWidths">
-    <list>
-        <ref name="positiveLength"/>
-        <ref name="positiveLength"/>
-        <ref name="positiveLength"/>
-    </list>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <ref name="common-padding-attlist"/>
-</define>
-
-<define name="common-padding-attlist">
-    <optional>
-        <attribute name="fo:padding">
-            <ref name="nonNegativeLength"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="fo:padding-top">
-            <ref name="nonNegativeLength"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="fo:padding-bottom">
-            <ref name="nonNegativeLength"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="fo:padding-left">
-            <ref name="nonNegativeLength"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="fo:padding-right">
-            <ref name="nonNegativeLength"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <ref name="common-shadow-attlist"/>
-</define>
-
-<define name="common-shadow-attlist">
-    <optional>
-        <attribute name="style:shadow">
-            <ref name="shadowType"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <ref name="common-keep-with-next-attlist"/>
-</define>
-
-<define name="common-keep-with-next-attlist">
-    <optional>
-        <attribute name="fo:keep-with-next">
-            <choice>
-                <value>auto</value>
-                <value>always</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:number-lines" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:line-number">
-            <ref name="nonNegativeInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:text-autospace">
-            <choice>
-                <value>none</value>
-                <value>ideograph-alpha</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:punctuation-wrap">
-            <choice>
-                <value>simple</value>
-                <value>hanging</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:line-break">
-            <choice>
-                <value>normal</value>
-                <value>strict</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:vertical-align" a:defaultValue="auto">
-            <choice>
-                <value>top</value>
-                <value>middle</value>
-                <value>bottom</value>
-                <value>auto</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <ref name="common-writing-mode-attlist"/>
-</define>
-
-<define name="common-writing-mode-attlist">
-    <optional>
-        <attribute name="style:writing-mode">
-            <choice>
-                <value>lr-tb</value>
-                <value>rl-tb</value>
-                <value>tb-rl</value>
-                <value>tb-lr</value>
-                <value>lr</value>
-                <value>rl</value>
-                <value>tb</value>
-                <value>page</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:writing-mode-automatic">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:snap-to-layout-grid">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <ref name="common-page-number-attlist"/>
-</define>
-
-<define name="common-page-number-attlist">
-    <optional>
-        <attribute name="style:page-number">
-            <ref name="positiveInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:background-transparency">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-ruby-properties">
-    <element name="style:ruby-properties">
-        <ref name="style-ruby-properties-content"/>
-    </element>
-</define>
-
-<define name="style-ruby-properties-content">
-    <ref name="style-properties-content"/>
-</define>
-
-<define name="style-ruby-properties-content-strict">
-    <ref name="style-ruby-properties-attlist"/>
-    <ref name="style-ruby-properties-elements"/>
-</define>
-
-<define name="style-ruby-properties-elements">
-    <empty/>
-</define>
-<define name="style-ruby-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:ruby-position">
-            <choice>
-                <value>above</value>
-                <value>below</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-ruby-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:ruby-align">
-            <choice>
-                <value>left</value>
-                <value>center</value>
-                <value>right</value>
-                <value>distribute-letter</value>
-                <value>distribute-space</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-section-properties">
-    <element name="style:section-properties">
-        <ref name="style-section-properties-content"/>
-    </element>
-</define>
-
-<define name="style-section-properties-content">
-    <ref name="style-properties-content"/>
-</define>
-
-<define name="style-section-properties-content-strict">
-    <ref name="style-section-properties-attlist"/>
-    <ref name="style-section-properties-elements"/>
-</define>
-<define name="style-section-properties-attlist" combine="interleave">
-    <ref name="common-background-color-attlist"/>
-</define>
-<define name="style-section-properties-elements" combine="interleave">
-    <ref name="style-background-image"/>
-</define>
-<define name="style-section-properties-attlist" combine="interleave">
-    <ref name="common-horizontal-margin-attlist"/>
-</define>
-<define name="style-section-properties-elements" combine="interleave">
-    <ref name="style-columns"/>
-</define>
-
-<define name="style-columns">
-    <optional>
-        <element name="style:columns">
-            <ref name="style-columns-attlist"/>
-            <optional>
-                <ref name="style-column-sep"/>
-            </optional>
-            <zeroOrMore>
-                <ref name="style-column"/>
-            </zeroOrMore>
-        </element>
-    </optional>
-</define>
-<define name="style-columns-attlist" combine="interleave">
-    <attribute name="fo:column-count">
-        <ref name="positiveInteger"/>
-    </attribute>
-</define>
-<define name="style-columns-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:column-gap">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-column">
-    <element name="style:column">
-        <ref name="style-column-attlist"/>
-    </element>
-</define>
-<define name="style-column-attlist" combine="interleave">
-    <attribute name="style:rel-width">
-        <ref name="relativeLength"/>
-    </attribute>
-</define>
-<define name="style-column-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:start-indent" a:defaultValue="0cm">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-column-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:end-indent" a:defaultValue="0cm">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-column-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:space-before" a:defaultValue="0cm">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-column-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:space-after" a:defaultValue="0cm">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-column-sep">
-    <element name="style:column-sep">
-        <ref name="style-column-sep-attlist"/>
-    </element>
-</define>
-<define name="style-column-sep-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:style" a:defaultValue="solid">
-            <choice>
-                <value>none</value>
-                <value>solid</value>
-                <value>dotted</value>
-                <value>dashed</value>
-                <value>dot-dashed</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-column-sep-attlist" combine="interleave">
-    <attribute name="style:width">
-        <ref name="length"/>
-    </attribute>
-</define>
-<define name="style-column-sep-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:height" a:defaultValue="100%">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-column-sep-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:vertical-align" a:defaultValue="top">
-            <choice>
-                <value>top</value>
-                <value>middle</value>
-                <value>bottom</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-column-sep-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:color" a:defaultValue="#000000">
-            <ref name="color"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-section-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:protect" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-section-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:dont-balance-text-columns">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-section-properties-attlist" combine="interleave">
-    <ref name="common-writing-mode-attlist"/>
-</define>
-<define name="style-section-properties-elements" combine="interleave">
-    <zeroOrMore>
-        <ref name="text-notes-configuration"/>
-    </zeroOrMore>
-</define>
-<define name="style-table-properties">
-    <element name="style:table-properties">
-        <ref name="style-table-properties-content"/>
-    </element>
-</define>
-
-<define name="style-table-properties-content">
-    <ref name="style-properties-content"/>
-</define>
-
-<define name="style-table-properties-content-strict">
-    <ref name="style-table-properties-attlist"/>
-    <ref name="style-table-properties-elements"/>
-</define>
-<define name="style-table-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:width">
-            <ref name="positiveLength"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:rel-width">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-table-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:align">
-            <choice>
-                <value>left</value>
-                <value>center</value>
-                <value>right</value>
-                <value>margins</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-table-properties-attlist" combine="interleave">
-    <ref name="common-horizontal-margin-attlist"/>
-</define>
-<define name="style-table-properties-attlist" combine="interleave">
-    <ref name="common-vertical-margin-attlist"/>
-</define>
-<define name="style-table-properties-attlist" combine="interleave">
-    <ref name="common-margin-attlist"/>
-</define>
-<define name="style-table-properties-attlist" combine="interleave">
-    <ref name="common-page-number-attlist"/>
-</define>
-<define name="style-table-properties-attlist" combine="interleave">
-    <ref name="common-break-attlist"/>
-</define>
-<define name="style-table-properties-attlist" combine="interleave">
-    <ref name="common-background-color-attlist"/>
-</define>
-<define name="style-table-properties-elements" combine="interleave">
-    <ref name="style-background-image"/>
-</define>
-<define name="style-table-properties-attlist" combine="interleave">
-    <ref name="common-shadow-attlist"/>
-</define>
-<define name="style-table-properties-attlist" combine="interleave">
-    <ref name="common-keep-with-next-attlist"/>
-</define>
-<define name="style-table-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:may-break-between-rows">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-table-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:border-model">
-            <choice>
-                <value>collapsing</value>
-                <value>separating</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-table-properties-attlist" combine="interleave">
-    <ref name="common-writing-mode-attlist"/>
-</define>
-<define name="style-table-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:display">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-table-column-properties">
-    <element name="style:table-column-properties">
-        <ref name="style-table-column-properties-content"/>
-    </element>
-</define>
-
-<define name="style-table-column-properties-content">
-    <ref name="style-properties-content"/>
-</define>
-
-<define name="style-table-column-properties-content-strict">
-    <ref name="style-table-column-properties-attlist"/>
-    <ref name="style-table-column-properties-elements"/>
-</define>
-
-<define name="style-table-column-properties-elements">
-    <empty/>
-</define>
-<define name="style-table-column-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:column-width">
-            <ref name="positiveLength"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:rel-column-width">
-            <ref name="relativeLength"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-table-column-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:use-optimal-column-width">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-table-column-properties-attlist" combine="interleave">
-    <ref name="common-break-attlist"/>
-</define>
-<define name="style-table-row-properties">
-    <element name="style:table-row-properties">
-        <ref name="style-table-row-properties-content"/>
-    </element>
-</define>
-
-<define name="style-table-row-properties-content">
-    <ref name="style-properties-content"/>
-</define>
-
-<define name="style-table-row-properties-content-strict">
-    <ref name="style-table-row-properties-attlist"/>
-    <ref name="style-table-row-properties-elements"/>
-</define>
-<define name="style-table-row-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:row-height">
-            <ref name="positiveLength"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:min-row-height">
-            <ref name="nonNegativeLength"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-table-row-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:use-optimal-row-height">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-table-row-properties-attlist" combine="interleave">
-    <ref name="common-background-color-attlist"/>
-</define>
-<define name="style-table-row-properties-elements" combine="interleave">
-    <ref name="style-background-image"/>
-</define>
-<define name="style-table-row-properties-attlist" combine="interleave">
-    <ref name="common-break-attlist"/>
-</define>
-<define name="style-table-row-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:keep-together">
-            <choice>
-                <value>auto</value>
-                <value>always</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-table-cell-properties">
-    <element name="style:table-cell-properties">
-        <ref name="style-table-cell-properties-content"/>
-    </element>
-</define>
-
-<define name="style-table-cell-properties-content">
-    <ref name="style-properties-content"/>
-</define>
-
-<define name="style-table-cell-properties-content-strict">
-    <ref name="style-table-cell-properties-attlist"/>
-    <ref name="style-table-cell-properties-elements"/>
-</define>
-<define name="style-table-cell-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:vertical-align">
-            <choice>
-                <value>top</value>
-                <value>middle</value>
-                <value>bottom</value>
-                <value>automatic</value>
-            </choice>
-            </attribute>
-    </optional>
-</define>
-<define name="style-table-cell-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:text-align-source">
-            <choice>
-                <value>fix</value>
-                <value>value-type</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-table-cell-properties-attlist" combine="interleave">
-    <ref name="common-style-direction-attlist"/>
-</define>
-
-<define name="common-style-direction-attlist">
-    <optional>
-        <attribute name="style:direction">
-            <choice>
-                <value>ltr</value>
-                <value>ttb</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-table-cell-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:glyph-orientation-vertical">
-            <choice>
-                <value>auto</value>
-                <value>0</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-table-cell-properties-attlist" combine="interleave">
-    <ref name="common-shadow-attlist"/>
-</define>
-<define name="style-table-cell-properties-attlist" combine="interleave">
-    <ref name="common-background-color-attlist"/>
-</define>
-<define name="style-table-cell-properties-elements" combine="interleave">
-    <ref name="style-background-image"/>
-</define>
-<define name="style-table-cell-properties-attlist" combine="interleave">
-    <ref name="common-border-attlist"/>
-</define>
-<define name="style-table-cell-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:diagonal-tl-br">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:diagonal-tl-br-widths">
-            <ref name="borderWidths"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:diagonal-bl-tr">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:diagonal-bl-tr-widths">
-            <ref name="borderWidths"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-table-cell-properties-attlist" combine="interleave">
-    <ref name="common-border-line-width-attlist"/>
-</define>
-<define name="style-table-cell-properties-attlist" combine="interleave">
-    <ref name="common-padding-attlist"/>
-</define>
-<define name="style-table-cell-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:wrap-option">
-            <choice>
-                <value>no-wrap</value>
-                <value>wrap</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-table-cell-properties-attlist" combine="interleave">
-    <ref name="common-rotation-angle-attlist"/>
-</define>
-
-<define name="common-rotation-angle-attlist">
-    <optional>
-        <attribute name="style:rotation-angle">
-            <ref name="nonNegativeInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-table-cell-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:rotation-align">
-            <choice>
-                <value>none</value>
-                <value>bottom</value>
-                <value>top</value>
-                <value>center</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-table-cell-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:cell-protect">
-            <choice>
-                <value>none</value>
-                <value>hidden-and-protected</value>
-                <list>
-                    <oneOrMore>
-                        <choice>
-                            <value>protected</value>
-                            <value>formula-hidden</value>
-                        </choice>
-                    </oneOrMore>
-                </list>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-table-cell-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:print-content">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-table-cell-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:decimal-places">
-            <ref name="nonNegativeInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-table-cell-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:repeat-content">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-table-cell-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:shrink-to-fit">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-list-level-properties">
-    <element name="style:list-level-properties">
-        <ref name="style-list-level-properties-content"/>
-    </element>
-</define>
-
-<define name="style-list-level-properties-content">
-    <ref name="style-properties-content"/>
-</define>
-
-<define name="style-list-level-properties-content-strict">
-    <ref name="style-list-level-properties-attlist"/>
-    <ref name="style-list-level-properties-elements"/>
-</define>
-
-<define name="style-list-level-properties-elements">
-    <empty/>
-</define>
-<define name="style-list-level-properties-attlist" combine="interleave">
-    <ref name="common-text-align"/>
-</define>
-<define name="style-list-level-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:space-before">
-            <ref name="nonNegativeLength"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-list-level-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:min-label-width">
-            <ref name="nonNegativeLength"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-list-level-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:min-label-distance">
-            <ref name="nonNegativeLength"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-list-level-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:font-name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-list-level-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:width">
-            <ref name="positiveLength"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="fo:height">
-            <ref name="positiveLength"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-list-level-properties-attlist" combine="interleave">
-    <ref name="common-vertical-rel-attlist"/>
-    <ref name="common-vertical-pos-attlist"/>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:stroke">
-            <choice>
-                <value>none</value>
-                <value>dash</value>
-                <value>solid</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:stroke-dash">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:stroke-dash-names">
-            <ref name="styleNameRefs"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="svg:stroke-width">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="svg:stroke-color">
-            <ref name="color"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:marker-start">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:marker-end">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:marker-start-width">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:marker-end-width">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:marker-start-center">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:marker-end-center">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="svg:stroke-opacity">
-            <choice>
-                <data type="double">
-                    <param name="minInclusive">0</param>
-                    <param name="maxInclusive">1</param>
-                </data>
-                <ref name="percent"/>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:stroke-linejoin">
-            <choice>
-                <value>miter</value>
-                <value>round</value>
-                <value>bevel</value>
-                <value>middle</value>
-                <value>none</value>
-                <value>inherit</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-fill-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:fill">
-            <choice>
-                <value>none</value>
-                <value>solid</value>
-                <value>bitmap</value>
-                <value>gradient</value>
-                <value>hatch</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-fill-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:fill-color">
-            <ref name="color"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-fill-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:secondary-fill-color">
-            <ref name="color"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-fill-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:fill-gradient-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-fill-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:gradient-step-count">
-            <ref name="nonNegativeInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-fill-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:fill-hatch-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-fill-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:fill-hatch-solid">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-fill-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:fill-image-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-fill-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:repeat">
-            <choice>
-                <value>no-repeat</value>
-                <value>repeat</value>
-                <value>stretch</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-fill-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:fill-image-width">
-            <choice>
-                <ref name="length"/>
-                <ref name="percent"/>
-            </choice>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="draw:fill-image-height">
-            <choice>
-                <ref name="length"/>
-                <ref name="percent"/>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-fill-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:fill-image-ref-point-x">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="draw:fill-image-ref-point-y">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="draw:fill-image-ref-point">
-            <choice>
-                <value>top-left</value>
-                <value>top</value>
-                <value>top-right</value>
-                <value>left</value>
-                <value>center</value>
-                <value>right</value>
-                <value>bottom-left</value>
-                <value>bottom</value>
-                <value>bottom-right</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-fill-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:tile-repeat-offset"/>
-    </optional>
-</define>
-<define name="style-graphic-fill-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:opacity">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-fill-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:opacity-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-fill-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="svg:fill-rule">
-            <choice>
-                <value>nonzero</value>
-                <value>evenodd</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:symbol-color">
-            <ref name="color"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:animation">
-            <choice>
-                <value>none</value>
-                <value>scroll</value>
-                <value>alternate</value>
-                <value>slide</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:animation-direction">
-            <choice>
-                <value>left</value>
-                <value>right</value>
-                <value>up</value>
-                <value>down</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:animation-start-inside">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:animation-stop-inside">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:animation-repeat">
-            <ref name="nonNegativeInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:animation-delay">
-            <ref name="duration"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:animation-steps">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:auto-grow-width">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="draw:auto-grow-height">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:fit-to-size">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:fit-to-contour">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:textarea-vertical-align">
-            <choice>
-                <value>top</value>
-                <value>middle</value>
-                <value>bottom</value>
-                <value>justify</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:textarea-horizontal-align">
-            <choice>
-                <value>left</value>
-                <value>center</value>
-                <value>right</value>
-                <value>justify</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:wrap-option">
-            <choice>
-                <value>no-wrap</value>
-                <value>wrap</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-elements" combine="interleave">
-    <optional>
-        <ref name="text-list-style"/>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:color-mode">
-            <choice>
-                <value>greyscale</value>
-                <value>mono</value>
-                <value>watermark</value>
-                <value>standard</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:color-inversion">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:luminance">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:contrast">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:gamma">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:red">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:green">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:blue">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:image-opacity">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:shadow">
-            <choice>
-                <value>visible</value>
-                <value>hidden</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:shadow-offset-x">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="draw:shadow-offset-y">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:shadow-color">
-            <ref name="color"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:shadow-opacity">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:start-line-spacing-horizontal">
-            <ref name="distance"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="draw:start-line-spacing-vertical">
-            <ref name="distance"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:end-line-spacing-horizontal">
-            <ref name="distance"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="draw:end-line-spacing-vertical">
-            <ref name="distance"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:line-distance">
-            <ref name="distance"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:guide-overhang">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:guide-distance">
-            <ref name="distance"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:start-guide">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:end-guide">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:placing">
-            <choice>
-                <value>below</value>
-                <value>above</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:parallel">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:measure-align">
-            <choice>
-                <value>automatic</value>
-                <value>left-outside</value>
-                <value>inside</value>
-                <value>right-outside</value>
-            </choice>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="draw:measure-vertical-align">
-            <choice>
-                <value>automatic</value>
-                <value>above</value>
-                <value>below</value>
-                <value>center</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:unit">
-            <choice>
-                <value>automatic</value>
-                <value>mm</value>
-                <value>cm</value>
-                <value>m</value>
-                <value>km</value>
-                <value>pt</value>
-                <value>pc</value>
-                <value>inch</value>
-                <value>ft</value>
-                <value>mi</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:show-unit">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:decimal-places">
-            <ref name="nonNegativeInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:caption-type">
-            <choice>
-                <value>straight-line</value>
-                <value>angled-line</value>
-                <value>angled-connector-line</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:caption-angle-type">
-            <choice>
-                <value>fixed</value>
-                <value>free</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:caption-angle">
-            <ref name="nonNegativeInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:caption-gap">
-            <ref name="distance"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:caption-escape-direction">
-            <choice>
-                <value>horizontal</value>
-                <value>vertical</value>
-                <value>auto</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:caption-escape">
-            <choice>
-                <ref name="length"/>
-                <ref name="percent"/>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:caption-line-length">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:caption-fit-line-length">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:horizontal-segments">
-            <ref name="nonNegativeInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:vertical-segments">
-            <ref name="nonNegativeInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:edge-rounding">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:edge-rounding-mode">
-            <choice>
-                <value>correct</value>
-                <value>attractive</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:back-scale">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:depth">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:backface-culling">
-            <choice>
-                <value>enabled</value>
-                <value>disabled</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:end-angle">
-            <ref name="nonNegativeInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:close-front">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:close-back">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:lighting-mode">
-            <choice>
-                <value>standard</value>
-                <value>double-sided</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:normals-kind">
-            <choice>
-                <value>object</value>
-                <value>flat</value>
-                <value>sphere</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:normals-direction">
-            <choice>
-                <value>normal</value>
-                <value>inverse</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:texture-generation-mode-x">
-            <choice>
-                <value>object</value>
-                <value>parallel</value>
-                <value>sphere</value>
-            </choice>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="dr3d:texture-generation-mode-y">
-            <choice>
-                <value>object</value>
-                <value>parallel</value>
-                <value>sphere</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:texture-kind">
-            <choice>
-                <value>luminance</value>
-                <value>intesity</value>
-                <value>color</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:texture-filter">
-            <choice>
-                <value>enabled</value>
-                <value>disabled</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:texture-mode">
-            <choice>
-                <value>replace</value>
-                <value>modulate</value>
-                <value>blend</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:ambient-color">
-            <ref name="color"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="dr3d:emissive-color">
-            <ref name="color"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="dr3d:specular-color">
-            <ref name="color"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="dr3d:diffuse-color">
-            <ref name="color"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:shininess">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:shadow">
-            <choice>
-                <value>visible</value>
-                <value>hidden</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <ref name="common-draw-rel-size-attlist"/>
-    <optional>
-        <attribute name="fo:min-width">
-            <choice>
-                <ref name="length"/>
-                <ref name="percent"/>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:min-height">
-            <choice>
-                <ref name="length"/>
-                <ref name="percent"/>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:max-height">
-            <choice>
-                <ref name="length"/>
-                <ref name="percent"/>
-            </choice>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="fo:max-width">
-            <choice>
-                <ref name="length"/>
-                <ref name="percent"/>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <ref name="common-horizontal-margin-attlist"/>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <ref name="common-vertical-margin-attlist"/>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <ref name="common-margin-attlist"/>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:print-content">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:protect">
-            <choice>
-                <value>none</value>
-                <list>
-                    <oneOrMore>
-                        <choice>
-                            <value>content</value>
-                            <value>position</value>
-                            <value>size</value>
-                        </choice>
-                    </oneOrMore>
-                </list>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:horizontal-pos">
-            <choice>
-                <value>left</value>
-                <value>center</value>
-                <value>right</value>
-                <value>from-left</value>
-                <value>inside</value>
-                <value>outside</value>
-                <value>from-inside</value>
-            </choice>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:x">
-            <ref name="coordinate"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:horizontal-rel">
-            <choice>
-                    <value>page</value>
-                <value>page-content</value>
-                <value>page-start-margin</value>
-                <value>page-end-margin</value>
-                <value>frame</value>
-                <value>frame-content</value>
-                <value>frame-start-margin</value>
-                <value>frame-end-margin</value>
-                <value>paragraph</value>
-                <value>paragraph-content</value>
-                <value>paragraph-start-margin</value>
-                <value>paragraph-end-margin</value>
-                <value>char</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <ref name="common-vertical-pos-attlist"/>
-</define>
-
-<define name="common-vertical-pos-attlist">
-    <optional>
-        <attribute name="style:vertical-pos">
-            <choice>
-                <value>top</value>
-                <value>middle</value>
-                <value>bottom</value>
-                <value>from-top</value>
-                <value>below</value>
-            </choice>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:y">
-            <ref name="coordinate"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <ref name="common-vertical-rel-attlist"/>
-</define>
-
-<define name="common-vertical-rel-attlist">
-    <optional>
-        <attribute name="style:vertical-rel">
-            <choice>
-                <value>page</value>
-                <value>page-content</value>
-                <value>frame</value>
-                <value>frame-content</value>
-                <value>paragraph</value>
-                <value>paragraph-content</value>
-                <value>char</value>
-                <value>line</value>
-                <value>baseline</value>
-                <value>text</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <ref name="common-text-anchor-attlist"/>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <ref name="common-border-attlist"/>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <ref name="common-border-line-width-attlist"/>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <ref name="common-padding-attlist"/>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <ref name="common-shadow-attlist"/>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <ref name="common-background-color-attlist"/>
-</define>
-<define name="style-graphic-properties-elements" combine="interleave">
-    <ref name="style-background-image"/>
-</define>
-<define name="style-graphic-properties-elements" combine="interleave">
-    <ref name="style-columns"/>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:editable">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:wrap">
-            <choice>
-                <value>none</value>
-                <value>left</value>
-                <value>right</value>
-                <value>parallel</value>
-                <value>dynamic</value>
-                <value>run-through</value>
-                <value>biggest</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:wrap-dynamic-treshold">
-            <ref name="nonNegativeLength"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:number-wrapped-paragraphs">
-            <choice>
-                <value>no-limit</value>
-                <ref name="positiveInteger"/>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:wrap-contour">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:wrap-contour-mode">
-            <choice>
-                <value>full</value>
-                <value>outside</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:run-through">
-            <choice>
-                <value>foreground</value>
-                <value>background</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:flow-with-text">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:overflow-behavior">
-            <choice>
-                <value>clip</value>
-                <value>auto-create-new-frame</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:mirror">
-            <choice>
-                <value>none</value>
-                <value>vertical</value>
-                <ref name="horizontal-mirror"/>
-                <list>
-                    <value>vertical</value>
-                    <ref name="horizontal-mirror"/>
-                </list>
-                <list>
-                    <ref name="horizontal-mirror"/>
-                    <value>vertical</value>
-                </list>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-
-<define name="horizontal-mirror">
-    <choice>
-        <value>horizontal</value>
-        <value>horizontal-on-odd</value>
-        <value>horizontal-on-even</value>
-    </choice>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:clip">
-            <!-- The attribute value must match the one XSL's clip -->
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:wrap-influence-on-position"
-                    a:defaultValue="iterative">
-            <choice>
-                <value>iterative</value>
-                <value>once-concurrent</value>
-                <value>once-successive</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:frame-display-scrollbar">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:frame-display-border">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:frame-margin-horizontal">
-            <ref name="nonNegativePixelLength"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="draw:frame-margin-vertical">
-            <ref name="nonNegativePixelLength"/>
-        </attribute>
-    </optional>
-</define>
-
-<define name="nonNegativePixelLength">
-    <data type="string">
-        <param name="pattern">([0-9]+(\.[0-9]*)?|\.[0-9]+)(px)</param>
-    </data>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:visible-area-left">
-            <ref name="nonNegativeLength"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="draw:visible-area-top">
-            <ref name="nonNegativeLength"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="draw:visible-area-width">
-            <ref name="positiveLength"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="draw:visible-area-height">
-            <ref name="positiveLength"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:ole-draw-aspect">
-            <ref name="nonNegativeInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-chart-properties">
-    <element name="style:chart-properties">
-        <ref name="style-chart-properties-content"/>
-    </element>
-</define>
-
-<define name="style-chart-properties-content">
-    <ref name="style-properties-content"/>
-</define>
-
-<define name="style-chart-properties-content-strict">
-    <ref name="style-chart-properties-attlist"/>
-    <ref name="style-chart-properties-elements"/>
-</define>
-
-<define name="style-chart-properties-elements">
-    <empty/>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:scale-text" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:three-dimensional">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:deep">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <choice>
-        <attribute name="chart:symbol-type">
-            <value>none</value>
-        </attribute>
-        <attribute name="chart:symbol-type">
-            <value>automatic</value>
-        </attribute>
-        <group>
-            <attribute name="chart:symbol-type">
-                <value>named-symbol</value>
-            </attribute>
-            <attribute name="chart:symbol-name">
-                <choice>
-                    <value>square</value>
-                    <value>diamond</value>
-                    <value>arrow-down</value>
-                    <value>arrow-up</value>
-                    <value>arrow-right</value>
-                    <value>arrow-left</value>
-                    <value>bow-tie</value>
-                    <value>hourglass</value>
-                    <value>circle</value>
-                    <value>star</value>
-                    <value>x</value>
-                    <value>plus</value>
-                    <value>asterisk</value>
-                    <value>horizontal-bar</value>
-                    <value>vertical-bar</value>
-                </choice>
-            </attribute>
-        </group>
-        <group>
-            <attribute name="chart:symbol-type">
-                <value>image</value>
-            </attribute>
-            <element name="chart:symbol-image">
-                <attribute name="xlink:href">
-                    <ref name="anyURI"/>
-                </attribute>
-            </element>
-        </group>
-        <empty/>
-    </choice>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:symbol-width">
-            <ref name="nonNegativeLength"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="chart:symbol-height">
-            <ref name="nonNegativeLength"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:vertical" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:connect-bars" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:gap-width">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="chart:overlap">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:japanese-candle-stick"
-                    a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:interpolation" a:defaultValue="none">
-            <choice>
-                <value>none</value>
-                <value>cubic-spline</value>
-                <value>b-spline</value>
-            </choice>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="chart:spline-order" a:defaultValue="2">
-            <ref name="positiveInteger"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="chart:spline-resolution" a:defaultValue="20">
-            <ref name="positiveInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:pie-offset" a:defaultValue="0">
-            <ref name="nonNegativeInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:lines" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:solid-type" a:defaultValue="cuboid">
-            <choice>
-                <value>cuboid</value>
-                <value>cylinder</value>
-                <value>cone</value>
-                <value>pyramid</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:stacked" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="chart:percentage" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:link-data-style-to-source">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:visible">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:logarithmic">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:maximum">
-            <ref name="double"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="chart:minimum">
-            <ref name="double"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="chart:origin">
-            <ref name="double"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="chart:interval-major">
-            <ref name="double"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="chart:interval-minor">
-            <ref name="positiveInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:tick-marks-major-inner">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="chart:tick-marks-major-outer">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="chart:tick-marks-minor-inner">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="chart:tick-marks-minor-outer">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:display-label">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="chart:text-overlap">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="text:line-break">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="chart:label-arrangement"
-                   a:defaultValue="side-by-side">
-            <choice>
-                <value>side-by-side</value>
-                <value>stagger-even</value>
-                <value>stagger-odd</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <ref name="common-style-direction-attlist"/>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <ref name="common-rotation-angle-attlist"/>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:data-label-number">
-            <choice>
-                <value>none</value>
-                <value>value</value>
-                <value>percentage</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:data-label-text">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:data-label-symbol">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:mean-value">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:error-category" a:defaultValue="none">
-            <choice>
-                <value>none</value>
-                <value>variance</value>
-                <value>standard-deviation</value>
-                <value>percentage</value>
-                <value>error-margin</value>
-                <value>constant</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:error-percentage">
-            <ref name="double"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:error-margin">
-            <ref name="double"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:error-lower-limit">
-            <ref name="double"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="chart:error-upper-limit">
-            <ref name="double"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:error-upper-indicator">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="chart:error-lower-indicator">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:series-source" a:defaultValue="columns">
-            <choice>
-                <value>columns</value>
-                <value>rows</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:regression-type" a:defaultValue="none">
-            <choice>
-                <value>none</value>
-                <value>linear</value>
-                <value>logarithmic</value>
-                <value>exponential</value>
-                <value>power</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-drawing-page-properties-attlist"
-        combine="interleave">
-    <optional>
-        <attribute name="presentation:transition-type">
-            <choice>
-                <value>manual</value>
-                <value>automatic</value>
-                <value>semi-automatic</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-drawing-page-properties-attlist"
-         combine="interleave">
-    <optional>
-        <attribute name="presentation:transition-style">
-            <choice>
-                <value>none</value>
-                <value>fade-from-left</value>
-                <value>fade-from-top</value>
-                <value>fade-from-right</value>
-                <value>fade-from-bottom</value>
-                <value>fade-from-upperleft</value>
-                <value>fade-from-upperright</value>
-                <value>fade-from-lowerleft</value>
-                <value>fade-from-lowerright</value>
-                <value>move-from-left</value>
-                <value>move-from-top</value>
-                <value>move-from-right</value>
-                <value>move-from-bottom</value>
-                <value>move-from-upperleft</value>
-                <value>move-from-upperright</value>
-                <value>move-from-lowerleft</value>
-                <value>move-from-lowerright</value>
-                <value>uncover-to-left</value>
-                <value>uncover-to-top</value>
-                <value>uncover-to-right</value>    
-                <value>uncover-to-bottom</value>
-                <value>uncover-to-upperleft</value>
-                <value>uncover-to-upperright</value>
-                <value>uncover-to-lowerleft</value>
-                <value>uncover-to-lowerright</value>
-                <value>fade-to-center</value>
-                <value>fade-from-center</value>
-                <value>vertical-stripes</value>
-                <value>horizontal-stripes</value>
-                <value>clockwise</value>
-                <value>counterclockwise</value>
-                <value>open-vertical</value>
-                <value>open-horizontal</value>
-                <value>close-vertical</value>
-                <value>close-horizontal</value>
-                <value>wavyline-from-left</value>
-                <value>wavyline-from-top</value>
-                <value>wavyline-from-right</value>
-                <value>wavyline-from-bottom</value>
-                <value>spiralin-left</value>
-                <value>spiralin-right</value>
-                <value>spiralout-left</value>
-                <value>spiralout-right</value>
-                <value>roll-from-top</value>
-                <value>roll-from-left</value>
-                <value>roll-from-right</value>
-                <value>roll-from-bottom</value>
-                <value>stretch-from-left</value>
-                <value>stretch-from-top</value>
-                <value>stretch-from-right</value>
-                <value>stretch-from-bottom</value>
-
-                <value>vertical-lines</value>
-                <value>horizontal-lines</value>
-                <value>dissolve</value>
-                <value>random</value>
-                <value>vertical-checkerboard</value>
-                <value>horizontal-checkerboard</value>
-                <value>interlocking-horizontal-left</value>
-                <value>interlocking-horizontal-right</value>
-                <value>interlocking-vertical-top</value>
-                <value>interlocking-vertical-bottom</value>
-                <value>fly-away</value>
-                <value>open</value>
-                <value>close</value>
-                <value>melt</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-drawing-page-properties-attlist"
-        combine="interleave">
-    <optional>
-        <attribute name="presentation:transition-speed">
-            <ref name="presentationSpeeds"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-drawing-page-properties-attlist " combine="interleave">
-    <optional>
-        <attribute name="smil:type">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-drawing-page-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="smil:subtype">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-drawing-page-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="smil:direction" a:defaultValue="forward">
-            <choice>
-                <value>forward</value>
-                <value>reverse</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-drawing-page-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="smil:fadeColor">
-            <choice>
-                <value>forward</value>
-                <value>reverse</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-drawing-page-properties-attlist"
-        combine="interleave">
-    <optional>
-        <attribute name="presentation:duration">
-            <ref name="duration"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-drawing-page-properties-attlist"
-         combine="interleave">
-    <optional>
-        <attribute name="presentation:visibility">
-            <choice>
-                <value>visible</value>
-                <value>hidden</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-drawing-page-properties-elements"
-         combine="interleave">
-    <optional>
-        <ref name="presentation-sound"/>
-    </optional>
-</define>
-<define name="style-drawing-page-properties-attlist"
-         combine="interleave">
-    <optional>
-        <attribute name="draw:background-size">
-            <choice>
-                <value>full</value>
-                <value>border</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-drawing-page-properties-attlist"
-         combine="interleave">
-    <optional>
-        <attribute name="presentation:background-objects-visible">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-drawing-page-properties-attlist"
-         combine="interleave">
-    <optional>
-        <attribute name="presentation:background-visible">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-drawing-page-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:display-header">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-drawing-page-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:display-footer">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-drawing-page-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:display-page-number">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-drawing-page-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:display-date-time">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="string">
-    <data type="string"/>
-</define>
-<define name="date">
-    <data type="date"/>
-</define>
-<define name="time">
-    <data type="time"/>
-</define>
-<define name="dateTime">
-    <data type="dateTime"/>
-</define>
-<define name="duration">
-    <data type="duration"/>
-</define>
-<define name="integer">
-    <data type="integer"/>
-</define>
-<define name="nonNegativeInteger">
-    <data type="nonNegativeInteger"/>
-</define>
-<define name="positiveInteger">
-    <data type="positiveInteger"/>
-</define>
-<define name="double">
-    <data type="double"/>
-</define>
-<define name="anyURI">
-    <data type="anyURI"/>
-</define>
-<define name="base64Binary">
-    <data type="base64Binary"/>
-</define>
-<define name="ID">
-    <data type="ID"/>
-</define>
-<define name="IDREF">
-    <data type="IDREF"/>
-</define>
-<define name="boolean">
-    <choice>
-        <value>true</value>
-        <value>false</value>
-    </choice>
-</define>
-<define name="dateOrDateTime">
-    <choice>
-        <data type="date"/>
-        <data type="dateTime"/>
-    </choice>
-</define>
-<define name="timeOrDateTime">
-    <choice>
-        <data type="time"/>
-        <data type="dateTime"/>
-    </choice>
-</define>
-<define name="language">
-    <data type="token">
-        <param name="pattern">[A-Za-z]{1,8}(-[A-Za-z0-9]{1,8})*</param>
-    </data>
-</define>
-<define name="countryCode">
-    <data type="token">
-        <param name="pattern">[A-Za-z0-9]{1,8}</param>
-    </data>
-</define>
-<define name="languageCode">
-    <data type="token">
-        <param name="pattern">[A-Za-z]{1,8}</param>
-    </data>
-</define>
-<define name="character">
-    <data type="string">
-        <param name="length">1</param>
-    </data>
-</define>
-<define name="length">
-    <data type="string">
-        <param name="pattern">-?([0-9]+(\.[0-9]*)?|\.[0-9]+)((cm)|(mm)|(in)|(pt)|(pc)|(px))</param>
-
-    </data>
-</define>
-<define name="nonNegativeLength">
-    <data type="string">
-        <param name="pattern">([0-9]+(\.[0-9]*)?|\.[0-9]+)((cm)|(mm)|(in)|(pt)|(pc)|(px))</param>
-
-    </data>
-</define>
-<define name="positiveLength">
-    <data type="string">
-        <!-- A zero value is not allowed here -->
-        <param name="pattern">([0-9]+(\.[0-9]*)?|\.[0-9]+)((cm)|(mm)|(in)|(pt)|(pc)|(px))</param>
-
-    </data>
-</define>
-<define name="percent">
-    <data type="string">
-        <param name="pattern">-?([0-9]+(\.[0-9]*)?|\.[0-9]+)%</param>
-    </data>
-</define>
-<define name="relativeLength">
-    <data type="string">
-        <param name="pattern">[0-9]+\*</param>
-    </data>
-</define>
-<define name="coordinate">
-    <ref name="length"/>
-</define>
-<define name="distance">
-    <ref name="length"/>
-</define>
-<define name="color">
-    <data type="string">
-        <param name="pattern">#[0-9a-fA-F]{6}</param>
-    </data>
-</define>
-<define name="styleName">
-    <data type="NCName"/>
-</define>
-<define name="styleNameRef">
-    <choice>
-        <data type="NCName"/>
-        <empty/>
-    </choice>
-</define>
-<define name="styleNameRefs">
-    <list>
-        <zeroOrMore>
-            <data type="NCName"/>
-        </zeroOrMore>
-    </list>
-</define>
-<define name="variableName">
-    <data type="string"/>
-</define>
-<define name="formula">
-    <!-- A formula should start with a namespace prefix, -->
-    <!-- but has no restrictions-->
-    <data type="string"/>
-</define>
-
-<define name="targetFrameName">
-    <choice>
-        <value>_self</value>
-        <value>_blank</value>
-        <value>_parent</value>
-        <value>_top</value>
-        <ref name="string"/>
-    </choice>
-</define>
-
-<define name="valueType">
-    <choice>
-        <value>float</value>
-        <value>time</value>
-        <value>date</value>
-        <value>percentage</value>
-        <value>currency</value>
-        <value>boolean</value>
-        <value>string</value>
-    </choice>
-</define>
-
-<define name="points">
-    <data type="string">
-        <param name="pattern">-?[0-9]+,-?[0-9]+([ ]+-?[0-9]+,-?[0-9]+)*</param>
-    </data>
-</define>
-<define name="pathData">
-    <data type="string"/>
-</define>
-
-<define name="vector3D">
-    <data type="string">
-        <param name="pattern">\([ ]*-?([0-9]+(\.[0-9]*)?|\.[0-9]+)([ ]+-?([0-9]+(\.[0-9]*)?|\.[0-9]+)){2}[ ]*\)</param>
-
-    </data>
-</define>
-
-<define name="namespacedToken">
-    <data type="string">
-        <param name="pattern">[0-9a-zA-Z_]+:[0-9a-zA-Z._\-]+</param>
-    </data>
-</define>
-<define name="anyAttListOrElements">
-    <zeroOrMore>
-        <attribute>
-            <anyName/>
-            <text/>
-        </attribute>
-    </zeroOrMore>
-    <ref name="anyElements"/>
-</define>
-<define name="anyElements">
-    <zeroOrMore>
-        <element>
-            <anyName/>
-            <mixed>
-                <ref name="anyAttListOrElements"/>
-            </mixed>
-        </element>
-    </zeroOrMore>
-</define>
-</grammar>
diff --git a/apps/files_odfviewer/src/webodf/programs/docnosis/OpenDocument-schema-v1.1.rng b/apps/files_odfviewer/src/webodf/programs/docnosis/OpenDocument-schema-v1.1.rng
deleted file mode 100644
index 3ba6a687c4..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/docnosis/OpenDocument-schema-v1.1.rng
+++ /dev/null
@@ -1,17891 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    OASIS OpenDocument v1.1
-    OASIS Standard, 1 Feb 2007
-    Relax-NG Schema
-
-    $Id$
-
-    © 2002-2007 OASIS Open
-    © 1999-2007 Sun Microsystems, Inc.
--->
-
-<grammar
-    xmlns="http://relaxng.org/ns/structure/1.0"
-    xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
-
-    datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
-
-    xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
-    xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0"
-    xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0"
-    xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
-    xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0"
-    xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
-    xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0"
-    xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0"
-    xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
-    xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0"
-    xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0"
-    xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
-    xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0"
-    xmlns:anim="urn:oasis:names:tc:opendocument:xmlns:animation:1.0"
-
-    xmlns:dc="http://purl.org/dc/elements/1.1/"
-    xmlns:xlink="http://www.w3.org/1999/xlink"
-    xmlns:math="http://www.w3.org/1998/Math/MathML"
-    xmlns:xforms="http://www.w3.org/2002/xforms"
-
-    xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0"
-    xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0"
-    xmlns:smil="urn:oasis:names:tc:opendocument:xmlns:smil-compatible:1.0"
->
-<define name="office-process-content">
-    <optional>
-        <attribute name="office:process-content" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<start>
-    <choice>
-        <ref name="office-document"/>
-        <ref name="office-document-content"/>
-        <ref name="office-document-styles"/>
-        <ref name="office-document-meta"/>
-        <ref name="office-document-settings"/>
-    </choice>
-</start>
-<define name="office-document">
-    <element name="office:document">
-        <ref name="office-document-attrs"/>
-        <ref name="office-document-common-attrs"/>
-        <ref name="office-meta"/>
-        <ref name="office-settings"/>
-        <ref name="office-scripts"/>
-        <ref name="office-font-face-decls"/>
-        <ref name="office-styles"/>
-        <ref name="office-automatic-styles"/>
-        <ref name="office-master-styles"/>
-        <ref name="office-body"/>
-    </element>
-</define>
-<define name="office-document-content">
-    <element name="office:document-content">
-        <ref name="office-document-common-attrs"/>
-        <ref name="office-scripts"/>
-        <ref name="office-font-face-decls"/>
-        <ref name="office-automatic-styles"/>
-        <ref name="office-body"/>
-    </element>
-</define>
-<define name="office-document-styles">
-    <element name="office:document-styles">
-        <ref name="office-document-common-attrs"/>
-        <ref name="office-font-face-decls"/>
-        <ref name="office-styles"/>
-        <ref name="office-automatic-styles"/>
-        <ref name="office-master-styles"/>
-    </element>
-</define>
-<define name="office-document-meta">
-    <element name="office:document-meta">
-        <ref name="office-document-common-attrs"/>
-        <ref name="office-meta"/>
-    </element>
-</define>
-<define name="office-document-settings">
-    <element name="office:document-settings">
-        <ref name="office-document-common-attrs"/>
-        <ref name="office-settings"/>
-    </element>
-</define>
-<define name="office-document-common-attrs" combine="interleave">
-    <optional>
-        <attribute name="office:version">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="office-document-attrs" combine="interleave">
-    <attribute name="office:mimetype">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="office-meta">
-    <optional>
-        <element name="office:meta">
-            <ref name="office-meta-content"/>
-        </element>
-    </optional>
-</define>
-
-<define name="office-meta-content">
-    <ref name="anyElements"/>
-</define>
-
-<define name="office-meta-content-strict">
-    <zeroOrMore>
-        <ref name="office-meta-data"/>
-    </zeroOrMore>
-</define>
-<define name="office-body">
-    <element name="office:body">
-        <ref name="office-body-content"/>
-    </element>
-</define>
-<define name="office-body-content" combine="choice">
-    <element name="office:text">
-        <ref name="office-text-attlist"/>
-        <ref name="office-text-content-prelude"/>
-        <zeroOrMore>
-            <ref name="office-text-content-main"/>
-        </zeroOrMore>
-        <ref name="office-text-content-epilogue"/>
-    </element>
-</define>
-<define name="office-text-content-prelude">
-    <ref name="office-forms"/>
-    <ref name="text-tracked-changes"/>
-    <ref name="text-decls"/>
-    <ref name="table-decls"/>
-</define>
-<define name="office-text-content-main">
-    <choice>
-        <zeroOrMore>
-            <ref name="text-content"/>
-        </zeroOrMore>
-        <group>
-            <ref name="text-page-sequence"/>
-            <zeroOrMore>
-                <choice>
-                    <ref name="draw-a"/>
-                    <ref name="shape"/>
-                </choice>
-            </zeroOrMore>
-        </group>
-    </choice>
-</define>
-
-<define name="text-content">
-    <choice>
-        <ref name="text-h"/>
-        <ref name="text-p"/>
-        <ref name="text-list"/>
-        <ref name="text-numbered-paragraph"/>
-        <ref name="table-table"/>
-        <ref name="draw-a"/>
-        <ref name="text-section"/>
-        <ref name="text-soft-page-break"/> 
-        <ref name="text-table-of-content"/>
-        <ref name="text-illustration-index"/>
-        <ref name="text-table-index"/>
-        <ref name="text-object-index"/>
-        <ref name="text-user-index"/>
-        <ref name="text-alphabetical-index"/>
-        <ref name="text-bibliography"/>
-        <ref name="shape"/>
-        <ref name="change-marks"/>
-    </choice>
-</define>
-<define name="office-text-content-epilogue">
-    <ref name="table-functions"/>
-</define>
-<define name="office-text-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:global" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="office-text-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:use-soft-page-breaks" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="office-body-content" combine="choice">
-    <element name="office:drawing">
-        <ref name="office-drawing-attlist"/>
-        <ref name="office-drawing-content-prelude"/>
-        <ref name="office-drawing-content-main"/>
-        <ref name="office-drawing-content-epilogue"/>
-    </element>
-</define>
-
-<define name="office-drawing-attlist">
-    <empty/>
-</define>
-<define name="office-drawing-content-prelude">
-    <ref name="text-decls"/>
-    <ref name="table-decls"/>
-</define>
-<define name="office-drawing-content-main">
-    <zeroOrMore>
-        <ref name="draw-page"/>
-    </zeroOrMore>
-</define>
-<define name="office-drawing-content-epilogue">
-    <ref name="table-functions"/>
-</define>
-<define name="office-body-content" combine="choice">
-    <element name="office:presentation">
-        <ref name="office-presentation-attlist"/>
-        <ref name="office-presentation-content-prelude"/>
-        <ref name="office-presentation-content-main"/>
-        <ref name="office-presentation-content-epilogue"/>
-    </element>
-</define>
-
-<define name="office-presentation-attlist">
-    <empty/>
-</define>
-<define name="office-presentation-content-prelude">
-    <ref name="text-decls"/>
-    <ref name="table-decls"/>
-    <ref name="presentation-decls"/>
-</define>
-<define name="office-presentation-content-main">
-    <zeroOrMore>
-        <ref name="draw-page"/>
-    </zeroOrMore>
-</define>
-<define name="office-presentation-content-epilogue">
-    <ref name="presentation-settings"/>
-    <ref name="table-functions"/>
-</define>
-<define name="office-body-content" combine="choice">
-    <element name="office:spreadsheet">
-        <ref name="office-spreadsheet-attlist"/>
-        <ref name="office-spreadsheet-content-prelude"/>
-        <ref name="office-spreadsheet-content-main"/>
-        <ref name="office-spreadsheet-content-epilogue"/>
-    </element>
-</define>
-<define name="office-spreadsheet-content-prelude">
-    <optional>
-        <ref name="table-tracked-changes"/>    
-    </optional>
-    <ref name="text-decls"/>
-    <ref name="table-decls"/>
-</define>
-
-<define name="table-decls">
-    <optional>
-        <ref name="table-calculation-settings"/>    
-    </optional>
-    <optional>
-        <ref name="table-content-validations"/>    
-    </optional>
-    <optional>
-        <ref name="table-label-ranges"/>    
-    </optional>
-</define>
-<define name="office-spreadsheet-content-main">
-    <zeroOrMore>
-        <ref name="table-table"/>
-    </zeroOrMore>
-</define>
-<define name="office-spreadsheet-content-epilogue">
-    <ref name="table-functions"/>    
-</define>
-
-<define name="table-functions">
-    <optional>
-        <ref name="table-named-expressions"/>    
-    </optional>
-    <optional>
-        <ref name="table-database-ranges"/>    
-    </optional>
-    <optional>
-        <ref name="table-data-pilot-tables"/>    
-    </optional>
-    <optional>
-        <ref name="table-consolidation"/>    
-    </optional>
-    <optional>
-        <ref name="table-dde-links"/>    
-    </optional>
-</define>
-<define name="office-body-content" combine="choice">
-    <element name="office:chart">
-        <ref name="office-chart-attlist"/>
-        <ref name="office-chart-content-prelude"/>
-        <ref name="office-chart-content-main"/>
-        <ref name="office-chart-content-epilogue"/>
-    </element>
-</define>
-
-<define name="office-chart-attlist">
-    <empty/>
-</define>
-<define name="office-chart-content-prelude">
-    <ref name="text-decls"/>
-    <ref name="table-decls"/>
-</define>
-<define name="office-chart-content-main">
-    <ref name="chart-chart"/>
-</define>
-<define name="office-chart-content-epilogue">
-    <ref name="table-functions"/>    
-</define>
-<define name="office-body-content" combine="choice">
-    <element name="office:image">
-        <ref name="office-image-attlist"/>
-        <ref name="office-image-content-prelude"/>
-        <ref name="office-image-content-main"/>
-        <ref name="office-image-content-epilogue"/>
-    </element>
-</define>
-
-<define name="office-image-attlist">
-    <empty/>
-</define>
-<define name="office-image-content-prelude">
-    <empty/>
-</define>
-<define name="office-image-content-main">
-    <ref name="draw-frame"/>
-</define>
-<define name="office-image-content-epilogue">
-    <empty/>
-</define>
-<define name="office-settings">
-    <optional>
-        <element name="office:settings">
-            <oneOrMore>
-                <ref name="config-config-item-set"/>
-            </oneOrMore>
-        </element>
-    </optional>
-</define>
-<define name="config-config-item-set">
-    <element name="config:config-item-set">
-        <ref name="config-config-item-set-attlist"/>
-        <ref name="config-items"/>
-    </element>
-</define>
-
-<define name="config-items">
-    <oneOrMore>
-        <choice>
-            <ref name="config-config-item"/>
-            <ref name="config-config-item-set"/>
-            <ref name="config-config-item-map-named"/>
-            <ref name="config-config-item-map-indexed"/>
-        </choice>
-    </oneOrMore>
-</define>
-<define name="config-config-item-set-attlist" combine="interleave">
-    <attribute name="config:name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="config-config-item">
-    <element name="config:config-item">
-        <ref name="config-config-item-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="config-config-item-attlist" combine="interleave">
-    <attribute name="config:name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="config-config-item-attlist" combine="interleave">
-    <attribute name="config:type">
-        <choice>
-            <value>boolean</value>
-            <value>short</value>
-            <value>int</value>
-            <value>long</value>
-            <value>double</value>
-            <value>string</value>
-            <value>datetime</value>
-            <value>base64Binary</value>
-        </choice>
-    </attribute>
-</define>
-<define name="config-config-item-map-indexed">
-    <element name="config:config-item-map-indexed">
-        <ref name="config-config-item-map-indexed-attlist"/>
-        <oneOrMore>
-            <ref name="config-config-item-map-entry"/>
-        </oneOrMore>
-    </element>
-</define>
-<define name="config-config-item-map-indexed-attlist" combine="interleave">
-    <attribute name="config:name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="config-config-item-map-entry">
-    <element name="config:config-item-map-entry">
-        <ref name="config-config-item-map-entry-attlist"/>
-        <ref name="config-items"/>
-    </element>
-</define>
-<define name="config-config-item-map-entry-attlist" combine="interleave">
-    <optional>
-        <attribute name="config:name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="config-config-item-map-named">
-    <element name="config:config-item-map-named">
-        <ref name="config-config-item-map-named-attlist"/>
-        <oneOrMore>
-            <ref name="config-config-item-map-entry"/>
-        </oneOrMore>
-    </element>
-</define>
-<define name="config-config-item-map-named-attlist" combine="interleave">
-    <attribute name="config:name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="office-scripts">
-    <optional>
-        <element name="office:scripts">
-            <zeroOrMore>
-                <ref name="office-script"/>
-            </zeroOrMore>
-            <optional>
-                <ref name="office-event-listeners"/>
-            </optional>
-        </element>
-    </optional>
-</define>
-<define name="office-script">
-    <element name="office:script">
-        <ref name="office-script-attlist"/>
-        <mixed>
-            <ref name="anyElements"/>
-        </mixed>
-    </element>
-</define>
-<define name="office-script-attlist">
-    <attribute name="script:language">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="office-font-face-decls">
-    <optional>
-        <element name="office:font-face-decls">
-            <zeroOrMore>
-                <ref name="style-font-face"/>
-            </zeroOrMore>
-        </element>
-    </optional>
-</define>
-<define name="office-styles">
-    <optional>
-        <element name="office:styles">
-            <interleave>
-                <ref name="styles"/>
-                <zeroOrMore>
-                    <ref name="style-default-style"/>
-                </zeroOrMore>
-                <optional>
-                    <ref name="text-outline-style"/>
-                </optional>
-                <zeroOrMore>
-                    <ref name="text-notes-configuration"/>
-                </zeroOrMore>
-                <optional>
-                    <ref name="text-bibliography-configuration"/>
-                </optional>
-                <optional>
-                    <ref name="text-linenumbering-configuration"/>
-                </optional>
-                <zeroOrMore>
-                    <ref name="draw-gradient"/>
-                </zeroOrMore>
-                <zeroOrMore>
-                    <ref name="svg-linearGradient"/>
-                </zeroOrMore>
-                <zeroOrMore>
-                    <ref name="svg-radialGradient"/>
-                </zeroOrMore>
-                <zeroOrMore>
-                    <ref name="draw-hatch"/>
-                </zeroOrMore>
-                <zeroOrMore>
-                    <ref name="draw-fill-image"/>
-                </zeroOrMore>
-                <zeroOrMore>
-                    <ref name="draw-marker"/>
-                </zeroOrMore>
-                <zeroOrMore>
-                    <ref name="draw-stroke-dash"/>
-                </zeroOrMore>
-                <zeroOrMore>
-                    <ref name="draw-opacity"/>
-                </zeroOrMore>
-                <zeroOrMore>
-                    <ref name="style-presentation-page-layout"/>
-                </zeroOrMore>
-            </interleave>
-        </element>
-    </optional>
-</define>
-<define name="office-automatic-styles">
-    <optional>
-        <element name="office:automatic-styles">
-            <interleave>
-                <ref name="styles"/>
-                <zeroOrMore>
-                    <ref name="style-page-layout"/>
-                </zeroOrMore>
-            </interleave>
-        </element>
-    </optional>
-</define>
-<define name="office-master-styles">
-    <optional>
-        <element name="office:master-styles">
-            <interleave>
-                <zeroOrMore>
-                    <ref name="style-master-page"/>
-                </zeroOrMore>
-                <optional>
-                    <ref name="style-handout-master"/>
-                </optional>
-                <optional>
-                    <ref name="draw-layer-set"/>
-                </optional>
-            </interleave>
-        </element>
-    </optional>
-</define>
-
-<define name="styles">
-    <interleave>
-        <zeroOrMore>
-            <ref name="style-style"/>
-        </zeroOrMore>
-        <zeroOrMore>
-            <ref name="text-list-style"/>
-        </zeroOrMore>
-        <zeroOrMore>
-            <ref name="number-number-style"/>
-        </zeroOrMore>
-        <zeroOrMore>
-            <ref name="number-currency-style"/>
-        </zeroOrMore>
-        <zeroOrMore>
-            <ref name="number-percentage-style"/>
-        </zeroOrMore>
-        <zeroOrMore>
-            <ref name="number-date-style"/>
-        </zeroOrMore>
-        <zeroOrMore>
-            <ref name="number-time-style"/>
-        </zeroOrMore>
-        <zeroOrMore>
-            <ref name="number-boolean-style"/>
-        </zeroOrMore>
-        <zeroOrMore>
-            <ref name="number-text-style"/>
-        </zeroOrMore>
-    </interleave>
-</define>
-<define name="office-meta-data" combine="choice">
-    <element name="meta:generator">
-        <ref name="string"/>
-    </element>
-</define>
-<define name="office-meta-data" combine="choice">
-    <element name="dc:title">
-        <ref name="string"/>
-    </element>
-</define>
-<define name="office-meta-data" combine="choice">
-    <element name="dc:description">
-        <ref name="string"/>
-    </element>
-</define>
-<define name="office-meta-data" combine="choice">
-    <element name="dc:subject">
-        <ref name="string"/>
-    </element>
-</define>
-<define name="office-meta-data" combine="choice">
-    <element name="meta:keyword">
-        <ref name="string"/>
-    </element>
-</define>
-<define name="office-meta-data" combine="choice">
-    <element name="meta:initial-creator">
-        <ref name="string"/>
-    </element>
-</define>
-<define name="office-meta-data" combine="choice">
-    <ref name="dc-creator"/>
-</define>
-<define name="dc-creator">
-    <element name="dc:creator">
-        <ref name="string"/>
-    </element>
-</define>
-<define name="office-meta-data" combine="choice">
-    <element name="meta:printed-by">
-        <ref name="string"/>
-    </element>
-</define>
-<define name="office-meta-data" combine="choice">
-    <element name="meta:creation-date">
-        <ref name="dateTime"/>
-    </element>
-</define>
-<define name="office-meta-data" combine="choice">
-    <ref name="dc-date"/>
-</define>
-<define name="dc-date">
-    <element name="dc:date">
-        <ref name="dateTime"/>
-    </element>
-</define>
-<define name="office-meta-data" combine="choice">
-    <element name="meta:print-date">
-        <ref name="dateTime"/>
-    </element>
-</define>
-<define name="office-meta-data" combine="choice">
-    <element name="meta:template">
-        <attribute name="xlink:href">
-            <ref name="anyURI"/>
-        </attribute>
-        <optional>
-            <attribute name="xlink:type" a:defaultValue="simple">
-                <value>simple</value>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="xlink:actuate" a:defaultValue="onRequest">
-                <value>onRequest</value>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="xlink:title">
-                <ref name="string"/>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="meta:date">
-                <ref name="dateTime"/>
-            </attribute>
-        </optional>
-    </element>
-</define>
-<define name="office-meta-data" combine="choice">
-    <element name="meta:auto-reload">
-        <optional>
-            <attribute name="xlink:type" a:defaultValue="simple">
-                <value>simple</value>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="xlink:show" a:defaultValue="replace">
-                <value>replace</value>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="xlink:actuate" a:defaultValue="onLoad">
-                <value>onLoad</value>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="xlink:href">
-                <ref name="anyURI"/>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="meta:delay">
-                <ref name="duration"/>
-            </attribute>
-        </optional>
-    </element>
-</define>
-<define name="office-meta-data" combine="choice">
-    <element name="meta:hyperlink-behaviour">
-        <optional>
-            <attribute name="office:target-frame-name">
-                <ref name="targetFrameName"/>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="xlink:show">
-                <choice>
-                    <value>new</value>
-                    <value>replace</value>
-                </choice>
-            </attribute>
-        </optional>
-    </element>
-</define>
-<define name="office-meta-data" combine="choice">
-    <element name="dc:language">
-        <ref name="language"/>
-    </element>
-</define>
-<define name="office-meta-data" combine="choice">
-    <element name="meta:editing-cycles">
-        <ref name="nonNegativeInteger"/>
-    </element>
-</define>
-<define name="office-meta-data" combine="choice">
-    <element name="meta:editing-duration">
-        <ref name="duration"/>
-    </element>
-</define>
-<define name="office-meta-data" combine="choice">
-    <element name="meta:document-statistic">
-        <optional>
-            <attribute name="meta:page-count">
-                <ref name="nonNegativeInteger"/>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="meta:table-count">
-                <ref name="nonNegativeInteger"/>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="meta:draw-count">
-                <ref name="nonNegativeInteger"/>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="meta:image-count">
-                <ref name="nonNegativeInteger"/>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="meta:ole-object-count">
-                <ref name="nonNegativeInteger"/>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="meta:object-count">
-                <ref name="nonNegativeInteger"/>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="meta:paragraph-count">
-                <ref name="nonNegativeInteger"/>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="meta:word-count">
-                <ref name="nonNegativeInteger"/>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="meta:character-count">
-                <ref name="nonNegativeInteger"/>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="frame-count">
-                <ref name="nonNegativeInteger"/>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="sentence-count">
-                <ref name="nonNegativeInteger"/>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="syllable-count">
-                <ref name="nonNegativeInteger"/>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="non-whitespace-character-count">
-                <ref name="nonNegativeInteger"/>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="meta:row-count">
-                <ref name="nonNegativeInteger"/>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="meta:cell-count">
-                <ref name="nonNegativeInteger"/>
-            </attribute>
-        </optional>
-    </element>
-</define>
-<define name="office-meta-data" combine="choice">
-    <element name="meta:user-defined">
-        <attribute name="meta:name">
-            <ref name="string"/>
-        </attribute>
-        <choice>
-            <group>
-                <attribute name="meta:value-type">
-                    <value>float</value>
-                </attribute>
-                <ref name="double"/>
-            </group>
-            <group>
-                <attribute name="meta:value-type">
-                    <value>date</value>
-                </attribute>
-                <ref name="dateOrDateTime"/>
-            </group>
-            <group>
-                <attribute name="meta:value-type">
-                    <value>time</value>
-                </attribute>
-                <ref name="duration"/>
-            </group>
-            <group>
-                <attribute name="meta:value-type">
-                    <value>boolean</value>
-                </attribute>
-                <ref name="boolean"/>
-            </group>
-            <group>
-                <attribute name="meta:value-type">
-                    <value>string</value>
-                </attribute>
-                <ref name="string"/>
-            </group>
-            <text/>
-        </choice>
-    </element>
-</define>
-<define name="text-h">
-    <element name="text:h">
-        <ref name="heading-attrs"/>
-        <ref name="paragraph-attrs"/>
-        <optional>
-            <ref name="text-number"/>
-        </optional>
-        <zeroOrMore>
-            <ref name="paragraph-content"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="heading-attrs" combine="interleave">
-    <attribute name="text:outline-level">
-        <ref name="positiveInteger"/>
-    </attribute>
-</define>
-<define name="heading-attrs" combine="interleave">
-    <optional>
-        <attribute name="text:restart-numbering" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="heading-attrs" combine="interleave">
-    <optional>
-        <attribute name="text:start-value">
-            <ref name="nonNegativeInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="heading-attrs" combine="interleave">
-    <optional>
-        <attribute name="text:is-list-header" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-number">
-    <element name="text:number">
-        <ref name="string"/>
-    </element>
-</define>
-<define name="text-p">
-    <element name="text:p">
-        <ref name="paragraph-attrs"/>
-        <zeroOrMore>
-            <ref name="paragraph-content"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="paragraph-attrs">
-    <optional>
-        <attribute name="text:style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="text:class-names">
-            <ref name="styleNameRefs"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="text:cond-style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="paragraph-attrs" combine="interleave">
-    <optional>
-        <ref name="text-id"/>
-    </optional>
-</define>
-<define name="text-page-sequence">
-    <element name="text:page-sequence">
-        <oneOrMore>
-            <ref name="text-page"/>
-        </oneOrMore>
-    </element>
-</define>
-<define name="text-page">
-    <element name="text:page">
-        <ref name="text-page-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="text-page-attlist">
-    <attribute name="text:master-page-name">
-        <ref name="styleNameRef"/>
-    </attribute>
-</define>
-<define name="text-list">
-    <element name="text:list">
-        <ref name="text-list-attr"/>
-        <optional>
-            <ref name="text-list-header"/>
-        </optional>
-        <zeroOrMore>
-            <ref name="text-list-item"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="text-list-attr" combine="interleave">
-    <optional>
-        <attribute name="text:style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-list-attr" combine="interleave">
-    <optional>
-        <attribute name="text:continue-numbering">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-list-item">
-    <element name="text:list-item">
-        <ref name="text-list-item-attr"/>
-        <ref name="text-list-item-content"/>
-    </element>
-</define>
-<define name="text-list-item-content">
-    <optional>
-        <ref name="text-number"/>
-    </optional>
-    <zeroOrMore>
-        <choice>
-            <ref name="text-p"/>
-            <ref name="text-h"/>
-            <ref name="text-list"/>
-            <ref name="text-soft-page-break"/>
-        </choice>
-    </zeroOrMore>
-</define>
-<define name="text-list-item-attr" combine="interleave">
-    <optional>
-        <attribute name="text:start-value">
-            <ref name="nonNegativeInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-list-header">
-    <element name="text:list-header">
-        <ref name="text-list-item-content"/>
-    </element>
-</define>
-<define name="text-numbered-paragraph">
-    <element name="text:numbered-paragraph">
-        <ref name="text-numbered-paragraph-attr"/>
-        <optional>
-            <ref name="text-number"/>
-        </optional>
-        <choice>
-            <ref name="text-p"/>
-            <ref name="text-h"/>
-        </choice>
-    </element>
-</define>
-<define name="text-numbered-paragraph-attr" combine="interleave">
-    <optional>
-        <attribute name="text:level" a:defaultValue="1">
-            <ref name="positiveInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-numbered-paragraph-attr" combine="interleave">
-    <ref name="text-list-attr"/>
-</define>
-<define name="text-numbered-paragraph-attr" combine="interleave">
-    <ref name="text-list-item-attr"/>
-</define>
-<define name="text-section">
-    <element name="text:section">
-        <ref name="text-section-attr"/>
-        <choice>
-            <ref name="text-section-source"/>
-            <ref name="text-section-source-dde"/>
-            <empty/>
-        </choice>
-        <zeroOrMore>
-            <ref name="text-content"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="text-section-attr" combine="interleave">
-    <ref name="sectionAttr"/>
-</define>
-<define name="sectionAttr" combine="interleave">
-    <optional>
-        <attribute name="text:style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="sectionAttr" combine="interleave">
-    <attribute name="text:name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="sectionAttr" combine="interleave">
-    <optional>
-        <attribute name="text:protected">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="sectionAttr" combine="interleave">
-    <optional>
-        <attribute name="text:protection-key">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-section-attr" combine="interleave">
-    <choice>
-        <attribute name="text:display">
-            <choice>
-                <value>true</value>
-                <value>none</value>
-            </choice>
-        </attribute>
-        <group>
-            <attribute name="text:display">
-                <value>condition</value>
-            </attribute>
-            <attribute name="text:condition">
-                <ref name="string"/>
-            </attribute>
-        </group>
-        <empty/>
-    </choice>
-</define>
-<define name="text-section-source">
-    <element name="text:section-source">
-        <ref name="text-section-source-attr"/>
-    </element>
-</define>
-<define name="text-section-source-attr" combine="interleave">
-    <optional>
-        <attribute name="xlink:href">
-            <ref name="anyURI"/>
-        </attribute>
-        <optional>
-            <attribute name="xlink:type" a:defaultValue="simple">
-                <value>simple</value>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="xlink:show" a:defaultValue="embed">
-                <value>embed</value>
-            </attribute>
-        </optional>
-    </optional>
-</define>
-<define name="text-section-source-attr" combine="interleave">
-    <optional>
-        <attribute name="text:section-name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-section-source-attr" combine="interleave">
-    <optional>
-        <attribute name="text:filter-name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-section-source-dde">
-    <ref name="office-dde-source"/>
-</define>
-<define name="text-tracked-changes">
-    <optional>
-        <element name="text:tracked-changes">
-            <ref name="text-tracked-changes-attr"/>
-            <zeroOrMore>
-                <ref name="text-changed-region"/>
-            </zeroOrMore>
-        </element>
-    </optional>
-</define>
-<define name="text-tracked-changes-attr" combine="interleave">
-    <optional>
-        <attribute name="text:track-changes" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-changed-region">
-    <element name="text:changed-region">
-        <ref name="text-changed-region-attr"/>
-        <ref name="text-changed-region-content"/>
-    </element>
-</define>
-<define name="text-changed-region-attr" combine="interleave">
-    <attribute name="text:id">
-        <ref name="ID"/>
-    </attribute>
-</define>
-<define name="text-changed-region-content" combine="choice">
-    <element name="text:insertion">
-        <ref name="office-change-info"/>
-    </element>
-</define>
-<define name="text-changed-region-content" combine="choice">
-    <element name="text:deletion">
-        <ref name="office-change-info"/>
-        <zeroOrMore>
-            <ref name="text-content"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="text-changed-region-content" combine="choice">
-    <element name="text:format-change">
-        <ref name="office-change-info"/>
-    </element>
-</define>
-<define name="change-marks">
-    <choice>
-        <element name="text:change">
-            <ref name="change-mark-attr"/>
-        </element>
-        <element name="text:change-start">
-            <ref name="change-mark-attr"/>
-        </element>
-        <element name="text:change-end">
-            <ref name="change-mark-attr"/>
-        </element>
-    </choice>
-</define>
-<define name="change-mark-attr">
-    <attribute name="text:change-id">
-        <ref name="IDREF"/>
-    </attribute>
-</define>
-<define name="text-soft-page-break">
-    <element name="text:soft-page-break">
-        <empty/>
-    </element>
-</define>
-<define name="text-decls">
-    <optional>
-        <element name="text:variable-decls">
-            <zeroOrMore>
-                <ref name="text-variable-decl"/>
-            </zeroOrMore>
-        </element>
-    </optional>
-    <optional>
-        <element name="text:sequence-decls">
-            <zeroOrMore>
-                <ref name="text-sequence-decl"/>
-            </zeroOrMore>
-        </element>
-    </optional>
-    <optional>
-        <element name="text:user-field-decls">
-            <zeroOrMore>
-                <ref name="text-user-field-decl"/>
-            </zeroOrMore>
-        </element>
-    </optional>
-    <optional>
-        <element name="text:dde-connection-decls">
-            <zeroOrMore>
-                <ref name="text-dde-connection-decl"/>
-            </zeroOrMore>
-        </element>
-    </optional>
-    <optional>
-        <ref name="text-alphabetical-index-auto-mark-file"/>
-    </optional>
-</define>
-<define name="paragraph-content" combine="choice">
-    <text/>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:s">
-        <optional>
-            <attribute name="text:c">
-                <ref name="nonNegativeInteger"/>
-            </attribute>
-        </optional>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:tab">
-        <ref name="text-tab-attr"/>
-    </element>
-</define>
-<define name="text-tab-attr">
-    <optional>
-        <attribute name="text:tab-ref">
-            <ref name="nonNegativeInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:line-break">
-        <empty/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <ref name="text-soft-page-break"/>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:span">
-        <optional>
-            <attribute name="text:style-name">
-                <ref name="styleNameRef"/>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="text:class-names">
-                <ref name="styleNameRefs"/>
-            </attribute>
-        </optional>
-        <zeroOrMore>
-            <ref name="paragraph-content"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:a">
-        <ref name="text-a-attlist"/>
-        <optional>
-            <ref name="office-event-listeners"/>
-        </optional>
-        <zeroOrMore>
-            <ref name="paragraph-content"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="text-a-attlist" combine="interleave">
-    <optional>
-        <attribute name="office:name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-a-attlist" combine="interleave">
-    <optional>
-        <attribute name="office:title">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-a-attlist" combine="interleave">
-    <attribute name="xlink:href">
-        <ref name="anyURI"/>
-    </attribute>
-    <optional>
-        <attribute name="xlink:type" a:defaultValue="simple">
-            <value>simple</value>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="xlink:actuate" a:defaultValue="onRequest">
-            <value>onRequest</value>
-        </attribute>
-    </optional>
-</define>
-<define name="text-a-attlist" combine="interleave">
-    <optional>
-        <attribute name="office:target-frame-name">
-            <ref name="targetFrameName"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="xlink:show">
-            <choice>
-                <value>new</value>
-                <value>replace</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="text-a-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="text:visited-style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="paragraph-content" combine="choice">
-    <choice>
-        <element name="text:bookmark">
-            <attribute name="text:name">
-                <ref name="string"/>
-            </attribute>
-        </element>
-        <element name="text:bookmark-start">
-            <attribute name="text:name">
-                <ref name="string"/>
-            </attribute>
-        </element>
-        <element name="text:bookmark-end">
-            <attribute name="text:name">
-                <ref name="string"/>
-            </attribute>
-        </element>
-    </choice>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:reference-mark">
-        <attribute name="text:name">
-            <ref name="string"/>
-        </attribute>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <choice>
-        <element name="text:reference-mark-start">
-            <attribute name="text:name">
-                <ref name="string"/>
-            </attribute>
-        </element>
-        <element name="text:reference-mark-end">
-            <attribute name="text:name">
-                <ref name="string"/>
-            </attribute>
-        </element>
-    </choice>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:note">
-        <ref name="text-note-class"/>
-        <optional>
-            <attribute name="text:id">
-                <ref name="string"/>
-            </attribute>
-        </optional>
-        <element name="text:note-citation">
-            <optional>
-                <attribute name="text:label">
-                    <ref name="string"/>
-                </attribute>
-            </optional>
-            <text/>
-        </element>
-        <element name="text:note-body">
-            <zeroOrMore>
-                <ref name="text-content"/>
-            </zeroOrMore>
-        </element>
-    </element>
-</define>
-<define name="text-note-class">
-    <attribute name="text:note-class">
-        <choice>
-            <value>footnote</value>
-            <value>endnote</value>
-        </choice>
-    </attribute>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:ruby">
-        <optional>
-            <attribute name="text:style-name">
-                <ref name="styleNameRef"/>
-            </attribute>
-        </optional>
-        <element name="text:ruby-base">
-            <ref name="paragraph-content"/>
-        </element>
-        <element name="text:ruby-text">
-            <optional>
-                <attribute name="text:style-name">
-                    <ref name="styleNameRef"/>
-                </attribute>
-            </optional>
-            <text/>
-        </element>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <ref name="office-annotation"/>
-</define>
-<define name="paragraph-content" combine="choice">
-    <ref name="change-marks"/>
-</define>
-<define name="paragraph-content" combine="choice">
-    <choice>
-        <ref name="shape"/>
-        <ref name="draw-a"/>
-    </choice>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:date">
-        <ref name="text-date-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="text-date-attlist" combine="interleave">
-    <interleave>
-        <ref name="common-field-fixed-attlist"/>
-        <ref name="common-field-data-style-name-attlist"/>
-    </interleave>
-</define>
-<define name="text-date-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:date-value">
-            <ref name="dateOrDateTime"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-date-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:date-adjust">
-            <ref name="duration"/>
-        </attribute>
-    </optional>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:time">
-        <ref name="text-time-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="text-time-attlist" combine="interleave">
-    <interleave>
-        <ref name="common-field-fixed-attlist"/>
-        <ref name="common-field-data-style-name-attlist"/>
-    </interleave>
-</define>
-<define name="text-time-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:time-value">
-            <ref name="timeOrDateTime"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-time-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:time-adjust">
-            <ref name="duration"/>
-        </attribute>
-    </optional>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:page-number">
-        <ref name="text-page-number-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="text-page-number-attlist" combine="interleave">
-    <interleave>
-        <ref name="common-field-num-format-attlist"/>
-        <ref name="common-field-fixed-attlist"/>
-    </interleave>
-</define>
-<define name="text-page-number-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:page-adjust">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-page-number-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:select-page">
-            <choice>
-                <value>previous</value>
-                <value>current</value>
-                <value>next</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:page-continuation">
-        <ref name="text-page-continuation-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="text-page-continuation-attlist" combine="interleave">
-    <attribute name="text:select-page">
-        <choice>
-            <value>previous</value>
-            <value>next</value>
-        </choice>
-    </attribute>
-</define>
-<define name="text-page-continuation-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:string-value">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:sender-firstname">
-        <ref name="common-field-fixed-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:sender-lastname">
-        <ref name="common-field-fixed-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:sender-initials">
-        <ref name="common-field-fixed-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:sender-title">
-        <ref name="common-field-fixed-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:sender-position">
-        <ref name="common-field-fixed-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:sender-email">
-        <ref name="common-field-fixed-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:sender-phone-private">
-        <ref name="common-field-fixed-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:sender-fax">
-        <ref name="common-field-fixed-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:sender-company">
-        <ref name="common-field-fixed-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:sender-phone-work">
-        <ref name="common-field-fixed-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:sender-street">
-        <ref name="common-field-fixed-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:sender-city">
-        <ref name="common-field-fixed-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:sender-postal-code">
-        <ref name="common-field-fixed-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:sender-country">
-        <ref name="common-field-fixed-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:sender-state-or-province">
-        <ref name="common-field-fixed-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:author-name">
-        <ref name="common-field-fixed-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:author-initials">
-        <ref name="common-field-fixed-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:chapter">
-        <ref name="text-chapter-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="text-chapter-attlist" combine="interleave">
-    <attribute name="text:display">
-        <choice>
-            <value>name</value>
-            <value>number</value>
-            <value>number-and-name</value>
-            <value>plain-number-and-name</value>
-            <value>plain-number</value>
-        </choice>
-    </attribute>
-</define>
-<define name="text-chapter-attlist" combine="interleave">
-    <attribute name="text:outline-level">
-        <ref name="nonNegativeInteger"/>
-    </attribute>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:file-name">
-        <ref name="text-file-name-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="text-file-name-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:display">
-            <choice>
-                <value>full</value>
-                <value>path</value>
-                <value>name</value>
-                <value>name-and-extension</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="text-file-name-attlist" combine="interleave">
-    <ref name="common-field-fixed-attlist"/>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:template-name">
-        <ref name="text-template-name-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="text-template-name-attlist">
-    <optional>
-        <attribute name="text:display">
-            <choice>
-                <value>full</value>
-                <value>path</value>
-                <value>name</value>
-                <value>name-and-extension</value>
-                <value>area</value>
-                <value>title</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:sheet-name">
-        <text/>
-    </element>
-</define>
-<define name="text-variable-decl">
-    <element name="text:variable-decl">
-        <ref name="common-field-name-attlist"/>
-        <ref name="common-value-type-attlist"/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:variable-set">
-        <interleave>
-            <ref name="common-field-name-attlist"/>
-            <ref name="common-field-formula-attlist"/>
-            <ref name="common-value-and-type-attlist"/>
-            <ref name="common-field-display-value-none-attlist"/>
-            <ref name="common-field-data-style-name-attlist"/>
-        </interleave>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:variable-get">
-        <interleave>
-            <ref name="common-field-name-attlist"/>
-            <ref name="common-field-display-value-formula-attlist"/>
-            <ref name="common-field-data-style-name-attlist"/>
-        </interleave>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:variable-input">
-        <interleave>
-            <ref name="common-field-name-attlist"/>
-            <ref name="common-field-description-attlist"/>
-            <ref name="common-value-type-attlist"/>
-            <ref name="common-field-display-value-none-attlist"/>
-            <ref name="common-field-data-style-name-attlist"/>
-        </interleave>
-        <text/>
-    </element>
-</define>
-<define name="text-user-field-decl">
-    <element name="text:user-field-decl">
-        <ref name="common-field-name-attlist"/>
-        <optional>
-            <ref name="common-field-formula-attlist"/>
-        </optional>
-        <ref name="common-value-and-type-attlist"/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:user-field-get">
-        <interleave>
-            <ref name="common-field-name-attlist"/>
-            <ref name="common-field-display-value-formula-none-attlist"/>
-            <ref name="common-field-data-style-name-attlist"/>
-        </interleave>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:user-field-input">
-        <interleave>
-            <ref name="common-field-name-attlist"/>
-            <ref name="common-field-description-attlist"/>
-            <ref name="common-field-data-style-name-attlist"/>
-        </interleave>
-        <text/>
-    </element>
-</define>
-<define name="text-sequence-decl">
-    <element name="text:sequence-decl">
-        <ref name="text-sequence-decl-attlist"/>
-    </element>
-</define>
-<define name="text-sequence-decl-attlist" combine="interleave">
-    <ref name="common-field-name-attlist"/>
-</define>
-<define name="text-sequence-decl-attlist" combine="interleave">
-    <attribute name="text:display-outline-level">
-        <ref name="nonNegativeInteger"/>
-    </attribute>
-</define>
-<define name="text-sequence-decl-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:separation-character">
-            <ref name="character"/>
-        </attribute>
-    </optional>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:sequence">
-        <interleave>
-            <ref name="common-field-name-attlist"/>
-            <ref name="common-field-formula-attlist"/>
-            <ref name="common-field-num-format-attlist"/>
-            <ref name="text-sequence-ref-name"/>
-        </interleave>
-        <text/>
-    </element>
-</define>
-<define name="text-sequence-ref-name">
-    <optional>
-        <attribute name="text:ref-name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:expression">
-        <interleave>
-            <ref name="common-field-formula-attlist"/>
-            <optional>
-                <ref name="common-value-and-type-attlist"/>
-            </optional>
-            <ref name="common-field-display-value-formula-attlist"/>
-            <ref name="common-field-data-style-name-attlist"/>
-        </interleave>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:text-input">
-        <ref name="common-field-description-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:initial-creator">
-        <ref name="common-field-fixed-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:creation-date">
-        <interleave>
-            <ref name="common-field-fixed-attlist"/>
-            <ref name="common-field-data-style-name-attlist"/>
-            <optional>
-                <attribute name="text:date-value">
-                    <ref name="dateOrDateTime"/>
-                </attribute>
-            </optional>
-        </interleave>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:creation-time">
-        <interleave>
-            <ref name="common-field-fixed-attlist"/>
-            <ref name="common-field-data-style-name-attlist"/>
-            <optional>
-                <attribute name="text:time-value">
-                    <ref name="timeOrDateTime"/>
-                </attribute>
-            </optional>
-        </interleave>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:description">
-        <ref name="common-field-fixed-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:user-defined">
-        <interleave>
-            <ref name="common-field-fixed-attlist"/>
-            <attribute name="text:name">
-                <ref name="string"/>
-            </attribute>
-            <ref name="common-field-data-style-name-attlist"/>
-            <optional>
-                <attribute name="office:value">
-                    <ref name="double"/>
-                </attribute>
-            </optional>
-            <optional>
-                <attribute name="office:date-value">
-                    <ref name="dateOrDateTime"/>
-                </attribute>
-            </optional>
-            <optional>
-                <attribute name="office:time-value">
-                    <ref name="duration"/>
-                </attribute>
-            </optional>
-            <optional>
-                <attribute name="office:boolean-value">
-                    <ref name="boolean"/>
-                </attribute>
-            </optional>
-            <optional>
-                <attribute name="office:string-value">
-                    <ref name="string"/>
-                </attribute>
-            </optional>
-        </interleave>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:print-time">
-        <interleave>
-            <ref name="common-field-fixed-attlist"/>
-            <ref name="common-field-data-style-name-attlist"/>
-            <optional>
-                <attribute name="text:time-value">
-                    <ref name="time"/>
-                </attribute>
-            </optional>
-        </interleave>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:print-date">
-        <interleave>
-            <ref name="common-field-fixed-attlist"/>
-            <ref name="common-field-data-style-name-attlist"/>
-            <optional>
-                <attribute name="text:date-value">
-                    <ref name="date"/>
-                </attribute>
-            </optional>
-        </interleave>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:printed-by">
-        <ref name="common-field-fixed-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:title">
-        <ref name="common-field-fixed-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:subject">
-        <ref name="common-field-fixed-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:keywords">
-        <ref name="common-field-fixed-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:editing-cycles">
-        <ref name="common-field-fixed-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:editing-duration">
-        <interleave>
-            <ref name="common-field-fixed-attlist"/>
-            <ref name="common-field-data-style-name-attlist"/>
-            <optional>
-                <attribute name="text:duration">
-                    <ref name="duration"/>
-                </attribute>
-            </optional>
-        </interleave>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:modification-time">
-        <interleave>
-            <ref name="common-field-fixed-attlist"/>
-            <ref name="common-field-data-style-name-attlist"/>
-            <optional>
-                <attribute name="text:time-value">
-                    <ref name="time"/>
-                </attribute>
-            </optional>
-        </interleave>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:modification-date">
-        <interleave>
-            <ref name="common-field-fixed-attlist"/>
-            <ref name="common-field-data-style-name-attlist"/>
-            <optional>
-                <attribute name="text:date-value">
-                    <ref name="date"/>
-                </attribute>
-            </optional>
-        </interleave>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:creator">
-        <ref name="common-field-fixed-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element>
-        <choice>
-            <name>text:page-count</name>
-            <name>text:paragraph-count</name>
-            <name>text:word-count</name>
-            <name>text:character-count</name>
-            <name>text:table-count</name>
-            <name>text:image-count</name>
-            <name>text:object-count</name>
-        </choice>
-        <ref name="common-field-num-format-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="common-field-database-table">
-    <ref name="common-field-database-table-attlist"/>
-    <ref name="common-field-database-name"/>
-</define>
-<define name="common-field-database-name" combine="choice">
-    <optional>
-        <attribute name="text:database-name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-field-database-name" combine="choice">
-    <ref name="form-connection-resource"/>
-</define>
-<define name="common-field-database-table-attlist" combine="interleave">
-    <attribute name="text:table-name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="common-field-database-table-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:table-type">
-            <choice>
-                <value>table</value>
-                <value>query</value>
-                <value>command</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:database-display">
-        <ref name="text-database-display-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="text-database-display-attlist" combine="interleave">
-    <ref name="common-field-database-table"/>
-</define>
-<define name="text-database-display-attlist" combine="interleave">
-    <ref name="common-field-data-style-name-attlist"/>
-</define>
-<define name="text-database-display-attlist" combine="interleave">
-    <attribute name="text:column-name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:database-next">
-        <ref name="text-database-next-attlist"/>
-    </element>
-</define>
-<define name="text-database-next-attlist" combine="interleave">
-    <ref name="common-field-database-table"/>
-</define>
-<define name="text-database-next-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:condition">
-            <ref name="formula"/>
-        </attribute>
-    </optional>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:database-row-select">
-        <ref name="text-database-row-select-attlist"/>
-    </element>
-</define>
-<define name="text-database-row-select-attlist" combine="interleave">
-    <ref name="common-field-database-table"/>
-</define>
-<define name="text-database-row-select-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:condition">
-            <ref name="formula"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-database-row-select-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:row-number">
-            <ref name="nonNegativeInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:database-row-number">
-        <interleave>
-            <ref name="common-field-database-table"/>
-            <ref name="common-field-num-format-attlist"/>
-            <optional>
-                <attribute name="text:value">
-                    <ref name="nonNegativeInteger"/>
-                </attribute>
-            </optional>
-        </interleave>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:database-name">
-        <ref name="common-field-database-table"/>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:page-variable-set">
-        <ref name="text-set-page-variable-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="text-set-page-variable-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:active">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-set-page-variable-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:page-adjust">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:page-variable-get">
-        <ref name="text-get-page-variable-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="text-get-page-variable-attlist" combine="interleave">
-    <ref name="common-field-num-format-attlist"/>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:placeholder">
-        <ref name="text-placeholder-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="text-placeholder-attlist" combine="interleave">
-    <attribute name="text:placeholder-type">
-        <choice>
-            <value>text</value>
-            <value>table</value>
-            <value>text-box</value>
-            <value>image</value>
-            <value>object</value>
-        </choice>
-    </attribute>
-</define>
-<define name="text-placeholder-attlist" combine="interleave">
-    <ref name="common-field-description-attlist"/>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:conditional-text">
-        <ref name="text-conditional-text-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="text-conditional-text-attlist" combine="interleave">
-    <attribute name="text:condition">
-        <ref name="formula"/>
-    </attribute>
-</define>
-<define name="text-conditional-text-attlist" combine="interleave">
-    <attribute name="text:string-value-if-true">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="text-conditional-text-attlist" combine="interleave">
-    <attribute name="text:string-value-if-false">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="text-conditional-text-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:current-value">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:hidden-text">
-        <ref name="text-hidden-text-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="text-hidden-text-attlist" combine="interleave">
-    <attribute name="text:condition">
-        <ref name="formula"/>
-    </attribute>
-</define>
-<define name="text-hidden-text-attlist" combine="interleave">
-    <attribute name="text:string-value">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="text-hidden-text-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:is-hidden">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element>
-        <choice>
-            <name>text:reference-ref</name>
-            <name>text:bookmark-ref</name>
-        </choice>
-        <interleave>
-            <ref name="text-common-ref-content"/>
-            <ref name="text-ref-content"/>
-        </interleave>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:note-ref">
-        <interleave>
-            <ref name="text-common-ref-content"/>
-            <ref name="text-note-ref-content"/>
-            <ref name="text-ref-content"/>
-        </interleave>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:sequence-ref">
-        <interleave>
-            <ref name="text-common-ref-content"/>
-            <ref name="text-sequence-ref-content"/>
-        </interleave>
-    </element>
-</define>
-<define name="text-common-ref-content" combine="interleave">
-    <text/>
-</define>
-<define name="text-common-ref-content" combine="interleave">
-    <optional>
-        <attribute name="text:ref-name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-note-ref-content" combine="interleave">
-    <ref name="text-note-class"/>
-</define>
-<define name="text-ref-content" combine="interleave">
-    <optional>
-        <attribute name="text:reference-format">
-            <choice>
-                <value>page</value>
-                <value>chapter</value>
-                <value>direction</value>
-                <value>text</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="text-sequence-ref-content" combine="interleave">
-    <optional>
-        <attribute name="text:reference-format">
-            <choice>
-                <value>page</value>
-                <value>chapter</value>
-                <value>direction</value>
-                <value>text</value>
-                <value>category-and-value</value>
-                <value>caption</value>
-                <value>value</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:script">
-        <interleave>
-            <choice>
-                <group>
-                    <attribute name="xlink:href">
-                        <ref name="anyURI"/>
-                    </attribute>
-                    <optional>
-                        <attribute name="xlink:type" a:defaultValue="simple">
-                            <value>simple</value>
-                        </attribute>
-                    </optional>
-                </group>    
-                <text/>
-            </choice>
-            <optional>
-                <attribute name="script:language">
-                    <ref name="string"/>
-                </attribute>
-            </optional>
-        </interleave>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:execute-macro">
-        <optional>
-            <attribute name="text:name">
-                <ref name="string"/>
-            </attribute>
-        </optional>
-        <optional>
-            <ref name="office-event-listeners"/>
-        </optional>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:hidden-paragraph">
-        <ref name="text-hidden-paragraph-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="text-hidden-paragraph-attlist" combine="interleave">
-    <attribute name="text:condition">
-        <ref name="formula"/>
-    </attribute>
-</define>
-<define name="text-hidden-paragraph-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:is-hidden">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:dde-connection">
-        <attribute name="text:connection-name">
-            <ref name="string"/>
-        </attribute>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:measure">
-        <attribute name="text:kind">
-            <choice>
-                <value>value</value>
-                <value>unit</value>
-                <value>gap</value>
-            </choice>
-        </attribute>
-        <text/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:table-formula">
-        <interleave>
-            <ref name="common-field-formula-attlist"/>
-            <ref name="common-field-display-value-formula-attlist"/>
-            <ref name="common-field-data-style-name-attlist"/>
-        </interleave>
-        <text/>
-    </element>
-</define>
-<define name="common-value-type-attlist">
-    <attribute name="office:value-type">
-        <ref name="valueType"/>
-    </attribute>
-</define>
-<define name="common-value-and-type-attlist">
-    <choice>
-        <group>
-            <attribute name="office:value-type">
-                <value>float</value>
-            </attribute>
-            <attribute name="office:value">
-                <ref name="double"/>
-            </attribute>
-        </group>
-        <group>
-            <attribute name="office:value-type">
-                <value>percentage</value>
-            </attribute>
-            <attribute name="office:value">
-                <ref name="double"/>
-            </attribute>
-        </group>
-        <group>
-            <attribute name="office:value-type">
-                <value>currency</value>
-            </attribute>
-            <attribute name="office:value">
-                <ref name="double"/>
-            </attribute>
-            <optional>
-                <attribute name="office:currency">
-                    <ref name="string"/>
-                </attribute>
-            </optional>
-        </group>
-        <group>
-            <attribute name="office:value-type">
-                <value>date</value>
-            </attribute>
-            <attribute name="office:date-value">
-                <ref name="dateOrDateTime"/>
-            </attribute>
-        </group>
-        <group>
-            <attribute name="office:value-type">
-                <value>time</value>
-            </attribute>
-            <attribute name="office:time-value">
-                <ref name="duration"/>
-            </attribute>
-        </group>
-        <group>
-            <attribute name="office:value-type">
-                <value>boolean</value>
-            </attribute>
-            <attribute name="office:boolean-value">
-                <ref name="boolean"/>
-            </attribute>
-        </group>
-        <group>
-            <attribute name="office:value-type">
-                <value>string</value>
-            </attribute>
-            <optional>
-                <attribute name="office:string-value">
-                    <ref name="string"/>
-                </attribute>
-            </optional>
-        </group>
-    </choice>
-</define>
-<define name="common-field-fixed-attlist">
-    <optional>
-        <attribute name="text:fixed">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-field-name-attlist">
-    <attribute name="text:name">
-        <ref name="variableName"/>
-    </attribute>
-</define>
-<define name="common-field-description-attlist">
-    <optional>
-        <attribute name="text:description">
-            <text/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-field-display-value-none-attlist">
-    <optional>
-        <attribute name="text:display">
-            <choice>
-                <value>value</value>
-                <value>none</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="common-field-display-value-formula-none-attlist">
-    <optional>
-        <attribute name="text:display">
-            <choice>
-                <value>value</value>
-                <value>formula</value>
-                <value>none</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="common-field-display-value-formula-attlist">
-    <optional>
-        <attribute name="text:display">
-            <choice>
-                <value>value</value>
-                <value>formula</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="common-field-formula-attlist">
-    <optional>
-        <attribute name="text:formula">
-            <ref name="formula"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-field-data-style-name-attlist">
-    <optional>
-        <attribute name="style:data-style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-field-num-format-attlist">
-    <optional>
-        <ref name="common-num-format-attlist"/>
-    </optional>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:toc-mark-start">
-        <ref name="text-toc-mark-start-attrs"/>
-    </element>
-</define>
-<define name="text-toc-mark-start-attrs">
-    <ref name="text-id"/>
-    <ref name="text-outline-level"/>
-</define>
-<define name="text-outline-level">
-    <optional>
-        <attribute name="text:outline-level">
-            <ref name="positiveInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-id">
-    <attribute name="text:id">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:toc-mark-end">
-        <ref name="text-id"/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:toc-mark">
-        <attribute name="text:string-value">
-            <ref name="string"/>
-        </attribute>
-        <ref name="text-outline-level"/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:user-index-mark-start">
-        <ref name="text-id"/>
-        <ref name="text-outline-level"/>
-        <ref name="text-index-name"/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:user-index-mark-end">
-        <ref name="text-id"/>
-        <ref name="text-outline-level"/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:user-index-mark">
-        <attribute name="text:string-value">
-            <ref name="string"/>
-        </attribute>
-        <ref name="text-outline-level"/>
-        <ref name="text-index-name"/>
-    </element>
-</define>
-<define name="text-index-name">
-    <attribute name="text:index-name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:alphabetical-index-mark-start">
-        <ref name="text-id"/>
-        <ref name="text-alphabetical-index-mark-attrs"/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:alphabetical-index-mark-end">
-        <ref name="text-id"/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:alphabetical-index-mark">
-        <attribute name="text:string-value">
-            <ref name="string"/>
-        </attribute>
-        <ref name="text-alphabetical-index-mark-attrs"/>
-    </element>
-</define>
-<define name="text-alphabetical-index-mark-attrs" combine="interleave">
-    <optional>
-        <attribute name="text:key1">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="text:key2">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-alphabetical-index-mark-attrs" combine="interleave">
-    <optional>
-        <attribute name="text:string-value-phonetic">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="text:key1-phonetic">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="text:key2-phonetic">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-alphabetical-index-mark-attrs" combine="interleave">
-    <optional>
-        <attribute name="text:main-entry" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="text:bibliography-mark">
-        <attribute name="text:bibliography-type">
-            <ref name="text-bibliography-types"/>
-        </attribute>
-        <zeroOrMore>
-            <attribute>
-                <choice>
-                    <name>text:identifier</name>
-                    <name>text:address</name>
-                    <name>text:annote</name>
-                    <name>text:author</name>
-                    <name>text:booktitle</name>
-                    <name>text:chapter</name>
-                    <name>text:edition</name>
-                    <name>text:editor</name>
-                    <name>text:howpublished</name>
-                    <name>text:institution</name>
-                    <name>text:journal</name>
-                    <name>text:month</name>
-                    <name>text:note</name>
-                    <name>text:number</name>
-                    <name>text:organizations</name>
-                    <name>text:pages</name>
-                    <name>text:publisher</name>
-                    <name>text:school</name>
-                    <name>text:series</name>
-                    <name>text:title</name>
-                    <name>text:report-type</name>
-                    <name>text:volume</name>
-                    <name>text:year</name>
-                    <name>text:url</name>
-                    <name>text:custom1</name>
-                    <name>text:custom2</name>
-                    <name>text:custom3</name>
-                    <name>text:custom4</name>
-                    <name>text:custom5</name>
-                    <name>text:isbn</name>
-                    <name>text:issn</name>
-                </choice>
-                <ref name="string"/>
-            </attribute>
-        </zeroOrMore>
-        <text/>
-    </element>
-</define>
-<define name="text-bibliography-types">
-    <choice>
-        <value>article</value>
-        <value>book</value>
-        <value>booklet</value>
-        <value>conference</value>
-        <value>custom1</value>
-        <value>custom2</value>
-        <value>custom3</value>
-        <value>custom4</value>
-        <value>custom5</value>
-        <value>email</value>
-        <value>inbook</value>
-        <value>incollection</value>
-        <value>inproceedings</value>
-        <value>journal</value>
-        <value>manual</value>
-        <value>mastersthesis</value>
-        <value>misc</value>
-        <value>phdthesis</value>
-        <value>proceedings</value>
-        <value>techreport</value>
-        <value>unpublished</value>
-        <value>www</value>
-    </choice>
-</define>
-<define name="text-index-body">
-    <element name="text:index-body">
-        <zeroOrMore>
-            <ref name="index-content-main"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="index-content-main">
-    <choice>
-        <ref name="text-content"/>
-        <ref name="text-index-title"/>
-    </choice>
-</define>
-<define name="text-index-title">
-    <element name="text:index-title">
-        <ref name="sectionAttr"/>
-        <zeroOrMore>
-            <ref name="index-content-main"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="text-table-of-content">
-    <element name="text:table-of-content">
-        <ref name="sectionAttr"/>
-        <ref name="text-table-of-content-source"/>
-        <ref name="text-index-body"/>
-    </element>
-</define>
-<define name="text-table-of-content-source">
-    <element name="text:table-of-content-source">
-        <ref name="text-table-of-content-source-attlist"/>
-        <optional>
-            <ref name="text-index-title-template"/>
-        </optional>
-        <zeroOrMore>
-            <ref name="text-table-of-content-entry-template"/>
-        </zeroOrMore>
-        <zeroOrMore>
-            <ref name="text-index-source-styles"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="text-table-of-content-source-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:outline-level">
-            <choice>
-                <ref name="positiveInteger"/>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="text-table-of-content-source-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:use-outline-level" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-table-of-content-source-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:use-index-marks">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-table-of-content-source-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:use-index-source-styles">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-table-of-content-source-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:index-scope">
-            <choice>
-                <value>document</value>
-                <value>chapter</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="text-table-of-content-source-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:relative-tab-stop-position">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-table-of-content-entry-template">
-    <element name="text:table-of-content-entry-template">
-        <ref name="text-table-of-content-entry-template-attlist"/>
-        <zeroOrMore>
-            <ref name="text-table-of-content-children"/>
-
-        </zeroOrMore>
-    </element>
-</define>
-<define name="text-table-of-content-children">
-    <choice>
-        <ref name="text-index-entry-chapter"/>
-        <ref name="text-index-entry-page-number"/>
-        <ref name="text-index-entry-text"/>
-        <ref name="text-index-entry-span"/>
-        <ref name="text-index-entry-tab-stop"/>
-        <ref name="text-index-entry-link-start"/>
-        <ref name="text-index-entry-link-end"/>
-    </choice>
-</define>
-<define name="text-table-of-content-entry-template-attlist"
-        combine="interleave">
-    <attribute name="text:outline-level">
-        <ref name="positiveInteger"/>
-    </attribute>
-</define>
-<define name="text-table-of-content-entry-template-attlist"
-        combine="interleave">
-    <attribute name="text:style-name">
-        <ref name="styleNameRef"/>
-    </attribute>
-</define>
-<define name="text-illustration-index">
-    <element name="text:illustration-index">
-        <ref name="sectionAttr"/>
-        <ref name="text-illustration-index-source"/>
-        <ref name="text-index-body"/>
-    </element>
-</define>
-<define name="text-illustration-index-source">
-    <element name="text:illustration-index-source">
-        <ref name="text-illustration-index-source-attrs"/>
-        <optional>
-            <ref name="text-index-title-template"/>
-        </optional>
-        <optional>
-            <ref name="text-illustration-index-entry-template"/>
-        </optional>
-    </element>
-</define>
-<define name="text-illustration-index-source-attrs" combine="interleave">
-    <ref name="text-index-scope-attr"/>
-</define>
-<define name="text-index-scope-attr">
-    <optional>
-        <attribute name="text:index-scope" a:defaultValue="document">
-            <choice>
-                <value>document</value>
-                <value>chapter</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="text-illustration-index-source-attrs" combine="interleave">
-    <ref name="text-relative-tab-stop-position-attr"/>
-</define>
-<define name="text-relative-tab-stop-position-attr">
-    <optional>
-        <attribute name="text:relative-tab-stop-position"
-                   a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-illustration-index-source-attrs" combine="interleave">
-    <optional>
-        <attribute name="text:use-caption" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-illustration-index-source-attrs" combine="interleave">
-    <optional>
-        <attribute name="text:caption-sequence-name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-illustration-index-source-attrs" combine="interleave">
-    <optional>
-        <attribute name="text:caption-sequence-format">
-            <choice>
-                <value>text</value>
-                <value>category-and-value</value>
-                <value>caption</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="text-illustration-index-entry-template">
-    <element name="text:illustration-index-entry-template">
-        <ref name="text-illustration-index-entry-content"/>
-    </element>
-</define>
-<define name="text-illustration-index-entry-content">
-    <ref name="text-illustration-index-entry-template-attrs"/>
-    <zeroOrMore>
-        <choice>
-            <ref name="text-index-entry-page-number"/>
-            <ref name="text-index-entry-text"/>
-            <ref name="text-index-entry-span"/>
-            <ref name="text-index-entry-tab-stop"/>
-        </choice>
-    </zeroOrMore>
-</define>
-<define name="text-illustration-index-entry-template-attrs">
-    <attribute name="text:style-name">
-        <ref name="styleNameRef"/>
-    </attribute>
-</define>
-<define name="text-table-index">
-    <element name="text:table-index">
-        <ref name="sectionAttr"/>
-        <ref name="text-table-index-source"/>
-        <ref name="text-index-body"/>
-    </element>
-</define>
-<define name="text-table-index-source">
-    <element name="text:table-index-source">
-        <ref name="text-illustration-index-source-attrs"/>
-        <optional>
-            <ref name="text-index-title-template"/>
-        </optional>
-        <optional>
-            <ref name="text-table-index-entry-template"/>
-        </optional>
-    </element>
-</define>
-<define name="text-table-index-entry-template">
-    <element name="text:table-index-entry-template">
-        <ref name="text-illustration-index-entry-content"/>
-    </element>
-</define>
-<define name="text-object-index">
-    <element name="text:object-index">
-        <ref name="sectionAttr"/>
-        <ref name="text-object-index-source"/>
-        <ref name="text-index-body"/>
-    </element>
-</define>
-<define name="text-object-index-source">
-    <element name="text:object-index-source">
-        <ref name="text-object-index-source-attrs"/>
-        <optional>
-            <ref name="text-index-title-template"/>
-        </optional>
-        <optional>
-            <ref name="text-object-index-entry-template"/>
-        </optional>
-    </element>
-</define>
-<define name="text-object-index-source-attrs" combine="interleave">
-    <ref name="text-index-scope-attr"/>
-</define>
-<define name="text-object-index-source-attrs" combine="interleave">
-    <ref name="text-relative-tab-stop-position-attr"/>
-</define>
-<define name="text-object-index-source-attrs" combine="interleave">
-    <optional>
-        <attribute name="text:use-spreadsheet-objects" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-object-index-source-attrs" combine="interleave">
-    <optional>
-        <attribute name="text:use-math-objects" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-object-index-source-attrs" combine="interleave">
-    <optional>
-        <attribute name="text:use-draw-objects" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-object-index-source-attrs" combine="interleave">
-    <optional>
-        <attribute name="text:use-chart-objects" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-object-index-source-attrs" combine="interleave">
-    <optional>
-        <attribute name="text:use-other-objects" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-object-index-entry-template">
-    <element name="text:object-index-entry-template">
-        <ref name="text-illustration-index-entry-content"/>
-    </element>
-</define>
-<define name="text-user-index">
-    <element name="text:user-index">
-        <ref name="sectionAttr"/>
-        <ref name="text-user-index-source"/>
-        <ref name="text-index-body"/>
-    </element>
-</define>
-<define name="text-user-index-source">
-    <element name="text:user-index-source">
-        <ref name="text-user-index-source-attr"/>
-        <optional>
-            <ref name="text-index-title-template"/>
-        </optional>
-        <zeroOrMore>
-            <ref name="text-user-index-entry-template"/>
-        </zeroOrMore>
-        <zeroOrMore>
-            <ref name="text-index-source-styles"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="text-user-index-source-attr" combine="interleave">
-    <ref name="text-index-scope-attr"/>
-    <ref name="text-relative-tab-stop-position-attr"/>
-    <attribute name="text:index-name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="text-user-index-source-attr" combine="interleave">
-    <optional>
-        <attribute name="text:use-index-marks" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="text:use-graphics" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="text:use-tables" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="text:use-floating-frames"
-                     a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="text:use-objects" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-user-index-source-attr" combine="interleave">
-    <optional>
-        <attribute name="text:copy-outline-levels"
-                     a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-user-index-entry-template">
-    <element name="text:user-index-entry-template">
-        <ref name="text-user-index-entry-template-attrs"/>
-        <zeroOrMore>
-            <choice>
-                <ref name="text-index-entry-chapter"/>
-                <ref name="text-index-entry-page-number"/>
-                <ref name="text-index-entry-text"/>
-                <ref name="text-index-entry-span"/>
-                <ref name="text-index-entry-tab-stop"/>
-            </choice>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="text-user-index-entry-template-attrs" combine="interleave">
-    <attribute name="text:outline-level">
-        <ref name="positiveInteger"/>
-    </attribute>
-</define>
-<define name="text-user-index-entry-template-attrs" combine="interleave">
-    <attribute name="text:style-name">
-        <ref name="styleNameRef"/>
-    </attribute>
-</define>
-<define name="text-alphabetical-index">
-    <element name="text:alphabetical-index">
-        <ref name="sectionAttr"/>
-        <ref name="text-alphabetical-index-source"/>
-        <ref name="text-index-body"/>
-    </element>
-</define>
-<define name="text-alphabetical-index-source">
-    <element name="text:alphabetical-index-source">
-        <ref name="text-alphabetical-index-source-attrs"/>
-        <optional>
-            <ref name="text-index-title-template"/>
-        </optional>
-        <zeroOrMore>
-            <ref name="text-alphabetical-index-entry-template"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="text-alphabetical-index-source-attrs" combine="interleave">
-    <ref name="text-index-scope-attr"/>
-    <ref name="text-relative-tab-stop-position-attr"/>
-</define>
-<define name="text-alphabetical-index-source-attrs" combine="interleave">
-    <optional>
-        <attribute name="text:ignore-case" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-alphabetical-index-source-attrs" combine="interleave">
-    <optional>
-        <attribute name="text:main-entry-style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-alphabetical-index-source-attrs" combine="interleave">
-    <optional>
-        <attribute name="text:alphabetical-separators" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-alphabetical-index-source-attrs" combine="interleave">
-    <optional>
-        <attribute name="text:combine-entries" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="text:combine-entries-with-dash"
-                   a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="text:combine-entries-with-pp" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-alphabetical-index-source-attrs" combine="interleave">
-    <optional>
-        <attribute name="text:use-keys-as-entries" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-alphabetical-index-source-attrs" combine="interleave">
-    <optional>
-        <attribute name="text:capitalize-entries" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-alphabetical-index-source-attrs" combine="interleave">
-    <optional>
-        <attribute name="text:comma-separated" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-alphabetical-index-source-attrs" combine="interleave">
-    <optional>
-        <attribute name="fo:language">
-            <ref name="languageCode"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-alphabetical-index-source-attrs" combine="interleave">
-    <optional>
-        <attribute name="fo:country">
-            <ref name="countryCode"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-alphabetical-index-source-attrs" combine="interleave">
-    <optional>
-        <attribute name="text:sort-algorithm">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-alphabetical-index-auto-mark-file">
-    <element name="text:alphabetical-index-auto-mark-file">
-        <attribute name="xlink:href">
-            <ref name="anyURI"/>
-        </attribute>
-        <optional>
-            <attribute name="xlink:type" a:defaultValue="simple">
-                <value>simple</value>
-            </attribute>
-        </optional>
-    </element>
-</define>
-<define name="text-alphabetical-index-entry-template">
-    <element name="text:alphabetical-index-entry-template">
-        <ref name="text-alphabetical-index-entry-template-attrs"/>
-        <zeroOrMore>
-            <choice>
-                <ref name="text-index-entry-chapter"/>
-                <ref name="text-index-entry-page-number"/>
-                <ref name="text-index-entry-text"/>
-                <ref name="text-index-entry-span"/>
-                <ref name="text-index-entry-tab-stop"/>
-            </choice>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="text-alphabetical-index-entry-template-attrs"
-        combine="interleave">
-    <attribute name="text:outline-level">
-        <choice>
-            <value>1</value>
-            <value>2</value>
-            <value>3</value>
-            <value>separator</value>
-        </choice>
-    </attribute>
-</define>
-<define name="text-alphabetical-index-entry-template-attrs"
-        combine="interleave">
-    <attribute name="text:style-name">
-        <ref name="styleNameRef"/>
-    </attribute>
-</define>
-<define name="text-bibliography">
-    <element name="text:bibliography">
-        <ref name="sectionAttr"/>
-        <ref name="text-bibliography-source"/>
-        <ref name="text-index-body"/>
-    </element>
-</define>
-<define name="text-bibliography-source">
-    <element name="text:bibliography-source">
-        <optional>
-            <ref name="text-index-title-template"/>
-        </optional>
-        <zeroOrMore>
-            <ref name="text-bibliography-entry-template"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="text-bibliography-entry-template">
-    <element name="text:bibliography-entry-template">
-        <ref name="text-bibliography-entry-template-attrs"/>
-        <zeroOrMore>
-            <choice>
-                <ref name="text-index-entry-span"/>
-                <ref name="text-index-entry-tab-stop"/>
-                <ref name="text-index-entry-bibliography"/>
-            </choice>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="text-bibliography-entry-template-attrs" combine="interleave">
-    <attribute name="text:bibliography-type">
-        <ref name="text-bibliography-types"/>
-    </attribute>
-</define>
-<define name="text-bibliography-entry-template-attrs" combine="interleave">
-    <attribute name="text:style-name">
-        <ref name="styleNameRef"/>
-    </attribute>
-</define>
-<define name="text-index-source-styles">
-    <element name="text:index-source-styles">
-        <attribute name="text:outline-level">
-            <ref name="positiveInteger"/>
-        </attribute>
-        <zeroOrMore>
-            <ref name="text-index-source-style"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="text-index-source-style">
-    <element name="text:index-source-style">
-        <attribute name="text:style-name">
-            <ref name="styleName"/>
-        </attribute>
-        <empty/>
-    </element>
-</define>
-<define name="text-index-title-template">
-    <element name="text:index-title-template">
-        <optional>
-            <attribute name="text:style-name">
-                <ref name="styleNameRef"/>
-            </attribute>
-        </optional>
-        <text/>
-    </element>
-</define>
-<define name="text-index-entry-chapter">
-    <element name="text:index-entry-chapter">
-        <optional>
-            <attribute name="text:style-name">
-                <ref name="styleNameRef"/>
-            </attribute>
-        </optional>
-        <ref name="text-index-entry-chapter-attrs"/>
-    </element>
-</define>
-<define name="text-index-entry-chapter-attrs">
-    <optional>
-        <attribute name="text:display" a:defaultValue="number">
-            <choice>
-                <value>name</value>
-                <value>number</value>
-                <value>number-and-name</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="text-index-entry-text">
-    <element name="text:index-entry-text">
-        <optional>
-            <attribute name="text:style-name">
-                <ref name="styleNameRef"/>
-            </attribute>
-        </optional>
-    </element>
-</define>
-<define name="text-index-entry-page-number">
-    <element name="text:index-entry-page-number">
-        <optional>
-            <attribute name="text:style-name">
-                <ref name="styleNameRef"/>
-            </attribute>
-        </optional>
-    </element>
-</define>
-<define name="text-index-entry-span">
-    <element name="text:index-entry-span">
-        <optional>
-            <attribute name="text:style-name">
-                <ref name="styleNameRef"/>
-            </attribute>
-        </optional>
-        <text/>
-    </element>
-</define>
-<define name="text-index-entry-bibliography">
-    <element name="text:index-entry-bibliography">
-        <ref name="text-index-entry-bibliography-attrs"/>
-    </element>
-</define>
-<define name="text-index-entry-bibliography-attrs" combine="interleave">
-    <optional>
-        <attribute name="text:style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-index-entry-bibliography-attrs" combine="interleave">
-    <attribute name="text:bibliography-data-field">
-        <choice>
-            <value>address</value>
-            <value>annote</value>
-            <value>author</value>
-            <value>bibliography-type</value>
-            <value>booktitle</value>
-            <value>chapter</value>
-            <value>custom1</value>
-            <value>custom2</value>
-            <value>custom3</value>
-            <value>custom4</value>
-            <value>custom5</value>
-            <value>edition</value>
-            <value>editor</value>
-            <value>howpublished</value>
-            <value>identifier</value>
-            <value>institution</value>
-            <value>isbn</value>
-            <value>issn</value>
-            <value>journal</value>
-            <value>month</value>
-            <value>note</value>
-            <value>number</value>
-            <value>organizations</value>
-            <value>pages</value>
-            <value>publisher</value>
-            <value>report-type</value>
-            <value>school</value>
-            <value>series</value>
-            <value>title</value>
-            <value>url</value>
-            <value>volume</value>
-            <value>year</value>
-        </choice>
-    </attribute>
-</define>
-<define name="text-index-entry-tab-stop">
-    <element name="text:index-entry-tab-stop">
-        <optional>
-            <attribute name="text:style-name">
-                <ref name="styleNameRef"/>
-            </attribute>
-        </optional>
-        <ref name="text-index-entry-tab-stop-attrs"/>
-    </element>
-</define>
-<define name="text-index-entry-tab-stop-attrs" combine="interleave">
-    <optional>
-        <attribute name="style:leader-char">
-            <ref name="character"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-index-entry-tab-stop-attrs" combine="interleave">
-    <choice>
-        <attribute name="style:type">
-            <value>right</value>
-        </attribute>
-        <group>
-            <attribute name="style:type">
-                <value>left</value>
-            </attribute>
-            <attribute name="style:position">
-                <ref name="length"/>
-            </attribute>
-        </group>
-    </choice>
-</define>
-<define name="text-index-entry-link-start">
-    <element name="text:index-entry-link-start">
-        <optional>
-            <attribute name="text:style-name">
-                <ref name="styleNameRef"/>
-            </attribute>
-        </optional>
-    </element>
-</define>
-<define name="text-index-entry-link-end">
-    <element name="text:index-entry-link-end">
-        <optional>
-            <attribute name="text:style-name">
-                <ref name="styleNameRef"/>
-            </attribute>
-        </optional>
-    </element>
-</define>
-<define name="table-table">
-    <element name="table:table">
-        <ref name="table-table-attlist"/>
-        <optional>
-            <ref name="table-table-source"/>
-        </optional>
-        <optional>
-            <ref name="office-dde-source"/>
-        </optional>
-        <optional>
-            <ref name="table-scenario"/>
-        </optional>
-        <optional>
-            <ref name="office-forms"/>
-        </optional>
-        <optional>
-            <ref name="table-shapes"/>
-        </optional>
-        <ref name="table-columns-and-groups"/>
-        <ref name="table-rows-and-groups"/>
-    </element>
-</define>
-<define name="table-columns-and-groups">
-    <oneOrMore>
-        <choice>
-            <ref name="table-table-column-group"/>
-            <ref name="table-columns-no-group"/>
-        </choice>
-    </oneOrMore>
-</define>
-
-<define name="table-columns-no-group">
-    <choice>
-        <group>
-            <ref name="table-columns"/>
-            <optional>
-                <ref name="table-table-header-columns"/>
-                <optional>
-                    <ref name="table-columns"/>
-                </optional>
-            </optional>
-        </group>
-        <group>
-            <ref name="table-table-header-columns"/>
-            <optional>
-                <ref name="table-columns"/>
-            </optional>
-        </group>
-    </choice>
-</define>
-
-<define name="table-columns">
-    <choice>
-        <ref name="table-table-columns"/>
-        <oneOrMore>
-                <ref name="table-table-column"/>
-        </oneOrMore>
-    </choice>
-</define>
-
-<define name="table-rows-and-groups">
-    <oneOrMore>
-        <choice>
-            <ref name="table-table-row-group"/>
-            <ref name="table-rows-no-group"/>
-        </choice>
-    </oneOrMore>
-</define>
-
-<define name="table-rows-no-group">
-    <choice>
-        <group>
-            <ref name="table-rows"/>
-            <optional>
-                <ref name="table-table-header-rows"/>
-                <optional>
-                    <ref name="table-rows"/>
-                </optional>
-            </optional>
-        </group>
-        <group>
-            <ref name="table-table-header-rows"/>
-            <optional>
-                <ref name="table-rows"/>
-            </optional>
-        </group>
-    </choice>
-</define>
-
-<define name="table-rows">
-    <choice>
-        <ref name="table-table-rows"/>
-        <oneOrMore>
-            <optional>
-                <ref name="text-soft-page-break"/>
-            </optional>
-            <ref name="table-table-row"/>
-        </oneOrMore>
-    </choice>
-</define>
-<define name="table-table-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-table-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-table-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:protected" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="table:protection-key">
-            <text/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-table-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:print" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-table-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:print-ranges">
-            <ref name="cellRangeAddressList"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-table-row">
-    <element name="table:table-row">
-        <ref name="table-table-row-attlist"/>
-        <oneOrMore>
-            <choice>
-                <ref name="table-table-cell"/>
-                <ref name="table-covered-table-cell"/>
-            </choice>
-        </oneOrMore>
-    </element>
-</define>
-<define name="table-table-row-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:number-rows-repeated" a:defaultValue="1">
-            <ref name="positiveInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-table-row-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-table-row-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:default-cell-style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-table-row-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:visibility" a:defaultValue="visible">
-            <ref name="table-visibility-value"/>
-        </attribute>
-    </optional>
-</define>
-
-<define name="table-visibility-value">
-    <choice>
-        <value>visible</value>
-        <value>collapse</value>
-        <value>filter</value>
-    </choice>
-</define>
-<define name="table-table-cell">
-    <element name="table:table-cell">
-        <ref name="table-table-cell-attlist"/>
-        <ref name="table-table-cell-attlist-extra"/>
-        <ref name="table-table-cell-content"/>
-    </element>
-</define>
-
-<define name="table-covered-table-cell">
-    <element name="table:covered-table-cell">
-        <ref name="table-table-cell-attlist"/>
-        <ref name="table-table-cell-content"/>
-    </element>
-</define>
-
-<define name="table-table-cell-content">
-    <optional>
-        <ref name="table-cell-range-source"/>
-    </optional>
-    <optional>
-        <ref name="office-annotation"/>
-    </optional>
-    <optional>
-        <ref name="table-detective"/>
-    </optional>
-    <zeroOrMore>
-        <ref name="text-content"/>
-    </zeroOrMore>
-</define>
-<define name="table-table-cell-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:number-columns-repeated" a:defaultValue="1">
-            <ref name="positiveInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-table-cell-attlist-extra" combine="interleave">
-    <optional>
-        <attribute name="table:number-columns-spanned" a:defaultValue="1">
-            <ref name="positiveInteger"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="table:number-rows-spanned" a:defaultValue="1">
-            <ref name="positiveInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-table-cell-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-table-cell-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:content-validation-name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-table-cell-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:formula">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-table-cell-attlist-extra" combine="interleave">
-    <optional>
-        <attribute name="table:number-matrix-columns-spanned">
-            <ref name="positiveInteger"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="table:number-matrix-rows-spanned">
-            <ref name="positiveInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-table-cell-attlist" combine="interleave">
-    <optional>
-        <ref name="common-value-and-type-attlist"/>
-    </optional>
-</define>
-<define name="table-table-cell-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:protect" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-table-column">
-    <element name="table:table-column">
-        <ref name="table-table-column-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="table-table-column-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:number-columns-repeated" a:defaultValue="1">
-            <ref name="positiveInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-table-column-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-table-column-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:visibility" a:defaultValue="visible">
-            <ref name="table-visibility-value"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-table-column-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:default-cell-style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-table-header-columns">
-    <element name="table:table-header-columns">
-        <oneOrMore>
-            <ref name="table-table-column"/>
-        </oneOrMore>
-    </element>
-</define>
-
-<define name="table-table-columns">
-    <element name="table:table-columns">
-        <oneOrMore>
-            <ref name="table-table-column"/>
-        </oneOrMore>
-    </element>
-</define>
-<define name="table-table-column-group">
-    <element name="table:table-column-group">
-        <ref name="table-table-column-group-attlist"/>
-        <ref name="table-columns-and-groups"/>
-    </element>
-</define>
-<define name="table-table-column-group-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:display" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-table-header-rows">
-    <element name="table:table-header-rows">
-        <oneOrMore>
-            <optional>
-                <ref name="text-soft-page-break"/>
-            </optional>
-            <ref name="table-table-row"/>
-        </oneOrMore>
-    </element>
-</define>
-
-<define name="table-table-rows">
-    <element name="table:table-rows">
-        <oneOrMore>
-            <optional>
-                <ref name="text-soft-page-break"/>
-            </optional>
-            <ref name="table-table-row"/>
-        </oneOrMore>
-    </element>
-</define>
-<define name="table-table-row-group">
-    <element name="table:table-row-group">
-        <ref name="table-table-row-group-attlist"/>
-        <ref name="table-rows-and-groups"/>
-    </element>
-</define>
-<define name="table-table-row-group-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:display" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-table-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:is-sub-table" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="cellAddress">
-    <data type="string">
-        <param name="pattern">($?([^\. ']+|'([^']|'')+'))?\.$?[A-Z]+$?[0-9]+</param>
-
-    </data>
-</define>
-<define name="cellRangeAddress">
-    <data type="string">
-        <param name="pattern">($?([^\. ']+|'([^']|'')+'))?\.$?[A-Z]+$?[0-9]+(:($?([^\. ']+|'([^']|'')+'))?\.$?[A-Z]+$?[0-9]+)?</param>
-
-    </data>
-</define>
-<define name="cellRangeAddressList">
-    <!-- Value is a space separated list of "cellRangeAddress" patterns -->
-    <data type="string"/> 
-</define>
-<define name="table-table-source">
-    <element name="table:table-source">
-        <ref name="table-table-source-attlist"/>
-        <ref name="table-linked-source-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="table-table-source-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:mode" a:defaultValue="copy-all">
-            <choice>
-                <value>copy-all</value>
-                <value>copy-results-only</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="table-table-source-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:table-name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-linked-source-attlist" combine="interleave">
-    <optional>
-        <attribute name="xlink:type" a:defaultValue="simple">
-            <value>simple</value>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="xlink:actuate" a:defaultValue="onRequest">
-            <value>onRequest</value>
-        </attribute>
-    </optional>
-    <attribute name="xlink:href">
-        <ref name="anyURI"/>
-    </attribute>
-</define>
-<define name="table-linked-source-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:filter-name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-linked-source-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:filter-options">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-linked-source-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:refresh-delay">
-            <ref name="duration"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-scenario">
-    <element name="table:scenario">
-        <ref name="table-scenario-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="table-scenario-attlist" combine="interleave">
-    <attribute name="table:scenario-ranges">
-        <ref name="cellRangeAddressList"/>
-    </attribute>
-</define>
-<define name="table-scenario-attlist" combine="interleave">
-    <attribute name="table:is-active">
-        <ref name="boolean"/>
-    </attribute>
-</define>
-<define name="table-scenario-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:display-border" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-scenario-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:border-color">
-            <ref name="color"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-scenario-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:copy-back" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-scenario-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:copy-styles" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-scenario-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:copy-formulas" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-scenario-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:comment">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-scenario-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:protected">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-shapes">
-    <element name="table:shapes">
-        <oneOrMore>
-            <ref name="shape"/>
-        </oneOrMore>
-    </element>
-</define>
-<define name="table-cell-range-source">
-    <element name="table:cell-range-source">
-        <ref name="table-table-cell-range-source-attlist"/>
-        <ref name="table-linked-source-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="table-table-cell-range-source-attlist" combine="interleave">
-    <attribute name="table:name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="table-table-cell-range-source-attlist" combine="interleave">
-    <attribute name="table:last-column-spanned">
-        <ref name="positiveInteger"/>
-    </attribute>
-    <attribute name="table:last-row-spanned">
-        <ref name="positiveInteger"/>
-    </attribute>
-</define>
-<define name="table-detective">
-    <element name="table:detective">
-        <zeroOrMore>
-            <ref name="table-highlighted-range"/>
-        </zeroOrMore>
-        <zeroOrMore>
-            <ref name="table-operation"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="table-operation">
-    <element name="table:operation">
-        <ref name="table-operation-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="table-operation-attlist" combine="interleave">
-    <attribute name="table:name">
-        <choice>
-            <value>trace-dependents</value>
-            <value>remove-dependents</value>
-            <value>trace-precedents</value>
-            <value>remove-precedents</value>
-            <value>trace-errors</value>
-        </choice>
-    </attribute>
-</define>
-<define name="table-operation-attlist" combine="interleave">
-    <attribute name="table:index">
-        <ref name="nonNegativeInteger"/>
-    </attribute>
-</define>
-<define name="table-highlighted-range">
-    <element name="table:highlighted-range">
-        <choice>
-            <group>
-                <ref name="table-highlighted-range-attlist"/>
-            </group>
-            <group>
-                <ref name="table-highlighted-range-attlist-invalid"/>
-            </group>
-        </choice>
-        <empty/>
-    </element>
-</define>
-<define name="table-highlighted-range-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:cell-range-address">
-            <ref name="cellRangeAddress"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-highlighted-range-attlist" combine="interleave">
-    <attribute name="table:direction">
-        <choice>
-            <value>from-another-table</value>
-            <value>to-another-table</value>
-            <value>from-same-table</value>
-        </choice>
-    </attribute>
-</define>
-<define name="table-highlighted-range-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:contains-error" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-highlighted-range-attlist-invalid" combine="interleave">
-    <attribute name="table:marked-invalid">
-        <ref name="boolean"/>
-    </attribute>
-</define>
-<define name="office-spreadsheet-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:structure-protected" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="table:protection-key">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-calculation-settings">
-    <element name="table:calculation-settings">
-        <ref name="table-calculation-setting-attlist"/>
-        <optional>
-            <ref name="table-null-date"/>
-        </optional>
-        <optional>
-            <ref name="table-iteration"/>
-        </optional>
-    </element>
-</define>
-<define name="table-calculation-setting-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:case-sensitive" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-calculation-setting-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:precision-as-shown" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-calculation-setting-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:search-criteria-must-apply-to-whole-cell"
-                     a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-calculation-setting-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:automatic-find-labels" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-calculation-setting-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:use-regular-expressions"
-                     a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-calculation-setting-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:null-year" a:defaultValue="1930">
-            <ref name="positiveInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-null-date">
-    <element name="table:null-date">
-        <optional>
-            <attribute name="table:value-type" a:defaultValue="date">
-                <ref name="valueType"/>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="table:date-value"
-                         a:defaultValue="1899-12-30">
-                <ref name="date"/>
-            </attribute>
-        </optional>
-        <empty/>
-    </element>
-</define>
-<define name="table-iteration">
-    <element name="table:iteration">
-        <optional>
-            <attribute name="table:status" a:defaultValue="disable">
-                <choice>
-                    <value>enable</value>
-                    <value>disable</value>
-                </choice>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="table:steps" a:defaultValue="100">
-                <ref name="positiveInteger"/>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="table:maximum-difference"
-                         a:defaultValue="0.001">
-                <ref name="double"/>
-            </attribute>
-        </optional>
-        <empty/>
-    </element>
-</define>
-<define name="table-content-validations">
-    <element name="table:content-validations">
-        <oneOrMore>
-            <ref name="table-content-validation"/>
-        </oneOrMore>
-    </element>
-</define>
-
-<define name="table-content-validation">
-    <element name="table:content-validation">
-        <ref name="table-validation-attlist"/>
-        <optional>
-            <ref name="table-help-message"/>
-        </optional>
-        <optional>
-            <choice>
-                <ref name="table-error-message"/>
-                <group>
-                    <ref name="table-error-macro"/>
-                    <optional>
-                        <ref name="office-event-listeners"/>
-                    </optional>
-                </group>
-            </choice>
-        </optional>
-    </element>
-</define>
-<define name="table-validation-attlist" combine="interleave">
-    <attribute name="table:name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="table-validation-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:condition">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-validation-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:base-cell-address">
-            <ref name="cellAddress"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-validation-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:allow-empty-cell" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-validation-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:display-list" a:defaultValue="unsorted">
-            <choice>
-                <value>none</value>
-                <value>unsorted</value>
-                <value>sort-ascending</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="table-help-message">
-    <element name="table:help-message">
-        <optional>
-            <attribute name="table:title">
-                <ref name="string"/>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="table:display" a:defaultValue="false">
-                <ref name="boolean"/>
-            </attribute>
-        </optional>
-        <zeroOrMore>
-            <ref name="text-p"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="table-error-message">
-    <element name="table:error-message">
-        <optional>
-            <attribute name="table:title">
-                <ref name="string"/>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="table:display" a:defaultValue="false">
-                <ref name="boolean"/>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="table:message-type" a:defaultValue="stop">
-                <choice>
-                    <value>stop</value>
-                    <value>warning</value>
-                    <value>information</value>
-                </choice>
-            </attribute>
-        </optional>
-        <zeroOrMore>
-            <ref name="text-p"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="table-error-macro">
-    <element name="table:error-macro">
-        <optional>
-            <attribute name="table:execute" a:defaultValue="true">
-                <ref name="boolean"/>
-            </attribute>
-        </optional>
-    </element>
-</define>
-<define name="table-label-ranges">
-    <element name="table:label-ranges">
-        <zeroOrMore>
-            <ref name="table-label-range"/>
-        </zeroOrMore>
-    </element>
-</define>
-
-<define name="table-label-range">
-    <element name="table:label-range">
-        <ref name="table-label-range-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="table-label-range-attlist" combine="interleave">
-    <attribute name="table:label-cell-range-address">
-        <ref name="cellRangeAddress"/>
-    </attribute>
-</define>
-<define name="table-label-range-attlist" combine="interleave">
-    <attribute name="table:data-cell-range-address">
-        <ref name="cellRangeAddress"/>
-    </attribute>
-</define>
-<define name="table-label-range-attlist" combine="interleave">
-    <attribute name="table:orientation">
-        <choice>
-            <value>column</value>
-            <value>row</value>
-        </choice>
-    </attribute>
-</define>
-<define name="table-named-expressions">
-    <element name="table:named-expressions">
-        <zeroOrMore>
-            <choice>
-                <ref name="table-named-range"/>
-                <ref name="table-named-expression"/>
-            </choice>
-        </zeroOrMore>
-    </element>
-</define>
-
-<define name="table-named-range">
-    <element name="table:named-range">
-        <ref name="table-named-range-attlist"/>
-        <empty/>
-    </element>
-</define>
-
-<define name="table-named-range-attlist" combine="interleave">
-    <attribute name="table:name">
-        <ref name="string"/>
-    </attribute>
-    <attribute name="table:cell-range-address">
-        <ref name="cellRangeAddress"/>
-    </attribute>
-    <optional>
-        <attribute name="table:base-cell-address">
-            <ref name="cellAddress"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="table:range-usable-as" a:defaultValue="none">
-            <choice>
-                <value>none</value>
-                <list>
-                    <oneOrMore>
-                        <choice>
-                            <value>print-range</value>
-                            <value>filter</value>
-                            <value>repeat-row</value>
-                            <value>repeat-column</value>
-                        </choice>
-                    </oneOrMore>
-                </list>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="table-named-expression">
-    <element name="table:named-expression">
-        <ref name="table-named-expression-attlist"/>
-        <empty/>
-    </element>
-</define>
-
-<define name="table-named-expression-attlist" combine="interleave">
-    <attribute name="table:name">
-        <ref name="string"/>
-    </attribute>
-    <attribute name="table:expression">
-        <ref name="string"/>
-    </attribute>
-    <optional>
-        <attribute name="table:base-cell-address">
-            <ref name="cellAddress"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-database-ranges">
-    <element name="table:database-ranges">
-        <zeroOrMore>
-            <ref name="table-database-range"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="table-database-range">
-    <element name="table:database-range">
-        <ref name="table-database-range-attlist"/>
-        <optional>
-            <choice>
-                <ref name="table-database-source-sql"/>
-                <ref name="table-database-source-table"/>
-                <ref name="table-database-source-query"/>
-            </choice>
-        </optional>
-        <optional>
-            <ref name="table-filter"/>
-        </optional>
-        <optional>
-            <ref name="table-sort"/>
-        </optional>
-        <optional>
-            <ref name="table-subtotal-rules"/>
-        </optional>
-    </element>
-</define>
-<define name="table-database-range-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-database-range-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:is-selection" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-database-range-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:on-update-keep-styles" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-database-range-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:on-update-keep-size" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-database-range-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:has-persistent-data" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-database-range-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:orientation" a:defaultValue="row">
-            <choice>
-                <value>column</value>
-                <value>row</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="table-database-range-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:contains-header" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-database-range-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:display-filter-buttons"
-                   a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-database-range-attlist" combine="interleave">
-    <attribute name="table:target-range-address">
-        <ref name="cellRangeAddress"/>
-    </attribute>
-</define>
-<define name="table-database-range-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:refresh-delay">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-database-source-sql">
-    <element name="table:database-source-sql">
-        <ref name="table-database-source-sql-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="table-database-source-sql-attlist" combine="interleave">
-    <attribute name="table:database-name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="table-database-source-sql-attlist" combine="interleave">
-    <attribute name="table:sql-statement">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="table-database-source-sql-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:parse-sql-statement" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-database-source-query">
-    <element name="table:database-source-table">
-        <ref name="table-database-source-table-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="table-database-source-table-attlist" combine="interleave">
-    <attribute name="table:database-name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="table-database-source-table-attlist" combine="interleave">
-    <attribute name="table:database-table-name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="table-database-source-table">
-    <element name="table:database-source-query">
-        <ref name="table-database-source-query-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="table-database-source-query-attlist" combine="interleave">
-    <attribute name="table:database-name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="table-database-source-query-attlist" combine="interleave">
-    <attribute name="table:query-name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="table-sort">
-    <element name="table:sort">
-        <ref name="table-sort-attlist"/>
-        <oneOrMore>
-            <ref name="table-sort-by"/>
-        </oneOrMore>
-    </element>
-</define>
-<define name="table-sort-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:bind-styles-to-content" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-sort-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:target-range-address">
-            <ref name="cellRangeAddress"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-sort-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:case-sensitive" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-sort-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:language">
-            <ref name="languageCode"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-sort-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:country">
-            <ref name="countryCode"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-sort-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:algorithm">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-sort-by">
-    <element name="table:sort-by">
-        <ref name="table-sort-by-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="table-sort-by-attlist" combine="interleave">
-    <attribute name="table:field-number">
-        <ref name="nonNegativeInteger"/>
-    </attribute>
-</define>
-<define name="table-sort-by-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:data-type" a:defaultValue="automatic">
-            <choice>
-                <value>text</value>
-                <value>number</value>
-                <value>automatic</value>
-                <ref name="string"/>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="table-sort-by-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:order" a:defaultValue="ascending">
-            <choice>
-                <value>ascending</value>
-                <value>descending</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="table-subtotal-rules">
-    <element name="table:subtotal-rules">
-        <ref name="table-subtotal-rules-attlist"/>
-        <optional>
-            <ref name="table-sort-groups"/>
-        </optional>
-        <zeroOrMore>
-            <ref name="table-subtotal-rule"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="table-subtotal-rules-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:bind-styles-to-content" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-subtotal-rules-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:case-sensitive" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-subtotal-rules-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:page-breaks-on-group-change"
-                   a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-sort-groups">
-    <element name="table:sort-groups">
-        <ref name="table-sort-groups-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="table-sort-groups-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:data-type" a:defaultValue="automatic">
-            <choice>
-                <value>text</value>
-                <value>number</value>
-                <value>automatic</value>
-                <ref name="string"/>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="table-sort-groups-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:order" a:defaultValue="ascending">
-            <choice>
-                <value>ascending</value>
-                <value>descending</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="table-subtotal-rule">
-    <element name="table:subtotal-rule">
-        <ref name="table-subtotal-rule-attlist"/>
-        <zeroOrMore>
-            <ref name="table-subtotal-field"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="table-subtotal-rule-attlist" combine="interleave">
-    <attribute name="table:group-by-field-number">
-        <ref name="nonNegativeInteger"/>
-    </attribute>
-</define>
-<define name="table-subtotal-field">
-    <element name="table:subtotal-field">
-        <ref name="table-subtotal-field-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="table-subtotal-field-attlist" combine="interleave">
-    <attribute name="table:field-number">
-        <ref name="nonNegativeInteger"/>
-    </attribute>
-</define>
-<define name="table-subtotal-field-attlist" combine="interleave">
-    <attribute name="table:function">
-        <choice>
-            <value>auto</value>
-            <value>average</value>
-            <value>count</value>
-            <value>countnums</value>
-            <value>max</value>
-            <value>min</value>
-            <value>product</value>
-            <value>stdev</value>
-            <value>stdevp</value>
-            <value>sum</value>
-            <value>var</value>
-            <value>varp</value>
-            <ref name="string"/>
-        </choice>
-    </attribute>
-</define>
-<define name="table-filter">
-    <element name="table:filter">
-        <ref name="table-filter-attlist"/>
-        <choice>
-            <ref name="table-filter-condition"/>
-            <ref name="table-filter-and"/>
-            <ref name="table-filter-or"/>
-        </choice>
-    </element>
-</define>
-<define name="table-filter-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:target-range-address">
-            <ref name="cellRangeAddress"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-filter-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:condition-source" a:defaultValue="self">
-            <choice>
-                <value>self</value>
-                <value>cell-range</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="table-filter-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:condition-source-range-address">
-            <ref name="cellRangeAddress"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-filter-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:display-duplicates" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-filter-and">
-    <element name="table:filter-and">
-        <oneOrMore>
-            <choice>
-                <ref name="table-filter-or"/>
-                <ref name="table-filter-condition"/>
-            </choice>
-        </oneOrMore>
-    </element>
-</define>
-<define name="table-filter-or">
-    <element name="table:filter-or">
-        <oneOrMore>
-            <choice>
-                <ref name="table-filter-and"/>
-                <ref name="table-filter-condition"/>
-            </choice>
-        </oneOrMore>
-    </element>
-</define>
-<define name="table-filter-condition">
-    <element name="table:filter-condition">
-        <ref name="table-filter-condition-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="table-filter-condition-attlist" combine="interleave">
-    <attribute name="table:field-number">    
-        <ref name="nonNegativeInteger"/>
-    </attribute>
-</define>
-<define name="table-filter-condition-attlist" combine="interleave">
-    <attribute name="table:value">    
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="table-filter-condition-attlist" combine="interleave">
-    <attribute name="table:operator">    
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="table-filter-condition-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:case-sensitive" a:defaultValue="false">    
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-filter-condition-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:data-type" a:defaultValue="text">
-            <choice>
-                <value>text</value>
-                <value>number</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="table-data-pilot-tables">
-    <element name="table:data-pilot-tables">
-        <zeroOrMore>
-            <ref name="table-data-pilot-table"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="table-data-pilot-table">
-    <element name="table:data-pilot-table">
-        <ref name="table-data-pilot-table-attlist"/>
-        <optional>
-            <choice>
-                <ref name="table-database-source-sql"/>
-                <ref name="table-database-source-table"/>
-                <ref name="table-database-source-query"/>
-                <ref name="table-source-service"/>
-                <ref name="table-source-cell-range"/>
-            </choice>
-        </optional>
-        <oneOrMore>
-            <ref name="table-data-pilot-field"/>
-        </oneOrMore>
-    </element>
-</define>
-<define name="table-data-pilot-table-attlist" combine="interleave">
-    <attribute name="table:name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="table-data-pilot-table-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:application-data">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-data-pilot-table-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:grand-total" a:defaultValue="both">
-            <choice>
-                <value>none</value>
-                <value>row</value>
-                <value>column</value>
-                <value>both</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="table-data-pilot-table-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:ignore-empty-rows" a:defaultValue="false">    
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-data-pilot-table-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:identify-categories" a:defaultValue="false">    
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-data-pilot-table-attlist" combine="interleave">
-    <attribute name="table:target-range-address">    
-        <ref name="cellRangeAddress"/>
-    </attribute>
-</define>
-<define name="table-data-pilot-table-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:buttons">    
-            <ref name="cellRangeAddressList"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-data-pilot-table-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:show-filter-button" a:defaultValue="true">    
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-data-pilot-table-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:drill-down-on-double-click"
-                   a:defaultValue="true">    
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-source-cell-range">
-    <element name="table:source-cell-range">
-        <ref name="table-source-cell-range-attlist"/>
-        <optional>
-            <ref name="table-filter"/>
-        </optional>
-    </element>
-</define>
-<define name="table-source-cell-range-attlist" combine="interleave">
-    <attribute name="table:cell-range-address">    
-        <ref name="cellRangeAddress"/>
-    </attribute>
-</define>
-<define name="table-source-service">
-    <element name="table:source-service">
-        <ref name="table-source-service-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="table-source-service-attlist" combine="interleave">
-    <attribute name="table:name">    
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="table-source-service-attlist" combine="interleave">
-    <attribute name="table:source-name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="table-source-service-attlist" combine="interleave">
-    <attribute name="table:object-name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="table-source-service-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:user-name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-source-service-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:password">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-data-pilot-field">
-    <element name="table:data-pilot-field">
-        <ref name="table-data-pilot-field-attlist"/>
-        <optional>
-            <ref name="table-data-pilot-level"/>
-        </optional>
-        <optional>
-            <ref name="table-data-pilot-field-reference"/>
-        </optional>
-        <optional>
-            <ref name="table-data-pilot-groups"/>
-        </optional>
-    </element>
-</define>
-<define name="table-data-pilot-field-attlist" combine="interleave">
-    <attribute name="table:source-field-name">    
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="table-data-pilot-field-attlist" combine="interleave">
-    <choice>
-        <attribute name="table:orientation">    
-            <choice>
-                <value>row</value>
-                <value>column</value>
-                <value>data</value>
-                <value>hidden</value>
-            </choice>
-        </attribute>
-        <group>
-            <attribute name="table:orientation">
-                <value>page</value>
-            </attribute>
-            <attribute name="table:selected-page">
-                <ref name="string"/>
-            </attribute>
-        </group>
-    </choice>
-</define>
-<define name="table-data-pilot-field-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:is-data-layout-field" a:defaultValue="false">    
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-data-pilot-field-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:function">
-            <choice>
-                <value>auto</value>
-                <value>average</value>
-                <value>count</value>
-                <value>countnums</value>
-                <value>max</value>
-                <value>min</value>
-                <value>product</value>
-                <value>stdev</value>
-                <value>stdevp</value>
-                <value>sum</value>
-                <value>var</value>
-                <value>varp</value>
-                <ref name="string"/>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="table-data-pilot-field-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:used-hierarchy" a:defaultValue="-1">    
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-data-pilot-level">
-    <element name="table:data-pilot-level">
-        <ref name="table-data-pilot-level-attlist"/>
-        <optional>
-            <ref name="table-data-pilot-subtotals"/>
-        </optional>
-        <optional>
-            <ref name="table-data-pilot-members"/>
-        </optional>
-        <optional>
-            <ref name="table-data-pilot-display-info"/>
-        </optional>
-        <optional>
-            <ref name="table-data-pilot-sort-info"/>
-        </optional>
-        <optional>
-            <ref name="table-data-pilot-layout-info"/>
-        </optional>
-    </element>
-</define>
-<define name="table-data-pilot-level-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:show-empty">    
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-data-pilot-subtotals">
-    <element name="table:data-pilot-subtotals">
-        <zeroOrMore>
-            <ref name="table-data-pilot-subtotal"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="table-data-pilot-subtotal">
-    <element name="table:data-pilot-subtotal">
-        <ref name="table-data-pilot-subtotal-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="table-data-pilot-subtotal-attlist" combine="interleave">
-    <attribute name="table:function">
-        <choice>
-            <value>auto</value>
-            <value>average</value>
-            <value>count</value>
-            <value>countnums</value>
-            <value>max</value>
-            <value>min</value>
-            <value>product</value>
-            <value>stdev</value>
-            <value>stdevp</value>
-            <value>sum</value>
-            <value>var</value>
-            <value>varp</value>
-            <ref name="string"/>
-        </choice>
-    </attribute>
-</define>
-<define name="table-data-pilot-members">
-    <element name="table:data-pilot-members">
-        <zeroOrMore>
-            <ref name="table-data-pilot-member"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="table-data-pilot-member">
-    <element name="table:data-pilot-member">
-        <ref name="table-data-pilot-member-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="table-data-pilot-member-attlist" combine="interleave">
-    <attribute name="table:name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="table-data-pilot-member-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:display">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-data-pilot-member-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:show-details">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-data-pilot-display-info">
-    <element name="table:data-pilot-display-info">
-        <ref name="table-data-pilot-display-info-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="table-data-pilot-display-info-attlist" combine="interleave">
-    <attribute name="table:enabled">
-        <ref name="boolean"/>
-    </attribute>
-</define>
-<define name="table-data-pilot-display-info-attlist" combine="interleave">
-    <attribute name="table:data-field">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="table-data-pilot-display-info-attlist" combine="interleave">
-    <attribute name="table:member-count">
-        <ref name="nonNegativeInteger"/>
-    </attribute>
-</define>
-<define name="table-data-pilot-display-info-attlist" combine="interleave">
-    <attribute name="table:display-member-mode">
-        <choice>
-            <value>from-top</value>
-            <value>from-bottom</value>
-        </choice>
-    </attribute>
-</define>
-<define name="table-data-pilot-sort-info">
-    <element name="table:data-pilot-sort-info">
-        <ref name="table-data-pilot-sort-info-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="table-data-pilot-sort-info-attlist" combine="interleave">
-    <choice>
-        <group>
-            <attribute name="table:sort-mode">
-                <value>data</value>
-            </attribute>
-            <attribute name="table:data-field">
-                <ref name="string"/>
-            </attribute>
-        </group>
-        <attribute name="table:sort-mode">
-            <choice>
-                <value>none</value>
-                <value>manual</value>
-                <value>name</value>
-            </choice>
-        </attribute>
-    </choice>
-</define>
-<define name="table-data-pilot-sort-info-attlist" combine="interleave">
-    <attribute name="table:order">
-        <choice>
-            <value>ascending</value>
-            <value>descending</value>
-        </choice>
-    </attribute>
-</define>
-<define name="table-data-pilot-layout-info">
-    <element name="table:data-pilot-layout-info">
-        <ref name="table-data-pilot-layout-info-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="table-data-pilot-layout-info-attlist" combine="interleave">
-    <attribute name="table:layout-mode">
-        <choice>
-            <value>tabular-layout</value>
-            <value>outline-subtotals-top</value>
-            <value>outline-subtotals-bottom</value>
-        </choice>
-    </attribute>
-</define>
-<define name="table-data-pilot-layout-info-attlist" combine="interleave">
-    <attribute name="table:add-empty-lines">
-        <ref name="boolean"/>
-    </attribute>
-</define>
-<define name="table-data-pilot-field-reference">
-    <element name="table:data-pilot-field-reference">
-        <ref name="table-data-pilot-field-reference-attlist"/>
-    </element>
-</define>
-<define name="table-data-pilot-field-reference-attlist" combine="interleave">
-    <attribute name="table:field-name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="table-data-pilot-field-reference-attlist" combine="interleave">
-    <choice>
-        <group>
-            <attribute name="table:member-type">
-                <value>named</value>
-            </attribute>
-            <attribute name="table:member-name">
-                <ref name="string"/>
-            </attribute>
-        </group>
-        <attribute name="table:member-type">
-            <choice>
-                <value>previous</value>
-                <value>next</value>
-            </choice>
-        </attribute>
-    </choice>
-</define>
-<define name="table-data-pilot-field-reference-attlist" combine="interleave">
-    <attribute name="table:type">
-        <choice>
-            <value>none</value>
-            <value>member-difference</value>
-            <value>member-percentage</value>
-            <value>member-percentage-difference</value>
-            <value>running-total</value>
-            <value>row-percentage</value>
-            <value>column-percentage</value>
-            <value>total-percentage</value>
-            <value>index</value>
-        </choice>
-    </attribute>
-</define>
-<define name="table-data-pilot-groups">
-    <element name="table:data-pilot-groups">
-        <ref name="table-data-pilot-groups-attlist"/>
-        <oneOrMore>
-            <ref name="table-data-pilot-group"/>
-        </oneOrMore>
-    </element>
-</define>
-<define name="table-data-pilot-groups-attlist" combine="interleave">
-    <attribute name="table:source-field-name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="table-data-pilot-groups-attlist" combine="interleave">
-    <choice>
-        <attribute name="table:date-start">
-            <choice>
-                <ref name="dateOrDateTime"/>
-                <value>auto</value>
-            </choice>
-        </attribute>
-        <attribute name="table:start">
-            <choice>
-                <ref name="double"/>
-                <value>auto</value>
-            </choice>
-        </attribute>
-    </choice>
-</define>
-<define name="table-data-pilot-groups-attlist" combine="interleave">
-    <choice>
-        <attribute name="table:date-end">
-            <choice>
-                <ref name="dateOrDateTime"/>
-                <value>auto</value>
-            </choice>
-        </attribute>
-        <attribute name="table:end">
-            <choice>
-                <ref name="double"/>
-                <value>auto</value>
-            </choice>
-        </attribute>
-    </choice>
-</define>
-<define name="table-data-pilot-groups-attlist" combine="interleave">
-    <attribute name="table:step">
-        <ref name="double"/>
-    </attribute>
-</define>
-<define name="table-data-pilot-groups-attlist" combine="interleave">
-    <attribute name="table:grouped-by">
-        <choice>
-            <value>seconds</value>
-            <value>minutes</value>
-            <value>hours</value>
-            <value>days</value>
-            <value>months</value>
-            <value>quarters</value>
-            <value>years</value>
-        </choice>
-    </attribute>
-</define>
-<define name="table-data-pilot-group">
-    <element name="table:data-pilot-group">
-        <ref name="table-data-pilot-group-attlist"/>
-        <oneOrMore>
-            <ref name="table-data-pilot-group-member"/>
-        </oneOrMore>
-    </element>
-</define>
-<define name="table-data-pilot-group-attlist" combine="interleave">
-    <attribute name="table:name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="table-data-pilot-group-member">
-    <element name="table:data-pilot-group-member">
-        <ref name="table-data-pilot-group-member-attlist"/>
-    </element>
-</define>
-<define name="table-data-pilot-group-member-attlist" combine="interleave">
-    <attribute name="table:name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="table-consolidation">
-    <element name="table:consolidation">
-        <ref name="table-consolidation-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="table-consolidation-attlist" combine="interleave">
-    <attribute name="table:function">    
-        <choice>
-            <value>auto</value>
-            <value>average</value>
-            <value>count</value>
-            <value>countnums</value>
-            <value>max</value>
-            <value>min</value>
-            <value>product</value>
-            <value>stdev</value>
-            <value>stdevp</value>
-            <value>sum</value>
-            <value>var</value>
-            <value>varp</value>
-            <ref name="string"/>
-        </choice>
-    </attribute>
-</define>
-<define name="table-consolidation-attlist" combine="interleave">
-    <attribute name="table:source-cell-range-addresses">    
-        <ref name="cellRangeAddressList"/>
-    </attribute>
-</define>
-<define name="table-consolidation-attlist" combine="interleave">
-    <attribute name="table:target-cell-address">    
-        <ref name="cellAddress"/>
-    </attribute>
-</define>
-<define name="table-consolidation-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:use-labels" a:defaultValue="none">
-            <choice>
-                <value>none</value>
-                <value>row</value>
-                <value>column</value>
-                <value>both</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="table-consolidation-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:link-to-source-data" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-dde-links">
-    <element name="table:dde-links">
-        <oneOrMore>
-            <ref name="table-dde-link"/>
-        </oneOrMore>
-    </element>
-</define>
-<define name="table-tracked-changes">
-    <element name="table:tracked-changes">
-        <ref name="table-tracked-changes-attlist"/>
-        <zeroOrMore>
-            <choice>
-                <ref name="table-cell-content-change"/>
-                <ref name="table-insertion"/>
-                <ref name="table-deletion"/>
-                <ref name="table-movement"/>
-            </choice>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="table-tracked-changes-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:track-changes" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-insertion">
-    <element name="table:insertion">
-        <ref name="table-insertion-attlist"/>
-        <ref name="common-table-change-attlist"/>
-        <ref name="office-change-info"/>
-        <optional>
-            <ref name="table-dependencies"/>
-        </optional>
-        <optional>
-            <ref name="table-deletions"/>
-        </optional>
-    </element>
-</define>
-<define name="table-insertion-attlist" combine="interleave">
-    <attribute name="table:type">
-        <choice>
-            <value>row</value>
-            <value>column</value>
-            <value>table</value>
-        </choice>
-    </attribute>
-</define>
-<define name="table-insertion-attlist" combine="interleave">
-    <attribute name="table:position">
-        <ref name="integer"/>
-    </attribute>
-</define>
-<define name="table-insertion-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:count" a:defaultValue="1">
-            <ref name="positiveInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-insertion-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:table">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-dependencies">
-    <element name="table:dependencies">
-        <oneOrMore>
-            <ref name="table-dependency"/>
-        </oneOrMore>
-    </element>
-</define>
-<define name="table-dependency">
-    <element name="table:dependency">
-        <attribute name="table:id">
-            <ref name="string"/>
-        </attribute>
-        <empty/>
-    </element>
-</define>
-<define name="table-deletions">
-    <element name="table:deletions">
-        <oneOrMore>
-            <choice>
-                <ref name="table-cell-content-deletion"/>
-                <ref name="table-change-deletion"/>
-            </choice>
-        </oneOrMore>
-    </element>
-</define>
-<define name="table-cell-content-deletion">
-    <element name="table:cell-content-deletion">
-        <optional>
-            <attribute name="table:id">
-                <ref name="string"/>
-            </attribute>
-        </optional>
-        <optional>
-            <ref name="table-cell-address"/>
-        </optional>
-        <optional>
-            <ref name="table-change-track-table-cell"/>
-        </optional>
-    </element>
-</define>
-<define name="table-change-deletion">
-    <element name="table:change-deletion">
-        <optional>
-            <attribute name="table:id">
-                <ref name="string"/>
-            </attribute>
-        </optional>
-        <empty/>
-    </element>
-</define>
-<define name="table-deletion">
-    <element name="table:deletion">
-        <ref name="table-deletion-attlist"/>
-        <ref name="common-table-change-attlist"/>
-        <ref name="office-change-info"/>
-        <optional>
-            <ref name="table-dependencies"/>
-        </optional>
-        <optional>
-            <ref name="table-deletions"/>
-        </optional>
-        <optional>
-            <ref name="table-cut-offs"/>
-        </optional>
-    </element>
-</define>
-<define name="table-deletion-attlist" combine="interleave">
-    <attribute name="table:type">
-        <choice>
-            <value>row</value>
-            <value>column</value>
-            <value>table</value>
-        </choice>
-    </attribute>
-</define>
-<define name="table-deletion-attlist" combine="interleave">
-    <attribute name="table:position">
-        <ref name="integer"/>
-    </attribute>
-</define>
-<define name="table-deletion-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:table">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-deletion-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:multi-deletion-spanned">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-cut-offs">
-    <element name="table:cut-offs">
-        <choice>
-            <oneOrMore>
-                <ref name="table-movement-cut-off"/>
-            </oneOrMore>
-            <group>
-                <ref name="table-insertion-cut-off"/>
-                <zeroOrMore>
-                    <ref name="table-movement-cut-off"/>
-                </zeroOrMore>
-            </group>
-        </choice>
-    </element>
-</define>
-<define name="table-insertion-cut-off">
-    <element name="table:insertion-cut-off">
-        <ref name="table-insertion-cut-off-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="table-insertion-cut-off-attlist" combine="interleave">
-    <attribute name="table:id">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="table-insertion-cut-off-attlist" combine="interleave">
-    <attribute name="table:position">
-        <ref name="integer"/>
-    </attribute>
-</define>
-<define name="table-movement-cut-off">
-    <element name="table:movement-cut-off">
-        <ref name="table-movement-cut-off-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="table-movement-cut-off-attlist" combine="interleave">
-    <choice>
-        <attribute name="table:position">
-            <ref name="integer"/>
-        </attribute>
-        <group>
-            <attribute name="table:start-position">
-                <ref name="integer"/>
-            </attribute>
-            <attribute name="table:end-position">
-                <ref name="integer"/>
-            </attribute>
-        </group>
-    </choice>
-</define>
-<define name="table-movement">
-    <element name="table:movement">
-        <ref name="common-table-change-attlist"/>
-        <ref name="table-source-range-address"/>
-        <ref name="table-target-range-address"/>
-        <ref name="office-change-info"/>
-        <optional>
-            <ref name="table-dependencies"/>
-        </optional>
-        <optional>
-            <ref name="table-deletions"/>
-        </optional>
-    </element>
-</define>
-<define name="table-source-range-address">
-    <element name="table:source-range-address">
-        <ref name="common-table-range-attlist"/>
-        <empty/>
-    </element>
-</define>
-
-<define name="table-target-range-address">
-    <element name="table:target-range-address">
-        <ref name="common-table-range-attlist"/>
-        <empty/>
-    </element>
-</define>
-
-
-<define name="common-table-range-attlist" combine="interleave">
-    <choice>
-        <group>
-            <ref name="common-table-cell-address-attlist"/>
-        </group>
-        <group>
-            <ref name="common-table-cell-range-address-attlist"/>
-        </group>
-    </choice>
-</define>
-<define name="common-table-cell-address-attlist" combine="interleave">
-    <attribute name="table:column">
-        <ref name="integer"/>
-    </attribute>
-    <attribute name="table:row">
-        <ref name="integer"/>
-    </attribute>
-    <attribute name="table:table">
-        <ref name="integer"/>
-    </attribute>
-</define>
-<define name="common-table-cell-range-address-attlist" combine="interleave">
-    <attribute name="table:start-column">
-        <ref name="integer"/>
-    </attribute>
-    <attribute name="table:start-row">
-        <ref name="integer"/>
-    </attribute>
-    <attribute name="table:start-table">
-        <ref name="integer"/>
-    </attribute>
-    <attribute name="table:end-column">
-        <ref name="integer"/>
-    </attribute>
-    <attribute name="table:end-row">
-        <ref name="integer"/>
-    </attribute>
-    <attribute name="table:end-table">
-        <ref name="integer"/>
-    </attribute>
-</define>
-<define name="table-change-track-table-cell" combine="interleave">
-    <element name="table:change-track-table-cell">
-        <ref name="table-change-track-table-cell-attlist"/>
-        <zeroOrMore>
-            <ref name="text-p"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="table-change-track-table-cell-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:cell-address">
-            <ref name="cellAddress"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-change-track-table-cell-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:matrix-covered" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-change-track-table-cell-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:formula">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="table:number-matrix-columns-spanned">
-            <ref name="positiveInteger"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="table:number-matrix-rows-spanned">
-            <ref name="positiveInteger"/>
-        </attribute>
-    </optional>
-    <optional>
-        <ref name="common-value-and-type-attlist"/>
-    </optional>
-</define>
-<define name="table-cell-content-change">
-    <element name="table:cell-content-change">
-        <ref name="common-table-change-attlist"/>
-        <ref name="table-cell-address"/>
-        <ref name="office-change-info"/>
-        <optional>
-            <ref name="table-dependencies"/>
-        </optional>
-        <optional>
-            <ref name="table-deletions"/>
-        </optional>
-        <ref name="table-previous"/>
-    </element>
-</define>
-<define name="table-cell-address">
-    <element name="table:cell-address">
-        <ref name="common-table-cell-address-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="table-previous">
-    <element name="table:previous">
-        <optional>
-            <attribute name="table:id">
-                <ref name="string"/>
-            </attribute>
-        </optional>
-        <ref name="table-change-track-table-cell"/>
-    </element>
-</define>
-<define name="common-table-change-attlist" combine="interleave">
-    <attribute name="table:id">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="common-table-change-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:acceptance-state" a:defaultValue="pending">
-            <choice>
-                <value>accepted</value>
-                <value>rejected</value>
-                <value>pending</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="common-table-change-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:rejecting-change-id">
-            <ref name="string"/> 
-        </attribute>
-    </optional>
-</define>
-<define name="style-handout-master">
-    <element name="style:handout-master">
-        <ref name="common-presentation-header-footer-attlist"/>
-        <ref name="style-handout-master-attlist"/>
-        <zeroOrMore>
-            <ref name="shape"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="style-handout-master-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:presentation-page-layout-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-handout-master-attlist" combine="interleave">
-    <attribute name="style:page-layout-name">
-        <ref name="styleNameRef"/>
-    </attribute>
-</define>
-<define name="style-handout-master-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-layer-set">
-    <element name="draw:layer-set">
-        <zeroOrMore>
-            <ref name="draw-layer"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="draw-layer">
-    <element name="draw:layer">
-        <ref name="draw-layer-attlist"/>
-        <optional>
-            <ref name="svg-title"/>
-        </optional>
-        <optional>
-            <ref name="svg-desc"/>
-        </optional>
-    </element>
-</define>
-<define name="draw-layer-attlist" combine="interleave">
-    <attribute name="draw:name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="draw-layer-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:protected" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-layer-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:display" a:defaultValue="always">
-            <choice>
-                <value>always</value>
-                <value>screen</value>
-                <value>printer</value>
-                <value>none</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-page">
-    <element name="draw:page">
-        <ref name="common-presentation-header-footer-attlist"/>
-        <ref name="draw-page-attlist"/>
-        <optional>
-            <ref name="office-forms"/>
-        </optional>
-        <zeroOrMore>
-            <ref name="shape"/>
-        </zeroOrMore>
-        <optional>
-            <choice>
-                <ref name="presentation-animations"/>
-                <ref name="animation-element"/>
-            </choice>
-        </optional>
-        <optional>
-            <ref name="presentation-notes"/>
-        </optional>
-    </element>
-</define>
-<define name="draw-page-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-page-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-page-attlist" combine="interleave">
-    <attribute name="draw:master-page-name">
-        <ref name="styleNameRef"/>
-    </attribute>
-</define>
-<define name="draw-page-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:presentation-page-layout-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-presentation-header-footer-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:use-header-name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-presentation-header-footer-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:use-footer-name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-presentation-header-footer-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:use-date-time-name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-page-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:id">
-            <ref name="ID"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-page-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:nav-order">
-            <ref name="IDREFS"/>
-        </attribute>
-    </optional>
-</define>
-<define name="shape">
-    <choice>
-        <ref name="draw-rect"/>
-        <ref name="draw-line"/>
-        <ref name="draw-polyline"/>
-        <ref name="draw-polygon"/>
-        <ref name="draw-regular-polygon"/>
-        <ref name="draw-path"/>
-        <ref name="draw-circle"/>
-        <ref name="draw-ellipse"/>
-        <ref name="draw-g"/>
-        <ref name="draw-page-thumbnail"/>
-        <ref name="draw-frame"/>
-        <ref name="draw-measure"/>
-        <ref name="draw-caption"/>
-        <ref name="draw-connector"/>
-        <ref name="draw-control"/>
-        <ref name="dr3d-scene"/>
-        <ref name="draw-custom-shape"/>
-    </choice>
-</define>
-<define name="draw-rect">
-    <element name="draw:rect">
-        <ref name="draw-rect-attlist"/>
-        <ref name="common-draw-position-attlist"/>
-        <ref name="common-draw-size-attlist"/>
-        <ref name="common-draw-shape-with-text-and-styles-attlist"/>
-        <ref name="common-draw-caption-id-attlist"/>
-        <optional>
-            <ref name="svg-title"/>
-        </optional>
-        <optional>
-            <ref name="svg-desc"/>
-        </optional>
-        <optional>
-            <ref name="office-event-listeners"/>
-        </optional>
-        <zeroOrMore>
-            <ref name="draw-glue-point"/>
-        </zeroOrMore>
-        <ref name="draw-text"/>
-    </element>
-</define>
-<define name="draw-rect-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:corner-radius">
-            <ref name="nonNegativeLength"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-line">
-    <element name="draw:line">
-        <ref name="draw-line-attlist"/>
-        <ref name="common-draw-shape-with-text-and-styles-attlist"/>
-        <ref name="common-draw-caption-id-attlist"/>
-        <optional>
-            <ref name="svg-title"/>
-        </optional>
-        <optional>
-            <ref name="svg-desc"/>
-        </optional>
-        <optional>
-            <ref name="office-event-listeners"/>
-        </optional>
-        <zeroOrMore>
-            <ref name="draw-glue-point"/>
-        </zeroOrMore>
-        <ref name="draw-text"/>
-    </element>
-</define>
-<define name="draw-line-attlist" combine="interleave">
-    <attribute name="svg:x1">
-        <ref name="coordinate"/>
-    </attribute>
-    <attribute name="svg:y1">
-        <ref name="coordinate"/>
-    </attribute>
-</define>
-<define name="draw-line-attlist" combine="interleave">
-    <attribute name="svg:x2">
-        <ref name="coordinate"/>
-    </attribute>
-    <attribute name="svg:y2">
-        <ref name="coordinate"/>
-    </attribute>
-</define>
-<define name="draw-polyline">
-    <element name="draw:polyline">
-        <ref name="common-draw-points-attlist"/>
-        <ref name="common-draw-position-attlist"/>
-        <ref name="common-draw-size-attlist"/>
-        <ref name="common-draw-viewbox-attlist"/>
-        <ref name="common-draw-shape-with-text-and-styles-attlist"/>
-        <ref name="common-draw-caption-id-attlist"/>
-        <optional>
-            <ref name="svg-title"/>
-        </optional>
-        <optional>
-            <ref name="svg-desc"/>
-        </optional>
-        <optional>
-            <ref name="office-event-listeners"/>
-        </optional>
-        <zeroOrMore>
-            <ref name="draw-glue-point"/>
-        </zeroOrMore>
-        <ref name="draw-text"/>
-    </element>
-</define>
-<define name="common-draw-points-attlist">
-    <attribute name="draw:points">
-        <ref name="points"/>
-    </attribute>
-</define>
-<define name="draw-polygon">
-    <element name="draw:polygon">
-        <ref name="common-draw-points-attlist"/>
-        <ref name="common-draw-position-attlist"/>
-        <ref name="common-draw-size-attlist"/>
-        <ref name="common-draw-viewbox-attlist"/>
-        <ref name="common-draw-shape-with-text-and-styles-attlist"/>
-        <ref name="common-draw-caption-id-attlist"/>
-        <optional>
-            <ref name="svg-title"/>
-        </optional>
-        <optional>
-            <ref name="svg-desc"/>
-        </optional>
-        <optional>
-            <ref name="office-event-listeners"/>
-        </optional>
-        <zeroOrMore>
-            <ref name="draw-glue-point"/>
-        </zeroOrMore>
-        <ref name="draw-text"/>
-    </element>
-</define>
-<define name="draw-regular-polygon">
-    <element name="draw:regular-polygon">
-        <ref name="draw-regular-polygon-attlist"/>
-        <ref name="common-draw-position-attlist"/>
-        <ref name="common-draw-size-attlist"/>
-        <ref name="common-draw-shape-with-text-and-styles-attlist"/>
-        <ref name="common-draw-caption-id-attlist"/>
-        <optional>
-            <ref name="svg-title"/>
-        </optional>
-        <optional>
-            <ref name="svg-desc"/>
-        </optional>
-        <optional>
-            <ref name="office-event-listeners"/>
-        </optional>
-        <zeroOrMore>
-            <ref name="draw-glue-point"/>
-        </zeroOrMore>
-        <ref name="draw-text"/>
-    </element>
-</define>
-<define name="draw-regular-polygon-attlist" combine="interleave">
-    <choice>
-        <attribute name="draw:concave">
-            <value>false</value>
-        </attribute>
-        <group>
-            <attribute name="draw:concave">
-                <value>true</value>
-            </attribute>
-            <ref name="draw-regular-polygon-sharpness-attlist"/>
-        </group>
-    </choice>
-</define>
-<define name="draw-regular-polygon-attlist" combine="interleave">
-    <attribute name="draw:corners">
-        <ref name="positiveInteger"/>
-    </attribute>
-</define>
-<define name="draw-regular-polygon-sharpness-attlist">
-    <attribute name="draw:sharpness">
-        <ref name="percent"/>
-    </attribute>
-</define>
-<define name="draw-path">
-    <element name="draw:path">
-        <ref name="common-draw-path-data-attlist"/>
-        <ref name="common-draw-position-attlist"/>
-        <ref name="common-draw-size-attlist"/>
-        <ref name="common-draw-viewbox-attlist"/>
-        <ref name="common-draw-shape-with-text-and-styles-attlist"/>
-        <ref name="common-draw-caption-id-attlist"/>
-        <optional>
-            <ref name="svg-title"/>
-        </optional>
-        <optional>
-            <ref name="svg-desc"/>
-        </optional>
-        <optional>
-            <ref name="office-event-listeners"/>
-        </optional>
-        <zeroOrMore>
-            <ref name="draw-glue-point"/>
-        </zeroOrMore>
-        <ref name="draw-text"/>
-    </element>
-</define>
-<define name="common-draw-path-data-attlist">
-    <attribute name="svg:d">
-        <ref name="pathData"/>
-    </attribute>
-</define>
-<define name="draw-circle">
-    <element name="draw:circle">
-        <ref name="draw-circle-attlist"/>
-        <ref name="common-draw-circle-ellipse-attlist"/>
-        <ref name="common-draw-position-attlist"/>
-        <ref name="common-draw-size-attlist"/>
-        <ref name="common-draw-shape-with-text-and-styles-attlist"/>
-        <ref name="common-draw-caption-id-attlist"/>
-        <optional>
-            <ref name="svg-title"/>
-        </optional>
-        <optional>
-            <ref name="svg-desc"/>
-        </optional>
-        <optional>
-            <ref name="office-event-listeners"/>
-        </optional>
-        <zeroOrMore>
-            <ref name="draw-glue-point"/>
-        </zeroOrMore>
-        <ref name="draw-text"/>
-    </element>
-</define>
-<define name="common-draw-circle-ellipse-attlist" combine="interleave">
-    <optional>
-        <attribute name="svg:cx">
-            <ref name="coordinate"/>
-        </attribute>
-        <attribute name="svg:cy">
-            <ref name="coordinate"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-circle-attlist" combine="interleave">
-    <optional>
-        <attribute name="svg:r">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-draw-circle-ellipse-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:kind" a:defaultValue="full">
-            <choice>
-                <value>full</value>
-                <value>section</value>
-                <value>cut</value>
-                <value>arc</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="common-draw-circle-ellipse-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:start-angle">
-            <ref name="double"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-draw-circle-ellipse-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:end-angle">
-            <ref name="double"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-ellipse">
-    <element name="draw:ellipse">
-        <ref name="common-draw-circle-ellipse-attlist"/>
-        <ref name="draw-ellipse-attlist"/>
-        <ref name="common-draw-position-attlist"/>
-        <ref name="common-draw-size-attlist"/>
-        <ref name="common-draw-shape-with-text-and-styles-attlist"/>
-        <ref name="common-draw-caption-id-attlist"/>
-        <optional>
-            <ref name="svg-title"/>
-        </optional>
-        <optional>
-            <ref name="svg-desc"/>
-        </optional>
-        <optional>
-            <ref name="office-event-listeners"/>
-        </optional>
-        <zeroOrMore>
-            <ref name="draw-glue-point"/>
-        </zeroOrMore>
-        <ref name="draw-text"/>
-    </element>
-</define>
-<define name="draw-ellipse-attlist" combine="interleave">
-    <optional>
-        <attribute name="svg:rx">
-            <ref name="length"/>
-        </attribute>
-        <attribute name="svg:ry">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-connector">
-    <element name="draw:connector">
-        <ref name="draw-connector-attlist"/>
-        <ref name="common-draw-shape-with-text-and-styles-attlist"/>
-        <ref name="common-draw-caption-id-attlist"/>
-        <optional>
-            <ref name="svg-title"/>
-        </optional>
-        <optional>
-            <ref name="svg-desc"/>
-        </optional>
-        <optional>
-            <ref name="office-event-listeners"/>
-        </optional>
-        <zeroOrMore>
-            <ref name="draw-glue-point"/>
-        </zeroOrMore>
-        <ref name="draw-text"/>
-    </element>
-</define>
-<define name="draw-connector-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:type" a:defaultValue="standard">
-            <choice>
-                <value>standard</value>
-                <value>lines</value>
-                <value>line</value>
-                <value>curve</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-connector-attlist" combine="interleave">
-    <optional>
-        <attribute name="svg:x1">
-            <ref name="coordinate"/>
-        </attribute>
-        <attribute name="svg:y1">
-            <ref name="coordinate"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-connector-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:start-shape">
-            <ref name="IDREF"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-connector-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:start-glue-point">
-            <ref name="nonNegativeInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-connector-attlist" combine="interleave">
-    <optional>
-        <attribute name="svg:x2">
-            <ref name="coordinate"/>
-        </attribute>
-        <attribute name="svg:y2">
-            <ref name="coordinate"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-connector-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:end-shape">
-            <ref name="IDREF"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-connector-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:end-glue-point">
-            <ref name="nonNegativeInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-connector-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:line-skew">
-            <list>
-                <ref name="length"/>
-                <optional>
-                    <ref name="length"/>
-                    <optional>
-                        <ref name="length"/>
-                    </optional>
-                </optional>
-            </list>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-caption">
-    <element name="draw:caption">
-        <ref name="draw-caption-attlist"/>
-        <ref name="common-draw-position-attlist"/>
-        <ref name="common-draw-size-attlist"/>
-        <ref name="common-draw-shape-with-text-and-styles-attlist"/>
-        <ref name="common-draw-caption-id-attlist"/>
-        <optional>
-            <ref name="svg-title"/>
-        </optional>
-        <optional>
-            <ref name="svg-desc"/>
-        </optional>
-        <optional>
-            <ref name="office-event-listeners"/>
-        </optional>
-        <zeroOrMore>
-            <ref name="draw-glue-point"/>
-        </zeroOrMore>
-        <ref name="draw-text"/>
-    </element>
-</define>
-<define name="draw-caption-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:caption-point-x">
-            <ref name="coordinate"/>
-        </attribute>
-        <attribute name="draw:caption-point-y">
-            <ref name="coordinate"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-caption-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:corner-radius">
-            <ref name="nonNegativeLength"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-measure">
-    <element name="draw:measure">
-        <ref name="draw-measure-attlist"/>
-        <ref name="common-draw-shape-with-text-and-styles-attlist"/>
-        <ref name="common-draw-caption-id-attlist"/>
-        <optional>
-            <ref name="svg-title"/>
-        </optional>
-        <optional>
-            <ref name="svg-desc"/>
-        </optional>
-        <optional>
-            <ref name="office-event-listeners"/>
-        </optional>
-        <zeroOrMore>
-            <ref name="draw-glue-point"/>
-        </zeroOrMore>
-        <ref name="draw-text"/>
-    </element>
-</define>
-<define name="draw-measure-attlist" combine="interleave">
-    <attribute name="svg:x1">
-        <ref name="coordinate"/>
-    </attribute>
-    <attribute name="svg:y1">
-        <ref name="coordinate"/>
-    </attribute>
-</define>
-<define name="draw-measure-attlist" combine="interleave">
-    <attribute name="svg:x2">
-        <ref name="coordinate"/>
-    </attribute>
-    <attribute name="svg:y2">
-        <ref name="coordinate"/>
-    </attribute>
-</define>
-<define name="draw-control">
-    <element name="draw:control">
-        <ref name="draw-control-attlist"/>
-        <ref name="common-draw-position-attlist"/>
-        <ref name="common-draw-size-attlist"/>
-        <ref name="common-draw-shape-with-text-and-styles-attlist"/>    
-        <ref name="common-draw-caption-id-attlist"/>
-        <optional>
-            <ref name="svg-title"/>
-        </optional>
-        <optional>
-            <ref name="svg-desc"/>
-        </optional>
-        <zeroOrMore>
-            <ref name="draw-glue-point"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="draw-control-attlist" combine="interleave">
-    <attribute name="draw:control">
-        <ref name="IDREF"/>
-    </attribute>
-</define>
-<define name="draw-page-thumbnail">
-    <element name="draw:page-thumbnail">
-        <ref name="draw-page-thumbnail-attlist"/>
-        <ref name="common-draw-position-attlist"/>
-        <ref name="common-draw-size-attlist"/>
-        <ref name="presentation-shape-attlist"/>
-        <ref name="common-draw-shape-with-styles-attlist"/>
-        <ref name="common-draw-caption-id-attlist"/>
-        <optional>
-            <ref name="svg-title"/>
-        </optional>
-        <optional>
-            <ref name="svg-desc"/>
-        </optional>
-    </element>
-</define>
-<define name="draw-page-thumbnail-attlist">
-    <optional>
-        <attribute name="draw:page-number">
-            <ref name="positiveInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-g">
-    <element name="draw:g">
-        <ref name="draw-g-attlist"/>
-        <ref name="common-draw-z-index-attlist"/>
-        <ref name="common-draw-name-attlist"/>
-        <ref name="common-draw-id-attlist"/>
-        <ref name="common-draw-style-name-attlist"/>
-        <ref name="common-text-spreadsheet-shape-attlist"/>
-        <ref name="common-draw-caption-id-attlist"/>
-        <optional>
-            <ref name="svg-title"/>
-        </optional>
-        <optional>
-            <ref name="svg-desc"/>
-        </optional>
-        <optional>
-            <ref name="office-event-listeners"/>
-        </optional>
-        <zeroOrMore>
-            <ref name="draw-glue-point"/>
-        </zeroOrMore>
-        <zeroOrMore>
-            <ref name="shape"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="draw-g-attlist" combine="interleave">
-    <optional>
-        <attribute name="svg:y">
-            <ref name="coordinate"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-draw-name-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-draw-caption-id-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:caption-id">
-            <ref name="IDREF"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-draw-position-attlist">
-    <optional>
-        <attribute name="svg:x">
-            <ref name="coordinate"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:y">
-            <ref name="coordinate"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-draw-size-attlist">
-    <optional>
-        <attribute name="svg:width">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:height">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-draw-transform-attlist">
-    <optional>
-        <attribute name="draw:transform">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-draw-viewbox-attlist">
-    <attribute name="svg:viewBox">
-        <list>
-            <ref name="integer"/>
-            <ref name="integer"/>
-            <ref name="integer"/>
-            <ref name="integer"/>
-        </list>
-    </attribute>
-</define>
-<define name="common-draw-style-name-attlist">
-    <choice>
-        <group>
-            <optional>
-                <attribute name="draw:style-name">
-                    <ref name="styleNameRef"/>
-                </attribute>
-            </optional>
-            <optional>
-                <attribute name="draw:class-names">
-                    <ref name="styleNameRefs"/>
-                </attribute>
-            </optional>
-        </group>
-        <group>
-            <optional>
-                <attribute name="presentation:style-name">
-                    <ref name="styleNameRef"/>
-                </attribute>
-            </optional>
-            <optional>
-                <attribute name="presentation:class-names">
-                    <ref name="styleNameRefs"/>
-                </attribute>
-            </optional>
-        </group>
-    </choice>
-</define>
-<define name="common-draw-text-style-name-attlist">
-    <optional>
-        <attribute name="draw:text-style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-draw-layer-name-attlist">
-    <optional>
-        <attribute name="draw:layer">
-            <data type="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-draw-id-attlist">
-    <optional>
-        <attribute name="draw:id">
-            <ref name="ID"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-draw-z-index-attlist">
-    <optional>
-        <attribute name="draw:z-index">
-            <ref name="nonNegativeInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-text-spreadsheet-shape-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:end-cell-address">
-            <ref name="cellAddress"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="table:end-x">
-            <ref name="coordinate"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="table:end-y">
-            <ref name="coordinate"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-text-spreadsheet-shape-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:table-background">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-text-spreadsheet-shape-attlist" combine="interleave">
-    <ref name="common-text-anchor-attlist"/>
-</define>
-
-<define name="common-text-anchor-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:anchor-type">
-            <choice>
-                <value>page</value>
-                <value>frame</value>
-                <value>paragraph</value>
-                <value>char</value>
-                <value>as-char</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="common-text-anchor-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:anchor-page-number">
-            <ref name="positiveInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-text">
-    <zeroOrMore>
-        <choice>
-            <ref name="text-p"/>
-            <ref name="text-list"/>
-        </choice>
-    </zeroOrMore>
-</define>
-<define name="common-draw-shape-with-styles-attlist">
-    <ref name="common-draw-z-index-attlist"/>
-    <ref name="common-draw-id-attlist"/>
-    <ref name="common-draw-layer-name-attlist"/>
-    <ref name="common-draw-style-name-attlist"/>
-    <ref name="common-draw-transform-attlist"/>
-    <ref name="common-draw-name-attlist"/>
-    <ref name="common-text-spreadsheet-shape-attlist"/>
-</define>
-<define name="common-draw-shape-with-text-and-styles-attlist">
-    <ref name="common-draw-shape-with-styles-attlist"/>
-    <ref name="common-draw-text-style-name-attlist"/>
-</define>
-<define name="draw-glue-point">
-    <element name="draw:glue-point">
-        <ref name="draw-glue-point-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="draw-glue-point-attlist" combine="interleave">
-    <attribute name="draw:id">
-        <ref name="nonNegativeInteger"/>
-    </attribute>
-</define>
-<define name="draw-glue-point-attlist" combine="interleave">
-    <attribute name="svg:x">
-        <choice>
-            <ref name="distance"/> 
-            <ref name="percent"/>
-        </choice>
-    </attribute>
-    <attribute name="svg:y">
-        <choice>
-            <ref name="distance"/> 
-            <ref name="percent"/>
-        </choice>
-    </attribute>
-</define>
-<define name="draw-glue-point-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:align">
-            <choice>
-                <value>top-left</value>
-                <value>top</value>
-                <value>top-right</value>
-                <value>left</value>
-                <value>center</value>
-                <value>right</value>
-                <value>bottom-left</value>
-                <value>bottom-right</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-glue-points-attlist" combine="interleave">
-    <attribute name="draw:escape-direction">
-        <choice>
-            <value>auto</value>
-            <value>left</value>
-            <value>right</value>
-            <value>up</value>
-            <value>down</value>
-            <value>horizontal</value>
-            <value>vertical</value>
-        </choice>
-    </attribute>
-</define>
-<define name="svg-title">
-    <element name="svg:title">
-        <text/>
-    </element>
-</define>
-<define name="svg-desc">
-    <element name="svg:desc">
-        <text/>
-    </element>
-</define>
-<define name="draw-frame">
-    <element name="draw:frame">
-        <ref name="common-draw-shape-with-text-and-styles-attlist"/>
-        <ref name="common-draw-position-attlist"/>
-        <ref name="common-draw-rel-size-attlist"/>
-        <ref name="common-draw-caption-id-attlist"/>
-        <ref name="presentation-shape-attlist"/>
-        <ref name="draw-frame-attlist"/>
-        <zeroOrMore>
-            <choice>
-                <ref name="draw-text-box"/>
-                <ref name="draw-image"/>
-                <ref name="draw-object"/>
-                <ref name="draw-object-ole"/>
-                <ref name="draw-applet"/>
-                <ref name="draw-floating-frame"/>
-                <ref name="draw-plugin"/>
-            </choice>
-        </zeroOrMore>
-        <optional>
-            <ref name="office-event-listeners"/>
-        </optional>
-        <zeroOrMore>
-            <ref name="draw-glue-point"/>
-        </zeroOrMore>
-        <optional>
-            <ref name="draw-image-map"/>
-        </optional>
-        <optional>
-            <ref name="svg-title"/>
-        </optional>
-        <optional>
-            <ref name="svg-desc"/>
-        </optional>
-        <optional>
-            <choice>
-                <ref name="draw-contour-polygon"/>
-                <ref name="draw-contour-path"/>
-            </choice>
-        </optional>
-    </element>
-</define>
-<define name="common-draw-rel-size-attlist">
-    <ref name="common-draw-size-attlist"/>
-    <optional>
-        <attribute name="style:rel-width">
-            <choice>
-                <ref name="percent"/>
-                <value>scale</value>
-                <value>scale-min</value>
-            </choice>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:rel-height">
-            <choice>
-                <ref name="percent"/>
-                <value>scale</value>
-                <value>scale-min</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-frame-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:copy-of">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-text-box">
-    <element name="draw:text-box">
-        <ref name="draw-text-box-attlist"/>
-        <zeroOrMore>
-            <ref name="text-content"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="draw-text-box-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:chain-next-name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-text-box-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:corner-radius">
-            <ref name="nonNegativeLength"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-text-box-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:min-height">
-            <choice>
-                <ref name="length"/>
-                <ref name="percent"/>
-            </choice>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="fo:min-width">
-            <choice>
-                <ref name="length"/>
-                <ref name="percent"/>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-text-box-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:max-height">
-            <choice>
-                <ref name="length"/>
-                <ref name="percent"/>
-            </choice>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="fo:max-width">
-            <choice>
-                <ref name="length"/>
-                <ref name="percent"/>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-text-box-attlist" combine="interleave">
-    <optional>
-        <ref name="text-id"/>
-    </optional>
-</define>
-<define name="draw-image">
-    <element name="draw:image">
-        <ref name="draw-image-attlist"/>
-        <choice>
-            <ref name="common-draw-data-attlist"/>
-            <ref name="office-binary-data"/>
-        </choice>
-        <ref name="draw-text"/>
-    </element>
-</define>
-<define name="common-draw-data-attlist" combine="interleave">
-    <group>
-        <attribute name="xlink:href">
-            <ref name="anyURI"/>
-        </attribute>
-        <optional>
-            <attribute name="xlink:type" a:defaultValue="simple">
-                <choice>
-                    <value>simple</value>
-                </choice>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="xlink:show" a:defaultValue="embed">
-                <choice>
-                    <value>embed</value>
-                </choice>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="xlink:actuate" a:defaultValue="onLoad">
-                <choice>
-                    <value>onLoad</value>
-                </choice>
-            </attribute>
-        </optional>
-    </group>
-</define>
-
-<define name="office-binary-data">
-    <element name="office:binary-data">
-        <ref name="base64Binary"/>
-    </element>
-</define>
-<define name="draw-image-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:filter-name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-object">
-    <element name="draw:object">
-        <ref name="draw-object-attlist"/>
-        <choice>
-            <ref name="common-draw-data-attlist"/>
-            <ref name="office-document"/>
-            <ref name="math-math"/>
-        </choice>
-    </element>
-</define>
-
-<define name="draw-object-ole">
-    <element name="draw:object-ole">
-        <ref name="draw-object-ole-attlist"/>
-        <choice>
-            <ref name="common-draw-data-attlist"/>
-            <ref name="office-binary-data"/>
-        </choice>
-    </element>
-</define>
-<define name="draw-object-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:notify-on-update-of-ranges">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-object-ole-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:class-id"/>
-    </optional>
-</define>
-<define name="draw-applet">
-    <element name="draw:applet">
-        <ref name="draw-applet-attlist"/>
-        <optional>
-            <ref name="common-draw-data-attlist"/>
-        </optional>
-        <zeroOrMore>
-            <ref name="draw-param"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="draw-applet-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:code"/>
-    </optional>
-</define>
-<define name="draw-applet-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:object"/>
-    </optional>
-</define>
-<define name="draw-applet-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:archive"/>
-    </optional>
-</define>
-<define name="draw-applet-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:may-script" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-plugin">
-    <element name="draw:plugin">
-        <ref name="draw-plugin-attlist"/>
-        <ref name="common-draw-data-attlist"/>
-        <zeroOrMore>
-            <ref name="draw-param"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="draw-plugin-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:mime-type"/>
-    </optional>
-</define>
-<define name="draw-param">
-    <element name="draw:param">
-        <ref name="draw-param-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="draw-param-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:name"/>
-    </optional>
-</define>
-<define name="draw-param-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:value"/>
-    </optional>
-</define>
-<define name="draw-floating-frame">
-    <element name="draw:floating-frame">
-        <ref name="draw-floating-frame-attlist"/>
-        <ref name="common-draw-data-attlist"/>
-    </element>
-</define>
-<define name="draw-floating-frame-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:frame-name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-contour-polygon">
-    <element name="draw:contour-polygon">
-        <ref name="common-contour-attlist"/>
-        <ref name="common-draw-size-attlist"/>
-        <ref name="common-draw-viewbox-attlist"/>
-        <ref name="common-draw-points-attlist"/>
-        <empty/>
-    </element>
-</define>
-
-<define name="draw-contour-path">
-    <element name="draw:contour-path">
-        <ref name="common-contour-attlist"/>
-        <ref name="common-draw-size-attlist"/>
-        <ref name="common-draw-viewbox-attlist"/>
-        <ref name="common-draw-path-data-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="common-contour-attlist" combine="interleave">
-    <attribute name="draw:recreate-on-edit">
-        <ref name="boolean"/>
-    </attribute>
-</define>
-<define name="draw-a">
-    <element name="draw:a">
-        <ref name="draw-a-attlist"/>
-        <ref name="draw-frame"/>
-    </element>
-</define>
-<define name="draw-a-attlist" combine="interleave">
-    <attribute name="xlink:href">
-        <ref name="anyURI"/>
-    </attribute>
-    <optional>
-        <attribute name="xlink:type" a:defaultValue="simple">
-            <value>simple</value>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="xlink:actuate" a:defaultValue="onRequest">
-            <choice>
-                <value>onRequest</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-a-attlist" combine="interleave">
-    <optional>
-        <attribute name="office:target-frame-name">
-            <ref name="targetFrameName"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="xlink:show">
-            <choice>
-                <value>new</value>
-                <value>replace</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-a-attlist" combine="interleave">
-    <optional>
-        <attribute name="office:name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-a-attlist" combine="interleave">
-    <optional>
-        <attribute name="office:title">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-a-attlist" combine="interleave">
-    <optional>
-        <attribute name="office:server-map" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-image-map">
-    <element name="draw:image-map">
-        <zeroOrMore>
-            <choice>
-                <ref name="draw-area-rectangle"/>
-                <ref name="draw-area-circle"/>
-                <ref name="draw-area-polygon"/>
-            </choice>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="draw-area-rectangle">
-    <element name="draw:area-rectangle">
-        <ref name="common-draw-area-attlist"/>
-        <attribute name="svg:x">
-            <ref name="coordinate"/>
-        </attribute>
-        <attribute name="svg:y">
-            <ref name="coordinate"/>
-        </attribute>
-        <attribute name="svg:width">
-            <ref name="length"/>
-        </attribute>
-        <attribute name="svg:height">
-            <ref name="length"/>
-        </attribute>
-        <optional>
-            <ref name="svg-title"/>
-        </optional>
-        <optional>
-            <ref name="svg-desc"/>
-        </optional>
-        <optional>
-            <ref name="office-event-listeners"/>
-        </optional>
-    </element>
-</define>
-<define name="draw-area-circle">
-    <element name="draw:area-circle">
-        <ref name="common-draw-area-attlist"/>
-        <attribute name="svg:cx">
-            <ref name="coordinate"/>
-        </attribute>
-        <attribute name="svg:cy">
-            <ref name="coordinate"/>
-        </attribute>
-        <attribute name="svg:r">
-            <ref name="length"/>
-        </attribute>
-        <optional>
-            <ref name="svg-title"/>
-        </optional>
-        <optional>
-            <ref name="svg-desc"/>
-        </optional>
-        <optional>
-            <ref name="office-event-listeners"/>
-        </optional>
-    </element>
-</define>
-<define name="draw-area-polygon">
-    <element name="draw:area-polygon">
-        <ref name="common-draw-area-attlist"/>
-        <attribute name="svg:x">
-            <ref name="coordinate"/>
-        </attribute>
-        <attribute name="svg:y">
-            <ref name="coordinate"/>
-        </attribute>
-        <attribute name="svg:width">
-            <ref name="length"/>
-        </attribute>
-        <attribute name="svg:height">
-            <ref name="length"/>
-        </attribute>
-        <ref name="common-draw-viewbox-attlist"/>
-        <ref name="common-draw-points-attlist"/>
-        <optional>
-            <ref name="svg-title"/>
-        </optional>
-        <optional>
-            <ref name="svg-desc"/>
-        </optional>
-        <optional>
-            <ref name="office-event-listeners"/>
-        </optional>
-    </element>
-</define>
-<define name="common-draw-area-attlist" combine="interleave">
-    <optional>
-        <attribute name="xlink:href">
-            <ref name="anyURI"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="xlink:type" a:defaultValue="simple">
-            <choice>
-                <value>simple</value>
-            </choice>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="office:target-frame-name">
-            <ref name="targetFrameName"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="xlink:show">
-            <choice>
-                <value>new</value>
-                <value>replace</value>
-            </choice>
-            </attribute>
-    </optional>
-</define>
-<define name="common-draw-area-attlist" combine="interleave">
-    <optional>
-        <attribute name="office:name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-draw-area-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:nohref">
-            <choice>
-                <value>nohref</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="dr3d-scene">
-    <element name="dr3d:scene">
-        <ref name="dr3d-scene-attlist"/>
-        <ref name="common-draw-position-attlist"/>
-        <ref name="common-draw-size-attlist"/>
-        <ref name="common-draw-style-name-attlist"/>
-        <ref name="common-draw-z-index-attlist"/>
-        <ref name="common-draw-id-attlist"/>
-        <ref name="common-draw-layer-name-attlist"/>
-        <ref name="common-text-spreadsheet-shape-attlist"/>
-        <ref name="common-dr3d-transform-attlist"/>
-        <ref name="common-draw-caption-id-attlist"/>
-        <optional>
-            <ref name="svg-title"/>
-        </optional>
-        <optional>
-            <ref name="svg-desc"/>
-        </optional>
-        <zeroOrMore>
-            <ref name="dr3d-light"/>
-        </zeroOrMore>
-        <zeroOrMore>
-            <ref name="shapes3d"/>
-        </zeroOrMore>
-    </element>
-</define>
-
-<define name="shapes3d">
-    <choice>
-        <ref name="dr3d-scene"/>
-        <ref name="dr3d-extrude"/>
-        <ref name="dr3d-sphere"/>
-        <ref name="dr3d-rotate"/>
-        <ref name="dr3d-cube"/>
-    </choice>
-</define>
-<define name="dr3d-scene-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:vrp">
-            <ref name="vector3D"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="dr3d:vpn">
-            <ref name="vector3D"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="dr3d:vup">
-            <ref name="vector3D"/>
-        </attribute>
-    </optional>
-</define>
-<define name="dr3d-scene-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:projection">
-            <choice>
-                <value>parallel</value>
-                <value>perspective</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="dr3d-scene-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:distance">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="dr3d-scene-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:focal-length">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="dr3d-scene-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:shadow-slant">
-            <ref name="nonNegativeInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="dr3d-scene-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:shade-mode">
-            <choice>
-                <value>flat</value>
-                <value>phong</value>
-                <value>gouraud</value>
-                <value>draft</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="dr3d-scene-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:ambient-color">
-            <ref name="color"/>
-        </attribute>
-    </optional>
-</define>
-<define name="dr3d-scene-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:lighting-mode">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-dr3d-transform-attlist">
-    <optional>
-        <attribute name="dr3d:transform"/>
-    </optional>
-</define>
-<define name="dr3d-light">
-    <element name="dr3d:light">
-        <ref name="dr3d-light-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="dr3d-light-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:diffuse-color">
-            <ref name="color"/>
-        </attribute>
-    </optional>
-</define>
-<define name="dr3d-light-attlist" combine="interleave">
-    <attribute name="dr3d:direction">
-        <ref name="vector3D"/>
-    </attribute>
-</define>
-<define name="dr3d-light-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:enabled">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="dr3d-light-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:specular">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="dr3d-cube">
-    <element name="dr3d:cube">
-        <ref name="dr3d-cube-attlist"/>
-        <ref name="common-draw-z-index-attlist"/>
-        <ref name="common-draw-id-attlist"/>
-        <ref name="common-draw-layer-name-attlist"/>
-        <ref name="common-draw-style-name-attlist"/>
-        <ref name="common-dr3d-transform-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="dr3d-cube-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:min-edge">
-            <ref name="vector3D"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="dr3d:max-edge">
-            <ref name="vector3D"/>
-        </attribute>
-    </optional>
-</define>
-<define name="dr3d-sphere">
-    <element name="dr3d:sphere">
-        <ref name="dr3d-sphere-attlist"/>
-        <ref name="common-draw-z-index-attlist"/>
-        <ref name="common-draw-id-attlist"/>
-        <ref name="common-draw-layer-name-attlist"/>
-        <ref name="common-draw-style-name-attlist"/>
-        <ref name="common-dr3d-transform-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="dr3d-sphere-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:center">
-            <ref name="vector3D"/>
-        </attribute>
-    </optional>
-</define>
-<define name="dr3d-sphere-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:size">
-            <ref name="vector3D"/>
-        </attribute>
-    </optional>
-</define>
-<define name="dr3d-extrude">
-    <element name="dr3d:extrude">
-        <ref name="common-draw-path-data-attlist"/>
-        <ref name="common-draw-viewbox-attlist"/>
-        <ref name="common-draw-id-attlist"/>
-        <ref name="common-draw-z-index-attlist"/>
-        <ref name="common-draw-layer-name-attlist"/>
-        <ref name="common-draw-style-name-attlist"/>
-        <ref name="common-dr3d-transform-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="dr3d-rotate">
-    <element name="dr3d:rotate">
-        <ref name="common-draw-viewbox-attlist"/>
-        <ref name="common-draw-path-data-attlist"/>
-        <ref name="common-draw-z-index-attlist"/>
-        <ref name="common-draw-id-attlist"/>
-        <ref name="common-draw-layer-name-attlist"/>
-        <ref name="common-draw-style-name-attlist"/>
-        <ref name="common-dr3d-transform-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="draw-custom-shape">
-    <element name="draw:custom-shape">
-        <ref name="draw-custom-shape-attlist"/>
-        <ref name="common-draw-position-attlist"/>
-        <ref name="common-draw-size-attlist"/>
-        <ref name="common-draw-shape-with-text-and-styles-attlist"/>
-        <ref name="common-draw-caption-id-attlist"/>
-        <optional>
-            <ref name="svg-title"/>
-        </optional>
-        <optional>
-            <ref name="svg-desc"/>
-        </optional>
-        <optional>
-            <ref name="office-event-listeners"/>
-        </optional>
-        <zeroOrMore>
-            <ref name="draw-glue-point"/>
-        </zeroOrMore>
-        <ref name="draw-text"/>
-        <optional>
-            <ref name="draw-enhanced-geometry"/>
-        </optional>
-    </element>
-</define>
-<define name="draw-custom-shape-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:engine">
-            <ref name="namespacedToken"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-custom-shape-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:data">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry">
-    <element name="draw:enhanced-geometry">
-        <ref name="draw-enhanced-geometry-attlist"/>
-        <zeroOrMore>
-            <ref name="draw-equation"/>
-        </zeroOrMore>
-        <zeroOrMore>
-            <ref name="draw-handle"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:type" a:defaultValue="non-primitive">
-            <ref name="custom-shape-type"/>
-        </attribute>
-    </optional>
-</define>
-
-<define name="custom-shape-type">
-    <choice>
-        <value>non-primitive</value>
-        <ref name="string"/>
-    </choice>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="svg:viewBox">
-            <list>
-                <ref name="integer"/>
-                <ref name="integer"/>
-                <ref name="integer"/>
-                <ref name="integer"/>
-            </list>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:mirror-vertical" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="draw:mirror-horizontal" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:text-rotate-angle" a:defaultValue="0">
-            <ref name="double"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:extrusion-allowed" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:text-path-allowed" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:concentric-gradient-fill-allowed"
-                    a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:extrusion" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:extrusion-brightness" a:defaultValue="33%">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:extrusion-depth" a:defaultValue="36pt 0">
-            <list>
-                <ref name="length"/>
-                <ref name="double"/>
-            </list>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:extrusion-diffusion" a:defaultValue="0%">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:extrusion-number-of-line-segments"
-                   a:defaultValue="30">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:extrusion-light-face" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:extrusion-first-light-harsh"
-                   a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:extrusion-second-light-harsh"
-                   a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:extrusion-first-light-level"
-                   a:defaultValue="66%">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:extrusion-second-light-level"
-                   a:defaultValue="66%">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:extrusion-first-light-direction"
-                   a:defaultValue="(5 0 1)">
-            <ref name="vector3D"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:extrusion-second-light-direction"
-                   a:defaultValue="(-5 0 1)">
-            <ref name="vector3D"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:extrusion-metal" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:shade-mode" a:defaultValue="flat">
-            <choice>
-                <value>flat</value>
-                <value>phong</value>
-                <value>gouraud</value>
-                <value>draft</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:extrusion-rotation-angle" a:defaultValue="0 0">
-            <list>
-                <ref name="double"/>
-                <ref name="double"/>
-            </list>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:extrusion-rotation-center">
-            <ref name="vector3D"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:extrusion-shininess" a:defaultValue="50%">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:extrusion-skew" a:defaultValue="50 45">
-            <list>
-                <ref name="double"/>
-                <ref name="double"/>
-            </list>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:extrusion-specularity" a:defaultValue="0%">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:projection" a:defaultValue="parallel">
-            <choice>
-                <value>parallel</value>
-                <value>perspective</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:extrusion-viewpoint" 
-                   a:defaultValue="3.5cm -3.5cm 25cm">
-            <ref name="point3D"/>
-        </attribute>
-    </optional>
-</define>
-
-<define name="point3D">
-    <data type="string"/>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:extrusion-origin" a:defaultValue="0.5 -0.5">
-            <list>
-                <ref name="double"/>
-                <ref name="double"/>
-            </list>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:extrusion-color" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:enhanced-path">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:path-stretchpoint-x" a:defaultValue="0">
-            <ref name="double"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="draw:path-stretchpoint-y" a:defaultValue="0">
-            <ref name="double"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:text-areas">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:glue-points">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:glue-point-type" a:defaultValue="none">
-            <choice>
-                <value>none</value>
-                <value>segments</value>
-                <value>rectangle</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:glue-point-leaving-directions"/>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:text-path" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:text-path-mode" a:defaultValue="normal">
-            <choice>
-                <value>normal</value>
-                <value>path</value>
-                <value>shape</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:text-path-scale" a:defaultValue="path">
-            <choice>
-                <value>path</value>
-                <value>shape</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:text-path-same-letter-heights"
-                   a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-enhanced-geometry-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:modifiers">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-equation">
-    <element name="draw:equation">
-        <ref name="draw-equation-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="draw-equation-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-equation-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:formula">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-handle">
-    <element name="draw:handle">
-        <ref name="draw-handle-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="draw-handle-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:handle-mirror-vertical" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-handle-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:handle-mirror-horizontal" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-handle-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:handle-switched" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-handle-attlist" combine="interleave">
-    <attribute name="draw:handle-position">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="draw-handle-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:handle-range-x-minimum">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-handle-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:handle-range-x-maximum">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-handle-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:handle-range-y-minimum">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-handle-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:handle-range-y-maximum">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-handle-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:handle-polar">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-handle-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:handle-radius-range-minimum">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-handle-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:handle-radius-range-maximum">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="presentation-shape-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:class">
-            <ref name="presentation-classes"/>
-        </attribute>
-    </optional>
-</define>
-<define name="presentation-classes">
-    <choice>
-        <value>title</value>
-        <value>outline</value>
-        <value>subtitle</value>
-        <value>text</value>
-        <value>graphic</value>
-        <value>object</value>
-        <value>chart</value>
-        <value>table</value>
-        <value>orgchart</value>
-        <value>page</value>
-        <value>notes</value>
-        <value>handout</value>
-        <value>header</value>
-        <value>footer</value>
-        <value>date-time</value>
-        <value>page-number</value>
-    </choice>
-</define>
-<define name="presentation-shape-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:placeholder">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="presentation-shape-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:user-transformed">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="presentation-animations">
-    <element name="presentation:animations">
-        <zeroOrMore>
-            <choice>
-                <ref name="presentation-animation-elements"/>
-                <ref name="presentation-animation-group"/>
-            </choice>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="presentation-animation-elements">
-    <choice>
-        <ref name="presentation-show-shape"/>
-        <ref name="presentation-show-text"/>
-        <ref name="presentation-hide-shape"/>
-        <ref name="presentation-hide-text"/>
-        <ref name="presentation-dim"/>
-        <ref name="presentation-play"/>
-    </choice>
-</define>
-<define name="presentation-sound">
-    <element name="presentation:sound">
-        <ref name="presentation-sound-attlist"/>
-        <attribute name="xlink:href">
-            <ref name="anyURI"/>
-        </attribute>
-        <optional>
-            <attribute name="xlink:type" a:defaultValue="simple">
-                <choice>
-                    <value>simple</value>
-                </choice>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="xlink:actuate" a:defaultValue="onRequest">
-                <choice>
-                    <value>onRequest</value>
-                </choice>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="xlink:show">
-                <choice>
-                    <value>new</value>
-                    <value>replace</value>
-                </choice>
-            </attribute>
-        </optional>
-        <empty/>
-    </element>
-</define>
-<define name="presentation-sound-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:play-full">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="presentation-show-shape">
-    <element name="presentation:show-shape">
-        <ref name="common-presentation-effect-attlist"/>
-        <optional>
-            <ref name="presentation-sound"/>
-        </optional>
-    </element>
-</define>
-<define name="common-presentation-effect-attlist" combine="interleave">
-    <attribute name="draw:shape-id">
-        <ref name="IDREF"/>
-    </attribute>
-</define>
-<define name="common-presentation-effect-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:effect" a:defaultValue="none">
-            <ref name="presentationEffects"/>
-        </attribute>
-    </optional>
-</define>
-<define name="presentationEffects">
-    <choice>
-        <value>none</value>
-        <value>fade</value>
-        <value>move</value>
-        <value>stripes</value>
-        <value>open</value>
-        <value>close</value>
-        <value>dissolve</value>
-        <value>wavyline</value>
-        <value>random</value>
-        <value>lines</value>
-        <value>laser</value>
-        <value>appear</value>
-        <value>hide</value>
-        <value>move-short</value>
-        <value>checkerboard</value>
-        <value>rotate</value>
-        <value>stretch</value>
-    </choice>
-</define>
-<define name="common-presentation-effect-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:direction" a:defaultValue="none">
-            <ref name="presentationEffectDirections"/>
-        </attribute>
-    </optional>
-</define>
-<define name="presentationEffectDirections">
-    <choice>
-        <value>none</value>
-        <value>from-left</value>
-        <value>from-top</value>
-        <value>from-right</value>
-        <value>from-bottom</value>
-        <value>from-center</value>
-        <value>from-upper-left</value>
-        <value>from-upper-right</value>
-        <value>from-lower-left</value>
-        <value>from-lower-right</value>
-        <value>to-left</value>
-        <value>to-top</value>
-        <value>to-right</value>
-        <value>to-bottom</value>
-        <value>to-upper-left</value>
-        <value>to-upper-right</value>
-        <value>to-lower-right</value>
-        <value>to-lower-left</value>
-        <value>path</value>
-        <value>spiral-inward-left</value>
-        <value>spiral-inward-right</value>
-        <value>spiral-outward-left</value>
-        <value>spiral-outward-right</value>
-        <value>vertical</value>
-        <value>horizontal</value>
-        <value>to-center</value>
-        <value>clockwise</value>
-        <value>counter-clockwise</value>
-    </choice>
-</define>
-<define name="common-presentation-effect-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:speed" a:defaultValue="medium">
-            <ref name="presentationSpeeds"/>
-        </attribute>
-    </optional>
-</define>
-<define name="presentationSpeeds">
-    <choice>
-        <value>slow</value>
-        <value>medium</value>
-        <value>fast</value>
-    </choice>
-</define>
-<define name="common-presentation-effect-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:delay">
-            <ref name="duration"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-presentation-effect-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:start-scale" a:defaultValue="100%">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-presentation-effect-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:path-id"/>
-    </optional>
-</define>
-<define name="presentation-show-text">
-    <element name="presentation:show-text">
-        <ref name="common-presentation-effect-attlist"/>
-        <optional>
-            <ref name="presentation-sound"/>
-        </optional>
-    </element>
-</define>
-<define name="presentation-hide-shape">
-    <element name="presentation:hide-shape">
-        <ref name="common-presentation-effect-attlist"/>
-        <optional>
-            <ref name="presentation-sound"/>
-        </optional>
-    </element>
-</define>
-<define name="presentation-hide-text">
-    <element name="presentation:hide-text">
-        <ref name="common-presentation-effect-attlist"/>
-        <optional>
-            <ref name="presentation-sound"/>
-        </optional>
-    </element>
-</define>
-<define name="presentation-dim">
-    <element name="presentation:dim">
-        <ref name="presentation-dim-attlist"/>
-        <optional>
-            <ref name="presentation-sound"/>
-        </optional>
-    </element>
-</define>
-<define name="presentation-dim-attlist" combine="interleave">
-    <attribute name="draw:shape-id">
-        <ref name="IDREF"/>
-    </attribute>
-</define>
-<define name="presentation-dim-attlist" combine="interleave">
-    <attribute name="draw:color">
-        <ref name="color"/>
-    </attribute>
-</define>
-<define name="presentation-play">
-    <element name="presentation:play">
-        <ref name="presentation-play-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="presentation-play-attlist" combine="interleave">
-    <attribute name="draw:shape-id">
-        <ref name="IDREF"/>
-    </attribute>
-    <optional>
-        <attribute name="presentation:speed" a:defaultValue="medium">
-            <ref name="presentationSpeeds"/>
-        </attribute>
-    </optional>
-</define>
-<define name="presentation-animation-group">
-    <element name="presentation:animation-group">
-        <zeroOrMore>
-            <ref name="presentation-animation-elements"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="common-anim-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:node-type" a:defaultValue="default">
-            <choice>
-                <value>default</value>
-                <value>on-click</value>
-                <value>with-previous</value>
-                <value>after-previous</value>
-                <value>timing-root</value>
-                <value>main-sequence</value>
-                <value>interactive-sequence</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="common-anim-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:preset-id">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-anim-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:preset-sub-type">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-anim-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:preset-class" a:defaultValue="custom">
-            <choice>
-                <value>custom</value>
-                <value>entrance</value>
-                <value>exit</value>
-                <value>emphasis</value>
-                <value>motion-path</value>
-                <value>ole-action</value>
-                <value>media-call</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="common-anim-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:master-element">
-            <ref name="IDREF"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-anim-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:group-id">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="presentation-event-listener">
-    <element name="presentation:event-listener">
-        <ref name="presentation-event-listener-attlist"/>
-        <optional>
-            <ref name="presentation-sound"/>
-        </optional>
-    </element>
-</define>
-<define name="presentation-event-listener-attlist" combine="interleave">
-    <attribute name="script:event-name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="presentation-event-listener-attlist" combine="interleave">
-    <attribute name="presentation:action">
-        <choice>
-            <value>none</value>
-            <value>previous-page</value>
-            <value>next-page</value>
-            <value>first-page</value>
-            <value>last-page</value>
-            <value>hide</value>
-            <value>stop</value>
-            <value>execute</value>
-            <value>show</value>
-            <value>verb</value>
-            <value>fade-out</value>
-            <value>sound</value>
-        </choice>
-    </attribute>
-</define>
-<define name="presentation-event-listener-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:effect" a:defaultValue="none">
-            <ref name="presentationEffects"/>
-        </attribute>
-    </optional>
-</define>
-<define name="presentation-event-listener-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:direction" a:defaultValue="none">
-            <ref name="presentationEffectDirections"/>
-        </attribute>
-    </optional>
-</define>
-<define name="presentation-event-listener-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:speed" a:defaultValue="medium">
-            <ref name="presentationSpeeds"/>
-        </attribute>
-    </optional>
-</define>
-<define name="presentation-event-listener-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:start-scale" a:defaultValue="100%">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-</define>
-<define name="presentation-event-listener-attlist" combine="interleave">
-    <optional>
-        <attribute name="xlink:href">
-            <ref name="anyURI"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="xlink:type" a:defaultValue="simple">
-            <choice>
-                <value>simple</value>
-            </choice>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="xlink:show" a:defaultValue="embed">
-            <choice>
-                <value>embed</value>
-            </choice>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="xlink:actuate" a:defaultValue="onRequest">
-            <choice>
-                <value>onRequest</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="presentation-event-listener-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:verb">
-            <ref name="nonNegativeInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="presentation:header">
-        <empty/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="presentation:footer">
-        <empty/>
-    </element>
-</define>
-<define name="paragraph-content" combine="choice">
-    <element name="presentation:date-time">
-        <empty/>
-    </element>
-</define>
-<define name="presentation-decls">
-    <zeroOrMore>
-        <ref name="presentation-decl"/>
-    </zeroOrMore>
-</define>
-<define name="presentation-decl" combine="choice">
-    <element name="presentation:header-decl">
-        <ref name="presentation-header-decl-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="presentation-header-decl-attlist" combine="interleave">
-    <attribute name="presentation:name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="presentation-decl" combine="choice">
-    <element name="presentation:footer-decl">
-        <ref name="presentation-footer-decl-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="presentation-footer-decl-attlist" combine="interleave">
-    <attribute name="presentation:name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="presentation-decl" combine="choice">
-    <element name="presentation:date-time-decl">
-        <ref name="presentation-date-time-decl-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="presentation-date-time-decl-attlist" combine="interleave">
-    <attribute name="presentation:name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="presentation-date-time-decl-attlist" combine="interleave">
-    <attribute name="presentation:source">
-        <choice>
-            <value>fixed</value>
-            <value>current-date</value>
-        </choice>
-    </attribute>
-</define>
-<define name="presentation-date-time-decl-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:data-style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="presentation-settings">
-    <optional>
-        <element name="presentation:settings">
-            <ref name="presentation-settings-attlist"/>
-            <zeroOrMore>
-                <ref name="presentation-show"/>
-            </zeroOrMore>
-        </element>
-    </optional>
-</define>
-<define name="presentation-settings-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:start-page">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="presentation-settings-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:show">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="presentation-settings-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:full-screen" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="presentation-settings-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:endless" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="presentation-settings-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:pause">
-            <ref name="duration"/>
-        </attribute>
-    </optional>
-</define>
-<define name="presentation-settings-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:show-logo" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="presentation-settings-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:force-manual" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="presentation-settings-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:mouse-visible" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="presentation-settings-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:mouse-as-pen" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="presentation-settings-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:start-with-navigator"
-                   a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="presentation-settings-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:animations" a:defaultValue="enabled">
-            <choice>
-                <value>enabled</value>
-                <value>disabled</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="presentation-settings-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:transition-on-click"
-                   a:defaultValue="enabled">
-            <choice>
-                <value>enabled</value>
-                <value>disabled</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="presentation-settings-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:stay-on-top" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="presentation-settings-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:show-end-of-presentation-slide"
-                   a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="presentation-show">
-    <element name="presentation:show">
-        <ref name="presentation-show-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="presentation-show-attlist" combine="interleave">
-    <attribute name="presentation:name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="presentation-show-attlist" combine="interleave">
-    <attribute name="presentation:pages"/>
-</define>
-<define name="chart-chart">
-    <element name="chart:chart">
-        <ref name="chart-chart-attlist"/>
-        <optional>
-            <ref name="chart-title"/>
-        </optional>
-        <optional>
-            <ref name="chart-subtitle"/>
-        </optional>
-        <optional>
-            <ref name="chart-footer"/>
-        </optional>
-        <optional>
-            <ref name="chart-legend"/>
-        </optional>
-        <ref name="chart-plot-area"/>
-        <optional>
-            <ref name="table-table"/>
-        </optional>
-    </element>
-</define>
-<define name="chart-chart-attlist" combine="interleave">
-    <attribute name="chart:class">
-        <ref name="namespacedToken"/>
-    </attribute>
-</define>
-<define name="chart-chart-attlist" combine="interleave">
-    <ref name="common-draw-size-attlist"/>
-</define>
-<define name="chart-chart-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:column-mapping">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="chart-chart-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:row-mapping">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="chart-chart-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="chart-title">
-    <element name="chart:title">
-        <ref name="chart-title-attlist"/>
-        <optional>
-            <ref name="text-p"/>
-        </optional>
-    </element>
-</define>
-<define name="chart-title-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:cell-range">
-            <ref name="cellAddress"/>
-        </attribute>
-    </optional>
-</define>
-<define name="chart-title-attlist" combine="interleave">
-    <ref name="common-draw-position-attlist"/>
-</define>
-<define name="chart-title-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="chart-subtitle">
-    <element name="chart:subtitle">
-        <ref name="chart-title-attlist"/>
-        <optional>
-            <ref name="text-p"/>
-        </optional>
-    </element>
-</define>
-<define name="chart-footer">
-    <element name="chart:footer">
-        <ref name="chart-title-attlist"/>
-        <optional>
-            <ref name="text-p"/>
-        </optional>
-    </element>
-</define>
-<define name="chart-legend">
-    <element name="chart:legend">
-        <ref name="chart-legend-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="chart-legend-attlist" combine="interleave">
-    <choice>
-        <group>
-            <attribute name="chart:legend-position">
-                <choice>
-                    <value>start</value>
-                    <value>end</value>
-                    <value>top</value>
-                    <value>bottom</value>
-                </choice>
-            </attribute>
-            <optional>
-                <attribute name="chart:legend-align">
-                    <choice>
-                        <value>start</value>
-                        <value>center</value>
-                        <value>end</value>
-                    </choice>
-                </attribute>
-            </optional>
-        </group>
-        <attribute name="chart:legend-position">
-            <choice>
-                <value>top-start</value>
-                <value>bottom-start</value>
-                <value>top-end</value>
-                <value>bottom-end</value>
-            </choice>
-        </attribute>
-        <empty/>
-    </choice>
-</define>
-<define name="chart-legend-attlist" combine="interleave">
-    <ref name="common-draw-position-attlist"/>
-</define>
-<define name="chart-legend-attlist" combine="interleave">
-    <choice>
-        <attribute name="style:legend-expansion">
-            <choice>
-                <value>wide</value>
-                <value>high</value>
-                <value>balanced</value>
-            </choice>
-        </attribute>
-        <group>
-            <attribute name="style:legend-expansion">
-                <value>custom</value>
-            </attribute>
-            <attribute name="style:legend-expansion-aspect-ratio">
-                <ref name="double"/>
-            </attribute>
-        </group>
-        <empty/>
-    </choice>
-</define>
-<define name="chart-legend-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="chart-plot-area">
-    <element name="chart:plot-area">
-        <ref name="chart-plot-area-attlist"/>
-        <zeroOrMore>
-            <ref name="dr3d-light"/>
-        </zeroOrMore>
-        <zeroOrMore>
-            <ref name="chart-axis"/>
-        </zeroOrMore>
-        <zeroOrMore>
-            <ref name="chart-series"/>
-        </zeroOrMore>
-        <optional>
-            <ref name="chart-stock-gain-marker"/>
-        </optional>
-        <optional>
-            <ref name="chart-stock-loss-marker"/>
-        </optional>
-        <optional>
-            <ref name="chart-stock-range-line"/>
-        </optional>
-        <optional>
-            <ref name="chart-wall"/>
-        </optional>
-        <optional>
-            <ref name="chart-floor"/>
-        </optional>
-    </element>
-</define>
-<define name="chart-plot-area-attlist" combine="interleave">
-    <ref name="common-draw-position-attlist"/>
-    <ref name="common-draw-size-attlist"/>
-</define>
-<define name="chart-plot-area-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="chart-plot-area-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:cell-range-address">
-            <ref name="cellRangeAddress"/>
-        </attribute>
-    </optional>
-</define>
-<define name="chart-plot-area-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:data-source-has-labels" a:defaultValue="none">
-            <choice>
-                <value>none</value>
-                <value>row</value>
-                <value>column</value>
-                <value>both</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="chart-plot-area-attlist" combine="interleave">
-    <ref name="dr3d-scene-attlist"/>
-    <ref name="common-dr3d-transform-attlist"/>
-</define>
-<define name="chart-wall">
-    <element name="chart:wall">
-        <ref name="chart-wall-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="chart-wall-attlist" combine="interleave">
-    <optional>
-        <attribute name="svg:width">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="chart-wall-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="chart-floor">
-    <element name="chart:floor">
-        <ref name="chart-floor-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="chart-floor-attlist" combine="interleave">
-    <optional>
-        <attribute name="svg:width">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="chart-floor-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="chart-axis">
-    <element name="chart:axis">
-        <ref name="chart-axis-attlist"/>
-        <optional>
-            <ref name="chart-title"/>
-        </optional>
-        <optional>
-            <ref name="chart-categories"/>
-        </optional>
-        <zeroOrMore>
-            <ref name="chart-grid"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="chart-axis-attlist" combine="interleave">
-    <attribute name="chart:dimension">
-        <choice>
-            <value>x</value>
-            <value>y</value>
-            <value>z</value>
-        </choice>
-    </attribute>
-</define>
-<define name="chart-axis-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="chart-axis-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="chart-grid">
-    <element name="chart:grid">
-        <ref name="chart-grid-attlist"/>
-    </element>
-</define>
-<define name="chart-grid-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:class" a:defaultValue="major">
-            <choice>
-                <value>major</value>
-                <value>minor</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="chart-grid-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="chart-series">
-    <element name="chart:series">
-        <ref name="chart-series-attlist"/>
-        <zeroOrMore>
-            <ref name="chart-domain"/>
-        </zeroOrMore>
-        <optional>
-            <ref name="chart-mean-value"/>
-        </optional>
-        <optional>
-            <ref name="chart-regression-curve"/>
-        </optional>
-        <optional>
-            <ref name="chart-error-indicator"/>
-        </optional>
-        <zeroOrMore>
-            <ref name="chart-data-point"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="chart-series-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:values-cell-range-address">
-            <ref name="cellRangeAddress"/>
-        </attribute>
-    </optional>
-</define>
-<define name="chart-series-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:label-cell-address">
-            <ref name="cellAddress"/>
-        </attribute>
-    </optional>
-</define>
-<define name="chart-series-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:class">
-            <ref name="namespacedToken"/>
-        </attribute>
-    </optional>
-</define>
-<define name="chart-series-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:attached-axis">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="chart-series-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="chart-domain">
-    <element name="chart:domain">
-    <optional>
-        <attribute name="table:cell-range-address">
-            <ref name="cellRangeAddress"/>
-        </attribute>
-    </optional>
-    </element>
-</define>
-<define name="chart-categories">
-    <element name="chart:categories">
-    <optional>
-        <attribute name="table:cell-range-address">
-            <ref name="cellRangeAddress"/>
-        </attribute>
-    </optional>
-    </element>
-</define>
-<define name="chart-data-point">
-    <element name="chart:data-point">
-        <ref name="chart-data-point-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="chart-data-point-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:repeated">
-            <ref name="nonNegativeInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="chart-data-point-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-
-<define name="chart-mean-value">
-    <element name="chart:mean-value">
-        <ref name="chart-mean-value-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="chart-mean-value-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="chart-error-indicator">
-    <element name="chart:error-indicator">
-        <ref name="chart-error-indicator-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="chart-error-indicator-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="chart-regression-curve">
-    <element name="chart:regression-curve">
-        <ref name="chart-regression-curve-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="chart-regression-curve-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="chart-stock-gain-marker">
-    <element name="chart:stock-gain-marker">
-        <ref name="common-stock-marker-attlist"/>
-    </element>
-</define>
-<define name="chart-stock-loss-marker">
-    <element name="chart:stock-loss-marker">
-        <ref name="common-stock-marker-attlist"/>
-    </element>
-</define>
-<define name="chart-stock-range-line">
-    <element name="chart:stock-range-line">
-        <ref name="common-stock-marker-attlist"/>
-    </element>
-</define>
-<define name="common-stock-marker-attlist">
-    <optional>
-        <attribute name="chart:style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="office-forms">
-    <optional>
-        <element name="office:forms">
-            <ref name="office-forms-attlist"/>
-            <zeroOrMore>
-                <choice>
-                    <ref name="form-form"/>
-                    <ref name="xforms-model"/>
-                </choice>
-            </zeroOrMore>
-        </element>
-    </optional>
-</define>
-<define name="office-forms-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:automatic-focus" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="office-forms-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:apply-design-mode" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-form">
-    <element name="form:form">
-        <ref name="common-form-control-attlist"/>
-        <ref name="form-form-attlist"/>
-        <optional>
-            <ref name="form-properties"/>
-        </optional>
-        <optional>
-            <ref name="office-event-listeners"/>
-        </optional>
-        <zeroOrMore>
-            <choice>
-                <ref name="controls"/>
-                <ref name="form-form"/>
-            </choice>
-        </zeroOrMore>
-        <optional>
-            <ref name="form-connection-resource"/>
-        </optional>
-    </element>
-</define>
-<define name="form-form-attlist" combine="interleave">
-    <optional>
-        <attribute name="xlink:href">
-            <ref name="anyURI"/>
-        </attribute>
-        <optional>
-            <attribute name="xlink:type" a:defaultValue="simple">
-                <value>simple</value>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="xlink:actuate" a:defaultValue="onRequest">
-                <value>onRequest</value>
-            </attribute>
-        </optional>
-    </optional>
-</define>
-<define name="form-form-attlist" combine="interleave">
-    <optional>
-        <attribute name="office:target-frame" a:defaultValue="_blank">
-            <ref name="targetFrameName"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-form-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:method" a:defaultValue="get">
-            <choice>
-                <value>get</value>
-                <value>post</value>
-                <ref name="string"/>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="form-form-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:enctype" 
-                    a:defaultValue="application/x-www-form-urlencoded">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-form-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:allow-deletes" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-form-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:allow-inserts" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-form-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:allow-updates" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-form-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:apply-filter" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-form-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:command-type" a:defaultValue="command">
-            <choice>
-                <value>table</value>
-                <value>query</value>
-                <value>command</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="form-form-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:command"/>
-    </optional>
-</define>
-<define name="form-form-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:datasource">
-            <choice>
-                <ref name="anyURI"/>
-                <ref name="string"/>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="form-form-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:master-fields">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-form-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:detail-fields">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-form-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:escape-processing" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-form-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:filter">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-form-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:ignore-result" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-form-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:navigation-mode">
-            <ref name="navigation"/>
-        </attribute>
-    </optional>
-</define>
-
-<define name="navigation">
-    <choice>
-        <value>none</value>
-        <value>current</value>
-        <value>parent</value>
-    </choice>
-</define>
-<define name="form-form-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:order">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-form-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:tab-cycle">
-            <ref name="tab-cycles"/>
-        </attribute>
-    </optional>
-</define>
-<define name="tab-cycles">
-    <choice>
-        <value>records</value>
-        <value>current</value>
-        <value>page</value>
-    </choice>
-</define>
-<define name="form-connection-resource">
-    <element name="form:connection-resource">
-        <attribute name="xlink:href">
-            <ref name="anyURI"/>
-        </attribute>
-        <empty/>
-    </element>
-</define>
-<define name="xforms-model">
-    <element name="xforms:model">
-        <ref name="anyAttListOrElements"/>
-    </element>
-</define>
-<define name="column-controls" combine="choice">
-    <element name="form:text">
-        <ref name="form-text-attlist"/>
-        <ref name="common-form-control-content"/>
-    </element>
-</define>
-<define name="controls" combine="choice">
-    <ref name="column-controls"/>
-</define>
-<define name="form-text-attlist">
-    <ref name="form-control-attlist"/>
-    <ref name="common-current-value-attlist"/>
-    <ref name="common-disabled-attlist"/>
-    <ref name="common-maxlength-attlist"/>
-    <ref name="common-printable-attlist"/>
-    <ref name="common-readonly-attlist"/>
-    <ref name="common-tab-attlist"/>
-    <ref name="common-title-attlist"/>
-    <ref name="common-value-attlist"/>
-    <ref name="common-convert-empty-attlist"/>
-    <ref name="common-data-field-attlist"/>
-</define>
-<define name="form-control-attlist">
-    <ref name="common-form-control-attlist"/>
-    <ref name="common-control-id-attlist"/>
-    <ref name="xforms-bind-attlist"/>
-</define>
-<define name="common-form-control-content">
-    <optional>
-        <ref name="form-properties"/>
-    </optional>
-    <optional>
-        <ref name="office-event-listeners"/>
-    </optional>
-</define>
-<define name="column-controls" combine="choice">
-    <element name="form:textarea">
-        <ref name="form-textarea-attlist"/>
-        <ref name="common-form-control-content"/>
-        <zeroOrMore>
-            <ref name="text-p"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="form-textarea-attlist">
-    <ref name="form-control-attlist"/>
-    <ref name="common-current-value-attlist"/>
-    <ref name="common-disabled-attlist"/>
-    <ref name="common-maxlength-attlist"/>
-    <ref name="common-printable-attlist"/>
-    <ref name="common-readonly-attlist"/>
-    <ref name="common-tab-attlist"/>
-    <ref name="common-title-attlist"/>
-    <ref name="common-value-attlist"/>
-    <ref name="common-convert-empty-attlist"/>
-    <ref name="common-data-field-attlist"/>
-</define>
-<define name="controls" combine="choice">
-    <element name="form:password">
-        <ref name="form-password-attlist"/>
-        <ref name="common-form-control-content"/>
-    </element>
-</define>
-<define name="form-password-attlist" combine="interleave">
-    <ref name="form-control-attlist"/>
-    <ref name="common-disabled-attlist"/>
-    <ref name="common-maxlength-attlist"/>
-    <ref name="common-printable-attlist"/>
-    <ref name="common-tab-attlist"/>
-    <ref name="common-title-attlist"/>
-    <ref name="common-value-attlist"/>
-    <ref name="common-convert-empty-attlist"/>
-</define>
-<define name="form-password-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:echo-char" a:defaultValue="*">
-            <ref name="character"/>
-        </attribute>
-    </optional>
-</define>
-<define name="controls" combine="choice">
-    <element name="form:file">
-        <ref name="form-file-attlist"/>
-        <ref name="common-form-control-content"/>
-    </element>
-</define>
-<define name="form-file-attlist" combine="interleave">
-    <ref name="form-control-attlist"/>
-    <ref name="common-current-value-attlist"/>
-    <ref name="common-disabled-attlist"/>
-    <ref name="common-maxlength-attlist"/>
-    <ref name="common-printable-attlist"/>
-    <ref name="common-readonly-attlist"/>
-    <ref name="common-tab-attlist"/>
-    <ref name="common-title-attlist"/>
-    <ref name="common-value-attlist"/>
-</define>
-<define name="column-controls" combine="choice">
-    <element name="form:formatted-text">
-        <ref name="form-formatted-text-attlist"/>
-        <ref name="common-form-control-content"/>
-    </element>
-</define>
-<define name="form-formatted-text-attlist" combine="interleave">
-    <ref name="form-control-attlist"/>
-    <ref name="common-current-value-attlist"/>
-    <ref name="common-disabled-attlist"/>
-    <ref name="common-maxlength-attlist"/>
-    <ref name="common-printable-attlist"/>
-    <ref name="common-readonly-attlist"/>
-    <ref name="common-tab-attlist"/>
-    <ref name="common-title-attlist"/>
-    <ref name="common-value-attlist"/>
-    <ref name="common-convert-empty-attlist"/>
-    <ref name="common-data-field-attlist"/>
-</define>
-<define name="form-formatted-text-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:max-value">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-formatted-text-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:min-value">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-formatted-text-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:validation" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="column-controls" combine="choice">
-    <element name="form:number">
-        <ref name="form-number-attlist"/>
-        <ref name="common-numeric-control-attlist"/>
-        <ref name="common-form-control-content"/>
-    </element>
-</define>
-<define name="common-numeric-control-attlist">
-    <ref name="form-control-attlist"/>
-    <ref name="common-disabled-attlist"/>
-    <ref name="common-maxlength-attlist"/>
-    <ref name="common-printable-attlist"/>
-    <ref name="common-readonly-attlist"/>
-    <ref name="common-tab-attlist"/>
-    <ref name="common-title-attlist"/>
-    <ref name="common-convert-empty-attlist"/>
-    <ref name="common-data-field-attlist"/>
-</define>
-<define name="form-number-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:value">
-            <ref name="double"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-number-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:current-value">
-            <ref name="double"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-number-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:min-value">
-            <ref name="double"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-number-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:max-value">
-            <ref name="double"/>
-        </attribute>
-    </optional>
-</define>
-<define name="column-controls" combine="choice">
-    <element name="form:date">
-        <ref name="form-date-attlist"/>
-        <ref name="common-numeric-control-attlist"/>
-        <ref name="common-form-control-content"/>
-    </element>
-</define>
-<define name="controls" combine="choice">
-    <element name="form:time">
-        <ref name="form-time-attlist"/>
-        <ref name="common-numeric-control-attlist"/>
-        <ref name="common-form-control-content"/>
-    </element>
-</define>
-<define name="form-date-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:value">
-            <ref name="date"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-time-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:value">
-            <ref name="time"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-date-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:current-value">
-            <ref name="date"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-time-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:current-value">
-            <ref name="time"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-date-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:min-value">
-            <ref name="date"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-time-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:min-value">
-            <ref name="time"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-date-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:max-value">
-            <ref name="date"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-time-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:max-value">
-            <ref name="time"/>
-        </attribute>
-    </optional>
-</define>
-<define name="controls" combine="choice">
-    <element name="form:fixed-text">
-        <ref name="form-fixed-text-attlist"/>
-        <ref name="common-form-control-content"/>
-    </element>
-</define>
-<define name="form-fixed-text-attlist" combine="interleave">
-    <ref name="form-control-attlist"/>
-    <ref name="for"/>
-    <ref name="common-disabled-attlist"/>
-    <ref name="label"/>
-    <ref name="common-printable-attlist"/>
-    <ref name="common-title-attlist"/>
-</define>
-<define name="form-fixed-text-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:multi-line" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="column-controls" combine="choice">
-    <element name="form:combobox">
-        <ref name="form-combobox-attlist"/>
-        <ref name="common-form-control-content"/>
-        <zeroOrMore>
-            <ref name="form-item"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="form-combobox-attlist" combine="interleave">
-    <ref name="form-control-attlist"/>
-    <ref name="common-current-value-attlist"/>
-    <ref name="common-disabled-attlist"/>
-    <ref name="dropdown"/>
-    <ref name="common-maxlength-attlist"/>
-    <ref name="common-printable-attlist"/>
-    <ref name="common-readonly-attlist"/>
-    <ref name="size"/>
-    <ref name="common-tab-attlist"/>
-    <ref name="common-title-attlist"/>
-    <ref name="common-value-attlist"/>
-    <ref name="common-convert-empty-attlist"/>
-    <ref name="common-data-field-attlist"/>
-    <ref name="list-source"/>
-    <ref name="list-source-type"/>
-</define>
-<define name="form-combobox-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:auto-complete">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-item">
-    <element name="form:item">
-        <ref name="form-item-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="form-item-attlist" combine="interleave">
-    <ref name="label"/>
-</define>
-<define name="column-controls" combine="choice">
-    <element name="form:listbox">
-        <ref name="form-listbox-attlist"/>
-        <ref name="common-form-control-content"/>
-        <zeroOrMore>
-            <ref name="form-option"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="form-listbox-attlist" combine="interleave">
-    <ref name="form-control-attlist"/>
-    <ref name="common-disabled-attlist"/>
-    <ref name="dropdown"/>
-    <ref name="common-printable-attlist"/>
-    <ref name="size"/>
-    <ref name="common-tab-attlist"/>
-    <ref name="common-title-attlist"/>
-    <ref name="bound-column"/>
-    <ref name="common-data-field-attlist"/>
-    <ref name="list-source"/>
-    <ref name="list-source-type"/>
-</define>
-<define name="form-listbox-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:multiple" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-listbox-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:xforms-list-source">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-option">
-    <element name="form:option">
-        <ref name="form-option-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="form-option-attlist" combine="interleave">
-    <ref name="current-selected"/>
-    <ref name="selected"/>
-    <ref name="label"/>
-    <ref name="common-value-attlist"/>
-</define>
-<define name="controls" combine="choice">
-    <element name="form:button">
-        <ref name="form-button-attlist"/>
-        <ref name="common-form-control-content"/>
-    </element>
-</define>
-<define name="form-button-attlist" combine="interleave">
-    <ref name="form-control-attlist"/>
-    <ref name="button-type"/>
-    <ref name="common-disabled-attlist"/>
-    <ref name="label"/>
-    <ref name="image-data"/>
-    <ref name="common-printable-attlist"/>
-    <ref name="common-tab-attlist"/>
-    <ref name="target-frame"/>
-    <ref name="target-location"/>
-    <ref name="common-title-attlist"/>
-    <ref name="common-value-attlist"/>
-    <ref name="common-form-relative-image-position-attlist"/>
-</define>
-<define name="form-button-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:default-button" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-button-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:toggle" a:default-value="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-button-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:focus-on-click">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-button-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:xforms-submission">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="controls" combine="choice">
-    <element name="form:image">
-        <ref name="form-image-attlist"/>
-        <ref name="common-form-control-content"/>
-    </element>
-</define>
-<define name="form-image-attlist" combine="interleave">
-    <ref name="form-control-attlist"/>
-    <ref name="button-type"/>
-    <ref name="common-disabled-attlist"/>
-    <ref name="image-data"/>
-    <ref name="common-printable-attlist"/>
-    <ref name="common-tab-attlist"/>
-    <ref name="target-frame"/>
-    <ref name="target-location"/>
-    <ref name="common-title-attlist"/>
-    <ref name="common-value-attlist"/>
-</define>
-<define name="column-controls" combine="choice">
-    <element name="form:checkbox">
-        <ref name="form-checkbox-attlist"/>
-        <ref name="common-form-control-content"/>
-    </element>
-</define>
-<define name="form-checkbox-attlist" combine="interleave">
-    <ref name="form-control-attlist"/>
-    <ref name="common-disabled-attlist"/>
-    <ref name="label"/>
-    <ref name="common-printable-attlist"/>
-    <ref name="common-tab-attlist"/>
-    <ref name="common-title-attlist"/>
-    <ref name="common-value-attlist"/>
-    <ref name="common-data-field-attlist"/>
-    <ref name="common-form-visual-effect-attlist"/>
-    <ref name="common-form-relative-image-position-attlist"/>
-</define>
-<define name="states">
-    <choice>
-        <value>unchecked</value>
-        <value>checked</value>
-        <value>unknown</value>
-    </choice>
-</define>
-<define name="form-checkbox-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:current-state">
-            <ref name="states"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-checkbox-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:is-tristate" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-checkbox-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:state" a:defaultValue="unchecked">
-            <ref name="states"/>
-        </attribute>
-    </optional>
-</define>
-<define name="controls" combine="choice">
-    <element name="form:radio">
-        <ref name="form-radio-attlist"/>
-        <ref name="common-form-control-content"/>
-    </element>
-</define>
-<define name="form-radio-attlist" combine="interleave">
-    <ref name="form-control-attlist"/>
-    <ref name="current-selected"/>
-    <ref name="common-disabled-attlist"/>
-    <ref name="label"/>
-    <ref name="common-printable-attlist"/>
-    <ref name="selected"/>
-    <ref name="common-tab-attlist"/>
-    <ref name="common-title-attlist"/>
-    <ref name="common-value-attlist"/>
-    <ref name="common-data-field-attlist"/>
-    <ref name="common-form-visual-effect-attlist"/>
-    <ref name="common-form-relative-image-position-attlist"/>
-</define>
-<define name="controls" combine="choice">
-    <element name="form:frame">
-        <ref name="form-frame-attlist"/>
-        <ref name="common-form-control-content"/>
-    </element>
-</define>
-<define name="form-frame-attlist" combine="interleave">
-    <ref name="form-control-attlist"/>
-    <ref name="common-disabled-attlist"/>
-    <ref name="for"/>
-    <ref name="label"/>
-    <ref name="common-printable-attlist"/>
-    <ref name="common-title-attlist"/>
-</define>
-<define name="controls" combine="choice">
-    <element name="form:image-frame">
-        <ref name="form-image-frame-attlist"/>
-        <ref name="common-form-control-content"/>
-    </element>
-</define>
-<define name="form-image-frame-attlist" combine="interleave">
-    <ref name="form-control-attlist"/>
-    <ref name="common-disabled-attlist"/>
-    <ref name="image-data"/>
-    <ref name="common-printable-attlist"/>
-    <ref name="common-readonly-attlist"/>
-    <ref name="common-title-attlist"/>
-    <ref name="common-data-field-attlist"/>
-</define>
-<define name="controls" combine="choice">
-    <element name="form:hidden">
-        <ref name="form-hidden-attlist"/>
-        <ref name="common-form-control-content"/>
-    </element>
-</define>
-<define name="form-hidden-attlist" combine="interleave">
-    <ref name="form-control-attlist"/>
-    <ref name="common-value-attlist"/>
-</define>
-<define name="controls" combine="choice">
-    <element name="form:grid">
-        <ref name="form-grid-attlist"/>
-        <ref name="common-form-control-content"/>
-        <zeroOrMore>
-            <ref name="form-column"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="form-grid-attlist" combine="interleave">
-    <ref name="form-control-attlist"/>
-    <ref name="common-disabled-attlist"/>
-    <ref name="common-printable-attlist"/>
-    <ref name="common-tab-attlist"/>
-    <ref name="common-title-attlist"/>
-</define>
-<define name="form-column">
-    <element name="form:column">
-        <ref name="form-column-attlist"/>
-        <oneOrMore>
-            <ref name="column-controls"/>
-        </oneOrMore>
-    </element>
-</define>
-<define name="form-column-attlist" combine="interleave">
-    <ref name="common-form-control-attlist"/>
-    <ref name="label"/>
-    <ref name="text-style-name"/>
-</define>
-<define name="text-style-name">
-    <optional>
-        <attribute name="form:text-style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="controls" combine="choice">
-    <element name="form:value-range">
-        <ref name="form-value-range-attlist"/>
-        <ref name="common-form-control-content"/>
-    </element>
-</define>
-<define name="form-value-range-attlist" combine="interleave">
-    <ref name="form-control-attlist"/>
-    <ref name="common-disabled-attlist"/>
-    <ref name="common-printable-attlist"/>
-    <ref name="common-tab-attlist"/>
-    <ref name="common-title-attlist"/>
-    <ref name="common-value-attlist"/>
-</define>
-<define name="form-value-range-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:max-value">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-value-range-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:min-value">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-value-range-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:step-size" a:defaultName="1">
-            <ref name="positiveInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-value-range-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:page-step-size">
-            <ref name="positiveInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-value-range-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:delay-for-repeat">
-            <ref name="duration"/>
-        </attribute>
-    </optional>
-</define>
-<define name="form-value-range-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:orientation">
-            <choice>
-                <value>horizontal</value>
-                <value>vertical</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="controls" combine="choice">
-    <element name="form:generic-control">
-        <ref name="form-generic-control-attlist"/>
-        <ref name="common-form-control-content"/>
-    </element>
-</define>
-<define name="form-generic-control-attlist" combine="interleave">
-    <ref name="form-control-attlist"/>
-</define>
-<define name="common-form-control-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-form-control-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:control-implementation">
-            <ref name="namespacedToken"/>
-        </attribute>
-    </optional>
-</define>
-<define name="xforms-bind-attlist">
-    <optional>
-        <attribute name="xforms:bind">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="types">
-    <choice>
-        <value>submit</value>
-        <value>reset</value>
-        <value>push</value>
-        <value>url</value>
-    </choice>
-</define>
-<define name="button-type">
-    <optional>
-        <attribute name="form:button-type" a:defaultValue="push">
-            <ref name="types"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-control-id-attlist">
-    <attribute name="form:id">
-        <ref name="ID"/>
-    </attribute>
-</define>
-<define name="current-selected">
-    <optional>
-        <attribute name="form:current-selected" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-value-attlist">
-    <optional>
-        <attribute name="form:value">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-current-value-attlist">
-    <optional>
-        <attribute name="form:current-value">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-disabled-attlist">
-    <optional>
-        <attribute name="form:disabled" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="dropdown">
-    <optional>
-        <attribute name="form:dropdown" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="for">
-    <optional>
-        <attribute name="form:for">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="image-data">
-    <optional>
-        <attribute name="form:image-data">
-            <ref name="anyURI"/>
-        </attribute>
-    </optional>
-</define>
-<define name="label">
-    <optional>
-        <attribute name="form:label">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-maxlength-attlist">
-    <optional>
-        <attribute name="form:max-length">
-            <ref name="nonNegativeInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-printable-attlist">
-    <optional>
-        <attribute name="form:printable" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-readonly-attlist">
-    <optional>
-        <attribute name="form:readonly" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="selected">
-    <optional>
-        <attribute name="form:selected" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="size">
-    <optional>
-        <attribute name="form:size">
-            <ref name="nonNegativeInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-tab-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:tab-index" a:defaultValue="0">
-            <ref name="nonNegativeInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-tab-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:tab-stop" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="target-frame">
-    <optional>
-        <attribute name="office:target-frame" a:defaultValue="_blank">
-            <ref name="targetFrameName"/>
-        </attribute>
-    </optional>
-</define>
-<define name="target-location">
-    <optional>
-        <attribute name="xlink:href">
-            <ref name="anyURI"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-title-attlist">
-    <optional>
-        <attribute name="form:title"/>
-    </optional>
-</define>
-<define name="common-form-visual-effect-attlist" combine="interleave">
-    <optional>
-        <attribute name="form:visual-effect">
-            <choice>
-                <value>flat</value>
-                <value>3d</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="common-form-relative-image-position-attlist"
-        combine="interleave">
-    <choice>
-        <optional>
-            <attribute name="form:image-position" a:defaultValue="center">
-                <value>center</value>
-            </attribute>
-        </optional>
-        <group>
-            <attribute name="form:image-position">
-                <choice>
-                    <value>start</value>
-                    <value>end</value>
-                    <value>top</value>
-                    <value>bottom</value>
-                </choice>
-            </attribute>
-            <optional>
-                <attribute name="form:image-align" a:defaultValue="center">
-                    <choice>
-                        <value>start</value>
-                        <value>center</value>
-                        <value>end</value>
-                    </choice>
-                </attribute>
-            </optional>
-        </group>
-    </choice>
-</define>
-<define name="bound-column">
-    <optional>
-        <attribute name="form:bound-column">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-convert-empty-attlist">
-    <optional>
-        <attribute name="form:convert-empty-to-null" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-data-field-attlist">
-    <optional>
-        <attribute name="form:data-field">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="list-source">
-    <optional>
-        <attribute name="form:list-source">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="list-source-type">
-    <optional>
-        <attribute name="form:list-source-type">
-            <choice>
-                <value>table</value>
-                <value>query</value>
-                <value>sql</value>
-                <value>sql-pass-through</value>
-                <value>value-list</value>
-                <value>table-fields</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="form-properties">
-    <element name="form:properties">
-        <oneOrMore>
-            <ref name="form-property"/>
-        </oneOrMore>
-    </element>
-</define>
-<define name="form-property" combine="choice">
-    <element name="form:property">
-        <ref name="form-property-name"/>
-        <ref name="form-property-value-and-type-attlist"/>
-    </element>
-</define>
-<define name="form-property-name" combine="interleave">
-    <attribute name="form:property-name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="form-property-value-and-type-attlist" combine="interleave">
-    <choice>
-        <ref name="common-value-and-type-attlist"/>
-        <attribute name="office:value-type">
-            <value>void</value>
-        </attribute>
-    </choice>
-</define>
-<define name="form-property" combine="choice">
-    <element name="form:list-property">
-        <ref name="form-property-name"/>
-        <ref name="form-property-type-and-value-list"/>
-    </element>
-</define>
-<define name="form-property-type-and-value-list">
-    <choice>
-        <group>
-            <attribute name="office:value-type">
-                <value>float</value>
-            </attribute>
-            <zeroOrMore>
-                <element name="form:list-value">
-                    <attribute name="office:value">
-                        <ref name="double"/>
-                    </attribute>
-                </element>
-            </zeroOrMore>
-        </group>
-        <group>
-            <attribute name="office:value-type">
-                <value>percentage</value>
-            </attribute>
-            <zeroOrMore>
-                <element name="form:list-value">
-                    <attribute name="office:value">
-                        <ref name="double"/>
-                    </attribute>
-                </element>
-            </zeroOrMore>
-        </group>
-        <group>
-            <attribute name="office:value-type">
-                <value>currency</value>
-            </attribute>
-            <zeroOrMore>
-                <element name="form:list-value">
-                    <attribute name="office:value">
-                        <ref name="double"/>
-                    </attribute>
-                    <optional>
-                        <attribute name="office:currency">
-                            <ref name="string"/>
-                        </attribute>
-                    </optional>
-                </element>
-            </zeroOrMore>
-        </group>
-        <group>
-            <attribute name="office:value-type">
-                <value>date</value>
-            </attribute>
-            <zeroOrMore>
-                <element name="form:list-value">
-                    <attribute name="office:date-value">
-                        <ref name="dateOrDateTime"/>
-                    </attribute>
-                </element>
-            </zeroOrMore>
-        </group>
-        <group>
-            <attribute name="office:value-type">
-                <value>time</value>
-            </attribute>
-            <zeroOrMore>
-                <element name="form:list-value">
-                    <attribute name="office:time-value">
-                        <ref name="duration"/>
-                    </attribute>
-                </element>
-            </zeroOrMore>
-        </group>
-        <group>
-            <attribute name="office:value-type">
-                <value>boolean</value>
-            </attribute>
-            <zeroOrMore>
-                <element name="form:list-value">
-                    <attribute name="office:boolean-value">
-                        <ref name="boolean"/>
-                    </attribute>
-                </element>
-            </zeroOrMore>
-        </group>
-        <group>
-            <attribute name="office:value-type">
-                <value>string</value>
-            </attribute>
-            <zeroOrMore>
-                <element name="form:list-value">
-                    <attribute name="office:string-value">
-                        <ref name="string"/>
-                    </attribute>
-                </element>
-            </zeroOrMore>
-        </group>
-        <attribute name="office:value-type">
-            <value>void</value>
-        </attribute>
-    </choice>
-</define>
-<define name="office-annotation">
-    <element name="office:annotation">
-        <ref name="office-annotation-attlist"/>
-        <ref name="draw-caption-attlist"/>
-        <ref name="common-draw-position-attlist"/>
-        <ref name="common-draw-size-attlist"/>
-        <ref name="common-draw-shape-with-text-and-styles-attlist"/>
-        <optional>
-            <ref name="dc-creator"/>
-        </optional>
-        <optional>
-            <ref name="dc-date"/>
-        </optional>
-        <optional>
-            <ref name="meta-date-string"/>
-        </optional>
-        <zeroOrMore>
-            <choice>
-                <ref name="text-p"/>
-                <ref name="text-list"/>
-            </choice>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="office-annotation-attlist" combine="interleave">
-    <optional>
-        <attribute name="office:display">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="meta-date-string">
-    <element name="meta:date-string">
-        <ref name="string"/>
-    </element>
-</define>
-<define name="common-num-format-prefix-suffix-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:num-prefix">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:num-suffix">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-num-format-attlist" combine="interleave">
-    <choice>
-        <attribute name="style:num-format">
-            <choice>
-                <value>1</value>
-                <value>i</value>
-                <value>I</value>
-                <ref name="string"/>
-                <empty/>
-            </choice>
-        </attribute>
-        <group>
-            <attribute name="style:num-format">
-                <choice>
-                    <value>a</value>
-                    <value>A</value>
-                </choice>
-            </attribute>
-            <ref name="style-num-letter-sync-attlist"/>
-        </group>
-        <empty/>
-    </choice>
-</define>
-<define name="style-num-letter-sync-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:num-letter-sync">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="office-change-info">
-    <element name="office:change-info">
-        <ref name="dc-creator"/>
-        <ref name="dc-date"/>
-        <zeroOrMore>
-            <ref name="text-p"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="office-event-listeners">
-    <element name="office:event-listeners">
-        <zeroOrMore>
-            <choice>
-                <ref name="script-event-listener"/>
-                <ref name="presentation-event-listener"/>
-            </choice>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="script-event-listener" combine="interleave">
-    <element name="script:event-listener">
-        <ref name="script-event-listener-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="script-event-listener-attlist" combine="interleave">
-    <attribute name="script:event-name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="script-event-listener-attlist" combine="interleave">
-    <attribute name="script:language">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="script-event-listener-attlist" combine="interleave">
-    <choice>
-        <attribute name="script:macro-name">
-            <ref name="string"/>
-        </attribute>
-        <group>
-            <attribute name="xlink:href">
-                <ref name="anyURI"/>
-            </attribute>
-            <optional>
-                <attribute name="xlink:type" a:defaultValue="simple">
-                    <value>simple</value>
-                </attribute>
-            </optional>
-            <optional>
-                <attribute name="xlink:actuate" a:defaultValue="onRequest">
-                    <value>onRequest</value>
-                </attribute>
-            </optional>
-        </group>
-    </choice>
-</define>
-<define name="math-math">
-    <element name="math:math">
-        <ref name="mathMarkup"/>
-    </element>
-</define>
-
-<!-- To avoid inclusion of the complete MathML schema, anything -->
-<!-- is allowed within a math:math top-level element            -->
-<define name="mathMarkup">
-    <zeroOrMore>
-        <choice>
-            <attribute>
-                <anyName/>
-            </attribute>
-            <text/>
-            <element>
-                <anyName/>
-                <ref name="mathMarkup"/>
-            </element>
-        </choice>
-    </zeroOrMore>
-</define>
-<define name="text-dde-connection-decl">
-    <element name="text:dde-connection-decl">
-        <ref name="text-dde-connection-decl-attlist"/>
-        <ref name="common-dde-connection-decl-attlist"/>
-    </element>
-</define>
-<define name="text-dde-connection-decl-attlist" combine="interleave">
-    <attribute name="office:name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="common-dde-connection-decl-attlist" combine="interleave">
-    <attribute name="office:dde-application">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="common-dde-connection-decl-attlist" combine="interleave">
-    <attribute name="office:dde-topic">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="common-dde-connection-decl-attlist" combine="interleave">
-    <attribute name="office:dde-item">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="common-dde-connection-decl-attlist" combine="interleave">
-    <optional>
-        <attribute name="office:automatic-update" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-dde-link">
-    <element name="table:dde-link">
-        <ref name="office-dde-source"/>
-        <ref name="table-table"/>
-    </element>
-</define>
-<define name="office-dde-source">
-    <element name="office:dde-source">
-        <ref name="office-dde-source-attlist"/>
-        <ref name="common-dde-connection-decl-attlist"/>
-    </element>
-</define>
-<define name="office-dde-source-attlist" combine="interleave">
-    <optional>
-        <attribute name="office:name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="office-dde-source-attlist" combine="interleave">
-    <optional>
-        <attribute name="office:conversion-mode" 
-                    a:defaultValue="into-default-style-data-style">
-            <choice>
-                <value>into-default-style-data-style</value>
-                <value>into-english-number</value>
-                <value>keep-text</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="animation-element" combine="choice">
-    <element name="anim:animate">
-        <ref name="common-anim-target-attlist"/>
-        <ref name="common-anim-named-target-attlist"/>
-        <ref name="common-anim-values-attlist"/>
-        <ref name="common-anim-spline-mode-attlist"/>
-        <ref name="common-spline-anim-value-attlist"/>
-        <ref name="common-timing-attlist"/>
-        <ref name="common-anim-add-accum-attlist"/>
-    </element>
-</define>
-<define name="animation-element" combine="choice">
-    <element name="anim:set">
-        <ref name="common-anim-target-attlist"/>
-        <ref name="common-anim-named-target-attlist"/>
-        <ref name="common-anim-set-values-attlist"/>
-        <ref name="common-timing-attlist"/>
-        <ref name="common-anim-add-accum-attlist"/>
-    </element>
-</define>
-<define name="animation-element" combine="choice">
-    <element name="anim:animateMotion">
-        <ref name="anim-animate-motion-attlist"/>
-        <ref name="common-anim-target-attlist"/>
-        <ref name="common-anim-named-target-attlist"/>
-        <ref name="common-anim-add-accum-attlist"/>
-        <ref name="common-anim-values-attlist"/>
-        <ref name="common-timing-attlist"/>
-        <ref name="common-spline-anim-value-attlist"/>
-    </element>
-</define>
-<define name="anim-animate-motion-attlist" combine="interleave">
-    <optional>
-        <attribute name="svg:path">
-            <ref name="pathData"/>
-        </attribute>
-    </optional>
-</define>
-<define name="anim-animate-motion-attlist" combine="interleave">
-    <optional>
-        <attribute name="svg:origin">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="anim-animate-motion-attlist" combine="interleave">
-    <optional>
-        <attribute name="smil:calcMode" a:defaultValue="paced">   
-            <choice>
-                <value>discrete</value>
-                <value>linear</value>
-                <value>paced</value>
-                <value>spline</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="animation-element" combine="choice">
-    <element name="anim:animateColor">
-        <ref name="common-anim-target-attlist"/>
-        <ref name="common-anim-named-target-attlist"/>
-        <ref name="common-anim-add-accum-attlist"/>
-        <ref name="common-anim-values-attlist"/>
-        <ref name="common-anim-spline-mode-attlist"/>
-        <ref name="common-spline-anim-value-attlist"/>
-        <ref name="anim-animate-color-attlist"/>
-        <ref name="common-timing-attlist"/>
-    </element>
-</define>
-<define name="anim-animate-color-attlist" combine="interleave">
-    <optional>
-        <attribute name="anim:color-interpolation" a:defaultValue="rgb">
-            <choice>
-                <value>rgb</value>
-                <value>hsl</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="anim-animate-color-attlist" combine="interleave">
-    <optional>
-        <attribute name="anim:color-interpolation-direction"     
-                                   a:defaultValue="clockwise">
-            <choice>
-                <value>clockwise</value>
-                <value>counter-clockwise</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="animation-element" combine="choice">
-    <element name="anim:animateTransform">
-        <ref name="common-anim-target-attlist"/>
-        <ref name="common-anim-named-target-attlist"/>
-        <ref name="common-anim-add-accum-attlist"/>
-        <ref name="common-anim-values-attlist"/>
-        <ref name="anim-animate-transform-attlist"/>
-        <ref name="common-timing-attlist"/>
-    </element>
-</define>
-<define name="anim-animate-transform-attlist" combine="interleave">
-    <attribute name="svg:type">
-        <choice>
-            <value>translate</value>
-            <value>scale</value>
-            <value>rotate</value>
-            <value>skewX</value>
-            <value>skewY</value> 
-        </choice>
-    </attribute>
-</define>
-<define name="animation-element" combine="choice">
-    <element name="anim:transitionFilter">
-        <ref name="common-anim-target-attlist"/>
-        <ref name="common-anim-add-accum-attlist"/>
-        <ref name="common-anim-values-attlist"/>
-        <ref name="common-anim-spline-mode-attlist "/>
-        <ref name="anim-transition-filter-attlist"/>
-        <ref name="common-timing-attlist"/>
-    </element>
-</define>
-<define name="anim-transition-filter-attlist" combine="interleave">
-    <attribute name="smil:type">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="anim-transition-filter-attlist" combine="interleave">
-    <optional>
-        <attribute name="smil:subtype">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="anim-transition-filter-attlist" combine="interleave">
-    <optional>
-        <attribute name="smil:direction" a:defaultValue="forward">
-            <choice>
-                <value>forward</value>
-                <value>reverse</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="anim-transition-filter-attlist" combine="interleave">
-    <optional>
-        <attribute name="smil:fadeColor">
-            <choice>
-                <value>forward</value>
-                <value>reverse</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="anim-transition-filter-attlist" combine="interleave">
-    <optional>
-        <attribute name="smil:mode" a:defaultValue="in">
-            <choice>
-                <value>in</value>
-                <value>out</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="common-anim-attlist" combine="interleave">
-    <optional>
-        <attribute name="anim:id">
-            <ref name="ID"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-anim-target-attlist" combine="interleave">
-    <optional>
-        <attribute name="smil:targetElement">
-            <ref name="IDREF"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-anim-named-target-attlist" combine="interleave">
-    <attribute name="smil:attributeName">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="common-anim-target-attlist" combine="interleave">
-    <optional>
-        <attribute name="anim:sub-item">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-anim-values-attlist" combine="interleave">
-    <optional>
-        <attribute name="smil:values">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-anim-spline-mode-attlist" combine="interleave">
-    <optional>
-        <attribute name="smil:calcMode" a:defaultValue="discrete">   
-            <choice>
-                <value>discrete</value>
-                <value>linear</value>
-                <value>paced</value>
-                <value>spline</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="common-spline-anim-value-attlist" combine="interleave">
-    <optional>
-        <attribute name="smil:keyTimes">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-spline-anim-value-attlist" combine="interleave">
-    <optional>
-        <attribute name="smil:keySplines">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-anim-add-accum-attlist" combine="interleave">
-    <optional>
-        <attribute name="smil:accumulate">
-            <choice>
-                <value>none</value>
-                <value>sum</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="common-anim-add-accum-attlist" combine="interleave">
-    <optional>
-        <attribute name="smil:additive">
-            <choice>
-                <value>replace</value>
-                <value>sum</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="common-anim-values-attlist" combine="interleave">
-    <optional>
-        <attribute name="anim:formula">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-anim-set-values-attlist" combine="interleave">
-    <optional>
-        <attribute name="smil:to">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-
-<define name="common-anim-values-attlist" combine="interleave">
-    <ref name="common-anim-set-values-attlist"/>
-    <optional>
-        <attribute name="smil:from">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="smil:by">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-begin-end-timing-attlist" combine="interleave">
-    <optional>
-        <attribute name="smil:begin">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-begin-end-timing-attlist" combine="interleave">
-    <optional>
-        <attribute name="smil:end">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-dur-timing-attlist" combine="interleave">
-    <optional>
-        <attribute name="smil:dur">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-endsync-timing-attlist" combine="interleave">
-    <optional>
-        <attribute name="smil:endsync">
-            <choice>
-                <value>first</value>
-                <value>last</value>
-                <value>all</value>
-                <value>media</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="common-repeat-timing-attlist" combine="interleave">
-    <optional>
-        <attribute name="smil:repeatDur">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="smil:repeatCount">
-            <choice>
-                <ref name="nonNegativeInteger"/>
-                <value>indefinite</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="common-fill-timing-attlist" combine="interleave">
-    <optional>
-        <attribute name="smil:fill">
-            <choice>
-                <value>remove</value>
-                <value>freeze</value>
-                <value>hold</value>
-                <value>auto</value>
-                <value>default</value>
-                <value>transition</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="common-fill-default-attlist" combine="interleave">
-    <optional>
-        <attribute name="smil:fillDefault">
-            <choice>
-                <value>remove</value>
-                <value>freeze</value>
-                <value>hold</value>
-                <value>transition</value>
-                <value>auto</value>
-                <value>inherit</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="common-restart-timing-attlist" combine="interleave">
-    <optional>
-        <attribute name="smil:restart" a:defaultValue="default">
-            <choice>
-                <value>never</value>
-                <value>always</value>
-                <value>whenNotActive</value>
-                <value>default</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="common-restart-default-attlist" combine="interleave">
-    <optional>
-        <attribute name="smil:restartDefault" a:defaultValue="inherit">
-            <choice>
-                <value>never</value>
-                <value>always</value>
-                <value>whenNotActive</value>
-                <value>inherit</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="common-time-manip-attlist" combine="interleave">
-    <optional>    
-        <attribute name="smil:accelerate" a:defaultValue="0.0">
-            <ref name="double"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-time-manip-attlist" combine="interleave">
-    <optional>
-        <attribute name="smil:decelerate" a:defaultValue="0.0">
-            <ref name="double"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-time-manip-attlist" combine="interleave">
-    <optional>
-        <attribute name="smil:autoReverse" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="animation-element" combine="choice">
-    <element name="anim:par">
-        <ref name="common-anim-attlist"/>
-        <ref name="common-timing-attlist"/>
-        <ref name="common-endsync-timing-attlist"/>
-        <zeroOrMore>
-            <ref name="animation-element"/>
-        </zeroOrMore>
-    </element>
-</define>
-
-<define name="common-basic-timing-attlist" combine="interleave">
-   <ref name="common-begin-end-timing-attlist"/>
-   <ref name="common-dur-timing-attlist"/>
-   <ref name="common-repeat-timing-attlist"/>
-</define>
-
-<define name="common-timing-attlist" combine="interleave">
-   <ref name="common-basic-timing-attlist"/>
-   <ref name="common-restart-timing-attlist"/>
-   <ref name="common-restart-default-attlist"/>
-   <ref name="common-fill-timing-attlist"/>
-   <ref name="common-fill-default-attlist"/>
-   <ref name="common-time-manip-attlist"/>
-</define>
-<define name="animation-element" combine="choice">
-    <element name="anim:seq">
-        <ref name="common-anim-attlist"/>
-        <ref name="common-endsync-timing-attlist"/>
-        <ref name="common-timing-attlist"/>
-        <zeroOrMore>
-            <ref name="animation-element"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="animation-element" combine="choice">
-    <element name="anim:iterate">
-        <ref name="common-anim-attlist"/>
-        <ref name="anim-iterate-attlist"/>
-        <ref name="common-timing-attlist"/>
-        <ref name="common-endsync-timing-attlist"/>
-        <zeroOrMore>
-            <ref name="animation-element"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="anim-iterate-attlist" combine="interleave">
-    <ref name="common-anim-target-attlist"/>
-</define>
-<define name="anim-iterate-attlist" combine="interleave">
-    <optional>
-        <attribute name="anim:iterate-type">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="anim-iterate-attlist" combine="interleave">
-    <optional>
-        <attribute name="anim:iterate-interval">
-            <ref name="duration"/>
-        </attribute>
-    </optional>
-</define>
-<define name="animation-element" combine="choice">
-    <element name="anim:audio">
-        <ref name="common-anim-attlist"/>
-        <ref name="anim-audio-attlist"/>
-        <ref name="common-basic-timing-attlist"/>
-    </element>
-</define>
-<define name="anim-audio-attlist" combine="interleave">
-    <optional>
-        <attribute name="xlink:href">
-            <ref name="anyURI"/>
-        </attribute>
-    </optional>
-</define>
-<define name="anim-audio-attlist" combine="interleave">
-    <optional>
-        <attribute name="anim:audio-level">
-            <ref name="double"/>
-        </attribute>
-    </optional>
-</define>
-<define name="animation-element" combine="choice">
-    <element name="anim:command">
-        <ref name="common-anim-attlist"/>
-        <ref name="anim-command-attlist"/>
-        <ref name="common-begin-end-timing-attlist"/>
-        <ref name="common-anim-target-attlist"/>
-        <zeroOrMore>
-            <element name="anim:param">
-                <attribute name="anim:name"/>
-                <attribute name="anim:value"/>
-            </element>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="anim-command-attlist" combine="interleave">
-    <attribute name="anim:command">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="style-style">
-    <element name="style:style">
-        <ref name="style-style-attlist"/>
-        <ref name="style-style-content"/>
-        <zeroOrMore>
-            <ref name="style-map"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="style-style-attlist" combine="interleave">
-    <attribute name="style:name">
-        <ref name="styleName"/>
-    </attribute>
-</define>
-<define name="style-style-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:display-name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-style-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:parent-style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-style-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:next-style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-style-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:list-style-name">
-            <choice>
-                <ref name="styleName"/>
-                <empty/>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-style-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:master-page-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-style-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:auto-update" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-style-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:data-style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-style-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:class">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-style-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:default-outline-level">
-            <ref name="positiveInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-map">
-    <element name="style:map">
-        <ref name="style-map-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="style-map-attlist" combine="interleave">
-    <attribute name="style:condition">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="style-map-attlist" combine="interleave">
-    <attribute name="style:apply-style-name">
-        <ref name="styleNameRef"/>
-    </attribute>
-</define>
-<define name="style-map-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:base-cell-address">
-            <ref name="cellAddress"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-default-style">
-    <element name="style:default-style">
-        <ref name="style-style-content"/>
-    </element>
-</define>
-<define name="style-page-layout">
-    <element name="style:page-layout">
-        <ref name="style-page-layout-attlist"/>
-        <optional>
-            <ref name="style-page-layout-properties"/>
-        </optional>
-        <optional>
-            <ref name="style-header-style"/>
-        </optional>
-        <optional>
-            <ref name="style-footer-style"/>
-        </optional>
-    </element>
-</define>
-<define name="style-page-layout-attlist" combine="interleave">
-    <attribute name="style:name">
-        <ref name="styleName"/>
-    </attribute>
-</define>
-<define name="style-page-layout-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:page-usage" a:defaultValue="all">
-            <choice>
-                <value>all</value>
-                <value>left</value>
-                <value>right</value>
-                <value>mirrored</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-header-style">
-    <element name="style:header-style">
-        <optional>
-            <ref name="style-header-footer-properties"/>
-        </optional>
-    </element>
-</define>
-<define name="style-footer-style">
-    <element name="style:footer-style">
-        <optional>
-            <ref name="style-header-footer-properties"/>
-        </optional>
-    </element>
-</define>
-<define name="style-master-page">
-    <element name="style:master-page">
-        <ref name="style-master-page-attlist"/>
-        <optional>
-            <ref name="style-header"/>
-            <optional>
-                <ref name="style-header-left"/>
-            </optional>
-        </optional>
-        <optional>
-            <ref name="style-footer"/>
-            <optional>
-                <ref name="style-footer-left"/>
-            </optional>
-        </optional>
-        <optional>
-            <ref name="office-forms"/>
-        </optional>
-        <zeroOrMore>
-            <ref name="style-style"/>
-        </zeroOrMore>
-        <zeroOrMore>
-            <ref name="shape"/>
-        </zeroOrMore>
-        <optional>
-            <ref name="presentation-notes"/>
-        </optional>
-    </element>
-</define>
-<define name="style-master-page-attlist" combine="interleave">
-    <attribute name="style:name">
-        <ref name="styleName"/>
-    </attribute>
-</define>
-<define name="style-master-page-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:display-name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-master-page-attlist" combine="interleave">
-    <attribute name="style:page-layout-name">
-        <ref name="styleNameRef"/>
-    </attribute>
-</define>
-<define name="style-master-page-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-master-page-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:next-style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-header">
-    <element name="style:header">
-        <ref name="common-style-header-footer-attlist"/>
-        <ref name="header-footer-content"/>
-    </element>
-</define>
-<define name="style-footer">
-    <element name="style:footer">
-        <ref name="common-style-header-footer-attlist"/>
-        <ref name="header-footer-content"/>
-    </element>
-</define>
-<define name="style-header-left">
-    <element name="style:header-left">
-        <ref name="common-style-header-footer-attlist"/>
-        <ref name="header-footer-content"/>
-    </element>
-</define>
-<define name="style-footer-left">
-    <element name="style:footer-left">
-        <ref name="common-style-header-footer-attlist"/>
-        <ref name="header-footer-content"/>
-    </element>
-</define>
-<define name="header-footer-content">
-    <choice>
-        <group>
-            <ref name="text-tracked-changes"/>
-            <ref name="text-decls"/>
-            <zeroOrMore>
-                <choice>
-                    <ref name="text-h"/>
-                    <ref name="text-p"/>
-                    <ref name="text-list"/>
-                    <ref name="table-table"/>
-                    <ref name="text-section"/>
-                    <ref name="text-table-of-content"/>
-                    <ref name="text-illustration-index"/>
-                    <ref name="text-table-index"/>
-                    <ref name="text-object-index"/>
-                    <ref name="text-user-index"/>
-                    <ref name="text-alphabetical-index"/>
-                    <ref name="text-bibliography"/>
-                    <ref name="text-index-title"/>
-                    <ref name="change-marks"/>
-                </choice>
-            </zeroOrMore>
-        </group>
-        <group>
-            <optional>
-                <ref name="style-region-left"/>
-            </optional>
-            <optional>
-                <ref name="style-region-center"/>
-            </optional>
-            <optional>
-                <ref name="style-region-right"/>
-            </optional>
-        </group>
-    </choice>
-</define>
-<define name="common-style-header-footer-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:display" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-region-left">
-    <element name="style:region-left">
-        <ref name="region-content"/>
-    </element>
-</define>
-<define name="style-region-center">
-    <element name="style:region-center">
-        <ref name="region-content"/>
-    </element>
-</define>
-<define name="style-region-right">
-    <element name="style:region-right">
-        <ref name="region-content"/>
-    </element>
-</define>
-
-<define name="region-content">
-    <zeroOrMore>
-        <ref name="text-p"/>
-    </zeroOrMore>
-</define>
-<define name="presentation-notes">
-    <element name="presentation:notes">
-        <ref name="common-presentation-header-footer-attlist"/>
-        <ref name="presentation-notes-attlist"/>
-        <ref name="office-forms"/>
-        <zeroOrMore>
-            <ref name="shape"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="presentation-notes-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:page-layout-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="presentation-notes-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="table-table-template">
-    <element name="table:table-template">
-        <ref name="table-table-template-attlist"/>
-        <optional>
-            <ref name="table-first-row"/>
-        </optional>
-        <optional>
-            <ref name="table-last-row"/>
-        </optional>
-        <optional>
-            <ref name="table-first-column"/>
-        </optional>
-        <optional>
-            <ref name="table-last-column"/>
-        </optional>
-        <choice>
-            <ref name="table-body"/>
-            <group>
-                <ref name="table-even-rows"/>
-                <ref name="table-odd-rows"/>
-            </group>
-            <group>
-                <ref name="table-even-columns"/>
-                <ref name="table-odd-columns"/>
-            </group>
-        </choice>
-    </element>
-</define>
-<define name="table-table-template-attlist" combine="interleave">
-    <attribute name="text:name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="table-table-template-attlist" combine="interleave">
-    <attribute name="text:first-row-start-column">
-        <ref name="rowOrCol"/>
-    </attribute>
-</define>
-
-<define name="table-table-template-attlist" combine="interleave">
-    <attribute name="text:first-row-end-column">
-        <ref name="rowOrCol"/>
-    </attribute>
-</define>
-
-<define name="table-table-template-attlist" combine="interleave">
-    <attribute name="text:last-row-start-column">
-        <ref name="rowOrCol"/>
-    </attribute>
-</define>
-
-<define name="table-table-template-attlist" combine="interleave">
-    <attribute name="text:last-row-end-column">
-        <ref name="rowOrCol"/>
-    </attribute>
-</define>
-
-<define name="rowOrCol">
-    <choice>
-        <value>row</value>
-        <value>column</value>
-    </choice>
-</define>
-<define name="table-first-row">
-    <element name="table:first-row">
-        <ref name="common-table-template-attlist"/>
-        <empty/>
-    </element>
-</define>
-
-<define name="table-last-row">
-    <element name="table:last-row">
-        <ref name="common-table-template-attlist"/>
-        <empty/>
-    </element>
-</define>
-
-<define name="table-first-column">
-    <element name="table:first-column">
-        <ref name="common-table-template-attlist"/>
-        <empty/>
-    </element>
-</define>
-
-<define name="table-last-column">
-    <element name="table:last-column">
-        <ref name="common-table-template-attlist"/>
-        <empty/>
-    </element>
-</define>
-
-<define name="table-body">
-    <element name="table:body">
-        <ref name="common-table-template-attlist"/>
-        <empty/>
-    </element>
-</define>
-
-<define name="table-even-rows">
-    <element name="table:even-rows">
-        <ref name="common-table-template-attlist"/>
-        <empty/>
-    </element>
-</define>
-
-<define name="table-odd-rows">
-    <element name="table:odd-rows">
-        <ref name="common-table-template-attlist"/>
-        <empty/>
-    </element>
-</define>
-
-<define name="table-even-columns">
-    <element name="table:even-columns">
-        <ref name="common-table-template-attlist"/>
-        <empty/>
-    </element>
-</define>
-
-<define name="table-odd-columns">
-    <element name="table:odd-columns">
-        <ref name="common-table-template-attlist"/>
-        <empty/>
-    </element>
-</define>
-
-<define name="common-table-template-attlist" combine="interleave">
-    <attribute name="text:style-name">
-        <ref name="styleNameRef"/>
-    </attribute>
-    <attribute name="text:paragraph-style-name">
-        <optional>
-            <ref name="styleNameRef"/>
-        </optional>
-    </attribute>
-</define>
-<define name="style-font-face">
-    <element name="style:font-face">
-        <ref name="style-font-face-attlist"/>
-        <optional>
-            <ref name="svg-font-face-src"/>
-        </optional>
-        <optional>
-            <ref name="svg-definition-src"/>
-        </optional>
-    </element>
-</define>
-<define name="style-font-face-attlist" combine="interleave">
-    <optional>
-        <attribute name="svg:font-family">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:font-style">
-            <ref name="fontStyle"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:font-variant">
-            <ref name="fontVariant"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:font-weight">
-            <ref name="fontWeight"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:font-stretch">
-            <choice>
-                <value>normal</value>
-                <value>ultra-condensed</value>
-                <value>extra-condensed</value>
-                <value>condensed</value>
-                <value>semi-condensed</value>
-                <value>semi-expanded</value>
-                <value>expanded</value>
-                <value>extra-expanded</value>
-                <value>ultra-expanded</value>
-            </choice>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:font-size">
-            <ref name="positiveLength"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:unicode-range"/>
-    </optional>
-    <optional>
-        <attribute name="svg:units-per-em">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:panose-1"/>
-    </optional>
-    <optional>
-        <attribute name="svg:stemv">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:stemh">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:slope">
-            <ref name="integer"/>
-        </attribute>
-        </optional>
-    <optional>
-        <attribute name="svg:cap-height">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:x-height">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:accent-height">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:ascent">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:descent">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:widths"/>
-    </optional>
-    <optional>
-        <attribute name="svg:bbox"/>
-    </optional>
-    <optional>
-        <attribute name="svg:ideographic">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:alphabetic">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:mathematical">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:hanging">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:v-ideographic">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:v-alphabetic">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:v-mathematical">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:v-hanging">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:underline-position">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:underline-thickness">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:strikethrough-position">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:strikethrough-thickness">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:overline-position">
-            <ref name="integer"/>
-        </attribute>
-        </optional>
-    <optional>
-        <attribute name="svg:overline-thickness">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-</define>
-
-<define name="svg-font-face-src">
-    <element name="svg:font-face-src">
-        <oneOrMore>
-            <choice>
-                <ref name="svg-font-face-uri"/>
-                <ref name="svg-font-face-name"/>
-            </choice>
-        </oneOrMore>
-    </element>
-</define>
-
-<define name="svg-font-face-uri">
-    <element name="svg:font-face-uri">
-        <ref name="common-svg-font-face-xlink-attlist"/>
-        <zeroOrMore>
-            <ref name="svg-font-face-format"/>
-        </zeroOrMore>
-    </element>
-</define>
-
-<define name="svg-font-face-format">
-    <element name="svg:font-face-format">
-        <optional>
-            <attribute name="svg:string"/>
-        </optional>
-        <empty/>
-    </element>
-</define>
-<define name="svg-font-face-name">
-    <element name="svg:font-face-name">
-        <optional>
-            <attribute name="svg:name"/>
-        </optional>
-        <empty/>
-    </element>
-</define>
-
-<define name="svg-definition-src">
-    <element name="svg:definition-src">
-        <ref name="common-svg-font-face-xlink-attlist"/>
-    <empty/>
-    </element>
-</define>
-
-<define name="common-svg-font-face-xlink-attlist" combine="interleave">
-    <attribute name="xlink:href">
-        <ref name="anyURI"/>
-    </attribute>
-    <optional>
-        <attribute name="xlink:type" a:defaultValue="simple">
-            <value>simple</value>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="xlink:actuate" a:defaultValue="onRequest">
-            <value>onRequest</value>
-        </attribute>
-    </optional>
-</define>
-<define name="style-font-face-attlist" combine="interleave">
-    <attribute name="style:name">
-        <ref name="string"/>
-    </attribute>
-</define>
-<define name="style-font-face-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:font-adornments">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-font-face-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:font-family-generic">
-            <ref name="fontFamilyGeneric"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-font-face-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:font-pitch">
-            <ref name="fontPitch"/>
-        </attribute>
-    </optional>
-</define>
-
-<define name="style-font-face-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:font-charset">
-            <ref name="textEncoding"/>
-        </attribute>
-    </optional>
-</define>
-<define name="number-number-style">
-    <element name="number:number-style">
-        <ref name="common-data-style-attlist"/>
-        <optional>
-            <ref name="style-text-properties"/>
-        </optional>
-        <optional>
-            <ref name="number-text"/>
-        </optional>
-        <optional>
-            <ref name="any-number"/>
-            <optional>
-                <ref name="number-text"/>
-            </optional>
-        </optional>
-        <zeroOrMore>
-            <ref name="style-map"/>
-        </zeroOrMore>
-    </element>
-</define>
-
-<define name="any-number">
-    <choice>
-        <ref name="number-number"/>
-        <ref name="number-scientific-number"/>
-        <ref name="number-fraction"/>
-    </choice>
-</define>
-<define name="number-number">
-    <element name="number:number">
-        <ref name="number-number-attlist"/>
-        <ref name="common-decimal-places-attlist"/>
-        <ref name="common-number-attlist"/>
-        <zeroOrMore>
-            <ref name="number-embedded-text"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="number-number-attlist" combine="interleave">
-    <optional>
-        <attribute name="number:decimal-replacement"/>
-    </optional>
-</define>
-<define name="number-number-attlist" combine="interleave">
-    <optional>
-        <attribute name="number:display-factor" a:defaultValue="1">
-            <ref name="double"/>
-        </attribute>
-    </optional>
-</define>
-<define name="number-embedded-text">
-    <element name="number:embedded-text">
-        <ref name="number-embedded-text-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="number-embedded-text-attlist" combine="interleave">
-    <attribute name="number:position">
-        <ref name="integer"/>
-    </attribute>
-</define>
-<define name="number-scientific-number">
-    <element name="number:scientific-number">
-        <ref name="number-scientific-number-attlist"/>
-        <ref name="common-decimal-places-attlist"/>
-        <ref name="common-number-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="number-scientific-number-attlist" combine="interleave">
-    <optional>
-        <attribute name="number:min-exponent-digits">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-</define>
-<define name="number-fraction">
-    <element name="number:fraction">
-        <ref name="number-fraction-attlist"/>
-        <ref name="common-number-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="number-fraction-attlist" combine="interleave">
-    <optional>
-        <attribute name="number:min-numerator-digits">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-</define>
-<define name="number-fraction-attlist" combine="interleave">
-    <optional>
-        <attribute name="number:min-denominator-digits">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-</define>
-<define name="number-fraction-attlist" combine="interleave">
-    <optional>
-        <attribute name="number:denominator-value">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-</define>
-<define name="number-currency-style">
-    <element name="number:currency-style">
-        <ref name="common-data-style-attlist"/>
-        <ref name="common-auto-reorder-attlist"/>
-        <optional>
-            <ref name="style-text-properties"/>
-        </optional>
-        <optional>
-            <ref name="number-text"/>
-        </optional>
-        <optional>
-            <choice>
-                <group>
-                    <ref name="number-and-text"/>
-                    <optional>
-                        <ref name="currency-symbol-and-text"/>
-                    </optional>
-                </group>
-                <group>
-                    <ref name="currency-symbol-and-text"/>
-                    <optional>
-                        <ref name="number-and-text"/>
-                    </optional>
-                </group>
-            </choice>
-        </optional>
-        <zeroOrMore>
-            <ref name="style-map"/>
-        </zeroOrMore>
-    </element>
-</define>
-
-<define name="currency-symbol-and-text">
-    <ref name="number-currency-symbol"/>
-    <optional>
-        <ref name="number-text"/>
-    </optional>
-</define>
-<define name="number-and-text">
-    <ref name="number-number"/>
-    <optional>
-        <ref name="number-text"/>
-    </optional>
-</define>
-<define name="number-currency-symbol">
-    <element name="number:currency-symbol">
-        <ref name="number-currency-symbol-attlist"/>
-        <text/>
-    </element>
-</define>
-<define name="number-currency-symbol-attlist" combine="interleave">
-    <optional>
-        <attribute name="number:language">
-            <ref name="languageCode"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="number:country">
-            <ref name="countryCode"/>
-        </attribute>
-    </optional>
-</define>
-<define name="number-percentage-style">
-    <element name="number:percentage-style">
-        <ref name="common-data-style-attlist"/>
-        <optional>
-            <ref name="style-text-properties"/>
-        </optional>
-        <optional>
-            <ref name="number-text"/>
-        </optional>
-        <optional>
-            <ref name="number-and-text"/>
-        </optional>
-        <zeroOrMore>
-            <ref name="style-map"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="number-date-style">
-    <element name="number:date-style">
-        <ref name="common-data-style-attlist"/>
-        <ref name="common-auto-reorder-attlist"/>
-        <ref name="common-format-source-attlist"/>
-        <optional>
-            <ref name="style-text-properties"/>
-        </optional>
-        <!-- This DTD does not reflect the fact that some elements must not -->
-        <!-- occur more than once. -->
-        <optional>
-            <ref name="number-text"/>
-        </optional>
-        <oneOrMore>
-            <ref name="any-date"/>
-            <optional>
-                <ref name="number-text"/>
-            </optional>
-        </oneOrMore>
-        <zeroOrMore>
-            <ref name="style-map"/>
-        </zeroOrMore>
-    </element>
-</define>
-
-<define name="any-date">
-    <choice>
-        <ref name="number-day"/>
-        <ref name="number-month"/>
-        <ref name="number-year"/>
-        <ref name="number-era"/>
-        <ref name="number-day-of-week"/>
-        <ref name="number-week-of-year"/>
-        <ref name="number-quarter"/>
-        <ref name="number-hours"/>
-        <ref name="number-am-pm"/>
-        <ref name="number-minutes"/>
-        <ref name="number-seconds"/>
-    </choice>
-</define>
-<define name="number-day">
-    <element name="number:day">
-        <ref name="number-day-attlist"/>
-        <ref name="common-calendar-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="number-day-attlist" combine="interleave">
-    <optional>
-        <attribute name="number:style" a:defaultValue="short">
-            <choice>
-                <value>short</value>
-                <value>long</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="number-month">
-    <element name="number:month">
-        <ref name="number-month-attlist"/>
-        <ref name="common-calendar-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="number-month-attlist" combine="interleave">
-    <optional>
-        <attribute name="number:textual" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="number-month-attlist" combine="interleave">
-    <optional>
-        <attribute name="number:possessive-form" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="number-month-attlist" combine="interleave">
-    <optional>
-        <attribute name="number:style" a:defaultValue="short">
-            <choice>
-                <value>short</value>
-                <value>long</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="number-year">
-    <element name="number:year">
-        <ref name="number-year-attlist"/>
-        <ref name="common-calendar-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="number-year-attlist" combine="interleave">
-    <optional>
-        <attribute name="number:style" a:defaultValue="short">
-            <choice>
-                <value>short</value>
-                <value>long</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="number-era">
-    <element name="number:era">
-        <ref name="number-era-attlist"/>
-        <ref name="common-calendar-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="number-era-attlist" combine="interleave">
-    <optional>
-        <attribute name="number:style" a:defaultValue="short">
-            <choice>
-                <value>short</value>
-                <value>long</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="number-day-of-week">
-    <element name="number:day-of-week">
-        <ref name="number-day-of-week-attlist"/>
-        <ref name="common-calendar-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="number-day-of-week-attlist" combine="interleave">
-    <optional>
-        <attribute name="number:style" a:defaultValue="short">
-            <choice>
-                <value>short</value>
-                <value>long</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="number-week-of-year">
-    <element name="number:week-of-year">
-        <ref name="common-calendar-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="number-quarter">
-    <element name="number:quarter">
-        <ref name="number-quarter-attlist"/>
-        <ref name="common-calendar-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="number-quarter-attlist" combine="interleave">
-    <optional>
-        <attribute name="number:style" a:defaultValue="short">
-            <choice>
-                <value>short</value>
-                <value>long</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="number-time-style">
-    <element name="number:time-style">
-        <ref name="number-time-style-attlist"/>
-        <ref name="common-data-style-attlist"/>
-        <ref name="common-format-source-attlist"/>
-        <optional>
-            <ref name="style-text-properties"/>
-        </optional>
-        <!-- This DTD does not reflect the fact that some elements must not -->
-        <!-- occur more than once. -->
-        <optional>
-            <ref name="number-text"/>
-        </optional>
-        <oneOrMore>
-            <ref name="any-time"/>
-            <optional>
-                <ref name="number-text"/>
-            </optional>
-        </oneOrMore>
-        <zeroOrMore>
-            <ref name="style-map"/>
-        </zeroOrMore>
-    </element>
-</define>
-
-<define name="any-time">
-    <choice>
-        <ref name="number-hours"/>
-        <ref name="number-am-pm"/>
-        <ref name="number-minutes"/>
-        <ref name="number-seconds"/>
-    </choice>
-</define>
-<define name="number-time-style-attlist" combine="interleave">
-    <optional>
-        <attribute name="number:truncate-on-overflow" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="number-hours">
-    <element name="number:hours">
-        <ref name="number-hours-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="number-hours-attlist" combine="interleave">
-    <optional>
-        <attribute name="number:style" a:defaultValue="short">
-            <choice>
-                <value>short</value>
-                <value>long</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="number-minutes">
-    <element name="number:minutes">
-        <ref name="number-minutes-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="number-minutes-attlist" combine="interleave">
-    <optional>
-        <attribute name="number:style" a:defaultValue="short">
-            <choice>
-                <value>short</value>
-                <value>long</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="number-seconds">
-    <element name="number:seconds">
-        <ref name="number-seconds-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="number-seconds-attlist" combine="interleave">
-    <optional>
-        <attribute name="number:style" a:defaultValue="short">
-            <choice>
-                <value>short</value>
-                <value>long</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="number-seconds-attlist" combine="interleave">
-    <optional>
-        <attribute name="number:decimal-places" a:defaultValue="0">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-</define>
-<define name="number-am-pm">
-    <element name="number:am-pm">
-        <empty/>
-    </element>
-</define>
-<define name="number-boolean-style">
-    <element name="number:boolean-style">
-        <ref name="common-data-style-attlist"/>
-        <optional>
-            <ref name="style-text-properties"/>
-        </optional>
-        <optional>
-            <ref name="number-text"/>
-        </optional>
-        <optional>
-            <ref name="number-boolean"/>
-            <optional>
-                <ref name="number-text"/>
-            </optional>
-        </optional>
-        <zeroOrMore>
-            <ref name="style-map"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="number-boolean">
-    <element name="number:boolean">
-        <empty/>
-    </element>
-</define>
-<define name="number-text-style">
-    <element name="number:text-style">
-        <ref name="common-data-style-attlist"/>
-        <optional>
-            <ref name="style-text-properties"/>
-        </optional>
-        <optional>
-            <ref name="number-text"/>
-        </optional>
-        <zeroOrMore>
-            <ref name="number-text-content"/>
-            <optional>
-                <ref name="number-text"/>
-            </optional>
-        </zeroOrMore>
-        <zeroOrMore>
-            <ref name="style-map"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="number-text">
-    <element name="number:text">
-        <text/>
-    </element>
-</define>
-<define name="number-text-content">
-    <element name="number:text-content">
-        <empty/>
-    </element>
-</define>
-<define name="common-data-style-attlist" combine="interleave">
-    <attribute name="style:name">
-        <ref name="styleName"/>
-    </attribute>
-</define>
-<define name="style-data-style-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:display-name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-data-style-attlist" combine="interleave">
-    <optional>
-        <attribute name="number:language">
-            <ref name="languageCode"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-data-style-attlist" combine="interleave">
-    <optional>
-        <attribute name="number:country">
-            <ref name="countryCode"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-data-style-attlist" combine="interleave">
-    <optional>
-        <attribute name="number:title"/>
-    </optional>
-</define>
-<define name="common-data-style-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:volatile">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-auto-reorder-attlist" combine="interleave">
-    <optional>
-        <attribute name="number:automatic-order" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-format-source-attlist">
-    <optional>
-        <attribute name="number:format-source" a:defaultValue="fixed">
-            <choice>
-                <value>fixed</value>
-                <value>language</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="common-data-style-attlist" combine="interleave">
-    <optional>
-        <attribute name="number:transliteration-format" a:defaultValue="1">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-data-style-attlist" combine="interleave">
-    <optional>
-        <attribute name="number:transliteration-language">
-            <ref name="countryCode"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-data-style-attlist" combine="interleave">
-    <optional>
-        <attribute name="number:transliteration-country">
-            <ref name="countryCode"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-data-style-attlist" combine="interleave">
-    <optional>
-        <attribute name="number:transliteration-style" a:defaultValue="short">
-            <choice>
-                <value>short</value>
-                <value>medium</value>
-                <value>long</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="common-decimal-places-attlist">
-    <optional>
-        <attribute name="number:decimal-places">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-number-attlist" combine="interleave">
-    <optional>
-        <attribute name="number:min-integer-digits">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-number-attlist" combine="interleave">
-    <optional>
-        <attribute name="number:grouping" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-calendar-attlist" combine="interleave">
-    <optional>
-        <attribute name="number:calendar">
-            <choice>
-                <value>gregorian</value>
-                <value>gengou</value>
-                <value>ROC</value>
-                <value>hanja_yoil</value>
-                <value>hanja</value>
-                <value>hijri</value>
-                <value>jewish</value>
-                <value>buddhist</value>
-                <ref name="string"/>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-style-content" combine="choice">
-    <group>
-        <attribute name="style:family">
-            <value>text</value>
-        </attribute>
-        <optional>
-            <ref name="style-text-properties"/>
-        </optional>
-    </group>
-</define>
-<define name="style-style-content" combine="choice">
-    <group>
-        <attribute name="style:family">
-            <value>paragraph</value>
-        </attribute>
-        <optional>
-            <ref name="style-paragraph-properties"/>
-        </optional>
-        <optional>
-            <ref name="style-text-properties"/>
-        </optional>
-    </group>
-</define>
-<define name="style-style-content" combine="choice">
-    <group>
-        <attribute name="style:family">
-            <value>section</value>
-        </attribute>
-        <optional>
-            <ref name="style-section-properties"/>
-        </optional>
-    </group>
-</define>
-<define name="style-style-content" combine="choice">
-    <group>
-        <attribute name="style:family">
-            <value>ruby</value>
-        </attribute>
-        <optional>
-            <ref name="style-ruby-properties"/>
-        </optional>
-    </group>
-</define>
-<define name="text-linenumbering-configuration">
-    <element name="text:linenumbering-configuration">
-        <ref name="text-linenumbering-configuration-attlist"/>
-        <optional>
-            <ref name="text-linenumbering-separator"/>
-        </optional>
-    </element>
-</define>
-<define name="text-linenumbering-configuration-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:number-lines" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-linenumbering-configuration-attlist" combine="interleave">
-    <optional>
-        <ref name="common-num-format-attlist"/>
-    </optional>
-</define>
-<define name="text-linenumbering-configuration-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-linenumbering-configuration-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:increment">
-            <ref name="nonNegativeInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-linenumbering-configuration-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:number-position" a:defaultValue="left">
-            <choice>
-                <value>left</value>
-                <value>right</value>
-                <value>inner</value>
-                <value>outer</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="text-linenumbering-configuration-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:offset">
-            <ref name="nonNegativeLength"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-linenumbering-configuration-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:count-empty-lines" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-linenumbering-configuration-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:count-in-text-boxes" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-linenumbering-configuration-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:restart-on-page" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-linenumbering-separator">
-    <element name="text:linenumbering-separator">
-        <optional>
-            <attribute name="text:increment">
-                <ref name="nonNegativeInteger"/>
-            </attribute>
-        </optional>
-        <text/>
-    </element>
-</define>
-<define name="text-notes-configuration">
-    <element name="text:notes-configuration">
-        <ref name="text-notes-configuration-content"/>
-    </element>
-</define>
-<define name="text-notes-configuration-content" combine="interleave">
-    <ref name="text-note-class"/>
-</define>
-<define name="text-notes-configuration-content" combine="interleave">
-    <optional>
-        <attribute name="text:citation-style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-notes-configuration-content" combine="interleave">
-    <optional>
-        <attribute name="text:citation-body-style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-notes-configuration-content" combine="interleave">
-    <optional>
-        <attribute name="text:default-style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-notes-configuration-content" combine="interleave">
-    <optional>
-        <attribute name="text:master-page-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-notes-configuration-content" combine="interleave">
-    <optional>
-        <attribute name="text:start-value">
-            <ref name="nonNegativeInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-notes-configuration-content" combine="interleave">
-    <ref name="common-num-format-prefix-suffix-attlist"/>
-    <optional>
-        <ref name="common-num-format-attlist"/>
-    </optional>
-</define>
-<define name="text-notes-configuration-content" combine="interleave">
-    <optional>
-        <attribute name="text:start-numbering-at">
-            <choice>
-                <value>document</value>
-                <value>chapter</value>
-                <value>page</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="text-notes-configuration-content" combine="interleave">
-    <optional>
-        <attribute name="text:footnotes-position">
-            <choice>
-                <value>text</value>
-                <value>page</value>
-                <value>section</value>
-                <value>document</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="text-notes-configuration-content" combine="interleave">
-    <optional>
-        <element name="text:note-continuation-notice-forward">
-            <text/>
-        </element>
-    </optional>
-</define>
-<define name="text-notes-configuration-content" combine="interleave">
-    <optional>
-        <element name="text:note-continuation-notice-backward">
-            <text/>
-        </element>
-    </optional>
-</define>
-<define name="text-bibliography-configuration">
-    <element name="text:bibliography-configuration">
-        <ref name="text-bibliography-configuration-attlist"/>
-        <zeroOrMore>
-            <ref name="text-sort-key"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="text-bibliography-configuration-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:prefix">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="text:suffix">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-bibliography-configuration-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:numbered-entries" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-bibliography-configuration-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:sort-by-position" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="fo:language">
-            <ref name="languageCode"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="fo:country">
-            <ref name="countryCode"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="text:sort-algorithm">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-sort-key">
-    <element name="text:sort-key">
-        <ref name="text-sort-key-attlist"/>
-        <empty/>
-    </element>
-</define>
-
-<define name="text-sort-key-attlist" combine="interleave">
-    <attribute name="text:key">
-        <choice>
-            <value>address</value>
-            <value>annote</value>
-            <value>author</value>
-            <value>bibliography-type</value>
-            <value>booktitle</value>
-            <value>chapter</value>
-            <value>custom1</value>
-            <value>custom2</value>
-            <value>custom3</value>
-            <value>custom4</value>
-            <value>custom5</value>
-            <value>edition</value>
-            <value>editor</value>
-            <value>howpublished</value>
-            <value>identifier</value>
-            <value>institution</value>
-            <value>isbn</value>
-            <value>issn</value>
-            <value>journal</value>
-            <value>month</value>
-            <value>note</value>
-            <value>number</value>
-            <value>organizations</value>
-            <value>pages</value>
-            <value>publisher</value>
-            <value>report-type</value>
-            <value>school</value>
-            <value>series</value>
-            <value>title</value>
-            <value>url</value>
-            <value>volume</value>
-            <value>year</value>
-        </choice>
-    </attribute>
-    <optional>
-        <attribute name="text:sort-ascending" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-list-style">
-    <element name="text:list-style">
-        <ref name="text-list-style-attr"/>
-        <zeroOrMore>
-            <ref name="text-list-style-content"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="text-list-style-attr" combine="interleave">
-    <attribute name="style:name">
-        <ref name="styleName"/>
-    </attribute>
-</define>
-<define name="text-list-style-attr" combine="interleave">
-    <optional>
-        <attribute name="style:display-name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-list-style-attr" combine="interleave">
-    <optional>
-        <attribute name="text:consecutive-numbering" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-list-level-style-attr">
-    <attribute name="text:level">
-        <ref name="positiveInteger"/>
-    </attribute>
-</define>
-<define name="text-list-style-content" combine="choice">
-    <element name="text:list-level-style-number">
-        <ref name="text-list-level-style-attr"/>
-        <ref name="text-list-level-style-number-attr"/>
-        <optional>
-            <ref name="style-list-level-properties"/>
-        </optional>
-        <optional>
-            <ref name="style-text-properties"/>
-        </optional>
-    </element>
-</define>
-<define name="text-list-level-style-number-attr" combine="interleave">
-    <optional>
-        <attribute name="text:style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-list-level-style-number-attr" combine="interleave">
-    <ref name="common-num-format-attlist"/>
-    <ref name="common-num-format-prefix-suffix-attlist"/>
-</define>
-<define name="text-list-level-style-number-attr" combine="interleave">
-    <optional>
-        <attribute name="text:display-levels" a:defaultValue="1">
-            <ref name="positiveInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-list-level-style-number-attr" combine="interleave">
-    <optional>
-        <attribute name="text:start-value" a:defaultValue="1">
-            <ref name="positiveInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-list-style-content" combine="choice">
-    <element name="text:list-level-style-bullet">
-        <ref name="text-list-level-style-attr"/>
-        <ref name="text-list-level-style-bullet-attr"/>
-        <optional>
-            <ref name="style-list-level-properties"/>
-        </optional>
-        <optional>
-            <ref name="style-text-properties"/>
-        </optional>
-    </element>
-</define>
-<define name="text-list-level-style-bullet-attr" combine="interleave">
-    <optional>
-        <attribute name="text:style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-list-level-style-bullet-attr" combine="interleave">
-    <attribute name="text:bullet-char">
-        <ref name="character"/>
-    </attribute>
-</define>
-<define name="text-list-level-style-bullet-attr" combine="interleave">
-    <ref name="common-num-format-prefix-suffix-attlist"/>
-</define>
-<define name="text-list-level-style-bullet-attr" combine="interleave">
-    <optional>
-        <attribute name="text:bullet-relative-size">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-list-style-content" combine="choice">
-    <element name="text:list-level-style-image">
-        <ref name="text-list-level-style-attr"/>
-        <ref name="text-list-level-style-image-attr"/>
-        <optional>
-            <ref name="style-list-level-properties"/>
-        </optional>
-    </element>
-</define>
-<define name="text-list-level-style-image-attr" combine="interleave">
-    <choice>
-        <ref name="common-draw-data-attlist"/>
-        <ref name="office-binary-data"/>
-    </choice>
-</define>
-<define name="text-outline-style">
-    <element name="text:outline-style">
-        <oneOrMore>
-            <ref name="text-outline-level-style"/>
-        </oneOrMore>
-    </element>
-</define>
-<define name="text-outline-level-style">
-    <element name="text:outline-level-style">
-        <ref name="text-outline-level-style-attlist"/>
-        <optional>
-            <ref name="style-list-level-properties"/>
-        </optional>
-        <optional>
-            <ref name="style-text-properties"/>
-        </optional>
-    </element>
-</define>
-<define name="text-outline-level-style-attlist" combine="interleave">
-    <attribute name="text:level">
-        <ref name="positiveInteger"/>
-    </attribute>
-</define>
-<define name="text-outline-level-style-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-outline-level-style-attlist" combine="interleave">
-    <ref name="common-num-format-attlist"/>
-    <ref name="common-num-format-prefix-suffix-attlist"/>
-</define>
-<define name="text-outline-level-style-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:display-levels" a:defaultValue="1">
-            <ref name="positiveInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="text-outline-level-style-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:start-value" a:defaultValue="1">
-            <ref name="positiveInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-style-content" combine="choice">
-    <group>
-        <attribute name="style:family">
-            <value>table</value>
-        </attribute>
-        <optional>
-            <ref name="style-table-properties"/>
-        </optional>
-    </group>
-</define>
-<define name="style-style-content" combine="choice">
-    <group>
-        <attribute name="style:family">
-            <value>table-column</value>
-        </attribute>
-        <optional>
-            <ref name="style-table-column-properties"/>
-        </optional>
-    </group>
-</define>
-<define name="style-style-content" combine="choice">
-    <group>
-        <attribute name="style:family">
-            <value>table-row</value>
-        </attribute>
-        <optional>
-            <ref name="style-table-row-properties"/>
-        </optional>
-    </group>
-</define>
-<define name="style-style-content" combine="choice">
-    <group>
-        <attribute name="style:family">
-            <value>table-cell</value>
-        </attribute>
-        <optional>
-            <ref name="style-table-cell-properties"/>
-        </optional>
-        <optional>
-            <ref name="style-paragraph-properties"/>
-        </optional>
-        <optional>
-            <ref name="style-text-properties"/>
-        </optional>
-    </group>
-</define>
-<define name="style-style-content" combine="choice">
-    <group>
-        <attribute name="style:family">
-            <choice>
-                <value>graphic</value>
-                <value>presentation</value>
-            </choice>
-        </attribute>
-        <optional>
-            <ref name="style-graphic-properties"/>
-        </optional>
-        <optional>
-            <ref name="style-paragraph-properties"/>
-        </optional>
-        <optional>
-            <ref name="style-text-properties"/>
-        </optional>
-    </group>
-</define>
-
-<define name="style-graphic-properties">
-    <element name="style:graphic-properties">
-        <ref name="style-graphic-properties-content"/>
-    </element>
-</define>
-
-<define name="style-graphic-properties-content">
-    <ref name="style-properties-content"/>
-</define>
-
-<define name="style-graphic-properties-content-strict">
-    <ref name="style-graphic-properties-attlist"/>
-    <ref name="style-graphic-fill-properties-attlist"/>
-    <ref name="style-graphic-properties-elements"/>
-</define>
-
-<define name=" style-graphic-properties-elements">
-    <empty/>
-</define>
-<define name="style-style-content" combine="choice">
-    <group>
-        <attribute name="style:family">
-            <value>drawing-page</value>
-        </attribute>
-        <optional>
-            <ref name="style-drawing-page-properties"/>
-        </optional>
-    </group>
-</define>
-
-<define name="style-drawing-page-properties">
-    <element name="style:drawing-page-properties">
-        <ref name="style-drawing-page-properties-content"/>
-    </element>
-</define>
-
-<define name="style-drawing-page-properties-content">
-    <ref name="style-properties-content"/>
-</define>
-
-<define name="style-drawing-page-properties-content-strict">
-    <ref name="style-graphic-fill-properties-attlist"/>
-    <ref name="style-drawing-page-properties-attlist"/>
-    <ref name="style-drawing-page-properties-elements"/>
-</define>
-<define name="draw-gradient">
-    <element name="draw:gradient">
-        <ref name="common-draw-gradient-attlist"/>
-        <ref name="draw-gradient-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="common-draw-gradient-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:name">
-            <ref name="styleName"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-draw-gradient-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:display-name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-draw-gradient-attlist" combine="interleave">
-    <attribute name="draw:style">
-        <ref name="gradient-style"/>
-    </attribute>
-</define>
-<define name="gradient-style">
-    <choice>
-        <value>linear</value>
-        <value>axial</value>
-        <value>radial</value>
-        <value>ellipsoid</value>
-        <value>square</value>
-        <value>rectangular</value>
-    </choice>
-</define>
-<define name="common-draw-gradient-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:cx">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="draw:cy">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-gradient-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:start-color">
-            <ref name="color"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="draw:end-color">
-            <ref name="color"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-gradient-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:start-intensity">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="draw:end-intensity">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-draw-gradient-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:angle">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-</define>
-<define name="common-draw-gradient-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:border">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-</define>
-<define name="svg-linearGradient">
-    <element name="svg:linearGradient">
-        <ref name="common-svg-gradient-attlist"/>
-        <optional>
-            <attribute name="svg:x1" a:defaultValue="0%">
-                <choice>
-                    <ref name="coordinate"/>
-                    <ref name="percent"/>
-                </choice>                
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="svg:y1" a:defaultValue="0%">
-                <choice>
-                    <ref name="coordinate"/>
-                    <ref name="percent"/>
-                </choice>                
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="svg:x2" a:defaultValue="100%">
-                <choice>
-                    <ref name="coordinate"/>
-                    <ref name="percent"/>
-                </choice>                
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="svg:y2" a:defaultValue="100%">
-                <choice>
-                    <ref name="coordinate"/>
-                    <ref name="percent"/>
-                </choice>                
-            </attribute>
-        </optional>
-        <zeroOrMore>
-            <ref name="svg-stop"/>
-        </zeroOrMore>
-    </element>
-</define>
-
-<define name="svg-radialGradient">
-    <element name="svg:radialGradient">
-        <ref name="common-svg-gradient-attlist"/>
-        <optional>
-            <attribute name="svg:cx" a:defaultValue="50%">
-                <choice>
-                    <ref name="coordinate"/>
-                    <ref name="percent"/>
-                </choice>                
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="svg:cy" a:defaultValue="50%">
-                <choice>
-                    <ref name="coordinate"/>
-                    <ref name="percent"/>
-                </choice>                
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="svg:r" a:defaultValue="50%">
-                <choice>
-                    <ref name="coordinate"/>
-                    <ref name="percent"/>
-                </choice>                
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="svg:fx">
-                <choice>
-                    <ref name="coordinate"/>
-                    <ref name="percent"/>
-                </choice>                
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="svg:fy">
-                <choice>
-                    <ref name="coordinate"/>
-                    <ref name="percent"/>
-                </choice>                
-            </attribute>
-        </optional>
-        <zeroOrMore>
-            <ref name="svg-stop"/>
-        </zeroOrMore>
-    </element>
-</define>
-
-<define name="svg-stop">
-    <element name="svg:stop">
-        <attribute name="svg:offset">
-            <choice>
-                <ref name="double"/>
-                <ref name="percent"/>
-            </choice>
-        </attribute>
-        <optional>
-            <attribute name="svg:stop-color">
-                <ref name="color"/>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="svg:stop-opacity">
-                <ref name="double"/>
-            </attribute>
-        </optional>
-    </element>
-</define>
-
-<define name="common-svg-gradient-attlist" combine="interleave">
-    <optional>
-        <attribute name="svg:gradientUnits" a:defaultValue="objectBoundingBox">
-            <value>objectBoundingBox</value>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:gradientTransform">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:spreadMethod" a:defaultValue="pad">
-            <choice>
-                <value>pad</value>
-                <value>reflect</value>
-                <value>repeat</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="common-svg-gradient-attlist" combine="interleave">
-    <attribute name="draw:name">
-        <ref name="styleName"/>
-    </attribute>
-</define>
-<define name="common-svg-gradient-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:display-name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-hatch">
-    <element name="draw:hatch">
-        <ref name="draw-hatch-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="draw-hatch-attlist" combine="interleave">
-    <attribute name="draw:name">
-        <ref name="styleName"/>
-    </attribute>
-</define>
-<define name="draw-hatch-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:display-name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-hatch-attlist" combine="interleave">
-    <attribute name="draw:style">
-        <choice>
-            <value>single</value>
-            <value>double</value>
-            <value>triple</value>
-        </choice>
-    </attribute>
-</define>
-<define name="draw-hatch-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:color">
-            <ref name="color"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-hatch-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:distance">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-hatch-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:rotation">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-fill-image">
-    <element name="draw:fill-image">
-        <ref name="draw-fill-image-attlist"/>
-        <attribute name="xlink:href">
-            <ref name="anyURI"/>
-        </attribute>
-        <optional>
-            <attribute name="xlink:type" a:defaultValue="simple">
-                <choice>
-                    <value>simple</value>
-                </choice>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="xlink:show" a:defaultValue="embed">
-                <choice>
-                    <value>embed</value>
-                </choice>
-            </attribute>
-        </optional>
-        <optional>
-            <attribute name="xlink:actuate" a:defaultValue="onLoad">
-                <choice>
-                    <value>onLoad</value>
-                </choice>
-            </attribute>
-        </optional>
-        <empty/>
-    </element>
-</define>
-<define name="draw-fill-image-attlist" combine="interleave">
-    <attribute name="draw:name">
-        <ref name="styleName"/>
-    </attribute>
-</define>
-<define name="draw-fill-image-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:display-name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-fill-image-attlist" combine="interleave">
-    <optional>
-        <attribute name="svg:width">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:height">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-opacity">
-    <element name="draw:opacity">
-        <ref name="common-draw-gradient-attlist"/>
-        <ref name="draw-opacity-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="draw-opacity-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:start">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="draw:end">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-marker">
-    <element name="draw:marker">
-        <ref name="draw-marker-attlist"/>
-        <ref name="common-draw-viewbox-attlist"/>
-        <ref name="common-draw-path-data-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="draw-marker-attlist" combine="interleave">
-    <attribute name="draw:name">
-        <ref name="styleName"/>
-    </attribute>
-</define>
-<define name="draw-marker-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:display-name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-stroke-dash">
-    <element name="draw:stroke-dash">
-        <ref name="draw-stroke-dash-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="draw-stroke-dash-attlist" combine="interleave">
-    <attribute name="draw:name">
-        <ref name="styleName"/>
-    </attribute>
-</define>
-<define name="draw-stroke-dash-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:display-name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-stroke-dash-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:style">
-            <choice>
-                <value>rect</value>
-                <value>round</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-stroke-dash-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:dots1">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="draw:dots1-length">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="draw:dots2">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="draw:dots2-length">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="draw-stroke-dash-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:distance">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-presentation-page-layout">
-    <element name="style:presentation-page-layout">
-        <attribute name="style:name">
-            <ref name="styleName"/>
-        </attribute>
-        <optional>
-            <attribute name="style:display-name">
-                <ref name="string"/>
-            </attribute>
-        </optional>
-        <zeroOrMore>
-            <ref name="presentation-placeholder"/>
-        </zeroOrMore>
-    </element>
-</define>
-<define name="presentation-placeholder">
-    <element name="presentation:placeholder">
-        <attribute name="presentation:object">
-            <ref name="presentation-classes"/>
-        </attribute>
-        <attribute name="svg:x">
-            <choice>
-                <ref name="coordinate"/>
-                <ref name="percent"/>
-            </choice>
-        </attribute>
-        <attribute name="svg:y">
-            <choice>
-                <ref name="coordinate"/>
-                <ref name="percent"/>
-            </choice>
-        </attribute>
-        <attribute name="svg:width">
-            <choice>
-                <ref name="length"/>
-                <ref name="percent"/>
-            </choice>
-        </attribute>
-        <attribute name="svg:height">
-            <choice>
-                <ref name="length"/>
-                <ref name="percent"/>
-            </choice>
-        </attribute>
-        <empty/>
-    </element>
-</define>
-<define name="style-style-content" combine="choice">
-    <group>
-        <attribute name="style:family">
-            <value>chart</value>
-        </attribute>
-        <optional>
-            <ref name="style-chart-properties"/>
-        </optional>
-        <optional>
-            <ref name="style-graphic-properties"/>
-        </optional>
-        <optional>
-            <ref name="style-paragraph-properties"/>
-        </optional>
-        <optional>
-            <ref name="style-text-properties"/>
-        </optional>
-    </group>
-</define>
-<define name="style-properties-content">
-    <ref name="anyAttListOrElements"/>
-</define>
-<define name="style-page-layout-properties">
-    <element name="style:page-layout-properties">
-        <ref name="style-page-layout-properties-content"/>
-    </element>
-</define>
-
-<define name="style-page-layout-properties-content">
-    <ref name="style-properties-content"/>
-</define>
-
-<define name="style-page-layout-properties-content-strict">
-    <ref name="style-page-layout-properties-attlist"/>
-    <ref name="style-page-layout-properties-elements"/>
-</define>
-<define name="style-page-layout-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:page-width">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="fo:page-height">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-page-layout-properties-attlist" combine="interleave">
-    <optional>
-        <ref name="common-num-format-attlist"/>
-    </optional>
-    <ref name="common-num-format-prefix-suffix-attlist"/>
-</define>
-<define name="style-page-layout-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:paper-tray-name">
-            <choice>
-                <value>default</value>
-                <ref name="string"/>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-page-layout-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:print-orientation">
-            <choice>
-                <value>portrait</value>
-                <value>landscape</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-page-layout-properties-attlist" combine="interleave">
-    <ref name="common-horizontal-margin-attlist"/>
-    <ref name="common-vertical-margin-attlist"/>
-    <ref name="common-margin-attlist"/>
-</define>
-<define name="style-page-layout-properties-attlist" combine="interleave">
-    <ref name="common-border-attlist"/>
-</define>
-<define name="style-page-layout-properties-attlist" combine="interleave">
-    <ref name="common-border-line-width-attlist"/>
-</define>
-<define name="style-page-layout-properties-attlist" combine="interleave">
-    <ref name="common-padding-attlist"/>
-</define>
-<define name="style-page-layout-properties-attlist" combine="interleave">
-    <ref name="common-shadow-attlist"/>
-</define>
-<define name="style-page-layout-properties-attlist" combine="interleave">
-    <ref name="common-background-color-attlist"/>
-</define>
-<define name="style-page-layout-properties-elements" combine="interleave">
-    <ref name="style-background-image"/>
-</define>
-<define name="style-page-layout-properties-elements" combine="interleave">
-    <ref name="style-columns"/>
-</define>
-<define name="style-page-layout-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:register-truth-ref-style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-page-layout-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:print">
-            <list>
-                <zeroOrMore>
-                    <choice>
-                        <value>headers</value>
-                        <value>grid</value>
-                        <value>annotations</value>
-                        <value>objects</value>
-                        <value>charts</value>
-                        <value>drawings</value>
-                        <value>formulas</value>
-                        <value>zero-values</value>
-                    </choice>
-                </zeroOrMore>
-            </list>
-        </attribute>
-    </optional>
-</define>
-<define name="style-page-layout-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:print-page-order">
-            <choice>
-                <value>ttb</value>
-                <value>ltr</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-page-layout-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:first-page-number">
-            <choice>
-                <ref name="positiveInteger"/>
-                <value>continue</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-page-layout-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:scale-to">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:scale-to-pages">
-            <ref name="positiveInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-page-layout-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:table-centering">
-            <choice>
-                <value>horizontal</value>
-                <value>vertical</value>
-                <value>both</value>
-                <value>none</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-page-layout-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:footnote-max-height">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-page-layout-properties-attlist" combine="interleave">
-    <ref name="common-writing-mode-attlist"/>
-</define>
-<define name="style-page-layout-properties-elements" combine="interleave">
-    <ref name="style-footnote-sep"/>
-</define>
-
-<define name="style-footnote-sep">
-    <optional>
-        <element name="style:footnote-sep">
-            <ref name="style-footnote-sep-attlist"/>
-            <empty/>
-        </element>
-    </optional>
-</define>
-<define name="style-footnote-sep-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:width">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:rel-width">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:color">
-            <ref name="color"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:line-style">
-            <ref name="lineStyle"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:adjustment" a:defaultValue="left">
-            <choice>
-                <value>left</value>
-                <value>center</value>
-                <value>right</value>
-            </choice>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:distance-before-sep">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:distance-after-sep">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-page-layout-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:layout-grid-mode">
-            <choice>
-                <value>none</value>
-                <value>line</value>
-                <value>both</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-page-layout-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:layout-grid-base-height">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-page-layout-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:layout-grid-ruby-height">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-page-layout-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:layout-grid-lines">
-            <ref name="positiveInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-page-layout-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:layout-grid-color">
-            <ref name="color"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-page-layout-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:layout-grid-ruby-below">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-page-layout-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:layout-grid-print">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-page-layout-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:layout-grid-display">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-header-footer-properties">
-    <element name="style:header-footer-properties">
-        <ref name="style-header-footer-properties-content"/>
-    </element>
-</define>
-
-<define name="style-header-footer-properties-content">
-    <ref name="style-properties-content"/>
-</define>
-
-<define name="style-header-footer-properties-content-strict">
-        <ref name="style-header-footer-properties-attlist"/>
-        <ref name="style-header-footer-properties-elements"/>
-</define>
-<define name="style-header-footer-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="svg:height">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="fo:min-height">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-header-footer-properties-attlist" combine="interleave">
-    <ref name="common-horizontal-margin-attlist"/>
-    <ref name="common-vertical-margin-attlist"/>
-    <ref name="common-margin-attlist"/>
-</define>
-<define name="style-header-footer-properties-attlist" combine="interleave">
-    <ref name="common-border-attlist"/>
-</define>
-<define name="style-header-footer-properties-attlist" combine="interleave">
-    <ref name="common-border-line-width-attlist"/>
-</define>
-<define name="style-header-footer-properties-attlist" combine="interleave">
-    <ref name="common-padding-attlist"/>
-</define>
-<define name="style-header-footer-properties-attlist" combine="interleave">
-    <ref name="common-background-color-attlist"/>
-</define>
-<define name="style-header-footer-properties-elements" combine="interleave">
-    <ref name="style-background-image"/>
-</define>
-<define name="style-header-footer-properties-attlist" combine="interleave">
-    <ref name="common-shadow-attlist"/>
-</define>
-<define name="style-header-footer-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:dynamic-spacing">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties">
-    <element name="style:text-properties">
-        <ref name="style-text-properties-content"/>
-    </element>
-</define>
-
-<define name="style-text-properties-content">
-    <ref name="style-properties-content"/>
-</define>
-
-<define name="style-text-properties-content-strict">
-    <ref name="style-text-properties-attlist"/>
-    <ref name="style-text-properties-elements"/>
-</define>
-
-<define name="style-text-properties-elements">
-    <empty/>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:font-variant">
-            <ref name="fontVariant"/>
-        </attribute>
-    </optional>
-</define>
-
-<define name="fontVariant">
-    <choice>
-        <value>normal</value>
-        <value>small-caps</value>
-    </choice>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:text-transform">
-            <choice>
-                <value>none</value>
-                <value>lowercase</value>
-                <value>uppercase</value>
-                <value>capitalize</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-            <attribute name="fo:color">
-            <ref name="color"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:use-window-font-color">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:text-outline">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:text-line-through-type">
-            <ref name="lineType"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:text-line-through-style">
-            <ref name="lineStyle"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:text-line-through-width">
-            <ref name="lineWidth"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:text-line-through-color">
-            <choice>
-                <value>font-color</value>
-                <ref name="color"/>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:text-line-through-text">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:text-line-through-text-style">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:text-position">
-            <list>
-                <choice>
-                    <ref name="percent"/>
-                    <value>super</value>
-                    <value>sub</value>
-                </choice>
-                <optional>
-                    <ref name="percent"/>
-                </optional>
-            </list>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:font-name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:font-name-asian">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:font-name-complex">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:font-family">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:font-family-asian">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:font-family-complex">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:font-family-generic">
-            <ref name="fontFamilyGeneric"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:font-family-generic-asian">
-            <ref name="fontFamilyGeneric"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:font-family-generic-complex">
-            <ref name="fontFamilyGeneric"/>
-        </attribute>
-    </optional>
-</define>
-
-<define name="fontFamilyGeneric">
-    <choice>
-        <value>roman</value>
-        <value>swiss</value>
-        <value>modern</value>
-        <value>decorative</value>
-        <value>script</value>
-        <value>system</value>
-    </choice>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:font-style-name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:font-style-name-asian">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:font-style-name-complex">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:font-pitch">
-            <ref name="fontPitch"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:font-pitch-asian">
-            <ref name="fontPitch"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:font-pitch-complex">
-            <ref name="fontPitch"/>
-        </attribute>
-    </optional>
-</define>
-
-<define name="fontPitch">
-    <choice>
-        <value>fixed</value>
-        <value>variable</value>
-    </choice>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:font-charset">
-            <ref name="textEncoding"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:font-charset-asian">
-            <ref name="textEncoding"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:font-charset-complex">
-            <ref name="textEncoding"/>
-        </attribute>
-    </optional>
-</define>
-
-<define name="textEncoding">
-    <data type="string">
-        <param name="pattern">[A-Za-z][A-Za-z0-9._\-]*</param>
-    </data>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:font-size">
-            <choice>
-                <ref name="positiveLength"/>
-                <ref name="percent"/>
-            </choice>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:font-size-asian">
-            <choice>
-                <ref name="positiveLength"/>
-                <ref name="percent"/>
-            </choice>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:font-size-complex">
-            <choice>
-                <ref name="positiveLength"/>
-                <ref name="percent"/>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:font-size-rel">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:font-size-rel-asian">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:font-size-rel-complex">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:script-type">
-            <choice>
-                <value>latin</value>
-                <value>asian</value>
-                <value>complex</value>
-                <value>ignore</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:letter-spacing">
-            <choice>
-                <ref name="length"/>
-                <value>normal</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:language">
-            <ref name="languageCode"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:language-asian">
-            <ref name="languageCode"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:language-complex">
-            <ref name="languageCode"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:country">
-            <ref name="countryCode"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:country-asian">
-            <ref name="countryCode"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:country-complex">
-            <ref name="countryCode"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:font-style">
-            <ref name="fontStyle"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:font-style-asian">
-            <ref name="fontStyle"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:font-style-complex">
-            <ref name="fontStyle"/>
-        </attribute>
-    </optional>
-</define>
-
-<define name="fontStyle">
-    <choice>
-        <value>normal</value>
-        <value>italic</value>
-        <value>oblique</value>
-    </choice>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:font-relief">
-            <choice>
-            <value>none</value>
-                <value>embossed</value>
-                <value>engraved</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:text-shadow">
-            <ref name="shadowType"/>
-        </attribute>
-    </optional>
-</define>
-
-<define name="shadowType">
-    <choice>
-        <value>none</value>
-        <!-- The following string must match an XSL shadow decl -->
-        <ref name="string"/>
-    </choice>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:text-underline-type">
-            <ref name="lineType"/>
-        </attribute>
-    </optional>
-</define>
-
-<define name="lineType">
-    <choice>
-        <value>none</value>
-        <value>single</value>
-        <value>double</value>
-    </choice>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:text-underline-style">
-            <ref name="lineStyle"/>
-        </attribute>
-    </optional>
-</define>
-
-<define name="lineStyle">
-    <choice>
-        <value>none</value>
-        <value>solid</value>
-        <value>dotted</value>
-        <value>dash</value>
-        <value>long-dash</value>
-        <value>dot-dash</value>
-        <value>dot-dot-dash</value>
-        <value>wave</value>
-    </choice>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:text-underline-width">
-            <ref name="lineWidth"/>
-        </attribute>
-    </optional>
-</define>
-
-<define name="lineWidth">
-    <choice>
-        <value>auto</value>
-        <value>normal</value>
-        <value>bold</value>
-        <value>thin</value>
-        <value>dash</value>
-        <value>medium</value>
-        <value>thick</value>
-        <ref name="positiveInteger"/>
-        <ref name="percent"/>
-        <ref name="positiveLength"/>
-    </choice>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:text-underline-color">
-            <choice>
-                <value>font-color</value>
-                <ref name="color"/>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:font-weight">
-            <ref name="fontWeight"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:font-weight-asian">
-            <ref name="fontWeight"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:font-weight-complex">
-            <ref name="fontWeight"/>
-        </attribute>
-    </optional>
-</define>
-
-<define name="fontWeight">
-    <choice>
-        <value>normal</value>
-        <value>bold</value>
-        <value>100</value>
-        <value>200</value>
-        <value>300</value>
-        <value>400</value>
-        <value>500</value>
-        <value>600</value>
-        <value>700</value>
-        <value>800</value>
-        <value>900</value>
-    </choice>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:text-underline-mode">
-            <ref name="lineMode"/>
-        </attribute>
-    </optional>
-</define>
-
-<define name="lineMode">
-    <choice>
-        <value>continuous</value>
-        <value>skip-white-space</value>
-    </choice>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:text-line-through-mode">
-            <ref name="lineMode"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:letter-kerning">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:text-blinking">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <ref name="common-background-color-attlist"/>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:text-combine">
-            <choice>
-                <value>none</value>
-                <value>letters</value>
-                <value>lines</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:text-combine-start-char">
-            <ref name="character"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:text-combine-end-char">
-            <ref name="character"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:text-emphasize">
-            <choice>
-                <value>none</value>
-                <list>
-                    <choice>
-                        <value>none</value>
-                        <value>accent</value>
-                        <value>dot</value>
-                        <value>circle</value>
-                        <value>disc</value>
-                    </choice>
-                    <choice>
-                        <value>above</value>
-                        <value>below</value>
-                    </choice>
-                </list>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:text-scale">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:text-rotation-angle">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:text-rotation-scale">
-            <choice>
-                <value>fixed</value>
-                <value>line-height</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:hyphenate">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:hyphenation-remain-char-count">
-            <ref name="positiveInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:hyphenation-push-char-count">
-            <ref name="positiveInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-text-properties-attlist" combine="interleave">
-    <choice>
-        <attribute name="text:display">
-            <value>true</value>
-        </attribute>
-        <attribute name="text:display">
-            <value>none</value>
-        </attribute>
-        <group>
-            <attribute name="text:display">
-                <value>condition</value>
-            </attribute>
-            <attribute name="text:condition">
-                <value>none</value>
-            </attribute>
-        </group>
-        <empty/>
-    </choice>
-</define>
-<define name="style-paragraph-properties">
-    <element name="style:paragraph-properties">
-        <ref name="style-paragraph-properties-content"/>
-    </element>
-</define>
-
-<define name="style-paragraph-properties-content">
-    <ref name="style-properties-content"/>
-</define>
-
-<define name="style-paragraph-properties-content-strict">
-    <ref name="style-paragraph-properties-attlist"/>
-    <ref name="style-paragraph-properties-elements"/>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:line-height">
-            <choice>
-                <value>normal</value>
-                <ref name="nonNegativeLength"/>
-                <ref name="percent"/>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:line-height-at-least">
-            <ref name="nonNegativeLength"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:line-spacing">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:font-independent-line-spacing">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <ref name="common-text-align"/>
-</define>
-
-<define name="common-text-align">
-    <optional>
-        <attribute name="fo:text-align">
-            <choice>
-                <value>start</value>
-                <value>end</value>
-                <value>left</value>
-                <value>right</value>
-                <value>center</value>
-                <value>justify</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:text-align-last">
-            <choice>
-                <value>start</value>
-                <value>center</value>
-                <value>justify</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:justify-single-word">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:keep-together">
-            <choice>
-                <value>auto</value>
-                <value>always</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:widows">
-            <ref name="nonNegativeInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:orphans">
-            <ref name="nonNegativeInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-elements" combine="interleave">
-    <ref name="style-tab-stops"/>
-</define>
-
-<define name="style-tab-stops">
-    <optional>
-        <element name="style:tab-stops">
-            <zeroOrMore>
-                <ref name="style-tab-stop"/>
-            </zeroOrMore>
-        </element>
-    </optional>
-</define>
-
-<define name="style-tab-stop">
-    <element name="style:tab-stop">
-        <ref name="style-tab-stop-attlist"/>
-        <empty/>
-    </element>
-</define>
-<define name="style-tab-stop-attlist" combine="interleave">
-    <attribute name="style:position">
-        <ref name="nonNegativeLength"/>
-    </attribute>
-</define>
-<define name="style-tab-stop-attlist" combine="interleave">
-    <choice>
-        <optional>
-            <attribute name="style:type" a:defaultValue="left">
-                <choice>
-                    <value>left</value>
-                    <value>center</value>
-                    <value>right</value>
-                </choice>
-            </attribute>
-        </optional>
-        <group>
-            <attribute name="style:type">
-                <value>char</value>
-            </attribute>
-            <ref name="style-tab-stop-char-attlist"/>
-        </group>
-    </choice>
-</define>
-<define name="style-tab-stop-char-attlist" combine="interleave">
-    <attribute name="style:char">
-        <ref name="character"/>
-    </attribute>
-</define>
-<define name="style-tab-stop-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:leader-type">
-            <ref name="lineType"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-tab-stop-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:leader-style">
-            <ref name="lineStyle"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-tab-stop-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:leader-width">
-            <ref name="lineWidth"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-tab-stop-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:leader-color">
-            <choice>
-                <value>font-color</value>
-                <ref name="color"/>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-tab-stop-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:leader-text" a:defaultValue=" ">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-tab-stop-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:leader-text-style">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:tab-stop-distance">
-            <ref name="nonNegativeLength"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:hyphenation-keep">
-            <choice>
-                <value>auto</value>
-                <value>page</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:hyphenation-ladder-count">
-            <choice>
-                <value>no-limit</value>
-                <ref name="positiveInteger"/>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-elements" combine="interleave">
-    <ref name="style-drop-cap"/>
-</define>
-
-<define name="style-drop-cap">
-    <optional>
-        <element name="style:drop-cap">
-            <ref name="style-drop-cap-attlist"/>
-            <empty/>
-        </element>
-    </optional>
-</define>
-<define name="style-drop-cap-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:length" a:defaultValue="1">
-            <choice>
-                <value>word</value>
-                <ref name="positiveInteger"/>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-drop-cap-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:lines" a:defaultValue="1">
-            <ref name="positiveInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-drop-cap-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:distance" a:defaultValue="0cm">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-drop-cap-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:style-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-        <optional>
-            <attribute name="style:register-true">
-                <ref name="boolean"/>
-            </attribute>
-        </optional>
-    </define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <ref name="common-horizontal-margin-attlist"/>
-</define>
-
-<define name="common-horizontal-margin-attlist">
-    <optional>
-        <attribute name="fo:margin-left">
-            <choice>
-                <ref name="length"/>
-                <ref name="percent"/>
-            </choice>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="fo:margin-right">
-            <choice>
-                <ref name="length"/>
-                <ref name="percent"/>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:text-indent">
-            <choice>
-                <ref name="length"/>
-                <ref name="percent"/>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:auto-text-indent">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <ref name="common-vertical-margin-attlist"/>
-</define>
-
-<define name="common-vertical-margin-attlist">
-    <optional>
-        <attribute name="fo:margin-top">
-            <choice>
-                <ref name="nonNegativeLength"/>
-                <ref name="percent"/>
-            </choice>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="fo:margin-bottom">
-            <choice>
-                <ref name="nonNegativeLength"/>
-                <ref name="percent"/>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <ref name="common-margin-attlist"/>
-</define>
-
-<define name="common-margin-attlist">
-    <optional>
-        <attribute name="fo:margin">
-            <choice>
-                <ref name="nonNegativeLength"/>
-                <ref name="percent"/>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <ref name="common-break-attlist"/>
-</define>
-
-<define name="common-break-attlist">
-    <optional>
-        <attribute name="fo:break-before">
-            <choice>
-                <value>auto</value>
-                <value>column</value>
-                <value>page</value>
-            </choice>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="fo:break-after">
-            <choice>
-                <value>auto</value>
-                <value>column</value>
-                <value>page</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <ref name="common-background-color-attlist"/>
-</define>
-
-<define name="common-background-color-attlist">
-    <optional>
-        <attribute name="fo:background-color">
-            <choice>
-                <value>transparent</value>
-                <ref name="color"/>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-elements" combine="interleave">
-    <ref name="style-background-image"/>
-</define>
-
-<define name="style-background-image">
-    <optional>
-        <element name="style:background-image">
-            <ref name="style-background-image-attlist"/>
-            <choice>
-                <ref name="common-draw-data-attlist"/>
-                <ref name="office-binary-data"/>
-                <empty/>
-            </choice>
-        </element>
-    </optional>
-</define>
-<define name="style-background-image-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:repeat" a:defaultValue="repeat">
-            <choice>
-                <value>no-repeat</value>
-                <value>repeat</value>
-                <value>stretch</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-background-image-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:position" a:defaultValue="center">
-            <choice>
-                <value>left</value>
-                <value>center</value>
-                <value>right</value>
-                <value>top</value>
-                <value>bottom</value>
-                <list>
-                    <ref name="horiBackPos"/>
-                    <ref name="vertBackPos"/>
-                </list>
-                <list>
-                    <ref name="vertBackPos"/>
-                    <ref name="horiBackPos"/>
-                </list>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-
-<define name="horiBackPos">
-    <choice>
-        <value>left</value>
-        <value>center</value>
-        <value>right</value>
-    </choice>
-</define>
-<define name="vertBackPos">
-    <choice>
-        <value>top</value>
-        <value>center</value>
-        <value>bottom</value>
-    </choice>
-</define>
-<define name="style-background-image-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:filter-name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-background-image-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:opacity">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <ref name="common-border-attlist"/>
-</define>
-
-<define name="common-border-attlist">
-    <optional>
-        <attribute name="fo:border">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="fo:border-top">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="fo:border-bottom">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="fo:border-left">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="fo:border-right">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <ref name="common-border-line-width-attlist"/>
-</define>
-
-<define name="common-border-line-width-attlist">
-    <optional>
-        <attribute name="style:border-line-width">
-            <ref name="borderWidths"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:border-line-width-top">
-            <ref name="borderWidths"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:border-line-width-bottom">
-            <ref name="borderWidths"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:border-line-width-left">
-            <ref name="borderWidths"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:border-line-width-right">
-            <ref name="borderWidths"/>
-        </attribute>
-    </optional>
-</define>
-
-<define name="borderWidths">
-    <list>
-        <ref name="positiveLength"/>
-        <ref name="positiveLength"/>
-        <ref name="positiveLength"/>
-    </list>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <ref name="common-padding-attlist"/>
-</define>
-
-<define name="common-padding-attlist">
-    <optional>
-        <attribute name="fo:padding">
-            <ref name="nonNegativeLength"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="fo:padding-top">
-            <ref name="nonNegativeLength"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="fo:padding-bottom">
-            <ref name="nonNegativeLength"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="fo:padding-left">
-            <ref name="nonNegativeLength"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="fo:padding-right">
-            <ref name="nonNegativeLength"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <ref name="common-shadow-attlist"/>
-</define>
-
-<define name="common-shadow-attlist">
-    <optional>
-        <attribute name="style:shadow">
-            <ref name="shadowType"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <ref name="common-keep-with-next-attlist"/>
-</define>
-
-<define name="common-keep-with-next-attlist">
-    <optional>
-        <attribute name="fo:keep-with-next">
-            <choice>
-                <value>auto</value>
-                <value>always</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:number-lines" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:line-number">
-            <ref name="nonNegativeInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:text-autospace">
-            <choice>
-                <value>none</value>
-                <value>ideograph-alpha</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:punctuation-wrap">
-            <choice>
-                <value>simple</value>
-                <value>hanging</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:line-break">
-            <choice>
-                <value>normal</value>
-                <value>strict</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:vertical-align" a:defaultValue="auto">
-            <choice>
-                <value>top</value>
-                <value>middle</value>
-                <value>bottom</value>
-                <value>auto</value>
-                <value>baseline</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <ref name="common-writing-mode-attlist"/>
-</define>
-
-<define name="common-writing-mode-attlist">
-    <optional>
-        <attribute name="style:writing-mode">
-            <choice>
-                <value>lr-tb</value>
-                <value>rl-tb</value>
-                <value>tb-rl</value>
-                <value>tb-lr</value>
-                <value>lr</value>
-                <value>rl</value>
-                <value>tb</value>
-                <value>page</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:writing-mode-automatic">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:snap-to-layout-grid">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <ref name="common-page-number-attlist"/>
-</define>
-
-<define name="common-page-number-attlist">
-    <optional>
-        <attribute name="style:page-number">
-            <choice>                <ref name="positiveInteger"/>                <value>auto</value>            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-paragraph-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:background-transparency">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-ruby-properties">
-    <element name="style:ruby-properties">
-        <ref name="style-ruby-properties-content"/>
-    </element>
-</define>
-
-<define name="style-ruby-properties-content">
-    <ref name="style-properties-content"/>
-</define>
-
-<define name="style-ruby-properties-content-strict">
-    <ref name="style-ruby-properties-attlist"/>
-    <ref name="style-ruby-properties-elements"/>
-</define>
-
-<define name="style-ruby-properties-elements">
-    <empty/>
-</define>
-<define name="style-ruby-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:ruby-position">
-            <choice>
-                <value>above</value>
-                <value>below</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-ruby-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:ruby-align">
-            <choice>
-                <value>left</value>
-                <value>center</value>
-                <value>right</value>
-                <value>distribute-letter</value>
-                <value>distribute-space</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-section-properties">
-    <element name="style:section-properties">
-        <ref name="style-section-properties-content"/>
-    </element>
-</define>
-
-<define name="style-section-properties-content">
-    <ref name="style-properties-content"/>
-</define>
-
-<define name="style-section-properties-content-strict">
-    <ref name="style-section-properties-attlist"/>
-    <ref name="style-section-properties-elements"/>
-</define>
-<define name="style-section-properties-attlist" combine="interleave">
-    <ref name="common-background-color-attlist"/>
-</define>
-<define name="style-section-properties-elements" combine="interleave">
-    <ref name="style-background-image"/>
-</define>
-<define name="style-section-properties-attlist" combine="interleave">
-    <ref name="common-horizontal-margin-attlist"/>
-</define>
-<define name="style-section-properties-elements" combine="interleave">
-    <ref name="style-columns"/>
-</define>
-
-<define name="style-columns">
-    <optional>
-        <element name="style:columns">
-            <ref name="style-columns-attlist"/>
-            <optional>
-                <ref name="style-column-sep"/>
-            </optional>
-            <zeroOrMore>
-                <ref name="style-column"/>
-            </zeroOrMore>
-        </element>
-    </optional>
-</define>
-<define name="style-columns-attlist" combine="interleave">
-    <attribute name="fo:column-count">
-        <ref name="positiveInteger"/>
-    </attribute>
-</define>
-<define name="style-columns-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:column-gap">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-column">
-    <element name="style:column">
-        <ref name="style-column-attlist"/>
-    </element>
-</define>
-<define name="style-column-attlist" combine="interleave">
-    <attribute name="style:rel-width">
-        <ref name="relativeLength"/>
-    </attribute>
-</define>
-<define name="style-column-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:start-indent" a:defaultValue="0cm">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-column-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:end-indent" a:defaultValue="0cm">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-column-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:space-before" a:defaultValue="0cm">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-column-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:space-after" a:defaultValue="0cm">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-column-sep">
-    <element name="style:column-sep">
-        <ref name="style-column-sep-attlist"/>
-    </element>
-</define>
-<define name="style-column-sep-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:style" a:defaultValue="solid">
-            <choice>
-                <value>none</value>
-                <value>solid</value>
-                <value>dotted</value>
-                <value>dashed</value>
-                <value>dot-dashed</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-column-sep-attlist" combine="interleave">
-    <attribute name="style:width">
-        <ref name="length"/>
-    </attribute>
-</define>
-<define name="style-column-sep-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:height" a:defaultValue="100%">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-column-sep-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:vertical-align" a:defaultValue="top">
-            <choice>
-                <value>top</value>
-                <value>middle</value>
-                <value>bottom</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-column-sep-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:color" a:defaultValue="#000000">
-            <ref name="color"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-section-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:protect" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-section-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:dont-balance-text-columns">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-section-properties-attlist" combine="interleave">
-    <ref name="common-writing-mode-attlist"/>
-</define>
-<define name="style-section-properties-elements" combine="interleave">
-    <zeroOrMore>
-        <ref name="text-notes-configuration"/>
-    </zeroOrMore>
-</define>
-<define name="style-table-properties">
-    <element name="style:table-properties">
-        <ref name="style-table-properties-content"/>
-    </element>
-</define>
-
-<define name="style-table-properties-content">
-    <ref name="style-properties-content"/>
-</define>
-
-<define name="style-table-properties-content-strict">
-    <ref name="style-table-properties-attlist"/>
-    <ref name="style-table-properties-elements"/>
-</define>
-<define name="style-table-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:width">
-            <ref name="positiveLength"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:rel-width">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-table-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:align">
-            <choice>
-                <value>left</value>
-                <value>center</value>
-                <value>right</value>
-                <value>margins</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-table-properties-attlist" combine="interleave">
-    <ref name="common-horizontal-margin-attlist"/>
-</define>
-<define name="style-table-properties-attlist" combine="interleave">
-    <ref name="common-vertical-margin-attlist"/>
-</define>
-<define name="style-table-properties-attlist" combine="interleave">
-    <ref name="common-margin-attlist"/>
-</define>
-<define name="style-table-properties-attlist" combine="interleave">
-    <ref name="common-page-number-attlist"/>
-</define>
-<define name="style-table-properties-attlist" combine="interleave">
-    <ref name="common-break-attlist"/>
-</define>
-<define name="style-table-properties-attlist" combine="interleave">
-    <ref name="common-background-color-attlist"/>
-</define>
-<define name="style-table-properties-elements" combine="interleave">
-    <ref name="style-background-image"/>
-</define>
-<define name="style-table-properties-attlist" combine="interleave">
-    <ref name="common-shadow-attlist"/>
-</define>
-<define name="style-table-properties-attlist" combine="interleave">
-    <ref name="common-keep-with-next-attlist"/>
-</define>
-<define name="style-table-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:may-break-between-rows">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-table-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:border-model">
-            <choice>
-                <value>collapsing</value>
-                <value>separating</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-table-properties-attlist" combine="interleave">
-    <ref name="common-writing-mode-attlist"/>
-</define>
-<define name="style-table-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="table:display">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-table-column-properties">
-    <element name="style:table-column-properties">
-        <ref name="style-table-column-properties-content"/>
-    </element>
-</define>
-
-<define name="style-table-column-properties-content">
-    <ref name="style-properties-content"/>
-</define>
-
-<define name="style-table-column-properties-content-strict">
-    <ref name="style-table-column-properties-attlist"/>
-    <ref name="style-table-column-properties-elements"/>
-</define>
-
-<define name="style-table-column-properties-elements">
-    <empty/>
-</define>
-<define name="style-table-column-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:column-width">
-            <ref name="positiveLength"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:rel-column-width">
-            <ref name="relativeLength"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-table-column-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:use-optimal-column-width">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-table-column-properties-attlist" combine="interleave">
-    <ref name="common-break-attlist"/>
-</define>
-<define name="style-table-row-properties">
-    <element name="style:table-row-properties">
-        <ref name="style-table-row-properties-content"/>
-    </element>
-</define>
-
-<define name="style-table-row-properties-content">
-    <ref name="style-properties-content"/>
-</define>
-
-<define name="style-table-row-properties-content-strict">
-    <ref name="style-table-row-properties-attlist"/>
-    <ref name="style-table-row-properties-elements"/>
-</define>
-<define name="style-table-row-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:row-height">
-            <ref name="positiveLength"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:min-row-height">
-            <ref name="nonNegativeLength"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-table-row-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:use-optimal-row-height">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-table-row-properties-attlist" combine="interleave">
-    <ref name="common-background-color-attlist"/>
-</define>
-<define name="style-table-row-properties-elements" combine="interleave">
-    <ref name="style-background-image"/>
-</define>
-<define name="style-table-row-properties-attlist" combine="interleave">
-    <ref name="common-break-attlist"/>
-</define>
-<define name="style-table-row-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:keep-together">
-            <choice>
-                <value>auto</value>
-                <value>always</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-table-cell-properties">
-    <element name="style:table-cell-properties">
-        <ref name="style-table-cell-properties-content"/>
-    </element>
-</define>
-
-<define name="style-table-cell-properties-content">
-    <ref name="style-properties-content"/>
-</define>
-
-<define name="style-table-cell-properties-content-strict">
-    <ref name="style-table-cell-properties-attlist"/>
-    <ref name="style-table-cell-properties-elements"/>
-</define>
-<define name="style-table-cell-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:vertical-align">
-            <choice>
-                <value>top</value>
-                <value>middle</value>
-                <value>bottom</value>
-                <value>automatic</value>
-            </choice>
-            </attribute>
-    </optional>
-</define>
-<define name="style-table-cell-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:text-align-source">
-            <choice>
-                <value>fix</value>
-                <value>value-type</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-table-cell-properties-attlist" combine="interleave">
-    <ref name="common-style-direction-attlist"/>
-</define>
-
-<define name="common-style-direction-attlist">
-    <optional>
-        <attribute name="style:direction">
-            <choice>
-                <value>ltr</value>
-                <value>ttb</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-table-cell-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:glyph-orientation-vertical">
-            <choice>
-                <value>auto</value>
-                <value>0</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-table-cell-properties-attlist" combine="interleave">
-    <ref name="common-shadow-attlist"/>
-</define>
-<define name="style-table-cell-properties-attlist" combine="interleave">
-    <ref name="common-background-color-attlist"/>
-</define>
-<define name="style-table-cell-properties-elements" combine="interleave">
-    <ref name="style-background-image"/>
-</define>
-<define name="style-table-cell-properties-attlist" combine="interleave">
-    <ref name="common-border-attlist"/>
-</define>
-<define name="style-table-cell-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:diagonal-tl-br">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:diagonal-tl-br-widths">
-            <ref name="borderWidths"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:diagonal-bl-tr">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="style:diagonal-bl-tr-widths">
-            <ref name="borderWidths"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-table-cell-properties-attlist" combine="interleave">
-    <ref name="common-border-line-width-attlist"/>
-</define>
-<define name="style-table-cell-properties-attlist" combine="interleave">
-    <ref name="common-padding-attlist"/>
-</define>
-<define name="style-table-cell-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:wrap-option">
-            <choice>
-                <value>no-wrap</value>
-                <value>wrap</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-table-cell-properties-attlist" combine="interleave">
-    <ref name="common-rotation-angle-attlist"/>
-</define>
-
-<define name="common-rotation-angle-attlist">
-    <optional>
-        <attribute name="style:rotation-angle">
-            <ref name="nonNegativeInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-table-cell-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:rotation-align">
-            <choice>
-                <value>none</value>
-                <value>bottom</value>
-                <value>top</value>
-                <value>center</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-table-cell-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:cell-protect">
-            <choice>
-                <value>none</value>
-                <value>hidden-and-protected</value>
-                <list>
-                    <oneOrMore>
-                        <choice>
-                            <value>protected</value>
-                            <value>formula-hidden</value>
-                        </choice>
-                    </oneOrMore>
-                </list>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-table-cell-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:print-content">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-table-cell-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:decimal-places">
-            <ref name="nonNegativeInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-table-cell-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:repeat-content">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-table-cell-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:shrink-to-fit">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-list-level-properties">
-    <element name="style:list-level-properties">
-        <ref name="style-list-level-properties-content"/>
-    </element>
-</define>
-
-<define name="style-list-level-properties-content">
-    <ref name="style-properties-content"/>
-</define>
-
-<define name="style-list-level-properties-content-strict">
-    <ref name="style-list-level-properties-attlist"/>
-    <ref name="style-list-level-properties-elements"/>
-</define>
-
-<define name="style-list-level-properties-elements">
-    <empty/>
-</define>
-<define name="style-list-level-properties-attlist" combine="interleave">
-    <ref name="common-text-align"/>
-</define>
-<define name="style-list-level-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:space-before">
-            <ref name="nonNegativeLength"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-list-level-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:min-label-width">
-            <ref name="nonNegativeLength"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-list-level-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:min-label-distance">
-            <ref name="nonNegativeLength"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-list-level-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:font-name">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-list-level-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:width">
-            <ref name="positiveLength"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="fo:height">
-            <ref name="positiveLength"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-list-level-properties-attlist" combine="interleave">
-    <ref name="common-vertical-rel-attlist"/>
-    <ref name="common-vertical-pos-attlist"/>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:stroke">
-            <choice>
-                <value>none</value>
-                <value>dash</value>
-                <value>solid</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:stroke-dash">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:stroke-dash-names">
-            <ref name="styleNameRefs"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="svg:stroke-width">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="svg:stroke-color">
-            <ref name="color"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:marker-start">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:marker-end">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:marker-start-width">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:marker-end-width">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:marker-start-center">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:marker-end-center">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="svg:stroke-opacity">
-            <choice>
-                <data type="double">
-                    <param name="minInclusive">0</param>
-                    <param name="maxInclusive">1</param>
-                </data>
-                <ref name="percent"/>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:stroke-linejoin">
-            <choice>
-                <value>miter</value>
-                <value>round</value>
-                <value>bevel</value>
-                <value>middle</value>
-                <value>none</value>
-                <value>inherit</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-fill-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:fill">
-            <choice>
-                <value>none</value>
-                <value>solid</value>
-                <value>bitmap</value>
-                <value>gradient</value>
-                <value>hatch</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-fill-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:fill-color">
-            <ref name="color"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-fill-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:secondary-fill-color">
-            <ref name="color"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-fill-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:fill-gradient-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-fill-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:gradient-step-count">
-            <ref name="nonNegativeInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-fill-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:fill-hatch-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-fill-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:fill-hatch-solid">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-fill-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:fill-image-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-fill-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:repeat">
-            <choice>
-                <value>no-repeat</value>
-                <value>repeat</value>
-                <value>stretch</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-fill-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:fill-image-width">
-            <choice>
-                <ref name="length"/>
-                <ref name="percent"/>
-            </choice>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="draw:fill-image-height">
-            <choice>
-                <ref name="length"/>
-                <ref name="percent"/>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-fill-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:fill-image-ref-point-x">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="draw:fill-image-ref-point-y">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="draw:fill-image-ref-point">
-            <choice>
-                <value>top-left</value>
-                <value>top</value>
-                <value>top-right</value>
-                <value>left</value>
-                <value>center</value>
-                <value>right</value>
-                <value>bottom-left</value>
-                <value>bottom</value>
-                <value>bottom-right</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-fill-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:tile-repeat-offset"/>
-    </optional>
-</define>
-<define name="style-graphic-fill-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:opacity">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-fill-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:opacity-name">
-            <ref name="styleNameRef"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-fill-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="svg:fill-rule">
-            <choice>
-                <value>nonzero</value>
-                <value>evenodd</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:symbol-color">
-            <ref name="color"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:animation">
-            <choice>
-                <value>none</value>
-                <value>scroll</value>
-                <value>alternate</value>
-                <value>slide</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:animation-direction">
-            <choice>
-                <value>left</value>
-                <value>right</value>
-                <value>up</value>
-                <value>down</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:animation-start-inside">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:animation-stop-inside">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:animation-repeat">
-            <ref name="nonNegativeInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:animation-delay">
-            <ref name="duration"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="text:animation-steps">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:auto-grow-width">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="draw:auto-grow-height">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:fit-to-size">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:fit-to-contour">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:textarea-vertical-align">
-            <choice>
-                <value>top</value>
-                <value>middle</value>
-                <value>bottom</value>
-                <value>justify</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:textarea-horizontal-align">
-            <choice>
-                <value>left</value>
-                <value>center</value>
-                <value>right</value>
-                <value>justify</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:wrap-option">
-            <choice>
-                <value>no-wrap</value>
-                <value>wrap</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-elements" combine="interleave">
-    <optional>
-        <ref name="text-list-style"/>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:color-mode">
-            <choice>
-                <value>greyscale</value>
-                <value>mono</value>
-                <value>watermark</value>
-                <value>standard</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:color-inversion">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:luminance">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:contrast">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:gamma">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:red">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:green">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:blue">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:image-opacity">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:shadow">
-            <choice>
-                <value>visible</value>
-                <value>hidden</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:shadow-offset-x">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="draw:shadow-offset-y">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:shadow-color">
-            <ref name="color"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:shadow-opacity">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:start-line-spacing-horizontal">
-            <ref name="distance"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="draw:start-line-spacing-vertical">
-            <ref name="distance"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:end-line-spacing-horizontal">
-            <ref name="distance"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="draw:end-line-spacing-vertical">
-            <ref name="distance"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:line-distance">
-            <ref name="distance"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:guide-overhang">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:guide-distance">
-            <ref name="distance"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:start-guide">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:end-guide">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:placing">
-            <choice>
-                <value>below</value>
-                <value>above</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:parallel">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:measure-align">
-            <choice>
-                <value>automatic</value>
-                <value>left-outside</value>
-                <value>inside</value>
-                <value>right-outside</value>
-            </choice>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="draw:measure-vertical-align">
-            <choice>
-                <value>automatic</value>
-                <value>above</value>
-                <value>below</value>
-                <value>center</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:unit">
-            <choice>
-                <value>automatic</value>
-                <value>mm</value>
-                <value>cm</value>
-                <value>m</value>
-                <value>km</value>
-                <value>pt</value>
-                <value>pc</value>
-                <value>inch</value>
-                <value>ft</value>
-                <value>mi</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:show-unit">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:decimal-places">
-            <ref name="nonNegativeInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:caption-type">
-            <choice>
-                <value>straight-line</value>
-                <value>angled-line</value>
-                <value>angled-connector-line</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:caption-angle-type">
-            <choice>
-                <value>fixed</value>
-                <value>free</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:caption-angle">
-            <ref name="nonNegativeInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:caption-gap">
-            <ref name="distance"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:caption-escape-direction">
-            <choice>
-                <value>horizontal</value>
-                <value>vertical</value>
-                <value>auto</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:caption-escape">
-            <choice>
-                <ref name="length"/>
-                <ref name="percent"/>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:caption-line-length">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:caption-fit-line-length">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:horizontal-segments">
-            <ref name="nonNegativeInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:vertical-segments">
-            <ref name="nonNegativeInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:edge-rounding">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:edge-rounding-mode">
-            <choice>
-                <value>correct</value>
-                <value>attractive</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:back-scale">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:depth">
-            <ref name="length"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:backface-culling">
-            <choice>
-                <value>enabled</value>
-                <value>disabled</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:end-angle">
-            <ref name="nonNegativeInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:close-front">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:close-back">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:lighting-mode">
-            <choice>
-                <value>standard</value>
-                <value>double-sided</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:normals-kind">
-            <choice>
-                <value>object</value>
-                <value>flat</value>
-                <value>sphere</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:normals-direction">
-            <choice>
-                <value>normal</value>
-                <value>inverse</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:texture-generation-mode-x">
-            <choice>
-                <value>object</value>
-                <value>parallel</value>
-                <value>sphere</value>
-            </choice>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="dr3d:texture-generation-mode-y">
-            <choice>
-                <value>object</value>
-                <value>parallel</value>
-                <value>sphere</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:texture-kind">
-            <choice>
-                <value>luminance</value>
-                <value>intensity</value>
-                <value>color</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:texture-filter">
-            <choice>
-                <value>enabled</value>
-                <value>disabled</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:texture-mode">
-            <choice>
-                <value>replace</value>
-                <value>modulate</value>
-                <value>blend</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:ambient-color">
-            <ref name="color"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="dr3d:emissive-color">
-            <ref name="color"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="dr3d:specular-color">
-            <ref name="color"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="dr3d:diffuse-color">
-            <ref name="color"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:shininess">
-            <ref name="percent"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="dr3d:shadow">
-            <choice>
-                <value>visible</value>
-                <value>hidden</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <ref name="common-draw-rel-size-attlist"/>
-    <optional>
-        <attribute name="fo:min-width">
-            <choice>
-                <ref name="length"/>
-                <ref name="percent"/>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:min-height">
-            <choice>
-                <ref name="length"/>
-                <ref name="percent"/>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:max-height">
-            <choice>
-                <ref name="length"/>
-                <ref name="percent"/>
-            </choice>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="fo:max-width">
-            <choice>
-                <ref name="length"/>
-                <ref name="percent"/>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <ref name="common-horizontal-margin-attlist"/>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <ref name="common-vertical-margin-attlist"/>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <ref name="common-margin-attlist"/>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:print-content">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:protect">
-            <choice>
-                <value>none</value>
-                <list>
-                    <oneOrMore>
-                        <choice>
-                            <value>content</value>
-                            <value>position</value>
-                            <value>size</value>
-                        </choice>
-                    </oneOrMore>
-                </list>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:horizontal-pos">
-            <choice>
-                <value>left</value>
-                <value>center</value>
-                <value>right</value>
-                <value>from-left</value>
-                <value>inside</value>
-                <value>outside</value>
-                <value>from-inside</value>
-            </choice>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:x">
-            <ref name="coordinate"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:horizontal-rel">
-            <choice>
-                    <value>page</value>
-                <value>page-content</value>
-                <value>page-start-margin</value>
-                <value>page-end-margin</value>
-                <value>frame</value>
-                <value>frame-content</value>
-                <value>frame-start-margin</value>
-                <value>frame-end-margin</value>
-                <value>paragraph</value>
-                <value>paragraph-content</value>
-                <value>paragraph-start-margin</value>
-                <value>paragraph-end-margin</value>
-                <value>char</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <ref name="common-vertical-pos-attlist"/>
-</define>
-
-<define name="common-vertical-pos-attlist">
-    <optional>
-        <attribute name="style:vertical-pos">
-            <choice>
-                <value>top</value>
-                <value>middle</value>
-                <value>bottom</value>
-                <value>from-top</value>
-                <value>below</value>
-            </choice>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="svg:y">
-            <ref name="coordinate"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <ref name="common-vertical-rel-attlist"/>
-</define>
-
-<define name="common-vertical-rel-attlist">
-    <optional>
-        <attribute name="style:vertical-rel">
-            <choice>
-                <value>page</value>
-                <value>page-content</value>
-                <value>frame</value>
-                <value>frame-content</value>
-                <value>paragraph</value>
-                <value>paragraph-content</value>
-                <value>char</value>
-                <value>line</value>
-                <value>baseline</value>
-                <value>text</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <ref name="common-text-anchor-attlist"/>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <ref name="common-border-attlist"/>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <ref name="common-border-line-width-attlist"/>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <ref name="common-padding-attlist"/>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <ref name="common-shadow-attlist"/>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <ref name="common-background-color-attlist"/>
-</define>
-<define name="style-graphic-properties-elements" combine="interleave">
-    <ref name="style-background-image"/>
-</define>
-<define name="style-graphic-properties-elements" combine="interleave">
-    <ref name="style-columns"/>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:editable">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:wrap">
-            <choice>
-                <value>none</value>
-                <value>left</value>
-                <value>right</value>
-                <value>parallel</value>
-                <value>dynamic</value>
-                <value>run-through</value>
-                <value>biggest</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:wrap-dynamic-threshold">
-            <ref name="nonNegativeLength"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:number-wrapped-paragraphs">
-            <choice>
-                <value>no-limit</value>
-                <ref name="positiveInteger"/>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:wrap-contour">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:wrap-contour-mode">
-            <choice>
-                <value>full</value>
-                <value>outside</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:run-through">
-            <choice>
-                <value>foreground</value>
-                <value>background</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:flow-with-text">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:overflow-behavior">
-            <choice>
-                <value>clip</value>
-                <value>auto-create-new-frame</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="style:mirror">
-            <choice>
-                <value>none</value>
-                <value>vertical</value>
-                <ref name="horizontal-mirror"/>
-                <list>
-                    <value>vertical</value>
-                    <ref name="horizontal-mirror"/>
-                </list>
-                <list>
-                    <ref name="horizontal-mirror"/>
-                    <value>vertical</value>
-                </list>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-
-<define name="horizontal-mirror">
-    <choice>
-        <value>horizontal</value>
-        <value>horizontal-on-odd</value>
-        <value>horizontal-on-even</value>
-    </choice>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="fo:clip">
-            <!-- The attribute value must match the one XSL's clip -->
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:wrap-influence-on-position"
-                    a:defaultValue="iterative">
-            <choice>
-                <value>iterative</value>
-                <value>once-concurrent</value>
-                <value>once-successive</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <ref name="common-writing-mode-attlist"/>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:frame-display-scrollbar">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:frame-display-border">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:frame-margin-horizontal">
-            <ref name="nonNegativePixelLength"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="draw:frame-margin-vertical">
-            <ref name="nonNegativePixelLength"/>
-        </attribute>
-    </optional>
-</define>
-
-<define name="nonNegativePixelLength">
-    <data type="string">
-        <param name="pattern">([0-9]+(\.[0-9]*)?|\.[0-9]+)(px)</param>
-    </data>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:visible-area-left">
-            <ref name="nonNegativeLength"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="draw:visible-area-top">
-            <ref name="nonNegativeLength"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="draw:visible-area-width">
-            <ref name="positiveLength"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="draw:visible-area-height">
-            <ref name="positiveLength"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-graphic-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="draw:ole-draw-aspect">
-            <ref name="nonNegativeInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-chart-properties">
-    <element name="style:chart-properties">
-        <ref name="style-chart-properties-content"/>
-    </element>
-</define>
-
-<define name="style-chart-properties-content">
-    <ref name="style-properties-content"/>
-</define>
-
-<define name="style-chart-properties-content-strict">
-    <ref name="style-chart-properties-attlist"/>
-    <ref name="style-chart-properties-elements"/>
-</define>
-
-<define name="style-chart-properties-elements">
-    <empty/>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:scale-text" a:defaultValue="true">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:three-dimensional">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:deep">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <choice>
-        <attribute name="chart:symbol-type">
-            <value>none</value>
-        </attribute>
-        <attribute name="chart:symbol-type">
-            <value>automatic</value>
-        </attribute>
-        <group>
-            <attribute name="chart:symbol-type">
-                <value>named-symbol</value>
-            </attribute>
-            <attribute name="chart:symbol-name">
-                <choice>
-                    <value>square</value>
-                    <value>diamond</value>
-                    <value>arrow-down</value>
-                    <value>arrow-up</value>
-                    <value>arrow-right</value>
-                    <value>arrow-left</value>
-                    <value>bow-tie</value>
-                    <value>hourglass</value>
-                    <value>circle</value>
-                    <value>star</value>
-                    <value>x</value>
-                    <value>plus</value>
-                    <value>asterisk</value>
-                    <value>horizontal-bar</value>
-                    <value>vertical-bar</value>
-                </choice>
-            </attribute>
-        </group>
-        <group>
-            <attribute name="chart:symbol-type">
-                <value>image</value>
-            </attribute>
-            <element name="chart:symbol-image">
-                <attribute name="xlink:href">
-                    <ref name="anyURI"/>
-                </attribute>
-            </element>
-        </group>
-        <empty/>
-    </choice>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:symbol-width">
-            <ref name="nonNegativeLength"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="chart:symbol-height">
-            <ref name="nonNegativeLength"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:vertical" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:connect-bars" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:gap-width">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="chart:overlap">
-            <ref name="integer"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:japanese-candle-stick"
-                    a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:interpolation" a:defaultValue="none">
-            <choice>
-                <value>none</value>
-                <value>cubic-spline</value>
-                <value>b-spline</value>
-            </choice>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="chart:spline-order" a:defaultValue="2">
-            <ref name="positiveInteger"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="chart:spline-resolution" a:defaultValue="20">
-            <ref name="positiveInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:pie-offset" a:defaultValue="0">
-            <ref name="nonNegativeInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:lines" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:solid-type" a:defaultValue="cuboid">
-            <choice>
-                <value>cuboid</value>
-                <value>cylinder</value>
-                <value>cone</value>
-                <value>pyramid</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:stacked" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="chart:percentage" a:defaultValue="false">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:link-data-style-to-source">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:visible">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:logarithmic">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:maximum">
-            <ref name="double"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="chart:minimum">
-            <ref name="double"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="chart:origin">
-            <ref name="double"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="chart:interval-major">
-            <ref name="double"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="chart:interval-minor-divisor">
-            <ref name="positiveInteger"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:tick-marks-major-inner">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="chart:tick-marks-major-outer">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="chart:tick-marks-minor-inner">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="chart:tick-marks-minor-outer">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:display-label">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="chart:text-overlap">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="text:line-break">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="chart:label-arrangement"
-                   a:defaultValue="side-by-side">
-            <choice>
-                <value>side-by-side</value>
-                <value>stagger-even</value>
-                <value>stagger-odd</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <ref name="common-style-direction-attlist"/>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <ref name="common-rotation-angle-attlist"/>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:data-label-number">
-            <choice>
-                <value>none</value>
-                <value>value</value>
-                <value>percentage</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:data-label-text">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:data-label-symbol">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:mean-value">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:error-category" a:defaultValue="none">
-            <choice>
-                <value>none</value>
-                <value>variance</value>
-                <value>standard-deviation</value>
-                <value>percentage</value>
-                <value>error-margin</value>
-                <value>constant</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:error-percentage">
-            <ref name="double"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:error-margin">
-            <ref name="double"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:error-lower-limit">
-            <ref name="double"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="chart:error-upper-limit">
-            <ref name="double"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:error-upper-indicator">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-    <optional>
-        <attribute name="chart:error-lower-indicator">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:series-source" a:defaultValue="columns">
-            <choice>
-                <value>columns</value>
-                <value>rows</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-chart-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="chart:regression-type" a:defaultValue="none">
-            <choice>
-                <value>none</value>
-                <value>linear</value>
-                <value>logarithmic</value>
-                <value>exponential</value>
-                <value>power</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-drawing-page-properties-attlist"
-        combine="interleave">
-    <optional>
-        <attribute name="presentation:transition-type">
-            <choice>
-                <value>manual</value>
-                <value>automatic</value>
-                <value>semi-automatic</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-drawing-page-properties-attlist"
-         combine="interleave">
-    <optional>
-        <attribute name="presentation:transition-style">
-            <choice>
-                <value>none</value>
-                <value>fade-from-left</value>
-                <value>fade-from-top</value>
-                <value>fade-from-right</value>
-                <value>fade-from-bottom</value>
-                <value>fade-from-upperleft</value>
-                <value>fade-from-upperright</value>
-                <value>fade-from-lowerleft</value>
-                <value>fade-from-lowerright</value>
-                <value>move-from-left</value>
-                <value>move-from-top</value>
-                <value>move-from-right</value>
-                <value>move-from-bottom</value>
-                <value>move-from-upperleft</value>
-                <value>move-from-upperright</value>
-                <value>move-from-lowerleft</value>
-                <value>move-from-lowerright</value>
-                <value>uncover-to-left</value>
-                <value>uncover-to-top</value>
-                <value>uncover-to-right</value>    
-                <value>uncover-to-bottom</value>
-                <value>uncover-to-upperleft</value>
-                <value>uncover-to-upperright</value>
-                <value>uncover-to-lowerleft</value>
-                <value>uncover-to-lowerright</value>
-                <value>fade-to-center</value>
-                <value>fade-from-center</value>
-                <value>vertical-stripes</value>
-                <value>horizontal-stripes</value>
-                <value>clockwise</value>
-                <value>counterclockwise</value>
-                <value>open-vertical</value>
-                <value>open-horizontal</value>
-                <value>close-vertical</value>
-                <value>close-horizontal</value>
-                <value>wavyline-from-left</value>
-                <value>wavyline-from-top</value>
-                <value>wavyline-from-right</value>
-                <value>wavyline-from-bottom</value>
-                <value>spiralin-left</value>
-                <value>spiralin-right</value>
-                <value>spiralout-left</value>
-                <value>spiralout-right</value>
-                <value>roll-from-top</value>
-                <value>roll-from-left</value>
-                <value>roll-from-right</value>
-                <value>roll-from-bottom</value>
-                <value>stretch-from-left</value>
-                <value>stretch-from-top</value>
-                <value>stretch-from-right</value>
-                <value>stretch-from-bottom</value>
-
-                <value>vertical-lines</value>
-                <value>horizontal-lines</value>
-                <value>dissolve</value>
-                <value>random</value>
-                <value>vertical-checkerboard</value>
-                <value>horizontal-checkerboard</value>
-                <value>interlocking-horizontal-left</value>
-                <value>interlocking-horizontal-right</value>
-                <value>interlocking-vertical-top</value>
-                <value>interlocking-vertical-bottom</value>
-                <value>fly-away</value>
-                <value>open</value>
-                <value>close</value>
-                <value>melt</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-drawing-page-properties-attlist"
-        combine="interleave">
-    <optional>
-        <attribute name="presentation:transition-speed">
-            <ref name="presentationSpeeds"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-drawing-page-properties-attlist " combine="interleave">
-    <optional>
-        <attribute name="smil:type">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-drawing-page-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="smil:subtype">
-            <ref name="string"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-drawing-page-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="smil:direction" a:defaultValue="forward">
-            <choice>
-                <value>forward</value>
-                <value>reverse</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-drawing-page-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="smil:fadeColor">
-            <ref name="color"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-drawing-page-properties-attlist"
-        combine="interleave">
-    <optional>
-        <attribute name="presentation:duration">
-            <ref name="duration"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-drawing-page-properties-attlist"
-         combine="interleave">
-    <optional>
-        <attribute name="presentation:visibility">
-            <choice>
-                <value>visible</value>
-                <value>hidden</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-drawing-page-properties-elements"
-         combine="interleave">
-    <optional>
-        <ref name="presentation-sound"/>
-    </optional>
-</define>
-<define name="style-drawing-page-properties-attlist"
-         combine="interleave">
-    <optional>
-        <attribute name="draw:background-size">
-            <choice>
-                <value>full</value>
-                <value>border</value>
-            </choice>
-        </attribute>
-    </optional>
-</define>
-<define name="style-drawing-page-properties-attlist"
-         combine="interleave">
-    <optional>
-        <attribute name="presentation:background-objects-visible">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-drawing-page-properties-attlist"
-         combine="interleave">
-    <optional>
-        <attribute name="presentation:background-visible">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-drawing-page-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:display-header">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-drawing-page-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:display-footer">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-drawing-page-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:display-page-number">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="style-drawing-page-properties-attlist" combine="interleave">
-    <optional>
-        <attribute name="presentation:display-date-time">
-            <ref name="boolean"/>
-        </attribute>
-    </optional>
-</define>
-<define name="string">
-    <data type="string"/>
-</define>
-<define name="date">
-    <data type="date"/>
-</define>
-<define name="time">
-    <data type="time"/>
-</define>
-<define name="dateTime">
-    <data type="dateTime"/>
-</define>
-<define name="duration">
-    <data type="duration"/>
-</define>
-<define name="integer">
-    <data type="integer"/>
-</define>
-<define name="nonNegativeInteger">
-    <data type="nonNegativeInteger"/>
-</define>
-<define name="positiveInteger">
-    <data type="positiveInteger"/>
-</define>
-<define name="double">
-    <data type="double"/>
-</define>
-<define name="anyURI">
-    <data type="anyURI"/>
-</define>
-<define name="base64Binary">
-    <data type="base64Binary"/>
-</define>
-<define name="ID">
-    <data type="ID"/>
-</define>
-<define name="IDREF">
-    <data type="IDREF"/>
-</define>
-<define name="IDREFS">
-    <data type="IDREFS"/>
-</define>
-<define name="boolean">
-    <choice>
-        <value>true</value>
-        <value>false</value>
-    </choice>
-</define>
-<define name="dateOrDateTime">
-    <choice>
-        <data type="date"/>
-        <data type="dateTime"/>
-    </choice>
-</define>
-<define name="timeOrDateTime">
-    <choice>
-        <data type="time"/>
-        <data type="dateTime"/>
-    </choice>
-</define>
-<define name="language">
-    <data type="language"/>
-</define>
-<define name="countryCode">
-    <data type="token">
-        <param name="pattern">[A-Za-z0-9]{1,8}</param>
-    </data>
-</define>
-<define name="languageCode">
-    <data type="token">
-        <param name="pattern">[A-Za-z]{1,8}</param>
-    </data>
-</define>
-<define name="character">
-    <data type="string">
-        <param name="length">1</param>
-    </data>
-</define>
-<define name="length">
-    <data type="string">
-        <param name="pattern">-?([0-9]+(\.[0-9]*)?|\.[0-9]+)((cm)|(mm)|(in)|(pt)|(pc)|(px))</param>
-
-    </data>
-</define>
-<define name="nonNegativeLength">
-    <data type="string">
-        <param name="pattern">([0-9]+(\.[0-9]*)?|\.[0-9]+)((cm)|(mm)|(in)|(pt)|(pc)|(px))</param>
-
-    </data>
-</define>
-<define name="positiveLength">
-    <data type="string">
-        <param name="pattern">([0-9]*[1-9][0-9]*(\.[0-9]*)?|0+\.[0-9]*[1-9][0-9]*|\.[0-9]*[1-9][0-9]*)((cm)|(mm)|(in)|(pt)|(pc)|(px))</param>
-
-    </data>
-</define>
-<define name="percent">
-    <data type="string">
-        <param name="pattern">-?([0-9]+(\.[0-9]*)?|\.[0-9]+)%</param>
-    </data>
-</define>
-<define name="relativeLength">
-    <data type="string">
-        <param name="pattern">[0-9]+\*</param>
-    </data>
-</define>
-<define name="coordinate">
-    <ref name="length"/>
-</define>
-<define name="distance">
-    <ref name="length"/>
-</define>
-<define name="color">
-    <data type="string">
-        <param name="pattern">#[0-9a-fA-F]{6}</param>
-    </data>
-</define>
-<define name="styleName">
-    <data type="NCName"/>
-</define>
-<define name="styleNameRef">
-    <choice>
-        <data type="NCName"/>
-        <empty/>
-    </choice>
-</define>
-<define name="styleNameRefs">
-    <list>
-        <zeroOrMore>
-            <data type="NCName"/>
-        </zeroOrMore>
-    </list>
-</define>
-<define name="variableName">
-    <data type="string"/>
-</define>
-<define name="formula">
-    <!-- A formula should start with a namespace prefix, -->
-    <!-- but has no restrictions-->
-    <data type="string"/>
-</define>
-
-<define name="targetFrameName">
-    <choice>
-        <value>_self</value>
-        <value>_blank</value>
-        <value>_parent</value>
-        <value>_top</value>
-        <ref name="string"/>
-    </choice>
-</define>
-
-<define name="valueType">
-    <choice>
-        <value>float</value>
-        <value>time</value>
-        <value>date</value>
-        <value>percentage</value>
-        <value>currency</value>
-        <value>boolean</value>
-        <value>string</value>
-    </choice>
-</define>
-
-<define name="points">
-    <data type="string">
-        <param name="pattern">-?[0-9]+,-?[0-9]+([ ]+-?[0-9]+,-?[0-9]+)*</param>
-    </data>
-</define>
-<define name="pathData">
-    <data type="string"/>
-</define>
-
-<define name="vector3D">
-    <data type="string">
-        <param name="pattern">\([ ]*-?([0-9]+(\.[0-9]*)?|\.[0-9]+)([ ]+-?([0-9]+(\.[0-9]*)?|\.[0-9]+)){2}[ ]*\)</param>
-
-    </data>
-</define>
-
-<define name="namespacedToken">
-    <data type="string">
-        <param name="pattern">[0-9a-zA-Z_]+:[0-9a-zA-Z._\-]+</param>
-    </data>
-</define>
-<define name="anyAttListOrElements">
-    <zeroOrMore>
-        <attribute>
-            <anyName/>
-            <text/>
-        </attribute>
-    </zeroOrMore>
-    <ref name="anyElements"/>
-</define>
-<define name="anyElements">
-    <zeroOrMore>
-        <element>
-            <anyName/>
-            <mixed>
-                <ref name="anyAttListOrElements"/>
-            </mixed>
-        </element>
-    </zeroOrMore>
-</define>
-</grammar>
diff --git a/apps/files_odfviewer/src/webodf/programs/docnosis/OpenDocument-strict-schema-v1.0-os.rng b/apps/files_odfviewer/src/webodf/programs/docnosis/OpenDocument-strict-schema-v1.0-os.rng
deleted file mode 100644
index aa761dc880..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/docnosis/OpenDocument-strict-schema-v1.0-os.rng
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    OASIS OpenDocument v1.0
-    OASIS Standard, 1 May 2005
-    Strict Relax-NG Schema
-
-    $Id$
-
-    © 2002-2005 OASIS Open
-    © 1999-2005 Sun Microsystems, Inc.
--->
-
-<grammar xmlns="http://relaxng.org/ns/structure/1.0">
-    <include href="OpenDocument-schema-v1.0-os.rng">
-        <define name="office-meta-content">
-            <ref name="office-meta-content-strict"/>
-        </define>
-        <define name="style-page-layout-properties-content">
-            <ref name="style-page-layout-properties-content-strict"/>
-        </define>
-        <define name="style-header-footer-properties-content">
-            <ref name="style-header-footer-properties-content-strict"/>
-        </define>
-        <define name="style-drawing-page-properties-content">
-            <ref name="style-drawing-page-properties-content-strict"/>
-        </define>
-        <define name="style-text-properties-content">
-            <ref name="style-text-properties-content-strict"/>
-        </define>
-        <define name="style-paragraph-properties-content">
-            <ref name="style-paragraph-properties-content-strict"/>
-        </define>
-        <define name="style-ruby-properties-content">
-            <ref name="style-ruby-properties-content-strict"/>
-        </define>
-        <define name="style-section-properties-content">
-            <ref name="style-section-properties-content-strict"/>
-        </define>
-        <define name="style-list-level-properties-content">
-            <ref name="style-list-level-properties-content-strict"/>
-        </define>
-        <define name="style-table-properties-content">
-            <ref name="style-table-properties-content-strict"/>
-        </define>
-        <define name="style-table-column-properties-content">
-            <ref name="style-table-column-properties-content-strict"/>
-        </define>
-        <define name="style-table-row-properties-content">
-            <ref name="style-table-row-properties-content-strict"/>
-        </define>
-        <define name="style-table-cell-properties-content">
-            <ref name="style-table-cell-properties-content-strict"/>
-        </define>
-        <define name="style-graphic-properties-content">
-            <ref name="style-graphic-properties-content-strict"/>
-        </define>
-        <define name="style-chart-properties-content">
-            <ref name="style-properties-content"/>
-        </define>
-    </include>
-</grammar>
diff --git a/apps/files_odfviewer/src/webodf/programs/docnosis/OpenDocument-strict-schema-v1.1.rng b/apps/files_odfviewer/src/webodf/programs/docnosis/OpenDocument-strict-schema-v1.1.rng
deleted file mode 100644
index e77fe4ba6e..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/docnosis/OpenDocument-strict-schema-v1.1.rng
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-    OASIS OpenDocument v1.1
-    OASIS Standard, 1 Feb 2007
-    Strict Relax-NG Schema
-
-    $Id$
-
-    © 2002-2007 OASIS Open
-    © 1999-2007 Sun Microsystems, Inc.
--->
-
-<grammar xmlns="http://relaxng.org/ns/structure/1.0">
-    <include href="OpenDocument-schema-v1.1.rng">
-        <define name="office-meta-content">
-            <ref name="office-meta-content-strict"/>
-        </define>
-        <define name="style-page-layout-properties-content">
-            <ref name="style-page-layout-properties-content-strict"/>
-        </define>
-        <define name="style-header-footer-properties-content">
-            <ref name="style-header-footer-properties-content-strict"/>
-        </define>
-        <define name="style-drawing-page-properties-content">
-            <ref name="style-drawing-page-properties-content-strict"/>
-        </define>
-        <define name="style-text-properties-content">
-            <ref name="style-text-properties-content-strict"/>
-        </define>
-        <define name="style-paragraph-properties-content">
-            <ref name="style-paragraph-properties-content-strict"/>
-        </define>
-        <define name="style-ruby-properties-content">
-            <ref name="style-ruby-properties-content-strict"/>
-        </define>
-        <define name="style-section-properties-content">
-            <ref name="style-section-properties-content-strict"/>
-        </define>
-        <define name="style-list-level-properties-content">
-            <ref name="style-list-level-properties-content-strict"/>
-        </define>
-        <define name="style-table-properties-content">
-            <ref name="style-table-properties-content-strict"/>
-        </define>
-        <define name="style-table-column-properties-content">
-            <ref name="style-table-column-properties-content-strict"/>
-        </define>
-        <define name="style-table-row-properties-content">
-            <ref name="style-table-row-properties-content-strict"/>
-        </define>
-        <define name="style-table-cell-properties-content">
-            <ref name="style-table-cell-properties-content-strict"/>
-        </define>
-        <define name="style-graphic-properties-content">
-            <ref name="style-graphic-properties-content-strict"/>
-        </define>
-        <define name="style-chart-properties-content">
-            <ref name="style-chart-properties-content-strict"/>
-        </define>
-    </include>
-</grammar>
diff --git a/apps/files_odfviewer/src/webodf/programs/docnosis/OpenDocument-v1.2-cos01-dsig-schema.rng b/apps/files_odfviewer/src/webodf/programs/docnosis/OpenDocument-v1.2-cos01-dsig-schema.rng
deleted file mode 100644
index bb2e591d86..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/docnosis/OpenDocument-v1.2-cos01-dsig-schema.rng
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-        Open Document Format for Office Applications (OpenDocument) Version 1.2
-        Candidate OASIS Standard (COS) 01, 10 May 2011
-	Digital Signatures Relax-NG Schema
-        Source: http://docs.oasis-open.org/office/v1.2/cos01/
-        Copyright (c) OASIS Open 2002-2011. All Rights Reserved.
-
-	All capitalized terms in the following text have the meanings assigned to them
-   	in the OASIS Intellectual Property Rights Policy (the "OASIS IPR Policy"). The
-	full Policy may be found at the OASIS website.
-
-	This document and translations of it may be copied and furnished to others, and
-	derivative works that comment on or otherwise explain it or assist in its
-	implementation may be prepared, copied, published, and distributed, in whole or
-	in part, without restriction of any kind, provided that the above copyright
-	notice and this section are included on all such copies and derivative works.
-	However, this document itself may not be modified in any way, including by
-	removing the copyright notice or references to OASIS, except as needed for the
-	purpose of developing any document or deliverable produced by an OASIS
-	Technical Committee (in which case the rules applicable to copyrights, as set
-	forth in the OASIS IPR Policy, must be followed) or as required to translate it
-	into languages other than English.
-
-	The limited permissions granted above are perpetual and will not be revoked by
-	OASIS or its successors or assigns.
-
-	This document and the information contained herein is provided on an "AS IS"
-	basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT
-	LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT
-	INFRINGE ANY OWNERSHIP RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR
-	FITNESS FOR A PARTICULAR PURPOSE. 
--->
-
-<grammar
-	xmlns="http://relaxng.org/ns/structure/1.0"
-
-	datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
-
-	xmlns:dsig="urn:oasis:names:tc:opendocument:xmlns:digitalsignature:1.0"
-	xmlns:ds="http://www.w3.org/2000/09/xmldsig#"
->
-<start>
-	<choice>
-		<ref name="dsig-document-signatures"/>
-	</choice>
-</start>
-<define name="dsig-document-signatures">
-	<element name="dsig:document-signatures">
-		<ref name="dsig-document-signatures-attlist"/>
-		<oneOrMore>
-			<ref name="ds-signature"/>
-		</oneOrMore>
-	</element>
-</define>
-<define name="dsig-document-signatures-attlist">
-	<attribute name="dsig:version">
-		<value>1.2</value>
-	</attribute>
-</define>
-<define name="ds-signature">
-	<element name="ds:Signature">
-		<!-- The permitted content of this element is the permitted -->
-		<!-- content of the Signature element defined by W3C XML    -->
-		<!-- Signature Syntax and Processing (Second Edition).      -->
-		<!-- See OpenDocument v1.2 part 3, section 4.3.             -->
-		<ref name="dsMarkup"/>
-	</element>
-</define>
-<define name="dsMarkup">
-	<zeroOrMore>
-		<choice>
-			<attribute>
-				<anyName/>
-			</attribute>
-			<text/>
-			<element>
-				<anyName/>
-				<ref name="dsMarkup"/>
-			</element>
-		</choice>
-	</zeroOrMore>
-</define>
-</grammar>
diff --git a/apps/files_odfviewer/src/webodf/programs/docnosis/OpenDocument-v1.2-cos01-manifest-schema.rng b/apps/files_odfviewer/src/webodf/programs/docnosis/OpenDocument-v1.2-cos01-manifest-schema.rng
deleted file mode 100644
index 8902970eec..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/docnosis/OpenDocument-v1.2-cos01-manifest-schema.rng
+++ /dev/null
@@ -1,224 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-        Open Document Format for Office Applications (OpenDocument) Version 1.2
-        Candidate OASIS Standard (COS) 01, 10 May 2011
-	Manifest Relax-NG Schema
-        Source: http://docs.oasis-open.org/office/v1.2/cos01/
-        Copyright (c) OASIS Open 2002-2011. All Rights Reserved.
-
-	All capitalized terms in the following text have the meanings assigned to them
-   	in the OASIS Intellectual Property Rights Policy (the "OASIS IPR Policy"). The
-	full Policy may be found at the OASIS website.
-
-	This document and translations of it may be copied and furnished to others, and
-	derivative works that comment on or otherwise explain it or assist in its
-	implementation may be prepared, copied, published, and distributed, in whole or
-	in part, without restriction of any kind, provided that the above copyright
-	notice and this section are included on all such copies and derivative works.
-	However, this document itself may not be modified in any way, including by
-	removing the copyright notice or references to OASIS, except as needed for the
-	purpose of developing any document or deliverable produced by an OASIS
-	Technical Committee (in which case the rules applicable to copyrights, as set
-	forth in the OASIS IPR Policy, must be followed) or as required to translate it
-	into languages other than English.
-
-	The limited permissions granted above are perpetual and will not be revoked by
-	OASIS or its successors or assigns.
-
-	This document and the information contained herein is provided on an "AS IS"
-	basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT
-	LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT
-	INFRINGE ANY OWNERSHIP RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR
-	FITNESS FOR A PARTICULAR PURPOSE. 
--->
-<grammar 
-	xmlns="http://relaxng.org/ns/structure/1.0"
-
-	datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
-
-	xmlns:manifest="urn:oasis:names:tc:opendocument:xmlns:manifest:1.0"
->
-<start>
-	<choice>
-		<ref name="manifest"/>
-	</choice>
-</start>
-<define name="manifest">
-	<element name="manifest:manifest">
-		<ref name="manifest-attlist"/>
-		<oneOrMore>
-			<ref name="file-entry"/>
-		</oneOrMore>
-	</element>
-</define>
-<define name="manifest-attlist">
-	<attribute name="manifest:version">
-		<value>1.2</value>
-	</attribute>
-</define>
-<define name="file-entry">
-	<element name="manifest:file-entry">
-		<ref name="file-entry-attlist"/>
-		<optional>
-			<ref name="encryption-data"/>
-		</optional>
-	</element>
-</define>
-<define name="file-entry-attlist">
-  <interleave>
-	<attribute name="manifest:full-path">
-		<ref name="string"/>
-	</attribute>
-	<optional>
-		<attribute name="manifest:size">
-			<ref name="nonNegativeInteger"/>
-		</attribute>
-	</optional>
-	<attribute name="manifest:media-type">
-		<ref name="string"/>
-	</attribute>
-	<optional>
-		<attribute name="manifest:preferred-view-mode">
-			<choice>
-				<value>edit</value>
-				<value>presentation-slide-show</value>
-				<value>read-only</value>
-				<ref name="namespacedToken"/> 
-			</choice> 
-		</attribute> 
-	</optional> 
-	<optional>
-		<attribute name="manifest:version">
-			<ref name="string"/>
-		</attribute>
-	</optional>
-  </interleave>
-</define>
-
-<define name="encryption-data">
-	<element name="manifest:encryption-data">
-		<ref name="encryption-data-attlist"/>
-		<ref name="algorithm"/>
-		<optional>
-			<ref name="start-key-generation"/>
-		</optional>
-		<ref name="key-derivation"/>
-	</element>
-</define>
-<define name="encryption-data-attlist">
-  <interleave>
-	<attribute name="manifest:checksum-type">
-		<choice>
-			<value>SHA1/1K</value>
-			<ref name="anyURI"/>
-		</choice>
-	</attribute>
-	<attribute name="manifest:checksum">
-		<ref name="base64Binary"/>
-	</attribute>
-  </interleave>
-</define>
-<define name="algorithm">
-	<element name="manifest:algorithm">
-		<ref name="algorithm-attlist"/>
-		<ref name="anyElements"/>
-	</element>
-</define>
-<define name="algorithm-attlist">
-  <interleave>
-	<attribute name="manifest:algorithm-name">
-		<choice>
-			<value>Blowfish CFB</value>
-			<ref name="anyURI"/>
-		</choice>
-	</attribute>
-	<attribute name="manifest:initialisation-vector">
-		<ref name="base64Binary"/>
-	</attribute>
-  </interleave>
-</define>
-<define name="anyAttListOrElements">
-	<zeroOrMore>
-		<attribute>
-			<anyName/>
-			<text/>
-		</attribute>
-	</zeroOrMore>
-	<ref name="anyElements"/>
-</define>
-<define name="anyElements">
-	<zeroOrMore>
-		<element>
-			<anyName/>
-			<mixed>
-				<ref name="anyAttListOrElements"/>
-			</mixed>
-		</element>
-	</zeroOrMore>
-</define>
-<define name="key-derivation">
-	<element name="manifest:key-derivation">
-		<ref name="key-derivation-attlist"/>
-		<empty/>
-	</element>
-</define>
-<define name="key-derivation-attlist">
-  <interleave>
-	<attribute name="manifest:key-derivation-name">
-		<choice>
-			<value>PBKDF2</value>
-			<ref name="anyURI"/>
-		</choice>
-	</attribute>
-	<attribute name="manifest:salt">
-		<ref name="base64Binary"/>
-	</attribute>
-	<attribute name="manifest:iteration-count">
-			<ref name="nonNegativeInteger"/>
-		</attribute>
-	<optional>
-		<attribute name="manifest:key-size">
-			<ref name="nonNegativeInteger"/>
-		</attribute>
-	</optional>
-  </interleave>
-</define>
-<define name="start-key-generation">
-	<element name="manifest:start-key-generation">
-		<ref name="start-key-generation-attlist"/>
-		<empty/>
-	</element>
-</define>
-<define name="start-key-generation-attlist">
-  <interleave>
-	<attribute name="manifest:start-key-generation-name">
-		<choice>
-			<value>SHA1</value>
-			<ref name="anyURI"/>
-		</choice>
-	</attribute>
-	<optional>
-		<attribute name="manifest:key-size">
-			<ref name="nonNegativeInteger"/>
-		</attribute>
-	</optional>
-  </interleave>
-</define>
-<define name="base64Binary">
-	<data type="base64Binary"/>
-</define>
-<define name="namespacedToken">
-	<data type="QName">
-		<param name="pattern">[^:]+:[^:]+</param>
-	</data>
-</define>
-<define name="nonNegativeInteger">
-	<data type="nonNegativeInteger"/>
-</define>
-<define name="string">
-	<data type="string"/>
-</define>
-<define name="anyURI">
-	<data type="anyURI"/>
-</define>
-</grammar>
diff --git a/apps/files_odfviewer/src/webodf/programs/docnosis/OpenDocument-v1.2-cos01-schema.rng b/apps/files_odfviewer/src/webodf/programs/docnosis/OpenDocument-v1.2-cos01-schema.rng
deleted file mode 100644
index bd57af13f7..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/docnosis/OpenDocument-v1.2-cos01-schema.rng
+++ /dev/null
@@ -1,18127 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-        Open Document Format for Office Applications (OpenDocument) Version 1.2
-        Candidate OASIS Standard (COS) 01, 10 May 2011
-	Relax-NG Schema
-        Source: http://docs.oasis-open.org/office/v1.2/cos01/
-        Copyright (c) OASIS Open 2002-2011. All Rights Reserved.
-
-	All capitalized terms in the following text have the meanings assigned to them
-	in the OASIS Intellectual Property Rights Policy (the "OASIS IPR Policy"). The
-	full Policy may be found at the OASIS website.
-
-	This document and translations of it may be copied and furnished to others, and
-	derivative works that comment on or otherwise explain it or assist in its
-	implementation may be prepared, copied, published, and distributed, in whole or
-	in part, without restriction of any kind, provided that the above copyright
-	notice and this section are included on all such copies and derivative works.
-	However, this document itself may not be modified in any way, including by
-	removing the copyright notice or references to OASIS, except as needed for the
-	purpose of developing any document or deliverable produced by an OASIS
-	Technical Committee (in which case the rules applicable to copyrights, as set
-	forth in the OASIS IPR Policy, must be followed) or as required to translate it
-	into languages other than English.
-
-	The limited permissions granted above are perpetual and will not be revoked by
-	OASIS or its successors or assigns.
-
-	This document and the information contained herein is provided on an "AS IS"
-	basis and OASIS DISCLAIMS ALL WARRANTIES, EXPRESS OR IMPLIED, INCLUDING BUT NOT
-	LIMITED TO ANY WARRANTY THAT THE USE OF THE INFORMATION HEREIN WILL NOT
-	INFRINGE ANY OWNERSHIP RIGHTS OR ANY IMPLIED WARRANTIES OF MERCHANTABILITY OR
-	FITNESS FOR A PARTICULAR PURPOSE. 
--->
-<grammar
-	xmlns="http://relaxng.org/ns/structure/1.0"
-
-	datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
-
-	xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
-	xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0"
-	xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0"
-	xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
-	xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0"
-	xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
-	xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0"
-	xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0"
-	xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
-	xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0"
-	xmlns:db="urn:oasis:names:tc:opendocument:xmlns:database:1.0"
-	xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0"
-	xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
-	xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0"
-	xmlns:anim="urn:oasis:names:tc:opendocument:xmlns:animation:1.0"
-
-	xmlns:dc="http://purl.org/dc/elements/1.1/"
-	xmlns:xlink="http://www.w3.org/1999/xlink"
-	xmlns:math="http://www.w3.org/1998/Math/MathML"
-	xmlns:xforms="http://www.w3.org/2002/xforms"
-	xmlns:grddl="http://www.w3.org/2003/g/data-view#"
-	xmlns:xhtml="http://www.w3.org/1999/xhtml"
-
-	xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0"
-	xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0"
-	xmlns:smil="urn:oasis:names:tc:opendocument:xmlns:smil-compatible:1.0"
->
-	<define name="office-process-content">
-		<optional>
-			<attribute name="office:process-content">
-				<ref name="boolean"/>
-			</attribute>
-		</optional>
-	</define>
-	<start>
-		<choice>
-			<ref name="office-document"/>
-			<ref name="office-document-content"/>
-			<ref name="office-document-styles"/>
-			<ref name="office-document-meta"/>
-			<ref name="office-document-settings"/>
-		</choice>
-	</start>
-	<define name="office-document">
-		<element name="office:document">
-			<ref name="office-document-attrs"/>
-			<ref name="office-document-common-attrs"/>
-			<ref name="office-meta"/>
-			<ref name="office-settings"/>
-			<ref name="office-scripts"/>
-			<ref name="office-font-face-decls"/>
-			<ref name="office-styles"/>
-			<ref name="office-automatic-styles"/>
-			<ref name="office-master-styles"/>
-			<ref name="office-body"/>
-		</element>
-	</define>
-	<define name="office-document-content">
-		<element name="office:document-content">
-			<ref name="office-document-common-attrs"/>
-			<ref name="office-scripts"/>
-			<ref name="office-font-face-decls"/>
-			<ref name="office-automatic-styles"/>
-			<ref name="office-body"/>
-		</element>
-	</define>
-	<define name="office-document-styles">
-		<element name="office:document-styles">
-			<ref name="office-document-common-attrs"/>
-			<ref name="office-font-face-decls"/>
-			<ref name="office-styles"/>
-			<ref name="office-automatic-styles"/>
-			<ref name="office-master-styles"/>
-		</element>
-	</define>
-	<define name="office-document-meta">
-		<element name="office:document-meta">
-			<ref name="office-document-common-attrs"/>
-			<ref name="office-meta"/>
-		</element>
-	</define>
-	<define name="office-document-settings">
-		<element name="office:document-settings">
-			<ref name="office-document-common-attrs"/>
-			<ref name="office-settings"/>
-		</element>
-	</define>
-	<define name="office-document-common-attrs">
-		<interleave>
-			<attribute name="office:version">
-				<value>1.2</value>
-			</attribute>
-			<optional>
-				<attribute name="grddl:transformation">
-					<list>
-						<zeroOrMore>
-							<ref name="anyIRI"/>
-						</zeroOrMore>
-					</list>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="office-document-attrs">
-		<attribute name="office:mimetype">
-			<ref name="string"/>
-		</attribute>
-	</define>
-	<define name="office-meta">
-		<optional>
-			<element name="office:meta">
-				<ref name="office-meta-content-strict"/>
-			</element>
-		</optional>
-	</define>
-	<define name="office-meta-content-strict">
-		<zeroOrMore>
-			<ref name="office-meta-data"/>
-		</zeroOrMore>
-	</define>
-	<define name="office-body">
-		<element name="office:body">
-			<ref name="office-body-content"/>
-		</element>
-	</define>
-	<define name="office-body-content">
-		<choice>
-			<element name="office:text">
-				<ref name="office-text-attlist"/>
-				<ref name="office-text-content-prelude"/>
-				<ref name="office-text-content-main"/>
-				<ref name="office-text-content-epilogue"/>
-			</element>
-			<element name="office:drawing">
-				<ref name="office-drawing-attlist"/>
-				<ref name="office-drawing-content-prelude"/>
-				<ref name="office-drawing-content-main"/>
-				<ref name="office-drawing-content-epilogue"/>
-			</element>
-			<element name="office:presentation">
-				<ref name="office-presentation-attlist"/>
-				<ref name="office-presentation-content-prelude"/>
-				<ref name="office-presentation-content-main"/>
-				<ref name="office-presentation-content-epilogue"/>
-			</element>
-			<element name="office:spreadsheet">
-				<ref name="office-spreadsheet-attlist"/>
-				<ref name="office-spreadsheet-content-prelude"/>
-				<ref name="office-spreadsheet-content-main"/>
-				<ref name="office-spreadsheet-content-epilogue"/>
-			</element>
-			<element name="office:chart">
-				<ref name="office-chart-attlist"/>
-				<ref name="office-chart-content-prelude"/>
-				<ref name="office-chart-content-main"/>
-				<ref name="office-chart-content-epilogue"/>
-			</element>
-			<element name="office:image">
-				<ref name="office-image-attlist"/>
-				<ref name="office-image-content-prelude"/>
-				<ref name="office-image-content-main"/>
-				<ref name="office-image-content-epilogue"/>
-			</element>
-			<ref name="office-database"/>
-		</choice>
-	</define>
-	<define name="office-text-content-prelude">
-		<ref name="office-forms"/>
-		<ref name="text-tracked-changes"/>
-		<ref name="text-decls"/>
-		<ref name="table-decls"/>
-	</define>
-	<define name="office-text-content-main">
-		<choice>
-			<zeroOrMore>
-				<ref name="text-content"/>
-			</zeroOrMore>
-			<group>
-				<ref name="text-page-sequence"/>
-				<zeroOrMore>
-					<choice>
-						<ref name="shape"/>
-					</choice>
-				</zeroOrMore>
-			</group>
-		</choice>
-	</define>
-	<define name="text-content">
-		<choice>
-			<ref name="text-h"/>
-			<ref name="text-p"/>
-			<ref name="text-list"/>
-			<ref name="text-numbered-paragraph"/>
-			<ref name="table-table"/>
-			<ref name="text-section"/>
-			<ref name="text-soft-page-break"/>
-			<ref name="text-table-of-content"/>
-			<ref name="text-illustration-index"/>
-			<ref name="text-table-index"/>
-			<ref name="text-object-index"/>
-			<ref name="text-user-index"/>
-			<ref name="text-alphabetical-index"/>
-			<ref name="text-bibliography"/>
-			<ref name="shape"/>
-			<ref name="change-marks"/>
-		</choice>
-	</define>
-	<define name="office-text-content-epilogue">
-		<ref name="table-functions"/>
-	</define>
-	<define name="office-text-attlist">
-		<interleave>
-			<optional>
-				<attribute name="text:global">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:use-soft-page-breaks">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="office-drawing-attlist">
-		<empty/>
-	</define>
-	<define name="office-drawing-content-prelude">
-		<ref name="text-decls"/>
-		<ref name="table-decls"/>
-	</define>
-	<define name="office-drawing-content-main">
-		<zeroOrMore>
-			<ref name="draw-page"/>
-		</zeroOrMore>
-	</define>
-	<define name="office-drawing-content-epilogue">
-		<ref name="table-functions"/>
-	</define>
-	<define name="office-presentation-attlist">
-		<empty/>
-	</define>
-	<define name="office-presentation-content-prelude">
-		<ref name="text-decls"/>
-		<ref name="table-decls"/>
-		<ref name="presentation-decls"/>
-	</define>
-	<define name="office-presentation-content-main">
-		<zeroOrMore>
-			<ref name="draw-page"/>
-		</zeroOrMore>
-	</define>
-	<define name="office-presentation-content-epilogue">
-		<ref name="presentation-settings"/>
-		<ref name="table-functions"/>
-	</define>
-	<define name="office-spreadsheet-content-prelude">
-		<optional>
-			<ref name="table-tracked-changes"/>
-		</optional>
-		<ref name="text-decls"/>
-		<ref name="table-decls"/>
-	</define>
-	<define name="table-decls">
-		<optional>
-			<ref name="table-calculation-settings"/>
-		</optional>
-		<optional>
-			<ref name="table-content-validations"/>
-		</optional>
-		<optional>
-			<ref name="table-label-ranges"/>
-		</optional>
-	</define>
-	<define name="office-spreadsheet-content-main">
-		<zeroOrMore>
-			<ref name="table-table"/>
-		</zeroOrMore>
-	</define>
-	<define name="office-spreadsheet-content-epilogue">
-		<ref name="table-functions"/>
-	</define>
-	<define name="table-functions">
-		<optional>
-			<ref name="table-named-expressions"/>
-		</optional>
-		<optional>
-			<ref name="table-database-ranges"/>
-		</optional>
-		<optional>
-			<ref name="table-data-pilot-tables"/>
-		</optional>
-		<optional>
-			<ref name="table-consolidation"/>
-		</optional>
-		<optional>
-			<ref name="table-dde-links"/>
-		</optional>
-	</define>
-	<define name="office-chart-attlist">
-		<empty/>
-	</define>
-	<define name="office-chart-content-prelude">
-		<ref name="text-decls"/>
-		<ref name="table-decls"/>
-	</define>
-	<define name="office-chart-content-main">
-		<ref name="chart-chart"/>
-	</define>
-	<define name="office-chart-content-epilogue">
-		<ref name="table-functions"/>
-	</define>
-	<define name="office-image-attlist">
-		<empty/>
-	</define>
-	<define name="office-image-content-prelude">
-		<empty/>
-	</define>
-	<define name="office-image-content-main">
-		<ref name="draw-frame"/>
-	</define>
-	<define name="office-image-content-epilogue">
-		<empty/>
-	</define>
-	<define name="office-settings">
-		<optional>
-			<element name="office:settings">
-				<oneOrMore>
-					<ref name="config-config-item-set"/>
-				</oneOrMore>
-			</element>
-		</optional>
-	</define>
-	<define name="config-config-item-set">
-		<element name="config:config-item-set">
-			<ref name="config-config-item-set-attlist"/>
-			<ref name="config-items"/>
-		</element>
-	</define>
-	<define name="config-items">
-		<oneOrMore>
-			<choice>
-				<ref name="config-config-item"/>
-				<ref name="config-config-item-set"/>
-				<ref name="config-config-item-map-named"/>
-				<ref name="config-config-item-map-indexed"/>
-			</choice>
-		</oneOrMore>
-	</define>
-	<define name="config-config-item-set-attlist">
-		<attribute name="config:name">
-			<ref name="string"/>
-		</attribute>
-	</define>
-	<define name="config-config-item">
-		<element name="config:config-item">
-			<ref name="config-config-item-attlist"/>
-			<text/>
-		</element>
-	</define>
-	<define name="config-config-item-attlist">
-		<interleave>
-			<attribute name="config:name">
-				<ref name="string"/>
-			</attribute>
-			<attribute name="config:type">
-				<choice>
-					<value>boolean</value>
-					<value>short</value>
-					<value>int</value>
-					<value>long</value>
-					<value>double</value>
-					<value>string</value>
-					<value>datetime</value>
-					<value>base64Binary</value>
-				</choice>
-			</attribute>
-		</interleave>
-	</define>
-	<define name="config-config-item-map-indexed">
-		<element name="config:config-item-map-indexed">
-			<ref name="config-config-item-map-indexed-attlist"/>
-			<oneOrMore>
-				<ref name="config-config-item-map-entry"/>
-			</oneOrMore>
-		</element>
-	</define>
-	<define name="config-config-item-map-indexed-attlist">
-		<attribute name="config:name">
-			<ref name="string"/>
-		</attribute>
-	</define>
-	<define name="config-config-item-map-entry">
-		<element name="config:config-item-map-entry">
-			<ref name="config-config-item-map-entry-attlist"/>
-			<ref name="config-items"/>
-		</element>
-	</define>
-	<define name="config-config-item-map-entry-attlist">
-		<optional>
-			<attribute name="config:name">
-				<ref name="string"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="config-config-item-map-named">
-		<element name="config:config-item-map-named">
-			<ref name="config-config-item-map-named-attlist"/>
-			<oneOrMore>
-				<ref name="config-config-item-map-entry"/>
-			</oneOrMore>
-		</element>
-	</define>
-	<define name="config-config-item-map-named-attlist">
-		<attribute name="config:name">
-			<ref name="string"/>
-		</attribute>
-	</define>
-	<define name="office-scripts">
-		<optional>
-			<element name="office:scripts">
-				<zeroOrMore>
-					<ref name="office-script"/>
-				</zeroOrMore>
-				<optional>
-					<ref name="office-event-listeners"/>
-				</optional>
-			</element>
-		</optional>
-	</define>
-	<define name="office-script">
-		<element name="office:script">
-			<ref name="office-script-attlist"/>
-			<mixed>
-				<ref name="anyElements"/>
-			</mixed>
-		</element>
-	</define>
-	<define name="office-script-attlist">
-		<attribute name="script:language">
-			<ref name="string"/>
-		</attribute>
-	</define>
-	<define name="office-font-face-decls">
-		<optional>
-			<element name="office:font-face-decls">
-				<zeroOrMore>
-					<ref name="style-font-face"/>
-				</zeroOrMore>
-			</element>
-		</optional>
-	</define>
-	<define name="office-styles">
-		<optional>
-			<element name="office:styles">
-				<interleave>
-					<ref name="styles"/>
-					<zeroOrMore>
-						<ref name="style-default-style"/>
-					</zeroOrMore>
-					<optional>
-						<ref name="style-default-page-layout"/>
-					</optional>
-					<optional>
-						<ref name="text-outline-style"/>
-					</optional>
-					<zeroOrMore>
-						<ref name="text-notes-configuration"/>
-					</zeroOrMore>
-					<optional>
-						<ref name="text-bibliography-configuration"/>
-					</optional>
-					<optional>
-						<ref name="text-linenumbering-configuration"/>
-					</optional>
-					<zeroOrMore>
-						<ref name="draw-gradient"/>
-					</zeroOrMore>
-					<zeroOrMore>
-						<ref name="svg-linearGradient"/>
-					</zeroOrMore>
-					<zeroOrMore>
-						<ref name="svg-radialGradient"/>
-					</zeroOrMore>
-					<zeroOrMore>
-						<ref name="draw-hatch"/>
-					</zeroOrMore>
-					<zeroOrMore>
-						<ref name="draw-fill-image"/>
-					</zeroOrMore>
-					<zeroOrMore>
-						<ref name="draw-marker"/>
-					</zeroOrMore>
-					<zeroOrMore>
-						<ref name="draw-stroke-dash"/>
-					</zeroOrMore>
-					<zeroOrMore>
-						<ref name="draw-opacity"/>
-					</zeroOrMore>
-					<zeroOrMore>
-						<ref name="style-presentation-page-layout"/>
-					</zeroOrMore>
-					<zeroOrMore>
-						<ref name="table-table-template"/>
-					</zeroOrMore>
-				</interleave>
-			</element>
-		</optional>
-	</define>
-	<define name="office-automatic-styles">
-		<optional>
-			<element name="office:automatic-styles">
-				<interleave>
-					<ref name="styles"/>
-					<zeroOrMore>
-						<ref name="style-page-layout"/>
-					</zeroOrMore>
-				</interleave>
-			</element>
-		</optional>
-	</define>
-	<define name="office-master-styles">
-		<optional>
-			<element name="office:master-styles">
-				<interleave>
-					<zeroOrMore>
-						<ref name="style-master-page"/>
-					</zeroOrMore>
-					<optional>
-						<ref name="style-handout-master"/>
-					</optional>
-					<optional>
-						<ref name="draw-layer-set"/>
-					</optional>
-				</interleave>
-			</element>
-		</optional>
-	</define>
-	<define name="styles">
-		<interleave>
-			<zeroOrMore>
-				<ref name="style-style"/>
-			</zeroOrMore>
-			<zeroOrMore>
-				<ref name="text-list-style"/>
-			</zeroOrMore>
-			<zeroOrMore>
-				<ref name="number-number-style"/>
-			</zeroOrMore>
-			<zeroOrMore>
-				<ref name="number-currency-style"/>
-			</zeroOrMore>
-			<zeroOrMore>
-				<ref name="number-percentage-style"/>
-			</zeroOrMore>
-			<zeroOrMore>
-				<ref name="number-date-style"/>
-			</zeroOrMore>
-			<zeroOrMore>
-				<ref name="number-time-style"/>
-			</zeroOrMore>
-			<zeroOrMore>
-				<ref name="number-boolean-style"/>
-			</zeroOrMore>
-			<zeroOrMore>
-				<ref name="number-text-style"/>
-			</zeroOrMore>
-		</interleave>
-	</define>
-	<define name="office-meta-data">
-		<choice>
-			<element name="meta:generator">
-				<ref name="string"/>
-			</element>
-			<element name="dc:title">
-				<ref name="string"/>
-			</element>
-			<element name="dc:description">
-				<ref name="string"/>
-			</element>
-			<element name="dc:subject">
-				<ref name="string"/>
-			</element>
-			<element name="meta:keyword">
-				<ref name="string"/>
-			</element>
-			<element name="meta:initial-creator">
-				<ref name="string"/>
-			</element>
-			<ref name="dc-creator"/>
-			<element name="meta:printed-by">
-				<ref name="string"/>
-			</element>
-			<element name="meta:creation-date">
-				<ref name="dateTime"/>
-			</element>
-			<ref name="dc-date"/>
-			<element name="meta:print-date">
-				<ref name="dateTime"/>
-			</element>
-			<element name="meta:template">
-				<attribute name="xlink:type">
-					<value>simple</value>
-				</attribute>
-				<attribute name="xlink:href">
-					<ref name="anyIRI"/>
-				</attribute>
-				<optional>
-					<attribute name="xlink:actuate">
-						<value>onRequest</value>
-					</attribute>
-				</optional>
-				<optional>
-					<attribute name="xlink:title">
-						<ref name="string"/>
-					</attribute>
-				</optional>
-				<optional>
-					<attribute name="meta:date">
-						<ref name="dateTime"/>
-					</attribute>
-				</optional>
-			</element>
-			<element name="meta:auto-reload">
-				<optional>
-					<attribute name="xlink:type">
-						<value>simple</value>
-					</attribute>
-					<attribute name="xlink:href">
-						<ref name="anyIRI"/>
-					</attribute>
-					<optional>
-						<attribute name="xlink:show">
-							<value>replace</value>
-						</attribute>
-					</optional>
-					<optional>
-						<attribute name="xlink:actuate">
-							<value>onLoad</value>
-						</attribute>
-					</optional>
-				</optional>
-				<optional>
-					<attribute name="meta:delay">
-						<ref name="duration"/>
-					</attribute>
-				</optional>
-			</element>
-			<element name="meta:hyperlink-behaviour">
-				<optional>
-					<attribute name="office:target-frame-name">
-						<ref name="targetFrameName"/>
-					</attribute>
-				</optional>
-				<optional>
-					<attribute name="xlink:show">
-						<choice>
-							<value>new</value>
-							<value>replace</value>
-						</choice>
-					</attribute>
-				</optional>
-			</element>
-			<element name="dc:language">
-				<ref name="language"/>
-			</element>
-			<element name="meta:editing-cycles">
-				<ref name="nonNegativeInteger"/>
-			</element>
-			<element name="meta:editing-duration">
-				<ref name="duration"/>
-			</element>
-			<element name="meta:document-statistic">
-				<optional>
-					<attribute name="meta:page-count">
-						<ref name="nonNegativeInteger"/>
-					</attribute>
-				</optional>
-				<optional>
-					<attribute name="meta:table-count">
-						<ref name="nonNegativeInteger"/>
-					</attribute>
-				</optional>
-				<optional>
-					<attribute name="meta:draw-count">
-						<ref name="nonNegativeInteger"/>
-					</attribute>
-				</optional>
-				<optional>
-					<attribute name="meta:image-count">
-						<ref name="nonNegativeInteger"/>
-					</attribute>
-				</optional>
-				<optional>
-					<attribute name="meta:ole-object-count">
-						<ref name="nonNegativeInteger"/>
-					</attribute>
-				</optional>
-				<optional>
-					<attribute name="meta:object-count">
-						<ref name="nonNegativeInteger"/>
-					</attribute>
-				</optional>
-				<optional>
-					<attribute name="meta:paragraph-count">
-						<ref name="nonNegativeInteger"/>
-					</attribute>
-				</optional>
-				<optional>
-					<attribute name="meta:word-count">
-						<ref name="nonNegativeInteger"/>
-					</attribute>
-				</optional>
-				<optional>
-					<attribute name="meta:character-count">
-						<ref name="nonNegativeInteger"/>
-					</attribute>
-				</optional>
-				<optional>
-					<attribute name="meta:frame-count">
-						<ref name="nonNegativeInteger"/>
-					</attribute>
-				</optional>
-				<optional>
-					<attribute name="meta:sentence-count">
-						<ref name="nonNegativeInteger"/>
-					</attribute>
-				</optional>
-				<optional>
-					<attribute name="meta:syllable-count">
-						<ref name="nonNegativeInteger"/>
-					</attribute>
-				</optional>
-				<optional>
-					<attribute name="meta:non-whitespace-character-count">
-						<ref name="nonNegativeInteger"/>
-					</attribute>
-				</optional>
-				<optional>
-					<attribute name="meta:row-count">
-						<ref name="nonNegativeInteger"/>
-					</attribute>
-				</optional>
-				<optional>
-					<attribute name="meta:cell-count">
-						<ref name="nonNegativeInteger"/>
-					</attribute>
-				</optional>
-			</element>
-			<element name="meta:user-defined">
-				<attribute name="meta:name">
-					<ref name="string"/>
-				</attribute>
-				<choice>
-					<group>
-						<attribute name="meta:value-type">
-							<value>float</value>
-						</attribute>
-						<ref name="double"/>
-					</group>
-					<group>
-						<attribute name="meta:value-type">
-							<value>date</value>
-						</attribute>
-						<ref name="dateOrDateTime"/>
-					</group>
-					<group>
-						<attribute name="meta:value-type">
-							<value>time</value>
-						</attribute>
-						<ref name="duration"/>
-					</group>
-					<group>
-						<attribute name="meta:value-type">
-							<value>boolean</value>
-						</attribute>
-						<ref name="boolean"/>
-					</group>
-					<group>
-						<attribute name="meta:value-type">
-							<value>string</value>
-						</attribute>
-						<ref name="string"/>
-					</group>
-					<text/>
-				</choice>
-			</element>
-		</choice>
-	</define>
-	<define name="dc-creator">
-		<element name="dc:creator">
-			<ref name="string"/>
-		</element>
-	</define>
-	<define name="dc-date">
-		<element name="dc:date">
-			<ref name="dateTime"/>
-		</element>
-	</define>
-	<define name="text-h">
-		<element name="text:h">
-			<ref name="heading-attrs"/>
-			<ref name="paragraph-attrs"/>
-			<optional>
-				<ref name="text-number"/>
-			</optional>
-			<zeroOrMore>
-				<ref name="paragraph-content-or-hyperlink"/>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="heading-attrs">
-		<interleave>
-			<attribute name="text:outline-level">
-				<ref name="positiveInteger"/>
-			</attribute>
-			<optional>
-				<attribute name="text:restart-numbering">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:start-value">
-					<ref name="nonNegativeInteger"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:is-list-header">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="text-number">
-		<element name="text:number">
-			<ref name="string"/>
-		</element>
-	</define>
-	<define name="text-p">
-		<element name="text:p">
-			<ref name="paragraph-attrs"/>
-			<zeroOrMore>
-				<ref name="paragraph-content-or-hyperlink"/>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="paragraph-attrs">
-		<interleave>
-			<optional>
-				<attribute name="text:style-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:class-names">
-					<ref name="styleNameRefs"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:cond-style-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-			<optional>
-				<group>
-					<ref name="xml-id"/>
-					<optional>
-						<attribute name="text:id">
-							<ref name="NCName"/>
-						</attribute>
-					</optional>
-				</group>
-			</optional>
-			<optional>
-				<ref name="common-in-content-meta-attlist"/>
-			</optional>
-		</interleave>
-	</define>
-	<define name="text-page-sequence">
-		<element name="text:page-sequence">
-			<oneOrMore>
-				<ref name="text-page"/>
-			</oneOrMore>
-		</element>
-	</define>
-	<define name="text-page">
-		<element name="text:page">
-			<ref name="text-page-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="text-page-attlist">
-		<attribute name="text:master-page-name">
-			<ref name="styleNameRef"/>
-		</attribute>
-	</define>
-	<define name="text-list">
-		<element name="text:list">
-			<ref name="text-list-attr"/>
-			<optional>
-				<ref name="text-list-header"/>
-			</optional>
-			<zeroOrMore>
-				<ref name="text-list-item"/>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="text-list-attr">
-		<interleave>
-			<optional>
-				<attribute name="text:style-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:continue-numbering">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:continue-list">
-					<ref name="IDREF"/>
-				</attribute>
-			</optional>
-			<optional>
-				<ref name="xml-id"/>
-			</optional>
-		</interleave>
-	</define>
-	<define name="text-list-item">
-		<element name="text:list-item">
-			<ref name="text-list-item-attr"/>
-			<ref name="text-list-item-content"/>
-		</element>
-	</define>
-	<define name="text-list-item-content">
-		<optional>
-			<ref name="text-number"/>
-		</optional>
-		<zeroOrMore>
-			<choice>
-				<ref name="text-p"/>
-				<ref name="text-h"/>
-				<ref name="text-list"/>
-				<ref name="text-soft-page-break"/>
-			</choice>
-		</zeroOrMore>
-	</define>
-	<define name="text-list-item-attr">
-		<interleave>
-			<optional>
-				<attribute name="text:start-value">
-					<ref name="nonNegativeInteger"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:style-override">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-			<optional>
-				<ref name="xml-id"/>
-			</optional>
-		</interleave>
-	</define>
-	<define name="text-list-header">
-		<element name="text:list-header">
-			<ref name="text-list-header-attr"/>
-			<ref name="text-list-item-content"/>
-		</element>
-	</define>
-	<define name="text-list-header-attr">
-		<optional>
-			<ref name="xml-id"/>
-		</optional>
-	</define>
-	<define name="text-numbered-paragraph">
-		<element name="text:numbered-paragraph">
-			<ref name="text-numbered-paragraph-attr"/>
-			<optional>
-				<ref name="text-number"/>
-			</optional>
-			<choice>
-				<ref name="text-p"/>
-				<ref name="text-h"/>
-			</choice>
-		</element>
-	</define>
-	<define name="text-numbered-paragraph-attr">
-		<interleave>
-			<attribute name="text:list-id">
-				<ref name="NCName"/>
-			</attribute>
-			<optional>
-				<attribute name="text:level">
-					<ref name="positiveInteger"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:style-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-				<attribute name="text:continue-numbering">
-					<ref name="boolean"/>
-				</attribute>
-				<attribute name="text:start-value">
-					<ref name="nonNegativeInteger"/>
-				</attribute>
-			</optional>
-			<optional>
-				<ref name="xml-id"/>
-			</optional>
-		</interleave>
-	</define>
-	<define name="text-section">
-		<element name="text:section">
-			<ref name="text-section-attlist"/>
-			<choice>
-				<ref name="text-section-source"/>
-				<ref name="text-section-source-dde"/>
-				<empty/>
-			</choice>
-			<zeroOrMore>
-				<ref name="text-content"/>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="text-section-attlist">
-		<interleave>
-			<ref name="common-section-attlist"/>
-			<choice>
-				<attribute name="text:display">
-					<choice>
-						<value>true</value>
-						<value>none</value>
-					</choice>
-				</attribute>
-				<group>
-					<attribute name="text:display">
-						<value>condition</value>
-					</attribute>
-					<attribute name="text:condition">
-						<ref name="string"/>
-					</attribute>
-				</group>
-				<empty/>
-			</choice>
-		</interleave>
-	</define>
-	<define name="common-section-attlist">
-		<interleave>
-			<optional>
-				<attribute name="text:style-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-			<attribute name="text:name">
-				<ref name="string"/>
-			</attribute>
-			<optional>
-				<attribute name="text:protected">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:protection-key">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:protection-key-digest-algorithm">
-					<ref name="anyIRI"/>
-				</attribute>
-			</optional>
-			<optional>
-				<ref name="xml-id"/>
-			</optional>
-		</interleave>
-	</define>
-	<define name="text-section-source">
-		<element name="text:section-source">
-			<ref name="text-section-source-attr"/>
-		</element>
-	</define>
-	<define name="text-section-source-attr">
-		<interleave>
-			<optional>
-				<attribute name="xlink:type">
-					<value>simple</value>
-				</attribute>
-				<attribute name="xlink:href">
-					<ref name="anyIRI"/>
-				</attribute>
-				<optional>
-					<attribute name="xlink:show">
-						<value>embed</value>
-					</attribute>
-				</optional>
-			</optional>
-			<optional>
-				<attribute name="text:section-name">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:filter-name">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="text-section-source-dde">
-		<ref name="office-dde-source"/>
-	</define>
-	<define name="text-tracked-changes">
-		<optional>
-			<element name="text:tracked-changes">
-				<ref name="text-tracked-changes-attr"/>
-				<zeroOrMore>
-					<ref name="text-changed-region"/>
-				</zeroOrMore>
-			</element>
-		</optional>
-	</define>
-	<define name="text-tracked-changes-attr">
-		<optional>
-			<attribute name="text:track-changes">
-				<ref name="boolean"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="text-changed-region">
-		<element name="text:changed-region">
-			<ref name="text-changed-region-attr"/>
-			<ref name="text-changed-region-content"/>
-		</element>
-	</define>
-	<define name="text-changed-region-attr">
-		<group>
-			<ref name="xml-id"/>
-			<optional>
-				<attribute name="text:id">
-					<ref name="NCName"/>
-				</attribute>
-			</optional>
-		</group>
-	</define>
-	<define name="text-changed-region-content">
-		<choice>
-			<element name="text:insertion">
-				<ref name="office-change-info"/>
-			</element>
-			<element name="text:deletion">
-				<ref name="office-change-info"/>
-				<zeroOrMore>
-					<ref name="text-content"/>
-				</zeroOrMore>
-			</element>
-			<element name="text:format-change">
-				<ref name="office-change-info"/>
-			</element>
-		</choice>
-	</define>
-	<define name="change-marks">
-		<choice>
-			<element name="text:change">
-				<ref name="change-mark-attr"/>
-			</element>
-			<element name="text:change-start">
-				<ref name="change-mark-attr"/>
-			</element>
-			<element name="text:change-end">
-				<ref name="change-mark-attr"/>
-			</element>
-		</choice>
-	</define>
-	<define name="change-mark-attr">
-		<attribute name="text:change-id">
-			<ref name="IDREF"/>
-		</attribute>
-	</define>
-	<define name="text-soft-page-break">
-		<element name="text:soft-page-break">
-			<empty/>
-		</element>
-	</define>
-	<define name="text-decls">
-		<optional>
-			<element name="text:variable-decls">
-				<zeroOrMore>
-					<ref name="text-variable-decl"/>
-				</zeroOrMore>
-			</element>
-		</optional>
-		<optional>
-			<element name="text:sequence-decls">
-				<zeroOrMore>
-					<ref name="text-sequence-decl"/>
-				</zeroOrMore>
-			</element>
-		</optional>
-		<optional>
-			<element name="text:user-field-decls">
-				<zeroOrMore>
-					<ref name="text-user-field-decl"/>
-				</zeroOrMore>
-			</element>
-		</optional>
-		<optional>
-			<element name="text:dde-connection-decls">
-				<zeroOrMore>
-					<ref name="text-dde-connection-decl"/>
-				</zeroOrMore>
-			</element>
-		</optional>
-		<optional>
-			<ref name="text-alphabetical-index-auto-mark-file"/>
-		</optional>
-	</define>
-	<define name="paragraph-content-or-hyperlink">
-		<choice>
-			<ref name="paragraph-content"/>
-			<ref name="text-a"/>
-		</choice>
-	</define>
-	<define name="paragraph-content">
-		<choice>
-			<text/>
-			<element name="text:s">
-				<optional>
-					<attribute name="text:c">
-						<ref name="nonNegativeInteger"/>
-					</attribute>
-				</optional>
-			</element>
-			<element name="text:tab">
-				<ref name="text-tab-attr"/>
-			</element>
-			<element name="text:line-break">
-				<empty/>
-			</element>
-			<ref name="text-soft-page-break"/>
-			<element name="text:span">
-				<optional>
-					<attribute name="text:style-name">
-						<ref name="styleNameRef"/>
-					</attribute>
-				</optional>
-				<optional>
-					<attribute name="text:class-names">
-						<ref name="styleNameRefs"/>
-					</attribute>
-				</optional>
-				<zeroOrMore>
-					<ref name="paragraph-content-or-hyperlink"/>
-				</zeroOrMore>
-			</element>
-			<element name="text:meta">
-				<ref name="text-meta-attlist"/>
-				<zeroOrMore>
-					<ref name="paragraph-content-or-hyperlink"/>
-				</zeroOrMore>
-			</element>
-			<choice>
-				<ref name="text-bookmark"/>
-				<ref name="text-bookmark-start"/>
-				<ref name="text-bookmark-end"/>
-			</choice>
-			<element name="text:reference-mark">
-				<attribute name="text:name">
-					<ref name="string"/>
-				</attribute>
-			</element>
-			<choice>
-				<element name="text:reference-mark-start">
-					<attribute name="text:name">
-						<ref name="string"/>
-					</attribute>
-				</element>
-				<element name="text:reference-mark-end">
-					<attribute name="text:name">
-						<ref name="string"/>
-					</attribute>
-				</element>
-			</choice>
-			<element name="text:note">
-				<ref name="text-note-class"/>
-				<optional>
-					<attribute name="text:id">
-						<ref name="string"/>
-					</attribute>
-				</optional>
-				<element name="text:note-citation">
-					<optional>
-						<attribute name="text:label">
-							<ref name="string"/>
-						</attribute>
-					</optional>
-					<text/>
-				</element>
-				<element name="text:note-body">
-					<zeroOrMore>
-						<ref name="text-content"/>
-					</zeroOrMore>
-				</element>
-			</element>
-			<element name="text:ruby">
-				<optional>
-					<attribute name="text:style-name">
-						<ref name="styleNameRef"/>
-					</attribute>
-				</optional>
-				<element name="text:ruby-base">
-					<zeroOrMore>
-						<ref name="paragraph-content-or-hyperlink"/>
-					</zeroOrMore>
-				</element>
-				<element name="text:ruby-text">
-					<optional>
-						<attribute name="text:style-name">
-							<ref name="styleNameRef"/>
-						</attribute>
-					</optional>
-					<text/>
-				</element>
-			</element>
-			<choice>
-				<ref name="office-annotation"/>
-				<ref name="office-annotation-end"/>
-			</choice>
-			<ref name="change-marks"/>
-			<ref name="shape"/>
-			<element name="text:date">
-				<ref name="text-date-attlist"/>
-				<text/>
-			</element>
-			<element name="text:time">
-				<ref name="text-time-attlist"/>
-				<text/>
-			</element>
-			<element name="text:page-number">
-				<ref name="text-page-number-attlist"/>
-				<text/>
-			</element>
-			<element name="text:page-continuation">
-				<ref name="text-page-continuation-attlist"/>
-				<text/>
-			</element>
-			<element name="text:sender-firstname">
-				<ref name="common-field-fixed-attlist"/>
-				<text/>
-			</element>
-			<element name="text:sender-lastname">
-				<ref name="common-field-fixed-attlist"/>
-				<text/>
-			</element>
-			<element name="text:sender-initials">
-				<ref name="common-field-fixed-attlist"/>
-				<text/>
-			</element>
-			<element name="text:sender-title">
-				<ref name="common-field-fixed-attlist"/>
-				<text/>
-			</element>
-			<element name="text:sender-position">
-				<ref name="common-field-fixed-attlist"/>
-				<text/>
-			</element>
-			<element name="text:sender-email">
-				<ref name="common-field-fixed-attlist"/>
-				<text/>
-			</element>
-			<element name="text:sender-phone-private">
-				<ref name="common-field-fixed-attlist"/>
-				<text/>
-			</element>
-			<element name="text:sender-fax">
-				<ref name="common-field-fixed-attlist"/>
-				<text/>
-			</element>
-			<element name="text:sender-company">
-				<ref name="common-field-fixed-attlist"/>
-				<text/>
-			</element>
-			<element name="text:sender-phone-work">
-				<ref name="common-field-fixed-attlist"/>
-				<text/>
-			</element>
-			<element name="text:sender-street">
-				<ref name="common-field-fixed-attlist"/>
-				<text/>
-			</element>
-			<element name="text:sender-city">
-				<ref name="common-field-fixed-attlist"/>
-				<text/>
-			</element>
-			<element name="text:sender-postal-code">
-				<ref name="common-field-fixed-attlist"/>
-				<text/>
-			</element>
-			<element name="text:sender-country">
-				<ref name="common-field-fixed-attlist"/>
-				<text/>
-			</element>
-			<element name="text:sender-state-or-province">
-				<ref name="common-field-fixed-attlist"/>
-				<text/>
-			</element>
-			<element name="text:author-name">
-				<ref name="common-field-fixed-attlist"/>
-				<text/>
-			</element>
-			<element name="text:author-initials">
-				<ref name="common-field-fixed-attlist"/>
-				<text/>
-			</element>
-			<element name="text:chapter">
-				<ref name="text-chapter-attlist"/>
-				<text/>
-			</element>
-			<element name="text:file-name">
-				<ref name="text-file-name-attlist"/>
-				<text/>
-			</element>
-			<element name="text:template-name">
-				<ref name="text-template-name-attlist"/>
-				<text/>
-			</element>
-			<element name="text:sheet-name">
-				<text/>
-			</element>
-			<element name="text:variable-set">
-				<interleave>
-					<ref name="common-field-name-attlist"/>
-					<ref name="common-field-formula-attlist"/>
-					<ref name="common-value-and-type-attlist"/>
-					<ref name="common-field-display-value-none-attlist"/>
-					<ref name="common-field-data-style-name-attlist"/>
-				</interleave>
-				<text/>
-			</element>
-			<element name="text:variable-get">
-				<interleave>
-					<ref name="common-field-name-attlist"/>
-					<ref name="common-field-display-value-formula-attlist"/>
-					<ref name="common-field-data-style-name-attlist"/>
-				</interleave>
-				<text/>
-			</element>
-			<element name="text:variable-input">
-				<interleave>
-					<ref name="common-field-name-attlist"/>
-					<ref name="common-field-description-attlist"/>
-					<ref name="common-value-type-attlist"/>
-					<ref name="common-field-display-value-none-attlist"/>
-					<ref name="common-field-data-style-name-attlist"/>
-				</interleave>
-				<text/>
-			</element>
-			<element name="text:user-field-get">
-				<interleave>
-					<ref name="common-field-name-attlist"/>
-					<ref name="common-field-display-value-formula-none-attlist"/>
-					<ref name="common-field-data-style-name-attlist"/>
-				</interleave>
-				<text/>
-			</element>
-			<element name="text:user-field-input">
-				<interleave>
-					<ref name="common-field-name-attlist"/>
-					<ref name="common-field-description-attlist"/>
-					<ref name="common-field-data-style-name-attlist"/>
-				</interleave>
-				<text/>
-			</element>
-			<element name="text:sequence">
-				<interleave>
-					<ref name="common-field-name-attlist"/>
-					<ref name="common-field-formula-attlist"/>
-					<ref name="common-field-num-format-attlist"/>
-					<ref name="text-sequence-ref-name"/>
-				</interleave>
-				<text/>
-			</element>
-			<element name="text:expression">
-				<interleave>
-					<ref name="common-field-formula-attlist"/>
-					<optional>
-						<ref name="common-value-and-type-attlist"/>
-					</optional>
-					<ref name="common-field-display-value-formula-attlist"/>
-					<ref name="common-field-data-style-name-attlist"/>
-				</interleave>
-				<text/>
-			</element>
-			<element name="text:text-input">
-				<ref name="common-field-description-attlist"/>
-				<text/>
-			</element>
-			<element name="text:initial-creator">
-				<ref name="common-field-fixed-attlist"/>
-				<text/>
-			</element>
-			<element name="text:creation-date">
-				<interleave>
-					<ref name="common-field-fixed-attlist"/>
-					<ref name="common-field-data-style-name-attlist"/>
-					<optional>
-						<attribute name="text:date-value">
-							<ref name="dateOrDateTime"/>
-						</attribute>
-					</optional>
-				</interleave>
-				<text/>
-			</element>
-			<element name="text:creation-time">
-				<interleave>
-					<ref name="common-field-fixed-attlist"/>
-					<ref name="common-field-data-style-name-attlist"/>
-					<optional>
-						<attribute name="text:time-value">
-							<ref name="timeOrDateTime"/>
-						</attribute>
-					</optional>
-				</interleave>
-				<text/>
-			</element>
-			<element name="text:description">
-				<ref name="common-field-fixed-attlist"/>
-				<text/>
-			</element>
-			<element name="text:user-defined">
-				<interleave>
-					<ref name="common-field-fixed-attlist"/>
-					<attribute name="text:name">
-						<ref name="string"/>
-					</attribute>
-					<ref name="common-field-data-style-name-attlist"/>
-					<optional>
-						<attribute name="office:value">
-							<ref name="double"/>
-						</attribute>
-					</optional>
-					<optional>
-						<attribute name="office:date-value">
-							<ref name="dateOrDateTime"/>
-						</attribute>
-					</optional>
-					<optional>
-						<attribute name="office:time-value">
-							<ref name="duration"/>
-						</attribute>
-					</optional>
-					<optional>
-						<attribute name="office:boolean-value">
-							<ref name="boolean"/>
-						</attribute>
-					</optional>
-					<optional>
-						<attribute name="office:string-value">
-							<ref name="string"/>
-						</attribute>
-					</optional>
-				</interleave>
-				<text/>
-			</element>
-			<element name="text:print-time">
-				<interleave>
-					<ref name="common-field-fixed-attlist"/>
-					<ref name="common-field-data-style-name-attlist"/>
-					<optional>
-						<attribute name="text:time-value">
-							<ref name="time"/>
-						</attribute>
-					</optional>
-				</interleave>
-				<text/>
-			</element>
-			<element name="text:print-date">
-				<interleave>
-					<ref name="common-field-fixed-attlist"/>
-					<ref name="common-field-data-style-name-attlist"/>
-					<optional>
-						<attribute name="text:date-value">
-							<ref name="date"/>
-						</attribute>
-					</optional>
-				</interleave>
-				<text/>
-			</element>
-			<element name="text:printed-by">
-				<ref name="common-field-fixed-attlist"/>
-				<text/>
-			</element>
-			<element name="text:title">
-				<ref name="common-field-fixed-attlist"/>
-				<text/>
-			</element>
-			<element name="text:subject">
-				<ref name="common-field-fixed-attlist"/>
-				<text/>
-			</element>
-			<element name="text:keywords">
-				<ref name="common-field-fixed-attlist"/>
-				<text/>
-			</element>
-			<element name="text:editing-cycles">
-				<ref name="common-field-fixed-attlist"/>
-				<text/>
-			</element>
-			<element name="text:editing-duration">
-				<interleave>
-					<ref name="common-field-fixed-attlist"/>
-					<ref name="common-field-data-style-name-attlist"/>
-					<optional>
-						<attribute name="text:duration">
-							<ref name="duration"/>
-						</attribute>
-					</optional>
-				</interleave>
-				<text/>
-			</element>
-			<element name="text:modification-time">
-				<interleave>
-					<ref name="common-field-fixed-attlist"/>
-					<ref name="common-field-data-style-name-attlist"/>
-					<optional>
-						<attribute name="text:time-value">
-							<ref name="time"/>
-						</attribute>
-					</optional>
-				</interleave>
-				<text/>
-			</element>
-			<element name="text:modification-date">
-				<interleave>
-					<ref name="common-field-fixed-attlist"/>
-					<ref name="common-field-data-style-name-attlist"/>
-					<optional>
-						<attribute name="text:date-value">
-							<ref name="date"/>
-						</attribute>
-					</optional>
-				</interleave>
-				<text/>
-			</element>
-			<element name="text:creator">
-				<ref name="common-field-fixed-attlist"/>
-				<text/>
-			</element>
-			<element>
-				<choice>
-					<name>text:page-count</name>
-					<name>text:paragraph-count</name>
-					<name>text:word-count</name>
-					<name>text:character-count</name>
-					<name>text:table-count</name>
-					<name>text:image-count</name>
-					<name>text:object-count</name>
-				</choice>
-				<ref name="common-field-num-format-attlist"/>
-				<text/>
-			</element>
-			<element name="text:database-display">
-				<ref name="text-database-display-attlist"/>
-				<text/>
-			</element>
-			<element name="text:database-next">
-				<ref name="text-database-next-attlist"/>
-			</element>
-			<element name="text:database-row-select">
-				<ref name="text-database-row-select-attlist"/>
-			</element>
-			<element name="text:database-row-number">
-				<interleave>
-					<ref name="common-field-database-table"/>
-					<ref name="common-field-num-format-attlist"/>
-					<optional>
-						<attribute name="text:value">
-							<ref name="nonNegativeInteger"/>
-						</attribute>
-					</optional>
-				</interleave>
-				<text/>
-			</element>
-			<element name="text:database-name">
-				<ref name="common-field-database-table"/>
-				<text/>
-			</element>
-			<element name="text:page-variable-set">
-				<ref name="text-set-page-variable-attlist"/>
-				<text/>
-			</element>
-			<element name="text:page-variable-get">
-				<ref name="text-get-page-variable-attlist"/>
-				<text/>
-			</element>
-			<element name="text:placeholder">
-				<ref name="text-placeholder-attlist"/>
-				<text/>
-			</element>
-			<element name="text:conditional-text">
-				<ref name="text-conditional-text-attlist"/>
-				<text/>
-			</element>
-			<element name="text:hidden-text">
-				<ref name="text-hidden-text-attlist"/>
-				<text/>
-			</element>
-			<element>
-				<choice>
-					<name>text:reference-ref</name>
-					<name>text:bookmark-ref</name>
-				</choice>
-				<interleave>
-					<ref name="text-common-ref-content"/>
-					<ref name="text-bookmark-ref-content"/>
-				</interleave>
-			</element>
-			<element name="text:note-ref">
-				<interleave>
-					<ref name="text-common-ref-content"/>
-					<ref name="text-note-ref-content"/>
-				</interleave>
-			</element>
-			<element name="text:sequence-ref">
-				<interleave>
-					<ref name="text-common-ref-content"/>
-					<ref name="text-sequence-ref-content"/>
-				</interleave>
-			</element>
-			<element name="text:script">
-				<interleave>
-					<choice>
-						<group>
-							<attribute name="xlink:type">
-								<value>simple</value>
-							</attribute>
-							<attribute name="xlink:href">
-								<ref name="anyIRI"/>
-							</attribute>
-						</group>
-						<text/>
-					</choice>
-					<optional>
-						<attribute name="script:language">
-							<ref name="string"/>
-						</attribute>
-					</optional>
-				</interleave>
-			</element>
-			<element name="text:execute-macro">
-				<optional>
-					<attribute name="text:name">
-						<ref name="string"/>
-					</attribute>
-				</optional>
-				<optional>
-					<ref name="office-event-listeners"/>
-				</optional>
-				<text/>
-			</element>
-			<element name="text:hidden-paragraph">
-				<ref name="text-hidden-paragraph-attlist"/>
-				<text/>
-			</element>
-			<element name="text:dde-connection">
-				<attribute name="text:connection-name">
-					<ref name="string"/>
-				</attribute>
-				<text/>
-			</element>
-			<element name="text:measure">
-				<attribute name="text:kind">
-					<choice>
-						<value>value</value>
-						<value>unit</value>
-						<value>gap</value>
-					</choice>
-				</attribute>
-				<text/>
-			</element>
-			<element name="text:table-formula">
-				<interleave>
-					<ref name="common-field-formula-attlist"/>
-					<ref name="common-field-display-value-formula-attlist"/>
-					<ref name="common-field-data-style-name-attlist"/>
-				</interleave>
-				<text/>
-			</element>
-			<element name="text:meta-field">
-				<ref name="text-meta-field-attlist"/>
-				<zeroOrMore>
-					<ref name="paragraph-content-or-hyperlink"/>
-				</zeroOrMore>
-			</element>
-			<element name="text:toc-mark-start">
-				<ref name="text-toc-mark-start-attrs"/>
-			</element>
-			<element name="text:toc-mark-end">
-				<ref name="text-id"/>
-			</element>
-			<element name="text:toc-mark">
-				<attribute name="text:string-value">
-					<ref name="string"/>
-				</attribute>
-				<ref name="text-outline-level"/>
-			</element>
-			<element name="text:user-index-mark-start">
-				<ref name="text-id"/>
-				<ref name="text-outline-level"/>
-				<ref name="text-index-name"/>
-			</element>
-			<element name="text:user-index-mark-end">
-				<ref name="text-id"/>
-			</element>
-			<element name="text:user-index-mark">
-				<attribute name="text:string-value">
-					<ref name="string"/>
-				</attribute>
-				<ref name="text-outline-level"/>
-				<ref name="text-index-name"/>
-			</element>
-			<element name="text:alphabetical-index-mark-start">
-				<ref name="text-id"/>
-				<ref name="text-alphabetical-index-mark-attrs"/>
-			</element>
-			<element name="text:alphabetical-index-mark-end">
-				<ref name="text-id"/>
-			</element>
-			<element name="text:alphabetical-index-mark">
-				<attribute name="text:string-value">
-					<ref name="string"/>
-				</attribute>
-				<ref name="text-alphabetical-index-mark-attrs"/>
-			</element>
-			<element name="text:bibliography-mark">
-				<attribute name="text:bibliography-type">
-					<ref name="text-bibliography-types"/>
-				</attribute>
-				<zeroOrMore>
-					<attribute>
-						<choice>
-							<name>text:identifier</name>
-							<name>text:address</name>
-							<name>text:annote</name>
-							<name>text:author</name>
-							<name>text:booktitle</name>
-							<name>text:chapter</name>
-							<name>text:edition</name>
-							<name>text:editor</name>
-							<name>text:howpublished</name>
-							<name>text:institution</name>
-							<name>text:journal</name>
-							<name>text:month</name>
-							<name>text:note</name>
-							<name>text:number</name>
-							<name>text:organizations</name>
-							<name>text:pages</name>
-							<name>text:publisher</name>
-							<name>text:school</name>
-							<name>text:series</name>
-							<name>text:title</name>
-							<name>text:report-type</name>
-							<name>text:volume</name>
-							<name>text:year</name>
-							<name>text:url</name>
-							<name>text:custom1</name>
-							<name>text:custom2</name>
-							<name>text:custom3</name>
-							<name>text:custom4</name>
-							<name>text:custom5</name>
-							<name>text:isbn</name>
-							<name>text:issn</name>
-						</choice>
-						<ref name="string"/>
-					</attribute>
-				</zeroOrMore>
-				<text/>
-			</element>
-			<element name="presentation:header">
-				<empty/>
-			</element>
-			<element name="presentation:footer">
-				<empty/>
-			</element>
-			<element name="presentation:date-time">
-				<empty/>
-			</element>
-		</choice>
-	</define>
-	<define name="text-tab-attr">
-		<optional>
-			<attribute name="text:tab-ref">
-				<ref name="nonNegativeInteger"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="text-a">
-		<element name="text:a">
-			<ref name="text-a-attlist"/>
-			<optional>
-				<ref name="office-event-listeners"/>
-			</optional>
-			<zeroOrMore>
-				<ref name="paragraph-content"/>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="text-a-attlist">
-		<interleave>
-			<optional>
-				<attribute name="office:name">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="office:title">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<attribute name="xlink:type">
-				<value>simple</value>
-			</attribute>
-			<attribute name="xlink:href">
-				<ref name="anyIRI"/>
-			</attribute>
-			<optional>
-				<attribute name="xlink:actuate">
-					<value>onRequest</value>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="office:target-frame-name">
-					<ref name="targetFrameName"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="xlink:show">
-					<choice>
-						<value>new</value>
-						<value>replace</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:style-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:visited-style-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="text-meta-attlist">
-		<interleave>
-			<optional>
-				<ref name="common-in-content-meta-attlist"/>
-			</optional>
-			<optional>
-				<ref name="xml-id"/>
-			</optional>
-		</interleave>
-	</define>
-	<define name="text-bookmark">
-		<element name="text:bookmark">
-			<ref name="text-bookmark-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="text-bookmark-start">
-		<element name="text:bookmark-start">
-			<ref name="text-bookmark-start-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="text-bookmark-end">
-		<element name="text:bookmark-end">
-			<ref name="text-bookmark-end-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="text-bookmark-attlist">
-		<interleave>
-			<attribute name="text:name">
-				<ref name="string"/>
-			</attribute>
-			<optional>
-				<ref name="xml-id"/>
-			</optional>
-		</interleave>
-	</define>
-	<define name="text-bookmark-start-attlist">
-		<interleave>
-			<attribute name="text:name">
-				<ref name="string"/>
-			</attribute>
-			<optional>
-				<ref name="xml-id"/>
-			</optional>
-			<optional>
-				<ref name="common-in-content-meta-attlist"/>
-			</optional>
-		</interleave>
-	</define>
-	<define name="text-bookmark-end-attlist">
-		<attribute name="text:name">
-			<ref name="string"/>
-		</attribute>
-	</define>
-	<define name="text-note-class">
-		<attribute name="text:note-class">
-			<choice>
-				<value>footnote</value>
-				<value>endnote</value>
-			</choice>
-		</attribute>
-	</define>
-	<define name="text-date-attlist">
-		<interleave>
-			<interleave>
-				<ref name="common-field-fixed-attlist"/>
-				<ref name="common-field-data-style-name-attlist"/>
-			</interleave>
-			<optional>
-				<attribute name="text:date-value">
-					<ref name="dateOrDateTime"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:date-adjust">
-					<ref name="duration"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="text-time-attlist">
-		<interleave>
-			<interleave>
-				<ref name="common-field-fixed-attlist"/>
-				<ref name="common-field-data-style-name-attlist"/>
-			</interleave>
-			<optional>
-				<attribute name="text:time-value">
-					<ref name="timeOrDateTime"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:time-adjust">
-					<ref name="duration"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="text-page-number-attlist">
-		<interleave>
-			<interleave>
-				<ref name="common-field-num-format-attlist"/>
-				<ref name="common-field-fixed-attlist"/>
-			</interleave>
-			<optional>
-				<attribute name="text:page-adjust">
-					<ref name="integer"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:select-page">
-					<choice>
-						<value>previous</value>
-						<value>current</value>
-						<value>next</value>
-					</choice>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="text-page-continuation-attlist">
-		<interleave>
-			<attribute name="text:select-page">
-				<choice>
-					<value>previous</value>
-					<value>next</value>
-				</choice>
-			</attribute>
-			<optional>
-				<attribute name="text:string-value">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="text-chapter-attlist">
-		<interleave>
-			<attribute name="text:display">
-				<choice>
-					<value>name</value>
-					<value>number</value>
-					<value>number-and-name</value>
-					<value>plain-number-and-name</value>
-					<value>plain-number</value>
-				</choice>
-			</attribute>
-			<attribute name="text:outline-level">
-				<ref name="nonNegativeInteger"/>
-			</attribute>
-		</interleave>
-	</define>
-	<define name="text-file-name-attlist">
-		<interleave>
-			<optional>
-				<attribute name="text:display">
-					<choice>
-						<value>full</value>
-						<value>path</value>
-						<value>name</value>
-						<value>name-and-extension</value>
-					</choice>
-				</attribute>
-			</optional>
-			<ref name="common-field-fixed-attlist"/>
-		</interleave>
-	</define>
-	<define name="text-template-name-attlist">
-		<optional>
-			<attribute name="text:display">
-				<choice>
-					<value>full</value>
-					<value>path</value>
-					<value>name</value>
-					<value>name-and-extension</value>
-					<value>area</value>
-					<value>title</value>
-				</choice>
-			</attribute>
-		</optional>
-	</define>
-	<define name="text-variable-decl">
-		<element name="text:variable-decl">
-			<ref name="common-field-name-attlist"/>
-			<ref name="common-value-type-attlist"/>
-		</element>
-	</define>
-	<define name="text-user-field-decl">
-		<element name="text:user-field-decl">
-			<ref name="common-field-name-attlist"/>
-			<optional>
-				<ref name="common-field-formula-attlist"/>
-			</optional>
-			<ref name="common-value-and-type-attlist"/>
-		</element>
-	</define>
-	<define name="text-sequence-decl">
-		<element name="text:sequence-decl">
-			<ref name="text-sequence-decl-attlist"/>
-		</element>
-	</define>
-	<define name="text-sequence-decl-attlist">
-		<interleave>
-			<ref name="common-field-name-attlist"/>
-			<attribute name="text:display-outline-level">
-				<ref name="nonNegativeInteger"/>
-			</attribute>
-			<optional>
-				<attribute name="text:separation-character">
-					<ref name="character"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="text-sequence-ref-name">
-		<optional>
-			<attribute name="text:ref-name">
-				<ref name="string"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="common-field-database-table">
-		<ref name="common-field-database-table-attlist"/>
-		<ref name="common-field-database-name"/>
-	</define>
-	<define name="common-field-database-name">
-		<choice>
-			<optional>
-				<attribute name="text:database-name">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<ref name="form-connection-resource"/>
-		</choice>
-	</define>
-	<define name="common-field-database-table-attlist">
-		<interleave>
-			<attribute name="text:table-name">
-				<ref name="string"/>
-			</attribute>
-			<optional>
-				<attribute name="text:table-type">
-					<choice>
-						<value>table</value>
-						<value>query</value>
-						<value>command</value>
-					</choice>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="text-database-display-attlist">
-		<interleave>
-			<ref name="common-field-database-table"/>
-			<ref name="common-field-data-style-name-attlist"/>
-			<attribute name="text:column-name">
-				<ref name="string"/>
-			</attribute>
-		</interleave>
-	</define>
-	<define name="text-database-next-attlist">
-		<interleave>
-			<ref name="common-field-database-table"/>
-			<optional>
-				<attribute name="text:condition">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="text-database-row-select-attlist">
-		<interleave>
-			<ref name="common-field-database-table"/>
-			<optional>
-				<attribute name="text:condition">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:row-number">
-					<ref name="nonNegativeInteger"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="text-set-page-variable-attlist">
-		<interleave>
-			<optional>
-				<attribute name="text:active">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:page-adjust">
-					<ref name="integer"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="text-get-page-variable-attlist">
-		<ref name="common-field-num-format-attlist"/>
-	</define>
-	<define name="text-placeholder-attlist">
-		<interleave>
-			<attribute name="text:placeholder-type">
-				<choice>
-					<value>text</value>
-					<value>table</value>
-					<value>text-box</value>
-					<value>image</value>
-					<value>object</value>
-				</choice>
-			</attribute>
-			<ref name="common-field-description-attlist"/>
-		</interleave>
-	</define>
-	<define name="text-conditional-text-attlist">
-		<interleave>
-			<attribute name="text:condition">
-				<ref name="string"/>
-			</attribute>
-			<attribute name="text:string-value-if-true">
-				<ref name="string"/>
-			</attribute>
-			<attribute name="text:string-value-if-false">
-				<ref name="string"/>
-			</attribute>
-			<optional>
-				<attribute name="text:current-value">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="text-hidden-text-attlist">
-		<interleave>
-			<attribute name="text:condition">
-				<ref name="string"/>
-			</attribute>
-			<attribute name="text:string-value">
-				<ref name="string"/>
-			</attribute>
-			<optional>
-				<attribute name="text:is-hidden">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="text-common-ref-content">
-		<interleave>
-			<text/>
-			<optional>
-				<attribute name="text:ref-name">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="text-bookmark-ref-content">
-		<optional>
-			<attribute name="text:reference-format">
-				<choice>
-					<ref name="common-ref-format-values"/>
-					<value>number-no-superior</value>
-					<value>number-all-superior</value>
-					<value>number</value>
-				</choice>
-			</attribute>
-		</optional>
-	</define>
-	<define name="text-note-ref-content">
-		<interleave>
-			<optional>
-				<attribute name="text:reference-format">
-					<choice>
-						<ref name="common-ref-format-values"/>
-					</choice>
-				</attribute>
-			</optional>
-			<ref name="text-note-class"/>
-		</interleave>
-	</define>
-	<define name="text-sequence-ref-content">
-		<optional>
-			<attribute name="text:reference-format">
-				<choice>
-					<ref name="common-ref-format-values"/>
-					<value>category-and-value</value>
-					<value>caption</value>
-					<value>value</value>
-				</choice>
-			</attribute>
-		</optional>
-	</define>
-	<define name="common-ref-format-values">
-		<choice>
-			<value>page</value>
-			<value>chapter</value>
-			<value>direction</value>
-			<value>text</value>
-		</choice>
-	</define>
-	<define name="text-hidden-paragraph-attlist">
-		<interleave>
-			<attribute name="text:condition">
-				<ref name="string"/>
-			</attribute>
-			<optional>
-				<attribute name="text:is-hidden">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="text-meta-field-attlist">
-		<interleave>
-			<ref name="xml-id"/>
-			<ref name="common-field-data-style-name-attlist"/>
-		</interleave>
-	</define>
-	<define name="common-value-type-attlist">
-		<attribute name="office:value-type">
-			<ref name="valueType"/>
-		</attribute>
-	</define>
-	<define name="common-value-and-type-attlist">
-		<choice>
-			<group>
-				<attribute name="office:value-type">
-					<value>float</value>
-				</attribute>
-				<attribute name="office:value">
-					<ref name="double"/>
-				</attribute>
-			</group>
-			<group>
-				<attribute name="office:value-type">
-					<value>percentage</value>
-				</attribute>
-				<attribute name="office:value">
-					<ref name="double"/>
-				</attribute>
-			</group>
-			<group>
-				<attribute name="office:value-type">
-					<value>currency</value>
-				</attribute>
-				<attribute name="office:value">
-					<ref name="double"/>
-				</attribute>
-				<optional>
-					<attribute name="office:currency">
-						<ref name="string"/>
-					</attribute>
-				</optional>
-			</group>
-			<group>
-				<attribute name="office:value-type">
-					<value>date</value>
-				</attribute>
-				<attribute name="office:date-value">
-					<ref name="dateOrDateTime"/>
-				</attribute>
-			</group>
-			<group>
-				<attribute name="office:value-type">
-					<value>time</value>
-				</attribute>
-				<attribute name="office:time-value">
-					<ref name="duration"/>
-				</attribute>
-			</group>
-			<group>
-				<attribute name="office:value-type">
-					<value>boolean</value>
-				</attribute>
-				<attribute name="office:boolean-value">
-					<ref name="boolean"/>
-				</attribute>
-			</group>
-			<group>
-				<attribute name="office:value-type">
-					<value>string</value>
-				</attribute>
-				<optional>
-					<attribute name="office:string-value">
-						<ref name="string"/>
-					</attribute>
-				</optional>
-			</group>
-		</choice>
-	</define>
-	<define name="common-field-fixed-attlist">
-		<optional>
-			<attribute name="text:fixed">
-				<ref name="boolean"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="common-field-name-attlist">
-		<attribute name="text:name">
-			<ref name="variableName"/>
-		</attribute>
-	</define>
-	<define name="common-field-description-attlist">
-		<optional>
-			<attribute name="text:description">
-				<ref name="string"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="common-field-display-value-none-attlist">
-		<optional>
-			<attribute name="text:display">
-				<choice>
-					<value>value</value>
-					<value>none</value>
-				</choice>
-			</attribute>
-		</optional>
-	</define>
-	<define name="common-field-display-value-formula-none-attlist">
-		<optional>
-			<attribute name="text:display">
-				<choice>
-					<value>value</value>
-					<value>formula</value>
-					<value>none</value>
-				</choice>
-			</attribute>
-		</optional>
-	</define>
-	<define name="common-field-display-value-formula-attlist">
-		<optional>
-			<attribute name="text:display">
-				<choice>
-					<value>value</value>
-					<value>formula</value>
-				</choice>
-			</attribute>
-		</optional>
-	</define>
-	<define name="common-field-formula-attlist">
-		<optional>
-			<attribute name="text:formula">
-				<ref name="string"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="common-field-data-style-name-attlist">
-		<optional>
-			<attribute name="style:data-style-name">
-				<ref name="styleNameRef"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="common-field-num-format-attlist">
-		<optional>
-			<ref name="common-num-format-attlist"/>
-		</optional>
-	</define>
-	<define name="text-toc-mark-start-attrs">
-		<ref name="text-id"/>
-		<ref name="text-outline-level"/>
-	</define>
-	<define name="text-outline-level">
-		<optional>
-			<attribute name="text:outline-level">
-				<ref name="positiveInteger"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="text-id">
-		<attribute name="text:id">
-			<ref name="string"/>
-		</attribute>
-	</define>
-	<define name="text-index-name">
-		<attribute name="text:index-name">
-			<ref name="string"/>
-		</attribute>
-	</define>
-	<define name="text-alphabetical-index-mark-attrs">
-		<interleave>
-			<optional>
-				<attribute name="text:key1">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:key2">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:string-value-phonetic">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:key1-phonetic">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:key2-phonetic">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:main-entry">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="text-bibliography-types">
-		<choice>
-			<value>article</value>
-			<value>book</value>
-			<value>booklet</value>
-			<value>conference</value>
-			<value>custom1</value>
-			<value>custom2</value>
-			<value>custom3</value>
-			<value>custom4</value>
-			<value>custom5</value>
-			<value>email</value>
-			<value>inbook</value>
-			<value>incollection</value>
-			<value>inproceedings</value>
-			<value>journal</value>
-			<value>manual</value>
-			<value>mastersthesis</value>
-			<value>misc</value>
-			<value>phdthesis</value>
-			<value>proceedings</value>
-			<value>techreport</value>
-			<value>unpublished</value>
-			<value>www</value>
-		</choice>
-	</define>
-	<define name="text-index-body">
-		<element name="text:index-body">
-			<zeroOrMore>
-				<ref name="index-content-main"/>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="index-content-main">
-		<choice>
-			<ref name="text-content"/>
-			<ref name="text-index-title"/>
-		</choice>
-	</define>
-	<define name="text-index-title">
-		<element name="text:index-title">
-			<ref name="common-section-attlist"/>
-			<zeroOrMore>
-				<ref name="index-content-main"/>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="text-table-of-content">
-		<element name="text:table-of-content">
-			<ref name="common-section-attlist"/>
-			<ref name="text-table-of-content-source"/>
-			<ref name="text-index-body"/>
-		</element>
-	</define>
-	<define name="text-table-of-content-source">
-		<element name="text:table-of-content-source">
-			<ref name="text-table-of-content-source-attlist"/>
-			<optional>
-				<ref name="text-index-title-template"/>
-			</optional>
-			<zeroOrMore>
-				<ref name="text-table-of-content-entry-template"/>
-			</zeroOrMore>
-			<zeroOrMore>
-				<ref name="text-index-source-styles"/>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="text-table-of-content-source-attlist">
-		<interleave>
-			<optional>
-				<attribute name="text:outline-level">
-					<ref name="positiveInteger"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:use-outline-level">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:use-index-marks">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:use-index-source-styles">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:index-scope">
-					<choice>
-						<value>document</value>
-						<value>chapter</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:relative-tab-stop-position">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="text-table-of-content-entry-template">
-		<element name="text:table-of-content-entry-template">
-			<ref name="text-table-of-content-entry-template-attlist"/>
-			<zeroOrMore>
-				<ref name="text-table-of-content-children"/>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="text-table-of-content-children">
-		<choice>
-			<ref name="text-index-entry-chapter"/>
-			<ref name="text-index-entry-page-number"/>
-			<ref name="text-index-entry-text"/>
-			<ref name="text-index-entry-span"/>
-			<ref name="text-index-entry-tab-stop"/>
-			<ref name="text-index-entry-link-start"/>
-			<ref name="text-index-entry-link-end"/>
-		</choice>
-	</define>
-	<define name="text-table-of-content-entry-template-attlist">
-		<interleave>
-			<attribute name="text:outline-level">
-				<ref name="positiveInteger"/>
-			</attribute>
-			<attribute name="text:style-name">
-				<ref name="styleNameRef"/>
-			</attribute>
-		</interleave>
-	</define>
-	<define name="text-illustration-index">
-		<element name="text:illustration-index">
-			<ref name="common-section-attlist"/>
-			<ref name="text-illustration-index-source"/>
-			<ref name="text-index-body"/>
-		</element>
-	</define>
-	<define name="text-illustration-index-source">
-		<element name="text:illustration-index-source">
-			<ref name="text-illustration-index-source-attrs"/>
-			<optional>
-				<ref name="text-index-title-template"/>
-			</optional>
-			<optional>
-				<ref name="text-illustration-index-entry-template"/>
-			</optional>
-		</element>
-	</define>
-	<define name="text-illustration-index-source-attrs">
-		<interleave>
-			<ref name="text-index-scope-attr"/>
-			<ref name="text-relative-tab-stop-position-attr"/>
-			<optional>
-				<attribute name="text:use-caption">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:caption-sequence-name">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:caption-sequence-format">
-					<choice>
-						<value>text</value>
-						<value>category-and-value</value>
-						<value>caption</value>
-					</choice>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="text-index-scope-attr">
-		<optional>
-			<attribute name="text:index-scope">
-				<choice>
-					<value>document</value>
-					<value>chapter</value>
-				</choice>
-			</attribute>
-		</optional>
-	</define>
-	<define name="text-relative-tab-stop-position-attr">
-		<optional>
-			<attribute name="text:relative-tab-stop-position">
-				<ref name="boolean"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="text-illustration-index-entry-template">
-		<element name="text:illustration-index-entry-template">
-			<ref name="text-illustration-index-entry-content"/>
-		</element>
-	</define>
-	<define name="text-illustration-index-entry-content">
-		<ref name="text-illustration-index-entry-template-attrs"/>
-		<zeroOrMore>
-			<choice>
-				<ref name="text-index-entry-chapter"/>
-				<ref name="text-index-entry-page-number"/>
-				<ref name="text-index-entry-text"/>
-				<ref name="text-index-entry-span"/>
-				<ref name="text-index-entry-tab-stop"/>
-			</choice>
-		</zeroOrMore>
-	</define>
-	<define name="text-illustration-index-entry-template-attrs">
-		<attribute name="text:style-name">
-			<ref name="styleNameRef"/>
-		</attribute>
-	</define>
-	<define name="text-table-index">
-		<element name="text:table-index">
-			<ref name="common-section-attlist"/>
-			<ref name="text-table-index-source"/>
-			<ref name="text-index-body"/>
-		</element>
-	</define>
-	<define name="text-table-index-source">
-		<element name="text:table-index-source">
-			<ref name="text-illustration-index-source-attrs"/>
-			<optional>
-				<ref name="text-index-title-template"/>
-			</optional>
-			<optional>
-				<ref name="text-table-index-entry-template"/>
-			</optional>
-		</element>
-	</define>
-	<define name="text-table-index-entry-template">
-		<element name="text:table-index-entry-template">
-			<ref name="text-illustration-index-entry-content"/>
-		</element>
-	</define>
-	<define name="text-object-index">
-		<element name="text:object-index">
-			<ref name="common-section-attlist"/>
-			<ref name="text-object-index-source"/>
-			<ref name="text-index-body"/>
-		</element>
-	</define>
-	<define name="text-object-index-source">
-		<element name="text:object-index-source">
-			<ref name="text-object-index-source-attrs"/>
-			<optional>
-				<ref name="text-index-title-template"/>
-			</optional>
-			<optional>
-				<ref name="text-object-index-entry-template"/>
-			</optional>
-		</element>
-	</define>
-	<define name="text-object-index-source-attrs">
-		<interleave>
-			<ref name="text-index-scope-attr"/>
-			<ref name="text-relative-tab-stop-position-attr"/>
-			<optional>
-				<attribute name="text:use-spreadsheet-objects">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:use-math-objects">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:use-draw-objects">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:use-chart-objects">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:use-other-objects">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="text-object-index-entry-template">
-		<element name="text:object-index-entry-template">
-			<ref name="text-illustration-index-entry-content"/>
-		</element>
-	</define>
-	<define name="text-user-index">
-		<element name="text:user-index">
-			<ref name="common-section-attlist"/>
-			<ref name="text-user-index-source"/>
-			<ref name="text-index-body"/>
-		</element>
-	</define>
-	<define name="text-user-index-source">
-		<element name="text:user-index-source">
-			<ref name="text-user-index-source-attr"/>
-			<optional>
-				<ref name="text-index-title-template"/>
-			</optional>
-			<zeroOrMore>
-				<ref name="text-user-index-entry-template"/>
-			</zeroOrMore>
-			<zeroOrMore>
-				<ref name="text-index-source-styles"/>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="text-user-index-source-attr">
-		<interleave>
-			<ref name="text-index-scope-attr"/>
-			<ref name="text-relative-tab-stop-position-attr"/>
-			<optional>
-				<attribute name="text:use-index-marks">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:use-index-source-styles">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:use-graphics">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:use-tables">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:use-floating-frames">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:use-objects">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:copy-outline-levels">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<attribute name="text:index-name">
-				<ref name="string"/>
-			</attribute>
-		</interleave>
-	</define>
-	<define name="text-user-index-entry-template">
-		<element name="text:user-index-entry-template">
-			<ref name="text-user-index-entry-template-attrs"/>
-			<zeroOrMore>
-				<choice>
-					<ref name="text-index-entry-chapter"/>
-					<ref name="text-index-entry-page-number"/>
-					<ref name="text-index-entry-text"/>
-					<ref name="text-index-entry-span"/>
-					<ref name="text-index-entry-tab-stop"/>
-				</choice>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="text-user-index-entry-template-attrs">
-		<interleave>
-			<attribute name="text:outline-level">
-				<ref name="positiveInteger"/>
-			</attribute>
-			<attribute name="text:style-name">
-				<ref name="styleNameRef"/>
-			</attribute>
-		</interleave>
-	</define>
-	<define name="text-alphabetical-index">
-		<element name="text:alphabetical-index">
-			<ref name="common-section-attlist"/>
-			<ref name="text-alphabetical-index-source"/>
-			<ref name="text-index-body"/>
-		</element>
-	</define>
-	<define name="text-alphabetical-index-source">
-		<element name="text:alphabetical-index-source">
-			<ref name="text-alphabetical-index-source-attrs"/>
-			<optional>
-				<ref name="text-index-title-template"/>
-			</optional>
-			<zeroOrMore>
-				<ref name="text-alphabetical-index-entry-template"/>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="text-alphabetical-index-source-attrs">
-		<interleave>
-			<ref name="text-index-scope-attr"/>
-			<ref name="text-relative-tab-stop-position-attr"/>
-			<optional>
-				<attribute name="text:ignore-case">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:main-entry-style-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:alphabetical-separators">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:combine-entries">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:combine-entries-with-dash">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:combine-entries-with-pp">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:use-keys-as-entries">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:capitalize-entries">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:comma-separated">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="fo:language">
-					<ref name="languageCode"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="fo:country">
-					<ref name="countryCode"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="fo:script">
-					<ref name="scriptCode"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:rfc-language-tag">
-					<ref name="language"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:sort-algorithm">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="text-alphabetical-index-auto-mark-file">
-		<element name="text:alphabetical-index-auto-mark-file">
-			<attribute name="xlink:type">
-				<value>simple</value>
-			</attribute>
-			<attribute name="xlink:href">
-				<ref name="anyIRI"/>
-			</attribute>
-		</element>
-	</define>
-	<define name="text-alphabetical-index-entry-template">
-		<element name="text:alphabetical-index-entry-template">
-			<ref name="text-alphabetical-index-entry-template-attrs"/>
-			<zeroOrMore>
-				<choice>
-					<ref name="text-index-entry-chapter"/>
-					<ref name="text-index-entry-page-number"/>
-					<ref name="text-index-entry-text"/>
-					<ref name="text-index-entry-span"/>
-					<ref name="text-index-entry-tab-stop"/>
-				</choice>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="text-alphabetical-index-entry-template-attrs">
-		<interleave>
-			<attribute name="text:outline-level">
-				<choice>
-					<value>1</value>
-					<value>2</value>
-					<value>3</value>
-					<value>separator</value>
-				</choice>
-			</attribute>
-			<attribute name="text:style-name">
-				<ref name="styleNameRef"/>
-			</attribute>
-		</interleave>
-	</define>
-	<define name="text-bibliography">
-		<element name="text:bibliography">
-			<ref name="common-section-attlist"/>
-			<ref name="text-bibliography-source"/>
-			<ref name="text-index-body"/>
-		</element>
-	</define>
-	<define name="text-bibliography-source">
-		<element name="text:bibliography-source">
-			<optional>
-				<ref name="text-index-title-template"/>
-			</optional>
-			<zeroOrMore>
-				<ref name="text-bibliography-entry-template"/>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="text-bibliography-entry-template">
-		<element name="text:bibliography-entry-template">
-			<ref name="text-bibliography-entry-template-attrs"/>
-			<zeroOrMore>
-				<choice>
-					<ref name="text-index-entry-span"/>
-					<ref name="text-index-entry-tab-stop"/>
-					<ref name="text-index-entry-bibliography"/>
-				</choice>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="text-bibliography-entry-template-attrs">
-		<interleave>
-			<attribute name="text:bibliography-type">
-				<ref name="text-bibliography-types"/>
-			</attribute>
-			<attribute name="text:style-name">
-				<ref name="styleNameRef"/>
-			</attribute>
-		</interleave>
-	</define>
-	<define name="text-index-source-styles">
-		<element name="text:index-source-styles">
-			<attribute name="text:outline-level">
-				<ref name="positiveInteger"/>
-			</attribute>
-			<zeroOrMore>
-				<ref name="text-index-source-style"/>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="text-index-source-style">
-		<element name="text:index-source-style">
-			<attribute name="text:style-name">
-				<ref name="styleName"/>
-			</attribute>
-			<empty/>
-		</element>
-	</define>
-	<define name="text-index-title-template">
-		<element name="text:index-title-template">
-			<optional>
-				<attribute name="text:style-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-			<text/>
-		</element>
-	</define>
-	<define name="text-index-entry-chapter">
-		<element name="text:index-entry-chapter">
-			<optional>
-				<attribute name="text:style-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-			<ref name="text-index-entry-chapter-attrs"/>
-		</element>
-	</define>
-	<define name="text-index-entry-chapter-attrs">
-		<interleave>
-			<optional>
-				<attribute name="text:display">
-					<choice>
-						<value>name</value>
-						<value>number</value>
-						<value>number-and-name</value>
-						<value>plain-number</value>
-						<value>plain-number-and-name</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:outline-level">
-					<ref name="positiveInteger"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="text-index-entry-text">
-		<element name="text:index-entry-text">
-			<optional>
-				<attribute name="text:style-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-		</element>
-	</define>
-	<define name="text-index-entry-page-number">
-		<element name="text:index-entry-page-number">
-			<optional>
-				<attribute name="text:style-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-		</element>
-	</define>
-	<define name="text-index-entry-span">
-		<element name="text:index-entry-span">
-			<optional>
-				<attribute name="text:style-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-			<text/>
-		</element>
-	</define>
-	<define name="text-index-entry-bibliography">
-		<element name="text:index-entry-bibliography">
-			<ref name="text-index-entry-bibliography-attrs"/>
-		</element>
-	</define>
-	<define name="text-index-entry-bibliography-attrs">
-		<interleave>
-			<optional>
-				<attribute name="text:style-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-			<attribute name="text:bibliography-data-field">
-				<choice>
-					<value>address</value>
-					<value>annote</value>
-					<value>author</value>
-					<value>bibliography-type</value>
-					<value>booktitle</value>
-					<value>chapter</value>
-					<value>custom1</value>
-					<value>custom2</value>
-					<value>custom3</value>
-					<value>custom4</value>
-					<value>custom5</value>
-					<value>edition</value>
-					<value>editor</value>
-					<value>howpublished</value>
-					<value>identifier</value>
-					<value>institution</value>
-					<value>isbn</value>
-					<value>issn</value>
-					<value>journal</value>
-					<value>month</value>
-					<value>note</value>
-					<value>number</value>
-					<value>organizations</value>
-					<value>pages</value>
-					<value>publisher</value>
-					<value>report-type</value>
-					<value>school</value>
-					<value>series</value>
-					<value>title</value>
-					<value>url</value>
-					<value>volume</value>
-					<value>year</value>
-				</choice>
-			</attribute>
-		</interleave>
-	</define>
-	<define name="text-index-entry-tab-stop">
-		<element name="text:index-entry-tab-stop">
-			<optional>
-				<attribute name="text:style-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-			<ref name="text-index-entry-tab-stop-attrs"/>
-		</element>
-	</define>
-	<define name="text-index-entry-tab-stop-attrs">
-		<interleave>
-			<optional>
-				<attribute name="style:leader-char">
-					<ref name="character"/>
-				</attribute>
-			</optional>
-			<choice>
-				<attribute name="style:type">
-					<value>right</value>
-				</attribute>
-				<group>
-					<attribute name="style:type">
-						<value>left</value>
-					</attribute>
-					<attribute name="style:position">
-						<ref name="length"/>
-					</attribute>
-				</group>
-			</choice>
-		</interleave>
-	</define>
-	<define name="text-index-entry-link-start">
-		<element name="text:index-entry-link-start">
-			<optional>
-				<attribute name="text:style-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-		</element>
-	</define>
-	<define name="text-index-entry-link-end">
-		<element name="text:index-entry-link-end">
-			<optional>
-				<attribute name="text:style-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-		</element>
-	</define>
-	<define name="table-table">
-		<element name="table:table">
-			<ref name="table-table-attlist"/>
-			<optional>
-				<ref name="table-title"/>
-			</optional>
-			<optional>
-				<ref name="table-desc"/>
-			</optional>
-			<optional>
-				<ref name="table-table-source"/>
-			</optional>
-			<optional>
-				<ref name="office-dde-source"/>
-			</optional>
-			<optional>
-				<ref name="table-scenario"/>
-			</optional>
-			<optional>
-				<ref name="office-forms"/>
-			</optional>
-			<optional>
-				<ref name="table-shapes"/>
-			</optional>
-			<ref name="table-columns-and-groups"/>
-			<ref name="table-rows-and-groups"/>
-			<optional>
-				<ref name="table-named-expressions"/>
-			</optional>
-		</element>
-	</define>
-	<define name="table-columns-and-groups">
-		<oneOrMore>
-			<choice>
-				<ref name="table-table-column-group"/>
-				<ref name="table-columns-no-group"/>
-			</choice>
-		</oneOrMore>
-	</define>
-	<define name="table-columns-no-group">
-		<choice>
-			<group>
-				<ref name="table-columns"/>
-				<optional>
-					<ref name="table-table-header-columns"/>
-					<optional>
-						<ref name="table-columns"/>
-					</optional>
-				</optional>
-			</group>
-			<group>
-				<ref name="table-table-header-columns"/>
-				<optional>
-					<ref name="table-columns"/>
-				</optional>
-			</group>
-		</choice>
-	</define>
-	<define name="table-columns">
-		<choice>
-			<ref name="table-table-columns"/>
-			<oneOrMore>
-				<ref name="table-table-column"/>
-			</oneOrMore>
-		</choice>
-	</define>
-	<define name="table-rows-and-groups">
-		<oneOrMore>
-			<choice>
-				<ref name="table-table-row-group"/>
-				<ref name="table-rows-no-group"/>
-			</choice>
-		</oneOrMore>
-	</define>
-	<define name="table-rows-no-group">
-		<choice>
-			<group>
-				<ref name="table-rows"/>
-				<optional>
-					<ref name="table-table-header-rows"/>
-					<optional>
-						<ref name="table-rows"/>
-					</optional>
-				</optional>
-			</group>
-			<group>
-				<ref name="table-table-header-rows"/>
-				<optional>
-					<ref name="table-rows"/>
-				</optional>
-			</group>
-		</choice>
-	</define>
-	<define name="table-rows">
-		<choice>
-			<ref name="table-table-rows"/>
-			<oneOrMore>
-				<optional>
-					<ref name="text-soft-page-break"/>
-				</optional>
-				<ref name="table-table-row"/>
-			</oneOrMore>
-		</choice>
-	</define>
-	<define name="table-table-attlist">
-		<interleave>
-			<optional>
-				<attribute name="table:name">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:style-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:template-name">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:use-first-row-styles">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:use-last-row-styles">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:use-first-column-styles">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:use-last-column-styles">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:use-banding-rows-styles">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:use-banding-columns-styles">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:protected">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:protection-key">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:protection-key-digest-algorithm">
-					<ref name="anyIRI"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:print">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:print-ranges">
-					<ref name="cellRangeAddressList"/>
-				</attribute>
-			</optional>
-			<optional>
-				<ref name="xml-id"/>
-			</optional>
-			<optional>
-				<attribute name="table:is-sub-table">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="table-title">
-		<element name="table:title">
-			<text/>
-		</element>
-	</define>
-	<define name="table-desc">
-		<element name="table:desc">
-			<text/>
-		</element>
-	</define>
-	<define name="table-table-row">
-		<element name="table:table-row">
-			<ref name="table-table-row-attlist"/>
-			<oneOrMore>
-				<choice>
-					<ref name="table-table-cell"/>
-					<ref name="table-covered-table-cell"/>
-				</choice>
-			</oneOrMore>
-		</element>
-	</define>
-	<define name="table-table-row-attlist">
-		<interleave>
-			<optional>
-				<attribute name="table:number-rows-repeated">
-					<ref name="positiveInteger"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:style-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:default-cell-style-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:visibility">
-					<ref name="table-visibility-value"/>
-				</attribute>
-			</optional>
-			<optional>
-				<ref name="xml-id"/>
-			</optional>
-		</interleave>
-	</define>
-	<define name="table-visibility-value">
-		<choice>
-			<value>visible</value>
-			<value>collapse</value>
-			<value>filter</value>
-		</choice>
-	</define>
-	<define name="table-table-cell">
-		<element name="table:table-cell">
-			<ref name="table-table-cell-attlist"/>
-			<ref name="table-table-cell-attlist-extra"/>
-			<ref name="table-table-cell-content"/>
-		</element>
-	</define>
-	<define name="table-covered-table-cell">
-		<element name="table:covered-table-cell">
-			<ref name="table-table-cell-attlist"/>
-			<ref name="table-table-cell-content"/>
-		</element>
-	</define>
-	<define name="table-table-cell-content">
-		<optional>
-			<ref name="table-cell-range-source"/>
-		</optional>
-		<optional>
-			<ref name="office-annotation"/>
-		</optional>
-		<optional>
-			<ref name="table-detective"/>
-		</optional>
-		<zeroOrMore>
-			<ref name="text-content"/>
-		</zeroOrMore>
-	</define>
-	<define name="table-table-cell-attlist">
-		<interleave>
-			<optional>
-				<attribute name="table:number-columns-repeated">
-					<ref name="positiveInteger"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:style-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:content-validation-name">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:formula">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<ref name="common-value-and-type-attlist"/>
-			</optional>
-			<optional>
-				<attribute name="table:protect">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:protected">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<ref name="xml-id"/>
-			</optional>
-			<optional>
-				<ref name="common-in-content-meta-attlist"/>
-			</optional>
-		</interleave>
-	</define>
-	<define name="table-table-cell-attlist-extra">
-		<interleave>
-			<optional>
-				<attribute name="table:number-columns-spanned">
-					<ref name="positiveInteger"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:number-rows-spanned">
-					<ref name="positiveInteger"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:number-matrix-columns-spanned">
-					<ref name="positiveInteger"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:number-matrix-rows-spanned">
-					<ref name="positiveInteger"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="table-table-column">
-		<element name="table:table-column">
-			<ref name="table-table-column-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="table-table-column-attlist">
-		<interleave>
-			<optional>
-				<attribute name="table:number-columns-repeated">
-					<ref name="positiveInteger"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:style-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:visibility">
-					<ref name="table-visibility-value"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:default-cell-style-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-			<optional>
-				<ref name="xml-id"/>
-			</optional>
-		</interleave>
-	</define>
-	<define name="table-table-header-columns">
-		<element name="table:table-header-columns">
-			<oneOrMore>
-				<ref name="table-table-column"/>
-			</oneOrMore>
-		</element>
-	</define>
-	<define name="table-table-columns">
-		<element name="table:table-columns">
-			<oneOrMore>
-				<ref name="table-table-column"/>
-			</oneOrMore>
-		</element>
-	</define>
-	<define name="table-table-column-group">
-		<element name="table:table-column-group">
-			<ref name="table-table-column-group-attlist"/>
-			<ref name="table-columns-and-groups"/>
-		</element>
-	</define>
-	<define name="table-table-column-group-attlist">
-		<optional>
-			<attribute name="table:display">
-				<ref name="boolean"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="table-table-header-rows">
-		<element name="table:table-header-rows">
-			<oneOrMore>
-				<optional>
-					<ref name="text-soft-page-break"/>
-				</optional>
-				<ref name="table-table-row"/>
-			</oneOrMore>
-		</element>
-	</define>
-	<define name="table-table-rows">
-		<element name="table:table-rows">
-			<oneOrMore>
-				<optional>
-					<ref name="text-soft-page-break"/>
-				</optional>
-				<ref name="table-table-row"/>
-			</oneOrMore>
-		</element>
-	</define>
-	<define name="table-table-row-group">
-		<element name="table:table-row-group">
-			<ref name="table-table-row-group-attlist"/>
-			<ref name="table-rows-and-groups"/>
-		</element>
-	</define>
-	<define name="table-table-row-group-attlist">
-		<optional>
-			<attribute name="table:display">
-				<ref name="boolean"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="cellAddress">
-		<data type="string">
-			<param name="pattern">($?([^\. ']+|'([^']|'')+'))?\.$?[A-Z]+$?[0-9]+</param>
-		</data>
-	</define>
-	<define name="cellRangeAddress">
-		<choice>
-			<data type="string">
-				<param name="pattern">($?([^\. ']+|'([^']|'')+'))?\.$?[A-Z]+$?[0-9]+(:($?([^\. ']+|'([^']|'')+'))?\.$?[A-Z]+$?[0-9]+)?</param>
-			</data>
-			<data type="string">
-				<param name="pattern">($?([^\. ']+|'([^']|'')+'))?\.$?[0-9]+:($?([^\. ']+|'([^']|'')+'))?\.$?[0-9]+</param>
-			</data>
-			<data type="string">
-				<param name="pattern">($?([^\. ']+|'([^']|'')+'))?\.$?[A-Z]+:($?([^\. ']+|'([^']|'')+'))?\.$?[A-Z]+</param>
-			</data>
-		</choice>
-	</define>
-	<define name="cellRangeAddressList">
-		<data type="string"/>
-		<dc:description>Value is a space separated list of "cellRangeAddress" patterns</dc:description>
-	</define>
-	<define name="table-table-source">
-		<element name="table:table-source">
-			<ref name="table-table-source-attlist"/>
-			<ref name="table-linked-source-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="table-table-source-attlist">
-		<interleave>
-			<optional>
-				<attribute name="table:mode">
-					<choice>
-						<value>copy-all</value>
-						<value>copy-results-only</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:table-name">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="table-linked-source-attlist">
-		<interleave>
-			<attribute name="xlink:type">
-				<value>simple</value>
-			</attribute>
-			<attribute name="xlink:href">
-				<ref name="anyIRI"/>
-			</attribute>
-			<optional>
-				<attribute name="xlink:actuate">
-					<value>onRequest</value>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:filter-name">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:filter-options">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:refresh-delay">
-					<ref name="duration"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="table-scenario">
-		<element name="table:scenario">
-			<ref name="table-scenario-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="table-scenario-attlist">
-		<interleave>
-			<attribute name="table:scenario-ranges">
-				<ref name="cellRangeAddressList"/>
-			</attribute>
-			<attribute name="table:is-active">
-				<ref name="boolean"/>
-			</attribute>
-			<optional>
-				<attribute name="table:display-border">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:border-color">
-					<ref name="color"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:copy-back">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:copy-styles">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:copy-formulas">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:comment">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:protected">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="table-shapes">
-		<element name="table:shapes">
-			<oneOrMore>
-				<ref name="shape"/>
-			</oneOrMore>
-		</element>
-	</define>
-	<define name="table-cell-range-source">
-		<element name="table:cell-range-source">
-			<ref name="table-table-cell-range-source-attlist"/>
-			<ref name="table-linked-source-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="table-table-cell-range-source-attlist">
-		<interleave>
-			<attribute name="table:name">
-				<ref name="string"/>
-			</attribute>
-			<attribute name="table:last-column-spanned">
-				<ref name="positiveInteger"/>
-			</attribute>
-			<attribute name="table:last-row-spanned">
-				<ref name="positiveInteger"/>
-			</attribute>
-		</interleave>
-	</define>
-	<define name="table-detective">
-		<element name="table:detective">
-			<zeroOrMore>
-				<ref name="table-highlighted-range"/>
-			</zeroOrMore>
-			<zeroOrMore>
-				<ref name="table-operation"/>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="table-operation">
-		<element name="table:operation">
-			<ref name="table-operation-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="table-operation-attlist">
-		<interleave>
-			<attribute name="table:name">
-				<choice>
-					<value>trace-dependents</value>
-					<value>remove-dependents</value>
-					<value>trace-precedents</value>
-					<value>remove-precedents</value>
-					<value>trace-errors</value>
-				</choice>
-			</attribute>
-			<attribute name="table:index">
-				<ref name="nonNegativeInteger"/>
-			</attribute>
-		</interleave>
-	</define>
-	<define name="table-highlighted-range">
-		<element name="table:highlighted-range">
-			<choice>
-				<group>
-					<ref name="table-highlighted-range-attlist"/>
-				</group>
-				<group>
-					<ref name="table-highlighted-range-attlist-invalid"/>
-				</group>
-			</choice>
-			<empty/>
-		</element>
-	</define>
-	<define name="table-highlighted-range-attlist">
-		<interleave>
-			<optional>
-				<attribute name="table:cell-range-address">
-					<ref name="cellRangeAddress"/>
-				</attribute>
-			</optional>
-			<attribute name="table:direction">
-				<choice>
-					<value>from-another-table</value>
-					<value>to-another-table</value>
-					<value>from-same-table</value>
-				</choice>
-			</attribute>
-			<optional>
-				<attribute name="table:contains-error">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="table-highlighted-range-attlist-invalid">
-		<attribute name="table:marked-invalid">
-			<ref name="boolean"/>
-		</attribute>
-	</define>
-	<define name="office-spreadsheet-attlist">
-		<optional>
-			<attribute name="table:structure-protected">
-				<ref name="boolean"/>
-			</attribute>
-		</optional>
-		<optional>
-			<attribute name="table:protection-key">
-				<ref name="string"/>
-			</attribute>
-		</optional>
-		<optional>
-			<attribute name="table:protection-key-digest-algorithm">
-				<ref name="anyIRI"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="table-calculation-settings">
-		<element name="table:calculation-settings">
-			<ref name="table-calculation-setting-attlist"/>
-			<optional>
-				<ref name="table-null-date"/>
-			</optional>
-			<optional>
-				<ref name="table-iteration"/>
-			</optional>
-		</element>
-	</define>
-	<define name="table-calculation-setting-attlist">
-		<interleave>
-			<optional>
-				<attribute name="table:case-sensitive">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:precision-as-shown">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:search-criteria-must-apply-to-whole-cell">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:automatic-find-labels">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:use-regular-expressions">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:use-wildcards">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:null-year">
-					<ref name="positiveInteger"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="table-null-date">
-		<element name="table:null-date">
-			<optional>
-				<attribute name="table:value-type">
-					<value>date</value>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:date-value">
-					<ref name="date"/>
-				</attribute>
-			</optional>
-			<empty/>
-		</element>
-	</define>
-	<define name="table-iteration">
-		<element name="table:iteration">
-			<optional>
-				<attribute name="table:status">
-					<choice>
-						<value>enable</value>
-						<value>disable</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:steps">
-					<ref name="positiveInteger"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:maximum-difference">
-					<ref name="double"/>
-				</attribute>
-			</optional>
-			<empty/>
-		</element>
-	</define>
-	<define name="table-content-validations">
-		<element name="table:content-validations">
-			<oneOrMore>
-				<ref name="table-content-validation"/>
-			</oneOrMore>
-		</element>
-	</define>
-	<define name="table-content-validation">
-		<element name="table:content-validation">
-			<ref name="table-validation-attlist"/>
-			<optional>
-				<ref name="table-help-message"/>
-			</optional>
-			<optional>
-				<choice>
-					<ref name="table-error-message"/>
-					<group>
-						<ref name="table-error-macro"/>
-						<ref name="office-event-listeners"/>
-					</group>
-				</choice>
-			</optional>
-		</element>
-	</define>
-	<define name="table-validation-attlist">
-		<interleave>
-			<attribute name="table:name">
-				<ref name="string"/>
-			</attribute>
-			<optional>
-				<attribute name="table:condition">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:base-cell-address">
-					<ref name="cellAddress"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:allow-empty-cell">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:display-list">
-					<choice>
-						<value>none</value>
-						<value>unsorted</value>
-						<value>sort-ascending</value>
-					</choice>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="table-help-message">
-		<element name="table:help-message">
-			<optional>
-				<attribute name="table:title">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:display">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<zeroOrMore>
-				<ref name="text-p"/>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="table-error-message">
-		<element name="table:error-message">
-			<optional>
-				<attribute name="table:title">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:display">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:message-type">
-					<choice>
-						<value>stop</value>
-						<value>warning</value>
-						<value>information</value>
-					</choice>
-				</attribute>
-			</optional>
-			<zeroOrMore>
-				<ref name="text-p"/>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="table-error-macro">
-		<element name="table:error-macro">
-			<optional>
-				<attribute name="table:execute">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-		</element>
-	</define>
-	<define name="table-label-ranges">
-		<element name="table:label-ranges">
-			<zeroOrMore>
-				<ref name="table-label-range"/>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="table-label-range">
-		<element name="table:label-range">
-			<ref name="table-label-range-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="table-label-range-attlist">
-		<interleave>
-			<attribute name="table:label-cell-range-address">
-				<ref name="cellRangeAddress"/>
-			</attribute>
-			<attribute name="table:data-cell-range-address">
-				<ref name="cellRangeAddress"/>
-			</attribute>
-			<attribute name="table:orientation">
-				<choice>
-					<value>column</value>
-					<value>row</value>
-				</choice>
-			</attribute>
-		</interleave>
-	</define>
-	<define name="table-named-expressions">
-		<element name="table:named-expressions">
-			<zeroOrMore>
-				<choice>
-					<ref name="table-named-range"/>
-					<ref name="table-named-expression"/>
-				</choice>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="table-named-range">
-		<element name="table:named-range">
-			<ref name="table-named-range-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="table-named-range-attlist">
-		<attribute name="table:name">
-			<ref name="string"/>
-		</attribute>
-		<attribute name="table:cell-range-address">
-			<ref name="cellRangeAddress"/>
-		</attribute>
-		<optional>
-			<attribute name="table:base-cell-address">
-				<ref name="cellAddress"/>
-			</attribute>
-		</optional>
-		<optional>
-			<attribute name="table:range-usable-as">
-				<choice>
-					<value>none</value>
-					<list>
-						<oneOrMore>
-							<choice>
-								<value>print-range</value>
-								<value>filter</value>
-								<value>repeat-row</value>
-								<value>repeat-column</value>
-							</choice>
-						</oneOrMore>
-					</list>
-				</choice>
-			</attribute>
-		</optional>
-	</define>
-	<define name="table-named-expression">
-		<element name="table:named-expression">
-			<ref name="table-named-expression-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="table-named-expression-attlist">
-		<attribute name="table:name">
-			<ref name="string"/>
-		</attribute>
-		<attribute name="table:expression">
-			<ref name="string"/>
-		</attribute>
-		<optional>
-			<attribute name="table:base-cell-address">
-				<ref name="cellAddress"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="table-database-ranges">
-		<element name="table:database-ranges">
-			<zeroOrMore>
-				<ref name="table-database-range"/>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="table-database-range">
-		<element name="table:database-range">
-			<ref name="table-database-range-attlist"/>
-			<optional>
-				<choice>
-					<ref name="table-database-source-sql"/>
-					<ref name="table-database-source-table"/>
-					<ref name="table-database-source-query"/>
-				</choice>
-			</optional>
-			<optional>
-				<ref name="table-filter"/>
-			</optional>
-			<optional>
-				<ref name="table-sort"/>
-			</optional>
-			<optional>
-				<ref name="table-subtotal-rules"/>
-			</optional>
-		</element>
-	</define>
-	<define name="table-database-range-attlist">
-		<interleave>
-			<optional>
-				<attribute name="table:name">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:is-selection">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:on-update-keep-styles">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:on-update-keep-size">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:has-persistent-data">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:orientation">
-					<choice>
-						<value>column</value>
-						<value>row</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:contains-header">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:display-filter-buttons">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<attribute name="table:target-range-address">
-				<ref name="cellRangeAddress"/>
-			</attribute>
-			<optional>
-				<attribute name="table:refresh-delay">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="table-database-source-sql">
-		<element name="table:database-source-sql">
-			<ref name="table-database-source-sql-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="table-database-source-sql-attlist">
-		<interleave>
-			<attribute name="table:database-name">
-				<ref name="string"/>
-			</attribute>
-			<attribute name="table:sql-statement">
-				<ref name="string"/>
-			</attribute>
-			<optional>
-				<attribute name="table:parse-sql-statement">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="table-database-source-query">
-		<element name="table:database-source-table">
-			<ref name="table-database-source-table-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="table-database-source-table-attlist">
-		<interleave>
-			<attribute name="table:database-name">
-				<ref name="string"/>
-			</attribute>
-			<attribute name="table:database-table-name">
-				<ref name="string"/>
-			</attribute>
-		</interleave>
-	</define>
-	<define name="table-database-source-table">
-		<element name="table:database-source-query">
-			<ref name="table-database-source-query-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="table-database-source-query-attlist">
-		<interleave>
-			<attribute name="table:database-name">
-				<ref name="string"/>
-			</attribute>
-			<attribute name="table:query-name">
-				<ref name="string"/>
-			</attribute>
-		</interleave>
-	</define>
-	<define name="table-sort">
-		<element name="table:sort">
-			<ref name="table-sort-attlist"/>
-			<oneOrMore>
-				<ref name="table-sort-by"/>
-			</oneOrMore>
-		</element>
-	</define>
-	<define name="table-sort-attlist">
-		<interleave>
-			<optional>
-				<attribute name="table:bind-styles-to-content">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:target-range-address">
-					<ref name="cellRangeAddress"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:case-sensitive">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:language">
-					<ref name="languageCode"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:country">
-					<ref name="countryCode"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:script">
-					<ref name="scriptCode"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:rfc-language-tag">
-					<ref name="language"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:algorithm">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:embedded-number-behavior">
-					<choice>
-						<value>alpha-numeric</value>
-						<value>integer</value>
-						<value>double</value>
-					</choice>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="table-sort-by">
-		<element name="table:sort-by">
-			<ref name="table-sort-by-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="table-sort-by-attlist">
-		<interleave>
-			<attribute name="table:field-number">
-				<ref name="nonNegativeInteger"/>
-			</attribute>
-			<optional>
-				<attribute name="table:data-type">
-					<choice>
-						<value>text</value>
-						<value>number</value>
-						<value>automatic</value>
-						<ref name="string"/>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:order">
-					<choice>
-						<value>ascending</value>
-						<value>descending</value>
-					</choice>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="table-subtotal-rules">
-		<element name="table:subtotal-rules">
-			<ref name="table-subtotal-rules-attlist"/>
-			<optional>
-				<ref name="table-sort-groups"/>
-			</optional>
-			<zeroOrMore>
-				<ref name="table-subtotal-rule"/>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="table-subtotal-rules-attlist">
-		<interleave>
-			<optional>
-				<attribute name="table:bind-styles-to-content">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:case-sensitive">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:page-breaks-on-group-change">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="table-sort-groups">
-		<element name="table:sort-groups">
-			<ref name="table-sort-groups-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="table-sort-groups-attlist">
-		<interleave>
-			<optional>
-				<attribute name="table:data-type">
-					<choice>
-						<value>text</value>
-						<value>number</value>
-						<value>automatic</value>
-						<ref name="string"/>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:order">
-					<choice>
-						<value>ascending</value>
-						<value>descending</value>
-					</choice>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="table-subtotal-rule">
-		<element name="table:subtotal-rule">
-			<ref name="table-subtotal-rule-attlist"/>
-			<zeroOrMore>
-				<ref name="table-subtotal-field"/>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="table-subtotal-rule-attlist">
-		<attribute name="table:group-by-field-number">
-			<ref name="nonNegativeInteger"/>
-		</attribute>
-	</define>
-	<define name="table-subtotal-field">
-		<element name="table:subtotal-field">
-			<ref name="table-subtotal-field-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="table-subtotal-field-attlist">
-		<interleave>
-			<attribute name="table:field-number">
-				<ref name="nonNegativeInteger"/>
-			</attribute>
-			<attribute name="table:function">
-				<choice>
-					<value>average</value>
-					<value>count</value>
-					<value>countnums</value>
-					<value>max</value>
-					<value>min</value>
-					<value>product</value>
-					<value>stdev</value>
-					<value>stdevp</value>
-					<value>sum</value>
-					<value>var</value>
-					<value>varp</value>
-					<ref name="string"/>
-				</choice>
-			</attribute>
-		</interleave>
-	</define>
-	<define name="table-filter">
-		<element name="table:filter">
-			<ref name="table-filter-attlist"/>
-			<choice>
-				<ref name="table-filter-condition"/>
-				<ref name="table-filter-and"/>
-				<ref name="table-filter-or"/>
-			</choice>
-		</element>
-	</define>
-	<define name="table-filter-attlist">
-		<interleave>
-			<optional>
-				<attribute name="table:target-range-address">
-					<ref name="cellRangeAddress"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:condition-source">
-					<choice>
-						<value>self</value>
-						<value>cell-range</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:condition-source-range-address">
-					<ref name="cellRangeAddress"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:display-duplicates">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="table-filter-and">
-		<element name="table:filter-and">
-			<oneOrMore>
-				<choice>
-					<ref name="table-filter-or"/>
-					<ref name="table-filter-condition"/>
-				</choice>
-			</oneOrMore>
-		</element>
-	</define>
-	<define name="table-filter-or">
-		<element name="table:filter-or">
-			<oneOrMore>
-				<choice>
-					<ref name="table-filter-and"/>
-					<ref name="table-filter-condition"/>
-				</choice>
-			</oneOrMore>
-		</element>
-	</define>
-	<define name="table-filter-condition">
-		<element name="table:filter-condition">
-			<ref name="table-filter-condition-attlist"/>
-			<zeroOrMore>
-				<ref name="table-filter-set-item"/>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="table-filter-condition-attlist">
-		<interleave>
-			<attribute name="table:field-number">
-				<ref name="nonNegativeInteger"/>
-			</attribute>
-			<attribute name="table:value">
-				<choice>
-					<ref name="string"/>
-					<ref name="double"/>
-				</choice>
-			</attribute>
-			<attribute name="table:operator">
-				<ref name="string"/>
-			</attribute>
-			<optional>
-				<attribute name="table:case-sensitive">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:data-type">
-					<choice>
-						<value>text</value>
-						<value>number</value>
-					</choice>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="table-filter-set-item">
-		<element name="table:filter-set-item">
-			<attribute name="table:value">
-				<ref name="string"/>
-			</attribute>
-			<empty/>
-		</element>
-	</define>
-	<define name="table-data-pilot-tables">
-		<element name="table:data-pilot-tables">
-			<zeroOrMore>
-				<ref name="table-data-pilot-table"/>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="table-data-pilot-table">
-		<element name="table:data-pilot-table">
-			<ref name="table-data-pilot-table-attlist"/>
-			<optional>
-				<choice>
-					<ref name="table-database-source-sql"/>
-					<ref name="table-database-source-table"/>
-					<ref name="table-database-source-query"/>
-					<ref name="table-source-service"/>
-					<ref name="table-source-cell-range"/>
-				</choice>
-			</optional>
-			<oneOrMore>
-				<ref name="table-data-pilot-field"/>
-			</oneOrMore>
-		</element>
-	</define>
-	<define name="table-data-pilot-table-attlist">
-		<interleave>
-			<attribute name="table:name">
-				<ref name="string"/>
-			</attribute>
-			<optional>
-				<attribute name="table:application-data">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:grand-total">
-					<choice>
-						<value>none</value>
-						<value>row</value>
-						<value>column</value>
-						<value>both</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:ignore-empty-rows">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:identify-categories">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<attribute name="table:target-range-address">
-				<ref name="cellRangeAddress"/>
-			</attribute>
-			<optional>
-				<attribute name="table:buttons">
-					<ref name="cellRangeAddressList"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:show-filter-button">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:drill-down-on-double-click">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="table-source-cell-range">
-		<element name="table:source-cell-range">
-			<ref name="table-source-cell-range-attlist"/>
-			<optional>
-				<ref name="table-filter"/>
-			</optional>
-		</element>
-	</define>
-	<define name="table-source-cell-range-attlist">
-		<attribute name="table:cell-range-address">
-			<ref name="cellRangeAddress"/>
-		</attribute>
-	</define>
-	<define name="table-source-service">
-		<element name="table:source-service">
-			<ref name="table-source-service-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="table-source-service-attlist">
-		<interleave>
-			<attribute name="table:name">
-				<ref name="string"/>
-			</attribute>
-			<attribute name="table:source-name">
-				<ref name="string"/>
-			</attribute>
-			<attribute name="table:object-name">
-				<ref name="string"/>
-			</attribute>
-			<optional>
-				<attribute name="table:user-name">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:password">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="table-data-pilot-field">
-		<element name="table:data-pilot-field">
-			<ref name="table-data-pilot-field-attlist"/>
-			<optional>
-				<ref name="table-data-pilot-level"/>
-			</optional>
-			<optional>
-				<ref name="table-data-pilot-field-reference"/>
-			</optional>
-			<optional>
-				<ref name="table-data-pilot-groups"/>
-			</optional>
-		</element>
-	</define>
-	<define name="table-data-pilot-field-attlist">
-		<interleave>
-			<attribute name="table:source-field-name">
-				<ref name="string"/>
-			</attribute>
-			<choice>
-				<attribute name="table:orientation">
-					<choice>
-						<value>row</value>
-						<value>column</value>
-						<value>data</value>
-						<value>hidden</value>
-					</choice>
-				</attribute>
-				<group>
-					<attribute name="table:orientation">
-						<value>page</value>
-					</attribute>
-					<attribute name="table:selected-page">
-						<ref name="string"/>
-					</attribute>
-				</group>
-			</choice>
-			<optional>
-				<attribute name="table:is-data-layout-field">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:function">
-					<choice>
-						<value>auto</value>
-						<value>average</value>
-						<value>count</value>
-						<value>countnums</value>
-						<value>max</value>
-						<value>min</value>
-						<value>product</value>
-						<value>stdev</value>
-						<value>stdevp</value>
-						<value>sum</value>
-						<value>var</value>
-						<value>varp</value>
-						<ref name="string"/>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:used-hierarchy">
-					<ref name="integer"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="table-data-pilot-level">
-		<element name="table:data-pilot-level">
-			<ref name="table-data-pilot-level-attlist"/>
-			<optional>
-				<ref name="table-data-pilot-subtotals"/>
-			</optional>
-			<optional>
-				<ref name="table-data-pilot-members"/>
-			</optional>
-			<optional>
-				<ref name="table-data-pilot-display-info"/>
-			</optional>
-			<optional>
-				<ref name="table-data-pilot-sort-info"/>
-			</optional>
-			<optional>
-				<ref name="table-data-pilot-layout-info"/>
-			</optional>
-		</element>
-	</define>
-	<define name="table-data-pilot-level-attlist">
-		<optional>
-			<attribute name="table:show-empty">
-				<ref name="boolean"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="table-data-pilot-subtotals">
-		<element name="table:data-pilot-subtotals">
-			<zeroOrMore>
-				<ref name="table-data-pilot-subtotal"/>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="table-data-pilot-subtotal">
-		<element name="table:data-pilot-subtotal">
-			<ref name="table-data-pilot-subtotal-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="table-data-pilot-subtotal-attlist">
-		<attribute name="table:function">
-			<choice>
-				<value>auto</value>
-				<value>average</value>
-				<value>count</value>
-				<value>countnums</value>
-				<value>max</value>
-				<value>min</value>
-				<value>product</value>
-				<value>stdev</value>
-				<value>stdevp</value>
-				<value>sum</value>
-				<value>var</value>
-				<value>varp</value>
-				<ref name="string"/>
-			</choice>
-		</attribute>
-	</define>
-	<define name="table-data-pilot-members">
-		<element name="table:data-pilot-members">
-			<zeroOrMore>
-				<ref name="table-data-pilot-member"/>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="table-data-pilot-member">
-		<element name="table:data-pilot-member">
-			<ref name="table-data-pilot-member-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="table-data-pilot-member-attlist">
-		<interleave>
-			<attribute name="table:name">
-				<ref name="string"/>
-			</attribute>
-			<optional>
-				<attribute name="table:display">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:show-details">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="table-data-pilot-display-info">
-		<element name="table:data-pilot-display-info">
-			<ref name="table-data-pilot-display-info-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="table-data-pilot-display-info-attlist">
-		<interleave>
-			<attribute name="table:enabled">
-				<ref name="boolean"/>
-			</attribute>
-			<attribute name="table:data-field">
-				<ref name="string"/>
-			</attribute>
-			<attribute name="table:member-count">
-				<ref name="nonNegativeInteger"/>
-			</attribute>
-			<attribute name="table:display-member-mode">
-				<choice>
-					<value>from-top</value>
-					<value>from-bottom</value>
-				</choice>
-			</attribute>
-		</interleave>
-	</define>
-	<define name="table-data-pilot-sort-info">
-		<element name="table:data-pilot-sort-info">
-			<ref name="table-data-pilot-sort-info-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="table-data-pilot-sort-info-attlist">
-		<interleave>
-			<choice>
-				<group>
-					<attribute name="table:sort-mode">
-						<value>data</value>
-					</attribute>
-					<attribute name="table:data-field">
-						<ref name="string"/>
-					</attribute>
-				</group>
-				<attribute name="table:sort-mode">
-					<choice>
-						<value>none</value>
-						<value>manual</value>
-						<value>name</value>
-					</choice>
-				</attribute>
-			</choice>
-			<attribute name="table:order">
-				<choice>
-					<value>ascending</value>
-					<value>descending</value>
-				</choice>
-			</attribute>
-		</interleave>
-	</define>
-	<define name="table-data-pilot-layout-info">
-		<element name="table:data-pilot-layout-info">
-			<ref name="table-data-pilot-layout-info-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="table-data-pilot-layout-info-attlist">
-		<interleave>
-			<attribute name="table:layout-mode">
-				<choice>
-					<value>tabular-layout</value>
-					<value>outline-subtotals-top</value>
-					<value>outline-subtotals-bottom</value>
-				</choice>
-			</attribute>
-			<attribute name="table:add-empty-lines">
-				<ref name="boolean"/>
-			</attribute>
-		</interleave>
-	</define>
-	<define name="table-data-pilot-field-reference">
-		<element name="table:data-pilot-field-reference">
-			<ref name="table-data-pilot-field-reference-attlist"/>
-		</element>
-	</define>
-	<define name="table-data-pilot-field-reference-attlist">
-		<interleave>
-			<attribute name="table:field-name">
-				<ref name="string"/>
-			</attribute>
-			<choice>
-				<group>
-					<attribute name="table:member-type">
-						<value>named</value>
-					</attribute>
-					<attribute name="table:member-name">
-						<ref name="string"/>
-					</attribute>
-				</group>
-				<attribute name="table:member-type">
-					<choice>
-						<value>previous</value>
-						<value>next</value>
-					</choice>
-				</attribute>
-			</choice>
-			<attribute name="table:type">
-				<choice>
-					<value>none</value>
-					<value>member-difference</value>
-					<value>member-percentage</value>
-					<value>member-percentage-difference</value>
-					<value>running-total</value>
-					<value>row-percentage</value>
-					<value>column-percentage</value>
-					<value>total-percentage</value>
-					<value>index</value>
-				</choice>
-			</attribute>
-		</interleave>
-	</define>
-	<define name="table-data-pilot-groups">
-		<element name="table:data-pilot-groups">
-			<ref name="table-data-pilot-groups-attlist"/>
-			<oneOrMore>
-				<ref name="table-data-pilot-group"/>
-			</oneOrMore>
-		</element>
-	</define>
-	<define name="table-data-pilot-groups-attlist">
-		<interleave>
-			<attribute name="table:source-field-name">
-				<ref name="string"/>
-			</attribute>
-			<choice>
-				<attribute name="table:date-start">
-					<choice>
-						<ref name="dateOrDateTime"/>
-						<value>auto</value>
-					</choice>
-				</attribute>
-				<attribute name="table:start">
-					<choice>
-						<ref name="double"/>
-						<value>auto</value>
-					</choice>
-				</attribute>
-			</choice>
-			<choice>
-				<attribute name="table:date-end">
-					<choice>
-						<ref name="dateOrDateTime"/>
-						<value>auto</value>
-					</choice>
-				</attribute>
-				<attribute name="table:end">
-					<choice>
-						<ref name="double"/>
-						<value>auto</value>
-					</choice>
-				</attribute>
-			</choice>
-			<attribute name="table:step">
-				<ref name="double"/>
-			</attribute>
-			<attribute name="table:grouped-by">
-				<choice>
-					<value>seconds</value>
-					<value>minutes</value>
-					<value>hours</value>
-					<value>days</value>
-					<value>months</value>
-					<value>quarters</value>
-					<value>years</value>
-				</choice>
-			</attribute>
-		</interleave>
-	</define>
-	<define name="table-data-pilot-group">
-		<element name="table:data-pilot-group">
-			<ref name="table-data-pilot-group-attlist"/>
-			<oneOrMore>
-				<ref name="table-data-pilot-group-member"/>
-			</oneOrMore>
-		</element>
-	</define>
-	<define name="table-data-pilot-group-attlist">
-		<attribute name="table:name">
-			<ref name="string"/>
-		</attribute>
-	</define>
-	<define name="table-data-pilot-group-member">
-		<element name="table:data-pilot-group-member">
-			<ref name="table-data-pilot-group-member-attlist"/>
-		</element>
-	</define>
-	<define name="table-data-pilot-group-member-attlist">
-		<attribute name="table:name">
-			<ref name="string"/>
-		</attribute>
-	</define>
-	<define name="table-consolidation">
-		<element name="table:consolidation">
-			<ref name="table-consolidation-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="table-consolidation-attlist">
-		<interleave>
-			<attribute name="table:function">
-				<choice>
-					<value>average</value>
-					<value>count</value>
-					<value>countnums</value>
-					<value>max</value>
-					<value>min</value>
-					<value>product</value>
-					<value>stdev</value>
-					<value>stdevp</value>
-					<value>sum</value>
-					<value>var</value>
-					<value>varp</value>
-					<ref name="string"/>
-				</choice>
-			</attribute>
-			<attribute name="table:source-cell-range-addresses">
-				<ref name="cellRangeAddressList"/>
-			</attribute>
-			<attribute name="table:target-cell-address">
-				<ref name="cellAddress"/>
-			</attribute>
-			<optional>
-				<attribute name="table:use-labels">
-					<choice>
-						<value>none</value>
-						<value>row</value>
-						<value>column</value>
-						<value>both</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:link-to-source-data">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="table-dde-links">
-		<element name="table:dde-links">
-			<oneOrMore>
-				<ref name="table-dde-link"/>
-			</oneOrMore>
-		</element>
-	</define>
-	<define name="table-tracked-changes">
-		<element name="table:tracked-changes">
-			<ref name="table-tracked-changes-attlist"/>
-			<zeroOrMore>
-				<choice>
-					<ref name="table-cell-content-change"/>
-					<ref name="table-insertion"/>
-					<ref name="table-deletion"/>
-					<ref name="table-movement"/>
-				</choice>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="table-tracked-changes-attlist">
-		<optional>
-			<attribute name="table:track-changes">
-				<ref name="boolean"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="table-insertion">
-		<element name="table:insertion">
-			<ref name="table-insertion-attlist"/>
-			<ref name="common-table-change-attlist"/>
-			<ref name="office-change-info"/>
-			<optional>
-				<ref name="table-dependencies"/>
-			</optional>
-			<optional>
-				<ref name="table-deletions"/>
-			</optional>
-		</element>
-	</define>
-	<define name="table-insertion-attlist">
-		<interleave>
-			<attribute name="table:type">
-				<choice>
-					<value>row</value>
-					<value>column</value>
-					<value>table</value>
-				</choice>
-			</attribute>
-			<attribute name="table:position">
-				<ref name="integer"/>
-			</attribute>
-			<optional>
-				<attribute name="table:count">
-					<ref name="positiveInteger"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:table">
-					<ref name="integer"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="table-dependencies">
-		<element name="table:dependencies">
-			<oneOrMore>
-				<ref name="table-dependency"/>
-			</oneOrMore>
-		</element>
-	</define>
-	<define name="table-dependency">
-		<element name="table:dependency">
-			<attribute name="table:id">
-				<ref name="string"/>
-			</attribute>
-			<empty/>
-		</element>
-	</define>
-	<define name="table-deletions">
-		<element name="table:deletions">
-			<oneOrMore>
-				<choice>
-					<ref name="table-cell-content-deletion"/>
-					<ref name="table-change-deletion"/>
-				</choice>
-			</oneOrMore>
-		</element>
-	</define>
-	<define name="table-cell-content-deletion">
-		<element name="table:cell-content-deletion">
-			<optional>
-				<attribute name="table:id">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<ref name="table-cell-address"/>
-			</optional>
-			<optional>
-				<ref name="table-change-track-table-cell"/>
-			</optional>
-		</element>
-	</define>
-	<define name="table-change-deletion">
-		<element name="table:change-deletion">
-			<optional>
-				<attribute name="table:id">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<empty/>
-		</element>
-	</define>
-	<define name="table-deletion">
-		<element name="table:deletion">
-			<ref name="table-deletion-attlist"/>
-			<ref name="common-table-change-attlist"/>
-			<ref name="office-change-info"/>
-			<optional>
-				<ref name="table-dependencies"/>
-			</optional>
-			<optional>
-				<ref name="table-deletions"/>
-			</optional>
-			<optional>
-				<ref name="table-cut-offs"/>
-			</optional>
-		</element>
-	</define>
-	<define name="table-deletion-attlist">
-		<interleave>
-			<attribute name="table:type">
-				<choice>
-					<value>row</value>
-					<value>column</value>
-					<value>table</value>
-				</choice>
-			</attribute>
-			<attribute name="table:position">
-				<ref name="integer"/>
-			</attribute>
-			<optional>
-				<attribute name="table:table">
-					<ref name="integer"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:multi-deletion-spanned">
-					<ref name="integer"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="table-cut-offs">
-		<element name="table:cut-offs">
-			<choice>
-				<oneOrMore>
-					<ref name="table-movement-cut-off"/>
-				</oneOrMore>
-				<group>
-					<ref name="table-insertion-cut-off"/>
-					<zeroOrMore>
-						<ref name="table-movement-cut-off"/>
-					</zeroOrMore>
-				</group>
-			</choice>
-		</element>
-	</define>
-	<define name="table-insertion-cut-off">
-		<element name="table:insertion-cut-off">
-			<ref name="table-insertion-cut-off-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="table-insertion-cut-off-attlist">
-		<interleave>
-			<attribute name="table:id">
-				<ref name="string"/>
-			</attribute>
-			<attribute name="table:position">
-				<ref name="integer"/>
-			</attribute>
-		</interleave>
-	</define>
-	<define name="table-movement-cut-off">
-		<element name="table:movement-cut-off">
-			<ref name="table-movement-cut-off-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="table-movement-cut-off-attlist">
-		<choice>
-			<attribute name="table:position">
-				<ref name="integer"/>
-			</attribute>
-			<group>
-				<attribute name="table:start-position">
-					<ref name="integer"/>
-				</attribute>
-				<attribute name="table:end-position">
-					<ref name="integer"/>
-				</attribute>
-			</group>
-		</choice>
-	</define>
-	<define name="table-movement">
-		<element name="table:movement">
-			<ref name="common-table-change-attlist"/>
-			<ref name="table-source-range-address"/>
-			<ref name="table-target-range-address"/>
-			<ref name="office-change-info"/>
-			<optional>
-				<ref name="table-dependencies"/>
-			</optional>
-			<optional>
-				<ref name="table-deletions"/>
-			</optional>
-		</element>
-	</define>
-	<define name="table-source-range-address">
-		<element name="table:source-range-address">
-			<ref name="common-table-range-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="table-target-range-address">
-		<element name="table:target-range-address">
-			<ref name="common-table-range-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="common-table-range-attlist">
-		<choice>
-			<group>
-				<ref name="common-table-cell-address-attlist"/>
-			</group>
-			<group>
-				<ref name="common-table-cell-range-address-attlist"/>
-			</group>
-		</choice>
-	</define>
-	<define name="common-table-cell-address-attlist">
-		<attribute name="table:column">
-			<ref name="integer"/>
-		</attribute>
-		<attribute name="table:row">
-			<ref name="integer"/>
-		</attribute>
-		<attribute name="table:table">
-			<ref name="integer"/>
-		</attribute>
-	</define>
-	<define name="common-table-cell-range-address-attlist">
-		<attribute name="table:start-column">
-			<ref name="integer"/>
-		</attribute>
-		<attribute name="table:start-row">
-			<ref name="integer"/>
-		</attribute>
-		<attribute name="table:start-table">
-			<ref name="integer"/>
-		</attribute>
-		<attribute name="table:end-column">
-			<ref name="integer"/>
-		</attribute>
-		<attribute name="table:end-row">
-			<ref name="integer"/>
-		</attribute>
-		<attribute name="table:end-table">
-			<ref name="integer"/>
-		</attribute>
-	</define>
-	<define name="table-change-track-table-cell">
-		<element name="table:change-track-table-cell">
-			<ref name="table-change-track-table-cell-attlist"/>
-			<zeroOrMore>
-				<ref name="text-p"/>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="table-change-track-table-cell-attlist">
-		<interleave>
-			<optional>
-				<attribute name="table:cell-address">
-					<ref name="cellAddress"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:matrix-covered">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:formula">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:number-matrix-columns-spanned">
-					<ref name="positiveInteger"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:number-matrix-rows-spanned">
-					<ref name="positiveInteger"/>
-				</attribute>
-			</optional>
-			<optional>
-				<ref name="common-value-and-type-attlist"/>
-			</optional>
-		</interleave>
-	</define>
-	<define name="table-cell-content-change">
-		<element name="table:cell-content-change">
-			<ref name="common-table-change-attlist"/>
-			<ref name="table-cell-address"/>
-			<ref name="office-change-info"/>
-			<optional>
-				<ref name="table-dependencies"/>
-			</optional>
-			<optional>
-				<ref name="table-deletions"/>
-			</optional>
-			<ref name="table-previous"/>
-		</element>
-	</define>
-	<define name="table-cell-address">
-		<element name="table:cell-address">
-			<ref name="common-table-cell-address-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="table-previous">
-		<element name="table:previous">
-			<optional>
-				<attribute name="table:id">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<ref name="table-change-track-table-cell"/>
-		</element>
-	</define>
-	<define name="common-table-change-attlist">
-		<interleave>
-			<attribute name="table:id">
-				<ref name="string"/>
-			</attribute>
-			<optional>
-				<attribute name="table:acceptance-state">
-					<choice>
-						<value>accepted</value>
-						<value>rejected</value>
-						<value>pending</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:rejecting-change-id">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="style-handout-master">
-		<element name="style:handout-master">
-			<ref name="common-presentation-header-footer-attlist"/>
-			<ref name="style-handout-master-attlist"/>
-			<zeroOrMore>
-				<ref name="shape"/>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="style-handout-master-attlist">
-		<interleave>
-			<optional>
-				<attribute name="presentation:presentation-page-layout-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-			<attribute name="style:page-layout-name">
-				<ref name="styleNameRef"/>
-			</attribute>
-			<optional>
-				<attribute name="draw:style-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="draw-layer-set">
-		<element name="draw:layer-set">
-			<zeroOrMore>
-				<ref name="draw-layer"/>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="draw-layer">
-		<element name="draw:layer">
-			<ref name="draw-layer-attlist"/>
-			<optional>
-				<ref name="svg-title"/>
-			</optional>
-			<optional>
-				<ref name="svg-desc"/>
-			</optional>
-		</element>
-	</define>
-	<define name="draw-layer-attlist">
-		<interleave>
-			<attribute name="draw:name">
-				<ref name="string"/>
-			</attribute>
-			<optional>
-				<attribute name="draw:protected">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:display">
-					<choice>
-						<value>always</value>
-						<value>screen</value>
-						<value>printer</value>
-						<value>none</value>
-					</choice>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="draw-page">
-		<element name="draw:page">
-			<ref name="common-presentation-header-footer-attlist"/>
-			<ref name="draw-page-attlist"/>
-			<optional>
-				<ref name="svg-title"/>
-			</optional>
-			<optional>
-				<ref name="svg-desc"/>
-			</optional>
-			<optional>
-				<ref name="draw-layer-set"/>
-			</optional>
-			<optional>
-				<ref name="office-forms"/>
-			</optional>
-			<zeroOrMore>
-				<ref name="shape"/>
-			</zeroOrMore>
-			<optional>
-				<choice>
-					<ref name="presentation-animations"/>
-					<ref name="animation-element"/>
-				</choice>
-			</optional>
-			<optional>
-				<ref name="presentation-notes"/>
-			</optional>
-		</element>
-	</define>
-	<define name="draw-page-attlist">
-		<interleave>
-			<optional>
-				<attribute name="draw:name">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:style-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-			<attribute name="draw:master-page-name">
-				<ref name="styleNameRef"/>
-			</attribute>
-			<optional>
-				<attribute name="presentation:presentation-page-layout-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-			<optional>
-				<group>
-					<ref name="xml-id"/>
-					<optional>
-						<attribute name="draw:id">
-							<ref name="NCName"/>
-						</attribute>
-					</optional>
-				</group>
-			</optional>
-			<optional>
-				<attribute name="draw:nav-order">
-					<ref name="IDREFS"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="common-presentation-header-footer-attlist">
-		<interleave>
-			<optional>
-				<attribute name="presentation:use-header-name">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="presentation:use-footer-name">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="presentation:use-date-time-name">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="shape">
-		<choice>
-			<ref name="shape-instance"/>
-			<ref name="draw-a"/>
-		</choice>
-	</define>
-	<define name="shape-instance">
-		<choice>
-			<ref name="draw-rect"/>
-			<ref name="draw-line"/>
-			<ref name="draw-polyline"/>
-			<ref name="draw-polygon"/>
-			<ref name="draw-regular-polygon"/>
-			<ref name="draw-path"/>
-			<ref name="draw-circle"/>
-			<ref name="draw-ellipse"/>
-			<ref name="draw-g"/>
-			<ref name="draw-page-thumbnail"/>
-			<ref name="draw-frame"/>
-			<ref name="draw-measure"/>
-			<ref name="draw-caption"/>
-			<ref name="draw-connector"/>
-			<ref name="draw-control"/>
-			<ref name="dr3d-scene"/>
-			<ref name="draw-custom-shape"/>
-		</choice>
-	</define>
-	<define name="draw-rect">
-		<element name="draw:rect">
-			<ref name="draw-rect-attlist"/>
-			<ref name="common-draw-position-attlist"/>
-			<ref name="common-draw-size-attlist"/>
-			<ref name="common-draw-shape-with-text-and-styles-attlist"/>
-			<ref name="common-draw-caption-id-attlist"/>
-			<optional>
-				<ref name="svg-title"/>
-			</optional>
-			<optional>
-				<ref name="svg-desc"/>
-			</optional>
-			<optional>
-				<ref name="office-event-listeners"/>
-			</optional>
-			<zeroOrMore>
-				<ref name="draw-glue-point"/>
-			</zeroOrMore>
-			<ref name="draw-text"/>
-		</element>
-	</define>
-	<define name="draw-rect-attlist">
-		<choice>
-			<optional>
-				<attribute name="draw:corner-radius">
-					<ref name="nonNegativeLength"/>
-				</attribute>
-			</optional>
-			<group>
-				<optional>
-					<attribute name="svg:rx">
-						<ref name="nonNegativeLength"/>
-					</attribute>
-				</optional>
-				<optional>
-					<attribute name="svg:ry">
-						<ref name="nonNegativeLength"/>
-					</attribute>
-				</optional>
-			</group>
-		</choice>
-	</define>
-	<define name="draw-line">
-		<element name="draw:line">
-			<ref name="draw-line-attlist"/>
-			<ref name="common-draw-shape-with-text-and-styles-attlist"/>
-			<ref name="common-draw-caption-id-attlist"/>
-			<optional>
-				<ref name="svg-title"/>
-			</optional>
-			<optional>
-				<ref name="svg-desc"/>
-			</optional>
-			<optional>
-				<ref name="office-event-listeners"/>
-			</optional>
-			<zeroOrMore>
-				<ref name="draw-glue-point"/>
-			</zeroOrMore>
-			<ref name="draw-text"/>
-		</element>
-	</define>
-	<define name="draw-line-attlist">
-		<interleave>
-			<attribute name="svg:x1">
-				<ref name="coordinate"/>
-			</attribute>
-			<attribute name="svg:y1">
-				<ref name="coordinate"/>
-			</attribute>
-			<attribute name="svg:x2">
-				<ref name="coordinate"/>
-			</attribute>
-			<attribute name="svg:y2">
-				<ref name="coordinate"/>
-			</attribute>
-		</interleave>
-	</define>
-	<define name="draw-polyline">
-		<element name="draw:polyline">
-			<ref name="common-draw-points-attlist"/>
-			<ref name="common-draw-position-attlist"/>
-			<ref name="common-draw-size-attlist"/>
-			<ref name="common-draw-viewbox-attlist"/>
-			<ref name="common-draw-shape-with-text-and-styles-attlist"/>
-			<ref name="common-draw-caption-id-attlist"/>
-			<optional>
-				<ref name="svg-title"/>
-			</optional>
-			<optional>
-				<ref name="svg-desc"/>
-			</optional>
-			<optional>
-				<ref name="office-event-listeners"/>
-			</optional>
-			<zeroOrMore>
-				<ref name="draw-glue-point"/>
-			</zeroOrMore>
-			<ref name="draw-text"/>
-		</element>
-	</define>
-	<define name="common-draw-points-attlist">
-		<attribute name="draw:points">
-			<ref name="points"/>
-		</attribute>
-	</define>
-	<define name="draw-polygon">
-		<element name="draw:polygon">
-			<ref name="common-draw-points-attlist"/>
-			<ref name="common-draw-position-attlist"/>
-			<ref name="common-draw-size-attlist"/>
-			<ref name="common-draw-viewbox-attlist"/>
-			<ref name="common-draw-shape-with-text-and-styles-attlist"/>
-			<ref name="common-draw-caption-id-attlist"/>
-			<optional>
-				<ref name="svg-title"/>
-			</optional>
-			<optional>
-				<ref name="svg-desc"/>
-			</optional>
-			<optional>
-				<ref name="office-event-listeners"/>
-			</optional>
-			<zeroOrMore>
-				<ref name="draw-glue-point"/>
-			</zeroOrMore>
-			<ref name="draw-text"/>
-		</element>
-	</define>
-	<define name="draw-regular-polygon">
-		<element name="draw:regular-polygon">
-			<ref name="draw-regular-polygon-attlist"/>
-			<ref name="common-draw-position-attlist"/>
-			<ref name="common-draw-size-attlist"/>
-			<ref name="common-draw-shape-with-text-and-styles-attlist"/>
-			<ref name="common-draw-caption-id-attlist"/>
-			<optional>
-				<ref name="svg-title"/>
-			</optional>
-			<optional>
-				<ref name="svg-desc"/>
-			</optional>
-			<optional>
-				<ref name="office-event-listeners"/>
-			</optional>
-			<zeroOrMore>
-				<ref name="draw-glue-point"/>
-			</zeroOrMore>
-			<ref name="draw-text"/>
-		</element>
-	</define>
-	<define name="draw-regular-polygon-attlist">
-		<interleave>
-			<choice>
-				<attribute name="draw:concave">
-					<value>false</value>
-				</attribute>
-				<group>
-					<attribute name="draw:concave">
-						<value>true</value>
-					</attribute>
-					<ref name="draw-regular-polygon-sharpness-attlist"/>
-				</group>
-			</choice>
-			<attribute name="draw:corners">
-				<ref name="positiveInteger"/>
-			</attribute>
-		</interleave>
-	</define>
-	<define name="draw-regular-polygon-sharpness-attlist">
-		<attribute name="draw:sharpness">
-			<ref name="percent"/>
-		</attribute>
-	</define>
-	<define name="draw-path">
-		<element name="draw:path">
-			<ref name="common-draw-path-data-attlist"/>
-			<ref name="common-draw-position-attlist"/>
-			<ref name="common-draw-size-attlist"/>
-			<ref name="common-draw-viewbox-attlist"/>
-			<ref name="common-draw-shape-with-text-and-styles-attlist"/>
-			<ref name="common-draw-caption-id-attlist"/>
-			<optional>
-				<ref name="svg-title"/>
-			</optional>
-			<optional>
-				<ref name="svg-desc"/>
-			</optional>
-			<optional>
-				<ref name="office-event-listeners"/>
-			</optional>
-			<zeroOrMore>
-				<ref name="draw-glue-point"/>
-			</zeroOrMore>
-			<ref name="draw-text"/>
-		</element>
-	</define>
-	<define name="common-draw-path-data-attlist">
-		<attribute name="svg:d">
-			<ref name="pathData"/>
-		</attribute>
-	</define>
-	<define name="draw-circle">
-		<element name="draw:circle">
-			<choice>
-				<group>
-					<ref name="draw-circle-attlist"/>
-					<ref name="common-draw-circle-ellipse-pos-attlist"/>
-				</group>
-				<group>
-					<ref name="common-draw-position-attlist"/>
-					<ref name="common-draw-size-attlist"/>
-				</group>
-			</choice>
-			<ref name="common-draw-circle-ellipse-attlist"/>
-			<ref name="common-draw-shape-with-text-and-styles-attlist"/>
-			<ref name="common-draw-caption-id-attlist"/>
-			<optional>
-				<ref name="svg-title"/>
-			</optional>
-			<optional>
-				<ref name="svg-desc"/>
-			</optional>
-			<optional>
-				<ref name="office-event-listeners"/>
-			</optional>
-			<zeroOrMore>
-				<ref name="draw-glue-point"/>
-			</zeroOrMore>
-			<ref name="draw-text"/>
-		</element>
-	</define>
-	<define name="common-draw-circle-ellipse-pos-attlist">
-		<attribute name="svg:cx">
-			<ref name="coordinate"/>
-		</attribute>
-		<attribute name="svg:cy">
-			<ref name="coordinate"/>
-		</attribute>
-	</define>
-	<define name="draw-circle-attlist">
-		<attribute name="svg:r">
-			<ref name="length"/>
-		</attribute>
-	</define>
-	<define name="common-draw-circle-ellipse-attlist">
-		<interleave>
-			<optional>
-				<attribute name="draw:kind">
-					<choice>
-						<value>full</value>
-						<value>section</value>
-						<value>cut</value>
-						<value>arc</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:start-angle">
-					<ref name="angle"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:end-angle">
-					<ref name="angle"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="draw-ellipse">
-		<element name="draw:ellipse">
-			<choice>
-				<group>
-					<ref name="draw-ellipse-attlist"/>
-					<ref name="common-draw-circle-ellipse-pos-attlist"/>
-				</group>
-				<group>
-					<ref name="common-draw-position-attlist"/>
-					<ref name="common-draw-size-attlist"/>
-				</group>
-			</choice>
-			<ref name="common-draw-circle-ellipse-attlist"/>
-			<ref name="common-draw-shape-with-text-and-styles-attlist"/>
-			<ref name="common-draw-caption-id-attlist"/>
-			<optional>
-				<ref name="svg-title"/>
-			</optional>
-			<optional>
-				<ref name="svg-desc"/>
-			</optional>
-			<optional>
-				<ref name="office-event-listeners"/>
-			</optional>
-			<zeroOrMore>
-				<ref name="draw-glue-point"/>
-			</zeroOrMore>
-			<ref name="draw-text"/>
-		</element>
-	</define>
-	<define name="draw-ellipse-attlist">
-		<attribute name="svg:rx">
-			<ref name="length"/>
-		</attribute>
-		<attribute name="svg:ry">
-			<ref name="length"/>
-		</attribute>
-	</define>
-	<define name="draw-connector">
-		<element name="draw:connector">
-			<ref name="draw-connector-attlist"/>
-			<ref name="common-draw-shape-with-text-and-styles-attlist"/>
-			<ref name="common-draw-caption-id-attlist"/>
-			<ref name="common-draw-viewbox-attlist"/>
-			<optional>
-				<ref name="svg-title"/>
-			</optional>
-			<optional>
-				<ref name="svg-desc"/>
-			</optional>
-			<optional>
-				<ref name="office-event-listeners"/>
-			</optional>
-			<zeroOrMore>
-				<ref name="draw-glue-point"/>
-			</zeroOrMore>
-			<ref name="draw-text"/>
-		</element>
-	</define>
-	<define name="draw-connector-attlist">
-		<interleave>
-			<optional>
-				<attribute name="draw:type">
-					<choice>
-						<value>standard</value>
-						<value>lines</value>
-						<value>line</value>
-						<value>curve</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="svg:x1">
-					<ref name="coordinate"/>
-				</attribute>
-				<attribute name="svg:y1">
-					<ref name="coordinate"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:start-shape">
-					<ref name="IDREF"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:start-glue-point">
-					<ref name="nonNegativeInteger"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="svg:x2">
-					<ref name="coordinate"/>
-				</attribute>
-				<attribute name="svg:y2">
-					<ref name="coordinate"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:end-shape">
-					<ref name="IDREF"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:end-glue-point">
-					<ref name="nonNegativeInteger"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:line-skew">
-					<list>
-						<ref name="length"/>
-						<optional>
-							<ref name="length"/>
-							<optional>
-								<ref name="length"/>
-							</optional>
-						</optional>
-					</list>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="svg:d">
-					<ref name="pathData"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="draw-caption">
-		<element name="draw:caption">
-			<ref name="draw-caption-attlist"/>
-			<ref name="common-draw-position-attlist"/>
-			<ref name="common-draw-size-attlist"/>
-			<ref name="common-draw-shape-with-text-and-styles-attlist"/>
-			<ref name="common-draw-caption-id-attlist"/>
-			<optional>
-				<ref name="svg-title"/>
-			</optional>
-			<optional>
-				<ref name="svg-desc"/>
-			</optional>
-			<optional>
-				<ref name="office-event-listeners"/>
-			</optional>
-			<zeroOrMore>
-				<ref name="draw-glue-point"/>
-			</zeroOrMore>
-			<ref name="draw-text"/>
-		</element>
-	</define>
-	<define name="draw-caption-attlist">
-		<interleave>
-			<optional>
-				<attribute name="draw:caption-point-x">
-					<ref name="coordinate"/>
-				</attribute>
-				<attribute name="draw:caption-point-y">
-					<ref name="coordinate"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:corner-radius">
-					<ref name="nonNegativeLength"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="draw-measure">
-		<element name="draw:measure">
-			<ref name="draw-measure-attlist"/>
-			<ref name="common-draw-shape-with-text-and-styles-attlist"/>
-			<ref name="common-draw-caption-id-attlist"/>
-			<optional>
-				<ref name="svg-title"/>
-			</optional>
-			<optional>
-				<ref name="svg-desc"/>
-			</optional>
-			<optional>
-				<ref name="office-event-listeners"/>
-			</optional>
-			<zeroOrMore>
-				<ref name="draw-glue-point"/>
-			</zeroOrMore>
-			<ref name="draw-text"/>
-		</element>
-	</define>
-	<define name="draw-measure-attlist">
-		<interleave>
-			<attribute name="svg:x1">
-				<ref name="coordinate"/>
-			</attribute>
-			<attribute name="svg:y1">
-				<ref name="coordinate"/>
-			</attribute>
-			<attribute name="svg:x2">
-				<ref name="coordinate"/>
-			</attribute>
-			<attribute name="svg:y2">
-				<ref name="coordinate"/>
-			</attribute>
-		</interleave>
-	</define>
-	<define name="draw-control">
-		<element name="draw:control">
-			<ref name="draw-control-attlist"/>
-			<ref name="common-draw-position-attlist"/>
-			<ref name="common-draw-size-attlist"/>
-			<ref name="common-draw-shape-with-text-and-styles-attlist"/>
-			<ref name="common-draw-caption-id-attlist"/>
-			<optional>
-				<ref name="svg-title"/>
-			</optional>
-			<optional>
-				<ref name="svg-desc"/>
-			</optional>
-			<zeroOrMore>
-				<ref name="draw-glue-point"/>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="draw-control-attlist">
-		<attribute name="draw:control">
-			<ref name="IDREF"/>
-		</attribute>
-	</define>
-	<define name="draw-page-thumbnail">
-		<element name="draw:page-thumbnail">
-			<ref name="draw-page-thumbnail-attlist"/>
-			<ref name="common-draw-position-attlist"/>
-			<ref name="common-draw-size-attlist"/>
-			<ref name="presentation-shape-attlist"/>
-			<ref name="common-draw-shape-with-styles-attlist"/>
-			<ref name="common-draw-caption-id-attlist"/>
-			<optional>
-				<ref name="svg-title"/>
-			</optional>
-			<optional>
-				<ref name="svg-desc"/>
-			</optional>
-		</element>
-	</define>
-	<define name="draw-page-thumbnail-attlist">
-		<optional>
-			<attribute name="draw:page-number">
-				<ref name="positiveInteger"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="draw-g">
-		<element name="draw:g">
-			<ref name="draw-g-attlist"/>
-			<ref name="common-draw-z-index-attlist"/>
-			<ref name="common-draw-name-attlist"/>
-			<ref name="common-draw-id-attlist"/>
-			<ref name="common-draw-style-name-attlist"/>
-			<ref name="common-text-spreadsheet-shape-attlist"/>
-			<ref name="common-draw-caption-id-attlist"/>
-			<optional>
-				<ref name="svg-title"/>
-			</optional>
-			<optional>
-				<ref name="svg-desc"/>
-			</optional>
-			<optional>
-				<ref name="office-event-listeners"/>
-			</optional>
-			<zeroOrMore>
-				<ref name="draw-glue-point"/>
-			</zeroOrMore>
-			<zeroOrMore>
-				<ref name="shape"/>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="draw-g-attlist">
-		<optional>
-			<attribute name="svg:y">
-				<ref name="coordinate"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="common-draw-name-attlist">
-		<optional>
-			<attribute name="draw:name">
-				<ref name="string"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="common-draw-caption-id-attlist">
-		<optional>
-			<attribute name="draw:caption-id">
-				<ref name="IDREF"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="common-draw-position-attlist">
-		<optional>
-			<attribute name="svg:x">
-				<ref name="coordinate"/>
-			</attribute>
-		</optional>
-		<optional>
-			<attribute name="svg:y">
-				<ref name="coordinate"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="common-draw-size-attlist">
-		<optional>
-			<attribute name="svg:width">
-				<ref name="length"/>
-			</attribute>
-		</optional>
-		<optional>
-			<attribute name="svg:height">
-				<ref name="length"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="common-draw-transform-attlist">
-		<optional>
-			<attribute name="draw:transform">
-				<ref name="string"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="common-draw-viewbox-attlist">
-		<attribute name="svg:viewBox">
-			<list>
-				<ref name="integer"/>
-				<ref name="integer"/>
-				<ref name="integer"/>
-				<ref name="integer"/>
-			</list>
-		</attribute>
-	</define>
-	<define name="common-draw-style-name-attlist">
-		<choice>
-			<group>
-				<optional>
-					<attribute name="draw:style-name">
-						<ref name="styleNameRef"/>
-					</attribute>
-				</optional>
-				<optional>
-					<attribute name="draw:class-names">
-						<ref name="styleNameRefs"/>
-					</attribute>
-				</optional>
-			</group>
-			<group>
-				<optional>
-					<attribute name="presentation:style-name">
-						<ref name="styleNameRef"/>
-					</attribute>
-				</optional>
-				<optional>
-					<attribute name="presentation:class-names">
-						<ref name="styleNameRefs"/>
-					</attribute>
-				</optional>
-			</group>
-		</choice>
-	</define>
-	<define name="common-draw-text-style-name-attlist">
-		<optional>
-			<attribute name="draw:text-style-name">
-				<ref name="styleNameRef"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="common-draw-layer-name-attlist">
-		<optional>
-			<attribute name="draw:layer">
-				<ref name="string"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="common-draw-id-attlist">
-		<optional>
-			<group>
-				<ref name="xml-id"/>
-				<optional>
-					<attribute name="draw:id">
-						<ref name="NCName"/>
-					</attribute>
-				</optional>
-			</group>
-		</optional>
-	</define>
-	<define name="common-draw-z-index-attlist">
-		<optional>
-			<attribute name="draw:z-index">
-				<ref name="nonNegativeInteger"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="common-text-spreadsheet-shape-attlist">
-		<interleave>
-			<optional>
-				<attribute name="table:end-cell-address">
-					<ref name="cellAddress"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:end-x">
-					<ref name="coordinate"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:end-y">
-					<ref name="coordinate"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:table-background">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<ref name="common-text-anchor-attlist"/>
-		</interleave>
-	</define>
-	<define name="common-text-anchor-attlist">
-		<interleave>
-			<optional>
-				<attribute name="text:anchor-type">
-					<choice>
-						<value>page</value>
-						<value>frame</value>
-						<value>paragraph</value>
-						<value>char</value>
-						<value>as-char</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:anchor-page-number">
-					<ref name="positiveInteger"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="draw-text">
-		<zeroOrMore>
-			<choice>
-				<ref name="text-p"/>
-				<ref name="text-list"/>
-			</choice>
-		</zeroOrMore>
-	</define>
-	<define name="common-draw-shape-with-styles-attlist">
-		<ref name="common-draw-z-index-attlist"/>
-		<ref name="common-draw-id-attlist"/>
-		<ref name="common-draw-layer-name-attlist"/>
-		<ref name="common-draw-style-name-attlist"/>
-		<ref name="common-draw-transform-attlist"/>
-		<ref name="common-draw-name-attlist"/>
-		<ref name="common-text-spreadsheet-shape-attlist"/>
-	</define>
-	<define name="common-draw-shape-with-text-and-styles-attlist">
-		<ref name="common-draw-shape-with-styles-attlist"/>
-		<ref name="common-draw-text-style-name-attlist"/>
-	</define>
-	<define name="draw-glue-point">
-		<element name="draw:glue-point">
-			<ref name="draw-glue-point-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="draw-glue-point-attlist">
-		<interleave>
-			<attribute name="draw:id">
-				<ref name="nonNegativeInteger"/>
-			</attribute>
-			<attribute name="svg:x">
-				<choice>
-					<ref name="distance"/>
-					<ref name="percent"/>
-				</choice>
-			</attribute>
-			<attribute name="svg:y">
-				<choice>
-					<ref name="distance"/>
-					<ref name="percent"/>
-				</choice>
-			</attribute>
-			<optional>
-				<attribute name="draw:align">
-					<choice>
-						<value>top-left</value>
-						<value>top</value>
-						<value>top-right</value>
-						<value>left</value>
-						<value>center</value>
-						<value>right</value>
-						<value>bottom-left</value>
-						<value>bottom-right</value>
-					</choice>
-				</attribute>
-			</optional>
-			<attribute name="draw:escape-direction">
-				<choice>
-					<value>auto</value>
-					<value>left</value>
-					<value>right</value>
-					<value>up</value>
-					<value>down</value>
-					<value>horizontal</value>
-					<value>vertical</value>
-				</choice>
-			</attribute>
-		</interleave>
-	</define>
-	<define name="svg-title">
-		<element name="svg:title">
-			<text/>
-		</element>
-	</define>
-	<define name="svg-desc">
-		<element name="svg:desc">
-			<text/>
-		</element>
-	</define>
-	<define name="draw-frame">
-		<element name="draw:frame">
-			<ref name="common-draw-shape-with-text-and-styles-attlist"/>
-			<ref name="common-draw-position-attlist"/>
-			<ref name="common-draw-rel-size-attlist"/>
-			<ref name="common-draw-caption-id-attlist"/>
-			<ref name="presentation-shape-attlist"/>
-			<ref name="draw-frame-attlist"/>
-			<zeroOrMore>
-				<choice>
-					<ref name="draw-text-box"/>
-					<ref name="draw-image"/>
-					<ref name="draw-object"/>
-					<ref name="draw-object-ole"/>
-					<ref name="draw-applet"/>
-					<ref name="draw-floating-frame"/>
-					<ref name="draw-plugin"/>
-					<ref name="table-table"/>
-				</choice>
-			</zeroOrMore>
-			<optional>
-				<ref name="office-event-listeners"/>
-			</optional>
-			<zeroOrMore>
-				<ref name="draw-glue-point"/>
-			</zeroOrMore>
-			<optional>
-				<ref name="draw-image-map"/>
-			</optional>
-			<optional>
-				<ref name="svg-title"/>
-			</optional>
-			<optional>
-				<ref name="svg-desc"/>
-			</optional>
-			<optional>
-				<choice>
-					<ref name="draw-contour-polygon"/>
-					<ref name="draw-contour-path"/>
-				</choice>
-			</optional>
-		</element>
-	</define>
-	<define name="common-draw-rel-size-attlist">
-		<ref name="common-draw-size-attlist"/>
-		<optional>
-			<attribute name="style:rel-width">
-				<choice>
-					<ref name="percent"/>
-					<value>scale</value>
-					<value>scale-min</value>
-				</choice>
-			</attribute>
-		</optional>
-		<optional>
-			<attribute name="style:rel-height">
-				<choice>
-					<ref name="percent"/>
-					<value>scale</value>
-					<value>scale-min</value>
-				</choice>
-			</attribute>
-		</optional>
-	</define>
-	<define name="draw-frame-attlist">
-		<optional>
-			<attribute name="draw:copy-of">
-				<ref name="string"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="draw-text-box">
-		<element name="draw:text-box">
-			<ref name="draw-text-box-attlist"/>
-			<zeroOrMore>
-				<ref name="text-content"/>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="draw-text-box-attlist">
-		<interleave>
-			<optional>
-				<attribute name="draw:chain-next-name">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:corner-radius">
-					<ref name="nonNegativeLength"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="fo:min-height">
-					<choice>
-						<ref name="length"/>
-						<ref name="percent"/>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="fo:min-width">
-					<choice>
-						<ref name="length"/>
-						<ref name="percent"/>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="fo:max-height">
-					<choice>
-						<ref name="length"/>
-						<ref name="percent"/>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="fo:max-width">
-					<choice>
-						<ref name="length"/>
-						<ref name="percent"/>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<group>
-					<ref name="xml-id"/>
-					<optional>
-						<attribute name="text:id">
-							<ref name="NCName"/>
-						</attribute>
-					</optional>
-				</group>
-			</optional>
-		</interleave>
-	</define>
-	<define name="draw-image">
-		<element name="draw:image">
-			<ref name="draw-image-attlist"/>
-			<choice>
-				<ref name="common-draw-data-attlist"/>
-				<ref name="office-binary-data"/>
-			</choice>
-			<ref name="draw-text"/>
-		</element>
-	</define>
-	<define name="common-draw-data-attlist">
-		<group>
-			<attribute name="xlink:type">
-				<value>simple</value>
-			</attribute>
-			<attribute name="xlink:href">
-				<ref name="anyIRI"/>
-			</attribute>
-			<optional>
-				<attribute name="xlink:show">
-					<value>embed</value>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="xlink:actuate">
-					<value>onLoad</value>
-				</attribute>
-			</optional>
-		</group>
-	</define>
-	<define name="office-binary-data">
-		<element name="office:binary-data">
-			<ref name="base64Binary"/>
-		</element>
-	</define>
-	<define name="draw-image-attlist">
-		<interleave>
-			<optional>
-				<attribute name="draw:filter-name">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<ref name="xml-id"/>
-			</optional>
-		</interleave>
-	</define>
-	<define name="draw-object">
-		<element name="draw:object">
-			<ref name="draw-object-attlist"/>
-			<choice>
-				<ref name="common-draw-data-attlist"/>
-				<ref name="office-document"/>
-				<ref name="math-math"/>
-			</choice>
-		</element>
-	</define>
-	<define name="draw-object-ole">
-		<element name="draw:object-ole">
-			<ref name="draw-object-ole-attlist"/>
-			<choice>
-				<ref name="common-draw-data-attlist"/>
-				<ref name="office-binary-data"/>
-			</choice>
-		</element>
-	</define>
-	<define name="draw-object-attlist">
-		<interleave>
-			<optional>
-				<attribute name="draw:notify-on-update-of-ranges">
-					<choice>
-						<ref name="cellRangeAddressList"/>
-						<ref name="string"/>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<ref name="xml-id"/>
-			</optional>
-		</interleave>
-	</define>
-	<define name="draw-object-ole-attlist">
-		<interleave>
-			<optional>
-				<attribute name="draw:class-id">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<ref name="xml-id"/>
-			</optional>
-		</interleave>
-	</define>
-	<define name="draw-applet">
-		<element name="draw:applet">
-			<ref name="draw-applet-attlist"/>
-			<optional>
-				<ref name="common-draw-data-attlist"/>
-			</optional>
-			<zeroOrMore>
-				<ref name="draw-param"/>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="draw-applet-attlist">
-		<interleave>
-			<optional>
-				<attribute name="draw:code">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:object">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:archive">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:may-script">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<ref name="xml-id"/>
-			</optional>
-		</interleave>
-	</define>
-	<define name="draw-plugin">
-		<element name="draw:plugin">
-			<ref name="draw-plugin-attlist"/>
-			<ref name="common-draw-data-attlist"/>
-			<zeroOrMore>
-				<ref name="draw-param"/>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="draw-plugin-attlist">
-		<interleave>
-			<optional>
-				<attribute name="draw:mime-type">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<ref name="xml-id"/>
-			</optional>
-		</interleave>
-	</define>
-	<define name="draw-param">
-		<element name="draw:param">
-			<ref name="draw-param-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="draw-param-attlist">
-		<interleave>
-			<optional>
-				<attribute name="draw:name">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:value">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="draw-floating-frame">
-		<element name="draw:floating-frame">
-			<ref name="draw-floating-frame-attlist"/>
-			<ref name="common-draw-data-attlist"/>
-		</element>
-	</define>
-	<define name="draw-floating-frame-attlist">
-		<interleave>
-			<optional>
-				<attribute name="draw:frame-name">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<ref name="xml-id"/>
-			</optional>
-		</interleave>
-	</define>
-	<define name="draw-contour-polygon">
-		<element name="draw:contour-polygon">
-			<ref name="common-contour-attlist"/>
-			<ref name="common-draw-size-attlist"/>
-			<ref name="common-draw-viewbox-attlist"/>
-			<ref name="common-draw-points-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="draw-contour-path">
-		<element name="draw:contour-path">
-			<ref name="common-contour-attlist"/>
-			<ref name="common-draw-size-attlist"/>
-			<ref name="common-draw-viewbox-attlist"/>
-			<ref name="common-draw-path-data-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="common-contour-attlist">
-		<attribute name="draw:recreate-on-edit">
-			<ref name="boolean"/>
-		</attribute>
-	</define>
-	<define name="draw-a">
-		<element name="draw:a">
-			<ref name="draw-a-attlist"/>
-			<ref name="shape-instance"/>
-		</element>
-	</define>
-	<define name="draw-a-attlist">
-		<interleave>
-			<attribute name="xlink:type">
-				<value>simple</value>
-			</attribute>
-			<attribute name="xlink:href">
-				<ref name="anyIRI"/>
-			</attribute>
-			<optional>
-				<attribute name="xlink:actuate">
-					<value>onRequest</value>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="office:target-frame-name">
-					<ref name="targetFrameName"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="xlink:show">
-					<choice>
-						<value>new</value>
-						<value>replace</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="office:name">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="office:title">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="office:server-map">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<ref name="xml-id"/>
-			</optional>
-		</interleave>
-	</define>
-	<define name="draw-image-map">
-		<element name="draw:image-map">
-			<zeroOrMore>
-				<choice>
-					<ref name="draw-area-rectangle"/>
-					<ref name="draw-area-circle"/>
-					<ref name="draw-area-polygon"/>
-				</choice>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="draw-area-rectangle">
-		<element name="draw:area-rectangle">
-			<ref name="common-draw-area-attlist"/>
-			<attribute name="svg:x">
-				<ref name="coordinate"/>
-			</attribute>
-			<attribute name="svg:y">
-				<ref name="coordinate"/>
-			</attribute>
-			<attribute name="svg:width">
-				<ref name="length"/>
-			</attribute>
-			<attribute name="svg:height">
-				<ref name="length"/>
-			</attribute>
-			<optional>
-				<ref name="svg-title"/>
-			</optional>
-			<optional>
-				<ref name="svg-desc"/>
-			</optional>
-			<optional>
-				<ref name="office-event-listeners"/>
-			</optional>
-		</element>
-	</define>
-	<define name="draw-area-circle">
-		<element name="draw:area-circle">
-			<ref name="common-draw-area-attlist"/>
-			<attribute name="svg:cx">
-				<ref name="coordinate"/>
-			</attribute>
-			<attribute name="svg:cy">
-				<ref name="coordinate"/>
-			</attribute>
-			<attribute name="svg:r">
-				<ref name="length"/>
-			</attribute>
-			<optional>
-				<ref name="svg-title"/>
-			</optional>
-			<optional>
-				<ref name="svg-desc"/>
-			</optional>
-			<optional>
-				<ref name="office-event-listeners"/>
-			</optional>
-		</element>
-	</define>
-	<define name="draw-area-polygon">
-		<element name="draw:area-polygon">
-			<ref name="common-draw-area-attlist"/>
-			<attribute name="svg:x">
-				<ref name="coordinate"/>
-			</attribute>
-			<attribute name="svg:y">
-				<ref name="coordinate"/>
-			</attribute>
-			<attribute name="svg:width">
-				<ref name="length"/>
-			</attribute>
-			<attribute name="svg:height">
-				<ref name="length"/>
-			</attribute>
-			<ref name="common-draw-viewbox-attlist"/>
-			<ref name="common-draw-points-attlist"/>
-			<optional>
-				<ref name="svg-title"/>
-			</optional>
-			<optional>
-				<ref name="svg-desc"/>
-			</optional>
-			<optional>
-				<ref name="office-event-listeners"/>
-			</optional>
-		</element>
-	</define>
-	<define name="common-draw-area-attlist">
-		<interleave>
-			<optional>
-				<attribute name="xlink:type">
-					<value>simple</value>
-				</attribute>
-				<attribute name="xlink:href">
-					<ref name="anyIRI"/>
-				</attribute>
-				<optional>
-					<attribute name="office:target-frame-name">
-						<ref name="targetFrameName"/>
-					</attribute>
-				</optional>
-				<optional>
-					<attribute name="xlink:show">
-						<choice>
-							<value>new</value>
-							<value>replace</value>
-						</choice>
-					</attribute>
-				</optional>
-			</optional>
-			<optional>
-				<attribute name="office:name">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:nohref">
-					<value>nohref</value>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="dr3d-scene">
-		<element name="dr3d:scene">
-			<ref name="dr3d-scene-attlist"/>
-			<ref name="common-draw-position-attlist"/>
-			<ref name="common-draw-size-attlist"/>
-			<ref name="common-draw-style-name-attlist"/>
-			<ref name="common-draw-z-index-attlist"/>
-			<ref name="common-draw-id-attlist"/>
-			<ref name="common-draw-layer-name-attlist"/>
-			<ref name="common-text-spreadsheet-shape-attlist"/>
-			<ref name="common-dr3d-transform-attlist"/>
-			<ref name="common-draw-caption-id-attlist"/>
-			<optional>
-				<ref name="svg-title"/>
-			</optional>
-			<optional>
-				<ref name="svg-desc"/>
-			</optional>
-			<zeroOrMore>
-				<ref name="dr3d-light"/>
-			</zeroOrMore>
-			<zeroOrMore>
-				<ref name="shapes3d"/>
-			</zeroOrMore>
-			<zeroOrMore>
-				<ref name="draw-glue-point"/>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="shapes3d">
-		<choice>
-			<ref name="dr3d-scene"/>
-			<ref name="dr3d-extrude"/>
-			<ref name="dr3d-sphere"/>
-			<ref name="dr3d-rotate"/>
-			<ref name="dr3d-cube"/>
-		</choice>
-	</define>
-	<define name="dr3d-scene-attlist">
-		<interleave>
-			<optional>
-				<attribute name="dr3d:vrp">
-					<ref name="vector3D"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="dr3d:vpn">
-					<ref name="vector3D"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="dr3d:vup">
-					<ref name="vector3D"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="dr3d:projection">
-					<choice>
-						<value>parallel</value>
-						<value>perspective</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="dr3d:distance">
-					<ref name="length"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="dr3d:focal-length">
-					<ref name="length"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="dr3d:shadow-slant">
-					<ref name="angle"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="dr3d:shade-mode">
-					<choice>
-						<value>flat</value>
-						<value>phong</value>
-						<value>gouraud</value>
-						<value>draft</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="dr3d:ambient-color">
-					<ref name="color"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="dr3d:lighting-mode">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="common-dr3d-transform-attlist">
-		<optional>
-			<attribute name="dr3d:transform">
-				<ref name="string"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="dr3d-light">
-		<element name="dr3d:light">
-			<ref name="dr3d-light-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="dr3d-light-attlist">
-		<interleave>
-			<optional>
-				<attribute name="dr3d:diffuse-color">
-					<ref name="color"/>
-				</attribute>
-			</optional>
-			<attribute name="dr3d:direction">
-				<ref name="vector3D"/>
-			</attribute>
-			<optional>
-				<attribute name="dr3d:enabled">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="dr3d:specular">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="dr3d-cube">
-		<element name="dr3d:cube">
-			<ref name="dr3d-cube-attlist"/>
-			<ref name="common-draw-z-index-attlist"/>
-			<ref name="common-draw-id-attlist"/>
-			<ref name="common-draw-layer-name-attlist"/>
-			<ref name="common-draw-style-name-attlist"/>
-			<ref name="common-dr3d-transform-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="dr3d-cube-attlist">
-		<optional>
-			<attribute name="dr3d:min-edge">
-				<ref name="vector3D"/>
-			</attribute>
-		</optional>
-		<optional>
-			<attribute name="dr3d:max-edge">
-				<ref name="vector3D"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="dr3d-sphere">
-		<element name="dr3d:sphere">
-			<ref name="dr3d-sphere-attlist"/>
-			<ref name="common-draw-z-index-attlist"/>
-			<ref name="common-draw-id-attlist"/>
-			<ref name="common-draw-layer-name-attlist"/>
-			<ref name="common-draw-style-name-attlist"/>
-			<ref name="common-dr3d-transform-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="dr3d-sphere-attlist">
-		<interleave>
-			<optional>
-				<attribute name="dr3d:center">
-					<ref name="vector3D"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="dr3d:size">
-					<ref name="vector3D"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="dr3d-extrude">
-		<element name="dr3d:extrude">
-			<ref name="common-draw-path-data-attlist"/>
-			<ref name="common-draw-viewbox-attlist"/>
-			<ref name="common-draw-id-attlist"/>
-			<ref name="common-draw-z-index-attlist"/>
-			<ref name="common-draw-layer-name-attlist"/>
-			<ref name="common-draw-style-name-attlist"/>
-			<ref name="common-dr3d-transform-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="dr3d-rotate">
-		<element name="dr3d:rotate">
-			<ref name="common-draw-viewbox-attlist"/>
-			<ref name="common-draw-path-data-attlist"/>
-			<ref name="common-draw-z-index-attlist"/>
-			<ref name="common-draw-id-attlist"/>
-			<ref name="common-draw-layer-name-attlist"/>
-			<ref name="common-draw-style-name-attlist"/>
-			<ref name="common-dr3d-transform-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="draw-custom-shape">
-		<element name="draw:custom-shape">
-			<ref name="draw-custom-shape-attlist"/>
-			<ref name="common-draw-position-attlist"/>
-			<ref name="common-draw-size-attlist"/>
-			<ref name="common-draw-shape-with-text-and-styles-attlist"/>
-			<ref name="common-draw-caption-id-attlist"/>
-			<optional>
-				<ref name="svg-title"/>
-			</optional>
-			<optional>
-				<ref name="svg-desc"/>
-			</optional>
-			<optional>
-				<ref name="office-event-listeners"/>
-			</optional>
-			<zeroOrMore>
-				<ref name="draw-glue-point"/>
-			</zeroOrMore>
-			<ref name="draw-text"/>
-			<optional>
-				<ref name="draw-enhanced-geometry"/>
-			</optional>
-		</element>
-	</define>
-	<define name="draw-custom-shape-attlist">
-		<interleave>
-			<optional>
-				<attribute name="draw:engine">
-					<ref name="namespacedToken"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:data">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="draw-enhanced-geometry">
-		<element name="draw:enhanced-geometry">
-			<ref name="draw-enhanced-geometry-attlist"/>
-			<zeroOrMore>
-				<ref name="draw-equation"/>
-			</zeroOrMore>
-			<zeroOrMore>
-				<ref name="draw-handle"/>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="draw-enhanced-geometry-attlist">
-		<interleave>
-			<optional>
-				<attribute name="draw:type">
-					<ref name="custom-shape-type"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="svg:viewBox">
-					<list>
-						<ref name="integer"/>
-						<ref name="integer"/>
-						<ref name="integer"/>
-						<ref name="integer"/>
-					</list>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:mirror-vertical">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:mirror-horizontal">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:text-rotate-angle">
-					<ref name="angle"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:extrusion-allowed">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:text-path-allowed">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:concentric-gradient-fill-allowed">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:extrusion">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:extrusion-brightness">
-					<ref name="zeroToHundredPercent"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:extrusion-depth">
-					<list>
-						<ref name="length"/>
-						<ref name="double"/>
-					</list>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:extrusion-diffusion">
-					<ref name="percent"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:extrusion-number-of-line-segments">
-					<ref name="integer"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:extrusion-light-face">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:extrusion-first-light-harsh">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:extrusion-second-light-harsh">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:extrusion-first-light-level">
-					<ref name="zeroToHundredPercent"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:extrusion-second-light-level">
-					<ref name="zeroToHundredPercent"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:extrusion-first-light-direction">
-					<ref name="vector3D"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:extrusion-second-light-direction">
-					<ref name="vector3D"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:extrusion-metal">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="dr3d:shade-mode">
-					<choice>
-						<value>flat</value>
-						<value>phong</value>
-						<value>gouraud</value>
-						<value>draft</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:extrusion-rotation-angle">
-					<list>
-						<ref name="angle"/>
-						<ref name="angle"/>
-					</list>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:extrusion-rotation-center">
-					<ref name="vector3D"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:extrusion-shininess">
-					<ref name="zeroToHundredPercent"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:extrusion-skew">
-					<list>
-						<ref name="double"/>
-						<ref name="angle"/>
-					</list>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:extrusion-specularity">
-					<ref name="zeroToHundredPercent"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="dr3d:projection">
-					<choice>
-						<value>parallel</value>
-						<value>perspective</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:extrusion-viewpoint">
-					<ref name="point3D"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:extrusion-origin">
-					<list>
-						<ref name="extrusionOrigin"/>
-						<ref name="extrusionOrigin"/>
-					</list>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:extrusion-color">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:enhanced-path">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:path-stretchpoint-x">
-					<ref name="double"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:path-stretchpoint-y">
-					<ref name="double"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:text-areas">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:glue-points">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:glue-point-type">
-					<choice>
-						<value>none</value>
-						<value>segments</value>
-						<value>rectangle</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:glue-point-leaving-directions">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:text-path">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:text-path-mode">
-					<choice>
-						<value>normal</value>
-						<value>path</value>
-						<value>shape</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:text-path-scale">
-					<choice>
-						<value>path</value>
-						<value>shape</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:text-path-same-letter-heights">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:modifiers">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="custom-shape-type">
-		<choice>
-			<value>non-primitive</value>
-			<ref name="string"/>
-		</choice>
-	</define>
-	<define name="point3D">
-		<data type="string">
-			<param name="pattern">\([ ]*-?([0-9]+(\.[0-9]*)?|\.[0-9]+)((cm)|(mm)|(in)|(pt)|(pc))([ ]+-?([0-9]+(\.[0-9]*)?|\.[0-9]+)((cm)|(mm)|(in)|(pt)|(pc))){2}[ ]*\)</param>
-		</data>
-	</define>
-	<define name="extrusionOrigin">
-		<data type="double">
-			<param name="minInclusive">-0.5</param>
-			<param name="maxInclusive">0.5</param>
-		</data>
-	</define>
-	<define name="draw-equation">
-		<element name="draw:equation">
-			<ref name="draw-equation-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="draw-equation-attlist">
-		<interleave>
-			<optional>
-				<attribute name="draw:name">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:formula">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="draw-handle">
-		<element name="draw:handle">
-			<ref name="draw-handle-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="draw-handle-attlist">
-		<interleave>
-			<optional>
-				<attribute name="draw:handle-mirror-vertical">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:handle-mirror-horizontal">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:handle-switched">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<attribute name="draw:handle-position">
-				<ref name="string"/>
-			</attribute>
-			<optional>
-				<attribute name="draw:handle-range-x-minimum">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:handle-range-x-maximum">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:handle-range-y-minimum">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:handle-range-y-maximum">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:handle-polar">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:handle-radius-range-minimum">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:handle-radius-range-maximum">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="presentation-shape-attlist">
-		<interleave>
-			<optional>
-				<attribute name="presentation:class">
-					<ref name="presentation-classes"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="presentation:placeholder">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="presentation:user-transformed">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="presentation-classes">
-		<choice>
-			<value>title</value>
-			<value>outline</value>
-			<value>subtitle</value>
-			<value>text</value>
-			<value>graphic</value>
-			<value>object</value>
-			<value>chart</value>
-			<value>table</value>
-			<value>orgchart</value>
-			<value>page</value>
-			<value>notes</value>
-			<value>handout</value>
-			<value>header</value>
-			<value>footer</value>
-			<value>date-time</value>
-			<value>page-number</value>
-		</choice>
-	</define>
-	<define name="presentation-animations">
-		<element name="presentation:animations">
-			<zeroOrMore>
-				<choice>
-					<ref name="presentation-animation-elements"/>
-					<ref name="presentation-animation-group"/>
-				</choice>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="presentation-animation-elements">
-		<choice>
-			<ref name="presentation-show-shape"/>
-			<ref name="presentation-show-text"/>
-			<ref name="presentation-hide-shape"/>
-			<ref name="presentation-hide-text"/>
-			<ref name="presentation-dim"/>
-			<ref name="presentation-play"/>
-		</choice>
-	</define>
-	<define name="presentation-sound">
-		<element name="presentation:sound">
-			<ref name="presentation-sound-attlist"/>
-			<attribute name="xlink:type">
-				<value>simple</value>
-			</attribute>
-			<attribute name="xlink:href">
-				<ref name="anyIRI"/>
-			</attribute>
-			<optional>
-				<attribute name="xlink:actuate">
-					<value>onRequest</value>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="xlink:show">
-					<choice>
-						<value>new</value>
-						<value>replace</value>
-					</choice>
-				</attribute>
-			</optional>
-			<empty/>
-		</element>
-	</define>
-	<define name="presentation-sound-attlist">
-		<interleave>
-			<optional>
-				<attribute name="presentation:play-full">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<ref name="xml-id"/>
-			</optional>
-		</interleave>
-	</define>
-	<define name="presentation-show-shape">
-		<element name="presentation:show-shape">
-			<ref name="common-presentation-effect-attlist"/>
-			<optional>
-				<ref name="presentation-sound"/>
-			</optional>
-		</element>
-	</define>
-	<define name="common-presentation-effect-attlist">
-		<interleave>
-			<attribute name="draw:shape-id">
-				<ref name="IDREF"/>
-			</attribute>
-			<optional>
-				<attribute name="presentation:effect">
-					<ref name="presentationEffects"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="presentation:direction">
-					<ref name="presentationEffectDirections"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="presentation:speed">
-					<ref name="presentationSpeeds"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="presentation:delay">
-					<ref name="duration"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="presentation:start-scale">
-					<ref name="percent"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="presentation:path-id">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="presentationEffects">
-		<choice>
-			<value>none</value>
-			<value>fade</value>
-			<value>move</value>
-			<value>stripes</value>
-			<value>open</value>
-			<value>close</value>
-			<value>dissolve</value>
-			<value>wavyline</value>
-			<value>random</value>
-			<value>lines</value>
-			<value>laser</value>
-			<value>appear</value>
-			<value>hide</value>
-			<value>move-short</value>
-			<value>checkerboard</value>
-			<value>rotate</value>
-			<value>stretch</value>
-		</choice>
-	</define>
-	<define name="presentationEffectDirections">
-		<choice>
-			<value>none</value>
-			<value>from-left</value>
-			<value>from-top</value>
-			<value>from-right</value>
-			<value>from-bottom</value>
-			<value>from-center</value>
-			<value>from-upper-left</value>
-			<value>from-upper-right</value>
-			<value>from-lower-left</value>
-			<value>from-lower-right</value>
-			<value>to-left</value>
-			<value>to-top</value>
-			<value>to-right</value>
-			<value>to-bottom</value>
-			<value>to-upper-left</value>
-			<value>to-upper-right</value>
-			<value>to-lower-right</value>
-			<value>to-lower-left</value>
-			<value>path</value>
-			<value>spiral-inward-left</value>
-			<value>spiral-inward-right</value>
-			<value>spiral-outward-left</value>
-			<value>spiral-outward-right</value>
-			<value>vertical</value>
-			<value>horizontal</value>
-			<value>to-center</value>
-			<value>clockwise</value>
-			<value>counter-clockwise</value>
-		</choice>
-	</define>
-	<define name="presentationSpeeds">
-		<choice>
-			<value>slow</value>
-			<value>medium</value>
-			<value>fast</value>
-		</choice>
-	</define>
-	<define name="presentation-show-text">
-		<element name="presentation:show-text">
-			<ref name="common-presentation-effect-attlist"/>
-			<optional>
-				<ref name="presentation-sound"/>
-			</optional>
-		</element>
-	</define>
-	<define name="presentation-hide-shape">
-		<element name="presentation:hide-shape">
-			<ref name="common-presentation-effect-attlist"/>
-			<optional>
-				<ref name="presentation-sound"/>
-			</optional>
-		</element>
-	</define>
-	<define name="presentation-hide-text">
-		<element name="presentation:hide-text">
-			<ref name="common-presentation-effect-attlist"/>
-			<optional>
-				<ref name="presentation-sound"/>
-			</optional>
-		</element>
-	</define>
-	<define name="presentation-dim">
-		<element name="presentation:dim">
-			<ref name="presentation-dim-attlist"/>
-			<optional>
-				<ref name="presentation-sound"/>
-			</optional>
-		</element>
-	</define>
-	<define name="presentation-dim-attlist">
-		<interleave>
-			<attribute name="draw:shape-id">
-				<ref name="IDREF"/>
-			</attribute>
-			<attribute name="draw:color">
-				<ref name="color"/>
-			</attribute>
-		</interleave>
-	</define>
-	<define name="presentation-play">
-		<element name="presentation:play">
-			<ref name="presentation-play-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="presentation-play-attlist">
-		<attribute name="draw:shape-id">
-			<ref name="IDREF"/>
-		</attribute>
-		<optional>
-			<attribute name="presentation:speed">
-				<ref name="presentationSpeeds"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="presentation-animation-group">
-		<element name="presentation:animation-group">
-			<zeroOrMore>
-				<ref name="presentation-animation-elements"/>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="common-anim-attlist">
-		<interleave>
-			<optional>
-				<attribute name="presentation:node-type">
-					<choice>
-						<value>default</value>
-						<value>on-click</value>
-						<value>with-previous</value>
-						<value>after-previous</value>
-						<value>timing-root</value>
-						<value>main-sequence</value>
-						<value>interactive-sequence</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="presentation:preset-id">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="presentation:preset-sub-type">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="presentation:preset-class">
-					<choice>
-						<value>custom</value>
-						<value>entrance</value>
-						<value>exit</value>
-						<value>emphasis</value>
-						<value>motion-path</value>
-						<value>ole-action</value>
-						<value>media-call</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="presentation:master-element">
-					<ref name="IDREF"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="presentation:group-id">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<group>
-					<ref name="xml-id"/>
-					<optional>
-						<attribute name="anim:id">
-							<ref name="NCName"/>
-						</attribute>
-					</optional>
-				</group>
-			</optional>
-		</interleave>
-	</define>
-	<define name="presentation-event-listener">
-		<element name="presentation:event-listener">
-			<ref name="presentation-event-listener-attlist"/>
-			<optional>
-				<ref name="presentation-sound"/>
-			</optional>
-		</element>
-	</define>
-	<define name="presentation-event-listener-attlist">
-		<interleave>
-			<attribute name="script:event-name">
-				<ref name="string"/>
-			</attribute>
-			<attribute name="presentation:action">
-				<choice>
-					<value>none</value>
-					<value>previous-page</value>
-					<value>next-page</value>
-					<value>first-page</value>
-					<value>last-page</value>
-					<value>hide</value>
-					<value>stop</value>
-					<value>execute</value>
-					<value>show</value>
-					<value>verb</value>
-					<value>fade-out</value>
-					<value>sound</value>
-					<value>last-visited-page</value>
-				</choice>
-			</attribute>
-			<optional>
-				<attribute name="presentation:effect">
-					<ref name="presentationEffects"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="presentation:direction">
-					<ref name="presentationEffectDirections"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="presentation:speed">
-					<ref name="presentationSpeeds"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="presentation:start-scale">
-					<ref name="percent"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="xlink:type">
-					<value>simple</value>
-				</attribute>
-				<attribute name="xlink:href">
-					<ref name="anyIRI"/>
-				</attribute>
-				<optional>
-					<attribute name="xlink:show">
-						<value>embed</value>
-					</attribute>
-				</optional>
-				<optional>
-					<attribute name="xlink:actuate">
-						<value>onRequest</value>
-					</attribute>
-				</optional>
-			</optional>
-			<optional>
-				<attribute name="presentation:verb">
-					<ref name="nonNegativeInteger"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="presentation-decls">
-		<zeroOrMore>
-			<ref name="presentation-decl"/>
-		</zeroOrMore>
-	</define>
-	<define name="presentation-decl">
-		<choice>
-			<element name="presentation:header-decl">
-				<ref name="presentation-header-decl-attlist"/>
-				<text/>
-			</element>
-			<element name="presentation:footer-decl">
-				<ref name="presentation-footer-decl-attlist"/>
-				<text/>
-			</element>
-			<element name="presentation:date-time-decl">
-				<ref name="presentation-date-time-decl-attlist"/>
-				<text/>
-			</element>
-		</choice>
-	</define>
-	<define name="presentation-header-decl-attlist">
-		<attribute name="presentation:name">
-			<ref name="string"/>
-		</attribute>
-	</define>
-	<define name="presentation-footer-decl-attlist">
-		<attribute name="presentation:name">
-			<ref name="string"/>
-		</attribute>
-	</define>
-	<define name="presentation-date-time-decl-attlist">
-		<interleave>
-			<attribute name="presentation:name">
-				<ref name="string"/>
-			</attribute>
-			<attribute name="presentation:source">
-				<choice>
-					<value>fixed</value>
-					<value>current-date</value>
-				</choice>
-			</attribute>
-			<optional>
-				<attribute name="style:data-style-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="presentation-settings">
-		<optional>
-			<element name="presentation:settings">
-				<ref name="presentation-settings-attlist"/>
-				<zeroOrMore>
-					<ref name="presentation-show"/>
-				</zeroOrMore>
-			</element>
-		</optional>
-	</define>
-	<define name="presentation-settings-attlist">
-		<interleave>
-			<optional>
-				<attribute name="presentation:start-page">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="presentation:show">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="presentation:full-screen">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="presentation:endless">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="presentation:pause">
-					<ref name="duration"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="presentation:show-logo">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="presentation:force-manual">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="presentation:mouse-visible">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="presentation:mouse-as-pen">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="presentation:start-with-navigator">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="presentation:animations">
-					<choice>
-						<value>enabled</value>
-						<value>disabled</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="presentation:transition-on-click">
-					<choice>
-						<value>enabled</value>
-						<value>disabled</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="presentation:stay-on-top">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="presentation:show-end-of-presentation-slide">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="presentation-show">
-		<element name="presentation:show">
-			<ref name="presentation-show-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="presentation-show-attlist">
-		<interleave>
-			<attribute name="presentation:name">
-				<ref name="string"/>
-			</attribute>
-			<attribute name="presentation:pages">
-				<ref name="string"/>
-			</attribute>
-		</interleave>
-	</define>
-	<define name="chart-chart">
-		<element name="chart:chart">
-			<ref name="chart-chart-attlist"/>
-			<optional>
-				<ref name="chart-title"/>
-			</optional>
-			<optional>
-				<ref name="chart-subtitle"/>
-			</optional>
-			<optional>
-				<ref name="chart-footer"/>
-			</optional>
-			<optional>
-				<ref name="chart-legend"/>
-			</optional>
-			<ref name="chart-plot-area"/>
-			<optional>
-				<ref name="table-table"/>
-			</optional>
-		</element>
-	</define>
-	<define name="chart-chart-attlist">
-		<interleave>
-			<attribute name="chart:class">
-				<ref name="namespacedToken"/>
-			</attribute>
-			<ref name="common-draw-size-attlist"/>
-			<optional>
-				<attribute name="chart:column-mapping">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:row-mapping">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:style-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-			<optional>
-				<group>
-					<attribute name="xlink:type">
-						<value>simple</value>
-					</attribute>
-					<attribute name="xlink:href">
-						<ref name="anyIRI"/>
-					</attribute>
-				</group>
-			</optional>
-			<optional>
-				<ref name="xml-id"/>
-			</optional>
-		</interleave>
-	</define>
-	<define name="chart-title">
-		<element name="chart:title">
-			<ref name="chart-title-attlist"/>
-			<optional>
-				<ref name="text-p"/>
-			</optional>
-		</element>
-	</define>
-	<define name="chart-title-attlist">
-		<interleave>
-			<optional>
-				<attribute name="table:cell-range">
-					<ref name="cellRangeAddressList"/>
-				</attribute>
-			</optional>
-			<ref name="common-draw-position-attlist"/>
-			<optional>
-				<attribute name="chart:style-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="chart-subtitle">
-		<element name="chart:subtitle">
-			<ref name="chart-title-attlist"/>
-			<optional>
-				<ref name="text-p"/>
-			</optional>
-		</element>
-	</define>
-	<define name="chart-footer">
-		<element name="chart:footer">
-			<ref name="chart-title-attlist"/>
-			<optional>
-				<ref name="text-p"/>
-			</optional>
-		</element>
-	</define>
-	<define name="chart-legend">
-		<element name="chart:legend">
-			<ref name="chart-legend-attlist"/>
-			<optional>
-				<ref name="text-p"/>
-			</optional>
-		</element>
-	</define>
-	<define name="chart-legend-attlist">
-		<interleave>
-			<choice>
-				<group>
-					<attribute name="chart:legend-position">
-						<choice>
-							<value>start</value>
-							<value>end</value>
-							<value>top</value>
-							<value>bottom</value>
-						</choice>
-					</attribute>
-					<optional>
-						<attribute name="chart:legend-align">
-							<choice>
-								<value>start</value>
-								<value>center</value>
-								<value>end</value>
-							</choice>
-						</attribute>
-					</optional>
-				</group>
-				<attribute name="chart:legend-position">
-					<choice>
-						<value>top-start</value>
-						<value>bottom-start</value>
-						<value>top-end</value>
-						<value>bottom-end</value>
-					</choice>
-				</attribute>
-				<empty/>
-			</choice>
-			<ref name="common-draw-position-attlist"/>
-			<choice>
-				<attribute name="style:legend-expansion">
-					<choice>
-						<value>wide</value>
-						<value>high</value>
-						<value>balanced</value>
-					</choice>
-				</attribute>
-				<group>
-					<attribute name="style:legend-expansion">
-						<value>custom</value>
-					</attribute>
-					<attribute name="style:legend-expansion-aspect-ratio">
-						<ref name="double"/>
-					</attribute>
-				</group>
-				<empty/>
-			</choice>
-			<optional>
-				<attribute name="chart:style-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="chart-plot-area">
-		<element name="chart:plot-area">
-			<ref name="chart-plot-area-attlist"/>
-			<zeroOrMore>
-				<ref name="dr3d-light"/>
-			</zeroOrMore>
-			<zeroOrMore>
-				<ref name="chart-axis"/>
-			</zeroOrMore>
-			<zeroOrMore>
-				<ref name="chart-series"/>
-			</zeroOrMore>
-			<optional>
-				<ref name="chart-stock-gain-marker"/>
-			</optional>
-			<optional>
-				<ref name="chart-stock-loss-marker"/>
-			</optional>
-			<optional>
-				<ref name="chart-stock-range-line"/>
-			</optional>
-			<optional>
-				<ref name="chart-wall"/>
-			</optional>
-			<optional>
-				<ref name="chart-floor"/>
-			</optional>
-		</element>
-	</define>
-	<define name="chart-plot-area-attlist">
-		<interleave>
-			<ref name="common-draw-position-attlist"/>
-			<ref name="common-draw-size-attlist"/>
-			<optional>
-				<attribute name="chart:style-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:cell-range-address">
-					<ref name="cellRangeAddressList"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:data-source-has-labels">
-					<choice>
-						<value>none</value>
-						<value>row</value>
-						<value>column</value>
-						<value>both</value>
-					</choice>
-				</attribute>
-			</optional>
-			<ref name="dr3d-scene-attlist"/>
-			<ref name="common-dr3d-transform-attlist"/>
-			<optional>
-				<ref name="xml-id"/>
-			</optional>
-		</interleave>
-	</define>
-	<define name="chart-wall">
-		<element name="chart:wall">
-			<ref name="chart-wall-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="chart-wall-attlist">
-		<interleave>
-			<optional>
-				<attribute name="svg:width">
-					<ref name="length"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:style-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="chart-floor">
-		<element name="chart:floor">
-			<ref name="chart-floor-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="chart-floor-attlist">
-		<interleave>
-			<optional>
-				<attribute name="svg:width">
-					<ref name="length"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:style-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="chart-axis">
-		<element name="chart:axis">
-			<ref name="chart-axis-attlist"/>
-			<optional>
-				<ref name="chart-title"/>
-			</optional>
-			<optional>
-				<ref name="chart-categories"/>
-			</optional>
-			<zeroOrMore>
-				<ref name="chart-grid"/>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="chart-axis-attlist">
-		<interleave>
-			<attribute name="chart:dimension">
-				<ref name="chart-dimension"/>
-			</attribute>
-			<optional>
-				<attribute name="chart:name">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:style-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="chart-dimension">
-		<choice>
-			<value>x</value>
-			<value>y</value>
-			<value>z</value>
-		</choice>
-	</define>
-	<define name="chart-categories">
-		<element name="chart:categories">
-			<optional>
-				<attribute name="table:cell-range-address">
-					<ref name="cellRangeAddressList"/>
-				</attribute>
-			</optional>
-		</element>
-	</define>
-	<define name="chart-grid">
-		<element name="chart:grid">
-			<ref name="chart-grid-attlist"/>
-		</element>
-	</define>
-	<define name="chart-grid-attlist">
-		<interleave>
-			<optional>
-				<attribute name="chart:class">
-					<choice>
-						<value>major</value>
-						<value>minor</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:style-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="chart-series">
-		<element name="chart:series">
-			<ref name="chart-series-attlist"/>
-			<zeroOrMore>
-				<ref name="chart-domain"/>
-			</zeroOrMore>
-			<optional>
-				<ref name="chart-mean-value"/>
-			</optional>
-			<zeroOrMore>
-				<ref name="chart-regression-curve"/>
-			</zeroOrMore>
-			<zeroOrMore>
-				<ref name="chart-error-indicator"/>
-			</zeroOrMore>
-			<zeroOrMore>
-				<ref name="chart-data-point"/>
-			</zeroOrMore>
-			<optional>
-				<ref name="chart-data-label"/>
-			</optional>
-		</element>
-	</define>
-	<define name="chart-series-attlist">
-		<interleave>
-			<optional>
-				<attribute name="chart:values-cell-range-address">
-					<ref name="cellRangeAddressList"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:label-cell-address">
-					<ref name="cellRangeAddressList"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:class">
-					<ref name="namespacedToken"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:attached-axis">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:style-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-			<optional>
-				<ref name="xml-id"/>
-			</optional>
-		</interleave>
-	</define>
-	<define name="chart-domain">
-		<element name="chart:domain">
-			<optional>
-				<attribute name="table:cell-range-address">
-					<ref name="cellRangeAddressList"/>
-				</attribute>
-			</optional>
-		</element>
-	</define>
-	<define name="chart-data-point">
-		<element name="chart:data-point">
-			<ref name="chart-data-point-attlist"/>
-			<optional>
-				<ref name="chart-data-label"/>
-			</optional>
-		</element>
-	</define>
-	<define name="chart-data-point-attlist">
-		<interleave>
-			<optional>
-				<attribute name="chart:repeated">
-					<ref name="positiveInteger"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:style-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-			<optional>
-				<ref name="xml-id"/>
-			</optional>
-		</interleave>
-	</define>
-	<define name="chart-data-label">
-		<element name="chart:data-label">
-			<ref name="chart-data-label-attlist"/>
-			<optional>
-				<ref name="text-p"/>
-			</optional>
-		</element>
-	</define>
-	<define name="chart-data-label-attlist">
-		<interleave>
-			<ref name="common-draw-position-attlist"/>
-			<optional>
-				<attribute name="chart:style-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="chart-mean-value">
-		<element name="chart:mean-value">
-			<ref name="chart-mean-value-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="chart-mean-value-attlist">
-		<optional>
-			<attribute name="chart:style-name">
-				<ref name="styleNameRef"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="chart-error-indicator">
-		<element name="chart:error-indicator">
-			<ref name="chart-error-indicator-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="chart-error-indicator-attlist">
-		<interleave>
-			<optional>
-				<attribute name="chart:style-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-			<attribute name="chart:dimension">
-				<ref name="chart-dimension"/>
-			</attribute>
-		</interleave>
-	</define>
-	<define name="chart-regression-curve">
-		<element name="chart:regression-curve">
-			<ref name="chart-regression-curve-attlist"/>
-			<optional>
-				<ref name="chart-equation"/>
-			</optional>
-		</element>
-	</define>
-	<define name="chart-regression-curve-attlist">
-		<optional>
-			<attribute name="chart:style-name">
-				<ref name="styleNameRef"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="chart-equation">
-		<element name="chart:equation">
-			<ref name="chart-equation-attlist"/>
-			<optional>
-				<ref name="text-p"/>
-			</optional>
-		</element>
-	</define>
-	<define name="chart-equation-attlist">
-		<interleave>
-			<optional>
-				<attribute name="chart:automatic-content">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:display-r-square">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:display-equation">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<ref name="common-draw-position-attlist"/>
-			<optional>
-				<attribute name="chart:style-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="chart-stock-gain-marker">
-		<element name="chart:stock-gain-marker">
-			<ref name="common-stock-marker-attlist"/>
-		</element>
-	</define>
-	<define name="chart-stock-loss-marker">
-		<element name="chart:stock-loss-marker">
-			<ref name="common-stock-marker-attlist"/>
-		</element>
-	</define>
-	<define name="chart-stock-range-line">
-		<element name="chart:stock-range-line">
-			<ref name="common-stock-marker-attlist"/>
-		</element>
-	</define>
-	<define name="common-stock-marker-attlist">
-		<optional>
-			<attribute name="chart:style-name">
-				<ref name="styleNameRef"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="office-database">
-		<element name="office:database">
-			<ref name="db-data-source"/>
-			<optional>
-				<ref name="db-forms"/>
-			</optional>
-			<optional>
-				<ref name="db-reports"/>
-			</optional>
-			<optional>
-				<ref name="db-queries"/>
-			</optional>
-			<optional>
-				<ref name="db-table-presentations"/>
-			</optional>
-			<optional>
-				<ref name="db-schema-definition"/>
-			</optional>
-		</element>
-	</define>
-	<define name="db-data-source">
-		<element name="db:data-source">
-			<ref name="db-data-source-attlist"/>
-			<ref name="db-connection-data"/>
-			<optional>
-				<ref name="db-driver-settings"/>
-			</optional>
-			<optional>
-				<ref name="db-application-connection-settings"/>
-			</optional>
-		</element>
-	</define>
-	<define name="db-data-source-attlist">
-		<empty/>
-	</define>
-	<define name="db-connection-data">
-		<element name="db:connection-data">
-			<ref name="db-connection-data-attlist"/>
-			<choice>
-				<ref name="db-database-description"/>
-				<ref name="db-connection-resource"/>
-			</choice>
-			<optional>
-				<ref name="db-login"/>
-			</optional>
-		</element>
-	</define>
-	<define name="db-connection-data-attlist">
-		<empty/>
-	</define>
-	<define name="db-database-description">
-		<element name="db:database-description">
-			<ref name="db-database-description-attlist"/>
-			<choice>
-				<ref name="db-file-based-database"/>
-				<ref name="db-server-database"/>
-			</choice>
-		</element>
-	</define>
-	<define name="db-database-description-attlist">
-		<empty/>
-	</define>
-	<define name="db-file-based-database">
-		<element name="db:file-based-database">
-			<ref name="db-file-based-database-attlist"/>
-		</element>
-	</define>
-	<define name="db-file-based-database-attlist">
-		<interleave>
-			<attribute name="xlink:type">
-				<value>simple</value>
-			</attribute>
-			<attribute name="xlink:href">
-				<ref name="anyIRI"/>
-			</attribute>
-			<attribute name="db:media-type">
-				<ref name="string"/>
-			</attribute>
-			<optional>
-				<attribute name="db:extension">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="db-server-database">
-		<element name="db:server-database">
-			<ref name="db-server-database-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="db-server-database-attlist">
-		<interleave>
-			<attribute name="db:type">
-				<ref name="namespacedToken"/>
-			</attribute>
-			<choice>
-				<ref name="db-host-and-port"/>
-				<ref name="db-local-socket-name"/>
-			</choice>
-			<optional>
-				<attribute name="db:database-name">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="db-host-and-port">
-		<attribute name="db:hostname">
-			<ref name="string"/>
-		</attribute>
-		<optional>
-			<attribute name="db:port">
-				<ref name="positiveInteger"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="db-local-socket-name">
-		<optional>
-			<attribute name="db:local-socket">
-				<ref name="string"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="db-connection-resource">
-		<element name="db:connection-resource">
-			<ref name="db-connection-resource-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="db-connection-resource-attlist">
-		<attribute name="xlink:type">
-			<value>simple</value>
-		</attribute>
-		<attribute name="xlink:href">
-			<ref name="anyIRI"/>
-		</attribute>
-		<optional>
-			<attribute name="xlink:show">
-				<value>none</value>
-			</attribute>
-		</optional>
-		<optional>
-			<attribute name="xlink:actuate">
-				<value>onRequest</value>
-			</attribute>
-		</optional>
-	</define>
-	<define name="db-login">
-		<element name="db:login">
-			<ref name="db-login-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="db-login-attlist">
-		<interleave>
-			<optional>
-				<choice>
-					<attribute name="db:user-name">
-						<ref name="string"/>
-					</attribute>
-					<attribute name="db:use-system-user">
-						<ref name="boolean"/>
-					</attribute>
-				</choice>
-			</optional>
-			<optional>
-				<attribute name="db:is-password-required">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="db:login-timeout">
-					<ref name="positiveInteger"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="db-driver-settings">
-		<element name="db:driver-settings">
-			<ref name="db-driver-settings-attlist"/>
-			<optional>
-				<ref name="db-auto-increment"/>
-			</optional>
-			<optional>
-				<ref name="db-delimiter"/>
-			</optional>
-			<optional>
-				<ref name="db-character-set"/>
-			</optional>
-			<optional>
-				<ref name="db-table-settings"/>
-			</optional>
-		</element>
-	</define>
-	<define name="db-driver-settings-attlist">
-		<interleave>
-			<ref name="db-show-deleted"/>
-			<optional>
-				<attribute name="db:system-driver-settings">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="db:base-dn">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<ref name="db-is-first-row-header-line"/>
-			<optional>
-				<attribute name="db:parameter-name-substitution">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="db-show-deleted">
-		<optional>
-			<attribute name="db:show-deleted">
-				<ref name="boolean"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="db-is-first-row-header-line">
-		<optional>
-			<attribute name="db:is-first-row-header-line">
-				<ref name="boolean"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="db-auto-increment">
-		<element name="db:auto-increment">
-			<ref name="db-auto-increment-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="db-auto-increment-attlist">
-		<interleave>
-			<optional>
-				<attribute name="db:additional-column-statement">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="db:row-retrieving-statement">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="db-delimiter">
-		<element name="db:delimiter">
-			<ref name="db-delimiter-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="db-delimiter-attlist">
-		<interleave>
-			<optional>
-				<attribute name="db:field">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="db:string">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="db:decimal">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="db:thousand">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="db-character-set">
-		<element name="db:character-set">
-			<ref name="db-character-set-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="db-character-set-attlist">
-		<optional>
-			<attribute name="db:encoding">
-				<ref name="textEncoding"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="db-table-settings">
-		<element name="db:table-settings">
-			<zeroOrMore>
-				<ref name="db-table-setting"/>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="db-table-setting">
-		<element name="db:table-setting">
-			<ref name="db-table-setting-attlist"/>
-			<optional>
-				<ref name="db-delimiter"/>
-			</optional>
-			<optional>
-				<ref name="db-character-set"/>
-			</optional>
-			<empty/>
-		</element>
-	</define>
-	<define name="db-table-setting-attlist">
-		<ref name="db-is-first-row-header-line"/>
-		<ref name="db-show-deleted"/>
-	</define>
-	<define name="db-application-connection-settings">
-		<element name="db:application-connection-settings">
-			<ref name="db-application-connection-settings-attlist"/>
-			<optional>
-				<ref name="db-table-filter"/>
-			</optional>
-			<optional>
-				<ref name="db-table-type-filter"/>
-			</optional>
-			<optional>
-				<ref name="db-data-source-settings"/>
-			</optional>
-		</element>
-	</define>
-	<define name="db-application-connection-settings-attlist">
-		<interleave>
-			<optional>
-				<attribute name="db:is-table-name-length-limited">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="db:enable-sql92-check">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="db:append-table-alias-name">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="db:ignore-driver-privileges">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="db:boolean-comparison-mode">
-					<choice>
-						<value>equal-integer</value>
-						<value>is-boolean</value>
-						<value>equal-boolean</value>
-						<value>equal-use-only-zero</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="db:use-catalog">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="db:max-row-count">
-					<ref name="integer"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="db:suppress-version-columns">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="db-table-filter">
-		<element name="db:table-filter">
-			<ref name="db-table-filter-attlist"/>
-			<optional>
-				<ref name="db-table-include-filter"/>
-			</optional>
-			<optional>
-				<ref name="db-table-exclude-filter"/>
-			</optional>
-		</element>
-	</define>
-	<define name="db-table-filter-attlist">
-		<empty/>
-	</define>
-	<define name="db-table-include-filter">
-		<element name="db:table-include-filter">
-			<ref name="db-table-include-filter-attlist"/>
-			<oneOrMore>
-				<ref name="db-table-filter-pattern"/>
-			</oneOrMore>
-		</element>
-	</define>
-	<define name="db-table-include-filter-attlist">
-		<empty/>
-	</define>
-	<define name="db-table-exclude-filter">
-		<element name="db:table-exclude-filter">
-			<ref name="db-table-exclude-filter-attlist"/>
-			<oneOrMore>
-				<ref name="db-table-filter-pattern"/>
-			</oneOrMore>
-		</element>
-	</define>
-	<define name="db-table-exclude-filter-attlist">
-		<empty/>
-	</define>
-	<define name="db-table-filter-pattern">
-		<element name="db:table-filter-pattern">
-			<ref name="db-table-filter-pattern-attlist"/>
-			<ref name="string"/>
-		</element>
-	</define>
-	<define name="db-table-filter-pattern-attlist">
-		<empty/>
-	</define>
-	<define name="db-table-type-filter">
-		<element name="db:table-type-filter">
-			<ref name="db-table-type-filter-attlist"/>
-			<zeroOrMore>
-				<ref name="db-table-type"/>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="db-table-type-filter-attlist">
-		<empty/>
-	</define>
-	<define name="db-table-type">
-		<element name="db:table-type">
-			<ref name="db-table-type-attlist"/>
-			<ref name="string"/>
-		</element>
-	</define>
-	<define name="db-table-type-attlist">
-		<empty/>
-	</define>
-	<define name="db-data-source-settings">
-		<element name="db:data-source-settings">
-			<ref name="db-data-source-settings-attlist"/>
-			<oneOrMore>
-				<ref name="db-data-source-setting"/>
-			</oneOrMore>
-		</element>
-	</define>
-	<define name="db-data-source-settings-attlist">
-		<empty/>
-	</define>
-	<define name="db-data-source-setting">
-		<element name="db:data-source-setting">
-			<ref name="db-data-source-setting-attlist"/>
-			<oneOrMore>
-				<ref name="db-data-source-setting-value"/>
-			</oneOrMore>
-		</element>
-	</define>
-	<define name="db-data-source-setting-attlist">
-		<interleave>
-			<optional>
-				<attribute name="db:data-source-setting-is-list">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<attribute name="db:data-source-setting-name">
-				<ref name="string"/>
-			</attribute>
-			<attribute name="db:data-source-setting-type">
-				<ref name="db-data-source-setting-types"/>
-			</attribute>
-		</interleave>
-	</define>
-	<define name="db-data-source-setting-types">
-		<choice>
-			<value>boolean</value>
-			<value>short</value>
-			<value>int</value>
-			<value>long</value>
-			<value>double</value>
-			<value>string</value>
-		</choice>
-	</define>
-	<define name="db-data-source-setting-value">
-		<element name="db:data-source-setting-value">
-			<ref name="db-data-source-setting-value-attlist"/>
-			<ref name="string"/>
-		</element>
-	</define>
-	<define name="db-data-source-setting-value-attlist">
-		<empty/>
-	</define>
-	<define name="db-forms">
-		<element name="db:forms">
-			<ref name="db-forms-attlist"/>
-			<zeroOrMore>
-				<choice>
-					<ref name="db-component"/>
-					<ref name="db-component-collection"/>
-				</choice>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="db-forms-attlist">
-		<empty/>
-	</define>
-	<define name="db-reports">
-		<element name="db:reports">
-			<ref name="db-reports-attlist"/>
-			<zeroOrMore>
-				<choice>
-					<ref name="db-component"/>
-					<ref name="db-component-collection"/>
-				</choice>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="db-reports-attlist">
-		<empty/>
-	</define>
-	<define name="db-component-collection">
-		<element name="db:component-collection">
-			<ref name="db-component-collection-attlist"/>
-			<ref name="common-db-object-name"/>
-			<ref name="common-db-object-title"/>
-			<ref name="common-db-object-description"/>
-			<zeroOrMore>
-				<choice>
-					<ref name="db-component"/>
-					<ref name="db-component-collection"/>
-				</choice>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="db-component-collection-attlist">
-		<empty/>
-	</define>
-	<define name="db-component">
-		<element name="db:component">
-			<ref name="db-component-attlist"/>
-			<ref name="common-db-object-name"/>
-			<ref name="common-db-object-title"/>
-			<ref name="common-db-object-description"/>
-			<optional>
-				<choice>
-					<ref name="office-document"/>
-					<ref name="math-math"/>
-				</choice>
-			</optional>
-		</element>
-	</define>
-	<define name="db-component-attlist">
-		<interleave>
-			<optional>
-				<attribute name="xlink:type">
-					<value>simple</value>
-				</attribute>
-				<attribute name="xlink:href">
-					<ref name="anyIRI"/>
-				</attribute>
-				<optional>
-					<attribute name="xlink:show">
-						<value>none</value>
-					</attribute>
-				</optional>
-				<optional>
-					<attribute name="xlink:actuate">
-						<value>onRequest</value>
-					</attribute>
-				</optional>
-			</optional>
-			<optional>
-				<attribute name="db:as-template">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="db-queries">
-		<element name="db:queries">
-			<ref name="db-queries-attlist"/>
-			<zeroOrMore>
-				<choice>
-					<ref name="db-query"/>
-					<ref name="db-query-collection"/>
-				</choice>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="db-queries-attlist">
-		<empty/>
-	</define>
-	<define name="db-query-collection">
-		<element name="db:query-collection">
-			<ref name="db-query-collection-attlist"/>
-			<ref name="common-db-object-name"/>
-			<ref name="common-db-object-title"/>
-			<ref name="common-db-object-description"/>
-			<zeroOrMore>
-				<choice>
-					<ref name="db-query"/>
-					<ref name="db-query-collection"/>
-				</choice>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="db-query-collection-attlist">
-		<empty/>
-	</define>
-	<define name="db-query">
-		<element name="db:query">
-			<ref name="db-query-attlist"/>
-			<ref name="common-db-object-name"/>
-			<ref name="common-db-object-title"/>
-			<ref name="common-db-object-description"/>
-			<ref name="common-db-table-style-name"/>
-			<optional>
-				<ref name="db-order-statement"/>
-			</optional>
-			<optional>
-				<ref name="db-filter-statement"/>
-			</optional>
-			<optional>
-				<ref name="db-columns"/>
-			</optional>
-			<optional>
-				<ref name="db-update-table"/>
-			</optional>
-		</element>
-	</define>
-	<define name="db-query-attlist">
-		<interleave>
-			<attribute name="db:command">
-				<ref name="string"/>
-			</attribute>
-			<optional>
-				<attribute name="db:escape-processing">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="db-order-statement">
-		<element name="db:order-statement">
-			<ref name="db-command"/>
-			<ref name="db-apply-command"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="db-filter-statement">
-		<element name="db:filter-statement">
-			<ref name="db-command"/>
-			<ref name="db-apply-command"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="db-update-table">
-		<element name="db:update-table">
-			<ref name="common-db-table-name-attlist"/>
-		</element>
-	</define>
-	<define name="db-table-presentations">
-		<element name="db:table-representations">
-			<ref name="db-table-presentations-attlist"/>
-			<zeroOrMore>
-				<ref name="db-table-presentation"/>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="db-table-presentations-attlist">
-		<empty/>
-	</define>
-	<define name="db-table-presentation">
-		<element name="db:table-representation">
-			<ref name="db-table-presentation-attlist"/>
-			<ref name="common-db-table-name-attlist"/>
-			<ref name="common-db-object-title"/>
-			<ref name="common-db-object-description"/>
-			<ref name="common-db-table-style-name"/>
-			<optional>
-				<ref name="db-order-statement"/>
-			</optional>
-			<optional>
-				<ref name="db-filter-statement"/>
-			</optional>
-			<optional>
-				<ref name="db-columns"/>
-			</optional>
-		</element>
-	</define>
-	<define name="db-table-presentation-attlist">
-		<empty/>
-	</define>
-	<define name="db-columns">
-		<element name="db:columns">
-			<ref name="db-columns-attlist"/>
-			<oneOrMore>
-				<ref name="db-column"/>
-			</oneOrMore>
-		</element>
-	</define>
-	<define name="db-columns-attlist">
-		<empty/>
-	</define>
-	<define name="db-column">
-		<element name="db:column">
-			<ref name="db-column-attlist"/>
-			<ref name="common-db-object-name"/>
-			<ref name="common-db-object-title"/>
-			<ref name="common-db-object-description"/>
-			<ref name="common-db-default-value"/>
-		</element>
-	</define>
-	<define name="db-column-attlist">
-		<interleave>
-			<optional>
-				<attribute name="db:visible">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-	
-			<optional>
-				<attribute name="db:style-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="db:default-cell-style-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="db-command">
-		<attribute name="db:command">
-			<ref name="string"/>
-		</attribute>
-	</define>
-	<define name="db-apply-command">
-		<optional>
-			<attribute name="db:apply-command">
-				<ref name="boolean"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="common-db-table-name-attlist">
-		<interleave>
-			<attribute name="db:name">
-				<ref name="string"/>
-			</attribute>
-			<optional>
-				<attribute name="db:catalog-name">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="db:schema-name">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="common-db-object-name">
-		<attribute name="db:name">
-			<ref name="string"/>
-		</attribute>
-	</define>
-	<define name="common-db-object-title">
-		<optional>
-			<attribute name="db:title">
-				<ref name="string"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="common-db-object-description">
-		<optional>
-			<attribute name="db:description">
-				<ref name="string"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="common-db-table-style-name">
-		<interleave>
-			<optional>
-				<attribute name="db:style-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="db:default-row-style-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="common-db-default-value">
-		<optional>
-			<ref name="common-value-and-type-attlist"/>
-		</optional>
-	</define>
-	<define name="db-schema-definition">
-		<element name="db:schema-definition">
-			<ref name="db-schema-definition-attlist"/>
-			<ref name="db-table-definitions"/>
-		</element>
-	</define>
-	<define name="db-schema-definition-attlist">
-		<empty/>
-	</define>
-	<define name="db-table-definitions">
-		<element name="db:table-definitions">
-			<ref name="db-table-definitions-attlist"/>
-			<zeroOrMore>
-				<ref name="db-table-definition"/>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="db-table-definitions-attlist">
-		<empty/>
-	</define>
-	<define name="db-table-definition">
-		<element name="db:table-definition">
-			<ref name="common-db-table-name-attlist"/>
-			<ref name="db-table-definition-attlist"/>
-			<ref name="db-column-definitions"/>
-			<optional>
-				<ref name="db-keys"/>
-			</optional>
-			<optional>
-				<ref name="db-indices"/>
-			</optional>
-		</element>
-	</define>
-	<define name="db-table-definition-attlist">
-		<optional>
-			<attribute name="db:type">
-				<ref name="string"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="db-column-definitions">
-		<element name="db:column-definitions">
-			<ref name="db-column-definitions-attlist"/>
-			<oneOrMore>
-				<ref name="db-column-definition"/>
-			</oneOrMore>
-		</element>
-	</define>
-	<define name="db-column-definitions-attlist">
-		<empty/>
-	</define>
-	<define name="db-column-definition">
-		<element name="db:column-definition">
-			<ref name="db-column-definition-attlist"/>
-			<ref name="common-db-default-value"/>
-		</element>
-	</define>
-	<define name="db-column-definition-attlist">
-		<interleave>
-			<attribute name="db:name">
-				<ref name="string"/>
-			</attribute>
-	
-			<optional>
-				<attribute name="db:data-type">
-					<ref name="db-data-types"/>
-				</attribute>
-			</optional>
-	
-			<optional>
-				<attribute name="db:type-name">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-	
-			<optional>
-				<attribute name="db:precision">
-					<ref name="positiveInteger"/>
-				</attribute>
-			</optional>
-	
-			<optional>
-				<attribute name="db:scale">
-					<ref name="positiveInteger"/>
-				</attribute>
-			</optional>
-	
-			<optional>
-				<attribute name="db:is-nullable">
-					<choice>
-						<value>no-nulls</value>
-						<value>nullable</value>
-					</choice>
-				</attribute>
-			</optional>
-	
-			<optional>
-				<attribute name="db:is-empty-allowed">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-	
-			<optional>
-				<attribute name="db:is-autoincrement">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="db-data-types">
-		<choice>
-			<value>bit</value>
-			<value>boolean</value>
-			<value>tinyint</value>
-			<value>smallint</value>
-			<value>integer</value>
-			<value>bigint</value>
-			<value>float</value>
-			<value>real</value>
-			<value>double</value>
-			<value>numeric</value>
-			<value>decimal</value>
-			<value>char</value>
-			<value>varchar</value>
-			<value>longvarchar</value>
-			<value>date</value>
-			<value>time</value>
-			<value>timestmp</value>
-			<value>binary</value>
-			<value>varbinary</value>
-			<value>longvarbinary</value>
-			<value>sqlnull</value>
-			<value>other</value>
-			<value>object</value>
-			<value>distinct</value>
-			<value>struct</value>
-			<value>array</value>
-			<value>blob</value>
-			<value>clob</value>
-			<value>ref</value>
-		</choice>
-	</define>
-	<define name="db-keys">
-		<element name="db:keys">
-			<ref name="db-keys-attlist"/>
-			<oneOrMore>
-				<ref name="db-key"/>
-			</oneOrMore>
-		</element>
-	</define>
-	<define name="db-keys-attlist">
-		<empty/>
-	</define>
-	<define name="db-key">
-		<element name="db:key">
-			<ref name="db-key-attlist"/>
-			<oneOrMore>
-				<ref name="db-key-columns"/>
-			</oneOrMore>
-		</element>
-	</define>
-	<define name="db-key-attlist">
-		<interleave>
-			<optional>
-				<attribute name="db:name">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-	
-			<attribute name="db:type">
-				<choice>
-					<value>primary</value>
-					<value>unique</value>
-					<value>foreign</value>
-				</choice>
-			</attribute>
-	
-			<optional>
-				<attribute name="db:referenced-table-name">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-	
-			<optional>
-				<attribute name="db:update-rule">
-					<choice>
-						<value>cascade</value>
-						<value>restrict</value>
-						<value>set-null</value>
-						<value>no-action</value>
-						<value>set-default</value>
-					</choice>
-				</attribute>
-			</optional>
-	
-			<optional>
-				<attribute name="db:delete-rule">
-					<choice>
-						<value>cascade</value>
-						<value>restrict</value>
-						<value>set-null</value>
-						<value>no-action</value>
-						<value>set-default</value>
-					</choice>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="db-key-columns">
-		<element name="db:key-columns">
-			<ref name="db-key-columns-attlist"/>
-			<oneOrMore>
-				<ref name="db-key-column"/>
-			</oneOrMore>
-		</element>
-	</define>
-	<define name="db-key-columns-attlist">
-		<empty/>
-	</define>
-	<define name="db-key-column">
-		<element name="db:key-column">
-			<ref name="db-key-column-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="db-key-column-attlist">
-		<interleave>
-			<optional>
-				<attribute name="db:name">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-	
-			<optional>
-				<attribute name="db:related-column-name">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="db-indices">
-		<element name="db:indices">
-			<ref name="db-indices-attlist"/>
-			<oneOrMore>
-				<ref name="db-index"/>
-			</oneOrMore>
-		</element>
-	</define>
-	<define name="db-indices-attlist">
-		<empty/>
-	</define>
-	<define name="db-index">
-		<element name="db:index">
-			<ref name="db-index-attlist"/>
-			<oneOrMore>
-				<ref name="db-index-columns"/>
-			</oneOrMore>
-		</element>
-	</define>
-	<define name="db-index-attlist">
-		<interleave>
-			<attribute name="db:name">
-				<ref name="string"/>
-			</attribute>
-	
-			<optional>
-				<attribute name="db:catalog-name">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-	
-			<optional>
-				<attribute name="db:is-unique">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-	
-			<optional>
-				<attribute name="db:is-clustered">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="db-index-columns">
-		<element name="db:index-columns">
-			<oneOrMore>
-				<ref name="db-index-column"/>
-			</oneOrMore>
-		</element>
-	</define>
-	<define name="db-index-column">
-		<element name="db:index-column">
-			<ref name="db-index-column-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="db-index-column-attlist">
-		<interleave>
-			<attribute name="db:name">
-				<ref name="string"/>
-			</attribute>
-	
-			<optional>
-				<attribute name="db:is-ascending">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="office-forms">
-		<optional>
-			<element name="office:forms">
-				<ref name="office-forms-attlist"/>
-				<zeroOrMore>
-					<choice>
-						<ref name="form-form"/>
-						<ref name="xforms-model"/>
-					</choice>
-				</zeroOrMore>
-			</element>
-		</optional>
-	</define>
-	<define name="office-forms-attlist">
-		<interleave>
-			<optional>
-				<attribute name="form:automatic-focus">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="form:apply-design-mode">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="form-form">
-		<element name="form:form">
-			<ref name="common-form-control-attlist"/>
-			<ref name="form-form-attlist"/>
-			<optional>
-				<ref name="form-properties"/>
-			</optional>
-			<optional>
-				<ref name="office-event-listeners"/>
-			</optional>
-			<zeroOrMore>
-				<choice>
-					<ref name="controls"/>
-					<ref name="form-form"/>
-				</choice>
-			</zeroOrMore>
-			<optional>
-				<ref name="form-connection-resource"/>
-			</optional>
-		</element>
-	</define>
-	<define name="form-form-attlist">
-		<interleave>
-			<optional>
-				<attribute name="xlink:type">
-					<value>simple</value>
-				</attribute>
-				<attribute name="xlink:href">
-					<ref name="anyIRI"/>
-				</attribute>
-				<optional>
-					<attribute name="xlink:actuate">
-						<value>onRequest</value>
-					</attribute>
-				</optional>
-			</optional>
-			<optional>
-				<attribute name="office:target-frame">
-					<ref name="targetFrameName"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="form:method">
-					<choice>
-						<value>get</value>
-						<value>post</value>
-						<ref name="string"/>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="form:enctype">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="form:allow-deletes">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="form:allow-inserts">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="form:allow-updates">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="form:apply-filter">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="form:command-type">
-					<choice>
-						<value>table</value>
-						<value>query</value>
-						<value>command</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="form:command">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="form:datasource">
-					<choice>
-						<ref name="anyIRI"/>
-						<ref name="string"/>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="form:master-fields">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="form:detail-fields">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="form:escape-processing">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="form:filter">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="form:ignore-result">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="form:navigation-mode">
-					<ref name="navigation"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="form:order">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="form:tab-cycle">
-					<ref name="tab-cycles"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="navigation">
-		<choice>
-			<value>none</value>
-			<value>current</value>
-			<value>parent</value>
-		</choice>
-	</define>
-	<define name="tab-cycles">
-		<choice>
-			<value>records</value>
-			<value>current</value>
-			<value>page</value>
-		</choice>
-	</define>
-	<define name="form-connection-resource">
-		<element name="form:connection-resource">
-			<attribute name="xlink:href">
-				<ref name="anyIRI"/>
-			</attribute>
-			<empty/>
-		</element>
-	</define>
-	<define name="xforms-model">
-		<element name="xforms:model">
-			<ref name="anyAttListOrElements"/>
-		</element>
-	</define>
-	<define name="column-controls">
-		<choice>
-			<element name="form:text">
-				<ref name="form-text-attlist"/>
-				<ref name="common-form-control-content"/>
-			</element>
-			<element name="form:textarea">
-				<ref name="form-textarea-attlist"/>
-				<ref name="common-form-control-content"/>
-				<zeroOrMore>
-					<ref name="text-p"/>
-				</zeroOrMore>
-			</element>
-			<element name="form:formatted-text">
-				<ref name="form-formatted-text-attlist"/>
-				<ref name="common-form-control-content"/>
-			</element>
-			<element name="form:number">
-				<ref name="form-number-attlist"/>
-				<ref name="common-numeric-control-attlist"/>
-				<ref name="common-form-control-content"/>
-				<ref name="common-linked-cell"/>
-				<ref name="common-spin-button"/>
-				<ref name="common-repeat"/>
-				<ref name="common-delay-for-repeat"/>
-			</element>
-			<element name="form:date">
-				<ref name="form-date-attlist"/>
-				<ref name="common-numeric-control-attlist"/>
-				<ref name="common-form-control-content"/>
-				<ref name="common-linked-cell"/>
-				<ref name="common-spin-button"/>
-				<ref name="common-repeat"/>
-				<ref name="common-delay-for-repeat"/>
-			</element>
-			<element name="form:time">
-				<ref name="form-time-attlist"/>
-				<ref name="common-numeric-control-attlist"/>
-				<ref name="common-form-control-content"/>
-				<ref name="common-linked-cell"/>
-				<ref name="common-spin-button"/>
-				<ref name="common-repeat"/>
-				<ref name="common-delay-for-repeat"/>
-			</element>
-			<element name="form:combobox">
-				<ref name="form-combobox-attlist"/>
-				<ref name="common-form-control-content"/>
-				<zeroOrMore>
-					<ref name="form-item"/>
-				</zeroOrMore>
-			</element>
-			<element name="form:listbox">
-				<ref name="form-listbox-attlist"/>
-				<ref name="common-form-control-content"/>
-				<zeroOrMore>
-					<ref name="form-option"/>
-				</zeroOrMore>
-			</element>
-			<element name="form:checkbox">
-				<ref name="form-checkbox-attlist"/>
-				<ref name="common-form-control-content"/>
-			</element>
-		</choice>
-	</define>
-	<define name="controls">
-		<choice>
-			<ref name="column-controls"/>
-			<element name="form:password">
-				<ref name="form-password-attlist"/>
-				<ref name="common-form-control-content"/>
-			</element>
-			<element name="form:file">
-				<ref name="form-file-attlist"/>
-				<ref name="common-form-control-content"/>
-			</element>
-			<element name="form:fixed-text">
-				<ref name="form-fixed-text-attlist"/>
-				<ref name="common-form-control-content"/>
-			</element>
-			<element name="form:button">
-				<ref name="form-button-attlist"/>
-				<ref name="common-form-control-content"/>
-			</element>
-			<element name="form:image">
-				<ref name="form-image-attlist"/>
-				<ref name="common-form-control-content"/>
-			</element>
-			<element name="form:radio">
-				<ref name="form-radio-attlist"/>
-				<ref name="common-form-control-content"/>
-			</element>
-			<element name="form:frame">
-				<ref name="form-frame-attlist"/>
-				<ref name="common-form-control-content"/>
-			</element>
-			<element name="form:image-frame">
-				<ref name="form-image-frame-attlist"/>
-				<ref name="common-form-control-content"/>
-			</element>
-			<element name="form:hidden">
-				<ref name="form-hidden-attlist"/>
-				<ref name="common-form-control-content"/>
-			</element>
-			<element name="form:grid">
-				<ref name="form-grid-attlist"/>
-				<ref name="common-form-control-content"/>
-				<zeroOrMore>
-					<ref name="form-column"/>
-				</zeroOrMore>
-			</element>
-			<element name="form:value-range">
-				<ref name="form-value-range-attlist"/>
-				<ref name="common-form-control-content"/>
-			</element>
-			<element name="form:generic-control">
-				<ref name="form-generic-control-attlist"/>
-				<ref name="common-form-control-content"/>
-			</element>
-		</choice>
-	</define>
-	<define name="form-text-attlist">
-		<ref name="form-control-attlist"/>
-		<ref name="common-current-value-attlist"/>
-		<ref name="common-disabled-attlist"/>
-		<ref name="common-maxlength-attlist"/>
-		<ref name="common-printable-attlist"/>
-		<ref name="common-readonly-attlist"/>
-		<ref name="common-tab-attlist"/>
-		<ref name="common-title-attlist"/>
-		<ref name="common-value-attlist"/>
-		<ref name="common-convert-empty-attlist"/>
-		<ref name="common-data-field-attlist"/>
-		<ref name="common-linked-cell"/>
-	</define>
-	<define name="form-control-attlist">
-		<ref name="common-form-control-attlist"/>
-		<ref name="common-control-id-attlist"/>
-		<ref name="xforms-bind-attlist"/>
-	</define>
-	<define name="common-form-control-content">
-		<optional>
-			<ref name="form-properties"/>
-		</optional>
-		<optional>
-			<ref name="office-event-listeners"/>
-		</optional>
-	</define>
-	<define name="form-textarea-attlist">
-		<ref name="form-control-attlist"/>
-		<ref name="common-current-value-attlist"/>
-		<ref name="common-disabled-attlist"/>
-		<ref name="common-maxlength-attlist"/>
-		<ref name="common-printable-attlist"/>
-		<ref name="common-readonly-attlist"/>
-		<ref name="common-tab-attlist"/>
-		<ref name="common-title-attlist"/>
-		<ref name="common-value-attlist"/>
-		<ref name="common-convert-empty-attlist"/>
-		<ref name="common-data-field-attlist"/>
-		<ref name="common-linked-cell"/>
-	</define>
-	<define name="form-password-attlist">
-		<interleave>
-			<ref name="form-control-attlist"/>
-			<ref name="common-disabled-attlist"/>
-			<ref name="common-maxlength-attlist"/>
-			<ref name="common-printable-attlist"/>
-			<ref name="common-tab-attlist"/>
-			<ref name="common-title-attlist"/>
-			<ref name="common-value-attlist"/>
-			<ref name="common-convert-empty-attlist"/>
-			<ref name="common-linked-cell"/>
-			<optional>
-				<attribute name="form:echo-char">
-					<ref name="character"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="form-file-attlist">
-		<ref name="form-control-attlist"/>
-		<ref name="common-current-value-attlist"/>
-		<ref name="common-disabled-attlist"/>
-		<ref name="common-maxlength-attlist"/>
-		<ref name="common-printable-attlist"/>
-		<ref name="common-readonly-attlist"/>
-		<ref name="common-tab-attlist"/>
-		<ref name="common-title-attlist"/>
-		<ref name="common-value-attlist"/>
-		<ref name="common-linked-cell"/>
-	</define>
-	<define name="form-formatted-text-attlist">
-		<interleave>
-			<ref name="form-control-attlist"/>
-			<ref name="common-current-value-attlist"/>
-			<ref name="common-disabled-attlist"/>
-			<ref name="common-maxlength-attlist"/>
-			<ref name="common-printable-attlist"/>
-			<ref name="common-readonly-attlist"/>
-			<ref name="common-tab-attlist"/>
-			<ref name="common-title-attlist"/>
-			<ref name="common-value-attlist"/>
-			<ref name="common-convert-empty-attlist"/>
-			<ref name="common-data-field-attlist"/>
-			<ref name="common-linked-cell"/>
-			<ref name="common-spin-button"/>
-			<ref name="common-repeat"/>
-			<ref name="common-delay-for-repeat"/>
-			<optional>
-				<attribute name="form:max-value">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="form:min-value">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="form:validation">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="common-numeric-control-attlist">
-		<ref name="form-control-attlist"/>
-		<ref name="common-disabled-attlist"/>
-		<ref name="common-maxlength-attlist"/>
-		<ref name="common-printable-attlist"/>
-		<ref name="common-readonly-attlist"/>
-		<ref name="common-tab-attlist"/>
-		<ref name="common-title-attlist"/>
-		<ref name="common-convert-empty-attlist"/>
-		<ref name="common-data-field-attlist"/>
-	</define>
-	<define name="form-number-attlist">
-		<interleave>
-			<optional>
-				<attribute name="form:value">
-					<ref name="double"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="form:current-value">
-					<ref name="double"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="form:min-value">
-					<ref name="double"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="form:max-value">
-					<ref name="double"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="form-date-attlist">
-		<interleave>
-			<optional>
-				<attribute name="form:value">
-					<ref name="date"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="form:current-value">
-					<ref name="date"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="form:min-value">
-					<ref name="date"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="form:max-value">
-					<ref name="date"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="form-time-attlist">
-		<interleave>
-			<optional>
-				<attribute name="form:value">
-					<ref name="time"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="form:current-value">
-					<ref name="time"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="form:min-value">
-					<ref name="time"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="form:max-value">
-					<ref name="time"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="form-fixed-text-attlist">
-		<interleave>
-			<ref name="form-control-attlist"/>
-			<ref name="for"/>
-			<ref name="common-disabled-attlist"/>
-			<ref name="label"/>
-			<ref name="common-printable-attlist"/>
-			<ref name="common-title-attlist"/>
-			<optional>
-				<attribute name="form:multi-line">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="form-combobox-attlist">
-		<interleave>
-			<ref name="form-control-attlist"/>
-			<ref name="common-current-value-attlist"/>
-			<ref name="common-disabled-attlist"/>
-			<ref name="dropdown"/>
-			<ref name="common-maxlength-attlist"/>
-			<ref name="common-printable-attlist"/>
-			<ref name="common-readonly-attlist"/>
-			<ref name="size"/>
-			<ref name="common-tab-attlist"/>
-			<ref name="common-title-attlist"/>
-			<ref name="common-value-attlist"/>
-			<ref name="common-convert-empty-attlist"/>
-			<ref name="common-data-field-attlist"/>
-			<ref name="list-source"/>
-			<ref name="list-source-type"/>
-			<ref name="common-linked-cell"/>
-			<ref name="common-source-cell-range"/>
-			<optional>
-				<attribute name="form:auto-complete">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="form-item">
-		<element name="form:item">
-			<ref name="form-item-attlist"/>
-			<text/>
-		</element>
-	</define>
-	<define name="form-item-attlist">
-		<ref name="label"/>
-	</define>
-	<define name="form-listbox-attlist">
-		<interleave>
-			<ref name="form-control-attlist"/>
-			<ref name="common-disabled-attlist"/>
-			<ref name="dropdown"/>
-			<ref name="common-printable-attlist"/>
-			<ref name="size"/>
-			<ref name="common-tab-attlist"/>
-			<ref name="common-title-attlist"/>
-			<ref name="bound-column"/>
-			<ref name="common-data-field-attlist"/>
-			<ref name="list-source"/>
-			<ref name="list-source-type"/>
-			<ref name="common-linked-cell"/>
-			<ref name="list-linkage-type"/>
-			<ref name="common-source-cell-range"/>
-			<optional>
-				<attribute name="form:multiple">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="form:xforms-list-source">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="list-linkage-type">
-		<optional>
-			<attribute name="form:list-linkage-type">
-				<choice>
-					<value>selection</value>
-					<value>selection-indices</value>
-				</choice>
-			</attribute>
-		</optional>
-	</define>
-	<define name="form-option">
-		<element name="form:option">
-			<ref name="form-option-attlist"/>
-			<text/>
-		</element>
-	</define>
-	<define name="form-option-attlist">
-		<ref name="current-selected"/>
-		<ref name="selected"/>
-		<ref name="label"/>
-		<ref name="common-value-attlist"/>
-	</define>
-	<define name="form-button-attlist">
-		<interleave>
-			<ref name="form-control-attlist"/>
-			<ref name="button-type"/>
-			<ref name="common-disabled-attlist"/>
-			<ref name="label"/>
-			<ref name="image-data"/>
-			<ref name="common-printable-attlist"/>
-			<ref name="common-tab-attlist"/>
-			<ref name="target-frame"/>
-			<ref name="target-location"/>
-			<ref name="common-title-attlist"/>
-			<ref name="common-value-attlist"/>
-			<ref name="common-form-relative-image-position-attlist"/>
-			<ref name="common-repeat"/>
-			<ref name="common-delay-for-repeat"/>
-			<optional>
-				<attribute name="form:default-button">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="form:toggle">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="form:focus-on-click">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="form:xforms-submission">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="form-image-attlist">
-		<ref name="form-control-attlist"/>
-		<ref name="button-type"/>
-		<ref name="common-disabled-attlist"/>
-		<ref name="image-data"/>
-		<ref name="common-printable-attlist"/>
-		<ref name="common-tab-attlist"/>
-		<ref name="target-frame"/>
-		<ref name="target-location"/>
-		<ref name="common-title-attlist"/>
-		<ref name="common-value-attlist"/>
-	</define>
-	<define name="form-checkbox-attlist">
-		<interleave>
-			<ref name="form-control-attlist"/>
-			<ref name="common-disabled-attlist"/>
-			<ref name="label"/>
-			<ref name="common-printable-attlist"/>
-			<ref name="common-tab-attlist"/>
-			<ref name="common-title-attlist"/>
-			<ref name="common-value-attlist"/>
-			<ref name="common-data-field-attlist"/>
-			<ref name="common-form-visual-effect-attlist"/>
-			<ref name="common-form-relative-image-position-attlist"/>
-			<ref name="common-linked-cell"/>
-			<optional>
-				<attribute name="form:current-state">
-					<ref name="states"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="form:is-tristate">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="form:state">
-					<ref name="states"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="states">
-		<choice>
-			<value>unchecked</value>
-			<value>checked</value>
-			<value>unknown</value>
-		</choice>
-	</define>
-	<define name="form-radio-attlist">
-		<ref name="form-control-attlist"/>
-		<ref name="current-selected"/>
-		<ref name="common-disabled-attlist"/>
-		<ref name="label"/>
-		<ref name="common-printable-attlist"/>
-		<ref name="selected"/>
-		<ref name="common-tab-attlist"/>
-		<ref name="common-title-attlist"/>
-		<ref name="common-value-attlist"/>
-		<ref name="common-data-field-attlist"/>
-		<ref name="common-form-visual-effect-attlist"/>
-		<ref name="common-form-relative-image-position-attlist"/>
-		<ref name="common-linked-cell"/>
-	</define>
-	<define name="form-frame-attlist">
-		<ref name="form-control-attlist"/>
-		<ref name="common-disabled-attlist"/>
-		<ref name="for"/>
-		<ref name="label"/>
-		<ref name="common-printable-attlist"/>
-		<ref name="common-title-attlist"/>
-	</define>
-	<define name="form-image-frame-attlist">
-		<ref name="form-control-attlist"/>
-		<ref name="common-disabled-attlist"/>
-		<ref name="image-data"/>
-		<ref name="common-printable-attlist"/>
-		<ref name="common-readonly-attlist"/>
-		<ref name="common-title-attlist"/>
-		<ref name="common-data-field-attlist"/>
-	</define>
-	<define name="form-hidden-attlist">
-		<ref name="form-control-attlist"/>
-		<ref name="common-value-attlist"/>
-	</define>
-	<define name="form-grid-attlist">
-		<ref name="form-control-attlist"/>
-		<ref name="common-disabled-attlist"/>
-		<ref name="common-printable-attlist"/>
-		<ref name="common-tab-attlist"/>
-		<ref name="common-title-attlist"/>
-	</define>
-	<define name="form-column">
-		<element name="form:column">
-			<ref name="form-column-attlist"/>
-			<oneOrMore>
-				<ref name="column-controls"/>
-			</oneOrMore>
-		</element>
-	</define>
-	<define name="form-column-attlist">
-		<ref name="common-form-control-attlist"/>
-		<ref name="label"/>
-		<ref name="text-style-name"/>
-	</define>
-	<define name="text-style-name">
-		<optional>
-			<attribute name="form:text-style-name">
-				<ref name="styleNameRef"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="form-value-range-attlist">
-		<interleave>
-			<ref name="form-control-attlist"/>
-			<ref name="common-disabled-attlist"/>
-			<ref name="common-printable-attlist"/>
-			<ref name="common-tab-attlist"/>
-			<ref name="common-title-attlist"/>
-			<ref name="common-value-attlist"/>
-			<ref name="common-linked-cell"/>
-			<ref name="common-repeat"/>
-			<ref name="common-delay-for-repeat"/>
-			<optional>
-				<attribute name="form:max-value">
-					<ref name="integer"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="form:min-value">
-					<ref name="integer"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="form:step-size">
-					<ref name="positiveInteger"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="form:page-step-size">
-					<ref name="positiveInteger"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="form:orientation">
-					<choice>
-						<value>horizontal</value>
-						<value>vertical</value>
-					</choice>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="form-generic-control-attlist">
-		<ref name="form-control-attlist"/>
-	</define>
-	<define name="common-form-control-attlist">
-		<interleave>
-			<optional>
-				<attribute name="form:name">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="form:control-implementation">
-					<ref name="namespacedToken"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="xforms-bind-attlist">
-		<optional>
-			<attribute name="xforms:bind">
-				<ref name="string"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="types">
-		<choice>
-			<value>submit</value>
-			<value>reset</value>
-			<value>push</value>
-			<value>url</value>
-		</choice>
-	</define>
-	<define name="button-type">
-		<optional>
-			<attribute name="form:button-type">
-				<ref name="types"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="common-control-id-attlist">
-		<group>
-			<ref name="xml-id"/>
-			<optional>
-				<attribute name="form:id">
-					<ref name="NCName"/>
-				</attribute>
-			</optional>
-		</group>
-	</define>
-	<define name="current-selected">
-		<optional>
-			<attribute name="form:current-selected">
-				<ref name="boolean"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="common-value-attlist">
-		<optional>
-			<attribute name="form:value">
-				<ref name="string"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="common-current-value-attlist">
-		<optional>
-			<attribute name="form:current-value">
-				<ref name="string"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="common-disabled-attlist">
-		<optional>
-			<attribute name="form:disabled">
-				<ref name="boolean"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="dropdown">
-		<optional>
-			<attribute name="form:dropdown">
-				<ref name="boolean"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="for">
-		<optional>
-			<attribute name="form:for">
-				<ref name="string"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="image-data">
-		<optional>
-			<attribute name="form:image-data">
-				<ref name="anyIRI"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="label">
-		<optional>
-			<attribute name="form:label">
-				<ref name="string"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="common-maxlength-attlist">
-		<optional>
-			<attribute name="form:max-length">
-				<ref name="nonNegativeInteger"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="common-printable-attlist">
-		<optional>
-			<attribute name="form:printable">
-				<ref name="boolean"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="common-readonly-attlist">
-		<optional>
-			<attribute name="form:readonly">
-				<ref name="boolean"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="selected">
-		<optional>
-			<attribute name="form:selected">
-				<ref name="boolean"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="size">
-		<optional>
-			<attribute name="form:size">
-				<ref name="nonNegativeInteger"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="common-tab-attlist">
-		<interleave>
-			<optional>
-				<attribute name="form:tab-index">
-					<ref name="nonNegativeInteger"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="form:tab-stop">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="target-frame">
-		<optional>
-			<attribute name="office:target-frame">
-				<ref name="targetFrameName"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="target-location">
-		<optional>
-			<attribute name="xlink:href">
-				<ref name="anyIRI"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="common-title-attlist">
-		<optional>
-			<attribute name="form:title">
-				<ref name="string"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="common-form-visual-effect-attlist">
-		<optional>
-			<attribute name="form:visual-effect">
-				<choice>
-					<value>flat</value>
-					<value>3d</value>
-				</choice>
-			</attribute>
-		</optional>
-	</define>
-	<define name="common-form-relative-image-position-attlist">
-		<choice>
-			<optional>
-				<attribute name="form:image-position">
-					<value>center</value>
-				</attribute>
-			</optional>
-			<group>
-				<attribute name="form:image-position">
-					<choice>
-						<value>start</value>
-						<value>end</value>
-						<value>top</value>
-						<value>bottom</value>
-					</choice>
-				</attribute>
-				<optional>
-					<attribute name="form:image-align">
-						<choice>
-							<value>start</value>
-							<value>center</value>
-							<value>end</value>
-						</choice>
-					</attribute>
-				</optional>
-			</group>
-		</choice>
-	</define>
-	<define name="bound-column">
-		<optional>
-			<attribute name="form:bound-column">
-				<ref name="string"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="common-convert-empty-attlist">
-		<optional>
-			<attribute name="form:convert-empty-to-null">
-				<ref name="boolean"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="common-data-field-attlist">
-		<optional>
-			<attribute name="form:data-field">
-				<ref name="string"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="list-source">
-		<optional>
-			<attribute name="form:list-source">
-				<ref name="string"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="list-source-type">
-		<optional>
-			<attribute name="form:list-source-type">
-				<choice>
-					<value>table</value>
-					<value>query</value>
-					<value>sql</value>
-					<value>sql-pass-through</value>
-					<value>value-list</value>
-					<value>table-fields</value>
-				</choice>
-			</attribute>
-		</optional>
-	</define>
-	<define name="common-linked-cell">
-		<optional>
-			<attribute name="form:linked-cell">
-				<choice>
-					<ref name="cellAddress"/>
-					<ref name="string"/>
-				</choice>
-			</attribute>
-		</optional>
-	</define>
-	<define name="common-source-cell-range">
-		<optional>
-			<attribute name="form:source-cell-range">
-				<choice>
-					<ref name="cellRangeAddress"/>
-					<ref name="string"/>
-				</choice>
-			</attribute>
-		</optional>
-	</define>
-	<define name="common-spin-button">
-		<optional>
-			<attribute name="form:spin-button">
-				<ref name="boolean"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="common-repeat">
-		<optional>
-			<attribute name="form:repeat">
-				<ref name="boolean"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="common-delay-for-repeat">
-		<optional>
-			<attribute name="form:delay-for-repeat">
-				<ref name="duration"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="form-properties">
-		<element name="form:properties">
-			<oneOrMore>
-				<ref name="form-property"/>
-			</oneOrMore>
-		</element>
-	</define>
-	<define name="form-property">
-		<choice>
-			<element name="form:property">
-				<ref name="form-property-name"/>
-				<ref name="form-property-value-and-type-attlist"/>
-			</element>
-			<element name="form:list-property">
-				<ref name="form-property-name"/>
-				<ref name="form-property-type-and-value-list"/>
-			</element>
-		</choice>
-	</define>
-	<define name="form-property-name">
-		<attribute name="form:property-name">
-			<ref name="string"/>
-		</attribute>
-	</define>
-	<define name="form-property-value-and-type-attlist">
-		<choice>
-			<ref name="common-value-and-type-attlist"/>
-			<attribute name="office:value-type">
-				<value>void</value>
-			</attribute>
-		</choice>
-	</define>
-	<define name="form-property-type-and-value-list">
-		<choice>
-			<group>
-				<attribute name="office:value-type">
-					<value>float</value>
-				</attribute>
-				<zeroOrMore>
-					<element name="form:list-value">
-						<attribute name="office:value">
-							<ref name="double"/>
-						</attribute>
-					</element>
-				</zeroOrMore>
-			</group>
-			<group>
-				<attribute name="office:value-type">
-					<value>percentage</value>
-				</attribute>
-				<zeroOrMore>
-					<element name="form:list-value">
-						<attribute name="office:value">
-							<ref name="double"/>
-						</attribute>
-					</element>
-				</zeroOrMore>
-			</group>
-			<group>
-				<attribute name="office:value-type">
-					<value>currency</value>
-				</attribute>
-				<zeroOrMore>
-					<element name="form:list-value">
-						<attribute name="office:value">
-							<ref name="double"/>
-						</attribute>
-						<optional>
-							<attribute name="office:currency">
-								<ref name="string"/>
-							</attribute>
-						</optional>
-					</element>
-				</zeroOrMore>
-			</group>
-			<group>
-				<attribute name="office:value-type">
-					<value>date</value>
-				</attribute>
-				<zeroOrMore>
-					<element name="form:list-value">
-						<attribute name="office:date-value">
-							<ref name="dateOrDateTime"/>
-						</attribute>
-					</element>
-				</zeroOrMore>
-			</group>
-			<group>
-				<attribute name="office:value-type">
-					<value>time</value>
-				</attribute>
-				<zeroOrMore>
-					<element name="form:list-value">
-						<attribute name="office:time-value">
-							<ref name="duration"/>
-						</attribute>
-					</element>
-				</zeroOrMore>
-			</group>
-			<group>
-				<attribute name="office:value-type">
-					<value>boolean</value>
-				</attribute>
-				<zeroOrMore>
-					<element name="form:list-value">
-						<attribute name="office:boolean-value">
-							<ref name="boolean"/>
-						</attribute>
-					</element>
-				</zeroOrMore>
-			</group>
-			<group>
-				<attribute name="office:value-type">
-					<value>string</value>
-				</attribute>
-				<zeroOrMore>
-					<element name="form:list-value">
-						<attribute name="office:string-value">
-							<ref name="string"/>
-						</attribute>
-					</element>
-				</zeroOrMore>
-			</group>
-			<attribute name="office:value-type">
-				<value>void</value>
-			</attribute>
-		</choice>
-	</define>
-	<define name="office-annotation">
-		<element name="office:annotation">
-			<ref name="office-annotation-attlist"/>
-			<ref name="draw-caption-attlist"/>
-			<ref name="common-draw-position-attlist"/>
-			<ref name="common-draw-size-attlist"/>
-			<ref name="common-draw-shape-with-text-and-styles-attlist"/>
-			<optional>
-				<ref name="dc-creator"/>
-			</optional>
-			<optional>
-				<ref name="dc-date"/>
-			</optional>
-			<optional>
-				<ref name="meta-date-string"/>
-			</optional>
-			<zeroOrMore>
-				<choice>
-					<ref name="text-p"/>
-					<ref name="text-list"/>
-				</choice>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="office-annotation-end">
-		<element name="office:annotation-end">
-			<ref name="office-annotation-end-attlist"/>
-		</element>
-	</define>
-	<define name="office-annotation-attlist">
-		<interleave>
-			<optional>
-				<attribute name="office:display">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<ref name="common-office-annotation-name-attlist"/>
-			</optional>
-		</interleave>
-	</define>
-	<define name="office-annotation-end-attlist">
-		<ref name="common-office-annotation-name-attlist"/>
-	</define>
-	<define name="common-office-annotation-name-attlist">
-		<attribute name="office:name">
-			<ref name="string"/>
-		</attribute>
-	</define>
-	<define name="meta-date-string">
-		<element name="meta:date-string">
-			<ref name="string"/>
-		</element>
-	</define>
-	<define name="common-num-format-prefix-suffix-attlist">
-		<optional>
-			<attribute name="style:num-prefix">
-				<ref name="string"/>
-			</attribute>
-		</optional>
-		<optional>
-			<attribute name="style:num-suffix">
-				<ref name="string"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="common-num-format-attlist">
-		<choice>
-			<attribute name="style:num-format">
-				<choice>
-					<value>1</value>
-					<value>i</value>
-					<value>I</value>
-					<ref name="string"/>
-					<empty/>
-				</choice>
-			</attribute>
-			<group>
-				<attribute name="style:num-format">
-					<choice>
-						<value>a</value>
-						<value>A</value>
-					</choice>
-				</attribute>
-				<ref name="style-num-letter-sync-attlist"/>
-			</group>
-			<empty/>
-		</choice>
-	</define>
-	<define name="style-num-letter-sync-attlist">
-		<optional>
-			<attribute name="style:num-letter-sync">
-				<ref name="boolean"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="office-change-info">
-		<element name="office:change-info">
-			<ref name="dc-creator"/>
-			<ref name="dc-date"/>
-			<zeroOrMore>
-				<ref name="text-p"/>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="office-event-listeners">
-		<element name="office:event-listeners">
-			<zeroOrMore>
-				<choice>
-					<ref name="script-event-listener"/>
-					<ref name="presentation-event-listener"/>
-				</choice>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="script-event-listener">
-		<element name="script:event-listener">
-			<ref name="script-event-listener-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="script-event-listener-attlist">
-		<interleave>
-			<attribute name="script:event-name">
-				<ref name="string"/>
-			</attribute>
-			<attribute name="script:language">
-				<ref name="string"/>
-			</attribute>
-			<choice>
-				<attribute name="script:macro-name">
-					<ref name="string"/>
-				</attribute>
-				<group>
-					<attribute name="xlink:type">
-						<value>simple</value>
-					</attribute>
-					<attribute name="xlink:href">
-						<ref name="anyIRI"/>
-					</attribute>
-					<optional>
-						<attribute name="xlink:actuate">
-							<value>onRequest</value>
-						</attribute>
-					</optional>
-				</group>
-			</choice>
-		</interleave>
-	</define>
-	<define name="math-math">
-		<element name="math:math">
-			<ref name="mathMarkup"/>
-		</element>
-	</define>
-	<define name="mathMarkup">
-		<dc:description>To avoid inclusion of the complete MathML schema, anything is allowed within a math:math top-level element</dc:description>
-		<zeroOrMore>
-			<choice>
-				<attribute>
-					<anyName/>
-				</attribute>
-				<text/>
-				<element>
-					<anyName/>
-					<ref name="mathMarkup"/>
-				</element>
-			</choice>
-		</zeroOrMore>
-	</define>
-	<define name="text-dde-connection-decl">
-		<element name="text:dde-connection-decl">
-			<ref name="text-dde-connection-decl-attlist"/>
-			<ref name="common-dde-connection-decl-attlist"/>
-		</element>
-	</define>
-	<define name="text-dde-connection-decl-attlist">
-		<attribute name="office:name">
-			<ref name="string"/>
-		</attribute>
-	</define>
-	<define name="common-dde-connection-decl-attlist">
-		<interleave>
-			<attribute name="office:dde-application">
-				<ref name="string"/>
-			</attribute>
-			<attribute name="office:dde-topic">
-				<ref name="string"/>
-			</attribute>
-			<attribute name="office:dde-item">
-				<ref name="string"/>
-			</attribute>
-			<optional>
-				<attribute name="office:automatic-update">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="table-dde-link">
-		<element name="table:dde-link">
-			<ref name="office-dde-source"/>
-			<ref name="table-table"/>
-		</element>
-	</define>
-	<define name="office-dde-source">
-		<element name="office:dde-source">
-			<ref name="office-dde-source-attlist"/>
-			<ref name="common-dde-connection-decl-attlist"/>
-		</element>
-	</define>
-	<define name="office-dde-source-attlist">
-		<interleave>
-			<optional>
-				<attribute name="office:name">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="office:conversion-mode">
-					<choice>
-						<value>into-default-style-data-style</value>
-						<value>into-english-number</value>
-						<value>keep-text</value>
-					</choice>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="animation-element">
-		<choice>
-			<element name="anim:animate">
-				<ref name="common-anim-target-attlist"/>
-				<ref name="common-anim-named-target-attlist"/>
-				<ref name="common-anim-values-attlist"/>
-				<ref name="common-anim-spline-mode-attlist"/>
-				<ref name="common-spline-anim-value-attlist"/>
-				<ref name="common-timing-attlist"/>
-				<ref name="common-anim-add-accum-attlist"/>
-			</element>
-			<element name="anim:set">
-				<ref name="common-anim-target-attlist"/>
-				<ref name="common-anim-named-target-attlist"/>
-				<ref name="common-anim-set-values-attlist"/>
-				<ref name="common-timing-attlist"/>
-				<ref name="common-anim-add-accum-attlist"/>
-			</element>
-			<element name="anim:animateMotion">
-				<ref name="anim-animate-motion-attlist"/>
-				<ref name="common-anim-target-attlist"/>
-				<ref name="common-anim-named-target-attlist"/>
-				<ref name="common-anim-add-accum-attlist"/>
-				<ref name="common-anim-values-attlist"/>
-				<ref name="common-timing-attlist"/>
-				<ref name="common-spline-anim-value-attlist"/>
-			</element>
-			<element name="anim:animateColor">
-				<ref name="common-anim-target-attlist"/>
-				<ref name="common-anim-named-target-attlist"/>
-				<ref name="common-anim-add-accum-attlist"/>
-				<ref name="common-anim-values-attlist"/>
-				<ref name="common-anim-spline-mode-attlist"/>
-				<ref name="common-spline-anim-value-attlist"/>
-				<ref name="anim-animate-color-attlist"/>
-				<ref name="common-timing-attlist"/>
-			</element>
-			<element name="anim:animateTransform">
-				<ref name="common-anim-target-attlist"/>
-				<ref name="common-anim-named-target-attlist"/>
-				<ref name="common-anim-add-accum-attlist"/>
-				<ref name="common-anim-values-attlist"/>
-				<ref name="anim-animate-transform-attlist"/>
-				<ref name="common-timing-attlist"/>
-			</element>
-			<element name="anim:transitionFilter">
-				<ref name="common-anim-target-attlist"/>
-				<ref name="common-anim-add-accum-attlist"/>
-				<ref name="common-anim-values-attlist"/>
-				<ref name="common-anim-spline-mode-attlist"/>
-				<ref name="anim-transition-filter-attlist"/>
-				<ref name="common-timing-attlist"/>
-			</element>
-			<element name="anim:par">
-				<ref name="common-anim-attlist"/>
-				<ref name="common-timing-attlist"/>
-				<ref name="common-endsync-timing-attlist"/>
-				<zeroOrMore>
-					<ref name="animation-element"/>
-				</zeroOrMore>
-			</element>
-			<element name="anim:seq">
-				<ref name="common-anim-attlist"/>
-				<ref name="common-endsync-timing-attlist"/>
-				<ref name="common-timing-attlist"/>
-				<zeroOrMore>
-					<ref name="animation-element"/>
-				</zeroOrMore>
-			</element>
-			<element name="anim:iterate">
-				<ref name="common-anim-attlist"/>
-				<ref name="anim-iterate-attlist"/>
-				<ref name="common-timing-attlist"/>
-				<ref name="common-endsync-timing-attlist"/>
-				<zeroOrMore>
-					<ref name="animation-element"/>
-				</zeroOrMore>
-			</element>
-			<element name="anim:audio">
-				<ref name="common-anim-attlist"/>
-				<ref name="anim-audio-attlist"/>
-				<ref name="common-basic-timing-attlist"/>
-			</element>
-			<element name="anim:command">
-				<ref name="common-anim-attlist"/>
-				<ref name="anim-command-attlist"/>
-				<ref name="common-begin-end-timing-attlist"/>
-				<ref name="common-anim-target-attlist"/>
-				<zeroOrMore>
-					<element name="anim:param">
-						<attribute name="anim:name">
-							<ref name="string"/>
-						</attribute>
-						<attribute name="anim:value">
-							<ref name="string"/>
-						</attribute>
-					</element>
-				</zeroOrMore>
-			</element>
-		</choice>
-	</define>
-	<define name="anim-animate-motion-attlist">
-		<interleave>
-			<optional>
-				<attribute name="svg:path">
-					<ref name="pathData"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="svg:origin">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="smil:calcMode">
-					<choice>
-						<value>discrete</value>
-						<value>linear</value>
-						<value>paced</value>
-						<value>spline</value>
-					</choice>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="anim-animate-color-attlist">
-		<interleave>
-			<optional>
-				<attribute name="anim:color-interpolation">
-					<choice>
-						<value>rgb</value>
-						<value>hsl</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="anim:color-interpolation-direction">
-					<choice>
-						<value>clockwise</value>
-						<value>counter-clockwise</value>
-					</choice>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="anim-animate-transform-attlist">
-		<attribute name="svg:type">
-			<choice>
-				<value>translate</value>
-				<value>scale</value>
-				<value>rotate</value>
-				<value>skewX</value>
-				<value>skewY</value>
-			</choice>
-		</attribute>
-	</define>
-	<define name="anim-transition-filter-attlist">
-		<interleave>
-			<attribute name="smil:type">
-				<ref name="string"/>
-			</attribute>
-			<optional>
-				<attribute name="smil:subtype">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="smil:direction">
-					<choice>
-						<value>forward</value>
-						<value>reverse</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="smil:fadeColor">
-					<ref name="color"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="smil:mode">
-					<choice>
-						<value>in</value>
-						<value>out</value>
-					</choice>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="common-anim-target-attlist">
-		<interleave>
-			<optional>
-				<attribute name="smil:targetElement">
-					<ref name="IDREF"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="anim:sub-item">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="common-anim-named-target-attlist">
-		<attribute name="smil:attributeName">
-			<ref name="string"/>
-		</attribute>
-	</define>
-	<define name="common-anim-values-attlist">
-		<interleave>
-			<optional>
-				<attribute name="smil:values">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="anim:formula">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<ref name="common-anim-set-values-attlist"/>
-			<optional>
-				<attribute name="smil:from">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="smil:by">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="common-anim-spline-mode-attlist">
-		<optional>
-			<attribute name="smil:calcMode">
-				<choice>
-					<value>discrete</value>
-					<value>linear</value>
-					<value>paced</value>
-					<value>spline</value>
-				</choice>
-			</attribute>
-		</optional>
-	</define>
-	<define name="common-spline-anim-value-attlist">
-		<interleave>
-			<optional>
-				<attribute name="smil:keyTimes">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="smil:keySplines">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="common-anim-add-accum-attlist">
-		<interleave>
-			<optional>
-				<attribute name="smil:accumulate">
-					<choice>
-						<value>none</value>
-						<value>sum</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="smil:additive">
-					<choice>
-						<value>replace</value>
-						<value>sum</value>
-					</choice>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="common-anim-set-values-attlist">
-		<optional>
-			<attribute name="smil:to">
-				<ref name="string"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="common-begin-end-timing-attlist">
-		<interleave>
-			<optional>
-				<attribute name="smil:begin">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="smil:end">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="common-dur-timing-attlist">
-		<optional>
-			<attribute name="smil:dur">
-				<ref name="string"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="common-endsync-timing-attlist">
-		<optional>
-			<attribute name="smil:endsync">
-				<choice>
-					<value>first</value>
-					<value>last</value>
-					<value>all</value>
-					<value>media</value>
-					<ref name="IDREF"/>
-				</choice>
-			</attribute>
-		</optional>
-	</define>
-	<define name="common-repeat-timing-attlist">
-		<optional>
-			<attribute name="smil:repeatDur">
-				<ref name="string"/>
-			</attribute>
-		</optional>
-		<optional>
-			<attribute name="smil:repeatCount">
-				<choice>
-					<ref name="nonNegativeDecimal"/>
-					<value>indefinite</value>
-				</choice>
-			</attribute>
-		</optional>
-	</define>
-	<define name="nonNegativeDecimal">
-		<data type="decimal">
-			<param name="minInclusive">0.0</param>
-		</data>
-	</define>
-	<define name="common-fill-timing-attlist">
-		<optional>
-			<attribute name="smil:fill">
-				<choice>
-					<value>remove</value>
-					<value>freeze</value>
-					<value>hold</value>
-					<value>auto</value>
-					<value>default</value>
-					<value>transition</value>
-				</choice>
-			</attribute>
-		</optional>
-	</define>
-	<define name="common-fill-default-attlist">
-		<optional>
-			<attribute name="smil:fillDefault">
-				<choice>
-					<value>remove</value>
-					<value>freeze</value>
-					<value>hold</value>
-					<value>transition</value>
-					<value>auto</value>
-					<value>inherit</value>
-				</choice>
-			</attribute>
-		</optional>
-	</define>
-	<define name="common-restart-timing-attlist">
-		<optional>
-			<attribute name="smil:restart">
-				<choice>
-					<value>never</value>
-					<value>always</value>
-					<value>whenNotActive</value>
-					<value>default</value>
-				</choice>
-			</attribute>
-		</optional>
-	</define>
-	<define name="common-restart-default-attlist">
-		<optional>
-			<attribute name="smil:restartDefault">
-				<choice>
-					<value>never</value>
-					<value>always</value>
-					<value>whenNotActive</value>
-					<value>inherit</value>
-				</choice>
-			</attribute>
-		</optional>
-	</define>
-	<define name="common-time-manip-attlist">
-		<interleave>
-			<optional>
-				<attribute name="smil:accelerate">
-					<ref name="zeroToOneDecimal"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="smil:decelerate">
-					<ref name="zeroToOneDecimal"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="smil:autoReverse">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="zeroToOneDecimal">
-		<data type="decimal">
-			<param name="minInclusive">0</param>
-			<param name="maxInclusive">1</param>
-		</data>
-	</define>
-	<define name="common-basic-timing-attlist">
-		<ref name="common-begin-end-timing-attlist"/>
-		<ref name="common-dur-timing-attlist"/>
-		<ref name="common-repeat-timing-attlist"/>
-		<ref name="common-restart-timing-attlist"/>
-		<ref name="common-restart-default-attlist"/>
-		<ref name="common-fill-timing-attlist"/>
-		<ref name="common-fill-default-attlist"/>
-	</define>
-	<define name="common-timing-attlist">
-		<ref name="common-basic-timing-attlist"/>
-		<ref name="common-time-manip-attlist"/>
-	</define>
-	<define name="anim-iterate-attlist">
-		<interleave>
-			<ref name="common-anim-target-attlist"/>
-			<optional>
-				<attribute name="anim:iterate-type">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="anim:iterate-interval">
-					<ref name="duration"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="anim-audio-attlist">
-		<interleave>
-			<optional>
-				<attribute name="xlink:href">
-					<ref name="anyIRI"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="anim:audio-level">
-					<ref name="double"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="anim-command-attlist">
-		<attribute name="anim:command">
-			<ref name="string"/>
-		</attribute>
-	</define>
-	<define name="style-style">
-		<element name="style:style">
-			<ref name="style-style-attlist"/>
-			<ref name="style-style-content"/>
-			<zeroOrMore>
-				<ref name="style-map"/>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="common-in-content-meta-attlist">
-		<attribute name="xhtml:about">
-			<ref name="URIorSafeCURIE"/>
-		</attribute>
-		<attribute name="xhtml:property">
-			<ref name="CURIEs"/>
-		</attribute>
-		<ref name="common-meta-literal-attlist"/>
-	</define>
-	<define name="common-meta-literal-attlist">
-		<optional>
-			<attribute name="xhtml:datatype">
-				<ref name="CURIE"/>
-			</attribute>
-		</optional>
-		<optional>
-			<attribute name="xhtml:content">
-				<ref name="string"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="xml-id">
-		<attribute name="xml:id">
-			<ref name="ID"/>
-		</attribute>
-	</define>
-	<define name="style-style-attlist">
-		<interleave>
-			<attribute name="style:name">
-				<ref name="styleName"/>
-			</attribute>
-			<optional>
-				<attribute name="style:display-name">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:parent-style-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:next-style-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:list-level">
-					<choice>
-						<ref name="positiveInteger"/>
-						<empty/>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:list-style-name">
-					<choice>
-						<ref name="styleName"/>
-						<empty/>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:master-page-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:auto-update">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:data-style-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:percentage-data-style-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:class">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:default-outline-level">
-					<choice>
-						<ref name="positiveInteger"/>
-						<empty/>
-					</choice>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="style-map">
-		<element name="style:map">
-			<ref name="style-map-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="style-map-attlist">
-		<interleave>
-			<attribute name="style:condition">
-				<ref name="string"/>
-			</attribute>
-			<attribute name="style:apply-style-name">
-				<ref name="styleNameRef"/>
-			</attribute>
-			<optional>
-				<attribute name="style:base-cell-address">
-					<ref name="cellAddress"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="style-default-style">
-		<element name="style:default-style">
-			<ref name="style-style-content"/>
-		</element>
-	</define>
-	<define name="style-page-layout">
-		<element name="style:page-layout">
-			<ref name="style-page-layout-attlist"/>
-			<ref name="style-page-layout-content"/>
-		</element>
-	</define>
-	<define name="style-page-layout-content">
-		<optional>
-			<ref name="style-page-layout-properties"/>
-		</optional>
-		<optional>
-			<ref name="style-header-style"/>
-		</optional>
-		<optional>
-			<ref name="style-footer-style"/>
-		</optional>
-	</define>
-	<define name="style-page-layout-attlist">
-		<interleave>
-			<attribute name="style:name">
-				<ref name="styleName"/>
-			</attribute>
-			<optional>
-				<attribute name="style:page-usage">
-					<choice>
-						<value>all</value>
-						<value>left</value>
-						<value>right</value>
-						<value>mirrored</value>
-					</choice>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="style-header-style">
-		<element name="style:header-style">
-			<optional>
-				<ref name="style-header-footer-properties"/>
-			</optional>
-		</element>
-	</define>
-	<define name="style-footer-style">
-		<element name="style:footer-style">
-			<optional>
-				<ref name="style-header-footer-properties"/>
-			</optional>
-		</element>
-	</define>
-	<define name="style-default-page-layout">
-		<element name="style:default-page-layout">
-			<ref name="style-page-layout-content"/>
-		</element>
-	</define>
-	<define name="style-master-page">
-		<element name="style:master-page">
-			<ref name="style-master-page-attlist"/>
-			<optional>
-				<ref name="style-header"/>
-				<optional>
-					<ref name="style-header-left"/>
-				</optional>
-			</optional>
-			<optional>
-				<ref name="style-footer"/>
-				<optional>
-					<ref name="style-footer-left"/>
-				</optional>
-			</optional>
-			<optional>
-				<ref name="draw-layer-set"/>
-			</optional>
-			<optional>
-				<ref name="office-forms"/>
-			</optional>
-			<zeroOrMore>
-				<ref name="shape"/>
-			</zeroOrMore>
-			<optional>
-				<ref name="animation-element"/>
-			</optional>
-			<optional>
-				<ref name="presentation-notes"/>
-			</optional>
-		</element>
-	</define>
-	<define name="style-master-page-attlist">
-		<interleave>
-			<attribute name="style:name">
-				<ref name="styleName"/>
-			</attribute>
-			<optional>
-				<attribute name="style:display-name">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<attribute name="style:page-layout-name">
-				<ref name="styleNameRef"/>
-			</attribute>
-			<optional>
-				<attribute name="draw:style-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:next-style-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="style-header">
-		<element name="style:header">
-			<ref name="common-style-header-footer-attlist"/>
-			<ref name="header-footer-content"/>
-		</element>
-	</define>
-	<define name="style-footer">
-		<element name="style:footer">
-			<ref name="common-style-header-footer-attlist"/>
-			<ref name="header-footer-content"/>
-		</element>
-	</define>
-	<define name="style-header-left">
-		<element name="style:header-left">
-			<ref name="common-style-header-footer-attlist"/>
-			<ref name="header-footer-content"/>
-		</element>
-	</define>
-	<define name="style-footer-left">
-		<element name="style:footer-left">
-			<ref name="common-style-header-footer-attlist"/>
-			<ref name="header-footer-content"/>
-		</element>
-	</define>
-	<define name="header-footer-content">
-		<choice>
-			<group>
-				<ref name="text-tracked-changes"/>
-				<ref name="text-decls"/>
-				<zeroOrMore>
-					<choice>
-						<ref name="text-h"/>
-						<ref name="text-p"/>
-						<ref name="text-list"/>
-						<ref name="table-table"/>
-						<ref name="text-section"/>
-						<ref name="text-table-of-content"/>
-						<ref name="text-illustration-index"/>
-						<ref name="text-table-index"/>
-						<ref name="text-object-index"/>
-						<ref name="text-user-index"/>
-						<ref name="text-alphabetical-index"/>
-						<ref name="text-bibliography"/>
-						<ref name="text-index-title"/>
-						<ref name="change-marks"/>
-					</choice>
-				</zeroOrMore>
-			</group>
-			<group>
-				<optional>
-					<ref name="style-region-left"/>
-				</optional>
-				<optional>
-					<ref name="style-region-center"/>
-				</optional>
-				<optional>
-					<ref name="style-region-right"/>
-				</optional>
-			</group>
-		</choice>
-	</define>
-	<define name="common-style-header-footer-attlist">
-		<optional>
-			<attribute name="style:display">
-				<ref name="boolean"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="style-region-left">
-		<element name="style:region-left">
-			<ref name="region-content"/>
-		</element>
-	</define>
-	<define name="style-region-center">
-		<element name="style:region-center">
-			<ref name="region-content"/>
-		</element>
-	</define>
-	<define name="style-region-right">
-		<element name="style:region-right">
-			<ref name="region-content"/>
-		</element>
-	</define>
-	<define name="region-content">
-		<zeroOrMore>
-			<ref name="text-p"/>
-		</zeroOrMore>
-	</define>
-	<define name="presentation-notes">
-		<element name="presentation:notes">
-			<ref name="common-presentation-header-footer-attlist"/>
-			<ref name="presentation-notes-attlist"/>
-			<ref name="office-forms"/>
-			<zeroOrMore>
-				<ref name="shape"/>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="presentation-notes-attlist">
-		<interleave>
-			<optional>
-				<attribute name="style:page-layout-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:style-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="table-table-template">
-		<element name="table:table-template">
-			<ref name="table-table-template-attlist"/>
-			<optional>
-				<ref name="table-first-row"/>
-			</optional>
-			<optional>
-				<ref name="table-last-row"/>
-			</optional>
-			<optional>
-				<ref name="table-first-column"/>
-			</optional>
-			<optional>
-				<ref name="table-last-column"/>
-			</optional>
-			<ref name="table-body"/>
-			<optional>
-				<ref name="table-even-rows"/>
-			</optional>
-			<optional>
-				<ref name="table-odd-rows"/>
-			</optional>
-			<optional>
-				<ref name="table-even-columns"/>
-			</optional>
-			<optional>
-				<ref name="table-odd-columns"/>
-			</optional>
-			<optional>
-				<ref name="table-background"/>
-			</optional>
-		</element>
-	</define>
-	<define name="table-table-template-attlist">
-		<interleave>
-			<attribute name="table:name">
-				<ref name="string"/>
-			</attribute>
-			<attribute name="table:first-row-start-column">
-				<ref name="rowOrCol"/>
-			</attribute>
-			<attribute name="table:first-row-end-column">
-				<ref name="rowOrCol"/>
-			</attribute>
-			<attribute name="table:last-row-start-column">
-				<ref name="rowOrCol"/>
-			</attribute>
-			<attribute name="table:last-row-end-column">
-				<ref name="rowOrCol"/>
-			</attribute>
-		</interleave>
-	</define>
-	<define name="rowOrCol">
-		<choice>
-			<value>row</value>
-			<value>column</value>
-		</choice>
-	</define>
-	<define name="table-first-row">
-		<element name="table:first-row">
-			<ref name="common-table-template-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="table-last-row">
-		<element name="table:last-row">
-			<ref name="common-table-template-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="table-first-column">
-		<element name="table:first-column">
-			<ref name="common-table-template-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="table-last-column">
-		<element name="table:last-column">
-			<ref name="common-table-template-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="table-body">
-		<element name="table:body">
-			<ref name="common-table-template-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="table-even-rows">
-		<element name="table:even-rows">
-			<ref name="common-table-template-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="table-odd-rows">
-		<element name="table:odd-rows">
-			<ref name="common-table-template-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="table-even-columns">
-		<element name="table:even-columns">
-			<ref name="common-table-template-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="table-odd-columns">
-		<element name="table:odd-columns">
-			<ref name="common-table-template-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="common-table-template-attlist">
-		<attribute name="table:style-name">
-			<ref name="styleNameRef"/>
-		</attribute>
-		<optional>
-			<attribute name="table:paragraph-style-name">
-				<ref name="styleNameRef"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="table-background">
-		<element name="table:background">
-			<ref name="table-background-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="table-background-attlist">
-		<attribute name="table:style-name">
-			<ref name="styleNameRef"/>
-		</attribute>
-	</define>
-	<define name="style-font-face">
-		<element name="style:font-face">
-			<ref name="style-font-face-attlist"/>
-			<optional>
-				<ref name="svg-font-face-src"/>
-			</optional>
-			<optional>
-				<ref name="svg-definition-src"/>
-			</optional>
-		</element>
-	</define>
-	<define name="style-font-face-attlist">
-		<interleave>
-			<optional>
-				<attribute name="svg:font-family">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="svg:font-style">
-					<ref name="fontStyle"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="svg:font-variant">
-					<ref name="fontVariant"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="svg:font-weight">
-					<ref name="fontWeight"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="svg:font-stretch">
-					<choice>
-						<value>normal</value>
-						<value>ultra-condensed</value>
-						<value>extra-condensed</value>
-						<value>condensed</value>
-						<value>semi-condensed</value>
-						<value>semi-expanded</value>
-						<value>expanded</value>
-						<value>extra-expanded</value>
-						<value>ultra-expanded</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="svg:font-size">
-					<ref name="positiveLength"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="svg:unicode-range">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="svg:units-per-em">
-					<ref name="integer"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="svg:panose-1">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="svg:stemv">
-					<ref name="integer"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="svg:stemh">
-					<ref name="integer"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="svg:slope">
-					<ref name="integer"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="svg:cap-height">
-					<ref name="integer"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="svg:x-height">
-					<ref name="integer"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="svg:accent-height">
-					<ref name="integer"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="svg:ascent">
-					<ref name="integer"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="svg:descent">
-					<ref name="integer"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="svg:widths">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="svg:bbox">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="svg:ideographic">
-					<ref name="integer"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="svg:alphabetic">
-					<ref name="integer"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="svg:mathematical">
-					<ref name="integer"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="svg:hanging">
-					<ref name="integer"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="svg:v-ideographic">
-					<ref name="integer"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="svg:v-alphabetic">
-					<ref name="integer"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="svg:v-mathematical">
-					<ref name="integer"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="svg:v-hanging">
-					<ref name="integer"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="svg:underline-position">
-					<ref name="integer"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="svg:underline-thickness">
-					<ref name="integer"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="svg:strikethrough-position">
-					<ref name="integer"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="svg:strikethrough-thickness">
-					<ref name="integer"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="svg:overline-position">
-					<ref name="integer"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="svg:overline-thickness">
-					<ref name="integer"/>
-				</attribute>
-			</optional>
-			<attribute name="style:name">
-				<ref name="string"/>
-			</attribute>
-			<optional>
-				<attribute name="style:font-adornments">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:font-family-generic">
-					<ref name="fontFamilyGeneric"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:font-pitch">
-					<ref name="fontPitch"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:font-charset">
-					<ref name="textEncoding"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="svg-font-face-src">
-		<element name="svg:font-face-src">
-			<oneOrMore>
-				<choice>
-					<ref name="svg-font-face-uri"/>
-					<ref name="svg-font-face-name"/>
-				</choice>
-			</oneOrMore>
-		</element>
-	</define>
-	<define name="svg-font-face-uri">
-		<element name="svg:font-face-uri">
-			<ref name="common-svg-font-face-xlink-attlist"/>
-			<zeroOrMore>
-				<ref name="svg-font-face-format"/>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="svg-font-face-format">
-		<element name="svg:font-face-format">
-			<optional>
-				<attribute name="svg:string">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<empty/>
-		</element>
-	</define>
-	<define name="svg-font-face-name">
-		<element name="svg:font-face-name">
-			<optional>
-				<attribute name="svg:name">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<empty/>
-		</element>
-	</define>
-	<define name="svg-definition-src">
-		<element name="svg:definition-src">
-			<ref name="common-svg-font-face-xlink-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="common-svg-font-face-xlink-attlist">
-		<attribute name="xlink:type">
-			<value>simple</value>
-		</attribute>
-		<attribute name="xlink:href">
-			<ref name="anyIRI"/>
-		</attribute>
-		<optional>
-			<attribute name="xlink:actuate">
-				<value>onRequest</value>
-			</attribute>
-		</optional>
-	</define>
-	<define name="number-number-style">
-		<element name="number:number-style">
-			<ref name="common-data-style-attlist"/>
-			<optional>
-				<ref name="style-text-properties"/>
-			</optional>
-			<optional>
-				<ref name="number-text"/>
-			</optional>
-			<optional>
-				<ref name="any-number"/>
-				<optional>
-					<ref name="number-text"/>
-				</optional>
-			</optional>
-			<zeroOrMore>
-				<ref name="style-map"/>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="any-number">
-		<choice>
-			<ref name="number-number"/>
-			<ref name="number-scientific-number"/>
-			<ref name="number-fraction"/>
-		</choice>
-	</define>
-	<define name="number-number">
-		<element name="number:number">
-			<ref name="number-number-attlist"/>
-			<ref name="common-decimal-places-attlist"/>
-			<ref name="common-number-attlist"/>
-			<zeroOrMore>
-				<ref name="number-embedded-text"/>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="number-number-attlist">
-		<interleave>
-			<optional>
-				<attribute name="number:decimal-replacement">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="number:display-factor">
-					<ref name="double"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="number-embedded-text">
-		<element name="number:embedded-text">
-			<ref name="number-embedded-text-attlist"/>
-			<text/>
-		</element>
-	</define>
-	<define name="number-embedded-text-attlist">
-		<attribute name="number:position">
-			<ref name="integer"/>
-		</attribute>
-	</define>
-	<define name="number-scientific-number">
-		<element name="number:scientific-number">
-			<ref name="number-scientific-number-attlist"/>
-			<ref name="common-decimal-places-attlist"/>
-			<ref name="common-number-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="number-scientific-number-attlist">
-		<optional>
-			<attribute name="number:min-exponent-digits">
-				<ref name="integer"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="number-fraction">
-		<element name="number:fraction">
-			<ref name="number-fraction-attlist"/>
-			<ref name="common-number-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="number-fraction-attlist">
-		<interleave>
-			<optional>
-				<attribute name="number:min-numerator-digits">
-					<ref name="integer"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="number:min-denominator-digits">
-					<ref name="integer"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="number:denominator-value">
-					<ref name="integer"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="number-currency-style">
-		<element name="number:currency-style">
-			<ref name="common-data-style-attlist"/>
-			<ref name="common-auto-reorder-attlist"/>
-			<optional>
-				<ref name="style-text-properties"/>
-			</optional>
-			<optional>
-				<ref name="number-text"/>
-			</optional>
-			<optional>
-				<choice>
-					<group>
-						<ref name="number-and-text"/>
-						<optional>
-							<ref name="currency-symbol-and-text"/>
-						</optional>
-					</group>
-					<group>
-						<ref name="currency-symbol-and-text"/>
-						<optional>
-							<ref name="number-and-text"/>
-						</optional>
-					</group>
-				</choice>
-			</optional>
-			<zeroOrMore>
-				<ref name="style-map"/>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="currency-symbol-and-text">
-		<ref name="number-currency-symbol"/>
-		<optional>
-			<ref name="number-text"/>
-		</optional>
-	</define>
-	<define name="number-and-text">
-		<ref name="number-number"/>
-		<optional>
-			<ref name="number-text"/>
-		</optional>
-	</define>
-	<define name="number-currency-symbol">
-		<element name="number:currency-symbol">
-			<ref name="number-currency-symbol-attlist"/>
-			<text/>
-		</element>
-	</define>
-	<define name="number-currency-symbol-attlist">
-		<optional>
-			<attribute name="number:language">
-				<ref name="languageCode"/>
-			</attribute>
-		</optional>
-		<optional>
-			<attribute name="number:country">
-				<ref name="countryCode"/>
-			</attribute>
-		</optional>
-		<optional>
-			<attribute name="number:script">
-				<ref name="scriptCode"/>
-			</attribute>
-		</optional>
-		<optional>
-			<attribute name="number:rfc-language-tag">
-				<ref name="language"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="number-percentage-style">
-		<element name="number:percentage-style">
-			<ref name="common-data-style-attlist"/>
-			<optional>
-				<ref name="style-text-properties"/>
-			</optional>
-			<optional>
-				<ref name="number-text"/>
-			</optional>
-			<optional>
-				<ref name="number-and-text"/>
-			</optional>
-			<zeroOrMore>
-				<ref name="style-map"/>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="number-date-style">
-		<element name="number:date-style">
-			<ref name="common-data-style-attlist"/>
-			<ref name="common-auto-reorder-attlist"/>
-			<ref name="common-format-source-attlist"/>
-			<optional>
-				<ref name="style-text-properties"/>
-			</optional>
-			<optional>
-				<ref name="number-text"/>
-			</optional>
-			<oneOrMore>
-				<ref name="any-date"/>
-				<optional>
-					<ref name="number-text"/>
-				</optional>
-			</oneOrMore>
-			<zeroOrMore>
-				<ref name="style-map"/>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="any-date">
-		<choice>
-			<ref name="number-day"/>
-			<ref name="number-month"/>
-			<ref name="number-year"/>
-			<ref name="number-era"/>
-			<ref name="number-day-of-week"/>
-			<ref name="number-week-of-year"/>
-			<ref name="number-quarter"/>
-			<ref name="number-hours"/>
-			<ref name="number-am-pm"/>
-			<ref name="number-minutes"/>
-			<ref name="number-seconds"/>
-		</choice>
-	</define>
-	<define name="number-day">
-		<element name="number:day">
-			<ref name="number-day-attlist"/>
-			<ref name="common-calendar-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="number-day-attlist">
-		<optional>
-			<attribute name="number:style">
-				<choice>
-					<value>short</value>
-					<value>long</value>
-				</choice>
-			</attribute>
-		</optional>
-	</define>
-	<define name="number-month">
-		<element name="number:month">
-			<ref name="number-month-attlist"/>
-			<ref name="common-calendar-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="number-month-attlist">
-		<interleave>
-			<optional>
-				<attribute name="number:textual">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="number:possessive-form">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="number:style">
-					<choice>
-						<value>short</value>
-						<value>long</value>
-					</choice>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="number-year">
-		<element name="number:year">
-			<ref name="number-year-attlist"/>
-			<ref name="common-calendar-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="number-year-attlist">
-		<optional>
-			<attribute name="number:style">
-				<choice>
-					<value>short</value>
-					<value>long</value>
-				</choice>
-			</attribute>
-		</optional>
-	</define>
-	<define name="number-era">
-		<element name="number:era">
-			<ref name="number-era-attlist"/>
-			<ref name="common-calendar-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="number-era-attlist">
-		<optional>
-			<attribute name="number:style">
-				<choice>
-					<value>short</value>
-					<value>long</value>
-				</choice>
-			</attribute>
-		</optional>
-	</define>
-	<define name="number-day-of-week">
-		<element name="number:day-of-week">
-			<ref name="number-day-of-week-attlist"/>
-			<ref name="common-calendar-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="number-day-of-week-attlist">
-		<optional>
-			<attribute name="number:style">
-				<choice>
-					<value>short</value>
-					<value>long</value>
-				</choice>
-			</attribute>
-		</optional>
-	</define>
-	<define name="number-week-of-year">
-		<element name="number:week-of-year">
-			<ref name="common-calendar-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="number-quarter">
-		<element name="number:quarter">
-			<ref name="number-quarter-attlist"/>
-			<ref name="common-calendar-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="number-quarter-attlist">
-		<optional>
-			<attribute name="number:style">
-				<choice>
-					<value>short</value>
-					<value>long</value>
-				</choice>
-			</attribute>
-		</optional>
-	</define>
-	<define name="number-time-style">
-		<element name="number:time-style">
-			<ref name="number-time-style-attlist"/>
-			<ref name="common-data-style-attlist"/>
-			<ref name="common-format-source-attlist"/>
-			<optional>
-				<ref name="style-text-properties"/>
-			</optional>
-			<optional>
-				<ref name="number-text"/>
-			</optional>
-			<oneOrMore>
-				<ref name="any-time"/>
-				<optional>
-					<ref name="number-text"/>
-				</optional>
-			</oneOrMore>
-			<zeroOrMore>
-				<ref name="style-map"/>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="any-time">
-		<choice>
-			<ref name="number-hours"/>
-			<ref name="number-am-pm"/>
-			<ref name="number-minutes"/>
-			<ref name="number-seconds"/>
-		</choice>
-	</define>
-	<define name="number-time-style-attlist">
-		<optional>
-			<attribute name="number:truncate-on-overflow">
-				<ref name="boolean"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="number-hours">
-		<element name="number:hours">
-			<ref name="number-hours-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="number-hours-attlist">
-		<optional>
-			<attribute name="number:style">
-				<choice>
-					<value>short</value>
-					<value>long</value>
-				</choice>
-			</attribute>
-		</optional>
-	</define>
-	<define name="number-minutes">
-		<element name="number:minutes">
-			<ref name="number-minutes-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="number-minutes-attlist">
-		<optional>
-			<attribute name="number:style">
-				<choice>
-					<value>short</value>
-					<value>long</value>
-				</choice>
-			</attribute>
-		</optional>
-	</define>
-	<define name="number-seconds">
-		<element name="number:seconds">
-			<ref name="number-seconds-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="number-seconds-attlist">
-		<interleave>
-			<optional>
-				<attribute name="number:style">
-					<choice>
-						<value>short</value>
-						<value>long</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="number:decimal-places">
-					<ref name="integer"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="number-am-pm">
-		<element name="number:am-pm">
-			<empty/>
-		</element>
-	</define>
-	<define name="number-boolean-style">
-		<element name="number:boolean-style">
-			<ref name="common-data-style-attlist"/>
-			<optional>
-				<ref name="style-text-properties"/>
-			</optional>
-			<optional>
-				<ref name="number-text"/>
-			</optional>
-			<optional>
-				<ref name="number-boolean"/>
-				<optional>
-					<ref name="number-text"/>
-				</optional>
-			</optional>
-			<zeroOrMore>
-				<ref name="style-map"/>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="number-boolean">
-		<element name="number:boolean">
-			<empty/>
-		</element>
-	</define>
-	<define name="number-text-style">
-		<element name="number:text-style">
-			<ref name="common-data-style-attlist"/>
-			<optional>
-				<ref name="style-text-properties"/>
-			</optional>
-			<optional>
-				<ref name="number-text"/>
-			</optional>
-			<zeroOrMore>
-				<ref name="number-text-content"/>
-				<optional>
-					<ref name="number-text"/>
-				</optional>
-			</zeroOrMore>
-			<zeroOrMore>
-				<ref name="style-map"/>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="number-text">
-		<element name="number:text">
-			<text/>
-		</element>
-	</define>
-	<define name="number-text-content">
-		<element name="number:text-content">
-			<empty/>
-		</element>
-	</define>
-	<define name="common-data-style-attlist">
-		<interleave>
-			<attribute name="style:name">
-				<ref name="styleName"/>
-			</attribute>
-			<optional>
-				<attribute name="style:display-name">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="number:language">
-					<ref name="languageCode"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="number:country">
-					<ref name="countryCode"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="number:script">
-					<ref name="scriptCode"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="number:rfc-language-tag">
-					<ref name="language"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="number:title">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:volatile">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="number:transliteration-format">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="number:transliteration-language">
-					<ref name="countryCode"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="number:transliteration-country">
-					<ref name="countryCode"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="number:transliteration-style">
-					<choice>
-						<value>short</value>
-						<value>medium</value>
-						<value>long</value>
-					</choice>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="common-auto-reorder-attlist">
-		<optional>
-			<attribute name="number:automatic-order">
-				<ref name="boolean"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="common-format-source-attlist">
-		<optional>
-			<attribute name="number:format-source">
-				<choice>
-					<value>fixed</value>
-					<value>language</value>
-				</choice>
-			</attribute>
-		</optional>
-	</define>
-	<define name="common-decimal-places-attlist">
-		<optional>
-			<attribute name="number:decimal-places">
-				<ref name="integer"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="common-number-attlist">
-		<interleave>
-			<optional>
-				<attribute name="number:min-integer-digits">
-					<ref name="integer"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="number:grouping">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="common-calendar-attlist">
-		<optional>
-			<attribute name="number:calendar">
-				<choice>
-					<value>gregorian</value>
-					<value>gengou</value>
-					<value>ROC</value>
-					<value>hanja_yoil</value>
-					<value>hanja</value>
-					<value>hijri</value>
-					<value>jewish</value>
-					<value>buddhist</value>
-					<ref name="string"/>
-				</choice>
-			</attribute>
-		</optional>
-	</define>
-	<define name="style-style-content">
-		<choice>
-			<group>
-				<attribute name="style:family">
-					<value>text</value>
-				</attribute>
-				<optional>
-					<ref name="style-text-properties"/>
-				</optional>
-			</group>
-			<group>
-				<attribute name="style:family">
-					<value>paragraph</value>
-				</attribute>
-				<optional>
-					<ref name="style-paragraph-properties"/>
-				</optional>
-				<optional>
-					<ref name="style-text-properties"/>
-				</optional>
-			</group>
-			<group>
-				<attribute name="style:family">
-					<value>section</value>
-				</attribute>
-				<optional>
-					<ref name="style-section-properties"/>
-				</optional>
-			</group>
-			<group>
-				<attribute name="style:family">
-					<value>ruby</value>
-				</attribute>
-				<optional>
-					<ref name="style-ruby-properties"/>
-				</optional>
-			</group>
-			<group>
-				<attribute name="style:family">
-					<value>table</value>
-				</attribute>
-				<optional>
-					<ref name="style-table-properties"/>
-				</optional>
-			</group>
-			<group>
-				<attribute name="style:family">
-					<value>table-column</value>
-				</attribute>
-				<optional>
-					<ref name="style-table-column-properties"/>
-				</optional>
-			</group>
-			<group>
-				<attribute name="style:family">
-					<value>table-row</value>
-				</attribute>
-				<optional>
-					<ref name="style-table-row-properties"/>
-				</optional>
-			</group>
-			<group>
-				<attribute name="style:family">
-					<value>table-cell</value>
-				</attribute>
-				<optional>
-					<ref name="style-table-cell-properties"/>
-				</optional>
-				<optional>
-					<ref name="style-paragraph-properties"/>
-				</optional>
-				<optional>
-					<ref name="style-text-properties"/>
-				</optional>
-			</group>
-			<group>
-				<attribute name="style:family">
-					<choice>
-						<value>graphic</value>
-						<value>presentation</value>
-					</choice>
-				</attribute>
-				<optional>
-					<ref name="style-graphic-properties"/>
-				</optional>
-				<optional>
-					<ref name="style-paragraph-properties"/>
-				</optional>
-				<optional>
-					<ref name="style-text-properties"/>
-				</optional>
-			</group>
-			<group>
-				<attribute name="style:family">
-					<value>drawing-page</value>
-				</attribute>
-				<optional>
-					<ref name="style-drawing-page-properties"/>
-				</optional>
-			</group>
-			<group>
-				<attribute name="style:family">
-					<value>chart</value>
-				</attribute>
-				<optional>
-					<ref name="style-chart-properties"/>
-				</optional>
-				<optional>
-					<ref name="style-graphic-properties"/>
-				</optional>
-				<optional>
-					<ref name="style-paragraph-properties"/>
-				</optional>
-				<optional>
-					<ref name="style-text-properties"/>
-				</optional>
-			</group>
-		</choice>
-	</define>
-	<define name="text-linenumbering-configuration">
-		<element name="text:linenumbering-configuration">
-			<ref name="text-linenumbering-configuration-attlist"/>
-			<optional>
-				<ref name="text-linenumbering-separator"/>
-			</optional>
-		</element>
-	</define>
-	<define name="text-linenumbering-configuration-attlist">
-		<interleave>
-			<optional>
-				<attribute name="text:number-lines">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<ref name="common-num-format-attlist"/>
-			</optional>
-			<optional>
-				<attribute name="text:style-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:increment">
-					<ref name="nonNegativeInteger"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:number-position">
-					<choice>
-						<value>left</value>
-						<value>right</value>
-						<value>inner</value>
-						<value>outer</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:offset">
-					<ref name="nonNegativeLength"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:count-empty-lines">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:count-in-text-boxes">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:restart-on-page">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="text-linenumbering-separator">
-		<element name="text:linenumbering-separator">
-			<optional>
-				<attribute name="text:increment">
-					<ref name="nonNegativeInteger"/>
-				</attribute>
-			</optional>
-			<text/>
-		</element>
-	</define>
-	<define name="text-notes-configuration">
-		<element name="text:notes-configuration">
-			<ref name="text-notes-configuration-content"/>
-		</element>
-	</define>
-	<define name="text-notes-configuration-content">
-		<interleave>
-			<ref name="text-note-class"/>
-			<optional>
-				<attribute name="text:citation-style-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:citation-body-style-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:default-style-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:master-page-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:start-value">
-					<ref name="nonNegativeInteger"/>
-				</attribute>
-			</optional>
-			<ref name="common-num-format-prefix-suffix-attlist"/>
-			<optional>
-				<ref name="common-num-format-attlist"/>
-			</optional>
-			<optional>
-				<attribute name="text:start-numbering-at">
-					<choice>
-						<value>document</value>
-						<value>chapter</value>
-						<value>page</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:footnotes-position">
-					<choice>
-						<value>text</value>
-						<value>page</value>
-						<value>section</value>
-						<value>document</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<element name="text:note-continuation-notice-forward">
-					<text/>
-				</element>
-			</optional>
-			<optional>
-				<element name="text:note-continuation-notice-backward">
-					<text/>
-				</element>
-			</optional>
-		</interleave>
-	</define>
-	<define name="text-bibliography-configuration">
-		<element name="text:bibliography-configuration">
-			<ref name="text-bibliography-configuration-attlist"/>
-			<zeroOrMore>
-				<ref name="text-sort-key"/>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="text-bibliography-configuration-attlist">
-		<interleave>
-			<optional>
-				<attribute name="text:prefix">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:suffix">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:numbered-entries">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:sort-by-position">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="fo:language">
-					<ref name="languageCode"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="fo:country">
-					<ref name="countryCode"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="fo:script">
-					<ref name="scriptCode"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:rfc-language-tag">
-					<ref name="language"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:sort-algorithm">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="text-sort-key">
-		<element name="text:sort-key">
-			<ref name="text-sort-key-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="text-sort-key-attlist">
-		<attribute name="text:key">
-			<choice>
-				<value>address</value>
-				<value>annote</value>
-				<value>author</value>
-				<value>bibliography-type</value>
-				<value>booktitle</value>
-				<value>chapter</value>
-				<value>custom1</value>
-				<value>custom2</value>
-				<value>custom3</value>
-				<value>custom4</value>
-				<value>custom5</value>
-				<value>edition</value>
-				<value>editor</value>
-				<value>howpublished</value>
-				<value>identifier</value>
-				<value>institution</value>
-				<value>isbn</value>
-				<value>issn</value>
-				<value>journal</value>
-				<value>month</value>
-				<value>note</value>
-				<value>number</value>
-				<value>organizations</value>
-				<value>pages</value>
-				<value>publisher</value>
-				<value>report-type</value>
-				<value>school</value>
-				<value>series</value>
-				<value>title</value>
-				<value>url</value>
-				<value>volume</value>
-				<value>year</value>
-			</choice>
-		</attribute>
-		<optional>
-			<attribute name="text:sort-ascending">
-				<ref name="boolean"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="text-list-style">
-		<element name="text:list-style">
-			<ref name="text-list-style-attr"/>
-			<zeroOrMore>
-				<ref name="text-list-style-content"/>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="text-list-style-attr">
-		<interleave>
-			<attribute name="style:name">
-				<ref name="styleName"/>
-			</attribute>
-			<optional>
-				<attribute name="style:display-name">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:consecutive-numbering">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="text-list-style-content">
-		<choice>
-			<element name="text:list-level-style-number">
-				<ref name="text-list-level-style-attr"/>
-				<ref name="text-list-level-style-number-attr"/>
-				<optional>
-					<ref name="style-list-level-properties"/>
-				</optional>
-				<optional>
-					<ref name="style-text-properties"/>
-				</optional>
-			</element>
-			<element name="text:list-level-style-bullet">
-				<ref name="text-list-level-style-attr"/>
-				<ref name="text-list-level-style-bullet-attr"/>
-				<optional>
-					<ref name="style-list-level-properties"/>
-				</optional>
-				<optional>
-					<ref name="style-text-properties"/>
-				</optional>
-			</element>
-			<element name="text:list-level-style-image">
-				<ref name="text-list-level-style-attr"/>
-				<ref name="text-list-level-style-image-attr"/>
-				<optional>
-					<ref name="style-list-level-properties"/>
-				</optional>
-			</element>
-		</choice>
-	</define>
-	<define name="text-list-level-style-number-attr">
-		<interleave>
-			<optional>
-				<attribute name="text:style-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-			<ref name="common-num-format-attlist"/>
-			<ref name="common-num-format-prefix-suffix-attlist"/>
-			<optional>
-				<attribute name="text:display-levels">
-					<ref name="positiveInteger"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:start-value">
-					<ref name="positiveInteger"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="text-list-level-style-bullet-attr">
-		<interleave>
-			<optional>
-				<attribute name="text:style-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-			<attribute name="text:bullet-char">
-				<ref name="character"/>
-			</attribute>
-			<ref name="common-num-format-prefix-suffix-attlist"/>
-			<optional>
-				<attribute name="text:bullet-relative-size">
-					<ref name="percent"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="text-list-level-style-image-attr">
-		<choice>
-			<ref name="common-draw-data-attlist"/>
-			<ref name="office-binary-data"/>
-		</choice>
-	</define>
-	<define name="text-list-level-style-attr">
-		<attribute name="text:level">
-			<ref name="positiveInteger"/>
-		</attribute>
-	</define>
-	<define name="text-outline-style">
-		<element name="text:outline-style">
-			<ref name="text-outline-style-attr"/>
-			<oneOrMore>
-				<ref name="text-outline-level-style"/>
-			</oneOrMore>
-		</element>
-	</define>
-	<define name="text-outline-style-attr">
-		<attribute name="style:name">
-			<ref name="styleName"/>
-		</attribute>
-	</define>
-	<define name="text-outline-level-style">
-		<element name="text:outline-level-style">
-			<ref name="text-outline-level-style-attlist"/>
-			<optional>
-				<ref name="style-list-level-properties"/>
-			</optional>
-			<optional>
-				<ref name="style-text-properties"/>
-			</optional>
-		</element>
-	</define>
-	<define name="text-outline-level-style-attlist">
-		<interleave>
-			<attribute name="text:level">
-				<ref name="positiveInteger"/>
-			</attribute>
-			<optional>
-				<attribute name="text:style-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-			<ref name="common-num-format-attlist"/>
-			<ref name="common-num-format-prefix-suffix-attlist"/>
-			<optional>
-				<attribute name="text:display-levels">
-					<ref name="positiveInteger"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:start-value">
-					<ref name="positiveInteger"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="style-graphic-properties">
-		<element name="style:graphic-properties">
-			<ref name="style-graphic-properties-content-strict"/>
-		</element>
-	</define>
-	<define name="style-graphic-properties-content-strict">
-		<ref name="style-graphic-properties-attlist"/>
-		<ref name="style-graphic-fill-properties-attlist"/>
-		<ref name="style-graphic-properties-elements"/>
-	</define>
-	<define name="style-drawing-page-properties">
-		<element name="style:drawing-page-properties">
-			<ref name="style-drawing-page-properties-content-strict"/>
-		</element>
-	</define>
-	<define name="style-drawing-page-properties-content-strict">
-		<ref name="style-graphic-fill-properties-attlist"/>
-		<ref name="style-drawing-page-properties-attlist"/>
-		<ref name="style-drawing-page-properties-elements"/>
-	</define>
-	<define name="draw-gradient">
-		<element name="draw:gradient">
-			<ref name="common-draw-gradient-attlist"/>
-			<ref name="draw-gradient-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="common-draw-gradient-attlist">
-		<interleave>
-			<optional>
-				<attribute name="draw:name">
-					<ref name="styleName"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:display-name">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<attribute name="draw:style">
-				<ref name="gradient-style"/>
-			</attribute>
-			<optional>
-				<attribute name="draw:cx">
-					<ref name="percent"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:cy">
-					<ref name="percent"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:angle">
-					<ref name="angle"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:border">
-					<ref name="percent"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="gradient-style">
-		<choice>
-			<value>linear</value>
-			<value>axial</value>
-			<value>radial</value>
-			<value>ellipsoid</value>
-			<value>square</value>
-			<value>rectangular</value>
-		</choice>
-	</define>
-	<define name="draw-gradient-attlist">
-		<interleave>
-			<optional>
-				<attribute name="draw:start-color">
-					<ref name="color"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:end-color">
-					<ref name="color"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:start-intensity">
-					<ref name="zeroToHundredPercent"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:end-intensity">
-					<ref name="zeroToHundredPercent"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="svg-linearGradient">
-		<element name="svg:linearGradient">
-			<ref name="common-svg-gradient-attlist"/>
-			<optional>
-				<attribute name="svg:x1">
-					<choice>
-						<ref name="coordinate"/>
-						<ref name="percent"/>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="svg:y1">
-					<choice>
-						<ref name="coordinate"/>
-						<ref name="percent"/>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="svg:x2">
-					<choice>
-						<ref name="coordinate"/>
-						<ref name="percent"/>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="svg:y2">
-					<choice>
-						<ref name="coordinate"/>
-						<ref name="percent"/>
-					</choice>
-				</attribute>
-			</optional>
-			<zeroOrMore>
-				<ref name="svg-stop"/>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="svg-radialGradient">
-		<element name="svg:radialGradient">
-			<ref name="common-svg-gradient-attlist"/>
-			<optional>
-				<attribute name="svg:cx">
-					<choice>
-						<ref name="coordinate"/>
-						<ref name="percent"/>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="svg:cy">
-					<choice>
-						<ref name="coordinate"/>
-						<ref name="percent"/>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="svg:r">
-					<choice>
-						<ref name="coordinate"/>
-						<ref name="percent"/>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="svg:fx">
-					<choice>
-						<ref name="coordinate"/>
-						<ref name="percent"/>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="svg:fy">
-					<choice>
-						<ref name="coordinate"/>
-						<ref name="percent"/>
-					</choice>
-				</attribute>
-			</optional>
-			<zeroOrMore>
-				<ref name="svg-stop"/>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="svg-stop">
-		<element name="svg:stop">
-			<attribute name="svg:offset">
-				<choice>
-					<ref name="double"/>
-					<ref name="percent"/>
-				</choice>
-			</attribute>
-			<optional>
-				<attribute name="svg:stop-color">
-					<ref name="color"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="svg:stop-opacity">
-					<ref name="double"/>
-				</attribute>
-			</optional>
-		</element>
-	</define>
-	<define name="common-svg-gradient-attlist">
-		<interleave>
-			<optional>
-				<attribute name="svg:gradientUnits">
-					<value>objectBoundingBox</value>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="svg:gradientTransform">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="svg:spreadMethod">
-					<choice>
-						<value>pad</value>
-						<value>reflect</value>
-						<value>repeat</value>
-					</choice>
-				</attribute>
-			</optional>
-			<attribute name="draw:name">
-				<ref name="styleName"/>
-			</attribute>
-			<optional>
-				<attribute name="draw:display-name">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="draw-hatch">
-		<element name="draw:hatch">
-			<ref name="draw-hatch-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="draw-hatch-attlist">
-		<interleave>
-			<attribute name="draw:name">
-				<ref name="styleName"/>
-			</attribute>
-			<optional>
-				<attribute name="draw:display-name">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<attribute name="draw:style">
-				<choice>
-					<value>single</value>
-					<value>double</value>
-					<value>triple</value>
-				</choice>
-			</attribute>
-			<optional>
-				<attribute name="draw:color">
-					<ref name="color"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:distance">
-					<ref name="length"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:rotation">
-					<ref name="angle"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="draw-fill-image">
-		<element name="draw:fill-image">
-			<ref name="draw-fill-image-attlist"/>
-			<attribute name="xlink:type">
-				<value>simple</value>
-			</attribute>
-			<attribute name="xlink:href">
-				<ref name="anyIRI"/>
-			</attribute>
-			<optional>
-				<attribute name="xlink:show">
-					<value>embed</value>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="xlink:actuate">
-					<value>onLoad</value>
-				</attribute>
-			</optional>
-			<empty/>
-		</element>
-	</define>
-	<define name="draw-fill-image-attlist">
-		<interleave>
-			<attribute name="draw:name">
-				<ref name="styleName"/>
-			</attribute>
-			<optional>
-				<attribute name="draw:display-name">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="svg:width">
-					<ref name="length"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="svg:height">
-					<ref name="length"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="draw-opacity">
-		<element name="draw:opacity">
-			<ref name="common-draw-gradient-attlist"/>
-			<ref name="draw-opacity-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="draw-opacity-attlist">
-		<optional>
-			<attribute name="draw:start">
-				<ref name="zeroToHundredPercent"/>
-			</attribute>
-		</optional>
-		<optional>
-			<attribute name="draw:end">
-				<ref name="zeroToHundredPercent"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="draw-marker">
-		<element name="draw:marker">
-			<ref name="draw-marker-attlist"/>
-			<ref name="common-draw-viewbox-attlist"/>
-			<ref name="common-draw-path-data-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="draw-marker-attlist">
-		<interleave>
-			<attribute name="draw:name">
-				<ref name="styleName"/>
-			</attribute>
-			<optional>
-				<attribute name="draw:display-name">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="draw-stroke-dash">
-		<element name="draw:stroke-dash">
-			<ref name="draw-stroke-dash-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="draw-stroke-dash-attlist">
-		<interleave>
-			<attribute name="draw:name">
-				<ref name="styleName"/>
-			</attribute>
-			<optional>
-				<attribute name="draw:display-name">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:style">
-					<choice>
-						<value>rect</value>
-						<value>round</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:dots1">
-					<ref name="integer"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:dots1-length">
-					<choice>
-						<ref name="length"/>
-						<ref name="percent"/>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:dots2">
-					<ref name="integer"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:dots2-length">
-					<choice>
-						<ref name="length"/>
-						<ref name="percent"/>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:distance">
-					<choice>
-						<ref name="length"/>
-						<ref name="percent"/>
-					</choice>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="style-presentation-page-layout">
-		<element name="style:presentation-page-layout">
-			<attribute name="style:name">
-				<ref name="styleName"/>
-			</attribute>
-			<optional>
-				<attribute name="style:display-name">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<zeroOrMore>
-				<ref name="presentation-placeholder"/>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="presentation-placeholder">
-		<element name="presentation:placeholder">
-			<attribute name="presentation:object">
-				<ref name="presentation-classes"/>
-			</attribute>
-			<attribute name="svg:x">
-				<choice>
-					<ref name="coordinate"/>
-					<ref name="percent"/>
-				</choice>
-			</attribute>
-			<attribute name="svg:y">
-				<choice>
-					<ref name="coordinate"/>
-					<ref name="percent"/>
-				</choice>
-			</attribute>
-			<attribute name="svg:width">
-				<choice>
-					<ref name="length"/>
-					<ref name="percent"/>
-				</choice>
-			</attribute>
-			<attribute name="svg:height">
-				<choice>
-					<ref name="length"/>
-					<ref name="percent"/>
-				</choice>
-			</attribute>
-			<empty/>
-		</element>
-	</define>
-	<define name="style-page-layout-properties">
-		<element name="style:page-layout-properties">
-			<ref name="style-page-layout-properties-content-strict"/>
-		</element>
-	</define>
-	<define name="style-page-layout-properties-content-strict">
-		<ref name="style-page-layout-properties-attlist"/>
-		<ref name="style-page-layout-properties-elements"/>
-	</define>
-	<define name="style-page-layout-properties-attlist">
-		<interleave>
-			<optional>
-				<attribute name="fo:page-width">
-					<ref name="length"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="fo:page-height">
-					<ref name="length"/>
-				</attribute>
-			</optional>
-			<optional>
-				<ref name="common-num-format-attlist"/>
-			</optional>
-			<ref name="common-num-format-prefix-suffix-attlist"/>
-			<optional>
-				<attribute name="style:paper-tray-name">
-					<choice>
-						<value>default</value>
-						<ref name="string"/>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:print-orientation">
-					<choice>
-						<value>portrait</value>
-						<value>landscape</value>
-					</choice>
-				</attribute>
-			</optional>
-			<ref name="common-horizontal-margin-attlist"/>
-			<ref name="common-vertical-margin-attlist"/>
-			<ref name="common-margin-attlist"/>
-			<ref name="common-border-attlist"/>
-			<ref name="common-border-line-width-attlist"/>
-			<ref name="common-padding-attlist"/>
-			<ref name="common-shadow-attlist"/>
-			<ref name="common-background-color-attlist"/>
-			<optional>
-				<attribute name="style:register-truth-ref-style-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:print">
-					<list>
-						<zeroOrMore>
-							<choice>
-								<value>headers</value>
-								<value>grid</value>
-								<value>annotations</value>
-								<value>objects</value>
-								<value>charts</value>
-								<value>drawings</value>
-								<value>formulas</value>
-								<value>zero-values</value>
-							</choice>
-						</zeroOrMore>
-					</list>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:print-page-order">
-					<choice>
-						<value>ttb</value>
-						<value>ltr</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:first-page-number">
-					<choice>
-						<ref name="positiveInteger"/>
-						<value>continue</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:scale-to">
-					<ref name="percent"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:scale-to-pages">
-					<ref name="positiveInteger"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:table-centering">
-					<choice>
-						<value>horizontal</value>
-						<value>vertical</value>
-						<value>both</value>
-						<value>none</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:footnote-max-height">
-					<ref name="length"/>
-				</attribute>
-			</optional>
-			<ref name="common-writing-mode-attlist"/>
-			<optional>
-				<attribute name="style:layout-grid-mode">
-					<choice>
-						<value>none</value>
-						<value>line</value>
-						<value>both</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:layout-grid-standard-mode">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:layout-grid-base-height">
-					<ref name="length"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:layout-grid-ruby-height">
-					<ref name="length"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:layout-grid-lines">
-					<ref name="positiveInteger"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:layout-grid-base-width">
-					<ref name="length"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:layout-grid-color">
-					<ref name="color"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:layout-grid-ruby-below">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:layout-grid-print">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:layout-grid-display">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:layout-grid-snap-to">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="style-page-layout-properties-elements">
-		<interleave>
-			<ref name="style-background-image"/>
-			<ref name="style-columns"/>
-			<ref name="style-footnote-sep"/>
-		</interleave>
-	</define>
-	<define name="style-footnote-sep">
-		<optional>
-			<element name="style:footnote-sep">
-				<ref name="style-footnote-sep-attlist"/>
-				<empty/>
-			</element>
-		</optional>
-	</define>
-	<define name="style-footnote-sep-attlist">
-		<optional>
-			<attribute name="style:width">
-				<ref name="length"/>
-			</attribute>
-		</optional>
-		<optional>
-			<attribute name="style:rel-width">
-				<ref name="percent"/>
-			</attribute>
-		</optional>
-		<optional>
-			<attribute name="style:color">
-				<ref name="color"/>
-			</attribute>
-		</optional>
-		<optional>
-			<attribute name="style:line-style">
-				<ref name="lineStyle"/>
-			</attribute>
-		</optional>
-		<optional>
-			<attribute name="style:adjustment">
-				<choice>
-					<value>left</value>
-					<value>center</value>
-					<value>right</value>
-				</choice>
-			</attribute>
-		</optional>
-		<optional>
-			<attribute name="style:distance-before-sep">
-				<ref name="length"/>
-			</attribute>
-		</optional>
-		<optional>
-			<attribute name="style:distance-after-sep">
-				<ref name="length"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="style-header-footer-properties">
-		<element name="style:header-footer-properties">
-			<ref name="style-header-footer-properties-content-strict"/>
-		</element>
-	</define>
-	<define name="style-header-footer-properties-content-strict">
-		<ref name="style-header-footer-properties-attlist"/>
-		<ref name="style-header-footer-properties-elements"/>
-	</define>
-	<define name="style-header-footer-properties-attlist">
-		<interleave>
-			<optional>
-				<attribute name="svg:height">
-					<ref name="length"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="fo:min-height">
-					<ref name="length"/>
-				</attribute>
-			</optional>
-			<ref name="common-horizontal-margin-attlist"/>
-			<ref name="common-vertical-margin-attlist"/>
-			<ref name="common-margin-attlist"/>
-			<ref name="common-border-attlist"/>
-			<ref name="common-border-line-width-attlist"/>
-			<ref name="common-padding-attlist"/>
-			<ref name="common-background-color-attlist"/>
-			<ref name="common-shadow-attlist"/>
-			<optional>
-				<attribute name="style:dynamic-spacing">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="style-header-footer-properties-elements">
-		<ref name="style-background-image"/>
-	</define>
-	<define name="style-text-properties">
-		<element name="style:text-properties">
-			<ref name="style-text-properties-content-strict"/>
-		</element>
-	</define>
-	<define name="style-text-properties-content-strict">
-		<ref name="style-text-properties-attlist"/>
-		<ref name="style-text-properties-elements"/>
-	</define>
-	<define name="style-text-properties-elements">
-		<empty/>
-	</define>
-	<define name="style-text-properties-attlist">
-		<interleave>
-			<optional>
-				<attribute name="fo:font-variant">
-					<ref name="fontVariant"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="fo:text-transform">
-					<choice>
-						<value>none</value>
-						<value>lowercase</value>
-						<value>uppercase</value>
-						<value>capitalize</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="fo:color">
-					<ref name="color"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:use-window-font-color">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:text-outline">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:text-line-through-type">
-					<ref name="lineType"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:text-line-through-style">
-					<ref name="lineStyle"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:text-line-through-width">
-					<ref name="lineWidth"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:text-line-through-color">
-					<choice>
-						<value>font-color</value>
-						<ref name="color"/>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:text-line-through-text">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:text-line-through-text-style">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:text-position">
-					<list>
-						<choice>
-							<ref name="percent"/>
-							<value>super</value>
-							<value>sub</value>
-						</choice>
-						<optional>
-							<ref name="percent"/>
-						</optional>
-					</list>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:font-name">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:font-name-asian">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:font-name-complex">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="fo:font-family">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:font-family-asian">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:font-family-complex">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:font-family-generic">
-					<ref name="fontFamilyGeneric"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:font-family-generic-asian">
-					<ref name="fontFamilyGeneric"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:font-family-generic-complex">
-					<ref name="fontFamilyGeneric"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:font-style-name">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:font-style-name-asian">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:font-style-name-complex">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:font-pitch">
-					<ref name="fontPitch"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:font-pitch-asian">
-					<ref name="fontPitch"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:font-pitch-complex">
-					<ref name="fontPitch"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:font-charset">
-					<ref name="textEncoding"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:font-charset-asian">
-					<ref name="textEncoding"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:font-charset-complex">
-					<ref name="textEncoding"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="fo:font-size">
-					<choice>
-						<ref name="positiveLength"/>
-						<ref name="percent"/>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:font-size-asian">
-					<choice>
-						<ref name="positiveLength"/>
-						<ref name="percent"/>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:font-size-complex">
-					<choice>
-						<ref name="positiveLength"/>
-						<ref name="percent"/>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:font-size-rel">
-					<ref name="length"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:font-size-rel-asian">
-					<ref name="length"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:font-size-rel-complex">
-					<ref name="length"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:script-type">
-					<choice>
-						<value>latin</value>
-						<value>asian</value>
-						<value>complex</value>
-						<value>ignore</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="fo:letter-spacing">
-					<choice>
-						<ref name="length"/>
-						<value>normal</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="fo:language">
-					<ref name="languageCode"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:language-asian">
-					<ref name="languageCode"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:language-complex">
-					<ref name="languageCode"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="fo:country">
-					<ref name="countryCode"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:country-asian">
-					<ref name="countryCode"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:country-complex">
-					<ref name="countryCode"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="fo:script">
-					<ref name="scriptCode"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:script-asian">
-					<ref name="scriptCode"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:script-complex">
-					<ref name="scriptCode"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:rfc-language-tag">
-					<ref name="language"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:rfc-language-tag-asian">
-					<ref name="language"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:rfc-language-tag-complex">
-					<ref name="language"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="fo:font-style">
-					<ref name="fontStyle"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:font-style-asian">
-					<ref name="fontStyle"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:font-style-complex">
-					<ref name="fontStyle"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:font-relief">
-					<choice>
-						<value>none</value>
-						<value>embossed</value>
-						<value>engraved</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="fo:text-shadow">
-					<ref name="shadowType"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:text-underline-type">
-					<ref name="lineType"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:text-underline-style">
-					<ref name="lineStyle"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:text-underline-width">
-					<ref name="lineWidth"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:text-underline-color">
-					<choice>
-						<value>font-color</value>
-						<ref name="color"/>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:text-overline-type">
-					<ref name="lineType"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:text-overline-style">
-					<ref name="lineStyle"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:text-overline-width">
-					<ref name="lineWidth"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:text-overline-color">
-					<choice>
-						<value>font-color</value>
-						<ref name="color"/>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:text-overline-mode">
-					<ref name="lineMode"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="fo:font-weight">
-					<ref name="fontWeight"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:font-weight-asian">
-					<ref name="fontWeight"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:font-weight-complex">
-					<ref name="fontWeight"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:text-underline-mode">
-					<ref name="lineMode"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:text-line-through-mode">
-					<ref name="lineMode"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:letter-kerning">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:text-blinking">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<ref name="common-background-color-attlist"/>
-			<optional>
-				<attribute name="style:text-combine">
-					<choice>
-						<value>none</value>
-						<value>letters</value>
-						<value>lines</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:text-combine-start-char">
-					<ref name="character"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:text-combine-end-char">
-					<ref name="character"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:text-emphasize">
-					<choice>
-						<value>none</value>
-						<list>
-							<choice>
-								<value>none</value>
-								<value>accent</value>
-								<value>dot</value>
-								<value>circle</value>
-								<value>disc</value>
-							</choice>
-							<choice>
-								<value>above</value>
-								<value>below</value>
-							</choice>
-						</list>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:text-scale">
-					<ref name="percent"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:text-rotation-angle">
-					<ref name="angle"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:text-rotation-scale">
-					<choice>
-						<value>fixed</value>
-						<value>line-height</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="fo:hyphenate">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="fo:hyphenation-remain-char-count">
-					<ref name="positiveInteger"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="fo:hyphenation-push-char-count">
-					<ref name="positiveInteger"/>
-				</attribute>
-			</optional>
-			<choice>
-				<attribute name="text:display">
-					<value>true</value>
-				</attribute>
-				<attribute name="text:display">
-					<value>none</value>
-				</attribute>
-				<group>
-					<attribute name="text:display">
-						<value>condition</value>
-					</attribute>
-					<attribute name="text:condition">
-						<value>none</value>
-					</attribute>
-				</group>
-				<empty/>
-			</choice>
-		</interleave>
-	</define>
-	<define name="fontVariant">
-		<choice>
-			<value>normal</value>
-			<value>small-caps</value>
-		</choice>
-	</define>
-	<define name="fontFamilyGeneric">
-		<choice>
-			<value>roman</value>
-			<value>swiss</value>
-			<value>modern</value>
-			<value>decorative</value>
-			<value>script</value>
-			<value>system</value>
-		</choice>
-	</define>
-	<define name="fontPitch">
-		<choice>
-			<value>fixed</value>
-			<value>variable</value>
-		</choice>
-	</define>
-	<define name="textEncoding">
-		<data type="string">
-			<param name="pattern">[A-Za-z][A-Za-z0-9._\-]*</param>
-		</data>
-	</define>
-	<define name="fontStyle">
-		<choice>
-			<value>normal</value>
-			<value>italic</value>
-			<value>oblique</value>
-		</choice>
-	</define>
-	<define name="shadowType">
-		<choice>
-			<value>none</value>
-			<ref name="string"/>
-		</choice>
-	</define>
-	<define name="lineType">
-		<choice>
-			<value>none</value>
-			<value>single</value>
-			<value>double</value>
-		</choice>
-	</define>
-	<define name="lineStyle">
-		<choice>
-			<value>none</value>
-			<value>solid</value>
-			<value>dotted</value>
-			<value>dash</value>
-			<value>long-dash</value>
-			<value>dot-dash</value>
-			<value>dot-dot-dash</value>
-			<value>wave</value>
-		</choice>
-	</define>
-	<define name="lineWidth">
-		<choice>
-			<value>auto</value>
-			<value>normal</value>
-			<value>bold</value>
-			<value>thin</value>
-			<value>medium</value>
-			<value>thick</value>
-			<ref name="positiveInteger"/>
-			<ref name="percent"/>
-			<ref name="positiveLength"/>
-		</choice>
-	</define>
-	<define name="fontWeight">
-		<choice>
-			<value>normal</value>
-			<value>bold</value>
-			<value>100</value>
-			<value>200</value>
-			<value>300</value>
-			<value>400</value>
-			<value>500</value>
-			<value>600</value>
-			<value>700</value>
-			<value>800</value>
-			<value>900</value>
-		</choice>
-	</define>
-	<define name="lineMode">
-		<choice>
-			<value>continuous</value>
-			<value>skip-white-space</value>
-		</choice>
-	</define>
-	<define name="style-paragraph-properties">
-		<element name="style:paragraph-properties">
-			<ref name="style-paragraph-properties-content-strict"/>
-		</element>
-	</define>
-	<define name="style-paragraph-properties-content-strict">
-		<ref name="style-paragraph-properties-attlist"/>
-		<ref name="style-paragraph-properties-elements"/>
-	</define>
-	<define name="style-paragraph-properties-attlist">
-		<interleave>
-			<optional>
-				<attribute name="fo:line-height">
-					<choice>
-						<value>normal</value>
-						<ref name="nonNegativeLength"/>
-						<ref name="percent"/>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:line-height-at-least">
-					<ref name="nonNegativeLength"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:line-spacing">
-					<ref name="length"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:font-independent-line-spacing">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<ref name="common-text-align"/>
-			<optional>
-				<attribute name="fo:text-align-last">
-					<choice>
-						<value>start</value>
-						<value>center</value>
-						<value>justify</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:justify-single-word">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="fo:keep-together">
-					<choice>
-						<value>auto</value>
-						<value>always</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="fo:widows">
-					<ref name="nonNegativeInteger"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="fo:orphans">
-					<ref name="nonNegativeInteger"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:tab-stop-distance">
-					<ref name="nonNegativeLength"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="fo:hyphenation-keep">
-					<choice>
-						<value>auto</value>
-						<value>page</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="fo:hyphenation-ladder-count">
-					<choice>
-						<value>no-limit</value>
-						<ref name="positiveInteger"/>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:register-true">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-	
-			<ref name="common-horizontal-margin-attlist"/>
-			<optional>
-				<attribute name="fo:text-indent">
-					<choice>
-						<ref name="length"/>
-						<ref name="percent"/>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:auto-text-indent">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<ref name="common-vertical-margin-attlist"/>
-			<ref name="common-margin-attlist"/>
-			<ref name="common-break-attlist"/>
-			<ref name="common-background-color-attlist"/>
-			<ref name="common-border-attlist"/>
-			<ref name="common-border-line-width-attlist"/>
-			<optional>
-				<attribute name="style:join-border">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<ref name="common-padding-attlist"/>
-			<ref name="common-shadow-attlist"/>
-			<ref name="common-keep-with-next-attlist"/>
-			<optional>
-				<attribute name="text:number-lines">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:line-number">
-					<ref name="nonNegativeInteger"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:text-autospace">
-					<choice>
-						<value>none</value>
-						<value>ideograph-alpha</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:punctuation-wrap">
-					<choice>
-						<value>simple</value>
-						<value>hanging</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:line-break">
-					<choice>
-						<value>normal</value>
-						<value>strict</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:vertical-align">
-					<choice>
-						<value>top</value>
-						<value>middle</value>
-						<value>bottom</value>
-						<value>auto</value>
-						<value>baseline</value>
-					</choice>
-				</attribute>
-			</optional>
-			<ref name="common-writing-mode-attlist"/>
-			<optional>
-				<attribute name="style:writing-mode-automatic">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:snap-to-layout-grid">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<ref name="common-page-number-attlist"/>
-			<ref name="common-background-transparency-attlist"/>
-		</interleave>
-	</define>
-	<define name="common-text-align">
-		<optional>
-			<attribute name="fo:text-align">
-				<choice>
-					<value>start</value>
-					<value>end</value>
-					<value>left</value>
-					<value>right</value>
-					<value>center</value>
-					<value>justify</value>
-				</choice>
-			</attribute>
-		</optional>
-	</define>
-	<define name="style-paragraph-properties-elements">
-		<interleave>
-			<ref name="style-tab-stops"/>
-			<ref name="style-drop-cap"/>
-			<ref name="style-background-image"/>
-		</interleave>
-	</define>
-	<define name="style-tab-stops">
-		<optional>
-			<element name="style:tab-stops">
-				<zeroOrMore>
-					<ref name="style-tab-stop"/>
-				</zeroOrMore>
-			</element>
-		</optional>
-	</define>
-	<define name="style-tab-stop">
-		<element name="style:tab-stop">
-			<ref name="style-tab-stop-attlist"/>
-			<empty/>
-		</element>
-	</define>
-	<define name="style-tab-stop-attlist">
-		<interleave>
-			<attribute name="style:position">
-				<ref name="length"/>
-			</attribute>
-			<choice>
-				<optional>
-					<attribute name="style:type">
-						<choice>
-							<value>left</value>
-							<value>center</value>
-							<value>right</value>
-						</choice>
-					</attribute>
-				</optional>
-				<group>
-					<attribute name="style:type">
-						<value>char</value>
-					</attribute>
-					<ref name="style-tab-stop-char-attlist"/>
-				</group>
-			</choice>
-			<optional>
-				<attribute name="style:leader-type">
-					<ref name="lineType"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:leader-style">
-					<ref name="lineStyle"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:leader-width">
-					<ref name="lineWidth"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:leader-color">
-					<choice>
-						<value>font-color</value>
-						<ref name="color"/>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:leader-text">
-					<ref name="character"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:leader-text-style">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="style-tab-stop-char-attlist">
-		<attribute name="style:char">
-			<ref name="character"/>
-		</attribute>
-	</define>
-	<define name="style-drop-cap">
-		<optional>
-			<element name="style:drop-cap">
-				<ref name="style-drop-cap-attlist"/>
-				<empty/>
-			</element>
-		</optional>
-	</define>
-	<define name="style-drop-cap-attlist">
-		<interleave>
-			<optional>
-				<attribute name="style:length">
-					<choice>
-						<value>word</value>
-						<ref name="positiveInteger"/>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:lines">
-					<ref name="positiveInteger"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:distance">
-					<ref name="length"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:style-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="common-horizontal-margin-attlist">
-		<optional>
-			<attribute name="fo:margin-left">
-				<choice>
-					<ref name="length"/>
-					<ref name="percent"/>
-				</choice>
-			</attribute>
-		</optional>
-		<optional>
-			<attribute name="fo:margin-right">
-				<choice>
-					<ref name="length"/>
-					<ref name="percent"/>
-				</choice>
-			</attribute>
-		</optional>
-	</define>
-	<define name="common-vertical-margin-attlist">
-		<optional>
-			<attribute name="fo:margin-top">
-				<choice>
-					<ref name="nonNegativeLength"/>
-					<ref name="percent"/>
-				</choice>
-			</attribute>
-		</optional>
-		<optional>
-			<attribute name="fo:margin-bottom">
-				<choice>
-					<ref name="nonNegativeLength"/>
-					<ref name="percent"/>
-				</choice>
-			</attribute>
-		</optional>
-	</define>
-	<define name="common-margin-attlist">
-		<optional>
-			<attribute name="fo:margin">
-				<choice>
-					<ref name="nonNegativeLength"/>
-					<ref name="percent"/>
-				</choice>
-			</attribute>
-		</optional>
-	</define>
-	<define name="common-break-attlist">
-		<optional>
-			<attribute name="fo:break-before">
-				<choice>
-					<value>auto</value>
-					<value>column</value>
-					<value>page</value>
-				</choice>
-			</attribute>
-		</optional>
-		<optional>
-			<attribute name="fo:break-after">
-				<choice>
-					<value>auto</value>
-					<value>column</value>
-					<value>page</value>
-				</choice>
-			</attribute>
-		</optional>
-	</define>
-	<define name="common-background-color-attlist">
-		<optional>
-			<attribute name="fo:background-color">
-				<choice>
-					<value>transparent</value>
-					<ref name="color"/>
-				</choice>
-			</attribute>
-		</optional>
-	</define>
-	<define name="style-background-image">
-		<optional>
-			<element name="style:background-image">
-				<ref name="style-background-image-attlist"/>
-				<choice>
-					<ref name="common-draw-data-attlist"/>
-					<ref name="office-binary-data"/>
-					<empty/>
-				</choice>
-			</element>
-		</optional>
-	</define>
-	<define name="style-background-image-attlist">
-		<interleave>
-			<optional>
-				<attribute name="style:repeat">
-					<choice>
-						<value>no-repeat</value>
-						<value>repeat</value>
-						<value>stretch</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:position">
-					<choice>
-						<value>left</value>
-						<value>center</value>
-						<value>right</value>
-						<value>top</value>
-						<value>bottom</value>
-						<list>
-							<ref name="horiBackPos"/>
-							<ref name="vertBackPos"/>
-						</list>
-						<list>
-							<ref name="vertBackPos"/>
-							<ref name="horiBackPos"/>
-						</list>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:filter-name">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:opacity">
-					<ref name="zeroToHundredPercent"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="horiBackPos">
-		<choice>
-			<value>left</value>
-			<value>center</value>
-			<value>right</value>
-		</choice>
-	</define>
-	<define name="vertBackPos">
-		<choice>
-			<value>top</value>
-			<value>center</value>
-			<value>bottom</value>
-		</choice>
-	</define>
-	<define name="common-border-attlist">
-		<optional>
-			<attribute name="fo:border">
-				<ref name="string"/>
-			</attribute>
-		</optional>
-		<optional>
-			<attribute name="fo:border-top">
-				<ref name="string"/>
-			</attribute>
-		</optional>
-		<optional>
-			<attribute name="fo:border-bottom">
-				<ref name="string"/>
-			</attribute>
-		</optional>
-		<optional>
-			<attribute name="fo:border-left">
-				<ref name="string"/>
-			</attribute>
-		</optional>
-		<optional>
-			<attribute name="fo:border-right">
-				<ref name="string"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="common-border-line-width-attlist">
-		<optional>
-			<attribute name="style:border-line-width">
-				<ref name="borderWidths"/>
-			</attribute>
-		</optional>
-		<optional>
-			<attribute name="style:border-line-width-top">
-				<ref name="borderWidths"/>
-			</attribute>
-		</optional>
-		<optional>
-			<attribute name="style:border-line-width-bottom">
-				<ref name="borderWidths"/>
-			</attribute>
-		</optional>
-		<optional>
-			<attribute name="style:border-line-width-left">
-				<ref name="borderWidths"/>
-			</attribute>
-		</optional>
-		<optional>
-			<attribute name="style:border-line-width-right">
-				<ref name="borderWidths"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="borderWidths">
-		<list>
-			<ref name="positiveLength"/>
-			<ref name="positiveLength"/>
-			<ref name="positiveLength"/>
-		</list>
-	</define>
-	<define name="common-padding-attlist">
-		<optional>
-			<attribute name="fo:padding">
-				<ref name="nonNegativeLength"/>
-			</attribute>
-		</optional>
-		<optional>
-			<attribute name="fo:padding-top">
-				<ref name="nonNegativeLength"/>
-			</attribute>
-		</optional>
-		<optional>
-			<attribute name="fo:padding-bottom">
-				<ref name="nonNegativeLength"/>
-			</attribute>
-		</optional>
-		<optional>
-			<attribute name="fo:padding-left">
-				<ref name="nonNegativeLength"/>
-			</attribute>
-		</optional>
-		<optional>
-			<attribute name="fo:padding-right">
-				<ref name="nonNegativeLength"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="common-shadow-attlist">
-		<optional>
-			<attribute name="style:shadow">
-				<ref name="shadowType"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="common-keep-with-next-attlist">
-		<optional>
-			<attribute name="fo:keep-with-next">
-				<choice>
-					<value>auto</value>
-					<value>always</value>
-				</choice>
-			</attribute>
-		</optional>
-	</define>
-	<define name="common-writing-mode-attlist">
-		<optional>
-			<attribute name="style:writing-mode">
-				<choice>
-					<value>lr-tb</value>
-					<value>rl-tb</value>
-					<value>tb-rl</value>
-					<value>tb-lr</value>
-					<value>lr</value>
-					<value>rl</value>
-					<value>tb</value>
-					<value>page</value>
-				</choice>
-			</attribute>
-		</optional>
-	</define>
-	<define name="common-page-number-attlist">
-		<optional>
-			<attribute name="style:page-number">
-				<choice>
-					<ref name="positiveInteger"/>
-					<value>auto</value>
-				</choice>
-			</attribute>
-		</optional>
-	</define>
-	<define name="common-background-transparency-attlist">
-		<optional>
-			<attribute name="style:background-transparency">
-				<ref name="zeroToHundredPercent"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="style-ruby-properties">
-		<element name="style:ruby-properties">
-			<ref name="style-ruby-properties-content-strict"/>
-		</element>
-	</define>
-	<define name="style-ruby-properties-content-strict">
-		<ref name="style-ruby-properties-attlist"/>
-		<ref name="style-ruby-properties-elements"/>
-	</define>
-	<define name="style-ruby-properties-elements">
-		<empty/>
-	</define>
-	<define name="style-ruby-properties-attlist">
-		<interleave>
-			<optional>
-				<attribute name="style:ruby-position">
-					<choice>
-						<value>above</value>
-						<value>below</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:ruby-align">
-					<choice>
-						<value>left</value>
-						<value>center</value>
-						<value>right</value>
-						<value>distribute-letter</value>
-						<value>distribute-space</value>
-					</choice>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="style-section-properties">
-		<element name="style:section-properties">
-			<ref name="style-section-properties-content-strict"/>
-		</element>
-	</define>
-	<define name="style-section-properties-content-strict">
-		<ref name="style-section-properties-attlist"/>
-		<ref name="style-section-properties-elements"/>
-	</define>
-	<define name="style-section-properties-attlist">
-		<interleave>
-			<ref name="common-background-color-attlist"/>
-			<ref name="common-horizontal-margin-attlist"/>
-			<optional>
-				<attribute name="style:protect">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<ref name="common-editable-attlist"/>
-			<optional>
-				<attribute name="text:dont-balance-text-columns">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<ref name="common-writing-mode-attlist"/>
-		</interleave>
-	</define>
-	<define name="style-section-properties-elements">
-		<interleave>
-			<ref name="style-background-image"/>
-			<ref name="style-columns"/>
-			<zeroOrMore>
-				<ref name="text-notes-configuration"/>
-			</zeroOrMore>
-		</interleave>
-	</define>
-	<define name="style-columns">
-		<optional>
-			<element name="style:columns">
-				<ref name="style-columns-attlist"/>
-				<optional>
-					<ref name="style-column-sep"/>
-				</optional>
-				<zeroOrMore>
-					<ref name="style-column"/>
-				</zeroOrMore>
-			</element>
-		</optional>
-	</define>
-	<define name="style-columns-attlist">
-		<interleave>
-			<attribute name="fo:column-count">
-				<ref name="positiveInteger"/>
-			</attribute>
-			<optional>
-				<attribute name="fo:column-gap">
-					<ref name="length"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="style-column">
-		<element name="style:column">
-			<ref name="style-column-attlist"/>
-		</element>
-	</define>
-	<define name="style-column-attlist">
-		<interleave>
-			<attribute name="style:rel-width">
-				<ref name="relativeLength"/>
-			</attribute>
-			<optional>
-				<attribute name="fo:start-indent">
-					<ref name="length"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="fo:end-indent">
-					<ref name="length"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="fo:space-before">
-					<ref name="length"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="fo:space-after">
-					<ref name="length"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="style-column-sep">
-		<element name="style:column-sep">
-			<ref name="style-column-sep-attlist"/>
-		</element>
-	</define>
-	<define name="style-column-sep-attlist">
-		<interleave>
-			<optional>
-				<attribute name="style:style">
-					<choice>
-						<value>none</value>
-						<value>solid</value>
-						<value>dotted</value>
-						<value>dashed</value>
-						<value>dot-dashed</value>
-					</choice>
-				</attribute>
-			</optional>
-			<attribute name="style:width">
-				<ref name="length"/>
-			</attribute>
-			<optional>
-				<attribute name="style:height">
-					<ref name="zeroToHundredPercent"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:vertical-align">
-					<choice>
-						<value>top</value>
-						<value>middle</value>
-						<value>bottom</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:color">
-					<ref name="color"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="style-table-properties">
-		<element name="style:table-properties">
-			<ref name="style-table-properties-content-strict"/>
-		</element>
-	</define>
-	<define name="style-table-properties-content-strict">
-		<ref name="style-table-properties-attlist"/>
-		<ref name="style-table-properties-elements"/>
-	</define>
-	<define name="style-table-properties-attlist">
-		<interleave>
-			<optional>
-				<attribute name="style:width">
-					<ref name="positiveLength"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:rel-width">
-					<ref name="percent"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:align">
-					<choice>
-						<value>left</value>
-						<value>center</value>
-						<value>right</value>
-						<value>margins</value>
-					</choice>
-				</attribute>
-			</optional>
-			<ref name="common-horizontal-margin-attlist"/>
-			<ref name="common-vertical-margin-attlist"/>
-			<ref name="common-margin-attlist"/>
-			<ref name="common-page-number-attlist"/>
-			<ref name="common-break-attlist"/>
-			<ref name="common-background-color-attlist"/>
-			<ref name="common-shadow-attlist"/>
-			<ref name="common-keep-with-next-attlist"/>
-			<optional>
-				<attribute name="style:may-break-between-rows">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="table:border-model">
-					<choice>
-						<value>collapsing</value>
-						<value>separating</value>
-					</choice>
-				</attribute>
-			</optional>
-			<ref name="common-writing-mode-attlist"/>
-			<optional>
-				<attribute name="table:display">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="style-table-properties-elements">
-		<ref name="style-background-image"/>
-	</define>
-	<define name="style-table-column-properties">
-		<element name="style:table-column-properties">
-			<ref name="style-table-column-properties-content-strict"/>
-		</element>
-	</define>
-	<define name="style-table-column-properties-content-strict">
-		<ref name="style-table-column-properties-attlist"/>
-		<ref name="style-table-column-properties-elements"/>
-	</define>
-	<define name="style-table-column-properties-elements">
-		<empty/>
-	</define>
-	<define name="style-table-column-properties-attlist">
-		<interleave>
-			<optional>
-				<attribute name="style:column-width">
-					<ref name="positiveLength"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:rel-column-width">
-					<ref name="relativeLength"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:use-optimal-column-width">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<ref name="common-break-attlist"/>
-		</interleave>
-	</define>
-	<define name="style-table-row-properties">
-		<element name="style:table-row-properties">
-			<ref name="style-table-row-properties-content-strict"/>
-		</element>
-	</define>
-	<define name="style-table-row-properties-content-strict">
-		<ref name="style-table-row-properties-attlist"/>
-		<ref name="style-table-row-properties-elements"/>
-	</define>
-	<define name="style-table-row-properties-attlist">
-		<interleave>
-			<optional>
-				<attribute name="style:row-height">
-					<ref name="positiveLength"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:min-row-height">
-					<ref name="nonNegativeLength"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:use-optimal-row-height">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<ref name="common-background-color-attlist"/>
-			<ref name="common-break-attlist"/>
-			<optional>
-				<attribute name="fo:keep-together">
-					<choice>
-						<value>auto</value>
-						<value>always</value>
-					</choice>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="style-table-row-properties-elements">
-		<ref name="style-background-image"/>
-	</define>
-	<define name="style-table-cell-properties">
-		<element name="style:table-cell-properties">
-			<ref name="style-table-cell-properties-content-strict"/>
-		</element>
-	</define>
-	<define name="style-table-cell-properties-content-strict">
-		<ref name="style-table-cell-properties-attlist"/>
-		<ref name="style-table-cell-properties-elements"/>
-	</define>
-	<define name="style-table-cell-properties-attlist">
-		<interleave>
-			<optional>
-				<attribute name="style:vertical-align">
-					<choice>
-						<value>top</value>
-						<value>middle</value>
-						<value>bottom</value>
-						<value>automatic</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:text-align-source">
-					<choice>
-						<value>fix</value>
-						<value>value-type</value>
-					</choice>
-				</attribute>
-			</optional>
-			<ref name="common-style-direction-attlist"/>
-			<optional>
-				<attribute name="style:glyph-orientation-vertical">
-					<choice>
-						<value>auto</value>
-						<value>0</value>
-						<value>0deg</value>
-						<value>0rad</value>
-						<value>0grad</value>
-					</choice>
-				</attribute>
-			</optional>
-			<ref name="common-writing-mode-attlist"/>
-			<ref name="common-shadow-attlist"/>
-			<ref name="common-background-color-attlist"/>
-			<ref name="common-border-attlist"/>
-			<optional>
-				<attribute name="style:diagonal-tl-br">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:diagonal-tl-br-widths">
-					<ref name="borderWidths"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:diagonal-bl-tr">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:diagonal-bl-tr-widths">
-					<ref name="borderWidths"/>
-				</attribute>
-			</optional>
-			<ref name="common-border-line-width-attlist"/>
-			<ref name="common-padding-attlist"/>
-			<optional>
-				<attribute name="fo:wrap-option">
-					<choice>
-						<value>no-wrap</value>
-						<value>wrap</value>
-					</choice>
-				</attribute>
-			</optional>
-			<ref name="common-rotation-angle-attlist"/>
-			<optional>
-				<attribute name="style:rotation-align">
-					<choice>
-						<value>none</value>
-						<value>bottom</value>
-						<value>top</value>
-						<value>center</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:cell-protect">
-					<choice>
-						<value>none</value>
-						<value>hidden-and-protected</value>
-						<list>
-							<oneOrMore>
-								<choice>
-									<value>protected</value>
-									<value>formula-hidden</value>
-								</choice>
-							</oneOrMore>
-						</list>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:print-content">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:decimal-places">
-					<ref name="nonNegativeInteger"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:repeat-content">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:shrink-to-fit">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="common-style-direction-attlist">
-		<optional>
-			<attribute name="style:direction">
-				<choice>
-					<value>ltr</value>
-					<value>ttb</value>
-				</choice>
-			</attribute>
-		</optional>
-	</define>
-	<define name="style-table-cell-properties-elements">
-		<ref name="style-background-image"/>
-	</define>
-	<define name="common-rotation-angle-attlist">
-		<optional>
-			<attribute name="style:rotation-angle">
-				<ref name="angle"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="style-list-level-properties">
-		<element name="style:list-level-properties">
-			<ref name="style-list-level-properties-content-strict"/>
-		</element>
-	</define>
-	<define name="style-list-level-properties-content-strict">
-		<ref name="style-list-level-properties-attlist"/>
-		<ref name="style-list-level-properties-elements"/>
-	</define>
-	<define name="style-list-level-properties-attlist">
-		<interleave>
-			<ref name="common-text-align"/>
-			<optional>
-				<attribute name="text:space-before">
-					<ref name="length"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:min-label-width">
-					<ref name="nonNegativeLength"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:min-label-distance">
-					<ref name="nonNegativeLength"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:font-name">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="fo:width">
-					<ref name="positiveLength"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="fo:height">
-					<ref name="positiveLength"/>
-				</attribute>
-			</optional>
-			<ref name="common-vertical-rel-attlist"/>
-			<ref name="common-vertical-pos-attlist"/>
-			<optional>
-				<attribute name="text:list-level-position-and-space-mode">
-					<choice>
-						<value>label-width-and-position</value>
-						<value>label-alignment</value>
-					</choice>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="style-list-level-properties-elements">
-		<ref name="style-list-level-label-alignment"/>
-	</define>
-	<define name="style-list-level-label-alignment">
-		<optional>
-			<element name="style:list-level-label-alignment">
-				<ref name="style-list-level-label-alignment-attlist"/>
-				<empty/>
-			</element>
-		</optional>
-	</define>
-	<define name="style-list-level-label-alignment-attlist">
-		<interleave>
-			<attribute name="text:label-followed-by">
-				<choice>
-					<value>listtab</value>
-					<value>space</value>
-					<value>nothing</value>
-				</choice>
-			</attribute>
-			<optional>
-				<attribute name="text:list-tab-stop-position">
-					<ref name="length"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="fo:text-indent">
-					<ref name="length"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="fo:margin-left">
-					<ref name="length"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="style-graphic-properties-attlist">
-		<interleave>
-			<optional>
-				<attribute name="draw:stroke">
-					<choice>
-						<value>none</value>
-						<value>dash</value>
-						<value>solid</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:stroke-dash">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:stroke-dash-names">
-					<ref name="styleNameRefs"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="svg:stroke-width">
-					<ref name="length"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="svg:stroke-color">
-					<ref name="color"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:marker-start">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:marker-end">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:marker-start-width">
-					<ref name="length"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:marker-end-width">
-					<ref name="length"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:marker-start-center">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:marker-end-center">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="svg:stroke-opacity">
-					<choice>
-						<data type="double">
-							<param name="minInclusive">0</param>
-							<param name="maxInclusive">1</param>
-						</data>
-						<ref name="zeroToHundredPercent"/>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:stroke-linejoin">
-					<choice>
-						<value>miter</value>
-						<value>round</value>
-						<value>bevel</value>
-						<value>middle</value>
-						<value>none</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="svg:stroke-linecap">
-					<choice>
-						<value>butt</value>
-						<value>square</value>
-						<value>round</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:symbol-color">
-					<ref name="color"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:animation">
-					<choice>
-						<value>none</value>
-						<value>scroll</value>
-						<value>alternate</value>
-						<value>slide</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:animation-direction">
-					<choice>
-						<value>left</value>
-						<value>right</value>
-						<value>up</value>
-						<value>down</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:animation-start-inside">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:animation-stop-inside">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:animation-repeat">
-					<ref name="nonNegativeInteger"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:animation-delay">
-					<ref name="duration"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:animation-steps">
-					<ref name="length"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:auto-grow-width">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:auto-grow-height">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:fit-to-size">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:fit-to-contour">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:textarea-vertical-align">
-					<choice>
-						<value>top</value>
-						<value>middle</value>
-						<value>bottom</value>
-						<value>justify</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:textarea-horizontal-align">
-					<choice>
-						<value>left</value>
-						<value>center</value>
-						<value>right</value>
-						<value>justify</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="fo:wrap-option">
-					<choice>
-						<value>no-wrap</value>
-						<value>wrap</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:shrink-to-fit">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:color-mode">
-					<choice>
-						<value>greyscale</value>
-						<value>mono</value>
-						<value>watermark</value>
-						<value>standard</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:color-inversion">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:luminance">
-					<ref name="zeroToHundredPercent"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:contrast">
-					<ref name="percent"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:gamma">
-					<ref name="percent"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:red">
-					<ref name="signedZeroToHundredPercent"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:green">
-					<ref name="signedZeroToHundredPercent"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:blue">
-					<ref name="signedZeroToHundredPercent"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:image-opacity">
-					<ref name="zeroToHundredPercent"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:shadow">
-					<choice>
-						<value>visible</value>
-						<value>hidden</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:shadow-offset-x">
-					<ref name="length"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:shadow-offset-y">
-					<ref name="length"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:shadow-color">
-					<ref name="color"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:shadow-opacity">
-					<ref name="zeroToHundredPercent"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:start-line-spacing-horizontal">
-					<ref name="distance"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:start-line-spacing-vertical">
-					<ref name="distance"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:end-line-spacing-horizontal">
-					<ref name="distance"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:end-line-spacing-vertical">
-					<ref name="distance"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:line-distance">
-					<ref name="distance"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:guide-overhang">
-					<ref name="length"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:guide-distance">
-					<ref name="distance"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:start-guide">
-					<ref name="length"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:end-guide">
-					<ref name="length"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:placing">
-					<choice>
-						<value>below</value>
-						<value>above</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:parallel">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:measure-align">
-					<choice>
-						<value>automatic</value>
-						<value>left-outside</value>
-						<value>inside</value>
-						<value>right-outside</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:measure-vertical-align">
-					<choice>
-						<value>automatic</value>
-						<value>above</value>
-						<value>below</value>
-						<value>center</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:unit">
-					<choice>
-						<value>automatic</value>
-						<value>mm</value>
-						<value>cm</value>
-						<value>m</value>
-						<value>km</value>
-						<value>pt</value>
-						<value>pc</value>
-						<value>inch</value>
-						<value>ft</value>
-						<value>mi</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:show-unit">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:decimal-places">
-					<ref name="nonNegativeInteger"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:caption-type">
-					<choice>
-						<value>straight-line</value>
-						<value>angled-line</value>
-						<value>angled-connector-line</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:caption-angle-type">
-					<choice>
-						<value>fixed</value>
-						<value>free</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:caption-angle">
-					<ref name="angle"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:caption-gap">
-					<ref name="distance"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:caption-escape-direction">
-					<choice>
-						<value>horizontal</value>
-						<value>vertical</value>
-						<value>auto</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:caption-escape">
-					<choice>
-						<ref name="length"/>
-						<ref name="percent"/>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:caption-line-length">
-					<ref name="length"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:caption-fit-line-length">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="dr3d:horizontal-segments">
-					<ref name="nonNegativeInteger"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="dr3d:vertical-segments">
-					<ref name="nonNegativeInteger"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="dr3d:edge-rounding">
-					<ref name="percent"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="dr3d:edge-rounding-mode">
-					<choice>
-						<value>correct</value>
-						<value>attractive</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="dr3d:back-scale">
-					<ref name="percent"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="dr3d:depth">
-					<ref name="length"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="dr3d:backface-culling">
-					<choice>
-						<value>enabled</value>
-						<value>disabled</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="dr3d:end-angle">
-					<ref name="angle"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="dr3d:close-front">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="dr3d:close-back">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="dr3d:lighting-mode">
-					<choice>
-						<value>standard</value>
-						<value>double-sided</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="dr3d:normals-kind">
-					<choice>
-						<value>object</value>
-						<value>flat</value>
-						<value>sphere</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="dr3d:normals-direction">
-					<choice>
-						<value>normal</value>
-						<value>inverse</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="dr3d:texture-generation-mode-x">
-					<choice>
-						<value>object</value>
-						<value>parallel</value>
-						<value>sphere</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="dr3d:texture-generation-mode-y">
-					<choice>
-						<value>object</value>
-						<value>parallel</value>
-						<value>sphere</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="dr3d:texture-kind">
-					<choice>
-						<value>luminance</value>
-						<value>intensity</value>
-						<value>color</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="dr3d:texture-filter">
-					<choice>
-						<value>enabled</value>
-						<value>disabled</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="dr3d:texture-mode">
-					<choice>
-						<value>replace</value>
-						<value>modulate</value>
-						<value>blend</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="dr3d:ambient-color">
-					<ref name="color"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="dr3d:emissive-color">
-					<ref name="color"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="dr3d:specular-color">
-					<ref name="color"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="dr3d:diffuse-color">
-					<ref name="color"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="dr3d:shininess">
-					<ref name="percent"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="dr3d:shadow">
-					<choice>
-						<value>visible</value>
-						<value>hidden</value>
-					</choice>
-				</attribute>
-			</optional>
-			<ref name="common-draw-rel-size-attlist"/>
-			<optional>
-				<attribute name="fo:min-width">
-					<choice>
-						<ref name="length"/>
-						<ref name="percent"/>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="fo:min-height">
-					<choice>
-						<ref name="length"/>
-						<ref name="percent"/>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="fo:max-height">
-					<choice>
-						<ref name="length"/>
-						<ref name="percent"/>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="fo:max-width">
-					<choice>
-						<ref name="length"/>
-						<ref name="percent"/>
-					</choice>
-				</attribute>
-			</optional>
-			<ref name="common-horizontal-margin-attlist"/>
-			<ref name="common-vertical-margin-attlist"/>
-			<ref name="common-margin-attlist"/>
-			<optional>
-				<attribute name="style:print-content">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:protect">
-					<choice>
-						<value>none</value>
-						<list>
-							<oneOrMore>
-								<choice>
-									<value>content</value>
-									<value>position</value>
-									<value>size</value>
-								</choice>
-							</oneOrMore>
-						</list>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:horizontal-pos">
-					<choice>
-						<value>left</value>
-						<value>center</value>
-						<value>right</value>
-						<value>from-left</value>
-						<value>inside</value>
-						<value>outside</value>
-						<value>from-inside</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="svg:x">
-					<ref name="coordinate"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:horizontal-rel">
-					<choice>
-						<value>page</value>
-						<value>page-content</value>
-						<value>page-start-margin</value>
-						<value>page-end-margin</value>
-						<value>frame</value>
-						<value>frame-content</value>
-						<value>frame-start-margin</value>
-						<value>frame-end-margin</value>
-						<value>paragraph</value>
-						<value>paragraph-content</value>
-						<value>paragraph-start-margin</value>
-						<value>paragraph-end-margin</value>
-						<value>char</value>
-					</choice>
-				</attribute>
-			</optional>
-			<ref name="common-vertical-pos-attlist"/>
-			<ref name="common-vertical-rel-attlist"/>
-			<ref name="common-text-anchor-attlist"/>
-			<ref name="common-border-attlist"/>
-			<ref name="common-border-line-width-attlist"/>
-			<ref name="common-padding-attlist"/>
-			<ref name="common-shadow-attlist"/>
-			<ref name="common-background-color-attlist"/>
-			<ref name="common-background-transparency-attlist"/>
-			<ref name="common-editable-attlist"/>
-			<optional>
-				<attribute name="style:wrap">
-					<choice>
-						<value>none</value>
-						<value>left</value>
-						<value>right</value>
-						<value>parallel</value>
-						<value>dynamic</value>
-						<value>run-through</value>
-						<value>biggest</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:wrap-dynamic-threshold">
-					<ref name="nonNegativeLength"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:number-wrapped-paragraphs">
-					<choice>
-						<value>no-limit</value>
-						<ref name="positiveInteger"/>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:wrap-contour">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:wrap-contour-mode">
-					<choice>
-						<value>full</value>
-						<value>outside</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:run-through">
-					<choice>
-						<value>foreground</value>
-						<value>background</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:flow-with-text">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:overflow-behavior">
-					<choice>
-						<value>clip</value>
-						<value>auto-create-new-frame</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:mirror">
-					<choice>
-						<value>none</value>
-						<value>vertical</value>
-						<ref name="horizontal-mirror"/>
-						<list>
-							<value>vertical</value>
-							<ref name="horizontal-mirror"/>
-						</list>
-						<list>
-							<ref name="horizontal-mirror"/>
-							<value>vertical</value>
-						</list>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="fo:clip">
-					<choice>
-						<value>auto</value>
-						<ref name="clipShape"/>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:wrap-influence-on-position">
-					<choice>
-						<value>iterative</value>
-						<value>once-concurrent</value>
-						<value>once-successive</value>
-					</choice>
-				</attribute>
-			</optional>
-			<ref name="common-writing-mode-attlist"/>
-			<optional>
-				<attribute name="draw:frame-display-scrollbar">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:frame-display-border">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:frame-margin-horizontal">
-					<ref name="nonNegativePixelLength"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:frame-margin-vertical">
-					<ref name="nonNegativePixelLength"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:visible-area-left">
-					<ref name="nonNegativeLength"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:visible-area-top">
-					<ref name="nonNegativeLength"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:visible-area-width">
-					<ref name="positiveLength"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:visible-area-height">
-					<ref name="positiveLength"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:draw-aspect">
-					<choice>
-						<value>content</value>
-						<value>thumbnail</value>
-						<value>icon</value>
-						<value>print-view</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:ole-draw-aspect">
-					<ref name="nonNegativeInteger"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="style-graphic-fill-properties-attlist">
-		<interleave>
-			<optional>
-				<attribute name="draw:fill">
-					<choice>
-						<value>none</value>
-						<value>solid</value>
-						<value>bitmap</value>
-						<value>gradient</value>
-						<value>hatch</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:fill-color">
-					<ref name="color"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:secondary-fill-color">
-					<ref name="color"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:fill-gradient-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:gradient-step-count">
-					<ref name="nonNegativeInteger"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:fill-hatch-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:fill-hatch-solid">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:fill-image-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:repeat">
-					<choice>
-						<value>no-repeat</value>
-						<value>repeat</value>
-						<value>stretch</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:fill-image-width">
-					<choice>
-						<ref name="length"/>
-						<ref name="percent"/>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:fill-image-height">
-					<choice>
-						<ref name="length"/>
-						<ref name="percent"/>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:fill-image-ref-point-x">
-					<ref name="percent"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:fill-image-ref-point-y">
-					<ref name="percent"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:fill-image-ref-point">
-					<choice>
-						<value>top-left</value>
-						<value>top</value>
-						<value>top-right</value>
-						<value>left</value>
-						<value>center</value>
-						<value>right</value>
-						<value>bottom-left</value>
-						<value>bottom</value>
-						<value>bottom-right</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:tile-repeat-offset">
-					<list>
-						<ref name="zeroToHundredPercent"/>
-						<choice>
-							<value>horizontal</value>
-							<value>vertical</value>
-						</choice>
-					</list>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:opacity">
-					<ref name="zeroToHundredPercent"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:opacity-name">
-					<ref name="styleNameRef"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="svg:fill-rule">
-					<choice>
-						<value>nonzero</value>
-						<value>evenodd</value>
-					</choice>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="style-graphic-properties-elements">
-		<interleave>
-			<optional>
-				<ref name="text-list-style"/>
-			</optional>
-			<ref name="style-background-image"/>
-			<ref name="style-columns"/>
-		</interleave>
-	</define>
-	<define name="common-vertical-pos-attlist">
-		<optional>
-			<attribute name="style:vertical-pos">
-				<choice>
-					<value>top</value>
-					<value>middle</value>
-					<value>bottom</value>
-					<value>from-top</value>
-					<value>below</value>
-				</choice>
-			</attribute>
-		</optional>
-		<optional>
-			<attribute name="svg:y">
-				<ref name="coordinate"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="common-vertical-rel-attlist">
-		<optional>
-			<attribute name="style:vertical-rel">
-				<choice>
-					<value>page</value>
-					<value>page-content</value>
-					<value>frame</value>
-					<value>frame-content</value>
-					<value>paragraph</value>
-					<value>paragraph-content</value>
-					<value>char</value>
-					<value>line</value>
-					<value>baseline</value>
-					<value>text</value>
-				</choice>
-			</attribute>
-		</optional>
-	</define>
-	<define name="common-editable-attlist">
-		<optional>
-			<attribute name="style:editable">
-				<ref name="boolean"/>
-			</attribute>
-		</optional>
-	</define>
-	<define name="horizontal-mirror">
-		<choice>
-			<value>horizontal</value>
-			<value>horizontal-on-odd</value>
-			<value>horizontal-on-even</value>
-		</choice>
-	</define>
-	<define name="clipShape">
-		<data type="string">
-			<param name="pattern">rect\([ ]*((-?([0-9]+(\.[0-9]*)?|\.[0-9]+)((cm)|(mm)|(in)|(pt)|(pc)))|(auto))([ ]*,[ ]*((-?([0-9]+(\.[0-9]*)?|\.[0-9]+)((cm)|(mm)|(in)|(pt)|(pc))))|(auto)){3}[ ]*\)</param>
-		</data>
-	</define>
-	<define name="nonNegativePixelLength">
-		<data type="string">
-			<param name="pattern">([0-9]+(\.[0-9]*)?|\.[0-9]+)(px)</param>
-		</data>
-	</define>
-	<define name="style-chart-properties">
-		<element name="style:chart-properties">
-			<ref name="style-chart-properties-content-strict"/>
-		</element>
-	</define>
-	<define name="style-chart-properties-content-strict">
-		<ref name="style-chart-properties-attlist"/>
-		<ref name="style-chart-properties-elements"/>
-	</define>
-	<define name="style-chart-properties-elements">
-		<empty/>
-	</define>
-	<define name="style-chart-properties-attlist">
-		<interleave>
-			<optional>
-				<attribute name="chart:scale-text">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:three-dimensional">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:deep">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:right-angled-axes">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<choice>
-				<attribute name="chart:symbol-type">
-					<value>none</value>
-				</attribute>
-				<attribute name="chart:symbol-type">
-					<value>automatic</value>
-				</attribute>
-				<group>
-					<attribute name="chart:symbol-type">
-						<value>named-symbol</value>
-					</attribute>
-					<attribute name="chart:symbol-name">
-						<choice>
-							<value>square</value>
-							<value>diamond</value>
-							<value>arrow-down</value>
-							<value>arrow-up</value>
-							<value>arrow-right</value>
-							<value>arrow-left</value>
-							<value>bow-tie</value>
-							<value>hourglass</value>
-							<value>circle</value>
-							<value>star</value>
-							<value>x</value>
-							<value>plus</value>
-							<value>asterisk</value>
-							<value>horizontal-bar</value>
-							<value>vertical-bar</value>
-						</choice>
-					</attribute>
-				</group>
-				<group>
-					<attribute name="chart:symbol-type">
-						<value>image</value>
-					</attribute>
-					<element name="chart:symbol-image">
-						<attribute name="xlink:href">
-							<ref name="anyIRI"/>
-						</attribute>
-					</element>
-				</group>
-				<empty/>
-			</choice>
-			<optional>
-				<attribute name="chart:symbol-width">
-					<ref name="nonNegativeLength"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:symbol-height">
-					<ref name="nonNegativeLength"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:sort-by-x-values">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:vertical">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:connect-bars">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:gap-width">
-					<ref name="integer"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:overlap">
-					<ref name="integer"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:group-bars-per-axis">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:japanese-candle-stick">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:interpolation">
-					<choice>
-						<value>none</value>
-						<value>cubic-spline</value>
-						<value>b-spline</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:spline-order">
-					<ref name="positiveInteger"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:spline-resolution">
-					<ref name="positiveInteger"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:pie-offset">
-					<ref name="nonNegativeInteger"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:angle-offset">
-					<ref name="angle"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:hole-size">
-					<ref name="percent"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:lines">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:solid-type">
-					<choice>
-						<value>cuboid</value>
-						<value>cylinder</value>
-						<value>cone</value>
-						<value>pyramid</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:stacked">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:percentage">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:treat-empty-cells">
-					<choice>
-						<value>use-zero</value>
-						<value>leave-gap</value>
-						<value>ignore</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:link-data-style-to-source">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:logarithmic">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:maximum">
-					<ref name="double"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:minimum">
-					<ref name="double"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:origin">
-					<ref name="double"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:interval-major">
-					<ref name="double"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:interval-minor-divisor">
-					<ref name="positiveInteger"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:tick-marks-major-inner">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:tick-marks-major-outer">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:tick-marks-minor-inner">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:tick-marks-minor-outer">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:reverse-direction">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:display-label">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:text-overlap">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="text:line-break">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:label-arrangement">
-					<choice>
-						<value>side-by-side</value>
-						<value>stagger-even</value>
-						<value>stagger-odd</value>
-					</choice>
-				</attribute>
-			</optional>
-			<ref name="common-style-direction-attlist"/>
-			<ref name="common-rotation-angle-attlist"/>
-			<optional>
-				<attribute name="chart:data-label-number">
-					<choice>
-						<value>none</value>
-						<value>value</value>
-						<value>percentage</value>
-						<value>value-and-percentage</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:data-label-text">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:data-label-symbol">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<element name="chart:label-separator">
-					<ref name="text-p"/>
-				</element>
-			</optional>
-			<optional>
-				<attribute name="chart:label-position">
-					<ref name="labelPositions"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:label-position-negative">
-					<ref name="labelPositions"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:visible">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:auto-position">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:auto-size">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:mean-value">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:error-category">
-					<choice>
-						<value>none</value>
-						<value>variance</value>
-						<value>standard-deviation</value>
-						<value>percentage</value>
-						<value>error-margin</value>
-						<value>constant</value>
-						<value>standard-error</value>
-						<value>cell-range</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:error-percentage">
-					<ref name="double"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:error-margin">
-					<ref name="double"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:error-lower-limit">
-					<ref name="double"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:error-upper-limit">
-					<ref name="double"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:error-upper-indicator">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:error-lower-indicator">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:error-lower-range">
-					<ref name="cellRangeAddressList"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:error-upper-range">
-					<ref name="cellRangeAddressList"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:series-source">
-					<choice>
-						<value>columns</value>
-						<value>rows</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:regression-type">
-					<choice>
-						<value>none</value>
-						<value>linear</value>
-						<value>logarithmic</value>
-						<value>exponential</value>
-						<value>power</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:axis-position">
-					<choice>
-						<value>start</value>
-						<value>end</value>
-						<ref name="double"/>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:axis-label-position">
-					<choice>
-						<value>near-axis</value>
-						<value>near-axis-other-side</value>
-						<value>outside-start</value>
-						<value>outside-end</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:tick-mark-position">
-					<choice>
-						<value>at-labels</value>
-						<value>at-axis</value>
-						<value>at-labels-and-axis</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="chart:include-hidden-cells">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="labelPositions">
-		<choice>
-			<value>avoid-overlap</value>
-			<value>center</value>
-			<value>top</value>
-			<value>top-right</value>
-			<value>right</value>
-			<value>bottom-right</value>
-			<value>bottom</value>
-			<value>bottom-left</value>
-			<value>left</value>
-			<value>top-left</value>
-			<value>inside</value>
-			<value>outside</value>
-			<value>near-origin</value>
-		</choice>
-	</define>
-	<define name="style-drawing-page-properties-attlist">
-		<interleave>
-			<optional>
-				<attribute name="presentation:transition-type">
-					<choice>
-						<value>manual</value>
-						<value>automatic</value>
-						<value>semi-automatic</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="presentation:transition-style">
-					<choice>
-						<value>none</value>
-						<value>fade-from-left</value>
-						<value>fade-from-top</value>
-						<value>fade-from-right</value>
-						<value>fade-from-bottom</value>
-						<value>fade-from-upperleft</value>
-						<value>fade-from-upperright</value>
-						<value>fade-from-lowerleft</value>
-						<value>fade-from-lowerright</value>
-						<value>move-from-left</value>
-						<value>move-from-top</value>
-						<value>move-from-right</value>
-						<value>move-from-bottom</value>
-						<value>move-from-upperleft</value>
-						<value>move-from-upperright</value>
-						<value>move-from-lowerleft</value>
-						<value>move-from-lowerright</value>
-						<value>uncover-to-left</value>
-						<value>uncover-to-top</value>
-						<value>uncover-to-right</value>
-						<value>uncover-to-bottom</value>
-						<value>uncover-to-upperleft</value>
-						<value>uncover-to-upperright</value>
-						<value>uncover-to-lowerleft</value>
-						<value>uncover-to-lowerright</value>
-						<value>fade-to-center</value>
-						<value>fade-from-center</value>
-						<value>vertical-stripes</value>
-						<value>horizontal-stripes</value>
-						<value>clockwise</value>
-						<value>counterclockwise</value>
-						<value>open-vertical</value>
-						<value>open-horizontal</value>
-						<value>close-vertical</value>
-						<value>close-horizontal</value>
-						<value>wavyline-from-left</value>
-						<value>wavyline-from-top</value>
-						<value>wavyline-from-right</value>
-						<value>wavyline-from-bottom</value>
-						<value>spiralin-left</value>
-						<value>spiralin-right</value>
-						<value>spiralout-left</value>
-						<value>spiralout-right</value>
-						<value>roll-from-top</value>
-						<value>roll-from-left</value>
-						<value>roll-from-right</value>
-						<value>roll-from-bottom</value>
-						<value>stretch-from-left</value>
-						<value>stretch-from-top</value>
-						<value>stretch-from-right</value>
-						<value>stretch-from-bottom</value>
-						<value>vertical-lines</value>
-						<value>horizontal-lines</value>
-						<value>dissolve</value>
-						<value>random</value>
-						<value>vertical-checkerboard</value>
-						<value>horizontal-checkerboard</value>
-						<value>interlocking-horizontal-left</value>
-						<value>interlocking-horizontal-right</value>
-						<value>interlocking-vertical-top</value>
-						<value>interlocking-vertical-bottom</value>
-						<value>fly-away</value>
-						<value>open</value>
-						<value>close</value>
-						<value>melt</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="presentation:transition-speed">
-					<ref name="presentationSpeeds"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="smil:type">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="smil:subtype">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="smil:direction">
-					<choice>
-						<value>forward</value>
-						<value>reverse</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="smil:fadeColor">
-					<ref name="color"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="presentation:duration">
-					<ref name="duration"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="presentation:visibility">
-					<choice>
-						<value>visible</value>
-						<value>hidden</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="draw:background-size">
-					<choice>
-						<value>full</value>
-						<value>border</value>
-					</choice>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="presentation:background-objects-visible">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="presentation:background-visible">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="presentation:display-header">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="presentation:display-footer">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="presentation:display-page-number">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="presentation:display-date-time">
-					<ref name="boolean"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="style-drawing-page-properties-elements">
-		<optional>
-			<ref name="presentation-sound"/>
-		</optional>
-	</define>
-	<define name="string">
-		<data type="string"/>
-	</define>
-	<define name="date">
-		<data type="date"/>
-	</define>
-	<define name="time">
-		<data type="time"/>
-	</define>
-	<define name="dateTime">
-		<data type="dateTime"/>
-	</define>
-	<define name="duration">
-		<data type="duration"/>
-	</define>
-	<define name="integer">
-		<data type="integer"/>
-	</define>
-	<define name="nonNegativeInteger">
-		<data type="nonNegativeInteger"/>
-	</define>
-	<define name="positiveInteger">
-		<data type="positiveInteger"/>
-	</define>
-	<define name="double">
-		<data type="double"/>
-	</define>
-	<define name="anyURI">
-		<data type="anyURI"/>
-	</define>
-	<define name="base64Binary">
-		<data type="base64Binary"/>
-	</define>
-	<define name="ID">
-		<data type="ID"/>
-	</define>
-	<define name="IDREF">
-		<data type="IDREF"/>
-	</define>
-	<define name="IDREFS">
-		<data type="IDREFS"/>
-	</define>
-	<define name="NCName">
-		<data type="NCName"/>
-	</define>
-	<define name="boolean">
-		<choice>
-			<value>true</value>
-			<value>false</value>
-		</choice>
-	</define>
-	<define name="dateOrDateTime">
-		<choice>
-			<data type="date"/>
-			<data type="dateTime"/>
-		</choice>
-	</define>
-	<define name="timeOrDateTime">
-		<choice>
-			<data type="time"/>
-			<data type="dateTime"/>
-		</choice>
-	</define>
-	<define name="language">
-		<data type="language"/>
-	</define>
-	<define name="countryCode">
-		<data type="token">
-			<param name="pattern">[A-Za-z0-9]{1,8}</param>
-		</data>
-	</define>
-	<define name="languageCode">
-		<data type="token">
-			<param name="pattern">[A-Za-z]{1,8}</param>
-		</data>
-	</define>
-	<define name="scriptCode">
-		<data type="token">
-			<param name="pattern">[A-Za-z0-9]{1,8}</param>
-		</data>
-	</define>
-	<define name="character">
-		<data type="string">
-			<param name="length">1</param>
-		</data>
-	</define>
-	<define name="length">
-		<data type="string">
-			<param name="pattern">-?([0-9]+(\.[0-9]*)?|\.[0-9]+)((cm)|(mm)|(in)|(pt)|(pc)|(px))</param>
-		</data>
-	</define>
-	<define name="nonNegativeLength">
-		<data type="string">
-			<param name="pattern">([0-9]+(\.[0-9]*)?|\.[0-9]+)((cm)|(mm)|(in)|(pt)|(pc)|(px))</param>
-		</data>
-	</define>
-	<define name="positiveLength">
-		<data type="string">
-			<param name="pattern">([0-9]*[1-9][0-9]*(\.[0-9]*)?|0+\.[0-9]*[1-9][0-9]*|\.[0-9]*[1-9][0-9]*)((cm)|(mm)|(in)|(pt)|(pc)|(px))</param>
-		</data>
-	</define>
-	<define name="percent">
-		<data type="string">
-			<param name="pattern">-?([0-9]+(\.[0-9]*)?|\.[0-9]+)%</param>
-		</data>
-	</define>
-	<define name="zeroToHundredPercent">
-		<data type="string">
-			<param name="pattern">([0-9]?[0-9](\.[0-9]*)?|100(\.0*)?|\.[0-9]+)%</param>
-		</data>
-	</define>
-	<define name="signedZeroToHundredPercent">
-		<data type="string">
-			<param name="pattern">-?([0-9]?[0-9](\.[0-9]*)?|100(\.0*)?|\.[0-9]+)%</param>
-		</data>
-	</define>
-	<define name="relativeLength">
-		<data type="string">
-			<param name="pattern">[0-9]+\*</param>
-		</data>
-	</define>
-	<define name="coordinate">
-		<ref name="length"/>
-	</define>
-	<define name="distance">
-		<ref name="length"/>
-	</define>
-	<define name="color">
-		<data type="string">
-			<param name="pattern">#[0-9a-fA-F]{6}</param>
-		</data>
-	</define>
-	<define name="angle">
-		<data type="string"/>
-	</define>
-	<define name="CURIE">
-		<data type="string">
-			<param name="pattern">(([\i-[:]][\c-[:]]*)?:)?.+</param>
-			<param name="minLength">1</param>
-		</data>
-	</define>
-	<define name="CURIEs">
-		<list>
-			<oneOrMore>
-				<ref name="CURIE"/>
-			</oneOrMore>
-		</list>
-	</define>
-	<define name="SafeCURIE">
-		<data type="string">
-			<param name="pattern">\[(([\i-[:]][\c-[:]]*)?:)?.+\]</param>
-			<param name="minLength">3</param>
-		</data>
-	</define>
-	<define name="URIorSafeCURIE">
-		<choice>
-			<ref name="anyURI"/>
-			<ref name="SafeCURIE"/>
-		</choice>
-	</define>
-	<define name="styleName">
-		<data type="NCName"/>
-	</define>
-	<define name="styleNameRef">
-		<choice>
-			<data type="NCName"/>
-			<empty/>
-		</choice>
-	</define>
-	<define name="styleNameRefs">
-		<list>
-			<zeroOrMore>
-				<data type="NCName"/>
-			</zeroOrMore>
-		</list>
-	</define>
-	<define name="variableName">
-		<data type="string"/>
-	</define>
-	<define name="targetFrameName">
-		<choice>
-			<value>_self</value>
-			<value>_blank</value>
-			<value>_parent</value>
-			<value>_top</value>
-			<ref name="string"/>
-		</choice>
-	</define>
-	<define name="valueType">
-		<choice>
-			<value>float</value>
-			<value>time</value>
-			<value>date</value>
-			<value>percentage</value>
-			<value>currency</value>
-			<value>boolean</value>
-			<value>string</value>
-		</choice>
-	</define>
-	<define name="points">
-		<data type="string">
-			<param name="pattern">-?[0-9]+,-?[0-9]+([ ]+-?[0-9]+,-?[0-9]+)*</param>
-		</data>
-	</define>
-	<define name="pathData">
-		<data type="string"/>
-	</define>
-	<define name="vector3D">
-		<data type="string">
-			<param name="pattern">\([ ]*-?([0-9]+(\.[0-9]*)?|\.[0-9]+)([ ]+-?([0-9]+(\.[0-9]*)?|\.[0-9]+)){2}[ ]*\)</param>
-		</data>
-	</define>
-	<define name="namespacedToken">
-		<data type="QName">
-			<param name="pattern">[^:]+:[^:]+</param>
-		</data>
-	</define>
-	<define name="anyIRI">
-		<data type="anyURI"/>
-		<dc:description>An IRI-reference as defined in [RFC3987]. See ODF 1.2 Part 1 section 18.3.</dc:description> 
-	</define>
-	<define name="anyAttListOrElements">
-		<zeroOrMore>
-			<attribute>
-				<anyName/>
-				<text/>
-			</attribute>
-		</zeroOrMore>
-		<ref name="anyElements"/>
-	</define>
-	<define name="anyElements">
-		<zeroOrMore>
-			<element>
-				<anyName/>
-				<mixed>
-					<ref name="anyAttListOrElements"/>
-				</mixed>
-			</element>
-		</zeroOrMore>
-	</define>
-</grammar>
diff --git a/apps/files_odfviewer/src/webodf/programs/docnosis/application-vnd.oasis.opendocument.presentation.png b/apps/files_odfviewer/src/webodf/programs/docnosis/application-vnd.oasis.opendocument.presentation.png
deleted file mode 100644
index 1d0fdc08af2f32c16e879686b7da19353b0bca24..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6617
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%0Awyy
zzd+9h7hila1B2QIGZ5>~8|M%tqkJnT(9?Sa*(usA1Tum~uYCP7Zhfu3Pc*-2(<Vmm
z`chtA4nO_$6LacDjT*&zvHHYrBkRz^oTpEp&P;;dFQ7u-Azy;P)3<M5b{(U_)nirh
zdgU9>TPZmaV0bbUXf`3lE)QUQYKECPp!M~75a>anI(RiTHLz>fF4(qhTim3{qeqW2
zMO}I2mC&zWKXyGkzl2`5Y10O#PMykphdq1tu-_;uD$=fb;J^V`wQ3a<7Z*d9E?pR_
z5L4(CY{mk5`|YIX+cE%M6FklUb^{(p$~XJI-2{!iygb%JiMr1|`)q9k2bNV-Hfjh4
zgG`)0YiG=uG0b!j0L-qNo14q7tAeV&Vq`2c#!DmtWE>9mY!smHv2^nr3WE9^Lv<F9
zep#0rg%nHIbmO{q>D@$>uY$)2VozlP!Qy!VDrKu6urdcmo7`A=f^_Eg6IH%lD%dlb
zK&yozjl~4bLHTA=!qUP3P9}w_if?Wpa8voJ3Gj9z$RY|*H#Sn8rRD$vx0P?T^E&6X
z;b1%OS9M}kC1$EmkP79i=i(TE^YC!6KE^hJAXAwjmC83OK2I$Ssb@lnzOk9e1gTWM
zek`EL3<v8?fWFsfA`_%q`FbbNyFNfYPN2HLQqb*`WlWtW!USfi<8*?+Y67R(u@ykf
z7MH5PFq(lTH5_d0^=i*IGJ(nhcDst`-;1Zh^njqTlyAiVo*oW1`T>~+g2q(7<=#t@
zhlhjpjWklfO8<I0r}_bU5Y%T5%s$r`AV`Js&3phoAoQz)($4@6GJ!PjF4KzMZ%OYT
z@sJN-RyJ?mY}p(1{()UjX~_4iW(!$e*J@Ueelmx8-gwUHygu<|{CuJ_ip<U@5_x%o
z0X)@HGPFqP0zhgu3Cfmq=^>ESf0hB97J6D^Yvakc?i!};U8gRekEu=0sau_i^?Z(b
z$PTU>bL|BFlj>D#8%#j#vFdUAOy1Lfh6CfZxVUR3@;j!VGhD+)Hz{X;pRnp}6%KN4
zdnxW;ER%cxPfoAZklDrCvnudx+1?loumG!(kTFko%$Pz}azV-&V9EEw7DU0r?0GI`
zkFCl|I)rrbFw>1w<J!<2K7V_bpZtK?C}*K`F>?&FC8dQNzFjEvgv|v@w+ml3<RbqM
XQNJo$)Gw_d00000NkvXXu0mjfFS<TW

diff --git a/apps/files_odfviewer/src/webodf/programs/docnosis/application-vnd.oasis.opendocument.spreadsheet.png b/apps/files_odfviewer/src/webodf/programs/docnosis/application-vnd.oasis.opendocument.spreadsheet.png
deleted file mode 100644
index 9614ca81d6af07ef50296a491708e7f1bdcea202..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7002
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

diff --git a/apps/files_odfviewer/src/webodf/programs/docnosis/application-vnd.oasis.opendocument.text.png b/apps/files_odfviewer/src/webodf/programs/docnosis/application-vnd.oasis.opendocument.text.png
deleted file mode 100644
index 3fa71f4dc140eef6005415d37557c973c8b61503..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6723
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
Z{{bYFzUPlgdp!UE002ovPDHLkV1g%jzAFF#

diff --git a/apps/files_odfviewer/src/webodf/programs/docnosis/docnosis.js b/apps/files_odfviewer/src/webodf/programs/docnosis/docnosis.js
deleted file mode 100644
index 4bddc12cc2..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/docnosis/docnosis.js
+++ /dev/null
@@ -1,779 +0,0 @@
-/*global runtime, Node, window, DOMParser, core, xmldom, NodeFilter, alert,
-   FileReader*/
-runtime.loadClass("core.Zip");
-runtime.loadClass("core.Base64");
-runtime.loadClass("xmldom.RelaxNG");
-
-/** This code runs a number of tests on an ODF document.
- * Ideally, it would use ODFContainer, but for now, it uses a custome container
- * for loaded odf files.
- */
-
-function conformsToPattern(object, pattern, name) {
-    "use strict";
-    var i;
-    if (object === undefined || object === null) {
-        return pattern === null || (typeof pattern) !== "object";
-    }
-    for (i in pattern) {
-        if (pattern.hasOwnProperty(i)) {
-            if (!(object.hasOwnProperty(i) ||
-                        (i === "length" && object.length)) ||
-                    !conformsToPattern(object[i], pattern[i], i)) {
-                return false;
-            }
-        }
-    }
-    return true;
-}
-
-function getConformingObjects(object, pattern, name) {
-    "use strict";
-    var c = [], i, j;
-    name = name || "??";
-    // we do not look inside long arrays and strings atm,
-    // detection of these types could be better
-    function accept(object) {
-        return object !== null && object !== undefined &&
-            (typeof object) === "object" &&
-            (object.length === undefined || object.length < 1000) &&
-            !(object instanceof Node) &&
-            !(object.constructor && object.constructor === window.Uint8Array);
-    }
-    for (i in object) {
-        if (object.hasOwnProperty(i) && accept(object[i])) {
-            c = c.concat(getConformingObjects(object[i], pattern, i));
-        }
-    }
-    if (conformsToPattern(object, pattern, "?")) {
-        c.push(object);
-    }
-    return c;
-}
-function parseXml(data, errorlog, name) {
-    "use strict";
-    function getText(e) {
-        var str = "", c = e.firstChild;
-        while (c) {
-            if (c.nodeType === 3) {
-                str += c.nodeValue;
-            } else {
-                str += getText(c);
-            }
-            c = c.nextSibling;
-        }
-        return str;
-    }
-    var str, parser, errorelements;
-    try {
-        str = runtime.byteArrayToString(data, "utf8");
-        parser = new DOMParser();
-        str = parser.parseFromString(str, "text/xml");
-        if (str.documentElement.localName === "parsererror"
-                || str.documentElement.localName === "html") {
-            errorelements = str.getElementsByTagName("parsererror");
-            if (errorelements.length > 0) {
-                errorlog.push("invalid XML in " + name + ": " +
-                    getText(errorelements[0]));
-                str = null;
-            }
-        }
-    } catch (err) {
-        errorlog.push(err);
-    }
-    return str;
-}
-
-/*** the jobs / tests ***/
-
-function ParseXMLJob() {
-    "use strict";
-    this.inputpattern = { file: { entries: [] } };
-    this.outputpattern  = {
-        file: { entries: [] },
-        errors: { parseXmlErrors: [] },
-        content_xml: null,
-        manifest_xml: null,
-        settings_xml: null,
-        meta_xml: null,
-        styles_xml: null
-    };
-    function parseXmlFiles(input, position, callback) {
-        var e = input.file.entries,
-            filename,
-            ext,
-            dom;
-        if (position >= e.length) {
-            return callback();
-        }
-        filename = e[position].filename;
-        ext = filename.substring(filename.length - 4);
-        if (ext === ".xml" || ext === ".rdf") {
-            dom = parseXml(e[position].data, input.errors.parseXmlErrors,
-                    filename);
-            if (filename === "content.xml") {
-                input.content_xml = dom;
-            } else if (filename === "META-INF/manifest.xml") {
-                input.manifest_xml = dom;
-            } else if (filename === "styles.xml") {
-                input.styles_xml = dom;
-            } else if (filename === "meta.xml") {
-                input.meta_xml = dom;
-            } else if (filename === "settings.xml") {
-                input.settings_xml = dom;
-            }
-            e[position].dom = dom;
-        }
-        window.setTimeout(function () {
-            parseXmlFiles(input, position + 1, callback);
-        }, 0);
-    }
-    this.run = function (input, callback) {
-        input.errors = input.errors || {};
-        input.errors.parseXmlErrors = [];
-        input.content_xml = null;
-        input.manifest_xml = null;
-        input.styles_xml = null;
-        input.meta_xml = null;
-        input.settings_xml = null;
-        parseXmlFiles(input, 0, callback);
-    };
-}
-function UnpackJob() {
-    "use strict";
-    this.inputpattern = { file: { path: "", data: { length: 0 } } };
-    this.outputpattern  = {
-        file: { entries: [], dom: null }, errors: { unpackErrors: [] }
-    };
-    function getText(e) {
-        var str = "", c = e.firstChild;
-        while (c) {
-            if (c.nodeType === 3) {
-                str += c.nodeValue;
-            } else {
-                str += getText(c);
-            }
-            c = c.nextSibling;
-        }
-        return str;
-    }
-    function loadZipEntries(input, position, callback) {
-        if (position >= input.file.entries.length) {
-            return callback();
-        }
-        var e = input.file.entries[position];
-        e.load(function (err, data) {
-            if (err) {
-                input.errors.unpackErrors.push(err);
-            }
-            e.error = err;
-            e.data = data;
-            window.setTimeout(function () {
-                loadZipEntries(input, position + 1, callback);
-            }, 0);
-        });
-    }
-    function loadZip(input, callback) {
-        var zip = new core.Zip(input.file.path, function (err, zip) {
-            var i;
-            if (err) {
-                input.errors.unpackErrors.push(err);
-                callback();
-            } else {
-                input.file.entries = zip.getEntries();
-                loadZipEntries(input, 0, callback);
-            }
-        });
-    }
-    function loadXml(input, callback) {
-        input.file.dom = parseXml(input.file.data, input.errors.unpackErrors,
-                input.file.name);
-        callback();
-    }
-    this.run = function (input, callback) {
-        input.errors = input.errors || {};
-        input.errors.unpackErrors = [];
-        input.file.dom = null;
-        input.file.entries = [];
-
-        if (input.file.data.length < 1) {
-            input.errors.unpackErrors.push("Input data is empty.");
-            return;
-        }
-        if (input.file.data[0] === 80) { // a ZIP file starts with 'P'
-            loadZip(input, callback);
-        } else {
-            loadXml(input, callback);
-        }
-    };
-}
-function MimetypeTestJob(odffile) {
-    "use strict";
-    this.inputpattern = {
-        file: { entries: [], dom: null },
-        manifest_xml: null
-    };
-    this.outputpattern = { mimetype: "", errors: { mimetypeErrors: [] } };
-    var manifestns = "urn:oasis:names:tc:opendocument:xmlns:manifest:1.0";
-    function getManifestMimetype(manifest) {
-        if (!manifest) {
-            return null;
-        }
-        var path, mimetype, node;
-        node = manifest.documentElement.firstChild;
-        while (node) {
-            if (node.nodeType === 1 && node.localName === "file-entry" &&
-                    node.namespaceURI === manifestns) {
-                path = node.getAttributeNS(manifestns, "full-path");
-                if (path === "/") {
-                    mimetype = node.getAttributeNS(manifestns, "media-type");
-                    break;
-                }
-            }
-            node = node.nextSibling;
-        }
-        return mimetype;
-    }
-    this.run = function (input, callback) {
-        input.mimetype = null;
-        input.errors.mimetypeErrors = [];
-        var mime = null,
-            altmime,
-            e = input.file.entries,
-            i;
-        if (input.file.dom) {
-            mime = input.file.dom.documentElement.getAttributeNS(
-                "urn:oasis:names:tc:opendocument:xmlns:office:1.0", "mimetype");
-        } else {
-            if (e.length < 1 || e[0].filename !== "mimetype") {
-                input.errors.mimetypeErrors.push(
-                        "First file in zip is not 'mimetype'");
-            }
-            for (i = 0; i < e.length; i += 1) {
-                if (e[i].filename === "mimetype") {
-                    mime = runtime.byteArrayToString(e[i].data, "binary");
-                    break;
-                }
-            }
-            if (mime) {
-                altmime = input.file.data.slice(38, 38 + mime.length);
-                altmime = runtime.byteArrayToString(altmime, "binary");
-                if (mime !== altmime) {
-                    input.errors.mimetypeErrors.push(
-                           "mimetype should start at byte 38 in the zip file.");
-                }
-            }
-            // compare with mimetype from manifest_xml
-            altmime = getManifestMimetype(input.manifest_xml);
-            if (altmime !== mime) {
-                input.errors.mimetypeErrors.push(
-                    "manifest.xml has a different mimetype.");
-            }
-        }
-        if (!mime) {
-            input.errors.mimetypeErrors.push("No mimetype was found.");
-        }
-        input.mimetype = mime;
-        callback();
-    };
-}
-function VersionTestJob() {
-    "use strict";
-    this.inputpattern = {
-        file: { dom: null },
-        content_xml: null,
-        styles_xml: null,
-        meta_xml: null,
-        settings_xml: null,
-        manifest_xml: null
-    };
-    this.outputpattern = { version: "", errors: { versionErrors: [] } };
-    var officens = "urn:oasis:names:tc:opendocument:xmlns:office:1.0";
-    function getVersion(dom, filename, log, vinfo, filerequired) {
-        var v, ns = officens;
-        if (!dom) {
-            if (filerequired) {
-                log.push(filename + " is missing, so version cannot be found.");
-            }
-            return;
-        }
-        if (filename === "META-INF/manifest.xml") {
-            ns = "urn:oasis:names:tc:opendocument:xmlns:manifest:1.0";
-        }
-        if (!dom.documentElement.hasAttributeNS(ns, "version")) {
-            if (vinfo.versionrequired) {
-                log.push(filename + " has no version number.");
-            }
-            return;
-        }
-        v = dom.documentElement.getAttributeNS(ns, "version");
-        if (vinfo.version === undefined) {
-            vinfo.version = v;
-            // version number is required since ODF 1.2
-            vinfo.needversion = vinfo.version === "1.2";
-            vinfo.versionSource = filename;
-        } else if (v !== vinfo.version) {
-            log.push(vinfo.versionSource + " and " + filename + " " +
-                    " have  different version number.");
-        }
-    }
-    this.run = function (input, callback) {
-        input.errors.versionErrors = [];
-        var v,
-            e = input.file.entries,
-            log = input.errors.versionErrors,
-            vinfo = {
-                version: undefined,
-                needversion: null,
-                versionSource: null
-            },
-            contentxmlhasnoversionnumber;
-        if (input.file.dom) {
-            getVersion(input.file.dom, input.file.name, log, vinfo, true);
-        } else {
-            // until we know the version number, we cannot claim that
-            // content.xml needs a version number
-            getVersion(input.content_xml, "content.xml", log, vinfo, true);
-            contentxmlhasnoversionnumber = vinfo.version === undefined;
-            getVersion(input.manifest_xml, "META-INF/manifest.xml", log,
-                    vinfo, true);
-            getVersion(input.styles_xml, "styles.xml", log, vinfo);
-            getVersion(input.meta_xml, "meta.xml", log, vinfo);
-            getVersion(input.settings_xml, "settings.xml", log, vinfo);
-            if (vinfo.needversion && contentxmlhasnoversionnumber) {
-                log.push("content.xml has no version number.");
-            }
-        }
-        input.version = vinfo.version;
-        callback();
-    };
-}
-function GetThumbnailJob() {
-    "use strict";
-    var base64 = new core.Base64();
-    this.inputpattern = { file: { entries: [] }, errors: {}, mimetype: "" };
-    this.outputpattern = { thumbnail: "", errors: { thumbnailErrors: [] } };
-    this.run = function (input, callback) {
-        input.thumbnail = null;
-        input.errors.thumbnailErrors = [];
-        var i, e = input.file.entries, mime = input.mimetype, thumb = null;
-        if (mime === "application/vnd.oasis.opendocument.text") {
-            thumb = "application-vnd.oasis.opendocument.text.png";
-        } else if (mime === "application/vnd.oasis.opendocument.spreadsheet") {
-            thumb = "application-vnd.oasis.opendocument.spreadsheet.png";
-        } else if (mime === "application/vnd.oasis.opendocument.presentation") {
-            thumb = "application-vnd.oasis.opendocument.presentation.png";
-        }
-        for (i = 0; i < e.length; i += 1) {
-            if (e[i].filename === "Thumbnails/thumbnail.png") {
-                thumb = "data:image/png;base64," +
-                        base64.convertUTF8ArrayToBase64(e[i].data);
-                break;
-            }
-        }
-        input.thumbnail = thumb;
-        callback();
-    };
-}
-function RelaxNGJob() {
-    "use strict";
-    var parser = new xmldom.RelaxNGParser(),
-        validators = {};
-    this.inputpattern = { file: {dom: null}, version: null };
-    this.outputpattern = { errors: { relaxngErrors: [] } };
-    function loadValidator(ns, version, callback) {
-        var rng;
-        if (ns === "urn:oasis:names:tc:opendocument:xmlns:manifest:1.0") {
-            if (version === "1.2") {
-                rng = "OpenDocument-v1.2-cos01-manifest-schema.rng";
-            } else if (version === "1.1") {
-                rng = "OpenDocument-manifest-schema-v1.1.rng";
-            } else if (version === "1.0") {
-                rng = "OpenDocument-manifest-schema-v1.0-os.rng";
-            }
-        } else if (ns === "urn:oasis:names:tc:opendocument:xmlns:office:1.0") {
-            if (version === "1.2") {
-                rng = "OpenDocument-v1.2-cos01-schema.rng";
-            } else if (version === "1.1") {
-                rng = "OpenDocument-schema-v1.1.rng";
-            } else if (version === "1.0") {
-                rng = "OpenDocument-schema-v1.0-os.rng";
-            }
-        }
-        if (rng) {
-            runtime.loadXML(rng, function (err, dom) {
-                var relaxng;
-                if (err) {
-                    runtime.log(err);
-                } else {
-                    relaxng = new xmldom.RelaxNG();
-                    err = parser.parseRelaxNGDOM(dom, relaxng.makePattern);
-                    if (err) {
-                        runtime.log(err);
-                    } else {
-                        relaxng.init(parser.rootPattern);
-                    }
-                }
-                validators[ns] = validators[ns] || {};
-                validators[ns][version] = relaxng;
-                callback(relaxng);
-            });
-        } else {
-            callback(null);
-        }
-    }
-    function getValidator(ns, version, callback) {
-        if (ns === "urn:oasis:names:tc:opendocument:xmlns:office:1.0" ||
-                ns === "urn:oasis:names:tc:opendocument:xmlns:manifest:1.0") {
-            if (!version) {
-                version = "1.1";
-            }
-        }
-        if (validators[ns] && validators[ns][version]) {
-            return callback(validators[ns][version]);
-        }
-        loadValidator(ns, version, callback);
-    }
-    function validate(log, dom, filename, version, callback) {
-        var ns = dom.documentElement.namespaceURI;
-        getValidator(ns, version, function (relaxng) {
-            if (!relaxng) {
-                return callback();
-            }
-            var walker = dom.createTreeWalker(dom.firstChild, 0xFFFFFFFF,
-                    { acceptNode: function(node) {
-                        return NodeFilter.FILTER_ACCEPT; }
-                    }, false),
-                err;
-runtime.log("START VALIDATING");
-            err = relaxng.validate(walker, function (err) {
-runtime.log("FINISHED VALIDATING");
-                var i;
-                if (err) {
-                    for (i = 0; i < err.length; i += 1) {
-                        log.push(filename + ": " + err[i]);
-                    }
-                }
-                callback();
-            });
-        });
-    }
-    function validateEntries(log, entries, position, version, callback) {
-        if (position >= entries.length) {
-            return callback();
-        }
-        var e = entries[position];
-        if (e.dom) {
-            validate(log, e.dom, e.filename, version, function () {
-                window.setTimeout(function () {
-                    validateEntries(log, entries, position + 1, version,
-                            callback);
-                }, 0);
-            });
-        } else {
-            validateEntries(log, entries, position + 1, version, callback);
-        }
-    }
-    this.run = function (input, callback) {
-        input.errors = input.errors || {};
-        input.errors.relaxngErrors = [];
-        runtime.log(input.version);
-        if (input.file.dom) {
-            validate(input.errors.relaxngErrors, input.file.dom,
-                input.file.path, input.version, callback);
-            return;
-        }
-        var i, e = input.file.entries;
-        validateEntries(input.errors.relaxngErrors, input.file.entries, 0,
-            input.version, callback);
-    };
-}
-
-function DataRenderer(parentelement) {
-    "use strict";
-    var doc = parentelement.ownerDocument,
-        element = doc.createElement("div"),
-        lastrendertime,
-        delayedRenderComing,
-        renderinterval = 300; // minimal milliseconds between renders
-    function clear(element) {
-        while (element.firstChild) {
-            element.removeChild(element.firstChild);
-        }
-    }
-    function addParagraph(div, text) {
-        var p = doc.createElement("p");
-        p.appendChild(doc.createTextNode(text));
-        div.appendChild(p);
-    }
-    function addSpan(parent, nodename, text) {
-        var e = doc.createElement(nodename);
-        e.appendChild(doc.createTextNode(text));
-        parent.appendChild(e);
-    }
-    function addErrors(div, e, active) {
-        var i, o;
-        for (i in e) {
-            if (e.hasOwnProperty(i)) {
-                o = e[i];
-                if (active && ((typeof o) === "string"
-                        || o instanceof String)) {
-                    addParagraph(div, o);
-                } else if (o && (typeof o) === "object" &&
-                        !(o instanceof Node) &&
-                        !(o.constructor &&
-                          o.constructor === window.Uint8Array)) {
-                    addErrors(div, o, active || i === "errors");
-                }
-            }
-        }
-    }
-    function renderFile(data) {
-        var div = doc.createElement("div"),
-            h1 = doc.createElement("h1"),
-            icon = doc.createElement("img");
-        div.style.clear = "both";
-        div.appendChild(h1);
-        div.appendChild(icon);
-        h1.appendChild(doc.createTextNode(data.file.path));
-        element.appendChild(div);
-        if (data.thumbnail) {
-            icon.src = data.thumbnail;
-        }
-        icon.style.width = "128px";
-        icon.style.float = "left";
-        icon.style.mozBoxShadow = icon.style.webkitBoxShadow =
-                icon.style.boxShadow = "3px 3px 4px #000";
-        icon.style.marginRight = icon.style.marginBottom = "10px";
-        addParagraph(div, "mimetype: " + data.mimetype);
-        addParagraph(div, "version: " + data.version);
-        addParagraph(div, "document representation: " +
-                ((data.file.dom) ? "single XML document" :"package"));
-        addErrors(div, data, false);
-    }
-    function dorender(data) {
-        clear(element);
-        var i;
-        for (i = 0; i < data.length; i += 1) {
-            renderFile(data[i]);
-        }
-    }
-    this.render = function render(data) {
-        var now = Date.now();
-        if (!lastrendertime || now - lastrendertime > renderinterval) {
-            lastrendertime = now;
-            dorender(data);
-        } else if (!delayedRenderComing) {
-            delayedRenderComing = true;
-            window.setTimeout(function () {
-                delayedRenderComing = false;
-                lastrendertime = now + renderinterval;
-                dorender(data);
-            }, renderinterval);
-        }
-    };
-    parentelement.appendChild(element);
-}
-
-function JobRunner(datarenderer) {
-    "use strict";
-    var jobrunner = this,
-        jobtypes = [],
-        data,
-        busy = false,
-        todo = [];
-        
-    jobtypes.push(new UnpackJob());
-    jobtypes.push(new MimetypeTestJob());
-    jobtypes.push(new GetThumbnailJob());
-    jobtypes.push(new VersionTestJob());
-    jobtypes.push(new ParseXMLJob());
-    jobtypes.push(new RelaxNGJob());
-
-    function run() {
-        if (busy) {
-           return;
-        }
-        var job = todo.shift();
-        if (job) {
-            busy = true;
-            job.job.run(job.object, function () {
-                busy = false;
-                if (!conformsToPattern(job.object, job.job.outputpattern)) {
-                    throw "Job does not give correct output.";
-                }
-                datarenderer.render(data);
-                window.setTimeout(run, 0);
-            });
-        }
-    }
-
-    function update(ignore, callback) {
-        var i, jobtype, j, inobjects, outobjects;
-        todo = [];
-        for (i = 0; i < jobtypes.length; i += 1) {
-            jobtype = jobtypes[i];
-            inobjects = getConformingObjects(data, jobtype.inputpattern);
-            outobjects = getConformingObjects(data, jobtype.outputpattern);
-            for (j = 0; j < inobjects.length; j += 1) {
-                if (outobjects.indexOf(inobjects[j]) === -1) {
-                    todo.push({job: jobtype, object: inobjects[j]});
-                }
-            }
-        }
-        if (todo.length > 0) {
-            // run update again after all todos are done
-            todo.push({job: jobrunner, object: null});
-        }
-        if (callback) {
-            callback();
-        } else {
-            run();
-        }
-    }
-
-    this.run = update;
-
-    this.setData = function setData(newdata) {
-        data = newdata;
-        if (busy) {
-            todo = [];
-            todo.push({job: jobrunner, object: null});
-        } else {
-            update();
-        }
-    };
-}
-function LoadingFile(file) {
-    "use strict";
-    var data,
-        error,
-        readRequests = [];
-    function load(callback) {
-        var reader = new FileReader();
-        reader.onloadend = function(evt) {
-            data = runtime.byteArrayFromString(evt.target.result, "binary");
-            error = evt.target.error && String(evt.target.error);
-            var i = 0;
-            for (i = 0; i < readRequests.length; i += 1) {
-                readRequests[i]();
-            }
-            readRequests = undefined;
-            reader = undefined;
-            callback(error, data);
-        };
-        reader.readAsBinaryString(file);
-    }
-    this.file = file;
-    this.read = function (offset, length, callback) {
-        function read() {
-            if (error) {
-                return callback(error);
-            }
-            if (data) {
-                return callback(error, data.slice(offset, offset + length));
-            }
-            readRequests.push(read);
-        }
-        read();
-    };
-    this.load = load;
-}
-function Docnosis(element) {
-    "use strict";
-    var doc = element.ownerDocument,
-        form,
-        diagnoses = doc.createElement("div"),
-        openedFiles = {},
-        datarenderer = new DataRenderer(diagnoses),
-        jobrunner = new JobRunner(datarenderer),
-        jobrunnerdata = [];
-
-    function dragHandler(evt) {
-        var over = evt.type === "dragover" && evt.target.nodeName !== "INPUT";
-        if (over || evt.type === "drop") {
-            evt.stopPropagation();
-            evt.preventDefault();
-        }
-        if (evt.target.style) {
-            evt.target.style.background = (over ? "#CCCCCC" : "inherit");
-        }
-    }
-
-    function fileSelectHandler(evt) {
-        // cancel event and hover styling
-        dragHandler(evt);
-
-        function diagnoseFile(file) {
-            var loadingfile, path;
-            path = file.name;
-            loadingfile = new LoadingFile(file);
-            openedFiles[path] = loadingfile;
-            loadingfile.load(function (error, data) {
-                jobrunnerdata.push({file:{
-                    path: path,
-                    data: data
-                }});
-                jobrunner.setData(jobrunnerdata);
-            });
-        }
-        // process all File objects
-        var i, files, div;
-        files = (evt.target && evt.target.files) ||
-                (evt.dataTransfer && evt.dataTransfer.files);
-        if (files) {
-            for (i = 0; files && i < files.length; i += 1) {
-                div = doc.createElement("div");
-                diagnoses.appendChild(div);
-                diagnoseFile(files[i]);
-            }
-        } else {
-            alert("File(s) could not be opened in this browser.");
-        }
-    }
-
-    function createForm() {
-        var form = doc.createElement("form"),
-            fieldset = doc.createElement("fieldset"),
-            legend = doc.createElement("legend"),
-            input = doc.createElement("input");
-        form = doc.createElement("form");
-        form.appendChild(fieldset);
-        fieldset.appendChild(legend);
-        input.setAttribute("type", "file");
-        input.setAttribute("name", "fileselect[]");
-        input.setAttribute("multiple", "multiple");
-        input.addEventListener("change", fileSelectHandler, false);
-        fieldset.appendChild(input);
-        fieldset.appendChild(doc.createTextNode("or drop files here"));
-        legend.appendChild(doc.createTextNode("docnosis"));
-        form.addEventListener("dragover", dragHandler, false);
-        form.addEventListener("dragleave", dragHandler, false);
-        form.addEventListener("drop", fileSelectHandler, false);
-        return form;
-    }
-
-    function enhanceRuntime() {
-        var read = runtime.read,
-            getFileSize = runtime.getFileSize;
-        runtime.read = function (path, offset, length, callback) {
-            if (openedFiles.hasOwnProperty(path)) {
-                return openedFiles[path].read(offset, length, callback);
-            } else {
-                return read(path, offset, length, callback);
-            }
-        };
-        runtime.getFileSize = function (path, callback) {
-            if (openedFiles.hasOwnProperty(path)) {
-                return callback(openedFiles[path].file.size);
-            } else {
-                return getFileSize(path, callback);
-            }
-        };
-    }
-
-    form = createForm();
-    element.appendChild(form);
-    element.appendChild(diagnoses);
-    enhanceRuntime();
-}
diff --git a/apps/files_odfviewer/src/webodf/programs/docnosis/index.html b/apps/files_odfviewer/src/webodf/programs/docnosis/index.html
deleted file mode 100644
index cd56d4f746..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/docnosis/index.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html xml:lang="en" lang="en">
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8"></meta>
-  <title>docnosis</title>
-  <!-- <script src="../../webodf/webodf.js" type="text/javascript" charset="utf-8"></script> -->
-  <script src="../../webodf/lib/runtime.js" type="text/javascript" charset="utf-8"></script>
-  <script type="text/javascript">//<![CDATA[
-runtime.libraryPaths = function () {
-    return ["../../webodf/lib/"];
-};
-  //]]></script>
-  <script src="docnosis.js" type="text/javascript" charset="utf-8"></script>
-  <script type="text/javascript">//<![CDATA[
-runtime.libraryPaths = function () {
-    return ["../../webodf/lib/"];
-};
-window.addEventListener("load", function () {
-   var docnosis = document.getElementById("docnosis");
-   new Docnosis(docnosis);
-}, false);
-  //]]></script>
- </head>
- <body>
-  <div id="docnosis"></div>
- </body>
-</html>
diff --git a/apps/files_odfviewer/src/webodf/programs/firefoxextension/CMakeLists.txt b/apps/files_odfviewer/src/webodf/programs/firefoxextension/CMakeLists.txt
deleted file mode 100644
index 92d1e19f7c..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/firefoxextension/CMakeLists.txt
+++ /dev/null
@@ -1,35 +0,0 @@
-# the files that go into the extension
-set(FIREFOXEXTENSIONFILES
-    bootstrap.js
-    chrome.manifest
-    skin/default/icon.png
-    content/odf.html
-    components/odfContentHandler.js
-)
-configure_file(${CMAKE_CURRENT_SOURCE_DIR}/install.rdf.in
-    ${CMAKE_CURRENT_SOURCE_DIR}/install.rdf)
-set(WEBODFXPI ${CMAKE_CURRENT_BINARY_DIR}/webodf-${WEBODF_VERSION}.xpi)
-add_custom_command(
-    OUTPUT ${WEBODFXPI}
-    # copy the common webodf.css and webodf.js
-    COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different
-        ${CMAKE_SOURCE_DIR}/webodf/webodf.css
-        ${CMAKE_CURRENT_SOURCE_DIR}/content/webodf.css
-    COMMAND ${CMAKE_COMMAND} ARGS -E copy_if_different
-        ${CMAKE_BINARY_DIR}/webodf/webodf.js
-        ${CMAKE_CURRENT_SOURCE_DIR}/content/webodf.js
-    # zip using javascript code running in node.js
-    COMMAND ${NODE} ARGS ../../webodf/lib/runtime.js packextension.js
-        ${WEBODFXPI}
-        ${FIREFOXEXTENSIONFILES}
-        content/webodf.js
-        content/webodf.css
-        install.rdf
-    DEPENDS NodeJS
-        packextension.js ${FIREFOXEXTENSIONFILES}
-        install.rdf.in
-        ${CMAKE_SOURCE_DIR}/webodf/webodf.css
-        ${CMAKE_BINARY_DIR}/webodf/webodf.js
-    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-)
-add_custom_target(firefoxextension ALL DEPENDS ${WEBODFXPI})
diff --git a/apps/files_odfviewer/src/webodf/programs/firefoxextension/bootstrap.js b/apps/files_odfviewer/src/webodf/programs/firefoxextension/bootstrap.js
deleted file mode 100644
index c95dbd4a90..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/firefoxextension/bootstrap.js
+++ /dev/null
@@ -1,36 +0,0 @@
-/*global Components: true, dump: true, Services: true*/
-
-var Cc = Components.classes;
-var Ci = Components.interfaces;
-var Cm = Components.manager;
-var Cu = Components.utils;
-
-Cu["import"]('resource://gre/modules/Services.jsm');
-
-function log(str) {
-    "use strict";
-    dump(str + '\n');
-}
-
-function startup(aData, aReason) {
-    "use strict";
-    var manifestPath = 'chrome.manifest',
-        file = Cc['@mozilla.org/file/local;1'].createInstance(Ci.nsILocalFile);
-    try {
-        file.initWithPath(aData.installPath.path);
-        file.append(manifestPath);
-        Cm.QueryInterface(Ci.nsIComponentRegistrar).autoRegister(file);
-    } catch (e) {
-        log(e);
-    }
-}
-
-function shutdown(aData, aReason) {
-    "use strict";
-}
-
-function install(aData, aReason) {
-    "use strict";
-    var url = 'chrome://webodf.js/content/odf.html?file=%s';
-    Services.prefs.setCharPref('extensions.webodf.js.url', url);
-}
diff --git a/apps/files_odfviewer/src/webodf/programs/firefoxextension/chrome.manifest b/apps/files_odfviewer/src/webodf/programs/firefoxextension/chrome.manifest
deleted file mode 100644
index b6f6e75cfb..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/firefoxextension/chrome.manifest
+++ /dev/null
@@ -1,13 +0,0 @@
-content webodf.js content/
-skin webodf.js default skin/default/
-
-component {afe5fa21-709d-4916-b51c-56f60d574a0a} components/odfContentHandler.js
-contract @mozilla.org/uriloader/content-handler;1?type=application/vnd.oasis.opendocument.text {afe5fa21-709d-4916-b51c-56f60d574a0a}
-contract @mozilla.org/uriloader/content-handler;1?type=application/vnd.oasis.opendocument.spreadsheet {afe5fa21-709d-4916-b51c-56f60d574a0a}
-contract @mozilla.org/uriloader/content-handler;1?type=application/vnd.oasis.opendocument.presentation {afe5fa21-709d-4916-b51c-56f60d574a0a}
-category ext-to-type-mapping odt application/vnd.oasis.opendocument.text
-category ext-to-type-mapping fodt application/vnd.oasis.opendocument.text
-category ext-to-type-mapping ods application/vnd.oasis.opendocument.spreadsheet
-category ext-to-type-mapping fods application/vnd.oasis.opendocument.spreadsheet
-category ext-to-type-mapping odp application/vnd.oasis.opendocument.presentation
-category ext-to-type-mapping fodp application/vnd.oasis.opendocument.presentation
diff --git a/apps/files_odfviewer/src/webodf/programs/firefoxextension/components/odfContentHandler.js b/apps/files_odfviewer/src/webodf/programs/firefoxextension/components/odfContentHandler.js
deleted file mode 100644
index 47a3d349ac..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/firefoxextension/components/odfContentHandler.js
+++ /dev/null
@@ -1,196 +0,0 @@
-/*jslint bitwise: true*/
-/*global Components: true, dump: true, Uint8Array: true, Services: true,
-   XPCOMUtils: true*/
-var Cc = Components.classes;
-var Ci = Components.interfaces;
-var Cr = Components.results;
-var Cu = Components.utils;
-
-var ODF_CONTENT_TYPE_PREFIX = 'application/vnd.oasis.opendocument.';
-var NS_ERROR_WONT_HANDLE_CONTENT = 0x805d0001;
-
-Cu["import"]('resource://gre/modules/XPCOMUtils.jsm');
-Cu["import"]('resource://gre/modules/Services.jsm');
-
-function log(aMsg) {
-    "use strict";
-    var msg = 'odfContentHandler.js: ' + (aMsg.join ? aMsg.join('') : aMsg);
-    Cc['@mozilla.org/consoleservice;1'].getService(Ci.nsIConsoleService)
-                                       .logStringMessage(msg);
-    dump(msg + '\n');
-}
-
-function fireEventTo(aName, aData, aWindow) {
-    "use strict";
-    var mywindow = aWindow.wrappedJSObject,
-        evt = mywindow.document.createEvent('CustomEvent');
-    evt.initCustomEvent('odf' + aName, false, false, aData);
-    mywindow.document.dispatchEvent(evt);
-}
-
-function loadDocument(aWindow, aDocumentUrl) {
-    "use strict";
-    var xhr = Cc['@mozilla.org/xmlextras/xmlhttprequest;1']
-              .createInstance(Ci.nsIXMLHttpRequest);
-    xhr.onprogress = function updateProgress(evt) {
-        if (evt.lengthComputable) {
-            fireEventTo(evt.type, evt.loaded / evt.total, aWindow);
-        }
-    };
-
-    xhr.onerror = function error(evt) {
-        fireEventTo(evt.type, false, aWindow);
-    };
-
-    xhr.onload = function load(evt) {
-        var data = (xhr.mozResponseArrayBuffer || xhr.mozResponse ||
-                xhr.responseArrayBuffer || xhr.response),
-            view,
-            mywindow,
-            arrayBuffer,
-            view2,
-            array,
-            i;
-        try {
-            view = new Uint8Array(data);
-            mywindow = aWindow.wrappedJSObject;
-            arrayBuffer = new mywindow.ArrayBuffer(data.byteLength);
-            view2 = new mywindow.Uint8Array(arrayBuffer);
-            view2.set(view);
-            array = [];
-            array.length = view2.byteLength;
-            for (i = 0; i < view2.byteLength; i += 1) {
-                array[i] = view2[i];
-            }
-            fireEventTo(evt.type, array, aWindow);
-        } catch (e) {
-            log('Error - ' + e);
-        }
-    };
-
-    xhr.open('GET', aDocumentUrl);
-    xhr.responseType = 'arraybuffer';
-    xhr.send(null);
-}
-
-var WebProgressListener = {
-    init: function WebProgressListenerInit(aWindow, aUrl) {
-        "use strict";
-        this.locationHasChanged = false;
-        this.documentUrl = aUrl;
-
-        var flags = Ci.nsIWebProgress.NOTIFY_LOCATION |
-                Ci.nsIWebProgress.NOTIFY_STATE_NETWORK |
-                Ci.nsIWebProgress.NOTIFY_STATE_DOCUMENT,
-            docShell = aWindow.QueryInterface(Ci.nsIInterfaceRequestor)
-                          .getInterface(Ci.nsIWebNavigation)
-                          .QueryInterface(Ci.nsIDocShell),
-            webProgress = docShell.QueryInterface(Ci.nsIInterfaceRequestor)
-                              .getInterface(Ci.nsIWebProgress);
-        try {
-            webProgress.removeProgressListener(this);
-        } catch (e) {
-        }
-        webProgress.addProgressListener(this, flags);
-    },
-
-    onStateChange: function onStateChange(aWebProgress, aRequest, aStateFlags,
-                                        aStatus) {
-        "use strict";
-        var complete = Ci.nsIWebProgressListener.STATE_IS_WINDOW +
-                     Ci.nsIWebProgressListener.STATE_STOP;
-        if ((aStateFlags & complete) === complete && this.locationHasChanged) {
-            aWebProgress.removeProgressListener(this);
-            loadDocument(aWebProgress.DOMWindow, this.documentUrl);
-        }
-    },
-
-    onProgressChange: function onProgressChange(aWebProgress, aRequest,
-                                                aCurSelf, aMaxSelf, aCurTotal,
-                                                aMaxTotal) {
-        "use strict";
-    },
-
-    onLocationChange: function onLocationChange(aWebProgress, aRequest,
-                                              aLocationURI) {
-        "use strict";
-        this.locationHasChanged = true;
-    },
-
-    onStatusChange: function onStatusChange(aWebProgress, aRequest, aStatus,
-                                          aMessage) {
-        "use strict";
-    },
-
-    onSecurityChange: function onSecurityChange(aWebProgress, aRequest, aState) {
-        "use strict";
-    },
-
-    QueryInterface: function QueryInterface(aIID) {
-        "use strict";
-        if (aIID.equals(Ci.nsIWebProgressListener) ||
-                aIID.equals(Ci.nsISupportsWeakReference) ||
-                aIID.equals(Ci.nsISupports)) {
-            return this;
-        }
-        throw Components.results.NS_ERROR_NO_INTERFACE;
-    }
-};
-
-function odfContentHandler() {
-    "use strict";
-}
-
-odfContentHandler.prototype = {
-    handleContent: function handleContent(aMimetype, aContext, aRequest) {
-        "use strict";
-
-        if (!(aMimetype.indexOf(ODF_CONTENT_TYPE_PREFIX) === 0 ||
-                aMimetype === "application/octet-stream")) {
-            throw NS_ERROR_WONT_HANDLE_CONTENT;
-        }
-
-        if (!(aRequest instanceof Ci.nsIChannel)) {
-            throw NS_ERROR_WONT_HANDLE_CONTENT;
-        }
-
-        var mywindow = null,
-            callbacks,
-            uri = aRequest.URI,
-            targetUrl = uri.spec,
-            tail = targetUrl.substring(targetUrl.length-9),
-            url;
-
-        // if the url ends with a download parameter, then do not handle it
-        if (tail === "#download") {
-            throw NS_ERROR_WONT_HANDLE_CONTENT;
-        }
-
-        callbacks = aRequest.notificationCallbacks ||
-                    aRequest.loadGroup.notificationCallbacks;
-        if (!callbacks) {
-            return;
-        }
-
-        mywindow = callbacks.getInterface(Ci.nsIDOMWindow);
-
-        WebProgressListener.init(mywindow, uri.spec);
-
-        try {
-            url = Services.prefs.getCharPref('extensions.webodf.js.url');
-            //url = url.replace('%s', encodeURIComponent(targetUrl));
-            url = url.replace('%s', targetUrl);
-        } catch (e) {
-            log('Error retrieving the webodf base url - ' + e);
-            throw NS_ERROR_WONT_HANDLE_CONTENT;
-        }
-
-        aRequest.cancel(Cr.NS_BINDING_ABORTED);
-        mywindow.location = url;
-    },
-
-    classID: Components.ID('{afe5fa21-709d-4916-b51c-56f60d574a0a}'),
-    QueryInterface: XPCOMUtils.generateQI([Ci.nsIContentHandler])
-};
-
-var NSGetFactory = XPCOMUtils.generateNSGetFactory([odfContentHandler]);
diff --git a/apps/files_odfviewer/src/webodf/programs/firefoxextension/content/odf.html b/apps/files_odfviewer/src/webodf/programs/firefoxextension/content/odf.html
deleted file mode 100644
index 0dc023aed8..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/firefoxextension/content/odf.html
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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"></meta>
-  <style type="text/css" media="screen">
-    body, html, div {
-      padding: 0px;
-      margin: 0px;
-      border: 0px;
-    }
-    body, html {
-      height: 100%;
-      text-align: center;
-    }
-    html > body {
-      background: black;
-    }
-    div#toolbar {
-      background: white;
-      padding: 7px;
-      border-bottom: 1px solid black;
-    }
-    div#toolbar > span {
-      border: 1px solid black;
-      padding: 2px;
-    }
-    div#toolbar > span:hover {
-      background: #CCCCCC;
-    }
-  </style>
-  <link rel="stylesheet" type="text/css" href="webodf.css"/>
-  <script src="webodf.js" type="text/javascript" charset="utf-8"></script>
-  <script type="text/javascript" charset="utf-8">//<![CDATA[
-var webodffirefox = {
-    url: undefined,
-    data: undefined,
-    odfcanvas: undefined
-};
-window.addEventListener('odfload', function webViewerLoad(evt) {
-    runtime.loadClass("odf.OdfCanvas");
-    var wf = webodffirefox,
-        params = document.location.search.substring(1).split('&'),
-        param,
-        odfelement = document.getElementById("odf"),
-        data = evt.detail;
-    for (i = 0; i < params.length; i += 1) {
-        param = params[i].split('=');
-        params[unescape(param[0])] = unescape(param[1]);
-    }
-    wf.url = params.file;
-    wf.data = data;
-    wf.odfcanvas = new odf.OdfCanvas(odfelement);
-
-    runtime.read = function (path, offset, length, callback) {
-        var d = data.slice(offset, offset + length);
-        callback(null, d);
-    }
-    runtime.getFileSize = function (path, callback) {
-        callback(data.length);
-    }
-    wf.odfcanvas.load(params.file);
-}, true);
-function addButton(parent, label, onclick) {
-    var doc = parent.ownerDocument,
-        button = doc.createElement("span");
-    button.appendChild(doc.createTextNode(label));
-    button.onclick = onclick;
-    parent.appendChild(button);
-}
-function init() {
-    runtime.loadClass("core.Base64");
-    var toolbar = document.getElementById("toolbar");
-    addButton(toolbar, "download", function onclick() {
-        window.location.href = webodffirefox.url + "#download";
-    });
-}
-window.setTimeout(function () {
-    init();
-}, 1);
-//--></script>
-  <title></title>
-</head>
-<body>
-  <div id="toolbar">
-  </div>
-  <div id="odf"/>
-</body>
-</html>
diff --git a/apps/files_odfviewer/src/webodf/programs/firefoxextension/install.rdf.in b/apps/files_odfviewer/src/webodf/programs/firefoxextension/install.rdf.in
deleted file mode 100644
index caf59198a2..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/firefoxextension/install.rdf.in
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0"?>
-
-<RDF xmlns="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
-     xmlns:em="http://www.mozilla.org/2004/em-rdf#">
-
-  <Description about="urn:mozilla:install-manifest">
-    <em:id>uriloader@webodf.js</em:id>
-    <em:name>WebODF</em:name>
-    <em:type>2</em:type>
-    <em:version>@WEBODF_VERSION@</em:version>
-    <em:iconURL>chrome://webodf.js/skin/icon.png</em:iconURL>
-    <em:targetApplication>
-      <!-- Firefox -->
-      <Description>
-       <em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
-       <em:minVersion>3.6</em:minVersion>
-       <em:maxVersion>9.*</em:maxVersion>
-     </Description>
-    </em:targetApplication>
-    <em:targetApplication>
-      <!-- Fennec -->
-      <Description>
-       <em:id>{a23983c0-fd0e-11dc-95ff-0800200c9a66}</em:id>
-       <em:minVersion>4.0</em:minVersion>
-       <em:maxVersion>9.*</em:maxVersion>
-      </Description>
-    </em:targetApplication>
-    <em:bootstrap>true</em:bootstrap>
-    <em:unpack>true</em:unpack>
-    <em:creator>Jos van den Oever</em:creator>
-    <em:description>OpenDocument Viewer</em:description>
-    <em:homepageURL>http://webodf.org/</em:homepageURL>
-  </Description>
-</RDF>
diff --git a/apps/files_odfviewer/src/webodf/programs/firefoxextension/packextension.js b/apps/files_odfviewer/src/webodf/programs/firefoxextension/packextension.js
deleted file mode 100644
index ce606817ea..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/firefoxextension/packextension.js
+++ /dev/null
@@ -1,77 +0,0 @@
-/**
- * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
- * @licstart
- * The JavaScript code in this page is free software: you can redistribute it
- * and/or modify it under the terms of the GNU Affero General Public License
- * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.  The code is distributed
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
- *
- * As additional permission under GNU AGPL version 3 section 7, you
- * may distribute non-source (e.g., minimized or compacted) forms of
- * that code without the copy of the GNU GPL normally required by
- * section 4, provided you include this license notice and a URL
- * through which recipients can access the Corresponding Source.
- *
- * As a special exception to the AGPL, any HTML file which merely makes function
- * calls to this code, and for that purpose includes it by reference shall be
- * deemed a separate work for copyright law purposes. In addition, the copyright
- * holders of this code give you permission to combine this code with free
- * software libraries that are released under the GNU LGPL. You may copy and
- * distribute such a system following the terms of the GNU AGPL for this code
- * and the LGPL for the libraries. If you modify this code, you may extend this
- * exception to your version of the code, but you are not obligated to do so.
- * If you do not wish to do so, delete this exception statement from your
- * version.
- *
- * This license applies to this entire compilation.
- * @licend
- * @source: http://www.webodf.org/
- * @source: http://gitorious.org/odfkit/webodf/
- */
-/*global runtime: true, core: true*/
-runtime.loadClass("core.Zip");
-runtime.loadClass("core.Base64");
-
-function addFiles(zip, pos, files, callback) {
-    "use strict";
-    if (pos >= files.length) {
-        zip.write(function (err) {
-            return callback(err);
-        });
-        return;
-    }
-    var path = files[pos];
-    runtime.readFile(path, "binary", function (err, data) {
-        var base64;
-        if (err) {
-            return callback(err);
-        }
-        if (path === "content/webodf.js") {
-            // replace eval() with evil(), since Firefox does not approve of it
-            base64 = new core.Base64();
-            data = base64.convertUTF8ArrayToUTF16String(data);
-            data = data.replace(new RegExp('eval\\(', 'g'), 'evil(');
-            data = runtime.byteArrayFromString(data);
-        }
-        zip.save(path, data, false, new Date());
-        addFiles(zip, pos + 1, files, callback);
-    });
-}
-
-var args = arguments,
-    filename = args[1],
-    zipmembers = [],
-    i,
-    zip = new core.Zip(filename, null);
-for (i = 2; i < arguments.length; i += 1) {
-    zipmembers.push(arguments[i]);
-}
-
-addFiles(zip, 0, zipmembers, function (err) {
-    "use strict";
-    if (err) {
-        runtime.log(err);
-    }
-});
diff --git a/apps/files_odfviewer/src/webodf/programs/firefoxextension/skin/default/icon.png b/apps/files_odfviewer/src/webodf/programs/firefoxextension/skin/default/icon.png
deleted file mode 100644
index 94d7d8da5defc1d587cbbd4e8ef7cdc1901ca6d9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 44606
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

diff --git a/apps/files_odfviewer/src/webodf/programs/ios/Default-Landscape~ipad.png b/apps/files_odfviewer/src/webodf/programs/ios/Default-Landscape~ipad.png
deleted file mode 100644
index 06bb96b394f8360815781aada7d1c3704263726b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 52135
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

diff --git a/apps/files_odfviewer/src/webodf/programs/ios/Default-Portrait~ipad.png b/apps/files_odfviewer/src/webodf/programs/ios/Default-Portrait~ipad.png
deleted file mode 100644
index dbfed967af6dbda81c510e41d83cc9abf4ae9626..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 51794
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
Z@c?$9q{=`5#lL#2rLM15qiXl&{{!kJSVjN<

diff --git a/apps/files_odfviewer/src/webodf/programs/ios/WebODF.xcodeproj/project.pbxproj b/apps/files_odfviewer/src/webodf/programs/ios/WebODF.xcodeproj/project.pbxproj
deleted file mode 100644
index d4a76518f3..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/ios/WebODF.xcodeproj/project.pbxproj
+++ /dev/null
@@ -1,512 +0,0 @@
-// !$*UTF8*$!
-{
-	archiveVersion = 1;
-	classes = {
-	};
-	objectVersion = 46;
-	objects = {
-
-/* Begin PBXBuildFile section */
-		CB099EC714DAC535000D7B99 /* Default-Portrait~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = CB099EC614DAC535000D7B99 /* Default-Portrait~ipad.png */; };
-		CB099EC914DAC53D000D7B99 /* Default-Landscape~ipad.png in Resources */ = {isa = PBXBuildFile; fileRef = CB099EC814DAC53D000D7B99 /* Default-Landscape~ipad.png */; };
-		CB29ECBD14FFBBBB00CEAEE3 /* unzip.c in Sources */ = {isa = PBXBuildFile; fileRef = CB29ECBC14FFBBBB00CEAEE3 /* unzip.c */; };
-		CB29ECBF14FFBC0500CEAEE3 /* ioapi.c in Sources */ = {isa = PBXBuildFile; fileRef = CB29ECBE14FFBC0500CEAEE3 /* ioapi.c */; };
-		CB29ECC114FFBC1B00CEAEE3 /* mztools.c in Sources */ = {isa = PBXBuildFile; fileRef = CB29ECC014FFBC1B00CEAEE3 /* mztools.c */; };
-		CB29ECC314FFBC5500CEAEE3 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = CB29ECC214FFBC5500CEAEE3 /* libz.dylib */; };
-		CB36D11814F68F7F0084BECB /* www in Resources */ = {isa = PBXBuildFile; fileRef = CB36D11714F68F7F0084BECB /* www */; };
-		CB533D9114DABDA600C733F6 /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CB533D9014DABDA600C733F6 /* Foundation.framework */; };
-		CB533D9314DABDA600C733F6 /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CB533D9214DABDA600C733F6 /* UIKit.framework */; };
-		CB533D9514DABDA600C733F6 /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CB533D9414DABDA600C733F6 /* CoreGraphics.framework */; };
-		CB533D9714DABDA600C733F6 /* AddressBook.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CB533D9614DABDA600C733F6 /* AddressBook.framework */; };
-		CB533D9914DABDA600C733F6 /* AddressBookUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CB533D9814DABDA600C733F6 /* AddressBookUI.framework */; };
-		CB533D9B14DABDA600C733F6 /* AudioToolbox.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CB533D9A14DABDA600C733F6 /* AudioToolbox.framework */; };
-		CB533D9D14DABDA600C733F6 /* AVFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CB533D9C14DABDA600C733F6 /* AVFoundation.framework */; };
-		CB533D9F14DABDA600C733F6 /* CoreLocation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CB533D9E14DABDA600C733F6 /* CoreLocation.framework */; };
-		CB533DA114DABDA600C733F6 /* MediaPlayer.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CB533DA014DABDA600C733F6 /* MediaPlayer.framework */; };
-		CB533DA314DABDA600C733F6 /* QuartzCore.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CB533DA214DABDA600C733F6 /* QuartzCore.framework */; };
-		CB533DA514DABDA600C733F6 /* SystemConfiguration.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CB533DA414DABDA600C733F6 /* SystemConfiguration.framework */; };
-		CB533DA714DABDA600C733F6 /* MobileCoreServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CB533DA614DABDA600C733F6 /* MobileCoreServices.framework */; };
-		CB533DA914DABDA600C733F6 /* CoreMedia.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CB533DA814DABDA600C733F6 /* CoreMedia.framework */; };
-		CB533DAF14DABDA600C733F6 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = CB533DAD14DABDA600C733F6 /* InfoPlist.strings */; };
-		CB533DB114DABDA600C733F6 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = CB533DB014DABDA600C733F6 /* main.m */; };
-		CB533DB414DABDA600C733F6 /* PhoneGap.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CB533DB314DABDA600C733F6 /* PhoneGap.framework */; };
-		CB533DB914DABDA600C733F6 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = CB533DB714DABDA600C733F6 /* Localizable.strings */; };
-		CB533DC014DABDA600C733F6 /* icon.png in Resources */ = {isa = PBXBuildFile; fileRef = CB533DBF14DABDA600C733F6 /* icon.png */; };
-		CB533DC214DABDA600C733F6 /* icon@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = CB533DC114DABDA600C733F6 /* icon@2x.png */; };
-		CB533DC414DABDA600C733F6 /* icon-72.png in Resources */ = {isa = PBXBuildFile; fileRef = CB533DC314DABDA600C733F6 /* icon-72.png */; };
-		CB533DC714DABDA600C733F6 /* Default.png in Resources */ = {isa = PBXBuildFile; fileRef = CB533DC614DABDA600C733F6 /* Default.png */; };
-		CB533DC914DABDA600C733F6 /* Default@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = CB533DC814DABDA600C733F6 /* Default@2x.png */; };
-		CB533DCD14DABDA600C733F6 /* PhoneGap.plist in Resources */ = {isa = PBXBuildFile; fileRef = CB533DCC14DABDA600C733F6 /* PhoneGap.plist */; };
-		CB533DD114DABDA600C733F6 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = CB533DD014DABDA600C733F6 /* AppDelegate.m */; };
-		CB533DD414DABDA600C733F6 /* MainViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = CB533DD314DABDA600C733F6 /* MainViewController.m */; };
-		CB533DD614DABDA600C733F6 /* MainViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = CB533DD514DABDA600C733F6 /* MainViewController.xib */; };
-		CBD2B77314FF8E9700FC3A44 /* NativeZip.m in Sources */ = {isa = PBXBuildFile; fileRef = CBD2B77214FF8E9700FC3A44 /* NativeZip.m */; };
-		CBDCA69D1504EAEB00C706C7 /* WebViewCache.m in Sources */ = {isa = PBXBuildFile; fileRef = CBDCA69C1504EAEB00C706C7 /* WebViewCache.m */; };
-/* End PBXBuildFile section */
-
-/* Begin PBXFileReference section */
-		CB099EC614DAC535000D7B99 /* Default-Portrait~ipad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Default-Portrait~ipad.png"; path = "../Default-Portrait~ipad.png"; sourceTree = "<group>"; };
-		CB099EC814DAC53D000D7B99 /* Default-Landscape~ipad.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Default-Landscape~ipad.png"; path = "../Default-Landscape~ipad.png"; sourceTree = "<group>"; };
-		CB29ECBC14FFBBBB00CEAEE3 /* unzip.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = unzip.c; path = WebODF/Classes/minizip/unzip.c; sourceTree = "<group>"; };
-		CB29ECBE14FFBC0500CEAEE3 /* ioapi.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = ioapi.c; path = WebODF/Classes/minizip/ioapi.c; sourceTree = "<group>"; };
-		CB29ECC014FFBC1B00CEAEE3 /* mztools.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; name = mztools.c; path = WebODF/Classes/minizip/mztools.c; sourceTree = "<group>"; };
-		CB29ECC214FFBC5500CEAEE3 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; };
-		CB36D11714F68F7F0084BECB /* www */ = {isa = PBXFileReference; lastKnownFileType = folder; path = www; sourceTree = "<group>"; };
-		CB533D8C14DABDA500C733F6 /* KO Viewer.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "KO Viewer.app"; sourceTree = BUILT_PRODUCTS_DIR; };
-		CB533D9014DABDA600C733F6 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
-		CB533D9214DABDA600C733F6 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
-		CB533D9414DABDA600C733F6 /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
-		CB533D9614DABDA600C733F6 /* AddressBook.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AddressBook.framework; path = System/Library/Frameworks/AddressBook.framework; sourceTree = SDKROOT; };
-		CB533D9814DABDA600C733F6 /* AddressBookUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AddressBookUI.framework; path = System/Library/Frameworks/AddressBookUI.framework; sourceTree = SDKROOT; };
-		CB533D9A14DABDA600C733F6 /* AudioToolbox.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AudioToolbox.framework; path = System/Library/Frameworks/AudioToolbox.framework; sourceTree = SDKROOT; };
-		CB533D9C14DABDA600C733F6 /* AVFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AVFoundation.framework; path = System/Library/Frameworks/AVFoundation.framework; sourceTree = SDKROOT; };
-		CB533D9E14DABDA600C733F6 /* CoreLocation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreLocation.framework; path = System/Library/Frameworks/CoreLocation.framework; sourceTree = SDKROOT; };
-		CB533DA014DABDA600C733F6 /* MediaPlayer.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MediaPlayer.framework; path = System/Library/Frameworks/MediaPlayer.framework; sourceTree = SDKROOT; };
-		CB533DA214DABDA600C733F6 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
-		CB533DA414DABDA600C733F6 /* SystemConfiguration.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SystemConfiguration.framework; path = System/Library/Frameworks/SystemConfiguration.framework; sourceTree = SDKROOT; };
-		CB533DA614DABDA600C733F6 /* MobileCoreServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = MobileCoreServices.framework; path = System/Library/Frameworks/MobileCoreServices.framework; sourceTree = SDKROOT; };
-		CB533DA814DABDA600C733F6 /* CoreMedia.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMedia.framework; path = System/Library/Frameworks/CoreMedia.framework; sourceTree = SDKROOT; };
-		CB533DAC14DABDA600C733F6 /* WebODF-Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = "WebODF-Info.plist"; sourceTree = "<group>"; };
-		CB533DAE14DABDA600C733F6 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
-		CB533DB014DABDA600C733F6 /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
-		CB533DB214DABDA600C733F6 /* WebODF-Prefix.pch */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "WebODF-Prefix.pch"; sourceTree = "<group>"; };
-		CB533DB314DABDA600C733F6 /* PhoneGap.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = PhoneGap.framework; path = /Users/Shared/PhoneGap/Frameworks/PhoneGap.framework; sourceTree = "<absolute>"; };
-		CB533DB814DABDA600C733F6 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = Resources/en.lproj/Localizable.strings; sourceTree = "<group>"; };
-		CB533DBF14DABDA600C733F6 /* icon.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = icon.png; path = Resources/icons/icon.png; sourceTree = "<group>"; };
-		CB533DC114DABDA600C733F6 /* icon@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "icon@2x.png"; path = "Resources/icons/icon@2x.png"; sourceTree = "<group>"; };
-		CB533DC314DABDA600C733F6 /* icon-72.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "icon-72.png"; path = "Resources/icons/icon-72.png"; sourceTree = "<group>"; };
-		CB533DC614DABDA600C733F6 /* Default.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Default.png; path = Resources/splash/Default.png; sourceTree = "<group>"; };
-		CB533DC814DABDA600C733F6 /* Default@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Default@2x.png"; path = "Resources/splash/Default@2x.png"; sourceTree = "<group>"; };
-		CB533DCC14DABDA600C733F6 /* PhoneGap.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = PhoneGap.plist; sourceTree = "<group>"; };
-		CB533DCF14DABDA600C733F6 /* AppDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = AppDelegate.h; path = Classes/AppDelegate.h; sourceTree = "<group>"; };
-		CB533DD014DABDA600C733F6 /* AppDelegate.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = AppDelegate.m; path = Classes/AppDelegate.m; sourceTree = "<group>"; };
-		CB533DD214DABDA600C733F6 /* MainViewController.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = MainViewController.h; path = Classes/MainViewController.h; sourceTree = "<group>"; };
-		CB533DD314DABDA600C733F6 /* MainViewController.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = MainViewController.m; path = Classes/MainViewController.m; sourceTree = "<group>"; };
-		CB533DD514DABDA600C733F6 /* MainViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = MainViewController.xib; path = Classes/MainViewController.xib; sourceTree = "<group>"; };
-		CBD2B77114FF8E9700FC3A44 /* NativeZip.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NativeZip.h; path = Classes/NativeZip.h; sourceTree = "<group>"; };
-		CBD2B77214FF8E9700FC3A44 /* NativeZip.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = NativeZip.m; path = Classes/NativeZip.m; sourceTree = "<group>"; };
-		CBDCA69B1504EAEB00C706C7 /* WebViewCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebViewCache.h; path = Classes/WebViewCache.h; sourceTree = "<group>"; };
-		CBDCA69C1504EAEB00C706C7 /* WebViewCache.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = WebViewCache.m; path = Classes/WebViewCache.m; sourceTree = "<group>"; };
-/* End PBXFileReference section */
-
-/* Begin PBXFrameworksBuildPhase section */
-		CB533D8614DABDA500C733F6 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				CB29ECC314FFBC5500CEAEE3 /* libz.dylib in Frameworks */,
-				CB533D9114DABDA600C733F6 /* Foundation.framework in Frameworks */,
-				CB533D9314DABDA600C733F6 /* UIKit.framework in Frameworks */,
-				CB533D9514DABDA600C733F6 /* CoreGraphics.framework in Frameworks */,
-				CB533D9714DABDA600C733F6 /* AddressBook.framework in Frameworks */,
-				CB533D9914DABDA600C733F6 /* AddressBookUI.framework in Frameworks */,
-				CB533D9B14DABDA600C733F6 /* AudioToolbox.framework in Frameworks */,
-				CB533D9D14DABDA600C733F6 /* AVFoundation.framework in Frameworks */,
-				CB533D9F14DABDA600C733F6 /* CoreLocation.framework in Frameworks */,
-				CB533DA114DABDA600C733F6 /* MediaPlayer.framework in Frameworks */,
-				CB533DA314DABDA600C733F6 /* QuartzCore.framework in Frameworks */,
-				CB533DA514DABDA600C733F6 /* SystemConfiguration.framework in Frameworks */,
-				CB533DA714DABDA600C733F6 /* MobileCoreServices.framework in Frameworks */,
-				CB533DA914DABDA600C733F6 /* CoreMedia.framework in Frameworks */,
-				CB533DB414DABDA600C733F6 /* PhoneGap.framework in Frameworks */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		CB533D8914DABDA500C733F6 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXFrameworksBuildPhase section */
-
-/* Begin PBXGroup section */
-		CB533D7E14DABDA500C733F6 = {
-			isa = PBXGroup;
-			children = (
-				CB29ECC214FFBC5500CEAEE3 /* libz.dylib */,
-				CB29ECC014FFBC1B00CEAEE3 /* mztools.c */,
-				CB29ECBE14FFBC0500CEAEE3 /* ioapi.c */,
-				CB29ECBC14FFBBBB00CEAEE3 /* unzip.c */,
-				CB36D11714F68F7F0084BECB /* www */,
-				CB533DAA14DABDA600C733F6 /* WebODF */,
-				CB533D8F14DABDA500C733F6 /* Frameworks */,
-				CB533D8D14DABDA500C733F6 /* Products */,
-			);
-			sourceTree = "<group>";
-		};
-		CB533D8D14DABDA500C733F6 /* Products */ = {
-			isa = PBXGroup;
-			children = (
-				CB533D8C14DABDA500C733F6 /* KO Viewer.app */,
-			);
-			name = Products;
-			sourceTree = "<group>";
-		};
-		CB533D8F14DABDA500C733F6 /* Frameworks */ = {
-			isa = PBXGroup;
-			children = (
-				CB533D9014DABDA600C733F6 /* Foundation.framework */,
-				CB533D9214DABDA600C733F6 /* UIKit.framework */,
-				CB533D9414DABDA600C733F6 /* CoreGraphics.framework */,
-				CB533D9614DABDA600C733F6 /* AddressBook.framework */,
-				CB533D9814DABDA600C733F6 /* AddressBookUI.framework */,
-				CB533D9A14DABDA600C733F6 /* AudioToolbox.framework */,
-				CB533D9C14DABDA600C733F6 /* AVFoundation.framework */,
-				CB533D9E14DABDA600C733F6 /* CoreLocation.framework */,
-				CB533DA014DABDA600C733F6 /* MediaPlayer.framework */,
-				CB533DA214DABDA600C733F6 /* QuartzCore.framework */,
-				CB533DA414DABDA600C733F6 /* SystemConfiguration.framework */,
-				CB533DA614DABDA600C733F6 /* MobileCoreServices.framework */,
-				CB533DA814DABDA600C733F6 /* CoreMedia.framework */,
-			);
-			name = Frameworks;
-			sourceTree = "<group>";
-		};
-		CB533DAA14DABDA600C733F6 /* WebODF */ = {
-			isa = PBXGroup;
-			children = (
-				CB533DB314DABDA600C733F6 /* PhoneGap.framework */,
-				CB533DB514DABDA600C733F6 /* Resources */,
-				CB533DCE14DABDA600C733F6 /* Classes */,
-				CB533DAB14DABDA600C733F6 /* Supporting Files */,
-			);
-			path = WebODF;
-			sourceTree = "<group>";
-		};
-		CB533DAB14DABDA600C733F6 /* Supporting Files */ = {
-			isa = PBXGroup;
-			children = (
-				CB533DAC14DABDA600C733F6 /* WebODF-Info.plist */,
-				CB533DAD14DABDA600C733F6 /* InfoPlist.strings */,
-				CB533DB014DABDA600C733F6 /* main.m */,
-				CB533DB214DABDA600C733F6 /* WebODF-Prefix.pch */,
-				CB533DCC14DABDA600C733F6 /* PhoneGap.plist */,
-				CB533DD514DABDA600C733F6 /* MainViewController.xib */,
-			);
-			name = "Supporting Files";
-			sourceTree = "<group>";
-		};
-		CB533DB514DABDA600C733F6 /* Resources */ = {
-			isa = PBXGroup;
-			children = (
-				CB533DB614DABDA600C733F6 /* en.lproj */,
-				CB533DBE14DABDA600C733F6 /* icons */,
-				CB533DC514DABDA600C733F6 /* splash */,
-			);
-			name = Resources;
-			sourceTree = "<group>";
-		};
-		CB533DB614DABDA600C733F6 /* en.lproj */ = {
-			isa = PBXGroup;
-			children = (
-				CB533DB714DABDA600C733F6 /* Localizable.strings */,
-			);
-			name = en.lproj;
-			sourceTree = "<group>";
-		};
-		CB533DBE14DABDA600C733F6 /* icons */ = {
-			isa = PBXGroup;
-			children = (
-				CB533DBF14DABDA600C733F6 /* icon.png */,
-				CB533DC114DABDA600C733F6 /* icon@2x.png */,
-				CB533DC314DABDA600C733F6 /* icon-72.png */,
-			);
-			name = icons;
-			sourceTree = "<group>";
-		};
-		CB533DC514DABDA600C733F6 /* splash */ = {
-			isa = PBXGroup;
-			children = (
-				CB099EC814DAC53D000D7B99 /* Default-Landscape~ipad.png */,
-				CB099EC614DAC535000D7B99 /* Default-Portrait~ipad.png */,
-				CB533DC614DABDA600C733F6 /* Default.png */,
-				CB533DC814DABDA600C733F6 /* Default@2x.png */,
-			);
-			name = splash;
-			sourceTree = "<group>";
-		};
-		CB533DCE14DABDA600C733F6 /* Classes */ = {
-			isa = PBXGroup;
-			children = (
-				CBDCA69B1504EAEB00C706C7 /* WebViewCache.h */,
-				CBDCA69C1504EAEB00C706C7 /* WebViewCache.m */,
-				CB533DCF14DABDA600C733F6 /* AppDelegate.h */,
-				CB533DD014DABDA600C733F6 /* AppDelegate.m */,
-				CB533DD214DABDA600C733F6 /* MainViewController.h */,
-				CB533DD314DABDA600C733F6 /* MainViewController.m */,
-				CBD2B77114FF8E9700FC3A44 /* NativeZip.h */,
-				CBD2B77214FF8E9700FC3A44 /* NativeZip.m */,
-			);
-			name = Classes;
-			sourceTree = "<group>";
-		};
-/* End PBXGroup section */
-
-/* Begin PBXNativeTarget section */
-		CB533D8B14DABDA500C733F6 /* KO Viewer */ = {
-			isa = PBXNativeTarget;
-			buildConfigurationList = CB533DDB14DABDA600C733F6 /* Build configuration list for PBXNativeTarget "KO Viewer" */;
-			buildPhases = (
-				CB533D8514DABDA500C733F6 /* Sources */,
-				CB533D8614DABDA500C733F6 /* Frameworks */,
-				CB533D8714DABDA500C733F6 /* Resources */,
-				CB533D8814DABDA500C733F6 /* Sources */,
-				CB533D8914DABDA500C733F6 /* Frameworks */,
-				CB533D8A14DABDA500C733F6 /* ShellScript */,
-			);
-			buildRules = (
-			);
-			dependencies = (
-			);
-			name = "KO Viewer";
-			productName = WebODF;
-			productReference = CB533D8C14DABDA500C733F6 /* KO Viewer.app */;
-			productType = "com.apple.product-type.application";
-		};
-/* End PBXNativeTarget section */
-
-/* Begin PBXProject section */
-		CB533D8014DABDA500C733F6 /* Project object */ = {
-			isa = PBXProject;
-			attributes = {
-				LastUpgradeCheck = 0420;
-			};
-			buildConfigurationList = CB533D8314DABDA500C733F6 /* Build configuration list for PBXProject "WebODF" */;
-			compatibilityVersion = "Xcode 3.2";
-			developmentRegion = English;
-			hasScannedForEncodings = 0;
-			knownRegions = (
-				en,
-				es,
-			);
-			mainGroup = CB533D7E14DABDA500C733F6;
-			productRefGroup = CB533D8D14DABDA500C733F6 /* Products */;
-			projectDirPath = "";
-			projectRoot = "";
-			targets = (
-				CB533D8B14DABDA500C733F6 /* KO Viewer */,
-			);
-		};
-/* End PBXProject section */
-
-/* Begin PBXResourcesBuildPhase section */
-		CB533D8714DABDA500C733F6 /* Resources */ = {
-			isa = PBXResourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				CB533DAF14DABDA600C733F6 /* InfoPlist.strings in Resources */,
-				CB533DB914DABDA600C733F6 /* Localizable.strings in Resources */,
-				CB533DC014DABDA600C733F6 /* icon.png in Resources */,
-				CB533DC214DABDA600C733F6 /* icon@2x.png in Resources */,
-				CB533DC414DABDA600C733F6 /* icon-72.png in Resources */,
-				CB533DC714DABDA600C733F6 /* Default.png in Resources */,
-				CB533DC914DABDA600C733F6 /* Default@2x.png in Resources */,
-				CB533DCD14DABDA600C733F6 /* PhoneGap.plist in Resources */,
-				CB533DD614DABDA600C733F6 /* MainViewController.xib in Resources */,
-				CB099EC714DAC535000D7B99 /* Default-Portrait~ipad.png in Resources */,
-				CB099EC914DAC53D000D7B99 /* Default-Landscape~ipad.png in Resources */,
-				CB36D11814F68F7F0084BECB /* www in Resources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXResourcesBuildPhase section */
-
-/* Begin PBXShellScriptBuildPhase section */
-		CB533D8A14DABDA500C733F6 /* ShellScript */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/bash;
-			shellScript = "rsync -a ../touchui/app/ www/app/\ncp ../../webodf/webodf.css www/\ncp ../touchui/sencha-touch.* www/\ncp ../touchui/Zoom*.png www/\nif [ ! -e www/webodf.js ]; then\n    # webodf.js should be built\n    if [ ! -e build ]; then mkdir build; fi\n    cd build\n    cmake -G Xcode ../../.. && make && cp webodf/webodf.js ..\n    if [ ! -e webodf.js ]; then\n        echo \"put webodf.js in the ios/www directory\"\n        exit 1;\n    fi\nfi\n";
-		};
-/* End PBXShellScriptBuildPhase section */
-
-/* Begin PBXSourcesBuildPhase section */
-		CB533D8514DABDA500C733F6 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-				CB533DB114DABDA600C733F6 /* main.m in Sources */,
-				CB533DD114DABDA600C733F6 /* AppDelegate.m in Sources */,
-				CB533DD414DABDA600C733F6 /* MainViewController.m in Sources */,
-				CBD2B77314FF8E9700FC3A44 /* NativeZip.m in Sources */,
-				CB29ECBD14FFBBBB00CEAEE3 /* unzip.c in Sources */,
-				CB29ECBF14FFBC0500CEAEE3 /* ioapi.c in Sources */,
-				CB29ECC114FFBC1B00CEAEE3 /* mztools.c in Sources */,
-				CBDCA69D1504EAEB00C706C7 /* WebViewCache.m in Sources */,
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-		CB533D8814DABDA500C733F6 /* Sources */ = {
-			isa = PBXSourcesBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXSourcesBuildPhase section */
-
-/* Begin PBXVariantGroup section */
-		CB533DAD14DABDA600C733F6 /* InfoPlist.strings */ = {
-			isa = PBXVariantGroup;
-			children = (
-				CB533DAE14DABDA600C733F6 /* en */,
-			);
-			name = InfoPlist.strings;
-			sourceTree = "<group>";
-		};
-		CB533DB714DABDA600C733F6 /* Localizable.strings */ = {
-			isa = PBXVariantGroup;
-			children = (
-				CB533DB814DABDA600C733F6 /* en */,
-			);
-			name = Localizable.strings;
-			sourceTree = "<group>";
-		};
-/* End PBXVariantGroup section */
-
-/* Begin XCBuildConfiguration section */
-		CB533DD914DABDA600C733F6 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
-				CLANG_ENABLE_OBJC_ARC = YES;
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				COPY_PHASE_STRIP = NO;
-				GCC_C_LANGUAGE_STANDARD = gnu99;
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_OPTIMIZATION_LEVEL = 0;
-				GCC_PREPROCESSOR_DEFINITIONS = (
-					"DEBUG=1",
-					"$(inherited)",
-				);
-				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
-				GCC_VERSION = com.apple.compilers.llvmgcc42;
-				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 3.0;
-				SDKROOT = iphoneos;
-			};
-			name = Debug;
-		};
-		CB533DDA14DABDA600C733F6 /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = NO;
-				ARCHS = "$(ARCHS_STANDARD_32_BIT)";
-				CLANG_ENABLE_OBJC_ARC = YES;
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
-				COPY_PHASE_STRIP = YES;
-				GCC_C_LANGUAGE_STANDARD = gnu99;
-				GCC_VERSION = com.apple.compilers.llvmgcc42;
-				GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
-				GCC_WARN_ABOUT_RETURN_TYPE = YES;
-				GCC_WARN_UNUSED_VARIABLE = YES;
-				IPHONEOS_DEPLOYMENT_TARGET = 3.0;
-				SDKROOT = iphoneos;
-				VALIDATE_PRODUCT = YES;
-			};
-			name = Release;
-		};
-		CB533DDC14DABDA600C733F6 /* Debug */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = YES;
-				CODE_SIGN_IDENTITY = "iPhone Developer: Jos van den Oever (GJ9RDPR233)";
-				COPY_PHASE_STRIP = NO;
-				FRAMEWORK_SEARCH_PATHS = /Users/Shared/PhoneGap/Frameworks;
-				GCC_DYNAMIC_NO_PIC = NO;
-				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = "WebODF/WebODF-Prefix.pch";
-				GCC_PREPROCESSOR_DEFINITIONS = "PHONEGAP_FRAMEWORK=YES";
-				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
-				INFOPLIST_FILE = "WebODF/WebODF-Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 5.0;
-				OTHER_LDFLAGS = (
-					"-weak_framework",
-					UIKit,
-					"-weak_framework",
-					AVFoundation,
-					"-weak_framework",
-					CoreMedia,
-					"-weak_library",
-					/usr/lib/libSystem.B.dylib,
-				);
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE = "8A253628-DC77-4EEA-8543-53315AA93987";
-				TARGETED_DEVICE_FAMILY = "1,2";
-				WRAPPER_EXTENSION = app;
-			};
-			name = Debug;
-		};
-		CB533DDD14DABDA600C733F6 /* Release */ = {
-			isa = XCBuildConfiguration;
-			buildSettings = {
-				ALWAYS_SEARCH_USER_PATHS = YES;
-				ARCHS = (
-					armv6,
-					"$(ARCHS_STANDARD_32_BIT)",
-				);
-				CODE_SIGN_IDENTITY = "iPhone Developer: Jos van den Oever (GJ9RDPR233)";
-				COPY_PHASE_STRIP = YES;
-				DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
-				FRAMEWORK_SEARCH_PATHS = /Users/Shared/PhoneGap/Frameworks;
-				GCC_PRECOMPILE_PREFIX_HEADER = YES;
-				GCC_PREFIX_HEADER = "WebODF/WebODF-Prefix.pch";
-				GCC_PREPROCESSOR_DEFINITIONS = "PHONEGAP_FRAMEWORK=YES";
-				GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
-				INFOPLIST_FILE = "WebODF/WebODF-Info.plist";
-				IPHONEOS_DEPLOYMENT_TARGET = 5.0;
-				OTHER_LDFLAGS = (
-					"-weak_framework",
-					UIKit,
-					"-weak_framework",
-					AVFoundation,
-					"-weak_framework",
-					CoreMedia,
-					"-weak_library",
-					/usr/lib/libSystem.B.dylib,
-				);
-				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE = "8A253628-DC77-4EEA-8543-53315AA93987";
-				TARGETED_DEVICE_FAMILY = "1,2";
-				VALIDATE_PRODUCT = YES;
-				WRAPPER_EXTENSION = app;
-			};
-			name = Release;
-		};
-/* End XCBuildConfiguration section */
-
-/* Begin XCConfigurationList section */
-		CB533D8314DABDA500C733F6 /* Build configuration list for PBXProject "WebODF" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				CB533DD914DABDA600C733F6 /* Debug */,
-				CB533DDA14DABDA600C733F6 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-		CB533DDB14DABDA600C733F6 /* Build configuration list for PBXNativeTarget "KO Viewer" */ = {
-			isa = XCConfigurationList;
-			buildConfigurations = (
-				CB533DDC14DABDA600C733F6 /* Debug */,
-				CB533DDD14DABDA600C733F6 /* Release */,
-			);
-			defaultConfigurationIsVisible = 0;
-			defaultConfigurationName = Release;
-		};
-/* End XCConfigurationList section */
-	};
-	rootObject = CB533D8014DABDA500C733F6 /* Project object */;
-}
diff --git a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/AppDelegate.h b/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/AppDelegate.h
deleted file mode 100644
index e2e93b0d9e..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/AppDelegate.h
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you 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.
- */
-
-//
-//  AppDelegate.h
-//  WebODF
-//
-//  Created by KO GmbH on 2/2/12.
-//  Copyright __MyCompanyName__ 2012. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-#ifdef PHONEGAP_FRAMEWORK
-    #import <PhoneGap/PGViewController.h>
-#else
-    #import "PGViewController.h"
-#endif
-
-
-@interface AppDelegate : NSObject < UIApplicationDelegate, UIWebViewDelegate, PGCommandDelegate > {
-
-	NSString* invokeString;
-}
-
-// invoke string is passed to your app on launch, this is only valid if you 
-// edit FooBar.plist to add a protocol
-// a simple tutorial can be found here : 
-// http://iphonedevelopertips.com/cocoa/launching-your-own-application-via-a-custom-url-scheme.html
-
-@property (nonatomic, copy)  NSString* invokeString;
-@property (nonatomic, retain) IBOutlet UIWindow* window;
-@property (nonatomic, retain) IBOutlet PGViewController* viewController;
-
-@end
-
diff --git a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/AppDelegate.m b/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/AppDelegate.m
deleted file mode 100644
index 6845e95349..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/AppDelegate.m
+++ /dev/null
@@ -1,202 +0,0 @@
-/*
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you 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.
- */
-
-//
-//  AppDelegate.m
-//  WebODF
-//
-//  Created by KO GmbH on 2/2/12.
-//  Copyright __MyCompanyName__ 2012. All rights reserved.
-//
-
-#import "AppDelegate.h"
-#import "MainViewController.h"
-
-#ifdef PHONEGAP_FRAMEWORK
-    #import <PhoneGap/PGPlugin.h>
-    #import <PhoneGap/PGURLProtocol.h>
-#else
-    #import "PGPlugin.h"
-    #import "PGURLProtocol.h"
-#endif
-#import "WebViewCache.h"
-
-
-@implementation AppDelegate
-
-@synthesize invokeString, window, viewController;
-
-- (id) init
-{	
-	/** If you need to do any extra app-specific initialization, you can do it here
-	 *  -jm
-	 **/
-    NSHTTPCookieStorage *cookieStorage = [NSHTTPCookieStorage sharedHTTPCookieStorage]; 
-    [cookieStorage setCookieAcceptPolicy:NSHTTPCookieAcceptPolicyAlways];
-    
-    [PGURLProtocol registerPGHttpURLProtocol];
-    
-    return [super init];
-}
-
-#pragma UIApplicationDelegate implementation
-
-/**
- * This is main kick off after the app inits, the views and Settings are setup here. (preferred - iOS4 and up)
- */
-- (BOOL) application:(UIApplication*)application didFinishLaunchingWithOptions:(NSDictionary*)launchOptions
-{    
-    NSURL* url = [launchOptions objectForKey:UIApplicationLaunchOptionsURLKey];
-    if (url && [url isKindOfClass:[NSURL class]]) {
-        self.invokeString = [url absoluteString];
-		NSLog(@"WebODF launchOptions = %@", url);
-    }    
-    
-    CGRect screenBounds = [[UIScreen mainScreen] bounds];
-    self.window = [[UIWindow alloc] initWithFrame:screenBounds];
-    self.window.autoresizesSubviews = YES;
-    
-    CGRect viewBounds = [[UIScreen mainScreen] applicationFrame];
-    
-    self.viewController = [[MainViewController alloc] init];
-    self.viewController.useSplashScreen = YES;
-    self.viewController.wwwFolderName = @"www";
-    self.viewController.startPage = @"index.html";
-    self.viewController.view.frame = viewBounds;
-    
-    // over-ride delegates
-    self.viewController.webView.delegate = self;
-    self.viewController.commandDelegate = self;
-
-    // check whether the current orientation is supported: if it is, keep it, rather than forcing a rotation
-    BOOL forceStartupRotation = YES;
-    UIDeviceOrientation curDevOrientation = [[UIDevice currentDevice] orientation];
-    
-    if (UIDeviceOrientationUnknown == curDevOrientation) {
-        // UIDevice isn't firing orientation notifications yet… go look at the status bar
-        curDevOrientation = (UIDeviceOrientation)[[UIApplication sharedApplication] statusBarOrientation];
-    }
-    
-    if (UIDeviceOrientationIsValidInterfaceOrientation(curDevOrientation)) {
-        for (NSNumber *orient in self.viewController.supportedOrientations) {
-            if ([orient intValue] == curDevOrientation) {
-                forceStartupRotation = NO;
-                break;
-            }
-        }
-    }
-    
-    if (forceStartupRotation) {
-        NSLog(@"supportedOrientations: %@", self.viewController.supportedOrientations);
-        // The first item in the supportedOrientations array is the start orientation (guaranteed to be at least Portrait)
-        UIInterfaceOrientation newOrient = [[self.viewController.supportedOrientations objectAtIndex:0] intValue];
-        NSLog(@"AppDelegate forcing status bar to: %d from: %d", newOrient, curDevOrientation);
-        [[UIApplication sharedApplication] setStatusBarOrientation:newOrient];
-    }
-    
-    [self.window addSubview:self.viewController.view];
-    [self.window makeKeyAndVisible];
-    
-    
-    NSString *path = @"./cache";
-    NSUInteger discCapacity = 1*1024*1024;
-    NSUInteger memoryCapacity = 0*1024*1024;
-    
-    WebViewCache *cache =
-    [[WebViewCache alloc] initWithMemoryCapacity: memoryCapacity
-                                        diskCapacity: discCapacity diskPath:path];
-    [NSURLCache setSharedURLCache:cache];
-
-    
-    return YES;
-}
-
-// this happens while we are running ( in the background, or from within our own app )
-// only valid if FooBar.plist specifies a protocol to handle
-- (BOOL) application:(UIApplication*)application handleOpenURL:(NSURL*)url 
-{
-    if (!url) { 
-        return NO; 
-    }
-    
-	// calls into javascript global function 'handleOpenURL'
-    NSString* jsString = [NSString stringWithFormat:@"handleOpenURL(\"%@\");", url];
-    [self.viewController.webView stringByEvaluatingJavaScriptFromString:jsString];
-    
-    // all plugins will get the notification, and their handlers will be called 
-    [[NSNotificationCenter defaultCenter] postNotification:[NSNotification notificationWithName:PGPluginHandleOpenURLNotification object:url]];
-    
-    return YES;    
-}
-
-#pragma PGCommandDelegate implementation
-
-- (id) getCommandInstance:(NSString*)className
-{
-	return [self.viewController getCommandInstance:className];
-}
-
-- (BOOL) execute:(InvokedUrlCommand*)command
-{
-	return [self.viewController execute:command];
-}
-
-- (NSString*) pathForResource:(NSString*)resourcepath;
-{
-	return [self.viewController pathForResource:resourcepath];
-}
-
-#pragma UIWebDelegate implementation
-
-- (void) webViewDidFinishLoad:(UIWebView*) theWebView 
-{
-	// only valid if FooBar.plist specifies a protocol to handle
-	if (self.invokeString)
-	{
-		// this is passed before the deviceready event is fired, so you can access it in js when you receive deviceready
-		NSString* jsString = [NSString stringWithFormat:@"var invokeString = \"%@\";", self.invokeString];
-		[theWebView stringByEvaluatingJavaScriptFromString:jsString];
-	}
-	
-	 // Black base color for background matches the native apps
-   	theWebView.backgroundColor = [UIColor blackColor];
-    
-	return [self.viewController webViewDidFinishLoad:theWebView];
-}
-
-- (void) webViewDidStartLoad:(UIWebView*)theWebView 
-{
-	return [self.viewController webViewDidStartLoad:theWebView];
-}
-
-- (void) webView:(UIWebView*)theWebView didFailLoadWithError:(NSError*)error 
-{
-	return [self.viewController webView:theWebView didFailLoadWithError:error];
-}
-
-- (BOOL) webView:(UIWebView*)theWebView shouldStartLoadWithRequest:(NSURLRequest*)request navigationType:(UIWebViewNavigationType)navigationType
-{
-	return [self.viewController webView:theWebView shouldStartLoadWithRequest:request navigationType:navigationType];
-}
-
-- (void) dealloc
-{
-}
-
-@end
diff --git a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/MainViewController.h b/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/MainViewController.h
deleted file mode 100644
index 33ddbc2103..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/MainViewController.h
+++ /dev/null
@@ -1,17 +0,0 @@
-//
-//  MainViewController.h
-//  FooBar
-//
-//  Created by Shazron Abdullah on 12-01-26.
-//  Copyright (c) 2012 __MyCompanyName__. All rights reserved.
-//
-
-#ifdef PHONEGAP_FRAMEWORK
-    #import <PhoneGap/PGViewController.h>
-#else
-    #import "PGViewController.h"
-#endif
-
-@interface MainViewController : PGViewController
-
-@end
diff --git a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/MainViewController.m b/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/MainViewController.m
deleted file mode 100644
index 550e4b25c2..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/MainViewController.m
+++ /dev/null
@@ -1,47 +0,0 @@
-//
-//  MainViewController.m
-//  WebODF
-//
-#import "MainViewController.h"
-
-@implementation MainViewController
-
-- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
-{
-    self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil];
-    if (self) {
-        // Custom initialization
-    }
-    return self;
-}
-
-- (void)didReceiveMemoryWarning
-{
-    // Releases the view if it doesn't have a superview.
-    [super didReceiveMemoryWarning];
-    
-    // Release any cached data, images, etc that aren't in use.
-}
-
-#pragma mark - View lifecycle
-
-- (void)viewDidLoad
-{
-    [super viewDidLoad];
-    // Do any additional setup after loading the view from its nib.
-}
-
-- (void)viewDidUnload
-{
-    [super viewDidUnload];
-    // Release any retained subviews of the main view.
-    // e.g. self.myOutlet = nil;
-}
-
-- (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation
-{
-    // Return YES for supported orientations
-    return (interfaceOrientation == UIInterfaceOrientationPortrait);
-}
-
-@end
diff --git a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/MainViewController.xib b/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/MainViewController.xib
deleted file mode 100644
index 9837f578ca..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/MainViewController.xib
+++ /dev/null
@@ -1,118 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="8.00">
-	<data>
-		<int key="IBDocument.SystemTarget">1280</int>
-		<string key="IBDocument.SystemVersion">11C25</string>
-		<string key="IBDocument.InterfaceBuilderVersion">1919</string>
-		<string key="IBDocument.AppKitVersion">1138.11</string>
-		<string key="IBDocument.HIToolboxVersion">566.00</string>
-		<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
-			<string key="NS.key.0">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-			<string key="NS.object.0">916</string>
-		</object>
-		<array key="IBDocument.IntegratedClassDependencies">
-			<string>IBProxyObject</string>
-			<string>IBUIView</string>
-		</array>
-		<array key="IBDocument.PluginDependencies">
-			<string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-		</array>
-		<object class="NSMutableDictionary" key="IBDocument.Metadata">
-			<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
-			<integer value="1" key="NS.object.0"/>
-		</object>
-		<array class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
-			<object class="IBProxyObject" id="372490531">
-				<string key="IBProxiedObjectIdentifier">IBFilesOwner</string>
-				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-			</object>
-			<object class="IBProxyObject" id="975951072">
-				<string key="IBProxiedObjectIdentifier">IBFirstResponder</string>
-				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-			</object>
-			<object class="IBUIView" id="191373211">
-				<reference key="NSNextResponder"/>
-				<int key="NSvFlags">274</int>
-				<string key="NSFrame">{{0, 20}, {320, 460}}</string>
-				<reference key="NSSuperview"/>
-				<reference key="NSWindow"/>
-				<object class="NSColor" key="IBUIBackgroundColor">
-					<int key="NSColorSpace">3</int>
-					<bytes key="NSWhite">MQA</bytes>
-					<object class="NSColorSpace" key="NSCustomColorSpace">
-						<int key="NSID">2</int>
-					</object>
-				</object>
-				<object class="IBUISimulatedStatusBarMetrics" key="IBUISimulatedStatusBarMetrics"/>
-				<string key="targetRuntimeIdentifier">IBCocoaTouchFramework</string>
-			</object>
-		</array>
-		<object class="IBObjectContainer" key="IBDocument.Objects">
-			<array class="NSMutableArray" key="connectionRecords">
-				<object class="IBConnectionRecord">
-					<object class="IBCocoaTouchOutletConnection" key="connection">
-						<string key="label">view</string>
-						<reference key="source" ref="372490531"/>
-						<reference key="destination" ref="191373211"/>
-					</object>
-					<int key="connectionID">3</int>
-				</object>
-			</array>
-			<object class="IBMutableOrderedSet" key="objectRecords">
-				<array key="orderedObjects">
-					<object class="IBObjectRecord">
-						<int key="objectID">0</int>
-						<array key="object" id="0"/>
-						<reference key="children" ref="1000"/>
-						<nil key="parent"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">1</int>
-						<reference key="object" ref="191373211"/>
-						<reference key="parent" ref="0"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-1</int>
-						<reference key="object" ref="372490531"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">File's Owner</string>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">-2</int>
-						<reference key="object" ref="975951072"/>
-						<reference key="parent" ref="0"/>
-					</object>
-				</array>
-			</object>
-			<dictionary class="NSMutableDictionary" key="flattenedProperties">
-				<string key="-1.CustomClassName">MainViewController</string>
-				<string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<string key="-2.CustomClassName">UIResponder</string>
-				<string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-				<string key="1.IBPluginDependency">com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string>
-			</dictionary>
-			<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
-			<nil key="activeLocalization"/>
-			<dictionary class="NSMutableDictionary" key="localizations"/>
-			<nil key="sourceID"/>
-			<int key="maxID">3</int>
-		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes">
-			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
-				<object class="IBPartialClassDescription">
-					<string key="className">MainViewController</string>
-					<string key="superclassName">UIViewController</string>
-					<object class="IBClassDescriptionSource" key="sourceIdentifier">
-						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/MainViewController.h</string>
-					</object>
-				</object>
-			</array>
-		</object>
-		<int key="IBDocument.localizationMode">0</int>
-		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaTouchFramework</string>
-		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
-		<int key="IBDocument.defaultPropertyAccessControl">3</int>
-		<string key="IBCocoaTouchPluginVersion">916</string>
-	</data>
-</archive>
diff --git a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/NSData+Base64.h b/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/NSData+Base64.h
deleted file mode 100644
index eb1ff485a7..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/NSData+Base64.h
+++ /dev/null
@@ -1,33 +0,0 @@
-//
-//  NSData+Base64.h
-//  base64
-//
-//  Created by Matt Gallagher on 2009/06/03.
-//  Copyright 2009 Matt Gallagher. All rights reserved.
-//
-//  Permission is given to use this source code file, free of charge, in any
-//  project, commercial or otherwise, entirely at your risk, with the condition
-//  that any redistribution (in part or whole) of source code must retain
-//  this copyright and permission notice. Attribution in compiled projects is
-//  appreciated but not required.
-//
-
-#import <Foundation/Foundation.h>
-
-void *NewBase64Decode(
-	const char *inputBuffer,
-	size_t length,
-	size_t *outputLength);
-
-char *NewBase64Encode(
-	const void *inputBuffer,
-	size_t length,
-	bool separateLines,
-	size_t *outputLength);
-
-@interface NSData (Base64)
-
-+ (NSData *)dataFromBase64String:(NSString *)aString;
-- (NSString *)base64EncodedString;
-
-@end
diff --git a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/NSData+Base64.m b/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/NSData+Base64.m
deleted file mode 100644
index 13f828d09c..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/NSData+Base64.m
+++ /dev/null
@@ -1,299 +0,0 @@
-//
-//  NSData+Base64.m
-//  base64
-//
-//  Created by Matt Gallagher on 2009/06/03.
-//  Copyright 2009 Matt Gallagher. All rights reserved.
-//
-//  Permission is given to use this source code file, free of charge, in any
-//  project, commercial or otherwise, entirely at your risk, with the condition
-//  that any redistribution (in part or whole) of source code must retain
-//  this copyright and permission notice. Attribution in compiled projects is
-//  appreciated but not required.
-//
-
-#import "NSData+Base64.h"
-
-//
-// Mapping from 6 bit pattern to ASCII character.
-//
-static unsigned char base64EncodeLookup[65] =
-	"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
-
-//
-// Definition for "masked-out" areas of the base64DecodeLookup mapping
-//
-#define xx 65
-
-//
-// Mapping from ASCII character to 6 bit pattern.
-//
-static unsigned char base64DecodeLookup[256] =
-{
-    xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, 
-    xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, 
-    xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, 62, xx, xx, xx, 63, 
-    52, 53, 54, 55, 56, 57, 58, 59, 60, 61, xx, xx, xx, xx, xx, xx, 
-    xx,  0,  1,  2,  3,  4,  5,  6,  7,  8,  9, 10, 11, 12, 13, 14, 
-    15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, xx, xx, xx, xx, xx, 
-    xx, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 
-    41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, xx, xx, xx, xx, xx, 
-    xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, 
-    xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, 
-    xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, 
-    xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, 
-    xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, 
-    xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, 
-    xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, 
-    xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, xx, 
-};
-
-//
-// Fundamental sizes of the binary and base64 encode/decode units in bytes
-//
-#define BINARY_UNIT_SIZE 3
-#define BASE64_UNIT_SIZE 4
-
-//
-// NewBase64Decode
-//
-// Decodes the base64 ASCII string in the inputBuffer to a newly malloced
-// output buffer.
-//
-//  inputBuffer - the source ASCII string for the decode
-//	length - the length of the string or -1 (to specify strlen should be used)
-//	outputLength - if not-NULL, on output will contain the decoded length
-//
-// returns the decoded buffer. Must be free'd by caller. Length is given by
-//	outputLength.
-//
-void *NewBase64Decode(
-	const char *inputBuffer,
-	size_t length,
-	size_t *outputLength)
-{
-	if (length == -1)
-	{
-		length = strlen(inputBuffer);
-	}
-	
-	size_t outputBufferSize = (length / BASE64_UNIT_SIZE) * BINARY_UNIT_SIZE;
-	unsigned char *outputBuffer = (unsigned char *)malloc(outputBufferSize);
-	
-	size_t i = 0;
-	size_t j = 0;
-	while (i < length)
-	{
-		//
-		// Accumulate 4 valid characters (ignore everything else)
-		//
-		unsigned char accumulated[BASE64_UNIT_SIZE];
-		bzero(accumulated, sizeof(unsigned char) * BASE64_UNIT_SIZE);
-		size_t accumulateIndex = 0;
-		while (i < length)
-		{
-			unsigned char decode = base64DecodeLookup[inputBuffer[i++]];
-			if (decode != xx)
-			{
-				accumulated[accumulateIndex] = decode;
-				accumulateIndex++;
-				
-				if (accumulateIndex == BASE64_UNIT_SIZE)
-				{
-					break;
-				}
-			}
-		}
-		
-		//
-		// Store the 6 bits from each of the 4 characters as 3 bytes
-		//
-		outputBuffer[j] = (accumulated[0] << 2) | (accumulated[1] >> 4);
-		outputBuffer[j + 1] = (accumulated[1] << 4) | (accumulated[2] >> 2);
-		outputBuffer[j + 2] = (accumulated[2] << 6) | accumulated[3];
-		j += accumulateIndex - 1;
-	}
-	
-	if (outputLength)
-	{
-		*outputLength = j;
-	}
-	return outputBuffer;
-}
-
-//
-// NewBase64Decode
-//
-// Encodes the arbitrary data in the inputBuffer as base64 into a newly malloced
-// output buffer.
-//
-//  inputBuffer - the source data for the encode
-//	length - the length of the input in bytes
-//  separateLines - if zero, no CR/LF characters will be added. Otherwise
-//		a CR/LF pair will be added every 64 encoded chars.
-//	outputLength - if not-NULL, on output will contain the encoded length
-//		(not including terminating 0 char)
-//
-// returns the encoded buffer. Must be free'd by caller. Length is given by
-//	outputLength.
-//
-char *NewBase64Encode(
-	const void *buffer,
-	size_t length,
-	bool separateLines,
-	size_t *outputLength)
-{
-	const unsigned char *inputBuffer = (const unsigned char *)buffer;
-	
-	#define MAX_NUM_PADDING_CHARS 2
-	#define OUTPUT_LINE_LENGTH 64
-	#define INPUT_LINE_LENGTH ((OUTPUT_LINE_LENGTH / BASE64_UNIT_SIZE) * BINARY_UNIT_SIZE)
-	#define CR_LF_SIZE 0
-	
-	//
-	// Byte accurate calculation of final buffer size
-	//
-	size_t outputBufferSize =
-			((length / BINARY_UNIT_SIZE)
-				+ ((length % BINARY_UNIT_SIZE) ? 1 : 0))
-					* BASE64_UNIT_SIZE;
-	if (separateLines)
-	{
-		outputBufferSize +=
-			(outputBufferSize / OUTPUT_LINE_LENGTH) * CR_LF_SIZE;
-	}
-	
-	//
-	// Include space for a terminating zero
-	//
-	outputBufferSize += 1;
-
-	//
-	// Allocate the output buffer
-	//
-	char *outputBuffer = (char *)malloc(outputBufferSize);
-	if (!outputBuffer)
-	{
-		return NULL;
-	}
-
-	size_t i = 0;
-	size_t j = 0;
-	const size_t lineLength = separateLines ? INPUT_LINE_LENGTH : length;
-	size_t lineEnd = lineLength;
-	
-	while (true)
-	{
-		if (lineEnd > length)
-		{
-			lineEnd = length;
-		}
-
-		for (; i + BINARY_UNIT_SIZE - 1 < lineEnd; i += BINARY_UNIT_SIZE)
-		{
-			//
-			// Inner loop: turn 48 bytes into 64 base64 characters
-			//
-			outputBuffer[j++] = base64EncodeLookup[(inputBuffer[i] & 0xFC) >> 2];
-			outputBuffer[j++] = base64EncodeLookup[((inputBuffer[i] & 0x03) << 4)
-				| ((inputBuffer[i + 1] & 0xF0) >> 4)];
-			outputBuffer[j++] = base64EncodeLookup[((inputBuffer[i + 1] & 0x0F) << 2)
-				| ((inputBuffer[i + 2] & 0xC0) >> 6)];
-			outputBuffer[j++] = base64EncodeLookup[inputBuffer[i + 2] & 0x3F];
-		}
-		
-		if (lineEnd == length)
-		{
-			break;
-		}
-		
-		//
-		// Add the newline
-		//
-		//outputBuffer[j++] = '\r';
-		//outputBuffer[j++] = '\n';
-		lineEnd += lineLength;
-	}
-	
-	if (i + 1 < length)
-	{
-		//
-		// Handle the single '=' case
-		//
-		outputBuffer[j++] = base64EncodeLookup[(inputBuffer[i] & 0xFC) >> 2];
-		outputBuffer[j++] = base64EncodeLookup[((inputBuffer[i] & 0x03) << 4)
-			| ((inputBuffer[i + 1] & 0xF0) >> 4)];
-		outputBuffer[j++] = base64EncodeLookup[(inputBuffer[i + 1] & 0x0F) << 2];
-		outputBuffer[j++] =	'=';
-	}
-	else if (i < length)
-	{
-		//
-		// Handle the double '=' case
-		//
-		outputBuffer[j++] = base64EncodeLookup[(inputBuffer[i] & 0xFC) >> 2];
-		outputBuffer[j++] = base64EncodeLookup[(inputBuffer[i] & 0x03) << 4];
-		outputBuffer[j++] = '=';
-		outputBuffer[j++] = '=';
-	}
-	outputBuffer[j] = 0;
-	
-	//
-	// Set the output length and return the buffer
-	//
-	if (outputLength)
-	{
-		*outputLength = j;
-	}
-	return outputBuffer;
-}
-
-@implementation NSData (Base64)
-
-//
-// dataFromBase64String:
-//
-// Creates an NSData object containing the base64 decoded representation of
-// the base64 string 'aString'
-//
-// Parameters:
-//    aString - the base64 string to decode
-//
-// returns the autoreleased NSData representation of the base64 string
-//
-+ (NSData *)dataFromBase64String:(NSString *)aString
-{
-	NSData *data = [aString dataUsingEncoding:NSASCIIStringEncoding];
-	size_t outputLength;
-	void *outputBuffer = NewBase64Decode([data bytes], [data length], &outputLength);
-	NSData *result = [NSData dataWithBytes:outputBuffer length:outputLength];
-	free(outputBuffer);
-	return result;
-}
-
-//
-// base64EncodedString
-//
-// Creates an NSString object that contains the base 64 encoding of the
-// receiver's data. Lines are broken at 64 characters long.
-//
-// returns an autoreleased NSString being the base 64 representation of the
-//	receiver.
-//
-- (NSString *)base64EncodedString
-{
-	size_t outputLength;
-	char *outputBuffer =
-		NewBase64Encode([self bytes], [self length], true, &outputLength);
-	
-	NSString *result =
-		[[[NSString alloc]
-			initWithBytes:outputBuffer
-			length:outputLength
-			encoding:NSASCIIStringEncoding]
-		autorelease];
-	free(outputBuffer);
-	return result;
-}
-
-@end
diff --git a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/NativeZip.h b/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/NativeZip.h
deleted file mode 100644
index 44e296b8cf..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/NativeZip.h
+++ /dev/null
@@ -1,13 +0,0 @@
-#import <PhoneGap/PGPlugin.h>
-
-@interface NativeZip : PGPlugin {
-     NSString* callbackID;
-}
-
-@property (nonatomic, copy) NSString* callbackID;
-
-- (void) load:(BOOL)base64 arguments:(NSMutableArray*)arguments withDict:(NSMutableDictionary*)options;
-- (void) loadAsString:(NSMutableArray*)arguments withDict:(NSMutableDictionary*)options;
-- (void) loadAsDataURL:(NSMutableArray*)arguments withDict:(NSMutableDictionary*)options;
-
-@end
\ No newline at end of file
diff --git a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/NativeZip.m b/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/NativeZip.m
deleted file mode 100644
index d8c241cf0b..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/NativeZip.m
+++ /dev/null
@@ -1,79 +0,0 @@
-#import "NativeZip.h"
-#import "minizip/unzip.h"
-#import "NSData+Base64.h"
-
-@implementation NativeZip
-@synthesize callbackID;
-
--(void) load:(BOOL)base64 arguments:(NSMutableArray*)arguments withDict:(NSMutableDictionary*)options
-{
-    self.callbackID = [arguments objectAtIndex:0];
-    NSString *zipPath = [arguments objectAtIndex:1];
-    NSString *entryPath = [arguments objectAtIndex:2];
-    NSString *mimetype = nil;
-    if (base64 == TRUE) {
-        mimetype = [arguments objectAtIndex:3];
-    }
-    
-    const char* path = [ zipPath cStringUsingEncoding:NSUTF8StringEncoding ];
-    unzFile unzipFile = unzOpen(path);
-    NSString* jsString = nil;
-    BOOL error = TRUE;
-    if (!unzipFile) {
-		jsString = [[NSString alloc] initWithString: @"cannot open file"];
-    } else {
-        path = [ entryPath cStringUsingEncoding:NSUTF8StringEncoding ];
-        int r = unzLocateFile(unzipFile, path, 2);
-        if (r != UNZ_OK) {
-		    jsString = [[NSString alloc] initWithString: @"cannot find entry"];
-        } else {
-            unz_file_info info;
-            r = unzGetCurrentFileInfo(unzipFile, &info, 0, 0, 0, 0, 0, 0);
-            if (r != UNZ_OK) {
-		        jsString = [[NSString alloc] initWithString: @"cannot determine size"];
-            } else {
-                r = unzOpenCurrentFile(unzipFile);
-                if (r != UNZ_OK) {
-		            jsString = [[NSString alloc] initWithString: @"cannot open entry"];
-                } else {
-                    char* contents = malloc(info.uncompressed_size);
-                    r = unzReadCurrentFile(unzipFile, contents, info.uncompressed_size);
-                    if (r != info.uncompressed_size) {
-                        jsString = [[NSString alloc] initWithString: @"cannot uncompress file"];
-                    } else {
-                        if (base64) {
-                            NSData* readData = [NSData dataWithBytes:(const void *)contents length:sizeof(unsigned char)*info.uncompressed_size];
-                            jsString = [NSString stringWithFormat:@"data:%@;base64,%@", mimetype, [readData base64EncodedString]];
-                        } else {                    
-                            jsString = [[NSString alloc] initWithUTF8String: contents];
-                        }
-                    }
-                    unzCloseCurrentFile(unzipFile);
-                    free(contents);
-                    error = FALSE;
-                }
-            }
-        }
-        unzClose(unzipFile);
-    }
-    PluginResult* pluginResult = [PluginResult
-                                  resultWithStatus:PGCommandStatus_OK
-                                  messageAsString: jsString
-                                  ];
-    if (!error) {
-        [self writeJavascript: [pluginResult toSuccessCallbackString:self.callbackID]];
-    } else {
-        [self writeJavascript: [pluginResult toErrorCallbackString:self.callbackID]];
-    }
-}
-
--(void)loadAsString:(NSMutableArray*)arguments withDict:(NSMutableDictionary*)options  
-{
-    [self load:FALSE arguments:arguments withDict:options];
-}
--(void)loadAsDataURL:(NSMutableArray*)arguments withDict:(NSMutableDictionary*)options  
-{
-    [self load:TRUE arguments:arguments withDict:options];
-}
-
-@end
diff --git a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/WebViewCache.h b/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/WebViewCache.h
deleted file mode 100644
index 216a0bf2bb..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/WebViewCache.h
+++ /dev/null
@@ -1,15 +0,0 @@
-//
-//  WebCache.h
-//  KO Viewer
-//
-//  Created by Tobias Hintze on 3/5/12.
-//  Copyright (c) 2012 KO GmbH. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-
-@interface WebViewCache : NSURLCache
-
-- (NSData*)getSomeData:(NSString*)zip entry:(NSString*)entry;
-
-@end
diff --git a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/WebViewCache.m b/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/WebViewCache.m
deleted file mode 100644
index 4de0bb3a0c..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/WebViewCache.m
+++ /dev/null
@@ -1,72 +0,0 @@
-//
-//  WebCache.m
-//  KO Viewer
-//
-//  Created by Tobias Hintze on 3/5/12.
-//  Copyright (c) 2012 KO GmbH. All rights reserved.
-//
-
-#import "WebViewCache.h"
-#import "minizip/unzip.h"
-
-@implementation WebViewCache
-
-- (NSCachedURLResponse*)cachedResponseForRequest:(NSURLRequest*)request
-{
-    [super removeAllCachedResponses];
-    NSURL *url = [request URL];
-        if ([url query]) {
-        NSData *somedata = [self getSomeData:[url path] entry:[url query]];
-        NSHTTPURLResponse *response = [[NSHTTPURLResponse alloc] initWithURL:url
-                              MIMEType:@"text/xml"
-                 expectedContentLength:[somedata length]
-                      textEncodingName:nil];
-        NSCachedURLResponse *cachedResponse = [[NSCachedURLResponse alloc] 
-            initWithResponse:response data:somedata];
-        return cachedResponse;
-    }
-    return [super cachedResponseForRequest:request];
-}
-
-- (NSData*)getSomeData:(NSString*)zip entry:(NSString*)entry
-{
-    NSLog(@"get some data: %@ %@", zip, entry);
-    const char* path = [ zip cStringUsingEncoding:NSUTF8StringEncoding ];
-    unzFile unzipFile = unzOpen(path);
-    NSData *data = nil;
-    if (!unzipFile) {
-		NSLog(@"cannot open file %@", zip);
-    } else {
-        path = [ entry cStringUsingEncoding:NSUTF8StringEncoding ];
-        int r = unzLocateFile(unzipFile, path, 2);
-        if (r != UNZ_OK) {
-		    NSLog(@"cannot find entry %@", entry);
-        } else {
-            unz_file_info info;
-            r = unzGetCurrentFileInfo(unzipFile, &info, 0, 0, 0, 0, 0, 0);
-            if (r != UNZ_OK) {
-		        NSLog(@"cannot determine size of %@", entry);
-            } else {
-                r = unzOpenCurrentFile(unzipFile);
-                if (r != UNZ_OK) {
-		            NSLog(@"cannot open entry %@", entry);
-                } else {
-                    char* contents = malloc(info.uncompressed_size);
-                    r = unzReadCurrentFile(unzipFile, contents, info.uncompressed_size);
-                    if (r != info.uncompressed_size) {
-                        NSLog(@"cannot uncompress file %@", entry);
-                    } else {
-                        data = [NSData dataWithBytes:(const void *)contents length:sizeof(unsigned char)*info.uncompressed_size];
-                        NSLog(@"read file entry %li %@", info.uncompressed_size, entry);
-                    }
-                    unzCloseCurrentFile(unzipFile);
-                    free(contents);
-                }
-            }
-        }
-        unzClose(unzipFile);
-    }
-    return data;
-}
-
-@end
diff --git a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/minizip/crypt.h b/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/minizip/crypt.h
deleted file mode 100644
index 622f4bc2ec..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/minizip/crypt.h
+++ /dev/null
@@ -1,132 +0,0 @@
-/* crypt.h -- base code for crypt/uncrypt ZIPfile
-
-
-   Version 1.01e, February 12th, 2005
-
-   Copyright (C) 1998-2005 Gilles Vollant
-
-   This code is a modified version of crypting code in Infozip distribution
-
-   The encryption/decryption parts of this source code (as opposed to the
-   non-echoing password parts) were originally written in Europe.  The
-   whole source package can be freely distributed, including from the USA.
-   (Prior to January 2000, re-export from the US was a violation of US law.)
-
-   This encryption code is a direct transcription of the algorithm from
-   Roger Schlafly, described by Phil Katz in the file appnote.txt.  This
-   file (appnote.txt) is distributed with the PKZIP program (even in the
-   version without encryption capabilities).
-
-   If you don't need crypting in your application, just define symbols
-   NOCRYPT and NOUNCRYPT.
-
-   This code support the "Traditional PKWARE Encryption".
-
-   The new AES encryption added on Zip format by Winzip (see the page
-   http://www.winzip.com/aes_info.htm ) and PKWare PKZip 5.x Strong
-   Encryption is not supported.
-*/
-
-#define CRC32(c, b) ((*(pcrc_32_tab+(((int)(c) ^ (b)) & 0xff))) ^ ((c) >> 8))
-
-/***********************************************************************
- * Return the next byte in the pseudo-random sequence
- */
-static int decrypt_byte(unsigned long* pkeys, const unsigned long* pcrc_32_tab)
-{
-    unsigned temp;  /* POTENTIAL BUG:  temp*(temp^1) may overflow in an
-                     * unpredictable manner on 16-bit systems; not a problem
-                     * with any known compiler so far, though */
-
-    temp = ((unsigned)(*(pkeys+2)) & 0xffff) | 2;
-    return (int)(((temp * (temp ^ 1)) >> 8) & 0xff);
-}
-
-/***********************************************************************
- * Update the encryption keys with the next byte of plain text
- */
-static int update_keys(unsigned long* pkeys,const unsigned long* pcrc_32_tab,int c)
-{
-    (*(pkeys+0)) = CRC32((*(pkeys+0)), c);
-    (*(pkeys+1)) += (*(pkeys+0)) & 0xff;
-    (*(pkeys+1)) = (*(pkeys+1)) * 134775813L + 1;
-    {
-      register int keyshift = (int)((*(pkeys+1)) >> 24);
-      (*(pkeys+2)) = CRC32((*(pkeys+2)), keyshift);
-    }
-    return c;
-}
-
-
-/***********************************************************************
- * Initialize the encryption keys and the random header according to
- * the given password.
- */
-static void init_keys(const char* passwd,unsigned long* pkeys,const unsigned long* pcrc_32_tab)
-{
-    *(pkeys+0) = 305419896L;
-    *(pkeys+1) = 591751049L;
-    *(pkeys+2) = 878082192L;
-    while (*passwd != '\0') {
-        update_keys(pkeys,pcrc_32_tab,(int)*passwd);
-        passwd++;
-    }
-}
-
-#define zdecode(pkeys,pcrc_32_tab,c) \
-    (update_keys(pkeys,pcrc_32_tab,c ^= decrypt_byte(pkeys,pcrc_32_tab)))
-
-#define zencode(pkeys,pcrc_32_tab,c,t) \
-    (t=decrypt_byte(pkeys,pcrc_32_tab), update_keys(pkeys,pcrc_32_tab,c), t^(c))
-
-#ifdef INCLUDECRYPTINGCODE_IFCRYPTALLOWED
-
-#define RAND_HEAD_LEN  12
-   /* "last resort" source for second part of crypt seed pattern */
-#  ifndef ZCR_SEED2
-#    define ZCR_SEED2 3141592654UL     /* use PI as default pattern */
-#  endif
-
-static int crypthead(passwd, buf, bufSize, pkeys, pcrc_32_tab, crcForCrypting)
-    const char *passwd;         /* password string */
-    unsigned char *buf;         /* where to write header */
-    int bufSize;
-    unsigned long* pkeys;
-    const unsigned long* pcrc_32_tab;
-    unsigned long crcForCrypting;
-{
-    int n;                       /* index in random header */
-    int t;                       /* temporary */
-    int c;                       /* random byte */
-    unsigned char header[RAND_HEAD_LEN-2]; /* random header */
-    static unsigned calls = 0;   /* ensure different random header each time */
-
-    if (bufSize<RAND_HEAD_LEN)
-      return 0;
-
-    /* First generate RAND_HEAD_LEN-2 random bytes. We encrypt the
-     * output of rand() to get less predictability, since rand() is
-     * often poorly implemented.
-     */
-    if (++calls == 1)
-    {
-        srand((unsigned)(time(NULL) ^ ZCR_SEED2));
-    }
-    init_keys(passwd, pkeys, pcrc_32_tab);
-    for (n = 0; n < RAND_HEAD_LEN-2; n++)
-    {
-        c = (rand() >> 7) & 0xff;
-        header[n] = (unsigned char)zencode(pkeys, pcrc_32_tab, c, t);
-    }
-    /* Encrypt random header (last two bytes is high word of crc) */
-    init_keys(passwd, pkeys, pcrc_32_tab);
-    for (n = 0; n < RAND_HEAD_LEN-2; n++)
-    {
-        buf[n] = (unsigned char)zencode(pkeys, pcrc_32_tab, header[n], t);
-    }
-    buf[n++] = zencode(pkeys, pcrc_32_tab, (int)(crcForCrypting >> 16) & 0xff, t);
-    buf[n++] = zencode(pkeys, pcrc_32_tab, (int)(crcForCrypting >> 24) & 0xff, t);
-    return n;
-}
-
-#endif
diff --git a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/minizip/ioapi.c b/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/minizip/ioapi.c
deleted file mode 100644
index 7f20c182f9..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/minizip/ioapi.c
+++ /dev/null
@@ -1,177 +0,0 @@
-/* ioapi.c -- IO base function header for compress/uncompress .zip
-   files using zlib + zip or unzip API
-
-   Version 1.01e, February 12th, 2005
-
-   Copyright (C) 1998-2005 Gilles Vollant
-*/
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "zlib.h"
-#include "ioapi.h"
-
-
-
-/* I've found an old Unix (a SunOS 4.1.3_U1) without all SEEK_* defined.... */
-
-#ifndef SEEK_CUR
-#define SEEK_CUR    1
-#endif
-
-#ifndef SEEK_END
-#define SEEK_END    2
-#endif
-
-#ifndef SEEK_SET
-#define SEEK_SET    0
-#endif
-
-voidpf ZCALLBACK fopen_file_func OF((
-   voidpf opaque,
-   const char* filename,
-   int mode));
-
-uLong ZCALLBACK fread_file_func OF((
-   voidpf opaque,
-   voidpf stream,
-   void* buf,
-   uLong size));
-
-uLong ZCALLBACK fwrite_file_func OF((
-   voidpf opaque,
-   voidpf stream,
-   const void* buf,
-   uLong size));
-
-long ZCALLBACK ftell_file_func OF((
-   voidpf opaque,
-   voidpf stream));
-
-long ZCALLBACK fseek_file_func OF((
-   voidpf opaque,
-   voidpf stream,
-   uLong offset,
-   int origin));
-
-int ZCALLBACK fclose_file_func OF((
-   voidpf opaque,
-   voidpf stream));
-
-int ZCALLBACK ferror_file_func OF((
-   voidpf opaque,
-   voidpf stream));
-
-
-voidpf ZCALLBACK fopen_file_func (opaque, filename, mode)
-   voidpf opaque;
-   const char* filename;
-   int mode;
-{
-    FILE* file = NULL;
-    const char* mode_fopen = NULL;
-    if ((mode & ZLIB_FILEFUNC_MODE_READWRITEFILTER)==ZLIB_FILEFUNC_MODE_READ)
-        mode_fopen = "rb";
-    else
-    if (mode & ZLIB_FILEFUNC_MODE_EXISTING)
-        mode_fopen = "r+b";
-    else
-    if (mode & ZLIB_FILEFUNC_MODE_CREATE)
-        mode_fopen = "wb";
-
-    if ((filename!=NULL) && (mode_fopen != NULL))
-        file = fopen(filename, mode_fopen);
-    return file;
-}
-
-
-uLong ZCALLBACK fread_file_func (opaque, stream, buf, size)
-   voidpf opaque;
-   voidpf stream;
-   void* buf;
-   uLong size;
-{
-    uLong ret;
-    ret = (uLong)fread(buf, 1, (size_t)size, (FILE *)stream);
-    return ret;
-}
-
-
-uLong ZCALLBACK fwrite_file_func (opaque, stream, buf, size)
-   voidpf opaque;
-   voidpf stream;
-   const void* buf;
-   uLong size;
-{
-    uLong ret;
-    ret = (uLong)fwrite(buf, 1, (size_t)size, (FILE *)stream);
-    return ret;
-}
-
-long ZCALLBACK ftell_file_func (opaque, stream)
-   voidpf opaque;
-   voidpf stream;
-{
-    long ret;
-    ret = ftell((FILE *)stream);
-    return ret;
-}
-
-long ZCALLBACK fseek_file_func (opaque, stream, offset, origin)
-   voidpf opaque;
-   voidpf stream;
-   uLong offset;
-   int origin;
-{
-    int fseek_origin=0;
-    long ret;
-    switch (origin)
-    {
-    case ZLIB_FILEFUNC_SEEK_CUR :
-        fseek_origin = SEEK_CUR;
-        break;
-    case ZLIB_FILEFUNC_SEEK_END :
-        fseek_origin = SEEK_END;
-        break;
-    case ZLIB_FILEFUNC_SEEK_SET :
-        fseek_origin = SEEK_SET;
-        break;
-    default: return -1;
-    }
-    ret = 0;
-    fseek((FILE *)stream, offset, fseek_origin);
-    return ret;
-}
-
-int ZCALLBACK fclose_file_func (opaque, stream)
-   voidpf opaque;
-   voidpf stream;
-{
-    int ret;
-    ret = fclose((FILE *)stream);
-    return ret;
-}
-
-int ZCALLBACK ferror_file_func (opaque, stream)
-   voidpf opaque;
-   voidpf stream;
-{
-    int ret;
-    ret = ferror((FILE *)stream);
-    return ret;
-}
-
-void fill_fopen_filefunc (pzlib_filefunc_def)
-  zlib_filefunc_def* pzlib_filefunc_def;
-{
-    pzlib_filefunc_def->zopen_file = fopen_file_func;
-    pzlib_filefunc_def->zread_file = fread_file_func;
-    pzlib_filefunc_def->zwrite_file = fwrite_file_func;
-    pzlib_filefunc_def->ztell_file = ftell_file_func;
-    pzlib_filefunc_def->zseek_file = fseek_file_func;
-    pzlib_filefunc_def->zclose_file = fclose_file_func;
-    pzlib_filefunc_def->zerror_file = ferror_file_func;
-    pzlib_filefunc_def->opaque = NULL;
-}
diff --git a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/minizip/ioapi.h b/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/minizip/ioapi.h
deleted file mode 100644
index e73a3b2bd8..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/minizip/ioapi.h
+++ /dev/null
@@ -1,75 +0,0 @@
-/* ioapi.h -- IO base function header for compress/uncompress .zip
-   files using zlib + zip or unzip API
-
-   Version 1.01e, February 12th, 2005
-
-   Copyright (C) 1998-2005 Gilles Vollant
-*/
-
-#ifndef _ZLIBIOAPI_H
-#define _ZLIBIOAPI_H
-
-
-#define ZLIB_FILEFUNC_SEEK_CUR (1)
-#define ZLIB_FILEFUNC_SEEK_END (2)
-#define ZLIB_FILEFUNC_SEEK_SET (0)
-
-#define ZLIB_FILEFUNC_MODE_READ      (1)
-#define ZLIB_FILEFUNC_MODE_WRITE     (2)
-#define ZLIB_FILEFUNC_MODE_READWRITEFILTER (3)
-
-#define ZLIB_FILEFUNC_MODE_EXISTING (4)
-#define ZLIB_FILEFUNC_MODE_CREATE   (8)
-
-
-#ifndef ZCALLBACK
-
-#if (defined(WIN32) || defined (WINDOWS) || defined (_WINDOWS)) && defined(CALLBACK) && defined (USEWINDOWS_CALLBACK)
-#define ZCALLBACK CALLBACK
-#else
-#define ZCALLBACK
-#endif
-#endif
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-typedef voidpf (ZCALLBACK *open_file_func) OF((voidpf opaque, const char* filename, int mode));
-typedef uLong  (ZCALLBACK *read_file_func) OF((voidpf opaque, voidpf stream, void* buf, uLong size));
-typedef uLong  (ZCALLBACK *write_file_func) OF((voidpf opaque, voidpf stream, const void* buf, uLong size));
-typedef long   (ZCALLBACK *tell_file_func) OF((voidpf opaque, voidpf stream));
-typedef long   (ZCALLBACK *seek_file_func) OF((voidpf opaque, voidpf stream, uLong offset, int origin));
-typedef int    (ZCALLBACK *close_file_func) OF((voidpf opaque, voidpf stream));
-typedef int    (ZCALLBACK *testerror_file_func) OF((voidpf opaque, voidpf stream));
-
-typedef struct zlib_filefunc_def_s
-{
-    open_file_func      zopen_file;
-    read_file_func      zread_file;
-    write_file_func     zwrite_file;
-    tell_file_func      ztell_file;
-    seek_file_func      zseek_file;
-    close_file_func     zclose_file;
-    testerror_file_func zerror_file;
-    voidpf              opaque;
-} zlib_filefunc_def;
-
-
-
-void fill_fopen_filefunc OF((zlib_filefunc_def* pzlib_filefunc_def));
-
-#define ZREAD(filefunc,filestream,buf,size) ((*((filefunc).zread_file))((filefunc).opaque,filestream,buf,size))
-#define ZWRITE(filefunc,filestream,buf,size) ((*((filefunc).zwrite_file))((filefunc).opaque,filestream,buf,size))
-#define ZTELL(filefunc,filestream) ((*((filefunc).ztell_file))((filefunc).opaque,filestream))
-#define ZSEEK(filefunc,filestream,pos,mode) ((*((filefunc).zseek_file))((filefunc).opaque,filestream,pos,mode))
-#define ZCLOSE(filefunc,filestream) ((*((filefunc).zclose_file))((filefunc).opaque,filestream))
-#define ZERROR(filefunc,filestream) ((*((filefunc).zerror_file))((filefunc).opaque,filestream))
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif
-
diff --git a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/minizip/mztools.c b/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/minizip/mztools.c
deleted file mode 100644
index 74e6c75778..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/minizip/mztools.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
-  Additional tools for Minizip
-  Code: Xavier Roche '2004
-  License: Same as ZLIB (www.gzip.org)
-*/
-
-/* Code */
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "zlib.h"
-#include "unzip.h"
-
-#define READ_8(adr)  ((unsigned char)*(adr))
-#define READ_16(adr) ( READ_8(adr) | (READ_8(adr+1) << 8) )
-#define READ_32(adr) ( READ_16(adr) | (READ_16((adr)+2) << 16) )
-
-#define WRITE_8(buff, n) do { \
-  *((unsigned char*)(buff)) = (unsigned char) ((n) & 0xff); \
-} while(0)
-#define WRITE_16(buff, n) do { \
-  WRITE_8((unsigned char*)(buff), n); \
-  WRITE_8(((unsigned char*)(buff)) + 1, (n) >> 8); \
-} while(0)
-#define WRITE_32(buff, n) do { \
-  WRITE_16((unsigned char*)(buff), (n) & 0xffff); \
-  WRITE_16((unsigned char*)(buff) + 2, (n) >> 16); \
-} while(0)
diff --git a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/minizip/mztools.h b/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/minizip/mztools.h
deleted file mode 100644
index 82d1597ad7..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/minizip/mztools.h
+++ /dev/null
@@ -1,31 +0,0 @@
-/*
-  Additional tools for Minizip
-  Code: Xavier Roche '2004
-  License: Same as ZLIB (www.gzip.org)
-*/
-
-#ifndef _zip_tools_H
-#define _zip_tools_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef _ZLIB_H
-#include "zlib.h"
-#endif
-
-#include "unzip.h"
-
-/* Repair a ZIP file (missing central directory) 
-   file: file to recover
-   fileOut: output file after recovery
-   fileOutTmp: temporary file name used for recovery
-*/
-extern int ZEXPORT unzRepair(const char* file, 
-                             const char* fileOut, 
-                             const char* fileOutTmp, 
-                             uLong* nRecovered,
-                             uLong* bytesRecovered);
-
-#endif
diff --git a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/minizip/unzip.c b/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/minizip/unzip.c
deleted file mode 100644
index 81aee6a149..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/minizip/unzip.c
+++ /dev/null
@@ -1,1597 +0,0 @@
-/* unzip.c -- IO for uncompress .zip files using zlib
-   Version 1.01e, February 12th, 2005
-
-   Copyright (C) 1998-2005 Gilles Vollant
-
-   Read unzip.h for more info
-*/
-
-/* Decryption code comes from crypt.c by Info-ZIP but has been greatly reduced in terms of
-compatibility with older software. The following is from the original crypt.c. Code
-woven in by Terry Thorsen 1/2003.
-*/
-/*
-  Copyright (c) 1990-2000 Info-ZIP.  All rights reserved.
-
-  See the accompanying file LICENSE, version 2000-Apr-09 or later
-  (the contents of which are also included in zip.h) for terms of use.
-  If, for some reason, all these files are missing, the Info-ZIP license
-  also may be found at:  ftp://ftp.info-zip.org/pub/infozip/license.html
-*/
-/*
-  crypt.c (full version) by Info-ZIP.      Last revised:  [see crypt.h]
-
-  The encryption/decryption parts of this source code (as opposed to the
-  non-echoing password parts) were originally written in Europe.  The
-  whole source package can be freely distributed, including from the USA.
-  (Prior to January 2000, re-export from the US was a violation of US law.)
- */
-
-/*
-  This encryption code is a direct transcription of the algorithm from
-  Roger Schlafly, described by Phil Katz in the file appnote.txt.  This
-  file (appnote.txt) is distributed with the PKZIP program (even in the
-  version without encryption capabilities).
- */
-
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include "zlib.h"
-#include "unzip.h"
-
-#ifdef STDC
-#  include <stddef.h>
-#  include <string.h>
-#  include <stdlib.h>
-#endif
-#ifdef NO_ERRNO_H
-    extern int errno;
-#else
-#   include <errno.h>
-#endif
-
-
-#ifndef local
-#  define local static
-#endif
-/* compile with -Dlocal if your debugger can't find static symbols */
-
-
-#ifndef CASESENSITIVITYDEFAULT_NO
-#  if !defined(unix) && !defined(CASESENSITIVITYDEFAULT_YES)
-#    define CASESENSITIVITYDEFAULT_NO
-#  endif
-#endif
-
-
-#ifndef UNZ_BUFSIZE
-#define UNZ_BUFSIZE (16384)
-#endif
-
-#ifndef UNZ_MAXFILENAMEINZIP
-#define UNZ_MAXFILENAMEINZIP (256)
-#endif
-
-#ifndef ALLOC
-# define ALLOC(size) (malloc(size))
-#endif
-#ifndef TRYFREE
-# define TRYFREE(p) {if (p) free(p);}
-#endif
-
-#define SIZECENTRALDIRITEM (0x2e)
-#define SIZEZIPLOCALHEADER (0x1e)
-
-
-
-
-const char unz_copyright[] =
-   " unzip 1.01 Copyright 1998-2004 Gilles Vollant - http://www.winimage.com/zLibDll";
-
-/* unz_file_info_interntal contain internal info about a file in zipfile*/
-typedef struct unz_file_info_internal_s
-{
-    uLong offset_curfile;/* relative offset of local header 4 bytes */
-} unz_file_info_internal;
-
-
-/* file_in_zip_read_info_s contain internal information about a file in zipfile,
-    when reading and decompress it */
-typedef struct
-{
-    char  *read_buffer;         /* internal buffer for compressed data */
-    z_stream stream;            /* zLib stream structure for inflate */
-
-    uLong pos_in_zipfile;       /* position in byte on the zipfile, for fseek*/
-    uLong stream_initialised;   /* flag set if stream structure is initialised*/
-
-    uLong offset_local_extrafield;/* offset of the local extra field */
-    uInt  size_local_extrafield;/* size of the local extra field */
-    uLong pos_local_extrafield;   /* position in the local extra field in read*/
-
-    uLong crc32;                /* crc32 of all data uncompressed */
-    uLong crc32_wait;           /* crc32 we must obtain after decompress all */
-    uLong rest_read_compressed; /* number of byte to be decompressed */
-    uLong rest_read_uncompressed;/*number of byte to be obtained after decomp*/
-    zlib_filefunc_def z_filefunc;
-    voidpf filestream;        /* io structore of the zipfile */
-    uLong compression_method;   /* compression method (0==store) */
-    uLong byte_before_the_zipfile;/* byte before the zipfile, (>0 for sfx)*/
-    int   raw;
-} file_in_zip_read_info_s;
-
-
-/* unz_s contain internal information about the zipfile
-*/
-typedef struct
-{
-    zlib_filefunc_def z_filefunc;
-    voidpf filestream;        /* io structore of the zipfile */
-    unz_global_info gi;       /* public global information */
-    uLong byte_before_the_zipfile;/* byte before the zipfile, (>0 for sfx)*/
-    uLong num_file;             /* number of the current file in the zipfile*/
-    uLong pos_in_central_dir;   /* pos of the current file in the central dir*/
-    uLong current_file_ok;      /* flag about the usability of the current file*/
-    uLong central_pos;          /* position of the beginning of the central dir*/
-
-    uLong size_central_dir;     /* size of the central directory  */
-    uLong offset_central_dir;   /* offset of start of central directory with
-                                   respect to the starting disk number */
-
-    unz_file_info cur_file_info; /* public info about the current file in zip*/
-    unz_file_info_internal cur_file_info_internal; /* private info about it*/
-    file_in_zip_read_info_s* pfile_in_zip_read; /* structure about the current
-                                        file if we are decompressing it */
-    int encrypted;
-#    ifndef NOUNCRYPT
-    unsigned long keys[3];     /* keys defining the pseudo-random sequence */
-    const unsigned long* pcrc_32_tab;
-#    endif
-} unz_s;
-
-
-#ifndef NOUNCRYPT
-#include "crypt.h"
-#endif
-
-/* ===========================================================================
-     Read a byte from a gz_stream; update next_in and avail_in. Return EOF
-   for end of file.
-   IN assertion: the stream s has been sucessfully opened for reading.
-*/
-
-
-local int unzlocal_getByte OF((
-    const zlib_filefunc_def* pzlib_filefunc_def,
-    voidpf filestream,
-    int *pi));
-
-local int unzlocal_getByte(pzlib_filefunc_def,filestream,pi)
-    const zlib_filefunc_def* pzlib_filefunc_def;
-    voidpf filestream;
-    int *pi;
-{
-    unsigned char c;
-    int err = (int)ZREAD(*pzlib_filefunc_def,filestream,&c,1);
-    if (err==1)
-    {
-        *pi = (int)c;
-        return UNZ_OK;
-    }
-    else
-    {
-        if (ZERROR(*pzlib_filefunc_def,filestream))
-            return UNZ_ERRNO;
-        else
-            return UNZ_EOF;
-    }
-}
-
-
-/* ===========================================================================
-   Reads a long in LSB order from the given gz_stream. Sets
-*/
-local int unzlocal_getShort OF((
-    const zlib_filefunc_def* pzlib_filefunc_def,
-    voidpf filestream,
-    uLong *pX));
-
-local int unzlocal_getShort (pzlib_filefunc_def,filestream,pX)
-    const zlib_filefunc_def* pzlib_filefunc_def;
-    voidpf filestream;
-    uLong *pX;
-{
-    uLong x ;
-    int i;
-    int err;
-
-    err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i);
-    x = (uLong)i;
-
-    if (err==UNZ_OK)
-        err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i);
-    x += ((uLong)i)<<8;
-
-    if (err==UNZ_OK)
-        *pX = x;
-    else
-        *pX = 0;
-    return err;
-}
-
-local int unzlocal_getLong OF((
-    const zlib_filefunc_def* pzlib_filefunc_def,
-    voidpf filestream,
-    uLong *pX));
-
-local int unzlocal_getLong (pzlib_filefunc_def,filestream,pX)
-    const zlib_filefunc_def* pzlib_filefunc_def;
-    voidpf filestream;
-    uLong *pX;
-{
-    uLong x ;
-    int i;
-    int err;
-
-    err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i);
-    x = (uLong)i;
-
-    if (err==UNZ_OK)
-        err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i);
-    x += ((uLong)i)<<8;
-
-    if (err==UNZ_OK)
-        err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i);
-    x += ((uLong)i)<<16;
-
-    if (err==UNZ_OK)
-        err = unzlocal_getByte(pzlib_filefunc_def,filestream,&i);
-    x += ((uLong)i)<<24;
-
-    if (err==UNZ_OK)
-        *pX = x;
-    else
-        *pX = 0;
-    return err;
-}
-
-
-/* My own strcmpi / strcasecmp */
-local int strcmpcasenosensitive_internal (fileName1,fileName2)
-    const char* fileName1;
-    const char* fileName2;
-{
-    for (;;)
-    {
-        char c1=*(fileName1++);
-        char c2=*(fileName2++);
-        if ((c1>='a') && (c1<='z'))
-            c1 -= 0x20;
-        if ((c2>='a') && (c2<='z'))
-            c2 -= 0x20;
-        if (c1=='\0')
-            return ((c2=='\0') ? 0 : -1);
-        if (c2=='\0')
-            return 1;
-        if (c1<c2)
-            return -1;
-        if (c1>c2)
-            return 1;
-    }
-}
-
-
-#ifdef  CASESENSITIVITYDEFAULT_NO
-#define CASESENSITIVITYDEFAULTVALUE 2
-#else
-#define CASESENSITIVITYDEFAULTVALUE 1
-#endif
-
-#ifndef STRCMPCASENOSENTIVEFUNCTION
-#define STRCMPCASENOSENTIVEFUNCTION strcmpcasenosensitive_internal
-#endif
-
-/*
-   Compare two filename (fileName1,fileName2).
-   If iCaseSenisivity = 1, comparision is case sensitivity (like strcmp)
-   If iCaseSenisivity = 2, comparision is not case sensitivity (like strcmpi
-                                                                or strcasecmp)
-   If iCaseSenisivity = 0, case sensitivity is defaut of your operating system
-        (like 1 on Unix, 2 on Windows)
-
-*/
-extern int ZEXPORT unzStringFileNameCompare (fileName1,fileName2,iCaseSensitivity)
-    const char* fileName1;
-    const char* fileName2;
-    int iCaseSensitivity;
-{
-    if (iCaseSensitivity==0)
-        iCaseSensitivity=CASESENSITIVITYDEFAULTVALUE;
-
-    if (iCaseSensitivity==1)
-        return strcmp(fileName1,fileName2);
-
-    return STRCMPCASENOSENTIVEFUNCTION(fileName1,fileName2);
-}
-
-#ifndef BUFREADCOMMENT
-#define BUFREADCOMMENT (0x400)
-#endif
-
-/*
-  Locate the Central directory of a zipfile (at the end, just before
-    the global comment)
-*/
-local uLong unzlocal_SearchCentralDir OF((
-    const zlib_filefunc_def* pzlib_filefunc_def,
-    voidpf filestream));
-
-local uLong unzlocal_SearchCentralDir(pzlib_filefunc_def,filestream)
-    const zlib_filefunc_def* pzlib_filefunc_def;
-    voidpf filestream;
-{
-    unsigned char* buf;
-    uLong uSizeFile;
-    uLong uBackRead;
-    uLong uMaxBack=0xffff; /* maximum size of global comment */
-    uLong uPosFound=0;
-
-    if (ZSEEK(*pzlib_filefunc_def,filestream,0,ZLIB_FILEFUNC_SEEK_END) != 0)
-        return 0;
-
-
-    uSizeFile = ZTELL(*pzlib_filefunc_def,filestream);
-
-    if (uMaxBack>uSizeFile)
-        uMaxBack = uSizeFile;
-
-    buf = (unsigned char*)ALLOC(BUFREADCOMMENT+4);
-    if (buf==NULL)
-        return 0;
-
-    uBackRead = 4;
-    while (uBackRead<uMaxBack)
-    {
-        uLong uReadSize,uReadPos ;
-        int i;
-        if (uBackRead+BUFREADCOMMENT>uMaxBack)
-            uBackRead = uMaxBack;
-        else
-            uBackRead+=BUFREADCOMMENT;
-        uReadPos = uSizeFile-uBackRead ;
-
-        uReadSize = ((BUFREADCOMMENT+4) < (uSizeFile-uReadPos)) ?
-                     (BUFREADCOMMENT+4) : (uSizeFile-uReadPos);
-        if (ZSEEK(*pzlib_filefunc_def,filestream,uReadPos,ZLIB_FILEFUNC_SEEK_SET)!=0)
-            break;
-
-        if (ZREAD(*pzlib_filefunc_def,filestream,buf,uReadSize)!=uReadSize)
-            break;
-
-        for (i=(int)uReadSize-3; (i--)>0;)
-            if (((*(buf+i))==0x50) && ((*(buf+i+1))==0x4b) &&
-                ((*(buf+i+2))==0x05) && ((*(buf+i+3))==0x06))
-            {
-                uPosFound = uReadPos+i;
-                break;
-            }
-
-        if (uPosFound!=0)
-            break;
-    }
-    TRYFREE(buf);
-    return uPosFound;
-}
-
-/*
-  Open a Zip file. path contain the full pathname (by example,
-     on a Windows NT computer "c:\\test\\zlib114.zip" or on an Unix computer
-     "zlib/zlib114.zip".
-     If the zipfile cannot be opened (file doesn't exist or in not valid), the
-       return value is NULL.
-     Else, the return value is a unzFile Handle, usable with other function
-       of this unzip package.
-*/
-extern unzFile ZEXPORT unzOpen2 (path, pzlib_filefunc_def)
-    const char *path;
-    zlib_filefunc_def* pzlib_filefunc_def;
-{
-    unz_s us;
-    unz_s *s;
-    uLong central_pos,uL;
-
-    uLong number_disk;          /* number of the current dist, used for
-                                   spaning ZIP, unsupported, always 0*/
-    uLong number_disk_with_CD;  /* number the the disk with central dir, used
-                                   for spaning ZIP, unsupported, always 0*/
-    uLong number_entry_CD;      /* total number of entries in
-                                   the central dir
-                                   (same than number_entry on nospan) */
-
-    int err=UNZ_OK;
-
-    if (unz_copyright[0]!=' ')
-        return NULL;
-
-    if (pzlib_filefunc_def==NULL)
-        fill_fopen_filefunc(&us.z_filefunc);
-    else
-        us.z_filefunc = *pzlib_filefunc_def;
-
-    us.filestream= (*(us.z_filefunc.zopen_file))(us.z_filefunc.opaque,
-                                                 path,
-                                                 ZLIB_FILEFUNC_MODE_READ |
-                                                 ZLIB_FILEFUNC_MODE_EXISTING);
-    if (us.filestream==NULL)
-        return NULL;
-
-    central_pos = unzlocal_SearchCentralDir(&us.z_filefunc,us.filestream);
-    if (central_pos==0)
-        err=UNZ_ERRNO;
-
-    if (ZSEEK(us.z_filefunc, us.filestream,
-                                      central_pos,ZLIB_FILEFUNC_SEEK_SET)!=0)
-        err=UNZ_ERRNO;
-
-    /* the signature, already checked */
-    if (unzlocal_getLong(&us.z_filefunc, us.filestream,&uL)!=UNZ_OK)
-        err=UNZ_ERRNO;
-
-    /* number of this disk */
-    if (unzlocal_getShort(&us.z_filefunc, us.filestream,&number_disk)!=UNZ_OK)
-        err=UNZ_ERRNO;
-
-    /* number of the disk with the start of the central directory */
-    if (unzlocal_getShort(&us.z_filefunc, us.filestream,&number_disk_with_CD)!=UNZ_OK)
-        err=UNZ_ERRNO;
-
-    /* total number of entries in the central dir on this disk */
-    if (unzlocal_getShort(&us.z_filefunc, us.filestream,&us.gi.number_entry)!=UNZ_OK)
-        err=UNZ_ERRNO;
-
-    /* total number of entries in the central dir */
-    if (unzlocal_getShort(&us.z_filefunc, us.filestream,&number_entry_CD)!=UNZ_OK)
-        err=UNZ_ERRNO;
-
-    if ((number_entry_CD!=us.gi.number_entry) ||
-        (number_disk_with_CD!=0) ||
-        (number_disk!=0))
-        err=UNZ_BADZIPFILE;
-
-    /* size of the central directory */
-    if (unzlocal_getLong(&us.z_filefunc, us.filestream,&us.size_central_dir)!=UNZ_OK)
-        err=UNZ_ERRNO;
-
-    /* offset of start of central directory with respect to the
-          starting disk number */
-    if (unzlocal_getLong(&us.z_filefunc, us.filestream,&us.offset_central_dir)!=UNZ_OK)
-        err=UNZ_ERRNO;
-
-    /* zipfile comment length */
-    if (unzlocal_getShort(&us.z_filefunc, us.filestream,&us.gi.size_comment)!=UNZ_OK)
-        err=UNZ_ERRNO;
-
-    if ((central_pos<us.offset_central_dir+us.size_central_dir) &&
-        (err==UNZ_OK))
-        err=UNZ_BADZIPFILE;
-
-    if (err!=UNZ_OK)
-    {
-        ZCLOSE(us.z_filefunc, us.filestream);
-        return NULL;
-    }
-
-    us.byte_before_the_zipfile = central_pos -
-                            (us.offset_central_dir+us.size_central_dir);
-    us.central_pos = central_pos;
-    us.pfile_in_zip_read = NULL;
-    us.encrypted = 0;
-
-
-    s=(unz_s*)ALLOC(sizeof(unz_s));
-    *s=us;
-    unzGoToFirstFile((unzFile)s);
-    return (unzFile)s;
-}
-
-
-extern unzFile ZEXPORT unzOpen (path)
-    const char *path;
-{
-    return unzOpen2(path, NULL);
-}
-
-/*
-  Close a ZipFile opened with unzipOpen.
-  If there is files inside the .Zip opened with unzipOpenCurrentFile (see later),
-    these files MUST be closed with unzipCloseCurrentFile before call unzipClose.
-  return UNZ_OK if there is no problem. */
-extern int ZEXPORT unzClose (file)
-    unzFile file;
-{
-    unz_s* s;
-    if (file==NULL)
-        return UNZ_PARAMERROR;
-    s=(unz_s*)file;
-
-    if (s->pfile_in_zip_read!=NULL)
-        unzCloseCurrentFile(file);
-
-    ZCLOSE(s->z_filefunc, s->filestream);
-    TRYFREE(s);
-    return UNZ_OK;
-}
-
-
-/*
-  Write info about the ZipFile in the *pglobal_info structure.
-  No preparation of the structure is needed
-  return UNZ_OK if there is no problem. */
-extern int ZEXPORT unzGetGlobalInfo (file,pglobal_info)
-    unzFile file;
-    unz_global_info *pglobal_info;
-{
-    unz_s* s;
-    if (file==NULL)
-        return UNZ_PARAMERROR;
-    s=(unz_s*)file;
-    *pglobal_info=s->gi;
-    return UNZ_OK;
-}
-
-
-/*
-   Translate date/time from Dos format to tm_unz (readable more easilty)
-*/
-local void unzlocal_DosDateToTmuDate (ulDosDate, ptm)
-    uLong ulDosDate;
-    tm_unz* ptm;
-{
-    uLong uDate;
-    uDate = (uLong)(ulDosDate>>16);
-    ptm->tm_mday = (uInt)(uDate&0x1f) ;
-    ptm->tm_mon =  (uInt)((((uDate)&0x1E0)/0x20)-1) ;
-    ptm->tm_year = (uInt)(((uDate&0x0FE00)/0x0200)+1980) ;
-
-    ptm->tm_hour = (uInt) ((ulDosDate &0xF800)/0x800);
-    ptm->tm_min =  (uInt) ((ulDosDate&0x7E0)/0x20) ;
-    ptm->tm_sec =  (uInt) (2*(ulDosDate&0x1f)) ;
-}
-
-/*
-  Get Info about the current file in the zipfile, with internal only info
-*/
-local int unzlocal_GetCurrentFileInfoInternal OF((unzFile file,
-                                                  unz_file_info *pfile_info,
-                                                  unz_file_info_internal
-                                                  *pfile_info_internal,
-                                                  char *szFileName,
-                                                  uLong fileNameBufferSize,
-                                                  void *extraField,
-                                                  uLong extraFieldBufferSize,
-                                                  char *szComment,
-                                                  uLong commentBufferSize));
-
-local int unzlocal_GetCurrentFileInfoInternal (file,
-                                              pfile_info,
-                                              pfile_info_internal,
-                                              szFileName, fileNameBufferSize,
-                                              extraField, extraFieldBufferSize,
-                                              szComment,  commentBufferSize)
-    unzFile file;
-    unz_file_info *pfile_info;
-    unz_file_info_internal *pfile_info_internal;
-    char *szFileName;
-    uLong fileNameBufferSize;
-    void *extraField;
-    uLong extraFieldBufferSize;
-    char *szComment;
-    uLong commentBufferSize;
-{
-    unz_s* s;
-    unz_file_info file_info;
-    unz_file_info_internal file_info_internal;
-    int err=UNZ_OK;
-    uLong uMagic;
-    long lSeek=0;
-
-    if (file==NULL)
-        return UNZ_PARAMERROR;
-    s=(unz_s*)file;
-    if (ZSEEK(s->z_filefunc, s->filestream,
-              s->pos_in_central_dir+s->byte_before_the_zipfile,
-              ZLIB_FILEFUNC_SEEK_SET)!=0)
-        err=UNZ_ERRNO;
-
-
-    /* we check the magic */
-    if (err==UNZ_OK)
-        if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uMagic) != UNZ_OK)
-            err=UNZ_ERRNO;
-        else if (uMagic!=0x02014b50)
-            err=UNZ_BADZIPFILE;
-
-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.version) != UNZ_OK)
-        err=UNZ_ERRNO;
-
-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.version_needed) != UNZ_OK)
-        err=UNZ_ERRNO;
-
-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.flag) != UNZ_OK)
-        err=UNZ_ERRNO;
-
-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.compression_method) != UNZ_OK)
-        err=UNZ_ERRNO;
-
-    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info.dosDate) != UNZ_OK)
-        err=UNZ_ERRNO;
-
-    unzlocal_DosDateToTmuDate(file_info.dosDate,&file_info.tmu_date);
-
-    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info.crc) != UNZ_OK)
-        err=UNZ_ERRNO;
-
-    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info.compressed_size) != UNZ_OK)
-        err=UNZ_ERRNO;
-
-    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info.uncompressed_size) != UNZ_OK)
-        err=UNZ_ERRNO;
-
-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.size_filename) != UNZ_OK)
-        err=UNZ_ERRNO;
-
-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.size_file_extra) != UNZ_OK)
-        err=UNZ_ERRNO;
-
-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.size_file_comment) != UNZ_OK)
-        err=UNZ_ERRNO;
-
-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.disk_num_start) != UNZ_OK)
-        err=UNZ_ERRNO;
-
-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&file_info.internal_fa) != UNZ_OK)
-        err=UNZ_ERRNO;
-
-    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info.external_fa) != UNZ_OK)
-        err=UNZ_ERRNO;
-
-    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&file_info_internal.offset_curfile) != UNZ_OK)
-        err=UNZ_ERRNO;
-
-    lSeek+=file_info.size_filename;
-    if ((err==UNZ_OK) && (szFileName!=NULL))
-    {
-        uLong uSizeRead ;
-        if (file_info.size_filename<fileNameBufferSize)
-        {
-            *(szFileName+file_info.size_filename)='\0';
-            uSizeRead = file_info.size_filename;
-        }
-        else
-            uSizeRead = fileNameBufferSize;
-
-        if ((file_info.size_filename>0) && (fileNameBufferSize>0))
-            if (ZREAD(s->z_filefunc, s->filestream,szFileName,uSizeRead)!=uSizeRead)
-                err=UNZ_ERRNO;
-        lSeek -= uSizeRead;
-    }
-
-
-    if ((err==UNZ_OK) && (extraField!=NULL))
-    {
-        uLong uSizeRead ;
-        if (file_info.size_file_extra<extraFieldBufferSize)
-            uSizeRead = file_info.size_file_extra;
-        else
-            uSizeRead = extraFieldBufferSize;
-
-        if (lSeek!=0)
-            if (ZSEEK(s->z_filefunc, s->filestream,lSeek,ZLIB_FILEFUNC_SEEK_CUR)==0)
-                lSeek=0;
-            else
-                err=UNZ_ERRNO;
-        if ((file_info.size_file_extra>0) && (extraFieldBufferSize>0))
-            if (ZREAD(s->z_filefunc, s->filestream,extraField,uSizeRead)!=uSizeRead)
-                err=UNZ_ERRNO;
-        lSeek += file_info.size_file_extra - uSizeRead;
-    }
-    else
-        lSeek+=file_info.size_file_extra;
-
-
-    if ((err==UNZ_OK) && (szComment!=NULL))
-    {
-        uLong uSizeRead ;
-        if (file_info.size_file_comment<commentBufferSize)
-        {
-            *(szComment+file_info.size_file_comment)='\0';
-            uSizeRead = file_info.size_file_comment;
-        }
-        else
-            uSizeRead = commentBufferSize;
-
-        if (lSeek!=0)
-            if (ZSEEK(s->z_filefunc, s->filestream,lSeek,ZLIB_FILEFUNC_SEEK_CUR)==0)
-                lSeek=0;
-            else
-                err=UNZ_ERRNO;
-        if ((file_info.size_file_comment>0) && (commentBufferSize>0))
-            if (ZREAD(s->z_filefunc, s->filestream,szComment,uSizeRead)!=uSizeRead)
-                err=UNZ_ERRNO;
-        lSeek+=file_info.size_file_comment - uSizeRead;
-    }
-    else
-        lSeek+=file_info.size_file_comment;
-
-    if ((err==UNZ_OK) && (pfile_info!=NULL))
-        *pfile_info=file_info;
-
-    if ((err==UNZ_OK) && (pfile_info_internal!=NULL))
-        *pfile_info_internal=file_info_internal;
-
-    return err;
-}
-
-
-
-/*
-  Write info about the ZipFile in the *pglobal_info structure.
-  No preparation of the structure is needed
-  return UNZ_OK if there is no problem.
-*/
-extern int ZEXPORT unzGetCurrentFileInfo (file,
-                                          pfile_info,
-                                          szFileName, fileNameBufferSize,
-                                          extraField, extraFieldBufferSize,
-                                          szComment,  commentBufferSize)
-    unzFile file;
-    unz_file_info *pfile_info;
-    char *szFileName;
-    uLong fileNameBufferSize;
-    void *extraField;
-    uLong extraFieldBufferSize;
-    char *szComment;
-    uLong commentBufferSize;
-{
-    return unzlocal_GetCurrentFileInfoInternal(file,pfile_info,NULL,
-                                                szFileName,fileNameBufferSize,
-                                                extraField,extraFieldBufferSize,
-                                                szComment,commentBufferSize);
-}
-
-/*
-  Set the current file of the zipfile to the first file.
-  return UNZ_OK if there is no problem
-*/
-extern int ZEXPORT unzGoToFirstFile (file)
-    unzFile file;
-{
-    int err=UNZ_OK;
-    unz_s* s;
-    if (file==NULL)
-        return UNZ_PARAMERROR;
-    s=(unz_s*)file;
-    s->pos_in_central_dir=s->offset_central_dir;
-    s->num_file=0;
-    err=unzlocal_GetCurrentFileInfoInternal(file,&s->cur_file_info,
-                                             &s->cur_file_info_internal,
-                                             NULL,0,NULL,0,NULL,0);
-    s->current_file_ok = (err == UNZ_OK);
-    return err;
-}
-
-/*
-  Set the current file of the zipfile to the next file.
-  return UNZ_OK if there is no problem
-  return UNZ_END_OF_LIST_OF_FILE if the actual file was the latest.
-*/
-extern int ZEXPORT unzGoToNextFile (file)
-    unzFile file;
-{
-    unz_s* s;
-    int err;
-
-    if (file==NULL)
-        return UNZ_PARAMERROR;
-    s=(unz_s*)file;
-    if (!s->current_file_ok)
-        return UNZ_END_OF_LIST_OF_FILE;
-    if (s->gi.number_entry != 0xffff)    /* 2^16 files overflow hack */
-      if (s->num_file+1==s->gi.number_entry)
-        return UNZ_END_OF_LIST_OF_FILE;
-
-    s->pos_in_central_dir += SIZECENTRALDIRITEM + s->cur_file_info.size_filename +
-            s->cur_file_info.size_file_extra + s->cur_file_info.size_file_comment ;
-    s->num_file++;
-    err = unzlocal_GetCurrentFileInfoInternal(file,&s->cur_file_info,
-                                               &s->cur_file_info_internal,
-                                               NULL,0,NULL,0,NULL,0);
-    s->current_file_ok = (err == UNZ_OK);
-    return err;
-}
-
-
-/*
-  Try locate the file szFileName in the zipfile.
-  For the iCaseSensitivity signification, see unzipStringFileNameCompare
-
-  return value :
-  UNZ_OK if the file is found. It becomes the current file.
-  UNZ_END_OF_LIST_OF_FILE if the file is not found
-*/
-extern int ZEXPORT unzLocateFile (file, szFileName, iCaseSensitivity)
-    unzFile file;
-    const char *szFileName;
-    int iCaseSensitivity;
-{
-    unz_s* s;
-    int err;
-
-    /* We remember the 'current' position in the file so that we can jump
-     * back there if we fail.
-     */
-    unz_file_info cur_file_infoSaved;
-    unz_file_info_internal cur_file_info_internalSaved;
-    uLong num_fileSaved;
-    uLong pos_in_central_dirSaved;
-
-
-    if (file==NULL)
-        return UNZ_PARAMERROR;
-
-    if (strlen(szFileName)>=UNZ_MAXFILENAMEINZIP)
-        return UNZ_PARAMERROR;
-
-    s=(unz_s*)file;
-    if (!s->current_file_ok)
-        return UNZ_END_OF_LIST_OF_FILE;
-
-    /* Save the current state */
-    num_fileSaved = s->num_file;
-    pos_in_central_dirSaved = s->pos_in_central_dir;
-    cur_file_infoSaved = s->cur_file_info;
-    cur_file_info_internalSaved = s->cur_file_info_internal;
-
-    err = unzGoToFirstFile(file);
-
-    while (err == UNZ_OK)
-    {
-        char szCurrentFileName[UNZ_MAXFILENAMEINZIP+1];
-        err = unzGetCurrentFileInfo(file,NULL,
-                                    szCurrentFileName,sizeof(szCurrentFileName)-1,
-                                    NULL,0,NULL,0);
-        if (err == UNZ_OK)
-        {
-            if (unzStringFileNameCompare(szCurrentFileName,
-                                            szFileName,iCaseSensitivity)==0)
-                return UNZ_OK;
-            err = unzGoToNextFile(file);
-        }
-    }
-
-    /* We failed, so restore the state of the 'current file' to where we
-     * were.
-     */
-    s->num_file = num_fileSaved ;
-    s->pos_in_central_dir = pos_in_central_dirSaved ;
-    s->cur_file_info = cur_file_infoSaved;
-    s->cur_file_info_internal = cur_file_info_internalSaved;
-    return err;
-}
-
-
-/*
-///////////////////////////////////////////
-// Contributed by Ryan Haksi (mailto://cryogen@infoserve.net)
-// I need random access
-//
-// Further optimization could be realized by adding an ability
-// to cache the directory in memory. The goal being a single
-// comprehensive file read to put the file I need in a memory.
-*/
-
-/*
-typedef struct unz_file_pos_s
-{
-    uLong pos_in_zip_directory;   // offset in file
-    uLong num_of_file;            // # of file
-} unz_file_pos;
-*/
-
-extern int ZEXPORT unzGetFilePos(file, file_pos)
-    unzFile file;
-    unz_file_pos* file_pos;
-{
-    unz_s* s;
-
-    if (file==NULL || file_pos==NULL)
-        return UNZ_PARAMERROR;
-    s=(unz_s*)file;
-    if (!s->current_file_ok)
-        return UNZ_END_OF_LIST_OF_FILE;
-
-    file_pos->pos_in_zip_directory  = s->pos_in_central_dir;
-    file_pos->num_of_file           = s->num_file;
-
-    return UNZ_OK;
-}
-
-extern int ZEXPORT unzGoToFilePos(file, file_pos)
-    unzFile file;
-    unz_file_pos* file_pos;
-{
-    unz_s* s;
-    int err;
-
-    if (file==NULL || file_pos==NULL)
-        return UNZ_PARAMERROR;
-    s=(unz_s*)file;
-
-    /* jump to the right spot */
-    s->pos_in_central_dir = file_pos->pos_in_zip_directory;
-    s->num_file           = file_pos->num_of_file;
-
-    /* set the current file */
-    err = unzlocal_GetCurrentFileInfoInternal(file,&s->cur_file_info,
-                                               &s->cur_file_info_internal,
-                                               NULL,0,NULL,0,NULL,0);
-    /* return results */
-    s->current_file_ok = (err == UNZ_OK);
-    return err;
-}
-
-/*
-// Unzip Helper Functions - should be here?
-///////////////////////////////////////////
-*/
-
-/*
-  Read the local header of the current zipfile
-  Check the coherency of the local header and info in the end of central
-        directory about this file
-  store in *piSizeVar the size of extra info in local header
-        (filename and size of extra field data)
-*/
-local int unzlocal_CheckCurrentFileCoherencyHeader (s,piSizeVar,
-                                                    poffset_local_extrafield,
-                                                    psize_local_extrafield)
-    unz_s* s;
-    uInt* piSizeVar;
-    uLong *poffset_local_extrafield;
-    uInt  *psize_local_extrafield;
-{
-    uLong uMagic,uData,uFlags;
-    uLong size_filename;
-    uLong size_extra_field;
-    int err=UNZ_OK;
-
-    *piSizeVar = 0;
-    *poffset_local_extrafield = 0;
-    *psize_local_extrafield = 0;
-
-    if (ZSEEK(s->z_filefunc, s->filestream,s->cur_file_info_internal.offset_curfile +
-                                s->byte_before_the_zipfile,ZLIB_FILEFUNC_SEEK_SET)!=0)
-        return UNZ_ERRNO;
-
-
-    if (err==UNZ_OK)
-        if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uMagic) != UNZ_OK)
-            err=UNZ_ERRNO;
-        else if (uMagic!=0x04034b50)
-            err=UNZ_BADZIPFILE;
-
-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&uData) != UNZ_OK)
-        err=UNZ_ERRNO;
-/*
-    else if ((err==UNZ_OK) && (uData!=s->cur_file_info.wVersion))
-        err=UNZ_BADZIPFILE;
-*/
-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&uFlags) != UNZ_OK)
-        err=UNZ_ERRNO;
-
-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&uData) != UNZ_OK)
-        err=UNZ_ERRNO;
-    else if ((err==UNZ_OK) && (uData!=s->cur_file_info.compression_method))
-        err=UNZ_BADZIPFILE;
-
-    if ((err==UNZ_OK) && (s->cur_file_info.compression_method!=0) &&
-                         (s->cur_file_info.compression_method!=Z_DEFLATED))
-        err=UNZ_BADZIPFILE;
-
-    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) /* date/time */
-        err=UNZ_ERRNO;
-
-    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) /* crc */
-        err=UNZ_ERRNO;
-    else if ((err==UNZ_OK) && (uData!=s->cur_file_info.crc) &&
-                              ((uFlags & 8)==0))
-        err=UNZ_BADZIPFILE;
-
-    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) /* size compr */
-        err=UNZ_ERRNO;
-    else if ((err==UNZ_OK) && (uData!=s->cur_file_info.compressed_size) &&
-                              ((uFlags & 8)==0))
-        err=UNZ_BADZIPFILE;
-
-    if (unzlocal_getLong(&s->z_filefunc, s->filestream,&uData) != UNZ_OK) /* size uncompr */
-        err=UNZ_ERRNO;
-    else if ((err==UNZ_OK) && (uData!=s->cur_file_info.uncompressed_size) &&
-                              ((uFlags & 8)==0))
-        err=UNZ_BADZIPFILE;
-
-
-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&size_filename) != UNZ_OK)
-        err=UNZ_ERRNO;
-    else if ((err==UNZ_OK) && (size_filename!=s->cur_file_info.size_filename))
-        err=UNZ_BADZIPFILE;
-
-    *piSizeVar += (uInt)size_filename;
-
-    if (unzlocal_getShort(&s->z_filefunc, s->filestream,&size_extra_field) != UNZ_OK)
-        err=UNZ_ERRNO;
-    *poffset_local_extrafield= s->cur_file_info_internal.offset_curfile +
-                                    SIZEZIPLOCALHEADER + size_filename;
-    *psize_local_extrafield = (uInt)size_extra_field;
-
-    *piSizeVar += (uInt)size_extra_field;
-
-    return err;
-}
-
-/*
-  Open for reading data the current file in the zipfile.
-  If there is no error and the file is opened, the return value is UNZ_OK.
-*/
-extern int ZEXPORT unzOpenCurrentFile3 (file, method, level, raw, password)
-    unzFile file;
-    int* method;
-    int* level;
-    int raw;
-    const char* password;
-{
-    int err=UNZ_OK;
-    uInt iSizeVar;
-    unz_s* s;
-    file_in_zip_read_info_s* pfile_in_zip_read_info;
-    uLong offset_local_extrafield;  /* offset of the local extra field */
-    uInt  size_local_extrafield;    /* size of the local extra field */
-#    ifndef NOUNCRYPT
-    char source[12];
-#    else
-    if (password != NULL)
-        return UNZ_PARAMERROR;
-#    endif
-
-    if (file==NULL)
-        return UNZ_PARAMERROR;
-    s=(unz_s*)file;
-    if (!s->current_file_ok)
-        return UNZ_PARAMERROR;
-
-    if (s->pfile_in_zip_read != NULL)
-        unzCloseCurrentFile(file);
-
-    if (unzlocal_CheckCurrentFileCoherencyHeader(s,&iSizeVar,
-                &offset_local_extrafield,&size_local_extrafield)!=UNZ_OK)
-        return UNZ_BADZIPFILE;
-
-    pfile_in_zip_read_info = (file_in_zip_read_info_s*)
-                                        ALLOC(sizeof(file_in_zip_read_info_s));
-    if (pfile_in_zip_read_info==NULL)
-        return UNZ_INTERNALERROR;
-
-    pfile_in_zip_read_info->read_buffer=(char*)ALLOC(UNZ_BUFSIZE);
-    pfile_in_zip_read_info->offset_local_extrafield = offset_local_extrafield;
-    pfile_in_zip_read_info->size_local_extrafield = size_local_extrafield;
-    pfile_in_zip_read_info->pos_local_extrafield=0;
-    pfile_in_zip_read_info->raw=raw;
-
-    if (pfile_in_zip_read_info->read_buffer==NULL)
-    {
-        TRYFREE(pfile_in_zip_read_info);
-        return UNZ_INTERNALERROR;
-    }
-
-    pfile_in_zip_read_info->stream_initialised=0;
-
-    if (method!=NULL)
-        *method = (int)s->cur_file_info.compression_method;
-
-    if (level!=NULL)
-    {
-        *level = 6;
-        switch (s->cur_file_info.flag & 0x06)
-        {
-          case 6 : *level = 1; break;
-          case 4 : *level = 2; break;
-          case 2 : *level = 9; break;
-        }
-    }
-
-    if ((s->cur_file_info.compression_method!=0) &&
-        (s->cur_file_info.compression_method!=Z_DEFLATED))
-        err=UNZ_BADZIPFILE;
-
-    pfile_in_zip_read_info->crc32_wait=s->cur_file_info.crc;
-    pfile_in_zip_read_info->crc32=0;
-    pfile_in_zip_read_info->compression_method =
-            s->cur_file_info.compression_method;
-    pfile_in_zip_read_info->filestream=s->filestream;
-    pfile_in_zip_read_info->z_filefunc=s->z_filefunc;
-    pfile_in_zip_read_info->byte_before_the_zipfile=s->byte_before_the_zipfile;
-
-    pfile_in_zip_read_info->stream.total_out = 0;
-
-    if ((s->cur_file_info.compression_method==Z_DEFLATED) &&
-        (!raw))
-    {
-      pfile_in_zip_read_info->stream.zalloc = (alloc_func)0;
-      pfile_in_zip_read_info->stream.zfree = (free_func)0;
-      pfile_in_zip_read_info->stream.opaque = (voidpf)0;
-      pfile_in_zip_read_info->stream.next_in = (voidpf)0;
-      pfile_in_zip_read_info->stream.avail_in = 0;
-
-      err=inflateInit2(&pfile_in_zip_read_info->stream, -MAX_WBITS);
-      if (err == Z_OK)
-        pfile_in_zip_read_info->stream_initialised=1;
-      else
-      {
-        TRYFREE(pfile_in_zip_read_info);
-        return err;
-      }
-        /* windowBits is passed < 0 to tell that there is no zlib header.
-         * Note that in this case inflate *requires* an extra "dummy" byte
-         * after the compressed stream in order to complete decompression and
-         * return Z_STREAM_END.
-         * In unzip, i don't wait absolutely Z_STREAM_END because I known the
-         * size of both compressed and uncompressed data
-         */
-    }
-    pfile_in_zip_read_info->rest_read_compressed =
-            s->cur_file_info.compressed_size ;
-    pfile_in_zip_read_info->rest_read_uncompressed =
-            s->cur_file_info.uncompressed_size ;
-
-
-    pfile_in_zip_read_info->pos_in_zipfile =
-            s->cur_file_info_internal.offset_curfile + SIZEZIPLOCALHEADER +
-              iSizeVar;
-
-    pfile_in_zip_read_info->stream.avail_in = (uInt)0;
-
-    s->pfile_in_zip_read = pfile_in_zip_read_info;
-
-#    ifndef NOUNCRYPT
-    if (password != NULL)
-    {
-        int i;
-        s->pcrc_32_tab = get_crc_table();
-        init_keys(password,s->keys,s->pcrc_32_tab);
-        if (ZSEEK(s->z_filefunc, s->filestream,
-                  s->pfile_in_zip_read->pos_in_zipfile +
-                     s->pfile_in_zip_read->byte_before_the_zipfile,
-                  SEEK_SET)!=0)
-            return UNZ_INTERNALERROR;
-        if(ZREAD(s->z_filefunc, s->filestream,source, 12)<12)
-            return UNZ_INTERNALERROR;
-
-        for (i = 0; i<12; i++)
-            zdecode(s->keys,s->pcrc_32_tab,source[i]);
-
-        s->pfile_in_zip_read->pos_in_zipfile+=12;
-        s->encrypted=1;
-    }
-#    endif
-
-
-    return UNZ_OK;
-}
-
-extern int ZEXPORT unzOpenCurrentFile (file)
-    unzFile file;
-{
-    return unzOpenCurrentFile3(file, NULL, NULL, 0, NULL);
-}
-
-extern int ZEXPORT unzOpenCurrentFilePassword (file, password)
-    unzFile file;
-    const char* password;
-{
-    return unzOpenCurrentFile3(file, NULL, NULL, 0, password);
-}
-
-extern int ZEXPORT unzOpenCurrentFile2 (file,method,level,raw)
-    unzFile file;
-    int* method;
-    int* level;
-    int raw;
-{
-    return unzOpenCurrentFile3(file, method, level, raw, NULL);
-}
-
-/*
-  Read bytes from the current file.
-  buf contain buffer where data must be copied
-  len the size of buf.
-
-  return the number of byte copied if somes bytes are copied
-  return 0 if the end of file was reached
-  return <0 with error code if there is an error
-    (UNZ_ERRNO for IO error, or zLib error for uncompress error)
-*/
-extern int ZEXPORT unzReadCurrentFile  (file, buf, len)
-    unzFile file;
-    voidp buf;
-    unsigned len;
-{
-    int err=UNZ_OK;
-    uInt iRead = 0;
-    unz_s* s;
-    file_in_zip_read_info_s* pfile_in_zip_read_info;
-    if (file==NULL)
-        return UNZ_PARAMERROR;
-    s=(unz_s*)file;
-    pfile_in_zip_read_info=s->pfile_in_zip_read;
-
-    if (pfile_in_zip_read_info==NULL)
-        return UNZ_PARAMERROR;
-
-
-    if (pfile_in_zip_read_info->read_buffer == NULL)
-        return UNZ_END_OF_LIST_OF_FILE;
-    if (len==0)
-        return 0;
-
-    pfile_in_zip_read_info->stream.next_out = (Bytef*)buf;
-
-    pfile_in_zip_read_info->stream.avail_out = (uInt)len;
-
-    if ((len>pfile_in_zip_read_info->rest_read_uncompressed) &&
-        (!(pfile_in_zip_read_info->raw)))
-        pfile_in_zip_read_info->stream.avail_out =
-            (uInt)pfile_in_zip_read_info->rest_read_uncompressed;
-
-    if ((len>pfile_in_zip_read_info->rest_read_compressed+
-           pfile_in_zip_read_info->stream.avail_in) &&
-         (pfile_in_zip_read_info->raw))
-        pfile_in_zip_read_info->stream.avail_out =
-            (uInt)pfile_in_zip_read_info->rest_read_compressed+
-            pfile_in_zip_read_info->stream.avail_in;
-
-    while (pfile_in_zip_read_info->stream.avail_out>0)
-    {
-        if ((pfile_in_zip_read_info->stream.avail_in==0) &&
-            (pfile_in_zip_read_info->rest_read_compressed>0))
-        {
-            uInt uReadThis = UNZ_BUFSIZE;
-            if (pfile_in_zip_read_info->rest_read_compressed<uReadThis)
-                uReadThis = (uInt)pfile_in_zip_read_info->rest_read_compressed;
-            if (uReadThis == 0)
-                return UNZ_EOF;
-            if (ZSEEK(pfile_in_zip_read_info->z_filefunc,
-                      pfile_in_zip_read_info->filestream,
-                      pfile_in_zip_read_info->pos_in_zipfile +
-                         pfile_in_zip_read_info->byte_before_the_zipfile,
-                         ZLIB_FILEFUNC_SEEK_SET)!=0)
-                return UNZ_ERRNO;
-            if (ZREAD(pfile_in_zip_read_info->z_filefunc,
-                      pfile_in_zip_read_info->filestream,
-                      pfile_in_zip_read_info->read_buffer,
-                      uReadThis)!=uReadThis)
-                return UNZ_ERRNO;
-
-
-#            ifndef NOUNCRYPT
-            if(s->encrypted)
-            {
-                uInt i;
-                for(i=0;i<uReadThis;i++)
-                  pfile_in_zip_read_info->read_buffer[i] =
-                      zdecode(s->keys,s->pcrc_32_tab,
-                              pfile_in_zip_read_info->read_buffer[i]);
-            }
-#            endif
-
-
-            pfile_in_zip_read_info->pos_in_zipfile += uReadThis;
-
-            pfile_in_zip_read_info->rest_read_compressed-=uReadThis;
-
-            pfile_in_zip_read_info->stream.next_in =
-                (Bytef*)pfile_in_zip_read_info->read_buffer;
-            pfile_in_zip_read_info->stream.avail_in = (uInt)uReadThis;
-        }
-
-        if ((pfile_in_zip_read_info->compression_method==0) || (pfile_in_zip_read_info->raw))
-        {
-            uInt uDoCopy,i ;
-
-            if ((pfile_in_zip_read_info->stream.avail_in == 0) &&
-                (pfile_in_zip_read_info->rest_read_compressed == 0))
-                return (iRead==0) ? UNZ_EOF : iRead;
-
-            if (pfile_in_zip_read_info->stream.avail_out <
-                            pfile_in_zip_read_info->stream.avail_in)
-                uDoCopy = pfile_in_zip_read_info->stream.avail_out ;
-            else
-                uDoCopy = pfile_in_zip_read_info->stream.avail_in ;
-
-            for (i=0;i<uDoCopy;i++)
-                *(pfile_in_zip_read_info->stream.next_out+i) =
-                        *(pfile_in_zip_read_info->stream.next_in+i);
-
-            pfile_in_zip_read_info->crc32 = crc32(pfile_in_zip_read_info->crc32,
-                                pfile_in_zip_read_info->stream.next_out,
-                                uDoCopy);
-            pfile_in_zip_read_info->rest_read_uncompressed-=uDoCopy;
-            pfile_in_zip_read_info->stream.avail_in -= uDoCopy;
-            pfile_in_zip_read_info->stream.avail_out -= uDoCopy;
-            pfile_in_zip_read_info->stream.next_out += uDoCopy;
-            pfile_in_zip_read_info->stream.next_in += uDoCopy;
-            pfile_in_zip_read_info->stream.total_out += uDoCopy;
-            iRead += uDoCopy;
-        }
-        else
-        {
-            uLong uTotalOutBefore,uTotalOutAfter;
-            const Bytef *bufBefore;
-            uLong uOutThis;
-            int flush=Z_SYNC_FLUSH;
-
-            uTotalOutBefore = pfile_in_zip_read_info->stream.total_out;
-            bufBefore = pfile_in_zip_read_info->stream.next_out;
-
-            /*
-            if ((pfile_in_zip_read_info->rest_read_uncompressed ==
-                     pfile_in_zip_read_info->stream.avail_out) &&
-                (pfile_in_zip_read_info->rest_read_compressed == 0))
-                flush = Z_FINISH;
-            */
-            err=inflate(&pfile_in_zip_read_info->stream,flush);
-
-            if ((err>=0) && (pfile_in_zip_read_info->stream.msg!=NULL))
-              err = Z_DATA_ERROR;
-
-            uTotalOutAfter = pfile_in_zip_read_info->stream.total_out;
-            uOutThis = uTotalOutAfter-uTotalOutBefore;
-
-            pfile_in_zip_read_info->crc32 =
-                crc32(pfile_in_zip_read_info->crc32,bufBefore,
-                        (uInt)(uOutThis));
-
-            pfile_in_zip_read_info->rest_read_uncompressed -=
-                uOutThis;
-
-            iRead += (uInt)(uTotalOutAfter - uTotalOutBefore);
-
-            if (err==Z_STREAM_END)
-                return (iRead==0) ? UNZ_EOF : iRead;
-            if (err!=Z_OK)
-                break;
-        }
-    }
-
-    if (err==Z_OK)
-        return iRead;
-    return err;
-}
-
-
-/*
-  Give the current position in uncompressed data
-*/
-extern z_off_t ZEXPORT unztell (file)
-    unzFile file;
-{
-    unz_s* s;
-    file_in_zip_read_info_s* pfile_in_zip_read_info;
-    if (file==NULL)
-        return UNZ_PARAMERROR;
-    s=(unz_s*)file;
-    pfile_in_zip_read_info=s->pfile_in_zip_read;
-
-    if (pfile_in_zip_read_info==NULL)
-        return UNZ_PARAMERROR;
-
-    return (z_off_t)pfile_in_zip_read_info->stream.total_out;
-}
-
-
-/*
-  return 1 if the end of file was reached, 0 elsewhere
-*/
-extern int ZEXPORT unzeof (file)
-    unzFile file;
-{
-    unz_s* s;
-    file_in_zip_read_info_s* pfile_in_zip_read_info;
-    if (file==NULL)
-        return UNZ_PARAMERROR;
-    s=(unz_s*)file;
-    pfile_in_zip_read_info=s->pfile_in_zip_read;
-
-    if (pfile_in_zip_read_info==NULL)
-        return UNZ_PARAMERROR;
-
-    if (pfile_in_zip_read_info->rest_read_uncompressed == 0)
-        return 1;
-    else
-        return 0;
-}
-
-
-
-/*
-  Read extra field from the current file (opened by unzOpenCurrentFile)
-  This is the local-header version of the extra field (sometimes, there is
-    more info in the local-header version than in the central-header)
-
-  if buf==NULL, it return the size of the local extra field that can be read
-
-  if buf!=NULL, len is the size of the buffer, the extra header is copied in
-    buf.
-  the return value is the number of bytes copied in buf, or (if <0)
-    the error code
-*/
-extern int ZEXPORT unzGetLocalExtrafield (file,buf,len)
-    unzFile file;
-    voidp buf;
-    unsigned len;
-{
-    unz_s* s;
-    file_in_zip_read_info_s* pfile_in_zip_read_info;
-    uInt read_now;
-    uLong size_to_read;
-
-    if (file==NULL)
-        return UNZ_PARAMERROR;
-    s=(unz_s*)file;
-    pfile_in_zip_read_info=s->pfile_in_zip_read;
-
-    if (pfile_in_zip_read_info==NULL)
-        return UNZ_PARAMERROR;
-
-    size_to_read = (pfile_in_zip_read_info->size_local_extrafield -
-                pfile_in_zip_read_info->pos_local_extrafield);
-
-    if (buf==NULL)
-        return (int)size_to_read;
-
-    if (len>size_to_read)
-        read_now = (uInt)size_to_read;
-    else
-        read_now = (uInt)len ;
-
-    if (read_now==0)
-        return 0;
-
-    if (ZSEEK(pfile_in_zip_read_info->z_filefunc,
-              pfile_in_zip_read_info->filestream,
-              pfile_in_zip_read_info->offset_local_extrafield +
-              pfile_in_zip_read_info->pos_local_extrafield,
-              ZLIB_FILEFUNC_SEEK_SET)!=0)
-        return UNZ_ERRNO;
-
-    if (ZREAD(pfile_in_zip_read_info->z_filefunc,
-              pfile_in_zip_read_info->filestream,
-              buf,read_now)!=read_now)
-        return UNZ_ERRNO;
-
-    return (int)read_now;
-}
-
-/*
-  Close the file in zip opened with unzipOpenCurrentFile
-  Return UNZ_CRCERROR if all the file was read but the CRC is not good
-*/
-extern int ZEXPORT unzCloseCurrentFile (file)
-    unzFile file;
-{
-    int err=UNZ_OK;
-
-    unz_s* s;
-    file_in_zip_read_info_s* pfile_in_zip_read_info;
-    if (file==NULL)
-        return UNZ_PARAMERROR;
-    s=(unz_s*)file;
-    pfile_in_zip_read_info=s->pfile_in_zip_read;
-
-    if (pfile_in_zip_read_info==NULL)
-        return UNZ_PARAMERROR;
-
-
-    if ((pfile_in_zip_read_info->rest_read_uncompressed == 0) &&
-        (!pfile_in_zip_read_info->raw))
-    {
-        if (pfile_in_zip_read_info->crc32 != pfile_in_zip_read_info->crc32_wait)
-            err=UNZ_CRCERROR;
-    }
-
-
-    TRYFREE(pfile_in_zip_read_info->read_buffer);
-    pfile_in_zip_read_info->read_buffer = NULL;
-    if (pfile_in_zip_read_info->stream_initialised)
-        inflateEnd(&pfile_in_zip_read_info->stream);
-
-    pfile_in_zip_read_info->stream_initialised = 0;
-    TRYFREE(pfile_in_zip_read_info);
-
-    s->pfile_in_zip_read=NULL;
-
-    return err;
-}
-
-
-/*
-  Get the global comment string of the ZipFile, in the szComment buffer.
-  uSizeBuf is the size of the szComment buffer.
-  return the number of byte copied or an error code <0
-*/
-extern int ZEXPORT unzGetGlobalComment (file, szComment, uSizeBuf)
-    unzFile file;
-    char *szComment;
-    uLong uSizeBuf;
-{
-    unz_s* s;
-    uLong uReadThis ;
-    if (file==NULL)
-        return UNZ_PARAMERROR;
-    s=(unz_s*)file;
-
-    uReadThis = uSizeBuf;
-    if (uReadThis>s->gi.size_comment)
-        uReadThis = s->gi.size_comment;
-
-    if (ZSEEK(s->z_filefunc,s->filestream,s->central_pos+22,ZLIB_FILEFUNC_SEEK_SET)!=0)
-        return UNZ_ERRNO;
-
-    if (uReadThis>0)
-    {
-      *szComment='\0';
-      if (ZREAD(s->z_filefunc,s->filestream,szComment,uReadThis)!=uReadThis)
-        return UNZ_ERRNO;
-    }
-
-    if ((szComment != NULL) && (uSizeBuf > s->gi.size_comment))
-        *(szComment+s->gi.size_comment)='\0';
-    return (int)uReadThis;
-}
-
-/* Additions by RX '2004 */
-extern uLong ZEXPORT unzGetOffset (file)
-    unzFile file;
-{
-    unz_s* s;
-
-    if (file==NULL)
-          return UNZ_PARAMERROR;
-    s=(unz_s*)file;
-    if (!s->current_file_ok)
-      return 0;
-    if (s->gi.number_entry != 0 && s->gi.number_entry != 0xffff)
-      if (s->num_file==s->gi.number_entry)
-         return 0;
-    return s->pos_in_central_dir;
-}
-
-extern int ZEXPORT unzSetOffset (file, pos)
-        unzFile file;
-        uLong pos;
-{
-    unz_s* s;
-    int err;
-
-    if (file==NULL)
-        return UNZ_PARAMERROR;
-    s=(unz_s*)file;
-
-    s->pos_in_central_dir = pos;
-    s->num_file = s->gi.number_entry;      /* hack */
-    err = unzlocal_GetCurrentFileInfoInternal(file,&s->cur_file_info,
-                                              &s->cur_file_info_internal,
-                                              NULL,0,NULL,0,NULL,0);
-    s->current_file_ok = (err == UNZ_OK);
-    return err;
-}
diff --git a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/minizip/unzip.h b/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/minizip/unzip.h
deleted file mode 100644
index c3206a0589..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/minizip/unzip.h
+++ /dev/null
@@ -1,354 +0,0 @@
-/* unzip.h -- IO for uncompress .zip files using zlib
-   Version 1.01e, February 12th, 2005
-
-   Copyright (C) 1998-2005 Gilles Vollant
-
-   This unzip package allow extract file from .ZIP file, compatible with PKZip 2.04g
-     WinZip, InfoZip tools and compatible.
-
-   Multi volume ZipFile (span) are not supported.
-   Encryption compatible with pkzip 2.04g only supported
-   Old compressions used by old PKZip 1.x are not supported
-
-
-   I WAIT FEEDBACK at mail info@winimage.com
-   Visit also http://www.winimage.com/zLibDll/unzip.htm for evolution
-
-   Condition of use and distribution are the same than zlib :
-
-  This software is provided 'as-is', without any express or implied
-  warranty.  In no event will the authors be held liable for any damages
-  arising from the use of this software.
-
-  Permission is granted to anyone to use this software for any purpose,
-  including commercial applications, and to alter it and redistribute it
-  freely, subject to the following restrictions:
-
-  1. The origin of this software must not be misrepresented; you must not
-     claim that you wrote the original software. If you use this software
-     in a product, an acknowledgment in the product documentation would be
-     appreciated but is not required.
-  2. Altered source versions must be plainly marked as such, and must not be
-     misrepresented as being the original software.
-  3. This notice may not be removed or altered from any source distribution.
-
-
-*/
-
-/* for more info about .ZIP format, see
-      http://www.info-zip.org/pub/infozip/doc/appnote-981119-iz.zip
-      http://www.info-zip.org/pub/infozip/doc/
-   PkWare has also a specification at :
-      ftp://ftp.pkware.com/probdesc.zip
-*/
-
-#ifndef _unz_H
-#define _unz_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#ifndef _ZLIB_H
-#include "zlib.h"
-#endif
-
-#ifndef _ZLIBIOAPI_H
-#include "ioapi.h"
-#endif
-
-#if defined(STRICTUNZIP) || defined(STRICTZIPUNZIP)
-/* like the STRICT of WIN32, we define a pointer that cannot be converted
-    from (void*) without cast */
-typedef struct TagunzFile__ { int unused; } unzFile__;
-typedef unzFile__ *unzFile;
-#else
-typedef voidp unzFile;
-#endif
-
-
-#define UNZ_OK                          (0)
-#define UNZ_END_OF_LIST_OF_FILE         (-100)
-#define UNZ_ERRNO                       (Z_ERRNO)
-#define UNZ_EOF                         (0)
-#define UNZ_PARAMERROR                  (-102)
-#define UNZ_BADZIPFILE                  (-103)
-#define UNZ_INTERNALERROR               (-104)
-#define UNZ_CRCERROR                    (-105)
-
-/* tm_unz contain date/time info */
-typedef struct tm_unz_s
-{
-    uInt tm_sec;            /* seconds after the minute - [0,59] */
-    uInt tm_min;            /* minutes after the hour - [0,59] */
-    uInt tm_hour;           /* hours since midnight - [0,23] */
-    uInt tm_mday;           /* day of the month - [1,31] */
-    uInt tm_mon;            /* months since January - [0,11] */
-    uInt tm_year;           /* years - [1980..2044] */
-} tm_unz;
-
-/* unz_global_info structure contain global data about the ZIPfile
-   These data comes from the end of central dir */
-typedef struct unz_global_info_s
-{
-    uLong number_entry;         /* total number of entries in
-                       the central dir on this disk */
-    uLong size_comment;         /* size of the global comment of the zipfile */
-} unz_global_info;
-
-
-/* unz_file_info contain information about a file in the zipfile */
-typedef struct unz_file_info_s
-{
-    uLong version;              /* version made by                 2 bytes */
-    uLong version_needed;       /* version needed to extract       2 bytes */
-    uLong flag;                 /* general purpose bit flag        2 bytes */
-    uLong compression_method;   /* compression method              2 bytes */
-    uLong dosDate;              /* last mod file date in Dos fmt   4 bytes */
-    uLong crc;                  /* crc-32                          4 bytes */
-    uLong compressed_size;      /* compressed size                 4 bytes */
-    uLong uncompressed_size;    /* uncompressed size               4 bytes */
-    uLong size_filename;        /* filename length                 2 bytes */
-    uLong size_file_extra;      /* extra field length              2 bytes */
-    uLong size_file_comment;    /* file comment length             2 bytes */
-
-    uLong disk_num_start;       /* disk number start               2 bytes */
-    uLong internal_fa;          /* internal file attributes        2 bytes */
-    uLong external_fa;          /* external file attributes        4 bytes */
-
-    tm_unz tmu_date;
-} unz_file_info;
-
-extern int ZEXPORT unzStringFileNameCompare OF ((const char* fileName1,
-                                                 const char* fileName2,
-                                                 int iCaseSensitivity));
-/*
-   Compare two filename (fileName1,fileName2).
-   If iCaseSenisivity = 1, comparision is case sensitivity (like strcmp)
-   If iCaseSenisivity = 2, comparision is not case sensitivity (like strcmpi
-                                or strcasecmp)
-   If iCaseSenisivity = 0, case sensitivity is defaut of your operating system
-    (like 1 on Unix, 2 on Windows)
-*/
-
-
-extern unzFile ZEXPORT unzOpen OF((const char *path));
-/*
-  Open a Zip file. path contain the full pathname (by example,
-     on a Windows XP computer "c:\\zlib\\zlib113.zip" or on an Unix computer
-     "zlib/zlib113.zip".
-     If the zipfile cannot be opened (file don't exist or in not valid), the
-       return value is NULL.
-     Else, the return value is a unzFile Handle, usable with other function
-       of this unzip package.
-*/
-
-extern unzFile ZEXPORT unzOpen2 OF((const char *path,
-                                    zlib_filefunc_def* pzlib_filefunc_def));
-/*
-   Open a Zip file, like unzOpen, but provide a set of file low level API
-      for read/write the zip file (see ioapi.h)
-*/
-
-extern int ZEXPORT unzClose OF((unzFile file));
-/*
-  Close a ZipFile opened with unzipOpen.
-  If there is files inside the .Zip opened with unzOpenCurrentFile (see later),
-    these files MUST be closed with unzipCloseCurrentFile before call unzipClose.
-  return UNZ_OK if there is no problem. */
-
-extern int ZEXPORT unzGetGlobalInfo OF((unzFile file,
-                                        unz_global_info *pglobal_info));
-/*
-  Write info about the ZipFile in the *pglobal_info structure.
-  No preparation of the structure is needed
-  return UNZ_OK if there is no problem. */
-
-
-extern int ZEXPORT unzGetGlobalComment OF((unzFile file,
-                                           char *szComment,
-                                           uLong uSizeBuf));
-/*
-  Get the global comment string of the ZipFile, in the szComment buffer.
-  uSizeBuf is the size of the szComment buffer.
-  return the number of byte copied or an error code <0
-*/
-
-
-/***************************************************************************/
-/* Unzip package allow you browse the directory of the zipfile */
-
-extern int ZEXPORT unzGoToFirstFile OF((unzFile file));
-/*
-  Set the current file of the zipfile to the first file.
-  return UNZ_OK if there is no problem
-*/
-
-extern int ZEXPORT unzGoToNextFile OF((unzFile file));
-/*
-  Set the current file of the zipfile to the next file.
-  return UNZ_OK if there is no problem
-  return UNZ_END_OF_LIST_OF_FILE if the actual file was the latest.
-*/
-
-extern int ZEXPORT unzLocateFile OF((unzFile file,
-                     const char *szFileName,
-                     int iCaseSensitivity));
-/*
-  Try locate the file szFileName in the zipfile.
-  For the iCaseSensitivity signification, see unzStringFileNameCompare
-
-  return value :
-  UNZ_OK if the file is found. It becomes the current file.
-  UNZ_END_OF_LIST_OF_FILE if the file is not found
-*/
-
-
-/* ****************************************** */
-/* Ryan supplied functions */
-/* unz_file_info contain information about a file in the zipfile */
-typedef struct unz_file_pos_s
-{
-    uLong pos_in_zip_directory;   /* offset in zip file directory */
-    uLong num_of_file;            /* # of file */
-} unz_file_pos;
-
-extern int ZEXPORT unzGetFilePos(
-    unzFile file,
-    unz_file_pos* file_pos);
-
-extern int ZEXPORT unzGoToFilePos(
-    unzFile file,
-    unz_file_pos* file_pos);
-
-/* ****************************************** */
-
-extern int ZEXPORT unzGetCurrentFileInfo OF((unzFile file,
-                         unz_file_info *pfile_info,
-                         char *szFileName,
-                         uLong fileNameBufferSize,
-                         void *extraField,
-                         uLong extraFieldBufferSize,
-                         char *szComment,
-                         uLong commentBufferSize));
-/*
-  Get Info about the current file
-  if pfile_info!=NULL, the *pfile_info structure will contain somes info about
-        the current file
-  if szFileName!=NULL, the filemane string will be copied in szFileName
-            (fileNameBufferSize is the size of the buffer)
-  if extraField!=NULL, the extra field information will be copied in extraField
-            (extraFieldBufferSize is the size of the buffer).
-            This is the Central-header version of the extra field
-  if szComment!=NULL, the comment string of the file will be copied in szComment
-            (commentBufferSize is the size of the buffer)
-*/
-
-/***************************************************************************/
-/* for reading the content of the current zipfile, you can open it, read data
-   from it, and close it (you can close it before reading all the file)
-   */
-
-extern int ZEXPORT unzOpenCurrentFile OF((unzFile file));
-/*
-  Open for reading data the current file in the zipfile.
-  If there is no error, the return value is UNZ_OK.
-*/
-
-extern int ZEXPORT unzOpenCurrentFilePassword OF((unzFile file,
-                                                  const char* password));
-/*
-  Open for reading data the current file in the zipfile.
-  password is a crypting password
-  If there is no error, the return value is UNZ_OK.
-*/
-
-extern int ZEXPORT unzOpenCurrentFile2 OF((unzFile file,
-                                           int* method,
-                                           int* level,
-                                           int raw));
-/*
-  Same than unzOpenCurrentFile, but open for read raw the file (not uncompress)
-    if raw==1
-  *method will receive method of compression, *level will receive level of
-     compression
-  note : you can set level parameter as NULL (if you did not want known level,
-         but you CANNOT set method parameter as NULL
-*/
-
-extern int ZEXPORT unzOpenCurrentFile3 OF((unzFile file,
-                                           int* method,
-                                           int* level,
-                                           int raw,
-                                           const char* password));
-/*
-  Same than unzOpenCurrentFile, but open for read raw the file (not uncompress)
-    if raw==1
-  *method will receive method of compression, *level will receive level of
-     compression
-  note : you can set level parameter as NULL (if you did not want known level,
-         but you CANNOT set method parameter as NULL
-*/
-
-
-extern int ZEXPORT unzCloseCurrentFile OF((unzFile file));
-/*
-  Close the file in zip opened with unzOpenCurrentFile
-  Return UNZ_CRCERROR if all the file was read but the CRC is not good
-*/
-
-extern int ZEXPORT unzReadCurrentFile OF((unzFile file,
-                      voidp buf,
-                      unsigned len));
-/*
-  Read bytes from the current file (opened by unzOpenCurrentFile)
-  buf contain buffer where data must be copied
-  len the size of buf.
-
-  return the number of byte copied if somes bytes are copied
-  return 0 if the end of file was reached
-  return <0 with error code if there is an error
-    (UNZ_ERRNO for IO error, or zLib error for uncompress error)
-*/
-
-extern z_off_t ZEXPORT unztell OF((unzFile file));
-/*
-  Give the current position in uncompressed data
-*/
-
-extern int ZEXPORT unzeof OF((unzFile file));
-/*
-  return 1 if the end of file was reached, 0 elsewhere
-*/
-
-extern int ZEXPORT unzGetLocalExtrafield OF((unzFile file,
-                                             voidp buf,
-                                             unsigned len));
-/*
-  Read extra field from the current file (opened by unzOpenCurrentFile)
-  This is the local-header version of the extra field (sometimes, there is
-    more info in the local-header version than in the central-header)
-
-  if buf==NULL, it return the size of the local extra field
-
-  if buf!=NULL, len is the size of the buffer, the extra header is copied in
-    buf.
-  the return value is the number of bytes copied in buf, or (if <0)
-    the error code
-*/
-
-/***************************************************************************/
-
-/* Get the current file offset */
-extern uLong ZEXPORT unzGetOffset (unzFile file);
-
-/* Set the current file offset */
-extern int ZEXPORT unzSetOffset (unzFile file, uLong pos);
-
-
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif /* _unz_H */
diff --git a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/zip.h b/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/zip.h
deleted file mode 100644
index a4f0716054..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Classes/zip.h
+++ /dev/null
@@ -1,15 +0,0 @@
-//
-//  Header.h
-//  WebODF
-//
-//  Created by KO GmbH on 3/1/12.
-//  Copyright (c) 2012 __MyCompanyName__. All rights reserved.
-//
-
-#ifndef WebODF_Header_h
-#define WebODF_Header_h
-
-void readZipEntry(const char* zippath, const char* entrypath) {}
-
-
-#endif
diff --git a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/PhoneGap.plist b/apps/files_odfviewer/src/webodf/programs/ios/WebODF/PhoneGap.plist
deleted file mode 100644
index 29011e6d11..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/PhoneGap.plist
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>TopActivityIndicator</key>
-	<string>gray</string>
-	<key>EnableLocation</key>
-	<false/>
-	<key>EnableViewportScale</key>
-	<false/>
-	<key>AutoHideSplashScreen</key>
-	<true/>
-	<key>ShowSplashScreenSpinner</key>
-	<true/>
-	<key>MediaPlaybackRequiresUserAction</key>
-	<false/>
-	<key>AllowInlineMediaPlayback</key>
-	<false/>
-	<key>OpenAllWhitelistURLsInWebView</key>
-	<false/>
-	<key>ExternalHosts</key>
-	<array>
-		<string>zipserver</string>
-	</array>
-	<key>Plugins</key>
-	<dict>
-		<key>ZipClass</key>
-		<string>NativeZip</string>
-		<key>com.phonegap.accelerometer</key>
-		<string>PGAccelerometer</string>
-		<key>com.phonegap.camera</key>
-		<string>PGCamera</string>
-		<key>com.phonegap.connection</key>
-		<string>PGConnection</string>
-		<key>com.phonegap.contacts</key>
-		<string>PGContacts</string>
-		<key>com.phonegap.debugconsole</key>
-		<string>PGDebugConsole</string>
-		<key>com.phonegap.file</key>
-		<string>PGFile</string>
-		<key>com.phonegap.filetransfer</key>
-		<string>PGFileTransfer</string>
-		<key>com.phonegap.geolocation</key>
-		<string>PGLocation</string>
-		<key>com.phonegap.notification</key>
-		<string>PGNotification</string>
-		<key>com.phonegap.media</key>
-		<string>PGSound</string>
-		<key>com.phonegap.mediacapture</key>
-		<string>PGCapture</string>
-		<key>com.phonegap.splashscreen</key>
-		<string>PGSplashScreen</string>
-		<key>com.phonegap.battery</key>
-		<string>PGBattery</string>
-	</dict>
-</dict>
-</plist>
diff --git a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Resources/en.lproj/Localizable.strings b/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Resources/en.lproj/Localizable.strings
deleted file mode 100644
index 8972684435..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Resources/en.lproj/Localizable.strings
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you 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.
- */
-
-// accessibility label for recording button
-"toggle audio recording" = "toggle audio recording";
-// notification spoken by VoiceOver when timed recording finishes
-"timed recording complete" = "timed recording complete";
-// accessibility hint for display of recorded elapsed time
-"recorded time in minutes and seconds" = "recorded time in minutes and seconds";
\ No newline at end of file
diff --git a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Resources/icons/icon-72.png b/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Resources/icons/icon-72.png
deleted file mode 100644
index 1aebf5d34b638026e1c7caa63e5821e372a00c45..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 8844
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
O0000<MNUMnLSTZW7-w7n

diff --git a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Resources/icons/icon.png b/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Resources/icons/icon.png
deleted file mode 100644
index 9e654236c0be58c0080b2ca786d4f5274a8fb669..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 6106
zcmV<07bWP4P)<h;3K|Lk000e1NJLTq0021v0021%1^@s6j2MH300001b5ch_0Itp)
z=>Py1lu1NERA}DqdTXd{X?E2Z^ZV9X`+45yzHe3Cs<OJ%W%`k%V;<1mX@!Jtf^C9g
zjEVt~Zb(273;`kdOGW%6g8D-cQSpx;M9>g}8WlqnAJLdpr(acd>(+gp=RW(j);H(y
z$J*!I>aMO%#TfD@i^JIu)@yuo&N0TEYZL#E+ucunfp7l1zpHQj{-y8x%=qx7?>{iJ
z-SOV7gZb?E?x@<j7Z|;`yqH~oa<n|ix!DV)(bi;;4-O`Iw3FK9e0g?jXK?->|I>pn
zt{11Tne@xcv)BK}+yCqDzXbpv_{7ifwO{&cUw6IdKKyyU@vDFD>bvQUKll6}`Jq=2
zUjJHq{r~*W-`x3*KXkhm1H|ued*#!A`sKanU;R+7nh)N-dHn-V&dcqbt6P$;4Tj@u
zgVgZ;TNgT?wejjJ*Y#_^@dN}yA$SO*Ch^YgEvxEev$K|UPI&E$k3lbhcMnTh{`^;d
z`R9HH>wo+9H@|~s>-mrU<)4%W-xr~8n~dz>xjXyQv$IvZe`DO)z`EZS$WQ(8&tH4<
zL^nDPKVo_CvC(+%qqlDFOqHq$El>7$x0<#9%T8>nis;0zeD%yiObXck?%1Z|nqT_r
zkyR<dNO~7k2u5(ZF1UGZg1y}le*M=U(m)G$9PBlS_0ymDm4ERU|KTTo{Ga7t`X_&~
z0BAn(qkreGzyA9A&*z*cia>a*N>^G&S-<%5o~Lmt-MTC3{Q`XM6F>3M>E89fV#D3f
zl{Ef%J)GVysOn)e$fN1d966f0j=`YDauqflRCfGyo#yLEDJP>PTdX?U-y5-XvbGIN
zMgk;_6v3R0=jSWdb>jZ+7^`)sd-o0^!tCUve6E`OfuH}iU-(OJeD7y|_B%iRgP;F5
zyVq}ib}$^o<A<}g89M?_V-ybzs)WI$fqUqEgRJj<*AHL2e*Gh|s;o*%IoDOL>Sn%X
zy)zlrqw%0FU_Bf(xeMlirSYIjN2i_Tlnj7HfbOyzhf^M%E|_y7K!W|ht_$Rx00A%F
zJK%I{fG>UN3C~XELCcn_!7lUGm%92x|8;9?`=A=7_13iE*479oM;B<@f+`szf;;;o
z4JMV`1MeH;&If<sM-TV54+~PY_B60u)t0IT$Q3NryE}tw-XiZ!hq-lS(NbB<&Ssr4
z(Tt=e<9y!naDPkzTr4{(fDi})w{C9Z`r!msmGG6X9bqu2xL$YcI)@nv+Tn2Pg)gM4
zsh&K(=-36VHtgRR^ZDoZ*sVIvW-Ca*{G!FpTT`{&`vkfB!B6fD4qo`9hx^;xj$AKG
zYEo4<OjVt7u2+TCpsuUYsL6Fx<>E*ICKcG(th1DiR~yKqlLhYG-Q{9gIGql7>-t2u
zZftROvF4*EGael;Sc-EtTjRxh`#L>cGF)MnCS=NxoJKC@9kPU{4=*$tSGfD~A*Ry`
z!zSbC=>pSfEmrpa()I8oKlF+<(;qzC-)ag{y(}E$RMnPpP0LlvxjvhDYI2pv!zS(S
z4AR*}F$V4EbZth`UGxxlwg$X;ZOX&_2@m#$>N>~cr*pn>|BUN(Aq1vmG&8yfmdg%z
z?(FjTctHRn6e1`WUjD!VZojyPH@|$0qsJH6-XFr6ib&9OSc!y?`2Hd}{lKTbSJmi~
zhr3%?yEU^l8d<7Csdl9*z$~V8HurpT)~4qVwo+A_l@2D5*Y_uU?$$PM-`FBa9-S`v
z_M@35ql&M6`G_83l??#3p?d<58M$1xsOzMiogq(8m#}1j`Wiks7-1RW{@xHzA6;NF
zu8`}b!Kg-Aby_c5)#FO}{eb-7ot+oDY8!{U!@TV|?`&JD>n2rIoh)Sovyqknvk)kf
zr3C}V!@Utt&enMI(TrW|AP9rhb<WwM!|hvJeDH7vBSey-dY}X(pl&L>{qP(wy?B7#
z{V`9DE|851iH{y$;NHu7Qk}4~JHl7Le1aEW*yi@(2($B+Z{MHsqc^8~KOn6h=9e5f
zETslWX}wZv*PdeC85jn0Ba#v1stcR1Wy3o2H(ozQlMRVrT_-d-(IXTt=45z$wBRfE
z_Vo7S3rHX!fP}P(r2&XwU1z*;|3vqm+sFK3&C(VmGdw+BVsQVQH}7s~)pj^JUGn&}
z(fQeu=NBD6`klAASatX<LB9OyADf=G_Odhl=)%*YQ+hP>RAnWajEn?^0ZxDxLFQaA
z8dS`w=bC^R4pLH&gRn$;30=%vK7VUl_aB}i=Y(F=1$i)B5=js!t>e+-bKbeTi?4j?
z3Cy5oP~p+zxmJsgXXh=(lUffR%&2fg=g8GQnhe@+sgJ|)y_B25c$m|8P$$bN<(w_$
zY$+$Rl$cYpl#MARR@r#5EX>I;8Po(xz#srFAOduOod;aNgU1&dj~kGtfCLbhs8l7@
zO=eYR<!or0%-O|St5w1E8(Zi~5D+XGPR>`TssxEh$pDeJ?rd?{6%2;WdxQMgpZaM7
zfZ^Wtk1!<#El<Xk31*-fNF&W?Mi@z$kp#`SY@I0^>n1^)`s&4_cQ-}~q*5Z6>w?9q
z!|u)yT@gwMr3hVdbS2;(0LYXKgQmjC$z0nzBTlylo16xcS^vH-Y@}>BK3?h3n`e0Q
zi;wZ1Ae-?H0U%Y)huEJaRoN^hGZ#%gP=YjU6cD6|KuU(T3siLidqR1}ndBvK0zgw|
zzV&Fv8;27LA~qg~n}a04Lufak+Y)^E_8D&6+(xPl%^;(y6H+2BF9QQg2|Rha!2LJR
z-djTM|F>Thfck~+`OJ@}s@YP?c`&G&;h?SpDT9_AmW`G`OQabA1I?1r=Bt9|u21dJ
z(E=$MC4nG&YUv#g4S;~III5g58PzyDUm=+h64b8*)u*x06EK#`R&||KR~hGLOK`KW
zMu<ijAxHuwO8S;H`Qab=sTW8a(+H9#ke0ybuZ=hvR*WF8tS4}_lt#m1<s3B?;wq{7
z@+1h68zV=k*F&A0Ej1a}s;UGLVy~IHO!dvHK%lA;o;;ahJZ;bnDwICL=(<3JK=vBj
z3^Hy$w})>DvKmcZ0=Y#R0_3=^Sm(^sWyhQQ4X^Ds3~i8I<`@AHFazf64wF&M&}B(p
zrYtV+8X%a=Fq^kDlEY#3ESWD+LAXl!jqMS{<D)tD4=25GAS4nV(rR5W7}wgrzK!|C
z>RU%L<@!0xIRQX6<Ggh)y24K2$+F}2BxBeZ<DCax)t}+%=?b?F#^}7?L(gK0&0k-m
z1ezw}{-bl;y1v!#e}zgCsLf&A?2eQY&SxtC&~!S0yC8+?I^p*7duT?r9^OCE$<gAy
z9nZll-%(l0_W*Vz>JUi-LVdW#bwXQ24}iu?9sw?g5d>Nf)RiFwfE3i%lpsB030-CS
za#bJz<57+Es>n7udwFV-lKNvMp{h)eAD-j-jV-L(4%6unb)EI(?Gvq*Ysdq4pWA-#
zNZx$)yT^c@Bdr67l=>iLBL>Ov^t7NdySh)|iYTt4R9pa{s!F{Hcs6Z$=R{)TbtC{f
zJzL`1!9>M_SEt<^qGv}kB!z&0RMn;zUp~}oS#baLBXq5cW&)(aFu!+AdRK1bX0&I7
z52}pfM3XBhs4u_0Ku*N4F)daOcU?NN{zf+MFIKGtU^=QGh|i`_efsg8*$u*sIGe3l
zRf&T^)`nnlDJW({xZobxnhtR7+7!<{zmG=`XPC`aSj^W-$<%Wj#6-RI=2^T8<g1_i
zNdkZkcV1bx>YmIx&X$378#ulwIG%O#0Jg>%>k@e7?nuvHAEC;I2wi0tNp+={$eg&L
z$xBnvlk8QAUXrg7tF<FMFd9~U7zIQK5xpwx?T`85i-(#_8Z73mzWS9XSgl%}o-A~D
zeX8Pd$yG9=)?InGcg@!CGOW{wMgx>d%IWDvD;ac$ee&##vqGVDS5)Up<FRSDG_AS<
zGisA&G(v3`%-JrXXtR;;EJ|(|ROFz^dh_iwyl`hnj~>ssGZ|peWQ+z`!$GCflR4gc
z>s0N!gFH}GNeF2%Z#5oO8jou&E|x(kB!wBiNhE*h&k6u?-P~?cD#!CeLh=Yny}FJX
zQ)Sd3o9av<fa$PO+DQ1b1*4vvF15GSd}AT1k4sM@5u&@~9xCnvsOh-jw}0p+4iCl{
z4YN+pmiUd=9^%Q-h1|XOx0##s1ZdLP=|a=(LEkKIY8=G7+4Z0Ph40qA@BiUjZD3f!
z!^CJMi6Nt8P&_(W>16If%L0->#<$(wwnwL?Qes0EL{7%Di?u#*cc<^1NVX9u#T70k
z0|r&Xw8=0+TjLs|L50<-!_(tAnmX%iZyZA*m_c=wAw{n$K>rR9i6EiHVy)@4j%HBB
zYPkv^0+4@G38}ZQ-9dQ0Y)ecBRYXd0vP4W9255S4T2xAibcqmX_}^bU+lU*bKIjbe
zM9~#TC{RT0ZZ+7QHms`zg-}XQT%|al9xrfmwgd!J8M=F8OHGsEop0b={_9a*f~BAk
zA|=zw(M)>>V?B6dE~7%gH`mGCt?}K_u*%5hbz_=Nb8L@uELx9cOEsC%R2G&@W~P*K
zkjCDh_g!O^lSXw$QyKQB1AO9Rw=uhDaXxQ(dcM-Sbr^ufvc+=QK_Mg~>dF8Kt921b
z3<en&ZMmElY`BPkHZ#8HfkP50?>dk5s*A~V5VNy+5b++7O!-=qbDL|k(a=IdjGGiY
z!yKc=qN(f1xsq89S_-oifb|;Cdo`_F*L+#<<fP-%)0K8c6@Kl@$E+(80ZNdeXU(dz
z{+=a7^tPc&#M7e->}(G;J6(YZml-1Vf)ty`hKK+aeT5_Dvt>-Tnz%SeK#F&Py!*X>
zZ2YCii-XC!Y42RK`pwhuf)XuO@!=P8%+~aWvxt;(1X2hVkVU|3Gl&YnNH7w69Zptb
zG#s(2O;zd#G@BU*5mH?G2lcj85R#eBFV?tyV{7B;aCwm4!CTRH8qs?LDGZ9$s>Ebk
zd0m^YSKYfKSuAfg+4f8E_G^!pDc4O{PVS<2oqJmlUgQLwW=@ltA%MQ&*x;i2aX=_w
z#e-e(kc-~m;AOM8;SB&l|M*Fl;vyv@j!)(~I2hy6qjM$eTPR&du$QC|6rl(pT$G#1
z&rasCy*=<p^ToR*1YT|m49Gpv9SR4+33r7%A{=su6p#lZToKXlr|1_{p?H=~>vakD
z(0GvgT{p|FK0UShd?lir!v#o-Ri~{<9i(JLuqV}!6i@^q?-w{6l0y+BylY!`_o!;~
zE08z7=STY5&dptguN7Xx!x8RsFA-i8?z(y{CBjP&I*KAf5&jO)arwGlcM%a94N|CI
z@&4g}u({#5yzvb{#YUFn;$j`8xJJV&B0>OyL~H;%p+LCz5si?dDBKD7#cWw7)23Xd
zYidSU-W=gAJd!Lt!b=KwfF9u`f>|z?xfAAMF#rb2DM7GHSK8B|K#wq7mY$@`8Hf;<
zVsM#!5FkF23zSmi?y4)({32vfASB5{iXb9Lg+cCpG(!p(qO_|L!@=NLO}_Q-|FNtd
z4nZ3#yo)GR@=|1}$h=4_axV%NMRW=y<OV~(pxjg<1za{aGC?pxTCF?g1XBpG&7eHQ
zOV85x7@I1?rsO2$L_B&ti<{S{Iz5?-lpG%DGbf}z+alZvIT%i;2vH)utk>)Eb;Psx
z!SB1KC{TEjhs(Uc-Ia<%@bFUP)+r(>x&(u7Y_|3NdScInmp!fo5sBjQ*^)Q+M|y~$
zuDC|jW)Rtz+9k%gVi-bNuR7H=r3lFsjH}diA|fJOiU==Gg-bn`<V0UyEWd$WX@?4D
zUw5TMq+*demDB~0-AfLq$(2MJ68nKFMOeC;3~=+M!~{|Vcs5(67jI1<#icpth8H*B
z;z}8C$x0g@BZbq`dF*UAadLbiuqPPE1CRsm*pQ+SE_tUux?O~qZ;%j95h~$s?4wv@
zULr~nSmdRX)529`W&jfe%0TvW;Y~eC=ur#NPw~P-P*4i0@9`;J)giBBP`w~*__s$d
z>HK`D!~Ib_d0ZkV_UYP3B(wnsL|?!P7raPbq<98$eDjqWiiyJ4j8e%<7nUmX)QPE+
zn8Ldh#Y~|TPMTnn)Xy1H-xkv(m`DqVi42oyh_Lm#wJHf+aT-8)@6m+lRdy3RY*H4X
zKsX>p>0Dk)<cyH_qyvSAdTEoQXa4?kK}3ltUHCg9nTK0VxQ{Hnl{;l#<fRCyh}KES
zQM?QHBu6Kb0roylpiJmHk`S3BL;_3#jiLdvv-1_VhRGfuw_q|0_249I2&hlbUR`vl
z3L#0WRZ;2c7!6aLpS95&!HvXi(pB2Xo0p>SQdd@*X?_M$;Zp)8FRhqTSl5x(iYck|
zJyn!8g`279(utE6f@SrFKLj%o62Sl&lv#jA!Omt2JKP!aLFt%~sOX1_ct>y1N3!>N
z3J=C6f4!*dy2wO8CDcpF#-O-+Dehe<O+(Lv+*LXIda*9&Cl_6Q2kC4p%36`@h*DCd
z5>W~~bwJ7iB=?e{kaCzvAoYXM5NN$L0Aan;CIhelHt7nawgr<7C@+M82(c&7o?W%+
zF)nKo!j&~JlTMB=;`-q@j*k>l-)1W!;87-%%A2O~Zrzska$QbN7bV;a`Hq@|VoM&a
ztPr#mmMVjFf+dkz$`++F6*3AedPmKOESeM+VkkfhF@j(sEeTA3nFN=E-gPE-hV>JH
z&9wo&!w_6*y(IR-ouH)ks&!xx;axN}qsrOqik_4CY&Q4fr_179A5k(28J(hh9lH)9
zykmG`Zvr*|Ed^7O$S7TMC&OW~OA_6TbRtBP`lksg04Bi_$VAX2rqYRB*IG_NMW5l?
z*rJ|zVxyCrQtT&K8?zgcGn5!{_s*6t=Bo&IKRa9aa=vuyWu-`^n7PZNNTt)Igbeqe
zn<_l$r3<DESZ7wUU@2&3Gz$cyv?)64eFY&iLFqC(JvK<4OfIBMFo8^h831eB&f2!-
zFvI4ncJtt8Gg@=OBM|O@q^8QMYLkH)4XdcLX}xaa>C<!Hnl|z9(MfP)$Wu};9pPo;
zev0G;;RU*6SIfgqjvJyB1(V#mfF+|@kVy*j(pk7c0SgBq7$jN>6Ehk8Q!Qivv!wp9
z6{BAcSXacZU0aocrS1BMejCzha>DMkMpI`<8<lXOlrD~r&b3;0frzLwVo)O(9%gVw
z>E%P=h*BcL6{RSmZwfC#1~ft`Az3k5*Hefk>#b#PPa#Grxp#)Jh%m8qOqC<56<7$Q
zL|T@mOr{!414x6M^R%w2R2kNF(h^yDcam&6uG!QXg1BB4Tr675W^+NpdR^46yMW|I
zDiId+REn&0EeDNpxm=5g=)0om6uv@iT0(hjB&7#As+e+R9TQ{;i3u4=&i*GyN$AqL
zThH3IdFrjN%Sww>RTr^ZoU<A%s`2i6@$~goIeS!)j4Hz9_O}nJ$^OI_C)1sqw{LGx
z@IvSOgN^yCgHdW%t9AGI={Xk5j#p#%%Xwx9R4|zm0>kiiDP{ctOb>j$I$xxV1-wLA
ztx~dFN!pImZqd@N1eeMR5k*mo6djxG>s7Andnq@QlyjA;I;C8tDkUEc2N&VxtW!Q&
zE>^9G?#XZdivJFNIa+<&AO6D2o+f`{S*lOwoZW~u1naG9^i&oxhWmMx)oW!n`vvb7
zzZ$-tEzTb<7x({jdDr0W-e;TeWmV<z)V;lvs_{z@UJ^Kkyk<4oA2Bz#nDQF5HiUV1
z^tJgro=^R*Y_~rCXFgs}uKyHMwGU~%@#nR?3-6Y{us(U?pFe%=Uq1MqTw}QR;r(WO
z<6dHFoWyB+`u3?WPUo>aZ2{oME8oS7qX)k$0KfCc{<eMb=l{lAdARk<x!L}Ko}9di
zvbw)IdE;jv{`Y_MuNOyOoZb8MUro8$#^UK~zpeA{-TN%JZ-2^8-}qOH)%lkn5WmOU
zjgS5KC#%u^PkTH64-fv!Klqyf%Kz_c*zYw+5C7G6{^aLozxj)Q3qU!1^>e@H3;+Au
g?{B}q{qAo67YQCy^R=1qw*UYD07*qoM6N<$f{obUy8r+H

diff --git a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Resources/icons/icon@2x.png b/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Resources/icons/icon@2x.png
deleted file mode 100644
index b7ccb848e3949b55361f2fb30dfe3a39756aa387..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 19269
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

diff --git a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Resources/splash/Default-Landscape~ipad.png b/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Resources/splash/Default-Landscape~ipad.png
deleted file mode 100644
index 06bb96b394f8360815781aada7d1c3704263726b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 52135
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

diff --git a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Resources/splash/Default-Portrait~ipad.png b/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Resources/splash/Default-Portrait~ipad.png
deleted file mode 100644
index dbfed967af6dbda81c510e41d83cc9abf4ae9626..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 51794
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
Z@c?$9q{=`5#lL#2rLM15qiXl&{{!kJSVjN<

diff --git a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Resources/splash/Default.png b/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Resources/splash/Default.png
deleted file mode 100755
index fbf06e22d23ca03166bcfa695d7992c6df88fedc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 46308
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

diff --git a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Resources/splash/Default@2x.png b/apps/files_odfviewer/src/webodf/programs/ios/WebODF/Resources/splash/Default@2x.png
deleted file mode 100755
index e845a3f0b01414ef25bb3eedaa2529e3b027f121..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 50982
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

diff --git a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/WebODF-Info.plist b/apps/files_odfviewer/src/webodf/programs/ios/WebODF/WebODF-Info.plist
deleted file mode 100644
index 18518ec4c1..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/WebODF-Info.plist
+++ /dev/null
@@ -1,122 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-<plist version="1.0">
-<dict>
-	<key>CFBundleDevelopmentRegion</key>
-	<string>English</string>
-	<key>CFBundleDisplayName</key>
-	<string>${PRODUCT_NAME}</string>
-	<key>CFBundleDocumentTypes</key>
-	<array>
-		<dict>
-			<key>CFBundleTypeIconFiles</key>
-			<array>
-				<string>icon.png</string>
-			</array>
-			<key>CFBundleTypeName</key>
-			<string>OpenDocument Text</string>
-			<key>CFBundleTypeRole</key>
-			<string>Viewer</string>
-			<key>LSHandlerRank</key>
-			<string>Owner</string>
-			<key>LSItemContentTypes</key>
-			<array>
-				<string>org.oasis.opendocument.text</string>
-			</array>
-		</dict>
-		<dict>
-			<key>CFBundleTypeIconFiles</key>
-			<array>
-				<string>icon.png</string>
-			</array>
-			<key>CFBundleTypeName</key>
-			<string>OpenDocument Presentation</string>
-			<key>CFBundleTypeRole</key>
-			<string>Viewer</string>
-			<key>LSHandlerRank</key>
-			<string>Owner</string>
-			<key>LSItemContentTypes</key>
-			<array>
-				<string>org.oasis.opendocument.presentation</string>
-			</array>
-		</dict>
-	</array>
-	<key>CFBundleExecutable</key>
-	<string>${EXECUTABLE_NAME}</string>
-	<key>CFBundleIconFile</key>
-	<string>icon.png</string>
-	<key>CFBundleIconFiles</key>
-	<array>
-		<string>icon.png</string>
-		<string>icon@2x.png</string>
-		<string>icon-72.png</string>
-	</array>
-	<key>CFBundleIdentifier</key>
-	<string>WebODF-03</string>
-	<key>CFBundleInfoDictionaryVersion</key>
-	<string>6.0</string>
-	<key>CFBundleName</key>
-	<string>${PRODUCT_NAME}</string>
-	<key>CFBundlePackageType</key>
-	<string>APPL</string>
-	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
-	<key>CFBundleSignature</key>
-	<string>????</string>
-	<key>CFBundleVersion</key>
-	<string>1.0</string>
-	<key>LSRequiresIPhoneOS</key>
-	<true/>
-	<key>UISupportedInterfaceOrientations</key>
-	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationPortraitUpsideDown</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-	</array>
-	<key>UISupportedInterfaceOrientations~ipad</key>
-	<array>
-		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationLandscapeLeft</string>
-		<string>UIInterfaceOrientationPortraitUpsideDown</string>
-		<string>UIInterfaceOrientationLandscapeRight</string>
-	</array>
-	<key>UTExportedTypeDeclarations</key>
-	<array>
-		<dict>
-			<key>UTTypeConformsTo</key>
-			<array>
-				<string>org.gnu.gnu-zip-archive</string>
-			</array>
-			<key>UTTypeDescription</key>
-			<string>OpenDocument Text</string>
-			<key>UTTypeIdentifier</key>
-			<string>org.oasis.opendocument.text</string>
-			<key>UTTypeTagSpecification</key>
-			<dict>
-				<key>public.filename-extension</key>
-				<string>odt</string>
-				<key>public.mime-type</key>
-				<string>application/vnd.oasis.opendocument.text</string>
-			</dict>
-		</dict>
-		<dict>
-			<key>UTTypeConformsTo</key>
-			<array>
-				<string>org.gnu.gnu-zip-archive</string>
-			</array>
-			<key>UTTypeDescription</key>
-			<string>OpenDocument Presentation</string>
-			<key>UTTypeIdentifier</key>
-			<string>org.oasis.opendocument.presentation</string>
-			<key>UTTypeTagSpecification</key>
-			<dict>
-				<key>public.filename-extension</key>
-				<string>odp</string>
-				<key>public.mime-type</key>
-				<string>application/vnd.oasis.opendocument.presentation</string>
-			</dict>
-		</dict>
-	</array>
-</dict>
-</plist>
diff --git a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/WebODF-Prefix.pch b/apps/files_odfviewer/src/webodf/programs/ios/WebODF/WebODF-Prefix.pch
deleted file mode 100644
index da48b6a1fd..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/WebODF-Prefix.pch
+++ /dev/null
@@ -1,7 +0,0 @@
-//
-// Prefix header for all source files of the 'WebODF' target in the 'WebODF' project
-//
-
-#ifdef __OBJC__
-    #import <UIKit/UIKit.h>
-#endif
diff --git a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/en.lproj/InfoPlist.strings b/apps/files_odfviewer/src/webodf/programs/ios/WebODF/en.lproj/InfoPlist.strings
deleted file mode 100644
index 477b28ff8f..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/en.lproj/InfoPlist.strings
+++ /dev/null
@@ -1,2 +0,0 @@
-/* Localized versions of Info.plist keys */
-
diff --git a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/main.m b/apps/files_odfviewer/src/webodf/programs/ios/WebODF/main.m
deleted file mode 100644
index bda2f99ea3..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/ios/WebODF/main.m
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements.  See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership.  The ASF licenses this file
- to you 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.
- */
-//
-//  main.m
-//  WebODF
-//
-//  Created by KO GmbH on 2/2/12.
-//  Copyright __MyCompanyName__ 2012. All rights reserved.
-//
-
-#import <UIKit/UIKit.h>
-
-int main(int argc, char *argv[]) {
-    int retVal = UIApplicationMain(argc, argv, nil, @"AppDelegate");
-    return retVal;
-}
diff --git a/apps/files_odfviewer/src/webodf/programs/ios/www/index.html b/apps/files_odfviewer/src/webodf/programs/ios/www/index.html
deleted file mode 100644
index ec998a1005..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/ios/www/index.html
+++ /dev/null
@@ -1,52 +0,0 @@
-<!DOCTYPE html>
-<html>
- <head>
-  <title>WebODF</title>
-  <link href="sencha-touch.css" rel="stylesheet" type="text/css" />
-  <link href="webodf.css" rel="stylesheet" type="text/css" />
-  <script type="text/javascript" src="phonegap-1.4.1.js"></script>
-  <script type="text/javascript" src="sencha-touch.js"></script>
-  <script type="text/javascript" src="webodf.js"></script>
-  <script type="text/javascript" src="nativezip.js"></script>
-  <script type="text/javascript" src="app/app.js"></script>
-  <script type="text/javascript" src="app/controller/Files.js"></script>
-  <script type="text/javascript" src="app/model/FileSystem.js"></script>
-  <script type="text/javascript" src="app/store/FileStore.js"></script>
-  <script type="text/javascript" src="app/views/FileDetail.js"></script>
-  <script type="text/javascript" src="app/views/FilesList.js"></script>
-  <script type="text/javascript" src="app/views/OdfView.js"></script>
-  <script type="text/javascript" src="app/views/Viewport.js"></script>
-  <script type="text/javascript">
-var applicationReady = false,
-    deviceReady = false,
-    startScanningDirectories,
-    application;
-document.addEventListener("deviceready", function () {
-    deviceReady = true;
-    if (applicationReady) {
-        startScanningDirectories();
-    }
-}, false);
-/**
- * Override this function so it waits until the device is ready.
- */
-onApplicationLaunch = function (app) {
-    "use strict";
-    application = app;
-    applicationReady = true;
-    startScanningDirectories = function () {
-        if (typeof invokeString !== "undefined" && invokeString) {
-            app.openUrl(invokeString);
-        }
-        app.startScanningDirectories();
-    };
-    if (deviceReady) {
-        startScanningDirectories();
-    }
-};
-function handleOpenURL(url) {
-    application.openUrl(url);
-}
-  </script>
- </head><body></body>
-</html>
diff --git a/apps/files_odfviewer/src/webodf/programs/ios/www/nativezip.js b/apps/files_odfviewer/src/webodf/programs/ios/www/nativezip.js
deleted file mode 100644
index 04a8ff13c7..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/ios/www/nativezip.js
+++ /dev/null
@@ -1,84 +0,0 @@
-/*global PhoneGap, core*/
-
-var ZipPlugin = {
-    loadAsString: function (zippath, entrypath, success, fail) {
-        "use strict";
-        return PhoneGap.exec(success, fail, "ZipClass", "loadAsString", [zippath, entrypath]);
-    },
-    loadAsDataURL: function (zippath, entrypath, mimetype, success, fail) {
-        "use strict";
-        return PhoneGap.exec(success, fail, "ZipClass", "loadAsDataURL", [zippath, entrypath, mimetype]);
-    }
-};
-core.Zip = function (url, entriesReadCallback) {
-    "use strict";
-    // remove 'odf:' prefix
-    url = url.substr(4);
-    var zip = this;
-    this.load = function (filename, callback) {
-        //alert(filename);
-        callback(null, "");
-    };
-    this.loadAsString = function (filename, callback) {
-        alert("loadAsString");
-    };
-    this.loadAsDOM = function (filename, callback) {
-        var xhr = new XMLHttpRequest();
-        function handleResult() {
-            var xml;
-            console.log("loading " + filename + " status " + xhr.status + " readyState " + xhr.readyState);
-            if (xhr.readyState === 4) {
-                xml = xhr.responseXML;
-                console.log("done accessing responseXML " + xml + " " + (xhr.responseText && xhr.responseText.length)
-                    + " " + xhr.statusText);
-                console.log("statusText " + xhr.statusText);
-                if (xhr.status === 0 && !xml) {
-                    // empty files are considered as errors
-                    callback("File " + path + " is not valid XML.");
-                } else if (xhr.status === 200 || xhr.status === 0) {
-                    try {
-                        callback(null, xml);
-                    } catch (e) {
-                        console.log(e);
-                    }
-                } else {
-                    // report error
-                    callback(xhr.responseText || xhr.statusText);
-                }
-            }
-        }
-        xhr.open('GET', "http://zipserver" + url + "?" + filename, true);
-        xhr.onreadystatechange = handleResult;
-        xhr.send(null);
-    };
-    this.loadAsDataURL = function (filename, mimetype, callback) {
-        callback(null, "http://zipserver" + url + "?" + filename);
-        /*
-        ZipPlugin.loadAsDataURL(url, filename, mimetype,
-            function (content) {
-                callback(null, content);
-            },
-            function (err) { callback(err, null); }
-            );
-            */
-    };
-    this.getEntries = function () {
-        alert("getEntries");
-    };
-    this.loadContentXmlAsFragments = function (filename, handler) {
-        // the javascript implementation simply reads the file
-        zip.loadAsString(filename, function (err, data) {
-            if (err) {
-                return handler.rootElementReady(err);
-            }
-            handler.rootElementReady(null, data, true);
-        });
-    };
-    this.save = function () {
-        alert("save");
-    };
-    this.write = function () {
-        alert("write");
-    };
-    entriesReadCallback(null, this);
-};
diff --git a/apps/files_odfviewer/src/webodf/programs/ios/www/phonegap-1.4.1.js b/apps/files_odfviewer/src/webodf/programs/ios/www/phonegap-1.4.1.js
deleted file mode 100644
index 680e180209..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/ios/www/phonegap-1.4.1.js
+++ /dev/null
@@ -1,4123 +0,0 @@
-/*     PhoneGap v1.4.1 */
-/*
-       Licensed to the Apache Software Foundation (ASF) under one
-       or more contributor license agreements.  See the NOTICE file
-       distributed with this work for additional information
-       regarding copyright ownership.  The ASF licenses this file
-       to you 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.
-*/
-
-
-/*
- * Some base contributions
- * Copyright (c) 2011, Proyectos Equis Ka, S.L.
- */
-
-if (typeof PhoneGap === "undefined") {
-
-if (typeof(DeviceInfo) !== 'object'){
-    DeviceInfo = {};
-}
-/**
- * This represents the PhoneGap API itself, and provides a global namespace for accessing
- * information about the state of PhoneGap.
- * @class
- */
-PhoneGap = {
-    // This queue holds the currently executing command and all pending
-    // commands executed with PhoneGap.exec().
-    commandQueue: [],
-    // Indicates if we're currently in the middle of flushing the command
-    // queue on the native side.
-    commandQueueFlushing: false,
-    _constructors: [],
-    documentEventHandler: {},   // Collection of custom document event handlers
-    windowEventHandler: {} 
-};
-
-/**
- * List of resource files loaded by PhoneGap.
- * This is used to ensure JS and other files are loaded only once.
- */
-PhoneGap.resources = {base: true};
-
-/**
- * Determine if resource has been loaded by PhoneGap
- *
- * @param name
- * @return
- */
-PhoneGap.hasResource = function(name) {
-    return PhoneGap.resources[name];
-};
-
-/**
- * Add a resource to list of loaded resources by PhoneGap
- *
- * @param name
- */
-PhoneGap.addResource = function(name) {
-    PhoneGap.resources[name] = true;
-};
-
-/**
- * Boolean flag indicating if the PhoneGap API is available and initialized.
- */ // TODO: Remove this, it is unused here ... -jm
-PhoneGap.available = DeviceInfo.uuid != undefined;
-
-/**
- * Add an initialization function to a queue that ensures it will run and initialize
- * application constructors only once PhoneGap has been initialized.
- * @param {Function} func The function callback you want run once PhoneGap is initialized
- */
-PhoneGap.addConstructor = function(func) {
-    var state = document.readyState;
-    if ( ( state == 'loaded' || state == 'complete' ) && DeviceInfo.uuid != null )
-    {
-        func();
-    }
-    else
-    {
-        PhoneGap._constructors.push(func);
-    }
-};
-
-(function() 
- {
-    var timer = setInterval(function()
-    {
-                            
-        var state = document.readyState;
-                            
-        if ( ( state == 'loaded' || state == 'complete' ) && DeviceInfo.uuid != null )
-        {
-            clearInterval(timer); // stop looking
-            // run our constructors list
-            while (PhoneGap._constructors.length > 0) 
-            {
-                var constructor = PhoneGap._constructors.shift();
-                try 
-                {
-                    constructor();
-                } 
-                catch(e) 
-                {
-                    if (typeof(console['log']) == 'function')
-                    {
-                        console.log("Failed to run constructor: " + console.processMessage(e));
-                    }
-                    else
-                    {
-                        alert("Failed to run constructor: " + e.message);
-                    }
-                }
-            }
-            // all constructors run, now fire the deviceready event
-            var e = document.createEvent('Events'); 
-            e.initEvent('deviceready');
-            document.dispatchEvent(e);
-        }
-    }, 1);
-})();
-
-// session id for calls
-PhoneGap.sessionKey = 0;
-
-// centralized callbacks
-PhoneGap.callbackId = 0;
-PhoneGap.callbacks = {};
-PhoneGap.callbackStatus = {
-    NO_RESULT: 0,
-    OK: 1,
-    CLASS_NOT_FOUND_EXCEPTION: 2,
-    ILLEGAL_ACCESS_EXCEPTION: 3,
-    INSTANTIATION_EXCEPTION: 4,
-    MALFORMED_URL_EXCEPTION: 5,
-    IO_EXCEPTION: 6,
-    INVALID_ACTION: 7,
-    JSON_EXCEPTION: 8,
-    ERROR: 9
-    };
-
-/**
- * Creates a gap bridge iframe used to notify the native code about queued
- * commands.
- *
- * @private
- */
-PhoneGap.createGapBridge = function() {
-    gapBridge = document.createElement("iframe");
-    gapBridge.setAttribute("style", "display:none;");
-    gapBridge.setAttribute("height","0px");
-    gapBridge.setAttribute("width","0px");
-    gapBridge.setAttribute("frameborder","0");
-    document.documentElement.appendChild(gapBridge);
-    return gapBridge;
-}
-
-/** 
- * Execute a PhoneGap command by queuing it and letting the native side know
- * there are queued commands. The native side will then request all of the
- * queued commands and execute them.
- *
- * Arguments may be in one of two formats:
- *
- * FORMAT ONE (preferable)
- * The native side will call PhoneGap.callbackSuccess or
- * PhoneGap.callbackError, depending upon the result of the action.
- *
- * @param {Function} success    The success callback
- * @param {Function} fail       The fail callback
- * @param {String} service      The name of the service to use
- * @param {String} action       The name of the action to use
- * @param {String[]} [args]     Zero or more arguments to pass to the method
- *      
- * FORMAT TWO
- * @param {String} command    Command to be run in PhoneGap, e.g.
- *                            "ClassName.method"
- * @param {String[]} [args]   Zero or more arguments to pass to the method
- *                            object parameters are passed as an array object
- *                            [object1, object2] each object will be passed as
- *                            JSON strings 
- */
-PhoneGap.exec = function() { 
-    if (!PhoneGap.available) {
-        alert("ERROR: Attempting to call PhoneGap.exec()"
-              +" before 'deviceready'. Ignoring.");
-        return;
-    }
-
-    var successCallback, failCallback, service, action, actionArgs;
-    var callbackId = null;
-    if (typeof arguments[0] !== "string") {
-        // FORMAT ONE
-        successCallback = arguments[0];
-        failCallback = arguments[1];
-        service = arguments[2];
-        action = arguments[3];
-        actionArgs = arguments[4];
-
-        // Since we need to maintain backwards compatibility, we have to pass
-        // an invalid callbackId even if no callback was provided since plugins
-        // will be expecting it. The PhoneGap.exec() implementation allocates
-        // an invalid callbackId and passes it even if no callbacks were given.
-        callbackId = 'INVALID';
-    } else {
-        // FORMAT TWO
-        splitCommand = arguments[0].split(".");
-        action = splitCommand.pop();
-        service = splitCommand.join(".");
-        actionArgs = Array.prototype.splice.call(arguments, 1);
-    }
-    
-    // Start building the command object.
-    var command = {
-        className: service,
-        methodName: action,
-        arguments: []
-    };
-
-    // Register the callbacks and add the callbackId to the positional
-    // arguments if given.
-    if (successCallback || failCallback) {
-        callbackId = service + PhoneGap.callbackId++;
-        PhoneGap.callbacks[callbackId] = 
-            {success:successCallback, fail:failCallback};
-    }
-    if (callbackId != null) {
-        command.arguments.push(callbackId);
-    }
-
-    for (var i = 0; i < actionArgs.length; ++i) {
-        var arg = actionArgs[i];
-        if (arg == undefined || arg == null) {
-            continue;
-        } else if (typeof(arg) == 'object') {
-            command.options = arg;
-        } else {
-            command.arguments.push(arg);
-        }
-    }
-
-    // Stringify and queue the command. We stringify to command now to
-    // effectively clone the command arguments in case they are mutated before
-    // the command is executed.
-    PhoneGap.commandQueue.push(JSON.stringify(command));
-
-    // If the queue length is 1, then that means it was empty before we queued
-    // the given command, so let the native side know that we have some
-    // commands to execute, unless the queue is currently being flushed, in
-    // which case the command will be picked up without notification.
-    if (PhoneGap.commandQueue.length == 1 && !PhoneGap.commandQueueFlushing) {
-        if (!PhoneGap.gapBridge) {
-            PhoneGap.gapBridge = PhoneGap.createGapBridge();
-        }
-
-        PhoneGap.gapBridge.src = "gap://ready";
-    }
-}
-
-/**
- * Called by native code to retrieve all queued commands and clear the queue.
- */
-PhoneGap.getAndClearQueuedCommands = function() {
-  json = JSON.stringify(PhoneGap.commandQueue);
-  PhoneGap.commandQueue = [];
-  return json;
-}
-
-/**
- * Called by native code when returning successful result from an action.
- *
- * @param callbackId
- * @param args
- *        args.status - PhoneGap.callbackStatus
- *        args.message - return value
- *        args.keepCallback - 0 to remove callback, 1 to keep callback in PhoneGap.callbacks[]
- */
-PhoneGap.callbackSuccess = function(callbackId, args) {
-    if (PhoneGap.callbacks[callbackId]) {
-
-        // If result is to be sent to callback
-        if (args.status == PhoneGap.callbackStatus.OK) {
-            try {
-                if (PhoneGap.callbacks[callbackId].success) {
-                       PhoneGap.callbacks[callbackId].success(args.message);
-                }
-            }
-            catch (e) {
-                console.log("Error in success callback: "+callbackId+" = "+e);
-            }
-        }
-    
-        // Clear callback if not expecting any more results
-        if (!args.keepCallback) {
-            delete PhoneGap.callbacks[callbackId];
-        }
-    }
-};
-
-/**
- * Called by native code when returning error result from an action.
- *
- * @param callbackId
- * @param args
- */
-PhoneGap.callbackError = function(callbackId, args) {
-    if (PhoneGap.callbacks[callbackId]) {
-        try {
-            if (PhoneGap.callbacks[callbackId].fail) {
-                PhoneGap.callbacks[callbackId].fail(args.message);
-            }
-        }
-        catch (e) {
-            console.log("Error in error callback: "+callbackId+" = "+e);
-        }
-        
-        // Clear callback if not expecting any more results
-        if (!args.keepCallback) {
-            delete PhoneGap.callbacks[callbackId];
-        }
-    }
-};
-
-
-/**
- * Does a deep clone of the object.
- *
- * @param obj
- * @return
- */
-PhoneGap.clone = function(obj) {
-    if(!obj) { 
-        return obj;
-    }
-
-    if(obj instanceof Array){
-        var retVal = new Array();
-        for(var i = 0; i < obj.length; ++i){
-            retVal.push(PhoneGap.clone(obj[i]));
-        }
-        return retVal;
-    }
-
-    if (obj instanceof Function) {
-        return obj;
-    }
-
-    if(!(obj instanceof Object)){
-        return obj;
-    }
-    
-    if (obj instanceof Date) {
-        return obj;
-    }
-
-    retVal = new Object();
-    for(i in obj){
-        if(!(i in retVal) || retVal[i] != obj[i]) {
-            retVal[i] = PhoneGap.clone(obj[i]);
-        }
-    }
-    return retVal;
-};
-
-// Intercept calls to document.addEventListener 
-PhoneGap.m_document_addEventListener = document.addEventListener;
-
-// Intercept calls to window.addEventListener
-PhoneGap.m_window_addEventListener = window.addEventListener;
-
-/**
- * Add a custom window event handler.
- *
- * @param {String} event            The event name that callback handles
- * @param {Function} callback       The event handler
- */
-PhoneGap.addWindowEventHandler = function(event, callback) {
-    PhoneGap.windowEventHandler[event] = callback;
-}
-
-/**
- * Add a custom document event handler.
- *
- * @param {String} event            The event name that callback handles
- * @param {Function} callback       The event handler
- */
-PhoneGap.addDocumentEventHandler = function(event, callback) {
-    PhoneGap.documentEventHandler[event] = callback;
-}
-
-/**
- * Intercept adding document event listeners and handle our own
- *
- * @param {Object} evt
- * @param {Function} handler
- * @param capture
- */
-document.addEventListener = function(evt, handler, capture) {
-    var e = evt.toLowerCase();
-           
-    // If subscribing to an event that is handled by a plugin
-    if (typeof PhoneGap.documentEventHandler[e] !== "undefined") {
-        if (PhoneGap.documentEventHandler[e](e, handler, true)) {
-            return; // Stop default behavior
-        }
-    }
-    
-    PhoneGap.m_document_addEventListener.call(document, evt, handler, capture); 
-};
-
-/**
- * Intercept adding window event listeners and handle our own
- *
- * @param {Object} evt
- * @param {Function} handler
- * @param capture
- */
-window.addEventListener = function(evt, handler, capture) {
-    var e = evt.toLowerCase();
-        
-    // If subscribing to an event that is handled by a plugin
-    if (typeof PhoneGap.windowEventHandler[e] !== "undefined") {
-        if (PhoneGap.windowEventHandler[e](e, handler, true)) {
-            return; // Stop default behavior
-        }
-    }
-        
-    PhoneGap.m_window_addEventListener.call(window, evt, handler, capture);
-};
-
-// Intercept calls to document.removeEventListener and watch for events that
-// are generated by PhoneGap native code
-PhoneGap.m_document_removeEventListener = document.removeEventListener;
-
-// Intercept calls to window.removeEventListener
-PhoneGap.m_window_removeEventListener = window.removeEventListener;
-
-/**
- * Intercept removing document event listeners and handle our own
- *
- * @param {Object} evt
- * @param {Function} handler
- * @param capture
- */
-document.removeEventListener = function(evt, handler, capture) {
-    var e = evt.toLowerCase();
-
-    // If unsubcribing from an event that is handled by a plugin
-    if (typeof PhoneGap.documentEventHandler[e] !== "undefined") {
-        if (PhoneGap.documentEventHandler[e](e, handler, false)) {
-            return; // Stop default behavior
-        }
-    }
-
-    PhoneGap.m_document_removeEventListener.call(document, evt, handler, capture);
-};
-
-/**
- * Intercept removing window event listeners and handle our own
- *
- * @param {Object} evt
- * @param {Function} handler
- * @param capture
- */
-window.removeEventListener = function(evt, handler, capture) {
-    var e = evt.toLowerCase();
-
-    // If unsubcribing from an event that is handled by a plugin
-    if (typeof PhoneGap.windowEventHandler[e] !== "undefined") {
-        if (PhoneGap.windowEventHandler[e](e, handler, false)) {
-            return; // Stop default behavior
-        }
-    }
-
-    PhoneGap.m_window_removeEventListener.call(window, evt, handler, capture);
-};
-
-/**
- * Method to fire document event
- *
- * @param {String} type             The event type to fire
- * @param {Object} data             Data to send with event
- */
-PhoneGap.fireDocumentEvent = function(type, data) {
-    var e = document.createEvent('Events');
-    e.initEvent(type);
-    if (data) {
-        for (var i in data) {
-            e[i] = data[i];
-        }
-    }
-    document.dispatchEvent(e);
-};
-
-/**
- * Method to fire window event
- *
- * @param {String} type             The event type to fire
- * @param {Object} data             Data to send with event
- */
-PhoneGap.fireWindowEvent = function(type, data) {
-    var e = document.createEvent('Events');
-    e.initEvent(type);
-    if (data) {
-        for (var i in data) {
-            e[i] = data[i];
-        }
-    }
-    window.dispatchEvent(e);
-};
-
-/**
- * Method to fire event from native code
- * Leaving this generic version to handle problems with iOS 3.x. Is currently used by orientation and battery events
- * Remove when iOS 3.x no longer supported and call fireWindowEvent or fireDocumentEvent directly
- */
-PhoneGap.fireEvent = function(type, target, data) {
-    var e = document.createEvent('Events');
-    e.initEvent(type);
-    if (data) {
-        for (var i in data) {
-            e[i] = data[i];
-        }
-    }
-    target = target || document;
-    if (target.dispatchEvent === undefined) { // ie window.dispatchEvent is undefined in iOS 3.x
-        target = document;
-    } 
-
-    target.dispatchEvent(e);
-};
-/**
- * Create a UUID
- *
- * @return
- */
-PhoneGap.createUUID = function() {
-    return PhoneGap.UUIDcreatePart(4) + '-' +
-        PhoneGap.UUIDcreatePart(2) + '-' +
-        PhoneGap.UUIDcreatePart(2) + '-' +
-        PhoneGap.UUIDcreatePart(2) + '-' +
-        PhoneGap.UUIDcreatePart(6);
-};
-
-PhoneGap.UUIDcreatePart = function(length) {
-    var uuidpart = "";
-    for (var i=0; i<length; i++) {
-        var uuidchar = parseInt((Math.random() * 256)).toString(16);
-        if (uuidchar.length == 1) {
-            uuidchar = "0" + uuidchar;
-        }
-        uuidpart += uuidchar;
-    }
-    return uuidpart;
-};
-};
-
-
-if (!PhoneGap.hasResource("debugconsole")) {
-	PhoneGap.addResource("debugconsole");
-	
-/**
- * This class provides access to the debugging console.
- * @constructor
- */
-var DebugConsole = function() {
-    this.winConsole = window.console;
-    this.logLevel = DebugConsole.INFO_LEVEL;
-}
-
-// from most verbose, to least verbose
-DebugConsole.ALL_LEVEL    = 1; // same as first level
-DebugConsole.INFO_LEVEL   = 1;
-DebugConsole.WARN_LEVEL   = 2;
-DebugConsole.ERROR_LEVEL  = 4;
-DebugConsole.NONE_LEVEL   = 8;
-													
-DebugConsole.prototype.setLevel = function(level) {
-    this.logLevel = level;
-};
-
-/**
- * Utility function for rendering and indenting strings, or serializing
- * objects to a string capable of being printed to the console.
- * @param {Object|String} message The string or object to convert to an indented string
- * @private
- */
-DebugConsole.prototype.processMessage = function(message, maxDepth) {
-	if (maxDepth === undefined) maxDepth = 0;
-    if (typeof(message) != 'object') {
-        return (this.isDeprecated ? "WARNING: debug object is deprecated, please use console object \n" + message : message);
-    } else {
-        /**
-         * @function
-         * @ignore
-         */
-        function indent(str) {
-            return str.replace(/^/mg, "    ");
-        }
-        /**
-         * @function
-         * @ignore
-         */
-        function makeStructured(obj, depth) {
-            var str = "";
-            for (var i in obj) {
-                try {
-                    if (typeof(obj[i]) == 'object' && depth < maxDepth) {
-                        str += i + ":\n" + indent(makeStructured(obj[i])) + "\n";
-                    } else {
-                        str += i + " = " + indent(String(obj[i])).replace(/^    /, "") + "\n";
-                    }
-                } catch(e) {
-                    str += i + " = EXCEPTION: " + e.message + "\n";
-                }
-            }
-            return str;
-        }
-        
-        return ("Object:\n" + makeStructured(message, maxDepth));
-    }
-};
-
-/**
- * Print a normal log message to the console
- * @param {Object|String} message Message or object to print to the console
- */
-DebugConsole.prototype.log = function(message, maxDepth) {
-    if (PhoneGap.available && this.logLevel <= DebugConsole.INFO_LEVEL)
-        PhoneGap.exec(null, null, 'com.phonegap.debugconsole', 'log',
-            [ this.processMessage(message, maxDepth), { logLevel: 'INFO' } ]
-        );
-    else
-        this.winConsole.log(message);
-};
-
-/**
- * Print a warning message to the console
- * @param {Object|String} message Message or object to print to the console
- */
-DebugConsole.prototype.warn = function(message, maxDepth) {
-    if (PhoneGap.available && this.logLevel <= DebugConsole.WARN_LEVEL)
-    	PhoneGap.exec(null, null, 'com.phonegap.debugconsole', 'log',
-            [ this.processMessage(message, maxDepth), { logLevel: 'WARN' } ]
-        );
-    else
-        this.winConsole.error(message);
-};
-
-/**
- * Print an error message to the console
- * @param {Object|String} message Message or object to print to the console
- */
-DebugConsole.prototype.error = function(message, maxDepth) {
-    if (PhoneGap.available && this.logLevel <= DebugConsole.ERROR_LEVEL)
-		PhoneGap.exec(null, null, 'com.phonegap.debugconsole', 'log',
-            [ this.processMessage(message, maxDepth), { logLevel: 'ERROR' } ]
-        );
-    else
-        this.winConsole.error(message);
-};
-
-PhoneGap.addConstructor(function() {
-    window.console = new DebugConsole();
-});
-};
-if (!PhoneGap.hasResource("position")) {
-	PhoneGap.addResource("position");
-
-/**
- * This class contains position information.
- * @param {Object} lat
- * @param {Object} lng
- * @param {Object} acc
- * @param {Object} alt
- * @param {Object} altAcc
- * @param {Object} head
- * @param {Object} vel
- * @constructor
- */
-Position = function(coords, timestamp) {
-	this.coords = Coordinates.cloneFrom(coords);
-    this.timestamp = timestamp || new Date().getTime();
-};
-
-Position.prototype.equals = function(other) {
-    return (this.coords && other && other.coords &&
-            this.coords.latitude == other.coords.latitude &&
-            this.coords.longitude == other.coords.longitude);
-};
-
-Position.prototype.clone = function()
-{
-    return new Position(
-        this.coords? this.coords.clone() : null,
-        this.timestamp? this.timestamp : new Date().getTime()
-    );
-}
-
-Coordinates = function(lat, lng, alt, acc, head, vel, altAcc) {
-	/**
-	 * The latitude of the position.
-	 */
-	this.latitude = lat;
-	/**
-	 * The longitude of the position,
-	 */
-	this.longitude = lng;
-	/**
-	 * The altitude of the position.
-	 */
-	this.altitude = alt;
-	/**
-	 * The accuracy of the position.
-	 */
-	this.accuracy = acc;
-	/**
-	 * The direction the device is moving at the position.
-	 */
-	this.heading = head;
-	/**
-	 * The velocity with which the device is moving at the position.
-	 */
-	this.speed = vel;
-	/**
-	 * The altitude accuracy of the position.
-	 */
-	this.altitudeAccuracy = (altAcc != 'undefined') ? altAcc : null; 
-};
-
-Coordinates.prototype.clone = function()
-{
-    return new Coordinates(
-        this.latitude,
-        this.longitude,
-        this.altitude,
-        this.accuracy,
-        this.heading,
-        this.speed,
-        this.altitudeAccuracy
-    );
-};
-
-Coordinates.cloneFrom = function(obj)
-{
-    return new Coordinates(
-        obj.latitude,
-        obj.longitude,
-        obj.altitude,
-        obj.accuracy,
-        obj.heading,
-        obj.speed,
-        obj.altitudeAccuracy
-    );
-};
-
-/**
- * This class specifies the options for requesting position data.
- * @constructor
- */
-PositionOptions = function(enableHighAccuracy, timeout, maximumAge) {
-	/**
-	 * Specifies the desired position accuracy.
-	 */
-	this.enableHighAccuracy = enableHighAccuracy || false;
-	/**
-	 * The timeout after which if position data cannot be obtained the errorCallback
-	 * is called.
-	 */
-	this.timeout = timeout || 10000;
-	/**
-     * The age of a cached position whose age is no greater than the specified time 
-     * in milliseconds. 
-     */
-	this.maximumAge = maximumAge || 0;
-	
-	if (this.maximumAge < 0) {
-		this.maximumAge = 0;
-	}
-};
-
-/**
- * This class contains information about any GPS errors.
- * @constructor
- */
-PositionError = function(code, message) {
-	this.code = code || 0;
-	this.message = message || "";
-};
-
-PositionError.UNKNOWN_ERROR = 0;
-PositionError.PERMISSION_DENIED = 1;
-PositionError.POSITION_UNAVAILABLE = 2;
-PositionError.TIMEOUT = 3;
-
-};if (!PhoneGap.hasResource("acceleration")) {
-	PhoneGap.addResource("acceleration");
- 	
-
-/**
- * This class contains acceleration information
- * @constructor
- * @param {Number} x The force applied by the device in the x-axis.
- * @param {Number} y The force applied by the device in the y-axis.
- * @param {Number} z The force applied by the device in the z-axis.
- */
-Acceleration = function(x, y, z) {
-	/**
-	 * The force applied by the device in the x-axis.
-	 */
-	this.x = x;
-	/**
-	 * The force applied by the device in the y-axis.
-	 */
-	this.y = y;
-	/**
-	 * The force applied by the device in the z-axis.
-	 */
-	this.z = z;
-	/**
-	 * The time that the acceleration was obtained.
-	 */
-	this.timestamp = new Date().getTime();
-}
-
-/**
- * This class specifies the options for requesting acceleration data.
- * @constructor
- */
-AccelerationOptions = function() {
-	/**
-	 * The timeout after which if acceleration data cannot be obtained the errorCallback
-	 * is called.
-	 */
-	this.timeout = 10000;
-}
-};if (!PhoneGap.hasResource("accelerometer")) {
-	PhoneGap.addResource("accelerometer");
-
-/**
- * This class provides access to device accelerometer data.
- * @constructor
- */
-Accelerometer = function() 
-{
-	/**
-	 * The last known acceleration.
-	 */
-	this.lastAcceleration = new Acceleration(0,0,0);
-}
-
-/**
- * Asynchronously aquires the current acceleration.
- * @param {Function} successCallback The function to call when the acceleration
- * data is available
- * @param {Function} errorCallback The function to call when there is an error 
- * getting the acceleration data.
- * @param {AccelerationOptions} options The options for getting the accelerometer data
- * such as timeout.
- */
-Accelerometer.prototype.getCurrentAcceleration = function(successCallback, errorCallback, options) {
-	// If the acceleration is available then call success
-	// If the acceleration is not available then call error
-	
-	// Created for iPhone, Iphone passes back _accel obj litteral
-	if (typeof successCallback == "function") {
-		successCallback(this.lastAcceleration);
-	}
-};
-
-// private callback called from Obj-C by name
-Accelerometer.prototype._onAccelUpdate = function(x,y,z)
-{
-   this.lastAcceleration = new Acceleration(x,y,z);
-};
-
-/**
- * Asynchronously aquires the acceleration repeatedly at a given interval.
- * @param {Function} successCallback The function to call each time the acceleration
- * data is available
- * @param {Function} errorCallback The function to call when there is an error 
- * getting the acceleration data.
- * @param {AccelerationOptions} options The options for getting the accelerometer data
- * such as timeout.
- */
-
-Accelerometer.prototype.watchAcceleration = function(successCallback, errorCallback, options) {
-	//this.getCurrentAcceleration(successCallback, errorCallback, options);
-	// TODO: add the interval id to a list so we can clear all watches
- 	var frequency = (options != undefined && options.frequency != undefined) ? options.frequency : 10000;
-	var updatedOptions = {
-		desiredFrequency:frequency 
-	}
-	PhoneGap.exec(null, null, "com.phonegap.accelerometer", "start", [options]);
-
-	return setInterval(function() {
-		navigator.accelerometer.getCurrentAcceleration(successCallback, errorCallback, options);
-	}, frequency);
-};
-
-/**
- * Clears the specified accelerometer watch.
- * @param {String} watchId The ID of the watch returned from #watchAcceleration.
- */
-Accelerometer.prototype.clearWatch = function(watchId) {
-	PhoneGap.exec(null, null, "com.phonegap.accelerometer", "stop", []);
-	clearInterval(watchId);
-};
-
-Accelerometer.install = function()
-{
-    if (typeof navigator.accelerometer == "undefined") {
-		navigator.accelerometer = new Accelerometer();
-	}
-};
-
-Accelerometer.installDeviceMotionHandler = function()
-{
-	if (!(window.DeviceMotionEvent == undefined)) {
-		// supported natively, so we don't have to add support
-		return;
-	}	
-	
-	var self = this;
-	var devicemotionEvent = 'devicemotion';
-	self.deviceMotionWatchId = null;
-	self.deviceMotionListenerCount = 0;
-	self.deviceMotionLastEventTimestamp = 0;
-	
-	// backup original `window.addEventListener`, `window.removeEventListener`
-    var _addEventListener = window.addEventListener;
-    var _removeEventListener = window.removeEventListener;
-													
-	var windowDispatchAvailable = !(window.dispatchEvent === undefined); // undefined in iOS 3.x
-													
-	var accelWin = function(acceleration) {
-		var evt = document.createEvent('Events');
-	    evt.initEvent(devicemotionEvent);
-	
-		evt.acceleration = null; // not all devices have gyroscope, don't care for now if we actually have it.
-		evt.rotationRate = null; // not all devices have gyroscope, don't care for now if we actually have it:
-		evt.accelerationIncludingGravity = acceleration; // accelerometer, all iOS devices have it
-		
-		var currentTime = new Date().getTime();
-		evt.interval =  (self.deviceMotionLastEventTimestamp == 0) ? 0 : (currentTime - self.deviceMotionLastEventTimestamp);
-		self.deviceMotionLastEventTimestamp = currentTime;
-		
-		if (windowDispatchAvailable) {
-			window.dispatchEvent(evt);
-		} else {
-			document.dispatchEvent(evt);
-		}
-	};
-	
-	var accelFail = function() {
-		
-	};
-													
-    // override `window.addEventListener`
-    window.addEventListener = function() {
-        if (arguments[0] === devicemotionEvent) {
-            ++(self.deviceMotionListenerCount);
-			if (self.deviceMotionListenerCount == 1) { // start
-				self.deviceMotionWatchId = navigator.accelerometer.watchAcceleration(accelWin, accelFail, { frequency:500});
-			}
-		} 
-													
-		if (!windowDispatchAvailable) {
-			return document.addEventListener.apply(this, arguments);
-		} else {
-			return _addEventListener.apply(this, arguments);
-		}
-    };	
-
-    // override `window.removeEventListener'
-    window.removeEventListener = function() {
-        if (arguments[0] === devicemotionEvent) {
-            --(self.deviceMotionListenerCount);
-			if (self.deviceMotionListenerCount == 0) { // stop
-				navigator.accelerometer.clearWatch(self.deviceMotionWatchId);
-			}
-		} 
-		
-		if (!windowDispatchAvailable) {
-			return document.removeEventListener.apply(this, arguments);
-		} else {
-			return _removeEventListener.apply(this, arguments);
-		}
-    };	
-};
-
-
-PhoneGap.addConstructor(Accelerometer.install);
-PhoneGap.addConstructor(Accelerometer.installDeviceMotionHandler);
-
-};
-if (!PhoneGap.hasResource("battery")) {
-PhoneGap.addResource("battery");
-
-/**
- * This class contains information about the current battery status.
- * @constructor
- */
-var Battery = function() {
-    this._level = null;
-    this._isPlugged = null;
-    this._batteryListener = [];
-    this._lowListener = [];
-    this._criticalListener = [];
-};
-
-/**
- * Registers as an event producer for battery events.
- * 
- * @param {Object} eventType
- * @param {Object} handler
- * @param {Object} add
- */
-Battery.prototype.eventHandler = function(eventType, handler, add) {
-    var me = navigator.battery;
-    if (add) {
-        // If there are no current registered event listeners start the battery listener on native side.
-        if (me._batteryListener.length === 0 && me._lowListener.length === 0 && me._criticalListener.length === 0) {
-            PhoneGap.exec(me._status, me._error, "com.phonegap.battery", "start", []);
-        }
-        
-        // Register the event listener in the proper array
-        if (eventType === "batterystatus") {
-            var pos = me._batteryListener.indexOf(handler);
-            if (pos === -1) {
-            	me._batteryListener.push(handler);
-            }
-        } else if (eventType === "batterylow") {
-            var pos = me._lowListener.indexOf(handler);
-            if (pos === -1) {
-            	me._lowListener.push(handler);
-            }
-        } else if (eventType === "batterycritical") {
-            var pos = me._criticalListener.indexOf(handler);
-            if (pos === -1) {
-            	me._criticalListener.push(handler);
-            }
-        }
-    } else {
-        // Remove the event listener from the proper array
-        if (eventType === "batterystatus") {
-            var pos = me._batteryListener.indexOf(handler);
-            if (pos > -1) {
-                me._batteryListener.splice(pos, 1);        
-            }
-        } else if (eventType === "batterylow") {
-            var pos = me._lowListener.indexOf(handler);
-            if (pos > -1) {
-                me._lowListener.splice(pos, 1);        
-            }
-        } else if (eventType === "batterycritical") {
-            var pos = me._criticalListener.indexOf(handler);
-            if (pos > -1) {
-                me._criticalListener.splice(pos, 1);        
-            }
-        }
-        
-        // If there are no more registered event listeners stop the battery listener on native side.
-        if (me._batteryListener.length === 0 && me._lowListener.length === 0 && me._criticalListener.length === 0) {
-            PhoneGap.exec(null, null, "com.phonegap.battery", "stop", []);
-        }
-    }
-};
-
-/**
- * Callback for battery status
- * 
- * @param {Object} info			keys: level, isPlugged
- */
-Battery.prototype._status = function(info) {
-	if (info) {
-		var me = this;
-		if (me._level != info.level || me._isPlugged != info.isPlugged) {
-			// Fire batterystatus event
-			//PhoneGap.fireWindowEvent("batterystatus", info);
-			// use this workaround since iOS 3.x does have window.dispatchEvent
-			PhoneGap.fireEvent("batterystatus", window, info);	
-
-			// Fire low battery event
-			if (info.level == 20 || info.level == 5) {
-				if (info.level == 20) {
-					//PhoneGap.fireWindowEvent("batterylow", info);
-					// use this workaround since iOS 3.x does not have window.dispatchEvent
-					PhoneGap.fireEvent("batterylow", window, info);
-				}
-				else {
-					//PhoneGap.fireWindowEvent("batterycritical", info);
-					// use this workaround since iOS 3.x does not have window.dispatchEvent
-					PhoneGap.fireEvent("batterycritical", window, info);
-				}
-			}
-		}
-		me._level = info.level;
-		me._isPlugged = info.isPlugged;	
-	}
-};
-
-/**
- * Error callback for battery start
- */
-Battery.prototype._error = function(e) {
-    console.log("Error initializing Battery: " + e);
-};
-
-PhoneGap.addConstructor(function() {
-    if (typeof navigator.battery === "undefined") {
-        navigator.battery = new Battery();
-        PhoneGap.addWindowEventHandler("batterystatus", navigator.battery.eventHandler);
-        PhoneGap.addWindowEventHandler("batterylow", navigator.battery.eventHandler);
-        PhoneGap.addWindowEventHandler("batterycritical", navigator.battery.eventHandler);
-    }
-});
-}if (!PhoneGap.hasResource("camera")) {
-	PhoneGap.addResource("camera");
-	
-
-/**
- * This class provides access to the device camera.
- * @constructor
- */
-Camera = function() {
-	
-}
-/**
- *  Available Camera Options
- *  {boolean} allowEdit - true to allow editing image, default = false
- *	{number} quality 0-100 (low to high) default =  100
- *  {Camera.DestinationType} destinationType default = DATA_URL
- *	{Camera.PictureSourceType} sourceType default = CAMERA
- *	{number} targetWidth - width in pixels to scale image default = 0 (no scaling)
- *  {number} targetHeight - height in pixels to scale image default = 0 (no scaling)
- *  {Camera.EncodingType} - encodingType default = JPEG
- *  {boolean} correctOrientation - Rotate the image to correct for the orientation of the device during capture (iOS only)
- *  {boolean} saveToPhotoAlbum - Save the image to the photo album on the device after capture (iOS only)
- */
-/**
- * Format of image that is returned from getPicture.
- *
- * Example: navigator.camera.getPicture(success, fail,
- *              { quality: 80,
- *                destinationType: Camera.DestinationType.DATA_URL,
- *                sourceType: Camera.PictureSourceType.PHOTOLIBRARY})
- */
-Camera.DestinationType = {
-    DATA_URL: 0,                // Return base64 encoded string
-    FILE_URI: 1                 // Return file uri 
-};
-Camera.prototype.DestinationType = Camera.DestinationType;
-
-/**
- * Source to getPicture from.
- *
- * Example: navigator.camera.getPicture(success, fail,
- *              { quality: 80,
- *                destinationType: Camera.DestinationType.DATA_URL,
- *                sourceType: Camera.PictureSourceType.PHOTOLIBRARY})
- */
-Camera.PictureSourceType = {
-    PHOTOLIBRARY : 0,           // Choose image from picture library 
-    CAMERA : 1,                 // Take picture from camera
-    SAVEDPHOTOALBUM : 2         // Choose image from picture library 
-};
-Camera.prototype.PictureSourceType = Camera.PictureSourceType;
-
-/** 
- * Encoding of image returned from getPicture. 
- * 
- * Example: navigator.camera.getPicture(success, fail, 
- *              { quality: 80, 
- *                destinationType: Camera.DestinationType.DATA_URL, 
- *                sourceType: Camera.PictureSourceType.CAMERA, 
- *                encodingType: Camera.EncodingType.PNG}) 
- */ 
-Camera.EncodingType = { 
-	JPEG: 0,                    // Return JPEG encoded image 
-	PNG: 1                      // Return PNG encoded image 
-};
-Camera.prototype.EncodingType = Camera.EncodingType;
-
-/** 
- * Type of pictures to select from.  Only applicable when
- *	PictureSourceType is PHOTOLIBRARY or SAVEDPHOTOALBUM 
- * 
- * Example: navigator.camera.getPicture(success, fail, 
- *              { quality: 80, 
- *                destinationType: Camera.DestinationType.DATA_URL, 
- *                sourceType: Camera.PictureSourceType.PHOTOLIBRARY, 
- *                mediaType: Camera.MediaType.PICTURE}) 
- */ 
-Camera.MediaType = { 
-	PICTURE: 0,             // allow selection of still pictures only. DEFAULT. Will return format specified via DestinationType
-	VIDEO: 1,                // allow selection of video only, ONLY RETURNS URL
-	ALLMEDIA : 2			// allow selection from all media types
-};
-Camera.prototype.MediaType = Camera.MediaType;
-
-/**
- * Gets a picture from source defined by "options.sourceType", and returns the
- * image as defined by the "options.destinationType" option.
-
- * The defaults are sourceType=CAMERA and destinationType=DATA_URL.
- *
- * @param {Function} successCallback
- * @param {Function} errorCallback
- * @param {Object} options
- */
-Camera.prototype.getPicture = function(successCallback, errorCallback, options) {
-	// successCallback required
-	if (typeof successCallback != "function") {
-        console.log("Camera Error: successCallback is not a function");
-        return;
-    }
-
-    // errorCallback optional
-    if (errorCallback && (typeof errorCallback != "function")) {
-        console.log("Camera Error: errorCallback is not a function");
-        return;
-    }
-	
-	PhoneGap.exec(successCallback, errorCallback, "com.phonegap.camera","getPicture",[options]);
-};
-
-
-
-PhoneGap.addConstructor(function() {
-    if (typeof navigator.camera == "undefined") navigator.camera = new Camera();
-});
-};
-
-if (!PhoneGap.hasResource("device")) {
-	PhoneGap.addResource("device");
-
-/**
- * this represents the mobile device, and provides properties for inspecting the model, version, UUID of the
- * phone, etc.
- * @constructor
- */
-Device = function() 
-{
-    this.platform = null;
-    this.version  = null;
-    this.name     = null;
-    this.phonegap      = null;
-    this.uuid     = null;
-    try 
-	{      
-		this.platform = DeviceInfo.platform;
-		this.version  = DeviceInfo.version;
-		this.name     = DeviceInfo.name;
-		this.phonegap = DeviceInfo.gap;
-		this.uuid     = DeviceInfo.uuid;
-
-    } 
-	catch(e) 
-	{
-        // TODO: 
-    }
-	this.available = PhoneGap.available = this.uuid != null;
-}
-
-PhoneGap.addConstructor(function() {
-	if (typeof navigator.device === "undefined") {
-    	navigator.device = window.device = new Device();
-	}
-});
-};
-if (!PhoneGap.hasResource("capture")) {
-	PhoneGap.addResource("capture");
-/**
- * The CaptureError interface encapsulates all errors in the Capture API.
- */
-function CaptureError() {
-   this.code = null;
-};
-
-// Capture error codes
-CaptureError.CAPTURE_INTERNAL_ERR = 0;
-CaptureError.CAPTURE_APPLICATION_BUSY = 1;
-CaptureError.CAPTURE_INVALID_ARGUMENT = 2;
-CaptureError.CAPTURE_NO_MEDIA_FILES = 3;
-CaptureError.CAPTURE_NOT_SUPPORTED = 20;
-
-/**
- * The Capture interface exposes an interface to the camera and microphone of the hosting device.
- */
-function Capture() {
-	this.supportedAudioModes = [];
-	this.supportedImageModes = [];
-	this.supportedVideoModes = [];
-};
-
-/**
- * Launch audio recorder application for recording audio clip(s).
- * 
- * @param {Function} successCB
- * @param {Function} errorCB
- * @param {CaptureAudioOptions} options
- *
- * No audio recorder to launch for iOS - return CAPTURE_NOT_SUPPORTED
- */
-Capture.prototype.captureAudio = function(successCallback, errorCallback, options) {
-	/*if (errorCallback && typeof errorCallback === "function") {
-		errorCallback({
-				"code": CaptureError.CAPTURE_NOT_SUPPORTED
-			});
-	}*/
-    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.mediacapture", "captureAudio", [options]);
-};
-
-/**
- * Launch camera application for taking image(s).
- * 
- * @param {Function} successCB
- * @param {Function} errorCB
- * @param {CaptureImageOptions} options
- */
-Capture.prototype.captureImage = function(successCallback, errorCallback, options) {
-    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.mediacapture", "captureImage", [options]);
-};
-
-/**
- * Casts a PluginResult message property  (array of objects) to an array of MediaFile objects
- * (used in Objective-C)
- *
- * @param {PluginResult} pluginResult
- */
-Capture.prototype._castMediaFile = function(pluginResult) {
-    var mediaFiles = [];
-    var i;
-    for (i=0; i<pluginResult.message.length; i++) {
-        var mediaFile = new MediaFile();
-	    mediaFile.name = pluginResult.message[i].name;
-	    mediaFile.fullPath = pluginResult.message[i].fullPath;
-	    mediaFile.type = pluginResult.message[i].type;
-	    mediaFile.lastModifiedDate = pluginResult.message[i].lastModifiedDate;
-	    mediaFile.size = pluginResult.message[i].size;
-        mediaFiles.push(mediaFile);
-    }
-    pluginResult.message = mediaFiles;
-    return pluginResult;
-};
-
-/**
- * Launch device camera application for recording video(s).
- * 
- * @param {Function} successCB
- * @param {Function} errorCB
- * @param {CaptureVideoOptions} options
- */
-Capture.prototype.captureVideo = function(successCallback, errorCallback, options) {
-    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.mediacapture", "captureVideo", [options]);
-};
-
-/**
- * Encapsulates a set of parameters that the capture device supports.
- */
-function ConfigurationData() {
-    // The ASCII-encoded string in lower case representing the media type. 
-    this.type; 
-    // The height attribute represents height of the image or video in pixels. 
-    // In the case of a sound clip this attribute has value 0. 
-    this.height = 0;
-    // The width attribute represents width of the image or video in pixels. 
-    // In the case of a sound clip this attribute has value 0
-    this.width = 0;
-};
-
-/**
- * Encapsulates all image capture operation configuration options.
- */
-var CaptureImageOptions = function() {
-    // Upper limit of images user can take. Value must be equal or greater than 1.
-    this.limit = 1; 
-    // The selected image mode. Must match with one of the elements in supportedImageModes array.
-    this.mode = null; 
-};
-
-/**
- * Encapsulates all video capture operation configuration options.
- */
-var CaptureVideoOptions = function() {
-    // Upper limit of videos user can record. Value must be equal or greater than 1.
-    this.limit = 1;
-    // Maximum duration of a single video clip in seconds.
-    this.duration = 0;
-    // The selected video mode. Must match with one of the elements in supportedVideoModes array.
-    this.mode = null;
-};
-
-/**
- * Encapsulates all audio capture operation configuration options.
- */
-var CaptureAudioOptions = function() {
-    // Upper limit of sound clips user can record. Value must be equal or greater than 1.
-    this.limit = 1;
-    // Maximum duration of a single sound clip in seconds.
-    this.duration = 0;
-    // The selected audio mode. Must match with one of the elements in supportedAudioModes array.
-    this.mode = null;
-};
-
-/**
- * Represents a single file.
- * 
- * name {DOMString} name of the file, without path information
- * fullPath {DOMString} the full path of the file, including the name
- * type {DOMString} mime type
- * lastModifiedDate {Date} last modified date
- * size {Number} size of the file in bytes
- */
-function MediaFile(name, fullPath, type, lastModifiedDate, size) {
-    this.name = name || null;
-    this.fullPath = fullPath || null;
-    this.type = type || null;
-    this.lastModifiedDate = lastModifiedDate || null;
-    this.size = size || 0;
-}
-
-/**
- * Request capture format data for a specific file and type
- * 
- * @param {Function} successCB
- * @param {Function} errorCB
- */
-MediaFile.prototype.getFormatData = function(successCallback, errorCallback) {
-	if (typeof this.fullPath === "undefined" || this.fullPath === null) {
-		errorCallback({
-				"code": CaptureError.CAPTURE_INVALID_ARGUMENT
-			});
-	} else {
-    	PhoneGap.exec(successCallback, errorCallback, "com.phonegap.mediacapture", "getFormatData", [this.fullPath, this.type]);
-	}	
-};
-
-/**
- * MediaFileData encapsulates format information of a media file.
- * 
- * @param {DOMString} codecs
- * @param {long} bitrate
- * @param {long} height
- * @param {long} width
- * @param {float} duration
- */
-function MediaFileData(codecs, bitrate, height, width, duration) {
-    this.codecs = codecs || null;
-    this.bitrate = bitrate || 0;
-    this.height = height || 0;
-    this.width = width || 0;
-    this.duration = duration || 0;
-}
-
-PhoneGap.addConstructor(function() {
-    if (typeof navigator.device === "undefined") {
-        navigator.device = window.device = new Device();
-    }
-    if (typeof navigator.device.capture === "undefined") {
-        navigator.device.capture = window.device.capture = new Capture();
-    }
-});
-};
-if (!PhoneGap.hasResource("contact")) {
-	PhoneGap.addResource("contact");
-
-
-/**
-* Contains information about a single contact.
-* @param {DOMString} id unique identifier
-* @param {DOMString} displayName
-* @param {ContactName} name
-* @param {DOMString} nickname
-* @param {ContactField[]} phoneNumbers array of phone numbers
-* @param {ContactField[]} emails array of email addresses
-* @param {ContactAddress[]} addresses array of addresses
-* @param {ContactField[]} ims instant messaging user ids
-* @param {ContactOrganization[]} organizations
-* @param {DOMString} birthday contact's birthday
-* @param {DOMString} note user notes about contact
-* @param {ContactField[]} photos
-* @param {Array.<ContactField>} categories
-* @param {ContactField[]} urls contact's web sites
-*/
-var Contact = function(id, displayName, name, nickname, phoneNumbers, emails, addresses,
-    ims, organizations, birthday, note, photos, categories, urls) {
-    this.id = id || null;
-    this.displayName = displayName || null;
-    this.name = name || null; // ContactName
-    this.nickname = nickname || null;
-    this.phoneNumbers = phoneNumbers || null; // ContactField[]
-    this.emails = emails || null; // ContactField[]
-    this.addresses = addresses || null; // ContactAddress[]
-    this.ims = ims || null; // ContactField[]
-    this.organizations = organizations || null; // ContactOrganization[]
-    this.birthday = birthday || null; // JS Date
-    this.note = note || null;
-    this.photos = photos || null; // ContactField[]
-    this.categories = categories || null; 
-    this.urls = urls || null; // ContactField[]
-};
-
-/**
-* Converts Dates to milliseconds before sending to iOS
-*/
-Contact.prototype.convertDatesOut = function()
-{
-	var dates = new Array("birthday");
-	for (var i=0; i<dates.length; i++){
-		var value = this[dates[i]];
-		if (value){
-			if (!value instanceof Date){
-				try {
-					value = new Date(value);
-				} catch(exception){
-					value = null;
-				}
-			}
-			if (value instanceof Date){
-				value = value.valueOf();
-			}
-			this[dates[i]] = value;
-		}
-	}
-	
-};
-/**
-* Converts milliseconds to JS Date when returning from iOS
-*/
-Contact.prototype.convertDatesIn = function()
-{
-	var dates = new Array("birthday");
-	for (var i=0; i<dates.length; i++){
-		var value = this[dates[i]];
-		if (value){
-			try {
-				this[dates[i]] = new Date(parseFloat(value));
-			} catch (exception){
-				console.log("exception creating date");
-			}
-		}
-	}
-};
-/**
-* Removes contact from device storage.
-* @param successCB success callback
-* @param errorCB error callback (optional)
-*/
-Contact.prototype.remove = function(successCB, errorCB) {
-	if (this.id == null) {
-        var errorObj = new ContactError();
-        errorObj.code = ContactError.UNKNOWN_ERROR;
-        errorCB(errorObj);
-    }
-    else {
-        PhoneGap.exec(successCB, errorCB, "com.phonegap.contacts", "remove", [{ "contact": this}]);
-    }
-};
-/**
-* iOS ONLY
-* displays contact via iOS UI
-*	NOT part of W3C spec so no official documentation
-*
-* @param errorCB error callback
-* @param options object
-*	allowsEditing: boolean AS STRING
-*		"true" to allow editing the contact
-*		"false" (default) display contact
-*/
-Contact.prototype.display = function(errorCB, options) { 
-	if (this.id == null) {
-        if (typeof errorCB == "function") {
-        	var errorObj = new ContactError();
-        	errorObj.code = ContactError.UNKNOWN_ERROR;
-        	errorCB(errorObj);
-		}
-    }
-    else {
-        PhoneGap.exec(null, errorCB, "com.phonegap.contacts","displayContact", [this.id, options]);
-    }
-};
-
-/**
-* Creates a deep copy of this Contact.
-* With the contact ID set to null.
-* @return copy of this Contact
-*/
-Contact.prototype.clone = function() {
-    var clonedContact = PhoneGap.clone(this);
-    clonedContact.id = null;
-    // Loop through and clear out any id's in phones, emails, etc.
-    if (clonedContact.phoneNumbers) {
-    	for (i=0; i<clonedContact.phoneNumbers.length; i++) {
-    		clonedContact.phoneNumbers[i].id = null;
-    	}
-    }
-    if (clonedContact.emails) {
-    	for (i=0; i<clonedContact.emails.length; i++) {
-    		clonedContact.emails[i].id = null;
-    	}
-    }
-    if (clonedContact.addresses) {
-    	for (i=0; i<clonedContact.addresses.length; i++) {
-    		clonedContact.addresses[i].id = null;
-    	}
-    }
-    if (clonedContact.ims) {
-    	for (i=0; i<clonedContact.ims.length; i++) {
-    		clonedContact.ims[i].id = null;
-    	}
-    }
-    if (clonedContact.organizations) {
-    	for (i=0; i<clonedContact.organizations.length; i++) {
-    		clonedContact.organizations[i].id = null;
-    	}
-    }
-    if (clonedContact.photos) {
-    	for (i=0; i<clonedContact.photos.length; i++) {
-    		clonedContact.photos[i].id = null;
-    	}
-    }
-    if (clonedContact.urls) {
-    	for (i=0; i<clonedContact.urls.length; i++) {
-    		clonedContact.urls[i].id = null;
-    	}
-    }
-    return clonedContact;
-};
-
-/**
-* Persists contact to device storage.
-* @param successCB success callback
-* @param errorCB error callback - optional
-*/
-Contact.prototype.save = function(successCB, errorCB) {
-	// don't modify the original contact
-	var cloned = PhoneGap.clone(this);
-	cloned.convertDatesOut(); 
-	PhoneGap.exec(successCB, errorCB, "com.phonegap.contacts","save", [{"contact": cloned}]);
-};
-
-/**
-* Contact name.
-* @param formatted
-* @param familyName
-* @param givenName
-* @param middle
-* @param prefix
-* @param suffix
-*/
-var ContactName = function(formatted, familyName, givenName, middle, prefix, suffix) {
-    this.formatted = formatted != "undefined" ? formatted : null;
-    this.familyName = familyName != "undefined" ? familyName : null;
-    this.givenName = givenName != "undefined" ? givenName : null;
-    this.middleName = middle != "undefined" ? middle : null;
-    this.honorificPrefix = prefix != "undefined" ? prefix : null;
-    this.honorificSuffix = suffix != "undefined" ? suffix : null;
-};
-
-/**
-* Generic contact field.
-* @param type
-* @param value
-* @param pref
-* @param id
-*/
-var ContactField = function(type, value, pref, id) {
-    this.type = type != "undefined" ? type : null;
-    this.value = value != "undefined" ? value : null;
-    this.pref = pref != "undefined" ? pref : null;
-    this.id = id != "undefined" ? id : null;
-};
-
-/**
-* Contact address.
-* @param pref - boolean is primary / preferred address
-* @param type - string - work, home…..
-* @param formatted
-* @param streetAddress
-* @param locality
-* @param region
-* @param postalCode
-* @param country
-*/
-var ContactAddress = function(pref, type, formatted, streetAddress, locality, region, postalCode, country, id) {
-	this.pref = pref != "undefined" ? pref : null;
-	this.type = type != "undefined" ? type : null;
-    this.formatted = formatted != "undefined" ? formatted : null;
-    this.streetAddress = streetAddress != "undefined" ? streetAddress : null;
-    this.locality = locality != "undefined" ? locality : null;
-    this.region = region != "undefined" ? region : null;
-    this.postalCode = postalCode != "undefined" ? postalCode : null;
-    this.country = country != "undefined" ? country : null;
-    this.id = id != "undefined" ? id : null;
-};
-
-/**
-* Contact organization.
-* @param pref - boolean is primary / preferred address
-* @param type - string - work, home…..
-* @param name
-* @param dept
-* @param title
-*/
-var ContactOrganization = function(pref, type, name, dept, title) {
-	this.pref = pref != "undefined" ? pref : null;
-	this.type = type != "undefined" ? type : null;
-    this.name = name != "undefined" ? name : null;
-    this.department = dept != "undefined" ? dept : null;
-    this.title = title != "undefined" ? title : null;
-};
-
-/**
-* Contact account.
-* @param domain
-* @param username
-* @param userid
-*/
-/*var ContactAccount = function(domain, username, userid) {
-    this.domain = domain != "undefined" ? domain : null;
-    this.username = username != "undefined" ? username : null;
-    this.userid = userid != "undefined" ? userid : null;
-}*/
-
-/**
-* Represents a group of Contacts.
-*/
-var Contacts = function() {
-    this.inProgress = false;
-    this.records = new Array();
-};
-/**
-* Returns an array of Contacts matching the search criteria.
-* @param fields that should be searched
-* @param successCB success callback
-* @param errorCB error callback (optional)
-* @param {ContactFindOptions} options that can be applied to contact searching
-* @return array of Contacts matching search criteria
-*/
-Contacts.prototype.find = function(fields, successCB, errorCB, options) {
-	if (successCB === null) {
-        throw new TypeError("You must specify a success callback for the find command.");
-    }
-    if (fields === null || fields === "undefined" || fields.length === "undefined" || fields.length <= 0) {
-    	if (typeof errorCB === "function") {
-			errorCB({"code": ContactError.INVALID_ARGUMENT_ERROR});
-    	}
-    } else {
-		PhoneGap.exec(successCB, errorCB, "com.phonegap.contacts","search", [{"fields":fields, "findOptions":options}]);
-    }
-};
-/**
-* need to turn the array of JSON strings representing contact objects into actual objects
-* @param array of JSON strings with contact data
-* @return call results callback with array of Contact objects
-*  This function is called from objective C Contacts.search() method.
-*/
-Contacts.prototype._findCallback = function(pluginResult) {
-	var contacts = new Array();
-	try {
-		for (var i=0; i<pluginResult.message.length; i++) {
-			var newContact = navigator.contacts.create(pluginResult.message[i]); 
-			newContact.convertDatesIn();
-			contacts.push(newContact);
-		}
-		pluginResult.message = contacts;
-	} catch(e){
-			console.log("Error parsing contacts: " +e);
-	}
-	return pluginResult;
-}
-
-/**
-* need to turn the JSON string representing contact object into actual object
-* @param JSON string with contact data
-* Call stored results function with  Contact object
-*  This function is called from objective C Contacts remove and save methods
-*/
-Contacts.prototype._contactCallback = function(pluginResult)
-{
-	var newContact = null;
-	if (pluginResult.message){
-		try {
-			newContact = navigator.contacts.create(pluginResult.message);
-			newContact.convertDatesIn();
-		} catch(e){
-			console.log("Error parsing contact");
-		}
-	}
-	pluginResult.message = newContact;
-	return pluginResult;
-	
-};
-/** 
-* Need to return an error object rather than just a single error code
-* @param error code
-* Call optional error callback if found.
-* Called from objective c find, remove, and save methods on error.
-*/
-Contacts.prototype._errCallback = function(pluginResult)
-{
-	var errorObj = new ContactError();
-   	errorObj.code = pluginResult.message;
-	pluginResult.message = errorObj;
-	return pluginResult;
-};
-// iPhone only api to create a new contact via the GUI
-Contacts.prototype.newContactUI = function(successCallback) { 
-    PhoneGap.exec(successCallback, null, "com.phonegap.contacts","newContact", []);
-};
-// iPhone only api to select a contact via the GUI
-Contacts.prototype.chooseContact = function(successCallback, options) {
-    PhoneGap.exec(successCallback, null, "com.phonegap.contacts","chooseContact", options);
-};
-
-
-/**
-* This function creates a new contact, but it does not persist the contact
-* to device storage. To persist the contact to device storage, invoke
-* contact.save().
-* @param properties an object who's properties will be examined to create a new Contact
-* @returns new Contact object
-*/
-Contacts.prototype.create = function(properties) {
-    var i;
-    var contact = new Contact();
-    for (i in properties) {
-        if (contact[i] !== 'undefined') {
-            contact[i] = properties[i];
-        }
-    }
-    return contact;
-};
-
-/**
- * ContactFindOptions.
- * @param filter used to match contacts against
- * @param multiple boolean used to determine if more than one contact should be returned
- */
-var ContactFindOptions = function(filter, multiple, updatedSince) {
-    this.filter = filter || '';
-    this.multiple = multiple || false;
-};
-
-/**
- *  ContactError.
- *  An error code assigned by an implementation when an error has occurred
- */
-var ContactError = function() {
-    this.code=null;
-};
-
-/**
- * Error codes
- */
-ContactError.UNKNOWN_ERROR = 0;
-ContactError.INVALID_ARGUMENT_ERROR = 1;
-ContactError.TIMEOUT_ERROR = 2;
-ContactError.PENDING_OPERATION_ERROR = 3;
-ContactError.IO_ERROR = 4;
-ContactError.NOT_SUPPORTED_ERROR = 5;
-ContactError.PERMISSION_DENIED_ERROR = 20;
-
-/**
- * Add the contact interface into the browser.
- */
-PhoneGap.addConstructor(function() { 
-    if(typeof navigator.contacts == "undefined") {
-    	navigator.contacts = new Contacts();
-    }
-});
-};
-if (!PhoneGap.hasResource("file")) {
-	PhoneGap.addResource("file");
-
-/**
- * This class provides generic read and write access to the mobile device file system.
- * They are not used to read files from a server.
- */
-
-/**
- * This class provides some useful information about a file.
- * This is the fields returned when navigator.fileMgr.getFileProperties() 
- * is called.
- */
-FileProperties = function(filePath) {
-    this.filePath = filePath;
-    this.size = 0;
-    this.lastModifiedDate = null;
-}
-/**
- * Represents a single file.
- * 
- * name {DOMString} name of the file, without path information
- * fullPath {DOMString} the full path of the file, including the name
- * type {DOMString} mime type
- * lastModifiedDate {Date} last modified date
- * size {Number} size of the file in bytes
- */
-File = function(name, fullPath, type, lastModifiedDate, size) {
-	this.name = name || null;
-    this.fullPath = fullPath || null;
-	this.type = type || null;
-    this.lastModifiedDate = lastModifiedDate || null;
-    this.size = size || 0;
-}
-/**
- * Create an event object since we can't set target on DOM event.
- *
- * @param type
- * @param target
- *
- */
-File._createEvent = function(type, target) {
-    // Can't create event object, since we can't set target (its readonly)
-    //var evt = document.createEvent('Events');
-    //evt.initEvent("onload", false, false);
-    var evt = {"type": type};
-    evt.target = target;
-    return evt;
-};
-
-FileError = function() {
-   this.code = null;
-}
-
-// File error codes
-// Found in DOMException
-FileError.NOT_FOUND_ERR = 1;
-FileError.SECURITY_ERR = 2;
-FileError.ABORT_ERR = 3;
-
-// Added by this specification
-FileError.NOT_READABLE_ERR = 4;
-FileError.ENCODING_ERR = 5;
-FileError.NO_MODIFICATION_ALLOWED_ERR = 6;
-FileError.INVALID_STATE_ERR = 7;
-FileError.SYNTAX_ERR = 8;
-FileError.INVALID_MODIFICATION_ERR = 9;
-FileError.QUOTA_EXCEEDED_ERR = 10;
-FileError.TYPE_MISMATCH_ERR = 11;
-FileError.PATH_EXISTS_ERR = 12;
-
-//-----------------------------------------------------------------------------
-// File manager
-//-----------------------------------------------------------------------------
-
-FileMgr = function() {
-}
-
-FileMgr.prototype.testFileExists = function(fileName, successCallback, errorCallback) {
-    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "testFileExists", [fileName]);
-};
-
-FileMgr.prototype.testDirectoryExists = function(dirName, successCallback, errorCallback) {
-    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "testDirectoryExists", [dirName]);
-};
-
-FileMgr.prototype.getFreeDiskSpace = function(successCallback, errorCallback) {
-    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "getFreeDiskSpace", []);
-};
-
-FileMgr.prototype.write = function(fileName, data, position, successCallback, errorCallback) {
-    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "write", [fileName, data, position]);
-};
-
-FileMgr.prototype.truncate = function(fileName, size, successCallback, errorCallback) {
-    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "truncateFile", [fileName, size]);
-};
-
-FileMgr.prototype.readAsText = function(fileName, encoding, successCallback, errorCallback) {
-    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "readFile", [fileName, encoding]);
-};
-
-FileMgr.prototype.readAsDataURL = function(fileName, successCallback, errorCallback) {
-	PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "readAsDataURL", [fileName]);
-};
-
-PhoneGap.addConstructor(function() {
-    if (typeof navigator.fileMgr === "undefined") {
-        navigator.fileMgr = new FileMgr();
-    }
-});
-
-
-//-----------------------------------------------------------------------------
-// File Reader
-//-----------------------------------------------------------------------------
-
-/**
- * This class reads the mobile device file system.
- *
- */
-FileReader = function() {
-    this.fileName = "";
-
-    this.readyState = 0;
-
-    // File data
-    this.result = null;
-
-    // Error
-    this.error = null;
-
-    // Event handlers
-    this.onloadstart = null;    // When the read starts.
-    this.onprogress = null;     // While reading (and decoding) file or fileBlob data, and reporting partial file data (progess.loaded/progress.total)
-    this.onload = null;         // When the read has successfully completed.
-    this.onerror = null;        // When the read has failed (see errors).
-    this.onloadend = null;      // When the request has completed (either in success or failure).
-    this.onabort = null;        // When the read has been aborted. For instance, by invoking the abort() method.
-}
-
-// States
-FileReader.EMPTY = 0;
-FileReader.LOADING = 1;
-FileReader.DONE = 2;
-
-/**
- * Abort reading file.
- */
-FileReader.prototype.abort = function() {
-    var evt;
-    this.readyState = FileReader.DONE;
-    this.result = null;
-
-    // set error
-    var error = new FileError();
-    error.code = error.ABORT_ERR;
-    this.error = error;
-   
-    // If error callback
-    if (typeof this.onerror === "function") {
-        evt = File._createEvent("error", this);
-        this.onerror(evt);
-    }
-    // If abort callback
-    if (typeof this.onabort === "function") {
-        evt = File._createEvent("abort", this);
-        this.onabort(evt);
-    }
-    // If load end callback
-    if (typeof this.onloadend === "function") {
-        evt = File._createEvent("loadend", this);
-        this.onloadend(evt);
-    }
-};
-
-/**
- * Read text file.
- *
- * @param file          The name of the file
- * @param encoding      [Optional] (see http://www.iana.org/assignments/character-sets)
- */
-FileReader.prototype.readAsText = function(file, encoding) {
-    this.fileName = "";
-	if (typeof file.fullPath === "undefined") {
-		this.fileName = file;
-	} else {
-		this.fileName = file.fullPath;
-	}
-
-    // LOADING state
-    this.readyState = FileReader.LOADING;
-
-    // If loadstart callback
-    if (typeof this.onloadstart === "function") {
-        var evt = File._createEvent("loadstart", this);
-        this.onloadstart(evt);
-    }
-
-    // Default encoding is UTF-8
-    var enc = encoding ? encoding : "UTF-8";
-
-    var me = this;
-
-    // Read file
-    navigator.fileMgr.readAsText(this.fileName, enc,
-
-        // Success callback
-        function(r) {
-            var evt;
-
-            // If DONE (cancelled), then don't do anything
-            if (me.readyState === FileReader.DONE) {
-                return;
-            }
-
-            // Save result
-            me.result = decodeURIComponent(r);
-
-            // If onload callback
-            if (typeof me.onload === "function") {
-                evt = File._createEvent("load", me);
-                me.onload(evt);
-            }
-
-            // DONE state
-            me.readyState = FileReader.DONE;
-
-            // If onloadend callback
-            if (typeof me.onloadend === "function") {
-                evt = File._createEvent("loadend", me);
-                me.onloadend(evt);
-            }
-        },
-
-        // Error callback
-        function(e) {
-            var evt;
-            // If DONE (cancelled), then don't do anything
-            if (me.readyState === FileReader.DONE) {
-                return;
-            }
-
-            // Save error
-            me.error = e;
-
-            // If onerror callback
-            if (typeof me.onerror === "function") {
-                evt = File._createEvent("error", me);
-                me.onerror(evt);
-            }
-
-            // DONE state
-            me.readyState = FileReader.DONE;
-
-            // If onloadend callback
-            if (typeof me.onloadend === "function") {
-                evt = File._createEvent("loadend", me);
-                me.onloadend(evt);
-            }
-        }
-        );
-};
-
-
-/**
- * Read file and return data as a base64 encoded data url.
- * A data url is of the form:
- *      data:[<mediatype>][;base64],<data>
- *
- * @param file          {File} File object containing file properties
- */
-FileReader.prototype.readAsDataURL = function(file) {
-    this.fileName = "";
-    
-    if (typeof file.fullPath === "undefined") {
-        this.fileName = file;
-    } else {
-        this.fileName = file.fullPath;
-    }
-
-    // LOADING state
-    this.readyState = FileReader.LOADING;
-
-    // If loadstart callback
-    if (typeof this.onloadstart === "function") {
-        var evt = File._createEvent("loadstart", this);
-        this.onloadstart(evt);
-    }
-
-    var me = this;
-
-    // Read file
-    navigator.fileMgr.readAsDataURL(this.fileName,
-
-        // Success callback
-        function(r) {
-            var evt;
-
-            // If DONE (cancelled), then don't do anything
-            if (me.readyState === FileReader.DONE) {
-                return;
-            }
-
-            // Save result
-            me.result = r;
-
-            // If onload callback
-            if (typeof me.onload === "function") {
-                evt = File._createEvent("load", me);
-                me.onload(evt);
-            }
-
-            // DONE state
-            me.readyState = FileReader.DONE;
-
-            // If onloadend callback
-            if (typeof me.onloadend === "function") {
-                evt = File._createEvent("loadend", me);
-                me.onloadend(evt);
-            }
-        },
-
-        // Error callback
-        function(e) {
-            var evt;
-            // If DONE (cancelled), then don't do anything
-            if (me.readyState === FileReader.DONE) {
-                return;
-            }
-
-            // Save error
-            me.error = e;
-
-            // If onerror callback
-            if (typeof me.onerror === "function") {
-                evt = File._createEvent("error", me);
-                me.onerror(evt);
-            }
-
-            // DONE state
-            me.readyState = FileReader.DONE;
-
-            // If onloadend callback
-            if (typeof me.onloadend === "function") {
-                evt = File._createEvent("loadend", me);
-                me.onloadend(evt);
-            }
-        }
-        );
-};
-
-/**
- * Read file and return data as a binary data.
- *
- * @param file          The name of the file
- */
-FileReader.prototype.readAsBinaryString = function(file) {
-    // TODO - Can't return binary data to browser.
-    this.fileName = file;
-};
-
-/**
- * Read file and return data as a binary data.
- *
- * @param file          The name of the file
- */
-FileReader.prototype.readAsArrayBuffer = function(file) {
-    // TODO - Can't return binary data to browser.
-    this.fileName = file;
-};
-
-//-----------------------------------------------------------------------------
-// File Writer
-//-----------------------------------------------------------------------------
-
-/**
- * This class writes to the mobile device file system.
- *
-  @param file {File} a File object representing a file on the file system
-*/
-FileWriter = function(file) {
-    this.fileName = "";
-    this.length = 0;
-	if (file) {
-	    this.fileName = file.fullPath || file;
-	    this.length = file.size || 0;
-	}
-	
-	// default is to write at the beginning of the file
-    this.position = 0;
-    
-    this.readyState = 0; // EMPTY
-
-    this.result = null;
-
-    // Error
-    this.error = null;
-
-    // Event handlers
-    this.onwritestart = null;	// When writing starts
-    this.onprogress = null;		// While writing the file, and reporting partial file data
-    this.onwrite = null;		// When the write has successfully completed.
-    this.onwriteend = null;		// When the request has completed (either in success or failure).
-    this.onabort = null;		// When the write has been aborted. For instance, by invoking the abort() method.
-    this.onerror = null;		// When the write has failed (see errors).
-}
-
-// States
-FileWriter.INIT = 0;
-FileWriter.WRITING = 1;
-FileWriter.DONE = 2;
-
-/**
- * Abort writing file.
- */
-FileWriter.prototype.abort = function() {
-    // check for invalid state
-	if (this.readyState === FileWriter.DONE || this.readyState === FileWriter.INIT) {
-		throw FileError.INVALID_STATE_ERR;
-	} 
-
-    // set error
-    var error = new FileError(), evt;
-    error.code = error.ABORT_ERR;
-    this.error = error;
-    
-    // If error callback
-    if (typeof this.onerror === "function") {
-        evt = File._createEvent("error", this);
-        this.onerror(evt);
-    }
-    // If abort callback
-    if (typeof this.onabort === "function") {
-        evt = File._createEvent("abort", this);
-        this.onabort(evt);
-    }
-    
-    this.readyState = FileWriter.DONE;
-
-    // If write end callback
-    if (typeof this.onwriteend == "function") {
-        evt = File._createEvent("writeend", this);
-        this.onwriteend(evt);
-    }
-};
-
-/**
- * @Deprecated: use write instead
- * 
- * @param file to write the data to
- * @param text to be written
- * @param bAppend if true write to end of file, otherwise overwrite the file
- */
-FileWriter.prototype.writeAsText = function(file, text, bAppend) {
-	// Throw an exception if we are already writing a file
-	if (this.readyState === FileWriter.WRITING) {
-		throw FileError.INVALID_STATE_ERR;
-	}
-
-	if (bAppend !== true) {
-        bAppend = false; // for null values
-    }
-
-    this.fileName = file;
-
-    // WRITING state
-    this.readyState = FileWriter.WRITING;
-
-    var me = this;
-
-    // If onwritestart callback
-    if (typeof me.onwritestart === "function") {
-        var evt = File._createEvent("writestart", me);
-        me.onwritestart(evt);
-    }
-	
-	
-    // Write file 
-	navigator.fileMgr.writeAsText(file, text, bAppend,
-        // Success callback
-        function(r) {
-            var evt;
-
-            // If DONE (cancelled), then don't do anything
-            if (me.readyState === FileWriter.DONE) {
-                return;
-            }
-
-            // Save result
-            me.result = r;
-
-            // If onwrite callback
-            if (typeof me.onwrite === "function") {
-                evt = File._createEvent("write", me);
-                me.onwrite(evt);
-            }
-
-            // DONE state
-            me.readyState = FileWriter.DONE;
-
-            // If onwriteend callback
-            if (typeof me.onwriteend === "function") {
-                evt = File._createEvent("writeend", me);
-                me.onwriteend(evt);
-            }
-        },
-
-        // Error callback
-        function(e) {
-            var evt;
-
-            // If DONE (cancelled), then don't do anything
-            if (me.readyState === FileWriter.DONE) {
-                return;
-            }
-
-            // Save error
-            me.error = e;
-
-            // If onerror callback
-            if (typeof me.onerror === "function") {
-                evt = File._createEvent("error", me);
-                me.onerror(evt);
-            }
-
-            // DONE state
-            me.readyState = FileWriter.DONE;
-
-            // If onwriteend callback
-            if (typeof me.onwriteend === "function") {
-                evt = File._createEvent("writeend", me);
-                me.onwriteend(evt);
-            }
-        }
-    );
-};
-
-/**
- * Writes data to the file
- *  
- * @param text to be written
- */
-FileWriter.prototype.write = function(text) {
-	// Throw an exception if we are already writing a file
-	if (this.readyState === FileWriter.WRITING) {
-		throw FileError.INVALID_STATE_ERR;
-	}
-
-    // WRITING state
-    this.readyState = FileWriter.WRITING;
-
-    var me = this;
-
-    // If onwritestart callback
-    if (typeof me.onwritestart === "function") {
-        var evt = File._createEvent("writestart", me);
-        me.onwritestart(evt);
-    }
-
-    // Write file
-    navigator.fileMgr.write(this.fileName, text, this.position,
-
-        // Success callback
-        function(r) {
-            var evt;
-            // If DONE (cancelled), then don't do anything
-            if (me.readyState === FileWriter.DONE) {
-                return;
-            }
-
-            
-            // position always increases by bytes written because file would be extended
-            me.position += r;
-			// The length of the file is now where we are done writing.
-			me.length = me.position;
-            
-            // If onwrite callback
-            if (typeof me.onwrite === "function") {
-                evt = File._createEvent("write", me);
-                me.onwrite(evt);
-            }
-
-            // DONE state
-            me.readyState = FileWriter.DONE;
-
-            // If onwriteend callback
-            if (typeof me.onwriteend === "function") {
-                evt = File._createEvent("writeend", me);
-                me.onwriteend(evt);
-            }
-        },
-
-        // Error callback
-        function(e) {
-            var evt;
-
-            // If DONE (cancelled), then don't do anything
-            if (me.readyState === FileWriter.DONE) {
-                return;
-            }
-
-            // Save error
-            me.error = e;
-
-            // If onerror callback
-            if (typeof me.onerror === "function") {
-                evt = File._createEvent("error", me);
-                me.onerror(evt);
-            }
-
-            // DONE state
-            me.readyState = FileWriter.DONE;
-
-            // If onwriteend callback
-            if (typeof me.onwriteend === "function") {
-                evt = File._createEvent("writeend", me);
-                me.onwriteend(evt);
-            }
-        }
-        );
-
-};
-
-/** 
- * Moves the file pointer to the location specified.
- * 
- * If the offset is a negative number the position of the file 
- * pointer is rewound.  If the offset is greater than the file 
- * size the position is set to the end of the file.  
- * 
- * @param offset is the location to move the file pointer to.
- */
-FileWriter.prototype.seek = function(offset) {
-    // Throw an exception if we are already writing a file
-    if (this.readyState === FileWriter.WRITING) {
-        throw FileError.INVALID_STATE_ERR;
-    }
-
-    if (!offset) {
-        return;
-    }
-    
-    // See back from end of file.
-    if (offset < 0) {
-		this.position = Math.max(offset + this.length, 0);
-	}
-    // Offset is bigger then file size so set position 
-    // to the end of the file.
-	else if (offset > this.length) {
-		this.position = this.length;
-	}
-    // Offset is between 0 and file size so set the position
-    // to start writing.
-	else {
-		this.position = offset;
-	}	
-};
-
-/** 
- * Truncates the file to the size specified.
- * 
- * @param size to chop the file at.
- */
-FileWriter.prototype.truncate = function(size) {
-	// Throw an exception if we are already writing a file
-	if (this.readyState === FileWriter.WRITING) {
-		throw FileError.INVALID_STATE_ERR;
-	}
-	// what if no size specified? 
-
-    // WRITING state
-    this.readyState = FileWriter.WRITING;
-
-    var me = this;
-
-    // If onwritestart callback
-    if (typeof me.onwritestart === "function") {
-        var evt = File._createEvent("writestart", me);
-        me.onwritestart(evt);
-    }
-
-    // Write file
-    navigator.fileMgr.truncate(this.fileName, size,
-
-        // Success callback
-        function(r) {
-            var evt;
-            // If DONE (cancelled), then don't do anything
-            if (me.readyState === FileWriter.DONE) {
-                return;
-            }
-
-            // Update the length of the file
-            me.length = r;
-            me.position = Math.min(me.position, r);
-
-            // If onwrite callback
-            if (typeof me.onwrite === "function") {
-                evt = File._createEvent("write", me);
-                me.onwrite(evt);
-            }
-
-            // DONE state
-            me.readyState = FileWriter.DONE;
-
-            // If onwriteend callback
-            if (typeof me.onwriteend === "function") {
-                evt = File._createEvent("writeend", me);
-                me.onwriteend(evt);
-            }
-        },
-
-        // Error callback
-        function(e) {
-            var evt;
-            // If DONE (cancelled), then don't do anything
-            if (me.readyState === FileWriter.DONE) {
-                return;
-            }
-
-            // Save error
-            me.error = e;
-
-            // If onerror callback
-            if (typeof me.onerror === "function") {
-                evt = File._createEvent("error", me);
-                me.onerror(evt);
-            }
-
-            // DONE state
-            me.readyState = FileWriter.DONE;
-
-            // If onwriteend callback
-            if (typeof me.onwriteend === "function") {
-                evt = File._createEvent("writeend", me);
-                me.onwriteend(evt);
-            }
-        }
-    );
-};
-
-LocalFileSystem = function() {
-};
-
-// File error codes
-LocalFileSystem.TEMPORARY = 0;
-LocalFileSystem.PERSISTENT = 1;
-LocalFileSystem.RESOURCE = 2;
-LocalFileSystem.APPLICATION = 3;
-
-/**
- * Requests a filesystem in which to store application data.
- * 
- * @param {int} type of file system being requested
- * @param {Function} successCallback is called with the new FileSystem
- * @param {Function} errorCallback is called with a FileError
- */
-LocalFileSystem.prototype.requestFileSystem = function(type, size, successCallback, errorCallback) {
-	if (type < 0 || type > 3) {
-		if (typeof errorCallback == "function") {
-			errorCallback({
-				"code": FileError.SYNTAX_ERR
-			});
-		}
-	}
-	else {
-		PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "requestFileSystem", [type, size]);
-	}
-};
-
-/**
- * 
- * @param {DOMString} uri referring to a local file in a filesystem
- * @param {Function} successCallback is called with the new entry
- * @param {Function} errorCallback is called with a FileError
- */
-LocalFileSystem.prototype.resolveLocalFileSystemURI = function(uri, successCallback, errorCallback) {
-    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "resolveLocalFileSystemURI", [uri]);
-};
-
-/**
-* This function  is required as we need to convert raw 
-* JSON objects into concrete File and Directory objects.  
-* 
-* @param a JSON Objects that need to be converted to DirectoryEntry or FileEntry objects.
-* @returns an entry 
-*/
-LocalFileSystem.prototype._castFS = function(pluginResult) {
-    var entry = null;
-    entry = new DirectoryEntry();
-    entry.isDirectory = pluginResult.message.root.isDirectory;
-    entry.isFile = pluginResult.message.root.isFile;
-    entry.name = pluginResult.message.root.name;
-    entry.fullPath = pluginResult.message.root.fullPath;
-    pluginResult.message.root = entry;
-    return pluginResult;    
-}
-
-LocalFileSystem.prototype._castEntry = function(pluginResult) {
-    var entry = null;
-    if (pluginResult.message.isDirectory) {
-        entry = new DirectoryEntry();
-    }
-    else if (pluginResult.message.isFile) {
-		entry = new FileEntry();
-    }
-    entry.isDirectory = pluginResult.message.isDirectory;
-    entry.isFile = pluginResult.message.isFile;
-    entry.name = pluginResult.message.name;
-    entry.fullPath = pluginResult.message.fullPath;
-    pluginResult.message = entry;
-    return pluginResult;    
-}
-
-LocalFileSystem.prototype._castEntries = function(pluginResult) {
-    var entries = pluginResult.message;
-	var retVal = []; 
-	for (i=0; i<entries.length; i++) {
-		retVal.push(window.localFileSystem._createEntry(entries[i]));
-	}
-    pluginResult.message = retVal;
-    return pluginResult;    
-}
-
-LocalFileSystem.prototype._createEntry = function(castMe) {
-	var entry = null;
-    if (castMe.isDirectory) {
-        entry = new DirectoryEntry();
-    }
-    else if (castMe.isFile) {
-        entry = new FileEntry();
-    }
-    entry.isDirectory = castMe.isDirectory;
-    entry.isFile = castMe.isFile;
-    entry.name = castMe.name;
-    entry.fullPath = castMe.fullPath;
-    return entry;    
-
-}
-
-LocalFileSystem.prototype._castDate = function(pluginResult) {
-	if (pluginResult.message.modificationTime) {
-		var metadataObj = new Metadata();
-		
-	    metadataObj.modificationTime = new Date(pluginResult.message.modificationTime);
-	    pluginResult.message = metadataObj;
-	}
-	else if (pluginResult.message.lastModifiedDate) {
-		var file = new File();
-        file.size = pluginResult.message.size;
-        file.type = pluginResult.message.type;
-        file.name = pluginResult.message.name;
-        file.fullPath = pluginResult.message.fullPath;
-		file.lastModifiedDate = new Date(pluginResult.message.lastModifiedDate);
-	    pluginResult.message = file;		
-	}
-
-    return pluginResult;	
-}
-LocalFileSystem.prototype._castError = function(pluginResult) {
-	var fileError = new FileError();
-	fileError.code = pluginResult.message;
-	pluginResult.message = fileError;
-	return pluginResult;
-}
-
-/**
- * Information about the state of the file or directory
- * 
- * {Date} modificationTime (readonly)
- */
-Metadata = function() {
-    this.modificationTime=null;
-};
-
-/**
- * Supplies arguments to methods that lookup or create files and directories
- * 
- * @param {boolean} create file or directory if it doesn't exist 
- * @param {boolean} exclusive if true the command will fail if the file or directory exists
- */
-Flags = function(create, exclusive) {
-    this.create = create || false;
-    this.exclusive = exclusive || false;
-};
-
-/**
- * An interface representing a file system
- * 
- * {DOMString} name the unique name of the file system (readonly)
- * {DirectoryEntry} root directory of the file system (readonly)
- */
-FileSystem = function() {
-    this.name = null;
-    this.root = null;
-};
-
-/**
- * An interface representing a directory on the file system.
- * 
- * {boolean} isFile always false (readonly)
- * {boolean} isDirectory always true (readonly)
- * {DOMString} name of the directory, excluding the path leading to it (readonly)
- * {DOMString} fullPath the absolute full path to the directory (readonly)
- * {FileSystem} filesystem on which the directory resides (readonly)
- */
-DirectoryEntry = function() {
-    this.isFile = false;
-    this.isDirectory = true;
-    this.name = null;
-    this.fullPath = null;
-    this.filesystem = null;
-};
-
-/**
- * Copies a directory to a new location
- * 
- * @param {DirectoryEntry} parent the directory to which to copy the entry
- * @param {DOMString} newName the new name of the entry, defaults to the current name
- * @param {Function} successCallback is called with the new entry
- * @param {Function} errorCallback is called with a FileError
- */
-DirectoryEntry.prototype.copyTo = function(parent, newName, successCallback, errorCallback) {
-    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "copyTo", [this.fullPath, parent, newName]);
-};
-
-/**
- * Looks up the metadata of the entry
- * 
- * @param {Function} successCallback is called with a Metadata object
- * @param {Function} errorCallback is called with a FileError
- */
-DirectoryEntry.prototype.getMetadata = function(successCallback, errorCallback) {
-    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "getMetadata", [this.fullPath]);
-};
-
-/**
- * Gets the parent of the entry
- * 
- * @param {Function} successCallback is called with a parent entry
- * @param {Function} errorCallback is called with a FileError
- */
-DirectoryEntry.prototype.getParent = function(successCallback, errorCallback) {
-    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "getParent", [this.fullPath]);
-};
-
-/**
- * Moves a directory to a new location
- * 
- * @param {DirectoryEntry} parent the directory to which to move the entry
- * @param {DOMString} newName the new name of the entry, defaults to the current name
- * @param {Function} successCallback is called with the new entry
- * @param {Function} errorCallback is called with a FileError
- */
-DirectoryEntry.prototype.moveTo = function(parent, newName, successCallback, errorCallback) {
-    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "moveTo", [this.fullPath, parent, newName]);
-};
-
-/**
- * Removes the entry
- * 
- * @param {Function} successCallback is called with no parameters
- * @param {Function} errorCallback is called with a FileError
- */
-DirectoryEntry.prototype.remove = function(successCallback, errorCallback) {
-    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "remove", [this.fullPath]);
-};
-
-/**
- * Returns a URI that can be used to identify this entry.
- * 
- * @param {DOMString} mimeType for a FileEntry, the mime type to be used to interpret the file, when loaded through this URI.
- * @param {Function} successCallback is called with the new entry
- * @param {Function} errorCallback is called with a FileError
- */
-DirectoryEntry.prototype.toURI = function(mimeType, successCallback, errorCallback) {
-    return "file://localhost" + this.fullPath;
-    //PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "toURI", [this.fullPath, mimeType]);
-};
-
-/**
- * Creates a new DirectoryReader to read entries from this directory
- */
-DirectoryEntry.prototype.createReader = function(successCallback, errorCallback) {
-    return new DirectoryReader(this.fullPath);
-};
-
-/**
- * Creates or looks up a directory
- * 
- * @param {DOMString} path either a relative or absolute path from this directory in which to look up or create a directory
- * @param {Flags} options to create or excluively create the directory
- * @param {Function} successCallback is called with the new entry
- * @param {Function} errorCallback is called with a FileError
- */
-DirectoryEntry.prototype.getDirectory = function(path, options, successCallback, errorCallback) {
-    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "getDirectory", [this.fullPath, path, options]);
-};
-
-/**
- * Creates or looks up a file
- * 
- * @param {DOMString} path either a relative or absolute path from this directory in which to look up or create a file
- * @param {Flags} options to create or excluively create the file
- * @param {Function} successCallback is called with the new entry
- * @param {Function} errorCallback is called with a FileError
- */
-DirectoryEntry.prototype.getFile = function(path, options, successCallback, errorCallback) {
-    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "getFile", [this.fullPath, path, options]);
-};
-
-/**
- * Deletes a directory and all of it's contents
- * 
- * @param {Function} successCallback is called with no parameters
- * @param {Function} errorCallback is called with a FileError
- */
-DirectoryEntry.prototype.removeRecursively = function(successCallback, errorCallback) {
-    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "removeRecursively", [this.fullPath]);
-};
-
-/**
- * An interface that lists the files and directories in a directory.
- */
-DirectoryReader = function(fullPath){
-	this.fullPath = fullPath || null;    
-};
-
-/**
- * Returns a list of entries from a directory.
- * 
- * @param {Function} successCallback is called with a list of entries
- * @param {Function} errorCallback is called with a FileError
- */
-DirectoryReader.prototype.readEntries = function(successCallback, errorCallback) {
-    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "readEntries", [this.fullPath]);
-}
- 
-/**
- * An interface representing a directory on the file system.
- * 
- * {boolean} isFile always true (readonly)
- * {boolean} isDirectory always false (readonly)
- * {DOMString} name of the file, excluding the path leading to it (readonly)
- * {DOMString} fullPath the absolute full path to the file (readonly)
- * {FileSystem} filesystem on which the directory resides (readonly)
- */
-FileEntry = function() {
-    this.isFile = true;
-    this.isDirectory = false;
-    this.name = null;
-    this.fullPath = null;
-    this.filesystem = null;
-};
-
-/**
- * Copies a file to a new location
- * 
- * @param {DirectoryEntry} parent the directory to which to copy the entry
- * @param {DOMString} newName the new name of the entry, defaults to the current name
- * @param {Function} successCallback is called with the new entry
- * @param {Function} errorCallback is called with a FileError
- */
-FileEntry.prototype.copyTo = function(parent, newName, successCallback, errorCallback) {
-    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "copyTo", [this.fullPath, parent, newName]);
-};
-
-/**
- * Looks up the metadata of the entry
- * 
- * @param {Function} successCallback is called with a Metadata object
- * @param {Function} errorCallback is called with a FileError
- */
-FileEntry.prototype.getMetadata = function(successCallback, errorCallback) {
-    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "getMetadata", [this.fullPath]);
-};
-
-/**
- * Gets the parent of the entry
- * 
- * @param {Function} successCallback is called with a parent entry
- * @param {Function} errorCallback is called with a FileError
- */
-FileEntry.prototype.getParent = function(successCallback, errorCallback) {
-    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "getParent", [this.fullPath]);
-};
-
-/**
- * Moves a directory to a new location
- * 
- * @param {DirectoryEntry} parent the directory to which to move the entry
- * @param {DOMString} newName the new name of the entry, defaults to the current name
- * @param {Function} successCallback is called with the new entry
- * @param {Function} errorCallback is called with a FileError
- */
-FileEntry.prototype.moveTo = function(parent, newName, successCallback, errorCallback) {
-    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "moveTo", [this.fullPath, parent, newName]);
-};
-
-/**
- * Removes the entry
- * 
- * @param {Function} successCallback is called with no parameters
- * @param {Function} errorCallback is called with a FileError
- */
-FileEntry.prototype.remove = function(successCallback, errorCallback) {
-    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "remove", [this.fullPath]);
-};
-
-/**
- * Returns a URI that can be used to identify this entry.
- * 
- * @param {DOMString} mimeType for a FileEntry, the mime type to be used to interpret the file, when loaded through this URI.
- * @param {Function} successCallback is called with the new entry
- * @param {Function} errorCallback is called with a FileError
- */
-FileEntry.prototype.toURI = function(mimeType, successCallback, errorCallback) {
-    return "file://localhost" + this.fullPath;
-    //PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "toURI", [this.fullPath, mimeType]);
-};
-
-/**
- * Creates a new FileWriter associated with the file that this FileEntry represents.
- * 
- * @param {Function} successCallback is called with the new FileWriter
- * @param {Function} errorCallback is called with a FileError
- */
-FileEntry.prototype.createWriter = function(successCallback, errorCallback) {
-	this.file(function(filePointer) {	
-		var writer = new FileWriter(filePointer);
-		if (writer.fileName == null || writer.fileName == "") {
-			if (typeof errorCallback == "function") {
-				errorCallback({
-					"code": FileError.INVALID_STATE_ERR
-				});
-		}
-		}
-		if (typeof successCallback == "function") {
-			successCallback(writer);
-		}       
-	}, errorCallback);
-};
-
-/**
- * Returns a File that represents the current state of the file that this FileEntry represents.
- * 
- * @param {Function} successCallback is called with the new File object
- * @param {Function} errorCallback is called with a FileError
- */
-FileEntry.prototype.file = function(successCallback, errorCallback) {
-    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.file", "getFileMetadata", [this.fullPath]);
-};
-
-/**
- * Add the FileSystem interface into the browser.
- */
-PhoneGap.addConstructor(function() {
-	var pgLocalFileSystem = new LocalFileSystem();
-	// Needed for cast methods
-    if(typeof window.localFileSystem == "undefined") window.localFileSystem  = pgLocalFileSystem;
-    if(typeof window.requestFileSystem == "undefined") window.requestFileSystem  = pgLocalFileSystem.requestFileSystem;
-    if(typeof window.resolveLocalFileSystemURI == "undefined") window.resolveLocalFileSystemURI = pgLocalFileSystem.resolveLocalFileSystemURI;
-});
-};
-
-
-
-
-/*
- * Copyright (c) 2011, Matt Kane
- */
-
-if (!PhoneGap.hasResource("filetransfer")) {
-	PhoneGap.addResource("filetransfer");
-
-/**
- * FileTransfer uploads a file to a remote server.
- */
-FileTransfer = function() {}
-
-/**
- * FileUploadResult
- */
-FileUploadResult = function() {
-    this.bytesSent = 0;
-    this.responseCode = null;
-    this.response = null;
-}
-
-/**
- * FileTransferError
- */
-FileTransferError = function(errorCode) {
-    this.code = errorCode || null;
-}
-
-FileTransferError.FILE_NOT_FOUND_ERR = 1;
-FileTransferError.INVALID_URL_ERR = 2;
-FileTransferError.CONNECTION_ERR = 3;
-
-/**
-* Given an absolute file path, uploads a file on the device to a remote server 
-* using a multipart HTTP request.
-* @param filePath {String}           Full path of the file on the device
-* @param server {String}             URL of the server to receive the file
-* @param successCallback (Function}  Callback to be invoked when upload has completed
-* @param errorCallback {Function}    Callback to be invoked upon error
-* @param options {FileUploadOptions} Optional parameters such as file name and mimetype           
-*/
-FileTransfer.prototype.upload = function(filePath, server, successCallback, errorCallback, options) {
-	if(!options.params) {
-		options.params = {};
-	}
-	options.filePath = filePath;
-	options.server = server;
-	if(!options.fileKey) {
-		options.fileKey = 'file';
-	}
-	if(!options.fileName) {
-		options.fileName = 'image.jpg';
-	}
-	if(!options.mimeType) {
-		options.mimeType = 'image/jpeg';
-	}
-	
-	// successCallback required
-	if (typeof successCallback != "function") {
-        console.log("FileTransfer Error: successCallback is not a function");
-        return;
-    }
-
-
-    // errorCallback optional
-    if (errorCallback && (typeof errorCallback != "function")) {
-        console.log("FileTransfer Error: errorCallback is not a function");
-        return;
-    }
-	
-    PhoneGap.exec(successCallback, errorCallback, 'com.phonegap.filetransfer', 'upload', [options]);
-};
-
-FileTransfer.prototype._castTransferError = function(pluginResult) {
-	var fileError = new FileTransferError(pluginResult.message);
-	//fileError.code = pluginResult.message;
-	pluginResult.message = fileError;
-	return pluginResult;
-}
-
-FileTransfer.prototype._castUploadResult = function(pluginResult) {
-	var result = new FileUploadResult();
-	result.bytesSent = pluginResult.message.bytesSent;
-	result.responseCode = pluginResult.message.responseCode;
-	result.response = decodeURIComponent(pluginResult.message.response);
-	pluginResult.message = result;
-	return pluginResult;
-}
-
-/**
- * Downloads a file form a given URL and saves it to the specified directory.
- * @param source {String}          URL of the server to receive the file
- * @param target {String}         Full path of the file on the device
- * @param successCallback (Function}  Callback to be invoked when upload has completed
- * @param errorCallback {Function}    Callback to be invoked upon error
- */
-FileTransfer.prototype.download = function(source, target, successCallback, errorCallback) {
-	PhoneGap.exec(successCallback, errorCallback, 'com.phonegap.filetransfer', 'download', [source, target]);
-};
-
-/**
- * Options to customize the HTTP request used to upload files.
- * @param fileKey {String}   Name of file request parameter.
- * @param fileName {String}  Filename to be used by the server. Defaults to image.jpg.
- * @param mimeType {String}  Mimetype of the uploaded file. Defaults to image/jpeg.
- * @param params {Object}    Object with key: value params to send to the server.
- */
-FileUploadOptions = function(fileKey, fileName, mimeType, params) {
-    this.fileKey = fileKey || null;
-    this.fileName = fileName || null;
-    this.mimeType = mimeType || null;
-    this.params = params || null;
-}
-
-
-PhoneGap.addConstructor(function() {
-    if (typeof navigator.fileTransfer == "undefined") navigator.fileTransfer = new FileTransfer();
-});
-};
-if (!PhoneGap.hasResource("geolocation")) {
-	PhoneGap.addResource("geolocation");
-
-/**
- * This class provides access to device GPS data.
- * @constructor
- */
-Geolocation = function() {
-    // The last known GPS position.
-    this.lastPosition = null;
-    this.listener = null;
-    this.timeoutTimerId = 0;
-
-};
-
-
-/**
- * Asynchronously aquires the current position.
- * @param {Function} successCallback The function to call when the position
- * data is available
- * @param {Function} errorCallback The function to call when there is an error 
- * getting the position data.
- * @param {PositionOptions} options The options for getting the position data
- * such as timeout.
- * PositionOptions.forcePrompt:Bool default false, 
- * - tells iPhone to prompt the user to turn on location services.
- * - may cause your app to exit while the user is sent to the Settings app
- * PositionOptions.distanceFilter:double aka Number
- * - used to represent a distance in meters.
-PositionOptions
-{
-   desiredAccuracy:Number
-   - a distance in meters 
-		< 10   = best accuracy  ( Default value )
-		< 100  = Nearest Ten Meters
-		< 1000 = Nearest Hundred Meters
-		< 3000 = Accuracy Kilometers
-		3000+  = Accuracy 3 Kilometers
-		
-	forcePrompt:Boolean default false ( iPhone Only! )
-    - tells iPhone to prompt the user to turn on location services.
-	- may cause your app to exit while the user is sent to the Settings app
-	
-	distanceFilter:Number
-	- The minimum distance (measured in meters) a device must move laterally before an update event is generated.
-	- measured relative to the previously delivered location
-	- default value: null ( all movements will be reported )
-	
-}
-
- */
- 
-Geolocation.prototype.getCurrentPosition = function(successCallback, errorCallback, options) 
-{
-    // create an always valid local success callback
-    var win = successCallback;
-    if (!win || typeof(win) != 'function')
-    {
-        win = function(position) {};
-    }
-    
-    // create an always valid local error callback
-    var fail = errorCallback;
-    if (!fail || typeof(fail) != 'function')
-    {
-        fail = function(positionError) {};
-    }	
-
-    var self = this;
-    var totalTime = 0;
-	var timeoutTimerId;
-	
-	// set params to our default values
-	var params = new PositionOptions();
-	
-    if (options) 
-    {
-        if (options.maximumAge) 
-        {
-            // special case here if we have a cached value that is younger than maximumAge
-            if(this.lastPosition)
-            {
-                var now = new Date().getTime();
-                if((now - this.lastPosition.timestamp) < options.maximumAge)
-                {
-                    win(this.lastPosition); // send cached position immediately 
-                    return;                 // Note, execution stops here -jm
-                }
-            }
-            params.maximumAge = options.maximumAge;
-        }
-        if (options.enableHighAccuracy) 
-        {
-            params.enableHighAccuracy = (options.enableHighAccuracy == true); // make sure it's truthy
-        }
-        if (options.timeout) 
-        {
-            params.timeout = options.timeout;
-        }
-    }
-
-    var successListener = win;
-    var failListener = fail;
-    if (!this.locationRunning)
-    {
-        successListener = function(position)
-        { 
-            win(position);
-            self.stop();
-        };
-        errorListener = function(positionError)
-        { 
-            fail(positionError);
-            self.stop();
-        };
-    }
-    
-    this.listener = {"success":successListener,"fail":failListener};
-    this.start(params);
-	
-	var onTimeout = function()
-	{
-	    self.setError(new PositionError(PositionError.TIMEOUT,"Geolocation Error: Timeout."));
-	};
-
-    clearTimeout(this.timeoutTimerId);
-    this.timeoutTimerId = setTimeout(onTimeout, params.timeout); 
-};
-
-/**
- * Asynchronously aquires the position repeatedly at a given interval.
- * @param {Function} successCallback The function to call each time the position
- * data is available
- * @param {Function} errorCallback The function to call when there is an error 
- * getting the position data.
- * @param {PositionOptions} options The options for getting the position data
- * such as timeout and the frequency of the watch.
- */
-Geolocation.prototype.watchPosition = function(successCallback, errorCallback, options) {
-	// Invoke the appropriate callback with a new Position object every time the implementation 
-	// determines that the position of the hosting device has changed. 
-
-	var self = this; // those == this & that
-	
-	var params = new PositionOptions();
-
-    if(options)
-    {
-        if (options.maximumAge) {
-            params.maximumAge = options.maximumAge;
-        }
-        if (options.enableHighAccuracy) {
-            params.enableHighAccuracy = options.enableHighAccuracy;
-        }
-        if (options.timeout) {
-            params.timeout = options.timeout;
-        }
-    }
-
-	var that = this;
-    var lastPos = that.lastPosition? that.lastPosition.clone() : null;
-    
-	var intervalFunction = function() {
-        
-		var filterFun = function(position) {
-            if (lastPos == null || !position.equals(lastPos)) {
-                // only call the success callback when there is a change in position, per W3C
-                successCallback(position);
-            }
-            
-            // clone the new position, save it as our last position (internal var)
-            lastPos = position.clone();
-        };
-		
-		that.getCurrentPosition(filterFun, errorCallback, params);
-	};
-	
-    // Retrieve location immediately and schedule next retrieval afterwards
-	intervalFunction();
-	
-	return setInterval(intervalFunction, params.timeout);
-};
-
-
-/**
- * Clears the specified position watch.
- * @param {String} watchId The ID of the watch returned from #watchPosition.
- */
-Geolocation.prototype.clearWatch = function(watchId) {
-	clearInterval(watchId);
-};
-
-/**
- * Called by the geolocation framework when the current location is found.
- * @param {PositionOptions} position The current position.
- */
-Geolocation.prototype.setLocation = function(position) 
-{
-    var _position = new Position(position.coords, position.timestamp);
-
-    if(this.timeoutTimerId)
-    {
-        clearTimeout(this.timeoutTimerId);
-        this.timeoutTimerId = 0;
-    }
-    
-	this.lastError = null;
-    this.lastPosition = _position;
-    
-    if(this.listener && typeof(this.listener.success) == 'function')
-    {
-        this.listener.success(_position);
-    }
-    
-    this.listener = null;
-};
-
-/**
- * Called by the geolocation framework when an error occurs while looking up the current position.
- * @param {String} message The text of the error message.
- */
-Geolocation.prototype.setError = function(error) 
-{
-	var _error = new PositionError(error.code, error.message);
-
-    this.locationRunning = false
-	
-    if(this.timeoutTimerId)
-    {
-        clearTimeout(this.timeoutTimerId);
-        this.timeoutTimerId = 0;
-    }
-    
-    this.lastError = _error;
-    // call error handlers directly
-    if(this.listener && typeof(this.listener.fail) == 'function')
-    {
-        this.listener.fail(_error);
-    }
-    this.listener = null;
-
-};
-
-Geolocation.prototype.start = function(positionOptions) 
-{
-    PhoneGap.exec(null, null, "com.phonegap.geolocation", "startLocation", [positionOptions]);
-    this.locationRunning = true
-
-};
-
-Geolocation.prototype.stop = function() 
-{
-    PhoneGap.exec(null, null, "com.phonegap.geolocation", "stopLocation", []);
-    this.locationRunning = false
-};
-
-
-PhoneGap.addConstructor(function() 
-{
-    if (typeof navigator._geo == "undefined") 
-    {
-        // replace origObj's functions ( listed in funkList ) with the same method name on proxyObj
-        // this is a workaround to prevent UIWebView/MobileSafari default implementation of GeoLocation
-        // because it includes the full page path as the title of the alert prompt
-        var __proxyObj = function (origObj,proxyObj,funkList)
-        {
-            var replaceFunk = function(org,proxy,fName)
-            { 
-                org[fName] = function()
-                { 
-                   return proxy[fName].apply(proxy,arguments); 
-                }; 
-            };
-
-            for(var v in funkList) { replaceFunk(origObj,proxyObj,funkList[v]);}
-        }
-        navigator._geo = new Geolocation();
-        __proxyObj(navigator.geolocation, navigator._geo,
-                 ["setLocation","getCurrentPosition","watchPosition",
-                  "clearWatch","setError","start","stop"]);
-
-    }
-
-});
-};
-if (!PhoneGap.hasResource("compass")) {
-	PhoneGap.addResource("compass");
-
-CompassError = function(){
-   this.code = null;
-};
-
-// Capture error codes
-CompassError.COMPASS_INTERNAL_ERR = 0;
-CompassError.COMPASS_NOT_SUPPORTED = 20;
-
-CompassHeading = function() {
-	this.magneticHeading = null;
-	this.trueHeading = null;
-	this.headingAccuracy = null;
-	this.timestamp = null;
-}	
-/**
- * This class provides access to device Compass data.
- * @constructor
- */
-Compass = function() {
-    /**
-     * List of compass watch timers
-     */
-    this.timers = {};
-};
-
-/**
- * Asynchronously acquires the current heading.
- * @param {Function} successCallback The function to call when the heading
- * data is available
- * @param {Function} errorCallback The function to call when there is an error 
- * getting the heading data.
- * @param {PositionOptions} options The options for getting the heading data (not used).
- */
-Compass.prototype.getCurrentHeading = function(successCallback, errorCallback, options) {
- 	// successCallback required
-    if (typeof successCallback !== "function") {
-        console.log("Compass Error: successCallback is not a function");
-        return;
-    }
-
-    // errorCallback optional
-    if (errorCallback && (typeof errorCallback !== "function")) {
-        console.log("Compass Error: errorCallback is not a function");
-        return;
-    }
-
-    // Get heading
-    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.geolocation", "getCurrentHeading", []);
-};
-
-/**
- * Asynchronously acquires the heading repeatedly at a given interval.
- * @param {Function} successCallback The function to call each time the heading
- * data is available
- * @param {Function} errorCallback The function to call when there is an error 
- * getting the heading data.
- * @param {HeadingOptions} options The options for getting the heading data
- * such as timeout and the frequency of the watch.
- */
-Compass.prototype.watchHeading= function(successCallback, errorCallback, options) 
-{
-	// Default interval (100 msec)
-    var frequency = (options !== undefined) ? options.frequency : 100;
-
-    // successCallback required
-    if (typeof successCallback !== "function") {
-        console.log("Compass Error: successCallback is not a function");
-        return;
-    }
-
-    // errorCallback optional
-    if (errorCallback && (typeof errorCallback !== "function")) {
-        console.log("Compass Error: errorCallback is not a function");
-        return;
-    }
-
-    // Start watch timer to get headings
-    var id = PhoneGap.createUUID();
-    navigator.compass.timers[id] = setInterval(
-        function() {
-            PhoneGap.exec(successCallback, errorCallback, "com.phonegap.geolocation", "getCurrentHeading", [{repeats: 1}]);
-        }, frequency);
-
-    return id;
-};
-
-
-/**
- * Clears the specified heading watch.
- * @param {String} watchId The ID of the watch returned from #watchHeading.
- */
-Compass.prototype.clearWatch = function(id) 
-{
-	// Stop javascript timer & remove from timer list
-    if (id && navigator.compass.timers[id]) {
-        clearInterval(navigator.compass.timers[id]);
-        delete navigator.compass.timers[id];
-    }
-    if (navigator.compass.timers.length == 0) {
-    	// stop the 
-    	PhoneGap.exec(null, null, "com.phonegap.geolocation", "stopHeading", []);
-    }
-};
-
-/** iOS only
- * Asynchronously fires when the heading changes from the last reading.  The amount of distance 
- * required to trigger the event is specified in the filter paramter.
- * @param {Function} successCallback The function to call each time the heading
- * data is available
- * @param {Function} errorCallback The function to call when there is an error 
- * getting the heading data.
- * @param {HeadingOptions} options The options for getting the heading data
- * 			@param {filter} number of degrees change to trigger a callback with heading data (float)
- *
- * In iOS this function is more efficient than calling watchHeading  with a frequency for updates.
- * Only one watchHeadingFilter can be in effect at one time.  If a watchHeadingFilter is in effect, calling
- * getCurrentHeading or watchHeading will use the existing filter value for specifying heading change. 
-  */
-Compass.prototype.watchHeadingFilter = function(successCallback, errorCallback, options) 
-{
- 
- 	if (options === undefined || options.filter === undefined) {
- 		console.log("Compass Error:  options.filter not specified");
- 		return;
- 	}
-
-    // successCallback required
-    if (typeof successCallback !== "function") {
-        console.log("Compass Error: successCallback is not a function");
-        return;
-    }
-
-    // errorCallback optional
-    if (errorCallback && (typeof errorCallback !== "function")) {
-        console.log("Compass Error: errorCallback is not a function");
-        return;
-    }
-    PhoneGap.exec(successCallback, errorCallback, "com.phonegap.geolocation", "watchHeadingFilter", [options]);
-}
-Compass.prototype.clearWatchFilter = function() 
-{
-    	PhoneGap.exec(null, null, "com.phonegap.geolocation", "stopHeading", []);
-};
-
-PhoneGap.addConstructor(function() 
-{
-    if (typeof navigator.compass == "undefined") 
-    {
-        navigator.compass = new Compass();
-    }
-});
-};
-
-if (!PhoneGap.hasResource("media")) {
-	PhoneGap.addResource("media");
-
-/**
- * List of media objects.
- * PRIVATE
- */
-PhoneGap.mediaObjects = {};
-
-/**
- * Object that receives native callbacks.
- * PRIVATE
- */
-PhoneGap.Media = function() {};
-
-
-/**
- * Get the media object.
- * PRIVATE
- *
- * @param id            The media object id (string)
- */
-PhoneGap.Media.getMediaObject = function(id) {
-    return PhoneGap.mediaObjects[id];
-};
-
-/**
- * Audio has status update.
- * PRIVATE
- *
- * @param id            The media object id (string)
- * @param msg           The status message (int)
- * @param value        The status code (int)
- */
-PhoneGap.Media.onStatus = function(id, msg, value) {
-    var media = PhoneGap.mediaObjects[id];
-
-    // If state update
-    if (msg == Media.MEDIA_STATE) {
-        if (value == Media.MEDIA_STOPPED) {
-            if (media.successCallback) {
-                media.successCallback();
-            }
-        }
-        if (media.statusCallback) {
-            media.statusCallback(value);
-        }
-    }
-    else if (msg == Media.MEDIA_DURATION) {
-        media._duration = value;
-    }
-    else if (msg == Media.MEDIA_ERROR) {
-        if (media.errorCallback) {
-            media.errorCallback(value);
-        }
-    }
-    else if (msg == Media.MEDIA_POSITION) {
-    	media._position = value;
-    }
-};
-
-/**
- * This class provides access to the device media, interfaces to both sound and video
- *
- * @param src                   The file name or url to play
- * @param successCallback       The callback to be called when the file is done playing or recording.
- *                                  successCallback() - OPTIONAL
- * @param errorCallback         The callback to be called if there is an error.
- *                                  errorCallback(int errorCode) - OPTIONAL
- * @param statusCallback        The callback to be called when media status has changed.
- *                                  statusCallback(int statusCode) - OPTIONAL
- * @param positionCallback      The callback to be called when media position has changed.
- *                                  positionCallback(long position) - OPTIONAL
- */
-Media = function(src, successCallback, errorCallback, statusCallback, positionCallback) {
-
-    // successCallback optional
-    if (successCallback && (typeof successCallback != "function")) {
-        console.log("Media Error: successCallback is not a function");
-        return;
-    }
-
-    // errorCallback optional
-    if (errorCallback && (typeof errorCallback != "function")) {
-        console.log("Media Error: errorCallback is not a function");
-        return;
-    }
-
-    // statusCallback optional
-    if (statusCallback && (typeof statusCallback != "function")) {
-        console.log("Media Error: statusCallback is not a function");
-        return;
-    }
-
-    // positionCallback optional -- NOT SUPPORTED
-    if (positionCallback && (typeof positionCallback != "function")) {
-        console.log("Media Error: positionCallback is not a function");
-        return;
-    }
-
-    this.id = PhoneGap.createUUID();
-    PhoneGap.mediaObjects[this.id] = this;
-    this.src = src;
-    this.successCallback = successCallback;
-    this.errorCallback = errorCallback;
-    this.statusCallback = statusCallback;
-    this.positionCallback = positionCallback;
-    this._duration = -1;
-    this._position = -1;
-};
-
-// Media messages
-Media.MEDIA_STATE = 1;
-Media.MEDIA_DURATION = 2;
-Media.MEDIA_POSITION = 3;
-Media.MEDIA_ERROR = 9;
-
-// Media states
-Media.MEDIA_NONE = 0;
-Media.MEDIA_STARTING = 1;
-Media.MEDIA_RUNNING = 2;
-Media.MEDIA_PAUSED = 3;
-Media.MEDIA_STOPPED = 4;
-Media.MEDIA_MSG = ["None", "Starting", "Running", "Paused", "Stopped"];
-
-// TODO: Will MediaError be used?
-/**
- * This class contains information about any Media errors.
- * @constructor
- */
-
-MediaError = function() {
-	this.code = null,
-	this.message = "";
-}
-
-MediaError.MEDIA_ERR_ABORTED        = 1;
-MediaError.MEDIA_ERR_NETWORK        = 2;
-MediaError.MEDIA_ERR_DECODE         = 3;
-MediaError.MEDIA_ERR_NONE_SUPPORTED = 4;
-
-/**
- * Start or resume playing audio file.
- */
-Media.prototype.play = function(options) {
-    PhoneGap.exec(null, null, "com.phonegap.media", "play", [this.id, this.src, options]);
-};
-
-/**
- * Stop playing audio file.
- */
-Media.prototype.stop = function() {
-    PhoneGap.exec(null, null, "com.phonegap.media","stop", [this.id, this.src]);
-};
-
-/**
- * Pause playing audio file.
- */
-Media.prototype.pause = function() {
-    PhoneGap.exec(null, null, "com.phonegap.media","pause", [this.id, this.src]);
-};
-
-/**
- * Seek or jump to a new time in the track..
- */
-Media.prototype.seekTo = function(milliseconds) {
-    PhoneGap.exec(null, null, "com.phonegap.media", "seekTo", [this.id, this.src, milliseconds]);
-};
-
-/**
- * Get duration of an audio file.
- * The duration is only set for audio that is playing, paused or stopped.
- *
- * @return      duration or -1 if not known.
- */
-Media.prototype.getDuration = function() {
-    return this._duration;
-};
-
-/**
- * Get position of audio.
- *
- * @return
- */
-Media.prototype.getCurrentPosition = function(successCB, errorCB) {
-	var errCallback = (errorCB == undefined || errorCB == null) ? null : errorCB;
-    PhoneGap.exec(successCB, errorCB, "com.phonegap.media", "getCurrentPosition", [this.id, this.src]);
-};
-
-// iOS only.  prepare/load the audio in preparation for playing
-Media.prototype.prepare = function(successCB, errorCB) {
-	PhoneGap.exec(successCB, errorCB, "com.phonegap.media", "prepare", [this.id, this.src]);
-}
-
-/**
- * Start recording audio file.
- */
-Media.prototype.startRecord = function() {
-    PhoneGap.exec(null, null, "com.phonegap.media","startAudioRecord", [this.id, this.src]);
-};
-
-/**
- * Stop recording audio file.
- */
-Media.prototype.stopRecord = function() {
-    PhoneGap.exec(null, null, "com.phonegap.media","stopAudioRecord", [this.id, this.src]);
-};
-
-/**
- * Release the resources.
- */
-Media.prototype.release = function() {
-    PhoneGap.exec(null, null, "com.phonegap.media","release", [this.id, this.src]);
-};
-
-};
-if (!PhoneGap.hasResource("notification")) {
-	PhoneGap.addResource("notification");
-
-/**
- * This class provides access to notifications on the device.
- */
-Notification = function() {
-};
-
-/**
- * Open a native alert dialog, with a customizable title and button text.
- *
- * @param {String} message              Message to print in the body of the alert
- * @param {Function} completeCallback   The callback that is called when user clicks on a button.
- * @param {String} title                Title of the alert dialog (default: Alert)
- * @param {String} buttonLabel          Label of the close button (default: OK)
- */
-Notification.prototype.alert = function(message, completeCallback, title, buttonLabel) {
-    var _title = title;
-    if (title == null || typeof title === 'undefined') {
-        _title = "Alert";
-    }
-    var _buttonLabel = (buttonLabel || "OK");
-    PhoneGap.exec(completeCallback, null, "com.phonegap.notification", "alert", [message,{ "title": _title, "buttonLabel": _buttonLabel}]);
-};
-
-/**
- * Open a native confirm dialog, with a customizable title and button text.
- * The result that the user selects is returned to the result callback.
- *
- * @param {String} message              Message to print in the body of the alert
- * @param {Function} resultCallback     The callback that is called when user clicks on a button.
- * @param {String} title                Title of the alert dialog (default: Confirm)
- * @param {String} buttonLabels         Comma separated list of the labels of the buttons (default: 'OK,Cancel')
- */
-Notification.prototype.confirm = function(message, resultCallback, title, buttonLabels) {
-    var _title = (title || "Confirm");
-    var _buttonLabels = (buttonLabels || "OK,Cancel");
-    this.alert(message, resultCallback, _title, _buttonLabels);
-};
-
-/**
- * Causes the device to blink a status LED.
- * @param {Integer} count The number of blinks.
- * @param {String} colour The colour of the light.
- */
-Notification.prototype.blink = function(count, colour) {
-// NOT IMPLEMENTED	
-};
-
-Notification.prototype.vibrate = function(mills) {
-	PhoneGap.exec(null, null, "com.phonegap.notification", "vibrate", []);
-};
-
-Notification.prototype.beep = function(count, volume) {
-	// No Volume yet for the iphone interface
-	// We can use a canned beep sound and call that
-	new Media('beep.wav').play();
-};
-
-PhoneGap.addConstructor(function() {
-    if (typeof navigator.notification == "undefined") navigator.notification = new Notification();
-});
-};
-if (!PhoneGap.hasResource("orientation")) {
-	PhoneGap.addResource("orientation");
-
-/**
- * This class provides access to the device orientation.
- * @constructor
- */
-Orientation  = function() {
-	/**
-	 * The current orientation, or null if the orientation hasn't changed yet.
-	 */
-	this.currentOrientation = null;
-}
-
-/**
- * Set the current orientation of the phone.  This is called from the device automatically.
- * 
- * When the orientation is changed, the DOMEvent \c orientationChanged is dispatched against
- * the document element.  The event has the property \c orientation which can be used to retrieve
- * the device's current orientation, in addition to the \c Orientation.currentOrientation class property.
- *
- * @param {Number} orientation The orientation to be set
- */
-Orientation.prototype.setOrientation = function(orientation) {
-    Orientation.currentOrientation = orientation;
-    var e = document.createEvent('Events');
-    e.initEvent('orientationChanged', 'false', 'false');
-    e.orientation = orientation;
-    document.dispatchEvent(e);
-};
-
-/**
- * Asynchronously aquires the current orientation.
- * @param {Function} successCallback The function to call when the orientation
- * is known.
- * @param {Function} errorCallback The function to call when there is an error 
- * getting the orientation.
- */
-Orientation.prototype.getCurrentOrientation = function(successCallback, errorCallback) {
-	// If the position is available then call success
-	// If the position is not available then call error
-};
-
-/**
- * Asynchronously aquires the orientation repeatedly at a given interval.
- * @param {Function} successCallback The function to call each time the orientation
- * data is available.
- * @param {Function} errorCallback The function to call when there is an error 
- * getting the orientation data.
- */
-Orientation.prototype.watchOrientation = function(successCallback, errorCallback) {
-	// Invoke the appropriate callback with a new Position object every time the implementation 
-	// determines that the position of the hosting device has changed. 
-	this.getCurrentPosition(successCallback, errorCallback);
-	return setInterval(function() {
-		navigator.orientation.getCurrentOrientation(successCallback, errorCallback);
-	}, 10000);
-};
-
-/**
- * Clears the specified orientation watch.
- * @param {String} watchId The ID of the watch returned from #watchOrientation.
- */
-Orientation.prototype.clearWatch = function(watchId) {
-	clearInterval(watchId);
-};
-
-Orientation.install = function()
-{
-    if (typeof navigator.orientation == "undefined") { 
-		navigator.orientation = new Orientation();
-	}
-	
-	var windowDispatchAvailable = !(window.dispatchEvent === undefined); // undefined in iOS 3.x
-	if (windowDispatchAvailable) {
-		return;
-	} 
-	
-	// the code below is to capture window.add/remove eventListener calls on window
-	// this is for iOS 3.x where listening on 'orientationchange' events don't work on document/window (don't know why)
-	// however, window.onorientationchange DOES handle the 'orientationchange' event (sent through document), so...
-	// then we multiplex the window.onorientationchange event (consequently - people shouldn't overwrite this)
-	
-	var self = this;
-	var orientationchangeEvent = 'orientationchange';
-	var newOrientationchangeEvent = 'orientationchange_pg';
-	
-	// backup original `window.addEventListener`, `window.removeEventListener`
-    var _addEventListener = window.addEventListener;
-    var _removeEventListener = window.removeEventListener;
-
-	window.onorientationchange = function() {
-		PhoneGap.fireEvent(newOrientationchangeEvent, window);
-	}
-	
-    // override `window.addEventListener`
-    window.addEventListener = function() {
-        if (arguments[0] === orientationchangeEvent) {
-			arguments[0] = newOrientationchangeEvent; 
-		} 
-													
-		if (!windowDispatchAvailable) {
-			return document.addEventListener.apply(this, arguments);
-		} else {
-			return _addEventListener.apply(this, arguments);
-		}
-    };	
-
-    // override `window.removeEventListener'
-    window.removeEventListener = function() {
-        if (arguments[0] === orientationchangeEvent) {
-			arguments[0] = newOrientationchangeEvent; 
-		} 
-		
-		if (!windowDispatchAvailable) {
-			return document.removeEventListener.apply(this, arguments);
-		} else {
-			return _removeEventListener.apply(this, arguments);
-		}
-    };	
-};
-
-PhoneGap.addConstructor(Orientation.install);
-
-};
-if (!PhoneGap.hasResource("sms")) {
-	PhoneGap.addResource("sms");
-
-/**
- * This class provides access to the device SMS functionality.
- * @constructor
- */
-Sms = function() {
-
-}
-
-/**
- * Sends an SMS message.
- * @param {Integer} number The phone number to send the message to.
- * @param {String} message The contents of the SMS message to send.
- * @param {Function} successCallback The function to call when the SMS message is sent.
- * @param {Function} errorCallback The function to call when there is an error sending the SMS message.
- * @param {PositionOptions} options The options for accessing the GPS location such as timeout and accuracy.
- */
-Sms.prototype.send = function(number, message, successCallback, errorCallback, options) {
-	// not sure why this is here when it does nothing????
-};
-
-PhoneGap.addConstructor(function() {
-    if (typeof navigator.sms == "undefined") navigator.sms = new Sms();
-});
-};
-if (!PhoneGap.hasResource("telephony")) {
-	PhoneGap.addResource("telephony");
-
-/**
- * This class provides access to the telephony features of the device.
- * @constructor
- */
-Telephony = function() {
-	
-}
-
-/**
- * Calls the specifed number.
- * @param {Integer} number The number to be called.
- */
-Telephony.prototype.call = function(number) {
-	// not sure why this is here when it does nothing????
-};
-
-PhoneGap.addConstructor(function() {
-    if (typeof navigator.telephony == "undefined") navigator.telephony = new Telephony();
-});
-};if (!PhoneGap.hasResource("network")) {
-	PhoneGap.addResource("network");
-
-// //////////////////////////////////////////////////////////////////
-
-Connection = function() {
-	/*
-	 * One of the connection constants below.
-	 */
-	this.type = Connection.UNKNOWN;
-
-	/* initialize from the extended DeviceInfo properties */
-    try {      
-		this.type	= DeviceInfo.connection.type;
-    } 
-	catch(e) {
-    }
-};
-
-Connection.UNKNOWN = "unknown"; // Unknown connection type
-Connection.ETHERNET = "ethernet";
-Connection.WIFI = "wifi";
-Connection.CELL_2G = "2g"; // the default for iOS, for any cellular connection
-Connection.CELL_3G = "3g";
-Connection.CELL_4G = "4g";
-Connection.NONE = "none"; // NO connectivity
-
-
-PhoneGap.addConstructor(function() {
-    if (typeof navigator.network == "undefined") navigator.network = {};
-    if (typeof navigator.network.connection == "undefined") navigator.network.connection = new Connection();
-});
-
-};if (!PhoneGap.hasResource("splashscreen")) {
-	PhoneGap.addResource("splashscreen");
-
-/**
- * This class provides access to the splashscreen
- */
-SplashScreen = function() {
-};
-
-SplashScreen.prototype.show = function() {
-    PhoneGap.exec(null, null, "com.phonegap.splashscreen", "show", []);
-};
-
-SplashScreen.prototype.hide = function() {
-    PhoneGap.exec(null, null, "com.phonegap.splashscreen", "hide", []);
-};
-
-PhoneGap.addConstructor(function() {
-    if (typeof navigator.splashscreen == "undefined") navigator.splashscreen = new SplashScreen();
-});
-
-};
diff --git a/apps/files_odfviewer/src/webodf/programs/nativeQtClient/CMakeLists.txt b/apps/files_odfviewer/src/webodf/programs/nativeQtClient/CMakeLists.txt
deleted file mode 100644
index f317693e3d..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/nativeQtClient/CMakeLists.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-include(${QT_USE_FILE})
-include_directories(${CMAKE_CURRENT_BINARY_DIR} ${QT_QTCORE_INCLUDE_DIR})
-QT4_WRAP_CPP(NATIVEQTCLIENT_MOC
-    odfview.h
-    ../qtjsruntime/nativeio.h
-    ../qtjsruntime/nam.h
-)
-file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/application.qrc
-        "<RCC><qresource prefix='/'>")
-foreach(FILE ${HTML5UIFILES} ${LIBJSFILES} index.html scripts.js webodf.css)
-    file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/application.qrc
-        "<file>www/${FILE}</file>\n")
-endforeach(FILE ${HTML5UIFILES})
-file(APPEND ${CMAKE_CURRENT_BINARY_DIR}/application.qrc
-        "</qresource></RCC>")
-COPY_FILES(NATIVEDEPS ${CMAKE_SOURCE_DIR}/programs/touchui
-    ${CMAKE_CURRENT_BINARY_DIR}/www ${HTML5UIFILES})
-COPY_FILES(NATIVEDEPS ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_CURRENT_BINARY_DIR}/www scripts.js)
-COPY_FILES(NATIVEDEPS ${CMAKE_SOURCE_DIR}/programs/touchui
-    ${CMAKE_CURRENT_BINARY_DIR}/www index.html)
-COPY_FILES(NATIVEDEPS ${CMAKE_SOURCE_DIR}/webodf
-    ${CMAKE_CURRENT_BINARY_DIR}/www webodf.css)
-COPY_FILES(NATIVEDEPS ${CMAKE_SOURCE_DIR}/webodf
-    ${CMAKE_CURRENT_BINARY_DIR}/www ${LIBJSFILES})
-QT4_ADD_RESOURCES(NATIVEQTCLIENT_RES
-    ${CMAKE_CURRENT_BINARY_DIR}/application.qrc)
-
-add_custom_target(nativeQtClientDepencencies ALL DEPENDS ${NATIVEDEPS})
-
-add_executable(nativeQtClient
-    main.cpp
-    odfview.cpp
-    ../qtjsruntime/nativeio.cpp
-    odfpage.cpp ${NATIVEQTCLIENT_MOC} ${NATIVEQTCLIENT_UI}
-    ${NATIVEQTCLIENT_RES})
-
-target_link_libraries(nativeQtClient ${QT_LIBRARIES})
-add_dependencies(nativeQtClient nativeQtClientDepencencies)
diff --git a/apps/files_odfviewer/src/webodf/programs/nativeQtClient/README b/apps/files_odfviewer/src/webodf/programs/nativeQtClient/README
deleted file mode 100644
index 4860fa1b00..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/nativeQtClient/README
+++ /dev/null
@@ -1 +0,0 @@
-This is a small app that can show ODF documents using mainly javascript. Some functions that are not fast in browers are provided in C++ and it gives the ability to open files on the file system.
diff --git a/apps/files_odfviewer/src/webodf/programs/nativeQtClient/application.qrc b/apps/files_odfviewer/src/webodf/programs/nativeQtClient/application.qrc
deleted file mode 100644
index 5010cdb8a8..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/nativeQtClient/application.qrc
+++ /dev/null
@@ -1,18 +0,0 @@
-<RCC>
-    <qresource prefix="/">
-        <file>www/app/app.js</file>
-        <file>www/app/controller/Files.js</file>
-        <file>www/app/model/FileSystem.js</file>
-        <file>www/app/store/FileStore.js</file>
-        <file>www/app/views/FileDetail.js</file>
-        <file>www/app/views/FilesList.js</file>
-        <file>www/app/views/OdfView.js</file>
-        <file>www/app/views/Viewport.js</file>
-        <file>www/index.html</file>
-        <file>www/scripts.js</file>
-        <file>www/sencha-touch.css</file>
-        <file>www/sencha-touch.js</file>
-        <file>www/webodf.css</file>
-        <file>www/webodf.js</file>
-    </qresource>
-</RCC>
diff --git a/apps/files_odfviewer/src/webodf/programs/nativeQtClient/main.cpp b/apps/files_odfviewer/src/webodf/programs/nativeQtClient/main.cpp
deleted file mode 100644
index 62e5fa18be..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/nativeQtClient/main.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
-#include "odfview.h"
-#include <QtGui/QApplication>
-#include <QtCore/QTimer>
-
-int main(int argc, char *argv[]) {
-    QApplication a(argc, argv);
-    OdfView view;
-    view.show();
-    return a.exec();
-}
diff --git a/apps/files_odfviewer/src/webodf/programs/nativeQtClient/mainwindow.cpp b/apps/files_odfviewer/src/webodf/programs/nativeQtClient/mainwindow.cpp
deleted file mode 100644
index 861014399e..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/nativeQtClient/mainwindow.cpp
+++ /dev/null
@@ -1,173 +0,0 @@
-#include "mainwindow.h"
-#include "ui_mainwindow.h"
-#include "odfview.h"
-#include <QtGui/QDockWidget>
-#include <QtGui/QFileDialog>
-#include <QtGui/QFileSystemModel>
-#include <QtGui/QLineEdit>
-#include <QtGui/QMdiArea>
-#include <QtGui/QTreeView>
-#include <QtGui/QVBoxLayout>
-#include <QtCore/QDir>
-#include <QtCore/QSettings>
-
-MainWindow::MainWindow(QWidget *parent) :
-    QMainWindow(parent),
-    ui(new Ui::MainWindow)
-{
-    ui->setupUi(this);
-
-    createActions();
-    createToolBars();
-
-    QCoreApplication::setOrganizationName("KO");
-    //QCoreApplication::setOrganizationDomain("example.com");
-    QCoreApplication::setApplicationName("Odf Viewer");
-
-    QSettings settings;
-
-    setWindowTitle(tr("Odf Viewer"));
-    setUnifiedTitleAndToolBarOnMac(true);
-
-    QStringList odfNameFilter;
-    odfNameFilter << "*.odt" << "*.ods" << "*.odp";
-    dirmodel = new QFileSystemModel(this);
-    dirmodel->setNameFilters(odfNameFilter);
-    dirmodel->setFilter(QDir::AllDirs|QDir::AllEntries|QDir::NoDotAndDotDot);
-    dirview = new QTreeView(this);
-    dirview->setModel(dirmodel);
-    dirview->setHeaderHidden(true);
-    dirview->setAnimated(true);
-    for (int i = 1; i < dirmodel->columnCount(); i++) {
-        dirview->setColumnHidden(i, true);
-    }
-    QString rootpath = settings.value("rootpath", QDir::homePath()).toString();
-    dirmodel->setRootPath(rootpath);
-    const QModelIndex rootindex = dirmodel->index(rootpath);
-    dirview->setRootIndex(rootindex);
-    QLineEdit *dirPath = new QLineEdit(rootpath, this);
-    dirdock = new QDockWidget(this);
-    QWidget *w = new QWidget(dirdock);
-    QVBoxLayout *layout = new QVBoxLayout(w);
-    dirdock->setWidget(w);
-    layout->addWidget(dirPath);
-    layout->addWidget(dirview);
-    addDockWidget(Qt::LeftDockWidgetArea, dirdock);
-
-    connect(dirview, SIGNAL(clicked(QModelIndex)), this, SLOT(loadOdf(QModelIndex)));
-    connect(dirPath, SIGNAL(textChanged(QString)), this, SLOT(setPath(QString)));
-}
-
-MainWindow::~MainWindow()
-{
-    delete ui;
-}
-
-void
-MainWindow::openFile(const QString& path)
-{
-    QMdiSubWindow* w = findMdiChild(path);
-    OdfView* v = (w) ?dynamic_cast<OdfView*>(w->widget()) :0;
-    if (v == 0) {
-        w = ui->mdiArea->activeSubWindow();
-        v = (w) ?dynamic_cast<OdfView*>(w->widget()) :0;
-    }
-    if (v == 0) {
-        v = new OdfView(this);
-        v->showMaximized();
-        w = ui->mdiArea->addSubWindow(v);
-        w->showMaximized();
-    }
-    ui->mdiArea->setActiveSubWindow(w);
-    v->loadFile(path);
-}
-
-void MainWindow::changeEvent(QEvent *e)
-{
-    QMainWindow::changeEvent(e);
-    switch (e->type()) {
-    case QEvent::LanguageChange:
-        ui->retranslateUi(this);
-        break;
-    default:
-        break;
-    }
-}
-void MainWindow::open()
-{
-    QString fileName = QFileDialog::getOpenFileName(this, QString(), QString(),
-        tr("Office Files (*.odt *.odp *.ods)"));
-    if (!fileName.isEmpty()) {
-        QMdiSubWindow *existing = findMdiChild(fileName);
-        if (existing) {
-            ui->mdiArea->setActiveSubWindow(existing);
-            return;
-        }
-
-        OdfView *child = createOdfView();
-        if (child->loadFile(fileName)) {
-            statusBar()->showMessage(tr("File loaded"), 2000);
-            child->showMaximized();
-        } else {
-            child->close();
-        }
-    }
-}
-void MainWindow::createActions()
-{
-    //openAct = new QAction(QIcon(":/images/open.png"), tr("&Open..."), this);
-    openAct = new QAction(tr("&Open..."), this);
-    openAct->setShortcuts(QKeySequence::Open);
-    openAct->setStatusTip(tr("Open an existing file"));
-    connect(openAct, SIGNAL(triggered()), this, SLOT(open()));
-}
-void MainWindow::createToolBars()
-{
-    fileToolBar = addToolBar(tr("File"));
-    fileToolBar->addAction(openAct);
-}
-QMdiSubWindow *MainWindow::findMdiChild(const QString &fileName)
-{
-    QString canonicalFilePath = QFileInfo(fileName).canonicalFilePath();
-
-    foreach (QMdiSubWindow *window, ui->mdiArea->subWindowList()) {
-        OdfView *odfView = qobject_cast<OdfView *>(window->widget());
-        if (odfView->currentFile() == canonicalFilePath)
-            return window;
-    }
-    return 0;
-}
-
-OdfView *MainWindow::createOdfView()
-{
-    OdfView *view = new OdfView(this);
-    ui->mdiArea->addSubWindow(view);
-    return view;
-}
-
-void
-MainWindow::loadOdf(const QModelIndex& index) {
-    if (dirmodel->isDir(index)) {
-        if (dirview->isExpanded(index)) {
-            dirview->collapse(index);
-        } else {
-            dirview->expand(index);
-        }
-        return;
-    }
-    QString path = dirmodel->filePath(index);
-    path = QFileInfo(path).canonicalFilePath();
-    openFile(path);
-}
-
-void MainWindow::setPath(const QString &path)
-{
-    dirmodel->setRootPath(path);
-    const QModelIndex rootindex = dirmodel->index(path);
-    dirview->setRootIndex(rootindex);
-    QSettings settings;
-    settings.setValue("rootpath", path);
-}
-
-
-
diff --git a/apps/files_odfviewer/src/webodf/programs/nativeQtClient/mainwindow.h b/apps/files_odfviewer/src/webodf/programs/nativeQtClient/mainwindow.h
deleted file mode 100644
index d0bc822d03..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/nativeQtClient/mainwindow.h
+++ /dev/null
@@ -1,46 +0,0 @@
-#ifndef MAINWINDOW_H
-#define MAINWINDOW_H
-
-#include <QtGui/QMainWindow>
-#include <QtGui/QMdiSubWindow>
-
-namespace Ui {
-    class MainWindow;
-}
-
-class OdfView;
-class QFileSystemModel;
-class QTreeView;
-class QDockWidget;
-class QModelIndex;
-
-class MainWindow : public QMainWindow {
-    Q_OBJECT
-public:
-    MainWindow(QWidget *parent = 0);
-    ~MainWindow();
-    void openFile(const QString& path);
-
-private slots:
-    void open();
-    OdfView *createOdfView();
-    void loadOdf(const QModelIndex& index);
-    void setPath(const QString &path);
-
-private:
-    QMdiSubWindow *findMdiChild(const QString &fileName);
-    void createActions();
-    void createToolBars();
-    QToolBar *fileToolBar;
-    QAction *openAct;
-protected:
-    void changeEvent(QEvent *e);
-
-private:
-    Ui::MainWindow *ui;
-    QFileSystemModel* dirmodel;
-    QTreeView* dirview;
-    QDockWidget* dirdock;
-};
-
-#endif // MAINWINDOW_H
diff --git a/apps/files_odfviewer/src/webodf/programs/nativeQtClient/mainwindow.ui b/apps/files_odfviewer/src/webodf/programs/nativeQtClient/mainwindow.ui
deleted file mode 100644
index 38682c7010..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/nativeQtClient/mainwindow.ui
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>MainWindow</class>
- <widget class="QMainWindow" name="MainWindow">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>800</width>
-    <height>600</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string>MainWindow</string>
-  </property>
-  <widget class="QWidget" name="centralWidget">
-   <layout class="QGridLayout" name="gridLayout">
-    <item row="0" column="0">
-     <widget class="QMdiArea" name="mdiArea"/>
-    </item>
-   </layout>
-  </widget>
-  <widget class="QMenuBar" name="menuBar">
-   <property name="geometry">
-    <rect>
-     <x>0</x>
-     <y>0</y>
-     <width>800</width>
-     <height>23</height>
-    </rect>
-   </property>
-  </widget>
-  <widget class="QToolBar" name="mainToolBar">
-   <attribute name="toolBarArea">
-    <enum>TopToolBarArea</enum>
-   </attribute>
-   <attribute name="toolBarBreak">
-    <bool>false</bool>
-   </attribute>
-  </widget>
-  <widget class="QStatusBar" name="statusBar"/>
- </widget>
- <layoutdefault spacing="6" margin="11"/>
- <resources/>
- <connections/>
-</ui>
diff --git a/apps/files_odfviewer/src/webodf/programs/nativeQtClient/odfpage.cpp b/apps/files_odfviewer/src/webodf/programs/nativeQtClient/odfpage.cpp
deleted file mode 100644
index d87a8baa2b..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/nativeQtClient/odfpage.cpp
+++ /dev/null
@@ -1 +0,0 @@
-#include "odfpage.h"
diff --git a/apps/files_odfviewer/src/webodf/programs/nativeQtClient/odfpage.h b/apps/files_odfviewer/src/webodf/programs/nativeQtClient/odfpage.h
deleted file mode 100644
index 487d169917..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/nativeQtClient/odfpage.h
+++ /dev/null
@@ -1,15 +0,0 @@
-#ifndef ODFPAGE_H
-#define ODFPAGE_H
-
-#include <QtWebKit/QWebPage>
-#include <QtCore/QDebug>
-
-class OdfPage : public QWebPage {
-public:
-    OdfPage(QObject* parent) :QWebPage(parent) {}
-    void javaScriptConsoleMessage(const QString& message, int lineNumber, const QString & sourceID) {
-        qDebug() << sourceID << ":" << lineNumber << ":" << message;
-    }
-};
-
-#endif // ODFPAGE_H
diff --git a/apps/files_odfviewer/src/webodf/programs/nativeQtClient/odfview.cpp b/apps/files_odfviewer/src/webodf/programs/nativeQtClient/odfview.cpp
deleted file mode 100644
index 97125a5537..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/nativeQtClient/odfview.cpp
+++ /dev/null
@@ -1,83 +0,0 @@
-#include "odfview.h"
-
-#include "../qtjsruntime/nativeio.h"
-#include "../qtjsruntime/nam.h"
-
-#include "odfpage.h"
-
-#include <QtCore/QByteArray>
-#include <QtWebKit/QWebFrame>
-#include <QtNetwork/QNetworkAccessManager>
-#include <QtNetwork/QNetworkRequest>
-#include <QtNetwork/QNetworkReply>
-#include <QtCore/QFileInfo>
-#include <QtCore/QDir>
-
-OdfView::OdfView(QWidget* parent) :QWebView(parent)
-{
-    QString prefix = "../android/assets/"; // set this to the right value when debugging
-    QString htmlfile = QDir(prefix).absoluteFilePath("www/index.html");
-    if (!QFileInfo(htmlfile).exists()) {
-        prefix = "qrc:/";
-        htmlfile = "qrc:/www/index.html";
-    }
-    setPage(new OdfPage(this));
-    nativeio = new NativeIO(this, QDir(prefix), QDir::current());
-    connect(page(), SIGNAL(loadFinished(bool)), this, SLOT(slotLoadFinished(bool)));
-    page()->settings()->setAttribute(QWebSettings::DeveloperExtrasEnabled, true);
-
-    connect(page()->mainFrame(), SIGNAL(javaScriptWindowObjectCleared()),
-            this, SLOT(slotInitWindowObjects()));
-
-    // use our own networkaccessmanager that gives limited access to the local
-    // file system
-    networkaccessmanager = new NAM(this);
-    page()->setNetworkAccessManager(networkaccessmanager);
-    setUrl(QUrl(htmlfile));
-    loaded = false;
-}
-
-OdfView::~OdfView() {
-}
-
-void
-OdfView::slotInitWindowObjects()
-{
-    QWebFrame *frame = page()->mainFrame();
-    frame->addToJavaScriptWindowObject("nativeio", nativeio);
-}
-
-bool
-OdfView::loadFile(const QString &fileName) {
-    curFile = fileName;
-    //    odf->addFile(identifier, fileName);
-    //    networkaccessmanager->setCurrentFile(odf->getOpenContainer(identifier));
-    if (loaded) {
-        slotLoadFinished(true);
-    }
-    return true;
-}
-void
-OdfView::slotLoadFinished(bool ok) {
-    if (!ok) return;
-    loaded = true;
-    QWebFrame *frame = page()->mainFrame();
-    QString js =
-            "var originalReadFileSync = runtime.readFileSync;"
-            "runtime.readFileSync = function (path, encoding) {"
-            "    if (path.substr(path.length - 3) === '.js') {"
-            "        return originalReadFileSync.apply(runtime,"
-            "           [path, encoding]);"
-            "    }"
-            "    return nativeio.readFileSync(path, encoding);"
-            "};"
-            "runtime.read = function (path, offset, length, callback) {"
-            "    var data = nativeio.read(path, offset, length);"
-            "    data = runtime.byteArrayFromString(data, 'binary');"
-            "    callback(nativeio.error()||null, data);"
-            "};"
-            "runtime.getFileSize = function (path, callback) {"
-            "    callback(nativeio.getFileSize(path));"
-            "};";
-    frame->evaluateJavaScript(js);
-}
diff --git a/apps/files_odfviewer/src/webodf/programs/nativeQtClient/odfview.h b/apps/files_odfviewer/src/webodf/programs/nativeQtClient/odfview.h
deleted file mode 100644
index f61ba3c926..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/nativeQtClient/odfview.h
+++ /dev/null
@@ -1,29 +0,0 @@
-#ifndef ODFVIEW_H
-#define ODFVIEW_H
-
-#include <QtWebKit/QWebView>
-#include <QtNetwork/QNetworkAccessManager>
-class NativeIO;
-
-class OdfView : public QWebView {
-Q_OBJECT
-public:
-    OdfView(QWidget* parent = 0);
-    ~OdfView();
-    QString currentFile() { return curFile; }
-
-public slots:
-    bool loadFile(const QString &fileName);
-
-private slots:
-    void slotLoadFinished(bool ok);
-    void slotInitWindowObjects();
-
-private:
-    bool loaded;
-    QString curFile;
-    QNetworkAccessManager* networkaccessmanager;
-    NativeIO* nativeio;
-};
-
-#endif // ODFVIEW_H
diff --git a/apps/files_odfviewer/src/webodf/programs/nativeQtClient/scripts.js b/apps/files_odfviewer/src/webodf/programs/nativeQtClient/scripts.js
deleted file mode 100644
index ce2086bc7a..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/nativeQtClient/scripts.js
+++ /dev/null
@@ -1,93 +0,0 @@
-/*global alert, app, window, runtime*/
-var LocalFileSystem = {
-    PERSISTENT: 0,
-    TEMPORARY: 1
-};
-function FileEntry(name, fullPath) {
-    "use strict";
-    this.isFile = true;
-    this.isDirectory = false;
-    this.name = name;
-    this.fullPath = fullPath;
-    this.file = function (onsuccess, onerror) {
-        function File(fullPath) {
-            this.name = name;
-            this.fullPath = fullPath;
-            this.type = "";
-            this.size = -1;
-            this.lastModifiedDate = -1;
-        }
-        var file = new File(fullPath);
-        try {
-            onsuccess(file);
-        } catch (e) {
-            alert("Error on determining file properties: " + e);
-            onerror(e);
-        }
-    };
-}
-function FileReader() {
-    "use strict";
-    var fr = this;
-    this.readAsArrayBuffer = function (file) {
-        var path = file.fullPath.substr(7),
-            data = runtime.readFileSync(path, 'binary');
-        data = runtime.byteArrayFromString(data, "binary");
-        window.setTimeout(function () {
-            fr.onloadend({target: {result: data}});
-        }, 1);
-    };
-}
-var DirectoryReader;
-function DirectoryEntry(name, fullPath) {
-    "use strict";
-    this.isFile = false;
-    this.isDirectory = true;
-    this.name = name;
-    this.fullPath = fullPath;
-    this.createReader = function () {
-        var reader = new DirectoryReader(fullPath);
-        return reader;
-    };
-}
-function DirectoryReader(fullPath) {
-    "use strict";
-    this.readEntries = function (onsuccess, onerror) {
-        window.setTimeout(function () {
-            var entries = [];
-            entries[entries.length] = new FileEntry("welcome.odt",
-                    "welcome.odt");
-            entries[entries.length] = new FileEntry("Traktatenblad.odt",
-                    "Traktatenblad.odt");
-            try {
-                onsuccess(entries);
-            } catch (e) {
-                onerror(e);
-            }
-        }, 1);
-    };
-}
-window.resolveLocalFileSystemURI = function (path, onsuccess, onerror) {
-    "use strict";
-    var p = path.lastIndexOf("/"),
-        name = (p === -1) ? path : path.substr(p + 1);
-    onsuccess(new FileEntry(name, path));
-};
-window.requestFileSystem = function (filesystem, id, onsuccess, onerror) {
-    "use strict";
-    var dirs = [], shared, subfolder, path;
-    try {
-        if (filesystem === LocalFileSystem.PERSISTENT) {
-            path = "";
-            onsuccess({
-                name: "root",
-                root: new DirectoryEntry("root", path)
-            });
-        } else {
-            onerror("not defined");
-        }
-    } catch (e) {
-        onerror(e);
-    }
-};
-var device = {};
diff --git a/apps/files_odfviewer/src/webodf/programs/playbook/CMakeLists.txt b/apps/files_odfviewer/src/webodf/programs/playbook/CMakeLists.txt
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/apps/files_odfviewer/src/webodf/programs/playbook/build_sign.bat b/apps/files_odfviewer/src/webodf/programs/playbook/build_sign.bat
deleted file mode 100644
index 34e8deeab3..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/playbook/build_sign.bat
+++ /dev/null
@@ -1,23 +0,0 @@
-@echo on
-set WWSDK=M:\blackberrysdk\webworkssdk
-set BBWP=%WWSDK%\bbwp\bbwp
-set DEPLOY=%WWSDK%\bbwp\blackberry-tablet-sdk\bin\blackberry-deploy
-set JAVA_HOME=%WWSDK%\jre
-set PATH=%PATH%;%JAVA_HOME%\bin
-
-mkdir bin
-mkdir signed
-
-zip -r webodf.zip config.xml index.html icon.png scripts.js app sencha-touch.js sencha-touch.css webodf.js webodf.css ZoomIn.png ZoomOut.png
-
-rem MAKE A DEBUG VERSION
-del bin\webodf.bar
-%BBWP% webodf.zip -d -o bin
-if %errorlevel% neq 0 exit /b %errorlevel% 
-
-%DEPLOY% -installApp -password ko -device 192.168.1.111 -package bin\webodf.bar
-if %errorlevel% neq 0 exit /b %errorlevel% 
-
-rem MAKE A SIGNED VERSION, (can be done only once for each buildId!)
-rem %BBWP% webodf.zip -g U9gXpJXbGC -buildId 2 -o signed
-
diff --git a/apps/files_odfviewer/src/webodf/programs/playbook/config.xml b/apps/files_odfviewer/src/webodf/programs/playbook/config.xml
deleted file mode 100644
index cab7788317..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/playbook/config.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<widget xmlns="http://www.w3.org/ns/widgets"
-        xmlns:rim="http://www.blackberry.com/ns/widgets"
-        version="2.0.0.0">
-  <author href="http://www.kogmbh.com/" rim:copyright="Copyright 2010-2012 KO GmbH">KO GmbH</author>
-  <name>WebODF</name>
-  <description>
-    Viewer for OpenDocument files.
-  </description>
-  <rim:orientation mode="auto"/>
-  <rim:loadingScreen onLocalPageLoad="true" onRemotePageLoad="true">
-    <rim:transitionEffect type="zoomIn"/>
-  </rim:loadingScreen>
-  <rim:category name="productivity"/>
-
-  <rim:permissions>
-    <rim:permit>access_shared</rim:permit>
-  </rim:permissions>
-  <icon src="icon.png"/>
-  <content src="index.html" rim:allowInvokeParams="true"/>
-  <feature id="blackberry.ui.dialog"/>
-  <feature id="blackberry.io.dir" />
-  <feature id="blackberry.io.file" />
-  <feature id="blackberry.utils" />
-  <feature id="blackberry.custom.filereader"/>
-</widget>
diff --git a/apps/files_odfviewer/src/webodf/programs/playbook/ext/blackberry.custom.filereader/js/common/custom_filereader_dispatcher.js b/apps/files_odfviewer/src/webodf/programs/playbook/ext/blackberry.custom.filereader/js/common/custom_filereader_dispatcher.js
deleted file mode 100644
index 8c4d91c46e..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/playbook/ext/blackberry.custom.filereader/js/common/custom_filereader_dispatcher.js
+++ /dev/null
@@ -1,17 +0,0 @@
-(function () {
-	var CUSTOM_FILEREADER_API_URL = "blackberry/custom/filereader";
-
-	var ARGS_PATH = "path";
-	var ARGS_DATA = "data";
-
-	function CustomFileReader() {
-	};
-
-	CustomFileReader.prototype.readAsDataURL = function(path) {
-		var remoteCall = new blackberry.transport.RemoteFunctionCall(CUSTOM_FILEREADER_API_URL + "/readAsDataURL");
-		remoteCall.addParam(ARGS_PATH, path);
-		return remoteCall.makeSyncCall();
-	};
-
-	blackberry.Loader.javascriptLoaded("blackberry.custom.filereader", CustomFileReader);
-})();
diff --git a/apps/files_odfviewer/src/webodf/programs/playbook/ext/blackberry.custom.filereader/js/common/custom_filereader_ns.js b/apps/files_odfviewer/src/webodf/programs/playbook/ext/blackberry.custom.filereader/js/common/custom_filereader_ns.js
deleted file mode 100644
index 2ae1ede11e..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/playbook/ext/blackberry.custom.filereader/js/common/custom_filereader_ns.js
+++ /dev/null
@@ -1,8 +0,0 @@
-(function () {
-
-	function CustomFileReader(disp) {
-		this.constructor.prototype.readAsDataURL = function(path) { return disp.readAsDataURL(path); };
-	};
-
-	blackberry.Loader.javascriptLoaded("blackberry.custom.filereader", CustomFileReader);
-})();
diff --git a/apps/files_odfviewer/src/webodf/programs/playbook/ext/blackberry.custom.filereader/library.xml b/apps/files_odfviewer/src/webodf/programs/playbook/ext/blackberry.custom.filereader/library.xml
deleted file mode 100644
index 1f3aa52d36..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/playbook/ext/blackberry.custom.filereader/library.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<library>
-	<extension id="blackberry.custom.filereader">
-		<entryClass>blackberry.custom.filereader.CustomFileReader</entryClass>
-	</extension>
-	<platforms>
-		<platform value="AIR">
-			<target version="default" config="AIR_XHR" />
-		</platform>
-	</platforms>
-	
-	<configurations>
-		<configuration name="AIR_XHR" version="1.0" comment="For XHR architecture for implementation">
-			<src type="text/javascript" path="js/common/custom_filereader_dispatcher.js" comment="Application JS interface" />
-			<src type="text/javascript" path="js/common/custom_filereader_ns.js" comment="Application JS interface" />
-			<src type="text/actionscript" path="src/Air/CustomFileReader/src" comment="ActionScript implementation" />
-		</configuration>
-	</configurations>
-	<features>
-		<feature id="blackberry.custom.filereader" version="1.0.0" />
-	</features>
-</library>
\ No newline at end of file
diff --git a/apps/files_odfviewer/src/webodf/programs/playbook/ext/blackberry.custom.filereader/src/AIR/CustomFileReader/src/blackberry/custom/filereader/CustomFileReader.as b/apps/files_odfviewer/src/webodf/programs/playbook/ext/blackberry.custom.filereader/src/AIR/CustomFileReader/src/blackberry/custom/filereader/CustomFileReader.as
deleted file mode 100644
index 3261fbcf45..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/playbook/ext/blackberry.custom.filereader/src/AIR/CustomFileReader/src/blackberry/custom/filereader/CustomFileReader.as
+++ /dev/null
@@ -1,34 +0,0 @@
-package blackberry.custom.filereader {
-	import flash.filesystem.File;
-	import flash.filesystem.FileMode;
-	import flash.filesystem.FileStream;
-	import flash.utils.ByteArray;
-	import mx.utils.Base64Encoder;
-	import webworks.extension.DefaultExtension;
-	
-	public class CustomFileReader extends DefaultExtension {
-
-		public function CustomFileReader() {
-			super();
-		}
-
-		override public function getFeatureList():Array {
-			return new Array ("blackberry.custom.filereader");
-		}
-
-		public function readAsDataURL(path:String):String {
-			var file:File = new File(path);
-			if (!file.exists) {
-				return "";
-			}
-			var bytes:ByteArray = new ByteArray();
-			var stream:FileStream = new FileStream();
-			stream.open(file, FileMode.READ);
-			stream.readBytes(bytes);
-			var btoa:Base64Encoder = new Base64Encoder();
-			btoa.encodeBytes(bytes);
-			stream.close();			
-			return "data:;base64," + btoa.toString();
-		}
-	}
-}
\ No newline at end of file
diff --git a/apps/files_odfviewer/src/webodf/programs/playbook/icon.png b/apps/files_odfviewer/src/webodf/programs/playbook/icon.png
deleted file mode 100644
index b7ccb848e3949b55361f2fb30dfe3a39756aa387..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 19269
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

diff --git a/apps/files_odfviewer/src/webodf/programs/playbook/index.html b/apps/files_odfviewer/src/webodf/programs/playbook/index.html
deleted file mode 100644
index 77d331c12e..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/playbook/index.html
+++ /dev/null
@@ -1,28 +0,0 @@
-<!DOCTYPE html>
-<html>
-    <head>
-        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-        <meta name="viewport" content="width=device-width,user-scalable=no,initial-scale=1.0">
-        <link href="sencha-touch.css" rel="stylesheet" type="text/css" />
-        <link href="webodf.css" rel="stylesheet" type="text/css" />
-        <script type="text/javascript" src="sencha-touch.js"></script>
-        <script type="text/javascript" src="webodf.js"></script>
-        <script type="text/javascript" src="scripts.js"></script>
-        <script type="text/javascript" src="app/app.js"></script>
-        <script type="text/javascript" src="app/controller/Files.js"></script>
-        <script type="text/javascript" src="app/model/FileSystem.js"></script>
-        <script type="text/javascript" src="app/store/FileStore.js"></script>
-        <script type="text/javascript" src="app/views/FileDetail.js"></script>
-        <script type="text/javascript" src="app/views/FilesList.js"></script>
-        <script type="text/javascript" src="app/views/OdfView.js"></script>
-        <script type="text/javascript" src="app/views/Viewport.js"></script>
-        <title>WebODF</title>
-        <style>
-body {
-    background: url(icon.png);
-}
-</style>
-    </head>
-    <body onload="go()">
-    </body>
-</html>
diff --git a/apps/files_odfviewer/src/webodf/programs/playbook/scripts.js b/apps/files_odfviewer/src/webodf/programs/playbook/scripts.js
deleted file mode 100644
index e7913527d6..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/playbook/scripts.js
+++ /dev/null
@@ -1,146 +0,0 @@
-/*global blackberry, alert, document, window, app*/
-var LocalFileSystem = {
-    PERSISTENT: 0,
-    TEMPORARY: 1
-};
-function FileWriter(fullPath) {
-    "use strict";
-    this.write = function (data) {
-        var blob;
-        try {
-            blob = blackberry.utils.stringToBlob(data, "UTF-8");
-            blackberry.io.file.saveFile(fullPath, blob);
-        } catch (e) {
-        }
-    };
-}
-function FileEntry(name, fullPath) {
-    "use strict";
-    this.isFile = true;
-    this.isDirectory = false;
-    this.name = name;
-    this.fullPath = fullPath;
-    this.file = function (onsuccess, onerror) {
-        function File(fullPath) {
-            this.name = name;
-            this.fullPath = fullPath;
-            this.type = "";
-            this.size = -1;
-            this.lastModifiedDate = -1;
-        }
-        var file = new File(fullPath),
-            properties;
-        try {
-            properties = blackberry.io.file.getFileProperties(fullPath);
-            file.type = properties.mimeType;
-            file.size = properties.size;
-            file.lastModifiedDate = properties.dateModified;
-            onsuccess(file);
-        } catch (e) {
-            alert("Error on determining file properties: " + e);
-            onerror(e);
-        }
-    };
-    this.createWriter = function (onsuccess, onerror) {
-        onsuccess(new FileWriter(fullPath));
-    };
-}
-function FileReader() {
-    "use strict";
-    var fr = this;
-    this.readAsDataURL = function (file) {
-        var path = file.fullPath.substr(7);
-        window.setTimeout(function () {
-            try {
-                var data = blackberry.custom.filereader.readAsDataURL(path);
-                fr.onloadend({target: {result: data}});
-            } catch (e) {
-                alert("Error on reading file: " + e + " " + file.fullPath);
-            }
-        }, 1);
-    };
-    this.readAsText = function (file) {
-        var path = file.fullPath.substr(7);
-        try {
-            blackberry.io.file.readFile(path, function (fullPath, blob) {
-                var str = blackberry.utils.blobToString(blob, "UTF-8");
-                fr.onloadend({target: {result: str}});
-            }, true);
-        } catch (e) {
-            fr.onloadend({target: {result: "[]"}});
-        }
-    };
-}
-var DirectoryReader;
-function DirectoryEntry(name, fullPath) {
-    "use strict";
-    this.isFile = false;
-    this.isDirectory = true;
-    this.name = name;
-    this.fullPath = fullPath;
-    this.createReader = function () {
-        var reader = new DirectoryReader(fullPath);
-        return reader;
-    };
-}
-function DirectoryReader(fullPath) {
-    "use strict";
-    this.readEntries = function (onsuccess, onerror) {
-        window.setTimeout(function () {
-            var entries = [],
-                dirs = blackberry.io.dir.listDirectories(fullPath),
-                files = blackberry.io.dir.listFiles(fullPath),
-                i;
-            try {
-                for (i = 0; i < dirs.length; i += 1) {
-                    entries[entries.length] = new DirectoryEntry(dirs[i],
-                                             fullPath + "/" + dirs[i]);
-                }
-                for (i = 0; i < files.length; i += 1) {
-                    entries[entries.length] = new FileEntry(files[i],
-                                             fullPath + "/" + files[i]);
-                }
-                onsuccess(entries);
-            } catch (e) {
-                onerror(e);
-            }
-        }, 1);
-    };
-}
-window.resolveLocalFileSystemURI = function (path, onsuccess, onerror) {
-    "use strict";
-    var p = path.lastIndexOf("/"),
-        name;
-    if (p === -1) {
-        name = path;
-        path = blackberry.io.dir.appDirs.shared.documents.path + "/" + path;
-    } else {
-        name = path.substr(p + 1);
-    }
-    onsuccess(new FileEntry(name, path));
-};
-window.requestFileSystem = function (filesystem, id, onsuccess, onerror) {
-    "use strict";
-    var dirs = [], shared, subfolder;
-    try {
-        if (filesystem === LocalFileSystem.PERSISTENT) {
-            shared = blackberry.io.dir.appDirs.shared;
-            for (subfolder in shared) {
-                if (shared.hasOwnProperty(subfolder)) {
-                    dirs[dirs.length] = subfolder;
-                }
-            }
-            onsuccess({
-                name: "root",
-                root: new DirectoryEntry("root", shared.documents.path
-                    //+ "/kofficetests/odf/odt"
-                      )
-            });
-        } else {
-            onerror("not defined");
-        }
-    } catch (e) {
-        onerror(e);
-    }
-};
-var device = {};
diff --git a/apps/files_odfviewer/src/webodf/programs/qtjsruntime/CMakeLists.txt b/apps/files_odfviewer/src/webodf/programs/qtjsruntime/CMakeLists.txt
deleted file mode 100644
index ec8026741c..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/qtjsruntime/CMakeLists.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-include(${QT_USE_FILE})
-QT4_WRAP_CPP(QTJSRUNTIME_MOC nam.h pagerunner.h nativeio.h)
-add_executable(qtjsruntime qtjsruntime.cpp pagerunner.cpp nativeio.cpp ${QTJSRUNTIME_MOC})
-target_link_libraries(qtjsruntime ${QT_LIBRARIES})
diff --git a/apps/files_odfviewer/src/webodf/programs/qtjsruntime/nam.h b/apps/files_odfviewer/src/webodf/programs/qtjsruntime/nam.h
deleted file mode 100644
index ebb62f261a..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/qtjsruntime/nam.h
+++ /dev/null
@@ -1,48 +0,0 @@
-#ifndef NAM_H
-#define NAM_H
-
-#include <QtNetwork/QNetworkAccessManager>
-#include <QtNetwork/QNetworkRequest>
-
-class NAM : public QNetworkAccessManager {
-Q_OBJECT
-private:
-    const QString host;
-    const int port;
-    int outstandingRequests;
-public:
-    NAM(QObject* parent, const QString& host_ = QString(), int port_ = -1)
-            :QNetworkAccessManager(parent), host(host_), port(port_) {
-        outstandingRequests = 0;
-        connect(this, SIGNAL(finished(QNetworkReply*)),
-                this, SLOT(requestFinished()));
-    }
-    QNetworkReply* createRequest(QNetworkAccessManager::Operation o,
-            QNetworkRequest const& r, QIODevice* d) {
-        outstandingRequests += 1;
-        bool samehost = false;
-        if (port > 0) {
-            samehost = r.url().host() == host
-                    || r.url().host().endsWith("." + host)
-                    || host.endsWith("." + r.url().host());
-            samehost &= r.url().port() != port;
-        } else {
-            // use host string as a prefix
-            samehost = r.url().toString().startsWith(host);
-        }
-        if (!samehost) {
-            // if not same host or domain and port, block
-            return QNetworkAccessManager::createRequest(o, QNetworkRequest(),
-                    d);
-        }
-        return QNetworkAccessManager::createRequest(o, r, d);
-    }
-    bool hasOutstandingRequests() {
-        return outstandingRequests > 0;
-    }
-public slots:
-    void requestFinished() {
-        outstandingRequests -= 1;
-    }
-};
-#endif
diff --git a/apps/files_odfviewer/src/webodf/programs/qtjsruntime/nativeio.cpp b/apps/files_odfviewer/src/webodf/programs/qtjsruntime/nativeio.cpp
deleted file mode 100644
index 0657a0c711..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/qtjsruntime/nativeio.cpp
+++ /dev/null
@@ -1,106 +0,0 @@
-#include "nativeio.h"
-#include <QtWebKit/QWebPage>
-#include <QtCore/QCoreApplication>
-#include <QtCore/QTextCodec>
-
-NativeIO::NativeIO(QObject* parent, const QDir& runtimedir_,
-         const QDir& cwd_,
-         const QMap<QString, QFile::Permissions>& pathPermissions_)
-    :QObject(parent), runtimedir(runtimedir_), cwd(cwd_),
-      pathPermissions(pathPermissions_) {
-}
-QString
-NativeIO::readFileSync(const QString& path, const QString& encoding) {
-    errstr = QString();
-    QFile file(cwd.absoluteFilePath(path));
-    QByteArray data;
-    if (file.open(QIODevice::ReadOnly)) {
-        data = file.readAll();
-    }
-    QString out;
-    if (encoding != "binary") {
-        QTextCodec *codec = QTextCodec::codecForName(encoding.toAscii());
-        if (codec) {
-            out = codec->toUnicode(data);
-        }
-    }
-    if (out.length() == 0 && data.length() > 0) {
-        out = QString(data.length(), 0);
-        for (int i = 0; i < data.length(); ++i) {
-            out[i] = data[i];
-        }
-    }
-    return out;
-}
-QString
-NativeIO::read(const QString& path, int offset, int length) {
-    errstr = QString();
-    QFile file(cwd.absoluteFilePath(path));
-    QByteArray data;
-    if (file.open(QIODevice::ReadOnly) && (offset == 0 || file.seek(offset))) {
-        int lastLength = 0;
-        do {
-            lastLength = data.length();
-            data += file.read(length - data.length());
-        } while (data.length() < length && data.length() != lastLength);
-    }
-    if (length != data.length()) {
-        errstr = "Not enough data: " + QString::number(length) +
-                " instead of " + QString::number(data.length());
-        return QString();
-    }
-    QString out(length, 0);
-    for (int i = 0; i < length; ++i) {
-        out[i] = data[i];
-    }
-    return out;
-}
-void
-NativeIO::writeFile(const QString& path, const QString& data) {
-    QFile file(cwd.absoluteFilePath(path));
-    errstr = QString();
-    if (!file.open(QIODevice::WriteOnly)) {
-        errstr = "Could not open file for writing.";
-        return;
-    }
-    int length = data.length();
-    QByteArray out(length, 0);
-    for (int i = 0; i < length; ++i) {
-        out[i] = data[i].unicode();
-    }
-    if (file.write(out) != out.length()) {
-        errstr = "Could not write to file.";
-    }
-    return;
-}
-void
-NativeIO::unlink(const QString& path) {
-    errstr = QString();
-    QFile file(cwd.absoluteFilePath(path));
-    if (!file.remove()) {
-        errstr = "Could not delete file";
-    }
-}
-int
-NativeIO::getFileSize(const QString& path) {
-    errstr = QString();
-    QFile file(cwd.absoluteFilePath(path));
-    if (!file.exists()) {
-        errstr = "Could not determine file size.";
-    }
-    return file.size();
-}
-void
-NativeIO::exit(int exitcode) {
-    qApp->exit(exitcode);
-}
-QString
-NativeIO::currentDirectory() const {
-    return QDir::currentPath();
-}
-QStringList
-NativeIO::libraryPaths() const {
-    QStringList paths;
-    paths << runtimedir.absolutePath() << cwd.absolutePath();
-    return paths;
-}
diff --git a/apps/files_odfviewer/src/webodf/programs/qtjsruntime/nativeio.h b/apps/files_odfviewer/src/webodf/programs/qtjsruntime/nativeio.h
deleted file mode 100644
index b699744226..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/qtjsruntime/nativeio.h
+++ /dev/null
@@ -1,41 +0,0 @@
-#ifndef NATIVEIO_H
-#define NATIVEIO_H
-
-#include <QtCore/QFile>
-#include <QtCore/QDir>
-#include <QtCore/QMap>
-
-class QWebPage;
-
-// class that exposes filesystem to web environment
-class NativeIO : public QObject {
-Q_OBJECT
-private:
-    QWebPage* webpage;
-    QString errstr;
-    const QDir runtimedir;
-    const QDir cwd;
-    const QMap<QString, QFile::Permissions> pathPermissions;
-public:
-    typedef QMap<QString, QFile::Permissions> PathMap;
-    PathMap v;
-    NativeIO(QObject* parent, const QDir& runtimedir, const QDir& cwd,
-             const PathMap& pathPermissions = PathMap());
-public slots:
-    /**
-     * Return the last error.
-     */
-    QString error() {
-        return errstr;
-    }
-    QString readFileSync(const QString& path, const QString& encoding);
-    QString read(const QString& path, int offset, int length);
-    void writeFile(const QString& path, const QString& data);
-    void unlink(const QString& path);
-    int getFileSize(const QString& path);
-    void exit(int exitcode);
-    QString currentDirectory() const;
-    QStringList libraryPaths() const;
-};
-
-#endif
diff --git a/apps/files_odfviewer/src/webodf/programs/qtjsruntime/pagerunner.cpp b/apps/files_odfviewer/src/webodf/programs/qtjsruntime/pagerunner.cpp
deleted file mode 100644
index a91794d9a2..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/qtjsruntime/pagerunner.cpp
+++ /dev/null
@@ -1,191 +0,0 @@
-#include "pagerunner.h"
-
-#include "nam.h"
-#include "nativeio.h"
-#include <QtCore/QFileInfo>
-#include <QtCore/QTemporaryFile>
-#include <QtCore/QTimer>
-#include <QtCore/QCoreApplication>
-#include <QtGui/QPainter>
-#include <QtGui/QPrinter>
-#include <QtWebKit/QWebFrame>
-#include <QtCore/QDebug>
-
-QByteArray getRuntimeBindings() {
-    return
-    "if (typeof(runtime) !== 'undefined') {"
-    "    runtime.readFileSync = function (path, encoding) {"
-    "        return nativeio.readFileSync(path, encoding);"
-    "    };"
-    "    runtime.read = function (path, offset, length, callback) {"
-    "        var data = nativeio.read(path, offset, length);"
-    "        data = runtime.byteArrayFromString(data, 'binary');"
-    "        callback(nativeio.error()||null, data);"
-    "    };"
-    "    runtime.writeFile = function (path, data, callback) {"
-    "        data = runtime.byteArrayToString(data, 'binary');"
-    "        nativeio.writeFile(path, data);"
-    "        callback(nativeio.error()||null);"
-    "    };"
-    "    runtime.deleteFile = function (path, callback) {"
-    "        nativeio.unlink(path);"
-    "        callback(nativeio.error()||null);"
-    "    };"
-    "    runtime.getFileSize = function (path, callback) {"
-    "        callback(nativeio.getFileSize(path));"
-    "    };"
-    "    runtime.exit = function (exitCode) {"
-    "        nativeio.exit(exitCode);"
-    "    };"
-    "    runtime.currentDirectory = function () {"
-    "        return nativeio.currentDirectory();"
-    "    };"
-    "}";
-}
-
-PageRunner::PageRunner(const QStringList& args)
-    : QWebPage(0),
-      out(stdout),
-      err(stderr),
-      view(new QWidget()) {
-
-    QMap<QString, QString> settings = parseArguments(args);
-    QStringList arguments = args.mid(settings.size() * 2);
-    exportpdf = settings.value("export-pdf");
-    exportpng = settings.value("export-png");
-    url = QUrl(arguments[0]);
-    nativeio = new NativeIO(this, QFileInfo(arguments[0]).dir(),
-                            QDir::current());
-    if (url.scheme() == "file" || url.isRelative()) {
-        QFileInfo info(url.toLocalFile());
-        if (!info.isReadable() || !info.isFile()) {
-            QTextStream err(stderr);
-            err << "Cannot read file '" + url.toString() + "'.\n";
-            qApp->exit(1);
-        }
-    }
-    nam = new NAM(this, QUrl(url).host(), QUrl(url).port());
-
-    setNetworkAccessManager(nam);
-    connect(this, SIGNAL(loadFinished(bool)), this, SLOT(finished(bool)));
-    connect(mainFrame(), SIGNAL(javaScriptWindowObjectCleared()),
-            this, SLOT(slotInitWindowObjects()));
-    sawJSError = false;
-
-    setView(view);
-    scriptMode = arguments[0].endsWith(".js");
-    if (scriptMode) {
-        QByteArray html = "'" + arguments[0].toUtf8().replace('\'', "\\'")
-                + "'";
-        for (int i = 1; i < arguments.length(); ++i) {
-            html += ",'" + arguments[i].toUtf8().replace('\'', "\\'") + "'";
-        }
-        html = "<html>"
-                "<head><base href=\".\"></base><title></title>"
-                "<script>var arguments=[" + html + "];</script>"
-                "<script src=\"" + arguments[0].toUtf8() + "\"></script>";
-        if (arguments[0].endsWith("runtime.js")) {
-            // add runtime modification
-            html += "<script>" + getRuntimeBindings() +
-                        "    runtime.libraryPaths = function () {"
-                        "        /* convert to javascript array */"
-                        "        var p = nativeio.libraryPaths(),"
-                        "            a = [], i;"
-                        "        for (i in p) { a[i] = p[i]; }"
-                        "        return a;"
-                        "    };</script>";
-        }
-        html += "</head><body></body></html>\n";
-        QTemporaryFile tmp("XXXXXX.html");
-        tmp.setAutoRemove(true);
-        tmp.open();
-        tmp.write(html);
-        tmp.close();
-        mainFrame()->load(tmp.fileName());
-    } else {
-        // Make the url absolute. If it is not done here, QWebFrame will do
-        // it, and it will lose the query and fragment part.
-        QUrl absurl;
-        if (url.isRelative()) {
-            absurl = QUrl::fromLocalFile(QFileInfo(url.toLocalFile()).absoluteFilePath());
-            absurl.setQueryItems(url.queryItems());
-            absurl.setFragment(url.fragment());
-        } else {
-            absurl = url;
-        }
-        mainFrame()->load(absurl);
-    }
-}
-PageRunner::~PageRunner() {
-    delete view;
-}
-void PageRunner::finished(bool ok) {
-    // bind nativeio
-    if (!ok) {
-        qApp->exit(1);
-    }
-    if (!scriptMode) {
-        mainFrame()->evaluateJavaScript(getRuntimeBindings());
-    }
-
-    // connect signals
-    connect(this, SIGNAL(contentsChanged()), this, SLOT(noteChange()));
-    connect(this, SIGNAL(downloadRequested(QNetworkRequest)),
-            this, SLOT(noteChange()));
-    connect(this, SIGNAL(repaintRequested(QRect)),
-            this, SLOT(noteChange()));
-    connect(mainFrame(), SIGNAL(pageChanged()), this, SLOT(noteChange()));
-    connect(this, SIGNAL(geometryChangeRequested(QRect)),
-            this, SLOT(noteChange()));
-    QTimer::singleShot(150, this, SLOT(reallyFinished()));
-    changed = false;
-    time.start();
-}
-void PageRunner::reallyFinished() {
-    int latency = time.restart();
-    // err << latency << " " << changed << " " << nam->hasOutstandingRequests() << endl;
-    if (changed || latency >= 152 || nam->hasOutstandingRequests()) {
-        QTimer::singleShot(150, this, SLOT(reallyFinished()));
-        changed = false;
-        return;
-    }
-    if (!exportpdf.isEmpty() || !exportpng.isEmpty()) {
-        setViewportSize(mainFrame()->contentsSize());
-    }
-    if (!exportpng.isEmpty()) {
-        renderToFile(exportpng);
-    }
-    if (!exportpdf.isEmpty()) {
-        printToFile(exportpdf);
-    }
-    qApp->exit(sawJSError);
-}
-QMap<QString, QString> PageRunner::parseArguments(const QStringList& args) {
-    int i = 0;
-    QMap<QString, QString> settings;
-    while (i + 2 < args.length()) {
-        if (args[i].startsWith("--")) {
-            settings[args[i].mid(2)] = args[i+1];
-        }
-        i += 2;
-    }
-    return settings;
-}
-void PageRunner::slotInitWindowObjects() {
-    mainFrame()->addToJavaScriptWindowObject("nativeio", nativeio);
-}
-void PageRunner::renderToFile(const QString& filename) {
-    QImage pixmap(mainFrame()->contentsSize().boundedTo(QSize(10000,10000)),
-                  QImage::Format_ARGB32_Premultiplied);
-    QPainter painter(&pixmap);
-    mainFrame()->render(&painter, QWebFrame::ContentsLayer);
-    painter.end();
-    pixmap.save(filename);
-}
-void PageRunner::printToFile(const QString& filename) {
-    QPrinter printer(QPrinter::HighResolution);
-    printer.setFontEmbeddingEnabled(true);
-    printer.setOutputFormat(QPrinter::PdfFormat);
-    printer.setOutputFileName(filename);
-    mainFrame()->print(&printer);
-}
diff --git a/apps/files_odfviewer/src/webodf/programs/qtjsruntime/pagerunner.h b/apps/files_odfviewer/src/webodf/programs/qtjsruntime/pagerunner.h
deleted file mode 100644
index 9c848acc10..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/qtjsruntime/pagerunner.h
+++ /dev/null
@@ -1,68 +0,0 @@
-#ifndef PAGERUNNER_H
-#define PAGERUNNER_H
-
-#include <QtCore/QTextStream>
-#include <QtCore/QTime>
-#include <QtWebKit/QWebPage>
-
-class NAM;
-class NativeIO;
-
-class PageRunner : public QWebPage {
-Q_OBJECT
-private:
-    QUrl url;
-    NAM* nam;
-    QTextStream out;
-    QTextStream err;
-    bool changed;
-    QWidget* const view;
-    QTime time;
-    bool scriptMode;
-    NativeIO* nativeio;
-    QString exportpdf;
-    QString exportpng;
-    bool sawJSError;
-public:
-    PageRunner(const QStringList& args);
-    ~PageRunner();
-private slots:
-    void finished(bool ok);
-    void noteChange() {
-        changed = true;
-    }
-    void reallyFinished();
-    void slotInitWindowObjects();
-    bool shouldInterruptJavaScript() {
-        changed = true;
-        return false;
-    }
-private:
-    void javaScriptConsoleMessage(const QString& message, int lineNumber,
-            const QString& sourceID) {
-        changed = true;
-        if (scriptMode) {
-            err << message << endl;
-        } else {
-            err << sourceID << ":" << lineNumber << " " << message << endl;
-        }
-        sawJSError = true;
-    }
-    void javaScriptAlert(QWebFrame* /*frame*/, const QString& msg) {
-        changed = true;
-        err << "ALERT: " << msg << endl;
-    }
-    bool javaScriptPrompt(QWebFrame*, const QString&, const QString&, QString*){
-        changed = true;
-        return false;
-    }
-    void renderToFile(const QString& filename);
-    void printToFile(const QString& filename);
-    // overload because default impl was causing a crash
-    QString userAgentForUrl(const QUrl&) const {
-        return QString();
-    }
-    QMap<QString, QString> parseArguments(const QStringList& args);
-};
-
-#endif
diff --git a/apps/files_odfviewer/src/webodf/programs/qtjsruntime/qtjsruntime.cpp b/apps/files_odfviewer/src/webodf/programs/qtjsruntime/qtjsruntime.cpp
deleted file mode 100644
index 35d04da146..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/qtjsruntime/qtjsruntime.cpp
+++ /dev/null
@@ -1,20 +0,0 @@
-/**
- * Small executable that loads a javascript or html page from local a URI.
- * If the URI ends in .js it will be run in QtScript engine, otherwise, it will
- * be assumed to be a webpage that will be opened in
- */
-#include "pagerunner.h"
-#include <QtGui/QApplication>
-int
-main(int argc, char** argv) {
-    if (argc < 2) {
-        QTextStream err(stderr);
-        err << "Usage: " << argv[0] << " [--export-pdf pdffile] "
-               "[--export-png pngfile] html/javascripfile [arguments]\n";
-        return 1;
-    }
-    QApplication app(argc, argv);
-    app.setApplicationName(argv[0]);
-    PageRunner p(QCoreApplication::arguments().mid(1));
-    return app.exec();
-}
diff --git a/apps/files_odfviewer/src/webodf/programs/touchui/CMakeLists.txt b/apps/files_odfviewer/src/webodf/programs/touchui/CMakeLists.txt
deleted file mode 100644
index 0a18076273..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/touchui/CMakeLists.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-COPY_FILES(TOUCHUIDEPS ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_CURRENT_BINARY_DIR} ${HTML5UIFILES})
-COPY_FILES(TOUCHUIDEPS ${CMAKE_CURRENT_SOURCE_DIR}
-    ${CMAKE_CURRENT_BINARY_DIR} index.html scripts.js welcome.odt)
-COPY_FILES(TOUCHUIDEPS ${CMAKE_SOURCE_DIR}/webodf
-    ${CMAKE_CURRENT_BINARY_DIR} webodf.css ${LIBJSFILES})
-add_custom_target(touchuiDepencencies ALL DEPENDS ${TOUCHUIDEPS})
diff --git a/apps/files_odfviewer/src/webodf/programs/touchui/ZoomIn.png b/apps/files_odfviewer/src/webodf/programs/touchui/ZoomIn.png
deleted file mode 100644
index 6041c6ff937666e4266abf66970328fdbc080e20..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 670
zcmV;P0%84$P)<h;3K|Lk000e1NJLTq001oj001or1^@s6IvV1d0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!KuJVFRCwC#Sj%m~KoG@<JMMsVV4rib
zsQ@~FR1glilL8`z4j>f(71&&Iji~^qf^{lzW|Kj(oSogZJs2YSNh1S`&0}`neAekz
zK%VCwTzs%Qyt=p)gJoce<2Z-jwE;wjU`w!5ZU+Ij1{+<A@DfSXg(N?0i>wFsk@G<Q
z>7Wh5BIn19i=(3uT3isA3K@PUDSRe{8RAukISBQQTW~tDMPL()U0NGF?s1adYJTXk
z;<Exxh@Du(i9bS#$ZN23l$e(sq$A?tlZMY75gr#!yzO8SNEK@v5X}R1<I8(+PGi~A
z{o$w~F0;mlQ<QzMDY3RN+#92<v|jlomME5{bv;dymR|m1O#drx(!S#J9dpgvX&SJ~
z7!ZXd(Zp~WZfWgLjLTgEf~lhTxOGXZ;_#D*VHNz+ntVN0d@r@AnAYL(?=YYWgF=YU
z#QU_A(o!mn*cv98=~c=G(tF*F5Xa~HVu<0fsXAh#RYq86(&-bi8Zz(bl+ezhZcM8Z
z|D1W^m{$<C73mETf2N8UqAg6#7_oEBYJsL3^BO*v>d{5xos`{N%dP1v*ANhK4W@>{
zSg`3u)B6^W14fo-B!X)SvKedx3som5q7===Qtn%JZW-q1Bj>C*%P$YXI^bUD>_fCg
zd}whTU_yir@LD5Y5a_z1=eOmI!%5t!n$J;iAtBHoky4|Y<^+phoGt0)GNIBD?}&HA
zJK`Pjj<^l+n>=B{avl<ACAW=|$8S446vR(O!ruZ600>Znvx<9`Z2$lO07*qoM6N<$
Ef*6}H!T<mO

diff --git a/apps/files_odfviewer/src/webodf/programs/touchui/ZoomOut.png b/apps/files_odfviewer/src/webodf/programs/touchui/ZoomOut.png
deleted file mode 100644
index 733a4e1adab0a894598e1e9c8dd854cc5057718f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 607
zcmV-l0-*hgP)<h;3K|Lk000e1NJLTq001oj001or1^@s6IvV1d0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBU!0ZBwbRCwC#SkZ05Fc8HR|6v3A*RLvU
zkaPmrfNsDD=?07tbppCUU;={p>Q~YUOeb*9)qSL??OftZ04Yy8MKaOlalUtVwwSbl
zQYwVU0_+i=GyG`}b^*(U5QoXN0Yn3^1guarNU#)ael5ZYlIRLeJ{XE@2zFFF(0@7_
zg0NKlSaWd{2BGaM0yE))@8p#=EzB67F1&(J-?;_n5?cngB<xb!5b=<c^v?02O-o;q
zBgG09apFg8A__fr&L-xBgLGzbzV!4vw?tfeMH?L(Yb;aRt=X%I&R2`mfKe}|G}&>d
zM#^0KjnVdTD7kalB1*RMH?=g9yuNUFdZxDGOZ0g@{pnyrd;`JK(0pcHN&jz?LVOvP
z_e7uiy%)oJN$8j)JWTEoQ(F$|Ev+rT5q*}H^%<u~)D?vobxjXbuExwey0U2J&@~EM
z_BKoF1)1;A-_KCv9>zAlj*orJzK$8)e<!u@1|Chfedb-KgK5LTm`^W`*|&NfFel!T
zNUl>5<zO2T+O?ibKCp?D*fbVsE6Qx5ODdGRQ}1IWGbHN)x2L-gITZ1La2?Qu3<D4j
zM!X`>v}NRX^@_tuT(qs{D7e@n&|i@nCd8&2EPingq?dkDWh6clABm5|N8%%K3h|q~
tVZwGEV|%|Z)FOV{>0uyVR0;nGFaU{VsG5a2Ob!45002ovPDHLkV1ih@3se9A

diff --git a/apps/files_odfviewer/src/webodf/programs/touchui/app/app.js b/apps/files_odfviewer/src/webodf/programs/touchui/app/app.js
deleted file mode 100644
index 60da480a5f..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/touchui/app/app.js
+++ /dev/null
@@ -1,40 +0,0 @@
-/*global Ext, invokeString, document*/
-/**
- * When the application has been initialized, this function is called, if
- * it has been set. By default, it will start scanning the files in the
- * files sytem. It can be overridden by e.g. PhoneGap to wait until the device
- * is ready.
- */
-var onApplicationLaunch = function (app) {
-    "use strict";
-    app.startScanningDirectories();
-};
-Ext.application({
-    name : 'WebODFApp',
-    models: ['FileSystem'],
-    views: ['Viewport', 'FilesList', 'FileDetail', 'OdfView'],
-    controllers: ['Files'],
-    stores: ['FileStore'],
-    launch: function () {
-        'use strict';
-        var app = this;
-        Ext.create('WebODFApp.view.Viewport');
-        app.openUrl = function (url) {
-            var proxy = Ext.getStore("FileStore").getProxy();
-            proxy.getRecord(url, function (record) {
-                var controller;
-                if (!record) {
-                    alert("Cannot open " + url);
-                } else {
-                    controller = app.getController('Files');
-                    controller.show(null, null, null, record);
-                }
-            });
-        };
-        this.startScanningDirectories = function () {
-            var proxy = Ext.getStore("FileStore").getProxy();
-            proxy.startScanningDirectories();
-        };
-        onApplicationLaunch(this);
-    }
-});
diff --git a/apps/files_odfviewer/src/webodf/programs/touchui/app/controller/Files.js b/apps/files_odfviewer/src/webodf/programs/touchui/app/controller/Files.js
deleted file mode 100644
index 22e06f85b6..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/touchui/app/controller/Files.js
+++ /dev/null
@@ -1,82 +0,0 @@
-/*global Ext, runtime*/
-Ext.define('WebODFApp.controller.Files', {
-    extend: 'Ext.app.Controller',
-
-    config: {
-        refs: {
-            mainView: 'mainview',
-            filesList: 'fileslist list',
-            fileDetail: 'filedetail',
-            openButton: '#openButton',
-            odfView: 'odfview',
-            title: 'titlebar'
-        },
-        control: {
-            mainView: {
-                pop: 'pop',
-                push: 'push',
-                back: 'back'
-            },
-            filesList: {
-                itemtap: 'show'
-            },
-            openButton: {
-                tap: 'open'
-            }
-        }
-    },
-    back: function () {
-        "use strict";
-        this.odfView.hideCanvas();
-    },
-    push: function (view, item) {
-        "use strict";
-        if (item.xtype === "filedetail") {
-            this.getOpenButton().show();
-        } else {
-            this.getOpenButton().hide();
-        }
-    },
-    pop: function (view, item) {
-        "use strict";
-        if (item.xtype === "odfview") { // going to filedetail
-            this.getOpenButton().show();
-        } else {
-            this.getOpenButton().hide();
-        }
-        this.getFilesList().deselectAll();
-    },
-    show: function (list, index, target, record, e) {
-        "use strict";
-        // set the record in the details view and the file view
-        // this way, document starts loading in the background
-        var c = this;
-        if (!this.fileDetail) {
-            this.fileDetail = Ext.create('WebODFApp.view.FileDetail');
-        }
-        if (!this.odfView) {
-            this.odfView = Ext.create('WebODFApp.view.OdfView');
-            this.odfView.addCanvasListener(this.fileDetail.canvasListener);
-        }
-        this.odfView.hideCanvas();
-        this.fileDetail.odfView = this.odfView;
-        this.fileDetail.setRecord(record);
-        this.getMainView().push(this.fileDetail);
-        runtime.setTimeout(function () {
-            c.odfView.setRecord(record);
-        }, 300);
-    },
-    open: function (options) {
-        "use strict";
-        var c = this;
-        if (!this.odfView) {
-            this.odfView = Ext.create('WebODFApp.view.OdfView');
-        }
-        this.odfView.hideCanvas();
-        this.odfView.setRecord(this.fileDetail.getRecord());
-        this.getMainView().push(this.odfView);
-        runtime.setTimeout(function () {
-            c.odfView.showCanvas();
-        }, 300);
-    }
-});
diff --git a/apps/files_odfviewer/src/webodf/programs/touchui/app/model/FileSystem.js b/apps/files_odfviewer/src/webodf/programs/touchui/app/model/FileSystem.js
deleted file mode 100644
index 3346008f1a..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/touchui/app/model/FileSystem.js
+++ /dev/null
@@ -1,265 +0,0 @@
-/*global Ext, console, app, window, LocalFileSystem, JSON, FileReader, runtime*/
-Ext.define("WebODFApp.model.FileSystemProxy", (function () {
-    "use strict";
-    var self = this,
-        scanner;
-    function Scanner(proxy) {
-        var todo = [],
-            done = false,
-            fileSystems,
-            files,
-            cachedList = [],
-            dirs = {},
-            lastUpdate = 0,
-            lastUpdateTime = new Date();
-
-        function getFileId(fullPath) {
-            var i;
-            if (!files) {
-                return -1;
-            }
-            for (i = 0; i < files.length; i += 1) {
-                if (files[i].get('fullPath') === fullPath) {
-                    return i;
-                }
-            }
-            return -1;
-        }
-        this.getFileId = getFileId;
-        function addFileEntry(entry, callback) {
-            function fail() {
-                callback(-1);
-            }
-            var id = getFileId(entry.fullPath);
-            if (id !== -1) {
-                return callback(id);
-            }
-            entry.file(function (file) {
-                var id = files.length;
-                files.push(Ext.create('WebODFApp.model.FileSystem', {
-                    id: id,
-                    fileName: entry.name,
-                    fullPath: entry.fullPath,
-                    size: file.size
-                }));
-                callback(id);
-            }, fail);
-        }
-        function parseCachedFileList(pos, callback) {
-            if (pos === cachedList.length) {
-                return callback();
-            }
-            window.resolveLocalFileSystemURI(cachedList[pos], function (entry) {
-                addFileEntry(entry, function () {
-                    parseCachedFileList(pos + 1, callback);
-                });
-            }, function () {
-                parseCachedFileList(pos + 1, callback);
-            });
-        }
-        function readCachedFileList(callback) {
-            window.resolveLocalFileSystemURI("cachedODFList.json",
-                function (fileentry) {
-                    var reader = new FileReader();
-                    reader.onloadend = function (evt) {
-                        cachedList = [];
-                        try {
-                            cachedList = JSON.parse(evt.target.result);
-                        } catch (e) {
-                            alert(e);
-                        }
-                        parseCachedFileList(0, callback);
-                    };
-                    reader.readAsText(fileentry);
-                }, function () {
-                    callback();
-                });
-        }
-        function writeCachedFileList() {
-            var i,
-                l = files.length;
-            cachedList.length = files.length;
-            for (i = 0; i < l; i += 1) {
-                cachedList[i] = files[i].get('fullPath');
-            }
-            window.resolveLocalFileSystemURI("cachedODFList.json",
-                function (fileentry) {
-                    fileentry.createWriter(function (writer) {
-                        writer.write(JSON.stringify(cachedList));
-                    }, function (e) {
-                        runtime.log(JSON.stringify(e));
-                    });
-                }, function (e) {
-                    runtime.log(JSON.stringify(e));
-                });
-        }
-        function filter(name) {
-            var suffix = name.substr(name.length - 4);
-            return suffix === ".odt" || suffix === ".odp" || suffix === ".ods";
-        }
-        function errorCallback(err) {
-            console.log("FILE READ ERROR " + err + " " + todo.length);
-            done = true;
-        }
-        function load(entry, callback) {
-            function fail() {
-                callback(-1);
-            }
-            if (entry.isDirectory) {
-                entry.createReader().readEntries(function (entries) {
-                    var i = 0;
-                    for (i = 0; i < entries.length; i += 1) {
-                        entry = entries[i];
-                        if (entry.isDirectory
-                                && !dirs.hasOwnProperty(entry.fullPath)) {
-                            todo.push(entry);
-                            dirs[entry.fullPath] = entry;
-                        } else if (filter(entry.name)) {
-                            todo.push(entry);
-                        }
-                    }
-                    callback(-1);
-                }, fail);
-            } else if (entry.isFile) {
-                addFileEntry(entry, callback);
-            } else {
-                fail();
-            }
-        }
-        function addFileSystem(fileSystem) {
-            var dir = fileSystems[fileSystem.name] = {};
-            todo.push(fileSystem.root);
-            function callback() {
-                var now = new Date(),
-                    // a limit is needed, otherwise the # of files too large to
-                    // be handled by sencha touch
-                    done = todo.length === 0 || files.length > 2000,
-                    store = Ext.getStore('FileStore');
-                if (done || lastUpdate === 0 || (files.length - lastUpdate > 0
-                        && now - lastUpdateTime > files.length * 100)) {
-                    store.load();
-                    lastUpdate = files.length;
-                    lastUpdateTime = now;
-                }
-                if (done) {
-                    writeCachedFileList();
-                } else {
-                    load(todo.shift(), callback);
-                }
-            }
-            load(todo.shift(), callback);
-        }
-        function addFileSystems() {
-            window.requestFileSystem(LocalFileSystem.PERSISTENT, 0,
-                    addFileSystem, errorCallback);
-            window.requestFileSystem(LocalFileSystem.TEMPORARY, 0,
-                    addFileSystem, function () {});
-        }
-        this.scan = function () {
-            if (fileSystems !== undefined) {
-                return;
-            }
-            fileSystems = {};
-            readCachedFileList(function () {
-                addFileSystems();
-            });
-        };
-        this.load = load;
-        this.files = files = [];
-    }
-    function finishOperation(proxy, operation, callback, scope) {
-        if (operation) {
-            var i = 0,
-                recs = operation.getRecords(),
-                len = recs.length;
-
-            for (i; i < len; i += 1) {
-                recs[i].commit();
-            }
-            operation.setSuccessful();
-
-            Ext.callback(callback, scope || proxy, [operation]);
-        }
-    }
-    return {
-        extend: "Ext.data.proxy.Proxy",
-        xtype: 'filesystemproxy',
-        constructor: function (config) {
-            this.initConfig(config);
-            scanner = new Scanner(this);
-            this.startScanningDirectories = function () {
-                scanner.scan();
-            };
-            this.getRecord = function (url, callback) {
-                var id = scanner.getFileId(url);
-                if (id !== -1) {
-                    return callback(scanner.files[id]);
-                }
-                window.resolveLocalFileSystemURI(url,
-                    function (fileentry) {
-                        scanner.load(fileentry, function (id) {
-                            Ext.getStore('FileStore').load();
-                            callback(scanner.files[id]);
-                        });
-                    },
-                    function (evt) {
-                        callback(null);
-                    });
-            };
-        },
-    
-        create: function (operation, callback, scope) {
-            finishOperation(this, operation, callback, scope);
-        },
-    
-        read: function (operation, callback, scope) {
-            var me = this,
-                records = scanner.files;
-            if (!records) {
-                return;
-            }
-            // return model instances in a resultset
-            operation.setResultSet(new Ext.data.ResultSet({
-                //total: records.length,
-                count: records.length,
-                records: records,
-                success: true
-            }));
-
-            // announce success
-            operation.setSuccessful();
-            operation.setCompleted();
-    
-            // finish with callback
-            Ext.callback(callback, scope || me, [operation]);
-        },
-    
-        update: function (operation, callback, scope) {
-            finishOperation(this, operation, callback, scope);
-        },
-    
-        destroy: function (operation, callback, scope) {
-            finishOperation(this, operation, callback, scope);
-        }
-    };
-}()));
-
-Ext.define("WebODFApp.model.FileSystem", {
-    extend: 'Ext.data.Model',
-    config: {
-        idProperty: 'id',
-        fields: [ {
-            name: "id",
-            type: "auto"
-        }, {
-            name: "fullPath",
-            type: "string"
-        }, {
-            name: "fileName",
-            type: "string"
-        }, {
-            name: "size",
-            type: "int"
-        } ]
-    }
-});
diff --git a/apps/files_odfviewer/src/webodf/programs/touchui/app/store/FileStore.js b/apps/files_odfviewer/src/webodf/programs/touchui/app/store/FileStore.js
deleted file mode 100644
index d2932c8989..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/touchui/app/store/FileStore.js
+++ /dev/null
@@ -1,30 +0,0 @@
-/*global Ext*/
-Ext.define('WebODFApp.store.FileStore', {
-    extend: 'Ext.data.Store',
-    config: {
-        storeId: 'FileStore',
-        model: 'WebODFApp.model.FileSystem',
-        autoLoad: true,
-        grouper: {
-            groupFn: function (record) {
-                "use strict";
-                return record.get('fileName')[0].toUpperCase();
-            }
-        },
-        proxy: {
-            xtype: 'filesystemproxy'
-        },
-        sorters: function (a, b) {
-            "use strict";
-            a = a.get('fileName').toUpperCase();
-            b = b.get('fileName').toUpperCase();
-            if (a > b) {
-                return 1;
-            }
-            if (a < b) {
-                return -1;
-            }
-            return 0;
-        }
-    }
-});
diff --git a/apps/files_odfviewer/src/webodf/programs/touchui/app/views/FileDetail.js b/apps/files_odfviewer/src/webodf/programs/touchui/app/views/FileDetail.js
deleted file mode 100644
index b79876c6de..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/touchui/app/views/FileDetail.js
+++ /dev/null
@@ -1,122 +0,0 @@
-/*global Ext, app, runtime, xmldom, odf*/
-runtime.loadClass("xmldom.XPath");
-runtime.loadClass("odf.Style2CSS");
-Ext.define('WebODFApp.view.FileDetail', (function () {
-    "use strict";
-    var panel,
-        style2CSS = new odf.Style2CSS(),
-        xpath = new xmldom.XPath(),
-        fileDetail,
-        title,
-        image,
-        list,
-        emptyImageUrl = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAAXNSR0IArs4c6QAAAAtJREFUCB1jYGAAAAADAAFPSAqvAAAAAElFTkSuQmCC";
-    function getTitle(body) {
-        var ps,
-            title;
-        ps = xpath.getODFElementsWithXPath(body,
-                ".//text:h", style2CSS.namespaceResolver);
-        title = "";
-        if (ps && ps.length) {
-            title = ps[0].nodeValue;
-        } else {
-            ps = xpath.getODFElementsWithXPath(body,
-                ".//text:p", style2CSS.namespaceResolver);
-            if (ps && ps.length) {
-                title = ps[0].nodeValue;
-            }
-        }
-        return title;
-    }
-    function metaToJSON(body, meta) {
-        var json = [],
-            title = body && getTitle(body),
-            e = meta && meta.firstChild,
-            name;
-        if (title) {
-            json.push({name: "title", value: title});
-        }
-        while (e) {
-            if (e.nodeType === 1 && e.textContent) {
-                if (e.localName === "user-defined") {
-                    name = e.getAttributeNS(
-                        "urn:oasis:names:tc:opendocument:xmlns:meta:1.0",
-                        "name"
-                    );
-                } else {
-                    name = e.localName;
-                }
-                json.push({
-                    name: name,
-                    value: e.textContent
-                });
-            }
-            e = e.nextSibling;
-        }
-        return json;
-    }
-    return {
-        extend: 'Ext.Panel',
-        xtype: 'filedetail',
-        config: {
-            title: 'File details',
-            layout: 'vbox',
-            items: [{
-                id: "title",
-                dock: 'top',
-                xtype: 'toolbar'
-            }, {
-                id: 'details',
-                xtype: 'container',
-                layout: 'hbox',
-                flex: 1,
-                items: [{
-                    id: 'thumbnail',
-                    xtype: 'image',
-                    width: 256,
-                    maxWidth: "50%"
-                }, {
-                    id: 'metalist',
-                    xtype: 'list',
-                    store: {
-                        fields: ["name", "value"],
-                        data: []
-                    },
-                    itemTpl: "{name}: {value}",
-                    flex: 1
-                }]
-            }],
-            listeners: {
-                initialize: function () {
-                    fileDetail = this.query("#details")[0];
-                    title = this.query("#title")[0];
-                    image = fileDetail.query('#thumbnail')[0];
-                    list = fileDetail.query('#metalist')[0];
-                }
-            }
-        },
-        updateRecord: function (record) {
-            if (record) {
-                fileDetail.setMasked({
-                    xtype: 'loadmask',
-                    message: 'Loading...'
-                });
-                title.setTitle(record.get('fileName'));
-            }
-        },
-        canvasListener: function (odfcanvas) {
-            var view = this,
-                odfcontainer = odfcanvas.odfContainer(),
-                part = odfcontainer.getPart("Thumbnails/thumbnail.png"),
-                metajson = [];
-            metajson = metaToJSON(odfcontainer.rootElement.body,
-                    odfcontainer.rootElement.meta);
-            part.onstatereadychange = function (part) {
-                image.setSrc(part.url || emptyImageUrl);
-            };
-            part.load();
-            list.getStore().setData(metajson);
-            fileDetail.unmask();
-        }
-    };
-}()));
diff --git a/apps/files_odfviewer/src/webodf/programs/touchui/app/views/FilesList.js b/apps/files_odfviewer/src/webodf/programs/touchui/app/views/FilesList.js
deleted file mode 100644
index 1a82a2e8b6..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/touchui/app/views/FilesList.js
+++ /dev/null
@@ -1,47 +0,0 @@
-/*global Ext, app, filestore */
-Ext.define("WebODFApp.view.FilesList", {
-    extend: "Ext.Panel",
-    xtype: 'fileslist',
-    config: {
-        layout: 'fit',
-        items: [{
-            xtype: 'list',
-            store: 'FileStore',
-/*
-            store: {
-                fields: ['fileName', 'fullPath'],
-                grouper: {
-                    groupFn: function (record) {
-                        "use strict";
-                        return record.get('fileName')[0].toUpperCase();
-                    }
-                },
-                data: [
-                    {fileName: 'Cowper', fullPath: '-'},
-                    {fileName: 'Everett', fullPath: '-'},
-                    {fileName: 'University', fullPath: '-'},
-                    {fileName: 'Forest', fullPath: '-'}
-                ]
-            },
-*/
-/*
-            listeners: {
-                'itemtap': function (view, number, item) {
-                    "use strict";
-                    var record = view.getStore().getAt(number);
-                    if (record) {
-                        Ext.app.dispatch({
-                            controller: 'Files', //app.controllers.files,
-                            action: 'show',
-                            id: record.getId()
-                        });
-                    }
-                }
-            },
-*/
-            itemTpl: '{fileName}<br/><span style="font-size:x-small">{fullPath}</span>',
-            grouped: true,
-            indexBar: true
-        }]
-    }
-});
diff --git a/apps/files_odfviewer/src/webodf/programs/touchui/app/views/OdfView.js b/apps/files_odfviewer/src/webodf/programs/touchui/app/views/OdfView.js
deleted file mode 100644
index 2098304d32..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/touchui/app/views/OdfView.js
+++ /dev/null
@@ -1,170 +0,0 @@
-/*global Ext, runtime, core, odf, window, FileReader, PhoneGap, gui*/
-runtime.loadClass('odf.OdfCanvas');
-
-Ext.define('WebODFApp.view.OdfView', (function () {
-    "use strict";
-    var currentPath,
-        overridePath,
-        overridePathPrefix = "odf:",
-        data,
-        globalreadfunction,
-        globalfilesizefunction,
-        odfcanvas,
-        zoom = 1,
-        dom,
-        canvasListeners = [],
-        view;
-    function signalCanvasChange() {
-        var i;
-        for (i = 0; i < canvasListeners.length; i += 1) {
-            canvasListeners[i](odfcanvas);
-        }
-    }
-    function initCanvas() {
-        var cmp;
-        if (globalreadfunction === undefined) {
-            // overload the global read function with one that only reads
-            // the data from this canvas
-            globalreadfunction = runtime.read;
-            globalfilesizefunction = runtime.getFileSize;
-            runtime.read = function (path, offset, length, callback) {
-                if (path !== overridePath) {
-                    globalreadfunction.apply(runtime,
-                        [path, offset, length, callback]);
-                } else {
-                    callback(null, data.slice(offset, offset + length));
-                }
-            };
-            runtime.getFileSize = function (path, callback) {
-                if (path !== overridePath) {
-                    globalfilesizefunction.apply(runtime, [path, callback]);
-                } else {
-                    callback(data.length);
-                }
-            };
-            dom = Ext.getCmp('webodf').element.dom;
-            odfcanvas = new odf.OdfCanvas(dom);
-            odfcanvas.addListener("statereadychange", signalCanvasChange);
-        }
-    }
-    function load(path) {
-        if (path === currentPath) {
-            return;
-        }
-        currentPath = path;
-        overridePath = overridePathPrefix + path;
-        data = null;
-        window.resolveLocalFileSystemURI("file://" + path, function (file) {
-            var reader = new FileReader();
-            // so far phonegap is very limited, ideally it would implement
-            // readAsArrayBuffer and slice() on the File object
-            // right now, it has a dummy function, hence breaking simple
-            // detection of which features are implemented
-            if (reader.readAsArrayBuffer
-                    && (typeof PhoneGap === "undefined")) {
-                reader.onloadend = function (evt) {
-                    data = evt.target.result;
-                    odfcanvas.load(overridePath);
-                };
-                reader.readAsArrayBuffer(file);
-            } else {
-                reader.onloadend = function (evt) {
-                    var b = new core.Base64();
-                    data = evt.target.result;
-                    data = data.substr(data.indexOf(",") + 1);
-                    data = b.convertBase64ToUTF8Array(data);
-                    odfcanvas.load(overridePath);
-                };
-                reader.readAsDataURL(file);
-            }
-        }, function () {
-            runtime.log("COULD NOT RESOLVE " + path);
-        });
-    }
-    function tapHandler(button) {
-        var id = button.getId(),
-            dom = Ext.getCmp('odfcontainer').element.dom,
-            width = dom.offsetWidth,
-            height = dom.offsetHeight;
-        if (id === 'zoomin') {
-            odfcanvas.setZoomLevel(odfcanvas.getZoomLevel() * 1.25);
-        } else if (id === 'zoomout') {
-            odfcanvas.setZoomLevel(odfcanvas.getZoomLevel() * 0.8);
-        } else if (id === 'fit-best') {
-            odfcanvas.fitToContainingElement(width, height);
-        } else if (id === 'fit-width') {
-            odfcanvas.fitToWidth(width);
-        } else if (id === 'fit-height') {
-            odfcanvas.fitToHeight(height);
-        } else if (id === 'next') {
-            odfcanvas.showNextPage();
-        } else if (id === 'previous') {
-            odfcanvas.showPreviousPage();
-        }
-    }
-    return {
-        extend: 'Ext.Container',
-        xtype: 'odfview',
-        id: 'odfcontainer',
-        config: {
-            scrollable: 'both',
-            items: [{
-                id: 'webodf'
-            }, {
-                xtype : 'toolbar',
-                docked: 'bottom',
-                scrollable: false,
-                defaults: {
-                    iconMask: false,
-                    ui      : 'plain',
-                    handler: tapHandler
-                },
-                items: [
-                    { id: 'previous', icon: 'go-previous.png'},
-                    { id: 'next', icon: 'go-next.png' },
-                    { id: 'zoomin', icon: 'ZoomIn.png'},
-                    { id: 'zoomout', icon: 'ZoomOut.png' },
-                    { id: 'fit-best', icon: 'zoom-fit-best.png' },
-                    { id: 'fit-height', icon: 'zoom-fit-height.png' },
-                    { id: 'fit-width', icon: 'zoom-fit-width.png' }
-                ],
-                layout: {
-                    pack : 'center',
-                    align: 'center'
-                }
-            }],
-            listeners: {
-                painted: function () {
-                    // make sure the viewport is the right size
-                    odfcanvas.setZoomLevel(odfcanvas.getZoomLevel());
-                }
-            }
-        },
-        updateRecord: function (record) {
-            view = this;
-            initCanvas();
-            load(record.get('fullPath'));
-        },
-        addCanvasListener: function (listener) {
-            canvasListeners.push(listener);
-        },
-        hideCanvas: function () {
-            if (dom) {
-                dom.style.display = "none";
-            }
-            if (view) {
-                view.setMasked({
-                    xtype: 'loadmask',
-                    message: 'Loading...'
-                });
-            }
-        },
-        showCanvas: function () {
-            if (view) {
-                view.unmask();
-            }
-            dom.style.display = "inline-block";
-            odfcanvas.setZoomLevel(odfcanvas.getZoomLevel());
-        }
-    };
-}()));
diff --git a/apps/files_odfviewer/src/webodf/programs/touchui/app/views/Viewport.js b/apps/files_odfviewer/src/webodf/programs/touchui/app/views/Viewport.js
deleted file mode 100644
index 3023ddc017..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/touchui/app/views/Viewport.js
+++ /dev/null
@@ -1,54 +0,0 @@
-/*global Ext, app*/
-Ext.define("WebODFApp.view.Viewport", {
-    extend: "Ext.navigation.View",
-    xtype: "mainview",
-    requires: [
-        "WebODFApp.view.FilesList",
-        "WebODFApp.view.FileDetail"
-    ],
-    config: {
-        fullscreen: true,
-        autoDestroy: false,
-        navigationBar: {
-            items: [{
-                xtype: 'button',
-                id: 'openButton',
-                text: 'Open',
-                align: 'right',
-                hidden: true
-            }]
-        },
-        items: [
-            { title: 'Files', xtype: 'fileslist' }
-        ]
-    }
-/*
-    initComponent: function () {
-
-        //put instances of cards into app.views namespace
-        Ext.apply(app.views, {
-            filesList: new app.views.FilesList(),
-            fileDetail: new app.views.FileDetail(),
-            odfView: new app.views.OdfView()
-        });
-        //put instances of cards into viewport
-        Ext.apply(this, {
-            items: [
-                app.views.filesList,
-                app.views.fileDetail,
-                app.views.odfView
-            ]
-        });
-        app.views.Viewport.superclass.initComponent.apply(this, arguments);
-    },
-    listeners: {
-        afterlayout: function () {
-            if (app.stores.filesystem.initialUrl) {
-                app.openUrl(app.stores.filesystem.initialUrl);
-                app.stores.filesystem.initialUrl = undefined;
-            }
-        }
-    }
-    };
-*/
-});
diff --git a/apps/files_odfviewer/src/webodf/programs/touchui/go-next.png b/apps/files_odfviewer/src/webodf/programs/touchui/go-next.png
deleted file mode 100644
index c4da8a9a3d787dcded3a357a062e92ee9f59d71d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1473
zcmV;y1wQ(TP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000}W
z000}W0bUxB8~^|S2XskIMF-am91ti7Q*Z|P00006VoOIv0RI600RN!9r;`8x1x`ss
zK~#9!?N?iDR8<sR=RRiI&P-c@00Ksyi6)?lA5_1D2;zqUV+5qJpdkkR0VPPH^$`;i
z4MdF*2$3itYCuT95E6<NNhN|p%cB*6LXCiZKwH}B%-q*`xbNw$X)WPlXunvKHTz6*
z&fRP8z0OPqcX2z&IDT<mL)+7Dtovmo?hp*zB9v0>lWjE>obx@^XPW9K&fEOrq<NbM
zPXIyf`tj7%SYZN77nLN(j)-p(f%EP7XEziLiU7tKu3o)@oB#@kBvHO>7G_VIumIdU
zKJJ;dj}1l#Alx*vj*DE*Mb`B(bH+nhxn%mdp((41M3hf>ZlgJ{0=zCt?!k44t_O$K
z!-f}O<*PHTlF1`iDZwkr8)F7m044W4A0BnU^@tRGAu#)?hfy|r^0b1uabnW*Tj$)a
z0PXUSHx%G!Nq|oR0!?2>O)YH9=wd9HJ7wtjQOVtt=6|)0gyi4UTTya+x~1Ys)v<FW
zhiWc>872S)6*!O~xkGE0qKnm^eWdp*L{R#CFG^ii?YVXwtZA+j0t@Q5m(|@=z=N|^
zsCQSCq9f~p6m$~|iV+b}MMqe#<n%(6TuLo~B9Ss@a~wbX*5b5wcq_oz`uc5U*A<{K
z<dK)u%4G|Xb^=(o4a>4%nidSxgkgj<z*xvWQ|eQ>lo3T31q6wp1!^y3aH=8wJp)@@
zzkOlb^-ZV*y0R{rDx4`N3i!T25XguMoKxf!g(j_gD0}wlGk(DJGqg8c4`W9dczjA~
zP9o1ZIdT4$>F5Ou5f~&gSqEGiP#~%(hVLd(g=An%5g8QFyY&$zgdlQVJw*<a_UGui
z9j)y^XUk~Liz+9~{o+Fa?_JojnEywB3uf2=vxpLk4ufc-#|NO~MD)xakYSL3&<lVE
z61kj@uC6T7=?t1$+K|m;;kjXV9g59{ogDsFtoXhX05kdsIDPgK5{VQFi;9p;C6S*G
z#NrIL&Bzam#4)hQj8w6%mWyyq0-hfrO9gnIM`Q31Q1m>P_JPhBM5bw4CM;7ya<A_Q
z0Ev#yEF2H;xQU#{kY51A^Aut+L5ED3+K?>rZr`?(C$w43(7a*$O|A`0$^SKQK|uk6
z#8BZ$`vWF|_xlN;U3w!O)DN=k7*%f(ZP=C;pyyBQHG4sy1tLqpBtd4BJW8yqPNWiO
z>u@gyf|p&ce7g#SeggDdi3ST>Zt1IN6Jxes>n^aU14{K&AAJTOm5jPXjIL~6K^)Gt
z46d|v>`*Y4G*zv>*6$XaY|WXkEnkJSN}?b?g~UCDNET8|CXpA9BOZ^ziaH=&4yC_v
zv<Gw&M9GEF?bad<(?BfW#Q8t!GwF18DRp8~%i*;M(NBOE7;4mrVZZ*q|6qyZ`nqiz
zG5~}RB?3z7BUzlnD{pRq@VOSijHvZt+YKYC8k9JO*7l1yd$RVJ;HtE>`pbGmxUPVy
z_vXp(lzQ}=HOp}$<P}a=R*X!h7=)Bjaz$$a#=9$5afuU$ev(%%HLd|O-)TSbb$}bd
zLWFrF{iX<g5wiiwU<d*98iNtH(A;tkM=SRJ?RjEh=jmMsa0{?-J1}kiI}w?_JGlXP
zafP4v?L<R$%`V35m%GmIYXjlV3yAJHGbK1BmzIHss~2%#>&9HRwf%Kw<$X@cp)n8w
zl+k^s6=TTQ68kH6qIU0|<K%-<=knn*h%gWWwCnGG;svxD0sd;PN5$s#vaR9IkC|bV
zyO)pn_@7|7MKop=n_s@VQ}Q5Hy?ali5^|B(bhL8N{+NtPFx7Oa@yV9DGo_4~59s7~
baR=}ZzeY4&{TPVR00000NkvXXu0mjfqamda

diff --git a/apps/files_odfviewer/src/webodf/programs/touchui/go-previous.png b/apps/files_odfviewer/src/webodf/programs/touchui/go-previous.png
deleted file mode 100644
index 68ed8a13ebda3f72affbd4061d8225397865b3f6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1536
zcmV+b2LJhqP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm000}W
z000}W0bUxB8~^|S2XskIMF-am91$lTA^ycs00006VoOIv0RI600RN!9r;`8x1&v8W
zK~#9!-B(*|R8<t+_uNNkrY)Vefw2$!nzn@6q(F(bRTKmi38oa~Vf3RK^@C_6BpCQG
z)EIw|Xhe*nsY;90_@O_1R3V5>6F}0a!52Zn@G5PAPRn#=?(?|LVJLQZ8RL}bZFctU
zz2}^@_TFosJ4d5ieEok2tliohnm4mBZ0PLJlEyN7(g;+o{D?SF>&df`x5^8uv)Xt4
z)XO=at0+qP2~;fKp5xl_cf!TN$66nqO|IWhy?saTA)1%|5>zaEyOCV;<L3Kkls7M}
zCyy9KOqYfR2ME!pk3e`uJL9&wF)v$fduH|BT5)NJF2)kXIT2vNX*7KztX$Pm#O?Ub
zIW<$~EniYcil$OD8Y3>yDM=u4F+BvTR(Cf0G~V94XnOwis%ez4ZBk$o78fTjQ}0^Q
zf0qD&{RnYOX(+H}>3z3ThEJujSVDr~5BNy}T;8GtHzt5=$qAUxZ%UwQRc9?D{z+3^
zer?_KTugSzG$A*Ik;2#n0+(5Mc8qdoJj@l%M@;t<)BL2s6XuZT(j(7rqq+5!2SKDk
z1fg9gYO&awoJ_W5{_H$|&J>+uag$V4CB}py-NF=>qIgcPy}6mV=aI)@F3fY`U2<Iq
z<`T#A?H%2Bt!-U=%@QE$j(jZ89xl+E>na1JsUm8HfK94K@Cq?uoC_io2#7L_j9CEn
z#z7qi-m&3f&<sQ72hUv?pQlY!`HuOz>UGwZs6|tQ9KaS9(Mj`=Doqi+E)}mzFogh*
z1^=o8E~9rb9{2=&0DIDG3ue3I(-{W36Ge#L7XIa&3~NJmAu&U<DW1^C(6I<l0t1$V
zy~F|l2@P=Z41Pip6qyN+Gt8AlK!B4C5*7#q4E1UPisyD01nmX4O>xOF0ct6v8yQ$g
z0%Jh3=D1}5XW}^wFRs{lGvZy+dm<AsR6!CDRC6-@R}=7D3(p)Hjzq~o*s7|@2q0y_
zPM{)SIH?1MchCfkNQh9C9U(8IU*rpQkR>v7gR*=YjYSa@%Gp0SLI?Vei1#T39Bc8(
zA!n1$osF^K6KZC_Pq}%y6buGwN)AyLhG{xUFb!%nG>v>2I_bI&ZJ;ZXWpF{jM!2S+
zfwZ5Gj8Xqk1OzTp3@n6cVj)V&z#qHTIdCr(FKpZG3l?^&idk}DI7)F-sM@8>EQbP_
z?j;L2<oEet8RYYEWXvF4tfGi|qt2E?2}GMnm=upYGMfOEhI@&aT7vQG)SkAUf_q<_
zX{mgBUT*e^4Cp{*viC80++@@`P*E<BFhr_lTiIweN@fD>cV!NMS@Is0Nhv|f)!(yu
zIMn#u%7HUuPX_a{w-%O^W-%se%|Jx99XykU1rhxv5^{`*wHXLNu&(04d*lhxs~*fH
z2nX+7Dl0FhzQf0<Tq(cyPB^fCn{Xex^-uLiM<QL7wKa3Hb%=qdZtPO`$^OSb5a{b0
zTFHzjh#0b>>JX?7U>GsE3x=lUQ@EnEw~Wee{xLe&_rcM;x+j``Jb3Vx!tlWQ+SyGE
zyPVikr8(#v+p;AQ`6a|^CTbt~{eW`4HD3VPO(e(vy|3YgA9mVs8yu_UtMg}0bj(@s
zU{R63f^6GC+9f#Z?MM-N21B$rUa}42+WyJ!fsvoT*vqRH*X{eP^Zn|E#+Leq2Z)<O
zaF@g;H%N|DGcA3;h(?cgpU<jXwEUNE_CDKx?8qBU%N`Geys30~PxK%<$UVL1g6MC%
zg?rEQ8hg6m-O_c(L(Q{ls_!Hgw~1?_3)tiwOyVc^|LQAlX!!o~PhUM<b9mjXg)J=G
z2#}!}lXo&ooH}5^tsnIGm-~(%+tK)RYhkFgWOV4eNj{pH{fGAW!}DkKf7`e8?CF7H
mx8iJw-v4?O*7ct|9sdbZjEEhHxB%1u0000<MNUMnLSTZ`AJkF+

diff --git a/apps/files_odfviewer/src/webodf/programs/touchui/index.html b/apps/files_odfviewer/src/webodf/programs/touchui/index.html
deleted file mode 100644
index 49b8a31f44..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/touchui/index.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<!DOCTYPE html>
-<html>
-    <head>
-        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-        <title>WebODF</title>
-        <link href="sencha-touch.css" rel="stylesheet" type="text/css" />
-        <link href="webodf.css" rel="stylesheet" type="text/css" />
-        <script type="text/javascript" src="sencha-touch.js"></script>
-        <script type="text/javascript" src="lib/runtime.js"></script>
-        <script type="text/javascript" src="app/app.js"></script>
-        <script type="text/javascript" src="scripts.js"></script>
-        <script type="text/javascript" src="app/controller/Files.js"></script>
-        <script type="text/javascript" src="app/model/FileSystem.js"></script>
-        <script type="text/javascript" src="app/store/FileStore.js"></script>
-        <script type="text/javascript" src="app/views/FileDetail.js"></script>
-        <script type="text/javascript" src="app/views/FilesList.js"></script>
-        <script type="text/javascript" src="app/views/OdfView.js"></script>
-        <script type="text/javascript" src="app/views/Viewport.js"></script>
-    </head>
-    <body>
-    </body>
-</html>
diff --git a/apps/files_odfviewer/src/webodf/programs/touchui/scripts.js b/apps/files_odfviewer/src/webodf/programs/touchui/scripts.js
deleted file mode 100644
index 2683bc83b4..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/touchui/scripts.js
+++ /dev/null
@@ -1,130 +0,0 @@
-/*global alert, app, window, runtime*/
-var LocalFileSystem = {
-    PERSISTENT: 0,
-    TEMPORARY: 1
-};
-function FileWriter(fullPath) {
-    "use strict";
-    this.write = function (data) {
-        data = runtime.byteArrayFromString(data, "utf8");
-        runtime.writeFile(fullPath, data, function () {});
-    };
-}
-function FileEntry(name, fullPath) {
-    "use strict";
-    this.isFile = true;
-    this.isDirectory = false;
-    this.name = name;
-    this.fullPath = fullPath;
-    this.file = function (onsuccess, onerror) {
-        function File(fullPath) {
-            this.name = name;
-            this.fullPath = fullPath;
-            this.type = "";
-            this.size = -1;
-            this.lastModifiedDate = -1;
-        }
-        var file = new File(fullPath);
-        try {
-            onsuccess(file);
-        } catch (e) {
-            alert("Error on determining file properties: " + e);
-            onerror(e);
-        }
-    };
-    this.createWriter = function (onsuccess, onerror) {
-        onsuccess(new FileWriter(fullPath));
-    };
-}
-function FileReader() {
-    "use strict";
-    var fr = this;
-    this.readAsArrayBuffer = function (file) {
-        var path = file.fullPath;
-        if (path.substr(0, 7) === "file://") {
-            path = path.substr(7);
-        }
-        runtime.readFile(path, 'binary', function (error, data) {
-            fr.onloadend({target: {result: data}});
-        });
-    };
-    this.readAsText = function (file) {
-        var path = file.fullPath;
-        if (path.substr(0, 7) === "file://") {
-            path = path.substr(7);
-        }
-        runtime.readFile(path, 'utf8', function (error, data) {
-            fr.onloadend({target: {result: data}});
-        });
-    };
-}
-var DirectoryReader;
-function DirectoryEntry(name, fullPath) {
-    "use strict";
-    this.isFile = false;
-    this.isDirectory = true;
-    this.name = name;
-    this.fullPath = fullPath;
-    this.createReader = function () {
-        var reader = new DirectoryReader(fullPath);
-        return reader;
-    };
-}
-function DirectoryReader(fullPath) {
-    "use strict";
-    this.readEntries = function (onsuccess, onerror) {
-        window.setTimeout(function () {
-            var entries = [];
-            entries[entries.length] = new FileEntry("welcome.odt",
-                    "welcome.odt");
-            entries[entries.length] = new FileEntry("Traktatenblad.odt",
-                    "Traktatenblad.odt");
-            entries[entries.length] = new FileEntry("DanskTest01.odt",
-                    "DanskTest01.odt");
-            entries[entries.length] = new FileEntry("plugfest-gouda.odp",
-                    "plugfest-gouda.odp");
-            entries[entries.length] = new FileEntry("OpenDocument-v1.2.odt",
-                    "OpenDocument-v1.2.odt");
-            entries[entries.length] = new FileEntry("OpenDocument-v1.2-part1.odt",
-                    "OpenDocument-v1.2-part1.odt");
-            entries[entries.length] = new FileEntry("OpenDocument-v1.2-part2.odt",
-                    "OpenDocument-v1.2-part2.odt");
-            try {
-                onsuccess(entries);
-            } catch (e) {
-                onerror(e);
-            }
-        }, 1);
-    };
-}
-window.resolveLocalFileSystemURI = function (path, onsuccess, onerror) {
-    "use strict";
-    var p = path.lastIndexOf("/"),
-        name = (p === -1) ? path : path.substr(p + 1);
-    onsuccess(new FileEntry(name, path));
-};
-window.requestFileSystem = function (filesystem, id, onsuccess, onerror) {
-    "use strict";
-    var dirs = [], shared, subfolder, path;
-    try {
-        if (filesystem === LocalFileSystem.PERSISTENT) {
-            path = "";
-            onsuccess({
-                name: "root",
-                root: new DirectoryEntry("root", path)
-            });
-        } else {
-            onerror("not defined");
-        }
-    } catch (e) {
-        onerror(e);
-    }
-};
-var device = {};
-/*
- * override launch function to quickly open a file for testing
-onApplicationLaunch = function (app) {
-    "use strict";
-    app.openUrl("plugfest-gouda.odp");
-};
-*/
diff --git a/apps/files_odfviewer/src/webodf/programs/touchui/sencha-touch.css b/apps/files_odfviewer/src/webodf/programs/touchui/sencha-touch.css
deleted file mode 100644
index 7227e268be..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/touchui/sencha-touch.css
+++ /dev/null
@@ -1 +0,0 @@
-body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,code,form,fieldset,legend,input,textarea,p,blockquote,th,td{margin:0;padding:0}table{border-collapse:collapse;border-spacing:0}fieldset,img{border:0}address,caption,cite,code,dfn,em,strong,th,var{font-style:normal;font-weight:normal}li{list-style:none}caption,th{text-align:left}h1,h2,h3,h4,h5,h6{font-size:100%;font-weight:normal}q:before,q:after{content:""}abbr,acronym{border:0;font-variant:normal}sup{vertical-align:text-top}sub{vertical-align:text-bottom}input,textarea,select{font-family:inherit;font-size:inherit;font-weight:inherit}*:focus{outline:none}html,body{font-family:"Helvetica Neue", HelveticaNeue, "Helvetica-Neue", Helvetica, "BBAlpha Sans", sans-serif;font-weight:normal;position:relative;-webkit-text-size-adjust:none}body.x-desktop{overflow:hidden}*,*:after,*:before{-webkit-box-sizing:border-box;box-sizing:border-box;-webkit-tap-highlight-color:rgba(0, 0, 0, 0);-webkit-user-select:none;-webkit-touch-callout:none;-webkit-user-drag:none}.x-ios.x-tablet .x-landscape *{-webkit-text-stroke:1px transparent}body{font-size:104%}body.x-ios{-webkit-backface-visibility:hidden}body.x-android.x-phone{font-size:116%}body.x-android.x-phone.x-silk{font-size:130%}body.x-ios.x-phone{font-size:114%}body.x-desktop{font-size:114%}input,textarea{-webkit-user-select:text}.x-hidden-visibility{visibility:hidden !important}.x-hidden-display,.x-field-hidden{display:none !important}.x-hidden-offsets{position:absolute !important;left:-10000em;top:-10000em;visibility:hidden}.x-fullscreen{position:absolute !important}.x-desktop .x-body-stretcher{margin-bottom:0px}.x-mask{position:absolute;top:0;left:0;bottom:0;right:0;height:100%;z-index:10;display:-webkit-box;display:box;-webkit-box-align:center;box-align:center;-webkit-box-pack:center;box-pack:center;background:rgba(0, 0, 0, 0.3) center center no-repeat}.x-mask.x-mask-gray{background-color:rgba(0, 0, 0, 0.5)}.x-mask.x-mask-transparent{background-color:transparent}.x-mask .x-mask-inner{background:rgba(0, 0, 0, 0.25);color:#fff;text-align:center;padding:.4em;font-size:.95em;font-weight:bold;-webkit-border-radius:0.5em;border-radius:0.5em}.x-mask .x-loading-spinner-outer{display:-webkit-box;display:box;-webkit-box-orient:vertical;box-orient:vertical;-webkit-box-align:center;box-align:center;-webkit-box-pack:center;box-pack:center;width:100%;min-width:8.5em;height:8.5em}.x-mask.x-indicator-hidden .x-loading-spinner-outer{display:none}.x-mask .x-mask-message{text-shadow:rgba(0, 0, 0, 0.5) 0 -0.08em 0;-webkit-box-flex:0 !important;max-width:13em;min-width:8.5em}.x-draggable{z-index:1}.x-dragging{opacity:0.7}.x-panel-list{background-color:#bacfe8}.x-html{-webkit-user-select:auto;-webkit-touch-callout:inherit;line-height:1.5;color:#333;font-size:.8em;padding:1.2em}.x-html body{line-height:1.5;font-family:"Helvetica Neue", Arial, Helvetica, sans-serif;color:#333333;font-size:75%}.x-html h1,.x-html h2,.x-html h3,.x-html h4,.x-html h5,.x-html h6{font-weight:normal;color:#222222}.x-html h1 img,.x-html h2 img,.x-html h3 img,.x-html h4 img,.x-html h5 img,.x-html h6 img{margin:0}.x-html h1{font-size:3em;line-height:1;margin-bottom:0.50em}.x-html h2{font-size:2em;margin-bottom:0.75em}.x-html h3{font-size:1.5em;line-height:1;margin-bottom:1.00em}.x-html h4{font-size:1.2em;line-height:1.25;margin-bottom:1.25em}.x-html h5{font-size:1em;font-weight:bold;margin-bottom:1.50em}.x-html h6{font-size:1em;font-weight:bold}.x-html p{margin:0 0 1.5em}.x-html p .left{display:inline;float:left;margin:1.5em 1.5em 1.5em 0;padding:0}.x-html p .right{display:inline;float:right;margin:1.5em 0 1.5em 1.5em;padding:0}.x-html a{text-decoration:underline;color:#0066cc}.x-html a:visited{color:#004c99}.x-html a:focus{color:#0099ff}.x-html a:hover{color:#0099ff}.x-html a:active{color:#bf00ff}.x-html blockquote{margin:1.5em;color:#666666;font-style:italic}.x-html strong,.x-html dfn{font-weight:bold}.x-html em,.x-html dfn{font-style:italic}.x-html sup,.x-html sub{line-height:0}.x-html abbr,.x-html acronym{border-bottom:1px dotted #666666}.x-html address{margin:0 0 1.5em;font-style:italic}.x-html del{color:#666666}.x-html pre{margin:1.5em 0;white-space:pre}.x-html pre,.x-html code,.x-html tt{font:1em "andale mono", "lucida console", monospace;line-height:1.5}.x-html li ul,.x-html li ol{margin:0}.x-html ul,.x-html ol{margin:0 1.5em 1.5em 0;padding-left:1.5em}.x-html ul{list-style-type:disc}.x-html ol{list-style-type:decimal}.x-html dl{margin:0 0 1.5em 0}.x-html dl dt{font-weight:bold}.x-html dd{margin-left:1.5em}.x-html table{margin-bottom:1.4em;width:100%}.x-html th{font-weight:bold}.x-html thead th{background:#c3d9ff}.x-html th,.x-html td,.x-html caption{padding:4px 10px 4px 5px}.x-html table.striped tr:nth-child(even) td,.x-html table tr.even td{background:#e5ecf9}.x-html tfoot{font-style:italic}.x-html caption{background:#eeeeee}.x-html .quiet{color:#666666}.x-html .loud{color:#111111}.x-html ul li{list-style-type:circle}.x-html ol li{list-style-type:decimal}.x-video{background-color:#000}.x-sortable .x-dragging{opacity:1;z-index:5}.x-layout-card-item{background:#eeeeee}.x-map{background-color:#edeae2}.x-map *{-webkit-box-sizing:content-box;box-sizing:content-box}.x-mask-map{background:transparent !important}.x-img{background-repeat:no-repeat}.x-video{height:100%;width:100%}.x-video > *{height:100%;width:100%;position:absolute}.x-video-ghost{-webkit-background-size:100% auto;background:black url() center center no-repeat}audio{width:100%}.x-panel,.x-msgbox,.x-panel-body{position:relative}.x-panel.x-floating,.x-msgbox.x-floating,.x-form.x-floating{padding:6px;-webkit-border-radius:0.3em;border-radius:0.3em;-webkit-box-shadow:rgba(0, 0, 0, 0.8) 0 0.2em 0.6em;background-color:black;background-image:none}.x-panel.x-floating.x-floating-light,.x-msgbox.x-floating.x-floating-light,.x-form.x-floating.x-floating-light{background-color:#354f6e;background-image:none}.x-panel.x-floating > .x-panel-inner,.x-panel.x-floating .x-scroll-view,.x-panel.x-floating .x-body,.x-msgbox.x-floating > .x-panel-inner,.x-msgbox.x-floating .x-scroll-view,.x-msgbox.x-floating .x-body,.x-form.x-floating > .x-panel-inner,.x-form.x-floating .x-scroll-view,.x-form.x-floating .x-body{background-color:#fff;-webkit-border-radius:0.3em;border-radius:0.3em}.x-anchor{width:1.631em;height:0.7em;position:absolute;left:0;top:0;z-index:1;-webkit-mask:0 0 url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACMAAAAPCAYAAABut3YUAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAPZJREFUeNpi/PX7LwOFwAyIG6HseiA+Ra5BjBQ6xg+IVwAxJ5T/HYgjgHgTOYYxUeCQUiBeh+QQBih7HVSOLiHDDMSTgTiTgLrpQJwLxH9p5RhOaLT4EakeFF3RQPyF2o6RhkaBGYkheRmIPYH4KbXSjC4QnyTDIch6danhGCcgPgwNGXKBNNQMb0ocEwXE24GYn4FyADJjI76Ej88x7UC8FIjZGKgHQDlxGtRsZmISMMjy+dBQoSXYBC0gv+NyDD80xzgx0AeAqg4fIH6NHk0qQHyMjg6B1WvHYDkNFjIgwS1ALMowMOAjEAeBHINe2Q0U+AUQYACQ10C2QNhRogAAAABJRU5ErkJggg==') no-repeat;-webkit-mask-size:1.631em 0.7em;overflow:hidden;background-color:black;-webkit-transform-origin:0% 0%}.x-anchor.x-anchor-top{margin-left:-0.816em;margin-top:-0.7em}.x-anchor.x-anchor-bottom{-webkit-transform:rotate(180deg);margin-left:0.816em;margin-top:0.6em}.x-anchor.x-anchor-left{-webkit-transform:rotate(270deg);margin-left:-0.7em;margin-top:-0.1em}.x-anchor.x-anchor-right{-webkit-transform:rotate(90deg);margin-left:0.7em;margin-top:0}.x-floating.x-panel-light:after{background-color:#354f6e}.x-button{-webkit-background-clip:padding;background-clip:padding-box;-webkit-border-radius:0.4em;border-radius:0.4em;display:-webkit-box;display:box;-webkit-box-align:center;box-align:center;min-height:1.8em !important;padding:.3em .6em;position:relative;overflow:hidden;-webkit-user-select:none}.x-button,.x-toolbar .x-button{border:1px solid #999999;border-top-color:#a6a6a6;color:black}.x-button.x-button-back:before,.x-button.x-button-forward:before,.x-toolbar .x-button.x-button-back:before,.x-toolbar .x-button.x-button-forward:before{background:#999999}.x-button,.x-button.x-button-back:after,.x-button.x-button-forward:after,.x-toolbar .x-button,.x-toolbar .x-button.x-button-back:after,.x-toolbar .x-button.x-button-forward:after{background-color:#ccc;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ffffff), color-stop(2%, #dedede), color-stop(100%, #bababa));background-image:-webkit-linear-gradient(#ffffff,#dedede 2%,#bababa);background-image:linear-gradient(#ffffff,#dedede 2%,#bababa)}.x-button .x-button-icon.x-icon-mask,.x-toolbar .x-button .x-button-icon.x-icon-mask{background-color:black;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #4d4d4d), color-stop(2%, #121212), color-stop(100%, #000000));background-image:-webkit-linear-gradient(#4d4d4d,#121212 2%,#000000);background-image:linear-gradient(#4d4d4d,#121212 2%,#000000)}.x-button.x-button-pressing,.x-button.x-button-pressing:after,.x-button.x-button-pressed,.x-button.x-button-pressed:after,.x-button.x-button-active,.x-button.x-button-active:after,.x-toolbar .x-button.x-button-pressing,.x-toolbar .x-button.x-button-pressing:after,.x-toolbar .x-button.x-button-pressed,.x-toolbar .x-button.x-button-pressed:after,.x-toolbar .x-button.x-button-active,.x-toolbar .x-button.x-button-active:after{background-color:#c4c4c4;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ababab), color-stop(10%, #b8b8b8), color-stop(65%, #c4c4c4), color-stop(100%, #c6c6c6));background-image:-webkit-linear-gradient(#ababab,#b8b8b8 10%,#c4c4c4 65%,#c6c6c6);background-image:linear-gradient(#ababab,#b8b8b8 10%,#c4c4c4 65%,#c6c6c6)}.x-button .x-button-icon{width:2.1em;height:2.1em;background-repeat:no-repeat;background-position:center;display:block}.x-button .x-button-icon.x-icon-mask{width:1.3em;height:1.3em;-webkit-mask-size:1.3em}.x-button.x-item-disabled .x-button-label,.x-button.x-item-disabled .x-hasbadge .x-badge,.x-hasbadge .x-button.x-item-disabled .x-badge,.x-button.x-item-disabled .x-button-icon{opacity:.5}.x-button-round,.x-button.x-button-action-round,.x-button.x-button-confirm-round,.x-button.x-button-decline-round{-webkit-border-radius:0.9em;border-radius:0.9em;padding:0.1em 0.9em}.x-iconalign-left,.x-icon-align-right{-webkit-box-orient:horizontal;box-orient:horizontal}.x-iconalign-top,.x-iconalign-bottom{-webkit-box-orient:vertical;box-orient:vertical}.x-iconalign-bottom,.x-iconalign-right{-webkit-box-direction:reverse;box-direction:reverse}.x-iconalign-center{-webkit-box-pack:center;box-pack:center}.x-iconalign-left .x-button-label,.x-iconalign-left .x-hasbadge .x-badge,.x-hasbadge .x-iconalign-left .x-badge{margin-left:0.3em}.x-iconalign-right .x-button-label,.x-iconalign-right .x-hasbadge .x-badge,.x-hasbadge .x-iconalign-right .x-badge{margin-right:0.3em}.x-iconalign-top .x-button-label,.x-iconalign-top .x-hasbadge .x-badge,.x-hasbadge .x-iconalign-top .x-badge{margin-top:0.3em}.x-iconalign-bottom .x-button-label,.x-iconalign-bottom .x-hasbadge .x-badge,.x-hasbadge .x-iconalign-bottom .x-badge{margin-bottom:0.3em}.x-button-label,.x-hasbadge .x-badge{-webkit-box-flex:1;box-flex:1;-webkit-box-align:center;box-align:center;white-space:nowrap;text-overflow:ellipsis;text-align:center;font-weight:bold;line-height:1.2em;display:block;overflow:hidden}.x-toolbar .x-button{margin:0 .2em;padding:.3em .6em}.x-toolbar .x-button .x-button-label,.x-toolbar .x-button .x-hasbadge .x-badge,.x-hasbadge .x-toolbar .x-button .x-badge{font-size:.7em}.x-button-small,.x-button.x-button-action-small,.x-button.x-button-confirm-small,.x-button.x-button-decline-small,.x-toolbar .x-button-small,.x-toolbar .x-button.x-button-action-small,.x-toolbar .x-button.x-button-confirm-small,.x-toolbar .x-button.x-button-decline-small{-webkit-border-radius:0.3em;border-radius:0.3em;padding:.2em .4em;min-height:0}.x-button-small .x-button-label,.x-button.x-button-action-small .x-button-label,.x-button.x-button-confirm-small .x-button-label,.x-button.x-button-decline-small .x-button-label,.x-button-small .x-hasbadge .x-badge,.x-hasbadge .x-button-small .x-badge,.x-button.x-button-action-small .x-hasbadge .x-badge,.x-hasbadge .x-button.x-button-action-small .x-badge,.x-button.x-button-confirm-small .x-hasbadge .x-badge,.x-hasbadge .x-button.x-button-confirm-small .x-badge,.x-button.x-button-decline-small .x-hasbadge .x-badge,.x-hasbadge .x-button.x-button-decline-small .x-badge,.x-toolbar .x-button-small .x-button-label,.x-toolbar .x-button.x-button-action-small .x-button-label,.x-toolbar .x-button.x-button-confirm-small .x-button-label,.x-toolbar .x-button.x-button-decline-small .x-button-label,.x-toolbar .x-button-small .x-hasbadge .x-badge,.x-hasbadge .x-toolbar .x-button-small .x-badge,.x-toolbar .x-button.x-button-action-small .x-hasbadge .x-badge,.x-hasbadge .x-toolbar .x-button.x-button-action-small .x-badge,.x-toolbar .x-button.x-button-confirm-small .x-hasbadge .x-badge,.x-hasbadge .x-toolbar .x-button.x-button-confirm-small .x-badge,.x-toolbar .x-button.x-button-decline-small .x-hasbadge .x-badge,.x-hasbadge .x-toolbar .x-button.x-button-decline-small .x-badge{font-size:.6em}.x-button-small .x-button-icon,.x-button.x-button-action-small .x-button-icon,.x-button.x-button-confirm-small .x-button-icon,.x-button.x-button-decline-small .x-button-icon,.x-toolbar .x-button-small .x-button-icon,.x-toolbar .x-button.x-button-action-small .x-button-icon,.x-toolbar .x-button.x-button-confirm-small .x-button-icon,.x-toolbar .x-button.x-button-decline-small .x-button-icon{width:.75em;height:.75em}.x-button-forward,.x-button-back{position:relative;overflow:visible;height:1.8em;z-index:1}.x-button-forward:before,.x-button-forward:after,.x-button-back:before,.x-button-back:after{content:"";position:absolute;width:0.773em;height:1.8em;top:-0.1em;left:auto;z-index:2;-webkit-mask:0.145em 0 url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAB4AAABGCAYAAADb7SQ4AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAiNJREFUeNrEWb9LQlEUvj5BcHoQvMnVKXD1D3CLwqBJbHJsazQaWoSCxgbHJiMIAiNok6AhCDdXVycnJ8EQOgeOYaG+d39998KH+HyP753zzjnfd325xfdSgVeV8B6BScuEV0IRSbxHeCMk/AVFXCA8ScQKSXxPqK0fQBBfE5r/D+Y8VzUT9jb94DPimqRYIYkrhGcpKhhxIqTxrpNcExdlQJTTTnRJnCc8ykhUSOIOoZ71ZFfEZ4S2zgUu+rguxZRHEnPbfKRVsOtUl0RtYpOLTYljIS2Z3nVk2DY9SbNCEt8RDm0rUpe4La1jvXSqmtum72raZI24KuNQIYl/nSGSOJb0Jq61M0pxhjwK9304hUjHGSKILzc5Q5drUzttdYY+I97pDH1FzG0zNFUb04gTG4kzJS5kdYauiZtZnaFr4ooKsCIVaDHxKAQxt1NBnGIVHfGCcEQYh3jGU8KBfMKLiyM+lgzAq/qT0ArVTg+Ei1B9fEPoovV4fcfQd2HedScX39GprwGTNjJn0maTELN6IuSzECLB6T5x2eM66jQgnIeSxa60GnS3uL56tr7b1Ai0JPVwYi6yho2U2lgfKym19VxjMRHzEGbvS9K+RBPzetGVUpf29lZHSl2/DMnLvwh1ZMQrKW3Ic4fvJOZS6ZMQW5hpmpT63DvtlFLfm7bBNruM2C2yXb7y3U6ZpRS5P/4jpUjihRTbCJ3q1eL3GMMfAQYAJmB6SBO619IAAAAASUVORK5CYII=') no-repeat;-webkit-mask-size:0.773em 1.8em;overflow:hidden}.x-button-back,.x-toolbar .x-button-back{margin-left:0.828em;padding-left:.4em}.x-button-back:before,.x-toolbar .x-button-back:before{left:-0.693em}.x-button-back:after,.x-toolbar .x-button-back:after{left:-0.628em}.x-button-forward,.x-toolbar .x-button-forward{margin-right:0.828em;padding-right:.4em}.x-button-forward:before,.x-button-forward:after,.x-toolbar .x-button-forward:before,.x-toolbar .x-button-forward:after{-webkit-mask:-0.145em 0 url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAB4AAABGCAYAAADb7SQ4AAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAXlJREFUaN7lmTFqAlEQhh8EhFSCYJXW1law9QAewMrWAwQWAmmtbPcGHiCQ1gPYCla2QsDKSsgmQecvFqImu2/fzry/2OLb9mt23vwz47Kvn5MwEFxM8DkLB6HHEIOd0GGIwUpoMcRgyRKDOUsMJizxpzBiiMFR6DPEeZl1GWKwFh4ZYvAmPDDEqmVWVQxmLPG3MGaIVcosVAz2whNDDDZCmyEG7yFlpiEGKUsMEpb4XKXMtMXeiVVb7J1YLcRgW1ZmVuLSxGopLkys1mLwwhL/mVhjie8Sayxx3kp7DPFVYo0tzhNriyEGU5Z40TjxtDE/F6WcDowHBE/msDFNImG0xZQRBAonDCvxhhH2vKZIZ9Ds+7EDfaWFnKZ4xhja5owxdcnYCAQv1p1Gi4sprn08cZbDt6ZYZasXIn5mLFHTjLCvVt1V+4rVt/M+4r3FPaJMbHaBKRKb3pyKxKZXtv/Er4yjZpRL6q042u34tzh4xV9H/FHnqBHKBQeEd6aqqwD6AAAAAElFTkSuQmCC') no-repeat}.x-button-forward:before,.x-toolbar .x-button-forward:before{right:-0.693em}.x-button-forward:after,.x-toolbar .x-button-forward:after{right:-0.628em}.x-button.x-button-plain,.x-toolbar .x-button.x-button-plain{background:none;border:0 none;-webkit-border-radius:none;border-radius:none;min-height:0;text-shadow:none;line-height:auto;height:auto;padding:0.5em}.x-button.x-button-plain > *,.x-toolbar .x-button.x-button-plain > *{overflow:visible}.x-button.x-button-plain .x-button-icon,.x-toolbar .x-button.x-button-plain .x-button-icon{-webkit-mask-size:1.4em;width:1.4em;height:1.4em}.x-button.x-button-plain.x-button-pressing,.x-button.x-button-plain.x-button-pressed,.x-toolbar .x-button.x-button-plain.x-button-pressing,.x-toolbar .x-button.x-button-plain.x-button-pressed{background:none;background-image:-webkit-gradient(radial, 50% 50%, 0, 50% 50%, 24, color-stop(0%, rgba(119,178,248,0.7)), color-stop(100%, rgba(119,178,248,0)));background-image:-webkit-radial-gradient(rgba(119,178,248,0.7),rgba(119,178,248,0) 24px);background-image:radial-gradient(rgba(119,178,248,0.7),rgba(119,178,248,0) 24px)}.x-button.x-button-plain.x-button-pressing .x-button-icon.x-button-mask,.x-button.x-button-plain.x-button-pressed .x-button-icon.x-button-mask,.x-toolbar .x-button.x-button-plain.x-button-pressing .x-button-icon.x-button-mask,.x-toolbar .x-button.x-button-plain.x-button-pressed .x-button-icon.x-button-mask{background-color:#fff;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #e6e6e6), color-stop(10%, #f2f2f2), color-stop(65%, #ffffff), color-stop(100%, #ffffff));background-image:-webkit-linear-gradient(#e6e6e6,#f2f2f2 10%,#ffffff 65%,#ffffff);background-image:linear-gradient(#e6e6e6,#f2f2f2 10%,#ffffff 65%,#ffffff)}.x-segmentedbutton .x-button{margin:0;-webkit-border-radius:0;border-radius:0}.x-segmentedbutton .x-button.x-first{-webkit-border-top-left-radius:0.4em;border-top-left-radius:0.4em;-webkit-border-bottom-left-radius:0.4em;border-bottom-left-radius:0.4em}.x-segmentedbutton .x-button.x-last{-webkit-border-top-right-radius:0.4em;border-top-right-radius:0.4em;-webkit-border-bottom-right-radius:0.4em;border-bottom-right-radius:0.4em}.x-segmentedbutton .x-button:not(:first-child){border-left:0}.x-hasbadge{overflow:visible}.x-hasbadge .x-badge{-webkit-border-radius:1em;border-radius:1em;-webkit-background-clip:padding;background-clip:padding-box;padding:.15em .25em;z-index:2;text-shadow:rgba(0, 0, 0, 0.5) 0 -0.08em 0;-webkit-box-shadow:#000 0 .1em .2em;overflow:hidden;color:#fff;border:2px solid #fff;position:absolute;width:auto;min-width:2em;height:2em;line-height:1.2em;font-size:.6em;top:-0.15em;right:0px;max-width:100%;background-color:#990000;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #e60000), color-stop(50%, #b30000), color-stop(51%, #990000), color-stop(100%, #800000));background-image:-webkit-linear-gradient(#e60000,#b30000 50%,#990000 51%,#800000);background-image:linear-gradient(#e60000,#b30000 50%,#990000 51%,#800000);display:inline-block}.x-tab .x-button-icon.action,.x-button .x-button-icon.x-icon-mask.action{-webkit-mask-image:url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAFI0lEQVRoBe2YW4hVVRjHZ0yzq6lFEaMlE0PShYRAJIl6iEqKHnqI6WJB0IvdICkfEk0aIyo0KFCph8giCitI7CkoohQL7SoZDaQmXSgKo4uWNf1+zt7DOXvOOXuvvc85bc+cD36ssy/r+77/Xmt9e+3TOzIy0jORbNJEEqvWruBOH/HuCHdHuMOeQOmmdO+ozaA5oxXPunSC2Re4MbgCNiB6vvqbKbx0giNxp9BeBU/BIJqnRecLN2UVrLDj4GIYgscRfSltYSuzYMUdA/0wCI8ieglM5XduK7vgWJhTegGshucRfQHkyj1XpziLNrfmOh2ug1dhMaJn0gbZZDpNpsexQb2y3azfKXCAwns4W5dMd7m2B2ANLCT/x/A/nKknN5mUhWFp1g4Z7vM14jrbBZvgEwi1tAdkDEf3ZrgI0S/RrkP4IdqGpuA+cJo0yw7iyNfJmzAcMrokfjp93HC4XrPYCdzkgPXDPPqvJN7eRh0VrBWqfKMuev6k3Qzr4SP4HWqOFIkZ73iYA/NhLpwPZ4LLS+FZzUp+GtwAA/heS/sGwv+irWnXc9bdTRF20/8eOBWmEKwnCectOrPhSlgF2+Bb+Bl+AxP8B/6FvLn8Td8fYQXMSubgsVZU8Cv4mAeNhC7k+jLYCopzrRURlvZA9P8WLIJJlcI5zi1Ypw+Dr4oqp3EAzlsbLCjfg1PeEUxLtlnXXU4/wQboq8gpl2BHx2l5UuyosuW8I6rQb8Bp1iwRefy4VN6FReaopU3pX7jnhwSO7MmVIiNnJ3L+DtgHCm3ltA0RH4/26rhKk1tdu4kr7yeuHkKgU3rMqI5ncfAQDIKbg14oi1nJv4OvTShthC9LjmTyGB8XwhZw+oQ8+Xbc68C8AOboK6+YYPpfDV+B06YdAkJiuMtzhvrOP1JYafMLpu/Z8CmEJNGOe60fz0J/cjZmWcP0G2+sWZ/aUnCqhFosOq7gyf6uOT888th+Ot0HmxF7MOkgt2AcXQNLkg5rHPv+dffjVvPX6PdeWtf7MJhUssD578ZtEGL6sY4MIfTjeh1zCWZ0Z+DwQXAkapkjtzviPdoPYB+JuJVMNfy7QQkR7MbGPfRaYhi7ruUSjLcbwe1k0tw2vgivwy6C70/ekPE4JK+N+HySWDuz+A5xXOnvlsqD6Lf/QjwBnxNc4a02YwzBeuIdyBosWDDT7RKcn1MRYA+/V8ImAv9Rcb5VP53ufoQ8AB8S0+PMFiwYz5fDzCjCF7SLCbojOm514zZ3HViYLIZVxmD4h8B0rtWtFXkEn4tTv22thPe2SawVeDs8TTz/NqoyhLqDGoC7wervt3lNCxKMY/fIc+BLuJXgn9G20pyuVuA1sJF4vt7GjHx8nZnT7XAXzIXnoK4FCcbLVHAqLW+DWF8v78Aq2EY8v7zGDK2+EmfBI3AtTAPNTU1dCxXs/a6ht+t6bM4FNykvw/0IdYSrDLHu8iyeQ7Cg6mLKQahgd0pbSOJwit/cl6Np6p+BrxGn6hNUp1z3m/tOWAH+DrIgwSTQcBcTFLnOzcRwSjZ6j/vdvQyCxRrSanu0mWvZqp3LjkbBuYTGnSac4CxreCQqJPFD+r/bhq+dtOSyCO7DyWzIcm9avKLXXb+FcskiYjlBfB0lP9KLJp+nv6N7ZL+cp7N9sgg+L6/zMvabcEWrK7iM07CZOXVHuJlPs4y+rNJ74JkyJpczp62N+vWOfpw0uqWzrnXXcGeN53g13REe/0w660x3hDtrPMer+Q9LNCcV91c+jgAAAABJRU5ErkJggg==')}.x-tab .x-button-icon.add,.x-button .x-button-icon.x-icon-mask.add{-webkit-mask-image:url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAABqUlEQVRoBe2awWnDUBBE843B4NxcQSAFOC4lJeTkoxtJDykgvRhcgCFNJCFgIs+ChEHSJX93YT6ZD4ssmR3NztNFH5Wu6+6iVynlEZpbp+4J3s5OjWm7DRxZuMMCdUB9oyzNmrJe01hEejMtM5exIh6bCI3JbFkDT27EckEDs5DI8iHCWcmy6IowC4ksHyKclSyLrgizkMjyIcJZybLoijALiSwfIpyVLItuOGFso/xiuEvAgJdeK0DqJrHEhtsTTh9ul9y/ChR2KE+Y1ruDt2ccI7d6PszcK+oFFblWELt3Cn6i/8epMW5/W+LKGrUZ/0NwboF5QxuPsfY8dmOxJs41cBOYHCZF2BFeE60i3AQmh0kRdoTXRKsIN4HJYVKEHeE10frvCNvr4RH1HojH3rGHr3hqA7VdkxPKvuKJ3AA4hn7BM3xxA5N71Fdv1gz/tax3P+hFHmsJwM/8wraMadqOh5GuXda76rVqNWb7wgeevQvRRQ1MBCPFiginxEokKsJEMFKsiHBKrESiIkwEI8WKCKfESiQqwkQwUqyIcEqsRKIiTAQjxcoVrP83/9czD9EAAAAASUVORK5CYII=')}.x-tab .x-button-icon.arrow_down,.x-button .x-button-icon.x-icon-mask.arrow_down{-webkit-mask-image:url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA2ZpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYwIDYxLjEzNDc3NywgMjAxMC8wMi8xMi0xNzozMjowMCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDpGRTdGMTE3NDA3MjA2ODExOTJDQUMyNUQwRUE4NjdEQiIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDoxQTFBMDFDQ0I5NEYxMURGQUU1RjlGMEFERUNDQTVEMCIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDoyMkRCMDIxMkI5NEUxMURGQUU1RjlGMEFERUNDQTVEMCIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgQ1M1IE1hY2ludG9zaCI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOjMwRTE0QzVBNDIyMjY4MTFCQ0ZCOTAzOTcwNzcyRkVCIiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOkZFN0YxMTc0MDcyMDY4MTE5MkNBQzI1RDBFQTg2N0RCIi8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+HfrH/AAAAeVJREFUeNrs2cFHBGEUAPA3zYqIiIhOnTpFRHSKrp26RqeuEV077R/QqWtE166dOkVERHRa9hQRnZalFcv0Hk/W1Mx+38z3vvlm5j3eZW+/9+abne+9KEkSaFPMQMtCwQpWsIIVrGAFK1jBClawgo2ik/4hiqJGwLKuvfpIc5xSkWqYr5hzU1s/mRNxXTPsJ+ZqluvXlwOmSj3XBDvG3M1rpAmYYoUrFzr4ZNqTawqm2MH8Dhh7ZXJUbcAUx4FinzBnJcAUl4FhP/jIgRSYKvkYCJaO2LbNv08RMMUy5nsA4COTLy0XYIqtil9iF6aflq7AwBWuAvuQ9ZKSBgNX2ieWjtKSzeXBNZgqfe8J+4W5aXtbcg0GrvibB/BhkeuhBJhigzsghT0veh+WAlMcCGHvMOMQwcCdcIntYy6WmXhIg2PuiAvsEHO97IhHGgzckb4D8L6LmZYPMHBnhiWwXVdDPF9g4A4Vwd66nFr6BAN3ygbbw1yoMzjmjplgB5hrrufSvsHAHesZDOD2JAbxVYCBOzfIAZ9JbR6qAgN3cPwP9kZy1VIlGLiTdluCmoOBO/pnS9Bk8DzmS3pL4BMcpZEe1qX0GI/atC4dQYXRMa1MU0IX4gpWsIIVrGAFK1jBCnYUPwIMAPUPAyFL+nRdAAAAAElFTkSuQmCC')}.x-tab .x-button-icon.arrow_left,.x-button .x-button-icon.x-icon-mask.arrow_left{-webkit-mask-image:url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA2ZpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYwIDYxLjEzNDc3NywgMjAxMC8wMi8xMi0xNzozMjowMCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDpGRTdGMTE3NDA3MjA2ODExOTJDQUMyNUQwRUE4NjdEQiIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDpGMDZEQTFBREFDOTMxMURGOEQ2MUVDMjM0MzY2NTBDQSIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDpGMDZEQTFBQ0FDOTMxMURGOEQ2MUVDMjM0MzY2NTBDQSIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgQ1M1IE1hY2ludG9zaCI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOkFGQzJEMjQxRjIyMDY4MTE4QTZEQzUxMDg5Q0Y0RTRFIiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOkZFN0YxMTc0MDcyMDY4MTE5MkNBQzI1RDBFQTg2N0RCIi8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+FXGmxAAAAghJREFUeNrsm09ERFEUxt+rxBAxqyFm1SqiRYpMSpFapUVaRGpTRIpIbWLaFJEoRZtilChRWiRKsyklilYRERERERGZvsN57Wfmvnnnznkfv+WM+bn3e/ePN24mk3E0pcRRllC42FOWy4dc1w30R+fz3LFthEs1TelZ0KlBuAIcgmRgHS5gqlm2RsNTmqbvrUlZycLT4BhUiliWfEwEbII+UeuwT4nzqNZq2Gm1gTu/ZaUIj4NTEBW7tTTY1zUwKH4vbaive6BBw2kpAa6DkA1CeBicgZhVx8McUg5WWNi+83CWiXFfE9ZeAGQR6ukBqJKyu/Gzw7TcXEiS9UuYbiWWeU8ckXYqMT2lozyFW6SeOU0K1/FhPS75RsHUlKbj3KV0WRPC1Nd5sCuxr6anNPV12zFwk2jLCCdtk81XeAIsahL+BVOgH3xrEPayA5rAixZhyj2oB2ktwpR30A5WtQh7vR4DQ+BHg7CXLdAMXrUIU26411dahClvoBVsaBF2uMsjYFRCrwt5a7kOOnjUVQg7vE43cr9VCDu8I6Nep7QIO7z3HgCTvHYXvbCXJe71hxZhyjmv1w9ahCnP/DDb1yLs9boXzGgR9rIAusCnFmHKCff6UYsw5Ymlj7QIU75AN5gz9YVuLu8eB/S+dA+v1+l83pe2Sfg/BRe2OeGfPELhUDgUtip/AgwAw4tbozZtKFwAAAAASUVORK5CYII=')}.x-tab .x-button-icon.arrow_right,.x-button .x-button-icon.x-icon-mask.arrow_right{-webkit-mask-image:url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA2ZpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYwIDYxLjEzNDc3NywgMjAxMC8wMi8xMi0xNzozMjowMCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDpGRTdGMTE3NDA3MjA2ODExOTJDQUMyNUQwRUE4NjdEQiIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDpGMDZEQTFCMUFDOTMxMURGOEQ2MUVDMjM0MzY2NTBDQSIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDpGMDZEQTFCMEFDOTMxMURGOEQ2MUVDMjM0MzY2NTBDQSIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgQ1M1IE1hY2ludG9zaCI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOkFGQzJEMjQxRjIyMDY4MTE4QTZEQzUxMDg5Q0Y0RTRFIiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOkZFN0YxMTc0MDcyMDY4MTE5MkNBQzI1RDBFQTg2N0RCIi8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+xvZexwAAAhhJREFUeNrsm8FHRFEUxu9rxhARsxqiVauYXWoTpTYtUkRqlWkz0WaiTW2iNi3atGhTm4k2E5GYSJRaZcZQtIqIISIiYhgyfZdv/oF59913X+cdfst5733u+c495743XqvVUpKiSwmLWPB/j2QnP/I8L9SH9lN3/KxwQlpKT4FtaR7eAhegR1LRmgEVMCCpSg+CGtNczLbUC8pgQ9I+rCv3LiiBbkmNxwJ93S+p08qCRzAhqbVMg2tQkNRLa1/vg6ILvrY5POTAXdi+tj0tDbOYjUoaDzPgBuQlzcMpcEhSkg4A8lztjBTBin6u0d8iBOvoYwXPSRGsuEcXuWcnJAhuR4G+TksRrGOMfXhWimDFjqzCyUuE4LavS5yxExIEt0OfopRN+DpKbx6MHAtHSfAeWPN7kWQEhDbAMjg1cTHXBdfBLHiSUKXvwZBJsS4LPgCT4NP0hV1L6SZYAcdB3cAlwe9gDlQlTEsP9Gs16Bu5IPgIjIOP/34AoP26Ss82bd00LA/r1Vzk1mM1whCsfTrPpsJ62E7pE/q1HpaPbAn+Betgib1xaGEjpb+Ywrcu7H9BC35m8//mSncTZEqfgRGXxAYpeJNp3FCOhemU/ub+euXqzGlS8AuYBq8unyiYSulLNv9OizUleIcr+6MiEF4n3x7ze2n9OkSfE5/bfmg/30v7ERxaWBcc5Yj/5BELjgXHgiMVfwIMAGPkXbHq6ClAAAAAAElFTkSuQmCC')}.x-tab .x-button-icon.arrow_up,.x-button .x-button-icon.x-icon-mask.arrow_up{-webkit-mask-image:url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA2ZpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYwIDYxLjEzNDc3NywgMjAxMC8wMi8xMi0xNzozMjowMCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDpGRTdGMTE3NDA3MjA2ODExOTJDQUMyNUQwRUE4NjdEQiIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDpDQUZBQUM3NEFDOTMxMURGOEQ2MUVDMjM0MzY2NTBDQSIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDpDQUZBQUM3M0FDOTMxMURGOEQ2MUVDMjM0MzY2NTBDQSIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgQ1M1IE1hY2ludG9zaCI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOkFGQzJEMjQxRjIyMDY4MTE4QTZEQzUxMDg5Q0Y0RTRFIiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOkZFN0YxMTc0MDcyMDY4MTE5MkNBQzI1RDBFQTg2N0RCIi8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+ar3jxgAAAbFJREFUeNrs2j9ExGEcx/H71YmmpoiIaIq4KSKi6dabbo1oiqamm1qboimiNZpuuikiIqLppiPipqYjIuLp+/D95vy6X/frfr/n730e3sst53XP9x7u+V2ilKpM05qpTNkCGGCAAQYYYIABBhhggAEGeNSqpl9IkiQKWNbvfBc7PDdNIz1PPVK7Trd+OMPrRr8l9Uat2nT9+CyCW4yVnnnHowTXqa8UWHcdI3iNGozASscxgReo7h9YxTtfjwXcHoOVBjwJQYNPcmKlLk9EkODGP7FSO0TwOvU+IVjxZAQD1iPZK4CVGiGAZ6lOCVjFE7LhO/i0JKzUK3KImQY3S8ZKHZ4cr8A16sMQWPHkeANepF4MYqWmD2A9arcWsIonqOYafGYJK73yRDkB71nGSnd5r4jKBG9Sn47AunOb4CWq7xAr7dsA61G69wCreMK2TIMvPMFKfZ44I+ADz7DSQ9YhVgS87fiQGtdlmeBlvkNWnndYBljfGT8FgJVDbKco+CoQrBp6mrEyKfgoMOyvpxlZ4CT9vcXj0shWNe8nE8vCfzwABhhggAEGGGCATa1vAQYAZekAmr8OukgAAAAASUVORK5CYII=')}.x-tab .x-button-icon.compose,.x-button .x-button-icon.x-icon-mask.compose{-webkit-mask-image:url('data:image/png;base64,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')}.x-tab .x-button-icon.delete,.x-button .x-button-icon.x-icon-mask.delete{-webkit-mask-image:url('data:image/png;base64,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')}.x-tab .x-button-icon.organize,.x-button .x-button-icon.x-icon-mask.organize{-webkit-mask-image:url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAEdUlEQVRoBe2aS2xMURjHjbbqUaLoI7RChQUiGo9YaEqkoolIkCASSki68dixsLIVYmHbkJA03UgkFRI2QgRBKl4RgtJFK0jUI+o5fv/p68ztmUlHzpzO9PZLfjP3fOfcO9//fOeee+69E4lGo6PCZKPDJFZaQyc4N1mGI5FIMfUVkAfZMPaVwE54yqn6i+8BllQwravgAEyEv5DppsQ8gYPw3hqsJi0bNJ4El0GZzSa6iHcbjLbpsp7DDGX5V8ByyDbLJ+CdUGQLPNGQnkzj3TDFspN68BNkwhDPIY5poG/T1lBYR+LOkuW4uSeR4KXssN48grF9h20NdeukYLRL96Y6vAD2wCwwbQyFvXARPpoVA85fKnXiN4HtvP2Gf0tPG3XWUKNYT4E6PxjvD3x1EDHPZZvgxTTSDBc8gMrKbql5gKHeJh7NM6/AFu91/EVmjHGTFmN+HA3qYSoE7SuO8+zcEawY4vJdfr8Z/ljiqMS3AV2RvjpTPc7V0A623rqJv8RsnynbxDUXXieJuy/LfRmmEzSd7wKtroL2Hcc5BL4LVmRCmbheEIfmHduVQ1muQV/3BN2bJZyqaANbdm/jL+xtm4nfxKcsP08Q/zX8MxV3TDXqx+PYBGUQNHVAI9AsYrsuB9sPVflDT5xH+O7OZn8kK9msJf6G3ooFOOr66+O2NOVL6A7oP/njmmREQcN5LGhy1cLJtBwK++FSLqrVSGvPcrCZGu8DZTqTBSs+zUkarTZTUrerYh50gHYY7rSpRxZCCYTByvouS2FQK42hE9w7S/tKsOaIt/AGfoMWO3OgFLyYb8FaGByHl6C1r27jlsAh8HaN14LD1+x8jN/KNVdqlAvhgq8YfJ/DLYjVUDatk8J905HObd+Cf1rEaHTp5sSL+RacaKWWyO+8E3wLdi4g1QOOCE61x7Kt/UiGsy1jqcY7kuFUeyzF9ok6WA8ZvJjLtbQWEI/hXpLIW4N1rLyiPHV5hP9MsM4or2V7hlH+702XghWE3gAcTRKN3mjY7AZOdZbNCnAug4wTrNXSItCrmmYSZ3tGTNVAo+1nvCLOyLyeT9WC7WlqXNtUCq7vlpTlGkQMeG+Vio9j6NbxMOjtn8u7udjzaJcH1H3uLViVikCzLftqEtsKbeAyNh3LuWAdVM+yr8JsU8hgt9mvGh6ATousEKwgdcvXCMWDFap2mOYBTWK6b3YtNvYDrs9hM0i9BTgB+YMRTbvp0AS6bzaP43I7LUPaDFBvHPVmIy+ZaOp1+TkJX8Dc3/V22gUrYF1jN4L1r0T4NSPXg+sZ2dZZXgRr5m6BymCW8en6rc54BrYAXfu8CFbQmoQ0c1eYoilXw0NQp7gWZzueN8H68S44DbG/IPA9H66AL7FR12tpYk9qetOwGfSaVjcMNVAFie6iqHJv6bws2YaUfLpctYP+S5WoTVr8vjOMvphN4FN4N69Dybs6yw+OCLZ0yrByhS7DmrRaoQE0Kw5707JOf/UvH/ZKewTG/kscFrHSGbpzOHSC/wHSRhVOrpN3ggAAAABJRU5ErkJggg==')}.x-tab .x-button-icon.refresh,.x-button .x-button-icon.x-icon-mask.refresh{-webkit-mask-image:url('data:image/png;base64,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')}.x-tab .x-button-icon.reply,.x-button .x-button-icon.x-icon-mask.reply{-webkit-mask-image:url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAES0lEQVRoBe2ZSWgUQRSGM24YTdSo4AYRTcxBEZJDJCoigrtGg6CIgihqogfRgEERguhB40UP6kHw4kEET4J4E9wPAdeg4ALigjuKcSMuMX7/mAmdSU/SXdM9PTPpBx/T3al67/31urq6K5G2trac3mR9epNYaQ0FZ3vFwwqHFc6yEQhv6SwraBc5YYW7DEmWXUhZhSORSC7UwKIgxzAlghE5CZFHoAEKgxTcz8/gCI3gfzHsh6l+xnLq2zfBaC0miXpYDvmgu+kXBGqeC0aohK2D7TAF+kPamKeCETseZdugGgZDSp4RxHFsnghGqKo4H/aB5uoASEtLWjBiZ6KsFlaAHlJpbUkJRmwl6rTcFKW1SktyRoIROhofdbARhlr8OTkMdBPNlWCE6iG0AA5AqRN1Nm1cxbTpn9Qlx8ERO4pIG0Br6yDDqH3pV4kvPdRewCd4C+/ZPdWx7xZxsk1LgqvIZDeUeZzRT/xJ8Dt4BQ/gGjSSVzO/3psEJ4JoY+A4fATNvVTwhjh34RSshMGJ8jO5biuWIJqrc6AJ/kIqhNrF+EFs3fqHYRoMMxFp7dNFME5Hwi5QMLskgrqmgb8M+hgZYRXh5riTYBxpFM9CUKKcxlWOSyHPjVi1jQqmYy7shQ/gNGjQ7f6Q6yWY7UY07XNK4CK0QtAiTOK/J29tLOQ7EU67nIGgtfU1mARMhz6a3zegtCfRHXOYxhXtndJBgGkOT9FQ1Z3oDsFqhBXAFngJpkGD7veN3NclEt1JcKwRHaaD3niCTt40vh6+q2N6rL+2gtUA03p8FL6AaeAg++ntsNwqNqor/kL8OZ2WgF71vEpeq8FvC36uDveJM8qqyenHwzg67oE1MAxMTeLOQyNod0SDqO2hCaDVIma6u3R9OAxq/9WxW9PT+wRsQ7RiE7Gbj4f4v9F8Fujxb1ptfR2tj/cbf04bfbbqZWgsFEM5LITNcBLc3HF6iM2IxXAlWJ0wJXEQfoFb4RJcEwtu8kv/PCiEGdAAevFQJbvL5Rh/j351uRbcLloVmA83ewgUn0TSgq2DRGzloVt9E9yDFoiPqfOvUBHN3erA7TFOtG6fBqdfVp4KtuZLDqr8DrgDdqIPcb2/UYXjAmmu1cLDBIGswX0THMuJHIrgDGglsMZu4nxI0oItgcbjUHP7MyRaanwXrHywvlAFj8E6v+dqZ8MTI9BzHO2DtaC9KY1wIEYurXCO4JrbjyA6CvzO80wwznS3tMAFDpfBKdArnkY4ECOXqwTWUqZvA1mJp4L/+4wKf8ZxDeyE26AlLBBD9HUC14GWr8mezWEc2/oiiNZM/TumGbRLkdQ6nChOT9eJWw3ffakwjjuMRF5wUg9b4QnE5hOHKTVNsSuO3qW9SosN/Yn4KmAQbnnl040f4pelVLCb5Pxq6/st7Vfipn5DwaYjlyn9wgpnSqVM8wwrbDpymdIvrHCmVMo0z15X4X9rh8wHLEjawQAAAABJRU5ErkJggg==')}.x-tab .x-button-icon.search,.x-button .x-button-icon.x-icon-mask.search{-webkit-mask-image:url('data:image/png;base64,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')}.x-tab .x-button-icon.settings,.x-button .x-button-icon.x-icon-mask.settings{-webkit-mask-image:url('data:image/png;base64,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')}.x-tab .x-button-icon.star,.x-button .x-button-icon.x-icon-mask.star{-webkit-mask-image:url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAFfUlEQVRoBd2aXahVRRTHz/Ujv+2mZRGZB7W6mtpFikC7+UWUZiqBD0JPFdRL1EMFPfjoU4baS0FUD/UWZBEVShA+BCpmWApRSkgllNpDmZWZt9//eOay72afvWfWOTPn3rvgz8yeWbPW+s/XmT379AwODtZSSQ+CryVgA/gVfIx/pelEhFMBVlvBOaBeFo6Cean8y09KsnMg932TqCOs9M2UhMfhMJVsxtHcAmcbmekLCsqjFKUkvAYG1xSwmEHZqoLyKEVJCDOCNxH9HUCbVl6mULAuXxjrOQlhgl8Bbi0h0Uen3FBS37GqVIQHiHh2SdR16jTlo0t0woycpuxiUDSdHcFeMv3uIWYanTDB3wIWVZBQHP10zuQKvbarUxDWT1HRz1E++Ds99fLtgp6jEmbExhPNcs+IbkZPiCpRCRP5TPCQJ4MJ6A3QSUqjSWzC2ozuC4j+fnSnB+gHq8YmvJKIJgVEpRPX9QH6waqxCa8PjEhHT981H2j6qno0wqzF63BhOUxsom3Zb7aJqGsUjTAONFJlpysXQz7VuXpavrBTzzEJaz1adlzNjHs6RTBvJyZhjZTF/kTaWZZCnlvhsyWgQkPZQpagzsX1bFlAXjGtDdAPUu1p3PPQhCCXkdwG/mta0PWLds060AuAnqtEOjpdbQR3VymX1P9F3UfgGJA9X9F92c/ADaQ2P8V0DJ4/kDbeYKaSvgI2AN0+OGJK1VAbSIhTOXEOybYll2kte77yD4rqrHyb85S9Cl4HtReAyI11/A7HpRq5PSD6oR0f3Rad+H7S1DvV7UgS+tc1cU3n3V/AWJ/SX8BxVuMinow2rNNjlPQVeH0GFg378kDBfLAPXARjZbTPwmUXmOG+bgz71EKFfqKeAUWfREZbJxyCxyOOqEuHER4qrNUWovwy0CFktBHV4eNZMNvxyaaFhKWAaBt/HJwEo4W0luSKLMF8viVhp4iBeeBd8CcYqcQ1qi+CKS7uVmklYdcQY0+C42Ckkf6EmO51cVal3oRlCFkCdKgfCWtbo7obDO3AVWQbHHyUsjo40E6uq9cvQbdG+wN892fj8s0HjXDWKA51/t4JUo72H/jTDtybjSUkbyYsJ0gdfAtSjfTn+JoWQjCv2+57a4M1QaQSvZvrMsIs7RJejGcdUlLJUhzpZsYsZsJcCen6ZwCE3IaYA2021OfUdU3fJltmwni7Fvh+KDMF16KR3ux0lWuSdgjPxeNdJq/tNdKNqJaSSUyEmVK6JNPomtqbIh3eSKNsEmvAarfJ5LEzjbbR59MtpqyEb8eZjpndkhtxvNri3Er4YZxpx+yW6Jdhi8V5MOHm+n0QZ9afo0u0fQO8A5S3iPaQ1cTSG9w4f/SqesZBH/gRWI6T+gyyxfkgvw2cMdrS+/lTzpZvGnyWxsnTwHLRd4R2a/OBqQyoztKBe/P2qp6DCBOUptKHhuA+pU1fq2Co0/F0L9CVaghxXTbWW9ktKg8lrFfCrwODeh/9wgu1bEDo6OT2Fvgb+JLWq+nQEsnaa5UPJbwKBxc8A9KXPG1O3u+u6E4F24GvD3XMDjCxFcF8uTdhjGpHfwn49L42lCeAdyDZwGi3HpwAPr6+Q29htn1ZPoSwfuz3ewShXVcBNz62lzkvq6O9DjZHgQ9p72kdQljvob9VBPAN9Q+UEQmpw5b+Sf8e0FotI/4a9ZN8bIcQXlnh9AD1y3ychuhgU0tpJyhb14epn+ljN+Sk9S9G1ct50d8SdgF9x9EO3lHB5hXwPEYfA8dbGD9LuWZBtfj0inSQWUDTKzu1dAB5Dkz2tdOOHn70LvwVyMag/FYwzse295Rukq5j+G1wEOib66PAy5FPMD46+NPmqTV7CpwGGvkJPm2l8z8GWDNDloqpGQAAAABJRU5ErkJggg==')}.x-tab .x-button-icon.trash,.x-button .x-button-icon.x-icon-mask.trash{-webkit-mask-image:url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAFBElEQVRoBe2aS4gdRRRA8+L/m0QIJkYNLlQUNOAvigpRcCEIcSsiCLoLLoILcaM7QVBX4koRshDxt9CFKCoiuvGDCP5QkxCiJhInRo2Ovzie80gPNWX1dL3uesM09IUz3V1169a9daur+031aG5ubkUpGY1GK7G1Dq4Cz9vKiIY74Sv8+72tkWQ7Ay4Bxo+Hu2E3/AuOZBf+ov2TsL6Ef5WNUsGazXvgEHQJMm77N/aeg3Mrh7seOweMM2bWYH+B2OES1/9g9w0oEnSngHHCYO+FGSgRXJ0NM/0idA565BRpKyxSt9J2B5xWY+Mw5Udq6uqKT6XimESlmX4d7sTnA4n6rKJjs7QSSgTrSno7nJyodtFyGr4AP4G6TeLIHweb4A44C0LR1xtgCzwP7aTtIkBvLlSfQjwNZyl7FNa0sU077V4DX0Js25X7cRjPzDb2Nd5FnK7xPbGXskdwxsxOLLRzdnwIj8GvkQFnypqobKLLrgGnOjMzP6cqJijzfn0NXPljmXRNWNC+dcBHM7HA2NELp10nwbaz5iC4OsdidTyrYp3a68ZFi7XJFfNsOBGcUmFnPpbiBWkVZefT7g+OXcTF0EUsFPtaje0Lw0LOzfoM49B4Gy36WMKwK+WDcC2cAmGwXK7YAAYdym9c+NiIdUOdnHODc6DjpPioix9LBvwtPE3QOzjWi7MjBS0M8CGY1huUA1ISg/4cNqXiqcqSwVqJ3AQ/QEmnpm3LR+IzsLYKMD4mA6bBOfAKuFpO28nS9v0Bcxckn9V1Ad9Pg2m/H5cONLT3Mf5fFGfX63hBQG8s7/LXxcdV0nvjMtgKp0MojuaroM60xYB8Z78ZTog6c515B1ylXey+ARe3/0tqFNCy0RjrkdvgOwhH0TeiB2A1uMBNGx9Ta+FZiP34mrIrQR39cECSUzqZYYIcR0mjJtmFwmHUvdenLjwmnUl7Eh05+LP40fjvoGTACYN1Rc6CecGhM7lw2lt+AA7Fg4fOespXgYO0j3pvnXmh3rY+/52+vrXtRSd841rQJ/WV1JVX9eNj14DnjeHnJVw8DBeAnX8A2ynfXwXN+cWUPQUOjNl6i7Jt1I9nCOe+1V0NT4AB/wkvw31QRIoFjDfnwRXgfVbJGZzsry44boTNUGVjlvOToPpV5FvbjXApKE7VLZ6UkpWlDGHH+96pV93/4TSsujGA8MeF51Xw6njuO3soKTth/UTnJQOeqONFlKsBW0SlfdVyDLh9NBkth4AzBqnXKkOGe52+DOeHDGcMUq9Vhgz3On0Zzg8ZzhikXqsMGe51+jKcHzKcMUi9Vhky3Ov0ZTg/ZDhjkHqtMmS41+nLcH7IcMYg9VplOWY4/Md88cEtHbDOVg5Xx9jpsM9Yx52JeAcw1ontTXRdcm9pFz3vBveHdNJN6YPVRhrnivtMlruZ5g7DFxBuXLut8j7sA/d43Yr5CIpJsYAJ7DN2/27Bsw1gwAb3I8wLOp+g4w6+nw/6HddOyszqWDg/Qv2bXFwH4+1SyhyUYtI1YLc85wXn/ORAagWdPVRKUqh3AJwtdTLeWq2rbCoP76cm3bjeLG6ELjZim03XJujyJqXF6rtmeDvGNzMN/ajEAZi2rKOD67t00jVgN7+3dnFgqdsu5XRc6tiS/eUGvBTTNengBIVZPuYG7LcYPjdluYk++bTw++pGyQ34bSy9B35Vs5zEYGfgJfg+x7H/ADoy2VfnrtXoAAAAAElFTkSuQmCC')}.x-tab .x-button-icon.maps,.x-button .x-button-icon.x-icon-mask.maps{-webkit-mask-image:url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAADl0lEQVRoBe2b24tNURzHjfutXEPycDAltwhJbuMSJUqSB/HiES/+AK9ePc6T8uCFkImQW5KGkdwSxYyMGkZu45bbDOPzyZyTrJnjnDkGrVm/+szas2bv397f33ftPS+/Vdba2toj5igj0NcfRkG/3qWIJdcIrs/AO6gDq7cKPkOjUNAmxr8ePJsix8NUWAvLoapowSQawIUzYCZUwAqohF3QAjtgGTyCy5x/nfEu1MNDCmAxuiS4Vy8ST4DZMB9WwiTIRUGC26q1gKtWwyyYBsPB5aLIL5CNTxzotDeWTeA5DUKuO4xXoQbxHpcUbSIzJFkDi0EzdLYnBNGuYJJ4ch+YAhvB5TAORsKvib4x97vwPpk2FjJuhibu85zxAlyCangBLRQib06u68t5vk4uVYVqgO+oqy9v5ASTRLd0LQNLYB24bAfBnw5zikX0HtuhGW5ANY9ylvEBvIY3FOArcz7rWHCpboBFMAxyGjguKIZy1jzYCqfAD5BLslB8J3dCP/AdOgo+fKHXd3Sebh+EctCMieBK6Oj8QuYrXZ7roQr88PiSD4b/IVyyfhB9jQy/uppTUijYhANLytJ1F/sxzL7POpg97vQdFfwVTNYtQsHdKpLg2O1ODieHI6tAWtKRGRrISQ4HJYlsIjkcmaGBnORwUJLIJpLDkRkayEkOByWJbCI5HJmhgZzkcFCSyCaSw5EZGshJDgcliWwiORyZoYGc5HBQksgmksORGRrISQ4HJYlsIjkcmaGBnORwUJLIJpLDkRkayEkOByWJbKLbOVx0r3E7httIbttwNvzddt//JWxIfQynYX8pgu2TbgBbjw9Ds53sNHJv49gOehu5bUe2DfjXojDVpWG/9iu4CEegBp7xfO+LFfyGC5+AiQ7BFXj/c8s+xw+Z24PwvYwKnQxLoQLccGEB7Hsu9t5ckjcU2QjuozgA5+Apz9PCmItCbvqWs2vhJpwBl8ZrEuVtOebPtiWLbf2ymyL0ZVT8XJgDbgHIgFsPOhPmr4d7oAnHue9txg6jI8EfueIaHIOrcAuafieSc/IG19vw7TYD6UEBbE4vhwxMB7cizIYhYPT6MeR+WjBFPoCToEgF1hb6bD8LNpHLwT0L56EOGkhUchc6edoNcruvQWoQ7/6GMTAa3E2zACxGNjRhH9wHV4zP9oGxqCjj7C0wA06Ay/YliRT/T4MCuGnEfQ4feJ5mfvdfaG+OXSWdju+VpAoIK3D9tAAAAABJRU5ErkJggg==')}.x-tab .x-button-icon.locate,.x-button .x-button-icon.x-icon-mask.locate{-webkit-mask-image:url('data:image/png;base64,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')}.x-tab .x-button-icon.home,.x-button .x-button-icon.x-icon-mask.home{-webkit-mask-image:url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAEK0lEQVRoBe2Zy28NURzHe/vwqEepYkFIQzxWaCOC2HhELEgQImhXIrqyIEXikVQi+gdIwx9AItg1NiJELMSGhKQbobY2VY9Srfp8m5lmTO/cOXN7Zu656f0ln8zMnTNnft/z+505j5sbGxurmk5WPZ3ESuu0E1xbigjncrka3jsbftClIvsU5RZ65aLK5Lj/C75SzSjHWCuJYLxqhPXwBgYhylq4sRaixChDP8EzGIJ4UwNnCR6tgFswANegKer93LsLim4herm/JKqO8O+ZRdhL42acOwunYAacg2Hu3ePYj3Ph1A1fU2ySmZSZeCiTjxaC1LAboRs6QGJl8+AKXIU1kLqlHmHEqlFboQv2gD40QdPHqx3qKdtJkD8Hb9o+TzXCXmT1cboB+cT6evTVPgIXeWYl6DoVSy3COF2Hx0rjTthp4L0a/4xXrofn33OeqH8avKMqFcE4O4uXb4ULsNfEEa+M0v00LIIuCKc/P03NrAtGrD5Iiuh10Dia1JTOR0EZsjjpw3HlrQpGbD0v3AzFig36e4CLkeAPNs6tCUbsHBxS+mpsLSayYT2KtLBqVgQjdgFe7QP1u9VWPbRc2ZQFe2LV5zSBWG7ZP+vVTUkwYhvx6DicB+fFqvWKFuyJ1QxJ00It48rCNNgnNi+N23hQaVw2YiU0cYQRq9Q9CJdBKV1q02zMeEaWSDBil1L5JTgBDeCCzcUJ8cXImfACOeqayjbBffgDfqu6cPyJP3dgVZTvwd9jdzuoSFmgicRDGAYXRIZ9+I5fPbA6KC7feUHBVKD5rJZ1EutaZMOiv+HjbWjJJ9T/LVIwDyqyh+ApuC7WFy/RCk4r5HyRwWNewRSW2N3wGv6CX2E5HBWcB9AaFOqfTxJMQa1lNewosqNQDiLDPmqv+hFsgzpfrI7/CeamVjwnQZEtV7G+eEX6MeyHGl/0hGB+1MJdYt+B/1C5H9UdX8J2qJ6IMBfz4Ri8hXIXGfZfmdoLWr5W1zJ7ktg2aId18BuiTHNvDVUumQSNxDikLSdtBzdok0yCD8MyiLNmCqhxXBL9An+egNI3yqRT9z+O92FO/O2UuOMuymoqF06bUl53489MQw21Gm8lWmkRa6R/oVaMfT6lAmrsUVMNRa2HU3I8k2orgjNp5hK+ZLwPp/x+fR+0ONfMp9BfJ+qLmulpyze1zMtC8AACbkI/xAneQZkO0JiZimUheAjPn0MfxAnWVo3RiEG5oiwLwXJsmGFDK5iCxrCnGZNSOzVLra+EPDZ9T6EMCFVZ3KWpI8XV7uBTFcEOBsWqS5UIW21OByurRNjBoFh1qRJhq83pYGWVCDsYFKsuVSJstTkdrGz8L0VTv1i+NVF2CyTJDC0LX7E8HIx7D/Vrb3wDaLvY1D5QsI/6jXZUEwk29cDlckki5bIOY9+mneB/GfbU3e4Ey5kAAAAASUVORK5CYII=')}.x-button.x-button-action,.x-toolbar .x-button.x-button-action,.x-button.x-button-action-round,.x-toolbar .x-button.x-button-action-round,.x-button.x-button-action-small,.x-toolbar .x-button.x-button-action-small{border:1px solid #010509;border-top-color:#021022;color:white}.x-button.x-button-action.x-button-back:before,.x-button.x-button-action.x-button-forward:before,.x-toolbar .x-button.x-button-action.x-button-back:before,.x-toolbar .x-button.x-button-action.x-button-forward:before,.x-button.x-button-action-round.x-button-back:before,.x-button.x-button-action-round.x-button-forward:before,.x-toolbar .x-button.x-button-action-round.x-button-back:before,.x-toolbar .x-button.x-button-action-round.x-button-forward:before,.x-button.x-button-action-small.x-button-back:before,.x-button.x-button-action-small.x-button-forward:before,.x-toolbar .x-button.x-button-action-small.x-button-back:before,.x-toolbar .x-button.x-button-action-small.x-button-forward:before{background:#010509}.x-button.x-button-action,.x-button.x-button-action.x-button-back:after,.x-button.x-button-action.x-button-forward:after,.x-toolbar .x-button.x-button-action,.x-toolbar .x-button.x-button-action.x-button-back:after,.x-toolbar .x-button.x-button-action.x-button-forward:after,.x-button.x-button-action-round,.x-button.x-button-action-round.x-button-back:after,.x-button.x-button-action-round.x-button-forward:after,.x-toolbar .x-button.x-button-action-round,.x-toolbar .x-button.x-button-action-round.x-button-back:after,.x-toolbar .x-button.x-button-action-round.x-button-forward:after,.x-button.x-button-action-small,.x-button.x-button-action-small.x-button-back:after,.x-button.x-button-action-small.x-button-forward:after,.x-toolbar .x-button.x-button-action-small,.x-toolbar .x-button.x-button-action-small.x-button-back:after,.x-toolbar .x-button.x-button-action-small.x-button-forward:after{background-color:#06346a;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #167bf3), color-stop(2%, #07448c), color-stop(100%, #042348));background-image:-webkit-linear-gradient(#167bf3,#07448c 2%,#042348);background-image:linear-gradient(#167bf3,#07448c 2%,#042348)}.x-button.x-button-action .x-button-icon.x-icon-mask,.x-toolbar .x-button.x-button-action .x-button-icon.x-icon-mask,.x-button.x-button-action-round .x-button-icon.x-icon-mask,.x-toolbar .x-button.x-button-action-round .x-button-icon.x-icon-mask,.x-button.x-button-action-small .x-button-icon.x-icon-mask,.x-toolbar .x-button.x-button-action-small .x-button-icon.x-icon-mask{background-color:white;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ffffff), color-stop(2%, #ffffff), color-stop(100%, #ddecfd));background-image:-webkit-linear-gradient(#ffffff,#ffffff 2%,#ddecfd);background-image:linear-gradient(#ffffff,#ffffff 2%,#ddecfd)}.x-button.x-button-action.x-button-pressing,.x-button.x-button-action.x-button-pressing:after,.x-button.x-button-action.x-button-pressed,.x-button.x-button-action.x-button-pressed:after,.x-button.x-button-action.x-button-active,.x-button.x-button-action.x-button-active:after,.x-toolbar .x-button.x-button-action.x-button-pressing,.x-toolbar .x-button.x-button-action.x-button-pressing:after,.x-toolbar .x-button.x-button-action.x-button-pressed,.x-toolbar .x-button.x-button-action.x-button-pressed:after,.x-toolbar .x-button.x-button-action.x-button-active,.x-toolbar .x-button.x-button-action.x-button-active:after,.x-button.x-button-action-round.x-button-pressing,.x-button.x-button-action-round.x-button-pressing:after,.x-button.x-button-action-round.x-button-pressed,.x-button.x-button-action-round.x-button-pressed:after,.x-button.x-button-action-round.x-button-active,.x-button.x-button-action-round.x-button-active:after,.x-toolbar .x-button.x-button-action-round.x-button-pressing,.x-toolbar .x-button.x-button-action-round.x-button-pressing:after,.x-toolbar .x-button.x-button-action-round.x-button-pressed,.x-toolbar .x-button.x-button-action-round.x-button-pressed:after,.x-toolbar .x-button.x-button-action-round.x-button-active,.x-toolbar .x-button.x-button-action-round.x-button-active:after,.x-button.x-button-action-small.x-button-pressing,.x-button.x-button-action-small.x-button-pressing:after,.x-button.x-button-action-small.x-button-pressed,.x-button.x-button-action-small.x-button-pressed:after,.x-button.x-button-action-small.x-button-active,.x-button.x-button-action-small.x-button-active:after,.x-toolbar .x-button.x-button-action-small.x-button-pressing,.x-toolbar .x-button.x-button-action-small.x-button-pressing:after,.x-toolbar .x-button.x-button-action-small.x-button-pressed,.x-toolbar .x-button.x-button-action-small.x-button-pressed:after,.x-toolbar .x-button.x-button-action-small.x-button-active,.x-toolbar .x-button.x-button-action-small.x-button-active:after{background-color:#052d5c;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #02152b), color-stop(10%, #042144), color-stop(65%, #052d5c), color-stop(100%, #052e5e));background-image:-webkit-linear-gradient(#02152b,#042144 10%,#052d5c 65%,#052e5e);background-image:linear-gradient(#02152b,#042144 10%,#052d5c 65%,#052e5e)}.x-button.x-button-confirm,.x-toolbar .x-button.x-button-confirm,.x-button.x-button-confirm-round,.x-toolbar .x-button.x-button-confirm-round,.x-button.x-button-confirm-small,.x-toolbar .x-button.x-button-confirm-small{border:1px solid #263501;border-top-color:#374e02;color:white}.x-button.x-button-confirm.x-button-back:before,.x-button.x-button-confirm.x-button-forward:before,.x-toolbar .x-button.x-button-confirm.x-button-back:before,.x-toolbar .x-button.x-button-confirm.x-button-forward:before,.x-button.x-button-confirm-round.x-button-back:before,.x-button.x-button-confirm-round.x-button-forward:before,.x-toolbar .x-button.x-button-confirm-round.x-button-back:before,.x-toolbar .x-button.x-button-confirm-round.x-button-forward:before,.x-button.x-button-confirm-small.x-button-back:before,.x-button.x-button-confirm-small.x-button-forward:before,.x-toolbar .x-button.x-button-confirm-small.x-button-back:before,.x-toolbar .x-button.x-button-confirm-small.x-button-forward:before{background:#263501}.x-button.x-button-confirm,.x-button.x-button-confirm.x-button-back:after,.x-button.x-button-confirm.x-button-forward:after,.x-toolbar .x-button.x-button-confirm,.x-toolbar .x-button.x-button-confirm.x-button-back:after,.x-toolbar .x-button.x-button-confirm.x-button-forward:after,.x-button.x-button-confirm-round,.x-button.x-button-confirm-round.x-button-back:after,.x-button.x-button-confirm-round.x-button-forward:after,.x-toolbar .x-button.x-button-confirm-round,.x-toolbar .x-button.x-button-confirm-round.x-button-back:after,.x-toolbar .x-button.x-button-confirm-round.x-button-forward:after,.x-button.x-button-confirm-small,.x-button.x-button-confirm-small.x-button-back:after,.x-button.x-button-confirm-small.x-button-forward:after,.x-toolbar .x-button.x-button-confirm-small,.x-toolbar .x-button.x-button-confirm-small.x-button-back:after,.x-toolbar .x-button.x-button-confirm-small.x-button-forward:after{background-color:#6c9804;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #c2fa3b), color-stop(2%, #85bb05), color-stop(100%, #547503));background-image:-webkit-linear-gradient(#c2fa3b,#85bb05 2%,#547503);background-image:linear-gradient(#c2fa3b,#85bb05 2%,#547503)}.x-button.x-button-confirm .x-button-icon.x-icon-mask,.x-toolbar .x-button.x-button-confirm .x-button-icon.x-icon-mask,.x-button.x-button-confirm-round .x-button-icon.x-icon-mask,.x-toolbar .x-button.x-button-confirm-round .x-button-icon.x-icon-mask,.x-button.x-button-confirm-small .x-button-icon.x-icon-mask,.x-toolbar .x-button.x-button-confirm-small .x-button-icon.x-icon-mask{background-color:white;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ffffff), color-stop(2%, #ffffff), color-stop(100%, #f4fedc));background-image:-webkit-linear-gradient(#ffffff,#ffffff 2%,#f4fedc);background-image:linear-gradient(#ffffff,#ffffff 2%,#f4fedc)}.x-button.x-button-confirm.x-button-pressing,.x-button.x-button-confirm.x-button-pressing:after,.x-button.x-button-confirm.x-button-pressed,.x-button.x-button-confirm.x-button-pressed:after,.x-button.x-button-confirm.x-button-active,.x-button.x-button-confirm.x-button-active:after,.x-toolbar .x-button.x-button-confirm.x-button-pressing,.x-toolbar .x-button.x-button-confirm.x-button-pressing:after,.x-toolbar .x-button.x-button-confirm.x-button-pressed,.x-toolbar .x-button.x-button-confirm.x-button-pressed:after,.x-toolbar .x-button.x-button-confirm.x-button-active,.x-toolbar .x-button.x-button-confirm.x-button-active:after,.x-button.x-button-confirm-round.x-button-pressing,.x-button.x-button-confirm-round.x-button-pressing:after,.x-button.x-button-confirm-round.x-button-pressed,.x-button.x-button-confirm-round.x-button-pressed:after,.x-button.x-button-confirm-round.x-button-active,.x-button.x-button-confirm-round.x-button-active:after,.x-toolbar .x-button.x-button-confirm-round.x-button-pressing,.x-toolbar .x-button.x-button-confirm-round.x-button-pressing:after,.x-toolbar .x-button.x-button-confirm-round.x-button-pressed,.x-toolbar .x-button.x-button-confirm-round.x-button-pressed:after,.x-toolbar .x-button.x-button-confirm-round.x-button-active,.x-toolbar .x-button.x-button-confirm-round.x-button-active:after,.x-button.x-button-confirm-small.x-button-pressing,.x-button.x-button-confirm-small.x-button-pressing:after,.x-button.x-button-confirm-small.x-button-pressed,.x-button.x-button-confirm-small.x-button-pressed:after,.x-button.x-button-confirm-small.x-button-active,.x-button.x-button-confirm-small.x-button-active:after,.x-toolbar .x-button.x-button-confirm-small.x-button-pressing,.x-toolbar .x-button.x-button-confirm-small.x-button-pressing:after,.x-toolbar .x-button.x-button-confirm-small.x-button-pressed,.x-toolbar .x-button.x-button-confirm-small.x-button-pressed:after,.x-toolbar .x-button.x-button-confirm-small.x-button-active,.x-toolbar .x-button.x-button-confirm-small.x-button-active:after{background-color:#628904;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #3e5702), color-stop(10%, #507003), color-stop(65%, #628904), color-stop(100%, #648c04));background-image:-webkit-linear-gradient(#3e5702,#507003 10%,#628904 65%,#648c04);background-image:linear-gradient(#3e5702,#507003 10%,#628904 65%,#648c04)}.x-button.x-button-decline,.x-toolbar .x-button.x-button-decline,.x-button.x-button-decline-round,.x-toolbar .x-button.x-button-decline-round,.x-button.x-button-decline-small,.x-toolbar .x-button.x-button-decline-small{border:1px solid #630303;border-top-color:#7c0303;color:white}.x-button.x-button-decline.x-button-back:before,.x-button.x-button-decline.x-button-forward:before,.x-toolbar .x-button.x-button-decline.x-button-back:before,.x-toolbar .x-button.x-button-decline.x-button-forward:before,.x-button.x-button-decline-round.x-button-back:before,.x-button.x-button-decline-round.x-button-forward:before,.x-toolbar .x-button.x-button-decline-round.x-button-back:before,.x-toolbar .x-button.x-button-decline-round.x-button-forward:before,.x-button.x-button-decline-small.x-button-back:before,.x-button.x-button-decline-small.x-button-forward:before,.x-toolbar .x-button.x-button-decline-small.x-button-back:before,.x-toolbar .x-button.x-button-decline-small.x-button-forward:before{background:#630303}.x-button.x-button-decline,.x-button.x-button-decline.x-button-back:after,.x-button.x-button-decline.x-button-forward:after,.x-toolbar .x-button.x-button-decline,.x-toolbar .x-button.x-button-decline.x-button-back:after,.x-toolbar .x-button.x-button-decline.x-button-forward:after,.x-button.x-button-decline-round,.x-button.x-button-decline-round.x-button-back:after,.x-button.x-button-decline-round.x-button-forward:after,.x-toolbar .x-button.x-button-decline-round,.x-toolbar .x-button.x-button-decline-round.x-button-back:after,.x-toolbar .x-button.x-button-decline-round.x-button-forward:after,.x-button.x-button-decline-small,.x-button.x-button-decline-small.x-button-back:after,.x-button.x-button-decline-small.x-button-forward:after,.x-toolbar .x-button.x-button-decline-small,.x-toolbar .x-button.x-button-decline-small.x-button-back:after,.x-toolbar .x-button.x-button-decline-small.x-button-forward:after{background-color:#c70505;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #fb6a6a), color-stop(2%, #ea0606), color-stop(100%, #a40404));background-image:-webkit-linear-gradient(#fb6a6a,#ea0606 2%,#a40404);background-image:linear-gradient(#fb6a6a,#ea0606 2%,#a40404)}.x-button.x-button-decline .x-button-icon.x-icon-mask,.x-toolbar .x-button.x-button-decline .x-button-icon.x-icon-mask,.x-button.x-button-decline-round .x-button-icon.x-icon-mask,.x-toolbar .x-button.x-button-decline-round .x-button-icon.x-icon-mask,.x-button.x-button-decline-small .x-button-icon.x-icon-mask,.x-toolbar .x-button.x-button-decline-small .x-button-icon.x-icon-mask{background-color:white;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ffffff), color-stop(2%, #ffffff), color-stop(100%, #fedcdc));background-image:-webkit-linear-gradient(#ffffff,#ffffff 2%,#fedcdc);background-image:linear-gradient(#ffffff,#ffffff 2%,#fedcdc)}.x-button.x-button-decline.x-button-pressing,.x-button.x-button-decline.x-button-pressing:after,.x-button.x-button-decline.x-button-pressed,.x-button.x-button-decline.x-button-pressed:after,.x-button.x-button-decline.x-button-active,.x-button.x-button-decline.x-button-active:after,.x-toolbar .x-button.x-button-decline.x-button-pressing,.x-toolbar .x-button.x-button-decline.x-button-pressing:after,.x-toolbar .x-button.x-button-decline.x-button-pressed,.x-toolbar .x-button.x-button-decline.x-button-pressed:after,.x-toolbar .x-button.x-button-decline.x-button-active,.x-toolbar .x-button.x-button-decline.x-button-active:after,.x-button.x-button-decline-round.x-button-pressing,.x-button.x-button-decline-round.x-button-pressing:after,.x-button.x-button-decline-round.x-button-pressed,.x-button.x-button-decline-round.x-button-pressed:after,.x-button.x-button-decline-round.x-button-active,.x-button.x-button-decline-round.x-button-active:after,.x-toolbar .x-button.x-button-decline-round.x-button-pressing,.x-toolbar .x-button.x-button-decline-round.x-button-pressing:after,.x-toolbar .x-button.x-button-decline-round.x-button-pressed,.x-toolbar .x-button.x-button-decline-round.x-button-pressed:after,.x-toolbar .x-button.x-button-decline-round.x-button-active,.x-toolbar .x-button.x-button-decline-round.x-button-active:after,.x-button.x-button-decline-small.x-button-pressing,.x-button.x-button-decline-small.x-button-pressing:after,.x-button.x-button-decline-small.x-button-pressed,.x-button.x-button-decline-small.x-button-pressed:after,.x-button.x-button-decline-small.x-button-active,.x-button.x-button-decline-small.x-button-active:after,.x-toolbar .x-button.x-button-decline-small.x-button-pressing,.x-toolbar .x-button.x-button-decline-small.x-button-pressing:after,.x-toolbar .x-button.x-button-decline-small.x-button-pressed,.x-toolbar .x-button.x-button-decline-small.x-button-pressed:after,.x-toolbar .x-button.x-button-decline-small.x-button-active,.x-toolbar .x-button.x-button-decline-small.x-button-active:after{background-color:#b80505;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #860303), color-stop(10%, #9f0404), color-stop(65%, #b80505), color-stop(100%, #ba0505));background-image:-webkit-linear-gradient(#860303,#9f0404 10%,#b80505 65%,#ba0505);background-image:linear-gradient(#860303,#9f0404 10%,#b80505 65%,#ba0505)}.x-sheet,.x-sheet-action{padding:0.7em;border-top:1px solid #030507;height:auto;background-color:rgba(0, 0, 0, 0.9);background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, rgba(50,74,103,0.9)), color-stop(2%, rgba(12,17,24,0.9)), color-stop(100%, rgba(0,0,0,0.9)));background-image:-webkit-linear-gradient(rgba(50,74,103,0.9),rgba(12,17,24,0.9) 2%,rgba(0,0,0,0.9));background-image:linear-gradient(rgba(50,74,103,0.9),rgba(12,17,24,0.9) 2%,rgba(0,0,0,0.9));-webkit-border-radius:0;border-radius:0}.x-sheet-inner > .x-button,.x-sheet-action-inner > .x-button{margin-bottom:0.5em}.x-sheet-inner > .x-button:last-child,.x-sheet-action-inner > .x-button:last-child{margin-bottom:0}.x-sheet.x-picker{padding:0}.x-sheet.x-picker .x-sheet-inner{position:relative;background-color:#fff;-webkit-border-radius:0.4em;border-radius:0.4em;-webkit-background-clip:padding;background-clip:padding-box;overflow:hidden;margin:0.7em}.x-sheet.x-picker .x-sheet-inner:before,.x-sheet.x-picker .x-sheet-inner:after{z-index:1;content:"";position:absolute;width:100%;height:30%;top:0;left:0}.x-sheet.x-picker .x-sheet-inner:before{top:auto;-webkit-border-bottom-left-radius:0.4em;border-bottom-left-radius:0.4em;-webkit-border-bottom-right-radius:0.4em;border-bottom-right-radius:0.4em;bottom:0;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ffffff), color-stop(100%, #bbbbbb));background-image:-webkit-linear-gradient(#ffffff,#bbbbbb);background-image:linear-gradient(#ffffff,#bbbbbb)}.x-sheet.x-picker .x-sheet-inner:after{-webkit-border-top-left-radius:0.4em;border-top-left-radius:0.4em;-webkit-border-top-right-radius:0.4em;border-top-right-radius:0.4em;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #bbbbbb), color-stop(100%, #ffffff));background-image:-webkit-linear-gradient(#bbbbbb,#ffffff);background-image:linear-gradient(#bbbbbb,#ffffff)}.x-sheet.x-picker .x-sheet-inner .x-picker-slot .x-body{border-left:1px solid #999999;border-right:1px solid #ACACAC}.x-sheet.x-picker .x-sheet-inner .x-picker-slot:first-child .x-body{border-left:0}.x-sheet.x-picker .x-sheet-inner .x-picker-slot:last-child .x-body{border-left:0;border-right:0}.x-picker-slot .x-scroll-view{z-index:2;position:relative;-webkit-box-shadow:rgba(0, 0, 0, 0.4) -1px 0 1px}.x-picker-slot .x-scroll-view:first-child{-webkit-box-shadow:none}.x-picker-mask{position:absolute;top:0;left:0;right:0;bottom:0;z-index:3;display:-webkit-box;display:box;-webkit-box-align:stretch;box-align:stretch;-webkit-box-orient:vertical;box-orient:vertical;-webkit-box-pack:center;box-pack:center;pointer-events:none}.x-picker-bar{border-top:0.12em solid #06346a;border-bottom:0.12em solid #06346a;height:2.5em;background-color:rgba(13, 117, 242, 0.3);background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, rgba(158,200,250,0.3)), color-stop(2%, rgba(47,137,244,0.3)), color-stop(100%, rgba(11,101,208,0.3)));background-image:-webkit-linear-gradient(rgba(158,200,250,0.3),rgba(47,137,244,0.3) 2%,rgba(11,101,208,0.3));background-image:linear-gradient(rgba(158,200,250,0.3),rgba(47,137,244,0.3) 2%,rgba(11,101,208,0.3));-webkit-box-shadow:rgba(0, 0, 0, 0.2) 0 0.2em 0.2em}.x-use-titles .x-picker-bar{margin-top:1.5em}.x-picker-slot-title{height:1.5em;position:relative;z-index:2;background-color:#345b89;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #85a7d1), color-stop(2%, #3e6ca3), color-stop(100%, #2a496f));background-image:-webkit-linear-gradient(#85a7d1,#3e6ca3 2%,#2a496f);background-image:linear-gradient(#85a7d1,#3e6ca3 2%,#2a496f);border-top:1px solid #345b89;border-bottom:1px solid #182a3f;-webkit-box-shadow:0px 0.1em 0.3em rgba(0, 0, 0, 0.3);padding:0.2em 1.02em}.x-picker-slot-title > div{font-weight:bold;font-size:0.8em;color:#0d1116;text-shadow:rgba(255, 255, 255, 0.25) 0 0.08em 0}.x-picker-slot .x-dataview-inner{width:100%}.x-picker-slot .x-dataview-item{vertical-align:middle;height:2.5em;line-height:2.5em;font-weight:bold;padding:0 10px}.x-picker-slot .x-picker-item{white-space:nowrap;overflow:hidden;text-overflow:ellipsis}.x-picker-right{text-align:right}.x-picker-center{text-align:center}.x-picker-left{text-align:left}.x-tabbar.x-docked-top{border-bottom:.1em solid;height:2.6em;padding:0 .8em}.x-tabbar.x-docked-top .x-tab{padding:0.4em 0.8em;height:1.8em;-webkit-border-radius:0.9em;border-radius:0.9em}.x-tabbar.x-docked-top .x-button-label,.x-tabbar.x-docked-top .x-hasbadge .x-badge,.x-hasbadge .x-tabbar.x-docked-top .x-badge{font-size:.8em;line-height:1.2em;text-rendering:optimizeLegibility;-webkit-font-smoothing:antialiased}.x-tabbar.x-docked-bottom{border-top:.1em solid;height:3em;padding:0}.x-tabbar.x-docked-bottom .x-tab{-webkit-border-radius:0.25em;border-radius:0.25em;min-width:3.3em;position:relative;padding-top:.2em}.x-tabbar.x-docked-bottom .x-tab .x-button-icon{-webkit-mask-size:1.65em;width:1.65em;height:1.65em;display:block;margin:0 auto;position:relative}.x-tabbar.x-docked-bottom .x-tab .x-button-label,.x-tabbar.x-docked-bottom .x-tab .x-hasbadge .x-badge,.x-hasbadge .x-tabbar.x-docked-bottom .x-tab .x-badge{margin:0;padding:.1em 0 .2em 0;font-size:9px;line-height:12px;text-rendering:optimizeLegibility;-webkit-font-smoothing:antialiased}.x-tab .x-button-icon.bookmarks,.x-button .x-button-icon.x-icon-mask.bookmarks{-webkit-mask-image:url('data:image/png;base64,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')}.x-tab .x-button-icon.download,.x-button .x-button-icon.x-icon-mask.download{-webkit-mask-image:url('data:image/png;base64,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')}.x-tab .x-button-icon.favorites,.x-button .x-button-icon.x-icon-mask.favorites{-webkit-mask-image:url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAFfUlEQVRoBd2aXahVRRTHz/Ujv+2mZRGZB7W6mtpFikC7+UWUZiqBD0JPFdRL1EMFPfjoU4baS0FUD/UWZBEVShA+BCpmWApRSkgllNpDmZWZt9//eOay72afvWfWOTPn3rvgz8yeWbPW+s/XmT379AwODtZSSQ+CryVgA/gVfIx/pelEhFMBVlvBOaBeFo6Cean8y09KsnMg932TqCOs9M2UhMfhMJVsxtHcAmcbmekLCsqjFKUkvAYG1xSwmEHZqoLyKEVJCDOCNxH9HUCbVl6mULAuXxjrOQlhgl8Bbi0h0Uen3FBS37GqVIQHiHh2SdR16jTlo0t0woycpuxiUDSdHcFeMv3uIWYanTDB3wIWVZBQHP10zuQKvbarUxDWT1HRz1E++Ds99fLtgp6jEmbExhPNcs+IbkZPiCpRCRP5TPCQJ4MJ6A3QSUqjSWzC2ozuC4j+fnSnB+gHq8YmvJKIJgVEpRPX9QH6waqxCa8PjEhHT981H2j6qno0wqzF63BhOUxsom3Zb7aJqGsUjTAONFJlpysXQz7VuXpavrBTzzEJaz1adlzNjHs6RTBvJyZhjZTF/kTaWZZCnlvhsyWgQkPZQpagzsX1bFlAXjGtDdAPUu1p3PPQhCCXkdwG/mta0PWLds060AuAnqtEOjpdbQR3VymX1P9F3UfgGJA9X9F92c/ADaQ2P8V0DJ4/kDbeYKaSvgI2AN0+OGJK1VAbSIhTOXEOybYll2kte77yD4rqrHyb85S9Cl4HtReAyI11/A7HpRq5PSD6oR0f3Rad+H7S1DvV7UgS+tc1cU3n3V/AWJ/SX8BxVuMinow2rNNjlPQVeH0GFg378kDBfLAPXARjZbTPwmUXmOG+bgz71EKFfqKeAUWfREZbJxyCxyOOqEuHER4qrNUWovwy0CFktBHV4eNZMNvxyaaFhKWAaBt/HJwEo4W0luSKLMF8viVhp4iBeeBd8CcYqcQ1qi+CKS7uVmklYdcQY0+C42Ckkf6EmO51cVal3oRlCFkCdKgfCWtbo7obDO3AVWQbHHyUsjo40E6uq9cvQbdG+wN892fj8s0HjXDWKA51/t4JUo72H/jTDtybjSUkbyYsJ0gdfAtSjfTn+JoWQjCv2+57a4M1QaQSvZvrMsIs7RJejGcdUlLJUhzpZsYsZsJcCen6ZwCE3IaYA2021OfUdU3fJltmwni7Fvh+KDMF16KR3ux0lWuSdgjPxeNdJq/tNdKNqJaSSUyEmVK6JNPomtqbIh3eSKNsEmvAarfJ5LEzjbbR59MtpqyEb8eZjpndkhtxvNri3Er4YZxpx+yW6Jdhi8V5MOHm+n0QZ9afo0u0fQO8A5S3iPaQ1cTSG9w4f/SqesZBH/gRWI6T+gyyxfkgvw2cMdrS+/lTzpZvGnyWxsnTwHLRd4R2a/OBqQyoztKBe/P2qp6DCBOUptKHhuA+pU1fq2Co0/F0L9CVaghxXTbWW9ktKg8lrFfCrwODeh/9wgu1bEDo6OT2Fvgb+JLWq+nQEsnaa5UPJbwKBxc8A9KXPG1O3u+u6E4F24GvD3XMDjCxFcF8uTdhjGpHfwn49L42lCeAdyDZwGi3HpwAPr6+Q29htn1ZPoSwfuz3ewShXVcBNz62lzkvq6O9DjZHgQ9p72kdQljvob9VBPAN9Q+UEQmpw5b+Sf8e0FotI/4a9ZN8bIcQXlnh9AD1y3ychuhgU0tpJyhb14epn+ljN+Sk9S9G1ct50d8SdgF9x9EO3lHB5hXwPEYfA8dbGD9LuWZBtfj0inSQWUDTKzu1dAB5Dkz2tdOOHn70LvwVyMag/FYwzse295Rukq5j+G1wEOib66PAy5FPMD46+NPmqTV7CpwGGvkJPm2l8z8GWDNDloqpGQAAAABJRU5ErkJggg==')}.x-tab .x-button-icon.info,.x-button .x-button-icon.x-icon-mask.info{-webkit-mask-image:url('data:image/png;base64,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')}.x-tab .x-button-icon.more,.x-button .x-button-icon.x-icon-mask.more{-webkit-mask-image:url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAADJ0lEQVRoBe2YS2sUQRSFp5MgvmLU+CAMiBJFDBHcCeoPEFciuHMjroMK4lZBcONG0JW60U1UEgRx59IXuNMoKEElKL7GRwyIqNHxO0N66FT3UNU9IHRNFXz0VNW5t+vW6RcT1ev1Sie1rk4qVrWGgn13PDgcHPZsB8Il7ZmhqXKCw6kt8WwgOOyZoalygsOpLfFsIDjsmaGpcoLDqS3xbCA47JmhqXKCw6kt8Wyg6XAURV2wEy7BM5iFtzAKu2BB0dqJ7YEtcBYmQblfwzjshUVt5O4mfhjOwwQodw3GYA8snpd77n9pFXMYvoP+qDaZZewcVKXPAzE64Qn4CmZe9f/AFSiSu4e4IzANrXJfZ24gXjO/KxEcg9+QFZQcU/CSONh2RKsraMQhr85xE/psOeN5tCr2APyA5Bqzfl9D06tYtX3wC7KE5pg2ZX98UtsR7XZo5ayZW/1DENnyzi18CO1nyMqTNXYcrTapcitHkBLJiZW2RaGRuxcg6+Stxu6i73fI3Y3uZM7cU+hXQeVvzsBP6Dc5LupxztzaiEGH3AvR3S+Qe4dc0D2cp/Uj1oPI1pR7g030n+erWlTe9pMA3cu2Jre+2ERtzBdZe01BL3Ke9Al6vQZsTbfKQ5vImH9PXxtqa3qVPbWJjHk94J6r4DPGhK17A8EHm4j7UAWP2nTG/GX6NWMs1SW3rrCroLeLaxtDqDdG4368zbHVkzM5Polus+2hEs+j7YNxx9zv0FkfhoncvegvOuZ+iW6rYhtfTXTWgV7OyeLM3w+Y3xaf0PVIzAqwFf0IzW7XnLGOmLUg58y1JvsTzA83Y5o/eLcyMQISJAN0z56G9bE275HYNXAU7kAy9xv6p2Bj3pyxntjVcBDuQTL3FH19Dg/FWh0bXzUMNhsf23JkOQzCK9B1P4NY39OFG3kjgpeB8g/AR/gG0+3mJkeF9Lp9lkIVZkDfC1r3vPs8VTAir1uRd1mpNyQUXGr7HBYfHHbYpFJLgsOlts9h8cFhh00qtSQ4XGr7HBYfHHbYpFJLgsOlts9h8cFhh00qtSQ4XGr7HBYfHHbYpFJLOs7hf5j4Vg3iLoGkAAAAAElFTkSuQmCC')}.x-tab .x-button-icon.time,.x-button .x-button-icon.x-icon-mask.time{-webkit-mask-image:url('data:image/png;base64,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')}.x-tab .x-button-icon.user,.x-button .x-button-icon.x-icon-mask.user{-webkit-mask-image:url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAEWElEQVRoBe2aS0gVYRiGO1lmF8nQQlETutGFokAiqEV0ISKwgmrdMtzUpnW7drWKbFGbQAKpJIhuUGIUFUkW0T1Jq4V2U4ui7GLPexpDD+ecuX1jHqcPHseZ+f9vvnf++e8n0d/fPyZONjZOYqU1doLHRV3CiURCz5gMxTANJsJg+8XJJ+iBt9BHNdO1SCwRZR1GbAFRl8F8WAFLoRwGLME/ffAM7kETvIYPxPWDo7lFIhiheURaCVtgBywHXXOzbhJcggZoRvR7twy+76uELSEAtQsqySPwGdQN+KWDPHuh2DI2+TIVm3T455M9G0Bk6ktRvd4NBZaiTQUT3AQnSNW/VAFBzl/iZw0kq56FcOtuaQHB7QIv9ZVkrqZ2YA9Mck3pMYGZYKeh2sBz1SJb2mqcmfk0E0xQ6l9rwNoKcWjm11JwEYFVW6t1/K218mspeB5B5VsFluKnIuU88Kml4PGBo3DPqBGZiVkKNgvKRFkGJ5aCv2Z4xoi6bCm4DWUaXERhZhMJS8FfolDq+DSbRFgKjrIOa8poYpaCTQKK2sl/wSHfcFSNlll1sSzhn7ys3pAvLFP275lu+L1uKVhBPfYbgMf0zz2mc01mKfgbT7vi+kT/CeT3sv9s6XNYCtbg4CJ0pX9U4Kv3yXk3cO6UjGaCWX5Rg/UArqY8I8yp1qdPQ08YJ4Pzmgl2nCqwc2DVyKjunuddqkE0MVPBBKYSuQ7tJtEhFj9apDczU8FOVB0ctZiuHYUw9obMjbxErW2bmblgApTQengVIkq1B83QEsJH2qzmgp2n3ObYCEGndZ3krbcuXcUWiWACldCjoA0yv6a8J6HJb0Yv6SMRrAcj+gmHA+B3aneDPHXk/8jR3LR3a2rOfnAlTmfDVPDb6Khrq8bPDI5PoRPxZpMSk+1SgtOKpTa8l8BC0JaLmAkloA1xr/aOhJqEtINGWeqW7jjHXrQHbRdw4WxSJf8L8Aeh2m1QaWoBfiUsA61PTwGtUYeZ1qlP1zhan3YraBSnz/0mdAUVHqiEESoxKs0a2AxloJIMI5DsWU0vQH2z2oZToAnFI7+fu2/BiF3PgzbCKqgC1bXhNH3S6rba4BocR7TquifzLBih5XjcCSrROaAGKbJWHt9uJuGq67fgAki4zrNaVsGIzCP3dNgE20B1VJ+uro8UUz3Xr39UvxugCeEZl3UzCkZsBZn1+W6HRaB6qtZ4pJp2PtTna+58DFoR3sVxqHFxyM8euFsIW6EeXoDeoPrBXEEbAlpqqoN1kD9YY6rYxSQ4DGoE9KOSXBGZLk4NYB7CfigZEP1XMBfVEJ0BJUznIFevaSBzEEolOimYkyo4AfocclVYtrjViB0C9SzJEdE+jrn+CWcTrHvdUKuRUSm0gPrZ0W7tGjjMhTiIVWFWSbAGEnGxhAT/y+HhsL9oiVWFjo3FqnRVqrETrG5pFmiSEAuTYC3TFMVCLSIzTg9H6wuIXR2OneDfMJq1NmzzbS8AAAAASUVORK5CYII=')}.x-tab .x-button-icon.team,.x-button .x-button-icon.x-icon-mask.team{-webkit-mask-image:url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAFI0lEQVRoBe2ZSYgdVRSG+yUmnagRQYU4NbZKNLYKWTgg4gQOaDYqJIIGl4LixhBwoy50LSIiulEjCkpAUBBRURpdGceFMQ7YtgkOJE4xTjGa9vuedUl1Vd2qevSrFqvrwJ97695zzj3/PXd6nd7MzMzIQpJFC4msXDvCbc94l+Euwy2bgW5JtyyhOTpdhnNT0rKGLsMtS2iOTpfh3JS0rOGQ+eLT6/VWMNYJ4NjUmN9T/xLs4WfqvPxO7TU9DkTdNmvBbeAskJ7kv/n+AjwKXiSW7yibFQk3BSIPZHdTl5xZzML238DDYFlTsQS/jZF1AGQ1mAZZkkXfe9FbGwJrqmz6lL4cEmOgjhyO0jq2gGVj0hhhAl9M1FeB3gDRn4Pu/5NwQnJ0ALKqrgKHDmgzkHpjGR4oioPKP1H96+Dn8GvpKyLqneV5Lp0XgnHggTMFJjlYPqAcpnyLsz/LHBLL0fRfCzwbvNN3gLeI5WXKaik7DbF2/20A28HPYF+CPZQfg9tj9vS5h18DRSdyrO0j9FeW+PQenwTe138AJ+d34OPFa215zDa0l15LOLgamM0DIBukbQ60JjhLl7RL+HWQtSv7jhLGz1FgM3DJZ30Yy69gYzqGonrVHr4eJ+OgB7Ji2xi4lGUW8+PsD0vOwNGNwInMirF42K0nlmXZzvR3LNARDN3fx6WVI3VJF50Fzvr7EZtY8zQdLtUiOYXGIrJpXUmvTDdk61HCKEqiagD9SSwnLCeX3RYwSJafRd/zoUj2FzVm2hyzMJ6gV0Y46Myl/BzjeqfnyMg36G5NJqpoTPvnLGWEnS0f9lVStL/7NgT/C5XNoHTW6XesV4En/1wlGo+Oo4QJ1ivoxxqju+fKCG2lf1uFH7P3eEl2K8xndRt3VKKEE4sPKWOHiCreg28TaPR1RN/X6GwEO0GReJ3cg95kUWeqzT8W6KtMpujcVaZQRfgFjL8qcbCDvndi/Zz0h4Hr6L8JHBHRW0L7DejdAU6K6Nj8CfBQi4mH4xYmrmy1sXlK/gCAAyfkQaAT91kWj9HW/6tJ8MO3NmeC+4CHlqdu1q7o25Xk5Hqynw+WBp+hpO1K4JItsnfr5GyCbSirCHstnQpcKulBXMK+o1frCPGgWAomwL2gLsm0z3S9ny38XARWgEXJOI7xNMiS9ns9MN5ZCQhEQ1lIGCOXmZf4ZeAW8C4IAblv3wBXAIn6sjkZ3Arc80FvGKW/nu4H/nhZDiR0IngI+LYPY3i43gWuAeNgFBQSn0UYJZejRH3CPQ8cMDi19Jp6AviuVfd48ADwRZXWG3Z9J/6fApeAJUm2TYRE02OZjPfA3WAM9HVDdvt2iXHI1HkoPQd2g7SjUHef+NyU7AXgFRD65qOcZrybQXgFmtUDIDu2xE3CBuCWWBxIU+8vk9MozdQukDUO3x4qm5IJOp36ZyW6waaJci/jrkviWEV9qiQOdd8Ebr/+T0fKkYvBp6AqOB2fnQz0SA39Kn9z6Z9mfPeze/UlUOXrB3Q2AW36a77KwP7tYCwh7Mupjk1TOmZuNInlyZqxuN8n3ItrQF1xryvRl9W/3Y3/60QGCTGF71h5JB0Tbn7vsDqyP6Vkva5dymxoVQ+lIE6+3+lJCH3Zcp+E78y2Fny7Evw7kstC8YA7BtQZRP1hiwTDKnuGun8aSiekaDxXwrbG/zOtaOT/ss3MLSjpCLc93V2Guwy3bAa6Jd2yhObodBnOTUnLGroMtyyhOTpdhnNT0rKGfwD3f6JVZi/xSQAAAABJRU5ErkJggg==')}.x-tabbar-light{background-color:#475c76;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #96a9c0), color-stop(2%, #546e8c), color-stop(100%, #394b5f));background-image:-webkit-linear-gradient(#96a9c0,#546e8c 2%,#394b5f);background-image:linear-gradient(#96a9c0,#546e8c 2%,#394b5f);border-color:#3d5066}.x-tabbar-light .x-tab{color:#b6c3d3}.x-tabbar-light .x-tab-active{color:white}.x-tabbar-light .x-tab-pressed{color:white}.x-tabbar-light.x-docked-bottom .x-tab{text-shadow:rgba(0, 0, 0, 0.5) 0 -0.08em 0}.x-tabbar-light.x-docked-bottom .x-tab .x-button-icon{background-color:#768fad;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #d5dde6), color-stop(2%, #8ca1ba), color-stop(100%, #607d9f));background-image:-webkit-linear-gradient(#d5dde6,#8ca1ba 2%,#607d9f);background-image:linear-gradient(#d5dde6,#8ca1ba 2%,#607d9f)}.x-tabbar-light.x-docked-bottom .x-tab-active{background-color:#506986;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #a6b6c9), color-stop(2%, #5e7a9c), color-stop(100%, #43576f));background-image:-webkit-linear-gradient(#a6b6c9,#5e7a9c 2%,#43576f);background-image:linear-gradient(#a6b6c9,#5e7a9c 2%,#43576f);text-shadow:rgba(0, 0, 0, 0.5) 0 -0.08em 0}.x-tabbar-light.x-docked-bottom .x-tab-active .x-button-icon{background-color:#003370;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #0056bd), color-stop(50%, #003f8a), color-stop(51%, #003370), color-stop(100%, #002757));background-image:-webkit-linear-gradient(#0056bd,#003f8a 50%,#003370 51%,#002757);background-image:linear-gradient(#0056bd,#003f8a 50%,#003370 51%,#002757)}.x-tabbar-light.x-docked-top .x-tab-active{background-color:#3d5066;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #2a3746), color-stop(10%, #344356), color-stop(65%, #3d5066), color-stop(100%, #3e5167));background-image:-webkit-linear-gradient(#2a3746,#344356 10%,#3d5066 65%,#3e5167);background-image:linear-gradient(#2a3746,#344356 10%,#3d5066 65%,#3e5167);color:white}.x-tabbar-dark{background-color:#141e29;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #466890), color-stop(2%, #1f2f41), color-stop(100%, #080c11));background-image:-webkit-linear-gradient(#466890,#1f2f41 2%,#080c11);background-image:linear-gradient(#466890,#1f2f41 2%,#080c11);border-color:#0c1118}.x-tabbar-dark .x-tab{color:#5a81af}.x-tabbar-dark .x-tab-active{color:white}.x-tabbar-dark .x-tab-pressed{color:white}.x-tabbar-dark.x-docked-bottom .x-tab{text-shadow:rgba(0, 0, 0, 0.5) 0 -0.08em 0}.x-tabbar-dark.x-docked-bottom .x-tab .x-button-icon{background-color:#354f6e;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #7c9bc0), color-stop(2%, #416086), color-stop(100%, #293e56));background-image:-webkit-linear-gradient(#7c9bc0,#416086 2%,#293e56);background-image:linear-gradient(#7c9bc0,#416086 2%,#293e56)}.x-tabbar-dark.x-docked-bottom .x-tab-active{background-color:#1c2a3a;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #4e74a2), color-stop(2%, #283b52), color-stop(100%, #111922));background-image:-webkit-linear-gradient(#4e74a2,#283b52 2%,#111922);background-image:linear-gradient(#4e74a2,#283b52 2%,#111922);text-shadow:rgba(0, 0, 0, 0.5) 0 -0.08em 0}.x-tabbar-dark.x-docked-bottom .x-tab-active .x-button-icon{background-color:#0a7aff;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #57a3ff), color-stop(50%, #2488ff), color-stop(51%, #0a7aff), color-stop(100%, #006df0));background-image:-webkit-linear-gradient(#57a3ff,#2488ff 50%,#0a7aff 51%,#006df0);background-image:linear-gradient(#57a3ff,#2488ff 50%,#0a7aff 51%,#006df0)}.x-tabbar-dark.x-docked-top .x-tab-active{background-color:#0c1118;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #000000), color-stop(10%, #030507), color-stop(65%, #0c1118), color-stop(100%, #0c121a));background-image:-webkit-linear-gradient(#000000,#030507 10%,#0c1118 65%,#0c121a);background-image:linear-gradient(#000000,#030507 10%,#0c1118 65%,#0c121a);color:white}.x-tab.x-item-disabled span.x-button-label,.x-tab.x-item-disabled .x-hasbadge span.x-badge,.x-hasbadge .x-tab.x-item-disabled span.x-badge,.x-tab.x-item-disabled .x-button-icon{opacity:.5}.x-tab.x-draggable{opacity:.7}.x-tab{-webkit-user-select:none;overflow:visible !important}.x-toolbar{padding:0 0.2em;overflow:hidden;position:relative;height:2.6em}.x-toolbar > *{z-index:1}.x-toolbar.x-docked-top{border-bottom:.1em solid}.x-toolbar.x-docked-bottom{border-top:.1em solid}.x-toolbar.x-docked-left{width:7em;height:auto;padding:0.2em;border-right:.1em solid}.x-toolbar.x-docked-right{width:7em;height:auto;padding:0.2em;border-left:.1em solid}.x-title{line-height:2.1em;font-size:1.2em;text-align:center;font-weight:bold;white-space:nowrap;overflow:hidden;text-overflow:ellipsis;margin:0 0.3em;max-width:100%}.x-title .x-innerhtml{white-space:nowrap;overflow:hidden;text-overflow:ellipsis;padding:0 .3em}.x-toolbar-dark{background-color:#24364c;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #5a81af), color-stop(2%, #304864), color-stop(100%, #192533));background-image:-webkit-linear-gradient(#5a81af,#304864 2%,#192533);background-image:linear-gradient(#5a81af,#304864 2%,#192533);border-color:black}.x-toolbar-dark .x-title{color:white;text-shadow:rgba(0, 0, 0, 0.5) 0 -0.08em 0}.x-toolbar-dark.x-docked-top{border-bottom-color:black}.x-toolbar-dark.x-docked-bottom{border-top-color:black}.x-toolbar-dark.x-docked-left{border-right-color:black}.x-toolbar-dark.x-docked-right{border-left-color:black}.x-toolbar-dark .x-button,.x-toolbar .x-toolbar-dark .x-button,.x-toolbar-dark .x-field-select .x-component-outer,.x-toolbar .x-toolbar-dark .x-field-select .x-component-outer,.x-toolbar-dark .x-field-select .x-component-outer:before,.x-toolbar .x-toolbar-dark .x-field-select .x-component-outer:before{border:1px solid black;border-top-color:black;color:white}.x-toolbar-dark .x-button.x-button-back:before,.x-toolbar-dark .x-button.x-button-forward:before,.x-toolbar .x-toolbar-dark .x-button.x-button-back:before,.x-toolbar .x-toolbar-dark .x-button.x-button-forward:before,.x-toolbar-dark .x-field-select .x-component-outer.x-button-back:before,.x-toolbar-dark .x-field-select .x-component-outer.x-button-forward:before,.x-toolbar .x-toolbar-dark .x-field-select .x-component-outer.x-button-back:before,.x-toolbar .x-toolbar-dark .x-field-select .x-component-outer.x-button-forward:before,.x-toolbar-dark .x-field-select .x-component-outer:before.x-button-back:before,.x-toolbar-dark .x-field-select .x-component-outer:before.x-button-forward:before,.x-toolbar .x-toolbar-dark .x-field-select .x-component-outer:before.x-button-back:before,.x-toolbar .x-toolbar-dark .x-field-select .x-component-outer:before.x-button-forward:before{background:black}.x-toolbar-dark .x-button,.x-toolbar-dark .x-button.x-button-back:after,.x-toolbar-dark .x-button.x-button-forward:after,.x-toolbar .x-toolbar-dark .x-button,.x-toolbar .x-toolbar-dark .x-button.x-button-back:after,.x-toolbar .x-toolbar-dark .x-button.x-button-forward:after,.x-toolbar-dark .x-field-select .x-component-outer,.x-toolbar-dark .x-field-select .x-component-outer.x-button-back:after,.x-toolbar-dark .x-field-select .x-component-outer.x-button-forward:after,.x-toolbar .x-toolbar-dark .x-field-select .x-component-outer,.x-toolbar .x-toolbar-dark .x-field-select .x-component-outer.x-button-back:after,.x-toolbar .x-toolbar-dark .x-field-select .x-component-outer.x-button-forward:after,.x-toolbar-dark .x-field-select .x-component-outer:before,.x-toolbar-dark .x-field-select .x-component-outer:before.x-button-back:after,.x-toolbar-dark .x-field-select .x-component-outer:before.x-button-forward:after,.x-toolbar .x-toolbar-dark .x-field-select .x-component-outer:before,.x-toolbar .x-toolbar-dark .x-field-select .x-component-outer:before.x-button-back:after,.x-toolbar .x-toolbar-dark .x-field-select .x-component-outer:before.x-button-forward:after{background-color:#141e29;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #466890), color-stop(2%, #1f2f41), color-stop(100%, #080c11));background-image:-webkit-linear-gradient(#466890,#1f2f41 2%,#080c11);background-image:linear-gradient(#466890,#1f2f41 2%,#080c11)}.x-toolbar-dark .x-button .x-button-icon.x-icon-mask,.x-toolbar .x-toolbar-dark .x-button .x-button-icon.x-icon-mask,.x-toolbar-dark .x-field-select .x-component-outer .x-button-icon.x-icon-mask,.x-toolbar .x-toolbar-dark .x-field-select .x-component-outer .x-button-icon.x-icon-mask,.x-toolbar-dark .x-field-select .x-component-outer:before .x-button-icon.x-icon-mask,.x-toolbar .x-toolbar-dark .x-field-select .x-component-outer:before .x-button-icon.x-icon-mask{background-color:white;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ffffff), color-stop(2%, #ffffff), color-stop(100%, #e7edf3));background-image:-webkit-linear-gradient(#ffffff,#ffffff 2%,#e7edf3);background-image:linear-gradient(#ffffff,#ffffff 2%,#e7edf3)}.x-toolbar-dark .x-button.x-button-pressing,.x-toolbar-dark .x-button.x-button-pressing:after,.x-toolbar-dark .x-button.x-button-pressed,.x-toolbar-dark .x-button.x-button-pressed:after,.x-toolbar-dark .x-button.x-button-active,.x-toolbar-dark .x-button.x-button-active:after,.x-toolbar .x-toolbar-dark .x-button.x-button-pressing,.x-toolbar .x-toolbar-dark .x-button.x-button-pressing:after,.x-toolbar .x-toolbar-dark .x-button.x-button-pressed,.x-toolbar .x-toolbar-dark .x-button.x-button-pressed:after,.x-toolbar .x-toolbar-dark .x-button.x-button-active,.x-toolbar .x-toolbar-dark .x-button.x-button-active:after,.x-toolbar-dark .x-field-select .x-component-outer.x-button-pressing,.x-toolbar-dark .x-field-select .x-component-outer.x-button-pressing:after,.x-toolbar-dark .x-field-select .x-component-outer.x-button-pressed,.x-toolbar-dark .x-field-select .x-component-outer.x-button-pressed:after,.x-toolbar-dark .x-field-select .x-component-outer.x-button-active,.x-toolbar-dark .x-field-select .x-component-outer.x-button-active:after,.x-toolbar .x-toolbar-dark .x-field-select .x-component-outer.x-button-pressing,.x-toolbar .x-toolbar-dark .x-field-select .x-component-outer.x-button-pressing:after,.x-toolbar .x-toolbar-dark .x-field-select .x-component-outer.x-button-pressed,.x-toolbar .x-toolbar-dark .x-field-select .x-component-outer.x-button-pressed:after,.x-toolbar .x-toolbar-dark .x-field-select .x-component-outer.x-button-active,.x-toolbar .x-toolbar-dark .x-field-select .x-component-outer.x-button-active:after,.x-toolbar-dark .x-field-select .x-component-outer:before.x-button-pressing,.x-toolbar-dark .x-field-select .x-component-outer:before.x-button-pressing:after,.x-toolbar-dark .x-field-select .x-component-outer:before.x-button-pressed,.x-toolbar-dark .x-field-select .x-component-outer:before.x-button-pressed:after,.x-toolbar-dark .x-field-select .x-component-outer:before.x-button-active,.x-toolbar-dark .x-field-select .x-component-outer:before.x-button-active:after,.x-toolbar .x-toolbar-dark .x-field-select .x-component-outer:before.x-button-pressing,.x-toolbar .x-toolbar-dark .x-field-select .x-component-outer:before.x-button-pressing:after,.x-toolbar .x-toolbar-dark .x-field-select .x-component-outer:before.x-button-pressed,.x-toolbar .x-toolbar-dark .x-field-select .x-component-outer:before.x-button-pressed:after,.x-toolbar .x-toolbar-dark .x-field-select .x-component-outer:before.x-button-active,.x-toolbar .x-toolbar-dark .x-field-select .x-component-outer:before.x-button-active:after{background-color:#0f161f;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #000000), color-stop(10%, #070a0e), color-stop(65%, #0f161f), color-stop(100%, #101721));background-image:-webkit-linear-gradient(#000000,#070a0e 10%,#0f161f 65%,#101721);background-image:linear-gradient(#000000,#070a0e 10%,#0f161f 65%,#101721)}.x-toolbar-dark .x-form-label{color:white;text-shadow:rgba(0, 0, 0, 0.5) 0 -0.08em 0}.x-toolbar-light{background-color:#354f6e;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #7c9bc0), color-stop(2%, #416086), color-stop(100%, #293e56));background-image:-webkit-linear-gradient(#7c9bc0,#416086 2%,#293e56);background-image:linear-gradient(#7c9bc0,#416086 2%,#293e56);border-color:black}.x-toolbar-light .x-title{color:white;text-shadow:rgba(0, 0, 0, 0.5) 0 -0.08em 0}.x-toolbar-light.x-docked-top{border-bottom-color:black}.x-toolbar-light.x-docked-bottom{border-top-color:black}.x-toolbar-light.x-docked-left{border-right-color:black}.x-toolbar-light.x-docked-right{border-left-color:black}.x-toolbar-light .x-button,.x-toolbar .x-toolbar-light .x-button,.x-toolbar-light .x-field-select .x-component-outer,.x-toolbar .x-toolbar-light .x-field-select .x-component-outer,.x-toolbar-light .x-field-select .x-component-outer:before,.x-toolbar .x-toolbar-light .x-field-select .x-component-outer:before{border:1px solid #030507;border-top-color:#0c1118;color:white}.x-toolbar-light .x-button.x-button-back:before,.x-toolbar-light .x-button.x-button-forward:before,.x-toolbar .x-toolbar-light .x-button.x-button-back:before,.x-toolbar .x-toolbar-light .x-button.x-button-forward:before,.x-toolbar-light .x-field-select .x-component-outer.x-button-back:before,.x-toolbar-light .x-field-select .x-component-outer.x-button-forward:before,.x-toolbar .x-toolbar-light .x-field-select .x-component-outer.x-button-back:before,.x-toolbar .x-toolbar-light .x-field-select .x-component-outer.x-button-forward:before,.x-toolbar-light .x-field-select .x-component-outer:before.x-button-back:before,.x-toolbar-light .x-field-select .x-component-outer:before.x-button-forward:before,.x-toolbar .x-toolbar-light .x-field-select .x-component-outer:before.x-button-back:before,.x-toolbar .x-toolbar-light .x-field-select .x-component-outer:before.x-button-forward:before{background:#030507}.x-toolbar-light .x-button,.x-toolbar-light .x-button.x-button-back:after,.x-toolbar-light .x-button.x-button-forward:after,.x-toolbar .x-toolbar-light .x-button,.x-toolbar .x-toolbar-light .x-button.x-button-back:after,.x-toolbar .x-toolbar-light .x-button.x-button-forward:after,.x-toolbar-light .x-field-select .x-component-outer,.x-toolbar-light .x-field-select .x-component-outer.x-button-back:after,.x-toolbar-light .x-field-select .x-component-outer.x-button-forward:after,.x-toolbar .x-toolbar-light .x-field-select .x-component-outer,.x-toolbar .x-toolbar-light .x-field-select .x-component-outer.x-button-back:after,.x-toolbar .x-toolbar-light .x-field-select .x-component-outer.x-button-forward:after,.x-toolbar-light .x-field-select .x-component-outer:before,.x-toolbar-light .x-field-select .x-component-outer:before.x-button-back:after,.x-toolbar-light .x-field-select .x-component-outer:before.x-button-forward:after,.x-toolbar .x-toolbar-light .x-field-select .x-component-outer:before,.x-toolbar .x-toolbar-light .x-field-select .x-component-outer:before.x-button-back:after,.x-toolbar .x-toolbar-light .x-field-select .x-component-outer:before.x-button-forward:after{background-color:#24364c;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #5a81af), color-stop(2%, #304864), color-stop(100%, #192533));background-image:-webkit-linear-gradient(#5a81af,#304864 2%,#192533);background-image:linear-gradient(#5a81af,#304864 2%,#192533)}.x-toolbar-light .x-button .x-button-icon.x-icon-mask,.x-toolbar .x-toolbar-light .x-button .x-button-icon.x-icon-mask,.x-toolbar-light .x-field-select .x-component-outer .x-button-icon.x-icon-mask,.x-toolbar .x-toolbar-light .x-field-select .x-component-outer .x-button-icon.x-icon-mask,.x-toolbar-light .x-field-select .x-component-outer:before .x-button-icon.x-icon-mask,.x-toolbar .x-toolbar-light .x-field-select .x-component-outer:before .x-button-icon.x-icon-mask{background-color:white;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ffffff), color-stop(2%, #ffffff), color-stop(100%, #e7edf3));background-image:-webkit-linear-gradient(#ffffff,#ffffff 2%,#e7edf3);background-image:linear-gradient(#ffffff,#ffffff 2%,#e7edf3)}.x-toolbar-light .x-button.x-button-pressing,.x-toolbar-light .x-button.x-button-pressing:after,.x-toolbar-light .x-button.x-button-pressed,.x-toolbar-light .x-button.x-button-pressed:after,.x-toolbar-light .x-button.x-button-active,.x-toolbar-light .x-button.x-button-active:after,.x-toolbar .x-toolbar-light .x-button.x-button-pressing,.x-toolbar .x-toolbar-light .x-button.x-button-pressing:after,.x-toolbar .x-toolbar-light .x-button.x-button-pressed,.x-toolbar .x-toolbar-light .x-button.x-button-pressed:after,.x-toolbar .x-toolbar-light .x-button.x-button-active,.x-toolbar .x-toolbar-light .x-button.x-button-active:after,.x-toolbar-light .x-field-select .x-component-outer.x-button-pressing,.x-toolbar-light .x-field-select .x-component-outer.x-button-pressing:after,.x-toolbar-light .x-field-select .x-component-outer.x-button-pressed,.x-toolbar-light .x-field-select .x-component-outer.x-button-pressed:after,.x-toolbar-light .x-field-select .x-component-outer.x-button-active,.x-toolbar-light .x-field-select .x-component-outer.x-button-active:after,.x-toolbar .x-toolbar-light .x-field-select .x-component-outer.x-button-pressing,.x-toolbar .x-toolbar-light .x-field-select .x-component-outer.x-button-pressing:after,.x-toolbar .x-toolbar-light .x-field-select .x-component-outer.x-button-pressed,.x-toolbar .x-toolbar-light .x-field-select .x-component-outer.x-button-pressed:after,.x-toolbar .x-toolbar-light .x-field-select .x-component-outer.x-button-active,.x-toolbar .x-toolbar-light .x-field-select .x-component-outer.x-button-active:after,.x-toolbar-light .x-field-select .x-component-outer:before.x-button-pressing,.x-toolbar-light .x-field-select .x-component-outer:before.x-button-pressing:after,.x-toolbar-light .x-field-select .x-component-outer:before.x-button-pressed,.x-toolbar-light .x-field-select .x-component-outer:before.x-button-pressed:after,.x-toolbar-light .x-field-select .x-component-outer:before.x-button-active,.x-toolbar-light .x-field-select .x-component-outer:before.x-button-active:after,.x-toolbar .x-toolbar-light .x-field-select .x-component-outer:before.x-button-pressing,.x-toolbar .x-toolbar-light .x-field-select .x-component-outer:before.x-button-pressing:after,.x-toolbar .x-toolbar-light .x-field-select .x-component-outer:before.x-button-pressed,.x-toolbar .x-toolbar-light .x-field-select .x-component-outer:before.x-button-pressed:after,.x-toolbar .x-toolbar-light .x-field-select .x-component-outer:before.x-button-active,.x-toolbar .x-toolbar-light .x-field-select .x-component-outer:before.x-button-active:after{background-color:#1f2f41;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #0f161f), color-stop(10%, #172330), color-stop(65%, #1f2f41), color-stop(100%, #203043));background-image:-webkit-linear-gradient(#0f161f,#172330 10%,#1f2f41 65%,#203043);background-image:linear-gradient(#0f161f,#172330 10%,#1f2f41 65%,#203043)}.x-toolbar-light .x-form-label{color:white;text-shadow:rgba(0, 0, 0, 0.5) 0 -0.08em 0}.x-navigation-bar .x-container{overflow:visible}.x-desktop .x-toolbar .x-field-search{padding-left:1.06em}.x-spinner .x-input-el,.x-field-select .x-input-el{-webkit-text-fill-color:#000;-webkit-opacity:1}.x-spinner.x-item-disabled .x-input-el,.x-field-select.x-item-disabled .x-input-el{-webkit-text-fill-color:currentcolor}.x-toolbar .x-field-select .x-input-el{-webkit-text-fill-color:#fff}.x-toolbar .x-field-select.x-item-disabled .x-input-el{-webkit-text-fill-color:rgba(255, 255, 255, 0.6)}.x-toolbar .x-form-field-container{padding:0 .3em}.x-toolbar .x-field{width:13em;margin:.5em;min-height:0;border-bottom:0}.x-toolbar .x-field .x-clear-icon{background-size:50% 50%;right:-0.8em;margin-top:-1.06em}.x-toolbar .x-field-input{padding-right:1.6em !important}.x-toolbar .x-field-textarea .x-component-outer,.x-toolbar .x-field-text .x-component-outer,.x-toolbar .x-field-number .x-component-outer,.x-toolbar .x-field-search .x-component-outer{-webkit-border-radius:0.3em;border-radius:0.3em;background-color:white;-webkit-box-shadow:inset rgba(0, 0, 0, 0.5) 0 0.1em 0, inset rgba(0, 0, 0, 0.5) 0 -0.1em 0, inset rgba(0, 0, 0, 0.5) 0.1em 0 0, inset rgba(0, 0, 0, 0.5) -0.1em 0 0, inset rgba(0, 0, 0, 0.5) 0 0.15em 0.4em}.x-toolbar .x-form-label{background:transparent;border:0;padding:0;line-height:1.4em}.x-toolbar .x-form-field{height:1.6em;color:#6e6e6e;background:transparent;min-height:0;-webkit-appearance:none;padding:0em .3em;margin:0}.x-toolbar .x-form-field:focus{color:black}.x-toolbar .x-field-select .x-component-outer,.x-toolbar .x-field-search .x-component-outer{-webkit-border-radius:0.8em;border-radius:0.8em}.x-toolbar .x-field-search .x-field-input{background-position:.5em 50%}.x-toolbar .x-field-select{-webkit-box-shadow:none}.x-toolbar .x-field-select .x-form-field{height:1.4em}.x-toolbar .x-field-select{background:transparent}.x-toolbar .x-field-select .x-component-outer:after{right:.4em}.x-toolbar .x-field-select.x-item-disabled .x-component-outer:after{opacity:.6}.x-toolbar .x-field-select .x-component-outer:before{width:3em;border-left:none;-webkit-border-top-right-radius:0.8em;border-top-right-radius:0.8em;-webkit-border-bottom-right-radius:0.8em;border-bottom-right-radius:0.8em;-webkit-mask:url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADIAAAABCAYAAACc0f2yAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAADJJREFUeNpi/P//PwMjIyMbAwMDOxRzAjEXFHMDMQ8a5kXC6HLcSHo5kcwEmU9TABBgAOcTBAFcRiSpAAAAAElFTkSuQmCC');-webkit-mask-position:right top;-webkit-mask-repeat:repeat-y;-webkit-mask-size:3em 0.05em}.x-toolbar .x-field-select .x-input-text{color:#fff}.x-android .x-field-search .x-field-input{padding-left:.2em !important;padding-right:2.2em !important}.x-indexbar-wrapper{-webkit-box-pack:end !important;box-pack:end !important;pointer-events:none}.x-indexbar-vertical{width:1.1em;-webkit-box-orient:vertical;box-orient:vertical;margin-right:8px}.x-indexbar-horizontal{height:1.1em;-webkit-box-orient:horizontal;box-orient:horizontal;margin-bottom:8px}.x-indexbar{pointer-events:auto;z-index:2;padding:.3em 0;min-height:0 !important;height:auto !important;-webkit-box-flex:0 !important}.x-indexbar > div{color:#1e2a38;font-size:0.6em;text-align:center;line-height:1.1em;font-weight:bold;display:block}.x-phone.x-landscape .x-indexbar > div{font-size:0.38em;line-height:1em}.x-indexbar-pressed{-webkit-border-radius:0.55em;border-radius:0.55em;background-color:rgba(143, 152, 163, 0.8)}.x-list{position:relative;background-color:#f7f7f7}.x-list .x-list-inner{width:100%}.x-list .x-list-disclosure{position:absolute;bottom:0.44em;right:0.44em}.x-list .x-list-disclosure{overflow:visible;-webkit-mask:0 0 url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA2ZpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYwIDYxLjEzNDc3NywgMjAxMC8wMi8xMi0xNzozMjowMCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDpFNkNCM0JGNTZFMjI2ODExQkNGQjkwMzk3MDc3MkZFQiIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDo3M0MzQUU1QUFDQkQxMURGOEQ2MUVDMjM0MzY2NTBDQSIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDo3M0MzQUU1OUFDQkQxMURGOEQ2MUVDMjM0MzY2NTBDQSIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgQ1M1IE1hY2ludG9zaCI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOkU3Q0IzQkY1NkUyMjY4MTFCQ0ZCOTAzOTcwNzcyRkVCIiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOkU2Q0IzQkY1NkUyMjY4MTFCQ0ZCOTAzOTcwNzcyRkVCIi8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+uoWjuwAACh9JREFUeNrUm2toVdkVx7eJRqPRaHzFGBOjidGYaLQaX9GREXXAkloYQVpT+qFYBkcqLS0zTKFQWpwv86F0KLRfHFqnWDq0UCsMFYqlqHSwGo2v4Du+X9FoNL5P12/N3rLn9Cb33HNvrnHDujfnnHvO2f+91l57/dfaGWBe8xYEQUq/H5ilftWIVIoU2+Ov2e/jIt0inSKnRVpEnvdlR/oK8CKRt0QaRd4QyU3hXkDvFvmXyOeZHoABGXzWWJF3RL4rUuFfKC4uNmPHjjUjRozQ44kTJ+r3jRs3zNOnT013d7e5deuWuXTpknnx4oV/602RP4n8TqQ1EyadCcBlIh9YoHmcqKioMFOnTjXl5eVm1KhR5smTJwrs+fPnCohvOjpw4ECTk5Ojwt/5+fnmzp075vr16+bkyZPm1KlT/nv+KvJLkf++KsCAe89KPidmz55t5s6dawoLC839+/fNo0ePFCwgHjx4oMe0u3fv6vfw4cNNbm6uGTRokCkoKNDBycvLU+DDhg3TQTp27Jg5fPiwuXfvnnvvJyI/EunIJmCczqci1RzMmzfPLFiwQF9Ox65cuWKuXr2qZoqk0ikGa/z48WbcuHFm0qRJOihDhw41LS0tZu/evToI1sl9W2RXNgC/K/IRGp42bZpZsmSJasSZ4fnz51WbmWiDBw9W0NXV1TrvOd6zZ49pbX05nd8XwB/2FWA87a+tYzKLFi0yixcvVoCY3NmzZ8MOJ6OttLRUpwy+4dy5c2bnzp3u0h9FvifAuzMJmPm6Q+SbHGzYsEHn3P79+83Ro0fVCWWrVVZWmqVLl+rfO3bsUA8v7QuRbwjoa5l6z2/xD7KsBJs3bw7WrVsXiINh8rwSGTJkSLBmzRrtS1lZmTv/H5wnc7o3iTpnA1k69AXLli0LZAmJ1VGeQWfFEek3x3FBc684ymDLli0+6E/TBfymyDMeJmasL4jbSe4bPXp0MGvWLJX6+vpAApJAlqTYoAcMGBDU1NQEmzZtCsRxuvPvxQVM7Hubh4gnDsRJxdYsInM+kOUrkHVXj/lmAGVOBuJ909K0rBZBc3OzO4eCmuIA/jcPkEAiWLVqVVqdQjA7WWLc8TZ3ns7W1tYGstaqxuI8m8GbM2dOIKuGO3dDpCAVwCw9QUlJSbB+/XrfXGLLzJkzffMtFNko8pjjyZMnq4njFONOGRSyevVqNXF77hdRARc4U167dm0wZsyYjHhW5m0IsLFMCm0EEl0FDQ0NgZCMl2afqjBgTU1N7vg+PCUK4B9yw/Tp0wNZ6NOatxEAO/JxxC03mCWmH8eZMVBVVVVBXV2dO/ebMOCcEFhIwI/5g1j2woUL5tmzZ30dS7SLLBb5DHKxb98+jaVhXDIAKT2IAIgYnnjcto3iF6r934QBr4G+Tpkyxdy+fdt0dXVlK4DiRetEfs7BgQMHtPPE6rAm6XTkBz18+FDJC2GoDYc39ga4mQ9ZL5UMZEG74fYzC7zrzJkzSitlaqnG4MxRGvH8zZs3daBs+5YMWG6iFE+R1bA+HD6bNBCXkcfsioqKNJsBl+1JGwT9J06ciNLnz0TaRP5+8eLFMvohnlfJCVQzihLQMoMF05JnFNsAanf4dxCDoLy8XIOBKGsiyxXLjUyBQEY0FQdTGDFltMdFVAQ+MmiR4wGiONZme7w1kdNayYcsQ0rio8SdaBa2wuhnigOH8lmryGfRF5gZaSDYEvw7qVMQ/4PF+djCc7iBD9ItUTtPNoK5blu5pZtRpDMi6Cci3xfZjBNua2tTc8WZ8e7e5jWK8GhrvVhJng841+aOdY643FPSjEBubrac2cciK8hjQf6vXbumzowcWE99ACyKGzlypMNX6QNmYueTO3r8+HFWCX0KjTz1AtK1WNXx48c19TNhwgS1ykQNLFiCR4ZeAsZBqMe1SbL+2k7bIGUX2iNIIectsbjmu8INLN7yNNEHXKBrlDiFfqrdcJDydZEPXZDinG0is/YcV6EPWA+42JeJuAy390XW49hI2JNjC8cAYEGJvlJzzOvb8mztStPFeOUkS2muH2l1OxOIGsK94kZU+BdLL1W7xM/hBhYvMuv0NdzhvFoWl5q4rY6pC1iWnIULFxI+6vocbpizt8R2+IDb/egkFXaS5Ub4u496HYU64b2GYARml8j3hIKo9rCGOyh84d69id6f2gfWjAsIOgAMGaEwlwisIzaucGe+LL5/hS1RiH4Tk+5n6zGB8+9F3uaAWhZ9O3ToUK+MDqURSFkNd4lDaw976f18YPPeYp00w9DHrcxWFN6GMKxYsUKJzZEjR5LSV8B6DviLROThn3wQtuEMonhrXko6xrYLGaaHb1iwdSUlJapZ4mjMOEqsT0jZ2fmSo+xOBBgNd7icUBQK1tHRob8jJeTFrJlopGX+QYxP4qCqqkqLdlQqoyQAMGeXtbFtV6KMR7fNNmzExZPBSEYTGWm4MLy4trZWHV4iD8854t3t27frjoAkwcRHtp6lmQ46jgnjfKIWw1iXWW3IeuCb5L7WRIBpnwAY+kUBmpRKb86LDhDhXL58WcH3Ng0izPevBBPLly/XKXPw4MGUkgs4XTKunnb/kOweFnWtBGQqCZ8kL+2CibNcE2sJVq5cGQj1i1XeIRlPzcpLxhf1lpemsVNGQzWSYB7byEowIQOtjglCQOSXSmPuwo897X4sIDt6S9PS2B7Uwh4qzBAvnIn4uof593/BBPOVKRKHteE48T04N0sjfxX13kY/W0gBO12TnjFjhl+UI8PyZ3eNcix1pXTeQ5mGSqfMX3fuB6mWS3Wbg5iI1pjSLZeWlpZqldAen3JpXgkmtBZEh+M+G99ATQmx5w7hv1IFDGE+aWwNFw2lA5r6L46LEqyx9WKcU0VFRVoFOwposqKohdhz0KaauFse6o2t4eI1SYTH7RzTg2Q9SXuhdLobAPOLWwQ3tvpPebWxsdE/35zuphaCdt3nQSmTykQ6+zLoJLXgdIvsaNaB9erJWzOxi4f2jnvR/Pnz1cTTmXNxC95OZKnUGnII7LZkYFPdpviueyHOAUeGV01n61GcaYFlUKzHI3vXtvXkpNIB7Mz7ofPemDhOJ50NKalolXcSReEHvGtbowB1EieXgyNjG6JW1mEylDwIFoi9U42OkjXSNLA3oj6Ykle4g/t9R0D8LZXnxU1esWRttXM7lwwJNA6qCL2EpMO44iYIXNaFyMlFeu3t7Zq78ugeBbZz2d4RX2mBa/oFTRPLQs+ggfBlGA/gYV09hYvQR5eScRvF+Zt7iOm92JjMxU9snam3kLXPALvWYHlsoztBmgjtIGiazkMhw6ABC4+GpADa/QuA5bJ+Temn5sv/f4gSo/c5YNfYKd9kGVBdOCmO5hI1pkAC3t1uExKfmwTbFfoL4HACDlN/y5p+RZLfU/Fvs+BgbK1psLBXAjhR+qauh2unTfRdAa8N4D5pqQL+nwADAKGFDQ//Deb9AAAAAElFTkSuQmCC') no-repeat;-webkit-mask-size:1.7em;background-color:#003370;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #0a7aff), color-stop(2%, #004394), color-stop(100%, #00234c));background-image:-webkit-linear-gradient(#0a7aff,#004394 2%,#00234c);background-image:linear-gradient(#0a7aff,#004394 2%,#00234c);width:1.7em;height:1.7em}.x-list.x-list-indexed .x-list-disclosure{margin-right:1em}.x-list .x-item-selected .x-list-disclosure{background:#fff none}.x-list .x-list-item{position:relative;color:black}.x-list .x-list-item .x-list-item-label{min-height:2.6em;padding:0.7em 0.8em}.x-list .x-list-item.x-item-pressed .x-list-item-label{background:#77b2f8 none}.x-list .x-list-item.x-item-selected .x-list-item-label{background-color:#06346a;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #167bf3), color-stop(2%, #07448c), color-stop(100%, #042348));background-image:-webkit-linear-gradient(#167bf3,#07448c 2%,#042348);background-image:linear-gradient(#167bf3,#07448c 2%,#042348);color:white;text-shadow:rgba(0, 0, 0, 0.5) 0 -0.08em 0}.x-list-header{position:relative}.x-list-header-swap{position:absolute;left:0;width:100%;z-index:1}.x-ios .x-list-header-swap{-webkit-transform:translate3d(0, 0, 0)}.x-list-normal .x-list-header{background-color:#4d80bc;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #bccfe6), color-stop(2%, #6792c5), color-stop(100%, #3f6ea6));background-image:-webkit-linear-gradient(#bccfe6,#6792c5 2%,#3f6ea6);background-image:linear-gradient(#bccfe6,#6792c5 2%,#3f6ea6);color:#1f3651;text-shadow:rgba(255, 255, 255, 0.25) 0 0.08em 0;border-top:1px solid #4d80bc;border-bottom:1px solid #2d4e76;font-weight:bold;font-size:0.8em;padding:0.2em 1.02em;text-shadow:rgba(255, 255, 255, 0.25) 0 0.08em 0}.x-list-normal .x-list-item .x-list-item-label{border-top:1px solid #d1d1d1}.x-list-normal .x-list-item:first-child{border-top:none}.x-list-normal .x-list-item:last-child .x-list-item-label{border-bottom:1px solid #d1d1d1}.x-list-normal .x-list-item.x-item-pressed .x-list-item-label{border-top-color:#77b2f8}.x-list-normal .x-list-item.x-item-selected .x-list-item-label{border-top-color:#084b9b;border-bottom-color:#021022}.x-list-round .x-scroll-view{background-color:#EEEEEE !important}.x-list-round .x-list-disclosure{-webkit-mask:0 0 url('data:image/png;base64,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') no-repeat;background-color:#777777;background-image:none}.x-list-round .x-list-header{color:#777;font-size:1em;font-weight:bold;padding-left:26px;line-height:1.7em;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #eeeeee), color-stop(30%, rgba(238,238,238,0.9)), color-stop(100%, rgba(238,238,238,0.4)));background-image:-webkit-linear-gradient(top, #eeeeee,rgba(238,238,238,0.9) 30%,rgba(238,238,238,0.4));background-image:linear-gradient(top, #eeeeee,rgba(238,238,238,0.9) 30%,rgba(238,238,238,0.4))}.x-list-round .x-list-container{padding:13px 13px 0 13px}.x-list-round .x-list-container .x-list-header{padding-left:13px;background-image:none}.x-list-round.x-list-ungrouped .x-list-item-label,.x-list-round.x-list-grouped .x-list-item-label{border:solid #DDDDDD;border-width:1px 1px 0 1px;background:#fff}.x-list-round.x-list-ungrouped .x-list-item:first-child .x-list-item-label{-webkit-border-top-left-radius:0.4em;border-top-left-radius:0.4em;-webkit-border-top-right-radius:0.4em;border-top-right-radius:0.4em}.x-list-round.x-list-ungrouped .x-list-item:last-child{margin-bottom:13px}.x-list-round.x-list-ungrouped .x-list-item:last-child .x-list-item-label{-webkit-border-bottom-left-radius:0.4em;border-bottom-left-radius:0.4em;-webkit-border-bottom-right-radius:0.4em;border-bottom-right-radius:0.4em;border-width:1px}.x-list-round.x-list-grouped .x-list-header-item .x-list-item-label{-webkit-border-top-left-radius:0.4em;border-top-left-radius:0.4em;-webkit-border-top-right-radius:0.4em;border-top-right-radius:0.4em}.x-list-round.x-list-grouped .x-list-footer-item{margin-bottom:13px}.x-list-round.x-list-grouped .x-list-footer-item .x-list-item-label{border-width:1px;-webkit-border-bottom-left-radius:0.4em;border-bottom-left-radius:0.4em;-webkit-border-bottom-right-radius:0.4em;border-bottom-right-radius:0.4em}.x-dataview-inlineblock .x-dataview-item{display:inline-block !important}.x-dataview-nowrap .x-dataview-container{white-space:nowrap !important}.x-list-inlineblock .x-list-item{display:inline-block !important}.x-list-nowrap .x-list-inner{width:auto}.x-list-nowrap .x-list-container{white-space:nowrap !important}.x-list-paging{height:50px}.x-list-paging .x-loading-spinner{display:none;margin:auto}.x-list-paging .x-list-paging-msg{text-align:center;color:#06346a;padding-top:10px;-webkit-border-radius:6px;border-radius:6px}.x-list-paging.x-loading .x-loading-spinner{display:block}.x-list-paging.x-loading .x-list-paging-msg{display:none}.x-list-pullrefresh{display:-webkit-box;display:box;-webkit-box-orient:horizontal;box-orient:horizontal;-webkit-box-align:center;box-align:center;-webkit-box-pack:center;box-pack:center;position:absolute;top:-5em;left:0;width:100%;height:4.5em}.x-list-pullrefresh .x-loading-spinner{display:none}.x-list-pullrefresh-arrow{width:2.5em;height:4.5em;background:center center url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACgAAAA8CAYAAAAUufjgAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAAjFJREFUeNrsmU8oREEYwOexdtNuKBfFwdVhCyfuysnFiXISS+1BLopyUpKLXETkRLaUi1LK3Q2lpPbiQLnIn03a/Hm+z86Ttv0zM++bfbOar36Hbad5v535Zp7v47iuy0wOpyoEHccRHV9L9NxPkUE/bhKCOKiOSPAdn69DsJ5I8E2HYA0QJRJ8Bb50CDYRCT7pEMQD0kwk+CByUFQEW4gE73UIhoA2IsFb4ENEMCQ5MdU1IxwygpT3oKNLMGyyYFVscdhusc8tDpu+xRG7xf95BW0O2kNiV1AgIvaQ2BzUJNgJNJYZGyUU7OG1cal4Bi68oqkDPszy2teEwJp5Cdyu/lZ1g8CwIYJ7wEF+2YmrNw90Byx3BizgKhaqizEP1wg7CLLxCEzy/CtauMeBlQDyEfNuGrgU6SyM8F9SyVgHdmRaH6tAb4XkToEp2d4M5mOK0TWMigU2koa8vJMRZPxEb2ss2LEVPMpPLlMRxBgDZjQJLgNbxb6Uab9tAn3EcifAeKkBMoLY+j0GWonk7oB+lmsFkwhidAGHBPmIeTcAnJcbKCuIMQEs+hScAzZEBqoIYuzyFVCJI36lMJ2CDfxibZeUu+EX/4uMIFP8ZyLejxkgK0hG5a8kP4IYSZbr1IuQVHmAX0HGX4VuGfZVJ6cQxPd1uoRcWqDW0SroFVzZAnJZ/h0LWhAjUUAw4XdSSsH8fExRTEgtGAOuOTETBb16Jk412e+bxOSwglYw6PgWYABvLk8P7zGJFwAAAABJRU5ErkJggg==') no-repeat;background-size:2em 3em;-webkit-transform:rotate(0deg)}.x-list-pullrefresh-release .x-list-pullrefresh-arrow{-webkit-transform:rotate(-180deg)}.x-list-pullrefresh-wrap{width:20em;font-size:0.7em}.x-list-pullrefresh-message{font-weight:bold;font-size:1.3em;margin-bottom:0.1em;text-align:center}.x-list-pullrefresh-updated{text-align:center}html,body{width:100%;height:100%}.x-translatable{position:absolute;top:100%;left:100%;z-index:1}.x-translatable-container{position:relative}.x-translatable-wrapper{width:100%;height:100%;position:absolute;overflow:hidden}.x-translatable-stretcher{width:300%;height:300%;position:absolute;visibility:hidden;z-index:-1}.x-translatable-nested-stretcher{width:100%;height:100%;left:100%;top:100%;position:absolute;visibility:hidden;z-index:-1}.x-layout-fit,.x-layout-card{position:relative;overflow:hidden}.x-layout-fit-item,.x-layout-card-item{position:absolute !important;width:100%;height:100%}.x-layout-hbox,.x-layout-vbox{display:-webkit-box}.x-layout-hbox > *,.x-layout-vbox > *{-webkit-box-flex:0}.x-layout-hbox{-webkit-box-orient:horizontal}.x-layout-vbox{-webkit-box-orient:vertical}.x-layout-hbox > .x-layout-box-item{width:0 !important}.x-layout-vbox > .x-layout-box-item{height:0 !important}.x-table-inner{display:table !important;width:100%;height:100%}.x-table-inner.x-table-fixed{table-layout:fixed !important}.x-table-row{display:table-row !important}.x-table-row > *{display:table-cell !important;vertical-align:middle}.x-container,.x-body{display:-webkit-box}.x-body{overflow:hidden;-webkit-box-flex:1;min-width:100%;min-height:100%}.x-body > .x-inner,.x-container > .x-inner{-webkit-box-flex:1;min-width:100%;min-height:100%;position:relative}.x-docking-horizontal{display:-webkit-box;-webkit-box-flex:1;-webkit-box-orient:horizontal;min-width:100%;min-height:100%}.x-docking-vertical{display:-webkit-box;-webkit-box-flex:1;-webkit-box-orient:vertical;min-width:100%;min-height:100%}.x-centered{position:absolute !important;width:100%;height:100%;display:-webkit-box;-webkit-box-align:center;-webkit-box-pack:center}.x-floating{position:absolute !important}.x-centered > *{position:relative !important;-webkit-box-flex:0 !important}.x-size-change-detector{visibility:hidden;position:absolute;left:0;top:0;z-index:-1;width:100%;height:100%;overflow:hidden}.x-size-change-detector > *{visibility:hidden}.x-size-change-detector-shrink > *{width:200%;height:200%}.x-size-change-detector-expand > *{width:100000px;height:100000px}.x-scroll-view{position:relative;display:block}.x-scroll-container{position:absolute;overflow:hidden;width:100%;height:100%}.x-scroll-scroller{position:absolute;min-width:100%;min-height:100%}.x-ios .x-scroll-scroller{-webkit-transform:translate3d(0, 0, 0)}.x-scroll-stretcher{position:absolute;visibility:hidden}.x-scroll-bar-grid-wrapper{position:absolute;width:100%;height:100%}.x-scroll-bar-grid{display:table;width:100%;height:100%}.x-scroll-bar-grid > *{display:table-row}.x-scroll-bar-grid > * > *{display:table-cell}.x-scroll-bar-grid > :first-child > :first-child{width:100%;height:100%}.x-scroll-bar-grid > :first-child > :nth-child(2){padding:3px 3px 0 0}.x-scroll-bar-grid > :nth-child(2) > :first-child{padding:0 0 3px 3px}.x-scroll-bar{position:relative;overflow:hidden}.x-scroll-bar-stretcher{position:absolute;visibility:hidden;width:100%;height:100%}.x-scroll-bar-x{width:100%}.x-scroll-bar-x > .x-scroll-bar-stretcher{width:300%}.x-scroll-bar-x.active{height:6px}.x-scroll-bar-y{height:100%}.x-scroll-bar-y > .x-scroll-bar-stretcher{height:300%}.x-scroll-bar-y.active{width:6px}.x-scroll-indicator{background:#333;position:absolute;z-index:2;opacity:0.5}.x-scroll-indicator.default{-webkit-border-top-left-radius:3px;border-top-left-radius:3px;-webkit-border-top-right-radius:3px;border-top-right-radius:3px;-webkit-border-bottom-left-radius:3px;border-bottom-left-radius:3px;-webkit-border-bottom-right-radius:3px;border-bottom-right-radius:3px}.x-list-light .x-scroll-indicator,.x-dataview-light .x-scroll-indicator{background:#fff;opacity:1}.x-scroll-indicator-x{height:100%}.x-scroll-indicator-y{width:100%}.x-scroll-indicator.csstransform{background:none}.x-scroll-indicator.csstransform > *{position:absolute;background-color:#333}.x-scroll-indicator.csstransform > :nth-child(2){-webkit-transform-origin:0% 0%;background:none;content:url(data:image/bmp;base64,Qk08AAAAAAAAADYAAAAoAAAAAQAAAAEAAAABABAAAAAAAAYAAAASCwAAEgsAAAAAAAAAAAAAxhgAAAAA)}.x-scroll-indicator.csstransform.x-scroll-indicator-light > *{background-color:#eee}.x-scroll-indicator.csstransform.x-scroll-indicator-light > :nth-child(2){content:url(data:image/bmp;base64,Qk08AAAAAAAAADYAAAAoAAAAAQAAAAEAAAABABAAAAAAAAYAAAASCwAAEgsAAAAAAAAAAAAAvXcAAAAA)}.x-scroll-indicator.csstransform.x-scroll-indicator-y > *{width:100%}.x-scroll-indicator.csstransform.x-scroll-indicator-y > :first-child{height:3px;-webkit-border-top-left-radius:3px;border-top-left-radius:3px;-webkit-border-top-right-radius:3px;border-top-right-radius:3px}.x-scroll-indicator.csstransform.x-scroll-indicator-y > :nth-child(2){height:1px}.x-scroll-indicator.csstransform.x-scroll-indicator-y > :last-child{height:3px;-webkit-border-bottom-left-radius:3px;border-bottom-left-radius:3px;-webkit-border-bottom-right-radius:3px;border-bottom-right-radius:3px}.x-scroll-indicator.csstransform.x-scroll-indicator-x > *{height:100%}.x-scroll-indicator.csstransform.x-scroll-indicator-x > :first-child{width:3px;-webkit-border-top-left-radius:3px;border-top-left-radius:3px;-webkit-border-bottom-left-radius:3px;border-bottom-left-radius:3px}.x-scroll-indicator.csstransform.x-scroll-indicator-x > :nth-child(2){width:1px}.x-scroll-indicator.csstransform.x-scroll-indicator-x > :last-child{width:3px;-webkit-border-top-right-radius:3px;border-top-right-radius:3px;-webkit-border-bottom-right-radius:3px;border-bottom-right-radius:3px}.x-carousel{position:relative;overflow:hidden}.x-carousel-item{position:absolute;width:100%;height:100%}.x-carousel-item > *{position:absolute;width:100%;height:100%}.x-carousel-indicator{padding:0;-webkit-border-radius:0;border-radius:0;-webkit-box-shadow:none;background-color:transparent;background-image:none}.x-carousel-indicator{-webkit-box-flex:1;display:-webkit-box;display:box;-webkit-box-pack:center;box-pack:center;-webkit-box-align:center;box-align:center}.x-carousel-indicator span{display:block;width:0.5em;height:0.5em;-webkit-border-radius:0.25em;border-radius:0.25em;margin:0.2em}.x-carousel-indicator-horizontal{height:1.5em;width:100%}.x-carousel-indicator-vertical{-webkit-box-orient:vertical;box-orient:vertical;width:1.5em;height:100%}.x-carousel-indicator-light span{background-color:rgba(255, 255, 255, 0.1);background-image:none}.x-carousel-indicator-light span.x-carousel-indicator-active{background-color:rgba(255, 255, 255, 0.3);background-image:none}.x-carousel-indicator-dark span{background-color:rgba(0, 0, 0, 0.1);background-image:none}.x-carousel-indicator-dark span.x-carousel-indicator-active{background-color:rgba(0, 0, 0, 0.3);background-image:none}.x-form .x-scroll-container{background-color:#eeeeee}.x-form .x-scroll-container > .x-inner{padding:1em}.x-form-label{text-shadow:#fff 0 1px 1px;color:#333333;text-shadow:rgba(255, 255, 255, 0.25) 0 0.08em 0;padding:0.6em;display:none !important;white-space:nowrap;overflow:hidden;text-overflow:ellipsis}.x-form-label span{font-size:.8em;font-weight:bold}.x-field{min-height:2.5em}.x-field .x-field-input{position:relative}.x-field .x-field-input,.x-field .x-input-el{width:100%}.x-field.x-field-labeled .x-form-label{display:block !important}.x-field:last-child{border-bottom:0}.x-label-align-left .x-component-outer,.x-label-align-right .x-component-outer{-webkit-box-flex:1;box-flex:1}.x-label-align-left:first-child .x-form-label{-webkit-border-top-left-radius:0.4em;border-top-left-radius:0.4em}.x-label-align-left:last-child .x-form-label{-webkit-border-bottom-left-radius:0.4em;border-bottom-left-radius:0.4em}.x-label-align-right{-webkit-box-direction:reverse;box-direction:reverse}.x-label-align-right:first-child .x-form-label{-webkit-border-top-right-radius:0.4em;border-top-right-radius:0.4em}.x-label-align-right:last-child{border-bottom:0}.x-label-align-right:last-child .x-form-label{-webkit-border-bottom-right-radius:0.4em;border-bottom-right-radius:0.4em}.x-label-align-top,.x-label-align-bottom{-webkit-box-orient:vertical;box-orient:vertical}.x-label-align-top:first-child .x-form-label{-webkit-border-top-left-radius:0.4em;border-top-left-radius:0.4em;-webkit-border-top-right-radius:0.4em;border-top-right-radius:0.4em}.x-label-align-bottom:last-child .x-form-label{-webkit-border-bottom-left-radius:0.4em;border-bottom-left-radius:0.4em;-webkit-border-bottom-right-radius:0.4em;border-bottom-right-radius:0.4em}.x-input-el{padding:.4em;min-height:2.5em;display:block;border-width:0;background:transparent;-webkit-appearance:none}.x-field-mask{position:absolute;top:0;right:0;bottom:0;left:0}.x-field-required label:after,.x-field-required .x-form-label:after{content:"*";display:inline}.x-item-disabled label:after,.x-item-disabled .x-form-label:after{color:#666 !important}.x-field-textarea textarea{min-height:6em;padding-top:.5em}.x-checkmark-base,.x-field .x-input-radio:after,.x-field .x-input-checkbox:after,.x-field .x-input-radio:checked:after,.x-field .x-input-checkbox:checked:after,.x-field.x-item-disabled .x-input-radio:checked:after,.x-field.x-item-disabled .x-input-checkbox:checked:after,.x-select-overlay .x-item-selected .x-list-item-label:before,.x-select-overlay .x-item-selected .x-list-item-label:after{content:"";position:absolute;width:1.4em;height:1.4em;top:50%;left:auto;right:1.1em;-webkit-mask-size:1.4em;-webkit-mask-image:url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAE+klEQVRoBe2aS28URxRGsY0h2FmwCQuEWLHjvUNgZAQ4PMwrEkIRIGEgySKwB8QvYIvEP+ANO0CwsJAA88wGBEKBZJUVQkJCQrwJ5nxN31Z5pnpc7e4ZT9vT0peqqanquqfurVvlIW3Dw8NTJtPTPplgxdoCnugeb3m45eEJtgJTJwJPGw8cP8V6TfmC4/Z/H9uEAAZsIdqHZiMBn2UNbvigSw8M2AIAD6PtqBPpmYe+8t1NoL9GLfYf3bTKKhiWo9PoA9KV0dUgn/tRh8tXWg/Hnj0KUB8yz1JNnjXUuhFd264A/f0O7dKXpQ7EIiTPfkKuVyvrSlx3US+KPF26cMbwxeg8Gg3W4LWHFd6rUUepQprQnI/Rh9A25AtjmqseHVkK7w59UxpgYFdg7wH0CwqFpWvyrKI23GZ7OWluwgqwOnqOobVoWh4Tm97DwCpBHUFp2TiUX3v5QVMnLQzMmqAsUVWWyta3UX/TAmOcwjjk6KmE830W7GbU0ZTAGKYEJdj3yAcQ2qYw1jmsG9e0KF8122UDw/SHwFX0EYWC+fpZGG/hPcn1sqk8jGHas+dQ6KXCB6o2g91IPfKsObZpgDGsqAT1hXdpz25A7QZqZU1gBsxFSh5zbEA9yniOU5R5PSvvCnYTSsLYtdkLTGf9uKdD/gS6gI6jPndgUXXe24OKSFAK4zsoSVA+G6uAGaC758/oBrIs+Zb6rbg9up35Xpa1jffpUqEEldezysbJ0VPLjhHADOpEfUiw2gtuUtAKDiGtYNXeqDWJ7zveYQnqM3V3nqx1s2s97xmRoLzzWqMgkLLaTVQJa0ZoJe+hXjRmaMYKVlslr2dlp5wgu4PsiTyszmg5qgVr0CqvoZW2WFlKxhV5gxJsdIMKtYH+Eew6yksoNLy0soJeFzqR+vEI9gx6h9wFzFoPSlA+25g3SlChnnUNU3grkWmxRg0n+ihBnUR5w9j2bCbPGjzzR3sgbc+6gL66TV4zkTHHEqSfZSzr+94V0mbzKUF1GkSWknG5QktGyoj7qBdVeZo2S1Ch2yUNXOMVUcEJyrcQjOeP4vzQCu9BpBtOck5T70HybN4w1iJcR7ouem9QPjhfG+On7EBPUNrKhrYLWp7+FS1FCjtdKvJ6VvM/Q9o2uWC1AHq60QB6hELh0voJ+im6iHReF+FZwe5HP/g8lrXNzuEfeeFu9C9Kg8nSrr9lBZ9ljK/v37xjL5qRFSytf3K15KXy9EH0D/JN3ui2Qj1rC5AAq4FnJvoDPUSNBnTnUy4YQF1maFHlCOAYuouJFN6PkWtEo+ryrH5sL2TPVi5UFXAMrfDegxrtae3ZfWh6paFFffYCx9BKZLtQo/a0YLXIhSUo3yKlAsfQ8vSBBkALtrCjxwdqbTWBY2glst9REee0Lw/ULUEZpFuOChxD1yuRybNbUV0SlAtq9SDgGFp7ushEJlhdKuqWoAzSLYOBHeidGPkc+cIztE2wA6iuCcoFtXom4Bha4f0nGmv2FqyOnoaFscFG9rsfQusYq0T2G8qayASrbdEdOlfR/TJ72AzAaHla5/QD9BnVCucvfK/fjZXtx8WzZneu/+WBf53XOb0G6XetHjQXyfv2vKLyH7qLLqMhJn5DOW5PLmBZDfRUilloGUoD/ovvXgIrT4/rkxt4XK0fw+TtYxhT6iEt4FK7L8D4locDFqnUXSadh78Bx5bEl2CLG+8AAAAASUVORK5CYII=');margin-top:-0.7em}.x-field .x-input-radio,.x-field .x-input-checkbox{position:relative}.x-field .x-input-radio:after,.x-field .x-input-checkbox:after{background-color:#dddddd}.x-field .x-input-radio:checked:after,.x-field .x-input-checkbox:checked:after{background-color:#06346a}.x-field.x-item-disabled .x-input-radio:checked:after,.x-field.x-item-disabled .x-input-checkbox:checked:after{background-color:#9caaba}.x-spinner .x-component-outer{display:-webkit-box;display:box}.x-spinner .x-component-outer > *{width:auto}.x-spinner .x-field-input{-webkit-box-flex:1}.x-spinner .x-field-input .x-input-el{-webkit-text-fill-color:#000;padding:0;width:100%;text-align:center}.x-spinner .x-field-input input::-webkit-outer-spin-button,.x-spinner .x-field-input input::-webkit-inner-spin-button{-webkit-appearance:none;margin:0}.x-spinner.x-item-disabled .x-input-el{-webkit-text-fill-color:#B3B3B3}.x-spinner.x-item-disabled .x-spinner-button{color:#aaa !important}.x-spinner.x-item-disabled .x-spinner-button,.x-toolbar .x-spinner.x-item-disabled .x-spinner-button{border:1px solid #c4c4c4;border-top-color:#d0d0d0;color:black}.x-spinner.x-item-disabled .x-spinner-button.x-button-back:before,.x-spinner.x-item-disabled .x-spinner-button.x-button-forward:before,.x-toolbar .x-spinner.x-item-disabled .x-spinner-button.x-button-back:before,.x-toolbar .x-spinner.x-item-disabled .x-spinner-button.x-button-forward:before{background:#c4c4c4}.x-spinner.x-item-disabled .x-spinner-button,.x-spinner.x-item-disabled .x-spinner-button.x-button-back:after,.x-spinner.x-item-disabled .x-spinner-button.x-button-forward:after,.x-toolbar .x-spinner.x-item-disabled .x-spinner-button,.x-toolbar .x-spinner.x-item-disabled .x-spinner-button.x-button-back:after,.x-toolbar .x-spinner.x-item-disabled .x-spinner-button.x-button-forward:after{background-color:#f7f7f7;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ffffff), color-stop(2%, #ffffff), color-stop(100%, #e5e5e5));background-image:-webkit-linear-gradient(#ffffff,#ffffff 2%,#e5e5e5);background-image:linear-gradient(#ffffff,#ffffff 2%,#e5e5e5)}.x-spinner.x-item-disabled .x-spinner-button .x-button-icon.x-icon-mask,.x-toolbar .x-spinner.x-item-disabled .x-spinner-button .x-button-icon.x-icon-mask{background-color:black;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #4d4d4d), color-stop(2%, #121212), color-stop(100%, #000000));background-image:-webkit-linear-gradient(#4d4d4d,#121212 2%,#000000);background-image:linear-gradient(#4d4d4d,#121212 2%,#000000)}.x-spinner.x-item-disabled .x-spinner-button.x-button-pressing,.x-spinner.x-item-disabled .x-spinner-button.x-button-pressing:after,.x-spinner.x-item-disabled .x-spinner-button.x-button-pressed,.x-spinner.x-item-disabled .x-spinner-button.x-button-pressed:after,.x-spinner.x-item-disabled .x-spinner-button.x-button-active,.x-spinner.x-item-disabled .x-spinner-button.x-button-active:after,.x-toolbar .x-spinner.x-item-disabled .x-spinner-button.x-button-pressing,.x-toolbar .x-spinner.x-item-disabled .x-spinner-button.x-button-pressing:after,.x-toolbar .x-spinner.x-item-disabled .x-spinner-button.x-button-pressed,.x-toolbar .x-spinner.x-item-disabled .x-spinner-button.x-button-pressed:after,.x-toolbar .x-spinner.x-item-disabled .x-spinner-button.x-button-active,.x-toolbar .x-spinner.x-item-disabled .x-spinner-button.x-button-active:after{background-color:#efefef;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #d5d5d5), color-stop(10%, #e2e2e2), color-stop(65%, #efefef), color-stop(100%, #f0f0f0));background-image:-webkit-linear-gradient(#d5d5d5,#e2e2e2 10%,#efefef 65%,#f0f0f0);background-image:linear-gradient(#d5d5d5,#e2e2e2 10%,#efefef 65%,#f0f0f0)}.x-spinner .x-spinner-button{width:3em;padding:.65em 0;font-weight:bold;text-align:center}.x-spinner .x-spinner-button,.x-toolbar .x-spinner .x-spinner-button{border:1px solid #aaaaaa;border-top-color:#b7b7b7;color:black}.x-spinner .x-spinner-button.x-button-back:before,.x-spinner .x-spinner-button.x-button-forward:before,.x-toolbar .x-spinner .x-spinner-button.x-button-back:before,.x-toolbar .x-spinner .x-spinner-button.x-button-forward:before{background:#aaaaaa}.x-spinner .x-spinner-button,.x-spinner .x-spinner-button.x-button-back:after,.x-spinner .x-spinner-button.x-button-forward:after,.x-toolbar .x-spinner .x-spinner-button,.x-toolbar .x-spinner .x-spinner-button.x-button-back:after,.x-toolbar .x-spinner .x-spinner-button.x-button-forward:after{background-color:#dddddd;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ffffff), color-stop(2%, #efefef), color-stop(100%, #cbcbcb));background-image:-webkit-linear-gradient(#ffffff,#efefef 2%,#cbcbcb);background-image:linear-gradient(#ffffff,#efefef 2%,#cbcbcb)}.x-spinner .x-spinner-button .x-button-icon.x-icon-mask,.x-toolbar .x-spinner .x-spinner-button .x-button-icon.x-icon-mask{background-color:black;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #4d4d4d), color-stop(2%, #121212), color-stop(100%, #000000));background-image:-webkit-linear-gradient(#4d4d4d,#121212 2%,#000000);background-image:linear-gradient(#4d4d4d,#121212 2%,#000000)}.x-spinner .x-spinner-button.x-button-pressing,.x-spinner .x-spinner-button.x-button-pressing:after,.x-spinner .x-spinner-button.x-button-pressed,.x-spinner .x-spinner-button.x-button-pressed:after,.x-spinner .x-spinner-button.x-button-active,.x-spinner .x-spinner-button.x-button-active:after,.x-toolbar .x-spinner .x-spinner-button.x-button-pressing,.x-toolbar .x-spinner .x-spinner-button.x-button-pressing:after,.x-toolbar .x-spinner .x-spinner-button.x-button-pressed,.x-toolbar .x-spinner .x-spinner-button.x-button-pressed:after,.x-toolbar .x-spinner .x-spinner-button.x-button-active,.x-toolbar .x-spinner .x-spinner-button.x-button-active:after{background-color:#d5d5d5;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #bcbcbc), color-stop(10%, #c9c9c9), color-stop(65%, #d5d5d5), color-stop(100%, #d7d7d7));background-image:-webkit-linear-gradient(#bcbcbc,#c9c9c9 10%,#d5d5d5 65%,#d7d7d7);background-image:linear-gradient(#bcbcbc,#c9c9c9 10%,#d5d5d5 65%,#d7d7d7)}.x-spinner .x-spinner-button-down{border:0 !important;border-right:1px solid #dddddd !important}.x-spinner .x-spinner-button-up{border:0 !important;border-left:1px solid #dddddd !important}.x-phone .x-select-overlay{min-width:14em;min-height:12.5em}.x-select-overlay{min-width:18em;min-height:22em}.x-select-overlay .x-list-item-label{height:2.6em}.x-select-overlay .x-list-label{white-space:nowrap;overflow:hidden;text-overflow:ellipsis;display:block}.x-select-overlay .x-item-selected .x-list-label{margin-right:2.6em}.x-select-overlay .x-item-selected .x-list-item-label:before{background-color:rgba(0, 0, 0, 0.3);margin-top:-0.8em}.x-select-overlay .x-item-selected .x-list-item-label:after{background-color:#dddddd}.x-slider-field .x-component-outer,.x-toggle-field .x-component-outer{padding:0.6em}.x-slider,.x-toggle{position:relative;height:2.2em;min-height:0;min-width:0}.x-slider > *,.x-toggle > *{position:absolute;width:100%;height:100%}.x-slider.x-item-disabled{opacity:.6}.x-thumb{position:absolute;height:2.2em;width:2.2em}.x-thumb:before{content:"";position:absolute;width:1.85em;height:1.85em;top:0.175em;left:0.175em;border:1px solid #919191;-webkit-border-radius:0.925em;border-radius:0.925em;background-color:#dddddd;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ffffff), color-stop(2%, #efefef), color-stop(100%, #cbcbcb));background-image:-webkit-linear-gradient(#ffffff,#efefef 2%,#cbcbcb);background-image:linear-gradient(#ffffff,#efefef 2%,#cbcbcb);-webkit-background-clip:padding;background-clip:padding-box}.x-thumb.x-dragging{opacity:1}.x-thumb.x-dragging:before{background-color:#d0d0d0;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #ffffff), color-stop(2%, #e2e2e2), color-stop(100%, #bebebe));background-image:-webkit-linear-gradient(#ffffff,#e2e2e2 2%,#bebebe);background-image:linear-gradient(#ffffff,#e2e2e2 2%,#bebebe)}.x-slider:after{content:"";position:absolute;width:auto;height:0.8em;top:0.737em;left:0;right:0;margin:0 0.925em;background-color:#dddddd;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #c4c4c4), color-stop(10%, #d0d0d0), color-stop(65%, #dddddd), color-stop(100%, #dedede));background-image:-webkit-linear-gradient(#c4c4c4,#d0d0d0 10%,#dddddd 65%,#dedede);background-image:linear-gradient(#c4c4c4,#d0d0d0 10%,#dddddd 65%,#dedede);border:0.1em solid rgba(0, 0, 0, 0.1);border-bottom:0;-webkit-box-shadow:rgba(255, 255, 255, 0.7) 0 0.1em 0;-webkit-border-radius:0.4em;border-radius:0.4em}.x-toggle{width:4.4em;-webkit-border-radius:1.1em;border-radius:1.1em;overflow:hidden;border:1px solid #b7b7b7;background-color:#ddd;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #c4c4c4), color-stop(10%, #d0d0d0), color-stop(65%, #dddddd), color-stop(100%, #dedede));background-image:-webkit-linear-gradient(#c4c4c4,#d0d0d0 10%,#dddddd 65%,#dedede);background-image:linear-gradient(#c4c4c4,#d0d0d0 10%,#dddddd 65%,#dedede);-webkit-box-flex:0}.x-toggle .x-thumb.x-dragging{opacity:1}.x-toggle .x-thumb:before{top:0.175em}.x-toggle-on{background-color:#92cf00;background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, #6e9c00), color-stop(10%, #80b500), color-stop(65%, #92cf00), color-stop(100%, #94d200));background-image:-webkit-linear-gradient(#6e9c00,#80b500 10%,#92cf00 65%,#94d200);background-image:linear-gradient(#6e9c00,#80b500 10%,#92cf00 65%,#94d200)}input[type="search"]::-webkit-search-cancel-button{-webkit-appearance:none}.x-field-number input::-webkit-outer-spin-button,.x-field-number input::-webkit-inner-spin-button{-webkit-appearance:none;margin:0}.x-field-search .x-field-input{position:relative}.x-field-search .x-field-input:before{content:"";position:absolute;width:0.86em;height:0.86em;top:50%;left:0.5em;-webkit-mask-image:url('data:image/png;base64,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');-webkit-mask-size:.86em;background-color:#ccc;-webkit-mask-repeat:no-repeat;margin-top:-0.43em}.x-field-search .x-field-input .x-form-field{margin-left:1.0em}.x-field-input .x-clear-icon{display:none;background:url('data:image/png;base64,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') no-repeat;background-position:center center;background-size:55% 55%;width:2.2em;height:2.2em;margin:.5em;margin-top:-1.1em;position:absolute;top:50%;right:-0.5em}.x-field-clearable .x-clear-icon{display:block}.x-field-clearable .x-field-input{padding-right:2.2em}.x-android .x-input-el{-webkit-text-fill-color:#000}.x-android .x-empty .x-input-el{-webkit-text-fill-color:#A9A9A9}.x-item-disabled .x-form-label span,.x-item-disabled input,.x-item-disabled .x-input-el,.x-item-disabled .x-spinner-body,.x-item-disabled select,.x-item-disabled textarea,.x-item-disabled .x-field-clear-container{color:#b3b3b3;-webkit-text-fill-color:#b3b3b3;pointer-events:none}.x-form-fieldset{margin:0 0 1.5em}.x-form-fieldset .x-form-label{background-color:#f7f7f7;border-top:1px solid white}.x-form-fieldset .x-form-fieldset-inner{border:1px solid #dddddd;background:#fff;padding:0;-webkit-border-radius:0.4em;border-radius:0.4em;overflow:hidden}.x-form-fieldset .x-field{border-bottom:1px solid #dddddd}.x-form-fieldset .x-field:first-child{-webkit-border-top-left-radius:0.4em;border-top-left-radius:0.4em;-webkit-border-top-right-radius:0.4em;border-top-right-radius:0.4em}.x-form-fieldset .x-field:last-child{border-bottom:0;-webkit-border-bottom-left-radius:0.4em;border-bottom-left-radius:0.4em;-webkit-border-bottom-right-radius:0.4em;border-bottom-right-radius:0.4em}.x-form-fieldset-title{text-shadow:#fff 0 1px 1px;color:#333333;margin:1em 0.7em 0.3em;color:#333333;font-weight:bold;white-space:nowrap}.x-form-fieldset-instructions{text-shadow:#fff 0 1px 1px;color:#333333;color:gray;margin:1em 0.7em 0.3em;font-size:.8em;text-align:center}.x-selectmark-base,.x-field-select .x-component-outer:after{content:"";position:absolute;width:1em;height:1em;top:50%;left:auto;right:0.7em;-webkit-mask-size:1em;-webkit-mask-image:url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAAGXRFWHRTb2Z0d2FyZQBBZG9iZSBJbWFnZVJlYWR5ccllPAAAA2ZpVFh0WE1MOmNvbS5hZG9iZS54bXAAAAAAADw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMC1jMDYwIDYxLjEzNDc3NywgMjAxMC8wMi8xMi0xNzozMjowMCAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOk9yaWdpbmFsRG9jdW1lbnRJRD0ieG1wLmRpZDpGRTdGMTE3NDA3MjA2ODExOTJDQUMyNUQwRUE4NjdEQiIgeG1wTU06RG9jdW1lbnRJRD0ieG1wLmRpZDoxQTFBMDFDQ0I5NEYxMURGQUU1RjlGMEFERUNDQTVEMCIgeG1wTU06SW5zdGFuY2VJRD0ieG1wLmlpZDoyMkRCMDIxMkI5NEUxMURGQUU1RjlGMEFERUNDQTVEMCIgeG1wOkNyZWF0b3JUb29sPSJBZG9iZSBQaG90b3Nob3AgQ1M1IE1hY2ludG9zaCI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuaWlkOjMwRTE0QzVBNDIyMjY4MTFCQ0ZCOTAzOTcwNzcyRkVCIiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOkZFN0YxMTc0MDcyMDY4MTE5MkNBQzI1RDBFQTg2N0RCIi8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+HfrH/AAAAeVJREFUeNrs2cFHBGEUAPA3zYqIiIhOnTpFRHSKrp26RqeuEV077R/QqWtE166dOkVERHRa9hQRnZalFcv0Hk/W1Mx+38z3vvlm5j3eZW+/9+abne+9KEkSaFPMQMtCwQpWsIIVrGAFK1jBClawgo2ik/4hiqJGwLKuvfpIc5xSkWqYr5hzU1s/mRNxXTPsJ+ZqluvXlwOmSj3XBDvG3M1rpAmYYoUrFzr4ZNqTawqm2MH8Dhh7ZXJUbcAUx4FinzBnJcAUl4FhP/jIgRSYKvkYCJaO2LbNv08RMMUy5nsA4COTLy0XYIqtil9iF6aflq7AwBWuAvuQ9ZKSBgNX2ieWjtKSzeXBNZgqfe8J+4W5aXtbcg0GrvibB/BhkeuhBJhigzsghT0veh+WAlMcCGHvMOMQwcCdcIntYy6WmXhIg2PuiAvsEHO97IhHGgzckb4D8L6LmZYPMHBnhiWwXVdDPF9g4A4Vwd66nFr6BAN3ygbbw1yoMzjmjplgB5hrrufSvsHAHesZDOD2JAbxVYCBOzfIAZ9JbR6qAgN3cPwP9kZy1VIlGLiTdluCmoOBO/pnS9Bk8DzmS3pL4BMcpZEe1qX0GI/atC4dQYXRMa1MU0IX4gpWsIIVrGAFK1jBCnYUPwIMAPUPAyFL+nRdAAAAAElFTkSuQmCC');margin-top:-0.5em}.x-field-select{position:relative}.x-field-select .x-component-outer:after{background-color:#dddddd;z-index:2}.x-field-select .x-component-outer:before,.x-field-select .x-component-outer:after{pointer-events:none;position:absolute;display:block}.x-field-select .x-component-outer:before{content:"";position:absolute;width:4em;height:auto;top:0;left:auto;right:0;bottom:0;-webkit-border-top-right-radius:0.4em;border-top-right-radius:0.4em;-webkit-border-bottom-right-radius:0.4em;border-bottom-right-radius:0.4em;background:-webkit-gradient(linear, 0% 0%, 100% 0%, from(rgba(255, 255, 255, 0)), color-stop(0.5, white));z-index:1}.x-msgbox{min-width:15em;max-width:20em;padding:0.8em;-webkit-box-shadow:rgba(0, 0, 0, 0.4) 0 0.1em 0.5em;-webkit-border-radius:0.3em;border-radius:0.3em;border:0.15em solid #354f6e}.x-msgbox .x-icon{margin-left:1.3em}.x-msgbox .x-title{font-size:.9em;line-height:1.4em}.x-msgbox .x-body{background:transparent !important}.x-msgbox .x-toolbar{background:transparent none;-webkit-box-shadow:none}.x-msgbox .x-toolbar.x-docked-top{border-bottom:0;height:1.3em}.x-msgbox .x-toolbar.x-docked-bottom{border-top:0}.x-msgbox .x-field{min-height:2em;background:#fff;-webkit-border-radius:0.2em;border-radius:0.2em}.x-msgbox .x-form-field{min-height:1.5em;padding-right:0 !important;-webkit-appearance:none}.x-msgbox .x-field-input{padding-right:2.2em}.x-msgbox-text{text-align:center;padding:6px 0;line-height:1.4em}.x-msgbox-buttons{padding:0.4em 0;height:auto}.x-msgbox-buttons .x-button{min-width:4.5em}.x-msgbox-buttons .x-button-normal span{opacity:.7}.x-msgbox-dark .x-msgbox-text{color:rgba(186, 202, 222, 0.9);text-shadow:rgba(0, 0, 0, 0.5) 0 -0.08em 0}.x-msgbox-dark .x-msgbox-input{background-color:rgba(186, 202, 222, 0.9);background-image:-webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(0%, rgba(152,176,205,0.9)), color-stop(10%, rgba(169,189,214,0.9)), color-stop(65%, rgba(186,202,222,0.9)), color-stop(100%, rgba(188,204,223,0.9)));background-image:-webkit-linear-gradient(rgba(152,176,205,0.9),rgba(169,189,214,0.9) 10%,rgba(186,202,222,0.9) 65%,rgba(188,204,223,0.9));background-image:linear-gradient(rgba(152,176,205,0.9),rgba(169,189,214,0.9) 10%,rgba(186,202,222,0.9) 65%,rgba(188,204,223,0.9));border:0.1em solid rgba(66, 99, 138, 0.9)}.x-loading-spinner{font-size:250%;height:1em;width:1em;position:relative;-webkit-transform-origin:0.5em 0.5em}.x-loading-spinner > span,.x-loading-spinner > span:before,.x-loading-spinner > span:after{display:block;position:absolute;width:0.1em;height:0.25em;top:0;-webkit-transform-origin:0.05em 0.5em;-webkit-border-radius:0.05em;border-radius:0.05em;content:" "}.x-loading-spinner > span.x-loading-top{background-color:rgba(170, 170, 170, 0.99)}.x-loading-spinner > span.x-loading-top::after{background-color:rgba(170, 170, 170, 0.9)}.x-loading-spinner > span.x-loading-left::before{background-color:rgba(170, 170, 170, 0.8)}.x-loading-spinner > span.x-loading-left{background-color:rgba(170, 170, 170, 0.7)}.x-loading-spinner > span.x-loading-left::after{background-color:rgba(170, 170, 170, 0.6)}.x-loading-spinner > span.x-loading-bottom::before{background-color:rgba(170, 170, 170, 0.5)}.x-loading-spinner > span.x-loading-bottom{background-color:rgba(170, 170, 170, 0.4)}.x-loading-spinner > span.x-loading-bottom::after{background-color:rgba(170, 170, 170, 0.35)}.x-loading-spinner > span.x-loading-right::before{background-color:rgba(170, 170, 170, 0.3)}.x-loading-spinner > span.x-loading-right{background-color:rgba(170, 170, 170, 0.25)}.x-loading-spinner > span.x-loading-right::after{background-color:rgba(170, 170, 170, 0.2)}.x-loading-spinner > span.x-loading-top::before{background-color:rgba(170, 170, 170, 0.15)}.x-loading-spinner > span{left:50%;margin-left:-0.05em}.x-loading-spinner > span.x-loading-top{-webkit-transform:rotate(0deg);-moz-transform:rotate(0deg)}.x-loading-spinner > span.x-loading-right{-webkit-transform:rotate(90deg);-moz-transform:rotate(90deg)}.x-loading-spinner > span.x-loading-bottom{-webkit-transform:rotate(180deg);-moz-transform:rotate(180deg)}.x-loading-spinner > span.x-loading-left{-webkit-transform:rotate(270deg);-moz-transform:rotate(270deg)}.x-loading-spinner > span::before{-webkit-transform:rotate(30deg);-moz-transform:rotate(30deg)}.x-loading-spinner > span::after{-webkit-transform:rotate(-30deg);-moz-transform:rotate(-30deg)}.x-loading-spinner{-webkit-animation-name:x-loading-spinner-rotate;-webkit-animation-duration:.5s;-webkit-animation-iteration-count:infinite;-webkit-animation-timing-function:linear}@-webkit-keyframes x-loading-spinner-rotate{0%{-webkit-transform:rotate(0deg)}8.32%{-webkit-transform:rotate(0deg)}8.33%{-webkit-transform:rotate(30deg)}16.65%{-webkit-transform:rotate(30deg)}16.66%{-webkit-transform:rotate(60deg)}24.99%{-webkit-transform:rotate(60deg)}25%{-webkit-transform:rotate(90deg)}33.32%{-webkit-transform:rotate(90deg)}33.33%{-webkit-transform:rotate(120deg)}41.65%{-webkit-transform:rotate(120deg)}41.66%{-webkit-transform:rotate(150deg)}49.99%{-webkit-transform:rotate(150deg)}50%{-webkit-transform:rotate(180deg)}58.32%{-webkit-transform:rotate(180deg)}58.33%{-webkit-transform:rotate(210deg)}66.65%{-webkit-transform:rotate(210deg)}66.66%{-webkit-transform:rotate(240deg)}74.99%{-webkit-transform:rotate(240deg)}75%{-webkit-transform:rotate(270deg)}83.32%{-webkit-transform:rotate(270deg)}83.33%{-webkit-transform:rotate(300deg)}91.65%{-webkit-transform:rotate(300deg)}91.66%{-webkit-transform:rotate(330deg)}100%{-webkit-transform:rotate(330deg)}}
diff --git a/apps/files_odfviewer/src/webodf/programs/touchui/sencha-touch.js b/apps/files_odfviewer/src/webodf/programs/touchui/sencha-touch.js
deleted file mode 100644
index caf8e4541d..0000000000
--- a/apps/files_odfviewer/src/webodf/programs/touchui/sencha-touch.js
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
-
-This file is part of Sencha Touch 2
-
-Copyright (c) 2012 Sencha Inc
-
-Contact:  http://www.sencha.com/contact
-
-Commercial Usage
-Licensees holding valid commercial licenses may use this file in accordance with the Commercial Software License Agreement provided with the Software or, alternatively, in accordance with the terms contained in a written agreement between you and Sencha.
-
-If you are unsure which license is appropriate for your use, please contact the sales department at http://www.sencha.com/contact.
-
-*/
-(function(){var global=this,objectPrototype=Object.prototype,toString=objectPrototype.toString,enumerables=true,enumerablesTest={toString:1},emptyFn=function(){},i;if(typeof Ext==="undefined"){global.Ext={}}Ext.global=global;for(i in enumerablesTest){enumerables=null}if(enumerables){enumerables=["hasOwnProperty","valueOf","isPrototypeOf","propertyIsEnumerable","toLocaleString","toString","constructor"]}Ext.enumerables=enumerables;Ext.apply=function(object,config,defaults){if(defaults){Ext.apply(object,defaults)}if(object&&config&&typeof config==="object"){var i,j,k;for(i in config){object[i]=config[i]}if(enumerables){for(j=enumerables.length;j--;){k=enumerables[j];if(config.hasOwnProperty(k)){object[k]=config[k]}}}}return object};Ext.buildSettings=Ext.apply({baseCSSPrefix:"x-",scopeResetCSS:false},Ext.buildSettings||{});Ext.apply(Ext,{emptyFn:emptyFn,baseCSSPrefix:Ext.buildSettings.baseCSSPrefix,applyIf:function(object,config){var property;if(object){for(property in config){if(object[property]===undefined){object[property]=config[property]}}}return object},iterate:function(object,fn,scope){if(Ext.isEmpty(object)){return}if(scope===undefined){scope=object}if(Ext.isIterable(object)){Ext.Array.each.call(Ext.Array,object,fn,scope)}else{Ext.Object.each.call(Ext.Object,object,fn,scope)}}});Ext.apply(Ext,{extend:function(){var objectConstructor=objectPrototype.constructor,inlineOverrides=function(o){for(var m in o){if(!o.hasOwnProperty(m)){continue}this[m]=o[m]}};return function(subclass,superclass,overrides){if(Ext.isObject(superclass)){overrides=superclass;superclass=subclass;subclass=overrides.constructor!==objectConstructor?overrides.constructor:function(){superclass.apply(this,arguments)}}var F=function(){},subclassProto,superclassProto=superclass.prototype;F.prototype=superclassProto;subclassProto=subclass.prototype=new F();subclassProto.constructor=subclass;subclass.superclass=superclassProto;if(superclassProto.constructor===objectConstructor){superclassProto.constructor=superclass}subclass.override=function(overrides){Ext.override(subclass,overrides)};subclassProto.override=inlineOverrides;subclassProto.proto=subclassProto;subclass.override(overrides);subclass.extend=function(o){return Ext.extend(subclass,o)};return subclass}}(),override:function(cls,overrides){if(cls.$isClass){return cls.override(overrides)}else{Ext.apply(cls.prototype,overrides)}}});Ext.apply(Ext,{valueFrom:function(value,defaultValue,allowBlank){return Ext.isEmpty(value,allowBlank)?defaultValue:value},typeOf:function(value){if(value===null){return"null"}var type=typeof value;if(type==="undefined"||type==="string"||type==="number"||type==="boolean"){return type}var typeToString=toString.call(value);switch(typeToString){case"[object Array]":return"array";case"[object Date]":return"date";case"[object Boolean]":return"boolean";case"[object Number]":return"number";case"[object RegExp]":return"regexp"}if(type==="function"){return"function"}if(type==="object"){if(value.nodeType!==undefined){if(value.nodeType===3){return(/\S/).test(value.nodeValue)?"textnode":"whitespace"}else{return"element"}}return"object"}},isEmpty:function(value,allowEmptyString){return(value===null)||(value===undefined)||(!allowEmptyString?value==="":false)||(Ext.isArray(value)&&value.length===0)},isArray:("isArray" in Array)?Array.isArray:function(value){return toString.call(value)==="[object Array]"},isDate:function(value){return toString.call(value)==="[object Date]"},isObject:(toString.call(null)==="[object Object]")?function(value){return value!==null&&value!==undefined&&toString.call(value)==="[object Object]"&&value.ownerDocument===undefined}:function(value){return toString.call(value)==="[object Object]"},isSimpleObject:function(value){return value instanceof Object&&value.constructor===Object},isPrimitive:function(value){var type=typeof value;return type==="string"||type==="number"||type==="boolean"},isFunction:(typeof document!=="undefined"&&typeof document.getElementsByTagName("body")==="function")?function(value){return toString.call(value)==="[object Function]"}:function(value){return typeof value==="function"},isNumber:function(value){return typeof value==="number"&&isFinite(value)},isNumeric:function(value){return !isNaN(parseFloat(value))&&isFinite(value)},isString:function(value){return typeof value==="string"},isBoolean:function(value){return typeof value==="boolean"},isElement:function(value){return value?value.nodeType===1:false},isTextNode:function(value){return value?value.nodeName==="#text":false},isDefined:function(value){return typeof value!=="undefined"},isIterable:function(value){return(value&&typeof value!=="string")?value.length!==undefined:false}});Ext.apply(Ext,{clone:function(item){if(item===null||item===undefined){return item}if(item.nodeType&&item.cloneNode){return item.cloneNode(true)}var type=toString.call(item);if(type==="[object Date]"){return new Date(item.getTime())}var i,j,k,clone,key;if(type==="[object Array]"){i=item.length;clone=[];while(i--){clone[i]=Ext.clone(item[i])}}else{if(type==="[object Object]"&&item.constructor===Object){clone={};for(key in item){clone[key]=Ext.clone(item[key])}if(enumerables){for(j=enumerables.length;j--;){k=enumerables[j];clone[k]=item[k]}}}}return clone||item},getUniqueGlobalNamespace:function(){var uniqueGlobalNamespace=this.uniqueGlobalNamespace;if(uniqueGlobalNamespace===undefined){var i=0;do{uniqueGlobalNamespace="ExtBox"+(++i)}while(Ext.global[uniqueGlobalNamespace]!==undefined);Ext.global[uniqueGlobalNamespace]=Ext;this.uniqueGlobalNamespace=uniqueGlobalNamespace}return uniqueGlobalNamespace},functionFactory:function(){var args=Array.prototype.slice.call(arguments),ln=args.length;if(ln>0){args[ln-1]="var Ext=window."+this.getUniqueGlobalNamespace()+";"+args[ln-1]}return Function.prototype.constructor.apply(Function.prototype,args)},globalEval:("execScript" in global)?function(code){global.execScript(code)}:function(code){(function(){eval(code)})()},});Ext.type=Ext.typeOf})();(function(){var a="4.1.0",b;Ext.Version=b=Ext.extend(Object,{constructor:function(d){var c=this.toNumber,f,e;if(d instanceof b){return d}this.version=this.shortVersion=String(d).toLowerCase().replace(/_/g,".").replace(/[\-+]/g,"");e=this.version.search(/([^\d\.])/);if(e!==-1){this.release=this.version.substr(e,d.length);this.shortVersion=this.version.substr(0,e)}this.shortVersion=this.shortVersion.replace(/[^\d]/g,"");f=this.version.split(".");this.major=c(f.shift());this.minor=c(f.shift());this.patch=c(f.shift());this.build=c(f.shift());return this},toNumber:function(c){c=parseInt(c||0,10);if(isNaN(c)){c=0}return c},toString:function(){return this.version},valueOf:function(){return this.version},getMajor:function(){return this.major||0},getMinor:function(){return this.minor||0},getPatch:function(){return this.patch||0},getBuild:function(){return this.build||0},getRelease:function(){return this.release||""},isGreaterThan:function(c){return b.compare(this.version,c)===1},isGreaterThanOrEqual:function(c){return b.compare(this.version,c)>=0},isLessThan:function(c){return b.compare(this.version,c)===-1},isLessThanOrEqual:function(c){return b.compare(this.version,c)<=0},equals:function(c){return b.compare(this.version,c)===0},match:function(c){c=String(c);return this.version.substr(0,c.length)===c},toArray:function(){return[this.getMajor(),this.getMinor(),this.getPatch(),this.getBuild(),this.getRelease()]},getShortVersion:function(){return this.shortVersion},gt:function(){return this.isGreaterThan.apply(this,arguments)},lt:function(){return this.isLessThan.apply(this,arguments)},gtEq:function(){return this.isGreaterThanOrEqual.apply(this,arguments)},ltEq:function(){return this.isLessThanOrEqual.apply(this,arguments)}});Ext.apply(b,{releaseValueMap:{dev:-6,alpha:-5,a:-5,beta:-4,b:-4,rc:-3,"#":-2,p:-1,pl:-1},getComponentValue:function(c){return !c?0:(isNaN(c)?this.releaseValueMap[c]||c:parseInt(c,10))},compare:function(g,f){var d,e,c;g=new b(g).toArray();f=new b(f).toArray();for(c=0;c<Math.max(g.length,f.length);c++){d=this.getComponentValue(g[c]);e=this.getComponentValue(f[c]);if(d<e){return -1}else{if(d>e){return 1}}}return 0}});Ext.apply(Ext,{versions:{},lastRegisteredVersion:null,setVersion:function(d,c){Ext.versions[d]=new b(c);Ext.lastRegisteredVersion=Ext.versions[d];return this},getVersion:function(c){if(c===undefined){return Ext.lastRegisteredVersion}return Ext.versions[c]},deprecate:function(c,e,f,d){if(b.compare(Ext.getVersion(c),e)<1){f.call(d)}}});Ext.setVersion("core",a)})();Ext.String={trimRegex:/^[\x09\x0a\x0b\x0c\x0d\x20\xa0\u1680\u180e\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u2028\u2029\u202f\u205f\u3000]+|[\x09\x0a\x0b\x0c\x0d\x20\xa0\u1680\u180e\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u2028\u2029\u202f\u205f\u3000]+$/g,escapeRe:/('|\\)/g,formatRe:/\{(\d+)\}/g,escapeRegexRe:/([-.*+?^${}()|[\]\/\\])/g,htmlEncode:(function(){var d={"&":"&amp;",">":"&gt;","<":"&lt;",'"':"&quot;"},b=[],c,a;for(c in d){b.push(c)}a=new RegExp("("+b.join("|")+")","g");return function(e){return(!e)?e:String(e).replace(a,function(g,f){return d[f]})}})(),htmlDecode:(function(){var d={"&amp;":"&","&gt;":">","&lt;":"<","&quot;":'"'},b=[],c,a;for(c in d){b.push(c)}a=new RegExp("("+b.join("|")+"|&#[0-9]{1,5};)","g");return function(e){return(!e)?e:String(e).replace(a,function(g,f){if(f in d){return d[f]}else{return String.fromCharCode(parseInt(f.substr(2),10))}})}})(),urlAppend:function(b,a){if(!Ext.isEmpty(a)){return b+(b.indexOf("?")===-1?"?":"&")+a}return b},trim:function(a){return a.replace(Ext.String.trimRegex,"")},capitalize:function(a){return a.charAt(0).toUpperCase()+a.substr(1)},ellipsis:function(c,a,d){if(c&&c.length>a){if(d){var e=c.substr(0,a-2),b=Math.max(e.lastIndexOf(" "),e.lastIndexOf("."),e.lastIndexOf("!"),e.lastIndexOf("?"));if(b!==-1&&b>=(a-15)){return e.substr(0,b)+"..."}}return c.substr(0,a-3)+"..."}return c},escapeRegex:function(a){return a.replace(Ext.String.escapeRegexRe,"\\$1")},escape:function(a){return a.replace(Ext.String.escapeRe,"\\$1")},toggle:function(b,c,a){return b===c?a:c},leftPad:function(b,c,d){var a=String(b);d=d||" ";while(a.length<c){a=d+a}return a},format:function(b){var a=Ext.Array.toArray(arguments,1);return b.replace(Ext.String.formatRe,function(c,d){return a[d]})},repeat:function(e,d,b){for(var a=[],c=d;c--;){a.push(e)}return a.join(b||"")}};Ext.htmlEncode=Ext.String.htmlEncode;Ext.htmlDecode=Ext.String.htmlDecode;Ext.urlAppend=Ext.String.urlAppend;(function(){var f=Array.prototype,n=f.slice,p=function(){var z=[],e,y=20;if(!z.splice){return false}while(y--){z.push("A")}z.splice(15,0,"F","F","F","F","F","F","F","F","F","F","F","F","F","F","F","F","F","F","F","F","F");e=z.length;z.splice(13,0,"XXX");if(e+1!=z.length){return false}return true}(),i="forEach" in f,t="map" in f,o="indexOf" in f,x="every" in f,c="some" in f,d="filter" in f,m=function(){var e=[1,2,3,4,5].sort(function(){return 0});return e[0]===1&&e[1]===2&&e[2]===3&&e[3]===4&&e[4]===5}(),j=true,a;try{if(typeof document!=="undefined"){n.call(document.getElementsByTagName("body"))}}catch(r){j=false}function l(y,e){return(e<0)?Math.max(0,y.length+e):Math.min(y.length,e)}function w(F,E,y,I){var J=I?I.length:0,A=F.length,G=l(F,E);if(G===A){if(J){F.push.apply(F,I)}}else{var D=Math.min(y,A-G),H=G+D,z=H+J-D,e=A-H,B=A-D,C;if(z<H){for(C=0;C<e;++C){F[z+C]=F[H+C]}}else{if(z>H){for(C=e;C--;){F[z+C]=F[H+C]}}}if(J&&G===B){F.length=B;F.push.apply(F,I)}else{F.length=B+J;for(C=0;C<J;++C){F[G+C]=I[C]}}}return F}function h(A,e,z,y){if(y&&y.length){if(e<A.length){A.splice.apply(A,[e,z].concat(y))}else{A.push.apply(A,y)}}else{A.splice(e,z)}return A}function b(z,e,y){return w(z,e,y)}function q(z,e,y){z.splice(e,y);return z}function k(B,e,z){var A=l(B,e),y=B.slice(e,l(B,A+z));if(arguments.length<4){w(B,A,z)}else{w(B,A,z,n.call(arguments,3))}return y}function g(e){return e.splice.apply(e,n.call(arguments,1))}var v=p?q:b,s=p?h:w,u=p?g:k;a=Ext.Array={each:function(C,A,z,e){C=a.from(C);var y,B=C.length;if(e!==true){for(y=0;y<B;y++){if(A.call(z||C[y],C[y],y,C)===false){return y}}}else{for(y=B-1;y>-1;y--){if(A.call(z||C[y],C[y],y,C)===false){return y}}}return true},forEach:i?function(z,y,e){return z.forEach(y,e)}:function(B,z,y){var e=0,A=B.length;for(;e<A;e++){z.call(y,B[e],e,B)}},indexOf:(o)?function(z,e,y){return z.indexOf(e,y)}:function(B,z,A){var e,y=B.length;for(e=(A<0)?Math.max(0,y+A):A||0;e<y;e++){if(B[e]===z){return e}}return -1},contains:o?function(y,e){return y.indexOf(e)!==-1}:function(A,z){var e,y;for(e=0,y=A.length;e<y;e++){if(A[e]===z){return true}}return false},toArray:function(z,B,e){if(!z||!z.length){return[]}if(typeof z==="string"){z=z.split("")}if(j){return n.call(z,B||0,e||z.length)}var A=[],y;B=B||0;e=e?((e<0)?z.length+e:e):z.length;for(y=B;y<e;y++){A.push(z[y])}return A},pluck:function(C,e){var y=[],z,B,A;for(z=0,B=C.length;z<B;z++){A=C[z];y.push(A[e])}return y},map:t?function(z,y,e){return z.map(y,e)}:function(C,B,A){var z=[],y=0,e=C.length;for(;y<e;y++){z[y]=B.call(A,C[y],y,C)}return z},every:function(B,z,y){if(x){return B.every(z,y)}var e=0,A=B.length;for(;e<A;++e){if(!z.call(y,B[e],e,B)){return false}}return true},some:function(B,z,y){if(c){return B.some(z,y)}var e=0,A=B.length;for(;e<A;++e){if(z.call(y,B[e],e,B)){return true}}return false},clean:function(B){var y=[],e=0,A=B.length,z;for(;e<A;e++){z=B[e];if(!Ext.isEmpty(z)){y.push(z)}}return y},unique:function(B){var A=[],e=0,z=B.length,y;for(;e<z;e++){y=B[e];if(a.indexOf(A,y)===-1){A.push(y)}}return A},filter:function(C,A,z){if(d){return C.filter(A,z)}var y=[],e=0,B=C.length;for(;e<B;e++){if(A.call(z,C[e],e,C)){y.push(C[e])}}return y},from:function(y,e){if(y===undefined||y===null){return[]}if(Ext.isArray(y)){return(e)?n.call(y):y}if(y&&y.length!==undefined&&typeof y!=="string"){return a.toArray(y)}return[y]},remove:function(z,y){var e=a.indexOf(z,y);if(e!==-1){v(z,e,1)}return z},include:function(y,e){if(!a.contains(y,e)){y.push(e)}},clone:function(e){return n.call(e)},merge:function(){var e=n.call(arguments),A=[],y,z;for(y=0,z=e.length;y<z;y++){A=A.concat(e[y])}return a.unique(A)},intersect:function(){var A=[],e=n.call(arguments),E,C,B,G,H,K,J,I,z,D;if(!e.length){return A}for(E=K=0,I=e.length;E<I,H=e[E];E++){if(!G||H.length<G.length){G=H;K=E}}G=a.unique(G);v(e,K,1);for(E=0,I=G.length;E<I,K=G[E];E++){var F=0;for(C=0,z=e.length;C<z,H=e[C];C++){for(B=0,D=H.length;B<D,J=H[B];B++){if(K===J){F++;break}}}if(F===z){A.push(K)}}return A},difference:function(y,e){var D=n.call(y),B=D.length,A,z,C;for(A=0,C=e.length;A<C;A++){for(z=0;z<B;z++){if(D[z]===e[A]){v(D,z,1);z--;B--}}}return D},slice:function(z,y,e){return n.call(z,y,e)},sort:function(E,D){if(m){if(D){return E.sort(D)}else{return E.sort()}}var B=E.length,A=0,C,e,z,y;for(;A<B;A++){z=A;for(e=A+1;e<B;e++){if(D){C=D(E[e],E[z]);if(C<0){z=e}}else{if(E[e]<E[z]){z=e}}}if(z!==A){y=E[A];E[A]=E[z];E[z]=y}}return E},flatten:function(z){var y=[];function e(A){var C,D,B;for(C=0,D=A.length;C<D;C++){B=A[C];if(Ext.isArray(B)){e(B)}else{y.push(B)}}return y}return e(z)},min:function(C,B){var y=C[0],e,A,z;for(e=0,A=C.length;e<A;e++){z=C[e];if(B){if(B(y,z)===1){y=z}}else{if(z<y){y=z}}}return y},max:function(C,B){var e=C[0],y,A,z;for(y=0,A=C.length;y<A;y++){z=C[y];if(B){if(B(e,z)===-1){e=z}}else{if(z>e){e=z}}}return e},mean:function(e){return e.length>0?a.sum(e)/e.length:undefined},sum:function(B){var y=0,e,A,z;for(e=0,A=B.length;e<A;e++){z=B[e];y+=z}return y},erase:v,insert:function(z,y,e){return s(z,y,0,e)},replace:s,splice:u};Ext.each=a.each;a.union=a.merge;Ext.min=a.min;Ext.max=a.max;Ext.sum=a.sum;Ext.mean=a.mean;Ext.flatten=a.flatten;Ext.clean=a.clean;Ext.unique=a.unique;Ext.pluck=a.pluck;Ext.toArray=function(){return a.toArray.apply(a,arguments)}})();(function(){var a=(0.9).toFixed()!=="1";Ext.Number={constrain:function(d,c,b){d=parseFloat(d);if(!isNaN(c)){d=Math.max(d,c)}if(!isNaN(b)){d=Math.min(d,b)}return d},snap:function(e,c,d,g){var f=e,b;if(!(c&&e)){return e}b=e%c;if(b!==0){f-=b;if(b*2>=c){f+=c}else{if(b*2<-c){f-=c}}}return Ext.Number.constrain(f,d,g)},toFixed:function(d,b){if(a){b=b||0;var c=Math.pow(10,b);return(Math.round(d*c)/c).toFixed(b)}return d.toFixed(b)},from:function(c,b){if(isFinite(c)){c=parseFloat(c)}return !isNaN(c)?c:b}}})();Ext.num=function(){return Ext.Number.from.apply(this,arguments)};(function(){var a=function(){};var b=Ext.Object={chain:function(d){a.prototype=d;var c=new a();a.prototype=null;return c},toQueryObjects:function(e,j,d){var c=b.toQueryObjects,h=[],f,g;if(Ext.isArray(j)){for(f=0,g=j.length;f<g;f++){if(d){h=h.concat(c(e+"["+f+"]",j[f],true))}else{h.push({name:e,value:j[f]})}}}else{if(Ext.isObject(j)){for(f in j){if(j.hasOwnProperty(f)){if(d){h=h.concat(c(e+"["+f+"]",j[f],true))}else{h.push({name:e,value:j[f]})}}}}else{h.push({name:e,value:j})}}return h},toQueryString:function(f,d){var g=[],e=[],k,h,l,c,m;for(k in f){if(f.hasOwnProperty(k)){g=g.concat(b.toQueryObjects(k,f[k],d))}}for(h=0,l=g.length;h<l;h++){c=g[h];m=c.value;if(Ext.isEmpty(m)){m=""}else{if(Ext.isDate(m)){m=Ext.Date.toString(m)}}e.push(encodeURIComponent(c.name)+"="+encodeURIComponent(String(m)))}return e.join("&")},fromQueryString:function(d,q){var l=d.replace(/^\?/,"").split("&"),t={},r,h,v,m,p,f,n,o,c,g,s,k,u,e;for(p=0,f=l.length;p<f;p++){n=l[p];if(n.length>0){h=n.split("=");v=decodeURIComponent(h[0]);m=(h[1]!==undefined)?decodeURIComponent(h[1]):"";if(!q){if(t.hasOwnProperty(v)){if(!Ext.isArray(t[v])){t[v]=[t[v]]}t[v].push(m)}else{t[v]=m}}else{g=v.match(/(\[):?([^\]]*)\]/g);s=v.match(/^([^\[]+)/);v=s[0];k=[];if(g===null){t[v]=m;continue}for(o=0,c=g.length;o<c;o++){u=g[o];u=(u.length===2)?"":u.substring(1,u.length-1);k.push(u)}k.unshift(v);r=t;for(o=0,c=k.length;o<c;o++){u=k[o];if(o===c-1){if(Ext.isArray(r)&&u===""){r.push(m)}else{r[u]=m}}else{if(r[u]===undefined||typeof r[u]==="string"){e=k[o+1];r[u]=(Ext.isNumeric(e)||e==="")?[]:{}}r=r[u]}}}}}return t},each:function(c,e,d){for(var f in c){if(c.hasOwnProperty(f)){if(e.call(d||c,f,c[f],c)===false){return}}}},merge:function(c){var h=1,j=arguments.length,d=b.merge,f=Ext.clone,g,l,k,e;for(;h<j;h++){g=arguments[h];for(l in g){k=g[l];if(k&&k.constructor===Object){e=c[l];if(e&&e.constructor===Object){d(e,k)}else{c[l]=f(k)}}else{c[l]=k}}}return c},mergeIf:function(j){var f=1,g=arguments.length,d=Ext.clone,c,e,h;for(;f<g;f++){c=arguments[f];for(e in c){if(!(e in j)){h=c[e];if(h&&h.constructor===Object){j[e]=d(h)}else{j[e]=h}}}}return j},getKey:function(c,e){for(var d in c){if(c.hasOwnProperty(d)&&c[d]===e){return d}}return null},getValues:function(d){var c=[],e;for(e in d){if(d.hasOwnProperty(e)){c.push(d[e])}}return c},getKeys:("keys" in Object)?Object.keys:function(c){var d=[],e;for(e in c){if(c.hasOwnProperty(e)){d.push(e)}}return d},getSize:function(c){var d=0,e;for(e in c){if(c.hasOwnProperty(e)){d++}}return d},classify:function(f){var e=f,h=[],d={},c=function(){var j=0,k=h.length,l;for(;j<k;j++){l=h[j];this[l]=new d[l]}},g,i;for(g in f){if(f.hasOwnProperty(g)){i=f[g];if(i&&i.constructor===Object){h.push(g);d[g]=b.classify(i)}}}c.prototype=e;return c},defineProperty:("defineProperty" in Object)?Object.defineProperty:function(d,c,e){if(e.get){d.__defineGetter__(c,e.get)}if(e.set){d.__defineSetter__(c,e.set)}}};Ext.merge=Ext.Object.merge;Ext.mergeIf=Ext.Object.mergeIf;Ext.urlEncode=function(){var c=Ext.Array.from(arguments),d="";if((typeof c[1]==="string")){d=c[1]+"&";c[1]=false}return d+b.toQueryString.apply(b,c)};Ext.urlDecode=function(){return b.fromQueryString.apply(b,arguments)}})();Ext.Function={flexSetter:function(a){return function(d,c){var e,f;if(d===null){return this}if(typeof d!=="string"){for(e in d){if(d.hasOwnProperty(e)){a.call(this,e,d[e])}}if(Ext.enumerables){for(f=Ext.enumerables.length;f--;){e=Ext.enumerables[f];if(d.hasOwnProperty(e)){a.call(this,e,d[e])}}}}else{a.call(this,d,c)}return this}},bind:function(d,c,b,a){if(arguments.length===2){return function(){return d.apply(c,arguments)}}var f=d,e=Array.prototype.slice;return function(){var g=b||arguments;if(a===true){g=e.call(arguments,0);g=g.concat(b)}else{if(typeof a=="number"){g=e.call(arguments,0);Ext.Array.insert(g,a,b)}}return f.apply(c||window,g)}},pass:function(c,a,b){if(!Ext.isArray(a)){a=Ext.Array.clone(a)}return function(){a.push.apply(a,arguments);return c.apply(b||this,a)}},alias:function(b,a){return function(){return b[a].apply(b,arguments)}},clone:function(a){return function(){return a.apply(this,arguments)}},createInterceptor:function(d,c,b,a){var e=d;if(!Ext.isFunction(c)){return d}else{return function(){var g=this,f=arguments;c.target=g;c.method=d;return(c.apply(b||g||window,f)!==false)?d.apply(g||window,f):a||null}}},createDelayed:function(e,c,d,b,a){if(d||b){e=Ext.Function.bind(e,d,b,a)}return function(){var g=this,f=Array.prototype.slice.call(arguments);setTimeout(function(){e.apply(g,f)},c)}},defer:function(e,c,d,b,a){e=Ext.Function.bind(e,d,b,a);if(c>0){return setTimeout(e,c)}e();return 0},createSequence:function(b,c,a){if(!c){return b}else{return function(){var d=b.apply(this,arguments);c.apply(a||this,arguments);return d}}},createBuffered:function(e,b,d,c){var a;return function(){if(!d){d=this}if(!c){c=Array.prototype.slice.call(arguments)}if(a){clearTimeout(a);a=null}a=setTimeout(function(){e.apply(d,c)},b)}},createThrottled:function(e,b,d){var f,a,c,h,g=function(){e.apply(d||this,c);f=new Date().getTime()};return function(){a=new Date().getTime()-f;c=arguments;clearTimeout(h);if(!f||(a>=b)){g()}else{h=setTimeout(g,b-a)}}},interceptBefore:function(b,a,c){var d=b[a]||Ext.emptyFn;return b[a]=function(){var e=c.apply(this,arguments);d.apply(this,arguments);return e}},interceptAfter:function(b,a,c){var d=b[a]||Ext.emptyFn;return b[a]=function(){d.apply(this,arguments);return c.apply(this,arguments)}}};Ext.defer=Ext.Function.alias(Ext.Function,"defer");Ext.pass=Ext.Function.alias(Ext.Function,"pass");Ext.bind=Ext.Function.alias(Ext.Function,"bind");Ext.JSON=new (function(){var useHasOwn=!!{}.hasOwnProperty,isNative=function(){var useNative=null;return function(){if(useNative===null){useNative=Ext.USE_NATIVE_JSON&&window.JSON&&JSON.toString()=="[object JSON]"}return useNative}}(),pad=function(n){return n<10?"0"+n:n},doDecode=function(json){return eval("("+json+")")},doEncode=function(o){if(!Ext.isDefined(o)||o===null){return"null"}else{if(Ext.isArray(o)){return encodeArray(o)}else{if(Ext.isDate(o)){return Ext.JSON.encodeDate(o)}else{if(Ext.isString(o)){return encodeString(o)}else{if(typeof o=="number"){return isFinite(o)?String(o):"null"}else{if(Ext.isBoolean(o)){return String(o)}else{if(Ext.isObject(o)){return encodeObject(o)}else{if(typeof o==="function"){return"null"}}}}}}}}return"undefined"},m={"\b":"\\b","\t":"\\t","\n":"\\n","\f":"\\f","\r":"\\r",'"':'\\"',"\\":"\\\\","\x0b":"\\u000b"},charToReplace=/[\\\"\x00-\x1f\x7f-\uffff]/g,encodeString=function(s){return'"'+s.replace(charToReplace,function(a){var c=m[a];return typeof c==="string"?c:"\\u"+("0000"+a.charCodeAt(0).toString(16)).slice(-4)})+'"'},encodeArray=function(o){var a=["[",""],len=o.length,i;for(i=0;i<len;i+=1){a.push(doEncode(o[i]),",")}a[a.length-1]="]";return a.join("")},encodeObject=function(o){var a=["{",""],i;for(i in o){if(!useHasOwn||o.hasOwnProperty(i)){a.push(doEncode(i),":",doEncode(o[i]),",")}}a[a.length-1]="}";return a.join("")};this.encodeDate=function(o){return'"'+o.getFullYear()+"-"+pad(o.getMonth()+1)+"-"+pad(o.getDate())+"T"+pad(o.getHours())+":"+pad(o.getMinutes())+":"+pad(o.getSeconds())+'"'};this.encode=function(){var ec;return function(o){if(!ec){ec=isNative()?JSON.stringify:doEncode}return ec(o)}}();this.decode=function(){var dc;return function(json,safe){if(!dc){dc=isNative()?JSON.parse:doDecode}try{return dc(json)}catch(e){if(safe===true){return null}Ext.Error.raise({sourceClass:"Ext.JSON",sourceMethod:"decode",msg:"You're trying to decode an invalid JSON String: "+json})}}}()})();Ext.encode=Ext.JSON.encode;Ext.decode=Ext.JSON.decode;Ext.Error={raise:function(a){throw new Error(a.msg)}};Ext.Date={now:Date.now,toString:function(a){if(!a){a=new Date()}var b=Ext.String.leftPad;return a.getFullYear()+"-"+b(a.getMonth()+1,2,"0")+"-"+b(a.getDate(),2,"0")+"T"+b(a.getHours(),2,"0")+":"+b(a.getMinutes(),2,"0")+":"+b(a.getSeconds(),2,"0")}};(function(a){var c=[],b=function(){};Ext.apply(b,{$className:"Ext.Base",$isClass:true,create:function(){return Ext.create.apply(Ext,[this].concat(Array.prototype.slice.call(arguments,0)))},extend:function(h){var d=h.prototype,l,f,g,j,e,k;f=this.prototype=Ext.Object.chain(d);f.self=this;this.superclass=f.superclass=d;if(!h.$isClass){l=Ext.Base.prototype;for(g in l){if(g in f){f[g]=l[g]}}}k=d.$inheritableStatics;if(k){for(g=0,j=k.length;g<j;g++){e=k[g];if(!this.hasOwnProperty(e)){this[e]=h[e]}}}if(h.$onExtended){this.$onExtended=h.$onExtended.slice()}f.config=f.defaultConfig=new f.configClass;f.initConfigList=f.initConfigList.slice();f.initConfigMap=Ext.Object.chain(f.initConfigMap)},"$onExtended":[],triggerExtended:function(){var f=this.$onExtended,e=f.length,d,g;if(e>0){for(d=0;d<e;d++){g=f[d];g.fn.apply(g.scope||this,arguments)}}},onExtended:function(e,d){this.$onExtended.push({fn:e,scope:d});return this},addConfig:function(f,i){var j=this.prototype,g=j.initConfigList,e=j.initConfigMap,h=j.defaultConfig,l,d,k;i=Boolean(i);for(d in f){if(f.hasOwnProperty(d)&&(i||!(d in h))){k=f[d];l=e[d];if(k!==null){if(!l){e[d]=true;g.push(d)}}else{if(l){e[d]=false;Ext.Array.remove(g,d)}}}}if(i){Ext.merge(h,f)}else{Ext.mergeIf(h,f)}j.configClass=Ext.Object.classify(h)},addStatics:function(d){var f,e;for(e in d){if(d.hasOwnProperty(e)){f=d[e];this[e]=f}}return this},addInheritableStatics:function(e){var h,d,g=this.prototype,f,i;h=g.$inheritableStatics;d=g.$hasInheritableStatics;if(!h){h=g.$inheritableStatics=[];d=g.$hasInheritableStatics={}}for(f in e){if(e.hasOwnProperty(f)){i=e[f];this[f]=i;if(!d[f]){d[f]=true;h.push(f)}}}return this},addMembers:function(e){var g=this.prototype,d=Ext.enumerables,k=[],h,j,f,l;for(f in e){k.push(f)}if(d){k.push.apply(k,d)}for(h=0,j=k.length;h<j;h++){f=k[h];if(e.hasOwnProperty(f)){l=e[f];if(typeof l=="function"&&!l.$isClass&&l!==Ext.emptyFn){l.$owner=this;l.$name=f}g[f]=l}}return this},addMember:function(d,e){if(typeof e=="function"&&!e.$isClass&&e!==Ext.emptyFn){e.$owner=this;e.$name=d}this.prototype[d]=e;return this},implement:function(){this.addMembers.apply(this,arguments)},borrow:function(h,f){var m=this.prototype,l=h.prototype,g,j,e,k,d;f=Ext.Array.from(f);for(g=0,j=f.length;g<j;g++){e=f[g];d=l[e];if(typeof d=="function"){k=function(){return d.apply(this,arguments)};k.$owner=this;k.$name=e;m[e]=k}else{m[e]=d}}return this},override:function(e){var l=this,n=Ext.enumerables,j=l.prototype,g=Ext.Function.clone,d,i,f,m,k,h;if(arguments.length===2){d=e;e={};e[d]=arguments[1];n=null}do{k=[];m=null;for(d in e){if(d=="statics"){m=e[d]}else{k.push(d)}}if(n){k.push.apply(k,n)}for(i=k.length;i--;){d=k[i];if(e.hasOwnProperty(d)){f=e[d];if(typeof f=="function"&&!f.$className&&f!==Ext.emptyFn){if(typeof f.$owner!="undefined"){f=g(f)}f.$owner=l;f.$name=d;h=j[d];if(h){f.$previous=h}}j[d]=f}}j=l;e=m}while(e);return this},callParent:function(d){var e;return(e=this.callParent.caller)&&(e.$previous||((e=e.$owner?e:e.caller)&&e.$owner.superclass.$class[e.$name])).apply(this,d||c)},mixin:function(f,h){var d=h.prototype,e=this.prototype,g;if(typeof d.onClassMixedIn!="undefined"){d.onClassMixedIn.call(h,this)}if(!e.hasOwnProperty("mixins")){if("mixins" in e){e.mixins=Ext.Object.chain(e.mixins)}else{e.mixins={}}}for(g in d){if(g==="mixins"){Ext.merge(e.mixins,d[g])}else{if(typeof e[g]=="undefined"&&g!="mixinId"&&g!="config"){e[g]=d[g]}}}if("config" in d){this.addConfig(d.config,false)}e.mixins[f]=d},getName:function(){return Ext.getClassName(this)},createAlias:a(function(e,d){this.override(e,function(){return this[d].apply(this,arguments)})}),addXtype:function(h){var e=this.prototype,g=e.xtypesMap,f=e.xtypes,d=e.xtypesChain;if(!e.hasOwnProperty("xtypesMap")){g=e.xtypesMap=Ext.merge({},e.xtypesMap||{});f=e.xtypes=e.xtypes?[].concat(e.xtypes):[];d=e.xtypesChain=e.xtypesChain?[].concat(e.xtypesChain):[];e.xtype=h}if(!g[h]){g[h]=true;f.push(h);d.push(h);Ext.ClassManager.setAlias(this,"widget."+h)}return this}});b.implement({isInstance:true,$className:"Ext.Base",configClass:Ext.emptyFn,initConfigList:[],initConfigMap:{},statics:function(){var e=this.statics.caller,d=this.self;if(!e){return d}return e.$owner},callParent:function(e){var f,d=(f=this.callParent.caller)&&(f.$previous||((f=f.$owner?f:f.caller)&&f.$owner.superclass[f.$name]));return d.apply(this,e||c)},self:b,constructor:function(){return this},wasInstantiated:false,initConfig:function(m){var l=Ext.Class.configNameCache,p=this.self.prototype,h=this.initConfigList,f=this.initConfigMap,g=new this.configClass,j=this.defaultConfig,k,o,e,q,n,d;this.initConfig=Ext.emptyFn;this.initialConfig=m||{};if(m){Ext.merge(g,m)}this.config=g;if(!p.hasOwnProperty("wasInstantiated")){p.wasInstantiated=true;for(k=0,o=h.length;k<o;k++){e=h[k];n=l[e];q=j[e];if(!(n.apply in p)&&!(n.update in p)&&p[n.set].$isDefault&&typeof q!="object"){p[n.internal]=j[e];f[e]=false;Ext.Array.remove(h,e);k--;o--}}}if(m){h=h.slice();for(e in m){if(e in j&&!f[e]){h.push(e)}}}for(k=0,o=h.length;k<o;k++){e=h[k];n=l[e];this[n.get]=this[n.initGet]}this.beforeInitConfig(g);for(k=0,o=h.length;k<o;k++){e=h[k];n=l[e];d=n.get;if(this.hasOwnProperty(d)){this[n.set].call(this,g[e]);delete this[d]}}return this},beforeInitConfig:Ext.emptyFn,getCurrentConfig:function(){var d=this.defaultConfig,g=Ext.Class.configNameCache,f={},e,h;for(e in d){h=g[e];f[e]=this[h.get].call(this)}return f},setConfig:function(e,l){if(!e){return this}var h=Ext.Class.configNameCache,j=this.config,f=this.defaultConfig,o=this.initialConfig,k=[],d,g,n,m;l=Boolean(l);for(d in e){if((l&&(d in o))){continue}j[d]=e[d];if(d in f){k.push(d);m=h[d];this[m.get]=this[m.initGet]}}for(g=0,n=k.length;g<n;g++){d=k[g];m=h[d];this[m.set].call(this,e[d]);delete this[m.get]}return this},getConfig:function(d){return this[Ext.Class.configNameCache[d].get].call(this)},hasConfig:function(d){return(d in this.defaultConfig)},getInitialConfig:function(e){var d=this.config;if(!e){return d}else{return d[e]}},onConfigUpdate:function(j,l,m){var n=this.self,f,h,d,g,k,e;j=Ext.Array.from(j);m=m||this;for(f=0,h=j.length;f<h;f++){d=j[f];g="update"+Ext.String.capitalize(d);k=this[g]||Ext.emptyFn;e=function(){k.apply(this,arguments);m[l].apply(m,arguments)};e.$name=g;e.$owner=n;this[g]=e}},destroy:function(){this.destroy=Ext.emptyFn;this.isDestroyed=true}});b.prototype.callOverridden=b.prototype.callParent;Ext.Base=b})(Ext.Function.flexSetter);(function(){var b,a=Ext.Base,e=[],d,c;for(d in a){if(a.hasOwnProperty(d)){e.push(d)}}c=e.length;Ext.Class=b=function(g,h,f){if(typeof g!="function"){f=h;h=g;g=null}if(!h){h={}}g=b.create(g);b.process(g,h,f);return g};Ext.apply(b,{onBeforeCreated:function(g,h,f){g.addMembers(h);f.onCreated.call(g,g)},create:function(f){var g,h;if(!f){f=function(){return this.constructor.apply(this,arguments)}}for(h=0;h<c;h++){g=e[h];f[g]=a[g]}return f},process:function(g,m,k){var j=m.preprocessors||b.defaultPreprocessors,q=this.preprocessors,t={onBeforeCreated:this.onBeforeCreated,onCreated:k||Ext.emptyFn},n=0,f,u,p,l,o,r,s,h;delete m.preprocessors;h=function(v,w,i){r=null;while(r===null){f=j[n++];if(f){u=q[f];p=u.properties;if(p===true){r=u.fn}else{for(l=0,o=p.length;l<o;l++){s=p[l];if(w.hasOwnProperty(s)){r=u.fn;break}}}}else{i.onBeforeCreated.apply(this,arguments);return}}if(r.call(this,v,w,i,h)!==false){h.apply(this,arguments)}};h.call(this,g,m,t)},preprocessors:{},registerPreprocessor:function(g,j,h,f,i){if(!f){f="last"}if(!h){h=[g]}this.preprocessors[g]={name:g,properties:h||false,fn:j};this.setDefaultPreprocessorPosition(g,f,i);return this},getPreprocessor:function(f){return this.preprocessors[f]},getPreprocessors:function(){return this.preprocessors},defaultPreprocessors:[],getDefaultPreprocessors:function(){return this.defaultPreprocessors},setDefaultPreprocessors:function(f){this.defaultPreprocessors=Ext.Array.from(f);return this},setDefaultPreprocessorPosition:function(h,j,i){var f=this.defaultPreprocessors,g;if(typeof j=="string"){if(j==="first"){f.unshift(h);return this}else{if(j==="last"){f.push(h);return this}}j=(j==="after")?1:-1}g=Ext.Array.indexOf(f,i);if(g!==-1){Ext.Array.splice(f,Math.max(0,g+j),0,h)}return this},configNameCache:{},getConfigNameMap:function(h){var g=this.configNameCache,i=g[h],f;if(!i){f=h.charAt(0).toUpperCase()+h.substr(1);i=g[h]={name:h,internal:"_"+h,initializing:"is"+f+"Initializing",apply:"apply"+f,update:"update"+f,set:"set"+f,get:"get"+f,initGet:"initGet"+f,doSet:"doSet"+f,changeEvent:h.toLowerCase()+"change"}}return i},generateSetter:function(i){var g=i.internal,h=i.get,f=i.apply,k=i.update,j;j=function(n){var m=this[g],l=this[f],o=this[k];delete this[h];if(l){n=l.call(this,n,m)}if(typeof n!="undefined"){this[g]=n;if(o&&n!==m){o.call(this,n,m)}}return this};j.$isDefault=true;return j},generateInitGetter:function(j){var f=j.name,i=j.set,g=j.get,h=j.initializing;return function(){this[h]=true;delete this[g];this[i].call(this,this.config[f]);delete this[h];return this[g].apply(this,arguments)}},generateGetter:function(g){var f=g.internal;return function(){return this[f]}}});b.registerPreprocessor("extend",function(g,k){var j=Ext.Base,l=j.prototype,m=k.extend,i,f,h;delete k.extend;if(m&&m!==Object){i=m}else{i=j}f=i.prototype;if(!i.$isClass){for(h in l){if(!f[h]){f[h]=l[h]}}}g.extend(i);g.triggerExtended.apply(g,arguments);if(k.onClassExtended){g.onExtended(k.onClassExtended,g);delete k.onClassExtended}},true);b.registerPreprocessor("statics",function(f,g){f.addStatics(g.statics);delete g.statics});b.registerPreprocessor("inheritableStatics",function(f,g){f.addInheritableStatics(g.inheritableStatics);delete g.inheritableStatics});b.registerPreprocessor("config",function(h,m){var j=m.config,p=h.prototype,l=p.config,o,g,n,f,i,k,q;delete m.config;for(g in j){if(j.hasOwnProperty(g)&&!(g in l)){q=j[g];o=this.getConfigNameMap(g);n=o.set;f=o.get;i=o.initGet;k=o.internal;m[i]=this.generateInitGetter(o);if(q===null&&!m.hasOwnProperty(k)){m[k]=null}if(!m.hasOwnProperty(f)){m[f]=this.generateGetter(o)}if(!m.hasOwnProperty(n)){m[n]=this.generateSetter(o)}}}h.addConfig(j,true)});b.registerPreprocessor("mixins",function(j,n,f){var g=n.mixins,k,h,l,m;delete n.mixins;Ext.Function.interceptBefore(f,"onCreated",function(){if(g instanceof Array){for(l=0,m=g.length;l<m;l++){h=g[l];k=h.prototype.mixinId||h.$className;j.mixin(k,h)}}else{for(k in g){if(g.hasOwnProperty(k)){j.mixin(k,g[k])}}}})});Ext.extend=function(h,i,g){if(arguments.length===2&&Ext.isObject(i)){g=i;i=h;h=null}var f;if(!i){throw new Error("[Ext.extend] Attempting to extend from a class which has not been loaded on the page.")}g.extend=i;g.preprocessors=["extend","statics","inheritableStatics","mixins","config"];if(h){f=new b(h,g)}else{f=new b(g)}f.prototype.override=function(k){for(var j in k){if(k.hasOwnProperty(j)){this[j]=k[j]}}};return f}})();(function(b,d,f,c,e){var a=Ext.ClassManager={classes:{},existCache:{},namespaceRewrites:[{from:"Ext.",to:Ext}],maps:{alternateToName:{},aliasToName:{},nameToAliases:{},nameToAlternates:{},overridesByName:{}},enableNamespaceParseCache:true,namespaceParseCache:{},instantiators:[],isCreated:function(l){var k=this.existCache,j,m,h,g,n;if(this.classes[l]||k[l]){return true}g=e;n=this.parseNamespace(l);for(j=0,m=n.length;j<m;j++){h=n[j];if(typeof h!="string"){g=h}else{if(!g||!g[h]){return false}g=g[h]}}k[l]=true;this.triggerCreated(l);return true},createdListeners:[],nameCreatedListeners:{},triggerCreated:function(k){var j=this.createdListeners,h=this.nameCreatedListeners,g,l,m;for(g=0,l=j.length;g<l;g++){m=j[g];m.fn.call(m.scope,k)}j=h[k];if(j){for(g=0,l=j.length;g<l;g++){m=j[g];m.fn.call(m.scope,k)}delete h[k]}},onCreated:function(k,j,i){var h=this.createdListeners,g=this.nameCreatedListeners,l={fn:k,scope:j};if(i){if(this.isCreated(i)){k.call(j,i);return}if(!g[i]){g[i]=[]}g[i].push(l)}else{h.push(l)}},parseNamespace:function(j){var g=this.namespaceParseCache;if(this.enableNamespaceParseCache){if(g.hasOwnProperty(j)){return g[j]}}var k=[],m=this.namespaceRewrites,o=e,h=j,r,q,p,l,n;for(l=0,n=m.length;l<n;l++){r=m[l];q=r.from;p=r.to;if(h===q||h.substring(0,q.length)===q){h=h.substring(q.length);if(typeof p!="string"){o=p}else{k=k.concat(p.split("."))}break}}k.push(o);k=k.concat(h.split("."));if(this.enableNamespaceParseCache){g[j]=k}return k},setNamespace:function(k,n){var h=e,o=this.parseNamespace(k),m=o.length-1,g=o[m],l,j;for(l=0;l<m;l++){j=o[l];if(typeof j!="string"){h=j}else{if(!h[j]){h[j]={}}h=h[j]}}h[g]=n;return h[g]},createNamespaces:function(){var g=e,n,k,l,h,m,o;for(l=0,m=arguments.length;l<m;l++){n=this.parseNamespace(arguments[l]);for(h=0,o=n.length;h<o;h++){k=n[h];if(typeof k!="string"){g=k}else{if(!g[k]){g[k]={}}g=g[k]}}}return g},set:function(g,k){var j=this,m=j.maps,l=m.nameToAlternates,i=j.getName(k),h;j.classes[g]=j.setNamespace(g,k);if(i&&i!==g){m.alternateToName[g]=i;h=l[i]||(l[i]=[]);h.push(g)}return this},get:function(j){var l=this.classes;if(l[j]){return l[j]}var g=e,n=this.parseNamespace(j),h,k,m;for(k=0,m=n.length;k<m;k++){h=n[k];if(typeof h!="string"){g=h}else{if(!g||!g[h]){return null}g=g[h]}}return g},setAlias:function(g,h){var j=this.maps.aliasToName,k=this.maps.nameToAliases,i;if(typeof g=="string"){i=g}else{i=this.getName(g)}if(h&&j[h]!==i){j[h]=i}if(!k[i]){k[i]=[]}if(h){Ext.Array.include(k[i],h)}return this},getByAlias:function(g){return this.get(this.getNameByAlias(g))},getNameByAlias:function(g){return this.maps.aliasToName[g]||""},getNameByAlternate:function(g){return this.maps.alternateToName[g]||""},getAliasesByName:function(g){return this.maps.nameToAliases[g]||[]},getName:function(g){return g&&g.$className||""},getClass:function(g){return g&&g.self||null},applyOverrides:function(g){var m=this,k=m.maps.overridesByName,n=k[g],l=n&&n.length||0,j=m.createOverride,h;delete k[g];for(h=0;h<l;++h){j.apply(m,n[h])}},create:function(h,i,g){i.$className=h;return new b(i,function(){var n=i.postprocessors||a.defaultPostprocessors,u=a.postprocessors,r=0,v=[],t,k,o,s,m,q,p,w,l;delete i.postprocessors;for(o=0,s=n.length;o<s;o++){t=n[o];if(typeof t=="string"){t=u[t];p=t.properties;if(p===true){v.push(t.fn)}else{if(p){for(m=0,q=p.length;m<q;m++){w=p[m];if(i.hasOwnProperty(w)){v.push(t.fn);break}}}}}else{v.push(t)}}k=function(x,j,y){t=v[r++];if(!t){a.set(h,j);if(g){g.call(j,j)}a.triggerCreated(h);return}if(t.call(this,x,j,y,k)!==false){k.apply(this,arguments)}};k.call(a,h,this,i);a.applyOverrides(h);l=a.maps.nameToAlternates[h];for(o=0,s=l&&l.length||0;o<s;++o){a.applyOverrides(l[o])}})},createOverride:function(h,j,g){var m=this,l=j.override,o=m.get(l),k,i,n;if(o){k=Ext.apply({},j);delete k.requires;delete k.uses;delete k.override;m.create(h,{requires:j.requires,uses:j.uses,override:l},function(){this.active=true;if(o.override){o.override(k)}else{o.self.override(k)}if(g){g.call(o)}})}else{i=m.maps.overridesByName;n=i[l]||(i[l]=[]);n.push(Array.prototype.slice.call(arguments,0));m.setNamespace(h,{override:l})}},instantiateByAlias:function(){var h=arguments[0],g=f.call(arguments),i=this.getNameByAlias(h);if(!i){i=this.maps.aliasToName[h];Ext.syncRequire(i)}g[0]=i;return this.instantiate.apply(this,g)},instantiate:function(){var i=arguments[0],h=f.call(arguments,1),j=i,k,g;if(typeof i!="function"){g=this.get(i)}else{g=i}if(!g){k=this.getNameByAlias(i);if(k){i=k;g=this.get(i)}}if(!g){k=this.getNameByAlternate(i);if(k){i=k;g=this.get(i)}}if(!g){Ext.syncRequire(i);g=this.get(i)}return this.getInstantiator(h.length)(g,h)},dynInstantiate:function(h,g){g=c(g,true);g.unshift(h);return this.instantiate.apply(this,g)},getInstantiator:function(k){var j=this.instantiators,l;l=j[k];if(!l){var h=k,g=[];for(h=0;h<k;h++){g.push("a["+h+"]")}l=j[k]=new Function("c","a","return new c("+g.join(",")+")")}return l},postprocessors:{},defaultPostprocessors:[],registerPostprocessor:function(h,k,i,g,j){if(!g){g="last"}if(!i){i=[h]}this.postprocessors[h]={name:h,properties:i||false,fn:k};this.setDefaultPostprocessorPosition(h,g,j);return this},setDefaultPostprocessors:function(g){this.defaultPostprocessors=c(g);return this},setDefaultPostprocessorPosition:function(h,k,j){var i=this.defaultPostprocessors,g;if(typeof k=="string"){if(k==="first"){i.unshift(h);return this}else{if(k==="last"){i.push(h);return this}}k=(k==="after")?1:-1}g=Ext.Array.indexOf(i,j);if(g!==-1){Ext.Array.splice(i,Math.max(0,g+k),0,h)}return this},getNamesByExpression:function(o){var m=this.maps.nameToAliases,p=[],g,l,j,h,q,k,n;if(o.indexOf("*")!==-1){o=o.replace(/\*/g,"(.*?)");q=new RegExp("^"+o+"$");for(g in m){if(m.hasOwnProperty(g)){j=m[g];if(g.search(q)!==-1){p.push(g)}else{for(k=0,n=j.length;k<n;k++){l=j[k];if(l.search(q)!==-1){p.push(g);break}}}}}}else{h=this.getNameByAlias(o);if(h){p.push(h)}else{h=this.getNameByAlternate(o);if(h){p.push(h)}else{p.push(o)}}}return p}};a.registerPostprocessor("alias",function(j,h,m){var g=m.alias,k,l;for(k=0,l=g.length;k<l;k++){d=g[k];this.setAlias(h,d)}},["xtype","alias"]);a.registerPostprocessor("singleton",function(h,g,j,i){i.call(this,h,new g(),j);return false});a.registerPostprocessor("alternateClassName",function(h,g,m){var k=m.alternateClassName,j,l,n;if(!(k instanceof Array)){k=[k]}for(j=0,l=k.length;j<l;j++){n=k[j];this.set(n,g)}});Ext.apply(Ext,{create:d(a,"instantiate"),widget:function(h){var g=f.call(arguments);g[0]="widget."+h;return a.instantiateByAlias.apply(a,g)},createByAlias:d(a,"instantiateByAlias"),define:function(h,i,g){if(i.override){return a.createOverride.apply(a,arguments)}return a.create.apply(a,arguments)},getClassName:d(a,"getName"),getDisplayName:function(g){if(g){if(g.displayName){return g.displayName}if(g.$name&&g.$class){return Ext.getClassName(g.$class)+"#"+g.$name}if(g.$className){return g.$className}}return"Anonymous"},getClass:d(a,"getClass"),namespace:d(a,"createNamespaces")});Ext.createWidget=Ext.widget;Ext.ns=Ext.namespace;b.registerPreprocessor("className",function(g,h){if(h.$className){g.$className=h.$className}},true,"first");b.registerPreprocessor("alias",function(s,m){var q=s.prototype,j=c(m.xtype),g=c(m.alias),t="widget.",r=t.length,n=Array.prototype.slice.call(q.xtypesChain||[]),k=Ext.merge({},q.xtypesMap||{}),l,p,o,h;for(l=0,p=g.length;l<p;l++){o=g[l];if(o.substring(0,r)===t){h=o.substring(r);Ext.Array.include(j,h)}}s.xtype=m.xtype=j[0];m.xtypes=j;for(l=0,p=j.length;l<p;l++){h=j[l];if(!k[h]){k[h]=true;n.push(h)}}m.xtypesChain=n;m.xtypesMap=k;Ext.Function.interceptAfter(m,"onClassCreated",function(){var i=q.mixins,v,u;for(v in i){if(i.hasOwnProperty(v)){u=i[v];j=u.xtypes;if(j){for(l=0,p=j.length;l<p;l++){h=j[l];if(!k[h]){k[h]=true;n.push(h)}}}}}});for(l=0,p=j.length;l<p;l++){h=j[l];Ext.Array.include(g,t+h)}m.alias=g},["xtype","alias"])})(Ext.Class,Ext.Function.alias,Array.prototype.slice,Ext.Array.from,Ext.global);(function(a,c,d,g,i,h,f,j){var e=["extend","mixins","requires"],b;b=Ext.Loader={isInHistory:{},history:[],config:{enabled:false,disableCaching:true,disableCachingParam:"_dc",paths:{Ext:"."}},setConfig:function(k,l){if(Ext.isObject(k)&&arguments.length===1){Ext.merge(this.config,k)}else{this.config[k]=(Ext.isObject(l))?Ext.merge(this.config[k],l):l}return this},getConfig:function(k){if(k){return this.config[k]}return this.config},setPath:d(function(k,l){this.config.paths[k]=l;return this}),getPath:function(k){var m="",n=this.config.paths,l=this.getPrefix(k);if(l.length>0){if(l===k){return n[l]}m=n[l];k=k.substring(l.length+1)}if(m.length>0){m+="/"}return m.replace(/\/\.\//g,"/")+k.replace(/\./g,"/")+".js"},getPrefix:function(l){var n=this.config.paths,m,k="";if(n.hasOwnProperty(l)){return l}for(m in n){if(n.hasOwnProperty(m)&&m+"."===l.substring(0,m.length+1)){if(m.length>k.length){k=m}}}return k},require:function(m,l,k,n){if(l){l.call(k)}},syncRequire:function(){},exclude:function(l){var k=this;return{require:function(o,n,m){return k.require(o,n,m,l)},syncRequire:function(o,n,m){return k.syncRequire(o,n,m,l)}}},onReady:function(n,m,o,k){var l;if(o!==false&&Ext.onDocumentReady){l=n;n=function(){Ext.onDocumentReady(l,m,k)}}n.call(m)}};Ext.apply(b,{documentHead:typeof document!="undefined"&&(document.head||document.getElementsByTagName("head")[0]),isLoading:false,queue:[],isClassFileLoaded:{},isFileLoaded:{},readyListeners:[],optionalRequires:[],requiresMap:{},numPendingFiles:0,numLoadedFiles:0,hasFileLoadError:false,classNameToFilePathMap:{},syncModeEnabled:false,scriptElements:{},refreshQueue:function(){var k=this.queue,q=k.length,n,p,l,o,m;if(q===0){this.triggerReady();return}for(n=0;n<q;n++){p=k[n];if(p){o=p.requires;m=p.references;if(o.length>this.numLoadedFiles){continue}l=0;do{if(a.isCreated(o[l])){f(o,l,1)}else{l++}}while(l<o.length);if(p.requires.length===0){f(k,n,1);p.callback.call(p.scope);this.refreshQueue();break}}}return this},injectScriptElement:function(m,o,q,n){var l=document.createElement("script"),p=this,k=function(){p.cleanupScriptElement(l);o.call(n)},r=function(){p.cleanupScriptElement(l);q.call(n)};l.type="text/javascript";l.src=m;l.onload=k;l.onerror=r;l.onreadystatechange=function(){if(this.readyState==="loaded"||this.readyState==="complete"){k()}};this.documentHead.appendChild(l);return l},removeScriptElement:function(l){var k=this.scriptElements;if(k[l]){this.cleanupScriptElement(k[l],true);delete k[l]}return this},cleanupScriptElement:function(l,k){l.onload=null;l.onreadystatechange=null;l.onerror=null;if(k){this.documentHead.removeChild(l)}return this},loadScriptFile:function(l,s,p,w,k){var r=this,x=this.isFileLoaded,n=this.scriptElements,v=l+(this.getConfig("disableCaching")?("?"+this.getConfig("disableCachingParam")+"="+Ext.Date.now()):""),m=false,u,o,t;if(x[l]){return this}w=w||this;this.isLoading=true;if(!k){t=function(){};if(!Ext.isReady&&Ext.onDocumentReady){Ext.onDocumentReady(function(){if(!x[l]){n[l]=r.injectScriptElement(v,s,t,w)}})}else{n[l]=this.injectScriptElement(v,s,t,w)}}else{if(typeof XMLHttpRequest!="undefined"){u=new XMLHttpRequest()}else{u=new ActiveXObject("Microsoft.XMLHTTP")}try{u.open("GET",v,false);u.send(null)}catch(q){m=true}o=(u.status===1223)?204:u.status;if(!m){m=(o===0)}if(m){}else{if(o>=200&&o<300){Ext.globalEval(u.responseText+"\n//@ sourceURL="+l);s.call(w)}else{}}u=null}},syncRequire:function(){var k=this.syncModeEnabled;if(!k){this.syncModeEnabled=true}this.require.apply(this,arguments);if(!k){this.syncModeEnabled=false}this.refreshQueue()},require:function(F,t,n,q){var v={},m={},y=this.queue,C=this.classNameToFilePathMap,A=this.isClassFileLoaded,s=[],H=[],E=[],l=[],r,G,x,w,k,p,D,B,z,u,o;if(q){q=h(q);for(B=0,u=q.length;B<u;B++){k=q[B];if(typeof k=="string"&&k.length>0){s=a.getNamesByExpression(k);for(z=0,o=s.length;z<o;z++){v[s[z]]=true}}}}F=h(F);if(t){if(t.length>0){r=function(){var K=[],J,L,I;for(J=0,L=l.length;J<L;J++){I=l[J];K.push(a.get(I))}return t.apply(this,K)}}else{r=t}}else{r=Ext.emptyFn}n=n||Ext.global;for(B=0,u=F.length;B<u;B++){w=F[B];if(typeof w=="string"&&w.length>0){H=a.getNamesByExpression(w);o=H.length;for(z=0;z<o;z++){D=H[z];if(v[D]!==true){l.push(D);if(!a.isCreated(D)&&!m[D]){m[D]=true;E.push(D)}}}}}if(E.length>0){if(!this.config.enabled){throw new Error("Ext.Loader is not enabled, so dependencies cannot be resolved dynamically. Missing required class"+((E.length>1)?"es":"")+": "+E.join(", "))}}else{r.call(n);return this}G=this.syncModeEnabled;if(!G){y.push({requires:E.slice(),callback:r,scope:n})}u=E.length;for(B=0;B<u;B++){p=E[B];x=this.getPath(p);if(G&&A.hasOwnProperty(p)){this.numPendingFiles--;this.removeScriptElement(x);delete A[p]}if(!A.hasOwnProperty(p)){A[p]=false;C[p]=x;this.numPendingFiles++;this.loadScriptFile(x,i(this.onFileLoaded,[p,x],this),i(this.onFileLoadError,[p,x]),this,G)}}if(G){r.call(n);if(u===1){return a.get(p)}}return this},onFileLoaded:function(l,k){this.numLoadedFiles++;this.isClassFileLoaded[l]=true;this.isFileLoaded[k]=true;this.numPendingFiles--;if(this.numPendingFiles===0){this.refreshQueue()}},onFileLoadError:function(m,l,k,n){this.numPendingFiles--;this.hasFileLoadError=true},addOptionalRequires:function(m){var o=this.optionalRequires,l,n,k;m=h(m);for(l=0,n=m.length;l<n;l++){k=m[l];j(o,k)}return this},triggerReady:function(l){var n=this.readyListeners,m=this.optionalRequires,k;if(this.isLoading||l){this.isLoading=false;if(m.length!==0){m=m.slice();this.optionalRequires.length=0;this.require(m,i(this.triggerReady,[true],this),this);return this}while(n.length){k=n.shift();k.fn.call(k.scope);if(this.isLoading){return this}}}return this},onReady:function(n,m,o,k){var l;if(o!==false&&Ext.onDocumentReady){l=n;n=function(){Ext.onDocumentReady(l,m,k)}}if(!this.isLoading){n.call(m)}else{this.readyListeners.push({fn:n,scope:m})}},historyPush:function(l){var k=this.isInHistory;if(l&&this.isClassFileLoaded.hasOwnProperty(l)&&!k[l]){k[l]=true;this.history.push(l)}return this}});Ext.require=g(b,"require");Ext.syncRequire=g(b,"syncRequire");Ext.exclude=g(b,"exclude");Ext.onReady=function(m,l,k){b.onReady(m,l,true,k)};c.registerPreprocessor("loader",function(x,m,w,v){var t=this,r=[],s=a.getName(x),n,l,q,p,u,o,k;for(n=0,q=e.length;n<q;n++){o=e[n];if(m.hasOwnProperty(o)){k=m[o];if(typeof k=="string"){r.push(k)}else{if(k instanceof Array){for(l=0,p=k.length;l<p;l++){u=k[l];if(typeof u=="string"){r.push(u)}}}else{if(typeof k!="function"){for(l in k){if(k.hasOwnProperty(l)){u=k[l];if(typeof u=="string"){r.push(u)}}}}}}}}if(r.length===0){return}b.require(r,function(){for(n=0,q=e.length;n<q;n++){o=e[n];if(m.hasOwnProperty(o)){k=m[o];if(typeof k=="string"){m[o]=a.get(k)}else{if(k instanceof Array){for(l=0,p=k.length;l<p;l++){u=k[l];if(typeof u=="string"){m[o][l]=a.get(u)}}}else{if(typeof k!="function"){for(var y in k){if(k.hasOwnProperty(y)){u=k[y];if(typeof u=="string"){m[o][y]=a.get(u)}}}}}}}}v.call(t,x,m,w)});return false},true,"after","className");a.registerPostprocessor("uses",function(n,l,r){var k=h(r.uses),m=[],o,q,p;for(o=0,q=k.length;o<q;o++){p=k[o];if(typeof p=="string"){m.push(p)}}b.addOptionalRequires(m)});a.onCreated(function(k){this.historyPush(k)},b)})(Ext.ClassManager,Ext.Class,Ext.Function.flexSetter,Ext.Function.alias,Ext.Function.pass,Ext.Array.from,Ext.Array.erase,Ext.Array.include);Ext.setVersion("touch","2.0.0.rc");Ext.apply(Ext,{version:Ext.getVersion("touch"),idSeed:0,repaint:function(){var a=Ext.getBody().createChild({cls:Ext.baseCSSPrefix+"mask "+Ext.baseCSSPrefix+"mask-transparent"});setTimeout(function(){a.destroy()},0)},id:function(a,b){if(a&&a.id){return a.id}a=Ext.getDom(a)||{};if(a===document||a===document.documentElement){a.id="ext-application"}else{if(a===document.body){a.id="ext-viewport"}else{if(a===window){a.id="ext-window"}}}a.id=a.id||((b||"ext-element-")+(++Ext.idSeed));return a.id},getBody:function(){if(!Ext.documentBodyElement){if(!document.body){throw new Error("[Ext.getBody] document.body does not exist at this point")}Ext.documentBodyElement=Ext.get(document.body)}return Ext.documentBodyElement},getHead:function(){if(!Ext.documentHeadElement){Ext.documentHeadElement=Ext.get(document.head||document.getElementsByTagName("head")[0])}return Ext.documentHeadElement},getDoc:function(){if(!Ext.documentElement){Ext.documentElement=Ext.get(document)}return Ext.documentElement},getCmp:function(a){return Ext.ComponentMgr.get(a)},copyTo:function(a,b,d,c){if(typeof d=="string"){d=d.split(/[,;\s]/)}Ext.each(d,function(e){if(c||b.hasOwnProperty(e)){a[e]=b[e]}},this);return a},destroy:function(){var a=arguments,d=a.length,b,c;for(b=0;b<d;b++){c=a[b];if(c){if(Ext.isArray(c)){this.destroy.apply(this,c)}else{if(Ext.isFunction(c.destroy)){c.destroy()}}}}},getDom:function(a){if(!a||!document){return null}return a.dom?a.dom:(typeof a=="string"?document.getElementById(a):a)},removeNode:function(a){if(a&&a.parentNode&&a.tagName!="BODY"){Ext.get(a).clearListeners();a.parentNode.removeChild(a);delete Ext.cache[a.id]}},defaultSetupConfig:{eventPublishers:{dom:{xclass:"Ext.event.publisher.Dom"},touchGesture:{xclass:"Ext.event.publisher.TouchGesture",recognizers:{drag:{xclass:"Ext.event.recognizer.Drag"},tap:{xclass:"Ext.event.recognizer.Tap"},doubleTap:{xclass:"Ext.event.recognizer.DoubleTap"},longPress:{xclass:"Ext.event.recognizer.LongPress"},swipe:{xclass:"Ext.event.recognizer.HorizontalSwipe"},pinch:{xclass:"Ext.event.recognizer.Pinch"},rotate:{xclass:"Ext.event.recognizer.Rotate"}}},componentDelegation:{xclass:"Ext.event.publisher.ComponentDelegation"},componentPaint:{xclass:"Ext.event.publisher.ComponentPaint"},componentSize:{xclass:"Ext.event.publisher.ComponentSize"}},animator:{xclass:"Ext.fx.Runner"},viewport:{xclass:"Ext.viewport.Viewport"}},isSetup:false,setupListeners:[],onSetup:function(b,a){if(Ext.isSetup){b.call(a)}else{Ext.setupListeners.push({fn:b,scope:a})}},setup:function(s){var i=Ext.defaultSetupConfig,b=s.onReady||Ext.emptyFn,a=s.scope,c=Ext.Array.from(s.requires),n=Ext.onReady,o=s.icon,f,p,g;Ext.setup=function(){throw new Error("Ext.setup has already been called before")};delete s.requires;delete s.onReady;delete s.scope;Ext.require(["Ext.event.Dispatcher","Ext.MessageBox"]);f=function(){var v=Ext.setupListeners,w=v.length,u,x;delete Ext.setupListeners;Ext.isSetup=true;for(u=0;u<w;u++){x=v[u];x.fn.call(x.scope)}Ext.onReady=n;Ext.onReady(b,a)};Ext.onReady=function(w,v){var u=b;b=function(){u();Ext.onReady(w,v)}};s=Ext.merge({},i,s);Ext.onDocumentReady(function(){Ext.factoryConfig(s,function(u){Ext.event.Dispatcher.getInstance().setPublishers(u.eventPublishers);if(u.logger){Ext.Logger=u.logger}if(u.animator){Ext.Animator=u.animator}if(u.viewport){Ext.Viewport=p=u.viewport;if(!a){a=p}Ext.require(c,function(){Ext.Viewport.on("ready",f,null,{single:true})})}else{Ext.require(c,f)}})});if(!document.body){var k=s.phoneIcon,m=s.tabletIcon,l=s.tabletStartupScreen,d=s.statusBarStyle,q=s.phoneStartupScreen,j=Ext.os.is.iPad;document.write('<meta id="extViewportMeta" name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0, user-scalable=no">');document.write('<meta name="apple-mobile-web-app-capable" content="yes">');document.write('<meta name="apple-touch-fullscreen" content="yes">');if(Ext.isString(d)){document.write('<meta name="apple-mobile-web-app-status-bar-style" content="'+d+'">')}if(l&&j){document.write('<link rel="apple-touch-startup-image" href="'+l+'">')}if(q&&!j){document.write('<link rel="apple-touch-startup-image" href="'+q+'">')}if(Ext.isString(o)||Ext.isString(k)||Ext.isString(m)){o={"57":k||m||o,"72":m||k||o,"114":k||m||o}}g=(s.glossOnIcon===false)?"-precomposed":"";if(o){var t=o["72"],e=o["57"],h=o["114"],r='<link rel="apple-touch-icon';if(j&&t){document.write(r+g+'" sizes="72x72" href="'+t+'">')}else{if(!j){if(e){document.write(r+g+'" href="'+e+'">')}if(h){document.write(r+g+'" sizes="114x114" href="'+h+'">')}}}}}},application:function(a){var c,b;if(!a){a={}}Ext.Loader.setPath(a.name,a.appFolder||"app");a.requires=Ext.Array.from(a.requires);a.requires.push("Ext.app.Application");c=a.onReady;b=a.scope;a.onReady=function(){new Ext.app.Application(a);if(c){c.call(b)}};Ext.setup(a)},factoryConfig:function(a,l){var g=Ext.isSimpleObject(a);if(g&&a.xclass){var f=a.xclass;delete a.xclass;Ext.require(f,function(){Ext.factoryConfig(a,function(i){l(Ext.create(f,i))})});return}var d=Ext.isArray(a),m=[],k,j,c,e;if(g||d){if(g){for(k in a){if(a.hasOwnProperty(k)){j=a[k];if(Ext.isSimpleObject(j)||Ext.isArray(j)){m.push(k)}}}}else{for(c=0,e=a.length;c<e;c++){j=a[c];if(Ext.isSimpleObject(j)||Ext.isArray(j)){m.push(c)}}}c=0;e=m.length;if(e===0){l(a);return}function h(i){a[k]=i;c++;b()}function b(){if(c>=e){l(a);return}k=m[c];j=a[k];Ext.factoryConfig(j,h)}b();return}l(a)},factory:function(b,e,a,f){var d=Ext.ClassManager,c;if(!b||b.isInstance){if(a&&a!==b){a.destroy()}return b}if(f){if(typeof b=="string"){return d.instantiateByAlias(f+"."+b)}else{if(Ext.isObject(b)&&"type" in b){return d.instantiateByAlias(f+"."+b.type,b)}}}else{if(typeof b=="string"){return Ext.getCmp(b)}}if(b===true){if(a){return a}else{return d.instantiate(e)}}if("xtype" in b){c=d.instantiateByAlias("widget."+b.xtype,b)}if("xclass" in b){c=d.instantiate(b.xclass,b)}if(c){if(a){a.destroy()}return c}if(a){return a.setConfig(b)}return d.instantiate(e,b)},deprecateClassMember:function(b,c,a,d){return this.deprecateProperty(b.prototype,c,a,d)},deprecateClassMembers:function(b,c){var d=b.prototype,e,a;for(e in c){if(c.hasOwnProperty(e)){a=c[e];this.deprecateProperty(d,e,a)}}},deprecateProperty:function(b,c,a,d){if(!d){d="'"+c+"' is deprecated"}if(a){d+=", please use '"+a+"' instead"}if(a){Ext.Object.defineProperty(b,c,{get:function(){return this[a]},set:function(e){this[a]=e},configurable:true})}},deprecatePropertyValue:function(b,a,d,c){Ext.Object.defineProperty(b,a,{get:function(){return d},configurable:true})},deprecateMethod:function(b,a,d,c){b[a]=function(){if(d){return d.apply(this,arguments)}}},deprecateClassMethod:function(a,b,h,d){if(typeof b!="string"){var g,f;for(g in b){if(b.hasOwnProperty(g)){f=b[g];Ext.deprecateClassMethod(a,g,f)}}return}var c=typeof h=="string",e;if(!d){d="'"+b+"()' is deprecated, please use '"+(c?h:h.name)+"()' instead"}if(c){e=function(){return this[h].apply(this,arguments)}}else{e=function(){return h.apply(this,arguments)}}if(b in a.prototype){Ext.Object.defineProperty(a.prototype,b,{value:null,writable:true,configurable:true})}a.addMember(b,e)},isReady:false,readyListeners:[],triggerReady:function(){var b=Ext.readyListeners,a,c,d;if(!Ext.isReady){Ext.isReady=true;for(a=0,c=b.length;a<c;a++){d=b[a];d.fn.call(d.scope)}delete Ext.readyListeners}},onDocumentReady:function(c,b){if(Ext.isReady){c.call(b)}else{var a=Ext.triggerReady;Ext.readyListeners.push({fn:c,scope:b});if(Ext.browser.is.PhoneGap&&!Ext.os.is.Desktop){if(!Ext.readyListenerAttached){Ext.readyListenerAttached=true;document.addEventListener("deviceready",a,false)}}else{if(document.readyState.match(/interactive|complete|loaded/)!==null){a()}else{if(!Ext.readyListenerAttached){Ext.readyListenerAttached=true;window.addEventListener("DOMContentLoaded",a,false)}}}}},callback:function(d,c,b,a){if(Ext.isFunction(d)){b=b||[];c=c||window;if(a){Ext.defer(d,a,c,b)}else{d.apply(c,b)}}}});Ext.define("Ext.env.Browser",{requires:["Ext.Version"],statics:{browserNames:{ie:"IE",firefox:"Firefox",safari:"Safari",chrome:"Chrome",opera:"Opera",dolfin:"Dolfin",webosbrowser:"webOSBrowser",chromeMobile:"ChromeMobile",silk:"Silk",other:"Other"},engineNames:{webkit:"WebKit",gecko:"Gecko",presto:"Presto",trident:"Trident",other:"Other"},enginePrefixes:{webkit:"AppleWebKit/",gecko:"Gecko/",presto:"Presto/",trident:"Trident/"},browserPrefixes:{ie:"MSIE ",firefox:"Firefox/",chrome:"Chrome/",safari:"Version/",opera:"Opera/",dolfin:"Dolfin/",webosbrowser:"wOSBrowser/",chromeMobile:"CrMo/",silk:"Silk/"}},styleDashPrefixes:{WebKit:"-webkit-",Gecko:"-moz-",Trident:"-ms-",Presto:"-o-",Other:""},stylePrefixes:{WebKit:"Webkit",Gecko:"Moz",Trident:"ms",Presto:"O",Other:""},propertyPrefixes:{WebKit:"webkit",Gecko:"moz",Trident:"ms",Presto:"o",Other:""},is:Ext.emptyFn,name:null,version:null,engineName:null,engineVersion:null,setFlag:function(a,b){if(typeof b=="undefined"){b=true}this.is[a]=b;this.is[a.toLowerCase()]=b;return this},constructor:function(o){this.userAgent=o;e=this.is=function(i){return e[i]===true};var k=this.statics(),c=o.match(new RegExp("((?:"+Ext.Object.getValues(k.browserPrefixes).join(")|(?:")+"))([\\w\\._]+)")),b=o.match(new RegExp("((?:"+Ext.Object.getValues(k.enginePrefixes).join(")|(?:")+"))([\\w\\._]+)")),g=k.browserNames,j=g.other,f=k.engineNames,n=f.other,m="",l="",h=false,e,d,a;if(c){j=g[Ext.Object.getKey(k.browserPrefixes,c[1])];m=new Ext.Version(c[2])}if(b){n=f[Ext.Object.getKey(k.enginePrefixes,b[1])];l=new Ext.Version(b[2])}Ext.apply(this,{engineName:n,engineVersion:l,name:j,version:m});this.setFlag(j);if(m){this.setFlag(j+(m.getMajor()||""));this.setFlag(j+m.getShortVersion())}for(d in g){if(g.hasOwnProperty(d)){a=g[d];this.setFlag(a,j===a)}}this.setFlag(a);if(l){this.setFlag(n+(l.getMajor()||""));this.setFlag(n+l.getShortVersion())}for(d in f){if(f.hasOwnProperty(d)){a=f[d];this.setFlag(a,n===a)}}this.setFlag("Standalone",!!navigator.standalone);if(typeof window.PhoneGap!="undefined"){h=true;this.setFlag("PhoneGap")}else{if(!!window.isNK){h=true;this.setFlag("Sencha")}}this.setFlag("WebView",h);this.isStrict=document.compatMode=="CSS1Compat";this.isSecure=/^https/i.test(window.location.protocol);return this},getStyleDashPrefix:function(){return this.styleDashPrefixes[this.engineName]},getStylePrefix:function(){return this.stylePrefixes[this.engineName]},getVendorProperyName:function(a){var b=this.propertyPrefixes[this.engineName];if(b.length>0){return b+Ext.String.capitalize(a)}return a}},function(){var a=Ext.browser=new this(Ext.global.navigator.userAgent)});Ext.define("Ext.env.OS",{requires:["Ext.Version"],statics:{names:{ios:"iOS",android:"Android",webos:"webOS",blackberry:"BlackBerry",rimTablet:"RIMTablet",mac:"MacOS",win:"Windows",linux:"Linux",bada:"Bada",other:"Other"},prefixes:{ios:"i(?:Pad|Phone|Pod)(?:.*)CPU(?: iPhone)? OS ",android:"(Android |HTC_|Silk/)",blackberry:"BlackBerry(?:.*)Version/",rimTablet:"RIM Tablet OS ",webos:"(?:webOS|hpwOS)/",bada:"Bada/"}},is:Ext.emptyFn,name:null,version:null,setFlag:function(a,b){if(typeof b=="undefined"){b=true}this.is[a]=b;this.is[a.toLowerCase()]=b;return this},constructor:function(m,b){var k=this.statics(),j=k.names,c=k.prefixes,a,h="",d,g,f,l,e;e=this.is=function(i){return this.is[i]===true};for(d in c){if(c.hasOwnProperty(d)){g=c[d];f=m.match(new RegExp("(?:"+g+")([^\\s;]+)"));if(f){a=j[d];if(f[1]&&(f[1]=="HTC_"||f[1]=="Silk/")){h=new Ext.Version("2.3")}else{h=new Ext.Version(f[f.length-1])}break}}}if(!a){a=j[(m.toLowerCase().match(/mac|win|linux/)||["other"])[0]];h=new Ext.Version("")}this.name=a;this.version=h;if(b){this.setFlag(b)}this.setFlag(a);if(h){this.setFlag(a+(h.getMajor()||""));this.setFlag(a+h.getShortVersion())}for(d in j){if(j.hasOwnProperty(d)){l=j[d];if(!e.hasOwnProperty(a)){this.setFlag(l,(a===l))}}}return this}},function(){var a=Ext.global.navigator,e=a.userAgent,b,g,d;Ext.os=b=new this(e,a.platform);g=b.name;var c=window.location.search.match(/deviceType=(Tablet|Phone)/),f=window.deviceType;if(c&&c[1]){d=c[1]}else{if(f==="iPhone"){d="Phone"}else{if(f==="iPad"){d="Tablet"}else{if(!b.is.Android&&!b.is.iOS&&/Windows|Linux|MacOS/.test(g)){d="Desktop"}else{if(b.is.iPad||b.is.Android3||(b.is.Android4&&e.search(/mobile/i)==-1)){d="Tablet"}else{d="Phone"}}}}}b.setFlag(d,true);b.deviceType=d});Ext.define("Ext.env.Feature",{requires:["Ext.env.Browser","Ext.env.OS"],constructor:function(){this.testElements={};this.has=function(a){return !!this.has[a]};return this},getTestElement:function(a,b){if(a===undefined){a="div"}else{if(typeof a!=="string"){return a}}if(b){return document.createElement(a)}if(!this.testElements[a]){this.testElements[a]=document.createElement(a)}return this.testElements[a]},isStyleSupported:function(c,b){var d=this.getTestElement(b).style,a=Ext.String.capitalize(c);if(typeof d[c]!=="undefined"||typeof d[Ext.browser.getStylePrefix(c)+a]!=="undefined"){return true}return false},isEventSupported:function(c,a){if(a===undefined){a=window}var e=this.getTestElement(a),b="on"+c.toLowerCase(),d=(b in e);if(!d){if(e.setAttribute&&e.removeAttribute){e.setAttribute(b,"");d=typeof e[b]==="function";if(typeof e[b]!=="undefined"){e[b]=undefined}e.removeAttribute(b)}}return d},getSupportedPropertyName:function(b,a){var c=Ext.browser.getVendorProperyName(a);if(c in b){return c}else{if(a in b){return a}}return null},registerTest:Ext.Function.flexSetter(function(a,b){this.has[a]=b.call(this);return this})},function(){Ext.feature=new this;var a=Ext.feature.has;Ext.feature.registerTest({Canvas:function(){var b=this.getTestElement("canvas");return !!(b&&b.getContext&&b.getContext("2d"))},Svg:function(){var b=document;return !!(b.createElementNS&&!!b.createElementNS("http://www.w3.org/2000/svg","svg").createSVGRect)},Vml:function(){var c=this.getTestElement(),b=false;c.innerHTML="<!--[if vml]><br><![endif]-->";b=(c.childNodes.length===1);c.innerHTML="";return b},Touch:function(){return this.isEventSupported("touchstart")&&!(Ext.os&&Ext.os.name.match(/Windows|MacOSX|Linux/))},Orientation:function(){return("orientation" in window)&&this.isEventSupported("orientationchange")},OrientationChange:function(){return this.isEventSupported("orientationchange")},DeviceMotion:function(){return this.isEventSupported("devicemotion")},Geolocation:function(){return"geolocation" in window.navigator},SqlDatabase:function(){return"openDatabase" in window},WebSockets:function(){return"WebSocket" in window},Range:function(){return !!document.createRange},CreateContextualFragment:function(){var b=!!document.createRange?document.createRange():false;return b&&!!b.createContextualFragment},History:function(){return("history" in window&&"pushState" in window.history)},CssTransforms:function(){return this.isStyleSupported("transform")},Css3dTransforms:function(){return this.has("CssTransforms")&&this.isStyleSupported("perspective")&&!Ext.os.is.Android2},CssAnimations:function(){return this.isStyleSupported("animationName")},CssTransitions:function(){return this.isStyleSupported("transitionProperty")},Audio:function(){return !!this.getTestElement("audio").canPlayType},Video:function(){return !!this.getTestElement("video").canPlayType},ClassList:function(){return"classList" in this.getTestElement()}})});Ext.define("Ext.dom.Query",{select:function(h,b){var g=[],d,f,e,c,a;b=b||document;if(typeof b=="string"){b=document.getElementById(b)}h=h.split(",");for(f=0,c=h.length;f<c;f++){if(typeof h[f]=="string"){if(h[f][0]=="@"){d=b.getAttributeNode(h[f].substring(1));g.push(d)}else{d=b.querySelectorAll(h[f]);for(e=0,a=d.length;e<a;e++){g.push(d[e])}}}}return g},selectNode:function(b,a){return this.select(b,a)[0]},is:function(a,b){if(typeof a=="string"){a=document.getElementById(a)}return this.select(b).indexOf(a)!==-1},isXml:function(a){var b=(a?a.ownerDocument||a:0).documentElement;return b?b.nodeName!=="HTML":false}},function(){Ext.ns("Ext.core");Ext.core.DomQuery=Ext.DomQuery=new this();Ext.query=Ext.Function.alias(Ext.DomQuery,"select")});Ext.define("Ext.dom.Helper",{emptyTags:/^(?:br|frame|hr|img|input|link|meta|range|spacer|wbr|area|param|col)$/i,confRe:/tag|children|cn|html|tpl|tplData$/i,endRe:/end/i,attribXlat:{cls:"class",htmlFor:"for"},closeTags:{},decamelizeName:function(){var c=/([a-z])([A-Z])/g,b={};function a(d,f,e){return f+"-"+e.toLowerCase()}return function(d){return b[d]||(b[d]=d.replace(c,a))}}(),generateMarkup:function(d,c){var g=this,b,h,a,e,f;if(typeof d=="string"){c.push(d)}else{if(Ext.isArray(d)){for(e=0;e<d.length;e++){if(d[e]){g.generateMarkup(d[e],c)}}}else{a=d.tag||"div";c.push("<",a);for(b in d){if(d.hasOwnProperty(b)){h=d[b];if(!g.confRe.test(b)){if(typeof h=="object"){c.push(" ",b,'="');g.generateStyles(h,c).push('"')}else{c.push(" ",g.attribXlat[b]||b,'="',h,'"')}}}}if(g.emptyTags.test(a)){c.push("/>")}else{c.push(">");if((h=d.tpl)){h.applyOut(d.tplData,c)}if((h=d.html)){c.push(h)}if((h=d.cn||d.children)){g.generateMarkup(h,c)}f=g.closeTags;c.push(f[a]||(f[a]="</"+a+">"))}}}return c},generateStyles:function(e,c){var b=c||[],d;for(d in e){if(e.hasOwnProperty(d)){b.push(this.decamelizeName(d),":",e[d],";")}}return c||b.join("")},markup:function(a){if(typeof a=="string"){return a}var b=this.generateMarkup(a,[]);return b.join("")},applyStyles:function(a,b){Ext.fly(a).applyStyles(b)},createContextualFragment:function(c){var f=document.createElement("div"),a=document.createDocumentFragment(),b=0,d,e;f.innerHTML=c;e=f.childNodes;d=e.length;for(;b<d;b++){a.appendChild(e[b].cloneNode(true))}return a},insertHtml:function(d,a,e){var h,f,i,c,b,g;d=d.toLowerCase();if(Ext.isTextNode(a)){if(d=="afterbegin"){d="beforebegin"}else{if(d=="beforeend"){d="afterend"}}}b=d=="beforebegin";g=d=="afterbegin";f=Ext.feature.has.CreateContextualFragment?a.ownerDocument.createRange():undefined;h="setStart"+(this.endRe.test(d)?"After":"Before");if(b||d=="afterend"){if(f){f[h](a);i=f.createContextualFragment(e)}else{i=this.createContextualFragment(e)}a.parentNode.insertBefore(i,b?a:a.nextSibling);return a[(b?"previous":"next")+"Sibling"]}else{c=(g?"first":"last")+"Child";if(a.firstChild){if(f){f[h](a[c]);i=f.createContextualFragment(e)}else{i=this.createContextualFragment(e)}if(g){a.insertBefore(i,a.firstChild)}else{a.appendChild(i)}}else{a.innerHTML=e}return a[c]}},insertBefore:function(a,c,b){return this.doInsert(a,c,b,"beforebegin")},insertAfter:function(a,c,b){return this.doInsert(a,c,b,"afterend")},insertFirst:function(a,c,b){return this.doInsert(a,c,b,"afterbegin")},append:function(a,c,b){return this.doInsert(a,c,b,"beforeend")},overwrite:function(a,c,b){a=Ext.getDom(a);a.innerHTML=this.markup(c);return b?Ext.get(a.firstChild):a.firstChild},doInsert:function(b,d,c,e){var a=this.insertHtml(e,Ext.getDom(b),this.markup(d));return c?Ext.get(a,true):a},createTemplate:function(b){var a=this.markup(b);return new Ext.Template(a)}},function(){Ext.ns("Ext.core");Ext.core.DomHelper=Ext.DomHelper=new this});Ext.define("Ext.mixin.Identifiable",{statics:{uniqueIds:{}},isIdentifiable:true,mixinId:"identifiable",idCleanRegex:/\.|[^\w\-]/g,defaultIdPrefix:"ext-",defaultIdSeparator:"-",getOptimizedId:function(){return this.id},getUniqueId:function(){var f=this.id,b,d,e,a,c;if(!f){b=this.self.prototype;d=this.defaultIdSeparator;a=Ext.mixin.Identifiable.uniqueIds;if(!b.hasOwnProperty("identifiablePrefix")){e=this.xtype;if(e){c=this.defaultIdPrefix+e+d}else{c=b.$className.replace(this.idCleanRegex,d).toLowerCase()+d}b.identifiablePrefix=c}c=this.identifiablePrefix;if(!a.hasOwnProperty(c)){a[c]=0}f=this.id=c+(++a[c])}this.getUniqueId=this.getOptimizedId;return f},setId:function(a){this.id=a},getId:function(){var a=this.id;if(!a){a=this.getUniqueId()}this.getId=this.getOptimizedId;return a}});Ext.define("Ext.dom.Element",{alternateClassName:"Ext.Element",mixins:["Ext.mixin.Identifiable"],requires:["Ext.dom.Query","Ext.dom.Helper"],observableType:"element",xtype:"element",statics:{CREATE_ATTRIBUTES:{style:"style",className:"className",cls:"cls",classList:"classList",text:"text",hidden:"hidden",html:"html",children:"children"},create:function(c,b){var f=this.CREATE_ATTRIBUTES,e,h,k,j,a,d,g;if(!c){c={}}if(c.isElement){return c.dom}else{if("nodeType" in c){return c}}if(typeof c=="string"){return document.createTextNode(c)}k=c.tag;if(!k){k="div"}e=document.createElement(k);h=e.style;for(a in c){if(a!="tag"&&c.hasOwnProperty(a)){j=c[a];switch(a){case f.style:if(typeof j=="string"){e.setAttribute(a,j)}else{for(d in j){if(j.hasOwnProperty(d)){h[d]=j[d]}}}break;case f.className:case f.cls:e.className=j;break;case f.classList:e.className=j.join(" ");break;case f.text:e.textContent=j;break;case f.hidden:if(j){e.style.display="none"}break;case f.html:e.innerHTML=j;break;case f.children:for(d=0,g=j.length;d<g;d++){e.appendChild(this.create(j[d],true))}break;default:e.setAttribute(a,j)}}}if(b){return e}else{return this.get(e)}},documentElement:null,cache:{},get:function(c){var b=this.cache,a,d,e;if(!c){return null}if(typeof c=="string"){if(b.hasOwnProperty(c)){return b[c]}if(!(d=document.getElementById(c))){return null}b[c]=a=new this(d);return a}if("tagName" in c){e=c.id;if(b.hasOwnProperty(e)){return b[e]}a=new this(c);b[a.getId()]=a;return a}if(c.isElement){return c}if(c.isComposite){return c}if(Ext.isArray(c)){return this.select(c)}if(c===document){if(!this.documentElement){this.documentElement=new this(document.documentElement);this.documentElement.setId("ext-application")}return this.documentElement}return null},data:function(c,b,e){var a=Ext.cache,f,d;c=this.get(c);if(!c){return null}f=c.id;d=a[f].data;if(!d){a[f].data=d={}}if(arguments.length==2){return d[b]}else{return(d[b]=e)}}},isElement:true,constructor:function(a){if(typeof a=="string"){a=document.getElementById(a)}if(!a){throw new Error("Invalid domNode reference or an id of an existing domNode: "+a)}this.dom=a;this.getUniqueId()},attach:function(a){this.dom=a;this.id=a.id;return this},getUniqueId:function(){var b=this.id,a;if(!b){a=this.dom;if(a.id.length>0){this.id=b=a.id}else{a.id=b=this.mixins.identifiable.getUniqueId.call(this)}this.self.cache[b]=this}return b},setId:function(c){var a=this.id,b=this.self.cache;if(a){delete b[a]}this.dom.id=c;this.id=c;b[c]=this;return this},setHtml:function(a){this.dom.innerHTML=a},getHtml:function(){return this.dom.innerHTML},setText:function(a){this.dom.textContent=a},redraw:function(){var b=this.dom,a=b.style;a.display="none";b.offsetHeight;a.display=""},isPainted:function(){return Boolean(this.dom.offsetParent)},set:function(a,b){var e=this.dom,c,d;for(c in a){if(a.hasOwnProperty(c)){d=a[c];if(c=="style"){this.applyStyles(d)}else{if(c=="cls"){e.className=d}else{if(b!==false){if(d===undefined){e.removeAttribute(c)}else{e.setAttribute(c,d)}}else{e[c]=d}}}}}return this},is:function(a){return Ext.DomQuery.is(this.dom,a)},getValue:function(b){var a=this.dom.value;return b?parseInt(a,10):a},getAttribute:function(a,b){var c=this.dom;return c.getAttributeNS(b,a)||c.getAttribute(b+":"+a)||c.getAttribute(a)||c[a]},destroy:function(){this.isDestroyed=true;var a=Ext.Element.cache,b=this.dom;if(b&&b.parentNode&&b.tagName!="BODY"){b.parentNode.removeChild(b)}delete a[this.id];delete this.dom}},function(a){Ext.elements=Ext.cache=a.cache;this.addStatics({Fly:new Ext.Class({extend:a,constructor:function(b){this.dom=b}}),_flyweights:{},fly:function(d,b){var e=null,c=a._flyweights;b=b||"_global";d=Ext.getDom(d);if(d){e=c[b]||(c[b]=new a.Fly());e.dom=d;e.isSynchronized=false}return e}});Ext.get=function(b){return a.get.call(a,b)};Ext.fly=function(){return a.fly.apply(a,arguments)};Ext.ClassManager.onCreated(function(){a.mixin("observable",Ext.mixin.Observable)},null,"Ext.mixin.Observable")});Ext.dom.Element.addStatics({unitRe:/\d+(px|em|%|en|ex|pt|in|cm|mm|pc)$/i,camelRe:/(-[a-z])/gi,cssRe:/([a-z0-9-]+)\s*:\s*([^;\s]+(?:\s*[^;\s]+)*);?/gi,opacityRe:/alpha\(opacity=(.*)\)/i,propertyCache:{},defaultUnit:"px",borders:{l:"border-left-width",r:"border-right-width",t:"border-top-width",b:"border-bottom-width"},paddings:{l:"padding-left",r:"padding-right",t:"padding-top",b:"padding-bottom"},margins:{l:"margin-left",r:"margin-right",t:"margin-top",b:"margin-bottom"},addUnits:function(b,a){if(Ext.isNumber(b)){return b+(a||this.defaultUnit||"px")}if(b===""||b=="auto"||b===undefined||b===null){return b||""}if(!this.unitRe.test(b)){return b||""}return b},isAncestor:function(b,d){var a=false;b=Ext.getDom(b);d=Ext.getDom(d);if(b&&d){if(b.contains){return b.contains(d)}else{if(b.compareDocumentPosition){return !!(b.compareDocumentPosition(d)&16)}else{while((d=d.parentNode)){a=d==b||a}}}}return a},parseBox:function(b){if(typeof b!="string"){b=b.toString()}var c=b.split(" "),a=c.length;if(a==1){c[1]=c[2]=c[3]=c[0]}else{if(a==2){c[2]=c[0];c[3]=c[1]}else{if(a==3){c[3]=c[1]}}}return{top:parseFloat(c[0])||0,right:parseFloat(c[1])||0,bottom:parseFloat(c[2])||0,left:parseFloat(c[3])||0}},unitizeBox:function(f,e){var d=this.addUnits,c=this.parseBox(f);return d(c.top,e)+" "+d(c.right,e)+" "+d(c.bottom,e)+" "+d(c.left,e)},camelReplaceFn:function(b,c){return c.charAt(1).toUpperCase()},normalize:function(a){return this.propertyCache[a]||(this.propertyCache[a]=a.replace(this.camelRe,this.camelReplaceFn))},fromPoint:function(a,b){return Ext.get(document.elementFromPoint(a,b))},parseStyles:function(c){var a={},b=this.cssRe,d;if(c){b.lastIndex=0;while((d=b.exec(c))){a[d[1]]=d[2]}}return a}});Ext.dom.Element.addMembers({appendChild:function(a){this.dom.appendChild(Ext.getDom(a));return this},removeChild:function(a){this.dom.removeChild(Ext.getDom(a));return this},append:function(){this.appendChild.apply(this,arguments)},appendTo:function(a){Ext.getDom(a).appendChild(this.dom);return this},insertBefore:function(a){a=Ext.getDom(a);a.parentNode.insertBefore(this.dom,a);return this},insertAfter:function(a){a=Ext.getDom(a);a.parentNode.insertBefore(this.dom,a.nextSibling);return this},insertFirst:function(b){var a=Ext.getDom(b),d=this.dom,c=d.firstChild;if(!c){d.appendChild(a)}else{d.insertBefore(a,c)}return this},insertSibling:function(e,c,d){var f=this,b,a=(c||"before").toLowerCase()=="after",g;if(Ext.isArray(e)){g=f;Ext.each(e,function(h){b=Ext.fly(g,"_internal").insertSibling(h,c,d);if(a){g=b}});return b}e=e||{};if(e.nodeType||e.dom){b=f.dom.parentNode.insertBefore(Ext.getDom(e),a?f.dom.nextSibling:f.dom);if(!d){b=Ext.get(b)}}else{if(a&&!f.dom.nextSibling){b=Ext.core.DomHelper.append(f.dom.parentNode,e,!d)}else{b=Ext.core.DomHelper[a?"insertAfter":"insertBefore"](f.dom,e,!d)}}return b},replace:function(a){a=Ext.get(a);this.insertBefore(a);a.remove();return this},replaceWith:function(a){var b=this;if(a.nodeType||a.dom||typeof a=="string"){a=Ext.get(a);b.dom.parentNode.insertBefore(a,b.dom)}else{a=Ext.core.DomHelper.insertBefore(b.dom,a)}delete Ext.cache[b.id];Ext.removeNode(b.dom);b.id=Ext.id(b.dom=a);Ext.dom.Element.addToCache(b.isFlyweight?new Ext.dom.Element(b.dom):b);return b},createChild:function(b,a,c){b=b||{tag:"div"};if(a){return Ext.core.DomHelper.insertBefore(a,b,c!==true)}else{return Ext.core.DomHelper[!this.dom.firstChild?"insertFirst":"append"](this.dom,b,c!==true)}},wrap:function(b,c){var e=this.dom,f=this.self.create(b,c),d=(c)?f:f.dom,a=e.parentNode;if(a){a.insertBefore(d,e)}d.appendChild(e);return f},wrapAllChildren:function(a){var d=this.dom,b=d.childNodes,e=this.self.create(a),c=e.dom;while(b.length>0){c.appendChild(d.firstChild)}d.appendChild(c);return e},unwrapAllChildren:function(){var c=this.dom,b=c.childNodes,a=c.parentNode;if(a){while(b.length>0){a.insertBefore(c,c.firstChild)}this.destroy()}},unwrap:function(){var c=this.dom,a=c.parentNode,b;if(a){b=a.parentNode;b.insertBefore(c,a);b.removeChild(a)}else{b=document.createDocumentFragment();b.appendChild(c)}return this},insertHtml:function(b,c,a){var d=Ext.core.DomHelper.insertHtml(b,this.dom,c);return a?Ext.get(d):d}});Ext.dom.Element.override({getX:function(a){return this.getXY(a)[0]},getY:function(a){return this.getXY(a)[1]},getXY:function(){var a=window.webkitConvertPointFromNodeToPage;if(a){return function(){var b=a(this.dom,new WebKitPoint(0,0));return[b.x,b.y]}}else{return function(){var c=this.dom.getBoundingClientRect(),b=Math.round;return[b(c.left+window.pageXOffset),b(c.top+window.pageYOffset)]}}}(),getOffsetsTo:function(a){var c=this.getXY(),b=Ext.fly(a,"_internal").getXY();return[c[0]-b[0],c[1]-b[1]]},setX:function(a){return this.setXY([a,this.getY()])},setY:function(a){return this.setXY([this.getX(),a])},setXY:function(d){var b=this;if(arguments.length>1){d=[d,arguments[1]]}var c=b.translatePoints(d),a=b.dom.style;for(d in c){if(!c.hasOwnProperty(d)){continue}if(!isNaN(c[d])){a[d]=c[d]+"px"}}return b},getLeft:function(){return parseInt(this.getStyle("left"),10)||0},getRight:function(){return parseInt(this.getStyle("right"),10)||0},getTop:function(){return parseInt(this.getStyle("top"),10)||0},getBottom:function(){return parseInt(this.getStyle("bottom"),10)||0},translatePoints:function(a,g){g=isNaN(a[1])?g:a[1];a=isNaN(a[0])?a:a[0];var d=this,e=d.isStyle("position","relative"),f=d.getXY(),b=parseInt(d.getStyle("left"),10),c=parseInt(d.getStyle("top"),10);b=!isNaN(b)?b:(e?0:d.dom.offsetLeft);c=!isNaN(c)?c:(e?0:d.dom.offsetTop);return{left:(a-f[0]+b),top:(g-f[1]+c)}},setBox:function(d){var c=this,b=d.width,a=d.height,f=d.top,e=d.left;if(e!==undefined){c.setLeft(e)}if(f!==undefined){c.setTop(f)}if(b!==undefined){c.setWidth(b)}if(a!==undefined){c.setHeight(a)}return this},getBox:function(g,j){var h=this,e=h.dom,c=e.offsetWidth,k=e.offsetHeight,n,f,d,a,m,i;if(!j){n=h.getXY()}else{if(g){n=[0,0]}else{n=[parseInt(h.getStyle("left"),10)||0,parseInt(h.getStyle("top"),10)||0]}}if(!g){f={x:n[0],y:n[1],0:n[0],1:n[1],width:c,height:k}}else{d=h.getBorderWidth.call(h,"l")+h.getPadding.call(h,"l");a=h.getBorderWidth.call(h,"r")+h.getPadding.call(h,"r");m=h.getBorderWidth.call(h,"t")+h.getPadding.call(h,"t");i=h.getBorderWidth.call(h,"b")+h.getPadding.call(h,"b");f={x:n[0]+d,y:n[1]+m,0:n[0]+d,1:n[1]+m,width:c-(d+a),height:k-(m+i)}}f.left=f.x;f.top=f.y;f.right=f.x+f.width;f.bottom=f.y+f.height;return f},getPageBox:function(e){var g=this,c=g.dom,j=c.offsetWidth,f=c.offsetHeight,m=g.getXY(),k=m[1],a=m[0]+j,i=m[1]+f,d=m[0];if(!c){return new Ext.util.Region()}if(e){return new Ext.util.Region(k,a,i,d)}else{return{left:d,top:k,width:j,height:f,right:a,bottom:i}}}});Ext.dom.Element.addMembers({WIDTH:"width",HEIGHT:"height",MIN_WIDTH:"min-width",MIN_HEIGHT:"min-height",MAX_WIDTH:"max-width",MAX_HEIGHT:"max-height",TOP:"top",RIGHT:"right",BOTTOM:"bottom",LEFT:"left",VISIBILITY:1,DISPLAY:2,OFFSETS:3,SEPARATOR:"-",trimRe:/^\s+|\s+$/g,wordsRe:/\w/g,spacesRe:/\s+/,styleSplitRe:/\s*(?::|;)\s*/,transparentRe:/^(?:transparent|(?:rgba[(](?:\s*\d+\s*[,]){3}\s*0\s*[)]))$/i,classNameSplitRegex:/[\s]+/,borders:{t:"border-top-width",r:"border-right-width",b:"border-bottom-width",l:"border-left-width"},paddings:{t:"padding-top",r:"padding-right",b:"padding-bottom",l:"padding-left"},margins:{t:"margin-top",r:"margin-right",b:"margin-bottom",l:"margin-left"},defaultUnit:"px",isSynchronized:false,synchronize:function(){var g=this.dom,a={},d=g.className,f,c,e,b;if(d.length>0){f=g.className.split(this.classNameSplitRegex);for(c=0,e=f.length;c<e;c++){b=f[c];a[b]=true}}else{f=[]}this.classList=f;this.hasClassMap=a;this.isSynchronized=true;return this},addCls:function(j,g,k){if(!j){return this}if(!this.isSynchronized){this.synchronize()}var e=this.dom,c=this.hasClassMap,d=this.classList,a=this.SEPARATOR,f,h,b;g=g?g+a:"";k=k?a+k:"";if(typeof j=="string"){j=j.split(this.spacesRe)}for(f=0,h=j.length;f<h;f++){b=g+j[f]+k;if(!c[b]){c[b]=true;d.push(b)}}e.className=d.join(" ");return this},removeCls:function(j,g,k){if(!j){return this}if(!this.isSynchronized){this.synchronize()}if(!k){k=""}var e=this.dom,c=this.hasClassMap,d=this.classList,a=this.SEPARATOR,f,h,b;g=g?g+a:"";k=k?a+k:"";if(typeof j=="string"){j=j.split(this.spacesRe)}for(f=0,h=j.length;f<h;f++){b=g+j[f]+k;if(c[b]){delete c[b];Ext.Array.remove(d,b)}}e.className=d.join(" ");return this},replaceCls:function(b,a,c,d){return this.removeCls(b,c,d).addCls(a,c,d)},hasCls:function(a){if(!this.isSynchronized){this.synchronize()}return this.hasClassMap.hasOwnProperty(a)},toggleCls:function(a){return this.hasCls(a)?this.removeCls(a):this.addCls(a)},setWidth:function(a){return this.setLengthValue(this.WIDTH,a)},setHeight:function(a){return this.setLengthValue(this.HEIGHT,a)},setSize:function(b,a){if(Ext.isObject(b)){a=b.height;b=b.width}this.setWidth(b);this.setHeight(a);return this},setMinWidth:function(a){return this.setLengthValue(this.MIN_WIDTH,a)},setMinHeight:function(a){return this.setLengthValue(this.MIN_HEIGHT,a)},setMaxWidth:function(a){return this.setLengthValue(this.MAX_WIDTH,a)},setMaxHeight:function(a){return this.setLengthValue(this.MAX_HEIGHT,a)},setTop:function(a){return this.setLengthValue(this.TOP,a)},setRight:function(a){return this.setLengthValue(this.RIGHT,a)},setBottom:function(a){return this.setLengthValue(this.BOTTOM,a)},setLeft:function(a){return this.setLengthValue(this.LEFT,a)},setMargin:function(b){var a=this.dom.style;if(b||b===0){b=this.self.unitizeBox((b===true)?5:b);a.setProperty("margin",b,"important")}else{a.removeProperty("margin-top");a.removeProperty("margin-right");a.removeProperty("margin-bottom");a.removeProperty("margin-left")}},setPadding:function(b){var a=this.dom.style;if(b||b===0){b=this.self.unitizeBox((b===true)?5:b);a.setProperty("padding",b,"important")}else{a.removeProperty("padding-top");a.removeProperty("padding-right");a.removeProperty("padding-bottom");a.removeProperty("padding-left")}},setBorder:function(a){var b=this.dom.style;if(a||a===0){a=this.self.unitizeBox((a===true)?1:a);b.setProperty("border-width",a,"important")}else{b.removeProperty("border-top-width");b.removeProperty("border-right-width");b.removeProperty("border-bottom-width");b.removeProperty("border-left-width")}},setLengthValue:function(a,c){var b=this.dom.style;if(c===null){b.removeProperty(a);return this}if(typeof c=="number"){c=c+"px"}b.setProperty(a,c,"important");return this},setVisible:function(b){var a=this.getVisibilityMode(),c=b?"removeCls":"addCls";switch(a){case this.VISIBILITY:this.removeCls(["x-hidden-display","x-hidden-offsets"]);this[c]("x-hidden-visibility");break;case this.DISPLAY:this.removeCls(["x-hidden-visibility","x-hidden-offsets"]);this[c]("x-hidden-display");break;case this.OFFSETS:this.removeCls(["x-hidden-visibility","x-hidden-display"]);this[c]("x-hidden-offsets");break}return this},getVisibilityMode:function(){var b=this.dom,a=Ext.dom.Element.data(b,"visibilityMode");if(a===undefined){Ext.dom.Element.data(b,"visibilityMode",a=this.DISPLAY)}return a},setVisibilityMode:function(a){this.self.data(this.dom,"visibilityMode",a);return this},show:function(){var a=this.dom;if(a){a.style.removeProperty("display")}},hide:function(){var c=this.dom,b=c.style,a=Ext.os.is.iOS5;if(b.getPropertyValue("display")!=="none"){if(a){b.setProperty("display","none","important");c.offsetHeight;b.removeProperty("display");c.offsetHeight}b.setProperty("display","none","important")}},setVisibility:function(a){var b=this.dom.style;if(a){b.removeProperty("visibility")}else{b.setProperty("visibility","hidden","important")}},styleHooks:{},addStyles:function(h,g){var b=0,f=h.match(this.wordsRe),e=0,a=f.length,d,c;for(;e<a;e++){d=f[e];c=d&&parseInt(this.getStyle(g[d]),10);if(c){b+=Math.abs(c)}}return b},isStyle:function(a,b){return this.getStyle(a)==b},getStyle:function(f){var c=this,e=c.dom,d=c.styleHooks[f],b,a;if(e==document){return null}if(!d){c.styleHooks[f]=d={name:this.self.normalize(f)}}if(d.get){return d.get(e,c)}b=window.getComputedStyle(e,"");a=(b&&b[d.name]);return a},setStyle:function(a,h){var f=this,d=f.dom,i=f.styleHooks,b=d.style,e=Ext.valueFrom,c,g;if(typeof a=="string"){g=i[a];if(!g){i[a]=g={name:Ext.dom.Element.normalize(a)}}h=e(h,"");if(g.set){g.set(d,h,f)}else{b[g.name]=h}}else{for(c in a){if(a.hasOwnProperty(c)){g=i[c];if(!g){i[c]=g={name:Ext.dom.Element.normalize(c)}}h=e(a[c],"");if(g.set){g.set(d,h,f)}else{b[g.name]=h}}}}return f},getHeight:function(b){var c=this.dom,a=b?(c.clientHeight-this.getPadding("tb")):c.offsetHeight;return a>0?a:0},getWidth:function(a){var c=this.dom,b=a?(c.clientWidth-this.getPadding("lr")):c.offsetWidth;return b>0?b:0},getBorderWidth:function(a){return this.addStyles(a,this.borders)},getPadding:function(a){return this.addStyles(a,this.paddings)},applyStyles:function(d){if(d){var e=this.dom,c,b,a;if(typeof d=="function"){d=d.call()}c=typeof d;if(c=="string"){d=Ext.util.Format.trim(d).split(this.styleSplitRe);for(b=0,a=d.length;b<a;){e.style[Ext.dom.Element.normalize(d[b++])]=d[b++]}}else{if(c=="object"){this.setStyle(d)}}}},getSize:function(b){var a=this.dom;return{width:Math.max(0,b?(a.clientWidth-this.getPadding("lr")):a.offsetWidth),height:Math.max(0,b?(a.clientHeight-this.getPadding("tb")):a.offsetHeight)}},repaint:function(){var a=this.dom;this.addCls(Ext.baseCSSPrefix+"repaint");setTimeout(function(){Ext.fly(a).removeCls(Ext.baseCSSPrefix+"repaint")},1);return this},getMargin:function(b){var c=this,d={t:"top",l:"left",r:"right",b:"bottom"},e={},a;if(!b){for(a in c.margins){e[d[a]]=parseFloat(c.getStyle(c.margins[a]))||0}return e}else{return c.addStyles.call(c,b,c.margins)}}});Ext.dom.Element.addMembers({getParent:function(){return Ext.get(this.dom.parentNode)},getFirstChild:function(){return Ext.get(this.dom.firstElementChild)},contains:function(a){if(!a){return false}var b=Ext.getDom(a);return(b===this.dom)||this.self.isAncestor(this.dom,b)},findParent:function(h,g,c){var e=this.dom,a=document.body,f=0,d;g=g||50;if(isNaN(g)){d=Ext.getDom(g);g=Number.MAX_VALUE}while(e&&e.nodeType==1&&f<g&&e!=a&&e!=d){if(Ext.DomQuery.is(e,h)){return c?Ext.get(e):e}f++;e=e.parentNode}return null},findParentNode:function(d,c,a){var b=Ext.fly(this.dom.parentNode,"_internal");return b?b.findParent(d,c,a):null},up:function(b,a){return this.findParentNode(b,a,true)},select:function(a,b){return Ext.dom.Element.select(a,this.dom,b)},query:function(a){return Ext.DomQuery.select(a,this.dom)},down:function(a,b){var c=Ext.DomQuery.selectNode(a,this.dom);return b?c:Ext.get(c)},child:function(a,b){var d,c=this,e;e=Ext.get(c).id;e=e.replace(/[\.:]/g,"\\$0");d=Ext.DomQuery.selectNode("#"+e+" > "+a,c.dom);return b?d:Ext.get(d)},parent:function(a,b){return this.matchNode("parentNode","parentNode",a,b)},next:function(a,b){return this.matchNode("nextSibling","nextSibling",a,b)},prev:function(a,b){return this.matchNode("previousSibling","previousSibling",a,b)},first:function(a,b){return this.matchNode("nextSibling","firstChild",a,b)},last:function(a,b){return this.matchNode("previousSibling","lastChild",a,b)},matchNode:function(b,e,a,c){if(!this.dom){return null}var d=this.dom[e];while(d){if(d.nodeType==1&&(!a||Ext.DomQuery.is(d,a))){return !c?Ext.get(d):d}d=d[b]}return null},isAncestor:function(a){return this.self.isAncestor.call(this.self,this.dom,a)}});Ext.define("Ext.dom.CompositeElementLite",{alternateClassName:["Ext.CompositeElementLite","Ext.CompositeElement"],requires:["Ext.dom.Element"],statics:{importElementMethods:function(){}},constructor:function(b,a){this.elements=[];this.add(b,a);this.el=new Ext.dom.Element.Fly()},isComposite:true,getElement:function(a){return this.el.attach(a)},transformElement:function(a){return Ext.getDom(a)},getCount:function(){return this.elements.length},add:function(c,a){var e=this.elements,b,d;if(!c){return this}if(typeof c=="string"){c=Ext.dom.Element.selectorFunction(c,a)}else{if(c.isComposite){c=c.elements}else{if(!Ext.isIterable(c)){c=[c]}}}for(b=0,d=c.length;b<d;++b){e.push(this.transformElement(c[b]))}return this},invoke:function(d,a){var f=this.elements,e=f.length,c,b;for(b=0;b<e;b++){c=f[b];if(c){Ext.dom.Element.prototype[d].apply(this.getElement(c),a)}}return this},item:function(b){var c=this.elements[b],a=null;if(c){a=this.getElement(c)}return a},addListener:function(b,h,g,f){var d=this.elements,a=d.length,c,j;for(c=0;c<a;c++){j=d[c];if(j){Ext.EventManager.on(j,b,h,g||j,f)}}return this},each:function(f,d){var g=this,c=g.elements,a=c.length,b,h;for(b=0;b<a;b++){h=c[b];if(h){h=this.getElement(h);if(f.call(d||h,h,g,b)===false){break}}}return g},fill:function(a){var b=this;b.elements=[];b.add(a);return b},filter:function(a){var b=[],d=this,c=Ext.isFunction(a)?a:function(e){return e.is(a)};d.each(function(g,e,f){if(c(g,f)!==false){b[b.length]=d.transformElement(g)}});d.elements=b;return d},indexOf:function(a){return Ext.Array.indexOf(this.elements,this.transformElement(a))},replaceElement:function(e,c,a){var b=!isNaN(e)?e:this.indexOf(e),f;if(b>-1){c=Ext.getDom(c);if(a){f=this.elements[b];f.parentNode.insertBefore(c,f);Ext.removeNode(f)}Ext.Array.splice(this.elements,b,1,c)}return this},clear:function(){this.elements=[]},addElements:function(c,a){if(!c){return this}if(typeof c=="string"){c=Ext.dom.Element.selectorFunction(c,a)}var b=this.elements;Ext.each(c,function(d){b.push(Ext.get(d))});return this},first:function(){return this.item(0)},last:function(){return this.item(this.getCount()-1)},contains:function(a){return this.indexOf(a)!=-1},removeElement:function(c,e){var b=this,d=this.elements,a;Ext.each(c,function(f){if((a=(d[f]||d[f=b.indexOf(f)]))){if(e){if(a.dom){a.remove()}else{Ext.removeNode(a)}}Ext.Array.erase(d,f,1)}});return this}},function(){var a=Ext.dom.Element,d=a.prototype,c=this.prototype,b;for(b in d){if(typeof d[b]=="function"){(function(e){c[e]=c[e]||function(){return this.invoke(e,arguments)}}).call(c,b)}}c.on=c.addListener;if(Ext.DomQuery){a.selectorFunction=Ext.DomQuery.select}a.select=function(e,f){var g;if(typeof e=="string"){g=a.selectorFunction(e,f)}else{if(e.length!==undefined){g=e}else{}}return new Ext.CompositeElementLite(g)};Ext.select=function(){return a.select.apply(a,arguments)}});Ext.define("Ext.ComponentManager",{alternateClassName:"Ext.ComponentMgr",singleton:true,constructor:function(){var a={};this.all={map:a,getArray:function(){var b=[],c;for(c in a){b.push(a[c])}return b}};this.map=a},register:function(a){this.map[a.getId()]=a},unregister:function(a){delete this.map[a.getId()]},isRegistered:function(a){return this.map[a]!==undefined},get:function(a){return this.map[a]},create:function(a,c){if(a.isComponent){return a}else{if(Ext.isString(a)){return Ext.createByAlias("widget."+a)}else{var b=a.xtype||c;return Ext.createByAlias("widget."+b,a)}}},registerType:Ext.emptyFn});Ext.define("Ext.ComponentQuery",{singleton:true,uses:["Ext.ComponentManager"]},function(){var g=this,j=["var r = [],","i = 0,","it = items,","l = it.length,","c;","for (; i < l; i++) {","c = it[i];","if (c.{0}) {","r.push(c);","}","}","return r;"].join(""),e=function(o,n){return n.method.apply(this,[o].concat(n.args))},a=function(p,t){var n=[],q=0,s=p.length,r,o=t!==">";for(;q<s;q++){r=p[q];if(r.getRefItems){n=n.concat(r.getRefItems(o))}}return n},f=function(o){var n=[],p=0,r=o.length,q;for(;p<r;p++){q=o[p];while(!!(q=(q.ownerCt||q.floatParent))){n.push(q)}}return n},l=function(o,t,s){if(t==="*"){return o.slice()}else{var n=[],p=0,r=o.length,q;for(;p<r;p++){q=o[p];if(q.isXType(t,s)){n.push(q)}}return n}},i=function(o,r){var t=Ext.Array,n=[],p=0,s=o.length,q;for(;p<s;p++){q=o[p];if(q.el?q.el.hasCls(r):t.contains(q.initCls(),r)){n.push(q)}}return n},m=function(r,u,o,t){var w=[],q=0,n=r.length,v,s,p;for(;q<n;q++){v=r[q];s=Ext.Class.getConfigNameMap(u).get;if(v[s]){p=v[s]();if(!t?!!p:(String(p)===t)){w.push(v)}}else{if(v.config&&v.config[u]){if(!t?!!v.config[u]:(String(v.config[u])===t)){w.push(v)}}else{if(!t?!!v[u]:(String(v[u])===t)){w.push(v)}}}}return w},d=function(o,s){var n=[],p=0,r=o.length,q;for(;p<r;p++){q=o[p];if(q.getId()===s||q.getItemId()===s){n.push(q)}}return n},k=function(n,o,p){return g.pseudos[o](n,p)},h=/^(\s?([>\^])\s?|\s|$)/,c=/^(#)?([\w\-]+|\*)(?:\((true|false)\))?/,b=[{re:/^\.([\w\-]+)(?:\((true|false)\))?/,method:l},{re:/^(?:[\[](?:@)?([\w\-]+)\s?(?:(=|.=)\s?['"]?(.*?)["']?)?[\]])/,method:m},{re:/^#([\w\-]+)/,method:d},{re:/^\:([\w\-]+)(?:\(((?:\{[^\}]+\})|(?:(?!\{)[^\s>\/]*?(?!\})))\))?/,method:k},{re:/^(?:\{([^\}]+)\})/,method:j}];g.Query=Ext.extend(Object,{constructor:function(n){n=n||{};Ext.apply(this,n)},execute:function(o){var q=this.operations,r=0,s=q.length,p,n;if(!o){n=Ext.ComponentManager.all.getArray()}else{if(Ext.isArray(o)){n=o}}for(;r<s;r++){p=q[r];if(p.mode==="^"){n=f(n||[o])}else{if(p.mode){n=a(n||[o],p.mode)}else{n=e(n||a([o]),p)}}if(r===s-1){return n}}return[]},is:function(p){var o=this.operations,s=Ext.isArray(p)?p:[p],n=s.length,t=o[o.length-1],r,q;s=e(s,t);if(s.length===n){if(o.length>1){for(q=0,r=s.length;q<r;q++){if(Ext.Array.indexOf(this.execute(),s[q])===-1){return false}}}return true}return false}});Ext.apply(this,{cache:{},pseudos:{not:function(t,n){var u=Ext.ComponentQuery,r=0,s=t.length,q=[],p=-1,o;for(;r<s;++r){o=t[r];if(!u.is(o,n)){q[++p]=o}}return q}},query:function(o,v){var w=o.split(","),n=w.length,p=0,q=[],x=[],u={},s,r,t;for(;p<n;p++){o=Ext.String.trim(w[p]);s=this.parse(o);q=q.concat(s.execute(v))}if(n>1){r=q.length;for(p=0;p<r;p++){t=q[p];if(!u[t.id]){x.push(t);u[t.id]=true}}q=x}return q},is:function(o,n){if(!n){return true}var p=this.cache[n];if(!p){this.cache[n]=p=this.parse(n)}return p.is(o)},parse:function(q){var o=[],p=b.length,u,r,v,w,x,s,t,n;while(q&&u!==q){u=q;r=q.match(c);if(r){v=r[1];if(v==="#"){o.push({method:d,args:[Ext.String.trim(r[2])]})}else{if(v==="."){o.push({method:i,args:[Ext.String.trim(r[2])]})}else{o.push({method:l,args:[Ext.String.trim(r[2]),Boolean(r[3])]})}}q=q.replace(r[0],"")}while(!(w=q.match(h))){for(s=0;q&&s<p;s++){t=b[s];x=q.match(t.re);n=t.method;if(x){o.push({method:Ext.isString(t.method)?Ext.functionFactory("items",Ext.String.format.apply(Ext.String,[n].concat(x.slice(1)))):t.method,args:x.slice(1)});q=q.replace(x[0],"");break}}}if(w[1]){o.push({mode:w[2]||w[1]});q=q.replace(w[0],"")}}return new g.Query({operations:o})}})});Ext.define("Ext.XTemplateParser",{constructor:function(a){Ext.apply(this,a)},doTpl:Ext.emptyFn,parse:function(n){var o=this,l=n.length,c={elseif:"elif"},j=o.topRe,b=o.actionsRe,k,p,r,f,q,g,a,e,d,h,i;o.level=0;o.stack=p=[];for(k=0;k<l;k=h){j.lastIndex=k;f=j.exec(n);if(!f){o.doText(n.substring(k,l));break}d=f.index;h=j.lastIndex;if(k<d){o.doText(n.substring(k,d))}if(f[1]){h=n.indexOf("%}",d+2);o.doEval(n.substring(d+2,h));h+=2}else{if(f[2]){h=n.indexOf("]}",d+2);o.doExpr(n.substring(d+2,h));h+=2}else{if(f[3]){o.doTag(f[3])}else{if(f[4]){i=null;while((e=b.exec(f[4]))!==null){r=e[2]||e[3];if(r){r=Ext.String.htmlDecode(r);q=e[1];q=c[q]||q;i=i||{};g=i[q];if(typeof g=="string"){i[q]=[g,r]}else{if(g){i[q].push(r)}else{i[q]=r}}}}if(!i){if(o.elseRe.test(f[4])){o.doElse()}else{if(o.defaultRe.test(f[4])){o.doDefault()}else{o.doTpl();p.push({type:"tpl"})}}}else{if(i["if"]){o.doIf(i["if"],i);p.push({type:"if"})}else{if(i["switch"]){o.doSwitch(i["switch"],i);p.push({type:"switch"})}else{if(i["case"]){o.doCase(i["case"],i)}else{if(i.elif){o.doElseIf(i.elif,i)}else{if(i["for"]){++o.level;o.doFor(i["for"],i);p.push({type:"for",actions:i})}else{if(i.exec){o.doExec(i.exec,i);p.push({type:"exec",actions:i})}}}}}}}}else{a=p.pop();o.doEnd(a.type,a.actions);if(a.type=="for"){--o.level}}}}}}},topRe:/(?:(\{\%)|(\{\[)|\{([^{}]*)\})|(?:<tpl([^>]*)\>)|(?:<\/tpl>)/g,actionsRe:/\s*(elif|elseif|if|for|exec|switch|case|eval)\s*\=\s*(?:(?:["]([^"]*)["])|(?:[']([^']*)[']))\s*/g,defaultRe:/^\s*default\s*$/,elseRe:/^\s*else\s*$/});Ext.define("Ext.app.Action",{config:{scope:null,application:null,controller:null,action:null,args:[],url:undefined,data:{},title:null,beforeFilters:[],currentFilterIndex:-1},constructor:function(a){this.initConfig(a);this.getUrl()},execute:function(){this.resume()},resume:function(){var b=this.getCurrentFilterIndex()+1,c=this.getBeforeFilters(),a=this.getController(),d=c[b];if(d){this.setCurrentFilterIndex(b);d.call(a,this)}else{a[this.getAction()].apply(a,this.getArgs())}},applyUrl:function(a){if(a===null||a===undefined){a=this.urlEncode()}return a},applyController:function(a){var c=this.getApplication(),b=c.getCurrentProfile();if(Ext.isString(a)){a=c.getController(a,b?b.getNamespace():null)}return a},urlEncode:function(){var a=this.getController(),b;if(a instanceof Ext.app.Controller){b=a.$className.split(".");a=b[b.length-1]}return a+"/"+this.getAction()}});Ext.define("Ext.app.Route",{config:{conditions:{},url:null,controller:null,action:null,initialized:false},constructor:function(a){this.initConfig(a)},recognize:function(b){if(!this.getInitialized()){this.initialize()}if(this.recognizes(b)){var c=this.matchesFor(b),a=b.match(this.matcherRegex);a.shift();return Ext.applyIf(c,{controller:this.getController(),action:this.getAction(),historyUrl:b,args:a})}},initialize:function(){this.paramMatchingRegex=new RegExp(/:([0-9A-Za-z\_]*)/g);this.paramsInMatchString=this.getUrl().match(this.paramMatchingRegex)||[];this.matcherRegex=this.createMatcherRegex(this.getUrl());this.setInitialized(true)},recognizes:function(a){return this.matcherRegex.test(a)},matchesFor:function(b){var f={},e=this.paramsInMatchString,a=b.match(this.matcherRegex),d=e.length,c;a.shift();for(c=0;c<d;c++){f[e[c].replace(":","")]=a[c]}return f},argsFor:function(c){var b=[],f=this.paramsInMatchString,a=c.match(this.matcherRegex),e=f.length,d;a.shift();for(d=0;d<e;d++){b.push(f[d].replace(":",""));params[f[d].replace(":","")]=a[d]}return params},urlFor:function(b){var a=this.getUrl();for(var c in b){a=a.replace(":"+c,b[c])}return a},createMatcherRegex:function(a){var e=this.paramsInMatchString,d=e.length,b,c,f;for(b=0;b<d;b++){c=this.getConditions()[e[b]];f=Ext.util.Format.format("({0})",c||"[%a-zA-Z0-9-\\_\\s,]+");a=a.replace(new RegExp(e[b]),f)}return new RegExp("^"+a+"$")}});Ext.define("Ext.app.Router",{requires:["Ext.app.Route"],config:{routes:[],defaults:{action:"index"}},constructor:function(a){this.initConfig(a)},connect:function(b,c){c=Ext.apply({url:b},c||{},this.getDefaults());var a=Ext.create("Ext.app.Route",c);this.getRoutes().push(a);return a},recognize:function(c){var b=this.getRoutes(),e=b.length,d,a;for(d=0;d<e;d++){a=b[d].recognize(c);if(a!==undefined){return a}}return undefined},draw:function(a){a.call(this,this)},clear:function(){this.setRoutes([])}},function(){});Ext.define("Ext.behavior.Behavior",{constructor:function(a){this.component=a;a.on("destroy","onComponentDestroy",this)},onComponentDestroy:Ext.emptyFn});Ext.define("Ext.data.JsonP",{alternateClassName:"Ext.util.JSONP",singleton:true,statics:{requestCount:0,requests:{}},timeout:30000,disableCaching:true,disableCachingParam:"_dc",callbackKey:"callback",request:function(m){m=Ext.apply({},m);var i=this,d=Ext.isDefined(m.disableCaching)?m.disableCaching:i.disableCaching,g=m.disableCachingParam||i.disableCachingParam,c=++i.statics().requestCount,k=m.callbackName||"callback"+c,h=m.callbackKey||i.callbackKey,l=Ext.isDefined(m.timeout)?m.timeout:i.timeout,e=Ext.apply({},m.params),b=m.url,a=Ext.isSandboxed?Ext.getUniqueGlobalNamespace():"Ext",f,j;e[h]=a+".data.JsonP."+k;if(d){e[g]=new Date().getTime()}j=i.createScript(b,e,m);i.statics().requests[c]=f={url:b,params:e,script:j,id:c,scope:m.scope,success:m.success,failure:m.failure,callback:m.callback,callbackKey:h,callbackName:k};if(l>0){f.timeout=setTimeout(Ext.bind(i.handleTimeout,i,[f]),l)}i.setupErrorHandling(f);i[k]=Ext.bind(i.handleResponse,i,[f],true);i.loadScript(f);return f},abort:function(b){var c=this.statics().requests,a;if(b){if(!b.id){b=c[b]}this.abort(b)}else{for(a in c){if(c.hasOwnProperty(a)){this.abort(c[a])}}}},setupErrorHandling:function(a){a.script.onerror=Ext.bind(this.handleError,this,[a])},handleAbort:function(a){a.errorType="abort";this.handleResponse(null,a)},handleError:function(a){a.errorType="error";this.handleResponse(null,a)},cleanupErrorHandling:function(a){a.script.onerror=null},handleTimeout:function(a){a.errorType="timeout";this.handleResponse(null,a)},handleResponse:function(a,b){var c=true;if(b.timeout){clearTimeout(b.timeout)}delete this[b.callbackName];delete this.statics()[b.id];this.cleanupErrorHandling(b);Ext.fly(b.script).destroy();if(b.errorType){c=false;Ext.callback(b.failure,b.scope,[b.errorType])}else{Ext.callback(b.success,b.scope,[a])}Ext.callback(b.callback,b.scope,[c,a,b.errorType])},createScript:function(c,d,b){var a=document.createElement("script");a.setAttribute("src",Ext.urlAppend(c,Ext.Object.toQueryString(d)));a.setAttribute("async",true);a.setAttribute("type","text/javascript");return a},loadScript:function(a){Ext.getHead().appendChild(a.script)}});Ext.define("Ext.data.Operation",{config:{synchronous:true,action:null,filters:null,sorters:null,grouper:null,start:null,limit:null,batch:null,callback:null,scope:null,resultSet:null,records:null,request:null,response:null,withCredentials:null,params:null,url:null,page:null,node:null,model:undefined,addRecords:false},started:false,running:false,complete:false,success:undefined,exception:false,error:undefined,constructor:function(a){this.initConfig(a)},applyModel:function(a){if(typeof a=="string"){a=Ext.data.ModelManager.getModel(a);if(!a){Ext.Logger.error("Model with name "+arguments[0]+" doesnt exist.")}}if(a&&!a.prototype.isModel&&Ext.isObject(a)){a=Ext.data.ModelManager.registerType(a.storeId||a.id||Ext.id(),a)}return a},getRecords:function(){var a=this.getResultSet();return this._records||(a?a.getRecords():[])},setStarted:function(){this.started=true;this.running=true},setCompleted:function(){this.complete=true;this.running=false},setSuccessful:function(){this.success=true},setException:function(a){this.exception=true;this.success=false;this.running=false;this.error=a},hasException:function(){return this.exception===true},getError:function(){return this.error},isStarted:function(){return this.started===true},isRunning:function(){return this.running===true},isComplete:function(){return this.complete===true},wasSuccessful:function(){return this.isComplete()&&this.success===true},allowWrite:function(){return this.getAction()!="read"},process:function(d,b,c,a){if(b.getSuccess()!==false){this.setResponse(a);this.setResultSet(b);this.setCompleted();this.setSuccessful()}else{return false}return this["process"+Ext.String.capitalize(d)].call(this,b,c,a)},processRead:function(d){var b=d.getRecords(),g=[],f=this.getModel(),e=b.length,c,a;for(c=0;c<e;c++){a=b[c];g.push(new f(a.data,a.id,a.node))}this.setRecords(g);return true},processCreate:function(d){var b=d.getRecords(),e=b.length,c,a,f;for(c=0;c<e;c++){f=b[c];a=this.findCurrentRecord(f.clientId);if(a){this.updateRecord(a,f)}}return true},processUpdate:function(e){var c=e.getRecords(),b=this.getRecords(),f=c.length,d,a,g;for(d=0;d<f;d++){g=c[d];a=b[d];if(a){this.updateRecord(a,g)}}return true},processDestroy:function(d){var b=d.getRecords(),e=b.length,c,a,f;for(c=0;c<e;c++){f=b[c];a=this.findCurrentRecord(f.id);if(a){a.setIsErased(true);a.notifyStores("afterErase",a)}}},findCurrentRecord:function(a){var c=this.getRecords(),e=c.length,d,b;for(d=0;d<e;d++){b=c[d];if(b.getId()===a){return b}}},updateRecord:function(b,d){var a=d.data,c=d.id;b.beginEdit();b.set(a);if(c!==null){b.setId(c)}b.endEdit(true);b.commit()}});Ext.define("Ext.data.Request",{config:{action:null,params:null,method:"GET",url:null,operation:null,proxy:null,disableCaching:false,headers:{},callbackKey:null,jsonP:null,jsonData:null,xmlData:null,withCredentials:null,callback:null,scope:null,timeout:30000,records:null,directFn:null,args:null},constructor:function(a){this.initConfig(a)}});Ext.define("Ext.data.ResultSet",{config:{loaded:true,count:null,total:null,success:false,records:null},constructor:function(a){this.initConfig(a)},applyCount:function(a){if(!a&&a!==0){return this.getRecords().length}return a},updateRecords:function(a){this.setCount(a.length)}});Ext.define("Ext.data.SortTypes",{singleton:true,stripTagsRE:/<\/?[^>]+>/gi,none:function(a){return a},asText:function(a){return String(a).replace(this.stripTagsRE,"")},asUCText:function(a){return String(a).toUpperCase().replace(this.stripTagsRE,"")},asUCString:function(a){return String(a).toUpperCase()},asDate:function(a){if(!a){return 0}if(Ext.isDate(a)){return a.getTime()}return Date.parse(String(a))},asFloat:function(a){a=parseFloat(String(a).replace(/,/g,""));return isNaN(a)?0:a},asInt:function(a){a=parseInt(String(a).replace(/,/g,""),10);return isNaN(a)?0:a}});Ext.define("Ext.data.Types",{singleton:true,requires:["Ext.data.SortTypes"],stripRe:/[\$,%]/g,dashesRe:/-/g,iso8601TestRe:/\d\dT\d\d/,iso8601SplitRe:/[- :T\.Z\+]/},function(){var b=this,a=Ext.data.SortTypes;Ext.apply(b,{AUTO:{convert:function(c){return c},sortType:a.none,type:"auto"},STRING:{convert:function(c){return(c===undefined||c===null)?(this.getAllowNull()?null:""):String(c)},sortType:a.asUCString,type:"string"},INT:{convert:function(c){return(c!==undefined&&c!==null&&c!=="")?((typeof c==="number")?parseInt(c,10):parseInt(String(c).replace(b.stripRe,""),10)):(this.getAllowNull()?null:0)},sortType:a.none,type:"int"},FLOAT:{convert:function(c){return(c!==undefined&&c!==null&&c!=="")?((typeof c==="number")?c:parseFloat(String(c).replace(b.stripRe,""),10)):(this.getAllowNull()?null:0)},sortType:a.none,type:"float"},BOOL:{convert:function(c){if((c===undefined||c===null||c==="")&&this.getAllowNull()){return null}return c===true||c==="true"||c==1},sortType:a.none,type:"bool"},DATE:{convert:function(e){var c=this.getDateFormat(),d;if(!e){return null}if(Ext.isDate(e)){return e}if(c){if(c=="timestamp"){return new Date(e*1000)}if(c=="time"){return new Date(parseInt(e,10))}return Ext.Date.parse(e,c)}d=new Date(Date.parse(e));if(isNaN(d)){if(b.iso8601TestRe.test(e)){d=e.split(b.iso8601SplitRe);d=new Date(d[0],d[1]-1,d[2],d[3],d[4],d[5])}if(isNaN(d)){d=new Date(Date.parse(e.replace(this.dashesRe,"/")))}}return isNaN(d)?null:d},sortType:a.asDate,type:"date"}});Ext.apply(b,{BOOLEAN:this.BOOL,INTEGER:this.INT,NUMBER:this.FLOAT})});Ext.define("Ext.data.Validations",{alternateClassName:"Ext.data.validations",singleton:true,config:{presenceMessage:"must be present",lengthMessage:"is the wrong length",formatMessage:"is the wrong format",inclusionMessage:"is not included in the list of acceptable values",exclusionMessage:"is not an acceptable value",emailMessage:"is not a valid email address"},constructor:function(a){this.initConfig(a)},getMessage:function(a){var b=this["get"+a[0].toUpperCase()+a.slice(1)+"Message"];if(b){return b.call(this)}return""},emailRe:/^([a-zA-Z0-9_\.\-])+\@(([a-zA-Z0-9\-])+\.)+([a-zA-Z0-9]{2,4})+$/,presence:function(a,b){if(b===undefined){b=a}return !!b||b===0},length:function(b,e){if(e===undefined||e===null){return false}var d=e.length,c=b.min,a=b.max;if((c&&d<c)||(a&&d>a)){return false}else{return true}},email:function(b,a){return Ext.data.validations.emailRe.test(a)},format:function(a,b){return !!(a.matcher&&a.matcher.test(b))},inclusion:function(a,b){return a.list&&Ext.Array.indexOf(a.list,b)!=-1},exclusion:function(a,b){return a.list&&Ext.Array.indexOf(a.list,b)==-1}});Ext.define("Ext.data.identifier.Simple",{alias:"data.identifier.simple",statics:{AUTO_ID:1},config:{prefix:"ext-record-"},constructor:function(a){this.initConfig(a)},generate:function(a){return this._prefix+this.self.AUTO_ID++}});Ext.define("Ext.data.identifier.Uuid",{extend:"Ext.data.identifier.Simple",alias:"data.identifier.uuid",config:{id:undefined,salt:null,timestamp:null,version:4},applyId:function(a){if(a===undefined){return Ext.data.identifier.Uuid.Global}return a},constructor:function(){var a=this;a.callParent(arguments);a.parts=[];a.init()},reconfigure:function(a){this.setConfig(a);this.init()},generate:function(){var c=this,e=c.parts,a=c.getVersion(),b=c.getSalt(),d=c.getTimestamp();e[0]=c.toHex(d.lo,8);e[1]=c.toHex(d.hi&65535,4);e[2]=c.toHex(((d.hi>>>16)&4095)|(a<<12),4);e[3]=c.toHex(128|((c.clockSeq>>>8)&63),2)+c.toHex(c.clockSeq&255,2);e[4]=c.toHex(b.hi,4)+c.toHex(b.lo,8);if(a==4){c.init()}else{++d.lo;if(d.lo>=c.twoPow32){d.lo=0;++d.hi}}return e.join("-").toLowerCase()},init:function(){var b=this,a=b.getSalt(),c=b.getTimestamp();if(b.getVersion()==4){b.clockSeq=b.rand(0,b.twoPow14-1);if(!a){a={};b.setSalt(a)}if(!c){c={};b.setTimestamp(c)}a.lo=b.rand(0,b.twoPow32-1);a.hi=b.rand(0,b.twoPow16-1);c.lo=b.rand(0,b.twoPow32-1);c.hi=b.rand(0,b.twoPow28-1)}else{b.setSalt(b.split(b.getSalt()));b.setTimestamp(b.split(b.getTimestamp()));b.getSalt().hi|=256}},twoPow14:Math.pow(2,14),twoPow16:Math.pow(2,16),twoPow28:Math.pow(2,28),twoPow32:Math.pow(2,32),toHex:function(c,b){var a=c.toString(16);if(a.length>b){a=a.substring(a.length-b)}else{if(a.length<b){a=Ext.String.leftPad(a,b,"0")}}return a},rand:function(c,b){var a=Math.random()*(b-c+1);return Math.floor(a)+c},split:function(b){if(typeof(b)=="number"){var a=Math.floor(b/this.twoPow32);return{lo:Math.floor(b-a*this.twoPow32),hi:a}}return b}},function(){this.Global=new this({id:"uuid"})});Ext.define("Ext.data.writer.Writer",{alias:"writer.base",alternateClassName:["Ext.data.DataWriter","Ext.data.Writer"],config:{writeAllFields:true,nameProperty:"name"},constructor:function(a){this.initConfig(a)},write:function(e){var c=e.getOperation(),b=c.getRecords()||[],a=b.length,d=0,f=[];for(;d<a;d++){f.push(this.getRecordData(b[d]))}return this.writeRecords(e,f)},writeDate:function(c,b){var a=c.dateFormat||"timestamp";switch(a){case"timestamp":return b.getTime()/1000;case"time":return b.getTime();default:return Ext.Date.format(b,a)}},getRecordData:function(f){var k=f.phantom===true,c=this.getWriteAllFields()||k,d=this.getNameProperty(),g=f.getFields(),e={},i,a,h,l,j,b;if(c){g.each(function(m){b=m.config;if(b.persist){a=b[d]||b.name;j=f.get(b.name);if(b.type.type=="date"){j=this.writeDate(b,j)}e[a]=j}},this)}else{i=f.getChanges();for(l in i){if(i.hasOwnProperty(l)){h=g.get(l);b=h.config;if(b.persist){a=b[d]||h.name;j=i[l];if(b.type.type=="date"){j=this.writeDate(b,j)}e[a]=j}}}if(!k){e[f.idProperty]=f.getId()}}return e}});Ext.define("Ext.data.writer.Xml",{extend:"Ext.data.writer.Writer",alternateClassName:"Ext.data.XmlWriter",alias:"writer.xml",config:{documentRoot:"xmlData",defaultDocumentRoot:"xmlData",header:"",record:"record"},writeRecords:function(a,b){var g=this,d=[],c=0,f=b.length,h=g.getDocumentRoot(),e=g.getRecord(),l=b.length!==1,k,j;d.push(g.getHeader()||"");if(!h&&l){h=g.getDefaultDocumentRoot()}if(h){d.push("<",h,">")}for(;c<f;++c){k=b[c];d.push("<",e,">");for(j in k){if(k.hasOwnProperty(j)){d.push("<",j,">",k[j],"</",j,">")}}d.push("</",e,">")}if(h){d.push("</",h,">")}a.setXmlData(d.join(""));return a}});Ext.define("Ext.direct.RemotingMethod",{config:{name:null,params:null,formHandler:null,len:null,ordered:true},constructor:function(a){this.initConfig(a)},applyParams:function(f){if(Ext.isNumber(f)){this.setLen(f)}else{if(Ext.isArray(f)){this.setOrdered(false);var d=f.length,b=[],c,e,a;for(c=0;c<d;c++){e=f[c];a=Ext.isObject(e)?e.name:e;b.push(a)}return b}}},getArgs:function(e,a,f){var b=[],c,d;if(this.getOrdered()){if(this.getLen()>0){if(a){for(c=0,d=a.length;c<d;c++){b.push(e[a[c]])}}else{if(f){b.push(e)}}}}else{b.push(e)}return b},getCallData:function(c){var e=this,f=null,a=e.getLen(),g=e.getParams(),h,d,b;if(e.getOrdered()){h=c[a];d=c[a+1];if(a!==0){f=c.slice(0,a)}}else{f=Ext.apply({},c[0]);h=c[1];d=c[2];for(b in f){if(f.hasOwnProperty(b)){if(!Ext.Array.contains(g,b)){delete f[b]}}}}return{data:f,callback:h,scope:d}}});Ext.define("Ext.direct.Transaction",{alias:"direct.transaction",alternateClassName:"Ext.Direct.Transaction",statics:{TRANSACTION_ID:0},config:{id:undefined,provider:null,retryCount:0,args:null,action:null,method:null,data:null,callback:null,form:null},constructor:function(a){this.initConfig(a)},applyId:function(a){if(a===undefined){a=++this.self.TRANSACTION_ID}return a},updateId:function(a){this.id=this.tid=a},getTid:function(){return this.tid},send:function(){this.getProvider().queueTransaction(this)},retry:function(){this.setRetryCount(this.getRetryCount()+1);this.send()}});Ext.define("Ext.dom.CompositeElement",{alternateClassName:"Ext.CompositeElement",extend:"Ext.dom.CompositeElementLite",getElement:function(a){return a},transformElement:function(a){return Ext.get(a)}},function(){Ext.dom.Element.select=function(a,d,b){var c;if(typeof a=="string"){c=Ext.dom.Element.selectorFunction(a,b)}else{if(a.length!==undefined){c=a}else{}}return(d===true)?new Ext.CompositeElement(c):new Ext.CompositeElementLite(c)}});Ext.define("Ext.event.Controller",{isFiring:false,listenerStack:null,constructor:function(a){this.firingListeners=[];this.firingArguments=[];this.setInfo(a);return this},setInfo:function(a){this.info=a},getInfo:function(){return this.info},setListenerStacks:function(a){this.listenerStacks=a},fire:function(h,e){var n=this.listenerStacks,m=this.firingListeners,d=this.firingArguments,k=m.push,g=n.length,j,l,c,o,a=false,b=false,f;m.length=0;if(e){if(e.order!=="after"){a=true}else{b=true}}if(g===1){j=n[0].listeners;l=j.before;c=j.current;o=j.after;if(l.length>0){k.apply(m,l)}if(a){k.call(m,e)}if(c.length>0){k.apply(m,c)}if(b){k.call(m,e)}if(o.length>0){k.apply(m,o)}}else{for(f=0;f<g;f++){l=n[f].listeners.before;if(l.length>0){k.apply(m,l)}}if(a){k.call(m,e)}for(f=0;f<g;f++){c=n[f].listeners.current;if(c.length>0){k.apply(m,c)}}if(b){k.call(m,e)}for(f=0;f<g;f++){o=n[f].listeners.after;if(o.length>0){k.apply(m,o)}}}if(m.length===0){return this}if(!h){h=[]}d.length=0;d.push.apply(d,h);d.push(null,this);this.doFire();return this},doFire:function(){var k=this.firingListeners,c=this.firingArguments,g=c.length-2,d,f,b,o,h,n,a,j,l,e,m;this.isPausing=false;this.isPaused=false;this.isStopped=false;this.isFiring=true;for(d=0,f=k.length;d<f;d++){b=k[d];o=b.options;h=b.fn;n=b.firingFn;a=b.boundFn;j=b.isLateBinding;l=b.scope;if(j&&a&&a!==l[h]){a=false;n=false}if(!a){if(j){a=l[h];if(!a){continue}}else{a=h}b.boundFn=a}if(!n){n=a;if(o.buffer){n=Ext.Function.createBuffered(n,o.buffer,l)}if(o.delay){n=Ext.Function.createDelayed(n,o.delay,l)}b.firingFn=n}c[g]=o;e=c;if(o.args){e=o.args.concat(e)}if(o.single===true){b.stack.remove(h,l,b.order)}m=n.apply(l,e);if(m===false){this.stop()}if(this.isStopped){break}if(this.isPausing){this.isPaused=true;k.splice(0,d+1);return}}this.isFiring=false;this.listenerStacks=null;k.length=0;c.length=0;this.connectingController=null},connect:function(a){this.connectingController=a},resume:function(){var a=this.connectingController;this.isPausing=false;if(this.isPaused&&this.firingListeners.length>0){this.isPaused=false;this.doFire()}if(a){a.resume()}return this},isInterrupted:function(){return this.isStopped||this.isPaused},stop:function(){var a=this.connectingController;this.isStopped=true;if(a){this.connectingController=null;a.stop()}this.isFiring=false;this.listenerStacks=null;return this},pause:function(){var a=this.connectingController;this.isPausing=true;if(a){a.pause()}return this}});Ext.define("Ext.event.Event",{alternateClassName:"Ext.EventObject",isStopped:false,set:function(a,b){if(arguments.length===1&&typeof a!="string"){var c=a;for(a in c){if(c.hasOwnProperty(a)){this[a]=c[a]}}}else{this[a]=c[a]}},stopEvent:function(){return this.stopPropagation()},stopPropagation:function(){this.isStopped=true;return this}});Ext.define("Ext.event.ListenerStack",{currentOrder:"current",length:0,constructor:function(){this.listeners={before:[],current:[],after:[]};this.lateBindingMap={};return this},add:function(h,j,k,e){var a=this.lateBindingMap,g=this.getAll(e),f=g.length,b,d,c;if(typeof h=="string"&&j.isIdentifiable){c=j.getId();b=a[c];if(b){if(b[h]){return false}else{b[h]=true}}else{a[c]=b={};b[h]=true}}else{if(f>0){while(f--){d=g[f];if(d.fn===h&&d.scope===j){d.options=k;return false}}}}d=this.create(h,j,k,e);if(k&&k.prepend){delete k.prepend;g.unshift(d)}else{g.push(d)}this.length++;return true},getAt:function(b,a){return this.getAll(a)[b]},getAll:function(a){if(!a){a=this.currentOrder}return this.listeners[a]},count:function(a){return this.getAll(a).length},create:function(d,c,b,a){return{stack:this,fn:d,firingFn:false,boundFn:false,isLateBinding:typeof d=="string",scope:c,options:b||{},order:a}},remove:function(h,j,e){var g=this.getAll(e),f=g.length,b=false,a=this.lateBindingMap,d,c;if(f>0){while(f--){d=g[f];if(d.fn===h&&d.scope===j){g.splice(f,1);b=true;this.length--;if(typeof h=="string"&&j.isIdentifiable){c=j.getId();if(a[c]&&a[c][h]){delete a[c][h]}}break}}}return b}});Ext.define("Ext.event.publisher.Publisher",{targetType:"",idSelectorRegex:/^#([\w\-]+)$/i,constructor:function(){var b=this.handledEvents,a,c,e,d;a=this.handledEventsMap={};for(c=0,e=b.length;c<e;c++){d=b[c];a[d]=true}this.subscribers={};return this},handles:function(a){var b=this.handledEventsMap;return !!b[a]||!!b["*"]||a==="*"},getHandledEvents:function(){return this.handledEvents},setDispatcher:function(a){this.dispatcher=a},subscribe:function(){return false},unsubscribe:function(){return false},unsubscribeAll:function(){delete this.subscribers;this.subscribers={};return this},notify:function(){return false},getTargetType:function(){return this.targetType},dispatch:function(c,a,b){this.dispatcher.doDispatchEvent(this.targetType,c,a,b)}});Ext.define("Ext.event.recognizer.Recognizer",{mixins:["Ext.mixin.Identifiable"],handledEvents:[],config:{onRecognized:Ext.emptyFn,onFailed:Ext.emptyFn,callbackScope:null},constructor:function(a){this.initConfig(a);return this},getHandledEvents:function(){return this.handledEvents},onStart:Ext.emptyFn,onEnd:Ext.emptyFn,fail:function(){this.getOnFailed().apply(this.getCallbackScope(),arguments);return false},fire:function(){this.getOnRecognized().apply(this.getCallbackScope(),arguments)}});Ext.define("Ext.event.recognizer.Touch",{extend:"Ext.event.recognizer.Recognizer",onTouchStart:Ext.emptyFn,onTouchMove:Ext.emptyFn,onTouchEnd:Ext.emptyFn});Ext.define("Ext.fx.State",{isAnimatable:{"background-color":true,"background-image":true,"background-position":true,"border-bottom-color":true,"border-bottom-width":true,"border-color":true,"border-left-color":true,"border-left-width":true,"border-right-color":true,"border-right-width":true,"border-spacing":true,"border-top-color":true,"border-top-width":true,"border-width":true,bottom:true,color:true,crop:true,"font-size":true,"font-weight":true,height:true,left:true,"letter-spacing":true,"line-height":true,"margin-bottom":true,"margin-left":true,"margin-right":true,"margin-top":true,"max-height":true,"max-width":true,"min-height":true,"min-width":true,opacity:true,"outline-color":true,"outline-offset":true,"outline-width":true,"padding-bottom":true,"padding-left":true,"padding-right":true,"padding-top":true,right:true,"text-indent":true,"text-shadow":true,top:true,"vertical-align":true,visibility:true,width:true,"word-spacing":true,"z-index":true,zoom:true,transform:true},constructor:function(a){this.data={};this.set(a)},setConfig:function(a){this.set(a);return this},setRaw:function(a){this.data=a;return this},clear:function(){return this.setRaw({})},setTransform:function(c,g){var f=this.data,a=Ext.isArray(g),b=f.transform,e,d;if(!b){b=f.transform={translateX:0,translateY:0,translateZ:0,scaleX:1,scaleY:1,scaleZ:1,rotate:0,rotateX:0,rotateY:0,rotateZ:0,skewX:0,skewY:0}}if(typeof c=="string"){switch(c){case"translate":if(a){e=g.length;if(e==0){break}b.translateX=g[0];if(e==1){break}b.translateY=g[1];if(e==2){break}b.translateZ=g[2]}else{b.translateX=g}break;case"rotate":if(a){e=g.length;if(e==0){break}b.rotateX=g[0];if(e==1){break}b.rotateY=g[1];if(e==2){break}b.rotateZ=g[2]}else{b.rotate=g}break;case"scale":if(a){e=g.length;if(e==0){break}b.scaleX=g[0];if(e==1){break}b.scaleY=g[1];if(e==2){break}b.scaleZ=g[2]}else{b.scaleX=g;b.scaleY=g}break;case"skew":if(a){e=g.length;if(e==0){break}b.skewX=g[0];if(e==1){break}b.skewY=g[1]}else{b.skewX=g}break;default:b[c]=g}}else{for(d in c){if(c.hasOwnProperty(d)){g=c[d];this.setTransform(d,g)}}}},set:function(a,d){var c=this.data,b;if(typeof a!="string"){for(b in a){d=a[b];if(b==="transform"){this.setTransform(d)}else{c[b]=d}}}else{if(a==="transform"){this.setTransform(d)}else{c[a]=d}}return this},unset:function(a){var b=this.data;if(b.hasOwnProperty(a)){delete b[a]}return this},getData:function(){return this.data}});Ext.define("Ext.fx.easing.Abstract",{config:{startTime:0,startValue:0},isEasing:true,isEnded:false,constructor:function(a){this.initConfig(a);return this},applyStartTime:function(a){if(!a){a=Ext.Date.now()}return a},updateStartTime:function(a){this.reset()},reset:function(){this.isEnded=false},getValue:Ext.emptyFn});Ext.define("Ext.fx.easing.Bounce",{extend:"Ext.fx.easing.Abstract",config:{springTension:0.3,acceleration:30,startVelocity:0},getValue:function(){var b=Ext.Date.now()-this.getStartTime(),c=(b/this.getAcceleration()),a=c*Math.pow(Math.E,-this.getSpringTension()*c);return this.getStartValue()+(this.getStartVelocity()*a)}});Ext.define("Ext.fx.easing.Linear",{extend:"Ext.fx.easing.Abstract",alias:"easing.linear",config:{duration:0,endValue:0},updateStartValue:function(a){this.distance=this.getEndValue()-a},updateEndValue:function(a){this.distance=a-this.getStartValue()},getValue:function(){var a=Ext.Date.now()-this.getStartTime(),b=this.getDuration();if(a>b){this.isEnded=true;return this.getEndValue()}else{return this.getStartValue()+((a/b)*this.distance)}}});Ext.define("Ext.fx.easing.Momentum",{extend:"Ext.fx.easing.Abstract",config:{acceleration:30,friction:0,startVelocity:0},alpha:0,updateFriction:function(b){var a=Math.log(1-(b/10));this.theta=a;this.alpha=a/this.getAcceleration()},updateStartVelocity:function(a){this.velocity=a*this.getAcceleration()},updateAcceleration:function(a){this.velocity=this.getStartVelocity()*a;this.alpha=this.theta/a},getValue:function(){return this.getStartValue()-this.velocity*(1-this.getFrictionFactor())/this.theta},getFrictionFactor:function(){var a=Ext.Date.now()-this.getStartTime();return Math.exp(a*this.alpha)},getVelocity:function(){return this.getFrictionFactor()*this.velocity}});Ext.define("Ext.mixin.Mixin",{onClassExtended:function(b,e){var a=e.mixinConfig,d,f,c;if(a){d=b.superclass.mixinConfig;if(d){a=e.mixinConfig=Ext.merge({},d,a)}e.mixinId=a.id;f=a.beforeHooks;c=a.hooks||a.afterHooks;if(f||c){Ext.Function.interceptBefore(e,"onClassMixedIn",function(h){var g=this.prototype;if(f){Ext.Object.each(f,function(j,i){h.override(i,function(){if(g[j].apply(this,arguments)!==false){return this.callOverridden(arguments)}})})}if(c){Ext.Object.each(c,function(j,i){h.override(i,function(){var k=this.callOverridden(arguments);g[j].apply(this,arguments);return k})})}})}}}});Ext.define("Ext.mixin.Selectable",{extend:"Ext.mixin.Mixin",mixinConfig:{id:"selectable",hooks:{updateStore:"updateStore"}},config:{disableSelection:null,mode:"SINGLE",allowDeselect:false,lastSelected:null,lastFocused:null,deselectOnContainerClick:true},modes:{SINGLE:true,SIMPLE:true,MULTI:true},selectableEventHooks:{addrecords:"onSelectionStoreAdd",removerecords:"onSelectionStoreRemove",updaterecord:"onSelectionStoreUpdate",load:"refreshSelection",refresh:"refreshSelection"},constructor:function(){this.selected=new Ext.util.MixedCollection();this.callParent(arguments)},applyMode:function(a){a=a?a.toUpperCase():"SINGLE";return this.modes[a]?a:"SINGLE"},updateStore:function(a,c){var b=this,d=Ext.apply({},b.selectableEventHooks,{scope:b});if(c&&Ext.isObject(c)&&c.isStore){if(c.autoDestroy){c.destroy()}else{c.un(d)}}if(a){a.on(d);b.refreshSelection()}},selectAll:function(a){var e=this,c=e.getStore().getRange(),d=c.length,b=0;for(;b<d;b++){e.select(c[b],true,a)}},deselectAll:function(e){var d=this,b=d.getStore().getRange(),c=b.length,a=0;for(;a<c;a++){d.deselect(b,e)}d.selected.clear();d.setLastSelected(null);d.setLastFocused(null)},selectWithEvent:function(a){var c=this,b=c.isSelected(a);switch(c.getMode()){case"MULTI":case"SIMPLE":if(b){c.deselect(a)}else{c.select(a,true)}break;case"SINGLE":if(c.getAllowDeselect()&&b){c.deselect(a)}else{c.select(a,false)}break}},selectRange:function(h,j,m,b){var g=this,k=g.getStore(),l=k.indexOf(h),d=k.indexOf(j),c=0,f,a,e;if(g.getDisableSelection()){return}if(l>d){f=d;d=l;l=f}for(e=l;e<=d;e++){if(g.isSelected(k.getAt(e))){c++}}if(!b){a=-1}else{a=(b=="up")?l:d}for(e=l;e<=d;e++){if(c==(d-l+1)){if(e!=a){g.deselect(e,true)}}else{g.select(e,true)}}},select:function(c,e,b){var d=this,a;if(d.getDisableSelection()){return}if(typeof c==="number"){c=[d.getStore().getAt(c)]}if(!c){return}if(d.getMode()=="SINGLE"&&c){a=c.length?c[0]:c;d.doSingleSelect(a,b)}else{d.doMultiSelect(c,e,b)}},doSingleSelect:function(a,b){var d=this,c=d.selected;if(d.getDisableSelection()){return}if(d.isSelected(a)){return}if(c.getCount()>0){d.deselect(d.getLastSelected(),b)}c.add(a);d.setLastSelected(a);d.onItemSelect(a,b);d.setLastFocused(a);d.fireSelectionChange(!b)},doMultiSelect:function(a,j,h){if(a===null||this.getDisableSelection()){return}a=!Ext.isArray(a)?[a]:a;var f=this,b=f.selected,e=a.length,g=false,c=0,d;if(!j&&b.getCount()>0){g=true;f.deselect(f.getSelection(),true)}for(;c<e;c++){d=a[c];if(j&&f.isSelected(d)){continue}g=true;f.setLastSelected(d);b.add(d);if(!h){f.setLastFocused(d)}f.onItemSelect(d,h)}this.fireSelectionChange(g&&!h)},deselect:function(a,j){var f=this;if(f.getDisableSelection()){return}a=Ext.isArray(a)?a:[a];var b=f.selected,g=false,c=0,h=f.getStore(),e=a.length,d;for(;c<e;c++){d=a[c];if(typeof d==="number"){d=h.getAt(d)}if(b.remove(d)){if(f.getLastSelected()==d){f.setLastSelected(b.last())}g=true}if(d){f.onItemDeselect(d,j)}}f.fireSelectionChange(g&&!j)},updateLastFocused:function(b,a){this.onLastFocusChanged(a,b)},fireSelectionChange:function(a){var b=this;if(a){b.fireEvent("selectionchange",b,b.getSelection())}},getSelection:function(){return this.selected.getRange()},isSelected:function(a){a=Ext.isNumber(a)?this.getStore().getAt(a):a;return this.selected.indexOf(a)!==-1},hasSelection:function(){return this.selected.getCount()>0},refreshSelection:function(){var b=this,a=b.getSelection();b.deselectAll(true);if(a.length){b.select(a,false,true)}},onSelectionStoreClear:function(){var b=this,a=b.selected;if(a.getCount()>0){a.clear();b.setLastSelected(null);b.setLastFocused(null);b.fireSelectionChange(true)}},onSelectionStoreRemove:function(b,a){var d=this,c=d.selected;if(d.getDisableSelection()){return}if(c.remove(a)){if(d.getLastSelected()==a){d.setLastSelected(null)}if(d.getLastFocused()==a){d.setLastFocused(null)}d.fireSelectionChange(true)}},getSelectionCount:function(){return this.selected.getCount()},onSelectionStoreAdd:Ext.emptyFn,onSelectionStoreUpdate:Ext.emptyFn,onItemSelect:Ext.emptyFn,onItemDeselect:Ext.emptyFn,onLastFocusChanged:Ext.emptyFn,onEditorKey:Ext.emptyFn},function(){});Ext.define("Ext.mixin.Traversable",{extend:"Ext.mixin.Mixin",mixinConfig:{id:"traversable"},setParent:function(a){this.parent=a;return this},hasParent:function(){return Boolean(this.parent)},getParent:function(){return this.parent},getAncestors:function(){var b=[],a=this.getParent();while(a){b.push(a);a=a.getParent()}return b},getAncestorIds:function(){var b=[],a=this.getParent();while(a){b.push(a.getId());a=a.getParent()}return b}});Ext.define("Ext.util.DelayedTask",{config:{interval:null,delay:null,fn:null,scope:null,args:null},constructor:function(d,c,b){var a={fn:d,scope:c,args:b};this.initConfig(a)},delay:function(b,f,e,a){var d=this;d.cancel();d.setConfig({delay:b,fn:f,scope:e,args:a});var c=function(){d.getFn().apply(d.getScope(),d.getArgs()||[]);d.cancel()};d.setInterval(setInterval(c,d.getDelay()))},cancel:function(){this.setInterval(null)},updateInterval:function(a,b){if(b){clearInterval(b)}},applyArgs:function(a){if(!Ext.isArray(a)){a=[a]}return a}});Ext.define("Ext.util.Filter",{isFilter:true,config:{property:null,value:null,filterFn:Ext.emptyFn,anyMatch:false,exactMatch:false,caseSensitive:false,root:null,id:undefined,scope:null},applyId:function(a){if(!a){if(this.getProperty()){a=this.getProperty()+"-"+String(this.getValue())}if(!a){a=Ext.id(null,"ext-filter-")}}return a},constructor:function(a){this.initConfig(a)},applyFilterFn:function(b){if(b===Ext.emptyFn){b=this.getInitialConfig("filter");if(b){return b}var a=this.getValue();if(!this.getProperty()&&!a&&a!==0){return Ext.emptyFn}else{return this.createFilterFn()}}return b},createFilterFn:function(){var a=this,b=a.createValueMatcher();return function(d){var c=a.getRoot(),e=a.getProperty();if(c){d=d[c]}return b.test(d[e])}},createValueMatcher:function(){var d=this,e=d.getValue(),f=d.getAnyMatch(),c=d.getExactMatch(),a=d.getCaseSensitive(),b=Ext.String.escapeRegex;if(e===null||e===undefined||!e.exec){e=String(e);if(f===true){e=b(e)}else{e="^"+b(e);if(c===true){e+="$"}}e=new RegExp(e,a?"":"i")}return e}});Ext.define("Ext.util.Point",{radianToDegreeConstant:180/Math.PI,statics:{fromEvent:function(b){var a=b.changedTouches,c=(a&&a.length>0)?a[0]:b;return this.fromTouch(c)},fromTouch:function(a){return new this(a.pageX,a.pageY)},from:function(a){if(!a){return new this(0,0)}if(!(a instanceof this)){return new this(a.x,a.y)}return a}},constructor:function(a,b){if(typeof a=="undefined"){a=0}if(typeof b=="undefined"){b=0}this.x=a;this.y=b;return this},clone:function(){return new this.self(this.x,this.y)},copy:function(){return this.clone.apply(this,arguments)},copyFrom:function(a){this.x=a.x;this.y=a.y;return this},toString:function(){return"Point["+this.x+","+this.y+"]"},equals:function(a){return(this.x===a.x&&this.y===a.y)},isCloseTo:function(c,b){if(typeof b=="number"){b={x:b};b.y=b.x}var a=c.x,f=c.y,e=b.x,d=b.y;return(this.x<=a+e&&this.x>=a-e&&this.y<=f+d&&this.y>=f-d)},isWithin:function(){return this.isCloseTo.apply(this,arguments)},translate:function(a,b){this.x+=a;this.y+=b;return this},roundedEquals:function(a){return(Math.round(this.x)===Math.round(a.x)&&Math.round(this.y)===Math.round(a.y))},getDistanceTo:function(b){var c=this.x-b.x,a=this.y-b.y;return Math.sqrt(c*c+a*a)},getAngleTo:function(b){var c=this.x-b.x,a=this.y-b.y;return Math.atan2(a,c)*this.radianToDegreeConstant}});Ext.define("Ext.util.Region",{statics:{getRegion:function(a){return Ext.fly(a).getPageBox(true)},from:function(a){return new this(a.top,a.right,a.bottom,a.left)}},constructor:function(d,f,a,c){var e=this;e.top=d;e[1]=d;e.right=f;e.bottom=a;e.left=c;e[0]=c},contains:function(b){var a=this;return(b.left>=a.left&&b.right<=a.right&&b.top>=a.top&&b.bottom<=a.bottom)},intersect:function(g){var f=this,d=Math.max(f.top,g.top),e=Math.min(f.right,g.right),a=Math.min(f.bottom,g.bottom),c=Math.max(f.left,g.left);if(a>d&&e>c){return new Ext.util.Region(d,e,a,c)}else{return false}},union:function(g){var f=this,d=Math.min(f.top,g.top),e=Math.max(f.right,g.right),a=Math.max(f.bottom,g.bottom),c=Math.min(f.left,g.left);return new Ext.util.Region(d,e,a,c)},constrainTo:function(b){var a=this,c=Ext.util.Numbers.constrain;a.top=c(a.top,b.top,b.bottom);a.bottom=c(a.bottom,b.top,b.bottom);a.left=c(a.left,b.left,b.right);a.right=c(a.right,b.left,b.right);return a},adjust:function(d,f,a,c){var e=this;e.top+=d;e.left+=c;e.right+=f;e.bottom+=a;return e},getOutOfBoundOffset:function(a,b){if(!Ext.isObject(a)){if(a=="x"){return this.getOutOfBoundOffsetX(b)}else{return this.getOutOfBoundOffsetY(b)}}else{b=a;var c=new Ext.util.Offset();c.x=this.getOutOfBoundOffsetX(b.x);c.y=this.getOutOfBoundOffsetY(b.y);return c}},getOutOfBoundOffsetX:function(a){if(a<=this.left){return this.left-a}else{if(a>=this.right){return this.right-a}}return 0},getOutOfBoundOffsetY:function(a){if(a<=this.top){return this.top-a}else{if(a>=this.bottom){return this.bottom-a}}return 0},isOutOfBound:function(a,b){if(!Ext.isObject(a)){if(a=="x"){return this.isOutOfBoundX(b)}else{return this.isOutOfBoundY(b)}}else{b=a;return(this.isOutOfBoundX(b.x)||this.isOutOfBoundY(b.y))}},isOutOfBoundX:function(a){return(a<this.left||a>this.right)},isOutOfBoundY:function(a){return(a<this.top||a>this.bottom)},restrict:function(b,d,a){if(Ext.isObject(b)){var c;a=d;d=b;if(d.copy){c=d.copy()}else{c={x:d.x,y:d.y}}c.x=this.restrictX(d.x,a);c.y=this.restrictY(d.y,a);return c}else{if(b=="x"){return this.restrictX(d,a)}else{return this.restrictY(d,a)}}},restrictX:function(b,a){if(!a){a=1}if(b<=this.left){b-=(b-this.left)*a}else{if(b>=this.right){b-=(b-this.right)*a}}return b},restrictY:function(b,a){if(!a){a=1}if(b<=this.top){b-=(b-this.top)*a}else{if(b>=this.bottom){b-=(b-this.bottom)*a}}return b},getSize:function(){return{width:this.right-this.left,height:this.bottom-this.top}},copy:function(){return new Ext.util.Region(this.top,this.right,this.bottom,this.left)},toString:function(){return"Region["+this.top+","+this.right+","+this.bottom+","+this.left+"]"},translateBy:function(a){this.left+=a.x;this.right+=a.x;this.top+=a.y;this.bottom+=a.y;return this},round:function(){this.top=Math.round(this.top);this.right=Math.round(this.right);this.bottom=Math.round(this.bottom);this.left=Math.round(this.left);return this},equals:function(a){return(this.top==a.top&&this.right==a.right&&this.bottom==a.bottom&&this.left==a.left)}});Ext.define("Ext.util.Sorter",{isSorter:true,config:{property:null,sorterFn:null,root:null,transform:null,direction:"ASC",id:undefined},constructor:function(a){this.initConfig(a)},applyId:function(a){if(!a){a=this.getProperty();if(!a){a=Ext.id(null,"ext-sorter-")}}return a},createSortFunction:function(b){var c=this,a=c.getDirection().toUpperCase()=="DESC"?-1:1;return function(e,d){return a*b.call(c,e,d)}},defaultSortFn:function(e,c){var g=this,f=g._transform,b=g._root,d,a,h=g._property;if(b!==null){e=e[b];c=c[b]}d=e[h];a=c[h];if(f){d=f(d);a=f(a)}return d>a?1:(d<a?-1:0)},updateDirection:function(){this.updateSortFn()},updateSortFn:function(){this.sort=this.createSortFunction(this.getSorterFn()||this.defaultSortFn)},toggle:function(){this.setDirection(Ext.String.toggle(this.getDirection(),"ASC","DESC"))}});Ext.define("Ext.util.Inflector",{singleton:true,plurals:[[(/(quiz)$/i),"$1zes"],[(/^(ox)$/i),"$1en"],[(/([m|l])ouse$/i),"$1ice"],[(/(matr|vert|ind)ix|ex$/i),"$1ices"],[(/(x|ch|ss|sh)$/i),"$1es"],[(/([^aeiouy]|qu)y$/i),"$1ies"],[(/(hive)$/i),"$1s"],[(/(?:([^f])fe|([lr])f)$/i),"$1$2ves"],[(/sis$/i),"ses"],[(/([ti])um$/i),"$1a"],[(/(buffal|tomat|potat)o$/i),"$1oes"],[(/(bu)s$/i),"$1ses"],[(/(alias|status|sex)$/i),"$1es"],[(/(octop|vir)us$/i),"$1i"],[(/(ax|test)is$/i),"$1es"],[(/^person$/),"people"],[(/^man$/),"men"],[(/^(child)$/),"$1ren"],[(/s$/i),"s"],[(/$/),"s"]],singulars:[[(/(quiz)zes$/i),"$1"],[(/(matr)ices$/i),"$1ix"],[(/(vert|ind)ices$/i),"$1ex"],[(/^(ox)en/i),"$1"],[(/(alias|status)es$/i),"$1"],[(/(octop|vir)i$/i),"$1us"],[(/(cris|ax|test)es$/i),"$1is"],[(/(shoe)s$/i),"$1"],[(/(o)es$/i),"$1"],[(/(bus)es$/i),"$1"],[(/([m|l])ice$/i),"$1ouse"],[(/(x|ch|ss|sh)es$/i),"$1"],[(/(m)ovies$/i),"$1ovie"],[(/(s)eries$/i),"$1eries"],[(/([^aeiouy]|qu)ies$/i),"$1y"],[(/([lr])ves$/i),"$1f"],[(/(tive)s$/i),"$1"],[(/(hive)s$/i),"$1"],[(/([^f])ves$/i),"$1fe"],[(/(^analy)ses$/i),"$1sis"],[(/((a)naly|(b)a|(d)iagno|(p)arenthe|(p)rogno|(s)ynop|(t)he)ses$/i),"$1$2sis"],[(/([ti])a$/i),"$1um"],[(/(n)ews$/i),"$1ews"],[(/people$/i),"person"],[(/s$/i),""]],uncountable:["sheep","fish","series","species","money","rice","information","equipment","grass","mud","offspring","deer","means"],singular:function(b,a){this.singulars.unshift([b,a])},plural:function(b,a){this.plurals.unshift([b,a])},clearSingulars:function(){this.singulars=[]},clearPlurals:function(){this.plurals=[]},isTransnumeral:function(a){return Ext.Array.indexOf(this.uncountable,a)!=-1},pluralize:function(f){if(this.isTransnumeral(f)){return f}var e=this.plurals,d=e.length,a,c,b;for(b=0;b<d;b++){a=e[b];c=a[0];if(c==f||(c.test&&c.test(f))){return f.replace(c,a[1])}}return f},singularize:function(f){if(this.isTransnumeral(f)){return f}var e=this.singulars,d=e.length,a,c,b;for(b=0;b<d;b++){a=e[b];c=a[0];if(c==f||(c.test&&c.test(f))){return f.replace(c,a[1])}}return f},classify:function(a){return Ext.String.capitalize(this.singularize(a))},ordinalize:function(d){var b=parseInt(d,10),c=b%10,a=b%100;if(11<=a&&a<=13){return d+"th"}else{switch(c){case 1:return d+"st";case 2:return d+"nd";case 3:return d+"rd";default:return d+"th"}}}},function(){var b={alumnus:"alumni",cactus:"cacti",focus:"foci",nucleus:"nuclei",radius:"radii",stimulus:"stimuli",ellipsis:"ellipses",paralysis:"paralyses",oasis:"oases",appendix:"appendices",index:"indexes",beau:"beaux",bureau:"bureaux",tableau:"tableaux",woman:"women",child:"children",man:"men",corpus:"corpora",criterion:"criteria",curriculum:"curricula",genus:"genera",memorandum:"memoranda",phenomenon:"phenomena",foot:"feet",goose:"geese",tooth:"teeth",antenna:"antennae",formula:"formulae",nebula:"nebulae",vertebra:"vertebrae",vita:"vitae"},a;for(a in b){this.plural(a,b[a]);this.singular(b[a],a)}});Ext.Anim=Ext.extend(Object,{isAnim:true,disableAnimations:false,defaultConfig:{from:{},to:{},duration:250,delay:0,easing:"ease-in-out",autoClear:true,out:true,direction:null,reverse:false},opposites:{left:"right",right:"left",up:"down",down:"up"},constructor:function(a){a=Ext.apply({},a||{},this.defaultConfig);this.config=a;Ext.Anim.superclass.constructor.call(this);this.running=[]},initConfig:function(c,b){var d=this,a=Ext.apply({},b||{},d.config);a.el=c=Ext.get(c);if(a.reverse&&d.opposites[a.direction]){a.direction=d.opposites[a.direction]}if(d.config.before){d.config.before.call(a,c,a)}if(b.before){b.before.call(a.scope||a,c,a)}return a},run:function(c,a){c=Ext.get(c);a=a||{};var d=this,b=c.dom.style,e,f=a.after;if(d.running[c.id]){d.onTransitionEnd(null,c,{config:a,after:f})}a=this.initConfig(c,a);if(this.disableAnimations){for(e in a.to){if(!a.to.hasOwnProperty(e)){continue}b[e]=a.to[e]}this.onTransitionEnd(null,c,{config:a,after:f});return d}c.un("transitionend",d.onTransitionEnd,d);b.webkitTransitionDuration="0ms";for(e in a.from){if(!a.from.hasOwnProperty(e)){continue}b[e]=a.from[e]}setTimeout(function(){if(!c.dom){return}if(a.is3d===true){c.parent().setStyle({"-webkit-perspective":"1200","-webkit-transform-style":"preserve-3d"})}b.webkitTransitionDuration=a.duration+"ms";b.webkitTransitionProperty="all";b.webkitTransitionTimingFunction=a.easing;c.on("transitionend",d.onTransitionEnd,d,{single:true,config:a,after:f});for(e in a.to){if(!a.to.hasOwnProperty(e)){continue}b[e]=a.to[e]}},a.delay||5);d.running[c.id]=a;return d},onTransitionEnd:function(e,c,g){c=Ext.get(c);if(this.running[c.id]===undefined){return}var b=c.dom.style,a=g.config,d=this,f;if(a.autoClear){for(f in a.to){if(!a.to.hasOwnProperty(f)||a[f]===false){continue}b[f]=""}}b.webkitTransitionDuration=null;b.webkitTransitionProperty=null;b.webkitTransitionTimingFunction=null;if(a.is3d){c.parent().setStyle({"-webkit-perspective":"","-webkit-transform-style":""})}if(d.config.after){d.config.after.call(a,c,a)}if(g.after){g.after.call(a.scope||d,c,a)}delete d.running[c.id]}});Ext.Anim.seed=1000;Ext.Anim.run=function(b,c,a){if(b.isComponent){b=b.element}a=a||{};if(c.isAnim){c.run(b,a)}else{if(Ext.isObject(c)){if(a.before&&c.before){a.before=Ext.createInterceptor(a.before,c.before,c.scope)}if(a.after&&c.after){a.after=Ext.createInterceptor(a.after,c.after,c.scope)}a=Ext.apply({},a,c);c=c.type}if(!Ext.anims[c]){throw c+" is not a valid animation type."}else{if(b&&b.dom){Ext.anims[c].run(b,a)}}}};Ext.anims={fade:new Ext.Anim({type:"fade",before:function(b){var c=1,a=1,e=b.getStyle("z-index")=="auto"?0:b.getStyle("z-index"),d=e;if(this.out){a=0}else{d=Math.abs(e)+1;c=0}this.from={opacity:c,"z-index":d};this.to={opacity:a,"z-index":d}}}),slide:new Ext.Anim({direction:"left",cover:false,reveal:false,opacity:false,"z-index":false,before:function(a){var c=a.getStyle("z-index")=="auto"?0:a.getStyle("z-index"),f=a.getStyle("opacity"),h=c+1,d=this.out,l=this.direction,k=0,i=0,j=0,g=0,b=a.getHeight(),e=a.getWidth();if(l=="left"||l=="right"){if(d){k=-e}else{j=e}}else{if(l=="up"||l=="down"){if(d){i=-b}else{g=b}}}if(l=="right"||l=="down"){i*=-1;k*=-1;g*=-1;j*=-1}if(this.cover&&d){k=0;i=0;h=c}else{if(this.reveal&&!d){j=0;g=0;h=c}}this.from={"-webkit-transform":"translate3d("+j+"px, "+g+"px, 0)","z-index":h,opacity:f-0.01};this.to={"-webkit-transform":"translate3d("+k+"px, "+i+"px, 0)","z-index":h,opacity:f}}}),pop:new Ext.Anim({scaleOnExit:true,before:function(d){var b=1,c=1,g=1,a=1,h=d.getStyle("z-index")=="auto"?0:d.getStyle("z-index"),f=h,e=h;if(!this.out){b=0.01;f=h+1;e=h+1;g=0}else{if(this.scaleOnExit){c=0.01;a=0}else{a=0.8}}this.from={"-webkit-transform":"scale("+b+")","-webkit-transform-origin":"50% 50%",opacity:g,"z-index":f};this.to={"-webkit-transform":"scale("+c+")","-webkit-transform-origin":"50% 50%",opacity:a,"z-index":e}}}),flip:new Ext.Anim({is3d:true,direction:"left",before:function(c){var f="Y",a=1,b=1,e=0,d=0;if(this.out){d=-180;b=0.8}else{e=180;a=0.8}if(this.direction=="up"||this.direction=="down"){f="X"}if(this.direction=="right"||this.direction=="left"){d*=-1;e*=-1}this.from={"-webkit-transform":"rotate"+f+"("+e+"deg) scale("+a+")","-webkit-backface-visibility":"hidden"};this.to={"-webkit-transform":"rotate"+f+"("+d+"deg) scale("+b+")","-webkit-backface-visibility":"hidden"}}}),cube:new Ext.Anim({is3d:true,direction:"left",style:"outer",before:function(b){var k="0% 0%",l=0,a=0,i="Y",f=0,g=0,e=b.getWidth(),d=b.getHeight(),j=true,c=" translateX(0)",h="";if(this.direction=="left"||this.direction=="right"){if(this.out){k="100% 100%";g=e;a=-90}else{k="0% 0%";f=e;l=90}}else{if(this.direction=="up"||this.direction=="down"){i="X";if(this.out){k="100% 100%";g=d;a=90}else{k="0% 0%";f=d;l=-90}}}if(this.direction=="down"||this.direction=="right"){l*=-1;a*=-1;k=(k=="0% 0%")?"100% 100%":"0% 0%"}if(this.style=="inner"){f*=-1;g*=-1;l*=-1;a*=-1;if(!this.out){h=" translateX(0px)";k="0% 50%"}else{h=c;k="100% 50%"}}this.from={"-webkit-transform":"rotate"+i+"("+l+"deg)"+(j?" translateZ("+f+"px)":"")+c,"-webkit-transform-origin":k};this.to={"-webkit-transform":"rotate"+i+"("+a+"deg) translateZ("+g+"px)"+h,"-webkit-transform-origin":k}},duration:250}),wipe:new Ext.Anim({before:function(b){var d=b.getStyle("z-index"),c,a="";if(!this.out){c=d+1;a="-webkit-gradient(linear, left bottom, right bottom, from(transparent), to(#000), color-stop(66%, #000), color-stop(33%, transparent))";this.from={"-webkit-mask-image":a,"-webkit-mask-size":b.getWidth()*3+"px "+b.getHeight()+"px","z-index":c,"-webkit-mask-position-x":0};this.to={"-webkit-mask-image":a,"-webkit-mask-size":b.getWidth()*3+"px "+b.getHeight()+"px","z-index":c,"-webkit-mask-position-x":-b.getWidth()*2+"px"}}},duration:500})};Ext.define("Ext.XTemplateCompiler",{extend:"Ext.XTemplateParser",useEval:Ext.isGecko,useFormat:true,propNameRe:/^[\w\d\$]*$/,compile:function(a){var c=this,b=c.generate(a);return c.useEval?c.evalTpl(b):(new Function("Ext",b))(Ext)},generate:function(a){var c=this;c.body=["var c0=values, p0=parent, n0=xcount, i0=xindex;\n"];c.funcs=["var fm=Ext.util.Format;"];c.switches=[];c.parse(a);c.funcs.push((c.useEval?"$=":"return")+" function ("+c.fnArgs+") {",c.body.join(""),"}");var b=c.funcs.join("\n");return b},doText:function(a){a=a.replace(this.aposRe,"\\'");a=a.replace(this.newLineRe,"\\n");this.body.push("out.push('",a,"')\n")},doExpr:function(a){this.body.push("out.push(String(",a,"))\n")},doTag:function(a){this.doExpr(this.parseTag(a))},doElse:function(){this.body.push("} else {\n")},doEval:function(a){this.body.push(a,"\n")},doIf:function(b,c){var a=this;if(a.propNameRe.test(b)){a.body.push("if (",a.parseTag(b),") {\n")}else{a.body.push("if (",a.addFn(b),a.callFn,") {\n")}if(c.exec){a.doExec(c.exec)}},doElseIf:function(b,c){var a=this;if(a.propNameRe.test(b)){a.body.push("} else if (",a.parseTag(b),") {\n")}else{a.body.push("} else if (",a.addFn(b),a.callFn,") {\n")}if(c.exec){a.doExec(c.exec)}},doSwitch:function(b){var a=this;if(a.propNameRe.test(b)){a.body.push("switch (",a.parseTag(b),") {\n")}else{a.body.push("switch (",a.addFn(b),a.callFn,") {\n")}a.switches.push(0)},doCase:function(e){var d=this,c=Ext.isArray(e)?e:[e],f=d.switches.length-1,a,b;if(d.switches[f]){d.body.push("break;\n")}else{d.switches[f]++}for(b=0,f=c.length;b<f;++b){a=d.intRe.exec(c[b]);c[b]=a?a[1]:("'"+c[b].replace(d.aposRe,"\\'")+"'")}d.body.push("case ",c.join(": case "),":\n")},doDefault:function(){var a=this,b=a.switches.length-1;if(a.switches[b]){a.body.push("break;\n")}else{a.switches[b]++}a.body.push("default:\n")},doEnd:function(b,d){var c=this,a=c.level-1;if(b=="for"){if(d.exec){c.doExec(d.exec)}c.body.push("}\n");c.body.push("parent=p",a,";values=r",a+1,";xcount=n",a,";xindex=i",a,"\n")}else{if(b=="if"||b=="switch"){c.body.push("}\n")}}},doFor:function(e,f){var d=this,c=d.addFn(e),b=d.level,a=b-1;d.body.push("var c",b,"=",c,d.callFn,", a",b,"=Ext.isArray(c",b,"),p",b,"=(parent=c",a,"),r",b,"=values\n","for (var i",b,"=0,n",b,"=a",b,"?c",b,".length:(c",b,"?1:0), xcount=n",b,";i",b,"<n"+b+";++i",b,"){\n","values=a",b,"?c",b,"[i",b,"]:c",b,"\n","xindex=i",b,"+1\n")},doExec:function(c,d){var b=this,a="f"+b.funcs.length;b.funcs.push("function "+a+"("+b.fnArgs+") {"," try { with(values) {","  "+c," }} catch(e) {}","}");b.body.push(a+b.callFn+"\n")},addFn:function(a){var c=this,b="f"+c.funcs.length;if(a==="."){c.funcs.push("function "+b+"("+c.fnArgs+") {"," return values","}")}else{if(a===".."){c.funcs.push("function "+b+"("+c.fnArgs+") {"," return parent","}")}else{c.funcs.push("function "+b+"("+c.fnArgs+") {"," try { with(values) {","  return("+a+")"," }} catch(e) {}","}")}}return b},parseTag:function(b){var a=this.tagRe.exec(b),e=a[1],g=a[2],d=a[3],f=a[4],c;if(e=="."){c='Ext.Array.indexOf(["string", "number", "boolean"], typeof values) > -1 || Ext.isDate(values) ? values : ""'}else{if(e=="#"){c="xindex"}else{if(e.substr(0,7)=="parent."){c=e}else{if((e.indexOf(".")!==-1)&&(e.indexOf("-")===-1)){c="values."+e}else{c="values['"+e+"']"}}}}if(f){c="("+c+f+")"}if(g&&this.useFormat){d=d?","+d:"";if(g.substr(0,5)!="this."){g="fm."+g+"("}else{g+="("}}else{d="";g="("+c+" === undefined ? '' : "}return g+c+d+")"},evalTpl:function($){eval($);return $},newLineRe:/\r\n|\r|\n/g,aposRe:/[']/g,intRe:/^\s*(\d+)\s*$/,tagRe:/([\w-\.\#]+)(?:\:([\w\.]*)(?:\((.*?)?\))?)?(\s?[\+\-\*\/]\s?[\d\.\+\-\*\/\(\)]+)?/},function(){var a=this.prototype;a.fnArgs="out,values,parent,xindex,xcount";a.callFn=".call(this,"+a.fnArgs+")"});Ext.define("Ext.data.Field",{requires:["Ext.data.Types","Ext.data.SortTypes"],alias:"data.field",isField:true,config:{name:null,type:"auto",convert:undefined,dateFormat:null,allowNull:true,defaultValue:undefined,mapping:null,sortType:undefined,sortDir:"ASC",allowBlank:true,persist:true,encode:null,decode:null},constructor:function(a){if(Ext.isString(a)){a={name:a}}this.initConfig(a)},applyType:function(c){var b=Ext.data.Types,a=b.AUTO;if(c){if(Ext.isString(c)){return b[c.toUpperCase()]||a}else{return c}}return a},updateType:function(a,b){var c=this.getConvert();if(b&&c===b.convert){this.setConvert(a.convert)}},applySortType:function(d){var c=Ext.data.SortTypes,a=this.getType(),b=a.sortType;if(d){if(Ext.isString(d)){return c[d]||b}else{return d}}return b},applyConvert:function(b){var a=this.getType().convert;if(b&&b!==a){this._hasCustomConvert=true;return b}else{this._hasCustomConvert=false;return a}},hasCustomConvert:function(){return this._hasCustomConvert}});Ext.define("Ext.data.identifier.Sequential",{extend:"Ext.data.identifier.Simple",alias:"data.identifier.sequential",config:{prefix:"",seed:1},constructor:function(){var a=this;a.callParent(arguments);a.parts=[a.getPrefix(),""]},generate:function(b){var c=this,d=c.parts,a=c.getSeed()+1;c.setSeed(a);d[1]=a;return d.join("")}});Ext.define("Ext.data.writer.Json",{extend:"Ext.data.writer.Writer",alternateClassName:"Ext.data.JsonWriter",alias:"writer.json",config:{root:undefined,encode:false,allowSingle:true,encodeRequest:false},applyRoot:function(a){if(!a&&(this.getEncode()||this.getEncodeRequest())){a="data"}return a},writeRecords:function(d,e){var a=this.getRoot(),f=d.getParams(),b=this.getAllowSingle(),c;if(this.getAllowSingle()&&e&&e.length==1){e=e[0]}if(this.getEncodeRequest()){c=d.getJsonData()||{};if(e&&(e.length||(b&&Ext.isObject(e)))){c[a]=e}d.setJsonData(Ext.apply(c,f||{}));d.setParams(null);d.setMethod("POST");return d}if(!e||!(e.length||(b&&Ext.isObject(e)))){return d}if(this.getEncode()){if(a){f[a]=Ext.encode(e)}else{}}else{c=d.getJsonData()||{};if(a){c[a]=e}else{c=e}d.setJsonData(c)}return d}});Ext.define("Ext.event.Dispatcher",{requires:["Ext.event.ListenerStack","Ext.event.Controller"],statics:{getInstance:function(){if(!this.instance){this.instance=new this()}return this.instance},setInstance:function(a){this.instance=a;return this}},config:{publishers:{}},wildcard:"*",constructor:function(a){this.listenerStacks={};this.activePublishers={};this.publishersCache={};this.noActivePublishers=[];this.controller=null;this.initConfig(a);return this},getListenerStack:function(e,g,c,b){var d=this.listenerStacks,f=d[e],a;b=Boolean(b);if(!f){if(b){d[e]=f={}}else{return null}}f=f[g];if(!f){if(b){d[e][g]=f={}}else{return null}}a=f[c];if(!a){if(b){f[c]=a=new Ext.event.ListenerStack()}else{return null}}return a},getController:function(d,f,c,b){var a=this.controller,e={targetType:d,target:f,eventName:c};if(!a){this.controller=a=new Ext.event.Controller()}if(a.isFiring){a=new Ext.event.Controller()}a.setInfo(e);if(b&&a!==b){a.connect(b)}return a},applyPublishers:function(c){var a,b;this.publishersCache={};for(a in c){if(c.hasOwnProperty(a)){b=c[a];this.registerPublisher(b)}}return c},registerPublisher:function(b){var a=this.activePublishers,c=b.getTargetType(),d=a[c];if(!d){a[c]=d=[]}d.push(b);b.setDispatcher(this);return this},getCachedActivePublishers:function(c,b){var a=this.publishersCache,d;if((d=a[c])&&(d=d[b])){return d}return null},cacheActivePublishers:function(c,b,d){var a=this.publishersCache;if(!a[c]){a[c]={}}a[c][b]=d;return d},getActivePublishers:function(f,b){var g,a,c,e,d;if((g=this.getCachedActivePublishers(f,b))){return g}a=this.activePublishers[f];if(a){g=[];for(c=0,e=a.length;c<e;c++){d=a[c];if(d.handles(b)){g.push(d)}}}else{g=this.noActivePublishers}return this.cacheActivePublishers(f,b,g)},hasListener:function(c,d,b){var a=this.getListenerStack(c,d,b);if(a){return a.count()>0}return false},addListener:function(d,e,a){var f=this.getActivePublishers(d,a),c=f.length,b;if(c>0){for(b=0;b<c;b++){f[b].subscribe(e,a)}}return this.doAddListener.apply(this,arguments)},doAddListener:function(g,h,c,f,e,d,a){var b=this.getListenerStack(g,h,c,true);return b.add(f,e,d,a)},removeListener:function(d,e,a){var f=this.getActivePublishers(d,a),c=f.length,b;if(c>0){for(b=0;b<c;b++){f[b].unsubscribe(e,a)}}return this.doRemoveListener.apply(this,arguments)},doRemoveListener:function(f,g,c,e,d,a){var b=this.getListenerStack(f,g,c);if(b===null){return false}return b.remove(e,d,a)},clearListeners:function(a,e,d){var j=this.listenerStacks,f=arguments.length,b,h,c,g;if(f===3){if(j[a]&&j[a][e]){this.removeListener(a,e,d);delete j[a][e][d]}}else{if(f===2){if(j[a]){b=j[a][e];if(b){for(d in b){if(b.hasOwnProperty(d)){h=this.getActivePublishers(a,d);for(c=0,f=h.length;c<f;c++){h[c].unsubscribe(e,d,true)}}}delete j[a][e]}}}else{if(f===1){h=this.activePublishers[a];for(c=0,f=h.length;c<f;c++){h[c].unsubscribeAll()}delete j[a]}else{h=this.activePublishers;for(a in h){if(h.hasOwnProperty(a)){g=h[a];for(c=0,f=g.length;c<f;c++){g[c].unsubscribeAll()}}}delete this.listenerStacks;this.listenerStacks={}}}}return this},dispatchEvent:function(d,e,a){var f=this.getActivePublishers(d,a),c=f.length,b;if(c>0){for(b=0;b<c;b++){f[b].notify(e,a)}}return this.doDispatchEvent.apply(this,arguments)},doDispatchEvent:function(a,g,f,i,c,b){var h=this.getListenerStack(a,g,f),d=this.getWildcardListenerStacks(a,g,f),e;if((h===null||h.length==0)){if(d.length==0&&!c){return}}else{d.push(h)}e=this.getController(a,g,f,b);e.setListenerStacks(d);e.fire(i,c);return !e.isInterrupted()},getWildcardListenerStacks:function(g,h,d){var f=[],b=this.wildcard,c=d!==b,e=h!==b,a;if(c&&(a=this.getListenerStack(g,h,b))){f.push(a)}if(e&&(a=this.getListenerStack(g,b,d))){f.push(a)}return f}});Ext.define("Ext.event.Dom",{extend:"Ext.event.Event",constructor:function(a){var c=a.target,b;if(c&&c.nodeType!==1){c=c.parentNode}b=a.changedTouches;if(b){b=b[0];this.pageX=b.pageX;this.pageY=b.pageY}else{this.pageX=a.pageX;this.pageY=a.pageY}this.browserEvent=this.event=a;this.target=this.delegatedTarget=c;this.type=a.type;this.timeStamp=this.time=a.timeStamp;if(typeof this.time!="number"){this.time=new Date(this.time).getTime()}return this},stopEvent:function(){this.preventDefault();return this.callParent()},preventDefault:function(){this.browserEvent.preventDefault()},getPageX:function(){return this.browserEvent.pageX},getPageY:function(){return this.browserEvent.pageY},getXY:function(){if(!this.xy){this.xy=[this.getPageX(),this.getPageY()]}return this.xy},getTarget:function(b,c,a){if(arguments.length===0){return this.delegatedTarget}return b?Ext.fly(this.target).findParent(b,c,a):(a?Ext.get(this.target):this.target)},getTime:function(){return this.time},setDelegatedTarget:function(a){this.delegatedTarget=a},makeUnpreventable:function(){this.browserEvent.preventDefault=Ext.emptyFn}});Ext.define("Ext.event.Touch",{extend:"Ext.event.Dom",requires:["Ext.util.Point"],constructor:function(a,b){if(b){this.set(b)}this.touchesMap={};this.changedTouches=this.cloneTouches(a.changedTouches);this.touches=this.cloneTouches(a.touches);this.targetTouches=this.cloneTouches(a.targetTouches);return this.callParent([a])},clone:function(){return new this.self(this)},setTargets:function(a){this.doSetTargets(this.changedTouches,a);this.doSetTargets(this.touches,a);this.doSetTargets(this.targetTouches,a)},doSetTargets:function(f,d){var c,e,g,b,a;for(c=0,e=f.length;c<e;c++){g=f[c];b=g.identifier;a=d[b];if(a){g.targets=a}}},cloneTouches:function(f){var e=this.touchesMap,h=[],d=null,b,c,g,a;for(b=0,c=f.length;b<c;b++){g=f[b];a=g.identifier;if(d!==null&&a===d){a++}d=a;if(!e[a]){e[a]={pageX:g.pageX,pageY:g.pageY,identifier:a,target:g.target,timeStamp:g.timeStamp,point:Ext.util.Point.fromTouch(g),targets:g.targets}}h[b]=e[a]}return h}});Ext.define("Ext.event.publisher.ComponentPaint",{extend:"Ext.event.publisher.Publisher",targetType:"component",handledEvents:["painted","erased"],eventNames:{painted:"painted",erased:"erased"},constructor:function(){this.callParent(arguments);this.hiddenQueue={};this.renderedQueue={}},getSubscribers:function(b,a){var c=this.subscribers;if(!c.hasOwnProperty(b)){if(!a){return null}c[b]={$length:0}}return c[b]},setDispatcher:function(a){var b=this.targetType;a.doAddListener(b,"*","renderedchange","onBeforeComponentRenderedChange",this,null,"before");a.doAddListener(b,"*","hiddenchange","onBeforeComponentHiddenChange",this,null,"before");a.doAddListener(b,"*","renderedchange","onComponentRenderedChange",this,null,"after");a.doAddListener(b,"*","hiddenchange","onComponentHiddenChange",this,null,"after");return this.callParent(arguments)},subscribe:function(d,a){var b=d.match(this.idSelectorRegex),c,e;if(!b){return false}e=b[1];c=this.getSubscribers(a,true);if(c.hasOwnProperty(e)){c[e]++;return true}c[e]=1;c.$length++;return true},unsubscribe:function(e,a,c){var b=e.match(this.idSelectorRegex),d,f;if(!b||!(d=this.getSubscribers(a))){return false}f=b[1];if(!d.hasOwnProperty(f)||(!c&&--d[f]>0)){return true}delete d[f];if(--d.$length===0){delete this.subscribers[a]}return true},onBeforeComponentRenderedChange:function(b,d,g){var f=this.eventNames,c=g?f.painted:f.erased,e=this.getSubscribers(c),a;if(e&&e.$length>0){this.renderedQueue[d.getId()]=a=[];this.publish(e,d,c,a)}},onBeforeComponentHiddenChange:function(c,d){var f=this.eventNames,b=d?f.erased:f.painted,e=this.getSubscribers(b),a;if(e&&e.$length>0){this.hiddenQueue[c.getId()]=a=[];this.publish(e,c,b,a)}},onComponentRenderedChange:function(b,c){var d=this.renderedQueue,e=c.getId(),a;if(!d.hasOwnProperty(e)){return}a=d[e];delete d[e];if(a.length>0){this.dispatchQueue(a)}},onComponentHiddenChange:function(c){var b=this.hiddenQueue,d=c.getId(),a;if(!b.hasOwnProperty(d)){return}a=b[d];delete b[d];if(a.length>0){this.dispatchQueue(a)}},dispatchQueue:function(g){var l=this.dispatcher,a=this.targetType,b=this.eventNames,e=g.slice(),f=e.length,c,k,h,d,j;g.length=0;if(f>0){for(c=0;c<f;c++){k=e[c];h=k.component;d=k.eventName;j=h.isPainted();if((d===b.painted&&j)||d===b.erased&&!j){l.doDispatchEvent(a,"#"+k.id,d,[h])}}e.length=0}},publish:function(a,k,f,j){var c=k.getId(),b=false,d,h,e,g,l;if(a[c]){d=this.eventNames;l=k.isPainted();if((f===d.painted&&!l)||f===d.erased&&l){b=true}else{return this}}if(k.isContainer){h=k.getItems().items;for(e=0,g=h.length;e<g;e++){this.publish(a,h[e],f,j)}}else{if(k.isDecorator){this.publish(a,k.getComponent(),f,j)}}if(b){j.push({id:c,eventName:f,component:k})}}});Ext.define("Ext.event.publisher.Dom",{extend:"Ext.event.publisher.Publisher",requires:["Ext.env.Browser","Ext.Element","Ext.event.Dom"],targetType:"element",idOrClassSelectorRegex:/^([#|\.])([\w\-]+)$/,handledEvents:["click","focus","blur","mousemove","mousedown","mouseup","mouseover","mouseout","keyup","keydown","keypress","submit","transitionend","animationstart","animationend"],classNameSplitRegex:/\s+/,SELECTOR_ALL:"*",constructor:function(){var f=this.getHandledEvents(),e={},b,c,a,d;this.doBubbleEventsMap={click:true,submit:true,mousedown:true,mousemove:true,mouseup:true,mouseover:true,mouseout:true,transitionend:true};this.onEvent=Ext.Function.bind(this.onEvent,this);for(b=0,c=f.length;b<c;b++){a=f[b];d=this.getVendorEventName(a);e[d]=a;this.attachListener(d)}this.eventNameMap=e;return this.callParent()},getSubscribers:function(a){var c=this.subscribers,b=c[a];if(!b){b=c[a]={id:{$length:0},className:{$length:0},selector:[],all:0,$length:0}}return b},getVendorEventName:function(a){if(a==="transitionend"){a=Ext.browser.getVendorProperyName("transitionEnd")}else{if(a==="animationstart"){a=Ext.browser.getVendorProperyName("animationStart")}else{if(a==="animationend"){a=Ext.browser.getVendorProperyName("animationEnd")}}}return a},attachListener:function(a){document.addEventListener(a,this.onEvent,!this.doesEventBubble(a));return this},removeListener:function(a){document.removeEventListener(a,this.onEvent,!this.doesEventBubble(a));return this},doesEventBubble:function(a){return !!this.doBubbleEventsMap[a]},subscribe:function(g,f){if(!this.handles(f)){return false}var e=g.match(this.idOrClassSelectorRegex),a=this.getSubscribers(f),c=a.id,d=a.className,b=a.selector,h,i;if(e!==null){h=e[1];i=e[2];if(h==="#"){if(c.hasOwnProperty(i)){c[i]++;return true}c[i]=1;c.$length++}else{if(d.hasOwnProperty(i)){d[i]++;return true}d[i]=1;d.$length++}}else{if(g===this.SELECTOR_ALL){a.all++}else{if(b.hasOwnProperty(g)){b[g]++;return true}b[g]=1;b.push(g)}}a.$length++;return true},unsubscribe:function(g,f,j){if(!this.handles(f)){return false}var e=g.match(this.idOrClassSelectorRegex),a=this.getSubscribers(f),c=a.id,d=a.className,b=a.selector,h,i;j=Boolean(j);if(e!==null){h=e[1];i=e[2];if(h==="#"){if(!c.hasOwnProperty(i)||(!j&&--c[i]>0)){return true}delete c[i];c.$length--}else{if(!d.hasOwnProperty(i)||(!j&&--d[i]>0)){return true}delete d[i];d.$length--}}else{if(g===this.SELECTOR_ALL){if(j){a.all=0}else{a.all--}}else{if(!b.hasOwnProperty(g)||(!j&&--b[g]>0)){return true}delete b[g];Ext.Array.remove(b,g)}}a.$length--;return true},getElementTarget:function(a){if(a.nodeType!==1){a=a.parentNode;if(!a||a.nodeType!==1){return null}}return a},getBubblingTargets:function(b){var a=[];if(!b){return a}do{a[a.length]=b;b=b.parentNode}while(b&&b.nodeType===1);return a},dispatch:function(c,a,b){b.push(b[0].target);this.callParent(arguments)},publish:function(b,a,c){var d=this.getSubscribers(b),e;if(d.$length===0||!this.doPublish(d,b,a,c)){e=this.getSubscribers("*");if(e.$length>0){this.doPublish(e,b,a,c)}}return this},doPublish:function(f,h,x,u){var r=f.id,g=f.className,b=f.selector,p=r.$length>0,a=g.$length>0,l=b.length>0,o=f.all>0,y={},e=[u],q=false,m=this.classNameSplitRegex,v,k,t,d,z,n,c,w,s;for(v=0,k=x.length;v<k;v++){z=x[v];u.setDelegatedTarget(z);if(p){n=z.id;if(n){if(r.hasOwnProperty(n)){q=true;this.dispatch("#"+n,h,e)}}}if(a){c=z.className;if(c){w=c.split(m);for(t=0,d=w.length;t<d;t++){c=w[t];if(!y[c]){y[c]=true;if(g.hasOwnProperty(c)){q=true;this.dispatch("."+c,h,e)}}}}}if(u.isStopped){return q}}if(o&&!q){u.setDelegatedTarget(u.browserEvent.target);q=true;this.dispatch(this.ALL_SELECTOR,h,e);if(u.isStopped){return q}}if(l){for(t=0,d=x.length;t<d;t++){z=x[t];for(v=0,k=b.length;v<k;v++){s=b[v];if(this.matchesSelector(z,s)){u.setDelegatedTarget(z);q=true;this.dispatch(s,h,e)}if(u.isStopped){return q}}}}return q},matchesSelector:function(b,a){if("webkitMatchesSelector" in b){return b.webkitMatchesSelector(a)}return Ext.DomQuery.is(b,a)},onEvent:function(d){var b=this.eventNameMap[d.type];if(!b||this.getSubscribersCount(b)===0){return}var c=this.getElementTarget(d.target),a;if(!c){return}if(this.doesEventBubble(b)){a=this.getBubblingTargets(c)}else{a=[c]}this.publish(b,a,new Ext.event.Dom(d))},getSubscribersCount:function(a){if(!this.handles(a)){return 0}return this.getSubscribers(a).$length+this.getSubscribers("*").$length}});Ext.define("Ext.event.publisher.TouchGesture",{extend:"Ext.event.publisher.Dom",requires:["Ext.util.Point","Ext.event.Touch"],handledEvents:["touchstart","touchmove","touchend","touchcancel"],moveEventName:"touchmove",config:{moveThrottle:1,buffering:{enabled:false,interval:10},recognizers:{}},currentTouchesCount:0,constructor:function(a){this.processEvents=Ext.Function.bind(this.processEvents,this);this.eventProcessors={touchstart:this.onTouchStart,touchmove:this.onTouchMove,touchend:this.onTouchEnd,touchcancel:this.onTouchEnd};this.eventToRecognizerMap={};this.activeRecognizers=[];this.currentRecognizers=[];this.currentTargets={};this.currentTouches={};this.buffer=[];this.initConfig(a);return this.callParent()},applyBuffering:function(a){if(a.enabled===true){this.bufferTimer=setInterval(this.processEvents,a.interval)}else{clearInterval(this.bufferTimer)}return a},applyRecognizers:function(b){var c,a;for(c in b){if(b.hasOwnProperty(c)){a=b[c];this.registerRecognizer(a)}}return b},handles:function(a){return this.callParent(arguments)||this.eventToRecognizerMap.hasOwnProperty(a)},doesEventBubble:function(){return true},eventLogs:[],onEvent:function(b){var a=this.getBuffering();b=new Ext.event.Touch(b);if(a.enabled){this.buffer.push(b)}else{this.processEvent(b)}},processEvents:function(){var a=this.buffer,f=a.length,d=[],c,e,b;if(f>0){c=a.slice(0);a.length=0;for(b=0;b<f;b++){e=c[b];if(e.type===this.moveEventName){d.push(e)}else{if(d.length>0){this.processEvent(this.mergeEvents(d));d.length=0}this.processEvent(e)}}if(d.length>0){this.processEvent(this.mergeEvents(d));d.length=0}}},mergeEvents:function(c){var b=[],f=c.length,a,e,d;d=c[f-1];if(f===1){return d}for(a=0;a<f;a++){e=c[a];b.push(e.changedTouches)}d.changedTouches=this.mergeTouchLists(b);return d},mergeTouchLists:function(l){var e={},h=[],d,k,a,b,f,c,g;for(d=0,k=l.length;d<k;d++){a=l[d];for(b=0,f=a.length;b<f;b++){c=a[b];g=c.identifier;e[g]=c}}for(g in e){if(e.hasOwnProperty(g)){h.push(e[g])}}return h},registerRecognizer:function(a){var g=this.eventToRecognizerMap,e=this.activeRecognizers,c=a.getHandledEvents(),d,f,b;a.setOnRecognized(this.onRecognized);a.setCallbackScope(this);for(d=0,f=c.length;d<f;d++){b=c[d];g[b]=a}e.push(a);return this},onRecognized:function(f,h,d,a){var k=[],j=d.length,g,c,b;if(j===1){return this.publish(f,d[0].targets,h,a)}for(c=0;c<j;c++){b=d[c];k.push(b.targets)}g=this.getCommonTargets(k);this.publish(f,g,h,a)},publish:function(b,a,c,d){c.set(d);return this.callParent([b,a,c])},getCommonTargets:function(a){var h=a[0],f=a.length;if(f===1){return h}var d=[],e=1,g,b,c;while(true){g=h[h.length-e];if(!g){return d}for(c=1;c<f;c++){b=a[c];if(b[b.length-e]!==g){return d}}d.unshift(g);e++}return d},invokeRecognizers:function(c,g){var b=this.activeRecognizers,f=b.length,d,a;if(c==="onStart"){for(d=0;d<f;d++){b[d].isActive=true}}for(d=0;d<f;d++){a=b[d];if(a.isActive&&a[c].call(a,g)===false){a.isActive=false}}},getActiveRecognizers:function(){return this.activeRecognizers},processEvent:function(a){this.eventProcessors[a.type].call(this,a)},onTouchStart:function(k){var m=this.currentTargets,g=this.currentTouches,o=this.currentTouchesCount,n=k.changedTouches,f=k.touches,h=f.length,a={},l=n.length,d,c,j,b;o+=l;if(o>h){for(d=0;d<h;d++){c=f[d];j=c.identifier;a[j]=true}for(j in g){if(g.hasOwnProperty(j)){if(!a[j]){o--;b=k.clone();c=g[j];c.targets=this.getBubblingTargets(this.getElementTarget(c.target));b.changedTouches=[c];this.onTouchEnd(b)}}}if(o>h){return}}for(d=0;d<l;d++){c=n[d];j=c.identifier;if(!g.hasOwnProperty(j)){this.currentTouchesCount++}g[j]=c;m[j]=this.getBubblingTargets(this.getElementTarget(c.target))}k.setTargets(m);for(d=0;d<l;d++){c=n[d];this.publish("touchstart",c.targets,k,{touch:c})}if(!this.isStarted){this.isStarted=true;this.invokeRecognizers("onStart",k)}this.invokeRecognizers("onTouchStart",k)},onTouchMove:function(j){if(!this.isStarted){return}var l=this.currentTargets,g=this.currentTouches,c=this.getMoveThrottle(),m=j.changedTouches,b=0,f,k,d,n,a,h;j.setTargets(l);for(f=0,k=m.length;f<k;f++){d=m[f];h=d.identifier;n=d.point;a=g[h].point;if(c&&n.isCloseTo(a,c)){b++;continue}g[h]=d;this.publish("touchmove",d.targets,j,{touch:d})}if(b<k){this.invokeRecognizers("onTouchMove",j)}},onTouchEnd:function(d){if(!this.isStarted){return}var h=this.currentTargets,c=this.currentTouches,k=d.changedTouches,g=k.length,j,f,b,a;d.setTargets(h);this.currentTouchesCount-=g;j=(this.currentTouchesCount===0);if(j){this.isStarted=false}for(b=0;b<g;b++){a=k[b];f=a.identifier;delete c[f];delete h[f];this.publish("touchend",a.targets,d,{touch:a})}this.invokeRecognizers("onTouchEnd",d);if(j){this.invokeRecognizers("onEnd",d)}}},function(){if(!Ext.feature.has.Touch){this.override({moveEventName:"mousemove",map:{mouseToTouch:{mousedown:"touchstart",mousemove:"touchmove",mouseup:"touchend"},touchToMouse:{touchstart:"mousedown",touchmove:"mousemove",touchend:"mouseup"}},attachListener:function(a){a=this.map.touchToMouse[a];if(!a){return}return this.callOverridden([a])},lastEventType:null,onEvent:function(d){if("button" in d&&d.button!==0){return}var c=d.type,b=[d];if(c==="mousedown"&&this.lastEventType&&this.lastEventType!=="mouseup"){var a=document.createEvent("MouseEvent");a.initMouseEvent("mouseup",d.bubbles,d.cancelable,document.defaultView,d.detail,d.screenX,d.screenY,d.clientX,d.clientY,d.ctrlKey,d.altKey,d.shiftKey,d.metaKey,d.metaKey,d.button,d.relatedTarget);this.onEvent(a)}if(c!=="mousemove"){this.lastEventType=c}d.identifier=1;d.touches=(c!=="mouseup")?b:[];d.targetTouches=(c!=="mouseup")?b:[];d.changedTouches=b;return this.callOverridden([d])},processEvent:function(a){this.eventProcessors[this.map.mouseToTouch[a.type]].call(this,a)}})}});Ext.define("Ext.event.recognizer.MultiTouch",{extend:"Ext.event.recognizer.Touch",requiredTouchesCount:2,isTracking:false,isStarted:false,onTouchStart:function(d){var a=this.requiredTouchesCount,c=d.touches,b=c.length;if(b===a){this.start(d)}else{if(b>a){this.end(d)}}},onTouchEnd:function(a){this.end(a)},start:function(){if(!this.isTracking){this.isTracking=true;this.isStarted=false}},end:function(a){if(this.isTracking){this.isTracking=false;if(this.isStarted){this.isStarted=false;this.fireEnd(a)}}}});Ext.define("Ext.event.recognizer.Pinch",{extend:"Ext.event.recognizer.MultiTouch",requiredTouchesCount:2,handledEvents:["pinchstart","pinch","pinchend"],startDistance:0,lastTouches:null,onTouchMove:function(c){if(!this.isTracking){return}var b=Array.prototype.slice.call(c.touches),d,a,f;d=b[0].point;a=b[1].point;f=d.getDistanceTo(a);if(f===0){return}if(!this.isStarted){this.isStarted=true;this.startDistance=f;this.fire("pinchstart",c,b,{touches:b,distance:f,scale:1})}else{this.fire("pinch",c,b,{touches:b,distance:f,scale:f/this.startDistance})}this.lastTouches=b},fireEnd:function(a){this.fire("pinchend",a,this.lastTouches)},fail:function(){return this.callParent(arguments)}});Ext.define("Ext.event.recognizer.Rotate",{extend:"Ext.event.recognizer.MultiTouch",requiredTouchesCount:2,handledEvents:["rotatestart","rotate","rotateend"],startAngle:0,lastTouches:null,lastAngle:null,onTouchMove:function(h){if(!this.isTracking){return}var g=Array.prototype.slice.call(h.touches),b=this.lastAngle,d,f,c,a,i,j;d=g[0].point;f=g[1].point;c=d.getAngleTo(f);if(b!==null){j=Math.abs(b-c);a=c+360;i=c-360;if(Math.abs(a-b)<j){c=a}else{if(Math.abs(i-b)<j){c=i}}}this.lastAngle=c;if(!this.isStarted){this.isStarted=true;this.startAngle=c;this.fire("rotatestart",h,g,{touches:g,angle:c,rotation:0})}else{this.fire("rotate",h,g,{touches:g,angle:c,rotation:c-this.startAngle})}this.lastTouches=g},fireEnd:function(a){this.lastAngle=null;this.fire("rotateend",a,this.lastTouches)}});Ext.define("Ext.event.recognizer.SingleTouch",{extend:"Ext.event.recognizer.Touch",inheritableStatics:{NOT_SINGLE_TOUCH:1,TOUCH_MOVED:2},onTouchStart:function(a){if(a.touches.length>1){return this.fail(this.self.NOT_SINGLE_TOUCH)}}});Ext.define("Ext.event.recognizer.DoubleTap",{extend:"Ext.event.recognizer.SingleTouch",config:{maxDuration:300},handledEvents:["singletap","doubletap"],singleTapTimer:null,onTouchStart:function(a){if(this.callParent(arguments)===false){return false}this.startTime=a.time;clearTimeout(this.singleTapTimer)},onTouchMove:function(){return this.fail(this.self.TOUCH_MOVED)},onEnd:function(g){var c=this,b=this.getMaxDuration(),h=g.changedTouches[0],f=g.time,a=this.lastTapTime,d;this.lastTapTime=f;if(a){d=f-a;if(d<=b){this.lastTapTime=0;this.fire("doubletap",g,[h],{touch:h,duration:d});return}}if(f-this.startTime>b){this.fireSingleTap(g,h)}else{this.singleTapTimer=setTimeout(function(){c.fireSingleTap(g,h)},b)}},fireSingleTap:function(a,b){this.fire("singletap",a,[b],{touch:b})}});Ext.define("Ext.event.recognizer.Drag",{extend:"Ext.event.recognizer.SingleTouch",isStarted:false,startPoint:null,previousPoint:null,lastPoint:null,handledEvents:["dragstart","drag","dragend"],onTouchStart:function(b){var c,a;if(this.callParent(arguments)===false){if(this.isStarted&&this.lastMoveEvent!==null){this.onTouchEnd(this.lastMoveEvent)}return false}this.startTouches=c=b.changedTouches;this.startTouch=a=c[0];this.startPoint=a.point},onTouchMove:function(d){var c=d.changedTouches,f=c[0],a=f.point,b=d.time;if(this.lastPoint){this.previousPoint=this.lastPoint}if(this.lastTime){this.previousTime=this.lastTime}this.lastTime=b;this.lastPoint=a;this.lastMoveEvent=d;if(!this.isStarted){this.isStarted=true;this.startTime=b;this.previousTime=b;this.previousPoint=this.startPoint;this.fire("dragstart",d,this.startTouches,this.getInfo(d,this.startTouch))}else{this.fire("drag",d,c,this.getInfo(d,f))}},onTouchEnd:function(c){if(this.isStarted){var b=c.changedTouches,d=b[0],a=d.point;this.isStarted=false;this.lastPoint=a;this.fire("dragend",c,b,this.getInfo(c,d));this.startTime=0;this.previousTime=0;this.lastTime=0;this.startPoint=null;this.previousPoint=null;this.lastPoint=null;this.lastMoveEvent=null}},getInfo:function(j,i){var d=j.time,a=this.startPoint,f=this.previousPoint,b=this.startTime,k=this.previousTime,l=this.lastPoint,h=l.x-a.x,g=l.y-a.y,c={touch:i,startX:a.x,startY:a.y,previousX:f.x,previousY:f.y,pageX:l.x,pageY:l.y,deltaX:h,deltaY:g,absDeltaX:Math.abs(h),absDeltaY:Math.abs(g),previousDeltaX:l.x-f.x,previousDeltaY:l.y-f.y,time:d,startTime:b,previousTime:k,deltaTime:d-b,previousDeltaTime:d-k};return c}});Ext.define("Ext.event.recognizer.LongPress",{extend:"Ext.event.recognizer.SingleTouch",inheritableStatics:{DURATION_NOT_ENOUGH:32},config:{minDuration:1000},handledEvents:["longpress"],fireLongPress:function(a){var b=a.changedTouches[0];this.fire("longpress",a,[b],{touch:b,duration:this.getMinDuration()});this.isLongPress=true},onTouchStart:function(b){var a=this;if(this.callParent(arguments)===false){return false}this.isLongPress=false;this.timer=setTimeout(function(){a.fireLongPress(b)},this.getMinDuration())},onTouchMove:function(){return this.fail(this.self.TOUCH_MOVED)},onTouchEnd:function(){if(!this.isLongPress){return this.fail(this.self.DURATION_NOT_ENOUGH)}},fail:function(){clearTimeout(this.timer);return this.callParent(arguments)}},function(){});Ext.define("Ext.event.recognizer.Tap",{handledEvents:["tap"],extend:"Ext.event.recognizer.SingleTouch",onTouchMove:function(){return this.fail(this.self.TOUCH_MOVED)},onTouchEnd:function(a){var b=a.changedTouches[0];this.fire("tap",a,[b])}},function(){});(function(){function b(d){var c=Array.prototype.slice.call(arguments,1);return d.replace(/\{(\d+)\}/g,function(e,f){return c[f]})}Ext.DateExtras={now:Date.now||function(){return +new Date()},getElapsed:function(d,c){return Math.abs(d-(c||new Date()))},useStrict:false,formatCodeToRegex:function(d,c){var e=a.parseCodes[d];if(e){e=typeof e=="function"?e():e;a.parseCodes[d]=e}return e?Ext.applyIf({c:e.c?b(e.c,c||"{0}"):e.c},e):{g:0,c:null,s:Ext.String.escapeRegex(d)}},parseFunctions:{MS:function(d,c){var e=new RegExp("\\/Date\\(([-+])?(\\d+)(?:[+-]\\d{4})?\\)\\/");var f=(d||"").match(e);return f?new Date(((f[1]||"")+f[2])*1):null}},parseRegexes:[],formatFunctions:{MS:function(){return"\\/Date("+this.getTime()+")\\/"}},y2kYear:50,MILLI:"ms",SECOND:"s",MINUTE:"mi",HOUR:"h",DAY:"d",MONTH:"mo",YEAR:"y",defaults:{},dayNames:["Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday"],monthNames:["January","February","March","April","May","June","July","August","September","October","November","December"],monthNumbers:{Jan:0,Feb:1,Mar:2,Apr:3,May:4,Jun:5,Jul:6,Aug:7,Sep:8,Oct:9,Nov:10,Dec:11},defaultFormat:"m/d/Y",getShortMonthName:function(c){return a.monthNames[c].substring(0,3)},getShortDayName:function(c){return a.dayNames[c].substring(0,3)},getMonthNumber:function(c){return a.monthNumbers[c.substring(0,1).toUpperCase()+c.substring(1,3).toLowerCase()]},formatCodes:{d:"Ext.String.leftPad(this.getDate(), 2, '0')",D:"Ext.Date.getShortDayName(this.getDay())",j:"this.getDate()",l:"Ext.Date.dayNames[this.getDay()]",N:"(this.getDay() ? this.getDay() : 7)",S:"Ext.Date.getSuffix(this)",w:"this.getDay()",z:"Ext.Date.getDayOfYear(this)",W:"Ext.String.leftPad(Ext.Date.getWeekOfYear(this), 2, '0')",F:"Ext.Date.monthNames[this.getMonth()]",m:"Ext.String.leftPad(this.getMonth() + 1, 2, '0')",M:"Ext.Date.getShortMonthName(this.getMonth())",n:"(this.getMonth() + 1)",t:"Ext.Date.getDaysInMonth(this)",L:"(Ext.Date.isLeapYear(this) ? 1 : 0)",o:"(this.getFullYear() + (Ext.Date.getWeekOfYear(this) == 1 && this.getMonth() > 0 ? +1 : (Ext.Date.getWeekOfYear(this) >= 52 && this.getMonth() < 11 ? -1 : 0)))",Y:"Ext.String.leftPad(this.getFullYear(), 4, '0')",y:"('' + this.getFullYear()).substring(2, 4)",a:"(this.getHours() < 12 ? 'am' : 'pm')",A:"(this.getHours() < 12 ? 'AM' : 'PM')",g:"((this.getHours() % 12) ? this.getHours() % 12 : 12)",G:"this.getHours()",h:"Ext.String.leftPad((this.getHours() % 12) ? this.getHours() % 12 : 12, 2, '0')",H:"Ext.String.leftPad(this.getHours(), 2, '0')",i:"Ext.String.leftPad(this.getMinutes(), 2, '0')",s:"Ext.String.leftPad(this.getSeconds(), 2, '0')",u:"Ext.String.leftPad(this.getMilliseconds(), 3, '0')",O:"Ext.Date.getGMTOffset(this)",P:"Ext.Date.getGMTOffset(this, true)",T:"Ext.Date.getTimezone(this)",Z:"(this.getTimezoneOffset() * -60)",c:function(){for(var j="Y-m-dTH:i:sP",g=[],f=0,d=j.length;f<d;++f){var h=j.charAt(f);g.push(h=="T"?"'T'":a.getFormatCode(h))}return g.join(" + ")},U:"Math.round(this.getTime() / 1000)"},isValid:function(n,c,l,j,f,g,e){j=j||0;f=f||0;g=g||0;e=e||0;var k=a.add(new Date(n<100?100:n,c-1,l,j,f,g,e),a.YEAR,n<100?n-100:0);return n==k.getFullYear()&&c==k.getMonth()+1&&l==k.getDate()&&j==k.getHours()&&f==k.getMinutes()&&g==k.getSeconds()&&e==k.getMilliseconds()},parse:function(d,f,c){var e=a.parseFunctions;if(e[f]==null){a.createParser(f)}return e[f](d,Ext.isDefined(c)?c:a.useStrict)},parseDate:function(d,e,c){return a.parse(d,e,c)},getFormatCode:function(d){var c=a.formatCodes[d];if(c){c=typeof c=="function"?c():c;a.formatCodes[d]=c}return c||("'"+Ext.String.escape(d)+"'")},createFormat:function(g){var f=[],c=false,e="";for(var d=0;d<g.length;++d){e=g.charAt(d);if(!c&&e=="\\"){c=true}else{if(c){c=false;f.push("'"+Ext.String.escape(e)+"'")}else{f.push(a.getFormatCode(e))}}}a.formatFunctions[g]=Ext.functionFactory("return "+f.join("+"))},createParser:(function(){var c=["var dt, y, m, d, h, i, s, ms, o, z, zz, u, v,","def = Ext.Date.defaults,","results = String(input).match(Ext.Date.parseRegexes[{0}]);","if(results){","{1}","if(u != null){","v = new Date(u * 1000);","}else{","dt = Ext.Date.clearTime(new Date);","y = Ext.Number.from(y, Ext.Number.from(def.y, dt.getFullYear()));","m = Ext.Number.from(m, Ext.Number.from(def.m - 1, dt.getMonth()));","d = Ext.Number.from(d, Ext.Number.from(def.d, dt.getDate()));","h  = Ext.Number.from(h, Ext.Number.from(def.h, dt.getHours()));","i  = Ext.Number.from(i, Ext.Number.from(def.i, dt.getMinutes()));","s  = Ext.Number.from(s, Ext.Number.from(def.s, dt.getSeconds()));","ms = Ext.Number.from(ms, Ext.Number.from(def.ms, dt.getMilliseconds()));","if(z >= 0 && y >= 0){","v = Ext.Date.add(new Date(y < 100 ? 100 : y, 0, 1, h, i, s, ms), Ext.Date.YEAR, y < 100 ? y - 100 : 0);","v = !strict? v : (strict === true && (z <= 364 || (Ext.Date.isLeapYear(v) && z <= 365))? Ext.Date.add(v, Ext.Date.DAY, z) : null);","}else if(strict === true && !Ext.Date.isValid(y, m + 1, d, h, i, s, ms)){","v = null;","}else{","v = Ext.Date.add(new Date(y < 100 ? 100 : y, m, d, h, i, s, ms), Ext.Date.YEAR, y < 100 ? y - 100 : 0);","}","}","}","if(v){","if(zz != null){","v = Ext.Date.add(v, Ext.Date.SECOND, -v.getTimezoneOffset() * 60 - zz);","}else if(o){","v = Ext.Date.add(v, Ext.Date.MINUTE, -v.getTimezoneOffset() + (sn == '+'? -1 : 1) * (hr * 60 + mn));","}","}","return v;"].join("\n");return function(l){var e=a.parseRegexes.length,m=1,f=[],k=[],j=false,d="";for(var h=0;h<l.length;++h){d=l.charAt(h);if(!j&&d=="\\"){j=true}else{if(j){j=false;k.push(Ext.String.escape(d))}else{var g=a.formatCodeToRegex(d,m);m+=g.g;k.push(g.s);if(g.g&&g.c){f.push(g.c)}}}}a.parseRegexes[e]=new RegExp("^"+k.join("")+"$","i");a.parseFunctions[l]=Ext.functionFactory("input","strict",b(c,e,f.join("")))}})(),parseCodes:{d:{g:1,c:"d = parseInt(results[{0}], 10);\n",s:"(\\d{2})"},j:{g:1,c:"d = parseInt(results[{0}], 10);\n",s:"(\\d{1,2})"},D:function(){for(var c=[],d=0;d<7;c.push(a.getShortDayName(d)),++d){}return{g:0,c:null,s:"(?:"+c.join("|")+")"}},l:function(){return{g:0,c:null,s:"(?:"+a.dayNames.join("|")+")"}},N:{g:0,c:null,s:"[1-7]"},S:{g:0,c:null,s:"(?:st|nd|rd|th)"},w:{g:0,c:null,s:"[0-6]"},z:{g:1,c:"z = parseInt(results[{0}], 10);\n",s:"(\\d{1,3})"},W:{g:0,c:null,s:"(?:\\d{2})"},F:function(){return{g:1,c:"m = parseInt(Ext.Date.getMonthNumber(results[{0}]), 10);\n",s:"("+a.monthNames.join("|")+")"}},M:function(){for(var c=[],d=0;d<12;c.push(a.getShortMonthName(d)),++d){}return Ext.applyIf({s:"("+c.join("|")+")"},a.formatCodeToRegex("F"))},m:{g:1,c:"m = parseInt(results[{0}], 10) - 1;\n",s:"(\\d{2})"},n:{g:1,c:"m = parseInt(results[{0}], 10) - 1;\n",s:"(\\d{1,2})"},t:{g:0,c:null,s:"(?:\\d{2})"},L:{g:0,c:null,s:"(?:1|0)"},o:function(){return a.formatCodeToRegex("Y")},Y:{g:1,c:"y = parseInt(results[{0}], 10);\n",s:"(\\d{4})"},y:{g:1,c:"var ty = parseInt(results[{0}], 10);\ny = ty > Ext.Date.y2kYear ? 1900 + ty : 2000 + ty;\n",s:"(\\d{1,2})"},a:{g:1,c:"if (/(am)/i.test(results[{0}])) {\nif (!h || h == 12) { h = 0; }\n} else { if (!h || h < 12) { h = (h || 0) + 12; }}",s:"(am|pm|AM|PM)"},A:{g:1,c:"if (/(am)/i.test(results[{0}])) {\nif (!h || h == 12) { h = 0; }\n} else { if (!h || h < 12) { h = (h || 0) + 12; }}",s:"(AM|PM|am|pm)"},g:function(){return a.formatCodeToRegex("G")},G:{g:1,c:"h = parseInt(results[{0}], 10);\n",s:"(\\d{1,2})"},h:function(){return a.formatCodeToRegex("H")},H:{g:1,c:"h = parseInt(results[{0}], 10);\n",s:"(\\d{2})"},i:{g:1,c:"i = parseInt(results[{0}], 10);\n",s:"(\\d{2})"},s:{g:1,c:"s = parseInt(results[{0}], 10);\n",s:"(\\d{2})"},u:{g:1,c:"ms = results[{0}]; ms = parseInt(ms, 10)/Math.pow(10, ms.length - 3);\n",s:"(\\d+)"},O:{g:1,c:["o = results[{0}];","var sn = o.substring(0,1),","hr = o.substring(1,3)*1 + Math.floor(o.substring(3,5) / 60),","mn = o.substring(3,5) % 60;","o = ((-12 <= (hr*60 + mn)/60) && ((hr*60 + mn)/60 <= 14))? (sn + Ext.String.leftPad(hr, 2, '0') + Ext.String.leftPad(mn, 2, '0')) : null;\n"].join("\n"),s:"([+-]\\d{4})"},P:{g:1,c:["o = results[{0}];","var sn = o.substring(0,1),","hr = o.substring(1,3)*1 + Math.floor(o.substring(4,6) / 60),","mn = o.substring(4,6) % 60;","o = ((-12 <= (hr*60 + mn)/60) && ((hr*60 + mn)/60 <= 14))? (sn + Ext.String.leftPad(hr, 2, '0') + Ext.String.leftPad(mn, 2, '0')) : null;\n"].join("\n"),s:"([+-]\\d{2}:\\d{2})"},T:{g:0,c:null,s:"[A-Z]{1,4}"},Z:{g:1,c:"zz = results[{0}] * 1;\nzz = (-43200 <= zz && zz <= 50400)? zz : null;\n",s:"([+-]?\\d{1,5})"},c:function(){var e=[],c=[a.formatCodeToRegex("Y",1),a.formatCodeToRegex("m",2),a.formatCodeToRegex("d",3),a.formatCodeToRegex("h",4),a.formatCodeToRegex("i",5),a.formatCodeToRegex("s",6),{c:"ms = results[7] || '0'; ms = parseInt(ms, 10)/Math.pow(10, ms.length - 3);\n"},{c:["if(results[8]) {","if(results[8] == 'Z'){","zz = 0;","}else if (results[8].indexOf(':') > -1){",a.formatCodeToRegex("P",8).c,"}else{",a.formatCodeToRegex("O",8).c,"}","}"].join("\n")}];for(var f=0,d=c.length;f<d;++f){e.push(c[f].c)}return{g:1,c:e.join(""),s:[c[0].s,"(?:","-",c[1].s,"(?:","-",c[2].s,"(?:","(?:T| )?",c[3].s,":",c[4].s,"(?::",c[5].s,")?","(?:(?:\\.|,)(\\d+))?","(Z|(?:[-+]\\d{2}(?::)?\\d{2}))?",")?",")?",")?"].join("")}},U:{g:1,c:"u = parseInt(results[{0}], 10);\n",s:"(-?\\d+)"}},dateFormat:function(c,d){return a.format(c,d)},format:function(d,e){if(a.formatFunctions[e]==null){a.createFormat(e)}var c=a.formatFunctions[e].call(d);return c+""},getTimezone:function(c){return c.toString().replace(/^.* (?:\((.*)\)|([A-Z]{1,4})(?:[\-+][0-9]{4})?(?: -?\d+)?)$/,"$1$2").replace(/[^A-Z]/g,"")},getGMTOffset:function(c,d){var e=c.getTimezoneOffset();return(e>0?"-":"+")+Ext.String.leftPad(Math.floor(Math.abs(e)/60),2,"0")+(d?":":"")+Ext.String.leftPad(Math.abs(e%60),2,"0")},getDayOfYear:function(f){var e=0,h=Ext.Date.clone(f),c=f.getMonth(),g;for(g=0,h.setDate(1),h.setMonth(0);g<c;h.setMonth(++g)){e+=a.getDaysInMonth(h)}return e+f.getDate()-1},getWeekOfYear:(function(){var c=86400000,d=7*c;return function(f){var g=Date.UTC(f.getFullYear(),f.getMonth(),f.getDate()+3)/c,e=Math.floor(g/7),h=new Date(e*d).getUTCFullYear();return e-Math.floor(Date.UTC(h,0,7)/d)+1}})(),isLeapYear:function(c){var d=c.getFullYear();return !!((d&3)==0&&(d%100||(d%400==0&&d)))},getFirstDayOfMonth:function(d){var c=(d.getDay()-(d.getDate()-1))%7;return(c<0)?(c+7):c},getLastDayOfMonth:function(c){return a.getLastDateOfMonth(c).getDay()},getFirstDateOfMonth:function(c){return new Date(c.getFullYear(),c.getMonth(),1)},getLastDateOfMonth:function(c){return new Date(c.getFullYear(),c.getMonth(),a.getDaysInMonth(c))},getDaysInMonth:(function(){var c=[31,28,31,30,31,30,31,31,30,31,30,31];return function(e){var d=e.getMonth();return d==1&&a.isLeapYear(e)?29:c[d]}})(),getSuffix:function(c){switch(c.getDate()){case 1:case 21:case 31:return"st";case 2:case 22:return"nd";case 3:case 23:return"rd";default:return"th"}},clone:function(c){return new Date(c.getTime())},isDST:function(c){return new Date(c.getFullYear(),0,1).getTimezoneOffset()!=c.getTimezoneOffset()},clearTime:function(e,i){if(i){return Ext.Date.clearTime(Ext.Date.clone(e))}var g=e.getDate();e.setHours(0);e.setMinutes(0);e.setSeconds(0);e.setMilliseconds(0);if(e.getDate()!=g){for(var f=1,h=a.add(e,Ext.Date.HOUR,f);h.getDate()!=g;f++,h=a.add(e,Ext.Date.HOUR,f)){}e.setDate(g);e.setHours(h.getHours())}return e},add:function(g,f,h){var i=Ext.Date.clone(g),c=Ext.Date;if(!f||h===0){return i}switch(f.toLowerCase()){case Ext.Date.MILLI:i.setMilliseconds(i.getMilliseconds()+h);break;case Ext.Date.SECOND:i.setSeconds(i.getSeconds()+h);break;case Ext.Date.MINUTE:i.setMinutes(i.getMinutes()+h);break;case Ext.Date.HOUR:i.setHours(i.getHours()+h);break;case Ext.Date.DAY:i.setDate(i.getDate()+h);break;case Ext.Date.MONTH:var e=g.getDate();if(e>28){e=Math.min(e,Ext.Date.getLastDateOfMonth(Ext.Date.add(Ext.Date.getFirstDateOfMonth(g),"mo",h)).getDate())}i.setDate(e);i.setMonth(g.getMonth()+h);break;case Ext.Date.YEAR:i.setFullYear(g.getFullYear()+h);break}return i},between:function(d,f,c){var e=d.getTime();return f.getTime()<=e&&e<=c.getTime()}};var a=Ext.DateExtras;Ext.apply(Ext.Date,a)})();Ext.define("Ext.fx.Easing",{requires:["Ext.fx.easing.Linear"],constructor:function(a){return Ext.factory(a,Ext.fx.easing.Linear,null,"easing")}});Ext.define("Ext.fx.easing.BoundMomentum",{extend:"Ext.fx.easing.Abstract",requires:["Ext.fx.easing.Momentum","Ext.fx.easing.Bounce"],config:{momentum:null,bounce:null,minMomentumValue:0,maxMomentumValue:0,minVelocity:0.01,startVelocity:0},applyMomentum:function(a,b){return Ext.factory(a,Ext.fx.easing.Momentum,b)},applyBounce:function(a,b){return Ext.factory(a,Ext.fx.easing.Bounce,b)},updateStartTime:function(a){this.getMomentum().setStartTime(a);this.callParent(arguments)},updateStartVelocity:function(a){this.getMomentum().setStartVelocity(a)},updateStartValue:function(a){this.getMomentum().setStartValue(a)},reset:function(){this.lastValue=null;this.isBouncingBack=false;this.isOutOfBound=false;return this.callParent(arguments)},getValue:function(){var a=this.getMomentum(),j=this.getBounce(),e=a.getStartVelocity(),f=e>0?1:-1,g=this.getMinMomentumValue(),d=this.getMaxMomentumValue(),c=(f==1)?d:g,h=this.lastValue,i,b;if(e===0){return this.getStartValue()}if(!this.isOutOfBound){i=a.getValue();b=a.getVelocity();if(Math.abs(b)<this.getMinVelocity()){this.isEnded=true}if(i>=g&&i<=d){return i}this.isOutOfBound=true;j.setStartTime(Ext.Date.now()).setStartVelocity(b).setStartValue(c)}i=j.getValue();if(!this.isEnded){if(!this.isBouncingBack){if(h!==null){if((f==1&&i<h)||(f==-1&&i>h)){this.isBouncingBack=true}}}else{if(Math.round(i)==c){this.isEnded=true}}}this.lastValue=i;return i}});Ext.define("Ext.fx.easing.EaseIn",{extend:"Ext.fx.easing.Linear",alias:"easing.ease-in",config:{exponent:4,duration:1500},getValue:function(){var c=Ext.Date.now()-this.getStartTime(),g=this.getDuration(),b=this.getStartValue(),a=this.getEndValue(),h=this.distance,e=c/g,d=Math.pow(e,this.getExponent()),f=b+(d*h);if(c>=g){this.isEnded=true;return a}return f}});Ext.define("Ext.fx.easing.EaseOut",{extend:"Ext.fx.easing.Linear",alias:"easing.ease-out",config:{exponent:4,duration:1500},getValue:function(){var f=Ext.Date.now()-this.getStartTime(),d=this.getDuration(),b=this.getStartValue(),h=this.getEndValue(),a=this.distance,c=f/d,g=1-c,e=1-Math.pow(g,this.getExponent()),i=b+(e*a);if(f>=d){this.isEnded=true;return h}return i}});Ext.define("Ext.mixin.Filterable",{extend:"Ext.mixin.Mixin",requires:["Ext.util.Filter"],mixinConfig:{id:"filterable"},config:{filters:null,filterRoot:null},dirtyFilterFn:false,filterFn:null,filtered:false,applyFilters:function(a,b){if(!b){b=this.createFiltersCollection()}b.clear();this.filtered=false;this.dirtyFilterFn=true;if(a){this.addFilters(a)}return b},createFiltersCollection:function(){this._filters=Ext.create("Ext.util.Collection",function(a){return a.getId()});return this._filters},addFilter:function(a){this.addFilters([a])},addFilters:function(b){var a=this.getFilters();return this.insertFilters(a?a.length:0,b)},insertFilter:function(a,b){return this.insertFilters(a,[b])},insertFilters:function(h,c){if(!Ext.isArray(c)){c=[c]}var j=c.length,a=this.getFilterRoot(),d=this.getFilters(),e=[],f,g,b;if(!d){d=this.createFiltersCollection()}for(g=0;g<j;g++){b=c[g];f={root:a};if(Ext.isFunction(b)){f.filterFn=b}else{if(Ext.isObject(b)){if(!b.isFilter){if(b.fn){b.filterFn=b.fn;delete b.fn}f=Ext.apply(f,b)}else{e.push(b);if(!b.getRoot()){b.setRoot(a)}continue}}}b=Ext.create("Ext.util.Filter",f);e.push(b)}for(g=0,j=e.length;g<j;g++){d.insert(h+g,e[g])}this.dirtyFilterFn=true;if(d.length){this.filtered=true}return d},removeFilters:function(e){if(!Ext.isArray(e)){e=[e]}var d=e.length,c=this.getFilters(),a,b;for(a=0;a<d;a++){b=e[a];if(typeof b==="string"){c.each(function(f){if(f.getProperty()===b){c.remove(f)}})}else{if(typeof b==="function"){c.each(function(f){if(f.getFilterFn()===b){c.remove(f)}})}else{if(b.isFilter){c.remove(b)}else{if(b.property!==undefined&&b.value!==undefined){c.each(function(f){if(f.getProperty()===b.property&&f.getValue()===b.value){c.remove(f)}})}}}}}if(!c.length){this.filtered=false}},updateFilterFn:function(){var a=this.getFilters().items;this.filterFn=function(h){var f=true,g=a.length,b;for(b=0;b<g;b++){var e=a[b],d=e.getFilterFn(),c=e.getScope()||this;f=f&&d.call(c,h)}return f};this.dirtyFilterFn=false;return this.filterFn},filter:function(a){return this.getFilters().length?Ext.Array.filter(a,this.getFilterFn()):a},isFiltered:function(a){return this.getFilters().length?!this.getFilterFn()(a):false},getFilterFn:function(){if(this.dirtyFilterFn){return this.updateFilterFn()}return this.filterFn}});Ext.define("Ext.mixin.Observable",{requires:["Ext.event.Dispatcher"],extend:"Ext.mixin.Mixin",mixins:["Ext.mixin.Identifiable"],mixinConfig:{id:"observable",hooks:{destroy:"destroy"}},alternateClassName:"Ext.util.Observable",isObservable:true,observableType:"observable",validIdRegex:/^([\w\-]+)$/,observableIdPrefix:"#",listenerOptionsRegex:/^(?:delegate|single|delay|buffer|args|prepend)$/,config:{listeners:null,bubbleEvents:null},constructor:function(a){this.initConfig(a)},applyListeners:function(a){if(a){this.addListener(a)}},applyBubbleEvents:function(a){if(a){this.enableBubble(a)}},getOptimizedObservableId:function(){return this.observableId},getObservableId:function(){if(!this.observableId){var a=this.getUniqueId();this.observableId=this.observableIdPrefix+a;this.getObservableId=this.getOptimizedObservableId}return this.observableId},getOptimizedEventDispatcher:function(){return this.eventDispatcher},getEventDispatcher:function(){if(!this.eventDispatcher){this.eventDispatcher=Ext.event.Dispatcher.getInstance();this.getEventDispatcher=this.getOptimizedEventDispatcher;this.getListeners();this.getBubbleEvents()}return this.eventDispatcher},getManagedListeners:function(c,b){var d=c.getUniqueId(),a=this.managedListeners;if(!a){this.managedListeners=a={}}if(!a[d]){a[d]={};c.doAddListener("destroy","clearManagedListeners",this,{single:true,args:[c]})}if(!a[d][b]){a[d][b]=[]}return a[d][b]},getUsedSelectors:function(){var a=this.usedSelectors;if(!a){a=this.usedSelectors=[];a.$map={}}return a},fireEvent:function(a){var b=Array.prototype.slice.call(arguments,1);return this.doFireEvent(a,b)},fireAction:function(c,e,g,f,d,a){var b=typeof g,h;if(e===undefined){e=[]}if(b!="undefined"){h={fn:g,isLateBinding:b=="string",scope:f||this,options:d||{},order:a}}return this.doFireEvent(c,e,h)},doFireEvent:function(b,c,e,a){if(this.eventFiringSuspended){return}var f=this.getObservableId(),d=this.getEventDispatcher();return d.dispatchEvent(this.observableType,f,b,c,e,a)},doAddListener:function(a,i,k,l,c){var e=(k&&k!==this&&k.isIdentifiable),b=this.getUsedSelectors(),f=b.$map,d=this.getObservableId(),g,j,h;if(!l){l={}}if(!k){k=this}if(l.delegate){h=l.delegate;d+=" "+h}if(!(d in f)){f[d]=true;b.push(d)}g=this.addDispatcherListener(d,a,i,k,l,c);if(g&&e){j=this.getManagedListeners(k,a);j.push({delegate:h,scope:k,fn:i,order:c})}return g},addDispatcherListener:function(b,d,f,e,c,a){return this.getEventDispatcher().addListener(this.observableType,b,d,f,e,c,a)},doRemoveListener:function(b,k,m,n,d){var g=(m&&m!==this&&m.isIdentifiable),e=this.getObservableId(),a,l,f,h,c,j;if(n&&n.delegate){j=n.delegate;e+=" "+j}if(!m){m=this}a=this.removeDispatcherListener(e,b,k,m,d);if(a&&g){l=this.getManagedListeners(m,b);for(f=0,h=l.length;f<h;f++){c=l[f];if(c.fn===k&&c.scope===m&&c.delegate===j&&c.order===d){l.splice(f,1);break}}}return a},removeDispatcherListener:function(b,c,e,d,a){return this.getEventDispatcher().removeListener(this.observableType,b,c,e,d,a)},clearManagedListeners:function(d){var j=this.managedListeners,a,c,h,f,e,g,b,k;if(!j){return this}if(d){if(typeof d!="string"){a=d.getUniqueId()}else{a=d}c=j[a];for(f in c){if(c.hasOwnProperty(f)){h=c[f];for(e=0,g=h.length;e<g;e++){b=h[e];k={};if(b.delegate){k.delegate=b.delegate}if(this.doRemoveListener(f,b.fn,b.scope,k,b.order)){e--;g--}}}}delete j[a];return this}for(a in j){if(j.hasOwnProperty(a)){this.clearManagedListeners(a)}}},changeListener:function(l,h,n,p,q,d){var b,m,g,j,a,o,f,k,c,e;if(typeof n!="undefined"){if(typeof h!="string"){for(f=0,k=h.length;f<k;f++){a=h[f];l.call(this,a,n,p,q,d)}return this}l.call(this,h,n,p,q,d)}else{if(Ext.isArray(h)){m=h;for(f=0,k=m.length;f<k;f++){c=m[f];l.call(this,c.event,c.fn,c.scope,c,c.order)}}else{g=this.listenerOptionsRegex;q=h;b=[];m=[];j={};for(a in q){o=q[a];if(a==="scope"){p=o;continue}else{if(a==="order"){d=o;continue}}if(!g.test(a)){e=typeof o;if(e!="string"&&e!="function"){l.call(this,a,o.fn,o.scope||p,o,o.order||d);continue}b.push(a);m.push(o)}else{j[a]=o}}for(f=0,k=b.length;f<k;f++){l.call(this,b[f],m[f],p,j,d)}}}},addListener:function(b,e,d,c,a){return this.changeListener(this.doAddListener,b,e,d,c,a)},addBeforeListener:function(a,d,c,b){return this.addListener(a,d,c,b,"before")},addAfterListener:function(a,d,c,b){return this.addListener(a,d,c,b,"after")},removeListener:function(b,e,d,c,a){return this.changeListener(this.doRemoveListener,b,e,d,c,a)},removeBeforeListener:function(a,d,c,b){return this.removeListener(a,d,c,b,"before")},removeAfterListener:function(a,d,c,b){return this.removeListener(a,d,c,b,"after")},clearListeners:function(){var e=this.getUsedSelectors(),c=this.getEventDispatcher(),b,d,a;for(b=0,d=e.length;b<d;b++){a=e[b];c.clearListeners(this.observableType,a)}},hasListener:function(a){return this.getEventDispatcher().hasListener(this.observableType,this.getObservableId(),a)},suspendEvents:function(a){this.eventFiringSuspended=true},resumeEvents:function(){this.eventFiringSuspended=false},relayEvents:function(b,d,g){var c,f,e,a;if(typeof g=="undefined"){g=""}if(typeof d=="string"){d=[d]}if(Ext.isArray(d)){for(c=0,f=d.length;c<f;c++){e=d[c];a=g+e;b.addListener(e,this.createEventRelayer(a),this)}}else{for(e in d){if(d.hasOwnProperty(e)){a=g+d[e];b.addListener(e,this.createEventRelayer(a),this)}}}return this},relayEvent:function(e,f,h,i,a){var g=typeof f,c=e[e.length-1],d=c.getInfo().eventName,b;e=Array.prototype.slice.call(e,0,-2);e[0]=this;if(g!="undefined"){b={fn:f,scope:h||this,options:i||{},order:a,isLateBinding:g=="string"}}return this.doFireEvent(d,e,b,c)},createEventRelayer:function(a){return function(){return this.doFireEvent(a,Array.prototype.slice.call(arguments,0,-2))}},enableBubble:function(d){var a=this.isBubblingEnabled,c,e,b;if(!a){a=this.isBubblingEnabled={}}if(typeof d=="string"){d=Ext.Array.clone(arguments)}for(c=0,e=d.length;c<e;c++){b=d[c];if(!a[b]){a[b]=true;this.addListener(b,this.createEventBubbler(b),this)}}},createEventBubbler:function(a){return function b(){var c=("getBubbleTarget" in this)?this.getBubbleTarget():null;if(c&&c!==this&&c.isObservable){c.fireAction(a,Array.prototype.slice.call(arguments,0,-2),b,c,null,"after")}}},getBubbleTarget:function(){return false},destroy:function(){if(this.observableId){this.fireEvent("destroy",this);this.clearListeners();this.clearManagedListeners()}},addEvents:Ext.emptyFn},function(){this.createAlias({on:"addListener",un:"removeListener",onBefore:"addBeforeListener",onAfter:"addAfterListener",unBefore:"removeBeforeListener",unAfter:"removeAfterListener"})});Ext.define("Ext.Evented",{alternateClassName:"Ext.EventedBase",mixins:["Ext.mixin.Observable"],statics:{generateSetter:function(e){var c=e.internal,b=e.apply,a=e.changeEvent,d=e.doSet;return function(h){var i=this.initialized,g=this[c],f=this[b];if(f){h=f.call(this,h,g);if(typeof h=="undefined"){return this}}if(h!==g){if(i){this.fireAction(a,[this,h,g],this.doSet,this,{nameMap:e})}else{this[c]=h;this[d].call(this,h,g)}}return this}}},initialized:false,constructor:function(a){this.initialConfig=a;this.initialize()},initialize:function(){this.initConfig(this.initialConfig);this.initialized=true},doSet:function(c,d,b,a){var e=a.nameMap;c[e.internal]=d;c[e.doSet].call(this,d,b)},onClassExtended:function(a,e){if(!e.hasOwnProperty("eventedConfig")){return}var d=Ext.Class,c=e.config,g=e.eventedConfig,b,f;e.config=(c)?Ext.applyIf(c,g):g;for(b in g){if(g.hasOwnProperty(b)){f=d.getConfigNameMap(b);e[f.set]=this.generateSetter(f)}}}});Ext.define("Ext.AbstractComponent",{extend:"Ext.Evented",onClassExtended:function(b,f){if(!f.hasOwnProperty("cachedConfig")){return}var g=b.prototype,c=f.config,e=f.cachedConfig,d=g.cachedConfigList,i=g.hasCachedConfig,a,h;delete f.cachedConfig;g.cachedConfigList=d=(d)?d.slice():[];g.hasCachedConfig=i=(i)?Ext.Object.chain(i):{};if(!c){f.config=c={}}for(a in e){if(e.hasOwnProperty(a)){h=e[a];if(!i[a]){i[a]=true;d.push(a)}c[a]=h}}},getElementConfig:Ext.emptyFn,referenceAttributeName:"reference",referenceSelector:"[reference]",addReferenceNode:function(a,b){Ext.Object.defineProperty(this,a,{get:function(){var c;delete this[a];this[a]=c=new Ext.Element(b);return c},configurable:true})},initElement:function(){var k=this.self.prototype,n=this.getId(),s=[],g=true,x=this.referenceAttributeName,p=false,e,v,b,o,t,d,l,c,f,j,w,m,a,q,h,y,u,r;if(k.hasOwnProperty("renderTemplate")){e=this.renderTemplate.cloneNode(true);v=e.firstChild}else{g=false;p=true;e=document.createDocumentFragment();v=Ext.Element.create(this.getElementConfig(),true);e.appendChild(v)}o=e.querySelectorAll(this.referenceSelector);for(t=0,d=o.length;t<d;t++){l=o[t];c=l.getAttribute(x);if(g){l.removeAttribute(x)}if(c=="element"){l.id=n;this.element=b=new Ext.Element(l)}else{this.addReferenceNode(c,l)}s.push(c)}this.referenceList=s;if(!this.innerElement){this.innerElement=b}if(v===b.dom){this.renderElement=b}else{this.addReferenceNode("renderElement",v)}if(p){f=Ext.Class.configNameCache;j=this.config;w=this.cachedConfigList;m=this.initConfigList;a=this.initConfigMap;q=[];for(t=0,d=w.length;t<d;t++){y=w[t];u=f[y];if(a[y]){a[y]=false;Ext.Array.remove(m,y)}if(j[y]!==null){q.push(y);this[u.get]=this[u.initGet]}}for(t=0,d=q.length;t<d;t++){y=q[t];u=f[y];r=u.internal;this[r]=null;this[u.set].call(this,j[y]);delete this[u.get];k[r]=this[r]}v=this.renderElement.dom;k.renderTemplate=e=document.createDocumentFragment();e.appendChild(v.cloneNode(true));h=e.querySelectorAll("[id]");for(t=0,d=h.length;t<d;t++){b=h[t];b.removeAttribute("id")}for(t=0,d=s.length;t<d;t++){c=s[t];this[c].dom.removeAttribute("reference")}}return this}});Ext.define("Ext.app.Controller",{mixins:{observable:"Ext.mixin.Observable"},config:{refs:{},routes:{},control:{},before:{},application:{},stores:[],models:[],views:[]},constructor:function(a){this.initConfig(a);this.mixins.observable.constructor.call(this,a)},init:Ext.emptyFn,launch:Ext.emptyFn,redirectTo:function(a){return this.getApplication().redirectTo(a)},execute:function(b,a){b.setBeforeFilters(this.getBefore()[b.getAction()]);b.execute()},applyBefore:function(e){var d,a,c,b;for(a in e){d=Ext.Array.from(e[a]);c=d.length;for(b=0;b<c;b++){d[b]=this[d[b]]}e[a]=d}return e},applyControl:function(a){this.control(a,this);return a},applyRefs:function(a){this.ref(a);return a},applyRoutes:function(a){var f=this instanceof Ext.app.Application?this:this.getApplication(),c=f.getRouter(),b,e,d;for(e in a){b=a[e];d={controller:this.$className};if(Ext.isString(b)){d.action=b}else{Ext.apply(d,b)}c.connect(e,d)}return a},applyStores:function(a){return this.getFullyQualified(a,"store")},applyModels:function(a){return this.getFullyQualified(a,"model")},applyViews:function(a){return this.getFullyQualified(a,"view")},getFullyQualified:function(b,e){var f=b.length,a=this.getApplication().getName(),c,d;for(d=0;d<f;d++){c=b[d];if(Ext.isString(c)&&(Ext.Loader.getPrefix(c)===""||c===a)){b[d]=a+"."+e+"."+c}}return b},control:function(a){this.getApplication().control(a,this)},ref:function(b){var e,c,a,d;for(e in b){a=b[e];c="get"+Ext.String.capitalize(e);if(!this[c]){if(Ext.isString(b[e])){d={ref:e,selector:a}}else{d=b[e]}this[c]=Ext.Function.pass(this.getRef,[e,d],this)}this.references=this.references||[];this.references.push(e.toLowerCase())}},getRef:function(d,e,a){this.refCache=this.refCache||{};e=e||{};a=a||{};Ext.apply(e,a);if(e.forceCreate){return Ext.ComponentManager.create(e,"component")}var c=this,b=c.refCache[d];if(!b){c.refCache[d]=b=Ext.ComponentQuery.query(e.selector)[0];if(!b&&e.autoCreate){c.refCache[d]=b=Ext.ComponentManager.create(e,"component")}if(b){b.on("destroy",function(){c.refCache[d]=null})}}return b},hasRef:function(a){return this.references&&this.references.indexOf(a.toLowerCase())!==-1},},function(){});Ext.define("Ext.app.History",{mixins:["Ext.mixin.Observable"],config:{actions:[],updateUrl:true,token:""},constructor:function(a){if(Ext.feature.has.History){window.addEventListener("hashchange",Ext.bind(this.detectStateChange,this))}else{setInterval(Ext.bind(this.detectStateChange,this),50)}this.initConfig(a)},add:function(c,a){this.getActions().push(Ext.factory(c,Ext.app.Action));var b=c.getUrl();if(this.getUpdateUrl()){this.setToken(b);window.location.hash=b}if(a!==true){this.fireEvent("change",b)}this.setToken(b)},back:function(){this.getActions().pop().run()},applyToken:function(a){return a[0]=="#"?a.substr(1):a},detectStateChange:function(){var b=this.applyToken(window.location.hash),a=this.getToken();if(b!=a){this.onStateChange();this.setToken(b)}},onStateChange:function(){this.fireEvent("change",window.location.hash.substr(1))}});Ext.define("Ext.app.Profile",{mixins:{observable:"Ext.mixin.Observable"},config:{namespace:"auto",name:"auto",controllers:[],models:[],views:[],stores:[],application:null},constructor:function(a){this.initConfig(a);this.mixins.observable.constructor.apply(this,arguments)},isActive:function(){return false},launch:Ext.emptyFn,applyNamespace:function(a){if(a=="auto"){a=this.getName()}return a.toLowerCase()},applyName:function(a){if(a=="auto"){var b=this.$className.split(".");a=b[b.length-1]}return a},getDependencies:function(){var c=[],g=Ext.String.format,b=this.getApplication().getName(),d=this.getNamespace(),f={model:this.getModels(),view:this.getViews(),controller:this.getControllers(),store:this.getStores()},e,h,a;for(e in f){h=[];Ext.each(f[e],function(i){if(Ext.isString(i)){if(i.match("\\.")){a=i}else{a=g("{0}.{1}.{2}.{3}",b,e,d,i)}h.push(a);c.push(a)}});f[e]=h}f.all=c;return f}});Ext.define("Ext.app.Application",{extend:"Ext.app.Controller",requires:["Ext.app.History","Ext.app.Profile","Ext.app.Router","Ext.app.Action"],config:{profiles:[],controllers:[],history:{},name:null,appFolder:"app",router:{},controllerInstances:[],profileInstances:[],currentProfile:null,launch:Ext.emptyFn,enableLoader:true},constructor:function(a){a=a||{};Ext.applyIf(a,{application:this});this.initConfig(a);for(var b in a){this[b]=a[b]}if(this.getEnableLoader()!==false){Ext.require(this.getProfiles(),this.onProfilesLoaded,this)}},dispatch:function(e,d){e=e||{};Ext.applyIf(e,{application:this});e=Ext.factory(e,Ext.app.Action);if(e){var c=this.getCurrentProfile(),b=c?c.getNamespace():undefined,a=this.getController(e.getController(),b);if(a){if(d!==false){this.getHistory().add(e,true)}a.execute(e)}}},redirectTo:function(c){if(Ext.data&&Ext.data.Model&&c instanceof Ext.data.Model){var a=c;c=a.toUrl()}var b=this.getRouter().recognize(c);if(b){b.url=c;if(a){b.data={};b.data.record=a}return this.dispatch(b)}},control:function(h,d){d=d||this;var i=this.getEventDispatcher(),g=(d)?d.getRefs():{},c,e,b,f,a;for(c in h){if(h.hasOwnProperty(c)){f=h[c];a=g[c];if(a){c=a.selector||a}for(e in f){b=f[e];if(Ext.isString(b)){b=d[b]}i.addListener("component",c,e,b,d)}}}},getController:function(b,d){var f=this.getControllerInstances(),a=this.getName(),e=Ext.String.format,c;if(b instanceof Ext.app.Controller){return b}if(f[b]){return f[b]}else{c=e("{0}.controller.{1}",a,b);d=e("{0}.controller.{1}.{2}",a,d,b);return f[d]||f[c]}},onProfilesLoaded:function(){var b=this.getProfiles(),e=b.length,g=[],d=this.gatherDependencies(),f,c,a;for(c=0;c<e;c++){g[c]=Ext.create(b[c],{application:this});a=g[c].getDependencies();d=d.concat(a.all);if(g[c].isActive()&&!f){f=g[c];this.setCurrentProfile(f);this.setControllers(this.getControllers().concat(a.controller));this.setModels(this.getModels().concat(a.model));this.setViews(this.getViews().concat(a.view));this.setStores(this.getStores().concat(a.store))}}this.setProfileInstances(g);Ext.require(d,this.loadControllerDependencies,this)},loadControllerDependencies:function(){this.instantiateStores();this.instantiateControllers();var e=this.getControllerInstances(),d=[],c,a,b;for(b in e){a=e[b];d=d.concat(a.getModels().concat(a.getViews()).concat(a.getStores()))}Ext.require(d,this.onDependenciesLoaded,this)},onDependenciesLoaded:function(){var c=this,b=this.getCurrentProfile(),e=this.getLaunch(),d,a;d=this.getControllerInstances();for(a in d){d[a].init(this)}if(b){b.launch()}e.call(c);for(a in d){d[a].launch(this)}c.redirectTo(window.location.hash.substr(1))},gatherDependencies:function(){var a=this.getModels().concat(this.getViews()).concat(this.getControllers());Ext.each(this.getStores(),function(b){if(Ext.isString(b)){a.push(b)}},this);return a},instantiateStores:function(){var b=this.getStores(),f=b.length,c,a,d,g,e;for(e=0;e<f;e++){c=b[e];if(Ext.data&&Ext.data.Store&&!(c instanceof Ext.data.Store)){if(Ext.isString(c)){d=c;a=Ext.ClassManager.classes[c];c={xclass:c};if(a.prototype.defaultConfig.storeId===undefined){g=d.split(".");c.id=g[g.length-1]}}b[e]=Ext.factory(c,Ext.data.Store)}}this.setStores(b)},instantiateControllers:function(){var e=this.getControllers(),d={},c=e.length,a,b;for(b=0;b<c;b++){a=e[b];d[a]=Ext.create(a,{application:this})}return this.setControllerInstances(d)},applyControllers:function(a){return this.getFullyQualified(a,"controller")},applyProfiles:function(a){return this.getFullyQualified(a,"profile")},applyName:function(a){var b;if(a&&a.match(/ /g)){b=a;a=a.replace(/ /g,"")}return a},updateName:function(a){Ext.ClassManager.setNamespace(a+".app",this);if(!Ext.Loader.config.paths[a]){Ext.Loader.setPath(a,this.getAppFolder())}},applyRouter:function(a){return Ext.factory(a,Ext.app.Router,this.getRouter())},applyHistory:function(a){var b=Ext.factory(a,Ext.app.History,this.getHistory());b.on("change",this.onHistoryChange,this);return b},onHistoryChange:function(a){this.dispatch(this.getRouter().recognize(a),false)}},function(){});Ext.define("Ext.data.Batch",{mixins:{observable:"Ext.mixin.Observable"},config:{autoStart:false,pauseOnException:true,proxy:null},current:-1,total:0,isRunning:false,isComplete:false,hasException:false,constructor:function(a){var b=this;b.initConfig(a);b.operations=[]},add:function(a){this.total++;a.setBatch(this);this.operations.push(a)},start:function(){this.hasException=false;this.isRunning=true;this.runNextOperation()},runNextOperation:function(){this.runOperation(this.current+1)},pause:function(){this.isRunning=false},runOperation:function(d){var e=this,c=e.operations,b=c[d],a;if(b===undefined){e.isRunning=false;e.isComplete=true;e.fireEvent("complete",e,c[c.length-1])}else{e.current=d;a=function(f){var g=f.hasException();if(g){e.hasException=true;e.fireEvent("exception",e,f)}else{e.fireEvent("operationcomplete",e,f)}if(g&&e.getPauseOnException()){e.pause()}else{f.setCompleted();e.runNextOperation()}};b.setStarted();e.getProxy()[b.getAction()](b,a,e)}}});Ext.define("Ext.data.Connection",{mixins:{observable:"Ext.util.Observable"},statics:{requestId:0},config:{url:null,async:true,method:null,username:"",password:"",disableCaching:true,disableCachingParam:"_dc",timeout:30000,extraParams:null,defaultHeaders:null,useDefaultHeader:true,defaultPostHeader:"application/x-www-form-urlencoded; charset=UTF-8",useDefaultXhrHeader:true,defaultXhrHeader:"XMLHttpRequest",autoAbort:false},textAreaRe:/textarea/i,multiPartRe:/multipart\/form-data/i,lineBreakRe:/\r\n/g,constructor:function(a){this.initConfig(a);this.requests={}},request:function(j){j=j||{};var f=this,i=j.scope||window,e=j.username||f.getUsername(),g=j.password||f.getPassword()||"",b,c,d,a,h;if(f.fireEvent("beforerequest",f,j)!==false){c=f.setOptions(j,i);if(this.isFormUpload(j)===true){this.upload(j.form,c.url,c.data,j);return null}if(j.autoAbort===true||f.getAutoAbort()){f.abort()}h=this.getXhrInstance();b=j.async!==false?(j.async||f.getAsync()):false;if(e){h.open(c.method,c.url,b,e,g)}else{h.open(c.method,c.url,b)}a=f.setupHeaders(h,j,c.data,c.params);d={id:++this.self.requestId,xhr:h,headers:a,options:j,async:b,timeout:setTimeout(function(){d.timedout=true;f.abort(d)},j.timeout||f.getTimeout())};f.requests[d.id]=d;if(b){h.onreadystatechange=Ext.Function.bind(f.onStateChange,f,[d])}h.send(c.data);if(!b){return this.onComplete(d)}return d}else{Ext.callback(j.callback,j.scope,[j,undefined,undefined]);return null}},upload:function(e,c,i,k){e=Ext.getDom(e);k=k||{};var d=Ext.id(),g=document.createElement("iframe"),j=[],h="multipart/form-data",f={target:e.target,method:e.method,encoding:e.encoding,enctype:e.enctype,action:e.action},b=function(l,m){a=document.createElement("input");Ext.fly(a).set({type:"hidden",value:m,name:l});e.appendChild(a);j.push(a)},a;Ext.fly(g).set({id:d,name:d,cls:Ext.baseCSSPrefix+"hide-display",src:Ext.SSL_SECURE_URL});document.body.appendChild(g);if(document.frames){document.frames[d].name=d}Ext.fly(e).set({target:d,method:"POST",enctype:h,encoding:h,action:c||f.action});if(i){Ext.iterate(Ext.Object.fromQueryString(i),function(l,m){if(Ext.isArray(m)){Ext.each(m,function(n){b(l,n)})}else{b(l,m)}})}Ext.fly(g).on("load",Ext.Function.bind(this.onUploadComplete,this,[g,k]),null,{single:true});e.submit();Ext.fly(e).set(f);Ext.each(j,function(l){Ext.removeNode(l)})},onUploadComplete:function(h,b){var c=this,a={responseText:"",responseXML:null},g,f;try{g=h.contentWindow.document||h.contentDocument||window.frames[id].document;if(g){if(g.body){if(this.textAreaRe.test((f=g.body.firstChild||{}).tagName)){a.responseText=f.value}else{a.responseText=g.body.innerHTML}}a.responseXML=g.XMLDocument||g}}catch(d){}c.fireEvent("requestcomplete",c,a,b);Ext.callback(b.success,b.scope,[a,b]);Ext.callback(b.callback,b.scope,[b,true,a]);setTimeout(function(){Ext.removeNode(h)},100)},isFormUpload:function(a){var b=this.getForm(a);if(b){return(a.isUpload||(this.multiPartRe).test(b.getAttribute("enctype")))}return false},getForm:function(a){return Ext.getDom(a.form)||null},setOptions:function(k,j){var h=this,e=k.params||{},g=h.getExtraParams(),d=k.urlParams,c=k.url||h.getUrl(),i=k.jsonData,b,a,f;if(Ext.isFunction(e)){e=e.call(j,k)}if(Ext.isFunction(c)){c=c.call(j,k)}c=this.setupUrl(k,c);f=k.rawData||k.xmlData||i||null;if(i&&!Ext.isPrimitive(i)){f=Ext.encode(f)}if(Ext.isObject(e)){e=Ext.Object.toQueryString(e)}if(Ext.isObject(g)){g=Ext.Object.toQueryString(g)}e=e+((g)?((e)?"&":"")+g:"");d=Ext.isObject(d)?Ext.Object.toQueryString(d):d;e=this.setupParams(k,e);b=(k.method||h.getMethod()||((e||f)?"POST":"GET")).toUpperCase();this.setupMethod(k,b);a=k.disableCaching!==false?(k.disableCaching||h.getDisableCaching()):false;if(b==="GET"&&a){c=Ext.urlAppend(c,(k.disableCachingParam||h.getDisableCachingParam())+"="+(new Date().getTime()))}if((b=="GET"||f)&&e){c=Ext.urlAppend(c,e);e=null}if(d){c=Ext.urlAppend(c,d)}return{url:c,method:b,data:f||e||null}},setupUrl:function(b,a){var c=this.getForm(b);if(c){a=a||c.action}return a},setupParams:function(a,d){var c=this.getForm(a),b;if(c&&!this.isFormUpload(a)){b=Ext.Element.serializeForm(c);d=d?(d+"&"+b):b}return d},setupMethod:function(a,b){if(this.isFormUpload(a)){return"POST"}return b},setupHeaders:function(l,m,d,c){var h=this,b=Ext.apply({},m.headers||{},h.getDefaultHeaders()||{}),k=h.getDefaultPostHeader(),i=m.jsonData,a=m.xmlData,j,f;if(!b["Content-Type"]&&(d||c)){if(d){if(m.rawData){k="text/plain"}else{if(a&&Ext.isDefined(a)){k="text/xml"}else{if(i&&Ext.isDefined(i)){k="application/json"}}}}b["Content-Type"]=k}if(h.getUseDefaultXhrHeader()&&!b["X-Requested-With"]){b["X-Requested-With"]=h.getDefaultXhrHeader()}try{for(j in b){if(b.hasOwnProperty(j)){f=b[j];l.setRequestHeader(j,f)}}}catch(g){h.fireEvent("exception",j,f)}if(m.withCredentials){l.withCredentials=m.withCredentials}return b},getXhrInstance:(function(){var b=[function(){return new XMLHttpRequest()},function(){return new ActiveXObject("MSXML2.XMLHTTP.3.0")},function(){return new ActiveXObject("MSXML2.XMLHTTP")},function(){return new ActiveXObject("Microsoft.XMLHTTP")}],c=0,a=b.length,f;for(;c<a;++c){try{f=b[c];f();break}catch(d){}}return f})(),isLoading:function(a){if(!(a&&a.xhr)){return false}var b=a.xhr.readyState;return !(b===0||b==4)},abort:function(b){var a=this,d=a.requests,c;if(b&&a.isLoading(b)){b.xhr.onreadystatechange=null;b.xhr.abort();a.clearTimeout(b);if(!b.timedout){b.aborted=true}a.onComplete(b);a.cleanup(b)}else{if(!b){for(c in d){if(d.hasOwnProperty(c)){a.abort(d[c])}}}}},abortAll:function(){this.abort()},onStateChange:function(a){if(a.xhr.readyState==4){this.clearTimeout(a);this.onComplete(a);this.cleanup(a)}},clearTimeout:function(a){clearTimeout(a.timeout);delete a.timeout},cleanup:function(a){a.xhr=null;delete a.xhr},onComplete:function(f){var d=this,c=f.options,a,h,b;try{a=d.parseStatus(f.xhr.status);if(f.timedout){a.success=false}}catch(g){a={success:false,isException:false}}h=a.success;if(h){b=d.createResponse(f);d.fireEvent("requestcomplete",d,b,c);Ext.callback(c.success,c.scope,[b,c])}else{if(a.isException||f.aborted||f.timedout){b=d.createException(f)}else{b=d.createResponse(f)}d.fireEvent("requestexception",d,b,c);Ext.callback(c.failure,c.scope,[b,c])}Ext.callback(c.callback,c.scope,[c,h,b]);delete d.requests[f.id];return b},parseStatus:function(a){a=a==1223?204:a;var c=(a>=200&&a<300)||a==304||a==0,b=false;if(!c){switch(a){case 12002:case 12029:case 12030:case 12031:case 12152:case 13030:b=true;break}}return{success:c,isException:b}},createResponse:function(c){var g=c.xhr,a={},h,d,i,e,f,b;if(c.timedout||c.aborted){c.success=false;h=[]}else{h=g.getAllResponseHeaders().replace(this.lineBreakRe,"\n").split("\n")}d=h.length;while(d--){i=h[d];e=i.indexOf(":");if(e>=0){f=i.substr(0,e).toLowerCase();if(i.charAt(e+1)==" "){++e}a[f]=i.substr(e+1)}}c.xhr=null;delete c.xhr;b={request:c,requestId:c.id,status:g.status,statusText:g.statusText,getResponseHeader:function(j){return a[j.toLowerCase()]},getAllResponseHeaders:function(){return a},responseText:g.responseText,responseXML:g.responseXML};g=null;return b},createException:function(a){return{request:a,requestId:a.id,status:a.aborted?-1:0,statusText:a.aborted?"transaction aborted":"communication failure",aborted:a.aborted,timedout:a.timedout}}});Ext.define("Ext.Ajax",{extend:"Ext.data.Connection",singleton:true,autoAbort:false});Ext.define("Ext.data.reader.Reader",{requires:["Ext.data.ResultSet"],alternateClassName:["Ext.data.Reader","Ext.data.DataReader"],mixins:["Ext.mixin.Observable"],isReader:true,config:{idProperty:undefined,clientIdProperty:"clientId",totalProperty:"total",successProperty:"success",messageProperty:null,rootProperty:"",implicitIncludes:true,model:undefined},constructor:function(a){this.initConfig(a)},fieldCount:0,applyModel:function(a){if(typeof a=="string"){a=Ext.data.ModelManager.getModel(a);if(!a){Ext.Logger.error("Model with name "+arguments[0]+" doesnt exist.")}}if(a&&!a.prototype.isModel&&Ext.isObject(a)){a=Ext.data.ModelManager.registerType(a.storeId||a.id||Ext.id(),a)}return a},applyIdProperty:function(a){if(!a&&this.getModel()){a=this.getModel().getIdProperty()}return a},updateModel:function(a){if(a){if(!this.getIdProperty()){this.setIdProperty(a.getIdProperty())}this.buildExtractors()}},createAccessor:Ext.emptyFn,createFieldAccessExpression:function(){return"undefined"},buildExtractors:function(){if(!this.getModel()){return}var b=this,c=b.getTotalProperty(),a=b.getSuccessProperty(),d=b.getMessageProperty();if(c){b.getTotal=b.createAccessor(c)}if(a){b.getSuccess=b.createAccessor(a)}if(d){b.getMessage=b.createAccessor(d)}b.extractRecordData=b.buildRecordDataExtractor()},buildRecordDataExtractor:function(){var k=this,e=k.getModel(),g=e.getFields(),j=g.length,a=[],h=k.getModel().getClientIdProperty(),f="__field",b=["var me = this,\n","    fields = me.getModel().getFields(),\n","    idProperty = me.getIdProperty(),\n",'    idPropertyIsFn = (typeof idProperty == "function"),',"    value,\n","    internalId"],d,l,c,m;g=g.items;for(d=0;d<j;d++){l=g[d];m=l.getName();if(m===e.getIdProperty()){a[d]="idField"}else{a[d]=f+d}b.push(",\n    ",a[d],' = fields.get("',l.getName(),'")')}b.push(";\n\n    return function(source) {\n        var dest = {};\n");b.push("        if (idPropertyIsFn) {\n");b.push("            idField.setMapping(idProperty);\n");b.push("        }\n");for(d=0;d<j;d++){l=g[d];c=a[d];m=l.getName();if(m===e.getIdProperty()&&l.getMapping()===null){l.setMapping(this.getIdProperty())}b.push('        dest["'+l.getName()+'"]'," = ",k.createFieldAccessExpression(l,c,"source"),";\n")}if(h){b.push("        internalId = "+k.createFieldAccessExpression(Ext.create("Ext.data.Field",{name:h}),null,"source")+";\n");b.push("        if (internalId !== undefined) {\n");b.push('            dest["_clientId"] = internalId;\n        }\n')}b.push("        return dest;\n");b.push("    };");return Ext.functionFactory(b.join("")).call(k)},getFields:function(){return this.getModel().getFields().items},getData:function(a){return a},getResponseData:function(a){return a},getRoot:function(a){return a},read:function(c){var g=c,h=this.getModel(),e,b,d,f,a;if(c){g=this.getResponseData(c)}if(g){e=this.readRecords(g);b=e.getRecords();for(d=0,f=b.length;d<f;d++){a=b[d];b[d]=new h(a.data,a.id,a.node)}return e}else{return this.nullResultSet}},process:function(a){var b=a;if(a){b=this.getResponseData(a)}if(b){return this.readRecords(b)}else{return this.nullResultSet}},readRecords:function(c){var d=this;d.rawData=c;c=d.getData(c);if(c.metaData){d.onMetaChange(c.metaData)}var f=Ext.isArray(c)?c:d.getRoot(c),h=true,b=0,e,g,a,i;if(d.getTotalProperty()){g=parseInt(d.getTotal(c),10);if(!isNaN(g)){e=g}}if(d.getSuccessProperty()){g=d.getSuccess(c);if(g===false||g==="false"){h=false}}if(d.getMessageProperty()){i=d.getMessage(c)}if(f){a=d.extractData(f);b=a.length}else{b=0;a=[]}return new Ext.data.ResultSet({total:e,count:b,records:a,success:h,message:i})},extractData:function(l){var j=this,e=[],c=l.length,h=j.getModel(),m=h.getIdProperty(),k=h.getFields(),d,g,f,b,a;if(k.isDirty){j.buildExtractors(true);delete k.isDirty}if(!l.length&&Ext.isObject(l)){l=[l];c=1}for(g=0;g<c;g++){a=null;b=null;d=l[g];f=j.extractRecordData(d);if(f._clientId!==undefined){a=f._clientId;delete f._clientId}if(f[m]!==undefined){b=f[m]}if(j.getImplicitIncludes()){j.readAssociated(f,d)}e.push({clientId:a,id:b,data:f,node:d})}return e},readAssociated:function(h,g){var e=this.getModel().associations.items,d=0,f=e.length,a,c,b;for(;d<f;d++){a=e[d];b=a.getAssociationKey();c=this.getAssociatedDataRoot(g,b);if(c){h[b]=c}}},getAssociatedDataRoot:function(b,a){return b[a]},onMetaChange:function(f){var a=f.fields,e=this,d,c,b;e.metaData=f;if(f.rootProperty!==undefined){e.setRootProperty(f.rootProperty)}else{if(f.root!==undefined){e.setRootProperty(f.root)}}if(f.idProperty!==undefined){e.setIdProperty(f.idProperty)}if(f.totalProperty!==undefined){e.setTotalProperty(f.totalProperty)}if(f.successProperty!==undefined){e.setSuccessProperty(f.successProperty)}if(f.messageProperty!==undefined){e.setMessageProperty(f.messageProperty)}if(a){if(e.getModel()){e.getModel().setFields(a);e.buildExtractors()}else{b=e.getIdProperty();c={fields:a};if(b){c.idProperty=b}d=Ext.define("Ext.data.reader.MetaModel"+Ext.id(),{extend:"Ext.data.Model",config:c});e.setModel(d)}}else{e.buildExtractors()}}},function(){Ext.apply(this.prototype,{nullResultSet:new Ext.data.ResultSet({total:0,count:0,records:[],success:true})})});Ext.define("Ext.data.reader.Json",{extend:"Ext.data.reader.Reader",alternateClassName:"Ext.data.JsonReader",alias:"reader.json",config:{record:null,useSimpleAccessors:false},objectRe:/[\[\.]/,getResponseData:function(a){var d=a;if(a&&a.responseText){d=a.responseText}if(typeof d!=="string"){return d}var c;try{c=Ext.decode(d)}catch(b){this.fireEvent("exception",this,a,"Unable to parse the JSON returned by the server: "+b.toString());Ext.Logger.warn("Unable to parse the JSON returned by the server: "+b.toString())}return c},buildExtractors:function(){var b=this,a=b.getRootProperty();b.callParent(arguments);if(a){b.rootAccessor=b.createAccessor(a)}else{delete b.rootAccessor}},getRoot:function(b){var a=this.getModel().getFields();if(a.isDirty){this.buildExtractors(true);delete a.isDirty}if(this.rootAccessor){return this.rootAccessor.call(this,b)}else{return b}},extractData:function(a){var e=this.getRecord(),d=[],c,b;if(e){c=a.length;if(!c&&Ext.isObject(a)){c=1;a=[a]}for(b=0;b<c;b++){d[b]=a[b][e]}}else{d=a}return this.callParent([d])},createAccessor:function(){var a=/[\[\.]/;return function(c){if(Ext.isEmpty(c)){return Ext.emptyFn}if(Ext.isFunction(c)){return c}if(this.getUseSimpleAccessors()!==true){var b=String(c).search(a);if(b>=0){return Ext.functionFactory("obj","var value; try {value = obj"+(b>0?".":"")+c+"} catch(e) {}; return value;")}}return function(d){return d[c]}}}(),createFieldAccessExpression:function(g,b,c){var f=this,h=f.objectRe,e=(g.getMapping()!==null),a=e?g.getMapping():g.getName(),i,d;if(typeof a==="function"){i=b+".getMapping()("+c+", this)"}else{if(f.getUseSimpleAccessors()===true||((d=String(a).search(h))<0)){if(!e||isNaN(a)){a='"'+a+'"'}i=c+"["+a+"]"}else{i=c+(d>0?".":"")+a}}return i}});Ext.define("Ext.data.proxy.Proxy",{extend:"Ext.Evented",alias:"proxy.proxy",alternateClassName:["Ext.data.DataProxy","Ext.data.Proxy"],requires:["Ext.data.reader.Json","Ext.data.writer.Json"],uses:["Ext.data.Batch","Ext.data.Operation","Ext.data.Model"],config:{batchOrder:"create,update,destroy",batchActions:true,model:null,reader:{type:"json"},writer:{type:"json"}},isProxy:true,applyModel:function(a){if(typeof a=="string"){a=Ext.data.ModelManager.getModel(a);if(!a){Ext.Logger.error("Model with name "+arguments[0]+" doesnt exist.")}}if(a&&!a.prototype.isModel&&Ext.isObject(a)){a=Ext.data.ModelManager.registerType(a.storeId||a.id||Ext.id(),a)}return a},updateModel:function(b){if(b){var a=this.getReader();if(a&&!a.getModel()){a.setModel(b)}}},applyReader:function(b,a){return Ext.factory(b,Ext.data.Reader,a,"reader")},updateReader:function(a){if(a){var b=this.getModel();if(!b){b=a.getModel();if(b){this.setModel(b)}}else{a.setModel(b)}if(a.onMetaChange){a.onMetaChange=Ext.Function.createSequence(a.onMetaChange,this.onMetaChange,this)}}},onMetaChange:function(b){var a=this.getReader().getModel();if(!this.getModel()&&a){this.setModel(a)}this.fireEvent("metachange",this,b)},applyWriter:function(b,a){return Ext.factory(b,Ext.data.Writer,a,"writer")},create:Ext.emptyFn,read:Ext.emptyFn,update:Ext.emptyFn,destroy:Ext.emptyFn,onDestroy:function(){Ext.destroy(this.getReader(),this.getWriter())},batch:function(e,f){var g=this,d=g.getBatchActions(),c=this.getModel(),b,a;if(e.operations===undefined){e={operations:e,batch:{listeners:f}}}if(e.batch){if(e.batch.isBatch){e.batch.setProxy(g)}else{e.batch.proxy=g}}else{e.batch={proxy:g,listeners:e.listeners||{}}}if(!b){b=new Ext.data.Batch(e.batch)}b.on("complete",Ext.bind(g.onBatchComplete,g,[e],0));Ext.each(g.getBatchOrder().split(","),function(h){a=e.operations[h];if(a){if(d){b.add(new Ext.data.Operation({action:h,records:a,model:c}))}else{Ext.each(a,function(i){b.add(new Ext.data.Operation({action:h,records:[i],model:c}))})}}},g);b.start();return b},onBatchComplete:function(a,b){var c=a.scope||this;if(b.hasException){if(Ext.isFunction(a.failure)){Ext.callback(a.failure,c,[b,a])}}else{if(Ext.isFunction(a.success)){Ext.callback(a.success,c,[b,a])}}if(Ext.isFunction(a.callback)){Ext.callback(a.callback,c,[b,a])}}},function(){});Ext.define("Ext.data.proxy.Client",{extend:"Ext.data.proxy.Proxy",alternateClassName:"Ext.proxy.ClientProxy",clear:function(){}});Ext.define("Ext.data.proxy.Memory",{extend:"Ext.data.proxy.Client",alias:"proxy.memory",alternateClassName:"Ext.data.MemoryProxy",isMemoryProxy:true,config:{data:[]},finishOperation:function(b,f,d){if(b){var c=0,e=b.getRecords(),a=e.length;for(c;c<a;c++){e[c].commit()}b.setSuccessful();Ext.callback(f,d||this,[b])}},create:function(){this.finishOperation.apply(this,arguments)},update:function(){this.finishOperation.apply(this,arguments)},destroy:function(){this.finishOperation.apply(this,arguments)},read:function(b,e,c){var d=this,a=d.getReader();if(b.process("read",a.process(d.getData()))===false){this.fireEvent("exception",this,null,b)}Ext.callback(e,c||d,[b])},clear:Ext.emptyFn});Ext.define("Ext.data.proxy.Server",{extend:"Ext.data.proxy.Proxy",alias:"proxy.server",alternateClassName:"Ext.data.ServerProxy",requires:["Ext.data.Request"],config:{url:null,pageParam:"page",startParam:"start",limitParam:"limit",groupParam:"group",sortParam:"sort",filterParam:"filter",directionParam:"dir",enablePagingParams:true,simpleSortMode:false,noCache:true,cacheString:"_dc",timeout:30000,api:{create:undefined,read:undefined,update:undefined,destroy:undefined},extraParams:{}},constructor:function(a){a=a||{};if(a.nocache!==undefined){a.noCache=a.nocache}this.callParent([a])},create:function(){return this.doRequest.apply(this,arguments)},read:function(){return this.doRequest.apply(this,arguments)},update:function(){return this.doRequest.apply(this,arguments)},destroy:function(){return this.doRequest.apply(this,arguments)},setExtraParam:function(a,b){this.getExtraParams()[a]=b},buildRequest:function(a){var c=this,d=Ext.applyIf(a.getParams()||{},c.getExtraParams()||{}),b;d=Ext.applyIf(d,c.getParams(a));b=Ext.create("Ext.data.Request",{params:d,action:a.getAction(),records:a.getRecords(),url:a.getUrl(),operation:a,proxy:c});b.setUrl(c.buildUrl(b));a.setRequest(b);return b},processResponse:function(k,b,d,c,j,l){var h=this,a=b.getAction(),f,i;if(k===true){f=h.getReader();try{i=f.process(c)}catch(g){b.setException(g.message);h.fireEvent("exception",this,c,b);return}if(!b.getModel()){b.setModel(this.getModel())}if(b.process(a,i,d,c)===false){this.fireEvent("exception",this,c,b)}}else{h.setException(b,c);h.fireEvent("exception",this,c,b)}if(typeof j=="function"){j.call(l||h,b)}h.afterRequest(d,k)},setException:function(b,a){b.setException({status:a.status,statusText:a.statusText})},applyEncoding:function(a){return Ext.encode(a)},encodeSorters:function(d){var b=[],c=d.length,a=0;for(;a<c;a++){b[a]={property:d[a].getProperty(),direction:d[a].getDirection()}}return this.applyEncoding(b)},encodeFilters:function(d){var b=[],c=d.length,a=0;for(;a<c;a++){b[a]={property:d[a].getProperty(),value:d[a].getValue()}}return this.applyEncoding(b)},getParams:function(i){var n=this,h={},a=i.getGrouper(),m=i.getSorters(),f=i.getFilters(),l=i.getPage(),d=i.getStart(),g=i.getLimit(),o=n.getSimpleSortMode(),q=n.getPageParam(),k=n.getStartParam(),p=n.getLimitParam(),j=n.getGroupParam(),e=n.getSortParam(),c=n.getFilterParam(),b=n.getDirectionParam();if(n.getEnablePagingParams()){if(q&&l!==null){h[q]=l}if(k&&d!==null){h[k]=d}if(p&&g!==null){h[p]=g}}if(j&&a){h[j]=n.encodeSorters([a])}if(e&&m&&m.length>0){if(o){h[e]=m[0].getProperty();h[b]=m[0].getDirection()}else{h[e]=n.encodeSorters(m)}}if(c&&f&&f.length>0){h[c]=n.encodeFilters(f)}return h},buildUrl:function(c){var b=this,a=b.getUrl(c);if(b.getNoCache()){a=Ext.urlAppend(a,Ext.String.format("{0}={1}",b.getCacheString(),Ext.Date.now()))}return a},getUrl:function(a){return a?a.getUrl()||this.getApi()[a.getAction()]||this._url:this._url},doRequest:function(a,c,b){},afterRequest:Ext.emptyFn});Ext.define("Ext.data.proxy.JsonP",{extend:"Ext.data.proxy.Server",alternateClassName:"Ext.data.ScriptTagProxy",alias:["proxy.jsonp","proxy.scripttag"],requires:["Ext.data.JsonP"],config:{defaultWriterType:"base",callbackKey:"callback",recordParam:"records",autoAppendParams:true},doRequest:function(a,g,b){var d=this,e=d.getWriter(),c=d.buildRequest(a),f=c.getParams();if(a.allowWrite()){c=e.write(c)}c.setConfig({callbackKey:d.getCallbackKey(),timeout:d.getTimeout(),scope:d,callback:d.createRequestCallback(c,a,g,b)});if(d.getAutoAppendParams()){c.setParams({})}c.setJsonP(Ext.data.JsonP.request(c.getCurrentConfig()));c.setParams(f);a.setStarted();d.lastRequest=c;return c},createRequestCallback:function(d,a,e,b){var c=this;return function(h,f,g){delete c.lastRequest;c.processResponse(h,a,d,f,e,b)}},setException:function(b,a){b.setException(b.getRequest().getJsonP().errorType)},buildUrl:function(f){var h=this,a=h.callParent(arguments),e=Ext.apply({},f.getParams()),c=e.filters,d,b,g,j;delete e.filters;if(h.getAutoAppendParams()){a=Ext.urlAppend(a,Ext.Object.toQueryString(e))}if(c&&c.length){for(g=0;g<c.length;g++){b=c[g];j=b.getValue();if(j){a=Ext.urlAppend(a,b.getProperty()+"="+j)}}}d=f.getRecords();if(Ext.isArray(d)&&d.length>0){a=Ext.urlAppend(a,Ext.String.format("{0}={1}",h.getRecordParam(),h.encodeRecords(d)))}return a},destroy:function(){this.abort();this.callParent(arguments)},abort:function(){var a=this.lastRequest;if(a){Ext.data.JsonP.abort(a.getJsonP())}},encodeRecords:function(b){var d="",c=0,a=b.length;for(;c<a;c++){d+=Ext.Object.toQueryString(b[c].getData())}return d}});Ext.define("Ext.data.proxy.WebStorage",{extend:"Ext.data.proxy.Client",alternateClassName:"Ext.data.WebStorageProxy",requires:"Ext.Date",config:{id:undefined,reader:null,writer:null},constructor:function(a){this.callParent(arguments);this.cache={}},updateModel:function(a){if(!this.getId()){this.setId(a.modelName)}},create:function(e,h,j){var d=e.getRecords(),c=d.length,a=this.getIds(),b,g,f;e.setStarted();for(f=0;f<c;f++){g=d[f];if(g.phantom){g.phantom=false;b=this.getNextId()}else{b=g.getId()}this.setRecord(g,b);a.push(b)}this.setIds(a);e.setCompleted();e.setSuccessful();if(typeof h=="function"){h.call(j||this,e)}},read:function(e,j,k){var c=[],a=this.getIds(),h=this.getModel(),l=h.getIdProperty(),d=e.getParams()||{},b=a.length,f,g;if(d[l]!==undefined){g=this.getRecord(d[l]);if(g){c.push(g);e.setSuccessful()}}else{for(f=0;f<b;f++){c.push(this.getRecord(a[f]))}e.setSuccessful()}e.setCompleted();e.setResultSet(Ext.create("Ext.data.ResultSet",{records:c,total:c.length,loaded:true}));e.setRecords(c);if(typeof j=="function"){j.call(k||this,e)}},update:function(e,h,j){var d=e.getRecords(),c=d.length,a=this.getIds(),g,b,f;e.setStarted();for(f=0;f<c;f++){g=d[f];this.setRecord(g);b=g.getId();if(b!==undefined&&Ext.Array.indexOf(a,b)==-1){a.push(b)}}this.setIds(a);e.setCompleted();e.setSuccessful();if(typeof h=="function"){h.call(j||this,e)}},destroy:function(b,h,e){var a=b.getRecords(),f=a.length,d=this.getIds(),g=[].concat(d),c;for(c=0;c<f;c++){Ext.Array.remove(g,a[c].getId());this.removeRecord(a[c],false)}this.setIds(g);b.setCompleted();b.setSuccessful();if(typeof h=="function"){h.call(e||this,b)}},getRecord:function(d){if(this.cache[d]===undefined){var m=this.getRecordKey(d),n=this.getStorageObject().getItem(m),g={},f=this.getModel(),k=f.getFields().items,e=k.length,h,l,c,j,a,b;if(!n){return}a=Ext.decode(n);for(h=0;h<e;h++){l=k[h];c=l.getName();if(typeof l.getDecode()=="function"){g[c]=l.getDecode()(a[c])}else{if(l.getType().type=="date"){b=l.getDateFormat();if(b){g[c]=Ext.Date.parse(a[c],b)}else{g[c]=new Date(a[c])}}else{g[c]=a[c]}}}j=new f(g,d);this.cache[d]=j}return this.cache[d]},setRecord:function(k,d){if(d){k.setId(d)}else{d=k.getId()}var m=this,a=k.getData(),j={},f=m.getModel(),l=f.getFields().items,e=l.length,h=0,n,c,g,o,b;for(;h<e;h++){n=l[h];c=n.getName();if(typeof n.getEncode()=="function"){j[c]=n.getEncode()(a[c],k)}else{if(n.getType().type=="date"&&Ext.isDate(a[c])){b=n.getDateFormat();if(b){j[c]=Ext.Date.format(a[c],b)}else{j[c]=a[c].getTime()}}else{j[c]=a[c]}}}g=m.getStorageObject();o=m.getRecordKey(d);m.cache[d]=k;g.removeItem(o);g.setItem(o,Ext.encode(j))},removeRecord:function(d,c){var b=this,a;if(d.isModel){d=d.getId()}if(c!==false){a=b.getIds();Ext.Array.remove(a,d);b.setIds(a)}b.getStorageObject().removeItem(b.getRecordKey(d))},getRecordKey:function(a){if(a.isModel){a=a.getId()}return Ext.String.format("{0}-{1}",this.getId(),a)},getRecordCounterKey:function(){return Ext.String.format("{0}-counter",this.getId())},getIds:function(){var b=(this.getStorageObject().getItem(this.getId())||"").split(","),c=b.length,a;if(c==1&&b[0]===""){b=[]}else{for(a=0;a<c;a++){b[a]=parseInt(b[a],10)}}return b},setIds:function(b){var c=this.getStorageObject(),d=b.join(","),e=this.getId(),a=this.getRecordCounterKey();c.removeItem(e);if(Ext.isEmpty(d)){c.removeItem(a)}else{c.setItem(e,d)}},getNextId:function(){var d=this.getStorageObject(),a=this.getRecordCounterKey(),c=d.getItem(a),b,e;if(c===null){b=this.getIds();c=b[b.length-1]||0}e=parseInt(c,10)+1;d.setItem(a,e);return e},initialize:function(){this.callParent(arguments);var a=this.getStorageObject();a.setItem(this.getId(),a.getItem(this.getId())||"")},clear:function(){var d=this.getStorageObject(),c=this.getIds(),a=c.length,b;for(b=0;b<a;b++){this.removeRecord(c[b])}d.removeItem(this.getRecordCounterKey());d.removeItem(this.getId())},getStorageObject:function(){}});Ext.define("Ext.data.proxy.LocalStorage",{extend:"Ext.data.proxy.WebStorage",alias:"proxy.localstorage",alternateClassName:"Ext.data.LocalStorageProxy",getStorageObject:function(){return window.localStorage}});Ext.define("Ext.data.proxy.SessionStorage",{extend:"Ext.data.proxy.WebStorage",alias:"proxy.sessionstorage",alternateClassName:"Ext.data.SessionStorageProxy",getStorageObject:function(){return window.sessionStorage}});Ext.define("Ext.data.reader.Array",{extend:"Ext.data.reader.Json",alternateClassName:"Ext.data.ArrayReader",alias:"reader.array",config:{totalProperty:undefined,successProperty:undefined},getResponseData:function(a){return a},createFieldAccessExpression:function(g,c,b){var f=this,e=g.getMapping(),d=(e==null)?f.getModel().getFields().indexOf(g):e,a;if(typeof d==="function"){a=c+".getMapping()("+b+", this)"}else{if(isNaN(d)){d='"'+d+'"'}a=b+"["+d+"]"}return a}});Ext.define("Ext.data.reader.Xml",{extend:"Ext.data.reader.Reader",alternateClassName:"Ext.data.XmlReader",alias:"reader.xml",config:{record:null},createAccessor:function(b){var a=this;if(Ext.isEmpty(b)){return Ext.emptyFn}if(Ext.isFunction(b)){return b}return function(c){return a.getNodeValue(Ext.DomQuery.selectNode(b,c))}},getNodeValue:function(a){if(a&&a.firstChild){return a.firstChild.nodeValue}return undefined},getResponseData:function(a){if(a.nodeType===1){return a}var b=a.responseXML;return b},getData:function(a){return a.documentElement||a},getRoot:function(b){var c=b.nodeName,a=this.getRootProperty();if(!a||(c&&c==a)){return b}else{if(Ext.DomQuery.isXml(b)){return Ext.DomQuery.selectNode(a,b)}}},extractData:function(a){var b=this.getRecord();if(b!=a.nodeName){a=Ext.DomQuery.select(b,a)}else{a=[a]}return this.callParent([a])},getAssociatedDataRoot:function(b,a){return Ext.DomQuery.select(a,b)[0]},readRecords:function(a){if(Ext.isArray(a)){a=a[0]}return this.callParent([a])},createFieldAccessExpression:function(e,d,c){var b=e.getMapping()||e.getName(),a;if(typeof b==="function"){a=d+".getMapping()("+c+", this)"}else{a='me.getNodeValue(Ext.DomQuery.selectNode("'+b+'", '+c+"))"}return a}});Ext.define("Ext.direct.Provider",{alias:"direct.provider",mixins:{observable:"Ext.util.Observable"},config:{id:undefined},constructor:function(a){this.initConfig(a)},applyId:function(a){if(a===undefined){a=this.getUniqueId()}return a},isConnected:function(){return false},connect:Ext.emptyFn,disconnect:Ext.emptyFn});Ext.define("Ext.direct.JsonProvider",{extend:"Ext.direct.Provider",alias:"direct.jsonprovider",uses:["Ext.direct.ExceptionEvent"],parseResponse:function(a){if(!Ext.isEmpty(a.responseText)){if(Ext.isObject(a.responseText)){return a.responseText}return Ext.decode(a.responseText)}return null},createEvents:function(a){var g=null,c=[],b=0,f,d;try{g=this.parseResponse(a)}catch(h){d=Ext.create("Ext.direct.ExceptionEvent",{data:h,xhr:a,code:Ext.direct.Manager.exceptions.PARSE,message:"Error parsing json response: \n\n "+g});return[d]}if(Ext.isArray(g)){for(f=g.length;b<f;++b){c.push(this.createEvent(g[b]))}}else{c.push(this.createEvent(g))}return c},createEvent:function(a){return Ext.create("direct."+a.type,a)}});Ext.define("Ext.direct.PollingProvider",{extend:"Ext.direct.JsonProvider",alias:"direct.pollingprovider",uses:["Ext.direct.ExceptionEvent"],requires:["Ext.Ajax","Ext.util.DelayedTask"],config:{interval:3000,baseParams:null,url:null},isConnected:function(){return !!this.pollTask},connect:function(){var b=this,a=b.getUrl(),c=b.getBaseParams();if(a&&!b.pollTask){b.pollTask=setInterval(function(){if(b.fireEvent("beforepoll",b)!==false){if(Ext.isFunction(a)){a(c)}else{Ext.Ajax.request({url:a,callback:b.onData,scope:b,params:c})}}},b.getInterval());b.fireEvent("connect",b)}else{if(!a){}}},disconnect:function(){var a=this;if(a.pollTask){clearInterval(a.pollTask);delete a.pollTask;a.fireEvent("disconnect",a)}},onData:function(e,g,b){var f=this,d=0,a,c;if(g){c=f.createEvents(b);for(a=c.length;d<a;++d){f.fireEvent("data",f,c[d])}}else{f.fireEvent("data",f,Ext.create("Ext.direct.ExceptionEvent",{data:null,code:Ext.direct.Manager.exceptions.TRANSPORT,message:"Unable to connect to the server.",xhr:b}))}}});Ext.define("Ext.fx.animation.Abstract",{extend:"Ext.Evented",isAnimation:true,requires:["Ext.fx.State"],config:{name:"",element:null,before:null,from:{},to:{},after:null,states:{},duration:300,easing:"linear",iteration:1,direction:"normal",delay:0,onBeforeStart:null,onEnd:null,onBeforeEnd:null,scope:null,reverse:null,preserveEndState:false,replacePrevious:true},STATE_FROM:"0%",STATE_TO:"100%",DIRECTION_UP:"up",DIRECTION_DOWN:"down",DIRECTION_LEFT:"left",DIRECTION_RIGHT:"right",stateNameRegex:/^(?:[\d\.]+)%$/,constructor:function(){this.states={};this.callParent(arguments);return this},applyElement:function(a){return Ext.get(a)},applyBefore:function(a,b){if(a){return Ext.factory(a,Ext.fx.State,b)}},applyAfter:function(b,a){if(b){return Ext.factory(b,Ext.fx.State,a)}},setFrom:function(a){return this.setState(this.STATE_FROM,a)},setTo:function(a){return this.setState(this.STATE_TO,a)},getFrom:function(){return this.getState(this.STATE_FROM)},getTo:function(){return this.getState(this.STATE_TO)},setStates:function(a){var c=this.stateNameRegex,b;for(b in a){if(c.test(b)){this.setState(b,a[b])}}return this},getStates:function(){return this.states},setState:function(b,d){var a=this.getStates(),c;c=Ext.factory(d,Ext.fx.State,a[b]);if(c){a[b]=c}return this},getState:function(a){return this.getStates()[a]},getData:function(){var k=this.getStates(),e={},g=this.getBefore(),c=this.getAfter(),h=k[this.STATE_FROM],i=k[this.STATE_TO],j=h.getData(),f=i.getData(),d,b,a;for(b in k){if(k.hasOwnProperty(b)){a=k[b];d=a.getData();e[b]=d}}if(Ext.os.is.Android2){e["0.0001%"]=j}return{before:g?g.getData():{},after:c?c.getData():{},states:e,from:j,to:f,duration:this.getDuration(),iteration:this.getIteration(),direction:this.getDirection(),easing:this.getEasing(),delay:this.getDelay(),onEnd:this.getOnEnd(),onBeforeEnd:this.getOnBeforeEnd(),onBeforeStart:this.getOnBeforeStart(),scope:this.getScope(),preserveEndState:this.getPreserveEndState(),replacePrevious:this.getReplacePrevious()}}});Ext.define("Ext.fx.animation.Cube",{extend:"Ext.fx.animation.Abstract",alias:"animation.cube",config:{before:{},after:{},direction:"right",out:false},getData:function(){var m=this.getTo(),n=this.getFrom(),k=this.getBefore(),a=this.getAfter(),e=this.getOut(),j=this.getDirection(),b=this.getElement(),g=b.getWidth(),c=b.getHeight(),l=e?"100% 100%":"0% 0%",i=1,d=1,f={rotateY:0,translateZ:0,},h={rotateY:0,translateZ:0};if(j=="left"||j=="right"){if(e){d=0.5;h.translateZ=g;h.rotateY=-90}else{i=0.5;f.translateZ=g;f.rotateY=90}}k["transform-origin"]=l;a["transform-origin"]=null;m.set("transform",h);n.set("transform",f);n.set("opacity",i);m.set("opacity",d);return this.callParent(arguments)}});Ext.define("Ext.fx.animation.Fade",{extend:"Ext.fx.animation.Abstract",alternateClassName:"Ext.fx.animation.FadeIn",alias:["animation.fade","animation.fadeIn"],config:{out:false,before:{display:null,opacity:0},after:{opacity:null},reverse:null},updateOut:function(a){var c=this.getTo(),b=this.getFrom();if(a){b.set("opacity",1);c.set("opacity",0)}else{b.set("opacity",0);c.set("opacity",1)}}});Ext.define("Ext.fx.animation.FadeOut",{extend:"Ext.fx.animation.Fade",alias:"animation.fadeOut",config:{out:true,before:{}}});Ext.define("Ext.fx.animation.Flip",{extend:"Ext.fx.animation.Abstract",alias:"animation.flip",config:{easing:"ease-in",direction:"right",half:false,out:null},getData:function(){var h=this.getFrom(),i=this.getTo(),g=this.getDirection(),b=this.getOut(),l=this.getHalf(),c=(l)?90:180,e=1,a=1,k=0,j=0,f=0,d=0;if(b){a=0.8}else{e=0.8}switch(g){case this.DIRECTION_UP:if(b){f=c}else{k=-c}break;case this.DIRECTION_DOWN:if(b){f=-c}else{k=c}break;case this.DIRECTION_RIGHT:if(b){d=-c}else{j=c}break;case this.DIRECTION_LEFT:if(b){d=-c}else{j=c}break}h.setTransform({rotateX:k,rotateY:j,scale:e});i.setTransform({rotateX:f,rotateY:d,scale:a});return this.callParent(arguments)}});Ext.define("Ext.fx.animation.Pop",{extend:"Ext.fx.animation.Abstract",alias:["animation.pop","animation.popIn"],alternateClassName:"Ext.fx.animation.PopIn",config:{out:false,before:{display:null,opacity:0},after:{opacity:null}},getData:function(){var c=this.getTo(),b=this.getFrom(),a=this.getOut();if(a){b.set("opacity",1);b.setTransform({scale:1});c.set("opacity",0);c.setTransform({scale:0})}else{b.set("opacity",0);b.setTransform({scale:0});c.set("opacity",1);c.setTransform({scale:1})}return this.callParent(arguments)}});Ext.define("Ext.fx.animation.PopOut",{extend:"Ext.fx.animation.Pop",alias:"animation.popOut",config:{out:true,before:{}}});Ext.define("Ext.fx.animation.Slide",{extend:"Ext.fx.animation.Abstract",alternateClassName:"Ext.fx.animation.SlideIn",alias:["animation.slide","animation.slideIn"],config:{direction:"left",out:false,offset:0,easing:"auto",containerBox:"auto",elementBox:"auto",isElementBoxFit:true,useCssTransform:true},reverseDirectionMap:{up:"down",down:"up",left:"right",right:"left"},applyEasing:function(a){if(a==="auto"){return"ease-"+((this.getOut())?"in":"out")}return a},getContainerBox:function(){var a=this._containerBox;if(a==="auto"){a=this.getElement().getParent().getPageBox()}return a},getElementBox:function(){var a=this._elementBox;if(this.getIsElementBoxFit()){return this.getContainerBox()}if(a==="auto"){a=this.getElement().getPageBox()}return a},getData:function(){var p=this.getElementBox(),c=this.getContainerBox(),g=p?p:c,n=this.getFrom(),o=this.getTo(),f=this.getOut(),e=this.getOffset(),m=this.getDirection(),b=this.getUseCssTransform(),h=this.getReverse(),d=0,a=0,l,j,k,i;if(h){m=this.reverseDirectionMap[m]}switch(m){case this.DIRECTION_UP:if(f){a=c.top-g.top-g.height-e}else{a=c.bottom-g.bottom+g.height+e}break;case this.DIRECTION_DOWN:if(f){a=c.bottom-g.bottom+g.height+e}else{a=c.top-g.height-g.top-e}break;case this.DIRECTION_RIGHT:if(f){d=c.right-g.right+g.width+e}else{d=c.left-g.left-g.width-e}break;case this.DIRECTION_LEFT:if(f){d=c.left-g.left-g.width-e}else{d=c.right-g.right+g.width+e}break}l=(f)?0:d;j=(f)?0:a;if(b){n.setTransform({translateX:l,translateY:j})}else{n.set("left",l);n.set("top",j)}k=(f)?d:0;i=(f)?a:0;if(b){o.setTransform({translateX:k,translateY:i})}else{o.set("left",k);o.set("top",i)}return this.callParent(arguments)}});Ext.define("Ext.fx.animation.SlideOut",{extend:"Ext.fx.animation.Slide",alias:["animation.slideOut"],config:{out:true}});Ext.define("Ext.fx.Animation",{requires:["Ext.fx.animation.Slide","Ext.fx.animation.SlideOut","Ext.fx.animation.Fade","Ext.fx.animation.FadeOut","Ext.fx.animation.Flip","Ext.fx.animation.Pop","Ext.fx.animation.PopOut","Ext.fx.animation.Cube"],constructor:function(b){var a=Ext.fx.animation.Abstract,c;if(typeof b=="string"){c=b;b={}}else{if(b&&b.type){c=b.type}}if(c){if(Ext.os.is.Android2){if(c=="pop"){c="fade"}if(c=="popIn"){c="fadeIn"}if(c=="popOut"){c="fadeOut"}}a=Ext.ClassManager.getByAlias("animation."+c)}return Ext.factory(b,a)}});Ext.define("Ext.fx.layout.card.Abstract",{extend:"Ext.Evented",isAnimation:true,config:{direction:"left",duration:null,reverse:null,layout:null},updateLayout:function(){this.enable()},enable:function(){var a=this.getLayout();if(a){a.onBefore("activeitemchange","onActiveItemChange",this)}},disable:function(){var a=this.getLayout();if(this.isAnimating){this.stopAnimation()}if(a){a.unBefore("activeitemchange","onActiveItemChange",this)}},onActiveItemChange:Ext.emptyFn,destroy:function(){var a=this.getLayout();if(this.isAnimating){this.stopAnimation()}if(a){a.unBefore("activeitemchange","onActiveItemChange",this)}this.setLayout(null)}});Ext.define("Ext.fx.layout.card.Scroll",{extend:"Ext.fx.layout.card.Abstract",requires:["Ext.fx.easing.Linear"],alias:"fx.layout.card.scroll",config:{duration:150},constructor:function(a){this.initConfig(a);this.doAnimationFrame=Ext.Function.bind(this.doAnimationFrame,this)},getEasing:function(){var a=this.easing;if(!a){this.easing=a=new Ext.fx.easing.Linear()}return a},updateDuration:function(a){this.getEasing().setDuration(a)},onActiveItemChange:function(a,d,l,m,c){var i=this.getDirection(),g=this.getEasing(),k,e,b,h,j,f;if(d&&l){if(this.isAnimating){this.stopAnimation()}k=this.getLayout().container.innerElement;h=k.getWidth();j=k.getHeight();e=d.renderElement;b=l.renderElement;this.oldItem=l;this.newItem=d;this.currentEventController=c;this.containerElement=k;this.isReverse=f=this.getReverse();d.show();if(i=="right"){i="left";this.isReverse=f=!f}else{if(i=="down"){i="up";this.isReverse=f=!f}}if(i=="left"){if(f){g.setConfig({startValue:h,endValue:0});k.dom.scrollLeft=h;b.setLeft(h)}else{g.setConfig({startValue:0,endValue:h});e.setLeft(h)}}else{if(f){g.setConfig({startValue:j,endValue:0});k.dom.scrollTop=j;b.setTop(j)}else{g.setConfig({startValue:0,endValue:j});e.setTop(j)}}this.startAnimation();c.pause()}},startAnimation:function(){this.isAnimating=true;this.getEasing().setStartTime(Date.now());this.timer=setInterval(this.doAnimationFrame,20);this.doAnimationFrame()},doAnimationFrame:function(){var d=this.getEasing(),c=this.getDirection(),a="scrollTop",b;if(c=="left"||c=="right"){a="scrollLeft"}if(d.isEnded){this.stopAnimation()}else{b=d.getValue();this.containerElement.dom[a]=b}},stopAnimation:function(){var b=this.getDirection(),a="setTop";if(b=="left"||b=="right"){a="setLeft"}this.currentEventController.resume();if(this.isReverse){this.oldItem.renderElement[a](null)}else{this.newItem.renderElement[a](null)}clearInterval(this.timer);this.isAnimating=false;this.fireEvent("animationend",this)}});Ext.define("Ext.fx.layout.card.Style",{extend:"Ext.fx.layout.card.Abstract",requires:["Ext.fx.Animation"],config:{inAnimation:{before:{visibility:null},preserveEndState:false,replacePrevious:true},outAnimation:{preserveEndState:false,replacePrevious:true}},constructor:function(b){var c,a;this.initConfig(b);this.endAnimationCounter=0;c=this.getInAnimation();a=this.getOutAnimation();c.on("animationend","incrementEnd",this);a.on("animationend","incrementEnd",this);c.setConfig(b);a.setConfig(b)},incrementEnd:function(){this.endAnimationCounter++;if(this.endAnimationCounter>1){this.endAnimationCounter=0;this.fireEvent("animationend",this)}},applyInAnimation:function(b,a){return Ext.factory(b,Ext.fx.Animation,a)},applyOutAnimation:function(b,a){return Ext.factory(b,Ext.fx.Animation,a)},updateInAnimation:function(a){a.setScope(this)},updateOutAnimation:function(a){a.setScope(this)},onActiveItemChange:function(a,e,h,i,d){var b=this.getInAnimation(),g=this.getOutAnimation(),f,c;if(e&&h&&h.isPainted()){f=e.renderElement;c=h.renderElement;b.setElement(f);g.setElement(c);g.setOnBeforeEnd(function(j,k){if(k||Ext.Animator.hasRunningAnimations(j)){d.firingArguments[1]=null;d.firingArguments[2]=null}});g.setOnEnd(function(){d.resume()});f.dom.style.setProperty("visibility","hidden","!important");e.show();Ext.Animator.run([g,b]);d.pause()}}});Ext.define("Ext.fx.layout.card.Cover",{extend:"Ext.fx.layout.card.Style",alias:"fx.layout.card.cover",config:{reverse:null,inAnimation:{before:{"z-index":100},after:{"z-index":0},type:"slide",easing:"ease-out"},outAnimation:{easing:"ease-out",from:{opacity:0.99},to:{opacity:1},out:true}},updateReverse:function(a){this.getInAnimation().setReverse(a);this.getOutAnimation().setReverse(a)}});Ext.define("Ext.fx.layout.card.Cube",{extend:"Ext.fx.layout.card.Style",alias:"fx.layout.card.cube",config:{reverse:null,inAnimation:{type:"cube"},outAnimation:{type:"cube",out:true}}});Ext.define("Ext.fx.layout.card.Fade",{extend:"Ext.fx.layout.card.Style",alias:"fx.layout.card.fade",config:{reverse:null,inAnimation:{type:"fade",easing:"ease-out"},outAnimation:{type:"fade",easing:"ease-out",out:true}}});Ext.define("Ext.fx.layout.card.Flip",{extend:"Ext.fx.layout.card.Style",alias:"fx.layout.card.flip",config:{duration:500,inAnimation:{type:"flip",half:true,easing:"ease-out",before:{"backface-visibility":"hidden"},after:{"backface-visibility":null}},outAnimation:{type:"flip",half:true,easing:"ease-in",before:{"backface-visibility":"hidden"},after:{"backface-visibility":null},out:true}},updateDuration:function(d){var c=d/2,b=this.getInAnimation(),a=this.getOutAnimation();b.setDelay(c);b.setDuration(c);a.setDuration(c)}});Ext.define("Ext.fx.layout.card.Pop",{extend:"Ext.fx.layout.card.Style",alias:"fx.layout.card.pop",config:{duration:500,inAnimation:{type:"pop",easing:"ease-out"},outAnimation:{type:"pop",easing:"ease-in",out:true}},updateDuration:function(d){var c=d/2,b=this.getInAnimation(),a=this.getOutAnimation();b.setDelay(c);b.setDuration(c);a.setDuration(c)}});Ext.define("Ext.fx.layout.card.Reveal",{extend:"Ext.fx.layout.card.Style",alias:"fx.layout.card.reveal",config:{inAnimation:{easing:"ease-out",from:{opacity:0.99},to:{opacity:1}},outAnimation:{before:{"z-index":100},after:{"z-index":0},type:"slide",easing:"ease-out",out:true}},updateReverse:function(a){this.getInAnimation().setReverse(a);this.getOutAnimation().setReverse(a)}});Ext.define("Ext.fx.layout.card.Slide",{extend:"Ext.fx.layout.card.Style",alias:"fx.layout.card.slide",config:{inAnimation:{type:"slide",easing:"ease-out"},outAnimation:{type:"slide",easing:"ease-out",out:true}},updateReverse:function(a){this.getInAnimation().setReverse(a);this.getOutAnimation().setReverse(a)}});Ext.define("Ext.fx.layout.Card",{requires:["Ext.fx.layout.card.Slide","Ext.fx.layout.card.Cover","Ext.fx.layout.card.Reveal","Ext.fx.layout.card.Fade","Ext.fx.layout.card.Flip","Ext.fx.layout.card.Pop","Ext.fx.layout.card.Cube","Ext.fx.layout.card.Scroll"],constructor:function(b){var a=Ext.fx.layout.card.Abstract,c;if(!b){return null}if(typeof b=="string"){c=b;b={}}else{if(b.type){c=b.type}}b.elementBox=false;if(c){if(Ext.os.is.Android2){if(c!="fade"){c="scroll"}}else{if(c==="slide"&&Ext.browser.is.ChromeMobile){c="scroll"}}a=Ext.ClassManager.getByAlias("fx.layout.card."+c)}return Ext.factory(b,a)}});Ext.define("Ext.fx.runner.Css",{extend:"Ext.Evented",requires:["Ext.fx.Animation"],prefixedProperties:{transform:true,"transform-origin":true,perspective:true,"transform-style":true,transition:true,"transition-property":true,"transition-duration":true,"transition-timing-function":true,"transition-delay":true,animation:true,"animation-name":true,"animation-duration":true,"animation-iteration-count":true,"animation-direction":true,"animation-timing-function":true,"animation-delay":true},lengthProperties:{top:true,right:true,bottom:true,left:true,width:true,height:true,"max-height":true,"max-width":true,"min-height":true,"min-width":true,"margin-bottom":true,"margin-left":true,"margin-right":true,"margin-top":true,"padding-bottom":true,"padding-left":true,"padding-right":true,"padding-top":true,"border-bottom-width":true,"border-left-width":true,"border-right-width":true,"border-spacing":true,"border-top-width":true,"border-width":true,"outline-width":true,"letter-spacing":true,"line-height":true,"text-indent":true,"word-spacing":true,"font-size":true,translate:true,translateX:true,translateY:true,translateZ:true,translate3d:true},durationProperties:{"transition-duration":true,"transition-delay":true,"animation-duration":true,"animation-delay":true},angleProperties:{rotate:true,rotateX:true,rotateY:true,rotateZ:true,skew:true,skewX:true,skewY:true},lengthUnitRegex:/([a-z%]*)$/,DEFAULT_UNIT_LENGTH:"px",DEFAULT_UNIT_ANGLE:"deg",DEFAULT_UNIT_DURATION:"ms",formattedNameCache:{},constructor:function(){var a=Ext.feature.has.Css3dTransforms;if(a){this.transformMethods=["translateX","translateY","translateZ","rotate","rotateX","rotateY","rotateZ","skewX","skewY","scaleX","scaleY","scaleZ"]}else{this.transformMethods=["translateX","translateY","rotate","skewX","skewY","scaleX","scaleY"]}this.vendorPrefix=Ext.browser.getStyleDashPrefix();this.ruleStylesCache={};return this},getStyleSheet:function(){var c=this.styleSheet,a,b;if(!c){a=document.createElement("style");a.type="text/css";(document.head||document.getElementsByTagName("head")[0]).appendChild(a);b=document.styleSheets;this.styleSheet=c=b[b.length-1]}return c},applyRules:function(i){var g=this.getStyleSheet(),k=this.ruleStylesCache,j=g.cssRules,c,e,h,b,d,a,f;for(c in i){e=i[c];h=k[c];if(h===undefined){d=j.length;g.insertRule(c+"{}",d);h=k[c]=j.item(d).style}b=h.$cache;if(!b){b=h.$cache={}}for(a in e){f=this.formatValue(e[a],a);a=this.formatName(a);if(b[a]!==f){b[a]=f;if(f===null){h.removeProperty(a)}else{h.setProperty(a,f,"important")}}}}return this},applyStyles:function(d){var g,c,f,b,a,e;for(g in d){c=document.getElementById(g);if(!c){return this}f=c.style;b=d[g];for(a in b){e=this.formatValue(b[a],a);a=this.formatName(a);if(e===null){f.removeProperty(a)}else{f.setProperty(a,e,"important")}}}return this},formatName:function(b){var a=this.formattedNameCache,c=a[b];if(!c){if(this.prefixedProperties[b]){c=this.vendorPrefix+b}else{c=b}a[b]=c}return c},formatValue:function(j,b){var g=typeof j,l=this.DEFAULT_UNIT_LENGTH,e,a,d,f,c,k,h;if(g=="string"){if(this.lengthProperties[b]){h=j.match(this.lengthUnitRegex)[1];if(h.length>0){}else{return j+l}}return j}else{if(g=="number"){if(j==0){return"0"}if(this.lengthProperties[b]){return j+l}if(this.angleProperties[b]){return j+this.DEFAULT_UNIT_ANGLE}if(this.durationProperties[b]){return j+this.DEFAULT_UNIT_DURATION}}else{if(b==="transform"){e=this.transformMethods;c=[];for(d=0,f=e.length;d<f;d++){a=e[d];c.push(a+"("+this.formatValue(j[a],a)+")")}return c.join(" ")}else{if(Ext.isArray(j)){k=[];for(d=0,f=j.length;d<f;d++){k.push(this.formatValue(j[d],b))}return(k.length>0)?k.join(", "):"none"}}}}return j}});Ext.define("Ext.fx.runner.CssTransition",{extend:"Ext.fx.runner.Css",listenersAttached:false,constructor:function(){this.runningAnimationsData={};return this.callParent(arguments)},attachListeners:function(){this.listenersAttached=true;this.getEventDispatcher().addListener("element","*","transitionend","onTransitionEnd",this)},onTransitionEnd:function(b){var a=b.target,c=a.id;if(c&&this.runningAnimationsData.hasOwnProperty(c)){this.refreshRunningAnimationsData(Ext.get(a),[b.browserEvent.propertyName])}},onAnimationEnd:function(g,f,d,j,n){var b=g.getId(),k=this.runningAnimationsData[b],c=k.nameMap,o={},m={},h,e,l,a;o[b]=m;if(f.onBeforeEnd){f.onBeforeEnd.call(f.scope||this,g,j)}d.fireEvent("animationbeforeend",d,g,j);this.fireEvent("animationbeforeend",this,d,g,j);if(n||(!j&&!f.preserveEndState)){h=f.toPropertyNames;for(e=0,l=h.length;e<l;e++){a=h[e];if(!c.hasOwnProperty(a)){m[a]=null}}}if(f.after){Ext.merge(m,f.after)}this.applyStyles(o);if(f.onEnd){f.onEnd.call(f.scope||this,g,j)}d.fireEvent("animationend",d,g,j);this.fireEvent("animationend",this,d,g,j)},onAllAnimationsEnd:function(b){var c=b.getId(),a={};delete this.runningAnimationsData[c];a[c]={"transition-property":null,"transition-duration":null,"transition-timing-function":null,"transition-delay":null};this.applyStyles(a);this.fireEvent("animationallend",this,b)},hasRunningAnimations:function(a){var c=a.getId(),b=this.runningAnimationsData;return b.hasOwnProperty(c)&&b[c].sessions.length>0},refreshRunningAnimationsData:function(d,k,t,p){var g=d.getId(),q=this.runningAnimationsData,a=q[g],m=a.nameMap,s=a.nameList,b=a.sessions,f,h,e,u,l,c,r,o,n=false;t=Boolean(t);p=Boolean(p);if(!b){return this}f=b.length;if(f===0){return this}if(p){a.nameMap={};s.length=0;for(l=0;l<f;l++){c=b[l];this.onAnimationEnd(d,c.data,c.animation,t,p)}b.length=0}else{for(l=0;l<f;l++){c=b[l];r=c.map;o=c.list;for(h=0,e=k.length;h<e;h++){u=k[h];if(r[u]){delete r[u];Ext.Array.remove(o,u);c.length--;if(--m[u]==0){delete m[u];Ext.Array.remove(s,u)}}}if(c.length==0){b.splice(l,1);l--;f--;n=true;this.onAnimationEnd(d,c.data,c.animation,t)}}}if(!p&&!t&&b.length==0&&n){this.onAllAnimationsEnd(d)}},getRunningData:function(b){var a=this.runningAnimationsData;if(!a.hasOwnProperty(b)){a[b]={nameMap:{},nameList:[],sessions:[]}}return a[b]},getTestElement:function(){var c=this.testElement,b,d,a;if(!c){b=document.createElement("iframe");a=b.style;a.setProperty("visibility","hidden","important");a.setProperty("width","0px","important");a.setProperty("height","0px","important");a.setProperty("position","absolute","important");a.setProperty("border","0px","important");a.setProperty("zIndex","-1000","important");document.body.appendChild(b);d=b.contentDocument;d.open();d.writeln("</body>");d.close();this.testElement=c=d.createElement("div");c.style.setProperty("position","absolute","!important");d.body.appendChild(c);this.testElementComputedStyle=window.getComputedStyle(c)}return c},getCssStyleValue:function(b,e){var d=this.getTestElement(),a=this.testElementComputedStyle,c=d.style;c.setProperty(b,e);e=a.getPropertyValue(b);c.removeProperty(b);return e},run:function(o){var E=this,h=this.lengthProperties,w={},D={},F={},d,r,x,e,t,H,u,p,q,a,z,y,n,A,l,s,g,B,G,k,f,v,m,c,C,b;if(!this.listenersAttached){this.attachListeners()}o=Ext.Array.from(o);for(z=0,n=o.length;z<n;z++){A=o[z];A=Ext.factory(A,Ext.fx.Animation);d=A.getElement();g=window.getComputedStyle(d.dom);r=d.getId();F=Ext.merge({},A.getData());if(A.onBeforeStart){A.onBeforeStart.call(A.scope||this,d);A.fireEvent("animationstart",A);this.fireEvent("animationstart",this,A)}F[r]=F;t=F.before;x=F.from;e=F.to;F.fromPropertyNames=H=[];F.toPropertyNames=u=[];for(G in e){if(e.hasOwnProperty(G)){e[G]=k=this.formatValue(e[G],G);B=this.formatName(G);m=h.hasOwnProperty(G);if(!m){k=this.getCssStyleValue(B,k)}if(x.hasOwnProperty(G)){x[G]=v=this.formatValue(x[G],G);if(!m){v=this.getCssStyleValue(B,v)}if(k!==v){H.push(B);u.push(B)}}else{f=g.getPropertyValue(B);if(k!==f){u.push(B)}}}}l=u.length;if(l===0){this.onAnimationEnd(d,F,A);continue}a=this.getRunningData(r);b=a.sessions;if(b.length>0){this.refreshRunningAnimationsData(d,Ext.Array.merge(H,u),true,F.replacePrevious)}c=a.nameMap;C=a.nameList;s={};for(y=0;y<l;y++){G=u[y];s[G]=true;if(!c.hasOwnProperty(G)){c[G]=1;C.push(G)}else{c[G]++}}b.push({element:d,map:s,list:u.slice(),length:l,data:F,animation:A});w[r]=x=Ext.apply(Ext.Object.chain(t),x);if(C.length>0){H=Ext.Array.difference(C,H);u=Ext.Array.merge(H,u);x["transition-property"]=H}D[r]=e=Ext.Object.chain(e);e["transition-property"]=u;e["transition-duration"]=F.duration;e["transition-timing-function"]=F.easing;e["transition-delay"]=F.delay;A.startTime=Date.now()}q=this.$className;this.applyStyles(w);p=function(i){if(i.data===q&&i.source===window){window.removeEventListener("message",p,false);E.applyStyles(D)}};window.addEventListener("message",p,false);window.postMessage(q,"*")}});Ext.define("Ext.fx.Runner",{requires:["Ext.fx.runner.CssTransition"],constructor:function(){return new Ext.fx.runner.CssTransition()}});(function(a){Ext.define("Ext.layout.Default",{extend:"Ext.Evented",alternateClassName:["Ext.layout.AutoContainerLayout","Ext.layout.ContainerLayout"],alias:["layout.auto","layout.default"],isLayout:true,hasDockedItemsCls:a+"hasdocked",centeredItemCls:a+"centered",floatingItemCls:a+"floating",dockingWrapperCls:a+"docking",dockingInnerCls:a+"docking-inner",maskCls:a+"mask",positionMap:{top:"start",left:"start",bottom:"end",right:"end"},positionDirectionMap:{top:"vertical",bottom:"vertical",left:"horizontal",right:"horizontal"},DIRECTION_VERTICAL:"vertical",DIRECTION_HORIZONTAL:"horizontal",POSITION_START:"start",POSITION_END:"end",config:{animation:null},constructor:function(b,c){this.container=b;this.innerItems=[];this.centeringWrappers={};this.initConfig(c)},reapply:Ext.emptyFn,unapply:Ext.emptyFn,onItemAdd:function(){this.doItemAdd.apply(this,arguments)},onItemRemove:function(){this.doItemRemove.apply(this,arguments)},onItemMove:function(){this.doItemMove.apply(this,arguments)},onItemCenteredChange:function(){this.doItemCenteredChange.apply(this,arguments)},onItemFloatingChange:function(){this.doItemFloatingChange.apply(this,arguments)},onItemDockedChange:function(){this.doItemDockedChange.apply(this,arguments)},doItemAdd:function(c,b){var d=c.getDocked();if(d!==null){this.dockItem(c,d)}else{if(c.isCentered()){this.centerItem(c,b)}else{this.insertItem(c,b)}}if(c.isFloating()){this.onItemFloatingChange(c,true)}},doItemRemove:function(b){if(b.isDocked()){this.undockItem(b)}else{if(b.isCentered()){this.uncenterItem(b)}}Ext.Array.remove(this.innerItems,b);this.container.innerElement.dom.removeChild(b.renderElement.dom)},doItemMove:function(c,d,b){if(c.isCentered()){c.setZIndex((d+1)*2)}else{if(c.isFloating()){c.setZIndex((d+1)*2)}this.insertItem(c,d)}},doItemCenteredChange:function(c,b){if(b){this.centerItem(c)}else{this.uncenterItem(c)}},doItemFloatingChange:function(d,e){var c=d.element,b=this.floatingItemCls;if(e){if(d.getZIndex()===null){d.setZIndex((this.container.indexOf(d)+1)*2)}c.addCls(b)}else{d.setZIndex(null);c.removeCls(b)}},doItemDockedChange:function(b,d,c){if(c){this.undockItem(b,c)}if(d){this.dockItem(b,d)}},centerItem:function(b){this.insertItem(b,0);if(b.getZIndex()===null){b.setZIndex((this.container.indexOf(b)+1)*2)}this.createCenteringWrapper(b);b.element.addCls(this.floatingItemCls)},uncenterItem:function(b){this.destroyCenteringWrapper(b);b.setZIndex(null);this.insertItem(b,this.container.indexOf(b));b.element.removeCls(this.floatingItemCls)},dockItem:function(f,b){var c=this.container,g=f.renderElement,e=f.element,d=this.dockingInnerElement;if(!d){c.setUseBodyElement(true);this.dockingInnerElement=d=c.bodyElement}this.getDockingWrapper(b);if(this.positionMap[b]===this.POSITION_START){g.insertBefore(d)}else{g.insertAfter(d)}e.addCls(a+"docked-"+b)},undockItem:function(b,c){this.insertItem(b,this.container.indexOf(b));b.element.removeCls(a+"docked-"+c)},getDockingWrapper:function(b){var e=this.currentDockingDirection,d=this.positionDirectionMap[b],c=this.dockingWrapper;if(e!==d){this.currentDockingDirection=d;this.dockingWrapper=c=this.createDockingWrapper(d)}return c},createDockingWrapper:function(b){return this.dockingInnerElement.wrap({classList:[this.dockingWrapperCls+"-"+b]},true)},createCenteringWrapper:function(c){var f=c.getId(),d=this.centeringWrappers,b=c.renderElement,e;d[f]=e=b.wrap({className:this.centeredItemCls});return e},destroyCenteringWrapper:function(c){var f=c.getId(),d=this.centeringWrappers,b=c.renderElement,e=d[f];b.unwrap();e.destroy();delete d[f];return this},insertItem:function(k,g){var d=this.container,j=d.getItems().items,e=this.innerItems,c=d.innerElement.dom,i=k.renderElement.dom,h,f,b;if(d.has(k)){Ext.Array.remove(e,k)}if(typeof g=="number"){h=j[g];if(h===k){h=j[++g]}while(h&&(h.isCentered()||h.isDocked())){h=j[++g]}if(h){b=e.indexOf(h);if(b!==-1){while(h&&(h.isCentered()||h.isDocked())){h=e[++b]}if(h){e.splice(b,0,k);f=h.renderElement.dom;c.insertBefore(i,f);return this}}}}e.push(k);c.appendChild(i);return this}})})(Ext.baseCSSPrefix);Ext.define("Ext.layout.AbstractBox",{extend:"Ext.layout.Default",config:{align:"stretch",pack:null},flexItemCls:Ext.baseCSSPrefix+"layout-box-item",positionMap:{middle:"center",left:"start",top:"start",right:"end",bottom:"end"},constructor:function(a){this.callParent(arguments);a.innerElement.addCls(this.cls);a.on(this.sizeChangeEventName,"onItemSizeChange",this,{delegate:"> component"})},reapply:function(){this.container.innerElement.addCls(this.cls);this.updatePack(this.getPack());this.updateAlign(this.getAlign())},unapply:function(){this.container.innerElement.removeCls(this.cls);this.updatePack(null);this.updateAlign(null)},doItemAdd:function(d,b){this.callParent(arguments);if(d.isInnerItem()){var c=d.getConfig(this.sizePropertyName),a=d.config;if(!c&&("flex" in a)){this.setItemFlex(d,a.flex)}}},doItemRemove:function(a){if(a.isInnerItem()){this.setItemFlex(a,null)}this.callParent(arguments)},onItemSizeChange:function(a){this.setItemFlex(a,null)},doItemCenteredChange:function(b,a){if(a){this.setItemFlex(b,null)}this.callParent(arguments)},doItemFloatingChange:function(a,b){if(b){this.setItemFlex(a,null)}this.callParent(arguments)},doItemDockedChange:function(a,b){if(b){this.setItemFlex(a,null)}this.callParent(arguments)},redrawContainer:function(){var a=this.container,b=a.renderElement.dom.parentNode;if(b&&b.nodeType!==11){a.innerElement.redraw()}},setItemFlex:function(c,a){var b=c.element,d=this.flexItemCls;if(a){b.addCls(d)}else{if(b.hasCls(d)){this.redrawContainer();b.removeCls(d)}}b.dom.style.webkitBoxFlex=a},convertPosition:function(a){if(this.positionMap.hasOwnProperty(a)){return this.positionMap[a]}return a},applyAlign:function(a){return this.convertPosition(a)},updateAlign:function(a){this.container.innerElement.dom.style.webkitBoxAlign=a},applyPack:function(a){return this.convertPosition(a)},updatePack:function(a){this.container.innerElement.dom.style.webkitBoxPack=a}});Ext.define("Ext.layout.Fit",{extend:"Ext.layout.Default",alternateClassName:"Ext.layout.FitLayout",alias:"layout.fit",cls:Ext.baseCSSPrefix+"layout-fit",itemCls:Ext.baseCSSPrefix+"layout-fit-item",constructor:function(a){this.callParent(arguments);this.apply()},apply:function(){this.container.innerElement.addCls(this.cls)},reapply:function(){this.apply()},unapply:function(){this.container.innerElement.removeCls(this.cls)},doItemAdd:function(b,a){if(b.isInnerItem()){b.addCls(this.itemCls)}this.callParent(arguments)},doItemRemove:function(a){if(a.isInnerItem()){a.removeCls(this.itemCls)}this.callParent(arguments)}});Ext.define("Ext.layout.Card",{extend:"Ext.layout.Fit",alternateClassName:"Ext.layout.CardLayout",isCard:true,requires:["Ext.fx.layout.Card"],alias:"layout.card",cls:Ext.baseCSSPrefix+"layout-card",itemCls:Ext.baseCSSPrefix+"layout-card-item",constructor:function(){this.callParent(arguments);this.container.onInitialized(this.onContainerInitialized,this)},applyAnimation:function(a){return new Ext.fx.layout.Card(a)},updateAnimation:function(b,a){if(b&&b.isAnimation){b.setLayout(this)}if(a){a.destroy()}},doItemAdd:function(b,a){if(b.isInnerItem()){b.hide()}this.callParent(arguments)},doItemRemove:function(c,a,b){this.callParent(arguments);if(!b&&c.isInnerItem()){c.show()}},onContainerInitialized:function(a){var b=a.getActiveItem();if(b){b.show()}a.on("activeitemchange","onContainerActiveItemChange",this)},onContainerActiveItemChange:function(a){this.relayEvent(arguments,"doActiveItemChange")},doActiveItemChange:function(b,c,a){if(a){a.hide()}if(c){c.show()}},doItemDockedChange:function(b,c){var a=b.element;if(c){a.removeCls(this.itemCls)}else{a.addCls(this.itemCls)}this.callParent(arguments)}});Ext.define("Ext.layout.HBox",{extend:"Ext.layout.AbstractBox",alternateClassName:"Ext.layout.HBoxLayout",alias:"layout.hbox",sizePropertyName:"width",sizeChangeEventName:"widthchange",cls:Ext.baseCSSPrefix+"layout-hbox"});Ext.define("Ext.layout.VBox",{extend:"Ext.layout.AbstractBox",alternateClassName:"Ext.layout.VBoxLayout",alias:"layout.vbox",sizePropertyName:"height",sizeChangeEventName:"heightchange",cls:Ext.baseCSSPrefix+"layout-vbox"});Ext.define("Ext.layout.Layout",{requires:["Ext.layout.Fit","Ext.layout.Card","Ext.layout.HBox","Ext.layout.VBox"],constructor:function(a,b){var c=Ext.layout.Default,d,e;if(typeof b=="string"){d=b;b={}}else{if("type" in b){d=b.type}}if(d){c=Ext.ClassManager.getByAlias("layout."+d)}return new c(a,b)}});Ext.define("Ext.mixin.Sortable",{extend:"Ext.mixin.Mixin",requires:["Ext.util.Sorter"],mixinConfig:{id:"sortable"},config:{sorters:null,defaultSortDirection:"ASC",sortRoot:null},dirtySortFn:false,sortFn:null,sorted:false,applySorters:function(a,b){if(!b){b=this.createSortersCollection()}b.clear();this.sorted=false;if(a){this.addSorters(a)}return b},createSortersCollection:function(){this._sorters=Ext.create("Ext.util.Collection",function(a){return a.getId()});return this._sorters},addSorter:function(b,a){this.addSorters([b],a)},addSorters:function(c,a){var b=this.getSorters();return this.insertSorters(b?b.length:0,c,a)},insertSorter:function(a,c,b){return this.insertSorters(a,[c],b)},insertSorters:function(e,h,a){if(!Ext.isArray(h)){h=[h]}var f=h.length,j=a||this.getDefaultSortDirection(),c=this.getSortRoot(),k=this.getSorters(),l=[],g,b,m,d;if(!k){k=this.createSortersCollection()}for(b=0;b<f;b++){m=h[b];g={direction:j,root:c};if(typeof m==="string"){d=k.get(m);if(!d){g.property=m}else{if(a!==undefined){d.setDirection(a)}else{d.toggle()}continue}}else{if(Ext.isFunction(m)){g.sorterFn=m}else{if(Ext.isObject(m)){if(!m.isSorter){if(m.fn){m.sorterFn=m.fn;delete m.fn}g=Ext.apply(g,m)}else{l.push(m);if(!m.getRoot()){m.setRoot(c)}continue}}}}m=Ext.create("Ext.util.Sorter",g);l.push(m)}for(b=0,f=l.length;b<f;b++){k.insert(e+b,l[b])}this.dirtySortFn=true;if(k.length){this.sorted=true}return k},removeSorter:function(a){return this.removeSorters([a])},removeSorters:function(d){if(!Ext.isArray(d)){d=[d]}var b=d.length,c=this.getSorters(),a,e;for(a=0;a<b;a++){e=d[a];if(typeof e==="string"){c.removeAtKey(e)}else{if(typeof e==="function"){c.each(function(f){if(f.getSorterFn()===e){c.remove(f)}})}else{if(e.isSorter){c.remove(e)}}}}if(!c.length){this.sorted=false}},updateSortFn:function(){var a=this.getSorters().items;this.sortFn=function(d,c){var f=a.length,b,e;for(e=0;e<f;e++){b=a[e].sort.call(this,d,c);if(b!==0){break}}return b};this.dirtySortFn=false;return this.sortFn},getSortFn:function(){if(this.dirtySortFn){return this.updateSortFn()}return this.sortFn},sort:function(a){Ext.Array.sort(a,this.getSortFn());return a},findInsertionIndex:function(b,e,g){var h=0,a=b.length-1,d=g||this.getSortFn(),c,f;while(h<=a){c=(h+a)>>1;f=d(e,b[c]);if(f>=0){h=c+1}else{if(f<0){a=c-1}}}return h}});Ext.define("Ext.util.AbstractMixedCollection",{requires:["Ext.util.Filter"],mixins:{observable:"Ext.util.Observable"},constructor:function(b,a){var c=this;c.items=[];c.map={};c.keys=[];c.length=0;c.allowFunctions=b===true;if(a){c.getKey=a}c.mixins.observable.constructor.call(c)},allowFunctions:false,add:function(b,e){var d=this,f=e,c=b,a;if(arguments.length==1){f=c;c=d.getKey(f)}if(typeof c!="undefined"&&c!==null){a=d.map[c];if(typeof a!="undefined"){return d.replace(c,f)}d.map[c]=f}d.length++;d.items.push(f);d.keys.push(c);d.fireEvent("add",d.length-1,f,c);return f},getKey:function(a){return a.id},replace:function(c,e){var d=this,a,b;if(arguments.length==1){e=arguments[0];c=d.getKey(e)}a=d.map[c];if(typeof c=="undefined"||c===null||typeof a=="undefined"){return d.add(c,e)}b=d.indexOfKey(c);d.items[b]=e;d.map[c]=e;d.fireEvent("replace",c,a,e);return e},addAll:function(f){var e=this,d=0,b,a,c;if(arguments.length>1||Ext.isArray(f)){b=arguments.length>1?arguments:f;for(a=b.length;d<a;d++){e.add(b[d])}}else{for(c in f){if(f.hasOwnProperty(c)){if(e.allowFunctions||typeof f[c]!="function"){e.add(c,f[c])}}}}},each:function(e,d){var b=[].concat(this.items),c=0,a=b.length,f;for(;c<a;c++){f=b[c];if(e.call(d||f,f,c,a)===false){break}}},eachKey:function(e,d){var f=this.keys,b=this.items,c=0,a=f.length;for(;c<a;c++){e.call(d||window,f[c],b[c],c,a)}},findBy:function(e,d){var f=this.keys,b=this.items,c=0,a=b.length;for(;c<a;c++){if(e.call(d||window,b[c],f[c])){return b[c]}}return null},insert:function(a,b,e){var d=this,c=b,f=e;if(arguments.length==2){f=c;c=d.getKey(f)}if(d.containsKey(c)){d.suspendEvents();d.removeAtKey(c);d.resumeEvents()}if(a>=d.length){return d.add(c,f)}d.length++;Ext.Array.splice(d.items,a,0,f);if(typeof c!="undefined"&&c!==null){d.map[c]=f}Ext.Array.splice(d.keys,a,0,c);d.fireEvent("add",a,f,c);return f},remove:function(a){return this.removeAt(this.indexOf(a))},removeAll:function(a){Ext.each(a||[],function(b){this.remove(b)},this);return this},removeAt:function(a){var c=this,d,b;if(a<c.length&&a>=0){c.length--;d=c.items[a];Ext.Array.erase(c.items,a,1);b=c.keys[a];if(typeof b!="undefined"){delete c.map[b]}Ext.Array.erase(c.keys,a,1);c.fireEvent("remove",d,b);return d}return false},removeAtKey:function(a){return this.removeAt(this.indexOfKey(a))},getCount:function(){return this.length},indexOf:function(a){return Ext.Array.indexOf(this.items,a)},indexOfKey:function(a){return Ext.Array.indexOf(this.keys,a)},get:function(b){var d=this,a=d.map[b],c=a!==undefined?a:(typeof b=="number")?d.items[b]:undefined;return typeof c!="function"||d.allowFunctions?c:null},getAt:function(a){return this.items[a]},getByKey:function(a){return this.map[a]},contains:function(a){return Ext.Array.contains(this.items,a)},containsKey:function(a){return typeof this.map[a]!="undefined"},clear:function(){var a=this;a.length=0;a.items=[];a.keys=[];a.map={};a.fireEvent("clear")},first:function(){return this.items[0]},last:function(){return this.items[this.length-1]},sum:function(g,b,h,a){var c=this.extractValues(g,b),f=c.length,e=0,d;h=h||0;a=(a||a===0)?a:f-1;for(d=h;d<=a;d++){e+=c[d]}return e},collect:function(j,e,g){var k=this.extractValues(j,e),a=k.length,b={},c=[],h,f,d;for(d=0;d<a;d++){h=k[d];f=String(h);if((g||!Ext.isEmpty(h))&&!b[f]){b[f]=true;c.push(h)}}return c},extractValues:function(c,a){var b=this.items;if(a){b=Ext.Array.pluck(b,a)}return Ext.Array.pluck(b,c)},getRange:function(f,a){var e=this,c=e.items,b=[],d;if(c.length<1){return b}f=f||0;a=Math.min(typeof a=="undefined"?e.length-1:a,e.length-1);if(f<=a){for(d=f;d<=a;d++){b[b.length]=c[d]}}else{for(d=f;d>=a;d--){b[b.length]=c[d]}}return b},filter:function(d,c,f,a){var b=[],e;if(Ext.isString(d)){b.push(Ext.create("Ext.util.Filter",{property:d,value:c,anyMatch:f,caseSensitive:a}))}else{if(Ext.isArray(d)||d instanceof Ext.util.Filter){b=b.concat(d)}}e=function(g){var m=true,n=b.length,h;for(h=0;h<n;h++){var l=b[h],k=l.getFilterFn(),j=l.getScope();m=m&&k.call(j,g)}return m};return this.filterBy(e)},filterBy:function(e,d){var h=this,a=new this.self(),g=h.keys,b=h.items,f=b.length,c;a.getKey=h.getKey;for(c=0;c<f;c++){if(e.call(d||h,b[c],g[c])){a.add(g[c],b[c])}}return a},findIndex:function(c,b,e,d,a){if(Ext.isEmpty(b,false)){return -1}b=this.createValueMatcher(b,d,a);return this.findIndexBy(function(f){return f&&b.test(f[c])},null,e)},findIndexBy:function(e,d,h){var g=this,f=g.keys,b=g.items,c=h||0,a=b.length;for(;c<a;c++){if(e.call(d||g,b[c],f[c])){return c}}return -1},createValueMatcher:function(c,e,a,b){if(!c.exec){var d=Ext.String.escapeRegex;c=String(c);if(e===true){c=d(c)}else{c="^"+d(c);if(b===true){c+="$"}}c=new RegExp(c,a?"":"i")}return c},clone:function(){var e=this,f=new this.self(),d=e.keys,b=e.items,c=0,a=b.length;for(;c<a;c++){f.add(d[c],b[c])}f.getKey=e.getKey;return f}});Ext.define("Ext.util.Collection",{config:{autoFilter:true,autoSort:true},mixins:{sortable:"Ext.mixin.Sortable",filterable:"Ext.mixin.Filterable"},constructor:function(b,a){var c=this;c.all=[];c.items=[];c.keys=[];c.indices={};c.map={};c.length=0;if(b){c.getKey=b}this.initConfig(a)},updateAutoSort:function(a,b){if(b===false&&a&&this.items.length){this.sort()}},updateAutoFilter:function(b,a){if(a===false&&b&&this.all.length){this.runFilters()}},insertSorters:function(){this.mixins.sortable.insertSorters.apply(this,arguments);if(this.getAutoSort()&&this.items.length){this.sort()}return this},removeSorters:function(a){this.mixins.sortable.removeSorters.call(this,a);if(this.sorted&&this.getAutoSort()&&this.items.length){this.sort()}return this},applyFilters:function(a){var b=this.mixins.filterable.applyFilters.call(this,a);if(!a&&this.all.length&&this.getAutoFilter()){this.filter()}return b},addFilters:function(a){this.mixins.filterable.addFilters.call(this,a);if(this.items.length&&this.getAutoFilter()){this.runFilters()}return this},removeFilters:function(a){this.mixins.filterable.removeFilters.call(this,a);if(this.filtered&&this.all.length&&this.getAutoFilter()){this.filter()}return this},filter:function(c,b,d,a){if(c){if(Ext.isString(c)){this.addFilters({property:c,value:b,anyMatch:d,caseSensitive:a});return this.items}else{this.addFilters(c);return this.items}}this.items=this.mixins.filterable.filter.call(this,this.all.slice());this.updateAfterFilter();if(this.sorted&&this.getAutoSort()){this.sort()}},runFilters:function(){this.items=this.mixins.filterable.filter.call(this,this.items);this.updateAfterFilter()},updateAfterFilter:function(){var a=this.items,f=this.keys,g=this.indices={},e=a.length,c,d,b;f.length=0;for(c=0;c<e;c++){d=a[c];b=this.getKey(d);g[b]=c;f[c]=b}this.length=a.length;this.dirtyIndices=false},sort:function(e,a){var d=this.items,h=this.keys,g=this.indices,c=d.length,b,j,f;if(e){this.addSorters(e,a);return this.items}for(b=0;b<c;b++){d[b]._current_key=h[b]}this.handleSort(d);for(b=0;b<c;b++){j=d[b];f=j._current_key;h[b]=f;g[f]=b;delete j._current_key}this.dirtyIndices=true},handleSort:function(a){this.mixins.sortable.sort.call(this,a)},add:function(i,k){var g=this,d=this.filtered,e=this.sorted,h=this.all,f=this.items,l=this.keys,j=this.indices,a=this.mixins.filterable,b=f.length,c=b;if(arguments.length==1){k=i;i=g.getKey(k)}if(typeof i!="undefined"&&i!==null){if(typeof g.map[i]!="undefined"){return g.replace(i,k)}g.map[i]=k}h.push(k);if(d&&this.getAutoFilter()&&a.isFiltered.call(g,k)){return null}g.length++;if(e&&this.getAutoSort()){c=this.findInsertionIndex(f,k)}if(c!==b){this.dirtyIndices=true;Ext.Array.splice(l,c,0,i);Ext.Array.splice(f,c,0,k)}else{j[i]=b;l.push(i);f.push(k)}return k},getKey:function(a){return a.id},replace:function(d,m){var i=this,g=i.sorted,f=i.filtered,b=i.mixins.filterable,h=i.items,n=i.keys,k=i.all,c=i.map,l=null,a=h.length,o,e,j;if(arguments.length==1){m=d;d=j=i.getKey(m)}else{j=i.getKey(m)}o=c[d];if(typeof d=="undefined"||d===null||typeof o=="undefined"){return i.add(j,m)}i.map[j]=m;if(j!==d){delete i.map[d]}if(g&&i.getAutoSort()){Ext.Array.remove(h,o);Ext.Array.remove(n,d);Ext.Array.remove(k,o);k.push(m);i.dirtyIndices=true;if(f&&i.getAutoFilter()){if(b.isFiltered.call(i,m)){if(a!==h.length){i.length--}return null}else{if(a===h.length){i.length++;l=m}}}e=this.findInsertionIndex(h,m);Ext.Array.splice(n,e,0,j);Ext.Array.splice(h,e,0,m)}else{if(f){if(i.getAutoFilter()&&b.isFiltered.call(i,m)){if(h.indexOf(o)!==-1){Ext.Array.remove(h,o);Ext.Array.remove(n,d);i.length--;i.dirtyIndices=true}return null}else{if(h.indexOf(o)===-1){h.push(m);n.push(j);i.indices[j]=i.length;i.length++;return m}}}e=i.items.indexOf(o);n[e]=j;h[e]=m;this.dirtyIndices=true}return l},addAll:function(h){var q=this,e=q.filtered,a=q.sorted,b=q.all,k=q.items,j=q.keys,p=q.map,l=q.getAutoFilter(),m=q.getAutoSort(),r=[],f=[],c=q.mixins.filterable,d=[],g,s,n,o;if(Ext.isObject(h)){for(s in h){if(h.hasOwnProperty(s)){f.push(k[s]);r.push(s)}}}else{f=h;g=h.length;for(n=0;n<g;n++){r.push(q.getKey(h[n]))}}for(n=0;n<g;n++){s=r[n];o=f[n];if(typeof s!="undefined"&&s!==null){if(typeof p[s]!="undefined"){q.replace(s,o);continue}p[s]=o}b.push(o);if(e&&l&&c.isFiltered.call(q,o)){continue}q.length++;j.push(s);k.push(o);d.push(o)}if(d.length){q.dirtyIndices=true;if(a&&m){q.sort()}return d}return null},each:function(e,d){var b=this.items.slice(),c=0,a=b.length,f;for(;c<a;c++){f=b[c];if(e.call(d||f,f,c,a)===false){break}}},eachKey:function(d,c){var f=this.keys,a=this.items,e=f.length,b;for(b=0;b<e;b++){d.call(c||window,f[b],a[b],b,e)}},findBy:function(e,d){var f=this.keys,b=this.items,c=0,a=b.length;for(;c<a;c++){if(e.call(d||window,b[c],f[c])){return b[c]}}return null},filterBy:function(e,d){var h=this,c=new this.self(),g=h.keys,a=h.all,f=a.length,b;c.getKey=h.getKey;for(b=0;b<f;b++){if(e.call(d||h,a[b],g[b])){c.add(g[b],a[b])}}return c},insert:function(c,d,f){var e=this,a=this.sorted,b=this.filtered;if(arguments.length==2){f=d;d=e.getKey(f)}if(e.containsKey(d)){e.removeAtKey(d)}if(c>=e.length||(a&&e.getAutoSort())){return e.add(d,f)}this.all.push(f);if(typeof d!="undefined"&&d!==null){e.map[d]=f}if(b&&this.getAutoFilter()&&filterable.isFiltered.call(e,f)){return null}e.length++;Ext.Array.splice(e.items,c,0,f);Ext.Array.splice(e.keys,c,0,d);e.dirtyIndices=true;return f},insertAll:function(g,d){if(g>=this.items.length||(this.sorted&&this.getAutoSort())){return this.addAll(d)}var s=this,h=this.filtered,a=this.sorted,b=this.all,m=this.items,l=this.keys,r=this.map,n=this.getAutoFilter(),o=this.getAutoSort(),t=[],j=[],f=[],c=this.mixins.filterable,e=false,k,u,p,q;if(a&&this.getAutoSort()){}if(Ext.isObject(d)){for(u in d){if(d.hasOwnProperty(u)){j.push(m[u]);t.push(u)}}}else{j=d;k=d.length;for(p=0;p<k;p++){t.push(s.getKey(d[p]))}}for(p=0;p<k;p++){u=t[p];q=j[p];if(typeof u!="undefined"&&u!==null){if(s.containsKey(u)){s.removeAtKey(u)}r[u]=q}b.push(q);if(h&&n&&c.isFiltered.call(s,q)){continue}s.length++;Ext.Array.splice(m,g+p,0,q);Ext.Array.splice(l,g+p,0,u);e=true;f.push(q)}if(e){this.dirtyIndices=true;if(a&&o){this.sort()}return f}return null},remove:function(b){var a=this.items.indexOf(b);if(a===-1){Ext.Array.remove(this.all,b);return b}return this.removeAt(this.items.indexOf(b))},removeAll:function(a){if(a){var c=a.length,b;for(b=0;b<c;b++){this.remove(a[b])}}return this},removeAt:function(b){var g=this,a=g.items,f=g.keys,d=this.all,e,c;if(b<g.length&&b>=0){e=a[b];c=f[b];if(typeof c!="undefined"){delete g.map[c]}Ext.Array.erase(a,b,1);Ext.Array.erase(f,b,1);Ext.Array.remove(d,e);g.length--;this.dirtyIndices=true;return e}return false},removeAtKey:function(a){return this.removeAt(this.indexOfKey(a))},getCount:function(){return this.length},indexOf:function(b){if(this.dirtyIndices){this.updateIndices()}var a=this.indices[this.getKey(b)];return(a===undefined)?-1:a},indexOfKey:function(b){if(this.dirtyIndices){this.updateIndices()}var a=this.indices[b];return(a===undefined)?-1:a},updateIndices:function(){var a=this.items,e=a.length,f=this.indices={},c,d,b;for(c=0;c<e;c++){d=a[c];b=this.getKey(d);f[b]=c}this.dirtyIndices=false},get:function(b){var d=this,a=d.map[b],c;if(a!==undefined){c=a}else{if(typeof b=="number"){c=d.items[b]}}return typeof c!="function"||d.getAllowFunctions()?c:null},getAt:function(a){return this.items[a]},getByKey:function(a){return this.map[a]},contains:function(b){var a=this.getKey(b);if(a){return this.containsKey(a)}else{return Ext.Array.contains(this.items,b)}},containsKey:function(a){return typeof this.map[a]!="undefined"},clear:function(){var a=this;a.length=0;a.items.length=0;a.keys.length=0;a.all.length=0;a.map={}},first:function(){return this.items[0]},last:function(){return this.items[this.length-1]},getRange:function(f,a){var e=this,c=e.items,b=[],d;if(c.length<1){return b}f=f||0;a=Math.min(typeof a=="undefined"?e.length-1:a,e.length-1);if(f<=a){for(d=f;d<=a;d++){b[b.length]=c[d]}}else{for(d=f;d>=a;d--){b[b.length]=c[d]}}return b},findIndexBy:function(d,c,h){var g=this,f=g.keys,a=g.items,b=h||0,e=a.length;for(;b<e;b++){if(d.call(c||g,a[b],f[b])){return b}}return -1},clone:function(){var e=this,f=new this.self(),d=e.keys,a=e.items,b=0,c=a.length;for(;b<c;b++){f.add(d[b],a[b])}f.getKey=e.getKey;return f}});Ext.define("Ext.data.StoreManager",{extend:"Ext.util.Collection",alternateClassName:["Ext.StoreMgr","Ext.data.StoreMgr","Ext.StoreManager"],singleton:true,uses:["Ext.data.ArrayStore"],register:function(){for(var a=0,b;(b=arguments[a]);a++){this.add(b)}},unregister:function(){for(var a=0,b;(b=arguments[a]);a++){this.remove(this.lookup(b))}},lookup:function(c){if(Ext.isArray(c)){var b=["field1"],e=!Ext.isArray(c[0]),f=c,d,a;if(e){f=[];for(d=0,a=c.length;d<a;++d){f.push([c[d]])}}else{for(d=2,a=c[0].length;d<=a;++d){b.push("field"+d)}}return Ext.create("Ext.data.ArrayStore",{data:f,fields:b,autoDestroy:true,autoCreated:true,expanded:e})}if(Ext.isString(c)){return this.get(c)}else{if(c instanceof Ext.data.Store){return c}else{return Ext.factory(c,Ext.data.Store,null,"store")}}},getKey:function(a){return a.getStoreId()}},function(){Ext.regStore=function(c,b){var a;if(Ext.isObject(c)){b=c}else{if(b instanceof Ext.data.Store){b.setStoreId(c)}else{b.storeId=c}}if(b instanceof Ext.data.Store){a=b}else{a=Ext.create("Ext.data.Store",b)}return Ext.data.StoreManager.register(a)};Ext.getStore=function(a){return Ext.data.StoreManager.lookup(a)}});Ext.define("Ext.direct.Manager",{singleton:true,mixins:{observable:"Ext.util.Observable"},requires:["Ext.util.Collection"],alternateClassName:"Ext.Direct",statics:{exceptions:{TRANSPORT:"xhr",PARSE:"parse",LOGIN:"login",SERVER:"exception"}},constructor:function(){var a=this;a.transactions=Ext.create("Ext.util.Collection",this.getKey);a.providers=Ext.create("Ext.util.Collection",this.getKey)},getKey:function(a){return a.getId()},addProvider:function(e){var d=this,a=Ext.toArray(arguments),b=0,c;if(a.length>1){for(c=a.length;b<c;++b){d.addProvider(a[b])}return}if(!e.isProvider){e=Ext.create("direct."+e.type+"provider",e)}d.providers.add(e);e.on("data",d.onProviderData,d);if(!e.isConnected()){e.connect()}return e},getProvider:function(a){return a.isProvider?a:this.providers.get(a)},removeProvider:function(c){var b=this,a=b.providers;c=c.isProvider?c:a.get(c);if(c){c.un("data",b.onProviderData,b);a.remove(c);return c}return null},addTransaction:function(a){this.transactions.add(a);return a},removeTransaction:function(a){a=this.getTransaction(a);this.transactions.remove(a);return a},getTransaction:function(a){return Ext.isObject(a)?a:this.transactions.get(a)},onProviderData:function(f,e){var d=this,b=0,c,a;if(Ext.isArray(e)){for(c=e.length;b<c;++b){d.onProviderData(f,e[b])}return}a=e.getName();if(a&&a!="event"&&a!="exception"){d.fireEvent(a,e)}else{if(e.getStatus()===false){d.fireEvent("exception",e)}}d.fireEvent("event",e,f)},parseMethod:function(b){if(Ext.isString(b)){var e=b.split("."),a=0,c=e.length,d=window;while(d&&a<c){d=d[e[a]];++a}b=Ext.isFunction(d)?d:null}return b||null}});Ext.define("Ext.data.proxy.Direct",{extend:"Ext.data.proxy.Server",alternateClassName:"Ext.data.DirectProxy",alias:"proxy.direct",requires:["Ext.direct.Manager"],config:{paramOrder:undefined,paramsAsHash:true,directFn:undefined,api:null,extraParams:null},paramOrderRe:/[\s,|]/,applyParamOrder:function(a){if(Ext.isString(a)){a=a.split(this.paramOrderRe)}return a},applyDirectFn:function(a){return Ext.direct.Manager.parseMethod(fn)},applyApi:function(b){var a;if(b&&Ext.isObject(b)){for(a in b){if(b.hasOwnProperty(a)){b[a]=Ext.direct.Manager.parseMethod(b[a])}}}return b},doRequest:function(d,j,k){var h=this,b=h.getWriter(),e=h.buildRequest(d,j,k),f=h.getApi(),i=f&&f[e.getAction()]||h.getDirectFn(),c=e.getParams(),g=[],a;e=b.write(e);if(d.getAction()=="read"){a=i.directCfg.method;g=a.getArgs(c,h.getParamOrder(),h.getParamsAsHash())}else{g.push(e.getJsonData())}g.push(h.createRequestCallback(e,d,j,k),h);e.setConfig({args:g,directFn:i});i.apply(window,g)},applyEncoding:function(a){return a},createRequestCallback:function(d,a,e,b){var c=this;return function(g,f){c.processResponse(f.getStatus(),a,d,f,e,b)}},extractResponseData:function(b){var a=b.getResult();return Ext.isDefined(a)?a:b.getData()},setException:function(b,a){b.setException(a.getMessage())},buildUrl:function(){return""}});Ext.define("Ext.direct.Event",{alias:"direct.event",requires:["Ext.direct.Manager"],config:{status:true,data:null,name:"event",xhr:null,code:null,message:"",result:null,transaction:null},constructor:function(a){this.initConfig(a)}});Ext.define("Ext.direct.RemotingEvent",{extend:"Ext.direct.Event",alias:"direct.rpc",config:{name:"remoting",tid:null,transaction:null},getTransaction:function(){return this._transaction||Ext.direct.Manager.getTransaction(this.getTid())}});Ext.define("Ext.direct.ExceptionEvent",{extend:"Ext.direct.RemotingEvent",alias:"direct.exception",config:{status:false,name:"exception",error:null}});Ext.define("Ext.util.Format",{requires:["Ext.DateExtras"],singleton:true,defaultDateFormat:"m/d/Y",escapeRe:/('|\\)/g,trimRe:/^[\x09\x0a\x0b\x0c\x0d\x20\xa0\u1680\u180e\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u2028\u2029\u202f\u205f\u3000]+|[\x09\x0a\x0b\x0c\x0d\x20\xa0\u1680\u180e\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u2028\u2029\u202f\u205f\u3000]+$/g,formatRe:/\{(\d+)\}/g,escapeRegexRe:/([-.*+?^${}()|[\]\/\\])/g,dashesRe:/-/g,iso8601TestRe:/\d\dT\d\d/,iso8601SplitRe:/[- :T\.Z\+]/,ellipsis:function(c,a,d){if(c&&c.length>a){if(d){var e=c.substr(0,a-2),b=Math.max(e.lastIndexOf(" "),e.lastIndexOf("."),e.lastIndexOf("!"),e.lastIndexOf("?"));if(b!=-1&&b>=(a-15)){return e.substr(0,b)+"..."}}return c.substr(0,a-3)+"..."}return c},escapeRegex:function(a){return a.replace(Ext.util.Format.escapeRegexRe,"\\$1")},escape:function(a){return a.replace(Ext.util.Format.escapeRe,"\\$1")},toggle:function(b,c,a){return b==c?a:c},trim:function(a){return a.replace(Ext.util.Format.trimRe,"")},leftPad:function(d,b,c){var a=String(d);c=c||" ";while(a.length<b){a=c+a}return a},format:function(b){var a=Ext.toArray(arguments,1);return b.replace(Ext.util.Format.formatRe,function(c,d){return a[d]})},htmlEncode:function(a){return !a?a:String(a).replace(/&/g,"&amp;").replace(/>/g,"&gt;").replace(/</g,"&lt;").replace(/"/g,"&quot;")},htmlDecode:function(a){return !a?a:String(a).replace(/&gt;/g,">").replace(/&lt;/g,"<").replace(/&quot;/g,'"').replace(/&amp;/g,"&")},date:function(b,c){var a=b;if(!b){return""}if(!Ext.isDate(b)){a=new Date(Date.parse(b));if(isNaN(a)){if(this.iso8601TestRe.test(b)){a=b.split(this.iso8601SplitRe);a=new Date(a[0],a[1]-1,a[2],a[3],a[4],a[5])}if(isNaN(a)){a=new Date(Date.parse(b.replace(this.dashesRe,"/")))}}b=a}return Ext.Date.format(b,c||Ext.util.Format.defaultDateFormat)}});Ext.define("Ext.Template",{requires:["Ext.dom.Helper","Ext.util.Format"],inheritableStatics:{from:function(b,a){b=Ext.getDom(b);return new this(b.value||b.innerHTML,a||"")}},constructor:function(d){var f=this,b=arguments,a=[],c=0,e=b.length,g;f.initialConfig={};if(e>1){for(;c<e;c++){g=b[c];if(typeof g=="object"){Ext.apply(f.initialConfig,g);Ext.apply(f,g)}else{a.push(g)}}d=a.join("")}else{if(Ext.isArray(d)){a.push(d.join(""))}else{a.push(d)}}f.html=a.join("");if(f.compiled){f.compile()}},isTemplate:true,disableFormats:false,re:/\{([\w\-]+)(?:\:([\w\.]*)(?:\((.*?)?\))?)?\}/g,apply:function(a){var g=this,d=g.disableFormats!==true,f=Ext.util.Format,c=g,b;if(g.compiled){return g.compiled(a).join("")}function e(h,j,k,i){if(k&&d){if(i){i=[a[j]].concat(Ext.functionFactory("return ["+i+"];")())}else{i=[a[j]]}if(k.substr(0,5)=="this."){return c[k.substr(5)].apply(c,i)}else{return f[k].apply(f,i)}}else{return a[j]!==undefined?a[j]:""}}b=g.html.replace(g.re,e);return b},applyOut:function(a,b){var c=this;if(c.compiled){b.push.apply(b,c.compiled(a))}else{b.push(c.apply(a))}return b},applyTemplate:function(){return this.apply.apply(this,arguments)},set:function(a,c){var b=this;b.html=a;b.compiled=null;return c?b.compile():b},compileARe:/\\/g,compileBRe:/(\r\n|\n)/g,compileCRe:/'/g,compile:function(){var me=this,fm=Ext.util.Format,useFormat=me.disableFormats!==true,body,bodyReturn;function fn(m,name,format,args){if(format&&useFormat){args=args?","+args:"";if(format.substr(0,5)!="this."){format="fm."+format+"("}else{format="this."+format.substr(5)+"("}}else{args="";format="(values['"+name+"'] == undefined ? '' : "}return"',"+format+"values['"+name+"']"+args+") ,'"}bodyReturn=me.html.replace(me.compileARe,"\\\\").replace(me.compileBRe,"\\n").replace(me.compileCRe,"\\'").replace(me.re,fn);body="this.compiled = function(values){ return ['"+bodyReturn+"'];};";eval(body);return me},insertFirst:function(b,a,c){return this.doInsert("afterBegin",b,a,c)},insertBefore:function(b,a,c){return this.doInsert("beforeBegin",b,a,c)},insertAfter:function(b,a,c){return this.doInsert("afterEnd",b,a,c)},append:function(b,a,c){return this.doInsert("beforeEnd",b,a,c)},doInsert:function(c,e,b,a){e=Ext.getDom(e);var d=Ext.DomHelper.insertHtml(c,e,this.apply(b));return a?Ext.get(d,true):d},overwrite:function(b,a,c){b=Ext.getDom(b);b.innerHTML=this.apply(a);return c?Ext.get(b.firstChild,true):b.firstChild}});Ext.define("Ext.XTemplate",{extend:"Ext.Template",requires:"Ext.XTemplateCompiler",apply:function(a){return this.applyOut(a,[]).join("")},applyOut:function(a,b){var d=this,c;if(!d.fn){c=new Ext.XTemplateCompiler({useFormat:d.disableFormats!==true});d.fn=c.compile(d.html)}try{d.fn.call(d,b,a,{},1,1)}catch(f){}return b},compile:function(){return this},statics:{getTpl:function(a,c){var b=a[c],d;if(b&&!b.isTemplate){b=Ext.ClassManager.dynInstantiate("Ext.XTemplate",b);if(a.hasOwnProperty(c)){a[c]=b}else{for(d=a.self.prototype;d;d=d.superclass){if(d.hasOwnProperty(c)){d[c]=b;break}}}}return b||null}}});Ext.define("Ext.util.GeoLocation",{extend:"Ext.Evented",config:{autoUpdate:true,latitude:null,longitude:null,accuracy:null,altitude:null,altitudeAccuracy:null,heading:null,speed:null,timestamp:null,allowHighAccuracy:false,timeout:Infinity,maximumAge:0,provider:undefined},updateMaximumAge:function(){if(this.watchOperation){this.updateWatchOperation()}},updateTimeout:function(){if(this.watchOperation){this.updateWatchOperation()}},updateAllowHighAccuracy:function(){if(this.watchOperation){this.updateWatchOperation()}},applyProvider:function(a){if(Ext.feature.has.Geolocation){if(!a){if(navigator&&navigator.geolocation){a=navigator.geolocation}else{if(window.google){a=google.gears.factory.create("beta.geolocation")}}}}else{this.fireEvent("locationerror",this,false,false,true,"This device does not support Geolocation.")}return a},updateAutoUpdate:function(a,b){var c=this,f=c.getProvider();if(b&&f){clearInterval(c.watchOperationId);c.watchOperationId=null}if(a){if(!f){c.fireEvent("locationerror",c,false,false,true,null);return}try{c.updateWatchOperation()}catch(d){c.fireEvent("locationerror",c,false,false,true,d.message)}}},updateWatchOperation:function(){var a=this,b=a.getProvider();if(a.watchOperationId){clearInterval(a.watchOperationId)}function c(){b.getCurrentPosition(Ext.bind(a.fireUpdate,a),Ext.bind(a.fireError,a),a.parseOptions())}c();a.watchOperationId=setInterval(c,10000)},updateLocation:function(h,a,c){var b=this,g=b.getProvider();var f=function(i,e){if(e){b.fireError(e)}else{b.fireEvent("locationerror",b,false,false,true,i)}if(h){h.call(a||b,null,b)}};if(!g){f(null);return}try{g.getCurrentPosition(function(e){b.fireUpdate(e);if(h){h.call(a||b,b,b)}},function(e){f(null,e)},c||b.parseOptions())}catch(d){f(d.message)}},fireUpdate:function(a){var b=this,c=a.coords;b.setConfig({timestamp:a.timestamp,latitude:c.latitude,longitude:c.longitude,accuracy:c.accuracy,altitude:c.altitude,altitudeAccuracy:c.altitudeAccuracy,heading:c.heading,speed:c.speed});b.fireEvent("locationupdate",b)},fireError:function(a){var b=a.code;this.fireEvent("locationerror",this,b==a.TIMEOUT,b==a.PERMISSION_DENIED,b==a.POSITION_UNAVAILABLE,a.message==undefined?null:a.message)},parseOptions:function(){var b=this.getTimeout(),a={maximumAge:this.getMaximumAge(),allowHighAccuracy:this.getAllowHighAccuracy()};if(b!==Infinity){a.timeout=b}return a},destroy:function(){this.updateAutoUpdate(null)}});Ext.define("Ext.util.Grouper",{extend:"Ext.util.Sorter",isGrouper:true,config:{groupFn:null,sortProperty:null,sorterFn:function(d,c){var e=this.getSortProperty(),g,b,f,a;g=this.getGroupFn();b=g.call(this,d);f=g.call(this,c);if(e){if(b!==f){return this.defaultSortFn.call(this,d,c)}else{return 0}}return(b>f)?1:((b<f)?-1:0)}},defaultSortFn:function(e,c){var g=this,f=g._transform,b=g._root,d,a,h=g._sortProperty;if(b!==null){e=e[b];c=c[b]}d=e[h];a=c[h];if(f){d=f(d);a=f(a)}return d>a?1:(d<a?-1:0)},updateProperty:function(a){this.setGroupFn(this.standardGroupFn)},standardGroupFn:function(b){var a=this.getRoot(),d=this.getProperty(),c=b;if(a){c=b[a]}return c[d]},getGroupString:function(a){var b=this.getGroupFn().call(this,a);return typeof b!="undefined"?b.toString():""}});Ext.define("Ext.util.HashMap",{mixins:{observable:"Ext.util.Observable"},constructor:function(a){this.callParent();this.mixins.observable.constructor.call(this);this.clear(true)},getCount:function(){return this.length},getData:function(a,b){if(b===undefined){b=a;a=this.getKey(b)}return[a,b]},getKey:function(a){return a.id},add:function(a,d){var b=this,c;if(b.containsKey(a)){throw new Error("This key already exists in the HashMap")}c=this.getData(a,d);a=c[0];d=c[1];b.map[a]=d;++b.length;b.fireEvent("add",b,a,d);return d},replace:function(b,d){var c=this,e=c.map,a;if(!c.containsKey(b)){c.add(b,d)}a=e[b];e[b]=d;c.fireEvent("replace",c,b,d,a);return d},remove:function(b){var a=this.findKey(b);if(a!==undefined){return this.removeByKey(a)}return false},removeByKey:function(a){var b=this,c;if(b.containsKey(a)){c=b.map[a];delete b.map[a];--b.length;b.fireEvent("remove",b,a,c);return true}return false},get:function(a){return this.map[a]},clear:function(a){var b=this;b.map={};b.length=0;if(a!==true){b.fireEvent("clear",b)}return b},containsKey:function(a){return this.map[a]!==undefined},contains:function(a){return this.containsKey(this.findKey(a))},getKeys:function(){return this.getArray(true)},getValues:function(){return this.getArray(false)},getArray:function(d){var a=[],b,c=this.map;for(b in c){if(c.hasOwnProperty(b)){a.push(d?b:c[b])}}return a},each:function(d,c){var a=Ext.apply({},this.map),b,e=this.length;c=c||this;for(b in a){if(a.hasOwnProperty(b)){if(d.call(c,b,a[b],e)===false){break}}}return this},clone:function(){var c=new Ext.util.HashMap(),b=this.map,a;c.suspendEvents();for(a in b){if(b.hasOwnProperty(a)){c.add(a,b[a])}}c.resumeEvents();return c},findKey:function(b){var a,c=this.map;for(a in c){if(c.hasOwnProperty(a)&&c[a]===b){return a}}return undefined}});Ext.define("Ext.AbstractManager",{requires:["Ext.util.HashMap"],typeName:"type",constructor:function(a){Ext.apply(this,a||{});this.all=Ext.create("Ext.util.HashMap");this.types={}},get:function(a){return this.all.get(a)},register:function(a){this.all.add(a)},unregister:function(a){this.all.remove(a)},registerType:function(b,a){this.types[b]=a;a[this.typeName]=b},isRegistered:function(a){return this.types[a]!==undefined},create:function(a,d){var b=a[this.typeName]||a.type||d,c=this.types[b];return new c(a)},onAvailable:function(e,c,b){var a=this.all,d;if(a.containsKey(e)){d=a.get(e);c.call(b||d,d)}else{a.on("add",function(h,f,g){if(f==e){c.call(b||g,g);a.un("add",c,b)}})}},each:function(b,a){this.all.each(b,a||this)},getCount:function(){return this.all.getCount()}});Ext.define("Ext.data.ModelManager",{extend:"Ext.AbstractManager",alternateClassName:["Ext.ModelMgr","Ext.ModelManager"],singleton:true,modelNamespace:null,registerType:function(c,b){var d=b.prototype,a;if(d&&d.isModel){a=b}else{b={extend:b.extend||"Ext.data.Model",config:b};a=Ext.define(c,b)}this.types[c]=a;return a},onModelDefined:Ext.emptyFn,getModel:function(b){var a=b;if(typeof a=="string"){a=this.types[a];if(!a&&this.modelNamespace){a=this.types[this.modelNamespace+"."+a]}}return a},create:function(c,b,d){var a=typeof b=="function"?b:this.types[b||c.name];return new a(c,d)}},function(){Ext.regModel=function(){return this.ModelManager.registerType.apply(this.ModelManager,arguments)}});Ext.define("Ext.data.NodeInterface",{requires:["Ext.data.Field","Ext.data.ModelManager"],alternateClassName:"Ext.data.Node",statics:{decorate:function(d){if(!d.isNode){var g=Ext.data.ModelManager,c=d.modelName,e=g.getModel(c),b=[],f,h,a;e.override(this.getPrototypeBody());b=this.applyFields(e,[{name:"parentId",type:"string",defaultValue:null},{name:"index",type:"int",defaultValue:0},{name:"depth",type:"int",defaultValue:0},{name:"expanded",type:"bool",defaultValue:false,persist:false},{name:"expandable",type:"bool",defaultValue:true,persist:false},{name:"checked",type:"auto",defaultValue:null},{name:"leaf",type:"bool",defaultValue:false,persist:false},{name:"cls",type:"string",defaultValue:null,persist:false},{name:"iconCls",type:"string",defaultValue:null,persist:false},{name:"root",type:"boolean",defaultValue:false,persist:false},{name:"isLast",type:"boolean",defaultValue:false,persist:false},{name:"isFirst",type:"boolean",defaultValue:false,persist:false},{name:"allowDrop",type:"boolean",defaultValue:true,persist:false},{name:"allowDrag",type:"boolean",defaultValue:true,persist:false},{name:"loaded",type:"boolean",defaultValue:false,persist:false},{name:"loading",type:"boolean",defaultValue:false,persist:false},{name:"href",type:"string",defaultValue:null,persist:false},{name:"hrefTarget",type:"string",defaultValue:null,persist:false},{name:"qtip",type:"string",defaultValue:null,persist:false},{name:"qtitle",type:"string",defaultValue:null,persist:false}]);a=b.length;e.getFields().isDirty=true;for(f=0;f<a;++f){h=b[f];if(d.get(h.getName())===undefined){d.data[h.getName()]=h.getDefaultValue()}}}if(!d.isDecorated){d.isDecorated=true;Ext.applyIf(d,{firstChild:null,lastChild:null,parentNode:null,previousSibling:null,nextSibling:null,childNodes:[]});d.enableBubble(["append","remove","move","insert","beforeappend","beforeremove","beforemove","beforeinsert","expand","collapse","beforeexpand","beforecollapse","sort","load"])}return d},applyFields:function(g,h){var b=g.prototype,d=b.fields,j=d.keys,f=h.length,a,c,e=[];for(c=0;c<f;c++){a=h[c];if(!Ext.Array.contains(j,a.name)){a=Ext.create("Ext.data.Field",a);e.push(a);d.add(a)}}return e},getPrototypeBody:function(){return{isNode:true,createNode:function(a){if(Ext.isObject(a)&&!a.isModel){a=Ext.data.ModelManager.create(a,this.modelName)}return Ext.data.NodeInterface.decorate(a)},isLeaf:function(){return this.get("leaf")===true},setFirstChild:function(a){this.firstChild=a},setLastChild:function(a){this.lastChild=a},updateInfo:function(g){var j=this,f=j.parentNode,b=(!f?true:f.firstChild==j),e=(!f?true:f.lastChild==j),d=0,k=j,a=j.childNodes,h=a.length,c;while(k.parentNode){++d;k=k.parentNode}j.beginEdit();j.set({isFirst:b,isLast:e,depth:d,index:f?f.indexOf(j):0,parentId:f?f.getId():null});j.endEdit(g);if(g){j.commit(g)}for(c=0;c<h;c++){a[c].updateInfo(g)}},isLast:function(){return this.get("isLast")},isFirst:function(){return this.get("isFirst")},hasChildNodes:function(){return !this.isLeaf()&&this.childNodes.length>0},isExpandable:function(){var a=this;if(a.get("expandable")){return !(a.isLeaf()||(a.isLoaded()&&!a.hasChildNodes()))}return false},appendChild:function(b,j,h){var f=this,c,e,d,g,a;if(Ext.isArray(b)){for(c=0,e=b.length;c<e;c++){f.appendChild(b[c])}}else{b=f.createNode(b);if(j!==true&&f.fireEvent("beforeappend",f,b)===false){return false}d=f.childNodes.length;g=b.parentNode;if(g){if(j!==true&&b.fireEvent("beforemove",b,g,f,d)===false){return false}g.removeChild(b,null,false,true)}d=f.childNodes.length;if(d===0){f.setFirstChild(b)}f.childNodes.push(b);b.parentNode=f;b.nextSibling=null;f.setLastChild(b);a=f.childNodes[d-1];if(a){b.previousSibling=a;a.nextSibling=b;a.updateInfo(h)}else{b.previousSibling=null}b.updateInfo(h);if(!f.isLoaded()){f.set("loaded",true)}else{if(f.childNodes.length===1){f.set("loaded",f.isLoaded())}}if(j!==true){f.fireEvent("append",f,b,d);if(g){b.fireEvent("move",b,g,f,d)}}return b}},getBubbleTarget:function(){return this.parentNode},removeChild:function(e,b,c,f){var d=this,a=d.indexOf(e);if(a==-1||(c!==true&&d.fireEvent("beforeremove",d,e)===false)){return false}Ext.Array.erase(d.childNodes,a,1);if(d.firstChild==e){d.setFirstChild(e.nextSibling)}if(d.lastChild==e){d.setLastChild(e.previousSibling)}if(c!==true){d.fireEvent("remove",d,e)}if(e.previousSibling){e.previousSibling.nextSibling=e.nextSibling;e.previousSibling.updateInfo(f)}if(e.nextSibling){e.nextSibling.previousSibling=e.previousSibling;e.nextSibling.updateInfo(f)}if(!d.childNodes.length){d.set("loaded",d.isLoaded())}if(b){e.destroy(true)}else{e.clear()}return e},copy:function(d,c){var f=this,b=f.callOverridden(arguments),a=f.childNodes?f.childNodes.length:0,e;if(c){for(e=0;e<a;e++){b.appendChild(f.childNodes[e].copy(true))}}return b},clear:function(a){var b=this;b.parentNode=b.previousSibling=b.nextSibling=null;if(a){b.firstChild=b.lastChild=null}},destroy:function(a){var c=this,b=c.destroyOptions;if(a===true){c.clear(true);Ext.each(c.childNodes,function(d){d.destroy(true)});c.childNodes=null;delete c.destroyOptions;c.callOverridden([b])}else{c.destroyOptions=a;c.remove(true)}},insertBefore:function(f,a,d){var e=this,b=e.indexOf(a),c=f.parentNode,g=b,h;if(!a){return e.appendChild(f)}if(f==a){return false}f=e.createNode(f);if(d!==true&&e.fireEvent("beforeinsert",e,f,a)===false){return false}if(c==e&&e.indexOf(f)<b){g--}if(c){if(d!==true&&f.fireEvent("beforemove",f,c,e,b,a)===false){return false}c.removeChild(f)}if(g===0){e.setFirstChild(f)}Ext.Array.splice(e.childNodes,g,0,f);f.parentNode=e;f.nextSibling=a;a.previousSibling=f;h=e.childNodes[g-1];if(h){f.previousSibling=h;h.nextSibling=f;h.updateInfo()}else{f.previousSibling=null}f.updateInfo();if(!e.isLoaded()){e.set("loaded",true)}else{if(e.childNodes.length===1){e.set("loaded",e.isLoaded())}}if(d!==true){e.fireEvent("insert",e,f,a);if(c){f.fireEvent("move",f,c,e,g,a)}}return f},insertChild:function(a,c){var b=this.childNodes[a];if(b){return this.insertBefore(c,b)}else{return this.appendChild(c)}},remove:function(b,c){var a=this.parentNode;if(a){a.removeChild(this,b,c,true)}return this},removeAll:function(a,b){var d=this.childNodes,c;while((c=d[0])){this.removeChild(c,a,b)}return this},getChildAt:function(a){return this.childNodes[a]},replaceChild:function(a,d,c){var b=d?d.nextSibling:null;this.removeChild(d,c);this.insertBefore(a,b,c);return d},indexOf:function(a){return Ext.Array.indexOf(this.childNodes,a)},getPath:function(d,c){d=d||this.idProperty;c=c||"/";var b=[this.get(d)],a=this.parentNode;while(a){b.unshift(a.get(d));a=a.parentNode}return c+b.join(c)},getDepth:function(){return this.get("depth")},bubble:function(c,b,a){var d=this;while(d){if(c.apply(b||d,a||[d])===false){break}d=d.parentNode}},cascadeBy:function(d,c,a){if(d.apply(c||this,a||[this])!==false){var f=this.childNodes,e=f.length,b;for(b=0;b<e;b++){f[b].cascadeBy(d,c,a)}}},eachChild:function(d,c,a){var f=this.childNodes,e=f.length,b;for(b=0;b<e;b++){if(d.apply(c||this,a||[f[b]])===false){break}}},findChild:function(b,c,a){return this.findChildBy(function(){return this.get(b)==c},null,a)},findChildBy:function(g,f,b){var e=this.childNodes,a=e.length,d=0,h,c;for(;d<a;d++){h=e[d];if(g.call(f||h,h)===true){return h}else{if(b){c=h.findChildBy(g,f,b);if(c!==null){return c}}}}return null},contains:function(a){return a.isAncestor(this)},isAncestor:function(a){var b=this.parentNode;while(b){if(b==a){return true}b=b.parentNode}return false},sort:function(f,b,a){var d=this.childNodes,e=d.length,c,g;if(e>0){Ext.Array.sort(d,f);for(c=0;c<e;c++){g=d[c];g.previousSibling=d[c-1];g.nextSibling=d[c+1];if(c===0){this.setFirstChild(g)}if(c==e-1){this.setLastChild(g)}g.updateInfo(a);if(b&&!g.isLeaf()){g.sort(f,true,true)}}this.notifyStores("afterEdit",["sorted"],{sorted:"sorted"});if(a!==true){this.fireEvent("sort",this,d)}}},isExpanded:function(){return this.get("expanded")},isLoaded:function(){return this.get("loaded")},isLoading:function(){return this.get("loading")},isRoot:function(){return !this.parentNode},isVisible:function(){var a=this.parentNode;while(a){if(!a.isExpanded()){return false}a=a.parentNode}return true},expand:function(a,d,b){var c=this;if(!c.isLeaf()){if(c.isLoading()){c.on("expand",function(){c.expand(a,d,b)},c,{single:true})}else{if(!c.isExpanded()){c.fireAction("expand",[this],function(){c.set("expanded",true);Ext.callback(d,b||c,[c.childNodes])})}else{Ext.callback(d,b||c,[c.childNodes])}}}else{Ext.callback(d,b||c)}},collapse:function(a,d,b){var c=this;if(!c.isLeaf()&&c.isExpanded()){this.fireAction("collapse",[c],function(){c.set("expanded",false);Ext.callback(d,b||c,[c.childNodes])})}else{Ext.callback(d,b||c,[c.childNodes])}}}}}});Ext.define("Ext.data.association.Association",{alternateClassName:"Ext.data.Association",requires:["Ext.data.ModelManager"],config:{ownerModel:null,ownerName:undefined,associatedModel:null,associatedName:undefined,associationKey:undefined,primaryKey:"id",reader:null,type:null,name:undefined},statics:{create:function(a){if(!a.isAssociation){if(Ext.isString(a)){a={type:a}}a.type=a.type.toLowerCase();return Ext.factory(a,Ext.data.association.Association,null,"association")}return a}},constructor:function(a){this.initConfig(a)},applyName:function(a){if(!a){a=this.getAssociatedName()}return a},applyOwnerModel:function(a){var b=Ext.data.ModelManager.getModel(a);if(b===undefined){Ext.Logger.error("The configured ownerModel was not valid (you tried "+a+")")}return b},applyOwnerName:function(a){if(!a){a=this.getOwnerModel().modelName}a=a.slice(a.lastIndexOf(".")+1);return a},updateOwnerModel:function(a){this.setOwnerName(a.modelName)},applyAssociatedModel:function(a){var b=Ext.data.ModelManager.types[a];if(b===undefined){Ext.Logger.error("The configured associatedModel was not valid (you tried "+a+")")}return b},applyAssociatedName:function(a){if(!a){a=this.getAssociatedModel().modelName}a=a.slice(a.lastIndexOf(".")+1);return a},updateAssociatedModel:function(a){this.setAssociatedName(a.modelName)},applyReader:function(a){if(a){if(Ext.isString(a)){a={type:a}}if(!a.isReader){Ext.applyIf(a,{type:"json"})}}return Ext.factory(a,Ext.data.Reader,this.getReader(),"reader")},updateReader:function(a){a.setModel(this.getAssociatedModel())}});Ext.define("Ext.data.association.BelongsTo",{extend:"Ext.data.association.Association",alternateClassName:"Ext.data.BelongsToAssociation",alias:"association.belongsto",config:{foreignKey:undefined,getterName:undefined,setterName:undefined,instanceName:undefined},applyForeignKey:function(a){if(!a){a=this.getAssociatedName().toLowerCase()+"_id"}return a},updateForeignKey:function(b,d){var a=this.getOwnerModel().getFields(),c=a.get(b);if(!c){c=new Ext.data.Field({name:b});a.add(c);a.isDirty=true}if(d){c=a.get(d);if(c){a.isDirty=true;a.remove(c)}}},applyInstanceName:function(a){if(!a){a=this.getAssociatedName()+"BelongsToInstance"}return a},applyAssociationKey:function(a){if(!a){var b=this.getAssociatedName();a=b[0].toLowerCase()+b.slice(1)}return a},applyGetterName:function(a){if(!a){a="get"+this.getAssociatedName()}return a},applySetterName:function(a){if(!a){a="set"+this.getAssociatedName()}return a},updateGetterName:function(b,c){var a=this.getOwnerModel().prototype;if(c){delete a[c]}if(b){a[b]=this.createGetter()}},updateSetterName:function(b,c){var a=this.getOwnerModel().prototype;if(c){delete a[c]}if(b){a[b]=this.createSetter()}},createSetter:function(){var b=this,a=b.getForeignKey();return function(e,c,d){if(e&&e.isModel){e=e.getId()}this.set(a,e);if(Ext.isFunction(c)){c={callback:c,scope:d||this}}if(Ext.isObject(c)){return this.save(c)}}},createGetter:function(){var c=this,d=c.getAssociatedModel(),b=c.getForeignKey(),a=c.getInstanceName();return function(h,i){h=h||{};var g=this,j=g.get(b),k,e,f;if(h.reload===true||g[a]===undefined){if(typeof h=="function"){h={callback:h,scope:i||g}}k=h.success;h.success=function(l){g[a]=l;if(k){k.call(this,arguments)}};d.load(j,h)}else{e=g[a];f=[e];i=i||g;Ext.callback(h,i,f);Ext.callback(h.success,i,f);Ext.callback(h.failure,i,f);Ext.callback(h.callback,i,f);return e}}},read:function(b,a,c){b[this.getInstanceName()]=a.read([c]).getRecords()[0]}});Ext.define("Ext.data.association.HasMany",{extend:"Ext.data.association.Association",alternateClassName:"Ext.data.HasManyAssociation",requires:["Ext.util.Inflector"],alias:"association.hasmany",config:{foreignKey:undefined,store:undefined,storeName:undefined,filterProperty:null,autoLoad:false},constructor:function(a){a=a||{};if(a.storeConfig){a.store=a.storeConfig;delete a.storeConfig}this.callParent([a])},applyName:function(a){if(!a){a=Ext.util.Inflector.pluralize(this.getAssociatedName().toLowerCase())}return a},applyStoreName:function(a){if(!a){a=this.getName()+"Store"}return a},applyForeignKey:function(a){if(!a){a=this.getOwnerName().toLowerCase()+"_id"}return a},applyAssociationKey:function(a){if(!a){var b=this.getAssociatedName();a=Ext.util.Inflector.pluralize(b[0].toLowerCase()+b.slice(1))}return a},updateForeignKey:function(b,d){var a=this.getAssociatedModel().getFields(),c=a.get(b);if(!c){c=new Ext.data.Field({name:b});a.add(c);a.isDirty=true}if(d){c=a.get(d);if(c){a.remove(c);a.isDirty=true}}},applyStore:function(a){var e=this,c=e,i=e.getAssociatedModel(),f=e.getStoreName(),d=e.getForeignKey(),h=e.getPrimaryKey(),g=e.getFilterProperty(),b=e.getAutoLoad();return function(){var m=this,k,l,j={};if(m[f]===undefined){if(g){l={property:g,value:m.get(g),exactMatch:true}}else{l={property:d,value:m.get(h),exactMatch:true}}j[d]=m.get(h);k=Ext.apply({},a,{model:i,filters:[l],remoteFilter:true,modelDefaults:j});m[f]=Ext.create("Ext.data.Store",k);if(b){m[f].load(function(o,n){c.updateInverseInstances(m)})}}return m[f]}},updateStore:function(a){this.getOwnerModel().prototype[this.getName()]=a},read:function(c,a,f){var e=c[this.getName()](),d=a.read(f).getRecords(),b;e.add(d);this.updateInverseInstances(c)},updateInverseInstances:function(a){var b=a[this.getName()]();inverse=this.getAssociatedModel().associations.findBy(function(c){return c.getType()==="belongsTo"&&c.getAssociatedModel().$className===a.$className});if(inverse){b.each(function(c){c[inverse.getInstanceName()]=a})}}});Ext.define("Ext.data.association.HasOne",{extend:"Ext.data.association.Association",alternateClassName:"Ext.data.HasOneAssociation",alias:"association.hasone",config:{foreignKey:undefined,getterName:undefined,setterName:undefined,instanceName:undefined},applyForeignKey:function(a){if(!a){a=this.getAssociatedName().toLowerCase()+"_id"}return a},updateForeignKey:function(b,d){var a=this.getAssociatedModel().getFields(),c=a.get(b);if(!c){c=new Ext.data.Field({name:b});a.add(c);a.isDirty=true}if(d){c=a.get(d);if(c){a.remove(c);a.isDirty=true}}},applyInstanceName:function(a){if(!a){a=this.getAssociatedName()+"BelongsToInstance"}return a},applyAssociationKey:function(a){if(!a){var b=this.getAssociatedName();a=b[0].toLowerCase()+b.slice(1)}return a},applyGetterName:function(a){if(!a){a="get"+this.getAssociatedName()}return a},applySetterName:function(a){if(!a){a="set"+this.getAssociatedName()}return a},updateGetterName:function(b,c){var a=this.getOwnerModel().prototype;if(c){delete a[c]}if(b){a[b]=this.createGetter()}},updateSetterName:function(b,c){var a=this.getOwnerModel().prototype;if(c){delete a[c]}if(b){a[b]=this.createSetter()}},createSetter:function(){var c=this,b=c.getForeignKey(),a=c.getInstanceName(),d=c.getAssociatedModel();return function(h,f,g){var i=Ext.data.Model,e;if(h&&h.isModel){h=h.getId()}this.set(b,h);e=i.cache.get(i.generateCacheId(d.modelName,h));if(e){this[a]=e}if(Ext.isFunction(f)){f={callback:f,scope:g||this}}if(Ext.isObject(f)){return this.save(f)}}},createGetter:function(){var c=this,d=c.getAssociatedModel(),b=c.getForeignKey(),a=c.getInstanceName();return function(h,i){h=h||{};var g=this,j=g.get(b),k,e,f;if(h.reload===true||g[a]===undefined){if(typeof h=="function"){h={callback:h,scope:i||g}}k=h.success;h.success=function(l){g[a]=l;if(k){k.call(this,arguments)}};d.load(j,h)}else{e=g[a];f=[e];i=i||g;Ext.callback(h,i,f);Ext.callback(h.success,i,f);Ext.callback(h.failure,i,f);Ext.callback(h.callback,i,f);return e}}},read:function(c,a,e){var b=this.getAssociatedModel().associations.findBy(function(f){return f.getType()==="belongsTo"&&f.getAssociatedName()===c.$className}),d=a.read([e]).getRecords()[0];c[this.getInstanceName()]=d;if(b){d[b.getInstanceName()]=c}}});Ext.define("Ext.util.LineSegment",{requires:["Ext.util.Point"],constructor:function(b,a){var c=Ext.util.Point;this.point1=c.from(b);this.point2=c.from(a)},intersects:function(l){var o=this.point1,m=this.point2,i=l.point1,f=l.point2,c=o.x,b=m.x,a=i.x,q=f.x,p=o.y,n=m.y,k=i.y,h=f.y,g=(c-b)*(k-h)-(p-n)*(a-q),j,e;if(g==0){return null}j=((a-q)*(c*n-p*b)-(c-b)*(a*h-k*q))/g;e=((k-h)*(c*n-p*b)-(p-n)*(a*h-k*q))/g;if(j<Math.min(c,b)||j>Math.max(c,b)||j<Math.min(a,q)||j>Math.max(a,q)||e<Math.min(p,n)||e>Math.max(p,n)||e<Math.min(k,h)||e>Math.max(k,h)){return null}return new Ext.util.Point(j,e)},toString:function(){return this.point1.toString()+" "+this.point2.toString()}});Ext.define("Ext.util.SizeMonitor",{extend:"Ext.Evented",config:{element:null,detectorCls:Ext.baseCSSPrefix+"size-change-detector",callback:Ext.emptyFn,scope:null,args:[]},constructor:function(d){this.initConfig(d);this.doFireSizeChangeEvent=Ext.Function.bind(this.doFireSizeChangeEvent,this);var g=this,e=this.getElement().dom,b=this.getDetectorCls(),c=Ext.Element.create({classList:[b,b+"-expand"],children:[{}]},true),h=Ext.Element.create({classList:[b,b+"-shrink"],children:[{}]},true),a=function(i){g.onDetectorScroll("expand",i)},f=function(i){g.onDetectorScroll("shrink",i)};e.appendChild(c);e.appendChild(h);c.addEventListener("scroll",a,true);h.addEventListener("scroll",f,true);this.detectors={expand:c,shrink:h};this.position={expand:{left:0,top:0},shrink:{left:0,top:0}};this.listeners={expand:a,shrink:f};this.refresh()},applyElement:function(a){if(a){return Ext.get(a)}},refreshPosition:function(b){var e=this.detectors[b],a=this.position[b],d,c;a.left=d=e.scrollWidth-e.offsetWidth;a.top=c=e.scrollHeight-e.offsetHeight;e.scrollLeft=d;e.scrollTop=c},refresh:function(){this.refreshPosition("expand");this.refreshPosition("shrink")},onDetectorScroll:function(b){var c=this.detectors[b],a=this.position[b];if(c.scrollLeft!==a.left||c.scrollTop!==a.top){this.refresh();this.fireSizeChangeEvent()}},fireSizeChangeEvent:function(){clearTimeout(this.sizeChangeThrottleTimer);this.sizeChangeThrottleTimer=setTimeout(this.doFireSizeChangeEvent,1)},doFireSizeChangeEvent:function(){this.getCallback().apply(this.getScope(),this.getArgs())},destroyDetector:function(a){var c=this.detectors[a],b=this.listeners[a];c.removeEventListener("scroll",b,true);Ext.removeNode(c)},destroy:function(){this.callParent(arguments);this.destroyDetector("expand");this.destroyDetector("shrink");delete this.listeners;delete this.detectors}});Ext.define("Ext.event.publisher.ComponentSize",{extend:"Ext.event.publisher.Publisher",requires:["Ext.ComponentManager","Ext.util.SizeMonitor"],targetType:"component",handledEvents:["resize"],constructor:function(){this.callParent(arguments);this.sizeMonitors={}},subscribe:function(g){var c=g.match(this.idSelectorRegex),f=this.subscribers,a=this.sizeMonitors,d=this.dispatcher,e=this.targetType,b;if(!c){return false}if(!f.hasOwnProperty(g)){f[g]=0;d.addListener(e,g,"painted","onComponentPainted",this,null,"before");b=Ext.ComponentManager.get(c[1]);a[g]=new Ext.util.SizeMonitor({element:b.element,callback:this.onComponentSizeChange,scope:this,args:[this,g]})}f[g]++;return true},unsubscribe:function(h,b,e){var c=h.match(this.idSelectorRegex),g=this.subscribers,d=this.dispatcher,f=this.targetType,a=this.sizeMonitors;if(!c){return false}if(!g.hasOwnProperty(h)||(!e&&--g[h]>0)){return true}a[h].destroy();delete a[h];d.removeListener(f,h,"painted","onComponentPainted",this,"before");delete g[h];return true},onComponentPainted:function(b){var c=b.getObservableId(),a=this.sizeMonitors[c];a.refresh()},onComponentSizeChange:function(a,b){this.dispatcher.doDispatchEvent(this.targetType,b,"resize",[a])}});Ext.define("Ext.util.Sortable",{isSortable:true,defaultSortDirection:"ASC",requires:["Ext.util.Sorter"],initSortable:function(){var a=this,b=a.sorters;a.sorters=Ext.create("Ext.util.AbstractMixedCollection",false,function(c){return c.id||c.property});if(b){a.sorters.addAll(a.decodeSorters(b))}},sort:function(g,f,c,e){var d=this,h,b,a;if(Ext.isArray(g)){e=c;c=f;a=g}else{if(Ext.isObject(g)){e=c;c=f;a=[g]}else{if(Ext.isString(g)){h=d.sorters.get(g);if(!h){h={property:g,direction:f};a=[h]}else{if(f===undefined){h.toggle()}else{h.setDirection(f)}}}}}if(a&&a.length){a=d.decodeSorters(a);if(Ext.isString(c)){if(c==="prepend"){g=d.sorters.clone().items;d.sorters.clear();d.sorters.addAll(a);d.sorters.addAll(g)}else{d.sorters.addAll(a)}}else{d.sorters.clear();d.sorters.addAll(a)}if(e!==false){d.onBeforeSort(a)}}if(e!==false){g=d.sorters.items;if(g.length){b=function(l,k){var j=g[0].sort(l,k),n=g.length,m;for(m=1;m<n;m++){j=j||g[m].sort.call(this,l,k)}return j};d.doSort(b)}}return g},onBeforeSort:Ext.emptyFn,decodeSorters:function(f){if(!Ext.isArray(f)){if(f===undefined){f=[]}else{f=[f]}}var d=f.length,g=Ext.util.Sorter,a=this.model?this.model.prototype.fields:null,e,b,c;for(c=0;c<d;c++){b=f[c];if(!(b instanceof g)){if(Ext.isString(b)){b={property:b}}Ext.applyIf(b,{root:this.sortRoot,direction:"ASC"});if(b.fn){b.sorterFn=b.fn}if(typeof b=="function"){b={sorterFn:b}}if(a&&!b.transform){e=a.get(b.property);b.transform=e?e.sortType:undefined}f[c]=Ext.create("Ext.util.Sorter",b)}}return f},getSorters:function(){return this.sorters.items}});Ext.define("Ext.util.MixedCollection",{extend:"Ext.util.AbstractMixedCollection",mixins:{sortable:"Ext.util.Sortable"},constructor:function(){var a=this;a.callParent(arguments);a.mixins.sortable.initSortable.call(a)},doSort:function(a){this.sortBy(a)},_sort:function(k,a,j){var h=this,d,e,b=String(a).toUpperCase()=="DESC"?-1:1,g=[],l=h.keys,f=h.items;j=j||function(i,c){return i-c};for(d=0,e=f.length;d<e;d++){g[g.length]={key:l[d],value:f[d],index:d}}Ext.Array.sort(g,function(i,c){var m=j(i[k],c[k])*b;if(m===0){m=(i.index<c.index?-1:1)}return m});for(d=0,e=g.length;d<e;d++){f[d]=g[d].value;l[d]=g[d].key}h.fireEvent("sort",h)},sortBy:function(c){var g=this,b=g.items,f=g.keys,e=b.length,a=[],d;for(d=0;d<e;d++){a[d]={key:f[d],value:b[d],index:d}}Ext.Array.sort(a,function(i,h){var j=c(i.value,h.value);if(j===0){j=(i.index<h.index?-1:1)}return j});for(d=0;d<e;d++){b[d]=a[d].value;f[d]=a[d].key}g.fireEvent("sort",g,b,f)},reorder:function(d){var g=this,b=g.items,c=0,f=b.length,a=[],e=[],h;g.suspendEvents();for(h in d){a[d[h]]=b[h]}for(c=0;c<f;c++){if(d[c]==undefined){e.push(b[c])}}for(c=0;c<f;c++){if(a[c]==undefined){a[c]=e.shift()}}g.clear();g.addAll(a);g.resumeEvents();g.fireEvent("sort",g)},sortByKey:function(a,b){this._sort("key",a,b||function(d,c){var f=String(d).toUpperCase(),e=String(c).toUpperCase();return f>e?1:(f<e?-1:0)})}});Ext.define("Ext.ItemCollection",{extend:"Ext.util.MixedCollection",getKey:function(a){return a.getItemId()},has:function(a){return this.map.hasOwnProperty(a.getId())}});Ext.define("Ext.data.Error",{extend:"Ext.util.MixedCollection",config:{field:null,message:""},constructor:function(a){this.initConfig(a)}});Ext.define("Ext.data.Errors",{extend:"Ext.util.Collection",requires:"Ext.data.Error",isValid:function(){return this.length===0},getByField:function(d){var c=[],a,b;for(b=0;b<this.length;b++){a=this.items[b];if(a.getField()==d){c.push(a)}}return c},add:function(){var a=arguments.length==1?arguments[0]:arguments[1];if(!(a instanceof Ext.data.Error)){a=Ext.create("Ext.data.Error",{field:a.field||a.name,message:a.error||a.message})}return this.callParent([a])}});Ext.define("Ext.data.proxy.Ajax",{extend:"Ext.data.proxy.Server",requires:["Ext.util.MixedCollection","Ext.Ajax"],alias:"proxy.ajax",alternateClassName:["Ext.data.HttpProxy","Ext.data.AjaxProxy"],config:{actionMethods:{create:"POST",read:"GET",update:"POST",destroy:"POST"},headers:{},withCredentials:false},doRequest:function(a,e,b){var d=this.getWriter(),c=this.buildRequest(a);c.setConfig({headers:this.getHeaders(),timeout:this.getTimeout(),method:this.getMethod(c),callback:this.createRequestCallback(c,a,e,b),scope:this});if(a.getWithCredentials()||this.getWithCredentials()){c.setWithCredentials(true)}c=d.write(c);Ext.Ajax.request(c.getCurrentConfig());return c},getMethod:function(a){return this.getActionMethods()[a.getAction()]},createRequestCallback:function(d,a,e,b){var c=this;return function(g,h,f){c.processResponse(h,a,d,f,e,b)}}});Ext.define("Ext.data.Model",{alternateClassName:"Ext.data.Record",mixins:{observable:"Ext.mixin.Observable"},isModel:true,requires:["Ext.util.Collection","Ext.data.Field","Ext.data.identifier.Simple","Ext.data.ModelManager","Ext.data.proxy.Ajax","Ext.data.association.HasMany","Ext.data.association.BelongsTo","Ext.data.association.HasOne","Ext.data.Errors"],config:{idProperty:"id",data:null,fields:undefined,validations:null,associations:null,hasMany:null,hasOne:null,belongsTo:null,proxy:null,identifier:{type:"simple"},clientIdProperty:"clientId",isErased:false},staticConfigs:["idProperty","fields","validations","associations","hasMany","hasOne","belongsTo","clientIdProperty","identifier","proxy"],statics:{EDIT:"edit",REJECT:"reject",COMMIT:"commit",generateProxyMethod:function(a){return function(){var b=this.prototype;return b[a].apply(b,arguments)}},generateCacheId:function(b,c){var a;if(b&&b.isModel){a=b.modelName;if(c===undefined){c=b.getId()}}else{a=b}return a.replace(/\./g,"-").toLowerCase()+"-"+c}},inheritableStatics:{load:function(a,b,h){var f=this.getProxy(),i=this.getIdProperty(),e=null,d={},g,c;h=h||(b&&b.scope)||this;if(Ext.isFunction(b)){b={callback:b,scope:h}}d[i]=a;b=Ext.apply({},b);b=Ext.applyIf(b,{action:"read",params:d,model:this});c=Ext.create("Ext.data.Operation",b);if(!f){Ext.Logger.error("You are trying to load a model that doesn't have a Proxy specified")}g=function(j){if(j.wasSuccessful()){e=j.getRecords()[0];Ext.callback(b.success,h,[e,j])}else{Ext.callback(b.failure,h,[e,j])}Ext.callback(b.callback,h,[e,j])};f.read(c,g,this)}},editing:false,dirty:false,phantom:false,constructor:function(e,g,b,f){var d=this,c=null,a=this.getIdProperty();d.modified={};d.raw=b||e||{};d.stores=[];e=e||f||{};if(g||g===0){e[a]=d.internalId=g}g=d.data[a];if(g||g===0){c=Ext.data.Model.cache.get(Ext.data.Model.generateCacheId(this,g));if(c){return c.mergeData(f||e||{})}}if(f){d.setConvertedData(e)}else{d.setData(e)}g=d.data[a];if(!g&&g!==0){d.data[a]=d.internalId=d.id=d.getIdentifier().generate(d);d.phantom=true;if(this.associations.length){this.handleInlineAssociationData(e)}}else{d.id=d.getIdentifier().generate(d)}Ext.data.Model.cache.add(d);if(this.init&&typeof this.init=="function"){this.init()}},mergeData:function(a){var g=this,d=g.getFields().items,e=d.length,b=g.data,c,h,k,j,f;for(c=0;c<e;c++){h=d[c];k=h.getName();f=h.getConvert();j=a[k];if(j!==undefined&&!g.isModified(k)){if(f){j=f.call(h,j,g)}b[k]=j}}return this},setData:function(a){var g=this.fields.items,h=g.length,f=Ext.isArray(a),d=this._data=this.data={},e,k,b,l,j,c;if(!a){return this}for(e=0;e<h;e++){k=g[e];b=k.getName();j=k.getConvert();if(f){l=a[e]}else{l=a[b];if(typeof l=="undefined"){l=k.getDefaultValue()}}if(j){l=j.call(k,l,this)}d[b]=l}c=this.getId();if(this.associations.length&&(c||c===0)){this.handleInlineAssociationData(a)}return this},handleInlineAssociationData:function(f){var e=this.associations.items,k=e.length,a=this.raw,g,d,c,h,j,b;for(g=0;g<k;g++){d=e[g];b=d.getAssociationKey();c=f[b];if(!c){c=a[b]}if(c){h=d.getReader();if(!h){j=d.getAssociatedModel().getProxy();if(j){h=j.getReader()}else{h=new Ext.data.JsonReader({model:d.getAssociatedModel()})}}d.read(this,h,c)}}},setId:function(b){var a=this.getId();this.set(this.getIdProperty(),b);this.internalId=b;Ext.data.Model.cache.replace(a,this)},getId:function(){return this.get(this.getIdProperty())},setConvertedData:function(a){this._data=this.data=a;return this},get:function(a){return this.data[a]},set:function(p,l){var j=this,b=j.fields.map,o=j.modified,a=!j.editing,c=j.associations.items,f=0,d=[],k,n,e,m,g,h;if(arguments.length==1){for(n in p){if(p.hasOwnProperty(n)){k=b[n];if(k&&k.hasCustomConvert()){d.push(n);continue}if(!f&&a){j.beginEdit()}++f;j.set(n,p[n])}}g=d.length;if(g){if(!f&&a){j.beginEdit()}f+=g;for(e=0;e<g;e++){k=d[e];j.set(k,p[k])}}if(a&&f){j.endEdit(false,d)}}else{k=b[p];h=k&&k.getConvert();if(h){l=h.call(k,l,j)}m=j.data[p];j.data[p]=l;if(k&&!j.isEqual(m,l)){if(o.hasOwnProperty(p)){if(j.isEqual(o[p],l)){delete o[p];j.dirty=false;for(n in o){if(o.hasOwnProperty(n)){j.dirty=true;break}}}}else{j.dirty=true;o[p]=m}}if(a){j.afterEdit([p],o)}}},isEqual:function(d,c){if(Ext.isDate(d)&&Ext.isDate(c)){return d.getTime()===c.getTime()}return d===c},beginEdit:function(){var a=this;if(!a.editing){a.editing=true;a.dirtySave=a.dirty;a.dataSave=Ext.apply({},a.data);a.modifiedSave=Ext.apply({},a.modified)}},cancelEdit:function(){var a=this;if(a.editing){a.editing=false;a.modified=a.modifiedSave;a.data=a.dataSave;a.dirty=a.dirtySave;delete a.modifiedSave;delete a.dataSave;delete a.dirtySave}},endEdit:function(a,c){var b=this;if(b.editing){b.editing=false;if(a!==true&&(b.changedWhileEditing())){b.afterEdit(c||Ext.Object.getKeys(this.modified),this.modified)}delete b.modifiedSave;delete b.dataSave;delete b.dirtySave}},changedWhileEditing:function(){var c=this,b=c.dataSave,d=c.data,a;for(a in d){if(d.hasOwnProperty(a)){if(!c.isEqual(d[a],b[a])){return true}}}return false},getChanges:function(){var a=this.modified,b={},c;for(c in a){if(a.hasOwnProperty(c)){b[c]=this.get(c)}}return b},isModified:function(a){return this.modified.hasOwnProperty(a)},save:function(b,d){var e=this,f=e.phantom?"create":"update",c=e.getProxy(),a,g;if(!c){Ext.Logger.error("You are trying to save a model instance that doesn't have a Proxy specified")}b=b||{};d=d||e;if(Ext.isFunction(b)){b={callback:b,scope:d}}Ext.applyIf(b,{records:[e],action:f,model:e.self});a=Ext.create("Ext.data.Operation",b);g=function(h){if(h.wasSuccessful()){Ext.callback(b.success,d,[e,h])}else{Ext.callback(b.failure,d,[e,h])}Ext.callback(b.callback,d,[e,h])};c[f](a,g,e);return e},erase:function(b,d){var e=this,c=this.getProxy(),a,f;if(!c){Ext.Logger.error("You are trying to erase a model instance that doesn't have a Proxy specified")}b=b||{};d=d||e;if(Ext.isFunction(b)){b={callback:b,scope:d}}Ext.applyIf(b,{records:[e],action:"destroy",model:this.self});a=Ext.create("Ext.data.Operation",b);f=function(g){if(g.wasSuccessful()){Ext.callback(b.success,d,[e,g])}else{Ext.callback(b.failure,d,[e,g])}Ext.callback(b.callback,d,[e,g])};c.destroy(a,f,e);return e},reject:function(a){var c=this,b=c.modified,d;for(d in b){if(b.hasOwnProperty(d)){if(typeof b[d]!="function"){c.data[d]=b[d]}}}c.dirty=false;c.editing=false;c.modified={};if(a!==true){c.afterReject()}},commit:function(a){var c=this,b=this.modified;c.phantom=c.dirty=c.editing=false;c.modified={};if(a!==true){c.afterCommit(b)}},afterEdit:function(b,a){this.notifyStores("afterEdit",b,a)},afterReject:function(){this.notifyStores("afterReject")},afterCommit:function(a){this.notifyStores("afterCommit",Ext.Object.getKeys(a||{}),a)},notifyStores:function(e){var c=Ext.Array.clone(arguments),a=this.stores,f=a.length,d,b;c[0]=this;for(d=0;d<f;++d){b=a[d];if(b!==undefined&&typeof b[e]=="function"){b[e].apply(b,c)}}},copy:function(c){var d=this,b=d.getIdProperty(),a=Ext.apply({},d.raw),e=Ext.apply({},d.data);delete a[b];delete e[b];return new d.self(null,c,a,e)},getData:function(a){var b=this.data;if(a===true){Ext.apply(b,this.getAssociatedData())}return b},getAssociatedData:function(){return this.prepareAssociatedData(this,[],null)},prepareAssociatedData:function(o,a,n){var h=o.associations.items,l=h.length,e={},f,s,g,q,r,d,c,m,k,p,b;for(m=0;m<l;m++){d=h[m];s=d.getName();p=d.getType();b=true;if(n){b=p==n}if(b&&p.toLowerCase()=="hasmany"){f=o[d.getStoreName()];e[s]=[];if(f&&f.getCount()>0){g=f.data.items;r=g.length;for(k=0;k<r;k++){q=g[k];c=q.id;if(Ext.Array.indexOf(a,c)==-1){a.push(c);e[s][k]=q.getData();Ext.apply(e[s][k],this.prepareAssociatedData(q,a,p))}}}}else{if(b&&(p.toLowerCase()=="belongsto"||p.toLowerCase()=="hasone")){q=o[d.getInstanceName()];if(q!==undefined){c=q.id;if(Ext.Array.indexOf(a,c)===-1){a.push(c);e[s]=q.getData();Ext.apply(e[s],this.prepareAssociatedData(q,a,p))}}}}}return e},join:function(a){Ext.Array.include(this.stores,a)},unjoin:function(a){Ext.Array.remove(this.stores,a)},setDirty:function(){var b=this,a;b.dirty=true;b.fields.each(function(c){if(c.getPersist()){a=c.getName();b.modified[a]=b.get(a)}})},validate:function(){var j=Ext.create("Ext.data.Errors"),c=this.getValidations().items,e=Ext.data.Validations,b,d,h,a,g,f;if(c){b=c.length;for(f=0;f<b;f++){d=c[f];h=d.field||d.name;g=d.type;a=e[g](d,this.get(h));if(!a){j.add(Ext.create("Ext.data.Error",{field:h,message:d.message||e.getMessage(g)}))}}}return j},isValid:function(){return this.validate().isValid()},toUrl:function(){var b=this.$className.split("."),a=b[b.length-1].toLowerCase();return a+"/"+this.getId()},destroy:function(){var a=this;a.notifyStores("afterErase",a);Ext.data.Model.cache.remove(a);a.data=a._data=a.raw=a.stores=a.modified=null;a.callParent(arguments)},applyProxy:function(b,a){return Ext.factory(b,Ext.data.Proxy,a,"proxy")},updateProxy:function(a){if(a){a.setModel(this.self)}},applyAssociations:function(a){if(a){this.addAssociations(a,"hasMany")}},applyBelongsTo:function(a){if(a){this.addAssociations(a,"belongsTo")}},applyHasMany:function(a){if(a){this.addAssociations(a,"hasMany")}},applyHasOne:function(a){if(a){this.addAssociations(a,"hasOne")}},addAssociations:function(e,h){var f,d,b,c=this.self.modelName,g=this.self.associations,a;e=Ext.Array.from(e);for(d=0,f=e.length;d<f;d++){b=e[d];if(!Ext.isObject(b)){b={model:b}}Ext.applyIf(b,{type:h,ownerModel:c,associatedModel:b.model});delete b.model;a=Ext.Function.bind(function(i){g.add(Ext.data.association.Association.create(this))},b);Ext.ClassManager.onCreated(a,this,(typeof b.associatedModel==="string")?b.associatedModel:Ext.getClassName(b.associatedModel))}},applyValidations:function(a){if(a){if(!Ext.isArray(a)){a=[a]}this.addValidations(a)}},addValidations:function(a){this.self.validations.addAll(a)},applyFields:function(a){var b=this.superclass.fields;if(b){a=b.items.concat(a||[])}return a||[]},updateFields:function(c){var d=c.length,e=this,h=e.self.prototype,j=this.getIdProperty(),a,f,g,b;f=e._fields=e.fields=new Ext.util.Collection(h.getFieldName);for(b=0;b<d;b++){g=c[b];if(!g.isField){g=new Ext.data.Field(c[b])}f.add(g)}a=f.get(j);if(!a){f.add(new Ext.data.Field(j))}else{a.setType("auto")}f.addSorter(h.sortConvertFields)},applyIdentifier:function(a){if(typeof a==="string"){a={type:a}}return Ext.factory(a,Ext.data.identifier.Simple,this.getIdentifier(),"data.identifier")},getFieldName:function(a){return a.getName()},sortConvertFields:function(a,d){var c=a.hasCustomConvert(),b=d.hasCustomConvert();if(c&&!b){return 1}if(!c&&b){return -1}return 0},onClassExtended:function(k,d,j){var f=j.onBeforeCreated,b=this,h=b.prototype,e=Ext.Class.configNameCache,g=h.staticConfigs.concat(d.staticConfigs||[]),c=h.config,a=d.config||{},i;d.config=a;j.onBeforeCreated=function(A,t){var v=[],x=A.prototype,w={},m=x.config,n=g.length,q=["set","get"],s=q.length,o=m.associations||[],l=Ext.getClassName(A),z,y,r,p,u;for(r=0;r<n;r++){z=g[r];for(p=0;p<s;p++){y=e[z][q[p]];if(y in x){w[y]=b.generateProxyMethod(y)}}}A.addStatics(w);A.modelName=l;x.modelName=l;if(m.belongsTo){v.push("association.belongsto")}if(m.hasMany){v.push("association.hasmany")}if(m.hasOne){v.push("association.hasone")}for(r=0,u=o.length;r<u;++r){v.push("association."+o[r].type.toLowerCase())}if(m.proxy){if(typeof m.proxy==="string"){v.push("proxy."+m.proxy)}else{if(typeof m.proxy.type==="string"){v.push("proxy."+m.proxy.type)}}}if(m.validations){v.push("Ext.data.Validations")}Ext.require(v,function(){Ext.Function.interceptBefore(j,"onCreated",function(){Ext.data.ModelManager.registerType(l,A);var B=A.prototype.superclass;A.prototype.associations=A.associations=A.prototype._associations=(B&&B.associations)?B.associations.clone():new Ext.util.Collection(function(C){return C.getName()});A.prototype.validations=A.validations=A.prototype._validations=(B&&B.validations)?B.validations.clone():new Ext.util.Collection(function(C){return C.field||C.name});A.prototype=Ext.Object.chain(A.prototype);A.prototype.initConfig.call(A.prototype,m);delete A.prototype.initConfig});f.call(b,A,t,j)})}}},function(){this.cache=new Ext.util.Collection(this.generateCacheId)});Ext.define("Ext.data.Store",{alias:"store.store",extend:"Ext.Evented",requires:["Ext.util.Collection","Ext.data.Operation","Ext.data.proxy.Memory","Ext.data.Model","Ext.data.StoreManager","Ext.util.Grouper"],statics:{create:function(a){if(!a.isStore){if(!a.type){a.type="store"}a=Ext.createByAlias("store."+a.type,a)}return a}},isStore:true,config:{storeId:undefined,data:null,autoLoad:null,autoSync:false,model:undefined,proxy:undefined,fields:null,remoteSort:false,remoteFilter:false,remoteGroup:false,filters:null,sorters:null,grouper:null,groupField:null,groupDir:null,getGroupString:null,pageSize:25,totalCount:null,clearOnPageLoad:true,modelDefaults:{},autoDestroy:false,syncRemovedRecords:true},currentPage:1,constructor:function(a){a=a||{};this.data=this._data=this.createDataCollection();this.data.setSortRoot("data");this.data.setFilterRoot("data");this.removed=[];if(a.id&&!a.storeId){a.storeId=a.id;delete a.id}this.initConfig(a)},createDataCollection:function(){return new Ext.util.Collection(function(a){return a.getId()})},applyStoreId:function(a){if(a===undefined||a===null){a=this.getUniqueId()}return a},updateStoreId:function(a,b){if(b){Ext.data.StoreManager.unregister(this)}if(a){Ext.data.StoreManager.register(this)}},applyModel:function(b){if(typeof b=="string"){var d=Ext.data.ModelManager.getModel(b);if(!d){Ext.Logger.error('Model with name "'+b+'" does not exist.')}b=d}if(b&&!b.prototype.isModel&&Ext.isObject(b)){b=Ext.data.ModelManager.registerType(b.storeId||b.id||Ext.id(),b)}if(!b){var a=this.getFields(),c=this.config.data;if(!a&&c&&c.length){a=Ext.Object.getKeys(c[0])}if(a){b=Ext.define("Ext.data.Store.ImplicitModel-"+(this.getStoreId()||Ext.id()),{extend:"Ext.data.Model",config:{fields:a,proxy:this.getProxy()}});this.implicitModel=true}}if(!b&&this.getProxy()){b=this.getProxy().getModel()}return b},updateModel:function(a){var b=this.getProxy();if(b&&!b.getModel()){b.setModel(a)}},applyProxy:function(b,a){b=Ext.factory(b,Ext.data.Proxy,a,"proxy");if(!b&&this.getModel()){b=this.getModel().getProxy();if(!b){b=new Ext.data.proxy.Memory({model:this.getModel()})}}return b},updateProxy:function(a){if(a){if(!a.getModel()){a.setModel(this.getModel())}a.on("metachange",this.onMetaChange,this)}},applyData:function(c){var b=this,a;if(c){a=b.getProxy();if(a instanceof Ext.data.proxy.Memory){a.setData(c);b.load()}else{b.removeAll(true);b.fireEvent("clear",b);b.suspendEvents();b.add(c);b.resumeEvents();b.dataLoaded=true}}else{b.removeAll(true);b.fireEvent("clear",b)}b.fireEvent("refresh",b,b.data)},clearData:function(){this.setData(null)},addData:function(d){var a=this.getProxy().getReader(),c=a.read(d),b=c.getRecords();this.add(b)},updateAutoLoad:function(a){var b=this.getProxy();if(a&&(b&&!b.isMemoryProxy)){this.load(Ext.isObject(a)?a:null)}},isAutoLoading:function(){var a=this.getProxy();return(this.getAutoLoad()||(a&&a.isMemoryProxy)||this.dataLoaded)},updateGroupField:function(a){var b=this.getGrouper();if(a){if(!b){this.setGrouper({property:a,direction:this.getGroupDir()||"ASC"})}else{b.setProperty(a)}}else{if(b){this.setGrouper(null)}}},updateGroupDir:function(a){var b=this.getGrouper();if(b){b.setDirection(a)}},applyGetGroupString:function(b){var a=this.getGrouper();if(b){if(a){a.setGroupFn(b)}else{this.setGrouper({groupFn:b})}}else{if(a){this.setGrouper(null)}}},applyGrouper:function(a){if(typeof a=="string"){a={property:a}}else{if(typeof a=="function"){a={groupFn:a}}}a=Ext.factory(a,Ext.util.Grouper,this.getGrouper());return a},updateGrouper:function(b,a){var c=this.data;if(a){c.removeSorter(a);if(!b){c.getSorters().removeSorter("isGrouper")}}if(b){c.insertSorter(0,b);if(!a){c.getSorters().addSorter({direction:"DESC",property:"isGrouper",transform:function(d){return(d===true)?1:-1}})}}},isGrouped:function(){return !!this.getGrouped()},updateSorters:function(d){var b=this.getGrouper(),c=this.data,a=c.getAutoSort();c.setAutoSort(false);c.setSorters(d);if(b){c.insertSorter(0,b)}this.updateSortTypes();c.setAutoSort(a)},updateSortTypes:function(){var b=this.getModel(),a=b&&b.getFields(),c=this.data;if(a){c.getSorters().each(function(f){var d=f.getProperty(),e;if(!f.isGrouper&&d&&!f.getTransform()){e=a.get(d);if(e){f.setTransform(e.getSortType())}}})}},updateFilters:function(a){this.data.setFilters(a)},add:function(a){if(!Ext.isArray(a)){a=Array.prototype.slice.apply(arguments)}return this.insert(this.data.length,a)},insert:function(e,b){if(!Ext.isArray(b)){b=Array.prototype.slice.call(arguments,1)}var h=this,k=false,f=b.length,a=this.getModel(),g=h.getModelDefaults(),c,d,j=false;b=b.slice();for(c=0;c<f;c++){d=b[c];if(!d.isModel){d=new a(d)}else{if(this.removed.indexOf(d)!=-1){Ext.Array.remove(this.removed,d)}}d.set(g);b[c]=d;d.join(h);k=k||(d.phantom===true)}if(f===1){j=this.data.insert(e,b[0]);if(j){j=[j]}}else{j=this.data.insertAll(e,b)}if(j){h.fireEvent("addrecords",h,j)}if(h.getAutoSync()&&k){h.sync()}return b},remove:function(b){if(b.isModel){b=[b]}var l=this,m=false,d=0,a=this.getAutoSync(),k=b.length,o=[],g=[],n,h=l.data.items,e,f,c;for(;d<k;d++){e=b[d];if(l.data.contains(e)){n=(e.phantom===true);f=h.indexOf(e);if(f!==-1){g.push(e);o.push(f)}if(!n&&l.getSyncRemovedRecords()){l.removed.push(e)}e.unjoin(l);l.data.remove(e);m=m||!n}}l.fireEvent("removerecords",l,g,o);if(a&&m){l.sync()}},removeAt:function(b){var a=this.getAt(b);if(a){this.remove(a)}},removeAll:function(a){if(a!==true){this.fireAction("clear",[this],"doRemoveAll")}else{this.doRemoveAll.call(this,true)}},doRemoveAll:function(a){var b=this;b.data.each(function(c){c.unjoin(b)});if(b.getSyncRemovedRecords()){b.removed=b.removed.concat(b.data.items)}b.data.clear();if(a!==true){b.fireEvent("refresh",b,b.data)}if(b.getAutoSync()){this.sync()}},each:function(b,a){this.data.each(b,a)},getCount:function(){return this.data.length||0},getAt:function(a){return this.data.getAt(a)},getRange:function(b,a){return this.data.getRange(b,a)},getById:function(a){return this.data.findBy(function(b){return b.getId()==a})},indexOf:function(a){return this.data.indexOf(a)},indexOfId:function(a){return this.data.indexOfKey(a)},afterEdit:function(c,g,d){var f=this,h=f.data,a=d[c.getIdProperty()]||c.getId(),b=h.keys.indexOf(a),e;if(b===-1&&h.map[a]===undefined){return}if(f.getAutoSync()){f.sync()}if(a!==c.getId()){h.replace(a,c)}else{h.replace(c)}e=h.indexOf(c);if(b===-1&&e!==-1){f.fireEvent("addrecords",f,[c])}else{if(b!==-1&&e===-1){f.fireEvent("removerecords",f,[c],[b])}else{if(e!==-1){f.fireEvent("updaterecord",f,c,e,b,g,d)}}}},afterReject:function(a){var b=this.data.indexOf(a);this.fireEvent("updaterecord",this,a,b,b,[],{})},afterCommit:function(c,g,d){var f=this,h=f.data,a=d[c.getIdProperty()]||c.getId(),b=h.keys.indexOf(a),e;if(b===-1&&h.map[a]===undefined){return}if(a!==c.getId()){h.replace(a,c)}else{h.replace(c)}e=h.indexOf(c);if(b===-1&&e!==-1){f.fireEvent("addrecords",f,[c])}else{if(b!==-1&&e===-1){f.fireEvent("removerecords",f,[c],[b])}else{if(e!==-1){f.fireEvent("updaterecord",f,c,e,b,g,d)}}}},afterErase:function(a){var c=this,d=c.data,b=d.indexOf(a);if(b!==-1){d.remove(a);c.fireEvent("removerecords",c,[a],[b])}},updateRemoteFilter:function(a){this.data.setAutoFilter(!a)},updateRemoteSort:function(a){this.data.setAutoSort(!a)},sort:function(f,d,c){var e=this.data,b=this.getGrouper(),a=e.getAutoSort();if(f){e.setAutoSort(false);if(typeof c==="string"){if(c=="prepend"){e.insertSorters(b?1:0,f,d)}else{e.addSorters(f,d)}}else{e.setSorters(null);if(b){e.addSorters(b)}e.addSorters(f,d)}this.updateSortTypes();e.setAutoSort(a)}if(!this.getRemoteSort()){if(!f){this.data.sort()}this.fireEvent("sort",this,this.data,this.data.getSorters());if(e.length){this.fireEvent("refresh",this,this.data)}}},filter:function(e,d,f,a){var c=this.data,b=c.length;if(this.getRemoteFilter()){if(e){if(Ext.isString(e)){c.addFilters({property:e,value:d,anyMatch:f,caseSensitive:a})}else{if(Ext.isArray(e)||e.isFilter){c.addFilters(e)}}}}else{c.filter(e,d);this.fireEvent("filter",this,c,c.getFilters());if(c.length!==b){this.fireEvent("refresh",this,c)}}},filterBy:function(b,a){var d=this,e=d.data,c=e.length;e.filter({filterFn:b,scope:a});this.fireEvent("filter",this,e,e.getFilters());if(e.length!==c){this.fireEvent("refresh",this,e)}},queryBy:function(b,a){return this.data.filterBy(b,a||this)},clearFilter:function(a){var b=this.data.length;if(a){this.suspendEvents()}this.data.setFilters(null);if(a){this.resumeEvents()}else{if(b!==this.data.length){this.fireEvent("refresh",this,this.data)}}},isFiltered:function(){return this.data.filtered},getSorters:function(){var a=this.data.getSorters();return(a)?a.items:[]},getFilters:function(){var a=this.data.getFilters();return(a)?a.items:[]},getGroups:function(c){var e=this.data.items,b=e.length,a=this.getGrouper(),d=[],k={},g,h,j,f;for(f=0;f<b;f++){g=e[f];h=a.getGroupString(g);j=k[h];if(j===undefined){j={name:h,children:[]};d.push(j);k[h]=j}j.children.push(g)}return c?k[c]:d},getGroupString:function(a){var b=this.getGrouper();if(b){return b.getGroupString(a)}return null},find:function(g,d,e,f,a,c){var b=Ext.create("Ext.util.Filter",{property:g,value:d,anyMatch:f,caseSensitive:a,exactMatch:c,root:"data"});return this.data.findIndexBy(b.getFilterFn(),null,e)},findRecord:function(){var b=this,a=b.find.apply(b,arguments);return a!==-1?b.getAt(a):null},findExact:function(c,a,b){return this.data.findIndexBy(function(d){return d.get(c)===a},this,b)},findBy:function(b,a,c){return this.data.findIndexBy(b,a,c)},load:function(c,e){var f=this,b,d=f.currentPage,a=f.getPageSize();c=c||{};if(Ext.isFunction(c)){c={callback:c,scope:e||this}}if(f.getRemoteSort()){c.sorters=c.sorters||this.getSorters()}if(f.getRemoteFilter()){c.filters=c.filters||this.getFilters()}if(f.getRemoteGroup()){c.grouper=c.grouper||this.getGrouper()}Ext.applyIf(c,{page:d,start:(d-1)*a,limit:a,addRecords:false,action:"read",model:this.getModel()});b=Ext.create("Ext.data.Operation",c);if(f.fireEvent("beforeload",f,b)!==false){f.loading=true;f.getProxy().read(b,f.onProxyLoad,f)}return f},isLoading:function(){return Boolean(this.loading)},isLoaded:function(){return Boolean(this.loaded)},sync:function(){var d=this,b={},e=d.getNewRecords(),c=d.getUpdatedRecords(),a=d.getRemovedRecords(),f=false;if(e.length>0){b.create=e;f=true}if(c.length>0){b.update=c;f=true}if(a.length>0){b.destroy=a;f=true}if(f&&d.fireEvent("beforesync",this,b)!==false){d.getProxy().batch({operations:b,listeners:d.getBatchListeners()})}return{added:e,updated:c,removed:a}},first:function(){return this.data.first()},last:function(){return this.data.last()},sum:function(e){var d=0,c=0,b=this.data.items,a=b.length;for(;c<a;++c){d+=b[c].get(e)}return d},min:function(f){var d=1,b=this.data.items,a=b.length,e,c;if(a>0){c=b[0].get(f)}for(;d<a;++d){e=b[d].get(f);if(e<c){c=e}}return c},max:function(f){var d=1,c=this.data.items,b=c.length,e,a;if(b>0){a=c[0].get(f)}for(;d<b;++d){e=c[d].get(f);if(e>a){a=e}}return a},average:function(e){var c=0,b=this.data.items,a=b.length,d=0;if(b.length>0){for(;c<a;++c){d+=b[c].get(e)}return d/a}return 0},getBatchListeners:function(){return{scope:this,exception:this.onBatchException,complete:this.onBatchComplete}},onBatchComplete:function(b){var e=this,a=b.operations,d=a.length,c;for(c=0;c<d;c++){e.onProxyWrite(a[c])}},onBatchException:function(b,a){},onProxyLoad:function(b){var d=this,a=b.getRecords(),c=b.getResultSet(),e=b.wasSuccessful();if(c){d.setTotalCount(c.getTotal())}if(e){if(b.getAddRecords()!==true){d.data.each(function(f){f.unjoin(d)});d.data.clear();d.fireEvent("clear",this)}if(a&&a.length){d.suspendEvents();d.add(a);d.resumeEvents()}d.fireEvent("refresh",this,this.data)}d.loaded=true;d.loading=false;d.fireEvent("load",this,a,e);Ext.callback(b.getCallback(),b.getScope()||d,[a,b,e])},onProxyWrite:function(b){var c=this,d=b.wasSuccessful(),a=b.getRecords();switch(b.getAction()){case"create":c.onCreateRecords(a,b,d);break;case"update":c.onUpdateRecords(a,b,d);break;case"destroy":c.onDestroyRecords(a,b,d);break}if(d){c.fireEvent("write",c,b)}Ext.callback(b.getCallback(),b.getScope()||c,[a,b,d])},onCreateRecords:function(b,a,c){},onUpdateRecords:function(b,a,c){},onDestroyRecords:function(b,a,c){this.removed=[]},onMetaChange:function(b){var a=this.getProxy().getModel();if(!this.getModel()&&a){this.setModel(a)}this.fireEvent("metachange",this,b)},getNewRecords:function(){return this.data.filterBy(function(a){return a.phantom===true&&a.isValid()}).items},getUpdatedRecords:function(){return this.data.filterBy(function(a){return a.dirty===true&&a.phantom!==true&&a.isValid()}).items},getRemovedRecords:function(){return this.removed},loadPage:function(f,c,d){if(typeof c==="function"){c={callback:c,scope:d||this}}var e=this,b=e.getPageSize(),a=e.getClearOnPageLoad();c=Ext.apply({},c);e.currentPage=f;e.load(Ext.applyIf(c,{page:f,start:(f-1)*b,limit:b,addRecords:!a}))},nextPage:function(a){this.loadPage(this.currentPage+1,a)},previousPage:function(a){this.loadPage(this.currentPage-1,a)}});Ext.define("Ext.data.ArrayStore",{extend:"Ext.data.Store",alias:"store.array",uses:["Ext.data.reader.Array"],config:{proxy:{type:"memory",reader:"array"}},loadData:function(b,a){this.callParent([b,a])}},function(){Ext.data.SimpleStore=Ext.data.ArrayStore});Ext.define("Ext.data.DirectStore",{extend:"Ext.data.Store",alias:"store.direct",requires:["Ext.data.proxy.Direct"],config:{proxy:{type:"direct",reader:{type:"json"}}}});Ext.define("Ext.data.JsonStore",{extend:"Ext.data.Store",alias:"store.json",config:{proxy:{type:"ajax",reader:"json",writer:"json"}}});Ext.define("Ext.data.NodeStore",{extend:"Ext.data.Store",alias:"store.node",requires:["Ext.data.NodeInterface"],config:{node:null,recursive:false,rootVisible:false,sorters:undefined,filters:undefined,folderSort:false},afterEdit:function(a,b){if(b){if(b.indexOf("loaded")!==-1){return this.add(this.retrieveChildNodes(a))}if(b.indexOf("expanded")!==-1){return this.filter()}if(b.indexOf("sorted")!==-1){return this.sort()}}this.callParent(arguments)},onNodeAppend:function(a,b){this.add([b].concat(this.retrieveChildNodes(b)))},onNodeInsert:function(a,b){this.add([b].concat(this.retrieveChildNodes(b)))},onNodeRemove:function(a,b){this.remove([b].concat(this.retrieveChildNodes(b)))},onNodeSort:function(){this.sort()},updateFolderSort:function(a){if(a){this.setGrouper(function(b){if(b.isLeaf()){return 1}return 0})}else{this.setGrouper(null)}},createDataCollection:function(){var a=this.callParent();a.handleSort=Ext.Function.bind(this.handleTreeSort,this,[a],true);a.findInsertionIndex=Ext.Function.bind(this.handleTreeInsertionIndex,this,[a,a.findInsertionIndex],true);return a},handleTreeInsertionIndex:function(a,b,d,c){return c.call(d,a,b,this.treeSortFn)},handleTreeSort:function(a){Ext.Array.sort(a,this.treeSortFn);return a},treeSortFn:function(c,a){if(c.parentNode===a.parentNode){return(c.data.index<a.data.index)?-1:1}var f=0,e=0,d=c,b=a;while(d){f+=(Math.pow(10,(d.data.depth+1)*-4)*(d.data.index+1));d=d.parentNode}while(b){e+=(Math.pow(10,(b.data.depth+1)*-4)*(b.data.index+1));b=b.parentNode}if(f>e){return 1}else{if(f<e){return -1}}return(c.data.index>a.data.index)?1:-1},applyFilters:function(b){var a=this;return function(c){return a.isVisible(c)}},applyProxy:function(a){},applyNode:function(a){if(a){a=Ext.data.NodeInterface.decorate(a)}return a},updateNode:function(a,c){if(c){c.un({append:"onNodeAppend",insert:"onNodeInsert",remove:"onNodeRemove",load:"onNodeLoad",scope:this});c.unjoin(this)}if(a){a.on({scope:this,append:"onNodeAppend",insert:"onNodeInsert",remove:"onNodeRemove",load:"onNodeLoad"});a.join(this);var b=[];if(a.childNodes.length){b=b.concat(this.retrieveChildNodes(a))}if(this.getRootVisible()){b.push(a)}else{if(a.isLoaded()||a.isLoading()){a.set("expanded",true)}}this.data.clear();this.fireEvent("clear",this);this.suspendEvents();this.add(b);this.resumeEvents();this.fireEvent("refresh",this,this.data)}},retrieveChildNodes:function(a){var d=this.getNode(),b=this.getRecursive(),c=[],e=a;if(!a.childNodes.length||(!b&&a!==d)){return c}if(!b){return a.childNodes}while(e){if(e._added){delete e._added;if(e===a){break}else{e=e.nextSibling||e.parentNode}}else{if(e!==a){c.push(e)}if(e.firstChild){e._added=true;e=e.firstChild}else{e=e.nextSibling||e.parentNode}}}return c},isVisible:function(b){var a=b.parentNode;while(a){if(!a.isExpanded()){return false}if(a===this.getNode()){break}a=a.parentNode}return true}});Ext.define("Ext.data.TreeStore",{extend:"Ext.data.NodeStore",alias:"store.tree",config:{root:undefined,clearOnLoad:true,nodeParam:"node",defaultRootId:"root",defaultRootProperty:"children",recursive:true},applyProxy:function(){return Ext.data.Store.prototype.applyProxy.apply(this,arguments)},applyRoot:function(a){var b=this;a=a||{};a=Ext.apply({},a);if(!a.isModel){Ext.applyIf(a,{id:b.getDefaultRootId(),text:"Root",allowDrag:false});a=Ext.data.ModelManager.create(a,b.getModel())}Ext.data.NodeInterface.decorate(a);a.set(a.raw);return a},handleTreeInsertionIndex:function(a,b,d,c){if(b.parentNode){b.parentNode.sort(d.getSortFn(),true,true)}return this.callParent(arguments)},handleTreeSort:function(a,b){if(this._sorting){return a}this._sorting=true;this.getNode().sort(b.getSortFn(),true,true);delete this._sorting;return this.callParent(arguments)},updateRoot:function(a,b){if(b){b.unBefore({expand:"onNodeBeforeExpand",scope:this});b.unjoin(this)}a.onBefore({expand:"onNodeBeforeExpand",scope:this});this.onNodeAppend(null,a);this.setNode(a);if(!a.isLoaded()&&!a.isLoading()&&a.isExpanded()){this.load({node:a})}this.fireEvent("rootchange",this,a,b)},getNodeById:function(a){return this.data.getByKey(a)},onNodeBeforeExpand:function(b,a,c){if(b.isLoading()){c.pause();this.on("load",function(){c.resume()},this,{single:true})}else{if(!b.isLoaded()){c.pause();this.load({node:b,callback:function(){c.resume()}})}}},onNodeAppend:function(l,b){var j=this.getProxy(),g=j.getReader(),e=b.raw,c=[],a=g.getRootProperty(),k,f,d,h;if(!b.isLeaf()){k=g.getRoot(e);if(k){f=g.extractData(k);for(d=0,h=f.length;d<h;d++){if(f[d].node[a]){f[d].data[a]=f[d].node[a]}c.push(f[d].data)}if(c.length){this.fillNode(b,c)}delete e[a]}}},updateAutoLoad:function(b){if(b){var a=this.getRoot();if(!a.isLoaded()&&!a.isLoading()){this.load({node:a})}}},load:function(a){a=a||{};a.params=a.params||{};var c=this,b=a.node=a.node||c.getRoot();a.params[c.getNodeParam()]=b.getId();if(c.getClearOnLoad()){b.removeAll(true)}b.set("loading",true);return c.callParent([a])},updateProxy:function(b){this.callParent(arguments);var a=b.getReader();if(!a.getRootProperty()){a.setRootProperty(this.getDefaultRootProperty());a.buildExtractors()}},removeAll:function(){this.getRootNode().removeAll(true);this.callParent(arguments)},onProxyLoad:function(b){var d=this,a=b.getRecords(),e=b.wasSuccessful(),c=b.getNode();c.beginEdit();c.set("loading",false);if(e){a=d.fillNode(c,a)}c.endEdit();c.fireEvent("load",c,a,e);d.loading=false;d.fireEvent("load",this,a,e);Ext.callback(b.getCallback(),b.getScope()||d,[a,b,e])},fillNode:function(d,a){var c=a?a.length:0,b,e;for(b=0;b<c;b++){e=d.appendChild(a[b],true,true);this.onNodeAppend(d,e)}d.set("loaded",true);return a}});Ext.define("Ext.data.proxy.Rest",{extend:"Ext.data.proxy.Ajax",alternateClassName:"Ext.data.RestProxy",alias:"proxy.rest",config:{appendId:true,format:null,batchActions:false,actionMethods:{create:"POST",read:"GET",update:"PUT",destroy:"DELETE"}},buildUrl:function(f){var i=this,e=f.getOperation(),c=e.getRecords()||[],h=c[0],g=i.getModel(),k=g.getIdProperty(),j=i.getFormat(),a=i.getUrl(f),d=f.getParams()||{},b=(h&&!h.phantom)?h.getId():d[k];if(i.getAppendId()&&b){if(!a.match(/\/$/)){a+="/"}a+=b;delete d[k]}if(j){if(!a.match(/\.$/)){a+="."}a+=j}f.setUrl(a);return i.callParent([f])}});Ext.define("Ext.direct.RemotingProvider",{alias:"direct.remotingprovider",extend:"Ext.direct.JsonProvider",requires:["Ext.util.MixedCollection","Ext.util.DelayedTask","Ext.direct.Transaction","Ext.direct.RemotingMethod"],config:{namespace:undefined,url:null,enableUrlEncode:null,enableBuffer:10,maxRetries:1,timeout:undefined,actions:{}},constructor:function(a){var b=this;b.callParent(arguments);b.transactions=Ext.create("Ext.util.Collection",function(c){return c.getId()});b.callBuffer=[]},applyNamespace:function(a){if(Ext.isString(a)){return Ext.ns(a)}return a||window},initAPI:function(){var g=this.getActions(),d=this.getNamespace(),f,a,b,c,e,h;for(f in g){if(g.hasOwnProperty(f)){a=d[f];if(!a){a=d[f]={}}b=g[f];for(c=0,e=b.length;c<e;++c){h=Ext.create("Ext.direct.RemotingMethod",b[c]);a[h.getName()]=this.createHandler(f,h)}}}},createHandler:function(c,d){var b=this,a;if(!d.getFormHandler()){a=function(){b.configureRequest(c,d,Array.prototype.slice.call(arguments,0))}}else{a=function(f,g,e){b.configureFormRequest(c,d,f,g,e)}}a.directCfg={action:c,method:d};return a},isConnected:function(){return !!this.connected},connect:function(){var a=this;if(a.getUrl()){a.initAPI();a.connected=true;a.fireEvent("connect",a)}else{}},disconnect:function(){var a=this;if(a.connected){a.connected=false;a.fireEvent("disconnect",a)}},runCallback:function(e,b){var d=!!b.getStatus(),c=d?"success":"failure",f=e&&e.getCallback(),a;if(f){a=b.getResult();if(Ext.isFunction(f)){f(a,b,d)}else{Ext.callback(f[c],f.scope,[a,b,d]);Ext.callback(f.callback,f.scope,[a,b,d])}}},onData:function(k,h,c){var f=this,d=0,e,j,a,b,g;if(h){j=f.createEvents(c);for(e=j.length;d<e;++d){a=j[d];b=f.getTransaction(a);f.fireEvent("data",f,a);if(b){f.runCallback(b,a,true);Ext.direct.Manager.removeTransaction(b)}}}else{g=[].concat(k.transaction);for(e=g.length;d<e;++d){b=f.getTransaction(g[d]);if(b&&b.getRetryCount()<f.getMaxRetries()){b.retry()}else{a=Ext.create("Ext.direct.ExceptionEvent",{data:null,transaction:b,code:Ext.direct.Manager.exceptions.TRANSPORT,message:"Unable to connect to the server.",xhr:c});f.fireEvent("data",f,a);if(b){f.runCallback(b,a,false);Ext.direct.Manager.removeTransaction(b)}}}}},getTransaction:function(a){return a&&a.getTid()?Ext.direct.Manager.getTransaction(a.getTid()):null},configureRequest:function(d,a,f){var g=this,c=a.getCallData(f),e=c.data,h=c.callback,i=c.scope,b;b=Ext.create("Ext.direct.Transaction",{provider:g,args:f,action:d,method:a.getName(),data:e,callback:i&&Ext.isFunction(h)?Ext.Function.bind(h,i):h});if(g.fireEvent("beforecall",g,b,a)!==false){Ext.direct.Manager.addTransaction(b);g.queueTransaction(b);g.fireEvent("call",g,b,a)}},getCallData:function(a){return{action:a.getAction(),method:a.getMethod(),data:a.getData(),type:"rpc",tid:a.getId()}},sendRequest:function(g){var f=this,e={url:f.getUrl(),callback:f.onData,scope:f,transaction:g,timeout:f.getTimeout()},a,c=f.getEnableUrlEncode(),b=0,d,h;if(Ext.isArray(g)){a=[];for(d=g.length;b<d;++b){a.push(f.getCallData(g[b]))}}else{a=f.getCallData(g)}if(c){h={};h[Ext.isString(c)?c:"data"]=Ext.encode(a);e.params=h}else{e.jsonData=a}Ext.Ajax.request(e)},queueTransaction:function(c){var b=this,a=b.getEnableBuffer();if(c.getForm()){b.sendFormRequest(c);return}b.callBuffer.push(c);if(a){if(!b.callTask){b.callTask=Ext.create("Ext.util.DelayedTask",b.combineAndSend,b)}b.callTask.delay(Ext.isNumber(a)?a:10)}else{b.combineAndSend()}},combineAndSend:function(){var a=this.callBuffer,b=a.length;if(b>0){this.sendRequest(b==1?a[0]:a);this.callBuffer=[]}}});Ext.define("Ext.util.TapRepeater",{requires:["Ext.DateExtras"],mixins:{observable:"Ext.mixin.Observable"},config:{el:null,accelerate:true,interval:10,delay:250,preventDefault:true,stopDefault:false,timer:0,pressCls:null},constructor:function(a){var b=this;b.initConfig(a)},updateEl:function(c,b){var a={touchstart:"onTouchStart",touchend:"onTouchEnd",tap:"eventOptions",scope:this};if(b){b.un(a)}c.on(a)},eventOptions:function(a){if(this.getPreventDefault()){a.preventDefault()}if(this.getStopDefault()){a.stopEvent()}},destroy:function(){this.clearListeners();Ext.destroy(this.el)},onTouchStart:function(c){var b=this,a=b.getPressCls();clearTimeout(b.getTimer());if(a){b.getEl().addCls(a)}b.tapStartTime=new Date();b.fireEvent("touchstart",b,c);b.fireEvent("tap",b,c);if(b.getAccelerate()){b.delay=400}b.setTimer(Ext.defer(b.tap,b.getDelay()||b.getInterval(),b,[c]))},tap:function(b){var a=this;a.fireEvent("tap",a,b);a.setTimer(Ext.defer(a.tap,a.getAccelerate()?a.easeOutExpo(Ext.Date.getElapsed(a.tapStartTime),400,-390,12000):a.getInterval(),a,[b]))},easeOutExpo:function(e,a,g,f){return(e==f)?a+g:g*(-Math.pow(2,-10*e/f)+1)+a},onTouchEnd:function(b){var a=this;clearTimeout(a.getTimer());a.getEl().removeCls(a.getPressCls());a.fireEvent("touchend",a,b)}});Ext.define("Ext.util.translatable.Abstract",{extend:"Ext.Evented",requires:["Ext.fx.easing.Linear"],config:{element:null,easing:null,easingX:null,easingY:null,fps:60},constructor:function(a){var b;this.doAnimationFrame=Ext.Function.bind(this.doAnimationFrame,this);this.x=0;this.y=0;this.activeEasingX=null;this.activeEasingY=null;this.initialConfig=a;if(a&&a.element){b=a.element;this.setElement(b)}},applyElement:function(a){if(!a){return}return Ext.get(a)},updateElement:function(a){this.initConfig(this.initialConfig);this.refresh()},factoryEasing:function(a){return Ext.factory(a,Ext.fx.easing.Linear,null,"easing")},applyEasing:function(a){if(!this.getEasingX()){this.setEasingX(this.factoryEasing(a))}if(!this.getEasingY()){this.setEasingY(this.factoryEasing(a))}},applyEasingX:function(a){return this.factoryEasing(a)},applyEasingY:function(a){return this.factoryEasing(a)},updateFps:function(a){this.animationInterval=1000/a},doTranslate:function(a,b){if(typeof a=="number"){this.x=a}if(typeof b=="number"){this.y=b}return this},translate:function(a,c,b){if(Ext.isObject(a)){throw new Error()}this.stopAnimation();if(b!==undefined){return this.translateAnimated(a,c,b)}return this.doTranslate(a,c)},animate:function(b,a){this.activeEasingX=b;this.activeEasingY=a;this.isAnimating=true;this.animationTimer=setInterval(this.doAnimationFrame,this.animationInterval);this.fireEvent("animationstart",this,this.x,this.y);return this},translateAnimated:function(b,g,e){if(Ext.isObject(b)){throw new Error()}if(!Ext.isObject(e)){e={}}var d=Ext.Date.now(),f=e.easing,c=(typeof b=="number")?(e.easingX||this.getEasingX()||f||true):null,a=(typeof g=="number")?(e.easingY||this.getEasingY()||f||true):null;if(c){c=this.factoryEasing(c);c.setStartTime(d);c.setStartValue(this.x);c.setEndValue(b);if("duration" in e){c.setDuration(e.duration)}}if(a){a=this.factoryEasing(a);a.setStartTime(d);a.setStartValue(this.y);a.setEndValue(g);if("duration" in e){a.setDuration(e.duration)}}return this.animate(c,a)},doAnimationFrame:function(){if(!this.isAnimating){return}var c=this.activeEasingX,b=this.activeEasingY,a,d;if(c===null&&b===null){this.stopAnimation();return}if(c!==null){this.x=a=Math.round(c.getValue());if(c.isEnded){this.activeEasingX=null;this.fireEvent("axisanimationend",this,"x",a)}}else{a=this.x}if(b!==null){this.y=d=Math.round(b.getValue());if(b.isEnded){this.activeEasingY=null;this.fireEvent("axisanimationend",this,"y",d)}}else{d=this.y}this.doTranslate(a,d);this.fireEvent("animationframe",this,a,d)},stopAnimation:function(){if(!this.isAnimating){return}this.activeEasingX=null;this.activeEasingY=null;this.isAnimating=false;clearInterval(this.animationTimer);this.fireEvent("animationend",this,this.x,this.y)},refresh:function(){this.translate(this.x,this.y)}});Ext.define("Ext.util.translatable.CssTransform",{extend:"Ext.util.translatable.Abstract",doTranslate:function(a,c){var b=this.getElement().dom.style;if(typeof a!="number"){a=this.x}if(typeof c!="number"){c=this.y}b.webkitTransform="translate3d("+a+"px, "+c+"px, 0px)";return this.callParent(arguments)},destroy:function(){var a=this.getElement();if(a&&!a.isDestroyed){a.dom.style.webkitTransform=null}this.callParent(arguments)}});Ext.define("Ext.util.translatable.ScrollPosition",{extend:"Ext.util.translatable.Abstract",wrapperWidth:0,wrapperHeight:0,baseCls:"x-translatable",config:{useWrapper:true},getWrapper:function(){var e=this.wrapper,c=this.baseCls,b=this.getElement(),d,a;if(!e){a=b.getParent();if(!a){return null}if(this.getUseWrapper()){e=b.wrap({className:c+"-wrapper"},true)}else{e=a.dom}e.appendChild(Ext.Element.create({className:c+"-stretcher"},true));this.nestedStretcher=d=Ext.Element.create({className:c+"-nested-stretcher"},true);b.appendChild(d);b.addCls(c);a.addCls(c+"-container");this.container=a;this.wrapper=e;this.refresh()}return e},doTranslate:function(a,c){var b=this.getWrapper();if(b){if(typeof a=="number"){b.scrollLeft=this.wrapperWidth-a}if(typeof c=="number"){b.scrollTop=this.wrapperHeight-c}}return this.callParent(arguments)},refresh:function(){var a=this.getWrapper();if(a){this.wrapperWidth=a.offsetWidth;this.wrapperHeight=a.offsetHeight;this.callParent(arguments)}},destroy:function(){var b=this.getElement(),a=this.baseCls;if(this.wrapper){if(this.getUseWrapper()){b.unwrap()}this.container.removeCls(a+"-container");b.removeCls(a);b.removeChild(this.nestedStretcher)}this.callParent(arguments)}});Ext.define("Ext.util.Translatable",{requires:["Ext.util.translatable.CssTransform","Ext.util.translatable.ScrollPosition"],constructor:function(a){var c=Ext.util.translatable,e=c.CssTransform,d=c.ScrollPosition,b;if(typeof a=="object"&&"translationMethod" in a){if(a.translationMethod==="scrollposition"){b=d}else{if(a.translationMethod==="csstransform"){b=e}}}if(!b){if(Ext.os.is.Android2||Ext.browser.is.ChromeMobile){b=d}else{b=e}}return new b(a)}});Ext.define("Ext.behavior.Translatable",{extend:"Ext.behavior.Behavior",requires:["Ext.util.Translatable"],constructor:function(){this.listeners={painted:"onComponentPainted",scope:this};this.callParent(arguments)},onComponentPainted:function(){this.translatable.refresh()},setConfig:function(c){var a=this.translatable,b=this.component;if(c){if(!a){this.translatable=a=new Ext.util.Translatable(c);a.setElement(b.renderElement);a.on("destroy","onTranslatableDestroy",this);if(b.isPainted()){this.onComponentPainted(b)}b.on(this.listeners)}else{if(Ext.isObject(c)){a.setConfig(c)}}}else{if(a){a.destroy()}}return this},getTranslatable:function(){return this.translatable},onTranslatableDestroy:function(){var a=this.component;delete this.translatable;a.un(this.listeners)},onComponentDestroy:function(){var a=this.translatable;if(a){a.destroy()}}});Ext.define("Ext.scroll.Scroller",{extend:"Ext.Evented",requires:["Ext.fx.easing.BoundMomentum","Ext.fx.easing.EaseOut","Ext.util.SizeMonitor","Ext.util.Translatable"],config:{element:null,direction:"auto",translationMethod:"auto",fps:"auto",disabled:null,directionLock:false,momentumEasing:{momentum:{acceleration:30,friction:0.5},bounce:{acceleration:30,springTension:0.3},minVelocity:1},bounceEasing:{duration:400},outOfBoundRestrictFactor:0.5,startMomentumResetTime:300,maxAbsoluteVelocity:6,containerSize:"auto",containerScrollSize:"auto",size:"auto",autoRefresh:true,initialOffset:{x:0,y:0},slotSnapSize:{x:0,y:0},slotSnapOffset:{x:0,y:0},slotSnapEasing:{duration:150}},cls:Ext.baseCSSPrefix+"scroll-scroller",containerCls:Ext.baseCSSPrefix+"scroll-container",dragStartTime:0,dragEndTime:0,isDragging:false,isAnimating:false,constructor:function(a){var b=a&&a.element;this.doAnimationFrame=Ext.Function.bind(this.doAnimationFrame,this);this.stopAnimation=Ext.Function.bind(this.stopAnimation,this);this.listeners={scope:this,touchstart:"onTouchStart",touchend:"onTouchEnd",dragstart:"onDragStart",drag:"onDrag",dragend:"onDragEnd"};this.minPosition={x:0,y:0};this.startPosition={x:0,y:0};this.size={x:0,y:0};this.position={x:0,y:0};this.velocity={x:0,y:0};this.isAxisEnabledFlags={x:false,y:false};this.flickStartPosition={x:0,y:0};this.flickStartTime={x:0,y:0};this.lastDragPosition={x:0,y:0};this.dragDirection={x:0,y:0};this.initialConfig=a;if(b){this.setElement(b)}return this},applyElement:function(a){if(!a){return}return Ext.get(a)},updateElement:function(a){this.initialize();a.addCls(this.cls);if(!this.getDisabled()){this.attachListeneners()}this.onConfigUpdate(["containerSize","size"],"refreshMaxPosition");this.on("maxpositionchange","snapToBoundary");this.on("minpositionchange","snapToBoundary");return this},getTranslatable:function(){if(!this.hasOwnProperty("translatable")){var a=this.getBounceEasing();this.translatable=new Ext.util.Translatable({translationMethod:this.getTranslationMethod(),element:this.getElement(),easingX:a.x,easingY:a.y,useWrapper:false,listeners:{animationframe:"onAnimationFrame",animationend:"onAnimationEnd",axisanimationend:"onAxisAnimationEnd",scope:this}})}return this.translatable},updateFps:function(a){if(a!=="auto"){this.getTranslatable().setFps(a)}},attachListeneners:function(){this.getContainer().on(this.listeners)},detachListeners:function(){this.getContainer().un(this.listeners)},updateDisabled:function(a){if(a){this.detachListeners()}else{this.attachListeneners()}},updateInitialOffset:function(c){if(typeof c=="number"){c={x:c,y:c}}var b=this.position,a,d;b.x=a=c.x;b.y=d=c.y;this.getTranslatable().doTranslate(-a,-d)},applyDirection:function(a){var e=this.getMinPosition(),d=this.getMaxPosition(),c,b;this.givenDirection=a;if(a==="auto"){c=d.x>e.x;b=d.y>e.y;if(c&&b){a="both"}else{if(c){a="horizontal"}else{a="vertical"}}}return a},updateDirection:function(b){var a=this.isAxisEnabledFlags;a.x=(b==="both"||b==="horizontal");a.y=(b==="both"||b==="vertical")},isAxisEnabled:function(a){this.getDirection();return this.isAxisEnabledFlags[a]},applyMomentumEasing:function(b){var a=Ext.fx.easing.BoundMomentum;return{x:Ext.factory(b,a),y:Ext.factory(b,a)}},applyBounceEasing:function(b){var a=Ext.fx.easing.EaseOut;return{x:Ext.factory(b,a),y:Ext.factory(b,a)}},applySlotSnapEasing:function(b){var a=Ext.fx.easing.EaseOut;return{x:Ext.factory(b,a),y:Ext.factory(b,a)}},getMinPosition:function(){var a=this.minPosition;if(!a){this.minPosition=a={x:0,y:0};this.fireEvent("minpositionchange",this,a)}return a},getMaxPosition:function(){var c=this.maxPosition,a,b;if(!c){a=this.getSize();b=this.getContainerSize();this.maxPosition=c={x:Math.max(0,a.x-b.x),y:Math.max(0,a.y-b.y)};this.fireEvent("maxpositionchange",this,c)}return c},refreshMaxPosition:function(){this.maxPosition=null;this.getMaxPosition()},applyContainerSize:function(b){var c,a,d;this.givenContainerSize=b;if(b==="auto"){c=this.getContainer().dom;a=c.offsetWidth;d=c.offsetHeight}else{a=b.x;d=b.y}return{x:a,y:d}},applySize:function(b){var c,a,d;this.givenSize=b;if(b==="auto"){c=this.getElement().dom;a=c.offsetWidth;d=c.offsetHeight}else{a=b.x;d=b.y}return{x:a,y:d}},applyContainerScrollSize:function(b){var c,a,d;this.givenContainerScrollSize=b;if(b==="auto"){c=this.getContainer().dom;a=c.scrollWidth;d=c.scrollHeight}else{a=b.x;d=b.y}return{x:a,y:d}},updateAutoRefresh:function(b){var c=Ext.util.SizeMonitor,a;if(b){this.sizeMonitors={element:new c({element:this.getElement(),callback:this.doRefresh,scope:this}),container:new c({element:this.getContainer(),callback:this.doRefresh,scope:this})}}else{a=this.sizeMonitors;if(a){a.element.destroy();a.container.destroy()}}},applySlotSnapSize:function(a){if(typeof a=="number"){return{x:a,y:a}}return a},applySlotSnapOffset:function(a){if(typeof a=="number"){return{x:a,y:a}}return a},getContainer:function(){var a=this.container;if(!a){this.container=a=this.getElement().getParent();a.addCls(this.containerCls)}return a},doRefresh:function(){this.stopAnimation();this.getTranslatable().refresh();this.setSize(this.givenSize);this.setContainerSize(this.givenContainerSize);this.setContainerScrollSize(this.givenContainerScrollSize);this.setDirection(this.givenDirection);this.fireEvent("refresh",this)},refresh:function(){var a=this.sizeMonitors;if(a){a.element.refresh();a.container.refresh()}this.doRefresh();return this},scrollTo:function(c,h,g){var b=this.getTranslatable(),a=this.position,d=false,f,e;if(this.isAxisEnabled("x")){if(typeof c!="number"){c=a.x}else{if(a.x!==c){a.x=c;d=true}}f=-c}if(this.isAxisEnabled("y")){if(typeof h!="number"){h=a.y}else{if(a.y!==h){a.y=h;d=true}}e=-h}if(d){if(g!==undefined){b.translateAnimated(f,e,g)}else{this.fireEvent("scroll",this,a.x,a.y);b.doTranslate(f,e)}}return this},scrollToTop:function(b){var a=this.getInitialOffset();return this.scrollTo(a.x,a.y,b)},scrollToEnd:function(a){return this.scrollTo(0,this.getSize().y-this.getContainerSize().y,a)},scrollBy:function(b,d,c){var a=this.position;b=(typeof b=="number")?b+a.x:null;d=(typeof d=="number")?d+a.y:null;return this.scrollTo(b,d,c)},onTouchStart:function(){this.isTouching=true;this.stopAnimation()},onTouchEnd:function(){var a=this.position;this.isTouching=false;if(!this.isDragging&&this.snapToSlot()){this.fireEvent("scrollstart",this,a.x,a.y)}},onDragStart:function(l){var o=this.getDirection(),g=l.absDeltaX,f=l.absDeltaY,j=this.getDirectionLock(),i=this.startPosition,d=this.flickStartPosition,k=this.flickStartTime,h=this.lastDragPosition,c=this.position,b=this.dragDirection,n=c.x,m=c.y,a=Ext.Date.now();this.isDragging=true;if(j&&o!=="both"){if((o==="horizontal"&&g>f)||(o==="vertical"&&f>g)){l.stopPropagation()}else{this.isDragging=false;return}}h.x=n;h.y=m;d.x=n;d.y=m;i.x=n;i.y=m;k.x=a;k.y=a;b.x=0;b.y=0;this.dragStartTime=a;this.isDragging=true;this.fireEvent("scrollstart",this,n,m)},onAxisDrag:function(i,q){if(!this.isAxisEnabled(i)){return}var h=this.flickStartPosition,l=this.flickStartTime,j=this.lastDragPosition,e=this.dragDirection,g=this.position[i],k=this.getMinPosition()[i],o=this.getMaxPosition()[i],d=this.startPosition[i],p=j[i],n=d-q,c=e[i],m=this.getOutOfBoundRestrictFactor(),f=this.getStartMomentumResetTime(),b=Ext.Date.now(),a;if(n<k){n*=m}else{if(n>o){a=n-o;n=o+a*m}}if(n>p){e[i]=1}else{if(n<p){e[i]=-1}}if((c!==0&&(e[i]!==c))||(b-l[i])>f){h[i]=g;l[i]=b}j[i]=n},onDrag:function(b){if(!this.isDragging){return}var a=this.lastDragPosition;this.onAxisDrag("x",b.deltaX);this.onAxisDrag("y",b.deltaY);this.scrollTo(a.x,a.y)},onDragEnd:function(c){var b,a;if(!this.isDragging){return}this.dragEndTime=Ext.Date.now();this.onDrag(c);this.isDragging=false;b=this.getAnimationEasing("x");a=this.getAnimationEasing("y");if(b||a){this.getTranslatable().animate(b,a)}else{this.onScrollEnd()}},getAnimationEasing:function(g){if(!this.isAxisEnabled(g)){return null}var e=this.position[g],f=this.flickStartPosition[g],k=this.flickStartTime[g],c=this.getMinPosition()[g],j=this.getMaxPosition()[g],a=this.getMaxAbsoluteVelocity(),d=null,b=this.dragEndTime,l,i,h;if(e<c){d=c}else{if(e>j){d=j}}if(d!==null){l=this.getBounceEasing()[g];l.setConfig({startTime:b,startValue:-e,endValue:-d});return l}h=b-k;if(h===0){return null}i=(e-f)/(b-k);if(i===0){return null}if(i<-a){i=-a}else{if(i>a){i=a}}l=this.getMomentumEasing()[g];l.setConfig({startTime:b,startValue:-e,startVelocity:-i,minMomentumValue:-j,maxMomentumValue:0});return l},onAnimationFrame:function(c,b,d){var a=this.position;a.x=-b;a.y=-d;this.fireEvent("scroll",this,a.x,a.y)},onAxisAnimationEnd:function(a){},onAnimationEnd:function(){this.snapToBoundary();this.onScrollEnd()},stopAnimation:function(){this.getTranslatable().stopAnimation()},onScrollEnd:function(){var a=this.position;if(this.isTouching||!this.snapToSlot()){this.fireEvent("scrollend",this,a.x,a.y)}},snapToSlot:function(){var b=this.getSnapPosition("x"),a=this.getSnapPosition("y"),c=this.getSlotSnapEasing();if(b!==null||a!==null){this.scrollTo(b,a,{easingX:c.x,easingY:c.y});return true}return false},getSnapPosition:function(c){var g=this.getSlotSnapSize()[c],d=null,a,f,e,b;if(g!==0&&this.isAxisEnabled(c)){a=this.position[c];f=this.getSlotSnapOffset()[c];e=this.getMaxPosition()[c];b=(a-f)%g;if(b!==0){if(Math.abs(b)>g/2){d=a+((b>0)?g-b:b-g);if(d>e){d=a-b}}else{d=a-b}}}return d},snapToBoundary:function(){var g=this.position,c=this.getMinPosition(),f=this.getMaxPosition(),e=c.x,d=c.y,b=f.x,a=f.y,i=Math.round(g.x),h=Math.round(g.y);if(i<e){i=e}else{if(i>b){i=b}}if(h<d){h=d}else{if(h>a){h=a}}this.scrollTo(i,h)},destroy:function(){var b=this.getElement(),a=this.sizeMonitors;if(a){a.element.destroy();a.container.destroy()}if(b&&!b.isDestroyed){b.removeCls(this.cls);this.getContainer().removeCls(this.containerCls)}Ext.destroy(this.translatable);this.callParent(arguments)}},function(){});Ext.define("Ext.util.Draggable",{isDraggable:true,mixins:["Ext.mixin.Observable"],requires:["Ext.util.SizeMonitor","Ext.util.Translatable"],config:{cls:Ext.baseCSSPrefix+"draggable",draggingCls:Ext.baseCSSPrefix+"dragging",element:null,constraint:"container",disabled:null,direction:"both",translatable:{}},DIRECTION_BOTH:"both",DIRECTION_VERTICAL:"vertical",DIRECTION_HORIZONTAL:"horizontal",constructor:function(a){var b;this.sizeMonitors={};this.extraConstraint={};this.initialConfig=a;this.offset={x:0,y:0};this.listeners={dragstart:"onDragStart",drag:"onDrag",dragend:"onDragEnd",scope:this};if(a&&a.element){b=a.element;delete a.element;this.setElement(b)}return this},applyElement:function(a){if(!a){return}return Ext.get(a)},updateElement:function(a){a.on(this.listeners);this.sizeMonitors.element=new Ext.util.SizeMonitor({element:a,callback:this.doRefresh,scope:this});this.initConfig(this.initialConfig)},updateCls:function(a){this.getElement().addCls(a)},applyTranslatable:function(a,b){a=Ext.factory(a,Ext.util.Translatable,b);a.setElement(this.getElement());return a},setExtraConstraint:function(a){this.extraConstraint=a||{};this.refreshConstraint();return this},addExtraConstraint:function(a){Ext.merge(this.extraConstraint,a);this.refreshConstraint();return this},applyConstraint:function(b,a){this.currentConstraint=b;if(b==="container"){return Ext.merge(this.getContainerConstraint(),this.extraConstraint)}return Ext.merge({},this.extraConstraint,b)},updateConstraint:function(){this.refreshOffset()},getContainerConstraint:function(){var b=this.getContainer();if(!b){return{min:{x:-Infinity,y:-Infinity},max:{x:Infinity,y:Infinity}}}var g=this.getElement().dom,f=b.dom,c=g.offsetWidth,a=g.offsetHeight,e=f.offsetWidth,d=f.offsetHeight;return{min:{x:0,y:0},max:{x:e-c,y:d-a}}},getContainer:function(){var a=this.container;if(!a){a=this.getElement().getParent();if(a){this.sizeMonitors.container=new Ext.util.SizeMonitor({element:a,callback:this.doRefresh,scope:this});this.container=a}}return a},detachListeners:function(){this.getElement().un(this.listeners)},isAxisEnabled:function(a){var b=this.getDirection();if(a==="x"){return(b===this.DIRECTION_BOTH||b===this.DIRECTION_HORIZONTAL)}return(b===this.DIRECTION_BOTH||b===this.DIRECTION_VERTICAL)},onDragStart:function(a){if(this.getDisabled()){return false}var b=this.offset;this.fireAction("dragstart",[this,a,b.x,b.y],this.initDragStart)},initDragStart:function(b,c,a,d){this.dragStartOffset={x:a,y:d};this.isDragging=true;this.getElement().addCls(this.getDraggingCls())},onDrag:function(b){if(!this.isDragging){return}var a=this.dragStartOffset;this.fireAction("drag",[this,b,a.x+b.deltaX,a.y+b.deltaY],this.doDrag)},doDrag:function(b,c,a,d){b.setOffset(a,d)},onDragEnd:function(a){if(!this.isDragging){return}this.onDrag(a);this.isDragging=false;this.getElement().removeCls(this.getDraggingCls());this.fireEvent("dragend",this,a,this.offset.x,this.offset.y)},setOffset:function(i,h,b){var f=this.offset,a=this.getConstraint(),e=a.min,c=a.max,d=Math.min,g=Math.max;if(this.isAxisEnabled("x")&&typeof i=="number"){i=d(g(i,e.x),c.x)}else{i=f.x}if(this.isAxisEnabled("y")&&typeof h=="number"){h=d(g(h,e.y),c.y)}else{h=f.y}f.x=i;f.y=h;this.getTranslatable().translate(i,h,b)},getOffset:function(){return this.offset},refreshConstraint:function(){this.setConstraint(this.currentConstraint)},refreshOffset:function(){var a=this.offset;this.setOffset(a.x,a.y)},doRefresh:function(){this.refreshConstraint();this.getTranslatable().refresh();this.refreshOffset()},refresh:function(){var a=this.sizeMonitors;if(a.element){a.element.refresh()}if(a.container){a.container.refresh()}this.doRefresh()},enable:function(){return this.setDisabled(false)},disable:function(){return this.setDisabled(true)},destroy:function(){var b=this.sizeMonitors,a=this.getTranslatable();if(b.element){b.element.destroy()}if(b.container){b.container.destroy()}var c=this.getElement();if(c&&!c.isDestroyed){c.removeCls(this.getCls())}this.detachListeners();if(a){a.destroy()}}},function(){});Ext.define("Ext.behavior.Draggable",{extend:"Ext.behavior.Behavior",requires:["Ext.util.Draggable"],constructor:function(){this.listeners={painted:"onComponentPainted",scope:this};this.callParent(arguments)},onComponentPainted:function(){this.draggable.refresh()},setConfig:function(c){var a=this.draggable,b=this.component;if(c){if(!a){b.setTranslatable(true);this.draggable=a=new Ext.util.Draggable(c);a.setTranslatable(b.getTranslatable());a.setElement(b.renderElement);a.on("destroy","onDraggableDestroy",this);if(b.isPainted()){this.onComponentPainted(b)}b.on(this.listeners)}else{if(Ext.isObject(c)){a.setConfig(c)}}}else{if(a){a.destroy()}}return this},getDraggable:function(){return this.draggable},onDraggableDestroy:function(){var a=this.component;delete this.draggable;a.un(this.listeners)},onComponentDestroy:function(){var a=this.draggable;if(a){a.destroy()}}});(function(a){Ext.define("Ext.Component",{extend:"Ext.AbstractComponent",alternateClassName:"Ext.lib.Component",mixins:["Ext.mixin.Traversable"],requires:["Ext.ComponentManager","Ext.XTemplate","Ext.dom.Element","Ext.behavior.Translatable","Ext.behavior.Draggable"],xtype:"component",observableType:"component",cachedConfig:{baseCls:null,cls:null,floatingCls:null,hiddenCls:a+"item-hidden",ui:null,margin:null,padding:null,border:null,styleHtmlCls:a+"html",styleHtmlContent:null},eventedConfig:{left:null,top:null,right:null,bottom:null,width:null,height:null,minWidth:null,minHeight:null,maxWidth:null,maxHeight:null,docked:null,centered:null,hidden:null,disabled:null},config:{style:null,html:null,draggable:null,translatable:null,renderTo:null,zIndex:null,tpl:null,enterAnimation:null,exitAnimation:null,showAnimation:null,hideAnimation:null,tplWriteMode:"overwrite",data:null,disabledCls:a+"item-disabled",contentEl:null,itemId:undefined,record:null,plugins:null},listenerOptionsRegex:/^(?:delegate|single|delay|buffer|args|prepend|element)$/,alignmentRegex:/^([a-z]+)-([a-z]+)(\?)?$/,isComponent:true,floating:false,rendered:false,dockPositions:{top:true,right:true,bottom:true,left:true},innerElement:null,element:null,template:[],constructor:function(c){var d=this,b=d.config,e;d.onInitializedListeners=[];d.initialConfig=c;if(c!==undefined&&"id" in c){e=c.id}else{if("id" in b){e=b.id}else{e=d.getId()}}d.id=e;d.setId(e);Ext.ComponentManager.register(d);d.initElement();d.initConfig(d.initialConfig);d.initialize();d.triggerInitialized();if("fullscreen" in d.config){d.fireEvent("fullscreen",d)}d.fireEvent("initialize",d)},beforeInitConfig:function(b){this.beforeInitialize.apply(this,arguments)},beforeInitialize:Ext.emptyFn,initialize:Ext.emptyFn,getTemplate:function(){return this.template},getElementConfig:function(){return{reference:"element",children:this.getTemplate()}},triggerInitialized:function(){var c=this.onInitializedListeners,d=c.length,e,b;if(!this.initialized){this.initialized=true;if(d>0){for(b=0;b<d;b++){e=c[b];e.fn.call(e.scope,this)}c.length=0}}},onInitialized:function(d,c){var b=this.onInitializedListeners;if(!c){c=this}if(this.initialized){d.call(c,this)}else{b.push({fn:d,scope:c})}},renderTo:function(b,d){var f=this.renderElement.dom,e=Ext.getDom(b),c=Ext.getDom(d);if(e){if(c){e.insertBefore(f,c)}else{e.appendChild(f)}this.setRendered(Boolean(f.offsetParent))}},setParent:function(c){var b=this.parent;if(c&&b&&b!==c){b.remove(this,false)}this.parent=c;return this},applyPlugins:function(b){var d,c,e;if(!b){return b}b=[].concat(b);for(c=0,d=b.length;c<d;c++){e=b[c];b[c]=Ext.factory(e,"Ext.plugin.Plugin",null,"plugin")}return b},updatePlugins:function(e,b){var d,c;if(e){for(c=0,d=e.length;c<d;c++){e[c].init(this)}}if(b){for(c=0,d=b.length;c<d;c++){Ext.destroy(b[c])}}},updateRenderTo:function(b){this.renderTo(b)},updateStyle:function(b){this.element.dom.style.cssText+=b},updateBorder:function(b){this.element.setBorder(b)},updatePadding:function(b){this.innerElement.setPadding(b)},updateMargin:function(b){this.element.setMargin(b)},updateUi:function(b,d){var c=this.getBaseCls();if(c){if(d){this.element.removeCls(d,c)}if(b){this.element.addCls(b,c)}}},applyBaseCls:function(b){return b||a+this.xtype},updateBaseCls:function(b,c){var d=this,e=d.getUi();if(b){this.element.addCls(b);if(e){this.element.addCls(b,null,e)}}if(c){this.element.removeCls(c);if(e){this.element.removeCls(c,null,e)}}},addCls:function(b,h,j){var e=this.getCls(),g=(e)?e.slice():[],f,d,c;h=h||"";j=j||"";if(typeof b=="string"){b=[b]}f=b.length;if(!g.length&&h===""&&j===""){g=b}else{for(d=0;d<f;d++){c=h+b[d]+j;if(g.indexOf(c)==-1){g.push(c)}}}this.setCls(g)},removeCls:function(b,g,h){var d=this.getCls(),f=(d)?d.slice():[],e,c;g=g||"";h=h||"";if(typeof b=="string"){f=Ext.Array.remove(f,g+b+h)}else{e=b.length;for(c=0;c<e;c++){f=Ext.Array.remove(f,g+b[c]+h)}}this.setCls(f)},replaceCls:function(e,j,d,h){var k=this.getCls(),f=(k)?k.slice():[],g,c,b;d=d||"";h=h||"";if(typeof e=="string"){f=Ext.Array.remove(f,d+e+h)}else{if(e){g=e.length;for(c=0;c<g;c++){f=Ext.Array.remove(f,d+e[c]+h)}}}if(typeof j=="string"){f.push(d+j+h)}else{if(j){g=j.length;if(!f.length&&d===""&&h===""){f=j}else{for(c=0;c<g;c++){b=d+j[c]+h;if(f.indexOf(b)==-1){f.push(b)}}}}}this.setCls(f)},applyCls:function(b){if(typeof b=="string"){b=[b]}if(!b||!b.length){b=null}return b},updateCls:function(c,b){this.element.replaceCls(b,c)},updateStyleHtmlCls:function(d,b){var e=this.innerHtmlElement,c=this.innerElement;if(this.getStyleHtmlContent()&&b){if(e){e.replaceCls(b,d)}else{c.replaceCls(b,d)}}},applyStyleHtmlContent:function(b){return Boolean(b)},updateStyleHtmlContent:function(d){var b=this.getStyleHtmlCls(),c=this.innerElement,e=this.innerHtmlElement;if(d){if(e){e.addCls(b)}else{c.addCls(b)}}else{if(e){e.removeCls(b)}else{c.addCls(b)}}},applyContentEl:function(b){if(b){return Ext.get(b)}},updateContentEl:function(b,c){if(c){c.hide();Ext.getBody().append(c)}if(b){this.setHtml(b.dom);b.show()}},getSize:function(){return{width:this.getWidth(),height:this.getHeight()}},isCentered:function(){return Boolean(this.getCentered())},isFloating:function(){return this.floating},isDocked:function(){return Boolean(this.getDocked())},isInnerItem:function(){var b=this;return !b.isCentered()&&!b.isFloating()&&!b.isDocked()},filterPositionValue:function(b){if(b===""||b==="auto"){b=null}return b},applyTop:function(b){return this.filterPositionValue(b)},applyRight:function(b){return this.filterPositionValue(b)},applyBottom:function(b){return this.filterPositionValue(b)},applyLeft:function(b){return this.filterPositionValue(b)},doSetTop:function(b){this.updateFloating();this.element.setTop(b)},doSetRight:function(b){this.updateFloating();this.element.setRight(b)},doSetBottom:function(b){this.updateFloating();this.element.setBottom(b)},doSetLeft:function(b){this.updateFloating();this.element.setLeft(b)},doSetWidth:function(b){this.element.setWidth(b)},doSetHeight:function(b){this.element.setHeight(b)},doSetMinWidth:function(b){this.element.setMinWidth(b)},doSetMinHeight:function(b){this.element.setMinHeight(b)},doSetMaxWidth:function(b){this.element.setMaxWidth(b)},doSetMaxHeight:function(b){this.element.setMaxHeight(b)},applyCentered:function(b){b=Boolean(b);if(b){if(this.isFloating()){this.resetFloating()}if(this.isDocked()){this.setDocked(false)}}return b},doSetCentered:Ext.emptyFn,applyDocked:function(b){if(b){if(!this.dockPositions[b]){return}if(this.isFloating()){this.resetFloating()}if(this.isCentered()){this.setCentered(false)}}return b},doSetDocked:Ext.emptyFn,resetFloating:function(){this.setTop(null);this.setRight(null);this.setBottom(null);this.setLeft(null)},updateFloating:function(){var c=true,b=this.getFloatingCls();if(this.getTop()===null&&this.getBottom()===null&&this.getRight()===null&&this.getLeft()===null){c=false}if(c!==this.floating){if(c){if(this.isCentered()){this.setCentered(false)}if(this.isDocked()){this.setDocked(false)}if(b){this.addCls(b)}}else{if(b){this.removeCls(b)}}this.floating=c;this.fireEvent("floatingchange",this,c)}},updateFloatingCls:function(b,c){if(this.isFloating()){this.replaceCls(c,b)}},applyDisabled:function(b){return Boolean(b)},doSetDisabled:function(b){this.element[b?"addCls":"removeCls"](this.getDisabledCls())},updateDisabledCls:function(b,c){if(this.isDisabled()){this.element.replaceCls(c,b)}},disable:function(){this.setDisabled(true)},enable:function(){this.setDisabled(false)},isDisabled:function(){return this.getDisabled()},applyZIndex:function(b){if(b!==null){b=Number(b);if(isNaN(b)){b=null}}return b},updateZIndex:function(c){var b=this.element.dom.style;if(c!==null){b.setProperty("z-index",c,"important")}else{b.removeProperty("z-index")}},getInnerHtmlElement:function(){var b=this.innerHtmlElement,c=this.getStyleHtmlCls();if(!b||!b.dom||!b.dom.parentNode){this.innerHtmlElement=b=this.innerElement.createChild({cls:"x-innerhtml "});if(this.getStyleHtmlContent()){this.innerHtmlElement.addCls(c);this.innerElement.removeCls(c)}}return b},updateHtml:function(b){var c=this.getInnerHtmlElement();if(Ext.isElement(b)){c.setHtml("");c.append(b)}else{c.setHtml(b)}},applyHidden:function(b){return Boolean(b)},doSetHidden:function(c){var b=this.renderElement;if(c){b.hide()}else{b.show()}if(this.element){this.element[c?"addCls":"removeCls"](this.getHiddenCls())}this.fireEvent(c?"hide":"show",this)},updateHiddenCls:function(b,c){if(this.isHidden()){this.element.replaceCls(c,b)}},isHidden:function(){return this.getHidden()},hide:function(b){if(!this.getHidden()){if(b===undefined||(b&&b.isComponent)){b=this.getHideAnimation()}if(b){if(b===true){b="fadeOut"}this.onBefore({hiddenchange:"animateFn",scope:this,single:true,args:[b]})}this.setHidden(true)}return this},show:function(c){var b=this.getHidden();if(b||b===null){if(c===undefined||(c&&!c.isComponent)){c=this.getShowAnimation()}if(c){if(c===true){c="fadeIn"}this.onBefore({hiddenchange:"animateFn",scope:this,single:true,args:[c]})}this.setHidden(false)}return this},animateFn:function(g,e,h,d,c,b){if(g){var f=new Ext.fx.Animation(g);f.setElement(e.element);if(h){f.setOnEnd(function(){b.resume()});b.pause()}Ext.Animator.run(f)}},setVisibility:function(b){this.renderElement.setVisibility(b)},isRendered:function(){return this.rendered},isPainted:function(){return this.renderElement.isPainted()},applyTpl:function(b){return(Ext.isObject(b)&&b.isTemplate)?b:new Ext.XTemplate(b)},applyData:function(b){if(Ext.isObject(b)){return Ext.apply({},b)}return b},updateData:function(d){var e=this;if(d){var c=e.getTpl(),b=e.getTplWriteMode();if(c){c[b](e.getInnerHtmlElement(),d)}this.fireEvent("updatedata",e,d)}},applyRecord:function(b){if(b&&Ext.isObject(b)&&b.isModel){return b}return null},updateRecord:function(c,b){var d=this;if(b){b.unjoin(d)}if(!c){d.updateData("")}else{c.join(d);d.updateData(c.getData(true))}},afterEdit:function(){this.updateRecord(this.getRecord())},afterErase:function(){this.setRecord(null)},applyItemId:function(b){return b||this.getId()},isXType:function(c,b){if(b){return this.xtypes.indexOf(c)!=-1}return Boolean(this.xtypesMap[c])},getXTypes:function(){return this.xtypesChain.join("/")},getDraggableBehavior:function(){var b=this.draggableBehavior;if(!b){b=this.draggableBehavior=new Ext.behavior.Draggable(this)}return b},applyDraggable:function(b){this.getDraggableBehavior().setConfig(b)},getDraggable:function(){return this.getDraggableBehavior().getDraggable()},getTranslatableBehavior:function(){var b=this.translatableBehavior;if(!b){b=this.translatableBehavior=new Ext.behavior.Translatable(this)}return b},applyTranslatable:function(b){this.getTranslatableBehavior().setConfig(b)},getTranslatable:function(){return this.getTranslatableBehavior().getTranslatable()},translateAxis:function(c,e,d){var b,f;if(c==="x"){b=e}else{f=e}return this.translate(b,f,d)},translate:function(){var b=this.getTranslatable();if(!b){this.setTranslatable(true);b=this.getTranslatable()}b.translate.apply(b,arguments)},setRendered:function(c){var b=this.rendered;if(c!==b){this.rendered=c;return true}return false},setSize:function(c,b){if(c!=undefined){this.setWidth(c)}if(b!=undefined){this.setHeight(b)}},doAddListener:function(d,f,e,c,b){if(c&&"element" in c){this[c.element].doAddListener(d,f,e||this,c,b)}return this.callParent(arguments)},doRemoveListener:function(d,f,e,c,b){if(c&&"element" in c){this[c.element].doRemoveListener(d,f,e||this,c,b)}return this.callParent(arguments)},showBy:function(d,f){var c=Ext.Array.from(arguments);var b=Ext.Viewport,e=this.getParent();this.setVisibility(false);if(e!==b){b.add(this)}this.show();this.on("erased","onShowByErased",this,{single:true});b.on("resize","refreshShowBy",this,{args:[d,f]});this.currentShowByArgs=c;this.alignTo(d,f);this.setVisibility(true)},refreshShowBy:function(b,c){this.alignTo(b,c)},onShowByErased:function(){Ext.Viewport.un("resize","refreshShowBy",this)},alignTo:function(o,j){var f=o.isComponent?o.renderElement:o,c=this.renderElement,q=f.getPageBox(),B=this.getParent().element.getPageBox(),n=c.getPageBox(),y=q.height,p=q.width,t=n.height,v=n.width;B.bottom-=5;B.height-=10;B.left+=5;B.right-=5;B.top+=5;B.width-=10;if(!j||j==="auto"){if(B.bottom-q.bottom<t){if(q.top-B.top<t){if(q.left-B.left<v){j="cl-cr?"}else{j="cr-cl?"}}else{j="bc-tc?"}}else{j="tc-bc?"}}var b=j.match(this.alignmentRegex);var w=b[1].split(""),d=b[2].split(""),z=(b[3]==="?"),i=w[0],u=w[1]||i,m=d[0],l=d[1]||m,r=q.top,e=q.left,k=y/2,g=p/2,h=v/2,s=t/2,x,A;switch(i){case"t":switch(m){case"c":r+=k;break;case"b":r+=y}break;case"b":switch(m){case"c":r-=(t-k);break;case"t":r-=t;break;case"b":r-=t-y}break;case"c":switch(m){case"t":r-=s;break;case"c":r-=(s-k);break;case"b":r-=(s-y)}break}switch(u){case"l":switch(l){case"c":e+=k;break;case"r":e+=p}break;case"r":switch(l){case"r":e-=(v-p);break;case"c":e-=(v-h);break;case"l":e-=v}break;case"c":switch(l){case"l":e-=h;break;case"c":e-=(h-g);break;case"r":e-=(h-p)}break}if(z){x=(B.left+B.width)-v;A=(B.top+B.height)-t;e=Math.max(B.left,Math.min(x,e));r=Math.max(B.top,Math.min(A,r))}this.setLeft(e);this.setTop(r)},up:function(c){var b=this.parent;if(c){for(;b;b=b.parent){if(Ext.ComponentQuery.is(b,c)){return b}}}return b},getBubbleTarget:function(){return this.getParent()},destroy:function(){this.destroy=Ext.emptyFn;var e=this.getParent(),c=this.referenceList,d,f,b;if(e){e.remove(this,false)}for(d=0,f=c.length;d<f;d++){b=c[d];this[b].destroy();delete this[b]}this.setRecord(null);Ext.destroy(this.innerHtmlElement,this.getTranslatable());Ext.ComponentManager.unregister(this);this.callParent()}},function(){})})(Ext.baseCSSPrefix);Ext.define("Ext.Button",{extend:"Ext.Component",xtype:"button",cachedConfig:{pressedCls:Ext.baseCSSPrefix+"button-pressing",badgeCls:Ext.baseCSSPrefix+"badge",hasBadgeCls:Ext.baseCSSPrefix+"hasbadge",labelCls:Ext.baseCSSPrefix+"button-label",iconMaskCls:Ext.baseCSSPrefix+"icon-mask"},config:{badgeText:null,text:null,iconCls:null,icon:null,iconAlign:"left",pressedDelay:0,iconMask:null,handler:null,scope:null,autoEvent:null,ui:"normal",baseCls:Ext.baseCSSPrefix+"button"},template:[{tag:"span",reference:"badgeElement",hidden:true},{tag:"span",className:Ext.baseCSSPrefix+"button-icon",reference:"iconElement",hidden:true},{tag:"span",reference:"textElement",hidden:true}],initialize:function(){this.callParent();this.element.on({scope:this,tap:"onTap",touchstart:"onPress",touchmove:"onTouchMove",touchend:"onRelease"})},updateBadgeText:function(c){var a=this.element,b=this.badgeElement;if(c){b.show();b.setText(c)}else{b.hide()}a[(c)?"addCls":"removeCls"](this.getHasBadgeCls())},updateText:function(b){var a=this.textElement;if(b){a.show();a.setHtml(b)}else{a.hide()}},updateHtml:function(b){var a=this.textElement;if(b){a.show();a.setHtml(b)}else{a.hide()}},updateBadgeCls:function(b,a){this.badgeElement.replaceCls(a,b)},updateHasBadgeCls:function(b,c){var a=this.element;if(a.hasCls(c)){a.replaceCls(c,b)}},updateLabelCls:function(b,a){this.textElement.replaceCls(a,b)},updatePressedCls:function(b,c){var a=this.element;if(a.hasCls(c)){a.replaceCls(c,b)}},updateIcon:function(b){var c=this,a=c.iconElement;if(b){c.showIconElement();a.setStyle("background-image",b?"url("+b+")":"");c.refreshIconAlign();c.refreshIconMask()}else{c.hideIconElement();c.setIconAlign(false)}},updateIconCls:function(c,a){var d=this,b=d.iconElement;if(c){d.showIconElement();b.replaceCls(a,c);d.refreshIconAlign();d.refreshIconMask()}else{d.hideIconElement();d.setIconAlign(false)}},updateIconAlign:function(d,c){var b=this.element,a=Ext.baseCSSPrefix+"iconalign-";if(!this.getText()){d="center"}b.removeCls(a+"center");b.removeCls(a+c);if(this.getIcon()||this.getIconCls()){b.addCls(a+d)}},refreshIconAlign:function(){this.updateIconAlign(this.getIconAlign())},updateIconMaskCls:function(c,b){var a=this.iconElement;if(this.getIconMask()){a.replaceCls(b,c)}},updateIconMask:function(a){this.iconElement[a?"addCls":"removeCls"](this.getIconMaskCls())},refreshIconMask:function(){this.updateIconMask(this.getIconMask())},applyAutoEvent:function(b){var a=this;if(typeof b=="string"){b={name:b,scope:a.scope||a}}return b},updateAutoEvent:function(c){var a=c.name,b=c.scope;this.setHandler(function(){b.fireEvent(a,b,this)});this.setScope(b)},hideIconElement:function(){this.iconElement.hide()},showIconElement:function(){this.iconElement.show()},applyUi:function(a){if(a&&Ext.isString(a)){var b=a.split("-");if(b&&(b[1]=="back"||b[1]=="forward")){return b}}return a},getUi:function(){var a=this._ui;if(Ext.isArray(a)){return a.join("-")}return a},applyPressedDelay:function(a){if(Ext.isNumber(a)){return a}return(a)?100:0},onPress:function(){var a=this.element,c=this.getPressedDelay(),b=this.getPressedCls();if(!this.getDisabled()){this.isPressed=true;if(this.hasOwnProperty("releasedTimeout")){clearTimeout(this.releasedTimeout);delete this.releasedTimeout}if(c>0){this.pressedTimeout=setTimeout(function(){if(a){a.addCls(b)}},c)}else{a.addCls(b)}}},onTouchMove:function(a){return},onRelease:function(a){this.fireAction("release",[this,a],"doRelease")},doRelease:function(a,b){if(!a.isPressed){return}a.isPressed=false;if(a.hasOwnProperty("pressedTimeout")){clearTimeout(a.pressedTimeout);delete a.pressedTimeout}a.releasedTimeout=setTimeout(function(){if(a&&a.element){a.element.removeCls(a.getPressedCls())}},10)},onTap:function(a){if(this.getDisabled()){return false}this.fireAction("tap",[this,a],"doTap")},doTap:function(c,d){var b=c.getHandler(),a=c.getScope()||c;if(!b){return}if(typeof b=="string"){b=a[b]}d.preventDefault();b.apply(a,arguments)}},function(){});Ext.define("Ext.Decorator",{extend:"Ext.Component",isDecorator:true,config:{component:{}},statics:{generateProxySetter:function(a){return function(c){var b=this.getComponent();b[a].call(b,c);return this}},generateProxyGetter:function(a){return function(){var b=this.getComponent();return b[a].call(b)}}},onClassExtended:function(c,e){if(!e.hasOwnProperty("proxyConfig")){return}var f=Ext.Class,i=e.proxyConfig,d=e.config;e.config=(d)?Ext.applyIf(d,i):i;var b,h,g,a;for(b in i){if(i.hasOwnProperty(b)){h=f.getConfigNameMap(b);g=h.set;a=h.get;e[g]=this.generateProxySetter(g);e[a]=this.generateProxyGetter(a)}}},applyComponent:function(a){return Ext.factory(a,Ext.Component)},updateComponent:function(a,b){if(b){if(this.isRendered()&&b.setRendered(false)){b.fireAction("renderedchange",[this,b,false],"doUnsetComponent",this,{args:[b]})}else{this.doUnsetComponent(b)}}if(a){if(this.isRendered()&&a.setRendered(true)){a.fireAction("renderedchange",[this,a,true],"doSetComponent",this,{args:[a]})}else{this.doSetComponent(a)}}},doUnsetComponent:function(a){if(a.renderElement.dom){this.innerElement.dom.removeChild(a.renderElement.dom)}},doSetComponent:function(a){if(a.renderElement.dom){this.innerElement.dom.appendChild(a.renderElement.dom)}},setRendered:function(b){var a;if(this.callParent(arguments)){a=this.getComponent();if(a){a.setRendered(b)}return true}return false},setDisabled:function(a){this.callParent(arguments);this.getComponent().setDisabled(a)},destroy:function(){Ext.destroy(this.getComponent());this.callParent()}});Ext.define("Ext.Img",{extend:"Ext.Component",xtype:["image","img"],config:{src:null,baseCls:Ext.baseCSSPrefix+"img",mode:"background"},beforeInitialize:function(){var a=this;a.onLoad=Ext.Function.bind(a.onLoad,a);a.onError=Ext.Function.bind(a.onError,a)},initialize:function(){var a=this;a.callParent();a.relayEvents(a.renderElement,"*");a.element.on({tap:"onTap",scope:a})},hide:function(){this.callParent();this.hiddenSrc=this.hiddenSrc||this.getSrc();this.setSrc(null)},show:function(){this.callParent();if(this.hiddenSrc){this.setSrc(this.hiddenSrc);delete this.hiddenSrc}},updateMode:function(a){if(a==="background"){if(this.imageElement){this.imageElement.destroy();delete this.imageElement;this.updateSrc(this.getSrc())}}else{this.imageElement=this.element.createChild({tag:"img"})}},onTap:function(a){this.fireEvent("tap",this,a)},onAfterRender:function(){this.updateSrc(this.getSrc())},updateSrc:function(a){var b=this,c;if(b.getMode()==="background"){c=this.imageObject||new Image()}else{c=b.imageElement.dom}this.imageObject=c;c.setAttribute("src",Ext.isString(a)?a:"");c.addEventListener("load",b.onLoad,false);c.addEventListener("error",b.onError,false)},detachListeners:function(){var a=this.imageObject;if(a){a.removeEventListener("load",this.onLoad,false);a.removeEventListener("error",this.onError,false)}},onLoad:function(a){this.detachListeners();if(this.getMode()==="background"){this.element.dom.style.backgroundImage='url("'+this.imageObject.src+'")'}this.fireEvent("load",this,a)},onError:function(a){this.detachListeners();this.fireEvent("error",this,a)},doSetWidth:function(b){var a=(this.getMode()==="background")?this.element:this.imageElement;a.setWidth(b);this.callParent(arguments)},doSetHeight:function(b){var a=(this.getMode()==="background")?this.element:this.imageElement;a.setHeight(b);this.callParent(arguments)},destroy:function(){this.detachListeners();Ext.destroy(this.imageObject);delete this.imageObject;this.callParent()}});Ext.define("Ext.Label",{extend:"Ext.Component",xtype:"label",config:{}});Ext.define("Ext.Map",{extend:"Ext.Component",xtype:"map",requires:["Ext.util.GeoLocation"],isMap:true,config:{baseCls:Ext.baseCSSPrefix+"map",useCurrentLocation:false,map:null,geo:null,mapOptions:{}},constructor:function(){this.callParent(arguments);this.options={};this.element.setVisibilityMode(Ext.Element.OFFSETS);if(!(window.google||{}).maps){this.setHtml("Google Maps API is required")}},initialize:function(){this.callParent();this.on({painted:"doResize",scope:this});this.element.on("touchstart","onTouchStart",this)},onTouchStart:function(a){a.makeUnpreventable()},applyMapOptions:function(a){return Ext.merge({},this.options,a)},updateMapOptions:function(c){var b=(window.google||{}).maps,a=this.getMap();if(b&&a){a.setOptions(c)}},getMapOptions:function(){return Ext.merge({},this.options)},updateUseCurrentLocation:function(a){this.setGeo(a);if(!a){this.renderMap()}},applyGeo:function(a){return Ext.factory(a,Ext.util.GeoLocation,this.getGeo())},updateGeo:function(b,a){var c={locationupdate:"onGeoUpdate",locationerror:"onGeoError",scope:this};if(a){a.un(c)}if(b){b.on(c);b.updateLocation()}},doResize:function(){var b=(window.google||{}).maps,a=this.getMap();if(b&&a){b.event.trigger(a,"resize")}},renderMap:function(){var d=this,f=(window.google||{}).maps,b=d.element,a=d.getMapOptions(),e=d.getMap(),c;if(f){if(Ext.os.is.iPad){Ext.merge({navigationControlOptions:{style:f.NavigationControlStyle.ZOOM_PAN}},a)}a=Ext.merge({zoom:12,mapTypeId:f.MapTypeId.ROADMAP},a);if(!a.hasOwnProperty("center")){a.center=new f.LatLng(37.381592,-122.135672)}if(b.dom.firstChild){Ext.fly(b.dom.firstChild).destroy()}if(e){f.event.clearInstanceListeners(e)}d.setMap(new f.Map(b.dom,a));e=d.getMap();c=f.event;c.addListener(e,"zoom_changed",Ext.bind(d.onZoomChange,d));c.addListener(e,"maptypeid_changed",Ext.bind(d.onTypeChange,d));c.addListener(e,"center_changed",Ext.bind(d.onCenterChange,d));d.fireEvent("maprender",d,e)}},onGeoUpdate:function(a){if(a){this.setMapCenter(new google.maps.LatLng(a.getLatitude(),a.getLongitude()))}},onGeoError:Ext.emptyFn,setMapCenter:function(d){var a=this,c=a.getMap(),b=(window.google||{}).maps;if(b){if(!a.isPainted()){a.un("painted","setMapCenter",this);a.on("painted","setMapCenter",this,{single:true,args:[d]});return}d=d||new b.LatLng(37.381592,-122.135672);if(d&&!(d instanceof b.LatLng)&&"longitude" in d){d=new b.LatLng(d.latitude,d.longitude)}if(!c){a.renderMap();c=a.getMap()}if(c&&d instanceof b.LatLng){c.panTo(d)}else{this.options=Ext.apply(this.getMapOptions(),{center:d})}}},onZoomChange:function(){var a=this.getMapOptions(),c=this.getMap(),b;b=(c&&c.getZoom)?c.getZoom():a.zoom||10;this.options=Ext.apply(a,{zoom:b});this.fireEvent("zoomchange",this,c,b)},onTypeChange:function(){var b=this.getMapOptions(),c=this.getMap(),a;a=(c&&c.getMapTypeId)?c.getMapTypeId():b.mapTypeId;this.options=Ext.apply(b,{mapTypeId:a});this.fireEvent("typechange",this,c,a)},onCenterChange:function(){var b=this.getMapOptions(),c=this.getMap(),a;a=(c&&c.getCenter)?c.getCenter():b.center;this.options=Ext.apply(b,{center:a});this.fireEvent("centerchange",this,c,a)},destroy:function(){Ext.destroy(this.getGeo());var a=this.getMap();if(a&&(window.google||{}).maps){google.maps.event.clearInstanceListeners(a)}this.callParent()}},function(){});Ext.define("Ext.Mask",{extend:"Ext.Component",xtype:"mask",config:{baseCls:Ext.baseCSSPrefix+"mask",transparent:false,top:0,left:0,right:0,bottom:0},initialize:function(){this.callParent();this.on({painted:"onPainted",erased:"onErased"})},onPainted:function(){this.element.on("*","onEvent",this)},onErased:function(){this.element.un("*","onEvent",this)},onEvent:function(b){var a=arguments[arguments.length-1];if(a.info.eventName==="tap"){this.fireEvent("tap",this,b);return false}if(b&&b.stopEvent){b.stopEvent()}return false},updateTransparent:function(a){this[a?"addCls":"removeCls"](this.getBaseCls()+"-transparent")}});Ext.define("Ext.LoadMask",{extend:"Ext.Mask",xtype:"loadmask",config:{message:"Loading...",messageCls:Ext.baseCSSPrefix+"mask-message",indicator:true,listeners:{painted:"onPainted",erased:"onErased"}},getTemplate:function(){var a=Ext.baseCSSPrefix;return[{reference:"innerElement",cls:a+"mask-inner",children:[{reference:"indicatorElement",cls:a+"loading-spinner-outer",children:[{cls:a+"loading-spinner",children:[{tag:"span",cls:a+"loading-top"},{tag:"span",cls:a+"loading-right"},{tag:"span",cls:a+"loading-bottom"},{tag:"span",cls:a+"loading-left"}]}]},{reference:"messageElement"}]}]},updateMessage:function(a){this.messageElement.setHtml(a)},updateMessageCls:function(b,a){this.messageElement.replaceCls(a,b)},updateIndicator:function(a){this[a?"removeCls":"addCls"](Ext.baseCSSPrefix+"indicator-hidden")},onPainted:function(){this.getParent().on({scope:this,resize:this.refreshPosition});this.refreshPosition()},onErased:function(){this.getParent().un({scope:this,resize:this.refreshPosition})},refreshPosition:function(){var c=this.getParent(),d=c.getScrollable(),a=(d)?d.getScroller():null,f=(a)?a.position:{x:0,y:0},e=c.element.getSize(),b=this.element.getSize();this.innerElement.setStyle({marginTop:Math.round(e.height-b.height+(f.y*2))+"px",marginLeft:Math.round(e.width-b.width+f.x)+"px"})}},function(){});Ext.define("Ext.Media",{extend:"Ext.Component",xtype:"media",config:{url:"",enableControls:Ext.os.is.Android?false:true,autoResume:false,autoPause:true,preload:true,loop:false,media:null,playing:false,volume:1,muted:false},initialize:function(){var a=this;a.callParent();a.on({scope:a,activate:a.onActivate,deactivate:a.onDeactivate});a.addMediaListener({play:"onPlay",pause:"onPause",ended:"onEnd",volumechange:"onVolumeChange",timeupdate:"onTimeUpdate"})},addMediaListener:function(d,b){var c=this,e=c.media.dom,f=Ext.Function.bind;if(!Ext.isObject(d)){var a=d;d={};d[a]=b}Ext.Object.each(d,function(h,g){if(typeof g!=="function"){g=c[g]}if(typeof g=="function"){g=f(g,c);e.addEventListener(h,g)}})},onPlay:function(){this.fireEvent("play",this)},onPause:function(){this.fireEvent("pause",this,this.getCurrentTime())},onEnd:function(){this.fireEvent("ended",this,this.getCurrentTime())},onVolumeChange:function(){this.fireEvent("volumechange",this,this.media.dom.volume)},onTimeUpdate:function(){this.fireEvent("timeupdate",this,this.getCurrentTime())},isPlaying:function(){return this.getPlaying()},onActivate:function(){var a=this;if(a.getAutoResume()&&!a.isPlaying()){a.play()}},onDeactivate:function(){var a=this;if(a.getAutoResume()&&a.isPlaying()){a.pause()}},updateUrl:function(a){var b=this.media.dom;b.src=a;b.load();if(this.getPlaying()){this.play()}},updateEnableControls:function(a){this.media.dom.controls=a?"controls":false},updateLoop:function(a){this.media.dom.loop=a?"loop":false},play:function(){this.media.dom.play();this.setPlaying(true)},pause:function(){this.media.dom.pause();this.setPlaying(false)},toggle:function(){if(this.isPlaying()){this.pause()}else{this.play()}},stop:function(){var a=this;a.setCurrentTime(0);a.fireEvent("stop",a);a.pause()},updateVolume:function(a){this.media.dom.volume=a},updateMuted:function(a){this.fireEvent("mutedchange",this,a);this.media.dom.muted=a},getCurrentTime:function(){return this.media.dom.currentTime},setCurrentTime:function(a){this.media.dom.currentTime=a;return a},getDuration:function(){return this.media.dom.duration},destroy:function(){var a=this;Ext.Object.each(event,function(c,b){if(typeof b!=="function"){b=a[b]}if(typeof b=="function"){b=bind(b,a);dom.removeEventListener(c,b)}})}});Ext.define("Ext.Audio",{extend:"Ext.Media",xtype:"audio",config:{cls:Ext.baseCSSPrefix+"audio"},onActivate:function(){var a=this;a.callParent();if(Ext.os.is.Phone){a.element.show()}},onDeactivate:function(){var a=this;a.callParent();if(Ext.os.is.Phone){a.element.hide()}},template:[{reference:"media",preload:"auto",tag:"audio",cls:Ext.baseCSSPrefix+"component"}]});Ext.define("Ext.Spacer",{extend:"Ext.Component",alias:"widget.spacer",config:{},constructor:function(a){a=a||{};if(!a.width){a.flex=1}this.callParent([a])}});Ext.define("Ext.Title",{extend:"Ext.Component",xtype:"title",config:{baseCls:"x-title",title:""},updateTitle:function(a){this.setHtml(a)}});Ext.define("Ext.Video",{extend:"Ext.Media",xtype:"video",config:{posterUrl:null,cls:Ext.baseCSSPrefix+"video"},template:[{reference:"ghost",classList:[Ext.baseCSSPrefix+"video-ghost"]},{tag:"video",reference:"media",classList:[Ext.baseCSSPrefix+"media"]}],initialize:function(){var a=this;a.callParent();a.media.hide();a.onBefore({erased:"onErased",scope:a});a.ghost.on({tap:"onGhostTap",scope:a});a.media.on({pause:"onPause",scope:a});if(Ext.os.is.Android4||Ext.os.is.iPad){this.isInlineVideo=true}},applyUrl:function(a){return[].concat(a)},updateUrl:function(f){var c=this,e=c.media,g=f.length,d=e.query("source"),b=d.length,a;for(a=0;a<b;a++){Ext.fly(d[a]).destroy()}for(a=0;a<g;a++){e.appendChild(Ext.Element.create({tag:"source",src:f[a]}))}if(c.getPlaying()){c.play()}},onErased:function(){this.pause();this.media.setTop(-2000);this.ghost.show()},onGhostTap:function(){var a=this,c=this.media,b=this.ghost;c.show();if(Ext.os.is.Android2){setTimeout(function(){a.play();setTimeout(function(){c.hide()},10)},10)}else{b.hide();a.play();setTimeout(function(){a.play()},10)}},onPause:function(){this.callParent(arguments);if(!this.isInlineVideo){this.media.setTop(-2000);this.ghost.show()}},onPlay:function(){this.callParent(arguments);this.media.setTop(0)},updatePosterUrl:function(b){var a=this.ghost;if(a){a.setStyle("background-image","url("+b+")")}}});Ext.define("Ext.carousel.Indicator",{extend:"Ext.Component",xtype:"carouselindicator",alternateClassName:"Ext.Carousel.Indicator",config:{baseCls:Ext.baseCSSPrefix+"carousel-indicator",direction:"horizontal"},initialize:function(){this.callParent();this.indicators=[];this.element.on({tap:"onTap",scope:this})},updateDirection:function(a,c){var b=this.getBaseCls();this.element.replaceCls(c,a,b);if(a==="horizontal"){this.setBottom(0);this.setRight(null)}else{this.setRight(0);this.setBottom(null)}},addIndicator:function(){this.indicators.push(this.element.createChild({tag:"span"}))},removeIndicator:function(){var a=this.indicators;if(a.length>0){a.pop().destroy()}},setActiveIndex:function(b){var e=this.indicators,d=this.activeIndex,a=e[d],f=e[b],c=this.getBaseCls();if(a){a.removeCls(c,null,"active")}if(f){f.addCls(c,null,"active")}this.activeIndex=b;return this},onTap:function(f){var g=f.touch,a=this.element.getPageBox(),d=a.left+(a.width/2),b=a.top+(a.height/2),c=this.getDirection();if((c==="horizontal"&&g.pageX>=d)||(c==="vertical"&&g.pageY>=b)){this.fireEvent("next",this)}else{this.fireEvent("previous",this)}},destroy:function(){var d=this.indicators,b,c,a;for(b=0,c=d.length;b<c;b++){a=d[b];a.destroy()}d.length=0;this.callParent()}});Ext.define("Ext.carousel.Item",{extend:"Ext.Decorator",config:{baseCls:"x-carousel-item",component:null,translatable:true}});Ext.define("Ext.dataview.IndexBar",{extend:"Ext.Component",alternateClassName:"Ext.IndexBar",config:{baseCls:Ext.baseCSSPrefix+"indexbar",direction:"vertical",letters:["A","B","C","D","E","F","G","H","I","J","K","L","M","N","O","P","Q","R","S","T","U","V","W","X","Y","Z"],ui:"alphabet",listPrefix:null},itemCls:Ext.baseCSSPrefix+"",updateDirection:function(a,c){var b=this.getBaseCls();this.element.replaceCls(b+"-"+c,b+"-"+a)},getElementConfig:function(){return{reference:"wrapper",classList:["x-centered","x-indexbar-wrapper"],children:[this.callParent()]}},updateLetters:function(c){this.innerElement.setHtml("");if(c){var b=c.length,a;for(a=0;a<b;a++){this.innerElement.createChild({html:c[a]})}}},updateListPrefix:function(a){if(a&&a.length){this.innerElement.createChild({html:a},0)}},initialize:function(){this.callParent();this.innerElement.on({touchstart:this.onTouchStart,touchend:this.onTouchEnd,touchmove:this.onTouchMove,scope:this})},onTouchStart:function(b,a){b.stopPropagation();this.innerElement.addCls(this.getBaseCls()+"-pressed");this.pageBox=this.innerElement.getPageBox();this.onTouchMove(b)},onTouchEnd:function(b,a){this.innerElement.removeCls(this.getBaseCls()+"-pressed")},onTouchMove:function(c){var a=Ext.util.Point.fromEvent(c),b,d=this.pageBox;if(!d){d=this.pageBox=this.el.getPageBox()}if(this.getDirection()==="vertical"){if(a.y>d.bottom||a.y<d.top){return}b=Ext.Element.fromPoint(d.left+(d.width/2),a.y)}else{if(a.x>d.right||a.x<d.left){return}b=Ext.Element.fromPoint(a.x,d.top+(d.height/2))}if(b){this.fireEvent("index",this,b.dom.innerHTML,b)}},destroy:function(){var c=this,d=Array.prototype.slice.call(c.innerElement.dom.childNodes),b=d.length,a=0;for(;a<b;a++){Ext.removeNode(d[a])}this.callParent()}},function(){});Ext.define("Ext.dataview.ListItemHeader",{extend:"Ext.Component",xtype:"listitemheader",config:{baseCls:Ext.baseCSSPrefix+"list-header",docked:"top"}});Ext.define("Ext.dataview.element.Container",{extend:"Ext.Component",doInitialize:function(){this.element.on({touchstart:"onItemTouchStart",touchend:"onItemTouchEnd",tap:"onItemTap",taphold:"onItemTapHold",touchmove:"onItemTouchMove",doubletap:"onItemDoubleTap",swipe:"onItemSwipe",delegate:"> div",scope:this})},initialize:function(){this.callParent();this.doInitialize()},updateBaseCls:function(a,b){var c=this;c.callParent([a+"-container",b])},onItemTouchStart:function(d){var b=this,c=d.getTarget(),a=b.getViewItems().indexOf(c);Ext.get(c).on({touchmove:"onItemTouchMove",scope:b,single:true});b.fireEvent("itemtouchstart",b,Ext.get(c),a,d)},onItemTouchEnd:function(d){var b=this,c=d.getTarget(),a=b.getViewItems().indexOf(c);Ext.get(c).un({touchmove:"onItemTouchMove",scope:b});b.fireEvent("itemtouchend",b,Ext.get(c),a,d)},onItemTouchMove:function(d){var b=this,c=d.getTarget(),a=b.getViewItems().indexOf(c);b.fireEvent("itemtouchmove",b,Ext.get(c),a,d)},onItemTap:function(d){var b=this,c=d.getTarget(),a=b.getViewItems().indexOf(c);b.fireEvent("itemtap",b,Ext.get(c),a,d)},onItemTapHold:function(d){var b=this,c=d.getTarget(),a=b.getViewItems().indexOf(c);b.fireEvent("itemtaphold",b,Ext.get(c),a,d)},onItemDoubleTap:function(d){var b=this,c=d.getTarget(),a=b.getViewItems().indexOf(c);b.fireEvent("itemdoubletap",b,Ext.get(c),a,d)},onItemSwipe:function(d){var b=this,c=d.getTarget(),a=b.getViewItems().indexOf(c);b.fireEvent("itemswipe",b,Ext.get(c),a,d)},updateListItem:function(b,d){var c=this,a=c.dataview,e=a.prepareData(b.getData(true),a.getStore().indexOf(b),b);d.innerHTML=c.dataview.getItemTpl().apply(e)},addListItem:function(e,c){var h=this,d=h.dataview,a=d.prepareData(c.getData(true),d.getStore().indexOf(c),c),b=h.element,i=b.dom.childNodes,g=i.length,f;f=Ext.Element.create(this.getItemElementConfig(e,a));if(!g||e==g){f.appendTo(b)}else{f.insertBefore(i[e])}},getItemElementConfig:function(c,e){var b=this.dataview,d=b.getItemCls(),a=b.getBaseCls()+"-item";if(d){a+=" "+d}return{cls:a,html:b.getItemTpl().apply(e)}},doRemoveItemCls:function(a){var d=this.getViewItems(),c=d.length,b=0;for(;b<c;b++){Ext.fly(d[b]).removeCls(a)}},doAddItemCls:function(a){var d=this.getViewItems(),c=d.length,b=0;for(;b<c;b++){Ext.fly(d[b]).addCls(a)}},moveItemsToCache:function(f,e){var d=this,a=d.getViewItems(),b=e-f,c;for(;b>=0;b--){c=a[f+b];c.parentNode.removeChild(c)}if(d.getViewItems().length==0){this.dataview.showEmptyText()}},moveItemsFromCache:function(d){var g=this,b=g.dataview,c=b.getStore(),f=d.length,e,a;if(f){b.hideEmptyText()}for(e=0;e<f;e++){d[e]._tmpIndex=c.indexOf(d[e])}Ext.Array.sort(d,function(i,h){return i._tmpIndex>h._tmpIndex?1:-1});for(e=0;e<f;e++){a=d[e];g.addListItem(a._tmpIndex,a);delete a._tmpIndex}},getViewItems:function(){return Array.prototype.slice.call(this.element.dom.childNodes)},destroy:function(){var c=this.getViewItems(),b=c.length,a=0;for(;a<b;a++){Ext.removeNode(c[a])}this.callParent()}});Ext.define("Ext.dataview.element.List",{extend:"Ext.dataview.element.Container",updateBaseCls:function(a){var b=this;b.itemClsShortCache=a+"-item";b.headerClsShortCache=a+"-header";b.headerClsCache="."+b.headerClsShortCache;b.headerItemClsShortCache=a+"-header-item";b.footerClsShortCache=a+"-footer-item";b.footerClsCache="."+b.footerClsShortCache;b.labelClsShortCache=a+"-item-label";b.labelClsCache="."+b.labelClsShortCache;b.disclosureClsShortCache=a+"-disclosure";b.disclosureClsCache="."+b.disclosureClsShortCache;b.iconClsShortCache=a+"-icon";b.iconClsCache="."+b.iconClsShortCache;this.callParent(arguments)},hiddenDisplayCache:Ext.baseCSSPrefix+"hidden-display",getItemElementConfig:function(e,h){var f=this,c=f.dataview,g=c.getItemCls(),b=f.itemClsShortCache,d,a;if(g){b+=" "+g}d={cls:b,children:[{cls:f.labelClsShortCache,html:c.getItemTpl().apply(h)}]};if(c.getIcon()){a=h.iconSrc;d.children.push({cls:f.iconClsShortCache,style:"background-image: "+a?'url("'+newSrc+'")':""})}if(c.getOnItemDisclosure()){d.children.push({cls:f.disclosureClsShortCache+((h.disclosure===false)?f.hiddenDisplayCache:"")})}return d},updateListItem:function(b,j){var g=this,c=g.dataview,i=Ext.fly(j),f=i.down(g.labelClsCache,true),a=b.data,d=a&&a.hasOwnProperty("disclosure"),k=a&&a.hasOwnProperty("iconSrc"),e,h;f.innerHTML=c.getItemTpl().apply(a);if(d&&c.getOnItemDisclosure()){e=i.down(g.disclosureClsCache);e[d?"removeCls":"addCls"](g.hiddenDisplayCache)}if(c.getIcon()){h=i.down(g.iconClsCache,true);h.style.backgroundImage=k?'url("'+k+'")':""}},doRemoveHeaders:function(){var e=this,a=e.headerItemClsShortCache,b=e.element.query(e.headerClsCache),f=b.length,c=0,d;for(;c<f;c++){d=b[c];Ext.fly(d.parentNode).removeCls(a);Ext.removeNode(d)}},doRemoveFooterCls:function(){var d=this,c=d.footerClsShortCache,a=d.element.query(d.footerClsCache),e=a.length,b=0;for(;b<e;b++){Ext.fly(a[b]).removeCls(c)}},doAddHeader:function(b,a){b=Ext.fly(b);b.insertFirst(Ext.Element.create({cls:this.headerClsShortCache,html:a}));b.addCls(this.headerItemClsShortCache)},destroy:function(){this.doRemoveHeaders();this.callParent()}});Ext.define("Ext.event.publisher.ComponentDelegation",{extend:"Ext.event.publisher.Publisher",requires:["Ext.Component","Ext.ComponentQuery"],targetType:"component",optimizedSelectorRegex:/^#([\w\-]+)((?:[\s]*)>(?:[\s]*)|(?:\s*))([\w\-]+)$/i,handledEvents:["*"],getSubscribers:function(b,a){var d=this.subscribers,c=d[b];if(!c&&a){c=d[b]={type:{$length:0},selector:[],$length:0}}return c},subscribe:function(g,f){if(this.idSelectorRegex.test(g)){return false}var e=g.match(this.optimizedSelectorRegex),a=this.getSubscribers(f,true),k=a.type,c=a.selector,d,i,j,b,h;if(e!==null){d=e[1];i=e[2].indexOf(">")===-1;j=e[3];b=k[j];if(!b){k[j]=b={descendents:{$length:0},children:{$length:0},$length:0}}h=i?b.descendents:b.children;if(h.hasOwnProperty(d)){h[d]++;return true}h[d]=1;h.$length++;b.$length++;k.$length++}else{if(c.hasOwnProperty(g)){c[g]++;return true}c[g]=1;c.push(g)}a.$length++;return true},unsubscribe:function(g,f,k){var a=this.getSubscribers(f);if(!a){return false}var e=g.match(this.optimizedSelectorRegex),l=a.type,c=a.selector,d,i,j,b,h;k=Boolean(k);if(e!==null){d=e[1];i=e[2].indexOf(">")===-1;j=e[3];b=l[j];if(!b){return true}h=i?b.descendents:b.children;if(!h.hasOwnProperty(d)||(!k&&--h[d]>0)){return true}delete h[d];h.$length--;b.$length--;l.$length--}else{if(!c.hasOwnProperty(g)||(!k&&--c[g]>0)){return true}delete c[g];Ext.Array.remove(c,g)}if(--a.$length===0){delete this.subscribers[f]}return true},notify:function(d,a){var c=this.getSubscribers(a),e,b;if(!c||c.$length===0){return false}e=d.substr(1);b=Ext.ComponentManager.get(e);if(b){this.dispatcher.doAddListener(this.targetType,d,a,"publish",this,{args:[a,b]},"before")}},matchesSelector:function(b,a){return Ext.ComponentQuery.is(b,a)},dispatch:function(d,b,c,a){this.dispatcher.doDispatchEvent(this.targetType,d,b,c,null,a)},publish:function(g,k){var e=this.getSubscribers(g);if(!e){return}var p=arguments[arguments.length-1],o=e.type,b=e.selector,d=Array.prototype.slice.call(arguments,2,-2),l=k.xtypesChain,s,n,t,a,m,v,r,u,h,f,q,c;for(u=0,h=l.length;u<h;u++){f=l[u];e=o[f];if(e&&e.$length>0){s=e.descendents;if(s.$length>0){if(!a){a=k.getAncestorIds()}for(q=0,c=a.length;q<c;q++){m=a[q];if(s.hasOwnProperty(m)){this.dispatch("#"+m+" "+f,g,d,p)}}}n=e.children;if(n.$length>0){if(!t){if(a){t=a[0]}else{v=k.getParent();if(v){t=v.getId()}}}if(t){if(n.hasOwnProperty(t)){this.dispatch("#"+t+" > "+f,g,d,p)}}}}}h=b.length;if(h>0){for(u=0;u<h;u++){r=b[u];if(this.matchesSelector(k,r)){this.dispatch(r,g,d,p)}}}}});Ext.define("Ext.field.Input",{extend:"Ext.Component",xtype:"input",tag:"input",cachedConfig:{cls:Ext.baseCSSPrefix+"form-field",focusCls:Ext.baseCSSPrefix+"field-focus",maskCls:Ext.baseCSSPrefix+"field-mask",useMask:"auto",type:"text",checked:false},config:{baseCls:Ext.baseCSSPrefix+"field-input",name:null,value:null,isFocused:false,tabIndex:null,placeHolder:null,minValue:null,maxValue:null,stepValue:null,maxLength:null,autoComplete:null,autoCapitalize:null,autoCorrect:null,readOnly:null,maxRows:null,startValue:false},getTemplate:function(){var a=[{reference:"input",tag:this.tag},{reference:"clearIcon",cls:"x-clear-icon"}];a.push({reference:"mask",classList:[this.config.maskCls]});return a},initElement:function(){var a=this;a.callParent();a.input.on({scope:a,keyup:"onKeyUp",focus:"onFocus",blur:"onBlur",paste:"onPaste"});a.mask.on({tap:"onMaskTap",scope:a});if(a.clearIcon){a.clearIcon.on({tap:"onClearIconTap",scope:a})}},applyUseMask:function(a){if(a==="auto"){a=Ext.os.is.iOS&&Ext.os.version.lt("5")}return Boolean(a)},updateUseMask:function(a){this.mask[a?"show":"hide"]()},updateFieldAttribute:function(b,c){var a=this.input;if(c){a.dom.setAttribute(b,c)}else{a.dom.removeAttribute(b)}},updateCls:function(b,a){this.input.addCls(Ext.baseCSSPrefix+"input-el");this.input.replaceCls(a,b)},updateType:function(a,c){var b=Ext.baseCSSPrefix+"input-";this.input.replaceCls(b+c,b+a);this.updateFieldAttribute("type",a)},updateName:function(a){this.updateFieldAttribute("name",a)},getValue:function(){var a=this.input;if(a){this._value=a.dom.value}return this._value},applyValue:function(a){return(Ext.isEmpty(a))?"":a},updateValue:function(b){var a=this.input;if(a){a.dom.value=b}},setValue:function(a){this.updateValue(this.applyValue(a));return this},updateTabIndex:function(a){this.updateFieldAttribute("tabIndex",a)},testAutoFn:function(a){return[true,"on"].indexOf(a)!==-1},updateMaxLength:function(a){this.updateFieldAttribute("maxlength",a)},updatePlaceHolder:function(a){this.updateFieldAttribute("placeholder",a)},applyAutoComplete:function(a){return this.testAutoFn(a)},updateAutoComplete:function(a){var b=a?"on":"off";this.updateFieldAttribute("autocomplete",b)},applyAutoCapitalize:function(a){return this.testAutoFn(a)},updateAutoCapitalize:function(b){var a=b?"on":"off";this.updateFieldAttribute("autocapitalize",a)},applyAutoCorrect:function(a){return this.testAutoFn(a)},updateAutoCorrect:function(a){var b=a?"on":"off";this.updateFieldAttribute("autocorrect",b)},updateMinValue:function(a){this.updateFieldAttribute("min",a)},updateMaxValue:function(a){this.updateFieldAttribute("max",a)},updateStepValue:function(a){this.updateFieldAttribute("step",a)},checkedRe:/^(true|1|on)/i,getChecked:function(){var a=this.input,b;if(a){b=a.dom.checked;this._checked=b}return b},applyChecked:function(a){return !!this.checkedRe.test(String(a))},setChecked:function(a){this.updateChecked(this.applyChecked(a));this._checked=a},updateChecked:function(a){this.input.dom.checked=a},updateReadOnly:function(a){this.updateFieldAttribute("readonly",a)},updateMaxRows:function(a){this.updateFieldAttribute("rows",a)},doSetDisabled:function(a){this.callParent(arguments);this.input.dom.disabled=a;if(!a){this.blur()}},isDirty:function(){if(this.getDisabled()){return false}return String(this.getValue())!==String(this.originalValue)},reset:function(){this.setValue(this.originalValue)},onMaskTap:function(a){this.fireAction("masktap",[this,a],"doMaskTap")},doMaskTap:function(a,b){if(a.getDisabled()){return false}a.maskCorrectionTimer=Ext.defer(a.showMask,1000,a);a.hideMask()},showMask:function(a){if(this.mask){this.mask.setStyle("display","block")}},hideMask:function(a){if(this.mask){this.mask.setStyle("display","none")}},focus:function(){var b=this,a=b.input;if(a&&a.dom.focus){a.dom.focus()}return b},blur:function(){var b=this,a=this.input;if(a&&a.dom.blur){a.dom.blur()}return b},select:function(){var b=this,a=b.input;if(a&&a.dom.setSelectionRange){a.dom.setSelectionRange(0,9999)}return b},onFocus:function(a){this.fireAction("focus",[a],"doFocus")},doFocus:function(b){var a=this;if(a.mask){if(a.maskCorrectionTimer){clearTimeout(a.maskCorrectionTimer)}a.hideMask()}if(!a.getIsFocused()){a.setIsFocused(true);a.setStartValue(a.getValue())}},onBlur:function(a){this.fireAction("blur",[a],"doBlur")},doBlur:function(d){var b=this,c=b.getValue(),a=b.getStartValue();b.setIsFocused(false);if(String(c)!=String(a)){b.onChange(b,c,a)}b.showMask()},onClearIconTap:function(c){var a=this.getValue(),b;this.fireEvent("clearicontap",this,c);b=this.getValue();if(String(b)!=String(a)){this.onChange(this,b,a)}if(Ext.os.is.Android){this.focus()}},onClick:function(a){this.fireEvent("click",a)},onChange:function(b,c,a){this.fireEvent("change",b,c,a)},onKeyUp:function(a){this.fireEvent("keyup",a)},onPaste:function(a){this.fireEvent("paste",a)},onMouseDown:function(a){this.fireEvent("mousedown",a)}});Ext.define("Ext.field.Field",{extend:"Ext.Decorator",alternateClassName:"Ext.form.Field",xtype:"field",requires:["Ext.field.Input"],isField:true,isFormField:true,config:{baseCls:Ext.baseCSSPrefix+"field",label:null,labelAlign:"left",labelWidth:"30%",clearIcon:null,required:false,inputType:null,name:null,value:null,tabIndex:null},cachedConfig:{labelCls:null,requiredCls:Ext.baseCSSPrefix+"field-required",inputCls:null},getElementConfig:function(){var a=Ext.baseCSSPrefix;return{reference:"element",className:"x-container",children:[{reference:"label",cls:a+"form-label",children:[{reference:"labelspan",tag:"span"}]},{reference:"innerElement",cls:a+"component-outer"}]}},updateLabel:function(b,d){var a=this.renderElement,c=Ext.baseCSSPrefix;if(b){this.labelspan.setHtml(b);a.addCls(c+"field-labeled")}else{a.removeCls(c+"field-labeled")}},updateLabelAlign:function(b,c){var a=this.renderElement,d=Ext.baseCSSPrefix;if(b){a.addCls(d+"label-align-"+b);if(b=="top"){this.label.setWidth("100%")}else{this.updateLabelWidth(this.getLabelWidth())}}if(c){a.removeCls(d+"label-align-"+c)}},updateLabelCls:function(a,b){if(a){this.label.addCls(a)}if(b){this.label.removeCls(b)}},updateLabelWidth:function(a){if(a){if(this.getLabelAlign()=="top"){this.label.setWidth("100%")}else{this.label.setWidth(a)}}},updateRequired:function(a){this.renderElement[a?"addCls":"removeCls"](this.getRequiredCls())},updateRequiredCls:function(a,b){if(this.getRequired()){this.renderElement.replaceCls(b,a)}},initialize:function(){var a=this;a.callParent();a.doInitValue()},doInitValue:function(){this.originalValue=this.getInitialConfig().value},reset:function(){this.setValue(this.originalValue);return this},isDirty:function(){return false}},function(){});Ext.define("Ext.field.Checkbox",{extend:"Ext.field.Field",alternateClassName:"Ext.form.Checkbox",xtype:"checkboxfield",qsaLeftRe:/[\[]/g,qsaRightRe:/[\]]/g,isCheckbox:true,config:{ui:"checkbox",value:"",checked:false,tabIndex:-1,component:{xtype:"input",type:"checkbox",useMask:true,cls:Ext.baseCSSPrefix+"input-checkbox"}},initialize:function(){var a=this;a.callParent();a.getComponent().on({scope:a,order:"before",masktap:"onMaskTap"})},doInitValue:function(){var a=this,b=a.getInitialConfig();if(b.hasOwnProperty("value")){a.originalState=b.value}if(b.hasOwnProperty("checked")){a.originalState=b.checked}a.callParent(arguments)},updateInputType:function(a){var b=this.getComponent();if(b){b.setType(a)}},updateName:function(a){var b=this.getComponent();if(b){b.setName(a)}},getChecked:function(){this._checked=this.getComponent().getChecked();return this._checked},getValue:function(){return this.getChecked()},setValue:function(a){return this.setChecked(a)},setChecked:function(a){this.updateChecked(a);this._checked=a},updateChecked:function(a){this.getComponent().setChecked(a)},onMaskTap:function(a,c){var b=this,d=a.input.dom;if(b.getDisabled()){return false}d.checked=!d.checked;if(b.getChecked()){b.fireEvent("check",b,c)}else{b.fireEvent("uncheck",b,c)}return false},doChecked:Ext.emptyFn,doUnChecked:Ext.emptyFn,isChecked:function(){return this.getChecked()},check:function(){return this.setChecked(true)},uncheck:function(){return this.setChecked(false)},getSameGroupFields:function(){var j=this.up("formpanel")||this.up("fieldset"),b=this.getName(),g=this.qsaLeftRe,c=this.qsaRightRe,f=[],a,d,e,h;if(!j){return null}b=b.replace(g,"\\[");b=b.replace(c,"\\]");a=Ext.query("[name="+b+"]",j.element.dom);h=a.length;for(e=0;e<h;e++){d=a[e];d=Ext.fly(d).up(".x-field-"+d.getAttribute("type"));if(d&&d.id){f.push(Ext.getCmp(d.id))}}return f},getGroupValues:function(){var a=[];this.getSameGroupFields().forEach(function(b){if(b.getChecked()){a.push(b.getValue())}});return a},setGroupValues:function(a){this.getSameGroupFields().forEach(function(b){b.setChecked((a.indexOf(b.getValue())!==-1))});return this},resetGroupValues:function(){this.getSameGroupFields().forEach(function(a){a.setChecked(a.originalState)});return this},reset:function(){this.setChecked(this.originalState);return this}});Ext.define("Ext.field.Hidden",{extend:"Ext.field.Field",alternateClassName:"Ext.form.Hidden",xtype:"hiddenfield",config:{component:{xtype:"input",type:"hidden"},ui:"hidden",hidden:true,tabIndex:-1}});Ext.define("Ext.field.Radio",{extend:"Ext.field.Checkbox",xtype:"radiofield",alternateClassName:"Ext.form.Radio",isRadio:true,config:{ui:"radio",component:{type:"radio",cls:Ext.baseCSSPrefix+"input-radio"}},getValue:function(){return this._value},setValue:function(a){this._value=a;return this},getGroupValue:function(){var a=this.getSameGroupFields(),c=a.length,b=0,d;for(;b<c;b++){d=a[b];if(d.getChecked()){return d.getValue()}}return null},setGroupValue:function(d){var a=this.getSameGroupFields(),c=a.length,b=0,e;for(;b<c;b++){e=a[b];if(e.getValue()===d){e.setChecked(true);return e}}}});Ext.define("Ext.field.Text",{extend:"Ext.field.Field",xtype:"textfield",alternateClassName:"Ext.form.Text",config:{ui:"text",clearIcon:true,placeHolder:null,maxLength:null,autoComplete:null,autoCapitalize:null,autoCorrect:null,readOnly:null,component:{xtype:"input",type:"text"}},initialize:function(){var a=this;a.callParent();a.getComponent().on({scope:this,keyup:"onKeyUp",change:"onChange",focus:"onFocus",blur:"onBlur",paste:"onPaste",mousedown:"onMouseDown",clearicontap:"onClearIconTap"});a.originalValue=a.originalValue||"";a.getComponent().originalValue=a.originalValue;a.syncEmptyCls()},syncEmptyCls:function(){var b=(this._value)?this._value.length:false,a=Ext.baseCSSPrefix+"empty";if(b){this.removeCls(a)}else{this.addCls(a)}},updateValue:function(b){var a=this.getComponent();if(a){a.setValue(b)}this[b?"showClearIcon":"hideClearIcon"]();this.syncEmptyCls()},getValue:function(){var a=this;a._value=a.getComponent().getValue();a.syncEmptyCls();return a._value},updatePlaceHolder:function(a){this.getComponent().setPlaceHolder(a)},updateMaxLength:function(a){this.getComponent().setMaxLength(a)},updateAutoComplete:function(a){this.getComponent().setAutoComplete(a)},updateAutoCapitalize:function(a){this.getComponent().setAutoCapitalize(a)},updateAutoCorrect:function(a){this.getComponent().setAutoCorrect(a)},updateReadOnly:function(a){if(a){this.hideClearIcon()}else{this.showClearIcon()}this.getComponent().setReadOnly(a)},updateInputType:function(a){var b=this.getComponent();if(b){b.setType(a)}},updateName:function(a){var b=this.getComponent();if(b){b.setName(a)}},updateTabIndex:function(b){var a=this.getComponent();if(a){a.setTabIndex(b)}},updateInputCls:function(a,b){var c=this.getComponent();if(c){c.replaceCls(b,a)}},doSetDisabled:function(b){var c=this;c.callParent(arguments);var a=c.getComponent();if(a){a.setDisabled(b)}if(b){c.hideClearIcon()}else{c.showClearIcon()}},showClearIcon:function(){var a=this;if(!a.getDisabled()&&!a.getReadOnly()&&a.getValue()&&a.getClearIcon()){a.element.addCls(Ext.baseCSSPrefix+"field-clearable")}return a},hideClearIcon:function(){if(this.getClearIcon()){this.element.removeCls(Ext.baseCSSPrefix+"field-clearable")}},onKeyUp:function(a){this.fireAction("keyup",[this,a],"doKeyUp")},doKeyUp:function(a,c){var b=a.getValue();a[b?"showClearIcon":"hideClearIcon"]();if(c.browserEvent.keyCode===13){a.fireAction("action",[a,c],"doAction")}},doAction:function(){this.blur()},onClearIconTap:function(a){this.fireAction("clearicontap",[this,a],"doClearIconTap")},doClearIconTap:function(a,b){a.setValue("");a.getValue()},onChange:function(b,c,a){b.fireEvent("change",this,c,a)},onFocus:function(a){this.isFocused=true;this.fireEvent("focus",this,a)},onBlur:function(b){var a=this;this.isFocused=false;a.fireEvent("blur",a,b);setTimeout(function(){a.isFocused=false},50)},onPaste:function(a){this.fireEvent("paste",this,a)},onMouseDown:function(a){this.fireEvent("mousedown",this,a)},focus:function(){this.getComponent().focus();return this},blur:function(){this.getComponent().blur();return this},select:function(){this.getComponent().select();return this},reset:function(){this.getComponent().reset();this.getValue();this[this._value?"showClearIcon":"hideClearIcon"]()},isDirty:function(){var a=this.getComponent();if(a){return a.isDirty()}return false}});Ext.define("Ext.field.Email",{extend:"Ext.field.Text",alternateClassName:"Ext.form.Email",xtype:"emailfield",config:{component:{type:"email"},autoCapitalize:false}});Ext.define("Ext.field.Number",{extend:"Ext.field.Text",xtype:"numberfield",alternateClassName:"Ext.form.Number",config:{component:{type:"number"},ui:"number"},proxyConfig:{minValue:null,maxValue:null,stepValue:null},applyValue:function(b){var a=this.getMinValue(),c=this.getMaxValue();if(Ext.isNumber(a)){b=Math.max(b,a)}if(Ext.isNumber(c)){b=Math.min(b,c)}return parseFloat(b)},getValue:function(){var a=this.callParent();return parseFloat(a||0)},doClearIconTap:function(a,b){a.setValue(0)}});Ext.define("Ext.field.Password",{extend:"Ext.field.Text",xtype:"passwordfield",alternateClassName:"Ext.form.Password",config:{autoCapitalize:false,component:{type:"password"}}});Ext.define("Ext.field.Search",{extend:"Ext.field.Text",xtype:"searchfield",alternateClassName:"Ext.form.Search",config:{component:{type:"search"},ui:"search"}});Ext.define("Ext.field.Spinner",{extend:"Ext.field.Number",xtype:"spinnerfield",alternateClassName:"Ext.form.Spinner",requires:["Ext.util.TapRepeater"],config:{cls:Ext.baseCSSPrefix+"spinner",minValue:Number.NEGATIVE_INFINITY,maxValue:Number.MAX_VALUE,increment:0.1,accelerateOnTapHold:true,cycle:false,clearIcon:false,defaultValue:0,tabIndex:-1,component:{disabled:true}},constructor:function(){this.callParent(arguments);if(!this.getValue()){this.setValue(this.getDefaultValue())}},syncEmptyCls:Ext.emptyFn,updateComponent:function(c){this.callParent(arguments);var b=this.innerElement,a=this.getCls();if(c){this.spinDownButton=Ext.Element.create({cls:a+"-button "+a+"-button-down",html:"-"});b.insertFirst(this.spinDownButton);this.spinUpButton=Ext.Element.create({cls:a+"-button "+a+"-button-up",html:"+"});b.appendChild(this.spinUpButton);this.downRepeater=this.createRepeater(this.spinDownButton,this.onSpinDown);this.upRepeater=this.createRepeater(this.spinUpButton,this.onSpinUp)}},applyValue:function(a){a=parseFloat(a);if(isNaN(a)||a===null){a=this.getDefaultValue()}a=Math.round(a*10)/10;return this.callParent([a])},createRepeater:function(c,b){var d=this,a=Ext.create("Ext.util.TapRepeater",{el:c,accelerate:d.getAccelerateOnTapHold()});a.on({tap:b,touchstart:"onTouchStart",touchend:"onTouchEnd",scope:d});return a},onSpinDown:function(){if(!this.getDisabled()){this.spin(true)}},onSpinUp:function(){if(!this.getDisabled()){this.spin(false)}},onTouchStart:function(a){if(!this.getDisabled()){a.getEl().addCls(Ext.baseCSSPrefix+"button-pressed")}},onTouchEnd:function(a){a.getEl().removeCls(Ext.baseCSSPrefix+"button-pressed")},spin:function(h){var c=this,b=c.getValue(),a=c.getIncrement(),g=h?"down":"up",e=c.getMinValue(),f=c.getMaxValue(),d;if(h){d=b-a}else{d=b+a}if(c.getCycle()){if(b==e&&d<e){d=f}if(b==f&&d>f){d=e}}c.setValue(d);d=c.getValue();c.fireEvent("spin",c,d,g);c.fireEvent("spin"+g,c,d)},doSetDisabled:function(a){Ext.Component.prototype.doSetDisabled.apply(this,arguments)},setDisabled:function(){Ext.Component.prototype.setDisabled.apply(this,arguments)},reset:function(){this.setValue(this.getDefaultValue())},destroy:function(){var a=this;Ext.destroy(a.downRepeater,a.upRepeater,a.spinDownButton,a.spinUpButton);a.callParent(arguments)}},function(){});Ext.define("Ext.field.TextAreaInput",{extend:"Ext.field.Input",xtype:"textareainput",tag:"textarea"});Ext.define("Ext.field.TextArea",{extend:"Ext.field.Text",xtype:"textareafield",requires:["Ext.field.TextAreaInput"],alternateClassName:"Ext.form.TextArea",config:{ui:"textarea",autoCapitalize:false,component:{xtype:"textareainput"},maxRows:null},updateMaxRows:function(a){this.getComponent().setMaxRows(a)},doSetHeight:function(a){this.callParent(arguments);var b=this.getComponent();b.input.setHeight(a)},doSetWidth:function(b){this.callParent(arguments);var a=this.getComponent();a.input.setWidth(b)},doKeyUp:function(a){var b=a.getValue();a[b?"showClearIcon":"hideClearIcon"]()}});Ext.define("Ext.field.Url",{extend:"Ext.field.Text",xtype:"urlfield",alternateClassName:"Ext.form.Url",config:{autoCapitalize:false,component:{type:"url"}}});Ext.define("Ext.plugin.ListPaging",{extend:"Ext.Component",alias:"plugin.listpaging",config:{autoPaging:false,loadMoreText:"Load More...",noMoreRecordsText:"No More Records",loadTpl:['<div class="{cssPrefix}loading-spinner" style="font-size: 180%; margin: 10px auto;">','<span class="{cssPrefix}loading-top"></span>','<span class="{cssPrefix}loading-right"></span>','<span class="{cssPrefix}loading-bottom"></span>','<span class="{cssPrefix}loading-left"></span>',"</div>",'<div class="{cssPrefix}list-paging-msg">{message}</div>'].join(""),loadMoreCmp:{xtype:"component",baseCls:Ext.baseCSSPrefix+"list-paging"},loadMoreCmpAdded:false,loadingCls:Ext.baseCSSPrefix+"loading",list:null,scroller:null,loading:false},init:function(c){var a=c.getScrollable().getScroller(),b=c.getStore();this.setList(c);this.setScroller(a);this.bindStore(c.getStore());if(b){this.disableDataViewMask(b)}c.updateStore=Ext.Function.createInterceptor(c.updateStore,this.bindStore,this);if(this.getAutoPaging()){a.on({scrollend:this.onScrollEnd,scope:this})}},bindStore:function(a,b){if(b){b.un({load:this.onStoreLoad,beforeload:this.onStoreBeforeLoad,scope:this})}if(a){a.on({load:this.onStoreLoad,beforeload:this.onStoreBeforeLoad,scope:this})}},disableDataViewMask:function(a){var b=this.getList();if(a.isAutoLoading()){b.setLoadingText(null)}else{a.on({load:{single:true,fn:function(){b.setLoadingText(null)}}})}},applyLoadTpl:function(a){return(Ext.isObject(a)&&a.isTemplate)?a:new Ext.XTemplate(a)},applyLoadMoreCmp:function(a){a=Ext.merge(a,{html:this.getLoadTpl().apply({cssPrefix:Ext.baseCSSPrefix,message:this.getLoadMoreText()}),listeners:{tap:{fn:this.loadNextPage,scope:this,element:"element"}}});return Ext.factory(a,Ext.Component,this.getLoadMoreCmp())},onScrollEnd:function(b,a,c){if(!this.getLoading()&&c>=b.maxPosition.y){if(!this.storeFullyLoaded()){this.loadNextPage()}}},updateLoading:function(a){var b=this.getLoadMoreCmp(),c=this.getLoadingCls();if(a){b.addCls(c)}else{b.removeCls(c)}},onStoreBeforeLoad:function(a){if(a.getCount()===0){this.getLoadMoreCmp().hide()}},onStoreLoad:function(a){var d=this.addLoadMoreCmp(),b=this.getLoadTpl(),c=this.storeFullyLoaded()?this.getNoMoreRecordsText():this.getLoadMoreText();this.getLoadMoreCmp().show();this.setLoading(false);if(this.scrollY){this.getScroller().scrollTo(null,this.scrollY);delete this.scrollY}d.setHtml(b.apply({cssPrefix:Ext.baseCSSPrefix,message:c}))},addLoadMoreCmp:function(){var b=this.getList(),a=this.getLoadMoreCmp();if(!this.getLoadMoreCmpAdded()){b.add(a);this.setLoadMoreCmpAdded(true)}return a},storeFullyLoaded:function(){var a=this.getList().getStore(),b=a.getTotalCount();return b!==null?a.getTotalCount()<=(a.currentPage*a.getPageSize()):false},loadNextPage:function(){var a=this.getList().getStore();this.setLoading(true);this.scrollY=this.getScroller().position.y;a.nextPage({addRecords:true})}});Ext.define("Ext.plugin.PullRefresh",{extend:"Ext.Component",alias:"plugin.pullrefresh",requires:["Ext.DateExtras"],config:{list:null,pullRefreshText:"Pull down to refresh...",releaseRefreshText:"Release to refresh...",loadingText:"Loading...",snappingAnimationDuration:150,refreshFn:null,pullTpl:['<div class="x-list-pullrefresh">','<div class="x-list-pullrefresh-arrow"></div>','<div class="x-loading-spinner">','<span class="x-loading-top"></span>','<span class="x-loading-right"></span>','<span class="x-loading-bottom"></span>','<span class="x-loading-left"></span>',"</div>",'<div class="x-list-pullrefresh-wrap">','<h3 class="x-list-pullrefresh-message">{message}</h3>','<div class="x-list-pullrefresh-updated">Last Updated: <span>{lastUpdated:date("m/d/Y h:iA")}</span></div>',"</div>","</div>"].join("")},isRefreshing:false,currentViewState:"",initialize:function(){this.callParent();this.on({painted:"onPainted",scope:this})},init:function(f){var d=this,b=f.getStore(),e=d.getPullTpl(),c=d.element,a=f.getScrollable().getScroller();d.setList(f);d.lastUpdated=new Date();f.insert(0,d);if(b){if(b.isAutoLoading()){f.setLoadingText(null)}else{b.on({load:{single:true,fn:function(){f.setLoadingText(null)}}})}}e.overwrite(c,{message:d.getPullRefreshText(),lastUpdated:d.lastUpdated},true);d.loadingElement=c.getFirstChild();d.messageEl=c.down(".x-list-pullrefresh-message");d.updatedEl=c.down(".x-list-pullrefresh-updated > span");d.maxScroller=a.getMaxPosition();a.on({maxpositionchange:d.setMaxScroller,scroll:d.onScrollChange,scope:d})},fetchLatest:function(){var b=this.getList().getStore(),c=b.getProxy(),a;a=Ext.create("Ext.data.Operation",{page:1,start:0,model:b.getModel(),limit:b.getPageSize(),action:"read",filters:b.getRemoteFilter()?b.getFilters():[]});c.read(a,this.onLatestFetched,this)},onLatestFetched:function(d){var j=this.getList().getStore(),b=j.getData(),c=d.getRecords(),a=c.length,g=[],h,f,e;for(e=0;e<a;e++){h=c[e];f=b.getByKey(h.getId());if(f){f.set(h.getData())}else{g.push(h)}f=undefined}j.insert(0,g)},onPainted:function(){this.pullHeight=this.loadingElement.getHeight()},setMaxScroller:function(b,a){this.maxScroller=a},onScrollChange:function(b,a,c){if(c<0){this.onBounceTop(c)}if(c>this.maxScroller.y){this.onBounceBottom(c)}},applyPullTpl:function(a){return(Ext.isObject(a)&&a.isTemplate)?a:new Ext.XTemplate(a)},onBounceTop:function(d){var b=this,c=b.getList(),a=c.getScrollable().getScroller();if(!b.isReleased){if(!b.isRefreshing&&-d>=b.pullHeight+10){b.isRefreshing=true;b.setViewState("release");a.getContainer().onBefore({dragend:"onScrollerDragEnd",single:true,scope:b})}else{if(b.isRefreshing&&-d<b.pullHeight+10){b.isRefreshing=false;b.setViewState("pull")}}}},onScrollerDragEnd:function(){var b=this;if(b.isRefreshing){var c=b.getList(),a=c.getScrollable().getScroller();a.minPosition.y=-b.pullHeight;a.on({scrollend:"loadStore",single:true,scope:b});b.isReleased=true}},loadStore:function(){var b=this,c=b.getList(),a=c.getScrollable().getScroller();b.setViewState("loading");b.isReleased=false;Ext.defer(function(){a.on({scrollend:function(){if(b.getRefreshFn()){b.getRefreshFn().call(b,b)}else{b.fetchLatest()}b.resetRefreshState()},delay:100,single:true,scope:b});a.minPosition.y=0;a.scrollTo(null,0,true)},500,b)},onBounceBottom:Ext.emptyFn,setViewState:function(d){var b=this,c=Ext.baseCSSPrefix,e=b.messageEl,a=b.loadingElement;if(d===b.currentViewState){return b}b.currentViewState=d;if(e&&a){switch(d){case"pull":e.setHtml(b.getPullRefreshText());a.removeCls([c+"list-pullrefresh-release",c+"list-pullrefresh-loading"]);break;case"release":e.setHtml(b.getReleaseRefreshText());a.addCls(c+"list-pullrefresh-release");break;case"loading":e.setHtml(b.getLoadingText());a.addCls(c+"list-pullrefresh-loading");break}}return b},resetRefreshState:function(){var a=this;a.isRefreshing=false;a.lastUpdated=new Date();a.setViewState("pull");a.updatedEl.setHtml(Ext.util.Format.date(a.lastUpdated,"m/d/Y h:iA"))}});Ext.define("Ext.scroll.indicator.Abstract",{extend:"Ext.Component",config:{baseCls:"x-scroll-indicator",axis:"x",value:0,length:null,hidden:true,ui:"dark"},cachedConfig:{ratio:1,barCls:"x-scroll-bar",active:true},barElement:null,barLength:0,gapLength:0,getElementConfig:function(){return{reference:"barElement",children:[this.callParent()]}},applyRatio:function(a){if(isNaN(a)){a=1}return a},refresh:function(){var f=this.barElement,e=f.dom,c=this.getRatio(),b=this.getAxis(),a=(b==="x")?e.offsetWidth:e.offsetHeight,d=a*c;this.barLength=a;this.gapLength=a-d;this.setLength(d);this.updateValue(this.getValue())},updateBarCls:function(a){this.barElement.addCls(a)},updateAxis:function(a){this.element.addCls(this.getBaseCls(),null,a);this.barElement.addCls(this.getBarCls(),null,a)},updateValue:function(a){this.setOffset(this.gapLength*a)},updateActive:function(a){this.barElement[a?"addCls":"removeCls"]("active")},doSetHidden:function(a){var b=this.element.dom.style;if(a){b.opacity="0"}else{b.opacity=""}},updateLength:function(c){var b=this.getAxis(),a=this.element;if(b==="x"){a.setWidth(c)}else{a.setHeight(c)}},setOffset:function(c){var b=this.getAxis(),a=this.element;if(b==="x"){a.setLeft(c)}else{a.setTop(c)}}});Ext.define("Ext.scroll.indicator.CssTransform",{extend:"Ext.scroll.indicator.Abstract",config:{cls:"csstransform"},getElementConfig:function(){var a=this.callParent();a.children[0].children=[{reference:"startElement"},{reference:"middleElement"},{reference:"endElement"}];return a},refresh:function(){var d=this.getAxis(),c=this.startElement.dom,a=this.endElement.dom,e=this.middleElement,b,f;if(d==="x"){b=c.offsetWidth;f=a.offsetWidth;e.setLeft(b)}else{b=c.offsetHeight;f=a.offsetHeight;e.setTop(b)}this.startElementLength=b;this.endElementLength=f;this.minLength=b+f;this.callParent()},applyLength:function(a){return Math.round(Math.max(this.minLength,a))},updateLength:function(c){var b=this.getAxis(),a=this.endElement.dom.style,e=this.middleElement.dom.style,d=this.endElementLength,g=c-d,f=g-this.startElementLength;if(b==="x"){a.webkitTransform="translate3d("+g+"px, 0, 0)";e.webkitTransform="translate3d(0, 0, 0) scaleX("+f+")"}else{a.webkitTransform="translate3d(0, "+g+"px, 0)";e.webkitTransform="translate3d(0, 0, 0) scaleY("+f+")"}},updateValue:function(f){var b=this.barLength,c=this.gapLength,d=this.getLength(),e,g,a;if(f<=0){g=0;this.updateLength(this.applyLength(d+f*b))}else{if(f>=1){a=Math.round((f-1)*b);e=this.applyLength(d-a);a=d-e;this.updateLength(e);g=c+a}else{g=c*f}}this.setOffset(g)},setOffset:function(c){var a=this.getAxis(),b=this.element.dom.style;c=Math.round(c);if(a==="x"){b.webkitTransform="translate3d("+c+"px, 0, 0)"}else{b.webkitTransform="translate3d(0, "+c+"px, 0)"}}});Ext.define("Ext.scroll.indicator.Default",{extend:"Ext.scroll.indicator.Abstract",config:{cls:"default"},setOffset:function(c){var b=this.getAxis(),a=this.element.dom.style;if(b==="x"){a.webkitTransform="translate3d("+c+"px, 0, 0)"}else{a.webkitTransform="translate3d(0, "+c+"px, 0)"}},applyLength:function(a){return Math.round(Math.max(0,a))},updateValue:function(f){var b=this.barLength,c=this.gapLength,d=this.getLength(),e,g,a;if(f<=0){g=0;this.updateLength(this.applyLength(d+f*b))}else{if(f>=1){a=Math.round((f-1)*b);e=this.applyLength(d-a);a=d-e;this.updateLength(e);g=c+a}else{g=c*f}}this.setOffset(g)}});Ext.define("Ext.scroll.indicator.ScrollPosition",{extend:"Ext.scroll.indicator.Abstract",config:{cls:"scrollposition"},getElementConfig:function(){var a=this.callParent(arguments);a.children.unshift({className:"x-scroll-bar-stretcher"});return a},updateValue:function(a){if(this.gapLength===0){if(a>1){a=a-1}this.setOffset(this.barLength*a)}else{this.setOffset(this.gapLength*a)}},setLength:function(e){var c=this.getAxis(),a=this.barLength,d=this.barElement.dom,b=this.element;this.callParent(arguments);if(c==="x"){d.scrollLeft=a;b.setLeft(a)}else{d.scrollTop=a;b.setTop(a)}},setOffset:function(d){var b=this.getAxis(),a=this.barLength,c=this.barElement.dom;d=a-d;if(b==="x"){c.scrollLeft=d}else{c.scrollTop=d}}});Ext.define("Ext.scroll.Indicator",{requires:["Ext.scroll.indicator.Default","Ext.scroll.indicator.ScrollPosition","Ext.scroll.indicator.CssTransform"],alternateClassName:"Ext.util.Indicator",constructor:function(a){if(Ext.os.is.Android2||Ext.browser.is.ChromeMobile){return new Ext.scroll.indicator.ScrollPosition(a)}else{if(Ext.os.is.iOS){return new Ext.scroll.indicator.CssTransform(a)}else{return new Ext.scroll.indicator.Default(a)}}}});Ext.define("Ext.scroll.View",{extend:"Ext.Evented",alternateClassName:"Ext.util.ScrollView",requires:["Ext.scroll.Scroller","Ext.scroll.Indicator"],config:{indicatorsUi:"dark",element:null,scroller:{},indicators:{x:{axis:"x"},y:{axis:"y"}},indicatorsHidingDelay:100,cls:Ext.baseCSSPrefix+"scroll-view"},processConfig:function(c){if(!c){return null}if(typeof c=="string"){c={direction:c}}c=Ext.merge({},c);var a=c.scroller,b;if(!a){c.scroller=a={}}for(b in c){if(c.hasOwnProperty(b)){if(!this.hasConfig(b)){a[b]=c[b];delete c[b]}}}return c},constructor:function(a){a=this.processConfig(a);this.useIndicators={x:true,y:true};this.doHideIndicators=Ext.Function.bind(this.doHideIndicators,this);this.initConfig(a)},setConfig:function(a){return this.callParent([this.processConfig(a)])},updateIndicatorsUi:function(a){var b=this.getIndicators();b.x.setUi(a);b.y.setUi(a)},applyScroller:function(a,b){return Ext.factory(a,Ext.scroll.Scroller,b)},applyIndicators:function(b,d){var a=Ext.scroll.Indicator,c=this.useIndicators;if(!b){b={}}if(!b.x){c.x=false;b.x={}}if(!b.y){c.y=false;b.y={}}return{x:Ext.factory(b.x,a,d&&d.x),y:Ext.factory(b.y,a,d&&d.y)}},updateIndicators:function(a){this.indicatorsGrid=Ext.Element.create({className:"x-scroll-bar-grid-wrapper",children:[{className:"x-scroll-bar-grid",children:[{children:[{},{children:[a.y.barElement]}]},{children:[{children:[a.x.barElement]},{}]}]}]})},updateScroller:function(a){a.on({scope:this,scrollstart:"onScrollStart",scroll:"onScroll",scrollend:"onScrollEnd",refresh:"refreshIndicators"})},isAxisEnabled:function(a){return this.getScroller().isAxisEnabled(a)&&this.useIndicators[a]},applyElement:function(a){if(a){return Ext.get(a)}},updateElement:function(c){var b=c.getFirstChild().getFirstChild(),a=this.getScroller();c.addCls(this.getCls());c.insertFirst(this.indicatorsGrid);a.setElement(b);this.refreshIndicators();return this},showIndicators:function(){var a=this.getIndicators();if(this.hasOwnProperty("indicatorsHidingTimer")){clearTimeout(this.indicatorsHidingTimer);delete this.indicatorsHidingTimer}if(this.isAxisEnabled("x")){a.x.show()}if(this.isAxisEnabled("y")){a.y.show()}},hideIndicators:function(){var a=this.getIndicatorsHidingDelay();if(a>0){this.indicatorsHidingTimer=setTimeout(this.doHideIndicators,a)}else{this.doHideIndicators()}},doHideIndicators:function(){var a=this.getIndicators();if(this.isAxisEnabled("x")){a.x.hide()}if(this.isAxisEnabled("y")){a.y.hide()}},onScrollStart:function(){this.onScroll.apply(this,arguments);this.showIndicators()},onScrollEnd:function(){this.hideIndicators()},onScroll:function(b,a,c){this.setIndicatorValue("x",a);this.setIndicatorValue("y",c)},setIndicatorValue:function(b,f){if(!this.isAxisEnabled(b)){return this}var a=this.getScroller(),c=a.getMaxPosition()[b],e=a.getContainerSize()[b],d;if(c===0){d=f/e;if(f>=0){d+=1}}else{if(f>c){d=1+((f-c)/e)}else{if(f<0){d=f/e}else{d=f/c}}}this.getIndicators()[b].setValue(d)},refreshIndicator:function(d){if(!this.isAxisEnabled(d)){return this}var a=this.getScroller(),b=this.getIndicators()[d],e=a.getContainerSize()[d],f=a.getSize()[d],c=e/f;b.setRatio(c);b.refresh()},refresh:function(){return this.getScroller().refresh()},refreshIndicators:function(){var a=this.getIndicators();a.x.setActive(this.isAxisEnabled("x"));a.y.setActive(this.isAxisEnabled("y"));this.refreshIndicator("x");this.refreshIndicator("y")},destroy:function(){var a=this.getElement(),b=this.getIndicators();if(a&&!a.isDestroyed){a.removeCls(this.getCls())}b.x.destroy();b.y.destroy();Ext.destroy(this.getScroller(),this.indicatorsGrid);delete this.indicatorsGrid;this.callParent(arguments)}});Ext.define("Ext.behavior.Scrollable",{extend:"Ext.behavior.Behavior",requires:["Ext.scroll.View"],constructor:function(){this.listeners={painted:"onComponentPainted",scope:this};this.callParent(arguments)},onComponentPainted:function(){this.scrollView.refresh()},setConfig:function(d){var b=this.scrollView,c=this.component,f,e,a;if(d){if(!b){this.scrollView=b=new Ext.scroll.View(d);b.on("destroy","onScrollViewDestroy",this);c.setUseBodyElement(true);this.scrollerElement=a=c.innerElement;this.scrollContainer=e=a.wrap();this.scrollViewElement=f=c.bodyElement;b.setElement(f);if(c.isPainted()){this.onComponentPainted(c)}c.on(this.listeners)}else{if(Ext.isObject(d)){b.setConfig(d)}}}else{if(b){b.destroy()}}return this},getScrollView:function(){return this.scrollView},onScrollViewDestroy:function(){var b=this.component,a=this.scrollerElement;if(!a.isDestroyed){this.scrollerElement.unwrap()}this.scrollContainer.destroy();b.un(this.listeners);delete this.scrollerElement;delete this.scrollView;delete this.scrollContainer},onComponentDestroy:function(){var a=this.scrollView;if(a){a.destroy()}}});Ext.define("Ext.Container",{extend:"Ext.Component",alternateClassName:"Ext.lib.Container",requires:["Ext.layout.Layout","Ext.ItemCollection","Ext.behavior.Scrollable","Ext.Mask"],xtype:"container",eventedConfig:{activeItem:0},config:{layout:null,control:{},defaults:null,items:null,autoDestroy:true,defaultType:null,scrollable:null,useBodyElement:null,masked:null,modal:null,hideOnMaskTap:null},isContainer:true,delegateListeners:{delegate:"> component",centeredchange:"onItemCenteredChange",dockedchange:"onItemDockedChange",floatingchange:"onItemFloatingChange"},constructor:function(a){var b=this;b._items=b.items=new Ext.ItemCollection();b.innerItems=[];b.onItemAdd=b.onFirstItemAdd;b.callParent(arguments)},getElementConfig:function(){return{reference:"element",className:"x-container",children:[{reference:"innerElement",className:"x-inner"}]}},applyMasked:function(a,b){b=Ext.factory(a,Ext.Mask,b);if(b){this.add(b)}return b},mask:function(a){this.setMasked(a||true)},unmask:function(){this.setMasked(false)},applyModal:function(a,b){if(!a&&!b){return}return Ext.factory(a,Ext.Mask,b)},updateModal:function(c,a){var b={painted:"refreshModalMask",erased:"destroyModalMask"};if(c){this.on(b);c.on("destroy","onModalDestroy",this);if(this.getTop()===null&&this.getBottom()===null&&this.getRight()===null&&this.getLeft()===null&&!this.getCentered()){this.setTop(0);this.setLeft(0)}if(this.isPainted()){this.refreshModalMask()}}else{if(a){a.un("destroy","onModalDestroy",this);this.un(b)}}},onModalDestroy:function(){this.setModal(null)},refreshModalMask:function(){var b=this.getModal(),a=this.getParent();if(!this.painted){this.painted=true;if(b){a.insertBefore(b,this);b.setZIndex(this.getZIndex()-1)}}},destroyModalMask:function(){var b=this.getModal(),a=this.getParent();if(this.painted){this.painted=false;if(b){a.remove(b,false)}}},updateZIndex:function(b){var a=this.getModal();this.callParent(arguments);if(a){a.setZIndex(b-1)}},updateHideOnMaskTap:function(b){var a=this.getModal();if(a){a[b?"on":"un"].call(a,"tap","hide",this)}},updateBaseCls:function(a,b){var c=this,d=c.getUi();if(a){this.element.addCls(a);this.innerElement.addCls(a,null,"inner");if(d){this.element.addCls(a,null,d)}}if(b){this.element.removeCls(b);this.innerElement.removeCls(a,null,"inner");if(d){this.element.removeCls(b,null,d)}}},updateUseBodyElement:function(a){if(a){this.bodyElement=this.innerElement.wrap({cls:"x-body"});this.referenceList.push("bodyElement")}},applyItems:function(a,b){if(a){this.getDefaultType();this.getDefaults();if(this.initialized&&b.length>0){this.removeAll()}this.add(a)}},applyControl:function(c){var a,b,e,d;for(a in c){d=c[a];for(b in d){e=d[b];if(Ext.isObject(e)){e.delegate=a}}d.delegate=a;this.addListener(d)}return c},onFirstItemAdd:function(){delete this.onItemAdd;this.setLayout(new Ext.layout.Layout(this,this.getLayout()||"default"));if(this.innerHtmlElement&&!this.getHtml()){this.innerHtmlElement.destroy();delete this.innerHtmlElement}this.on(this.delegateListeners);return this.onItemAdd.apply(this,arguments)},updateDefaultType:function(a){this.defaultItemClass=Ext.ClassManager.getByAlias("widget."+a)},applyDefaults:function(a){if(a){this.factoryItem=this.factoryItemWithDefaults;return a}},factoryItem:function(a){return Ext.factory(a,this.defaultItemClass)},factoryItemWithDefaults:function(c){var b=this,d=b.getDefaults(),a;if(!d){return Ext.factory(c,b.defaultItemClass)}if(c.isComponent){a=c;if(d&&c.isInnerItem()&&!b.has(a)){a.setConfig(d,true)}}else{if(d&&!c.ignoreDefaults){if(!(c.hasOwnProperty("left")&&c.hasOwnProperty("right")&&c.hasOwnProperty("top")&&c.hasOwnProperty("bottom")&&c.hasOwnProperty("docked")&&c.hasOwnProperty("centered"))){c=Ext.mergeIf({},c,d)}}a=Ext.factory(c,b.defaultItemClass)}return a},add:function(a){var e=this,b,d,c,f;a=Ext.Array.from(a);d=a.length;for(b=0;b<d;b++){c=e.factoryItem(a[b]);this.doAdd(c);if(!f&&!this.getActiveItem()&&this.innerItems.length>0&&c.isInnerItem()){f=c}}if(f){this.setActiveItem(f)}return c},doAdd:function(d){var c=this,a=c.getItems(),b;if(!a.has(d)){b=a.length;a.add(d);if(d.isInnerItem()){c.insertInner(d)}d.setParent(c);c.onItemAdd(d,b)}},remove:function(d,b){var c=this,a=c.indexOf(d),e=this.getInnerItems(),f;if(b===undefined){b=c.getAutoDestroy()}if(a!==-1){if(!this.removingAll&&e.length>1&&d===this.getActiveItem()){this.on({activeitemchange:"doRemove",scope:this,single:true,order:"after",args:[d,a,b]});f=e.indexOf(d);if(f===0){this.setActiveItem(1)}else{this.setActiveItem(0)}}else{this.doRemove(d,a,b)}}return c},doRemove:function(d,a,b){var c=this;c.items.remove(d);if(d.isInnerItem()){c.removeInner(d)}c.onItemRemove(d,a,b);d.setParent(null);if(b){d.destroy()}},removeAll:function(c,f){var a=this.items,e=a.length,b=0,d;if(c===undefined){c=this.getAutoDestroy()}f=Boolean(f);this.removingAll=true;for(;b<e;b++){d=a.getAt(b);if(d&&(f||d.isInnerItem())){this.doRemove(d,b,c);b--;e--}}this.removingAll=false;return this},getAt:function(a){return this.items.getAt(a)},removeAt:function(a){var b=this.getAt(a);if(b){this.remove(b)}return this},removeInnerAt:function(a){var b=this.getInnerItems()[a];if(b){this.remove(b)}return this},has:function(a){return this.getItems().indexOf(a)!=-1},hasInnerItem:function(a){return this.innerItems.indexOf(a)!=-1},indexOf:function(a){return this.getItems().indexOf(a)},insertInner:function(d,b){var a=this.getItems().items,f=this.innerItems,g=f.indexOf(d),c=-1,e;if(g!==-1){f.splice(g,1)}if(typeof b=="number"){do{e=a[++b]}while(e&&!e.isInnerItem());if(e){c=f.indexOf(e);f.splice(c,0,d)}}if(c===-1){f.push(d);c=f.length-1}if(g!==-1){this.onInnerItemMove(d,c,g)}return this},onInnerItemMove:Ext.emptyFn,removeInner:function(a){Ext.Array.remove(this.innerItems,a);return this},insert:function(a,d){var c=this,b;if(Ext.isArray(d)){for(b=d.length-1;b>=0;b--){c.insert(a,d[b])}return c}d=this.factoryItem(d);this.doInsert(a,d);return d},doInsert:function(d,f){var e=this,b=e.items,c=b.length,a,g;g=f.isInnerItem();if(d>c){d=c}if(b[d-1]===f){return e}a=e.indexOf(f);if(a!==-1){if(a<d){d-=1}b.removeAt(a)}else{f.setParent(e)}b.insert(d,f);if(g){e.insertInner(f,d)}if(a!==-1){e.onItemMove(f,d,a)}else{e.onItemAdd(f,d)}},insertFirst:function(a){return this.insert(0,a)},insertLast:function(a){return this.insert(this.getItems().length,a)},insertBefore:function(c,a){var b=this.indexOf(a);if(b!==-1){this.insert(b,c)}return this},insertAfter:function(c,a){var b=this.indexOf(a);if(b!==-1){this.insert(b+1,c)}return this},onItemAdd:function(b,a){this.doItemLayoutAdd(b,a);if(this.initialized){this.fireEvent("add",this,b,a)}},doItemLayoutAdd:function(c,a){var b=this.getLayout();if(this.isRendered()&&c.setRendered(true)){c.fireAction("renderedchange",[this,c,true],"onItemAdd",b,{args:[c,a]})}else{b.onItemAdd(c,a)}},onItemRemove:function(b,a){this.doItemLayoutRemove(b,a);this.fireEvent("remove",this,b,a)},doItemLayoutRemove:function(c,a){var b=this.getLayout();if(this.isRendered()&&c.setRendered(false)){c.fireAction("renderedchange",[this,c,false],"onItemRemove",b,{args:[c,a]})}else{b.onItemRemove(c,a)}},onItemMove:function(b,c,a){if(b.isDocked()){b.setDocked(null)}this.doItemLayoutMove(b,c,a);this.fireEvent("move",this,b,c,a)},doItemLayoutMove:function(b,c,a){this.getLayout().onItemMove(b,c,a)},onItemCenteredChange:function(b,a){if(!b.isFloating()&&!b.isDocked()){if(a){this.removeInner(b)}else{this.insertInner(b,this.indexOf(b))}}this.getLayout().onItemCenteredChange(b,a)},onItemFloatingChange:function(a,b){if(!a.isCentered()&&!a.isDocked()){if(b){this.removeInner(a)}else{this.insertInner(a,this.indexOf(a))}}this.getLayout().onItemFloatingChange(a,b)},onItemDockedChange:function(a,c,b){if(!a.isCentered()&&!a.isFloating()){if(c){this.removeInner(a)}else{this.insertInner(a,this.indexOf(a))}}this.getLayout().onItemDockedChange(a,c,b)},getInnerItems:function(){return this.innerItems},getDockedItems:function(){var a=this.getItems().items,c=[],e=a.length,d,b;for(b=0;b<e;b++){d=a[b];if(d.isDocked()){c.push(d)}}return c},applyActiveItem:function(c,a){var b=this.getInnerItems();this.getItems();if(typeof c=="number"){c=Math.max(0,Math.min(c,b.length-1));c=b[c];if(c){return c}else{if(a){return null}}}else{if(c){if(!c.isComponent){c=this.factoryItem(c)}if(!this.has(c)){this.add(c)}return c}}},animateActiveItem:function(d,c){var b=this.getLayout(),a;if(this.activeItemAnimation){this.activeItemAnimation.destroy()}this.activeItemAnimation=c=new Ext.fx.layout.Card(c);if(c&&b.isCard){c.setLayout(b);a=b.getAnimation();if(a){a.disable();c.on("animationend",function(){a.enable();c.destroy()},this)}}return this.setActiveItem(d)},doSetActiveItem:function(b,a){if(a){a.fireEvent("deactivate",a,this,b)}if(b){b.fireEvent("activate",b,this,a)}},setRendered:function(d){if(this.callParent(arguments)){var a=this.items.items,b,c;for(b=0,c=a.length;b<c;b++){a[b].setRendered(d)}return true}return false},getScrollableBehavior:function(){var a=this.scrollableBehavior;if(!a){a=this.scrollableBehavior=new Ext.behavior.Scrollable(this)}return a},applyScrollable:function(a){this.getScrollableBehavior().setConfig(a)},getScrollable:function(){return this.getScrollableBehavior().getScrollView()},getRefItems:function(a){var b=this.getItems().items.slice(),e=b.length,c,d;if(a){for(c=0;c<e;c++){d=b[c];if(d.getRefItems){b=b.concat(d.getRefItems(true))}}}return b},getComponent:function(a){if(Ext.isObject(a)){a=a.getItemId()}return this.getItems().get(a)},getDockedComponent:function(a){if(Ext.isObject(a)){a=a.getItemId()}var c=this.getDockedItems(),e=c.length,d,b;if(Ext.isNumber(a)){return c[a]}for(b=0;b<e;b++){d=c[b];if(d.id==a){return d}}return false},query:function(a){return Ext.ComponentQuery.query(a,this)},child:function(a){return this.query("> "+a)[0]||null},down:function(a){return this.query(a)[0]||null},destroy:function(){var a=this.getModal();if(a){a.destroy()}this.removeAll(true,true);Ext.destroy(this.getScrollable(),this.bodyElement);this.callParent()}},function(){this.addMember("defaultItemClass",this)});Ext.define("Ext.Panel",{extend:"Ext.Container",requires:["Ext.util.LineSegment"],alternateClassName:"Ext.lib.Panel",xtype:"panel",isPanel:true,config:{baseCls:Ext.baseCSSPrefix+"panel",bodyPadding:null,bodyMargin:null,bodyBorder:null},getElementConfig:function(){var a=this.callParent();a.children.push({reference:"tipElement",className:"x-anchor",hidden:true});return a},applyBodyPadding:function(a){if(a===true){a=5}a=Ext.dom.Element.unitizeBox(a);return a},updateBodyPadding:function(a){this.element.setStyle("padding",a)},applyBodyMargin:function(a){if(a===true){a=5}a=Ext.dom.Element.unitizeBox(a);return a},updateBodyMargin:function(a){this.element.setStyle("margin",a)},applyBodyBorder:function(a){if(a===true){a=1}a=Ext.dom.Element.unitizeBox(a);return a},updateBodyBorder:function(a){this.element.setStyle("border-width",a)},alignTo:function(m){var w=this.tipElement;w.hide();if(this.currentTipPosition){w.removeCls("x-anchor-"+this.currentTipPosition)}this.callParent(arguments);var f=Ext.util.LineSegment,d=m.isComponent?m.renderElement:m,a=this.renderElement,n=d.getPageBox(),k=a.getPageBox(),b=k.left,t=k.top,C=k.right,h=k.bottom,j=b+(k.width/2),i=t+(k.height/2),o={x:b,y:t},l={x:C,y:t},B={x:b,y:h},D={x:C,y:h},y={x:j,y:i},s=n.left+(n.width/2),q=n.top+(n.height/2),v={x:s,y:q},c=new f(y,v),g=0,A=0,e,z,r,p,x,u;w.setVisibility(false);w.show();e=w.getSize();z=e.width;r=e.height;if(c.intersects(new f(o,l))){x=Math.min(Math.max(s,b),C-(z/2));u=t;A=r+10;p="top"}else{if(c.intersects(new f(o,B))){x=b;u=Math.min(Math.max(q+(z/2),t),h);g=r+10;p="left"}else{if(c.intersects(new f(B,D))){x=Math.min(Math.max(s,b),C-(z/2));u=h;A=-r-10;p="bottom"}else{if(c.intersects(new f(l,D))){x=C;u=Math.min(Math.max(q-(z/2),t),h);g=-r-10;p="right"}}}}if(x||u){this.currentTipPosition=p;w.addCls("x-anchor-"+p);w.setLeft(x-b);w.setTop(u-t);w.setVisibility(true);this.setLeft(this.getLeft()+g);this.setTop(this.getTop()+A)}}});Ext.define("Ext.SegmentedButton",{extend:"Ext.Container",xtype:"segmentedbutton",requires:["Ext.Button"],config:{baseCls:Ext.baseCSSPrefix+"segmentedbutton",pressedCls:Ext.baseCSSPrefix+"button-pressed",allowMultiple:false,allowDepress:null,pressedButtons:null,layout:{type:"hbox",align:"stretch"},defaultType:"button"},initialize:function(){var a=this;a.callParent();a.on({delegate:"> button",scope:a,tap:"onButtonRelease"});a.onAfter({delegate:"> button",scope:a,hiddenchange:"onButtonHiddenChange"})},updateAllowMultiple:function(){if(!this.initialized&&!this.getInitialConfig().hasOwnProperty("allowDepress")){this.setAllowDepress(true)}},applyItems:function(){var e=this,f=[],d,b,c,a;e.callParent(arguments);a=this.getItems();d=a.length;for(b=0;b<d;b++){c=a.items[b];if(c.getInitialConfig("pressed")){f.push(a.items[b])}}e.updateFirstAndLastCls(a);e.setPressedButtons(f)},onButtonRelease:function(a){var d=this,e=d.getPressedButtons(),c=[],b;if(!d.getDisabled()&&!a.getDisabled()){if(d.getAllowMultiple()){c=e.concat(c)}b=(c.indexOf(a)!==-1)||(e.indexOf(a)!==-1);if(b&&d.getAllowDepress()){Ext.Array.remove(c,a)}else{if(!b||!d.getAllowDepress()){c.push(a)}}d.setPressedButtons(c);Ext.defer(function(){d.fireEvent("toggle",d,a,d.isPressed(a))},50)}},onButtonHiddenChange:function(){this.updateFirstAndLastCls(this.getItems())},updateFirstAndLastCls:function(a){var d=a.length,e=Ext.baseCSSPrefix,c,b;for(b=0;b<d;b++){c=a.items[b];if(!c.isHidden()){c.addCls(e+"first");break}}for(b=d-1;b>=0;b--){c=a.items[b];if(!c.isHidden()){c.addCls(e+"last");break}}},applyPressedButtons:function(a){var e=this,f=[],c,d,b;if(Ext.isArray(a)){d=a.length;for(b=0;b<d;b++){c=e.getComponent(a[b]);if(c&&f.indexOf(c)===-1){f.push(c)}}}else{c=e.getComponent(a);if(c&&f.indexOf(c)===-1){f.push(c)}}return f},updatePressedButtons:function(a){var h=this,b=h.getItems(),g=h.getPressedCls(),f,d,e,c;e=b.length;for(c=0;c<e;c++){f=b.items[c];f.removeCls([g,f.getPressedCls()])}e=a.length;for(c=0;c<e;c++){d=a[c];d.addCls(g)}},isPressed:function(a){var b=this.getPressedButtons();return b.indexOf(a)!=-1},doSetDisabled:function(a){var b=this;b.items.each(function(c){c.setDisabled(a)},b);b.callParent(arguments)}},function(){});Ext.define("Ext.Sheet",{extend:"Ext.Panel",xtype:"sheet",requires:["Ext.fx.Animation"],config:{baseCls:Ext.baseCSSPrefix+"sheet",hidden:true,modal:true,centered:true,stretchX:null,stretchY:null,enter:"bottom",exit:"bottom",showAnimation:!Ext.os.is.Android2?{type:"slideIn",duration:250,easing:"ease-out"}:null,hideAnimation:!Ext.os.is.Android2?{type:"slideOut",duration:250,easing:"ease-in"}:null},applyHideAnimation:function(b){var a=this.getExit(),d=a;if(a===null){return null}if(b===true){b={type:"slideOut"}}if(Ext.isString(b)){b={type:b}}var c=Ext.factory(b,Ext.fx.Animation);if(c){if(a=="bottom"){d="down"}if(a=="top"){d="up"}c.setDirection(d)}return c},applyShowAnimation:function(a){var d=this.getEnter(),c=d;if(d===null){return null}if(a===true){a={type:"slideIn"}}if(Ext.isString(a)){a={type:a}}var b=Ext.factory(a,Ext.fx.Animation);if(b){if(d=="bottom"){c="down"}if(d=="top"){c="up"}b.setBefore({display:null});b.setReverse(true);b.setDirection(c)}return b},updateStretchX:function(a){this.getLeft();this.getRight();if(a){this.setLeft(0);this.setRight(0)}},updateStretchY:function(a){this.getTop();this.getBottom();if(a){this.setTop(0);this.setBottom(0)}}});Ext.define("Ext.ActionSheet",{extend:"Ext.Sheet",alias:"widget.actionsheet",requires:["Ext.Button"],config:{baseCls:Ext.baseCSSPrefix+"sheet-action",left:0,right:0,bottom:0,centered:false,height:"auto",defaultType:"button"}});Ext.define("Ext.TitleBar",{extend:"Ext.Container",xtype:"titlebar",requires:["Ext.Button","Ext.Title","Ext.Spacer","Ext.util.SizeMonitor"],isToolbar:true,config:{baseCls:Ext.baseCSSPrefix+"toolbar",cls:Ext.baseCSSPrefix+"navigation-bar",ui:"dark",title:null,defaultType:"button",layout:{type:"hbox"},items:[]},maxButtonWidth:"40%",constructor:function(){this.refreshTitlePosition=Ext.Function.createThrottled(this.refreshTitlePosition,50,this);this.callParent(arguments)},beforeInitialize:function(){this.applyItems=this.applyInitialItems},initialize:function(){delete this.applyItems;this.doAdd=this.doBoxAdd;this.remove=this.doBoxRemove;this.doInsert=this.doBoxInsert;this.add(this.initialItems);delete this.initialItems;this.on({painted:"onPainted",erased:"onErased"})},applyInitialItems:function(c){var e=Ext.util.SizeMonitor,f=this.getDefaults()||{},a,b,d;this.initialItems=c;this.leftBox=a=this.add({xtype:"container",style:"position: relative",layout:{type:"hbox",align:"center"}});this.spacer=d=this.add({xtype:"component",style:"position: relative",flex:1});this.rightBox=b=this.add({xtype:"container",style:"position: relative",layout:{type:"hbox",align:"center"}});this.titleComponent=this.add({xtype:"title",hidden:f.hidden,centered:true});this.sizeMonitors={leftBox:new e({element:a.renderElement,callback:this.refreshTitlePosition,scope:this}),spacer:new e({element:d.renderElement,callback:this.refreshTitlePosition,scope:this}),rightBox:new e({element:b.renderElement,callback:this.refreshTitlePosition,scope:this})}},doBoxAdd:function(a){if(a.config.align=="right"){this.rightBox.add(a)}else{this.leftBox.add(a)}if(this.painted){this.refreshTitlePosition()}},doBoxRemove:function(a){if(a.config.align=="right"){this.rightBox.remove(a)}else{this.leftBox.remove(a)}if(this.painted){this.refreshTitlePosition()}},doBoxInsert:function(a,b){if(b.config.align=="right"){this.rightBox.add(b)}else{this.leftBox.add(b)}},onPainted:function(){var a=this.sizeMonitors;this.painted=true;this.refreshTitlePosition();a.leftBox.refresh();a.spacer.refresh();a.rightBox.refresh()},onErased:function(){this.painted=false},getMaxButtonWidth:function(){var a=this.maxButtonWidth;if(Ext.isString(this.maxButtonWidth)){a=parseInt(a.replace("%",""),10);a=Math.round((this.element.getWidth()/100)*a)}return a},refreshTitlePosition:function(){var f=this.titleComponent.renderElement;f.setWidth(null);f.setLeft(null);var a=this.leftBox,c=a.down("button"),h,m;if(c){c.renderElement.setWidth("auto");h=a.renderElement.getWidth();m=this.getMaxButtonWidth();if(h>m){c.renderElement.setWidth(m)}}var j=this.spacer.renderElement.getPageBox(),k=f.getPageBox(),g=k.width-j.width,d=k.left,i=k.right,b,l,e;if(g>0){f.setWidth(j.width);b=g/2;d+=b;i-=b}l=j.left-d;e=i-j.right;if(l>0){f.setLeft(l)}else{if(e>0){f.setLeft(-e)}}f.repaint()},updateTitle:function(a){this.titleComponent.setTitle(a);this.titleBox=null;if(this.painted){this.refreshTitlePosition()}},destroy:function(){this.callParent();var a=this.sizeMonitors;a.leftBox.destroy();a.spacer.destroy();a.rightBox.destroy()}});Ext.define("Ext.Toolbar",{extend:"Ext.Container",xtype:"toolbar",requires:["Ext.Button","Ext.Title","Ext.Spacer"],isToolbar:true,config:{baseCls:Ext.baseCSSPrefix+"toolbar",ui:"dark",title:null,defaultType:"button",layout:{type:"hbox",align:"center"}},constructor:function(a){a=a||{};if(a.docked=="left"||a.docked=="right"){a.layout={type:"vbox",align:"stretch"}}this.callParent([a])},applyTitle:function(a){if(typeof a=="string"){a={title:a,centered:true}}return Ext.factory(a,Ext.Title,this.getTitle())},updateTitle:function(b,a){if(b){this.add(b);this.getLayout().setItemFlex(b,1)}if(a){a.destroy()}},showTitle:function(){var a=this.getTitle();if(a){a.show()}},hideTitle:function(){var a=this.getTitle();if(a){a.hide()}}},function(){});Ext.define("Ext.MessageBox",{extend:"Ext.Sheet",requires:["Ext.Toolbar","Ext.field.Text","Ext.field.TextArea"],config:{ui:"dark",baseCls:Ext.baseCSSPrefix+"msgbox",iconCls:null,showAnimation:{type:"popIn",duration:250,easing:"ease-out"},hideAnimation:{type:"popOut",duration:250,easing:"ease-out"},zIndex:10,defaultTextHeight:75,title:null,buttons:null,message:null,prompt:null,layout:{type:"vbox",pack:"center"}},statics:{OK:{text:"OK",itemId:"ok",ui:"action"},YES:{text:"Yes",itemId:"yes",ui:"action"},NO:{text:"No",itemId:"no"},CANCEL:{text:"Cancel",itemId:"cancel"},INFO:Ext.baseCSSPrefix+"msgbox-info",WARNING:Ext.baseCSSPrefix+"msgbox-warning",QUESTION:Ext.baseCSSPrefix+"msgbox-question",ERROR:Ext.baseCSSPrefix+"msgbox-error",OKCANCEL:[{text:"Cancel",itemId:"cancel"},{text:"OK",itemId:"ok",ui:"action"}],YESNOCANCEL:[{text:"Cancel",itemId:"cancel"},{text:"No",itemId:"no"},{text:"Yes",itemId:"yes",ui:"action"}],YESNO:[{text:"No",itemId:"no"},{text:"Yes",itemId:"yes",ui:"action"}]},constructor:function(a){a=a||{};if(a.hasOwnProperty("promptConfig")){Ext.applyIf(a,{prompt:a.promptConfig});delete a.promptConfig}if(a.hasOwnProperty("multiline")||a.hasOwnProperty("multiLine")){a.prompt=a.prompt||{};Ext.applyIf(a.prompt,{multiLine:a.multiline||a.multiLine});delete a.multiline;delete a.multiLine}this.callParent([a])},applyTitle:function(a){if(typeof a=="string"){a={title:a}}Ext.applyIf(a,{docked:"top",cls:this.getBaseCls()+"-title"});return Ext.factory(a,Ext.Toolbar,this.getTitle())},updateTitle:function(a){if(a){this.add(a)}},updateButtons:function(a){var b=this;if(a){if(b.buttonsToolbar){b.buttonsToolbar.removeAll();b.buttonsToolbar.setItems(a)}else{b.buttonsToolbar=Ext.create("Ext.Toolbar",{docked:"bottom",defaultType:"button",layout:{type:"hbox",pack:"center"},ui:b.getUi(),cls:b.getBaseCls()+"-buttons",items:a});b.add(b.buttonsToolbar)}}},applyMessage:function(a){a={html:a,cls:this.getBaseCls()+"-text"};return Ext.factory(a,Ext.Component,this._message)},updateMessage:function(a){if(a){this.add(a)}},getMessage:function(){if(this._message){return this._message.getHtml()}return null},applyIconCls:function(a){a={xtype:"component",docked:"left",width:40,height:40,baseCls:Ext.baseCSSPrefix+"icon",hidden:(a)?false:true,cls:a};return Ext.factory(a,Ext.Component,this._iconCls)},updateIconCls:function(a,b){var c=this;this.getTitle();this.getButtons();if(a&&!b){this.add(a)}else{this.remove(b)}},getIconCls:function(){var b=this._iconCls,a;if(b){a=b.getCls();return(a)?a[0]:null}return null},applyPrompt:function(a){if(a){var b={label:false};if(Ext.isObject(a)){Ext.apply(b,a)}if(b.multiLine){b.height=Ext.isNumber(b.multiLine)?parseFloat(b.multiLine):this.getDefaultTextHeight();return Ext.factory(b,Ext.field.TextArea,this.getPrompt())}else{return Ext.factory(b,Ext.field.Text,this.getPrompt())}}return a},updatePrompt:function(a,b){if(a){this.add(a)}if(b){this.remove(b)}},onClick:function(c){if(c){var b=c.config.userConfig||{},d=c.getInitialConfig(),a=this.getPrompt();if(typeof b.fn=="function"){this.on({hiddenchange:function(){b.fn.call(b.scope||null,d.itemId||d.text,a?a.getValue():null,b)},single:true,scope:this})}if(b.cls){this.el.removeCls(b.cls)}if(b.input){b.input.dom.blur()}}this.hide()},show:function(f){if(!this.getParent()&&Ext.Viewport){Ext.Viewport.add(this)}if(!f){return this.callParent()}var b=Ext.Object.merge({},{value:""},f);var e=f.buttons||Ext.MessageBox.OK||[],d=[],c=f;Ext.each(e,function(g){if(!g){return}d.push(Ext.apply({userConfig:c,scope:this,handler:"onClick"},g))},this);b.buttons=d;if(b.promptConfig){}b.prompt=(b.promptConfig||b.prompt)||null;if(b.multiLine){b.prompt=b.prompt||{};b.prompt.multiLine=b.multiLine;delete b.multiLine}this.setConfig(b);var a=this.getPrompt();if(a){a.setValue(f.value||"")}this.callParent();return this},alert:function(d,c,b,a){return this.show({title:d,message:c,buttons:Ext.MessageBox.OK,promptConfig:false,fn:function(e){if(b){b.call(a,e)}},scope:a})},confirm:function(d,c,b,a){return this.show({title:d,message:c,buttons:Ext.MessageBox.YESNO,promptConfig:false,scope:a,fn:function(e){if(b){b.call(a,e)}}})},prompt:function(g,d,c,b,f,e,a){return this.show({title:g,message:d,buttons:Ext.MessageBox.OKCANCEL,scope:b,prompt:a||true,multiLine:f,value:e,fn:function(i,h){if(c){c.call(b,i,h)}}})}},function(a){Ext.onSetup(function(){Ext.Msg=new a})});Ext.define("Ext.carousel.Carousel",{extend:"Ext.Container",alternateClassName:"Ext.Carousel",xtype:"carousel",requires:["Ext.fx.easing.EaseOut","Ext.carousel.Item","Ext.carousel.Indicator"],config:{baseCls:"x-carousel",direction:"horizontal",directionLock:false,animation:{duration:250,easing:{type:"ease-out"}},indicator:true,ui:"dark",itemConfig:{},bufferSize:1,itemLength:null},itemLength:0,offset:0,flickStartOffset:0,flickStartTime:0,dragDirection:0,count:0,painted:false,activeIndex:-1,beforeInitialize:function(){this.animationListeners={animationframe:"onActiveItemAnimationFrame",animationend:"onActiveItemAnimationEnd",scope:this};this.element.on({dragstart:"onDragStart",drag:"onDrag",dragend:"onDragEnd",scope:this});this.on({painted:"onPainted",erased:"onErased",resize:"onSizeChange"});this.carouselItems=[];this.orderedCarouselItems=[];this.inactiveCarouselItems=[];this.hiddenTranslation=0},updateBufferSize:function(n){var l=Ext.carousel.Item,h=n*2+1,m=this.isRendered(),c=this.innerElement,g=this.carouselItems,f=g.length,e=this.getItemConfig(),d=this.getItemLength(),j=this.getDirection(),b=j==="horizontal"?"setWidth":"setHeight",a,k;for(a=f;a<h;a++){k=Ext.factory(e,l);if(d){k[b].call(k,d)}g.push(k);c.append(k.renderElement);if(m&&k.setRendered(true)){k.fireEvent("renderedchange",this,k,true)}}},getActiveCarouselItem:function(){return this.orderedCarouselItems[this.getBufferSize()]},setRendered:function(g){var a=this.rendered;if(g!==a){this.rendered=g;var b=this.items.items,d=this.carouselItems,c,f,e;for(c=0,f=b.length;c<f;c++){e=b[c];if(!e.isInnerItem()){e.setRendered(g)}}for(c=0,f=d.length;c<f;c++){d[c].setRendered(g)}return true}return false},onPainted:function(){this.painted=true;this.refresh();this.refreshCarouselItems()},onErased:function(){this.painted=false},onSizeChange:function(){this.refreshSizing();this.refreshCarouselItems();this.refreshOffset()},onItemAdd:function(c,b){this.callParent(arguments);var d=this.getInnerItems().indexOf(c),a=this.getIndicator();if(a&&c.isInnerItem()){a.addIndicator()}if(d<=this.getActiveIndex()){this.refreshActiveIndex()}if(this.painted&&this.isIndexDirty(d)){this.refreshActiveItem()}},doItemLayoutAdd:function(a){if(a.isInnerItem()){return}this.callParent(arguments)},onItemRemove:function(f,b){this.callParent(arguments);var h=this.getInnerItems().indexOf(f),a=this.getIndicator(),d=this.carouselItems,c,e,g;if(f.isInnerItem()&&a){a.removeIndicator()}if(h<=this.getActiveIndex()){this.refreshActiveIndex()}if(this.isIndexDirty(h)){for(c=0,e=d.length;c<e;c++){g=d[c];if(g.getComponent()===f){g.setComponent(null)}}if(this.painted){this.refreshActiveItem()}}},doItemLayoutRemove:function(a){if(a.isInnerItem()){return}this.callParent(arguments)},onInnerItemMove:function(b,c,a){if(this.painted&&(this.isIndexDirty(c)||this.isIndexDirty(a))){this.refreshActiveItem()}},doItemLayoutMove:function(a){if(a.isInnerItem()){return}this.callParent(arguments)},isIndexDirty:function(b){var a=this.getActiveIndex(),c=this.getBufferSize();return(b>=a-c&&b<=a+c)},onDragStart:function(f){var d=this.getDirection(),b=f.absDeltaX,a=f.absDeltaY,c=this.getDirectionLock();this.isDragging=true;if(c){if((d==="horizontal"&&b>a)||(d==="vertical"&&a>b)){f.stopPropagation()}else{this.isDragging=false;return}}if(this.isAnimating){this.getActiveCarouselItem().getTranslatable().stopAnimation()}this.dragStartOffset=this.offset;this.dragDirection=0},onDrag:function(j){if(!this.isDragging){return}var k=this.dragStartOffset,l=this.getDirection(),m=l==="horizontal"?j.deltaX:j.deltaY,a=this.offset,i=this.flickStartTime,c=this.dragDirection,b=Ext.Date.now(),h=this.getActiveIndex(),f=this.getMaxItemIndex(),d=c,g;if((h===0&&m>0)||(h===f&&m<0)){m*=0.5}g=k+m;if(g>a){c=1}else{if(g<a){c=-1}}if(c!==d||(b-i)>300){this.flickStartOffset=a;this.flickStartTime=b}this.dragDirection=c;this.setOffset(g)},onDragEnd:function(j){if(!this.isDragging){return}this.onDrag(j);this.isDragging=false;var a=Ext.Date.now(),i=this.itemLength,g=i/2,f=this.offset,m=this.getActiveIndex(),c=this.getMaxItemIndex(),h=0,l=f-this.flickStartOffset,b=a-this.flickStartTime,k=this.getIndicator(),d;if(b>0&&Math.abs(l)>=10){d=l/b;if(Math.abs(d)>=1){if(d<0&&m<c){h=-1}else{if(d>0&&m>0){h=1}}}}if(h===0){if(m<c&&f<-g){h=-1}else{if(m>0&&f>g){h=1}}}if(k){k.setActiveIndex(m-h)}this.animationDirection=h;this.setOffsetAnimated(h*i)},applyAnimation:function(a){a.easing=Ext.factory(a.easing,Ext.fx.easing.EaseOut);return a},updateDirection:function(b){var a=this.getIndicator();this.currentAxis=(b==="horizontal")?"x":"y";if(a){a.setDirection(b)}},setOffset:function(e){var k=this.orderedCarouselItems,c=this.getBufferSize(),g=k[c],j=this.itemLength,d=this.currentAxis,a,h,b,f;this.offset=e;e+=this.itemOffset;if(g){g.translateAxis(d,e);for(f=1,b=0;f<=c;f++){h=k[c-f];if(h){b+=j;h.translateAxis(d,e-b)}}for(f=1,b=0;f<=c;f++){a=k[c+f];if(a){b+=j;a.translateAxis(d,e+b)}}}return this},setOffsetAnimated:function(c){var b=this.orderedCarouselItems[this.getBufferSize()],a=this.getIndicator();if(a){a.setActiveIndex(this.getActiveIndex()-this.animationDirection)}this.offset=c;c+=this.itemOffset;if(b){this.isAnimating=true;b.getTranslatable().on(this.animationListeners);b.translateAxis(this.currentAxis,c,this.getAnimation())}return this},onActiveItemAnimationFrame:function(k){var j=this.orderedCarouselItems,c=this.getBufferSize(),h=this.itemLength,d=this.currentAxis,e=k[d],g,a,f,b;for(f=1,b=0;f<=c;f++){g=j[c-f];if(g){b+=h;g.translateAxis(d,e-b)}}for(f=1,b=0;f<=c;f++){a=j[c+f];if(a){b+=h;a.translateAxis(d,e+b)}}},onActiveItemAnimationEnd:function(b){var c=this.getActiveIndex(),a=this.animationDirection,e=this.currentAxis,f=b[e],d=this.itemLength,g;this.isAnimating=false;b.un(this.animationListeners);if(a===-1){g=d+f}else{if(a===1){g=f-d}else{g=f}}g-=this.itemOffset;this.offset=g;this.setActiveItem(c-a)},refresh:function(){this.refreshSizing();this.refreshActiveItem()},refreshSizing:function(){var a=this.element,b=this.getItemLength(),c,d;if(this.getDirection()==="horizontal"){d=a.getWidth()}else{d=a.getHeight()}this.hiddenTranslation=-d;if(b===null){b=d;c=0}else{c=(d-b)/2}this.itemLength=b;this.itemOffset=c},refreshOffset:function(){this.setOffset(this.offset)},refreshActiveItem:function(){this.doSetActiveItem(this.getActiveItem())},getActiveIndex:function(){return this.activeIndex},refreshActiveIndex:function(){this.activeIndex=this.getInnerItemIndex(this.getActiveItem())},refreshCarouselItems:function(){var a=this.carouselItems,b,d,c;for(b=0,d=a.length;b<d;b++){c=a[b];c.getTranslatable().refresh()}this.refreshInactiveCarouselItems()},refreshInactiveCarouselItems:function(){var a=this.inactiveCarouselItems,f=this.hiddenTranslation,c=this.currentAxis,b,e,d;for(b=0,e=a.length;b<e;b++){d=a[b];d.translateAxis(c,f)}},getMaxItemIndex:function(){return this.innerItems.length-1},getInnerItemIndex:function(a){return this.innerItems.indexOf(a)},getInnerItemAt:function(a){return this.innerItems[a]},applyActiveItem:function(){var b=this.callParent(arguments),a;if(b){a=this.getInnerItemIndex(b);if(a!==-1){this.activeIndex=a;return b}}},doSetActiveItem:function(g){var q=this.getActiveIndex(),e=this.getMaxItemIndex(),m=this.getIndicator(),c=this.getBufferSize(),k=this.carouselItems.slice(),n=this.orderedCarouselItems,p={},o={},a,l,b,f,h,j,d;if(k.length===0){return}this.callParent(arguments);n.length=0;if(g){b=g.getId();o[b]=g;p[b]=c;if(q>0){for(f=1;f<=c;f++){h=q-f;if(h>=0){a=this.getInnerItemAt(h);b=a.getId();o[b]=a;p[b]=c-f}else{break}}}if(q<e){for(f=1;f<=c;f++){h=q+f;if(h<=e){a=this.getInnerItemAt(h);b=a.getId();o[b]=a;p[b]=c+f}else{break}}}for(f=0,j=k.length;f<j;f++){d=k[f];l=d.getComponent();if(l){b=l.getId();if(p.hasOwnProperty(b)){k.splice(f,1);f--;j--;delete o[b];n[p[b]]=d}}}for(b in o){if(o.hasOwnProperty(b)){a=o[b];d=k.pop();d.setComponent(a);n[p[b]]=d}}}this.inactiveCarouselItems.length=0;this.inactiveCarouselItems=k;this.refreshOffset();this.refreshInactiveCarouselItems();if(m){m.setActiveIndex(q)}},next:function(){if(this.isAnimating){this.getActiveCarouselItem().getTranslatable().stopAnimation();this.setOffset(0)}if(this.activeIndex===this.getMaxItemIndex()){return this}this.animationDirection=-1;this.setOffsetAnimated(-this.itemLength);return this},previous:function(){if(this.isAnimating){this.getActiveCarouselItem().getTranslatable().stopAnimation();this.setOffset(0)}if(this.activeIndex===0){return this}this.animationDirection=1;this.setOffsetAnimated(this.itemLength);return this},applyIndicator:function(a,b){return Ext.factory(a,Ext.carousel.Indicator,b)},updateIndicator:function(a){if(a){this.insertFirst(a);a.setUi(this.getUi());a.on({next:"next",previous:"previous",scope:this})}},destroy:function(){var a=this.carouselItems.slice();this.carouselItems.length=0;Ext.destroy(a,this.getIndicator());this.callParent();delete this.carouselItems}},function(){});Ext.define("Ext.carousel.Infinite",{extend:"Ext.carousel.Carousel",config:{indicator:null,maxItemIndex:Infinity,innerItemConfig:{}},applyIndicator:function(a){return},updateBufferSize:function(b){this.callParent(arguments);var e=b*2+1,d=this.innerItems.length,c=this.getInnerItemConfig(),a;for(a=d;a<e;a++){this.doAdd(this.factoryItem(c))}this.rebuildInnerIndexes();this.refreshActiveItem()},updateMaxItemIndex:function(b,c){if(c!==undefined){var a=this.getActiveIndex();if(a>b){this.setActiveItem(b)}else{this.rebuildInnerIndexes(a);this.refreshActiveItem()}}},rebuildInnerIndexes:function(n){var c=this.innerIndexToItem,g=this.innerIdToIndex,j=this.innerItems.slice(),h=j.length,b=this.getBufferSize(),d=this.getMaxItemIndex(),l=[],e,k,f,a,m;if(n===undefined){this.innerIndexToItem=c={};this.innerIdToIndex=g={};for(e=0;e<h;e++){m=j[e];a=m.getId();g[a]=e;c[e]=m;this.fireEvent("itemindexchange",this,m,e,-1)}}else{for(e=n-b;e<=n+b;e++){if(e>=0&&e<=d){if(c.hasOwnProperty(e)){Ext.Array.remove(j,c[e]);continue}l.push(e)}}for(e=0,h=l.length;e<h;e++){m=j[e];a=m.getId();f=l[e];k=g[a];delete c[k];g[a]=f;c[f]=m;this.fireEvent("itemindexchange",this,m,f,k)}}},reset:function(){this.rebuildInnerIndexes();this.setActiveItem(0)},refreshItems:function(){var a=this.innerItems,f=this.innerIdToIndex,b,e,c,d;for(c=0,d=a.length;c<d;c++){e=a[c];b=f[e.getId()];this.fireEvent("itemindexchange",this,e,b,-1)}},getInnerItemIndex:function(b){var a=this.innerIdToIndex[b.getId()];return(typeof a=="number")?a:-1},getInnerItemAt:function(a){return this.innerIndexToItem[a]},applyActiveItem:function(c){this.getItems();this.getBufferSize();var b=this.getMaxItemIndex(),a=this.getActiveIndex();if(typeof c=="number"){c=Math.max(0,Math.min(c,b));if(c===a){return}this.activeIndex=c;this.rebuildInnerIndexes(c);c=this.getInnerItemAt(c)}if(c){return this.callParent([c])}}});Ext.define("Ext.dataview.component.DataItem",{extend:"Ext.Container",xtype:"dataitem",config:{baseCls:Ext.baseCSSPrefix+"data-item",defaultType:"component",record:null,itemCls:null,dataMap:{},items:[{xtype:"component"}]},updateBaseCls:function(a,b){var c=this;c.callParent(arguments)},updateItemCls:function(b,a){if(a){this.removeCls(a)}if(b){this.addCls(b)}},updateRecord:function(d){if(!d){return}var h=this,c=h.config.dataview,b=c.prepareData(d.getData(true),c.getStore().indexOf(d),d),e=h.getItems(),k=e.first(),i=h.getDataMap(),f,j,g,a;if(!k){return}for(f in i){g=i[f];j=h[f]();if(j){for(a in g){if(j[a]){j[a](b[g[a]])}}}}h.fireEvent("updatedata",h,b);k.updateData(b)}});Ext.define("Ext.dataview.component.Container",{extend:"Ext.Container",requires:["Ext.dataview.component.DataItem"],constructor:function(){this.itemCache=[];this.callParent(arguments)},doInitialize:function(){this.innerElement.on({touchstart:"onItemTouchStart",touchend:"onItemTouchEnd",tap:"onItemTap",touchmove:"onItemTouchMove",doubletap:"onItemDoubleTap",swipe:"onItemSwipe",delegate:"> ."+Ext.baseCSSPrefix+"data-item",scope:this})},initialize:function(){this.callParent();this.doInitialize()},onItemTouchStart:function(d){var b=this,c=d.getTarget(),a=Ext.getCmp(c.id);a.on({touchmove:"onItemTouchMove",scope:b,single:true});b.fireEvent("itemtouchstart",b,a,b.indexOf(a),d)},onItemTouchMove:function(d){var b=this,c=d.getTarget(),a=Ext.getCmp(c.id);b.fireEvent("itemtouchmove",b,a,b.indexOf(a),d)},onItemTouchEnd:function(d){var b=this,c=d.getTarget(),a=Ext.getCmp(c.id);a.un({touchmove:"onItemTouchMove",scope:b});b.fireEvent("itemtouchend",b,a,b.indexOf(a),d)},onItemTap:function(d){var b=this,c=d.getTarget(),a=Ext.getCmp(c.id);b.fireEvent("itemtap",b,a,b.indexOf(a),d)},onItemTapHold:function(d){var b=this,c=d.getTarget(),a=Ext.getCmp(c.id);b.fireEvent("itemtaphold",b,a,b.indexOf(a),d)},onItemDoubleTap:function(d){var b=this,c=d.getTarget(),a=Ext.getCmp(c.id);b.fireEvent("itemdoubletap",b,a,b.indexOf(a),d)},onItemSwipe:function(d){var b=this,c=d.getTarget(),a=Ext.getCmp(c.id);b.fireEvent("itemswipe",b,a,b.indexOf(a),d)},moveItemsToCache:function(j,k){var h=this,c=h.dataview,a=c.getMaxItemCache(),g=h.getViewItems(),f=h.itemCache,e=f.length,l=c.getPressedCls(),d=c.getSelectedCls(),b=k-j,m;for(;b>=0;b--){m=g[j+b];if(e!==a){h.remove(m,false);m.removeCls([l,d]);f.push(m);e++}else{m.destroy()}}if(h.getViewItems().length==0){this.dataview.showEmptyText()}},moveItemsFromCache:function(b){var l=this,e=l.dataview,m=e.getStore(),k=b.length,a=e.getDefaultType(),h=e.getItemConfig(),g=l.itemCache,f=g.length,j=[],c,n,d;if(k){e.hideEmptyText()}for(c=0;c<k;c++){b[c]._tmpIndex=m.indexOf(b[c])}Ext.Array.sort(b,function(o,i){return o._tmpIndex>i._tmpIndex?1:-1});for(c=0;c<k;c++){d=b[c];if(f){f--;n=g.pop();this.updateListItem(d,n)}else{n=l.getDataItemConfig(a,d,h)}this.insert(d._tmpIndex,n);delete d._tmpIndex}return j},getViewItems:function(){return this.getInnerItems()},updateListItem:function(a,b){if(b.updateRecord){b.updateRecord(a)}},getDataItemConfig:function(d,b,c){var a=this.dataview;return{xtype:d,record:b,dataview:a,itemCls:a.getItemCls(),defaults:c}},doRemoveItemCls:function(a){var b=this.getViewItems(),d=b.length,c=0;for(;c<d;c++){b[c].removeCls(a)}},doAddItemCls:function(a){var b=this.getViewItems(),d=b.length,c=0;for(;c<d;c++){b[c].addCls(a)}},destroy:function(){var d=this,b=d.itemCache,c=b.length,a=0;for(;a<c;a++){b[a].destroy()}this.callParent()}});Ext.define("Ext.dataview.DataView",{extend:"Ext.Container",alternateClassName:"Ext.DataView",mixins:["Ext.mixin.Selectable"],xtype:"dataview",requires:["Ext.LoadMask","Ext.data.StoreManager","Ext.dataview.component.Container","Ext.dataview.element.Container"],config:{store:null,baseCls:Ext.baseCSSPrefix+"dataview",emptyText:null,deferEmptyText:true,itemTpl:"<div>{text}</div>",pressedCls:"x-item-pressed",itemCls:null,selectedCls:"x-item-selected",triggerEvent:"itemtap",triggerCtEvent:"tap",deselectOnContainerClick:true,scrollable:true,inline:null,pressedDelay:100,loadingText:"Loading...",useComponents:null,itemConfig:{},maxItemCache:20,defaultType:"dataitem",scrollToTopOnRefresh:true},constructor:function(a){var b=this;b.hasLoadedStore=false;b.mixins.selectable.constructor.apply(b,arguments);b.callParent(arguments)},updateItemCls:function(c,b){var a=this.container;if(a){if(b){a.doRemoveItemCls(b)}if(c){a.doAddItemCls(c)}}},storeEventHooks:{beforeload:"onBeforeLoad",load:"onLoad",refresh:"refresh",addrecords:"onStoreAdd",removerecords:"onStoreRemove",updaterecord:"onStoreUpdate"},initialize:function(){this.callParent();var b=this,a;b.on(b.getTriggerCtEvent(),b.onContainerTrigger,b);a=b.container=this.add(new Ext.dataview[b.getUseComponents()?"component":"element"].Container({baseCls:this.getBaseCls()}));a.dataview=b;b.on(b.getTriggerEvent(),b.onItemTrigger,b);a.on({itemtouchstart:"onItemTouchStart",itemtouchend:"onItemTouchEnd",itemtap:"onItemTap",itemtaphold:"onItemTapHold",itemtouchmove:"onItemTouchMove",itemdoubletap:"onItemDoubleTap",itemswipe:"onItemSwipe",scope:b});if(this.getStore()){this.refresh()}},applyInline:function(a){if(Ext.isObject(a)){a=Ext.apply({},a)}return a},updateInline:function(c,b){var a=this.getBaseCls();if(b){this.removeCls([a+"-inlineblock",a+"-nowrap"])}if(c){this.addCls(a+"-inlineblock");if(Ext.isObject(c)&&c.wrap===false){this.addCls(a+"-nowrap")}else{this.removeCls(a+"-nowrap")}}},prepareData:function(c,b,a){return c},onContainerTrigger:function(b){var a=this;if(b.target!=a.element.dom){return}if(a.getDeselectOnContainerClick()&&a.getStore()){a.deselectAll()}},onItemTrigger:function(b,a){this.selectWithEvent(this.getStore().getAt(a))},doAddPressedCls:function(a){var c=this,b=c.container.getViewItems()[c.getStore().indexOf(a)];if(Ext.isElement(b)){b=Ext.get(b)}if(b){b.addCls(c.getPressedCls())}},onItemTouchStart:function(b,h,d,g){var f=this,c=f.getStore(),a=c&&c.getAt(d);f.fireAction("itemtouchstart",[f,d,h,a,g],"doItemTouchStart")},doItemTouchStart:function(c,b,e,a){var d=c.getPressedDelay();if(a){if(d>0){c.pressedTimeout=Ext.defer(c.doAddPressedCls,d,c,[a])}else{c.doAddPressedCls(a)}}},onItemTouchEnd:function(b,h,d,g){var f=this,c=f.getStore(),a=c&&c.getAt(d);if(this.hasOwnProperty("pressedTimeout")){clearTimeout(this.pressedTimeout);delete this.pressedTimeout}if(a&&h){h.removeCls(f.getPressedCls())}f.fireEvent("itemtouchend",f,d,h,a,g)},onItemTouchMove:function(b,h,d,g){var f=this,c=f.getStore(),a=c&&c.getAt(d);if(f.hasOwnProperty("pressedTimeout")){clearTimeout(f.pressedTimeout);delete f.pressedTimeout}if(a&&h){h.removeCls(f.getPressedCls())}f.fireEvent("itemtouchmove",f,d,h,a,g)},onItemTap:function(b,h,d,g){var f=this,c=f.getStore(),a=c&&c.getAt(d);f.fireEvent("itemtap",f,d,h,a,g)},onItemTapHold:function(b,h,d,g){var f=this,c=f.getStore(),a=c&&c.getAt(d);f.fireEvent("itemtaphold",f,d,h,a,g)},onItemDoubleTap:function(b,h,d,g){var f=this,c=f.getStore(),a=c&&c.getAt(d);f.fireEvent("itemdoubletap",f,d,h,a,g)},onItemSwipe:function(b,h,d,g){var f=this,c=f.getStore(),a=c&&c.getAt(d);f.fireEvent("itemswipe",f,d,h,a,g)},onItemSelect:function(a,b){var c=this;if(b){c.doItemSelect(c,a)}else{c.fireAction("select",[c,a],"doItemSelect")}},doItemSelect:function(c,a){if(c.container){var b=c.container.getViewItems()[c.getStore().indexOf(a)];if(Ext.isElement(b)){b=Ext.get(b)}if(b){b.removeCls(c.getPressedCls());b.addCls(c.getSelectedCls())}}},onItemDeselect:function(a,b){var c=this;if(c.container){if(b){c.doItemDeselect(c,a)}else{c.fireAction("deselect",[c,a,b],"doItemDeselect")}}},doItemDeselect:function(c,a){var b=c.container.getViewItems()[c.getStore().indexOf(a)];if(Ext.isElement(b)){b=Ext.get(b)}if(b){b.removeCls([c.getPressedCls(),c.getSelectedCls()])}},updateData:function(b){var a=this.getStore();if(!a){this.setStore(Ext.create("Ext.data.Store",{data:b}))}else{a.add(b)}},applyStore:function(b){var d=this,e=Ext.apply({},d.storeEventHooks,{scope:d}),c,a;if(b){b=Ext.data.StoreManager.lookup(b);if(b&&Ext.isObject(b)&&b.isStore){b.on(e);c=b.getProxy();if(c){a=c.getReader();if(a){a.on("exception","handleException",this)}}}}return b},handleException:function(){this.setMasked(false)},updateStore:function(b,e){var d=this,f=Ext.apply({},d.storeEventHooks,{scope:d}),c,a;if(e&&Ext.isObject(e)&&e.isStore){if(e.autoDestroy){e.destroy()}else{e.un(f);c=e.getProxy();if(c){a=c.getReader();if(a){a.un("exception","handleException",this)}}}}if(b){if(b.isLoaded()){this.hasLoadedStore=true}if(b.isLoading()){d.onBeforeLoad()}if(d.container){d.refresh()}}},onBeforeLoad:function(){var b=this.getScrollable();if(b){b.getScroller().stopAnimation()}var a=this.getLoadingText();if(a){this.setMasked({xtype:"loadmask",message:a});if(b){b.getScroller().setDisabled(true)}}this.hideEmptyText()},updateEmptyText:function(b){var a=this;if(b){a.emptyTextCmp=a.add({xtype:"component",cls:a.getBaseCls()+"-emptytext",html:b,hidden:true})}else{if(a.emptyTextCmp){a.remove(a.emptyTextCmp,true);delete a.emptyTextCmp}}},onLoad:function(a){var b=this.getScrollable();this.hasLoadedStore=true;this.setMasked(false);if(b){b.getScroller().setDisabled(false)}if(!a.getCount()){this.showEmptyText()}},refresh:function(){var b=this,a=b.container;if(!b.getStore()){if(!b.hasLoadedStore&&!b.getDeferEmptyText()){b.showEmptyText()}return}if(a){b.fireAction("refresh",[b],"doRefresh")}},applyItemTpl:function(a){return(Ext.isObject(a)&&a.isTemplate)?a:new Ext.XTemplate(a)},onAfterRender:function(){var a=this;a.callParent(arguments);a.updateStore(a.getStore())},getViewItems:function(){return this.container.getViewItems()},doRefresh:function(f){var a=f.container,j=f.getStore(),b=j.getRange(),e=a.getViewItems(),h=b.length,l=e.length,c=h-l,g=f.getScrollable(),d,k;if(this.getScrollToTopOnRefresh()&&g){g.getScroller().scrollToTop()}if(h<1){f.onStoreClear();return}if(c<0){a.moveItemsToCache(l+c,l-1);e=a.getViewItems();l=e.length}else{if(c>0){a.moveItemsFromCache(j.getRange(l))}}for(d=0;d<l;d++){k=e[d];a.updateListItem(b[d],k)}},showEmptyText:function(){if(this.hasLoadedStore&&this.getEmptyText()){this.emptyTextCmp.show()}},hideEmptyText:function(){if(this.getEmptyText()){this.emptyTextCmp.hide()}},onStoreClear:function(){var c=this,a=c.container,b=a.getViewItems();a.moveItemsToCache(0,b.length-1);this.showEmptyText()},onStoreAdd:function(b,a){if(a){this.container.moveItemsFromCache(a)}},onStoreRemove:function(c,b,f){var a=this.container,e=b.length,d;for(d=0;d<e;d++){a.moveItemsToCache(f[d],f[d])}},onStoreUpdate:function(c,b,d,f){var e=this,a=e.container;f=(typeof f==="undefined")?d:f;if(f!==d){a.moveItemsToCache(f,f);a.moveItemsFromCache([b])}else{a.updateListItem(b,a.getViewItems()[d])}}});Ext.define("Ext.dataview.List",{alternateClassName:"Ext.List",extend:"Ext.dataview.DataView",xtype:"list",requires:["Ext.dataview.element.List","Ext.dataview.IndexBar","Ext.dataview.ListItemHeader"],config:{indexBar:false,icon:null,preventSelectionOnDisclose:true,baseCls:Ext.baseCSSPrefix+"list",pinHeaders:true,grouped:false,onItemDisclosure:null,ui:"normal"},constructor:function(){this.translateHeader=(Ext.os.is.Android2)?this.translateHeaderCssPosition:this.translateHeaderTransform;this.callParent(arguments)},onItemTrigger:function(c,b,f,a,d){if(!(this.getPreventSelectionOnDisclose()&&Ext.fly(d.target).hasCls(this.getBaseCls()+"-disclosure"))){this.callParent(arguments)}},initialize:function(){var b=this,a;b.on(b.getTriggerCtEvent(),b.onContainerTrigger,b);a=b.container=this.add(new Ext.dataview.element.List({baseCls:this.getBaseCls()}));a.dataview=b;b.on(b.getTriggerEvent(),b.onItemTrigger,b);a.element.on({delegate:"."+this.getBaseCls()+"-disclosure",tap:"handleItemDisclosure",scope:b});a.on({itemtouchstart:"onItemTouchStart",itemtouchend:"onItemTouchEnd",itemtap:"onItemTap",itemtaphold:"onItemTapHold",itemtouchmove:"onItemTouchMove",itemdoubletap:"onItemDoubleTap",itemswipe:"onItemSwipe",scope:b});if(this.getStore()){this.refresh()}},updateInline:function(a){this.callParent(arguments);if(a){this.setOnItemDisclosure(false);this.setIndexBar(false);this.setGrouped(false)}},applyIndexBar:function(a){return Ext.factory(a,Ext.dataview.IndexBar,this.getIndexBar())},updateIndexBar:function(a){if(a&&this.getScrollable()){this.indexBarElement=this.getScrollableBehavior().getScrollView().getElement().appendChild(a.renderElement);a.on({index:"onIndex",scope:this});this.element.addCls(this.getBaseCls()+"-indexed")}},updateGrouped:function(c){var b=this.getBaseCls(),a=b+"-grouped",d=b+"-ungrouped";if(c){this.addCls(a);this.removeCls(d);this.doRefreshHeaders();this.updatePinHeaders(this.getPinHeaders())}else{this.addCls(d);this.removeCls(a);if(this.container){this.container.doRemoveHeaders()}this.updatePinHeaders(null)}},updatePinHeaders:function(b){var c=this.getScrollable(),a;if(c){a=c.getScroller()}if(!c){return}if(b&&this.getGrouped()){a.on({refresh:"doRefreshHeaders",scroll:"onScroll",scope:this});if(!this.header||!this.header.renderElement.dom){this.createHeader()}}else{a.un({refresh:"doRefreshHeaders",scroll:"onScroll",scope:this});if(this.header){this.header.destroy()}}},createHeader:function(){var e,d=this.getScrollable(),a,b,c;if(d){a=d.getScroller();b=this.getScrollableBehavior().getScrollView();c=b.getElement()}else{return}this.header=e=Ext.create("Ext.dataview.ListItemHeader",{html:" ",cls:"x-list-header-swap"});c.dom.insertBefore(e.element.dom,a.getContainer().dom.nextSibling);this.translateHeader(1000)},refresh:function(){this.callParent();this.doRefreshHeaders()},onStoreAdd:function(){this.callParent(arguments);this.doRefreshHeaders()},onStoreRemove:function(){this.callParent(arguments);this.doRefreshHeaders()},onStoreUpdate:function(){this.callParent(arguments);this.doRefreshHeaders()},onStoreClear:function(){this.callParent();if(this.header){this.header.destroy()}this.doRefreshHeaders()},getClosestGroups:function(){var a=this.pinHeaderInfo.offsets,e=this.getScrollable(),d=a.length,b=0,h,g,f,c;if(e){h=e.getScroller().position}else{return{current:0,next:0}}for(;b<d;b++){g=a[b];if(g.offset>h.y){c=g;break}f=g}return{current:f,next:c}},doRefreshHeaders:function(){if(!this.getGrouped()||!this.container){return false}var l=this.findGroupHeaderIndices(),f=l.length,g=this.container.getViewItems(),j=this.pinHeaderInfo={offsets:[]},a=j.offsets,h=this.getScrollable(),e,k,b,d,c;if(f){for(b=0;b<f;b++){d=g[l[b]];if(d){c=this.getItemHeader(d);a.push({header:c,offset:d.offsetTop})}}j.closest=this.getClosestGroups();this.setActiveGroup(j.closest.current);if(c){j.headerHeight=Ext.fly(c).getHeight()}if(h){e=h.getScroller();k=e.position;this.onScroll(e,k.x,k.y)}}},getItemHeader:function(a){return a.childNodes[0]},onScroll:function(e,j,h){var g=this,i=g.pinHeaderInfo,a=i.closest,b=g.activeGroup,c=i.headerHeight,d,f;if(!a){return}d=a.next;f=a.current;if(!this.header||!this.header.renderElement.dom){this.createHeader()}if(h<=0){if(b){g.setActiveGroup(false);a.next=f}this.translateHeader(1000);return}else{if((d&&h>d.offset)||(f&&h<f.offset)){a=i.closest=this.getClosestGroups();d=a.next;f=a.current;this.setActiveGroup(f)}}if(d&&h>0&&d.offset-h<=c){var k=c-(d.offset-h);this.translateHeader(k)}else{this.translateHeader(null)}},translateHeaderTransform:function(a){this.header.renderElement.dom.style.webkitTransform=(a===null)?null:"translate3d(0px, -"+a+"px, 0px)"},translateHeaderCssPosition:function(a){this.header.renderElement.dom.style.top=(a===null)?null:"-"+Math.round(a)+"px"},setActiveGroup:function(b){var a=this,c=a.header;if(c){if(b){if(!a.activeGroup||a.activeGroup.header!=b.header){c.show();if(c.element){c.setHtml(b.header.innerHTML)}}}else{if(c&&c.dom){c.hide()}}}this.activeGroup=b},onIndex:function(o,c){var r=this,s=c.toLowerCase(),b=r.getStore(),q=b.getGroups(),f=q.length,h=r.getScrollable(),n,e,m,g,k,p;if(h){n=r.getScrollable().getScroller()}else{return}for(m=0;m<f;m++){e=q[m];k=e.name.toLowerCase();if(k==s||k>s){g=e;break}else{g=e}}if(h&&g){p=r.container.getViewItems()[b.indexOf(g.children[0])];n.stopAnimation();var l=n.getContainerSize().y,j=n.getSize().y,d=j-l,a=(p.offsetTop>d)?d:p.offsetTop;n.scrollTo(0,a)}},applyOnItemDisclosure:function(a){if(Ext.isFunction(a)){return{scope:this,handler:a}}return a},handleItemDisclosure:function(f){var d=this,c=f.getTarget().parentNode,b=d.container.getViewItems().indexOf(c),a=d.getStore().getAt(b);d.fireAction("disclose",[d,a,c,b,f],"doDisclose")},doDisclose:function(f,a,d,c,g){var b=f.getOnItemDisclosure();if(b&&b.handler){b.handler.call(f,a,d,c,g)}},findGroupHeaderIndices:function(){if(!this.getGrouped()){return[]}var h=this,k=h.getStore();if(!k){return[]}var b=h.container,d=k.getGroups(),m=d.length,g=b.getViewItems(),c=[],l=b.footerClsShortCache,e,a,f,n,j;b.doRemoveHeaders();b.doRemoveFooterCls();if(g.length){for(e=0;e<m;e++){a=d[e].children[0];f=k.indexOf(a);n=g[f];b.doAddHeader(n,k.getGroupString(a));if(e){Ext.fly(n.previousSibling).addCls(l)}c.push(f)}j=d[--e].children;Ext.fly(g[k.indexOf(j[j.length-1])]).addCls(l)}return c},destroy:function(){Ext.destroy(this.getIndexBar(),this.indexBarElement,this.header);this.callParent()}});Ext.define("Ext.dataview.NestedList",{alternateClassName:"Ext.NestedList",extend:"Ext.Container",xtype:"nestedlist",requires:["Ext.List","Ext.Toolbar","Ext.Button","Ext.XTemplate","Ext.data.StoreManager","Ext.data.NodeStore","Ext.data.TreeStore"],config:{cls:Ext.baseCSSPrefix+"nested-list",backText:"Back",useTitleAsBackText:true,updateTitleText:true,displayField:"text",loadingText:"Loading...",emptyText:"No items available.",onItemDisclosure:false,allowDeselect:false,useToolbar:null,toolbar:{docked:"top",xtype:"titlebar",ui:"light",inline:true},title:"",layout:{type:"card",animation:{type:"slide",duration:250,direction:"left"}},store:null,detailContainer:undefined,detailCard:null,backButton:{ui:"back",hidden:true},listConfig:null,lastNode:null,lastActiveList:null},constructor:function(a){if(Ext.isObject(a)){if(a.getTitleTextTpl){this.getTitleTextTpl=a.getTitleTextTpl}if(a.getItemTextTpl){this.getItemTextTpl=a.getItemTextTpl}}this.callParent(arguments)},onItemInteraction:function(){if(this.isGoingTo){return false}},applyDetailContainer:function(a){if(!a){a=this}return a},updateDetailContainer:function(a,b){a.onBefore("activeitemchange","onBeforeDetailContainerChange",this);a.onAfter("activeitemchange","onDetailContainerChange",this)},onBeforeDetailContainerChange:function(){this.isGoingTo=true},onDetailContainerChange:function(){this.isGoingTo=false},onItemTap:function(g,c,i,a,h){var f=this,b=g.getStore(),d=b.getAt(c);f.fireEvent("itemtap",this,g,c,i,a,h);if(d.isLeaf()){f.fireEvent("leafitemtap",this,g,c,i,a,h);f.goToLeaf(d)}else{this.goToNode(d)}},onBeforeSelect:function(){this.fireEvent("beforeselect",[this,Array.prototype.slice.call(arguments)])},onContainerTap:function(){this.fireEvent("containertap",[this,Array.prototype.slice.call(arguments)])},onSelectionChange:function(){this.fireEvent("selectionchange",[this,Array.prototype.slice.call(arguments)])},onItemDoubleTap:function(){this.fireEvent("itemdoubletap",[this,Array.prototype.slice.call(arguments)])},onStoreBeforeLoad:function(){var a=this.getLoadingText(),b=this.getScrollable();if(a){this.setMasked({xtype:"loadmask",message:a});if(b){b.getScroller().setDisabled(true)}}this.fireEvent("beforeload",[this,Array.prototype.slice.call(arguments)])},onStoreLoad:function(){this.setMasked(false);this.fireEvent("load",[this,Array.prototype.slice.call(arguments)])},onBackTap:function(){var d=this,c=d.getLastNode(),e=d.getDetailCard(),a=e&&d.getActiveItem()==e,b=d.getLastActiveList();this.fireAction("back",[this,c,b,a],"doBack")},doBack:function(e,d,c,a){var b=e.getLayout(),f=(b)?b.getAnimation():null;if(a&&c){if(f){f.setReverse(true)}e.setActiveItem(c);e.setLastNode(d.parentNode);e.syncToolbar()}else{this.goToNode(d.parentNode)}},updateData:function(a){if(!this.getStore()){this.setStore(new Ext.data.TreeStore({root:a}))}},applyStore:function(a){if(a){a=Ext.data.StoreManager.lookup(a);if(a&&Ext.isObject(a)&&a.isStore){a.on({scope:this,load:"onStoreLoad",beforeload:"onStoreBeforeLoad"})}}return a},updateStore:function(a,c){var b=this;if(c&&Ext.isObject(c)&&c.isStore){if(c.autoDestroy){c.destroy()}c.un({rootchange:"onStoreRootChange",scope:this})}if(a){b.goToNode(a.getRoot());a.on({rootchange:"onStoreRootChange",scope:this})}},onStoreRootChange:function(a,b){this.goToNode(b)},applyBackButton:function(a){return Ext.factory(a,Ext.Button,this.getBackButton())},applyDetailCard:function(a){return this.factoryItem(a)},updateBackButton:function(b,a){if(b){var c=this;b.on("tap",c.onBackTap,c);b.setText(c.getBackText());c.getToolbar().insert(0,b)}else{if(a){a.destroy()}}},applyToolbar:function(a){return Ext.factory(a,Ext.TitleBar,this.getToolbar())},updateToolbar:function(a,b){var c=this;if(a){a.setTitle(c.getTitle());if(!a.getParent()){c.add(a)}}else{if(b){b.destroy()}}},updateUseToolbar:function(a,b){if(!a){this.setToolbar(false)}},updateTitle:function(c){var b=this,a=b.getToolbar();if(a){if(b.getUpdateTitleText()){a.setTitle(c)}}},getItemTextTpl:function(a){return"{"+this.getDisplayField()+"}"},getTitleTextTpl:function(a){return"{"+this.getDisplayField()+"}"},renderTitleText:function(b,c){if(!b.titleTpl){b.titleTpl=Ext.create("Ext.XTemplate",this.getTitleTextTpl(b))}if(b.isRoot()){var a=this.getInitialConfig("title");return(c&&a==="")?this.getInitialConfig("backText"):a}return b.titleTpl.applyTemplate(b.data)},goToNode:function(a){if(!a){return}var i=this,d=i.getActiveItem(),k=i.getDetailCard(),j=k&&i.getActiveItem()==k,h=i.goToNodeReverseAnimation(a),c=i.firstList,e=i.secondList,f=i.getLayout(),b=(f)?f.getAnimation():null,g;if(a.isLeaf()){throw new Error("goToNode: passed a node which is a leaf.")}if(a==i.getLastNode()&&!j){return}if(j){if(b){b.setReverse(true)}i.setActiveItem(i.getLastActiveList())}else{if(c&&e){d=i.getActiveItem();i.setLastActiveList(d);g=(d==c)?e:c;g.getStore().setNode(a);a.expand();if(b){b.setReverse(h)}i.setActiveItem(g);g.deselectAll()}else{if(c){i.setLastActiveList(i.getActiveItem());i.setActiveItem(i.getList(a));i.secondList=i.getActiveItem()}else{i.setActiveItem(i.getList(a));i.firstList=i.getActiveItem()}}}i.fireEvent("listchange",this,i.getActiveItem());i.setLastNode(a);i.syncToolbar()},goToLeaf:function(f){if(!f.isLeaf()){throw new Error("goToLeaf: passed a node which is not a leaf.")}var e=this,c=e.getDetailCard(f),b=e.getDetailContainer(),a=b==this,d=e.getLayout(),g=(d)?d.getAnimation():false;if(c){if(b.getItems().indexOf(c)===-1){b.add(c)}if(a){if(e.getActiveItem() instanceof Ext.dataview.List){e.setLastActiveList(e.getActiveItem())}e.setLastNode(f)}if(g){g.setReverse(false)}b.setActiveItem(c);e.syncToolbar()}},syncToolbar:function(g){var e=this,f=e.getDetailCard(),d=e.getLastNode(),b=g||(f&&(e.getActiveItem()==f)),a=(b)?d:d.parentNode,c=e.getBackButton();if(c){c[a?"show":"hide"]();if(a&&e.getUseTitleAsBackText()){c.setText(e.renderTitleText(d.parentNode,true))}}if(d){e.setTitle(e.renderTitleText(d))}},updateBackText:function(a){this.getBackButton().setText(a)},goToNodeReverseAnimation:function(c){var b=this,a=b.getLastNode();if(!a){return false}return(!a.contains(c)&&a.isAncestor(c))?true:false},getList:function(b){var a=this,c=Ext.create("Ext.data.NodeStore",{recursive:false,node:b,rootVisible:false,model:a.getStore().getModel()});b.expand();return Ext.Object.merge({xtype:"list",pressedDelay:250,autoDestroy:true,store:c,onItemDisclosure:a.getOnItemDisclosure(),allowDeselect:a.getAllowDeselect(),listeners:[{event:"itemdoubletap",fn:"onItemDoubleTap",scope:a},{event:"itemtap",fn:"onItemInteraction",scope:a,order:"before"},{event:"itemtouchstart",fn:"onItemInteraction",scope:a,order:"before"},{event:"itemtap",fn:"onItemTap",scope:a},{event:"beforeselect",fn:"onBeforeSelect",scope:a},{event:"containertap",fn:"onContainerTap",scope:a},{event:"selectionchange",fn:"onSelectionChange",scope:a}],itemTpl:'<span<tpl if="leaf == true"> class="x-list-item-leaf"</tpl>>'+a.getItemTextTpl(b)+"</span>"},this.getListConfig())}},function(){});Ext.define("Ext.form.FieldSet",{extend:"Ext.Container",alias:"widget.fieldset",requires:["Ext.Title"],config:{baseCls:Ext.baseCSSPrefix+"form-fieldset",title:null,instructions:null},applyTitle:function(a){if(typeof a=="string"){a={title:a}}Ext.applyIf(a,{docked:"top",baseCls:this.getBaseCls()+"-title"});return Ext.factory(a,Ext.Title,this.getTitle())},updateTitle:function(b,a){if(b){this.add(b)}if(a){this.remove(a)}},applyInstructions:function(a){if(typeof a=="string"){a={title:a}}Ext.applyIf(a,{docked:"bottom",baseCls:this.getBaseCls()+"-instructions"});return Ext.factory(a,Ext.Title,this.getInstructions())},updateInstructions:function(b,a){if(b){this.add(b)}if(a){this.remove(a)}}});Ext.define("Ext.form.Panel",{alternateClassName:"Ext.form.FormPanel",extend:"Ext.Panel",xtype:"formpanel",requires:["Ext.XTemplate","Ext.field.Checkbox","Ext.Ajax"],config:{baseCls:Ext.baseCSSPrefix+"form",standardSubmit:false,url:null,baseParams:null,submitOnAction:true,record:null,method:"post",scrollable:{translationMethod:"scrollposition"}},getElementConfig:function(){var a=this.callParent();a.tag="form";return a},initialize:function(){var a=this;a.callParent();a.on({action:"onFieldAction",scope:a});a.element.on({submit:"onSubmit",scope:a})},updateRecord:function(c){var a,b,d;if(c&&(a=c.fields)){b=this.getValues();for(d in b){if(b.hasOwnProperty(d)&&a.containsKey(d)){c.set(d,b[d])}}}return this},setRecord:function(a){var b=this;if(a&&a.data){b.setValues(a.data)}b._record=a;return this},onSubmit:function(b){var a=this;if(b&&!a.getStandardSubmit()){b.stopEvent()}a.fireAction("submit",[a,a.getValues(true),b],"doSubmit")},doSubmit:function(b,a,c){if(c){c.stopEvent()}},onFieldAction:function(a){if(this.getSubmitOnAction()){a.blur();this.submit()}},submit:function(a){var c=this,b=c.element.dom||{},d;a=Ext.apply({url:c.getUrl()||b.action,submit:false,method:c.getMethod()||b.method||"post",autoAbort:false,params:null,waitMsg:null,headers:null,success:null,failure:null},a||{});d=c.getValues(c.getStandardSubmit()||!a.submitDisabled);return c.fireAction("beforesubmit",[c,d,a],"doBeforeSubmit")},doBeforeSubmit:function(c,d,a){var b=c.element.dom||{};if(c.getStandardSubmit()){if(a.url&&Ext.isEmpty(b.action)){b.action=a.url}b.method=(a.method||b.method).toLowerCase();b.submit()}else{if(a.waitMsg){c.setMasked(a.waitMsg)}return Ext.Ajax.request({url:a.url,method:a.method,rawData:Ext.urlEncode(Ext.apply(Ext.apply({},c.getBaseParams()||{}),a.params||{},d)),autoAbort:a.autoAbort,headers:Ext.apply({"Content-Type":"application/x-www-form-urlencoded; charset=UTF-8"},a.headers||{}),scope:c,callback:function(e,j,f){var h=this,i=f.responseText,g;h.setMasked(false);g=function(){if(Ext.isFunction(a.failure)){a.failure.call(a.scope||h,h,f,i)}h.fireEvent("exception",h,f)};if(j){f=Ext.decode(i);j=!!f.success;if(j){if(Ext.isFunction(a.success)){a.success.call(a.scope||h,h,f,i)}h.fireEvent("submit",h,f)}else{g()}}else{g()}}})}},setValues:function(b){var a=this.getFields(),c,e,d;b=b||{};for(c in b){if(b.hasOwnProperty(c)){e=a[c];d=b[c];if(e){if(Ext.isArray(e)){e.forEach(function(g){if(g.isRadio){g.setGroupValue(d)}else{if(Ext.isArray(b[c])){g.setChecked((d.indexOf(g.getValue())!=-1))}else{g.setChecked((d==g.getValue()))}}})}else{if(e.setChecked){e.setChecked(d)}else{e.setValue(d)}}}}}return this},getValues:function(d){var a=this.getFields(),b={},g,c,f,e;for(c in a){if(a.hasOwnProperty(c)){if(Ext.isArray(a[c])){b[c]=[];f=a[c].length;for(e=0;e<f;e++){g=a[c][e];if(!g.getChecked){b[c]=g.getValue();break}if(!(d&&g.getDisabled())){if(g.isRadio){b[c]=g.getGroupValue()}else{b[c].push(g.getValue())}}}}else{g=a[c];if(!(d&&g.getDisabled())){if(g.isCheckbox){b[c]=(g.getChecked())?g.getValue():null}else{b[c]=g.getValue()}}}}}return b},reset:function(){this.getFieldsAsArray().forEach(function(a){a.reset()});return this},enable:function(){this.getFieldsAsArray().forEach(function(a){a.enable()});return this},disable:function(){this.getFieldsAsArray().forEach(function(a){a.disable()});return this},getFieldsAsArray:function(){var a=[],b=function(c){if(c.isField){a.push(c)}if(c.isContainer){c.getItems().each(b)}};this.getItems().each(b);return a},getFields:function(b){var a={},d;var c=function(e){if(e.isField){d=e.getName();if((b&&d==b)||typeof b=="undefined"){if(a.hasOwnProperty(d)){if(!Ext.isArray(a[d])){a[d]=[a[d]]}a[d].push(e)}else{a[d]=e}}}if(e.isContainer){e.items.each(c)}};this.getItems().each(c);return(b)?(a[b]||[]):a},getFieldsArray:function(){var a=[];var b=function(c){if(c.isField){a.push(c)}if(c.isContainer){c.items.each(b)}};this.items.each(b);return a},getFieldsFromItem:Ext.emptyFn,showMask:function(a,b){a=Ext.isObject(a)?a.message:a;if(a){this.setMasked({xtype:"loadmask",message:a})}else{this.setMasked(true)}return this},hideMask:function(){this.setMasked(false);return this},getFocusedField:function(){var a=this.getFieldsArray(),c=a.length,d,b;for(b=0;b<c;b++){d=a[b];if(d.isFocused){return d}}return null},getNextField:function(){var a=this.getFieldsArray(),c=this.getFocusedField(),d=a.length,b;if(c){b=a.indexOf(c);if(b!==a.length-1){b++;return a[b]}}return false},focusNextField:function(){var a=this.getNextField();if(a){a.focus();return a}return false},getPreviousField:function(){var a=this.getFieldsArray(),c=this.getFocusedField(),d=a.length,b;if(c){b=a.indexOf(c);if(b!==0){b--;return a[b]}}return false},focusPreviousField:function(){var a=this.getPreviousField();if(a){a.focus();return a}return false}},function(){});Ext.define("Ext.navigation.Bar",{extend:"Ext.Container",requires:["Ext.Button","Ext.TitleBar","Ext.Spacer","Ext.util.SizeMonitor"],isToolbar:true,config:{baseCls:Ext.baseCSSPrefix+"toolbar",cls:Ext.baseCSSPrefix+"navigation-bar",ui:"dark",title:null,defaultType:"button",layout:{type:"hbox"},defaultBackButtonText:"Back",animation:{duration:300},useTitleForBackButtonText:null,view:null,backButton:{align:"left",ui:"back",hidden:true}},minBackButtonWidth:80,constructor:function(a){a=a||{};if(!a.items){a.items=[]}this.callParent([a])},beforeInitialize:function(){this.backButtonStack=[];this.lastAnimationProperties={};this.animating=false;this.onSizeMonitorChange=Ext.Function.createThrottled(this.onSizeMonitorChange,50,this)},initialize:function(){var a=this;a.on({painted:"onPainted",erased:"onErased"});a.onSizeMonitorChange()},updateView:function(f,a){var c=this.getBackButton(),e,b,d;this.getItems();if(f){this.backButtonStack=[];e=f.getInnerItems();for(b=0;b<e.length;b++){this.backButtonStack.push(e[b].config.title||"&nbsp;")}this.titleComponent.setTitle(this.getTitleText());d=this.getBackButtonText();if(d){c.setText(this.getBackButtonText());c.show()}}},onViewAdd:function(a,c,b){var d=a.getLayout().getAnimation();this.endAnimation();this.backButtonStack.push(c.config.title||"&nbsp;");this.refreshNavigationBarProxy();if(d&&d.isAnimation&&a.isPainted()){if(this.backButtonStack.length>1){this.pushBackButtonAnimated(this.getBackButtonText())}this.pushTitleAnimated(this.getTitleText())}else{if(this.backButtonStack.length>1){this.pushBackButton(this.getBackButtonText())}this.pushTitle(this.getTitleText())}},onViewRemove:function(a,c,b){var d=a.getLayout().getAnimation();this.endAnimation();this.backButtonStack.pop();this.refreshNavigationBarProxy();if(d&&d.isAnimation&&a.isPainted()){this.popBackButtonAnimated(this.getBackButtonText());this.popTitleAnimated(this.getTitleText())}else{this.popBackButton(this.getBackButtonText());this.popTitle(this.getTitleText())}},endAnimation:function(){var c=this.lastAnimationProperties,d,b,a;if(c){for(d in c){b=Ext.get(d);for(a in c[d].to){b.setStyle(a,c[d][a])}if(c[d].onEnd){c[d].onEnd.call(this)}}}},applyBackButton:function(a){return Ext.factory(a,Ext.Button,this.getBackButton())},updateBackButton:function(a,b){if(b){this.remove(b)}if(a){this.add(a);a.on({scope:this,tap:this.onBackButtonTap})}},onBackButtonTap:function(){this.fireEvent("back",this)},updateUseTitleForBackButtonText:function(a){var b=this.getBackButton();if(b){b.setText(this.getBackButtonText())}this.onSizeMonitorChange()},onPainted:function(){this.painted=true;this.sizeMonitor.refresh();this.onSizeMonitorChange()},onErased:function(){this.painted=false},applyItems:function(c){var e=this;if(!e.initialized){var f=e.getDefaults()||{},a,b,d;e.leftBox=a=e.add({xtype:"container",style:"position: relative",layout:{type:"hbox",align:"center"}});e.spacer=d=e.add({xtype:"component",style:"position: relative",flex:1});e.rightBox=b=e.add({xtype:"container",style:"position: relative",layout:{type:"hbox",align:"center"}});e.titleComponent=e.add({xtype:"title",hidden:f.hidden,centered:true});e.sizeMonitor=new Ext.util.SizeMonitor({element:e.element,callback:e.onSizeMonitorChange,scope:e});e.doAdd=e.doBoxAdd;e.doInsert=e.doBoxInsert}e.callParent(arguments)},doBoxAdd:function(a){if(a.config.align=="right"){this.rightBox.add(a)}else{this.leftBox.add(a)}},doBoxInsert:function(a,b){if(b.config.align=="right"){this.rightBox.add(b)}else{this.leftBox.add(b)}},onSizeMonitorChange:function(){if(!this.rendered){return}var c=this.getBackButton(),a=this.titleComponent;if(c&&c.rendered){c.setWidth(null)}this.refreshNavigationBarProxy();var b=this.getNavigationBarProxyProperties();if(c&&c.rendered){c.setWidth(b.backButton.width)}a.setStyle("-webkit-transform",null);a.setWidth(b.title.width);a.element.setLeft(b.title.left)},getBackButtonAnimationProperties:function(){var c=this,b=c.element,h=c.getBackButton().element,e=c.titleComponent.element,g=Math.min(b.getWidth()/3,200),a=this.getNavigationBarProxyProperties(),d,f;d=e.getX()-b.getX();f=b.getX()-h.getX()-h.getWidth();d=Math.min(d,g);return{element:{from:{left:d,width:a.backButton.width,opacity:0},to:{left:0,width:a.backButton.width,opacity:1}},ghost:{from:null,to:{left:f,opacity:0}}}},getBackButtonAnimationReverseProperties:function(){var d=this,c=d.element,h=d.getBackButton().element,f=d.titleComponent.element,b=Math.min(c.getWidth()/3,200),a=this.getNavigationBarProxyProperties(),e,g;e=c.getX()-h.getX()-h.getWidth();g=f.getX()-h.getWidth();g=Math.min(g,b);return{element:{from:{left:e,width:a.backButton.width,opacity:0},to:{left:0,width:a.backButton.width,opacity:1}},ghost:{from:null,to:{left:g,opacity:0}}}},getTitleAnimationProperties:function(){var c=this,b=c.element,e=c.titleComponent.element,a=this.getNavigationBarProxyProperties(),d,f;d=b.getWidth()-e.getX();f=b.getX()-e.getX()+a.backButton.width;if((a.backButton.left+e.getWidth())>e.getX()){f=b.getX()-e.getX()-e.getWidth()}return{element:{from:{left:d,width:a.title.width,opacity:0},to:{left:a.title.left,width:a.title.width,opacity:1}},ghost:{from:e.getLeft(),to:{left:f,opacity:0}}}},getTitleAnimationReverseProperties:function(){var d=this,c=d.element,f=d.titleComponent.element,a=this.getNavigationBarProxyProperties(),b=0,e,g;b=f.getLeft();f.setLeft(0);e=c.getX()-f.getX()+a.backButton.width;g=c.getX()+c.getWidth();if((a.backButton.left+f.getWidth())>f.getX()){e=c.getX()-f.getX()-f.getWidth()}return{element:{from:{left:e,width:a.title.width,opacity:0},to:{left:a.title.left,width:a.title.width,opacity:1}},ghost:{from:b,to:{left:g,opacity:0}}}},animate:function(c,d,h,g,b){var e=this,a={element:d,easing:"ease-in-out",duration:this.getAnimation().duration,replacePrevious:true,preserveEndState:true},f;this.lastAnimationProperties[d.id]={to:g,onEnd:b};d.setLeft(0);if(Ext.os.is.Android){if(h){a.from={left:h.left,opacity:h.opacity};if(h.width){a.from.width=h.width}}if(g){a.to={left:g.left,opacity:g.opacity};if(g.width){a.to.width=g.width}}}else{if(h){a.from={transform:{translateX:h.left},opacity:h.opacity};if(h.width){a.from.width=h.width}}if(g){a.to={transform:{translateX:g.left},opacity:g.opacity};if(g.width){a.to.width=g.width}}}fn=function(){if(b){b.call(e)}if(c&&Ext.isNumber(g.width)){c.setWidth(g.width)}e.lastAnimationProperties={}};f=new Ext.fx.Animation(a);f.on("animationend",fn,this);Ext.Animator.run(f)},getBackButtonText:function(){var b=this.backButtonStack[this.backButtonStack.length-2],a=this.getUseTitleForBackButtonText();if(!a){if(b){b=this.getDefaultBackButtonText()}}return b},getTitleText:function(){return this.backButtonStack[this.backButtonStack.length-1]},pushBackButton:function(c){var b=this.getBackButton();b.setText(c);b.show();var a=this.getBackButtonAnimationProperties(),d=a.element.to;if(d.left){b.setLeft(d.left)}if(d.width){b.setWidth(d.width)}},pushBackButtonAnimated:function(f){var e=this;var d=e.getBackButton(),b=d.getText(),g=d.element,c=e.getBackButtonAnimationProperties(),a;if(b){a=e.createProxy(d)}d.setText(this.getBackButtonText());d.show();e.animate(d,g,c.element.from,c.element.to,function(){e.animating=false});if(a){e.animate(null,a,c.ghost.from,c.ghost.to,function(){a.destroy()})}},popBackButton:function(c){var b=this.getBackButton();b.setText(null);if(c){b.setText(this.getBackButtonText())}else{b.hide()}var a=this.getBackButtonAnimationReverseProperties(),d=a.element.to;if(d.left){b.setLeft(d.left)}if(d.width){b.setWidth(d.width)}},popBackButtonAnimated:function(f){var e=this;var d=e.getBackButton(),b=d.getText(),g=d.element,c=e.getBackButtonAnimationReverseProperties(),a;if(b){a=e.createProxy(d)}if(f&&e.backButtonStack.length){d.setText(this.getBackButtonText());d.show();e.animate(d,g,c.element.from,c.element.to)}else{d.hide()}if(a){e.animate(null,a,c.ghost.from,c.ghost.to,function(){a.destroy();if(!f){d.setText(null)}})}},pushTitle:function(e){var c=this.titleComponent,b=c.element,a=this.getTitleAnimationProperties(),d=a.element.to;c.setTitle(e);if(d.left){b.setLeft(d.left)}if(d.width){c.setWidth(d.width)}},pushTitleAnimated:function(h){var e=this;var d=e.getBackButton(),b=(d)?d.getText():null,g=e.titleComponent,f=g.element,c,a;if(b){a=e.createProxy(g,true)}g.setTitle(h);c=e.getTitleAnimationProperties();e.animate(g,f,c.element.from,c.element.to);if(a){e.animate(null,a,c.ghost.from,c.ghost.to,function(){a.destroy()})}},popTitle:function(e){var c=this.titleComponent,b=c.element,a=this.getTitleAnimationReverseProperties(),d=a.element.to;c.setTitle(e);if(d.left){b.setLeft(d.left)}if(d.width){c.setWidth(d.width)}},popTitleAnimated:function(h){var e=this;var d=e.getBackButton(),b=e.titleComponent.getTitle(),g=e.titleComponent,f=g.element,c=e.getTitleAnimationReverseProperties(),a;if(b){a=e.createProxy(g,true)}g.setTitle(h||"");e.animate(g,f,c.element.from,c.element.to,function(){e.animating=false});if(a){e.animate(null,a,c.ghost.from,c.ghost.to,function(){a.destroy()})}},createNavigationBarProxy:function(){var a=this.proxy;if(a){return}this.proxy=a=Ext.create("Ext.TitleBar",{items:[{xtype:"button",ui:"back",text:""}],title:this.backButtonStack[0]});a.backButton=a.down("button[ui=back]");Ext.getBody().appendChild(a.element);a.element.setStyle("position","absolute");a.element.setStyle("visibility","hidden");a.element.setX(0);a.element.setY(-1000)},getNavigationBarProxyProperties:function(){return{title:{left:this.proxy.titleComponent.element.getLeft(),width:this.proxy.titleComponent.element.getWidth()},backButton:{left:this.proxy.backButton.element.getLeft(),width:this.proxy.backButton.element.getWidth()}}},refreshNavigationBarProxy:function(){var c=this.proxy,b=this.element,a=this.backButtonStack,e=a[a.length-1],d=this.getBackButtonText();if(!c){this.createNavigationBarProxy();c=this.proxy}c.element.setWidth(b.getWidth());c.element.setHeight(b.getHeight());c.setTitle(e);if(d){c.backButton.setText(d);c.backButton.show()}else{c.backButton.hide()}c.refreshTitlePosition()},onBeforePop:function(b){b--;for(var a=0;a<b;a++){this.backButtonStack.pop()}},doSetHidden:function(a){if(!a){this.element.setStyle({position:"relative",top:"auto",left:"auto",width:"auto"})}else{this.element.setStyle({position:"absolute",top:"-1000px",left:"-1000px",width:this.element.getWidth()+"px"})}},createProxy:function(b,a){var c=(a)?b.element.getParent():b.element,d=Ext.get(c.id+"-proxy");if(!d){d=c.dom.cloneNode(true);d.id=c.id+"-proxy";c.getParent().dom.appendChild(d);d=Ext.get(d);d.setStyle("position","absolute");d.setY(c.getY());d.setX(c.getX())}return d}});Ext.define("Ext.navigation.View",{extend:"Ext.Container",alternateClassName:"Ext.NavigationView",xtype:"navigationview",requires:["Ext.navigation.Bar"],config:{baseCls:Ext.baseCSSPrefix+"navigationview",navigationBar:{docked:"top"},defaultBackButtonText:"Back",useTitleForBackButtonText:false,layout:{type:"card",animation:{duration:300,easing:"ease-out",type:"slide",direction:"left"}}},initialize:function(){this.getNavigationBar().on({scope:this,back:this.onBackButtonTap});this.relayEvents(this,{add:"push",remove:"pop"})},applyLayout:function(a){a=a||{};if(Ext.os.is.Android){a.animation=false}return a},onBackButtonTap:function(){this.pop();this.fireEvent("back",this)},push:function(a){return this.add(a)},pop:function(a){if(this.onBeforePop(a)){return this.doPop()}},onBeforePop:function(f){var e=this,g=this.getInnerItems(),d=g.length,b,c,a;if(!Ext.isNumber(f)||f<1){f=1}f=Math.min(f,d-1);if(f){e.getNavigationBar().onBeforePop(f);b=g.splice(-f,f-1);for(a=0;a<b.length;a++){this.remove(b[a])}return true}return false},doPop:function(a){var c=this,e=this.getInnerItems(),b=c.getLayout(),d=b.getAnimation();c.remove(e[e.length-1]);return this.getActiveItem()},getPreviousItem:function(){var a=this.getInnerItems();return a[a.length-2]},updateUseTitleForBackButtonText:function(b){var a=this.getNavigationBar();if(a){a.setUseTitleForBackButtonText(b)}},applyNavigationBar:function(a){if(!a){a={hidden:true,docked:"top"}}if(a.title){delete a.title}a.view=this;return Ext.factory(a,Ext.navigation.Bar,this.getNavigationBar())},updateNavigationBar:function(a,c){if(c){this.remove(c)}if(a){var b=this.getLayout(),d=(b&&b.isLayout)?b.getAnimation():false;if(d&&d.isAnimation){a.setAnimation(d.config)}this.add(a)}},applyActiveItem:function(c,a){var b=this.getInnerItems();this.getItems();if(!this.initialized){c=b.length-1}if(typeof c=="number"){c=Math.max(0,Math.min(c,b.length-1));c=b[c];if(c){return c}else{if(a){return null}}}else{if(c){if(!c.isComponent){c=this.factoryItem(c)}if(!this.has(c)){this.add(c)}return c}}},remove:function(d,b){var c=this,a=c.indexOf(d),f=this.getInnerItems(),e=this.getLayout().getAnimation(),g;if(b===undefined){b=c.getAutoDestroy()}if(a!==-1){if(!this.removingAll&&f.length>1&&d===this.getActiveItem()){this.on({activeitemchange:"doRemove",scope:this,single:true,order:"after",args:[d,a,b]});g=f.indexOf(d);if(g>0){if(e&&e.isAnimation){e.setReverse(true)}this.setActiveItem(g-1);this.getNavigationBar().onViewRemove(this,f[g],g)}}else{this.doRemove(d,a,b)}}return c},doRemove:function(){var a=this.getLayout().getAnimation();if(a&&a.isAnimation){a.setReverse(false)}this.callParent(arguments)},onItemAdd:function(b,a){this.doItemLayoutAdd(b,a);if(!this.isItemsInitializing&&b.isInnerItem()){this.setActiveItem(b);this.getNavigationBar().onViewAdd(this,b,a)}if(this.initialized){this.fireEvent("add",this,b,a)}},reset:function(){this.pop(this.getInnerItems().length)}});Ext.define("Ext.picker.Slot",{extend:"Ext.DataView",xtype:"pickerslot",alternateClassName:"Ext.Picker.Slot",requires:["Ext.XTemplate","Ext.data.Store","Ext.Component","Ext.data.StoreManager"],isSlot:true,config:{title:null,showTitle:true,cls:Ext.baseCSSPrefix+"picker-slot",name:null,value:null,flex:1,align:"left",displayField:"text",valueField:"value",scrollable:{direction:"vertical",indicators:false,momentumEasing:{minVelocity:2},slotSnapEasing:{duration:100}}},constructor:function(){this.selectedIndex=0;this.callParent(arguments)},applyTitle:function(a){if(a){a=Ext.create("Ext.Component",{cls:Ext.baseCSSPrefix+"picker-slot-title",docked:"top",html:a})}return a},updateTitle:function(b,a){if(b){this.add(b);this.setupBar()}if(a){this.remove(a)}},updateShowTitle:function(a){var b=this.getTitle();if(b){b[a?"show":"hide"]();this.setupBar()}},updateDisplayField:function(a){this.setItemTpl('<div class="'+Ext.baseCSSPrefix+'picker-item {cls} <tpl if="extra">'+Ext.baseCSSPrefix+'picker-invalid</tpl>">{'+a+"}</div>")},updateAlign:function(a,c){var b=this.element;b.addCls(Ext.baseCSSPrefix+"picker-"+a);b.removeCls(Ext.baseCSSPrefix+"picker-"+c)},applyData:function(d){var f=[],c=d&&d.length,a,b,e;if(d&&Ext.isArray(d)&&c){for(a=0;a<c;a++){b=d[a];e={};if(Ext.isArray(b)){e[this.valueField]=b[0];e[this.displayField]=b[1]}else{if(Ext.isString(b)){e[this.valueField]=b;e[this.displayField]=b}else{if(Ext.isObject(b)){e=b}}}f.push(e)}}return d},updateData:function(a){this.setStore(Ext.create("Ext.data.Store",{model:"x-textvalue",data:a}))},initialize:function(){this.callParent();var a=this.getScrollable().getScroller();this.on({scope:this,painted:"onPainted",itemtap:"doItemTap"});a.on({scope:this,scrollend:"onScrollEnd"})},onPainted:function(){this.setupBar()},getPicker:function(){if(!this.picker){this.picker=this.getParent()}return this.picker},setupBar:function(){if(!this.rendered){return}var b=this.element,g=this.innerElement,h=this.getPicker(),i=h.bar,m=this.getValue(),c=this.getShowTitle(),l=this.getTitle(),j=this.getScrollable(),f=j.getScroller(),e=0,o,d,n,k,a;o=i.getY();d=b.getY();if(c&&l){d+=l.element.getHeight()}n=i.getHeight();if(c&&l){e=l.element.getHeight()}k=Math.ceil((b.getHeight()-e-n)/2);this.slotPadding=k;g.setStyle({padding:k+"px 0 "+(k)+"px"});f.refresh();f.setSlotSnapSize(n);this.setValue(m)},doItemTap:function(d,a,c,f){var b=this;b.selectedIndex=a;b.selectedNode=c;b.scrollToItem(c,true);b.fireEvent("slotpick",b,b.getValue(),b.selectedNode)},scrollToItem:function(e,d){var h=e.getY(),c=e.parent(),f=c.getY(),b=this.getScrollable(),a=b.getScroller(),g;g=h-f;a.scrollTo(0,g,d)},onScrollEnd:function(b,a,g){var f=this,d=Math.round(g/f.picker.bar.getHeight()),c=f.getViewItems(),e=c[d];if(e){f.selectedIndex=d;f.selectedNode=e;f.fireEvent("slotpick",f,f.getValue(),f.selectedNode)}},getValue:function(){var b=this.getStore(),a,c;if(!b){return}if(this._value===false){return null}a=b.getAt(this.selectedIndex);c=a?a.get(this.getValueField()):null;this._value=c;return c},setValue:function(f){if(!Ext.isDefined(f)){return}if(!this.rendered||!f){this._value=f;return}var b=this.getStore(),a=this.getViewItems(),d=this.getValueField(),c,e;c=b.find(d,f);if(c!=-1){e=Ext.get(a[c]);this.selectedIndex=c;this.scrollToItem(e);this._value=f}},setValueAnimated:function(f){if(!f){return}if(!this.rendered){this._value=f;return}var b=this.getStore(),a=this.getViewItems(),d=this.getValueField(),c,e;c=b.find(d,f);if(c!=-1){e=Ext.get(a[c]);this.selectedIndex=c;this.scrollToItem(e,{duration:100});this._value=f}}});Ext.define("Ext.picker.Picker",{extend:"Ext.Sheet",alias:"widget.picker",alternateClassName:"Ext.Picker",requires:["Ext.picker.Slot","Ext.Toolbar","Ext.data.Model"],isPicker:true,config:{cls:Ext.baseCSSPrefix+"picker",doneButton:true,cancelButton:true,useTitles:false,slots:null,value:null,height:220,layout:{type:"hbox",align:"stretch"},centered:false,left:0,right:0,bottom:0,defaultType:"pickerslot",toolbar:true},initElement:function(){this.callParent(arguments);var b=this,a=Ext.baseCSSPrefix,c=this.innerElement;this.mask=c.createChild({cls:a+"picker-mask"});this.bar=this.mask.createChild({cls:a+"picker-bar"});b.on({scope:this,delegate:"pickerslot",slotpick:"onSlotPick"});b.on({scope:this,show:"onShow"})},applyToolbar:function(a){if(a===true){a={}}Ext.applyIf(a,{docked:"top"});return Ext.factory(a,"Ext.TitleBar",this.getToolbar())},updateToolbar:function(a,b){if(a){this.add(a)}if(b){this.remove(b)}},applyDoneButton:function(a){if(a){if(Ext.isBoolean(a)){a={}}if(typeof a=="string"){a={text:a}}Ext.applyIf(a,{ui:"action",align:"right",text:"Done"})}return Ext.factory(a,"Ext.Button",this.getDoneButton())},updateDoneButton:function(c,a){var b=this.getToolbar();if(c){b.add(c);c.on("tap",this.onDoneButtonTap,this)}else{if(a){b.remove(a)}}},applyCancelButton:function(a){if(a){if(Ext.isBoolean(a)){a={}}if(typeof a=="string"){a={text:a}}Ext.applyIf(a,{align:"left",text:"Cancel"})}return Ext.factory(a,"Ext.Button",this.getCancelButton())},updateCancelButton:function(b,a){var c=this.getToolbar();if(b){c.add(b);b.on("tap",this.onCancelButtonTap,this)}else{if(a){c.remove(a)}}},updateUseTitles:function(d){var f=this.getInnerItems(),e=f.length,a=Ext.baseCSSPrefix+"use-titles",c,b;if(d){this.addCls(a)}else{this.removeCls(a)}for(c=0;c<e;c++){b=f[c];if(b.isSlot){b.setShowTitle(d)}}},applySlots:function(b){if(b){var c=b.length,a;for(a=0;a<c;a++){b[a].picker=this}}return b},updateSlots:function(a){this.removeAll();if(a){this.add(a)}this.updateUseTitles(this.getUseTitles())},onDoneButtonTap:function(){this.fireEvent("change",this,this.getValue());this.hide()},onCancelButtonTap:function(){this.fireEvent("cancel",this);this.hide()},onSlotPick:function(c,b,a){this.fireEvent("pick",this,this.getValue(),c)},onShow:function(){if(!this.isHidden()){this.setValue(this._value)}},setValue:function(j,a){var f=this,d=f.getInnerItems(),e=d.length,h,g,c,b;if(!j){j={};for(b=0;b<e;b++){j[d[b].config.name]=false}}for(h in j){value=j[h];for(b=0;b<d.length;b++){c=d[b];if(c.config.name==h){g=c;break}}if(g){if(a){g.setValueAnimated(value)}else{g.setValue(value)}}}f._value=j;f._values=j;return f},setValueAnimated:function(a){this.setValue(a,true)},getValue:function(){var d=this.getParent(),b={},a=this.getItems().items,f=a.length,e,c;if(d){for(c=0;c<f;c++){e=a[c];if(e&&e.isSlot){b[e.getName()]=e.getValue()}}this._values=b}return this._values},getValues:function(){return this.getValue()},destroy:function(){this.callParent();Ext.destroy(this.mask,this.bar)}},function(){Ext.define("x-textvalue",{extend:"Ext.data.Model",config:{fields:["text","value"]}})});Ext.define("Ext.field.Select",{extend:"Ext.field.Text",xtype:"selectfield",alternateClassName:"Ext.form.Select",requires:["Ext.Panel","Ext.picker.Picker","Ext.data.Store","Ext.data.StoreManager","Ext.List"],config:{ui:"select",valueField:"value",displayField:"text",store:null,options:null,hiddenName:null,component:{useMask:true},clearIcon:false,usePicker:"auto",defaultPhonePickerConfig:null,defaultTabletPickerConfig:null},constructor:function(a){a=a||{};if(!a.store){a.store=true}this.callParent([a])},initialize:function(){var b=this,a=b.getComponent();b.callParent();a.on({scope:b,masktap:"onMaskTap"});a.input.dom.disabled=true},updateDefaultPhonePickerConfig:function(b){var a=this.picker;if(a){a.setConfig(b)}},updateDefaultTabletPickerConfig:function(a){var b=this.listPanel;if(b){b.setConfig(a)}},applyUsePicker:function(a){if(a=="auto"){a=(Ext.os.deviceType=="Phone")}return Boolean(a)},syncEmptyCls:Ext.emptyFn,applyValue:function(c){var a=c,b;this.getOptions();if(!(c instanceof Ext.data.Model)){b=this.getStore().find(this.getValueField(),c,null,null,null,true);if(b==-1){b=this.getStore().find(this.getDisplayField(),c,null,null,null,true)}a=this.getStore().getAt(b)}return a},updateValue:function(b,a){this.previousRecord=a;this.record=b;this.callParent([b?b.get(this.getDisplayField()):""]);if(a!==b){this.fireEvent("change",this,b,a)}},getValue:function(){var a=this.record;return(a)?a.get(this.getValueField()):null},getRecord:function(){return this.record},getPhonePicker:function(){var a=this.getDefaultPhonePickerConfig();if(!this.picker){this.picker=Ext.create("Ext.picker.Picker",Ext.apply({slots:[{align:"center",name:this.getName(),valueField:this.getValueField(),displayField:this.getDisplayField(),value:this.getValue(),store:this.getStore()}],listeners:{change:this.onPickerChange,scope:this}},a))}return this.picker},getTabletPicker:function(){var a=this.getDefaultTabletPickerConfig();if(!this.listPanel){this.listPanel=Ext.create("Ext.Panel",Ext.apply({centered:true,modal:true,cls:Ext.baseCSSPrefix+"select-overlay",layout:"fit",hideOnMaskTap:true,items:{xtype:"list",store:this.getStore(),itemTpl:'<span class="x-list-label">{'+this.getDisplayField()+"}</span>",listeners:{select:this.onListSelect,itemtap:this.onListTap,scope:this}}},a))}return this.listPanel},onMaskTap:function(){if(this.getDisabled()){return false}this.showPicker();return false},showPicker:function(){if(this.getStore().getCount()===0){return}if(this.getReadOnly()){return}this.isFocused=true;if(this.getUsePicker()){var e=this.getPhonePicker(),d=this.getName(),h={};h[d]=this.record.get(this.getValueField());e.setValue(h);if(!e.getParent()){Ext.Viewport.add(e)}e.show()}else{var f=this.getTabletPicker(),g=f.down("list"),b=g.getStore(),c=b.find(this.getValueField(),this.getValue(),null,null,null,true),a=b.getAt((c==-1)?0:c);if(!f.getParent()){Ext.Viewport.add(f)}f.showBy(this.getComponent());g.select(a,null,true)}},onListSelect:function(c,a){var b=this;if(a){b.setValue(a)}},onListTap:function(){this.listPanel.hide({type:"fade",out:true,scope:this})},onPickerChange:function(d,f){var e=this,g=f[e.getName()],b=e.getStore(),c=b.find(e.getValueField(),g,null,null,null,true),a=b.getAt(c);e.setValue(a)},updateOptions:function(b){var a=this.getStore();if(!b){a.clearData()}else{a.setData(b);this.onStoreDataChanged(a)}},applyStore:function(a){if(a===true){a=Ext.create("Ext.data.Store",{fields:[this.getValueField(),this.getDisplayField()]})}if(a){a=Ext.data.StoreManager.lookup(a);a.on({scope:this,addrecords:this.onStoreDataChanged,removerecords:this.onStoreDataChanged,updaterecord:this.onStoreDataChanged,refresh:this.onStoreDataChanged})}return a},updateStore:function(a){if(a){this.onStoreDataChanged(a)}},onStoreDataChanged:function(a){var c=this.getInitialConfig(),b=this.getValue();if(Ext.isDefined(b)){this.updateValue(this.applyValue(b))}if(this.getValue()===null){if(c.hasOwnProperty("value")){this.setValue(c.value)}if(this.getValue()===null){if(a.getCount()>0){this.setValue(a.getAt(0))}}}},doSetDisabled:function(a){Ext.Component.prototype.doSetDisabled.apply(this,arguments)},setDisabled:function(){Ext.Component.prototype.setDisabled.apply(this,arguments)},reset:function(){var b=this.getStore(),a=(this.originalValue)?this.originalValue:b.getAt(0);if(b&&a){this.setValue(a)}return this},onFocus:function(a){this.fireEvent("focus",this,a);this.isFocused=true;this.showPicker()},destroy:function(){this.callParent(arguments);Ext.destroy(this.listPanel,this.picker,this.hiddenField)}});Ext.define("Ext.picker.Date",{extend:"Ext.picker.Picker",xtype:"datepicker",alternateClassName:"Ext.DatePicker",requires:["Ext.DateExtras"],config:{yearFrom:1980,yearTo:new Date().getFullYear(),monthText:"Month",dayText:"Day",yearText:"Year",slotOrder:["month","day","year"]},initialize:function(){this.callParent();this.on({scope:this,delegate:"> slot",slotpick:this.onSlotPick})},setValue:function(b,a){if(Ext.isDate(b)){b={day:b.getDate(),month:b.getMonth()+1,year:b.getFullYear()}}this.callParent([b,a])},getValue:function(){var h={},a,g,c,f,e=this.getItems().items,d=e.length,j,b;for(b=0;b<d;b++){j=e[b];if(j instanceof Ext.picker.Slot){h[j.getName()]=j.getValue()}}if(h.year===null&&h.month===null&&h.day===null){return null}f=Ext.isNumber(h.year)?h.year:1;c=Ext.isNumber(h.month)?h.month:1;g=Ext.isNumber(h.day)?h.day:1;if(c&&f&&c&&g){a=this.getDaysInMonth(c,f)}g=(a)?Math.min(g,a):g;return new Date(f,c-1,g)},updateYearFrom:function(){if(this.initialized){this.createSlots()}},updateYearTo:function(){if(this.initialized){this.createSlots()}},updateMonthText:function(a,b){var f=this.getInnerItems,e=f.length,d,c;if(this.initialized){for(c=0;c<e;c++){d=f[c];if((typeof d.title=="string"&&d.title==b)||(d.title.html==b)){d.setTitle(a)}}}},updateDayText:function(a,c){var f=this.getInnerItems,e=f.length,d,b;if(this.initialized){for(b=0;b<e;b++){d=f[b];if((typeof d.title=="string"&&d.title==c)||(d.title.html==c)){d.setTitle(a)}}}},updateYearText:function(e){var d=this.getInnerItems,c=d.length,b,a;if(this.initialized){for(a=0;a<c;a++){b=d[a];if(b.title==this.yearText){b.setTitle(e)}}}},constructor:function(){this.callParent(arguments);this.createSlots()},createSlots:function(){var k=this,c=this.getSlotOrder(),m=k.getYearFrom(),f=k.getYearTo(),g=[],l=[],b=[],j,e,d,a;if(m>f){e=m;m=f;f=e}for(d=m;d<=f;d++){g.push({text:d,value:d})}a=this.getDaysInMonth(1,new Date().getFullYear());for(d=0;d<a;d++){l.push({text:d+1,value:d+1})}for(d=0,j=Ext.Date.monthNames.length;d<j;d++){b.push({text:Ext.Date.monthNames[d],value:d+1})}var h=[];c.forEach(function(i){h.push(this.createSlot(i,l,b,g))},this);k.setSlots(h)},createSlot:function(b,d,a,c){switch(b){case"year":return{name:"year",align:"center",data:c,title:this.getYearText(),flex:3};case"month":return{name:b,align:"right",data:a,title:this.getMonthText(),flex:4};case"day":return{name:"day",align:"center",data:d,title:this.getDayText(),flex:2}}},onSlotPick:function(){var j=this.getValue(),h=this.getDaySlot(),f=j.getFullYear(),e=j.getMonth(),k=[],b=h,a,c;if(!j||!Ext.isDate(j)||!h){return}a=this.getDaysInMonth(e+1,f);for(c=0;c<a;c++){k.push({text:c+1,value:c+1})}if(h.getData().length==k.length){return}var g=h.getStore(),n=h.getViewItems(),m=h.getValueField(),d,l;h.setData(k);d=g.find(m,j.getDate());if(d==-1){return}l=Ext.get(n[d]);h.selectedIndex=d;h.scrollToItem(l);h._value=j},getDaySlot:function(){var c=this.getInnerItems(),b=c.length,a,d;if(this.daySlot){return this.daySlot}for(a=0;a<b;a++){d=c[a];if(d.isSlot&&d.getName()=="day"){this.daySlot=d;return d}}return null},getDaysInMonth:function(c,b){var a=[31,28,31,30,31,30,31,31,30,31,30,31];return c==2&&this.isLeapYear(b)?29:a[c-1]},isLeapYear:function(a){return !!((a&3)===0&&(a%100||(a%400===0&&a)))}});Ext.define("Ext.field.DatePicker",{extend:"Ext.field.Text",alternateClassName:"Ext.form.DatePicker",xtype:"datepickerfield",requires:["Ext.picker.Date","Ext.DateExtras"],config:{ui:"select",picker:true,clearIcon:false,destroyPickerOnHide:false,dateFormat:null,component:{useMask:true}},initialize:function(){this.callParent();this.getComponent().on({scope:this,masktap:"onMaskTap"});this.getComponent().input.dom.disabled=true},syncEmptyCls:Ext.emptyFn,applyValue:function(a){if(!Ext.isDate(a)&&!Ext.isObject(a)){a=null}if(Ext.isObject(a)){a=new Date(a.year,a.month-1,a.day)}return a},updateValue:function(b){var a=this._picker;if(a&&a.isPicker){a.setValue(b)}if(b!==null){this.getComponent().setValue(Ext.Date.format(b,this.getDateFormat()||Ext.util.Format.defaultDateFormat))}else{this.getComponent().setValue("")}if(this._picker&&this._picker instanceof Ext.picker.Date){this._picker.setValue(b)}},updateDateFormat:function(c,a){var b=this.getValue();if(c!=a&&Ext.isDate(b)&&this._picker&&this._picker instanceof Ext.picker.Date){this.getComponent().setValue(Ext.Date.format(b,c||Ext.util.Format.defaultDateFormat))}},getValue:function(){if(this._picker&&this._picker instanceof Ext.picker.Date){return this._picker.getValue()}return this._value},getFormattedValue:function(b){var a=this.getValue();return(Ext.isDate(a))?Ext.Date.format(a,b||this.getDateFormat()||Ext.util.Format.defaultDateFormat):a},applyPicker:function(b,a){if(a&&a.isPicker){b=a.setConfig(b)}return b},getPicker:function(){var a=this._picker;if(a&&!a.isPicker){a=Ext.factory(a,Ext.picker.Date);a.on({scope:this,change:"onPickerChange",hide:"onPickerHide"});a.hide();a.setValue(this.getValue());Ext.Viewport.add(a);this._picker=a}return a},onMaskTap:function(){if(this.getDisabled()){return false}if(this.getReadOnly()){return false}this.getPicker().show();return false},onPickerChange:function(a,c){var b=this;b.setValue(c);b.fireEvent("change",b,b.getValue())},onPickerHide:function(){var a=this.getPicker();if(this.getDestroyPickerOnHide()&&a){a.destroy();this.setPicker(null)}},reset:function(){this.setValue(this.originalValue)},destroy:function(){var a=this.getPicker();if(a){a.destroy()}this.callParent(arguments)}});Ext.define("Ext.slider.Thumb",{extend:"Ext.Component",xtype:"thumb",config:{baseCls:Ext.baseCSSPrefix+"thumb",draggable:{direction:"horizontal"}},elementWidth:0,initialize:function(){this.callParent();this.getDraggable().onBefore({dragstart:"onDragStart",drag:"onDrag",dragend:"onDragEnd",scope:this});this.on("painted","onPainted")},onDragStart:function(){if(this.isDisabled()){return false}this.relayEvent(arguments)},onDrag:function(){if(this.isDisabled()){return false}this.relayEvent(arguments)},onDragEnd:function(){if(this.isDisabled()){return false}this.relayEvent(arguments)},onPainted:function(){this.elementWidth=this.element.dom.offsetWidth},getElementWidth:function(){return this.elementWidth}});Ext.define("Ext.slider.Slider",{extend:"Ext.Container",xtype:"slider",requires:["Ext.slider.Thumb","Ext.fx.easing.EaseOut"],config:{baseCls:"x-slider",thumbConfig:{draggable:{translatable:{easingX:{duration:300,type:"ease-out"}}}},value:0,minValue:0,maxValue:100,increment:1,allowThumbsOverlapping:false,animation:true},elementWidth:0,offsetValueRatio:0,activeThumb:null,constructor:function(a){a=a||{};if(a.hasOwnProperty("values")){a.value=a.values}this.callParent([a])},initialize:function(){var a=this.element;this.callParent();a.on({scope:this,tap:"onTap"});this.on({scope:this,delegate:"> thumb",dragstart:"onThumbDragStart",drag:"onThumbDrag",dragend:"onThumbDragEnd"});this.on({painted:"refresh",resize:"refresh"})},factoryThumb:function(){return Ext.factory(this.getThumbConfig(),Ext.slider.Thumb)},getThumbs:function(){return this.innerItems},getThumb:function(a){if(typeof a!="number"){a=0}return this.innerItems[a]},refreshOffsetValueRatio:function(){var b=this.getMaxValue()-this.getMinValue(),a=this.elementWidth-this.thumbWidth;this.offsetValueRatio=a/b},refreshElementWidth:function(){this.elementWidth=this.element.dom.offsetWidth;this.thumbWidth=this.getThumb(0).getElementWidth()},refresh:function(){this.refreshElementWidth();this.refreshValue()},setActiveThumb:function(b){var a=this.activeThumb;if(a&&a!==b){a.setZIndex(null)}this.activeThumb=b;b.setZIndex(2);return this},onThumbDragStart:function(a,b){if(b.absDeltaX<=b.absDeltaY){return false}else{b.stopPropagation()}if(this.getAllowThumbsOverlapping()){this.setActiveThumb(a)}this.dragStartValue=this.getValue()[this.getThumbIndex(a)];this.fireEvent("dragstart",this,a,this.dragStartValue,b)},onThumbDrag:function(c,g,a){var d=this.getThumbIndex(c),f=this.offsetValueRatio,b=this.constrainValue(a/f);g.stopPropagation();this.setIndexValue(d,b);this.fireEvent("drag",this,c,this.getValue(),g);return false},setIndexValue:function(d,g,f){var c=this.getThumb(d),b=this.getValue(),e=this.offsetValueRatio,a=c.getDraggable();a.setOffset(g*e,null,f);b[d]=this.constrainValue(a.getOffset().x/e)},onThumbDragEnd:function(a,f){this.refreshThumbConstraints(a);var c=this.getThumbIndex(a),d=this.getValue()[c],b=this.dragStartValue;this.fireEvent("dragend",this,a,this.getValue(),f);if(b!==d){this.fireEvent("change",this,a,d,b)}},getThumbIndex:function(a){return this.getThumbs().indexOf(a)},refreshThumbConstraints:function(d){var b=this.getAllowThumbsOverlapping(),a=d.getDraggable().getOffset().x,c=this.getThumbs(),e=this.getThumbIndex(d),g=c[e-1],h=c[e+1],f=this.thumbWidth;if(g){g.getDraggable().addExtraConstraint({max:{x:a-((b)?0:f)}})}if(h){h.getDraggable().addExtraConstraint({min:{x:a+((b)?0:f)}})}},onTap:function(j){if(this.isDisabled()){return}var k=Ext.get(j.target);if(!k||k.hasCls("x-thumb")){return}var n=j.touch.point.x,h=this.element,c=h.getX(),d=n-c-(this.thumbWidth/2),o=this.constrainValue(d/this.offsetValueRatio),r=this.getValue(),q=Infinity,m=r.length,g,f,l,p,b,a;if(m===1){p=0}else{for(g=0;g<m;g++){l=r[g];f=Math.abs(l-o);if(f<q){q=f;p=g}}}b=r[p];a=this.getThumb(p);this.setIndexValue(p,o,this.getAnimation());this.refreshThumbConstraints(a);if(b!==o){this.fireEvent("change",this,a,o,b)}},updateThumbs:function(a){this.add(a)},applyValue:function(g){var d=Ext.Array.from(g||0),b=[],c=this.getMinValue(),a,e,f;for(e=0,f=d.length;e<f;e++){a=this.constrainValue(d[e]);if(a<c){a=c}b.push(a);c=a}return b},updateValue:function(e,b){var a=this.getThumbs(),d=e.length,c;this.setThumbsCount(d);for(c=0;c<d;c++){a[c].getDraggable().setExtraConstraint(null).setOffset(e[c]*this.offsetValueRatio)}for(c=0;c<d;c++){this.refreshThumbConstraints(a[c])}},refreshValue:function(){this.refreshOffsetValueRatio();this.setValue(this.getValue())},constrainValue:function(e){var b=this,d=b.getMinValue(),f=b.getMaxValue(),a=b.getIncrement(),c;e=parseFloat(e);if(isNaN(e)){e=d}c=e%a;e-=c;if(Math.abs(c)>=(a/2)){e+=(c>0)?a:-a}e=Math.max(d,e);e=Math.min(f,e);return e},setThumbsCount:function(e){var a=this.getThumbs(),f=a.length,c,d,b;if(f>e){for(c=0,d=f-e;c<d;c++){b=a[a.length-1];b.destroy()}}else{if(f<e){for(c=0,d=e-f;c<d;c++){this.add(this.factoryThumb())}}}return this},setValues:function(a){this.setValue(a)},getValues:function(){return this.getValue()},applyIncrement:function(a){if(a===0){a=1}return Math.abs(a)},updateAllowThumbsOverlapping:function(b,a){if(typeof a!="undefined"){this.refreshValue()}},updateMinValue:function(b,a){if(typeof a!="undefined"){this.refreshValue()}},updateMaxValue:function(b,a){if(typeof a!="undefined"){this.refreshValue()}},updateIncrement:function(b,a){if(typeof a!="undefined"){this.refreshValue()}},doSetDisabled:function(c){this.callParent(arguments);var a=this.getItems().items,d=a.length,b;for(b=0;b<d;b++){a[b].setDisabled(c)}}},function(){});Ext.define("Ext.field.Slider",{extend:"Ext.field.Field",xtype:"sliderfield",requires:["Ext.slider.Slider"],alternateClassName:"Ext.form.Slider",config:{cls:Ext.baseCSSPrefix+"slider-field",tabIndex:-1},proxyConfig:{value:0,minValue:0,maxValue:100,increment:1},constructor:function(a){a=a||{};if(a.hasOwnProperty("values")){a.value=a.values}this.callParent([a])},initialize:function(){this.callParent();this.getComponent().on({scope:this,change:"onSliderChange"})},applyComponent:function(a){return Ext.factory(a,Ext.slider.Slider)},onSliderChange:function(c,a,d,b){this.fireEvent("change",this,a,d,b)},setValues:function(a){this.setValue(a)},getValues:function(){return this.getValue()},reset:function(){var b=this.config,a=(this.config.hasOwnProperty("values"))?b.values:b.value;this.setValue(a)},doSetDisabled:function(a){this.callParent(arguments);this.getComponent().setDisabled(a)}});Ext.define("Ext.slider.Toggle",{extend:"Ext.slider.Slider",config:{baseCls:"x-toggle",minValueCls:"x-toggle-off",maxValueCls:"x-toggle-on"},initialize:function(){this.callParent();this.on({change:"onChange"})},applyMinValue:function(){return 0},applyMaxValue:function(){return 1},applyIncrement:function(){return 1},setValue:function(b,a){this.callParent(arguments);this.onChange(this,this.getThumbs()[0],b,a)},onChange:function(d,a,f,c){var g=f>0,b=d.getMaxValueCls(),e=d.getMinValueCls();this.element.addCls(g?b:e);this.element.removeCls(g?e:b)}});Ext.define("Ext.field.Toggle",{extend:"Ext.field.Slider",xtype:"togglefield",alternateClassName:"Ext.form.Toggle",requires:["Ext.slider.Toggle"],config:{cls:"x-toggle-field"},proxyConfig:{minValueCls:"x-toggle-off",maxValueCls:"x-toggle-on"},applyComponent:function(a){return Ext.factory(a,Ext.slider.Toggle)},setValue:function(a){if(a===true){a=1}this.getComponent().setValue(a);return this},toggle:function(){var a=this.getValue();this.setValue((a==1)?0:1);return this}});Ext.define("Ext.tab.Tab",{extend:"Ext.Button",xtype:"tab",alternateClassName:"Ext.Tab",isTab:true,config:{baseCls:Ext.baseCSSPrefix+"tab",pressedCls:Ext.baseCSSPrefix+"tab-pressed",activeCls:Ext.baseCSSPrefix+"tab-active",active:false,title:"&nbsp;"},template:[{tag:"span",reference:"badgeElement",hidden:true},{tag:"span",className:Ext.baseCSSPrefix+"button-icon",reference:"iconElement",style:"visibility: hidden !important"},{tag:"span",reference:"textElement",hidden:true}],updateTitle:function(a){this.setText(a)},hideIconElement:function(){this.iconElement.dom.style.setProperty("visibility","hidden","!important")},showIconElement:function(){this.iconElement.dom.style.setProperty("visibility","visible","!important")},updateActive:function(c,b){var a=this.getActiveCls();if(c&&!b){this.element.addCls(a);this.fireEvent("activate",this)}else{if(b){this.element.removeCls(a);this.fireEvent("deactivate",this)}}}},function(){this.override({activate:function(){this.setActive(true)},deactivate:function(){this.setActive(false)}})});Ext.define("Ext.tab.Bar",{extend:"Ext.Toolbar",alternateClassName:"Ext.TabBar",xtype:"tabbar",requires:["Ext.tab.Tab"],config:{baseCls:Ext.baseCSSPrefix+"tabbar",defaultType:"tab",layout:{type:"hbox",align:"middle"}},eventedConfig:{activeTab:null},initialize:function(){var a=this;a.callParent();a.on({tap:"onTabTap",delegate:"> tab",scope:a})},onTabTap:function(a){this.setActiveTab(a)},applyActiveTab:function(a,c){if(!a&&a!==0){return}var b=this.parseActiveTab(a);if(!b){return}return b},doSetDocked:function(a){var c=this.getLayout(),b=a=="bottom"?"center":"left";if(c.isLayout){c.setPack(b)}else{c.pack=(c&&c.pack)?c.pack:b}},doSetActiveTab:function(b,a){if(b){b.setActive(true)}if(a){a.setActive(false)}},parseActiveTab:function(a){if(typeof a=="number"){return this.getInnerItems()[a]}else{if(typeof a=="string"){a=Ext.getCmp(a)}}return a}});Ext.define("Ext.tab.Panel",{extend:"Ext.Container",xtype:"tabpanel",alternateClassName:"Ext.TabPanel",requires:["Ext.tab.Bar"],config:{ui:"dark",tabBar:true,tabBarPosition:"top",layout:{type:"card",animation:{type:"slide",direction:"left"}},cls:Ext.baseCSSPrefix+"tabpanel"},delegateListeners:{delegate:"> component",centeredchange:"onItemCenteredChange",dockedchange:"onItemDockedChange",floatingchange:"onItemFloatingChange",disabledchange:"onItemDisabledChange"},initialize:function(){this.callParent();this.on({order:"before",activetabchange:"doTabChange",delegate:"> tabbar",scope:this})},applyScrollable:function(){return false},updateUi:function(a,b){this.callParent(arguments);if(this.initialized){this.getTabBar().setUi(a)}},doSetActiveItem:function(d,j){if(d){var f=this.getInnerItems(),g=f.indexOf(j),i=f.indexOf(d),e=g>i,c=this.getLayout().getAnimation(),b=this.getTabBar(),h=b.parseActiveTab(g),a=b.parseActiveTab(i);if(c&&c.setReverse){c.setReverse(e)}this.callParent(arguments);if(i!=-1){this.getTabBar().setActiveTab(i);if(h){h.setActive(false)}if(a){a.setActive(true)}}}},doTabChange:function(a,b){this.setActiveItem(a.indexOf(b))},applyTabBar:function(a){if(a===true){a={}}if(a){Ext.applyIf(a,{ui:this.getUi(),docked:this.getTabBarPosition()})}return Ext.factory(a,Ext.tab.Bar,this.getTabBar())},updateTabBar:function(a){if(a){this.add(a);this.setTabBarPosition(a.getDocked())}},updateTabBarPosition:function(b){var a=this.getTabBar();if(a){a.setDocked(b)}},onItemAdd:function(e){var k=this;if(!e.isInnerItem()){return k.callParent(arguments)}var c=k.getTabBar(),o=e.getInitialConfig(),d=o.tab||{},g=o.title,i=o.iconCls,j=o.hidden,n=o.disabled,p=o.badgeText,b=k.getInnerItems(),h=b.indexOf(e),l=c.getItems(),a=k.getInnerItems(),m=(l.length>=a.length)&&l.getAt(h),f;if(g&&!d.title){d.title=g}if(i&&!d.iconCls){d.iconCls=i}if(j&&!d.hidden){d.hidden=j}if(n&&!d.disabled){d.disabled=n}if(p&&!d.badgeText){d.badgeText=p}f=Ext.factory(d,Ext.tab.Tab,m);if(!m){c.insert(h,f)}e.tab=f;k.callParent(arguments)},onItemDisabledChange:function(a,b){if(a&&a.tab){a.tab.setDisabled(b)}},onItemRemove:function(b,a){this.getTabBar().remove(b.tab,this.getAutoDestroy());this.callParent(arguments)}},function(){});Ext.define("Ext.table.Cell",{extend:"Ext.Container",xtype:"tablecell",config:{baseCls:"x-table-cell"},getElementConfig:function(){var a=this.callParent();a.children.length=0;return a}});Ext.define("Ext.table.Row",{extend:"Ext.table.Cell",xtype:"tablerow",config:{baseCls:"x-table-row",defaultType:"tablecell"}});Ext.define("Ext.table.Table",{extend:"Ext.Container",requires:["Ext.table.Row"],xtype:"table",config:{baseCls:"x-table",defaultType:"tablerow"},cachedConfig:{fixedLayout:false},fixedLayoutCls:"x-table-fixed",updateFixedLayout:function(a){this.innerElement[a?"addCls":"removeCls"](this.fixedLayoutCls)}});Ext.define("Ext.viewport.Default",{extend:"Ext.Container",xtype:"viewport",PORTRAIT:"portrait",LANDSCAPE:"landscape",requires:["Ext.LoadMask"],config:{autoMaximize:false,autoBlurInput:true,preventPanning:true,preventZooming:true,autoRender:true,layout:"card",width:"100%",height:"100%"},isReady:false,isViewport:true,isMaximizing:false,id:"ext-viewport",isInputRegex:/^(input|textarea|select|a)$/i,focusedElement:null,fullscreenItemCls:Ext.baseCSSPrefix+"fullscreen",constructor:function(a){var b=Ext.Function.bind;this.doPreventPanning=b(this.doPreventPanning,this);this.doPreventZooming=b(this.doPreventZooming,this);this.doBlurInput=b(this.doBlurInput,this);this.maximizeOnEvents=["ready","orientationchange"];this.orientation=this.determineOrientation();this.windowWidth=this.getWindowWidth();this.windowHeight=this.getWindowHeight();this.windowOuterHeight=this.getWindowOuterHeight();if(!this.stretchHeights){this.stretchHeights={}}this.callParent([a]);if(this.supportsOrientation()){this.addWindowListener("orientationchange",b(this.onOrientationChange,this))}else{this.addWindowListener("resize",b(this.onResize,this))}document.addEventListener("focus",b(this.onElementFocus,this),true);document.addEventListener("blur",b(this.onElementBlur,this),true);Ext.onDocumentReady(this.onDomReady,this);this.on("ready",this.onReady,this,{single:true});this.getEventDispatcher().addListener("component","*","fullscreen","onItemFullscreenChange",this);return this},onDomReady:function(){this.isReady=true;this.updateSize();this.fireEvent("ready",this)},onReady:function(){if(this.getAutoRender()){this.render()}},onElementFocus:function(a){this.focusedElement=a.target},onElementBlur:function(){this.focusedElement=null},render:function(){if(!this.rendered){var a=Ext.getBody(),b=Ext.baseCSSPrefix,h=[],d=Ext.os,g=d.name.toLowerCase(),f=Ext.browser.name.toLowerCase(),e=d.version.getMajor(),c=this.getOrientation();this.renderTo(a);h.push(b+d.deviceType.toLowerCase());if(d.is.iPad){h.push(b+"ipad")}h.push(b+g);h.push(b+f);if(e){h.push(b+g+"-"+e)}if(d.is.BlackBerry){h.push(b+"bb")}if(Ext.browser.is.Standalone){h.push(b+"standalone")}h.push(b+c);a.addCls(h)}},applyAutoBlurInput:function(a){var b=(Ext.feature.has.Touch)?"touchstart":"mousedown";if(a){this.addWindowListener(b,this.doBlurInput,false)}else{this.removeWindowListener(b,this.doBlurInput,false)}return a},applyAutoMaximize:function(a){if(a){this.on("ready","doAutoMaximizeOnReady",this,{single:true});this.on("orientationchange","doAutoMaximizeOnOrientationChange",this)}else{this.un("ready","doAutoMaximizeOnReady",this);this.un("orientationchange","doAutoMaximizeOnOrientationChange",this)}return a},applyPreventPanning:function(a){if(a){this.addWindowListener("touchmove",this.doPreventPanning,false)}else{this.removeWindowListener("touchmove",this.doPreventPanning,false)}return a},applyPreventZooming:function(a){var b=(Ext.feature.has.Touch)?"touchstart":"mousedown";if(a){this.addWindowListener(b,this.doPreventZooming,false)}else{this.removeWindowListener(b,this.doPreventZooming,false)}return a},doAutoMaximizeOnReady:function(){var a=arguments[arguments.length-1];a.pause();this.isMaximizing=true;this.on("maximize",function(){this.isMaximizing=false;this.updateSize();a.resume();this.fireEvent("ready",this)},this,{single:true});this.maximize()},doAutoMaximizeOnOrientationChange:function(){var a=arguments[arguments.length-1],b=a.firingArguments;a.pause();this.isMaximizing=true;this.on("maximize",function(){this.isMaximizing=false;this.updateSize();b[1]=this.windowWidth;b[2]=this.windowHeight;a.resume()},this,{single:true});this.maximize()},doBlurInput:function(b){var a=b.target,c=this.focusedElement;if(c&&!this.isInputRegex.test(a.tagName)){delete this.focusedElement;c.blur()}},doPreventPanning:function(a){a.preventDefault()},doPreventZooming:function(b){if("button" in b&&b.button!==0){return}var a=b.target;if(a&&a.nodeType===1&&!this.isInputRegex.test(a.tagName)){b.preventDefault()}},addWindowListener:function(b,c,a){window.addEventListener(b,c,Boolean(a))},removeWindowListener:function(b,c,a){window.removeEventListener(b,c,Boolean(a))},doAddListener:function(a,d,c,b){if(a==="ready"&&this.isReady&&!this.isMaximizing){d.call(c);return this}this.mixins.observable.doAddListener.apply(this,arguments)},supportsOrientation:function(){return Ext.feature.has.Orientation},onResize:function(){var c=this.windowWidth,f=this.windowHeight,e=this.getWindowWidth(),a=this.getWindowHeight(),d=this.getOrientation(),b=this.determineOrientation();if((c!==e||f!==a)&&d!==b){this.fireOrientationChangeEvent(b,d)}},onOrientationChange:function(){var b=this.getOrientation(),a=this.determineOrientation();if(a!==b){this.fireOrientationChangeEvent(a,b)}},fireOrientationChangeEvent:function(b,c){var a=Ext.baseCSSPrefix;Ext.getBody().replaceCls(a+c,a+b);this.orientation=b;this.updateSize();this.fireEvent("orientationchange",this,b,this.windowWidth,this.windowHeight)},updateSize:function(b,a){this.windowWidth=b!==undefined?b:this.getWindowWidth();this.windowHeight=a!==undefined?a:this.getWindowHeight();return this},waitUntil:function(h,e,g,a,f){if(!a){a=50}if(!f){f=2000}var c=this,b=0;setTimeout(function d(){b+=a;if(h.call(c)===true){if(e){e.call(c)}}else{if(b>=f){if(g){g.call(c)}}else{setTimeout(d,a)}}},a)},maximize:function(){this.fireMaximizeEvent()},fireMaximizeEvent:function(){this.updateSize();this.fireEvent("maximize",this)},doSetHeight:function(a){Ext.getBody().setHeight(a);this.callParent(arguments)},doSetWidth:function(a){Ext.getBody().setWidth(a);this.callParent(arguments)},scrollToTop:function(){window.scrollTo(0,-1)},getWindowWidth:function(){return window.innerWidth},getWindowHeight:function(){return window.innerHeight},getWindowOuterHeight:function(){return window.outerHeight},getWindowOrientation:function(){return window.orientation},getOrientation:function(){return this.orientation},getSize:function(){return{width:this.windowWidth,height:this.windowHeight}},determineOrientation:function(){var b=this.PORTRAIT,a=this.LANDSCAPE;if(this.supportsOrientation()){if(this.getWindowOrientation()%180===0){return b}return a}else{if(this.getWindowHeight()>=this.getWindowWidth()){return b}return a}},onItemFullscreenChange:function(a){a.addCls(this.fullscreenItemCls);this.add(a)}});Ext.define("Ext.viewport.Android",{extend:"Ext.viewport.Default",constructor:function(){this.on("orientationchange","doFireOrientationChangeEvent",this,{prepend:true});this.on("orientationchange","hideKeyboardIfNeeded",this,{prepend:true});return this.callParent(arguments)},getDummyInput:function(){var a=this.dummyInput,c=this.focusedElement,b=Ext.fly(c).getPageBox();if(!a){this.dummyInput=a=document.createElement("input");a.style.position="absolute";a.style.opacity="0";document.body.appendChild(a)}a.style.left=b.left+"px";a.style.top=b.top+"px";a.style.display="";return a},doBlurInput:function(c){var b=c.target,d=this.focusedElement,a;if(d&&!this.isInputRegex.test(b.tagName)){a=this.getDummyInput();delete this.focusedElement;a.focus();setTimeout(function(){a.style.display="none"},100)}},hideKeyboardIfNeeded:function(){var a=arguments[arguments.length-1],b=this.focusedElement;if(b){delete this.focusedElement;a.pause();if(Ext.os.version.lt("4")){b.style.display="none"}else{b.blur()}setTimeout(function(){b.style.display="";a.resume()},1000)}},doFireOrientationChangeEvent:function(){var a=arguments[arguments.length-1];this.orientationChanging=true;a.pause();this.waitUntil(function(){return this.getWindowOuterHeight()!==this.windowOuterHeight},function(){this.windowOuterHeight=this.getWindowOuterHeight();this.updateSize();a.firingArguments[1]=this.windowWidth;a.firingArguments[2]=this.windowHeight;a.resume();this.orientationChanging=false},function(){});return this},applyAutoMaximize:function(a){this.callParent(arguments);this.on("add","fixSize",this,{single:true});if(!a){this.on("ready","fixSize",this,{single:true});this.onAfter("orientationchange","doFixSize",this)}else{this.un("ready","fixSize",this);this.unAfter("orientationchange","doFixSize",this)}},fixSize:function(){this.doFixSize()},doFixSize:function(){this.setHeight(this.getWindowHeight())},getActualWindowOuterHeight:function(){return Math.round(this.getWindowOuterHeight()/window.devicePixelRatio)},maximize:function(){var c=this.stretchHeights,b=this.orientation,a;a=c[b];if(!a){c[b]=a=this.getActualWindowOuterHeight()}if(!this.addressBarHeight){this.addressBarHeight=a-this.getWindowHeight()}this.setHeight(a);var d=Ext.Function.bind(this.isHeightMaximized,this,[a]);this.scrollToTop();this.waitUntil(d,this.fireMaximizeEvent,this.fireMaximizeEvent)},isHeightMaximized:function(a){this.scrollToTop();return this.getWindowHeight()===a}},function(){if(!Ext.os.is.Android){return}var a=Ext.os.version,b=Ext.browser.userAgent,c=/(htc|desire|incredible|ADR6300)/i.test(b)&&a.lt("2.3");if(c){this.override({constructor:function(d){if(!d){d={}}d.autoMaximize=false;this.watchDogTick=Ext.Function.bind(this.watchDogTick,this);setInterval(this.watchDogTick,1000);return this.callParent([d])},watchDogTick:function(){this.watchDogLastTick=Ext.Date.now()},doPreventPanning:function(){var e=Ext.Date.now(),f=this.watchDogLastTick,d=e-f;if(d>=2000){return}return this.callParent(arguments)},doPreventZooming:function(){var e=Ext.Date.now(),f=this.watchDogLastTick,d=e-f;if(d>=2000){return}return this.callParent(arguments)}})}if(a.match("2")){this.override({onReady:function(){this.addWindowListener("resize",Ext.Function.bind(this.onWindowResize,this));this.callParent(arguments)},scrollToTop:function(){document.body.scrollTop=100},onWindowResize:function(){var e=this.windowWidth,g=this.windowHeight,f=this.getWindowWidth(),d=this.getWindowHeight();if(this.getAutoMaximize()&&!this.isMaximizing&&!this.orientationChanging&&window.scrollY===0&&e===f&&d<g&&((d>=g-this.addressBarHeight)||!this.focusedElement)){this.scrollToTop()}},fixSize:function(){var d=this.getOrientation(),f=window.outerHeight,g=window.outerWidth,e;if(d==="landscape"&&(f<g)||d==="portrait"&&(f>=g)){e=this.getActualWindowOuterHeight()}else{e=this.getWindowHeight()}this.waitUntil(function(){return e>this.getWindowHeight()},this.doFixSize,this.doFixSize,50,1000)}})}else{if(a.gtEq("3.1")){this.override({isHeightMaximized:function(d){this.scrollToTop();return this.getWindowHeight()===d-1}})}else{if(a.match("3")){this.override({isHeightMaximized:function(){this.scrollToTop();return true}})}}}if(a.gtEq("4")){this.override({doBlurInput:Ext.emptyFn})}});Ext.define("Ext.viewport.Ios",{extend:"Ext.viewport.Default",isFullscreen:function(){return this.isHomeScreen()},isHomeScreen:function(){return window.navigator.standalone===true},constructor:function(){this.callParent(arguments);if(this.getAutoMaximize()&&!this.isFullscreen()){this.addWindowListener("touchstart",Ext.Function.bind(this.onTouchStart,this))}},maximize:function(){if(this.isFullscreen()){return this.callParent()}var c=this.stretchHeights,b=this.orientation,d=this.getWindowHeight(),a=c[b];if(window.scrollY>0){this.scrollToTop();if(!a){c[b]=a=this.getWindowHeight()}this.setHeight(a);this.fireMaximizeEvent()}else{if(!a){a=this.getScreenHeight()}this.setHeight(a);this.waitUntil(function(){this.scrollToTop();return d!==this.getWindowHeight()},function(){if(!c[b]){a=c[b]=this.getWindowHeight();this.setHeight(a)}this.fireMaximizeEvent()},function(){a=c[b]=this.getWindowHeight();this.setHeight(a);this.fireMaximizeEvent()},50,1000)}},getScreenHeight:function(){return window.screen[this.orientation===this.PORTRAIT?"height":"width"]},onElementFocus:function(){if(this.getAutoMaximize()&&!this.isFullscreen()){clearTimeout(this.scrollToTopTimer)}this.callParent(arguments)},onElementBlur:function(){if(this.getAutoMaximize()&&!this.isFullscreen()){this.scrollToTopTimer=setTimeout(this.scrollToTop,500)}this.callParent(arguments)},onTouchStart:function(){if(this.focusedElement===null){this.scrollToTop()}},scrollToTop:function(){window.scrollTo(0,0)}},function(){if(!Ext.os.is.iOS){return}if(Ext.os.version.lt("3.2")){this.override({constructor:function(){var a=this.stretchHeights={};a[this.PORTRAIT]=416;a[this.LANDSCAPE]=268;return this.callOverridden(arguments)}})}if(Ext.os.version.lt("5")){this.override({fieldMaskClsTest:"-field-mask",doPreventZooming:function(b){var a=b.target;if(a&&a.nodeType===1&&!this.isInputRegex.test(a.tagName)&&a.className.indexOf(this.fieldMaskClsTest)==-1){b.preventDefault()}}})}if(Ext.os.is.iPad){this.override({isFullscreen:function(){return true}})}});Ext.define("Ext.viewport.Viewport",{requires:["Ext.viewport.Ios","Ext.viewport.Android"],constructor:function(b){var c=Ext.os.name,d,a;switch(c){case"Android":d="Android";break;case"iOS":d="Ios";break;default:d="Default"}a=Ext.create("Ext.viewport."+d,b);return a}});Ext.define("Ext.event.recognizer.Swipe",{extend:"Ext.event.recognizer.SingleTouch",handledEvents:["swipe"],inheritableStatics:{MAX_OFFSET_EXCEEDED:16,MAX_DURATION_EXCEEDED:17,DISTANCE_NOT_ENOUGH:18},config:{minDistance:80,maxOffset:35,maxDuration:1000},onTouchStart:function(a){if(this.callParent(arguments)===false){return false}var b=a.changedTouches[0];this.startTime=a.time;this.isHorizontal=true;this.isVertical=true;this.startX=b.pageX;this.startY=b.pageY},onTouchMove:function(f){var h=f.changedTouches[0],b=h.pageX,g=h.pageY,c=Math.abs(b-this.startX),a=Math.abs(g-this.startY),d=f.time;if(d-this.startTime>this.getMaxDuration()){return this.fail(this.self.MAX_DURATION_EXCEEDED)}if(this.isVertical&&c>this.getMaxOffset()){this.isVertical=false}if(this.isHorizontal&&a>this.getMaxOffset()){this.isHorizontal=false}if(!this.isHorizontal&&!this.isVertical){return this.fail(this.self.MAX_OFFSET_EXCEEDED)}},onTouchEnd:function(i){if(this.onTouchMove(i)===false){return false}var h=i.changedTouches[0],l=h.pageX,j=h.pageY,g=l-this.startX,f=j-this.startY,c=Math.abs(g),b=Math.abs(f),m=this.getMinDistance(),d=i.time-this.startTime,k,a;if(this.isVertical&&b<m){this.isVertical=false}if(this.isHorizontal&&c<m){this.isHorizontal=false}if(this.isHorizontal){k=(g<0)?"left":"right";a=c}else{if(this.isVertical){k=(f<0)?"up":"down";a=b}else{return this.fail(this.self.DISTANCE_NOT_ENOUGH)}}this.fire("swipe",i,[h],{touch:h,direction:k,distance:a,duration:d})}});Ext.define("Ext.event.recognizer.HorizontalSwipe",{extend:"Ext.event.recognizer.Swipe",handledEvents:["swipe"],onTouchStart:function(a){if(this.callParent(arguments)===false){return false}var b=a.changedTouches[0];this.startTime=a.time;this.startX=b.pageX;this.startY=b.pageY},onTouchMove:function(f){var h=f.changedTouches[0],g=h.pageY,a=Math.abs(g-this.startY),d=f.time,c=this.getMaxDuration(),b=this.getMaxOffset();if(d-this.startTime>c){return this.fail(this.self.MAX_DURATION_EXCEEDED)}if(a>b){return this.fail(this.self.MAX_OFFSET_EXCEEDED)}},onTouchEnd:function(f){if(this.onTouchMove(f)!==false){var i=f.changedTouches[0],a=i.pageX,b=a-this.startX,h=Math.abs(b),d=f.time-this.startTime,g=this.getMinDistance(),c;if(h<g){return this.fail(this.self.DISTANCE_NOT_ENOUGH)}c=(b<0)?"left":"right";this.fire("swipe",f,[i],{touch:i,direction:c,distance:h,duration:d})}}});
diff --git a/apps/files_odfviewer/src/webodf/programs/touchui/welcome.odt b/apps/files_odfviewer/src/webodf/programs/touchui/welcome.odt
deleted file mode 100644
index 22e4d928241b9e316679983423df428f43bbb126..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 62780
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
VP7)gCNetuhr~j#5=kRIo{{a)gMvwpi

diff --git a/apps/files_odfviewer/src/webodf/programs/touchui/zoom-fit-best.png b/apps/files_odfviewer/src/webodf/programs/touchui/zoom-fit-best.png
deleted file mode 100644
index 623885a022926da4d55e2a8672462d89e5b19d99..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 932
zcmV;V16%xwP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01ejw01ejxLMWSf00007bV*G`2iOG+
z3JN#>O3Zlx00SgRL_t(|+SQiNOB7)o#-DebRnwq4q?ZVymQMWzU1|+NJL`WCT}s1)
z6<J_b1kp*!bJ8K*?a(DUblNTvWZ)^Y%jPPy8@apgubJK1w{I_uFYmm~j58$BBM<ZS
zWtq?OKJU9I{<RoX9U~tX>-!^4{zlHb3no;ZaUAEhW!V7pBxFpcj!8C66A9BC2?_wq
zwoxjTzzjxAk3sUzGMt>XiuKty00RU(o6X`!u?XNd5I8z8fK)1_gdq6`A=Pc5uN#mh
zvfu#ngNA^Qj*Y=E46(Mnv=q68N|WRAa|c(?8#sH?fKYe<Mo<QLs;^jG$maS{v$$~G
z0;*PrW{}+{hp;Vw&u??Q{p?`sB5?asXaj;PcLzBi>h0j%iAHb>U`owfWngl-g=;C3
z8emb5fMI~nJd;kN)a=6HUI&ANgD_~_g)#3egY3>n`Z$)a^gz*G1EhwA#PiLU0~k5o
z6tf2^3^j}r<Y2F|<7f@IZrI$N!$SB$A~qn;R=92>LI6#X8*st?4X99Isdx?Ok|5Oe
z0Ks5=E#4)>ZUYE{`vr-A1nSq!ZNTt>#|jdD2h>Z*0e|?u-T`?D^(yzR0rd}xdI^Kz
zfAJ2eM<5yqhwCrroC~W84WJ)Gy#-x5Tmg4F9XO67OtV-Mo9Z&7H2{bPG?*W}TrQ(n
zED)4K{LmBbzha35wktbT0M+0Co_gyR#~vhhS|}8dOeVFXXti3%<#P7J*_jytD}a;{
zR&To#R=up9{73jkexoxtKldP$dAR_f77#!JYBsP{;vk7<&EiVkUQoN;7H95-=Qs0w
zaq-#X`MLQg5*`r1Mf7(A*OzR3uW(Gfu+ZPb0_!IjxvjuAH}lA3(hIZq?$2s)J%Fz9
zp#-cpFma(9iuC#gkQz{Sp3bD7-n?;ZO2Wf6Y}+<(G#b3wZ1Ugp%&RJ=7Yb9&!UW<3
z6{cBymM$P)S@|U9^{?yBox9VIKt)0-UI6l*1FWvD^0l=!YkXpS8bBXnXqa9oVG`&<
zH9O>nW%J_C5`XvpLv?g)bTSH@LDea867jV|{zz`%f6*_Jd<?mNjG43m0000<MNUMn
GLSTXlR-$wO

diff --git a/apps/files_odfviewer/src/webodf/programs/touchui/zoom-fit-height.png b/apps/files_odfviewer/src/webodf/programs/touchui/zoom-fit-height.png
deleted file mode 100644
index 7f8d1935c64afd233b40d76c4f78d80928bd6e28..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 947
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|I14-?i-C%-
zgD|6$#_S59AbW|YuPgfvRvun?laQUcKvNiN1AIbUfl~NEXjo`SNN`?$UQTXKZCy=A
zXZyK}mkyseb@S%U+jnl?xqF8*<Gn!6d)12fY8CI*t3K$|zBg+8=-mC$Yr<#$NuQ!;
zeTkj<E^gMlr1@V<R(`Eo_pNc`m*(DC?fo;mcYL3;_s8@ZATV?0%*DrlE<f^a#nJbx
zj=o;EZr%Fz>o;uJuyNzYy;r~QyY}PMjn}7dy*+d0?74I2&!4|=>C&YuSFT*UcI`S4
z+_-+@#too*ZruW+TX*l?xeo*{e>`~g^Wn2MPhP%%_U!rd7cXACeEH(#D-d}7`t_SP
zuit%m0|am1zI_J<@87@s^y57cd;o)wA3uEg^$`d@fx%}m_yPuBzkd1l{VNcBgMjbf
zzC*x|?>~Ng|M}|&5c~v#UtsVX4E{jCUl8~Q0{{R2mk};$2Zp{_NswPK11A@^jEa@D
zjjd-<NljhH)X!gj{{3fqEjAXYf-%Y4-KEZcha)gv8GAil978H@^-ezTb=X0my*zDF
zgkYEW#zjr$2gL=r7P-H->s<dxdCR`G2M3$KEDNx$6mZPZ4>RHYdAWDL@3gyW8df<c
z%J%Djp3SoApVlE!gTE)dVi}Tz=bq<K)81V3@+!CXivILP(`}QS3}Z~T>=G@ot9|?C
zf!eAtkyG3^J}sH^#z<JKG5TovgDta59+wI|IQ1Znec{%>FBzrJMJT-GaLgAon{&{!
zkae%af}~HaQyGM|T3wmL>b4-qCE3G;CFU!KOkN%PLxDRs=ca8*e{i9oKic_JY}lQW
zKA!Df)=F>Ni*k2{?>W%2S?Zq=bCA{}t1YclZ|l5@cxO=Q$oKSBiKWZyWeY4$oIP6<
zo8r07@&i-bmA0#YGFN%8Rg#<fPItkRyfsOe%oRU7&f8h|FjKnWUw0S(=ah#m2RU!=
z?c4frdL_?0rF-|T{ykPUS0MXC;Xl@Q%2oZ{?Q35xZ)<q&KL3HA!}+tDp0_ReX|VZ@
z+k(Dy^>?Nf6BN@TJ7!#+DLctaa(QRopUT4lre4dJ{;IEK_BSt$TVF7(6O@ZQUHx3v
IIVCg!0H;O`R{#J2

diff --git a/apps/files_odfviewer/src/webodf/programs/touchui/zoom-fit-width.png b/apps/files_odfviewer/src/webodf/programs/touchui/zoom-fit-width.png
deleted file mode 100644
index 5bd06de6979a73e181830b111c019f62371d1dbe..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 934
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|I14-?i-C%-
zgD|6$#_S59AbW|YuPgfvRvs=+p46POc|bkQ0X`wFKq>qnG%PeEBsecWFDEyrwyvh5
zv;Ew~ONURKx_R^F?K`*c+`S{5_g<ptgG$8*t?Kut%^#e)Ke_dM^q%m^f6}LrX`drz
zevX;-F?RN+xH(^v=6y+D^d)=Am$H@_<*hRs)_-bR|E_t%`__%`+ctfeHXQ_J%$PBA
z=FBx~*REZ+ZvFc88#Zj%bLsQGt6$HYIeYfj>vQMMpFe-$(xppRu3Wix?b>x9xN-f)
zjT=D6+`0usx9&WCedpPiyLa#0d;0c15WM*I=-HcR&z?Vf_2K!87cXAEeDU(t%U7>n
zzWwwH2wuN_{pQW<cOTvW!P~cQ-+{sV_wPP^e-8v7z~Cbod;){dVDJSDzJC4k?fX|C
z_yz&rzkP>*AK!oc`2O?P4<Psn2EV}IHyHeZfWIK{4+Q@I|9_?LlNc}##7ctvf*Clu
zxMftVtZi&Pi%M$hI;MX9^7HRM(`&J@KoyKh-tI09se9*T0NGWZE{-7;w|Xc0dNDf+
zw7%Z^j`M}vq7=mnmV@#aS|5nAoPXqM(^MsVu$B8_?~2tD6FAoW@l5hbTXyW7p|Ndm
zm)MzCzhCWbN_(=t@wd)LWo?t<0GB9s{Q@=D8&9mtErg$ZowtDTVVl4K_vycU7!JPN
z!&ore@y)Eo=ie?<komfkOX#Osp`$}v_*`C2PJdg|^d+i}HFL6-&HBz(y)_|BOm2tY
zkKE>+vRx(bt)hFmF2_|VbE-@aQV~0Jv{sOlDP!7$*4!>d)`)38Je(((G;BPif61r8
z@ucSswlskQlYW<msq9NU#+;@jV9L)~$jZd;^+oKE{=d__>lUc&SNXx`9k%BXM-!u0
z)btg{nl4<Me)(aJmETk|jx|hP_iC>=EuA_?d}_ms4{P?n_P*DDDbwP58`IfOljN5_
z-XrF7_1#4eTYFFUdEEO$Q<O{pSjj$9wC>5TIRE#bLjII&mDG~IPwPB7+TDZ0FN;K_
q)T(e58%t(?`K;zSXTfBrfA;hLXB0=6^<KCE$~c~`elF{r5}E)XDEyZI

diff --git a/apps/files_odfviewer/src/webodf/simplerevisionserver/webdavserver.py b/apps/files_odfviewer/src/webodf/simplerevisionserver/webdavserver.py
deleted file mode 100755
index d9125699c8..0000000000
--- a/apps/files_odfviewer/src/webodf/simplerevisionserver/webdavserver.py
+++ /dev/null
@@ -1,77 +0,0 @@
-#! /usr/bin/env python
-
-import BaseHTTPServer, SimpleHTTPServer, re, os, sys, xml.etree.ElementTree
-from xml.etree.ElementTree import Element
-from xml.etree.ElementTree import ElementTree
-from xml.etree.ElementTree import QName
-from xml.etree.ElementTree import SubElement
-
-class WebDAVRequestHandler(SimpleHTTPServer.SimpleHTTPRequestHandler):
-	def do_GET(self):
-		# handle headers like Range: bytes=0-1023
-		if 'Range' in self.headers:
-			m = re.match('\s*bytes\s*=\s*(\d+)\s*-\s*(\d+)\s*',
-					self.headers['Range'])
-			if m:
-				start = int(m.group(1))
-				end = int(m.group(2))
-				f = self.send_range_head(start, end)
-				if f:
-					self.copyfilerange(f, self.wfile, start,
-							end)
-					f.close()
-				return
-		return SimpleHTTPServer.SimpleHTTPRequestHandler.do_GET(self)
-
-	def do_PROPFIND(self):
-		print 'PROPFIND ' + self.path
-		for key in self.headers.keys():
-			print key + '\t' + self.headers[key]
-		req = self.parseinputxml()
-		req = ElementTree(req)
-		res = ElementTree(Element(QName("DAV:", 'multistatus')))
-		self.addresponse('/', res.getroot(), 0)
-
-		self.writeresponse(res)
-
-	def do_OPTIONS(self):
-		req = self.parseinputxml()
-		print req
-        	self.send_response(200)
-		self.send_header("DAV", "1");
-		self.end_headers()
-		self.wfile.close()
-
-	def parseinputxml(self):
-		try:
-			contentlength = int(self.headers['content-length'])
-		except:
-			return None
-		data = self.rfile.read(contentlength)
-		print data
-		return xml.etree.ElementTree.fromstring(data)
-		
-	def writeresponse(self, response):
-		self.send_response(200)
-		self.send_header("Content-Type", 'text/xml; charset="utf-8"')
-        	self.end_headers()
-		response.write(self.wfile, 'utf-8')
-#		response.write(sys.stdout, 'utf-8')
-#		sys.stdout.flush()
-		d = xml.etree.ElementTree.tostring(response.getroot(), 'utf-8')
-		print d
-		self.wfile.close()
-
-	def addresponse(self, path, root, depth):
-		e = SubElement(root, QName("DAV:", 'response'))
-		href = SubElement(e, QName("DAV:", 'href'))
-		href.text = path
-		propstat = SubElement(e, QName("DAV:", 'propstat'))
-		prop = SubElement(propstat, QName("DAV:", 'resourcetype'))
-		if os.path.isdir(path):
-			SubElement(prop, QName("DAV:", 'collection'))
-
-if __name__ == '__main__':
-	server_address = ('', 8080)
-	httpd = BaseHTTPServer.HTTPServer(server_address, WebDAVRequestHandler)
-	httpd.serve_forever()
diff --git a/apps/files_odfviewer/src/webodf/webodf/APPNOTE.txt b/apps/files_odfviewer/src/webodf/webodf/APPNOTE.txt
deleted file mode 100644
index 45ef5bcd07..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/APPNOTE.txt
+++ /dev/null
@@ -1,3218 +0,0 @@
-File:    APPNOTE.TXT - .ZIP File Format Specification
-Version: 6.3.2 
-Revised: September 28, 2007
-Copyright (c) 1989 - 2007 PKWARE Inc., All Rights Reserved.
-
-The use of certain technological aspects disclosed in the current
-APPNOTE is available pursuant to the below section entitled
-"Incorporating PKWARE Proprietary Technology into Your Product".
-
-I. Purpose
-----------
-
-This specification is intended to define a cross-platform,
-interoperable file storage and transfer format.  Since its 
-first publication in 1989, PKWARE has remained committed to 
-ensuring the interoperability of the .ZIP file format through 
-publication and maintenance of this specification.  We trust that 
-all .ZIP compatible vendors and application developers that have 
-adopted and benefited from this format will share and support 
-this commitment to interoperability.
-
-II. Contacting PKWARE
----------------------
-
-     PKWARE, Inc.
-     648 N. Plankinton Avenue, Suite 220
-     Milwaukee, WI 53203
-     +1-414-289-9788
-     +1-414-289-9789 FAX
-     zipformat@pkware.com
-
-III. Disclaimer
----------------
-
-Although PKWARE will attempt to supply current and accurate
-information relating to its file formats, algorithms, and the
-subject programs, the possibility of error or omission cannot 
-be eliminated. PKWARE therefore expressly disclaims any warranty 
-that the information contained in the associated materials relating 
-to the subject programs and/or the format of the files created or
-accessed by the subject programs and/or the algorithms used by
-the subject programs, or any other matter, is current, correct or
-accurate as delivered.  Any risk of damage due to any possible
-inaccurate information is assumed by the user of the information.
-Furthermore, the information relating to the subject programs
-and/or the file formats created or accessed by the subject
-programs and/or the algorithms used by the subject programs is
-subject to change without notice.
-
-If the version of this file is marked as a NOTIFICATION OF CHANGE,
-the content defines an Early Feature Specification (EFS) change 
-to the .ZIP file format that may be subject to modification prior 
-to publication of the Final Feature Specification (FFS).  This
-document may also contain information on Planned Feature 
-Specifications (PFS) defining recognized future extensions.
-
-IV. Change Log
---------------
-
-Version       Change Description                        Date
--------       ------------------                       ----------
-5.2           -Single Password Symmetric Encryption    06/02/2003
-               storage
-
-6.1.0         -Smartcard compatibility                 01/20/2004
-              -Documentation on certificate storage
-
-6.2.0         -Introduction of Central Directory       04/26/2004
-               Encryption for encrypting metadata
-              -Added OS/X to Version Made By values
-
-6.2.1         -Added Extra Field placeholder for       04/01/2005
-               POSZIP using ID 0x4690
-
-              -Clarified size field on 
-               "zip64 end of central directory record"
-
-6.2.2         -Documented Final Feature Specification  01/06/2006
-               for Strong Encryption
-
-              -Clarifications and typographical 
-               corrections
-
-6.3.0         -Added tape positioning storage          09/29/2006
-               parameters
-
-              -Expanded list of supported hash algorithms
-
-              -Expanded list of supported compression
-               algorithms
-
-              -Expanded list of supported encryption
-               algorithms
-
-              -Added option for Unicode filename 
-               storage
-
-              -Clarifications for consistent use
-               of Data Descriptor records
-
-              -Added additional "Extra Field" 
-               definitions
-
-6.3.1         -Corrected standard hash values for      04/11/2007
-               SHA-256/384/512
-
-6.3.2         -Added compression method 97             09/28/2007
-
-              -Documented InfoZIP "Extra Field"
-               values for UTF-8 file name and
-               file comment storage
-
-V. General Format of a .ZIP file
---------------------------------
-
-  Files stored in arbitrary order.  Large .ZIP files can span multiple
-  volumes or be split into user-defined segment sizes. All values
-  are stored in little-endian byte order unless otherwise specified. 
-
-  Overall .ZIP file format:
-
-    [local file header 1]
-    [file data 1]
-    [data descriptor 1]
-    . 
-    .
-    .
-    [local file header n]
-    [file data n]
-    [data descriptor n]
-    [archive decryption header] 
-    [archive extra data record] 
-    [central directory]
-    [zip64 end of central directory record]
-    [zip64 end of central directory locator] 
-    [end of central directory record]
-
-
-  A.  Local file header:
-
-        local file header signature     4 bytes  (0x04034b50)
-        version needed to extract       2 bytes
-        general purpose bit flag        2 bytes
-        compression method              2 bytes
-        last mod file time              2 bytes
-        last mod file date              2 bytes
-        crc-32                          4 bytes
-        compressed size                 4 bytes
-        uncompressed size               4 bytes
-        file name length                2 bytes
-        extra field length              2 bytes
-
-        file name (variable size)
-        extra field (variable size)
-
-  B.  File data
-
-      Immediately following the local header for a file
-      is the compressed or stored data for the file. 
-      The series of [local file header][file data][data
-      descriptor] repeats for each file in the .ZIP archive. 
-
-  C.  Data descriptor:
-
-        crc-32                          4 bytes
-        compressed size                 4 bytes
-        uncompressed size               4 bytes
-
-      This descriptor exists only if bit 3 of the general
-      purpose bit flag is set (see below).  It is byte aligned
-      and immediately follows the last byte of compressed data.
-      This descriptor is used only when it was not possible to
-      seek in the output .ZIP file, e.g., when the output .ZIP file
-      was standard output or a non-seekable device.  For ZIP64(tm) format
-      archives, the compressed and uncompressed sizes are 8 bytes each.
-
-      When compressing files, compressed and uncompressed sizes 
-      should be stored in ZIP64 format (as 8 byte values) when a 
-      files size exceeds 0xFFFFFFFF.   However ZIP64 format may be 
-      used regardless of the size of a file.  When extracting, if 
-      the zip64 extended information extra field is present for 
-      the file the compressed and uncompressed sizes will be 8
-      byte values.  
-
-      Although not originally assigned a signature, the value 
-      0x08074b50 has commonly been adopted as a signature value 
-      for the data descriptor record.  Implementers should be 
-      aware that ZIP files may be encountered with or without this 
-      signature marking data descriptors and should account for
-      either case when reading ZIP files to ensure compatibility.
-      When writing ZIP files, it is recommended to include the
-      signature value marking the data descriptor record.  When
-      the signature is used, the fields currently defined for
-      the data descriptor record will immediately follow the
-      signature.
-
-      An extensible data descriptor will be released in a future
-      version of this APPNOTE.  This new record is intended to
-      resolve conflicts with the use of this record going forward,
-      and to provide better support for streamed file processing.
-
-      When the Central Directory Encryption method is used, the data
-      descriptor record is not required, but may be used.  If present,
-      and bit 3 of the general purpose bit field is set to indicate
-      its presence, the values in fields of the data descriptor
-      record should be set to binary zeros.
-
-  D.  Archive decryption header:  
-
-      The Archive Decryption Header is introduced in version 6.2
-      of the ZIP format specification.  This record exists in support
-      of the Central Directory Encryption Feature implemented as part of 
-      the Strong Encryption Specification as described in this document.
-      When the Central Directory Structure is encrypted, this decryption
-      header will precede the encrypted data segment.  The encrypted
-      data segment will consist of the Archive extra data record (if
-      present) and the encrypted Central Directory Structure data.
-      The format of this data record is identical to the Decryption
-      header record preceding compressed file data.  If the central 
-      directory structure is encrypted, the location of the start of
-      this data record is determined using the Start of Central Directory
-      field in the Zip64 End of Central Directory record.  Refer to the 
-      section on the Strong Encryption Specification for information
-      on the fields used in the Archive Decryption Header record.
-
-
-  E.  Archive extra data record: 
-
-        archive extra data signature    4 bytes  (0x08064b50)
-        extra field length              4 bytes
-        extra field data                (variable size)
-
-      The Archive Extra Data Record is introduced in version 6.2
-      of the ZIP format specification.  This record exists in support
-      of the Central Directory Encryption Feature implemented as part of 
-      the Strong Encryption Specification as described in this document.
-      When present, this record immediately precedes the central 
-      directory data structure.  The size of this data record will be
-      included in the Size of the Central Directory field in the
-      End of Central Directory record.  If the central directory structure
-      is compressed, but not encrypted, the location of the start of
-      this data record is determined using the Start of Central Directory
-      field in the Zip64 End of Central Directory record.  
-
-
-  F.  Central directory structure:
-
-      [file header 1]
-      .
-      .
-      . 
-      [file header n]
-      [digital signature] 
-
-      File header:
-
-        central file header signature   4 bytes  (0x02014b50)
-        version made by                 2 bytes
-        version needed to extract       2 bytes
-        general purpose bit flag        2 bytes
-        compression method              2 bytes
-        last mod file time              2 bytes
-        last mod file date              2 bytes
-        crc-32                          4 bytes
-        compressed size                 4 bytes
-        uncompressed size               4 bytes
-        file name length                2 bytes
-        extra field length              2 bytes
-        file comment length             2 bytes
-        disk number start               2 bytes
-        internal file attributes        2 bytes
-        external file attributes        4 bytes
-        relative offset of local header 4 bytes
-
-        file name (variable size)
-        extra field (variable size)
-        file comment (variable size)
-
-      Digital signature:
-
-        header signature                4 bytes  (0x05054b50)
-        size of data                    2 bytes
-        signature data (variable size)
-
-      With the introduction of the Central Directory Encryption 
-      feature in version 6.2 of this specification, the Central 
-      Directory Structure may be stored both compressed and encrypted. 
-      Although not required, it is assumed when encrypting the
-      Central Directory Structure, that it will be compressed
-      for greater storage efficiency.  Information on the
-      Central Directory Encryption feature can be found in the section
-      describing the Strong Encryption Specification. The Digital 
-      Signature record will be neither compressed nor encrypted.
-
-  G.  Zip64 end of central directory record
-
-        zip64 end of central dir 
-        signature                       4 bytes  (0x06064b50)
-        size of zip64 end of central
-        directory record                8 bytes
-        version made by                 2 bytes
-        version needed to extract       2 bytes
-        number of this disk             4 bytes
-        number of the disk with the 
-        start of the central directory  4 bytes
-        total number of entries in the
-        central directory on this disk  8 bytes
-        total number of entries in the
-        central directory               8 bytes
-        size of the central directory   8 bytes
-        offset of start of central
-        directory with respect to
-        the starting disk number        8 bytes
-        zip64 extensible data sector    (variable size)
-
-        The value stored into the "size of zip64 end of central
-        directory record" should be the size of the remaining
-        record and should not include the leading 12 bytes.
-  
-        Size = SizeOfFixedFields + SizeOfVariableData - 12.
-
-        The above record structure defines Version 1 of the 
-        zip64 end of central directory record. Version 1 was 
-        implemented in versions of this specification preceding 
-        6.2 in support of the ZIP64 large file feature. The 
-        introduction of the Central Directory Encryption feature 
-        implemented in version 6.2 as part of the Strong Encryption 
-        Specification defines Version 2 of this record structure. 
-        Refer to the section describing the Strong Encryption 
-        Specification for details on the version 2 format for 
-        this record.
-
-        Special purpose data may reside in the zip64 extensible data
-        sector field following either a V1 or V2 version of this
-        record.  To ensure identification of this special purpose data
-        it must include an identifying header block consisting of the
-        following:
-
-           Header ID  -  2 bytes
-           Data Size  -  4 bytes
-
-        The Header ID field indicates the type of data that is in the 
-        data block that follows.
-
-        Data Size identifies the number of bytes that follow for this
-        data block type.
-
-        Multiple special purpose data blocks may be present, but each
-        must be preceded by a Header ID and Data Size field.  Current
-        mappings of Header ID values supported in this field are as
-        defined in APPENDIX C.
-
-  H.  Zip64 end of central directory locator
-
-        zip64 end of central dir locator 
-        signature                       4 bytes  (0x07064b50)
-        number of the disk with the
-        start of the zip64 end of 
-        central directory               4 bytes
-        relative offset of the zip64
-        end of central directory record 8 bytes
-        total number of disks           4 bytes
-        
-  I.  End of central directory record:
-
-        end of central dir signature    4 bytes  (0x06054b50)
-        number of this disk             2 bytes
-        number of the disk with the
-        start of the central directory  2 bytes
-        total number of entries in the
-        central directory on this disk  2 bytes
-        total number of entries in
-        the central directory           2 bytes
-        size of the central directory   4 bytes
-        offset of start of central
-        directory with respect to
-        the starting disk number        4 bytes
-        .ZIP file comment length        2 bytes
-        .ZIP file comment       (variable size)
-
-  J.  Explanation of fields:
-
-      version made by (2 bytes)
-
-          The upper byte indicates the compatibility of the file
-          attribute information.  If the external file attributes 
-          are compatible with MS-DOS and can be read by PKZIP for 
-          DOS version 2.04g then this value will be zero.  If these 
-          attributes are not compatible, then this value will 
-          identify the host system on which the attributes are 
-          compatible.  Software can use this information to determine
-          the line record format for text files etc.  The current
-          mappings are:
-
-          0 - MS-DOS and OS/2 (FAT / VFAT / FAT32 file systems)
-          1 - Amiga                     2 - OpenVMS
-          3 - UNIX                      4 - VM/CMS
-          5 - Atari ST                  6 - OS/2 H.P.F.S.
-          7 - Macintosh                 8 - Z-System
-          9 - CP/M                     10 - Windows NTFS
-         11 - MVS (OS/390 - Z/OS)      12 - VSE
-         13 - Acorn Risc               14 - VFAT
-         15 - alternate MVS            16 - BeOS
-         17 - Tandem                   18 - OS/400
-         19 - OS/X (Darwin)            20 thru 255 - unused
-
-          The lower byte indicates the ZIP specification version 
-          (the version of this document) supported by the software 
-          used to encode the file.  The value/10 indicates the major 
-          version number, and the value mod 10 is the minor version 
-          number.  
-
-      version needed to extract (2 bytes)
-
-          The minimum supported ZIP specification version needed to 
-          extract the file, mapped as above.  This value is based on 
-          the specific format features a ZIP program must support to 
-          be able to extract the file.  If multiple features are
-          applied to a file, the minimum version should be set to the 
-          feature having the highest value. New features or feature 
-          changes affecting the published format specification will be 
-          implemented using higher version numbers than the last 
-          published value to avoid conflict.
-
-          Current minimum feature versions are as defined below:
-
-          1.0 - Default value
-          1.1 - File is a volume label
-          2.0 - File is a folder (directory)
-          2.0 - File is compressed using Deflate compression
-          2.0 - File is encrypted using traditional PKWARE encryption
-          2.1 - File is compressed using Deflate64(tm)
-          2.5 - File is compressed using PKWARE DCL Implode 
-          2.7 - File is a patch data set 
-          4.5 - File uses ZIP64 format extensions
-          4.6 - File is compressed using BZIP2 compression*
-          5.0 - File is encrypted using DES
-          5.0 - File is encrypted using 3DES
-          5.0 - File is encrypted using original RC2 encryption
-          5.0 - File is encrypted using RC4 encryption
-          5.1 - File is encrypted using AES encryption
-          5.1 - File is encrypted using corrected RC2 encryption**
-          5.2 - File is encrypted using corrected RC2-64 encryption**
-          6.1 - File is encrypted using non-OAEP key wrapping***
-          6.2 - Central directory encryption
-          6.3 - File is compressed using LZMA
-          6.3 - File is compressed using PPMd+
-          6.3 - File is encrypted using Blowfish
-          6.3 - File is encrypted using Twofish
-
-
-          * Early 7.x (pre-7.2) versions of PKZIP incorrectly set the
-          version needed to extract for BZIP2 compression to be 50
-          when it should have been 46.
-
-          ** Refer to the section on Strong Encryption Specification
-          for additional information regarding RC2 corrections.
-
-          *** Certificate encryption using non-OAEP key wrapping is the
-          intended mode of operation for all versions beginning with 6.1.
-          Support for OAEP key wrapping should only be used for
-          backward compatibility when sending ZIP files to be opened by
-          versions of PKZIP older than 6.1 (5.0 or 6.0).
-
-          + Files compressed using PPMd should set the version
-          needed to extract field to 6.3, however, not all ZIP 
-          programs enforce this and may be unable to decompress 
-          data files compressed using PPMd if this value is set.
-
-          When using ZIP64 extensions, the corresponding value in the
-          zip64 end of central directory record should also be set.  
-          This field should be set appropriately to indicate whether 
-          Version 1 or Version 2 format is in use. 
-
-      general purpose bit flag: (2 bytes)
-
-          Bit 0: If set, indicates that the file is encrypted.
-
-          (For Method 6 - Imploding)
-          Bit 1: If the compression method used was type 6,
-                 Imploding, then this bit, if set, indicates
-                 an 8K sliding dictionary was used.  If clear,
-                 then a 4K sliding dictionary was used.
-          Bit 2: If the compression method used was type 6,
-                 Imploding, then this bit, if set, indicates
-                 3 Shannon-Fano trees were used to encode the
-                 sliding dictionary output.  If clear, then 2
-                 Shannon-Fano trees were used.
-
-          (For Methods 8 and 9 - Deflating)
-          Bit 2  Bit 1
-            0      0    Normal (-en) compression option was used.
-            0      1    Maximum (-exx/-ex) compression option was used.
-            1      0    Fast (-ef) compression option was used.
-            1      1    Super Fast (-es) compression option was used.
-
-          (For Method 14 - LZMA)
-          Bit 1: If the compression method used was type 14,
-                 LZMA, then this bit, if set, indicates
-                 an end-of-stream (EOS) marker is used to
-                 mark the end of the compressed data stream.
-                 If clear, then an EOS marker is not present
-                 and the compressed data size must be known
-                 to extract.
-
-          Note:  Bits 1 and 2 are undefined if the compression
-                 method is any other.
-
-          Bit 3: If this bit is set, the fields crc-32, compressed 
-                 size and uncompressed size are set to zero in the 
-                 local header.  The correct values are put in the 
-                 data descriptor immediately following the compressed
-                 data.  (Note: PKZIP version 2.04g for DOS only 
-                 recognizes this bit for method 8 compression, newer 
-                 versions of PKZIP recognize this bit for any 
-                 compression method.)
-
-          Bit 4: Reserved for use with method 8, for enhanced
-                 deflating. 
-
-          Bit 5: If this bit is set, this indicates that the file is 
-                 compressed patched data.  (Note: Requires PKZIP 
-                 version 2.70 or greater)
-
-          Bit 6: Strong encryption.  If this bit is set, you should
-                 set the version needed to extract value to at least
-                 50 and you must also set bit 0.  If AES encryption
-                 is used, the version needed to extract value must 
-                 be at least 51.
-
-          Bit 7: Currently unused.
-
-          Bit 8: Currently unused.
-
-          Bit 9: Currently unused.
-
-          Bit 10: Currently unused.
-
-          Bit 11: Language encoding flag (EFS).  If this bit is set,
-                  the filename and comment fields for this file
-                  must be encoded using UTF-8. (see APPENDIX D)
-
-          Bit 12: Reserved by PKWARE for enhanced compression.
-
-          Bit 13: Used when encrypting the Central Directory to indicate 
-                  selected data values in the Local Header are masked to
-                  hide their actual values.  See the section describing 
-                  the Strong Encryption Specification for details.
-
-          Bit 14: Reserved by PKWARE.
-
-          Bit 15: Reserved by PKWARE.
-
-      compression method: (2 bytes)
-
-          (see accompanying documentation for algorithm
-          descriptions)
-
-          0 - The file is stored (no compression)
-          1 - The file is Shrunk
-          2 - The file is Reduced with compression factor 1
-          3 - The file is Reduced with compression factor 2
-          4 - The file is Reduced with compression factor 3
-          5 - The file is Reduced with compression factor 4
-          6 - The file is Imploded
-          7 - Reserved for Tokenizing compression algorithm
-          8 - The file is Deflated
-          9 - Enhanced Deflating using Deflate64(tm)
-         10 - PKWARE Data Compression Library Imploding (old IBM TERSE)
-         11 - Reserved by PKWARE
-         12 - File is compressed using BZIP2 algorithm
-         13 - Reserved by PKWARE
-         14 - LZMA (EFS)
-         15 - Reserved by PKWARE
-         16 - Reserved by PKWARE
-         17 - Reserved by PKWARE
-         18 - File is compressed using IBM TERSE (new)
-         19 - IBM LZ77 z Architecture (PFS)
-         97 - WavPack compressed data
-         98 - PPMd version I, Rev 1
-
-      date and time fields: (2 bytes each)
-
-          The date and time are encoded in standard MS-DOS format.
-          If input came from standard input, the date and time are
-          those at which compression was started for this data. 
-          If encrypting the central directory and general purpose bit 
-          flag 13 is set indicating masking, the value stored in the 
-          Local Header will be zero. 
-
-      CRC-32: (4 bytes)
-
-          The CRC-32 algorithm was generously contributed by
-          David Schwaderer and can be found in his excellent
-          book "C Programmers Guide to NetBIOS" published by
-          Howard W. Sams & Co. Inc.  The 'magic number' for
-          the CRC is 0xdebb20e3.  The proper CRC pre and post
-          conditioning is used, meaning that the CRC register
-          is pre-conditioned with all ones (a starting value
-          of 0xffffffff) and the value is post-conditioned by
-          taking the one's complement of the CRC residual.
-          If bit 3 of the general purpose flag is set, this
-          field is set to zero in the local header and the correct
-          value is put in the data descriptor and in the central
-          directory. When encrypting the central directory, if the
-          local header is not in ZIP64 format and general purpose 
-          bit flag 13 is set indicating masking, the value stored 
-          in the Local Header will be zero. 
-
-      compressed size: (4 bytes)
-      uncompressed size: (4 bytes)
-
-          The size of the file compressed and uncompressed,
-          respectively.  When a decryption header is present it will
-          be placed in front of the file data and the value of the
-          compressed file size will include the bytes of the decryption
-          header.  If bit 3 of the general purpose bit flag is set, 
-          these fields are set to zero in the local header and the 
-          correct values are put in the data descriptor and
-          in the central directory.  If an archive is in ZIP64 format
-          and the value in this field is 0xFFFFFFFF, the size will be
-          in the corresponding 8 byte ZIP64 extended information 
-          extra field.  When encrypting the central directory, if the
-          local header is not in ZIP64 format and general purpose bit 
-          flag 13 is set indicating masking, the value stored for the 
-          uncompressed size in the Local Header will be zero. 
-
-      file name length: (2 bytes)
-      extra field length: (2 bytes)
-      file comment length: (2 bytes)
-
-          The length of the file name, extra field, and comment
-          fields respectively.  The combined length of any
-          directory record and these three fields should not
-          generally exceed 65,535 bytes.  If input came from standard
-          input, the file name length is set to zero.  
-
-      disk number start: (2 bytes)
-
-          The number of the disk on which this file begins.  If an 
-          archive is in ZIP64 format and the value in this field is 
-          0xFFFF, the size will be in the corresponding 4 byte zip64 
-          extended information extra field.
-
-      internal file attributes: (2 bytes)
-
-          Bits 1 and 2 are reserved for use by PKWARE.
-
-          The lowest bit of this field indicates, if set, that
-          the file is apparently an ASCII or text file.  If not
-          set, that the file apparently contains binary data.
-          The remaining bits are unused in version 1.0.
-
-          The 0x0002 bit of this field indicates, if set, that a 
-          4 byte variable record length control field precedes each 
-          logical record indicating the length of the record. The 
-          record length control field is stored in little-endian byte
-          order.  This flag is independent of text control characters, 
-          and if used in conjunction with text data, includes any 
-          control characters in the total length of the record. This 
-          value is provided for mainframe data transfer support.
-
-      external file attributes: (4 bytes)
-
-          The mapping of the external attributes is
-          host-system dependent (see 'version made by').  For
-          MS-DOS, the low order byte is the MS-DOS directory
-          attribute byte.  If input came from standard input, this
-          field is set to zero.
-
-      relative offset of local header: (4 bytes)
-
-          This is the offset from the start of the first disk on
-          which this file appears, to where the local header should
-          be found.  If an archive is in ZIP64 format and the value
-          in this field is 0xFFFFFFFF, the size will be in the 
-          corresponding 8 byte zip64 extended information extra field.
-
-      file name: (Variable)
-
-          The name of the file, with optional relative path.
-          The path stored should not contain a drive or
-          device letter, or a leading slash.  All slashes
-          should be forward slashes '/' as opposed to
-          backwards slashes '\' for compatibility with Amiga
-          and UNIX file systems etc.  If input came from standard
-          input, there is no file name field.  If encrypting
-          the central directory and general purpose bit flag 13 is set 
-          indicating masking, the file name stored in the Local Header 
-          will not be the actual file name.  A masking value consisting 
-          of a unique hexadecimal value will be stored.  This value will 
-          be sequentially incremented for each file in the archive. See
-          the section on the Strong Encryption Specification for details 
-          on retrieving the encrypted file name. 
-
-      extra field: (Variable)
-
-          This is for expansion.  If additional information
-          needs to be stored for special needs or for specific 
-          platforms, it should be stored here.  Earlier versions 
-          of the software can then safely skip this file, and 
-          find the next file or header.  This field will be 0 
-          length in version 1.0.
-
-          In order to allow different programs and different types
-          of information to be stored in the 'extra' field in .ZIP
-          files, the following structure should be used for all
-          programs storing data in this field:
-
-          header1+data1 + header2+data2 . . .
-
-          Each header should consist of:
-
-            Header ID - 2 bytes
-            Data Size - 2 bytes
-
-          Note: all fields stored in Intel low-byte/high-byte order.
-
-          The Header ID field indicates the type of data that is in
-          the following data block.
-
-          Header ID's of 0 thru 31 are reserved for use by PKWARE.
-          The remaining ID's can be used by third party vendors for
-          proprietary usage.
-
-          The current Header ID mappings defined by PKWARE are:
-
-          0x0001        Zip64 extended information extra field
-          0x0007        AV Info
-          0x0008        Reserved for extended language encoding data (PFS)
-                        (see APPENDIX D)
-          0x0009        OS/2
-          0x000a        NTFS 
-          0x000c        OpenVMS
-          0x000d        UNIX
-          0x000e        Reserved for file stream and fork descriptors
-          0x000f        Patch Descriptor
-          0x0014        PKCS#7 Store for X.509 Certificates
-          0x0015        X.509 Certificate ID and Signature for 
-                        individual file
-          0x0016        X.509 Certificate ID for Central Directory
-          0x0017        Strong Encryption Header
-          0x0018        Record Management Controls
-          0x0019        PKCS#7 Encryption Recipient Certificate List
-          0x0065        IBM S/390 (Z390), AS/400 (I400) attributes 
-                        - uncompressed
-          0x0066        Reserved for IBM S/390 (Z390), AS/400 (I400) 
-                        attributes - compressed
-          0x4690        POSZIP 4690 (reserved) 
-
-          Third party mappings commonly used are:
-
-
-          0x07c8        Macintosh
-          0x2605        ZipIt Macintosh
-          0x2705        ZipIt Macintosh 1.3.5+
-          0x2805        ZipIt Macintosh 1.3.5+
-          0x334d        Info-ZIP Macintosh
-          0x4341        Acorn/SparkFS 
-          0x4453        Windows NT security descriptor (binary ACL)
-          0x4704        VM/CMS
-          0x470f        MVS
-          0x4b46        FWKCS MD5 (see below)
-          0x4c41        OS/2 access control list (text ACL)
-          0x4d49        Info-ZIP OpenVMS
-          0x4f4c        Xceed original location extra field
-          0x5356        AOS/VS (ACL)
-          0x5455        extended timestamp
-          0x554e        Xceed unicode extra field
-          0x5855        Info-ZIP UNIX (original, also OS/2, NT, etc)
-          0x6375        Info-ZIP Unicode Comment Extra Field
-          0x6542        BeOS/BeBox
-          0x7075        Info-ZIP Unicode Path Extra Field
-          0x756e        ASi UNIX
-          0x7855        Info-ZIP UNIX (new)
-          0xa220        Microsoft Open Packaging Growth Hint
-          0xfd4a        SMS/QDOS
-
-          Detailed descriptions of Extra Fields defined by third 
-          party mappings will be documented as information on
-          these data structures is made available to PKWARE.  
-          PKWARE does not guarantee the accuracy of any published
-          third party data.
-
-          The Data Size field indicates the size of the following
-          data block. Programs can use this value to skip to the
-          next header block, passing over any data blocks that are
-          not of interest.
-
-          Note: As stated above, the size of the entire .ZIP file
-                header, including the file name, comment, and extra
-                field should not exceed 64K in size.
-
-          In case two different programs should appropriate the same
-          Header ID value, it is strongly recommended that each
-          program place a unique signature of at least two bytes in
-          size (and preferably 4 bytes or bigger) at the start of
-          each data area.  Every program should verify that its
-          unique signature is present, in addition to the Header ID
-          value being correct, before assuming that it is a block of
-          known type.
-
-         -Zip64 Extended Information Extra Field (0x0001):
-
-          The following is the layout of the zip64 extended 
-          information "extra" block. If one of the size or
-          offset fields in the Local or Central directory
-          record is too small to hold the required data,
-          a Zip64 extended information record is created.
-          The order of the fields in the zip64 extended 
-          information record is fixed, but the fields will
-          only appear if the corresponding Local or Central
-          directory record field is set to 0xFFFF or 0xFFFFFFFF.
-
-          Note: all fields stored in Intel low-byte/high-byte order.
-
-          Value      Size       Description
-          -----      ----       -----------
-  (ZIP64) 0x0001     2 bytes    Tag for this "extra" block type
-          Size       2 bytes    Size of this "extra" block
-          Original 
-          Size       8 bytes    Original uncompressed file size
-          Compressed
-          Size       8 bytes    Size of compressed data
-          Relative Header
-          Offset     8 bytes    Offset of local header record
-          Disk Start
-          Number     4 bytes    Number of the disk on which
-                                this file starts 
-
-          This entry in the Local header must include BOTH original
-          and compressed file size fields. If encrypting the 
-          central directory and bit 13 of the general purpose bit
-          flag is set indicating masking, the value stored in the
-          Local Header for the original file size will be zero.
-
-
-         -OS/2 Extra Field (0x0009):
-
-          The following is the layout of the OS/2 attributes "extra" 
-          block.  (Last Revision  09/05/95)
-
-          Note: all fields stored in Intel low-byte/high-byte order.
-
-          Value       Size          Description
-          -----       ----          -----------
-  (OS/2)  0x0009      2 bytes       Tag for this "extra" block type
-          TSize       2 bytes       Size for the following data block
-          BSize       4 bytes       Uncompressed Block Size
-          CType       2 bytes       Compression type
-          EACRC       4 bytes       CRC value for uncompress block
-          (var)       variable      Compressed block
-
-          The OS/2 extended attribute structure (FEA2LIST) is 
-          compressed and then stored in it's entirety within this 
-          structure.  There will only ever be one "block" of data in 
-          VarFields[].
-
-         -NTFS Extra Field (0x000a):
-
-          The following is the layout of the NTFS attributes 
-          "extra" block. (Note: At this time the Mtime, Atime
-          and Ctime values may be used on any WIN32 system.)  
-
-          Note: all fields stored in Intel low-byte/high-byte order.
-
-          Value      Size       Description
-          -----      ----       -----------
-  (NTFS)  0x000a     2 bytes    Tag for this "extra" block type
-          TSize      2 bytes    Size of the total "extra" block
-          Reserved   4 bytes    Reserved for future use
-          Tag1       2 bytes    NTFS attribute tag value #1
-          Size1      2 bytes    Size of attribute #1, in bytes
-          (var.)     Size1      Attribute #1 data
-          .
-          .
-          .
-          TagN       2 bytes    NTFS attribute tag value #N
-          SizeN      2 bytes    Size of attribute #N, in bytes
-          (var.)     SizeN      Attribute #N data
-
-          For NTFS, values for Tag1 through TagN are as follows:
-          (currently only one set of attributes is defined for NTFS)
-
-          Tag        Size       Description
-          -----      ----       -----------
-          0x0001     2 bytes    Tag for attribute #1 
-          Size1      2 bytes    Size of attribute #1, in bytes
-          Mtime      8 bytes    File last modification time
-          Atime      8 bytes    File last access time
-          Ctime      8 bytes    File creation time
-
-         -OpenVMS Extra Field (0x000c):
-
-          The following is the layout of the OpenVMS attributes 
-          "extra" block.
-
-          Note: all fields stored in Intel low-byte/high-byte order.
-
-          Value      Size       Description
-          -----      ----       -----------
-  (VMS)   0x000c     2 bytes    Tag for this "extra" block type
-          TSize      2 bytes    Size of the total "extra" block
-          CRC        4 bytes    32-bit CRC for remainder of the block
-          Tag1       2 bytes    OpenVMS attribute tag value #1
-          Size1      2 bytes    Size of attribute #1, in bytes
-          (var.)     Size1      Attribute #1 data
-          .
-          .
-          .
-          TagN       2 bytes    OpenVMS attribute tag value #N
-          SizeN      2 bytes    Size of attribute #N, in bytes
-          (var.)     SizeN      Attribute #N data
-
-          Rules:
-
-          1. There will be one or more of attributes present, which 
-             will each be preceded by the above TagX & SizeX values.  
-             These values are identical to the ATR$C_XXXX and 
-             ATR$S_XXXX constants which are defined in ATR.H under 
-             OpenVMS C.  Neither of these values will ever be zero.
-
-          2. No word alignment or padding is performed.
-
-          3. A well-behaved PKZIP/OpenVMS program should never produce
-             more than one sub-block with the same TagX value.  Also,
-             there will never be more than one "extra" block of type
-             0x000c in a particular directory record.
-
-         -UNIX Extra Field (0x000d):
-
-          The following is the layout of the UNIX "extra" block.
-          Note: all fields are stored in Intel low-byte/high-byte 
-          order.
-
-          Value       Size          Description
-          -----       ----          -----------
-  (UNIX)  0x000d      2 bytes       Tag for this "extra" block type
-          TSize       2 bytes       Size for the following data block
-          Atime       4 bytes       File last access time
-          Mtime       4 bytes       File last modification time
-          Uid         2 bytes       File user ID
-          Gid         2 bytes       File group ID
-          (var)       variable      Variable length data field
-
-          The variable length data field will contain file type 
-          specific data.  Currently the only values allowed are
-          the original "linked to" file names for hard or symbolic 
-          links, and the major and minor device node numbers for
-          character and block device nodes.  Since device nodes
-          cannot be either symbolic or hard links, only one set of
-          variable length data is stored.  Link files will have the
-          name of the original file stored.  This name is NOT NULL
-          terminated.  Its size can be determined by checking TSize -
-          12.  Device entries will have eight bytes stored as two 4
-          byte entries (in little endian format).  The first entry
-          will be the major device number, and the second the minor
-          device number.
-          
-         -PATCH Descriptor Extra Field (0x000f):
-
-          The following is the layout of the Patch Descriptor "extra"
-          block.
-
-          Note: all fields stored in Intel low-byte/high-byte order.
-
-          Value     Size     Description
-          -----     ----     -----------
-  (Patch) 0x000f    2 bytes  Tag for this "extra" block type
-          TSize     2 bytes  Size of the total "extra" block
-          Version   2 bytes  Version of the descriptor
-          Flags     4 bytes  Actions and reactions (see below) 
-          OldSize   4 bytes  Size of the file about to be patched 
-          OldCRC    4 bytes  32-bit CRC of the file to be patched 
-          NewSize   4 bytes  Size of the resulting file 
-          NewCRC    4 bytes  32-bit CRC of the resulting file 
-
-          Actions and reactions
-
-          Bits          Description
-          ----          ----------------
-          0             Use for auto detection
-          1             Treat as a self-patch
-          2-3           RESERVED
-          4-5           Action (see below)
-          6-7           RESERVED
-          8-9           Reaction (see below) to absent file 
-          10-11         Reaction (see below) to newer file
-          12-13         Reaction (see below) to unknown file
-          14-15         RESERVED
-          16-31         RESERVED
-
-          Actions
-
-          Action       Value
-          ------       ----- 
-          none         0
-          add          1
-          delete       2
-          patch        3
-
-          Reactions
- 
-          Reaction     Value
-          --------     -----
-          ask          0
-          skip         1
-          ignore       2
-          fail         3
-
-          Patch support is provided by PKPatchMaker(tm) technology and is 
-          covered under U.S. Patents and Patents Pending. The use or 
-          implementation in a product of certain technological aspects set
-          forth in the current APPNOTE, including those with regard to 
-          strong encryption, patching, or extended tape operations requires
-          a license from PKWARE.  Please contact PKWARE with regard to 
-          acquiring a license. 
-
-         -PKCS#7 Store for X.509 Certificates (0x0014):
-
-          This field contains information about each of the certificates 
-          files may be signed with. When the Central Directory Encryption 
-          feature is enabled for a ZIP file, this record will appear in 
-          the Archive Extra Data Record, otherwise it will appear in the 
-          first central directory record and will be ignored in any 
-          other record.
-          
-          Note: all fields stored in Intel low-byte/high-byte order.
-
-          Value     Size     Description
-          -----     ----     -----------
-  (Store) 0x0014    2 bytes  Tag for this "extra" block type
-          TSize     2 bytes  Size of the store data
-          TData     TSize    Data about the store
-
-
-         -X.509 Certificate ID and Signature for individual file (0x0015):
-
-          This field contains the information about which certificate in 
-          the PKCS#7 store was used to sign a particular file. It also 
-          contains the signature data. This field can appear multiple 
-          times, but can only appear once per certificate.
-
-          Note: all fields stored in Intel low-byte/high-byte order.
-
-          Value     Size     Description
-          -----     ----     -----------
-  (CID)   0x0015    2 bytes  Tag for this "extra" block type
-          TSize     2 bytes  Size of data that follows
-          TData     TSize    Signature Data
-
-         -X.509 Certificate ID and Signature for central directory (0x0016):
-
-          This field contains the information about which certificate in 
-          the PKCS#7 store was used to sign the central directory structure.
-          When the Central Directory Encryption feature is enabled for a 
-          ZIP file, this record will appear in the Archive Extra Data Record, 
-          otherwise it will appear in the first central directory record.
-
-          Note: all fields stored in Intel low-byte/high-byte order.
-
-          Value     Size     Description
-          -----     ----     -----------
-  (CDID)  0x0016    2 bytes  Tag for this "extra" block type
-          TSize     2 bytes  Size of data that follows
-          TData     TSize    Data
-
-         -Strong Encryption Header (0x0017):
-
-          Value     Size     Description
-          -----     ----     -----------
-          0x0017    2 bytes  Tag for this "extra" block type
-          TSize     2 bytes  Size of data that follows
-          Format    2 bytes  Format definition for this record
-          AlgID     2 bytes  Encryption algorithm identifier
-          Bitlen    2 bytes  Bit length of encryption key
-          Flags     2 bytes  Processing flags
-          CertData  TSize-8  Certificate decryption extra field data
-                             (refer to the explanation for CertData
-                              in the section describing the 
-                              Certificate Processing Method under 
-                              the Strong Encryption Specification)
-
-
-         -Record Management Controls (0x0018):
-
-          Value     Size     Description
-          -----     ----     -----------
-(Rec-CTL) 0x0018    2 bytes  Tag for this "extra" block type
-          CSize     2 bytes  Size of total extra block data
-          Tag1      2 bytes  Record control attribute 1
-          Size1     2 bytes  Size of attribute 1, in bytes
-          Data1     Size1    Attribute 1 data
-            .
-            .
-            .
-          TagN      2 bytes  Record control attribute N
-          SizeN     2 bytes  Size of attribute N, in bytes
-          DataN     SizeN    Attribute N data
-
-
-         -PKCS#7 Encryption Recipient Certificate List (0x0019): 
-
-          This field contains information about each of the certificates
-          used in encryption processing and it can be used to identify who is
-          allowed to decrypt encrypted files.  This field should only appear 
-          in the archive extra data record. This field is not required and 
-          serves only to aide archive modifications by preserving public 
-          encryption key data. Individual security requirements may dictate 
-          that this data be omitted to deter information exposure.
-
-          Note: all fields stored in Intel low-byte/high-byte order.
-
-          Value     Size     Description
-          -----     ----     -----------
- (CStore) 0x0019    2 bytes  Tag for this "extra" block type
-          TSize     2 bytes  Size of the store data
-          TData     TSize    Data about the store
-
-          TData:
-
-          Value     Size     Description
-          -----     ----     -----------
-          Version   2 bytes  Format version number - must 0x0001 at this time
-          CStore    (var)    PKCS#7 data blob
-
-
-         -MVS Extra Field (0x0065):
-
-          The following is the layout of the MVS "extra" block.
-          Note: Some fields are stored in Big Endian format.
-          All text is in EBCDIC format unless otherwise specified.
-
-          Value       Size          Description
-          -----       ----          -----------
-  (MVS)   0x0065      2 bytes       Tag for this "extra" block type
-          TSize       2 bytes       Size for the following data block
-          ID          4 bytes       EBCDIC "Z390" 0xE9F3F9F0 or
-                                    "T4MV" for TargetFour
-          (var)       TSize-4       Attribute data (see APPENDIX B)
-
-
-         -OS/400 Extra Field (0x0065):
-
-          The following is the layout of the OS/400 "extra" block.
-          Note: Some fields are stored in Big Endian format.
-          All text is in EBCDIC format unless otherwise specified.
-
-          Value       Size          Description
-          -----       ----          -----------
-  (OS400) 0x0065      2 bytes       Tag for this "extra" block type
-          TSize       2 bytes       Size for the following data block
-          ID          4 bytes       EBCDIC "I400" 0xC9F4F0F0 or
-                                    "T4MV" for TargetFour
-          (var)       TSize-4       Attribute data (see APPENDIX A)
-
-
-          Third-party Mappings:
-          
-         -ZipIt Macintosh Extra Field (long) (0x2605):
-
-          The following is the layout of the ZipIt extra block 
-          for Macintosh. The local-header and central-header versions 
-          are identical. This block must be present if the file is 
-          stored MacBinary-encoded and it should not be used if the file 
-          is not stored MacBinary-encoded.
-
-          Value         Size        Description
-          -----         ----        -----------
-  (Mac2)  0x2605        Short       tag for this extra block type
-          TSize         Short       total data size for this block
-          "ZPIT"        beLong      extra-field signature
-          FnLen         Byte        length of FileName
-          FileName      variable    full Macintosh filename
-          FileType      Byte[4]     four-byte Mac file type string
-          Creator       Byte[4]     four-byte Mac creator string
-
-
-         -ZipIt Macintosh Extra Field (short, for files) (0x2705):
-
-          The following is the layout of a shortened variant of the
-          ZipIt extra block for Macintosh (without "full name" entry).
-          This variant is used by ZipIt 1.3.5 and newer for entries of
-          files (not directories) that do not have a MacBinary encoded
-          file. The local-header and central-header versions are identical.
-
-          Value         Size        Description
-          -----         ----        -----------
-  (Mac2b) 0x2705        Short       tag for this extra block type
-          TSize         Short       total data size for this block (12)
-          "ZPIT"        beLong      extra-field signature
-          FileType      Byte[4]     four-byte Mac file type string
-          Creator       Byte[4]     four-byte Mac creator string
-          fdFlags       beShort     attributes from FInfo.frFlags,
-                                    may be omitted
-          0x0000        beShort     reserved, may be omitted
-
-
-         -ZipIt Macintosh Extra Field (short, for directories) (0x2805):
-
-          The following is the layout of a shortened variant of the
-          ZipIt extra block for Macintosh used only for directory
-          entries. This variant is used by ZipIt 1.3.5 and newer to 
-          save some optional Mac-specific information about directories.
-          The local-header and central-header versions are identical.
-
-          Value         Size        Description
-          -----         ----        -----------
-  (Mac2c) 0x2805        Short       tag for this extra block type
-          TSize         Short       total data size for this block (12)
-          "ZPIT"        beLong      extra-field signature
-          frFlags       beShort     attributes from DInfo.frFlags, may
-                                    be omitted
-          View          beShort     ZipIt view flag, may be omitted
-
-
-          The View field specifies ZipIt-internal settings as follows:
-
-          Bits of the Flags:
-              bit 0           if set, the folder is shown expanded (open)
-                              when the archive contents are viewed in ZipIt.
-              bits 1-15       reserved, zero;
-
-
-         -FWKCS MD5 Extra Field (0x4b46):
-
-          The FWKCS Contents_Signature System, used in
-          automatically identifying files independent of file name,
-          optionally adds and uses an extra field to support the
-          rapid creation of an enhanced contents_signature:
-
-              Header ID = 0x4b46
-              Data Size = 0x0013
-              Preface   = 'M','D','5'
-              followed by 16 bytes containing the uncompressed file's
-              128_bit MD5 hash(1), low byte first.
-
-          When FWKCS revises a .ZIP file central directory to add
-          this extra field for a file, it also replaces the
-          central directory entry for that file's uncompressed
-          file length with a measured value.
-
-          FWKCS provides an option to strip this extra field, if
-          present, from a .ZIP file central directory. In adding
-          this extra field, FWKCS preserves .ZIP file Authenticity
-          Verification; if stripping this extra field, FWKCS
-          preserves all versions of AV through PKZIP version 2.04g.
-
-          FWKCS, and FWKCS Contents_Signature System, are
-          trademarks of Frederick W. Kantor.
-
-          (1) R. Rivest, RFC1321.TXT, MIT Laboratory for Computer
-              Science and RSA Data Security, Inc., April 1992.
-              ll.76-77: "The MD5 algorithm is being placed in the
-              public domain for review and possible adoption as a
-              standard."
-
-
-         -Info-ZIP Unicode Comment Extra Field (0x6375):
-
-          Stores the UTF-8 version of the file comment as stored in the
-          central directory header. (Last Revision 20070912)
-
-          Value         Size        Description
-          -----         ----        -----------
-   (UCom) 0x6375        Short       tag for this extra block type ("uc")
-          TSize         Short       total data size for this block
-          Version       1 byte      version of this extra field, currently 1
-          ComCRC32      4 bytes     Comment Field CRC32 Checksum
-          UnicodeCom    Variable    UTF-8 version of the entry comment
-
-          Currently Version is set to the number 1.  If there is a need
-          to change this field, the version will be incremented.  Changes
-          may not be backward compatible so this extra field should not be
-          used if the version is not recognized.
-
-          The ComCRC32 is the standard zip CRC32 checksum of the File Comment
-          field in the central directory header.  This is used to verify that
-          the comment field has not changed since the Unicode Comment extra field
-          was created.  This can happen if a utility changes the File Comment 
-          field but does not update the UTF-8 Comment extra field.  If the CRC 
-          check fails, this Unicode Comment extra field should be ignored and 
-          the File Comment field in the header should be used instead.
-
-          The UnicodeCom field is the UTF-8 version of the File Comment field
-          in the header.  As UnicodeCom is defined to be UTF-8, no UTF-8 byte
-          order mark (BOM) is used.  The length of this field is determined by
-          subtracting the size of the previous fields from TSize.  If both the
-          File Name and Comment fields are UTF-8, the new General Purpose Bit
-          Flag, bit 11 (Language encoding flag (EFS)), can be used to indicate
-          both the header File Name and Comment fields are UTF-8 and, in this
-          case, the Unicode Path and Unicode Comment extra fields are not
-          needed and should not be created.  Note that, for backward
-          compatibility, bit 11 should only be used if the native character set
-          of the paths and comments being zipped up are already in UTF-8. It is
-          expected that the same file comment storage method, either general
-          purpose bit 11 or extra fields, be used in both the Local and Central
-          Directory Header for a file.
-
-
-         -Info-ZIP Unicode Path Extra Field (0x7075):
-
-          Stores the UTF-8 version of the file name field as stored in the
-          local header and central directory header. (Last Revision 20070912)
-
-          Value         Size        Description
-          -----         ----        -----------
-  (UPath) 0x7075        Short       tag for this extra block type ("up")
-          TSize         Short       total data size for this block
-          Version       1 byte      version of this extra field, currently 1
-          NameCRC32     4 bytes     File Name Field CRC32 Checksum
-          UnicodeName   Variable    UTF-8 version of the entry File Name
-
-          Currently Version is set to the number 1.  If there is a need
-          to change this field, the version will be incremented.  Changes
-          may not be backward compatible so this extra field should not be
-          used if the version is not recognized.
-
-          The NameCRC32 is the standard zip CRC32 checksum of the File Name
-          field in the header.  This is used to verify that the header
-          File Name field has not changed since the Unicode Path extra field
-          was created.  This can happen if a utility renames the File Name but
-          does not update the UTF-8 path extra field.  If the CRC check fails,
-          this UTF-8 Path Extra Field should be ignored and the File Name field
-          in the header should be used instead.
-
-          The UnicodeName is the UTF-8 version of the contents of the File Name
-          field in the header.  As UnicodeName is defined to be UTF-8, no UTF-8
-          byte order mark (BOM) is used.  The length of this field is determined
-          by subtracting the size of the previous fields from TSize.  If both
-          the File Name and Comment fields are UTF-8, the new General Purpose
-          Bit Flag, bit 11 (Language encoding flag (EFS)), can be used to
-          indicate that both the header File Name and Comment fields are UTF-8
-          and, in this case, the Unicode Path and Unicode Comment extra fields
-          are not needed and should not be created.  Note that, for backward
-          compatibility, bit 11 should only be used if the native character set
-          of the paths and comments being zipped up are already in UTF-8. It is
-          expected that the same file name storage method, either general
-          purpose bit 11 or extra fields, be used in both the Local and Central
-          Directory Header for a file.
- 
-
-        -Microsoft Open Packaging Growth Hint (0xa220):
-
-          Value         Size        Description
-          -----         ----        -----------
-          0xa220        Short       tag for this extra block type
-          TSize         Short       size of Sig + PadVal + Padding
-          Sig           Short       verification signature (A028)
-          PadVal        Short       Initial padding value
-          Padding       variable    filled with NULL characters
-
-
-      file comment: (Variable)
-
-          The comment for this file.
-
-      number of this disk: (2 bytes)
-
-          The number of this disk, which contains central
-          directory end record. If an archive is in ZIP64 format
-          and the value in this field is 0xFFFF, the size will 
-          be in the corresponding 4 byte zip64 end of central 
-          directory field.
-
-
-      number of the disk with the start of the central
-      directory: (2 bytes)
-
-          The number of the disk on which the central
-          directory starts. If an archive is in ZIP64 format
-          and the value in this field is 0xFFFF, the size will 
-          be in the corresponding 4 byte zip64 end of central 
-          directory field.
-
-      total number of entries in the central dir on 
-      this disk: (2 bytes)
-
-          The number of central directory entries on this disk.
-          If an archive is in ZIP64 format and the value in 
-          this field is 0xFFFF, the size will be in the 
-          corresponding 8 byte zip64 end of central 
-          directory field.
-
-      total number of entries in the central dir: (2 bytes)
-
-          The total number of files in the .ZIP file. If an 
-          archive is in ZIP64 format and the value in this field
-          is 0xFFFF, the size will be in the corresponding 8 byte 
-          zip64 end of central directory field.
-
-      size of the central directory: (4 bytes)
-
-          The size (in bytes) of the entire central directory.
-          If an archive is in ZIP64 format and the value in 
-          this field is 0xFFFFFFFF, the size will be in the 
-          corresponding 8 byte zip64 end of central 
-          directory field.
-
-      offset of start of central directory with respect to
-      the starting disk number:  (4 bytes)
-
-          Offset of the start of the central directory on the
-          disk on which the central directory starts. If an 
-          archive is in ZIP64 format and the value in this 
-          field is 0xFFFFFFFF, the size will be in the 
-          corresponding 8 byte zip64 end of central 
-          directory field.
-
-      .ZIP file comment length: (2 bytes)
-
-          The length of the comment for this .ZIP file.
-
-      .ZIP file comment: (Variable)
-
-          The comment for this .ZIP file.  ZIP file comment data
-          is stored unsecured.  No encryption or data authentication
-          is applied to this area at this time.  Confidential information
-          should not be stored in this section.
-
-      zip64 extensible data sector    (variable size)
-
-          (currently reserved for use by PKWARE)
-
-
-  K.  Splitting and Spanning ZIP files
-
-          Spanning is the process of segmenting a ZIP file across 
-          multiple removable media. This support has typically only 
-          been provided for DOS formatted floppy diskettes. 
-
-          File splitting is a newer derivative of spanning.  
-          Splitting follows the same segmentation process as
-          spanning, however, it does not require writing each
-          segment to a unique removable medium and instead supports
-          placing all pieces onto local or non-removable locations
-          such as file systems, local drives, folders, etc...
-
-          A key difference between spanned and split ZIP files is
-          that all pieces of a spanned ZIP file have the same name.  
-          Since each piece is written to a separate volume, no name 
-          collisions occur and each segment can reuse the original 
-          .ZIP file name given to the archive.
-
-          Sequence ordering for DOS spanned archives uses the DOS 
-          volume label to determine segment numbers.  Volume labels
-          for each segment are written using the form PKBACK#xxx, 
-          where xxx is the segment number written as a decimal 
-          value from 001 - nnn.
-
-          Split ZIP files are typically written to the same location
-          and are subject to name collisions if the spanned name
-          format is used since each segment will reside on the same 
-          drive. To avoid name collisions, split archives are named 
-          as follows.
-
-          Segment 1   = filename.z01
-          Segment n-1 = filename.z(n-1)
-          Segment n   = filename.zip
-
-          The .ZIP extension is used on the last segment to support
-          quickly reading the central directory.  The segment number
-          n should be a decimal value.
-
-          Spanned ZIP files may be PKSFX Self-extracting ZIP files.
-          PKSFX files may also be split, however, in this case
-          the first segment must be named filename.exe.  The first
-          segment of a split PKSFX archive must be large enough to
-          include the entire executable program.
-
-          Capacities for split archives are as follows.
-
-          Maximum number of segments = 4,294,967,295 - 1
-          Maximum .ZIP segment size = 4,294,967,295 bytes
-          Minimum segment size = 64K
-          Maximum PKSFX segment size = 2,147,483,647 bytes
-          
-          Segment sizes may be different however by convention, all 
-          segment sizes should be the same with the exception of the 
-          last, which may be smaller.  Local and central directory 
-          header records must never be split across a segment boundary. 
-          When writing a header record, if the number of bytes remaining 
-          within a segment is less than the size of the header record,
-          end the current segment and write the header at the start
-          of the next segment.  The central directory may span segment
-          boundaries, but no single record in the central directory
-          should be split across segments.
-
-          Spanned/Split archives created using PKZIP for Windows
-          (V2.50 or greater), PKZIP Command Line (V2.50 or greater),
-          or PKZIP Explorer will include a special spanning 
-          signature as the first 4 bytes of the first segment of
-          the archive.  This signature (0x08074b50) will be 
-          followed immediately by the local header signature for
-          the first file in the archive.  
-
-          A special spanning marker may also appear in spanned/split 
-          archives if the spanning or splitting process starts but 
-          only requires one segment.  In this case the 0x08074b50 
-          signature will be replaced with the temporary spanning 
-          marker signature of 0x30304b50.  Split archives can
-          only be uncompressed by other versions of PKZIP that
-          know how to create a split archive.
-
-          The signature value 0x08074b50 is also used by some
-          ZIP implementations as a marker for the Data Descriptor 
-          record.  Conflict in this alternate assignment can be
-          avoided by ensuring the position of the signature
-          within the ZIP file to determine the use for which it
-          is intended.  
-
-  L.  General notes:
-
-      1)  All fields unless otherwise noted are unsigned and stored
-          in Intel low-byte:high-byte, low-word:high-word order.
-
-      2)  String fields are not null terminated, since the
-          length is given explicitly.
-
-      3)  The entries in the central directory may not necessarily
-          be in the same order that files appear in the .ZIP file.
-
-      4)  If one of the fields in the end of central directory
-          record is too small to hold required data, the field
-          should be set to -1 (0xFFFF or 0xFFFFFFFF) and the
-          ZIP64 format record should be created.
-
-      5)  The end of central directory record and the
-          Zip64 end of central directory locator record must
-          reside on the same disk when splitting or spanning
-          an archive.
-
-VI. Explanation of compression methods
---------------------------------------
-
-UnShrinking - Method 1
-----------------------
-
-Shrinking is a Dynamic Ziv-Lempel-Welch compression algorithm
-with partial clearing.  The initial code size is 9 bits, and
-the maximum code size is 13 bits.  Shrinking differs from
-conventional Dynamic Ziv-Lempel-Welch implementations in several
-respects:
-
-1)  The code size is controlled by the compressor, and is not
-    automatically increased when codes larger than the current
-    code size are created (but not necessarily used).  When
-    the decompressor encounters the code sequence 256
-    (decimal) followed by 1, it should increase the code size
-    read from the input stream to the next bit size.  No
-    blocking of the codes is performed, so the next code at
-    the increased size should be read from the input stream
-    immediately after where the previous code at the smaller
-    bit size was read.  Again, the decompressor should not
-    increase the code size used until the sequence 256,1 is
-    encountered.
-
-2)  When the table becomes full, total clearing is not
-    performed.  Rather, when the compressor emits the code
-    sequence 256,2 (decimal), the decompressor should clear
-    all leaf nodes from the Ziv-Lempel tree, and continue to
-    use the current code size.  The nodes that are cleared
-    from the Ziv-Lempel tree are then re-used, with the lowest
-    code value re-used first, and the highest code value
-    re-used last.  The compressor can emit the sequence 256,2
-    at any time.
-
-Expanding - Methods 2-5
------------------------
-
-The Reducing algorithm is actually a combination of two
-distinct algorithms.  The first algorithm compresses repeated
-byte sequences, and the second algorithm takes the compressed
-stream from the first algorithm and applies a probabilistic
-compression method.
-
-The probabilistic compression stores an array of 'follower
-sets' S(j), for j=0 to 255, corresponding to each possible
-ASCII character.  Each set contains between 0 and 32
-characters, to be denoted as S(j)[0],...,S(j)[m], where m<32.
-The sets are stored at the beginning of the data area for a
-Reduced file, in reverse order, with S(255) first, and S(0)
-last.
-
-The sets are encoded as { N(j), S(j)[0],...,S(j)[N(j)-1] },
-where N(j) is the size of set S(j).  N(j) can be 0, in which
-case the follower set for S(j) is empty.  Each N(j) value is
-encoded in 6 bits, followed by N(j) eight bit character values
-corresponding to S(j)[0] to S(j)[N(j)-1] respectively.  If
-N(j) is 0, then no values for S(j) are stored, and the value
-for N(j-1) immediately follows.
-
-Immediately after the follower sets, is the compressed data
-stream.  The compressed data stream can be interpreted for the
-probabilistic decompression as follows:
-
-let Last-Character <- 0.
-loop until done
-    if the follower set S(Last-Character) is empty then
-        read 8 bits from the input stream, and copy this
-        value to the output stream.
-    otherwise if the follower set S(Last-Character) is non-empty then
-        read 1 bit from the input stream.
-        if this bit is not zero then
-            read 8 bits from the input stream, and copy this
-            value to the output stream.
-        otherwise if this bit is zero then
-            read B(N(Last-Character)) bits from the input
-            stream, and assign this value to I.
-            Copy the value of S(Last-Character)[I] to the
-            output stream.
-
-    assign the last value placed on the output stream to
-    Last-Character.
-end loop
-
-B(N(j)) is defined as the minimal number of bits required to
-encode the value N(j)-1.
-
-The decompressed stream from above can then be expanded to
-re-create the original file as follows:
-
-let State <- 0.
-
-loop until done
-    read 8 bits from the input stream into C.
-    case State of
-        0:  if C is not equal to DLE (144 decimal) then
-                copy C to the output stream.
-            otherwise if C is equal to DLE then
-                let State <- 1.
-
-        1:  if C is non-zero then
-                let V <- C.
-                let Len <- L(V)
-                let State <- F(Len).
-            otherwise if C is zero then
-                copy the value 144 (decimal) to the output stream.
-                let State <- 0
-
-        2:  let Len <- Len + C
-            let State <- 3.
-
-        3:  move backwards D(V,C) bytes in the output stream
-            (if this position is before the start of the output
-            stream, then assume that all the data before the
-            start of the output stream is filled with zeros).
-            copy Len+3 bytes from this position to the output stream.
-            let State <- 0.
-    end case
-end loop
-
-The functions F,L, and D are dependent on the 'compression
-factor', 1 through 4, and are defined as follows:
-
-For compression factor 1:
-    L(X) equals the lower 7 bits of X.
-    F(X) equals 2 if X equals 127 otherwise F(X) equals 3.
-    D(X,Y) equals the (upper 1 bit of X) * 256 + Y + 1.
-For compression factor 2:
-    L(X) equals the lower 6 bits of X.
-    F(X) equals 2 if X equals 63 otherwise F(X) equals 3.
-    D(X,Y) equals the (upper 2 bits of X) * 256 + Y + 1.
-For compression factor 3:
-    L(X) equals the lower 5 bits of X.
-    F(X) equals 2 if X equals 31 otherwise F(X) equals 3.
-    D(X,Y) equals the (upper 3 bits of X) * 256 + Y + 1.
-For compression factor 4:
-    L(X) equals the lower 4 bits of X.
-    F(X) equals 2 if X equals 15 otherwise F(X) equals 3.
-    D(X,Y) equals the (upper 4 bits of X) * 256 + Y + 1.
-
-Imploding - Method 6
---------------------
-
-The Imploding algorithm is actually a combination of two distinct
-algorithms.  The first algorithm compresses repeated byte
-sequences using a sliding dictionary.  The second algorithm is
-used to compress the encoding of the sliding dictionary output,
-using multiple Shannon-Fano trees.
-
-The Imploding algorithm can use a 4K or 8K sliding dictionary
-size. The dictionary size used can be determined by bit 1 in the
-general purpose flag word; a 0 bit indicates a 4K dictionary
-while a 1 bit indicates an 8K dictionary.
-
-The Shannon-Fano trees are stored at the start of the compressed
-file. The number of trees stored is defined by bit 2 in the
-general purpose flag word; a 0 bit indicates two trees stored, a
-1 bit indicates three trees are stored.  If 3 trees are stored,
-the first Shannon-Fano tree represents the encoding of the
-Literal characters, the second tree represents the encoding of
-the Length information, the third represents the encoding of the
-Distance information.  When 2 Shannon-Fano trees are stored, the
-Length tree is stored first, followed by the Distance tree.
-
-The Literal Shannon-Fano tree, if present is used to represent
-the entire ASCII character set, and contains 256 values.  This
-tree is used to compress any data not compressed by the sliding
-dictionary algorithm.  When this tree is present, the Minimum
-Match Length for the sliding dictionary is 3.  If this tree is
-not present, the Minimum Match Length is 2.
-
-The Length Shannon-Fano tree is used to compress the Length part
-of the (length,distance) pairs from the sliding dictionary
-output.  The Length tree contains 64 values, ranging from the
-Minimum Match Length, to 63 plus the Minimum Match Length.
-
-The Distance Shannon-Fano tree is used to compress the Distance
-part of the (length,distance) pairs from the sliding dictionary
-output. The Distance tree contains 64 values, ranging from 0 to
-63, representing the upper 6 bits of the distance value.  The
-distance values themselves will be between 0 and the sliding
-dictionary size, either 4K or 8K.
-
-The Shannon-Fano trees themselves are stored in a compressed
-format. The first byte of the tree data represents the number of
-bytes of data representing the (compressed) Shannon-Fano tree
-minus 1.  The remaining bytes represent the Shannon-Fano tree
-data encoded as:
-
-    High 4 bits: Number of values at this bit length + 1. (1 - 16)
-    Low  4 bits: Bit Length needed to represent value + 1. (1 - 16)
-
-The Shannon-Fano codes can be constructed from the bit lengths
-using the following algorithm:
-
-1)  Sort the Bit Lengths in ascending order, while retaining the
-    order of the original lengths stored in the file.
-
-2)  Generate the Shannon-Fano trees:
-
-    Code <- 0
-    CodeIncrement <- 0
-    LastBitLength <- 0
-    i <- number of Shannon-Fano codes - 1   (either 255 or 63)
-
-    loop while i >= 0
-        Code = Code + CodeIncrement
-        if BitLength(i) <> LastBitLength then
-            LastBitLength=BitLength(i)
-            CodeIncrement = 1 shifted left (16 - LastBitLength)
-        ShannonCode(i) = Code
-        i <- i - 1
-    end loop
-
-3)  Reverse the order of all the bits in the above ShannonCode()
-    vector, so that the most significant bit becomes the least
-    significant bit.  For example, the value 0x1234 (hex) would
-    become 0x2C48 (hex).
-
-4)  Restore the order of Shannon-Fano codes as originally stored
-    within the file.
-
-Example:
-
-    This example will show the encoding of a Shannon-Fano tree
-    of size 8.  Notice that the actual Shannon-Fano trees used
-    for Imploding are either 64 or 256 entries in size.
-
-Example:   0x02, 0x42, 0x01, 0x13
-
-    The first byte indicates 3 values in this table.  Decoding the
-    bytes:
-            0x42 = 5 codes of 3 bits long
-            0x01 = 1 code  of 2 bits long
-            0x13 = 2 codes of 4 bits long
-
-    This would generate the original bit length array of:
-    (3, 3, 3, 3, 3, 2, 4, 4)
-
-    There are 8 codes in this table for the values 0 thru 7.  Using 
-    the algorithm to obtain the Shannon-Fano codes produces:
-
-                                  Reversed     Order     Original
-Val  Sorted   Constructed Code      Value     Restored    Length
----  ------   -----------------   --------    --------    ------
-0:     2      1100000000000000        11       101          3
-1:     3      1010000000000000       101       001          3
-2:     3      1000000000000000       001       110          3
-3:     3      0110000000000000       110       010          3
-4:     3      0100000000000000       010       100          3
-5:     3      0010000000000000       100        11          2
-6:     4      0001000000000000      1000      1000          4
-7:     4      0000000000000000      0000      0000          4
-
-The values in the Val, Order Restored and Original Length columns
-now represent the Shannon-Fano encoding tree that can be used for
-decoding the Shannon-Fano encoded data.  How to parse the
-variable length Shannon-Fano values from the data stream is beyond
-the scope of this document.  (See the references listed at the end of
-this document for more information.)  However, traditional decoding
-schemes used for Huffman variable length decoding, such as the
-Greenlaw algorithm, can be successfully applied.
-
-The compressed data stream begins immediately after the
-compressed Shannon-Fano data.  The compressed data stream can be
-interpreted as follows:
-
-loop until done
-    read 1 bit from input stream.
-
-    if this bit is non-zero then       (encoded data is literal data)
-        if Literal Shannon-Fano tree is present
-            read and decode character using Literal Shannon-Fano tree.
-        otherwise
-            read 8 bits from input stream.
-        copy character to the output stream.
-    otherwise              (encoded data is sliding dictionary match)
-        if 8K dictionary size
-            read 7 bits for offset Distance (lower 7 bits of offset).
-        otherwise
-            read 6 bits for offset Distance (lower 6 bits of offset).
-
-        using the Distance Shannon-Fano tree, read and decode the
-          upper 6 bits of the Distance value.
-
-        using the Length Shannon-Fano tree, read and decode
-          the Length value.
-
-        Length <- Length + Minimum Match Length
-
-        if Length = 63 + Minimum Match Length
-            read 8 bits from the input stream,
-            add this value to Length.
-
-        move backwards Distance+1 bytes in the output stream, and
-        copy Length characters from this position to the output
-        stream.  (if this position is before the start of the output
-        stream, then assume that all the data before the start of
-        the output stream is filled with zeros).
-end loop
-
-Tokenizing - Method 7
----------------------
-
-This method is not used by PKZIP.
-
-Deflating - Method 8
---------------------
-
-The Deflate algorithm is similar to the Implode algorithm using
-a sliding dictionary of up to 32K with secondary compression
-from Huffman/Shannon-Fano codes.
-
-The compressed data is stored in blocks with a header describing
-the block and the Huffman codes used in the data block.  The header
-format is as follows:
-
-   Bit 0: Last Block bit     This bit is set to 1 if this is the last
-                             compressed block in the data.
-   Bits 1-2: Block type
-      00 (0) - Block is stored - All stored data is byte aligned.
-               Skip bits until next byte, then next word = block 
-               length, followed by the ones compliment of the block
-               length word. Remaining data in block is the stored 
-               data.
-
-      01 (1) - Use fixed Huffman codes for literal and distance codes.
-               Lit Code    Bits             Dist Code   Bits
-               ---------   ----             ---------   ----
-                 0 - 143    8                 0 - 31      5
-               144 - 255    9
-               256 - 279    7
-               280 - 287    8
-
-               Literal codes 286-287 and distance codes 30-31 are 
-               never used but participate in the huffman construction.
-
-      10 (2) - Dynamic Huffman codes.  (See expanding Huffman codes)
-
-      11 (3) - Reserved - Flag a "Error in compressed data" if seen.
-
-Expanding Huffman Codes
------------------------
-If the data block is stored with dynamic Huffman codes, the Huffman
-codes are sent in the following compressed format:
-
-   5 Bits: # of Literal codes sent - 256 (256 - 286)
-           All other codes are never sent.
-   5 Bits: # of Dist codes - 1           (1 - 32)
-   4 Bits: # of Bit Length codes - 3     (3 - 19)
-
-The Huffman codes are sent as bit lengths and the codes are built as
-described in the implode algorithm.  The bit lengths themselves are
-compressed with Huffman codes.  There are 19 bit length codes:
-
-   0 - 15: Represent bit lengths of 0 - 15
-       16: Copy the previous bit length 3 - 6 times.
-           The next 2 bits indicate repeat length (0 = 3, ... ,3 = 6)
-              Example:  Codes 8, 16 (+2 bits 11), 16 (+2 bits 10) will
-                        expand to 12 bit lengths of 8 (1 + 6 + 5)
-       17: Repeat a bit length of 0 for 3 - 10 times. (3 bits of length)
-       18: Repeat a bit length of 0 for 11 - 138 times (7 bits of length)
-
-The lengths of the bit length codes are sent packed 3 bits per value
-(0 - 7) in the following order:
-
-   16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15
-
-The Huffman codes should be built as described in the Implode algorithm
-except codes are assigned starting at the shortest bit length, i.e. the
-shortest code should be all 0's rather than all 1's.  Also, codes with
-a bit length of zero do not participate in the tree construction.  The
-codes are then used to decode the bit lengths for the literal and 
-distance tables.
-
-The bit lengths for the literal tables are sent first with the number
-of entries sent described by the 5 bits sent earlier.  There are up
-to 286 literal characters; the first 256 represent the respective 8
-bit character, code 256 represents the End-Of-Block code, the remaining
-29 codes represent copy lengths of 3 thru 258.  There are up to 30
-distance codes representing distances from 1 thru 32k as described
-below.
-
-                             Length Codes
-                             ------------
-      Extra             Extra              Extra              Extra
- Code Bits Length  Code Bits Lengths  Code Bits Lengths  Code Bits Length(s)
- ---- ---- ------  ---- ---- -------  ---- ---- -------  ---- ---- ---------
-  257   0     3     265   1   11,12    273   3   35-42    281   5  131-162
-  258   0     4     266   1   13,14    274   3   43-50    282   5  163-194
-  259   0     5     267   1   15,16    275   3   51-58    283   5  195-226
-  260   0     6     268   1   17,18    276   3   59-66    284   5  227-257
-  261   0     7     269   2   19-22    277   4   67-82    285   0    258
-  262   0     8     270   2   23-26    278   4   83-98
-  263   0     9     271   2   27-30    279   4   99-114
-  264   0    10     272   2   31-34    280   4  115-130
-
-                            Distance Codes
-                            --------------
-      Extra           Extra             Extra               Extra
- Code Bits Dist  Code Bits  Dist   Code Bits Distance  Code Bits Distance
- ---- ---- ----  ---- ---- ------  ---- ---- --------  ---- ---- --------
-   0   0    1      8   3   17-24    16    7  257-384    24   11  4097-6144
-   1   0    2      9   3   25-32    17    7  385-512    25   11  6145-8192
-   2   0    3     10   4   33-48    18    8  513-768    26   12  8193-12288
-   3   0    4     11   4   49-64    19    8  769-1024   27   12 12289-16384
-   4   1   5,6    12   5   65-96    20    9 1025-1536   28   13 16385-24576
-   5   1   7,8    13   5   97-128   21    9 1537-2048   29   13 24577-32768
-   6   2   9-12   14   6  129-192   22   10 2049-3072
-   7   2  13-16   15   6  193-256   23   10 3073-4096
-
-The compressed data stream begins immediately after the
-compressed header data.  The compressed data stream can be
-interpreted as follows:
-
-do
-   read header from input stream.
-
-   if stored block
-      skip bits until byte aligned
-      read count and 1's compliment of count
-      copy count bytes data block
-   otherwise
-      loop until end of block code sent
-         decode literal character from input stream
-         if literal < 256
-            copy character to the output stream
-         otherwise
-            if literal = end of block
-               break from loop
-            otherwise
-               decode distance from input stream
-
-               move backwards distance bytes in the output stream, and
-               copy length characters from this position to the output
-               stream.
-      end loop
-while not last block
-
-if data descriptor exists
-   skip bits until byte aligned
-   read crc and sizes
-endif
-
-Enhanced Deflating - Method 9
------------------------------
-
-The Enhanced Deflating algorithm is similar to Deflate but
-uses a sliding dictionary of up to 64K. Deflate64(tm) is supported
-by the Deflate extractor. 
-
-BZIP2 - Method 12
------------------
-
-BZIP2 is an open-source data compression algorithm developed by 
-Julian Seward.  Information and source code for this algorithm
-can be found on the internet.
-
-LZMA - Method 14 (EFS)
-----------------------
-
-LZMA is a block-oriented, general purpose data compression algorithm  
-developed and maintained by Igor Pavlov.  It is a derivative of LZ77
-that utilizes Markov chains and a range coder.  Information and 
-source code for this algorithm can be found on the internet.  Consult 
-with the author of this algorithm for information on terms or 
-restrictions on use.
-
-Support for LZMA within the ZIP format is defined as follows:   
-
-The Compression method field within the ZIP Local and Central 
-Header records will be set to the value 14 to indicate data was
-compressed using LZMA. 
-
-The Version needed to extract field within the ZIP Local and 
-Central Header records will be set to 6.3 to indicate the 
-minimum ZIP format version supporting this feature.
-
-File data compressed using the LZMA algorithm must be placed 
-immediately following the Local Header for the file.  If a 
-standard ZIP encryption header is required, it will follow 
-the Local Header and will precede the LZMA compressed file 
-data segment.  The location of LZMA compressed data segment 
-within the ZIP format will be as shown:
-
-    [local header file 1]
-    [encryption header file 1]
-    [LZMA compressed data segment for file 1]
-    [data descriptor 1]
-    [local header file 2]
-
-The encryption header and data descriptor records may
-be conditionally present.  The LZMA Compressed Data Segment 
-will consist of an LZMA Properties Header followed by the 
-LZMA Compressed Data as shown:
-
-    [LZMA properties header for file 1]
-    [LZMA compressed data for file 1]
-
-The LZMA Compressed Data will be stored as provided by the 
-LZMA compression library.  Compressed size, uncompressed 
-size and other file characteristics about the file being 
-compressed must be stored in standard ZIP storage format.
-
-The LZMA Properties Header will store specific data required to 
-decompress the LZMA compressed Data.  This data is set by the 
-LZMA compression engine using the function WriteCoderProperties() 
-as documented within the LZMA SDK. 
- 
-Storage fields for the property information within the LZMA 
-Properties Header are as follows:
-
-     LZMA Version Information 2 bytes
-     LZMA Properties Size 2 bytes
-     LZMA Properties Data variable, defined by "LZMA Properties Size"
-
-LZMA Version Information - this field identifies which version of 
-     the LZMA SDK was used to compress a file.  The first byte will 
-     store the major version number of the LZMA SDK and the second 
-     byte will store the minor number.  
-
-LZMA Properties Size - this field defines the size of the remaining 
-     property data.  Typically this size should be determined by the 
-     version of the SDK.  This size field is included as a convenience
-     and to help avoid any ambiguity should it arise in the future due
-     to changes in this compression algorithm. 
-
-LZMA Property Data - this variable sized field records the required 
-     values for the decompressor as defined by the LZMA SDK.  The 
-     data stored in this field should be obtained using the 
-     WriteCoderProperties() in the version of the SDK defined by 
-     the "LZMA Version Information" field.  
-
-The layout of the "LZMA Properties Data" field is a function of the
-LZMA compression algorithm.  It is possible that this layout may be
-changed by the author over time.  The data layout in version 4.32 
-of the LZMA SDK defines a 5 byte array that uses 4 bytes to store 
-the dictionary size in little-endian order. This is preceded by a 
-single packed byte as the first element of the array that contains
-the following fields:
-
-     PosStateBits
-     LiteralPosStateBits
-     LiteralContextBits
-
-Refer to the LZMA documentation for a more detailed explanation of 
-these fields.  
-
-Data compressed with method 14, LZMA, may include an end-of-stream
-(EOS) marker ending the compressed data stream.  This marker is not
-required, but its use is highly recommended to facilitate processing
-and implementers should include the EOS marker whenever possible.
-When the EOS marker is used, general purpose bit 1 must be set.  If
-general purpose bit 1 is not set, the EOS marker is not present.
-
-WavPack - Method 97
--------------------
-
-Information describing the use of compression method 97 is 
-provided by WinZIP International, LLC.  This method relies on the
-open source WavPack audio compression utility developed by David Bryant.  
-Information on WavPack is available at www.wavpack.com.  Please consult 
-with the author of this algorithm for information on terms and 
-restrictions on use.
-
-WavPack data for a file begins immediately after the end of the
-local header data.  This data is the output from WavPack compression
-routines.  Within the ZIP file, the use of WavPack compression is
-indicated by setting the compression method field to a value of 97 
-in both the local header and the central directory header.  The Version 
-needed to extract and version made by fields use the same values as are 
-used for data compressed using the Deflate algorithm.
-
-An implementation note for storing digital sample data when using 
-WavPack compression within ZIP files is that all of the bytes of
-the sample data should be compressed.  This includes any unused
-bits up to the byte boundary.  An example is a 2 byte sample that
-uses only 12 bits for the sample data with 4 unused bits.  If only
-12 bits are passed as the sample size to the WavPack routines, the 4 
-unused bits will be set to 0 on extraction regardless of their original 
-state.  To avoid this, the full 16 bits of the sample data size
-should be provided. 
-
-PPMd - Method 98
-----------------
-
-PPMd is a data compression algorithm developed by Dmitry Shkarin
-which includes a carryless rangecoder developed by Dmitry Subbotin.
-This algorithm is based on predictive phrase matching on multiple
-order contexts.  Information and source code for this algorithm
-can be found on the internet. Consult with the author of this
-algorithm for information on terms or restrictions on use.
-
-Support for PPMd within the ZIP format currently is provided only 
-for version I, revision 1 of the algorithm.  Storage requirements
-for using this algorithm are as follows:
-
-Parameters needed to control the algorithm are stored in the two
-bytes immediately preceding the compressed data.  These bytes are
-used to store the following fields:
-
-Model order - sets the maximum model order, default is 8, possible
-              values are from 2 to 16 inclusive
-
-Sub-allocator size - sets the size of sub-allocator in MB, default is 50,
-            possible values are from 1MB to 256MB inclusive
-
-Model restoration method - sets the method used to restart context
-            model at memory insufficiency, values are:
-
-            0 - restarts model from scratch - default
-            1 - cut off model - decreases performance by as much as 2x
-            2 - freeze context tree - not recommended
-
-An example for packing these fields into the 2 byte storage field is
-illustrated below.  These values are stored in Intel low-byte/high-byte
-order.
-
-wPPMd = (Model order - 1) + 
-        ((Sub-allocator size - 1) << 4) + 
-        (Model restoration method << 12)
-
-
-VII. Traditional PKWARE Encryption
-----------------------------------
-
-The following information discusses the decryption steps
-required to support traditional PKWARE encryption.  This
-form of encryption is considered weak by today's standards
-and its use is recommended only for situations with
-low security needs or for compatibility with older .ZIP 
-applications.
-
-Decryption
-----------
-
-PKWARE is grateful to Mr. Roger Schlafly for his expert contribution 
-towards the development of PKWARE's traditional encryption.
-
-PKZIP encrypts the compressed data stream.  Encrypted files must
-be decrypted before they can be extracted.
-
-Each encrypted file has an extra 12 bytes stored at the start of
-the data area defining the encryption header for that file.  The
-encryption header is originally set to random values, and then
-itself encrypted, using three, 32-bit keys.  The key values are
-initialized using the supplied encryption password.  After each byte
-is encrypted, the keys are then updated using pseudo-random number
-generation techniques in combination with the same CRC-32 algorithm
-used in PKZIP and described elsewhere in this document.
-
-The following is the basic steps required to decrypt a file:
-
-1) Initialize the three 32-bit keys with the password.
-2) Read and decrypt the 12-byte encryption header, further
-   initializing the encryption keys.
-3) Read and decrypt the compressed data stream using the
-   encryption keys.
-
-Step 1 - Initializing the encryption keys
------------------------------------------
-
-Key(0) <- 305419896
-Key(1) <- 591751049
-Key(2) <- 878082192
-
-loop for i <- 0 to length(password)-1
-    update_keys(password(i))
-end loop
-
-Where update_keys() is defined as:
-
-update_keys(char):
-  Key(0) <- crc32(key(0),char)
-  Key(1) <- Key(1) + (Key(0) & 000000ffH)
-  Key(1) <- Key(1) * 134775813 + 1
-  Key(2) <- crc32(key(2),key(1) >> 24)
-end update_keys
-
-Where crc32(old_crc,char) is a routine that given a CRC value and a
-character, returns an updated CRC value after applying the CRC-32
-algorithm described elsewhere in this document.
-
-Step 2 - Decrypting the encryption header
------------------------------------------
-
-The purpose of this step is to further initialize the encryption
-keys, based on random data, to render a plaintext attack on the
-data ineffective.
-
-Read the 12-byte encryption header into Buffer, in locations
-Buffer(0) thru Buffer(11).
-
-loop for i <- 0 to 11
-    C <- buffer(i) ^ decrypt_byte()
-    update_keys(C)
-    buffer(i) <- C
-end loop
-
-Where decrypt_byte() is defined as:
-
-unsigned char decrypt_byte()
-    local unsigned short temp
-    temp <- Key(2) | 2
-    decrypt_byte <- (temp * (temp ^ 1)) >> 8
-end decrypt_byte
-
-After the header is decrypted,  the last 1 or 2 bytes in Buffer
-should be the high-order word/byte of the CRC for the file being
-decrypted, stored in Intel low-byte/high-byte order.  Versions of
-PKZIP prior to 2.0 used a 2 byte CRC check; a 1 byte CRC check is
-used on versions after 2.0.  This can be used to test if the password
-supplied is correct or not.
-
-Step 3 - Decrypting the compressed data stream
-----------------------------------------------
-
-The compressed data stream can be decrypted as follows:
-
-loop until done
-    read a character into C
-    Temp <- C ^ decrypt_byte()
-    update_keys(temp)
-    output Temp
-end loop
-
-
-VIII. Strong Encryption Specification
--------------------------------------
-
-The Strong Encryption technology defined in this specification is 
-covered under a pending patent application. The use or implementation
-in a product of certain technological aspects set forth in the current
-APPNOTE, including those with regard to strong encryption, patching, 
-or extended tape operations requires a license from PKWARE. Portions
-of this Strong Encryption technology are available for use at no charge.
-Contact PKWARE for licensing terms and conditions. Refer to section II
-of this APPNOTE (Contacting PKWARE) for information on how to 
-contact PKWARE. 
-
-Version 5.x of this specification introduced support for strong 
-encryption algorithms.  These algorithms can be used with either 
-a password or an X.509v3 digital certificate to encrypt each file. 
-This format specification supports either password or certificate 
-based encryption to meet the security needs of today, to enable 
-interoperability between users within both PKI and non-PKI 
-environments, and to ensure interoperability between different 
-computing platforms that are running a ZIP program.  
-
-Password based encryption is the most common form of encryption 
-people are familiar with.  However, inherent weaknesses with 
-passwords (e.g. susceptibility to dictionary/brute force attack) 
-as well as password management and support issues make certificate 
-based encryption a more secure and scalable option.  Industry 
-efforts and support are defining and moving towards more advanced 
-security solutions built around X.509v3 digital certificates and 
-Public Key Infrastructures(PKI) because of the greater scalability, 
-administrative options, and more robust security over traditional 
-password based encryption. 
-
-Most standard encryption algorithms are supported with this
-specification. Reference implementations for many of these 
-algorithms are available from either commercial or open source 
-distributors.  Readily available cryptographic toolkits make
-implementation of the encryption features straight-forward.  
-This document is not intended to provide a treatise on data 
-encryption principles or theory.  Its purpose is to document the 
-data structures required for implementing interoperable data 
-encryption within the .ZIP format.  It is strongly recommended that 
-you have a good understanding of data encryption before reading 
-further.
-
-The algorithms introduced in Version 5.0 of this specification 
-include:
-
-    RC2 40 bit, 64 bit, and 128 bit
-    RC4 40 bit, 64 bit, and 128 bit
-    DES
-    3DES 112 bit and 168 bit
-  
-Version 5.1 adds support for the following:
-
-    AES 128 bit, 192 bit, and 256 bit
-
-
-Version 6.1 introduces encryption data changes to support 
-interoperability with Smartcard and USB Token certificate storage 
-methods which do not support the OAEP strengthening standard.
-
-Version 6.2 introduces support for encrypting metadata by compressing 
-and encrypting the central directory data structure to reduce information 
-leakage.   Information leakage can occur in legacy ZIP applications 
-through exposure of information about a file even though that file is 
-stored encrypted.  The information exposed consists of file 
-characteristics stored within the records and fields defined by this 
-specification.  This includes data such as a files name, its original 
-size, timestamp and CRC32 value. 
-
-Version 6.3 introduces support for encrypting data using the Blowfish
-and Twofish algorithms.  These are symmetric block ciphers developed 
-by Bruce Schneier.  Blowfish supports using a variable length key from 
-32 to 448 bits.  Block size is 64 bits.  Implementations should use 16
-rounds and the only mode supported within ZIP files is CBC. Twofish 
-supports key sizes 128, 192 and 256 bits.  Block size is 128 bits.  
-Implementations should use 16 rounds and the only mode supported within
-ZIP files is CBC.  Information and source code for both Blowfish and 
-Twofish algorithms can be found on the internet.  Consult with the author
-of these algorithms for information on terms or restrictions on use.
-
-Central Directory Encryption provides greater protection against 
-information leakage by encrypting the Central Directory structure and 
-by masking key values that are replicated in the unencrypted Local 
-Header.   ZIP compatible programs that cannot interpret an encrypted 
-Central Directory structure cannot rely on the data in the corresponding 
-Local Header for decompression information.  
-
-Extra Field records that may contain information about a file that should 
-not be exposed should not be stored in the Local Header and should only 
-be written to the Central Directory where they can be encrypted.  This 
-design currently does not support streaming.  Information in the End of 
-Central Directory record, the Zip64 End of Central Directory Locator, 
-and the Zip64 End of Central Directory records are not encrypted.  Access 
-to view data on files within a ZIP file with an encrypted Central Directory
-requires the appropriate password or private key for decryption prior to 
-viewing any files, or any information about the files, in the archive.  
-
-Older ZIP compatible programs not familiar with the Central Directory 
-Encryption feature will no longer be able to recognize the Central 
-Directory and may assume the ZIP file is corrupt.  Programs that 
-attempt streaming access using Local Headers will see invalid 
-information for each file.  Central Directory Encryption need not be 
-used for every ZIP file.  Its use is recommended for greater security.  
-ZIP files not using Central Directory Encryption should operate as 
-in the past. 
-
-This strong encryption feature specification is intended to provide for 
-scalable, cross-platform encryption needs ranging from simple password
-encryption to authenticated public/private key encryption.  
-
-Encryption provides data confidentiality and privacy.  It is 
-recommended that you combine X.509 digital signing with encryption 
-to add authentication and non-repudiation.
-
-
-Single Password Symmetric Encryption Method:
--------------------------------------------
-
-The Single Password Symmetric Encryption Method using strong 
-encryption algorithms operates similarly to the traditional 
-PKWARE encryption defined in this format.  Additional data 
-structures are added to support the processing needs of the 
-strong algorithms.
-
-The Strong Encryption data structures are:
-
-1. General Purpose Bits - Bits 0 and 6 of the General Purpose bit 
-flag in both local and central header records.  Both bits set 
-indicates strong encryption.  Bit 13, when set indicates the Central
-Directory is encrypted and that selected fields in the Local Header
-are masked to hide their actual value.
-
-
-2. Extra Field 0x0017 in central header only.
-
-     Fields to consider in this record are:
-
-     Format - the data format identifier for this record.  The only
-     value allowed at this time is the integer value 2.
-
-     AlgId - integer identifier of the encryption algorithm from the
-     following range
-
-         0x6601 - DES
-         0x6602 - RC2 (version needed to extract < 5.2)
-         0x6603 - 3DES 168
-         0x6609 - 3DES 112
-         0x660E - AES 128 
-         0x660F - AES 192 
-         0x6610 - AES 256 
-         0x6702 - RC2 (version needed to extract >= 5.2)
-         0x6720 - Blowfish
-         0x6721 - Twofish
-         0x6801 - RC4
-         0xFFFF - Unknown algorithm
-
-     Bitlen - Explicit bit length of key
-
-         32 - 448 bits
-   
-     Flags - Processing flags needed for decryption
-
-         0x0001 - Password is required to decrypt
-         0x0002 - Certificates only
-         0x0003 - Password or certificate required to decrypt
-
-         Values > 0x0003 reserved for certificate processing
-
-
-3. Decryption header record preceding compressed file data.
-
-         -Decryption Header:
-
-          Value     Size     Description
-          -----     ----     -----------
-          IVSize    2 bytes  Size of initialization vector (IV)
-          IVData    IVSize   Initialization vector for this file
-          Size      4 bytes  Size of remaining decryption header data
-          Format    2 bytes  Format definition for this record
-          AlgID     2 bytes  Encryption algorithm identifier
-          Bitlen    2 bytes  Bit length of encryption key
-          Flags     2 bytes  Processing flags
-          ErdSize   2 bytes  Size of Encrypted Random Data
-          ErdData   ErdSize  Encrypted Random Data
-          Reserved1 4 bytes  Reserved certificate processing data
-          Reserved2 (var)    Reserved for certificate processing data
-          VSize     2 bytes  Size of password validation data
-          VData     VSize-4  Password validation data
-          VCRC32    4 bytes  Standard ZIP CRC32 of password validation data
-
-     IVData - The size of the IV should match the algorithm block size.
-              The IVData can be completely random data.  If the size of
-              the randomly generated data does not match the block size
-              it should be complemented with zero's or truncated as
-              necessary.  If IVSize is 0,then IV = CRC32 + Uncompressed
-              File Size (as a 64 bit little-endian, unsigned integer value).
-
-     Format - the data format identifier for this record.  The only
-     value allowed at this time is the integer value 3.
-
-     AlgId - integer identifier of the encryption algorithm from the
-     following range
-
-         0x6601 - DES
-         0x6602 - RC2 (version needed to extract < 5.2)
-         0x6603 - 3DES 168
-         0x6609 - 3DES 112
-         0x660E - AES 128 
-         0x660F - AES 192 
-         0x6610 - AES 256 
-         0x6702 - RC2 (version needed to extract >= 5.2)
-         0x6720 - Blowfish
-         0x6721 - Twofish
-         0x6801 - RC4
-         0xFFFF - Unknown algorithm
-
-     Bitlen - Explicit bit length of key
-
-         32 - 448 bits
-   
-     Flags - Processing flags needed for decryption
-
-         0x0001 - Password is required to decrypt
-         0x0002 - Certificates only
-         0x0003 - Password or certificate required to decrypt
-
-         Values > 0x0003 reserved for certificate processing
-
-     ErdData - Encrypted random data is used to store random data that
-               is used to generate a file session key for encrypting 
-               each file.  SHA1 is used to calculate hash data used to 
-               derive keys.  File session keys are derived from a master 
-               session key generated from the user-supplied password.
-               If the Flags field in the decryption header contains 
-               the value 0x4000, then the ErdData field must be 
-               decrypted using 3DES. If the value 0x4000 is not set,
-               then the ErdData field must be decrypted using AlgId.
-
-
-     Reserved1 - Reserved for certificate processing, if value is
-               zero, then Reserved2 data is absent.  See the explanation
-               under the Certificate Processing Method for details on
-               this data structure.
-
-     Reserved2 - If present, the size of the Reserved2 data structure 
-               is located by skipping the first 4 bytes of this field 
-               and using the next 2 bytes as the remaining size.  See
-               the explanation under the Certificate Processing Method
-               for details on this data structure.
-
-     VSize - This size value will always include the 4 bytes of the
-             VCRC32 data and will be greater than 4 bytes.
-
-     VData - Random data for password validation.  This data is VSize
-             in length and VSize must be a multiple of the encryption
-             block size.  VCRC32 is a checksum value of VData.  
-             VData and VCRC32 are stored encrypted and start the
-             stream of encrypted data for a file.
-
-
-4. Useful Tips
-
-Strong Encryption is always applied to a file after compression. The
-block oriented algorithms all operate in Cypher Block Chaining (CBC) 
-mode.  The block size used for AES encryption is 16.  All other block
-algorithms use a block size of 8.  Two ID's are defined for RC2 to 
-account for a discrepancy found in the implementation of the RC2
-algorithm in the cryptographic library on Windows XP SP1 and all 
-earlier versions of Windows.  It is recommended that zero length files
-not be encrypted, however programs should be prepared to extract them
-if they are found within a ZIP file.
-
-A pseudo-code representation of the encryption process is as follows:
-
-Password = GetUserPassword()
-MasterSessionKey = DeriveKey(SHA1(Password)) 
-RD = CryptographicStrengthRandomData() 
-For Each File
-   IV = CryptographicStrengthRandomData() 
-   VData = CryptographicStrengthRandomData()
-   VCRC32 = CRC32(VData)
-   FileSessionKey = DeriveKey(SHA1(IV + RD) 
-   ErdData = Encrypt(RD,MasterSessionKey,IV) 
-   Encrypt(VData + VCRC32 + FileData, FileSessionKey,IV)
-Done
-
-The function names and parameter requirements will depend on
-the choice of the cryptographic toolkit selected.  Almost any
-toolkit supporting the reference implementations for each
-algorithm can be used.  The RSA BSAFE(r), OpenSSL, and Microsoft
-CryptoAPI libraries are all known to work well.  
-
-
-Single Password - Central Directory Encryption:
------------------------------------------------
-
-Central Directory Encryption is achieved within the .ZIP format by 
-encrypting the Central Directory structure.  This encapsulates the metadata 
-most often used for processing .ZIP files.  Additional metadata is stored for 
-redundancy in the Local Header for each file.  The process of concealing 
-metadata by encrypting the Central Directory does not protect the data within 
-the Local Header.  To avoid information leakage from the exposed metadata 
-in the Local Header, the fields containing information about a file are masked.  
-
-Local Header:
-
-Masking replaces the true content of the fields for a file in the Local 
-Header with false information.  When masked, the Local Header is not 
-suitable for streaming access and the options for data recovery of damaged
-archives is reduced.  Extra Data fields that may contain confidential
-data should not be stored within the Local Header.  The value set into
-the Version needed to extract field should be the correct value needed to
-extract the file without regard to Central Directory Encryption. The fields 
-within the Local Header targeted for masking when the Central Directory is 
-encrypted are:
-
-        Field Name                     Mask Value
-        ------------------             ---------------------------
-        compression method              0
-        last mod file time              0
-        last mod file date              0
-        crc-32                          0
-        compressed size                 0
-        uncompressed size               0
-        file name (variable size)       Base 16 value from the
-                                        range 1 - 0xFFFFFFFFFFFFFFFF
-                                        represented as a string whose
-                                        size will be set into the
-                                        file name length field
-
-The Base 16 value assigned as a masked file name is simply a sequentially
-incremented value for each file starting with 1 for the first file.  
-Modifications to a ZIP file may cause different values to be stored for 
-each file.  For compatibility, the file name field in the Local Header 
-should never be left blank.  As of Version 6.2 of this specification, 
-the Compression Method and Compressed Size fields are not yet masked.
-Fields having a value of 0xFFFF or 0xFFFFFFFF for the ZIP64 format
-should not be masked.  
-
-Encrypting the Central Directory:
-
-Encryption of the Central Directory does not include encryption of the 
-Central Directory Signature data, the Zip64 End of Central Directory
-record, the Zip64 End of Central Directory Locator, or the End
-of Central Directory record.  The ZIP file comment data is never
-encrypted.
-
-Before encrypting the Central Directory, it may optionally be compressed.
-Compression is not required, but for storage efficiency it is assumed
-this structure will be compressed before encrypting.  Similarly, this 
-specification supports compressing the Central Directory without
-requiring that it also be encrypted.  Early implementations of this
-feature will assume the encryption method applied to files matches the 
-encryption applied to the Central Directory.
-
-Encryption of the Central Directory is done in a manner similar to
-that of file encryption.  The encrypted data is preceded by a 
-decryption header.  The decryption header is known as the Archive
-Decryption Header.  The fields of this record are identical to
-the decryption header preceding each encrypted file.  The location
-of the Archive Decryption Header is determined by the value in the
-Start of the Central Directory field in the Zip64 End of Central
-Directory record.  When the Central Directory is encrypted, the
-Zip64 End of Central Directory record will always be present.
-
-The layout of the Zip64 End of Central Directory record for all
-versions starting with 6.2 of this specification will follow the
-Version 2 format.  The Version 2 format is as follows:
-
-The leading fixed size fields within the Version 1 format for this
-record remain unchanged.  The record signature for both Version 1 
-and Version 2 will be 0x06064b50.  Immediately following the last
-byte of the field known as the Offset of Start of Central 
-Directory With Respect to the Starting Disk Number will begin the 
-new fields defining Version 2 of this record.  
-
-New fields for Version 2:
-
-Note: all fields stored in Intel low-byte/high-byte order.
-
-          Value                 Size       Description
-          -----                 ----       -----------
-          Compression Method    2 bytes    Method used to compress the
-                                           Central Directory
-          Compressed Size       8 bytes    Size of the compressed data
-          Original   Size       8 bytes    Original uncompressed size
-          AlgId                 2 bytes    Encryption algorithm ID
-          BitLen                2 bytes    Encryption key length
-          Flags                 2 bytes    Encryption flags
-          HashID                2 bytes    Hash algorithm identifier
-          Hash Length           2 bytes    Length of hash data
-          Hash Data             (variable) Hash data
-
-The Compression Method accepts the same range of values as the 
-corresponding field in the Central Header.
-
-The Compressed Size and Original Size values will not include the
-data of the Central Directory Signature which is compressed or
-encrypted.
-
-The AlgId, BitLen, and Flags fields accept the same range of values
-the corresponding fields within the 0x0017 record. 
-
-Hash ID identifies the algorithm used to hash the Central Directory 
-data.  This data does not have to be hashed, in which case the
-values for both the HashID and Hash Length will be 0.  Possible 
-values for HashID are:
-
-      Value         Algorithm
-     ------         ---------
-     0x0000          none
-     0x0001          CRC32
-     0x8003          MD5
-     0x8004          SHA1
-     0x8007          RIPEMD160
-     0x800C          SHA256
-     0x800D          SHA384
-     0x800E          SHA512
-
-When the Central Directory data is signed, the same hash algorithm
-used to hash the Central Directory for signing should be used.
-This is recommended for processing efficiency, however, it is 
-permissible for any of the above algorithms to be used independent 
-of the signing process.
-
-The Hash Data will contain the hash data for the Central Directory.
-The length of this data will vary depending on the algorithm used.
-
-The Version Needed to Extract should be set to 62.
-
-The value for the Total Number of Entries on the Current Disk will
-be 0.  These records will no longer support random access when
-encrypting the Central Directory.
-
-When the Central Directory is compressed and/or encrypted, the
-End of Central Directory record will store the value 0xFFFFFFFF
-as the value for the Total Number of Entries in the Central
-Directory.  The value stored in the Total Number of Entries in
-the Central Directory on this Disk field will be 0.  The actual
-values will be stored in the equivalent fields of the Zip64
-End of Central Directory record.
-
-Decrypting and decompressing the Central Directory is accomplished
-in the same manner as decrypting and decompressing a file.
-
-Certificate Processing Method:
------------------------------
-
-The Certificate Processing Method of for ZIP file encryption 
-defines the following additional data fields:
-
-1. Certificate Flag Values
-
-Additional processing flags that can be present in the Flags field of both 
-the 0x0017 field of the central directory Extra Field and the Decryption 
-header record preceding compressed file data are:
-
-         0x0007 - reserved for future use
-         0x000F - reserved for future use
-         0x0100 - Indicates non-OAEP key wrapping was used.  If this
-                  this field is set, the version needed to extract must
-                  be at least 61.  This means OAEP key wrapping is not
-                  used when generating a Master Session Key using
-                  ErdData.
-         0x4000 - ErdData must be decrypted using 3DES-168, otherwise use the
-                  same algorithm used for encrypting the file contents.
-         0x8000 - reserved for future use
-
-
-2. CertData - Extra Field 0x0017 record certificate data structure
-
-The data structure used to store certificate data within the section
-of the Extra Field defined by the CertData field of the 0x0017
-record are as shown:
-
-          Value     Size     Description
-          -----     ----     -----------
-          RCount    4 bytes  Number of recipients.  
-          HashAlg   2 bytes  Hash algorithm identifier
-          HSize     2 bytes  Hash size
-          SRList    (var)    Simple list of recipients hashed public keys
-
-          
-     RCount    This defines the number intended recipients whose 
-               public keys were used for encryption.  This identifies
-               the number of elements in the SRList.
-
-     HashAlg   This defines the hash algorithm used to calculate
-               the public key hash of each public key used
-               for encryption. This field currently supports
-               only the following value for SHA-1
-
-               0x8004 - SHA1
-
-     HSize     This defines the size of a hashed public key.
-
-     SRList    This is a variable length list of the hashed 
-               public keys for each intended recipient.  Each 
-               element in this list is HSize.  The total size of 
-               SRList is determined using RCount * HSize.
-
-
-3. Reserved1 - Certificate Decryption Header Reserved1 Data:
-
-          Value     Size     Description
-          -----     ----     -----------
-          RCount    4 bytes  Number of recipients.  
-          
-     RCount    This defines the number intended recipients whose 
-               public keys were used for encryption.  This defines
-               the number of elements in the REList field defined below.
-
-
-4. Reserved2 - Certificate Decryption Header Reserved2 Data Structures:
-
-
-          Value     Size     Description
-          -----     ----     -----------
-          HashAlg   2 bytes  Hash algorithm identifier
-          HSize     2 bytes  Hash size
-          REList    (var)    List of recipient data elements
-
-
-     HashAlg   This defines the hash algorithm used to calculate
-               the public key hash of each public key used
-               for encryption. This field currently supports
-               only the following value for SHA-1
-
-               0x8004 - SHA1
-
-     HSize     This defines the size of a hashed public key
-               defined in REHData.
-
-     REList    This is a variable length of list of recipient data.  
-               Each element in this list consists of a Recipient
-               Element data structure as follows:
-
-
-    Recipient Element (REList) Data Structure:
-
-          Value     Size     Description
-          -----     ----     -----------
-          RESize    2 bytes  Size of REHData + REKData
-          REHData   HSize    Hash of recipients public key
-          REKData   (var)    Simple key blob
-
-
-     RESize    This defines the size of an individual REList 
-               element.  This value is the combined size of the
-               REHData field + REKData field.  REHData is defined by
-               HSize.  REKData is variable and can be calculated
-               for each REList element using RESize and HSize.
-
-     REHData   Hashed public key for this recipient.
-
-     REKData   Simple Key Blob.  The format of this data structure
-               is identical to that defined in the Microsoft
-               CryptoAPI and generated using the CryptExportKey()
-               function.  The version of the Simple Key Blob
-               supported at this time is 0x02 as defined by
-               Microsoft.
-
-Certificate Processing - Central Directory Encryption:
-------------------------------------------------------
-
-Central Directory Encryption using Digital Certificates will 
-operate in a manner similar to that of Single Password Central
-Directory Encryption.  This record will only be present when there 
-is data to place into it.  Currently, data is placed into this
-record when digital certificates are used for either encrypting 
-or signing the files within a ZIP file.  When only password 
-encryption is used with no certificate encryption or digital 
-signing, this record is not currently needed. When present, this 
-record will appear before the start of the actual Central Directory 
-data structure and will be located immediately after the Archive 
-Decryption Header if the Central Directory is encrypted.
-
-The Archive Extra Data record will be used to store the following
-information.  Additional data may be added in future versions.
-
-Extra Data Fields:
-
-0x0014 - PKCS#7 Store for X.509 Certificates
-0x0016 - X.509 Certificate ID and Signature for central directory
-0x0019 - PKCS#7 Encryption Recipient Certificate List
-
-The 0x0014 and 0x0016 Extra Data records that otherwise would be 
-located in the first record of the Central Directory for digital 
-certificate processing. When encrypting or compressing the Central 
-Directory, the 0x0014 and 0x0016 records must be located in the 
-Archive Extra Data record and they should not remain in the first 
-Central Directory record.  The Archive Extra Data record will also 
-be used to store the 0x0019 data. 
-
-When present, the size of the Archive Extra Data record will be
-included in the size of the Central Directory.  The data of the
-Archive Extra Data record will also be compressed and encrypted
-along with the Central Directory data structure.
-
-Certificate Processing Differences:
-
-The Certificate Processing Method of encryption differs from the
-Single Password Symmetric Encryption Method as follows.  Instead
-of using a user-defined password to generate a master session key,
-cryptographically random data is used.  The key material is then
-wrapped using standard key-wrapping techniques.  This key material
-is wrapped using the public key of each recipient that will need
-to decrypt the file using their corresponding private key.
-
-This specification currently assumes digital certificates will follow
-the X.509 V3 format for 1024 bit and higher RSA format digital
-certificates.  Implementation of this Certificate Processing Method
-requires supporting logic for key access and management.  This logic
-is outside the scope of this specification.
-
-OAEP Processing with Certificate-based Encryption:
-
-OAEP stands for Optimal Asymmetric Encryption Padding.  It is a
-strengthening technique used for small encoded items such as decryption
-keys.  This is commonly applied in cryptographic key-wrapping techniques
-and is supported by PKCS #1.  Versions 5.0 and 6.0 of this specification 
-were designed to support OAEP key-wrapping for certificate-based 
-decryption keys for additional security.  
-
-Support for private keys stored on Smartcards or Tokens introduced
-a conflict with this OAEP logic.  Most card and token products do 
-not support the additional strengthening applied to OAEP key-wrapped 
-data.  In order to resolve this conflict, versions 6.1 and above of this 
-specification will no longer support OAEP when encrypting using 
-digital certificates. 
-
-Versions of PKZIP available during initial development of the 
-certificate processing method set a value of 61 into the 
-version needed to extract field for a file.  This indicates that 
-non-OAEP key wrapping is used.  This affects certificate encryption 
-only, and password encryption functions should not be affected by 
-this value.  This means values of 61 may be found on files encrypted
-with certificates only, or on files encrypted with both password
-encryption and certificate encryption.  Files encrypted with both
-methods can safely be decrypted using the password methods documented.
-
-IX. Change Process
-------------------
-
-In order for the .ZIP file format to remain a viable definition, this
-specification should be considered as open for periodic review and
-revision.  Although this format was originally designed with a 
-certain level of extensibility, not all changes in technology
-(present or future) were or will be necessarily considered in its
-design.  If your application requires new definitions to the
-extensible sections in this format, or if you would like to 
-submit new data structures, please forward your request to
-zipformat@pkware.com.  All submissions will be reviewed by the
-ZIP File Specification Committee for possible inclusion into
-future versions of this specification.  Periodic revisions
-to this specification will be published to ensure interoperability. 
-We encourage comments and feedback that may help improve clarity 
-or content.
-
-X. Incorporating PKWARE Proprietary Technology into Your Product
-----------------------------------------------------------------
-
-PKWARE is committed to the interoperability and advancement of the
-.ZIP format.  PKWARE offers a free license for certain technological
-aspects described above under certain restrictions and conditions.
-However, the use or implementation in a product of certain technological
-aspects set forth in the current APPNOTE, including those with regard to
-strong encryption, patching, or extended tape operations requires a 
-license from PKWARE.  Please contact PKWARE with regard to acquiring
-a license.
-
-XI. Acknowledgements
----------------------
-
-In addition to the above mentioned contributors to PKZIP and PKUNZIP,
-I would like to extend special thanks to Robert Mahoney for suggesting
-the extension .ZIP for this software.
-
-XII. References
----------------
-
-    Fiala, Edward R., and Greene, Daniel H., "Data compression with
-       finite windows",  Communications of the ACM, Volume 32, Number 4,
-       April 1989, pages 490-505.
-
-    Held, Gilbert, "Data Compression, Techniques and Applications,
-       Hardware and Software Considerations", John Wiley & Sons, 1987.
-
-    Huffman, D.A., "A method for the construction of minimum-redundancy
-       codes", Proceedings of the IRE, Volume 40, Number 9, September 1952,
-       pages 1098-1101.
-
-    Nelson, Mark, "LZW Data Compression", Dr. Dobbs Journal, Volume 14,
-       Number 10, October 1989, pages 29-37.
-
-    Nelson, Mark, "The Data Compression Book",  M&T Books, 1991.
-
-    Storer, James A., "Data Compression, Methods and Theory",
-       Computer Science Press, 1988
-
-    Welch, Terry, "A Technique for High-Performance Data Compression",
-       IEEE Computer, Volume 17, Number 6, June 1984, pages 8-19.
-
-    Ziv, J. and Lempel, A., "A universal algorithm for sequential data
-       compression", Communications of the ACM, Volume 30, Number 6,
-       June 1987, pages 520-540.
-
-    Ziv, J. and Lempel, A., "Compression of individual sequences via
-       variable-rate coding", IEEE Transactions on Information Theory,
-       Volume 24, Number 5, September 1978, pages 530-536.
-
-
-APPENDIX A - AS/400 Extra Field (0x0065) Attribute Definitions
---------------------------------------------------------------
-
-Field Definition Structure:
-
-   a. field length including length             2 bytes
-   b. field code                                2 bytes
-   c. data                                      x bytes
-
-Field Code  Description
-   4001     Source type i.e. CLP etc
-   4002     The text description of the library 
-   4003     The text description of the file
-   4004     The text description of the member
-   4005     x'F0' or 0 is PF-DTA,  x'F1' or 1 is PF_SRC
-   4007     Database Type Code                  1 byte
-   4008     Database file and fields definition
-   4009     GZIP file type                      2 bytes
-   400B     IFS code page                       2 bytes
-   400C     IFS Creation Time                   4 bytes
-   400D     IFS Access Time                     4 bytes
-   400E     IFS Modification time               4 bytes
-   005C     Length of the records in the file   2 bytes
-   0068     GZIP two words                      8 bytes
-
-APPENDIX B - z/OS Extra Field (0x0065) Attribute Definitions
-------------------------------------------------------------
-
-Field Definition Structure:
-
-   a. field length including length             2 bytes
-   b. field code                                2 bytes
-   c. data                                      x bytes
-
-Field Code  Description
-   0001     File Type                           2 bytes 
-   0002     NonVSAM Record Format               1 byte
-   0003     Reserved		
-   0004     NonVSAM Block Size                  2 bytes Big Endian
-   0005     Primary Space Allocation            3 bytes Big Endian
-   0006     Secondary Space Allocation          3 bytes Big Endian
-   0007     Space Allocation Type1 byte flag		
-   0008     Modification Date                   Retired with PKZIP 5.0 +
-   0009     Expiration Date                     Retired with PKZIP 5.0 +
-   000A     PDS Directory Block Allocation      3 bytes Big Endian binary value
-   000B     NonVSAM Volume List                 variable		
-   000C     UNIT Reference                      Retired with PKZIP 5.0 +
-   000D     DF/SMS Management Class             8 bytes EBCDIC Text Value
-   000E     DF/SMS Storage Class                8 bytes EBCDIC Text Value
-   000F     DF/SMS Data Class                   8 bytes EBCDIC Text Value
-   0010     PDS/PDSE Member Info.               30 bytes	
-   0011     VSAM sub-filetype                   2 bytes		
-   0012     VSAM LRECL                          13 bytes EBCDIC "(num_avg num_max)"
-   0013     VSAM Cluster Name                   Retired with PKZIP 5.0 +
-   0014     VSAM KSDS Key Information           13 bytes EBCDIC "(num_length num_position)"
-   0015     VSAM Average LRECL                  5 bytes EBCDIC num_value padded with blanks
-   0016     VSAM Maximum LRECL                  5 bytes EBCDIC num_value padded with blanks
-   0017     VSAM KSDS Key Length                5 bytes EBCDIC num_value padded with blanks
-   0018     VSAM KSDS Key Position              5 bytes EBCDIC num_value padded with blanks
-   0019     VSAM Data Name                      1-44 bytes EBCDIC text string
-   001A     VSAM KSDS Index Name                1-44 bytes EBCDIC text string
-   001B     VSAM Catalog Name                   1-44 bytes EBCDIC text string
-   001C     VSAM Data Space Type                9 bytes EBCDIC text string
-   001D     VSAM Data Space Primary             9 bytes EBCDIC num_value left-justified
-   001E     VSAM Data Space Secondary           9 bytes EBCDIC num_value left-justified
-   001F     VSAM Data Volume List               variable EBCDIC text list of 6-character Volume IDs
-   0020     VSAM Data Buffer Space              8 bytes EBCDIC num_value left-justified
-   0021     VSAM Data CISIZE                    5 bytes EBCDIC num_value left-justified
-   0022     VSAM Erase Flag                     1 byte flag		
-   0023     VSAM Free CI %                      3 bytes EBCDIC num_value left-justified
-   0024     VSAM Free CA %                      3 bytes EBCDIC num_value left-justified
-   0025     VSAM Index Volume List              variable EBCDIC text list of 6-character Volume IDs
-   0026     VSAM Ordered Flag                   1 byte flag		
-   0027     VSAM REUSE Flag                     1 byte flag		
-   0028     VSAM SPANNED Flag                   1 byte flag		
-   0029     VSAM Recovery Flag                  1 byte flag		
-   002A     VSAM  WRITECHK  Flag                1 byte flag		
-   002B     VSAM Cluster/Data SHROPTS           3 bytes EBCDIC "n,y"	
-   002C     VSAM Index SHROPTS                  3 bytes EBCDIC "n,y"	
-   002D     VSAM Index Space Type               9 bytes EBCDIC text string
-   002E     VSAM Index Space Primary            9 bytes EBCDIC num_value left-justified
-   002F     VSAM Index Space Secondary          9 bytes EBCDIC num_value left-justified
-   0030     VSAM Index CISIZE                   5 bytes EBCDIC num_value left-justified
-   0031     VSAM Index IMBED                    1 byte flag		
-   0032     VSAM Index Ordered Flag             1 byte flag		
-   0033     VSAM REPLICATE Flag                 1 byte flag		
-   0034     VSAM Index REUSE Flag               1 byte flag		
-   0035     VSAM Index WRITECHK Flag            1 byte flag Retired with PKZIP 5.0 +
-   0036     VSAM Owner                          8 bytes EBCDIC text string
-   0037     VSAM Index Owner                    8 bytes EBCDIC text string
-   0038     Reserved
-   0039     Reserved
-   003A     Reserved
-   003B     Reserved
-   003C     Reserved
-   003D     Reserved
-   003E     Reserved
-   003F     Reserved
-   0040     Reserved
-   0041     Reserved
-   0042     Reserved
-   0043     Reserved
-   0044     Reserved
-   0045     Reserved
-   0046     Reserved
-   0047     Reserved
-   0048     Reserved
-   0049     Reserved
-   004A     Reserved
-   004B     Reserved
-   004C     Reserved
-   004D     Reserved
-   004E     Reserved
-   004F     Reserved
-   0050     Reserved
-   0051     Reserved
-   0052     Reserved
-   0053     Reserved
-   0054     Reserved
-   0055     Reserved
-   0056     Reserved
-   0057     Reserved
-   0058     PDS/PDSE Member TTR Info.           6 bytes  Big Endian
-   0059     PDS 1st LMOD Text TTR               3 bytes  Big Endian
-   005A     PDS LMOD EP Rec #                   4 bytes  Big Endian
-   005B     Reserved
-   005C     Max Length of records               2 bytes  Big Endian
-   005D     PDSE Flag                           1 byte flag
-   005E     Reserved
-   005F     Reserved
-   0060     Reserved
-   0061     Reserved
-   0062     Reserved
-   0063     Reserved
-   0064     Reserved
-   0065     Last Date Referenced                4 bytes  Packed Hex "yyyymmdd"
-   0066     Date Created                        4 bytes  Packed Hex "yyyymmdd"
-   0068     GZIP two words                      8 bytes
-   0071     Extended NOTE Location              12 bytes Big Endian
-   0072     Archive device UNIT                 6 bytes  EBCDIC
-   0073     Archive 1st Volume                  6 bytes  EBCDIC
-   0074     Archive 1st VOL File Seq#           2 bytes  Binary
-
-APPENDIX C - Zip64 Extensible Data Sector Mappings (EFS)
---------------------------------------------------------
-
-          -Z390   Extra Field:
-
-          The following is the general layout of the attributes for the 
-          ZIP 64 "extra" block for extended tape operations. Portions of 
-          this extended tape processing technology is covered under a 
-          pending patent application. The use or implementation in a 
-          product of certain technological aspects set forth in the 
-          current APPNOTE, including those with regard to strong encryption,
-          patching or extended tape operations, requires a license from
-          PKWARE.  Please contact PKWARE with regard to acquiring a license. 
- 
-
-          Note: some fields stored in Big Endian format.  All text is 
-	  in EBCDIC format unless otherwise specified.
-
-          Value       Size          Description
-          -----       ----          -----------
-  (Z390)  0x0065      2 bytes       Tag for this "extra" block type
-          Size        4 bytes       Size for the following data block
-          Tag         4 bytes       EBCDIC "Z390"
-          Length71    2 bytes       Big Endian
-          Subcode71   2 bytes       Enote type code
-          FMEPos      1 byte
-          Length72    2 bytes       Big Endian
-          Subcode72   2 bytes       Unit type code
-          Unit        1 byte        Unit
-          Length73    2 bytes       Big Endian
-          Subcode73   2 bytes       Volume1 type code
-          FirstVol    1 byte        Volume
-          Length74    2 bytes       Big Endian
-          Subcode74   2 bytes       FirstVol file sequence
-          FileSeq     2 bytes       Sequence 
-
-APPENDIX D - Language Encoding (EFS)
-------------------------------------
-
-The ZIP format has historically supported only the original IBM PC character 
-encoding set, commonly referred to as IBM Code Page 437.  This limits storing 
-file name characters to only those within the original MS-DOS range of values 
-and does not properly support file names in other character encodings, or 
-languages. To address this limitation, this specification will support the 
-following change. 
-
-If general purpose bit 11 is unset, the file name and comment should conform 
-to the original ZIP character encoding.  If general purpose bit 11 is set, the 
-filename and comment must support The Unicode Standard, Version 4.1.0 or 
-greater using the character encoding form defined by the UTF-8 storage 
-specification.  The Unicode Standard is published by the The Unicode
-Consortium (www.unicode.org).  UTF-8 encoded data stored within ZIP files 
-is expected to not include a byte order mark (BOM). 
-
-Applications may choose to supplement this file name storage through the use 
-of the 0x0008 Extra Field.  Storage for this optional field is currently 
-undefined, however it will be used to allow storing extended information 
-on source or target encoding that may further assist applications with file 
-name, or file content encoding tasks.  Please contact PKWARE with any
-requirements on how this field should be used.
-
-The 0x0008 Extra Field storage may be used with either setting for general 
-purpose bit 11.  Examples of the intended usage for this field is to store 
-whether "modified-UTF-8" (JAVA) is used, or UTF-8-MAC.  Similarly, other 
-commonly used character encoding (code page) designations can be indicated 
-through this field.  Formalized values for use of the 0x0008 record remain 
-undefined at this time.  The definition for the layout of the 0x0008 field
-will be published when available.  Use of the 0x0008 Extra Field provides
-for storing data within a ZIP file in an encoding other than IBM Code
-Page 437 or UTF-8.
-
-General purpose bit 11 will not imply any encoding of file content or
-password.  Values defining character encoding for file content or 
-password must be stored within the 0x0008 Extended Language Encoding 
-Extra Field.
-
-Ed Gordon of the Info-ZIP group has defined a pair of "extra field" records 
-that can be used to store UTF-8 file name and file comment fields.  These
-records can be used for cases when the general purpose bit 11 method
-for storing UTF-8 data in the standard file name and comment fields is
-not desirable.  A common case for this alternate method is if backward
-compatibility with older programs is required.
-
-Definitions for the record structure of these fields are included above 
-in the section on 3rd party mappings for "extra field" records.  These
-records are identified by Header ID's 0x6375 (Info-ZIP Unicode Comment 
-Extra Field) and 0x7075 (Info-ZIP Unicode Path Extra Field).
-
-The choice of which storage method to use when writing a ZIP file is left
-to the implementation.  Developers should expect that a ZIP file may 
-contain either method and should provide support for reading data in 
-either format. Use of general purpose bit 11 reduces storage requirements 
-for file name data by not requiring additional "extra field" data for
-each file, but can result in older ZIP programs not being able to extract 
-files.  Use of the 0x6375 and 0x7075 records will result in a ZIP file 
-that should always be readable by older ZIP programs, but requires more 
-storage per file to write file name and/or file comment fields.
-
- 
-
-
-
diff --git a/apps/files_odfviewer/src/webodf/webodf/CMakeLists.txt b/apps/files_odfviewer/src/webodf/webodf/CMakeLists.txt
deleted file mode 100644
index 247ff5c625..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/CMakeLists.txt
+++ /dev/null
@@ -1,201 +0,0 @@
-string(COMPARE EQUAL "${CMAKE_SOURCE_DIR}" "${CMAKE_CURRENT_SOURCE_DIR}"
-    WRONGCMAKEDIR)
-if(WRONGCMAKEDIR)
-  message(FATAL_ERROR "You should point CMake to the parent directory.")
-endif(WRONGCMAKEDIR)
-
-set(TESTJSFILES tests/core/ZipTests.js
-    tests/core/Base64Tests.js
-    tests/core/CursorTests.js
-    tests/core/PointWalkerTests.js
-    tests/core/RuntimeTests.js
-    tests/gui/CaretTests.js
-    tests/gui/SelectionMoverTests.js
-    tests/gui/XMLEditTests.js
-    tests/xmldom/OperationalTransformDOMTests.js
-    tests/xmldom/XPathTests.js
-    tests/tests.js
-)
-
-add_custom_target(jslintcheck ALL
-    COMMAND ${NODE} lib/runtime.js tools/runjslint.js
-        ${LIBJSFILES} ${TESTJSFILES}
-    DEPENDS NodeJS
-    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-    SOURCES ${LIBJSFILES} ${TESTJSFILES}
-)
-
-if (Java_JAVA_EXECUTABLE)
-  # nonStandardJsDocs is not used because we use @licstart @licend and @source
-  set(SHARED_CLOSURE_ARGS --warning_level VERBOSE --jscomp_error accessControls --jscomp_error ambiguousFunctionDecl --jscomp_error checkRegExp --jscomp_error checkTypes --jscomp_error checkVars --jscomp_error constantProperty --jscomp_error deprecated --jscomp_error externsValidation --jscomp_error fileoverviewTags --jscomp_error globalThis --jscomp_error invalidCasts --jscomp_error missingProperties --jscomp_error strictModuleDepCheck --jscomp_error typeInvalidation --jscomp_error undefinedVars --jscomp_error unknownDefines --jscomp_error uselessCode --jscomp_error visibility --jscomp_off nonStandardJsDocs --summary_detail_level 3)
-
-  foreach(JSFILE ${LIBJSFILES})
-    set(LIB_CLOSURE_ARGS ${LIB_CLOSURE_ARGS}
-        --js ${CMAKE_CURRENT_SOURCE_DIR}/${JSFILE})
-  endforeach(JSFILE ${LIBJSFILES})
-
-  foreach(JSFILE ${TESTJSFILES})
-    set(TEST_CLOSURE_ARGS ${TEST_CLOSURE_ARGS}
-        --js ${CMAKE_CURRENT_SOURCE_DIR}/${JSFILE})
-  endforeach(JSFILE ${TESTJSFILES})
-
-  add_custom_command(
-      OUTPUT simplecompiled.js
-      COMMAND ${Java_JAVA_EXECUTABLE}
-      ARGS -jar ${CLOSURE_JAR}
-         ${SHARED_CLOSURE_ARGS} ${LIB_CLOSURE_ARGS} ${TEST_CLOSURE_ARGS}
-         --compilation_level WHITESPACE_ONLY
-         --formatting PRETTY_PRINT
-         --js_output_file simplecompiled.js
-      DEPENDS ClosureCompiler ${LIBJSFILES} ${TESTJSFILES}
-  )
-
-  add_custom_command(
-      OUTPUT compiled.js
-      COMMAND ${Java_JAVA_EXECUTABLE}
-      ARGS -jar ${CLOSURE_JAR}
-         --define IS_COMPILED_CODE=true
-         ${SHARED_CLOSURE_ARGS} ${LIB_CLOSURE_ARGS} ${TEST_CLOSURE_ARGS}
-         --compilation_level ADVANCED_OPTIMIZATIONS
-         --formatting PRETTY_PRINT
-         --externs ${CMAKE_CURRENT_SOURCE_DIR}/tools/externs.js
-         --js_output_file compiled.js
-      DEPENDS ClosureCompiler ${LIBJSFILES} ${TESTJSFILES} tools/externs.js
-  )
-
-  add_custom_command(
-      OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/webodf.js
-      COMMAND ${Java_JAVA_EXECUTABLE}
-      ARGS -jar ${CLOSURE_JAR}
-         --define IS_COMPILED_CODE=true
-         ${SHARED_CLOSURE_ARGS} ${LIB_CLOSURE_ARGS}
-         --compilation_level SIMPLE_OPTIMIZATIONS
-         --formatting PRINT_INPUT_DELIMITER
-         --externs ${CMAKE_CURRENT_SOURCE_DIR}/tools/externs.js
-         --js_output_file ${CMAKE_CURRENT_BINARY_DIR}/webodf.js
-      DEPENDS ClosureCompiler ${LIBJSFILES} tools/externs.js
-  )
-  add_custom_target(webodf.js
-      SOURCES ${CMAKE_CURRENT_BINARY_DIR}/webodf.js
-  )
-
-  # too hardcore for now...
-  # add_custom_command(
-  #     OUTPUT webodf-experimental.js
-  #     COMMAND ${Java_JAVA_EXECUTABLE}
-  #     ARGS -jar ${CLOSURE_JAR}
-  #        --define IS_COMPILED_CODE=true
-  #        ${SHARED_CLOSURE_ARGS} ${LIB_CLOSURE_ARGS}
-  #        --js ${CMAKE_CURRENT_SOURCE_DIR}/lib/export.js
-  #        --compilation_level ADVANCED_OPTIMIZATIONS
-  #        --formatting PRINT_INPUT_DELIMITER
-  #        --externs ${CMAKE_CURRENT_SOURCE_DIR}/tools/externs.js
-  #        --js_output_file webodf-experimental.js
-  #     DEPENDS ClosureCompiler ${LIBJSFILES} lib/export.js tools/externs.js
-  # )
-
-  add_custom_command(
-      OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/webodf-debug.js
-      COMMAND ${Java_JAVA_EXECUTABLE}
-      ARGS -jar ${CLOSURE_JAR}
-         --define IS_COMPILED_CODE=true
-         ${SHARED_CLOSURE_ARGS} ${LIB_CLOSURE_ARGS}
-         --compilation_level WHITESPACE_ONLY
-         --formatting PRETTY_PRINT
-         --externs ${CMAKE_CURRENT_SOURCE_DIR}/tools/externs.js
-         --js_output_file ${CMAKE_CURRENT_BINARY_DIR}/webodf-debug.js
-      DEPENDS ClosureCompiler ${LIBJSFILES} tools/externs.js
-  )
-  add_custom_target(webodf-debug.js
-     SOURCES ${CMAKE_CURRENT_BINARY_DIR}/webodf-debug.js
-  )
-
-  add_custom_command(
-      OUTPUT odfedit.js
-      COMMAND ${Java_JAVA_EXECUTABLE}
-      ARGS -jar ${CLOSURE_JAR}
-         --define IS_COMPILED_CODE=true
-         ${SHARED_CLOSURE_ARGS} ${LIB_CLOSURE_ARGS}
-         --js ${CMAKE_CURRENT_SOURCE_DIR}/odfedit.js
-         --compilation_level ADVANCED_OPTIMIZATIONS
-         --formatting PRETTY_PRINT
-         --externs ${CMAKE_CURRENT_SOURCE_DIR}/tools/externs.js
-         --externs ${CMAKE_CURRENT_SOURCE_DIR}/tools/extjsexterns.js
-         --js_output_file odfedit.js
-      DEPENDS ClosureCompiler ${LIBJSFILES} ${APPJSFILES} tools/externs.js tools/extjsexterns.js odfedit.js
-  )
-
-  add_custom_command(
-    OUTPUT gui.js
-    COMMAND ${Java_JAVA_EXECUTABLE}
-    ARGS -jar ${CLOSURE_JAR}
-         --define IS_COMPILED_CODE=true
-         ${SHARED_CLOSURE_ARGS} ${LIB_CLOSURE_ARGS}
-         --js ${CMAKE_CURRENT_SOURCE_DIR}/filelister.js
-         --js ${CMAKE_CURRENT_SOURCE_DIR}/gui.js
-         --compilation_level ADVANCED_OPTIMIZATIONS
-         --formatting PRETTY_PRINT
-         --externs ${CMAKE_CURRENT_SOURCE_DIR}/tools/externs.js
-         --externs ${CMAKE_CURRENT_SOURCE_DIR}/tools/extjsexterns.js
-         --js_output_file gui.js
-    DEPENDS ClosureCompiler ${LIBJSFILES} ${APPJSFILES} tools/externs.js tools/extjsexterns.js filelister.js gui.js
-  )
-
-  add_custom_target(syntaxcheck ALL
-      DEPENDS simplecompiled.js webodf.js webodf-debug.js compiled.js
-  )
-
-  add_custom_target(rhinotest
-      COMMAND ${Java_JAVA_EXECUTABLE} -jar ${RHINO}
-          -debug lib/runtime.js tests/tests.js
-      DEPENDS Rhino
-      WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-      SOURCES ${LIBJSFILES}
-  )
-  add_custom_target(simplerhinotest
-      COMMAND ${Java_JAVA_EXECUTABLE} -jar ${RHINO}
-          ${CMAKE_CURRENT_BINARY_DIR}/simplecompiled.js
-      DEPENDS Rhino simplecompiled.js
-      WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/tests
-  )
-  add_custom_command(
-      OUTPUT docs/index.html
-       COMMAND ${Java_JAVA_EXECUTABLE}
-        ARGS -jar ${JSDOCDIR}/jsrun.jar
-            ${JSDOCDIR}/app/run.js -d=${CMAKE_CURRENT_BINARY_DIR}/docs
-                -t=${JSDOCDIR}/templates/jsdoc ${LIBJSFILES}
-        WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-        DEPENDS ${LIBJSFILES} JsDoc
-  )
-  add_custom_target(doc DEPENDS docs/index.html)
-  add_custom_target(simplenodetest ALL
-      COMMAND ${NODE} ${CMAKE_CURRENT_BINARY_DIR}/simplecompiled.js
-      DEPENDS NodeJS simplecompiled.js
-      WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/tests
-  )
-
-endif (Java_JAVA_EXECUTABLE)
-
-add_custom_target(nodetest ALL
-    COMMAND ${NODE} lib/runtime.js tests/tests.js
-    DEPENDS NodeJS
-    WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-    SOURCES ${LIBJSFILES}
-)
-if (QT4_FOUND)
-  add_custom_target(qtjsruntimetest ALL
-      COMMAND ${CMAKE_BINARY_DIR}/programs/qtjsruntime/qtjsruntime ../lib/runtime.js tests.js
-      DEPENDS qtjsruntime jslintcheck
-      WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/tests
-      SOURCES ${LIBJSFILES}
-  )
-endif (QT4_FOUND)
-add_custom_command(
-    OUTPUT instrumented/index.html
-    COMMAND ${JSCOVERAGE}
-    ARGS --exclude=extjs --exclude=extjs/.git ${CMAKE_CURRENT_SOURCE_DIR}
-         ${CMAKE_CURRENT_BINARY_DIR}/instrumented
-    DEPENDS ${LIBJSFILES} jslintcheck JSCoverage
-)
-add_custom_target(instrumented ALL DEPENDS instrumented/index.html)
-# vim:expandtab
diff --git a/apps/files_odfviewer/src/webodf/webodf/README b/apps/files_odfviewer/src/webodf/webodf/README
deleted file mode 100644
index a4dde2fee7..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/README
+++ /dev/null
@@ -1,43 +0,0 @@
-This directory contains the javacript code to WebODF as well as applications that use it. The applications are browser applications, commandline applications and unit tests.
-
-lib/
-lib/core/    Parts of WebODF that also work on JavaScript runtimes without a
-             document window.
-lib/gui/     Parts of WebODF that require a domtree
-
-The library should be able to run in a number of different runtimes. Currently these are:
- - a webbrowser
- - node.js
- - rhino
-A common API is implemented for these three environments in the files lib/browser.js, lib/node.js and lib/rhino.js respectively.
-
-
-
-Requirements on the code
-
-There are several requirements that need to met before code can be considered for inclusion in WebODF. Most requirements can be checked automatically, a few have to be checked by hand. A contribution must:
- - be contributed under the appropriate license
- - be javascript
- - not give any warnings in a JSLint check
- - be unchanged when passed through jsbeautifier
- - compile with the closure compiler
- - must pass all the unit tests that were passed before
-   - as separate js files in the currenlty used Node.JS implementation
-   - as a single compiled file in the currenlty used Node.JS implementation
-   - as separate js files in the currenlty used Rhino implementation
-   - as a single compiled file Rhino implementation
- - must have equal or greater code coverage for the each of the test runs
-
-The automatic checks can be performed by running a dedicated command that reports in an xml file. This report is compared to the previous report.
-
-runtests.js is the command that creates a report.
-
-
-
-
-
-
-
-
-
-
diff --git a/apps/files_odfviewer/src/webodf/webodf/compare.html b/apps/files_odfviewer/src/webodf/webodf/compare.html
deleted file mode 100644
index 0cf1cc80af..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/compare.html
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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"></meta>
-  <style type="text/css" media="screen">
-    body, html, div {
-      padding: 0px;
-      margin: 0px;
-      border: 0px;
-    }
-    body, html {
-      height: 100%;
-      text-align: center;
-    }
-    html > body {
-      background: black;
-    }
-  </style>
-  <link rel="stylesheet" type="text/css" href="webodf.css"/>
-  <script src="lib/runtime.js" type="text/javascript" charset="utf-8"></script>
-  <script src="compare.js" type="text/javascript" charset="utf-8"></script>
-  <script type="text/javascript" charset="utf-8">
-window.setTimeout(function () {
-    init(window, document);
-}, 0);
-  </script>
-  <title></title>
-</head>
- 
-<body>
-  <div id="odf"/>
-</body>
-</html>
diff --git a/apps/files_odfviewer/src/webodf/webodf/compare.js b/apps/files_odfviewer/src/webodf/webodf/compare.js
deleted file mode 100644
index 16bf5e333f..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/compare.js
+++ /dev/null
@@ -1,45 +0,0 @@
-/*global runtime: true, odf: true*/
-/*jslint white: false*/
-function getURIParameters(window) {
-    "use strict";
-    var params = {},
-        query = window.location.search.substring(1),
-        parms = query.split('&'),
-        i,
-        pos,
-        key,
-        val;
-    for (i = 0; i < parms.length; i += 1) {
-        pos = parms[i].indexOf('=');
-        if (pos > 0) {
-            key = parms[i].substring(0, pos);
-            val = parms[i].substring(pos + 1);
-            params[key] = val;
-        }
-    }
-    return params;
-}
-function init(window, document) {
-    "use strict";
-    runtime.loadClass("odf.OdfCanvas");
-    var params = getURIParameters(window),
-        odfelement = document.getElementById("odf"),
-        odfcanvas = new odf.OdfCanvas(odfelement);
-    if (!params.odf) {
-        return;
-    }
-    odfcanvas.addListener("statereadychange", function () {
-        var s = odfelement.style,
-            bgzoom = "100% auto",
-            pos;
-        s.backgroundImage = "url(" + params.bg + ")";
-        s.backgroundRepeat = "no-repeat";
-        if (params.bgzoom) {
-            bgzoom = params.bgzoom + "% auto";
-        }
-        s.backgroundSize = bgzoom;
-        pos = (params.x || "0") + "px " + (params.y || "0") + "px";
-        s.backgroundPosition = pos;
-    });
-    odfcanvas.load(params.odf);
-}
diff --git a/apps/files_odfviewer/src/webodf/webodf/deflateinmozilla.txt b/apps/files_odfviewer/src/webodf/webodf/deflateinmozilla.txt
deleted file mode 100644
index 866b29de77..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/deflateinmozilla.txt
+++ /dev/null
@@ -1,69 +0,0 @@
-Found this in a mozilla forum.
-http://forums.mozillazine.org/viewtopic.php?f=27&t=313496&start=0#
-
-Another implementation under MIT license can be found here:
-http://www.codeproject.com/KB/scripting/Javascript_binaryenc.aspx
-
- //listener for the converted data
-      var listener =
-      {
-         onDataAvailable : function(request, context, inputStream, offset, count)
-         {
-            //write the data
-                 var output = Components.classes["@mozilla.org/network/file-output-stream;1"].createInstance(Components.interfaces.nsIFileOutputStream);
-
-                                //outputFile is a file which will contain the gunzipped data
-            if(!outputFile.exists())
-                     output.init(outputFile, 0x02 | 0x08, 0644, 0);
-
-            else
-                     output.init(outputFile, 0x02 | 0x10, 0644, 0);
-
-                  var scriptable = Components.classes["@mozilla.org/scriptableinputstream;1"].createInstance(Components.interfaces.nsIScriptableInputStream);
-               scriptable.init(inputStream);
-
-            var data = scriptable.read(inputStream.available());
-            output.write(data, data.length);
-
-            output.close();
-         },
-
-         onStartRequest : function(request, context)   
-         {
-         },
-
-         onStopRequest : function(request, context)
-         {
-         }
-      };
-
-      //fake uri needed to create a channel
-      var uri = Components.classes["@mozilla.org/network/simple-uri;1"].createInstance(Components.interfaces.nsIURI);
-      uri.scheme = "http://gunzip";
-
-      //fake channel needed to create a request
-      var chan = Components.classes["@mozilla.org/network/input-stream-channel;1"].createInstance(Components.interfaces.nsIInputStreamChannel);
-      chan.setURI(uri);
-      chan.contentLength = decrypted.length;
-      chan.contentType = "gzip";
-      chan.contentStream = null;
-
-      var request = chan.QueryInterface(Components.interfaces.nsIRequest);
-
-            // Attempt to gunzip
-      var conv = Components.classes["@mozilla.org/streamconv;1?from=gzip&to=uncompressed"].createInstance(Components.interfaces.nsIStreamConverter);
-
-      conv.asyncConvertData("gzip", "uncompressed", listener, null);
-
-      conv.onStartRequest(request, null);
-
-                //input is an inputstream which contains the gzipped data
-      var avail = input.available();
-
-      //really do the conversion
-      conv.onDataAvailable(request, null, input, 0, avail);
-
-      var status = {};
-      conv.onStopRequest(request, null, status);
-
-      input.close();
diff --git a/apps/files_odfviewer/src/webodf/webodf/embedodf.html b/apps/files_odfviewer/src/webodf/webodf/embedodf.html
deleted file mode 100644
index 96bb25cc2b..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/embedodf.html
+++ /dev/null
@@ -1,2 +0,0 @@
-<html><link rel='stylesheet' href='webodf.css'/><script src='webodf.js'/><div id='odf'>
-<!-- This html is used by applications that embed webodf such as nativeQtClient. You can replace webodf.js with lib/runtime.js when debugging. -->
diff --git a/apps/files_odfviewer/src/webodf/webodf/filelist.js b/apps/files_odfviewer/src/webodf/webodf/filelist.js
deleted file mode 100644
index 8f7b876b46..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/filelist.js
+++ /dev/null
@@ -1,66 +0,0 @@
-/**
- * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
- * @licstart
- * The JavaScript code in this page is free software: you can redistribute it
- * and/or modify it under the terms of the GNU Affero General Public License
- * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.  The code is distributed
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
- *
- * As additional permission under GNU AGPL version 3 section 7, you
- * may distribute non-source (e.g., minimized or compacted) forms of
- * that code without the copy of the GNU GPL normally required by
- * section 4, provided you include this license notice and a URL
- * through which recipients can access the Corresponding Source.
- *
- * As a special exception to the AGPL, any HTML file which merely makes function
- * calls to this code, and for that purpose includes it by reference shall be
- * deemed a separate work for copyright law purposes. In addition, the copyright
- * holders of this code give you permission to combine this code with free
- * software libraries that are released under the GNU LGPL. You may copy and
- * distribute such a system following the terms of the GNU AGPL for this code
- * and the LGPL for the libraries. If you modify this code, you may extend this
- * exception to your version of the code, but you are not obligated to do so.
- * If you do not wish to do so, delete this exception statement from your
- * version.
- *
- * This license applies to this entire compilation.
- * @licend
- * @source: http://www.webodf.org/
- * @source: http://gitorious.org/odfkit/webodf/
- */
-var fileList = [
-    'kofficetests/odf/134010.ods',
-    '../../../odfkit/odfkit/odfkit/LayoutTests/fast/odf/script-tests/hello-odf-2.odt',
-    '../../../odfkit/odfkit/odfkit/LayoutTests/fast/odf/script-tests/hello-odf-1.odt',
-    '../../../odfkit/odfkit/odfkit/LayoutTests/platform/mac/fast/loader/resources/mimeTypeExamples/example-ods.ods',
-    '../../../odfkit/odfkit/lpod-python/test/samples/note.odt',
-    '../../../odfkit/odfkit/lpod-python/test/samples/list.odt',
-    '../../../odfkit/odfkit/lpod-python/test/samples/frame_image.odp',
-    '../../../odfkit/odfkit/lpod-python/test/samples/bookmark.odt',
-    '../../../odfkit/odfkit/lpod-python/test/samples/span_a.odt',
-    '../../../odfkit/odfkit/lpod-python/test/samples/toc.odt',
-    '../../../odfkit/odfkit/lpod-python/test/samples/meta.odt',
-    '../../../odfkit/odfkit/lpod-python/test/samples/base_text.odt',
-    '../../../odfkit/odfkit/lpod-python/test/samples/span_style.odt',
-    '../../../odfkit/odfkit/lpod-python/test/samples/variable.odt',
-    '../../../odfkit/odfkit/lpod-python/test/samples/example.odp',
-    '../../../odfkit/odfkit/lpod-python/test/samples/base_shapes.odg',
-    '../../../odfkit/odfkit/lpod-python/test/samples/simple_table.ods',
-    '../../../odfkit/odfkit/lpod-python/test/samples/example.odt',
-    '../../../odfkit/odfkit/lpod-python/test/samples/styled_table.ods',
-    '../../../odfkit/odfkit/lpod-python/test/samples/tracked_changes.odt',
-    '../../../odfkit/odfkit/lpod-python/templates/lpod_styles.odt',
-    '../../../ictu/ictu/xsl-odt/z2.odt',
-    '../../../ictu/ictu/xsl-odt/gerechtelijkeaankondigingen/input/stcrt-2010-8050.odt',
-    '../../../ictu/ictu/odfquality/stcrt-2010-6505/stcrt-2010-6505.odt',
-    '../../../ictu/ictu/odfquality/kst-31460-12/kst-31460-12.odt',
-    '../../../ictu/ictu/odfquality/ah-tk-20092010-2140/ah-tk-20092010-2140.odt',
-    '../../../ictu/ictu/odfquality/kv-tk-2010Z06142/kv-tk-2010Z06142.odt',
-    '../../../ictu/ictu/odfquality/stb-2010-161/stb-2010-161.odt',
-    'kofficetests/odf/charts/Areacharts.odp',
-    'kofficetests/odf/xenophon.odt',
-    'kofficetests/odf/134010.ods',
-    'kofficetests/interoperability/kword/oowriter/oow_pic_flip_vertical.odt'
-];
diff --git a/apps/files_odfviewer/src/webodf/webodf/filelister.html b/apps/files_odfviewer/src/webodf/webodf/filelister.html
deleted file mode 100644
index 0caf7b599d..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/filelister.html
+++ /dev/null
@@ -1,42 +0,0 @@
-<!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>
-  <title>FileLister demo</title>
-  <script src="filelister.js" type="text/javascript" charset="utf-8"></script>
-  <script src="base64.js" type="text/javascript" charset="utf-8"></script>
-  <script src="bytearray.js" type="text/javascript" charset="utf-8"></script>
-  <script src="rawinflate.js" type="text/javascript" charset="utf-8"></script>
-  <script src="zip.js" type="text/javascript" charset="utf-8"></script>
-  <script type="text/javascript" charset="utf-8">
-function listFilesCallback(directories, files) {
-  for (var i in files) {
-    var e = document.createElement('p');
-    var t = document.createTextNode(files[i]);
-    var img = document.createElement('img');
-    img.src = getThumbUrl(files[i]);
-    e.appendChild(img);
-    e.appendChild(t);
-    document.body.appendChild(e);
-  }
-}
-function getThumbUrl(url) {
-  var data;
-  try {
-    var zip = new Zip(url);
-    data = zip.load('Thumbnails/thumbnail.png');
-  } catch (e) {
-    return e;
-  }
-  if (data) {
-      return 'data:;base64,' + Base64.toBase64(data);
-  }
-  return null;
-}
-function init() {
-  listFiles('kofficetests/', /\.od[tps]$/i, listFilesCallback);
-}
-  </script>
-</head>
-<body onload="init()">
-</body>
-</html>
diff --git a/apps/files_odfviewer/src/webodf/webodf/filelister.js b/apps/files_odfviewer/src/webodf/webodf/filelister.js
deleted file mode 100644
index 08f6cd3cb0..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/filelister.js
+++ /dev/null
@@ -1,200 +0,0 @@
-/**
- * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
- * @licstart
- * The JavaScript code in this page is free software: you can redistribute it
- * and/or modify it under the terms of the GNU Affero General Public License
- * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.  The code is distributed
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
- *
- * As additional permission under GNU AGPL version 3 section 7, you
- * may distribute non-source (e.g., minimized or compacted) forms of
- * that code without the copy of the GNU GPL normally required by
- * section 4, provided you include this license notice and a URL
- * through which recipients can access the Corresponding Source.
- *
- * As a special exception to the AGPL, any HTML file which merely makes function
- * calls to this code, and for that purpose includes it by reference shall be
- * deemed a separate work for copyright law purposes. In addition, the copyright
- * holders of this code give you permission to combine this code with free
- * software libraries that are released under the GNU LGPL. You may copy and
- * distribute such a system following the terms of the GNU AGPL for this code
- * and the LGPL for the libraries. If you modify this code, you may extend this
- * exception to your version of the code, but you are not obligated to do so.
- * If you do not wish to do so, delete this exception statement from your
- * version.
- *
- * This license applies to this entire compilation.
- * @licend
- * @source: http://www.webodf.org/
- * @source: http://gitorious.org/odfkit/webodf/
- */
-/*global XMLHttpRequest*/
-/*jslint regexp: true*/
-/** asynchroneous function that lists all files **/
-function listFiles(startdir, filepattern, fileCallback, doneCallback) {
-    "use strict";
-
-    var todoList = [],
-        doneList = [],
-        dirpattern = /\/$/,
-        hasWEBDAV = false;
-
-    function getHref(responseElement) {
-        var n = responseElement.firstChild;
-        while (n && !(n.namespaceURI === 'DAV:' && n.localName === 'href')) {
-            n = n.nextSibling;
-        }
-        return n && n.firstChild && n.firstChild.nodeValue;
-    }
-
-    function isDirectory(responseElement) {
-        var n = responseElement.firstChild;
-        while (n &&
-                !(n.namespaceURI === 'DAV:' && n.localName === 'propstat')) {
-            n = n.nextSibling;
-        }
-        n = n && n.firstChild;
-        while (n &&
-                !(n.namespaceURI === 'DAV:' && n.localName === 'prop')) {
-            n = n.nextSibling;
-        }
-        n = n && n.firstChild;
-        while (n && !(n.namespaceURI === 'DAV:' &&
-                      n.localName === 'resourcetype')) {
-            n = n.nextSibling;
-        }
-        n = n && n.firstChild;
-        while (n &&
-                !(n.namespaceURI === 'DAV:' && n.localName === 'collection')) {
-            n = n.nextSibling;
-        }
-        return n;
-    }
-
-    function processWebDavResponse(xml) {
-        if (!xml) {
-            throw new Error('No proper XML response.');
-        }
-        
-        var refs = xml.getElementsByTagNameNS('DAV:', 'response'),
-            directories = [],
-            files = [],
-            i,
-            d,
-            href;
-        if (refs.length === 0) {
-            throw new Error('No proper XML response.');
-        }
-        for (i = 0; i < refs.length; i += 1) {
-            href = getHref(refs[i]);
-            if (isDirectory(refs[i])) {
-                directories.push(href);
-            } else if (filepattern.test(href)) {
-                files.push(href);
-            }
-        }
-        for (i = 0; i < directories.length; i += 1) {
-            d = directories[i];
-            if (doneList.indexOf(d) === -1 && todoList.indexOf(d) === -1) {
-                todoList.push(d);
-            }
-        }
-        fileCallback(directories, files);
-    }
-
-    function processIndexHtmlResponse(base, text) {
-        // use regex because index.html is usually not valid xml
-        var re = /href="([^\/\?"][^"]*)"/ig,
-            matches,
-            files = [],
-            directories = [],
-            name,
-            d,
-            i;
-        while ((matches = re.exec(text)) !== null) {
-            name = matches[1];
-            if (dirpattern.test(name)) {
-                directories.push(base + name);
-            } else if (filepattern.test(name)) {
-                files.push(base + name);
-            }
-        }
-        for (i = 0; i < directories.length; i += 1) {
-            d = directories[i];
-            if (doneList.indexOf(d) === -1 && todoList.indexOf(d) === -1) {
-                todoList.push(d);
-            }
-        }
-        fileCallback(directories, files);
-    }
-
-    function getNextFileListWithIndexHtml() {
-        var url = todoList.shift(),
-            req;
-        while (url && typeof url !== 'string') {
-            url = todoList.shift();
-        }
-        if (!url) {
-            if (doneCallback) {
-                doneCallback();
-            }
-            return;
-        }
-        req = new XMLHttpRequest();
-        req.open('GET', url, true);
-        req.onreadystatechange = function (evt) {
-            if (req.readyState !== 4) {
-                return;
-            }
-            if (req.status >= 200 && req.status < 300) {
-                processIndexHtmlResponse(url, req.responseText);
-            }
-            getNextFileListWithIndexHtml();
-        };
-        req.send(null);
-
-        doneList.push(url);
-    }
-
-    function getNextFileListWithWebDav() {
-        var url = todoList.shift(),
-            req;
-        if (!url) {
-            if (doneCallback) {
-                doneCallback();
-            }
-            return;
-        }
-
-        req = new XMLHttpRequest();
-        req.open('PROPFIND', url, true);
-        req.onreadystatechange = function (evt) {
-            if (req.readyState !== 4) {
-                return;
-            }
-            if (req.status >= 200 && req.status < 300) {
-                try {
-                    processWebDavResponse(req.responseXML);
-                    hasWEBDAV = true;
-                } catch (e) {
-                }
-            }
-            if (hasWEBDAV) {
-                getNextFileListWithWebDav();
-            } else {
-                todoList.push(url);
-                doneList = [];
-                getNextFileListWithIndexHtml();
-            }
-        };
-        req.setRequestHeader('Depth', '1');
-        req.send(null);
-
-        doneList.push(url);
-    }
-
-    todoList.push(startdir);
-    getNextFileListWithWebDav();
-}
diff --git a/apps/files_odfviewer/src/webodf/webodf/flashput/Makefile b/apps/files_odfviewer/src/webodf/webodf/flashput/Makefile
deleted file mode 100644
index 291eef04b6..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/flashput/Makefile
+++ /dev/null
@@ -1,2 +0,0 @@
-all:
-	/tmp/flex/bin/mxmlc PUT.as
diff --git a/apps/files_odfviewer/src/webodf/webodf/flashput/PUT.as b/apps/files_odfviewer/src/webodf/webodf/flashput/PUT.as
deleted file mode 100644
index 451d8a0fd0..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/flashput/PUT.as
+++ /dev/null
@@ -1,18 +0,0 @@
-package {
-	import flash.display.Sprite;
-	import flash.display.LoaderInfo;
-	import flash.external.ExternalInterface;
-	public class PUT extends Sprite {
-		public function PUT() {
-			ExternalInterface.addCallback("put", this.put);
-			var callback:String = LoaderInfo(root.loaderInfo).parameters["readyCallback"];
-			ExternalInterface.call(callback);
-		}
-		public function put(host:String, port:uint, path:String,
-				data:String, callbackFunctionName:String,
-                                callbackId:String):void {
-			new Request(host, port, path, data,
-					callbackFunctionName, callbackId);
-		}
-	}
-}
diff --git a/apps/files_odfviewer/src/webodf/webodf/flashput/PUT.swf b/apps/files_odfviewer/src/webodf/webodf/flashput/PUT.swf
deleted file mode 100644
index 466d0a1316e109f0617b7f723b0929cbd03439ce..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 18031
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
Cf~D;M

diff --git a/apps/files_odfviewer/src/webodf/webodf/flashput/Request.as b/apps/files_odfviewer/src/webodf/webodf/flashput/Request.as
deleted file mode 100644
index 3217dde25d..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/flashput/Request.as
+++ /dev/null
@@ -1,83 +0,0 @@
-package {
-	import flash.events.*;
-	import flash.external.ExternalInterface;
-	import flash.net.Socket;
-	import flash.utils.ByteArray;
-	import mx.utils.Base64Decoder;
-	import mx.utils.Base64Encoder;
-	internal class Request {
-		private var id:String;
-		private var header:String;
-		private var data:ByteArray;
-		private var callbackName:String;
-		private var socket:Socket;
-		public function Request(host:String, port:uint, path:String,
-                                data:String, callbackName:String,
-                                callbackId:String) {
-			var atob:Base64Decoder = new Base64Decoder();
-			atob.decode(data);
-			this.data = atob.toByteArray();
-			this.header = 
-				"PUT " + path + " HTTP/1.1\r\n" +
-				"Host: " + host + "\r\n" +
-				"Content-Length: " + this.data.length + "\r\n" +
-				"\r\n";
-			this.callbackName = callbackName;
-			this.id = callbackId;
-			this.socket = new Socket();
-			this.socket.timeout = 1000;
-			this.socket.addEventListener(Event.CONNECT,
-					connectHandler);
-			this.socket.addEventListener(IOErrorEvent.IO_ERROR,
-					ioErrorHandler);
-			this.socket.addEventListener(
-					SecurityErrorEvent.SECURITY_ERROR,
-					securityErrorHandler);
-			this.socket.addEventListener(Event.CLOSE, closeHandler);
-			this.socket.addEventListener(ProgressEvent.SOCKET_DATA,
-					dataHandler); 
-			this.socket.connect(host, port);
-		}
-		private function connectHandler(connect:Event):void {
-			this.socket.writeBytes(toByteArray(this.header));
-			this.socket.writeBytes(this.data);
-			this.socket.flush();
-			this.header = null;
-			this.data.length = 0;
-		}
-		private function ioErrorHandler(ioError:IOErrorEvent):void {
-			ExternalInterface.call(this.callbackName, this.id,
-					null);
-			this.socket.close();
-		}
-		private function securityErrorHandler(
-				securityError:SecurityErrorEvent):void {
-			ExternalInterface.call(this.callbackName, this.id,
-					null);
-			this.socket.close();
-		}
-		private function closeHandler(close:Event):void {
-			ExternalInterface.call(this.callbackName, this.id,
-					null);
-		}
-		private function dataHandler(data:ProgressEvent):void {
-			// assume it went well, TODO: parse reply, handle error
-			this.socket.readBytes(this.data);
-			var btoa:Base64Encoder = new Base64Encoder();
-			btoa.encodeBytes(this.data);
-			ExternalInterface.call(this.callbackName, this.id,
-					btoa.toString());
-			this.data.length = 0;
-			this.socket.close();
-		}
-		public function toByteArray(str:String):ByteArray {
-			var length:uint = str.length;
-			var i:uint = 0;
-			var data:ByteArray = new ByteArray();
-			for (i; i < length; i++) {
-				data.writeByte(str.charCodeAt(i) & 0xff);
-			}
-			return data;
-		}
-	}
-}
diff --git a/apps/files_odfviewer/src/webodf/webodf/flashput/test.html b/apps/files_odfviewer/src/webodf/webodf/flashput/test.html
deleted file mode 100644
index 349f7680ba..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/flashput/test.html
+++ /dev/null
@@ -1,96 +0,0 @@
-<html>
-	<head>
-		<title>hi</title>
-	</head>
-	<body onload="init()">
-		<script type="text/javascript">//<![CDATA[
-/**
- * @constuctor
- */
-function FlashPut(host, port, domelement) {
-    if (port <= 0) {
-        return;
-    }
-    var flashput = this,
-        ready = false,
-        id = "FlashPut" + String(Math.random()).substring(2),
-        jobnumber = 0,
-        queue = [],
-        runningCalls = {},
-        doc = domelement.ownerDocument,
-        flash = doc.createElement("object"),
-        param = doc.createElement("param");
-    flash.setAttribute("data", "PUT.swf");
-    flash.setAttribute("type", "application/x-shockwave-flash");
-    flash.setAttribute("width", "1");
-    flash.setAttribute("height", "1");
-    param.setAttribute("name", "allowNetworking");
-    param.setAttribute("value", "all");
-    flash.appendChild(param);
-    param = doc.createElement("param");
-    param.setAttribute("name", "allowScriptAccess");
-    param.setAttribute("value", "always");
-    flash.appendChild(param);
-    param.setAttribute("name", "FlashVars");
-    param.setAttribute("value", "readyCallback=" + id);
-    flash.appendChild(param);
-    domelement.appendChild(flash);
-
-    // function to be called when flash movie is ready
-    window[id] = function () {
-        window[id] = undefined;
-        ready = true;
-        var i, a;
-        for (i = 0; i < queue.length; i += 1) {
-            a = queue[i];
-            put(a[0], a[1], a[2]);
-        }
-        queue = undefined;
-    };
-    function put(path, data, callback) {
-        var id = Math.random();
-        runningCalls[id] = callback;
-        flash.put(host, port, path, data, "FlashPut.putCallback", id);
-    }
-    this.put = function (path, data, callback) {
-        if (!ready) {
-            queue.push([path, data, callback]);
-        } else {
-            put(path, data, callback);
-        }
-    }
-    FlashPut.putCallback = function (id, result) {
-        if (id in runningCalls) {
-            runningCalls[id](result);
-            runningCalls.remove(id);
-        } else {
-            console.log("running put call " + id + " was not found.");
-        }
-    }
-};
-
-function testFlash() {
-    var i, l = 1000000, str = "", now = new Date();
-    for (i = 0; i < l; i += 1) {
-        str += String.fromCharCode(i & 0xff);
-    }
-    now = new Date();
-    str = window.btoa(str);
-    flashput.put("/zz", str, function (result) {
-        alert("'" + result + "' " + now.toString() + " " + (new Date()).toString());
-	var z = "hmm";
-        try {
-            z = window.atob(result);
-        } catch (e) {
-        }
-        alert(z + " " + now.toString() + " " + (new Date()).toString());
-    });
-}
-var flashput;
-function init() {
-    flashput = new FlashPut("", 8123, document.body);
-    testFlash();
-}
-//]]>		</script>
-	</body>
-</html>
diff --git a/apps/files_odfviewer/src/webodf/webodf/gui.js b/apps/files_odfviewer/src/webodf/webodf/gui.js
deleted file mode 100644
index 5fce22f51e..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/gui.js
+++ /dev/null
@@ -1,263 +0,0 @@
-/**
- * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
- * @licstart
- * The JavaScript code in this page is free software: you can redistribute it
- * and/or modify it under the terms of the GNU Affero General Public License
- * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.  The code is distributed
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
- *
- * As additional permission under GNU AGPL version 3 section 7, you
- * may distribute non-source (e.g., minimized or compacted) forms of
- * that code without the copy of the GNU GPL normally required by
- * section 4, provided you include this license notice and a URL
- * through which recipients can access the Corresponding Source.
- *
- * As a special exception to the AGPL, any HTML file which merely makes function
- * calls to this code, and for that purpose includes it by reference shall be
- * deemed a separate work for copyright law purposes. In addition, the copyright
- * holders of this code give you permission to combine this code with free
- * software libraries that are released under the GNU LGPL. You may copy and
- * distribute such a system following the terms of the GNU AGPL for this code
- * and the LGPL for the libraries. If you modify this code, you may extend this
- * exception to your version of the code, but you are not obligated to do so.
- * If you do not wish to do so, delete this exception statement from your
- * version.
- *
- * This license applies to this entire compilation.
- * @licend
- * @source: http://www.webodf.org/
- * @source: http://gitorious.org/odfkit/webodf/
- */
-/*global Ext:true, runtime:true, core:true, listFiles:true*/
-runtime.loadClass("core.Zip");
-runtime.loadClass("core.Base64");
-
-/**
- * @param {Ext.data.Model} node
- * @return {undefined}
- */
-function addThumbnail(node) {
-    "use strict";
-    var url = node.get('id'), zip;
-/*
-    zip = new core.Zip(url, function (err, zipobject) {
-        zip = zipobject;
-        if (err) {
-            return;
-        }
-        zip.load('Thumbnails/thumbnail.png', function (err, data) {
-            if (data === null) {
-                return;
-            }
-            var url = 'data:;base64,' +
-                    (new core.Base64()).convertUTF8ArrayToBase64(data),
-                el, spans, i, s;
-            el = node.getUI().getEl();
-            if (el) {
-                spans = el.getElementsByTagName('span');
-                for (i = 0; i < spans.length; i += 1) {
-                    s = spans.item(i);
-                    if (s.getAttribute('qtip')) {
-                        s.setAttribute('qtip', node.attributes.qtip);
-                    }
-                }
-            } else {
-                node.attributes.qtip += '<br/><img src="' + url + '"/>';
-            }
-        });
-    });
-*/
-}
-
-/**
- * @param {!string} url
- * @param {!Ext.tab.Panel} panel
- * @param {!string} title
- * @return {undefined}
- */
-function loadODF(url, panel, title) {
-    "use strict";
-    var tab = panel.items.findBy(function (item) {
-            return item.url === url;
-        }),
-        newTab;
-    if (tab) {
-        panel.setActiveTab(tab);
-        return;
-    }
-    newTab = Ext.create('Ext.container.Container', {
-        title: title,
-        tabTip: url,
-        url: url,
-        closable: true,
-        autoEl: {
-            tag: 'iframe',
-            name: url,
-            src: 'odf.html#' + url,
-            frameBorder: 0,
-            style: {
-                border: '0 none'
-            }
-        },
-        region: 'center'
-    });
-    panel.add(newTab);
-    panel.setActiveTab(newTab);
-}
-
-Ext.onReady(function () {
-    "use strict";
-    var editButton, tabpanel, slider, tree, viewport;
-
-    Ext.QuickTips.init();
-
-    /**
-     * @param {!Ext.Button} button
-     * @param {!boolean} pressed
-     * @return {undefined}
-     */
-    function editToggle(button, pressed) {
-        var tab = tabpanel.getActiveTab(), o, odfcanvas = "odfcanvas";
-        if (!tab) {
-            return;
-        }
-        tab.el.dom.contentDocument[odfcanvas].setEditable(pressed);
-    }
-
-    /**
-     * @param {!Object} slider
-     * @param {!number} zoomlevel
-     * @param {!Object} thumb
-     * @return {undefined}
-     */
-    function setZoom(slider, zoomlevel, thumb) {
-        var tab = tabpanel.getActiveTab(),
-            body;
-        if (!tab) {
-            return;
-        }
-        body = tab.el.dom.contentDocument.body;
-        zoomlevel = Math.pow(10, zoomlevel / 10.0);
-        body.style.zoom = zoomlevel;
-        body.style.MozTransform = 'scale(' + zoomlevel + ')';
-    }
-
-    /**
-     * @param {!Ext.data.NodeInterface} root
-     * @param {!string} uri
-     * @return {!Ext.data.NodeInterface}
-     */
-    function getParentNode(root, uri) {
-        var parts = uri.split('/'),
-            node = root,
-            id = parts[0],
-            i,
-            n;
-        for (i = 1; i < parts.length - 1; i += 1) {
-            n = node.findChild('text', parts[i], false);
-            id += '/' + parts[i];
-            if (!n) {
-                n = {
-                    id: id,
-                    text: parts[i],
-                    qtip: uri,
-                    cls: 'folder'
-                };
-                n = node.appendChild(n);
-            }
-            node = n;
-        }
-        return node;
-    }
-
-    /**
-     * @param {!Array.<!string>} directories
-     * @param {!Array.<!string>} files
-     * @return {undefined}
-     */
-    function listFilesCallback(directories, files) {
-        var root = tree.getRootNode(),
-            i,
-            f,
-            parentNode,
-            qtip,
-            node;
-        for (i = 0; i < files.length; i += 1) {
-            f = files[i];
-            parentNode = getParentNode(root, f);
-            qtip = f;
-            node = parentNode.appendChild({
-                id: f,
-                qtip: qtip,
-                text: f.substr(f.lastIndexOf('/') + 1),
-                cls: 'file',
-                leaf: true,
-                editable: false
-            });
-            f = /**@type{!Ext.data.Model}*/(node);
-            addThumbnail(f);
-        }
-    }
-
-    /**
-     * @return {undefined}
-     */
-    function listFilesDoneCallback() {
-    }
-
-    editButton = new Ext.Button({
-        enableToggle: true,
-        text: 'Editable',
-        listeners: { toggle: { fn: editToggle } }
-    });
-
-    slider = new Ext.Slider({
-        width: 300,
-        minValue: -5,
-        maxValue: 5,
-        values: [0],
-        listeners: { changecomplete: { fn: setZoom } }
-    });
-
-    tabpanel = Ext.create('Ext.tab.Panel', {
-        tbar: [ 'Zoom: ', slider, editButton ],
-        region: 'center'
-    });
-
-    tree = Ext.create('Ext.tree.Panel', {
-        title: 'Documents',
-        region: 'west',
-        width: 200,
-        split: true,
-        autoScroll: true,
-        collapsible: true,
-        rootVisible: false,
-        enableTabScroll: true,
-        defaults: {autoScroll: true},
-        listeners: {
-            itemclick: function (view, rec) {
-                if (rec.get('cls') === 'file') {
-                    loadODF(rec.get('id'), tabpanel, rec.get('text'));
-                } else if (rec.get('cls') === 'folder') {
-                    if (rec.isExpanded()) {
-                        rec.collapse();
-                    } else {
-                        rec.expand();
-                    }
-                }
-            }
-        },
-        root: { nodeType: 'node' }
-    });
-
-    viewport = new Ext.Viewport({
-        layout: 'border',
-        items: [ tabpanel, tree ]
-    });
-
-    // put data in the tree
-    listFiles('./demodocs/', /\.od[tps]$/i, listFilesCallback,
-            listFilesDoneCallback);
-});
diff --git a/apps/files_odfviewer/src/webodf/webodf/httpserver.js b/apps/files_odfviewer/src/webodf/webodf/httpserver.js
deleted file mode 100644
index 245ce9f3f7..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/httpserver.js
+++ /dev/null
@@ -1,213 +0,0 @@
-/**
- * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
- * @licstart
- * The JavaScript code in this page is free software: you can redistribute it
- * and/or modify it under the terms of the GNU Affero General Public License
- * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.  The code is distributed
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
- *
- * As additional permission under GNU AGPL version 3 section 7, you
- * may distribute non-source (e.g., minimized or compacted) forms of
- * that code without the copy of the GNU GPL normally required by
- * section 4, provided you include this license notice and a URL
- * through which recipients can access the Corresponding Source.
- *
- * As a special exception to the AGPL, any HTML file which merely makes function
- * calls to this code, and for that purpose includes it by reference shall be
- * deemed a separate work for copyright law purposes. In addition, the copyright
- * holders of this code give you permission to combine this code with free
- * software libraries that are released under the GNU LGPL. You may copy and
- * distribute such a system following the terms of the GNU AGPL for this code
- * and the LGPL for the libraries. If you modify this code, you may extend this
- * exception to your version of the code, but you are not obligated to do so.
- * If you do not wish to do so, delete this exception statement from your
- * version.
- *
- * This license applies to this entire compilation.
- * @licend
- * @source: http://www.webodf.org/
- * @source: http://gitorious.org/odfkit/webodf/
- */
-/*global require: true, console: true, process: true, Buffer: true,
-   unescape: true */
-/* A Node.JS http server*/
-var http = require("http"),
-    url = require("url"),
-    path = require("path"),
-    fs = require("fs"),
-    lookForIndexHtml = true,
-    ipaddress = "127.0.0.1",
-    //ipaddress = "192.168.1.105",
-    port = 8124;
-
-function statFile(dir, filelist, position, callback) {
-    "use strict";
-    if (position >= filelist.length) {
-        return callback(null, filelist);
-    }
-    fs.stat(dir + "/" + filelist[position], function (err, stats) {
-        if (stats && stats.isDirectory()) {
-            filelist[position] = filelist[position] + "/";
-        }
-        statFile(dir, filelist, position + 1, callback);
-    });
-}
-
-function listFiles(dir, callback) {
-    "use strict";
-    fs.readdir(dir, function (err, files) {
-        if (err) {
-            return callback(err);
-        }
-        statFile(dir, files, 0, callback);
-    });
-}
-
-http.createServer(function (request, response) {
-    "use strict";
-    var uri = unescape(url.parse(request.url).pathname),
-        filename = path.join(process.cwd(), uri);
-    if (uri !== '/favicon.ico') {
-        console.log(request.method + " " + uri);
-    }
-    function put() {
-        var contentlength = parseInt(request.headers["content-length"], 10),
-            alldata = new Buffer(contentlength),
-            sum = 0;
-        request.on("data", function (data) {
-            data.copy(alldata, sum, 0);
-            sum += data.length;
-        });
-        request.on("end", function () {
-            fs.writeFile(filename, alldata, "binary", function (err) {
-                if (err) {
-                    response.writeHead(500);
-                    response.write(err);
-                } else {
-                    response.writeHead(200);
-                }
-                response.end();
-            });
-        });
-    }
-    if (request.method === "PUT") {
-        put(request, response);
-        return;
-    }
-    if (request.method === "DELETE") {
-        fs.unlink(filename, function (err) {
-            if (err) {
-                response.writeHead(500);
-            } else {
-                response.writeHead(200);
-            }
-            response.end();
-        });
-        return;
-    }
-    function handleStat(err, stats, lookForIndexHtml) {
-        if (!err && stats.isFile()) {
-            fs.readFile(filename, "binary", function (err, file) {
-                if (err) {
-                    response.writeHead(500, {"Content-Type": "text/plain"});
-                    if (request.method !== "HEAD") {
-                        response.write(err + "\n");
-                    }
-                    response.end();
-                    return;
-                }
-                var head = {"Content-Length": stats.size};
-                if (filename.substr(-3) === ".js") {
-                    head["Content-Type"] = "text/javascript";
-                } else if (filename.substr(-4) === ".css") {
-                    head["Content-Type"] = "text/css";
-                } else if (filename.substr(-4) === ".odt" ||
-                        filename.substr(-5) === ".fodt") {
-                    head["Content-Type"] = "application/vnd.oasis.opendocument.text";
-                } else if (filename.substr(-4) === ".ods" ||
-                        filename.substr(-5) === ".fods") {
-                    head["Content-Type"] = "application/vnd.oasis.opendocument.presentation";
-                } else if (filename.substr(-4) === ".odp" ||
-                        filename.substr(-5) === ".fodp") {
-                    head["Content-Type"] = "application/vnd.oasis.opendocument.spreadsheet";
-                }
-                response.writeHead(200, head);
-                if (request.method !== "HEAD") {
-                    response.write(file, "binary");
-                }
-                response.end();
-            });
-        } else if (!err && stats.isDirectory()) {
-            if (lookForIndexHtml) {
-                fs.stat(filename + "/index.html", function (err, stats) {
-                    if (err) {
-                        fs.stat(filename, handleStat);
-                    } else {
-                        filename = filename + "/index.html";
-                        handleStat(err, stats);
-                    }
-                });
-                return;
-            }
-            if (uri.length === 0 || uri[uri.length - 1] !== "/") {
-                response.writeHead(301, {"Content-Type": "text/plain",
-                        "Location": uri + "/"});
-                if (request.method !== "HEAD") {
-                    response.write("Moved permanently\n");
-                }
-                response.end();
-                return;
-            }
-            listFiles(filename, function (err, files) {
-                if (err) {
-                    response.writeHead(500, {"Content-Type": "text/plain"});
-                    if (request.method !== "HEAD") {
-                        response.write(err + "\n");
-                    }
-                    response.end();
-                    return;
-                }
-                response.writeHead(200);
-                if (request.method !== "HEAD") {
-                    files.sort();
-                    response.write("<html><head><title></title></head><body>");
-                    response.write("<table>");
-                    var i, l = files.length, file;
-                    for (i = 0; i < l; i += 1) {
-                        file = files[i];
-                        if (file.length > 0 && file[file.length - 1] === '/') {
-                            file = encodeURIComponent(file.slice(0, file.length - 1)) + "/";
-                        } else {
-                            file = encodeURIComponent(file);
-                        }
-                        response.write("<tr><td><a href=\"");
-                        response.write(file);
-                        response.write("\">");
-                        file = files[i].replace("&", "&amp;")
-                                .replace("<", "&gt;");
-                        response.write(file.replace("\"", "\\\""));
-                        response.write("</a></td></tr>\n");
-                    }
-                    response.write("</table></body></html>\n");
-                }
-                response.end();
-            });
-        } else {
-            if (uri !== '/favicon.ico') {
-                console.log("Not found: " + uri);
-            }
-            response.writeHead(404, {"Content-Type": "text/plain"});
-            if (request.method !== "HEAD") {
-                response.write("404 Not Found\n");
-            }
-            response.end();
-        }
-    }
-    fs.stat(filename, function (err, stats) {
-        handleStat(err, stats, lookForIndexHtml);
-    });
-}).listen(port, ipaddress);
-
-console.log('Server running at ' + ipaddress + ':' + port + '/');
diff --git a/apps/files_odfviewer/src/webodf/webodf/index.html b/apps/files_odfviewer/src/webodf/webodf/index.html
deleted file mode 100644
index 027a8a9b23..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/index.html
+++ /dev/null
@@ -1,17 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html xml:lang="en" lang="en">
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8"></meta>
-  <link rel="stylesheet" type="text/css" href="extjs/resources/css/ext-all.css"/>
-  <!-- requirements -->
-  <script src="extjs/ext-all.js" type="text/javascript" charset="utf-8"></script>
-  <script src="lib/runtime.js" type="text/javascript" charset="utf-8"></script>
-  <script src="filelister.js" type="text/javascript" charset="utf-8"></script>
-  <!-- application -->
-  <script src="gui.js" type="text/javascript" charset="utf-8"></script>
- 
-  <title id="page-title">WebODF</title>
-</head>
-<body>
-</body>
-</html>
diff --git a/apps/files_odfviewer/src/webodf/webodf/lib/core/Async.js b/apps/files_odfviewer/src/webodf/webodf/lib/core/Async.js
deleted file mode 100644
index 358a8feee0..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/lib/core/Async.js
+++ /dev/null
@@ -1,65 +0,0 @@
-/**
- * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
- * @licstart
- * The JavaScript code in this page is free software: you can redistribute it
- * and/or modify it under the terms of the GNU Affero General Public License
- * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.  The code is distributed
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
- *
- * As additional permission under GNU AGPL version 3 section 7, you
- * may distribute non-source (e.g., minimized or compacted) forms of
- * that code without the copy of the GNU GPL normally required by
- * section 4, provided you include this license notice and a URL
- * through which recipients can access the Corresponding Source.
- *
- * As a special exception to the AGPL, any HTML file which merely makes function
- * calls to this code, and for that purpose includes it by reference shall be
- * deemed a separate work for copyright law purposes. In addition, the copyright
- * holders of this code give you permission to combine this code with free
- * software libraries that are released under the GNU LGPL. You may copy and
- * distribute such a system following the terms of the GNU AGPL for this code
- * and the LGPL for the libraries. If you modify this code, you may extend this
- * exception to your version of the code, but you are not obligated to do so.
- * If you do not wish to do so, delete this exception statement from your
- * version.
- *
- * This license applies to this entire compilation.
- * @licend
- * @source: http://www.webodf.org/
- * @source: http://gitorious.org/odfkit/webodf/
- */
-/*global core*/
-
-/**
- * @constructor
- */
-core.Async = function Async() {
-    "use strict";
-    /**
-     * @param {!Array.<*>} items
-     * @param {function(*, !function(!string):undefined):undefined} f
-     * @param {function(?string)} callback
-     * @return {undefined}
-     */
-    this.forEach = function (items, f, callback) {
-        var i, l = items.length, itemsDone = 0;
-        function end(err) {
-            if (itemsDone !== l) {
-                if (err) {
-                    itemsDone = l;
-                    callback(err);
-                } else {
-                    itemsDone += 1;
-                    if (itemsDone === l) {
-                        callback(null);
-                    }
-                }
-            }
-        }
-        for (i = 0; i < l; i += 1) {
-            f(items[i], end);
-        }
-    };
-};
diff --git a/apps/files_odfviewer/src/webodf/webodf/lib/core/Base64.js b/apps/files_odfviewer/src/webodf/webodf/lib/core/Base64.js
deleted file mode 100644
index 736f5bb531..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/lib/core/Base64.js
+++ /dev/null
@@ -1,362 +0,0 @@
-/**
- * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
- * @licstart
- * The JavaScript code in this page is free software: you can redistribute it
- * and/or modify it under the terms of the GNU Affero General Public License
- * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.  The code is distributed
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
- *
- * As additional permission under GNU AGPL version 3 section 7, you
- * may distribute non-source (e.g., minimized or compacted) forms of
- * that code without the copy of the GNU GPL normally required by
- * section 4, provided you include this license notice and a URL
- * through which recipients can access the Corresponding Source.
- *
- * As a special exception to the AGPL, any HTML file which merely makes function
- * calls to this code, and for that purpose includes it by reference shall be
- * deemed a separate work for copyright law purposes. In addition, the copyright
- * holders of this code give you permission to combine this code with free
- * software libraries that are released under the GNU LGPL. You may copy and
- * distribute such a system following the terms of the GNU AGPL for this code
- * and the LGPL for the libraries. If you modify this code, you may extend this
- * exception to your version of the code, but you are not obligated to do so.
- * If you do not wish to do so, delete this exception statement from your
- * version.
- *
- * This license applies to this entire compilation.
- * @licend
- * @source: http://www.webodf.org/
- * @source: http://gitorious.org/odfkit/webodf/
- */
-/*jslint bitwise: true, regexp: true*/
-/*global core: true, runtime: true*/
-/*
- * $Id: base64.js,v 0.9 2009/03/01 20:51:18 dankogai Exp dankogai $
- */
-/**
- * @namespace
- */
-core.Base64 = (function () {
-    "use strict";
-    var b64chars
-        = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/',
-
-        b64charcodes = (function () {
-            var a = [], i,
-                codeA = 'A'.charCodeAt(0),
-                codea = 'a'.charCodeAt(0),
-                code0 = '0'.charCodeAt(0);
-            for (i = 0; i < 26; i += 1) {
-                a.push(codeA + i);
-            }
-            for (i = 0; i < 26; i += 1) {
-                a.push(codea + i);
-            }
-            for (i = 0; i < 10; i += 1) {
-                a.push(code0 + i);
-            }
-            a.push('+'.charCodeAt(0));
-            a.push('/'.charCodeAt(0));
-            return a;
-        }()),
-
-        b64tab = (function (bin) {
-            var t = {}, i, l;
-            for (i = 0, l = bin.length; i < l; i += 1) {
-                t[bin.charAt(i)] = i;
-            }
-            return t;
-        }(b64chars)),
-        convertUTF16StringToBase64,
-        convertBase64ToUTF16String,
-        btoa, atob;
-
-    /**
-     * @param {!string} s
-     * @return {!Array}
-     */
-    function stringToArray(s) {
-        var a = [], i, l = s.length;
-        for (i = 0; i < l; i += 1) {
-            a[i] = s.charCodeAt(i) & 0xff;
-        }
-        return a;
-    }
-
-    function convertUTF8ArrayToBase64(bin) {
-        var n,
-            b64 = "",
-            i,
-            l = bin.length - 2;
-        for (i = 0; i < l; i += 3) {
-            n = (bin[i] << 16) | (bin[i + 1] << 8) | bin[i + 2];
-            b64 += b64chars[n >>> 18];
-            b64 += b64chars[(n >>> 12) & 63];
-            b64 += b64chars[(n >>>  6) & 63];
-            b64 += b64chars[n          & 63];
-        }
-        if (i === l + 1) { // 1 byte left
-            n = bin[i] << 4;
-            b64 += b64chars[n >>> 6];
-            b64 += b64chars[n & 63];
-            b64 += "==";
-        } else if (i === l) { // 2 bytes left
-            n = (bin[i] << 10) | (bin[i + 1] << 2);
-            b64 += b64chars[n >>> 12];
-            b64 += b64chars[(n >>> 6) & 63];
-            b64 += b64chars[n & 63];
-            b64 += "=";
-        }
-        return b64;
-    }
-
-    function convertBase64ToUTF8Array(b64) {
-        b64 = b64.replace(/[^A-Za-z0-9+\/]+/g, '');
-        var bin = [],
-            padlen = b64.length % 4,
-            i,
-            l = b64.length,
-            n;
-        for (i = 0; i < l; i += 4) {
-            n = ((b64tab[b64.charAt(i)]     || 0) << 18) |
-                ((b64tab[b64.charAt(i + 1)] || 0) << 12) |
-                ((b64tab[b64.charAt(i + 2)] || 0) <<  6) |
-                ((b64tab[b64.charAt(i + 3)] || 0));
-            bin.push(
-                (n >> 16),
-                ((n >>  8) & 0xff),
-                (n         & 0xff)
-            );
-        }
-        bin.length -= [0, 0, 2, 1][padlen];
-        return bin;
-    }
-
-    function convertUTF16ArrayToUTF8Array(uni) {
-        var bin = [], i, l = uni.length, n;
-        for (i = 0; i < l; i += 1) {
-            n = uni[i];
-            if (n < 0x80) {
-                bin.push(n);
-            } else if (n < 0x800) {
-                bin.push(
-                    0xc0 | (n >>>  6),
-                    0x80 | (n & 0x3f)
-                );
-            } else {
-                bin.push(
-                    0xe0 | ((n >>> 12) & 0x0f),
-                    0x80 | ((n >>>  6) & 0x3f),
-                    0x80 |  (n         & 0x3f)
-                );
-            }
-        }
-        return bin;
-    }
-
-    function convertUTF8ArrayToUTF16Array(bin) {
-        var uni = [], i, l = bin.length,
-            c0, c1, c2;
-        for (i = 0; i < l; i += 1) {
-            c0 = bin[i];
-            if (c0 < 0x80) {
-                uni.push(c0);
-            } else {
-                i += 1;
-                c1 = bin[i];
-                if (c0 < 0xe0) {
-                    uni.push(((c0 & 0x1f) << 6) | (c1 & 0x3f));
-                } else {
-                    i += 1;
-                    c2 = bin[i];
-                    uni.push(((c0 & 0x0f) << 12) | ((c1 & 0x3f) << 6) |
-                            (c2 & 0x3f)
-                        );
-                }
-            }
-        }
-        return uni;
-    }
-
-    function convertUTF8StringToBase64(bin) {
-        return convertUTF8ArrayToBase64(stringToArray(bin));
-    }
-
-    function convertBase64ToUTF8String(b64) {
-        return String.fromCharCode.apply(String, convertBase64ToUTF8Array(b64));
-    }
-
-    function convertUTF8StringToUTF16Array(bin) {
-        return convertUTF8ArrayToUTF16Array(stringToArray(bin));
-    }
-
-    function convertUTF8ArrayToUTF16String(bin) {
-        // this conversion is done in chunks to avoid a stack overflow in
-        // apply()
-        var b = convertUTF8ArrayToUTF16Array(bin),
-            r = "",
-            i = 0,
-            chunksize = 45000;
-        while (i < b.length) {
-            r += String.fromCharCode.apply(String, b.slice(i, i + chunksize));
-            i += chunksize;
-        }
-        return r;
-    }
-    /**
-     * @param {!Array.<number>|!string} bin
-     * @param {!number} i
-     * @param {!number} end
-     * @return {!string}
-     */
-    function convertUTF8StringToUTF16String_internal(bin, i, end) {
-        var str = "", c0, c1, c2, j;
-        for (j = i; j < end; j += 1) {
-            c0 = bin.charCodeAt(j) & 0xff;
-            if (c0 < 0x80) {
-                str += String.fromCharCode(c0);
-            } else {
-                j += 1;
-                c1 = bin.charCodeAt(j) & 0xff;
-                if (c0 < 0xe0) {
-                    str += String.fromCharCode(((c0 & 0x1f) << 6) |
-                        (c1 & 0x3f));
-                } else {
-                    j += 1;
-                    c2 = bin.charCodeAt(j) & 0xff;
-                    str += String.fromCharCode(((c0 & 0x0f) << 12) |
-                            ((c1 & 0x3f) << 6) | (c2 & 0x3f));
-                }
-            }
-        }
-        return str;
-    }
-
-    /**
-     * Convert a utf-8 array into a utf-16 string.
-     * The input array is treated as a list of values between 0 and 255.
-     * This function works with a callback and splits the work up in parts
-     * between which it yields to the main thread.
-     * After each part the progress is reported with the callback function that
-     * also passes a booleant that indicates if the job has finished.
-     * If the conversion should stop, the callback should return false.
-     *
-     * @param {!Array.<number>|!string} bin
-     * @param {!function(!string, boolean):boolean} callback
-     * @return {undefined}
-     */
-    function convertUTF8StringToUTF16String(bin, callback) {
-        var partsize = 100000,
-            numparts = bin.length / partsize,
-            str = "",
-            pos = 0;
-        if (bin.length < partsize) {
-            callback(convertUTF8StringToUTF16String_internal(bin, 0,
-                    bin.length), true);
-            return;
-        }
-        // make a local copy if the input is a string, to avoid modification
-        if (typeof bin !== "string") {
-            bin = bin.slice();
-        }
-        function f() {
-            var end = pos + partsize;
-            if (end > bin.length) {
-                end = bin.length;
-            }
-            str += convertUTF8StringToUTF16String_internal(bin, pos, end);
-            pos = end;
-            end = pos === bin.length;
-            if (callback(str, end) && !end) {
-                runtime.setTimeout(f, 0);
-            }
-        }
-        f();
-    }
-
-    function convertUTF16StringToUTF8Array(uni) {
-        return convertUTF16ArrayToUTF8Array(stringToArray(uni));
-    }
-
-    function convertUTF16ArrayToUTF8String(uni) {
-        return String.fromCharCode.apply(String,
-                 convertUTF16ArrayToUTF8Array(uni));
-    }
-
-    function convertUTF16StringToUTF8String(uni) {
-        return String.fromCharCode.apply(String,
-                 convertUTF16ArrayToUTF8Array(stringToArray(uni)));
-    }
-
-    btoa = runtime.getWindow() && runtime.getWindow().btoa;
-    if (btoa) {
-        convertUTF16StringToBase64 = function (uni) {
-            return btoa(convertUTF16StringToUTF8String(uni));
-        };
-    } else {
-        btoa = convertUTF8StringToBase64;
-        convertUTF16StringToBase64 = function (uni) {
-            return convertUTF8ArrayToBase64(convertUTF16StringToUTF8Array(uni));
-        };
-    }
-    atob = runtime.getWindow() && runtime.getWindow().atob;
-    if (atob) {
-        convertBase64ToUTF16String = function (b64) {
-            var b = atob(b64);
-            return convertUTF8StringToUTF16String_internal(b, 0, b.length);
-        };
-    } else {
-        atob = convertBase64ToUTF8String;
-        convertBase64ToUTF16String = function (b64) {
-            return convertUTF8ArrayToUTF16String(convertBase64ToUTF8Array(b64));
-        };
-    }
-
-    /**
-     * @constructor
-     */
-    function Base64() {
-        this.convertUTF8ArrayToBase64 = convertUTF8ArrayToBase64;
-        this.convertByteArrayToBase64 = convertUTF8ArrayToBase64;
-        this.convertBase64ToUTF8Array = convertBase64ToUTF8Array;
-        this.convertBase64ToByteArray = convertBase64ToUTF8Array;
-        this.convertUTF16ArrayToUTF8Array = convertUTF16ArrayToUTF8Array;
-        this.convertUTF16ArrayToByteArray = convertUTF16ArrayToUTF8Array;
-        this.convertUTF8ArrayToUTF16Array = convertUTF8ArrayToUTF16Array;
-        this.convertByteArrayToUTF16Array = convertUTF8ArrayToUTF16Array;
-        this.convertUTF8StringToBase64 = convertUTF8StringToBase64;
-        this.convertBase64ToUTF8String = convertBase64ToUTF8String;
-        this.convertUTF8StringToUTF16Array = convertUTF8StringToUTF16Array;
-        this.convertUTF8ArrayToUTF16String = convertUTF8ArrayToUTF16String;
-        this.convertByteArrayToUTF16String = convertUTF8ArrayToUTF16String;
-        this.convertUTF8StringToUTF16String = convertUTF8StringToUTF16String;
-        this.convertUTF16StringToUTF8Array = convertUTF16StringToUTF8Array;
-        this.convertUTF16StringToByteArray = convertUTF16StringToUTF8Array;
-        this.convertUTF16ArrayToUTF8String = convertUTF16ArrayToUTF8String;
-        this.convertUTF16StringToUTF8String = convertUTF16StringToUTF8String;
-        this.convertUTF16StringToBase64 = convertUTF16StringToBase64;
-        this.convertBase64ToUTF16String = convertBase64ToUTF16String;
-        this.fromBase64 = convertBase64ToUTF8String;
-        this.toBase64 = convertUTF8StringToBase64;
-        this.atob = atob;
-        this.btoa = btoa;
-        this.utob = convertUTF16StringToUTF8String;
-        this.btou = convertUTF8StringToUTF16String;
-        this.encode = convertUTF16StringToBase64;
-        this.encodeURI = function (u) {
-            return convertUTF16StringToBase64(u).replace(/[+\/]/g,
-                    function (m0) {
-                    return m0 === '+' ? '-' : '_';
-                }).replace(/\\=+$/, '');
-        };
-        this.decode = function (a) {
-            return convertBase64ToUTF16String(a.replace(/[\-_]/g,
-                function (m0) {
-                    return m0 === '-' ? '+' : '/';
-                }));
-        };
-    }
-    return Base64;
-}());
diff --git a/apps/files_odfviewer/src/webodf/webodf/lib/core/ByteArray.js b/apps/files_odfviewer/src/webodf/webodf/lib/core/ByteArray.js
deleted file mode 100644
index d8a9ddd73d..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/lib/core/ByteArray.js
+++ /dev/null
@@ -1,68 +0,0 @@
-/**
- * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
- * @licstart
- * The JavaScript code in this page is free software: you can redistribute it
- * and/or modify it under the terms of the GNU Affero General Public License
- * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.  The code is distributed
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
- *
- * As additional permission under GNU AGPL version 3 section 7, you
- * may distribute non-source (e.g., minimized or compacted) forms of
- * that code without the copy of the GNU GPL normally required by
- * section 4, provided you include this license notice and a URL
- * through which recipients can access the Corresponding Source.
- *
- * As a special exception to the AGPL, any HTML file which merely makes function
- * calls to this code, and for that purpose includes it by reference shall be
- * deemed a separate work for copyright law purposes. In addition, the copyright
- * holders of this code give you permission to combine this code with free
- * software libraries that are released under the GNU LGPL. You may copy and
- * distribute such a system following the terms of the GNU AGPL for this code
- * and the LGPL for the libraries. If you modify this code, you may extend this
- * exception to your version of the code, but you are not obligated to do so.
- * If you do not wish to do so, delete this exception statement from your
- * version.
- *
- * This license applies to this entire compilation.
- * @licend
- * @source: http://www.webodf.org/
- * @source: http://gitorious.org/odfkit/webodf/
- */
-/*global core*/
-/*jslint plusplus: true, bitwise: true */
-/**
- * @constructor
- * @param {!Runtime.ByteArray} data
- */
-core.ByteArray = function ByteArray(data) {
-    "use strict";
-    /**
-     * @type {!number}
-     */
-    this.pos = 0;
-    /**
-     * @type {!Runtime.ByteArray}
-     */
-    this.data = data;
-    /**
-     * @return {number}
-     */
-    this.readUInt32LE = function () {
-        var data = this.data,
-            pos = (this.pos += 4);
-        return (data[--pos] << 24) |
-            (data[--pos] << 16) |
-            (data[--pos] <<  8) |
-            data[--pos];
-    };
-    /**
-     * @return {number}
-     */
-    this.readUInt16LE = function () {
-        var data = this.data,
-            pos = (this.pos += 2);
-        return (data[--pos] << 8) | data[--pos];
-    };
-};
diff --git a/apps/files_odfviewer/src/webodf/webodf/lib/core/ByteArrayWriter.js b/apps/files_odfviewer/src/webodf/webodf/lib/core/ByteArrayWriter.js
deleted file mode 100644
index a7838be3dc..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/lib/core/ByteArrayWriter.js
+++ /dev/null
@@ -1,101 +0,0 @@
-/**
- * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
- * @licstart
- * The JavaScript code in this page is free software: you can redistribute it
- * and/or modify it under the terms of the GNU Affero General Public License
- * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.  The code is distributed
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
- *
- * As additional permission under GNU AGPL version 3 section 7, you
- * may distribute non-source (e.g., minimized or compacted) forms of
- * that code without the copy of the GNU GPL normally required by
- * section 4, provided you include this license notice and a URL
- * through which recipients can access the Corresponding Source.
- *
- * As a special exception to the AGPL, any HTML file which merely makes function
- * calls to this code, and for that purpose includes it by reference shall be
- * deemed a separate work for copyright law purposes. In addition, the copyright
- * holders of this code give you permission to combine this code with free
- * software libraries that are released under the GNU LGPL. You may copy and
- * distribute such a system following the terms of the GNU AGPL for this code
- * and the LGPL for the libraries. If you modify this code, you may extend this
- * exception to your version of the code, but you are not obligated to do so.
- * If you do not wish to do so, delete this exception statement from your
- * version.
- *
- * This license applies to this entire compilation.
- * @licend
- * @source: http://www.webodf.org/
- * @source: http://gitorious.org/odfkit/webodf/
- */
-/*global runtime: true, core: true*/
-/*jslint bitwise: true */
-/**
- * @constructor
- * @param {!string} encoding
- */
-core.ByteArrayWriter = function ByteArrayWriter(encoding) {
-    "use strict";
-    var self = this,
-        data = new runtime.ByteArray(0);
-
-    /**
-     * @param {!core.ByteArrayWriter} writer
-     * @return {undefined}
-     */
-    this.appendByteArrayWriter = function (writer) {
-        data = runtime.concatByteArrays(data, writer.getByteArray());
-    };
-    /**
-     * @param {!Runtime.ByteArray} array
-     * @return {undefined}
-     */
-    this.appendByteArray = function (array) {
-        data = runtime.concatByteArrays(data, array);
-    };
-    /**
-     * @param {!Array.<!number>} array
-     * @return {undefined}
-     */
-    this.appendArray = function (array) {
-        data = runtime.concatByteArrays(data,
-                runtime.byteArrayFromArray(array));
-    };
-    /**
-     * @param {!number} value
-     * @return {undefined}
-     */
-    this.appendUInt16LE = function (value) {
-        self.appendArray([value & 0xff, (value >> 8) & 0xff]);
-    };
-    /**
-     * @param {!number} value
-     * @return {undefined}
-     */
-    this.appendUInt32LE = function (value) {
-        self.appendArray([value & 0xff, (value >> 8) & 0xff,
-                (value >> 16) & 0xff, (value >> 24) & 0xff]);
-    };
-    /**
-     * @param {!string} string
-     * @return {undefined}
-     */
-    this.appendString = function (string) {
-        data = runtime.concatByteArrays(data,
-                runtime.byteArrayFromString(string, encoding));
-    };
-    /**
-     * @return {!number}
-     */
-    this.getLength = function () {
-        return data.length;
-    };
-    /**
-     * @return {!Runtime.ByteArray}
-     */
-    this.getByteArray = function () {
-        return data;
-    };
-};
diff --git a/apps/files_odfviewer/src/webodf/webodf/lib/core/Cursor.js b/apps/files_odfviewer/src/webodf/webodf/lib/core/Cursor.js
deleted file mode 100644
index d8f7965388..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/lib/core/Cursor.js
+++ /dev/null
@@ -1,213 +0,0 @@
-/**
- * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
- * @licstart
- * The JavaScript code in this page is free software: you can redistribute it
- * and/or modify it under the terms of the GNU Affero General Public License
- * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.  The code is distributed
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
- *
- * As additional permission under GNU AGPL version 3 section 7, you
- * may distribute non-source (e.g., minimized or compacted) forms of
- * that code without the copy of the GNU GPL normally required by
- * section 4, provided you include this license notice and a URL
- * through which recipients can access the Corresponding Source.
- *
- * As a special exception to the AGPL, any HTML file which merely makes function
- * calls to this code, and for that purpose includes it by reference shall be
- * deemed a separate work for copyright law purposes. In addition, the copyright
- * holders of this code give you permission to combine this code with free
- * software libraries that are released under the GNU LGPL. You may copy and
- * distribute such a system following the terms of the GNU AGPL for this code
- * and the LGPL for the libraries. If you modify this code, you may extend this
- * exception to your version of the code, but you are not obligated to do so.
- * If you do not wish to do so, delete this exception statement from your
- * version.
- *
- * This license applies to this entire compilation.
- * @licend
- * @source: http://www.webodf.org/
- * @source: http://gitorious.org/odfkit/webodf/
- */
-/*global core: true, Node: true*/
-/**
- * @class
- * A cursor is a dom node that visually represents a cursor in a DOM tree.
- * It should stay synchronized with the selection in the document. When
- * there is only one collapsed selection range, a cursor should be shown at
- * that point.
- *
- * Putting the cursor in the DOM tree modifies the DOM, so care should be taken
- * to keep the selection consistent. If e.g. a selection is drawn over the
- * cursor, and the cursor is updated to the selection, the cursor is removed
- * from the DOM because the selection is not collapsed. This means that the
- * offsets of the selection may have to be changed.
- *
- * When the selection is collapsed, the cursor is placed after the point of the
- * selection and the selection will stay valid. However, if the cursor was
- * placed in the DOM tree and was counted in the offset, the offset in the
- * selection should be decreased by one.
- *
- * Even when the selection allows for a cursor, it might be desireable to hide
- * the cursor by not letting it be part of the DOM.
- *
- * @constructor
- * @param {Selection} selection The selection to which the cursor corresponds
- * @param {Document} document The document in which the cursor is placed
- */
-core.Cursor = function Cursor(selection, document) {
-    "use strict";
-    var cursorns,
-        cursorNode;
-    cursorns = 'urn:webodf:names:cursor';
-    cursorNode = document.createElementNS(cursorns, 'cursor');
-
-    function putCursorIntoTextNode(container, offset) {
-        var len, ref, textnode, parent;
-        parent = container.parentNode;
-        if (offset === 0) {
-            parent.insertBefore(cursorNode, container);
-        } else if (offset === container.length) {
-            parent.appendChild(cursorNode);
-        } else {
-            len = container.length;
-            ref = container.nextSibling;
-            textnode = document.createTextNode(
-                container.substringData(offset, len)
-            );
-            container.deleteData(offset, len);
-            if (ref) {
-                parent.insertBefore(textnode, ref);
-            } else {
-                parent.appendChild(textnode);
-            }
-            parent.insertBefore(cursorNode, textnode);
-        }
-    }
-    function putCursorIntoContainer(container, offset) {
-        var node;
-        node = container.firstChild;
-        while (node && offset) {
-            node = node.nextSibling;
-            offset -= 1;
-        }
-        container.insertBefore(cursorNode, node);
-    }
-    function getPotentialParentOrNode(parent, node) {
-        var n = node;
-        while (n && n !== parent) {
-            n = n.parentNode;
-        }
-        return n || node;
-    }
-    function removeCursorFromSelectionRange(range, cursorpos) {
-        var cursorParent, start, end;
-        cursorParent = cursorNode.parentNode;
-        start = getPotentialParentOrNode(cursorNode, range.startContainer);
-        end = getPotentialParentOrNode(cursorNode, range.endContainer);
-        if (start === cursorNode) {
-            range.setStart(cursorParent, cursorpos);
-        } else if (start === cursorParent &&
-                range.startOffset > cursorpos) {
-            range.setStart(cursorParent, range.startOffset - 1);
-        }
-        if (range.endContainer === cursorNode) {
-            range.setEnd(cursorParent, cursorpos);
-        } else if (range.endContainer === cursorParent &&
-                range.endOffset > cursorpos) {
-            range.setEnd(cursorParent, range.endOffset - 1);
-        }
-    }
-    function adaptRangeToMergedText(range, prev, textnodetomerge, cursorpos) {
-        var diff = prev.length - textnodetomerge.length;
-        if (range.startContainer === textnodetomerge) {
-            range.setStart(prev, diff + range.startOffset);
-        } else if (range.startContainer === prev.parentNode &&
-                range.startOffset === cursorpos) {
-            range.setStart(prev, diff);
-        }
-        if (range.endContainer === textnodetomerge) {
-            range.setEnd(prev, diff + range.endOffset);
-        } else if (range.endContainer === prev.parentNode &&
-                range.endOffset === cursorpos) {
-            range.setEnd(prev, diff);
-        }
-    }
-    function removeCursor() {
-        // if the cursor is part of a selection, the selection must be adapted
-        var i, cursorpos, node, textnodetoremove, range;
-        // if the cursor has no parent, it is already not part of the document
-        // tree
-        if (!cursorNode.parentNode) {
-            return;
-        }
-        // find the position of the cursor in its parent
-        cursorpos = 0;
-        node = cursorNode.parentNode.firstChild;
-        while (node && node !== cursorNode) {
-            cursorpos += 1;
-            node = node.nextSibling;
-        }
-        // Check if removing the node will result in a merge of texts.
-        // This will happen if the cursor is between two text nodes.
-        // The text of the text node after the cursor is put in the text node
-        // before the cursor. The latter node is removed after the selection
-        // has been adapted.
-        if (cursorNode.previousSibling &&
-                cursorNode.previousSibling.nodeType === 3 && // TEXT_NODE
-                cursorNode.nextSibling &&
-                cursorNode.nextSibling.nodeType === 3) { // TEXT_NODE
-            textnodetoremove = cursorNode.nextSibling;
-            cursorNode.previousSibling.appendData(textnodetoremove.nodeValue);
-        }
-        // remove the node from the selections
-        for (i = 0; i < selection.rangeCount; i += 1) {
-            removeCursorFromSelectionRange(selection.getRangeAt(i), cursorpos);
-        }
-        // merge the texts that surround the cursor
-        if (textnodetoremove) {
-            for (i = 0; i < selection.rangeCount; i += 1) {
-                adaptRangeToMergedText(selection.getRangeAt(i),
-                       cursorNode.previousSibling, textnodetoremove, cursorpos);
-            }
-            textnodetoremove.parentNode.removeChild(textnodetoremove);
-        }
-        cursorNode.parentNode.removeChild(cursorNode);
-    }
-    // put the cursor at a particular position
-    function putCursor(container, offset) {
-        if (container.nodeType === 3) { // TEXT_NODE
-            putCursorIntoTextNode(container, offset);
-        } else if (container.nodeType !== 9) { // DOCUMENT_NODE
-            putCursorIntoContainer(container, offset);
-        }
-    }
-    /**
-     * Obtain the node representing the cursor.
-     * @return {Element}
-     */
-    this.getNode = function () {
-        return cursorNode;
-    };
-    /**
-     * Synchronize the cursor with the current selection.
-     * If there is a single collapsed selection range, the cursor will be placed
-     * there. If not, the cursor will be removed from the document tree.
-     * @return {undefined}
-     */
-    this.updateToSelection = function () {
-        var range;
-        removeCursor();
-        if (selection.focusNode) {
-            putCursor(selection.focusNode, selection.focusOffset);
-        }
-    };
-    /**
-     * Remove the cursor from the document tree.
-     * @return {undefined}
-     */
-    this.remove = function () {
-        removeCursor();
-    };
-};
diff --git a/apps/files_odfviewer/src/webodf/webodf/lib/core/JSLint.js b/apps/files_odfviewer/src/webodf/webodf/lib/core/JSLint.js
deleted file mode 100644
index b3e422ef59..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/lib/core/JSLint.js
+++ /dev/null
@@ -1,6403 +0,0 @@
-// jslint.js
-// 2012-04-15
-
-// Copyright (c) 2002 Douglas Crockford  (www.JSLint.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 shall be used for Good, not Evil.
-
-// 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.
-
-// WARNING: JSLint will hurt your feelings.
-
-// JSLINT is a global function. It takes two parameters.
-
-//     var myResult = JSLINT(source, option);
-
-// The first parameter is either a string or an array of strings. If it is a
-// string, it will be split on '\n' or '\r'. If it is an array of strings, it
-// is assumed that each string represents one line. The source can be a
-// JavaScript text, or HTML text, or a JSON text, or a CSS text.
-
-// The second parameter is an optional object of options that control the
-// operation of JSLINT. Most of the options are booleans: They are all
-// optional and have a default value of false. One of the options, predef,
-// can be an array of names, which will be used to declare global variables,
-// or an object whose keys are used as global names, with a boolean value
-// that determines if they are assignable.
-
-// If it checks out, JSLINT returns true. Otherwise, it returns false.
-
-// If false, you can inspect JSLINT.errors to find out the problems.
-// JSLINT.errors is an array of objects containing these properties:
-
-//  {
-//      line      : The line (relative to 0) at which the lint was found
-//      character : The character (relative to 0) at which the lint was found
-//      reason    : The problem
-//      evidence  : The text line in which the problem occurred
-//      raw       : The raw message before the details were inserted
-//      a         : The first detail
-//      b         : The second detail
-//      c         : The third detail
-//      d         : The fourth detail
-//  }
-
-// If a stopping error was found, a null will be the last element of the
-// JSLINT.errors array. A stopping error means that JSLint was not confident
-// enough to continue. It does not necessarily mean that the error was
-// especially heinous.
-
-// You can request a Function Report, which shows all of the functions
-// and the parameters and vars that they use. This can be used to find
-// implied global variables and other problems. The report is in HTML and
-// can be inserted in an HTML <body>.
-
-//     var myReport = JSLINT.report(errors_only);
-
-// If errors_only is true, then the report will be limited to only errors.
-
-// You can request a data structure that contains JSLint's results.
-
-//     var myData = JSLINT.data();
-
-// It returns a structure with this form:
-
-//     {
-//         errors: [
-//             {
-//                 line: NUMBER,
-//                 character: NUMBER,
-//                 reason: STRING,
-//                 evidence: STRING
-//             }
-//         ],
-//         functions: [
-//             {
-//                 name: STRING,
-//                 line: NUMBER,
-//                 last: NUMBER,
-//                 params: [
-//                     {
-//                         string: STRING
-//                     }
-//                 ],
-//                 closure: [
-//                     STRING
-//                 ],
-//                 var: [
-//                     STRING
-//                 ],
-//                 exception: [
-//                     STRING
-//                 ],
-//                 outer: [
-//                     STRING
-//                 ],
-//                 unused: [
-//                     STRING
-//                 ],
-//                 undef: [
-//                     STRING
-//                 ],
-//                 global: [
-//                     STRING
-//                 ],
-//                 label: [
-//                     STRING
-//                 ]
-//             }
-//         ],
-//         globals: [
-//             STRING
-//         ],
-//         member: {
-//             STRING: NUMBER
-//         },
-//         urls: [
-//             STRING
-//         ],
-//         json: BOOLEAN
-//     }
-
-// Empty arrays will not be included.
-
-// You can obtain the parse tree that JSLint constructed while parsing. The
-// latest tree is kept in JSLINT.tree. A nice stringication can be produced
-// with
-
-//     JSON.stringify(JSLINT.tree, [
-//         'string',  'arity', 'name',  'first',
-//         'second', 'third', 'block', 'else'
-//     ], 4));
-
-// JSLint provides three directives. They look like slashstar comments, and
-// allow for setting options, declaring global variables, and establishing a
-// set of allowed property names.
-
-// These directives respect function scope.
-
-// The jslint directive is a special comment that can set one or more options.
-// The current option set is
-
-//     anon       true, if the space may be omitted in anonymous function declarations
-//     bitwise    true, if bitwise operators should be allowed
-//     browser    true, if the standard browser globals should be predefined
-//     cap        true, if upper case HTML should be allowed
-//     'continue' true, if the continuation statement should be tolerated
-//     css        true, if CSS workarounds should be tolerated
-//     debug      true, if debugger statements should be allowed
-//     devel      true, if logging should be allowed (console, alert, etc.)
-//     eqeq       true, if == should be allowed
-//     es5        true, if ES5 syntax should be allowed
-//     evil       true, if eval should be allowed
-//     forin      true, if for in statements need not filter
-//     fragment   true, if HTML fragments should be allowed
-//     indent     the indentation factor
-//     maxerr     the maximum number of errors to allow
-//     maxlen     the maximum length of a source line
-//     newcap     true, if constructor names capitalization is ignored
-//     node       true, if Node.js globals should be predefined
-//     nomen      true, if names may have dangling _
-//     on         true, if HTML event handlers should be allowed
-//     passfail   true, if the scan should stop on first error
-//     plusplus   true, if increment/decrement should be allowed
-//     properties true, if all property names must be declared with /*properties*/
-//     regexp     true, if the . should be allowed in regexp literals
-//     rhino      true, if the Rhino environment globals should be predefined
-//     undef      true, if variables can be declared out of order
-//     unparam    true, if unused parameters should be tolerated
-//     sloppy     true, if the 'use strict'; pragma is optional
-//     stupid     true, if really stupid practices are tolerated
-//     sub        true, if all forms of subscript notation are tolerated
-//     vars       true, if multiple var statements per function should be allowed
-//     white      true, if sloppy whitespace is tolerated
-//     widget     true  if the Yahoo Widgets globals should be predefined
-//     windows    true, if MS Windows-specific globals should be predefined
-
-// For example:
-
-/*jslint
-    evil: true, nomen: true, regexp: true
-*/
-
-// The properties directive declares an exclusive list of property names.
-// Any properties named in the program that are not in the list will
-// produce a warning.
-
-// For example:
-
-/*properties
-    '\b', '\t', '\n', '\f', '\r', '!', '!=', '!==', '"', '%', '\'',
-    '(arguments)', '(begin)', '(breakage)', '(context)', '(error)',
-    '(identifier)', '(line)', '(loopage)', '(name)', '(params)', '(scope)',
-    '(token)', '(vars)', '(verb)', '*', '+', '-', '/', '<', '<=', '==',
-    '===', '>', '>=', ADSAFE, Array, Date, Function, Object, '\\', a,
-    a_label, a_not_allowed, a_not_defined, a_scope, abbr, acronym, address,
-    adsafe, adsafe_a, adsafe_autocomplete, adsafe_bad_id, adsafe_div,
-    adsafe_fragment, adsafe_go, adsafe_html, adsafe_id, adsafe_id_go, adsafe_lib,
-    adsafe_lib_second, adsafe_missing_id, adsafe_name_a, adsafe_placement,
-    adsafe_prefix_a, adsafe_script, adsafe_source, adsafe_subscript_a,
-    adsafe_tag, all, already_defined, and, anon, applet, apply, approved, area,
-    arity, article, aside, assign, assign_exception,
-    assignment_function_expression, at, attribute_case_a, audio, autocomplete,
-    avoid_a, b, background, 'background-attachment', 'background-color',
-    'background-image', 'background-position', 'background-repeat',
-    bad_assignment, bad_color_a, bad_constructor, bad_entity, bad_html, bad_id_a,
-    bad_in_a, bad_invocation, bad_name_a, bad_new, bad_number, bad_operand,
-    bad_style, bad_type, bad_url_a, bad_wrap, base, bdo, big, bitwise, block,
-    blockquote, body, border, 'border-bottom', 'border-bottom-color',
-    'border-bottom-left-radius', 'border-bottom-right-radius',
-    'border-bottom-style', 'border-bottom-width', 'border-collapse',
-    'border-color', 'border-left', 'border-left-color', 'border-left-style',
-    'border-left-width', 'border-radius', 'border-right', 'border-right-color',
-    'border-right-style', 'border-right-width', 'border-spacing', 'border-style',
-    'border-top', 'border-top-color', 'border-top-left-radius',
-    'border-top-right-radius', 'border-top-style', 'border-top-width',
-    'border-width', bottom, br, braille, browser, button, c, call, canvas, cap,
-    caption, 'caption-side', center, charAt, charCodeAt, character, cite, clear,
-    clip, closure, cm, code, col, colgroup, color, combine_var, command,
-    conditional_assignment, confusing_a, confusing_regexp, constructor_name_a,
-    content, continue, control_a, 'counter-increment', 'counter-reset', create,
-    css, cursor, d, dangerous_comment, dangling_a, data, datalist, dd, debug,
-    del, deleted, details, devel, dfn, dialog, dir, direction, display, disrupt,
-    div, dl, dt, duplicate_a, edge, edition, else, em, embed, embossed, empty,
-    'empty-cells', empty_block, empty_case, empty_class, entityify, eqeq, errors,
-    es5, eval, evidence, evil, ex, exception, exec, expected_a,
-    expected_a_at_b_c, expected_a_b, expected_a_b_from_c_d, expected_at_a,
-    expected_attribute_a, expected_attribute_value_a, expected_class_a,
-    expected_fraction_a, expected_id_a, expected_identifier_a,
-    expected_identifier_a_reserved, expected_lang_a, expected_linear_a,
-    expected_media_a, expected_name_a, expected_nonstandard_style_attribute,
-    expected_number_a, expected_operator_a, expected_percent_a,
-    expected_positive_a, expected_pseudo_a, expected_selector_a,
-    expected_small_a, expected_space_a_b, expected_string_a,
-    expected_style_attribute, expected_style_pattern, expected_tagname_a,
-    expected_type_a, f, fieldset, figure, filter, first, flag, float, floor,
-    font, 'font-family', 'font-size', 'font-size-adjust', 'font-stretch',
-    'font-style', 'font-variant', 'font-weight', footer, forEach, for_if, forin,
-    form, fragment, frame, frameset, from, fromCharCode, fud, funct, function,
-    function_block, function_eval, function_loop, function_statement,
-    function_strict, functions, global, globals, h1, h2, h3, h4, h5, h6,
-    handheld, hasOwnProperty, head, header, height, hgroup, hr,
-    'hta:application', html, html_confusion_a, html_handlers, i, id, identifier,
-    identifier_function, iframe, img, immed, implied_evil, in, indent, indexOf,
-    infix_in, init, input, ins, insecure_a, isAlpha, isArray, isDigit, isNaN,
-    join, jslint, json, kbd, keygen, keys, label, labeled, lang, lbp,
-    leading_decimal_a, led, left, legend, length, 'letter-spacing', li, lib,
-    line, 'line-height', link, 'list-style', 'list-style-image',
-    'list-style-position', 'list-style-type', map, margin, 'margin-bottom',
-    'margin-left', 'margin-right', 'margin-top', mark, 'marker-offset', match,
-    'max-height', 'max-width', maxerr, maxlen, member, menu, message, meta,
-    meter, 'min-height', 'min-width', missing_a, missing_a_after_b,
-    missing_option, missing_property, missing_space_a_b, missing_url,
-    missing_use_strict, mixed, mm, mode, move_invocation, move_var, n, name,
-    name_function, nav, nested_comment, newcap, node, noframes, nomen, noscript,
-    not, not_a_constructor, not_a_defined, not_a_function, not_a_label,
-    not_a_scope, not_greater, nud, number, object, octal_a, ol, on, opacity,
-    open, optgroup, option, outer, outline, 'outline-color', 'outline-style',
-    'outline-width', output, overflow, 'overflow-x', 'overflow-y', p, padding,
-    'padding-bottom', 'padding-left', 'padding-right', 'padding-top',
-    'page-break-after', 'page-break-before', param, parameter_a_get_b,
-    parameter_arguments_a, parameter_set_a, params, paren, parent, passfail, pc,
-    plusplus, pop, position, postscript, pre, predef, print, progress,
-    projection, properties, prototype, pt, push, px, q, quote, quotes, r, radix,
-    range, raw, read_only, reason, redefinition_a, regexp, replace, report,
-    reserved, reserved_a, rhino, right, rp, rt, ruby, safe, samp, scanned_a_b,
-    screen, script, search, second, section, select, shift, slash_equal, slice,
-    sloppy, small, sort, source, span, speech, split, src, statement_block,
-    stopping, strange_loop, strict, string, strong, stupid, style, styleproperty,
-    sub, subscript, substr, sup, supplant, sync_a, t, table, 'table-layout',
-    tag_a_in_b, tbody, td, test, 'text-align', 'text-decoration', 'text-indent',
-    'text-shadow', 'text-transform', textarea, tfoot, th, thead, third, thru,
-    time, title, toLowerCase, toString, toUpperCase, token, too_long, too_many,
-    top, tr, trailing_decimal_a, tree, tt, tty, tv, type, u, ul, unclosed,
-    unclosed_comment, unclosed_regexp, undef, undefined, unescaped_a,
-    unexpected_a, unexpected_char_a_b, unexpected_comment, unexpected_else,
-    unexpected_label_a, unexpected_property_a, unexpected_space_a_b,
-    'unicode-bidi', unnecessary_initialize, unnecessary_use, unparam,
-    unreachable_a_b, unrecognized_style_attribute_a, unrecognized_tag_a, unsafe,
-    unused, url, urls, use_array, use_braces, use_charAt, use_object, use_or,
-    use_param, used_before_a, var, var_a_not, vars, 'vertical-align', video,
-    visibility, was, weird_assignment, weird_condition, weird_new, weird_program,
-    weird_relation, weird_ternary, white, 'white-space', widget, width, windows,
-    'word-spacing', 'word-wrap', wrap, wrap_immediate, wrap_regexp,
-    write_is_wrong, writeable, 'z-index'
-*/
-
-// The global directive is used to declare global variables that can
-// be accessed by the program. If a declaration is true, then the variable
-// is writeable. Otherwise, it is read-only.
-
-// We build the application inside a function so that we produce only a single
-// global variable. That function will be invoked immediately, and its return
-// value is the JSLINT function itself. That function is also an object that
-// can contain data and other functions.
-
-var JSLINT = (function () {
-    'use strict';
-
-    function array_to_object(array, value) {
-
-// Make an object from an array of keys and a common value.
-
-        var i, length = array.length, object = {};
-        for (i = 0; i < length; i += 1) {
-            object[array[i]] = value;
-        }
-        return object;
-    }
-
-
-    var adsafe_id,      // The widget's ADsafe id.
-        adsafe_may,     // The widget may load approved scripts.
-        adsafe_top,     // At the top of the widget script.
-        adsafe_went,    // ADSAFE.go has been called.
-        allowed_option = {
-            anon      : true,
-            bitwise   : true,
-            browser   : true,
-            cap       : true,
-            'continue': true,
-            css       : true,
-            debug     : true,
-            devel     : true,
-            eqeq      : true,
-            es5       : true,
-            evil      : true,
-            forin     : true,
-            fragment  : true,
-            indent    :   10,
-            maxerr    : 1000,
-            maxlen    :  256,
-            newcap    : true,
-            node      : true,
-            nomen     : true,
-            on        : true,
-            passfail  : true,
-            plusplus  : true,
-            properties: true,
-            regexp    : true,
-            rhino     : true,
-            undef     : true,
-            unparam   : true,
-            sloppy    : true,
-            stupid    : true,
-            sub       : true,
-            vars      : true,
-            white     : true,
-            widget    : true,
-            windows   : true
-        },
-        anonname,       // The guessed name for anonymous functions.
-        approved,       // ADsafe approved urls.
-
-// These are operators that should not be used with the ! operator.
-
-        bang = {
-            '<'  : true,
-            '<=' : true,
-            '==' : true,
-            '===': true,
-            '!==': true,
-            '!=' : true,
-            '>'  : true,
-            '>=' : true,
-            '+'  : true,
-            '-'  : true,
-            '*'  : true,
-            '/'  : true,
-            '%'  : true
-        },
-
-// These are property names that should not be permitted in the safe subset.
-
-        banned = array_to_object([
-            'arguments', 'callee', 'caller', 'constructor', 'eval', 'prototype',
-            'stack', 'unwatch', 'valueOf', 'watch'
-        ], true),
-        begin,          // The root token
-
-// browser contains a set of global names that are commonly provided by a
-// web browser environment.
-
-        browser = array_to_object([
-            'clearInterval', 'clearTimeout', 'document', 'event', 'FormData',
-            'frames', 'history', 'Image', 'localStorage', 'location', 'name',
-            'navigator', 'Option', 'parent', 'screen', 'sessionStorage',
-            'setInterval', 'setTimeout', 'Storage', 'window', 'XMLHttpRequest'
-        ], false),
-
-// bundle contains the text messages.
-
-        bundle = {
-            a_label: "'{a}' is a statement label.",
-            a_not_allowed: "'{a}' is not allowed.",
-            a_not_defined: "'{a}' is not defined.",
-            a_scope: "'{a}' used out of scope.",
-            adsafe_a: "ADsafe violation: '{a}'.",
-            adsafe_autocomplete: "ADsafe autocomplete violation.",
-            adsafe_bad_id: "ADSAFE violation: bad id.",
-            adsafe_div: "ADsafe violation: Wrap the widget in a div.",
-            adsafe_fragment: "ADSAFE: Use the fragment option.",
-            adsafe_go: "ADsafe violation: Misformed ADSAFE.go.",
-            adsafe_html: "Currently, ADsafe does not operate on whole HTML " +
-                "documents. It operates on <div> fragments and .js files.",
-            adsafe_id: "ADsafe violation: id does not match.",
-            adsafe_id_go: "ADsafe violation: Missing ADSAFE.id or ADSAFE.go.",
-            adsafe_lib: "ADsafe lib violation.",
-            adsafe_lib_second: "ADsafe: The second argument to lib must be a function.",
-            adsafe_missing_id: "ADSAFE violation: missing ID_.",
-            adsafe_name_a: "ADsafe name violation: '{a}'.",
-            adsafe_placement: "ADsafe script placement violation.",
-            adsafe_prefix_a: "ADsafe violation: An id must have a '{a}' prefix",
-            adsafe_script: "ADsafe script violation.",
-            adsafe_source: "ADsafe unapproved script source.",
-            adsafe_subscript_a: "ADsafe subscript '{a}'.",
-            adsafe_tag: "ADsafe violation: Disallowed tag '{a}'.",
-            already_defined: "'{a}' is already defined.",
-            and: "The '&&' subexpression should be wrapped in parens.",
-            assign_exception: "Do not assign to the exception parameter.",
-            assignment_function_expression: "Expected an assignment or " +
-                "function call and instead saw an expression.",
-            attribute_case_a: "Attribute '{a}' not all lower case.",
-            avoid_a: "Avoid '{a}'.",
-            bad_assignment: "Bad assignment.",
-            bad_color_a: "Bad hex color '{a}'.",
-            bad_constructor: "Bad constructor.",
-            bad_entity: "Bad entity.",
-            bad_html: "Bad HTML string",
-            bad_id_a: "Bad id: '{a}'.",
-            bad_in_a: "Bad for in variable '{a}'.",
-            bad_invocation: "Bad invocation.",
-            bad_name_a: "Bad name: '{a}'.",
-            bad_new: "Do not use 'new' for side effects.",
-            bad_number: "Bad number '{a}'.",
-            bad_operand: "Bad operand.",
-            bad_style: "Bad style.",
-            bad_type: "Bad type.",
-            bad_url_a: "Bad url '{a}'.",
-            bad_wrap: "Do not wrap function literals in parens unless they " +
-                "are to be immediately invoked.",
-            combine_var: "Combine this with the previous 'var' statement.",
-            conditional_assignment: "Expected a conditional expression and " +
-                "instead saw an assignment.",
-            confusing_a: "Confusing use of '{a}'.",
-            confusing_regexp: "Confusing regular expression.",
-            constructor_name_a: "A constructor name '{a}' should start with " +
-                "an uppercase letter.",
-            control_a: "Unexpected control character '{a}'.",
-            css: "A css file should begin with @charset 'UTF-8';",
-            dangling_a: "Unexpected dangling '_' in '{a}'.",
-            dangerous_comment: "Dangerous comment.",
-            deleted: "Only properties should be deleted.",
-            duplicate_a: "Duplicate '{a}'.",
-            empty_block: "Empty block.",
-            empty_case: "Empty case.",
-            empty_class: "Empty class.",
-            es5: "This is an ES5 feature.",
-            evil: "eval is evil.",
-            expected_a: "Expected '{a}'.",
-            expected_a_b: "Expected '{a}' and instead saw '{b}'.",
-            expected_a_b_from_c_d: "Expected '{a}' to match '{b}' from line " +
-                "{c} and instead saw '{d}'.",
-            expected_at_a: "Expected an at-rule, and instead saw @{a}.",
-            expected_a_at_b_c: "Expected '{a}' at column {b}, not column {c}.",
-            expected_attribute_a: "Expected an attribute, and instead saw [{a}].",
-            expected_attribute_value_a: "Expected an attribute value and " +
-                "instead saw '{a}'.",
-            expected_class_a: "Expected a class, and instead saw .{a}.",
-            expected_fraction_a: "Expected a number between 0 and 1 and " +
-                "instead saw '{a}'",
-            expected_id_a: "Expected an id, and instead saw #{a}.",
-            expected_identifier_a: "Expected an identifier and instead saw '{a}'.",
-            expected_identifier_a_reserved: "Expected an identifier and " +
-                "instead saw '{a}' (a reserved word).",
-            expected_linear_a: "Expected a linear unit and instead saw '{a}'.",
-            expected_lang_a: "Expected a lang code, and instead saw :{a}.",
-            expected_media_a: "Expected a CSS media type, and instead saw '{a}'.",
-            expected_name_a: "Expected a name and instead saw '{a}'.",
-            expected_nonstandard_style_attribute: "Expected a non-standard " +
-                "style attribute and instead saw '{a}'.",
-            expected_number_a: "Expected a number and instead saw '{a}'.",
-            expected_operator_a: "Expected an operator and instead saw '{a}'.",
-            expected_percent_a: "Expected a percentage and instead saw '{a}'",
-            expected_positive_a: "Expected a positive number and instead saw '{a}'",
-            expected_pseudo_a: "Expected a pseudo, and instead saw :{a}.",
-            expected_selector_a: "Expected a CSS selector, and instead saw {a}.",
-            expected_small_a: "Expected a small positive integer and instead saw '{a}'",
-            expected_space_a_b: "Expected exactly one space between '{a}' and '{b}'.",
-            expected_string_a: "Expected a string and instead saw {a}.",
-            expected_style_attribute: "Excepted a style attribute, and instead saw '{a}'.",
-            expected_style_pattern: "Expected a style pattern, and instead saw '{a}'.",
-            expected_tagname_a: "Expected a tagName, and instead saw {a}.",
-            expected_type_a: "Expected a type, and instead saw {a}.",
-            for_if: "The body of a for in should be wrapped in an if " +
-                "statement to filter unwanted properties from the prototype.",
-            function_block: "Function statements should not be placed in blocks. " +
-                "Use a function expression or move the statement to the top of " +
-                "the outer function.",
-            function_eval: "The Function constructor is eval.",
-            function_loop: "Don't make functions within a loop.",
-            function_statement: "Function statements are not invocable. " +
-                "Wrap the whole function invocation in parens.",
-            function_strict: "Use the function form of 'use strict'.",
-            html_confusion_a: "HTML confusion in regular expression '<{a}'.",
-            html_handlers: "Avoid HTML event handlers.",
-            identifier_function: "Expected an identifier in an assignment " +
-                "and instead saw a function invocation.",
-            implied_evil: "Implied eval is evil. Pass a function instead of a string.",
-            infix_in: "Unexpected 'in'. Compare with undefined, or use the " +
-                "hasOwnProperty method instead.",
-            insecure_a: "Insecure '{a}'.",
-            isNaN: "Use the isNaN function to compare with NaN.",
-            lang: "lang is deprecated.",
-            leading_decimal_a: "A leading decimal point can be confused with a dot: '.{a}'.",
-            missing_a: "Missing '{a}'.",
-            missing_a_after_b: "Missing '{a}' after '{b}'.",
-            missing_option: "Missing option value.",
-            missing_property: "Missing property name.",
-            missing_space_a_b: "Missing space between '{a}' and '{b}'.",
-            missing_url: "Missing url.",
-            missing_use_strict: "Missing 'use strict' statement.",
-            mixed: "Mixed spaces and tabs.",
-            move_invocation: "Move the invocation into the parens that " +
-                "contain the function.",
-            move_var: "Move 'var' declarations to the top of the function.",
-            name_function: "Missing name in function statement.",
-            nested_comment: "Nested comment.",
-            not: "Nested not.",
-            not_a_constructor: "Do not use {a} as a constructor.",
-            not_a_defined: "'{a}' has not been fully defined yet.",
-            not_a_function: "'{a}' is not a function.",
-            not_a_label: "'{a}' is not a label.",
-            not_a_scope: "'{a}' is out of scope.",
-            not_greater: "'{a}' should not be greater than '{b}'.",
-            octal_a: "Don't use octal: '{a}'. Use '\\u....' instead.",
-            parameter_arguments_a: "Do not mutate parameter '{a}' when using 'arguments'.",
-            parameter_a_get_b: "Unexpected parameter '{a}' in get {b} function.",
-            parameter_set_a: "Expected parameter (value) in set {a} function.",
-            radix: "Missing radix parameter.",
-            read_only: "Read only.",
-            redefinition_a: "Redefinition of '{a}'.",
-            reserved_a: "Reserved name '{a}'.",
-            scanned_a_b: "{a} ({b}% scanned).",
-            slash_equal: "A regular expression literal can be confused with '/='.",
-            statement_block: "Expected to see a statement and instead saw a block.",
-            stopping: "Stopping. ",
-            strange_loop: "Strange loop.",
-            strict: "Strict violation.",
-            subscript: "['{a}'] is better written in dot notation.",
-            sync_a: "Unexpected sync method: '{a}'.",
-            tag_a_in_b: "A '<{a}>' must be within '<{b}>'.",
-            too_long: "Line too long.",
-            too_many: "Too many errors.",
-            trailing_decimal_a: "A trailing decimal point can be confused " +
-                "with a dot: '.{a}'.",
-            type: "type is unnecessary.",
-            unclosed: "Unclosed string.",
-            unclosed_comment: "Unclosed comment.",
-            unclosed_regexp: "Unclosed regular expression.",
-            unescaped_a: "Unescaped '{a}'.",
-            unexpected_a: "Unexpected '{a}'.",
-            unexpected_char_a_b: "Unexpected character '{a}' in {b}.",
-            unexpected_comment: "Unexpected comment.",
-            unexpected_else: "Unexpected 'else' after 'return'.",
-            unexpected_label_a: "Unexpected label '{a}'.",
-            unexpected_property_a: "Unexpected /*property*/ '{a}'.",
-            unexpected_space_a_b: "Unexpected space between '{a}' and '{b}'.",
-            unnecessary_initialize: "It is not necessary to initialize '{a}' " +
-                "to 'undefined'.",
-            unnecessary_use: "Unnecessary 'use strict'.",
-            unreachable_a_b: "Unreachable '{a}' after '{b}'.",
-            unrecognized_style_attribute_a: "Unrecognized style attribute '{a}'.",
-            unrecognized_tag_a: "Unrecognized tag '<{a}>'.",
-            unsafe: "Unsafe character.",
-            url: "JavaScript URL.",
-            use_array: "Use the array literal notation [].",
-            use_braces: "Spaces are hard to count. Use {{a}}.",
-            use_charAt: "Use the charAt method.",
-            use_object: "Use the object literal notation {}.",
-            use_or: "Use the || operator.",
-            use_param: "Use a named parameter.",
-            used_before_a: "'{a}' was used before it was defined.",
-            var_a_not: "Variable {a} was not declared correctly.",
-            weird_assignment: "Weird assignment.",
-            weird_condition: "Weird condition.",
-            weird_new: "Weird construction. Delete 'new'.",
-            weird_program: "Weird program.",
-            weird_relation: "Weird relation.",
-            weird_ternary: "Weird ternary.",
-            wrap_immediate: "Wrap an immediate function invocation in parentheses " +
-                "to assist the reader in understanding that the expression " +
-                "is the result of a function, and not the function itself.",
-            wrap_regexp: "Wrap the /regexp/ literal in parens to " +
-                "disambiguate the slash operator.",
-            write_is_wrong: "document.write can be a form of eval."
-        },
-        comments_off,
-        css_attribute_data,
-        css_any,
-
-        css_colorData = array_to_object([
-            "aliceblue", "antiquewhite", "aqua", "aquamarine", "azure", "beige",
-            "bisque", "black", "blanchedalmond", "blue", "blueviolet", "brown",
-            "burlywood", "cadetblue", "chartreuse", "chocolate", "coral",
-            "cornflowerblue", "cornsilk", "crimson", "cyan", "darkblue",
-            "darkcyan", "darkgoldenrod", "darkgray", "darkgreen", "darkkhaki",
-            "darkmagenta", "darkolivegreen", "darkorange", "darkorchid",
-            "darkred", "darksalmon", "darkseagreen", "darkslateblue",
-            "darkslategray", "darkturquoise", "darkviolet", "deeppink",
-            "deepskyblue", "dimgray", "dodgerblue", "firebrick", "floralwhite",
-            "forestgreen", "fuchsia", "gainsboro", "ghostwhite", "gold",
-            "goldenrod", "gray", "green", "greenyellow", "honeydew", "hotpink",
-            "indianred", "indigo", "ivory", "khaki", "lavender",
-            "lavenderblush", "lawngreen", "lemonchiffon", "lightblue",
-            "lightcoral", "lightcyan", "lightgoldenrodyellow", "lightgreen",
-            "lightpink", "lightsalmon", "lightseagreen", "lightskyblue",
-            "lightslategray", "lightsteelblue", "lightyellow", "lime",
-            "limegreen", "linen", "magenta", "maroon", "mediumaquamarine",
-            "mediumblue", "mediumorchid", "mediumpurple", "mediumseagreen",
-            "mediumslateblue", "mediumspringgreen", "mediumturquoise",
-            "mediumvioletred", "midnightblue", "mintcream", "mistyrose",
-            "moccasin", "navajowhite", "navy", "oldlace", "olive", "olivedrab",
-            "orange", "orangered", "orchid", "palegoldenrod", "palegreen",
-            "paleturquoise", "palevioletred", "papayawhip", "peachpuff",
-            "peru", "pink", "plum", "powderblue", "purple", "red", "rosybrown",
-            "royalblue", "saddlebrown", "salmon", "sandybrown", "seagreen",
-            "seashell", "sienna", "silver", "skyblue", "slateblue", "slategray",
-            "snow", "springgreen", "steelblue", "tan", "teal", "thistle",
-            "tomato", "turquoise", "violet", "wheat", "white", "whitesmoke",
-            "yellow", "yellowgreen",
-
-            "activeborder", "activecaption", "appworkspace", "background",
-            "buttonface", "buttonhighlight", "buttonshadow", "buttontext",
-            "captiontext", "graytext", "highlight", "highlighttext",
-            "inactiveborder", "inactivecaption", "inactivecaptiontext",
-            "infobackground", "infotext", "menu", "menutext", "scrollbar",
-            "threeddarkshadow", "threedface", "threedhighlight",
-            "threedlightshadow", "threedshadow", "window", "windowframe",
-            "windowtext"
-        ], true),
-
-        css_border_style,
-        css_break,
-
-        css_lengthData = {
-            '%': true,
-            'cm': true,
-            'em': true,
-            'ex': true,
-            'in': true,
-            'mm': true,
-            'pc': true,
-            'pt': true,
-            'px': true
-        },
-
-        css_media,
-        css_overflow,
-
-        descapes = {
-            'b': '\b',
-            't': '\t',
-            'n': '\n',
-            'f': '\f',
-            'r': '\r',
-            '"': '"',
-            '/': '/',
-            '\\': '\\',
-            '!': '!'
-        },
-
-        devel = array_to_object([
-            'alert', 'confirm', 'console', 'Debug', 'opera', 'prompt', 'WSH'
-        ], false),
-        directive,
-        escapes = {
-            '\b': '\\b',
-            '\t': '\\t',
-            '\n': '\\n',
-            '\f': '\\f',
-            '\r': '\\r',
-            '\'': '\\\'',
-            '"' : '\\"',
-            '/' : '\\/',
-            '\\': '\\\\'
-        },
-
-        funct,          // The current function, including the labels used in
-                        // the function, as well as (breakage),
-                        // (context), (loopage), (name), (params), (token),
-                        // (vars), (verb)
-
-        functionicity = [
-            'closure', 'exception', 'global', 'label', 'outer', 'undef',
-            'unused', 'var'
-        ],
-
-        functions,      // All of the functions
-        global_funct,   // The global body
-        global_scope,   // The global scope
-        html_tag = {
-            a:        {},
-            abbr:     {},
-            acronym:  {},
-            address:  {},
-            applet:   {},
-            area:     {empty: true, parent: ' map '},
-            article:  {},
-            aside:    {},
-            audio:    {},
-            b:        {},
-            base:     {empty: true, parent: ' head '},
-            bdo:      {},
-            big:      {},
-            blockquote: {},
-            body:     {parent: ' html noframes '},
-            br:       {empty: true},
-            button:   {},
-            canvas:   {parent: ' body p div th td '},
-            caption:  {parent: ' table '},
-            center:   {},
-            cite:     {},
-            code:     {},
-            col:      {empty: true, parent: ' table colgroup '},
-            colgroup: {parent: ' table '},
-            command:  {parent: ' menu '},
-            datalist: {},
-            dd:       {parent: ' dl '},
-            del:      {},
-            details:  {},
-            dialog:   {},
-            dfn:      {},
-            dir:      {},
-            div:      {},
-            dl:       {},
-            dt:       {parent: ' dl '},
-            em:       {},
-            embed:    {},
-            fieldset: {},
-            figure:   {},
-            font:     {},
-            footer:   {},
-            form:     {},
-            frame:    {empty: true, parent: ' frameset '},
-            frameset: {parent: ' html frameset '},
-            h1:       {},
-            h2:       {},
-            h3:       {},
-            h4:       {},
-            h5:       {},
-            h6:       {},
-            head:     {parent: ' html '},
-            header:   {},
-            hgroup:   {},
-            hr:       {empty: true},
-            'hta:application':
-                      {empty: true, parent: ' head '},
-            html:     {parent: '*'},
-            i:        {},
-            iframe:   {},
-            img:      {empty: true},
-            input:    {empty: true},
-            ins:      {},
-            kbd:      {},
-            keygen:   {},
-            label:    {},
-            legend:   {parent: ' details fieldset figure '},
-            li:       {parent: ' dir menu ol ul '},
-            link:     {empty: true, parent: ' head '},
-            map:      {},
-            mark:     {},
-            menu:     {},
-            meta:     {empty: true, parent: ' head noframes noscript '},
-            meter:    {},
-            nav:      {},
-            noframes: {parent: ' html body '},
-            noscript: {parent: ' body head noframes '},
-            object:   {},
-            ol:       {},
-            optgroup: {parent: ' select '},
-            option:   {parent: ' optgroup select '},
-            output:   {},
-            p:        {},
-            param:    {empty: true, parent: ' applet object '},
-            pre:      {},
-            progress: {},
-            q:        {},
-            rp:       {},
-            rt:       {},
-            ruby:     {},
-            samp:     {},
-            script:   {empty: true, parent: ' body div frame head iframe p pre span '},
-            section:  {},
-            select:   {},
-            small:    {},
-            span:     {},
-            source:   {},
-            strong:   {},
-            style:    {parent: ' head ', empty: true},
-            sub:      {},
-            sup:      {},
-            table:    {},
-            tbody:    {parent: ' table '},
-            td:       {parent: ' tr '},
-            textarea: {},
-            tfoot:    {parent: ' table '},
-            th:       {parent: ' tr '},
-            thead:    {parent: ' table '},
-            time:     {},
-            title:    {parent: ' head '},
-            tr:       {parent: ' table tbody thead tfoot '},
-            tt:       {},
-            u:        {},
-            ul:       {},
-            'var':    {},
-            video:    {}
-        },
-
-        ids,            // HTML ids
-        in_block,
-        indent,
-        itself,         // JSLint itself
-        json_mode,
-        lex,            // the tokenizer
-        lines,
-        lookahead,
-        node = array_to_object([
-            'Buffer', 'clearInterval', 'clearTimeout', 'console', 'exports',
-            'global', 'module', 'process', 'querystring', 'require',
-            'setInterval', 'setTimeout', '__dirname', '__filename'
-        ], false),
-        node_js,
-        numbery = array_to_object(['indexOf', 'lastIndexOf', 'search'], true),
-        next_token,
-        option,
-        predefined,     // Global variables defined by option
-        prereg,
-        prev_token,
-        property,
-        regexp_flag = array_to_object(['g', 'i', 'm'], true),
-        return_this = function return_this() {
-            return this;
-        },
-        rhino = array_to_object([
-            'defineClass', 'deserialize', 'gc', 'help', 'load', 'loadClass',
-            'print', 'quit', 'readFile', 'readUrl', 'runCommand', 'seal',
-            'serialize', 'spawn', 'sync', 'toint32', 'version'
-        ], false),
-
-        scope,      // An object containing an object for each variable in scope
-        semicolon_coda = array_to_object([';', '"', '\'', ')'], true),
-        src,
-        stack,
-
-// standard contains the global names that are provided by the
-// ECMAScript standard.
-
-        standard = array_to_object([
-            'Array', 'Boolean', 'Date', 'decodeURI', 'decodeURIComponent',
-            'encodeURI', 'encodeURIComponent', 'Error', 'eval', 'EvalError',
-            'Function', 'isFinite', 'isNaN', 'JSON', 'Math', 'Number',
-            'Object', 'parseInt', 'parseFloat', 'RangeError', 'ReferenceError',
-            'RegExp', 'String', 'SyntaxError', 'TypeError', 'URIError'
-        ], false),
-
-        strict_mode,
-        syntax = {},
-        tab,
-        token,
-        urls,
-        var_mode,
-        warnings,
-
-// widget contains the global names which are provided to a Yahoo
-// (fna Konfabulator) widget.
-
-        widget = array_to_object([
-            'alert', 'animator', 'appleScript', 'beep', 'bytesToUIString',
-            'Canvas', 'chooseColor', 'chooseFile', 'chooseFolder',
-            'closeWidget', 'COM', 'convertPathToHFS', 'convertPathToPlatform',
-            'CustomAnimation', 'escape', 'FadeAnimation', 'filesystem', 'Flash',
-            'focusWidget', 'form', 'FormField', 'Frame', 'HotKey', 'Image',
-            'include', 'isApplicationRunning', 'iTunes', 'konfabulatorVersion',
-            'log', 'md5', 'MenuItem', 'MoveAnimation', 'openURL', 'play',
-            'Point', 'popupMenu', 'preferenceGroups', 'preferences', 'print',
-            'prompt', 'random', 'Rectangle', 'reloadWidget', 'ResizeAnimation',
-            'resolvePath', 'resumeUpdates', 'RotateAnimation', 'runCommand',
-            'runCommandInBg', 'saveAs', 'savePreferences', 'screen',
-            'ScrollBar', 'showWidgetPreferences', 'sleep', 'speak', 'Style',
-            'suppressUpdates', 'system', 'tellWidget', 'Text', 'TextArea',
-            'Timer', 'unescape', 'updateNow', 'URL', 'Web', 'widget', 'Window',
-            'XMLDOM', 'XMLHttpRequest', 'yahooCheckLogin', 'yahooLogin',
-            'yahooLogout'
-        ], true),
-
-        windows = array_to_object([
-            'ActiveXObject', 'CScript', 'Debug', 'Enumerator', 'System',
-            'VBArray', 'WScript', 'WSH'
-        ], false),
-
-//  xmode is used to adapt to the exceptions in html parsing.
-//  It can have these states:
-//      ''      .js script file
-//      'html'
-//      'outer'
-//      'script'
-//      'style'
-//      'scriptstring'
-//      'styleproperty'
-
-        xmode,
-        xquote,
-
-// Regular expressions. Some of these are stupidly long.
-
-// unsafe comment or string
-        ax = /@cc|<\/?|script|\]\s*\]|<\s*!|&lt/i,
-// carriage return, carriage return linefeed, or linefeed
-        crlfx = /\r\n?|\n/,
-// unsafe characters that are silently deleted by one or more browsers
-        cx = /[\u0000-\u001f\u007f-\u009f\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/,
-// query characters for ids
-        dx = /[\[\]\/\\"'*<>.&:(){}+=#]/,
-// html token
-        hx = /^\s*(['"=>\/&#]|<(?:\/|\!(?:--)?)?|[a-zA-Z][a-zA-Z0-9_\-:]*|[0-9]+|--)/,
-// identifier
-        ix = /^([a-zA-Z_$][a-zA-Z0-9_$]*)$/,
-// javascript url
-        jx = /^(?:javascript|jscript|ecmascript|vbscript|mocha|livescript)\s*:/i,
-// star slash
-        lx = /\*\/|\/\*/,
-// characters in strings that need escapement
-        nx = /[\u0000-\u001f'\\\u007f-\u009f\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g,
-// outer html token
-        ox = /[>&]|<[\/!]?|--/,
-// attributes characters
-        qx = /[^a-zA-Z0-9+\-_\/. ]/,
-// style
-        sx = /^\s*([{}:#%.=,>+\[\]@()"';]|[*$\^~]=|[a-zA-Z_][a-zA-Z0-9_\-]*|[0-9]+|<\/|\/\*)/,
-        ssx = /^\s*([@#!"'};:\-%.=,+\[\]()*_]|[a-zA-Z][a-zA-Z0-9._\-]*|\/\*?|\d+(?:\.\d+)?|<\/)/,
-// token
-        tx = /^\s*([(){}\[\]\?.,:;'"~#@`]|={1,3}|\/(\*(jslint|properties|property|members?|globals?)?|=|\/)?|\*[\/=]?|\+(?:=|\++)?|-(?:=|-+)?|[\^%]=?|&[&=]?|\|[|=]?|>{1,3}=?|<(?:[\/=!]|\!(\[|--)?|<=?)?|\!={0,2}|[a-zA-Z_$][a-zA-Z0-9_$]*|[0-9]+(?:[xX][0-9a-fA-F]+|\.[0-9]*)?(?:[eE][+\-]?[0-9]+)?)/,
-// url badness
-        ux = /&|\+|\u00AD|\.\.|\/\*|%[^;]|base64|url|expression|data|mailto|script/i,
-
-        rx = {
-            outer: hx,
-            html: hx,
-            style: sx,
-            styleproperty: ssx
-        };
-
-
-    function F() {}     // Used by Object.create
-
-// Provide critical ES5 functions to ES3.
-
-    if (typeof Array.prototype.filter !== 'function') {
-        Array.prototype.filter = function (f) {
-            var i, length = this.length, result = [], value;
-            for (i = 0; i < length; i += 1) {
-                try {
-                    value = this[i];
-                    if (f(value)) {
-                        result.push(value);
-                    }
-                } catch (ignore) {
-                }
-            }
-            return result;
-        };
-    }
-
-    if (typeof Array.prototype.forEach !== 'function') {
-        Array.prototype.forEach = function (f) {
-            var i, length = this.length;
-            for (i = 0; i < length; i += 1) {
-                try {
-                    f(this[i]);
-                } catch (ignore) {
-                }
-            }
-        };
-    }
-
-    if (typeof Array.isArray !== 'function') {
-        Array.isArray = function (o) {
-            return Object.prototype.toString.apply(o) === '[object Array]';
-        };
-    }
-
-    if (!Object.prototype.hasOwnProperty.call(Object, 'create')) {
-        Object.create = function (o) {
-            F.prototype = o;
-            return new F();
-        };
-    }
-
-    if (typeof Object.keys !== 'function') {
-        Object.keys = function (o) {
-            var array = [], key;
-            for (key in o) {
-                if (Object.prototype.hasOwnProperty.call(o, key)) {
-                    array.push(key);
-                }
-            }
-            return array;
-        };
-    }
-
-    if (typeof String.prototype.entityify !== 'function') {
-        String.prototype.entityify = function () {
-            return this
-                .replace(/&/g, '&amp;')
-                .replace(/</g, '&lt;')
-                .replace(/>/g, '&gt;');
-        };
-    }
-
-    if (typeof String.prototype.isAlpha !== 'function') {
-        String.prototype.isAlpha = function () {
-            return (this >= 'a' && this <= 'z\uffff') ||
-                (this >= 'A' && this <= 'Z\uffff');
-        };
-    }
-
-    if (typeof String.prototype.isDigit !== 'function') {
-        String.prototype.isDigit = function () {
-            return (this >= '0' && this <= '9');
-        };
-    }
-
-    if (typeof String.prototype.supplant !== 'function') {
-        String.prototype.supplant = function (o) {
-            return this.replace(/\{([^{}]*)\}/g, function (a, b) {
-                var replacement = o[b];
-                return typeof replacement === 'string' ||
-                    typeof replacement === 'number' ? replacement : a;
-            });
-        };
-    }
-
-
-    function sanitize(a) {
-
-//  Escapify a troublesome character.
-
-        return escapes[a] ||
-            '\\u' + ('0000' + a.charCodeAt().toString(16)).slice(-4);
-    }
-
-
-    function add_to_predefined(group) {
-        Object.keys(group).forEach(function (name) {
-            predefined[name] = group[name];
-        });
-    }
-
-
-    function assume() {
-        if (!option.safe) {
-            if (option.rhino) {
-                add_to_predefined(rhino);
-                option.rhino = false;
-            }
-            if (option.devel) {
-                add_to_predefined(devel);
-                option.devel = false;
-            }
-            if (option.browser) {
-                add_to_predefined(browser);
-                option.browser = false;
-            }
-            if (option.windows) {
-                add_to_predefined(windows);
-                option.windows = false;
-            }
-            if (option.node) {
-                add_to_predefined(node);
-                option.node = false;
-                node_js = true;
-            }
-            if (option.widget) {
-                add_to_predefined(widget);
-                option.widget = false;
-            }
-        }
-    }
-
-
-// Produce an error warning.
-
-    function artifact(tok) {
-        if (!tok) {
-            tok = next_token;
-        }
-        return tok.number || tok.string;
-    }
-
-    function quit(message, line, character) {
-        throw {
-            name: 'JSLintError',
-            line: line,
-            character: character,
-            message: bundle.scanned_a_b.supplant({
-                a: message,
-                b: Math.floor((line / lines.length) * 100)
-            })
-        };
-    }
-
-    function warn(message, offender, a, b, c, d) {
-        var character, line, warning;
-        offender = offender || next_token;  // ~~
-        line = offender.line || 0;
-        character = offender.from || 0;
-        warning = {
-            id: '(error)',
-            raw: bundle[message] || message,
-            evidence: lines[line - 1] || '',
-            line: line,
-            character: character,
-            a: a || (offender.id === '(number)'
-                ? String(offender.number)
-                : offender.string),
-            b: b,
-            c: c,
-            d: d
-        };
-        warning.reason = warning.raw.supplant(warning);
-        JSLINT.errors.push(warning);
-        if (option.passfail) {
-            quit(bundle.stopping, line, character);
-        }
-        warnings += 1;
-        if (warnings >= option.maxerr) {
-            quit(bundle.too_many, line, character);
-        }
-        return warning;
-    }
-
-    function warn_at(message, line, character, a, b, c, d) {
-        return warn(message, {
-            line: line,
-            from: character
-        }, a, b, c, d);
-    }
-
-    function stop(message, offender, a, b, c, d) {
-        var warning = warn(message, offender, a, b, c, d);
-        quit(bundle.stopping, warning.line, warning.character);
-    }
-
-    function stop_at(message, line, character, a, b, c, d) {
-        return stop(message, {
-            line: line,
-            from: character
-        }, a, b, c, d);
-    }
-
-    function expected_at(at) {
-        if (!option.white && next_token.from !== at) {
-            warn('expected_a_at_b_c', next_token, '', at,
-                next_token.from);
-        }
-    }
-
-    function aint(it, name, expected) {
-        if (it[name] !== expected) {
-            warn('expected_a_b', it, expected, it[name]);
-            return true;
-        }
-        return false;
-    }
-
-
-// lexical analysis and token construction
-
-    lex = (function lex() {
-        var character, c, from, length, line, pos, source_row;
-
-// Private lex methods
-
-        function next_line() {
-            var at;
-            if (line >= lines.length) {
-                return false;
-            }
-            character = 1;
-            source_row = lines[line];
-            line += 1;
-            at = source_row.search(/ \t/);
-            if (at >= 0) {
-                warn_at('mixed', line, at + 1);
-            }
-            source_row = source_row.replace(/\t/g, tab);
-            at = source_row.search(cx);
-            if (at >= 0) {
-                warn_at('unsafe', line, at);
-            }
-            if (option.maxlen && option.maxlen < source_row.length) {
-                warn_at('too_long', line, source_row.length);
-            }
-            return true;
-        }
-
-// Produce a token object.  The token inherits from a syntax symbol.
-
-        function it(type, value) {
-            var id, the_token;
-            if (type === '(string)' || type === '(range)') {
-                if (jx.test(value)) {
-                    warn_at('url', line, from);
-                }
-            }
-            the_token = Object.create(syntax[(
-                type === '(punctuator)' || (type === '(identifier)' &&
-                        Object.prototype.hasOwnProperty.call(syntax, value))
-                    ? value
-                    : type
-            )] || syntax['(error)']);
-            if (type === '(identifier)') {
-                the_token.identifier = true;
-                if (value === '__iterator__' || value === '__proto__') {
-                    stop_at('reserved_a', line, from, value);
-                } else if (!option.nomen &&
-                        (value.charAt(0) === '_' ||
-                        value.charAt(value.length - 1) === '_')) {
-                    warn_at('dangling_a', line, from, value);
-                }
-            }
-            if (type === '(number)') {
-                the_token.number = +value;
-            } else if (value !== undefined) {
-                the_token.string = String(value);
-            }
-            the_token.line = line;
-            the_token.from = from;
-            the_token.thru = character;
-            id = the_token.id;
-            prereg = id && (
-                ('(,=:[!&|?{};'.indexOf(id.charAt(id.length - 1)) >= 0) ||
-                id === 'return' || id === 'case'
-            );
-            return the_token;
-        }
-
-        function match(x) {
-            var exec = x.exec(source_row), first;
-            if (exec) {
-                length = exec[0].length;
-                first = exec[1];
-                c = first.charAt(0);
-                source_row = source_row.slice(length);
-                from = character + length - first.length;
-                character += length;
-                return first;
-            }
-        }
-
-        function string(x) {
-            var c, pos = 0, r = '', result;
-
-            function hex(n) {
-                var i = parseInt(source_row.substr(pos + 1, n), 16);
-                pos += n;
-                if (i >= 32 && i <= 126 &&
-                        i !== 34 && i !== 92 && i !== 39) {
-                    warn_at('unexpected_a', line, character, '\\');
-                }
-                character += n;
-                c = String.fromCharCode(i);
-            }
-
-            if (json_mode && x !== '"') {
-                warn_at('expected_a', line, character, '"');
-            }
-
-            if (xquote === x || (xmode === 'scriptstring' && !xquote)) {
-                return it('(punctuator)', x);
-            }
-
-            for (;;) {
-                while (pos >= source_row.length) {
-                    pos = 0;
-                    if (xmode !== 'html' || !next_line()) {
-                        stop_at('unclosed', line, from);
-                    }
-                }
-                c = source_row.charAt(pos);
-                if (c === x) {
-                    character += 1;
-                    source_row = source_row.slice(pos + 1);
-                    result = it('(string)', r);
-                    result.quote = x;
-                    return result;
-                }
-                if (c < ' ') {
-                    if (c === '\n' || c === '\r') {
-                        break;
-                    }
-                    warn_at('control_a', line, character + pos,
-                        source_row.slice(0, pos));
-                } else if (c === xquote) {
-                    warn_at('bad_html', line, character + pos);
-                } else if (c === '<') {
-                    if (option.safe && xmode === 'html') {
-                        warn_at('adsafe_a', line, character + pos, c);
-                    } else if (source_row.charAt(pos + 1) === '/' && (xmode || option.safe)) {
-                        warn_at('expected_a_b', line, character,
-                            '<\\/', '</');
-                    } else if (source_row.charAt(pos + 1) === '!' && (xmode || option.safe)) {
-                        warn_at('unexpected_a', line, character, '<!');
-                    }
-                } else if (c === '\\') {
-                    if (xmode === 'html') {
-                        if (option.safe) {
-                            warn_at('adsafe_a', line, character + pos, c);
-                        }
-                    } else if (xmode === 'styleproperty') {
-                        pos += 1;
-                        character += 1;
-                        c = source_row.charAt(pos);
-                        if (c !== x) {
-                            warn_at('unexpected_a', line, character, '\\');
-                        }
-                    } else {
-                        pos += 1;
-                        character += 1;
-                        c = source_row.charAt(pos);
-                        switch (c) {
-                        case '':
-                            if (!option.es5) {
-                                warn_at('es5', line, character);
-                            }
-                            next_line();
-                            pos = -1;
-                            break;
-                        case xquote:
-                            warn_at('bad_html', line, character + pos);
-                            break;
-                        case '\'':
-                            if (json_mode) {
-                                warn_at('unexpected_a', line, character, '\\\'');
-                            }
-                            break;
-                        case 'u':
-                            hex(4);
-                            break;
-                        case 'v':
-                            if (json_mode) {
-                                warn_at('unexpected_a', line, character, '\\v');
-                            }
-                            c = '\v';
-                            break;
-                        case 'x':
-                            if (json_mode) {
-                                warn_at('unexpected_a', line, character, '\\x');
-                            }
-                            hex(2);
-                            break;
-                        default:
-                            if (typeof descapes[c] !== 'string') {
-                                warn_at(c >= '0' && c <= '7' ? 'octal_a' : 'unexpected_a',
-                                    line, character, '\\' + c);
-                            } else {
-                                c = descapes[c];
-                            }
-                        }
-                    }
-                }
-                r += c;
-                character += 1;
-                pos += 1;
-            }
-        }
-
-        function number(snippet) {
-            var digit;
-            if (xmode !== 'style' && xmode !== 'styleproperty' &&
-                    source_row.charAt(0).isAlpha()) {
-                warn_at('expected_space_a_b',
-                    line, character, c, source_row.charAt(0));
-            }
-            if (c === '0') {
-                digit = snippet.charAt(1);
-                if (digit.isDigit()) {
-                    if (token.id !== '.' && xmode !== 'styleproperty') {
-                        warn_at('unexpected_a', line, character, snippet);
-                    }
-                } else if (json_mode && (digit === 'x' || digit === 'X')) {
-                    warn_at('unexpected_a', line, character, '0x');
-                }
-            }
-            if (snippet.slice(snippet.length - 1) === '.') {
-                warn_at('trailing_decimal_a', line, character, snippet);
-            }
-            if (xmode !== 'style') {
-                digit = +snippet;
-                if (!isFinite(digit)) {
-                    warn_at('bad_number', line, character, snippet);
-                }
-                snippet = digit;
-            }
-            return it('(number)', snippet);
-        }
-
-        function comment(snippet) {
-            if (comments_off || src || (xmode && xmode !== 'script' &&
-                    xmode !== 'style' && xmode !== 'styleproperty')) {
-                warn_at('unexpected_comment', line, character);
-            } else if (xmode === 'script' && /<\//i.test(source_row)) {
-                warn_at('unexpected_a', line, character, '<\/');
-            } else if (option.safe && ax.test(snippet)) {
-                warn_at('dangerous_comment', line, character);
-            }
-        }
-
-        function regexp() {
-            var b,
-                bit,
-                captures = 0,
-                depth = 0,
-                flag = '',
-                high,
-                letter,
-                length = 0,
-                low,
-                potential,
-                quote,
-                result;
-            for (;;) {
-                b = true;
-                c = source_row.charAt(length);
-                length += 1;
-                switch (c) {
-                case '':
-                    stop_at('unclosed_regexp', line, from);
-                    return;
-                case '/':
-                    if (depth > 0) {
-                        warn_at('unescaped_a', line, from + length, '/');
-                    }
-                    c = source_row.slice(0, length - 1);
-                    potential = Object.create(regexp_flag);
-                    for (;;) {
-                        letter = source_row.charAt(length);
-                        if (potential[letter] !== true) {
-                            break;
-                        }
-                        potential[letter] = false;
-                        length += 1;
-                        flag += letter;
-                    }
-                    if (source_row.charAt(length).isAlpha()) {
-                        stop_at('unexpected_a', line, from, source_row.charAt(length));
-                    }
-                    character += length;
-                    source_row = source_row.slice(length);
-                    quote = source_row.charAt(0);
-                    if (quote === '/' || quote === '*') {
-                        stop_at('confusing_regexp', line, from);
-                    }
-                    result = it('(regexp)', c);
-                    result.flag = flag;
-                    return result;
-                case '\\':
-                    c = source_row.charAt(length);
-                    if (c < ' ') {
-                        warn_at('control_a', line, from + length, String(c));
-                    } else if (c === '<') {
-                        warn_at(bundle.unexpected_a, line, from + length, '\\');
-                    }
-                    length += 1;
-                    break;
-                case '(':
-                    depth += 1;
-                    b = false;
-                    if (source_row.charAt(length) === '?') {
-                        length += 1;
-                        switch (source_row.charAt(length)) {
-                        case ':':
-                        case '=':
-                        case '!':
-                            length += 1;
-                            break;
-                        default:
-                            warn_at(bundle.expected_a_b, line, from + length,
-                                ':', source_row.charAt(length));
-                        }
-                    } else {
-                        captures += 1;
-                    }
-                    break;
-                case '|':
-                    b = false;
-                    break;
-                case ')':
-                    if (depth === 0) {
-                        warn_at('unescaped_a', line, from + length, ')');
-                    } else {
-                        depth -= 1;
-                    }
-                    break;
-                case ' ':
-                    pos = 1;
-                    while (source_row.charAt(length) === ' ') {
-                        length += 1;
-                        pos += 1;
-                    }
-                    if (pos > 1) {
-                        warn_at('use_braces', line, from + length, pos);
-                    }
-                    break;
-                case '[':
-                    c = source_row.charAt(length);
-                    if (c === '^') {
-                        length += 1;
-                        if (!option.regexp) {
-                            warn_at('insecure_a', line, from + length, c);
-                        } else if (source_row.charAt(length) === ']') {
-                            stop_at('unescaped_a', line, from + length, '^');
-                        }
-                    }
-                    bit = false;
-                    if (c === ']') {
-                        warn_at('empty_class', line, from + length - 1);
-                        bit = true;
-                    }
-klass:              do {
-                        c = source_row.charAt(length);
-                        length += 1;
-                        switch (c) {
-                        case '[':
-                        case '^':
-                            warn_at('unescaped_a', line, from + length, c);
-                            bit = true;
-                            break;
-                        case '-':
-                            if (bit) {
-                                bit = false;
-                            } else {
-                                warn_at('unescaped_a', line, from + length, '-');
-                                bit = true;
-                            }
-                            break;
-                        case ']':
-                            if (!bit) {
-                                warn_at('unescaped_a', line, from + length - 1, '-');
-                            }
-                            break klass;
-                        case '\\':
-                            c = source_row.charAt(length);
-                            if (c < ' ') {
-                                warn_at(bundle.control_a, line, from + length, String(c));
-                            } else if (c === '<') {
-                                warn_at(bundle.unexpected_a, line, from + length, '\\');
-                            }
-                            length += 1;
-                            bit = true;
-                            break;
-                        case '/':
-                            warn_at('unescaped_a', line, from + length - 1, '/');
-                            bit = true;
-                            break;
-                        case '<':
-                            if (xmode === 'script') {
-                                c = source_row.charAt(length);
-                                if (c === '!' || c === '/') {
-                                    warn_at(bundle.html_confusion_a, line,
-                                        from + length, c);
-                                }
-                            }
-                            bit = true;
-                            break;
-                        default:
-                            bit = true;
-                        }
-                    } while (c);
-                    break;
-                case '.':
-                    if (!option.regexp) {
-                        warn_at('insecure_a', line, from + length, c);
-                    }
-                    break;
-                case ']':
-                case '?':
-                case '{':
-                case '}':
-                case '+':
-                case '*':
-                    warn_at('unescaped_a', line, from + length, c);
-                    break;
-                case '<':
-                    if (xmode === 'script') {
-                        c = source_row.charAt(length);
-                        if (c === '!' || c === '/') {
-                            warn_at(bundle.html_confusion_a, line, from + length, c);
-                        }
-                    }
-                    break;
-                }
-                if (b) {
-                    switch (source_row.charAt(length)) {
-                    case '?':
-                    case '+':
-                    case '*':
-                        length += 1;
-                        if (source_row.charAt(length) === '?') {
-                            length += 1;
-                        }
-                        break;
-                    case '{':
-                        length += 1;
-                        c = source_row.charAt(length);
-                        if (c < '0' || c > '9') {
-                            warn_at(bundle.expected_number_a, line,
-                                from + length, c);
-                        }
-                        length += 1;
-                        low = +c;
-                        for (;;) {
-                            c = source_row.charAt(length);
-                            if (c < '0' || c > '9') {
-                                break;
-                            }
-                            length += 1;
-                            low = +c + (low * 10);
-                        }
-                        high = low;
-                        if (c === ',') {
-                            length += 1;
-                            high = Infinity;
-                            c = source_row.charAt(length);
-                            if (c >= '0' && c <= '9') {
-                                length += 1;
-                                high = +c;
-                                for (;;) {
-                                    c = source_row.charAt(length);
-                                    if (c < '0' || c > '9') {
-                                        break;
-                                    }
-                                    length += 1;
-                                    high = +c + (high * 10);
-                                }
-                            }
-                        }
-                        if (source_row.charAt(length) !== '}') {
-                            warn_at(bundle.expected_a_b, line, from + length,
-                                '}', c);
-                        } else {
-                            length += 1;
-                        }
-                        if (source_row.charAt(length) === '?') {
-                            length += 1;
-                        }
-                        if (low > high) {
-                            warn_at(bundle.not_greater, line, from + length,
-                                low, high);
-                        }
-                        break;
-                    }
-                }
-            }
-            c = source_row.slice(0, length - 1);
-            character += length;
-            source_row = source_row.slice(length);
-            return it('(regexp)', c);
-        }
-
-// Public lex methods
-
-        return {
-            init: function (source) {
-                if (typeof source === 'string') {
-                    lines = source.split(crlfx);
-                } else {
-                    lines = source;
-                }
-                line = 0;
-                next_line();
-                from = 1;
-            },
-
-            range: function (begin, end) {
-                var c, value = '';
-                from = character;
-                if (source_row.charAt(0) !== begin) {
-                    stop_at('expected_a_b', line, character, begin,
-                        source_row.charAt(0));
-                }
-                for (;;) {
-                    source_row = source_row.slice(1);
-                    character += 1;
-                    c = source_row.charAt(0);
-                    switch (c) {
-                    case '':
-                        stop_at('missing_a', line, character, c);
-                        break;
-                    case end:
-                        source_row = source_row.slice(1);
-                        character += 1;
-                        return it('(range)', value);
-                    case xquote:
-                    case '\\':
-                        warn_at('unexpected_a', line, character, c);
-                        break;
-                    }
-                    value += c;
-                }
-            },
-
-// token -- this is called by advance to get the next token.
-
-            token: function () {
-                var c, i, snippet;
-
-                for (;;) {
-                    while (!source_row) {
-                        if (!next_line()) {
-                            return it('(end)');
-                        }
-                    }
-                    while (xmode === 'outer') {
-                        i = source_row.search(ox);
-                        if (i === 0) {
-                            break;
-                        } else if (i > 0) {
-                            character += 1;
-                            source_row = source_row.slice(i);
-                            break;
-                        } else {
-                            if (!next_line()) {
-                                return it('(end)', '');
-                            }
-                        }
-                    }
-                    snippet = match(rx[xmode] || tx);
-                    if (!snippet) {
-                        if (source_row) {
-                            if (source_row.charAt(0) === ' ') {
-                                if (!option.white) {
-                                    warn_at('unexpected_a', line, character,
-                                        '(space)');
-                                }
-                                character += 1;
-                                source_row = '';
-                            } else {
-                                stop_at('unexpected_a', line, character,
-                                    source_row.charAt(0));
-                            }
-                        }
-                    } else {
-
-//      identifier
-
-                        c = snippet.charAt(0);
-                        if (c.isAlpha() || c === '_' || c === '$') {
-                            return it('(identifier)', snippet);
-                        }
-
-//      number
-
-                        if (c.isDigit()) {
-                            return number(snippet);
-                        }
-                        switch (snippet) {
-
-//      string
-
-                        case '"':
-                        case "'":
-                            return string(snippet);
-
-//      // comment
-
-                        case '//':
-                            comment(source_row);
-                            source_row = '';
-                            break;
-
-//      /* comment
-
-                        case '/*':
-                            for (;;) {
-                                i = source_row.search(lx);
-                                if (i >= 0) {
-                                    break;
-                                }
-                                comment(source_row);
-                                if (!next_line()) {
-                                    stop_at('unclosed_comment', line, character);
-                                }
-                            }
-                            comment(source_row.slice(0, i));
-                            character += i + 2;
-                            if (source_row.charAt(i) === '/') {
-                                stop_at('nested_comment', line, character);
-                            }
-                            source_row = source_row.slice(i + 2);
-                            break;
-
-                        case '':
-                            break;
-//      /
-                        case '/':
-                            if (token.id === '/=') {
-                                stop_at(
-                                    bundle.slash_equal,
-                                    line,
-                                    from
-                                );
-                            }
-                            return prereg
-                                ? regexp()
-                                : it('(punctuator)', snippet);
-
-//      punctuator
-
-                        case '<!--':
-                            length = line;
-//                            c = character;
-                            for (;;) {
-                                i = source_row.indexOf('--');
-                                if (i >= 0) {
-                                    break;
-                                }
-                                i = source_row.indexOf('<!');
-                                if (i >= 0) {
-                                    stop_at('nested_comment',
-                                        line, character + i);
-                                }
-                                if (!next_line()) {
-                                    stop_at('unclosed_comment', length, c);
-                                }
-                            }
-                            length = source_row.indexOf('<!');
-                            if (length >= 0 && length < i) {
-                                stop_at('nested_comment',
-                                    line, character + length);
-                            }
-                            character += i;
-                            if (source_row.charAt(i + 2) !== '>') {
-                                stop_at('expected_a', line, character, '-->');
-                            }
-                            character += 3;
-                            source_row = source_row.slice(i + 3);
-                            break;
-                        case '#':
-                            if (xmode === 'html' || xmode === 'styleproperty') {
-                                for (;;) {
-                                    c = source_row.charAt(0);
-                                    if ((c < '0' || c > '9') &&
-                                            (c < 'a' || c > 'f') &&
-                                            (c < 'A' || c > 'F')) {
-                                        break;
-                                    }
-                                    character += 1;
-                                    source_row = source_row.slice(1);
-                                    snippet += c;
-                                }
-                                if (snippet.length !== 4 && snippet.length !== 7) {
-                                    warn_at('bad_color_a', line,
-                                        from + length, snippet);
-                                }
-                                return it('(color)', snippet);
-                            }
-                            return it('(punctuator)', snippet);
-
-                        default:
-                            if (xmode === 'outer' && c === '&') {
-                                character += 1;
-                                source_row = source_row.slice(1);
-                                for (;;) {
-                                    c = source_row.charAt(0);
-                                    character += 1;
-                                    source_row = source_row.slice(1);
-                                    if (c === ';') {
-                                        break;
-                                    }
-                                    if (!((c >= '0' && c <= '9') ||
-                                            (c >= 'a' && c <= 'z') ||
-                                            c === '#')) {
-                                        stop_at('bad_entity', line, from + length,
-                                            character);
-                                    }
-                                }
-                                break;
-                            }
-                            return it('(punctuator)', snippet);
-                        }
-                    }
-                }
-            }
-        };
-    }());
-
-
-    function add_label(token, kind, name) {
-
-// Define the symbol in the current function in the current scope.
-
-        name = name || token.string;
-
-// Global variables cannot be created in the safe subset. If a global variable
-// already exists, do nothing. If it is predefined, define it.
-
-        if (funct === global_funct) {
-            if (option.safe) {
-                warn('adsafe_a', token, name);
-            }
-            if (typeof global_funct[name] !== 'string') {
-                token.writeable = typeof predefined[name] === 'boolean'
-                    ? predefined[name]
-                    : true;
-                token.funct = funct;
-                global_scope[name] = token;
-            }
-            if (kind === 'becoming') {
-                kind = 'var';
-            }
-
-// Ordinary variables.
-
-        } else {
-
-// Warn if the variable already exists.
-
-            if (typeof funct[name] === 'string') {
-                if (funct[name] === 'undef') {
-                    if (!option.undef) {
-                        warn('used_before_a', token, name);
-                    }
-                    kind = 'var';
-                } else {
-                    warn('already_defined', token, name);
-                }
-            } else {
-
-// Add the symbol to the current function.
-
-                token.funct = funct;
-                token.writeable = true;
-                scope[name] = token;
-            }
-        }
-        funct[name] = kind;
-    }
-
-
-    function peek(distance) {
-
-// Peek ahead to a future token. The distance is how far ahead to look. The
-// default is the next token.
-
-        var found, slot = 0;
-
-        distance = distance || 0;
-        while (slot <= distance) {
-            found = lookahead[slot];
-            if (!found) {
-                found = lookahead[slot] = lex.token();
-            }
-            slot += 1;
-        }
-        return found;
-    }
-
-
-    function advance(id, match) {
-
-// Produce the next token, also looking for programming errors.
-
-        if (indent) {
-
-// If indentation checking was requested, then inspect all of the line breakings.
-// The var statement is tricky because the names might be aligned or not. We
-// look at the first line break after the var to determine the programmer's
-// intention.
-
-            if (var_mode && next_token.line !== token.line) {
-                if ((var_mode !== indent || !next_token.edge) &&
-                        next_token.from === indent.at -
-                        (next_token.edge ? option.indent : 0)) {
-                    var dent = indent;
-                    for (;;) {
-                        dent.at -= option.indent;
-                        if (dent === var_mode) {
-                            break;
-                        }
-                        dent = dent.was;
-                    }
-                    dent.open = false;
-                }
-                var_mode = null;
-            }
-            if (next_token.id === '?' && indent.mode === ':' &&
-                    token.line !== next_token.line) {
-                indent.at -= option.indent;
-            }
-            if (indent.open) {
-
-// If the token is an edge.
-
-                if (next_token.edge) {
-                    if (next_token.edge === 'label') {
-                        expected_at(1);
-                    } else if (next_token.edge === 'case' || indent.mode === 'statement') {
-                        expected_at(indent.at - option.indent);
-                    } else if (indent.mode !== 'array' || next_token.line !== token.line) {
-                        expected_at(indent.at);
-                    }
-
-// If the token is not an edge, but is the first token on the line.
-
-                } else if (next_token.line !== token.line) {
-                    if (next_token.from < indent.at + (indent.mode ===
-                            'expression' ? 0 : option.indent)) {
-                        expected_at(indent.at + option.indent);
-                    }
-                    indent.wrap = true;
-                }
-            } else if (next_token.line !== token.line) {
-                if (next_token.edge) {
-                    expected_at(indent.at);
-                } else {
-                    indent.wrap = true;
-                    if (indent.mode === 'statement' || indent.mode === 'var') {
-                        expected_at(indent.at + option.indent);
-                    } else if (next_token.from < indent.at + (indent.mode ===
-                            'expression' ? 0 : option.indent)) {
-                        expected_at(indent.at + option.indent);
-                    }
-                }
-            }
-        }
-
-        switch (token.id) {
-        case '(number)':
-            if (next_token.id === '.') {
-                warn('trailing_decimal_a');
-            }
-            break;
-        case '-':
-            if (next_token.id === '-' || next_token.id === '--') {
-                warn('confusing_a');
-            }
-            break;
-        case '+':
-            if (next_token.id === '+' || next_token.id === '++') {
-                warn('confusing_a');
-            }
-            break;
-        }
-        if (token.id === '(string)' || token.identifier) {
-            anonname = token.string;
-        }
-
-        if (id && next_token.id !== id) {
-            if (match) {
-                warn('expected_a_b_from_c_d', next_token, id,
-                    match.id, match.line, artifact());
-            } else if (!next_token.identifier || next_token.string !== id) {
-                warn('expected_a_b', next_token, id, artifact());
-            }
-        }
-        prev_token = token;
-        token = next_token;
-        next_token = lookahead.shift() || lex.token();
-    }
-
-
-    function advance_identifier(string) {
-        if (next_token.identifier && next_token.string === string) {
-            advance();
-        } else {
-            warn('expected_a_b', next_token, string, artifact());
-        }
-    }
-
-
-    function do_safe() {
-        if (option.adsafe) {
-            option.safe = true;
-        }
-        if (option.safe) {
-            option.browser     =
-                option['continue'] =
-                option.css     =
-                option.debug   =
-                option.devel   =
-                option.evil    =
-                option.forin   =
-                option.newcap  =
-                option.nomen   =
-                option.on      =
-                option.rhino   =
-                option.sloppy  =
-                option.sub     =
-                option.undef   =
-                option.widget  =
-                option.windows = false;
-
-
-            delete predefined.Array;
-            delete predefined.Date;
-            delete predefined.Function;
-            delete predefined.Object;
-            delete predefined['eval'];
-
-            add_to_predefined({
-                ADSAFE: false,
-                lib: false
-            });
-        }
-    }
-
-
-    function do_globals() {
-        var name, writeable;
-        for (;;) {
-            if (next_token.id !== '(string)' && !next_token.identifier) {
-                return;
-            }
-            name = next_token.string;
-            advance();
-            writeable = false;
-            if (next_token.id === ':') {
-                advance(':');
-                switch (next_token.id) {
-                case 'true':
-                    writeable = predefined[name] !== false;
-                    advance('true');
-                    break;
-                case 'false':
-                    advance('false');
-                    break;
-                default:
-                    stop('unexpected_a');
-                }
-            }
-            predefined[name] = writeable;
-            if (next_token.id !== ',') {
-                return;
-            }
-            advance(',');
-        }
-    }
-
-
-    function do_jslint() {
-        var name, value;
-        while (next_token.id === '(string)' || next_token.identifier) {
-            name = next_token.string;
-            if (!allowed_option[name]) {
-                stop('unexpected_a');
-            }
-            advance();
-            if (next_token.id !== ':') {
-                stop('expected_a_b', next_token, ':', artifact());
-            }
-            advance(':');
-            if (typeof allowed_option[name] === 'number') {
-                value = next_token.number;
-                if (value > allowed_option[name] || value <= 0 ||
-                        Math.floor(value) !== value) {
-                    stop('expected_small_a');
-                }
-                option[name] = value;
-            } else {
-                if (next_token.id === 'true') {
-                    option[name] = true;
-                } else if (next_token.id === 'false') {
-                    option[name] = false;
-                } else {
-                    stop('unexpected_a');
-                }
-            }
-            advance();
-            if (next_token.id === ',') {
-                advance(',');
-            }
-        }
-        assume();
-    }
-
-
-    function do_properties() {
-        var name;
-        option.properties = true;
-        for (;;) {
-            if (next_token.id !== '(string)' && !next_token.identifier) {
-                return;
-            }
-            name = next_token.string;
-            advance();
-            if (next_token.id === ':') {
-                for (;;) {
-                    advance();
-                    if (next_token.id !== '(string)' && !next_token.identifier) {
-                        break;
-                    }
-                }
-            }
-            property[name] = 0;
-            if (next_token.id !== ',') {
-                return;
-            }
-            advance(',');
-        }
-    }
-
-
-    directive = function directive() {
-        var command = this.id,
-            old_comments_off = comments_off,
-            old_indent = indent;
-        comments_off = true;
-        indent = null;
-        if (next_token.line === token.line && next_token.from === token.thru) {
-            warn('missing_space_a_b', next_token, artifact(token), artifact());
-        }
-        if (lookahead.length > 0) {
-            warn('unexpected_a', this);
-        }
-        switch (command) {
-        case '/*properties':
-        case '/*property':
-        case '/*members':
-        case '/*member':
-            do_properties();
-            break;
-        case '/*jslint':
-            if (option.safe) {
-                warn('adsafe_a', this);
-            }
-            do_jslint();
-            break;
-        case '/*globals':
-        case '/*global':
-            if (option.safe) {
-                warn('adsafe_a', this);
-            }
-            do_globals();
-            break;
-        default:
-            stop('unexpected_a', this);
-        }
-        comments_off = old_comments_off;
-        advance('*/');
-        indent = old_indent;
-    };
-
-
-// Indentation intention
-
-    function edge(mode) {
-        next_token.edge = indent ? indent.open && (mode || 'edge') : '';
-    }
-
-
-    function step_in(mode) {
-        var open;
-        if (typeof mode === 'number') {
-            indent = {
-                at: +mode,
-                open: true,
-                was: indent
-            };
-        } else if (!indent) {
-            indent = {
-                at: 1,
-                mode: 'statement',
-                open: true
-            };
-        } else if (mode === 'statement') {
-            indent = {
-                at: indent.at,
-                open: true,
-                was: indent
-            };
-        } else {
-            open = mode === 'var' || next_token.line !== token.line;
-            indent = {
-                at: (open || mode === 'control'
-                    ? indent.at + option.indent
-                    : indent.at) + (indent.wrap ? option.indent : 0),
-                mode: mode,
-                open: open,
-                was: indent
-            };
-            if (mode === 'var' && open) {
-                var_mode = indent;
-            }
-        }
-    }
-
-    function step_out(id, symbol) {
-        if (id) {
-            if (indent && indent.open) {
-                indent.at -= option.indent;
-                edge();
-            }
-            advance(id, symbol);
-        }
-        if (indent) {
-            indent = indent.was;
-        }
-    }
-
-// Functions for conformance of whitespace.
-
-    function one_space(left, right) {
-        left = left || token;
-        right = right || next_token;
-        if (right.id !== '(end)' && !option.white &&
-                (token.line !== right.line ||
-                token.thru + 1 !== right.from)) {
-            warn('expected_space_a_b', right, artifact(token), artifact(right));
-        }
-    }
-
-    function one_space_only(left, right) {
-        left = left || token;
-        right = right || next_token;
-        if (right.id !== '(end)' && (left.line !== right.line ||
-                (!option.white && left.thru + 1 !== right.from))) {
-            warn('expected_space_a_b', right, artifact(left), artifact(right));
-        }
-    }
-
-    function no_space(left, right) {
-        left = left || token;
-        right = right || next_token;
-        if ((!option.white || xmode === 'styleproperty' || xmode === 'style') &&
-                left.thru !== right.from && left.line === right.line) {
-            warn('unexpected_space_a_b', right, artifact(left), artifact(right));
-        }
-    }
-
-    function no_space_only(left, right) {
-        left = left || token;
-        right = right || next_token;
-        if (right.id !== '(end)' && (left.line !== right.line ||
-                (!option.white && left.thru !== right.from))) {
-            warn('unexpected_space_a_b', right, artifact(left), artifact(right));
-        }
-    }
-
-    function spaces(left, right) {
-        if (!option.white) {
-            left = left || token;
-            right = right || next_token;
-            if (left.thru === right.from && left.line === right.line) {
-                warn('missing_space_a_b', right, artifact(left), artifact(right));
-            }
-        }
-    }
-
-    function comma() {
-        if (next_token.id !== ',') {
-            warn_at('expected_a_b', token.line, token.thru, ',', artifact());
-        } else {
-            if (!option.white) {
-                no_space_only();
-            }
-            advance(',');
-            spaces();
-        }
-    }
-
-
-    function semicolon() {
-        if (next_token.id !== ';') {
-            warn_at('expected_a_b', token.line, token.thru, ';', artifact());
-        } else {
-            if (!option.white) {
-                no_space_only();
-            }
-            advance(';');
-            if (semicolon_coda[next_token.id] !== true) {
-                spaces();
-            }
-        }
-    }
-
-    function use_strict() {
-        if (next_token.string === 'use strict') {
-            if (strict_mode) {
-                warn('unnecessary_use');
-            }
-            edge();
-            advance();
-            semicolon();
-            strict_mode = true;
-            option.undef = false;
-            return true;
-        }
-        return false;
-    }
-
-
-    function are_similar(a, b) {
-        if (a === b) {
-            return true;
-        }
-        if (Array.isArray(a)) {
-            if (Array.isArray(b) && a.length === b.length) {
-                var i;
-                for (i = 0; i < a.length; i += 1) {
-                    if (!are_similar(a[i], b[i])) {
-                        return false;
-                    }
-                }
-                return true;
-            }
-            return false;
-        }
-        if (Array.isArray(b)) {
-            return false;
-        }
-        if (a.id === '(number)' && b.id === '(number)') {
-            return a.number === b.number;
-        }
-        if (a.arity === b.arity && a.string === b.string) {
-            switch (a.arity) {
-            case 'prefix':
-            case 'suffix':
-            case undefined:
-                return a.id === b.id && are_similar(a.first, b.first);
-            case 'infix':
-                return are_similar(a.first, b.first) &&
-                    are_similar(a.second, b.second);
-            case 'ternary':
-                return are_similar(a.first, b.first) &&
-                    are_similar(a.second, b.second) &&
-                    are_similar(a.third, b.third);
-            case 'function':
-            case 'regexp':
-                return false;
-            default:
-                return true;
-            }
-        } else {
-            if (a.id === '.' && b.id === '[' && b.arity === 'infix') {
-                return a.second.string === b.second.string && b.second.id === '(string)';
-            }
-            if (a.id === '[' && a.arity === 'infix' && b.id === '.') {
-                return a.second.string === b.second.string && a.second.id === '(string)';
-            }
-        }
-        return false;
-    }
-
-
-// This is the heart of JSLINT, the Pratt parser. In addition to parsing, it
-// is looking for ad hoc lint patterns. We add .fud to Pratt's model, which is
-// like .nud except that it is only used on the first token of a statement.
-// Having .fud makes it much easier to define statement-oriented languages like
-// JavaScript. I retained Pratt's nomenclature.
-
-// .nud     Null denotation
-// .fud     First null denotation
-// .led     Left denotation
-//  lbp     Left binding power
-//  rbp     Right binding power
-
-// They are elements of the parsing method called Top Down Operator Precedence.
-
-    function expression(rbp, initial) {
-
-// rbp is the right binding power.
-// initial indicates that this is the first expression of a statement.
-
-        var left;
-        if (next_token.id === '(end)') {
-            stop('unexpected_a', token, next_token.id);
-        }
-        advance();
-        if (option.safe && scope[token.string] &&
-                scope[token.string] === global_scope[token.string] &&
-                (next_token.id !== '(' && next_token.id !== '.')) {
-            warn('adsafe_a', token);
-        }
-        if (initial) {
-            anonname = 'anonymous';
-            funct['(verb)'] = token.string;
-        }
-        if (initial === true && token.fud) {
-            left = token.fud();
-        } else {
-            if (token.nud) {
-                left = token.nud();
-            } else {
-                if (next_token.id === '(number)' && token.id === '.') {
-                    warn('leading_decimal_a', token, artifact());
-                    advance();
-                    return token;
-                }
-                stop('expected_identifier_a', token, token.id);
-            }
-            while (rbp < next_token.lbp) {
-                advance();
-                if (token.led) {
-                    left = token.led(left);
-                } else {
-                    stop('expected_operator_a', token, token.id);
-                }
-            }
-        }
-        return left;
-    }
-
-
-// Functional constructors for making the symbols that will be inherited by
-// tokens.
-
-    function symbol(s, p) {
-        var x = syntax[s];
-        if (!x || typeof x !== 'object') {
-            syntax[s] = x = {
-                id: s,
-                lbp: p || 0,
-                string: s
-            };
-        }
-        return x;
-    }
-
-    function postscript(x) {
-        x.postscript = true;
-        return x;
-    }
-
-    function ultimate(s) {
-        var x = symbol(s, 0);
-        x.from = 1;
-        x.thru = 1;
-        x.line = 0;
-        x.edge = 'edge';
-        s.string = s;
-        return postscript(x);
-    }
-
-
-    function stmt(s, f) {
-        var x = symbol(s);
-        x.identifier = x.reserved = true;
-        x.fud = f;
-        return x;
-    }
-
-    function labeled_stmt(s, f) {
-        var x = stmt(s, f);
-        x.labeled = true;
-    }
-
-    function disrupt_stmt(s, f) {
-        var x = stmt(s, f);
-        x.disrupt = true;
-    }
-
-
-    function reserve_name(x) {
-        var c = x.id.charAt(0);
-        if ((c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z')) {
-            x.identifier = x.reserved = true;
-        }
-        return x;
-    }
-
-
-    function prefix(s, f) {
-        var x = symbol(s, 150);
-        reserve_name(x);
-        x.nud = typeof f === 'function'
-            ? f
-            : function () {
-                if (s === 'typeof') {
-                    one_space();
-                } else {
-                    no_space_only();
-                }
-                this.first = expression(150);
-                this.arity = 'prefix';
-                if (this.id === '++' || this.id === '--') {
-                    if (!option.plusplus) {
-                        warn('unexpected_a', this);
-                    } else if ((!this.first.identifier || this.first.reserved) &&
-                            this.first.id !== '.' && this.first.id !== '[') {
-                        warn('bad_operand', this);
-                    }
-                }
-                return this;
-            };
-        return x;
-    }
-
-
-    function type(s, t, nud) {
-        var x = symbol(s);
-        x.arity = t;
-        if (nud) {
-            x.nud = nud;
-        }
-        return x;
-    }
-
-
-    function reserve(s, f) {
-        var x = symbol(s);
-        x.identifier = x.reserved = true;
-        if (typeof f === 'function') {
-            x.nud = f;
-        }
-        return x;
-    }
-
-
-    function constant(name) {
-        var x = reserve(name);
-        x.string = name;
-        x.nud = return_this;
-        return x;
-    }
-
-
-    function reservevar(s, v) {
-        return reserve(s, function () {
-            if (typeof v === 'function') {
-                v(this);
-            }
-            return this;
-        });
-    }
-
-
-    function infix(s, p, f, w) {
-        var x = symbol(s, p);
-        reserve_name(x);
-        x.led = function (left) {
-            this.arity = 'infix';
-            if (!w) {
-                spaces(prev_token, token);
-                spaces();
-            }
-            if (!option.bitwise && this.bitwise) {
-                warn('unexpected_a', this);
-            }
-            if (typeof f === 'function') {
-                return f(left, this);
-            }
-            this.first = left;
-            this.second = expression(p);
-            return this;
-        };
-        return x;
-    }
-
-    function expected_relation(node, message) {
-        if (node.assign) {
-            warn(message || bundle.conditional_assignment, node);
-        }
-        return node;
-    }
-
-    function expected_condition(node, message) {
-        switch (node.id) {
-        case '[':
-        case '-':
-            if (node.arity !== 'infix') {
-                warn(message || bundle.weird_condition, node);
-            }
-            break;
-        case 'false':
-        case 'function':
-        case 'Infinity':
-        case 'NaN':
-        case 'null':
-        case 'true':
-        case 'undefined':
-        case 'void':
-        case '(number)':
-        case '(regexp)':
-        case '(string)':
-        case '{':
-            warn(message || bundle.weird_condition, node);
-            break;
-        case '(':
-            if (node.first.id === '.' && numbery[node.first.second.string] === true) {
-                warn(message || bundle.weird_condition, node);
-            }
-            break;
-        }
-        return node;
-    }
-
-    function check_relation(node) {
-        switch (node.arity) {
-        case 'prefix':
-            switch (node.id) {
-            case '{':
-            case '[':
-                warn('unexpected_a', node);
-                break;
-            case '!':
-                warn('confusing_a', node);
-                break;
-            }
-            break;
-        case 'function':
-        case 'regexp':
-            warn('unexpected_a', node);
-            break;
-        default:
-            if (node.id  === 'NaN') {
-                warn('isNaN', node);
-            }
-        }
-        return node;
-    }
-
-
-    function relation(s, eqeq) {
-        return infix(s, 100, function (left, that) {
-            check_relation(left);
-            if (eqeq && !option.eqeq) {
-                warn('expected_a_b', that, eqeq, that.id);
-            }
-            var right = expression(100);
-            if (are_similar(left, right) ||
-                    ((left.id === '(string)' || left.id === '(number)') &&
-                    (right.id === '(string)' || right.id === '(number)'))) {
-                warn('weird_relation', that);
-            }
-            that.first = left;
-            that.second = check_relation(right);
-            return that;
-        });
-    }
-
-
-    function assignop(s, op) {
-        var x = infix(s, 20, function (left, that) {
-            var l;
-            that.first = left;
-            if (left.identifier) {
-                if (scope[left.string]) {
-                    if (scope[left.string].writeable === false) {
-                        warn('read_only', left);
-                    }
-                } else {
-                    stop('read_only');
-                }
-                if (funct['(params)']) {
-                    funct['(params)'].forEach(function (value) {
-                        if (value.string === left.string) {
-                            value.assign = true;
-                        }
-                    });
-                }
-            } else if (option.safe) {
-                l = left;
-                do {
-                    if (typeof predefined[l.string] === 'boolean') {
-                        warn('adsafe_a', l);
-                    }
-                    l = l.first;
-                } while (l);
-            }
-            if (left === syntax['function']) {
-                warn('identifier_function', token);
-            }
-            if (left.id === '.' || left.id === '[') {
-                if (!left.first || left.first.string === 'arguments') {
-                    warn('bad_assignment', that);
-                }
-            } else if (left.identifier) {
-                if (!left.reserved && funct[left.string] === 'exception') {
-                    warn('assign_exception', left);
-                }
-            } else {
-                warn('bad_assignment', that);
-            }
-            that.second = expression(19);
-            if (that.id === '=' && are_similar(that.first, that.second)) {
-                warn('weird_assignment', that);
-            }
-            return that;
-        });
-        x.assign = true;
-        if (op) {
-            if (syntax[op].bitwise) {
-                x.bitwise = true;
-            }
-        }
-        return x;
-    }
-
-
-    function bitwise(s, p) {
-        var x = infix(s, p, 'number');
-        x.bitwise = true;
-        return x;
-    }
-
-
-    function suffix(s) {
-        var x = symbol(s, 150);
-        x.led = function (left) {
-            no_space_only(prev_token, token);
-            if (!option.plusplus) {
-                warn('unexpected_a', this);
-            } else if ((!left.identifier || left.reserved) &&
-                    left.id !== '.' && left.id !== '[') {
-                warn('bad_operand', this);
-            }
-            this.first = left;
-            this.arity = 'suffix';
-            return this;
-        };
-        return x;
-    }
-
-
-    function optional_identifier() {
-        if (next_token.identifier) {
-            advance();
-            if (option.safe && banned[token.string]) {
-                warn('adsafe_a', token);
-            } else if (token.reserved && !option.es5) {
-                warn('expected_identifier_a_reserved', token);
-            }
-            return token.string;
-        }
-    }
-
-
-    function identifier() {
-        var i = optional_identifier();
-        if (!i) {
-            stop(token.id === 'function' && next_token.id === '('
-                ? 'name_function'
-                : 'expected_identifier_a');
-        }
-        return i;
-    }
-
-
-    function statement() {
-
-        var label, old_scope = scope, the_statement;
-
-// We don't like the empty statement.
-
-        if (next_token.id === ';') {
-            warn('unexpected_a');
-            semicolon();
-            return;
-        }
-
-// Is this a labeled statement?
-
-        if (next_token.identifier && !next_token.reserved && peek().id === ':') {
-            edge('label');
-            label = next_token;
-            advance();
-            advance(':');
-            scope = Object.create(old_scope);
-            add_label(label, 'label');
-            if (next_token.labeled !== true || funct === global_funct) {
-                stop('unexpected_label_a', label);
-            } else if (jx.test(label.string + ':')) {
-                warn('url', label);
-            }
-            next_token.label = label;
-        }
-
-// Parse the statement.
-
-        if (token.id !== 'else') {
-            edge();
-        }
-        step_in('statement');
-        the_statement = expression(0, true);
-        if (the_statement) {
-
-// Look for the final semicolon.
-
-            if (the_statement.arity === 'statement') {
-                if (the_statement.id === 'switch' ||
-                        (the_statement.block && the_statement.id !== 'do')) {
-                    spaces();
-                } else {
-                    semicolon();
-                }
-            } else {
-
-// If this is an expression statement, determine if it is acceptable.
-// We do not like
-//      new Blah();
-// statments. If it is to be used at all, new should only be used to make
-// objects, not side effects. The expression statements we do like do
-// assignment or invocation or delete.
-
-                if (the_statement.id === '(') {
-                    if (the_statement.first.id === 'new') {
-                        warn('bad_new');
-                    }
-                } else if (!the_statement.assign &&
-                        the_statement.id !== 'delete' &&
-                        the_statement.id !== '++' &&
-                        the_statement.id !== '--') {
-                    warn('assignment_function_expression', token);
-                }
-                semicolon();
-            }
-        }
-        step_out();
-        scope = old_scope;
-        return the_statement;
-    }
-
-
-    function statements() {
-        var array = [], disruptor, the_statement;
-
-// A disrupt statement may not be followed by any other statement.
-// If the last statement is disrupt, then the sequence is disrupt.
-
-        while (next_token.postscript !== true) {
-            if (next_token.id === ';') {
-                warn('unexpected_a', next_token);
-                semicolon();
-            } else {
-                if (next_token.string === 'use strict') {
-                    if ((!node_js && xmode !== 'script') || funct !== global_funct || array.length > 0) {
-                        warn('function_strict');
-                    }
-                    use_strict();
-                }
-                if (disruptor) {
-                    warn('unreachable_a_b', next_token, next_token.string,
-                        disruptor.string);
-                    disruptor = null;
-                }
-                the_statement = statement();
-                if (the_statement) {
-                    array.push(the_statement);
-                    if (the_statement.disrupt) {
-                        disruptor = the_statement;
-                        array.disrupt = true;
-                    }
-                }
-            }
-        }
-        return array;
-    }
-
-
-    function block(ordinary) {
-
-// array block is array sequence of statements wrapped in braces.
-// ordinary is false for function bodies and try blocks.
-// ordinary is true for if statements, while, etc.
-
-        var array,
-            curly = next_token,
-            old_in_block = in_block,
-            old_scope = scope,
-            old_strict_mode = strict_mode;
-
-        in_block = ordinary;
-        scope = Object.create(scope);
-        spaces();
-        if (next_token.id === '{') {
-            advance('{');
-            step_in();
-            if (!ordinary && !use_strict() && !old_strict_mode &&
-                    !option.sloppy && funct['(context)'] === global_funct) {
-                warn('missing_use_strict');
-            }
-            array = statements();
-            strict_mode = old_strict_mode;
-            step_out('}', curly);
-        } else if (!ordinary) {
-            stop('expected_a_b', next_token, '{', artifact());
-        } else {
-            warn('expected_a_b', next_token, '{', artifact());
-            array = [statement()];
-            array.disrupt = array[0].disrupt;
-        }
-        funct['(verb)'] = null;
-        scope = old_scope;
-        in_block = old_in_block;
-        if (ordinary && array.length === 0) {
-            warn('empty_block');
-        }
-        return array;
-    }
-
-
-    function tally_property(name) {
-        if (option.properties && typeof property[name] !== 'number') {
-            warn('unexpected_property_a', token, name);
-        }
-        if (typeof property[name] === 'number') {
-            property[name] += 1;
-        } else {
-            property[name] = 1;
-        }
-    }
-
-
-// ECMAScript parser
-
-    syntax['(identifier)'] = {
-        id: '(identifier)',
-        lbp: 0,
-        identifier: true,
-        nud: function () {
-            var name = this.string,
-                variable = scope[name],
-                site,
-                writeable;
-
-// If the variable is not in scope, then we may have an undeclared variable.
-// Check the predefined list. If it was predefined, create the global
-// variable.
-
-            if (typeof variable !== 'object') {
-                writeable = predefined[name];
-                if (typeof writeable === 'boolean') {
-                    global_scope[name] = variable = {
-                        string:    name,
-                        writeable: writeable,
-                        funct:     global_funct
-                    };
-                    global_funct[name] = 'var';
-
-// But if the variable is not in scope, and is not predefined, and if we are not
-// in the global scope, then we have an undefined variable error.
-
-                } else {
-                    if (!option.undef) {
-                        warn('used_before_a', token);
-                    }
-                    scope[name] = variable = {
-                        string: name,
-                        writeable: true,
-                        funct: funct
-                    };
-                    funct[name] = 'undef';
-                }
-
-            }
-            site = variable.funct;
-
-// The name is in scope and defined in the current function.
-
-            if (funct === site) {
-
-//      Change 'unused' to 'var', and reject labels.
-
-                switch (funct[name]) {
-                case 'becoming':
-                    warn('unexpected_a', token);
-                    funct[name] = 'var';
-                    break;
-                case 'unused':
-                    funct[name] = 'var';
-                    break;
-                case 'unparam':
-                    funct[name] = 'parameter';
-                    break;
-                case 'unction':
-                    funct[name] = 'function';
-                    break;
-                case 'label':
-                    warn('a_label', token, name);
-                    break;
-                }
-
-// If the name is already defined in the current
-// function, but not as outer, then there is a scope error.
-
-            } else {
-                switch (funct[name]) {
-                case 'closure':
-                case 'function':
-                case 'var':
-                case 'unused':
-                    warn('a_scope', token, name);
-                    break;
-                case 'label':
-                    warn('a_label', token, name);
-                    break;
-                case 'outer':
-                case 'global':
-                    break;
-                default:
-
-// If the name is defined in an outer function, make an outer entry, and if
-// it was unused, make it var.
-
-                    switch (site[name]) {
-                    case 'becoming':
-                    case 'closure':
-                    case 'function':
-                    case 'parameter':
-                    case 'unction':
-                    case 'unused':
-                    case 'var':
-                        site[name] = 'closure';
-                        funct[name] = site === global_funct
-                            ? 'global'
-                            : 'outer';
-                        break;
-                    case 'unparam':
-                        site[name] = 'parameter';
-                        funct[name] = 'outer';
-                        break;
-                    case 'undef':
-                        funct[name] = 'undef';
-                        break;
-                    case 'label':
-                        warn('a_label', token, name);
-                        break;
-                    }
-                }
-            }
-            return this;
-        },
-        led: function () {
-            stop('expected_operator_a');
-        }
-    };
-
-// Build the syntax table by declaring the syntactic elements.
-
-    type('(array)', 'array');
-    type('(color)', 'color');
-    type('(function)', 'function');
-    type('(number)', 'number', return_this);
-    type('(object)', 'object');
-    type('(string)', 'string', return_this);
-    type('(boolean)', 'boolean', return_this);
-    type('(range)', 'range');
-    type('(regexp)', 'regexp', return_this);
-
-    ultimate('(begin)');
-    ultimate('(end)');
-    ultimate('(error)');
-    postscript(symbol('</'));
-    symbol('<!');
-    symbol('<!--');
-    symbol('-->');
-    postscript(symbol('}'));
-    symbol(')');
-    symbol(']');
-    postscript(symbol('"'));
-    postscript(symbol('\''));
-    symbol(';');
-    symbol(':');
-    symbol(',');
-    symbol('#');
-    symbol('@');
-    symbol('*/');
-    postscript(reserve('case'));
-    reserve('catch');
-    postscript(reserve('default'));
-    reserve('else');
-    reserve('finally');
-
-    reservevar('arguments', function (x) {
-        if (strict_mode && funct === global_funct) {
-            warn('strict', x);
-        } else if (option.safe) {
-            warn('adsafe_a', x);
-        }
-        funct['(arguments)'] = true;
-    });
-    reservevar('eval', function (x) {
-        if (option.safe) {
-            warn('adsafe_a', x);
-        }
-    });
-    constant('false', 'boolean');
-    constant('Infinity', 'number');
-    constant('NaN', 'number');
-    constant('null', '');
-    reservevar('this', function (x) {
-        if (option.safe) {
-            warn('adsafe_a', x);
-        } else if (strict_mode && funct['(token)'].arity === 'statement' &&
-                funct['(name)'].charAt(0) > 'Z') {
-            warn('strict', x);
-        }
-    });
-    constant('true', 'boolean');
-    constant('undefined', '');
-
-    infix('?', 30, function (left, that) {
-        step_in('?');
-        that.first = expected_condition(expected_relation(left));
-        that.second = expression(0);
-        spaces();
-        step_out();
-        var colon = next_token;
-        advance(':');
-        step_in(':');
-        spaces();
-        that.third = expression(10);
-        that.arity = 'ternary';
-        if (are_similar(that.second, that.third)) {
-            warn('weird_ternary', colon);
-        } else if (are_similar(that.first, that.second)) {
-            warn('use_or', that);
-        }
-        step_out();
-        return that;
-    });
-
-    infix('||', 40, function (left, that) {
-        function paren_check(that) {
-            if (that.id === '&&' && !that.paren) {
-                warn('and', that);
-            }
-            return that;
-        }
-
-        that.first = paren_check(expected_condition(expected_relation(left)));
-        that.second = paren_check(expected_relation(expression(40)));
-        if (are_similar(that.first, that.second)) {
-            warn('weird_condition', that);
-        }
-        return that;
-    });
-
-    infix('&&', 50, function (left, that) {
-        that.first = expected_condition(expected_relation(left));
-        that.second = expected_relation(expression(50));
-        if (are_similar(that.first, that.second)) {
-            warn('weird_condition', that);
-        }
-        return that;
-    });
-
-    prefix('void', function () {
-        this.first = expression(0);
-        this.arity = 'prefix';
-        if (option.es5) {
-            warn('expected_a_b', this, 'undefined', 'void');
-        } else if (this.first.number !== 0) {
-            warn('expected_a_b', this.first, '0', artifact(this.first));
-        }
-        return this;
-    });
-
-    bitwise('|', 70);
-    bitwise('^', 80);
-    bitwise('&', 90);
-
-    relation('==', '===');
-    relation('===');
-    relation('!=', '!==');
-    relation('!==');
-    relation('<');
-    relation('>');
-    relation('<=');
-    relation('>=');
-
-    bitwise('<<', 120);
-    bitwise('>>', 120);
-    bitwise('>>>', 120);
-
-    infix('in', 120, function (left, that) {
-        warn('infix_in', that);
-        that.left = left;
-        that.right = expression(130);
-        return that;
-    });
-    infix('instanceof', 120);
-    infix('+', 130, function (left, that) {
-        if (left.id === '(number)') {
-            if (left.number === 0) {
-                warn('unexpected_a', left, '0');
-            }
-        } else if (left.id === '(string)') {
-            if (left.string === '') {
-                warn('expected_a_b', left, 'String', '\'\'');
-            }
-        }
-        var right = expression(130);
-        if (right.id === '(number)') {
-            if (right.number === 0) {
-                warn('unexpected_a', right, '0');
-            }
-        } else if (right.id === '(string)') {
-            if (right.string === '') {
-                warn('expected_a_b', right, 'String', '\'\'');
-            }
-        }
-        if (left.id === right.id) {
-            if (left.id === '(string)' || left.id === '(number)') {
-                if (left.id === '(string)') {
-                    left.string += right.string;
-                    if (jx.test(left.string)) {
-                        warn('url', left);
-                    }
-                } else {
-                    left.number += right.number;
-                }
-                left.thru = right.thru;
-                return left;
-            }
-        }
-        that.first = left;
-        that.second = right;
-        return that;
-    });
-    prefix('+', 'num');
-    prefix('+++', function () {
-        warn('confusing_a', token);
-        this.first = expression(150);
-        this.arity = 'prefix';
-        return this;
-    });
-    infix('+++', 130, function (left) {
-        warn('confusing_a', token);
-        this.first = left;
-        this.second = expression(130);
-        return this;
-    });
-    infix('-', 130, function (left, that) {
-        if ((left.id === '(number)' && left.number === 0) || left.id === '(string)') {
-            warn('unexpected_a', left);
-        }
-        var right = expression(130);
-        if ((right.id === '(number)' && right.number === 0) || right.id === '(string)') {
-            warn('unexpected_a', right);
-        }
-        if (left.id === right.id && left.id === '(number)') {
-            left.number -= right.number;
-            left.thru = right.thru;
-            return left;
-        }
-        that.first = left;
-        that.second = right;
-        return that;
-    });
-    prefix('-');
-    prefix('---', function () {
-        warn('confusing_a', token);
-        this.first = expression(150);
-        this.arity = 'prefix';
-        return this;
-    });
-    infix('---', 130, function (left) {
-        warn('confusing_a', token);
-        this.first = left;
-        this.second = expression(130);
-        return this;
-    });
-    infix('*', 140, function (left, that) {
-        if ((left.id === '(number)' && (left.number === 0 || left.number === 1)) || left.id === '(string)') {
-            warn('unexpected_a', left);
-        }
-        var right = expression(140);
-        if ((right.id === '(number)' && (right.number === 0 || right.number === 1)) || right.id === '(string)') {
-            warn('unexpected_a', right);
-        }
-        if (left.id === right.id && left.id === '(number)') {
-            left.number *= right.number;
-            left.thru = right.thru;
-            return left;
-        }
-        that.first = left;
-        that.second = right;
-        return that;
-    });
-    infix('/', 140, function (left, that) {
-        if ((left.id === '(number)' && left.number === 0) || left.id === '(string)') {
-            warn('unexpected_a', left);
-        }
-        var right = expression(140);
-        if ((right.id === '(number)' && (right.number === 0 || right.number === 1)) || right.id === '(string)') {
-            warn('unexpected_a', right);
-        }
-        if (left.id === right.id && left.id === '(number)') {
-            left.number /= right.number;
-            left.thru = right.thru;
-            return left;
-        }
-        that.first = left;
-        that.second = right;
-        return that;
-    });
-    infix('%', 140, function (left, that) {
-        if ((left.id === '(number)' && (left.number === 0 || left.number === 1)) || left.id === '(string)') {
-            warn('unexpected_a', left);
-        }
-        var right = expression(140);
-        if ((right.id === '(number)' && right.number === 0) || right.id === '(string)') {
-            warn('unexpected_a', right);
-        }
-        if (left.id === right.id && left.id === '(number)') {
-            left.number %= right.number;
-            left.thru = right.thru;
-            return left;
-        }
-        that.first = left;
-        that.second = right;
-        return that;
-    });
-
-    suffix('++');
-    prefix('++');
-
-    suffix('--');
-    prefix('--');
-    prefix('delete', function () {
-        one_space();
-        var p = expression(0);
-        if (!p || (p.id !== '.' && p.id !== '[')) {
-            warn('deleted');
-        }
-        this.first = p;
-        return this;
-    });
-
-
-    prefix('~', function () {
-        no_space_only();
-        if (!option.bitwise) {
-            warn('unexpected_a', this);
-        }
-        expression(150);
-        return this;
-    });
-    prefix('!', function () {
-        no_space_only();
-        this.first = expected_condition(expression(150));
-        this.arity = 'prefix';
-        if (bang[this.first.id] === true || this.first.assign) {
-            warn('confusing_a', this);
-        }
-        return this;
-    });
-    prefix('typeof', null);
-    prefix('new', function () {
-        one_space();
-        var c = expression(160), n, p, v;
-        this.first = c;
-        if (c.id !== 'function') {
-            if (c.identifier) {
-                switch (c.string) {
-                case 'Object':
-                    warn('use_object', token);
-                    break;
-                case 'Array':
-                    if (next_token.id === '(') {
-                        p = next_token;
-                        p.first = this;
-                        advance('(');
-                        if (next_token.id !== ')') {
-                            n = expression(0);
-                            p.second = [n];
-                            if (n.id !== '(number)' || next_token.id === ',') {
-                                warn('use_array', p);
-                            }
-                            while (next_token.id === ',') {
-                                advance(',');
-                                p.second.push(expression(0));
-                            }
-                        } else {
-                            warn('use_array', token);
-                        }
-                        advance(')', p);
-                        return p;
-                    }
-                    warn('use_array', token);
-                    break;
-                case 'Number':
-                case 'String':
-                case 'Boolean':
-                case 'Math':
-                case 'JSON':
-                    warn('not_a_constructor', c);
-                    break;
-                case 'Function':
-                    if (!option.evil) {
-                        warn('function_eval');
-                    }
-                    break;
-                case 'Date':
-                case 'RegExp':
-                case 'this':
-                    break;
-                default:
-                    if (c.id !== 'function') {
-                        v = c.string.charAt(0);
-                        if (!option.newcap && (v < 'A' || v > 'Z')) {
-                            warn('constructor_name_a', token);
-                        }
-                    }
-                }
-            } else {
-                if (c.id !== '.' && c.id !== '[' && c.id !== '(') {
-                    warn('bad_constructor', token);
-                }
-            }
-        } else {
-            warn('weird_new', this);
-        }
-        if (next_token.id !== '(') {
-            warn('missing_a', next_token, '()');
-        }
-        return this;
-    });
-
-    infix('(', 160, function (left, that) {
-        var p;
-        if (indent && indent.mode === 'expression') {
-            no_space(prev_token, token);
-        } else {
-            no_space_only(prev_token, token);
-        }
-        if (!left.immed && left.id === 'function') {
-            warn('wrap_immediate');
-        }
-        p = [];
-        if (left.identifier) {
-            if (left.string.match(/^[A-Z]([A-Z0-9_$]*[a-z][A-Za-z0-9_$]*)?$/)) {
-                if (left.string !== 'Number' && left.string !== 'String' &&
-                        left.string !== 'Boolean' && left.string !== 'Date') {
-                    if (left.string === 'Math' || left.string === 'JSON') {
-                        warn('not_a_function', left);
-                    } else if (left.string === 'Object') {
-                        warn('use_object', token);
-                    } else if (left.string === 'Array' || !option.newcap) {
-                        warn('missing_a', left, 'new');
-                    }
-                }
-            }
-        } else if (left.id === '.') {
-            if (option.safe && left.first.string === 'Math' &&
-                    left.second === 'random') {
-                warn('adsafe_a', left);
-            } else if (left.second.string === 'split' &&
-                    left.first.id === '(string)') {
-                warn('use_array', left.second);
-            }
-        }
-        step_in();
-        if (next_token.id !== ')') {
-            no_space();
-            for (;;) {
-                edge();
-                p.push(expression(10));
-                if (next_token.id !== ',') {
-                    break;
-                }
-                comma();
-            }
-        }
-        no_space();
-        step_out(')', that);
-        if (typeof left === 'object') {
-            if (left.string === 'parseInt' && p.length === 1) {
-                warn('radix', left);
-            }
-            if (!option.evil) {
-                if (left.string === 'eval' || left.string === 'Function' ||
-                        left.string === 'execScript') {
-                    warn('evil', left);
-                } else if (p[0] && p[0].id === '(string)' &&
-                        (left.string === 'setTimeout' ||
-                        left.string === 'setInterval')) {
-                    warn('implied_evil', left);
-                }
-            }
-            if (!left.identifier && left.id !== '.' && left.id !== '[' &&
-                    left.id !== '(' && left.id !== '&&' && left.id !== '||' &&
-                    left.id !== '?') {
-                warn('bad_invocation', left);
-            }
-        }
-        that.first = left;
-        that.second = p;
-        return that;
-    }, true);
-
-    prefix('(', function () {
-        step_in('expression');
-        no_space();
-        edge();
-        if (next_token.id === 'function') {
-            next_token.immed = true;
-        }
-        var value = expression(0);
-        value.paren = true;
-        no_space();
-        step_out(')', this);
-        if (value.id === 'function') {
-            switch (next_token.id) {
-            case '(':
-                warn('move_invocation');
-                break;
-            case '.':
-            case '[':
-                warn('unexpected_a');
-                break;
-            default:
-                warn('bad_wrap', this);
-            }
-        }
-        return value;
-    });
-
-    infix('.', 170, function (left, that) {
-        no_space(prev_token, token);
-        no_space();
-        var name = identifier();
-        if (typeof name === 'string') {
-            tally_property(name);
-        }
-        that.first = left;
-        that.second = token;
-        if (left && left.string === 'arguments' &&
-                (name === 'callee' || name === 'caller')) {
-            warn('avoid_a', left, 'arguments.' + name);
-        } else if (!option.evil && left && left.string === 'document' &&
-                (name === 'write' || name === 'writeln')) {
-            warn('write_is_wrong', left);
-        } else if (!option.stupid && name.indexOf('Sync') > 0) {
-            warn('sync_a', token);
-        } else if (option.adsafe) {
-            if (!adsafe_top && left.string === 'ADSAFE') {
-                if (name === 'id' || name === 'lib') {
-                    warn('adsafe_a', that);
-                } else if (name === 'go') {
-                    if (xmode !== 'script') {
-                        warn('adsafe_a', that);
-                    } else if (adsafe_went || next_token.id !== '(' ||
-                            peek(0).id !== '(string)' ||
-                            peek(0).string !== adsafe_id ||
-                            peek(1).id !== ',') {
-                        stop('adsafe_a', that, 'go');
-                    }
-                    adsafe_went = true;
-                    adsafe_may = false;
-                }
-            }
-            adsafe_top = false;
-        }
-        if (!option.evil && (name === 'eval' || name === 'execScript')) {
-            warn('evil');
-        } else if (option.safe) {
-            for (;;) {
-                if (banned[name] === true) {
-                    warn('adsafe_a', token, name);
-                }
-                if (typeof predefined[left.string] !== 'boolean' ||    //// check for writeable
-                        next_token.id === '(') {
-                    break;
-                }
-                if (next_token.id !== '.') {
-                    warn('adsafe_a', that);
-                    break;
-                }
-                advance('.');
-                token.first = that;
-                token.second = name;
-                that = token;
-                name = identifier();
-                if (typeof name === 'string') {
-                    tally_property(name);
-                }
-            }
-        }
-        return that;
-    }, true);
-
-    infix('[', 170, function (left, that) {
-        var e, s;
-        no_space_only(prev_token, token);
-        no_space();
-        step_in();
-        edge();
-        e = expression(0);
-        switch (e.id) {
-        case '(number)':
-            if (e.id === '(number)' && left.id === 'arguments') {
-                warn('use_param', left);
-            }
-            break;
-        case '(string)':
-            if (option.safe && (banned[e.string] ||
-                    e.string.charAt(0) === '_' || e.string.slice(-1) === '_')) {
-                warn('adsafe_subscript_a', e);
-            } else if (!option.evil &&
-                    (e.string === 'eval' || e.string === 'execScript')) {
-                warn('evil', e);
-            } else if (!option.sub && ix.test(e.string)) {
-                s = syntax[e.string];
-                if (!s || !s.reserved) {
-                    warn('subscript', e);
-                }
-            }
-            tally_property(e.string);
-            break;
-        default:
-            if (option.safe) {
-                warn('adsafe_subscript_a', e);
-            }
-        }
-        step_out(']', that);
-        no_space(prev_token, token);
-        that.first = left;
-        that.second = e;
-        return that;
-    }, true);
-
-    prefix('[', function () {
-        this.arity = 'prefix';
-        this.first = [];
-        step_in('array');
-        while (next_token.id !== '(end)') {
-            while (next_token.id === ',') {
-                warn('unexpected_a', next_token);
-                advance(',');
-            }
-            if (next_token.id === ']') {
-                break;
-            }
-            indent.wrap = false;
-            edge();
-            this.first.push(expression(10));
-            if (next_token.id === ',') {
-                comma();
-                if (next_token.id === ']' && !option.es5) {
-                    warn('unexpected_a', token);
-                    break;
-                }
-            } else {
-                break;
-            }
-        }
-        step_out(']', this);
-        return this;
-    }, 170);
-
-
-    function property_name() {
-        var id = optional_identifier(true);
-        if (!id) {
-            if (next_token.id === '(string)') {
-                id = next_token.string;
-                if (option.safe) {
-                    if (banned[id]) {
-                        warn('adsafe_a');
-                    } else if (id.charAt(0) === '_' ||
-                            id.charAt(id.length - 1) === '_') {
-                        warn('dangling_a');
-                    }
-                }
-                advance();
-            } else if (next_token.id === '(number)') {
-                id = next_token.number.toString();
-                advance();
-            }
-        }
-        return id;
-    }
-
-
-    function function_params() {
-        var id, paren = next_token, params = [];
-        advance('(');
-        step_in();
-        no_space();
-        if (next_token.id === ')') {
-            no_space();
-            step_out(')', paren);
-            return params;
-        }
-        for (;;) {
-            edge();
-            id = identifier();
-            params.push(token);
-            add_label(token, option.unparam ? 'parameter' : 'unparam');
-            if (next_token.id === ',') {
-                comma();
-            } else {
-                no_space();
-                step_out(')', paren);
-                return params;
-            }
-        }
-    }
-
-
-
-    function do_function(func, name) {
-        var old_funct      = funct,
-            old_option     = option,
-            old_scope      = scope;
-        funct = {
-            '(name)'     : name || '\'' + (anonname || '').replace(nx, sanitize) + '\'',
-            '(line)'     : next_token.line,
-            '(context)'  : old_funct,
-            '(breakage)' : 0,
-            '(loopage)'  : 0,
-            '(scope)'    : scope,
-            '(token)'    : func
-        };
-        option = Object.create(old_option);
-        scope = Object.create(old_scope);
-        functions.push(funct);
-        func.name = name;
-        if (name) {
-            add_label(func, 'function', name);
-        }
-        func.writeable = false;
-        func.first = funct['(params)'] = function_params();
-        one_space();
-        func.block = block(false);
-        if (funct['(arguments)']) {
-            func.first.forEach(function (value) {
-                if (value.assign) {
-                    warn('parameter_arguments_a', value, value.string);
-                }
-            });
-        }
-        funct      = old_funct;
-        option     = old_option;
-        scope      = old_scope;
-    }
-
-
-    assignop('=');
-    assignop('+=', '+');
-    assignop('-=', '-');
-    assignop('*=', '*');
-    assignop('/=', '/').nud = function () {
-        stop('slash_equal');
-    };
-    assignop('%=', '%');
-    assignop('&=', '&');
-    assignop('|=', '|');
-    assignop('^=', '^');
-    assignop('<<=', '<<');
-    assignop('>>=', '>>');
-    assignop('>>>=', '>>>');
-
-
-    prefix('{', function () {
-        var get, i, j, name, p, set, seen = {};
-        this.arity = 'prefix';
-        this.first = [];
-        step_in();
-        while (next_token.id !== '}') {
-            indent.wrap = false;
-
-// JSLint recognizes the ES5 extension for get/set in object literals,
-// but requires that they be used in pairs.
-
-            edge();
-            if (next_token.string === 'get' && peek().id !== ':') {
-                if (!option.es5) {
-                    warn('es5');
-                }
-                get = next_token;
-                advance('get');
-                one_space_only();
-                name = next_token;
-                i = property_name();
-                if (!i) {
-                    stop('missing_property');
-                }
-                get.string = '';
-                do_function(get);
-                if (funct['(loopage)']) {
-                    warn('function_loop', get);
-                }
-                p = get.first;
-                if (p && p.length) {
-                    warn('parameter_a_get_b', p[0], p[0].string, i);
-                }
-                comma();
-                set = next_token;
-                spaces();
-                edge();
-                advance('set');
-                set.string = '';
-                one_space_only();
-                j = property_name();
-                if (i !== j) {
-                    stop('expected_a_b', token, i, j || next_token.string);
-                }
-                do_function(set);
-                if (set.block.length === 0) {
-                    warn('missing_a', token, 'throw');
-                }
-                p = set.first;
-                if (!p || p.length !== 1) {
-                    stop('parameter_set_a', set, 'value');
-                } else if (p[0].string !== 'value') {
-                    stop('expected_a_b', p[0], 'value', p[0].string);
-                }
-                name.first = [get, set];
-            } else {
-                name = next_token;
-                i = property_name();
-                if (typeof i !== 'string') {
-                    stop('missing_property');
-                }
-                advance(':');
-                spaces();
-                name.first = expression(10);
-            }
-            this.first.push(name);
-            if (seen[i] === true) {
-                warn('duplicate_a', next_token, i);
-            }
-            seen[i] = true;
-            tally_property(i);
-            if (next_token.id !== ',') {
-                break;
-            }
-            for (;;) {
-                comma();
-                if (next_token.id !== ',') {
-                    break;
-                }
-                warn('unexpected_a', next_token);
-            }
-            if (next_token.id === '}' && !option.es5) {
-                warn('unexpected_a', token);
-            }
-        }
-        step_out('}', this);
-        return this;
-    });
-
-    stmt('{', function () {
-        warn('statement_block');
-        this.arity = 'statement';
-        this.block = statements();
-        this.disrupt = this.block.disrupt;
-        advance('}', this);
-        return this;
-    });
-
-    stmt('/*global', directive);
-    stmt('/*globals', directive);
-    stmt('/*jslint', directive);
-    stmt('/*member', directive);
-    stmt('/*members', directive);
-    stmt('/*property', directive);
-    stmt('/*properties', directive);
-
-    stmt('var', function () {
-
-// JavaScript does not have block scope. It only has function scope. So,
-// declaring a variable in a block can have unexpected consequences.
-
-// var.first will contain an array, the array containing name tokens
-// and assignment tokens.
-
-        var assign, id, name;
-
-        if (funct['(vars)'] && !option.vars) {
-            warn('combine_var');
-        } else if (funct !== global_funct) {
-            funct['(vars)'] = true;
-        }
-        this.arity = 'statement';
-        this.first = [];
-        step_in('var');
-        for (;;) {
-            name = next_token;
-            id = identifier();
-            add_label(name, 'becoming');
-
-            if (next_token.id === '=') {
-                assign = next_token;
-                assign.first = name;
-                spaces();
-                advance('=');
-                spaces();
-                if (next_token.id === 'undefined') {
-                    warn('unnecessary_initialize', token, id);
-                }
-                if (peek(0).id === '=' && next_token.identifier) {
-                    stop('var_a_not');
-                }
-                assign.second = expression(0);
-                assign.arity = 'infix';
-                this.first.push(assign);
-            } else {
-                this.first.push(name);
-            }
-            if (funct[id] === 'becoming') {
-                funct[id] = 'unused';
-            }
-            if (next_token.id !== ',') {
-                break;
-            }
-            comma();
-            indent.wrap = false;
-            if (var_mode && next_token.line === token.line &&
-                    this.first.length === 1) {
-                var_mode = null;
-                indent.open = false;
-                indent.at -= option.indent;
-            }
-            spaces();
-            edge();
-        }
-        var_mode = null;
-        step_out();
-        return this;
-    });
-
-    stmt('function', function () {
-        one_space();
-        if (in_block) {
-            warn('function_block', token);
-        }
-        var name = next_token, id = identifier();
-        add_label(name, 'unction');
-        no_space();
-        this.arity = 'statement';
-        do_function(this, id);
-        if (next_token.id === '(' && next_token.line === token.line) {
-            stop('function_statement');
-        }
-        return this;
-    });
-
-    prefix('function', function () {
-        if (!option.anon) {
-            one_space();
-        }
-        var id = optional_identifier();
-        if (id) {
-            no_space();
-        } else {
-            id = '';
-        }
-        do_function(this, id);
-        if (funct['(loopage)']) {
-            warn('function_loop');
-        }
-        switch (next_token.id) {
-        case ';':
-        case '(':
-        case ')':
-        case ',':
-        case ']':
-        case '}':
-        case ':':
-            break;
-        case '.':
-            if (peek().string !== 'bind' || peek(1).id !== '(') {
-                warn('unexpected_a');
-            }
-            break;
-        default:
-            stop('unexpected_a');
-        }
-        this.arity = 'function';
-        return this;
-    });
-
-    stmt('if', function () {
-        var paren = next_token;
-        one_space();
-        advance('(');
-        step_in('control');
-        no_space();
-        edge();
-        this.arity = 'statement';
-        this.first = expected_condition(expected_relation(expression(0)));
-        no_space();
-        step_out(')', paren);
-        one_space();
-        this.block = block(true);
-        if (next_token.id === 'else') {
-            one_space();
-            advance('else');
-            one_space();
-            this['else'] = next_token.id === 'if' || next_token.id === 'switch'
-                ? statement(true)
-                : block(true);
-            if (this['else'].disrupt && this.block.disrupt) {
-                this.disrupt = true;
-            }
-        }
-        return this;
-    });
-
-    stmt('try', function () {
-
-// try.first    The catch variable
-// try.second   The catch clause
-// try.third    The finally clause
-// try.block    The try block
-
-        var exception_variable, old_scope, paren;
-        if (option.adsafe) {
-            warn('adsafe_a', this);
-        }
-        one_space();
-        this.arity = 'statement';
-        this.block = block(false);
-        if (next_token.id === 'catch') {
-            one_space();
-            advance('catch');
-            one_space();
-            paren = next_token;
-            advance('(');
-            step_in('control');
-            no_space();
-            edge();
-            old_scope = scope;
-            scope = Object.create(old_scope);
-            exception_variable = next_token.string;
-            this.first = exception_variable;
-            if (!next_token.identifier) {
-                warn('expected_identifier_a', next_token);
-            } else {
-                add_label(next_token, 'exception');
-            }
-            advance();
-            no_space();
-            step_out(')', paren);
-            one_space();
-            this.second = block(false);
-            scope = old_scope;
-        }
-        if (next_token.id === 'finally') {
-            one_space();
-            advance('finally');
-            one_space();
-            this.third = block(false);
-        } else if (!this.second) {
-            stop('expected_a_b', next_token, 'catch', artifact());
-        }
-        return this;
-    });
-
-    labeled_stmt('while', function () {
-        one_space();
-        var paren = next_token;
-        funct['(breakage)'] += 1;
-        funct['(loopage)'] += 1;
-        advance('(');
-        step_in('control');
-        no_space();
-        edge();
-        this.arity = 'statement';
-        this.first = expected_relation(expression(0));
-        if (this.first.id !== 'true') {
-            expected_condition(this.first, bundle.unexpected_a);
-        }
-        no_space();
-        step_out(')', paren);
-        one_space();
-        this.block = block(true);
-        if (this.block.disrupt) {
-            warn('strange_loop', prev_token);
-        }
-        funct['(breakage)'] -= 1;
-        funct['(loopage)'] -= 1;
-        return this;
-    });
-
-    reserve('with');
-
-    labeled_stmt('switch', function () {
-
-// switch.first         the switch expression
-// switch.second        the array of cases. A case is 'case' or 'default' token:
-//    case.first        the array of case expressions
-//    case.second       the array of statements
-// If all of the arrays of statements are disrupt, then the switch is disrupt.
-
-        var cases = [],
-            old_in_block = in_block,
-            particular,
-            the_case = next_token,
-            unbroken = true;
-
-        function find_duplicate_case(value) {
-            if (are_similar(particular, value)) {
-                warn('duplicate_a', value);
-            }
-        }
-
-        funct['(breakage)'] += 1;
-        one_space();
-        advance('(');
-        no_space();
-        step_in();
-        this.arity = 'statement';
-        this.first = expected_condition(expected_relation(expression(0)));
-        no_space();
-        step_out(')', the_case);
-        one_space();
-        advance('{');
-        step_in();
-        in_block = true;
-        this.second = [];
-        while (next_token.id === 'case') {
-            the_case = next_token;
-            cases.forEach(find_duplicate_case);
-            the_case.first = [];
-            the_case.arity = 'case';
-            spaces();
-            edge('case');
-            advance('case');
-            for (;;) {
-                one_space();
-                particular = expression(0);
-                cases.forEach(find_duplicate_case);
-                cases.push(particular);
-                the_case.first.push(particular);
-                if (particular.id === 'NaN') {
-                    warn('unexpected_a', particular);
-                }
-                no_space_only();
-                advance(':');
-                if (next_token.id !== 'case') {
-                    break;
-                }
-                spaces();
-                edge('case');
-                advance('case');
-            }
-            spaces();
-            the_case.second = statements();
-            if (the_case.second && the_case.second.length > 0) {
-                particular = the_case.second[the_case.second.length - 1];
-                if (particular.disrupt) {
-                    if (particular.id === 'break') {
-                        unbroken = false;
-                    }
-                } else {
-                    warn('missing_a_after_b', next_token, 'break', 'case');
-                }
-            } else {
-                warn('empty_case');
-            }
-            this.second.push(the_case);
-        }
-        if (this.second.length === 0) {
-            warn('missing_a', next_token, 'case');
-        }
-        if (next_token.id === 'default') {
-            spaces();
-            the_case = next_token;
-            the_case.arity = 'case';
-            edge('case');
-            advance('default');
-            no_space_only();
-            advance(':');
-            spaces();
-            the_case.second = statements();
-            if (the_case.second && the_case.second.length > 0) {
-                particular = the_case.second[the_case.second.length - 1];
-                if (unbroken && particular.disrupt && particular.id !== 'break') {
-                    this.disrupt = true;
-                }
-            }
-            this.second.push(the_case);
-        }
-        funct['(breakage)'] -= 1;
-        spaces();
-        step_out('}', this);
-        in_block = old_in_block;
-        return this;
-    });
-
-    stmt('debugger', function () {
-        if (!option.debug) {
-            warn('unexpected_a', this);
-        }
-        this.arity = 'statement';
-        return this;
-    });
-
-    labeled_stmt('do', function () {
-        funct['(breakage)'] += 1;
-        funct['(loopage)'] += 1;
-        one_space();
-        this.arity = 'statement';
-        this.block = block(true);
-        if (this.block.disrupt) {
-            warn('strange_loop', prev_token);
-        }
-        one_space();
-        advance('while');
-        var paren = next_token;
-        one_space();
-        advance('(');
-        step_in();
-        no_space();
-        edge();
-        this.first = expected_condition(expected_relation(expression(0)), bundle.unexpected_a);
-        no_space();
-        step_out(')', paren);
-        funct['(breakage)'] -= 1;
-        funct['(loopage)'] -= 1;
-        return this;
-    });
-
-    labeled_stmt('for', function () {
-
-        var blok, filter, ok = false, paren = next_token, value;
-        this.arity = 'statement';
-        funct['(breakage)'] += 1;
-        funct['(loopage)'] += 1;
-        advance('(');
-        if (next_token.id === ';') {
-            no_space();
-            advance(';');
-            no_space();
-            advance(';');
-            no_space();
-            advance(')');
-            blok = block(true);
-        } else {
-            step_in('control');
-            spaces(this, paren);
-            no_space();
-            if (next_token.id === 'var') {
-                stop('move_var');
-            }
-            edge();
-            if (peek(0).id === 'in') {
-                this.forin = true;
-                value = next_token;
-                switch (funct[value.string]) {
-                case 'unused':
-                    funct[value.string] = 'var';
-                    break;
-                case 'closure':
-                case 'var':
-                    break;
-                default:
-                    warn('bad_in_a', value);
-                }
-                advance();
-                advance('in');
-                this.first = value;
-                this.second = expression(20);
-                step_out(')', paren);
-                blok = block(true);
-                if (!option.forin) {
-                    if (blok.length === 1 && typeof blok[0] === 'object' &&
-                            blok[0].string === 'if' && !blok[0]['else']) {
-                        filter = blok[0].first;
-                        while (filter.id === '&&') {
-                            filter = filter.first;
-                        }
-                        switch (filter.id) {
-                        case '===':
-                        case '!==':
-                            ok = filter.first.id === '['
-                                ? filter.first.first.string === this.second.string &&
-                                    filter.first.second.string === this.first.string
-                                : filter.first.id === 'typeof' &&
-                                    filter.first.first.id === '[' &&
-                                    filter.first.first.first.string === this.second.string &&
-                                    filter.first.first.second.string === this.first.string;
-                            break;
-                        case '(':
-                            ok = filter.first.id === '.' && ((
-                                filter.first.first.string === this.second.string &&
-                                filter.first.second.string === 'hasOwnProperty' &&
-                                filter.second[0].string === this.first.string
-                            ) || (
-                                filter.first.first.string === 'ADSAFE' &&
-                                filter.first.second.string === 'has' &&
-                                filter.second[0].string === this.second.string &&
-                                filter.second[1].string === this.first.string
-                            ) || (
-                                filter.first.first.id === '.' &&
-                                filter.first.first.first.id === '.' &&
-                                filter.first.first.first.first.string === 'Object' &&
-                                filter.first.first.first.second.string === 'prototype' &&
-                                filter.first.first.second.string === 'hasOwnProperty' &&
-                                filter.first.second.string === 'call' &&
-                                filter.second[0].string === this.second.string &&
-                                filter.second[1].string === this.first.string
-                            ));
-                            break;
-                        }
-                    }
-                    if (!ok) {
-                        warn('for_if', this);
-                    }
-                }
-            } else {
-                edge();
-                this.first = [];
-                for (;;) {
-                    this.first.push(expression(0, 'for'));
-                    if (next_token.id !== ',') {
-                        break;
-                    }
-                    comma();
-                }
-                semicolon();
-                edge();
-                this.second = expected_relation(expression(0));
-                if (this.second.id !== 'true') {
-                    expected_condition(this.second, bundle.unexpected_a);
-                }
-                semicolon(token);
-                if (next_token.id === ';') {
-                    stop('expected_a_b', next_token, ')', ';');
-                }
-                this.third = [];
-                edge();
-                for (;;) {
-                    this.third.push(expression(0, 'for'));
-                    if (next_token.id !== ',') {
-                        break;
-                    }
-                    comma();
-                }
-                no_space();
-                step_out(')', paren);
-                one_space();
-                blok = block(true);
-            }
-        }
-        if (blok.disrupt) {
-            warn('strange_loop', prev_token);
-        }
-        this.block = blok;
-        funct['(breakage)'] -= 1;
-        funct['(loopage)'] -= 1;
-        return this;
-    });
-
-    disrupt_stmt('break', function () {
-        var label = next_token.string;
-        this.arity = 'statement';
-        if (funct['(breakage)'] === 0) {
-            warn('unexpected_a', this);
-        }
-        if (next_token.identifier && token.line === next_token.line) {
-            one_space_only();
-            if (funct[label] !== 'label') {
-                warn('not_a_label', next_token);
-            } else if (scope[label].funct !== funct) {
-                warn('not_a_scope', next_token);
-            }
-            this.first = next_token;
-            advance();
-        }
-        return this;
-    });
-
-    disrupt_stmt('continue', function () {
-        if (!option['continue']) {
-            warn('unexpected_a', this);
-        }
-        var label = next_token.string;
-        this.arity = 'statement';
-        if (funct['(breakage)'] === 0) {
-            warn('unexpected_a', this);
-        }
-        if (next_token.identifier && token.line === next_token.line) {
-            one_space_only();
-            if (funct[label] !== 'label') {
-                warn('not_a_label', next_token);
-            } else if (scope[label].funct !== funct) {
-                warn('not_a_scope', next_token);
-            }
-            this.first = next_token;
-            advance();
-        }
-        return this;
-    });
-
-    disrupt_stmt('return', function () {
-        if (funct === global_funct && xmode !== 'scriptstring') {
-            warn('unexpected_a', this);
-        }
-        this.arity = 'statement';
-        if (next_token.id !== ';' && next_token.line === token.line) {
-            one_space_only();
-            if (next_token.id === '/' || next_token.id === '(regexp)') {
-                warn('wrap_regexp');
-            }
-            this.first = expression(20);
-        }
-        if (peek(0).id === '}' && peek(1).id === 'else') {
-            warn('unexpected_else', this);
-        }
-        return this;
-    });
-
-    disrupt_stmt('throw', function () {
-        this.arity = 'statement';
-        one_space_only();
-        this.first = expression(20);
-        return this;
-    });
-
-
-//  Superfluous reserved words
-
-    reserve('class');
-    reserve('const');
-    reserve('enum');
-    reserve('export');
-    reserve('extends');
-    reserve('import');
-    reserve('super');
-
-// Harmony reserved words
-
-    reserve('implements');
-    reserve('interface');
-    reserve('let');
-    reserve('package');
-    reserve('private');
-    reserve('protected');
-    reserve('public');
-    reserve('static');
-    reserve('yield');
-
-
-// Parse JSON
-
-    function json_value() {
-
-        function json_object() {
-            var brace = next_token, object = {};
-            advance('{');
-            if (next_token.id !== '}') {
-                while (next_token.id !== '(end)') {
-                    while (next_token.id === ',') {
-                        warn('unexpected_a', next_token);
-                        advance(',');
-                    }
-                    if (next_token.id !== '(string)') {
-                        warn('expected_string_a');
-                    }
-                    if (object[next_token.string] === true) {
-                        warn('duplicate_a');
-                    } else if (next_token.string === '__proto__') {
-                        warn('dangling_a');
-                    } else {
-                        object[next_token.string] = true;
-                    }
-                    advance();
-                    advance(':');
-                    json_value();
-                    if (next_token.id !== ',') {
-                        break;
-                    }
-                    advance(',');
-                    if (next_token.id === '}') {
-                        warn('unexpected_a', token);
-                        break;
-                    }
-                }
-            }
-            advance('}', brace);
-        }
-
-        function json_array() {
-            var bracket = next_token;
-            advance('[');
-            if (next_token.id !== ']') {
-                while (next_token.id !== '(end)') {
-                    while (next_token.id === ',') {
-                        warn('unexpected_a', next_token);
-                        advance(',');
-                    }
-                    json_value();
-                    if (next_token.id !== ',') {
-                        break;
-                    }
-                    advance(',');
-                    if (next_token.id === ']') {
-                        warn('unexpected_a', token);
-                        break;
-                    }
-                }
-            }
-            advance(']', bracket);
-        }
-
-        switch (next_token.id) {
-        case '{':
-            json_object();
-            break;
-        case '[':
-            json_array();
-            break;
-        case 'true':
-        case 'false':
-        case 'null':
-        case '(number)':
-        case '(string)':
-            advance();
-            break;
-        case '-':
-            advance('-');
-            no_space_only();
-            advance('(number)');
-            break;
-        default:
-            stop('unexpected_a');
-        }
-    }
-
-
-// CSS parsing.
-
-    function css_name() {
-        if (next_token.identifier) {
-            advance();
-            return true;
-        }
-    }
-
-
-    function css_number() {
-        if (next_token.id === '-') {
-            advance('-');
-            no_space_only();
-        }
-        if (next_token.id === '(number)') {
-            advance('(number)');
-            return true;
-        }
-    }
-
-
-    function css_string() {
-        if (next_token.id === '(string)') {
-            advance();
-            return true;
-        }
-    }
-
-    function css_color() {
-        var i, number, paren, value;
-        if (next_token.identifier) {
-            value = next_token.string;
-            if (value === 'rgb' || value === 'rgba') {
-                advance();
-                paren = next_token;
-                advance('(');
-                for (i = 0; i < 3; i += 1) {
-                    if (i) {
-                        comma();
-                    }
-                    number = next_token.number;
-                    if (next_token.id !== '(number)' || number < 0) {
-                        warn('expected_positive_a', next_token);
-                        advance();
-                    } else {
-                        advance();
-                        if (next_token.id === '%') {
-                            advance('%');
-                            if (number > 100) {
-                                warn('expected_percent_a', token, number);
-                            }
-                        } else {
-                            if (number > 255) {
-                                warn('expected_small_a', token, number);
-                            }
-                        }
-                    }
-                }
-                if (value === 'rgba') {
-                    comma();
-                    number = next_token.number;
-                    if (next_token.id !== '(number)' || number < 0 || number > 1) {
-                        warn('expected_fraction_a', next_token);
-                    }
-                    advance();
-                    if (next_token.id === '%') {
-                        warn('unexpected_a');
-                        advance('%');
-                    }
-                }
-                advance(')', paren);
-                return true;
-            }
-            if (css_colorData[next_token.string] === true) {
-                advance();
-                return true;
-            }
-        } else if (next_token.id === '(color)') {
-            advance();
-            return true;
-        }
-        return false;
-    }
-
-
-    function css_length() {
-        if (next_token.id === '-') {
-            advance('-');
-            no_space_only();
-        }
-        if (next_token.id === '(number)') {
-            advance();
-            if (next_token.id !== '(string)' &&
-                    css_lengthData[next_token.string] === true) {
-                no_space_only();
-                advance();
-            } else if (+token.number !== 0) {
-                warn('expected_linear_a');
-            }
-            return true;
-        }
-        return false;
-    }
-
-
-    function css_line_height() {
-        if (next_token.id === '-') {
-            advance('-');
-            no_space_only();
-        }
-        if (next_token.id === '(number)') {
-            advance();
-            if (next_token.id !== '(string)' &&
-                    css_lengthData[next_token.string] === true) {
-                no_space_only();
-                advance();
-            }
-            return true;
-        }
-        return false;
-    }
-
-
-    function css_width() {
-        if (next_token.identifier) {
-            switch (next_token.string) {
-            case 'thin':
-            case 'medium':
-            case 'thick':
-                advance();
-                return true;
-            }
-        } else {
-            return css_length();
-        }
-    }
-
-
-    function css_margin() {
-        if (next_token.identifier) {
-            if (next_token.string === 'auto') {
-                advance();
-                return true;
-            }
-        } else {
-            return css_length();
-        }
-    }
-
-    function css_attr() {
-        if (next_token.identifier && next_token.string === 'attr') {
-            advance();
-            advance('(');
-            if (!next_token.identifier) {
-                warn('expected_name_a');
-            }
-            advance();
-            advance(')');
-            return true;
-        }
-        return false;
-    }
-
-
-    function css_comma_list() {
-        while (next_token.id !== ';') {
-            if (!css_name() && !css_string()) {
-                warn('expected_name_a');
-            }
-            if (next_token.id !== ',') {
-                return true;
-            }
-            comma();
-        }
-    }
-
-
-    function css_counter() {
-        if (next_token.identifier && next_token.string === 'counter') {
-            advance();
-            advance('(');
-            advance();
-            if (next_token.id === ',') {
-                comma();
-                if (next_token.id !== '(string)') {
-                    warn('expected_string_a');
-                }
-                advance();
-            }
-            advance(')');
-            return true;
-        }
-        if (next_token.identifier && next_token.string === 'counters') {
-            advance();
-            advance('(');
-            if (!next_token.identifier) {
-                warn('expected_name_a');
-            }
-            advance();
-            if (next_token.id === ',') {
-                comma();
-                if (next_token.id !== '(string)') {
-                    warn('expected_string_a');
-                }
-                advance();
-            }
-            if (next_token.id === ',') {
-                comma();
-                if (next_token.id !== '(string)') {
-                    warn('expected_string_a');
-                }
-                advance();
-            }
-            advance(')');
-            return true;
-        }
-        return false;
-    }
-
-
-    function css_radius() {
-        return css_length() && (next_token.id !== '(number)' || css_length());
-    }
-
-
-    function css_shape() {
-        var i;
-        if (next_token.identifier && next_token.string === 'rect') {
-            advance();
-            advance('(');
-            for (i = 0; i < 4; i += 1) {
-                if (!css_length()) {
-                    warn('expected_number_a');
-                    break;
-                }
-            }
-            advance(')');
-            return true;
-        }
-        return false;
-    }
-
-
-    function css_url() {
-        var c, url;
-        if (next_token.identifier && next_token.string === 'url') {
-            next_token = lex.range('(', ')');
-            url = next_token.string;
-            c = url.charAt(0);
-            if (c === '"' || c === '\'') {
-                if (url.slice(-1) !== c) {
-                    warn('bad_url_a');
-                } else {
-                    url = url.slice(1, -1);
-                    if (url.indexOf(c) >= 0) {
-                        warn('bad_url_a');
-                    }
-                }
-            }
-            if (!url) {
-                warn('missing_url');
-            }
-            if (ux.test(url)) {
-                stop('bad_url_a');
-            }
-            urls.push(url);
-            advance();
-            return true;
-        }
-        return false;
-    }
-
-
-    css_any = [css_url, function () {
-        for (;;) {
-            if (next_token.identifier) {
-                switch (next_token.string.toLowerCase()) {
-                case 'url':
-                    css_url();
-                    break;
-                case 'expression':
-                    warn('unexpected_a');
-                    advance();
-                    break;
-                default:
-                    advance();
-                }
-            } else {
-                if (next_token.id === ';' || next_token.id === '!'  ||
-                        next_token.id === '(end)' || next_token.id === '}') {
-                    return true;
-                }
-                advance();
-            }
-        }
-    }];
-
-
-    function font_face() {
-        advance_identifier('font-family');
-        advance(':');
-        if (!css_name() && !css_string()) {
-            stop('expected_name_a');
-        }
-        semicolon();
-        advance_identifier('src');
-        advance(':');
-        while (true) {
-            if (next_token.string === 'local') {
-                advance_identifier('local');
-                advance('(');
-                if (ux.test(next_token.string)) {
-                    stop('bad_url_a');
-                }
-
-                if (!css_name() && !css_string()) {
-                    stop('expected_name_a');
-                }
-                advance(')');
-            } else if (!css_url()) {
-                stop('expected_a_b', next_token, 'url', artifact());
-            }
-            if (next_token.id !== ',') {
-                break;
-            }
-            comma();
-        }
-        semicolon();
-    }
-
-
-    css_border_style = [
-        'none', 'dashed', 'dotted', 'double', 'groove',
-        'hidden', 'inset', 'outset', 'ridge', 'solid'
-    ];
-
-    css_break = [
-        'auto', 'always', 'avoid', 'left', 'right'
-    ];
-
-    css_media = {
-        'all': true,
-        'braille': true,
-        'embossed': true,
-        'handheld': true,
-        'print': true,
-        'projection': true,
-        'screen': true,
-        'speech': true,
-        'tty': true,
-        'tv': true
-    };
-
-    css_overflow = [
-        'auto', 'hidden', 'scroll', 'visible'
-    ];
-
-    css_attribute_data = {
-        background: [
-            true, 'background-attachment', 'background-color',
-            'background-image', 'background-position', 'background-repeat'
-        ],
-        'background-attachment': ['scroll', 'fixed'],
-        'background-color': ['transparent', css_color],
-        'background-image': ['none', css_url],
-        'background-position': [
-            2, [css_length, 'top', 'bottom', 'left', 'right', 'center']
-        ],
-        'background-repeat': [
-            'repeat', 'repeat-x', 'repeat-y', 'no-repeat'
-        ],
-        'border': [true, 'border-color', 'border-style', 'border-width'],
-        'border-bottom': [
-            true, 'border-bottom-color', 'border-bottom-style',
-            'border-bottom-width'
-        ],
-        'border-bottom-color': css_color,
-        'border-bottom-left-radius': css_radius,
-        'border-bottom-right-radius': css_radius,
-        'border-bottom-style': css_border_style,
-        'border-bottom-width': css_width,
-        'border-collapse': ['collapse', 'separate'],
-        'border-color': ['transparent', 4, css_color],
-        'border-left': [
-            true, 'border-left-color', 'border-left-style', 'border-left-width'
-        ],
-        'border-left-color': css_color,
-        'border-left-style': css_border_style,
-        'border-left-width': css_width,
-        'border-radius': function () {
-            function count(separator) {
-                var n = 1;
-                if (separator) {
-                    advance(separator);
-                }
-                if (!css_length()) {
-                    return false;
-                }
-                while (next_token.id === '(number)') {
-                    if (!css_length()) {
-                        return false;
-                    }
-                    n += 1;
-                }
-                if (n > 4) {
-                    warn('bad_style');
-                }
-                return true;
-            }
-
-            return count() && (next_token.id !== '/' || count('/'));
-        },
-        'border-right': [
-            true, 'border-right-color', 'border-right-style',
-            'border-right-width'
-        ],
-        'border-right-color': css_color,
-        'border-right-style': css_border_style,
-        'border-right-width': css_width,
-        'border-spacing': [2, css_length],
-        'border-style': [4, css_border_style],
-        'border-top': [
-            true, 'border-top-color', 'border-top-style', 'border-top-width'
-        ],
-        'border-top-color': css_color,
-        'border-top-left-radius': css_radius,
-        'border-top-right-radius': css_radius,
-        'border-top-style': css_border_style,
-        'border-top-width': css_width,
-        'border-width': [4, css_width],
-        bottom: [css_length, 'auto'],
-        'caption-side' : ['bottom', 'left', 'right', 'top'],
-        clear: ['both', 'left', 'none', 'right'],
-        clip: [css_shape, 'auto'],
-        color: css_color,
-        content: [
-            'open-quote', 'close-quote', 'no-open-quote', 'no-close-quote',
-            css_string, css_url, css_counter, css_attr
-        ],
-        'counter-increment': [
-            css_name, 'none'
-        ],
-        'counter-reset': [
-            css_name, 'none'
-        ],
-        cursor: [
-            css_url, 'auto', 'crosshair', 'default', 'e-resize', 'help', 'move',
-            'n-resize', 'ne-resize', 'nw-resize', 'pointer', 's-resize',
-            'se-resize', 'sw-resize', 'w-resize', 'text', 'wait'
-        ],
-        direction: ['ltr', 'rtl'],
-        display: [
-            'block', 'compact', 'inline', 'inline-block', 'inline-table',
-            'list-item', 'marker', 'none', 'run-in', 'table', 'table-caption',
-            'table-cell', 'table-column', 'table-column-group',
-            'table-footer-group', 'table-header-group', 'table-row',
-            'table-row-group'
-        ],
-        'empty-cells': ['show', 'hide'],
-        'float': ['left', 'none', 'right'],
-        font: [
-            'caption', 'icon', 'menu', 'message-box', 'small-caption',
-            'status-bar', true, 'font-size', 'font-style', 'font-weight',
-            'font-family'
-        ],
-        'font-family': css_comma_list,
-        'font-size': [
-            'xx-small', 'x-small', 'small', 'medium', 'large', 'x-large',
-            'xx-large', 'larger', 'smaller', css_length
-        ],
-        'font-size-adjust': ['none', css_number],
-        'font-stretch': [
-            'normal', 'wider', 'narrower', 'ultra-condensed',
-            'extra-condensed', 'condensed', 'semi-condensed',
-            'semi-expanded', 'expanded', 'extra-expanded'
-        ],
-        'font-style': [
-            'normal', 'italic', 'oblique'
-        ],
-        'font-variant': [
-            'normal', 'small-caps'
-        ],
-        'font-weight': [
-            'normal', 'bold', 'bolder', 'lighter', css_number
-        ],
-        height: [css_length, 'auto'],
-        left: [css_length, 'auto'],
-        'letter-spacing': ['normal', css_length],
-        'line-height': ['normal', css_line_height],
-        'list-style': [
-            true, 'list-style-image', 'list-style-position', 'list-style-type'
-        ],
-        'list-style-image': ['none', css_url],
-        'list-style-position': ['inside', 'outside'],
-        'list-style-type': [
-            'circle', 'disc', 'square', 'decimal', 'decimal-leading-zero',
-            'lower-roman', 'upper-roman', 'lower-greek', 'lower-alpha',
-            'lower-latin', 'upper-alpha', 'upper-latin', 'hebrew', 'katakana',
-            'hiragana-iroha', 'katakana-oroha', 'none'
-        ],
-        margin: [4, css_margin],
-        'margin-bottom': css_margin,
-        'margin-left': css_margin,
-        'margin-right': css_margin,
-        'margin-top': css_margin,
-        'marker-offset': [css_length, 'auto'],
-        'max-height': [css_length, 'none'],
-        'max-width': [css_length, 'none'],
-        'min-height': css_length,
-        'min-width': css_length,
-        opacity: css_number,
-        outline: [true, 'outline-color', 'outline-style', 'outline-width'],
-        'outline-color': ['invert', css_color],
-        'outline-style': [
-            'dashed', 'dotted', 'double', 'groove', 'inset', 'none',
-            'outset', 'ridge', 'solid'
-        ],
-        'outline-width': css_width,
-        overflow: css_overflow,
-        'overflow-x': css_overflow,
-        'overflow-y': css_overflow,
-        padding: [4, css_length],
-        'padding-bottom': css_length,
-        'padding-left': css_length,
-        'padding-right': css_length,
-        'padding-top': css_length,
-        'page-break-after': css_break,
-        'page-break-before': css_break,
-        position: ['absolute', 'fixed', 'relative', 'static'],
-        quotes: [8, css_string],
-        right: [css_length, 'auto'],
-        'table-layout': ['auto', 'fixed'],
-        'text-align': ['center', 'justify', 'left', 'right'],
-        'text-decoration': [
-            'none', 'underline', 'overline', 'line-through', 'blink'
-        ],
-        'text-indent': css_length,
-        'text-shadow': ['none', 4, [css_color, css_length]],
-        'text-transform': ['capitalize', 'uppercase', 'lowercase', 'none'],
-        top: [css_length, 'auto'],
-        'unicode-bidi': ['normal', 'embed', 'bidi-override'],
-        'vertical-align': [
-            'baseline', 'bottom', 'sub', 'super', 'top', 'text-top', 'middle',
-            'text-bottom', css_length
-        ],
-        visibility: ['visible', 'hidden', 'collapse'],
-        'white-space': [
-            'normal', 'nowrap', 'pre', 'pre-line', 'pre-wrap', 'inherit'
-        ],
-        width: [css_length, 'auto'],
-        'word-spacing': ['normal', css_length],
-        'word-wrap': ['break-word', 'normal'],
-        'z-index': ['auto', css_number]
-    };
-
-    function style_attribute() {
-        var v;
-        while (next_token.id === '*' || next_token.id === '#' ||
-                next_token.string === '_') {
-            if (!option.css) {
-                warn('unexpected_a');
-            }
-            advance();
-        }
-        if (next_token.id === '-') {
-            if (!option.css) {
-                warn('unexpected_a');
-            }
-            advance('-');
-            if (!next_token.identifier) {
-                warn('expected_nonstandard_style_attribute');
-            }
-            advance();
-            return css_any;
-        }
-        if (!next_token.identifier) {
-            warn('expected_style_attribute');
-        } else {
-            if (Object.prototype.hasOwnProperty.call(css_attribute_data,
-                    next_token.string)) {
-                v = css_attribute_data[next_token.string];
-            } else {
-                v = css_any;
-                if (!option.css) {
-                    warn('unrecognized_style_attribute_a');
-                }
-            }
-        }
-        advance();
-        return v;
-    }
-
-
-    function style_value(v) {
-        var i = 0,
-            n,
-            once,
-            match,
-            round,
-            start = 0,
-            vi;
-        switch (typeof v) {
-        case 'function':
-            return v();
-        case 'string':
-            if (next_token.identifier && next_token.string === v) {
-                advance();
-                return true;
-            }
-            return false;
-        }
-        for (;;) {
-            if (i >= v.length) {
-                return false;
-            }
-            vi = v[i];
-            i += 1;
-            if (typeof vi === 'boolean') {
-                break;
-            } else if (typeof vi === 'number') {
-                n = vi;
-                vi = v[i];
-                i += 1;
-            } else {
-                n = 1;
-            }
-            match = false;
-            while (n > 0) {
-                if (style_value(vi)) {
-                    match = true;
-                    n -= 1;
-                } else {
-                    break;
-                }
-            }
-            if (match) {
-                return true;
-            }
-        }
-        start = i;
-        once = [];
-        for (;;) {
-            round = false;
-            for (i = start; i < v.length; i += 1) {
-                if (!once[i]) {
-                    if (style_value(css_attribute_data[v[i]])) {
-                        match = true;
-                        round = true;
-                        once[i] = true;
-                        break;
-                    }
-                }
-            }
-            if (!round) {
-                return match;
-            }
-        }
-    }
-
-    function style_child() {
-        if (next_token.id === '(number)') {
-            advance();
-            if (next_token.string === 'n' && next_token.identifier) {
-                no_space_only();
-                advance();
-                if (next_token.id === '+') {
-                    no_space_only();
-                    advance('+');
-                    no_space_only();
-                    advance('(number)');
-                }
-            }
-            return;
-        }
-        if (next_token.identifier &&
-                (next_token.string === 'odd' || next_token.string === 'even')) {
-            advance();
-            return;
-        }
-        warn('unexpected_a');
-    }
-
-    function substyle() {
-        var v;
-        for (;;) {
-            if (next_token.id === '}' || next_token.id === '(end)' ||
-                    (xquote && next_token.id === xquote)) {
-                return;
-            }
-            v = style_attribute();
-            advance(':');
-            if (next_token.identifier && next_token.string === 'inherit') {
-                advance();
-            } else {
-                if (!style_value(v)) {
-                    warn('unexpected_a');
-                    advance();
-                }
-            }
-            if (next_token.id === '!') {
-                advance('!');
-                no_space_only();
-                if (next_token.identifier && next_token.string === 'important') {
-                    advance();
-                } else {
-                    warn('expected_a_b',
-                        next_token, 'important', artifact());
-                }
-            }
-            if (next_token.id === '}' || next_token.id === xquote) {
-                warn('expected_a_b', next_token, ';', artifact());
-            } else {
-                semicolon();
-            }
-        }
-    }
-
-    function style_selector() {
-        if (next_token.identifier) {
-            if (!Object.prototype.hasOwnProperty.call(html_tag, option.cap
-                    ? next_token.string.toLowerCase()
-                    : next_token.string)) {
-                warn('expected_tagname_a');
-            }
-            advance();
-        } else {
-            switch (next_token.id) {
-            case '>':
-            case '+':
-                advance();
-                style_selector();
-                break;
-            case ':':
-                advance(':');
-                switch (next_token.string) {
-                case 'active':
-                case 'after':
-                case 'before':
-                case 'checked':
-                case 'disabled':
-                case 'empty':
-                case 'enabled':
-                case 'first-child':
-                case 'first-letter':
-                case 'first-line':
-                case 'first-of-type':
-                case 'focus':
-                case 'hover':
-                case 'last-child':
-                case 'last-of-type':
-                case 'link':
-                case 'only-of-type':
-                case 'root':
-                case 'target':
-                case 'visited':
-                    advance_identifier(next_token.string);
-                    break;
-                case 'lang':
-                    advance_identifier('lang');
-                    advance('(');
-                    if (!next_token.identifier) {
-                        warn('expected_lang_a');
-                    }
-                    advance(')');
-                    break;
-                case 'nth-child':
-                case 'nth-last-child':
-                case 'nth-last-of-type':
-                case 'nth-of-type':
-                    advance_identifier(next_token.string);
-                    advance('(');
-                    style_child();
-                    advance(')');
-                    break;
-                case 'not':
-                    advance_identifier('not');
-                    advance('(');
-                    if (next_token.id === ':' && peek(0).string === 'not') {
-                        warn('not');
-                    }
-                    style_selector();
-                    advance(')');
-                    break;
-                default:
-                    warn('expected_pseudo_a');
-                }
-                break;
-            case '#':
-                advance('#');
-                if (!next_token.identifier) {
-                    warn('expected_id_a');
-                }
-                advance();
-                break;
-            case '*':
-                advance('*');
-                break;
-            case '.':
-                advance('.');
-                if (!next_token.identifier) {
-                    warn('expected_class_a');
-                }
-                advance();
-                break;
-            case '[':
-                advance('[');
-                if (!next_token.identifier) {
-                    warn('expected_attribute_a');
-                }
-                advance();
-                if (next_token.id === '=' || next_token.string === '~=' ||
-                        next_token.string === '$=' ||
-                        next_token.string === '|=' ||
-                        next_token.id === '*=' ||
-                        next_token.id === '^=') {
-                    advance();
-                    if (next_token.id !== '(string)') {
-                        warn('expected_string_a');
-                    }
-                    advance();
-                }
-                advance(']');
-                break;
-            default:
-                stop('expected_selector_a');
-            }
-        }
-    }
-
-    function style_pattern() {
-        if (next_token.id === '{') {
-            warn('expected_style_pattern');
-        }
-        for (;;) {
-            style_selector();
-            if (next_token.id === '</' || next_token.id === '{' ||
-                    next_token.id === '}' || next_token.id === '(end)') {
-                return '';
-            }
-            if (next_token.id === ',') {
-                comma();
-            }
-        }
-    }
-
-    function style_list() {
-        while (next_token.id !== '}' && next_token.id !== '</' &&
-                next_token.id !== '(end)') {
-            style_pattern();
-            xmode = 'styleproperty';
-            if (next_token.id === ';') {
-                semicolon();
-            } else {
-                advance('{');
-                substyle();
-                xmode = 'style';
-                advance('}');
-            }
-        }
-    }
-
-    function styles() {
-        var i;
-        while (next_token.id === '@') {
-            i = peek();
-            advance('@');
-            switch (next_token.string) {
-            case 'import':
-                advance_identifier('import');
-                if (!css_url()) {
-                    warn('expected_a_b',
-                        next_token, 'url', artifact());
-                    advance();
-                }
-                semicolon();
-                break;
-            case 'media':
-                advance_identifier('media');
-                for (;;) {
-                    if (!next_token.identifier || css_media[next_token.string] !== true) {
-                        stop('expected_media_a');
-                    }
-                    advance();
-                    if (next_token.id !== ',') {
-                        break;
-                    }
-                    comma();
-                }
-                advance('{');
-                style_list();
-                advance('}');
-                break;
-            case 'font-face':
-                advance_identifier('font-face');
-                advance('{');
-                font_face();
-                advance('}');
-                break;
-            default:
-                stop('expected_at_a');
-            }
-        }
-        style_list();
-    }
-
-
-// Parse HTML
-
-    function do_begin(n) {
-        if (n !== 'html' && !option.fragment) {
-            if (n === 'div' && option.adsafe) {
-                stop('adsafe_fragment');
-            } else {
-                stop('expected_a_b', token, 'html', n);
-            }
-        }
-        if (option.adsafe) {
-            if (n === 'html') {
-                stop('adsafe_html', token);
-            }
-            if (option.fragment) {
-                if (n !== 'div') {
-                    stop('adsafe_div', token);
-                }
-            } else {
-                stop('adsafe_fragment', token);
-            }
-        }
-        option.browser = true;
-    }
-
-    function do_attribute(a, v) {
-        var u, x;
-        if (a === 'id') {
-            u = typeof v === 'string' ? v.toUpperCase() : '';
-            if (ids[u] === true) {
-                warn('duplicate_a', next_token, v);
-            }
-            if (!/^[A-Za-z][A-Za-z0-9._:\-]*$/.test(v)) {
-                warn('bad_id_a', next_token, v);
-            } else if (option.adsafe) {
-                if (adsafe_id) {
-                    if (v.slice(0, adsafe_id.length) !== adsafe_id) {
-                        warn('adsafe_prefix_a', next_token, adsafe_id);
-                    } else if (!/^[A-Z]+_[A-Z]+$/.test(v)) {
-                        warn('adsafe_bad_id');
-                    }
-                } else {
-                    adsafe_id = v;
-                    if (!/^[A-Z]+_$/.test(v)) {
-                        warn('adsafe_bad_id');
-                    }
-                }
-            }
-            x = v.search(dx);
-            if (x >= 0) {
-                warn('unexpected_char_a_b', token, v.charAt(x), a);
-            }
-            ids[u] = true;
-        } else if (a === 'class' || a === 'type' || a === 'name') {
-            x = v.search(qx);
-            if (x >= 0) {
-                warn('unexpected_char_a_b', token, v.charAt(x), a);
-            }
-            ids[u] = true;
-        } else if (a === 'href' || a === 'background' ||
-                a === 'content' || a === 'data' ||
-                a.indexOf('src') >= 0 || a.indexOf('url') >= 0) {
-            if (option.safe && ux.test(v)) {
-                stop('bad_url_a', next_token, v);
-            }
-            urls.push(v);
-        } else if (a === 'for') {
-            if (option.adsafe) {
-                if (adsafe_id) {
-                    if (v.slice(0, adsafe_id.length) !== adsafe_id) {
-                        warn('adsafe_prefix_a', next_token, adsafe_id);
-                    } else if (!/^[A-Z]+_[A-Z]+$/.test(v)) {
-                        warn('adsafe_bad_id');
-                    }
-                } else {
-                    warn('adsafe_bad_id');
-                }
-            }
-        } else if (a === 'name') {
-            if (option.adsafe && v.indexOf('_') >= 0) {
-                warn('adsafe_name_a', next_token, v);
-            }
-        }
-    }
-
-    function do_tag(name, attribute) {
-        var i, tag = html_tag[name], script, x;
-        src = false;
-        if (!tag) {
-            stop(
-                bundle.unrecognized_tag_a,
-                next_token,
-                name === name.toLowerCase()
-                    ? name
-                    : name + ' (capitalization error)'
-            );
-        }
-        if (stack.length > 0) {
-            if (name === 'html') {
-                stop('unexpected_a', token, name);
-            }
-            x = tag.parent;
-            if (x) {
-                if (x.indexOf(' ' + stack[stack.length - 1].name + ' ') < 0) {
-                    stop('tag_a_in_b', token, name, x);
-                }
-            } else if (!option.adsafe && !option.fragment) {
-                i = stack.length;
-                do {
-                    if (i <= 0) {
-                        stop('tag_a_in_b', token, name, 'body');
-                    }
-                    i -= 1;
-                } while (stack[i].name !== 'body');
-            }
-        }
-        switch (name) {
-        case 'div':
-            if (option.adsafe && stack.length === 1 && !adsafe_id) {
-                warn('adsafe_missing_id');
-            }
-            break;
-        case 'script':
-            xmode = 'script';
-            advance('>');
-            if (attribute.lang) {
-                warn('lang', token);
-            }
-            if (option.adsafe && stack.length !== 1) {
-                warn('adsafe_placement', token);
-            }
-            if (attribute.src) {
-                if (option.adsafe && (!adsafe_may || !approved[attribute.src])) {
-                    warn('adsafe_source', token);
-                }
-            } else {
-                step_in(next_token.from);
-                edge();
-                use_strict();
-                adsafe_top = true;
-                script = statements();
-
-// JSLint is also the static analyzer for ADsafe. See www.ADsafe.org.
-
-                if (option.adsafe) {
-                    if (adsafe_went) {
-                        stop('adsafe_script', token);
-                    }
-                    if (script.length !== 1 ||
-                            aint(script[0],             'id',     '(') ||
-                            aint(script[0].first,       'id',     '.') ||
-                            aint(script[0].first.first, 'string', 'ADSAFE') ||
-                            aint(script[0].second[0],   'string', adsafe_id)) {
-                        stop('adsafe_id_go');
-                    }
-                    switch (script[0].first.second.string) {
-                    case 'id':
-                        if (adsafe_may || adsafe_went ||
-                                script[0].second.length !== 1) {
-                            stop('adsafe_id', next_token);
-                        }
-                        adsafe_may = true;
-                        break;
-                    case 'go':
-                        if (adsafe_went) {
-                            stop('adsafe_go');
-                        }
-                        if (script[0].second.length !== 2 ||
-                                aint(script[0].second[1], 'id', 'function') ||
-                                !script[0].second[1].first ||
-                                aint(script[0].second[1].first[0], 'string', 'dom') ||
-                                script[0].second[1].first.length > 2 ||
-                                (script[0].second[1].first.length === 2 &&
-                                aint(script[0].second[1].first[1], 'string', 'lib'))) {
-                            stop('adsafe_go', next_token);
-                        }
-                        adsafe_went = true;
-                        break;
-                    default:
-                        stop('adsafe_id_go');
-                    }
-                }
-                indent = null;
-            }
-            xmode = 'html';
-            advance('</');
-            advance_identifier('script');
-            xmode = 'outer';
-            break;
-        case 'style':
-            xmode = 'style';
-            advance('>');
-            styles();
-            xmode = 'html';
-            advance('</');
-            advance_identifier('style');
-            break;
-        case 'input':
-            switch (attribute.type) {
-            case 'button':
-            case 'checkbox':
-            case 'radio':
-            case 'reset':
-            case 'submit':
-                break;
-            case 'file':
-            case 'hidden':
-            case 'image':
-            case 'password':
-            case 'text':
-                if (option.adsafe && attribute.autocomplete !== 'off') {
-                    warn('adsafe_autocomplete');
-                }
-                break;
-            default:
-                warn('bad_type');
-            }
-            break;
-        case 'applet':
-        case 'body':
-        case 'embed':
-        case 'frame':
-        case 'frameset':
-        case 'head':
-        case 'iframe':
-        case 'noembed':
-        case 'noframes':
-        case 'object':
-        case 'param':
-            if (option.adsafe) {
-                warn('adsafe_tag', next_token, name);
-            }
-            break;
-        }
-    }
-
-
-    function closetag(name) {
-        return '</' + name + '>';
-    }
-
-    function html() {
-        var attribute, attributes, is_empty, name, old_white = option.white,
-            quote, tag_name, tag, wmode;
-        xmode = 'html';
-        xquote = '';
-        stack = null;
-        for (;;) {
-            switch (next_token.string) {
-            case '<':
-                xmode = 'html';
-                advance('<');
-                attributes = {};
-                tag_name = next_token;
-                name = tag_name.string;
-                advance_identifier(name);
-                if (option.cap) {
-                    name = name.toLowerCase();
-                }
-                tag_name.name = name;
-                if (!stack) {
-                    stack = [];
-                    do_begin(name);
-                }
-                tag = html_tag[name];
-                if (typeof tag !== 'object') {
-                    stop('unrecognized_tag_a', tag_name, name);
-                }
-                is_empty = tag.empty;
-                tag_name.type = name;
-                for (;;) {
-                    if (next_token.id === '/') {
-                        advance('/');
-                        if (next_token.id !== '>') {
-                            warn('expected_a_b', next_token, '>', artifact());
-                        }
-                        break;
-                    }
-                    if (next_token.id && next_token.id.charAt(0) === '>') {
-                        break;
-                    }
-                    if (!next_token.identifier) {
-                        if (next_token.id === '(end)' || next_token.id === '(error)') {
-                            warn('expected_a_b', next_token, '>', artifact());
-                        }
-                        warn('bad_name_a');
-                    }
-                    option.white = false;
-                    spaces();
-                    attribute = next_token.string;
-                    option.white = old_white;
-                    advance();
-                    if (!option.cap && attribute !== attribute.toLowerCase()) {
-                        warn('attribute_case_a', token);
-                    }
-                    attribute = attribute.toLowerCase();
-                    xquote = '';
-                    if (Object.prototype.hasOwnProperty.call(attributes, attribute)) {
-                        warn('duplicate_a', token, attribute);
-                    }
-                    if (attribute.slice(0, 2) === 'on') {
-                        if (!option.on) {
-                            warn('html_handlers');
-                        }
-                        xmode = 'scriptstring';
-                        advance('=');
-                        quote = next_token.id;
-                        if (quote !== '"' && quote !== '\'') {
-                            stop('expected_a_b', next_token, '"', artifact());
-                        }
-                        xquote = quote;
-                        wmode = option.white;
-                        option.white = true;
-                        advance(quote);
-                        use_strict();
-                        statements();
-                        option.white = wmode;
-                        if (next_token.id !== quote) {
-                            stop('expected_a_b', next_token, quote, artifact());
-                        }
-                        xmode = 'html';
-                        xquote = '';
-                        advance(quote);
-                        tag = false;
-                    } else if (attribute === 'style') {
-                        xmode = 'scriptstring';
-                        advance('=');
-                        quote = next_token.id;
-                        if (quote !== '"' && quote !== '\'') {
-                            stop('expected_a_b', next_token, '"', artifact());
-                        }
-                        xmode = 'styleproperty';
-                        xquote = quote;
-                        advance(quote);
-                        substyle();
-                        xmode = 'html';
-                        xquote = '';
-                        advance(quote);
-                        tag = false;
-                    } else {
-                        if (next_token.id === '=') {
-                            advance('=');
-                            tag = next_token.string;
-                            if (!next_token.identifier &&
-                                    next_token.id !== '"' &&
-                                    next_token.id !== '\'' &&
-                                    next_token.id !== '(string)' &&
-                                    next_token.id !== '(string)' &&
-                                    next_token.id !== '(color)') {
-                                warn('expected_attribute_value_a', token, attribute);
-                            }
-                            advance();
-                        } else {
-                            tag = true;
-                        }
-                    }
-                    attributes[attribute] = tag;
-                    do_attribute(attribute, tag);
-                }
-                do_tag(name, attributes);
-                if (!is_empty) {
-                    stack.push(tag_name);
-                }
-                xmode = 'outer';
-                advance('>');
-                break;
-            case '</':
-                xmode = 'html';
-                advance('</');
-                if (!next_token.identifier) {
-                    warn('bad_name_a');
-                }
-                name = next_token.string;
-                if (option.cap) {
-                    name = name.toLowerCase();
-                }
-                advance();
-                if (!stack) {
-                    stop('unexpected_a', next_token, closetag(name));
-                }
-                tag_name = stack.pop();
-                if (!tag_name) {
-                    stop('unexpected_a', next_token, closetag(name));
-                }
-                if (tag_name.name !== name) {
-                    stop('expected_a_b',
-                        next_token, closetag(tag_name.name), closetag(name));
-                }
-                if (next_token.id !== '>') {
-                    stop('expected_a_b', next_token, '>', artifact());
-                }
-                xmode = 'outer';
-                advance('>');
-                break;
-            case '<!':
-                if (option.safe) {
-                    warn('adsafe_a');
-                }
-                xmode = 'html';
-                for (;;) {
-                    advance();
-                    if (next_token.id === '>' || next_token.id === '(end)') {
-                        break;
-                    }
-                    if (next_token.string.indexOf('--') >= 0) {
-                        stop('unexpected_a', next_token, '--');
-                    }
-                    if (next_token.string.indexOf('<') >= 0) {
-                        stop('unexpected_a', next_token, '<');
-                    }
-                    if (next_token.string.indexOf('>') >= 0) {
-                        stop('unexpected_a', next_token, '>');
-                    }
-                }
-                xmode = 'outer';
-                advance('>');
-                break;
-            case '(end)':
-                if (stack.length !== 0) {
-                    warn('missing_a', next_token, '</' + stack.pop().string + '>');
-                }
-                return;
-            default:
-                if (next_token.id === '(end)') {
-                    stop('missing_a', next_token,
-                        '</' + stack[stack.length - 1].string + '>');
-                } else {
-                    advance();
-                }
-            }
-            if (stack && stack.length === 0 && (option.adsafe ||
-                    !option.fragment || next_token.id === '(end)')) {
-                break;
-            }
-        }
-        if (next_token.id !== '(end)') {
-            stop('unexpected_a');
-        }
-    }
-
-
-// The actual JSLINT function itself.
-
-    itself = function JSLint(the_source, the_option) {
-
-        var i, predef, tree;
-        JSLINT.errors = [];
-        JSLINT.tree = '';
-        begin = prev_token = token = next_token =
-            Object.create(syntax['(begin)']);
-        predefined = {};
-        add_to_predefined(standard);
-        property = {};
-        if (the_option) {
-            option = Object.create(the_option);
-            predef = option.predef;
-            if (predef) {
-                if (Array.isArray(predef)) {
-                    for (i = 0; i < predef.length; i += 1) {
-                        predefined[predef[i]] = true;
-                    }
-                } else if (typeof predef === 'object') {
-                    add_to_predefined(predef);
-                }
-            }
-            do_safe();
-        } else {
-            option = {};
-        }
-        option.indent = +option.indent || 4;
-        option.maxerr = +option.maxerr || 50;
-        adsafe_id = '';
-        adsafe_may = adsafe_top = adsafe_went = false;
-        approved = {};
-        if (option.approved) {
-            for (i = 0; i < option.approved.length; i += 1) {
-                approved[option.approved[i]] = option.approved[i];
-            }
-        } else {
-            approved.test = 'test';
-        }
-        tab = '';
-        for (i = 0; i < option.indent; i += 1) {
-            tab += ' ';
-        }
-        global_scope = scope = {};
-        global_funct = funct = {
-            '(scope)': scope,
-            '(breakage)': 0,
-            '(loopage)': 0
-        };
-        functions = [funct];
-
-        comments_off = false;
-        ids = {};
-        in_block = false;
-        indent = null;
-        json_mode = false;
-        lookahead = [];
-        node_js = false;
-        prereg = true;
-        src = false;
-        stack = null;
-        strict_mode = false;
-        urls = [];
-        var_mode = null;
-        warnings = 0;
-        xmode = '';
-        lex.init(the_source);
-
-        assume();
-
-        try {
-            advance();
-            if (next_token.id === '(number)') {
-                stop('unexpected_a');
-            } else if (next_token.string.charAt(0) === '<') {
-                html();
-                if (option.adsafe && !adsafe_went) {
-                    warn('adsafe_go', this);
-                }
-            } else {
-                switch (next_token.id) {
-                case '{':
-                case '[':
-                    json_mode = true;
-                    json_value();
-                    break;
-                case '@':
-                case '*':
-                case '#':
-                case '.':
-                case ':':
-                    xmode = 'style';
-                    advance();
-                    if (token.id !== '@' || !next_token.identifier ||
-                            next_token.string !== 'charset' || token.line !== 1 ||
-                            token.from !== 1) {
-                        stop('css');
-                    }
-                    advance();
-                    if (next_token.id !== '(string)' &&
-                            next_token.string !== 'UTF-8') {
-                        stop('css');
-                    }
-                    advance();
-                    semicolon();
-                    styles();
-                    break;
-
-                default:
-                    if (option.adsafe && option.fragment) {
-                        stop('expected_a_b',
-                            next_token, '<div>', artifact());
-                    }
-
-// If the first token is a semicolon, ignore it. This is sometimes used when
-// files are intended to be appended to files that may be sloppy. A sloppy
-// file may be depending on semicolon insertion on its last line.
-
-                    step_in(1);
-                    if (next_token.id === ';' && !node_js) {
-                        semicolon();
-                    }
-                    adsafe_top = true;
-                    tree = statements();
-                    begin.first = tree;
-                    JSLINT.tree = begin;
-                    // infer_types(tree);
-                    if (option.adsafe && (tree.length !== 1 ||
-                            aint(tree[0], 'id', '(') ||
-                            aint(tree[0].first, 'id', '.') ||
-                            aint(tree[0].first.first, 'string', 'ADSAFE') ||
-                            aint(tree[0].first.second, 'string', 'lib') ||
-                            tree[0].second.length !== 2 ||
-                            tree[0].second[0].id !== '(string)' ||
-                            aint(tree[0].second[1], 'id', 'function'))) {
-                        stop('adsafe_lib');
-                    }
-                    if (tree.disrupt) {
-                        warn('weird_program', prev_token);
-                    }
-                }
-            }
-            indent = null;
-            advance('(end)');
-        } catch (e) {
-            if (e) {        // ~~
-                JSLINT.errors.push({
-                    reason    : e.message,
-                    line      : e.line || next_token.line,
-                    character : e.character || next_token.from
-                }, null);
-            }
-        }
-        return JSLINT.errors.length === 0;
-    };
-
-
-// Data summary.
-
-    itself.data = function () {
-        var data = {functions: []},
-            function_data,
-            globals,
-            i,
-            j,
-            kind,
-            members = [],
-            name,
-            the_function,
-            undef = [],
-            unused = [];
-        if (itself.errors.length) {
-            data.errors = itself.errors;
-        }
-
-        if (json_mode) {
-            data.json = true;
-        }
-
-        if (urls.length > 0) {
-            data.urls = urls;
-        }
-
-        globals = Object.keys(global_scope).filter(function (value) {
-            return value.charAt(0) !== '(' && typeof standard[value] !== 'boolean';
-        });
-        if (globals.length > 0) {
-            data.globals = globals;
-        }
-
-        for (i = 1; i < functions.length; i += 1) {
-            the_function = functions[i];
-            function_data = {};
-            for (j = 0; j < functionicity.length; j += 1) {
-                function_data[functionicity[j]] = [];
-            }
-            for (name in the_function) {
-                if (Object.prototype.hasOwnProperty.call(the_function, name)) {
-                    if (name.charAt(0) !== '(') {
-                        kind = the_function[name];
-                        if (kind === 'unction' || kind === 'unparam') {
-                            kind = 'unused';
-                        }
-                        if (Array.isArray(function_data[kind])) {
-                            function_data[kind].push(name);
-                            if (kind === 'unused') {
-                                unused.push({
-                                    name: name,
-                                    line: the_function['(line)'],
-                                    'function': the_function['(name)']
-                                });
-                            } else if (kind === 'undef') {
-                                undef.push({
-                                    name: name,
-                                    line: the_function['(line)'],
-                                    'function': the_function['(name)']
-                                });
-                            }
-                        }
-                    }
-                }
-            }
-            for (j = 0; j < functionicity.length; j += 1) {
-                if (function_data[functionicity[j]].length === 0) {
-                    delete function_data[functionicity[j]];
-                }
-            }
-            function_data.name = the_function['(name)'];
-            function_data.params = the_function['(params)'];
-            function_data.line = the_function['(line)'];
-            data.functions.push(function_data);
-        }
-
-        if (unused.length > 0) {
-            data.unused = unused;
-        }
-        if (undef.length > 0) {
-            data['undefined'] = undef;
-        }
-
-        members = [];
-        for (name in property) {
-            if (typeof property[name] === 'number') {
-                data.member = property;
-                break;
-            }
-        }
-
-        return data;
-    };
-
-
-    itself.report = function (errors_only) {
-        var data = itself.data(), err, evidence, i, italics, j, key, keys,
-            length, mem = '', name, names, not_first, output = [], snippets,
-            the_function, warning;
-
-        function detail(h, value) {
-            var comma_needed, singularity;
-            if (Array.isArray(value)) {
-                output.push('<div><i>' + h + '</i> ');
-                value.sort().forEach(function (item) {
-                    if (item !== singularity) {
-                        singularity = item;
-                        output.push((comma_needed ? ', ' : '') + singularity);
-                        comma_needed = true;
-                    }
-                });
-                output.push('</div>');
-            } else if (value) {
-                output.push('<div><i>' + h + '</i> ' + value + '</div>');
-            }
-        }
-
-        if (data.errors || data.unused || data['undefined']) {
-            err = true;
-            output.push('<div id=errors><i>Error:</i>');
-            if (data.errors) {
-                for (i = 0; i < data.errors.length; i += 1) {
-                    warning = data.errors[i];
-                    if (warning) {
-                        evidence = warning.evidence || '';
-                        output.push('<p>Problem' + (isFinite(warning.line)
-                            ? ' at line ' + String(warning.line) +
-                                ' character ' + String(warning.character)
-                            : '') +
-                            ': ' + warning.reason.entityify() +
-                            '</p><p class=evidence>' +
-                            (evidence && (evidence.length > 80
-                                ? evidence.slice(0, 77) + '...'
-                                : evidence).entityify()) + '</p>');
-                    }
-                }
-            }
-
-            if (data['undefined']) {
-                snippets = [];
-                for (i = 0; i < data['undefined'].length; i += 1) {
-                    snippets[i] = '<code><u>' + data['undefined'][i].name + '</u></code>&nbsp;<i>' +
-                        String(data['undefined'][i].line) + ' </i> <small>' +
-                        data['undefined'][i]['function'] + '</small>';
-                }
-                output.push('<p><i>Undefined variable:</i> ' + snippets.join(', ') + '</p>');
-            }
-            if (data.unused) {
-                snippets = [];
-                for (i = 0; i < data.unused.length; i += 1) {
-                    snippets[i] = '<code><u>' + data.unused[i].name + '</u></code>&nbsp;<i>' +
-                        String(data.unused[i].line) + ' </i> <small>' +
-                        data.unused[i]['function'] + '</small>';
-                }
-                output.push('<p><i>Unused variable:</i> ' + snippets.join(', ') + '</p>');
-            }
-            if (data.json) {
-                output.push('<p>JSON: bad.</p>');
-            }
-            output.push('</div>');
-        }
-
-        if (!errors_only) {
-
-            output.push('<br><div id=functions>');
-
-            if (data.urls) {
-                detail("URLs<br>", data.urls, '<br>');
-            }
-
-            if (xmode === 'style') {
-                output.push('<p>CSS.</p>');
-            } else if (data.json && !err) {
-                output.push('<p>JSON: good.</p>');
-            } else if (data.globals) {
-                output.push('<div><i>Global</i> ' +
-                    data.globals.sort().join(', ') + '</div>');
-            } else {
-                output.push('<div><i>No new global variables introduced.</i></div>');
-            }
-
-            for (i = 0; i < data.functions.length; i += 1) {
-                the_function = data.functions[i];
-                names = [];
-                if (the_function.params) {
-                    for (j = 0; j < the_function.params.length; j += 1) {
-                        names[j] = the_function.params[j].string;
-                    }
-                }
-                output.push('<br><div class=function><i>' +
-                    String(the_function.line) + '</i> ' +
-                    the_function.name.entityify() +
-                    '(' + names.join(', ') + ')</div>');
-                detail('<big><b>Undefined</b></big>', the_function['undefined']);
-                detail('<big><b>Unused</b></big>', the_function.unused);
-                detail('Closure', the_function.closure);
-                detail('Variable', the_function['var']);
-                detail('Exception', the_function.exception);
-                detail('Outer', the_function.outer);
-                detail('Global', the_function.global);
-                detail('Label', the_function.label);
-            }
-
-            if (data.member) {
-                keys = Object.keys(data.member);
-                if (keys.length) {
-                    keys = keys.sort();
-                    output.push('<br><pre id=properties>/*properties<br>');
-                    mem = '    ';
-                    italics = 0;
-                    j = 0;
-                    not_first = false;
-                    for (i = 0; i < keys.length; i += 1) {
-                        key = keys[i];
-                        if (data.member[key] > 0) {
-                            if (not_first) {
-                                mem += ', ';
-                            }
-                            name = ix.test(key)
-                                ? key
-                                : '\'' + key.entityify().replace(nx, sanitize) + '\'';
-                            length += name.length + 2;
-                            if (data.member[key] === 1) {
-                                name = '<i>' + name + '</i>';
-                                italics += 1;
-                                j = 1;
-                            }
-                            if (mem.length + name.length - (italics * 7) > 80) {
-                                output.push(mem + '<br>');
-                                mem = '    ';
-                                italics = j;
-                            }
-                            mem += name;
-                            j = 0;
-                            not_first = true;
-                        }
-                    }
-                    output.push(mem + '<br>*/</pre>');
-                }
-                output.push('</div>');
-            }
-        }
-        return output.join('');
-    };
-    itself.jslint = itself;
-
-    itself.edition = '2012-04-15';
-
-    return itself;
-}());
-core.JSLint = function JSLint() {
-  this.JSLINT = JSLINT;
-};
-
diff --git a/apps/files_odfviewer/src/webodf/webodf/lib/core/PointWalker.js b/apps/files_odfviewer/src/webodf/webodf/lib/core/PointWalker.js
deleted file mode 100644
index f3f0008f78..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/lib/core/PointWalker.js
+++ /dev/null
@@ -1,197 +0,0 @@
-/**
- * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
- * @licstart
- * The JavaScript code in this page is free software: you can redistribute it
- * and/or modify it under the terms of the GNU Affero General Public License
- * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.  The code is distributed
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
- *
- * As additional permission under GNU AGPL version 3 section 7, you
- * may distribute non-source (e.g., minimized or compacted) forms of
- * that code without the copy of the GNU GPL normally required by
- * section 4, provided you include this license notice and a URL
- * through which recipients can access the Corresponding Source.
- *
- * As a special exception to the AGPL, any HTML file which merely makes function
- * calls to this code, and for that purpose includes it by reference shall be
- * deemed a separate work for copyright law purposes. In addition, the copyright
- * holders of this code give you permission to combine this code with free
- * software libraries that are released under the GNU LGPL. You may copy and
- * distribute such a system following the terms of the GNU AGPL for this code
- * and the LGPL for the libraries. If you modify this code, you may extend this
- * exception to your version of the code, but you are not obligated to do so.
- * If you do not wish to do so, delete this exception statement from your
- * version.
- *
- * This license applies to this entire compilation.
- * @licend
- * @source: http://www.webodf.org/
- * @source: http://gitorious.org/odfkit/webodf/
- */
-/*global core: true, Node: true*/
-/**
- * A simple walker that allows finegrained stepping through the DOM.
- * It does not support node filtering.
- * TODO: write a position walker that uses a treewalker
- * @constructor
- * @param {!Node} node
- */
-core.PointWalker = function PointWalker(node) {
-    "use strict";
-    var currentNode = node,
-        before = null, // node before the point
-        after = node && node.firstChild, // node after the point
-        root = node,
-        pos = 0;
-
-    /**
-     * @param {!Node} node
-     * @return {!number}
-     */
-    function getPosition(node) {
-        var /**@type{!number}*/ p = -1,
-            /**@type{Node}*/ n = node;
-        while (n) {
-            n = n.previousSibling;
-            p += 1;
-        }
-        return p;
-    }
-    /**
-     * Move the walker to the point given by @p node and @p position.
-     * @param {!Element} node must be the root of this walker or part of the
-     *                   tree of this walker.
-     * @param {!number} position must be a valid position in @node.
-     **/
-    this.setPoint = function (node, position) {
-        currentNode = node;
-        pos = position;
-        if (currentNode.nodeType === 3) { // Node.TEXT_NODE
-            after = null;
-            before = null;
-        } else {
-            after = currentNode.firstChild;
-            while (position) {
-                position -= 1;
-                after = after.nextSibling;
-            }
-            if (after) {
-                before = after.previousSibling;
-            } else {
-                before = currentNode.lastChild;
-            }
-        }
-    };
-    /**
-     * @return {!boolean}
-     */
-    this.stepForward = function () {
-        var len;
-        // if this is a text node, move to the next position in the text
-        if (currentNode.nodeType === 3) { // TEXT_NODE
-            if (typeof currentNode.nodeValue.length === "number") {
-                len = currentNode.nodeValue.length;
-            } else {
-                len = currentNode.nodeValue.length();
-            }
-            if (pos < len) {
-                pos += 1;
-                return true;
-            }
-        }
-        if (after) {
-            if (after.nodeType === 1) { // ELEMENT_NODE
-                currentNode = after;
-                before = null;
-                after = currentNode.firstChild;
-                pos = 0;
-            } else if (after.nodeType === 3) { // TEXT_NODE
-                currentNode = after;
-                before = null;
-                after = null;
-                pos = 0;
-            } else {
-                before = after;
-                after = after.nextSibling;
-                pos += 1;
-            }
-            return true;
-        }
-        if (currentNode !== root) {
-            before = currentNode;
-            after = before.nextSibling;
-            currentNode = currentNode.parentNode;
-            pos = getPosition(before) + 1;
-            return true;
-        }
-        return false;
-    };
-    /**
-     * @return {!boolean}
-     */
-    this.stepBackward = function () {
-        // if this is a text node, move to the next position in the text
-        if (currentNode.nodeType === 3) { // TEXT_NODE
-            if (pos > 0) {
-                pos -= 1;
-                return true;
-            }
-        }
-        if (before) {
-            if (before.nodeType === 1) { // ELEMENT_NODE
-                currentNode = before;
-                before = currentNode.lastChild;
-                after = null;
-                pos = getPosition(before) + 1;
-            } else if (before.nodeType === 3) { // TEXT_NODE
-                currentNode = before;
-                before = null;
-                after = null;
-                if (typeof currentNode.nodeValue.length === "number") {
-                    pos = currentNode.nodeValue.length;
-                } else {
-                    pos = currentNode.nodeValue.length();
-                }
-            } else {
-                after = before;
-                before = before.previousSibling;
-                pos -= 1;
-            }
-            return true;
-        }
-        if (currentNode !== root) {
-            after = currentNode;
-            before = after.previousSibling;
-            currentNode = currentNode.parentNode;
-            pos = getPosition(after);
-            return true;
-        }
-        return false;
-    };
-    /**
-     * @return {?Node}
-     */
-    this.node = function () {
-        return currentNode;
-    };
-    /**
-     * @return {!number}
-     */
-    this.position = function () {
-        return pos;
-    };
-    /**
-     * @return {?Node}
-     */
-    this.precedingSibling = function () {
-        return before;
-    };
-    /**
-     * @return {?Node}
-     */
-    this.followingSibling = function () {
-        return after;
-    };
-};
diff --git a/apps/files_odfviewer/src/webodf/webodf/lib/core/RawDeflate.js b/apps/files_odfviewer/src/webodf/webodf/lib/core/RawDeflate.js
deleted file mode 100644
index 5fdd2b02de..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/lib/core/RawDeflate.js
+++ /dev/null
@@ -1,1833 +0,0 @@
-/**
- * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
- * @licstart
- * The JavaScript code in this page is free software: you can redistribute it
- * and/or modify it under the terms of the GNU Affero General Public License
- * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.  The code is distributed
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
- *
- * As additional permission under GNU AGPL version 3 section 7, you
- * may distribute non-source (e.g., minimized or compacted) forms of
- * that code without the copy of the GNU GPL normally required by
- * section 4, provided you include this license notice and a URL
- * through which recipients can access the Corresponding Source.
- *
- * As a special exception to the AGPL, any HTML file which merely makes function
- * calls to this code, and for that purpose includes it by reference shall be
- * deemed a separate work for copyright law purposes. In addition, the copyright
- * holders of this code give you permission to combine this code with free
- * software libraries that are released under the GNU LGPL. You may copy and
- * distribute such a system following the terms of the GNU AGPL for this code
- * and the LGPL for the libraries. If you modify this code, you may extend this
- * exception to your version of the code, but you are not obligated to do so.
- * If you do not wish to do so, delete this exception statement from your
- * version.
- *
- * This license applies to this entire compilation.
- * @licend
- * @source: http://www.webodf.org/
- * @source: http://gitorious.org/odfkit/webodf/
- */
-/*global core, runtime*/
-/*jslint bitwise: true, white: false, plusplus: true, vars: true, continue: true*/
-/*
- * $Id: rawdeflate.js,v 0.3 2009/03/01 19:05:05 dankogai Exp dankogai $
- *
- * Original:
- *   http://www.onicos.com/staff/iz/amuse/javascript/expert/deflate.txt
- */
-/**
- * @constructor
- */
-core.RawDeflate = function () {
-    "use strict";
-    /* Copyright (C) 1999 Masanao Izumo <iz@onicos.co.jp>
-     * Version: 1.0.1
-     * LastModified: Dec 25 1999
-     */
-
-    /* Interface:
-     * data = zip_deflate(src);
-     */
-
-    /* constant parameters */
-    var zip_WSIZE = 32768,        // Sliding Window size
-        zip_STORED_BLOCK = 0,
-        zip_STATIC_TREES = 1,
-        zip_DYN_TREES    = 2,
-
-    /* for deflate */
-        zip_DEFAULT_LEVEL = 6,
-        zip_FULL_SEARCH = true,
-        zip_INBUFSIZ = 32768,    // Input buffer size
-        zip_INBUF_EXTRA = 64,    // Extra buffer
-        zip_OUTBUFSIZ = 1024 * 8,
-        zip_window_size = 2 * zip_WSIZE,
-        zip_MIN_MATCH = 3,
-        zip_MAX_MATCH = 258,
-        zip_BITS = 16,
-    // for SMALL_MEM
-        zip_LIT_BUFSIZE = 0x2000,
-        zip_HASH_BITS = 13,
-    // for MEDIUM_MEM
-    // var zip_LIT_BUFSIZE = 0x4000;
-    // var zip_HASH_BITS = 14;
-    // for BIG_MEM
-    // var zip_LIT_BUFSIZE = 0x8000;
-        zip_DIST_BUFSIZE = zip_LIT_BUFSIZE,
-        zip_HASH_SIZE = 1 << zip_HASH_BITS,
-        zip_HASH_MASK = zip_HASH_SIZE - 1,
-        zip_WMASK = zip_WSIZE - 1,
-        zip_NIL = 0, // Tail of hash chains
-        zip_TOO_FAR = 4096,
-        zip_MIN_LOOKAHEAD = zip_MAX_MATCH + zip_MIN_MATCH + 1,
-        zip_MAX_DIST = zip_WSIZE - zip_MIN_LOOKAHEAD,
-        zip_SMALLEST = 1,
-        zip_MAX_BITS = 15,
-        zip_MAX_BL_BITS = 7,
-        zip_LENGTH_CODES = 29,
-        zip_LITERALS = 256,
-        zip_END_BLOCK = 256,
-        zip_L_CODES = zip_LITERALS + 1 + zip_LENGTH_CODES,
-        zip_D_CODES = 30,
-        zip_BL_CODES = 19,
-        zip_REP_3_6 = 16,
-        zip_REPZ_3_10 = 17,
-        zip_REPZ_11_138 = 18,
-        zip_HEAP_SIZE = 2 * zip_L_CODES + 1,
-        zip_H_SHIFT = parseInt((zip_HASH_BITS + zip_MIN_MATCH - 1) /
-                zip_MIN_MATCH, 10),
-
-    /* variables */
-        zip_free_queue,
-        zip_qhead,
-        zip_qtail,
-        zip_initflag,
-        zip_outbuf = null,
-        zip_outcnt,
-        zip_outoff,
-        zip_complete,
-        zip_window,
-        zip_d_buf,
-        zip_l_buf,
-        zip_prev,
-        zip_bi_buf,
-        zip_bi_valid,
-        zip_block_start,
-        zip_ins_h,
-        zip_hash_head,
-        zip_prev_match,
-        zip_match_available,
-        zip_match_length,
-        zip_prev_length,
-        zip_strstart,
-        zip_match_start,
-        zip_eofile,
-        zip_lookahead,
-        zip_max_chain_length,
-        zip_max_lazy_match,
-        zip_compr_level,
-        zip_good_match,
-        zip_nice_match,
-        zip_dyn_ltree,
-        zip_dyn_dtree,
-        zip_static_ltree,
-        zip_static_dtree,
-        zip_bl_tree,
-        zip_l_desc,
-        zip_d_desc,
-        zip_bl_desc,
-        zip_bl_count,
-        zip_heap,
-        zip_heap_len,
-        zip_heap_max,
-        zip_depth,
-        zip_length_code,
-        zip_dist_code,
-        zip_base_length,
-        zip_base_dist,
-        zip_flag_buf,
-        zip_last_lit,
-        zip_last_dist,
-        zip_last_flags,
-        zip_flags,
-        zip_flag_bit,
-        zip_opt_len,
-        zip_static_len,
-        zip_deflate_data,
-        zip_deflate_pos,
-    // var zip_HASH_BITS = 15;
-    /* constant tables */
-        zip_extra_lbits = [0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5, 0],
-        zip_extra_dbits = [0, 0, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6, 7, 7, 8, 8, 9, 9, 10, 10, 11, 11, 12, 12, 13, 13],
-        zip_extra_blbits = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 3, 7],
-        zip_bl_order = [16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15],
-        zip_configuration_table;
-    if (zip_LIT_BUFSIZE > zip_INBUFSIZ) {
-        runtime.log("error: zip_INBUFSIZ is too small");
-    }
-    if ((zip_WSIZE << 1) > (1 << zip_BITS)) {
-        runtime.log("error: zip_WSIZE is too large");
-    }
-    if (zip_HASH_BITS > zip_BITS - 1) {
-        runtime.log("error: zip_HASH_BITS is too large");
-    }
-    if (zip_HASH_BITS < 8 || zip_MAX_MATCH !== 258) {
-        runtime.log("error: Code too clever");
-    }
-
-    /* objects (deflate) */
-    /**
-     * @constructor
-     */
-    function Zip_DeflateCT() {
-        this.fc = 0; // frequency count or bit string
-        this.dl = 0; // father node in Huffman tree or length of bit string
-    }
-    /**
-     * @constructor
-     */
-    function Zip_DeflateTreeDesc() {
-        this.dyn_tree = null;    // the dynamic tree
-        this.static_tree = null;    // corresponding static tree or NULL
-        this.extra_bits = null;    // extra bits for each code or NULL
-        this.extra_base = 0;    // base index for extra_bits
-        this.elems = 0;        // max number of elements in the tree
-        this.max_length = 0;    // max bit length for the codes
-        this.max_code = 0;        // largest code with non zero frequency
-    }
-
-    /** Values for max_lazy_match, good_match and max_chain_length, depending on
-     * the desired pack level (0..9). The values given below have been tuned to
-     * exclude worst case performance for pathological files. Better values may be
-     * found for specific files.
-     * @constructor
-     */
-    function Zip_DeflateConfiguration(a, b, c, d) {
-        this.good_length = a; // reduce lazy search above this match length
-        this.max_lazy = b;    // do not perform lazy search above this match length
-        this.nice_length = c; // quit search above this match length
-        this.max_chain = d;
-    }
-
-    /**
-     * @constructor
-     */
-    function Zip_DeflateBuffer() {
-        this.next = null;
-        this.len = 0;
-        this.ptr = [];
-        this.ptr.length = zip_OUTBUFSIZ;
-        this.off = 0;
-    }
-
-    /* constant tables */
-    zip_configuration_table = [
-        new Zip_DeflateConfiguration(0,    0,   0,    0),
-        new Zip_DeflateConfiguration(4,    4,   8,    4),
-        new Zip_DeflateConfiguration(4,    5,  16,    8),
-        new Zip_DeflateConfiguration(4,    6,  32,   32),
-        new Zip_DeflateConfiguration(4,    4,  16,   16),
-        new Zip_DeflateConfiguration(8,   16,  32,   32),
-        new Zip_DeflateConfiguration(8,   16, 128,  128),
-        new Zip_DeflateConfiguration(8,   32, 128,  256),
-        new Zip_DeflateConfiguration(32, 128, 258, 1024),
-        new Zip_DeflateConfiguration(32, 258, 258, 4096)
-    ];
-
-
-    /* routines (deflate) */
-
-    function zip_deflate_start(level) {
-        var i;
-
-        if (!level) {
-            level = zip_DEFAULT_LEVEL;
-        } else if (level < 1) {
-            level = 1;
-        } else if (level > 9) {
-            level = 9;
-        }
-
-        zip_compr_level = level;
-        zip_initflag = false;
-        zip_eofile = false;
-        if (zip_outbuf !== null) {
-            return;
-        }
-
-        zip_free_queue = zip_qhead = zip_qtail = null;
-        zip_outbuf = [];
-        zip_outbuf.length = zip_OUTBUFSIZ;
-        zip_window = [];
-        zip_window.length = zip_window_size;
-        zip_d_buf = [];
-        zip_d_buf.length = zip_DIST_BUFSIZE;
-        zip_l_buf = [];
-        zip_l_buf.length = zip_INBUFSIZ + zip_INBUF_EXTRA;
-        zip_prev = [];
-        zip_prev.length = 1 << zip_BITS;
-        zip_dyn_ltree = [];
-        zip_dyn_ltree.length = zip_HEAP_SIZE;
-        for (i = 0; i < zip_HEAP_SIZE; i++) {
-            zip_dyn_ltree[i] = new Zip_DeflateCT();
-        }
-        zip_dyn_dtree = [];
-        zip_dyn_dtree.length = 2 * zip_D_CODES + 1;
-        for (i = 0; i < 2 * zip_D_CODES + 1; i++) {
-            zip_dyn_dtree[i] = new Zip_DeflateCT();
-        }
-        zip_static_ltree = [];
-        zip_static_ltree.length = zip_L_CODES + 2;
-        for (i = 0; i < zip_L_CODES + 2; i++) {
-            zip_static_ltree[i] = new Zip_DeflateCT();
-        }
-        zip_static_dtree = [];
-        zip_static_dtree.length = zip_D_CODES;
-        for (i = 0; i < zip_D_CODES; i++) {
-            zip_static_dtree[i] = new Zip_DeflateCT();
-        }
-        zip_bl_tree = [];
-        zip_bl_tree.length = 2 * zip_BL_CODES + 1;
-        for (i = 0; i < 2 * zip_BL_CODES + 1; i++) {
-            zip_bl_tree[i] = new Zip_DeflateCT();
-        }
-        zip_l_desc = new Zip_DeflateTreeDesc();
-        zip_d_desc = new Zip_DeflateTreeDesc();
-        zip_bl_desc = new Zip_DeflateTreeDesc();
-        zip_bl_count = [];
-        zip_bl_count.length = zip_MAX_BITS + 1;
-        zip_heap = [];
-        zip_heap.length = 2 * zip_L_CODES + 1;
-        zip_depth = [];
-        zip_depth.length = 2 * zip_L_CODES + 1;
-        zip_length_code = [];
-        zip_length_code.length = zip_MAX_MATCH - zip_MIN_MATCH + 1;
-        zip_dist_code = [];
-        zip_dist_code.length = 512;
-        zip_base_length = [];
-        zip_base_length.length = zip_LENGTH_CODES;
-        zip_base_dist = [];
-        zip_base_dist.length = zip_D_CODES;
-        zip_flag_buf = [];
-        zip_flag_buf.length = parseInt(zip_LIT_BUFSIZE / 8, 10);
-    }
-
-    var zip_deflate_end = function () {
-        zip_free_queue = zip_qhead = zip_qtail = null;
-        zip_outbuf = null;
-        zip_window = null;
-        zip_d_buf = null;
-        zip_l_buf = null;
-        zip_prev = null;
-        zip_dyn_ltree = null;
-        zip_dyn_dtree = null;
-        zip_static_ltree = null;
-        zip_static_dtree = null;
-        zip_bl_tree = null;
-        zip_l_desc = null;
-        zip_d_desc = null;
-        zip_bl_desc = null;
-        zip_bl_count = null;
-        zip_heap = null;
-        zip_depth = null;
-        zip_length_code = null;
-        zip_dist_code = null;
-        zip_base_length = null;
-        zip_base_dist = null;
-        zip_flag_buf = null;
-    };
-
-    var zip_reuse_queue = function (p) {
-        p.next = zip_free_queue;
-        zip_free_queue = p;
-    };
-
-    var zip_new_queue = function () {
-        var p;
-
-        if (zip_free_queue !== null) {
-            p = zip_free_queue;
-            zip_free_queue = zip_free_queue.next;
-        } else {
-            p = new Zip_DeflateBuffer();
-        }
-        p.next = null;
-        p.len = p.off = 0;
-
-        return p;
-    };
-
-    var zip_head1 = function (i) {
-        return zip_prev[zip_WSIZE + i];
-    };
-
-    var zip_head2 = function (i, val) {
-        zip_prev[zip_WSIZE + i] = val;
-        return val;
-    };
-
-    var zip_qoutbuf = function () {
-        var q, i;
-        if (zip_outcnt !== 0) {
-            q = zip_new_queue();
-            if (zip_qhead === null) {
-                zip_qhead = zip_qtail = q;
-            } else {
-                zip_qtail = zip_qtail.next = q;
-            }
-            q.len = zip_outcnt - zip_outoff;
-    //      System.arraycopy(zip_outbuf, zip_outoff, q.ptr, 0, q.len);
-            for (i = 0; i < q.len; i++) {
-                q.ptr[i] = zip_outbuf[zip_outoff + i];
-            }
-            zip_outcnt = zip_outoff = 0;
-        }
-    };
-
-    /* put_byte is used for the compressed output, put_ubyte for the
-     * uncompressed output. However unlzw() uses window for its
-     * suffix table instead of its output buffer, so it does not use put_ubyte
-     * (to be cleaned up).
-     */
-    var zip_put_byte = function (c) {
-        zip_outbuf[zip_outoff + zip_outcnt++] = c;
-        if (zip_outoff + zip_outcnt === zip_OUTBUFSIZ) {
-            zip_qoutbuf();
-        }
-    };
-
-    /* Output a 16 bit value, lsb first */
-    var zip_put_short = function (w) {
-        w &= 0xffff;
-        if (zip_outoff + zip_outcnt < zip_OUTBUFSIZ - 2) {
-            zip_outbuf[zip_outoff + zip_outcnt++] = (w & 0xff);
-            zip_outbuf[zip_outoff + zip_outcnt++] = (w >>> 8);
-        } else {
-            zip_put_byte(w & 0xff);
-            zip_put_byte(w >>> 8);
-        }
-    };
-
-    /* ==========================================================================
-     * Insert string s in the dictionary and set match_head to the previous head
-     * of the hash chain (the most recent string with same hash key). Return
-     * the previous length of the hash chain.
-     * IN  assertion: all calls to to INSERT_STRING are made with consecutive
-     *    input characters and the first MIN_MATCH bytes of s are valid
-     *    (except for the last MIN_MATCH-1 bytes of the input file).
-     */
-    var zip_INSERT_STRING = function () {
-        zip_ins_h = ((zip_ins_h << zip_H_SHIFT)
-             ^ (zip_window[zip_strstart + zip_MIN_MATCH - 1] & 0xff))
-            & zip_HASH_MASK;
-        zip_hash_head = zip_head1(zip_ins_h);
-        zip_prev[zip_strstart & zip_WMASK] = zip_hash_head;
-        zip_head2(zip_ins_h, zip_strstart);
-    };
-
-    /* ==========================================================================
-     * Send a value on a given number of bits.
-     * IN assertion: length <= 16 and value fits in length bits.
-     */
-    var zip_Buf_size = 16; // bit size of bi_buf
-    var zip_send_bits = function (
-        value,    // value to send
-        length
-    ) {    // number of bits
-        /* If not enough room in bi_buf, use (valid) bits from bi_buf and
-         * (16 - bi_valid) bits from value, leaving (width - (16-bi_valid))
-         * unused bits in value.
-         */
-        if (zip_bi_valid > zip_Buf_size - length) {
-            zip_bi_buf |= (value << zip_bi_valid);
-            zip_put_short(zip_bi_buf);
-            zip_bi_buf = (value >> (zip_Buf_size - zip_bi_valid));
-            zip_bi_valid += length - zip_Buf_size;
-        } else {
-            zip_bi_buf |= value << zip_bi_valid;
-            zip_bi_valid += length;
-        }
-    };
-
-    /* Send a code of the given tree. c and tree must not have side effects */
-    var zip_SEND_CODE = function (c, tree) {
-        zip_send_bits(tree[c].fc, tree[c].dl);
-    };
-
-    /* Mapping from a distance to a distance code. dist is the distance - 1 and
-     * must not have side effects. dist_code[256] and dist_code[257] are never
-     * used.
-     */
-    var zip_D_CODE = function (dist) {
-        return (dist < 256 ? zip_dist_code[dist]
-            : zip_dist_code[256 + (dist >> 7)]) & 0xff;
-    };
-
-    /* ==========================================================================
-     * Compares to subtrees, using the tree depth as tie breaker when
-     * the subtrees have equal frequency. This minimizes the worst case length.
-     */
-    var zip_SMALLER = function (tree, n, m) {
-        return tree[n].fc < tree[m].fc ||
-            (tree[n].fc === tree[m].fc && zip_depth[n] <= zip_depth[m]);
-    };
-
-    /* ==========================================================================
-     * read string data
-     */
-    var zip_read_buff = function (buff, offset, n) {
-        var i;
-        for (i = 0; i < n && zip_deflate_pos < zip_deflate_data.length; i++) {
-            buff[offset + i] =
-                zip_deflate_data.charCodeAt(zip_deflate_pos++) & 0xff;
-        }
-        return i;
-    };
-
-    /* ==========================================================================
-     * Fill the window when the lookahead becomes insufficient.
-     * Updates strstart and lookahead, and sets eofile if end of input file.
-     * IN assertion: lookahead < MIN_LOOKAHEAD && strstart + lookahead > 0
-     * OUT assertions: at least one byte has been read, or eofile is set;
-     *    file reads are performed for at least two bytes (required for the
-     *    translate_eol option).
-     */
-    var zip_fill_window = function () {
-        var n, m;
-
-        // Amount of free space at the end of the window.
-        var more = zip_window_size - zip_lookahead - zip_strstart;
-
-        /* If the window is almost full and there is insufficient lookahead,
-         * move the upper half to the lower one to make room in the upper half.
-         */
-        if (more === -1) {
-        /* Very unlikely, but possible on 16 bit machine if strstart == 0
-             * and lookahead == 1 (input done one byte at time)
-             */
-            more--;
-        } else if (zip_strstart >= zip_WSIZE + zip_MAX_DIST) {
-        /* By the IN assertion, the window is not empty so we can't confuse
-             * more == 0 with more == 64K on a 16 bit machine.
-             */
-    //    Assert(window_size == (ulg)2*WSIZE, "no sliding with BIG_MEM");
-
-    //    System.arraycopy(window, WSIZE, window, 0, WSIZE);
-            for (n = 0; n < zip_WSIZE; n++) {
-                zip_window[n] = zip_window[n + zip_WSIZE];
-            }
-
-            zip_match_start -= zip_WSIZE;
-            zip_strstart    -= zip_WSIZE; /* we now have strstart >= MAX_DIST: */
-            zip_block_start -= zip_WSIZE;
-
-            for (n = 0; n < zip_HASH_SIZE; n++) {
-                m = zip_head1(n);
-                zip_head2(n, m >= zip_WSIZE ? m - zip_WSIZE : zip_NIL);
-            }
-            for (n = 0; n < zip_WSIZE; n++) {
-            /* If n is not on any hash chain, prev[n] is garbage but
-             * its value will never be used.
-             */
-                m = zip_prev[n];
-                zip_prev[n] = (m >= zip_WSIZE ? m - zip_WSIZE : zip_NIL);
-            }
-            more += zip_WSIZE;
-        }
-        // At this point, more >= 2
-        if (!zip_eofile) {
-            n = zip_read_buff(zip_window, zip_strstart + zip_lookahead, more);
-            if (n <= 0) {
-                zip_eofile = true;
-            } else {
-                zip_lookahead += n;
-            }
-        }
-    };
-
-
-    /* ==========================================================================
-     * Initialize the "longest match" routines for a new file
-     */
-    var zip_lm_init = function () {
-        var j;
-
-        /* Initialize the hash table. */
-        for (j = 0; j < zip_HASH_SIZE; j++) {
-    //    zip_head2(j, zip_NIL);
-            zip_prev[zip_WSIZE + j] = 0;
-        }
-        /* prev will be initialized on the fly */
-
-        /* Set the default configuration parameters:
-         */
-        zip_max_lazy_match = zip_configuration_table[zip_compr_level].max_lazy;
-        zip_good_match     = zip_configuration_table[zip_compr_level].good_length;
-        if (!zip_FULL_SEARCH) {
-            zip_nice_match = zip_configuration_table[zip_compr_level].nice_length;
-        }
-        zip_max_chain_length = zip_configuration_table[zip_compr_level].max_chain;
-
-        zip_strstart = 0;
-        zip_block_start = 0;
-
-        zip_lookahead = zip_read_buff(zip_window, 0, 2 * zip_WSIZE);
-        if (zip_lookahead <= 0) {
-            zip_eofile = true;
-            zip_lookahead = 0;
-            return;
-        }
-        zip_eofile = false;
-        /* Make sure that we always have enough lookahead. This is important
-         * if input comes from a device such as a tty.
-         */
-        while (zip_lookahead < zip_MIN_LOOKAHEAD && !zip_eofile) {
-            zip_fill_window();
-        }
-
-        /* If lookahead < MIN_MATCH, ins_h is garbage, but this is
-         * not important since only literal bytes will be emitted.
-         */
-        zip_ins_h = 0;
-        for (j = 0; j < zip_MIN_MATCH - 1; j++) {
-    //      UPDATE_HASH(ins_h, window[j]);
-            zip_ins_h = ((zip_ins_h << zip_H_SHIFT) ^ (zip_window[j] & 0xff)) & zip_HASH_MASK;
-        }
-    };
-
-    /* ==========================================================================
-     * Set match_start to the longest match starting at the given string and
-     * return its length. Matches shorter or equal to prev_length are discarded,
-     * in which case the result is equal to prev_length and match_start is
-     * garbage.
-     * IN assertions: cur_match is the head of the hash chain for the current
-     *   string (strstart) and its distance is <= MAX_DIST, and prev_length >= 1
-     */
-    var zip_longest_match = function (cur_match) {
-        var chain_length = zip_max_chain_length; // max hash chain length
-        var scanp = zip_strstart; // current string
-        var matchp;        // matched string
-        var len;        // length of current match
-        var best_len = zip_prev_length;    // best match length so far
-
-        /* Stop when cur_match becomes <= limit. To simplify the code,
-         * we prevent matches with the string of window index 0.
-         */
-        var limit = (zip_strstart > zip_MAX_DIST ? zip_strstart - zip_MAX_DIST : zip_NIL);
-
-        var strendp = zip_strstart + zip_MAX_MATCH;
-        var scan_end1 = zip_window[scanp + best_len - 1];
-        var scan_end  = zip_window[scanp + best_len];
-
-        /* Do not waste too much time if we already have a good match: */
-        if (zip_prev_length >= zip_good_match) {
-            chain_length >>= 2;
-        }
-
-    //  Assert(encoder->strstart <= window_size-MIN_LOOKAHEAD, "insufficient lookahead");
-
-        do {
-    //    Assert(cur_match < encoder->strstart, "no future");
-            matchp = cur_match;
-
-        /* Skip to next match if the match length cannot increase
-            * or if the match length is less than 2:
-        */
-            if (zip_window[matchp + best_len]    !== scan_end  ||
-                    zip_window[matchp + best_len - 1]    !== scan_end1 ||
-                    zip_window[matchp]            !== zip_window[scanp] ||
-                    zip_window[++matchp]            !== zip_window[scanp + 1]) {
-                continue;
-            }
-
-        /* The check at best_len-1 can be removed because it will be made
-             * again later. (This heuristic is not always a win.)
-             * It is not necessary to compare scan[2] and match[2] since they
-             * are always equal when the other bytes match, given that
-             * the hash keys are equal and that HASH_BITS >= 8.
-             */
-            scanp += 2;
-            matchp++;
-
-        /* We check for insufficient lookahead only every 8th comparison;
-             * the 256th check will be made at strstart+258.
-             */
-            do {
-                ++scanp;
-            } while (zip_window[scanp] === zip_window[++matchp] &&
-                zip_window[++scanp] === zip_window[++matchp] &&
-                zip_window[++scanp] === zip_window[++matchp] &&
-                zip_window[++scanp] === zip_window[++matchp] &&
-                zip_window[++scanp] === zip_window[++matchp] &&
-                zip_window[++scanp] === zip_window[++matchp] &&
-                zip_window[++scanp] === zip_window[++matchp] &&
-                zip_window[++scanp] === zip_window[++matchp] &&
-                scanp < strendp);
-
-            len = zip_MAX_MATCH - (strendp - scanp);
-            scanp = strendp - zip_MAX_MATCH;
-
-            if (len > best_len) {
-                zip_match_start = cur_match;
-                best_len = len;
-                if (zip_FULL_SEARCH) {
-                    if (len >= zip_MAX_MATCH) {
-                        break;
-                    }
-                } else {
-                    if (len >= zip_nice_match) {
-                        break;
-                    }
-                }
-
-                scan_end1  = zip_window[scanp + best_len - 1];
-                scan_end   = zip_window[scanp + best_len];
-            }
-        } while ((cur_match = zip_prev[cur_match & zip_WMASK]) > limit
-            && --chain_length !== 0);
-
-        return best_len;
-    };
-
-    /* ==========================================================================
-     * Save the match info and tally the frequency counts. Return true if
-     * the current block must be flushed.
-     */
-    var zip_ct_tally = function (
-        dist, // distance of matched string
-        lc
-    ) { // match length-MIN_MATCH or unmatched char (if dist==0)
-        zip_l_buf[zip_last_lit++] = lc;
-        if (dist === 0) {
-        // lc is the unmatched char
-            zip_dyn_ltree[lc].fc++;
-        } else {
-        // Here, lc is the match length - MIN_MATCH
-            dist--;            // dist = match distance - 1
-    //      Assert((ush)dist < (ush)MAX_DIST &&
-    //         (ush)lc <= (ush)(MAX_MATCH-MIN_MATCH) &&
-    //         (ush)D_CODE(dist) < (ush)D_CODES,  "ct_tally: bad match");
-
-            zip_dyn_ltree[zip_length_code[lc] + zip_LITERALS + 1].fc++;
-            zip_dyn_dtree[zip_D_CODE(dist)].fc++;
-
-            zip_d_buf[zip_last_dist++] = dist;
-            zip_flags |= zip_flag_bit;
-        }
-        zip_flag_bit <<= 1;
-
-        // Output the flags if they fill a byte
-        if ((zip_last_lit & 7) === 0) {
-            zip_flag_buf[zip_last_flags++] = zip_flags;
-            zip_flags = 0;
-            zip_flag_bit = 1;
-        }
-        // Try to guess if it is profitable to stop the current block here
-        if (zip_compr_level > 2 && (zip_last_lit & 0xfff) === 0) {
-        // Compute an upper bound for the compressed length
-            var out_length = zip_last_lit * 8;
-            var in_length = zip_strstart - zip_block_start;
-            var dcode;
-
-            for (dcode = 0; dcode < zip_D_CODES; dcode++) {
-                out_length += zip_dyn_dtree[dcode].fc * (5 + zip_extra_dbits[dcode]);
-            }
-            out_length >>= 3;
-    //      Trace((stderr,"\nlast_lit %u, last_dist %u, in %ld, out ~%ld(%ld%%) ",
-    //         encoder->last_lit, encoder->last_dist, in_length, out_length,
-    //         100L - out_length*100L/in_length));
-            if (zip_last_dist < parseInt(zip_last_lit / 2, 10) &&
-                    out_length < parseInt(in_length / 2, 10)) {
-                return true;
-            }
-        }
-        return (zip_last_lit === zip_LIT_BUFSIZE - 1 ||
-            zip_last_dist === zip_DIST_BUFSIZE);
-        /* We avoid equality with LIT_BUFSIZE because of wraparound at 64K
-         * on 16 bit machines and because stored blocks are restricted to
-         * 64K-1 bytes.
-         */
-    };
-
-    /* ==========================================================================
-     * Restore the heap property by moving down the tree starting at node k,
-     * exchanging a node with the smallest of its two sons if necessary, stopping
-     * when the heap property is re-established (each father smaller than its
-     * two sons).
-     */
-    var zip_pqdownheap = function (
-        tree,    // the tree to restore
-        k
-    ) {    // node to move down
-        var v = zip_heap[k];
-        var j = k << 1;    // left son of k
-
-        while (j <= zip_heap_len) {
-        // Set j to the smallest of the two sons:
-            if (j < zip_heap_len &&
-                    zip_SMALLER(tree, zip_heap[j + 1], zip_heap[j])) {
-                j++;
-            }
-
-        // Exit if v is smaller than both sons
-            if (zip_SMALLER(tree, v, zip_heap[j])) {
-                break;
-            }
-
-        // Exchange v with the smallest son
-            zip_heap[k] = zip_heap[j];
-            k = j;
-
-        // And continue down the tree, setting j to the left son of k
-            j <<= 1;
-        }
-        zip_heap[k] = v;
-    };
-
-    /* ==========================================================================
-     * Compute the optimal bit lengths for a tree and update the total bit length
-     * for the current block.
-     * IN assertion: the fields freq and dad are set, heap[heap_max] and
-     *    above are the tree nodes sorted by increasing frequency.
-     * OUT assertions: the field len is set to the optimal bit length, the
-     *     array bl_count contains the frequencies for each bit length.
-     *     The length opt_len is updated; static_len is also updated if stree is
-     *     not null.
-     */
-    var zip_gen_bitlen = function (desc) { // the tree descriptor
-        var tree        = desc.dyn_tree;
-        var extra        = desc.extra_bits;
-        var base        = desc.extra_base;
-        var max_code    = desc.max_code;
-        var max_length    = desc.max_length;
-        var stree        = desc.static_tree;
-        var h;        // heap index
-        var n, m;        // iterate over the tree elements
-        var bits;        // bit length
-        var xbits;        // extra bits
-        var f;        // frequency
-        var overflow = 0;    // number of elements with bit length too large
-
-        for (bits = 0; bits <= zip_MAX_BITS; bits++) {
-            zip_bl_count[bits] = 0;
-        }
-
-        /* In a first pass, compute the optimal bit lengths (which may
-         * overflow in the case of the bit length tree).
-         */
-        tree[zip_heap[zip_heap_max]].dl = 0; // root of the heap
-
-        for (h = zip_heap_max + 1; h < zip_HEAP_SIZE; h++) {
-            n = zip_heap[h];
-            bits = tree[tree[n].dl].dl + 1;
-            if (bits > max_length) {
-                bits = max_length;
-                overflow++;
-            }
-            tree[n].dl = bits;
-        // We overwrite tree[n].dl which is no longer needed
-
-            if (n > max_code) {
-                continue; // not a leaf node
-            }
-
-            zip_bl_count[bits]++;
-            xbits = 0;
-            if (n >= base) {
-                xbits = extra[n - base];
-            }
-            f = tree[n].fc;
-            zip_opt_len += f * (bits + xbits);
-            if (stree !== null) {
-                zip_static_len += f * (stree[n].dl + xbits);
-            }
-        }
-        if (overflow === 0) {
-            return;
-        }
-
-        // This happens for example on obj2 and pic of the Calgary corpus
-
-        // Find the first bit length which could increase:
-        do {
-            bits = max_length - 1;
-            while (zip_bl_count[bits] === 0) {
-                bits--;
-            }
-            zip_bl_count[bits]--;        // move one leaf down the tree
-            zip_bl_count[bits + 1] += 2;    // move one overflow item as its brother
-            zip_bl_count[max_length]--;
-        /* The brother of the overflow item also moves one step up,
-         * but this does not affect bl_count[max_length]
-         */
-            overflow -= 2;
-        } while (overflow > 0);
-
-        /* Now recompute all bit lengths, scanning in increasing frequency.
-         * h is still equal to HEAP_SIZE. (It is simpler to reconstruct all
-         * lengths instead of fixing only the wrong ones. This idea is taken
-         * from 'ar' written by Haruhiko Okumura.)
-         */
-        for (bits = max_length; bits !== 0; bits--) {
-            n = zip_bl_count[bits];
-            while (n !== 0) {
-                m = zip_heap[--h];
-                if (m > max_code) {
-                    continue;
-                }
-                if (tree[m].dl !== bits) {
-                    zip_opt_len += (bits - tree[m].dl) * tree[m].fc;
-                    tree[m].fc = bits;
-                }
-                n--;
-            }
-        }
-    };
-
-    /* ==========================================================================
-     * Reverse the first len bits of a code, using straightforward code (a faster
-     * method would use a table)
-     * IN assertion: 1 <= len <= 15
-     */
-    var zip_bi_reverse = function (
-        code,    // the value to invert
-        len
-    ) {    // its bit length
-        var res = 0;
-        do {
-            res |= code & 1;
-            code >>= 1;
-            res <<= 1;
-        } while (--len > 0);
-        return res >> 1;
-    };
-
-      /* ==========================================================================
-       * Generate the codes for a given tree and bit counts (which need not be
-       * optimal).
-       * IN assertion: the array bl_count contains the bit length statistics for
-       * the given tree and the field len is set for all tree elements.
-       * OUT assertion: the field code is set for all tree elements of non
-       *     zero code length.
-       */
-    var zip_gen_codes = function (tree,    // the tree to decorate
-               max_code) {    // largest code with non zero frequency
-            var next_code = [];
-            next_code.length = zip_MAX_BITS + 1; // next code value for each bit length
-            var code = 0;        // running code value
-            var bits;            // bit index
-            var n;            // code index
-
-        /* The distribution counts are first used to generate the code values
-         * without bit reversal.
-         */
-            for (bits = 1; bits <= zip_MAX_BITS; bits++) {
-                code = ((code + zip_bl_count[bits - 1]) << 1);
-                next_code[bits] = code;
-            }
-
-        /* Check that the bit counts in bl_count are consistent. The last code
-         * must be all ones.
-         */
-    //    Assert (code + encoder->bl_count[MAX_BITS]-1 == (1<<MAX_BITS)-1,
-    //        "inconsistent bit counts");
-    //    Tracev((stderr,"\ngen_codes: max_code %d ", max_code));
-
-            for (n = 0; n <= max_code; n++) {
-                var len = tree[n].dl;
-                if (len === 0) {
-                    continue;
-                }
-        // Now reverse the bits
-                tree[n].fc = zip_bi_reverse(next_code[len]++, len);
-
-    //      Tracec(tree != static_ltree, (stderr,"\nn %3d %c l %2d c %4x (%x) ",
-    //      n, (isgraph(n) ? n : ' '), len, tree[n].fc, next_code[len]-1));
-            }
-        };
-
-
-    /* ==========================================================================
-     * Construct one Huffman tree and assigns the code bit strings and lengths.
-     * Update the total bit length for the current block.
-     * IN assertion: the field freq is set for all tree elements.
-     * OUT assertions: the fields len and code are set to the optimal bit length
-     *     and corresponding code. The length opt_len is updated; static_len is
-     *     also updated if stree is not null. The field max_code is set.
-     */
-    var zip_build_tree = function (desc) { // the tree descriptor
-        var tree    = desc.dyn_tree;
-        var stree    = desc.static_tree;
-        var elems    = desc.elems;
-        var n, m;        // iterate over heap elements
-        var max_code = -1;    // largest code with non zero frequency
-        var node = elems;    // next internal node of the tree
-
-        /* Construct the initial heap, with least frequent element in
-         * heap[SMALLEST]. The sons of heap[n] are heap[2*n] and heap[2*n+1].
-         * heap[0] is not used.
-         */
-        zip_heap_len = 0;
-        zip_heap_max = zip_HEAP_SIZE;
-
-        for (n = 0; n < elems; n++) {
-            if (tree[n].fc !== 0) {
-                zip_heap[++zip_heap_len] = max_code = n;
-                zip_depth[n] = 0;
-            } else {
-                tree[n].dl = 0;
-            }
-        }
-
-        /* The pkzip format requires that at least one distance code exists,
-         * and that at least one bit should be sent even if there is only one
-         * possible code. So to avoid special checks later on we force at least
-         * two codes of non zero frequency.
-         */
-        while (zip_heap_len < 2) {
-            var xnew = zip_heap[++zip_heap_len] = (max_code < 2 ? ++max_code : 0);
-            tree[xnew].fc = 1;
-            zip_depth[xnew] = 0;
-            zip_opt_len--;
-            if (stree !== null) {
-                zip_static_len -= stree[xnew].dl;
-            }
-        // new is 0 or 1 so it does not have extra bits
-        }
-        desc.max_code = max_code;
-
-        /* The elements heap[heap_len/2+1 .. heap_len] are leaves of the tree,
-         * establish sub-heaps of increasing lengths:
-         */
-        for (n = zip_heap_len >> 1; n >= 1; n--) {
-            zip_pqdownheap(tree, n);
-        }
-
-        /* Construct the Huffman tree by repeatedly combining the least two
-         * frequent nodes.
-         */
-        do {
-            n = zip_heap[zip_SMALLEST];
-            zip_heap[zip_SMALLEST] = zip_heap[zip_heap_len--];
-            zip_pqdownheap(tree, zip_SMALLEST);
-
-            m = zip_heap[zip_SMALLEST];  // m = node of next least frequency
-
-        // keep the nodes sorted by frequency
-            zip_heap[--zip_heap_max] = n;
-            zip_heap[--zip_heap_max] = m;
-
-        // Create a new node father of n and m
-            tree[node].fc = tree[n].fc + tree[m].fc;
-    //    depth[node] = (char)(MAX(depth[n], depth[m]) + 1);
-            if (zip_depth[n] > zip_depth[m] + 1) {
-                zip_depth[node] = zip_depth[n];
-            } else {
-                zip_depth[node] = zip_depth[m] + 1;
-            }
-            tree[n].dl = tree[m].dl = node;
-
-        // and insert the new node in the heap
-            zip_heap[zip_SMALLEST] = node++;
-            zip_pqdownheap(tree, zip_SMALLEST);
-
-        } while (zip_heap_len >= 2);
-
-        zip_heap[--zip_heap_max] = zip_heap[zip_SMALLEST];
-
-        /* At this point, the fields freq and dad are set. We can now
-         * generate the bit lengths.
-         */
-        zip_gen_bitlen(desc);
-
-        // The field len is now set, we can generate the bit codes
-        zip_gen_codes(tree, max_code);
-    };
-
-    /* ==========================================================================
-     * Scan a literal or distance tree to determine the frequencies of the codes
-     * in the bit length tree. Updates opt_len to take into account the repeat
-     * counts. (The contribution of the bit length codes will be added later
-     * during the construction of bl_tree.)
-     */
-    var zip_scan_tree = function (tree,// the tree to be scanned
-               max_code) {  // and its largest code of non zero frequency
-            var n;            // iterates over all tree elements
-            var prevlen = -1;        // last emitted length
-            var curlen;            // length of current code
-            var nextlen = tree[0].dl;    // length of next code
-            var count = 0;        // repeat count of the current code
-            var max_count = 7;        // max repeat count
-            var min_count = 4;        // min repeat count
-
-            if (nextlen === 0) {
-                max_count = 138;
-                min_count = 3;
-            }
-            tree[max_code + 1].dl = 0xffff; // guard
-
-            for (n = 0; n <= max_code; n++) {
-                curlen = nextlen;
-                nextlen = tree[n + 1].dl;
-                if (++count < max_count && curlen === nextlen) {
-                    continue;
-                } else if (count < min_count) {
-                    zip_bl_tree[curlen].fc += count;
-                } else if (curlen !== 0) {
-                    if (curlen !== prevlen) {
-                        zip_bl_tree[curlen].fc++;
-                    }
-                    zip_bl_tree[zip_REP_3_6].fc++;
-                } else if (count <= 10) {
-                    zip_bl_tree[zip_REPZ_3_10].fc++;
-                } else {
-                    zip_bl_tree[zip_REPZ_11_138].fc++;
-                }
-                count = 0;
-                prevlen = curlen;
-                if (nextlen === 0) {
-                    max_count = 138;
-                    min_count = 3;
-                } else if (curlen === nextlen) {
-                    max_count = 6;
-                    min_count = 3;
-                } else {
-                    max_count = 7;
-                    min_count = 4;
-                }
-            }
-        };
-
-
-    /* ==========================================================================
-     * Construct the Huffman tree for the bit lengths and return the index in
-     * bl_order of the last bit length code to send.
-     */
-    var zip_build_bl_tree = function () {
-        var max_blindex;  // index of last bit length code of non zero freq
-
-        // Determine the bit length frequencies for literal and distance trees
-        zip_scan_tree(zip_dyn_ltree, zip_l_desc.max_code);
-        zip_scan_tree(zip_dyn_dtree, zip_d_desc.max_code);
-
-        // Build the bit length tree:
-        zip_build_tree(zip_bl_desc);
-        /* opt_len now includes the length of the tree representations, except
-         * the lengths of the bit lengths codes and the 5+5+4 bits for the counts.
-         */
-
-        /* Determine the number of bit length codes to send. The pkzip format
-         * requires that at least 4 bit length codes be sent. (appnote.txt says
-         * 3 but the actual value used is 4.)
-         */
-        for (max_blindex = zip_BL_CODES - 1; max_blindex >= 3; max_blindex--) {
-            if (zip_bl_tree[zip_bl_order[max_blindex]].dl !== 0) {
-                break;
-            }
-        }
-        /* Update opt_len to include the bit length tree and counts */
-        zip_opt_len += 3 * (max_blindex + 1) + 5 + 5 + 4;
-    //    Tracev((stderr, "\ndyn trees: dyn %ld, stat %ld",
-    //        encoder->opt_len, encoder->static_len));
-
-        return max_blindex;
-    };
-
-    /* ==========================================================================
-     * Write out any remaining bits in an incomplete byte.
-     */
-    var zip_bi_windup = function () {
-        if (zip_bi_valid > 8) {
-            zip_put_short(zip_bi_buf);
-        } else if (zip_bi_valid > 0) {
-            zip_put_byte(zip_bi_buf);
-        }
-        zip_bi_buf = 0;
-        zip_bi_valid = 0;
-    };
-
-      /* ==========================================================================
-       * Send the block data compressed using the given Huffman trees
-       */
-    var zip_compress_block = function (
-        ltree,    // literal tree
-        dtree
-    ) {    // distance tree
-        var dist;        // distance of matched string
-        var lc;        // match length or unmatched char (if dist == 0)
-        var lx = 0;        // running index in l_buf
-        var dx = 0;        // running index in d_buf
-        var fx = 0;        // running index in flag_buf
-        var flag = 0;    // current flags
-        var code;        // the code to send
-        var extra;        // number of extra bits to send
-
-        if (zip_last_lit !== 0) {
-            do {
-                if ((lx & 7) === 0) {
-                    flag = zip_flag_buf[fx++];
-                }
-                lc = zip_l_buf[lx++] & 0xff;
-                if ((flag & 1) === 0) {
-                    zip_SEND_CODE(lc, ltree); /* send a literal byte */
-    //    Tracecv(isgraph(lc), (stderr," '%c' ", lc));
-                } else {
-            // Here, lc is the match length - MIN_MATCH
-                    code = zip_length_code[lc];
-                    zip_SEND_CODE(code + zip_LITERALS + 1, ltree); // send the length code
-                    extra = zip_extra_lbits[code];
-                    if (extra !== 0) {
-                        lc -= zip_base_length[code];
-                        zip_send_bits(lc, extra); // send the extra length bits
-                    }
-                    dist = zip_d_buf[dx++];
-            // Here, dist is the match distance - 1
-                    code = zip_D_CODE(dist);
-    //    Assert (code < D_CODES, "bad d_code");
-
-                    zip_SEND_CODE(code, dtree);      // send the distance code
-                    extra = zip_extra_dbits[code];
-                    if (extra !== 0) {
-                        dist -= zip_base_dist[code];
-                        zip_send_bits(dist, extra);   // send the extra distance bits
-                    }
-                } // literal or match pair ?
-                flag >>= 1;
-            } while (lx < zip_last_lit);
-        }
-
-        zip_SEND_CODE(zip_END_BLOCK, ltree);
-    };
-
-      /* ==========================================================================
-       * Send a literal or distance tree in compressed form, using the codes in
-       * bl_tree.
-       */
-    var zip_send_tree = function (tree, // the tree to be scanned
-               max_code) { // and its largest code of non zero frequency
-            var n;            // iterates over all tree elements
-            var prevlen = -1;        // last emitted length
-            var curlen;            // length of current code
-            var nextlen = tree[0].dl;    // length of next code
-            var count = 0;        // repeat count of the current code
-            var max_count = 7;        // max repeat count
-            var min_count = 4;        // min repeat count
-
-            /* tree[max_code+1].dl = -1; */  /* guard already set */
-            if (nextlen === 0) {
-                max_count = 138;
-                min_count = 3;
-            }
-
-            for (n = 0; n <= max_code; n++) {
-                curlen = nextlen;
-                nextlen = tree[n + 1].dl;
-                if (++count < max_count && curlen === nextlen) {
-                    continue;
-                } else if (count < min_count) {
-                    do {
-                        zip_SEND_CODE(curlen, zip_bl_tree);
-                    } while (--count !== 0);
-                } else if (curlen !== 0) {
-                    if (curlen !== prevlen) {
-                        zip_SEND_CODE(curlen, zip_bl_tree);
-                        count--;
-                    }
-                    // Assert(count >= 3 && count <= 6, " 3_6?");
-                    zip_SEND_CODE(zip_REP_3_6, zip_bl_tree);
-                    zip_send_bits(count - 3, 2);
-                } else if (count <= 10) {
-                    zip_SEND_CODE(zip_REPZ_3_10, zip_bl_tree);
-                    zip_send_bits(count - 3, 3);
-                } else {
-                    zip_SEND_CODE(zip_REPZ_11_138, zip_bl_tree);
-                    zip_send_bits(count - 11, 7);
-                }
-                count = 0;
-                prevlen = curlen;
-                if (nextlen === 0) {
-                    max_count = 138;
-                    min_count = 3;
-                } else if (curlen === nextlen) {
-                    max_count = 6;
-                    min_count = 3;
-                } else {
-                    max_count = 7;
-                    min_count = 4;
-                }
-            }
-        };
-
-    /* ==========================================================================
-     * Send the header for a block using dynamic Huffman trees: the counts, the
-     * lengths of the bit length codes, the literal tree and the distance tree.
-     * IN assertion: lcodes >= 257, dcodes >= 1, blcodes >= 4.
-     */
-    var zip_send_all_trees = function (lcodes, dcodes, blcodes) { // number of codes for each tree
-        var rank; // index in bl_order
-
-    //    Assert (lcodes >= 257 && dcodes >= 1 && blcodes >= 4, "not enough codes");
-    //    Assert (lcodes <= L_CODES && dcodes <= D_CODES && blcodes <= BL_CODES,
-    //        "too many codes");
-    //    Tracev((stderr, "\nbl counts: "));
-        zip_send_bits(lcodes - 257, 5); // not +255 as stated in appnote.txt
-        zip_send_bits(dcodes - 1,   5);
-        zip_send_bits(blcodes - 4,  4); // not -3 as stated in appnote.txt
-        for (rank = 0; rank < blcodes; rank++) {
-    //      Tracev((stderr, "\nbl code %2d ", bl_order[rank]));
-            zip_send_bits(zip_bl_tree[zip_bl_order[rank]].dl, 3);
-        }
-
-        // send the literal tree
-        zip_send_tree(zip_dyn_ltree, lcodes - 1);
-
-        // send the distance tree
-        zip_send_tree(zip_dyn_dtree, dcodes - 1);
-    };
-
-    /* ==========================================================================
-     * Initialize a new block.
-     */
-    var zip_init_block = function () {
-        var n; // iterates over tree elements
-
-        // Initialize the trees.
-        for (n = 0; n < zip_L_CODES;  n++) {
-            zip_dyn_ltree[n].fc = 0;
-        }
-        for (n = 0; n < zip_D_CODES;  n++) {
-            zip_dyn_dtree[n].fc = 0;
-        }
-        for (n = 0; n < zip_BL_CODES; n++) {
-            zip_bl_tree[n].fc = 0;
-        }
-
-        zip_dyn_ltree[zip_END_BLOCK].fc = 1;
-        zip_opt_len = zip_static_len = 0;
-        zip_last_lit = zip_last_dist = zip_last_flags = 0;
-        zip_flags = 0;
-        zip_flag_bit = 1;
-    };
-
-    /* ==========================================================================
-     * Determine the best encoding for the current block: dynamic trees, static
-     * trees or store, and output the encoded block to the zip file.
-     */
-    var zip_flush_block = function (eof) { // true if this is the last block for a file
-        var opt_lenb, static_lenb; // opt_len and static_len in bytes
-        var max_blindex;    // index of last bit length code of non zero freq
-        var stored_len;    // length of input block
-
-        stored_len = zip_strstart - zip_block_start;
-        zip_flag_buf[zip_last_flags] = zip_flags; // Save the flags for the last 8 items
-
-        // Construct the literal and distance trees
-        zip_build_tree(zip_l_desc);
-    //    Tracev((stderr, "\nlit data: dyn %ld, stat %ld",
-    //        encoder->opt_len, encoder->static_len));
-
-        zip_build_tree(zip_d_desc);
-    //    Tracev((stderr, "\ndist data: dyn %ld, stat %ld",
-    //        encoder->opt_len, encoder->static_len));
-        /* At this point, opt_len and static_len are the total bit lengths of
-         * the compressed block data, excluding the tree representations.
-         */
-
-        /* Build the bit length tree for the above two trees, and get the index
-         * in bl_order of the last bit length code to send.
-         */
-        max_blindex = zip_build_bl_tree();
-
-        // Determine the best encoding. Compute first the block length in bytes
-        opt_lenb    = (zip_opt_len    + 3 + 7) >> 3;
-        static_lenb = (zip_static_len + 3 + 7) >> 3;
-
-    //    Trace((stderr, "\nopt %lu(%lu) stat %lu(%lu) stored %lu lit %u dist %u ",
-    //       opt_lenb, encoder->opt_len,
-    //       static_lenb, encoder->static_len, stored_len,
-    //       encoder->last_lit, encoder->last_dist));
-
-        if (static_lenb <= opt_lenb) {
-            opt_lenb = static_lenb;
-        }
-        if (stored_len + 4 <= opt_lenb // 4: two words for the lengths
-                && zip_block_start >= 0) {
-            var i;
-
-        /* The test buf != NULL is only necessary if LIT_BUFSIZE > WSIZE.
-         * Otherwise we can't have processed more than WSIZE input bytes since
-         * the last block flush, because compression would have been
-         * successful. If LIT_BUFSIZE <= WSIZE, it is never too late to
-         * transform a block into a stored block.
-         */
-            zip_send_bits((zip_STORED_BLOCK << 1) + eof, 3);  /* send block type */
-            zip_bi_windup();         /* align on byte boundary */
-            zip_put_short(stored_len);
-            zip_put_short(~stored_len);
-
-          // copy block
-    /*
-          p = &window[block_start];
-          for (i = 0; i < stored_len; i++)
-        put_byte(p[i]);
-    */
-            for (i = 0; i < stored_len; i++) {
-                zip_put_byte(zip_window[zip_block_start + i]);
-            }
-
-        } else if (static_lenb === opt_lenb) {
-            zip_send_bits((zip_STATIC_TREES << 1) + eof, 3);
-            zip_compress_block(zip_static_ltree, zip_static_dtree);
-        } else {
-            zip_send_bits((zip_DYN_TREES << 1) + eof, 3);
-            zip_send_all_trees(zip_l_desc.max_code + 1,
-                   zip_d_desc.max_code + 1,
-                   max_blindex + 1);
-            zip_compress_block(zip_dyn_ltree, zip_dyn_dtree);
-        }
-
-        zip_init_block();
-
-        if (eof !== 0) {
-            zip_bi_windup();
-        }
-    };
-
-    /* ==========================================================================
-     * Processes a new input file and return its compressed length. This
-     * function does not perform lazy evaluationof matches and inserts
-     * new strings in the dictionary only for unmatched strings or for short
-     * matches. It is used only for the fast compression options.
-     */
-    var zip_deflate_fast = function () {
-        while (zip_lookahead !== 0 && zip_qhead === null) {
-            var flush; // set if current block must be flushed
-
-        /* Insert the string window[strstart .. strstart+2] in the
-         * dictionary, and set hash_head to the head of the hash chain:
-         */
-            zip_INSERT_STRING();
-
-        /* Find the longest match, discarding those <= prev_length.
-         * At this point we have always match_length < MIN_MATCH
-         */
-            if (zip_hash_head !== zip_NIL &&
-                    zip_strstart - zip_hash_head <= zip_MAX_DIST) {
-            /* To simplify the code, we prevent matches with the string
-             * of window index 0 (in particular we have to avoid a match
-             * of the string with itself at the start of the input file).
-             */
-                zip_match_length = zip_longest_match(zip_hash_head);
-            /* longest_match() sets match_start */
-                if (zip_match_length > zip_lookahead) {
-                    zip_match_length = zip_lookahead;
-                }
-            }
-            if (zip_match_length >= zip_MIN_MATCH) {
-    //        check_match(strstart, match_start, match_length);
-
-                flush = zip_ct_tally(zip_strstart - zip_match_start,
-                     zip_match_length - zip_MIN_MATCH);
-                zip_lookahead -= zip_match_length;
-
-            /* Insert new strings in the hash table only if the match length
-             * is not too large. This saves time but degrades compression.
-             */
-                if (zip_match_length <= zip_max_lazy_match) {
-                    zip_match_length--; // string at strstart already in hash table
-                    do {
-                        zip_strstart++;
-                        zip_INSERT_STRING();
-                /* strstart never exceeds WSIZE-MAX_MATCH, so there are
-                 * always MIN_MATCH bytes ahead. If lookahead < MIN_MATCH
-                 * these bytes are garbage, but it does not matter since
-                 * the next lookahead bytes will be emitted as literals.
-                 */
-                    } while (--zip_match_length !== 0);
-                    zip_strstart++;
-                } else {
-                    zip_strstart += zip_match_length;
-                    zip_match_length = 0;
-                    zip_ins_h = zip_window[zip_strstart] & 0xff;
-    //        UPDATE_HASH(ins_h, window[strstart + 1]);
-                    zip_ins_h = ((zip_ins_h << zip_H_SHIFT) ^ (zip_window[zip_strstart + 1] & 0xff)) & zip_HASH_MASK;
-
-    //#if MIN_MATCH != 3
-    //        Call UPDATE_HASH() MIN_MATCH-3 more times
-    //#endif
-
-                }
-            } else {
-            /* No match, output a literal byte */
-                flush = zip_ct_tally(0, zip_window[zip_strstart] & 0xff);
-                zip_lookahead--;
-                zip_strstart++;
-            }
-            if (flush) {
-                zip_flush_block(0);
-                zip_block_start = zip_strstart;
-            }
-
-        /* Make sure that we always have enough lookahead, except
-         * at the end of the input file. We need MAX_MATCH bytes
-         * for the next match, plus MIN_MATCH bytes to insert the
-         * string following the next match.
-         */
-            while (zip_lookahead < zip_MIN_LOOKAHEAD && !zip_eofile) {
-                zip_fill_window();
-            }
-        }
-    };
-
-    var zip_deflate_better = function () {
-        /* Process the input block. */
-        while (zip_lookahead !== 0 && zip_qhead === null) {
-        /* Insert the string window[strstart .. strstart+2] in the
-         * dictionary, and set hash_head to the head of the hash chain:
-         */
-            zip_INSERT_STRING();
-
-        /* Find the longest match, discarding those <= prev_length.
-         */
-            zip_prev_length = zip_match_length;
-            zip_prev_match = zip_match_start;
-            zip_match_length = zip_MIN_MATCH - 1;
-
-            if (zip_hash_head !== zip_NIL &&
-                    zip_prev_length < zip_max_lazy_match &&
-                    zip_strstart - zip_hash_head <= zip_MAX_DIST) {
-            /* To simplify the code, we prevent matches with the string
-             * of window index 0 (in particular we have to avoid a match
-             * of the string with itself at the start of the input file).
-             */
-                zip_match_length = zip_longest_match(zip_hash_head);
-            /* longest_match() sets match_start */
-                if (zip_match_length > zip_lookahead) {
-                    zip_match_length = zip_lookahead;
-                }
-
-            /* Ignore a length 3 match if it is too distant: */
-                if (zip_match_length === zip_MIN_MATCH &&
-                        zip_strstart - zip_match_start > zip_TOO_FAR) {
-            /* If prev_match is also MIN_MATCH, match_start is garbage
-             * but we will ignore the current match anyway.
-             */
-                    zip_match_length--;
-                }
-            }
-        /* If there was a match at the previous step and the current
-         * match is not better, output the previous match:
-         */
-            if (zip_prev_length >= zip_MIN_MATCH &&
-                     zip_match_length <= zip_prev_length) {
-                var flush; // set if current block must be flushed
-
-    //        check_match(strstart - 1, prev_match, prev_length);
-                flush = zip_ct_tally(zip_strstart - 1 - zip_prev_match,
-                     zip_prev_length - zip_MIN_MATCH);
-
-            /* Insert in hash table all strings up to the end of the match.
-             * strstart-1 and strstart are already inserted.
-             */
-                zip_lookahead -= zip_prev_length - 1;
-                zip_prev_length -= 2;
-                do {
-                    zip_strstart++;
-                    zip_INSERT_STRING();
-            /* strstart never exceeds WSIZE-MAX_MATCH, so there are
-             * always MIN_MATCH bytes ahead. If lookahead < MIN_MATCH
-             * these bytes are garbage, but it does not matter since the
-             * next lookahead bytes will always be emitted as literals.
-             */
-                } while (--zip_prev_length !== 0);
-                zip_match_available = 0;
-                zip_match_length = zip_MIN_MATCH - 1;
-                zip_strstart++;
-                if (flush) {
-                    zip_flush_block(0);
-                    zip_block_start = zip_strstart;
-                }
-            } else if (zip_match_available !== 0) {
-            /* If there was no match at the previous position, output a
-             * single literal. If there was a match but the current match
-             * is longer, truncate the previous match to a single literal.
-             */
-                if (zip_ct_tally(0, zip_window[zip_strstart - 1] & 0xff)) {
-                    zip_flush_block(0);
-                    zip_block_start = zip_strstart;
-                }
-                zip_strstart++;
-                zip_lookahead--;
-            } else {
-            /* There is no previous match to compare with, wait for
-             * the next step to decide.
-             */
-                zip_match_available = 1;
-                zip_strstart++;
-                zip_lookahead--;
-            }
-
-        /* Make sure that we always have enough lookahead, except
-         * at the end of the input file. We need MAX_MATCH bytes
-         * for the next match, plus MIN_MATCH bytes to insert the
-         * string following the next match.
-         */
-            while (zip_lookahead < zip_MIN_LOOKAHEAD && !zip_eofile) {
-                zip_fill_window();
-            }
-        }
-    };
-
-    /* ==========================================================================
-     * Allocate the match buffer, initialize the various tables and save the
-     * location of the internal file attribute (ascii/binary) and method
-     * (DEFLATE/STORE).
-     */
-    var zip_ct_init = function () {
-        var n;    // iterates over tree elements
-        var bits;    // bit counter
-        var length;    // length value
-        var code;    // code value
-        var dist;    // distance index
-
-        if (zip_static_dtree[0].dl !== 0) {
-            return; // ct_init already called
-        }
-
-        zip_l_desc.dyn_tree        = zip_dyn_ltree;
-        zip_l_desc.static_tree    = zip_static_ltree;
-        zip_l_desc.extra_bits    = zip_extra_lbits;
-        zip_l_desc.extra_base    = zip_LITERALS + 1;
-        zip_l_desc.elems        = zip_L_CODES;
-        zip_l_desc.max_length    = zip_MAX_BITS;
-        zip_l_desc.max_code        = 0;
-
-        zip_d_desc.dyn_tree        = zip_dyn_dtree;
-        zip_d_desc.static_tree    = zip_static_dtree;
-        zip_d_desc.extra_bits    = zip_extra_dbits;
-        zip_d_desc.extra_base    = 0;
-        zip_d_desc.elems        = zip_D_CODES;
-        zip_d_desc.max_length    = zip_MAX_BITS;
-        zip_d_desc.max_code        = 0;
-
-        zip_bl_desc.dyn_tree    = zip_bl_tree;
-        zip_bl_desc.static_tree    = null;
-        zip_bl_desc.extra_bits    = zip_extra_blbits;
-        zip_bl_desc.extra_base    = 0;
-        zip_bl_desc.elems        = zip_BL_CODES;
-        zip_bl_desc.max_length    = zip_MAX_BL_BITS;
-        zip_bl_desc.max_code    = 0;
-
-        // Initialize the mapping length (0..255) -> length code (0..28)
-        length = 0;
-        for (code = 0; code < zip_LENGTH_CODES - 1; code++) {
-            zip_base_length[code] = length;
-            for (n = 0; n < (1 << zip_extra_lbits[code]); n++) {
-                zip_length_code[length++] = code;
-            }
-        }
-        // Assert (length == 256, "ct_init: length != 256");
-
-        /* Note that the length 255 (match length 258) can be represented
-         * in two different ways: code 284 + 5 bits or code 285, so we
-         * overwrite length_code[255] to use the best encoding:
-         */
-        zip_length_code[length - 1] = code;
-
-        /* Initialize the mapping dist (0..32K) -> dist code (0..29) */
-        dist = 0;
-        for (code = 0; code < 16; code++) {
-            zip_base_dist[code] = dist;
-            for (n = 0; n < (1 << zip_extra_dbits[code]); n++) {
-                zip_dist_code[dist++] = code;
-            }
-        }
-        // Assert (dist == 256, "ct_init: dist != 256");
-        dist >>= 7; // from now on, all distances are divided by 128
-        n = code;
-        for (code = n; code < zip_D_CODES; code++) {
-            zip_base_dist[code] = dist << 7;
-            for (n = 0; n < (1 << (zip_extra_dbits[code] - 7)); n++) {
-                zip_dist_code[256 + dist++] = code;
-            }
-        }
-        // Assert (dist == 256, "ct_init: 256+dist != 512");
-
-        // Construct the codes of the static literal tree
-        for (bits = 0; bits <= zip_MAX_BITS; bits++) {
-            zip_bl_count[bits] = 0;
-        }
-        n = 0;
-        while (n <= 143) {
-            zip_static_ltree[n++].dl = 8;
-            zip_bl_count[8]++;
-        }
-        while (n <= 255) {
-            zip_static_ltree[n++].dl = 9;
-            zip_bl_count[9]++;
-        }
-        while (n <= 279) {
-            zip_static_ltree[n++].dl = 7;
-            zip_bl_count[7]++;
-        }
-        while (n <= 287) {
-            zip_static_ltree[n++].dl = 8;
-            zip_bl_count[8]++;
-        }
-        /* Codes 286 and 287 do not exist, but we must include them in the
-         * tree construction to get a canonical Huffman tree (longest code
-         * all ones)
-         */
-        zip_gen_codes(zip_static_ltree, zip_L_CODES + 1);
-
-        /* The static distance tree is trivial: */
-        for (n = 0; n < zip_D_CODES; n++) {
-            zip_static_dtree[n].dl = 5;
-            zip_static_dtree[n].fc = zip_bi_reverse(n, 5);
-        }
-
-        // Initialize the first block of the first file:
-        zip_init_block();
-    };
-
-
-    var zip_init_deflate = function () {
-        if (zip_eofile) {
-            return;
-        }
-        zip_bi_buf = 0;
-        zip_bi_valid = 0;
-        zip_ct_init();
-        zip_lm_init();
-
-        zip_qhead = null;
-        zip_outcnt = 0;
-        zip_outoff = 0;
-
-        if (zip_compr_level <= 3) {
-            zip_prev_length = zip_MIN_MATCH - 1;
-            zip_match_length = 0;
-        } else {
-            zip_match_length = zip_MIN_MATCH - 1;
-            zip_match_available = 0;
-        }
-
-        zip_complete = false;
-    };
-
-    var zip_qcopy = function (buff, off, buff_size) {
-        var n, i, j;
-
-        n = 0;
-        while (zip_qhead !== null && n < buff_size) {
-            i = buff_size - n;
-            if (i > zip_qhead.len) {
-                i = zip_qhead.len;
-            }
-    //      System.arraycopy(qhead.ptr, qhead.off, buff, off + n, i);
-            for (j = 0; j < i; j++) {
-                buff[off + n + j] = zip_qhead.ptr[zip_qhead.off + j];
-            }
-
-            zip_qhead.off += i;
-            zip_qhead.len -= i;
-            n += i;
-            if (zip_qhead.len === 0) {
-                var p;
-                p = zip_qhead;
-                zip_qhead = zip_qhead.next;
-                zip_reuse_queue(p);
-            }
-        }
-
-        if (n === buff_size) {
-            return n;
-        }
-
-        if (zip_outoff < zip_outcnt) {
-            i = buff_size - n;
-            if (i > zip_outcnt - zip_outoff) {
-                i = zip_outcnt - zip_outoff;
-            }
-        // System.arraycopy(outbuf, outoff, buff, off + n, i);
-            for (j = 0; j < i; j++) {
-                buff[off + n + j] = zip_outbuf[zip_outoff + j];
-            }
-            zip_outoff += i;
-            n += i;
-            if (zip_outcnt === zip_outoff) {
-                zip_outcnt = zip_outoff = 0;
-            }
-        }
-        return n;
-    };
-
-    /* ==========================================================================
-     * Same as above, but achieves better compression. We use a lazy
-     * evaluation for matches: a match is finally adopted only if there is
-     * no better match at the next window position.
-     */
-    var zip_deflate_internal = function (buff, off, buff_size) {
-        var n;
-
-        if (!zip_initflag) {
-            zip_init_deflate();
-            zip_initflag = true;
-            if (zip_lookahead === 0) { // empty
-                zip_complete = true;
-                return 0;
-            }
-        }
-
-        if ((n = zip_qcopy(buff, off, buff_size)) === buff_size) {
-            return buff_size;
-        }
-
-        if (zip_complete) {
-            return n;
-        }
-
-        if (zip_compr_level <= 3) { // optimized for speed
-            zip_deflate_fast();
-        } else {
-            zip_deflate_better();
-        }
-        if (zip_lookahead === 0) {
-            if (zip_match_available !== 0) {
-                zip_ct_tally(0, zip_window[zip_strstart - 1] & 0xff);
-            }
-            zip_flush_block(1);
-            zip_complete = true;
-        }
-        return n + zip_qcopy(buff, n + off, buff_size - n);
-    };
-
-    var zip_deflate = function (str, level) {
-        var i, j;
-
-        zip_deflate_data = str;
-        zip_deflate_pos = 0;
-        if (typeof level === "undefined") {
-            level = zip_DEFAULT_LEVEL;
-        }
-        zip_deflate_start(level);
-
-        var buff = new Array(1024);
-        var aout = [];
-        while ((i = zip_deflate_internal(buff, 0, buff.length)) > 0) {
-            var cbuf = [];
-            cbuf.length = i;
-            for (j = 0; j < i; j++) {
-                cbuf[j] = String.fromCharCode(buff[j]);
-            }
-            aout[aout.length] = cbuf.join("");
-        }
-        zip_deflate_data = null; // G.C.
-        return aout.join("");
-    };
-
-    this.deflate = zip_deflate;
-};
diff --git a/apps/files_odfviewer/src/webodf/webodf/lib/core/RawInflate.js b/apps/files_odfviewer/src/webodf/webodf/lib/core/RawInflate.js
deleted file mode 100644
index 0005ea56ea..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/lib/core/RawInflate.js
+++ /dev/null
@@ -1,790 +0,0 @@
-/**
- * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
- * @licstart
- * The JavaScript code in this page is free software: you can redistribute it
- * and/or modify it under the terms of the GNU Affero General Public License
- * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.  The code is distributed
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
- *
- * As additional permission under GNU AGPL version 3 section 7, you
- * may distribute non-source (e.g., minimized or compacted) forms of
- * that code without the copy of the GNU GPL normally required by
- * section 4, provided you include this license notice and a URL
- * through which recipients can access the Corresponding Source.
- *
- * As a special exception to the AGPL, any HTML file which merely makes function
- * calls to this code, and for that purpose includes it by reference shall be
- * deemed a separate work for copyright law purposes. In addition, the copyright
- * holders of this code give you permission to combine this code with free
- * software libraries that are released under the GNU LGPL. You may copy and
- * distribute such a system following the terms of the GNU AGPL for this code
- * and the LGPL for the libraries. If you modify this code, you may extend this
- * exception to your version of the code, but you are not obligated to do so.
- * If you do not wish to do so, delete this exception statement from your
- * version.
- *
- * This license applies to this entire compilation.
- * @licend
- * @source: http://www.webodf.org/
- * @source: http://gitorious.org/odfkit/webodf/
- */
-/*global core*/
-/*
- * $Id: rawinflate.js,v 0.2 2009/03/01 18:32:24 dankogai Exp $
- *
- * original:
- * http://www.onicos.com/staff/iz/amuse/javascript/expert/inflate.txt
- */
-
-/**
- * @constructor
- */
-core.RawInflate = function RawInflate() {
-
-/* Copyright (C) 1999 Masanao Izumo <iz@onicos.co.jp>
- * Version: 1.0.0.1
- * LastModified: Dec 25 1999
- */
-
-/* Interface:
- * data = zip_inflate(src);
- */
-
-/* constant parameters */
-var zip_WSIZE = 32768;		// Sliding Window size
-var zip_STORED_BLOCK = 0;
-var zip_STATIC_TREES = 1;
-var zip_DYN_TREES    = 2;
-
-/* for inflate */
-var zip_lbits = 9; 		// bits in base literal/length lookup table
-var zip_dbits = 6; 		// bits in base distance lookup table
-var zip_INBUFSIZ = 32768;	// Input buffer size
-var zip_INBUF_EXTRA = 64;	// Extra buffer
-
-/* variables (inflate) */
-var zip_slide;
-var zip_wp;			// current position in slide
-var zip_fixed_tl = null;	// inflate static
-var zip_fixed_td;		// inflate static
-var zip_fixed_bl, fixed_bd;	// inflate static
-var zip_bit_buf;		// bit buffer
-var zip_bit_len;		// bits in bit buffer
-var zip_method;
-var zip_eof;
-var zip_copy_leng;
-var zip_copy_dist;
-var zip_tl, zip_td;	// literal/length and distance decoder tables
-var zip_bl, zip_bd;	// number of bits decoded by tl and td
-
-var zip_inflate_data;
-var zip_inflate_pos;
-
-
-/* constant tables (inflate) */
-var zip_MASK_BITS = new Array(
-    0x0000,
-    0x0001, 0x0003, 0x0007, 0x000f, 0x001f, 0x003f, 0x007f, 0x00ff,
-    0x01ff, 0x03ff, 0x07ff, 0x0fff, 0x1fff, 0x3fff, 0x7fff, 0xffff);
-// Tables for deflate from PKZIP's appnote.txt.
-var zip_cplens = new Array( // Copy lengths for literal codes 257..285
-    3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31,
-    35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0);
-/* note: see note #13 above about the 258 in this list. */
-var zip_cplext = new Array( // Extra bits for literal codes 257..285
-    0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2,
-    3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5, 0, 99, 99); // 99==invalid
-var zip_cpdist = new Array( // Copy offsets for distance codes 0..29
-    1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193,
-    257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145,
-    8193, 12289, 16385, 24577);
-var zip_cpdext = new Array( // Extra bits for distance codes
-    0, 0, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6,
-    7, 7, 8, 8, 9, 9, 10, 10, 11, 11,
-    12, 12, 13, 13);
-var zip_border = new Array(  // Order of the bit length code lengths
-    16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15);
-/* objects (inflate) */
-
-/**
- * @constructor
- */
-var zip_HuftList = function() {
-    this.next = null;
-    this.list = null;
-}
-
-/**
- * @constructor
- */
-var zip_HuftNode = function() {
-    this.e = 0; // number of extra bits or operation
-    this.b = 0; // number of bits in this code or subcode
-
-    // union
-    this.n = 0; // literal, length base, or distance base
-    this.t = null; // (zip_HuftNode) pointer to next level of table
-}
-
-/**
- * @constructor
- */
-var zip_HuftBuild = function(b,	// code lengths in bits (all assumed <= BMAX)
-		       n,	// number of codes (assumed <= N_MAX)
-		       s,	// number of simple-valued codes (0..s-1)
-		       d,	// list of base values for non-simple codes
-		       e,	// list of extra bits for non-simple codes
-		       mm	// maximum lookup bits
-		   ) {
-    this.BMAX = 16;   // maximum bit length of any code
-    this.N_MAX = 288; // maximum number of codes in any set
-    this.status = 0;	// 0: success, 1: incomplete table, 2: bad input
-    this.root = null;	// (zip_HuftList) starting table
-    this.m = 0;		// maximum lookup bits, returns actual
-
-/* Given a list of code lengths and a maximum table size, make a set of
-   tables to decode that set of codes.	Return zero on success, one if
-   the given code set is incomplete (the tables are still built in this
-   case), two if the input is invalid (all zero length codes or an
-   oversubscribed set of lengths), and three if not enough memory.
-   The code with value 256 is special, and the tables are constructed
-   so that no bits beyond that code are fetched when that code is
-   decoded. */
-    {
-	var a;			// counter for codes of length k
-	var c = new Array(this.BMAX+1);	// bit length count table
-	var el;			// length of EOB code (value 256)
-	var f;			// i repeats in table every f entries
-	var g;			// maximum code length
-	var h;			// table level
-	var i;			// counter, current code
-	var j;			// counter
-	var k;			// number of bits in current code
-	var lx = new Array(this.BMAX+1);	// stack of bits per table
-	var p;			// pointer into c[], b[], or v[]
-	var pidx;		// index of p
-	var q;			// (zip_HuftNode) points to current table
-	var r = new zip_HuftNode(); // table entry for structure assignment
-	var u = new Array(this.BMAX); // zip_HuftNode[BMAX][]  table stack
-	var v = new Array(this.N_MAX); // values in order of bit length
-	var w;
-	var x = new Array(this.BMAX+1);// bit offsets, then code stack
-	var xp;			// pointer into x or c
-	var y;			// number of dummy codes added
-	var z;			// number of entries in current table
-	var o;
-	var tail;		// (zip_HuftList)
-
-	tail = this.root = null;
-	for(i = 0; i < c.length; i++)
-	    c[i] = 0;
-	for(i = 0; i < lx.length; i++)
-	    lx[i] = 0;
-	for(i = 0; i < u.length; i++)
-	    u[i] = null;
-	for(i = 0; i < v.length; i++)
-	    v[i] = 0;
-	for(i = 0; i < x.length; i++)
-	    x[i] = 0;
-
-	// Generate counts for each bit length
-	el = n > 256 ? b[256] : this.BMAX; // set length of EOB code, if any
-	p = b; pidx = 0;
-	i = n;
-	do {
-	    c[p[pidx]]++;	// assume all entries <= BMAX
-	    pidx++;
-	} while(--i > 0);
-	if(c[0] == n) {	// null input--all zero length codes
-	    this.root = null;
-	    this.m = 0;
-	    this.status = 0;
-	    return;
-	}
-
-	// Find minimum and maximum length, bound *m by those
-	for(j = 1; j <= this.BMAX; j++)
-	    if(c[j] != 0)
-		break;
-	k = j;			// minimum code length
-	if(mm < j)
-	    mm = j;
-	for(i = this.BMAX; i != 0; i--)
-	    if(c[i] != 0)
-		break;
-	g = i;			// maximum code length
-	if(mm > i)
-	    mm = i;
-
-	// Adjust last length count to fill out codes, if needed
-	for(y = 1 << j; j < i; j++, y <<= 1)
-	    if((y -= c[j]) < 0) {
-		this.status = 2;	// bad input: more codes than bits
-		this.m = mm;
-		return;
-	    }
-	if((y -= c[i]) < 0) {
-	    this.status = 2;
-	    this.m = mm;
-	    return;
-	}
-	c[i] += y;
-
-	// Generate starting offsets into the value table for each length
-	x[1] = j = 0;
-	p = c;
-	pidx = 1;
-	xp = 2;
-	while(--i > 0)		// note that i == g from above
-	    x[xp++] = (j += p[pidx++]);
-
-	// Make a table of values in order of bit lengths
-	p = b; pidx = 0;
-	i = 0;
-	do {
-	    if((j = p[pidx++]) != 0)
-		v[x[j]++] = i;
-	} while(++i < n);
-	n = x[g];			// set n to length of v
-
-	// Generate the Huffman codes and for each, make the table entries
-	x[0] = i = 0;		// first Huffman code is zero
-	p = v; pidx = 0;		// grab values in bit order
-	h = -1;			// no tables yet--level -1
-	w = lx[0] = 0;		// no bits decoded yet
-	q = null;			// ditto
-	z = 0;			// ditto
-
-	// go through the bit lengths (k already is bits in shortest code)
-	for(; k <= g; k++) {
-	    a = c[k];
-	    while(a-- > 0) {
-		// here i is the Huffman code of length k bits for value p[pidx]
-		// make tables up to required level
-		while(k > w + lx[1 + h]) {
-		    w += lx[1 + h]; // add bits already decoded
-		    h++;
-
-		    // compute minimum size table less than or equal to *m bits
-		    z = (z = g - w) > mm ? mm : z; // upper limit
-		    if((f = 1 << (j = k - w)) > a + 1) { // try a k-w bit table
-			// too few codes for k-w bit table
-			f -= a + 1;	// deduct codes from patterns left
-			xp = k;
-			while(++j < z) { // try smaller tables up to z bits
-			    if((f <<= 1) <= c[++xp])
-				break;	// enough codes to use up j bits
-			    f -= c[xp];	// else deduct codes from patterns
-			}
-		    }
-		    if(w + j > el && w < el)
-			j = el - w;	// make EOB code end at table
-		    z = 1 << j;	// table entries for j-bit table
-		    lx[1 + h] = j; // set table size in stack
-
-		    // allocate and link in new table
-		    q = new Array(z);
-		    for(o = 0; o < z; o++) {
-			q[o] = new zip_HuftNode();
-		    }
-
-		    if(tail == null)
-			tail = this.root = new zip_HuftList();
-		    else
-			tail = tail.next = new zip_HuftList();
-		    tail.next = null;
-		    tail.list = q;
-		    u[h] = q;	// table starts after link
-
-		    /* connect to last table, if there is one */
-		    if(h > 0) {
-			x[h] = i;		// save pattern for backing up
-			r.b = lx[h];	// bits to dump before this table
-			r.e = 16 + j;	// bits in this table
-			r.t = q;		// pointer to this table
-			j = (i & ((1 << w) - 1)) >> (w - lx[h]);
-			u[h-1][j].e = r.e;
-			u[h-1][j].b = r.b;
-			u[h-1][j].n = r.n;
-			u[h-1][j].t = r.t;
-		    }
-		}
-
-		// set up table entry in r
-		r.b = k - w;
-		if(pidx >= n)
-		    r.e = 99;		// out of values--invalid code
-		else if(p[pidx] < s) {
-		    r.e = (p[pidx] < 256 ? 16 : 15); // 256 is end-of-block code
-		    r.n = p[pidx++];	// simple code is just the value
-		} else {
-		    r.e = e[p[pidx] - s];	// non-simple--look up in lists
-		    r.n = d[p[pidx++] - s];
-		}
-
-		// fill code-like entries with r //
-		f = 1 << (k - w);
-		for(j = i >> w; j < z; j += f) {
-		    q[j].e = r.e;
-		    q[j].b = r.b;
-		    q[j].n = r.n;
-		    q[j].t = r.t;
-		}
-
-		// backwards increment the k-bit code i
-		for(j = 1 << (k - 1); (i & j) != 0; j >>= 1)
-		    i ^= j;
-		i ^= j;
-
-		// backup over finished tables
-		while((i & ((1 << w) - 1)) != x[h]) {
-		    w -= lx[h];		// don't need to update q
-		    h--;
-		}
-	    }
-	}
-
-	/* return actual size of base table */
-	this.m = lx[1];
-
-	/* Return true (1) if we were given an incomplete table */
-	this.status = ((y != 0 && g != 1) ? 1 : 0);
-    } /* end of constructor */
-}
-
-
-/* routines (inflate) */
-
-var zip_GET_BYTE = function() {
-    if(zip_inflate_data.length == zip_inflate_pos)
-	return -1;
-    return zip_inflate_data[zip_inflate_pos++];
-}
-
-var zip_NEEDBITS = function(n) {
-    while(zip_bit_len < n) {
-	zip_bit_buf |= zip_GET_BYTE() << zip_bit_len;
-	zip_bit_len += 8;
-    }
-}
-
-var zip_GETBITS = function(n) {
-    return zip_bit_buf & zip_MASK_BITS[n];
-}
-
-var zip_DUMPBITS = function(n) {
-    zip_bit_buf >>= n;
-    zip_bit_len -= n;
-}
-
-var zip_inflate_codes = function(buff, off, size) {
-    /* inflate (decompress) the codes in a deflated (compressed) block.
-       Return an error code or zero if it all goes ok. */
-    var e;		// table entry flag/number of extra bits
-    var t;		// (zip_HuftNode) pointer to table entry
-    var n;
-
-    if(size == 0)
-      return 0;
-
-    // inflate the coded data
-    n = 0;
-    for(;;) {			// do until end of block
-	zip_NEEDBITS(zip_bl);
-	t = zip_tl.list[zip_GETBITS(zip_bl)];
-	e = t.e;
-	while(e > 16) {
-	    if(e == 99)
-		return -1;
-	    zip_DUMPBITS(t.b);
-	    e -= 16;
-	    zip_NEEDBITS(e);
-	    t = t.t[zip_GETBITS(e)];
-	    e = t.e;
-	}
-	zip_DUMPBITS(t.b);
-
-	if(e == 16) {		// then it's a literal
-	    zip_wp &= zip_WSIZE - 1;
-	    buff[off + n++] = zip_slide[zip_wp++] = t.n;
-	    if(n == size)
-		return size;
-	    continue;
-	}
-
-	// exit if end of block
-	if(e == 15)
-	    break;
-
-	// it's an EOB or a length
-
-	// get length of block to copy
-	zip_NEEDBITS(e);
-	zip_copy_leng = t.n + zip_GETBITS(e);
-	zip_DUMPBITS(e);
-
-	// decode distance of block to copy
-	zip_NEEDBITS(zip_bd);
-	t = zip_td.list[zip_GETBITS(zip_bd)];
-	e = t.e;
-
-	while(e > 16) {
-	    if(e == 99)
-		return -1;
-	    zip_DUMPBITS(t.b);
-	    e -= 16;
-	    zip_NEEDBITS(e);
-	    t = t.t[zip_GETBITS(e)];
-	    e = t.e;
-	}
-	zip_DUMPBITS(t.b);
-	zip_NEEDBITS(e);
-	zip_copy_dist = zip_wp - t.n - zip_GETBITS(e);
-	zip_DUMPBITS(e);
-
-	// do the copy
-	while(zip_copy_leng > 0 && n < size) {
-	    zip_copy_leng--;
-	    zip_copy_dist &= zip_WSIZE - 1;
-	    zip_wp &= zip_WSIZE - 1;
-	    buff[off + n++] = zip_slide[zip_wp++]
-		= zip_slide[zip_copy_dist++];
-	}
-
-	if(n == size)
-	    return size;
-    }
-
-    zip_method = -1; // done
-    return n;
-}
-
-var zip_inflate_stored = function(buff, off, size) {
-    /* "decompress" an inflated type 0 (stored) block. */
-    var n;
-
-    // go to byte boundary
-    n = zip_bit_len & 7;
-    zip_DUMPBITS(n);
-
-    // get the length and its complement
-    zip_NEEDBITS(16);
-    n = zip_GETBITS(16);
-    zip_DUMPBITS(16);
-    zip_NEEDBITS(16);
-    if(n != ((~zip_bit_buf) & 0xffff))
-	return -1;			// error in compressed data
-    zip_DUMPBITS(16);
-
-    // read and output the compressed data
-    zip_copy_leng = n;
-
-    n = 0;
-    while(zip_copy_leng > 0 && n < size) {
-	zip_copy_leng--;
-	zip_wp &= zip_WSIZE - 1;
-	zip_NEEDBITS(8);
-	buff[off + n++] = zip_slide[zip_wp++] =
-	    zip_GETBITS(8);
-	zip_DUMPBITS(8);
-    }
-
-    if(zip_copy_leng == 0)
-      zip_method = -1; // done
-    return n;
-}
-
-var zip_fixed_bd;
-var zip_inflate_fixed = function(buff, off, size) {
-    /* decompress an inflated type 1 (fixed Huffman codes) block.  We should
-       either replace this with a custom decoder, or at least precompute the
-       Huffman tables. */
-
-    // if first time, set up tables for fixed blocks
-    if(zip_fixed_tl == null) {
-	var i;			// temporary variable
-	var l = new Array(288);	// length list for huft_build
-	var h;	// zip_HuftBuild
-
-	// literal table
-	for(i = 0; i < 144; i++)
-	    l[i] = 8;
-	for(; i < 256; i++)
-	    l[i] = 9;
-	for(; i < 280; i++)
-	    l[i] = 7;
-	for(; i < 288; i++)	// make a complete, but wrong code set
-	    l[i] = 8;
-	zip_fixed_bl = 7;
-
-	h = new zip_HuftBuild(l, 288, 257, zip_cplens, zip_cplext,
-			      zip_fixed_bl);
-	if(h.status != 0) {
-	    alert("HufBuild error: "+h.status);
-	    return -1;
-	}
-	zip_fixed_tl = h.root;
-	zip_fixed_bl = h.m;
-
-	// distance table
-	for(i = 0; i < 30; i++)	// make an incomplete code set
-	    l[i] = 5;
-	zip_fixed_bd = 5;
-
-	h = new zip_HuftBuild(l, 30, 0, zip_cpdist, zip_cpdext, zip_fixed_bd);
-	if(h.status > 1) {
-	    zip_fixed_tl = null;
-	    alert("HufBuild error: "+h.status);
-	    return -1;
-	}
-	zip_fixed_td = h.root;
-	zip_fixed_bd = h.m;
-    }
-
-    zip_tl = zip_fixed_tl;
-    zip_td = zip_fixed_td;
-    zip_bl = zip_fixed_bl;
-    zip_bd = zip_fixed_bd;
-    return zip_inflate_codes(buff, off, size);
-}
-
-var zip_inflate_dynamic = function(buff, off, size) {
-    // decompress an inflated type 2 (dynamic Huffman codes) block.
-    var i;		// temporary variables
-    var j;
-    var l;		// last length
-    var n;		// number of lengths to get
-    var t;		// (zip_HuftNode) literal/length code table
-    var nb;		// number of bit length codes
-    var nl;		// number of literal/length codes
-    var nd;		// number of distance codes
-    var ll = new Array(286+30); // literal/length and distance code lengths
-    var h;		// (zip_HuftBuild)
-
-    for(i = 0; i < ll.length; i++)
-	ll[i] = 0;
-
-    // read in table lengths
-    zip_NEEDBITS(5);
-    nl = 257 + zip_GETBITS(5);	// number of literal/length codes
-    zip_DUMPBITS(5);
-    zip_NEEDBITS(5);
-    nd = 1 + zip_GETBITS(5);	// number of distance codes
-    zip_DUMPBITS(5);
-    zip_NEEDBITS(4);
-    nb = 4 + zip_GETBITS(4);	// number of bit length codes
-    zip_DUMPBITS(4);
-    if(nl > 286 || nd > 30)
-      return -1;		// bad lengths
-
-    // read in bit-length-code lengths
-    for(j = 0; j < nb; j++)
-    {
-	zip_NEEDBITS(3);
-	ll[zip_border[j]] = zip_GETBITS(3);
-	zip_DUMPBITS(3);
-    }
-    for(; j < 19; j++)
-	ll[zip_border[j]] = 0;
-
-    // build decoding table for trees--single level, 7 bit lookup
-    zip_bl = 7;
-    h = new zip_HuftBuild(ll, 19, 19, null, null, zip_bl);
-    if(h.status != 0)
-	return -1;	// incomplete code set
-
-    zip_tl = h.root;
-    zip_bl = h.m;
-
-    // read in literal and distance code lengths
-    n = nl + nd;
-    i = l = 0;
-    while(i < n) {
-	zip_NEEDBITS(zip_bl);
-	t = zip_tl.list[zip_GETBITS(zip_bl)];
-	j = t.b;
-	zip_DUMPBITS(j);
-	j = t.n;
-	if(j < 16)		// length of code in bits (0..15)
-	    ll[i++] = l = j;	// save last length in l
-	else if(j == 16) {	// repeat last length 3 to 6 times
-	    zip_NEEDBITS(2);
-	    j = 3 + zip_GETBITS(2);
-	    zip_DUMPBITS(2);
-	    if(i + j > n)
-		return -1;
-	    while(j-- > 0)
-		ll[i++] = l;
-	} else if(j == 17) {	// 3 to 10 zero length codes
-	    zip_NEEDBITS(3);
-	    j = 3 + zip_GETBITS(3);
-	    zip_DUMPBITS(3);
-	    if(i + j > n)
-		return -1;
-	    while(j-- > 0)
-		ll[i++] = 0;
-	    l = 0;
-	} else {		// j == 18: 11 to 138 zero length codes
-	    zip_NEEDBITS(7);
-	    j = 11 + zip_GETBITS(7);
-	    zip_DUMPBITS(7);
-	    if(i + j > n)
-		return -1;
-	    while(j-- > 0)
-		ll[i++] = 0;
-	    l = 0;
-	}
-    }
-
-    // build the decoding tables for literal/length and distance codes
-    zip_bl = zip_lbits;
-    h = new zip_HuftBuild(ll, nl, 257, zip_cplens, zip_cplext, zip_bl);
-    if(zip_bl == 0)	// no literals or lengths
-	h.status = 1;
-    if(h.status != 0) {
-	//if(h.status == 1)
-	//    ;// **incomplete literal tree**
-	return -1;		// incomplete code set
-    }
-    zip_tl = h.root;
-    zip_bl = h.m;
-
-    for(i = 0; i < nd; i++)
-	ll[i] = ll[i + nl];
-    zip_bd = zip_dbits;
-    h = new zip_HuftBuild(ll, nd, 0, zip_cpdist, zip_cpdext, zip_bd);
-    zip_td = h.root;
-    zip_bd = h.m;
-
-    if(zip_bd == 0 && nl > 257) {   // lengths but no distances
-	// **incomplete distance tree**
-	return -1;
-    }
-
-    //if(h.status == 1) {
-//	;// **incomplete distance tree**
-    //}
-    if(h.status != 0)
-	return -1;
-
-    // decompress until an end-of-block code
-    return zip_inflate_codes(buff, off, size);
-}
-
-var zip_inflate_start = function() {
-    var i;
-
-    if(zip_slide == null)
-	zip_slide = new Array(2 * zip_WSIZE);
-    zip_wp = 0;
-    zip_bit_buf = 0;
-    zip_bit_len = 0;
-    zip_method = -1;
-    zip_eof = false;
-    zip_copy_leng = zip_copy_dist = 0;
-    zip_tl = null;
-}
-
-var zip_inflate_internal = function(buff, off, size) {
-    // decompress an inflated entry
-    var n, i;
-
-    n = 0;
-    while(n < size) {
-	if(zip_eof && zip_method == -1)
-	    return n;
-
-	if(zip_copy_leng > 0) {
-	    if(zip_method != zip_STORED_BLOCK) {
-		// STATIC_TREES or DYN_TREES
-		while(zip_copy_leng > 0 && n < size) {
-		    zip_copy_leng--;
-		    zip_copy_dist &= zip_WSIZE - 1;
-		    zip_wp &= zip_WSIZE - 1;
-		    buff[off + n++] = zip_slide[zip_wp++] =
-			zip_slide[zip_copy_dist++];
-		}
-	    } else {
-		while(zip_copy_leng > 0 && n < size) {
-		    zip_copy_leng--;
-		    zip_wp &= zip_WSIZE - 1;
-		    zip_NEEDBITS(8);
-		    buff[off + n++] = zip_slide[zip_wp++] = zip_GETBITS(8);
-		    zip_DUMPBITS(8);
-		}
-		if(zip_copy_leng == 0)
-		    zip_method = -1; // done
-	    }
-	    if(n == size)
-		return n;
-	}
-
-	if(zip_method == -1) {
-	    if(zip_eof)
-		break;
-
-	    // read in last block bit
-	    zip_NEEDBITS(1);
-	    if(zip_GETBITS(1) != 0)
-		zip_eof = true;
-	    zip_DUMPBITS(1);
-
-	    // read in block type
-	    zip_NEEDBITS(2);
-	    zip_method = zip_GETBITS(2);
-	    zip_DUMPBITS(2);
-	    zip_tl = null;
-	    zip_copy_leng = 0;
-	}
-
-	switch(zip_method) {
-	  case 0: // zip_STORED_BLOCK
-	    i = zip_inflate_stored(buff, off + n, size - n);
-	    break;
-
-	  case 1: // zip_STATIC_TREES
-	    if(zip_tl != null)
-		i = zip_inflate_codes(buff, off + n, size - n);
-	    else
-		i = zip_inflate_fixed(buff, off + n, size - n);
-	    break;
-
-	  case 2: // zip_DYN_TREES
-	    if(zip_tl != null)
-		i = zip_inflate_codes(buff, off + n, size - n);
-	    else
-		i = zip_inflate_dynamic(buff, off + n, size - n);
-	    break;
-
-	  default: // error
-	    i = -1;
-	    break;
-	}
-
-	if(i == -1) {
-	    if(zip_eof)
-		return 0;
-	    return -1;
-	}
-	n += i;
-    }
-    return n;
-}
-
-var zip_inflate = function(data, size) {
-    var i, j;
-
-    zip_inflate_start();
-    zip_inflate_data = data;
-    zip_inflate_pos = 0;
-
-    var buff = new runtime.ByteArray(size);
-    zip_inflate_internal(buff, 0, size);
-    zip_inflate_data = null; // G.C.
-    return buff;
-}
-
-this.inflate = zip_inflate;
-};
diff --git a/apps/files_odfviewer/src/webodf/webodf/lib/core/UnitTester.js b/apps/files_odfviewer/src/webodf/webodf/lib/core/UnitTester.js
deleted file mode 100644
index 4dbe1fa2c0..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/lib/core/UnitTester.js
+++ /dev/null
@@ -1,255 +0,0 @@
-/**
- * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
- * @licstart
- * The JavaScript code in this page is free software: you can redistribute it
- * and/or modify it under the terms of the GNU Affero General Public License
- * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.  The code is distributed
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
- *
- * As additional permission under GNU AGPL version 3 section 7, you
- * may distribute non-source (e.g., minimized or compacted) forms of
- * that code without the copy of the GNU GPL normally required by
- * section 4, provided you include this license notice and a URL
- * through which recipients can access the Corresponding Source.
- *
- * As a special exception to the AGPL, any HTML file which merely makes function
- * calls to this code, and for that purpose includes it by reference shall be
- * deemed a separate work for copyright law purposes. In addition, the copyright
- * holders of this code give you permission to combine this code with free
- * software libraries that are released under the GNU LGPL. You may copy and
- * distribute such a system following the terms of the GNU AGPL for this code
- * and the LGPL for the libraries. If you modify this code, you may extend this
- * exception to your version of the code, but you are not obligated to do so.
- * If you do not wish to do so, delete this exception statement from your
- * version.
- *
- * This license applies to this entire compilation.
- * @licend
- * @source: http://www.webodf.org/
- * @source: http://gitorious.org/odfkit/webodf/
- */
-/*global runtime: true, Runtime: true, core: true*/
-/*jslint evil: true*/
-/**
- * @interface
- */
-core.UnitTest = function UnitTest() {"use strict";};
-/**
- * @return {undefined}
- */
-core.UnitTest.prototype.setUp = function () {"use strict";};
-/**
- * @return {undefined}
- */
-core.UnitTest.prototype.tearDown = function () {"use strict";};
-/**
- * @return {!string}
- */
-core.UnitTest.prototype.description = function () {"use strict";};
-/**
- * @return {Array.<!function():undefined>}
- */
-core.UnitTest.prototype.tests = function () {"use strict";};
-/**
- * @return {Array.<!function(!function():undefined):undefined>}
- */
-core.UnitTest.prototype.asyncTests = function () {"use strict";};
-
-/**
- * @constructor
- */
-core.UnitTestRunner = function UnitTestRunner() {
-    "use strict";
-    var failedTests = 0;
-    function debug(msg) {
-        runtime.log(msg);
-    }
-    function testFailed(msg) {
-        failedTests += 1;
-        runtime.log("fail", msg);
-    }
-    function testPassed(msg) {
-        runtime.log("pass", msg);
-    }
-    function areArraysEqual(a, b) {
-        var i;
-        try {
-            if (a.length !== b.length) {
-                return false;
-            }
-            for (i = 0; i < a.length; i += 1) {
-                if (a[i] !== b[i]) {
-                    return false;
-                }
-            }
-        } catch (ex) {
-            return false;
-        }
-        return true;
-    }
-    function isResultCorrect(actual, expected) {
-        if (expected === 0) {
-            return actual === expected && (1 / actual) === (1 / expected);
-        }
-        if (actual === expected) {
-            return true;
-        }
-        if (typeof expected === "number" && isNaN(expected)) {
-            return typeof actual === "number" && isNaN(actual);
-        }
-        if (Object.prototype.toString.call(expected) ===
-                Object.prototype.toString.call([])) {
-            return areArraysEqual(actual, expected);
-        }
-        return false;
-    }
-    function stringify(v) {
-        if (v === 0 && 1 / v < 0) {
-            return "-0";
-        }
-        return String(v);
-    }
-    /**
-     * @param {!Object} t
-     * @param {!string} a
-     * @param {!string} b
-     * @return {undefined}
-     */
-    function shouldBe(t, a, b) {
-        if (typeof a !== "string" || typeof b !== "string") {
-            debug("WARN: shouldBe() expects string arguments");
-        }
-        var exception, av, bv;
-        try {
-            av = eval(a);
-        } catch (e) {
-            exception = e;
-        }
-        bv = eval(b);
-
-        if (exception) {
-            testFailed(a + " should be " + bv + ". Threw exception " +
-                    exception);
-        } else if (isResultCorrect(av, bv)) {
-            testPassed(a + " is " + b);
-        } else if (typeof av === typeof bv) {
-            testFailed(a + " should be " + bv + ". Was " + stringify(av) + ".");
-        } else {
-            testFailed(a + " should be " + bv + " (of type " + typeof bv +
-                    "). Was " + av + " (of type " + typeof av + ").");
-        }
-    }
-    /**
-     * @param {!Object} t context in which values to be tested are placed
-     * @param {!string} a the value to be checked
-     * @return {undefined}
-     */
-    function shouldBeNonNull(t, a) {
-        var exception, av;
-        try {
-            av = eval(a);
-        } catch (e) {
-            exception = e;
-        }
-
-        if (exception) {
-            testFailed(a + " should be non-null. Threw exception " + exception);
-        } else if (av !== null) {
-            testPassed(a + " is non-null.");
-        } else {
-            testFailed(a + " should be non-null. Was " + av);
-        }
-    }
-    /**
-     * @param {!Object} t context in which values to be tested are placed
-     * @param {!string} a the value to be checked
-     * @return {undefined}
-     */
-    function shouldBeNull(t, a) {
-        shouldBe(t, a, "null");
-    }
-    this.shouldBeNull = shouldBeNull;
-    this.shouldBeNonNull = shouldBeNonNull;
-    this.shouldBe = shouldBe;
-    this.countFailedTests = function () {
-        return failedTests;
-    };
-};
-
-/**
- * @constructor
- */
-core.UnitTester = function UnitTester() {
-    "use strict";
-    var failedTests = 0,
-        results = {};
-    /**
-     * @param {Function} TestClass the constructor for the test class
-     * @param {!function():undefined} callback
-     * @return {undefined}
-     */
-    this.runTests = function (TestClass, callback) {
-        var testName = Runtime.getFunctionName(TestClass),
-            tname,
-            runner = new core.UnitTestRunner(),
-            test = new TestClass(runner),
-            testResults = {},
-            i,
-            t,
-            tests,
-            lastFailCount;
-
-        // check that this test has not been run or started yet
-        if (testName.hasOwnProperty(results)) {
-            runtime.log("Test " + testName + " has already run.");
-            return;
-        }
-
-        runtime.log("Running " + testName + ": " + test.description());
-        tests = test.tests();
-        for (i = 0; i < tests.length; i += 1) {
-            t = tests[i];
-            tname = Runtime.getFunctionName(t);
-            runtime.log("Running " + tname);
-            lastFailCount = runner.countFailedTests();
-            test.setUp();
-            t();
-            test.tearDown();
-            testResults[tname] = lastFailCount === runner.countFailedTests();
-        }
-        function runAsyncTests(todo) {
-            if (todo.length === 0) {
-                results[testName] = testResults;
-                failedTests += runner.countFailedTests();
-                callback();
-                return;
-            }
-            t = todo[0];
-            var tname = Runtime.getFunctionName(t);
-            runtime.log("Running " + tname);
-            lastFailCount = runner.countFailedTests();
-            test.setUp();
-            t(function () {
-                test.tearDown();
-                testResults[tname] = lastFailCount ===
-                    runner.countFailedTests();
-                runAsyncTests(todo.slice(1));
-            });
-        }
-        runAsyncTests(test.asyncTests());
-    };
-    /**
-     * @return {!number}
-     **/
-    this.countFailedTests = function () {
-        return failedTests;
-    };
-    /**
-     * @return {!Object}
-     **/
-    this.results = function () {
-        return results;
-    };
-};
diff --git a/apps/files_odfviewer/src/webodf/webodf/lib/core/Zip.js b/apps/files_odfviewer/src/webodf/webodf/lib/core/Zip.js
deleted file mode 100644
index 66f508ee39..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/lib/core/Zip.js
+++ /dev/null
@@ -1,600 +0,0 @@
-/**
- * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
- * @licstart
- * The JavaScript code in this page is free software: you can redistribute it
- * and/or modify it under the terms of the GNU Affero General Public License
- * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.  The code is distributed
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
- *
- * As additional permission under GNU AGPL version 3 section 7, you
- * may distribute non-source (e.g., minimized or compacted) forms of
- * that code without the copy of the GNU GPL normally required by
- * section 4, provided you include this license notice and a URL
- * through which recipients can access the Corresponding Source.
- *
- * As a special exception to the AGPL, any HTML file which merely makes function
- * calls to this code, and for that purpose includes it by reference shall be
- * deemed a separate work for copyright law purposes. In addition, the copyright
- * holders of this code give you permission to combine this code with free
- * software libraries that are released under the GNU LGPL. You may copy and
- * distribute such a system following the terms of the GNU AGPL for this code
- * and the LGPL for the libraries. If you modify this code, you may extend this
- * exception to your version of the code, but you are not obligated to do so.
- * If you do not wish to do so, delete this exception statement from your
- * version.
- *
- * This license applies to this entire compilation.
- * @licend
- * @source: http://www.webodf.org/
- * @source: http://gitorious.org/odfkit/webodf/
- */
-/*global runtime, core, DOMParser*/
-/*jslint bitwise: true*/
-/*
-* @preserve
-* WebODF
-* Copyright (c) 2010 Jos van den Oever 
-* Licensed under the ... License:
-*
-* Project home: http://www.webodf.org/
-*/
-
-runtime.loadClass("core.RawInflate");
-runtime.loadClass("core.ByteArray");
-runtime.loadClass("core.ByteArrayWriter");
-runtime.loadClass("core.Base64");
-
-/**
- * @constructor
- * @param {!string} url path to zip file, should be readable by the runtime
- * @param {?function(?string, !core.Zip):undefined} entriesReadCallback callback
- *        indicating the zip
- *        has loaded this list of entries, the arguments are a string that
- *        indicates error if present and the created object
- */
-core.Zip = function Zip(url, entriesReadCallback) {
-    "use strict";
-    var /**@type{Array.<!ZipEntry>}*/ entries,
-        /**@type{number}*/ filesize,
-        /**@type{number}*/ nEntries,
-        /**@type{Function}*/ inflate = new core.RawInflate().inflate,
-        /**@type{!core.Zip}*/ zip = this,
-        base64 = new core.Base64();
-
-    /**
-     * @param {!Runtime.ByteArray} data
-     * @return {!number}
-     */
-    function crc32(data) {
-        // Calculate the crc32 polynomial of a string  
-        // 
-        // version: 1009.2513
-        // discuss at: http:\/\/phpjs.org\/functions\/crc32
-        // +   original by: Webtoolkit.info (http:\/\/www.webtoolkit.info\/)
-        // +   improved by: T0bsn
-        // -    depends on: utf8_encode
-        // *     example 1: crc32('Kevin van Zonneveld');
-        // *     returns 1: 1249991249
-        var /**@const@type{!Array.<!number>}*/table = [0x00000000, 0x77073096, 0xEE0E612C, 0x990951BA, 0x076DC419, 0x706AF48F, 0xE963A535, 0x9E6495A3, 0x0EDB8832, 0x79DCB8A4, 0xE0D5E91E, 0x97D2D988, 0x09B64C2B, 0x7EB17CBD, 0xE7B82D07, 0x90BF1D91, 0x1DB71064, 0x6AB020F2, 0xF3B97148, 0x84BE41DE, 0x1ADAD47D, 0x6DDDE4EB, 0xF4D4B551, 0x83D385C7, 0x136C9856, 0x646BA8C0, 0xFD62F97A, 0x8A65C9EC, 0x14015C4F, 0x63066CD9, 0xFA0F3D63, 0x8D080DF5, 0x3B6E20C8, 0x4C69105E, 0xD56041E4, 0xA2677172, 0x3C03E4D1, 0x4B04D447, 0xD20D85FD, 0xA50AB56B, 0x35B5A8FA, 0x42B2986C, 0xDBBBC9D6, 0xACBCF940, 0x32D86CE3, 0x45DF5C75, 0xDCD60DCF, 0xABD13D59, 0x26D930AC, 0x51DE003A, 0xC8D75180, 0xBFD06116, 0x21B4F4B5, 0x56B3C423, 0xCFBA9599, 0xB8BDA50F, 0x2802B89E, 0x5F058808, 0xC60CD9B2, 0xB10BE924, 0x2F6F7C87, 0x58684C11, 0xC1611DAB, 0xB6662D3D, 0x76DC4190, 0x01DB7106, 0x98D220BC, 0xEFD5102A, 0x71B18589, 0x06B6B51F, 0x9FBFE4A5, 0xE8B8D433, 0x7807C9A2, 0x0F00F934, 0x9609A88E, 0xE10E9818, 0x7F6A0DBB, 0x086D3D2D, 0x91646C97, 0xE6635C01, 0x6B6B51F4, 0x1C6C6162, 0x856530D8, 0xF262004E, 0x6C0695ED, 0x1B01A57B, 0x8208F4C1, 0xF50FC457, 0x65B0D9C6, 0x12B7E950, 0x8BBEB8EA, 0xFCB9887C, 0x62DD1DDF, 0x15DA2D49, 0x8CD37CF3, 0xFBD44C65, 0x4DB26158, 0x3AB551CE, 0xA3BC0074, 0xD4BB30E2, 0x4ADFA541, 0x3DD895D7, 0xA4D1C46D, 0xD3D6F4FB, 0x4369E96A, 0x346ED9FC, 0xAD678846, 0xDA60B8D0, 0x44042D73, 0x33031DE5, 0xAA0A4C5F, 0xDD0D7CC9, 0x5005713C, 0x270241AA, 0xBE0B1010, 0xC90C2086, 0x5768B525, 0x206F85B3, 0xB966D409, 0xCE61E49F, 0x5EDEF90E, 0x29D9C998, 0xB0D09822, 0xC7D7A8B4, 0x59B33D17, 0x2EB40D81, 0xB7BD5C3B, 0xC0BA6CAD, 0xEDB88320, 0x9ABFB3B6, 0x03B6E20C, 0x74B1D29A, 0xEAD54739, 0x9DD277AF, 0x04DB2615, 0x73DC1683, 0xE3630B12, 0x94643B84, 0x0D6D6A3E, 0x7A6A5AA8, 0xE40ECF0B, 0x9309FF9D, 0x0A00AE27, 0x7D079EB1, 0xF00F9344, 0x8708A3D2, 0x1E01F268, 0x6906C2FE, 0xF762575D, 0x806567CB, 0x196C3671, 0x6E6B06E7, 0xFED41B76, 0x89D32BE0, 0x10DA7A5A, 0x67DD4ACC, 0xF9B9DF6F, 0x8EBEEFF9, 0x17B7BE43, 0x60B08ED5, 0xD6D6A3E8, 0xA1D1937E, 0x38D8C2C4, 0x4FDFF252, 0xD1BB67F1, 0xA6BC5767, 0x3FB506DD, 0x48B2364B, 0xD80D2BDA, 0xAF0A1B4C, 0x36034AF6, 0x41047A60, 0xDF60EFC3, 0xA867DF55, 0x316E8EEF, 0x4669BE79, 0xCB61B38C, 0xBC66831A, 0x256FD2A0, 0x5268E236, 0xCC0C7795, 0xBB0B4703, 0x220216B9, 0x5505262F, 0xC5BA3BBE, 0xB2BD0B28, 0x2BB45A92, 0x5CB36A04, 0xC2D7FFA7, 0xB5D0CF31, 0x2CD99E8B, 0x5BDEAE1D, 0x9B64C2B0, 0xEC63F226, 0x756AA39C, 0x026D930A, 0x9C0906A9, 0xEB0E363F, 0x72076785, 0x05005713, 0x95BF4A82, 0xE2B87A14, 0x7BB12BAE, 0x0CB61B38, 0x92D28E9B, 0xE5D5BE0D, 0x7CDCEFB7, 0x0BDBDF21, 0x86D3D2D4, 0xF1D4E242, 0x68DDB3F8, 0x1FDA836E, 0x81BE16CD, 0xF6B9265B, 0x6FB077E1, 0x18B74777, 0x88085AE6, 0xFF0F6A70, 0x66063BCA, 0x11010B5C, 0x8F659EFF, 0xF862AE69, 0x616BFFD3, 0x166CCF45, 0xA00AE278, 0xD70DD2EE, 0x4E048354, 0x3903B3C2, 0xA7672661, 0xD06016F7, 0x4969474D, 0x3E6E77DB, 0xAED16A4A, 0xD9D65ADC, 0x40DF0B66, 0x37D83BF0, 0xA9BCAE53, 0xDEBB9EC5, 0x47B2CF7F, 0x30B5FFE9, 0xBDBDF21C, 0xCABAC28A, 0x53B39330, 0x24B4A3A6, 0xBAD03605, 0xCDD70693, 0x54DE5729, 0x23D967BF, 0xB3667A2E, 0xC4614AB8, 0x5D681B02, 0x2A6F2B94, 0xB40BBE37, 0xC30C8EA1, 0x5A05DF1B, 0x2D02EF8D],
-            /**@type{!number}*/ crc = 0,
-            /**@type{!number}*/ i,
-            /**@const@type{!number}*/ iTop = data.length,
-            /**@type{!number}*/ x = 0,
-            /**@type{!number}*/ y = 0;
-        crc = crc ^ (-1);
-        for (i = 0; i < iTop; i += 1) {
-            y = (crc ^ data[i]) & 0xFF;
-            x = table[y];
-            crc = (crc >>> 8) ^ x;
-        }
-        return crc ^ (-1);
-    }
-
-    /**
-     * @param {!number} dostime
-     * @return {!Date}
-     */
-    function dosTime2Date(dostime) {
-        var /**@const@type{!number}*/ year = ((dostime >> 25) & 0x7f) + 1980,
-            /**@const@type{!number}*/ month = ((dostime >> 21) & 0x0f) - 1,
-            /**@const@type{!number}*/ mday = (dostime >> 16) & 0x1f,
-            /**@const@type{!number}*/ hour = (dostime >> 11) & 0x0f,
-            /**@const@type{!number}*/ min = (dostime >> 5) & 0x3f,
-            /**@const@type{!number}*/ sec = (dostime & 0x1f) << 1,
-            /**@const@type{!Date}*/ d
-                = new Date(year, month, mday, hour, min, sec);
-        return d;
-    }
-    /**
-     * @param {!Date} date
-     * @return {!number}
-     */
-    function date2DosTime(date) {
-        var /**@const@type{!number}*/ y = date.getFullYear();
-        return y < 1980 ? 0 :
-            ((y - 1980) << 25) | ((date.getMonth() + 1) << 21) |
-            (date.getDate() << 16) | (date.getHours() << 11) |
-            (date.getMinutes() << 5) | (date.getSeconds() >> 1);
-    }
-    /**
-     * Create a new ZipEntry.
-     * If the stream is not provided, the object should be initialized
-     * with ZipEntry.set()
-     * @constructor
-     * @param {!string} url
-     * @param {!core.ByteArray=} stream
-     */
-    function ZipEntry(url, stream) {
-        var /**@const@type{!number}*/ sig,
-            /**@const@type{!number}*/ namelen,
-            /**@const@type{!number}*/ extralen,
-            /**@const@type{!number}*/ commentlen,
-            /**@const@type{!number}*/ compressionMethod,
-            /**@const@type{!number}*/ compressedSize,
-            /**@const@type{!number}*/ uncompressedSize,
-            /**@const@type{!number}*/ offset,
-            /**@const@type{!number}*/ crc,
-            /**@const@type{!ZipEntry}*/ entry = this;
-
-        /**
-         * @param {!Runtime.ByteArray} data
-         * @param {!function(?string, ?Runtime.ByteArray)} callback
-         * @return {undefined}
-         */
-        function handleEntryData(data, callback) {
-            var /**@const@type{!core.ByteArray}*/ stream
-                        = new core.ByteArray(data),
-                /**@const@type{!number}*/ sig = stream.readUInt32LE(),
-                /**@const@type{!number}*/ filenamelen,
-                /**@const@type{!number}*/ extralen;
-            if (sig !== 0x04034b50) {
-                callback('File entry signature is wrong.' + sig.toString() +
-                        ' ' + data.length.toString(), null);
-                return;
-            }
-            stream.pos += 22;
-            filenamelen = stream.readUInt16LE();
-            extralen = stream.readUInt16LE();
-            stream.pos += filenamelen + extralen;
-            if (compressionMethod) {
-                data = data.slice(stream.pos, stream.pos + compressedSize);
-                if (compressedSize !== data.length) {
-                    callback("The amount of compressed bytes read was " +
-                        data.length.toString() + " instead of " +
-                        compressedSize.toString() + " for " + entry.filename +
-                        " in " + url + ".", null);
-                    return;
-                }
-                data = inflate(data, uncompressedSize);
-            } else {
-                data = data.slice(stream.pos, stream.pos + uncompressedSize);
-            }
-            if (uncompressedSize !== data.length) {
-                callback("The amount of bytes read was " +
-                        data.length.toString() +
-                        " instead of " + uncompressedSize.toString() + " for " +
-                        entry.filename + " in " + url + ".", null);
-                return;
-            }
-/*
- * This check is disabled for performance reasons
-            if (crc !== crc32(data)) {
-                runtime.log("Warning: CRC32 for " + entry.filename +
-                    " is wrong.");
-            }
-*/
-            entry.data = data;
-            callback(null, data);
-        }
-        /**
-         * @param {!function(?string, ?Runtime.ByteArray)} callback
-         * @return {undefined}
-         */
-        function load(callback) {
-            // if data has already been downloaded, use that
-            if (entry.data !== undefined) {
-                callback(null, entry.data);
-                return;
-            }
-            // the 256 at the end is security for when local extra field is
-            // larger
-            var /**@type{!number}*/ size
-                = compressedSize + 34 + namelen + extralen + 256;
-            if (size + offset > filesize) {
-                size = filesize - offset;
-            }
-            runtime.read(url, offset, size, function (err, data) {
-                if (err) {
-                    callback(err, data);
-                } else {
-                    handleEntryData(data, callback);
-                }
-            });
-        }
-        this.load = load;
-        /**
-         * @param {!string} filename
-         * @param {!Runtime.ByteArray} data
-         * @param {!boolean} compressed
-         * @param {!Date} date
-         * @return {undefined}
-         */
-        function set(filename, data, compressed, date) {
-            entry.filename = filename;
-            entry.data = data;
-            entry.compressed = compressed;
-            entry.date = date;
-        }
-        this.set = set;
-        /**
-         * @type {?string}
-         */
-        this.error = null;
-
-        if (!stream) {
-            return;
-        }
-        sig = stream.readUInt32LE();
-
-        if (sig !== 0x02014b50) {
-            this.error =
-                "Central directory entry has wrong signature at position " +
-                (stream.pos - 4).toString() + ' for file "' + url + '": ' +
-                stream.data.length.toString();
-            return;
-        }
-        // stream should be positioned at the start of the CDS entry for the
-        // file
-        stream.pos += 6;
-        compressionMethod = stream.readUInt16LE();
-        this.date = dosTime2Date(stream.readUInt32LE());
-        crc = stream.readUInt32LE();
-        compressedSize = stream.readUInt32LE();
-        uncompressedSize = stream.readUInt32LE();
-        namelen = stream.readUInt16LE();
-        extralen = stream.readUInt16LE();
-        commentlen = stream.readUInt16LE();
-        stream.pos += 8;
-        offset = stream.readUInt32LE();
-        this.filename = runtime.byteArrayToString(
-                stream.data.slice(stream.pos, stream.pos + namelen), "utf8");
-        stream.pos += namelen + extralen + commentlen;
-    }
-    /**
-     * @param {!Runtime.ByteArray} data
-     * @param {!function(?string, !core.Zip)} callback
-     * @return {undefined}
-     */
-    function handleCentralDirectory(data, callback) {
-        // parse the central directory
-        var stream = new core.ByteArray(data), i, e;
-        entries = [];
-        for (i = 0; i < nEntries; i += 1) {
-            e = new ZipEntry(url, stream);
-            if (e.error) {
-                callback(e.error, zip);
-                return;
-            }
-            entries[entries.length] = e;
-        }
-        // report that entries are listed and no error occured
-        callback(null, zip);
-    }
-    /**
-     * @param {!Runtime.ByteArray} data
-     * @param {!function(?string, !core.Zip)} callback
-     * @return {undefined}
-     */
-    function handleCentralDirectoryEnd(data, callback) {
-        if (data.length !== 22) {
-            callback("Central directory length should be 22.", zip);
-            return;
-        }
-        var stream = new core.ByteArray(data), sig, disk, cddisk, diskNEntries,
-            cdsSize, cdsOffset;
-        sig = stream.readUInt32LE();
-        if (sig !== 0x06054b50) {
-            callback('Central directory signature is wrong: ' + sig.toString(),
-                    zip);
-            return;
-        }
-        disk = stream.readUInt16LE();
-        if (disk !== 0) {
-            callback('Zip files with non-zero disk numbers are not supported.',
-                    zip);
-            return;
-        }
-        cddisk = stream.readUInt16LE();
-        if (cddisk !== 0) {
-            callback('Zip files with non-zero disk numbers are not supported.',
-                    zip);
-            return;
-        }
-        diskNEntries = stream.readUInt16LE();
-        nEntries = stream.readUInt16LE();
-        if (diskNEntries !== nEntries) {
-            callback('Number of entries is inconsistent.', zip);
-            return;
-        }
-        cdsSize = stream.readUInt32LE();
-        cdsOffset = stream.readUInt16LE();
-        cdsOffset = filesize - 22 - cdsSize;
-
-        // for some reason cdsOffset is not always equal to offset calculated
-        // from the central directory size. The latter is reliable.
-        runtime.read(url, cdsOffset, filesize - cdsOffset,
-                function (err, data) {
-                handleCentralDirectory(data, callback);
-            });
-    }
-    /**
-     * @param {!string} filename
-     * @param {!function(?string, ?Runtime.ByteArray)} callback receiving err and data
-     * @return {undefined}
-     */
-    function load(filename, callback) {
-        var entry = null,
-            end = filesize,
-            e,
-            i;
-        for (i = 0; i < entries.length; i += 1) {
-            e = entries[i];
-            if (e.filename === filename) {
-                entry = e;
-                break;
-            }
-        }
-        if (entry) {
-            if (entry.data) {
-                callback(null, entry.data);
-            } else {
-                entry.load(callback);
-            }
-        } else {
-            callback(filename + " not found.", null);
-        }
-    }
-    /**
-     * @param {!string} filename
-     * @param {!function(?string, ?string)} callback receiving err and data
-     * @return {undefined}
-     */
-    function loadAsString(filename, callback) {
-        // the javascript implementation simply reads the file and converts to
-        // string
-        load(filename, function (err, data) {
-            if (err) {
-                return callback(err, null);
-            }
-            data = runtime.byteArrayToString(data, "utf8");
-            callback(null, data);
-        });
-    }
-    /**
-     * @param {!string} filename
-     * @param {!Object} handler
-     * @return {undefined}
-     */
-    function loadContentXmlAsFragments(filename, handler) {
-        // the javascript implementation simply reads the file
-        loadAsString(filename, function (err, data) {
-            if (err) {
-                return handler.rootElementReady(err);
-            }
-            handler.rootElementReady(null, data, true);
-        });
-    }
-    function loadAsDataURL(filename, mimetype, callback) {
-        load(filename, function (err, data) {
-            if (err) {
-                return callback(err, null);
-            }
-            var /**@const@type{!Runtime.ByteArray}*/p = data,
-                chunksize = 45000, // must be multiple of 3 and less than 50000
-                i = 0,
-                url;
-            if (!mimetype) {
-                if (p[1] === 0x50 && p[2] === 0x4E && p[3] === 0x47) {
-                    mimetype = "image/png";
-                } else if (p[0] === 0xFF && p[1] === 0xD8 && p[2] === 0xFF) {
-                    mimetype = "image/jpeg";
-                } else if (p[0] === 0x47 && p[1] === 0x49 && p[2] === 0x46) {
-                    mimetype = "image/gif";
-                } else {
-                    mimetype = "";
-                }
-            }
-            url = 'data:' + mimetype + ';base64,';
-            // to avoid exceptions, base64 encoding is done in chunks
-            // it would make sense to move this to base64.toBase64
-            while (i < data.length) {
-                url += base64.convertUTF8ArrayToBase64(
-                    p.slice(i, Math.min(i + chunksize, p.length))
-                );
-                i += chunksize;
-            }
-            callback(null, url);
-        });
-    }
-    function loadAsDOM(filename, callback) {
-        loadAsString(filename, function (err, xmldata) {
-            if (err) {
-                callback(err, null);
-                return;
-            }
-            var parser = new DOMParser();
-            xmldata = parser.parseFromString(xmldata, "text/xml");
-            callback(null, xmldata);
-        });
-    }
-    /**
-     * Add or replace an entry to the zip file.
-     * This data is not stored to disk yet, and therefore, no callback is
-     * necessary.
-     * @param {!string} filename
-     * @param {!Runtime.ByteArray} data
-     * @param {!boolean} compressed
-     * @param {!Date} date
-     * @return {undefined}
-     */
-    function save(filename, data, compressed, date) {
-        var i,
-            entry;
-        for (i = 0; i < entries.length; i += 1) {
-            entry = entries[i];
-            if (entry.filename === filename) {
-                entry.set(filename, data, compressed, date);
-                return;
-            }
-        }
-        entry = new ZipEntry(url);
-        entry.set(filename, data, compressed, date);
-        entries.push(entry);
-    }
-    /**
-     * @param {!ZipEntry} entry
-     * @return {!core.ByteArrayWriter}
-     */
-    function writeEntry(entry) {
-        // each entry is currently stored uncompressed
-        var data = new core.ByteArrayWriter("utf8"),
-            length = 0;
-        data.appendArray([0x50, 0x4B, 0x03, 0x04, 0x14, 0, 0, 0, 0, 0]);
-        if (entry.data) {
-            length = entry.data.length;
-        }
-        data.appendUInt32LE(date2DosTime(entry.date));
-        data.appendUInt32LE(crc32(entry.data));
-        data.appendUInt32LE(length); // compressedSize
-        data.appendUInt32LE(length); // uncompressedSize
-        data.appendUInt16LE(entry.filename.length); // namelen
-        data.appendUInt16LE(0); // extralen
-        data.appendString(entry.filename);
-        if (entry.data) {
-            data.appendByteArray(entry.data);
-        }
-        return data;
-    }
-    /**
-     * @param {!ZipEntry} entry
-     * @param {!number} offset
-     * @return {!core.ByteArrayWriter}
-     */
-    function writeCODEntry(entry, offset) {
-        // each entry is currently stored uncompressed
-        var data = new core.ByteArrayWriter("utf8"),
-            length = 0;
-        data.appendArray([0x50, 0x4B, 0x01, 0x02, 0x14, 0x00, 0x14, 0x00,
-                0, 0, 0, 0]);
-        if (entry.data) {
-            length = entry.data.length;
-        }
-        data.appendUInt32LE(date2DosTime(entry.date));
-        data.appendUInt32LE(crc32(entry.data));
-        data.appendUInt32LE(length); // compressedSize
-        data.appendUInt32LE(length); // uncompressedSize
-        data.appendUInt16LE(entry.filename.length); // namelen
-        // extralen, commalen, diskno, file attributes
-        data.appendArray([0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0]);
-        data.appendUInt32LE(offset);
-        data.appendString(entry.filename);
-        return data;
-    }
-    /**
-     * @param {!number} position
-     * @param {!function(?string):undefined} callback
-     * @return {undefined}
-     */
-    function loadAllEntries(position, callback) {
-        if (position === entries.length) {
-            callback(null);
-            return;
-        }
-        var entry = entries[position];
-        if (entry.data !== undefined) {
-            loadAllEntries(position + 1, callback);
-            return;
-        }
-        entry.load(function (err) {
-            if (err) {
-                callback(err);
-                return;
-            }
-            loadAllEntries(position + 1, callback);
-        });
-    }
-    /**
-     * Write the zipfile to the given path.
-     * @param {!function(?string):undefined} callback receiving possible err
-     * @return {undefined}
-     */
-    function write(callback) {
-        // make sure all data is in memory, for each entry that has data
-        // undefined, try to load the entry
-        loadAllEntries(0, function (err) {
-            if (err) {
-                callback(err);
-                return;
-            }
-            var data = new core.ByteArrayWriter("utf8"),
-                i, e, codoffset, codsize,
-                offsets = [0];
-            // write entries
-            for (i = 0; i < entries.length; i += 1) {
-                data.appendByteArrayWriter(writeEntry(entries[i]));
-                offsets.push(data.getLength());
-            }
-            // write central directory
-            codoffset = data.getLength();
-            for (i = 0; i < entries.length; i += 1) {
-                e = entries[i];
-                data.appendByteArrayWriter(writeCODEntry(e, offsets[i]));
-            }
-            codsize = data.getLength() - codoffset;
-            data.appendArray([0x50, 0x4B, 0x05, 0x06, 0, 0, 0, 0]);
-            data.appendUInt16LE(entries.length);
-            data.appendUInt16LE(entries.length);
-            data.appendUInt32LE(codsize);
-            data.appendUInt32LE(codoffset);
-            data.appendArray([0, 0]);
-            runtime.writeFile(url, data.getByteArray(), callback);
-        });
-    }
-
-    this.load = load;
-    this.save = save;
-    this.write = write;
-    // a special function that makes faster odf loading possible
-    this.loadContentXmlAsFragments = loadContentXmlAsFragments;
-    this.loadAsString = loadAsString;
-    this.loadAsDOM = loadAsDOM;
-    this.loadAsDataURL = loadAsDataURL;
-    this.getEntries = function () {
-        return entries.slice();
-    };
-
-    // determine the file size
-    filesize = -1;
-    // if no callback is defined, this is a new file
-    if (entriesReadCallback === null) {
-        entries = [];
-        return;
-    }
-    runtime.getFileSize(url, function (size) {
-        filesize = size;
-        if (filesize < 0) {
-            entriesReadCallback("File '" + url + "' cannot be read.", zip);
-        } else {
-            runtime.read(url, filesize - 22, 22, function (err, data) {
-                // todo: refactor entire zip class
-                if (err || entriesReadCallback === null) {
-                    entriesReadCallback(err, zip);
-                } else {
-                    handleCentralDirectoryEnd(data, entriesReadCallback);
-                }
-            });
-        }
-    });
-};
diff --git a/apps/files_odfviewer/src/webodf/webodf/lib/core/dummyxmlmodel.js_ b/apps/files_odfviewer/src/webodf/webodf/lib/core/dummyxmlmodel.js_
deleted file mode 100644
index c14ec84411..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/lib/core/dummyxmlmodel.js_
+++ /dev/null
@@ -1,21 +0,0 @@
-/*global exports require*/
-function createDummyXMLModel() {
-    var that = {};
-
-    function preserveWhitespace(node) {
-        return true;
-    }
-
-    // return an array with child qnames or null for inserting text.
-    // the dummy implementation allows text everywhere, but no new elements
-    // "*" means all elements are allowed
-    // ["#PCDATA", "*"] means any element and text is allowed
-    function getAllowedChildren(node, position) {
-        return [null];
-    }
-
-    that.getAllowedChildren = getAllowedChildren;
-    that.preserveWhitespace = preserveWhitespace;
-    return that;
-}
-exports.createDummyXMLModel = createDummyXMLModel;
diff --git a/apps/files_odfviewer/src/webodf/webodf/lib/export.js b/apps/files_odfviewer/src/webodf/webodf/lib/export.js
deleted file mode 100644
index 08982cd424..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/lib/export.js
+++ /dev/null
@@ -1,39 +0,0 @@
-/**
- * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
- * @licstart
- * The JavaScript code in this page is free software: you can redistribute it
- * and/or modify it under the terms of the GNU Affero General Public License
- * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.  The code is distributed
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
- *
- * As additional permission under GNU AGPL version 3 section 7, you
- * may distribute non-source (e.g., minimized or compacted) forms of
- * that code without the copy of the GNU GPL normally required by
- * section 4, provided you include this license notice and a URL
- * through which recipients can access the Corresponding Source.
- *
- * As a special exception to the AGPL, any HTML file which merely makes function
- * calls to this code, and for that purpose includes it by reference shall be
- * deemed a separate work for copyright law purposes. In addition, the copyright
- * holders of this code give you permission to combine this code with free
- * software libraries that are released under the GNU LGPL. You may copy and
- * distribute such a system following the terms of the GNU AGPL for this code
- * and the LGPL for the libraries. If you modify this code, you may extend this
- * exception to your version of the code, but you are not obligated to do so.
- * If you do not wish to do so, delete this exception statement from your
- * version.
- *
- * This license applies to this entire compilation.
- * @licend
- * @source: http://www.webodf.org/
- * @source: http://gitorious.org/odfkit/webodf/
- */
-/*global window runtime odf*/
-/*jslint sub: true*/
-
-window["runtime"] = runtime;
-runtime["loadClass"] = runtime.loadClass;
-window["odf"] = odf;
-window["odf"]["OdfCanvas"] = odf.OdfCanvas;
diff --git a/apps/files_odfviewer/src/webodf/webodf/lib/gui/Caret.js b/apps/files_odfviewer/src/webodf/webodf/lib/gui/Caret.js
deleted file mode 100644
index 744b8b022a..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/lib/gui/Caret.js
+++ /dev/null
@@ -1,65 +0,0 @@
-/**
- * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
- * @licstart
- * The JavaScript code in this page is free software: you can redistribute it
- * and/or modify it under the terms of the GNU Affero General Public License
- * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.  The code is distributed
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
- *
- * As additional permission under GNU AGPL version 3 section 7, you
- * may distribute non-source (e.g., minimized or compacted) forms of
- * that code without the copy of the GNU GPL normally required by
- * section 4, provided you include this license notice and a URL
- * through which recipients can access the Corresponding Source.
- *
- * As a special exception to the AGPL, any HTML file which merely makes function
- * calls to this code, and for that purpose includes it by reference shall be
- * deemed a separate work for copyright law purposes. In addition, the copyright
- * holders of this code give you permission to combine this code with free
- * software libraries that are released under the GNU LGPL. You may copy and
- * distribute such a system following the terms of the GNU AGPL for this code
- * and the LGPL for the libraries. If you modify this code, you may extend this
- * exception to your version of the code, but you are not obligated to do so.
- * If you do not wish to do so, delete this exception statement from your
- * version.
- *
- * This license applies to this entire compilation.
- * @licend
- * @source: http://www.webodf.org/
- * @source: http://gitorious.org/odfkit/webodf/
- */
-/*global gui*/
-/**
- * Class that represents a caret in a document. In text nodes, a native caret is
- * used via the HTML attribute contentEditable. Outside of text nodes, an empty
- * element representing the caret is used.
- * @constructor
- */
-gui.Caret = function Caret(selection, rootNode) {
-    "use strict";
-    var document = rootNode.ownerDocument,
-        cursorns,
-        cursorNode;
-    cursorns = 'urn:webodf:names:cursor';
-    cursorNode = document.createElementNS(cursorns, 'cursor');
-    /**
-     * Synchronize the cursor with the current selection.
-     * If there is a single collapsed selection range, the cursor will be placed
-     * there. If not, the cursor will be removed from the document tree.
-     * @return {undefined}
-     */
-    this.updateToSelection = function () {
-        var range;
-//        removeCursor();
-        if (selection.rangeCount === 1) {
-            range = selection.getRangeAt(0);
-/*
-            if (range.collapsed) {
-                putCursor(range.startContainer, range.startOffset);
-            }
-*/
-        }
-    };
-};
diff --git a/apps/files_odfviewer/src/webodf/webodf/lib/gui/PresenterUI.js b/apps/files_odfviewer/src/webodf/webodf/lib/gui/PresenterUI.js
deleted file mode 100644
index c6553cc3af..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/lib/gui/PresenterUI.js
+++ /dev/null
@@ -1,246 +0,0 @@
-/**
- * Copyright (C) 2011 KO GmbH - Tobias Hintze
- * @licstart
- * The JavaScript code in this page is free software: you can redistribute it
- * and/or modify it under the terms of the GNU Affero General Public License
- * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.  The code is distributed
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
- *
- * As additional permission under GNU AGPL version 3 section 7, you
- * may distribute non-source (e.g., minimized or compacted) forms of
- * that code without the copy of the GNU GPL normally required by
- * section 4, provided you include this license notice and a URL
- * through which recipients can access the Corresponding Source.
- *
- * As a special exception to the AGPL, any HTML file which merely makes function
- * calls to this code, and for that purpose includes it by reference shall be
- * deemed a separate work for copyright law purposes. In addition, the copyright
- * holders of this code give you permission to combine this code with free
- * software libraries that are released under the GNU LGPL. You may copy and
- * distribute such a system following the terms of the GNU AGPL for this code
- * and the LGPL for the libraries. If you modify this code, you may extend this
- * exception to your version of the code, but you are not obligated to do so.
- * If you do not wish to do so, delete this exception statement from your
- * version.
- *
- * This license applies to this entire compilation.
- * @licend
- * @source: http://www.webodf.org/
- * @source: http://gitorious.org/odfkit/webodf/
- */
-
-/*global runtime, gui, odf, core, xmldom, document, window*/
-runtime.loadClass("xmldom.XPath");
-runtime.loadClass("odf.Style2CSS");
-
-gui.PresenterUI = (function () {
-    "use strict";
-    var s2css = new odf.Style2CSS(),
-        xpath = new xmldom.XPath(),
-        nsResolver = s2css.namespaceResolver;
-
-    return function PresenterUI(odf_element) {
-        var self = this;
-
-        self.setInitialSlideMode = function () {
-            self.startSlideMode('single');
-        };
-
-        self.keyDownHandler = function (ev) {
-            if (ev.target.isContentEditable) { return; }
-            if (ev.target.nodeName === 'input') { return; }
-            switch (ev.keyCode) {
-            case 84: // t - hide/show toolbar
-                self.toggleToolbar();
-                break;
-            case 37: // left
-            case 8: // left
-                self.prevSlide();
-                break;
-            case 39:  // right
-            case 32:  // space
-                self.nextSlide();
-                break;
-            case 36: // pos1
-                self.firstSlide();
-                break;
-            case 35: // end
-                self.lastSlide();
-                break;
-            }
-        };
-
-        self.root = function () { return self.odf_canvas.odfContainer().rootElement; };
-
-        self.firstSlide = function () { self.slideChange(function (old, pc) { return 0; }); };
-        self.lastSlide = function () { self.slideChange(function (old, pc) { return pc - 1; }); };
-
-        self.nextSlide = function () {
-            self.slideChange(function (old, pc) { return old + 1 < pc ? old + 1 : -1; });
-        };
-        self.prevSlide = function () {
-            self.slideChange(function (old, pc) { return old < 1 ? -1 : old - 1; });
-        };
-        // indexChanger gets (idx,pagecount) as parameter and returns the new index
-        self.slideChange = function (indexChanger) {
-            var pages = self.getPages(self.odf_canvas.odfContainer().rootElement),
-                last = -1,
-                i = 0,
-                newidx,
-                pagelist;
-            pages.forEach(function (tuple) {
-                var name = tuple[0],
-                    node = tuple[1];
-                if (node.hasAttribute('slide_current')) {
-                    last = i;
-                    node.removeAttribute('slide_current');
-                }
-                i += 1;
-            });
-            newidx = indexChanger(last, pages.length);
-            if (newidx === -1) { newidx = last; }
-            pages[newidx][1].setAttribute('slide_current', '1');
-            pagelist = document.getElementById('pagelist');
-            pagelist.selectedIndex = newidx;
-            // FIXME this needs to become a sane callback/listener mechanism
-            // (and the mode probably a class/instance..)
-            if (self.slide_mode === 'cont') {
-                window.scrollBy(0, pages[newidx][1].getBoundingClientRect().top - 30);
-            }
-        };
-
-        self.selectSlide = function (idx) {
-            self.slideChange(function (old, pc) {
-                if (idx >= pc) { return -1; }
-                if (idx < 0) { return -1; }
-                return idx;
-            });
-        };
-
-        // make one specific slide visible in cont-mode
-        self.scrollIntoContView = function (idx) {
-            var pages = self.getPages(self.odf_canvas.odfContainer().rootElement);
-            if (pages.length === 0) { return; }
-            /*
-            if (false) {
-                // works in chrome
-                pages[idx][1].scrollIntoView();
-            } else {
-            */
-                // works in ff
-            window.scrollBy(0, pages[idx][1].getBoundingClientRect().top - 30);
-            /*}*/
-        };
-
-        // return a list of tuples (pagename, pagenode)
-        self.getPages = function (root) {
-            var pagenodes = root.getElementsByTagNameNS(nsResolver('draw'), 'page'),
-                pages  = [],
-                i;
-            for (i = 0; i < pagenodes.length; i += 1) {
-                pages.push([
-                    pagenodes[i].getAttribute('draw:name'),
-                    pagenodes[i]
-                ]);
-            }
-            return pages;
-        };
-
-        // fill a html-select with options, one option per page in odf (odp)
-        self.fillPageList = function (odfdom_root, html_select) {
-            var pages = self.getPages(odfdom_root),
-                i,
-                html_option,
-                res,
-                page_denom;
-
-            // empty the pagelist
-            while (html_select.firstChild) {
-                html_select.removeChild(html_select.firstChild);
-            }
-
-            // populate it
-            for (i = 0; i < pages.length; i += 1) {
-                html_option = document.createElement('option');
-                res = xpath.getODFElementsWithXPath(pages[i][1],
-                    './draw:frame[@presentation:class="title"]//draw:text-box/text:p',
-                    xmldom.XPath);
-                page_denom = (res.length > 0) ? res[0].textContent : pages[i][0];
-                html_option.textContent = (i + 1) + ": " + page_denom;
-                html_select.appendChild(html_option);
-            }
-        };
-
-        self.startSlideMode = function (mode) {
-            var pagelist = document.getElementById('pagelist'),
-                css = self.odf_canvas.slidevisibilitycss().sheet;
-            self.slide_mode = mode;
-            while (css.cssRules.length > 0) { css.deleteRule(0); }
-            // start on slide 0
-            self.selectSlide(0);
-            if (self.slide_mode === 'single') {
-                css.insertRule("draw|page { position:fixed; left:0px;top:30px; z-index:1; }", 0);
-                css.insertRule("draw|page[slide_current]  { z-index:2;}", 1);
-                css.insertRule("draw|page  { -webkit-transform: scale(1);}", 2);
-                self.fitToWindow();
-                window.addEventListener('resize', self.fitToWindow, false);
-
-            } else if (self.slide_mode === 'cont') {
-                window.removeEventListener('resize', self.fitToWindow, false);
-            }
-
-            self.fillPageList(self.odf_canvas.odfContainer().rootElement, pagelist);
-        };
-
-        // toggle (show/hide) toolbar
-        self.toggleToolbar = function () {
-            var css, found, i;
-            css = self.odf_canvas.slidevisibilitycss().sheet;
-            found = -1;
-            for (i = 0; i < css.cssRules.length; i += 1) {
-                if (css.cssRules[i].cssText.substring(0, 8) === ".toolbar") {
-                    found = i;
-                    break;
-                }
-            }
-            if (found > -1) {
-                css.deleteRule(found);
-            } else {
-                css.insertRule(".toolbar { position:fixed; left:0px;top:-200px; z-index:0; }", 0);
-            }
-        };
-
-        // adapt css-transform to window-size
-        self.fitToWindow = function () {
-            function ruleByFactor(f) {
-                return "draw|page { \n" +
-                    "-moz-transform: scale(" + f + "); \n" +
-                    "-moz-transform-origin: 0% 0%; " +
-                    "-webkit-transform-origin: 0% 0%; -webkit-transform: scale(" + f + "); " +
-                    "-o-transform-origin: 0% 0%; -o-transform: scale(" + f + "); " +
-                    "-ms-transform-origin: 0% 0%; -ms-transform: scale(" + f + "); " +
-                    "}";
-            }
-            var pages = self.getPages(self.root()),
-                factorVert = ((window.innerHeight - 40) / pages[0][1].clientHeight),
-                factorHoriz = ((window.innerWidth - 10) / pages[0][1].clientWidth),
-                factor = factorVert < factorHoriz ? factorVert : factorHoriz,
-                css = self.odf_canvas.slidevisibilitycss().sheet;
-            css.deleteRule(2);
-            css.insertRule(ruleByFactor(factor), 2);
-        };
-
-        self.load = function (url) {
-            self.odf_canvas.load(url);
-        };
-
-        self.odf_element = odf_element;
-        self.odf_canvas = new odf.OdfCanvas(self.odf_element);
-        self.odf_canvas.addListener("statereadychange", self.setInitialSlideMode);
-        self.slide_mode = 'undefined';
-        document.addEventListener('keydown', self.keyDownHandler, false);
-    };
-}());
-
diff --git a/apps/files_odfviewer/src/webodf/webodf/lib/gui/SelectionMover.js b/apps/files_odfviewer/src/webodf/webodf/lib/gui/SelectionMover.js
deleted file mode 100644
index 2356c2c8c0..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/lib/gui/SelectionMover.js
+++ /dev/null
@@ -1,217 +0,0 @@
-/**
- * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
- * @licstart
- * The JavaScript code in this page is free software: you can redistribute it
- * and/or modify it under the terms of the GNU Affero General Public License
- * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.  The code is distributed
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
- *
- * As additional permission under GNU AGPL version 3 section 7, you
- * may distribute non-source (e.g., minimized or compacted) forms of
- * that code without the copy of the GNU GPL normally required by
- * section 4, provided you include this license notice and a URL
- * through which recipients can access the Corresponding Source.
- *
- * As a special exception to the AGPL, any HTML file which merely makes function
- * calls to this code, and for that purpose includes it by reference shall be
- * deemed a separate work for copyright law purposes. In addition, the copyright
- * holders of this code give you permission to combine this code with free
- * software libraries that are released under the GNU LGPL. You may copy and
- * distribute such a system following the terms of the GNU AGPL for this code
- * and the LGPL for the libraries. If you modify this code, you may extend this
- * exception to your version of the code, but you are not obligated to do so.
- * If you do not wish to do so, delete this exception statement from your
- * version.
- *
- * This license applies to this entire compilation.
- * @licend
- * @source: http://www.webodf.org/
- * @source: http://gitorious.org/odfkit/webodf/
- */
-/*global runtime: true, core: true, gui: true*/
-runtime.loadClass("core.Cursor");
-/**
- * This class modifies the selection in different ways.
- * @constructor
- * @param {Selection} selection
- * @param {!core.PointWalker} pointWalker
- * @return {!gui.SelectionMover}
- */
-gui.SelectionMover = function SelectionMover(selection, pointWalker) {
-    "use strict";
-    var doc = pointWalker.node().ownerDocument,
-        cursor = new core.Cursor(selection, doc);
-    /**
-     * Return the last range in the selection. Create one if the selection is
-     * empty.
-     */
-    function getActiveRange(node) {
-        var range;
-        if (selection.rangeCount === 0) {
-            selection.addRange(node.ownerDocument.createRange());
-        }
-        return selection.getRangeAt(selection.rangeCount - 1);
-    }
-    function setStart(node, offset) {
-        // selection interface is cumbersome and in Chrome it is buggy
-        // as a workaround all ranges are removed. The last one is updated and
-        // all ranges are placed back
-        var ranges = [], i, range;
-        for (i = 0; i < selection.rangeCount; i += 1) {
-            ranges[i] = selection.getRangeAt(i);
-        }
-        selection.removeAllRanges();
-        if (ranges.length === 0) {
-            ranges[0] = node.ownerDocument.createRange();
-        }
-        ranges[ranges.length - 1].setStart(pointWalker.node(),
-                pointWalker.position());
-        for (i = 0; i < ranges.length; i += 1) {
-            selection.addRange(ranges[i]);
-        }
-    }
-    function doMove(extend, move) {
-        if (selection.rangeCount === 0) {
-            return;
-        }
-        var range = selection.getRangeAt(0),
-            /**@type{Element}*/ element;
-        if (!range.startContainer || range.startContainer.nodeType !== 1) {
-            return;
-        }
-        element = /**@type{!Element}*/(range.startContainer);
-        pointWalker.setPoint(element, range.startOffset);
-        move();
-        setStart(pointWalker.node(), pointWalker.position());
-    }
-    function doMoveForward(extend, move) {
-        if (selection.rangeCount === 0) {
-            return;
-        }
-        move();
-        var range = selection.getRangeAt(0),
-            /**@type{Element}*/ element;
-        if (!range.startContainer || range.startContainer.nodeType !== 1) {
-            return;
-        }
-        element = /**@type{!Element}*/(range.startContainer);
-        pointWalker.setPoint(element, range.startOffset);
-    }
-/*
-    function fallbackMoveLineUp() {
-        // put an element at the current position and call
-        // pointWalker.stepForward until the y position increases and x position
-        // is comparable to the previous one
-        cursor.updateToSelection();
-        // retrieve cursor x and y position, then move selection/cursor left
-        // until, y offset is less and x offset about equal
-        var rect = cursor.getNode().getBoundingClientRect(),
-            x = rect.left,
-            y = rect.top,
-            arrived = false,
-            allowedSteps = 200;
-        while (!arrived && allowedSteps) {
-            allowedSteps -= 1;
-            cursor.remove();
-            pointWalker.setPoint(selection.focusNode, selection.focusOffset);
-            pointWalker.stepForward();
-        moveCursor(walker.node(), walker.position());
-            moveCursorLeft();
-            rect = cursor.getNode().getBoundingClientRect();
-            arrived = rect.top !== y && rect.left < x;
-        }
-    }
-*/
-    function moveCursor(node, offset, selectMode) {
-        if (selectMode) {
-            selection.extend(node, offset);
-        } else {
-            selection.collapse(node, offset);
-        }
-        cursor.updateToSelection();
-    }
-    function moveCursorLeft() {
-        var /**@type{Element}*/ element;
-        if (!selection.focusNode || selection.focusNode.nodeType !== 1) {
-            return;
-        }
-        element = /**@type{!Element}*/(selection.focusNode);
-        pointWalker.setPoint(element, selection.focusOffset);
-        pointWalker.stepBackward();
-        moveCursor(pointWalker.node(), pointWalker.position(), false);
-    }
-    function moveCursorRight() {
-        cursor.remove();
-        var /**@type{Element}*/ element;
-        if (!selection.focusNode || selection.focusNode.nodeType !== 1) {
-            return;
-        }
-        element = /**@type{!Element}*/(selection.focusNode);
-        pointWalker.setPoint(element, selection.focusOffset);
-        pointWalker.stepForward();
-        moveCursor(pointWalker.node(), pointWalker.position(), false);
-    }
-    function moveCursorUp() {
-        // retrieve cursor x and y position, then move selection/cursor left
-        // until, y offset is less and x offset about equal
-        var rect = cursor.getNode().getBoundingClientRect(),
-            x = rect.left,
-            y = rect.top,
-            arrived = false,
-            left = 200;
-        while (!arrived && left) {
-            left -= 1;
-            moveCursorLeft();
-            rect = cursor.getNode().getBoundingClientRect();
-            arrived = rect.top !== y && rect.left < x;
-        }
-    }
-    function moveCursorDown() {
-        // retrieve cursor x and y position, then move selection/cursor right
-        // until, x offset is less
-        cursor.updateToSelection();
-        var rect = cursor.getNode().getBoundingClientRect(),
-            x = rect.left,
-            y = rect.top,
-            arrived = false,
-            left = 200;
-        while (!arrived) {
-            left -= 1;
-            moveCursorRight();
-            rect = cursor.getNode().getBoundingClientRect();
-            arrived = rect.top !== y && rect.left > x;
-        }
-//alert(left + " " + y + " " + x + " " + rect.top + " " + rect.left);
-    }
-    /**
-     * Move selection forward one point.
-     * @param {boolean} extend true if range is to be expanded from the current
-     *                         point
-     * @return {undefined}
-     **/
-    this.movePointForward = function (extend) {
-        doMove(extend, pointWalker.stepForward);
-    };
-    this.movePointBackward = function (extend) {
-        doMove(extend, pointWalker.stepBackward);
-    };
-    this.moveLineForward = function (extend) {
-        if (selection.modify) {
-            // TODO add a way to 
-            selection.modify(extend ? "extend" : "move", "forward", "line");
-        } else {
-            doMove(extend, moveCursorDown);
-        }
-    };
-    this.moveLineBackward = function (extend) {
-        if (selection.modify) {
-            selection.modify(extend ? "extend" : "move", "backward", "line");
-        } else {
-            doMove(extend, function () {
-            });
-        }
-    };
-    return this;
-};
diff --git a/apps/files_odfviewer/src/webodf/webodf/lib/gui/XMLEdit.js b/apps/files_odfviewer/src/webodf/webodf/lib/gui/XMLEdit.js
deleted file mode 100644
index aee0bd5e7d..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/lib/gui/XMLEdit.js
+++ /dev/null
@@ -1,330 +0,0 @@
-/**
- * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
- * @licstart
- * The JavaScript code in this page is free software: you can redistribute it
- * and/or modify it under the terms of the GNU Affero General Public License
- * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.  The code is distributed
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
- *
- * As additional permission under GNU AGPL version 3 section 7, you
- * may distribute non-source (e.g., minimized or compacted) forms of
- * that code without the copy of the GNU GPL normally required by
- * section 4, provided you include this license notice and a URL
- * through which recipients can access the Corresponding Source.
- *
- * As a special exception to the AGPL, any HTML file which merely makes function
- * calls to this code, and for that purpose includes it by reference shall be
- * deemed a separate work for copyright law purposes. In addition, the copyright
- * holders of this code give you permission to combine this code with free
- * software libraries that are released under the GNU LGPL. You may copy and
- * distribute such a system following the terms of the GNU AGPL for this code
- * and the LGPL for the libraries. If you modify this code, you may extend this
- * exception to your version of the code, but you are not obligated to do so.
- * If you do not wish to do so, delete this exception statement from your
- * version.
- *
- * This license applies to this entire compilation.
- * @licend
- * @source: http://www.webodf.org/
- * @source: http://gitorious.org/odfkit/webodf/
- */
-/*global runtime: true, core: true, gui: true*/
-runtime.loadClass("core.PointWalker");
-runtime.loadClass("core.Cursor");
-//runtime.loadClass("gui.Caret");
-/**
- * @constructor
- */
-gui.XMLEdit = function XMLEdit(element, stylesheet) {
-    "use strict";
-    var simplecss,
-        cssprefix,
-        documentElement,
-        customNS = "customns",
-        walker = null;
-
-    if (!element.id) {
-        element.id = "xml" + String(Math.random()).substring(2);
-    }
-//    element.contentEditable = true;
-    cssprefix = "#" + element.id + " ";
-
-    function installHandlers() {
-    }
-
-    // generic css for doing xml formatting: color tags and do indentation
-    simplecss = cssprefix + "*," + cssprefix + ":visited, " + cssprefix + ":link {display:block; margin: 0px; margin-left: 10px; font-size: medium; color: black; background: white; font-variant: normal; font-weight: normal; font-style: normal; font-family: sans-serif; text-decoration: none; white-space: pre-wrap; height: auto; width: auto}\n" +
-        cssprefix + ":before {color: blue; content: '<' attr(customns_name) attr(customns_atts) '>';}\n" +
-        cssprefix + ":after {color: blue; content: '</' attr(customns_name) '>';}\n" +
-        cssprefix + "{overflow: auto;}\n";
-
-    function listenEvent(eventTarget, eventType, eventHandler) {
-        if (eventTarget.addEventListener) {
-            eventTarget.addEventListener(eventType, eventHandler, false);
-        } else if (eventTarget.attachEvent) {
-            eventType = "on" + eventType;
-            eventTarget.attachEvent(eventType, eventHandler);
-        } else {
-            eventTarget["on" + eventType] = eventHandler;
-        }
-    }
-    function cancelEvent(event) {
-        if (event.preventDefault) {
-            event.preventDefault();
-        } else {
-            event.returnValue = false;
-        }
-    }
-
-    function isCaretMoveCommand(charCode) {
-        if (charCode >= 16 && charCode <= 20) {
-            return true;
-        }
-        if (charCode >= 33 && charCode <= 40) { //arrows,home,end,pgup,pgdown
-            return true;
-        }
-        return false;
-    }
-
-    function syncSelectionWithWalker() {
-        var sel = element.ownerDocument.defaultView.getSelection(),
-            r;
-        if (!sel || sel.rangeCount <= 0 || !walker) {
-            return;
-        }
-        r = sel.getRangeAt(0);
-        walker.setPoint(r.startContainer, r.startOffset);
-    }
-
-    function syncWalkerWithSelection() {
-        var sel = element.ownerDocument.defaultView.getSelection(),
-            n, r;
-        sel.removeAllRanges();
-        if (!walker || !walker.node()) {
-            return;
-        }
-        n = walker.node();
-        r = n.ownerDocument.createRange();
-        r.setStart(n, walker.position());
-        r.collapse(true);
-        sel.addRange(r);
-    }
-
-    function handleKeyDown(event) {
-        var charCode = event.charCode || event.keyCode;
-        // cursor movement
-        walker = null;
-        if (walker && charCode === 39) { // right arrow
-            syncSelectionWithWalker();
-            walker.stepForward();
-            syncWalkerWithSelection();
-        } else if (walker && charCode === 37) { //left arrow
-            syncSelectionWithWalker();
-            walker.stepBackward();
-            syncWalkerWithSelection();
-        } else if (isCaretMoveCommand(charCode)) {
-            return;
-        }
-        cancelEvent(event);
-    }
-
-    function handleKeyPress(event) {
-//        handleKeyDown(event);
-    }
-
-    function handleClick(event) {
-//        alert(event.target.nodeName);
-        var sel = element.ownerDocument.defaultView.getSelection(),
-            r = sel.getRangeAt(0),
-            n = r.startContainer;
-        // if cursor is in customns node, move up to the top one
-        /*
-        if (n.parentNode.namespaceURI === customNS) {
-            while (n.parentNode.namespaceURI === customNS) {
-                n = n.parentNode;
-            }
-            r = n.ownerDocument.createRange();
-            r.setStart(n.nextSibling, 0);
-            r.collapse(true);
-            sel.removeAllRanges();
-            sel.addRange(r);
-        }
-*/
-/*
-            r = element.ownerDocument.createRange();
-            r.setStart(event.target.nodeName, 0);
-            r.collapse(true);
-            sel.removeAllRanges();
-            sel.addRange(r);
-*/
-//alert(sel.getRangeAt(0).startContainer.nodeName + " " + sel.getRangeAt(0).startOffset);
-
-        cancelEvent(event);
-    }
-
-    function initElement(element) {
-        listenEvent(element, "click", handleClick);
-        listenEvent(element, "keydown", handleKeyDown);
-        listenEvent(element, "keypress", handleKeyPress);
-        //listenEvent(element, "mouseup", handleMouseUp);
-        // ignore drop events, dragstart, drag, dragenter, dragover are ok for now
-        listenEvent(element, "drop", cancelEvent);
-        listenEvent(element, "dragend", cancelEvent);
-        // pasting is also disallowed for now
-        listenEvent(element, "beforepaste", cancelEvent);
-        listenEvent(element, "paste", cancelEvent);
-    }
-
-    // remove all textnodes that contain only whitespace
-    function cleanWhitespace(node) {
-        var n = node.firstChild, p,
-            re = /^\s*$/;
-        while (n && n !== node) {
-            p = n;
-            n = n.nextSibling || n.parentNode;
-            if (p.nodeType === 3 && re.test(p.nodeValue)) {
-                p.parentNode.removeChild(p);
-            }
-        }
-    }
-    /**
-     * @param {!Node} node
-     * @return {undefined}
-     */
-    function setCssHelperAttributes(node) {
-        var atts, attsv, a, i;
-        // write all attributes in a string that is shown via the css
-        atts = node.attributes;
-        attsv = "";
-        for (i = atts.length - 1; i >= 0; i -= 1) {
-            a = atts.item(i);
-            attsv = attsv + " " + a.nodeName + "=\"" + a.nodeValue + "\"";
-        }
-        node.setAttribute("customns_name", node.nodeName);
-        node.setAttribute("customns_atts", attsv);
-    }
-    /**
-     * @param {!Node} node
-     * @return {undefined}
-     */
-    function addExplicitAttributes(node) {
-        var n = node.firstChild;
-        // recurse over the dom
-        while (n && n !== node) {
-            if (n.nodeType === 1) {
-                addExplicitAttributes(n);
-            }
-            n = n.nextSibling || n.parentNode;
-        }
-        setCssHelperAttributes(node);
-        cleanWhitespace(node);
-    }
-
-    function getNamespacePrefixes(node, prefixes) {
-        var n = node.firstChild, atts, att, i;
-        while (n && n !== node) {
-            if (n.nodeType === 1) {
-                getNamespacePrefixes(n, prefixes);
-                atts = n.attributes;
-                for (i = atts.length - 1; i >= 0; i -= 1) {
-                    att = atts.item(i);
-                    // record the prefix that the document uses for namespaces
-                    if (att.namespaceURI === "http://www.w3.org/2000/xmlns/") {
-                        if (!prefixes[att.nodeValue]) {
-                            prefixes[att.nodeValue] = att.localName;
-                        }
-                    }
-                }
-            }
-            n = n.nextSibling || n.parentNode;
-        }
-    }
-
-    /**
-     * Give each namespace a unique prefix.
-     * @param {Object.<?string,?string>} prefixes Map with namespace as key and
-     *                                          prefix as value
-     * @return {undefined}
-     */
-    function generateUniquePrefixes(prefixes) {
-        var taken = {},
-            ns, p, n = 0;
-        for (ns in prefixes) {
-            if (prefixes.hasOwnProperty(ns) && ns) {
-                p = prefixes[ns];
-                if (!p || taken.hasOwnProperty(p) || p === "xmlns") {
-                    do {
-                        p = "ns" + n;
-                        n += 1;
-                    } while (taken.hasOwnProperty(p));
-                    prefixes[ns] = p;
-                }
-                taken[p] = true;
-            }
-        }
-    }
-
-    // the CSS neededed for the XML edit view depends on the prefixes
-    function createCssFromXmlInstance(node) {
-        // collect all prefixes and elements
-        var prefixes = {},    // namespace prefixes as they occur in the XML
-            css = "@namespace customns url(customns);\n",
-            name, pre, ns, names, csssel;
-        getNamespacePrefixes(node, prefixes);
-        generateUniquePrefixes(prefixes);
-/*
-        for (ns in prefixes) {
-            if (ns) {
-                css = css + "@namepace " + prefixes[ns] + " url(" + ns + ");\n";
-            }
-        }
-        for (ns in prefixes) {
-            if (ns) {
-                pre = cssprefix + prefixes[ns] + "|";
-                css = css + pre + ":before { content: '<" + prefixes[ns] +
-                        ":' attr(customns_name); }\n" +
-                        pre + ":after { content: '</" + prefixes[ns] +
-                        ":' attr(customns_name) '>'; }\n";
-            }
-        }
-*/
-        return css;
-    }
-
-    // Adapt the CSS to the current settings.
-    function updateCSS() {
-        var css = element.ownerDocument.createElement("style"),
-            text = createCssFromXmlInstance(element);
-        css.type = "text/css";
-        text = text + simplecss;
-        css.appendChild(element.ownerDocument.createTextNode(text));
-        stylesheet = stylesheet.parentNode.replaceChild(css, stylesheet);
-    }
-    function getXML() {
-        return documentElement;
-    }
-    function setXML(xml) {
-        var node = xml.documentElement || xml;
-        node = element.ownerDocument.importNode(node, true);
-        documentElement = node;
-
-        addExplicitAttributes(node);
-
-        while (element.lastChild) {
-            element.removeChild(element.lastChild);
-        }
-        element.appendChild(node);
-
-        updateCSS();
-
-        walker = new core.PointWalker(node);
-    }
-
-    initElement(element);
-
-    this.updateCSS = updateCSS;
-    this.setXML = setXML;
-    this.getXML = getXML;
-};
diff --git a/apps/files_odfviewer/src/webodf/webodf/lib/manifest.js b/apps/files_odfviewer/src/webodf/webodf/lib/manifest.js
deleted file mode 100644
index 1a185b85b9..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/lib/manifest.js
+++ /dev/null
@@ -1,34 +0,0 @@
-(function () {
-    "use strict";
-    return [
-        "core/Async.js",
-        "core/Base64.js",
-        "core/ByteArray.js",
-        "core/ByteArrayWriter.js",
-        "core/Cursor.js",
-        "core/JSLint.js",
-        "core/PointWalker.js",
-        "core/RawDeflate.js",
-        "core/RawInflate.js",
-        "core/UnitTester.js",
-        "core/Zip.js",
-        "gui/Caret.js",
-        "gui/SelectionMover.js",
-        "gui/XMLEdit.js",
-        "gui/PresenterUI.js",
-        "odf/FontLoader.js",
-        "odf/Formatting.js",
-        "odf/OdfCanvas.js",
-        "odf/OdfContainer.js",
-        "odf/Style2CSS.js",
-        "odf/StyleInfo.js",
-        "xmldom/LSSerializer.js",
-        "xmldom/LSSerializerFilter.js",
-        "xmldom/OperationalTransformDOM.js",
-        "xmldom/OperationalTransformInterface.js",
-        "xmldom/RelaxNG.js",
-        "xmldom/RelaxNG2.js",
-        "xmldom/RelaxNGParser.js",
-        "xmldom/XPath.js"
-    ];
-}());
diff --git a/apps/files_odfviewer/src/webodf/webodf/lib/odf/FontLoader.js b/apps/files_odfviewer/src/webodf/webodf/lib/odf/FontLoader.js
deleted file mode 100644
index f6d51f666a..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/lib/odf/FontLoader.js
+++ /dev/null
@@ -1,135 +0,0 @@
-/**
- * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
- * @licstart
- * The JavaScript code in this page is free software: you can redistribute it
- * and/or modify it under the terms of the GNU Affero General Public License
- * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.  The code is distributed
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
- *
- * As additional permission under GNU AGPL version 3 section 7, you
- * may distribute non-source (e.g., minimized or compacted) forms of
- * that code without the copy of the GNU GPL normally required by
- * section 4, provided you include this license notice and a URL
- * through which recipients can access the Corresponding Source.
- *
- * As a special exception to the AGPL, any HTML file which merely makes function
- * calls to this code, and for that purpose includes it by reference shall be
- * deemed a separate work for copyright law purposes. In addition, the copyright
- * holders of this code give you permission to combine this code with free
- * software libraries that are released under the GNU LGPL. You may copy and
- * distribute such a system following the terms of the GNU AGPL for this code
- * and the LGPL for the libraries. If you modify this code, you may extend this
- * exception to your version of the code, but you are not obligated to do so.
- * If you do not wish to do so, delete this exception statement from your
- * version.
- *
- * This license applies to this entire compilation.
- * @licend
- * @source: http://www.webodf.org/
- * @source: http://gitorious.org/odfkit/webodf/
- */
-/*jslint sub: true*/
-/*global runtime, odf, core, document, xmldom*/
-runtime.loadClass("core.Base64");
-runtime.loadClass("xmldom.XPath");
-runtime.loadClass("odf.Style2CSS");
-/**
- * This class loads embedded fonts into the CSS 
- * @constructor
- **/
-odf.FontLoader = (function () {
-    "use strict";
-    var style2CSS = new odf.Style2CSS(),
-        xpath = new xmldom.XPath(),
-        base64 = new core.Base64();
-    /**
-     * @param {!Element} fontFaceDecls
-     * @return {!Object.<string,Object>}
-     */
-    function getEmbeddedFontDeclarations(fontFaceDecls) {
-        var decls = {},
-            fonts,
-            i, font, name, uris, href;
-        if (!fontFaceDecls) {
-            return decls;
-        }
-        fonts = xpath.getODFElementsWithXPath(fontFaceDecls,
-                    "style:font-face[svg:font-face-src]",
-                    style2CSS.namespaceResolver);
-        for (i = 0; i < fonts.length; i += 1) {
-            font = fonts[i];
-            name = font.getAttributeNS(style2CSS.namespaces["style"], "name");
-            uris = xpath.getODFElementsWithXPath(font,
-                "svg:font-face-src/svg:font-face-uri",
-                style2CSS.namespaceResolver);
-            if (uris.length > 0) {
-                href = uris[0].getAttributeNS(style2CSS.namespaces["xlink"],
-                        "href");
-                decls[name] = {href: href};
-            }
-        }
-        return decls;
-    }
-    function addFontToCSS(name, font, fontdata, stylesheet) {
-        // hack: get the first stylesheet
-        stylesheet = document.styleSheets[0];
-        var rule = "@font-face { font-family: \"" + name + "\"; src: " +
-            "url(data:application/x-font-ttf;charset=binary;base64," +
-            base64.convertUTF8ArrayToBase64(fontdata) +
-            ") format(\"truetype\"); }";
-        try {
-            stylesheet.insertRule(rule, stylesheet.cssRules.length);
-        } catch (e) {
-            runtime.log("Problem inserting rule in CSS: " + rule);
-        }
-    }
-    function loadFontIntoCSS(embeddedFontDeclarations, zip, pos, stylesheet,
-            callback) {
-        var name, i = 0, n;
-        for (n in embeddedFontDeclarations) {
-            if (embeddedFontDeclarations.hasOwnProperty(n)) {
-                if (i === pos) {
-                    name = n;
-                }
-                i += 1;
-            }
-        }
-        if (!name) {
-            return callback();
-        }
-        zip.load(embeddedFontDeclarations[name].href, function (err, fontdata) {
-            if (err) {
-                runtime.log(err);
-            } else {
-                addFontToCSS(name, embeddedFontDeclarations[name], fontdata,
-                    stylesheet);
-            }
-            return loadFontIntoCSS(embeddedFontDeclarations, zip, pos + 1,
-                    stylesheet, callback);
-        });
-    }
-    function loadFontsIntoCSS(embeddedFontDeclarations, zip, stylesheet) {
-        loadFontIntoCSS(embeddedFontDeclarations, zip, 0, stylesheet,
-            function () {});
-    }
-    /**
-     * @constructor
-     */
-    odf.FontLoader = function FontLoader() {
-        var self = this;
-        /**
-         * @param {!Element} fontFaceDecls
-         * @param {!core.Zip} zip
-         * @param {!StyleSheet} stylesheet
-         * @return {undefined}
-         */
-        this.loadFonts = function (fontFaceDecls, zip, stylesheet) {
-            var embeddedFontDeclarations = getEmbeddedFontDeclarations(
-                    fontFaceDecls);
-            loadFontsIntoCSS(embeddedFontDeclarations, zip, stylesheet);
-        };
-    };
-    return odf.FontLoader;
-}());
diff --git a/apps/files_odfviewer/src/webodf/webodf/lib/odf/Formatting.js b/apps/files_odfviewer/src/webodf/webodf/lib/odf/Formatting.js
deleted file mode 100644
index cf42fcc50a..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/lib/odf/Formatting.js
+++ /dev/null
@@ -1,153 +0,0 @@
-/**
- * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
- * @licstart
- * The JavaScript code in this page is free software: you can redistribute it
- * and/or modify it under the terms of the GNU Affero General Public License
- * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.  The code is distributed
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
- *
- * As additional permission under GNU AGPL version 3 section 7, you
- * may distribute non-source (e.g., minimized or compacted) forms of
- * that code without the copy of the GNU GPL normally required by
- * section 4, provided you include this license notice and a URL
- * through which recipients can access the Corresponding Source.
- *
- * As a special exception to the AGPL, any HTML file which merely makes function
- * calls to this code, and for that purpose includes it by reference shall be
- * deemed a separate work for copyright law purposes. In addition, the copyright
- * holders of this code give you permission to combine this code with free
- * software libraries that are released under the GNU LGPL. You may copy and
- * distribute such a system following the terms of the GNU AGPL for this code
- * and the LGPL for the libraries. If you modify this code, you may extend this
- * exception to your version of the code, but you are not obligated to do so.
- * If you do not wish to do so, delete this exception statement from your
- * version.
- *
- * This license applies to this entire compilation.
- * @licend
- * @source: http://www.webodf.org/
- * @source: http://gitorious.org/odfkit/webodf/
- */
-/*global odf: true, runtime: true*/
-/**
- * @constructor
- */
-odf.Formatting = function Formatting() {
-    "use strict";
-    var /**@type{odf.OdfContainer}*/ odfContainer,
-        /**@type{odf.StyleInfo}*/ styleInfo = new odf.StyleInfo();
-
-    /**
-     * Class that iterates over all elements that are part of the range.
-     * @constructor
-     * @param {!Range} range
-     * @return {undefined}
-     */
-    function RangeElementIterator(range) {
-        /**
-         * @param {Node} parent
-         * @param {!number} n
-         * @return {Node}
-         */
-        function getNthChild(parent, n) {
-            var c = parent && parent.firstChild;
-            while (c && n) {
-                c = c.nextSibling;
-                n -= 1;
-            }
-            return c;
-        }
-        var start = getNthChild(range.startContainer, range.startOffset),
-            end = getNthChild(range.endContainer, range.endOffset),
-            current = start;
-        /**
-         * @return {Element|null}
-         */
-        this.next = function () {
-            var c = current;
-            if (c === null) {
-                return c;
-            }
-            return null;
-        };
-    }
-
-    /**
-     * @param {!Element} element
-     * @return {Element}
-     */
-    function getParentStyle(element) {
-        var n = element.firstChild, e;
-        if (n.nodeType === 1) { // Element
-            e = /**@type{Element}*/(n);
-            return e;
-        }
-        return null;
-    }
-    /**
-     * @param {!Range} range
-     * @return {!Array.<!Element>}
-     */
-    function getParagraphStyles(range) {
-        var iter = new RangeElementIterator(range), e, styles = [];
-        e = iter.next();
-        while (e) {
-            if (styleInfo.canElementHaveStyle("paragraph", e)) {
-                styles.push(e);
-            }
-        }
-        return styles;
-    }
-
-    /**
-     * @param {!odf.OdfContainer} odfcontainer
-     * @return {undefined}
-     */
-    this.setOdfContainer = function (odfcontainer) {
-        odfContainer = odfcontainer;
-    };
-    /**
-     * Return true if all parts of the selection are bold.
-     * @param {!Array.<!Range>} selection
-     * @return {!boolean}
-     */
-    this.isCompletelyBold = function (selection) {
-        return false;
-    };
-    /**
-     * Get the alignment or undefined if no uniform alignment is found
-     * @param {!Array.<!Range>} selection
-     * @return {!string|undefined}
-     */
-    this.getAlignment = function (selection) {
-        var styles = this.getParagraphStyles(selection), i, l = styles.length;
-        return undefined;
-    };
-    /**
-     * Get the list of paragraph styles that covered by the current selection.
-     * @param {!Array.<!Range>} selection
-     * @return {!Array.<Element>}
-     */
-    this.getParagraphStyles = function (selection) {
-        var i, j, s, styles = [];
-        for (i = 0; i < selection.length; i += 0) {
-            s = getParagraphStyles(selection[i]);
-            for (j = 0; j < s.length; j += 1) {
-                if (styles.indexOf(s[j]) === -1) {
-                    styles.push(s[j]);
-                }
-            }
-        }
-        return styles;
-    };
-    /**
-     * Get the list of text styles that are covered by the current selection.
-     * @param {!Array.<!Range>} selection
-     * @return {!Array.<Element>}
-     */
-    this.getTextStyles = function (selection) {
-        return [];
-    };
-};
diff --git a/apps/files_odfviewer/src/webodf/webodf/lib/odf/OdfCanvas.js b/apps/files_odfviewer/src/webodf/webodf/lib/odf/OdfCanvas.js
deleted file mode 100644
index b8077f8093..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/lib/odf/OdfCanvas.js
+++ /dev/null
@@ -1,912 +0,0 @@
-/**
- * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
- * @licstart
- * The JavaScript code in this page is free software: you can redistribute it
- * and/or modify it under the terms of the GNU Affero General Public License
- * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.  The code is distributed
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
- *
- * As additional permission under GNU AGPL version 3 section 7, you
- * may distribute non-source (e.g., minimized or compacted) forms of
- * that code without the copy of the GNU GPL normally required by
- * section 4, provided you include this license notice and a URL
- * through which recipients can access the Corresponding Source.
- *
- * As a special exception to the AGPL, any HTML file which merely makes function
- * calls to this code, and for that purpose includes it by reference shall be
- * deemed a separate work for copyright law purposes. In addition, the copyright
- * holders of this code give you permission to combine this code with free
- * software libraries that are released under the GNU LGPL. You may copy and
- * distribute such a system following the terms of the GNU AGPL for this code
- * and the LGPL for the libraries. If you modify this code, you may extend this
- * exception to your version of the code, but you are not obligated to do so.
- * If you do not wish to do so, delete this exception statement from your
- * version.
- *
- * This license applies to this entire compilation.
- * @licend
- * @source: http://www.webodf.org/
- * @source: http://gitorious.org/odfkit/webodf/
- */
-/*jslint sub: true*/
-/*global runtime, odf, xmldom */
-runtime.loadClass("odf.OdfContainer");
-runtime.loadClass("odf.Formatting");
-runtime.loadClass("xmldom.XPath");
-/**
- * This class manages a loaded ODF document that is shown in an element.
- * It takes care of giving visual feedback on loading, ensures that the
- * stylesheets are loaded.
- * @constructor
- * @param {!Element} element Put and ODF Canvas inside this element.
- **/
-odf.OdfCanvas = (function () {
-    "use strict";
-    /**
-     * A loading queue where various tasks related to loading can be placed
-     * and will be run with 10 ms between them. This gives the ui a change to
-     * to update.
-     * @constructor
-     */
-    function LoadingQueue() {
-        var queue = [],
-            taskRunning = false;
-        /**
-         * @param {Function} task
-         * @return {undefined}
-         */
-        function run(task) {
-            taskRunning = true;
-            runtime.setTimeout(function () {
-                try {
-                    task();
-                } catch (e) {
-                    runtime.log(e);
-                }
-                taskRunning = false;
-                if (queue.length > 0) {
-                    run(queue.pop());
-                }
-            }, 10);
-        }
-        /**
-         * @return {undefined}
-         */
-        this.clearQueue = function () {
-            queue.length = 0;
-        };
-        /**
-         * @param {Function} loadingTask
-         * @return {undefined}
-         */
-        this.addToQueue = function (loadingTask) {
-            if (queue.length === 0 && !taskRunning) {
-                return run(loadingTask);
-            }
-            queue.push(loadingTask);
-        };
-    }
-    /**
-     * @constructor
-     * @param css
-     */
-    function PageSwitcher(css) {
-        var sheet = css.sheet,
-            position = 1;
-        function updateCSS() {
-            while (sheet.cssRules.length > 0) {
-                sheet.deleteRule(0);
-            }
-            sheet.insertRule('office|presentation draw|page {display:none;}', 0);
-            sheet.insertRule("office|presentation draw|page:nth-child(" +
-                position + ") {display:block;}", 1);
-        }
-        /**
-         * @return {undefined}
-         */
-        this.showNextPage = function () {
-            position += 1;
-            updateCSS();
-        };
-        /**
-         * @return {undefined}
-         */
-        this.showPreviousPage = function () {
-            if (position > 1) {
-                position -= 1;
-                updateCSS();
-            }
-        };
-        this.css = css;
-    }
-    /**
-     * Register event listener on DOM element.
-     * @param {!Element} eventTarget
-     * @param {!string} eventType
-     * @param {!Function} eventHandler
-     * @return {undefined}
-     */
-    function listenEvent(eventTarget, eventType, eventHandler) {
-        if (eventTarget.addEventListener) {
-            eventTarget.addEventListener(eventType, eventHandler, false);
-        } else if (eventTarget.attachEvent) {
-            eventType = "on" + eventType;
-            eventTarget.attachEvent(eventType, eventHandler);
-        } else {
-            eventTarget["on" + eventType] = eventHandler;
-        }
-    }
-    /**
-     * Class that listens to events and sends a signal if the selection changes.
-     * @constructor
-     * @param {!Element} element
-     */
-    function SelectionWatcher(element) {
-        var selection = [], count = 0, listeners = [];
-        /**
-         * @param {!Element} ancestor
-         * @param {Node} descendant
-         * @return {!boolean}
-         */
-        function isAncestorOf(ancestor, descendant) {
-            while (descendant) {
-                if (descendant === ancestor) {
-                    return true;
-                }
-                descendant = descendant.parentNode;
-            }
-            return false;
-        }
-        /**
-         * @param {!Element} element
-         * @param {!Range} range
-         * @return {!boolean}
-         */
-        function fallsWithin(element, range) {
-            return isAncestorOf(element, range.startContainer) &&
-                isAncestorOf(element, range.endContainer);
-        }
-        /**
-         * @return {!Array.<!Range>}
-         */
-        function getCurrentSelection() {
-            var s = [], selection = runtime.getWindow().getSelection(), i, r;
-            for (i = 0; i < selection.rangeCount; i += 1) {
-                r = selection.getRangeAt(i);
-                // check if the nodes in the range fall completely within the
-                // element
-                if (r !== null && fallsWithin(element, r)) {
-                    s.push(r);
-                }
-            }
-            return s;
-        }
-        /**
-         * @param {Range} rangeA
-         * @param {Range} rangeB
-         * @return {!boolean}
-         */
-        function rangesNotEqual(rangeA, rangeB) {
-            if (rangeA === rangeB) {
-                return false;
-            }
-            if (rangeA === null || rangeB === null) {
-                return true;
-            }
-            return rangeA.startContainer !== rangeB.startContainer ||
-                   rangeA.startOffset !== rangeB.startOffset ||
-                   rangeA.endContainer !== rangeB.endContainer ||
-                   rangeA.endOffset !== rangeB.endOffset;
-        }
-        /**
-         * @return {undefined}
-         */
-        function emitNewSelection() {
-            var i, l = listeners.length;
-            for (i = 0; i < l; i += 1) {
-                listeners[i](element, selection);
-            }
-        }
-        /**
-         * @param {!Array.<!Range>} selection
-         * @return {!Array.<!Range>}
-         */
-        function copySelection(selection) {
-            var s = [selection.length], i, oldr, r,
-                doc = element.ownerDocument;
-            for (i = 0; i < selection.length; i += 1) {
-                oldr = selection[i];
-                r = doc.createRange();
-                r.setStart(oldr.startContainer, oldr.startOffset);
-                r.setEnd(oldr.endContainer, oldr.endOffset);
-                s[i] = r;
-            }
-            return s;
-        }
-        /**
-         * @return {undefined}
-         */
-        function checkSelection() {
-            var s = getCurrentSelection(), i;
-            if (s.length === selection.length) {
-                for (i = 0; i < s.length; i += 1) {
-                    if (rangesNotEqual(s[i], selection[i])) {
-                        break;
-                    }
-                }
-                if (i === s.length) {
-                    return; // no change
-                }
-            }
-            selection = s;
-            selection = copySelection(s);
-            emitNewSelection();
-        }
-        /**
-         * @param {!string} eventName
-         * @param {!function(!Element, !Array.<!Range>)} handler
-         * @return {undefined}
-         */
-        this.addListener = function (eventName, handler) {
-            var i, l = listeners.length;
-            for (i = 0; i < l; i += 1) {
-                if (listeners[i] === handler) {
-                    return;
-                }
-            }
-            listeners.push(handler);
-        };
-        listenEvent(element, "mouseup", checkSelection);
-        listenEvent(element, "keyup", checkSelection);
-        listenEvent(element, "keydown", checkSelection);
-    }
-    var style2CSS = new odf.Style2CSS(),
-        namespaces = style2CSS.namespaces,
-        drawns  = namespaces.draw,
-        fons    = namespaces.fo,
-        officens = namespaces.office,
-        svgns   = namespaces.svg,
-        textns  = namespaces.text,
-        xlinkns = namespaces.xlink,
-        window = runtime.getWindow(),
-        xpath = new xmldom.XPath(),
-        /**@const@type{!Object.<!string,!Array.<!Function>>}*/
-        eventHandlers = {},
-        editparagraph,
-        loadingQueue = new LoadingQueue();
-
-    /**
-     * Register an event handler
-     * @param {!string} eventType
-     * @param {!Function} eventHandler
-     * @return {undefined}
-     */
-    function addEventListener(eventType, eventHandler) {
-        var handlers = eventHandlers[eventType];
-        if (handlers === undefined) {
-            handlers = eventHandlers[eventType] = [];
-        }
-        if (eventHandler && handlers.indexOf(eventHandler) === -1) {
-            handlers.push(eventHandler);
-        }
-    }
-    /**
-     * Fire an event
-     * @param {!string} eventType
-     * @param {Array.<Object>=} args
-     * @return {undefined}
-     */
-    function fireEvent(eventType, args) {
-        if (!eventHandlers.hasOwnProperty(eventType)) {
-            return;
-        }
-        var handlers = eventHandlers[eventType], i;
-        for (i = 0; i < handlers.length; i += 1) {
-            handlers[i](args);
-        }
-    }
-    /**
-     * @param {!Element} element
-     * @return {undefined}
-     */
-    function clear(element) {
-        while (element.firstChild) {
-            element.removeChild(element.firstChild);
-        }
-    }
-    /**
-     * A new styles.xml has been loaded. Update the live document with it.
-     * @param {!Element} odfelement
-     * @param {!HTMLStyleElement} stylesxmlcss
-     * @return {undefined}
-     **/
-    function handleStyles(odfelement, stylesxmlcss) {
-        // update the css translation of the styles
-        var style2css = new odf.Style2CSS();
-        style2css.style2css(stylesxmlcss.sheet, odfelement.styles,
-                    odfelement.automaticStyles);
-    }
-    /**
-     * @param {!string} id
-     * @param {!Element} frame
-     * @param {!StyleSheet} stylesheet
-     * @return {undefined}
-     **/
-    function setFramePosition(id, frame, stylesheet) {
-        frame.setAttribute('styleid', id);
-        var rule,
-            anchor = frame.getAttributeNS(textns, 'anchor-type'),
-            x = frame.getAttributeNS(svgns, 'x'),
-            y = frame.getAttributeNS(svgns, 'y'),
-            width = frame.getAttributeNS(svgns, 'width'),
-            height = frame.getAttributeNS(svgns, 'height'),
-            minheight = frame.getAttributeNS(fons, 'min-height'),
-            minwidth = frame.getAttributeNS(fons, 'min-width');
-        if (anchor === "as-char") {
-            rule = 'display: inline-block;';
-        } else if (anchor || x || y) {
-            rule = 'position: absolute;';
-        } else if (width || height || minheight || minwidth) {
-            rule = 'display: block;';
-        }
-        if (x) {
-            rule += 'left: ' + x + ';';
-        }
-        if (y) {
-            rule += 'top: ' + y + ';';
-        }
-        if (width) {
-            rule += 'width: ' + width + ';';
-        }
-        if (height) {
-            rule += 'height: ' + height + ';';
-        }
-        if (minheight) {
-            rule += 'min-height: ' + minheight + ';';
-        }
-        if (minwidth) {
-            rule += 'min-width: ' + minwidth + ';';
-        }
-        if (rule) {
-            rule = 'draw|' + frame.localName + '[styleid="' + id + '"] {' +
-                rule + '}';
-            stylesheet.insertRule(rule, stylesheet.cssRules.length);
-        }
-    }
-    /**
-     * @param {!Element} image
-     * @return {string}
-     **/
-    function getUrlFromBinaryDataElement(image) {
-        var node = image.firstChild;
-        while (node) {
-            if (node.namespaceURI === officens &&
-                    node.localName === "binary-data") {
-                // TODO: detect mime-type, assuming png for now
-                return "data:image/png;base64," + node.textContent;
-            }
-            node = node.nextSibling;
-        }
-        return "";
-    }
-    /**
-     * @param {!string} id
-     * @param {!Object} container
-     * @param {!Element} image
-     * @param {!StyleSheet} stylesheet
-     * @return {undefined}
-     **/
-    function setImage(id, container, image, stylesheet) {
-        image.setAttribute('styleid', id);
-        var url = image.getAttributeNS(xlinkns, 'href'),
-            part,
-            node;
-        function callback(url) {
-            var rule = "background-image: url(" + url + ");";
-            rule = 'draw|image[styleid="' + id + '"] {' + rule + '}';
-            stylesheet.insertRule(rule, stylesheet.cssRules.length);
-        }
-        // look for a office:binary-data
-        if (url) {
-            try {
-                if (container.getPartUrl) {
-                    url = container.getPartUrl(url);
-                    callback(url);
-                } else {
-                    part = container.getPart(url);
-                    part.onchange = function (part) {
-                        callback(part.url);
-                    };
-                    part.load();
-                }
-            } catch (e) {
-                runtime.log('slight problem: ' + e);
-            }
-        } else {
-            url = getUrlFromBinaryDataElement(image);
-            callback(url);
-        }
-    }
-    function formatParagraphAnchors(odfbody) {
-        var runtimens = "urn:webodf",
-            n,
-            i,
-            nodes = xpath.getODFElementsWithXPath(odfbody,
-                ".//*[*[@text:anchor-type='paragraph']]",
-                style2CSS.namespaceResolver);
-        for (i = 0; i < nodes.length; i += 1) {
-            n = nodes[i];
-            if (n.setAttributeNS) {
-                n.setAttributeNS(runtimens, "containsparagraphanchor", true);
-            }
-        }
-    }
-    /**
-     * @param {!Object} container
-     * @param {!Element} odfbody
-     * @param {!StyleSheet} stylesheet
-     * @return {undefined}
-     **/
-    function modifyImages(container, odfbody, stylesheet) {
-        var node,
-            frames,
-            i,
-            images;
-        function namespaceResolver(prefix) {
-            return namespaces[prefix];
-        }
-        // find all the frame elements
-        frames = [];
-        node = odfbody.firstChild;
-        while (node && node !== odfbody) {
-            if (node.namespaceURI === drawns) {
-                frames[frames.length] = node;
-            }
-            if (node.firstChild) {
-                node = node.firstChild;
-            } else {
-                while (node && node !== odfbody && !node.nextSibling) {
-                    node = node.parentNode;
-                }
-                if (node && node.nextSibling) {
-                    node = node.nextSibling;
-                }
-            }
-        }
-        // adjust all the frame positions
-        for (i = 0; i < frames.length; i += 1) {
-            node = frames[i];
-            setFramePosition('frame' + String(i), node, stylesheet);
-        }
-        formatParagraphAnchors(odfbody);
-    }
-    /**
-     * Load all the images that are inside an odf element.
-     * @param {!Object} container
-     * @param {!Element} odffragment
-     * @param {!StyleSheet} stylesheet
-     * @return {undefined}
-     */
-    function loadImages(container, odffragment, stylesheet) {
-        var i,
-            images,
-            node;
-        // do delayed loading for all the images
-        function loadImage(name, container, node, stylesheet) {
-            // load image with a small delay to give the html ui a chance to
-            // update
-            loadingQueue.addToQueue(function () {
-                setImage(name, container, node, stylesheet);
-            });
-        }
-        images = odffragment.getElementsByTagNameNS(drawns, 'image');
-        for (i = 0; i < images.length; i += 1) {
-            node = /**@type{!Element}*/(images.item(i));
-            loadImage('image' + String(i), container, node, stylesheet);
-        }
-    }
-	/**
-     * @param {!string} id
-     * @param {!Object} container
-     * @param {!Element} plugin
-     * @param {!StyleSheet} stylesheet
-     * @return {undefined}
-     **/
-    function setVideo(id, container, plugin, stylesheet) {
-        var video, source, url, videoType, doc = plugin.ownerDocument, part, node;
-
-        url = plugin.getAttributeNS(xlinkns, 'href');
-
-        function callback(url, mimetype) {
-            // test for video mimetypes
-            if (mimetype.substr(0, 6) === 'video/') {
-                video = doc.createElementNS(doc.documentElement.namespaceURI, "video");
-                video.setAttribute('controls', 'controls');
-
-                source = doc.createElement('source');
-                source.setAttribute('src', url);
-                source.setAttribute('type', mimetype);
-
-                video.appendChild(source);
-                plugin.parentNode.appendChild(video);
-            } else {
-                plugin.innerHtml = 'Unrecognised Plugin';
-            }
-        }
-        // look for a office:binary-data
-        if (url) {
-            try {
-                if (container.getPartUrl) {
-                    url = container.getPartUrl(url);
-                    callback(url, 'video/mp4');
-                } else {
-                    part = container.getPart(url);
-                    part.onchange = function (part) {
-                        callback(part.url, part.mimetype);
-                    };
-                    part.load();
-                }
-            } catch (e) {
-                runtime.log('slight problem: ' + e);
-            }
-        } else {
-        // this will fail  atm - following function assumes PNG data]
-            runtime.log('using MP4 data fallback');
-            url = getUrlFromBinaryDataElement(plugin);
-            callback(url, 'video/mp4');
-        }
-    }
-    /**
-     * Load all the video that are inside an odf element.
-     * @param {!Object} container
-     * @param {!Element} odffragment
-     * @param {!StyleSheet} stylesheet
-     * @return {undefined}
-     */
-    function loadVideos(container, odffragment, stylesheet) {
-        var i,
-            plugins,
-            node;
-        // do delayed loading for all the videos
-        function loadVideo(name, container, node, stylesheet) {
-            // load video with a small delay to give the html ui a chance to
-            // update
-            loadingQueue.addToQueue(function () {
-                setVideo(name, container, node, stylesheet);
-            });
-        }
-        // embedded video is stored in a draw:plugin element
-        plugins = odffragment.getElementsByTagNameNS(drawns, 'plugin');
-        runtime.log('Loading Videos:');
-        
-        for (i = 0; i < plugins.length; i += 1) {
-            runtime.log('...Found a video.');
-            node = /**@type{!Element}*/(plugins.item(i));
-            loadVideo('video' + String(i), container, node, stylesheet);
-        }
-    }
-    /**
-     * @param {Document} document Put and ODF Canvas inside this element.
-     */
-    function addStyleSheet(document) {
-        var styles = document.getElementsByTagName("style"),
-            head = document.getElementsByTagName('head')[0],
-            text = '',
-            prefix,
-            a = "",
-            b;
-        // use cloneNode on an exisiting HTMLStyleElement, because in
-        // Chromium 12, document.createElement('style') does not give a
-        // HTMLStyleElement
-        if (styles && styles.length > 0) {
-            styles = styles[0].cloneNode(false);
-        } else {
-            styles = document.createElement('style');
-        }
-        for (prefix in namespaces) {
-            if (namespaces.hasOwnProperty(prefix) && prefix) {
-                text += "@namespace " + prefix + " url(" + namespaces[prefix] +
-                        ");\n";
-            }
-        }
-        styles.appendChild(document.createTextNode(text));
-        head.appendChild(styles);
-        return styles;
-    }
-    /**
-     * @constructor
-     * @param {!Element} element Put and ODF Canvas inside this element.
-     */
-    odf.OdfCanvas = function OdfCanvas(element) {
-        var self = this,
-            document = element.ownerDocument,
-            /**@type{odf.OdfContainer}*/ odfcontainer,
-            /**@type{!odf.Formatting}*/ formatting = new odf.Formatting(),
-            selectionWatcher = new SelectionWatcher(element),
-            slidecssindex = 0,
-            pageSwitcher = new PageSwitcher(addStyleSheet(document)),
-            stylesxmlcss = addStyleSheet(document),
-            positioncss = addStyleSheet(document),
-            editable = false,
-            zoomLevel = 1;
-
-        function fixContainerSize() {
-            var sizer = element.firstChild,
-                odfdoc = sizer.firstChild;
-            if (!odfdoc) {
-                return;
-            }
-            element.style.WebkitTransform = 'scale(' + zoomLevel + ')';
-            element.style.WebkitTransformOrigin = 'left top';
-            element.style.width = Math.round(zoomLevel * odfdoc.offsetWidth)
-                + "px";
-            element.style.height = Math.round(zoomLevel * odfdoc.offsetHeight)
-                + "px";
-        }
-        /**
-         * A new content.xml has been loaded. Update the live document with it.
-         * @param {!Object} container
-         * @param {!Element} odfnode
-         * @return {undefined}
-         **/
-        function handleContent(container, odfnode) {
-            var css = positioncss.sheet, sizer;
-            modifyImages(container, odfnode.body, css);
-/*
-            slidecssindex = css.insertRule(
-                'office|presentation draw|page:nth-child(1n) {display:block;}',
-                css.cssRules.length
-            );
-*/
-            // FIXME: this is a hack to have a defined background now
-            // should be removed as soon as we have sane background
-            // handling for pages
-            css.insertRule('draw|page { background-color:#fff; }',
-                css.cssRules.length);
-
-            // only append the content at the end
-            clear(element);
-            sizer = document.createElement('div');
-            sizer.style.display = "inline-block";
-            sizer.style.background = "white";
-            sizer.appendChild(odfnode);
-            element.appendChild(sizer);
-            loadImages(container, odfnode.body, css);
-            loadVideos(container, odfnode.body, css);
-            fixContainerSize();
-        }
-        /**
-         * @param {!odf.OdfContainer} container
-         * @return {undefined}
-         **/
-        function refreshOdf(container) {
-            if (odfcontainer !== container) {
-                return;
-            }
-
-            // synchronize the object a window.odfcontainer with the view
-            function callback() {
-                clear(element);
-                element.style.display = "inline-block";
-                var odfnode = container.rootElement;
-                element.ownerDocument.importNode(odfnode, true);
-
-                formatting.setOdfContainer(container);
-                handleStyles(odfnode, stylesxmlcss);
-                // do content last, because otherwise the document is constantly
-                // updated whenever the css changes
-                handleContent(container, odfnode);
-                fireEvent("statereadychange");
-            }
-
-            if (odfcontainer.state === odf.OdfContainer.DONE) {
-                callback();
-            } else {
-                odfcontainer.onchange = callback;
-            }
-        }
-
-        this.odfContainer = function () {
-            return odfcontainer;
-        };
-        this.slidevisibilitycss = function () {
-            return pageSwitcher.css;
-        };
-        /**
-         * @param {!string} url
-         * @return {undefined}
-         */
-        this["load"] = this.load = function (url) {
-            loadingQueue.clearQueue();
-            element.innerHTML = 'loading ' + url;
-            // open the odf container
-            odfcontainer = new odf.OdfContainer(url, function (container) {
-                odfcontainer = container;
-                refreshOdf(container);
-            });
-            odfcontainer.onstatereadychange = refreshOdf;
-        };
-
-        function stopEditing() {
-            if (!editparagraph) {
-                return;
-            }
-            var fragment = editparagraph.ownerDocument.createDocumentFragment();
-            while (editparagraph.firstChild) {
-                fragment.insertBefore(editparagraph.firstChild, null);
-            }
-            editparagraph.parentNode.replaceChild(fragment, editparagraph);
-        }
-
-        this.save = function (callback) {
-            stopEditing();
-            odfcontainer.save(callback);
-        };
-
-        function cancelPropagation(event) {
-            if (event.stopPropagation) {
-                event.stopPropagation();
-            } else {
-                event.cancelBubble = true;
-            }
-        }
-
-        function cancelEvent(event) {
-            if (event.preventDefault) {
-                event.preventDefault();
-                event.stopPropagation();
-            } else {
-                event.returnValue = false;
-                event.cancelBubble = true;
-            }
-        }
-
-        this.setEditable = function (iseditable) {
-            editable = iseditable;
-            if (!editable) {
-                stopEditing();
-            }
-        };
-
-        function processClick(evt) {
-            evt = evt || window.event;
-            // go up until we find a text:p, if we find it, wrap it in <p> and
-            // make that editable
-            var e = evt.target, selection = window.getSelection(),
-                range = ((selection.rangeCount > 0)
-                     ? selection.getRangeAt(0) : null),
-                startContainer = range && range.startContainer,
-                startOffset = range && range.startOffset,
-                endContainer = range && range.endContainer,
-                endOffset = range && range.endOffset;
-
-            while (e && !((e.localName === "p" || e.localName === "h") &&
-                    e.namespaceURI === textns)) {
-                e = e.parentNode;
-            }
-            if (!editable) {
-                return;
-            }
-            // test code for enabling editing
-            if (!e || e.parentNode === editparagraph) {
-                return;
-            }
-
-            if (!editparagraph) {
-                editparagraph = e.ownerDocument.createElement("p");
-                if (!editparagraph.style) {
-                    editparagraph = e.ownerDocument.createElementNS(
-                        "http://www.w3.org/1999/xhtml",
-                        "p"
-                    );
-                }
-                editparagraph.style.margin = "0px";
-                editparagraph.style.padding = "0px";
-                editparagraph.style.border = "0px";
-                editparagraph.setAttribute("contenteditable", true);
-            } else if (editparagraph.parentNode) {
-                stopEditing();
-            }
-            e.parentNode.replaceChild(editparagraph, e);
-            editparagraph.appendChild(e);
-
-            // set the cursor or selection at the right position
-            editparagraph.focus(); // needed in FF to show cursor in the paragraph
-            if (range) {
-                selection.removeAllRanges();
-                range = e.ownerDocument.createRange();
-                range.setStart(startContainer, startOffset);
-                range.setEnd(endContainer, endOffset);
-                selection.addRange(range);
-            }
-            cancelEvent(evt);
-        }
-
-        /**
-         * @param {!string} eventName
-         * @param {!function(*)} handler
-         * @return {undefined}
-         */
-        this.addListener = function (eventName, handler) {
-            if (eventName === "selectionchange") {
-                selectionWatcher.addListener(eventName, handler);
-            } else {
-                addEventListener(eventName, handler);
-            }
-        };
-        /**
-         * @return {!odf.Formatting}
-         */
-        this.getFormatting = function () {
-            return formatting;
-        };
-        /**
-         * @param {!number} zoom
-         * @return {undefined}
-         */
-        this.setZoomLevel = function (zoom) {
-            zoomLevel = zoom;
-            fixContainerSize();
-        };
-        /**
-         * @return {!number}
-         */
-        this.getZoomLevel = function () {
-            return zoomLevel;
-        };
-        /**
-         * @param {!number} width
-         * @param {!number} height
-         * @return {undefined}
-         */
-        this.fitToContainingElement = function (width, height) {
-            var realWidth = element.offsetWidth / zoomLevel,
-                realHeight = element.offsetHeight / zoomLevel;
-            zoomLevel = width / realWidth;
-            if (height / realHeight < zoomLevel) {
-                zoomLevel = height / realHeight;
-            }
-            fixContainerSize();
-        };
-        /**
-         * @param {!number} width
-         * @return {undefined}
-         */
-        this.fitToWidth = function (width) {
-            var realWidth = element.offsetWidth / zoomLevel;
-            zoomLevel = width / realWidth;
-            fixContainerSize();
-        };
-        /**
-         * @param {!number} height
-         * @return {undefined}
-         */
-        this.fitToHeight = function (height) {
-            var realHeight = element.offsetHeight / zoomLevel;
-            zoomLevel = height / realHeight;
-            fixContainerSize();
-        };
-        /**
-         * @return {undefined}
-         */
-        this.showNextPage = function () {
-            pageSwitcher.showNextPage();
-        };
-        /**
-         * @return {undefined}
-         */
-        this.showPreviousPage = function () {
-            pageSwitcher.showPreviousPage();
-        };
-        /**
-         * @return {undefined}
-         */
-        this.showAllPages = function () {
-        };
-
-        listenEvent(element, "click", processClick);
-    };
-    return odf.OdfCanvas;
-}());
diff --git a/apps/files_odfviewer/src/webodf/webodf/lib/odf/OdfContainer.js b/apps/files_odfviewer/src/webodf/webodf/lib/odf/OdfContainer.js
deleted file mode 100644
index 709addbecd..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/lib/odf/OdfContainer.js
+++ /dev/null
@@ -1,672 +0,0 @@
-/**
- * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
- * @licstart
- * The JavaScript code in this page is free software: you can redistribute it
- * and/or modify it under the terms of the GNU Affero General Public License
- * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.  The code is distributed
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
- *
- * As additional permission under GNU AGPL version 3 section 7, you
- * may distribute non-source (e.g., minimized or compacted) forms of
- * that code without the copy of the GNU GPL normally required by
- * section 4, provided you include this license notice and a URL
- * through which recipients can access the Corresponding Source.
- *
- * As a special exception to the AGPL, any HTML file which merely makes function
- * calls to this code, and for that purpose includes it by reference shall be
- * deemed a separate work for copyright law purposes. In addition, the copyright
- * holders of this code give you permission to combine this code with free
- * software libraries that are released under the GNU LGPL. You may copy and
- * distribute such a system following the terms of the GNU AGPL for this code
- * and the LGPL for the libraries. If you modify this code, you may extend this
- * exception to your version of the code, but you are not obligated to do so.
- * If you do not wish to do so, delete this exception statement from your
- * version.
- *
- * This license applies to this entire compilation.
- * @licend
- * @source: http://www.webodf.org/
- * @source: http://gitorious.org/odfkit/webodf/
- */
-/*global runtime: true, core: true, xmldom: true, odf: true, DOMParser: true,
-  document: true */
-runtime.loadClass("core.Base64");
-runtime.loadClass("core.Zip");
-runtime.loadClass("xmldom.LSSerializer");
-runtime.loadClass("odf.StyleInfo");
-runtime.loadClass("odf.Style2CSS");
-runtime.loadClass("odf.FontLoader");
-/**
- * The OdfContainer class manages the various parts that constitues an ODF
- * document.
- * @constructor
- * @param {!string} url
- * @param {!Function|null} onstatereadychange
- **/
-odf.OdfContainer = (function () {
-    "use strict";
-    var styleInfo = new odf.StyleInfo(),
-        style2CSS = new odf.Style2CSS(),
-        namespaces = style2CSS.namespaces,
-        officens = "urn:oasis:names:tc:opendocument:xmlns:office:1.0",
-        manifestns = "urn:oasis:names:tc:opendocument:xmlns:manifest:1.0",
-        nodeorder = ['meta', 'settings', 'scripts', 'font-face-decls', 'styles',
-            'automatic-styles', 'master-styles', 'body'],
-        base64 = new core.Base64(),
-        fontLoader = new odf.FontLoader(),
-        partMimetypes = {};
-    /**
-     * @param {?Node} node
-     * @param {!string} ns
-     * @param {!string} name
-     * @return {?Node}
-     */
-    function getDirectChild(node, ns, name) {
-        node = (node) ? node.firstChild : null;
-        while (node) {
-            if (node.localName === name && node.namespaceURI === ns) {
-                return node;
-            }
-            node = node.nextSibling;
-        }
-        return null;
-    }
-    /**
-     * Return the position the node should get according to the ODF flat format.
-     * @param {!Node} child
-     * @return {!number}
-     */
-    function getNodePosition(child) {
-        var childpos = 0, i, l = nodeorder.length;
-        for (i = 0; i < l; i += 1) {
-            if (child.namespaceURI === officens &&
-                    child.localName === nodeorder[i]) {
-                return i;
-            }
-        }
-        return -1;
-    }
-    /**
-     * Class that filters runtime specific nodes from the DOM.
-     * @constructor
-     * @implements {xmldom.LSSerializerFilter}
-     * @param {!Element} odfroot
-     * @param {!Element=} usedStylesElement
-     */
-    function OdfNodeFilter(odfroot, usedStylesElement) {
-        var automaticStyles = odfroot.automaticStyles,
-            usedKeysList;
-        if (usedStylesElement) {
-            usedKeysList = new styleInfo.UsedKeysList(usedStylesElement);
-        }
-        /**
-         * @param {!Node} node
-         * @return {!number}
-         */
-        this.acceptNode = function (node) {
-            var styleName, styleFamily, result;
-            if (node.namespaceURI === "http://www.w3.org/1999/xhtml") {
-                result = 3; // FILTER_SKIP
-            } else if (usedKeysList && node.parentNode === automaticStyles &&
-                    node.nodeType === 1) {
-                if (usedKeysList.uses(node)) {
-                    result = 1; // FILTER_ACCEPT
-                } else {
-                    result = 2; // FILTER_REJECT
-                }
-            } else {
-                result = 1; // FILTER_ACCEPT
-            }
-            return result;
-        };
-    }
-    /**
-     * Put the element at the right position in the parent.
-     * The right order is given by the value returned from getNodePosition.
-     * @param {!Node} node
-     * @param {?Node} child
-     * @return {undefined}
-     */
-    function setChild(node, child) {
-        if (!child) {
-            return;
-        }
-        var childpos = getNodePosition(child),
-            pos,
-            c = node.firstChild;
-        if (childpos === -1) {
-            return;
-        }
-        while (c) {
-            pos = getNodePosition(c);
-            if (pos !== -1 && pos > childpos) {
-                break;
-            }
-            c = c.nextSibling;
-        }
-        node.insertBefore(child, c);
-    }
-    /**
-     * A DOM element that is part of and ODF part of a DOM.
-     * @constructor
-     * @extends {Element}
-     */
-    function ODFElement() {
-    }
-    /**
-     * The root element of an ODF document.
-     * @constructor
-     * @extends {ODFElement}
-     */
-    function ODFDocumentElement(odfcontainer) {
-        this.OdfContainer = odfcontainer;
-    }
-    ODFDocumentElement.prototype = new ODFElement();
-    ODFDocumentElement.prototype.constructor = ODFDocumentElement;
-    ODFDocumentElement.namespaceURI = officens;
-    ODFDocumentElement.localName = 'document';
-    // private constructor
-    /**
-     * @constructor
-     * @param {!string} name
-     * @param {!odf.OdfContainer} container
-     * @param {!core.Zip} zip
-     */
-    function OdfPart(name, container, zip) {
-        var self = this,
-            privatedata;
-
-        // declare public variables
-        this.size = 0;
-        this.type = null;
-        this.name = name;
-        this.container = container;
-        this.url = null;
-        this.mimetype = null;
-        this.document = null;
-        this.onreadystatechange = null;
-        this.onchange = null;
-        this.EMPTY = 0;
-        this.LOADING = 1;
-        this.DONE = 2;
-        this.state = this.EMPTY;
-
-        // private functions
-        // public functions
-        this.load = function () {
-            var mimetype = partMimetypes[name];
-            this.mimetype = mimetype;
-            zip.loadAsDataURL(name, mimetype, function (err, url) {
-                self.url = url;
-                if (self.onchange) {
-                    self.onchange(self);
-                }
-                if (self.onstatereadychange) {
-                    self.onstatereadychange(self);
-                }
-            });
-        };
-        this.abort = function () {
-            // TODO
-        };
-    }
-    OdfPart.prototype.load = function () {
-    };
-    OdfPart.prototype.getUrl = function () {
-        if (this.data) {
-            return 'data:;base64,' + base64.toBase64(this.data);
-        }
-        return null;
-    };
-    /**
-     * @constructor
-     * @param {!odf.OdfContainer} odfcontainer
-     */
-    function OdfPartList(odfcontainer) {
-        var self = this;
-        // declare public variables
-        this.length = 0;
-        this.item = function (index) {
-        };
-    }
-    /**
-     * @constructor
-     * @param {!string} url
-     * @param {!Function|null} onstatereadychange
-     */
-    odf.OdfContainer = function OdfContainer(url, onstatereadychange) {
-        var self = this,
-            zip = null,
-            contentXmlCompletelyLoaded = false;
-
-        // NOTE each instance of OdfContainer has a copy of the private functions
-        // it would be better to have a class OdfContainerPrivate where the
-        // private functions can be defined via OdfContainerPrivate.prototype
-        // without exposing them
-
-        // declare public variables
-        this.onstatereadychange = onstatereadychange;
-        this.onchange = null;
-        this.state = null;
-        this.rootElement = null;
-        this.parts = null;
-
-        /**
-         * @param {!Element} element
-         * @return {undefined}
-         */
-        function removeProcessingInstructions(element) {
-            var n = element.firstChild, next, e;
-            while (n) {
-                next = n.nextSibling;
-                if (n.nodeType === 1) { // ELEMENT
-                    e = /**@type{!Element}*/(n);
-                    removeProcessingInstructions(e);
-                } else if (n.nodeType === 7) { // PROCESSING_INSTRUCTION_NODE
-                    element.removeChild(n);
-                }
-                n = next;
-            }
-        }
-
-        // private functions
-        /**
-         * Import the document elementnode into the DOM of OdfContainer.
-         * Any processing instructions are removed, since importing them
-         * gives an exception.
-         * @param {!Document} xmldoc
-         * @return {!Node}
-         */
-        function importRootNode(xmldoc) {
-            var doc = self.rootElement.ownerDocument,
-                node;
-            // remove all processing instructions
-            // TODO: replace cursor processing instruction with an element
-            if (xmldoc) {
-                removeProcessingInstructions(xmldoc.documentElement);
-                try {
-                    node = doc.importNode(xmldoc.documentElement, true);
-                } catch (e) {
-                }
-            }
-            return node;
-        }
-        function setState(state) {
-            self.state = state;
-            if (self.onchange) {
-                self.onchange(self);
-            }
-            if (self.onstatereadychange) {
-                self.onstatereadychange(self);
-            }
-        }
-        /**
-         * @param {!Document} xmldoc
-         * @return {undefined}
-         */
-        function handleFlatXml(xmldoc) {
-            var root = importRootNode(xmldoc);
-            if (!root || root.localName !== 'document' ||
-                    root.namespaceURI !== officens) {
-                setState(OdfContainer.INVALID);
-                return;
-            }
-            self.rootElement = root;
-            root.fontFaceDecls = getDirectChild(root, officens, 'font-face-decls');
-            root.styles = getDirectChild(root, officens, 'styles');
-            root.automaticStyles = getDirectChild(root, officens,
-                    'automatic-styles');
-            root.masterStyles = getDirectChild(root, officens, 'master-styles');
-            root.body = getDirectChild(root, officens, 'body');
-            root.meta = getDirectChild(root, officens, 'meta');
-            setState(OdfContainer.DONE);
-        }
-        /**
-         * @param {!Document} xmldoc
-         * @return {undefined}
-         */
-        function handleStylesXml(xmldoc) {
-            var node = importRootNode(xmldoc),
-                root = self.rootElement;
-            if (!node || node.localName !== 'document-styles' ||
-                    node.namespaceURI !== officens) {
-                setState(OdfContainer.INVALID);
-                return;
-            }
-            root.fontFaceDecls = getDirectChild(node, officens, 'font-face-decls');
-            setChild(root, root.fontFaceDecls);
-            root.styles = getDirectChild(node, officens, 'styles');
-            setChild(root, root.styles);
-            root.automaticStyles = getDirectChild(node, officens,
-                    'automatic-styles');
-            setChild(root, root.automaticStyles);
-            root.masterStyles = getDirectChild(node, officens, 'master-styles');
-            setChild(root, root.masterStyles);
-            //removeUnusedAutomaticStyles(root.automaticStyles,
-            //        root.masterStyles);
-            fontLoader.loadFonts(root.fontFaceDecls, zip, null);
-        }
-        /**
-         * @param {!Document} xmldoc
-         * @return {undefined}
-         */
-        function handleContentXml(xmldoc) {
-            var node = importRootNode(xmldoc),
-                root,
-                automaticStyles,
-                fontFaceDecls,
-                c;
-            if (!node || node.localName !== 'document-content' ||
-                    node.namespaceURI !== officens) {
-                setState(OdfContainer.INVALID);
-                return;
-            }
-            root = self.rootElement;
-            fontFaceDecls = getDirectChild(node, officens, 'font-face-decls');
-            if (root.fontFaceDecls && fontFaceDecls) {
-                c = fontFaceDecls.firstChild;
-                while (c) {
-                    root.fontFaceDecls.appendChild(c);
-                    c = fontFaceDecls.firstChild;
-                }
-            } else if (fontFaceDecls) {
-                root.fontFaceDecls = fontFaceDecls;
-                setChild(root, fontFaceDecls);
-            }
-            automaticStyles = getDirectChild(node, officens, 'automatic-styles');
-            if (root.automaticStyles && automaticStyles) {
-                c = automaticStyles.firstChild;
-                while (c) {
-                    root.automaticStyles.appendChild(c);
-                    c = automaticStyles.firstChild; // works because node c moved
-                }
-            } else if (automaticStyles) {
-                root.automaticStyles = automaticStyles;
-                setChild(root, automaticStyles);
-            }
-            root.body = getDirectChild(node, officens, 'body');
-            setChild(root, root.body);
-        }
-        /**
-         * @param {!Document} xmldoc
-         * @return {undefined}
-         */
-        function handleMetaXml(xmldoc) {
-            var node = importRootNode(xmldoc),
-                root;
-            if (!node || node.localName !== 'document-meta' ||
-                    node.namespaceURI !== officens) {
-                return;
-            }
-            root = self.rootElement;
-            root.meta = getDirectChild(node, officens, 'meta');
-            setChild(root, root.meta);
-        }
-        /**
-         * @param {!Document} xmldoc
-         * @return {undefined}
-         */
-        function handleSettingsXml(xmldoc) {
-            var node = importRootNode(xmldoc),
-                root;
-            if (!node || node.localName !== 'document-settings' ||
-                    node.namespaceURI !== officens) {
-                return;
-            }
-            root = self.rootElement;
-            root.settings = getDirectChild(node, officens, 'settings');
-            setChild(root, root.settings);
-        }
-        /**
-         * @param {!Document} xmldoc
-         * @return {undefined}
-         */
-        function handleManifestXml(xmldoc) {
-            var node = importRootNode(xmldoc),
-                root,
-                n;
-            if (!node || node.localName !== 'manifest' ||
-                    node.namespaceURI !== manifestns) {
-                return;
-            }
-            root = self.rootElement;
-            root.manifest = node;
-            n = root.manifest.firstChild;
-            while (n) {
-                if (n.nodeType === 1 && n.localName === "file-entry" &&
-                        n.namespaceURI === manifestns) {
-                    partMimetypes[n.getAttributeNS(manifestns, "full-path")] =
-                            n.getAttributeNS(manifestns, "media-type");
-                }
-                n = n.nextSibling;
-            }
-        }
-        /**
-         * @param {!function(?string,?Document)} callback
-         * @return {undefined}
-         */
-        function getContentXmlNode(callback) {
-            var handler = {
-                rootElementReady: function (err, rootxml, done) {
-                    contentXmlCompletelyLoaded = err || done;
-                    if (err) {
-                        return callback(err, null);
-                    }
-                    var parser = new DOMParser();
-                    rootxml = parser.parseFromString(rootxml, "text/xml");
-                    callback(null, rootxml);
-                },
-                bodyChildElementsReady: function (err, nodes, done) {
-                    // TODO
-                }
-            };
-            zip.loadContentXmlAsFragments("content.xml", handler);
-        }
-        /**
-         * @param {!string} filepath
-         * @param {!function(?string,?Document)} callback
-         * @return {undefined}
-         */
-        function getXmlNode(filepath, callback) {
-            zip.loadAsDOM(filepath, callback);
-        }
-        /**
-         * @return {undefined}
-         */
-        function loadComponents() {
-            // always load content.xml, meta.xml, styles.xml and settings.xml
-            getXmlNode('styles.xml', function (err, xmldoc) {
-                handleStylesXml(xmldoc);
-                if (self.state === OdfContainer.INVALID) {
-                    return;
-                }
-                getXmlNode('content.xml', function (err, xmldoc) {
-                    handleContentXml(xmldoc);
-                    if (self.state === OdfContainer.INVALID) {
-                        return;
-                    }
-                    getXmlNode('meta.xml', function (err, xmldoc) {
-                        handleMetaXml(xmldoc);
-                        if (self.state === OdfContainer.INVALID) {
-                            return;
-                        }
-                        getXmlNode('settings.xml', function (err, xmldoc) {
-                            if (xmldoc) {
-                                handleSettingsXml(xmldoc);
-                            }
-                            getXmlNode('META-INF/manifest.xml', function (err,
-                                    xmldoc) {
-                                if (xmldoc) {
-                                    handleManifestXml(xmldoc);
-                                }
-                                if (self.state !== OdfContainer.INVALID) {
-                                    setState(OdfContainer.DONE);
-                                }
-                            });
-                        });
-                    });
-                });
-            });
-        }
-        function documentElement(name, map) {
-            var s = "", i;
-            for (i in map) {
-                if (map.hasOwnProperty(i)) {
-                    s += " xmlns:" + i + "=\"" + map[i] + "\"";
-                }
-            }
-            return "<?xml version=\"1.0\" encoding=\"UTF-8\"?><office:" + name +
-                    " " + s + " office:version=\"1.2\">";
-        }
-        /**
-         * @return {!string}
-         */
-        function serializeMetaXml() {
-            var nsmap = style2CSS.namespaces,
-                serializer = new xmldom.LSSerializer(),
-                /**@type{!string}*/ s = documentElement("document-meta", nsmap);
-            serializer.filter = new OdfNodeFilter(self.rootElement);
-            s += serializer.writeToString(self.rootElement.meta, nsmap);
-            s += "</office:document-meta>";
-            return s;
-        }
-        /**
-         * @return {!string}
-         */
-        function serializeSettingsXml() {
-            var nsmap = style2CSS.namespaces,
-                serializer = new xmldom.LSSerializer(),
-                /**@type{!string}*/ s = documentElement("document-settings", nsmap);
-            serializer.filter = new OdfNodeFilter(self.rootElement);
-            s += serializer.writeToString(self.rootElement.settings, nsmap);
-            s += "</office:document-settings>";
-            return s;
-        }
-        /**
-         * @return {!string}
-         */
-        function serializeStylesXml() {
-            var nsmap = style2CSS.namespaces,
-                serializer = new xmldom.LSSerializer(),
-                /**@type{!string}*/ s = documentElement("document-styles", nsmap);
-            serializer.filter = new OdfNodeFilter(self.rootElement,
-                    self.rootElement.masterStyles);
-            s += serializer.writeToString(self.rootElement.fontFaceDecls, nsmap);
-            s += serializer.writeToString(self.rootElement.styles, nsmap);
-            s += serializer.writeToString(self.rootElement.automaticStyles, nsmap);
-            s += serializer.writeToString(self.rootElement.masterStyles, nsmap);
-            s += "</office:document-styles>";
-            return s;
-        }
-        /**
-         * @return {!string}
-         */
-        function serializeContentXml() {
-            var nsmap = style2CSS.namespaces,
-                serializer = new xmldom.LSSerializer(),
-                /**@type{!string}*/ s = documentElement("document-content", nsmap);
-            serializer.filter = new OdfNodeFilter(self.rootElement,
-                    self.rootElement.body);
-            // Until there is code to  determine if a font is referenced only
-            // from all font declaratios will be stored in styles.xml
-            s += serializer.writeToString(self.rootElement.automaticStyles, nsmap);
-            s += serializer.writeToString(self.rootElement.body, nsmap);
-            s += "</office:document-content>";
-            return s;
-        }
-        function createElement(Type) {
-            var original = document.createElementNS(
-                    Type.namespaceURI,
-                    Type.localName
-                ),
-                method,
-                iface = new Type();
-            for (method in iface) {
-                if (iface.hasOwnProperty(method)) {
-                    original[method] = iface[method];
-                }
-            }
-            return original;
-        }
-        function loadFromXML(url, callback) {
-            runtime.loadXML(url, function (err, dom) {
-                if (err) {
-                    callback(err);
-                } else {
-                    handleFlatXml(dom);
-                }
-            });
-        }
-        // public functions
-        /**
-         * Open file and parse it. Return the XML Node. Return the root node of
-         * the file or null if this is not possible.
-         * For 'content.xml', 'styles.xml', 'meta.xml', and 'settings.xml', the
-         * elements 'document-content', 'document-styles', 'document-meta', or
-         * 'document-settings' will be returned respectively.
-         * @param {!string} partname
-         * @return {!OdfPart}
-         **/
-        this.getPart = function (partname) {
-            return new OdfPart(partname, self, zip);
-        };
-        /**
-         * @param {function(?string):undefined} callback
-         * @return {undefined}
-         */
-        this.save = function (callback) {
-            // the assumption so far is that all ODF parts are serialized
-            // already, but meta, settings, styles and content should be
-            // refreshed
-            // update the zip entries with the data from the live ODF DOM
-            var data;
-            data = runtime.byteArrayFromString(serializeSettingsXml(), "utf8");
-            zip.save("settings.xml", data, true, new Date());
-            data = runtime.byteArrayFromString(serializeMetaXml(), "utf8");
-            zip.save("meta.xml", data, true, new Date());
-            data = runtime.byteArrayFromString(serializeStylesXml(), "utf8");
-            zip.save("styles.xml", data, true, new Date());
-            data = runtime.byteArrayFromString(serializeContentXml(), "utf8");
-            zip.save("content.xml", data, true, new Date());
-            zip.write(function (err) {
-                callback(err);
-            });
-        };
-
-        // initialize public variables
-        this.state = OdfContainer.LOADING;
-        this.rootElement = createElement(ODFDocumentElement);
-        this.parts = new OdfPartList(this);
-
-        // initialize private variables
-        zip = new core.Zip(url, function (err, zipobject) {
-            zip = zipobject;
-            if (err) {
-                loadFromXML(url, function (xmlerr) {
-                    if (err) {
-                        zip.error = err + "\n" + xmlerr;
-                        setState(OdfContainer.INVALID);
-                    }
-                });
-            } else {
-                loadComponents();
-            }
-        });
-    };
-    odf.OdfContainer.EMPTY = 0;
-    odf.OdfContainer.LOADING = 1;
-    odf.OdfContainer.DONE = 2;
-    odf.OdfContainer.INVALID = 3;
-    odf.OdfContainer.SAVING = 4;
-    odf.OdfContainer.MODIFIED = 5;
-    /**
-     * @param {!string} url
-     * @return {!odf.OdfContainer}
-     */
-    odf.OdfContainer.getContainer = function (url) {
-        return new odf.OdfContainer(url, null);
-    };
-    return odf.OdfContainer;
-}());
diff --git a/apps/files_odfviewer/src/webodf/webodf/lib/odf/Style2CSS.js b/apps/files_odfviewer/src/webodf/webodf/lib/odf/Style2CSS.js
deleted file mode 100644
index f33e3faef4..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/lib/odf/Style2CSS.js
+++ /dev/null
@@ -1,632 +0,0 @@
-/**
- * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
- * @licstart
- * The JavaScript code in this page is free software: you can redistribute it
- * and/or modify it under the terms of the GNU Affero General Public License
- * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.  The code is distributed
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
- *
- * As additional permission under GNU AGPL version 3 section 7, you
- * may distribute non-source (e.g., minimized or compacted) forms of
- * that code without the copy of the GNU GPL normally required by
- * section 4, provided you include this license notice and a URL
- * through which recipients can access the Corresponding Source.
- *
- * As a special exception to the AGPL, any HTML file which merely makes function
- * calls to this code, and for that purpose includes it by reference shall be
- * deemed a separate work for copyright law purposes. In addition, the copyright
- * holders of this code give you permission to combine this code with free
- * software libraries that are released under the GNU LGPL. You may copy and
- * distribute such a system following the terms of the GNU AGPL for this code
- * and the LGPL for the libraries. If you modify this code, you may extend this
- * exception to your version of the code, but you are not obligated to do so.
- * If you do not wish to do so, delete this exception statement from your
- * version.
- *
- * This license applies to this entire compilation.
- * @licend
- * @source: http://www.webodf.org/
- * @source: http://gitorious.org/odfkit/webodf/
- */
-/*global odf: true, runtime: true*/
-/**
- * @constructor
- */
-odf.Style2CSS = function Style2CSS() {
-    "use strict";
-    // helper constants
-    var xlinkns = 'http://www.w3.org/1999/xlink',
-        drawns = "urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",
-        fons = "urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0",
-        officens = "urn:oasis:names:tc:opendocument:xmlns:office:1.0",
-        presentationns = "urn:oasis:names:tc:opendocument:xmlns:presentation:1.0",
-        stylens = "urn:oasis:names:tc:opendocument:xmlns:style:1.0",
-        svgns = "urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0",
-        tablens = "urn:oasis:names:tc:opendocument:xmlns:table:1.0",
-        textns = "urn:oasis:names:tc:opendocument:xmlns:text:1.0",
-        namespaces = {
-            "draw": drawns,
-            "fo": fons,
-            "office": officens,
-            "presentation": presentationns,
-            "style": stylens,
-            "svg": svgns,
-            "table": tablens,
-            "text": textns,
-            "xlink": xlinkns
-        },
-
-        familynamespaceprefixes = {
-            'graphic': 'draw',
-            'paragraph': 'text',
-            'presentation': 'presentation',
-            'ruby': 'text',
-            'section': 'text',
-            'table': 'table',
-            'table-cell': 'table',
-            'table-column': 'table',
-            'table-row': 'table',
-            'text': 'text',
-            'list': 'text'
-        },
-
-        familytagnames = {
-            'graphic': ['circle', 'connected', 'control', 'custom-shape',
-                'ellipse', 'frame', 'g', 'line', 'measure', 'page',
-                'page-thumbnail', 'path', 'polygon', 'polyline', 'rect',
-                'regular-polygon' ],
-            'paragraph': ['alphabetical-index-entry-template', 'h',
-                'illustration-index-entry-template', 'index-source-style',
-                'object-index-entry-template', 'p',
-                'table-index-entry-template', 'table-of-content-entry-template',
-                'user-index-entry-template'],
-            'presentation': ['caption', 'circle', 'connector', 'control',
-                'custom-shape', 'ellipse', 'frame', 'g', 'line', 'measure',
-                'page-thumbnail', 'path', 'polygon', 'polyline', 'rect',
-                'regular-polygon'],
-            'ruby': ['ruby', 'ruby-text'],
-            'section': ['alphabetical-index', 'bibliography',
-                'illustration-index', 'index-title', 'object-index', 'section',
-                'table-of-content', 'table-index', 'user-index'],
-            'table': ['background', 'table'],
-            'table-cell': ['body', 'covered-table-cell', 'even-columns',
-                'even-rows', 'first-column', 'first-row', 'last-column',
-                'last-row', 'odd-columns', 'odd-rows', 'table-cell'],
-            'table-column': ['table-column'],
-            'table-row': ['table-row'],
-            'text': ['a', 'index-entry-chapter', 'index-entry-link-end',
-                'index-entry-link-start', 'index-entry-page-number',
-                'index-entry-span', 'index-entry-tab-stop', 'index-entry-text',
-                'index-title-template', 'linenumbering-configuration',
-                'list-level-style-number', 'list-level-style-bullet',
-                'outline-level-style', 'span'],
-            'list': ['list-item']
-        },
-
-        textPropertySimpleMapping = [
-            [ fons, 'color', 'color' ],
-            // this sets the element background, not just the text background
-            [ fons, 'background-color', 'background-color' ],
-            [ fons, 'font-weight', 'font-weight' ],
-            [ fons, 'font-style', 'font-style' ],
-            [ fons, 'font-size', 'font-size' ]
-        ],
-
-        bgImageSimpleMapping = [
-            [ stylens, 'repeat', 'background-repeat' ]
-        ],
-
-        paragraphPropertySimpleMapping = [
-            [ fons, 'background-color', 'background-color' ],
-            [ fons, 'text-align', 'text-align' ],
-            [ fons, 'padding-left', 'padding-left' ],
-            [ fons, 'padding-right', 'padding-right' ],
-            [ fons, 'padding-top', 'padding-top' ],
-            [ fons, 'padding-bottom', 'padding-bottom' ],
-            [ fons, 'border-left', 'border-left' ],
-            [ fons, 'border-right', 'border-right' ],
-            [ fons, 'border-top', 'border-top' ],
-            [ fons, 'border-bottom', 'border-bottom' ],
-            [ fons, 'margin-left', 'margin-left' ],
-            [ fons, 'margin-right', 'margin-right' ],
-            [ fons, 'margin-top', 'margin-top' ],
-            [ fons, 'margin-bottom', 'margin-bottom' ],
-            [ fons, 'border', 'border' ]
-        ],
-
-        graphicPropertySimpleMapping = [
-            [ drawns, 'fill-color', 'background-color' ],
-            [ drawns, 'fill', 'background' ],
-            [ fons, 'min-height', 'min-height' ],
-            [ drawns, 'stroke', 'border' ],
-            [ svgns, 'stroke-color', 'border-color' ]
-        ],
-
-        tablecellPropertySimpleMapping = [
-            [ fons, 'background-color', 'background-color' ],
-            [ fons, 'border-left', 'border-left' ],
-            [ fons, 'border-right', 'border-right' ],
-            [ fons, 'border-top', 'border-top' ],
-            [ fons, 'border-bottom', 'border-bottom' ]
-        ];
-
-    // helper functions
-    /**
-     * @param {string} prefix
-     * @return {string}
-     */
-    function namespaceResolver(prefix) {
-        return namespaces[prefix] || null;
-    }
-    /**
-     * @param {!Document} doc
-     * @param {!Element} stylesnode
-     * @return {!Object}
-     */
-    function getStyleMap(doc, stylesnode) {
-        // put all style elements in a hash map by family and name
-        var stylemap = {}, node, name, family, map;
-        if (!stylesnode) {
-            return stylemap;
-        }
-        node = stylesnode.firstChild;
-        while (node) {
-            if (node.namespaceURI === stylens && node.localName === 'style') {
-                family = node.getAttributeNS(stylens, 'family');
-            } else if (node.namespaceURI === textns &&
-                    node.localName === 'list-style') {
-                family = "list";
-            }
-            name = family && node.getAttributeNS &&
-                    node.getAttributeNS(stylens, 'name');
-            if (name) {
-               if (!stylemap[family]) {
-                   stylemap[family] = {};
-               }
-               stylemap[family][name] = node;
-            }
-            node = node.nextSibling;
-        }
-        return stylemap;
-    }
-    /**
-     * @param {?Object} stylestree
-     * @param {?string} name
-     * @return {?string}
-     */
-    function findStyle(stylestree, name) {
-        if (!name || !stylestree) {
-            return null;
-        }
-        if (stylestree[name]) {
-            return stylestree[name];
-        }
-        var derivedStyles = stylestree.derivedStyles,
-            n, style;
-        for (n in stylestree) {
-            if (stylestree.hasOwnProperty(n)) {
-                style = findStyle(stylestree[n].derivedStyles, name);
-                if (style) {
-                    return style;
-                }
-            }
-        }
-        return null;
-    }
-    /**
-     * @param {!string} stylename
-     * @param {!Object} stylesmap
-     * @param {!Object} stylestree
-     * @return {undefined}
-     */
-    function addStyleToStyleTree(stylename, stylesmap, stylestree) {
-        var style = stylesmap[stylename], parentname, parentstyle;
-        if (!style) {
-            return;
-        }
-        parentname = style.getAttributeNS(stylens, 'parent-style-name');
-        parentstyle = null;
-        if (parentname) {
-            parentstyle = findStyle(stylestree, parentname);
-            if (!parentstyle && stylesmap[parentname]) {
-                // parent style has not been handled yet, do that now
-                addStyleToStyleTree(parentname, stylesmap, stylestree);
-                parentstyle = stylesmap[parentname];
-                stylesmap[parentname] = null;
-            }
-        }
-        if (parentstyle) {
-            if (!parentstyle.derivedStyles) {
-                parentstyle.derivedStyles = {};
-            }
-            parentstyle.derivedStyles[stylename] = style;
-        } else {
-            // no parent so add the root
-            stylestree[stylename] = style;
-        }
-    }
-    /**
-     * @param {!Object} stylesmap
-     * @param {!Object} stylestree
-     * @return {undefined}
-     */
-    function addStyleMapToStyleTree(stylesmap, stylestree) {
-        var name;
-        for (name in stylesmap) {
-            if (stylesmap.hasOwnProperty(name)) {
-                addStyleToStyleTree(name, stylesmap, stylestree);
-                stylesmap[name] = null;
-            }
-        }
-    }
-    /**
-     * @param {!string} family
-     * @param {!string} name
-     * @return {?string}
-     */
-    function createSelector(family, name) {
-        var prefix = familynamespaceprefixes[family],
-            namepart,
-            selector = "",
-            first = true;
-        if (prefix === null) {
-            return null;
-        }
-        namepart = '[' + prefix + '|style-name="' + name + '"]';
-        if (prefix === 'presentation') {
-            prefix = 'draw';
-            namepart = '[presentation|style-name="' + name + '"]';
-        }
-        return prefix + '|' + familytagnames[family].join(
-                namepart + ',' + prefix + '|') + namepart;
-    }
-    /**
-     * @param {!string} family
-     * @param {!string} name
-     * @param {!Element} node
-     * @return {!Array}
-     */
-    function getSelectors(family, name, node) {
-        var selectors = [], n, ss, s;
-        selectors.push(createSelector(family, name));
-        for (n in node.derivedStyles) {
-            if (node.derivedStyles.hasOwnProperty(n)) {
-                ss = getSelectors(family, n, node.derivedStyles[n]);
-                for (s in ss) {
-                    if (ss.hasOwnProperty(s)) {
-                        selectors.push(ss[s]);
-                    }
-                }
-            }
-        }
-        return selectors;
-    }
-    /**
-     * @param {?Element} node
-     * @param {!string} ns
-     * @param {!string} name
-     * @return {?Element}
-     */
-    function getDirectChild(node, ns, name) {
-        if (!node) {
-            return null;
-        }
-        var c = node.firstChild, e;
-        while (c) {
-            if (c.namespaceURI === ns && c.localName === name) {
-                e = /**@type{Element}*/(c);
-                return e;
-            }
-            c = c.nextSibling;
-        }
-        return null;
-    }
-    /**
-     * @param {!Element} props
-     * @param {!Object} mapping
-     * @return {!string}
-     */
-    function applySimpleMapping(props, mapping) {
-        var rule = '', r, value;
-        for (r in mapping) {
-            if (mapping.hasOwnProperty(r)) {
-                r = mapping[r];
-                value = props.getAttributeNS(r[0], r[1]);
-                if (value) {
-                    rule += r[2] + ':' + value + ';';
-                }
-            }
-        }
-        return rule;
-    }
-    /**
-     * @param {!string} name
-     * @return {!string}
-     */
-    function getFontDeclaration(name) {
-        return '"' + name + '"';
-    }
-    /**
-     * @param {!Element} props
-     * @return {!string}
-     */
-    function getTextProperties(props) {
-        var rule = '', value;
-        rule += applySimpleMapping(props, textPropertySimpleMapping);
-        value = props.getAttributeNS(stylens, 'text-underline-style');
-        if (value === 'solid') {
-            rule += 'text-decoration: underline;';
-        }
-        value = props.getAttributeNS(stylens, 'font-name');
-        if (value) {
-            value = getFontDeclaration(value);
-            if (value) {
-                rule += 'font-family: ' + value + ';';
-            }
-        }
-        return rule;
-    }
-    /**
-     * @param {!Element} props
-     * @return {!string}
-     */
-    function getParagraphProperties(props) {
-        var rule = '', imageProps, url, element;
-        rule += applySimpleMapping(props, paragraphPropertySimpleMapping);
-        imageProps = props.getElementsByTagNameNS(stylens, 'background-image');
-        if (imageProps.length > 0) {
-            url = imageProps.item(0).getAttributeNS(xlinkns, 'href');
-            if (url) {
-                rule += "background-image: url('odfkit:" + url + "');";
-                //rule += "background-repeat: repeat;"; //FIXME test
-                element = /**@type{!Element}*/(imageProps.item(0));
-                rule += applySimpleMapping(element, bgImageSimpleMapping);
-            }
-        }
-        return rule;
-    }
-    /**
-     * @param {!Element} props
-     * @return {!string}
-     */
-    function getGraphicProperties(props) {
-        var rule = '';
-        rule += applySimpleMapping(props, graphicPropertySimpleMapping);
-        return rule;
-    }
-    /**
-     * @param {!Element} props
-     * @return {!string}
-     */
-    function getTableCellProperties(props) {
-        var rule = '';
-        rule += applySimpleMapping(props, tablecellPropertySimpleMapping);
-        return rule;
-    }
-    /**
-     * @param {!StyleSheet} sheet
-     * @param {!string} family
-     * @param {!string} name
-     * @param {!Element} node
-     * @return {undefined}
-     */
-    function addStyleRule(sheet, family, name, node) {
-        var selectors = getSelectors(family, name, node),
-            selector = selectors.join(','),
-            rule = '',
-            properties = getDirectChild(node, stylens, 'text-properties');
-        if (properties) {
-            rule += getTextProperties(properties);
-        }
-        properties = getDirectChild(node, stylens, 'paragraph-properties');
-        if (properties) {
-            rule += getParagraphProperties(properties);
-        }
-        properties = getDirectChild(node, stylens, 'graphic-properties');
-        if (properties) {
-            rule += getGraphicProperties(properties);
-        }
-        properties = getDirectChild(node, stylens, 'table-cell-properties');
-        if (properties) {
-            rule += getTableCellProperties(properties);
-        }
-        if (rule.length === 0) {
-            return;
-        }
-        rule = selector + '{' + rule + '}';
-        try {
-            sheet.insertRule(rule, sheet.cssRules.length);
-        } catch (e) {
-            throw e;
-        }
-    }
-    /**
-     * @param {!Element} node
-     * @return {!string}
-     */
-    function getNumberRule(node) {
-        var style = node.getAttributeNS(stylens, "num-format"),
-            suffix = node.getAttributeNS(stylens, "num-suffix"),
-            prefix = node.getAttributeNS(stylens, "num-prefix"),
-            rule = "",
-            stylemap = {'1': 'decimal', 'a': 'lower-latin', 'A': 'upper-latin',
-                'i': 'lower-roman', 'I': 'upper-roman'},
-            content = "";
-        content = prefix || "";
-        if (stylemap.hasOwnProperty(style)) {
-            content += " counter(list, " + stylemap[style] + ")";
-        } else if (style) {
-            content += "'" + style + "';";
-        } else {
-            content += " ''";
-        }
-        if (suffix) {
-            content += " '" + suffix + "'";
-        }
-        rule = "content: " + content + ";";
-        return rule;
-    }
-    /**
-     * @param {!Element} node
-     * @return {!string}
-     */
-    function getImageRule(node) {
-        var rule = "content: none;";
-        return rule;
-    }
-    /**
-     * @param {!Element} node
-     * @return {!string}
-     */
-    function getBulletRule(node) {
-        var rule = "",
-            bulletChar = node.getAttributeNS(textns, "bullet-char");
-        return "content: '" + bulletChar + "';";
-    }
-    /**
-     * @param {!StyleSheet} sheet
-     * @param {!string} name
-     * @param {!Element} node
-     * @return {undefined}
-     */
-    function addListStyleRule(sheet, name, node, itemrule) {
-        var selector = 'text|list[text|style-name="' + name +
-                '"]',
-            level = node.getAttributeNS(textns, "level"),
-            rule = "";
-        level = level && parseInt(level, 10);
-        while (level > 1) {
-            selector += " > text|list-item > text|list";
-            level -= 1;
-        }
-        selector += " > list-item:before";
-        rule = itemrule;
-        rule = selector + '{' + rule + '}';
-        try {
-            sheet.insertRule(rule, sheet.cssRules.length);
-        } catch (e) {
-            throw e;
-        }
-    }
-    /**
-     * @param {!StyleSheet} sheet
-     * @param {!string} name
-     * @param {!Element} node
-     * @return {undefined}
-     */
-    function addListStyleRules(sheet, name, node) {
-        var n = node.firstChild, e, itemrule;
-        while (n) {
-            if (n.namespaceURI === textns) {
-                e = /**@type{!Element}*/(n);
-                if (n.localName === "list-level-style-number") {
-                    itemrule = getNumberRule(e);
-                    addListStyleRule(sheet, name, e, itemrule);
-                } else if (n.localName === "list-level-style-image") {
-                    itemrule = getImageRule(e);
-                    addListStyleRule(sheet, name, e, itemrule);
-                } else if (n.localName === "list-level-style-bullet") {
-                    itemrule = getBulletRule(e);
-                    addListStyleRule(sheet, name, e, itemrule);
-                }
-            }
-            n = n.nextSibling;
-        }
-    }
-    /**
-     * @param {!StyleSheet} sheet
-     * @param {!string} family
-     * @param {!string} name
-     * @param {!Element} node
-     * @return {undefined}
-     */
-    function addRule(sheet, family, name, node) {
-        if (family === "list") {
-            addListStyleRules(sheet, name, node);
-        } else {
-            addStyleRule(sheet, family, name, node);
-        }
-    }
-    /**
-     * @param {!StyleSheet} sheet
-     * @param {!string} family
-     * @param {!string} name
-     * @param {!Element} node
-     * @return {undefined}
-     */
-    function addRules(sheet, family, name, node) {
-        addRule(sheet, family, name, node);
-        var n;
-        for (n in node.derivedStyles) {
-            if (node.derivedStyles.hasOwnProperty(n)) {
-                addRules(sheet, family, n, node.derivedStyles[n]);
-            }
-        }
-    }
-
-    // css vs odf styles
-    // ODF styles occur in families. A family is a group of odf elements to
-    // which an element applies. ODF families can be mapped to a group of css
-    // elements
-
-    this.namespaces = namespaces;
-    this.namespaceResolver = namespaceResolver;
-    this.namespaceResolver.lookupNamespaceURI = this.namespaceResolver;
-
-    /**
-     * @param {!StyleSheet} stylesheet
-     * @param {!Element} styles
-     * @param {!Element} autostyles
-     * @return {undefined}
-     */
-    this.style2css = function (stylesheet, styles, autostyles) {
-        var doc, prefix, styletree, tree, name, rule, family,
-            stylenodes, styleautonodes;
-        // make stylesheet empty
-        while (stylesheet.cssRules.length) {
-            stylesheet.deleteRule(stylesheet.cssRules.length - 1);
-        }
-        doc = null;
-        if (styles) {
-            doc = styles.ownerDocument;
-        }
-        if (autostyles) {
-            doc = autostyles.ownerDocument;
-        }
-        if (!doc) {
-            return;
-        }
-        // add @namespace rules
-        for (prefix in namespaces) {
-            if (namespaces.hasOwnProperty(prefix)) {
-                rule = '@namespace ' + prefix + ' url(' + namespaces[prefix] + ');';
-                try {
-                    stylesheet.insertRule(rule, stylesheet.cssRules.length);
-                } catch (e) {
-                    // WebKit can throw an exception here, but it will have
-                    // retained the namespace declarations anyway.
-                }
-            }
-        }
-
-        // add the various styles
-        stylenodes = getStyleMap(doc, styles);
-        styleautonodes = getStyleMap(doc, autostyles);
-        styletree = {};
-        for (family in familynamespaceprefixes) {
-            if (familynamespaceprefixes.hasOwnProperty(family)) {
-                tree = styletree[family] = {};
-                addStyleMapToStyleTree(stylenodes[family], tree);
-                addStyleMapToStyleTree(styleautonodes[family], tree);
-
-                for (name in tree) {
-                    if (tree.hasOwnProperty(name)) {
-                        addRules(stylesheet, family, name, tree[name]);
-                    }
-                }
-            }
-        }
-    };
-};
diff --git a/apps/files_odfviewer/src/webodf/webodf/lib/odf/StyleInfo.js b/apps/files_odfviewer/src/webodf/webodf/lib/odf/StyleInfo.js
deleted file mode 100644
index 9b76d13bed..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/lib/odf/StyleInfo.js
+++ /dev/null
@@ -1,424 +0,0 @@
-/**
- * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
- * @licstart
- * The JavaScript code in this page is free software: you can redistribute it
- * and/or modify it under the terms of the GNU Affero General Public License
- * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.  The code is distributed
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
- *
- * As additional permission under GNU AGPL version 3 section 7, you
- * may distribute non-source (e.g., minimized or compacted) forms of
- * that code without the copy of the GNU GPL normally required by
- * section 4, provided you include this license notice and a URL
- * through which recipients can access the Corresponding Source.
- *
- * As a special exception to the AGPL, any HTML file which merely makes function
- * calls to this code, and for that purpose includes it by reference shall be
- * deemed a separate work for copyright law purposes. In addition, the copyright
- * holders of this code give you permission to combine this code with free
- * software libraries that are released under the GNU LGPL. You may copy and
- * distribute such a system following the terms of the GNU AGPL for this code
- * and the LGPL for the libraries. If you modify this code, you may extend this
- * exception to your version of the code, but you are not obligated to do so.
- * If you do not wish to do so, delete this exception statement from your
- * version.
- *
- * This license applies to this entire compilation.
- * @licend
- * @source: http://www.webodf.org/
- * @source: http://gitorious.org/odfkit/webodf/
- */
-/*global odf*/
-/**
- * @constructor
- */
-odf.StyleInfo = function StyleInfo() {
-    "use strict";
-    // helper constants
-    var chartns = "urn:oasis:names:tc:opendocument:xmlns:chart:1.0",
-        dbns = "urn:oasis:names:tc:opendocument:xmlns:database:1.0",
-        dr3dns = "urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0",
-        drawns = "urn:oasis:names:tc:opendocument:xmlns:drawing:1.0",
-        fons = "urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0",
-        formns = "urn:oasis:names:tc:opendocument:xmlns:form:1.0",
-        numberns = "urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0",
-        officens = "urn:oasis:names:tc:opendocument:xmlns:office:1.0",
-        presentationns = "urn:oasis:names:tc:opendocument:xmlns:presentation:1.0",
-        stylens = "urn:oasis:names:tc:opendocument:xmlns:style:1.0",
-        svgns = "urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0",
-        tablens = "urn:oasis:names:tc:opendocument:xmlns:table:1.0",
-        textns = "urn:oasis:names:tc:opendocument:xmlns:text:1.0",
-        elementstyles = {
-            "text": [
-                { ens: stylens, en: 'tab-stop', ans: stylens, a: 'leader-text-style'},
-                { ens: stylens, en: 'drop-cap', ans: stylens, a: 'style-name'},
-                { ens: textns, en: 'notes-configuration', ans: textns, a: 'citation-body-style-name'},
-                { ens: textns, en: 'notes-configuration', ans: textns, a: 'citation-style-name'},
-                { ens: textns, en: 'a', ans: textns, a: 'style-name'},
-                { ens: textns, en: 'alphabetical-index', ans: textns, a: 'style-name'},
-                { ens: textns, en: 'linenumbering-configuration', ans: textns, a: 'style-name'},
-                { ens: textns, en: 'list-level-style-number', ans: textns, a: 'style-name'},
-                { ens: textns, en: 'ruby-text', ans: textns, a: 'style-name'},
-                { ens: textns, en: 'span', ans: textns, a: 'style-name'},
-                { ens: textns, en: 'a', ans: textns, a: 'visited-style-name'},
-                { ens: stylens, en: 'text-properties', ans: stylens, a: 'text-line-through-text-style'},
-                { ens: textns, en: 'alphabetical-index-source', ans: textns, a: 'main-entry-style-name'},
-                { ens: textns, en: 'index-entry-bibliography', ans: textns, a: 'style-name'},
-                { ens: textns, en: 'index-entry-chapter', ans: textns, a: 'style-name'},
-                { ens: textns, en: 'index-entry-link-end', ans: textns, a: 'style-name'},
-                { ens: textns, en: 'index-entry-link-start', ans: textns, a: 'style-name'},
-                { ens: textns, en: 'index-entry-page-number', ans: textns, a: 'style-name'},
-                { ens: textns, en: 'index-entry-span', ans: textns, a: 'style-name'},
-                { ens: textns, en: 'index-entry-tab-stop', ans: textns, a: 'style-name'},
-                { ens: textns, en: 'index-entry-text', ans: textns, a: 'style-name'},
-                { ens: textns, en: 'index-title-template', ans: textns, a: 'style-name'},
-                { ens: textns, en: 'list-level-style-bullet', ans: textns, a: 'style-name'},
-                { ens: textns, en: 'outline-level-style', ans: textns, a: 'style-name'}
-            ],
-            "paragraph": [
-                { ens: drawns, en: 'caption', ans: drawns, a: 'text-style-name'},
-                { ens: drawns, en: 'circle', ans: drawns, a: 'text-style-name'},
-                { ens: drawns, en: 'connector', ans: drawns, a: 'text-style-name'},
-                { ens: drawns, en: 'control', ans: drawns, a: 'text-style-name'},
-                { ens: drawns, en: 'custom-shape', ans: drawns, a: 'text-style-name'},
-                { ens: drawns, en: 'ellipse', ans: drawns, a: 'text-style-name'},
-                { ens: drawns, en: 'frame', ans: drawns, a: 'text-style-name'},
-                { ens: drawns, en: 'line', ans: drawns, a: 'text-style-name'},
-                { ens: drawns, en: 'measure', ans: drawns, a: 'text-style-name'},
-                { ens: drawns, en: 'path', ans: drawns, a: 'text-style-name'},
-                { ens: drawns, en: 'polygon', ans: drawns, a: 'text-style-name'},
-                { ens: drawns, en: 'polyline', ans: drawns, a: 'text-style-name'},
-                { ens: drawns, en: 'rect', ans: drawns, a: 'text-style-name'},
-                { ens: drawns, en: 'regular-polygon', ans: drawns, a: 'text-style-name'},
-                { ens: officens, en: 'annotation', ans: drawns, a: 'text-style-name'},
-                { ens: formns, en: 'column', ans: formns, a: 'text-style-name'},
-                { ens: stylens, en: 'style', ans: stylens, a: 'next-style-name'},
-                { ens: tablens, en: 'body', ans: tablens, a: 'paragraph-style-name'},
-                { ens: tablens, en: 'even-columns', ans: tablens, a: 'paragraph-style-name'},
-                { ens: tablens, en: 'even-rows', ans: tablens, a: 'paragraph-style-name'},
-                { ens: tablens, en: 'first-column', ans: tablens, a: 'paragraph-style-name'},
-                { ens: tablens, en: 'first-row', ans: tablens, a: 'paragraph-style-name'},
-                { ens: tablens, en: 'last-column', ans: tablens, a: 'paragraph-style-name'},
-                { ens: tablens, en: 'last-row', ans: tablens, a: 'paragraph-style-name'},
-                { ens: tablens, en: 'odd-columns', ans: tablens, a: 'paragraph-style-name'},
-                { ens: tablens, en: 'odd-rows', ans: tablens, a: 'paragraph-style-name'},
-                { ens: textns, en: 'notes-configuration', ans: textns, a: 'default-style-name'},
-                { ens: textns, en: 'alphabetical-index-entry-template', ans: textns, a: 'style-name'},
-                { ens: textns, en: 'bibliography-entry-template', ans: textns, a: 'style-name'},
-                { ens: textns, en: 'h', ans: textns, a: 'style-name'},
-                { ens: textns, en: 'illustration-index-entry-template', ans: textns, a: 'style-name'},
-                { ens: textns, en: 'index-source-style', ans: textns, a: 'style-name'},
-                { ens: textns, en: 'object-index-entry-template', ans: textns, a: 'style-name'},
-                { ens: textns, en: 'p', ans: textns, a: 'style-name'},
-                { ens: textns, en: 'table-index-entry-template', ans: textns, a: 'style-name'},
-                { ens: textns, en: 'table-of-content-entry-template', ans: textns, a: 'style-name'},
-                { ens: textns, en: 'table-index-entry-template', ans: textns, a: 'style-name'},
-                { ens: textns, en: 'user-index-entry-template', ans: textns, a: 'style-name'},
-                { ens: stylens, en: 'page-layout-properties', ans: stylens, a: 'register-truth-ref-style-name'}
-            ],
-            "chart": [
-                { ens: chartns, en: 'axis', ans: chartns, a: 'style-name'},
-                { ens: chartns, en: 'chart', ans: chartns, a: 'style-name'},
-                { ens: chartns, en: 'data-label', ans: chartns, a: 'style-name'},
-                { ens: chartns, en: 'data-point', ans: chartns, a: 'style-name'},
-                { ens: chartns, en: 'equation', ans: chartns, a: 'style-name'},
-                { ens: chartns, en: 'error-indicator', ans: chartns, a: 'style-name'},
-                { ens: chartns, en: 'floor', ans: chartns, a: 'style-name'},
-                { ens: chartns, en: 'footer', ans: chartns, a: 'style-name'},
-                { ens: chartns, en: 'grid', ans: chartns, a: 'style-name'},
-                { ens: chartns, en: 'legend', ans: chartns, a: 'style-name'},
-                { ens: chartns, en: 'mean-value', ans: chartns, a: 'style-name'},
-                { ens: chartns, en: 'plot-area', ans: chartns, a: 'style-name'},
-                { ens: chartns, en: 'regression-curve', ans: chartns, a: 'style-name'},
-                { ens: chartns, en: 'series', ans: chartns, a: 'style-name'},
-                { ens: chartns, en: 'stock-gain-marker', ans: chartns, a: 'style-name'},
-                { ens: chartns, en: 'stock-loss-marker', ans: chartns, a: 'style-name'},
-                { ens: chartns, en: 'stock-range-line', ans: chartns, a: 'style-name'},
-                { ens: chartns, en: 'subtitle', ans: chartns, a: 'style-name'},
-                { ens: chartns, en: 'title', ans: chartns, a: 'style-name'},
-                { ens: chartns, en: 'wall', ans: chartns, a: 'style-name'}
-            ],
-            "section": [
-                { ens: textns, en: 'alphabetical-index', ans: textns, a: 'style-name'},
-                { ens: textns, en: 'bibliography', ans: textns, a: 'style-name'},
-                { ens: textns, en: 'illustration-index', ans: textns, a: 'style-name'},
-                { ens: textns, en: 'index-title', ans: textns, a: 'style-name'},
-                { ens: textns, en: 'object-index', ans: textns, a: 'style-name'},
-                { ens: textns, en: 'section', ans: textns, a: 'style-name'},
-                { ens: textns, en: 'table-of-content', ans: textns, a: 'style-name'},
-                { ens: textns, en: 'table-index', ans: textns, a: 'style-name'},
-                { ens: textns, en: 'user-index', ans: textns, a: 'style-name'}
-            ],
-            "ruby": [
-                { ens: textns, en: 'ruby', ans: textns, a: 'style-name'}
-            ],
-            "table": [
-                { ens: dbns, en: 'query', ans: dbns, a: 'style-name'},
-                { ens: dbns, en: 'table-representation', ans: dbns, a: 'style-name'},
-                { ens: tablens, en: 'background', ans: tablens, a: 'style-name'},
-                { ens: tablens, en: 'table', ans: tablens, a: 'style-name'}
-            ],
-            "table-column": [
-                { ens: dbns, en: 'column', ans: dbns, a: 'style-name'},
-                { ens: tablens, en: 'table-column', ans: tablens, a: 'style-name'}
-            ],
-            "table-row": [
-                { ens: dbns, en: 'query', ans: dbns, a: 'default-row-style-name'},
-                { ens: dbns, en: 'table-representation', ans: dbns, a: 'default-row-style-name'},
-                { ens: tablens, en: 'table-row', ans: tablens, a: 'style-name'}
-            ],
-            "table-cell": [
-                { ens: dbns, en: 'column', ans: dbns, a: 'default-cell-style-name'},
-                { ens: tablens, en: 'table-column', ans: tablens, a: 'default-cell-style-name'},
-                { ens: tablens, en: 'table-row', ans: tablens, a: 'default-cell-style-name'},
-                { ens: tablens, en: 'body', ans: tablens, a: 'style-name'},
-                { ens: tablens, en: 'covered-table-cell', ans: tablens, a: 'style-name'},
-                { ens: tablens, en: 'even-columns', ans: tablens, a: 'style-name'},
-                { ens: tablens, en: 'covered-table-cell', ans: tablens, a: 'style-name'},
-                { ens: tablens, en: 'even-columns', ans: tablens, a: 'style-name'},
-                { ens: tablens, en: 'even-rows', ans: tablens, a: 'style-name'},
-                { ens: tablens, en: 'first-column', ans: tablens, a: 'style-name'},
-                { ens: tablens, en: 'first-row', ans: tablens, a: 'style-name'},
-                { ens: tablens, en: 'last-column', ans: tablens, a: 'style-name'},
-                { ens: tablens, en: 'last-row', ans: tablens, a: 'style-name'},
-                { ens: tablens, en: 'odd-columns', ans: tablens, a: 'style-name'},
-                { ens: tablens, en: 'odd-rows', ans: tablens, a: 'style-name'},
-                { ens: tablens, en: 'table-cell', ans: tablens, a: 'style-name'}
-            ],
-            "graphic": [
-                { ens: dr3dns, en: 'cube', ans: drawns, a: 'style-name'},
-                { ens: dr3dns, en: 'extrude', ans: drawns, a: 'style-name'},
-                { ens: dr3dns, en: 'rotate', ans: drawns, a: 'style-name'},
-                { ens: dr3dns, en: 'scene', ans: drawns, a: 'style-name'},
-                { ens: dr3dns, en: 'sphere', ans: drawns, a: 'style-name'},
-                { ens: drawns, en: 'caption', ans: drawns, a: 'style-name'},
-                { ens: drawns, en: 'circle', ans: drawns, a: 'style-name'},
-                { ens: drawns, en: 'connector', ans: drawns, a: 'style-name'},
-                { ens: drawns, en: 'control', ans: drawns, a: 'style-name'},
-                { ens: drawns, en: 'custom-shape', ans: drawns, a: 'style-name'},
-                { ens: drawns, en: 'ellipse', ans: drawns, a: 'style-name'},
-                { ens: drawns, en: 'frame', ans: drawns, a: 'style-name'},
-                { ens: drawns, en: 'g', ans: drawns, a: 'style-name'},
-                { ens: drawns, en: 'line', ans: drawns, a: 'style-name'},
-                { ens: drawns, en: 'measure', ans: drawns, a: 'style-name'},
-                { ens: drawns, en: 'page-thumbnail', ans: drawns, a: 'style-name'},
-                { ens: drawns, en: 'path', ans: drawns, a: 'style-name'},
-                { ens: drawns, en: 'polygon', ans: drawns, a: 'style-name'},
-                { ens: drawns, en: 'polyline', ans: drawns, a: 'style-name'},
-                { ens: drawns, en: 'rect', ans: drawns, a: 'style-name'},
-                { ens: drawns, en: 'regular-polygon', ans: drawns, a: 'style-name'},
-                { ens: officens, en: 'annotation', ans: drawns, a: 'style-name'}
-            ],
-            "presentation": [
-                { ens: dr3dns, en: 'cube', ans: presentationns, a: 'style-name'},
-                { ens: dr3dns, en: 'extrude', ans: presentationns, a: 'style-name'},
-                { ens: dr3dns, en: 'rotate', ans: presentationns, a: 'style-name'},
-                { ens: dr3dns, en: 'scene', ans: presentationns, a: 'style-name'},
-                { ens: dr3dns, en: 'sphere', ans: presentationns, a: 'style-name'},
-                { ens: drawns, en: 'caption', ans: presentationns, a: 'style-name'},
-                { ens: drawns, en: 'circle', ans: presentationns, a: 'style-name'},
-                { ens: drawns, en: 'connector', ans: presentationns, a: 'style-name'},
-                { ens: drawns, en: 'control', ans: presentationns, a: 'style-name'},
-                { ens: drawns, en: 'custom-shape', ans: presentationns, a: 'style-name'},
-                { ens: drawns, en: 'ellipse', ans: presentationns, a: 'style-name'},
-                { ens: drawns, en: 'frame', ans: presentationns, a: 'style-name'},
-                { ens: drawns, en: 'g', ans: presentationns, a: 'style-name'},
-                { ens: drawns, en: 'line', ans: presentationns, a: 'style-name'},
-                { ens: drawns, en: 'measure', ans: presentationns, a: 'style-name'},
-                { ens: drawns, en: 'page-thumbnail', ans: presentationns, a: 'style-name'},
-                { ens: drawns, en: 'path', ans: presentationns, a: 'style-name'},
-                { ens: drawns, en: 'polygon', ans: presentationns, a: 'style-name'},
-                { ens: drawns, en: 'polyline', ans: presentationns, a: 'style-name'},
-                { ens: drawns, en: 'rect', ans: presentationns, a: 'style-name'},
-                { ens: drawns, en: 'regular-polygon', ans: presentationns, a: 'style-name'},
-                { ens: officens, en: 'annotation', ans: presentationns, a: 'style-name'}
-            ],
-            "drawing-page": [
-                { ens: drawns, en: 'page', ans: drawns, a: 'style-name'},
-                { ens: presentationns, en: 'notes', ans: drawns, a: 'style-name'},
-                { ens: stylens, en: 'handout-master', ans: drawns, a: 'style-name'},
-                { ens: stylens, en: 'master-page', ans: drawns, a: 'style-name'}
-            ],
-            "list-style": [
-                { ens: textns, en: 'list', ans: textns, a: 'style-name'},
-                { ens: textns, en: 'numbered-paragraph', ans: textns, a: 'style-name'},
-                { ens: textns, en: 'list-item', ans: textns, a: 'style-override'},
-                { ens: stylens, en: 'style', ans: stylens, a: 'list-style-name'},
-                { ens: stylens, en: 'style', ans: stylens, a: 'data-style-name'},
-                { ens: stylens, en: 'style', ans: stylens, a: 'percentage-data-style-name'},
-                { ens: presentationns, en: 'date-time-decl', ans: stylens, a: 'data-style-name'},
-                { ens: textns, en: 'creation-date', ans: stylens, a: 'data-style-name'},
-                { ens: textns, en: 'creation-time', ans: stylens, a: 'data-style-name'},
-                { ens: textns, en: 'database-display', ans: stylens, a: 'data-style-name'},
-                { ens: textns, en: 'date', ans: stylens, a: 'data-style-name'},
-                { ens: textns, en: 'editing-duration', ans: stylens, a: 'data-style-name'},
-                { ens: textns, en: 'expression', ans: stylens, a: 'data-style-name'},
-                { ens: textns, en: 'meta-field', ans: stylens, a: 'data-style-name'},
-                { ens: textns, en: 'modification-date', ans: stylens, a: 'data-style-name'},
-                { ens: textns, en: 'modification-time', ans: stylens, a: 'data-style-name'},
-                { ens: textns, en: 'print-date', ans: stylens, a: 'data-style-name'},
-                { ens: textns, en: 'print-time', ans: stylens, a: 'data-style-name'},
-                { ens: textns, en: 'table-formula', ans: stylens, a: 'data-style-name'},
-                { ens: textns, en: 'time', ans: stylens, a: 'data-style-name'},
-                { ens: textns, en: 'user-defined', ans: stylens, a: 'data-style-name'},
-                { ens: textns, en: 'user-field-get', ans: stylens, a: 'data-style-name'},
-                { ens: textns, en: 'user-field-input', ans: stylens, a: 'data-style-name'},
-                { ens: textns, en: 'variable-get', ans: stylens, a: 'data-style-name'},
-                { ens: textns, en: 'variable-input', ans: stylens, a: 'data-style-name'},
-                { ens: textns, en: 'variable-set', ans: stylens, a: 'data-style-name'}
-            ],
-            "data": [
-                { ens: stylens, en: 'style', ans: stylens, a: 'data-style-name'},
-                { ens: stylens, en: 'style', ans: stylens, a: 'percentage-data-style-name'},
-                { ens: presentationns, en: 'date-time-decl', ans: stylens, a: 'data-style-name'},
-                { ens: textns, en: 'creation-date', ans: stylens, a: 'data-style-name'},
-                { ens: textns, en: 'creation-time', ans: stylens, a: 'data-style-name'},
-                { ens: textns, en: 'database-display', ans: stylens, a: 'data-style-name'},
-                { ens: textns, en: 'date', ans: stylens, a: 'data-style-name'},
-                { ens: textns, en: 'editing-duration', ans: stylens, a: 'data-style-name'},
-                { ens: textns, en: 'expression', ans: stylens, a: 'data-style-name'},
-                { ens: textns, en: 'meta-field', ans: stylens, a: 'data-style-name'},
-                { ens: textns, en: 'modification-date', ans: stylens, a: 'data-style-name'},
-                { ens: textns, en: 'modification-time', ans: stylens, a: 'data-style-name'},
-                { ens: textns, en: 'print-date', ans: stylens, a: 'data-style-name'},
-                { ens: textns, en: 'print-time', ans: stylens, a: 'data-style-name'},
-                { ens: textns, en: 'table-formula', ans: stylens, a: 'data-style-name'},
-                { ens: textns, en: 'time', ans: stylens, a: 'data-style-name'},
-                { ens: textns, en: 'user-defined', ans: stylens, a: 'data-style-name'},
-                { ens: textns, en: 'user-field-get', ans: stylens, a: 'data-style-name'},
-                { ens: textns, en: 'user-field-input', ans: stylens, a: 'data-style-name'},
-                { ens: textns, en: 'variable-get', ans: stylens, a: 'data-style-name'},
-                { ens: textns, en: 'variable-input', ans: stylens, a: 'data-style-name'},
-                { ens: textns, en: 'variable-set', ans: stylens, a: 'data-style-name'}
-            ],
-            "page-layout": [
-                { ens: presentationns, en: 'notes', ans: stylens, a: 'page-layout-name'},
-                { ens: stylens, en: 'handout-master', ans: stylens, a: 'page-layout-name'},
-                { ens: stylens, en: 'master-page', ans: stylens, a: 'page-layout-name'}
-            ]
-        },
-        elements;
-
-    /**
-     * Return if a particular element can have a style for a particular family.
-     * @param {!string} family
-     * @param {!Element} element
-     * @return {!boolean}
-     */
-    function canElementHaveStyle(family, element) {
-        var elname = elements[element.localName],
-            elns = elname && elname[element.namespaceURI],
-            length = elns ? elns.length : 0,
-            i;
-        return elns && elns.length > 0;
-    }
-
-    /**
-     * @param {!string} family
-     * @param {!Element} element
-     * @return {{name:string,family:string}|null}
-     */
-    function getStyleRef(family, element) {
-        var elname = elements[element.localName],
-            elns = elname && elname[element.namespaceURI],
-            length = elns ? elns.length : 0,
-            i, attr;
-        for (i = 0; i < length; i += 1) {
-            attr = element.getAttributeNS(elns[i].ns, elns[i].localname);
-/*
-            if (attr) { // a style has been found!
-                return attr;
-            }
-*/
-        }
-        return null;
-    }
-
-    /**
-     * @param {!Element} element
-     * @param {!Object.<string,Object.<string,number>>} keys
-     * @return {undefined}
-     */
-    function getUsedStylesForAutomatic(element, keys) {
-        var elname = elements[element.localName],
-            elns = elname && elname[element.namespaceURI],
-            length = elns ? elns.length : 0,
-            i, attr, group, map, e;
-        for (i = 0; i < length; i += 1) {
-            attr = element.getAttributeNS(elns[i].ns, elns[i].localname);
-            if (attr) { // a style has been found!
-                group = elns[i].keygroup;
-                map = keys[group];
-                if (!map) {
-                    map = keys[group] = {};
-                }
-                map[attr] = 1;
-            }
-        }
-        i = element.firstChild;
-        while (i) {
-            if (i.nodeType === 1) {
-                e = /**@type{!Element}*/(i);
-                getUsedStylesForAutomatic(e, keys);
-            }
-            i = i.nextSibling;
-        }
-    }
-
-    /**
-     * @param {!Object.<Array.<Object.<string,string>>>} elementstyles
-     */
-    function inverse(elementstyles) {
-        var keyname, i, list, item, l, elements = {}, map, array;
-        for (keyname in elementstyles) {
-            if (elementstyles.hasOwnProperty(keyname)) {
-                list = elementstyles[keyname];
-                l = list.length;
-                for (i = 0; i < l; i += 1) {
-                    item = list[i];
-                    map = elements[item.en] = elements[item.en] || {};
-                    array = map[item.ens] = map[item.ens] || [];
-                    array.push(
-                        {ns: item.ans, localname: item.a, keygroup: keyname});
-                }
-            }
-        }
-        return elements;
-    }
-
-    /**
-     * @constructor
-     * @param {!Element} element
-     */
-    this.UsedKeysList = function (element) {
-        var usedKeys = {};
-
-        /**
-         * @param {!Element} element
-         * @return {!boolean}
-         */
-        this.uses = function (element) {
-            var localName = element.localName,
-                name = element.getAttributeNS(drawns, "name") ||
-                        element.getAttributeNS(stylens, "name"),
-                keyName, map;
-            if (localName === "style") {
-                keyName = element.getAttributeNS(stylens, "family");
-            } else if (element.namespaceURI === numberns) {
-                keyName = "data";
-            } else {
-                keyName = localName; // list-style or page-layout
-            }
-            map = usedKeys[keyName];
-            return map ? (map[name] > 0) : false;
-        };
-
-        getUsedStylesForAutomatic(element, usedKeys);
-    };
-
-    this.canElementHaveStyle = canElementHaveStyle;
-
-    elements = inverse(elementstyles);
-};
diff --git a/apps/files_odfviewer/src/webodf/webodf/lib/packages.js b/apps/files_odfviewer/src/webodf/webodf/lib/packages.js
deleted file mode 100644
index 7277a833f9..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/lib/packages.js
+++ /dev/null
@@ -1,48 +0,0 @@
-/**
- * @license
- * @licstart
- * The JavaScript code in this page is free software: you can redistribute it
- * and/or modify it under the terms of the GNU Affero General Public License
- * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.  The code is distributed
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
- *
- * As additional permission under GNU AGPL version 3 section 7, you
- * may distribute non-source (e.g., minimized or compacted) forms of
- * that code without the copy of the GNU GPL normally required by
- * section 4, provided you include this license notice and a URL
- * through which recipients can access the Corresponding Source.
- *
- * As a special exception to the AGPL, any HTML file which merely makes function
- * calls to this code, and for that purpose includes it by reference shall be
- * deemed a separate work for copyright law purposes. In addition, the copyright
- * holders of this code give you permission to combine this code with free
- * software libraries that are released under the GNU LGPL. You may copy and
- * distribute such a system following the terms of the GNU AGPL for this code
- * and the LGPL for the libraries. If you modify this code, you may extend this
- * exception to your version of the code, but you are not obligated to do so.
- * If you do not wish to do so, delete this exception statement from your
- * version.
- *
- * This license applies to this entire compilation.
- * @licend
- * @source: http://www.webodf.org/
- * @source: http://gitorious.org/odfkit/webodf/
- */
-/**
- * @namespace The core package.
- */
-var core = {};
-/**
- * @namespace The gui package.
- */
-var gui = {};
-/**
- * @namespace The xmldom package.
- */
-var xmldom = {};
-/**
- * @namespace The ODF package.
- */
-var odf = {};
diff --git a/apps/files_odfviewer/src/webodf/webodf/lib/runtime.js b/apps/files_odfviewer/src/webodf/webodf/lib/runtime.js
deleted file mode 100644
index 99ded6f1d3..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/lib/runtime.js
+++ /dev/null
@@ -1,1117 +0,0 @@
-/**
- * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
- * @licstart
- * The JavaScript code in this page is free software: you can redistribute it
- * and/or modify it under the terms of the GNU Affero General Public License
- * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.  The code is distributed
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
- *
- * As additional permission under GNU AGPL version 3 section 7, you
- * may distribute non-source (e.g., minimized or compacted) forms of
- * that code without the copy of the GNU GPL normally required by
- * section 4, provided you include this license notice and a URL
- * through which recipients can access the Corresponding Source.
- *
- * As a special exception to the AGPL, any HTML file which merely makes function
- * calls to this code, and for that purpose includes it by reference shall be
- * deemed a separate work for copyright law purposes. In addition, the copyright
- * holders of this code give you permission to combine this code with free
- * software libraries that are released under the GNU LGPL. You may copy and
- * distribute such a system following the terms of the GNU AGPL for this code
- * and the LGPL for the libraries. If you modify this code, you may extend this
- * exception to your version of the code, but you are not obligated to do so.
- * If you do not wish to do so, delete this exception statement from your
- * version.
- *
- * This license applies to this entire compilation.
- * @licend
- * @source: http://www.webodf.org/
- * @source: http://gitorious.org/odfkit/webodf/
- */
-/*jslint nomen: true, evil: true, bitwise: true */
-/*global window: true, XMLHttpRequest: true, require: true, console: true,
-  process: true, __dirname: true, setTimeout: true, Packages: true, print: true,
-  readFile: true, quit: true, Buffer: true, ArrayBuffer: true, Uint8Array: true,
-  navigator: true, VBArray: true */
-/**
- * Three implementations of a runtime for browser, node.js and rhino.
- */
-
-/**
- * Abstraction of the runtime environment.
- * @class
- * @interface
- */
-function Runtime() {"use strict"; }
-/**
- * Abstraction of byte arrays.
- * @constructor
- * @extends {Array}
- * @param {!number} size
- */
-Runtime.ByteArray = function (size) {"use strict"; };
-/**
- * @param {!number} start
- * @param {!number} end
- * @return {!Runtime.ByteArray}
- */
-Runtime.ByteArray.prototype.slice = function (start, end) {"use strict"; };
-/**
- * @param {!Array.<number>} array
- * @return {!Runtime.ByteArray}
- */
-Runtime.prototype.byteArrayFromArray = function (array) {"use strict"; };
-/**
- * @param {!string} string
- * @param {!string} encoding
- * @return {!Runtime.ByteArray}
- */
-Runtime.prototype.byteArrayFromString = function (string, encoding) {"use strict"; };
-/**
- * @param {!Runtime.ByteArray} bytearray
- * @param {!string} encoding
- * @return {!string}
- */
-Runtime.prototype.byteArrayToString = function (bytearray, encoding) {"use strict"; };
-/**
- * @param {!Runtime.ByteArray} bytearray1
- * @param {!Runtime.ByteArray} bytearray2
- * @return {!Runtime.ByteArray}
- */
-Runtime.prototype.concatByteArrays = function (bytearray1, bytearray2) {"use strict"; };
-/**
- * @param {!string} path
- * @param {!number} offset
- * @param {!number} length
- * @param {!function(string,Runtime.ByteArray):undefined} callback
- * @return {undefined}
- */
-Runtime.prototype.read = function (path, offset, length, callback) {"use strict"; };
-/**
- * Read the contents of a file. Returns the result via a callback. If the
- * encoding is 'binary', the result is returned as a Runtime.ByteArray,
- * otherwise, it is returned as a string.
- * @param {!string} path
- * @param {!string} encoding text encoding or 'binary'
- * @param {!function(string,(string|Runtime.ByteArray)):undefined} callback
- * @return {undefined}
- */
-Runtime.prototype.readFile = function (path, encoding, callback) {"use strict"; };
-/**
- * @param {!string} path
- * @param {!string} encoding text encoding or 'binary'
- * @return {!string}
- */
-Runtime.prototype.readFileSync = function (path, encoding) {"use strict"; };
-/**
- * @param {!string} path
- * @param {!function((string|Document)):undefined} callback
- * @return {undefined}
- */
-Runtime.prototype.loadXML = function (path, callback) {"use strict"; };
-/**
- * @param {!string} path
- * @param {!Runtime.ByteArray} data
- * @param {!function(?string):undefined} callback
- * @return {undefined}
- */
-Runtime.prototype.writeFile = function (path, data, callback) {"use strict"; };
-/**
- * @param {!string} path
- * @param {!function(boolean):undefined} callback
- * @return {undefined}
- */
-Runtime.prototype.isFile = function (path, callback) {"use strict"; };
-/**
- * @param {!string} path
- * @param {!function(number):undefined} callback
- * @return {undefined}
- */
-Runtime.prototype.getFileSize = function (path, callback) {"use strict"; };
-/**
- * @param {!string} path
- * @param {!function(?string):undefined} callback
- * @return {undefined}
- */
-Runtime.prototype.deleteFile = function (path, callback) {"use strict"; };
-/**
- * @param {!string} msgOrCategory
- * @param {!string=} msg
- * @return {undefined}
- */
-Runtime.prototype.log = function (msgOrCategory, msg) {"use strict"; };
-/**
- * @param {!function():undefined} callback
- * @param {!number} milliseconds
- * @return {undefined}
- */
-Runtime.prototype.setTimeout = function (callback, milliseconds) {"use strict"; };
-/**
- * @return {!Array.<string>}
- */
-Runtime.prototype.libraryPaths = function () {"use strict"; };
-/**
- * @return {string}
- */
-Runtime.prototype.type = function () {"use strict"; };
-/**
- * @return {?DOMImplementation}
- */
-Runtime.prototype.getDOMImplementation = function () {"use strict"; };
-/**
- * @return {?Window}
- */
-Runtime.prototype.getWindow = function () {"use strict"; };
-
-/** @define {boolean} */
-var IS_COMPILED_CODE = false;
-
-/**
- * @this {Runtime}
- * @param {!Runtime.ByteArray} bytearray
- * @param {!string} encoding
- * @return {!string}
- */
-Runtime.byteArrayToString = function (bytearray, encoding) {
-    "use strict";
-    function byteArrayToString(bytearray) {
-        var s = "", i, l = bytearray.length;
-        for (i = 0; i < l; i += 1) {
-            s += String.fromCharCode(bytearray[i] & 0xff);
-        }
-        return s;
-    }
-    function utf8ByteArrayToString(bytearray) {
-        var s = "", i, l = bytearray.length,
-            c0, c1, c2;
-        for (i = 0; i < l; i += 1) {
-            c0 = bytearray[i];
-            if (c0 < 0x80) {
-                s += String.fromCharCode(c0);
-            } else {
-                i += 1;
-                c1 = bytearray[i];
-                if (c0 < 0xe0) {
-                    s += String.fromCharCode(((c0 & 0x1f) << 6) | (c1 & 0x3f));
-                } else {
-                    i += 1;
-                    c2 = bytearray[i];
-                    s += String.fromCharCode(((c0 & 0x0f) << 12) |
-                            ((c1 & 0x3f) << 6) | (c2 & 0x3f));
-                }
-            }
-        }
-        return s;
-    }
-    var result;
-    if (encoding === "utf8") {
-        result = utf8ByteArrayToString(bytearray);
-    } else {
-        if (encoding !== "binary") {
-            this.log("Unsupported encoding: " + encoding);
-        }
-        result = byteArrayToString(bytearray);
-    }
-    return result;
-};
-Runtime.getFunctionName = function getFunctionName(f) {
-    "use strict";
-    var m;
-    if (f.name === undefined) {
-        m = new RegExp("function\\s+(\\w+)").exec(f);
-        return m && m[1];
-    }
-    return f.name;
-};
-/**
- * @class
- * @constructor
- * @augments Runtime
- * @implements {Runtime}
- * @param {Element} logoutput
- */
-function BrowserRuntime(logoutput) {
-    "use strict";
-    var self = this,
-        cache = {},
-        useNativeArray = window.ArrayBuffer && window.Uint8Array;
-    /**
-     * @constructor
-     * @augments Runtime.ByteArray
-     * @inner
-     * @extends {Runtime.ByteArray}
-     * @param {!number} size
-     */
-    this.ByteArray = (useNativeArray)
-        // if Uint8Array is available, use that
-        ? function ByteArray(size) {
-            Uint8Array.prototype.slice = function (begin, end) {
-                if (end === undefined) {
-                    if (begin === undefined) {
-                        begin = 0;
-                    }
-                    end = this.length;
-                }
-                var view = this.subarray(begin, end), array, i;
-                end -= begin;
-                array = new Uint8Array(new ArrayBuffer(end));
-                for (i = 0; i < end; i += 1) {
-                    array[i] = view[i];
-                }
-                return array;
-            };
-            return new Uint8Array(new ArrayBuffer(size));
-        }
-        : function ByteArray(size) {
-            var a = [];
-            a.length = size;
-            return a;
-        };
-    this.concatByteArrays = (useNativeArray)
-        ? function (bytearray1, bytearray2) {
-            var i, l1 = bytearray1.length, l2 = bytearray2.length,
-                a = new this.ByteArray(l1 + l2);
-            for (i = 0; i < l1; i += 1) {
-                a[i] = bytearray1[i];
-            }
-            for (i = 0; i < l2; i += 1) {
-                a[i + l1] = bytearray2[i];
-            }
-            return a;
-        }
-        : function (bytearray1, bytearray2) {
-            return bytearray1.concat(bytearray2);
-        };
-    function utf8ByteArrayFromString(string) {
-        var l = string.length, bytearray, i, n, j = 0;
-        // first determine the length in bytes
-        for (i = 0; i < l; i += 1) {
-            n = string.charCodeAt(i);
-            j += 1 + (n > 0x80) + (n > 0x800);
-        }
-        // allocate a buffer and convert to a utf8 array
-        bytearray = new self.ByteArray(j);
-        j = 0;
-        for (i = 0; i < l; i += 1) {
-            n = string.charCodeAt(i);
-            if (n < 0x80) {
-                bytearray[j] = n;
-                j += 1;
-            } else if (n < 0x800) {
-                bytearray[j] = 0xc0 | (n >>>  6);
-                bytearray[j + 1] = 0x80 | (n & 0x3f);
-                j += 2;
-            } else {
-                bytearray[j] = 0xe0 | ((n >>> 12) & 0x0f);
-                bytearray[j + 1] = 0x80 | ((n >>>  6) & 0x3f);
-                bytearray[j + 2] = 0x80 |  (n         & 0x3f);
-                j += 3;
-            }
-        }
-        return bytearray;
-    }
-    function byteArrayFromString(string) {
-        // ignore encoding for now
-        var l = string.length,
-            a = new self.ByteArray(l),
-            i;
-        for (i = 0; i < l; i += 1) {
-            a[i] = string.charCodeAt(i) & 0xff;
-        }
-        return a;
-    }
-    this.byteArrayFromArray = function (array) {
-        return array.slice();
-    };
-    this.byteArrayFromString = function (string, encoding) {
-        var result;
-        if (encoding === "utf8") {
-            result = utf8ByteArrayFromString(string);
-        } else {
-            if (encoding !== "binary") {
-                self.log("unknown encoding: " + encoding);
-            }
-            result = byteArrayFromString(string);
-        }
-        return result;
-    };
-    this.byteArrayToString = Runtime.byteArrayToString;
-
-    /**
-     * @param {!string} msgOrCategory
-     * @param {string=} msg
-     * @return {undefined}
-     */
-    function log(msgOrCategory, msg) {
-        var node, doc, category;
-        if (msg) {
-            category = msgOrCategory;
-        } else {
-            msg = msgOrCategory;
-        }
-        if (logoutput) {
-            doc = logoutput.ownerDocument;
-            if (category) {
-                node = doc.createElement("span");
-                node.className = category;
-                node.appendChild(doc.createTextNode(category));
-                logoutput.appendChild(node);
-                logoutput.appendChild(doc.createTextNode(" "));
-            }
-            node = doc.createElement("span");
-            node.appendChild(doc.createTextNode(msg));
-            logoutput.appendChild(node);
-            logoutput.appendChild(doc.createElement("br"));
-        } else if (console) {
-            console.log(msg);
-        }
-    }
-    function readFile(path, encoding, callback) {
-        if (cache.hasOwnProperty(path)) {
-            callback(null, cache[path]);
-            return;
-        }
-        var xhr = new XMLHttpRequest();
-        function handleResult() {
-            var data;
-            if (xhr.readyState === 4) {
-                if (xhr.status === 0 && !xhr.responseText) {
-                    // for local files there is no difference between missing
-                    // and empty files, so empty files are considered as errors
-                    callback("File " + path + " is empty.");
-                } else if (xhr.status === 200 || xhr.status === 0) {
-                    // report file
-                    if (encoding === "binary") {
-                        if (typeof VBArray !== "undefined") { // IE9
-                            data = new VBArray(xhr.responseBody).toArray();
-                        } else {
-                            data = self.byteArrayFromString(xhr.responseText,
-                                "binary");
-                        }
-                    } else {
-                        data = xhr.responseText;
-                    }
-                    cache[path] = data;
-                    callback(null, data);
-                } else {
-                    // report error
-                    callback(xhr.responseText || xhr.statusText);
-                }
-            }
-        }
-        xhr.open('GET', path, true);
-        xhr.onreadystatechange = handleResult;
-        if (xhr.overrideMimeType) {
-            if (encoding !== "binary") {
-                xhr.overrideMimeType("text/plain; charset=" + encoding);
-            } else {
-                xhr.overrideMimeType("text/plain; charset=x-user-defined");
-            }
-        }
-        try {
-            xhr.send(null);
-        } catch (e) {
-            callback(e.message);
-        }
-    }
-    function read(path, offset, length, callback) {
-        if (cache.hasOwnProperty(path)) {
-            callback(null, cache[path].slice(offset, offset + length));
-            return;
-        }
-        var xhr = new XMLHttpRequest();
-        function handleResult() {
-            var data;
-            if (xhr.readyState === 4) {
-                if (xhr.status === 0 && !xhr.responseText) {
-                    // for local files there is no difference between missing
-                    // and empty files, so empty files are considered as errors
-                    callback("File " + path + " is empty.");
-                } else if (xhr.status === 200 || xhr.status === 0) {
-                    // report file
-                    if (typeof VBArray !== "undefined") {
-                        data = new VBArray(xhr.responseBody).toArray();
-                    } else {
-                        data = self.byteArrayFromString(xhr.responseText, "binary");
-                    }
-                    cache[path] = data;
-                    callback(null, data.slice(offset, offset + length));
-                } else {
-                    // report error
-                    callback(xhr.responseText || xhr.statusText);
-                }
-            }
-        }
-        xhr.open('GET', path, true);
-        xhr.onreadystatechange = handleResult;
-        if (xhr.overrideMimeType) {
-            xhr.overrideMimeType("text/plain; charset=x-user-defined");
-        }
-        //xhr.setRequestHeader('Range', 'bytes=' + offset + '-' +
-        //       (offset + length - 1));
-        try {
-            xhr.send(null);
-        } catch (e) {
-            callback(e.message);
-        }
-    }
-    function readFileSync(path, encoding) {
-        var xhr = new XMLHttpRequest(),
-            result;
-        xhr.open('GET', path, false);
-        if (xhr.overrideMimeType) {
-            if (encoding !== "binary") {
-                xhr.overrideMimeType("text/plain; charset=" + encoding);
-            } else {
-                xhr.overrideMimeType("text/plain; charset=x-user-defined");
-            }
-        }
-        try {
-            xhr.send(null);
-            if (xhr.status === 200 || xhr.status === 0) {
-                result = xhr.responseText;
-            }
-        } catch (e) {
-        }
-        return result;
-    }
-    function writeFile(path, data, callback) {
-        cache[path] = data;
-        var xhr = new XMLHttpRequest();
-        function handleResult() {
-            if (xhr.readyState === 4) {
-                if (xhr.status === 0 && !xhr.responseText) {
-                    // for local files there is no difference between missing
-                    // and empty files, so empty files are considered as errors
-                    callback("File " + path + " is empty.");
-                } else if ((xhr.status >= 200 && xhr.status < 300) ||
-                           xhr.status === 0) {
-                    // report success
-                    callback(null);
-                } else {
-                    // report error
-                    callback("Status " + String(xhr.status) + ": " +
-                            xhr.responseText || xhr.statusText);
-                }
-            }
-        }
-        xhr.open('PUT', path, true);
-        xhr.onreadystatechange = handleResult;
-        // ArrayBufferView will have an ArrayBuffer property, in WebKit, XHR can send()
-        // an ArrayBuffer, In Firefox, one must use sendAsBinary with a string
-        if (data.buffer && !xhr.sendAsBinary) {
-            data = data.buffer; // webkit supports sending an ArrayBuffer
-        } else {
-            // encode into a string, this works in FireFox >= 3
-            data = self.byteArrayToString(data, "binary");
-        }
-        try {
-            if (xhr.sendAsBinary) {
-                xhr.sendAsBinary(data);
-            } else {
-                xhr.send(data);
-            }
-        } catch (e) {
-            self.log("HUH? " + e + " " + data);
-            callback(e.message);
-        }
-    }
-    function deleteFile(path, callback) {
-        var xhr = new XMLHttpRequest();
-        xhr.open('DELETE', path, true);
-        xhr.onreadystatechange = function () {
-            if (xhr.readyState === 4) {
-                if (xhr.status < 200 && xhr.status >= 300) {
-                    callback(xhr.responseText);
-                } else {
-                    callback(null);
-                }
-            }
-        };
-        xhr.send(null);
-    }
-    function loadXML(path, callback) {
-        var xhr = new XMLHttpRequest();
-        function handleResult() {
-            if (xhr.readyState === 4) {
-                if (xhr.status === 0 && !xhr.responseText) {
-                    callback("File " + path + " is empty.");
-                } else if (xhr.status === 200 || xhr.status === 0) {
-                    // report file
-                    callback(null, xhr.responseXML);
-                } else {
-                    // report error
-                    callback(xhr.responseText);
-                }
-            }
-        }
-        xhr.open("GET", path, true);
-        if (xhr.overrideMimeType) {
-            xhr.overrideMimeType("text/xml");
-        }
-        xhr.onreadystatechange = handleResult;
-        try {
-            xhr.send(null);
-        } catch (e) {
-            callback(e.message);
-        }
-    }
-    function isFile(path, callback) {
-        self.getFileSize(path, function (size) {
-            callback(size !== -1);
-        });
-    }
-    function getFileSize(path, callback) {
-        var xhr = new XMLHttpRequest();
-        xhr.open("HEAD", path, true);
-        xhr.onreadystatechange = function () {
-            if (xhr.readyState !== 4) {
-                return;
-            }
-            var cl = xhr.getResponseHeader("Content-Length");
-            if (cl) {
-                callback(parseInt(cl, 10));
-            } else {
-                callback(-1);
-            }
-        };
-        xhr.send(null);
-    }
-    function wrap(nativeFunction, nargs) {
-        if (!nativeFunction) {
-            return null;
-        }
-        return function () {
-            // clear cache
-            cache = {};
-            // assume the last argument is a callback function
-            var callback = arguments[nargs],
-                args = Array.prototype.slice.call(arguments, 0, nargs),
-                callbackname = "callback" + String(Math.random()).substring(2);
-            window[callbackname] = function () {
-                delete window[callbackname];
-                callback.apply(this, arguments);
-            };
-            args.push(callbackname);
-            nativeFunction.apply(this, args);
-        };
-    }
-    this.readFile = readFile;
-    this.read = read;
-    this.readFileSync = readFileSync;
-    this.writeFile = writeFile;
-    this.deleteFile = deleteFile;
-    this.loadXML = loadXML;
-    this.isFile = isFile;
-    this.getFileSize = getFileSize;
-    this.log = log;
-    this.setTimeout = function (f, msec) {
-        setTimeout(function () {
-            f();
-        }, msec);
-    };
-    this.libraryPaths = function () {
-        return ["lib"]; // TODO: find a good solution
-                                       // probably let html app specify it
-    };
-    this.setCurrentDirectory = function (dir) {
-    };
-    this.type = function () {
-        return "BrowserRuntime";
-    };
-    this.getDOMImplementation = function () {
-        return window.document.implementation;
-    };
-    this.exit = function (exitCode) {
-        log("Calling exit with code " + String(exitCode) +
-                ", but exit() is not implemented.");
-    };
-    this.getWindow = function () {
-        return window;
-    };
-}
-
-/**
- * @constructor
- * @implements {Runtime}
- */
-function NodeJSRuntime() {
-    "use strict";
-    var self = this,
-        fs = require('fs'),
-        currentDirectory = "";
-
-    /**
-     * @constructor
-     * @extends {Runtime.ByteArray}
-     * @param {!number} size
-     */
-    this.ByteArray = function (size) {
-        return new Buffer(size);
-    };
-
-    this.byteArrayFromArray = function (array) {
-        var ba = new Buffer(array.length),
-            i,
-            l = array.length;
-        for (i = 0; i < l; i += 1) {
-            ba[i] = array[i];
-        }
-        return ba;
-    };
-
-    this.concatByteArrays = function (a, b) {
-        var ba = new Buffer(a.length + b.length);
-        a.copy(ba, 0, 0);
-        b.copy(ba, a.length, 0);
-        return ba;
-    };
-
-    this.byteArrayFromString = function (string, encoding) {
-        return new Buffer(string, encoding);
-    };
-
-    this.byteArrayToString = function (bytearray, encoding) {
-        return bytearray.toString(encoding);
-    };
-
-    function isFile(path, callback) {
-        if (currentDirectory) {
-            path = currentDirectory + "/" + path;
-        }
-        fs.stat(path, function (err, stats) {
-            callback(!err && stats.isFile());
-        });
-    }
-    function loadXML(path, callback) {
-        throw "Not implemented.";
-    }
-    this.readFile = function (path, encoding, callback) {
-        if (encoding !== "binary") {
-            fs.readFile(path, encoding, callback);
-        } else {
-            fs.readFile(path, null, callback);
-/*
-            // we have to encode the returned buffer to a string
-            // it would be nice if we would have a blob or buffer object
-            fs.readFile(path, null, function (err, data) {
-                if (err) {
-                    callback(err);
-                    return;
-                }
-                callback(null, data.toString("binary"));
-            });
-*/
-        }
-    };
-    this.writeFile = function (path, data, callback) {
-        fs.writeFile(path, data, "binary", function (err) {
-            callback(err || null);
-        });
-    };
-    this.deleteFile = fs.unlink;
-    this.read = function (path, offset, length, callback) {
-        if (currentDirectory) {
-            path = currentDirectory + "/" + path;
-        }
-        fs.open(path, "r+", 666, function (err, fd) {
-            if (err) {
-                callback(err);
-                return;
-            }
-            var buffer = new Buffer(length);
-            fs.read(fd, buffer, 0, length, offset, function (err, bytesRead) {
-                fs.close(fd);
-                callback(err, buffer);
-            });
-        });
-    };
-    this.readFileSync = function (path, encoding) {
-        if (!encoding) {
-            return "";
-        }
-        return fs.readFileSync(path, encoding);
-    };
-    this.loadXML = loadXML;
-    this.isFile = isFile;
-    this.getFileSize = function (path, callback) {
-        if (currentDirectory) {
-            path = currentDirectory + "/" + path;
-        }
-        fs.stat(path, function (err, stats) {
-            if (err) {
-                callback(-1);
-            } else {
-                callback(stats.size);
-            }
-        });
-    };
-    this.log = function (msg) {
-        process.stderr.write(msg + '\n');
-    };
-    this.setTimeout = function (f, msec) {
-        setTimeout(function () {
-            f();
-        }, msec);
-    };
-    this.libraryPaths = function () {
-        return [__dirname];
-    };
-    this.setCurrentDirectory = function (dir) {
-        currentDirectory = dir;
-    };
-    this.currentDirectory = function () {
-        return currentDirectory;
-    };
-    this.type = function () {
-        return "NodeJSRuntime";
-    };
-    this.getDOMImplementation = function () {
-        return null;
-    };
-    this.exit = process.exit;
-    this.getWindow = function () {
-        return null;
-    };
-}
-
-/**
- * @constructor
- * @implements {Runtime}
- */
-function RhinoRuntime() {
-    "use strict";
-    var self = this,
-        dom = Packages.javax.xml.parsers.DocumentBuilderFactory.newInstance(),
-        builder,
-        entityresolver,
-        currentDirectory = "";
-    dom.setValidating(false);
-    dom.setNamespaceAware(true);
-    dom.setExpandEntityReferences(false);
-    dom.setSchema(null);
-    entityresolver = Packages.org.xml.sax.EntityResolver({
-        resolveEntity: function (publicId, systemId) {
-            var file, open = function (path) {
-                var reader = new Packages.java.io.FileReader(path),
-                    source = new Packages.org.xml.sax.InputSource(reader);
-                return source;
-            };
-            file = systemId;
-            //file = /[^\/]*$/.exec(systemId); // what should this do?
-            return open(file);
-        }
-    });
-    //dom.setEntityResolver(entityresolver);
-    builder = dom.newDocumentBuilder();
-    builder.setEntityResolver(entityresolver);
-
-    /**
-     * @constructor
-     * @param {!number} size
-     */
-    this.ByteArray = function ByteArray(size) {
-        return [size];
-    };
-    this.byteArrayFromArray = function (array) {
-        return array;
-    };
-    this.byteArrayFromString = function (string, encoding) {
-        // ignore encoding for now
-        var a = [], i, l = string.length;
-        for (i = 0; i < l; i += 1) {
-            a[i] = string.charCodeAt(i) & 0xff;
-        }
-        return a;
-    };
-    this.byteArrayToString = Runtime.byteArrayToString;
-    this.concatByteArrays = function (bytearray1, bytearray2) {
-        return bytearray1.concat(bytearray2);
-    };
-
-    function loadXML(path, callback) {
-        var file = new Packages.java.io.File(path),
-            document;
-        try {
-            document = builder.parse(file);
-        } catch (err) {
-            print(err);
-            callback(err);
-            return;
-        }
-        callback(null, document);
-    }
-    function runtimeReadFile(path, encoding, callback) {
-        var file = new Packages.java.io.File(path),
-            data,
-            // read binary, seems hacky but works
-            rhinoencoding = (encoding === "binary") ? "latin1" : encoding;
-        if (!file.isFile()) {
-            callback(path + " is not a file.");
-        } else {
-            data = readFile(path, rhinoencoding);
-            if (encoding === "binary") {
-                data = self.byteArrayFromString(data, "binary");
-            }
-            callback(null, data);
-        }
-    }
-    /**
-     * @param {!string} path
-     * @param {!string} encoding
-     * @return {?string}
-     */
-    function runtimeReadFileSync(path, encoding) {
-        var file = new Packages.java.io.File(path), data, i;
-        if (!file.isFile()) {
-            return null;
-        }
-        if (encoding === "binary") {
-            encoding = "latin1"; // read binary, seems hacky but works
-        }
-        return readFile(path, encoding);
-    }
-    function isFile(path, callback) {
-        if (currentDirectory) {
-            path = currentDirectory + "/" + path;
-        }
-        var file = new Packages.java.io.File(path);
-        callback(file.isFile());
-    }
-    this.loadXML = loadXML;
-    this.readFile = runtimeReadFile;
-    this.writeFile = function (path, data, callback) {
-        var out = new Packages.java.io.FileOutputStream(path),
-            i,
-            l = data.length;
-        for (i = 0; i < l; i += 1) {
-            out.write(data[i]);
-        }
-        out.close();
-        callback(null);
-    };
-    this.deleteFile = function (path, callback) {
-        var file = new Packages.java.io.File(path);
-        if (file['delete']()) {
-            callback(null);
-        } else {
-            callback("Could not delete " + path);
-        }
-    };
-    this.read = function (path, offset, length, callback) {
-        // TODO: adapt to read only a part instead of the whole file
-        if (currentDirectory) {
-            path = currentDirectory + "/" + path;
-        }
-        var data = runtimeReadFileSync(path, "binary");
-        if (data) {
-            callback(null, this.byteArrayFromString(
-                data.substring(offset, offset + length),
-                "binary"
-            ));
-        } else {
-            callback("Cannot read " + path);
-        }
-    };
-    this.readFileSync = function (path, encoding) {
-        if (!encoding) {
-            return "";
-        }
-        return readFile(path, encoding);
-    };
-    this.isFile = isFile;
-    this.getFileSize = function (path, callback) {
-        if (currentDirectory) {
-            path = currentDirectory + "/" + path;
-        }
-        var file = new Packages.java.io.File(path);
-        callback(file.length());
-    };
-    this.log = print;
-    this.setTimeout = function (f, msec) {
-        f();
-    };
-    this.libraryPaths = function () {
-        return ["lib"];
-    };
-    this.setCurrentDirectory = function (dir) {
-        currentDirectory = dir;
-    };
-    this.currentDirectory = function () {
-        return currentDirectory;
-    };
-    this.type = function () {
-        return "RhinoRuntime";
-    };
-    this.getDOMImplementation = function () {
-        return builder.getDOMImplementation();
-    };
-    this.exit = quit;
-    this.getWindow = function () {
-        return null;
-    };
-}
-
-/**
- * @const
- * @type {Runtime}
- */
-var runtime = (function () {
-    "use strict";
-    var result;
-    if (typeof window !== "undefined") {
-        result = new BrowserRuntime(window.document.getElementById("logoutput"));
-    } else if (typeof require !== "undefined") {
-        result = new NodeJSRuntime();
-    } else {
-        result = new RhinoRuntime();
-    }
-    return result;
-}());
-/*jslint sloppy: true*/
-(function () {
-    var cache = {},
-        dircontents = {};
-    function getOrDefinePackage(packageNameComponents) {
-        var topname = packageNameComponents[0],
-            i,
-            pkg;
-        // ensure top level package exists
-        pkg = eval("if (typeof " + topname + " === 'undefined') {" +
-                "eval('" + topname + " = {};');}" + topname);
-        for (i = 1; i < packageNameComponents.length - 1; i += 1) {
-            if (!pkg.hasOwnProperty(packageNameComponents[i])) {
-                pkg = pkg[packageNameComponents[i]] = {};
-            }
-        }
-        return pkg[packageNameComponents[packageNameComponents.length - 1]];
-    }
-    /**
-     * @param {string} classpath
-     * @returns {undefined}
-     */
-    runtime.loadClass = function (classpath) {
-        if (IS_COMPILED_CODE) {
-            return;
-        }
-        if (cache.hasOwnProperty(classpath)) {
-            return;
-        }
-        var names = classpath.split("."),
-            impl;
-        impl = getOrDefinePackage(names);
-        if (impl) {
-            cache[classpath] = true;
-            return;
-        }
-        function getPathFromManifests(classpath) {
-            var path = classpath.replace(".", "/") + ".js",
-                dirs = runtime.libraryPaths(),
-                i,
-                dir,
-                code;
-            if (runtime.currentDirectory) {
-                dirs.push(runtime.currentDirectory());
-            }
-            for (i = 0; i < dirs.length; i += 1) {
-                dir = dirs[i];
-                if (!dircontents.hasOwnProperty(dir)) {
-                    code = runtime.readFileSync(dirs[i] + "/manifest.js",
-                            "utf8");
-                    if (code && code.length) {
-                        try {
-                            dircontents[dir] = eval(code);
-                        } catch (e1) {
-                            dircontents[dir] = null;
-                            runtime.log("Cannot load manifest for " + dir +
-                                    ".");
-                        }
-                    } else {
-                        dircontents[dir] = null;
-                    }
-                }
-                code = null;
-                dir = dircontents[dir];
-                if (dir && dir.indexOf && dir.indexOf(path) !== -1) {
-                    return dirs[i] + "/" + path;
-                }
-            }
-            return null;
-        }
-        function load(classpath) {
-            var code, path;
-            path = getPathFromManifests(classpath);
-            if (!path) {
-                throw classpath + " is not listed in any manifest.js.";
-            }
-            try {
-                code = runtime.readFileSync(path, "utf8");
-            } catch (e2) {
-                runtime.log("Error loading " + classpath + " " + e2);
-                throw e2;
-            }
-            if (code === undefined) {
-                throw "Cannot load class " + classpath;
-            }
-            try {
-                code = eval(classpath + " = eval(code);");
-            } catch (e4) {
-                runtime.log("Error loading " + classpath + " " + e4);
-                throw e4;
-            }
-            return code;
-        }
-        // check if the class in context already
-        impl = load(classpath);
-        if (!impl || Runtime.getFunctionName(impl) !==
-                names[names.length - 1]) {
-            runtime.log("Loaded code is not for " + names[names.length - 1]);
-            throw "Loaded code is not for " + names[names.length - 1];
-        }
-        cache[classpath] = true;
-    };
-}());
-(function (args) {
-    args = Array.prototype.slice.call(args);
-    function run(argv) {
-        if (!argv.length) {
-            return;
-        }
-        var script = argv[0];
-        runtime.readFile(script, "utf8", function (err, code) {
-            var path = "",
-                paths = runtime.libraryPaths();
-            if (script.indexOf("/") !== -1) {
-                path = script.substring(0, script.indexOf("/"));
-            }
-            runtime.setCurrentDirectory(path);
-            function run() {
-                var script, path, paths, args, argv, result; // hide variables
-                // execute script and make arguments available via argv
-                result = eval(code);
-                if (result) {
-                    runtime.exit(result);
-                }
-                return;
-            }
-            if (err) {
-                runtime.log(err);
-                runtime.exit(1);
-            } else {
-                // run the script with arguments bound to arguments parameter
-                run.apply(null, argv);
-            }
-        });
-    }
-    // if rhino or node.js, run the scripts provided as arguments
-    if (runtime.type() === "NodeJSRuntime") {
-        run(process.argv.slice(2));
-    } else if (runtime.type() === "RhinoRuntime") {
-        run(args);
-    } else {
-        run(args.slice(1));
-    }
-}(typeof arguments !== "undefined" && arguments));
-
diff --git a/apps/files_odfviewer/src/webodf/webodf/lib/xmldom/LSSerializer.js b/apps/files_odfviewer/src/webodf/webodf/lib/xmldom/LSSerializer.js
deleted file mode 100644
index 12b3219f81..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/lib/xmldom/LSSerializer.js
+++ /dev/null
@@ -1,197 +0,0 @@
-/**
- * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
- * @licstart
- * The JavaScript code in this page is free software: you can redistribute it
- * and/or modify it under the terms of the GNU Affero General Public License
- * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.  The code is distributed
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
- *
- * As additional permission under GNU AGPL version 3 section 7, you
- * may distribute non-source (e.g., minimized or compacted) forms of
- * that code without the copy of the GNU GPL normally required by
- * section 4, provided you include this license notice and a URL
- * through which recipients can access the Corresponding Source.
- *
- * As a special exception to the AGPL, any HTML file which merely makes function
- * calls to this code, and for that purpose includes it by reference shall be
- * deemed a separate work for copyright law purposes. In addition, the copyright
- * holders of this code give you permission to combine this code with free
- * software libraries that are released under the GNU LGPL. You may copy and
- * distribute such a system following the terms of the GNU AGPL for this code
- * and the LGPL for the libraries. If you modify this code, you may extend this
- * exception to your version of the code, but you are not obligated to do so.
- * If you do not wish to do so, delete this exception statement from your
- * version.
- *
- * This license applies to this entire compilation.
- * @licend
- * @source: http://www.webodf.org/
- * @source: http://gitorious.org/odfkit/webodf/
- */
-/*global xmldom*/
-/*jslint sub: true*/
-if (typeof Object.create !== 'function') {
-    Object['create'] = function (o) {
-        "use strict";
-        /**
-         * @constructor
-         */
-        var F = function () {};
-        F.prototype = o;
-        return new F();
-    };
-}
-
-/**
- * Partial implementation of LSSerializer
- * @constructor
- */
-xmldom.LSSerializer = function LSSerializer() {
-    "use strict";
-    var /**@const@type{!LSSerializer}*/ self = this;
-
-    /**
-     * @param {!string} prefix
-     * @param {!Attr} attr
-     * @return {!string}
-     */
-    function serializeAttribute(prefix, attr) {
-        var /**@type{!string}*/ s = prefix + attr.localName + "=\"" +
-            attr.nodeValue + "\"";
-        return s;
-    }
-    /**
-     * @param {!Object.<string,string>} nsmap
-     * @param {string} prefix
-     * @param {string} ns
-     * @return {!string}
-     */
-    function attributePrefix(nsmap, prefix, ns) {
-        // TODO: check for double prefix definitions, this needs a special class
-        if (nsmap.hasOwnProperty(ns)) {
-            return nsmap[ns] + ":";
-        }
-        if (nsmap[ns] !== prefix) {
-            nsmap[ns] = prefix;
-        }
-        return prefix + ":";
-    }
-    /**
-     * @param {!Object.<string,string>} nsmap
-     * @param {!Node} node
-     * @return {!string}
-     */
-    function startNode(nsmap, node) {
-        var /**@type{!string}*/ s = "",
-            /**@const@type{!NamedNodeMap}*/ atts = node.attributes,
-            /**@const@type{!number}*/ length,
-            /**@type{!number}*/ i,
-            /**@type{!Attr}*/ attr,
-            /**@type{!string}*/ attstr = "",
-            /**@type{!number}*/ accept,
-            /**@type{!string}*/ prefix;
-        if (atts) { // ELEMENT
-            if (nsmap[node.namespaceURI] !== node.prefix) {
-                nsmap[node.namespaceURI] = node.prefix;
-            }
-            s += "<" + node.nodeName;
-            length = atts.length;
-            for (i = 0; i < length; i += 1) {
-                attr = /**@type{!Attr}*/(atts.item(i));
-                if (attr.namespaceURI !== "http://www.w3.org/2000/xmlns/") {
-                    accept = (self.filter) ? self.filter.acceptNode(attr) : 1;
-                    if (accept === 1) {
-                        // xml attributes always need a prefix for a namespace
-                        if (attr.namespaceURI) {
-                           prefix = attributePrefix(nsmap, attr.prefix,
-                                   attr.namespaceURI);
-                        } else {
-                           prefix = "";
-                        }
-                        attstr += " " + serializeAttribute(prefix, attr);
-                    }
-                }
-            }
-            for (i in nsmap) {
-                if (nsmap.hasOwnProperty(i)) {
-                    prefix = nsmap[i];
-                    if (!prefix) {
-                        s += " xmlns=\"" + i + "\"";
-                    } else if (prefix !== "xmlns") {
-                        s += " xmlns:" + nsmap[i] + "=\"" + i + "\"";
-                    }
-                }
-            }
-            s += attstr + ">";
-        }
-        return s;
-    }
-    /**
-     * @param {!Node} node
-     * @return {!string}
-     */
-    function endNode(node) {
-        var /**@type{!string}*/ s = "";
-        if (node.nodeType === 1) { // ELEMENT
-            s += "</" + node.nodeName + ">";
-        }
-        return s;
-    }
-    /**
-     * @param {!Object.<string,string>} parentnsmap
-     * @param {!Node} node
-     * @return {!string}
-     */
-    function serializeNode(parentnsmap, node) {
-        var /**@type{!string}*/ s = "",
-            /**@const@type{!Object.<string,string>}*/ nsmap
-                = Object.create(parentnsmap),
-            /**@const@type{!number}*/ accept
-                = (self.filter) ? self.filter.acceptNode(node) : 1,
-            /**@type{Node}*/child;
-        if (accept === 1) {
-            s += startNode(nsmap, node);
-        }
-        if (accept === 1 || accept === 3) {
-            child = node.firstChild;
-            while (child) {
-                s += serializeNode(nsmap, child);
-                child = child.nextSibling;
-            }
-            if (node.nodeValue) {
-                s += node.nodeValue;
-            }
-        }
-        if (accept === 1) {
-            s += endNode(node);
-        }
-        return s;
-    }
-    function invertMap(map) {
-        var m = {}, i;
-        for (i in map) {
-            if (map.hasOwnProperty(i)) {
-                m[map[i]] = i;
-            }
-        }
-        return m;
-    }
-    /**
-     * @type {xmldom.LSSerializerFilter}
-     */
-    this.filter = null;
-    /**
-     * @param {!Node} node
-     * @param {!Object.<string,string>} nsmap
-     * @return {!string}
-     */
-    this.writeToString = function (node, nsmap) {
-        if (!node) {
-            return "";
-        }
-        nsmap = nsmap ? invertMap(nsmap) : {};
-        return serializeNode(nsmap, node);
-    };
-};
diff --git a/apps/files_odfviewer/src/webodf/webodf/lib/xmldom/LSSerializerFilter.js b/apps/files_odfviewer/src/webodf/webodf/lib/xmldom/LSSerializerFilter.js
deleted file mode 100644
index 889428b831..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/lib/xmldom/LSSerializerFilter.js
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
- * @licstart
- * The JavaScript code in this page is free software: you can redistribute it
- * and/or modify it under the terms of the GNU Affero General Public License
- * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.  The code is distributed
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
- *
- * As additional permission under GNU AGPL version 3 section 7, you
- * may distribute non-source (e.g., minimized or compacted) forms of
- * that code without the copy of the GNU GPL normally required by
- * section 4, provided you include this license notice and a URL
- * through which recipients can access the Corresponding Source.
- *
- * As a special exception to the AGPL, any HTML file which merely makes function
- * calls to this code, and for that purpose includes it by reference shall be
- * deemed a separate work for copyright law purposes. In addition, the copyright
- * holders of this code give you permission to combine this code with free
- * software libraries that are released under the GNU LGPL. You may copy and
- * distribute such a system following the terms of the GNU AGPL for this code
- * and the LGPL for the libraries. If you modify this code, you may extend this
- * exception to your version of the code, but you are not obligated to do so.
- * If you do not wish to do so, delete this exception statement from your
- * version.
- *
- * This license applies to this entire compilation.
- * @licend
- * @source: http://www.webodf.org/
- * @source: http://gitorious.org/odfkit/webodf/
- */
-/*global xmldom*/
-/**
- * Partial implementation of LSSerializerFilter
- * @interface
- */
-xmldom.LSSerializerFilter = function LSSerializerFilter() {
-    "use strict";
-};
diff --git a/apps/files_odfviewer/src/webodf/webodf/lib/xmldom/OperationalTransformDOM.js b/apps/files_odfviewer/src/webodf/webodf/lib/xmldom/OperationalTransformDOM.js
deleted file mode 100644
index 5e9f3abacf..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/lib/xmldom/OperationalTransformDOM.js
+++ /dev/null
@@ -1,115 +0,0 @@
-/**
- * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
- * @licstart
- * The JavaScript code in this page is free software: you can redistribute it
- * and/or modify it under the terms of the GNU Affero General Public License
- * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.  The code is distributed
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
- *
- * As additional permission under GNU AGPL version 3 section 7, you
- * may distribute non-source (e.g., minimized or compacted) forms of
- * that code without the copy of the GNU GPL normally required by
- * section 4, provided you include this license notice and a URL
- * through which recipients can access the Corresponding Source.
- *
- * As a special exception to the AGPL, any HTML file which merely makes function
- * calls to this code, and for that purpose includes it by reference shall be
- * deemed a separate work for copyright law purposes. In addition, the copyright
- * holders of this code give you permission to combine this code with free
- * software libraries that are released under the GNU LGPL. You may copy and
- * distribute such a system following the terms of the GNU AGPL for this code
- * and the LGPL for the libraries. If you modify this code, you may extend this
- * exception to your version of the code, but you are not obligated to do so.
- * If you do not wish to do so, delete this exception statement from your
- * version.
- *
- * This license applies to this entire compilation.
- * @licend
- * @source: http://www.webodf.org/
- * @source: http://gitorious.org/odfkit/webodf/
- */
-/*global xmldom*/
-/**
- * @class
- * @constructor
- * @augments xmldom.OperationalTransformInterface
- * @implements {xmldom.OperationalTransformInterface}
- * @param {Element} root
- * @param {xmldom.LSSerializer} serializer
- */
-xmldom.OperationalTransformDOM = function OperationalTransformDOM(root, serializer) {
-    "use strict";
-    var pos, length;
-    /**
-     * Skip in the document
-     * @param {!number} amount
-     * @return {undefined}
-     */
-    function retain(amount) {}
-    /**
-     * Insert characters
-     * Can throw an exception if the current position does not allow insertion
-     * of characters.
-     * @param {!string} chars
-     * @return {undefined}
-     */
-    function insertCharacters(chars) {}
-    /**
-     * Insert element start
-     * @param {!string} tagname
-     * @param {!Object} attributes
-     * @return {undefined}
-     */
-    function insertElementStart(tagname, attributes) {}
-    /**
-     * Insert element end
-     * @return {undefined}
-     */
-    function insertElementEnd() {}
-    /**
-     * Delete characters
-     * @param {!number} amount
-     * @return {undefined}
-     */
-    function deleteCharacters(amount) {}
-    /**
-     * Delete element start
-     * @return {undefined}
-     */
-    function deleteElementStart() {}
-    /**
-     * Delete element end
-     * @return {undefined}
-     */
-    function deleteElementEnd() {}
-    /**
-     * Replace attributes
-     * @param {!Object} atts
-     * @return {undefined}
-     */
-    function replaceAttributes(atts) {}
-    /**
-     * Update attributes
-     * @param {!Object} atts
-     * @return {undefined}
-     */
-    function updateAttributes(atts) {}
-    /**
-     * @return {!boolean}
-     */
-    function atEnd() {
-        return pos === length;
-    }
-    this.retain = retain;
-    this.insertCharacters = insertCharacters;
-    this.insertElementStart = insertElementStart;
-    this.insertElementEnd = insertElementEnd;
-    this.deleteCharacters = deleteCharacters;
-    this.deleteElementStart = deleteElementStart;
-    this.deleteElementEnd = deleteElementEnd;
-    this.replaceAttributes = replaceAttributes;
-    this.updateAttributes = updateAttributes;
-    this.atEnd = atEnd;
-};
diff --git a/apps/files_odfviewer/src/webodf/webodf/lib/xmldom/OperationalTransformInterface.js b/apps/files_odfviewer/src/webodf/webodf/lib/xmldom/OperationalTransformInterface.js
deleted file mode 100644
index 03aab1232b..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/lib/xmldom/OperationalTransformInterface.js
+++ /dev/null
@@ -1,97 +0,0 @@
-/**
- * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
- * @licstart
- * The JavaScript code in this page is free software: you can redistribute it
- * and/or modify it under the terms of the GNU Affero General Public License
- * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.  The code is distributed
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
- *
- * As additional permission under GNU AGPL version 3 section 7, you
- * may distribute non-source (e.g., minimized or compacted) forms of
- * that code without the copy of the GNU GPL normally required by
- * section 4, provided you include this license notice and a URL
- * through which recipients can access the Corresponding Source.
- *
- * As a special exception to the AGPL, any HTML file which merely makes function
- * calls to this code, and for that purpose includes it by reference shall be
- * deemed a separate work for copyright law purposes. In addition, the copyright
- * holders of this code give you permission to combine this code with free
- * software libraries that are released under the GNU LGPL. You may copy and
- * distribute such a system following the terms of the GNU AGPL for this code
- * and the LGPL for the libraries. If you modify this code, you may extend this
- * exception to your version of the code, but you are not obligated to do so.
- * If you do not wish to do so, delete this exception statement from your
- * version.
- *
- * This license applies to this entire compilation.
- * @licend
- * @source: http://www.webodf.org/
- * @source: http://gitorious.org/odfkit/webodf/
- */
-/*global xmldom*/
-/**
- * This interface allows a document to be modified by operational
- * transformations. The interface is modelled after Google Wave.
- * Manual editing of XML documents will also be done via this interface.
- *
- * 
- * @class
- * @interface
- */
-xmldom.OperationalTransformInterface = function () {"use strict"; };
-/**
- * Skip in the document
- * @param {!number} amount
- * @return {undefined}
- */
-xmldom.OperationalTransformInterface.prototype.retain = function (amount) {"use strict"; };
-/**
- * Insert characters
- * Can throw an exception if the current position does not allow insertion of
- * characters.
- * @param {!string} chars
- * @return {undefined}
- */
-xmldom.OperationalTransformInterface.prototype.insertCharacters = function (chars) {"use strict"; };
-/**
- * Insert element start
- * @param {!string} tagname
- * @param {!Object} attributes
- * @return {undefined}
- */
-xmldom.OperationalTransformInterface.prototype.insertElementStart = function (tagname, attributes) {"use strict"; };
-/**
- * Insert element end
- * @return {undefined}
- */
-xmldom.OperationalTransformInterface.prototype.insertElementEnd = function () {"use strict"; };
-/**
- * Delete characters
- * @param {!number} amount
- * @return {undefined}
- */
-xmldom.OperationalTransformInterface.prototype.deleteCharacters = function (amount) {"use strict"; };
-/**
- * Delete element start
- * @return {undefined}
- */
-xmldom.OperationalTransformInterface.prototype.deleteElementStart = function () {"use strict"; };
-/**
- * Delete element end
- * @return {undefined}
- */
-xmldom.OperationalTransformInterface.prototype.deleteElementEnd = function () {"use strict"; };
-/**
- * Replace attributes
- * @param {!Object} atts
- * @return {undefined}
- */
-xmldom.OperationalTransformInterface.prototype.replaceAttributes = function (atts) {"use strict"; };
-/**
- * Update attributes
- * @param {!Object} atts
- * @return {undefined}
- */
-xmldom.OperationalTransformInterface.prototype.updateAttributes = function (atts) {"use strict"; };
diff --git a/apps/files_odfviewer/src/webodf/webodf/lib/xmldom/RelaxNG.js b/apps/files_odfviewer/src/webodf/webodf/lib/xmldom/RelaxNG.js
deleted file mode 100644
index e04c3c7611..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/lib/xmldom/RelaxNG.js
+++ /dev/null
@@ -1,691 +0,0 @@
-/**
- * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
- * @licstart
- * The JavaScript code in this page is free software: you can redistribute it
- * and/or modify it under the terms of the GNU Affero General Public License
- * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.  The code is distributed
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
- *
- * As additional permission under GNU AGPL version 3 section 7, you
- * may distribute non-source (e.g., minimized or compacted) forms of
- * that code without the copy of the GNU GPL normally required by
- * section 4, provided you include this license notice and a URL
- * through which recipients can access the Corresponding Source.
- *
- * As a special exception to the AGPL, any HTML file which merely makes function
- * calls to this code, and for that purpose includes it by reference shall be
- * deemed a separate work for copyright law purposes. In addition, the copyright
- * holders of this code give you permission to combine this code with free
- * software libraries that are released under the GNU LGPL. You may copy and
- * distribute such a system following the terms of the GNU AGPL for this code
- * and the LGPL for the libraries. If you modify this code, you may extend this
- * exception to your version of the code, but you are not obligated to do so.
- * If you do not wish to do so, delete this exception statement from your
- * version.
- *
- * This license applies to this entire compilation.
- * @licend
- * @source: http://www.webodf.org/
- * @source: http://gitorious.org/odfkit/webodf/
- */
-/*global runtime: true, xmldom: true*/
-
-/**
- * RelaxNG can check a DOM tree against a Relax NG schema
- * The RelaxNG implementation is currently not complete. Relax NG should not
- * report errors on valid DOM trees, but it will not check all constraints that
- * a Relax NG file can define. The current implementation does not load external
- * parts of a Relax NG file.
- * The main purpose of this Relax NG engine is to validate runtime ODF
- * documents. The DOM tree is traversed via a TreeWalker. A custom TreeWalker
- * implementation can hide parts of a DOM tree. This is useful in WebODF, where
- * special elements and attributes in the runtime DOM tree.
- *
- * implementation according to
- * http://www.thaiopensource.com/relaxng/derivative.html
- */
-runtime.loadClass("xmldom.RelaxNGParser");
-/**
- * @constructor
- */
-xmldom.RelaxNG = function RelaxNG() {
-    "use strict";
-    var xmlnsns = "http://www.w3.org/2000/xmlns/",
-        createChoice,
-        createInterleave,
-        createGroup,
-        createAfter,
-        createOneOrMore,
-        createValue,
-        createAttribute,
-        createNameClass,
-        createData,
-        makePattern,
-        notAllowed = {
-            type: "notAllowed",
-            nullable: false,
-            hash: "notAllowed",
-            textDeriv: function () { return notAllowed; },
-            startTagOpenDeriv: function () { return notAllowed; },
-            attDeriv: function () { return notAllowed; },
-            startTagCloseDeriv: function () { return notAllowed; },
-            endTagDeriv: function () { return notAllowed; }
-        },
-        empty = {
-            type: "empty",
-            nullable: true,
-            hash: "empty",
-            textDeriv: function () { return notAllowed; },
-            startTagOpenDeriv: function () { return notAllowed; },
-            attDeriv: function (context, attribute) { return notAllowed; },
-            startTagCloseDeriv: function () { return empty; },
-            endTagDeriv: function () { return notAllowed; }
-        },
-        text = {
-            type: "text",
-            nullable: true,
-            hash: "text",
-            textDeriv: function () { return text; },
-            startTagOpenDeriv: function () { return notAllowed; },
-            attDeriv: function () { return notAllowed; },
-            startTagCloseDeriv: function () { return text; },
-            endTagDeriv: function () { return notAllowed; }
-        },
-        applyAfter,
-        childDeriv,
-        rootPattern;
-
-    function memoize0arg(func) {
-        return (function () {
-            var cache;
-            return function () {
-                if (cache === undefined) {
-                    cache = func();
-                }
-                return cache;
-            };
-        }());
-    }
-    function memoize1arg(type, func) {
-        return (function () {
-            var cache = {}, cachecount = 0;
-            return function (a) {
-                var ahash = a.hash || a.toString(),
-                    v;
-                v = cache[ahash];
-                if (v !== undefined) {
-                    return v;
-                }
-                cache[ahash] = v = func(a);
-                v.hash = type + cachecount.toString();
-                cachecount += 1;
-                return v;
-            };
-        }());
-    }
-    function memoizeNode(func) {
-        return (function () {
-            var cache = {};
-            return function (node) {
-                var v, m;
-                m = cache[node.localName];
-                if (m === undefined) {
-                    cache[node.localName] = m = {};
-                } else {
-                    v = m[node.namespaceURI];
-                    if (v !== undefined) {
-                        return v;
-                    }
-                }
-                m[node.namespaceURI] = v = func(node);
-                return v;
-            };
-        }());
-    }
-    function memoize2arg(type, fastfunc, func) {
-        return (function () {
-            var cache = {}, cachecount = 0;
-            return function (a, b) {
-                var v = fastfunc && fastfunc(a, b),
-                    ahash, bhash, m;
-                if (v !== undefined) { return v; }
-                ahash = a.hash || a.toString();
-                bhash = b.hash || b.toString();
-                m = cache[ahash];
-                if (m === undefined) {
-                    cache[ahash] = m = {};
-                } else {
-                    v = m[bhash];
-                    if (v !== undefined) {
-                        return v;
-                    }
-                }
-                m[bhash] = v = func(a, b);
-                v.hash = type + cachecount.toString();
-                cachecount += 1;
-                return v;
-            };
-        }());
-    }
-    // this memoize function can be used for functions where the order of two
-    // arguments is not important
-    function unorderedMemoize2arg(type, fastfunc, func) {
-        return (function () {
-            var cache = {}, cachecount = 0;
-            return function (a, b) {
-                var v = fastfunc && fastfunc(a, b),
-                    ahash, bhash, m;
-                if (v !== undefined) { return v; }
-                ahash = a.hash || a.toString();
-                bhash = b.hash || b.toString();
-                if (ahash < bhash) {
-                    m = ahash; ahash = bhash; bhash = m;
-                    m = a; a = b; b = m;
-                }
-                m = cache[ahash];
-                if (m === undefined) {
-                    cache[ahash] = m = {};
-                } else {
-                    v = m[bhash];
-                    if (v !== undefined) {
-                        return v;
-                    }
-                }
-                m[bhash] = v = func(a, b);
-                v.hash = type + cachecount.toString();
-                cachecount += 1;
-                return v;
-            };
-        }());
-    }
-    function getUniqueLeaves(leaves, pattern) {
-        if (pattern.p1.type === "choice") {
-            getUniqueLeaves(leaves, pattern.p1);
-        } else {
-            leaves[pattern.p1.hash] = pattern.p1;
-        }
-        if (pattern.p2.type === "choice") {
-            getUniqueLeaves(leaves, pattern.p2);
-        } else {
-            leaves[pattern.p2.hash] = pattern.p2;
-        }
-    }
-    createChoice = memoize2arg("choice", function (p1, p2) {
-        if (p1 === notAllowed) { return p2; }
-        if (p2 === notAllowed) { return p1; }
-        if (p1 === p2) { return p1; }
-    }, function (p1, p2) {
-        function makeChoice(p1, p2) {
-            return {
-                type: "choice",
-                p1: p1,
-                p2: p2,
-                nullable: p1.nullable || p2.nullable,
-                textDeriv: function (context, text) {
-                    return createChoice(p1.textDeriv(context, text),
-                        p2.textDeriv(context, text));
-                },
-                startTagOpenDeriv: memoizeNode(function (node) {
-                    return createChoice(p1.startTagOpenDeriv(node),
-                        p2.startTagOpenDeriv(node));
-                }),
-                attDeriv: function (context, attribute) {
-                    return createChoice(p1.attDeriv(context, attribute),
-                        p2.attDeriv(context, attribute));
-                },
-                startTagCloseDeriv: memoize0arg(function () {
-                    return createChoice(p1.startTagCloseDeriv(),
-                        p2.startTagCloseDeriv());
-                }),
-                endTagDeriv: memoize0arg(function () {
-                    return createChoice(p1.endTagDeriv(), p2.endTagDeriv());
-                })
-            };
-        }
-        var leaves = {}, i;
-        getUniqueLeaves(leaves, {p1: p1, p2: p2});
-        p1 = undefined;
-        p2 = undefined;
-        for (i in leaves) {
-            if (leaves.hasOwnProperty(i)) {
-                if (p1 === undefined) {
-                    p1 = leaves[i];
-                } else if (p2 === undefined) {
-                    p2 = leaves[i];
-                } else {
-                    p2 = createChoice(p2, leaves[i]);
-                }
-            }
-        }
-        return makeChoice(p1, p2);
-    });
-    createInterleave = unorderedMemoize2arg("interleave", function (p1, p2) {
-        if (p1 === notAllowed || p2 === notAllowed) { return notAllowed; }
-        if (p1 === empty) { return p2; }
-        if (p2 === empty) { return p1; }
-    }, function (p1, p2) {
-        return {
-            type: "interleave",
-            p1: p1,
-            p2: p2,
-            nullable: p1.nullable && p2.nullable,
-            textDeriv: function (context, text) {
-                return createChoice(
-                    createInterleave(p1.textDeriv(context, text), p2),
-                    createInterleave(p1, p2.textDeriv(context, text))
-                );
-            },
-            startTagOpenDeriv: memoizeNode(function (node) {
-                return createChoice(
-                    applyAfter(function (p) { return createInterleave(p, p2); },
-                               p1.startTagOpenDeriv(node)),
-                    applyAfter(function (p) { return createInterleave(p1, p); },
-                               p2.startTagOpenDeriv(node)));
-            }),
-            attDeriv: function (context, attribute) {
-                return createChoice(
-                    createInterleave(p1.attDeriv(context, attribute), p2),
-                    createInterleave(p1, p2.attDeriv(context, attribute)));
-            },
-            startTagCloseDeriv: memoize0arg(function () {
-                return createInterleave(p1.startTagCloseDeriv(),
-                    p2.startTagCloseDeriv());
-            })
-        };
-    });
-    createGroup = memoize2arg("group", function (p1, p2) {
-        if (p1 === notAllowed || p2 === notAllowed) { return notAllowed; }
-        if (p1 === empty) { return p2; }
-        if (p2 === empty) { return p1; }
-    }, function (p1, p2) {
-        return {
-            type: "group",
-            p1: p1,
-            p2: p2,
-            nullable: p1.nullable && p2.nullable,
-            textDeriv: function (context, text) {
-                var p = createGroup(p1.textDeriv(context, text), p2);
-                if (p1.nullable) {
-                    return createChoice(p, p2.textDeriv(context, text));
-                }
-                return p;
-            },
-            startTagOpenDeriv: function (node) {
-                var x = applyAfter(function (p) { return createGroup(p, p2); },
-                        p1.startTagOpenDeriv(node));
-                if (p1.nullable) {
-                    return createChoice(x, p2.startTagOpenDeriv(node));
-                }
-                return x;
-            },
-            attDeriv: function (context, attribute) {
-                return createChoice(
-                    createGroup(p1.attDeriv(context, attribute), p2),
-                    createGroup(p1, p2.attDeriv(context, attribute)));
-            },
-            startTagCloseDeriv: memoize0arg(function () {
-                return createGroup(p1.startTagCloseDeriv(),
-                    p2.startTagCloseDeriv());
-            })
-        };
-    });
-    createAfter = memoize2arg("after", function (p1, p2) {
-        if (p1 === notAllowed || p2 === notAllowed) { return notAllowed; }
-    }, function (p1, p2) {
-        return {
-            type: "after",
-            p1: p1,
-            p2: p2,
-            nullable: false,
-            textDeriv: function (context, text) {
-                return createAfter(p1.textDeriv(context, text), p2);
-            },
-            startTagOpenDeriv: memoizeNode(function (node) {
-                return applyAfter(function (p) { return createAfter(p, p2); },
-                    p1.startTagOpenDeriv(node));
-            }),
-            attDeriv: function (context, attribute) {
-                return createAfter(p1.attDeriv(context, attribute), p2);
-            },
-            startTagCloseDeriv: memoize0arg(function () {
-                return createAfter(p1.startTagCloseDeriv(), p2);
-            }),
-            endTagDeriv: memoize0arg(function () {
-                return (p1.nullable) ? p2 : notAllowed;
-            })
-        };
-    });
-    createOneOrMore = memoize1arg("oneormore", function (p) {
-        if (p === notAllowed) { return notAllowed; }
-        return {
-            type: "oneOrMore",
-            p: p,
-            nullable: p.nullable,
-            textDeriv: function (context, text) {
-                return createGroup(p.textDeriv(context, text),
-                            createChoice(this, empty));
-            },
-            startTagOpenDeriv: function (node) {
-                var oneOrMore = this;
-                return applyAfter(function (pf) {
-                    return createGroup(pf, createChoice(oneOrMore, empty));
-                }, p.startTagOpenDeriv(node));
-            },
-            attDeriv: function (context, attribute) {
-                var oneOrMore = this;
-                return createGroup(p.attDeriv(context, attribute),
-                    createChoice(oneOrMore, empty));
-            },
-            startTagCloseDeriv: memoize0arg(function () {
-                return createOneOrMore(p.startTagCloseDeriv());
-            })
-        };
-    });
-    function createElement(nc, p) {
-        return {
-            type: "element",
-            nc: nc,
-            nullable: false,
-            textDeriv: function () { return notAllowed; },
-            startTagOpenDeriv: function (node) {
-                if (nc.contains(node)) {
-                    return createAfter(p, empty);
-                }
-                return notAllowed;
-            },
-            attDeriv: function (context, attribute) { return notAllowed; },
-            startTagCloseDeriv: function () { return this; }
-        };
-    }
-    function valueMatch(context, pattern, text) {
-        return (pattern.nullable && /^\s+$/.test(text)) ||
-                pattern.textDeriv(context, text).nullable;
-    }
-    createAttribute = memoize2arg("attribute", undefined, function (nc, p) {
-        return {
-            type: "attribute",
-            nullable: false,
-            nc: nc,
-            p: p,
-            attDeriv: function (context, attribute) {
-                if (nc.contains(attribute) && valueMatch(context, p,
-                        attribute.nodeValue)) {
-                    return empty;
-                }
-                return notAllowed;
-            },
-            startTagCloseDeriv: function () { return notAllowed; }
-        };
-    });
-    function createList() {
-        return {
-            type: "list",
-            nullable: false,
-            hash: "list",
-            textDeriv: function (context, text) {
-                return empty;
-            }
-        };
-    }
-    createValue = memoize1arg("value", function (value) {
-        return {
-            type: "value",
-            nullable: false,
-            value: value,
-            textDeriv: function (context, text) {
-                return (text === value) ? empty : notAllowed;
-            },
-            attDeriv: function () { return notAllowed; },
-            startTagCloseDeriv: function () { return this; }
-        };
-    });
-    createData = memoize1arg("data", function (type) {
-        return {
-            type: "data",
-            nullable: false,
-            dataType: type,
-            textDeriv: function () { return empty; },
-            attDeriv: function () { return notAllowed; },
-            startTagCloseDeriv: function () { return this; }
-        };
-    });
-    function createDataExcept() {
-        return {
-            type: "dataExcept",
-            nullable: false,
-            hash: "dataExcept"
-        };
-    }
-    applyAfter = function applyAfter(f, p) {
-        var result;
-        if (p.type === "after") {
-            result = createAfter(p.p1, f(p.p2));
-        } else if (p.type === "choice") {
-            result = createChoice(applyAfter(f, p.p1), applyAfter(f, p.p2));
-        } else {
-            result = p;
-        }
-        return result;
-    };
-    function attsDeriv(context, pattern, attributes, position) {
-        if (pattern === notAllowed) {
-            return notAllowed;
-        }
-        if (position >= attributes.length) {
-            return pattern;
-        }
-        if (position === 0) {
-            // TODO: loop over attributes to update namespace mapping
-            position = 0;
-        }
-        var a = attributes.item(position);
-        while (a.namespaceURI === xmlnsns) { // always ok
-            position += 1;
-            if (position >= attributes.length) {
-                return pattern;
-            }
-            a = attributes.item(position);
-        }
-        a = attsDeriv(context, pattern.attDeriv(context,
-                attributes.item(position)), attributes, position + 1);
-        return a;
-    }
-    function childrenDeriv(context, pattern, walker) {
-        var element = walker.currentNode,
-            childNode = walker.firstChild(),
-            numberOfTextNodes = 0,
-            childNodes = [], i, p;
-        // simple incomplete implementation: only use non-empty text nodes
-        while (childNode) {
-            if (childNode.nodeType === 1) {
-                childNodes.push(childNode);
-            } else if (childNode.nodeType === 3 &&
-                    !/^\s*$/.test(childNode.nodeValue)) {
-                childNodes.push(childNode.nodeValue);
-                numberOfTextNodes += 1;
-            }
-            childNode = walker.nextSibling();
-        }
-        // if there is no nodes at all, add an empty text node
-        if (childNodes.length === 0) {
-            childNodes = [""];
-        }
-        p = pattern;
-        for (i = 0; p !== notAllowed && i < childNodes.length; i += 1) {
-            childNode = childNodes[i];
-            if (typeof childNode === "string") {
-                if (/^\s*$/.test(childNode)) {
-                    p = createChoice(p, p.textDeriv(context, childNode));
-                } else {
-                    p = p.textDeriv(context, childNode);
-                }
-            } else {
-                walker.currentNode = childNode;
-                p = childDeriv(context, p, walker);
-            }
-        }
-        walker.currentNode = element;
-        return p;
-    }
-    childDeriv = function childDeriv(context, pattern, walker) {
-        var childNode = walker.currentNode, p;
-        p = pattern.startTagOpenDeriv(childNode);
-        p = attsDeriv(context, p, childNode.attributes, 0);
-        p = p.startTagCloseDeriv();
-        p = childrenDeriv(context, p, walker);
-        p = p.endTagDeriv();
-        return p;
-    };
-    function addNames(name, ns, pattern) {
-        if (pattern.e[0].a) {
-            name.push(pattern.e[0].text);
-            ns.push(pattern.e[0].a.ns);
-        } else {
-            addNames(name, ns, pattern.e[0]);
-        }
-        if (pattern.e[1].a) {
-            name.push(pattern.e[1].text);
-            ns.push(pattern.e[1].a.ns);
-        } else {
-            addNames(name, ns, pattern.e[1]);
-        }
-    }
-    createNameClass = function createNameClass(pattern) {
-        var name, ns, hash, i, result;
-        if (pattern.name === "name") {
-            name = pattern.text;
-            ns = pattern.a.ns;
-            result = {
-                name: name,
-                ns: ns,
-                hash: "{" + ns + "}" + name,
-                contains: function (node) {
-                    return node.namespaceURI === ns && node.localName === name;
-                }
-            };
-        } else if (pattern.name === "choice") {
-            name = [];
-            ns = [];
-            addNames(name, ns, pattern);
-            hash = "";
-            for (i = 0; i < name.length; i += 1) {
-                 hash += "{" + ns[i] + "}" + name[i] + ",";
-            }
-            result = {
-                hash: hash,
-                contains: function (node) {
-                    var i;
-                    for (i = 0; i < name.length; i += 1) {
-                        if (name[i] === node.localName &&
-                                ns[i] === node.namespaceURI) {
-                            return true;
-                        }
-                    }
-                    return false;
-                }
-            };
-        } else {
-            result = {
-                hash: "anyName",
-                contains: function () { return true; }
-            };
-        }
-        return result;
-    };
-    function resolveElement(pattern, elements) {
-        var element, p, i, hash;
-        // create an empty object in the store to enable circular
-        // dependencies
-        hash = "element" + pattern.id.toString();
-        p = elements[pattern.id] = { hash: hash };
-        element = createElement(createNameClass(pattern.e[0]),
-            makePattern(pattern.e[1], elements));
-        // copy the properties of the new object into the predefined one
-        for (i in element) {
-            if (element.hasOwnProperty(i)) {
-                p[i] = element[i];
-            }
-        }
-        return p;
-    }
-    makePattern = function makePattern(pattern, elements) {
-        var p, i;
-        if (pattern.name === "elementref") {
-            p = pattern.id || 0;
-            pattern = elements[p];
-            if (pattern.name !== undefined) {
-                return resolveElement(pattern, elements);
-            }
-            return pattern;
-        }
-        switch (pattern.name) {
-            case 'empty':
-                return empty;
-            case 'notAllowed':
-                return notAllowed;
-            case 'text':
-                return text;
-            case 'choice':
-                return createChoice(makePattern(pattern.e[0], elements),
-                    makePattern(pattern.e[1], elements));
-            case 'interleave':
-                p = makePattern(pattern.e[0], elements);
-                for (i = 1; i < pattern.e.length; i += 1) {
-                    p = createInterleave(p, makePattern(pattern.e[i],
-                            elements));
-                }
-                return p;
-            case 'group':
-                return createGroup(makePattern(pattern.e[0], elements),
-                    makePattern(pattern.e[1], elements));
-            case 'oneOrMore':
-                return createOneOrMore(makePattern(pattern.e[0], elements));
-            case 'attribute':
-                return createAttribute(createNameClass(pattern.e[0]),
-                    makePattern(pattern.e[1], elements));
-            case 'value':
-                return createValue(pattern.text);
-            case 'data':
-                p = pattern.a && pattern.a.type;
-                if (p === undefined) {
-                    p = "";
-                }
-                return createData(p);
-            case 'list':
-                return createList();
-        }
-        throw "No support for " + pattern.name;
-    };
-    this.makePattern = function (pattern, elements) {
-        var copy = {}, i;
-        for (i in elements) {
-            if (elements.hasOwnProperty(i)) {
-                copy[i] = elements[i];
-            }
-        }
-        i = makePattern(pattern, copy);
-        return i;
-    };
-    /**
-     * Validate the elements pointed to by the TreeWalker
-     * @param {!TreeWalker} walker
-     * @param {!function(Array.<string>):undefined} callback
-     * @return {undefined}
-     */
-    this.validate = function validate(walker, callback) {
-        var errors;
-        walker.currentNode = walker.root;
-        errors = childDeriv(null, rootPattern, walker);
-        if (!errors.nullable) {
-            runtime.log("Error in Relax NG validation: " + errors);
-            callback(["Error in Relax NG validation: " + errors]);
-        } else {
-            callback(null);
-        }
-    };
-    this.init = function init(rootPattern1) {
-        rootPattern = rootPattern1;
-    };
-};
diff --git a/apps/files_odfviewer/src/webodf/webodf/lib/xmldom/RelaxNG2.js b/apps/files_odfviewer/src/webodf/webodf/lib/xmldom/RelaxNG2.js
deleted file mode 100644
index 185ef5236e..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/lib/xmldom/RelaxNG2.js
+++ /dev/null
@@ -1,416 +0,0 @@
-/**
- * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
- * @licstart
- * The JavaScript code in this page is free software: you can redistribute it
- * and/or modify it under the terms of the GNU Affero General Public License
- * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.  The code is distributed
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
- *
- * As additional permission under GNU AGPL version 3 section 7, you
- * may distribute non-source (e.g., minimized or compacted) forms of
- * that code without the copy of the GNU GPL normally required by
- * section 4, provided you include this license notice and a URL
- * through which recipients can access the Corresponding Source.
- *
- * As a special exception to the AGPL, any HTML file which merely makes function
- * calls to this code, and for that purpose includes it by reference shall be
- * deemed a separate work for copyright law purposes. In addition, the copyright
- * holders of this code give you permission to combine this code with free
- * software libraries that are released under the GNU LGPL. You may copy and
- * distribute such a system following the terms of the GNU AGPL for this code
- * and the LGPL for the libraries. If you modify this code, you may extend this
- * exception to your version of the code, but you are not obligated to do so.
- * If you do not wish to do so, delete this exception statement from your
- * version.
- *
- * This license applies to this entire compilation.
- * @licend
- * @source: http://www.webodf.org/
- * @source: http://gitorious.org/odfkit/webodf/
- */
-/*global runtime: true, xmldom: true*/
-
-/**
- * RelaxNG can check a DOM tree against a Relax NG schema
- * The RelaxNG implementation is currently not complete. Relax NG should not
- * report errors on valid DOM trees, but it will not check all constraints that
- * a Relax NG file can define. The current implementation does not load external
- * parts of a Relax NG file.
- * The main purpose of this Relax NG engine is to validate runtime ODF
- * documents. The DOM tree is traversed via a TreeWalker. A custom TreeWalker
- * implementation can hide parts of a DOM tree. This is useful in WebODF, where
- * special elements and attributes in the runtime DOM tree.
- */
-runtime.loadClass("xmldom.RelaxNGParser");
-/**
- * @constructor
- */
-xmldom.RelaxNG2 = function RelaxNG2() {
-    "use strict";
-    var start,
-        validateNonEmptyPattern,
-        nsmap,
-        depth = 0,
-        p = "                                                                ";
-
-    /**
-     * @constructor
-     * @param {!string} error
-     * @param {Node=} context
-     */
-    function RelaxNGParseError(error, context) {
-        this.message = function () {
-            if (context) {
-                error += (context.nodeType === 1) ? " Element " : " Node ";
-                error += context.nodeName;
-                if (context.nodeValue) {
-                    error += " with value '" + context.nodeValue + "'";
-                }
-                error += ".";
-            }
-            return error;
-        };
-//        runtime.log("[" + p.slice(0, depth) + this.message() + "]");
-    }
-    /**
-     * @param elementdef
-     * @param walker
-     * @param {Element} element
-     * @return {Array.<RelaxNGParseError>}
-     */
-    function validateOneOrMore(elementdef, walker, element) {
-        // The list of definitions in the elements list should be completely
-        // traversed at least once. If a second or later round fails, the walker
-        // should go back to the start of the last successful traversal
-        var node, i = 0, err;
-        do {
-            node = walker.currentNode;
-            err = validateNonEmptyPattern(elementdef.e[0], walker, element);
-            i += 1;
-        } while (!err && node !== walker.currentNode);
-        if (i > 1) { // at least one round was without error
-            // set position back to position of before last failed round
-            walker.currentNode = node;
-            return null;
-        }
-        return err;
-    }
-    /**
-     * @param {!Node} node
-     * @return {!string}
-     */
-    function qName(node) {
-        return nsmap[node.namespaceURI] + ":" + node.localName;
-    }
-    /**
-     * @param {!Node} node
-     * @return {!boolean}
-     */
-    function isWhitespace(node) {
-        return node && node.nodeType === 3 && /^\s+$/.test(node.nodeValue);
-    }
-    /**
-     * @param elementdef
-     * @param walker
-     * @param {Element} element
-     * @param {string=} data
-     * @return {Array.<RelaxNGParseError>}
-     */
-    function validatePattern(elementdef, walker, element, data) {
-        if (elementdef.name === "empty") {
-            return null;
-        }
-        return validateNonEmptyPattern(elementdef, walker, element, data);
-    }
-    /**
-     * @param elementdef
-     * @param walker
-     * @param {Element} element
-     * @return {Array.<RelaxNGParseError>}
-     */
-    function validateAttribute(elementdef, walker, element) {
-        if (elementdef.e.length !== 2) {
-            throw "Attribute with wrong # of elements: " + elementdef.e.length;
-        }
-        var att, a, l = elementdef.localnames.length, i;
-        for (i = 0; i < l; i += 1) {
-            a = element.getAttributeNS(elementdef.namespaces[i],
-                    elementdef.localnames[i]);
-            // if an element is not present, getAttributeNS will return an empty
-            // string but an empty string is possible attribute value, so an
-            // extra check is needed
-            if (a === "" && !element.hasAttributeNS(elementdef.namespaces[i],
-                    elementdef.localnames[i])) {
-                a = undefined;
-            }
-            if (att !== undefined && a !== undefined) {
-                return [new RelaxNGParseError("Attribute defined too often.",
-                        element)];
-            }
-            att = a;
-        }
-        if (att === undefined) {
-            return [new RelaxNGParseError("Attribute not found: " +
-                    elementdef.names, element)];
-        }
-        return validatePattern(elementdef.e[1], walker, element, att);
-    }
-    /**
-     * @param elementdef
-     * @param walker
-     * @param {Element} element
-     * @return {Array.<RelaxNGParseError>}
-     */
-    function validateTop(elementdef, walker, element) {
-        // notAllowed not implemented atm
-        return validatePattern(elementdef, walker, element);
-    }
-    /**
-     * Validate an element.
-     * Function forwards the walker until an element is met.
-     * If element if of the right type, it is entered and the validation
-     * continues inside the element. After validation, regardless of whether an
-     * error occurred, the walker is at the same depth in the dom tree.
-     * @param elementdef
-     * @param walker
-     * @param {Element} element
-     * @return {Array.<RelaxNGParseError>}
-     */
-    function validateElement(elementdef, walker, element) {
-        if (elementdef.e.length !== 2) {
-            throw "Element with wrong # of elements: " + elementdef.e.length;
-        }
-        depth += 1;
-        // forward until an element is seen, then check the name
-        var /**@type{Node}*/ node = walker.currentNode,
-            /**@type{number}*/ type = node ? node.nodeType : 0,
-            error = null;
-        // find the next element, skip text nodes with only whitespace
-        while (type > 1) {
-            if (type !== 8 &&
-                    (type !== 3 ||
-                     !/^\s+$/.test(walker.currentNode.nodeValue))) {// TEXT_NODE
-                depth -= 1;
-                return [new RelaxNGParseError("Not allowed node of type " +
-                        type + ".")];
-            }
-            node = walker.nextSibling();
-            type = node ? node.nodeType : 0;
-        }
-        if (!node) {
-            depth -= 1;
-            return [new RelaxNGParseError("Missing element " +
-                    elementdef.names)];
-        }
-        if (elementdef.names && elementdef.names.indexOf(qName(node)) === -1) {
-            depth -= 1;
-            return [new RelaxNGParseError("Found " + node.nodeName +
-                    " instead of " + elementdef.names + ".", node)];
-        }
-        // the right element was found, now parse the contents
-        if (walker.firstChild()) {
-            // currentNode now points to the first child node of this element
-            error = validateTop(elementdef.e[1], walker, node);
-            // there should be no content left
-            while (walker.nextSibling()) {
-                type = walker.currentNode.nodeType;
-                if (!isWhitespace(walker.currentNode) && type !== 8) {
-                    depth -= 1;
-                    return [new RelaxNGParseError("Spurious content.",
-                            walker.currentNode)];
-                }
-            }
-            if (walker.parentNode() !== node) {
-                depth -= 1;
-                return [new RelaxNGParseError("Implementation error.")];
-            }
-        } else {
-            error = validateTop(elementdef.e[1], walker, node);
-        }
-        depth -= 1;
-        // move to the next node
-        node = walker.nextSibling();
-        return error;
-    }
-    /**
-     * @param elementdef
-     * @param walker
-     * @param {Element} element
-     * @param {string=} data
-     * @return {Array.<RelaxNGParseError>}
-     */
-    function validateChoice(elementdef, walker, element, data) {
-        // loop through child definitions and return if a match is found
-        if (elementdef.e.length !== 2) {
-            throw "Choice with wrong # of options: " + elementdef.e.length;
-        }
-        var node = walker.currentNode, err;
-        // if the first option is empty, just check the second one for debugging
-        // but the total choice is alwasy ok
-        if (elementdef.e[0].name === "empty") {
-            err = validateNonEmptyPattern(elementdef.e[1], walker, element,
-                    data);
-            if (err) {
-                walker.currentNode = node;
-            }
-            return null;
-        }
-        err = validatePattern(elementdef.e[0], walker, element, data);
-        if (err) {
-            walker.currentNode = node;
-            err = validateNonEmptyPattern(elementdef.e[1], walker, element,
-                    data);
-        }
-        return err;
-    }
-    /**
-     * @param elementdef
-     * @param walker
-     * @param {Element} element
-     * @return {Array.<RelaxNGParseError>}
-     */
-    function validateInterleave(elementdef, walker, element) {
-        var l = elementdef.e.length, n = [l], err, i, todo = l,
-            donethisround, node, subnode, e;
-        // the interleave is done when all items are 'true' and no 
-        while (todo > 0) {
-            donethisround = 0;
-            node = walker.currentNode;
-            for (i = 0; i < l; i += 1) {
-                subnode = walker.currentNode;
-                if (n[i] !== true && n[i] !== subnode) {
-                    e = elementdef.e[i];
-                    err = validateNonEmptyPattern(e, walker, element);
-                    if (err) {
-                        walker.currentNode = subnode;
-                        if (n[i] === undefined) {
-                            n[i] = false;
-                        }
-                    } else if (subnode === walker.currentNode ||
-                            // this is a bit dodgy, there should be a rule to
-                            // see if multiple elements are allowed
-                            e.name === "oneOrMore" ||
-                            (e.name === "choice" &&
-                            (e.e[0].name === "oneOrMore" ||
-                             e.e[1].name === "oneOrMore"))) {
-                        donethisround += 1;
-                        n[i] = subnode; // no error and try this one again later
-                    } else {
-                        donethisround += 1;
-                        n[i] = true; // no error and progress
-                    }
-                }
-            }
-            if (node === walker.currentNode && donethisround === todo) {
-                return null;
-            }
-            if (donethisround === 0) {
-                for (i = 0; i < l; i += 1) {
-                    if (n[i] === false) {
-                        return [new RelaxNGParseError(
-                                "Interleave does not match.", element)];
-                    }
-                }
-                return null;
-            }
-            todo = 0;
-            for (i = 0; i < l; i += 1) {
-                if (n[i] !== true) {
-                    todo += 1;
-                }
-            }
-        }
-        return null;
-    }
-    /**
-     * @param elementdef
-     * @param walker
-     * @param {Element} element
-     * @return {Array.<RelaxNGParseError>}
-     */
-    function validateGroup(elementdef, walker, element) {
-        if (elementdef.e.length !== 2) {
-            throw "Group with wrong # of members: " + elementdef.e.length;
-        }
-        //runtime.log(elementdef.e[0].name + " " + elementdef.e[1].name);
-        return validateNonEmptyPattern(elementdef.e[0], walker, element) ||
-                validateNonEmptyPattern(elementdef.e[1], walker, element);
-    }
-    /**
-     * @param elementdef
-     * @param walker
-     * @param {Element} element
-     * @return {Array.<RelaxNGParseError>}
-     */
-    function validateText(elementdef, walker, element) {
-        var /**@type{Node}*/ node = walker.currentNode,
-            /**@type{number}*/ type = node ? node.nodeType : 0,
-            error = null;
-        // find the next element, skip text nodes with only whitespace
-        while (node !== element && type !== 3) {
-            if (type === 1) {
-                return [new RelaxNGParseError(
-                        "Element not allowed here.", node)];
-            }
-            node = walker.nextSibling();
-            type = node ? node.nodeType : 0;
-        }
-        walker.nextSibling();
-        return null;
-    }
-    /**
-     * @param elementdef
-     * @param walker
-     * @param {Element} element
-     * @param {string=} data
-     * @return {Array.<RelaxNGParseError>}
-     */
-    validateNonEmptyPattern = function validateNonEmptyPattern(elementdef,
-                walker, element, data) {
-        var name = elementdef.name, err = null;
-        if (name === "text") {
-            err = validateText(elementdef, walker, element);
-        } else if (name === "data") {
-            err = null; // data not implemented
-        } else if (name === "value") {
-            if (data !== elementdef.text) {
-                err = [new RelaxNGParseError("Wrong value, should be '" +
-                        elementdef.text + "', not '" + data + "'", element)];
-            }
-        } else if (name === "list") {
-            err = null; // list not implemented
-        } else if (name === "attribute") {
-            err = validateAttribute(elementdef, walker, element);
-        } else if (name === "element") {
-            err = validateElement(elementdef, walker, element);
-        } else if (name === "oneOrMore") {
-            err = validateOneOrMore(elementdef, walker, element);
-        } else if (name === "choice") {
-            err = validateChoice(elementdef, walker, element, data);
-        } else if (name === "group") {
-            err = validateGroup(elementdef, walker, element);
-        } else if (name === "interleave") {
-            err = validateInterleave(elementdef, walker, element);
-        } else {
-            throw name + " not allowed in nonEmptyPattern.";
-        }
-        return err;
-    };
-    /**
-     * Validate the elements pointed to by the TreeWalker
-     * @param {!TreeWalker} walker
-     * @param {!function(Array.<RelaxNGParseError>):undefined} callback
-     * @return {undefined}
-     */
-    this.validate = function validate(walker, callback) {
-        walker.currentNode = walker.root;
-        var errors = validatePattern(start.e[0], walker, walker.root);
-        callback(errors);
-    };
-    this.init = function init(start1, nsmap1) {
-        start = start1;
-        nsmap = nsmap1;
-    };
-};
diff --git a/apps/files_odfviewer/src/webodf/webodf/lib/xmldom/RelaxNGParser.js b/apps/files_odfviewer/src/webodf/webodf/lib/xmldom/RelaxNGParser.js
deleted file mode 100644
index 12e37278a0..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/lib/xmldom/RelaxNGParser.js
+++ /dev/null
@@ -1,452 +0,0 @@
-/**
- * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
- * @licstart
- * The JavaScript code in this page is free software: you can redistribute it
- * and/or modify it under the terms of the GNU Affero General Public License
- * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.  The code is distributed
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
- *
- * As additional permission under GNU AGPL version 3 section 7, you
- * may distribute non-source (e.g., minimized or compacted) forms of
- * that code without the copy of the GNU GPL normally required by
- * section 4, provided you include this license notice and a URL
- * through which recipients can access the Corresponding Source.
- *
- * As a special exception to the AGPL, any HTML file which merely makes function
- * calls to this code, and for that purpose includes it by reference shall be
- * deemed a separate work for copyright law purposes. In addition, the copyright
- * holders of this code give you permission to combine this code with free
- * software libraries that are released under the GNU LGPL. You may copy and
- * distribute such a system following the terms of the GNU AGPL for this code
- * and the LGPL for the libraries. If you modify this code, you may extend this
- * exception to your version of the code, but you are not obligated to do so.
- * If you do not wish to do so, delete this exception statement from your
- * version.
- *
- * This license applies to this entire compilation.
- * @licend
- * @source: http://www.webodf.org/
- * @source: http://gitorious.org/odfkit/webodf/
- */
-/*global runtime: true, xmldom: true*/
-
-/**
- * RelaxNG can check a DOM tree against a Relax NG schema
- * The RelaxNG implementation is currently not complete. Relax NG should not
- * report errors on valid DOM trees, but it will not check all constraints that
- * a Relax NG file can define. The current implementation does not load external
- * parts of a Relax NG file.
- * The main purpose of this Relax NG engine is to validate runtime ODF
- * documents. The DOM tree is traversed via a TreeWalker. A custom TreeWalker
- * implementation can hide parts of a DOM tree. This is useful in WebODF, where
- * special elements and attributes in the runtime DOM tree.
- * @constructor
- */
-xmldom.RelaxNGParser = function RelaxNGParser() {
-    "use strict";
-    var self = this,
-        rngns = "http://relaxng.org/ns/structure/1.0",
-        xmlnsns = "http://www.w3.org/2000/xmlns/",
-        start,
-        nsmap = { "http://www.w3.org/XML/1998/namespace": "xml" },
-        parse;
-
-    /**
-     * @constructor
-     * @param {!string} error
-     * @param {Node=} context
-     */
-    function RelaxNGParseError(error, context) {
-        /**
-         * return {!string}
-         */
-        this.message = function () {
-            if (context) {
-                error += (context.nodeType === 1) ? " Element " : " Node ";
-                error += context.nodeName;
-                if (context.nodeValue) {
-                    error += " with value '" + context.nodeValue + "'";
-                }
-                error += ".";
-            }
-            return error;
-        };
-    }
-    function splitToDuos(e) {
-        if (e.e.length <= 2) {
-            return e;
-        }
-        var o = { name: e.name, e: e.e.slice(0, 2) };
-        return splitToDuos({
-            name: e.name,
-            e: [ o ].concat(e.e.slice(2))
-        });
-    }
-    /**
-     * @param {!string} name
-     * @return {!Array.<string>}
-     */
-    function splitQName(name) {
-        var r = name.split(":", 2),
-            prefix = "", i;
-        if (r.length === 1) {
-            r = ["", r[0]];
-        } else {
-            prefix = r[0];
-        }
-        for (i in nsmap) {
-            if (nsmap[i] === prefix) {
-                r[0] = i;
-            }
-        }
-        return r;
-    }
-
-    function splitQNames(def) {
-        var i, l = (def.names) ? def.names.length : 0, name,
-            localnames = def.localnames = [l],
-            namespaces = def.namespaces = [l];
-        for (i = 0; i < l; i += 1) {
-            name = splitQName(def.names[i]);
-            namespaces[i] = name[0];
-            localnames[i] = name[1];
-        }
-    }
-
-    /**
-     * @param {!string} str
-     * @return {!string}
-     */
-    function trim(str) {
-        str = str.replace(/^\s\s*/, '');
-		var ws = /\s/,
-            i = str.length - 1;
-        while (ws.test(str.charAt(i))) {
-            i -= 1;
-        }
-        return str.slice(0, i + 1);
-    }
-
-    /**
-     * @param {!Object.<string,string>} atts
-     * @param {!string} name
-     * @param {!Array.<string>} names
-     * @return {!Object}
-     */
-    function copyAttributes(atts, name, names) {
-        var a = {}, i, att;
-        for (i = 0; i < atts.length; i += 1) {
-            att = atts.item(i);
-            if (!att.namespaceURI) {
-                if (att.localName === "name" &&
-                        (name === "element" || name === "attribute")) {
-                    names.push(att.value);
-                }
-                if (att.localName === "name" || att.localName === "combine" ||
-                        att.localName === "type") {
-                    att.value = trim(att.value);
-                }
-                a[att.localName] = att.value;
-            } else if (att.namespaceURI === xmlnsns) {
-                nsmap[att.value] = att.localName;
-            }
-        }
-        return a;
-    }
-
-    function parseChildren(c, e, elements, names) {
-        var text = "", ce;
-        while (c) {
-            if (c.nodeType === 1 && c.namespaceURI === rngns) {
-                ce = parse(c, elements, e);
-                if (ce) {
-                    if (ce.name === "name") {
-                        names.push(nsmap[ce.a.ns] + ":" + ce.text);
-                        e.push(ce);
-                    } else if (ce.name === "choice" && ce.names &&
-                            ce.names.length) {
-                        names = names.concat(ce.names);
-                        delete ce.names;
-                        e.push(ce);
-                    } else {
-                        e.push(ce);
-                    }
-                }
-            } else if (c.nodeType === 3) {
-                text += c.nodeValue;
-            }
-            c = c.nextSibling;
-        }
-        return text;
-    }
-
-    function combineDefines(combine, name, e, siblings) {
-        // combineDefines is called often enough that there can only be one
-        // other element with the same name
-        var i, ce;
-        for (i = 0; siblings && i < siblings.length; i += 1) {
-            ce = siblings[i];
-            if (ce.name === "define" && ce.a && ce.a.name === name) {
-                ce.e = [ { name: combine, e: ce.e.concat(e) } ];
-                return ce;
-            }
-        }
-        return null;
-    }
-
-    parse = function parse(element, elements, siblings) {
-        // parse all elements from the Relax NG namespace into JavaScript
-        // objects
-        var e = [],
-            /**@type{Object}*/a,
-            ce,
-            i, text, name = element.localName, names = [];
-        a = copyAttributes(element.attributes, name, names);
-        a.combine = a.combine || undefined;
-        text = parseChildren(element.firstChild, e, elements, names);
-
-        // 4.2 strip leading and trailing whitespace
-        if (name !== "value" && name !== "param") {
-            text = /^\s*([\s\S]*\S)?\s*$/.exec(text)[1];
-        }
-        // 4.3 datatypeLibrary attribute
-        // 4.4 type attribute of value element
-        if (name === "value" && a.type === undefined) {
-            a.type = "token";
-            a.datatypeLibrary = "";
-        }
-        // 4.5 href attribute
-        // 4.6 externalRef element
-        // 4.7 include element
-        // 4.8 name attribute of element and attribute elements
-        if ((name === "attribute" || name === "element") &&
-                a.name !== undefined) {
-           i = splitQName(a.name);
-           e = [{name: "name", text: i[1], a: {ns: i[0]}}].concat(e);
-           delete a.name;
-        }
-        // 4.9 ns attribute
-        if (name === "name" || name === "nsName" || name === "value") {
-            if (a.ns === undefined) {
-                a.ns = ""; // TODO
-            }
-        } else {
-            delete a.ns;
-        }
-        // 4.10 QNames
-        if (name === "name") {
-            i = splitQName(text);
-            a.ns = i[0];
-            text = i[1];
-        }
-        // 4.11 div element
-        // 4.12 Number of child elements
-        if (e.length > 1 && (name === "define" || name === "oneOrMore" ||
-                name === "zeroOrMore" || name === "optional" ||
-                name === "list" || name === "mixed")) {
-            e = [{name: "group", e: splitToDuos({name: "group", e: e}).e}];
-        }
-        if (e.length > 2 && name === "element") {
-            e = [e[0]].concat(
-                {name: "group", e: splitToDuos(
-                    {name: "group", e: e.slice(1)}).e});
-        }
-        if (e.length === 1 && name === "attribute") {
-            e.push({name: "text", text: text});
-        }
-        // if node has only one child, replace node with child
-        if (e.length === 1 && (name === "choice" || name === "group" ||
-                name === "interleave")) {
-            name = e[0].name;
-            names = e[0].names;
-            a = e[0].a;
-            text = e[0].text;
-            e = e[0].e;
-        } else if (e.length > 2 && (name === "choice" || name === "group" ||
-                name === "interleave")) {
-            e = splitToDuos({name: name, e: e}).e;
-        }
-        // 4.13 mixed element
-        if (name === "mixed") {
-            name = "interleave";
-            e = [ e[0], { name: "text" } ];
-        }
-        // 4.14 optional element
-        if (name === "optional") {
-            name = "choice";
-            e = [ e[0], { name: "empty" } ];
-        }
-        // 4.15 zeroOrMore element
-        if (name === "zeroOrMore") {
-            name = "choice";
-            e = [ {name: "oneOrMore", e: [ e[0] ] }, { name: "empty" } ];
-        }
-        // 4.17 combine attribute
-        if (name === "define" && a.combine) {
-            ce = combineDefines(a.combine, a.name, e, siblings);
-            if (ce) {
-                return;
-            }
-        }
-
-        // create the definition
-        ce = { name: name };
-        if (e && e.length > 0) { ce.e = e; }
-        for (i in a) {
-            if (a.hasOwnProperty(i)) {
-                ce.a = a;
-                break;
-            }
-        }
-        if (text !== undefined) { ce.text = text; }
-        if (names && names.length > 0) { ce.names = names; }
-
-        // part one of 4.19
-        if (name === "element") {
-            ce.id = elements.length;
-            elements.push(ce);
-            ce = { name: "elementref", id: ce.id };
-        }
-        return ce;
-    };
-
-    function resolveDefines(def, defines) {
-        var i = 0, e, defs, end, name = def.name;
-        while (def.e && i < def.e.length) {
-            e = def.e[i];
-            if (e.name === "ref") {
-                defs = defines[e.a.name];
-                if (!defs) {
-                    throw e.a.name + " was not defined.";
-                }
-                end = def.e.slice(i + 1);
-                def.e = def.e.slice(0, i);
-                def.e = def.e.concat(defs.e);
-                def.e = def.e.concat(end);
-            } else {
-                i += 1;
-                resolveDefines(e, defines);
-            }
-        }
-        e = def.e;
-        // 4.20 notAllowed element
-        // 4.21 empty element
-        if (name === "choice") {
-            if (!e || !e[1] || e[1].name === "empty") {
-                if (!e || !e[0] || e[0].name === "empty") {
-                    delete def.e;
-                    def.name = "empty";
-                } else {
-                    e[1] = e[0];
-                    e[0] = { name: "empty" };
-                }
-            }
-        }
-        if (name === "group" || name === "interleave") {
-            if (e[0].name === "empty") {
-                if (e[1].name === "empty") {
-                    delete def.e;
-                    def.name = "empty";
-                } else {
-                    name = def.name = e[1].name;
-                    def.names = e[1].names;
-                    e = def.e = e[1].e;
-                }
-            } else if (e[1].name === "empty") {
-                name = def.name = e[0].name;
-                def.names = e[0].names;
-                e = def.e = e[0].e;
-            }
-        }
-        if (name === "oneOrMore" && e[0].name === "empty") {
-            delete def.e;
-            def.name = "empty";
-        }
-        // for attributes we need to have the list of namespaces and
-        // localnames readily available, so we split up the qnames
-        if (name === "attribute") {
-            splitQNames(def);
-        }
-        // for interleaving validation, it is convenient to join all
-        // interleave elements that touch into one element
-        if (name === "interleave") {
-            // at this point the interleave will have two child elements,
-            // but the child interleave elements may have a different number
-            if (e[0].name === "interleave") {
-                if (e[1].name === "interleave") {
-                    e = def.e = e[0].e.concat(e[1].e);
-                } else {
-                    e = def.e = [e[1]].concat(e[0].e);
-                }
-            } else if (e[1].name === "interleave") {
-                e = def.e = [e[0]].concat(e[1].e);
-            }
-        }
-    }
-
-    function resolveElements(def, elements) {
-        var i = 0, e, name;
-        while (def.e && i < def.e.length) {
-            e = def.e[i];
-            if (e.name === "elementref") {
-                e.id = e.id || 0;
-                def.e[i] = elements[e.id];
-            } else if (e.name !== "element") {
-                resolveElements(e, elements);
-            }
-            i += 1;
-        }
-    }
-
-    /**
-     * @param {!Document} dom
-     * @param {!Function} callback
-     * @return {?Array}
-     */
-    function main(dom, callback) {
-        var elements = [],
-            grammar = parse(dom && dom.documentElement, elements, undefined),
-            i, e, defines = {};
-
-        for (i = 0; i < grammar.e.length; i += 1) {
-            e = grammar.e[i];
-            if (e.name === "define") {
-                defines[e.a.name] = e;
-            } else if (e.name === "start") {
-                start = e;
-            }
-        }
-        if (!start) {
-            return [new RelaxNGParseError(
-                    "No Relax NG start element was found.")];
-        }
-        resolveDefines(start, defines);
-        for (i in defines) {
-            if (defines.hasOwnProperty(i)) {
-                resolveDefines(defines[i], defines);
-            }
-        }
-        for (i = 0; i < elements.length; i += 1) {
-            resolveDefines(elements[i], defines);
-        }
-        if (callback) {
-            self.rootPattern = callback(start.e[0], elements);
-        }
-        resolveElements(start, elements);
-        for (i = 0; i < elements.length; i += 1) {
-            resolveElements(elements[i], elements);
-        }
-        self.start = start;
-        self.elements = elements;
-        self.nsmap = nsmap;
-        return null;
-    }
-    /**
-     * @param {!Document} dom
-     * @param {!Function} callback
-     * @return {?Array}
-     */
-    this.parseRelaxNGDOM = main;
-};
diff --git a/apps/files_odfviewer/src/webodf/webodf/lib/xmldom/XPath.js b/apps/files_odfviewer/src/webodf/webodf/lib/xmldom/XPath.js
deleted file mode 100644
index 28466c2184..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/lib/xmldom/XPath.js
+++ /dev/null
@@ -1,383 +0,0 @@
-/**
- * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
- * @licstart
- * The JavaScript code in this page is free software: you can redistribute it
- * and/or modify it under the terms of the GNU Affero General Public License
- * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.  The code is distributed
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
- *
- * As additional permission under GNU AGPL version 3 section 7, you
- * may distribute non-source (e.g., minimized or compacted) forms of
- * that code without the copy of the GNU GPL normally required by
- * section 4, provided you include this license notice and a URL
- * through which recipients can access the Corresponding Source.
- *
- * As a special exception to the AGPL, any HTML file which merely makes function
- * calls to this code, and for that purpose includes it by reference shall be
- * deemed a separate work for copyright law purposes. In addition, the copyright
- * holders of this code give you permission to combine this code with free
- * software libraries that are released under the GNU LGPL. You may copy and
- * distribute such a system following the terms of the GNU AGPL for this code
- * and the LGPL for the libraries. If you modify this code, you may extend this
- * exception to your version of the code, but you are not obligated to do so.
- * If you do not wish to do so, delete this exception statement from your
- * version.
- *
- * This license applies to this entire compilation.
- * @licend
- * @source: http://www.webodf.org/
- * @source: http://gitorious.org/odfkit/webodf/
- */
-/*global xmldom, XPathResult, runtime*/
-/**
- * Wrapper for XPath functions
- * @constructor
- */
-xmldom.XPath = (function () {
-    "use strict";
-    var createXPathPathIterator,
-        parsePredicates;
-    /**
-     * @param {!number} a
-     * @param {!number} b
-     * @param {!number} c
-     * @return {!boolean}
-     */
-    function isSmallestPositive(a, b, c) {
-        return a !== -1 && (a < b || b === -1) && (a < c || c === -1);
-    }
-    /**
-     * Parse a subset of xpaths.
-     * The xpath predicates may contain xpaths. The location may be equated to
-     * a value. If a parsing error occurs, null is returned.
-     * @param {!string} xpath
-     * @param {!number} pos
-     * @param {!number} end
-     * @param {!Array} steps
-     * @return {!number}
-     */
-    function parseXPathStep(xpath, pos, end, steps) {
-        var location = "",
-            predicates = [],
-            value,
-            brapos = xpath.indexOf('[', pos),
-            slapos = xpath.indexOf('/', pos),
-            eqpos = xpath.indexOf('=', pos),
-            depth = 0,
-            start = 0;
-        // parse the location
-        if (isSmallestPositive(slapos, brapos, eqpos)) {
-            location = xpath.substring(pos, slapos);
-            pos = slapos + 1;
-        } else if (isSmallestPositive(brapos, slapos, eqpos)) {
-            location = xpath.substring(pos, brapos);
-            pos = parsePredicates(xpath, brapos, predicates);
-        } else if (isSmallestPositive(eqpos, slapos, brapos)) {
-            location = xpath.substring(pos, eqpos);
-            pos = eqpos;
-        } else {
-            location = xpath.substring(pos, end);
-            pos = end;
-        }
-        steps.push({location: location, predicates: predicates});
-        return pos;
-    }
-    function parseXPath(xpath) {
-        var steps = [],
-            p = 0,
-            end = xpath.length,
-            value;
-        while (p < end) {
-            p = parseXPathStep(xpath, p, end, steps);
-            if (p < end && xpath[p] === '=') {
-                value = xpath.substring(p + 1, end);
-                if (value.length > 2 &&
-                        (value[0] === '\'' || value[0] === '"')) {
-                    value = value.slice(1, value.length - 1);
-                } else {
-                    try {
-                        value = parseInt(value, 10);
-                    } catch (e) {
-                    }
-                }
-                p = end;
-            }
-        }
-        return {steps: steps, value: value};
-    }
-    parsePredicates = function parsePredicates(xpath, start, predicates) {
-        var pos = start,
-            l = xpath.length,
-            selector,
-            depth = 0;
-        while (pos < l) {
-            if (xpath[pos] === ']') {
-                depth -= 1;
-                if (depth <= 0) {
-                    predicates.push(parseXPath(xpath.substring(start, pos)));
-                }
-            } else if (xpath[pos] === '[') {
-                if (depth <= 0) {
-                    start = pos + 1;
-                }
-                depth += 1;
-            }
-            pos += 1;
-        }
-        return pos;
-    };
-    /**
-     * Iterator over nodes uses in the xpath implementation
-     * @class
-     * @interface
-     */
-    function XPathIterator() {}
-    /**
-     * @return {Node}
-     */
-    XPathIterator.prototype.next = function () {};
-    /**
-     * @return {undefined}
-     */
-    XPathIterator.prototype.reset = function () {};
-    /**
-     * @class
-     * @constructor
-     * @augments XPathIterator
-     * @implements {XPathIterator}
-     */
-    function NodeIterator() {
-        var node, done = false;
-        this.setNode = function setNode(n) {
-            node = n;
-        };
-        this.reset = function () {
-            done = false;
-        };
-        this.next = function next() {
-            var val = (done) ? null : node;
-            done = true;
-            return val;
-        };
-    }
-    /**
-     * @class
-     * @constructor
-     * @augments XPathIterator
-     * @implements {XPathIterator}
-     * @param {XPathIterator} it
-     * @param {!string} namespace
-     * @param {!string} localName
-     */
-    function AttributeIterator(it, namespace, localName) {
-        this.reset = function reset() {
-            it.reset();
-        };
-        this.next = function next() {
-            var node = it.next(), attr;
-            while (node) {
-                node = node.getAttributeNodeNS(namespace, localName);
-                if (node) {
-                    return node;
-                }
-                node = it.next();
-            }
-            return node;
-        };
-    }
-    /**
-     * @class
-     * @constructor
-     * @augments XPathIterator
-     * @implements {XPathIterator}
-     * @param {XPathIterator} it
-     * @param {boolean} recurse
-     */
-    function AllChildElementIterator(it, recurse) {
-        var root = it.next(),
-            node = null;
-        this.reset = function reset() {
-            it.reset();
-            root = it.next();
-            node = null;
-        };
-        this.next = function next() {
-            while (root) {
-                if (node) {
-                    if (recurse && node.firstChild) {
-                        node = node.firstChild;
-                    } else {
-                        while (!node.nextSibling && node !== root) {
-                            node = node.parentNode;
-                        }
-                        if (node === root) {
-                            root = it.next();
-                        } else {
-                            node = node.nextSibling;
-                        }
-                    }
-                } else {
-                    do {
-//                        node = (recurse) ?root :root.firstChild;
-                        node = root.firstChild;
-                        if (!node) {
-                            root = it.next();
-                        }
-                    } while (root && !node);
-                }
-                if (node && node.nodeType === 1) {
-                    return node;
-                }
-            }
-            return null;
-        };
-    }
-    /**
-     * @class
-     * @constructor
-     * @augments XPathIterator
-     * @implements {XPathIterator}
-     * @param {XPathIterator} it
-     * @param {function(Node):boolean} condition
-     */
-    function ConditionIterator(it, condition) {
-        this.reset = function reset() {
-            it.reset();
-        };
-        this.next = function next() {
-            var n = it.next();
-            while (n && !condition(n)) {
-                n = it.next();
-            }
-            return n;
-        };
-    }
-    /**
-     * @param {XPathIterator} it
-     * @param {string} name
-     * @param {function(string):string} namespaceResolver
-     * @return {!ConditionIterator}
-     */
-    function createNodenameFilter(it, name, namespaceResolver) {
-        var s = name.split(':', 2),
-            namespace = namespaceResolver(s[0]),
-            localName = s[1];
-        return new ConditionIterator(it, function (node) {
-            return node.localName === localName &&
-                node.namespaceURI === namespace;
-        });
-    }
-    /**
-     * @param {XPathIterator} it
-     * @param {!Object} p
-     * @param {function(string):string} namespaceResolver
-     * @return {!ConditionIterator}
-     */
-    function createPredicateFilteredIterator(it, p, namespaceResolver) {
-        var nit = new NodeIterator(),
-            pit = createXPathPathIterator(nit, p, namespaceResolver),
-            value = p.value;
-        if (value === undefined) {
-            return new ConditionIterator(it, function (node) {
-                nit.setNode(node);
-                pit.reset();
-                return pit.next();
-            });
-        }
-        return new ConditionIterator(it, function (node) {
-            nit.setNode(node);
-            pit.reset();
-            var n = pit.next();
-            // todo: distinuish between number and string
-            return n && n.nodeValue === value;
-        });
-    }
-    /**
-     * @param {!XPathIterator} it
-     * @param {!Object} xpath
-     * @param {!Function} namespaceResolver
-     * @return {!XPathIterator}
-     */
-    createXPathPathIterator = function createXPathPathIterator(it, xpath,
-                namespaceResolver) {
-        var i, j, step, location, namespace, localName, prefix, p;
-        for (i = 0; i < xpath.steps.length; i += 1) {
-            step = xpath.steps[i];
-            location = step.location;
-            if (location === "") {
-                it = new AllChildElementIterator(it, false);
-            } else if (location[0] === '@') {
-                p = location.slice(1).split(":", 2);
-                it = new AttributeIterator(it, namespaceResolver(p[0]), p[1]);
-            } else if (location !== ".") {
-                it = new AllChildElementIterator(it, false);
-                if (location.indexOf(":") !== -1) {
-                    it = createNodenameFilter(it, location, namespaceResolver);
-                }
-            }
-            for (j = 0; j < step.predicates.length; j += 1) {
-                p = step.predicates[j];
-                it = createPredicateFilteredIterator(it, p, namespaceResolver);
-            }
-        }
-        return it;
-    };
-    /**
-     * @param {!Element} node
-     * @param {!string} xpath
-     * @param {!Function} namespaceResolver
-     * @return {!Array.<Element>}
-     */
-    function fallback(node, xpath, namespaceResolver) {
-        var it = new NodeIterator(),
-            i,
-            nodelist,
-            parsedXPath,
-            pos;
-        it.setNode(node);
-        parsedXPath = parseXPath(xpath);
-        it = createXPathPathIterator(it, parsedXPath, namespaceResolver);
-        nodelist = [];
-        i = it.next();
-        while (i) {
-            nodelist.push(i);
-            i = it.next();
-        }
-        return nodelist;
-    }
-    /**
-     * @param {!Element} node
-     * @param {!string} xpath
-     * @param {!Function} namespaceResolver
-     * @return {!Array.<Element>}
-     */
-    function getODFElementsWithXPath(node, xpath, namespaceResolver) {
-        var doc = node.ownerDocument,
-            nodes,
-            elements = [],
-            n = null;
-        if (!doc || !doc.evaluate || !n) {
-            elements = fallback(node, xpath, namespaceResolver);
-        } else {
-            nodes = doc.evaluate(xpath, node, namespaceResolver,
-                XPathResult.UNORDERED_NODE_ITERATOR_TYPE, null);
-            n = nodes.iterateNext();
-            while (n !== null) {
-                if (n.nodeType === 1) {
-                    elements.push(n);
-                }
-                n = nodes.iterateNext();
-            }
-        }
-        return elements;
-    }
-    /**
-     * @constructor
-     */
-    xmldom.XPath = function XPath() {
-        this.getODFElementsWithXPath = getODFElementsWithXPath;
-    };
-    return xmldom.XPath;
-}());
diff --git a/apps/files_odfviewer/src/webodf/webodf/misctests/carettest.html b/apps/files_odfviewer/src/webodf/webodf/misctests/carettest.html
deleted file mode 100644
index fc7f84c926..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/misctests/carettest.html
+++ /dev/null
@@ -1,135 +0,0 @@
-<html>
- <head>
-  <title></title>
- </head>
- <body onload="test()">
-  <script>
-function init() {
-    var p = document.createElement("p");
-    p.appendChild(document.createTextNode("MMMMM MMMMM MMMMM MMMMM MMMMM"));
-    p.style.width = "5em";
-    p.style.border = "1px solid black";
-//    p.contentEditable = true;
-    document.body.insertBefore(p, null);
-    return p;
-}
-function listenEvent(eventTarget, eventType, eventHandler) {
-    if (eventTarget.addEventListener) {
-        eventTarget.addEventListener(eventType, eventHandler, false);
-    } else if (eventTarget.attachEvent) {
-        eventType = "on" + eventType;
-        eventTarget.attachEvent(eventType, eventHandler);
-    } else {
-        eventTarget["on" + eventType] = eventHandler;
-    }
-}
-function simulateKeyEvent(target, type, keyCode) {
-    var customEvent = null,
-        bubbles = true,
-        cancelable = true,
-        view = window,
-        ctrlKey = false,
-        altKey = false,
-        shiftKey = false,
-        metaKey = false,
-        charCode = keyCode;
-    if (document.createEvent) {
-        try {
-            customEvent = document.createEvent("KeyEvents");
-            customEvent.initKeyEvent(type, bubbles, cancelable, view, ctrlKey,
-                altKey, shiftKey, metaKey, keyCode, charCode);
-        } catch (ex) {
-            try {
-                customEvent = document.createEvent("Events");
-            } catch (uierror) {
-                customEvent = document.createEvent("UIEvents");
-            } finally {
-                customEvent.initEvent(type, bubbles, cancelable);
-                customEvent.view = view;
-                customEvent.altKey = altKey;
-                customEvent.ctrlKey = ctrlKey;
-                customEvent.shiftKey = shiftKey;
-                customEvent.metaKey = metaKey;
-                customEvent.keyCode = keyCode;
-                customEvent.charCode = charCode;
-            }
-        }
-        target.dispatchEvent(customEvent);
-    } else {
-        alert('ze problem');
-    }
-}
-function moveDown(target) {
-    var evt;// = document.createEvent("KeyboardEvent");
-//    evt.initKeyEvent("keypress", true, true, null, false, false, false, false, 40, 0);
-//    target.dispatchEvent(evt);
-/*
-    evt = document.createEvent("KeyboardEvent");
-    //evt = document.createEvent("KeyEvents");
-    evt.initKeyEvent("keypress", true, true, target.ownerDocument.defaultView, false, false, false, false, 9, 0);
-    target.dispatchEvent(evt);
-*/
-                evt = document.createEvent("KeyboardEvent");
-                evt.initKeyEvent("keypress", true, true, null, false, false, false, false, 0x23, 0);
-                target.dispatchEvent(evt);
-
-}
-function moveDownOpera(target) {
-    var evt = document.createEvent("UIEvents");
-    evt.initUIEvent("keypress", true, true, window, 1);
-    target.keyCode = 8;
-    target.charCode = 0;
-    target.dispatchEvent(evt);
-alert(evt);
-}
-
-function mouseclick() {
-    var selection = window.getSelection(),
-        r = selection.getRangeAt(0);
-    alert(r.startOffset);
-}
-
-function test() {
-    var p = init(),
-        selection = window.getSelection(),
-        range;
-
-    // put caret at the start of the document
-    selection.removeAllRanges();
-    range = p.ownerDocument.createRange();
-    range.setStart(p.firstChild, 8);
-    range.collapse(true);
-    selection.addRange(range);
-
-    listenEvent(document, "keydown", show);
-    listenEvent(document, "mouseup", mouseclick);
-
-    // move the caret down
-    if (selection.modify) {
-        selection.modify("move", "forward", "line");
-    } else {
-//        moveDown(p);
-        moveDownOpera(p);
-//        simulateKeyEvent(p, "keypress", 40);
-//        simulateKeyEvent(p, "keypress", 39);
-//        simulateKeyEvent(p, "keypress", 69);
-var t = "";
-for (var i in selection) {
- t += i + " ";
-}
-//alert(t);
-    }
-    alert("'" + selection.getRangeAt(0).startOffset + "' ");
-
-}
-function show(e) {
-var t = "";
-for (var i in e) {
- t += i + " ";
-}
-//alert(t);
-    alert("code: " + e.charCode + " key: " + e.keyCode + ' ');
-}
-  </script>
- </body>
-</html>
diff --git a/apps/files_odfviewer/src/webodf/webodf/misctests/selection.html b/apps/files_odfviewer/src/webodf/webodf/misctests/selection.html
deleted file mode 100644
index d758237f39..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/misctests/selection.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<html>
-  <head><title></title>
-<script>
-window.onload = function () {
-    var selection = window.getSelection(),
-        p = document.createElement("p"),
-        textnode = document.createTextNode("hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello hello "),
-        range;
-
-    document.body.appendChild(p);
-    p.appendChild(textnode);
-    selection.removeAllRanges();
-    range = document.createRange();
-    range.setStart(textnode, 1);
-    selection.removeAllRanges();
-    selection.addRange(range);
-
-selection.modify("move", "forward", "line");
-
-alert(selection.rangeCount + " " + selection.getRangeAt(0).startOffset);
-}
-</script>
-  </head>
-  <body>
-  </body>
-</html>
-
diff --git a/apps/files_odfviewer/src/webodf/webodf/misctests/testselection.html b/apps/files_odfviewer/src/webodf/webodf/misctests/testselection.html
deleted file mode 100644
index 28ff15889b..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/misctests/testselection.html
+++ /dev/null
@@ -1,61 +0,0 @@
-<!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><title></title>
-<script>
-function log(message) {
-    document.body.appendChild(document.createTextNode(message));
-}
-
-window.onload = function () {
-    if (!document.createElementNS) {
-        log("Error: there is no function 'document.createElementNS'.");
-        return;
-    }
-    if (!window.getSelection) {
-        log("Error: there is no function 'window.getSelection'.");
-        return;
-    }
-    var testarea = document.getElementById("testarea"),
-        selection = window.getSelection(),
-        p = document.createElementNS("http://www.w3.org/1999/xhtml", "p"),
-        text = document.createTextNode("hello");
-    testarea.appendChild(p);
-    p.appendChild(text);
-    selection.removeAllRanges();
-    if (selection.rangeCount !== 0) {
-        log("Error: not all ranges were removed.");
-        return;
-    }
-
-    var range = document.createRange();
-    range.setStart(p, 0);
-    range.setEnd(p, 0);
-    if (range.startContainer !== p) {
-        log("Error: the start of the range was not correct.");
-        return;
-    }
-    selection.addRange(range);
-
-    if (selection.rangeCount === 0) {
-        log("Error: no range was added to the selection.");
-        return;
-    }
-    if (selection.rangeCount > 1) {
-        log("Error: there are too many ranges in the selection.");
-        return;
-    }
-    if (selection.getRangeAt(0).startContainer !== p) {
-        log("Error: the start of the selection is not the right element." +
-            "It is " + selection.getRangeAt(0).startContainer.nodeName +
-            " instead of " + p.nodeName + ".");
-        return;
-    }
-    log("Success: selection test worked without error.");
-}
-</script>
-  </head>
-  <body>
-<div id="testarea"></div>
-  </body>
-</html>
-
diff --git a/apps/files_odfviewer/src/webodf/webodf/misctests/testzip.js b/apps/files_odfviewer/src/webodf/webodf/misctests/testzip.js
deleted file mode 100644
index bd57807bf5..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/misctests/testzip.js
+++ /dev/null
@@ -1,181 +0,0 @@
-/**
- * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
- * @licstart
- * The JavaScript code in this page is free software: you can redistribute it
- * and/or modify it under the terms of the GNU Affero General Public License
- * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.  The code is distributed
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
- *
- * As additional permission under GNU AGPL version 3 section 7, you
- * may distribute non-source (e.g., minimized or compacted) forms of
- * that code without the copy of the GNU GPL normally required by
- * section 4, provided you include this license notice and a URL
- * through which recipients can access the Corresponding Source.
- *
- * As a special exception to the AGPL, any HTML file which merely makes function
- * calls to this code, and for that purpose includes it by reference shall be
- * deemed a separate work for copyright law purposes. In addition, the copyright
- * holders of this code give you permission to combine this code with free
- * software libraries that are released under the GNU LGPL. You may copy and
- * distribute such a system following the terms of the GNU AGPL for this code
- * and the LGPL for the libraries. If you modify this code, you may extend this
- * exception to your version of the code, but you are not obligated to do so.
- * If you do not wish to do so, delete this exception statement from your
- * version.
- *
- * This license applies to this entire compilation.
- * @licend
- * @source: http://www.webodf.org/
- * @source: http://gitorious.org/odfkit/webodf/
- */
-/*global runtime core*/
-runtime.loadClass("core.Zip");
-runtime.loadClass("core.Async");
-
-var async = new core.Async();
-
-/**
- * @param {!core.Zip.ZipEntry} entry
- * @param {!core.Zip} zip
- * @param {function(?string):undefined} callback
- * @return {undefined}
- */
-function copyEntry(entry, zip, callback) {
-    entry.load(function (err, data) {
-        if (err) {
-            callback(err);
-        } else {
-            zip.save(entry.filename, data, false, entry.date);
-            callback(null);
-        }
-    });
-}
-
-/**
- * @param {!core.Zip} zipa
- * @param {!core.Zip} zipb
- * @param {function(?string):undefined} callback
- * @return {undefined}
- */
-function compareZips(zipa, zipb, callback) {
-    var entriesa = zipa.getEntries(),
-        l = entriesa.length,
-        entriesb = zipb.getEntries(),
-        i,
-        j,
-        entrya,
-        entryb;
-    // compare the number of entries
-    if (entriesb.length !== l) {
-        callback("Number of entries is not equal.");
-        return;
-    }
-    // compare the meta data of the entries
-    for (i = 0; i < l; i += 1) {
-        entrya = entriesa[i];
-        for (j = 0; j < l; j += 1) {
-            entryb = entriesb[j];
-            if (entrya.filename === entryb.filename) {
-                break;
-            }
-        }
-        if (j === l) {
-            callback("Entry " + entrya.filename + " is not present in the " +
-                    "second zip file.");
-            return;
-        }
-        if (entrya.date.valueOf() !== entryb.date.valueOf()) {
-            callback("Dates for entry " + entrya.filename + " is not equal: " +
-                entrya.date + " vs " + entryb.date);
-            return;
-        }
-    }
-    // compare the data in the entries
-    async.forEach(entriesa, function (entry, callback) {
-        entry.load(function (err, dataa) {
-            if (err) {
-                callback(err);
-                return;
-            }
-            zipb.load(entry.filename, function (err, datab) {
-                if (err) {
-                    callback(err);
-                    return;
-                }
-                var i = 0, l = dataa.length;
-                if (dataa !== datab) {
-                    for (i = 0; i < l && dataa[i] === datab[i];) {
-                        i += 1;
-                    }
-                    callback("Data is not equal for " + entry.filename +
-                            " at position " + i + ": " + dataa.charCodeAt(i) +
-                            " vs " + datab.charCodeAt(i) + ".");
-                } else {
-                    callback(null);
-                }
-            });
-        });
-    }, function (err) {
-        callback(err);
-    });
-}
-
-function testZip(filepatha, callback) {
-    var zipa = new core.Zip(filepatha, function (err, zipa) {
-        if (err) {
-            runtime.log(err);
-            runtime.exit(1);
-            return;
-        }
-        // open a new zip file and copy all entries from zipa to zipb
-        var filepathb = "tmp323.zip",
-            zipb = new core.Zip(filepathb, null),
-            entries = zipa.getEntries(),
-            i,
-            entriesDone = 0;
-        async.forEach(entries, function (entry, callback) {
-            copyEntry(entry, zipb, callback);
-        }, function (err) {
-            if (err) {
-                callback(err);
-                return;
-            }
-            zipb.write(function (err) {
-                if (err) {
-                    callback(err);
-                    return;
-                }
-                zipb = new core.Zip(filepathb, function (err, zipb) {
-                    if (err) {
-                        callback(err);
-                        return;
-                    }
-                    compareZips(zipa, zipb, callback);
-                });
-            });
-        });
-    });
-}
-
-var args = arguments;
-// open the arguments one by one, save them to a file, then open again and see
-// if the contents matches
-function doit(i) {
-    if (i >= args.length) {
-        return;
-    }
-    testZip(args[i], function (err) {
-        runtime.log(args[i]);
-        if (err) {
-            runtime.log(err);
-            return;
-        }
-        i += 1;
-        if (i < args.length) {
-            doit(i);
-        }
-    });
-}
-doit(1);
diff --git a/apps/files_odfviewer/src/webodf/webodf/misctests/writetest.zip b/apps/files_odfviewer/src/webodf/webodf/misctests/writetest.zip
deleted file mode 100644
index 69a14abc26f0936e933110307459d7c57e9e1670..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 153
zcmWIWW@h1H0D<M5YIbqQjCj<6Y!K!E;@r&K)RM}A)Wm{<oXq6JlFa-({j$6iz5K-D
z%woO#g4Dc}{N&Qy)VvbClGKWl0B=SnIcD6(0Zl{#FvA19S=m6sj6i4xq<z6^01HYV
AmjD0&

diff --git a/apps/files_odfviewer/src/webodf/webodf/notes b/apps/files_odfviewer/src/webodf/webodf/notes
deleted file mode 100644
index f21a7c3fdd..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/notes
+++ /dev/null
@@ -1,137 +0,0 @@
-XMLModel:
- - list of all possible QNames
- - list of valid attributes for each QName  
- - node walker positions
- - knowledge about where whitespace is meaningfull
-
-
-
-
-xmledit
- - receives mouse and keyboard events
-     - simple editing
-     - inputs that might be interpreted higher up
-
-Tools:
-
-Features we want:
- - ability to run code from Rhine, Node.JS and browsers
- - type checking
- - sanity checking
- - javascript compilation
- - unit tests
- - unit test code coverage
-
-
-Closure seems a nice compiler. It should be optional.
-Unit testing should be as simple as doing a reload in a browser or calling a single command from the command-line.
-
-The only fundamental problem is the method of resolving dependencies. Closure does not understand require() commands that load modules. However, Node.JS needs this command to load modules.
-
-If require("mypackage.MyClass") would return just the class if it was already loaded, that would be perfect. Using eval() would solve this:
-    function require(module) {
-        var m;
-        try {
-            m = eval(module);
-        } catch (e) {
-        }
-        if (m === undefined) {
-            // load the module
-        }
-    }
-
-But then how to adapt the code in the modules themselves? Currenlty, no global objects are defined, but symbols are added to the exports variable. 
-Suppose that ideal javascript modules each define one class, then the code for class a.b.Class would be stored in the file a/b/Class.js and would look like this:
-====
-a.b.Class = function () {
-};
-====
-If this code should be loaded as a module, it should be executed with eval(). The environment in which the code is executed should already have 'package' a.b.
-
-function runModuleCode(modulename, code) {
-    var names = modulename.split("."),
-        evalcode;
-    if (!eval("typeof " + names[0] + " === 'undefined'")) {
-    }
-    evalcode = "if (typeof " + names[0] + " === 'undefined') {" +
-        
-    if 
-}
-
-function loadClass(modulename) {
-    // test if class already exists
-    var names = modulename.split("."),
-        evalcode, constructor;
-    evalcode = "(typeof " + names[0] + " !== 'undefined' ")
-    
-
-var code = "";
-if (typeof a === "undefined") {
-    code = code + "var a = {};";
-    if (!eval(
-
-
-Node does not have global context in eval() it seems.
-
-
-
-Running unit tests should be possible in a number of ways:
- - single tests in
-   * browser
-   * browser with code coverage
-   * browser from js compiled with Closure Compiler
-   * node.js
-   * rhino
- - 
-
-
----
-
-
-Caret should work like a cursor.
-It should use the contentEditable property to advance the cursor within one text node.
-
-Isn't the current cursor sufficient? All that is missing is to use the native display when it is a text node.
-
-Using the contentEditable means that the cursor code can be simplified quite a bit if you want to 
-
-
-If the caret is in a text node, moving should be done by passing a move signal to the system.
-After the move it should be checked if the move made sense, i.e. if the caret is in an allowed position. If it is not, the position should be corrected manually.
-
-Determining if a caret is in a legal position is done with a special class.
-
-The current players:
- - core.Cursor : insert a caret in the text if the selection calls for it
- - gui.XMLEdit : 
- - ...: moving of the cursor, taking into account skipping over/ignoring the cursor itself and also taking into account that the caret in an editable text must be moved by the browser
-
-move the cursor in a simple document with a wrapped text
-
-
-Contenteditable is perhaps not strictly necessary. It does not work well across browsers anyway. The only reason to use it would be to have a nice way to move the cursor up or down a line.
-
-To move the cursor or selection, a special class is needed for determining how to modify the selection upon different inputs. The visualization of the cursor is handled by the cursor class.
-
-stepForward
-stepBackward
-setPoint
-
-----
-
-Cursor and selection:
- - cursor is foreign element of height but with no width
- - handle mouse event to move or place the cursor at the right position
- - handle key events to move the cursor
-
-webkit has nice functions for manipulating the selection
-selection/cursor position is the 'real' thing, the cursor (visible or not) is just the visualization
-
-The cursor must appear invisible to the normal dom functions, this is tricky because a cursor may split a text. This is however a separate concern.
-
-So there should be an event handler that translates mouse and key events into api calls. There already is moving of the cursor/selection on mouse events in Firefox and WebKit so only keyboard events need to be handled. So core.Cursor.updateToSelection should work ok for mouse events.
-
-Should we re-evaluate the use of JQuery? NO! first add editing functions to WebODF.
-
-So current top priorities: moving the cursor and saving.
-And not in the general xml editor, but in the odf editor.
diff --git a/apps/files_odfviewer/src/webodf/webodf/odf.html b/apps/files_odfviewer/src/webodf/webodf/odf.html
deleted file mode 100644
index 3abbf96ff7..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/odf.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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"></meta>
-  <style type="text/css" media="screen">
-    body, html, div {
-      padding: 0px;
-      margin: 0px;
-      border: 0px;
-    }
-    body, html {
-      height: 100%;
-      text-align: center;
-    }
-    html > body {
-      background: black;
-    }
-  </style>
-  <link rel="stylesheet" type="text/css" href="webodf.css"/>
-  <script src="lib/runtime.js" type="text/javascript" charset="utf-8"></script>
-  <script type="text/javascript" charset="utf-8">
-function init() {
-    runtime.loadClass("odf.OdfCanvas");
-    // if the url has a fragment (#...), try to load the file it represents
-    var location = String(document.location),
-        pos = location.indexOf('#'),
-        odfelement = document.getElementById("odf");
-    document.odfcanvas = new odf.OdfCanvas(odfelement);
-    if (pos === -1 || !window) {
-        return;
-    }
-    location = location.substr(pos + 1);
-    document.odfcanvas.load(location);
-}
-window.setTimeout(init, 1);
-  </script>
-  <title></title>
-</head>
- 
-<body>
-  <div id="odf"/>
-</body>
-</html>
diff --git a/apps/files_odfviewer/src/webodf/webodf/odfedit.html b/apps/files_odfviewer/src/webodf/webodf/odfedit.html
deleted file mode 100644
index d4a5b53870..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/odfedit.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!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"></meta>
-  <link rel="stylesheet" type="text/css" href="extjs/resources/css/ext-all.css"/>
-  <style type="text/css" media="screen">
-  body { background: #dddddd;}
-  div#odf { margin: 10px; padding; 10px; border: 1px solid black; }
-  span { border: 1px solid black; }
-  body > div > span { cursor: pointer; }
-  body > div > span:hover { background: white; }
-  body > div > span:active { background: #dddddd; }
-  </style>
-  <!-- requirements -->
-  <script src="extjs/adapter/ext/ext-base.js" type="text/javascript" charset="utf-8"></script>
-  <script src="extjs/ext-all-debug.js" type="text/javascript" charset="utf-8"></script>
-  <script src="lib/runtime.js" type="text/javascript" charset="utf-8"></script>
-  <!-- application -->
-  <script src="odfedit.js" type="text/javascript" charset="utf-8"></script>
- 
-  <title id="page-title">WebODF</title>
-  <link rel="stylesheet" type="text/css" href="webodf.css"/>
-</head>
-<body>
-</body>
-</html>
diff --git a/apps/files_odfviewer/src/webodf/webodf/odfedit.js b/apps/files_odfviewer/src/webodf/webodf/odfedit.js
deleted file mode 100644
index 6dfc1cddac..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/odfedit.js
+++ /dev/null
@@ -1,314 +0,0 @@
-/**
- * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
- * @licstart
- * The JavaScript code in this page is free software: you can redistribute it
- * and/or modify it under the terms of the GNU Affero General Public License
- * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.  The code is distributed
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
- *
- * As additional permission under GNU AGPL version 3 section 7, you
- * may distribute non-source (e.g., minimized or compacted) forms of
- * that code without the copy of the GNU GPL normally required by
- * section 4, provided you include this license notice and a URL
- * through which recipients can access the Corresponding Source.
- *
- * As a special exception to the AGPL, any HTML file which merely makes function
- * calls to this code, and for that purpose includes it by reference shall be
- * deemed a separate work for copyright law purposes. In addition, the copyright
- * holders of this code give you permission to combine this code with free
- * software libraries that are released under the GNU LGPL. You may copy and
- * distribute such a system following the terms of the GNU AGPL for this code
- * and the LGPL for the libraries. If you modify this code, you may extend this
- * exception to your version of the code, but you are not obligated to do so.
- * If you do not wish to do so, delete this exception statement from your
- * version.
- *
- * This license applies to this entire compilation.
- * @licend
- * @source: http://www.webodf.org/
- * @source: http://gitorious.org/odfkit/webodf/
- */
-/*global runtime: true, document: true, odf: true, window: true, Ext: true*/
-/**
- * @type {odf.OdfCanvas}
- */
-var odfcanvas;
-
-/**
- * @return {undefined}
- */
-function fixExtJSCSS() {
-    "use strict";
-    // look through all stylesheets to change the selector
-    // ".x-viewport, .x-viewport body"
-    // to
-    // ".x-viewport, .x-viewport > body"
-    // The normal selector os not specific enough, office|body is also affected
-    // by it. To avoid this, the selector is changed so that is only applies to
-    // a director parent child relationship with '>'
-    var i, cssRules, j, rule;
-    for (i = 0; i < document.styleSheets.length; i += 1) {
-        cssRules = document.styleSheets[i].cssRules;
-        for (j = 0; j < cssRules.length; j += 1) {
-            rule = cssRules[j];
-            if (rule.selectorText === ".x-viewport, .x-viewport body") {
-                rule = rule.cssText.replace(".x-viewport, .x-viewport body",
-                        ".x-viewport, .x-viewport > body");
-                document.styleSheets[i].deleteRule(j);
-                document.styleSheets[i].insertRule(rule, j);
-                return;
-            }
-        }
-    }
-}
-/**
- * @return {undefined}
- */
-function updateStyleComboBox() {
-    "use strict";
-    var paragraphStylesBox = document.getElementById("paragraphStyleBox");
-}
-/**
- * @param {!Element} odfelement
- * @return {undefined}
- */
-function initCanvas(odfelement) {
-    "use strict";
-    runtime.loadClass("odf.OdfCanvas");
-    // if the url has a fragment (#...), try to load the file it represents
-    var location = String(document.location),
-        pos = location.indexOf('#');
-//    odfelement.style.overflow = 'auto';
-    odfelement.style.height = '100%';
-    odfcanvas = new odf.OdfCanvas(odfelement);
-    if (pos === -1 || !window) {
-        return;
-    }
-    location = location.substr(pos + 1);
-    odfcanvas.onstatereadychange = function () {
-        /*
-        updateStyleComboBox();
-        odfcanvas.save(function (err) {
-            alert(err);
-        });
-        */
-    };
-    odfcanvas.load(location);
-    odfcanvas.addListener("selectionchange", function (element, selection) {
-        var formatting = odfcanvas.getFormatting(),
-            completelyBold = formatting.isCompletelyBold(selection),
-            alignment = formatting.getAlignment(selection);
-        runtime.log("selection changed " + completelyBold + " " + alignment);
-    });
-}
-/**
- * @return {undefined}
- */
-function save() {
-    "use strict";
-    odfcanvas.odfContainer().save(function (err) {
-        if (err) {
-            runtime.log(err);
-        }
-    });
-}
-Ext.ODFEditor = Ext.extend(Ext.component.Component, {
-    buttonTips : {
-        bold : {
-            title: 'Bold (Ctrl+B)',
-            text: 'Make the selected text bold.',
-            cls: 'x-html-editor-tip'
-        },
-        italic : {
-            title: 'Italic (Ctrl+I)',
-            text: 'Make the selected text italic.',
-            cls: 'x-html-editor-tip'
-        },
-        underline : {
-            title: 'Underline (Ctrl+U)',
-            text: 'Underline the selected text.',
-            cls: 'x-html-editor-tip'
-        },
-        increasefontsize : {
-            title: 'Grow Text',
-            text: 'Increase the font size.',
-            cls: 'x-html-editor-tip'
-        },
-        decreasefontsize : {
-            title: 'Shrink Text',
-            text: 'Decrease the font size.',
-            cls: 'x-html-editor-tip'
-        },
-        backcolor : {
-            title: 'Text Highlight Color',
-            text: 'Change the background color of the selected text.',
-            cls: 'x-html-editor-tip'
-        },
-        forecolor : {
-            title: 'Font Color',
-            text: 'Change the color of the selected text.',
-            cls: 'x-html-editor-tip'
-        },
-        justifyleft : {
-            title: 'Align Text Left',
-            text: 'Align text to the left.',
-            cls: 'x-html-editor-tip'
-        },
-        justifycenter : {
-            title: 'Center Text',
-            text: 'Center text in the editor.',
-            cls: 'x-html-editor-tip'
-        },
-        justifyright : {
-            title: 'Align Text Right',
-            text: 'Align text to the right.',
-            cls: 'x-html-editor-tip'
-        },
-        insertunorderedlist : {
-            title: 'Bullet List',
-            text: 'Start a bulleted list.',
-            cls: 'x-html-editor-tip'
-        },
-        insertorderedlist : {
-            title: 'Numbered List',
-            text: 'Start a numbered list.',
-            cls: 'x-html-editor-tip'
-        },
-        createlink : {
-            title: 'Hyperlink',
-            text: 'Make the selected text a hyperlink.',
-            cls: 'x-html-editor-tip'
-        },
-        sourceedit : {
-            title: 'Source Edit',
-            text: 'Switch to source editing mode.',
-            cls: 'x-html-editor-tip'
-        },
-        save : {
-            title: 'Save (Ctrl+S)',
-            text: 'Save the document.',
-            cls: 'x-html-editor-tip'
-        }
-    }
-});
-
-
-var ODFEditor = Ext.extend(Ext.Panel, {
-    initComponent: function () {
-        "use strict";
-        var me = this,
-            statusMessage = new Ext.Toolbar.TextItem('');
-        function buttonHandler(button, event) {
-        }
-        me.defaults = {
-        };
-        me.initialConfig = Ext.apply({
-        }, me.initialConfig);
-        me.items = [{
-            xtype: 'box',
-            id: 'canvas',
-            autoEl: {
-                tag: 'div',
-                frameBorder: 0,
-                style: {
-                    border: '0 none'
-                }
-            },
-            autoScroll: true,
-            scroll: true
-        }];
-        me.tbar = {
-            xtype: 'toolbar',
-            items: [{
-                xtype: 'button',
-                icon: 'extjs/examples/shared/icons/save.gif',
-                handler: buttonHandler,
-                cls: 'x-btn-icon'
-            }, {
-                xtype: 'tbseparator'
-            }, {
-                tag: 'select',
-                //html: this.createFontOptions()
-                cls: 'x-font-select'
-            }, {
-                xtype: 'buttongroup',
-                cls: 'x-html-editor-tb',
-                frame: false,
-                items: [{
-                    xtype: 'button',
-                    iconCls: 'x-edit-bold',
-                    cls: 'x-btn-icon'
-                }, {
-                    xtype: 'button',
-                    iconCls: 'x-edit-italic',
-                    cls: 'x-btn-icon'
-                }, {
-                    xtype: 'button',
-                    iconCls: 'x-edit-underline',
-                    cls: 'x-btn-icon'
-                }, {
-                    itemId: 'forecolor',
-                    cls: 'x-btn-icon',
-                    iconCls: 'x-edit-forecolor',
-                    menu: { xtype: 'colormenu' }
-                }, {
-                    itemId: 'backcolor',
-                    cls: 'x-btn-icon',
-                    iconCls: 'x-edit-backcolor',
-                    menu: { xtype: 'colormenu' }
-                }, {
-                    xtype: 'button',
-                    iconCls: 'x-edit-justifyleft',
-                    cls: 'x-btn-icon'
-                }, {
-                    xtype: 'button',
-                    iconCls: 'x-edit-justifycenter',
-                    cls: 'x-btn-icon'
-                }, {
-                    xtype: 'button',
-                    iconCls: 'x-edit-justifyright',
-                    cls: 'x-btn-icon'
-                }, {
-                    xtype: 'button',
-                    iconCls: 'x-edit-insertorderedlist',
-                    cls: 'x-btn-icon'
-                }, {
-                    xtype: 'button',
-                    iconCls: 'x-edit-insertunorderedlist',
-                    cls: 'x-btn-icon'
-                }]
-            }, {
-                xtype: 'tbfill'
-            },
-            statusMessage
-            ]
-        };
-/*
-        me.bbar = {
-            xtype: 'toolbar',
-            items: [ {xtype: "tbfill" }, statusMessage ]
-        };
-*/
-        ODFEditor.superclass.initComponent.call(this);
-    }
-});
-Ext.onReady(function () {
-    "use strict";
-    var canvas, viewport;
-
-    Ext.QuickTips.init();
-
-    canvas = new ODFEditor({
-        region: 'center'
-    });
-
-    viewport = new Ext.Viewport({
-        layout: 'border',
-        items: [ canvas ]
-    });
-
-    fixExtJSCSS();
-    initCanvas(Ext.getCmp('canvas').el.dom);
-});
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngToCPP.js b/apps/files_odfviewer/src/webodf/webodf/relaxngToCPP.js
deleted file mode 100644
index 064fe61b79..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/relaxngToCPP.js
+++ /dev/null
@@ -1,463 +0,0 @@
-/**
- * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
- * @licstart
- * The JavaScript code in this page is free software: you can redistribute it
- * and/or modify it under the terms of the GNU Affero General Public License
- * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.  The code is distributed
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
- *
- * As additional permission under GNU AGPL version 3 section 7, you
- * may distribute non-source (e.g., minimized or compacted) forms of
- * that code without the copy of the GNU GPL normally required by
- * section 4, provided you include this license notice and a URL
- * through which recipients can access the Corresponding Source.
- *
- * As a special exception to the AGPL, any HTML file which merely makes function
- * calls to this code, and for that purpose includes it by reference shall be
- * deemed a separate work for copyright law purposes. In addition, the copyright
- * holders of this code give you permission to combine this code with free
- * software libraries that are released under the GNU LGPL. You may copy and
- * distribute such a system following the terms of the GNU AGPL for this code
- * and the LGPL for the libraries. If you modify this code, you may extend this
- * exception to your version of the code, but you are not obligated to do so.
- * If you do not wish to do so, delete this exception statement from your
- * version.
- *
- * This license applies to this entire compilation.
- * @licend
- * @source: http://www.webodf.org/
- * @source: http://gitorious.org/odfkit/webodf/
- */
-/*global runtime: true, xmldom: true*/
-runtime.loadClass("xmldom.RelaxNGParser");
-
-var nsmap = {
-        "http://purl.org/dc/elements/1.1/": "purl",
-        "http://www.w3.org/1998/Math/MathML": "mathml",
-        "http://www.w3.org/1999/xhtml": "xhtml",
-        "http://www.w3.org/1999/xlink": "xlink",
-        "http://www.w3.org/2002/xforms": "xforms",
-        "http://www.w3.org/2003/g/data-view#": "dv",
-        "http://www.w3.org/XML/1998/namespace": "xmlns",
-        "urn:oasis:names:tc:opendocument:xmlns:animation:1.0": "animation",
-        "urn:oasis:names:tc:opendocument:xmlns:chart:1.0": "chart",
-        "urn:oasis:names:tc:opendocument:xmlns:config:1.0": "config",
-        "urn:oasis:names:tc:opendocument:xmlns:database:1.0": "database",
-        "urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0": "datastyle",
-        "urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0": "dr3d",
-        "urn:oasis:names:tc:opendocument:xmlns:drawing:1.0": "drawing",
-        "urn:oasis:names:tc:opendocument:xmlns:form:1.0": "form",
-        "urn:oasis:names:tc:opendocument:xmlns:meta:1.0": "meta",
-        "urn:oasis:names:tc:opendocument:xmlns:office:1.0": "office",
-        "urn:oasis:names:tc:opendocument:xmlns:presentation:1.0": "presentation",
-        "urn:oasis:names:tc:opendocument:xmlns:script:1.0": "script",
-        "urn:oasis:names:tc:opendocument:xmlns:smil-compatible:1.0": "smilc",
-        "urn:oasis:names:tc:opendocument:xmlns:style:1.0": "style",
-        "urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0": "svgc",
-        "urn:oasis:names:tc:opendocument:xmlns:table:1.0": "table",
-        "urn:oasis:names:tc:opendocument:xmlns:text:1.0": "text",
-        "urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0": "xslfoc"
-    },
-    typemap = {
-        "string": "const QString&",
-        "NCName": "const QString&",
-        "date": "const QString&",
-        "time": "const QString&",
-        "dateTime": "const QString&",
-        "duration": "const QString&",
-        "anyURI": "const QString&",
-        "ID": "const QString&",
-        "IDREF": "const QString&",
-        "IDREFS": "const QString&",
-        "QName": "const QString&",
-        "token": "const QString&",
-        "language": "const QString&",
-        "positiveInteger": "quint32",
-        "nonNegativeInteger": "quint32",
-        "integer": "qint32",
-        "decimal": "double"
-    },
-    args = arguments,
-    relaxngurl = args[1],
-    parser = new xmldom.RelaxNGParser(relaxngurl);
-
-function out(string) {
-    "use strict";
-    runtime.log(string);
-}
-function toCamelCase(s) {
-    "use strict";
-    var str = "", i, up = true;
-    for (i = 0; i < s.length; i += 1) {
-        if (up) {
-            str += s.substr(i, 1).toUpperCase();
-        } else {
-            str += s.substr(i, 1);
-        }
-        up = false;
-        while (/\W/.test(s.substr(i + 1, 1))) {
-            up = true;
-            i += 1;
-        }
-    }
-    return str;
-}
-function getName(e) {
-    "use strict";
-    return toCamelCase(nsmap[e.a.ns]) + toCamelCase(e.text);
-}
-function getNames(e, names) {
-    "use strict";
-    if (e.name === "name") {
-        names.push(e);
-    } else if (e.name === "choice") {
-        getNames(e.e[0], names);
-        getNames(e.e[1], names);
-    }
-}
-function parseAttributes(e, att) {
-    "use strict";
-    var i, name;
-    if (e.name === "choice" || e.name === "interleave"
-            || e.name === "group") {
-        for (i = 0; i < e.e.length; i += 1) {
-            parseAttributes(e.e[i], att);
-        }
-    } else if (e.name === "value") {
-        att.values.push(e.text);
-    } else if (e.name === "data") {
-        att.types.push(e.a.type);
-    } else if (e.name === "list") {
-        name = null; // todo 
-    } else if (e.name === "empty") {
-        att.empty = true;
-    } else {
-        runtime.log("OOPS " + e.name);
-        throw null;
-    }
-}
-function writeAttributeSetter(name, type, a) {
-    "use strict";
-    var i, s = "";
-    out("    /**");
-    if (a.optional) {
-        out("     * Set optional attribute " + a.nsname + ".");
-    } else {
-        out("     * Set required attribute " + a.nsname + ".");
-    }
-    if (a.values.length > 0) {
-        s = "Choose one of these values: '" + a.values[0] + "'";
-        for (i = 1; i < a.values.length; i += 1) {
-            s += ", '" + a.values[i] + "'";
-        }
-        out("     * " + s + ".");
-    }
-    out("     */");
-    out("    inline void write" + name + "(" + type + " value) {");
-    out("        xml->addAttribute(\"" + a.nsname + "\", value);");
-    out("    }");
-}
-function writeAttribute(name, a) {
-    "use strict";
-    if (!a.optional) {
-        return;
-    }
-    var i, type, done = {}, needfallback = true;
-    for (i = 0; i < a.types.length; i += 1) {
-        needfallback = false;
-        type = typemap[a.types[i]] || a.types[i];
-        if (!done.hasOwnProperty(type)) {
-            done[type] = 1;
-            writeAttributeSetter(name, type, a);
-        }
-    }
-    if (a.values.indexOf("true") !== -1 && a.values.indexOf("false") !== -1 &&
-            done.hasOwnProperty("bool")) {
-        needfallback = false;
-        writeAttributeSetter(name, "bool", a);
-    }
-    if (needfallback) {
-        writeAttributeSetter(name, "const QString&", a);
-    }
-}
-function writeOptionalAttributes(atts) {
-    "use strict";
-    var name;
-    for (name in atts) {
-        if (atts.hasOwnProperty(name)) {
-            writeAttribute(name, atts[name]);
-        }
-    }
-}
-function writeFixedRequiredAttributes(atts) {
-    "use strict";
-    var name, a;
-    for (name in atts) {
-        if (atts.hasOwnProperty(name)) {
-            a = atts[name];
-            if (!a.optional && a.types.length === 0 && a.values.length === 1) {
-                 out("        xml->addAttribute(\"" + a.nsname + "\", \"" +
-                     a.values[0] + "\");");
-            }
-        }
-    }
-}
-function getRequiredAttributeArguments(atts) {
-    "use strict";
-    var name, a, s = "", type;
-    for (name in atts) {
-        if (atts.hasOwnProperty(name)) {
-            a = atts[name];
-            if (!a.optional && (a.types.length > 0 || a.values.length !== 1)) {
-                type = typemap[a.types[0]] || a.types[0] || "const QString&";
-                if (s) {
-                    s += ", ";
-                }
-                s += type + " " + name.toLowerCase();
-            }
-        }
-    }
-    return s;
-}
-function getRequiredAttributeCall(atts) {
-    "use strict";
-    var name, a, s = "";
-    for (name in atts) {
-        if (atts.hasOwnProperty(name)) {
-            a = atts[name];
-            if (!a.optional && (a.types.length > 0 || a.values.length !== 1)) {
-                if (s) {
-                    s += ", ";
-                }
-                s += name.toLowerCase();
-            }
-        }
-    }
-    return s;
-}
-function writeRequiredAttributesSetters(atts) {
-    "use strict";
-    var name, a;
-    for (name in atts) {
-        if (atts.hasOwnProperty(name)) {
-            a = atts[name];
-            if (!a.optional && (a.types.length > 0 || a.values.length !== 1)) {
-                out("        xml->addAttribute(\"" + a.nsname + "\", " +
-                    name.toLowerCase() + ");");
-            }
-        }
-    }
-}
-function writeMembers(e, atts, optional) {
-    "use strict";
-    var ne, nsname, i, name, names;
-    if (e.name === "element") {
-        name = null;
-    } else if (e.name === "attribute") {
-        names = [];
-        getNames(e.e[0], names);
-        for (i = 0; i < names.length; i += 1) {
-            ne = names[i];
-            name = getName(ne);
-            if (!atts.hasOwnProperty(name)) {
-                nsname = nsmap[ne.a.ns] + ":" + ne.text;
-                atts[name] = {
-                    nsname: nsname,
-                    values: [],
-                    types: [],
-                    optional: optional,
-                    empty: false
-                };
-            }
-            parseAttributes(e.e[1], atts[name]);
-        }
-    } else if (e.name === "choice") {
-        for (i = 0; i < e.e.length; i += 1) {
-            writeMembers(e.e[i], atts, true);
-        }
-    } else if (e.name === "interleave" || e.name === "group") {
-        for (i = 0; i < e.e.length; i += 1) {
-            writeMembers(e.e[i], atts, optional);
-        }
-    } else if (e.name === "oneOrMore") {
-        writeMembers(e.e[0], atts, optional);
-    } else if (e.name === "value") {
-        name = null; // todo 
-    } else if (e.name === "data") {
-        name = null; // todo 
-    } else if (e.name === "text") {
-        out("    void addTextNode(const QString& str) { xml->addTextNode(str); }");
-    } else if (e.name === "empty") {
-        name = null; // todo 
-    } else {
-        runtime.log("OOPS " + e.name);
-        throw null;
-    }
-}
-function defineClass(e, parents, children) {
-    "use strict";
-    var c, p, i,
-        ne = e.e[0],
-        nsname = nsmap[ne.a.ns] + ":" + ne.text,
-        name = ne.cppname, atts = {};
-    out("/**");
-    out(" * Serialize a <" + nsname + "> element.");
-    out(" */");
-    out("class " + name + "Writer {");
-    for (c in children) {
-        if (children.hasOwnProperty(c) && c !== name) {
-            out("friend class " + c + "Writer;");
-        }
-    }
-    out("public:");
-    writeMembers(e.e[1], atts, false);
-    writeOptionalAttributes(atts);
-    e.requiredAttributes = getRequiredAttributeArguments(atts);
-    e.requiredAttributeCall = getRequiredAttributeCall(atts);
-    out("private:");
-    out("    inline void start(" + e.requiredAttributes + ") {");
-    out("        xml->startElement(\"" + nsname + "\");");
-    if (e.requiredAttributes) {
-        e.requiredAttributes = ", " + e.requiredAttributes;
-    }
-    writeFixedRequiredAttributes(atts);
-    writeRequiredAttributesSetters(atts);
-    out("    }");
-    out("public:");
-    out("    KoXmlWriter* const xml;");
-    for (p in parents) {
-        if (parents.hasOwnProperty(p)) {
-            out("    inline explicit " + name + "Writer(const " + p +
-                    "Writer& p" + e.requiredAttributes + ");");
-        }
-    }
-    out("    inline explicit " + name + "Writer(KoXmlWriter* xml_" +
-            e.requiredAttributes +
-            ") :xml(xml_) { start(" + e.requiredAttributeCall + "); }");
-    out("    void end() { xml->endElement(); }");
-    out("    void operator=(const " + name + "Writer&) { }");
-    out("};");
-}
-function defineConstructors(e, parents) {
-    "use strict";
-    var p,
-        ne = e.e[0],
-        nsname = nsmap[ne.a.ns] + ":" + ne.text,
-        name = ne.cppname;
-    for (p in parents) {
-        if (parents.hasOwnProperty(p)) {
-            out(name + "Writer::" + name + "Writer(const " + p +
-                "Writer& p" + e.requiredAttributes +
-                ") :xml(p.xml) { start(" + e.requiredAttributeCall + "); }");
-        }
-    }
-}
-function getChildren(e, children) {
-    "use strict";
-    var name, i, names;
-    if (e.name === "element") {
-        names = [];
-        getNames(e.e[0], names);
-        for (i = 0; i < names.length; i += 1) {
-            children[names[i].cppname] = 1;
-        }
-    } else if (e.name === "choice" || e.name === "interleave"
-            || e.name === "group") {
-        for (i = 0; i < e.e.length; i += 1) {
-            getChildren(e.e[i], children);
-        }
-    } else if (e.name === "oneOrMore") {
-        getChildren(e.e[0], children);
-    } else if (e.name === "attribute" || e.name === "value" ||
-            e.name === "data" || e.name === "text" || e.name === "empty") {
-        name = null; // ignore
-    } else {
-        runtime.log("OOPS " + e.name);
-        throw null;
-    }
-}
-function childrenToParents(childrenmap) {
-    "use strict";
-    var p, children, c, parents = {};
-    for (p in childrenmap) {
-        if (childrenmap.hasOwnProperty(p)) {
-            children = childrenmap[p];
-            for (c in children) {
-                if (children.hasOwnProperty(c)) {
-                    if (!parents.hasOwnProperty(c)) {
-                        parents[c] = {};
-                    }
-                    parents[c][p] = 1;
-                }
-            }
-        }
-    }
-    return parents;
-}
-function toCPP(elements) {
-    "use strict";
-    out("#include <KoXmlWriter.h>");
-
-    // first get a mapping for all the parents
-    var children = {}, parents = {}, i, j, ce, ec, name, names, c,
-        elementMap = {}, sortedElementNames = [];
-    for (i = 0; i < elements.length; i += 1) {
-        ce = elements[i];
-        if (ce.name !== "element") {
-            runtime.log("Error in parsed data.");
-            return;
-        }
-        names = [];
-        getNames(ce.e[0], names);
-        for (j = 0; j < names.length; j += 1) {
-            name = getName(names[j]);
-            while (elementMap.hasOwnProperty(name)) {
-                name = name + "_";
-            }
-            names[j].cppname = name;
-            ec = {e: [names[j], ce.e[1]]};
-            elementMap[name] = ec;
-            sortedElementNames.push(name);
-        }
-    }
-    sortedElementNames.sort();
-
-    for (i = 0; i < sortedElementNames.length; i += 1) {
-        name = sortedElementNames[i];
-        c = {};
-        getChildren(elementMap[name].e[1], c);
-        children[name] = c;
-    }
-    parents = childrenToParents(children);
-
-    for (i = 0; i < sortedElementNames.length; i += 1) {
-        name = sortedElementNames[i];
-        out("class " + name + "Writer;");
-    }
-    for (i = 0; i < sortedElementNames.length; i += 1) {
-        name = sortedElementNames[i];
-        defineClass(elementMap[name], parents[name], children[name]);
-    }
-    for (i = 0; i < sortedElementNames.length; i += 1) {
-        name = sortedElementNames[i];
-        defineConstructors(elementMap[name], parents[name]);
-    }
-}
-
-// load and parse the Relax NG
-runtime.loadXML(relaxngurl, function (err, dom) {
-    "use strict";
-    var parser = new xmldom.RelaxNGParser();
-    if (err) {
-        runtime.log(err);
-    } else {
-        err = parser.parseRelaxNGDOM(dom);
-        if (err) {
-            runtime.log(err);
-        } else {
-            toCPP(parser.elements);
-        }
-    }
-});
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test01.rng b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test01.rng
deleted file mode 100644
index 0c4e4baa8d..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test01.rng
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<grammar
-	xmlns="http://relaxng.org/ns/structure/1.0"
-
-	xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
->
-	<start>
-		<ref name="office-document-content"/>
-	</start>
-	<define name="office-document-content">
-		<element name="office:document-content">
-			<ref name="office-document-common-attrs"/>
-			<ref name="office-scripts"/>
-			<ref name="office-body"/>
-		</element>
-	</define>
-	<define name="office-document-common-attrs">
-		<attribute name="office:version">
-			<value>1.2</value>
-		</attribute>
-	</define>
-	<define name="office-scripts">
-		<optional>
-			<element name="office:scripts">
-				<empty/>
-			</element>
-		</optional>
-	</define>
-	<define name="office-body">
-		<element name="office:body">
-			<element name="office:text">
-				<empty/>
-			</element>
-		</element>
-	</define>
-</grammar>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test01.xml b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test01.xml
deleted file mode 100644
index 71712e11e5..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test01.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<office:document-content xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" office:version="1.2">
- <office:scripts/>
- <!--comment-->
- <office:body>
-  <office:text/>
- </office:body>
-</office:document-content>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test02.rng b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test02.rng
deleted file mode 100644
index ed37e255fd..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test02.rng
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<grammar
-	xmlns="http://relaxng.org/ns/structure/1.0"
-
-	xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
-	xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
->
-	<start>
-		<ref name="office-document-content"/>
-	</start>
-	<define name="office-document-content">
-		<element name="office:document-content">
-			<ref name="office-document-common-attrs"/>
-			<ref name="office-scripts"/>
-			<ref name="office-automatic-styles"/>
-			<ref name="office-body"/>
-		</element>
-	</define>
-	<define name="office-automatic-styles">
-		<optional>
-			<element name="office:automatic-styles">
-				<zeroOrMore>
-					<element name="style:style">
-						<attribute name="style:name"><value>NamespaceTable</value></attribute>
-						<ref name="style-style-content"/>
-					</element>
-				</zeroOrMore>
-			</element>
-		</optional>
-	</define>
-	<define name="office-document-common-attrs">
-		<attribute name="office:version">
-			<value>1.2</value>
-		</attribute>
-	</define>
-	<define name="office-scripts">
-		<optional>
-			<element name="office:scripts">
-				<empty/>
-			</element>
-		</optional>
-	</define>
-	<define name="office-body">
-		<element name="office:body">
-			<element name="office:text">
-				<empty/>
-			</element>
-		</element>
-	</define>
-	<define name="style-table-properties">
-		<element name="style:table-properties">
-			<empty/>
-		</element>
-	</define>
-	<define name="style-chart-properties">
-		<element name="style:chart-properties">
-			<empty/>
-		</element>
-	</define>
-	<define name="style-style-content">
-		<choice>
-			<group>
-				<attribute name="style:family">
-					<value>chart</value>
-				</attribute>
-				<optional>
-					<ref name="style-chart-properties"/>
-				</optional>
-			</group>
-			<group>
-				<attribute name="style:family">
-					<value>table</value>
-				</attribute>
-				<optional>
-					<ref name="style-table-properties"/>
-				</optional>
-			</group>
-		</choice>
-	</define>
-</grammar>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test02.xml b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test02.xml
deleted file mode 100644
index 7e70255ed4..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test02.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<office:document-content xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" office:version="1.2">
- <office:automatic-styles>
-  <style:style style:name="NamespaceTable" style:family="table">
-   <style:table-properties/>
-  </style:style>
- </office:automatic-styles>
- <office:body>
-  <office:text>
-  </office:text>
- </office:body>
-</office:document-content>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test03.rng b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test03.rng
deleted file mode 100644
index 8803f52898..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test03.rng
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<grammar
-	xmlns="http://relaxng.org/ns/structure/1.0"
-	xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
->
-	<start>
-		<element name="office:a">
-			<interleave>
-				<text/>
-				<element name="office:b">
-					<empty/>
-				</element>
-			</interleave>
-		</element>
-	</start>
-</grammar>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test03.xml b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test03.xml
deleted file mode 100644
index a6255e802e..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test03.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<office:a xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0">
-	hello
-	<office:b/>
-	hi
-</office:a>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test04.rng b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test04.rng
deleted file mode 100644
index 511b297efa..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test04.rng
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<grammar
-	xmlns="http://relaxng.org/ns/structure/1.0"
-	xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
->
-	<start>
-		<element name="office:document-content">
-			<interleave>
-				<attribute name="office:version">
-					<value>1.2</value>
-				</attribute>
-			</interleave>
-			<element name="office:body">
-				<empty/>
-			</element>
-		</element>
-	</start>
-</grammar>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test04.xml b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test04.xml
deleted file mode 100644
index 21ceee55b1..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test04.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<office:document-content xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"  office:version="1.2">
- <office:body>
- </office:body>
-</office:document-content>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test05.rng b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test05.rng
deleted file mode 100644
index c0c73052f2..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test05.rng
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<grammar
-	xmlns="http://relaxng.org/ns/structure/1.0"
-	xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
-	xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
->
-	<start>
-		<ref name="office-document-content"/>
-	</start>
-	<define name="office-document-content">
-		<element name="office:document-content">
-			<attribute name="office:version">
-				<value>1.2</value>
-			</attribute>
-			<ref name="office-body"/>
-		</element>
-	</define>
-	<define name="office-body">
-		<element name="office:body">
-			<element name="office:text">
-				<zeroOrMore>
-					<ref name="text-p"/>
-				</zeroOrMore>
-			</element>
-		</element>
-	</define>
-	<define name="text-p">
-		<element name="text:p">
-			<zeroOrMore>
-				<ref name="paragraph-content"/>
-			</zeroOrMore>
-		</element>
-	</define>
-	<define name="paragraph-content">
-		<choice>
-			<text/>
-			<element name="text:s">
-				<empty/>
-			</element>
-		</choice>
-	</define>
-</grammar>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test05.xml b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test05.xml
deleted file mode 100644
index 38cb418bde..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test05.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<office:document-content xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" office:version="1.2">
- <office:body>
-  <office:text>
-   <text:p>
-   </text:p>
-  </office:text>
- </office:body>
-</office:document-content>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test06.rng b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test06.rng
deleted file mode 100644
index c744850f98..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test06.rng
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<grammar
-	xmlns="http://relaxng.org/ns/structure/1.0"
-	xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
->
-	<start>
-		<element name="office:a">
-			<text/>
-		</element>
-	</start>
-</grammar>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test06.xml b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test06.xml
deleted file mode 100644
index a9c24656ea..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test06.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<office:a xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0">
-	hello
-</office:a>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test07.rng b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test07.rng
deleted file mode 100644
index fb37cf8275..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test07.rng
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<grammar
-	xmlns="http://relaxng.org/ns/structure/1.0"
-	xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
-	xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0"
->
-	<start>
-		<element name="office:document">
-			<attribute name="office:version">
-				<value>1.2</value>
-			</attribute>
-			<attribute name="office:mimetype">
-				<ref name="string"/>
-			</attribute>
-			<ref name="office-settings"/>
-			<ref name="office-body"/>
-		</element>
-	</start>
-	<define name="office-body">
-		<element name="office:body">
-			<element name="office:text">
-				<empty/>
-			</element>
-		</element>
-	</define>
-	<define name="office-settings">
-		<element name="office:settings">
-			<element name="config:config-item-set">
-				<attribute name="config:name">
-					<ref name="string"/>
-				</attribute>
-				<element name="config:config-item">
-					<interleave>
-						<attribute name="config:name">
-							<ref name="string"/>
-						</attribute>
-						<attribute name="config:type">
-							<choice>
-								<value>boolean</value>
-								<value>short</value>
-							</choice>
-						</attribute>
-					</interleave>
-					<text/>
-				</element>
-			</element>
-		</element>
-	</define>
-	<define name="string">
-		<data type="string"/>
-	</define>
-</grammar>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test07.xml b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test07.xml
deleted file mode 100644
index a5361bf155..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test07.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
-                 xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0"
-                 office:version="1.2"
-                 office:mimetype="application/vnd.oasis.opendocument.text">
-   <office:settings>
-      <config:config-item-set config:name="ooo:configuration-settings">
-         <config:config-item config:name="UpdateFromTemplate" config:type="boolean">true</config:config-item>
-      </config:config-item-set>
-   </office:settings>
-   <office:body>
-      <office:text/>
-   </office:body>
-</office:document>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test08.rng b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test08.rng
deleted file mode 100644
index 82c2de66c5..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test08.rng
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<grammar
-	xmlns="http://relaxng.org/ns/structure/1.0"
-	xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
-	xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0"
->
-	<start>
-		<element name="office:document">
-			<attribute name="office:version">
-				<value>1.2</value>
-			</attribute>
-			<attribute name="office:mimetype">
-				<ref name="string"/>
-			</attribute>
-			<ref name="office-settings"/>
-			<ref name="office-body"/>
-		</element>
-	</start>
-	<define name="office-body">
-		<element name="office:body">
-			<element name="office:text">
-				<empty/>
-			</element>
-		</element>
-	</define>
-	<define name="office-settings">
-		<element name="office:settings">
-			<element name="config:config-item-set">
-				<attribute name="config:name">
-					<ref name="string"/>
-				</attribute>
-				<element name="config:config-item">
-					<interleave>
-						<attribute name="config:name">
-							<ref name="string"/>
-						</attribute>
-						<attribute name="config:type">
-							<choice>
-								<value>boolean</value>
-								<value>string</value>
-							</choice>
-						</attribute>
-					</interleave>
-					<text/>
-				</element>
-			</element>
-		</element>
-	</define>
-	<define name="string">
-		<data type="string"/>
-	</define>
-</grammar>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test08.xml b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test08.xml
deleted file mode 100644
index 71af08046c..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test08.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
-                 xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0"
-                 office:version="1.2"
-                 office:mimetype="application/vnd.oasis.opendocument.text">
-   <office:settings>
-      <config:config-item-set config:name="ooo:configuration-settings">
-         <config:config-item config:name="PrintFaxName" config:type="string"/>
-      </config:config-item-set>
-   </office:settings>
-   <office:body>
-      <office:text/>
-   </office:body>
-</office:document>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test09.rng b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test09.rng
deleted file mode 100644
index 1726996897..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test09.rng
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<grammar
-	xmlns="http://relaxng.org/ns/structure/1.0"
-	xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
-	xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
-	xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
->
-	<start>
-		<element name="office:document">
-			<attribute name="office:version">
-				<value>1.2</value>
-			</attribute>
-			<attribute name="office:mimetype">
-				<data type="string"/>
-			</attribute>
-			<element name="office:body">
-				<element name="office:text">
-					<element name="text:p">
-						<choice>
-							<text/>
-							<element name="draw:frame">
-								<empty/>
-							</element>
-						</choice>
-					</element>
-				</element>
-			</element>
-		</element>
-	</start>
-</grammar>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test09.xml b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test09.xml
deleted file mode 100644
index a54dd99e4b..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test09.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
-                 xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
-                 xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
-                 office:version="1.2"
-                 office:mimetype="application/vnd.oasis.opendocument.text">
-   <office:body>
-      <office:text>
-         <text:p>
-            <draw:frame/>
-         </text:p>
-      </office:text>
-   </office:body>
-</office:document>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test10.rng b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test10.rng
deleted file mode 100644
index 5e271a4389..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test10.rng
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<grammar
-	xmlns="http://relaxng.org/ns/structure/1.0"
-	datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
-	xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
-	xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
-	xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
->
-	<start>
-		<element name="office:document">
-			<attribute name="office:version">
-				<value>1.2</value>
-			</attribute>
-			<attribute name="office:mimetype">
-				<data type="string"/>
-			</attribute>
-			<element name="office:styles">
-				<interleave>
-					<choice>
-						<empty/>
-						<oneOrMore>
-							<ref name="style-style"/>
-						</oneOrMore>
-					</choice>
-					<element name="style:default-style">
-						<ref name="style-style-content"/>
-					</element>
-				</interleave>
-			</element>
-			<element name="office:body">
-				<element name="office:text">
-					<empty/>
-				</element>
-			</element>
-		</element>
-	</start>
-	<define name="style-style">
-		<element name="style:style">
-			<attribute name="style:name">
-				<data type="NCName"/>
-			</attribute>
-			<ref name="style-style-content"/>
-		</element>
-	</define>
-	<define name="style-style-content">
-		<attribute name="style:family">
-			<value>text</value>
-		</attribute>
-	</define>
-</grammar>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test10.xml b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test10.xml
deleted file mode 100644
index f4087a8976..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test10.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
-                 xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
-                 office:version="1.2"
-                 office:mimetype="application/vnd.oasis.opendocument.text">
-   <office:styles>
-      <style:default-style style:family="text"/>
-      <style:style style:name="Standard" style:family="text"/>
-   </office:styles>
-   <office:body>
-      <office:text/>
-   </office:body>
-</office:document>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test11.rng b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test11.rng
deleted file mode 100644
index 2df604b5b8..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test11.rng
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<grammar
-	xmlns="http://relaxng.org/ns/structure/1.0"
-	datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
-	xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
-	xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
-	xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0"
->
-	<start>
-		<element name="office:document">
-			<attribute name="office:version">
-				<value>1.2</value>
-			</attribute>
-			<attribute name="office:mimetype">
-				<data type="string"/>
-			</attribute>
-			<element name="office:font-face-decls">
-				<choice>
-					<empty/>
-					<oneOrMore>
-						<ref name="style-font-face"/>
-					</oneOrMore>
-				</choice>
-			</element>
-			<element name="office:body">
-				<element name="office:text">
-					<empty/>
-				</element>
-			</element>
-		</element>
-	</start>
-	<define name="style-font-face">
-		<element name="style:font-face">
-			<ref name="style-font-face-attlist"/>
-		</element>
-	</define>
-	<define name="style-font-face-attlist">
-		<interleave>
-			<optional>
-				<attribute name="svg:ascent">
-					<ref name="integer"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="svg:descent">
-					<ref name="integer"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="svg:widths">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="svg:bbox">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="svg:ideographic">
-					<ref name="integer"/>
-				</attribute>
-			</optional>
-			<attribute name="style:name">
-				<ref name="string"/>
-			</attribute>
-		</interleave>
-	</define>
-	<define name="string">
-		<data type="string"/>
-	</define>
-	<define name="integer">
-		<data type="integer"/>
-	</define>
-</grammar>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test11.xml b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test11.xml
deleted file mode 100644
index d272fd4e3e..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test11.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
-                 xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
-                 office:version="1.2"
-                 office:mimetype="application/vnd.oasis.opendocument.text">
-   <office:font-face-decls>
-      <style:font-face style:name="LucidaSans"/>
-   </office:font-face-decls>
-   <office:body>
-      <office:text/>
-   </office:body>
-</office:document>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test12.rng b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test12.rng
deleted file mode 100644
index a0e79a356e..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test12.rng
+++ /dev/null
@@ -1,97 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<grammar
-	xmlns="http://relaxng.org/ns/structure/1.0"
-	xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
-	xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
-	xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0"
->
-	<start>
-		<element name="office:document">
-			<attribute name="office:version">
-				<value>1.2</value>
-			</attribute>
-			<attribute name="office:mimetype">
-				<data type="string"/>
-			</attribute>
-			<element name="office:styles">
-				<interleave>
-					<element name="style:default-style">
-						<ref name="style-style-content"/>
-					</element>
-				</interleave>
-			</element>
-			<element name="office:body">
-				<element name="office:text">
-					<empty/>
-				</element>
-			</element>
-		</element>
-	</start>
-	<define name="style-style-content">
-		<group>
-			<attribute name="style:family">
-				<value>text</value>
-			</attribute>
-			<element name="style:text-properties">
-				<ref name="style-text-properties-attlist"/>
-			</element>
-		</group>
-	</define>
-	<define name="style-text-properties-attlist">
-		<interleave>
-			<optional>
-				<attribute name="style:text-line-through-text">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:font-name">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:font-name-asian">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:font-name-complex">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="fo:font-family">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:font-family-asian">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:font-family-complex">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:font-style-name">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:font-style-name-asian">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-			<optional>
-				<attribute name="style:font-style-name-complex">
-					<ref name="string"/>
-				</attribute>
-			</optional>
-		</interleave>
-	</define>
-	<define name="string">
-		<data type="string"/>
-	</define>
-</grammar>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test12.xml b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test12.xml
deleted file mode 100644
index a3f2a5d725..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test12.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
-                 xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
-                 office:version="1.2"
-                 office:mimetype="application/vnd.oasis.opendocument.text">
-   <office:styles>
-      <style:default-style style:family="text">
-         <style:text-properties>
-         </style:text-properties>
-      </style:default-style>
-   </office:styles>
-   <office:body>
-      <office:text/>
-   </office:body>
-</office:document>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test13.rng b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test13.rng
deleted file mode 100644
index 47a2161ed9..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test13.rng
+++ /dev/null
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<grammar
-	xmlns="http://relaxng.org/ns/structure/1.0"
-	datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
-	xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
-	xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
-	xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
->
-	<start>
-		<element name="office:document">
-			<attribute name="office:version">
-				<value>1.2</value>
-			</attribute>
-			<attribute name="office:mimetype">
-				<data type="string"/>
-			</attribute>
-			<ref name="office-styles"/>
-			<element name="office:body">
-				<element name="office:text">
-					<empty/>
-				</element>
-			</element>
-		</element>
-	</start>
-	<define name="office-styles">
-		<element name="office:styles">
-			<interleave>
-				<interleave>
-					<ref name="style-style"/>
-					<ref name="text-list-style"/>
-				</interleave>
-				<ref name="text-outline-style"/>
-			</interleave>
-		</element>
-	</define>
-	<define name="style-style">
-		<element name="style:style">
-			<attribute name="style:name">
-				<ref name="styleName"/>
-			</attribute>
-			<attribute name="style:family">
-				<value>text</value>
-			</attribute>
-		</element>
-	</define>
-	<define name="text-list-style">
-		<element name="text:list-style">
-			<attribute name="style:name">
-				<ref name="styleName"/>
-			</attribute>
-		</element>
-	</define>
-	<define name="text-outline-style">
-		<element name="text:outline-style">
-			<attribute name="style:name">
-				<ref name="styleName"/>
-			</attribute>
-			<element name="text:outline-level-style">
-				<attribute name="text:level">
-					<data type="positiveInteger"/>
-				</attribute>
-			</element>
-		</element>
-	</define>
-	<define name="string">
-		<data type="string"/>
-	</define>
-	<define name="styleName">
-		<data type="NCName"/>
-	</define>
-</grammar>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test13.xml b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test13.xml
deleted file mode 100644
index 8f46daa4ce..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test13.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
-                 xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
-                 xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
-                 office:version="1.2"
-                 office:mimetype="application/vnd.oasis.opendocument.text">
-   <office:styles>
-      <style:style style:name="Formula" style:family="text"/>
-      <text:outline-style style:name="Outline">
-         <text:outline-level-style text:level="1"/>
-      </text:outline-style>
-      <text:list-style style:name="Numbering_20_1"/>
-   </office:styles>
-   <office:body>
-      <office:text/>
-   </office:body>
-</office:document>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test14.rng b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test14.rng
deleted file mode 100644
index 61a8c9e2b4..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test14.rng
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<grammar
-	xmlns="http://relaxng.org/ns/structure/1.0"
-	datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
-	xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
-	xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
-	xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
->
-	<start>
-		<element name="office:document">
-			<attribute name="office:version">
-				<value>1.2</value>
-			</attribute>
-			<attribute name="office:mimetype">
-				<data type="string"/>
-			</attribute>
-			<ref name="office-automatic-styles"/>
-			<element name="office:body">
-				<element name="office:text">
-					<empty/>
-				</element>
-			</element>
-		</element>
-	</start>
-	<define name="office-automatic-styles">
-		<element name="office:automatic-styles">
-			<interleave>
-				<element name="style:style">
-					<attribute name="style:name">
-						<data type="NCName"/>
-					</attribute>
-					<attribute name="style:family">
-						<value>table</value>
-					</attribute>
-				</element>
-				<choice>
-					<empty/>
-					<element name="text:list-style">
-						<empty/>
-					</element>
-				</choice>
-			</interleave>
-		</element>
-	</define>
-</grammar>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test14.xml b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test14.xml
deleted file mode 100644
index 6c16a1d614..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test14.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
-                 xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
-                 office:version="1.2"
-                 office:mimetype="application/vnd.oasis.opendocument.text">
-   <office:automatic-styles>
-      <style:style style:name="NamespaceTable" style:family="table"/>
-   </office:automatic-styles>
-   <office:body>
-      <office:text/>
-   </office:body>
-</office:document>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test15.rng b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test15.rng
deleted file mode 100644
index 63557c6e2b..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test15.rng
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<grammar
-	xmlns="http://relaxng.org/ns/structure/1.0"
-	datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
-	xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
-	xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
-	xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
-	xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0"
->
-	<start>
-		<element name="office:document">
-			<attribute name="office:version">
-				<value>1.2</value>
-			</attribute>
-			<attribute name="office:mimetype">
-				<data type="string"/>
-			</attribute>
-			<ref name="office-automatic-styles"/>
-			<element name="office:body">
-				<element name="office:text">
-					<empty/>
-				</element>
-			</element>
-		</element>
-	</start>
-	<define name="office-automatic-styles">
-		<element name="office:automatic-styles">
-			<interleave>
-				<oneOrMore>
-					<choice>
-						<empty/>
-						<element name="number:boolean-style">
-							<attribute name="style:name">
-								<data type="NCName"/>
-							</attribute>
-						</element>
-					</choice>
-				</oneOrMore>
-				<element name="number:text-style">
-					<attribute name="style:name">
-						<data type="NCName"/>
-					</attribute>
-				</element>
-			</interleave>
-		</element>
-	</define>
-</grammar>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test15.xml b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test15.xml
deleted file mode 100644
index 4d8361aaa6..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test15.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
-                 xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
-                 xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0"
-                 office:version="1.2"
-                 office:mimetype="application/vnd.oasis.opendocument.text">
-   <office:automatic-styles>
-      <number:boolean-style style:name="N99">
-      </number:boolean-style>
-      <number:text-style style:name="N100">
-      </number:text-style>
-      <number:boolean-style style:name="N5099">
-      </number:boolean-style>
-   </office:automatic-styles>
-   <office:body>
-      <office:text/>
-   </office:body>
-</office:document>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test16.rng b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test16.rng
deleted file mode 100644
index 32c6cb8e2c..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test16.rng
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<grammar
-	xmlns="http://relaxng.org/ns/structure/1.0"
-	datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
-	xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
-	xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
-	xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0"
->
-	<start>
-		<element name="office:document">
-			<attribute name="office:version">
-				<value>1.2</value>
-			</attribute>
-			<attribute name="office:mimetype">
-				<data type="string"/>
-			</attribute>
-			<element name="office:automatic-styles">
-				<ref name="styles"/>
-			</element>
-			<element name="office:body">
-				<element name="office:text">
-					<empty/>
-				</element>
-			</element>
-		</element>
-	</start>
-	<define name="styles">
-		<interleave>
-			<choice>
-				<empty/>
-				<oneOrMore>
-					<element name="number:boolean-style">
-						<attribute name="style:name">
-							<data type="NCName"/>
-						</attribute>
-					</element>
-				</oneOrMore>
-			</choice>
-			<element name="number:text-style">
-				<attribute name="style:name">
-					<data type="NCName"/>
-				</attribute>
-			</element>
-		</interleave>
-	</define>
-</grammar>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test16.xml b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test16.xml
deleted file mode 100644
index 4d8361aaa6..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test16.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
-                 xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
-                 xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0"
-                 office:version="1.2"
-                 office:mimetype="application/vnd.oasis.opendocument.text">
-   <office:automatic-styles>
-      <number:boolean-style style:name="N99">
-      </number:boolean-style>
-      <number:text-style style:name="N100">
-      </number:text-style>
-      <number:boolean-style style:name="N5099">
-      </number:boolean-style>
-   </office:automatic-styles>
-   <office:body>
-      <office:text/>
-   </office:body>
-</office:document>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test17.rng b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test17.rng
deleted file mode 100644
index ffcd9bd4f9..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test17.rng
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<grammar
-	xmlns="http://relaxng.org/ns/structure/1.0"
-	xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
-	xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
->
-	<start>
-		<element name="office:document">
-			<attribute name="office:version">
-				<value>1.2</value>
-			</attribute>
-			<attribute name="office:mimetype">
-				<data type="string"/>
-			</attribute>
-			<ref name="office-body"/>
-		</element>
-	</start>
-	<define name="office-body">
-		<element name="office:body">
-			<element name="office:text">
-				<element name="text:p">
-					<zeroOrMore>
-						<ref name="paragraph-content"/>
-					</zeroOrMore>
-				</element>
-			</element>
-		</element>
-	</define>
-	<define name="paragraph-content">
-		<choice>
-			<text/>
-			<element name="text:conditional-text">
-				<ref name="text-conditional-text-attlist"/>
-				<text/>
-			</element>
-		</choice>
-	</define>
-	<define name="text-conditional-text-attlist">
-		<interleave>
-			<attribute name="text:condition">
-				<data type="string"/>
-			</attribute>
-			<attribute name="text:string-value-if-true">
-				<data type="string"/>
-			</attribute>
-			<attribute name="text:string-value-if-false">
-				<data type="string"/>
-			</attribute>
-		</interleave>
-	</define>
-</grammar>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test17.xml b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test17.xml
deleted file mode 100644
index 0947bff2b1..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test17.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
-                 xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
-                 xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
-                 office:version="1.2"
-                 office:mimetype="application/vnd.oasis.opendocument.text">
-   <office:body>
-      <office:text>
-         <text:p>
-            <text:conditional-text text:condition="test"
-                text:string-value-if-true="a"
-                text:string-value-if-false="" />
-            03
-         </text:p>
-      </office:text>
-   </office:body>
-</office:document>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test18.rng b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test18.rng
deleted file mode 100644
index 9ddbb9baaf..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test18.rng
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<grammar xmlns="http://relaxng.org/ns/structure/1.0"
-	datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
-	xmlns:manifest="urn:oasis:names:tc:opendocument:xmlns:manifest:1.0"
->
-	<start>
-		<element name="manifest:manifest">
-			<attribute name="manifest:version">
-				<value>1.2</value>
-			</attribute>
-			<oneOrMore>
-				<element name="manifest:file-entry">
-					<interleave>
-						<attribute name="manifest:full-path">
-							<data type="string"/>
-						</attribute>
-						<attribute name="manifest:media-type">
-							<data type="string"/>
-						</attribute>
-					</interleave>
-				</element>
-			</oneOrMore>
-		</element>
-	</start>
-</grammar>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test18.xml b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test18.xml
deleted file mode 100644
index cc6ab02761..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test18.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<manifest:manifest xmlns:manifest="urn:oasis:names:tc:opendocument:xmlns:manifest:1.0" manifest:version="1.2" >
- <manifest:file-entry manifest:media-type="a" manifest:full-path="a"/>
- <manifest:file-entry manifest:media-type="a" manifest:full-path="a"/>
- <manifest:file-entry manifest:media-type="a" manifest:full-path="a"/>
-</manifest:manifest>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test19.rng b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test19.rng
deleted file mode 100644
index ac676d982d..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test19.rng
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<grammar
-	xmlns="http://relaxng.org/ns/structure/1.0"
-	xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
-	xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
->
-	<start>
-		<element name="office:document">
-			<attribute name="office:version">
-				<value>1.2</value>
-			</attribute>
-			<attribute name="office:mimetype">
-				<data type="string"/>
-			</attribute>
-			<ref name="office-body"/>
-		</element>
-	</start>
-	<define name="office-body">
-		<element name="office:body">
-			<element name="office:text">
-				<element name="text:p">
-					<oneOrMore>
-						<ref name="paragraph-content"/>
-					</oneOrMore>
-				</element>
-			</element>
-		</element>
-	</define>
-	<define name="paragraph-content">
-		<choice>
-			<element>
-				<choice>
-					<name>text:reference-ref</name>
-					<name>text:bookmark-ref</name>
-				</choice>
-				<empty/>
-			</element>
-			<element name="text:span">
-				<empty/>
-			</element>
-		</choice>
-	</define>
-</grammar>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test19.xml b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test19.xml
deleted file mode 100644
index c562015a37..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test19.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
-                 xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
-                 office:version="1.2"
-                 office:mimetype="application/vnd.oasis.opendocument.text">
-	<office:body>
-		<office:text>
-			<text:p><text:reference-ref/><text:span/></text:p>
-		</office:text>
-	</office:body>
-</office:document>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test20.rng b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test20.rng
deleted file mode 100644
index bd6b4e0f05..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test20.rng
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<grammar
-	xmlns="http://relaxng.org/ns/structure/1.0"
-	xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
-	xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
-	datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
->
-	<start>
-		<element name="office:document-content">
-			<attribute name="office:version">
-				<value>1.2</value>
-			</attribute>
-			<ref name="office-body"/>
-		</element>
-	</start>
-	<define name="office-body">
-		<element name="office:body">
-			<element name="office:text">
-				<element name="text:p">
-					<zeroOrMore>
-						<choice>
-							<text/>
-							<element name="text:s">
-								<empty/>
-							</element>
-						</choice>
-					</zeroOrMore>
-				</element>
-			</element>
-		</element>
-	</define>
-</grammar>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test20.xml b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test20.xml
deleted file mode 100644
index e28b855386..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test20.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<office:document-content
-  xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
-  xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
-  office:version="1.2">
-  <office:body>
-    <office:text>
-      <text:p>,<text:s/>,</text:p>
-    </office:text>
-  </office:body>
-</office:document-content>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test21.rng b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test21.rng
deleted file mode 100644
index 032886009d..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test21.rng
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<grammar
-	xmlns="http://relaxng.org/ns/structure/1.0"
-	xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
-	xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
->
-	<start>
-		<element name="office:document-content">
-			<attribute name="office:version">
-				<value>1.2</value>
-			</attribute>
-			<ref name="office-body"/>
-		</element>
-	</start>
-	<define name="office-body">
-		<element name="office:body">
-			<element name="office:text">
-				<element name="text:p">
-					<zeroOrMore>
-						<ref name="paragraph-content"/>
-					</zeroOrMore>
-				</element>
-			</element>
-		</element>
-	</define>
-	<define name="paragraph-content">
-		<choice>
-			<text/>
-			<element name="text:bibliography-mark">
-				<attribute name="text:bibliography-type">
-					<value>misc</value>
-				</attribute>
-				<zeroOrMore>
-					<attribute>
-						<choice>
-							<name>text:url</name>
-							<name>text:custom5</name>
-							<name>text:year</name>
-						</choice>
-						<data type="string"/>
-					</attribute>
-				</zeroOrMore>
-				<text/>
-			</element>
-		</choice>
-	</define>
-</grammar>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test21.xml b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test21.xml
deleted file mode 100644
index fec92948f9..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test21.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<office:document-content
-  xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
-  xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
-  office:version="1.2">
-  <office:body>
-    <office:text>
-      <text:p><text:bibliography-mark text:bibliography-type="misc" text:year="F" text:url="h" text:custom5="i"/></text:p>
-    </office:text>
-  </office:body>
-</office:document-content>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test22.rng b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test22.rng
deleted file mode 100644
index 154c810975..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test22.rng
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<grammar
-	xmlns="http://relaxng.org/ns/structure/1.0"
-	xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
-	xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
-	datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
->
-	<start>
-		<element name="office:document">
-			<attribute name="office:version">
-				<value>1.2</value>
-			</attribute>
-			<attribute name="office:mimetype">
-				<data type="string"/>
-			</attribute>
-			<ref name="office-body"/>
-		</element>
-	</start>
-	<define name="office-body">
-		<element name="office:body">
-			<element name="office:text">
-				<element name="text:list">
-					<optional>
-						<attribute name="xml:id">
-							<data type="ID"/>
-						</attribute>
-					</optional>
-				</element>
-			</element>
-		</element>
-	</define>
-</grammar>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test22.xml b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test22.xml
deleted file mode 100644
index dd84419d66..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test22.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<office:document xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
-                 xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
-                 office:version="1.2"
-                 office:mimetype="application/vnd.oasis.opendocument.text">
-   <office:body>
-      <office:text>
-         <text:list xml:id="l"/>
-      </office:text>
-   </office:body>
-</office:document>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test23.rng b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test23.rng
deleted file mode 100644
index 1a02206d04..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test23.rng
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<grammar 
-    xmlns="http://relaxng.org/ns/structure/1.0"
-    datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
-    xmlns:manifest="urn:oasis:names:tc:opendocument:xmlns:manifest:1.0">
-<define name="manifest">
-    <element name="manifest:manifest">
-        <oneOrMore>
-            <ref name="file-entry"/>
-        </oneOrMore>
-    </element>
-</define>
-<start>
-    <choice>
-        <ref name="manifest"/>
-    </choice>
-</start>
-<define name="file-entry">
-    <element name="manifest:file-entry">
-        <ref name="file-entry-attlist"/>
-    </element>
-</define>
-<define name="file-entry-attlist" combine="interleave">
-    <attribute name="manifest:full-path">
-        <data type="string"/>
-    </attribute>
-</define>
-<define name="file-entry-attlist" combine="interleave">
-    <attribute name="manifest:media-type">
-        <data type="string"/>
-    </attribute>
-</define>
-</grammar>
diff --git a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test23.xml b/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test23.xml
deleted file mode 100644
index b622196b05..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/relaxngtests/test23.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<manifest:manifest xmlns:manifest="urn:oasis:names:tc:opendocument:xmlns:manifest:1.0">
- <manifest:file-entry manifest:media-type="text/xml" manifest:full-path="settings.xml"/>
-</manifest:manifest>
diff --git a/apps/files_odfviewer/src/webodf/webodf/roundtripodf.js b/apps/files_odfviewer/src/webodf/webodf/roundtripodf.js
deleted file mode 100644
index 6d16d1b2a3..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/roundtripodf.js
+++ /dev/null
@@ -1,71 +0,0 @@
-/**
- * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
- * @licstart
- * The JavaScript code in this page is free software: you can redistribute it
- * and/or modify it under the terms of the GNU Affero General Public License
- * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.  The code is distributed
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
- *
- * As additional permission under GNU AGPL version 3 section 7, you
- * may distribute non-source (e.g., minimized or compacted) forms of
- * that code without the copy of the GNU GPL normally required by
- * section 4, provided you include this license notice and a URL
- * through which recipients can access the Corresponding Source.
- *
- * As a special exception to the AGPL, any HTML file which merely makes function
- * calls to this code, and for that purpose includes it by reference shall be
- * deemed a separate work for copyright law purposes. In addition, the copyright
- * holders of this code give you permission to combine this code with free
- * software libraries that are released under the GNU LGPL. You may copy and
- * distribute such a system following the terms of the GNU AGPL for this code
- * and the LGPL for the libraries. If you modify this code, you may extend this
- * exception to your version of the code, but you are not obligated to do so.
- * If you do not wish to do so, delete this exception statement from your
- * version.
- *
- * This license applies to this entire compilation.
- * @licend
- * @source: http://www.webodf.org/
- * @source: http://gitorious.org/odfkit/webodf/
- */
-/*global runtime: true, core: true, odf: true*/
-runtime.loadClass("odf.OdfContainer");
-
-/**
- * If the state of the OdfContainer is invalid, exit with an error message.
- */
-function exitOnInvalid(odffilepath, odfcontainer) {
-    "use strict";
-    if (odfcontainer.state === odf.OdfContainer.INVALID) {
-        runtime.log("Document " + odffilepath + " is invalid.");
-        runtime.exit(1);
-    }
-    if (odfcontainer.state === odf.OdfContainer.DONE) {
-        odfcontainer.save(function (err) {
-            if (err) {
-                runtime.log(err);
-                runtime.exit(1);
-            }
-        });
-    }
-}
-
-/**
- * Load an ODF document. Report an error if there is a problem.
- */
-function loadODF(odffilepath) {
-    "use strict";
-    var odfcontainer = new odf.OdfContainer(odffilepath);
-    odfcontainer.onstatereadychange = function () {
-        exitOnInvalid(odffilepath, odfcontainer);
-    };
-    exitOnInvalid(odffilepath, odfcontainer);
-}
-
-// loop over arguments to load ODF
-var i;
-for (i = 1; i < arguments.length; i += 1) {
-    loadODF(arguments[i]);
-}
diff --git a/apps/files_odfviewer/src/webodf/webodf/roundtripzip.js b/apps/files_odfviewer/src/webodf/webodf/roundtripzip.js
deleted file mode 100644
index d3fe17fc81..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/roundtripzip.js
+++ /dev/null
@@ -1,64 +0,0 @@
-/**
- * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
- * @licstart
- * The JavaScript code in this page is free software: you can redistribute it
- * and/or modify it under the terms of the GNU Affero General Public License
- * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.  The code is distributed
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
- *
- * As additional permission under GNU AGPL version 3 section 7, you
- * may distribute non-source (e.g., minimized or compacted) forms of
- * that code without the copy of the GNU GPL normally required by
- * section 4, provided you include this license notice and a URL
- * through which recipients can access the Corresponding Source.
- *
- * As a special exception to the AGPL, any HTML file which merely makes function
- * calls to this code, and for that purpose includes it by reference shall be
- * deemed a separate work for copyright law purposes. In addition, the copyright
- * holders of this code give you permission to combine this code with free
- * software libraries that are released under the GNU LGPL. You may copy and
- * distribute such a system following the terms of the GNU AGPL for this code
- * and the LGPL for the libraries. If you modify this code, you may extend this
- * exception to your version of the code, but you are not obligated to do so.
- * If you do not wish to do so, delete this exception statement from your
- * version.
- *
- * This license applies to this entire compilation.
- * @licend
- * @source: http://www.webodf.org/
- * @source: http://gitorious.org/odfkit/webodf/
- */
-/*global runtime: true, core: true*/
-runtime.loadClass("core.Zip");
-
-/**
- * Load an ODF document. Report an error if there is a problem.
- */
-function roundTripZip(zipfilepath) {
-    "use strict";
-    var zip = new core.Zip(zipfilepath, function (err, zip) {
-        if (err) {
-            runtime.log(err);
-            runtime.exit(1);
-        }
-        // the TOC of the zip is loaded at this point
-        // now we want to load all parts in memory so we can save them again
-        zip.write(function (err) {
-            if (err) {
-                runtime.log(err);
-                runtime.exit(1);
-            }
-            // at this point a zip file should have been written with the same
-            // contents as the one that was read
-            runtime.exit(0);
-        });
-    });
-}
-
-// loop over arguments to load ODF
-var i;
-for (i = 1; i < arguments.length; i += 1) {
-    roundTripZip(arguments[i]);
-}
diff --git a/apps/files_odfviewer/src/webodf/webodf/styleNameRef b/apps/files_odfviewer/src/webodf/webodf/styleNameRef
deleted file mode 100644
index 39b2914746..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/styleNameRef
+++ /dev/null
@@ -1,272 +0,0 @@
-# cat styles.xml|xmlstarlet sel -N style=urn:oasis:names:tc:opendocument:xmlns:style:1.0 -t -m "//*[@style:family='graphic']/@style:name" -v . -
-
-gradient
-	draw:fill-gradient-name	style:drawing-page-properties
-	draw:fill-gradient-name	style:graphic-properties
-
-hatch
-	draw:fill-hatch-name	style:drawing-page-properties
-	draw:fill-hatch-name	style:graphic-properties
-
-fill-image
-	draw:fill-image-name	style:drawing-page-properties
-	draw:fill-image-name	style:graphic-properties
-
-marker
-	draw:marker-end	style:graphic-properties
-	draw:marker-start	style:graphic-properties
-
-dash
-	draw:stroke-dash	style:graphic-properties
-
-opacity
-	draw:opacity-name	style:drawing-page-properties
-	draw:opacity-name	style:graphic-properties
-
-master page
-	draw:master-page-name	draw:page
-	style:master-page-name	style:style
-	style:next-style-name	style:master-page
-	text:master-page-name	text:notes-configuration
-	text:master-page-name	text:page
-
-presentation-page-layout
-	presentation:presentation-page-layout-name	draw:page
-	presentation:presentation-page-layout-name	draw:handout-master
-
-page-layout
-	style:page-layout-name	presentation:notes
-	style:page-layout-name	style:handout-master
-	style:page-layout-name	style:master-page
-
-list
-	text:style-name	text:list
-	text:style-name	text:numbered-paragraph
-	text:style-override	text:list-item
-	style:list-style-name	style:style
-
-data
-	style:data-style-name	style:style
-	style:percentage-data-style-name	style:style
-	style:data-style-name	presentation:date-time-decl
-	style:data-style-name	text:creation-date
-	style:data-style-name	text:creation-time
-	style:data-style-name	text:database-display
-	style:data-style-name	text:date
-	style:data-style-name	text:editing-duration
-	style:data-style-name	text:expression
-	style:data-style-name	text:meta-field
-	style:data-style-name	text:modification-date
-	style:data-style-name	text:modification-time
-	style:data-style-name	text:print-date
-	style:data-style-name	text:print-time
-	style:data-style-name	text:table-formula
-	style:data-style-name	text:time
-	style:data-style-name	text:user-defined
-	style:data-style-name	text:user-field-get
-	style:data-style-name	text:user-field-input
-	style:data-style-name	text:variable-get
-	style:data-style-name	text:variable-input
-	style:data-style-name	text:variable-set
-
-chart
-	chart:style-name	chart:axis
-	chart:style-name	chart:chart
-	chart:style-name	chart:data-label
-	chart:style-name	chart:data-point
-	chart:style-name	chart:equation
-	chart:style-name	chart:error-indicator
-	chart:style-name	chart:floor
-	chart:style-name	chart:footer
-	chart:style-name	chart:grid
-	chart:style-name	chart:legend
-	chart:style-name	chart:mean-value
-	chart:style-name	chart:plot-area
-	chart:style-name	chart:regression-curve
-	chart:style-name	chart:series
-	chart:style-name	chart:stock-gain-marker
-	chart:style-name	chart:stock-loss-marker
-	chart:style-name	chart:stock-range-line
-	chart:style-name	chart:subtitle
-	chart:style-name	chart:title
-	chart:style-name	chart:wall
-
-----
-
-drawing-page
-	draw:style-name	draw:page
-	draw:style-name	presentation:notes
-	draw:style-name	style:handout-master
-	draw:style-name	style:master-page
-
-graphic
-	draw:style-name	dr3d:cube
-	draw:style-name	dr3d:extrude
-	draw:style-name	dr3d:rotate
-	draw:style-name	dr3d:scene
-	draw:style-name	dr3d:sphere
-	draw:style-name	draw:caption
-	draw:style-name	draw:circle
-	draw:style-name	draw:connector
-	draw:style-name	draw:control
-	draw:style-name	draw:custom-shape
-	draw:style-name	draw:ellipse
-	draw:style-name	draw:frame
-	draw:style-name	draw:g
-	draw:style-name	draw:line
-	draw:style-name	draw:measure
-	draw:style-name	draw:page-thumbnail
-	draw:style-name	draw:path
-	draw:style-name	draw:polygon
-	draw:style-name	draw:polyline
-	draw:style-name	draw:rect
-	draw:style-name	draw:regular-polygon
-	draw:style-name	office:annotation
-
-paragraph
-	draw:text-style-name	draw:caption
-	draw:text-style-name	draw:circle
-	draw:text-style-name	draw:connector
-	draw:text-style-name	draw:control
-	draw:text-style-name	draw:custom-shape
-	draw:text-style-name	draw:ellipse
-	draw:text-style-name	draw:frame
-	draw:text-style-name	draw:line
-	draw:text-style-name	draw:measure
-	draw:text-style-name	draw:path
-	draw:text-style-name	draw:polygon
-	draw:text-style-name	draw:polyline
-	draw:text-style-name	draw:rect
-	draw:text-style-name	draw:regular-polygon
-	draw:text-style-name	office:annotation
-	form:text-style-name	form:column
-	style:next-style-name	style:style
-	table:paragraph-style-name	table:body
-	table:paragraph-style-name	table:even-columns
-	table:paragraph-style-name	table:even-rows
-	table:paragraph-style-name	table:first-column
-	table:paragraph-style-name	table:first-row
-	table:paragraph-style-name	table:last-column
-	table:paragraph-style-name	table:last-row
-	table:paragraph-style-name	table:odd-columns
-	table:paragraph-style-name	table:odd-rows
-	text:default-style-name	text:notes-configuration
-	text:style-name	text:alphabetical-index-entry-template
-	text:style-name	text:bibliography-entry-template
-	text:style-name	text:h
-	text:style-name	text:illustration-index-entry-template
-	text:style-name	text:index-source-style
-	text:style-name	text:object-index-entry-template
-	text:style-name	text:p
-	text:style-name	text:table-index-entry-template
-	text:style-name	text:table-of-content-entry-template
-	text:style-name	text:table-index-entry-template
-	text:style-name	text:user-index-entry-template
-	style:register-truth-ref-style-name	style:page-layout-properties
-
-presentation
-	presentation:style-name	dr3d:cube
-	presentation:style-name	dr3d:extrude
-	presentation:style-name	dr3d:rotate
-	presentation:style-name	dr3d:scene
-	presentation:style-name	dr3d:sphere
-	presentation:style-name	draw:caption
-	presentation:style-name	draw:circle
-	presentation:style-name	draw:connector
-	presentation:style-name	draw:control
-	presentation:style-name	draw:custom-shape
-	presentation:style-name	draw:ellipse
-	presentation:style-name	draw:frame
-	presentation:style-name	draw:g
-	presentation:style-name	draw:line
-	presentation:style-name	draw:measure
-	presentation:style-name	draw:page-thumbnail
-	presentation:style-name	draw:path
-	presentation:style-name	draw:polygon
-	presentation:style-name	draw:polyline
-	presentation:style-name	draw:rect
-	presentation:style-name	draw:regular-polygon
-	presentation:style-name	office:annotation
-
-ruby
-	text:style-name	text:ruby
-
-section
-	text:style-name	text:alphabetical-index
-	text:style-name	text:bibliography
-	text:style-name	text:illustration-index
-	text:style-name	text:index-title
-	text:style-name	text:object-index
-	text:style-name	text:section
-	text:style-name	text:table-of-content
-	text:style-name	text:table-index
-	text:style-name	text:user-index
-
-table-cell
-	db:default-cell-style-name	db:column
-	table:default-cell-style-name	table:table-column
-	table:default-cell-style-name	table:table-row
-	table:style-name	table:body
-	table:style-name	table:covered-table-cell
-	table:style-name	table:even-columns
-	table:style-name	table:covered-table-cell
-	table:style-name	table:even-columns
-	table:style-name	table:even-rows
-	table:style-name	table:first-column
-	table:style-name	table:first-row
-	table:style-name	table:last-column
-	table:style-name	table:last-row
-	table:style-name	table:odd-columns
-	table:style-name	table:odd-rows
-	table:style-name	table:table-cell
-
-table-row
-	db:default-row-style-name	db:query
-	db:default-row-style-name	db:table-representation
-	table:style-name	table:table-row
-
-table-column
-	db:style-name	db:column
-	table:style-name	table:table-column
-
-table
-	db:style-name	db:query
-	db:style-name	db:table-representation
-	table:style-name	table:background
-	table:style-name	table:table
-
-text
-	style:leader-text-style	style:tab-stop
-	style:style-name	style:drop-cap
-	text:citation-body-style-name	text:notes-configuration
-	text:citation-style-name	text:notes-configuration
-	text:style-name	text:a
-	text:style-name	text:alphabetical-index
-	text:style-name	text:linenumbering-configuration
-	text:style-name	text:list-level-style-number
-	text:style-name	text:ruby-text
-	text:style-name	text:span
-	text:visited-style-name	text:a
-	style:text-line-through-text-style	style:text-properties
-	text:main-entry-style-name	text:alphabetical-index-source
-	text:style-name	text:index-entry-bibliography
-	text:style-name	text:index-entry-chapter
-	text:style-name	text:index-entry-link-end
-	text:style-name	text:index-entry-link-start
-	text:style-name	text:index-entry-page-number
-	text:style-name	text:index-entry-span
-	text:style-name	text:index-entry-tab-stop
-	text:style-name	text:index-entry-text
-	text:style-name	text:index-title-template
-	text:style-name	text:list-level-style-bullet
-	text:style-name	text:outline-level-style
-
-
----
-
-conditional style
-	text:cond-style-name	text:h
-	text:cond-style-name	text:p
-
-style:apply-style-name # complicated!
-style:parent-style-name # complicated!
diff --git a/apps/files_odfviewer/src/webodf/webodf/styleNameRefs b/apps/files_odfviewer/src/webodf/webodf/styleNameRefs
deleted file mode 100644
index e63e3562df..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/styleNameRefs
+++ /dev/null
@@ -1,57 +0,0 @@
-dash
-	draw:stroke-dash-names	style:graphic-properties
-
-graphic
-	draw:class-names	dr3d:cube
-	draw:class-names	dr3d:extrude
-	draw:class-names	dr3d:rotate
-	draw:class-names	dr3d:scene
-	draw:class-names	dr3d:sphere
-	draw:class-names	draw:caption
-	draw:class-names	draw:circle
-	draw:class-names	draw:connector
-	draw:class-names	draw:control
-	draw:class-names	draw:custom-shape
-	draw:class-names	draw:ellipse
-	draw:class-names	draw:frame
-	draw:class-names	draw:g
-	draw:class-names	draw:line
-	draw:class-names	draw:measure
-	draw:class-names	draw:page-thumbnail
-	draw:class-names	draw:path
-	draw:class-names	draw:polygon
-	draw:class-names	draw:polyline
-	draw:class-names	draw:rect
-	draw:class-names	draw:regular-polygon
-	draw:class-names	office:annotation
-
-paragraph
-	text:class-names	text:h
-	text:class-names	text:p
-
-presentation
-	presentation:class-names	dr3d:cube
-	presentation:class-names	dr3d:extrude
-	presentation:class-names	dr3d:rotate
-	presentation:class-names	dr3d:scene
-	presentation:class-names	dr3d:sphere
-	presentation:class-names	draw:caption
-	presentation:class-names	draw:circle
-	presentation:class-names	draw:connector
-	presentation:class-names	draw:control
-	presentation:class-names	draw:custom-shape
-	presentation:class-names	draw:ellipse
-	presentation:class-names	draw:frame
-	presentation:class-names	draw:g
-	presentation:class-names	draw:line
-	presentation:class-names	draw:measure
-	presentation:class-names	draw:page-thumbnail
-	presentation:class-names	draw:path
-	presentation:class-names	draw:polygon
-	presentation:class-names	draw:polyline
-	presentation:class-names	draw:rect
-	presentation:class-names	draw:regular-polygon
-	presentation:class-names	office:annotation
-
-text
-	text:class-names	text:span
diff --git a/apps/files_odfviewer/src/webodf/webodf/testrelaxng.js b/apps/files_odfviewer/src/webodf/webodf/testrelaxng.js
deleted file mode 100644
index 875faa9de8..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/testrelaxng.js
+++ /dev/null
@@ -1,91 +0,0 @@
-/**
- * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
- * @licstart
- * The JavaScript code in this page is free software: you can redistribute it
- * and/or modify it under the terms of the GNU Affero General Public License
- * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.  The code is distributed
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
- *
- * As additional permission under GNU AGPL version 3 section 7, you
- * may distribute non-source (e.g., minimized or compacted) forms of
- * that code without the copy of the GNU GPL normally required by
- * section 4, provided you include this license notice and a URL
- * through which recipients can access the Corresponding Source.
- *
- * As a special exception to the AGPL, any HTML file which merely makes function
- * calls to this code, and for that purpose includes it by reference shall be
- * deemed a separate work for copyright law purposes. In addition, the copyright
- * holders of this code give you permission to combine this code with free
- * software libraries that are released under the GNU LGPL. You may copy and
- * distribute such a system following the terms of the GNU AGPL for this code
- * and the LGPL for the libraries. If you modify this code, you may extend this
- * exception to your version of the code, but you are not obligated to do so.
- * If you do not wish to do so, delete this exception statement from your
- * version.
- *
- * This license applies to this entire compilation.
- * @licend
- * @source: http://www.webodf.org/
- * @source: http://gitorious.org/odfkit/webodf/
- */
-/*global runtime: true, xmldom: true*/
-runtime.loadClass("xmldom.RelaxNG");
-runtime.loadClass("xmldom.RelaxNG2");
-
-function validate(relaxng, relaxng2, url) {
-    "use strict";
-    runtime.loadXML(url, function (err, dom) {
-        var walker;
-        if (err) {
-            runtime.log("Could not read " + url + ": " + err);
-        } else {
-            walker = dom.createTreeWalker(dom.firstChild, 0xFFFFFFFF);
-            relaxng.validate(walker, function (err) {
-                if (err) {
-                    var i;
-                    runtime.log("Found " + String(err.length) +
-                            " error validating " + url + ":");
-                    for (i = 0; i < err.length; i += 1) {
-                        runtime.log(err[i].message());
-                    }
-                }
-            });
-            relaxng2.validate(walker, function (err) {
-                if (err) {
-                    var i;
-                    runtime.log("Found " + String(err.length) +
-                            " error validating " + url + ":");
-                    for (i = 0; i < err.length; i += 1) {
-                        runtime.log(err[i].message());
-                    }
-                }
-            });
-        }
-    });
-}
-
-var args = arguments,
-    relaxngurl = args[1];
-
-// load and parse the Relax NG
-runtime.loadXML(relaxngurl, function (err, dom) {
-    "use strict";
-    var parser, i, relaxng, relaxng2;
-    if (err) {
-        return;
-    }
-    parser = new xmldom.RelaxNGParser();
-    relaxng = new xmldom.RelaxNG();
-    relaxng2 = new xmldom.RelaxNG2();
-    err = parser.parseRelaxNGDOM(dom, relaxng.makePattern);
-    relaxng.init(parser.rootPattern);
-    relaxng2.init(parser.start, parser.nsmap);
-
-    // loop over arguments to load ODF
-    for (i = 2; i < args.length; i += 1) {
-        runtime.log("Validating " + args[i] + " from " + relaxngurl);
-        validate(relaxng, relaxng2, args[i]);
-    }
-});
diff --git a/apps/files_odfviewer/src/webodf/webodf/tests/core/Base64Tests.js b/apps/files_odfviewer/src/webodf/webodf/tests/core/Base64Tests.js
deleted file mode 100644
index 10156a1dc4..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/tests/core/Base64Tests.js
+++ /dev/null
@@ -1,105 +0,0 @@
-/**
- * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
- * @licstart
- * The JavaScript code in this page is free software: you can redistribute it
- * and/or modify it under the terms of the GNU Affero General Public License
- * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.  The code is distributed
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
- *
- * As additional permission under GNU AGPL version 3 section 7, you
- * may distribute non-source (e.g., minimized or compacted) forms of
- * that code without the copy of the GNU GPL normally required by
- * section 4, provided you include this license notice and a URL
- * through which recipients can access the Corresponding Source.
- *
- * As a special exception to the AGPL, any HTML file which merely makes function
- * calls to this code, and for that purpose includes it by reference shall be
- * deemed a separate work for copyright law purposes. In addition, the copyright
- * holders of this code give you permission to combine this code with free
- * software libraries that are released under the GNU LGPL. You may copy and
- * distribute such a system following the terms of the GNU AGPL for this code
- * and the LGPL for the libraries. If you modify this code, you may extend this
- * exception to your version of the code, but you are not obligated to do so.
- * If you do not wish to do so, delete this exception statement from your
- * version.
- *
- * This license applies to this entire compilation.
- * @licend
- * @source: http://www.webodf.org/
- * @source: http://gitorious.org/odfkit/webodf/
- */
-/*global core: true, runtime: true*/
-runtime.loadClass("core.Base64");
-/**
- * @constructor
- * @param runner {UnitTestRunner}
- * @implements {core.UnitTest}
- */
-core.Base64Tests = function Base64Tests(runner) {
-    "use strict";
-    var t, r = runner, base64 = new core.Base64();
-
-    function testConvertByteArrayToBase64() {
-        t.encoded = base64.convertByteArrayToBase64([65]);
-        r.shouldBe(t, "t.encoded", "'QQ=='");
-        t.encoded = base64.convertByteArrayToBase64([65, 65]);
-        r.shouldBe(t, "t.encoded", "'QUE='");
-        t.encoded = base64.convertByteArrayToBase64([65, 65, 65]);
-        r.shouldBe(t, "t.encoded", "'QUFB'");
-    }
-
-    function testToBase64() {
-        t.encoded = base64.toBase64("A");
-        r.shouldBe(t, "t.encoded", "'QQ=='");
-        t.encoded = base64.toBase64("AA");
-        r.shouldBe(t, "t.encoded", "'QUE='");
-        t.encoded = base64.toBase64("AAA");
-        r.shouldBe(t, "t.encoded", "'QUFB'");
-    }
-
-    function testConvertUTF8StringToUTF16String(callback) {
-        var bin = "1234567890";
-        while (bin.length < 100000) {
-            bin += bin;
-        }
-        t.numcallbacks = 0;
-        base64.convertUTF8StringToUTF16String(bin, function (str, done) {
-            t.numcallbacks += 1;
-            t.done = done;
-            if (t.numcallbacks === 1) {
-                r.shouldBe(t, "t.done", "false");
-            } else {
-                r.shouldBe(t, "t.done", "true");
-            }
-            if (done) {
-                r.shouldBe(t, "t.numcallbacks", "2");
-                t.str = str;
-                t.bin = bin;
-                r.shouldBe(t, "t.str.length", "t.bin.length");
-                callback();
-            }
-            return true;
-        });
-    }
-
-    this.setUp = function () {
-        t = {};
-    };
-    this.tearDown = function () {
-        t = {};
-    };
-    this.tests = function () {
-        return [
-            testConvertByteArrayToBase64,
-            testToBase64
-        ];
-    };
-    this.asyncTests = function () {
-        return [ testConvertUTF8StringToUTF16String ];
-    };
-    this.description = function () {
-        return "Test the Base64 class.";
-    };
-};
diff --git a/apps/files_odfviewer/src/webodf/webodf/tests/core/CursorTests.js b/apps/files_odfviewer/src/webodf/webodf/tests/core/CursorTests.js
deleted file mode 100644
index c9f7be78a6..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/tests/core/CursorTests.js
+++ /dev/null
@@ -1,238 +0,0 @@
-/**
- * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
- * @licstart
- * The JavaScript code in this page is free software: you can redistribute it
- * and/or modify it under the terms of the GNU Affero General Public License
- * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.  The code is distributed
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
- *
- * As additional permission under GNU AGPL version 3 section 7, you
- * may distribute non-source (e.g., minimized or compacted) forms of
- * that code without the copy of the GNU GPL normally required by
- * section 4, provided you include this license notice and a URL
- * through which recipients can access the Corresponding Source.
- *
- * As a special exception to the AGPL, any HTML file which merely makes function
- * calls to this code, and for that purpose includes it by reference shall be
- * deemed a separate work for copyright law purposes. In addition, the copyright
- * holders of this code give you permission to combine this code with free
- * software libraries that are released under the GNU LGPL. You may copy and
- * distribute such a system following the terms of the GNU AGPL for this code
- * and the LGPL for the libraries. If you modify this code, you may extend this
- * exception to your version of the code, but you are not obligated to do so.
- * If you do not wish to do so, delete this exception statement from your
- * version.
- *
- * This license applies to this entire compilation.
- * @licend
- * @source: http://www.webodf.org/
- * @source: http://gitorious.org/odfkit/webodf/
- */
-/*global core: true, runtime: true*/
-runtime.loadClass("core.Cursor");
-
-/**
- * @constructor
- * @param {core.UnitTestRunner} runner
- * @implements {core.UnitTest}
- */
-core.CursorTests = function CursorTests(runner) {
-    "use strict";
-    var r = runner, tests, t = {},
-        maindoc = runtime.getWindow().document,
-        testarea = maindoc.getElementById("testarea");
-    /**
-     * @param {Selection} selection
-     * @param {Node} startnode
-     * @param {number} startoffset
-     * @param {Node=} endnode
-     * @param {number=} endoffset
-     * @return {undefined}
-     */
-    function setSelection(selection, startnode, startoffset, endnode,
-            endoffset) {
-        // call createRange() on the document, even if startnode is the document
-        var range = (startnode.ownerDocument || startnode).createRange();
-        selection.removeAllRanges();
-        range.setStart(startnode, startoffset);
-        if (endnode) {
-            range.setEnd(endnode, endoffset);
-        } else {
-            range.setEnd(startnode, startoffset);
-        }
-        selection.addRange(range);
-        if (range.startContainer !== startnode) {
-            runtime.log("EVIL");
-        }
-    }
-
-    function setupEmptyRootNode() {
-        var selection = runtime.getWindow().getSelection(),
-            root = maindoc.createElementNS("", "p"),
-            cursor = new core.Cursor(selection, maindoc);
-        testarea.appendChild(root);
-        t = { selection: selection, root: root, cursor: cursor };
-        runner.shouldBeNonNull(t, "t.selection");
-    }
-
-    function setupSimpleTextDoc() {
-        setupEmptyRootNode();
-        t.textnode = maindoc.createTextNode("abc");
-        t.root.appendChild(t.textnode);
-    }
-
-    tests = [
-        // create a document, add a cursor and check that the cursor is present
-        function testOnEmptyNode1() {
-            // if the document is the container of the selection, the cursor
-            // can not be in the DOM
-            setupEmptyRootNode();
-            setSelection(t.selection, t.root, 0);
-            t.cursor.updateToSelection();
-            //r.shouldBeNull(t, "t.cursor.getNode().parentNode");
-        },
-        function testOnEmptyNode2() {
-            setupEmptyRootNode();
-            setSelection(t.selection, t.root, 0);
-       //     t.selection.focusNode = r.root;
-            var range = t.selection.getRangeAt(0);
-            t.cursor.updateToSelection();
-            r.shouldBeNonNull(t, "t.cursor.getNode().parentNode");
-            r.shouldBeNull(t, "t.cursor.getNode().previousSibling");
-            r.shouldBeNull(t, "t.cursor.getNode().nextSibling");
-        },
-        function testOnSimpleText() {
-            setupSimpleTextDoc();
-            // put the cursor at the start of the text node 
-            setSelection(t.selection, t.textnode, 0);
-            t.cursor.updateToSelection();
-            r.shouldBeNonNull(t, "t.cursor.getNode().parentNode");
-            r.shouldBeNull(t, "t.cursor.getNode().previousSibling");
-            r.shouldBe(t, "t.cursor.getNode().nextSibling.nodeValue", "'abc'");
-        },
-        function testOnSimpleText2() {
-            setupSimpleTextDoc();
-            // put the cursor in the middle of the text node 
-            setSelection(t.selection, t.textnode, 1);
-            t.cursor.updateToSelection();
-            r.shouldBeNonNull(t, "t.cursor.getNode().parentNode");
-            r.shouldBe(t, "t.cursor.getNode().previousSibling.nodeValue", "'a'");
-            r.shouldBe(t, "t.cursor.getNode().nextSibling.nodeValue", "'bc'");
-        },
-        function testOnSimpleText3() {
-            setupSimpleTextDoc();
-            // put the cursor at the end of the text node
-            setSelection(t.selection, t.textnode, 3);
-            t.cursor.updateToSelection();
-            r.shouldBeNonNull("t.cursor.getNode().parentNode");
-            r.shouldBe(t, "t.cursor.getNode().previousSibling.nodeValue", "'abc'");
-            r.shouldBeNull(t, "t.cursor.getNode().nextSibling");
-        },
-        function testOnSimpleText4() {
-            var textnode2;
-            setupSimpleTextDoc();
-            // put the cursor between 'a' and 'b', then change the selection to
-            // be between 'b' and 'c' and update the cursor
-            setSelection(t.selection, t.textnode, 1);
-            t.cursor.updateToSelection();
-            textnode2 = t.cursor.getNode().nextSibling;
-            setSelection(t.selection, textnode2, 1);
-            t.cursor.updateToSelection();
-            r.shouldBeNonNull(t, "t.cursor.getNode().parentNode");
-            r.shouldBe(t, "t.cursor.getNode().previousSibling.nodeValue", "'ab'");
-            r.shouldBe(t, "t.cursor.getNode().nextSibling.nodeValue", "'c'");
-        },
-        function testOnSimpleText5() {
-            var textnode2;
-            setupSimpleTextDoc();
-            // put the cursor between 'a' and 'b', then change the selection to
-            // span the entire text and update the cursor
-            setSelection(t.selection, t.textnode, 1);
-            t.cursor.updateToSelection();
-            textnode2 = t.cursor.getNode().nextSibling;
-            setSelection(t.selection, t.textnode, 0, textnode2, 2);
-            t.cursor.updateToSelection();
-            r.shouldBe(t, "t.selection.rangeCount", "1");
-// only null if working on a separate document
-//            r.shouldBeNull(t, "t.cursor.getNode().parentNode");
-            t.range = t.selection.getRangeAt(0);
-            r.shouldBe(t, "t.range.startContainer", "t.textnode");
-            r.shouldBe(t, "t.range.startOffset", "0");
-            r.shouldBe(t, "t.range.endContainer", "t.textnode");
-            r.shouldBe(t, "t.range.endOffset", "3");
-        },
-        function testOnSimpleText5b() {
-            var textnode2;
-            setupSimpleTextDoc();
-            setSelection(t.selection, t.textnode, 1);
-            t.cursor.updateToSelection();
-            textnode2 = t.cursor.getNode().nextSibling;
-            setSelection(t.selection, t.textnode.parentNode, 1, textnode2, 2);
-            t.cursor.updateToSelection();
-            r.shouldBe(t, "t.selection.rangeCount", "1");
-// only null if working on a separate document
-//            r.shouldBeNull(t, "t.cursor.getNode().parentNode");
-            t.range = t.selection.getRangeAt(0);
-            r.shouldBe(t, "t.range.startContainer", "t.textnode");
-            r.shouldBe(t, "t.range.startOffset", "1");
-            r.shouldBe(t, "t.range.endContainer", "t.textnode");
-            r.shouldBe(t, "t.range.endOffset", "3");
-        },
-        function testOnSimpleText6() {
-            var somenode, textnode2;
-            setupSimpleTextDoc();
-            // add a child node to the cursor
-            somenode = maindoc.createElement("p");
-            t.cursor.getNode().appendChild(somenode);
-            // select a single position so the cursor is put in the document
-            setSelection(t.selection, t.textnode, 1);
-            t.cursor.updateToSelection();
-            r.shouldBeNonNull(t, "t.cursor.getNode().parentNode");
-            textnode2 = t.cursor.getNode().nextSibling;
-            // select a range starting at the node in the cursor, but extends
-            // out of the the cursor
-            // this should have the result that the cursor is removed from the
-            // document and that the text nodes around the cursor are
-            // merged
-            setSelection(t.selection, somenode, 0, textnode2, 2);
-            t.cursor.updateToSelection();
-// only null if working on a separate document
-//            r.shouldBeNull(t, "t.cursor.getNode().parentNode");
-            t.range = t.selection.getRangeAt(0);
-            r.shouldBe(t, "t.range.startContainer", "t.textnode");
-            r.shouldBe(t, "t.range.startOffset", "1");
-            r.shouldBe(t, "t.range.endContainer", "t.textnode");
-            r.shouldBe(t, "t.range.endOffset", "3");
-            r.shouldBe(t, "t.range.collapsed", "false");
-        }
-    ];
-    this.setUp = function () {
-        t = {};
-        while (testarea.firstChild) {
-            testarea.removeChild(testarea.firstChild);
-        }
-    };
-    this.tearDown = function () {
-        t = {};
-        while (testarea.firstChild) {
-            testarea.removeChild(testarea.firstChild);
-        }
-    };
-    this.tests = function () {
-        return tests;
-    };
-    this.asyncTests = function () {
-        return [];
-    };
-};
-core.CursorTests.name = "CursorTests";
-core.CursorTests.prototype.description = function () {
-    "use strict";
-    return "Test the Cursor class.";
-};
-(function () {
-    "use strict";
-    return core.CursorTests;
-}());
diff --git a/apps/files_odfviewer/src/webodf/webodf/tests/core/PointWalkerTests.js b/apps/files_odfviewer/src/webodf/webodf/tests/core/PointWalkerTests.js
deleted file mode 100644
index dbb690f77e..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/tests/core/PointWalkerTests.js
+++ /dev/null
@@ -1,135 +0,0 @@
-/**
- * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
- * @licstart
- * The JavaScript code in this page is free software: you can redistribute it
- * and/or modify it under the terms of the GNU Affero General Public License
- * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.  The code is distributed
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
- *
- * As additional permission under GNU AGPL version 3 section 7, you
- * may distribute non-source (e.g., minimized or compacted) forms of
- * that code without the copy of the GNU GPL normally required by
- * section 4, provided you include this license notice and a URL
- * through which recipients can access the Corresponding Source.
- *
- * As a special exception to the AGPL, any HTML file which merely makes function
- * calls to this code, and for that purpose includes it by reference shall be
- * deemed a separate work for copyright law purposes. In addition, the copyright
- * holders of this code give you permission to combine this code with free
- * software libraries that are released under the GNU LGPL. You may copy and
- * distribute such a system following the terms of the GNU AGPL for this code
- * and the LGPL for the libraries. If you modify this code, you may extend this
- * exception to your version of the code, but you are not obligated to do so.
- * If you do not wish to do so, delete this exception statement from your
- * version.
- *
- * This license applies to this entire compilation.
- * @licend
- * @source: http://www.webodf.org/
- * @source: http://gitorious.org/odfkit/webodf/
- */
-/*global core: true, runtime: true*/
-runtime.loadClass("core.PointWalker");
-
-/**
- * @constructor
- * @param runner {UnitTestRunner}
- * @implements {core.UnitTest}
- */
-core.PointWalkerTests = function PointWalkerTests(runner) {
-    "use strict";
-    var t, r = runner;
-
-    function checkWalker(node, count, endpos) {
-        t = {};
-        t.node = node;
-        t.walker = new core.PointWalker(node);
-        t.count = count;
-        t.countForward = 0;
-        t.countBackward = 0;
-        t.endpos = endpos;
-        t.walker.setPoint(t.node, 0);
-        while (t.walker.stepForward()) {
-            t.countForward += 1;
-        }
-        r.shouldBe(t, "t.countForward", "t.count");
-        r.shouldBe(t, "t.walker.precedingSibling()", "t.node.lastChild");
-        r.shouldBe(t, "t.walker.followingSibling()", "null");
-        if (endpos !== null) {
-            r.shouldBe(t, "t.walker.position()", "t.endpos");
-        }
-        t.walker.setPoint(t.node, endpos);
-        while (t.walker.stepBackward()) {
-            t.countBackward += 1;
-        }
-        r.shouldBe(t, "t.countBackward", "t.count");
-        r.shouldBe(t, "t.walker.precedingSibling()", "null");
-        r.shouldBe(t, "t.walker.followingSibling()", "t.node.firstChild");
-        r.shouldBe(t, "t.walker.position()", "0");
-    }
-
-    function testEmptyDocument() {
-        var doc = runtime.getDOMImplementation().createDocument("", "p", null),
-            p = doc.firstChild,
-            textnode1,
-            textnode2,
-            textnode3,
-            em;
-
-        checkWalker(doc, 2, 1);
-        checkWalker(p, 0, 0);
-
-        t = {};
-        t.doc = doc;
-        t.walker = new core.PointWalker(t.doc);
-        r.shouldBe(t, "t.walker.position()", "0");
-        r.shouldBe(t, "t.walker.stepForward()", "true");
-        r.shouldBe(t, "t.walker.position()", "0");
-        r.shouldBe(t, "t.walker.stepForward()", "true");
-        r.shouldBe(t, "t.walker.position()", "1");
-        r.shouldBe(t, "t.walker.stepForward()", "false");
-        r.shouldBe(t, "t.walker.position()", "1");
-        r.shouldBe(t, "t.walker.stepBackward()", "true");
-        r.shouldBe(t, "t.walker.position()", "0");
-        r.shouldBe(t, "t.walker.stepBackward()", "true");
-        r.shouldBe(t, "t.walker.position()", "0");
-        r.shouldBe(t, "t.walker.stepBackward()", "false");
-        r.shouldBe(t, "t.walker.position()", "0");
-
-        textnode1 = doc.createTextNode("hello, ");
-        textnode2 = doc.createTextNode("big ");
-        textnode3 = doc.createTextNode("world.");
-        em = doc.createElement('em');
-        p.appendChild(textnode1);
-        p.appendChild(em);
-        em.appendChild(textnode2);
-        p.appendChild(textnode3);
-
-        checkWalker(textnode1, 7, 7);
-        checkWalker(textnode2, 4, 4);
-        checkWalker(textnode3, 6, 6);
-        checkWalker(em, 6, 1);
-        checkWalker(p, 25, 3);
-        checkWalker(doc, 27, 1);
-    }
-
-    this.setUp = function () {
-        t = {};
-    };
-    this.tearDown = function () {
-        t = {};
-    };
-    this.tests = function () {
-        return [
-            testEmptyDocument
-        ];
-    };
-    this.asyncTests = function () {
-        return [];
-    };
-    this.description = function () {
-        return "Test the PointWalker class.";
-    };
-};
diff --git a/apps/files_odfviewer/src/webodf/webodf/tests/core/RuntimeTests.js b/apps/files_odfviewer/src/webodf/webodf/tests/core/RuntimeTests.js
deleted file mode 100644
index d3f7c2dfa2..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/tests/core/RuntimeTests.js
+++ /dev/null
@@ -1,119 +0,0 @@
-/**
- * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
- * @licstart
- * The JavaScript code in this page is free software: you can redistribute it
- * and/or modify it under the terms of the GNU Affero General Public License
- * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.  The code is distributed
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
- *
- * As additional permission under GNU AGPL version 3 section 7, you
- * may distribute non-source (e.g., minimized or compacted) forms of
- * that code without the copy of the GNU GPL normally required by
- * section 4, provided you include this license notice and a URL
- * through which recipients can access the Corresponding Source.
- *
- * As a special exception to the AGPL, any HTML file which merely makes function
- * calls to this code, and for that purpose includes it by reference shall be
- * deemed a separate work for copyright law purposes. In addition, the copyright
- * holders of this code give you permission to combine this code with free
- * software libraries that are released under the GNU LGPL. You may copy and
- * distribute such a system following the terms of the GNU AGPL for this code
- * and the LGPL for the libraries. If you modify this code, you may extend this
- * exception to your version of the code, but you are not obligated to do so.
- * If you do not wish to do so, delete this exception statement from your
- * version.
- *
- * This license applies to this entire compilation.
- * @licend
- * @source: http://www.webodf.org/
- * @source: http://gitorious.org/odfkit/webodf/
- */
-/*global core: true, runtime: true*/
-/*jslint bitwise: true*/
-
-/**
- * @constructor
- * @param runner {UnitTestRunner}
- * @implements {core.UnitTest}
- */
-core.RuntimeTests = function RuntimeTests(runner) {
-    "use strict";
-    var t, r = runner;
-
-    function testRead(callback) {
-        runtime.read("tests.js", 2, 6, function (err, data) {
-            t.err = err;
-            r.shouldBeNull(t, "t.err");
-            t.data = runtime.byteArrayToString(data, "utf8");
-            r.shouldBe(t, "t.data", "'global'");
-            callback();
-        });
-    }
-
-    /**
-     * Test writing a binary file and reading it back.
-     */
-    function testWrite(callback) {
-        var content = new core.ByteArrayWriter("utf8"),
-            i, max = 1024, filename, clean;
-        for (i = 0; i < max; i += 1) {
-            content.appendArray([i]);
-        }
-        content = content.getByteArray();
-        filename = "tmp" + Math.random();
-        clean = new core.ByteArrayWriter("utf8");
-        for (i = 0; i < max; i += 1) {
-            clean.appendArray([content[i] & 0xff]);
-        }
-        clean = clean.getByteArray();
-        // now content has content different from what is on the server
-        runtime.writeFile(filename, content, function (err) {
-            t.err = err;
-            r.shouldBeNull(t, "t.err");
-            runtime.readFile(filename, "binary", function (err, data) {
-                t.err = err;
-                r.shouldBeNull(t, "t.err");
-                t.data = data;
-                t.clean = clean;
-                r.shouldBe(t, "t.data.length", "t.clean.length");
-                i = 0;
-                while (i < max && data[i] === clean[i]) {
-                    i += 1;
-                }
-                if (i !== max) {
-                    runtime.log("at " + String(i) + " " + data[i] + " vs " +
-                            clean[i]);
-                }
-                t.i = i;
-                t.max = max;
-                r.shouldBe(t, "t.i", "t.max");
-                // cleanup
-                runtime.deleteFile(filename, function (err) {
-                    callback();
-                });
-            });
-        });
-    }
-
-    this.setUp = function () {
-        t = {};
-    };
-    this.tearDown = function () {
-        t = {};
-    };
-    this.tests = function () {
-        return [
-        ];
-    };
-    this.asyncTests = function () {
-        return [
-            testRead,
-            testWrite
-        ];
-    };
-    this.description = function () {
-        return "Test the runtime.";
-    };
-};
diff --git a/apps/files_odfviewer/src/webodf/webodf/tests/core/ZipTests.js b/apps/files_odfviewer/src/webodf/webodf/tests/core/ZipTests.js
deleted file mode 100644
index ad2ece55ad..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/tests/core/ZipTests.js
+++ /dev/null
@@ -1,141 +0,0 @@
-/**
- * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
- * @licstart
- * The JavaScript code in this page is free software: you can redistribute it
- * and/or modify it under the terms of the GNU Affero General Public License
- * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.  The code is distributed
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
- *
- * As additional permission under GNU AGPL version 3 section 7, you
- * may distribute non-source (e.g., minimized or compacted) forms of
- * that code without the copy of the GNU GPL normally required by
- * section 4, provided you include this license notice and a URL
- * through which recipients can access the Corresponding Source.
- *
- * As a special exception to the AGPL, any HTML file which merely makes function
- * calls to this code, and for that purpose includes it by reference shall be
- * deemed a separate work for copyright law purposes. In addition, the copyright
- * holders of this code give you permission to combine this code with free
- * software libraries that are released under the GNU LGPL. You may copy and
- * distribute such a system following the terms of the GNU AGPL for this code
- * and the LGPL for the libraries. If you modify this code, you may extend this
- * exception to your version of the code, but you are not obligated to do so.
- * If you do not wish to do so, delete this exception statement from your
- * version.
- *
- * This license applies to this entire compilation.
- * @licend
- * @source: http://www.webodf.org/
- * @source: http://gitorious.org/odfkit/webodf/
- */
-/*global core: true, runtime: true*/
-runtime.loadClass("core.Zip");
-
-/**
- * @constructor
- * @param {core.UnitTestRunner} runner
- * @implements {core.UnitTest}
- */
-core.ZipTests = function ZipTests(runner) {
-    "use strict";
-    var r = runner,
-        t;
-
-    function testNonExistingFile(callback) {
-        var zip = new core.Zip("whatever", function (err) {
-            t.err = err;
-            r.shouldBeNonNull(t, "t.err");
-            callback();
-        });
-    }
-
-    function testNonZipFile(callback) {
-        var path = "core/ZipTests.js";
-        // check that file exists
-        runtime.isFile(path, function (exists) {
-            t.exists = exists;
-            r.shouldBe(t, "t.exists", "true");
-            // check that zip file opening returns an error
-            var zip = new core.Zip("core/ZipTests.js", function (err) {
-                t.err = err;
-                r.shouldBeNonNull(t, "t.err");
-                callback();
-            });
-        });
-    }
-
-    function testHi(path, callback) {
-        var zip = new core.Zip(path, function (err, zip) {
-            t.err = err;
-            t.zip = zip;
-            r.shouldBeNull(t, "t.err");
-            zip.load("hello", function (err, data) {
-                t.err = err;
-                r.shouldBeNull(t, "t.err");
-                t.data = runtime.byteArrayToString(data, "utf8");
-                r.shouldBe(t, "t.data.length", "16");
-                r.shouldBe(t, "t.data", "'bonjour\\nbonjour\\n'");
-                callback();
-            });
-        });
-    }
-
-    function testHiUncompressed(callback) {
-        testHi("core/hi-uncompressed.zip", callback);
-    }
-
-    function testHiCompressed(callback) {
-        testHi("core/hi-compressed.zip", callback);
-    }
-
-    function testCreateZip(callback) {
-        var filename = "writetest.zip",
-            zip = new core.Zip(filename, null),
-            data = runtime.byteArrayFromString(
-                    "application/vnd.oasis.opendocument.text", "utf8");
-        zip.save("mimetype", data, false, new Date());
-        zip.load("mimetype", function (err, newdata) {
-            t.err = err;
-            r.shouldBeNull(t, "t.err");
-            t.data = data;
-            t.newdata = newdata;
-            r.shouldBe(t, "t.data", "t.newdata");
-            zip.write(function (err) {
-                t.err = err;
-                r.shouldBeNull(t, "t.err");
-                runtime.deleteFile(filename, function (err) {
-                    callback();
-                });
-            });
-        });
-    }
-
-    this.setUp = function () {
-        t = {};
-    };
-    this.tearDown = function () {
-        t = {};
-    };
-    this.tests = function () {
-        return [];
-    };
-    this.asyncTests = function () {
-        return [
-            testNonExistingFile,
-            testNonZipFile,
-            testHiUncompressed,
-            testHiCompressed,
-            testCreateZip
-        ];
-    };
-};
-core.ZipTests.prototype.description = function () {
-    "use strict";
-    return "Test the Zip class.";
-};
-(function () {
-    "use strict";
-    return core.ZipTests;
-}());
diff --git a/apps/files_odfviewer/src/webodf/webodf/tests/core/hi-compressed.zip b/apps/files_odfviewer/src/webodf/webodf/tests/core/hi-compressed.zip
deleted file mode 100644
index ff6d86c158abed89f3865d3855e412ce6c08cd98..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 172
zcmWIWW@Zs#U}E54a170~P5pAhori&eK>&zZ8DtnTQgd?hLqj+jn6t!h`hak01vdjD
z%NIrl1~B1$>ip?b`nr$2nl3Q}cr!A|G2=2!0%#-y15h8smPQZ@YBVdvXf$I3yjj^m
OiWq^=8%TpN0|Nm1V<LM1

diff --git a/apps/files_odfviewer/src/webodf/webodf/tests/core/hi-uncompressed.zip b/apps/files_odfviewer/src/webodf/webodf/tests/core/hi-uncompressed.zip
deleted file mode 100644
index 2eafff7ab92e96eff0d1d28c21040e2c149c492b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 176
zcmWIWW@h1H00GC)Oxx5iC)@>qY!GH;kYUJ3&B@6R4dG;9&Jw@r1Hz>h+zgB?Ul<t}
zz(i7hURHi-5f_XO@MdI^W5#8m1jrsR*wP51pvJR8j7Kv%z?+o~q=*p+y@9kph{FH?
D59A^n

diff --git a/apps/files_odfviewer/src/webodf/webodf/tests/gui/CaretTests.js b/apps/files_odfviewer/src/webodf/webodf/tests/gui/CaretTests.js
deleted file mode 100644
index 05f1b9bcc5..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/tests/gui/CaretTests.js
+++ /dev/null
@@ -1,82 +0,0 @@
-/**
- * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
- * @licstart
- * The JavaScript code in this page is free software: you can redistribute it
- * and/or modify it under the terms of the GNU Affero General Public License
- * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.  The code is distributed
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
- *
- * As additional permission under GNU AGPL version 3 section 7, you
- * may distribute non-source (e.g., minimized or compacted) forms of
- * that code without the copy of the GNU GPL normally required by
- * section 4, provided you include this license notice and a URL
- * through which recipients can access the Corresponding Source.
- *
- * As a special exception to the AGPL, any HTML file which merely makes function
- * calls to this code, and for that purpose includes it by reference shall be
- * deemed a separate work for copyright law purposes. In addition, the copyright
- * holders of this code give you permission to combine this code with free
- * software libraries that are released under the GNU LGPL. You may copy and
- * distribute such a system following the terms of the GNU AGPL for this code
- * and the LGPL for the libraries. If you modify this code, you may extend this
- * exception to your version of the code, but you are not obligated to do so.
- * If you do not wish to do so, delete this exception statement from your
- * version.
- *
- * This license applies to this entire compilation.
- * @licend
- * @source: http://www.webodf.org/
- * @source: http://gitorious.org/odfkit/webodf/
- */
-/*global runtime: true, core: true, gui: true*/
-runtime.loadClass("gui.Caret");
-
-/**
- * @constructor
- * @param {core.UnitTestRunner} runner
- * @implements {core.UnitTest}
- */
-gui.CaretTests = function CaretTests(runner) {
-    "use strict";
-    var r = runner,
-        t;
-
-    function setupEmptyDoc() {
-        var selection = runtime.getWindow().getSelection(),
-            doc = runtime.getDOMImplementation().createDocument("", "p", null),
-            caret = new gui.Caret(selection, doc);
-        t = { selection: selection, doc: doc }; //, cursor: cursor };
-        runner.shouldBeNonNull(t, "t.selection");
-    }
-    function setupSimpleTextDoc() {
-        setupEmptyDoc();
-        t.textnode = t.doc.createTextNode("abc");
-        t.doc.documentElement.appendChild(t.textnode);
-    }
-    function testOnUpDownTraversal() {
-    }
-
-    this.setUp = function () {
-        t = {};
-    };
-    this.tearDown = function () {
-        t = {};
-    };
-    this.tests = function () {
-        return [];
-    };
-    this.asyncTests = function () {
-        return [
-        ];
-    };
-};
-gui.CaretTests.prototype.description = function () {
-    "use strict";
-    return "Test the Caret class.";
-};
-(function () {
-    "use strict";
-    return gui.CaretTests;
-}());
diff --git a/apps/files_odfviewer/src/webodf/webodf/tests/gui/SelectionMoverTests.js b/apps/files_odfviewer/src/webodf/webodf/tests/gui/SelectionMoverTests.js
deleted file mode 100644
index 8b8275bcb8..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/tests/gui/SelectionMoverTests.js
+++ /dev/null
@@ -1,109 +0,0 @@
-/**
- * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
- * @licstart
- * The JavaScript code in this page is free software: you can redistribute it
- * and/or modify it under the terms of the GNU Affero General Public License
- * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.  The code is distributed
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
- *
- * As additional permission under GNU AGPL version 3 section 7, you
- * may distribute non-source (e.g., minimized or compacted) forms of
- * that code without the copy of the GNU GPL normally required by
- * section 4, provided you include this license notice and a URL
- * through which recipients can access the Corresponding Source.
- *
- * As a special exception to the AGPL, any HTML file which merely makes function
- * calls to this code, and for that purpose includes it by reference shall be
- * deemed a separate work for copyright law purposes. In addition, the copyright
- * holders of this code give you permission to combine this code with free
- * software libraries that are released under the GNU LGPL. You may copy and
- * distribute such a system following the terms of the GNU AGPL for this code
- * and the LGPL for the libraries. If you modify this code, you may extend this
- * exception to your version of the code, but you are not obligated to do so.
- * If you do not wish to do so, delete this exception statement from your
- * version.
- *
- * This license applies to this entire compilation.
- * @licend
- * @source: http://www.webodf.org/
- * @source: http://gitorious.org/odfkit/webodf/
- */
-/*global runtime: true, core: true, gui: true*/
-runtime.loadClass("gui.SelectionMover");
-
-/**
- * @constructor
- * @param {core.UnitTestRunner} runner
- * @implements {core.UnitTest}
- */
-gui.SelectionMoverTests = function SelectionMoverTests(runner) {
-    "use strict";
-    var r = runner,
-        t, testarea = runtime.getWindow().document.getElementById("testarea");
-
-    function setupDoc() {
-        var doc = testarea.ownerDocument,
-            selection = runtime.getWindow().getSelection(),
-            p = doc.createElement("p"),
-            walker = new core.PointWalker(p),
-            mover = new gui.SelectionMover(selection, walker);
-        testarea.appendChild(p);
-        p.appendChild(doc.createTextNode("MMMMM MMMMM MMMMM MMMMM MMMMM"));
-        p.style.width = "5em";// break line after each 'MMMMM'
-        selection.removeAllRanges();
-        selection.addRange(doc.createRange());
-        t = { doc: doc, p: p, selection: selection, mover: mover };
-    }
-    function testUpDownTraversal() {
-        setupDoc();
-        r.shouldBe(t, "t.selection.rangeCount", "1");
-        t.r = t.selection.getRangeAt(0);
-        r.shouldBeNonNull(t, "t.r");
-        t.r.setStart(t.p.firstChild, 0);
-        r.shouldBe(t, "t.r.startContainer", "t.p.firstChild");
-        r.shouldBe(t, "t.r.startOffset", "0");
-        t.mover.movePointForward();
-        t.r = t.selection.getRangeAt(0);
-        r.shouldBe(t, "t.r.startContainer", "t.p.firstChild");
-        r.shouldBe(t, "t.r.startOffset", "1");
-        t.mover.movePointBackward();
-        t.r = t.selection.getRangeAt(0);
-        r.shouldBe(t, "t.r.startContainer", "t.p.firstChild");
-        r.shouldBe(t, "t.r.startOffset", "0");
-        t.mover.moveLineForward();
-//        t.selection.modify("move", "forward", "line");
-        t.r = t.selection.getRangeAt(0);
-        r.shouldBe(t, "t.r.startContainer", "t.p.firstChild");
-        r.shouldBe(t, "t.r.startOffset", "6");
-    }
-
-    this.setUp = function () {
-        t = {};
-        while (testarea.firstChild) {
-            testarea.removeChild(testarea.firstChild);
-        }
-    };
-    this.tearDown = function () {
-        t = {};
-        while (testarea.firstChild) {
-            testarea.removeChild(testarea.firstChild);
-        }
-    };
-    this.tests = function () {
-        return [ testUpDownTraversal ];
-    };
-    this.asyncTests = function () {
-        return [
-        ];
-    };
-};
-gui.SelectionMoverTests.prototype.description = function () {
-    "use strict";
-    return "Test the SelectionMover class.";
-};
-(function () {
-    "use strict";
-    return gui.SelectionMoverTests;
-}());
diff --git a/apps/files_odfviewer/src/webodf/webodf/tests/gui/XMLEditTests.js b/apps/files_odfviewer/src/webodf/webodf/tests/gui/XMLEditTests.js
deleted file mode 100644
index e253a72fea..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/tests/gui/XMLEditTests.js
+++ /dev/null
@@ -1,156 +0,0 @@
-/**
- * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
- * @licstart
- * The JavaScript code in this page is free software: you can redistribute it
- * and/or modify it under the terms of the GNU Affero General Public License
- * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.  The code is distributed
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
- *
- * As additional permission under GNU AGPL version 3 section 7, you
- * may distribute non-source (e.g., minimized or compacted) forms of
- * that code without the copy of the GNU GPL normally required by
- * section 4, provided you include this license notice and a URL
- * through which recipients can access the Corresponding Source.
- *
- * As a special exception to the AGPL, any HTML file which merely makes function
- * calls to this code, and for that purpose includes it by reference shall be
- * deemed a separate work for copyright law purposes. In addition, the copyright
- * holders of this code give you permission to combine this code with free
- * software libraries that are released under the GNU LGPL. You may copy and
- * distribute such a system following the terms of the GNU AGPL for this code
- * and the LGPL for the libraries. If you modify this code, you may extend this
- * exception to your version of the code, but you are not obligated to do so.
- * If you do not wish to do so, delete this exception statement from your
- * version.
- *
- * This license applies to this entire compilation.
- * @licend
- * @source: http://www.webodf.org/
- * @source: http://gitorious.org/odfkit/webodf/
- */
-/*global document: true, core: true, gui: true, runtime: true*/
-runtime.loadClass("core.PointWalker");
-runtime.loadClass("gui.XMLEdit");
-
-/**
- * @constructor
- * @param runner {core.UnitTestRunner}
- * @implements {core.UnitTest}
- */
-gui.XMLEditTests = function XMLEditTests(runner) {
-    "use strict";
-    var t, r = runner, tests;
-
-    function checkWalker(node, count, endpos) {
-        t = {};
-        t.node = node;
-        t.walker = new core.PointWalker(node);
-        t.count = count;
-        t.countForward = 0;
-        t.countBackward = 0;
-        t.endpos = endpos;
-        t.walker.setPoint(t.node, 0);
-        while (t.walker.stepForward()) {
-            t.countForward += 1;
-        }
-        r.shouldBe("t.countForward", "t.count");
-        r.shouldBe("t.walker.precedingSibling()", "t.node.lastChild");
-        r.shouldBe("t.walker.followingSibling()", "null");
-        if (endpos !== null) {
-            r.shouldBe("t.walker.position()", "t.endpos");
-        }
-        t.walker.setPoint(t.node, endpos);
-        while (t.walker.stepBackward()) {
-            t.countBackward += 1;
-        }
-        r.shouldBe("t.countBackward", "t.count");
-        r.shouldBe("t.walker.precedingSibling()", "null");
-        r.shouldBe("t.walker.followingSibling()", "t.node.firstChild");
-        r.shouldBe("t.walker.position()", "0");
-    }
-
-    function testSimpleDocument(xmledit) {
-        var maindoc = xmledit.ownerDocument,
-            doc = maindoc.implementation.createDocument(null, "p", null),
-            p = doc.firstChild,
-            textnode1,
-            textnode2,
-            textnode3,
-            em;
-
-        xmledit.setXML(doc);
-
-        checkWalker(doc, 2, 1);
-        checkWalker(p, 0, 0);
-
-        t = {};
-        t.doc = doc;
-        t.walker = new core.PointWalker(t.doc);
-        r.shouldBe("t.walker.position()", "0");
-        r.shouldBe("t.walker.stepForward()", "true");
-        r.shouldBe("t.walker.position()", "0");
-        r.shouldBe("t.walker.stepForward()", "true");
-        r.shouldBe("t.walker.position()", "1");
-        r.shouldBe("t.walker.stepForward()", "false");
-        r.shouldBe("t.walker.position()", "1");
-        r.shouldBe("t.walker.stepBackward()", "true");
-        r.shouldBe("t.walker.position()", "0");
-        r.shouldBe("t.walker.stepBackward()", "true");
-        r.shouldBe("t.walker.position()", "0");
-        r.shouldBe("t.walker.stepBackward()", "false");
-        r.shouldBe("t.walker.position()", "0");
-
-        textnode1 = doc.createTextNode("hello, ");
-        textnode2 = doc.createTextNode("big ");
-        textnode3 = doc.createTextNode("world.");
-        em = doc.createElement('em');
-        p.appendChild(textnode1);
-        p.appendChild(em);
-        em.appendChild(textnode2);
-        p.appendChild(textnode3);
-
-        checkWalker(textnode1, 7, 7);
-        checkWalker(textnode2, 4, 4);
-        checkWalker(textnode3, 6, 6);
-        checkWalker(em, 6, 1);
-        checkWalker(p, 25, 3);
-        checkWalker(doc, 27, 1);
-    }
-
-    function testXmlEdit(document) {
-        var head = document.getElementsByTagName("head")[0],
-            css = document.createElement("style"),
-            testarea = document.createElement("div"),
-            xmledit;
-
-        // the xml edit requires an element to put the content and a sheet to put
-        // the style
-        css.type = "text/css";
-        head.appendChild(css);
-        document.body.appendChild(testarea);
-        xmledit = new gui.XMLEdit(testarea, css);
-
-        testSimpleDocument(xmledit);
-
-        css.parentNode.removeChild(css);
-        testarea.parentNode.removeChild(testarea);
-    }
-
-    this.setUp = function () {
-        t = {};
-    };
-    this.tearDown = function () {
-        t = {};
-    };
-    this.tests = function () {
-        return [ testSimpleDocument ];
-    };
-    this.asyncTests = function () {
-        return [];
-    };
-    this.description = function () {
-        return "Test the XML editor class.";
-    };
-};
diff --git a/apps/files_odfviewer/src/webodf/webodf/tests/manifest.js b/apps/files_odfviewer/src/webodf/webodf/tests/manifest.js
deleted file mode 100644
index 6d4f151bc0..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/tests/manifest.js
+++ /dev/null
@@ -1,16 +0,0 @@
-(function () {
-    "use strict";
-return [
-        "core/Base64Tests.js",
-        "core/CursorTests.js",
-        "core/PointWalkerTests.js",
-        "core/RuntimeTests.js",
-        "core/ZipTests.js",
-        "gui/CaretTests.js",
-        "gui/SelectionMoverTests.js",
-        "gui/XMLEditTests.js",
-        "tests.js",
-        "xmldom/OperationalTransformDOMTests.js",
-        "xmldom/XPathTests.js"
-    ];
-}());
diff --git a/apps/files_odfviewer/src/webodf/webodf/tests/resources/js-test-style.css b/apps/files_odfviewer/src/webodf/webodf/tests/resources/js-test-style.css
deleted file mode 100644
index f12147ca43..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/tests/resources/js-test-style.css
+++ /dev/null
@@ -1,12 +0,0 @@
-.pass {
-    font-weight: bold;
-    color: green;
-}
-.fail {
-    font-weight: bold;
-    color: red;
-}
-#console {
-    white-space: pre-wrap;
-    font-family: monospace;
-}
diff --git a/apps/files_odfviewer/src/webodf/webodf/tests/tests.html b/apps/files_odfviewer/src/webodf/webodf/tests/tests.html
deleted file mode 100644
index 572db60554..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/tests/tests.html
+++ /dev/null
@@ -1,22 +0,0 @@
-<html>
-  <head>
-    <title>WebODF unit tests</title>
-    <link rel="stylesheet" href="resources/js-test-style.css"></link>
-  </head>
-  <body>
-    <p id="description"></p>
-    <div id="console"></div>
-    <div id="testarea"></div>
-    <div id="logoutput"></div>
-    <script src="../lib/runtime.js"></script>
-<script type="text/javascript" charset="utf-8">
-runtime.libraryPaths = (function () {
-    return function () {
-        return ["../lib", "."];
-    }
-}());
-</script>
-    <script src="tests.js"></script>
-  </body>
-</html>
-
diff --git a/apps/files_odfviewer/src/webodf/webodf/tests/tests.js b/apps/files_odfviewer/src/webodf/webodf/tests/tests.js
deleted file mode 100644
index 5570733de5..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/tests/tests.js
+++ /dev/null
@@ -1,94 +0,0 @@
-/*global window: true, runtime: true, Runtime: true, core: true, gui: true,
-  xmldom: true, RuntimeTests: true*/
-/**
- * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
- * @licstart
- * The JavaScript code in this page is free software: you can redistribute it
- * and/or modify it under the terms of the GNU Affero General Public License
- * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.  The code is distributed
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
- *
- * As additional permission under GNU AGPL version 3 section 7, you
- * may distribute non-source (e.g., minimized or compacted) forms of
- * that code without the copy of the GNU GPL normally required by
- * section 4, provided you include this license notice and a URL
- * through which recipients can access the Corresponding Source.
- *
- * As a special exception to the AGPL, any HTML file which merely makes function
- * calls to this code, and for that purpose includes it by reference shall be
- * deemed a separate work for copyright law purposes. In addition, the copyright
- * holders of this code give you permission to combine this code with free
- * software libraries that are released under the GNU LGPL. You may copy and
- * distribute such a system following the terms of the GNU AGPL for this code
- * and the LGPL for the libraries. If you modify this code, you may extend this
- * exception to your version of the code, but you are not obligated to do so.
- * If you do not wish to do so, delete this exception statement from your
- * version.
- *
- * This license applies to this entire compilation.
- * @licend
- * @source: http://www.webodf.org/
- * @source: http://gitorious.org/odfkit/webodf/
- */
-runtime.loadClass("core.RuntimeTests");
-runtime.loadClass("core.UnitTester");
-runtime.loadClass("core.PointWalkerTests");
-runtime.loadClass("core.CursorTests");
-runtime.loadClass("core.ZipTests");
-runtime.loadClass("core.Base64Tests");
-runtime.loadClass("xmldom.OperationalTransformDOMTests");
-runtime.loadClass("xmldom.XPathTests");
-runtime.loadClass("gui.CaretTests");
-runtime.loadClass("gui.XMLEditTests");
-
-var tests = [
-    core.RuntimeTests, // temporarily disabled, enable at next commit!
-    core.ZipTests,
-    core.Base64Tests
-];
-if (runtime.type() !== "NodeJSRuntime") {
-    tests.push(core.PointWalkerTests);
-}
-if (runtime.type() === "BrowserRuntime") {
-    tests.push(core.PointWalkerTests);
-//    tests.push(core.CursorTests);
-    tests.push(xmldom.OperationalTransformDOMTests);
-    tests.push(gui.CaretTests);
-    tests.push(xmldom.XPathTests);
-//    tests.push(gui.XMLEditTests);
-}
-var tester = new core.UnitTester();
-/**
- * @param {!Array.<Function>} tests
- * @return {undefined}
- */
-function runNextTest(tests) {
-    "use strict";
-    if (tests.length === 0) {
-        //runtime.log(JSON.stringify(tester.results()));
-        runtime.log("Number of failed tests: " +
-                String(tester.countFailedTests()));
-        runtime.exit(tester.countFailedTests());
-        return;
-    }
-    var test = tests[0];
-    if (typeof test !== "function") {
-        runtime.log("Tests contain a non-function object of type " +
-                typeof(test) + ".");
-        runtime.exit(1);
-        return;
-    }
-    runtime.log("Running test '" + Runtime.getFunctionName(test) + "'.");
-    try {
-        tester.runTests(test, function () {
-            runNextTest(tests.slice(1));
-        });
-    } catch (e) {
-        runtime.log(e);
-        runtime.exit(1);
-        throw e;
-    }
-}
-runNextTest(tests);
diff --git a/apps/files_odfviewer/src/webodf/webodf/tests/xmldom/OperationalTransformDOMTests.js b/apps/files_odfviewer/src/webodf/webodf/tests/xmldom/OperationalTransformDOMTests.js
deleted file mode 100644
index 3866a53708..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/tests/xmldom/OperationalTransformDOMTests.js
+++ /dev/null
@@ -1,79 +0,0 @@
-/**
- * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
- * @licstart
- * The JavaScript code in this page is free software: you can redistribute it
- * and/or modify it under the terms of the GNU Affero General Public License
- * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.  The code is distributed
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
- *
- * As additional permission under GNU AGPL version 3 section 7, you
- * may distribute non-source (e.g., minimized or compacted) forms of
- * that code without the copy of the GNU GPL normally required by
- * section 4, provided you include this license notice and a URL
- * through which recipients can access the Corresponding Source.
- *
- * As a special exception to the AGPL, any HTML file which merely makes function
- * calls to this code, and for that purpose includes it by reference shall be
- * deemed a separate work for copyright law purposes. In addition, the copyright
- * holders of this code give you permission to combine this code with free
- * software libraries that are released under the GNU LGPL. You may copy and
- * distribute such a system following the terms of the GNU AGPL for this code
- * and the LGPL for the libraries. If you modify this code, you may extend this
- * exception to your version of the code, but you are not obligated to do so.
- * If you do not wish to do so, delete this exception statement from your
- * version.
- *
- * This license applies to this entire compilation.
- * @licend
- * @source: http://www.webodf.org/
- * @source: http://gitorious.org/odfkit/webodf/
- */
-/*global runtime: true, core: true, xmldom: true*/
-runtime.loadClass("xmldom.OperationalTransformDOM");
-
-/**
- * @constructor
- * @param {core.UnitTestRunner} runner
- * @implements {core.UnitTest}
- */
-xmldom.OperationalTransformDOMTests = function OperationalTransformDOMTests(runner) {
-    "use strict";
-    var r = runner,
-        t;
-
-    function setupEmptyDoc() {
-        var doc = runtime.getDOMImplementation().createDocument("", "p", null);
-        t = { doc: doc };
-    }
-    function setupSimpleTextDoc() {
-        setupEmptyDoc();
-        t.textnode = t.doc.createTextNode("abc");
-        t.doc.documentElement.appendChild(t.textnode);
-    }
-    function testSkip() {
-        setupEmptyDoc();
-    }
-    this.setUp = function () {
-        t = {};
-    };
-    this.tearDown = function () {
-        t = {};
-    };
-    this.tests = function () {
-        return [ testSkip ];
-    };
-    this.asyncTests = function () {
-        return [
-        ];
-    };
-};
-xmldom.OperationalTransformDOMTests.prototype.description = function () {
-    "use strict";
-    return "Test the OperationalTransformDOM class.";
-};
-(function () {
-    "use strict";
-    return xmldom.OperationalTransformDOMTests;
-}());
diff --git a/apps/files_odfviewer/src/webodf/webodf/tests/xmldom/XPathTests.js b/apps/files_odfviewer/src/webodf/webodf/tests/xmldom/XPathTests.js
deleted file mode 100644
index 91ebba99c6..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/tests/xmldom/XPathTests.js
+++ /dev/null
@@ -1,112 +0,0 @@
-/**
- * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
- * @licstart
- * The JavaScript code in this page is free software: you can redistribute it
- * and/or modify it under the terms of the GNU Affero General Public License
- * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.  The code is distributed
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
- *
- * As additional permission under GNU AGPL version 3 section 7, you
- * may distribute non-source (e.g., minimized or compacted) forms of
- * that code without the copy of the GNU GPL normally required by
- * section 4, provided you include this license notice and a URL
- * through which recipients can access the Corresponding Source.
- *
- * As a special exception to the AGPL, any HTML file which merely makes function
- * calls to this code, and for that purpose includes it by reference shall be
- * deemed a separate work for copyright law purposes. In addition, the copyright
- * holders of this code give you permission to combine this code with free
- * software libraries that are released under the GNU LGPL. You may copy and
- * distribute such a system following the terms of the GNU AGPL for this code
- * and the LGPL for the libraries. If you modify this code, you may extend this
- * exception to your version of the code, but you are not obligated to do so.
- * If you do not wish to do so, delete this exception statement from your
- * version.
- *
- * This license applies to this entire compilation.
- * @licend
- * @source: http://www.webodf.org/
- * @source: http://gitorious.org/odfkit/webodf/
- */
-/*global runtime: true, core: true, xmldom: true, odf: true, XMLSerializer*/
-runtime.loadClass("xmldom.XPath");
-runtime.loadClass("odf.Style2CSS");
-
-/**
- * @constructor
- * @param {core.UnitTestRunner} runner
- * @implements {core.UnitTest}
- */
-xmldom.XPathTests = function XPathTests(runner) {
-    "use strict";
-    var r = runner,
-        style2CSS = new odf.Style2CSS(),
-        t;
-
-    function setupDoc() {
-        var stylens = style2CSS.namespaceResolver("style"),
-            svgns = style2CSS.namespaceResolver("svg"),
-            drawns = style2CSS.namespaceResolver("draw"),
-            presentationns = style2CSS.namespaceResolver("presentation"),
-            textns = style2CSS.namespaceResolver("text"),
-            doc = runtime.getDOMImplementation().createDocument("", "a", null),
-            r = doc.documentElement,
-            fontFace = doc.createElementNS(stylens, "font-face"),
-            fontFaceSrc = doc.createElementNS(svgns, "font-face-src"),
-            drawFrame = doc.createElementNS(drawns, "frame"),
-            p = doc.createElementNS(textns, "p");
-        r.appendChild(p);
-        r.appendChild(fontFace);
-        fontFace = doc.createElementNS(stylens, "font-face");
-        fontFace.appendChild(fontFaceSrc);
-        fontFaceSrc.setAttributeNS(textns, "anchor-type", "paragraph");
-        r.appendChild(fontFace);
-        r.appendChild(drawFrame);
-        drawFrame = doc.createElementNS(drawns, "frame");
-        drawFrame.setAttributeNS(presentationns, "class", "title");
-        r.appendChild(drawFrame);
-
-        t = { doc: doc, fontFace: fontFace, drawFrame: drawFrame };
-    }
-    function test1() {
-        setupDoc();
-        var xpath = new xmldom.XPath(),
-            xpaths = {
-                "style:font-face[svg:font-face-src]": "t.fontFace",
-                ".//*[*[@text:anchor-type='paragraph']]": "t.fontFace",
-                "./draw:frame[@presentation:class='title']": "t.drawFrame"
-            },
-            x;
-        for (x in xpaths) {
-            if (xpaths.hasOwnProperty(x)) {
-                t.result = xpath.getODFElementsWithXPath(t.doc.documentElement,
-                        x, style2CSS.namespaceResolver);
-                r.shouldBe(t, "t.result.length", "1");
-                r.shouldBe(t, "t.result[0]", xpaths[x]);
-            }
-        }
-    }
-    this.setUp = function () {
-        t = {};
-    };
-    this.tearDown = function () {
-        t = {};
-    };
-    this.tests = function () {
-        return [ test1 ];
-    };
-    this.asyncTests = function () {
-        return [
-        ];
-    };
-};
-xmldom.XPathTests.prototype.description = function () {
-    "use strict";
-    return "Test the XPath class.";
-};
-(function () {
-    "use strict";
-    return xmldom.XPathTests;
-}());
diff --git a/apps/files_odfviewer/src/webodf/webodf/tools/clippingTestImage.html b/apps/files_odfviewer/src/webodf/webodf/tools/clippingTestImage.html
deleted file mode 100644
index 67cc747737..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/tools/clippingTestImage.html
+++ /dev/null
@@ -1,39 +0,0 @@
-<html>
- <head>
-  <script type="application/javascript">//<![CDATA[
-function draw() {
-  var canvas = document.getElementById("canvas"),
-      ctx = canvas.getContext("2d"),
-      size = canvas.width / 2,
-      link = document.createElement("a");
-  ctx.translate(size, size);
-  for (i = 0; i < 4; i += 1) {
-     ctx.save();
-     ctx.rotate(i * Math.PI / 2);
-     ctx.translate(0, -size);
-     drawPattern(ctx, size);
-     ctx.restore();
-  }
-  document.body.appendChild(document.createElement("br"));
-  link.appendChild(document.createTextNode("download image"));
-  link.setAttribute("href", canvas.toDataURL());
-  document.body.appendChild(link);
-}
-function drawPattern(ctx, size) {
-  var i = 0,
-      step = 2;
-  while (i < size) {
-    ctx.fillStyle = "rgb(0,0,0)";
-    ctx.fillRect (i, i, size - i, step);
-    ctx.fillRect (i, i, step, size - i);
-    i += 2 * step;
-  }
-}
-//]]></script>
-	 </head>
-	 <body onload="draw()">
-<p>This image can be used to find clipping problems. If the sides of the image are clipped asymetrically, it will obvious visually.</p>
-   <canvas id="canvas" width="136" height="136"></canvas>
-<img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAIgAAACIAQMAAAAGdDERAAAABlBMVEUAAAAAAAClZ7nPAAAAAXRSTlMAQObYZgAAAXFJREFUSMd91EGKwzAMhWFBtjmMIQfw1XUAgQ6TrUGzGD0TW8/NaviGv69N3Irl5ZGXnGUIrrPcpSriQ7eqit6+VVVi2FZVkdu2qojHMF2qKio37sdRIobZUlURuc2WqohHDMP8QVTkxgM6SUQMw/xBROS2nD+IZ6WzqqJZ+ayqRFY2qyqSlc2qiM9Ks6qis/KsqsSsLKsqMivLqoh/KhWhop/KI6jEpzIRKvKpLIKJL5UKE10qDyaxVCZMZKksiPhWKRHdKicSW2VEnrz6/LWp8qa0XLiIXFv1EomteojIVjGJd6kuJpjP6mUSsVQPE8xnRSVyvuU4E8z3HGcSOd9ynAnme44ziZxvOc4E8z3HmeTr/VcPF/zR8S8ieMGGCSKY73irRPABGz4yEcx33DoiuOENj4AI5jseJREcgIYjQQTzHUeLCA5kwxElgvmOo04EX5CGrwwRzPc4C76w7ToL5vt7FvyAtOcsuPoPQfWe5Q+etqGXQp0CUgAAAABJRU5ErkJggg==" alt="pregenerated"/>
- </body>
-</html>
diff --git a/apps/files_odfviewer/src/webodf/webodf/tools/externs.js b/apps/files_odfviewer/src/webodf/webodf/tools/externs.js
deleted file mode 100644
index 9862befe48..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/tools/externs.js
+++ /dev/null
@@ -1,348 +0,0 @@
-/**
- * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
- * @licstart
- * The JavaScript code in this page is free software: you can redistribute it
- * and/or modify it under the terms of the GNU Affero General Public License
- * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.  The code is distributed
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
- *
- * As additional permission under GNU AGPL version 3 section 7, you
- * may distribute non-source (e.g., minimized or compacted) forms of
- * that code without the copy of the GNU GPL normally required by
- * section 4, provided you include this license notice and a URL
- * through which recipients can access the Corresponding Source.
- *
- * As a special exception to the AGPL, any HTML file which merely makes function
- * calls to this code, and for that purpose includes it by reference shall be
- * deemed a separate work for copyright law purposes. In addition, the copyright
- * holders of this code give you permission to combine this code with free
- * software libraries that are released under the GNU LGPL. You may copy and
- * distribute such a system following the terms of the GNU AGPL for this code
- * and the LGPL for the libraries. If you modify this code, you may extend this
- * exception to your version of the code, but you are not obligated to do so.
- * If you do not wish to do so, delete this exception statement from your
- * version.
- *
- * This license applies to this entire compilation.
- * @licend
- * @source: http://www.webodf.org/
- * @source: http://gitorious.org/odfkit/webodf/
- */
-/*global Packages HTMLStyleElement window XMLHttpRequest HTMLStyleElement Document*/
-/*jslint nomen: false */
-/**
- * @constructor
- */
-function NodeJSObject() {}
-/**
- * @param {!string} path
- * @param {function(...)} callback
- * @return {undefined}
- */
-NodeJSObject.prototype.stat = function (path, callback) {};
-/**
- * @param {!string} path
- * @param {?string} encoding
- * @param {function(...)} callback
- * @return {?string}
- */
-NodeJSObject.prototype.readFile = function (path, encoding, callback) {};
-/**
- * @param {!string} path
- * @param {?string} encoding
- * @return {?string}
- */
-NodeJSObject.prototype.readFileSync = function (path, encoding) {};
-/**
- * @param {!string} path
- * @param {!string} flags
- * @param {!number} mode
- * @param {!function(string, !number):undefined} callback
- * @return {undefined}
- */
-NodeJSObject.prototype.open = function (path, flags, mode, callback) {};
-/**
- * @param {!number} fd
- * @param {!Buffer} buffer
- * @param {!number} offset
- * @param {!number} length
- * @param {!number} position
- * @param {function(string, !number)} callback
- * @return {undefined}
- */
-NodeJSObject.prototype.read = function (fd, buffer, offset, length, position,
-        callback) {};
-/**
- * @param {!string} path
- * @param {!string} data
- * @param {!string} encoding
- * @param {!function(?string):undefined} callback
- * @return {undefined}
- */
-NodeJSObject.prototype.writeFile = function (path, data, encoding, callback) {};
-/**
- * @param {!string} path
- * @param {!function(?string):undefined} callback
- * @return {undefined}
- */
-NodeJSObject.prototype.unlink = function (path, callback) {};
-/**
- * @param {!number} fd
- * @param {function(!string)} callback
- * @return {undefined}
- */
-NodeJSObject.prototype.close = function (fd, callback) {};
-/**
- * @param {!string} className
- * @return {!NodeJSObject}
- */
-function require(className) {}
-/**
- * @constructor
- */
-function NodeJSConsole() {}
-/**
- * @param {!string} msg
- * @return {undefined}
- */
-NodeJSConsole.prototype.log = function (msg) {};
-/**
- * @type {!NodeJSConsole}
- */
-var console;
-/**
- * @constructor
- */
-function NodeJSProcess() {}
-/**
- * @param {!number} exitCode
- * @return {undefined}
- */
-NodeJSProcess.prototype.exit = function (exitCode) {};
-/**
- * @type {!Array}
- */
-NodeJSProcess.prototype.argv = [];
-/**
- * @type {!Object}
- */
-NodeJSProcess.prototype.stderr = {};
-/**
- * @type {!NodeJSProcess}
- */
-var process;
-/**
- * @type {!string}
- */
-var __dirname;
-/**
- * @constructor
- * @param {!number|!Array.<!number>|!string} arg1
- * @param {!string=} encoding
- */
-function Buffer(arg1, encoding) {}
-/**
- * @param {!string} msg
- * @return {undefined}
- */
-function print(msg) {}
-/**
- * @param {!string} path
- * @param {!string=} encoding
- * @return {?string}
- */
-function readFile(path, encoding) {}
-/**
- * @param {!number} exitCode
- * @return {undefined}
- */
-function quit(exitCode) {}
-/**
- * @namespace
- */
-Packages.javax = {};
-/**
- * @namespace
- */
-Packages.javax.xml = {};
-/**
- * @namespace
- */
-Packages.javax.xml.validation = {};
-/**
- * @constructor
- */
-Packages.javax.xml.validation.Schema = function () {};
-/**
- * @namespace
- */
-Packages.javax.xml.parsers = {};
-/**
- * @constructor
- */
-Packages.javax.xml.parsers.DocumentBuilder = function () {};
-/**
- * @param {!Object} entityresolver
- * @return {undefined}
- */
-Packages.javax.xml.parsers.DocumentBuilder.prototype.setEntityResolver =
-    function (entityresolver) {};
-/**
- * @param {!Packages.org.xml.sax.InputSource} source 
- * @return {Document}
- */
-Packages.javax.xml.parsers.DocumentBuilder.prototype.parse =
-    function (source) {};
-/**
- * @return {DOMImplementation}
- */
-Packages.javax.xml.parsers.DocumentBuilder.prototype.getDOMImplementation =
-    function () {};
-/**
- * @constructor
- */
-Packages.javax.xml.parsers.DocumentBuilderFactory = function () {};
-/**
- * @return {!Packages.javax.xml.parsers.DocumentBuilderFactory}
- */
-Packages.javax.xml.parsers.DocumentBuilderFactory.newInstance = function () {};
-/**
- * @param {!boolean} value
- */
-Packages.javax.xml.parsers.DocumentBuilderFactory.prototype.setValidating =
-    function (value) {};
-/**
- * @param {!boolean} value
- */
-Packages.javax.xml.parsers.DocumentBuilderFactory.prototype.setNamespaceAware =
-    function (value) {};
-/**
- * @param {!boolean} value
- */
-Packages.javax.xml.parsers.DocumentBuilderFactory.prototype
-    .setExpandEntityReferences = function (value) {};
-/**
- * @param {?Packages.javax.xml.validation.Schema} schema
- */
-Packages.javax.xml.parsers.DocumentBuilderFactory.prototype.setSchema =
-    function (schema) {};
-/**
- * @return {!Packages.javax.xml.parsers.DocumentBuilder}
- */
-Packages.javax.xml.parsers.DocumentBuilderFactory.prototype.newDocumentBuilder =
-    function () {};
-/**
- * @namespace
- */
-Packages.org = {};
-/**
- * @namespace
- */
-Packages.org.xml.sax = {};
-/**
- * @param {!Object} definition
- * @return {!Object}
- */
-Packages.org.xml.sax.EntityResolver = function (definition) {};
-/**
- * @namespace
- */
-Packages.java.io = {};
-/**
- * @constructor
- * @param {!string} path
- */
-Packages.java.io.FileReader = function (path) {};
-/**
- * @constructor
- * @param {!string} path
- */
-Packages.java.io.FileOutputStream = function (path) {};
-/**
- * @param {!number} b
- * @return {undefined}
- */
-Packages.java.io.FileOutputStream.prototype.write = function (b) {};
-/**
- * @return {undefined}
- */
-Packages.java.io.FileOutputStream.prototype.close = function () {};
-/**
- * @constructor
- * @param {!Packages.java.io.FileReader} reader
- */
-Packages.org.xml.sax.InputSource = function (reader) {};
-/**
- * @type {!StyleSheet}
- */
-HTMLStyleElement.prototype.sheet;
-XMLHttpRequest.prototype.sendAsBinary = function (data) {};
-/**
- * @const@type{!string}
- */
-XMLHttpRequest.prototype.responseBody;
-window.nativeio = {};
-var VBArray = {};
-VBArray.prototype.toArray = function () {};
-/**
- * @interface
- */
-function TreeWalker() {}
-/**
- * @const@type{!Node}
- */
-TreeWalker.prototype.root;
-/**
- * @const@type{number}
- */
-TreeWalker.prototype.whatToShow;
-/**
- * @const@type{NodeFilter}
- */
-TreeWalker.prototype.filter;
-/**
- * @const@type{boolean}
- */
-TreeWalker.prototype.expandEntityReferences;
-/**
- * @type{Node}
- */
-TreeWalker.prototype.currentNode;
-/**
- * @return {Node}
- */
-TreeWalker.prototype.parentNode = function () {};
-/**
- * @return {Node}
- */
-TreeWalker.prototype.firstChild = function () {};
-/**
- * @return {Node}
- */
-TreeWalker.prototype.lastChild = function () {};
-/**
- * @return {Node}
- */
-TreeWalker.prototype.previousSibling = function () {};
-/**
- * @return {Node}
- */
-TreeWalker.prototype.nextSibling = function () {};
-/**
- * @return {Node}
- */
-TreeWalker.prototype.previousNode = function () {};
-/**
- * @return {Node}
- */
-TreeWalker.prototype.nextNode = function () {};
-/**
- * @param {!Node} root
- * @param {!number} whatToShow
- * @param {NodeFilter=} filter
- * @param {boolean=} entityReferenceExpansion
- * @return {!TreeWalker}
- */
-Document.prototype.createTreeWalker = function (root, whatToShow, filter, entityReferenceExpansion) {};
diff --git a/apps/files_odfviewer/src/webodf/webodf/tools/extjsexterns.js b/apps/files_odfviewer/src/webodf/webodf/tools/extjsexterns.js
deleted file mode 100644
index f65d0c5cdb..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/tools/extjsexterns.js
+++ /dev/null
@@ -1,171 +0,0 @@
-/**
- * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
- * @licstart
- * The JavaScript code in this page is free software: you can redistribute it
- * and/or modify it under the terms of the GNU Affero General Public License
- * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.  The code is distributed
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
- *
- * As additional permission under GNU AGPL version 3 section 7, you
- * may distribute non-source (e.g., minimized or compacted) forms of
- * that code without the copy of the GNU GPL normally required by
- * section 4, provided you include this license notice and a URL
- * through which recipients can access the Corresponding Source.
- *
- * As a special exception to the AGPL, any HTML file which merely makes function
- * calls to this code, and for that purpose includes it by reference shall be
- * deemed a separate work for copyright law purposes. In addition, the copyright
- * holders of this code give you permission to combine this code with free
- * software libraries that are released under the GNU LGPL. You may copy and
- * distribute such a system following the terms of the GNU AGPL for this code
- * and the LGPL for the libraries. If you modify this code, you may extend this
- * exception to your version of the code, but you are not obligated to do so.
- * If you do not wish to do so, delete this exception statement from your
- * version.
- *
- * This license applies to this entire compilation.
- * @licend
- * @source: http://www.webodf.org/
- * @source: http://gitorious.org/odfkit/webodf/
- */
-/*global Packages HTMLStyleElement window XMLHttpRequest HTMLStyleElement Document*/
-/*jslint nomen: false */
-var Ext = {};
-Ext.data = {};
-/**
- * @constructor
- */
-Ext.data.Model = function (settings) {};
-/**
- * @param {!string} fieldName
- * @return {!string}
- */
-Ext.data.Model.prototype.get = function (fieldName) {};
-/**
- * @return {!boolean}
- */
-Ext.data.Model.isExpanded = function () {};
-/**
- * @constructor
- */
-Ext.data.NodeInterface = function () {};
-/**
- * @param {!string} attribute
- * @param {*} value
- * @param {boolean=} deep
- * @return {Ext.data.NodeInterface}
- */
-Ext.data.NodeInterface.prototype.findChild = function (attribute, value, deep) {};
-/**
- * @param {!Ext.data.NodeInterface|!Object} node
- * @return {!Ext.data.NodeInterface}
- */
-Ext.data.NodeInterface.prototype.appendChild = function (node) {};
-/**
- * @param {!string} id
- * @return {Ext.Component}
- */
-Ext.getCmp = function (id) {};
-Ext.tree = {};
-/**
- * @constructor
- */
-Ext.tree.Panel = function (settings) {};
-/**
- * @return {!Ext.data.NodeInterface}
- */
-Ext.tree.Panel.prototype.getRootNode = function () {};
-Ext.component = {};
-/**
- * @constructor
- * @extends {Ext.Component}
- */
-Ext.component.Component = function (settings) {};
-/**
- * @return {!Ext.Element}
- */
-Ext.component.Component.prototype.getEl = function () {};
-/**
- * @constructor
- */
-Ext.Button = function (settings) {};
-/**
- * @constructor
- */
-Ext.Component = function (settings) {};
-/**
- * @type {Object}
- */
-Ext.Component.prototype.superclass = {};
-/**
- * @type {!Ext.Element}
- */
-Ext.Component.prototype.el;
-/**
- * @constructor
- */
-Ext.Element = function (settings) {};
-/**
- * @constructor
- */
-Ext.Panel = function (settings) {};
-/**
- * @type {!Element}
- */
-Ext.Element.prototype.dom;
-Ext.QuickTips = {};
-/**
- * @return {undefined}
- */
-Ext.QuickTips.init = function () {};
-/**
- * @constructor
- */
-Ext.Slider = function (settings) {};
-Ext.util = {};
-/**
- * @constructor
- */
-Ext.util.MixedCollection = function () {};
-/**
- * @param {!Function} f
- */
-Ext.util.MixedCollection.prototype.findBy = function (f) {};
-Ext.tab = {};
-/**
- * @constructor
- */
-Ext.tab.Panel = function (settings) {};
-/**
- * @param {!Object} component
- * @return {undefined}
- */
-Ext.tab.Panel.prototype.add = function (component) {};
-/**
- * @return {!Ext.Component}
- */
-Ext.tab.Panel.prototype.getActiveTab = function () {};
-/**
- * @param {!Ext.Component} tab
- * @return {undefined}
- */
-Ext.tab.Panel.prototype.setActiveTab = function (tab) {};
-/**
- * @type {!Ext.util.MixedCollection}
- */
-Ext.tab.Panel.prototype.items;
-/**
- * @constructor
- */
-Ext.Toolbar = function (settings) {};
-/**
- * @constructor
- */
-Ext.Toolbar.TextItem = function (text) {};
-/**
- * @constructor
- */
-Ext.Viewport = function (settings) {};
-Ext.onReady = function (callback) {};
diff --git a/apps/files_odfviewer/src/webodf/webodf/tools/fixLicenses.py b/apps/files_odfviewer/src/webodf/webodf/tools/fixLicenses.py
deleted file mode 100755
index a81c9b55c6..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/tools/fixLicenses.py
+++ /dev/null
@@ -1,81 +0,0 @@
-#!/usr/bin/python -Qwarnall
-# -*- coding: utf-8 -*-
-#
-# This script checks if all files have licenses and fixes them if needed.
-# The script should be run from the root directory of the webodf project.
-import os, os.path
-
-# read the license text from the source file
-# the license starts at the line ' * @licstart' and ends at ' */'
-def readLicense(path):
-	file = open(path, "rU")
-	licensetext = []
-	started = False
-	for line in file:
-		if line.rstrip() == ' * @licstart':
-			started = True
-		if started:
-			licensetext.append(line)
-		if line.rstrip() == ' */':
-			break
-	return licensetext
-
-def writeLicense(file, license, defaultcopyright):
-	if defaultcopyright:
-		file.write(defaultcopyright)
-	file.writelines(license)
-
-def fixLicense(path, license, defaultcopyright):
-	# read the file
-	file = open(path, "rU")
-	lines = file.readlines()
-	file.close()
-	# does the file have any copyright statement already?
-	hasLicense = False
-	hasCopyright = False
-	for line in lines:
-		if line.rstrip() == ' * @licstart':
-			hasLicense = True
-		if line[:17] == ' * Copyright (C) ':
-			hasCopyright = True
-	if hasCopyright:
-		defaultcopyright = None
-	wroteLicense = False
-	skip = False
-	# write the file with the new slice
-	file = open(path, "w")
-	for line in lines:
-		if not wroteLicense:
-			if not hasLicense:
-				file.write("/**\n")
-				writeLicense(file, license, defaultcopyright)
-				wroteLicense = True
-			elif line.rstrip() == ' * @licstart':
-				writeLicense(file, license, defaultcopyright)
-				wroteLicense = True
-				skip = True
-		if skip:
-			if line.rstrip() == ' */':
-				skip = False
-		else:
-			file.write(line)
-	file.close()
-
-# get list of *.js files
-jsfiles = []
-for root, directories, files in os.walk("."):
-	while "extjs" in directories:
-		directories.remove("extjs")
-	for f in files:
-		if f[-3:] == ".js":
-			jsfiles.append(os.path.abspath(os.path.join(root, f)))
-
-# remove webodf/lib/packackages.js since it is the source for the licenses
-sourcefilepath = os.path.join(os.getcwd(), "webodf/lib/packages.js")
-jsfiles.remove(sourcefilepath)
-
-licensetext = readLicense(sourcefilepath)
-defaultcopyright = " * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>\n"
-
-for f in jsfiles:
-	fixLicense(f, licensetext, defaultcopyright)
diff --git a/apps/files_odfviewer/src/webodf/webodf/tools/refcheck/bootstrap.xsl b/apps/files_odfviewer/src/webodf/webodf/tools/refcheck/bootstrap.xsl
deleted file mode 100644
index 747e3e605b..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/tools/refcheck/bootstrap.xsl
+++ /dev/null
@@ -1,193 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0"
-  xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
-  xmlns:o="urn:odfkeys" xmlns:x="dummy" exclude-result-prefixes="o">
- <xsl:output method="xml" indent="yes"/>
- <xsl:namespace-alias stylesheet-prefix="x" result-prefix="xsl"/>
-
- <xsl:template name="join" >
-  <xsl:param name="values"/>
-  <xsl:param name="separator"/>
-  <xsl:for-each select="$values">
-   <xsl:choose>
-    <xsl:when test="position() = 1">
-     <xsl:value-of select="."/>
-    </xsl:when>
-    <xsl:otherwise>
-     <xsl:value-of select="concat($separator, .) "/>
-    </xsl:otherwise>
-   </xsl:choose>
-  </xsl:for-each>
- </xsl:template>
-
- <xsl:template name="getdefs">
-  <xsl:param name="name"/>
-  <xsl:param name="separator"/>
-  <xsl:variable name="key" select="../o:key[@name=$name]"/>
-  <xsl:if test="$key/@extends">
-   <xsl:call-template name="getdefs">
-    <xsl:with-param name="name" select="$key/@extends"/>
-    <xsl:with-param name="separator" select="$separator"/>
-   </xsl:call-template>
-   <xsl:text>|</xsl:text>
-  </xsl:if>
-  <xsl:call-template name="join">
-   <xsl:with-param name="values" select="$key/o:def"/>
-   <xsl:with-param name="separator" select="$separator"/>
-  </xsl:call-template>
- </xsl:template>
-
- <xsl:template match="o:key" mode="define">
-  <xsl:variable name="def">
-   <xsl:call-template name="getdefs">
-    <xsl:with-param name="name" select="@name"/>
-    <xsl:with-param name="separator" select="'|'"/>
-   </xsl:call-template>
-  </xsl:variable>
-  <xsl:variable name="ref">
-   <xsl:call-template name="join">
-    <xsl:with-param name="values" select="o:ref"/>
-    <xsl:with-param name="separator" select="'|'"/>
-   </xsl:call-template>
-  </xsl:variable>
-  <x:template name="check{@name}">
-   <x:param name="stylesfontfaces" />
-   <x:param name="fontfaces" />
-   <x:param name="officestyles" />
-   <x:param name="stylesautostyles" />
-   <x:param name="contentautostyles" />
-   <x:param name="masterstyles" />
-   <x:param name="body" />
-   <x:call-template name="checkReferences">
-    <x:with-param name="name" select="'{@name}'"/>
-    <x:with-param name="definitions" select="{$def}"/>
-    <x:with-param name="references" select="{$ref}"/>
-   </x:call-template>
-  </x:template>
- </xsl:template>
-
- <xsl:template match="o:key" mode="call">
-  <x:call-template name="check{@name}">
-   <x:with-param name="stylesfontfaces" select="$stylesfontfaces"/>
-   <x:with-param name="fontfaces" select="$fontfaces"/>
-   <x:with-param name="officestyles" select="$officestyles"/>
-   <x:with-param name="stylesautostyles" select="$stylesautostyles"/>
-   <x:with-param name="contentautostyles" select="$contentautostyles"/>
-   <x:with-param name="masterstyles" select="$masterstyles"/>
-   <x:with-param name="body" select="$body"/>
-  </x:call-template>
- </xsl:template>
-
- <xsl:template match="/o:keys">
-  <x:stylesheet version="1.0">
-   <xsl:for-each select="namespace::*"><xsl:copy/></xsl:for-each>
-
-   <xsl:apply-templates select="o:key" mode="define"/>
-
-   <x:template name="check">
-    <x:param name="stylesfontfaces" />
-    <x:param name="fontfaces" />
-    <x:param name="officestyles" />
-    <x:param name="stylesautostyles" />
-    <x:param name="contentautostyles" />
-    <x:param name="masterstyles" />
-    <x:param name="body" />
-    <xsl:apply-templates select="o:key" mode="call"/>
-   </x:template>
-
-   <x:template name="checkuniqueitem">
-    <x:param name="listname"/>
-    <x:param name="list"/>
-    <x:param name="item"/>
-    <x:if test="count($list[.=$item])!=1">
-     <x:message>
-      <x:value-of select="concat('The key with value &quot;', $item, '&quot; is used more than once in ', $listname, '.')"/>
-     </x:message>
-    </x:if>
-   </x:template>
-   
-   <x:template name="checkunique">
-    <x:param name="listname"/>
-    <x:param name="list"/>
-    <x:variable name="count">
-    </x:variable>
-    <x:for-each select="$list">
-     <x:call-template name="checkuniqueitem">
-      <x:with-param name="listname" select="$listname"/>
-      <x:with-param name="list" select="$list"/>
-      <x:with-param name="item" select="."/>
-     </x:call-template>
-    </x:for-each>
-   </x:template>
-   
-   <x:template name="verifyOccurance">
-    <x:param name="name"/>
-    <x:param name="definitions"/>
-    <x:param name="reference"/>
-    <x:if test="count($definitions[.=$reference])=0">
-     <x:message>
-      <x:value-of select="concat('There is no key with value &quot;', $reference, '&quot; in the key list ', $name, '.')"/>
-     </x:message>
-    </x:if>
-   </x:template>
-
-   <x:template name="checkReferences">
-    <x:param name="name"/>
-    <x:param name="definitions"/>
-    <x:param name="references"/>
-   
-    <x:call-template name="checkunique">
-     <x:with-param name="listname" select="$name"/>
-     <x:with-param name="list" select="$definitions"/>
-    </x:call-template>
-   
-    <x:for-each select="$references">
-     <x:call-template name="verifyOccurance">
-      <x:with-param name="name" select="$name"/>
-      <x:with-param name="definitions" select="$definitions"/>
-      <x:with-param name="reference" select="."/>
-     </x:call-template>
-    </x:for-each>
-   </x:template>
-
-   <x:template match="/office:document">
-    <x:call-template name="check">
-     <x:with-param name="stylesfontfaces" select="office:font-face-decls"/>
-     <x:with-param name="fontfaces" select="office:font-face-decls"/>
-     <x:with-param name="officestyles" select="office:styles"/>
-     <x:with-param name="stylesautostyles" select="office:automatic-styles"/>
-     <x:with-param name="contentautostyles" select="office:automatic-styles"/>
-     <x:with-param name="masterstyles" select="office:master-styles"/>
-     <x:with-param name="body" select="office:body"/>
-    </x:call-template>
-   </x:template>
-
-   <x:template match="/office:document-styles">
-    <x:call-template name="check">
-     <x:with-param name="stylesfontfaces" select="office:font-face-decls"/>
-     <x:with-param name="fontfaces" select="office:font-face-decls"/>
-     <x:with-param name="officestyles" select="office:styles"/>
-     <x:with-param name="stylesautostyles" select="office:automatic-styles"/>
-     <x:with-param name="contentautostyles" select="not-available"/>
-     <x:with-param name="masterstyles" select="office:master-styles"/>
-     <x:with-param name="body" select="not-available"/>
-    </x:call-template>
-   </x:template>
-
-   <x:template match="/office:document-content">
-    <x:variable name="stylesxml" select="document('styles.xml', .)/office:document-styles" />
-    <x:variable name="stylesfontfaces" select="$stylesxml/office:font-face-decls" />
-    <x:call-template name="check">
-     <x:with-param name="stylesfontfaces" select="$stylesfontfaces"/>
-     <x:with-param name="fontfaces" select="$stylesfontfaces|office:font-face-decls"/>
-     <x:with-param name="officestyles" select="$stylesxml/office:styles"/>
-     <x:with-param name="stylesautostyles" select="$stylesxml/office:automatic-styles"/>
-     <x:with-param name="contentautostyles" select="office:automatic-styles"/>
-     <x:with-param name="masterstyles" select="$stylesxml/office:master-styles"/>
-     <x:with-param name="body" select="office:body"/>
-    </x:call-template>
-   </x:template>
-  </x:stylesheet>
- </xsl:template>
-
-</xsl:stylesheet>
diff --git a/apps/files_odfviewer/src/webodf/webodf/tools/refcheck/odfkeys.xml b/apps/files_odfviewer/src/webodf/webodf/tools/refcheck/odfkeys.xml
deleted file mode 100644
index e2ad06941c..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/tools/refcheck/odfkeys.xml
+++ /dev/null
@@ -1,455 +0,0 @@
-<keys xmlns="urn:odfkeys"
-  xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
-  xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
-  xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0"
-  xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0"
-  xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
-  xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0"
-  xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0"
-  xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
-  >
- <doc>
-  <h2>ODF reference checker</h2>
-  <p>ODF documents use string keys and references to link different parts of the document. There are quite a few different groups of keys. The description of how these keys work in the specification is not trivial to implement, because not keys behave differently depending on the context in which they are defined. E.g. a style has a family. If the family is 'text', then only certain attributes on certain elements in certain parts of the ODF document may refer to that style.</p>
-  <p>For a beginning and even intermediate ODF developer or document producer, this is quite complicated. Also, there is not currently an easy way to check if all the references are correct. This document aims to make it easier to figure out what groups of keys exist and from which elements they may be linked.</p>
-  <p>The document consists of one &lt;key> element for each group of keys. Each group has a name and is defined by one or more XPath expressions in &lt;def> elements. Any string that matches the XPath expression in a particular document is part of the set of keys of that group. Each key in a set must be unique.</p>
-  <p>In addition, each &lt;key> has a number of &lt;ref> elements that define the positions in the document where a key may be referenced. Each reference must exist in the set of keys that are found via the &lt;def> elements.</p>
-  <p>The format of this document is designed to be easy to read but also to make it easy to use in a reference checker. This document comes with checked implemented in XSL. The XSL is called bootstrap.xsl and is used in two transformation steps. Here is shown how to run the check with <tt>xsltproc</tt>:</p>
-  <pre>xsltproc bootstrap.xsl odfkeys.xml > checkkeys.xsl</pre>
-  <pre>xsltproc checkkeys.xsl content.xml</pre>
-  <p>The check can be run on content.xml files, on styles.xml files and on flat ODF files.</p>
-  <h2>Definitions</h2>
-  <dl>
-   <dt>$stylesfontfaces</dt>
-   <dd>This variable refers to the subset of font face definitions that are available to the style elements. Styles.xml may not refer to font faces defined in content.xml.</dd>
-   <dt>$fontfaces</dt>
-   <dd>This variable refers to all font face definitions.</dd>
-   <dt>$officestyles</dt>
-   <dd>This variable refers to the element office:styles.</dd>
-   <dt>$stylesautostyles</dt>
-   <dd>This variable refers to the element office:automatic-styles in styles.xml.</dd>
-   <dt>$contentautostyles</dt>
-   <dd>This variable refers to the element office:automatic-styles in content.xml. When evaluating a styles.xml document, it is an empty set.</dd>
-   <dt>$masterstyles</dt>
-   <dd>This variable refers to the office:master-styles element.</dd>
-   <dt>$body</dt>
-   <dd>This variable refers to the office:body element. When evaluating a styles.xml document, it is an empty set.</dd>
-  </dl>
-  <h2>TODO</h2> 
-  <ul>
-   <li>implement &lt;refs/> to check refs of type styleNameRefs</li>
-   <li>check for unused automatic styles</li>
-   <li>check that there are no circular dependencies in style inheritance</li>
-  </ul>
- </doc>
- <key name="gradient">
-  <def>$officestyles/draw:gradient/@draw:name</def>
-  <def>$officestyles/svg:linearGradient/@draw:name</def>
-  <def>$officestyles/svg:radialGradient/@draw:name</def>
-  <ref>$officestyles//@draw:fill-gradient-name</ref>
-  <ref>$stylesautostyles//@draw:fill-gradient-name</ref>
-  <ref>$contentautostyles//@draw:fill-gradient-name</ref>
- </key>
- <key name="hatch">
-  <def>$officestyles/draw:hatch/@draw:name</def>
-  <ref>$officestyles//@draw:fill-hatch-name</ref>
-  <ref>$stylesautostyles//@draw:fill-hatch-name</ref>
-  <ref>$contentautostyles//@draw:fill-hatch-name</ref>
- </key>
- <key name="fill-image">
-  <def>$officestyles/draw:fill-image/@draw:name</def>
-  <ref>$officestyles//@draw:fill-image-name</ref>
-  <ref>$stylesautostyles//@draw:fill-image-name</ref>
-  <ref>$contentautostyles//@draw:fill-image-name</ref>
- </key>
- <key name="marker">
-  <def>$officestyles/draw:marker/@draw:name</def>
-  <ref>$officestyles//@draw:marker-start</ref>
-  <ref>$officestyles//@draw:marker-end</ref>
-  <ref>$stylesautostyles//@draw:marker-start</ref>
-  <ref>$stylesautostyles//@draw:marker-end</ref>
-  <ref>$contentautostyles//@draw:marker-start</ref>
-  <ref>$contentautostyles//@draw:marker-end</ref>
- </key>
- <key name="stroke-dash">
-  <def>$officestyles/draw:stroke-dash/@draw:name</def>
-  <ref>$officestyles//@draw:stroke-dash</ref>
-  <ref>$stylesautostyles//@draw:stroke-dash</ref>
-  <ref>$contentautostyles//@draw:stroke-dash</ref>
-  <refs>$officestyles//@draw:stroke-dash-names</refs>
-  <refs>$stylesautostyles//@draw:stroke-dash-names</refs>
-  <refs>$contentautostyles//@draw:stroke-dash-names</refs>
- </key>
- <key name="opacity">
-  <def>$officestyles/draw:opacity/@draw:name</def>
-  <ref>$officestyles//@draw:opacity-name</ref>
-  <ref>$stylesautostyles//@draw:opacity-name</ref>
-  <ref>$contentautostyles//@draw:opacity-name</ref>
- </key>
- <key name="styles-font-face">
-  <def>$stylesfontfaces/style:font-face/@style:name</def>
-  <ref>$officestyles//style:text-properties/@style:font-name</ref>
-  <ref>$officestyles//style:text-properties/@style:font-name-asian</ref>
-  <ref>$officestyles//style:text-properties/@style:font-name-complex</ref>
-  <ref>$officestyles//style:list-level-properties/@style:font-name</ref>
-  <ref>$stylesautostyles//style:text-properties/@style:font-name</ref>
-  <ref>$stylesautostyles//style:text-properties/@style:font-name-asian</ref>
-  <ref>$stylesautostyles//style:text-properties/@style:font-name-complex</ref>
-  <ref>$stylesautostyles//style:list-level-properties/@style:font-name</ref>
- </key>
- <key name="font-face">
-  <def>$fontfaces/style:font-face/@style:name</def>
-  <ref>$contentautostyles//style:text-properties/@style:font-name</ref>
-  <ref>$contentautostyles//style:text-properties/@style:font-name-asian</ref>
-  <ref>$contentautostyles//style:text-properties/@style:font-name-complex</ref>
-  <ref>$contentautostyles//style:list-level-properties/@style:font-name</ref>
- </key>
- <key name="master-page">
-  <def>$masterstyles/style:master-page/@style:name</def>
-  <!--draw:master-page-name-->
-  <ref>$body/office:drawing/draw:page/@draw:master-page-name</ref>
-  <ref>$body/office:presentation/draw:page/@draw:master-page-name</ref>
-  <!--style:master-page-name-->
-  <ref>$officestyles/style:style[@style:family='paragraph']/@style:master-page-name</ref>
-  <ref>$officestyles/style:style[@style:family='table']/@style:master-page-name</ref>
-  <ref>$stylesautostyles/style:style[@style:family='paragraph']/@style:master-page-name</ref>
-  <ref>$stylesautostyles/style:style[@style:family='table']/@style:master-page-name</ref>
-  <ref>$contentautostyles/style:style[@style:family='paragraph']/@style:master-page-name</ref>
-  <ref>$contentautostyles/style:style[@style:family='table']/@style:master-page-name</ref>
-  <!--style:next-style-name-->
-  <ref>$masterstyles/style:master-page/@style:next-style-name</ref>
-  <!--text:master-page-name-->
-  <ref>$officestyles/text:notes-configuration/@text:master-page-name</ref>
-  <ref>$officestyles/style:default-style[@style:family='section']/style:section-properties/text:notes-configuration/@text:master-page-name</ref>
-  <ref>$officestyles/style:style[@style:family='section']/style:section-properties/text:notes-configuration/@text:master-page-name</ref>
-  <ref>$stylesautostyles/style:style[@style:family='section']/style:section-properties/text:notes-configuration/@text:master-page-name</ref>
-  <ref>$contentautostyles/style:style[@style:family='section']/style:section-properties/text:notes-configuration/@text:master-page-name</ref>
-  <ref>$body/office:text/text:page-sequence/text:page/@text:master-page-name</ref>
-  <!--style:parent-style-name: not handled: likely an error in the specification -->
- </key>
- <key name="presentation-page-layout">
-  <def>$officestyles/style:presentation-page-layout/@style:name</def>
-  <ref>$masterstyles/style:handout-master/@presentation:presentation-page-layout-name</ref>
-  <ref>$body/office:drawing/draw:page/@presentation:presentation-page-layout-name</ref>
-  <ref>$body/office:presentation/draw:page/@presentation:presentation-page-layout-name</ref>
- </key>
- <key name="styles-page-layout">
-  <def>$stylesautostyles/style:page-layout/@style:name</def>
-  <ref>$masterstyles/style:master-page/@style:page-layout-name</ref>
-  <ref>$masterstyles/style:master-page/presentation:notes/@style:page-layout-name</ref>
-  <ref>$masterstyles/style:handout-master/@style:page-layout-name</ref>
- </key>
- <key name="content-page-layout">
-  <def>$contentautostyles/style:page-layout/@style:name</def>
-  <ref>$body/office:presentation/draw:page/presentation:notes/@style:page-layout-name</ref>
- </key>
- <key name="common-list-styles">
-  <def>$officestyles/text:list-style/@style:name</def>
-  <def>$officestyles//style:graphic-properties/text:list-style/@style:name</def>
-  <ref emptyok="true">$officestyles/style:style/@style:list-style-name</ref>
- </key>
- <key name="styles-list-styles" extends="common-list-styles">
-  <def>$stylesautostyles/text:list-style/@style:name</def>
-  <def>$stylesautostyles//style:graphic-properties/text:list-style/@style:name</def>
-  <ref emptyok="true">$stylesautostyles/style:style/@style:list-style-name</ref>
-  <ref>$masterstyles//text:list/@text:style-name</ref>
-  <ref>$masterstyles//text:numbered-paragraphs/@text:style-name</ref>
-  <ref>$masterstyles//text:list-item/@text:style-override</ref>
- </key>
- <key name="content-list-styles" extends="common-list-styles">
-  <def>$contentautostyles/text:list-style/@style:name</def>
-  <def>$contentautostyles//style:graphic-properties/text:list-style/@style:name</def>
-  <ref emptyok="true">$contentautostyles/style:style/@style:list-style-name</ref>
-  <ref>$body//text:list/@text:style-name</ref>
-  <ref>$body//text:numbered-paragraphs/@text:style-name</ref>
-  <ref>$body//text:list-item/@text:style-override</ref>
- </key>
- <key name="common-data-styles">
-  <def>$officestyles/number:number-style/@style:name</def>
-  <def>$officestyles/number:currency-style/@style:name</def>
-  <def>$officestyles/number:percentage-style/@style:name</def>
-  <def>$officestyles/number:date-style/@style:name</def>
-  <def>$officestyles/number:time-style/@style:name</def>
-  <def>$officestyles/number:boolean-style/@style:name</def>
-  <def>$officestyles/number:text-style/@style:name</def>
-  <ref>$officestyles/style:style/@style:data-style-name</ref>
-  <ref>$officestyles/style:style/@style:percentage-data-style-name</ref>
- </key>
- <key name="styles-data-styles" extends="common-data-styles">
-  <def>$stylesautostyles/number:number-style/@style:name</def>
-  <def>$stylesautostyles/number:currency-style/@style:name</def>
-  <def>$stylesautostyles/number:percentage-style/@style:name</def>
-  <def>$stylesautostyles/number:date-style/@style:name</def>
-  <def>$stylesautostyles/number:time-style/@style:name</def>
-  <def>$stylesautostyles/number:boolean-style/@style:name</def>
-  <def>$stylesautostyles/number:text-style/@style:name</def>
-  <ref>$stylesautostyles/style:style/@style:data-style-name</ref>
-  <ref>$stylesautostyles/style:style/@style:percentage-data-style-name</ref>
-  <ref>$masterstyles//text:creation-date/@style:data-style-name</ref>
-  <ref>$masterstyles//text:creation-time/@style:data-style-name</ref>
-  <ref>$masterstyles//text:database-display/@style:data-style-name</ref>
-  <ref>$masterstyles//text:date/@style:data-style-name</ref>
-  <ref>$masterstyles//text:editing-duration/@style:data-style-name</ref>
-  <ref>$masterstyles//text:expression/@style:data-style-name</ref>
-  <ref>$masterstyles//text:meta-field/@style:data-style-name</ref>
-  <ref>$masterstyles//text:modification-date/@style:data-style-name</ref>
-  <ref>$masterstyles//text:modification-time/@style:data-style-name</ref>
-  <ref>$masterstyles//text:print-date/@style:data-style-name</ref>
-  <ref>$masterstyles//text:print-time/@style:data-style-name</ref>
-  <ref>$masterstyles//text:table-formula/@style:data-style-name</ref>
-  <ref>$masterstyles//text:time/@style:data-style-name</ref>
-  <ref>$masterstyles//text:user-defined/@style:data-style-name</ref>
-  <ref>$masterstyles//text:user-field-get/@style:data-style-name</ref>
-  <ref>$masterstyles//text:user-field-input/@style:data-style-name</ref>
-  <ref>$masterstyles//text:variable-get/@style:data-style-name</ref>
-  <ref>$masterstyles//text:variable-input/@style:data-style-name</ref>
-  <ref>$masterstyles//text:variable-set/@style:data-style-name</ref>
- </key>
- <key name="content-data-styles" extends="common-data-styles">
-  <def>$contentautostyles/number:number-style/@style:name</def>
-  <def>$contentautostyles/number:currency-style/@style:name</def>
-  <def>$contentautostyles/number:percentage-style/@style:name</def>
-  <def>$contentautostyles/number:date-style/@style:name</def>
-  <def>$contentautostyles/number:time-style/@style:name</def>
-  <def>$contentautostyles/number:boolean-style/@style:name</def>
-  <def>$contentautostyles/number:text-style/@style:name</def>
-  <ref>$contentautostyles/style:style/@style:data-style-name</ref>
-  <ref>$contentautostyles/style:style/@style:percentage-data-style-name</ref>
-  <ref>$body/office:presentation/presentation:date-time-decl/@style:data-style-name</ref>
-  <ref>$body//text:creation-date/@style:data-style-name</ref>
-  <ref>$body//text:creation-time/@style:data-style-name</ref>
-  <ref>$body//text:database-display/@style:data-style-name</ref>
-  <ref>$body//text:date/@style:data-style-name</ref>
-  <ref>$body//text:editing-duration/@style:data-style-name</ref>
-  <ref>$body//text:expression/@style:data-style-name</ref>
-  <ref>$body//text:meta-field/@style:data-style-name</ref>
-  <ref>$body//text:modification-date/@style:data-style-name</ref>
-  <ref>$body//text:modification-time/@style:data-style-name</ref>
-  <ref>$body//text:print-date/@style:data-style-name</ref>
-  <ref>$body//text:print-time/@style:data-style-name</ref>
-  <ref>$body//text:table-formula/@style:data-style-name</ref>
-  <ref>$body//text:time/@style:data-style-name</ref>
-  <ref>$body//text:user-defined/@style:data-style-name</ref>
-  <ref>$body//text:user-field-get/@style:data-style-name</ref>
-  <ref>$body//text:user-field-input/@style:data-style-name</ref>
-  <ref>$body//text:variable-get/@style:data-style-name</ref>
-  <ref>$body//text:variable-input/@style:data-style-name</ref>
-  <ref>$body//text:variable-set/@style:data-style-name</ref>
- </key>
- <key name="common-chart-style">
-  <def>$officestyles/style:style[@style:family='chart']/@style:name</def>
-  <ref>$officestyles/style:style[@style:family='chart']/@style:parent-style-name</ref>
-  <ref>$stylesautostyles/style:style[@style:family='chart']/@style:parent-style-name</ref>
-  <ref>$contentautostyles/style:style[@style:family='chart']/@style:parent-style-name</ref>
- </key>
- <key name="styles-chart-style" extends="common-chart-style">
-  <def>$stylesautostyles/style:style[@style:family='chart']/@style:name</def>
-  <ref>$masterstyles//chart:axis/@chart:style-name</ref>
-  <ref>$masterstyles//chart:chart/@chart:style-name</ref>
-  <ref>$masterstyles//chart:data-label/@chart:style-name</ref>
-  <ref>$masterstyles//chart:data-point/@chart:style-name</ref>
-  <ref>$masterstyles//chart:equation/@chart:style-name</ref>
-  <ref>$masterstyles//chart:error-indicator/@chart:style-name</ref>
-  <ref>$masterstyles//chart:floor/@chart:style-name</ref>
-  <ref>$masterstyles//chart:footer/@chart:style-name</ref>
-  <ref>$masterstyles//chart:grid/@chart:style-name</ref>
-  <ref>$masterstyles//chart:legend/@chart:style-name</ref>
-  <ref>$masterstyles//chart:mean-value/@chart:style-name</ref>
-  <ref>$masterstyles//chart:plot-area/@chart:style-name</ref>
-  <ref>$masterstyles//chart:regression-curve/@chart:style-name</ref>
-  <ref>$masterstyles//chart:series/@chart:style-name</ref>
-  <ref>$masterstyles//chart:stock-gain-marker/@chart:style-name</ref>
-  <ref>$masterstyles//chart:stock-loss-marker/@chart:style-name</ref>
-  <ref>$masterstyles//chart:stock-range-line/@chart:style-name</ref>
-  <ref>$masterstyles//chart:subtitle/@chart:style-name</ref>
-  <ref>$masterstyles//chart:title/@chart:style-name</ref>
-  <ref>$masterstyles//chart:wall/@chart:style-name</ref>
- </key>
- <key name="content-chart-style" extends="common-chart-style">
-  <def>$contentautostyles/style:style[@style:family='chart']/@style:name</def>
-  <ref>$body//chart:axis/@chart:style-name</ref>
-  <ref>$body//chart:chart/@chart:style-name</ref>
-  <ref>$body//chart:data-label/@chart:style-name</ref>
-  <ref>$body//chart:data-point/@chart:style-name</ref>
-  <ref>$body//chart:equation/@chart:style-name</ref>
-  <ref>$body//chart:error-indicator/@chart:style-name</ref>
-  <ref>$body//chart:floor/@chart:style-name</ref>
-  <ref>$body//chart:footer/@chart:style-name</ref>
-  <ref>$body//chart:grid/@chart:style-name</ref>
-  <ref>$body//chart:legend/@chart:style-name</ref>
-  <ref>$body//chart:mean-value/@chart:style-name</ref>
-  <ref>$body//chart:plot-area/@chart:style-name</ref>
-  <ref>$body//chart:regression-curve/@chart:style-name</ref>
-  <ref>$body//chart:series/@chart:style-name</ref>
-  <ref>$body//chart:stock-gain-marker/@chart:style-name</ref>
-  <ref>$body//chart:stock-loss-marker/@chart:style-name</ref>
-  <ref>$body//chart:stock-range-line/@chart:style-name</ref>
-  <ref>$body//chart:subtitle/@chart:style-name</ref>
-  <ref>$body//chart:title/@chart:style-name</ref>
-  <ref>$body//chart:wall/@chart:style-name</ref>
- </key>
- <key name="common-ruby-style">
-  <def>$officestyles/style:style[@style:family='ruby']/@style:name</def>
-  <ref>$officestyles/style:style[@style:family='ruby']/@style:parent-style-name</ref>
-  <ref>$stylesautostyles/style:style[@style:family='ruby']/@style:parent-style-name</ref>
-  <ref>$contentautostyles/style:style[@style:family='ruby']/@style:parent-style-name</ref>
- </key>
- <key name="styles-ruby-style" extends="common-ruby-style">
-  <def>$stylesautostyles/style:style[@style:family='ruby']/@style:name</def>
-  <ref>$masterstyles//text:ruby/@text:style-name</ref>
- </key>
- <key name="content-ruby-style" extends="common-ruby-style">
-  <def>$contentautostyles/style:style[@style:family='ruby']/@style:name</def>
-  <ref>$body//text:ruby/@text:style-name</ref>
- </key>
-<!-- clearly unfinished below here: more refs needed -->
- <key name="common-text-style">
-  <def>$officestyles/style:style[@style:family='text']/@style:name</def>
-  <ref>$officestyles/style:style[@style:family='text']/@style:parent-style-name</ref>
-  <ref>$stylesautostyles/style:style[@style:family='text']/@style:parent-style-name</ref>
-  <ref>$contentautostyles/style:style[@style:family='text']/@style:parent-style-name</ref>
- </key>
- <key name="styles-text-style" extends="common-text-style">
-  <def>$stylesautostyles/style:style[@style:family='text']/@style:name</def>
-  <ref>$masterstyles//text:span/@text:style-name</ref>
- </key>
- <key name="content-text-style" extends="common-text-style">
-  <def>$contentautostyles/style:style[@style:family='text']/@style:name</def>
-  <ref>$body//text:span/@text:style-name</ref>
- </key>
- <key name="common-paragraph-style">
-  <def>$officestyles/style:style[@style:family='paragraph']/@style:name</def>
-  <ref>$officestyles/style:style[@style:family='paragraph']/@style:parent-style-name</ref>
-  <ref>$stylesautostyles/style:style[@style:family='paragraph']/@style:parent-style-name</ref>
-  <ref>$contentautostyles/style:style[@style:family='paragraph']/@style:parent-style-name</ref>
- </key>
- <key name="styles-paragraph-style" extends="common-paragraph-style">
-  <def>$stylesautostyles/style:style[@style:family='paragraph']/@style:name</def>
-  <ref>$masterstyles//text:p/@text:style-name</ref>
- </key>
- <key name="content-paragraph-style" extends="common-paragraph-style">
-  <def>$contentautostyles/style:style[@style:family='paragraph']/@style:name</def>
-  <ref>$body//text:p/@text:style-name</ref>
- </key>
- <key name="common-section-style">
-  <def>$officestyles/style:style[@style:family='section']/@style:name</def>
-  <ref>$officestyles/style:style[@style:family='section']/@style:parent-style-name</ref>
-  <ref>$stylesautostyles/style:style[@style:family='section']/@style:parent-style-name</ref>
-  <ref>$contentautostyles/style:style[@style:family='section']/@style:parent-style-name</ref>
- </key>
- <key name="styles-section-style" extends="common-section-style">
-  <def>$stylesautostyles/style:style[@style:family='section']/@style:name</def>
-  <ref>$masterstyles//text:alphabetical-index/@text:style-name</ref>
- </key>
- <key name="content-section-style" extends="common-section-style">
-  <def>$contentautostyles/style:style[@style:family='section']/@style:name</def>
-  <ref>$body//text:alphabetical-index/@text:style-name</ref>
- </key>
-
- <key name="common-table-style">
-  <def>$officestyles/style:style[@style:family='table']/@style:name</def>
-  <ref>$officestyles/style:style[@style:family='table']/@style:parent-style-name</ref>
-  <ref>$stylesautostyles/style:style[@style:family='table']/@style:parent-style-name</ref>
-  <ref>$contentautostyles/style:style[@style:family='table']/@style:parent-style-name</ref>
- </key>
- <key name="styles-table-style" extends="common-table-style">
-  <def>$stylesautostyles/style:style[@style:family='table']/@style:name</def>
-  <ref>$masterstyles//table:table/@table:style-name</ref>
- </key>
- <key name="content-table-style" extends="common-table-style">
-  <def>$contentautostyles/style:style[@style:family='table']/@style:name</def>
-  <ref>$body//table:table/@table:style-name</ref>
- </key>
-
- <key name="common-table-column-style">
-  <def>$officestyles/style:style[@style:family='table-column']/@style:name</def>
-  <ref>$officestyles/style:style[@style:family='table-column']/@style:parent-style-name</ref>
-  <ref>$stylesautostyles/style:style[@style:family='table-column']/@style:parent-style-name</ref>
-  <ref>$contentautostyles/style:style[@style:family='table-column']/@style:parent-style-name</ref>
- </key>
- <key name="styles-table-column-style" extends="common-table-column-style">
-  <def>$stylesautostyles/style:style[@style:family='table-column']/@style:name</def>
-  <ref>$masterstyles//table:table-column/@table:style-name</ref>
- </key>
- <key name="content-table-column-style" extends="common-table-column-style">
-  <def>$contentautostyles/style:style[@style:family='table-column']/@style:name</def>
-  <ref>$body//table:table-column/@table:style-name</ref>
- </key>
-
- <key name="common-table-row-style">
-  <def>$officestyles/style:style[@style:family='table-row']/@style:name</def>
-  <ref>$officestyles/style:style[@style:family='table-row']/@style:parent-style-name</ref>
-  <ref>$stylesautostyles/style:style[@style:family='table-row']/@style:parent-style-name</ref>
-  <ref>$contentautostyles/style:style[@style:family='table-row']/@style:parent-style-name</ref>
- </key>
- <key name="styles-table-row-style" extends="common-table-row-style">
-  <def>$stylesautostyles/style:style[@style:family='table-row']/@style:name</def>
-  <ref>$masterstyles//table:table-row/@table:style-name</ref>
- </key>
- <key name="content-table-row-style" extends="common-table-row-style">
-  <def>$contentautostyles/style:style[@style:family='table-row']/@style:name</def>
-  <ref>$body//table:table-row/@table:style-name</ref>
- </key>
-
- <key name="common-table-cell-style">
-  <def>$officestyles/style:style[@style:family='table-cell']/@style:name</def>
-  <ref>$officestyles/style:style[@style:family='table-cell']/@style:parent-style-name</ref>
-  <ref>$stylesautostyles/style:style[@style:family='table-cell']/@style:parent-style-name</ref>
-  <ref>$contentautostyles/style:style[@style:family='table-cell']/@style:parent-style-name</ref>
- </key>
- <key name="styles-table-cell-style" extends="common-table-cell-style">
-  <def>$stylesautostyles/style:style[@style:family='table-cell']/@style:name</def>
-  <ref>$masterstyles//table:table-cell/@table:style-name</ref>
- </key>
- <key name="content-table-cell-style" extends="common-table-cell-style">
-  <def>$contentautostyles/style:style[@style:family='table-cell']/@style:name</def>
-  <ref>$body//table:table-cell/@table:style-name</ref>
- </key>
-
- <key name="common-graphic-style">
-  <def>$officestyles/style:style[@style:family='graphic']/@style:name</def>
-  <ref>$officestyles/style:style[@style:family='graphic']/@style:parent-style-name</ref>
-  <ref>$stylesautostyles/style:style[@style:family='graphic']/@style:parent-style-name</ref>
-  <ref>$contentautostyles/style:style[@style:family='graphic']/@style:parent-style-name</ref>
- </key>
- <key name="styles-graphic-style" extends="common-graphic-style">
-  <def>$stylesautostyles/style:style[@style:family='graphic']/@style:name</def>
-  <ref>$masterstyles//draw:rect/@draw:style-name</ref>
- </key>
- <key name="content-graphic-style" extends="common-graphic-style">
-  <def>$contentautostyles/style:style[@style:family='graphic']/@style:name</def>
-  <ref>$body//draw:rect/@draw:style-name</ref>
- </key>
-
- <key name="common-presentation-style">
-  <def>$officestyles/style:style[@style:family='presentation']/@style:name</def>
-  <ref>$officestyles/style:style[@style:family='presentation']/@style:parent-style-name</ref>
-  <ref>$stylesautostyles/style:style[@style:family='presentation']/@style:parent-style-name</ref>
-  <ref>$contentautostyles/style:style[@style:family='presentation']/@style:parent-style-name</ref>
- </key>
- <key name="styles-presentation-style" extends="common-presentation-style">
-  <def>$stylesautostyles/style:style[@style:family='presentation']/@style:name</def>
-  <ref>$masterstyles//draw:rect/@presentation:style-name</ref>
- </key>
- <key name="content-presentation-style" extends="common-presentation-style">
-  <def>$contentautostyles/style:style[@style:family='presentation']/@style:name</def>
-  <ref>$body//draw:rect/@presentation:style-name</ref>
- </key>
-
- <key name="common-drawing-page-style">
-  <def>$officestyles/style:style[@style:family='drawing-page']/@style:name</def>
-  <ref>$officestyles/style:style[@style:family='drawing-page']/@style:parent-style-name</ref>
-  <ref>$stylesautostyles/style:style[@style:family='drawing-page']/@style:parent-style-name</ref>
-  <ref>$contentautostyles/style:style[@style:family='drawing-page']/@style:parent-style-name</ref>
- </key>
- <key name="styles-drawing-page-style" extends="common-drawing-page-style">
-  <def>$stylesautostyles/style:style[@style:family='drawing-page']/@style:name</def>
-  <ref>$masterstyles/style:handout-master/@draw:style-name</ref>
- </key>
- <key name="content-drawing-page-style" extends="common-drawing-page-style">
-  <def>$contentautostyles/style:style[@style:family='drawing-page']/@style:name</def>
-  <ref>$body/office:drawing/draw:page/@draw:style-name</ref>
-  <ref>$body/office:presentation/draw:page/@draw:style-name</ref>
- </key>
-
-</keys>
diff --git a/apps/files_odfviewer/src/webodf/webodf/tools/runjslint.js b/apps/files_odfviewer/src/webodf/webodf/tools/runjslint.js
deleted file mode 100644
index c0d28dc77d..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/tools/runjslint.js
+++ /dev/null
@@ -1,98 +0,0 @@
-/**
- * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
- * @licstart
- * The JavaScript code in this page is free software: you can redistribute it
- * and/or modify it under the terms of the GNU Affero General Public License
- * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.  The code is distributed
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
- *
- * As additional permission under GNU AGPL version 3 section 7, you
- * may distribute non-source (e.g., minimized or compacted) forms of
- * that code without the copy of the GNU GPL normally required by
- * section 4, provided you include this license notice and a URL
- * through which recipients can access the Corresponding Source.
- *
- * As a special exception to the AGPL, any HTML file which merely makes function
- * calls to this code, and for that purpose includes it by reference shall be
- * deemed a separate work for copyright law purposes. In addition, the copyright
- * holders of this code give you permission to combine this code with free
- * software libraries that are released under the GNU LGPL. You may copy and
- * distribute such a system following the terms of the GNU AGPL for this code
- * and the LGPL for the libraries. If you modify this code, you may extend this
- * exception to your version of the code, but you are not obligated to do so.
- * If you do not wish to do so, delete this exception statement from your
- * version.
- *
- * This license applies to this entire compilation.
- * @licend
- * @source: http://www.webodf.org/
- * @source: http://gitorious.org/odfkit/webodf/
- */
-/*global runtime: true, core: true*/
-runtime.loadClass("core.JSLint");
-
-function checkWithJSLINT(file) {
-    "use strict";
-    var i, jslint = new core.JSLint().JSLINT,
-        jslintconfig = {
-            anon:       false, // true, if the space may be omitted in anonymous function declarations
-            bitwise:    false, // if bitwise operators should be allowed
-            browser:    false, // if the standard browser globals should be predefined
-            cap:        false, // if upper case HTML should be allowed
-            'continue': false, // if the continuation statement should be tolerated
-            css:        false, // if CSS workarounds should be tolerated
-            debug:      false, // if debugger statements should be allowed
-            devel:      false, // if logging should be allowed (console, alert, etc.)
-            eqeq:       false, // if == should be allowed
-            es5:        false, // if ES5 syntax should be allowed
-            evil:       false, // if eval should be allowed
-            forin:      false, // if for in statements need not filter
-            fragment:   false, // if HTML fragments should be allowed
-            indent:     4, // the indentation factor
-            maxerr:     10, // the maximum number of errors to allow
-            //maxlen:     300, // the maximum length of a source line
-            newcap:     false, // if constructor names capitalization is ignored
-            node:       false, // if Node.js globals should be predefined
-            nomen:      false, // if names may have dangling _
-            on:         false, // if HTML event handlers should be allowed
-            passfail:   true,  // if the scan should stop on first error
-            plusplus:   false, // if increment/decrement should be allowed
-            properties: false, // if all property names must be declared with /*properties*/
-            regexp:     false, // if the . should be allowed in regexp literals
-            rhino:      false, // if the Rhino environment globals should be predefined
-            undef:      false, // if variables can be declared out of order
-            unparam:    false, // if unused parameters should be tolerated
-            safe:       false, // if use of some browser features should be restricted
-            sloppy:     false, // if the 'use strict'; pragma is optional
-            stupid:     true,  // true if stupid practices are tolerated
-            sub:        false, // if all forms of subscript notation are tolerated
-            vars:       false, // if multiple var statements per function should be allowed
-            white:      true,  // if sloppy whitespace is tolerated
-            widget:     false, // if the Yahoo Widgets globals should be predefined
-            windows:    false  // if MS Windows-specific globals should be predefined
-        },
-        data, result, err;
-
-    // these files are an exception for now
-    if (file === "lib/core/RawInflate.js") {
-        return;
-    }
-
-    data = runtime.readFileSync(file, "utf-8");
-    result = jslint(data, jslintconfig);
-    if (!result) {
-        for (i = 0; i < jslint.errors.length && jslint.errors[i]; i += 1) {
-            err = jslint.errors[i];
-            runtime.log(file + ":" + err.line + ":" + err.character +
-                ": error: " + err.reason);
-        }
-        runtime.exit(1);
-    }
-}
-
-var i;
-for (i = 0; i < arguments.length; i += 1) {
-    checkWithJSLINT(arguments[i]);
-}
diff --git a/apps/files_odfviewer/src/webodf/webodf/webodf.css b/apps/files_odfviewer/src/webodf/webodf/webodf.css
deleted file mode 100644
index dbd6686a26..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/webodf.css
+++ /dev/null
@@ -1,200 +0,0 @@
-@namespace draw url(urn:oasis:names:tc:opendocument:xmlns:drawing:1.0);
-@namespace fo url(urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0);
-@namespace office url(urn:oasis:names:tc:opendocument:xmlns:office:1.0);
-@namespace presentation url(urn:oasis:names:tc:opendocument:xmlns:presentation:1.0);
-@namespace style url(urn:oasis:names:tc:opendocument:xmlns:style:1.0);
-@namespace svg url(urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0);
-@namespace table url(urn:oasis:names:tc:opendocument:xmlns:table:1.0);
-@namespace text url(urn:oasis:names:tc:opendocument:xmlns:text:1.0);
-@namespace runtimens url(urn:webodf); /* namespace for runtime only */
-
-office|document > *, office|document-content > * {
-  display: none;
-}
-office|body, office|document {
-  display: inline-block;
-  position: relative;
-}
-
-text|p, text|h {
-  display: block;
-  padding: 3px 3px 3px 3px;
-  margin: 5px 5px 5px 5px;
-}
-text|h {
-  font-weight: bold;
-}
-*[runtimens|containsparagraphanchor] {
-  position: relative;
-}
-text|s:before { /* this needs to be the number of spaces given by text:c */
-  content: ' ';
-}
-text|tab:before {
-  display: inline;
-  content: '        ';
-}
-text|line-break {
-  content: " ";
-  display: block;
-}
-text|tracked-changes {
-  /*Consumers that do not support change tracking, should ignore changes.*/
-  display: none;
-}
-office|binary-data {
-  display: none;
-}
-office|text {
-  display: block;
-  width: 216mm; /* default to A4 width */
-  min-height: 279mm;
-  padding-left: 32mm;
-  padding-right: 32mm;
-  padding-top: 25mm;
-  padding-bottom: 13mm;
-  margin: 2px;
-  text-align: left;
-  overflow: hidden;
-}
-office|spreadsheet {
-  display: block;
-  border-collapse: collapse;
-  empty-cells: show;
-  font-family: sans-serif;
-  font-size: 10pt;
-  text-align: left;
-  page-break-inside: avoid;
-  overflow: hidden;
-}
-office|presentation {
-  display: inline-block;
-  text-align: left;
-}
-draw|page {
-  display: block;
-  height: 21cm;
-  width: 28cm;
-  margin: 3px;
-  position: relative;
-  overflow: hidden;
-}
-presentation|notes {
-    display: none;
-}
-@media print {
-  draw|page {
-    border: 1pt solid black;
-    page-break-inside: avoid;
-  }
-  presentation|notes {
-    /*TODO*/
-  }
-}
-office|spreadsheet text|p {
-  border: 0px;
-  padding: 1px;
-  margin: 0px;
-}
-office|spreadsheet table|table {
-  margin: 3px;
-}
-office|spreadsheet table|table:after {
-  /* show sheet name the end of the sheet */
-  /*content: attr(table|name);*/ /* gives parsing error in opera */
-}
-office|spreadsheet table|table-row {
-  counter-increment: row;
-}
-office|spreadsheet table|table-row:before {
-  width: 3em;
-  background: #cccccc;
-  border: 1px solid black;
-  text-align: center;
-  content: counter(row);
-}
-office|spreadsheet table|table-cell {
-  border: 1px solid #cccccc;
-}
-table|table {
-  display: table;
-}
-draw|frame table|table {
-  width: 100%;
-  height: 100%;
-  background: white;
-}
-table|table-row {
-  display: table-row;
-}
-table|table-column {
-  display: table-column;
-}
-table|table-cell {
-  display: table-cell;
-}
-draw|frame {
-  display: block;
-}
-draw|image {
-  display: block;
-  width: 100%;
-  height: 100%;
-  top: 0px;
-  left: 0px;
-  background-repeat: no-repeat;
-  background-size: 100% 100%;
-  -moz-background-size: 100% 100%;
-}
-/* only show the first image in frame */
-draw|frame > draw|image:nth-of-type(n+2) {
-  display: none;
-}
-text|list {
-    display: block;
-    padding-left: 1.5em;
-    counter-reset: list;
-}
-text|list-item {
-    display: block;
-}
-text|list-item:before {
-    display: inline-block;
-    content: '•';
-    counter-increment: list;
-    width: 0.5em;
-    margin-left: -0.5em;
-    padding: 0px;
-    border: 0px;
-}
-text|list-item > *:first-child {
-    display: inline-block;
-}
-text|a {
-    color: blue;
-    text-decoration: underline;
-}
-text|note-citation {
-    vertical-align: super;
-    font-size: smaller;
-}
-text|note-body {
-    display: none;
-}
-text|note:hover text|note-citation {
-    background: #dddddd;
-}
-text|note:hover text|note-body {
-    display: block;
-    left:1em;
-    max-width: 80%;
-    position: absolute;
-    background: #ffffaa;
-}
-svg|title, svg|desc {
-    display: none;
-}
-video {
-  width:100%;
-  height:100%
-}
diff --git a/apps/files_odfviewer/src/webodf/webodf/xmledit/gui.js b/apps/files_odfviewer/src/webodf/webodf/xmledit/gui.js
deleted file mode 100644
index e38c286aae..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/xmledit/gui.js
+++ /dev/null
@@ -1,119 +0,0 @@
-/**
- * Copyright (C) 2011 KO GmbH <jos.van.den.oever@kogmbh.com>
- * @licstart
- * The JavaScript code in this page is free software: you can redistribute it
- * and/or modify it under the terms of the GNU Affero General Public License
- * (GNU AGPL) as published by the Free Software Foundation, either version 3 of
- * the License, or (at your option) any later version.  The code is distributed
- * WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU AGPL for more details.
- *
- * As additional permission under GNU AGPL version 3 section 7, you
- * may distribute non-source (e.g., minimized or compacted) forms of
- * that code without the copy of the GNU GPL normally required by
- * section 4, provided you include this license notice and a URL
- * through which recipients can access the Corresponding Source.
- *
- * As a special exception to the AGPL, any HTML file which merely makes function
- * calls to this code, and for that purpose includes it by reference shall be
- * deemed a separate work for copyright law purposes. In addition, the copyright
- * holders of this code give you permission to combine this code with free
- * software libraries that are released under the GNU LGPL. You may copy and
- * distribute such a system following the terms of the GNU AGPL for this code
- * and the LGPL for the libraries. If you modify this code, you may extend this
- * exception to your version of the code, but you are not obligated to do so.
- * If you do not wish to do so, delete this exception statement from your
- * version.
- *
- * This license applies to this entire compilation.
- * @licend
- * @source: http://www.webodf.org/
- * @source: http://gitorious.org/odfkit/webodf/
- */
-/*global Ext runtime gui*/
-runtime.loadClass("gui.XMLEdit");
-
-function createXMLEdit(element, url) {
-    var head = element.ownerDocument.getElementsByTagName("head")[0],
-        xmlcss = element.ownerDocument.createElement("style"),
-        xmledt;
-
-    xmlcss.type = "text/css";
-    head.appendChild(xmlcss);
-    xmledt = new gui.XMLEdit(element, xmlcss);
-    runtime.loadXML(url, function (err, xml) {
-        if (xml.documentElement) {
-            xmledt.setXML(xml);
-        }
-    });
-}
-
-function loadXML(url, panel, title) {
-    title = title || url;
-    var tab = panel.find('url', url),
-        newTab;
-    if (tab.length) {
-        panel.setActiveTab(tab[0]);
-        return;
-    }
-    newTab = new Ext.BoxComponent({
-        title: title,
-        tabTip: url,
-        url: url,
-        closable: true,
-        autoEl: {
-            tag: 'div'
-        },
-        region: 'center'
-    });
-    panel.add(newTab);
-    panel.setActiveTab(newTab);
-
-    createXMLEdit(newTab.el.dom, url);
-}
-
-Ext.onReady(function () {
-    var tabpanel, tree, viewport, attributeEditor;
-
-    Ext.QuickTips.init();
-
-    tabpanel = new Ext.TabPanel({
-        tbar: [  ],
-        region: 'center'
-    });
-
-    attributeEditor = new Ext.grid.PropertyGrid({
-        title: 'Attributes',
-        region: 'east',
-        width: 200,
-        split: true,
-        autoScroll: true,
-        collapsible: true,
-        rootVisible: false,
-        enableTabScroll: true,
-        defaults: {autoScroll: true}
-    });
-
-    tree = new Ext.tree.TreePanel({
-        title: 'Documents',
-        region: 'west',
-        width: 200,
-        split: true,
-        autoScroll: true,
-        collapsible: true,
-        rootVisible: false,
-        enableTabScroll: true,
-        defaults: {autoScroll: true},
-        collapsed: true,
-        root: { nodeType: 'node' }
-    });
-
-    viewport = new Ext.Viewport({
-        layout: 'border',
-        items: [ tabpanel, tree, attributeEditor ]
-    });
-
-    // load the xml
-    loadXML('requirements.xml', tabpanel);
-    loadXML('../content.xml', tabpanel);
-});
diff --git a/apps/files_odfviewer/src/webodf/webodf/xmledit/index.html b/apps/files_odfviewer/src/webodf/webodf/xmledit/index.html
deleted file mode 100644
index dd6ae4942e..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/xmledit/index.html
+++ /dev/null
@@ -1,16 +0,0 @@
-<html>
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8"></meta>
-  <link rel="stylesheet" type="text/css" href="../extjs/resources/css/ext-all.css"/>
-  <!-- requirements -->
-  <script src="../extjs/adapter/ext/ext-base.js" type="text/javascript" charset="utf-8"></script>
-  <script src="../extjs/ext-all-debug.js" type="text/javascript" charset="utf-8"></script>
-  <script src="../lib/runtime.js"></script>
-  <!-- application -->
-  <script src="gui.js" type="text/javascript" charset="utf-8"></script>
- 
-  <title>XMLEdit</title>
-</head>
-<body>
-</body>
-</html>
diff --git a/apps/files_odfviewer/src/webodf/webodf/xmledit/requirements.dtd b/apps/files_odfviewer/src/webodf/webodf/xmledit/requirements.dtd
deleted file mode 100644
index 82cb8deb8f..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/xmledit/requirements.dtd
+++ /dev/null
@@ -1,12 +0,0 @@
-<!ELEMENT requirements (requirement*, dependency*)>
-<!ATTLIST desc>
-
-<!ELEMENT requirement (desc)>
-<!ATTLIST requirement id ID #REQUIRED>
-
-<!ELEMENT desc (#PCDATA)>
-<!ATTLIST desc>
-
-<!ELEMENT dependency EMPTY>
-<!ATTLIST dependency parent IDREF #REQUIRED
-                     child  IDREF #REQUIRED>
diff --git a/apps/files_odfviewer/src/webodf/webodf/xmledit/requirements.xml b/apps/files_odfviewer/src/webodf/webodf/xmledit/requirements.xml
deleted file mode 100644
index cbeae4ce7e..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/xmledit/requirements.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE requirements PUBLIC "WebODF requirements XML" "requirements.dtd">
-<!--
-     Designing an XML editor
-
-requirements:
- - load xml document in a frame and visualize it with specified css
-  - load xml document in another (underwater) frame and show it as XML
-   - parse DTD of the document format into a JSON data structure
-    - edit the text content/character of the XML document
-
--->
-
-<requirements xmlns="http://www.webodf.org/dtd/requirements" xmlns:hi="hello">
- <requirement id="r1">
-  <desc>load xml document in a frame</desc>
- </requirement> 
- <requirement id="r2">
-  <desc>show xml in a frame with a specified css</desc>
- </requirement>
- <dependency parent="r1" child="r2"/>
-</requirements>
diff --git a/apps/files_odfviewer/src/webodf/webodf/xmledit/test.xml b/apps/files_odfviewer/src/webodf/webodf/xmledit/test.xml
deleted file mode 100644
index cad3f32470..0000000000
--- a/apps/files_odfviewer/src/webodf/webodf/xmledit/test.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!DOCTYPE requirements PUBLIC "WebODF requirements XML" "requirements.dtd">
-<!--
-     Designing an XML editor
-
-requirements:
- - load xml document in a frame and visualize it with specified css
-  - load xml document in another (underwater) frame and show it as XML
-   - parse DTD of the document format into a JSON data structure
-    - edit the text content/character of the XML document
-
--->
-
-<requirements>
- <requirement id="r1">
-  <desc>load xml document in a frame</desc>
- </requirement> 
- <requirement id="r2">
-  <desc>show xml in a frame with a specified css</desc>
- </requirement>
- <dependency parent="r1" child="r2"/>
-</requirements>
diff --git a/apps/files_pdfviewer/appinfo/app.php b/apps/files_pdfviewer/appinfo/app.php
deleted file mode 100644
index e4771ee517..0000000000
--- a/apps/files_pdfviewer/appinfo/app.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-//load the required files
-OCP\Util::addStyle( 'files_pdfviewer', 'viewer');
-
-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_pdfviewer/appinfo/info.xml b/apps/files_pdfviewer/appinfo/info.xml
deleted file mode 100644
index 074962f57f..0000000000
--- a/apps/files_pdfviewer/appinfo/info.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0"?> 
-<info>
-	<id>files_pdfviewer</id>
-	<name>PDF Viewer</name>
-	<description>Inline PDF viewer (pdfjs-based)</description>
-	<licence>GPL</licence>
-	<author>Joan Creus, Thomas Müller</author>
-	<require>4</require>
-	<shipped>true</shipped>
-	<default_enable/>
-</info>
diff --git a/apps/files_pdfviewer/appinfo/version b/apps/files_pdfviewer/appinfo/version
deleted file mode 100644
index ceab6e11ec..0000000000
--- a/apps/files_pdfviewer/appinfo/version
+++ /dev/null
@@ -1 +0,0 @@
-0.1
\ No newline at end of file
diff --git a/apps/files_pdfviewer/css/history.png b/apps/files_pdfviewer/css/history.png
deleted file mode 100644
index afa0e4ab70fc83fcd35be727f6f64788beb3417d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 539
zcmV+$0_6RPP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0RI60
z0RN!9r;`8x00(qQO+^RV1`iAv1SCGyI{*Lyy-7qtR5*>Ll1*>oFc5~H8Hdj%L8z6s
z2ysEx{(#<l?C*!mUP0m#Do{b?Gmx?OuuYaO^t2;c9$TKr?>jd9XGochMx$SG9N&wG
zm|5`N6GEVzLkO4|X2xo@`gnbP{Rt42fM&CK@0|M)MSr$L1QDt7%LpM<bycFO)p&n@
zC(rY%LV$k1|7BeP%nT7hRcW`|)a!KsilV?dhjXsF=n`B3N}nRa>2%_7H~=snkJ)TC
zJUu<p@Av6;yI&OOC7@K$YPCqyluoC^%gYN%l8|K?jYi{p1prYLAtEdm3wFC5-EOy1
zl;=6?^_pI<ce@9rf^tl!Q#P9oMNtq%5owz8`1pvb;=RAN;JxQ`Isx$T@IV~L%;$5m
zEW^wwih|K-#PN9iUV(EC5h02qo}ZstE|-<H$z+0aj@fK>TR{kcTCE1a;c#HT-xJ3%
zNs@4PcgJ8bz|3&YVP<lrz|1OYtJR`juUD_4stkuihQlGt<&yLH9Bx`Dqup+!syOE=
zfcKs>O;J_0+wFA^-rnB!MNxdHsxvbUAt)f9;Z@bEsuvNzTCH|v-Subx3r>K>XP=J1
d4#@vK_!}QH$$pNdlPmxL002ovPDHLkV1i+g_a*=U

diff --git a/apps/files_pdfviewer/css/viewer.css b/apps/files_pdfviewer/css/viewer.css
deleted file mode 100644
index f9ce929d8b..0000000000
--- a/apps/files_pdfviewer/css/viewer.css
+++ /dev/null
@@ -1,267 +0,0 @@
-/* -*- Mode: Java; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- /
-/* vim: set shiftwidth=4 tabstop=8 autoindent cindent expandtab: */
-
-#viewer {
-  font-family: 'Lucida Grande', 'Lucida Sans Unicode', Helvetica, Arial, Verdana, sans-serif;
-  /*margin: 0px;*/
-  padding: 0px;
-  /*position:absolute;*/
-}
-
-[hidden] {
-  display: none;
-}
-
-#controls2 > a > img {
-    margin: 4px;
-    height: 10px;
-}
-
-#controls2 > button {
-  line-height: 10px;
-}
-
-#controls2 > button > img {
-  width: 10px;
-  height: 10px;
-}
-
-#controls2 > button[disabled] > img {
-  opacity: 0.5;
-}
-
-#pageNumber {
-  text-align: right;
-}
-
-span#info {
-  display: none;
-}
-
-@-moz-document regexp("http:.*debug=1.*") {
-  span#info {
-    display: inline-block;
-  }
-}
-
-/* === Sidebar === */
-#sidebar {
-  position: fixed;
-  width: 350px;
-  top: 62px;
-  bottom: 18px;
-  left: -290px;
-  transition: left 0.25s ease-in-out 1s;
-  -moz-transition: left 0.25s ease-in-out 1s;
-  -webkit-transition: left 0.25s ease-in-out 1s;
-  z-index: 1;
-}
-
-#sidebar:hover {
-  left: 0px;
-  transition: left 0.25s ease-in-out 0s;
-  -moz-transition: left 0.25s ease-in-out 0s;
-  -webkit-transition: left 0.25s ease-in-out 0s;
-}
-
-#sidebarBox {
-  background-color: rgba(0, 0, 0, 0.7);
-  width: 300px;
-  height: 100%;
-  border-top-right-radius: 8px;
-  border-bottom-right-radius: 8px;
-  -moz-border-radius-topright: 8px;
-  -moz-border-radius-bottomright: 8px;
-  -webkit-border-top-right-radius: 8px;
-  -webkit-border-bottom-right-radius: 8px;
-  box-shadow: 0px 2px 8px #000;
-  -moz-box-shadow: 0px 2px 8px #000;
-  -webkit-box-shadow: 0px 2px 8px #000;
-}
-
-#sidebarScrollView {
-  position: absolute;
-  overflow: hidden;
-  overflow-y: auto;
-  top: 10px;
-  bottom: 10px;
-  left: 10px;
-  width: 280px;
-}
-
-.thumbnail {
-  width: 134px;
-  height: 134px;
-  margin-top: 5px;
-  margin-bottom: 5px;
-  margin-left:auto;
-  margin-right:auto;
-  line-height: 134px;
-  text-align: center;
-  overflow: hidden;
-}
-
-.thumbnail:not([data-loaded]) {
-  background-color: gray;
-}
-
-.thumbnail > canvas {
-  vertical-align: middle;
-  display: inline-block;
-}
-
-#outlineScrollView {
-  position: absolute;
-  background-color: #fff;
-  overflow: auto;
-  top: 10px;
-  bottom: 10px;
-  left: 10px;
-  width: 280px;
-}
-
-#outlineView {
-  padding-top: 4px;
-  padding-bottom: 100px;
-  padding-left: 6px;
-  padding-right: 6px;
-  font-size: smaller;
-}
-
-.outlineItem > .outlineItems {
-  margin-left: 20px;
-}
-
-.outlineItem > a {
-  text-decoration: none;
-  color: black;
-}
-
-.outlineItem > a:hover {
-  background: #ff0;
-  box-shadow: 0px 2px 10px #ff0;
-}
-
-#sidebarControls {
-  position:absolute;
-  width: 120px;
-  height: 32px;
-  left: 15px;
-  bottom: 35px;
-}
-
-#sidebarControls > button {
-  box-shadow: 0px 4px 10px #000;
-  -moz-box-shadow: 0px 4px 10px #000;
-  -webkit-box-shadow: 0px 4px 10px #000;
-}
-
-#sidebarControls > button > img {
-  width: 32px;
-  height: 32px;
-}
-
-#sidebarControls > button[disabled] > img {
-  opacity: 0.5;
-}
-
-#sidebarControls > button[data-selected] {
-  box-shadow: 0px 4px 10px #ff0;
-  -moz-box-shadow: 0px 4px 10px #ff0;
-  -webkit-box-shadow: 0px 4px 10px #ff0;
-}
-
-/* === Content view === */
-canvas {
-  margin: auto;
-  display: block;
-}
-
-.page {
-  width: 816px;
-  height: 1056px;
-  margin: 10px auto;
-  position: relative;
-  overflow: hidden;
-  box-shadow: 0px 4px 10px #000;
-  -moz-box-shadow: 0px 4px 10px #000;
-  -webkit-box-shadow: 0px 4px 10px #000;
-  background-color: white;
-}
-
-.page > a {
-  display: block;
-  position: absolute;
-}
-
-.page > a:hover {
-  opacity: 0.2;
-  background: #ff0;
-  box-shadow: 0px 2px 10px #ff0;
-  -moz-box-shadow: 0px 2px 10px #ff0;
-  -webkit-box-shadow: 0px 2px 10px #ff0;
-}
-
-#viewer {
-  /*overflow:auto;*/
-  margin: 6.3em 0 0 0;
-  margin-right:12.5em;
-  padding: 8px 0px;
-  position:static;
-  height:100%;
-  width:100%;
-  text-align:center;
-}
-
-#sidebarView canvas:hover {
-  background: #ff0;
-  box-shadow: 0px 2px 10px #ff0;
-  -moz-box-shadow: 0px 2px 10px #ff0;
-  -webkit-box-shadow: 0px 2px 10px #ff0;
-}
-
-#pageWidthOption {
-  border-top: 1px solid black;
-}
-
-#customScaleOption {
-  display: none;
-}
-
-/* === Printed media overrides === */
-@media print {
-  #sidebar {
-    display: none;
-  }
-
-  #controls2 {
-    display: none;
-  }
-
-  #viewer {
-    margin: 0;
-    padding: 0;
-  }
-
-  .page {
-    display: none;
-    margin: 0;
-  }
-
-  .page canvas {
-    box-shadow: none;
-    -moz-box-shadow: none;
-    -webkit-box-shadow: none;
-  }
-
-  .page[data-loaded] {
-    display: block;
-    page-break-after: always;
-  }
-}
-
-#loading {
-	margin: 100px 0;
-	text-align: center;
-}
-
diff --git a/apps/files_pdfviewer/js/pdfjs/LICENSE b/apps/files_pdfviewer/js/pdfjs/LICENSE
deleted file mode 100644
index f8a8482057..0000000000
--- a/apps/files_pdfviewer/js/pdfjs/LICENSE
+++ /dev/null
@@ -1,30 +0,0 @@
-
-    Copyright (c) 2011 Mozilla Foundation
-
-    Contributors: Andreas Gal <gal@mozilla.com>
-                  Chris G Jones <cjones@mozilla.com>
-                  Shaon Barman <shaon.barman@gmail.com>
-                  Vivien Nicolas <21@vingtetun.org>
-                  Justin D'Arcangelo <justindarc@gmail.com>
-                  Yury Delendik
-                  Kalervo Kujala
-                  Adil Allawi <@ironymark>
-
-    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/apps/files_pdfviewer/js/pdfjs/README b/apps/files_pdfviewer/js/pdfjs/README
deleted file mode 100644
index ec6a1e1ab1..0000000000
--- a/apps/files_pdfviewer/js/pdfjs/README
+++ /dev/null
@@ -1,7 +0,0 @@
-Upstream (http://mozilla.github.com/pdf.js/) does not yet provide releases.
-The latest version of git master can be taken from http://mozilla.github.com/pdf.js/build/pdf.js
-
-Please update pdf.js from time to time and test it!
-
-
-
diff --git a/apps/files_pdfviewer/js/pdfjs/build/pdf.js b/apps/files_pdfviewer/js/pdfjs/build/pdf.js
deleted file mode 100644
index b1fc9d9747..0000000000
--- a/apps/files_pdfviewer/js/pdfjs/build/pdf.js
+++ /dev/null
@@ -1,33830 +0,0 @@
-/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
-
-var PDFJS = {};
-
-(function pdfjsWrapper() {
-  // Use strict in our context only - users might not want it
-  'use strict';
-
-  PDFJS.build = '2aae4fd';
-
-  // Files are inserted below - see Makefile
-/* -*- 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 globalScope = (typeof window === 'undefined') ? this : window;
-
-var isWorker = (typeof window == 'undefined');
-
-var ERRORS = 0, WARNINGS = 1, INFOS = 5;
-var verbosity = WARNINGS;
-
-// The global PDFJS object exposes the API
-// In production, it will be declared outside a global wrapper
-// In development, it will be declared here
-if (!globalScope.PDFJS) {
-  globalScope.PDFJS = {};
-}
-
-// getPdf()
-// Convenience function to perform binary Ajax GET
-// Usage: getPdf('http://...', callback)
-//        getPdf({
-//                 url:String ,
-//                 [,progress:Function, error:Function]
-//               },
-//               callback)
-function getPdf(arg, callback) {
-  var params = arg;
-  if (typeof arg === 'string')
-    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);
-  xhr.expected = (protocol === 'http:' || protocol === 'https:') ? 200 : 0;
-
-  if ('progress' in params)
-    xhr.onprogress = params.progress || undefined;
-
-  if ('error' in params)
-    xhr.onerror = params.error || undefined;
-
-  xhr.onreadystatechange = function getPdfOnreadystatechange(e) {
-    if (xhr.readyState === 4) {
-      if (xhr.status === xhr.expected) {
-        var data = (xhr.mozResponseArrayBuffer || xhr.mozResponse ||
-                    xhr.responseArrayBuffer || xhr.response);
-        callback(data);
-      } else if (params.error) {
-        params.error(e);
-      }
-    }
-  };
-  xhr.send(null);
-}
-globalScope.PDFJS.getPdf = getPdf;
-globalScope.PDFJS.pdfBug = false;
-
-var Page = (function PageClosure() {
-  function Page(xref, pageNumber, pageDict, ref) {
-    this.pageNumber = pageNumber;
-    this.pageDict = pageDict;
-    this.xref = xref;
-    this.ref = ref;
-
-    this.displayReadyPromise = null;
-  }
-
-  Page.prototype = {
-    getPageProp: function Page_getPageProp(key) {
-      return this.pageDict.get(key);
-    },
-    inheritPageProp: function Page_inheritPageProp(key) {
-      var dict = this.pageDict;
-      var obj = dict.get(key);
-      while (obj === undefined) {
-        dict = dict.get('Parent');
-        if (!dict)
-          break;
-        obj = dict.get(key);
-      }
-      return obj;
-    },
-    get content() {
-      return shadow(this, 'content', this.getPageProp('Contents'));
-    },
-    get resources() {
-      return shadow(this, 'resources', this.inheritPageProp('Resources'));
-    },
-    get mediaBox() {
-      var obj = this.inheritPageProp('MediaBox');
-      // Reset invalid media box to letter size.
-      if (!isArray(obj) || obj.length !== 4)
-        obj = [0, 0, 612, 792];
-      return shadow(this, 'mediaBox', obj);
-    },
-    get view() {
-      var mediaBox = this.mediaBox;
-      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
-      // extend beyond the boundaries of the media box. If they do, they are
-      // effectively reduced to their intersection with the media box."
-      cropBox = Util.intersect(cropBox, mediaBox);
-      if (!cropBox)
-        return shadow(this, 'view', mediaBox);
-
-      return shadow(this, 'view', cropBox);
-    },
-    get annotations() {
-      return shadow(this, 'annotations', this.inheritPageProp('Annots'));
-    },
-    get rotate() {
-      var rotate = this.inheritPageProp('Rotate') || 0;
-      // Normalize rotation so it's a multiple of 90 and between 0 and 270
-      if (rotate % 90 != 0) {
-        rotate = 0;
-      } else if (rotate >= 360) {
-        rotate = rotate % 360;
-      } else if (rotate < 0) {
-        // The spec doesn't cover negatives, assume its counterclockwise
-        // rotation. The following is the other implementation of modulo.
-        rotate = ((rotate % 360) + 360) % 360;
-      }
-      return shadow(this, 'rotate', rotate);
-    },
-
-    getOperatorList: function Page_getOperatorList(handler, dependency) {
-      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)
-          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));
-      }
-
-      var pe = this.pe = new PartialEvaluator(
-                                xref, handler, 'p' + this.pageNumber + '_');
-
-      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) {
-      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)
-      );
-    },
-    getLinks: function Page_getLinks() {
-      var links = [];
-      var annotations = pageGetAnnotations();
-      var i, n = annotations.length;
-      for (i = 0; i < n; ++i) {
-        if (annotations[i].type != 'Link')
-          continue;
-        links.push(annotations[i]);
-      }
-      return links;
-    },
-    getAnnotations: function Page_getAnnotations() {
-      var xref = this.xref;
-      function getInheritableProperty(annotation, name) {
-        var item = annotation;
-        while (item && !item.has(name)) {
-          item = item.get('Parent');
-        }
-        if (!item)
-          return null;
-        return item.get(name);
-      }
-      function isValidUrl(url) {
-        if (!url)
-          return false;
-        var colon = url.indexOf(':');
-        if (colon < 0)
-          return false;
-        var protocol = url.substr(0, colon);
-        switch (protocol) {
-          case 'http':
-          case 'https':
-          case 'ftp':
-          case 'mailto':
-            return true;
-          default:
-            return false;
-        }
-      }
-
-      var annotations = this.annotations || [];
-      var i, n = annotations.length;
-      var items = [];
-      for (i = 0; i < n; ++i) {
-        var annotationRef = annotations[i];
-        var annotation = xref.fetch(annotationRef);
-        if (!isDict(annotation))
-          continue;
-        var subtype = annotation.get('Subtype');
-        if (!isName(subtype))
-          continue;
-        var rect = annotation.get('Rect');
-
-        var item = {};
-        item.type = subtype.name;
-        item.rect = rect;
-        switch (subtype.name) {
-          case 'Link':
-            var a = annotation.get('A');
-            if (a) {
-              switch (a.get('S').name) {
-                case 'URI':
-                  var url = a.get('URI');
-                  // TODO: pdf spec mentions urls can be relative to a Base
-                  // entry in the dictionary.
-                  if (!isValidUrl(url))
-                    url = '';
-                  item.url = url;
-                  break;
-                case 'GoTo':
-                  item.dest = a.get('D');
-                  break;
-                default:
-                  TODO('other link types');
-              }
-            } else if (annotation.has('Dest')) {
-              // simple destination link
-              var dest = annotation.get('Dest');
-              item.dest = isName(dest) ? dest.name : dest;
-            }
-            break;
-          case 'Widget':
-            var fieldType = getInheritableProperty(annotation, 'FT');
-            if (!isName(fieldType))
-              break;
-            item.fieldType = fieldType.name;
-            // Building the full field name by collecting the field and
-            // its ancestors 'T' properties and joining them using '.'.
-            var fieldName = [];
-            var namedItem = annotation, ref = annotationRef;
-            while (namedItem) {
-              var parent = namedItem.get('Parent');
-              var parentRef = namedItem.getRaw('Parent');
-              var name = namedItem.get('T');
-              if (name) {
-                fieldName.unshift(stringToPDFString(name));
-              } else {
-                // The field name is absent, that means more than one field
-                // with the same name may exist. Replacing the empty name
-                // with the '`' plus index in the parent's 'Kids' array.
-                // This is not in the PDF spec but necessary to id the
-                // the input controls.
-                var kids = parent.get('Kids');
-                var j, jj;
-                for (j = 0, jj = kids.length; j < jj; j++) {
-                  var kidRef = kids[j];
-                  if (kidRef.num == ref.num && kidRef.gen == ref.gen)
-                    break;
-                }
-                fieldName.unshift('`' + j);
-              }
-              namedItem = parent;
-              ref = parentRef;
-            }
-            item.fullName = fieldName.join('.');
-            var alternativeText = stringToPDFString(annotation.get('TU') || '');
-            item.alternativeText = alternativeText;
-            var da = getInheritableProperty(annotation, 'DA') || '';
-            var m = /([\d\.]+)\sTf/.exec(da);
-            if (m)
-              item.fontSize = parseFloat(m[1]);
-            item.textAlignment = getInheritableProperty(annotation, 'Q');
-            item.flags = getInheritableProperty(annotation, 'Ff') || 0;
-            break;
-          case 'Text':
-            var content = annotation.get('Contents');
-            var title = annotation.get('T');
-            item.content = stringToPDFString(content || '');
-            item.title = stringToPDFString(title || '');
-            item.name = !annotation.has('Name') ? 'Note' :
-              annotation.get('Name').name;
-            break;
-          default:
-            TODO('unimplemented annotation type: ' + subtype.name);
-            break;
-        }
-        items.push(item);
-      }
-      return items;
-    }
-  };
-
-  return Page;
-})();
-
-/**
- * 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 PDFDocument on the main thread + one object
- * for each worker. If there is no worker support enabled, there are two
- * `PDFDocument` objects on the main thread created.
- */
-var PDFDocument = (function PDFDocumentClosure() {
-  function PDFDocument(arg, password) {
-    if (isStream(arg))
-      init.call(this, arg, password);
-    else if (isArrayBuffer(arg))
-      init.call(this, new Stream(arg), password);
-    else
-      error('PDFDocument: Unknown argument type');
-  }
-
-  function init(stream, password) {
-    assertWellFormed(stream.length > 0, 'stream must have data');
-    this.stream = stream;
-    this.setup(password);
-    this.acroForm = this.catalog.catDict.get('AcroForm');
-  }
-
-  function find(stream, needle, limit, backwards) {
-    var pos = stream.pos;
-    var end = stream.end;
-    var str = '';
-    if (pos + limit > end)
-      limit = end - pos;
-    for (var n = 0; n < limit; ++n)
-      str += stream.getChar();
-    stream.pos = pos;
-    var index = backwards ? str.lastIndexOf(needle) : str.indexOf(needle);
-    if (index == -1)
-      return false; /* not found */
-    stream.pos += index;
-    return true; /* found */
-  }
-
-  PDFDocument.prototype = {
-    get linearization() {
-      var length = this.stream.length;
-      var linearization = false;
-      if (length) {
-        linearization = new Linearization(this.stream);
-        if (linearization.length != length)
-          linearization = false;
-      }
-      // shadow the prototype getter with a data property
-      return shadow(this, 'linearization', linearization);
-    },
-    get startXRef() {
-      var stream = this.stream;
-      var startXRef = 0;
-      var linearization = this.linearization;
-      if (linearization) {
-        // Find end of first obj.
-        stream.reset();
-        if (find(stream, 'endobj', 1024))
-          startXRef = stream.pos + 6;
-      } else {
-        // Find startxref by jumping backward from the end of the file.
-        var step = 1024;
-        var found = false, pos = stream.end;
-        while (!found && pos > 0) {
-          pos -= step - 'startxref'.length;
-          if (pos < 0)
-            pos = 0;
-          stream.pos = pos;
-          found = find(stream, 'startxref', step, true);
-        }
-        if (found) {
-          stream.skip(9);
-          var ch;
-          do {
-            ch = stream.getChar();
-          } while (Lexer.isSpace(ch));
-          var str = '';
-          while ((ch - '0') <= 9) {
-            str += ch;
-            ch = stream.getChar();
-          }
-          startXRef = parseInt(str, 10);
-          if (isNaN(startXRef))
-            startXRef = 0;
-        }
-      }
-      // shadow the prototype getter with a data property
-      return shadow(this, 'startXRef', startXRef);
-    },
-    get mainXRefEntriesOffset() {
-      var mainXRefEntriesOffset = 0;
-      var linearization = this.linearization;
-      if (linearization)
-        mainXRefEntriesOffset = linearization.mainXRefEntriesOffset;
-      // shadow the prototype getter with a data property
-      return shadow(this, 'mainXRefEntriesOffset', mainXRefEntriesOffset);
-    },
-    // Find the header, remove leading garbage and setup the stream
-    // starting from the header.
-    checkHeader: function PDFDocument_checkHeader() {
-      var stream = this.stream;
-      stream.reset();
-      if (find(stream, '%PDF-', 1024)) {
-        // Found the header, trim off any garbage before it.
-        stream.moveStart();
-        return;
-      }
-      // May not be a PDF file, continue anyway.
-    },
-    setup: function PDFDocument_setup(password) {
-      this.checkHeader();
-      var xref = new XRef(this.stream,
-                          this.startXRef,
-                          this.mainXRefEntriesOffset,
-                          password);
-      this.xref = xref;
-      this.catalog = new Catalog(xref);
-    },
-    get numPages() {
-      var linearization = this.linearization;
-      var num = linearization ? linearization.numPages : this.catalog.numPages;
-      // shadow the prototype getter
-      return shadow(this, 'numPages', num);
-    },
-    getDocumentInfo: function PDFDocument_getDocumentInfo() {
-      var info;
-      if (this.xref.trailer.has('Info')) {
-        var infoDict = this.xref.trailer.get('Info');
-
-        info = {};
-        infoDict.forEach(function(key, value) {
-          info[key] = typeof value !== 'string' ? value :
-            stringToPDFString(value);
-        });
-      }
-
-      return shadow(this, 'getDocumentInfo', info);
-    },
-    getFingerprint: function PDFDocument_getFingerprint() {
-      var xref = this.xref, fileID;
-      if (xref.trailer.has('ID')) {
-        fileID = '';
-        var id = xref.trailer.get('ID')[0];
-        id.split('').forEach(function(el) {
-          fileID += Number(el.charCodeAt(0)).toString(16);
-        });
-      } else {
-        // If we got no fileID, then we generate one,
-        // from the first 100 bytes of PDF
-        var data = this.stream.bytes.subarray(0, 100);
-        var hash = calculateMD5(data, 0, data.length);
-        fileID = '';
-        for (var i = 0, length = hash.length; i < length; i++) {
-          fileID += Number(hash[i]).toString(16);
-        }
-      }
-
-      return shadow(this, 'getFingerprint', fileID);
-    },
-    getPage: function PDFDocument_getPage(n) {
-      return this.catalog.getPage(n);
-    }
-  };
-
-  return PDFDocument;
-})();
-
-
-/* -*- 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);
-  else if (print)
-    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) {
-    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() {
-  try {
-    throw new Error();
-  } catch (e) {
-    return e.stack ? e.stack.split('\n').slice(2).join('\n') : '';
-  }
-}
-
-function assert(cond, msg) {
-  if (!cond)
-    error(msg);
-}
-
-// In a well-formed PDF, |cond| holds.  If it doesn't, subsequent
-// behavior is undefined.
-function assertWellFormed(cond, msg) {
-  if (!cond)
-    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,
-                                     configurable: true,
-                                     writable: false });
-  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;
-  for (var n = 0; n < length; ++n)
-    str += String.fromCharCode(bytes[n]);
-  return str;
-}
-
-function stringToBytes(str) {
-  var length = str.length;
-  var bytes = new Uint8Array(length);
-  for (var n = 0; n < length; ++n)
-    bytes[n] = str.charCodeAt(n) & 0xFF;
-  return bytes;
-}
-
-var IDENTITY_MATRIX = [1, 0, 0, 1, 0, 0];
-
-var Util = PDFJS.Util = (function UtilClosure() {
-  function Util() {}
-
-  Util.makeCssRgb = function Util_makeCssRgb(r, g, b) {
-    var ri = (255 * r) | 0, gi = (255 * g) | 0, bi = (255 * b) | 0;
-    return 'rgb(' + ri + ',' + gi + ',' + bi + ')';
-  };
-
-  Util.makeCssCmyk = function Util_makeCssCmyk(c, m, y, k) {
-    c = (new DeviceCmykCS()).getRgb([c, m, y, k]);
-    var ri = (255 * c[0]) | 0, gi = (255 * c[1]) | 0, bi = (255 * c[2]) | 0;
-    return 'rgb(' + ri + ',' + gi + ',' + bi + ')';
-  };
-
-  // For 2d affine transforms
-  Util.applyTransform = function Util_applyTransform(p, m) {
-    var xt = p[0] * m[0] + p[1] * m[2] + m[4];
-    var yt = p[0] * m[1] + p[1] * m[3] + m[5];
-    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 |
-  //   | g h i |   | Z |
-  // M is assumed to be serialized as [a,b,c,d,e,f,g,h,i],
-  // with v as [X,Y,Z]
-  Util.apply3dTransform = function Util_apply3dTransform(m, v) {
-    return [
-      m[0] * v[0] + m[1] * v[1] + m[2] * v[2],
-      m[3] * v[0] + m[4] * v[1] + m[5] * v[2],
-      m[6] * v[0] + m[7] * v[1] + m[8] * v[2]
-    ];
-  }
-
-  // Normalize rectangle rect=[x1, y1, x2, y2] so that (x1,y1) < (x2,y2)
-  // For coordinate systems whose origin lies in the bottom-left, this
-  // means normalization to (BL,TR) ordering. For systems with origin in the
-  // top-left, this means (TL,BR) ordering.
-  Util.normalizeRect = function Util_normalizeRect(rect) {
-    var r = rect.slice(0); // clone rect
-    if (rect[0] > rect[2]) {
-      r[0] = rect[2];
-      r[2] = rect[0];
-    }
-    if (rect[1] > rect[3]) {
-      r[1] = rect[3];
-      r[3] = rect[1];
-    }
-    return r;
-  }
-
-  // Returns a rectangle [x1, y1, x2, y2] corresponding to the
-  // intersection of rect1 and rect2. If no intersection, returns 'false'
-  // The rectangle coordinates of rect1, rect2 should be [x1, y1, x2, y2]
-  Util.intersect = function Util_intersect(rect1, rect2) {
-    function compare(a, b) {
-      return a - b;
-    };
-
-    // Order points along the axes
-    var orderedX = [rect1[0], rect1[2], rect2[0], rect2[2]].sort(compare),
-        orderedY = [rect1[1], rect1[3], rect2[1], rect2[3]].sort(compare),
-        result = [];
-
-    rect1 = Util.normalizeRect(rect1);
-    rect2 = Util.normalizeRect(rect2);
-
-    // X: first and second points belong to different rectangles?
-    if ((orderedX[0] === rect1[0] && orderedX[1] === rect2[0]) ||
-        (orderedX[0] === rect2[0] && orderedX[1] === rect1[0])) {
-      // Intersection must be between second and third points
-      result[0] = orderedX[1];
-      result[2] = orderedX[2];
-    } else {
-      return false;
-    }
-
-    // Y: first and second points belong to different rectangles?
-    if ((orderedY[0] === rect1[1] && orderedY[1] === rect2[1]) ||
-        (orderedY[0] === rect2[1] && orderedY[1] === rect1[1])) {
-      // Intersection must be between second and third points
-      result[1] = orderedY[1];
-      result[3] = orderedY[2];
-    } else {
-      return false;
-    }
-
-    return result;
-  };
-
-  Util.sign = function Util_sign(num) {
-    return num < 0 ? -1 : 1;
-  };
-
-  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,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
-  0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x2022, 0x2020, 0x2021, 0x2026, 0x2014,
-  0x2013, 0x192, 0x2044, 0x2039, 0x203A, 0x2212, 0x2030, 0x201E, 0x201C,
-  0x201D, 0x2018, 0x2019, 0x201A, 0x2122, 0xFB01, 0xFB02, 0x141, 0x152, 0x160,
-  0x178, 0x17D, 0x131, 0x142, 0x153, 0x161, 0x17E, 0, 0x20AC
-];
-
-function stringToPDFString(str) {
-  var i, n = str.length, str2 = '';
-  if (str[0] === '\xFE' && str[1] === '\xFF') {
-    // UTF16BE BOM
-    for (i = 2; i < n; i += 2)
-      str2 += String.fromCharCode(
-        (str.charCodeAt(i) << 8) | str.charCodeAt(i + 1));
-  } else {
-    for (i = 0; i < n; ++i) {
-      var code = PDFStringTranslateTable[str.charCodeAt(i)];
-      str2 += code ? String.fromCharCode(code) : str.charAt(i);
-    }
-  }
-  return str2;
-}
-
-function stringToUTF8String(str) {
-  return decodeURIComponent(escape(str));
-}
-
-function isBool(v) {
-  return typeof v == 'boolean';
-}
-
-function isInt(v) {
-  return typeof v == 'number' && ((v | 0) == v);
-}
-
-function isNum(v) {
-  return typeof v == 'number';
-}
-
-function isString(v) {
-  return typeof v == 'string';
-}
-
-function isNull(v) {
-  return v === null;
-}
-
-function isName(v) {
-  return v instanceof Name;
-}
-
-function isCmd(v, cmd) {
-  return v instanceof Cmd && (!cmd || v.cmd == cmd);
-}
-
-function isDict(v, type) {
-  return v instanceof Dict && (!type || v.get('Type').name == type);
-}
-
-function isArray(v) {
-  return v instanceof Array;
-}
-
-function isStream(v) {
-  return typeof v == 'object' && v != null && ('getChar' in v);
-}
-
-function isArrayBuffer(v) {
-  return typeof v == 'object' && v != null && ('byteLength' in v);
-}
-
-function isRef(v) {
-  return v instanceof Ref;
-}
-
-function isPDFFunction(v) {
-  var fnDict;
-  if (typeof v != 'object')
-    return false;
-  else if (isDict(v))
-    fnDict = v;
-  else if (isStream(v))
-    fnDict = v.dict;
-  else
-    return false;
-  return fnDict.has('FunctionType');
-}
-
-/**
- * 'Promise' object.
- * Each object that is stored in PDFObjects is based on a Promise object that
- * contains the status of the object and the data. There migth be situations,
- * where a function want to use the value of an object, but it isn't ready at
- * that time. To get a notification, once the object is ready to be used, s.o.
- * can add a callback using the `then` method on the promise that then calls
- * the callback once the object gets resolved.
- * A promise can get resolved only once and only once the data of the promise
- * can be set. If any of these happens twice or the data is required before
- * it was set, an exception is throw.
- */
-var Promise = PDFJS.Promise = (function PromiseClosure() {
-  var EMPTY_PROMISE = {};
-
-  /**
-   * If `data` is passed in this constructor, the promise is created resolved.
-   * If there isn't data, it isn't resolved at the beginning.
-   */
-  function Promise(name, data) {
-    this.name = name;
-    this.isRejected = false;
-    this.error = null;
-    // If you build a promise and pass in some data it's already resolved.
-    if (data != null) {
-      this.isResolved = true;
-      this._data = data;
-      this.hasData = true;
-    } else {
-      this.isResolved = false;
-      this._data = EMPTY_PROMISE;
-    }
-    this.callbacks = [];
-    this.errbacks = [];
-    this.progressbacks = [];
-  };
-  /**
-   * Builds a promise that is resolved when all the passed in promises are
-   * resolved.
-   * @param {Promise[]} promises Array of promises to wait for.
-   * @return {Promise} New dependant promise.
-   */
-  Promise.all = function Promise_all(promises) {
-    var deferred = new Promise();
-    var unresolved = promises.length;
-    var results = [];
-    if (unresolved === 0) {
-      deferred.resolve(results);
-      return deferred;
-    }
-    for (var i = 0, ii = promises.length; i < ii; ++i) {
-      var promise = promises[i];
-      promise.then((function(i) {
-        return function(value) {
-          results[i] = value;
-          unresolved--;
-          if (unresolved === 0)
-            deferred.resolve(results);
-        };
-      })(i));
-    }
-    return deferred;
-  };
-  Promise.prototype = {
-    hasData: false,
-
-    set data(value) {
-      if (value === undefined) {
-        return;
-      }
-      if (this._data !== EMPTY_PROMISE) {
-        error('Promise ' + this.name +
-              ': Cannot set the data of a promise twice');
-      }
-      this._data = value;
-      this.hasData = true;
-
-      if (this.onDataCallback) {
-        this.onDataCallback(value);
-      }
-    },
-
-    get data() {
-      if (this._data === EMPTY_PROMISE) {
-        error('Promise ' + this.name + ': Cannot get data that isn\'t set');
-      }
-      return this._data;
-    },
-
-    onData: function Promise_onData(callback) {
-      if (this._data !== EMPTY_PROMISE) {
-        callback(this._data);
-      } else {
-        this.onDataCallback = callback;
-      }
-    },
-
-    resolve: function Promise_resolve(data) {
-      if (this.isResolved) {
-        error('A Promise can be resolved only once ' + this.name);
-      }
-      if (this.isRejected) {
-        error('The Promise was already rejected ' + this.name);
-      }
-
-      this.isResolved = true;
-      this.data = (typeof data !== 'undefined') ? data : null;
-      var callbacks = this.callbacks;
-
-      for (var i = 0, ii = callbacks.length; i < ii; i++) {
-        callbacks[i].call(null, data);
-      }
-    },
-
-    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);
-      }
-      if (this.isResolved) {
-        error('The Promise was already resolved ' + this.name);
-      }
-
-      this.isRejected = true;
-      this.error = reason || null;
-      var errbacks = this.errbacks;
-
-      for (var i = 0, ii = errbacks.length; i < ii; i++) {
-        errbacks[i].call(null, reason, exception);
-      }
-    },
-
-    then: function Promise_then(callback, errback, progressback) {
-      if (!callback) {
-        error('Requiring callback' + this.name);
-      }
-
-      // If the promise is already resolved, call the callback directly.
-      if (this.isResolved) {
-        var data = this.data;
-        callback.call(null, data);
-      } else if (this.isRejected && errback) {
-        var error = this.error;
-        errback.call(null, error);
-      } else {
-        this.callbacks.push(callback);
-        if (errback)
-          this.errbacks.push(errback);
-      }
-
-      if (progressback)
-        this.progressbacks.push(progressback);
-    }
-  };
-
-  return Promise;
-})();
-
-var StatTimer = (function StatTimerClosure() {
-  function rpad(str, pad, length) {
-    while (str.length < length)
-      str += pad;
-    return str;
-  }
-  function StatTimer() {
-    this.started = {};
-    this.times = [];
-    this.enabled = true;
-  }
-  StatTimer.prototype = {
-    time: function StatTimer_time(name) {
-      if (!this.enabled)
-        return;
-      if (name in this.started)
-        throw 'Timer is already running for ' + name;
-      this.started[name] = Date.now();
-    },
-    timeEnd: function StatTimer_timeEnd(name) {
-      if (!this.enabled)
-        return;
-      if (!(name in this.started))
-        throw 'Timer has not been started for ' + name;
-      this.times.push({
-        'name': name,
-        'start': this.started[name],
-        'end': Date.now()
-      });
-      // Remove timer from started so it can be called again.
-      delete this.started[name];
-    },
-    toString: function StatTimer_toString() {
-      var times = this.times;
-      var out = '';
-      // Find the longest name for padding purposes.
-      var longest = 0;
-      for (var i = 0, ii = times.length; i < ii; ++i) {
-        var name = times[i]['name'];
-        if (name.length > longest)
-          longest = name.length;
-      }
-      for (var i = 0, ii = times.length; i < ii; ++i) {
-        var span = times[i];
-        var duration = span.end - span.start;
-        out += rpad(span['name'], ' ', longest) + ' ' + duration + 'ms\n';
-      }
-      return out;
-    }
-  };
-  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: */
-
-'use strict';
-
-// <canvas> contexts store most of the state we need natively.
-// However, PDF needs a bit more state, which we store here.
-
-var TextRenderingMode = {
-  FILL: 0,
-  STROKE: 1,
-  FILL_STROKE: 2,
-  INVISIBLE: 3,
-  FILL_ADD_TO_PATH: 4,
-  STROKE_ADD_TO_PATH: 5,
-  FILL_STROKE_ADD_TO_PATH: 6,
-  ADD_TO_PATH: 7
-};
-
-// Minimal font size that would be used during canvas fillText operations.
-var MIN_FONT_SIZE = 1;
-
-function createScratchCanvas(width, height) {
-  var canvas = document.createElement('canvas');
-  canvas.width = width;
-  canvas.height = height;
-  return canvas;
-}
-
-function addContextCurrentTransform(ctx) {
-  // If the context doesn't expose a `mozCurrentTransform`, add a JS based on.
-  if (!ctx.mozCurrentTransform) {
-    // Store the original context
-    ctx._originalSave = ctx.save;
-    ctx._originalRestore = ctx.restore;
-    ctx._originalRotate = ctx.rotate;
-    ctx._originalScale = ctx.scale;
-    ctx._originalTranslate = ctx.translate;
-    ctx._originalTransform = ctx.transform;
-
-    ctx._transformMatrix = [1, 0, 0, 1, 0, 0];
-    ctx._transformStack = [];
-
-    Object.defineProperty(ctx, 'mozCurrentTransform', {
-      get: function getCurrentTransform() {
-        return this._transformMatrix;
-      }
-    });
-
-    Object.defineProperty(ctx, 'mozCurrentTransformInverse', {
-      get: function getCurrentTransformInverse() {
-        // Calculation done using WolframAlpha:
-        // http://www.wolframalpha.com/input/?
-        //   i=Inverse+{{a%2C+c%2C+e}%2C+{b%2C+d%2C+f}%2C+{0%2C+0%2C+1}}
-
-        var m = this._transformMatrix;
-        var a = m[0], b = m[1], c = m[2], d = m[3], e = m[4], f = m[5];
-
-        var ad_bc = a * d - b * c;
-        var bc_ad = b * c - a * d;
-
-        return [
-          d / ad_bc,
-          b / bc_ad,
-          c / bc_ad,
-          a / ad_bc,
-          (d * e - c * f) / bc_ad,
-          (b * e - a * f) / ad_bc
-        ];
-      }
-    });
-
-    ctx.save = function ctxSave() {
-      var old = this._transformMatrix;
-      this._transformStack.push(old);
-      this._transformMatrix = old.slice(0, 6);
-
-      this._originalSave();
-    };
-
-    ctx.restore = function ctxRestore() {
-      var prev = this._transformStack.pop();
-      if (prev) {
-        this._transformMatrix = prev;
-        this._originalRestore();
-      }
-    };
-
-    ctx.translate = function ctxTranslate(x, y) {
-      var m = this._transformMatrix;
-      m[4] = m[0] * x + m[2] * y + m[4];
-      m[5] = m[1] * x + m[3] * y + m[5];
-
-      this._originalTranslate(x, y);
-    };
-
-    ctx.scale = function ctxScale(x, y) {
-      var m = this._transformMatrix;
-      m[0] = m[0] * x;
-      m[1] = m[1] * x;
-      m[2] = m[2] * y;
-      m[3] = m[3] * y;
-
-      this._originalScale(x, y);
-    };
-
-    ctx.transform = function ctxTransform(a, b, c, d, e, f) {
-      var m = this._transformMatrix;
-      this._transformMatrix = [
-        m[0] * a + m[2] * b,
-        m[1] * a + m[3] * b,
-        m[0] * c + m[2] * d,
-        m[1] * c + m[3] * d,
-        m[0] * e + m[2] * f + m[4],
-        m[1] * e + m[3] * f + m[5]
-      ];
-
-      ctx._originalTransform(a, b, c, d, e, f);
-    };
-
-    ctx.rotate = function ctxRotate(angle) {
-      var cosValue = Math.cos(angle);
-      var sinValue = Math.sin(angle);
-
-      var m = this._transformMatrix;
-      this._transformMatrix = [
-        m[0] * cosValue + m[2] * sinValue,
-        m[1] * cosValue + m[3] * sinValue,
-        m[0] * (-sinValue) + m[2] * cosValue,
-        m[1] * (-sinValue) + m[3] * cosValue,
-        m[4],
-        m[5]
-      ];
-
-      this._originalRotate(angle);
-    };
-  }
-}
-
-var CanvasExtraState = (function CanvasExtraStateClosure() {
-  function CanvasExtraState(old) {
-    // Are soft masks and alpha values shapes or opacities?
-    this.alphaIsShape = false;
-    this.fontSize = 0;
-    this.fontSizeScale = 1;
-    this.textMatrix = IDENTITY_MATRIX;
-    this.fontMatrix = IDENTITY_MATRIX;
-    this.leading = 0;
-    // Current point (in user coordinates)
-    this.x = 0;
-    this.y = 0;
-    // Start of text line (in text coordinates)
-    this.lineX = 0;
-    this.lineY = 0;
-    // Character and word spacing
-    this.charSpacing = 0;
-    this.wordSpacing = 0;
-    this.textHScale = 1;
-    this.textRenderingMode = TextRenderingMode.FILL;
-    // Color spaces
-    this.fillColorSpace = new DeviceGrayCS();
-    this.fillColorSpaceObj = null;
-    this.strokeColorSpace = new DeviceGrayCS();
-    this.strokeColorSpaceObj = null;
-    this.fillColorObj = null;
-    this.strokeColorObj = null;
-    // Default fore and background colors
-    this.fillColor = '#000000';
-    this.strokeColor = '#000000';
-    // Note: fill alpha applies to all non-stroking operations
-    this.fillAlpha = 1;
-    this.strokeAlpha = 1;
-    this.lineWidth = 1;
-
-    this.old = old;
-  }
-
-  CanvasExtraState.prototype = {
-    clone: function CanvasExtraState_clone() {
-      return Object.create(this);
-    },
-    setCurrentPoint: function CanvasExtraState_setCurrentPoint(x, y) {
-      this.x = x;
-      this.y = y;
-    }
-  };
-  return CanvasExtraState;
-})();
-
-var CanvasGraphics = (function CanvasGraphicsClosure() {
-  // Defines the time the executeOperatorList is going to be executing
-  // before it stops and shedules a continue of execution.
-  var kExecutionTime = 15;
-
-  function CanvasGraphics(canvasCtx, objs, textLayer) {
-    this.ctx = canvasCtx;
-    this.current = new CanvasExtraState();
-    this.stateStack = [];
-    this.pendingClip = null;
-    this.res = null;
-    this.xobjs = null;
-    this.objs = objs;
-    this.textLayer = textLayer;
-    if (canvasCtx) {
-      addContextCurrentTransform(canvasCtx);
-    }
-  }
-
-  var LINE_CAP_STYLES = ['butt', 'round', 'square'];
-  var LINE_JOIN_STYLES = ['miter', 'round', 'bevel'];
-  var NORMAL_CLIP = {};
-  var EO_CLIP = {};
-
-  CanvasGraphics.prototype = {
-    slowCommands: {
-      'stroke': true,
-      'closeStroke': true,
-      'fill': true,
-      'eoFill': true,
-      'fillStroke': true,
-      'eoFillStroke': true,
-      'closeFillStroke': true,
-      'closeEOFillStroke': true,
-      'showText': true,
-      'showSpacedText': true,
-      'setStrokeColorSpace': true,
-      'setFillColorSpace': true,
-      'setStrokeColor': true,
-      'setStrokeColorN': true,
-      'setFillColor': true,
-      'setFillColorN': true,
-      'setStrokeGray': true,
-      'setFillGray': true,
-      'setStrokeRGBColor': true,
-      'setFillRGBColor': true,
-      'setStrokeCMYKColor': true,
-      'setFillCMYKColor': true,
-      'paintJpegXObject': true,
-      'paintImageXObject': true,
-      'paintImageMaskXObject': true,
-      'shadingFill': true
-    },
-
-    beginDrawing: function CanvasGraphics_beginDrawing(viewport) {
-      var transform = viewport.transform;
-      this.ctx.save();
-      this.ctx.transform.apply(this.ctx, transform);
-
-      if (this.textLayer)
-        this.textLayer.beginLayout();
-    },
-
-    executeOperatorList: function CanvasGraphics_executeOperatorList(
-                                    operatorList,
-                                    executionStartIdx, continueCallback,
-                                    stepper) {
-      var argsArray = operatorList.argsArray;
-      var fnArray = operatorList.fnArray;
-      var i = executionStartIdx || 0;
-      var argsArrayLen = argsArray.length;
-
-      // Sometimes the OperatorList to execute is empty.
-      if (argsArrayLen == i) {
-        return i;
-      }
-
-      var executionEndIdx;
-      var endTime = Date.now() + kExecutionTime;
-
-      var objs = this.objs;
-      var fnName;
-      var slowCommands = this.slowCommands;
-
-      while (true) {
-        if (stepper && i === stepper.nextBreakPoint) {
-          stepper.breakIt(i, continueCallback);
-          return i;
-        }
-
-        fnName = fnArray[i];
-
-        if (fnName !== 'dependency') {
-          this[fnName].apply(this, argsArray[i]);
-        } else {
-          var deps = argsArray[i];
-          for (var n = 0, nn = deps.length; n < nn; n++) {
-            var depObjId = deps[n];
-
-            // If the promise isn't resolved yet, add the continueCallback
-            // to the promise and bail out.
-            if (!objs.isResolved(depObjId)) {
-              objs.get(depObjId, continueCallback);
-              return i;
-            }
-          }
-        }
-
-        i++;
-
-        // If the entire operatorList was executed, stop as were done.
-        if (i == argsArrayLen) {
-          return i;
-        }
-
-        // If the execution took longer then a certain amount of time, shedule
-        // to continue exeution after a short delay.
-        // However, this is only possible if a 'continueCallback' is passed in.
-        if (continueCallback && slowCommands[fnName] && Date.now() > endTime) {
-          setTimeout(continueCallback, 0);
-          return i;
-        }
-
-        // If the operatorList isn't executed completely yet OR the execution
-        // time was short enough, do another execution round.
-      }
-    },
-
-    endDrawing: function CanvasGraphics_endDrawing() {
-      this.ctx.restore();
-
-      if (this.textLayer)
-        this.textLayer.endLayout();
-    },
-
-    // Graphics state
-    setLineWidth: function CanvasGraphics_setLineWidth(width) {
-      this.current.lineWidth = width;
-      this.ctx.lineWidth = width;
-    },
-    setLineCap: function CanvasGraphics_setLineCap(style) {
-      this.ctx.lineCap = LINE_CAP_STYLES[style];
-    },
-    setLineJoin: function CanvasGraphics_setLineJoin(style) {
-      this.ctx.lineJoin = LINE_JOIN_STYLES[style];
-    },
-    setMiterLimit: function CanvasGraphics_setMiterLimit(limit) {
-      this.ctx.miterLimit = limit;
-    },
-    setDash: function CanvasGraphics_setDash(dashArray, dashPhase) {
-      this.ctx.mozDash = dashArray;
-      this.ctx.mozDashOffset = dashPhase;
-      this.ctx.webkitLineDash = dashArray;
-      this.ctx.webkitLineDashOffset = dashPhase;
-    },
-    setRenderingIntent: function CanvasGraphics_setRenderingIntent(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) {
-      // 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++) {
-        var state = states[i];
-        var key = state[0];
-        var value = state[1];
-
-        switch (key) {
-          case 'LW':
-            this.setLineWidth(value);
-            break;
-          case 'LC':
-            this.setLineCap(value);
-            break;
-          case 'LJ':
-            this.setLineJoin(value);
-            break;
-          case 'ML':
-            this.setMiterLimit(value);
-            break;
-          case 'D':
-            this.setDash(value[0], value[1]);
-            break;
-          case 'RI':
-            this.setRenderingIntent(value);
-            break;
-          case 'FL':
-            this.setFlatness(value);
-            break;
-          case 'Font':
-            this.setFont(state[1], state[2]);
-            break;
-          case 'CA':
-            this.current.strokeAlpha = state[1];
-            break;
-          case 'ca':
-            this.current.fillAlpha = state[1];
-            this.ctx.globalAlpha = state[1];
-            break;
-        }
-      }
-    },
-    save: function CanvasGraphics_save() {
-      this.ctx.save();
-      var old = this.current;
-      this.stateStack.push(old);
-      this.current = old.clone();
-    },
-    restore: function CanvasGraphics_restore() {
-      var prev = this.stateStack.pop();
-      if (prev) {
-        this.current = prev;
-        this.ctx.restore();
-      }
-    },
-    transform: function CanvasGraphics_transform(a, b, c, d, e, f) {
-      this.ctx.transform(a, b, c, d, e, f);
-    },
-
-    // Path
-    moveTo: function CanvasGraphics_moveTo(x, y) {
-      this.ctx.moveTo(x, y);
-      this.current.setCurrentPoint(x, y);
-    },
-    lineTo: function CanvasGraphics_lineTo(x, y) {
-      this.ctx.lineTo(x, y);
-      this.current.setCurrentPoint(x, y);
-    },
-    curveTo: function CanvasGraphics_curveTo(x1, y1, x2, y2, x3, y3) {
-      this.ctx.bezierCurveTo(x1, y1, x2, y2, x3, y3);
-      this.current.setCurrentPoint(x3, y3);
-    },
-    curveTo2: function CanvasGraphics_curveTo2(x2, y2, x3, y3) {
-      var current = this.current;
-      this.ctx.bezierCurveTo(current.x, current.y, x2, y2, x3, y3);
-      current.setCurrentPoint(x3, y3);
-    },
-    curveTo3: function CanvasGraphics_curveTo3(x1, y1, x3, y3) {
-      this.curveTo(x1, y1, x3, y3, x3, y3);
-      this.current.setCurrentPoint(x3, y3);
-    },
-    closePath: function CanvasGraphics_closePath() {
-      this.ctx.closePath();
-    },
-    rectangle: function CanvasGraphics_rectangle(x, y, width, height) {
-      this.ctx.rect(x, y, width, height);
-    },
-    stroke: function CanvasGraphics_stroke(consumePath) {
-      consumePath = typeof consumePath !== 'undefined' ? consumePath : true;
-      var ctx = this.ctx;
-      var strokeColor = this.current.strokeColor;
-      if (this.current.lineWidth === 0)
-        ctx.lineWidth = this.getSinglePixelWidth();
-      // For stroke we want to temporarily change the global alpha to the
-      // stroking alpha.
-      ctx.globalAlpha = this.current.strokeAlpha;
-      if (strokeColor && strokeColor.hasOwnProperty('type') &&
-          strokeColor.type === 'Pattern') {
-        // for patterns, we transform to pattern space, calculate
-        // the pattern, call stroke, and restore to user space
-        ctx.save();
-        ctx.strokeStyle = strokeColor.getPattern(ctx);
-        ctx.stroke();
-        ctx.restore();
-      } else {
-        ctx.stroke();
-      }
-      if (consumePath)
-        this.consumePath();
-      // Restore the global alpha to the fill alpha
-      ctx.globalAlpha = this.current.fillAlpha;
-    },
-    closeStroke: function CanvasGraphics_closeStroke() {
-      this.closePath();
-      this.stroke();
-    },
-    fill: function CanvasGraphics_fill(consumePath) {
-      consumePath = typeof consumePath !== 'undefined' ? consumePath : true;
-      var ctx = this.ctx;
-      var fillColor = this.current.fillColor;
-
-      if (fillColor && fillColor.hasOwnProperty('type') &&
-          fillColor.type === 'Pattern') {
-        ctx.save();
-        ctx.fillStyle = fillColor.getPattern(ctx);
-        ctx.fill();
-        ctx.restore();
-      } else {
-        ctx.fill();
-      }
-      if (consumePath)
-        this.consumePath();
-    },
-    eoFill: function CanvasGraphics_eoFill() {
-      var savedFillRule = this.setEOFillRule();
-      this.fill();
-      this.restoreFillRule(savedFillRule);
-    },
-    fillStroke: function CanvasGraphics_fillStroke() {
-      this.fill(false);
-      this.stroke(false);
-
-      this.consumePath();
-    },
-    eoFillStroke: function CanvasGraphics_eoFillStroke() {
-      var savedFillRule = this.setEOFillRule();
-      this.fillStroke();
-      this.restoreFillRule(savedFillRule);
-    },
-    closeFillStroke: function CanvasGraphics_closeFillStroke() {
-      this.closePath();
-      this.fillStroke();
-    },
-    closeEOFillStroke: function CanvasGraphics_closeEOFillStroke() {
-      var savedFillRule = this.setEOFillRule();
-      this.closePath();
-      this.fillStroke();
-      this.restoreFillRule(savedFillRule);
-    },
-    endPath: function CanvasGraphics_endPath() {
-      this.consumePath();
-    },
-
-    // Clipping
-    clip: function CanvasGraphics_clip() {
-      this.pendingClip = NORMAL_CLIP;
-    },
-    eoClip: function CanvasGraphics_eoClip() {
-      this.pendingClip = EO_CLIP;
-    },
-
-    // Text
-    beginText: function CanvasGraphics_beginText() {
-      this.current.textMatrix = IDENTITY_MATRIX;
-      this.current.x = this.current.lineX = 0;
-      this.current.y = this.current.lineY = 0;
-    },
-    endText: function CanvasGraphics_endText() {
-    },
-    setCharSpacing: function CanvasGraphics_setCharSpacing(spacing) {
-      this.current.charSpacing = spacing;
-    },
-    setWordSpacing: function CanvasGraphics_setWordSpacing(spacing) {
-      this.current.wordSpacing = spacing;
-    },
-    setHScale: function CanvasGraphics_setHScale(scale) {
-      this.current.textHScale = scale / 100;
-    },
-    setLeading: function CanvasGraphics_setLeading(leading) {
-      this.current.leading = -leading;
-    },
-    setFont: function CanvasGraphics_setFont(fontRefName, size) {
-      var fontObj = this.objs.get(fontRefName);
-      var current = this.current;
-
-      if (!fontObj)
-        error('Can\'t find font for ' + fontRefName);
-
-      // Slice-clone matrix so we can manipulate it without affecting original
-      if (fontObj.fontMatrix)
-        current.fontMatrix = fontObj.fontMatrix.slice(0);
-      else
-        current.fontMatrix = IDENTITY_MATRIX.slice(0);
-
-      // A valid matrix needs all main diagonal elements to be non-zero
-      // This also ensures we bypass FF bugzilla bug #719844.
-      if (current.fontMatrix[0] === 0 ||
-          current.fontMatrix[3] === 0) {
-        warn('Invalid font matrix for font ' + fontRefName);
-      }
-
-      // The spec for Tf (setFont) says that 'size' specifies the font 'scale',
-      // and in some docs this can be negative (inverted x-y axes).
-      // We implement this condition with fontMatrix.
-      if (size < 0) {
-        size = -size;
-        current.fontMatrix[0] *= -1;
-        current.fontMatrix[3] *= -1;
-      }
-
-      this.current.font = fontObj;
-      this.current.fontSize = size;
-
-      if (fontObj.coded)
-        return; // we don't need ctx.font for Type3 fonts
-
-      var name = fontObj.loadedName || 'sans-serif';
-      var bold = fontObj.black ? (fontObj.bold ? 'bolder' : 'bold') :
-                                 (fontObj.bold ? 'bold' : 'normal');
-
-      var italic = fontObj.italic ? 'italic' : 'normal';
-      var serif = fontObj.isSerifFont ? 'serif' : 'sans-serif';
-      var typeface = '"' + name + '", ' + serif;
-
-      // Some font backends cannot handle fonts below certain size.
-      // Keeping the font at minimal size and using the fontSizeScale to change
-      // the current transformation matrix before the fillText/strokeText.
-      // See https://bugzilla.mozilla.org/show_bug.cgi?id=726227
-      var browserFontSize = size >= MIN_FONT_SIZE ? size : MIN_FONT_SIZE;
-      this.current.fontSizeScale = browserFontSize != MIN_FONT_SIZE ? 1.0 :
-                                   size / MIN_FONT_SIZE;
-
-      var rule = italic + ' ' + bold + ' ' + browserFontSize + 'px ' + typeface;
-      this.ctx.font = rule;
-    },
-    setTextRenderingMode: function CanvasGraphics_setTextRenderingMode(mode) {
-      if (mode >= TextRenderingMode.FILL_ADD_TO_PATH)
-        TODO('unsupported text rendering mode: ' + mode);
-      this.current.textRenderingMode = mode;
-    },
-    setTextRise: function CanvasGraphics_setTextRise(rise) {
-      TODO('text rise: ' + rise);
-    },
-    moveText: function CanvasGraphics_moveText(x, y) {
-      this.current.x = this.current.lineX += x;
-      this.current.y = this.current.lineY += y;
-    },
-    setLeadingMoveText: function CanvasGraphics_setLeadingMoveText(x, y) {
-      this.setLeading(-y);
-      this.moveText(x, y);
-    },
-    setTextMatrix: function CanvasGraphics_setTextMatrix(a, b, c, d, e, f) {
-      this.current.textMatrix = [a, b, c, d, e, f];
-
-      this.current.x = this.current.lineX = 0;
-      this.current.y = this.current.lineY = 0;
-    },
-    nextLine: function CanvasGraphics_nextLine() {
-      this.moveText(0, this.current.leading);
-    },
-    applyTextTransforms: function CanvasGraphics_applyTextTransforms() {
-      var ctx = this.ctx;
-      var current = this.current;
-      var textHScale = current.textHScale;
-      var fontMatrix = current.fontMatrix || IDENTITY_MATRIX;
-
-      ctx.transform.apply(ctx, current.textMatrix);
-      ctx.scale(1, -1);
-      ctx.translate(current.x, -1 * current.y);
-      ctx.transform.apply(ctx, fontMatrix);
-      ctx.scale(textHScale, 1);
-    },
-    getTextGeometry: function CanvasGraphics_getTextGeometry() {
-      var geometry = {};
-      var ctx = this.ctx;
-      var font = this.current.font;
-      var ctxMatrix = ctx.mozCurrentTransform;
-      if (ctxMatrix) {
-        var bl = Util.applyTransform([0, 0], ctxMatrix);
-        var tr = Util.applyTransform([1, 1], ctxMatrix);
-        geometry.x = bl[0];
-        geometry.y = bl[1];
-        geometry.hScale = tr[0] - bl[0];
-        geometry.vScale = tr[1] - bl[1];
-      }
-      geometry.spaceWidth = font.spaceWidth;
-      return geometry;
-    },
-
-    showText: function CanvasGraphics_showText(str, skipTextSelection) {
-      var ctx = this.ctx;
-      var current = this.current;
-      var font = current.font;
-      var glyphs = font.charsToGlyphs(str);
-      var fontSize = current.fontSize;
-      var fontSizeScale = current.fontSizeScale;
-      var charSpacing = current.charSpacing;
-      var wordSpacing = current.wordSpacing;
-      var textHScale = current.textHScale;
-      var fontMatrix = current.fontMatrix || IDENTITY_MATRIX;
-      var textHScale2 = textHScale * fontMatrix[0];
-      var glyphsLength = glyphs.length;
-      var textLayer = this.textLayer;
-      var text = {str: '', length: 0, canvasWidth: 0, geom: {}};
-      var textSelection = textLayer && !skipTextSelection ? true : false;
-      var textRenderingMode = current.textRenderingMode;
-
-      // Type3 fonts - each glyph is a "mini-PDF"
-      if (font.coded) {
-        ctx.save();
-        ctx.transform.apply(ctx, current.textMatrix);
-        ctx.translate(current.x, current.y);
-
-        ctx.scale(textHScale, 1);
-
-        if (textSelection) {
-          this.save();
-          ctx.scale(1, -1);
-          text.geom = this.getTextGeometry();
-          this.restore();
-        }
-        for (var i = 0; i < glyphsLength; ++i) {
-
-          var glyph = glyphs[i];
-          if (glyph === null) {
-            // word break
-            this.ctx.translate(wordSpacing, 0);
-            continue;
-          }
-
-          this.save();
-          ctx.scale(fontSize, fontSize);
-          ctx.transform.apply(ctx, fontMatrix);
-          this.executeOperatorList(glyph.operatorList);
-          this.restore();
-
-          var transformed = Util.applyTransform([glyph.width, 0], fontMatrix);
-          var width = transformed[0] * fontSize +
-              Util.sign(current.fontMatrix[0]) * charSpacing;
-
-          ctx.translate(width, 0);
-          current.x += width * textHScale;
-
-          text.str += glyph.unicode;
-          text.length++;
-          text.canvasWidth += width;
-        }
-        ctx.restore();
-      } else {
-        ctx.save();
-        this.applyTextTransforms();
-
-        var lineWidth = current.lineWidth;
-        var scale = Math.abs(current.textMatrix[0] * fontMatrix[0]);
-        if (scale == 0 || lineWidth == 0)
-          lineWidth = this.getSinglePixelWidth();
-        else
-          lineWidth /= scale;
-
-        if (textSelection)
-          text.geom = this.getTextGeometry();
-
-        if (fontSizeScale != 1.0) {
-          ctx.scale(fontSizeScale, fontSizeScale);
-          lineWidth /= fontSizeScale;
-        }
-
-        ctx.lineWidth = lineWidth;
-
-        var x = 0;
-        for (var i = 0; i < glyphsLength; ++i) {
-          var glyph = glyphs[i];
-          if (glyph === null) {
-            // word break
-            x += Util.sign(current.fontMatrix[0]) * wordSpacing;
-            continue;
-          }
-
-          var character = glyph.fontChar;
-          var charWidth = glyph.width * fontSize * 0.001 +
-              Util.sign(current.fontMatrix[0]) * charSpacing;
-
-          if (!glyph.disabled) {
-            var scaledX = x / fontSizeScale;
-            switch (textRenderingMode) {
-              default: // other unsupported rendering modes
-              case TextRenderingMode.FILL:
-              case TextRenderingMode.FILL_ADD_TO_PATH:
-                ctx.fillText(character, scaledX, 0);
-                break;
-              case TextRenderingMode.STROKE:
-              case TextRenderingMode.STROKE_ADD_TO_PATH:
-                ctx.strokeText(character, scaledX, 0);
-                break;
-              case TextRenderingMode.FILL_STROKE:
-              case TextRenderingMode.FILL_STROKE_ADD_TO_PATH:
-                ctx.fillText(character, scaledX, 0);
-                ctx.strokeText(character, scaledX, 0);
-                break;
-              case TextRenderingMode.INVISIBLE:
-                break;
-            }
-          }
-
-          x += charWidth;
-
-          var glyphUnicode = glyph.unicode === ' ' ? '\u00A0' : glyph.unicode;
-          var glyphUnicodeLength = glyphUnicode.length;
-          //reverse an arabic ligature
-          if (glyphUnicodeLength > 1 &&
-              isRTLRangeFor(glyphUnicode.charCodeAt(0))) {
-            for (var ii = glyphUnicodeLength - 1; ii >= 0; ii--)
-              text.str += glyphUnicode[ii];
-          } else
-            text.str += glyphUnicode;
-          text.length += glyphUnicodeLength;
-          text.canvasWidth += charWidth;
-        }
-        current.x += x * textHScale2;
-        ctx.restore();
-      }
-
-      if (textSelection)
-        this.textLayer.appendText(text, font.loadedName, fontSize);
-
-      return text;
-    },
-    showSpacedText: function CanvasGraphics_showSpacedText(arr) {
-      var ctx = this.ctx;
-      var current = this.current;
-      var font = current.font;
-      var fontSize = current.fontSize;
-      var textHScale = current.textHScale;
-      if (!font.coded)
-        textHScale *= (current.fontMatrix || IDENTITY_MATRIX)[0];
-      var arrLength = arr.length;
-      var textLayer = this.textLayer;
-      var text = {str: '', length: 0, canvasWidth: 0, geom: {}};
-      var textSelection = textLayer ? true : false;
-
-      if (textSelection) {
-        ctx.save();
-        // Type3 fonts - each glyph is a "mini-PDF" (see also showText)
-        if (font.coded) {
-          ctx.transform.apply(ctx, current.textMatrix);
-          ctx.scale(1, -1);
-          ctx.translate(current.x, -1 * current.y);
-          ctx.scale(textHScale, 1);
-        } else
-          this.applyTextTransforms();
-        text.geom = this.getTextGeometry();
-        ctx.restore();
-      }
-
-      for (var i = 0; i < arrLength; ++i) {
-        var e = arr[i];
-        if (isNum(e)) {
-          var spacingLength = -e * 0.001 * fontSize * textHScale;
-          current.x += spacingLength;
-
-          if (textSelection) {
-            // Emulate precise spacing via HTML spaces
-            text.canvasWidth += spacingLength;
-            if (e < 0 && text.geom.spaceWidth > 0) { // avoid div by zero
-              var numFakeSpaces = Math.round(-e / text.geom.spaceWidth);
-              if (numFakeSpaces > 0) {
-                text.str += '\u00A0';
-                text.length++;
-              }
-            }
-          }
-        } else if (isString(e)) {
-          var shownText = this.showText(e, true);
-
-          if (textSelection) {
-            if (shownText.str === ' ') {
-              text.str += '\u00A0';
-            } else {
-              text.str += shownText.str;
-            }
-            text.canvasWidth += shownText.canvasWidth;
-            text.length += shownText.length;
-          }
-        } else {
-          error('TJ array element ' + e + ' is not string or num');
-        }
-      }
-
-      if (textSelection)
-        this.textLayer.appendText(text, font.loadedName, fontSize);
-    },
-    nextLineShowText: function CanvasGraphics_nextLineShowText(text) {
-      this.nextLine();
-      this.showText(text);
-    },
-    nextLineSetSpacingShowText:
-      function CanvasGraphics_nextLineSetSpacingShowText(wordSpacing,
-                                                         charSpacing,
-                                                         text) {
-      this.setWordSpacing(wordSpacing);
-      this.setCharSpacing(charSpacing);
-      this.nextLineShowText(text);
-    },
-
-    // Type3 fonts
-    setCharWidth: function CanvasGraphics_setCharWidth(xWidth, yWidth) {
-      // We can safely ignore this since the width should be the same
-      // as the width in the Widths array.
-    },
-    setCharWidthAndBounds: function CanvasGraphics_setCharWidthAndBounds(xWidth,
-                                                                        yWidth,
-                                                                        llx,
-                                                                        lly,
-                                                                        urx,
-                                                                        ury) {
-      // TODO According to the spec we're also suppose to ignore any operators
-      // that set color or include images while processing this type3 font.
-      this.rectangle(llx, lly, urx - llx, ury - lly);
-      this.clip();
-      this.endPath();
-    },
-
-    // Color
-    setStrokeColorSpace: function CanvasGraphics_setStrokeColorSpace(raw) {
-      this.current.strokeColorSpace = ColorSpace.fromIR(raw);
-    },
-    setFillColorSpace: function CanvasGraphics_setFillColorSpace(raw) {
-      this.current.fillColorSpace = ColorSpace.fromIR(raw);
-    },
-    setStrokeColor: function CanvasGraphics_setStrokeColor(/*...*/) {
-      var cs = this.current.strokeColorSpace;
-      var rgbColor = cs.getRgb(arguments);
-      var color = Util.makeCssRgb(rgbColor[0], rgbColor[1], rgbColor[2]);
-      this.ctx.strokeStyle = color;
-      this.current.strokeColor = color;
-    },
-    getColorN_Pattern: function CanvasGraphics_getColorN_Pattern(IR, cs) {
-      if (IR[0] == 'TilingPattern') {
-        var args = IR[1];
-        var base = cs.base;
-        var color;
-        if (base) {
-          var baseComps = base.numComps;
-
-          color = [];
-          for (var i = 0; i < baseComps; ++i)
-            color.push(args[i]);
-
-          color = base.getRgb(color);
-        }
-        var pattern = new TilingPattern(IR, color, this.ctx, this.objs);
-      } else if (IR[0] == 'RadialAxial' || IR[0] == 'Dummy') {
-        var pattern = Pattern.shadingFromIR(IR);
-      } else {
-        error('Unkown IR type ' + IR[0]);
-      }
-      return pattern;
-    },
-    setStrokeColorN: function CanvasGraphics_setStrokeColorN(/*...*/) {
-      var cs = this.current.strokeColorSpace;
-
-      if (cs.name == 'Pattern') {
-        this.current.strokeColor = this.getColorN_Pattern(arguments, cs);
-      } else {
-        this.setStrokeColor.apply(this, arguments);
-      }
-    },
-    setFillColor: function CanvasGraphics_setFillColor(/*...*/) {
-      var cs = this.current.fillColorSpace;
-      var rgbColor = cs.getRgb(arguments);
-      var color = Util.makeCssRgb(rgbColor[0], rgbColor[1], rgbColor[2]);
-      this.ctx.fillStyle = color;
-      this.current.fillColor = color;
-    },
-    setFillColorN: function CanvasGraphics_setFillColorN(/*...*/) {
-      var cs = this.current.fillColorSpace;
-
-      if (cs.name == 'Pattern') {
-        this.current.fillColor = this.getColorN_Pattern(arguments, cs);
-      } else {
-        this.setFillColor.apply(this, arguments);
-      }
-    },
-    setStrokeGray: function CanvasGraphics_setStrokeGray(gray) {
-      if (!(this.current.strokeColorSpace instanceof DeviceGrayCS))
-        this.current.strokeColorSpace = new DeviceGrayCS();
-
-      var color = Util.makeCssRgb(gray, gray, gray);
-      this.ctx.strokeStyle = color;
-      this.current.strokeColor = color;
-    },
-    setFillGray: function CanvasGraphics_setFillGray(gray) {
-      if (!(this.current.fillColorSpace instanceof DeviceGrayCS))
-        this.current.fillColorSpace = new DeviceGrayCS();
-
-      var color = Util.makeCssRgb(gray, gray, gray);
-      this.ctx.fillStyle = color;
-      this.current.fillColor = color;
-    },
-    setStrokeRGBColor: function CanvasGraphics_setStrokeRGBColor(r, g, b) {
-      if (!(this.current.strokeColorSpace instanceof DeviceRgbCS))
-        this.current.strokeColorSpace = new DeviceRgbCS();
-
-      var color = Util.makeCssRgb(r, g, b);
-      this.ctx.strokeStyle = color;
-      this.current.strokeColor = color;
-    },
-    setFillRGBColor: function CanvasGraphics_setFillRGBColor(r, g, b) {
-      if (!(this.current.fillColorSpace instanceof DeviceRgbCS))
-        this.current.fillColorSpace = new DeviceRgbCS();
-
-      var color = Util.makeCssRgb(r, g, b);
-      this.ctx.fillStyle = color;
-      this.current.fillColor = color;
-    },
-    setStrokeCMYKColor: function CanvasGraphics_setStrokeCMYKColor(c, m, y, k) {
-      if (!(this.current.strokeColorSpace instanceof DeviceCmykCS))
-        this.current.strokeColorSpace = new DeviceCmykCS();
-
-      var color = Util.makeCssCmyk(c, m, y, k);
-      this.ctx.strokeStyle = color;
-      this.current.strokeColor = color;
-    },
-    setFillCMYKColor: function CanvasGraphics_setFillCMYKColor(c, m, y, k) {
-      if (!(this.current.fillColorSpace instanceof DeviceCmykCS))
-        this.current.fillColorSpace = new DeviceCmykCS();
-
-      var color = Util.makeCssCmyk(c, m, y, k);
-      this.ctx.fillStyle = color;
-      this.current.fillColor = color;
-    },
-
-    shadingFill: function CanvasGraphics_shadingFill(patternIR) {
-      var ctx = this.ctx;
-
-      this.save();
-      var pattern = Pattern.shadingFromIR(patternIR);
-      ctx.fillStyle = pattern.getPattern(ctx);
-
-      var inv = ctx.mozCurrentTransformInverse;
-      if (inv) {
-        var canvas = ctx.canvas;
-        var width = canvas.width;
-        var height = canvas.height;
-
-        var bl = Util.applyTransform([0, 0], inv);
-        var br = Util.applyTransform([0, height], inv);
-        var ul = Util.applyTransform([width, 0], inv);
-        var ur = Util.applyTransform([width, height], inv);
-
-        var x0 = Math.min(bl[0], br[0], ul[0], ur[0]);
-        var y0 = Math.min(bl[1], br[1], ul[1], ur[1]);
-        var x1 = Math.max(bl[0], br[0], ul[0], ur[0]);
-        var y1 = Math.max(bl[1], br[1], ul[1], ur[1]);
-
-        this.ctx.fillRect(x0, y0, x1 - x0, y1 - y0);
-      } else {
-        // HACK to draw the gradient onto an infinite rectangle.
-        // PDF gradients are drawn across the entire image while
-        // Canvas only allows gradients to be drawn in a rectangle
-        // The following bug should allow us to remove this.
-        // https://bugzilla.mozilla.org/show_bug.cgi?id=664884
-
-        this.ctx.fillRect(-1e10, -1e10, 2e10, 2e10);
-      }
-
-      this.restore();
-    },
-
-    // Images
-    beginInlineImage: function CanvasGraphics_beginInlineImage() {
-      error('Should not call beginInlineImage');
-    },
-    beginImageData: function CanvasGraphics_beginImageData() {
-      error('Should not call beginImageData');
-    },
-
-    paintFormXObjectBegin: function CanvasGraphics_paintFormXObjectBegin(matrix,
-                                                                        bbox) {
-      this.save();
-
-      if (matrix && isArray(matrix) && 6 == matrix.length)
-        this.transform.apply(this, matrix);
-
-      if (bbox && isArray(bbox) && 4 == bbox.length) {
-        var width = bbox[2] - bbox[0];
-        var height = bbox[3] - bbox[1];
-        this.rectangle(bbox[0], bbox[1], width, height);
-        this.clip();
-        this.endPath();
-      }
-    },
-
-    paintFormXObjectEnd: function CanvasGraphics_paintFormXObjectEnd() {
-      this.restore();
-    },
-
-    paintJpegXObject: function CanvasGraphics_paintJpegXObject(objId, w, h) {
-      var domImage = this.objs.get(objId);
-      if (!domImage) {
-        error('Dependent image isn\'t ready yet');
-      }
-
-      this.save();
-
-      var ctx = this.ctx;
-      // scale the image to the unit square
-      ctx.scale(1 / w, -1 / h);
-
-      ctx.drawImage(domImage, 0, 0, domImage.width, domImage.height,
-                    0, -h, w, h);
-
-      this.restore();
-    },
-
-    paintImageMaskXObject: function CanvasGraphics_paintImageMaskXObject(
-                             imgArray, inverseDecode, width, height) {
-      function applyStencilMask(buffer, inverseDecode) {
-        var imgArrayPos = 0;
-        var i, j, mask, buf;
-        // removing making non-masked pixels transparent
-        var bufferPos = 3; // alpha component offset
-        for (i = 0; i < height; i++) {
-          mask = 0;
-          for (j = 0; j < width; j++) {
-            if (!mask) {
-              buf = imgArray[imgArrayPos++];
-              mask = 128;
-            }
-            if (!(buf & mask) == inverseDecode) {
-              buffer[bufferPos] = 0;
-            }
-            bufferPos += 4;
-            mask >>= 1;
-          }
-        }
-      }
-      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();
-
-      var ctx = this.ctx;
-      var w = width, h = height;
-      // scale the image to the unit square
-      ctx.scale(1 / w, -1 / h);
-
-      var tmpCanvas = createScratchCanvas(w, h);
-      var tmpCtx = tmpCanvas.getContext('2d');
-
-      var fillColor = this.current.fillColor;
-      tmpCtx.fillStyle = (fillColor && fillColor.hasOwnProperty('type') &&
-                          fillColor.type === 'Pattern') ?
-                          fillColor.getPattern(tmpCtx) : fillColor;
-      tmpCtx.fillRect(0, 0, w, h);
-
-      var imgData = tmpCtx.getImageData(0, 0, w, h);
-      var pixels = imgData.data;
-
-      applyStencilMask(pixels, inverseDecode);
-
-      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();
-    },
-
-    paintImageXObject: function CanvasGraphics_paintImageXObject(objId) {
-      var imgData = this.objs.get(objId);
-      if (!imgData)
-        error('Dependent image isn\'t ready yet');
-
-      this.save();
-      var ctx = this.ctx;
-      var w = imgData.width;
-      var h = imgData.height;
-      // scale the image to the unit square
-      ctx.scale(1 / w, -1 / h);
-
-      var tmpCanvas = createScratchCanvas(w, h);
-      var tmpCtx = tmpCanvas.getContext('2d');
-      this.putBinaryImageData(tmpCtx, imgData, w, h);
-
-      ctx.drawImage(tmpCanvas, 0, -h);
-      this.restore();
-    },
-
-    putBinaryImageData: function CanvasGraphics_putBinaryImageData() {
-      //
-    },
-
-    // Marked content
-
-    markPoint: function CanvasGraphics_markPoint(tag) {
-      TODO('Marked content');
-    },
-    markPointProps: function CanvasGraphics_markPointProps(tag, properties) {
-      TODO('Marked content');
-    },
-    beginMarkedContent: function CanvasGraphics_beginMarkedContent(tag) {
-      TODO('Marked content');
-    },
-    beginMarkedContentProps: function CanvasGraphics_beginMarkedContentProps(
-                                        tag, properties) {
-      TODO('Marked content');
-    },
-    endMarkedContent: function CanvasGraphics_endMarkedContent() {
-      TODO('Marked content');
-    },
-
-    // Compatibility
-
-    beginCompat: function CanvasGraphics_beginCompat() {
-      TODO('ignore undefined operators (should we do that anyway?)');
-    },
-    endCompat: function CanvasGraphics_endCompat() {
-      TODO('stop ignoring undefined operators');
-    },
-
-    // Helper functions
-
-    consumePath: function CanvasGraphics_consumePath() {
-      if (this.pendingClip) {
-        var savedFillRule = null;
-        if (this.pendingClip == EO_CLIP)
-          savedFillRule = this.setEOFillRule();
-
-        this.ctx.clip();
-
-        this.pendingClip = null;
-        if (savedFillRule !== null)
-          this.restoreFillRule(savedFillRule);
-      }
-      this.ctx.beginPath();
-    },
-    // We generally keep the canvas context set for
-    // nonzero-winding, and just set evenodd for the operations
-    // that need them.
-    setEOFillRule: function CanvasGraphics_setEOFillRule() {
-      var savedFillRule = this.ctx.mozFillRule;
-      this.ctx.mozFillRule = 'evenodd';
-      return savedFillRule;
-    },
-    restoreFillRule: function CanvasGraphics_restoreFillRule(rule) {
-      this.ctx.mozFillRule = rule;
-    },
-    getSinglePixelWidth: function CanvasGraphics_getSinglePixelWidth(scale) {
-      var inverse = this.ctx.mozCurrentTransformInverse;
-      return Math.abs(inverse[0] + inverse[2]);
-    }
-  };
-
-  return CanvasGraphics;
-})();
-
-if (!isWorker) {
-  // Feature detection if the browser can use an Uint8Array directly as imgData.
-  var canvas = document.createElement('canvas');
-  canvas.width = 1;
-  canvas.height = 1;
-  var ctx = canvas.getContext('2d');
-
-  try {
-    ctx.putImageData({
-      width: 1,
-      height: 1,
-      data: new Uint8Array(4)
-    }, 0, 0);
-
-    CanvasGraphics.prototype.putBinaryImageData =
-      function CanvasGraphicsPutBinaryImageDataNative(ctx, imgData) {
-        ctx.putImageData(imgData, 0, 0);
-      };
-  } catch (e) {
-    CanvasGraphics.prototype.putBinaryImageData =
-      function CanvasGraphicsPutBinaryImageDataShim(ctx, imgData, w, h) {
-        var tmpImgData = ctx.getImageData(0, 0, w, h);
-
-        // Copy over the imageData pixel by pixel.
-        var tmpImgDataPixels = tmpImgData.data;
-        var len = tmpImgDataPixels.length;
-
-        while (len--) {
-          tmpImgDataPixels[len] = imgData.data[len];
-        }
-
-        ctx.putImageData(tmpImgData, 0, 0);
-      };
-  }
-}
-
-/* -*- 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 Name = (function NameClosure() {
-  function Name(name) {
-    this.name = name;
-  }
-
-  Name.prototype = {};
-
-  return Name;
-})();
-
-var Cmd = (function CmdClosure() {
-  function Cmd(cmd) {
-    this.cmd = cmd;
-  }
-
-  Cmd.prototype = {};
-
-  var cmdCache = {};
-
-  Cmd.get = function Cmd_get(cmd) {
-    var cmdValue = cmdCache[cmd];
-    if (cmdValue)
-      return cmdValue;
-
-    return cmdCache[cmd] = new Cmd(cmd);
-  };
-
-  return Cmd;
-})();
-
-var Dict = (function DictClosure() {
-  // xref is optional
-  function Dict(xref) {
-    // Map should only be used internally, use functions below to access.
-    var map = Object.create(null);
-
-    this.assignXref = function Dict_assignXref(newXref) {
-      xref = newXref;
-    };
-
-    // automatically dereferences Ref objects
-    this.get = function Dict_get(key1, key2, key3) {
-      var value;
-      if (typeof (value = map[key1]) != 'undefined' || key1 in map ||
-          typeof key2 == 'undefined') {
-        return xref ? xref.fetchIfRef(value) : value;
-      }
-      if (typeof (value = map[key2]) != 'undefined' || key2 in map ||
-          typeof key3 == 'undefined') {
-        return xref ? xref.fetchIfRef(value) : value;
-      }
-      value = map[key3] || null;
-      return xref ? xref.fetchIfRef(value) : value;
-    };
-
-    // no dereferencing
-    this.getRaw = function Dict_getRaw(key) {
-      return map[key];
-    };
-
-    // creates new map and dereferences all Refs
-    this.getAll = function Dict_getAll() {
-      var all = {};
-      for (var key in map) {
-        var obj = this.get(key);
-        all[key] = obj instanceof Dict ? obj.getAll() : obj;
-      }
-      return all;
-    };
-
-    this.set = function Dict_set(key, value) {
-      map[key] = value;
-    };
-
-    this.has = function Dict_has(key) {
-      return key in map;
-    };
-
-    this.forEach = function Dict_forEach(callback) {
-      for (var key in map) {
-        callback(key, this.get(key));
-      }
-    };
-  };
-
-  return Dict;
-})();
-
-var Ref = (function RefClosure() {
-  function Ref(num, gen) {
-    this.num = num;
-    this.gen = gen;
-  }
-
-  Ref.prototype = {};
-
-  return Ref;
-})();
-
-// The reference is identified by number and generation,
-// this structure stores only one instance of the reference.
-var RefSet = (function RefSetClosure() {
-  function RefSet() {
-    this.dict = {};
-  }
-
-  RefSet.prototype = {
-    has: function RefSet_has(ref) {
-      return !!this.dict['R' + ref.num + '.' + ref.gen];
-    },
-
-    put: function RefSet_put(ref) {
-      this.dict['R' + ref.num + '.' + ref.gen] = ref;
-    }
-  };
-
-  return RefSet;
-})();
-
-var Catalog = (function CatalogClosure() {
-  function Catalog(xref) {
-    this.xref = xref;
-    var obj = xref.getCatalogObj();
-    assertWellFormed(isDict(obj), 'catalog object is not a dictionary');
-    this.catDict = obj;
-  }
-
-  Catalog.prototype = {
-    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');
-        var subtype = stream.dict.get('Subtype');
-
-        if (isName(type) && isName(subtype) &&
-            type.name === 'Metadata' && subtype.name === 'XML') {
-          // 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.');
-          }
-        }
-      }
-
-      return shadow(this, 'metadata', metadata);
-    },
-    get toplevelPagesDict() {
-      var pagesObj = this.catDict.get('Pages');
-      assertWellFormed(isDict(pagesObj), 'invalid top-level pages dictionary');
-      // shadow the prototype getter
-      return shadow(this, 'toplevelPagesDict', pagesObj);
-    },
-    get documentOutline() {
-      var xref = this.xref;
-      var obj = this.catDict.get('Outlines');
-      var root = { items: [] };
-      if (isDict(obj)) {
-        obj = obj.getRaw('First');
-        var processed = new RefSet();
-        if (isRef(obj)) {
-          var queue = [{obj: obj, parent: root}];
-          // to avoid recursion keeping track of the items
-          // in the processed dictionary
-          processed.put(obj);
-          while (queue.length > 0) {
-            var i = queue.shift();
-            var outlineDict = xref.fetchIfRef(i.obj);
-            if (outlineDict === null)
-              continue;
-            if (!outlineDict.has('Title'))
-              error('Invalid outline item');
-            var dest = outlineDict.get('A');
-            if (dest)
-              dest = dest.get('D');
-            else if (outlineDict.has('Dest')) {
-              dest = outlineDict.getRaw('Dest');
-              if (isName(dest))
-                dest = dest.name;
-            }
-            var title = outlineDict.get('Title');
-            var outlineItem = {
-              dest: dest,
-              title: stringToPDFString(title),
-              color: outlineDict.get('C') || [0, 0, 0],
-              count: outlineDict.get('Count'),
-              bold: !!(outlineDict.get('F') & 2),
-              italic: !!(outlineDict.get('F') & 1),
-              items: []
-            };
-            i.parent.items.push(outlineItem);
-            obj = outlineDict.getRaw('First');
-            if (isRef(obj) && !processed.has(obj)) {
-              queue.push({obj: obj, parent: outlineItem});
-              processed.put(obj);
-            }
-            obj = outlineDict.getRaw('Next');
-            if (isRef(obj) && !processed.has(obj)) {
-              queue.push({obj: obj, parent: i.parent});
-              processed.put(obj);
-            }
-          }
-        }
-      }
-      obj = root.items.length > 0 ? root.items : null;
-      return shadow(this, 'documentOutline', obj);
-    },
-    get numPages() {
-      var obj = this.toplevelPagesDict.get('Count');
-      assertWellFormed(
-        isInt(obj),
-        'page count in top level pages object is not an integer'
-      );
-      // shadow the prototype getter
-      return shadow(this, 'num', obj);
-    },
-    traverseKids: function Catalog_traverseKids(pagesDict) {
-      var pageCache = this.pageCache;
-      var kids = pagesDict.get('Kids');
-      assertWellFormed(isArray(kids),
-                       'page dictionary kids object is not an array');
-      for (var i = 0, ii = kids.length; i < ii; ++i) {
-        var kid = kids[i];
-        assertWellFormed(isRef(kid),
-                        'page dictionary kid is not a reference');
-        var obj = this.xref.fetch(kid);
-        if (isDict(obj, 'Page') || (isDict(obj) && !obj.has('Kids'))) {
-          pageCache.push(new Page(this.xref, pageCache.length, obj, kid));
-        } else { // must be a child page dictionary
-          assertWellFormed(
-            isDict(obj),
-            'page dictionary kid reference points to wrong type of object'
-          );
-          this.traverseKids(obj);
-        }
-      }
-    },
-    get destinations() {
-      function fetchDestination(dest) {
-        return isDict(dest) ? dest.get('D') : dest;
-      }
-
-      var xref = this.xref;
-      var dests = {}, nameTreeRef, nameDictionaryRef;
-      var obj = this.catDict.get('Names');
-      if (obj)
-        nameTreeRef = obj.getRaw('Dests');
-      else if (this.catDict.has('Dests'))
-        nameDictionaryRef = this.catDict.get('Dests');
-
-      if (nameDictionaryRef) {
-        // reading simple destination dictionary
-        obj = nameDictionaryRef;
-        obj.forEach(function catalogForEach(key, value) {
-          if (!value) return;
-          dests[key] = fetchDestination(value);
-        });
-      }
-      if (nameTreeRef) {
-        // reading name tree
-        var processed = new RefSet();
-        processed.put(nameTreeRef);
-        var queue = [nameTreeRef];
-        while (queue.length > 0) {
-          var i, n;
-          obj = xref.fetch(queue.shift());
-          if (obj.has('Kids')) {
-            var kids = obj.get('Kids');
-            for (i = 0, n = kids.length; i < n; i++) {
-              var kid = kids[i];
-              if (processed.has(kid))
-                error('invalid destinations');
-              queue.push(kid);
-              processed.put(kid);
-            }
-            continue;
-          }
-          var names = obj.get('Names');
-          for (i = 0, n = names.length; i < n; i += 2) {
-            dests[names[i]] = fetchDestination(xref.fetchIfRef(names[i + 1]));
-          }
-        }
-      }
-      return shadow(this, 'destinations', dests);
-    },
-    getPage: function Catalog_getPage(n) {
-      var pageCache = this.pageCache;
-      if (!pageCache) {
-        pageCache = this.pageCache = [];
-        this.traverseKids(this.toplevelPagesDict);
-      }
-      return this.pageCache[n - 1];
-    }
-  };
-
-  return Catalog;
-})();
-
-var XRef = (function XRefClosure() {
-  function XRef(stream, startXRef, mainXRefEntriesOffset, password) {
-    this.stream = stream;
-    this.entries = [];
-    this.xrefstms = {};
-    var trailerDict = this.readXRef(startXRef);
-    trailerDict.assignXref(this);
-    this.trailer = trailerDict;
-    // prepare the XRef cache
-    this.cache = [];
-
-    var encrypt = trailerDict.get('Encrypt');
-    if (encrypt) {
-      var fileId = trailerDict.get('ID');
-      this.encrypt = new CipherTransformFactory(encrypt, fileId[0], password);
-    }
-
-    // get the root dictionary (catalog) object
-    if (!(this.root = trailerDict.get('Root')))
-      error('Invalid root reference');
-  }
-
-  XRef.prototype = {
-    readXRefTable: function XRef_readXRefTable(parser) {
-      // Example of cross-reference table:
-      // xref
-      // 0 1                    <-- subsection header (first obj #, obj count)
-      // 0000000000 65535 f     <-- actual object (offset, generation #, f/n)
-      // 23 2                   <-- subsection header ... and so on ...
-      // 0000025518 00002 n
-      // 0000025635 00000 n
-      // trailer
-      // ...
-
-      // Outer loop is over subsection headers
-      var obj;
-      while (!isCmd(obj = parser.getObj(), 'trailer')) {
-        var first = obj,
-            count = parser.getObj();
-
-        if (!isInt(first) || !isInt(count))
-          error('Invalid XRef table: wrong types in subsection header');
-
-        // Inner loop is over objects themselves
-        for (var i = 0; i < count; i++) {
-          var entry = {};
-          entry.offset = parser.getObj();
-          entry.gen = parser.getObj();
-          var type = parser.getObj();
-
-          if (isCmd(type, 'f'))
-            entry.free = true;
-          else if (isCmd(type, 'n'))
-            entry.uncompressed = true;
-
-          // Validate entry obj
-          if (!isInt(entry.offset) || !isInt(entry.gen) ||
-              !(entry.free || entry.uncompressed)) {
-            error('Invalid entry in XRef subsection: ' + first + ', ' + count);
-          }
-
-          if (!this.entries[i + first])
-            this.entries[i + first] = entry;
-        }
-      }
-
-      // 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
-      if (!isCmd(obj, 'trailer'))
-        error('Invalid XRef table: could not find trailer dictionary');
-
-      // Read trailer dictionary, e.g.
-      // trailer
-      //    << /Size 22
-      //      /Root 20R
-      //      /Info 10R
-      //      /ID [ <81b14aafa313db63dbd6f981e49f94f4> ]
-      //    >>
-      // The parser goes through the entire stream << ... >> and provides
-      // a getter interface for the key-value table
-      var dict = parser.getObj();
-      if (!isDict(dict))
-        error('Invalid XRef table: could not parse trailer dictionary');
-
-      return dict;
-    },
-    readXRefStream: function XRef_readXRefStream(stream) {
-      var streamParameters = stream.parameters;
-      var byteWidths = streamParameters.get('W');
-      var range = streamParameters.get('Index');
-      if (!range)
-        range = [0, streamParameters.get('Size')];
-      var i, j;
-      while (range.length > 0) {
-        var first = range[0], n = range[1];
-        if (!isInt(first) || !isInt(n))
-          error('Invalid XRef range fields: ' + first + ', ' + n);
-        var typeFieldWidth = byteWidths[0];
-        var offsetFieldWidth = byteWidths[1];
-        var generationFieldWidth = byteWidths[2];
-        if (!isInt(typeFieldWidth) || !isInt(offsetFieldWidth) ||
-            !isInt(generationFieldWidth)) {
-          error('Invalid XRef entry fields length: ' + first + ', ' + n);
-        }
-        for (i = 0; i < n; ++i) {
-          var type = 0, offset = 0, generation = 0;
-          for (j = 0; j < typeFieldWidth; ++j)
-            type = (type << 8) | stream.getByte();
-          // if type field is absent, its default value = 1
-          if (typeFieldWidth == 0)
-            type = 1;
-          for (j = 0; j < offsetFieldWidth; ++j)
-            offset = (offset << 8) | stream.getByte();
-          for (j = 0; j < generationFieldWidth; ++j)
-            generation = (generation << 8) | stream.getByte();
-          var entry = {};
-          entry.offset = offset;
-          entry.gen = generation;
-          switch (type) {
-            case 0:
-              entry.free = true;
-              break;
-            case 1:
-              entry.uncompressed = true;
-              break;
-            case 2:
-              break;
-            default:
-              error('Invalid XRef entry type: ' + type);
-          }
-          if (!this.entries[first + i])
-            this.entries[first + i] = entry;
-        }
-        range.splice(0, 2);
-      }
-      return streamParameters;
-    },
-    indexObjects: function XRef_indexObjects() {
-      // Simple scan through the PDF content to find objects,
-      // trailers and XRef streams.
-      function readToken(data, offset) {
-        var token = '', ch = data[offset];
-        while (ch !== 13 && ch !== 10) {
-          if (++offset >= data.length)
-            break;
-          token += String.fromCharCode(ch);
-          ch = data[offset];
-        }
-        return token;
-      }
-      function skipUntil(data, offset, what) {
-        var length = what.length, dataLength = data.length;
-        var skipped = 0;
-        // finding byte sequence
-        while (offset < dataLength) {
-          var i = 0;
-          while (i < length && data[offset + i] == what[i])
-            ++i;
-          if (i >= length)
-            break; // sequence found
-
-          offset++;
-          skipped++;
-        }
-        return skipped;
-      }
-      var trailerBytes = new Uint8Array([116, 114, 97, 105, 108, 101, 114]);
-      var startxrefBytes = new Uint8Array([115, 116, 97, 114, 116, 120, 114,
-                                          101, 102]);
-      var endobjBytes = new Uint8Array([101, 110, 100, 111, 98, 106]);
-      var xrefBytes = new Uint8Array([47, 88, 82, 101, 102]);
-
-      var stream = this.stream;
-      stream.pos = 0;
-      var buffer = stream.getBytes();
-      var position = stream.start, length = buffer.length;
-      var trailers = [], xrefStms = [];
-      var state = 0;
-      var currentToken;
-      while (position < length) {
-        var ch = buffer[position];
-        if (ch === 32 || ch === 9 || ch === 13 || ch === 10) {
-          ++position;
-          continue;
-        }
-        if (ch === 37) { // %-comment
-          do {
-            ++position;
-            ch = buffer[position];
-          } while (ch !== 13 && ch !== 10);
-          continue;
-        }
-        var token = readToken(buffer, position);
-        var m;
-        if (token === 'xref') {
-          position += skipUntil(buffer, position, trailerBytes);
-          trailers.push(position);
-          position += skipUntil(buffer, position, startxrefBytes);
-        } else if ((m = /^(\d+)\s+(\d+)\s+obj\b/.exec(token))) {
-          this.entries[m[1]] = {
-            offset: position,
-            gen: m[2] | 0,
-            uncompressed: true
-          };
-
-          var contentLength = skipUntil(buffer, position, endobjBytes) + 7;
-          var content = buffer.subarray(position, position + contentLength);
-
-          // checking XRef stream suspect
-          // (it shall have '/XRef' and next char is not a letter)
-          var xrefTagOffset = skipUntil(content, 0, xrefBytes);
-          if (xrefTagOffset < contentLength &&
-              content[xrefTagOffset + 5] < 64) {
-            xrefStms.push(position);
-            this.xrefstms[position] = 1; // don't read it recursively
-          }
-
-          position += contentLength;
-        } else
-          position += token.length + 1;
-      }
-      // reading XRef streams
-      for (var i = 0, ii = xrefStms.length; i < ii; ++i) {
-          this.readXRef(xrefStms[i], true);
-      }
-      // finding main trailer
-      var dict;
-      for (var i = 0, ii = trailers.length; i < ii; ++i) {
-        stream.pos = trailers[i];
-        var parser = new Parser(new Lexer(stream), true, null);
-        var obj = parser.getObj();
-        if (!isCmd(obj, 'trailer'))
-          continue;
-        // read the trailer dictionary
-        if (!isDict(dict = parser.getObj()))
-          continue;
-        // taking the first one with 'ID'
-        if (dict.has('ID'))
-          return dict;
-      }
-      // no tailer with 'ID', taking last one (if exists)
-      if (dict)
-        return dict;
-      // nothing helps
-      error('Invalid PDF structure');
-    },
-    readXRef: function XRef_readXRef(startXRef, recoveryMode) {
-      var stream = this.stream;
-      stream.pos = startXRef;
-
-      try {
-        var parser = new Parser(new Lexer(stream), true, null);
-        var obj = parser.getObj();
-        var dict;
-
-        // Get dictionary
-        if (isCmd(obj, 'xref')) {
-          // Parse end-of-file XRef
-          dict = this.readXRefTable(parser);
-
-          // Recursively get other XRefs 'XRefStm', if any
-          obj = dict.get('XRefStm');
-          if (isInt(obj)) {
-            var pos = obj;
-            // ignore previously loaded xref streams
-            // (possible infinite recursion)
-            if (!(pos in this.xrefstms)) {
-              this.xrefstms[pos] = 1;
-              this.readXRef(pos);
-            }
-          }
-        } else if (isInt(obj)) {
-          // Parse in-stream XRef
-          if (!isInt(parser.getObj()) ||
-              !isCmd(parser.getObj(), 'obj') ||
-              !isStream(obj = parser.getObj())) {
-            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, 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, recoveryMode);
-        }
-
-        return dict;
-      } catch (e) {
-        log('(while reading XRef): ' + e);
-      }
-
-      if (recoveryMode)
-        return;
-
-      warn('Indexing all PDF objects');
-      return this.indexObjects();
-    },
-    getEntry: function XRef_getEntry(i) {
-      var e = this.entries[i];
-      if (e === null)
-        return null;
-      return e.free ? null : e; // returns null is the entry is free
-    },
-    fetchIfRef: function XRef_fetchIfRef(obj) {
-      if (!isRef(obj))
-        return obj;
-      return this.fetch(obj);
-    },
-    fetch: function XRef_fetch(ref, suppressEncryption) {
-      assertWellFormed(isRef(ref), 'ref object is not a reference');
-      var num = ref.num;
-      if (num in this.cache)
-        return this.cache[num];
-
-      var e = this.getEntry(num);
-
-      // the referenced entry can be free
-      if (e === null)
-        return (this.cache[num] = e);
-
-      var gen = ref.gen;
-      var stream, parser;
-      if (e.uncompressed) {
-        if (e.gen != gen)
-          error('inconsistent generation in XRef');
-        stream = this.stream.makeSubStream(e.offset);
-        parser = new Parser(new Lexer(stream), true, this);
-        var obj1 = parser.getObj();
-        var obj2 = parser.getObj();
-        var obj3 = parser.getObj();
-        if (!isInt(obj1) || obj1 != num ||
-            !isInt(obj2) || obj2 != gen ||
-            !isCmd(obj3)) {
-          error('bad XRef entry');
-        }
-        if (!isCmd(obj3, 'obj')) {
-          // some bad pdfs use "obj1234" and really mean 1234
-          if (obj3.cmd.indexOf('obj') == 0) {
-            num = parseInt(obj3.cmd.substring(3), 10);
-            if (!isNaN(num))
-              return num;
-          }
-          error('bad XRef entry');
-        }
-        if (this.encrypt && !suppressEncryption) {
-          try {
-            e = parser.getObj(this.encrypt.createCipherTransform(num, gen));
-          } catch (ex) {
-            // almost all streams must be encrypted, but sometimes
-            // they are not probably due to some broken generators
-            // re-trying without encryption
-            return this.fetch(ref, true);
-          }
-        } else {
-          e = parser.getObj();
-        }
-        // Don't cache streams since they are mutable (except images).
-        if (!isStream(e) || e instanceof JpegStream)
-          this.cache[num] = e;
-        return e;
-      }
-
-      // compressed entry
-      stream = this.fetch(new Ref(e.offset, 0));
-      if (!isStream(stream))
-        error('bad ObjStm stream');
-      var first = stream.parameters.get('First');
-      var n = stream.parameters.get('N');
-      if (!isInt(first) || !isInt(n)) {
-        error('invalid first and n parameters for ObjStm stream');
-      }
-      parser = new Parser(new Lexer(stream), false, this);
-      var i, entries = [], nums = [];
-      // read the object numbers to populate cache
-      for (i = 0; i < n; ++i) {
-        num = parser.getObj();
-        if (!isInt(num)) {
-          error('invalid object number in the ObjStm stream: ' + num);
-        }
-        nums.push(num);
-        var offset = parser.getObj();
-        if (!isInt(offset)) {
-          error('invalid object offset in the ObjStm stream: ' + offset);
-        }
-      }
-      // read stream objects for cache
-      for (i = 0; i < n; ++i) {
-        entries.push(parser.getObj());
-        this.cache[nums[i]] = entries[i];
-      }
-      e = entries[e.gen];
-      if (!e) {
-        error('bad XRef entry for compressed object');
-      }
-      return e;
-    },
-    getCatalogObj: function XRef_getCatalogObj() {
-      return this.root;
-    }
-  };
-
-  return XRef;
-})();
-
-/**
- * A PDF document and page is built of many objects. E.g. there are objects
- * for fonts, images, rendering code and such. These objects might get processed
- * inside of a worker. The `PDFObjects` implements some basic functions to
- * manage these objects.
- */
-var PDFObjects = (function PDFObjectsClosure() {
-  function PDFObjects() {
-    this.objs = {};
-  }
-
-  PDFObjects.prototype = {
-    objs: null,
-
-    /**
-     * Internal function.
-     * Ensures there is an object defined for `objId`. Stores `data` on the
-     * object *if* it is created.
-     */
-    ensureObj: function PDFObjects_ensureObj(objId, data) {
-      if (this.objs[objId])
-        return this.objs[objId];
-      return this.objs[objId] = new Promise(objId, data);
-    },
-
-    /**
-     * If called *without* callback, this returns the data of `objId` but the
-     * object needs to be resolved. If it isn't, this function throws.
-     *
-     * If called *with* a callback, the callback is called with the data of the
-     * object once the object is resolved. That means, if you call this
-     * function and the object is already resolved, the callback gets called
-     * right away.
-     */
-    get: function PDFObjects_get(objId, callback) {
-      // If there is a callback, then the get can be async and the object is
-      // not required to be resolved right now
-      if (callback) {
-        this.ensureObj(objId).then(callback);
-        return null;
-      }
-
-      // If there isn't a callback, the user expects to get the resolved data
-      // directly.
-      var obj = this.objs[objId];
-
-      // If there isn't an object yet or the object isn't resolved, then the
-      // data isn't ready yet!
-      if (!obj || !obj.isResolved)
-        error('Requesting object that isn\'t resolved yet ' + objId);
-
-      return obj.data;
-    },
-
-    /**
-     * Resolves the object `objId` with optional `data`.
-     */
-    resolve: function PDFObjects_resolve(objId, data) {
-      var objs = this.objs;
-
-      // In case there is a promise already on this object, just resolve it.
-      if (objs[objId]) {
-        objs[objId].resolve(data);
-      } else {
-        this.ensureObj(objId, data);
-      }
-    },
-
-    onData: function PDFObjects_onData(objId, callback) {
-      this.ensureObj(objId).onData(callback);
-    },
-
-    isResolved: function PDFObjects_isResolved(objId) {
-      var objs = this.objs;
-      if (!objs[objId]) {
-        return false;
-      } else {
-        return objs[objId].isResolved;
-      }
-    },
-
-    hasData: function PDFObjects_hasData(objId) {
-      var objs = this.objs;
-      if (!objs[objId]) {
-        return false;
-      } else {
-        return objs[objId].hasData;
-      }
-    },
-
-    /**
-     * Sets the data of an object but *doesn't* resolve it.
-     */
-    setData: function PDFObjects_setData(objId, data) {
-      // Watchout! If you call `this.ensureObj(objId, data)` you're going to
-      // create a *resolved* promise which shouldn't be the case!
-      this.ensureObj(objId).data = data;
-    }
-  };
-  return PDFObjects;
-})();
-
-
-/* -*- 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 PDFFunction = (function PDFFunctionClosure() {
-  var CONSTRUCT_SAMPLED = 0;
-  var CONSTRUCT_INTERPOLATED = 2;
-  var CONSTRUCT_STICHED = 3;
-  var CONSTRUCT_POSTSCRIPT = 4;
-
-  return {
-    getSampleArray: function PDFFunction_getSampleArray(size, outputSize, bps,
-                                                       str) {
-      var length = 1;
-      for (var i = 0, ii = size.length; i < ii; i++)
-        length *= size[i];
-      length *= outputSize;
-
-      var array = [];
-      var codeSize = 0;
-      var codeBuf = 0;
-      // 32 is a valid bps so shifting won't work
-      var sampleMul = 1.0 / (Math.pow(2.0, bps) - 1);
-
-      var strBytes = str.getBytes((length * bps + 7) / 8);
-      var strIdx = 0;
-      for (var i = 0; i < length; i++) {
-        while (codeSize < bps) {
-          codeBuf <<= 8;
-          codeBuf |= strBytes[strIdx++];
-          codeSize += 8;
-        }
-        codeSize -= bps;
-        array.push((codeBuf >> codeSize) * sampleMul);
-        codeBuf &= (1 << codeSize) - 1;
-      }
-      return array;
-    },
-
-    getIR: function PDFFunction_getIR(xref, fn) {
-      var dict = fn.dict;
-      if (!dict)
-        dict = fn;
-
-      var types = [this.constructSampled,
-                   null,
-                   this.constructInterpolated,
-                   this.constructStiched,
-                   this.constructPostScript];
-
-      var typeNum = dict.get('FunctionType');
-      var typeFn = types[typeNum];
-      if (!typeFn)
-        error('Unknown type of function');
-
-      return typeFn.call(this, fn, dict, xref);
-    },
-
-    fromIR: function PDFFunction_fromIR(IR) {
-      var type = IR[0];
-      switch (type) {
-        case CONSTRUCT_SAMPLED:
-          return this.constructSampledFromIR(IR);
-        case CONSTRUCT_INTERPOLATED:
-          return this.constructInterpolatedFromIR(IR);
-        case CONSTRUCT_STICHED:
-          return this.constructStichedFromIR(IR);
-        case CONSTRUCT_POSTSCRIPT:
-        default:
-          return this.constructPostScriptFromIR(IR);
-      }
-    },
-
-    parse: function PDFFunction_parse(xref, fn) {
-      var IR = this.getIR(xref, fn);
-      return this.fromIR(IR);
-    },
-
-    constructSampled: function PDFFunction_constructSampled(str, dict) {
-      function toMultiArray(arr) {
-        var inputLength = arr.length;
-        var outputLength = arr.length / 2;
-        var out = [];
-        var index = 0;
-        for (var i = 0; i < inputLength; i += 2) {
-          out[index] = [arr[i], arr[i + 1]];
-          ++index;
-        }
-        return out;
-      }
-      var domain = dict.get('Domain');
-      var range = dict.get('Range');
-
-      if (!domain || !range)
-        error('No domain or range');
-
-      var inputSize = domain.length / 2;
-      var outputSize = range.length / 2;
-
-      domain = toMultiArray(domain);
-      range = toMultiArray(range);
-
-      var size = dict.get('Size');
-      var bps = dict.get('BitsPerSample');
-      var order = dict.get('Order');
-      if (!order)
-        order = 1;
-      if (order !== 1)
-        error('No support for cubic spline interpolation: ' + order);
-
-      var encode = dict.get('Encode');
-      if (!encode) {
-        encode = [];
-        for (var i = 0; i < inputSize; ++i) {
-          encode.push(0);
-          encode.push(size[i] - 1);
-        }
-      }
-      encode = toMultiArray(encode);
-
-      var decode = dict.get('Decode');
-      if (!decode)
-        decode = range;
-      else
-        decode = toMultiArray(decode);
-
-      var samples = this.getSampleArray(size, outputSize, bps, str);
-
-      return [
-        CONSTRUCT_SAMPLED, inputSize, domain, encode, decode, samples, size,
-        outputSize, Math.pow(2, bps) - 1, range
-      ];
-    },
-
-    constructSampledFromIR: function PDFFunction_constructSampledFromIR(IR) {
-      // See chapter 3, page 109 of the PDF reference
-      function interpolate(x, xmin, xmax, ymin, ymax) {
-        return ymin + ((x - xmin) * ((ymax - ymin) / (xmax - xmin)));
-      }
-
-      return function constructSampledFromIRResult(args) {
-        // See chapter 3, page 110 of the PDF reference.
-        var m = IR[1];
-        var domain = IR[2];
-        var encode = IR[3];
-        var decode = IR[4];
-        var samples = IR[5];
-        var size = IR[6];
-        var n = IR[7];
-        var mask = IR[8];
-        var range = IR[9];
-
-        if (m != args.length)
-          error('Incorrect number of arguments: ' + inputSize + ' != ' +
-                args.length);
-
-        var x = args;
-
-        // Building the cube vertices: its part and sample index
-        // http://rjwagner49.com/Mathematics/Interpolation.pdf
-        var cubeVertices = 1 << m;
-        var cubeN = new Float64Array(cubeVertices);
-        var cubeVertex = new Uint32Array(cubeVertices);
-        for (var j = 0; j < cubeVertices; j++)
-          cubeN[j] = 1;
-
-        var k = n, pos = 1;
-        // Map x_i to y_j for 0 <= i < m using the sampled function.
-        for (var i = 0; i < m; ++i) {
-          // x_i' = min(max(x_i, Domain_2i), Domain_2i+1)
-          var domain_2i = domain[i][0];
-          var domain_2i_1 = domain[i][1];
-          var xi = Math.min(Math.max(x[i], domain_2i), domain_2i_1);
-
-          // e_i = Interpolate(x_i', Domain_2i, Domain_2i+1,
-          //                   Encode_2i, Encode_2i+1)
-          var e = interpolate(xi, domain_2i, domain_2i_1,
-                              encode[i][0], encode[i][1]);
-
-          // e_i' = min(max(e_i, 0), Size_i - 1)
-          var size_i = size[i];
-          e = Math.min(Math.max(e, 0), size_i - 1);
-
-          // Adjusting the cube: N and vertex sample index
-          var e0 = e < size_i - 1 ? Math.floor(e) : e - 1; // e1 = e0 + 1;
-          var n0 = e0 + 1 - e; // (e1 - e) / (e1 - e0);
-          var n1 = e - e0; // (e - e0) / (e1 - e0);
-          var offset0 = e0 * k;
-          var offset1 = offset0 + k; // e1 * k
-          for (var j = 0; j < cubeVertices; j++) {
-            if (j & pos) {
-              cubeN[j] *= n1;
-              cubeVertex[j] += offset1;
-            } else {
-              cubeN[j] *= n0;
-              cubeVertex[j] += offset0;
-            }
-          }
-
-          k *= size_i;
-          pos <<= 1;
-        }
-
-        var y = new Float64Array(n);
-        for (var j = 0; j < n; ++j) {
-          // Sum all cube vertices' samples portions
-          var rj = 0;
-          for (var i = 0; i < cubeVertices; i++)
-            rj += samples[cubeVertex[i] + j] * cubeN[i];
-
-          // r_j' = Interpolate(r_j, 0, 2^BitsPerSample - 1,
-          //                    Decode_2j, Decode_2j+1)
-          rj = interpolate(rj, 0, 1, decode[j][0], decode[j][1]);
-
-          // y_j = min(max(r_j, range_2j), range_2j+1)
-          y[j] = Math.min(Math.max(rj, range[j][0]), range[j][1]);
-        }
-
-        return y;
-      }
-    },
-
-    constructInterpolated: function PDFFunction_constructInterpolated(str,
-                                                                      dict) {
-      var c0 = dict.get('C0') || [0];
-      var c1 = dict.get('C1') || [1];
-      var n = dict.get('N');
-
-      if (!isArray(c0) || !isArray(c1))
-        error('Illegal dictionary for interpolated function');
-
-      var length = c0.length;
-      var diff = [];
-      for (var i = 0; i < length; ++i)
-        diff.push(c1[i] - c0[i]);
-
-      return [CONSTRUCT_INTERPOLATED, c0, diff, n];
-    },
-
-    constructInterpolatedFromIR:
-      function PDFFunction_constructInterpolatedFromIR(IR) {
-      var c0 = IR[1];
-      var diff = IR[2];
-      var n = IR[3];
-
-      var length = diff.length;
-
-      return function constructInterpolatedFromIRResult(args) {
-        var x = n == 1 ? args[0] : Math.pow(args[0], n);
-
-        var out = [];
-        for (var j = 0; j < length; ++j)
-          out.push(c0[j] + (x * diff[j]));
-
-        return out;
-
-      }
-    },
-
-    constructStiched: function PDFFunction_constructStiched(fn, dict, xref) {
-      var domain = dict.get('Domain');
-
-      if (!domain)
-        error('No domain');
-
-      var inputSize = domain.length / 2;
-      if (inputSize != 1)
-        error('Bad domain for stiched function');
-
-      var fnRefs = dict.get('Functions');
-      var fns = [];
-      for (var i = 0, ii = fnRefs.length; i < ii; ++i)
-        fns.push(PDFFunction.getIR(xref, xref.fetchIfRef(fnRefs[i])));
-
-      var bounds = dict.get('Bounds');
-      var encode = dict.get('Encode');
-
-      return [CONSTRUCT_STICHED, domain, bounds, encode, fns];
-    },
-
-    constructStichedFromIR: function PDFFunction_constructStichedFromIR(IR) {
-      var domain = IR[1];
-      var bounds = IR[2];
-      var encode = IR[3];
-      var fnsIR = IR[4];
-      var fns = [];
-
-      for (var i = 0, ii = fnsIR.length; i < ii; i++) {
-        fns.push(PDFFunction.fromIR(fnsIR[i]));
-      }
-
-      return function constructStichedFromIRResult(args) {
-        var clip = function constructStichedFromIRClip(v, min, max) {
-          if (v > max)
-            v = max;
-          else if (v < min)
-            v = min;
-          return v;
-        };
-
-        // clip to domain
-        var v = clip(args[0], domain[0], domain[1]);
-        // calulate which bound the value is in
-        for (var i = 0, ii = bounds.length; i < ii; ++i) {
-          if (v < bounds[i])
-            break;
-        }
-
-        // encode value into domain of function
-        var dmin = domain[0];
-        if (i > 0)
-          dmin = bounds[i - 1];
-        var dmax = domain[1];
-        if (i < bounds.length)
-          dmax = bounds[i];
-
-        var rmin = encode[2 * i];
-        var rmax = encode[2 * i + 1];
-
-        var v2 = rmin + (v - dmin) * (rmax - rmin) / (dmax - dmin);
-
-        // call the appropropriate function
-        return fns[i]([v2]);
-      };
-    },
-
-    constructPostScript: function PDFFunction_constructPostScript(fn, dict,
-                                                                  xref) {
-      var domain = dict.get('Domain');
-      var range = dict.get('Range');
-
-      if (!domain)
-        error('No domain.');
-
-      if (!range)
-        error('No range.');
-
-      var lexer = new PostScriptLexer(fn);
-      var parser = new PostScriptParser(lexer);
-      var code = parser.parse();
-
-      return [CONSTRUCT_POSTSCRIPT, domain, range, code];
-    },
-
-    constructPostScriptFromIR: function PDFFunction_constructPostScriptFromIR(
-                                          IR) {
-      var domain = IR[1];
-      var range = IR[2];
-      var code = IR[3];
-      var numOutputs = range.length / 2;
-      var evaluator = new PostScriptEvaluator(code);
-      // Cache the values for a big speed up, the cache size is limited though
-      // since the number of possible values can be huge from a PS function.
-      var cache = new FunctionCache();
-      return function constructPostScriptFromIRResult(args) {
-        var initialStack = [];
-        for (var i = 0, ii = (domain.length / 2); i < ii; ++i) {
-          initialStack.push(args[i]);
-        }
-
-        var key = initialStack.join('_');
-        if (cache.has(key))
-          return cache.get(key);
-
-        var stack = evaluator.execute(initialStack);
-        var transformed = [];
-        for (i = numOutputs - 1; i >= 0; --i) {
-          var out = stack.pop();
-          var rangeIndex = 2 * i;
-          if (out < range[rangeIndex])
-            out = range[rangeIndex];
-          else if (out > range[rangeIndex + 1])
-            out = range[rangeIndex + 1];
-          transformed[i] = out;
-        }
-        cache.set(key, transformed);
-        return transformed;
-      };
-    }
-  };
-})();
-
-var FunctionCache = (function FunctionCacheClosure() {
-  // Of 10 PDF's with type4 functions the maxium number of distinct values seen
-  // was 256. This still may need some tweaking in the future though.
-  var MAX_CACHE_SIZE = 1024;
-  function FunctionCache() {
-    this.cache = {};
-    this.total = 0;
-  }
-  FunctionCache.prototype = {
-    has: function FunctionCache_has(key) {
-      return key in this.cache;
-    },
-    get: function FunctionCache_get(key) {
-      return this.cache[key];
-    },
-    set: function FunctionCache_set(key, value) {
-      if (this.total < MAX_CACHE_SIZE) {
-        this.cache[key] = value;
-        this.total++;
-      }
-    }
-  };
-  return FunctionCache;
-})();
-
-var PostScriptStack = (function PostScriptStackClosure() {
-  var MAX_STACK_SIZE = 100;
-  function PostScriptStack(initialStack) {
-    this.stack = initialStack || [];
-  }
-
-  PostScriptStack.prototype = {
-    push: function PostScriptStack_push(value) {
-      if (this.stack.length >= MAX_STACK_SIZE)
-        error('PostScript function stack overflow.');
-      this.stack.push(value);
-    },
-    pop: function PostScriptStack_pop() {
-      if (this.stack.length <= 0)
-        error('PostScript function stack underflow.');
-      return this.stack.pop();
-    },
-    copy: function PostScriptStack_copy(n) {
-      if (this.stack.length + n >= MAX_STACK_SIZE)
-        error('PostScript function stack overflow.');
-      var stack = this.stack;
-      for (var i = stack.length - n, j = n - 1; j >= 0; j--, i++)
-        stack.push(stack[i]);
-    },
-    index: function PostScriptStack_index(n) {
-      this.push(this.stack[this.stack.length - n - 1]);
-    },
-    // rotate the last n stack elements p times
-    roll: function PostScriptStack_roll(n, p) {
-      var stack = this.stack;
-      var l = stack.length - n;
-      var r = stack.length - 1, c = l + (p - Math.floor(p / n) * n), i, j, t;
-      for (i = l, j = r; i < j; i++, j--) {
-        t = stack[i]; stack[i] = stack[j]; stack[j] = t;
-      }
-      for (i = l, j = c - 1; i < j; i++, j--) {
-        t = stack[i]; stack[i] = stack[j]; stack[j] = t;
-      }
-      for (i = c, j = r; i < j; i++, j--) {
-        t = stack[i]; stack[i] = stack[j]; stack[j] = t;
-      }
-    }
-  };
-  return PostScriptStack;
-})();
-var PostScriptEvaluator = (function PostScriptEvaluatorClosure() {
-  function PostScriptEvaluator(operators, operands) {
-    this.operators = operators;
-    this.operands = operands;
-  }
-  PostScriptEvaluator.prototype = {
-    execute: function PostScriptEvaluator_execute(initialStack) {
-      var stack = new PostScriptStack(initialStack);
-      var counter = 0;
-      var operators = this.operators;
-      var length = operators.length;
-      var operator, a, b;
-      while (counter < length) {
-        operator = operators[counter++];
-        if (typeof operator == 'number') {
-          // Operator is really an operand and should be pushed to the stack.
-          stack.push(operator);
-          continue;
-        }
-        switch (operator) {
-          // non standard ps operators
-          case 'jz': // jump if false
-            b = stack.pop();
-            a = stack.pop();
-            if (!a)
-              counter = b;
-            break;
-          case 'j': // jump
-            a = stack.pop();
-            counter = a;
-            break;
-
-          // all ps operators in alphabetical order (excluding if/ifelse)
-          case 'abs':
-            a = stack.pop();
-            stack.push(Math.abs(a));
-            break;
-          case 'add':
-            b = stack.pop();
-            a = stack.pop();
-            stack.push(a + b);
-            break;
-          case 'and':
-            b = stack.pop();
-            a = stack.pop();
-            if (isBool(a) && isBool(b))
-              stack.push(a && b);
-            else
-              stack.push(a & b);
-            break;
-          case 'atan':
-            a = stack.pop();
-            stack.push(Math.atan(a));
-            break;
-          case 'bitshift':
-            b = stack.pop();
-            a = stack.pop();
-            if (a > 0)
-              stack.push(a << b);
-            else
-              stack.push(a >> b);
-            break;
-          case 'ceiling':
-            a = stack.pop();
-            stack.push(Math.ceil(a));
-            break;
-          case 'copy':
-            a = stack.pop();
-            stack.copy(a);
-            break;
-          case 'cos':
-            a = stack.pop();
-            stack.push(Math.cos(a));
-            break;
-          case 'cvi':
-            a = stack.pop() | 0;
-            stack.push(a);
-            break;
-          case 'cvr':
-            // noop
-            break;
-          case 'div':
-            b = stack.pop();
-            a = stack.pop();
-            stack.push(a / b);
-            break;
-          case 'dup':
-            stack.copy(1);
-            break;
-          case 'eq':
-            b = stack.pop();
-            a = stack.pop();
-            stack.push(a == b);
-            break;
-          case 'exch':
-            stack.roll(2, 1);
-            break;
-          case 'exp':
-            b = stack.pop();
-            a = stack.pop();
-            stack.push(Math.pow(a, b));
-            break;
-          case 'false':
-            stack.push(false);
-            break;
-          case 'floor':
-            a = stack.pop();
-            stack.push(Math.floor(a));
-            break;
-          case 'ge':
-            b = stack.pop();
-            a = stack.pop();
-            stack.push(a >= b);
-            break;
-          case 'gt':
-            b = stack.pop();
-            a = stack.pop();
-            stack.push(a > b);
-            break;
-          case 'idiv':
-            b = stack.pop();
-            a = stack.pop();
-            stack.push((a / b) | 0);
-            break;
-          case 'index':
-            a = stack.pop();
-            stack.index(a);
-            break;
-          case 'le':
-            b = stack.pop();
-            a = stack.pop();
-            stack.push(a <= b);
-            break;
-          case 'ln':
-            a = stack.pop();
-            stack.push(Math.log(a));
-            break;
-          case 'log':
-            a = stack.pop();
-            stack.push(Math.log(a) / Math.LN10);
-            break;
-          case 'lt':
-            b = stack.pop();
-            a = stack.pop();
-            stack.push(a < b);
-            break;
-          case 'mod':
-            b = stack.pop();
-            a = stack.pop();
-            stack.push(a % b);
-            break;
-          case 'mul':
-            b = stack.pop();
-            a = stack.pop();
-            stack.push(a * b);
-            break;
-          case 'ne':
-            b = stack.pop();
-            a = stack.pop();
-            stack.push(a != b);
-            break;
-          case 'neg':
-            a = stack.pop();
-            stack.push(-b);
-            break;
-          case 'not':
-            a = stack.pop();
-            if (isBool(a) && isBool(b))
-              stack.push(a && b);
-            else
-              stack.push(a & b);
-            break;
-          case 'or':
-            b = stack.pop();
-            a = stack.pop();
-            if (isBool(a) && isBool(b))
-              stack.push(a || b);
-            else
-              stack.push(a | b);
-            break;
-          case 'pop':
-            stack.pop();
-            break;
-          case 'roll':
-            b = stack.pop();
-            a = stack.pop();
-            stack.roll(a, b);
-            break;
-          case 'round':
-            a = stack.pop();
-            stack.push(Math.round(a));
-            break;
-          case 'sin':
-            a = stack.pop();
-            stack.push(Math.sin(a));
-            break;
-          case 'sqrt':
-            a = stack.pop();
-            stack.push(Math.sqrt(a));
-            break;
-          case 'sub':
-            b = stack.pop();
-            a = stack.pop();
-            stack.push(a - b);
-            break;
-          case 'true':
-            stack.push(true);
-            break;
-          case 'truncate':
-            a = stack.pop();
-            a = a < 0 ? Math.ceil(a) : Math.floor(a);
-            stack.push(a);
-            break;
-          case 'xor':
-            b = stack.pop();
-            a = stack.pop();
-            if (isBool(a) && isBool(b))
-              stack.push(a != b);
-            else
-              stack.push(a ^ b);
-            break;
-          default:
-            error('Unknown operator ' + operator);
-            break;
-        }
-      }
-      return stack.stack;
-    }
-  };
-  return PostScriptEvaluator;
-})();
-
-var PostScriptParser = (function PostScriptParserClosure() {
-  function PostScriptParser(lexer) {
-    this.lexer = lexer;
-    this.operators = [];
-    this.token;
-    this.prev;
-  }
-  PostScriptParser.prototype = {
-    nextToken: function PostScriptParser_nextToken() {
-      this.prev = this.token;
-      this.token = this.lexer.getToken();
-    },
-    accept: function PostScriptParser_accept(type) {
-      if (this.token.type == type) {
-        this.nextToken();
-        return true;
-      }
-      return false;
-    },
-    expect: function PostScriptParser_expect(type) {
-      if (this.accept(type))
-        return true;
-      error('Unexpected symbol: found ' + this.token.type + ' expected ' +
-            type + '.');
-    },
-    parse: function PostScriptParser_parse() {
-      this.nextToken();
-      this.expect(PostScriptTokenTypes.LBRACE);
-      this.parseBlock();
-      this.expect(PostScriptTokenTypes.RBRACE);
-      return this.operators;
-    },
-    parseBlock: function PostScriptParser_parseBlock() {
-      while (true) {
-        if (this.accept(PostScriptTokenTypes.NUMBER)) {
-          this.operators.push(this.prev.value);
-        } else if (this.accept(PostScriptTokenTypes.OPERATOR)) {
-          this.operators.push(this.prev.value);
-        } else if (this.accept(PostScriptTokenTypes.LBRACE)) {
-          this.parseCondition();
-        } else {
-          return;
-        }
-      }
-    },
-    parseCondition: function PostScriptParser_parseCondition() {
-      // Add two place holders that will be updated later
-      var conditionLocation = this.operators.length;
-      this.operators.push(null, null);
-
-      this.parseBlock();
-      this.expect(PostScriptTokenTypes.RBRACE);
-      if (this.accept(PostScriptTokenTypes.IF)) {
-        // The true block is right after the 'if' so it just falls through on
-        // true else it jumps and skips the true block.
-        this.operators[conditionLocation] = this.operators.length;
-        this.operators[conditionLocation + 1] = 'jz';
-      } else if (this.accept(PostScriptTokenTypes.LBRACE)) {
-        var jumpLocation = this.operators.length;
-        this.operators.push(null, null);
-        var endOfTrue = this.operators.length;
-        this.parseBlock();
-        this.expect(PostScriptTokenTypes.RBRACE);
-        this.expect(PostScriptTokenTypes.IFELSE);
-        // The jump is added at the end of the true block to skip the false
-        // block.
-        this.operators[jumpLocation] = this.operators.length;
-        this.operators[jumpLocation + 1] = 'j';
-
-        this.operators[conditionLocation] = endOfTrue;
-        this.operators[conditionLocation + 1] = 'jz';
-      } else {
-        error('PS Function: error parsing conditional.');
-      }
-    }
-  };
-  return PostScriptParser;
-})();
-
-var PostScriptTokenTypes = {
-  LBRACE: 0,
-  RBRACE: 1,
-  NUMBER: 2,
-  OPERATOR: 3,
-  IF: 4,
-  IFELSE: 5
-};
-
-var PostScriptToken = (function PostScriptTokenClosure() {
-  function PostScriptToken(type, value) {
-    this.type = type;
-    this.value = value;
-  }
-
-  var opCache = {};
-
-  PostScriptToken.getOperator = function PostScriptToken_getOperator(op) {
-    var opValue = opCache[op];
-    if (opValue)
-      return opValue;
-
-    return opCache[op] = new PostScriptToken(PostScriptTokenTypes.OPERATOR, op);
-  };
-
-  PostScriptToken.LBRACE = new PostScriptToken(PostScriptTokenTypes.LBRACE,
-                                                '{');
-  PostScriptToken.RBRACE = new PostScriptToken(PostScriptTokenTypes.RBRACE,
-                                                '}');
-  PostScriptToken.IF = new PostScriptToken(PostScriptTokenTypes.IF, 'IF');
-  PostScriptToken.IFELSE = new PostScriptToken(PostScriptTokenTypes.IFELSE,
-                                                'IFELSE');
-  return PostScriptToken;
-})();
-
-var PostScriptLexer = (function PostScriptLexerClosure() {
-  function PostScriptLexer(stream) {
-    this.stream = stream;
-  }
-  PostScriptLexer.prototype = {
-    getToken: function PostScriptLexer_getToken() {
-      var s = '';
-      var ch;
-      var comment = false;
-      var stream = this.stream;
-
-      // skip comments
-      while (true) {
-        if (!(ch = stream.getChar()))
-          return EOF;
-
-        if (comment) {
-          if (ch == '\x0a' || ch == '\x0d')
-            comment = false;
-        } else if (ch == '%') {
-          comment = true;
-        } else if (!Lexer.isSpace(ch)) {
-          break;
-        }
-      }
-      switch (ch) {
-        case '0': case '1': case '2': case '3': case '4':
-        case '5': case '6': case '7': case '8': case '9':
-        case '+': case '-': case '.':
-          return new PostScriptToken(PostScriptTokenTypes.NUMBER,
-                                      this.getNumber(ch));
-        case '{':
-          return PostScriptToken.LBRACE;
-        case '}':
-          return PostScriptToken.RBRACE;
-      }
-      // operator
-      var str = ch.toLowerCase();
-      while (true) {
-        ch = stream.lookChar();
-        if (ch === null)
-          break;
-        ch = ch.toLowerCase();
-        if (ch >= 'a' && ch <= 'z')
-          str += ch;
-        else
-          break;
-        stream.skip();
-      }
-      switch (str) {
-        case 'if':
-          return PostScriptToken.IF;
-        case 'ifelse':
-          return PostScriptToken.IFELSE;
-        default:
-          return PostScriptToken.getOperator(str);
-      }
-    },
-    getNumber: function PostScriptLexer_getNumber(ch) {
-      var str = ch;
-      var stream = this.stream;
-      while (true) {
-        ch = stream.lookChar();
-        if ((ch >= '0' && ch <= '9') || ch == '-' || ch == '.')
-          str += ch;
-        else
-          break;
-        stream.skip();
-      }
-      var value = parseFloat(str);
-      if (isNaN(value))
-        error('Invalid floating point number: ' + value);
-      return value;
-    }
-  };
-  return PostScriptLexer;
-})();
-
-
-/* -*- 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 ISOAdobeCharset = [
-  '.notdef', 'space', 'exclam', 'quotedbl', 'numbersign', 'dollar',
-  'percent', 'ampersand', 'quoteright', 'parenleft', 'parenright',
-  'asterisk', 'plus', 'comma', 'hyphen', 'period', 'slash', 'zero',
-  'one', 'two', 'three', 'four', 'five', 'six', 'seven', 'eight',
-  'nine', 'colon', 'semicolon', 'less', 'equal', 'greater', 'question',
-  'at', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M',
-  'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z',
-  'bracketleft', 'backslash', 'bracketright', 'asciicircum', 'underscore',
-  'quoteleft', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l',
-  'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z',
-  'braceleft', 'bar', 'braceright', 'asciitilde', 'exclamdown', 'cent',
-  'sterling', 'fraction', 'yen', 'florin', 'section', 'currency',
-  'quotesingle', 'quotedblleft', 'guillemotleft', 'guilsinglleft',
-  'guilsinglright', 'fi', 'fl', 'endash', 'dagger', 'daggerdbl',
-  'periodcentered', 'paragraph', 'bullet', 'quotesinglbase',
-  'quotedblbase', 'quotedblright', 'guillemotright', 'ellipsis',
-  'perthousand', 'questiondown', 'grave', 'acute', 'circumflex', 'tilde',
-  'macron', 'breve', 'dotaccent', 'dieresis', 'ring', 'cedilla',
-  'hungarumlaut', 'ogonek', 'caron', 'emdash', 'AE', 'ordfeminine',
-  'Lslash', 'Oslash', 'OE', 'ordmasculine', 'ae', 'dotlessi', 'lslash',
-  'oslash', 'oe', 'germandbls', 'onesuperior', 'logicalnot', 'mu',
-  'trademark', 'Eth', 'onehalf', 'plusminus', 'Thorn', 'onequarter',
-  'divide', 'brokenbar', 'degree', 'thorn', 'threequarters', 'twosuperior',
-  'registered', 'minus', 'eth', 'multiply', 'threesuperior', 'copyright',
-  'Aacute', 'Acircumflex', 'Adieresis', 'Agrave', 'Aring', 'Atilde',
-  'Ccedilla', 'Eacute', 'Ecircumflex', 'Edieresis', 'Egrave', 'Iacute',
-  'Icircumflex', 'Idieresis', 'Igrave', 'Ntilde', 'Oacute', 'Ocircumflex',
-  'Odieresis', 'Ograve', 'Otilde', 'Scaron', 'Uacute', 'Ucircumflex',
-  'Udieresis', 'Ugrave', 'Yacute', 'Ydieresis', 'Zcaron', 'aacute',
-  'acircumflex', 'adieresis', 'agrave', 'aring', 'atilde', 'ccedilla',
-  'eacute', 'ecircumflex', 'edieresis', 'egrave', 'iacute', 'icircumflex',
-  'idieresis', 'igrave', 'ntilde', 'oacute', 'ocircumflex', 'odieresis',
-  'ograve', 'otilde', 'scaron', 'uacute', 'ucircumflex', 'udieresis',
-  'ugrave', 'yacute', 'ydieresis', 'zcaron'
-];
-
-var ExpertCharset = [
-  '.notdef', 'space', 'exclamsmall', 'Hungarumlautsmall', 'dollaroldstyle',
-  'dollarsuperior', 'ampersandsmall', 'Acutesmall', 'parenleftsuperior',
-  'parenrightsuperior', 'twodotenleader', 'onedotenleader', 'comma',
-  'hyphen', 'period', 'fraction', 'zerooldstyle', 'oneoldstyle',
-  'twooldstyle', 'threeoldstyle', 'fouroldstyle', 'fiveoldstyle',
-  'sixoldstyle', 'sevenoldstyle', 'eightoldstyle', 'nineoldstyle',
-  'colon', 'semicolon', 'commasuperior', 'threequartersemdash',
-  'periodsuperior', 'questionsmall', 'asuperior', 'bsuperior',
-  'centsuperior', 'dsuperior', 'esuperior', 'isuperior', 'lsuperior',
-  'msuperior', 'nsuperior', 'osuperior', 'rsuperior', 'ssuperior',
-  'tsuperior', 'ff', 'fi', 'fl', 'ffi', 'ffl', 'parenleftinferior',
-  'parenrightinferior', 'Circumflexsmall', 'hyphensuperior', 'Gravesmall',
-  'Asmall', 'Bsmall', 'Csmall', 'Dsmall', 'Esmall', 'Fsmall', 'Gsmall',
-  'Hsmall', 'Ismall', 'Jsmall', 'Ksmall', 'Lsmall', 'Msmall', 'Nsmall',
-  'Osmall', 'Psmall', 'Qsmall', 'Rsmall', 'Ssmall', 'Tsmall', 'Usmall',
-  'Vsmall', 'Wsmall', 'Xsmall', 'Ysmall', 'Zsmall', 'colonmonetary',
-  'onefitted', 'rupiah', 'Tildesmall', 'exclamdownsmall', 'centoldstyle',
-  'Lslashsmall', 'Scaronsmall', 'Zcaronsmall', 'Dieresissmall',
-  'Brevesmall', 'Caronsmall', 'Dotaccentsmall', 'Macronsmall',
-  'figuredash', 'hypheninferior', 'Ogoneksmall', 'Ringsmall',
-  'Cedillasmall', 'onequarter', 'onehalf', 'threequarters',
-  'questiondownsmall', 'oneeighth', 'threeeighths', 'fiveeighths',
-  'seveneighths', 'onethird', 'twothirds', 'zerosuperior', 'onesuperior',
-  'twosuperior', 'threesuperior', 'foursuperior', 'fivesuperior',
-  'sixsuperior', 'sevensuperior', 'eightsuperior', 'ninesuperior',
-  'zeroinferior', 'oneinferior', 'twoinferior', 'threeinferior',
-  'fourinferior', 'fiveinferior', 'sixinferior', 'seveninferior',
-  'eightinferior', 'nineinferior', 'centinferior', 'dollarinferior',
-  'periodinferior', 'commainferior', 'Agravesmall', 'Aacutesmall',
-  'Acircumflexsmall', 'Atildesmall', 'Adieresissmall', 'Aringsmall',
-  'AEsmall', 'Ccedillasmall', 'Egravesmall', 'Eacutesmall',
-  'Ecircumflexsmall', 'Edieresissmall', 'Igravesmall', 'Iacutesmall',
-  'Icircumflexsmall', 'Idieresissmall', 'Ethsmall', 'Ntildesmall',
-  'Ogravesmall', 'Oacutesmall', 'Ocircumflexsmall', 'Otildesmall',
-  'Odieresissmall', 'OEsmall', 'Oslashsmall', 'Ugravesmall', 'Uacutesmall',
-  'Ucircumflexsmall', 'Udieresissmall', 'Yacutesmall', 'Thornsmall',
-  'Ydieresissmall'
-];
-
-var ExpertSubsetCharset = [
-  '.notdef', 'space', 'dollaroldstyle', 'dollarsuperior',
-  'parenleftsuperior', 'parenrightsuperior', 'twodotenleader',
-  'onedotenleader', 'comma', 'hyphen', 'period', 'fraction',
-  'zerooldstyle', 'oneoldstyle', 'twooldstyle', 'threeoldstyle',
-  'fouroldstyle', 'fiveoldstyle', 'sixoldstyle', 'sevenoldstyle',
-  'eightoldstyle', 'nineoldstyle', 'colon', 'semicolon', 'commasuperior',
-  'threequartersemdash', 'periodsuperior', 'asuperior', 'bsuperior',
-  'centsuperior', 'dsuperior', 'esuperior', 'isuperior', 'lsuperior',
-  'msuperior', 'nsuperior', 'osuperior', 'rsuperior', 'ssuperior',
-  'tsuperior', 'ff', 'fi', 'fl', 'ffi', 'ffl', 'parenleftinferior',
-  'parenrightinferior', 'hyphensuperior', 'colonmonetary', 'onefitted',
-  'rupiah', 'centoldstyle', 'figuredash', 'hypheninferior', 'onequarter',
-  'onehalf', 'threequarters', 'oneeighth', 'threeeighths', 'fiveeighths',
-  'seveneighths', 'onethird', 'twothirds', 'zerosuperior', 'onesuperior',
-  'twosuperior', 'threesuperior', 'foursuperior', 'fivesuperior',
-  'sixsuperior', 'sevensuperior', 'eightsuperior', 'ninesuperior',
-  'zeroinferior', 'oneinferior', 'twoinferior', 'threeinferior',
-  'fourinferior', 'fiveinferior', 'sixinferior', 'seveninferior',
-  'eightinferior', 'nineinferior', 'centinferior', 'dollarinferior',
-  'periodinferior', 'commainferior'
-];
-
-
-/* -*- 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 CIDToUnicodeMaps = {
-  'Adobe-Japan1': [[32, 160], {f: 12, c: 33}, [45, 8209], {f: 46, c: 46}, 165,
-    {f: 2, c: 93}, [95, 818], [96, 768], {f: 27, c: 97}, 166, 125, [732, 771],
-    [700, 8217], 92, [699, 8216], 124, [126, 8764], {f: 3, c: 161}, 8260, 402,
-    0, 164, 8220, 171, {f: 2, c: 8249}, {f: 2, c: 64257}, [8210, 8211], 0, 0,
-    [183, 8729], 0, 8226, 8218, 8222, 8221, 187, 0, 0, 191, {f: 2, c: 769},
-    [175, 772], {f: 3, c: 774}, 778, [184, 807], 779, 808, 780, [822, 8212],
-    198, 170, 321, 216, 338, 186, 230, 305, 322, 248, 339, 223, 173, 169, 172,
-    174, 0, 0, {f: 2, c: 178}, 181, 185, {f: 3, c: 188}, {f: 6, c: 192},
-    {f: 16, c: 199}, 0, {f: 6, c: 217}, {f: 6, c: 224}, {f: 16, c: 231}, 0,
-    {f: 7, c: 249}, 352, 376, 381, [773, 8254], 353, 8482, 382, 0, 8194,
-    {s: 91}, 65512, {s: 3}, {f: 63, c: 65377}, {s: 243}, [8195, 12288],
-    {f: 2, c: 12289}, 65292, 65294, 12539, {f: 2, c: 65306}, 65311, 65281,
-    {f: 2, c: 12443}, 180, 65344, 168, 65342, 65507, 65343, {f: 2, c: 12541},
-    {f: 2, c: 12445}, 12291, 20189, {f: 3, c: 12293}, 12540, 8213, 8208, 65295,
-    65340, [12316, 65374], 8214, 65372, 8230, 8229, {s: 4}, {f: 2, c: 65288},
-    {f: 2, c: 12308}, 65339, 65341, 65371, 65373, {f: 10, c: 12296}, 65291,
-    [8722, 65293], 177, 215, 247, 65309, 8800, 65308, 65310, {f: 2, c: 8806},
-    8734, 8756, 9794, 9792, 176, {f: 2, c: 8242}, 8451, 65509, 65284,
-    {f: 2, c: 65504}, 65285, 65283, 65286, 65290, 65312, 167, 9734, 9733, 9675,
-    9679, 9678, 9671, 9670, 9633, 9632, 9651, 9650, 9661, 9660, 8251, 12306,
-    8594, {f: 2, c: 8592}, 8595, 12307, 8712, 8715, {f: 2, c: 8838},
-    {f: 2, c: 8834}, 8746, 8745, {f: 2, c: 8743}, 65506, 8658, 8660, 8704,
-    8707, 8736, 8869, 8978, 8706, 8711, 8801, 8786, {f: 2, c: 8810}, 8730,
-    8765, 8733, 8757, {f: 2, c: 8747}, 8491, 8240, 9839, 9837, 9834,
-    {f: 2, c: 8224}, 182, 9711, {f: 10, c: 65296}, {f: 26, c: 65313},
-    {f: 26, c: 65345}, {f: 83, c: 12353}, {f: 86, c: 12449}, {f: 17, c: 913},
-    {f: 7, c: 931}, {f: 17, c: 945}, {f: 7, c: 963}, {f: 6, c: 1040}, 1025,
-    {f: 32, c: 1046}, 1105, {f: 26, c: 1078}, 20124, 21782, 23043, 38463,
-    21696, 24859, 25384, 23030, 36898, 33909, 33564, 31312, 24746, 25569,
-    28197, 26093, 33894, 33446, 39925, 26771, 22311, 26017, 25201, 23451,
-    22992, 34427, 39156, 32098, 32190, 39822, 25110, 31903, 34999, 23433,
-    24245, 25353, 26263, 26696, 38343, 38797, 26447, 20197, 20234, 20301,
-    20381, 20553, 22258, 22839, 22996, 23041, 23561, 24799, 24847, 24944,
-    26131, 26885, 28858, 30031, 30064, 31227, 32173, 32239, 32963, 33806,
-    [12176, 34915], 35586, 36949, 36986, 21307, 20117, 20133, 22495, 32946,
-    37057, 30959, [12032, 19968], 22769, 28322, 36920, 31282, 33576, 33419,
-    39983, 20801, 21360, 21693, 21729, 22240, 23035, 24341, 39154, 28139,
-    32996, 34093, 38498, 38512, 38560, 38907, 21515, 21491, 23431, 28879,
-    [12155, 32701], 36802, [12204, 38632], 21359, 40284, 31418, 19985, 30867,
-    [12165, 33276], 28198, 22040, 21764, 27421, 34074, 39995, 23013, 21417,
-    28006, [12128, 29916], 38287, 22082, 20113, 36939, 38642, 33615, 39180,
-    21473, 21942, 23344, 24433, 26144, 26355, 26628, 27704, 27891, 27945,
-    29787, 30408, 31310, 38964, 33521, 34907, 35424, 37613, 28082, 30123,
-    30410, 39365, 24742, 35585, 36234, 38322, 27022, 21421, 20870, 22290,
-    22576, 22852, 23476, 24310, 24616, 25513, 25588, 27839, 28436, 28814,
-    28948, 29017, 29141, 29503, 32257, 33398, 33489, 34199, 36960, 37467,
-    40219, 22633, 26044, 27738, 29989, 20985, 22830, 22885, 24448, 24540,
-    25276, 26106, 27178, 27431, 27572, 29579, 32705, 35158, 40236, 40206,
-    [12009, 40644], 23713, 27798, 33659, 20740, 23627, 25014, 33222, 26742,
-    29281, [12036, 20057], 20474, 21368, 24681, 28201, 31311, [12211, 38899],
-    19979, 21270, 20206, 20309, 20285, 20385, 20339, 21152, 21487, 22025,
-    22799, 23233, 23478, 23521, 31185, 26247, 26524, 26550, 27468, 27827,
-    [12117, 28779], 29634, 31117, [12146, 31166], 31292, 31623, 33457, 33499,
-    33540, 33655, 33775, 33747, 34662, 35506, 22057, 36008, 36838, 36942,
-    38686, 34442, 20420, 23784, 25105, [12123, 29273], 30011, 33253, 33469,
-    34558, 36032, 38597, 39187, 39381, 20171, 20250, 35299, 22238, 22602,
-    22730, 24315, 24555, 24618, 24724, 24674, 25040, 25106, 25296, 25913,
-    39745, 26214, 26800, 28023, 28784, 30028, 30342, 32117, 33445, 34809,
-    38283, 38542, [12185, 35997], 20977, 21182, 22806, 21683, 23475, 23830,
-    24936, 27010, 28079, 30861, 33995, 34903, 35442, 37799, 39608, 28012,
-    39336, 34521, 22435, 26623, 34510, 37390, 21123, 22151, 21508, 24275,
-    25313, 25785, 26684, 26680, 27579, 29554, 30906, 31339, 35226,
-    [12179, 35282], 36203, 36611, 37101, 38307, 38548, [12208, 38761], 23398,
-    23731, 27005, {f: 2, c: 38989}, 25499, 31520, 27179, 27263, 26806, 39949,
-    28511, 21106, 21917, 24688, 25324, 27963, 28167, 28369, 33883, 35088,
-    36676, 19988, 39993, 21494, 26907, 27194, 38788, 26666, 20828, 31427,
-    33970, 37340, 37772, 22107, 40232, 26658, 33541, 33841, 31909, 21000,
-    33477, [12129, 29926], 20094, 20355, 20896, 23506, 21002, 21208, 21223,
-    24059, 21914, 22570, 23014, 23436, 23448, 23515, [12082, 24178], 24185,
-    24739, 24863, 24931, 25022, 25563, 25954, 26577, 26707, 26874, 27454,
-    27475, 27735, 28450, 28567, 28485, 29872, [12130, 29976], 30435, 30475,
-    31487, 31649, 31777, 32233, [12152, 32566], 32752, 32925, 33382, 33694,
-    35251, 35532, 36011, 36996, 37969, 38291, 38289, 38306, 38501, 38867,
-    39208, 33304, 20024, 21547, 23736, 24012, 29609, 30284, 30524, 23721,
-    32747, 36107, 38593, 38929, 38996, 39000, 20225, 20238, 21361, 21916,
-    22120, 22522, 22855, 23305, 23492, 23696, 24076, 24190, 24524, 25582,
-    26426, 26071, 26082, 26399, 26827, 26820, 27231, 24112, 27589, 27671,
-    27773, 30079, 31048, 23395, 31232, 32000, 24509, 35215, 35352, 36020,
-    36215, 36556, 36637, 39138, 39438, [12004, 12225, 39740], [12018, 20096],
-    20605, 20736, 22931, 23452, 25135, 25216, 25836, 27450, 29344, 30097,
-    31047, 32681, 34811, 35516, 35696, 25516, 33738, 38816, 21513, 21507,
-    21931, 26708, 27224, 35440, 30759, 26485, [12233, 40653], 21364, 23458,
-    33050, 34384, 36870, 19992, 20037, 20167, 20241, 21450, 21560, 23470,
-    [12088, 24339], 24613, 25937, 26429, 27714, 27762, 27875, 28792, 29699,
-    31350, 31406, 31496, 32026, 31998, 32102, 26087, [12124, 29275], 21435,
-    23621, 24040, 25298, 25312, 25369, 28192, 34394, 35377, 36317, 37624,
-    28417, 31142, [12226, 39770], 20136, {f: 2, c: 20139}, 20379, 20384, 20689,
-    20807, 31478, 20849, 20982, 21332, 21281, 21375, 21483, 21932, 22659,
-    23777, 24375, 24394, 24623, 24656, 24685, 25375, 25945, 27211, 27841,
-    29378, 29421, 30703, 33016, 33029, 33288, 34126, 37111, 37857, 38911,
-    39255, 39514, 20208, 20957, 23597, 26241, 26989, 23616, 26354, 26997,
-    [12127, 29577], 26704, 31873, 20677, 21220, 22343, [12081, 24062], 37670,
-    [12100, 26020], 27427, 27453, 29748, 31105, 31165, 31563, 32202, 33465,
-    33740, 34943, 35167, 35641, 36817, [12198, 37329], 21535, 37504, 20061,
-    20534, 21477, 21306, 29399, 29590, 30697, 33510, 36527, 39366, 39368,
-    39378, 20855, 24858, 34398, 21936, 31354, 20598, 23507, 36935, 38533,
-    20018, 27355, 37351, 23633, 23624, 25496, 31391, 27795, 38772, 36705,
-    31402, 29066, 38536, 31874, 26647, 32368, 26705, 37740, 21234, 21531,
-    34219, 35347, 32676, 36557, 37089, 21350, 34952, 31041, 20418, 20670,
-    21009, 20804, 21843, 22317, 29674, 22411, 22865, 24418, 24452, 24693,
-    24950, 24935, 25001, 25522, 25658, 25964, 26223, 26690, 28179, 30054,
-    31293, 31995, 32076, 32153, 32331, 32619, 33550, 33610, 34509, 35336,
-    35427, 35686, 36605, 38938, 40335, 33464, 36814, 39912, 21127, 25119,
-    25731, 28608, 38553, 26689, 20625, [12107, 27424], 27770, 28500,
-    [12147, 31348], 32080, [12174, 34880], 35363, [12105, 26376], 20214, 20537,
-    20518, 20581, 20860, 21048, 21091, 21927, 22287, 22533, 23244, 24314,
-    25010, 25080, 25331, 25458, 26908, 27177, 29309, [12125, 29356], 29486,
-    30740, 30831, 32121, 30476, 32937, [12178, 35211], 35609, 36066, 36562,
-    36963, 37749, 38522, 38997, 39443, 40568, 20803, 21407, 21427, 24187,
-    24358, 28187, 28304, [12126, 29572], 29694, 32067, 33335, [12180, 35328],
-    35578, 38480, 20046, 20491, 21476, 21628, 22266, 22993, 23396,
-    [12080, 24049], 24235, 24359, [12094, 25144], 25925, 26543, 28246, 29392,
-    31946, 34996, 32929, 32993, 33776, [11969, 34382], 35463, 36328, 37431,
-    38599, 39015, [12238, 40723], 20116, 20114, 20237, 21320, 21577, 21566,
-    23087, 24460, 24481, 24735, 26791, 27278, 29786, 30849, 35486, 35492,
-    35703, 37264, 20062, 39881, 20132, 20348, 20399, 20505, 20502, 20809,
-    20844, 21151, 21177, 21246, 21402, [12061, 21475], 21521, 21518, 21897,
-    22353, 22434, 22909, 23380, 23389, 23439, [12079, 24037], 24039, 24055,
-    24184, 24195, 24218, 24247, 24344, 24658, 24908, 25239, 25304, 25511,
-    25915, 26114, 26179, 26356, 26477, 26657, 26775, 27083, 27743, 27946,
-    28009, 28207, 28317, 30002, 30343, 30828, 31295, 31968, 32005, 32024,
-    32094, 32177, 32789, 32771, 32943, 32945, 33108, 33167, 33322, 33618,
-    [12175, 34892], 34913, 35611, 36002, 36092, 37066, 37237, 37489, 30783,
-    37628, 38308, 38477, 38917, [12217, 39321], [12220, 39640], 40251, 21083,
-    21163, 21495, 21512, 22741, 25335, 28640, 35946, 36703, 40633, 20811,
-    21051, 21578, 22269, 31296, 37239, 40288, [12234, 40658], 29508, 28425,
-    33136, 29969, 24573, 24794, [12219, 39592], 29403, 36796, 27492, 38915,
-    20170, 22256, 22372, 22718, 23130, 24680, 25031, 26127, 26118, 26681,
-    26801, 28151, 30165, 32058, [12169, 33390], 39746, 20123, 20304, 21449,
-    21766, 23919, 24038, 24046, 26619, 27801, 29811, 30722, 35408, 37782,
-    35039, 22352, 24231, 25387, 20661, 20652, 20877, 26368, 21705, 22622,
-    22971, 23472, 24425, 25165, 25505, 26685, 27507, 28168, 28797, 37319,
-    29312, 30741, 30758, 31085, 25998, 32048, 33756, 35009, 36617, 38555,
-    21092, 22312, 26448, 32618, 36001, 20916, 22338, 38442, 22586, 27018,
-    32948, 21682, 23822, 22524, 30869, 40442, 20316, 21066, 21643, 25662,
-    26152, 26388, 26613, 31364, 31574, 32034, 37679, 26716, 39853, 31545,
-    21273, 20874, 21047, 23519, 25334, 25774, 25830, 26413, 27578, 34217,
-    38609, 30352, 39894, 25420, 37638, 39851, [12139, 30399], 26194, 19977,
-    20632, 21442, [12077, 23665], 24808, 25746, 25955, 26719, 29158, 29642,
-    29987, 31639, 32386, 34453, 35715, 36059, 37240, 39184, 26028, 26283,
-    27531, 20181, 20180, 20282, 20351, 21050, 21496, 21490, 21987, 22235,
-    [12064, 22763], 22987, 22985, 23039, [12070, 23376], 23629, 24066, 24107,
-    24535, 24605, 25351, [12096, 25903], 23388, 26031, 26045, 26088, 26525,
-    [12108, 27490], 27515, [12114, 27663], 29509, 31049, 31169, [12151, 31992],
-    32025, 32043, 32930, 33026, [12164, 33267], 35222, 35422, 35433, 35430,
-    35468, 35566, 36039, 36060, 38604, 39164, [12013, 27503], 20107, 20284,
-    20365, 20816, 23383, 23546, 24904, 25345, 26178, 27425, 28363, 27835,
-    29246, 29885, 30164, 30913, [12144, 31034], [12157, 32780], [12159, 32819],
-    [12163, 33258], 33940, 36766, 27728, [12229, 40575], 24335, 35672, 40235,
-    31482, 36600, 23437, 38635, 19971, 21489, 22519, 22833, 23241, 23460,
-    24713, 28287, 28422, 30142, 36074, 23455, 34048, 31712, 20594, 26612,
-    33437, 23649, 34122, 32286, 33294, 20889, 23556, 25448, 36198, 26012,
-    29038, 31038, 32023, 32773, 35613, [12190, 36554], 36974, 34503, 37034,
-    20511, 21242, 23610, 26451, 28796, 29237, 37196, 37320, 37675, 33509,
-    23490, 24369, 24825, 20027, 21462, 23432, [12095, 25163], 26417, 27530,
-    29417, 29664, 31278, 33131, 36259, 37202, [12216, 39318], 20754, 21463,
-    21610, 23551, 25480, 27193, 32172, 38656, 22234, 21454, 21608, 23447,
-    23601, 24030, 20462, 24833, 25342, 27954, 31168, 31179, 32066, 32333,
-    32722, 33261, [12168, 33311], 33936, 34886, 35186, 35728, 36468, 36655,
-    36913, 37195, 37228, 38598, 37276, 20160, 20303, 20805, [12055, 21313],
-    24467, 25102, 26580, 27713, 28171, 29539, 32294, 37325, 37507, 21460,
-    22809, 23487, 28113, 31069, 32302, 31899, 22654, 29087, 20986, 34899,
-    36848, 20426, 23803, 26149, 30636, 31459, 33308, 39423, 20934, 24490,
-    26092, 26991, 27529, 28147, 28310, 28516, 30462, 32020, 24033, 36981,
-    37255, 38918, 20966, 21021, 25152, 26257, 26329, 28186, 24246, 32210,
-    32626, 26360, 34223, 34295, 35576, 21161, 21465, [12069, 22899], 24207,
-    24464, 24661, 37604, 38500, 20663, 20767, 21213, 21280, 21319, 21484,
-    21736, 21830, 21809, 22039, 22888, 22974, 23100, 23477, 23558,
-    [12073, 23567], 23569, 23578, 24196, 24202, 24288, 24432, 25215, 25220,
-    25307, 25484, 25463, 26119, 26124, 26157, 26230, 26494, 26786, 27167,
-    27189, 27836, 28040, 28169, 28248, 28988, 28966, 29031, 30151, 30465,
-    30813, 30977, 31077, 31216, 31456, 31505, 31911, 32057, 32918, 33750,
-    33931, 34121, 34909, 35059, 35359, 35388, 35412, 35443, 35937, 36062,
-    37284, 37478, 37758, 37912, 38556, 38808, 19978, 19976, 19998, 20055,
-    20887, 21104, 22478, 22580, 22732, 23330, 24120, 24773, 25854, 26465,
-    26454, 27972, 29366, 30067, 31331, 33976, 35698, 37304, 37664, 22065,
-    22516, 39166, 25325, 26893, 27542, 29165, 32340, 32887, [12170, 33394],
-    35302, [12215, 39135], 34645, 36785, 23611, 20280, 20449, 20405, 21767,
-    23072, 23517, 23529, [12092, 24515], 24910, 25391, 26032, 26187, 26862,
-    27035, 28024, 28145, 30003, 30137, 30495, 31070, 31206, 32051,
-    [12162, 33251], 33455, 34218, 35242, 35386, [12189, 36523], [12191, 36763],
-    36914, 37341, 38663, [12040, 20154], 20161, 20995, 22645, 22764, 23563,
-    29978, 23613, 33102, 35338, 36805, 38499, 38765, 31525, 35535, 38920,
-    37218, 22259, 21416, 36887, 21561, 22402, 24101, 25512, [12116, 27700],
-    28810, 30561, 31883, 32736, 34928, 36930, 37204, 37648, 37656, 38543,
-    29790, 39620, 23815, 23913, 25968, 26530, 36264, 38619, 25454, 26441,
-    26905, 33733, 38935, 38592, 35070, 28548, 25722, [12072, 23544], 19990,
-    28716, 30045, 26159, 20932, 21046, 21218, 22995, 24449, 24615, 25104,
-    25919, 25972, 26143, 26228, 26866, 26646, 27491, 28165, 29298,
-    [12131, 29983], 30427, 31934, 32854, 22768, 35069, [11972, 35199], 35488,
-    35475, 35531, 36893, 37266, [11992, 38738], 38745, [12011, 25993], 31246,
-    33030, 38587, 24109, 24796, 25114, 26021, 26132, 26512, [12143, 30707],
-    31309, 31821, 32318, 33034, 36012, [12186, 36196], 36321, 36447, 30889,
-    20999, 25305, 25509, 25666, 25240, 35373, 31363, 31680, 35500, 38634,
-    32118, [12166, 33292], 34633, 20185, 20808, 21315, 21344, 23459, 23554,
-    23574, 24029, 25126, 25159, 25776, 26643, 26676, 27849, 27973, 27927,
-    26579, 28508, 29006, 29053, 26059, 31359, 31661, 32218, 32330, 32680,
-    33146, [12167, 33307], 33337, 34214, 35438, 36046, 36341, 36984, 36983,
-    37549, 37521, 38275, 39854, 21069, 21892, 28472, 28982, 20840, 31109,
-    32341, 33203, 31950, 22092, 22609, 23720, 25514, 26366, 26365, 26970,
-    29401, 30095, 30094, 30990, 31062, 31199, 31895, 32032, 32068, 34311,
-    35380, 38459, 36961, [12239, 40736], 20711, 21109, 21452, 21474, 20489,
-    21930, 22766, 22863, 29245, 23435, 23652, 21277, 24803, 24819, 25436,
-    25475, 25407, 25531, 25805, 26089, 26361, 24035, 27085, 27133, 28437,
-    29157, 20105, 30185, 30456, 31379, 31967, 32207, 32156, 32865, 33609,
-    33624, 33900, 33980, 34299, 35013, [12187, 36208], 36865, 36973, 37783,
-    38684, 39442, 20687, 22679, 24974, 33235, 34101, 36104, 36896, 20419,
-    20596, 21063, 21363, 24687, 25417, 26463, 28204, [12188, 36275], 36895,
-    20439, 23646, 36042, 26063, 32154, 21330, 34966, 20854, 25539, 23384,
-    23403, 23562, 25613, 26449, 36956, 20182, 22810, 22826, 27760, 35409,
-    21822, 22549, 22949, 24816, 25171, 26561, 33333, 26965, 38464, 39364,
-    39464, 20307, 22534, 23550, 32784, 23729, 24111, 24453, 24608, 24907,
-    25140, 26367, 27888, 28382, 32974, 33151, 33492, 34955, 36024, 36864,
-    36910, 38538, 40667, 39899, 20195, 21488, [12068, 22823], 31532, 37261,
-    38988, 40441, 28381, 28711, 21331, 21828, 23429, 25176, 25246, 25299,
-    27810, 28655, 29730, 35351, 37944, 28609, 35582, 33592, 20967, 34552,
-    21482, 21481, 20294, 36948, [12192, 36784], 22890, 33073, 24061, 31466,
-    36799, 26842, [12181, 35895], 29432, 40008, 27197, 35504, 20025, 21336,
-    22022, 22374, 25285, 25506, 26086, 27470, 28129, 28251, 28845, 30701,
-    31471, 31658, 32187, 32829, 32966, 34507, 35477, 37723, 22243, 22727,
-    24382, 26029, 26262, 27264, 27573, 30007, 35527, 20516, 30693, 22320,
-    24347, 24677, 26234, 27744, 30196, 31258, 32622, 33268, 34584, 36933,
-    39347, 31689, 30044, [12149, 31481], 31569, 33988, 36880, 31209, 31378,
-    33590, 23265, 30528, 20013, 20210, 23449, 24544, 25277, 26172, 26609,
-    27880, [12173, 34411], 34935, 35387, 37198, 37619, 39376, 27159, 28710,
-    29482, 33511, 33879, 36015, 19969, 20806, 20939, 21899, 23541, 24086,
-    24115, 24193, 24340, 24373, 24427, 24500, 25074, 25361, 26274, 26397,
-    28526, 29266, 30010, 30522, 32884, 33081, 33144, 34678, 35519, 35548,
-    36229, 36339, 37530, [11985, 12199, 38263], 38914, [12227, 40165], 21189,
-    25431, 30452, 26389, 27784, 29645, 36035, 37806, 38515, 27941, 22684,
-    26894, 27084, 36861, 37786, 30171, 36890, 22618, 26626, 25524, 27131,
-    20291, 28460, 26584, 36795, 34086, 32180, 37716, 26943, 28528, 22378,
-    22775, 23340, 32044, [12118, 29226], 21514, 37347, 40372, 20141, 20302,
-    20572, 20597, 21059, 35998, 21576, 22564, 23450, 24093, 24213, 24237,
-    24311, 24351, 24716, 25269, 25402, 25552, 26799, 27712, 30855, 31118,
-    31243, 32224, 33351, 35330, 35558, 36420, 36883, 37048, 37165, 37336,
-    [12237, 40718], 27877, 25688, 25826, 25973, 28404, 30340, 31515, 36969,
-    37841, 28346, 21746, 24505, 25764, 36685, 36845, 37444, 20856, 22635,
-    22825, 23637, 24215, 28155, 32399, 29980, 36028, 36578, 39003, 28857,
-    20253, 27583, 28593, [12133, 30000], 38651, 20814, 21520, 22581, 22615,
-    22956, 23648, 24466, [12099, 26007], 26460, 28193, 30331, 33759, 36077,
-    36884, 37117, 37709, 30757, 30778, 21162, 24230, [12063, 22303], 22900,
-    24594, 20498, 20826, 20908, 20941, [12049, 20992], 21776, 22612, 22616,
-    22871, 23445, 23798, 23947, 24764, 25237, 25645, 26481, 26691, 26812,
-    26847, 30423, 28120, 28271, 28059, 28783, 29128, 24403, 30168, 31095,
-    31561, 31572, 31570, 31958, 32113, 21040, 33891, 34153, 34276, 35342,
-    35588, [12182, 35910], 36367, 36867, 36879, 37913, 38518, 38957, 39472,
-    38360, 20685, 21205, 21516, 22530, 23566, 24999, 25758, 27934, 30643,
-    31461, 33012, 33796, 36947, 37509, 23776, 40199, 21311, 24471, 24499,
-    28060, 29305, 30563, 31167, 31716, 27602, 29420, 35501, 26627, 27233,
-    20984, 31361, 26932, 23626, 40182, 33515, 23493, [12195, 37193], 28702,
-    22136, 23663, 24775, 25958, 27788, 35930, 36929, 38931, 21585, 26311,
-    37389, 22856, 37027, 20869, 20045, 20970, 34201, 35598, 28760, 25466,
-    37707, 26978, 39348, 32260, 30071, 21335, 26976, 36575, 38627, 27741,
-    [12038, 20108], 23612, 24336, 36841, 21250, 36049, [12161, 32905], 34425,
-    24319, [12103, 26085], 20083, [12042, 20837], 22914, 23615, 38894, 20219,
-    22922, 24525, 35469, 28641, 31152, 31074, 23527, 33905, 29483, 29105,
-    24180, 24565, 25467, 25754, 29123, 31896, 20035, 24316, 20043, 22492,
-    22178, 24745, 28611, 32013, 33021, 33075, 33215, 36786, 35223, 34468,
-    24052, 25226, 25773, 35207, 26487, 27874, 27966, 29750, 30772, 23110,
-    32629, 33453, [12218, 39340], 20467, 24259, 25309, 25490, 25943, 26479,
-    30403, 29260, 32972, 32954, 36649, 37197, 20493, 22521, 23186, 26757,
-    26995, 29028, 29437, 36023, 22770, 36064, 38506, 36889, 34687, 31204,
-    30695, 33833, 20271, 21093, 21338, 25293, 26575, 27850, [12137, 30333],
-    31636, 31893, 33334, 34180, 36843, 26333, 28448, 29190, 32283, 33707,
-    39361, [12008, 40614], 20989, 31665, 30834, 31672, 32903, 31560, 27368,
-    24161, 32908, 30033, 30048, [12043, 20843], 37474, 28300, 30330, 37271,
-    39658, 20240, 32624, 25244, 31567, 38309, 40169, 22138, 22617, 34532,
-    38588, 20276, 21028, 21322, 21453, 21467, 24070, 25644, 26001, 26495,
-    27710, 27726, 29256, 29359, 29677, 30036, 32321, 33324, 34281, 36009,
-    31684, [12196, 37318], 29033, 38930, 39151, 25405, 26217, 30058, 30436,
-    30928, 34115, 34542, 21290, 21329, 21542, 22915, 24199, 24444, 24754,
-    25161, 25209, 25259, 26000, [12112, 27604], 27852, 30130, [12138, 30382],
-    30865, 31192, 32203, 32631, 32933, 34987, 35513, 36027, 36991,
-    [12206, 38750], [12214, 39131], 27147, 31800, 20633, 23614, 24494, 26503,
-    27608, 29749, 30473, 32654, [12240, 40763], 26570, 31255, 21305,
-    [12134, 30091], 39661, 24422, 33181, 33777, 32920, 24380, 24517, 30050,
-    31558, 36924, 26727, 23019, 23195, 32016, 30334, 35628, 20469, 24426,
-    27161, 27703, 28418, 29922, 31080, 34920, 35413, 35961, 24287, 25551,
-    30149, 31186, 33495, 37672, 37618, 33948, 34541, 39981, 21697, 24428,
-    25996, 27996, 28693, 36007, 36051, 38971, 25935, 29942, 19981, 20184,
-    22496, 22827, 23142, 23500, 20904, 24067, 24220, 24598, 25206, 25975,
-    26023, 26222, 28014, [12119, 29238], 31526, 33104, 33178, 33433, 35676,
-    36000, 36070, 36212, [12201, 38428], 38468, 20398, 25771, 27494, 33310,
-    33889, 34154, 37096, 23553, 26963, [12213, 39080], 33914, 34135, 20239,
-    21103, 24489, 24133, 26381, 31119, 33145, 35079, 35206, 28149, 24343,
-    25173, 27832, 20175, 29289, 39826, 20998, 21563, 22132, 22707, 24996,
-    25198, 28954, 22894, 31881, 31966, 32027, 38640, [12098, 25991], 32862,
-    19993, 20341, 20853, 22592, 24163, 24179, 24330, 26564, 20006, 34109,
-    38281, 38491, [12150, 31859], [12212, 38913], 20731, 22721, 30294, 30887,
-    21029, 30629, 34065, 31622, 20559, 22793, [12122, 29255], 31687, 32232,
-    36794, 36820, 36941, 20415, 21193, 23081, 24321, 38829, 20445, 33303,
-    37610, 22275, 25429, 27497, 29995, 35036, 36628, 31298, 21215, 22675,
-    24917, 25098, 26286, [11935, 27597], 31807, 33769, 20515, 20472, 21253,
-    21574, 22577, 22857, 23453, 23792, 23791, 23849, 24214, 25265, 25447,
-    25918, [12101, 26041], 26379, 27861, 27873, 28921, 30770, 32299, 32990,
-    33459, 33804, 34028, 34562, 35090, 35370, 35914, 37030, 37586, 39165,
-    40179, 40300, 20047, 20129, 20621, 21078, 22346, 22952, 24125,
-    {f: 2, c: 24536}, 25151, 26292, 26395, 26576, 26834, 20882, 32033, 32938,
-    33192, 35584, 35980, 36031, 37502, 38450, 21536, 38956, 21271, 20693,
-    [12056, 21340], 22696, 25778, 26420, 29287, 30566, 31302, 37350, 21187,
-    27809, 27526, 22528, 24140, 22868, 26412, 32763, 20961, 30406, 25705,
-    30952, 39764, [12231, 40635], 22475, 22969, 26151, 26522, 27598, 21737,
-    27097, 24149, 33180, 26517, 39850, 26622, 40018, 26717, 20134, 20451,
-    [12060, 21448], 25273, 26411, 27819, 36804, 20397, 32365, 40639, 19975,
-    24930, 28288, 28459, 34067, 21619, 26410, 39749, [11922, 24051], 31637,
-    23724, 23494, 34588, 28234, 34001, 31252, 33032, 22937, 31885,
-    [11936, 27665], 30496, 21209, 22818, 28961, 29279, [12141, 30683], 38695,
-    40289, 26891, 23167, 23064, 20901, 21517, 21629, 26126, 30431, 36855,
-    37528, 40180, 23018, 29277, 28357, 20813, 26825, 32191, 32236,
-    [12207, 38754], 40634, 25720, 27169, 33538, 22916, 23391, [12113, 27611],
-    29467, 30450, 32178, 32791, 33945, 20786, [12106, 26408], 40665,
-    [12140, 30446], 26466, 21247, 39173, 23588, 25147, 31870, 36016, 21839,
-    24758, 32011, [12200, 38272], 21249, 20063, 20918, 22812, 29242, 32822,
-    37326, 24357, [12142, 30690], 21380, 24441, 32004, 34220, 35379, 36493,
-    38742, 26611, 34222, 37971, 24841, 24840, 27833, 30290, 35565, 36664,
-    21807, 20305, 20778, 21191, 21451, 23461, 24189, 24736, 24962, 25558,
-    26377, 26586, 28263, 28044, {f: 2, c: 29494}, 30001, 31056, 35029, 35480,
-    36938, [12194, 37009], 37109, 38596, 34701, [12067, 22805], 20104, 20313,
-    19982, 35465, 36671, 38928, 20653, 24188, 22934, 23481, 24248, 25562,
-    25594, 25793, 26332, 26954, 27096, 27915, 28342, 29076, [12132, 29992],
-    31407, [12154, 32650], 32768, 33865, 33993, 35201, 35617, 36362, 36965,
-    38525, 39178, 24958, 25233, 27442, 27779, 28020, 32716, 32764, 28096,
-    32645, 34746, 35064, 26469, 33713, 38972, 38647, 27931, 32097, 33853,
-    37226, 20081, 21365, 23888, 27396, 28651, 34253, 34349, 35239, 21033,
-    21519, 23653, 26446, 26792, 29702, 29827, 30178, 35023, 35041,
-    [12197, 37324], 38626, 38520, 24459, 29575, [12148, 31435], 33870, 25504,
-    30053, 21129, 27969, 28316, 29705, 30041, 30827, 31890, 38534,
-    [12015, 31452], [12243, 40845], 20406, 24942, 26053, 34396, 20102, 20142,
-    20698, 20001, 20940, 23534, 26009, 26753, 28092, 29471, 30274, 30637,
-    31260, 31975, 33391, 35538, 36988, 37327, 38517, 38936, [12050, 21147],
-    32209, 20523, 21400, 26519, 28107, 29136, 29747, 33256, 36650, 38563,
-    40023, 40607, 29792, 22593, 28057, 32047, 39006, 20196, 20278, 20363,
-    20919, 21169, 23994, 24604, 29618, 31036, 33491, 37428, 38583, 38646,
-    38666, 40599, 40802, 26278, 27508, 21015, 21155, 28872, 35010, 24265,
-    24651, 24976, 28451, 29001, 31806, 32244, 32879, 34030, 36899, 37676,
-    21570, 39791, 27347, 28809, 36034, 36335, 38706, 21172, 23105, 24266,
-    24324, 26391, 27004, 27028, 28010, 28431, 29282, 29436, 31725,
-    [12156, 32769], 32894, 34635, 37070, 20845, 40595, 31108, 32907, 37682,
-    35542, 20525, 21644, 35441, 27498, 36036, 33031, 24785, 26528, 40434,
-    20121, 20120, 39952, 35435, 34241, 34152, 26880, 28286, 30871, 33109,
-    24332, 19984, 19989, 20010, 20017, [12034, 20022], 20028, [12035, 20031],
-    20034, 20054, 20056, 20098, [12037, 20101], 35947, 20106, 33298, 24333,
-    20110, {f: 2, c: 20126}, [12039, 20128], 20130, 20144, 20147, 20150, 20174,
-    20173, 20164, 20166, 20162, 20183, 20190, 20205, 20191, 20215, 20233,
-    20314, 20272, 20315, 20317, 20311, 20295, 20342, 20360, 20367, 20376,
-    20347, 20329, 20336, 20369, 20335, 20358, 20374, 20760, 20436, 20447,
-    20430, 20440, 20443, 20433, 20442, 20432, {f: 2, c: 20452}, 20506, 20520,
-    20500, 20522, 20517, 20485, 20252, 20470, 20513, 20521, 20524, 20478,
-    20463, 20497, 20486, 20547, 20551, 26371, 20565, 20560, 20552, 20570,
-    20566, 20588, 20600, 20608, 20634, 20613, 20660, 20658, {f: 2, c: 20681},
-    20659, 20674, 20694, 20702, 20709, 20717, 20707, 20718, 20729, 20725,
-    20745, {f: 2, c: 20737}, 20758, 20757, 20756, 20762, 20769, 20794, 20791,
-    20796, 20795, [12041, 20799], [11918, 20800], 20818, 20812, 20820, 20834,
-    31480, {f: 2, c: 20841}, 20846, 20864, [12044, 20866], 22232, 20876, 20873,
-    20879, 20881, 20883, 20885, [12045, 20886], 20900, 20902, 20898,
-    {f: 2, c: 20905}, [12046, 20907], 20915, {f: 2, c: 20913}, 20912, 20917,
-    20925, 20933, 20937, 20955, [12047, 20960], 34389, 20969, 20973, 20976,
-    [12048, 20981], 20990, 20996, 21003, 21012, 21006, 21031, 21034, 21038,
-    21043, 21049, 21071, 21060, {f: 2, c: 21067}, 21086, 21076, 21098, 21108,
-    21097, 21107, 21119, 21117, 21133, 21140, 21138, 21105, 21128, 21137,
-    36776, 36775, {f: 2, c: 21164}, 21180, 21173, 21185, 21197, 21207, 21214,
-    21219, 21222, 39149, 21216, 21235, 21237, 21240, [12051, 21241], 21254,
-    21256, 30008, 21261, 21264, 21263, [12052, 21269], [12053, 21274], 21283,
-    21295, 21297, 21299, [12054, 21304], 21312, 21318, 21317, 19991, 21321,
-    21325, 20950, 21342, [12057, 21353], 21358, 22808, 21371, 21367,
-    [12058, 21378], 21398, 21408, 21414, 21413, 21422, 21424, [12059, 21430],
-    21443, 31762, 38617, 21471, 26364, 29166, 21486, 21480, 21485, 21498,
-    21505, 21565, 21568, {f: 2, c: 21548}, 21564, 21550, 21558, 21545, 21533,
-    21582, 21647, 21621, 21646, 21599, 21617, 21623, 21616, 21650, 21627,
-    21632, 21622, 21636, 21648, 21638, 21703, 21666, 21688, 21669, 21676,
-    21700, 21704, 21672, 21675, 21698, 21668, 21694, 21692, 21720,
-    {f: 2, c: 21733}, 21775, 21780, 21757, 21742, 21741, 21754, 21730, 21817,
-    21824, 21859, 21836, 21806, 21852, 21829, {f: 2, c: 21846}, 21816, 21811,
-    21853, 21913, 21888, 21679, 21898, 21919, 21883, 21886, 21912, 21918,
-    21934, 21884, 21891, 21929, 21895, 21928, 21978, 21957, 21983, 21956,
-    21980, 21988, 21972, 22036, 22007, 22038, 22014, 22013, 22043, 22009,
-    22094, 22096, 29151, 22068, 22070, 22066, 22072, 22123, 22116, 22063,
-    22124, 22122, 22150, 22144, 22154, 22176, 22164, 22159, 22181, 22190,
-    22198, 22196, 22210, 22204, 22209, 22211, 22208, 22216, 22222, 22225,
-    22227, [12062, 22231], 22254, 22265, 22272, 22271, 22276, 22281, 22280,
-    22283, 22285, 22291, 22296, 22294, 21959, 22300, 22310, {f: 2, c: 22327},
-    22350, 22331, 22336, 22351, 22377, 22464, 22408, 22369, 22399, 22409,
-    22419, 22432, 22451, 22436, 22442, 22448, 22467, 22470, 22484,
-    {f: 2, c: 22482}, 22538, 22486, 22499, 22539, 22553, 22557, 22642, 22561,
-    22626, 22603, 22640, 27584, 22610, 22589, 22649, 22661, 22713, 22687,
-    22699, 22714, 22750, 22715, 22712, 22702, 22725, 22739, 22737, 22743,
-    22745, 22744, 22757, 22748, 22756, 22751, 22767, 22778, 22777,
-    {f: 3, c: 22779}, [12065, 22786], [12066, 22794], 22800, 22811, 26790,
-    22821, {f: 2, c: 22828}, 22834, 22840, 22846, 31442, 22869, 22864, 22862,
-    22874, 22872, 22882, 22880, 22887, 22892, 22889, 22904, 22913, 22941,
-    20318, 20395, 22947, 22962, 22982, 23016, 23004, 22925, {f: 2, c: 23001},
-    23077, 23071, 23057, 23068, 23049, 23066, 23104, 23148, 23113,
-    {f: 2, c: 23093}, 23138, 23146, 23194, 23228, 23230, 23243, 23234, 23229,
-    23267, 23255, 23270, 23273, 23254, {f: 2, c: 23290}, 23308, 23307, 23318,
-    23346, 23248, 23338, 23350, 23358, 23363, 23365, 23360, 23377, 23381,
-    {f: 2, c: 23386}, 23397, 23401, 23408, 23411, 23413, 23416, 25992, 23418,
-    [12071, 23424], 23427, 23462, 23480, 23491, 23495, 23497, 23508, 23504,
-    23524, 23526, 23522, 23518, 23525, 23531, 23536, 23542, 23539, 23557,
-    {f: 2, c: 23559}, 23565, 23571, 23584, [11920, 12074, 23586], 23592,
-    [12075, 23608], 23609, 23617, 23622, 23630, 23635, 23632, 23631, 23409,
-    23660, [12076, 23662], 20066, 23670, 23673, 23692, 23697, 23700, 22939,
-    23723, 23739, 23734, 23740, 23735, 23749, 23742, 23751, 23769, 23785,
-    23805, 23802, 23789, 23948, 23786, 23819, 23829, 23831, 23900, 23839,
-    23835, 23825, 23828, 23842, 23834, 23833, 23832, 23884, 23890, 23886,
-    23883, 23916, 23923, 23926, 23943, 23940, 23938, 23970, 23965, 23980,
-    23982, 23997, 23952, 23991, 23996, 24009, 24013, 24019, 24018, 24022,
-    [12078, 24027], 24043, 24050, 24053, 24075, 24090, 24089, 24081, 24091,
-    {f: 2, c: 24118}, 24132, 24131, 24128, 24142, 24151, 24148, 24159, 24162,
-    24164, 24135, {f: 2, c: 24181}, [11923, 12083, 24186], 40636,
-    [12084, 24191], 24224, {f: 2, c: 24257}, 24264, 24272, 24271, 24278, 24291,
-    24285, {f: 2, c: 24282}, 24290, 24289, {f: 2, c: 24296}, 24300, 24305,
-    24307, 24304, [12085, 24308], 24312, [12086, 24318], 24323, 24329, 24413,
-    24412, [12087, 24331], 24337, 24342, 24361, 24365, 24376, 24385, 24392,
-    24396, 24398, 24367, [11924, 24401], {f: 2, c: 24406}, 24409,
-    [12090, 24417], 24429, [12091, 24435], 24439, 24451, 24450, 24447, 24458,
-    24456, 24465, 24455, 24478, 24473, 24472, 24480, 24488, 24493, 24508,
-    24534, 24571, 24548, 24568, 24561, 24541, 24755, 24575, 24609, 24672,
-    24601, 24592, 24617, 24590, 24625, 24603, 24597, 24619, 24614, 24591,
-    24634, 24666, 24641, 24682, 24695, 24671, 24650, 24646, 24653, 24675,
-    24643, 24676, 24642, 24684, 24683, 24665, 24705, 24717, 24807, 24707,
-    24730, 24708, 24731, {f: 2, c: 24726}, 24722, 24743, 24715, 24801, 24760,
-    24800, 24787, 24756, 24560, 24765, 24774, 24757, 24792, 24909, 24853,
-    24838, {f: 2, c: 24822}, 24832, 24820, 24826, 24835, 24865, 24827, 24817,
-    {f: 2, c: 24845}, 24903, 24894, 24872, 24871, 24906, 24895, 24892, 24876,
-    24884, 24893, 24898, 24900, 24947, 24951, {f: 3, c: 24920}, 24939, 24948,
-    24943, 24933, 24945, 24927, 24925, 24915, 24949, 24985, 24982, 24967,
-    25004, 24980, 24986, 24970, 24977, 25003, 25006, 25036, 25034, 25033,
-    25079, 25032, 25027, 25030, 25018, 25035, 32633, 25037, 25062, 25059,
-    25078, 25082, 25076, 25087, 25085, 25084, 25086, 25088, [12093, 25096],
-    25097, 25101, 25100, 25108, 25115, 25118, 25121, 25130, 25134, 25136,
-    {f: 2, c: 25138}, 25153, 25166, 25182, 25187, 25179, 25184, 25192, 25212,
-    25218, 25225, 25214, {f: 2, c: 25234}, 25238, 25300, 25219, 25236, 25303,
-    25297, 25275, 25295, 25343, 25286, 25812, 25288, 25308, 25292, 25290,
-    25282, 25287, 25243, 25289, 25356, 25326, 25329, 25383, 25346, 25352,
-    25327, 25333, 25424, 25406, 25421, 25628, 25423, 25494, 25486, 25472,
-    25515, 25462, 25507, 25487, 25481, 25503, 25525, 25451, 25449, 25534,
-    25577, 25536, 25542, 25571, 25545, 25554, 25590, 25540, 25622, 25652,
-    25606, 25619, 25638, 25654, 25885, 25623, 25640, 25615, 25703, 25711,
-    25718, 25678, 25898, 25749, 25747, 25765, 25769, 25736, 25788, 25818,
-    25810, 25797, 25799, 25787, 25816, 25794, 25841, 25831, 33289,
-    {f: 2, c: 25824}, 25260, 25827, 25839, 25900, 25846, 25844, 25842, 25850,
-    25856, 25853, 25880, 25884, 25861, 25892, 25891, 25899, [12097, 25908],
-    [11929, 25909], 25911, 25910, 25912, 30027, 25928, 25942, 25941, 25933,
-    25944, 25950, 25949, 25970, 25976, {f: 2, c: 25986}, 35722, 26011, 26015,
-    26027, 26039, 26051, 26054, 26049, 26052, 26060, 26066, 26075, 26073,
-    [12102, 26080], [11931, 26081], 26097, 26482, 26122, 26115, 26107, 26483,
-    {f: 2, c: 26165}, 26164, 26140, 26191, 26180, 26185, 26177, 26206, 26205,
-    26212, {f: 2, c: 26215}, 26207, 26210, 26224, 26243, 26248, 26254, 26249,
-    26244, 26264, 26269, 26305, 26297, 26313, 26302, 26300, 26308, 26296,
-    26326, 26330, 26336, 26175, 26342, 26345, [12104, 26352], 26357, 26359,
-    26383, 26390, 26398, {f: 2, c: 26406}, 38712, 26414, 26431, 26422, 26433,
-    26424, 26423, 26438, 26462, 26464, 26457, {f: 2, c: 26467}, 26505, 26480,
-    26537, 26492, 26474, 26508, 26507, 26534, 26529, 26501, 26551, 26607,
-    26548, 26604, 26547, 26601, 26552, 26596, 26590, 26589, 26594, 26606,
-    26553, 26574, 26566, 26599, 27292, 26654, 26694, 26665, 26688, 26701,
-    26674, 26702, 26803, 26667, 26713, 26723, 26743, 26751, 26783, 26767,
-    26797, 26772, 26781, 26779, 26755, 27310, 26809, 26740, 26805, 26784,
-    26810, 26895, 26765, 26750, 26881, 26826, 26888, 26840, 26914, 26918,
-    26849, 26892, 26829, 26836, 26855, 26837, 26934, 26898, 26884, 26839,
-    26851, 26917, 26873, 26848, 26863, 26920, 26922, 26906, 26915, 26913,
-    26822, 27001, 26999, 26972, 27000, 26987, 26964, 27006, 26990, 26937,
-    26996, 26941, 26969, 26928, 26977, 26974, 26973, 27009, 26986, 27058,
-    27054, 27088, 27071, 27073, 27091, 27070, 27086, 23528, 27082, 27101,
-    27067, 27075, 27047, 27182, 27025, 27040, 27036, 27029, 27060, 27102,
-    27112, 27138, 27163, 27135, 27402, 27129, 27122, 27111, 27141, 27057,
-    27166, 27117, 27156, 27115, 27146, 27154, 27329, 27171, 27155, 27204,
-    27148, 27250, 27190, 27256, 27207, 27234, 27225, 27238, 27208, 27192,
-    27170, 27280, 27277, 27296, 27268, {f: 2, c: 27298}, 27287, 34327, 27323,
-    27331, 27330, 27320, 27315, 27308, 27358, 27345, 27359, 27306, 27354,
-    27370, 27387, 27397, 34326, 27386, 27410, 27414, 39729, 27423, 27448,
-    27447, 30428, 27449, 39150, 27463, 27459, 27465, 27472, 27481, 27476,
-    27483, 27487, 27489, 27512, [12109, 27513], {f: 2, c: 27519}, 27524, 27523,
-    27533, 27544, 27541, 27550, 27556, {f: 2, c: 27562}, 27567, 27570, 27569,
-    [12110, 27571], 27575, 27580, 27590, [12111, 27595], 27603, 27615, 27628,
-    27627, 27635, 27631, 40638, 27656, 27667, [12115, 27668], 27675, 27684,
-    27683, 27742, 27733, 27746, 27754, 27778, 27789, 27802, 27777, 27803,
-    27774, 27752, 27763, 27794, 27792, 27844, 27889, 27859, 27837, 27863,
-    27845, 27869, 27822, 27825, 27838, 27834, 27867, 27887, 27865, 27882,
-    27935, 34893, 27958, 27947, 27965, 27960, 27929, 27957, 27955, 27922,
-    27916, 28003, 28051, 28004, 27994, 28025, 27993, 28046, 28053, 28644,
-    28037, 28153, 28181, 28170, 28085, 28103, 28134, 28088, 28102, 28140,
-    28126, 28108, 28136, 28114, 28101, 28154, 28121, 28132, 28117, 28138,
-    28142, 28205, 28270, 28206, 28185, 28274, 28255, 28222, 28195, 28267,
-    28203, 28278, 28237, 28191, 28227, 28218, 28238, 28196, 28415, 28189,
-    28216, 28290, 28330, 28312, 28361, 28343, 28371, 28349, 28335, 28356,
-    28338, {f: 2, c: 28372}, 28303, 28325, 28354, 28319, 28481, 28433, 28748,
-    28396, 28408, 28414, 28479, 28402, 28465, 28399, 28466, 28364, 28478,
-    28435, 28407, 28550, 28538, 28536, 28545, 28544, 28527, 28507, 28659,
-    28525, 28546, 28540, 28504, 28558, 28561, 28610, 28518, 28595, 28579,
-    28577, 28580, 28601, 28614, 28586, 28639, 28629, 28652, 28628, 28632,
-    28657, 28654, 28635, 28681, 28683, 28666, 28689, 28673, 28687, 28670,
-    28699, 28698, 28532, 28701, 28696, 28703, 28720, 28734, 28722, 28753,
-    28771, 28825, 28818, 28847, 28913, 28844, 28856, 28851, 28846, 28895,
-    28875, 28893, 28889, 28937, 28925, 28956, 28953, 29029, 29013, 29064,
-    29030, 29026, 29004, 29014, 29036, 29071, 29179, 29060, 29077, 29096,
-    29100, 29143, 29113, 29118, 29138, 29129, 29140, 29134, 29152, 29164,
-    29159, 29173, 29180, 29177, 29183, 29197, 29200, 29211, 29224, 29229,
-    29228, 29232, 29234, [12120, 29243], 29244, [12121, 29247], 29248, 29254,
-    29259, 29272, 29300, 29310, 29314, 29313, 29319, 29330, 29334, 29346,
-    29351, 29369, 29362, 29379, 29382, 29380, 29390, 29394, 29410,
-    {f: 2, c: 29408}, 29433, 29431, 20495, 29463, 29450, 29468, 29462, 29469,
-    29492, 29487, 29481, 29477, 29502, {f: 2, c: 29518}, 40664, 29527, 29546,
-    29544, 29552, 29560, 29557, 29563, 29562, 29640, 29619, 29646, 29627,
-    29632, 29669, 29678, 29662, 29858, 29701, 29807, 29733, 29688, 29746,
-    29754, 29781, 29759, 29791, 29785, 29761, 29788, 29801, 29808, 29795,
-    29802, 29814, 29822, 29835, 29854, 29863, 29898, 29903, 29908, 29681,
-    29920, 29923, 29927, 29929, 29934, 29938, {f: 2, c: 29936}, 29944, 29943,
-    29956, 29955, 29957, 29964, 29966, 29965, 29973, 29971, 29982, 29990,
-    29996, 30012, 30020, 30029, 30026, 30025, 30043, 30022, 30042, 30057,
-    30052, 30055, 30059, 30061, 30072, 30070, {f: 2, c: 30086}, 30068, 30090,
-    30089, 30082, 30100, 30106, 30109, 30117, 30115, 30146, 30131, 30147,
-    30133, 30141, 30136, 30140, 30129, 30157, 30154, 30162, 30169, 30179,
-    30174, {f: 2, c: 30206}, 30204, 30209, 30192, 30202, {f: 2, c: 30194},
-    30219, 30221, 30217, 30239, 30247, {f: 3, c: 30240}, 30244, 30260, 30256,
-    30267, {f: 2, c: 30279}, 30278, 30300, 30296, {f: 2, c: 30305},
-    {f: 3, c: 30312}, 30311, 30316, 30320, 30322, [12136, 30326], 30328, 30332,
-    30336, 30339, 30344, 30347, 30350, 30358, 30355, {f: 2, c: 30361}, 30384,
-    30388, {f: 3, c: 30392}, 30402, 30413, 30422, 30418, 30430, 30433, 30437,
-    30439, 30442, 34351, 30459, 30472, 30471, 30468, 30505, 30500, 30494,
-    {f: 2, c: 30501}, 30491, {f: 2, c: 30519}, 30535, 30554, 30568, 30571,
-    30555, 30565, 30591, 30590, 30585, 30606, 30603, 30609, 30624, 30622,
-    30640, 30646, 30649, 30655, {f: 2, c: 30652}, 30651, 30663, 30669, 30679,
-    30682, 30684, 30691, 30702, 30716, 30732, 30738, 31014, 30752, 31018,
-    30789, 30862, 30836, 30854, 30844, 30874, 30860, 30883, 30901, 30890,
-    30895, 30929, 30918, 30923, 30932, 30910, 30908, 30917, 30922, 30956,
-    30951, 30938, 30973, 30964, 30983, 30994, 30993, 31001, 31020, 31019,
-    31040, 31072, 31063, 31071, 31066, 31061, 31059, 31098, 31103, 31114,
-    31133, 31143, 40779, 31146, 31150, 31155, {f: 2, c: 31161}, 31177, 31189,
-    31207, 31212, 31201, 31203, 31240, 31245, {f: 2, c: 31256}, 31264, 31263,
-    31104, 31281, 31291, 31294, 31287, 31299, 31319, 31305, {f: 2, c: 31329},
-    31337, 40861, 31344, 31353, 31357, 31368, 31383, 31381, 31384, 31382,
-    31401, 31432, 31408, 31414, 31429, 31428, 31423, 36995, 31431, 31434,
-    31437, 31439, 31445, 31443, {f: 2, c: 31449}, 31453, {f: 2, c: 31457},
-    31462, 31469, 31472, 31490, 31503, 31498, 31494, 31539, {f: 2, c: 31512},
-    31518, 31541, 31528, 31542, 31568, 31610, 31492, 31565, 31499, 31564,
-    31557, 31605, 31589, 31604, 31591, {f: 2, c: 31600}, 31596, 31598, 31645,
-    31640, 31647, 31629, 31644, 31642, 31627, 31634, 31631, 31581, 31641,
-    31691, 31681, 31692, 31695, 31668, 31686, 31709, 31721, 31761, 31764,
-    31718, 31717, 31840, 31744, 31751, 31763, 31731, 31735, 31767, 31757,
-    31734, 31779, 31783, 31786, 31775, 31799, 31787, 31805, 31820, 31811,
-    31828, 31823, 31808, 31824, 31832, 31839, 31844, 31830, 31845, 31852,
-    31861, 31875, 31888, 31908, 31917, 31906, 31915, 31905, 31912, 31923,
-    31922, 31921, 31918, 31929, 31933, 31936, 31941, 31938, 31960, 31954,
-    31964, 31970, 39739, 31983, 31986, 31988, 31990, 31994, 32006, 32002,
-    32028, 32021, 32010, 32069, 32075, 32046, 32050, 32063, 32053, 32070,
-    32115, 32086, 32078, 32114, 32104, 32110, 32079, 32099, 32147, 32137,
-    32091, 32143, 32125, 32155, 32186, 32174, 32163, 32181, 32199, 32189,
-    32171, 32317, 32162, 32175, 32220, 32184, 32159, 32176, 32216, 32221,
-    32228, 32222, 32251, 32242, 32225, 32261, 32266, 32291, 32289, 32274,
-    32305, 32287, 32265, 32267, 32290, 32326, 32358, 32315, 32309, 32313,
-    32323, 32311, 32306, 32314, 32359, 32349, 32342, 32350, {f: 2, c: 32345},
-    32377, 32362, 32361, 32380, 32379, 32387, 32213, 32381, 36782, 32383,
-    {f: 2, c: 32392}, 32396, 32402, 32400, {f: 2, c: 32403}, 32406, 32398,
-    {f: 2, c: 32411}, 32568, 32570, 32581, {f: 3, c: 32588}, 32592,
-    [12153, 32593], 32597, 32596, 32600, {f: 2, c: 32607}, {f: 2, c: 32616},
-    32615, 32632, 32642, 32646, 32643, 32648, 32647, 32652, 32660, 32670,
-    32669, 32666, 32675, 32687, 32690, 32697, 32686, 32694, 32696, 35697,
-    {f: 2, c: 32709}, 32714, 32725, 32724, 32737, 32742, 32745, 32755, 32761,
-    39132, 32774, 32772, 32779, [12158, 32786], {f: 2, c: 32792}, 32796, 32801,
-    32808, 32831, 32827, 32842, 32838, 32850, 32856, 32858, 32863, 32866,
-    32872, 32883, 32882, 32880, 32886, 32889, 32893, [12160, 32895], 32900,
-    32902, 32901, 32923, 32915, 32922, 32941, 20880, 32940, 32987, 32997,
-    32985, 32989, 32964, 32986, 32982, 33033, 33007, 33009, 33051, 33065,
-    33059, 33071, 33099, 38539, 33094, 33086, 33107, 33105, 33020, 33137,
-    33134, {f: 2, c: 33125}, 33140, 33155, 33160, 33162, 33152, 33154, 33184,
-    33173, 33188, 33187, 33119, 33171, 33193, 33200, 33205, 33214, 33208,
-    33213, 33216, 33218, 33210, 33225, 33229, 33233, 33241, 33240, 33224,
-    33242, {f: 2, c: 33247}, 33255, {f: 2, c: 33274}, 33278, {f: 2, c: 33281},
-    33285, 33287, 33290, 33293, 33296, 33302, 33321, 33323, 33336, 33331,
-    33344, 33369, 33368, 33373, 33370, 33375, 33380, 33378, 33384,
-    {f: 2, c: 33386}, 33326, 33393, 33399, [12171, 33400], 33406, 33421, 33426,
-    33451, 33439, 33467, 33452, 33505, 33507, 33503, 33490, 33524, 33523,
-    33530, 33683, 33539, 33531, 33529, 33502, 33542, 33500, 33545, 33497,
-    33589, 33588, 33558, 33586, 33585, 33600, 33593, 33616, 33605, 33583,
-    33579, {f: 2, c: 33559}, 33669, 33690, 33706, 33695, 33698, 33686, 33571,
-    33678, 33671, 33674, 33660, 33717, 33651, 33653, 33696, 33673, 33704,
-    33780, 33811, 33771, 33742, 33789, 33795, 33752, 33803, 33729, 33783,
-    33799, 33760, 33778, 33805, 33826, 33824, 33725, 33848, 34054, 33787,
-    33901, 33834, 33852, 34138, 33924, 33911, 33899, 33965, 33902, 33922,
-    33897, 33862, 33836, 33903, 33913, 33845, 33994, 33890, 33977, 33983,
-    33951, 34009, 33997, 33979, 34010, 34000, 33985, 33990, 34006, 33953,
-    34081, 34047, 34036, {f: 2, c: 34071}, 34092, 34079, 34069, 34068, 34044,
-    34112, 34147, 34136, 34120, 34113, 34306, 34123, 34133, 34176, 34212,
-    34184, 34193, 34186, 34216, 34157, 34196, 34203, 34282, 34183, 34204,
-    34167, 34174, 34192, 34249, 34234, 34255, 34233, 34256, 34261, 34269,
-    34277, 34268, 34297, 34314, 34323, 34315, 34302, 34298, 34310, 34338,
-    34330, 34352, 34367, [12172, 34381], 20053, 34388, 34399, 34407, 34417,
-    34451, 34467, {f: 2, c: 34473}, {f: 2, c: 34443}, 34486, 34479, 34500,
-    34502, 34480, 34505, 34851, 34475, 34516, 34526, 34537, 34540, 34527,
-    34523, 34543, 34578, 34566, 34568, 34560, 34563, 34555, 34577, 34569,
-    34573, 34553, 34570, 34612, 34623, 34615, 34619, 34597, 34601, 34586,
-    34656, 34655, 34680, 34636, 34638, 34676, 34647, 34664, 34670, 34649,
-    34643, 34659, 34666, 34821, 34722, 34719, 34690, 34735, 34763, 34749,
-    34752, 34768, 38614, 34731, 34756, 34739, 34759, 34758, 34747, 34799,
-    34802, 34784, 34831, 34829, 34814, {f: 2, c: 34806}, 34830, 34770, 34833,
-    34838, 34837, 34850, 34849, 34865, 34870, 34873, 34855, 34875, 34884,
-    34882, 34898, 34905, 34910, 34914, 34923, 34945, 34942, 34974, 34933,
-    34941, 34997, 34930, 34946, 34967, 34962, 34990, 34969, 34978, 34957,
-    34980, 34992, 35007, 34993, {f: 2, c: 35011}, 35028, {f: 2, c: 35032},
-    35037, 35065, 35074, 35068, 35060, 35048, 35058, 35076, 35084, 35082,
-    35091, 35139, 35102, 35109, {f: 2, c: 35114}, 35137, 35140, 35131, 35126,
-    35128, 35148, 35101, 35168, 35166, 35174, 35172, 35181, 35178, 35183,
-    35188, 35191, [12177, 35198], 35203, 35208, 35210, 35219, 35224, 35233,
-    35241, 35238, 35244, 35247, 35250, 35258, 35261, {f: 2, c: 35263}, 35290,
-    {f: 2, c: 35292}, 35303, 35316, 35320, 35331, 35350, 35344, 35340, 35355,
-    35357, 35365, 35382, 35393, 35419, 35410, 35398, 35400, 35452, 35437,
-    35436, 35426, 35461, 35458, 35460, 35496, 35489, 35473, {f: 2, c: 35493},
-    35482, 35491, 35524, 35533, 35522, 35546, 35563, 35571, 35559, 35556,
-    35569, 35604, 35552, 35554, 35575, 35550, 35547, 35596, 35591, 35610,
-    35553, 35606, 35600, 35607, 35616, 35635, 38827, 35622, 35627, 35646,
-    35624, 35649, 35660, 35663, 35662, 35657, 35670, 35675, 35674, 35691,
-    35679, 35692, 35695, 35700, 35709, 35712, 35724, 35726, {f: 2, c: 35730},
-    35734, {f: 2, c: 35737}, 35898, 35905, 35903, 35912, 35916, 35918, 35920,
-    [12183, 35925], 35938, 35948, [12184, 35960], 35962, 35970, 35977, 35973,
-    35978, {f: 2, c: 35981}, 35988, 35964, 35992, 25117, 36013, 36010, 36029,
-    {f: 2, c: 36018}, 36014, 36022, 36040, 36033, 36068, 36067, 36058, 36093,
-    {f: 2, c: 36090}, {f: 2, c: 36100}, 36106, 36103, 36111, 36109, 36112,
-    40782, 36115, 36045, 36116, 36118, 36199, 36205, 36209, 36211, 36225,
-    36249, 36290, 36286, 36282, 36303, 36314, 36310, 36300, 36315, 36299,
-    {f: 2, c: 36330}, 36319, 36323, 36348, {f: 2, c: 36360}, 36351,
-    {f: 2, c: 36381}, 36368, 36383, 36418, 36405, 36400, 36404, 36426, 36423,
-    36425, 36428, 36432, 36424, 36441, 36452, 36448, 36394, 36451, 36437,
-    36470, 36466, 36476, 36481, 36487, 36485, 36484, 36491, 36490, 36499,
-    36497, 36500, 36505, 36522, 36513, 36524, 36528, 36550, 36529, 36542,
-    36549, 36552, 36555, 36571, 36579, 36604, 36603, 36587, 36606, 36618,
-    36613, 36629, 36626, 36633, 36627, 36636, 36639, 36635, 36620, 36646,
-    36659, 36667, 36665, 36677, 36674, 36670, 36684, 36681, 36678, 36686,
-    36695, 36700, {f: 3, c: 36706}, 36764, 36767, 36771, 36781, 36783, 36791,
-    36826, 36837, 36834, 36842, 36847, 36999, 36852, 36869, {f: 2, c: 36857},
-    36881, 36885, 36897, 36877, 36894, 36886, 36875, 36903, 36918, 36917,
-    36921, 36856, {f: 4, c: 36943}, 36878, 36937, 36926, 36950, 36952, 36958,
-    36968, 36975, 36982, 38568, 36978, 36994, 36989, 36993, 36992, 37002,
-    37001, 37007, 37032, 37039, 37041, 37045, 37090, 37092, 25160, 37083,
-    37122, 37138, 37145, 37170, 37168, 37194, 37206, 37208, 37219, 37221,
-    37225, 37235, 37234, 37259, 37257, 37250, 37282, 37291, 37295, 37290,
-    37301, 37300, 37306, {f: 2, c: 37312}, 37321, 37323, 37328, 37334, 37343,
-    37345, 37339, 37372, {f: 2, c: 37365}, 37406, 37375, 37396, 37420, 37397,
-    37393, 37470, 37463, 37445, 37449, 37476, 37448, 37525, 37439, 37451,
-    37456, 37532, 37526, 37523, 37531, 37466, 37583, 37561, 37559, 37609,
-    37647, 37626, 37700, 37678, 37657, 37666, 37658, 37667, 37690, 37685,
-    37691, 37724, 37728, 37756, 37742, 37718, 37808, {f: 2, c: 37804}, 37780,
-    37817, {f: 2, c: 37846}, 37864, 37861, 37848, 37827, 37853, 37840, 37832,
-    37860, 37914, 37908, 37907, 37891, 37895, 37904, 37942, 37931, 37941,
-    37921, 37946, 37953, 37970, 37956, 37979, 37984, 37986, 37982, 37994,
-    37417, 38000, 38005, 38007, 38013, 37978, 38012, 38014, 38017, 38015,
-    38274, 38279, 38282, 38292, 38294, {f: 2, c: 38296}, 38304, 38312, 38311,
-    38317, 38332, 38331, 38329, 38334, 38346, 28662, 38339, 38349, 38348,
-    38357, 38356, 38358, 38364, 38369, 38373, 38370, 38433, 38440,
-    {f: 2, c: 38446}, 38466, 38476, 38479, 38475, 38519, 38492, 38494, 38493,
-    38495, 38502, 38514, 38508, 38541, 38552, 38549, 38551, 38570, 38567,
-    {f: 2, c: 38577}, 38576, 38580, [12202, 38582], 38584, [12203, 38585],
-    38606, 38603, 38601, 38605, 35149, 38620, 38669, 38613, 38649, 38660,
-    38662, 38664, 38675, 38670, 38673, 38671, 38678, 38681, 38692, 38698,
-    38704, 38713, {f: 2, c: 38717}, 38724, 38726, 38728, 38722, 38729, 38748,
-    38752, 38756, 38758, 38760, 21202, 38763, 38769, 38777, 38789, 38780,
-    38785, 38778, 38790, 38795, {f: 2, c: 38799}, 38812, 38824, 38822, 38819,
-    {f: 2, c: 38835}, 38851, 38854, 38856, [12209, 38859], 38876,
-    [12210, 38893], 40783, 38898, 31455, 38902, 38901, 38927, 38924, 38968,
-    38948, 38945, 38967, 38973, 38982, 38991, 38987, 39019, {f: 3, c: 39023},
-    39028, 39027, 39082, 39087, 39089, 39094, 39108, 39107, 39110, 39145,
-    39147, 39171, 39177, 39186, 39188, 39192, 39201, {f: 2, c: 39197}, 39204,
-    39200, 39212, 39214, {f: 2, c: 39229}, 39234, 39241, 39237, 39248, 39243,
-    {f: 2, c: 39249}, 39244, 39253, {f: 2, c: 39319}, 39333, {f: 2, c: 39341},
-    39356, 39391, 39387, 39389, 39384, 39377, {f: 2, c: 39405},
-    {f: 2, c: 39409}, 39419, 39416, 39425, 39439, 39429, 39394, 39449, 39467,
-    39479, 39493, 39490, 39488, 39491, 39486, 39509, 39501, 39515, 39511,
-    39519, 39522, 39525, 39524, 39529, 39531, 39530, 39597, 39600, 39612,
-    39616, 39631, 39633, {f: 2, c: 39635}, 39646, [12221, 39647],
-    {f: 2, c: 39650}, 39654, 39663, 39659, 39662, 39668, 39665, 39671, 39675,
-    39686, 39704, 39706, 39711, {f: 2, c: 39714}, [12222, 39717],
-    {f: 4, c: 39719}, 39726, [12223, 39727], [12224, 39730], 39748, 39747,
-    39759, {f: 2, c: 39757}, 39761, 39768, 39796, 39827, 39811, 39825,
-    {f: 2, c: 39830}, {f: 2, c: 39839}, 39848, 39860, 39872, 39882, 39865,
-    39878, 39887, {f: 2, c: 39889}, 39907, 39906, 39908, 39892, 39905, 39994,
-    39922, 39921, 39920, 39957, 39956, 39945, 39955, 39948, 39942, 39944,
-    39954, 39946, 39940, 39982, 39963, 39973, 39972, 39969, 39984, 40007,
-    39986, 40006, 39998, 40026, 40032, 40039, 40054, 40056, 40167, 40172,
-    40176, 40201, 40200, 40171, 40195, 40198, 40234, 40230, 40367, 40227,
-    40223, 40260, 40213, 40210, 40257, 40255, 40254, 40262, 40264,
-    {f: 2, c: 40285}, 40292, 40273, 40272, 40281, 40306, 40329, 40327, 40363,
-    40303, 40314, 40346, 40356, 40361, 40370, 40388, 40385, 40379, 40376,
-    40378, 40390, 40399, 40386, 40409, 40403, 40440, 40422, 40429, 40431,
-    40445, {f: 2, c: 40474}, 40478, [12228, 40565], 40569, 40573, 40577, 40584,
-    {f: 2, c: 40587}, 40594, 40597, 40593, 40605, [12230, 40613], 40617, 40632,
-    40618, 40621, 38753, 40652, {f: 3, c: 40654}, 40660, 40668, 40670, 40669,
-    40672, 40677, 40680, 40687, 40692, {f: 2, c: 40694}, [12235, 40697],
-    {f: 2, c: 40699}, [12236, 40701], {f: 2, c: 40711}, 30391, 40725, 40737,
-    40748, 40766, [12241, 40778], [12242, 40786], 40788, 40803,
-    {f: 3, c: 40799}, {f: 2, c: 40806}, 40812, 40810, 40823, 40818, 40822,
-    40853, [12244, 40860], [12245, 40864], 22575, 27079, 36953, 29796, 0,
-    {f: 76, c: 9472}, {f: 20, c: 9312}, {f: 10, c: 8544}, 13129, 13076, 0,
-    13133, 0, 13095, 0, 13110, 13137, 0, 13069, 13094, 0, 13099, 13130, 0,
-    {f: 3, c: 13212}, {f: 2, c: 13198}, 13252, 13217, 12317, 12319, 8470,
-    13261, 0, {f: 5, c: 12964}, {f: 2, c: 12849}, 12857, 13182, 13181, 13180,
-    8750, 8721, {s: 3}, 8735, 8895, 0, 0, 21854, {s: 7}, 167133, 0, 0, 28976,
-    0, 40407, {s: 4}, 64054, 0, 0, 22169, 15694, {s: 4}, 20448, 0, 0, 36544, 0,
-    194797, {s: 4}, 153716, 32363, 33606, 167670, {s: 3}, 40572, 0, 0, 26171,
-    0, 40628, {s: 4}, 26629, {s: 5}, 23650, 0, 194780, 0, 32353, 0, 0, 64070,
-    {s: 5}, 34083, 37292, {s: 7}, 34796, {s: 8}, 25620, 0, 0, 39506, {s: 4},
-    64074, 0, 194692, {s: 4}, 31774, {s: 6}, 64016, 25681, 0, 0, 63980, 22625,
-    39002, 0, 194679, {s: 3}, 31153, 0, 28678, {s: 9}, 22218, {s: 3}, 21085, 0,
-    28497, 37297, {s: 10}, 64106, {s: 6}, 38960, 0, 40629, {s: 9}, 33802,
-    63939, {f: 2, c: 63890}, 63897, 0, 34847, 194575, 0, 194771, 194584,
-    {s: 7}, 137754, 23643, {s: 4}, 25890, 0, 0, 26618, 0, 26766, 0, 148432,
-    194848, {s: 21}, 34110, {s: 15}, 30562, {s: 12}, 65075, 0,
-    {f: 2, c: 65073}, {s: 4}, 65072, {f: 2, c: 65077}, {f: 2, c: 65081}, 0, 0,
-    {f: 2, c: 65079}, {f: 2, c: 65087}, {f: 2, c: 65085}, {f: 4, c: 65089},
-    {f: 2, c: 65083}, {s: 41}, {f: 3, c: 12436}, 0, 0, 22099, {s: 41}, 65508,
-    65287, 65282, 0, 9665, 9655, 8681, 8679, 8678, 8680, 9634, 9831, 9825,
-    9828, 9826, 13216, 13218, {f: 2, c: 13220}, 13207, 8467, 13208, 13235,
-    13234, 13233, 13232, {f: 3, c: 13189}, 13259, 13200, 13268, 13206, 13090,
-    13078, 13080, 13077, 13059, 13091, 13143, 13122, 13113, 13115, 13056,
-    13105, 13127, 13086, 13098, 0, 13183, 8481, 9742, 12342, 12320, {s: 3},
-    {f: 9, c: 9352}, {f: 20, c: 9332}, 12881, {f: 10, c: 8560},
-    {f: 10, c: 12882}, {f: 26, c: 9372}, 12867, 12861, 12863, 12852, 12856,
-    12851, 12860, 12866, 12862, 12854, 12853, 12859, 12864, 12858, 12976,
-    12973, 12969, 12975, 12948, 12970, 12952, 12971, 12946, 12945, 12947,
-    12972, 12974, 12950, {s: 8}, {f: 3, c: 9131}, 0, {f: 3, c: 9127}, 0, 13260,
-    13061, 0, 0, 13215, 13219, 13222, 0, 0, 12958, {f: 2, c: 13192}, 13256,
-    8749, 0, 12848, {f: 6, c: 12842}, 12855, 12865, 10145, {s: 3}, 9673, 9824,
-    9829, 9827, 9830, {f: 4, c: 9728}, 9758, {f: 2, c: 9756}, 9759, 12953,
-    9450, {f: 2, c: 8554}, {s: 3}, {f: 8, c: 9601}, 9615, 9614, 9613, 9612,
-    9611, 9610, 9609, {f: 2, c: 9620}, {f: 2, c: 9581}, 9584, 9583, 9552, 9566,
-    9578, 9569, {f: 2, c: 9698}, 9701, 9700, 0, 0, {f: 3, c: 9585}, {s: 20},
-    20956, 29081, {f: 9, c: 10102}, {s: 3}, {f: 2, c: 8570}, {s: 3}, 8575,
-    8458, 8457, 0, 0, 12292, 8646, {f: 2, c: 8644}, 0, {f: 4, c: 12535}, 0, 0,
-    12957, {s: 3}, 13179, {s: 3}, 13107, 13134, {s: 30}, 32394, 35100, 37704,
-    37512, 34012, 20425, 28859, 26161, 26824, 37625, 26363, 24389,
-    [12033, 20008], 20193, 20220, 20224, 20227, 20281, 20310, 20370, 20362,
-    20378, 20372, 20429, 20544, 20514, 20479, 20510, 20550, 20592, 20546,
-    20628, 20724, 20696, 20810, 20836, 20893, 20926, 20972, 21013, 21148,
-    21158, 21184, 21211, 21248, 0, 21284, 21362, 21395, 21426, 21469, 64014,
-    21660, 21642, 21673, 21759, 21894, 22361, 22373, 22444, 22472, 22471,
-    64015, 0, 22686, 22706, 22795, 22867, 22875, 22877, 22883, 22948, 22970,
-    23382, 23488, 29999, 23512, 0, 23582, 23718, 23738, 23797, 23847, 23891, 0,
-    23874, 23917, {f: 2, c: 23992}, 24016, 24353, 24372, 24423, 24503, 24542,
-    24669, 24709, 24714, 24798, 24789, 24864, 24818, 24849, 24887, 24880,
-    24984, 25107, 25254, 25589, 25696, 25757, 25806, 25934, 26112, 26133,
-    26121, 26158, 0, 26148, 26213, 26199, 26201, 64018, 26227, 26265, 26272,
-    26290, 26303, 26362, 26382, 0, 26470, 26555, 26706, 26560, 0, 26692, 26831,
-    64019, 26984, 64020, 27032, 27106, 27184, 27243, 27206, 27251, 27262,
-    27362, 27364, 27606, 27711, 27740, 27782, 27759, 27866, 27908, 28039,
-    28015, 28054, 28076, 28111, 28152, 28146, 28156, 28217, 28252, 28199,
-    28220, 28351, 28552, 28597, 28661, 28677, 28679, 28712, 28805, 28843,
-    28943, 28932, 29020, {f: 2, c: 28998}, 0, 29121, 29182, 29361, 29374,
-    29476, 64022, 29559, 29629, 29641, 29654, 29667, 29650, 29703, 29685,
-    29734, 29738, 29737, 29742, 0, 29833, 29855, 29953, 30063, 30338, 30364,
-    30366, 30363, 30374, 64023, 30534, 21167, 30753, 30798, 30820, 30842,
-    31024, {f: 3, c: 64024}, 31124, 64027, 31131, 31441, 31463, 64028, 31467,
-    31646, 64029, 32072, 0, 32183, 32160, 32214, 32338, 32583, 32673, 64030,
-    33537, 33634, 33663, 33735, 33782, 33864, 33972, 34131, 34137, 34155,
-    64031, 34224, {f: 2, c: 64032}, 34823, 35061, 35346, 35383, 35449, 35495,
-    35518, 35551, 64034, 35574, 35667, 35711, 36080, 36084, 36114, 36214,
-    64035, 36559, 0, 64037, 36967, 37086, 64038, 37141, 37159, 37338, 37335,
-    37342, {f: 2, c: 37357}, {f: 2, c: 37348}, 37382, 37392, 37386, 37434,
-    37440, 37436, 37454, 37465, 37457, 37433, 37479, 37543, {f: 2, c: 37495},
-    37607, 37591, 37593, 37584, 64039, 37589, 37600, 37587, 37669, 37665,
-    37627, 64040, 37662, 37631, 37661, 37634, 37744, 37719, 37796, 37830,
-    37854, 37880, 37937, 37957, 37960, 38290, 0, 64041, 38557, 38575, 38707,
-    38715, 38723, 38733, 38735, [12205, 38737], 0, 38999, 39013,
-    {f: 2, c: 64042}, 39207, 64044, 39326, 39502, 39641, 39644, 39797, 39794,
-    39823, 39857, 39867, 39936, 40304, 40299, 64045, 40473, 40657, {s: 636},
-    8364, 8486, 0, 0, 64256, {f: 2, c: 64259}, 257, 299, 363, 275, 333, 256,
-    298, 362, 274, 332, {f: 4, c: 8539}, {f: 2, c: 8531}, 8304,
-    {f: 6, c: 8308}, {f: 10, c: 8320}, 461, 282, 0, 7868, 463, 0, 296, 465, 0,
-    467, 366, 360, 462, 283, 0, 7869, 464, 0, 297, 466, 0, 468, 367, 361, 593,
-    8049, 8048, 509, 0, 596, 0, 0, 601, 0, 0, 602, 0, 0, 603, 8051, 8050, 0,
-    331, 629, 652, 0, 0, 658, 643, 720, {s: 682}, {f: 10, c: 12832}, {s: 108},
-    {f: 4, c: 12892}, {f: 15, c: 12977}, {s: 50}, {f: 26, c: 9424},
-    {f: 26, c: 9398}, {s: 48}, {f: 47, c: 13008}, 0, {f: 10, c: 12928}, 12944,
-    {f: 6, c: 12938}, 0, 12959, {s: 6}, {f: 2, c: 12960}, 12955, 12954, 12963,
-    12962, 12951, 0, 12956, 12949, {s: 6}, 9676, {s: 11}, 10111,
-    {f: 10, c: 9451}, {s: 510}, 8414, {s: 815}, 13274, {s: 3}, 8448, 13250, 0,
-    0, 8453, 0, 13169, 0, 0, 13197, 13211, {s: 3}, {f: 2, c: 13271}, {s: 3},
-    {f: 2, c: 13057}, 13060, 13062, 0, 13064, 0, 13063, 13066, 0, 13065, 0,
-    13067, 0, 13068, {f: 6, c: 13070}, 0, 13079, 0, 13081, 0, {f: 4, c: 13082},
-    {f: 3, c: 13087}, 13092, 0, 13093, 0, 0, {f: 2, c: 13096}, 0, 13101, 0, 0,
-    {f: 3, c: 13102}, 13106, 0, 0, {f: 2, c: 13108}, 13116, {s: 3}, 13111, 0,
-    13112, 13114, 13117, 13121, {f: 3, c: 13118}, {f: 4, c: 13123}, 13128,
-    {f: 2, c: 13131}, {f: 2, c: 13135}, 0, 0, 13138, 13140, 0, 0, 13139,
-    {f: 2, c: 13141}, {s: 132}, 8501, 976, 8714, 8463, 0, 981, 987, 977, 0,
-    {f: 2, c: 9832}, 9836, {s: 5}, 12347, 0, {f: 3, c: 12339}, 8252, 8265,
-    {s: 5}, 8723, 0, 8771, {f: 2, c: 8818}, {s: 6}, {f: 2, c: 12312},
-    {f: 2, c: 65375}, {s: 10}, 9115, {f: 2, c: 9117}, 9120, {s: 4}, 9121,
-    {f: 2, c: 9123}, 9126, {s: 12}, [9116, 9119, 9122, 9125, 9130], {s: 8},
-    9986, 0, 0, 12349, 0, 12447, 0, 0, 8709, 8864, 8854, 8856, 8853, 8855,
-    {s: 4}, 9664, 9654, {s: 4}, 8656, 8596, {f: 2, c: 8600}, {f: 2, c: 8598},
-    8652, 8651, {s: 10}, 12336, 8967, {s: 8}, 10048, 10047, {s: 7}, 9643, 0,
-    9642, 0, 10010, {s: 12}, 9702, {s: 4}, 10070, {s: 379}, {f: 2, c: 65093},
-    {s: 679}, 64103, 64098, 32227, [12232, 40643], 28331, 64082, 64061, 64069,
-    64062, 27114, 28212, 64096, 64071, 64056, 64066, 64078, 34395, 64105,
-    64052, 64099, 25581, 25802, 30799, 64084, 63856, 64077, 64097, 64072,
-    64076, {f: 2, c: 64091}, 64081, 64067, 64090, 28041, 29376, 0, 194885,
-    64086, 64080, 64049, 64059, 24034, 64063, 64101, 21373, 64055, 64095,
-    24501, 64064, 0, 64083, 0, 64085, 64104, 64068, 64089, 26202, 64053, 64075,
-    64100, 64065, 64048, 0, 64057, 64051, 27493, 64058, 27599, 64050, 25150,
-    64079, 63773, 63964, 63798, 28122, 63952, 26310, 27511, 64087, 37706, 0,
-    37636, {s: 120}, 133390, {s: 120}, 35999, 11991, [11965, 158033], {s: 5},
-    37555, 38321, 0, 0, 194812, {s: 13}, 194965, {s: 8}, 194794, 0, 26478,
-    11974, 0, 194594, {s: 13}, 13314, 0, 0, 26083, {s: 4}, 134071, {s: 10},
-    171339, 0, 194611, 24378, {s: 8}, 11945, 0, 20465, {s: 7}, 63753, {s: 7},
-    11964, 0, 0, 194732, 26435, {s: 3}, 133732, 35329, 25142, 0, 0, 21555,
-    23067, {s: 3}, 25221, 0, 0, 194819, {s: 6}, 21567, {s: 9}, 27506, {s: 4},
-    29986, 19256, 0, 0, 24063, {s: 6}, 194827, 29626, 134047, {s: 3}, 194600,
-    0, 194849, {s: 5}, 194623, {s: 16}, 194675, {f: 2, c: 11916}, 23577,
-    {s: 3}, 131083, 23426, 194642, {s: 5}, 11997, [11999, 39136],
-    [11998, 169599], 14221, 0, [11927, 14586], 0, 194887, 0, [11909, 20155],
-    131490, {s: 7}, 13599, 0, 194738, 0, 0, [11971, 35200], {s: 4}, 31237,
-    {s: 4}, 35498, 0, 32085, 0, 28568, {s: 7}, 25591, 30246, {s: 4},
-    [11978, 163767], {s: 5}, 146686, {s: 5}, 13351, 0, 0, 33067, 0, 0, 194842,
-    {s: 5}, 11950, {s: 5}, 194714, {s: 3}, 194831, {s: 19}, 22305, 135741,
-    194586, 0, 64003, {s: 7}, 21534, 15240, 20839, {s: 4}, 63839, {s: 9},
-    20023, {s: 13}, [11946, 150804], 24421, 23020, 194658, 0, 24217, {s: 46},
-    13416, {s: 8}, 21200, {s: 9}, 26625, 0, 195024, 195039, {s: 5}, 153215, 0,
-    0, 11959, {s: 4}, 36534, 63775, {s: 3}, 63875, {s: 5}, 31867, 63906, 0,
-    63898, 0, [11961, 32770], 157360, {s: 4}, [11911, 132648], 0, 0, 131210,
-    194604, [11915, 13630], {s: 4}, 21589, 0, 22841, 0, 0, 23414, 194669,
-    23572, 14306, 23782, 0, 20040, 0, 0, 194742, {s: 4}, 158105, 25371, 0, 0,
-    26211, 0, 194779, 0, 0, 27126, 27014, {s: 3}, 27596, 0, 28183, 0, 0, 27818,
-    {s: 3}, [11942, 20012], 0, 0, 29935, 30069, 30188, 30286, 16305, 30570,
-    30633, {s: 6}, 31571, 0, 0, 16996, {s: 3}, 194924, 0, 0, 32328, {s: 5},
-    11955, {s: 4}, 33089, 17491, 0, [11966, 33401], [11967, 64094],
-    [11968, 64093], 0, 20857, 33626, {s: 3}, 17701, 0, 34292, 131248, {s: 4},
-    34429, 0, 13358, 35014, {s: 6}, 18406, {s: 8}, 36808, {s: 19}, 166279, 0,
-    0, 167447, 0, 0, 38969, {s: 6}, 39432, {s: 4}, 39903, {s: 10}, 148206,
-    {s: 5}, 21385, 0, 64017, 194785, 0, 146622, 132625, 0, {f: 2, c: 19972},
-    19999, 20011, {f: 2, c: 20015}, {f: 2, c: 20032}, 20036, [11907, 20058],
-    20095, 20109, 20118, 20153, 20176, 20192, 20221, 20223, 20235, 20245,
-    20320, 20283, 20297, 20308, 20346, {f: 2, c: 20349}, 20375, 20414, 20431,
-    20477, {f: 2, c: 20480}, 20496, 20507, 20519, 20526, 20567, 20582, 20586,
-    20539, 20623, 20630, 20636, 20684, 20710, 20713, 20719, 20744, 20747,
-    20752, 20763, 20766, 20831, 20897, 20924, 0, 20974, 20980, 20993,
-    [11913, 20994], 21011, 21065, 21089, 21094, 21139, 21192, 21232,
-    {f: 2, c: 21258}, 21310, 21324, 21323, 21345, 21356, 21419, 21466, 21478,
-    21493, 21543, 21581, 21606, 21611, 21620, 21645, 21654, 21665, 21677,
-    21689, 21695, 21702, 21709, 21774, 21803, 21813, 21834, 21856, 0, 21896,
-    21902, 22024, {f: 2, c: 22030}, 22071, 22079, 22089, 22091, 22095, 22118,
-    22121, 22127, {f: 2, c: 22129}, 22165, 22170, {f: 2, c: 22188}, 22193,
-    22217, 22237, 22244, 22282, 22293, 22307, 22319, {f: 2, c: 22323}, 22348,
-    22384, 22412, 22428, 22456, 22502, 22509, {f: 2, c: 22517}, 22527, 22537,
-    22560, 22578, 22652, 22656, 22697, 22734, 22736, 22740, 22746, 22761,
-    22796, 22820, 22831, 22881, 22893, 22986, 22994, 23005, {f: 2, c: 23011},
-    23044, 23052, 23075, 23111, 23125, 23139, 23149, 23166, 23198, 23207,
-    23212, 23219, 23264, 23296, 23321, 23333, 23341, 23361, 23420,
-    {f: 2, c: 23422}, 23434, [11919, 23587], 23595, 23600, 23651, 23657, 23676,
-    23755, 23762, 23796, 23844, 23846, 23875, 23878, 23882, 23954, 23956,
-    23961, 23968, 24024, 24032, 24056, 24064, 24082, {f: 2, c: 24084}, 24088,
-    24110, 24152, {f: 2, c: 24171}, 24232, 24234, {f: 2, c: 24254}, 0, 24274,
-    24327, 24334, {f: 2, c: 24348}, 24354, 24360, 24374, 24379, 24384,
-    [12089, 24400], 24408, 24420, 24457, 24476, 24487, 24484, 24495, 24504,
-    [11926, 24516], 24521, 24545, 24553, 24557, 24572, 24599, 24602, 24627,
-    24673, 24703, 24734, 24740, 24752, 24779, 24795, 24824, {f: 3, c: 24850},
-    24860, 24956, 24973, 24991, 25000, 25026, 25055, 25109, 25129, 25155,
-    25158, [11928, 25164], 25169, 25174, 25284, 25340, 25354, 25357, 25368,
-    25401, {f: 2, c: 25410}, 25445, 25460, 25469, 25476, 25479, 25488, 25502,
-    25553, 25564, 25609, 25616, 25634, 25684, 25691, 25709, 25723,
-    {f: 2, c: 25790}, 25829, 25847, 25851, 25860, 25878, 25881, 25927, 25959,
-    25985, 25989, 26050, 26096, 26098, 26156, 26188, {f: 2, c: 26203}, 26209,
-    26219, 0, 26276, 26312, 26348, 26373, 26387, 26419, 26440, 26444, 26486,
-    26491, 26544, 26546, 26617, 26583, 26585, 26608, 26668, {f: 2, c: 26672},
-    26715, 26738, 26741, 26746, 26756, 26789, 26802, 26832, 26838, 26856,
-    26861, {f: 2, c: 26864}, 26876, 26897, 26899, 26933, 26939, 26967, 26979,
-    26994, {f: 2, c: 27007}, 27046, 27053, 27063, {f: 2, c: 27094}, 27137,
-    27151, 27157, 27176, 27188, 27198, 27205, {f: 2, c: 27216}, 27222, 27227,
-    27267, 27273, 27281, {f: 3, c: 27293}, 27356, 27367, 27372, 27422, 27428,
-    27445, 27462, 27478, 27488, 27522, 27582, 27617, 27633, 27664, 27699,
-    [11937, 27701], 11938, 27737, 27766, 27771, 27781, 27797, 27804, 27856,
-    27860, 27862, 27872, {f: 2, c: 27883}, 27886, 27914, 27918, 27921, 27950,
-    27991, 27998, 28005, 28034, 28095, 28100, 28106, 28118, 28137, 28194,
-    28241, 28359, 28362, 28366, 28413, 28442, 28458, 28463, 28467, 28506,
-    28510, 28514, 28541, 28555, 28557, 28562, 28564, 28570, {f: 2, c: 28583},
-    28598, 28634, 28638, 0, 28729, 28732, 0, 28756, {f: 2, c: 28765}, 28772,
-    [11939, 28780], 28798, 28801, 28821, 28855, {f: 2, c: 28883}, 28888, 28892,
-    28935, 28960, 28977, 29002, 29010, 29024, 29049, 29074, 0, 29131, 29139,
-    29142, 29184, 29213, 29227, 29240, 29249, 29267, {f: 2, c: 29269}, 29276,
-    29325, [11944, 29357], 29364, 29383, 29435, {f: 2, c: 29444}, 29480, 29489,
-    29507, 29548, 29564, 29571, {f: 2, c: 29573}, 29589, {f: 3, c: 29598},
-    29606, 29611, 29621, 29623, 29628, 29647, 29657, 29673, 29684, 29693,
-    29700, 29706, {f: 2, c: 29722}, 29732, 29736, 29740, {f: 3, c: 29743},
-    29753, 29764, 29767, 29771, 29773, 29777, 29783, 29798, 29803, 29809,
-    29824, {f: 3, c: 29829}, 29840, 29848, 29852, 29856, 29859, 29864, 29867,
-    29877, 29887, 29896, 29914, 29918, 30030, 30073, 30081, 30096,
-    [12135, 30098], 30099, 30132, 30180, 30201, 30208, 30218, {f: 2, c: 30229},
-    30233, 30238, 30253, 30261, 30275, 30283, 30309, 30317, 30319, 30321,
-    30324, {f: 2, c: 30372}, 30405, 30412, 30444, 30460, 30516, 30518, 30556,
-    {f: 2, c: 30559}, 30578, 30589, 30613, 30634, 30694, 30704, 30708, 30726,
-    30754, {f: 2, c: 30765}, 30768, 30773, 30824, 30878, 30920, 30924, 30926,
-    30948, {f: 2, c: 30944}, 30962, 30967, 30971, 31025, 0, [11949, 31035],
-    31037, 31045, {f: 2, c: 31067}, 31115, 31126, 31128, [12145, 31160], 31163,
-    31178, 31194, 31235, 31241, 31249, 31262, 31277, 31289, 31301, 31308,
-    31325, 0, 31341, 31352, 31392, 31395, 31411, {f: 2, c: 31419}, 31430,
-    31495, 31508, 31527, 31537, 31559, 31566, 31584, 31593, 31597, 31602,
-    31633, 31663, 31703, 31705, 31755, 31759, 31776, 31782, 31793, 31798,
-    31825, 31833, 31847, 31854, 31856, 31932, 31935, {f: 2, c: 31944}, 31959,
-    31961, 31965, 31979, {f: 3, c: 32007}, 32019, 32029, 32035, 32065, 32083,
-    32089, 32093, 32122, 32134, {f: 2, c: 32139}, 32204, 32235, 32241, 32249,
-    32264, 32273, 32277, 32288, 32327, 32354, 32366, 32371, 32397, 32401,
-    32408, 32580, 32591, [11947, 11954, 32594], [11953, 32595], 32609, 32657,
-    32703, 32718, 32735, 32741, 32748, {f: 2, c: 32750}, 32762, 32782, 32785,
-    32788, 32804, 32806, 32826, 32828, 32864, 32881, 32885, 32926, 32934,
-    32939, {f: 2, c: 32983}, 33046, 33048, 33082, 33098, 33100, 33153, 33156,
-    33204, 33231, 33273, 33283, 33313, 33330, 33332, 33350, 33355, 33359,
-    33422, 33454, 33463, 33470, 33478, 33534, 33603, 33617, 33621, 33670,
-    33677, 33682, 33688, 33705, {f: 2, c: 33727}, 33770, 33807, 33809, 33866,
-    33910, 33960, 33967, 33984, 33986, 34032, 34045, 34060, 34100, 34142,
-    34191, 34231, 34254, 34221, 34322, 34345, 34386, 34403, 34412, 34415,
-    34426, 34445, 34449, 34456, {f: 2, c: 34471}, 34554, 34557, 34571, 34579,
-    34585, 34590, 34600, 34622, 34673, 34696, 34713, {f: 2, c: 34732}, 34741,
-    34774, 34795, 34797, 34817, 0, 34822, 34827, 34836, 34844, 34902, 34911,
-    [11970, 34916], 34968, 34986, {f: 2, c: 35005}, 35018, 35026, 35035,
-    {f: 2, c: 35056}, 35078, {f: 3, c: 35096}, 35111, 35120, 35134, 35195,
-    35284, 35286, 35301, 35313, 35335, 35343, 35349, 35362, 35406, 35455,
-    35572, 35615, 35639, {f: 2, c: 35651}, 35668, 35740, 35742, 35911, 35924,
-    35955, 36004, 36057, 36065, 36088, 36094, 36123, 36201, 36204, 36228,
-    36237, 36245, 36262, 36294, 36302, 36324, 36332, 36384, 36427, 36460,
-    36464, 36474, 36498, 36526, 36531, 36561, 36564, 36601, 36631, 36662,
-    36774, [12193, 36789], [11981, 36790], 0, 36832, 36836, 36854, 36866,
-    36908, 36932, 37000, 37013, 37017, 37019, 37026, 37044, 37079, 37085,
-    37108, 37143, 37148, 37169, 37178, 37181, 37192, 37211, 37217, 37220,
-    37262, 37278, 37288, {f: 2, c: 37293}, 37298, 37308, 37360, 37367, 37371,
-    37383, 37416, 37427, 37432, 37443, 37447, 37455, 37472, 37570,
-    {f: 2, c: 37579}, 37599, 37645, 37653, 37663, 37671, 37703, 37714, 0,
-    37738, 37741, 37787, 37818, 37801, 37825, 37834, 37858, 37882, 37885,
-    37903, 37940, 37951, 37973, 37995, 38002, [11986, 38264], 38310, 38313, 0,
-    38324, 38333, 38362, [11983, 11990, 38429], 38465, 38488, 38532, 38564,
-    38569, 38610, 195060, 38622, 38633, 38641, 38658, 38665, 38746, 38755,
-    38766, 38771, 38810, 38818, {f: 2, c: 38837}, 38873, 38878, 38900, 38922,
-    38926, 38942, 38947, 38955, 38974, {f: 2, c: 38994}, 39001, 39020, 39096,
-    39098, 39103, 39112, 39141, {f: 2, c: 39218}, 39232, 39245, 39260, 39263,
-    39345, {f: 2, c: 39353}, 39369, 39426, 39446, 39460, 39463,
-    {f: 2, c: 39469}, 39478, 39480, 39498, 39510, {f: 2, c: 39605}, 39673,
-    39683, 39712, {f: 2, c: 39731}, 39795, 39801, 39847, 39873, 39879, 39895,
-    39911, 39915, 39927, 39930, 39933, 39947, 39975, 39978, 39990, 40001,
-    40019, 40035, 40048, 40055, 40194, 40258, 40263, 40291, 40297, 40316,
-    40318, 40333, 40369, 40387, 40391, 40406, 40415, 40427, 40436, 40469,
-    40477, 40612, 40616, 40620, 40679, 40686, 40720, 40722, 40727, 40729,
-    40751, 40759, 40761, 40769, 40773, 40791, 40808, 40817, 40821, 40848,
-    40852, 40866, 0, 13317, 194564, 22048, 24267, 11925, 0, 144954, 0, 28665,
-    28390, 29107, [11940, 64073], {s: 4}, [11980, 64102], 0, 23986, 0, 20435,
-    20697, 20720, 20931, 22134, 27220, 27905, 28112, 28226, 28377, 29668,
-    29729, 30060, 30801, 34805, 144382, 29608, 15091, 13531, 17420, 16010, 0,
-    0, 19432, 0, 16090, 15138, 0, 17786, 16531, 0, 18021, 16643, 17043, 18094,
-    13448, 140809, {f: 3, c: 63584}, 63610, 63615, {s: 23}, {f: 2, c: 8836},
-    {f: 2, c: 8842}, 8713, 0, {f: 2, c: 8965}, {s: 9}, {f: 2, c: 8741},
-    {s: 14}, 8802, 0, 8773, 8776, {f: 2, c: 8822}, {s: 4}, 8487, {s: 209},
-    {f: 2, c: 8922}, 8533, 8984, {f: 2, c: 7742}, {f: 2, c: 504}, 470, 472,
-    474, 476, 260, 728, 317, 346, 350, 356, 377, 379, 261, 731, 318, 347, 711,
-    351, 357, 378, 733, 380, 340, 258, 313, 262, 268, 280, 270, 323, 327, 336,
-    344, 368, 354, 341, 259, 314, 263, 269, 281, 271, 273, 324, 328, 337, 345,
-    369, 355, 729, 264, 284, 292, 308, 348, 364, 265, 285, 293, 309, 349, 365,
-    625, 651, 638, 620, 622, 633, 648, 598, 627, 637, 642, 656, 635, 621, 607,
-    626, 669, 654, 609, 624, 641, 295, 661, 660, 614, 664, 450, 595, 599, 644,
-    608, 403, 616, 649, 600, 604, 606, 592, 623, 650, 612, 594, 653, 613, 674,
-    673, 597, 657, 634, 615, 865, 712, 716, 721, 8255, 783, {f: 5, c: 741}, 0,
-    0, 805, 812, 825, 796, {f: 2, c: 799}, 829, 809, 815, 734, 804, 816, 828,
-    820, {f: 2, c: 797}, {f: 2, c: 792}, 810, {f: 2, c: 826}, 794, {s: 3},
-    {f: 2, c: 610}, 618, 628, 630, 632, 640, 655, 665, 668, 671, 688, 690, 695,
-    704, {f: 2, c: 736}, {s: 6}, 8862, {s: 287}, 12348, 12543, 0,
-    {f: 2, c: 12310}, 9838, 9835, {f: 2, c: 10548}, 10687, 0, 12448, 0,
-    {f: 2, c: 10746}, {s: 13}, 962, {f: 10, c: 9461}, {f: 2, c: 9750}, 9649,
-    {f: 10, c: 12784}, 0, {f: 6, c: 12794}, {f: 15, c: 9150}, 0, 0, 10003, 0,
-    9251, 9166, {f: 4, c: 9680}, {f: 2, c: 8263}, 0, 8273, 8258,
-    {f: 16, c: 12688}, {s: 13}, {f: 2, c: 9136}, {f: 12, c: 9842},
-    {f: 2, c: 12441}, 8413, {s: 450}, 20296, 20319, 20330, 20332, 20494, 20504,
-    20545, 20722, 20688, 20742, 20739, 20789, 20821, 20823, 13493, 20938,
-    20962, 21079, 21196, 21206, 21243, 21276, 21347, 21405, 21522, 21631,
-    21640, 21840, 21889, 21933, 21966, 22075, 22174, 22185, 22195, 22391,
-    22396, 135963, 22479, 22500, 22628, 22665, 136302, 22738, 22752, 34369,
-    22923, 22930, 22979, 23059, 23143, 23159, 23172, 23236, 137405, 23421,
-    23443, 23570, 64060, 136884, 23674, 23695, 23711, 23715, 23722, 23760,
-    138804, 23821, 23879, 23937, 23972, 23975, 24011, 24158, 24313, 24320,
-    24322, 24355, 24381, 24404, 24445, 24589, 24596, 24600, 24629, 24647,
-    24733, 24788, 24797, 24875, 25020, 25017, 25122, 25178, 25199, 25302,
-    25468, 25573, 25721, 25796, 25808, 25897, 26013, 26170, 26146, 26155,
-    26160, 26163, 26184, 143812, {f: 2, c: 26231}, 26253, 26299, 26331, 26344,
-    26439, 26497, 26515, 26520, 26523, 26620, 26653, 26787, 26890, 26953,
-    144836, 26946, 26980, 27045, 27087, 15286, 15299, 27113, 27125, 145215,
-    27195, 145251, 27284, 27301, 15375, 27419, 27436, 27495, 27561, 27565,
-    27607, 27647, 27653, 27764, 27800, 27899, 27846, 27953, 27961, 27967,
-    27992, 28052, 28074, 28123, 28125, 28228, 28254, 28337, 28353, 28432,
-    28505, 28513, 28542, 28556, 28576, 28604, 28615, 28618, 28656, 28750,
-    28789, 28836, 28900, 28971, 28958, 28974, 29009, 29032, 29061, 29063,
-    29114, 29124, 29205, 15935, 29339, 149489, 29479, 29520, 29542, 29602,
-    29739, 29766, 29794, 29805, 29862, 29865, 29897, 29951, 29975, 16242,
-    30158, 30210, 30216, 30308, 30337, 30365, 30378, 30390, 30414, 30420,
-    30438, 30449, 30474, 30489, {f: 2, c: 30541}, 30586, 30592, 30612, 30688,
-    152718, 30787, 30830, 30896, 152846, 30893, 30976, 31004, 31022, 31028,
-    31046, 31097, 31176, 153457, 31188, 31198, 31211, 31213, 31365, 154052,
-    31438, 31485, 31506, 31533, 31547, 31599, 31745, 31795, 155041, 31853,
-    31865, 31887, 31892, 31904, 31957, 32049, 32092, 32131, 32166, 32194,
-    32296, 32663, 32731, 32821, 32823, 32970, 32992, 33011, 33120,
-    {f: 2, c: 33127}, 33133, 33211, 33226, 33239, 17499, 33376, 33396, 158463,
-    33441, {f: 2, c: 33443}, 33449, 33471, 33493, 33533, 33536, 33570, 33581,
-    33594, 33607, 33661, 33703, 33743, 33745, 33761, 33793, 33798, 33887,
-    33904, 33907, 33925, 33950, 33978, 159296, 34098, 34078, 34095, 34148,
-    34170, 34188, 34210, 34251, 34285, 34303, {f: 2, c: 34308}, 34320, 159988,
-    34328, 34360, 34391, 34402, 17821, 34421, 34488, 34556, 34695, 17898,
-    34826, 34832, 35022, 161412, 35122, 35129, 35136, 35220, 35318, 35399,
-    35421, 35425, 35445, 35536, 35654, 35673, 35689, 35741, 35913, 35944,
-    36271, 36305, 36311, 36387, 36413, 36475, 164471, 18500, 36602, 36638,
-    36653, 36692, 164813, 36840, 36846, 36872, 36909, 37015, 37043, 37054,
-    {f: 2, c: 37060}, 37063, 37103, 37140, 37142, {f: 2, c: 37154}, 37167,
-    37172, 37251, 37361, 37705, {f: 2, c: 37732}, 37795, 37855, 37892, 37939,
-    37962, 37987, 38001, 38286, 38303, 38316, 38326, 38347, 38352, 38355,
-    18864, 38366, 38565, 38639, 38734, 38805, 38830, 38842, 38849, 38857,
-    38875, 38998, 39143, 39256, 39427, 39617, 39619, 39630, 39638, 39682,
-    39688, 19479, 39725, 39774, 39782, 39812, 39818, 39838, 39886, 39909,
-    39928, 39971, {f: 2, c: 40015}, 40037, {f: 2, c: 40221}, 40259, 40274,
-    40330, 40342, 40384, 40364, 40380, 172432, 40423, 40455, 40606, 40623,
-    40855, 131209, 19970, 19983, 19986, 20009, 20014, 20039, 131234, 20049,
-    13318, 131236, 20073, 20125, 13356, 20156, 20163, 20168, 20203, 20186,
-    20209, 20213, 20246, 20324, 20279, 20286, 20312, 131603, {f: 2, c: 20343},
-    20354, 20357, 20454, 20402, 20421, 20427, 20434, 13418, 20466, 20499,
-    20508, 20558, 20563, 20579, 20643, 20616, {f: 2, c: 20626}, 20629, 20650,
-    131883, 20657, {f: 2, c: 20666}, 20676, 20679, 20723, 131969, 20686,
-    131953, 20692, 20705, 13458, 132089, 20759, 132170, 20832, 132361, 20851,
-    20867, 20875, 13500, 20888, 20899, 20909, 13511, 132566, 20979, 21010,
-    21014, 132943, 21077, 21084, 21100, 21111, 21124, 21122, 133127, 21144,
-    133178, 21156, {f: 2, c: 21178}, 21194, 21201, 133305, 21239, 21301, 21314,
-    133500, 133533, 21351, 21370, 21412, 21428, 133843, 21431, 21440, 133917,
-    {f: 2, c: 13661}, 21461, 13667, 21492, 21540, 21544, 13678, 21571, 21602,
-    21612, 21653, 21664, 21670, 21678, 21687, 21690, 21699, 134469, 21740,
-    21743, 21745, 21747, {f: 2, c: 21760}, 21769, 21820, 21825, 13734, 21831,
-    13736, 21860, 134625, 21885, 21890, 21905, 13765, 21970, 134805, 134765,
-    21951, 21961, 21964, 21969, 21981, 13786, 21986, 134756, 21993, 22056,
-    135007, 22023, 22032, 22064, 13812, 22077, 22080, 22087, 22110, 22112,
-    22125, 13829, 22152, 22156, 22173, 22184, 22194, 22213, 22221, 22239,
-    22248, {f: 2, c: 22262}, 135681, 135765, 22313, 135803, {f: 2, c: 22341},
-    22349, 135796, 22376, 22383, {f: 3, c: 22387}, 22395, 135908, 135895,
-    22426, {f: 2, c: 22429}, 22440, 22487, 135933, 22476, 135990, 136004,
-    22494, 22512, 13898, 22520, 22523, 22525, 22532, 22558, 22567, 22585,
-    136132, 22601, 22604, 22631, {f: 2, c: 22666}, 22669, {f: 2, c: 22671},
-    22676, 22685, 22698, 22705, 136301, 22723, 22733, 22754, {f: 2, c: 22771},
-    {f: 2, c: 22789}, 22797, 22804, 136663, 13969, 22845, 13977, 22854, 13974,
-    158761, 22879, 136775, {f: 2, c: 22901}, 22908, 22943, 22958, 22972, 22984,
-    22989, 23006, 23015, 23022, 136966, 137026, 14031, 23053, 23063, 23079,
-    23085, 23141, 23162, 23179, 23196, {f: 2, c: 23199}, 23202, 23217, 23221,
-    23226, 23231, 23258, 23260, 23269, 23280, 23278, 23285, 23304, 23319,
-    23348, 23372, 23378, 23400, 23407, 23425, 23428, 137667, 23446, 23468,
-    {f: 2, c: 14177}, 23502, 23510, 14188, 14187, 23537, 23549, 14197, 23555,
-    23593, 138326, 23647, {f: 2, c: 23655}, 23664, 138541, 138565, 138616,
-    138594, 23688, 23690, 14273, 138657, 138652, 23712, 23714, 23719, 138642,
-    23725, 23733, 138679, 23753, 138720, 138803, 23814, 23824, 23851, 23837,
-    23840, 23857, 23865, 14312, 23905, 23914, 14324, 23920, 139038, 14333,
-    23944, 14336, 23959, 23984, 23988, 139126, 24017, 24023, 139258, 24036,
-    24041, 14383, 14390, 14400, 24095, 24126, 24137, 14428, 24150, 14433,
-    {f: 2, c: 24173}, 139643, 24229, 24236, 24249, 24262, 24281, 140062, 24317,
-    24328, 140205, 24350, 24391, 24419, 24434, 24446, 24463, 24482, 24519,
-    24523, {f: 3, c: 24530}, 24546, {f: 2, c: 24558}, 24563, 14615, 24610,
-    24612, 14618, 24652, 24725, 24744, 141043, 24753, 24766, 24776, 24793,
-    24814, 24821, 24848, 24857, 24862, 24890, 14703, 24897, 24902, 24928,
-    141403, {f: 2, c: 24978}, 24983, 24997, 25005, 141483, 25045, 25053, 25077,
-    141711, 25123, 25170, 25185, 25188, 25211, 25197, 25203, 25241, 25301,
-    142008, 25341, 25347, 25360, {f: 2, c: 142159}, 25394, 25397,
-    {f: 2, c: 25403}, 25409, 25412, 25422, 142150, 25433, 142365, 142246,
-    25452, 25497, 142372, 25492, 25533, {f: 2, c: 25556}, 25568,
-    {f: 2, c: 25579}, 25586, 25630, 25637, 25641, 25647, 25690, 25693, 25715,
-    25725, 25735, 25745, 25759, {f: 2, c: 25803}, 25813, 25815, 142817, 25828,
-    25855, 14958, 25871, 25876, 14963, 25886, 25906, 25924, 25940, 25963,
-    25978, 25988, 25994, 26034, 26037, 26040, 26047, 26057, 26068, 15062,
-    26105, 26108, 26116, 26120, 26145, 26154, 26181, 26193, 26190, 15082,
-    143811, 143861, 143798, 26218, {f: 2, c: 26220}, 26235, 26240, 26256,
-    26258, 15118, 26285, 26289, 26293, 15130, 15132, 15063, 26369, 26386,
-    144242, 26393, 144339, 144338, 26445, 26452, 26461, 144336, 144356, 144341,
-    26484, 144346, 26514, 144351, 33635, 26640, 26563, 26568, 26578, 26587,
-    26615, 144458, 144465, 144459, 26648, 26655, 26669, 144485, 26675, 26683,
-    26686, 26693, 26697, 26700, 26709, 26711, 15223, 26731, 26734, 26748,
-    26754, 26768, 26774, 15213, {f: 3, c: 26776}, 26780, {f: 2, c: 26794},
-    26804, 26811, 26875, 144612, 144730, 26819, 26821, 26828, 26841,
-    {f: 2, c: 26852}, 26860, 26871, 26883, 26887, 15239, 144788, 15245, 26950,
-    26985, 26988, 27002, 27026, 15268, 27030, 27056, 27066, 27068, 27072,
-    27089, 144953, 144967, 144952, 27107, {f: 2, c: 27118}, 27123, 15309,
-    27124, 27134, 27153, 27162, 27165, 145180, {f: 2, c: 27186}, 27199, 27209,
-    27258, 27214, 27218, 27236, 145164, 27275, 15344, 27297, 145252, 27307,
-    27325, 27334, 27348, 27344, 27357, 145407, 145383, {f: 3, c: 27377}, 27389,
-    145444, 27403, {f: 3, c: 27407}, 145469, 27415, 15398, 27439, 27466, 27480,
-    27500, 27509, [11934, 27514], 27521, 27547, 27566, 146072, 27581,
-    {f: 3, c: 27591}, 27610, {f: 2, c: 27622}, 27630, 27650, 27658, 27662,
-    27702, 146559, 27725, 27739, 27757, 27780, 27785, 15555, 27796, 27799,
-    27821, 27842, 15570, 27868, 27881, 27885, 146688, 27904, 27940,
-    {f: 2, c: 27942}, 27751, 27951, 27964, 27995, 28000, 28016,
-    {f: 2, c: 28032}, 28042, 28045, 28049, 28056, 146752, 146938, 146937,
-    146899, 28075, 28078, 28084, 28098, 27956, 28104, 28110, 28127, 28150,
-    28214, 28190, 15633, 28210, {f: 2, c: 28232}, {f: 2, c: 28235}, 28239,
-    {f: 2, c: 28243}, 28247, 28259, 15646, 28307, 28327, 28340, 28355, 28469,
-    28395, 28409, 28411, 28426, 28428, 28440, 28453, 28470, 28476, 147326,
-    28498, 28503, 28512, 28520, 28560, 28566, 28606, 28575, 28581, 28591,
-    15716, {f: 2, c: 28616}, 28649, 147606, 28668, 28672, 28682, 28707, 147715,
-    28730, 28739, 28743, 28747, 15770, 28773, 28777, 28782, 28790, 28806,
-    28823, 147910, 28831, 28849, 147966, 28908, 28874, 28881, 28931, 28934,
-    28936, 28940, 15808, 28975, 29008, 29011, 29022, 15828, 29078, 29056,
-    29083, 29088, 29090, {f: 2, c: 29102}, 148412, 29145, 29148, 29191, 15877,
-    29236, 29241, 29250, 29271, 29283, 149033, {f: 2, c: 29294}, 29304, 29311,
-    29326, 149157, 29358, 29360, 29377, 15968, 29388, 15974, 15976, 29427,
-    29434, 29447, 29458, {f: 2, c: 29464}, 16003, 29497, 29484, 29491, 29501,
-    29522, 16020, 29547, 149654, {f: 2, c: 29550}, 29553, 29569, 29578, 29588,
-    29592, 29596, 29605, 29625, 29631, 29637, 29643, 29665, 29671, 29689,
-    29715, 29690, 29697, 29779, 29760, 29763, 29778, 29789, 29825, 29832,
-    150093, 29842, 29847, 29849, 29857, 29861, 29866, 29881, 29883, 29882,
-    29910, 29912, 29931, 150358, 29946, 150383, 29984, 29988, 29994, 16215,
-    150550, {f: 2, c: 30013}, 30016, 30024, 30032, 30034, 30066, 30065, 30074,
-    {f: 2, c: 30077}, 30092, 16245, 30114, 16247, 30128, 30135,
-    {f: 2, c: 30143}, 30150, 30159, 30163, 30173, {f: 2, c: 30175}, 30183,
-    30190, 30193, 30211, 30232, 30215, 30223, 16302, 151054, 30227,
-    {f: 2, c: 30235}, 151095, 30245, 30248, 30268, 30259, 151146, 16329, 30273,
-    151179, 30281, 30293, 16343, 30318, 30357, 30369, 30368, {f: 2, c: 30375},
-    30383, 151626, 30409, 151637, 30440, 151842, 30487, 30490, 30509, 30517,
-    151977, 16441, 152037, 152013, 30552, 152094, 30588, 152140, 16472, 30618,
-    30623, 30626, 30628, {f: 2, c: 30686}, 30692, 30698, 30700, 30715, 152622,
-    30725, 30729, 30733, 30745, 30764, 30791, 30826, 152793, 30858, 30868,
-    30884, 30877, 30879, 30907, 30933, 30950, {f: 2, c: 30969}, 30974, 152999,
-    30992, 31003, 31013, 31050, 31064, 16645, 31079, 31090, 31125, 31137,
-    31145, 31156, 31170, 31175, {f: 2, c: 31180}, 31190, 16712, 153513, 153524,
-    16719, 31242, 31253, 31259, 16739, 31288, 31303, 31318, 31321, 31324,
-    31327, 31335, 31338, 31349, 31362, 31370, 31376, 31404, 154068, 16820,
-    31417, 31422, 16831, 31436, 31464, 31476, 154340, 154339, 154353, 31549,
-    31530, {f: 2, c: 31534}, 16870, 16883, 31615, 31553, 16878, 31573, 31609,
-    31588, 31590, 31603, 154546, 16903, 31632, 31643, 16910, 31669, 31676,
-    31685, 31690, 154699, 154724, 31700, 31702, 31706, 31722, 31728, 31747,
-    31758, 31813, 31818, 31831, 31838, 31841, 31849, 31855, 155182, 155222,
-    155237, 31910, 155234, {f: 2, c: 31926}, 155352, 31940, 155330, 31949,
-    155368, 155427, 31974, 155484, 31989, 32003, 17094, 32018, 32030, 155616,
-    155604, {f: 2, c: 32061}, 32064, 32071, 155660, 155643, 17110, 32090,
-    32106, 32112, 17117, 32127, 155671, 32136, 32151, 155744, 32157, 32167,
-    32170, 32182, 32192, 32215, 32217, 32230, 17154, 155885, 64088, 32272,
-    32279, 32285, 32295, 32300, 32325, 32373, 32382, {f: 2, c: 32390}, 17195,
-    32410, 17219, 32572, 32571, 32574, 32579, 13505, 156272, 156294,
-    {f: 2, c: 32611}, 32621, {f: 2, c: 32637}, 32656, 20859, 146702, 32662,
-    32668, 32685, 156674, 32707, 32719, 32739, 32754, 32778, 32776, 32790,
-    32812, 32816, 32835, 32870, 32891, 32921, 32924, 32932, 32935, 32952,
-    157310, 32965, 32981, 32998, 33037, 33013, 33019, 17390, 33077, 33054,
-    17392, 33060, 33063, 33068, 157469, 33085, 17416, 33129, 17431, 17436,
-    33157, 17442, 33176, 33202, 33217, 33219, 33238, 33243, 157917, 33252,
-    157930, 33260, 33277, 33279, 158063, 33284, 158173, 33305, 33314, 158238,
-    33340, 33353, 33349, 158296, 17526, 17530, 33367, 158348, 33372, 33379,
-    158391, 17553, 33405, 33407, 33411, 33418, 33427, {f: 2, c: 33447}, 33458,
-    33460, 33466, 33468, 33506, 33512, 33527, {f: 2, c: 33543}, 33548, 33620,
-    33563, 33565, 33584, 33596, 33604, 33623, 17598, 17620, 17587,
-    {f: 2, c: 33684}, 33691, 33693, 33737, 33744, 33748, 33757, 33765, 33785,
-    33813, 158835, 33815, 33849, 33871, {f: 2, c: 33873}, {f: 2, c: 33881},
-    33884, 158941, 33893, 33912, 33916, 33921, 17677, 33943, 33958, 33982,
-    17672, {f: 2, c: 33998}, 34003, 159333, 34023, 34026, 34031, 34033, 34042,
-    34075, {f: 2, c: 34084}, 34091, 34127, 34159, 17731, 34129,
-    {f: 2, c: 34145}, 159636, 34171, 34173, 34175, 34177, 34182, 34195, 34205,
-    34207, 159736, {f: 2, c: 159734}, 34236, 34247, 34250, {f: 2, c: 34264},
-    34271, 34273, 34278, 34294, 34304, 34321, 34334, 34337, 34340, 34343,
-    160013, 34361, 34364, 160057, 34368, 34387, 34390, 34423, 34439, 34441,
-    {f: 2, c: 34460}, 34481, 34483, 34497, 34499, 34513, 34517, 34519, 34531,
-    34534, 17848, 34565, 34567, 34574, 34576, 34591, 34593, 34595, 34609,
-    34618, 34624, 34627, 34641, 34648, {f: 2, c: 34660}, 34674, 34684, 160731,
-    160730, 34727, 34697, 34699, 34707, 34720, 160766, 17893, 34750, 160784,
-    34753, 34766, 34783, 160841, 34787, {f: 2, c: 34789}, 34794, 34835, 34856,
-    34862, 34866, 34876, 17935, 34890, 34904, 161301, 161300, 34921, 161329,
-    34927, 34976, 35004, 35008, 161427, 35025, 35027, 17985, 35073, 161550,
-    35127, 161571, 35138, 35141, 35145, 161618, 35170, 35209, 35216, 35231,
-    35248, 35255, 35288, 35307, 18081, 35315, 35325, 35327, 18095, 35345,
-    35348, 162181, 35361, 35381, 35390, 35397, 35405, 35416, 35502, 35472,
-    35511, 35543, 35580, 162436, 35594, 35589, 35597, 35612, 35629, 18188,
-    35665, 35678, 35702, 35713, 35723, {f: 2, c: 35732}, 35897, 162739, 35901,
-    162750, 162759, 35909, 35919, 35927, 35945, 35949, 163000, 35987, 35986,
-    35993, 18276, 35995, 36054, 36053, 163232, 36081, 163344, 36105, 36110,
-    36296, 36313, 36364, 18429, 36349, 36358, 163978, 36372, 36374,
-    {f: 2, c: 36385}, 36391, 164027, 18454, 36406, 36409, 36436, 36450, 36461,
-    36463, 36504, 36510, 36533, 36539, 164482, 18510, 164595, 36608, 36616,
-    36651, 36672, 36682, 36696, 164876, 36772, 36788, 164949, 36801, 36806,
-    64036, 36810, 36813, 36819, 36821, 36849, 36853, 36859, 36876, 36919,
-    165227, 36931, 36957, {f: 2, c: 165320}, 36997, 37004, 37008, 37025, 18613,
-    37040, 37046, 37059, 37064, 165591, 37084, 37087, 165626, 37110, 37106,
-    37120, 37099, {f: 2, c: 37118}, 37124, 37126, 37144, 37150, 37175, 37177,
-    {f: 2, c: 37190}, 37207, 37209, 37236, 37241, 37253, 37299, 37302,
-    {f: 2, c: 37315}, 166217, 166214, 37356, 37377, {f: 2, c: 37398}, 166251,
-    37442, 37450, 37462, 37473, 37477, 37480, 166280, {f: 2, c: 37500}, 37503,
-    37513, 37517, 37527, 37529, 37535, 37547, {f: 2, c: 166330}, 37554,
-    {f: 2, c: 37567}, 37574, 37582, 37605, 37649, 166430, 166441, 37623, 37673,
-    166513, 166467, 37713, 37722, 37739, 37745, 37747, 37793, 166553, 166605,
-    37768, 37771, 37775, 37790, 37877, 166628, 166621, 37873, 37831, 37852,
-    37863, 37897, {f: 2, c: 37910}, 37883, 37938, 37947, 166849, 166895, 37997,
-    37999, 38265, 38278, {f: 2, c: 38284}, 167184, 167281, 38344, 167419,
-    167455, 38444, {f: 2, c: 38451}, 167478, 38460, 38497, 167561, 38530,
-    167659, 38554, 167730, 18919, 38579, 38586, 38589, 18938, 167928, 38616,
-    38618, 38621, 18948, 38676, 38691, 18985, 38710, 38721, 38727, 38743,
-    38747, 38762, 168608, 168625, 38806, 38814, {f: 2, c: 38833}, 38846, 38860,
-    38865, 38868, 38872, 38881, 38897, 38916, 38925, 38932, 38934, 19132,
-    169104, {f: 2, c: 38962}, 38949, 38983, 39014, 39083, 39085, 39088, 169423,
-    39095, {f: 2, c: 39099}, 39106, 39111, 39115, 39137, 39139, 39146,
-    {f: 2, c: 39152}, 39155, 39176, 19259, 169712, {f: 2, c: 39190}, 169753,
-    {f: 3, c: 39194}, 169808, 39217, {f: 3, c: 39226}, 39233, 39238, 39246,
-    39264, 39331, 39334, 39357, 39359, 39363, 39380, 39385, 39390, 170182,
-    39408, 39417, 39420, 39434, 39441, 39450, 39456, 39473, 39492, 39500,
-    39512, 19394, 39599, 19402, 39607, 19410, 39609, 170610, 39622, 39632,
-    39634, 39637, 39648, 39653, 39657, 39692, 39696, 39698, 39702, 39708,
-    39723, 39741, 19488, 39755, 39779, 39781, {f: 2, c: 39787},
-    {f: 2, c: 39798}, 39846, 39852, 171483, 39858, 39864, 39870, 39923, 39896,
-    39901, 39914, 39919, 39918, 171541, 171658, 171593, 39958,
-    {f: 3, c: 39960}, 39965, 39970, 39977, 171716, 39985, 39991, 40005, 40028,
-    171753, {f: 2, c: 40009}, 171739, 40020, 40024, 40027, 40029, 40031,
-    {f: 3, c: 40041}, {f: 2, c: 40045}, 40050, 40053, 40058, 40166, 40178,
-    40203, [171982, 171991], 40209, {f: 2, c: 40215}, 172079, 19652, 172058,
-    40242, 19665, 40266, 40287, 40290, 172281, 172162, 40307, {f: 2, c: 40310},
-    40324, 40345, 40353, 40383, 40373, 40377, 40381, 40393, 40410, 40416,
-    40419, 19719, 40458, 40450, 40461, 40476, 40571, 139800, 40576, 40581,
-    40603, 172940, 40637, 173111, 40671, 40703, 40706, 19831, 40707, 40762,
-    40765, 40774, 40787, 40789, 40792, 173553, 40797, 173570, 40809, 40813,
-    40816, 173746, 11948, 13844, 14509, 15820, 16348, 17854, 17936, 19326,
-    19512, 19681, 19980, {f: 2, c: 20003}, 20089, 20211, 20236, 20249, 20267,
-    20270, 20273, 20356, 20382, 20407, 20484, 20492, 20556, 20575, 20578,
-    20599, 20622, 20638, 20642, 20675, 20712, 20721, 20734, 20743,
-    {f: 3, c: 20748}, 20787, 20792, 20852, 20868, 20920, 20922, 20936, 20943,
-    20945, {f: 2, c: 20947}, 20952, 20959, 20997, 21030, 21032, 21035,
-    {f: 2, c: 21041}, 21045, 21052, 21082, 21088, 21102, {f: 2, c: 21112},
-    21130, 21132, 21217, 21225, 21233, 21251, 21265, 21279, 21293, 21298,
-    21309, 21349, 21357, 21369, 21374, 21396, 21401, 21418, 21423, 21434,
-    21441, {f: 2, c: 21444}, 21472, 21523, 21546, 21553, {f: 2, c: 21556},
-    21580, 21671, 21674, 21681, 21691, 21710, 21738, 21756, 21765, 21768,
-    21781, 21799, 21802, 21814, 21841, 21862, 21903, 21906, 21908, 21924,
-    21938, 21955, 21958, 21971, 21979, 21996, 21998, 22001, 22006, 22008,
-    22021, 22029, {f: 2, c: 22033}, 22060, 22069, 22073, 22093, 22100, 22149,
-    22175, 22182, 22199, 22220, 22223, 22233, 22241, 22251, 22253, 22257,
-    22279, 22284, {f: 2, c: 22298}, 22301, 22316, 22318, {f: 2, c: 22333},
-    22367, 22379, 22381, 22394, 22403, 22423, 22446, 22485, 22503, 22541,
-    22566, 22605, 22607, 22623, 22637, 22655, 22657, 22680, 22716, 22815,
-    22819, 22873, 22905, 22935, 22959, 22963, 23007, 23025, 23032, 23218,
-    23224, 23274, 23286, 23323, 23325, 23329, 23352, 23479, 23511, 23520,
-    23583, 23594, 23596, 23606, 23641, 23644, 23661, 23773, 23809, 23860,
-    23869, 23897, 23934, 23939, 24007, 24057, 24104, 24114, 24117, 24155,
-    24168, 24170, 24183, 24192, 24203, 24243, 24253, 24273, {f: 2, c: 24276},
-    24397, 24492, 24554, 24583, 24649, 24660, 24679, 24763, 24772, 24829,
-    24842, 24854, 24874, 24886, 24926, 24932, 24955, 24957, 24959, 24989,
-    25016, 25052, 25058, 25061, 25064, 25092, 25095, 25137, 25145, 25149,
-    25210, 25232, 25256, 25306, 25332, 25366, 25386, 25398, 25414, 25419,
-    25427, 25457, 25461, 25471, 25474, 25482, {f: 2, c: 25518}, 25578,
-    {f: 2, c: 25592}, 25618, 25624, 25632, 25636, 25642, 25653, 25661, 25663,
-    25682, 25695, 25716, 25744, {f: 2, c: 25752}, 25772, 25779, 25837, 25840,
-    25883, 25887, 25902, 25929, 25952, 26002, 26005, 26036, 26046, 26056,
-    26062, 26064, 26079, 26238, {f: 2, c: 26251}, 26291, 26304, 26319, 26405,
-    26421, 26453, 26496, 26511, 26513, 26532, 26545, 26549, 26558, 26664,
-    26758, 26859, 26869, 26903, 26931, 26936, 26971, 26981, 27048, 27051,
-    27055, 27109, 27121, 27210, 27221, 27239, 27249, 27311, {f: 2, c: 27336},
-    27395, 27451, 27455, {f: 2, c: 27517}, 27568, 27639, 27641, 27652, 27657,
-    27661, 27692, 27722, 27730, 27732, 27769, 27820, 27828, 27858, 28001,
-    28028, 28089, 28144, 28229, 28275, 28283, 28285, 28297, 28348,
-    {f: 2, c: 28378}, 28454, 28457, 28464, 28551, 28573, 28590, 28599, 28685,
-    28704, 28745, 28824, 28848, {f: 2, c: 28885}, 28997, 29106, 29172, 29207,
-    29215, 29251, {f: 2, c: 29263}, 29274, 29280, 29288, 29303, 29316, 29385,
-    29413, 29428, 29442, 29451, 29470, 29474, {f: 2, c: 29498}, 29517, 29528,
-    29543, 29810, 29871, 29919, 29924, 29940, 29947, 29974, 29985, 30015,
-    30046, 30105, 30116, 30145, 30148, 30156, 30167, 30172, 30177, 30191,
-    30212, 30220, 30237, 30258, 30264, 30277, 30282, 30303, 30381, 30397,
-    30425, 30443, 30448, 30457, 30464, 30478, 30498, 30504, 30511, 30521,
-    30526, 30533, 30538, 30543, 30558, 30564, 30567, 30572, 30596,
-    {f: 2, c: 30604}, 30614, 30631, 30639, 30647, 30654, 30665, 30673, 30681,
-    30705, 30775, 30812, 30846, 30872, 30881, 30897, 30899, 30921, 30931,
-    30988, 31007, {f: 2, c: 31015}, 31039, 31042, 31060, 31083, 31100, 31147,
-    31172, 31210, 31234, 31244, 31280, 31290, 31300, 31360, 31366, 31380,
-    31413, 31421, 31486, 31531, 31607, 31648, 31660, 31664, 31720, 31730,
-    31736, 31740, 31742, 31753, 31784, 31791, 31810, {f: 2, c: 31826},
-    {f: 3, c: 31835}, 31858, 31869, 31879, 31902, 31930, 31943, 31955, 31962,
-    32060, 32077, 32130, 32133, 32141, 32145, 32158, 32179, 32185, 32208,
-    32229, {f: 2, c: 32245}, 32303, 32310, 32324, 32367, 32376, 32385, 32573,
-    32603, 32605, 32613, 32625, {f: 2, c: 32639}, 32651, 32674,
-    {f: 3, c: 32765}, 32775, 32781, 32798, 32825, 32904, 32910, 32975, 32980,
-    33005, 33008, 33015, 33018, 33022, 33027, 33047, 33072, 33111, 33135,
-    33139, 33163, 33168, 33179, 33182, 33227, 33237, {f: 2, c: 33245}, 33249,
-    33263, 33270, 33280, 33291, {f: 2, c: 33299}, 33306, 33338, 33348, 33389,
-    33412, 33417, 33425, 33450, 33456, 33488, 33514, 33519, 33526, 33622,
-    33656, 33784, 33788, 33880, 33939, 33969, 33981, 34043, 34118, 34134,
-    34141, 34181, 34200, 34370, 34374, 34496, 34580, 34594, 34606, 34617,
-    34653, 34683, 34700, 34702, {f: 2, c: 34711}, 34718, 34723, 34734, 34751,
-    34761, 34778, 34840, 34843, 34861, 34874, 34885, 34891, 34894, 34901,
-    34906, 34926, {f: 3, c: 34970}, 35021, 35040, 35055, {f: 2, c: 35086},
-    35110, 35125, 35162, 35164, 35179, 35184, 35196, 35237, 35253, 35260,
-    35285, 35401, 35415, 35431, 35454, 35462, 35478, 35510, 35529, 35537,
-    35549, 35564, 35573, 35590, 35599, 35601, 35653, 35666, 35693, 35704,
-    35708, 35710, 35717, 35743, 35915, 35923, 35963, 36026, 36037, 36041,
-    36050, 36076, 36085, 36087, 36097, 36099, 36119, 36124, 36206, 36241,
-    36255, 36267, 36274, 36309, 36327, {f: 2, c: 36337}, 36340, 36353, 36363,
-    36390, 36401, {f: 2, c: 36416}, 36429, 36431, 36444, 36449, 36457, 36465,
-    36469, 36471, 36489, 36496, 36501, 36506, 36519, 36521, 36525, 36584,
-    36592, 36615, 36632, 36645, 36647, 36652, 36661, 36666, 36675, 36679,
-    36689, 36693, {f: 3, c: 36768}, 36773, 36868, 36891, 36911, 36940, 36955,
-    36976, 36980, 36985, 37003, 37016, 37024, 37042, 37053, 37065, 37104,
-    37125, 37157, 37210, 37223, 37242, 37258, 37265, 37269, 37296, 37307,
-    37309, 37314, 37317, 37376, 37385, 37411, 37494, 37518, 37551,
-    {f: 2, c: 37563}, 37569, 37571, 37573, 37576, 37652, 37683, 37686, 37720,
-    37759, 37762, 37770, 37819, 37836, 37862, 37881, 37890, {f: 2, c: 37901},
-    37934, 37964, 38280, 38305, 38335, 38342, 38345, {f: 2, c: 38353}, 38368,
-    38372, 38374, 38436, 38449, 38456, 38461, 38484, 38516, 38523, 38527,
-    38529, 38531, 38537, 38550, 38574, 38659, 38683, {f: 2, c: 38689}, 38696,
-    38705, 38759, 38774, 38781, 38783, 38809, 38815, 38828, 38841, 38861,
-    38880, 38895, 38919, 38950, 38958, {f: 2, c: 39010}, 39092, 39109, 39170,
-    39185, 39189, 39221, 39240, 39252, 39262, 39393, 39436, 39440, 39459,
-    39489, 39505, {f: 2, c: 39613}, 39681, 39689, 39691, {f: 2, c: 39693},
-    39705, 39733, 39752, 39765, 39784, 39808, 39814, 39824, 39837, 39856,
-    39871, 39880, 39935, 39938, 39964, 39989, 40004, 40022, 40033, 40040,
-    40240, 40253, 40298, 40315, 40421, 40425, 40435, 40570, {f: 3, c: 40578},
-    40624, 40676, 40688, 40690, 40713, 40719, 40724, 40731, 40738, 40742,
-    {f: 2, c: 40746}, 40756, 40794, 40815, 40862, 40869, 131317, 151044,
-    151538, 163187, 194581, 194630, 194713, 194726, 194789, 195038, 13790,
-    {s: 4}, 172722, 0, 0, 131416, {s: 4}, 132529, 0, 0, 132844, {s: 6}, 134488,
-    {s: 21}, 154060, {s: 9}, 14756, 14776, 142914, 0, 0, 14940, 0, 0, 143339,
-    0, 0, 162228, 0, 15044, 15051, {s: 5}, 14981, {s: 8}, 15347, 27384, {s: 5},
-    15665, {s: 9}, 147531, 0, 15936, 14497, {s: 34}, 158878, {s: 12}, 18207,
-    162876, {s: 4}, 18462, {s: 71}, 39709, 39724, 20482, 20958, 21255, 23532,
-    63784, 26142, 63785, 28746, 64021, 21857, 27706, 31328, 156492, 34819,
-    38315, 38741, 171581, 173594],
-  'Adobe-Korea1': [{f: 95, c: 32}, 8361, 8208, 169, 0, 0, [12288, 12644],
-    {f: 2, c: 12289}, 12539, 8229, [8230, 8943], 168, 12291, {f: 2, c: 8211},
-    8214, 65340, 65374, {f: 2, c: 8216}, {f: 2, c: 8220}, {f: 2, c: 12308},
-    {f: 10, c: 12296}, 177, 215, 247, 8800, {f: 2, c: 8804}, 8734, 8756, 176,
-    {f: 2, c: 8242}, 8451, 8491, {f: 2, c: 65504}, 65509, 9794, 9792, 8736,
-    8869, 8978, 8706, 8711, 8801, 8786, 167, 8251, 9734, 9733, 9675, 9679,
-    9678, 9671, 9670, 9633, 9632, 9651, 9650, 9661, 9660, 8594,
-    {f: 2, c: 8592}, {f: 2, c: 8595}, 12307, 171, 187, 8730, 8765, 8733, 8757,
-    {f: 2, c: 8747}, 8712, 8715, {f: 2, c: 8838}, {f: 2, c: 8834}, 8746, 8745,
-    {f: 2, c: 8743}, 65506, 8658, 8660, 8704, 8707, 180, 732, 711, 728, 733,
-    730, 729, 184, 731, 161, 191, 8758, 8750, 8721, 8719, 164, 8457, 8240,
-    9665, 9664, 9655, 9654, 9828, {f: 2, c: 9824}, 9829, 9831, 9827, 9673,
-    9672, 9635, {f: 2, c: 9680}, 9618, {f: 2, c: 9636}, 9640, 9639, 9638, 9641,
-    9832, 9743, 9742, 9756, 9758, 182, {f: 2, c: 8224}, 8597, 8599, 8601, 8598,
-    8600, 9837, {f: 2, c: 9833}, 9836, 12927, 12828, 8470, 13255, 8482, 13250,
-    13272, 8481, {f: 59, c: 65281}, 65510, {f: 33, c: 65341}, 65507,
-    {f: 51, c: 12593}, {f: 42, c: 12645}, {f: 10, c: 8560}, {f: 10, c: 8544},
-    {f: 17, c: 913}, {f: 7, c: 931}, {f: 17, c: 945}, {f: 7, c: 963}, 9472,
-    9474, 9484, 9488, 9496, 9492, 9500, 9516, 9508, 9524, 9532, 9473, 9475,
-    9487, 9491, 9499, 9495, 9507, 9523, 9515, 9531, 9547, 9504, 9519, 9512,
-    9527, 9535, 9501, 9520, 9509, 9528, 9538, 9490, 9489, 9498, 9497, 9494,
-    9493, 9486, 9485, {f: 2, c: 9502}, {f: 2, c: 9505}, {f: 2, c: 9510},
-    {f: 2, c: 9513}, {f: 2, c: 9517}, {f: 2, c: 9521}, {f: 2, c: 9525},
-    {f: 2, c: 9529}, {f: 2, c: 9533}, {f: 2, c: 9536}, {f: 8, c: 9539},
-    {f: 3, c: 13205}, 8467, 13208, 13252, {f: 4, c: 13219}, {f: 10, c: 13209},
-    13258, {f: 3, c: 13197}, 13263, {f: 2, c: 13192}, 13256, {f: 2, c: 13223},
-    {f: 10, c: 13232}, {f: 5, c: 13184}, {f: 6, c: 13242}, {f: 5, c: 13200},
-    8486, {f: 2, c: 13248}, {f: 3, c: 13194}, 13270, 13253, {f: 3, c: 13229},
-    13275, {f: 4, c: 13225}, 13277, 13264, 13267, 13251, 13257, 13276, 13254,
-    198, 208, 170, 294, 306, 319, 321, 216, 338, 186, 222, 358, 330,
-    {f: 28, c: 12896}, {f: 26, c: 9424}, {f: 15, c: 9312}, 189,
-    {f: 2, c: 8531}, 188, 190, {f: 4, c: 8539}, 230, 273, 240, 295, 305, 307,
-    312, 320, 322, 248, 339, 223, 254, 359, 331, 329, {f: 28, c: 12800},
-    {f: 26, c: 9372}, {f: 15, c: 9332}, 185, {f: 2, c: 178}, 8308, 8319,
-    {f: 4, c: 8321}, {f: 83, c: 12353}, {f: 86, c: 12449}, {f: 6, c: 1040},
-    1025, {f: 32, c: 1046}, 1105, {f: 26, c: 1078}, {f: 2, c: 44032}, 44036,
-    {f: 4, c: 44039}, {f: 8, c: 44048}, {f: 5, c: 44057}, 44064, 44068,
-    {f: 2, c: 44076}, {f: 3, c: 44079}, {f: 2, c: 44088}, 44092, 44096, 44107,
-    44109, 44116, 44120, 44124, {f: 2, c: 44144}, 44148, {f: 2, c: 44151},
-    44154, {f: 2, c: 44160}, {f: 4, c: 44163}, {f: 4, c: 44169}, 44176, 44180,
-    {f: 2, c: 44188}, {f: 3, c: 44191}, {f: 3, c: 44200}, 44204,
-    {f: 2, c: 44207}, {f: 2, c: 44216}, {f: 3, c: 44219}, 44225, 44228, 44232,
-    44236, 44245, 44247, {f: 2, c: 44256}, 44260, {f: 2, c: 44263}, 44266,
-    44268, {f: 3, c: 44271}, 44275, {f: 2, c: 44277}, {f: 2, c: 44284}, 44288,
-    44292, 44294, {f: 2, c: 44300}, 44303, 44305, 44312, 44316, 44320, 44329,
-    {f: 2, c: 44332}, {f: 2, c: 44340}, 44344, 44348, {f: 2, c: 44356}, 44359,
-    44361, 44368, 44372, 44376, 44385, 44387, {f: 2, c: 44396}, 44400,
-    {f: 4, c: 44403}, {f: 3, c: 44411}, 44415, {f: 2, c: 44417},
-    {f: 2, c: 44424}, 44428, 44432, {f: 2, c: 44444}, 44452, 44471,
-    {f: 2, c: 44480}, 44484, 44488, {f: 2, c: 44496}, 44499, 44508, 44512,
-    44516, {f: 2, c: 44536}, 44540, {f: 3, c: 44543}, {f: 2, c: 44552}, 44555,
-    44557, 44564, {f: 2, c: 44592}, 44596, {f: 2, c: 44599}, 44602,
-    {f: 2, c: 44608}, 44611, {f: 2, c: 44613}, 44618, {f: 3, c: 44620}, 44624,
-    44628, 44630, {f: 2, c: 44636}, {f: 3, c: 44639}, 44645, {f: 2, c: 44648},
-    44652, 44656, {f: 2, c: 44664}, {f: 3, c: 44667}, {f: 2, c: 44676}, 44684,
-    {f: 3, c: 44732}, 44736, 44740, {f: 2, c: 44748}, {f: 3, c: 44751},
-    {f: 2, c: 44760}, 44764, 44776, 44779, 44781, 44788, 44792, 44796,
-    {f: 2, c: 44807}, 44813, 44816, {f: 2, c: 44844}, 44848, 44850, 44852,
-    {f: 2, c: 44860}, 44863, {f: 3, c: 44865}, {f: 2, c: 44872}, 44880,
-    {f: 2, c: 44892}, {f: 2, c: 44900}, 44921, 44928, 44932, 44936,
-    {f: 2, c: 44944}, 44949, 44956, {f: 2, c: 44984}, 44988, 44992,
-    {f: 3, c: 44999}, 45003, {f: 2, c: 45005}, 45012, 45020, {f: 2, c: 45032},
-    {f: 2, c: 45040}, 45044, 45048, {f: 2, c: 45056}, 45060, 45068, 45072,
-    45076, {f: 2, c: 45084}, 45096, {f: 2, c: 45124}, 45128, 45130, 45132,
-    45134, {f: 3, c: 45139}, 45143, 45145, 45149, {f: 2, c: 45180}, 45184,
-    45188, {f: 2, c: 45196}, 45199, 45201, {f: 3, c: 45208}, 45212,
-    {f: 4, c: 45215}, {f: 2, c: 45224}, {f: 5, c: 45227}, 45233,
-    {f: 3, c: 45235}, 45240, 45244, {f: 2, c: 45252}, {f: 3, c: 45255},
-    {f: 2, c: 45264}, 45268, 45272, 45280, 45285, {f: 2, c: 45320},
-    {f: 2, c: 45323}, 45328, {f: 2, c: 45330}, {f: 2, c: 45336},
-    {f: 3, c: 45339}, {f: 3, c: 45347}, 45352, 45356, {f: 2, c: 45364},
-    {f: 3, c: 45367}, {f: 2, c: 45376}, 45380, 45384, {f: 2, c: 45392},
-    {f: 2, c: 45396}, 45400, 45404, 45408, {f: 2, c: 45432}, 45436, 45440,
-    45442, {f: 2, c: 45448}, 45451, 45453, {f: 3, c: 45458}, 45464, 45468,
-    45480, 45516, 45520, 45524, {f: 2, c: 45532}, 45535, {f: 2, c: 45544},
-    45548, 45552, 45561, 45563, 45565, {f: 2, c: 45572}, 45576,
-    {f: 2, c: 45579}, {f: 2, c: 45588}, 45591, 45593, 45600, 45620, 45628,
-    45656, 45660, 45664, {f: 2, c: 45672}, {f: 2, c: 45684}, 45692,
-    {f: 2, c: 45700}, 45705, {f: 2, c: 45712}, 45716, {f: 3, c: 45720},
-    {f: 2, c: 45728}, 45731, {f: 2, c: 45733}, 45738, 45740, 45744, 45748,
-    {f: 2, c: 45768}, 45772, 45776, 45778, {f: 2, c: 45784}, 45787, 45789,
-    45794, {f: 3, c: 45796}, 45800, {f: 5, c: 45803}, {f: 3, c: 45811},
-    {f: 5, c: 45815}, {f: 3, c: 45823}, 45828, 45832, {f: 2, c: 45840},
-    {f: 3, c: 45843}, 45852, {f: 3, c: 45908}, 45912, {f: 2, c: 45915},
-    {f: 2, c: 45918}, {f: 2, c: 45924}, 45927, 45929, 45931, 45934,
-    {f: 2, c: 45936}, 45940, 45944, {f: 2, c: 45952}, {f: 3, c: 45955}, 45964,
-    45968, 45972, {f: 2, c: 45984}, 45992, 45996, {f: 2, c: 46020}, 46024,
-    {f: 2, c: 46027}, 46030, 46032, {f: 2, c: 46036}, 46039, 46041, 46043,
-    46045, 46048, 46052, 46056, 46076, 46096, 46104, 46108, 46112,
-    {f: 2, c: 46120}, 46123, 46132, {f: 2, c: 46160}, 46164, 46168,
-    {f: 2, c: 46176}, 46179, 46181, 46188, 46208, 46216, 46237, 46244, 46248,
-    46252, 46261, 46263, 46265, 46272, 46276, 46280, 46288, 46293,
-    {f: 2, c: 46300}, 46304, {f: 2, c: 46307}, 46310, {f: 2, c: 46316}, 46319,
-    46321, 46328, {f: 2, c: 46356}, 46360, {f: 2, c: 46363}, {f: 2, c: 46372},
-    {f: 4, c: 46375}, {f: 2, c: 46384}, 46388, 46392, {f: 2, c: 46400},
-    {f: 3, c: 46403}, {f: 3, c: 46411}, 46416, 46420, {f: 2, c: 46428},
-    {f: 3, c: 46431}, {f: 2, c: 46496}, 46500, 46504, {f: 2, c: 46506},
-    {f: 2, c: 46512}, {f: 3, c: 46515}, {f: 3, c: 46523}, 46528, 46532,
-    {f: 2, c: 46540}, {f: 3, c: 46543}, 46552, 46572, {f: 2, c: 46608}, 46612,
-    46616, 46629, 46636, 46644, 46664, 46692, 46696, {f: 2, c: 46748}, 46752,
-    46756, {f: 2, c: 46763}, 46769, 46804, 46832, 46836, 46840,
-    {f: 2, c: 46848}, 46853, {f: 2, c: 46888}, 46892, {f: 2, c: 46895},
-    {f: 2, c: 46904}, 46907, 46916, 46920, 46924, {f: 2, c: 46932}, 46944,
-    46948, 46952, {f: 2, c: 46960}, 46963, 46965, {f: 2, c: 46972}, 46976,
-    46980, {f: 2, c: 46988}, {f: 4, c: 46991}, {f: 4, c: 46998}, 47004, 47008,
-    {f: 2, c: 47016}, {f: 3, c: 47019}, {f: 2, c: 47028}, 47032, 47047, 47049,
-    {f: 2, c: 47084}, 47088, 47092, {f: 2, c: 47100}, {f: 3, c: 47103},
-    {f: 3, c: 47111}, 47116, 47120, {f: 2, c: 47128}, 47131, 47133,
-    {f: 2, c: 47140}, 47144, 47148, {f: 2, c: 47156}, {f: 3, c: 47159}, 47168,
-    47172, 47185, 47187, {f: 2, c: 47196}, 47200, 47204, {f: 2, c: 47212},
-    47215, 47217, 47224, 47228, 47245, 47272, 47280, 47284, 47288,
-    {f: 2, c: 47296}, 47299, 47301, 47308, 47312, 47316, 47325, 47327, 47329,
-    {f: 2, c: 47336}, 47340, 47344, {f: 2, c: 47352}, 47355, 47357, 47364,
-    47384, 47392, {f: 2, c: 47420}, 47424, 47428, 47436, 47439, 47441,
-    {f: 2, c: 47448}, 47452, 47456, {f: 2, c: 47464}, 47467, 47469,
-    {f: 2, c: 47476}, 47480, 47484, {f: 2, c: 47492}, 47495, {f: 2, c: 47497},
-    {f: 2, c: 47501}, {f: 2, c: 47532}, 47536, 47540, {f: 2, c: 47548}, 47551,
-    47553, {f: 2, c: 47560}, 47564, {f: 5, c: 47566}, {f: 2, c: 47576}, 47579,
-    {f: 2, c: 47581}, 47585, {f: 3, c: 47587}, 47592, 47596, {f: 2, c: 47604},
-    {f: 4, c: 47607}, {f: 2, c: 47616}, 47624, 47637, {f: 2, c: 47672}, 47676,
-    47680, 47682, {f: 2, c: 47688}, 47691, {f: 2, c: 47693}, {f: 3, c: 47699},
-    47704, 47708, {f: 2, c: 47716}, {f: 3, c: 47719}, {f: 2, c: 47728}, 47732,
-    47736, {f: 3, c: 47747}, 47751, 47756, {f: 2, c: 47784}, {f: 2, c: 47787},
-    47792, 47794, {f: 2, c: 47800}, 47803, 47805, 47812, 47816,
-    {f: 2, c: 47832}, 47868, 47872, 47876, 47885, 47887, 47889, 47896, 47900,
-    47904, 47913, 47915, {f: 3, c: 47924}, 47928, {f: 4, c: 47931},
-    {f: 2, c: 47940}, 47943, 47945, 47949, {f: 2, c: 47951}, 47956, 47960,
-    47969, 47971, 47980, 48008, 48012, 48016, 48036, 48040, 48044, 48052,
-    48055, 48064, 48068, 48072, 48080, 48083, {f: 2, c: 48120}, 48124,
-    {f: 2, c: 48127}, 48130, {f: 2, c: 48136}, {f: 3, c: 48139}, 48143, 48145,
-    {f: 5, c: 48148}, {f: 5, c: 48155}, {f: 2, c: 48164}, 48167, 48169, 48173,
-    {f: 2, c: 48176}, 48180, 48184, {f: 2, c: 48192}, {f: 3, c: 48195}, 48201,
-    {f: 2, c: 48204}, 48208, 48221, {f: 2, c: 48260}, 48264, {f: 2, c: 48267},
-    48270, {f: 2, c: 48276}, 48279, {f: 2, c: 48281}, {f: 2, c: 48288}, 48292,
-    {f: 2, c: 48295}, {f: 2, c: 48304}, {f: 3, c: 48307}, {f: 2, c: 48316},
-    48320, 48324, 48333, {f: 3, c: 48335}, 48341, 48344, 48348,
-    {f: 3, c: 48372}, 48376, 48380, {f: 2, c: 48388}, 48391, 48393, 48400,
-    48404, 48420, 48428, 48448, {f: 2, c: 48456}, 48460, 48464,
-    {f: 2, c: 48472}, 48484, 48488, {f: 2, c: 48512}, 48516, {f: 4, c: 48519},
-    {f: 2, c: 48528}, 48531, 48533, {f: 2, c: 48537}, 48540, 48548, 48560,
-    48568, {f: 2, c: 48596}, 48600, 48604, 48617, 48624, 48628, 48632, 48640,
-    48643, 48645, {f: 2, c: 48652}, 48656, 48660, {f: 2, c: 48668}, 48671,
-    {f: 2, c: 48708}, 48712, 48716, 48718, {f: 2, c: 48724}, 48727,
-    {f: 3, c: 48729}, {f: 2, c: 48736}, 48740, 48744, 48746, {f: 2, c: 48752},
-    {f: 3, c: 48755}, {f: 3, c: 48763}, 48768, 48772, {f: 2, c: 48780},
-    {f: 3, c: 48783}, {f: 2, c: 48792}, 48808, {f: 2, c: 48848}, 48852,
-    {f: 2, c: 48855}, 48864, {f: 3, c: 48867}, 48876, 48897, {f: 2, c: 48904},
-    {f: 2, c: 48920}, {f: 3, c: 48923}, {f: 2, c: 48960}, 48964, 48968,
-    {f: 2, c: 48976}, 48981, 49044, 49072, 49093, {f: 2, c: 49100}, 49104,
-    49108, 49116, 49119, 49121, 49212, 49233, 49240, 49244, 49248,
-    {f: 2, c: 49256}, {f: 2, c: 49296}, 49300, 49304, {f: 2, c: 49312}, 49315,
-    49317, {f: 2, c: 49324}, {f: 2, c: 49327}, {f: 4, c: 49331},
-    {f: 2, c: 49340}, {f: 3, c: 49343}, 49349, {f: 2, c: 49352}, 49356, 49360,
-    {f: 2, c: 49368}, {f: 3, c: 49371}, {f: 2, c: 49380}, 49384, 49388,
-    {f: 2, c: 49396}, 49399, 49401, 49408, 49412, 49416, 49424, 49429,
-    {f: 5, c: 49436}, {f: 2, c: 49443}, {f: 2, c: 49446}, {f: 2, c: 49452},
-    {f: 3, c: 49455}, 49462, {f: 2, c: 49464}, 49468, 49472, {f: 2, c: 49480},
-    {f: 3, c: 49483}, {f: 2, c: 49492}, 49496, 49500, {f: 2, c: 49508},
-    {f: 3, c: 49511}, 49520, 49524, 49528, 49541, {f: 3, c: 49548}, 49552,
-    49556, 49558, {f: 2, c: 49564}, 49567, 49569, 49573, {f: 2, c: 49576},
-    49580, 49584, 49597, 49604, 49608, 49612, 49620, {f: 2, c: 49623}, 49632,
-    49636, 49640, {f: 2, c: 49648}, 49651, {f: 2, c: 49660}, 49664, 49668,
-    {f: 2, c: 49676}, 49679, 49681, {f: 2, c: 49688}, 49692, {f: 2, c: 49695},
-    {f: 2, c: 49704}, 49707, 49709, 49711, {f: 2, c: 49713}, 49716, 49736,
-    {f: 2, c: 49744}, 49748, 49752, 49760, 49765, {f: 2, c: 49772}, 49776,
-    49780, {f: 2, c: 49788}, 49791, 49793, {f: 2, c: 49800}, 49808, 49816,
-    49819, 49821, {f: 2, c: 49828}, 49832, {f: 2, c: 49836}, {f: 2, c: 49844},
-    49847, 49849, {f: 2, c: 49884}, 49888, {f: 2, c: 49891}, {f: 3, c: 49899},
-    49903, 49905, 49910, {f: 2, c: 49912}, {f: 2, c: 49915}, 49920,
-    {f: 2, c: 49928}, {f: 2, c: 49932}, {f: 3, c: 49939}, 49944, 49948,
-    {f: 2, c: 49956}, {f: 2, c: 49960}, 49989, {f: 2, c: 50024}, 50028, 50032,
-    50034, {f: 2, c: 50040}, {f: 2, c: 50044}, 50052, 50056, 50060, 50112,
-    {f: 2, c: 50136}, 50140, {f: 2, c: 50143}, 50146, {f: 2, c: 50152}, 50157,
-    {f: 2, c: 50164}, 50168, 50184, 50192, 50212, 50220, 50224, 50228,
-    {f: 2, c: 50236}, 50248, {f: 2, c: 50276}, 50280, 50284, {f: 2, c: 50292},
-    50297, 50304, 50324, 50332, 50360, 50364, 50409, {f: 2, c: 50416}, 50420,
-    50424, 50426, {f: 3, c: 50431}, 50444, 50448, 50452, 50460,
-    {f: 2, c: 50472}, 50476, 50480, {f: 2, c: 50488}, 50491, 50493,
-    {f: 2, c: 50500}, {f: 3, c: 50504}, {f: 3, c: 50508}, {f: 3, c: 50515},
-    {f: 3, c: 50519}, {f: 2, c: 50525}, {f: 2, c: 50528}, 50532, 50536,
-    {f: 2, c: 50544}, {f: 3, c: 50547}, {f: 2, c: 50556}, 50560, 50564, 50567,
-    {f: 2, c: 50572}, 50575, 50577, 50581, {f: 2, c: 50583}, 50588, 50592,
-    50601, {f: 2, c: 50612}, {f: 2, c: 50616}, {f: 4, c: 50619},
-    {f: 7, c: 50628}, 50636, 50638, {f: 2, c: 50640}, 50644, 50648,
-    {f: 2, c: 50656}, 50659, 50661, {f: 3, c: 50668}, 50672, 50676,
-    {f: 2, c: 50678}, {f: 6, c: 50684}, {f: 4, c: 50693}, 50700, 50704,
-    {f: 2, c: 50712}, {f: 2, c: 50715}, {f: 2, c: 50724}, 50728,
-    {f: 3, c: 50732}, 50736, {f: 3, c: 50739}, 50743, 50745, 50747,
-    {f: 2, c: 50752}, 50756, 50760, {f: 2, c: 50768}, {f: 3, c: 50771},
-    {f: 2, c: 50780}, 50784, 50796, 50799, 50801, {f: 2, c: 50808}, 50812,
-    50816, {f: 2, c: 50824}, 50827, 50829, {f: 2, c: 50836}, 50840, 50844,
-    {f: 2, c: 50852}, 50855, 50857, {f: 2, c: 50864}, 50868, {f: 3, c: 50872},
-    {f: 2, c: 50880}, 50883, 50885, {f: 2, c: 50892}, 50896, 50900,
-    {f: 2, c: 50908}, {f: 2, c: 50912}, {f: 2, c: 50920}, 50924, 50928,
-    {f: 2, c: 50936}, 50941, {f: 2, c: 50948}, 50952, 50956, {f: 2, c: 50964},
-    50967, 50969, {f: 2, c: 50976}, 50980, 50984, {f: 2, c: 50992}, 50995,
-    50997, 50999, {f: 2, c: 51004}, 51008, 51012, 51018, {f: 2, c: 51020},
-    51023, {f: 8, c: 51025}, 51036, 51040, 51048, 51051, {f: 2, c: 51060},
-    51064, {f: 3, c: 51068}, {f: 3, c: 51075}, {f: 4, c: 51079}, 51086,
-    {f: 2, c: 51088}, 51092, {f: 3, c: 51094}, 51098, {f: 2, c: 51104},
-    {f: 4, c: 51107}, {f: 2, c: 51116}, 51120, 51124, {f: 2, c: 51132},
-    {f: 3, c: 51135}, {f: 2, c: 51144}, 51148, 51150, 51152, 51160, 51165,
-    51172, 51176, 51180, {f: 2, c: 51200}, 51204, 51208, 51210,
-    {f: 2, c: 51216}, 51219, {f: 2, c: 51221}, {f: 2, c: 51228}, 51232, 51236,
-    {f: 2, c: 51244}, 51247, 51249, 51256, 51260, 51264, {f: 2, c: 51272},
-    {f: 2, c: 51276}, 51284, {f: 2, c: 51312}, 51316, 51320, 51322,
-    {f: 2, c: 51328}, 51331, {f: 3, c: 51333}, {f: 3, c: 51339}, 51348, 51357,
-    51359, 51361, 51368, {f: 2, c: 51388}, 51396, 51400, 51404,
-    {f: 2, c: 51412}, 51415, 51417, {f: 2, c: 51424}, 51428, 51445,
-    {f: 2, c: 51452}, 51456, {f: 3, c: 51460}, {f: 2, c: 51468}, 51471, 51473,
-    51480, 51500, 51508, {f: 2, c: 51536}, 51540, 51544, {f: 2, c: 51552},
-    51555, 51564, 51568, 51572, 51580, {f: 2, c: 51592}, 51596, 51600,
-    {f: 2, c: 51608}, 51611, 51613, {f: 2, c: 51648}, 51652, {f: 2, c: 51655},
-    51658, {f: 2, c: 51664}, 51667, {f: 2, c: 51669}, {f: 2, c: 51673},
-    {f: 2, c: 51676}, 51680, 51682, 51684, 51687, {f: 2, c: 51692},
-    {f: 3, c: 51695}, {f: 2, c: 51704}, 51708, 51712, {f: 2, c: 51720},
-    {f: 3, c: 51723}, 51732, 51736, 51753, {f: 2, c: 51788}, 51792, 51796,
-    {f: 2, c: 51804}, {f: 3, c: 51807}, 51816, 51837, 51844, 51864,
-    {f: 2, c: 51900}, 51904, 51908, {f: 2, c: 51916}, 51919, 51921, 51923,
-    {f: 2, c: 51928}, 51936, 51948, 51956, 51976, 51984, 51988, 51992,
-    {f: 2, c: 52000}, 52033, {f: 2, c: 52040}, 52044, 52048, {f: 2, c: 52056},
-    52061, 52068, {f: 2, c: 52088}, 52124, 52152, 52180, 52196, 52199, 52201,
-    {f: 2, c: 52236}, 52240, 52244, {f: 2, c: 52252}, {f: 2, c: 52257},
-    {f: 3, c: 52263}, 52268, 52270, 52272, {f: 2, c: 52280}, {f: 4, c: 52283},
-    {f: 2, c: 52292}, 52296, 52300, {f: 2, c: 52308}, {f: 3, c: 52311}, 52320,
-    52324, 52326, 52328, 52336, 52341, {f: 2, c: 52376}, 52380, 52384,
-    {f: 2, c: 52392}, {f: 3, c: 52395}, {f: 2, c: 52404}, 52408, 52412,
-    {f: 2, c: 52420}, 52423, 52425, 52432, 52436, 52452, 52460, 52464, 52481,
-    {f: 2, c: 52488}, 52492, 52496, {f: 2, c: 52504}, 52507, 52509, 52516,
-    52520, 52524, 52537, 52572, 52576, 52580, {f: 2, c: 52588}, 52591, 52593,
-    52600, 52616, {f: 2, c: 52628}, 52632, 52636, {f: 2, c: 52644}, 52647,
-    52649, 52656, 52676, 52684, 52688, 52712, 52716, 52720, {f: 2, c: 52728},
-    52731, 52733, 52740, 52744, 52748, 52756, 52761, {f: 2, c: 52768}, 52772,
-    52776, {f: 2, c: 52784}, 52787, 52789, {f: 2, c: 52824}, 52828,
-    {f: 3, c: 52831}, {f: 2, c: 52840}, 52843, 52845, {f: 2, c: 52852}, 52856,
-    52860, {f: 2, c: 52868}, 52871, 52873, {f: 2, c: 52880}, 52884, 52888,
-    {f: 2, c: 52896}, {f: 3, c: 52899}, {f: 2, c: 52908}, 52929,
-    {f: 2, c: 52964}, 52968, {f: 2, c: 52971}, {f: 2, c: 52980},
-    {f: 3, c: 52983}, {f: 2, c: 52992}, 52996, 53000, {f: 2, c: 53008}, 53011,
-    53013, 53020, 53024, 53028, {f: 2, c: 53036}, {f: 3, c: 53039}, 53048,
-    {f: 2, c: 53076}, 53080, 53084, {f: 2, c: 53092}, 53095, 53097,
-    {f: 2, c: 53104}, 53108, 53112, 53120, 53125, 53132, 53153, 53160, 53168,
-    53188, {f: 2, c: 53216}, 53220, 53224, {f: 2, c: 53232}, 53235, 53237,
-    53244, 53248, 53252, 53265, 53272, 53293, {f: 2, c: 53300}, 53304, 53308,
-    {f: 2, c: 53316}, 53319, 53321, 53328, 53332, 53336, 53344,
-    {f: 2, c: 53356}, 53360, 53364, {f: 2, c: 53372}, 53377, {f: 2, c: 53412},
-    53416, 53420, {f: 2, c: 53428}, 53431, 53433, {f: 2, c: 53440}, 53444,
-    {f: 2, c: 53448}, {f: 2, c: 53456}, {f: 3, c: 53459}, {f: 2, c: 53468},
-    53472, 53476, {f: 2, c: 53484}, {f: 3, c: 53487}, 53496, 53517,
-    {f: 2, c: 53552}, 53556, 53560, 53562, {f: 2, c: 53568}, {f: 3, c: 53571},
-    {f: 2, c: 53580}, 53584, 53588, {f: 2, c: 53596}, 53599, 53601, 53608,
-    53612, 53628, 53636, 53640, {f: 2, c: 53664}, 53668, 53672,
-    {f: 2, c: 53680}, 53683, 53685, 53690, 53692, 53696, 53720, 53748, 53752,
-    53767, 53769, 53776, {f: 2, c: 53804}, 53808, 53812, {f: 2, c: 53820},
-    53823, 53825, 53832, 53852, 53860, {f: 2, c: 53888}, 53892, 53896,
-    {f: 2, c: 53904}, 53909, 53916, 53920, 53924, 53932, 53937,
-    {f: 2, c: 53944}, 53948, {f: 2, c: 53951}, 53954, {f: 2, c: 53960}, 53963,
-    53972, 53976, 53980, {f: 2, c: 53988}, {f: 2, c: 54000}, 54004, 54008,
-    {f: 2, c: 54016}, 54019, 54021, {f: 3, c: 54028}, 54032, 54036, 54038,
-    {f: 2, c: 54044}, {f: 3, c: 54047}, 54053, {f: 2, c: 54056}, 54060, 54064,
-    {f: 2, c: 54072}, {f: 3, c: 54075}, {f: 2, c: 54084}, {f: 2, c: 54140},
-    54144, 54148, {f: 2, c: 54156}, {f: 3, c: 54159}, {f: 2, c: 54168}, 54172,
-    54176, {f: 2, c: 54184}, 54187, 54189, 54196, 54200, 54204,
-    {f: 2, c: 54212}, {f: 2, c: 54216}, 54224, 54232, 54241, 54243,
-    {f: 2, c: 54252}, 54256, 54260, {f: 2, c: 54268}, 54271, 54273, 54280,
-    54301, 54336, 54340, 54364, 54368, 54372, 54381, 54383, {f: 2, c: 54392},
-    54396, {f: 2, c: 54399}, 54402, {f: 2, c: 54408}, 54411, 54413, 54420,
-    54441, 54476, 54480, 54484, 54492, 54495, 54504, 54508, 54512, 54520,
-    54523, 54525, 54532, 54536, 54540, {f: 2, c: 54548}, 54551,
-    {f: 2, c: 54588}, 54592, 54596, {f: 2, c: 54604}, 54607, 54609,
-    {f: 2, c: 54616}, 54620, 54624, 54629, {f: 2, c: 54632}, 54635, 54637,
-    {f: 2, c: 54644}, 54648, 54652, {f: 2, c: 54660}, {f: 3, c: 54663}, 54672,
-    54693, {f: 2, c: 54728}, 54732, 54736, 54738, {f: 2, c: 54744}, 54747,
-    54749, {f: 2, c: 54756}, 54760, 54764, {f: 2, c: 54772}, 54775, 54777,
-    {f: 2, c: 54784}, 54788, 54792, {f: 2, c: 54800}, {f: 3, c: 54803}, 54812,
-    54816, 54820, 54829, {f: 2, c: 54840}, 54844, 54848, 54853,
-    {f: 2, c: 54856}, 54859, 54861, 54865, {f: 2, c: 54868}, 54872, 54876,
-    54887, 54889, {f: 2, c: 54896}, 54900, 54915, 54917, {f: 2, c: 54924},
-    54928, 54932, 54941, 54943, 54945, 54952, 54956, 54960, 54969, 54971,
-    {f: 2, c: 54980}, 54984, 54988, 54993, 54996, 54999, 55001, 55008, 55012,
-    55016, 55024, 55029, {f: 2, c: 55036}, 55040, 55044, 55057,
-    {f: 2, c: 55064}, 55068, 55072, {f: 2, c: 55080}, 55083, 55085,
-    {f: 2, c: 55092}, 55096, 55100, 55108, 55111, 55113, {f: 2, c: 55120},
-    55124, {f: 4, c: 55126}, {f: 2, c: 55136}, 55139, 55141, 55145, 55148,
-    55152, 55156, {f: 2, c: 55164}, 55169, {f: 2, c: 55176}, 55180, 55184,
-    {f: 2, c: 55192}, 55195, 55197, 20285, 20339, 20551, 20729, 21152, 21487,
-    21621, 21733, 22025, 23233, 23478, 26247, {f: 2, c: 26550}, 26607, 27468,
-    29634, 30146, 31292, 33499, 33540, 34903, 34952, 35382, [36040, 63747],
-    36303, 36603, 36838, 39381, 21051, 21364, 21508, 24682, 24932, 27580,
-    29647, 33050, 35258, [12179, 35282], 38307, 20355, 21002, 22718, 22904,
-    23014, [12082, 24178], 24185, 25031, 25536, 26438, 26604, 26751, 28567,
-    30286, 30475, 30965, 31240, 31487, 31777, 32925, [12169, 33390], 33393,
-    35563, 38291, 20075, 21917, 26359, 28212, 30883, 31469, 33883, 35088,
-    34638, 38824, 21208, 22350, 22570, 23884, 24863, 25022, 25121, 25954,
-    26577, 27204, 28187, [12130, 29976], 30131, 30435, 30640, 32058, 37039,
-    {f: 2, c: 37969}, 40853, 21283, 23724, 30002, 32987, 37440, 38296, 21083,
-    22536, 23004, 23713, 23831, 24247, 24378, 24394, 24951, 27743, 30074,
-    30086, 31968, 32115, 32177, 32652, 33108, 33313, 34193, 35137, 35611,
-    37628, [38477, 64009], 40007, 20171, 20215, 20491, 20977, 22607, 24887,
-    24894, 24936, 25913, 27114, 28433, 30117, 30342, 30422, 31623, 33445,
-    33995, 37799, 38283, 21888, 23458, 22353, 31923, 32697, 37301, 20520,
-    21435, 23621, 24040, 25298, 25454, 25818, 25831, 28192, 28844, 31067,
-    36317, 36382, 36989, 37445, 37624, 20094, 20214, 20581, [12081, 24062],
-    24314, 24838, 26967, 33137, 34388, 36423, 37749, 39467, 20062, 20625,
-    26480, 26688, 20745, 21133, 21138, 27298, 30652, 37392, 40660, 21163,
-    24623, 36850, 20552, 25001, 25581, 25802, 26684, 27268, 28608, 33160,
-    35233, 38548, 22533, 29309, [12125, 29356], 29956, 32121, 32365, 32937,
-    [12178, 35211, 64010], 35700, 36963, 40273, 25225, 27770, 28500, 32080,
-    32570, 35363, 20860, 24906, 31645, 35609, 37463, 37772, 20140, 20435,
-    20510, 20670, 20742, 21185, 21197, 21375, 22384, 22659, 24218, 24465,
-    24950, 25004, 25806, 25964, 26223, 26299, [26356, 63745], 26775, 28039,
-    28805, 28913, 29855, 29861, 29898, 30169, 30828, 30956, 31455, 31478,
-    32069, 32147, 32789, 32831, 33051, 33686, 35686, 36629, 36885, 37857,
-    38915, 38968, 39514, 39912, 20418, 21843, 22586, [22865, 63753], 23395,
-    23622, 24760, 25106, 26690, 26800, 26856, 28330, 30028, 30328, 30926,
-    31293, 31995, 32363, 32380, 35336, 35489, 35903, 38542, 40388, 21476,
-    21481, 21578, 21617, 22266, 22993, 23396, 23611, 24235, 25335, 25911,
-    25925, 25970, 26272, 26543, 27073, 27837, 30204, 30352, 30590, 31295,
-    32660, 32771, 32929, 33167, 33510, 33533, 33776, 34241, 34865, 34996,
-    35493, 36764, 37678, 38599, 39015, [12220, 39640], [12238, 40723], 21741,
-    26011, 26354, 26767, 31296, [12181, 35895], 40288, 22256, 22372, 23825,
-    26118, 26801, 26829, 28414, 29736, 34974, 39908, 27752, [12219, 39592],
-    20379, 20844, 20849, 21151, 23380, [12079, 24037], 24656, 24685, 25329,
-    25511, 25915, 29657, 31354, 34467, 36002, 38799, [20018, 63749], 23521,
-    [12093, 25096], 26524, [12128, 29916], 31185, 33747, 35463, 35506, 36328,
-    36942, 37707, 38982, [24275, 64011], 27112, 34303, 37101, 20896, 23448,
-    23532, 24931, 26874, 27454, 28748, 29743, 29912, 31649, 32592, 33733,
-    35264, 36011, 38364, 39208, 21038, 24669, 25324, 36866, 20362, 20809,
-    21281, 22745, 24291, 26336, 27960, 28826, 29378, 29654, 31568, 33009,
-    37979, 21350, 25499, 32619, 20054, 20608, 22602, 22750, 24618, 24871,
-    25296, 27088, 39745, 23439, 32024, 32945, 36703, 20132, 20689, 21676,
-    21932, 23308, 23968, 24039, 25898, 25934, 26657, 27211, 29409, 30350,
-    30703, 32094, 32761, 33184, 34126, 34527, 36611, 36686, 37066, 39171,
-    39509, 39851, 19992, 20037, 20061, 20167, 20465, 20855, 21246, 21312,
-    [12061, 21475], [21477, 63750], 21646, 22036, 22389, 22434, 23495, 23943,
-    24272, 25084, 25304, 25937, 26552, 26601, 27083, 27472, 27590, 27628,
-    27714, 28317, 28792, 29399, 29590, 29699, 30655, 30697, 31350, 32127,
-    32777, [12165, 33276], 33285, 33290, 33503, 34914, 35635, 36092, 36544,
-    36881, 37041, 37476, 37558, 39378, 39493, 40169, 40407,
-    [12244, 40860, 63751, 63752], 22283, 23616, 33738, 38816, 38827, 40628,
-    21531, 31384, 32676, 35033, 36557, 37089, 22528, 23624, 25496, 31391,
-    23470, [12088, 24339], 31353, 31406, 33422, 36524, 20518, 21048, 21240,
-    21367, 22280, 25331, 25458, 27402, 28099, 30519, 21413, 29527, 34152,
-    36470, 38357, 26426, 27331, 28528, 35437, 36556, 39243, 26231, 27512,
-    36020, [12225, 39740], 21483, 22317, 22862, 25542, 27131, 29674, 30789,
-    31418, 31429, 31998, 33909, 35215, 36211, 36917, 38312, 21243, 22343,
-    30023, 31584, 33740, 37406, 27224, 20811, 21067, 21127, 25119, 26840,
-    26997, 38553, 20677, 21156, 21220, 25027, [12100, 26020], 26681, 27135,
-    29822, 31563, 33465, 33771, 35250, 35641, 36817, 39241, 20170, 22935,
-    25810, 26129, 27278, 29748, 31105, 31165, 33449, {f: 2, c: 34942}, 35167,
-    37670, 20235, 21450, 24613, 25201, 27762, 32026, 32102, 20120, 20834,
-    30684, 32943, 20225, 20238, 20854, 20864, 21980, 22120, 22331, 22522,
-    22524, 22804, 22855, 22931, 23492, 23696, 23822, [12080, 24049], 24190,
-    24524, 25216, 26071, 26083, {f: 2, c: 26398}, 26462, 26827, 26820, 27231,
-    27450, 27683, 27773, 27778, 28103, 29592, 29734, 29738, 29826, 29859,
-    30072, 30079, 30849, 30959, 31041, {f: 2, c: 31047}, 31098, 31637, 32000,
-    32186, 32648, 32774, 32813, 32908, 35352, 35663, [35912, 63744], 36215,
-    37665, 37668, 39138, 39249, {f: 2, c: 39438}, 39525, 40594, 32202, 20342,
-    21513, 25326, 26708, [12198, 37329, 63754], 21931, 20794, 23068, 25062,
-    [25295, 63835], 25343, 37027, [35582, 63837], 26262, 29014, 38627, 25423,
-    25466, 21335, 26511, 26976, 28275, 30007, 32013, 34930, 22218, 23064,
-    20035, 20839, [22856, 63756], 26608, 32784, [12069, 22899, 63873],
-    [24180, 63886], [25754, 63889], [31178, 63893], [24565, 63907], 24684,
-    25288, [25467, 63908], [23527, 63839, 63914], 23511, 21162, 22900, 24361,
-    [24594, 63840], 29785, 39377, 28611, 33215, 36786, 24817, 33126,
-    [23615, 63933], 23273, 35365, [26491, 63944], [32016, 63951], 33021, 23612,
-    [27877, 63971], [21311, 63979], [28346, 63980], 22810, [33590, 63998],
-    [20025, 63838], 20150, 20294, 21934, 22296, 22727, 24406, 26039, 26086,
-    27264, 27573, 28237, 30701, 31471, 31774, 32222, 34507, 34962, 37170,
-    37723, 25787, 28606, 29562, 30136, 36948, 21846, 22349, 25018, 25812,
-    26311, 28129, 28251, 28525, 28601, 30192, 32835, 33213, 34113, 35203,
-    35527, 35674, 37663, 27795, 30035, 31572, 36367, 36957, 21776, 22530,
-    22616, 24162, 25095, 25758, 26848, 30070, [31958, 64003], 34739, 40680,
-    20195, 22408, 22382, [12068, 22823], 23565, 23729, 24118, 24453, 25140,
-    25825, 29619, 33274, 34955, 36024, 38538, 40667, [23429, 64004], 24503,
-    24755, 20498, [12049, 20992], 21040, 22294, 22581, 22615, 23566, 23648,
-    23798, 23947, [24230, 64001], 24466, 24764, 25361, 25481, 25623, 26691,
-    26873, 27330, 28120, 28193, 28372, 28644, 29182, 30428, 30585, 31153,
-    31291, 33796, 35241, 36077, 36339, 36424, 36867, 36884, 36947, 37117,
-    37709, 38518, 38876, 27602, 28678, 29272, 29346, 29544, 30563, 31167,
-    31716, 32411, [35712, 63834], 22697, 24775, 25958, 26109, 26302, 27788,
-    28958, 29129, 35930, 38931, 20077, 31361, 20189, 20908, 20941, 21205,
-    21516, 24999, 26481, 26704, 26847, [27934, 64005], 28540, 30140, 30643,
-    31461, 33012, 33891, 37509, 20828, [12099, 26007], 26460, 26515, 30168,
-    31431, 33651, [12182, 35910], 36887, 38957, 23663, 33216, 33434, 36929,
-    36975, 37389, 24471, 23965, 27225, 29128, 30331, 31561, 34276, 35588,
-    37159, 39472, [21895, 63755], [25078, 63757], [30313, 63758],
-    [32645, 63759], [34367, 63760], [34746, 63761], [35064, 63762],
-    [37007, 63763], [27931, 63765], [28889, 63766], [29662, 63767], 32097,
-    [33853, 63768], [37226, 63769], [39409, 63770], [20098, 63771],
-    [21365, 63772], [27396, 63773], 27410, 28734, [29211, 63774],
-    [34349, 63775], [40478, 63776], 21068, 36771, [23888, 63777], 25829, 25900,
-    27414, [28651, 63778], 31811, 32412, [34253, 63779], [35172, 63780], 35261,
-    [25289, 63781], [33240, 63782], [34847, 63783], [24266, 63784],
-    [26391, 63785], [28010, 63786], [29436, 63787], 29701, 29807, 34690,
-    [37086, 63788], [20358, 63789], 23821, 24480, 33802, [20919, 63790],
-    [25504, 63861], [30053, 63862], [20142, 63863], 20486, [20841, 63864],
-    [20937, 63865], [26753, 63866], 27153, 31918, 31921, [31975, 63867],
-    [33391, 63868], [35538, 63869], 36635, [37327, 63870], 20406, 20791,
-    [21237, 63871], [21570, 63872], [24300, 63874], 24942, 25150,
-    [26053, 63875], 27354, [28670, 63876], [31018, 63877], 34268, 34851,
-    [38317, 63878], 39522, [39530, 63879], [40599, 63880], [40654, 63881],
-    [12050, 21147, 63882], [26310, 63883], [27511, 63884], 28701, 31019,
-    [36706, 63885], 38722, [24976, 63887], [25088, 63888], 25891,
-    [28451, 63890], [29001, 63891], [29833, 63892], [32244, 63894],
-    [32879, 63895], [34030, 63897], [36646, 63896], [36899, 63898],
-    [37706, 63899], 20925, [21015, 63900], [21155, 63901], 27916,
-    [28872, 63903], [35010, 63904], [24265, 63906], 25986, [27566, 63909],
-    28610, [31806, 63910], [29557, 63911], [20196, 63912], 20278,
-    [22265, 63913], 23738, [23994, 63915], [24604, 63916], [29618, 63917],
-    31533, [32666, 63919], 32718, [32838, 63920], 36894, [37428, 63921],
-    [38646, 63922], [38728, 63923], [38936, 63924], 40801, [20363, 63925],
-    28583, [31150, 63926], [37300, 63927], [38583, 63928], [21214, 63791],
-    25736, [25796, 63792], [27347, 63793], 28510, 28696, [29200, 63794],
-    [30439, 63795], [12156, 32769, 63796], [34310, 63797], [34396, 63798],
-    [36335, 63799], 36613, [38706, 63800], [39791, 63801], [40442, 63802],
-    [12228, 40565], [30860, 63803], [31103, 63804], [32160, 63805],
-    [33737, 63806], [37636, 63807], [12229, 40575, 63808], 40595,
-    [35542, 63809], [22751, 63810], [24324, 63811], 26407, 28711, 29903,
-    [31840, 63812], [32894, 63813], 20769, 28712, [29282, 63814],
-    [30922, 63815], [36034, 63816], 36058, 36084, [38647, 63817],
-    [20102, 63930], [20698, 63931], [23534, 63932], 24278, [26009, 63934],
-    [29134, 63936], [30274, 63937], 30637, 32842, [34044, 63938],
-    [36988, 63939], 39719, [12243, 40845, 63940], [22744, 63818], 23105,
-    [23650, 63819], [27155, 63820], [28122, 63821], [28431, 63822], 30267,
-    [32047, 63823], [32311, 63824], 34078, 35128, 37860, [38475, 63825],
-    [21129, 63943], 26066, [26611, 63945], 27060, [27969, 63946],
-    [28316, 63947], 28687, [29705, 63948], 29792, [30041, 63949], 30244,
-    [30827, 63950], 35628, [39006, 63952], [20845, 63953], [25134, 63954],
-    [38520, 63955], 20374, [20523, 63956], [23833, 63957], [28138, 63958],
-    32184, [36650, 63959], [24459, 63960], [24900, 63961], [26647, 63962],
-    [38534, 63964], [21202, 63826], [32907, 63827], [20956, 63828],
-    [20940, 63829], 26974, [31260, 63830], [32190, 63831], [33777, 63832],
-    [38517, 63833], 20442, [21033, 63965], 21400, [21519, 63966], 21774,
-    [23653, 63967], 24743, [26446, 63969], [26792, 63970], 28012, 29313, 29432,
-    [29702, 63972], 29827, [30178, 63973], 31852, [32633, 63974], 32696, 33673,
-    [35023, 63975], [35041, 63976], [12197, 37324, 63977], 37328,
-    [38626, 63978], 39881, [21533, 63981], 28542, [29136, 63982],
-    [29848, 63983], [34298, 63984], 36522, [38563, 63985], [40023, 63986],
-    [40607, 63987], [26519, 63988], [28107, 63989], 29747, [33256, 63990],
-    38678, 30764, [12148, 31435, 63991], [31520, 63992], [31890, 63993], 25705,
-    29802, 30194, 30908, 30952, [12218, 39340], 39764, [12231, 40635], 23518,
-    24149, 28448, 33180, 33707, 37000, 19975, 21325, 23081, 24018, 24398,
-    24930, 25405, 26217, 26364, 28415, 28459, 28771, 30622, 33836, 34067,
-    34875, 36627, 39237, 39995, 21788, 25273, 26411, 27819, 33545, 35178,
-    38778, 20129, 22916, {f: 2, c: 24536}, 26395, 32178, 32596, 33426, 33579,
-    33725, 36638, 37017, 22475, 22969, 23186, 23504, 26151, 26522, 26757,
-    27599, 29028, 32629, 36023, 36067, 36993, 39749, 33032, 35978, 38476,
-    39488, [12230, 40613], 23391, 27667, 29467, 30450, 30431, 33804, 20906,
-    35219, 20813, 20885, 21193, 26825, 27796, 30468, 30496, 32191, 32236,
-    [12207, 38754], 40629, 28357, 34065, 20901, 21517, 21629, 26126, 26269,
-    26919, 28319, [12139, 30399], 30609, 33559, 33986, 34719, 37225, 37528,
-    40180, 34946, 20398, 20882, 21215, 22982, 24125, 24917, {f: 2, c: 25720},
-    26286, 26576, 27169, 27597, [12113, 27611], 29279, 29281, 29761, 30520,
-    [12141, 30683], 32791, 33468, 33541, 35584, 35624, 35980, [12106, 26408],
-    27792, 29287, [12140, 30446], 30566, 31302, 40361, 27519, 27794, 22818,
-    26406, 33945, 21359, 22675, 22937, 24287, 25551, 26164, 26483, 28218,
-    29483, 31447, 33495, 37672, 21209, 24043, 25006, 25035, 25098, 25287,
-    25771, [12102, 26080], 26969, 27494, [12111, 27595], 28961, 29687, 30045,
-    32326, 33310, 33538, 34154, 35491, 36031, 38695, 40289, 22696, 40664,
-    20497, 21006, 21563, 21839, [12098, 25991], 27766, {f: 2, c: 32010}, 32862,
-    34442, [12200, 38272], 38639, 21247, 27797, 29289, 21619, 23194, 23614,
-    23883, 24396, 24494, 26410, 26806, 26979, 28220, 28228, 30473,
-    [12150, 31859], 32654, 34183, 35598, 36855, 38753, 40692, 23735, 24758,
-    24845, 25003, 25935, {f: 2, c: 26107}, 27665, 27887, 29599, 29641, 32225,
-    38292, 23494, 34588, 35600, 21085, 21338, 25293, 25615, 25778, 26420,
-    27192, 27850, 29632, 29854, 31636, 31893, 32283, 33162, 33334, 34180,
-    36843, 38649, 39361, 20276, 21322, 21453, 21467, 25292, 25644, 25856,
-    26001, 27075, 27886, 28504, 29677, 30036, 30242, 30436, 30460, 30928,
-    [30971, 63844], 31020, 32070, 33324, 34784, 36820, 38930, 39151, 21187,
-    25300, 25765, 28196, 28497, 30332, 36299, 37297, 37474, 39662, 39747,
-    20515, 20621, 22346, 22952, 23592, 24135, 24439, 25151, 25918,
-    [12101, 26041], 26049, 26121, 26507, 27036, 28354, 30917, 32033, 32938,
-    33152, 33323, 33459, 33953, 34444, 35370, 35607, 37030, 38450, 40848,
-    20493, 20467, 22521, 24472, 25308, 25490, 26479, 28227, 28953, 30403,
-    32972, 32986, {f: 2, c: 35060}, 35097, 36064, 36649, 37197, 38506, 20271,
-    20336, 24091, 26575, 26658, [12137, 30333], 30334, 39748, 24161, 27146,
-    29033, 29140, 30058, 32321, 34115, 34281, 39132, 20240, 31567, 32624,
-    38309, 20961, 24070, 26805, 27710, 27726, 27867, 29359, 31684, 33539,
-    27861, 29754, 20731, 21128, 22721, 25816, 27287, 29863, 30294, 30887,
-    34327, 38370, 38713, 21342, 24321, 35722, 36776, 36783, 37002, 21029,
-    30629, 40009, 40712, 19993, 20482, 20853, 23643, 24183, 26142, 26170,
-    26564, 26821, 28851, 29953, 30149, 31177, 31453, 36647, 39200, 39432,
-    20445, 22561, 22577, 23542, 26222, 27493, 27921, 28282, 28541, 29668,
-    29995, 33769, 35036, 35091, 35676, 36628, 20239, 20693, 21264,
-    [12056, 21340], 23443, [24489, 63846], 26381, 31119, 33145, 33583, 34068,
-    35079, 35206, 36665, [36667, 64007], 39333, 39954, 26412, 20086, 20472,
-    22857, 23553, {f: 2, c: 23791}, 25447, 26834, 28925, 29090, 29739, 32299,
-    34028, 34562, 36898, 37586, 40179, [19981, 63847], 20184, 20463, 20613,
-    21078, 21103, 21542, 21648, 22496, 22827, 23142, 23386, 23413, 23500,
-    24220, 25206, 25975, 26023, 28014, 28325, [12119, 29238], 31526, 31807,
-    [12152, 32566], {f: 2, c: 33104}, 33178, 33344, 33433, 33705, 35331, 36000,
-    36070, 36091, 36212, 36282, 37096, 37340, [12201, 38428], 38468, 39385,
-    40167, [21271, 63843], 20998, 21545, 22132, 22707, 22868, 22894, 24575,
-    24996, 25198, 26128, 27774, 28954, 30406, 31881, 31966, 32027, 33452,
-    36033, 38640, 20315, 24343, 24447, 25282, 23849, 26379, 26842, 30844,
-    32323, 40300, 19989, 20633, [12052, 21269], 21290, 21329, 22915, 23138,
-    24199, 24754, 24970, 25161, 25209, 26000, 26503, 27047, [12112, 27604],
-    {f: 3, c: 27606}, 27832, 29749, 30202, 30738, 30865, 31189, 31192, 31875,
-    32203, 32737, 32933, 33086, 33218, 33778, 34586, 35048, 35513, 35692,
-    36027, 37145, [12206, 38750], [12214, 39131], [12240, 40763], 22188, 23338,
-    24428, 25996, 27315, 27567, 27996, 28657, 28693, 29277, 29613, 36007,
-    36051, 38971, 24977, 27703, 32856, 39425, 20045, 20107, 20123, 20181,
-    20282, 20284, 20351, 20447, 20735, 21490, 21496, 21766, 21987, 22235,
-    [12064, 22763], 22882, 23057, 23531, 23546, 23556, 24051, 24107, 24473,
-    24605, 25448, 26012, 26031, 26614, 26619, 26797, 27515, 27801, 27863,
-    28195, 28681, 29509, 30722, 31038, 31040, 31072, 31169, 31721, 32023,
-    32114, 32902, 33293, 33678, 34001, 34503, 35039, 35408, 35422, 35613,
-    36060, 36198, 36781, 37034, 39164, 39391, 40605, 21066, 26388, 20632,
-    21034, [12077, 23665], 25955, 27733, 29642, 29987, 30109, 31639, 33948,
-    37240, 38704, 20087, 25746, [27578, 63856], 29022, 34217, 19977, 26441,
-    26862, 28183, 33439, 34072, 34923, 25591, 28545, 37394, 39087, 19978,
-    20663, 20687, 20767, 21830, 21930, 22039, 23360, 23577, 23776, 24120,
-    24202, 24224, 24258, 24819, 26705, 27233, 28248, 29245, 29248,
-    [29376, 63994], 30456, 31077, 31665, 32724, 35059, 35316, 35443, 35937,
-    36062, 38684, [22622, 63852], 29885, 36093, 21959, 31329, [32034, 63850],
-    [12170, 33394], 29298, [12131, 29983], 29989, 31513, 22661, 22779, 23996,
-    24207, 24246, 24464, 24661, 25234, 25471, 25933, 26257, 26329, 26360,
-    26646, 26866, 29312, 29790, 31598, 32110, 32214, 32626, 32997, 33298,
-    34223, 35199, 35475, 36893, 37604, [12233, 40653], [12239, 40736],
-    [12067, 22805], 22893, 24109, 24796, 26132, 26227, 26512, 27728, 28101,
-    28511, [12143, 30707], 30889, 33990, 37323, 37675, 20185, 20682, 20808,
-    21892, 23307, 23459, 25159, 25982, 26059, 28210, 29053, 29697, 29764,
-    29831, 29887, 30316, 31146, 32218, 32341, 32680, 33146, 33203, 33337,
-    34330, 34796, 35445, 36323, 36984, 37521, 37925, 39245, 39854, 21352,
-    23633, 26964, 27844, 27945, 28203, [12166, 33292], 34203, 35131, 35373,
-    [35498, 63855, 63905], 38634, 40807, 21089, 26297, 27570, 32406, 34814,
-    36109, 38275, 38493, 25885, 28041, 29166, 22478, 22995, 23468, 24615,
-    24826, 25104, 26143, 26207, 29481, 29689, 30427, [30465, 63853], 31596,
-    32854, 32882, 33125, 35488, 37266, 19990, 21218, 27506, 27927, 31237,
-    31545, 32048, 36016, 21484, 22063, 22609, 23477, [12073, 23567], 23569,
-    24034, 25152, 25475, 25620, 26157, 26803, 27836, 28040, 28335, 28703,
-    28836, 29138, 29990, 30095, 30094, 30233, 31505, 31712, 31787, 32032,
-    32057, 34092, 34157, 34311, 35380, 36877, 36961, 37045, 37559, 38902,
-    39479, 20439, 23660, 26463, 28049, 31903, 32396, 35606, 36118, 36895,
-    23403, 24061, 25613, 33984, 36956, 39137, [29575, 63841, 63963], 23435,
-    24730, 26494, 28126, 35359, 35494, 36865, 38924, 21047, 28753, 30862,
-    37782, 34928, 37335, 20462, 21463, 22013, 22234, 22402, 22781, 23234,
-    23432, 23723, 23744, 24101, 24833, 25101, [12095, 25163], 25480, 25628,
-    25910, [25976, 63849], 27193, 27530, [12116, 27700], 27929, 28465, 29159,
-    29417, 29560, 29703, 29874, 30246, 30561, 31168, 31319, 31466, 31929,
-    32143, 32172, 32353, 32670, 33065, 33585, 33936, 34010, 34282, 34966,
-    35504, 35728, 36664, 36930, 36995, 37228, 37526, 37561, 38539,
-    {f: 2, c: 38567}, 38614, 38656, 38920, [12216, 39318], 39635, 39706, 21460,
-    22654, 22809, 23408, 23487, 28113, 28506, 29087, 29729, 29881, 32901,
-    33789, 24033, 24455, 24490, 24642, 26092, 26642, 26991, 27219, 27529,
-    27957, 28147, 29667, 30462, 30636, 31565, 32020, 33059, 33308, 33600,
-    34036, 34147, 35426, 35524, 37255, 37662, 38918, 39348, 25100, 34899,
-    36848, 37477, 23815, 23847, 23913, 29791, 33181, 34664, 28629,
-    [25342, 63859], 32722, 35126, 35186, 19998, 20056, 20711, 21213, 21319,
-    25215, 26119, 32361, 34821, 38494, 20365, 21273, 22070, 22987, 23204,
-    [12075, 23608], 23630, 23629, 24066, 24337, 24643, 26045, 26159, 26178,
-    26558, 26612, 29468, [12142, 30690], [12144, 31034], 32709, 33940, 33997,
-    35222, 35430, 35433, 35553, [12183, 35925], 35962, 22516, 23508, 24335,
-    24687, 25325, 26893, 27542, 28252, 29060, 31698, 34645, [35672, 63996],
-    36606, [12215, 39135], 39166, 20280, 20353, 20449, 21627, 23072, 23480,
-    24892, 26032, 26216, 29180, 30003, 31070, 32051, 33102, [12162, 33251],
-    33688, 34218, 34254, 34563, 35338, [12189, 36523], [12191, 36763], 36805,
-    22833, 23460, 23526, 24713, 23529, 23563, [12092, 24515], 27777, 28145,
-    28683, 29978, 33455, 35574, [20160, 63997], [12055, 21313], 38617,
-    [12114, 27663], 20126, 20420, 20818, 21854, 23077, 23784, 25105,
-    [12123, 29273], 33469, 33706, 34558, 34905, 35357, 38463, 38597, 39187,
-    40201, 40285, 22538, 23731, 23997, 24132, [24801, 63929], 24853, 25569,
-    [27138, 63764, 63836, 63935], 28197, 37122, 37716, 38990, 39952, 40823,
-    23433, 23736, 25353, 26191, 26696, 30524, 38593, 38797, 38996, 39839,
-    26017, 35585, 36555, 38332, 21813, 23721, 24022, 24245, 26263, 30284,
-    33780, 38343, 22739, 25276, 29390, 40232, 20208, 22830, 24591, 26171,
-    27523, 31207, 40230, 21395, 21696, 22467, 23830, 24859, 26326, 28079,
-    30861, 33406, 38552, 38724, 21380, 25212, 25494, 28082, 32266, 33099,
-    38989, 27387, 32588, 40367, 40474, 20063, 20539, 20918, 22812, 24825,
-    25590, 26928, 29242, 32822, 37326, 24369, 32004, [33509, 63860], 33903,
-    33979, 34277, 36493, 20335, 22756, 23363, 24665, 25562, 25880, 25965,
-    26264, 26954, 27171, 27915, 28673, 29036, 30162, 30221, 31155, 31344,
-    [12154, 32650], 35140, 35731, 37312, 38525, 39178, 22276, 24481, 26044,
-    28417, 30208, 31142, 35486, 39341, [12226, 39770], 40812, 20740, 25014,
-    25233, 27277, 33222, 20547, 22576, 24422, 28937, [12180, 35328], 35578,
-    23420, 34326, 20474, 20796, 22196, 22852, 25513, 28153, 23978, 26989,
-    20870, 20104, 20313, 22914, 27487, 27741, 29877, 30998, 33287, 33349,
-    33593, 36671, 36701, 39192, 20134, 22495, 24441, [26131, 63968], 30123,
-    32377, 35695, 36870, 39515, 22181, 22567, 23032, 23071, 23476, 24310,
-    25424, 25403, 26941, 27783, 27839, 28046, 28051, 28149, 28436, 28895,
-    28982, 29017, 29123, 29141, 30799, 30831, 31605, 32227, 32303, 34893,
-    36575, 37467, 40182, 24709, 28037, 29105, 38321, 21421, 26579, 28814,
-    28976, 29744, 33398, 33490, 38331, 39653, 40573, 26308, 29121,
-    [33865, 63854], 22603, 23992, 24433, 26144, 26254, 27001, 27054, 27704,
-    27891, 28214, 28481, 28634, 28699, 28719, 29008, 29151, 29552, 29787,
-    29908, 30408, 31310, 32403, 33521, 35424, 36814, 37704, 38681, 20034,
-    20522, 21000, 21473, 26355, 27757, 28618, 29450, 30591, 31330, 33454,
-    34269, 34306, 35028, 35427, 35709, 35947, 37555, 38675, 38928, 20116,
-    20237, 20425, 20658, 21320, 21566, 21555, 21978, 22626, 22714, 22887,
-    23067, 23524, 24735, 25034, 25942, 26111, 26212, 26791, 27738, 28595,
-    28879, 29100, 29522, 31613, 34568, 35492, 39986, 40711, 23627, 27779,
-    29508, [12127, 29577], 37434, 28331, 29797, 30239, 31337, 32277, 34314,
-    20800, 22725, 25793, 29934, 29973, 30320, 32705, 37013, 38605, 39252,
-    28198, [12129, 29926], {f: 2, c: 31401}, 33253, 34521, 34680, 35355, 23113,
-    23436, 23451, 26785, 26880, 28003, 29609, 29715, 29740, 30871, 32233,
-    32747, 33048, 33109, 33694, 35916, [38446, 63942], 38929, [12104, 26352],
-    24448, 26106, 26505, 27754, 29579, 20525, 23043, 27498, 30702, 22806,
-    23916, 24013, 29477, 30031, 20709, 20985, 22575, 22829, 22934, 23002,
-    23525, 23970, 25303, 25622, 25747, 25854, 26332, 27208, 29183, 29796,
-    31368, 31407, 32327, 32350, 32768, 33136, 34799, 35201, 35616, 36953,
-    36992, 39250, 24958, 27442, 28020, 32287, 35109, 36785, 20433, 20653,
-    20887, 21191, 22471, 22665, 23481, 24248, 24898, 27029, 28044, 28263,
-    28342, 29076, 29794, [12132, 29992], 29996, 32883, 33592, 33993, 36362,
-    37780, 37854, 20110, 20305, 20598, 20778, [12060, 21448], 21451, 21491,
-    23431, 23507, 23588, 24858, 24962, 26100, [12124, 29275], 29591, 29760,
-    30402, 31056, 31121, 31161, 32006, [12155, 32701], 33419, 34261, 34398,
-    36802, 36935, 37109, 37354, 38533, [12204, 38632], 38633, 21206, 24423,
-    26093, 26161, 26671, 29020, 31286, 37057, 38922, 20113, 27218, 27550,
-    28560, 29065, 32792, 33464, 34131, 36939, 38549, 38642, 38907, 34074,
-    39729, 20112, 29066, 38596, 20803, 21407, 21729, 22291, 22290, 22435,
-    23195, 23236, 23491, 24616, 24895, 25588, 27781, 27961, 28274, 28304,
-    29232, 29503, 29783, 33489, 34945, 36677, 36960, 38498, 39000, 40219,
-    [12105, 26376], 36234, 37470, 20301, 20553, 20702, 21361, 22285, 22996,
-    23041, 23561, 24944, 26256, 28205, 29234, 29771, 32239, 32963, 33806,
-    33894, 34111, 34655, 34907, 35096, 35586, 36949, [12209, 38859], 39759,
-    20083, 20369, 20754, 20842, 21807, 21929, 23418, 23461, {f: 2, c: 24188},
-    24254, 24736, 24799, {f: 2, c: 24840}, 25540, 25912, 26377, 26580, 26586,
-    {f: 2, c: 26977}, 27833, 27943, 28216, 28641, {f: 2, c: 29494}, 29788,
-    30001, 30290, 32173, 33278, 33848, 35029, 35480, 35547, 35565, 36400,
-    36418, 36938, 36926, 36986, [12195, 37193], 37321, 37742, 22537, 27603,
-    [12161, 32905], 32946, 20801, 22891, 23609, 28516, 29607, 32996, 36103,
-    37399, 38287, [12160, 32895], 25102, 28700, 32104, 34701, 22432, 24681,
-    24903, 27575, 35518, 37504, 38577, [12036, 20057], 21535, 28139, 34093,
-    38512, [12211, 38899], 39150, 25558, 27875, [12194, 37009], 20957, 25033,
-    33210, 40441, 20381, 20506, 20736, 23452, 24847, 25087, 25836, 26885,
-    27589, 30097, 30691, 32681, 33380, 34191, 34811, [12176, 34915], 35516,
-    35696, 37291, [12038, 20108], 20197, 20234, 22839, 23016, 24050, 24347,
-    24411, 24609, 29246, 29669, [30064, 63842], 30157, 31227, [12157, 32780],
-    [12159, 32819], 32900, 33505, 33617, 36029, 36019, 36999, 39156, 39180,
-    28727, 30410, 32714, 32716, 32764, 35610, [12040, 20154], 20161, 20995,
-    21360, [21693, 63902], 22240, 23035, 23493, 24341, 24525, 28270, 32106,
-    33589, 34451, 35469, 38765, 38775, [12032, 19968], 20314, 20350, 22777,
-    [12103, 26085], 28322, 36920, 37808, 39353, 20219, 22764, 22922, 23001,
-    24641, 31252, 33615, 36035, [12042, 20837], 21316, 20173, 21097, 23381,
-    33471, 20180, [21050, 63999], 21672, 22985, 23039, [12070, 23376], 23383,
-    23388, 24675, 24904, 28363, [28825, 63995], 29038, 29574, 29943, 30133,
-    30913, 32043, 32773, [12163, 33258], 33576, 34071, 34249, 35566, 36039,
-    38604, 20316, 21242, 22204, 26027, 26152, 28796, 28856, 29237, 32189,
-    33421, 37196, 38592, 40306, 23409, 26855, 27544, 28538, 30430, 23697,
-    26283, 28507, 31668, 31786, 34870, 38620, 19976, 20183, 21280, 22580,
-    22715, 22767, 22892, 23559, 24115, 24196, 24373, 25484, 26290, 26454,
-    27167, 27299, 27404, 28479, 29254, 29520, 29835, 31456, 31911, 33144,
-    33247, 33255, 33674, 33900, 34083, 34196, 34255, 35037, 36115, 37292,
-    [12199, 38263], 38556, 20877, 21705, 22312, 23472, 25165, 26448, 26685,
-    26771, 28221, 28371, 28797, 32289, 35009, 36001, 36617, 40779, 40782,
-    29229, 31631, 35533, 37658, 20295, 20302, 20786, 21632, 22992, 24213,
-    25269, 26485, 26990, 27159, 27822, 28186, 29401, 29482, 30141, 31672,
-    32053, 33511, 33785, 33879, 34295, 35419, 36015, 36487, 36889, 37048,
-    38606, 40799, 21219, 21514, 23265, 23490, 25688, 25973, 28404, 29380,
-    30340, 31309, 31515, 31821, 32318, 32735, 33659, 35627, 36042,
-    [12186, 36196], 36321, 36447, 36842, 36857, 36969, 37841, 20291, 20346,
-    20659, 20840, 20856, 21069, 21098, 22625, 22652, 22880, 23560, 23637,
-    24283, 24731, 25136, 26643, 27583, 27656, 28593, 29006, 29728,
-    [12133, 30000], 30008, 30033, 30322, 31564, 31627, 31661, 31686, 32399,
-    35438, 36670, 36681, 37439, 37523, 37666, 37931, 38651, 39002, 39019,
-    39198, [20999, 64000], 25130, 25240, 27993, 30308, 31434, 31680, 32118,
-    21344, 23742, 24215, 28472, 28857, 31896, 38673, 39822, 40670, 25509,
-    25722, 34678, 19969, 20117, 20141, 20572, 20597, 21576, 22979, 23450,
-    24128, 24237, 24311, 24449, 24773, 25402, 25919, 25972, 26060, 26230,
-    26232, 26622, 26984, 27273, 27491, 27712, 28096, 28136, 28191, 28254,
-    28702, 28833, 29582, 29693, 30010, 30555, 30855, 31118, 31243, 31357,
-    31934, 32142, 33351, 35330, 35562, 35998, 37165, 37194, 37336, 37478,
-    37580, 37664, 38662, 38742, 38748, 38914, [12237, 40718], 21046, 21137,
-    21884, 22564, 24093, 24351, 24716, 25552, 26799, 28639, 31085, 31532,
-    33229, 34234, 35069, 35576, 36420, 37261, 38500, 38555, 38717, 38988,
-    [12241, 40778], 20430, 20806, 20939, 21161, 22066, 24340, 24427, 25514,
-    25805, 26089, 26177, 26362, 26361, 26397, 26781, 26839, 27133, 28437,
-    28526, 29031, 29157, [12118, 29226], 29866, 30522, 31062, 31066, 31199,
-    31264, 31381, 31895, 31967, 32068, 32368, 32903, 34299, 34468, 35412,
-    35519, 36249, 36481, 36896, 36973, 37347, 38459, 38613, [12227, 40165],
-    26063, 31751, [12188, 36275], 37827, 23384, 23562, 21330, 25305, 29469,
-    20519, 23447, 24478, 24752, 24939, 26837, 28121, 29742, 31278, 32066,
-    32156, 32305, 33131, 36394, 36405, 37758, 37912, 20304, 22352, 24038,
-    24231, 25387, 32618, 20027, 20303, 20367, 20570, 23005, 32964, 21610,
-    21608, 22014, 22863, 23449, 24030, 24282, 26205, 26417, 26609, 26666,
-    27880, 27954, 28234, 28557, 28855, 29664, 30087, 31820, 32002, 32044,
-    32162, [12168, 33311], 34523, 35387, 35461, [12187, 36208], 36490, 36659,
-    36913, 37198, 37202, 37956, 39376, [12149, 31481], 31909, 20426, 20737,
-    20934, 22472, 23535, 23803, 26201, 27197, 27994, 28310, 28652, 28940,
-    30063, 31459, 34850, 36897, 36981, 38603, 39423, 33537, 20013, 20210,
-    34886, 37325, 21373, 27355, 26987, 27713, 33914, 22686, 24974, 26366,
-    25327, 28893, 29969, 30151, 32338, 33976, 35657, 36104, 20043, 21482,
-    21675, 22320, 22336, 24535, 25345, 25351, 25711, [12096, 25903], 26088,
-    26234, 26525, 26547, [12108, 27490], 27744, 27802, 28460, 30693, 30757,
-    31049, 31063, 32025, 32930, 33026, [12164, 33267], 33437, 33463, 34584,
-    35468, 36100, 36286, 36978, 30452, 31257, 31287, 32340, 32887, 21767,
-    21972, 22645, 25391, 25634, 26185, 26187, 26733, 27035, 27524, 27941,
-    28337, 29645, 29800, 29857, 30043, 30137, 30433, 30494, 30603, 31206,
-    32265, 32285, 33275, 34095, 34967, 35386, 36049, 36587,
-    [12192, 36784, 63857], 36914, 37805, 38499, 38515, 38663, 20356, 21489,
-    23018, 23241, 24089, 26702, 29894, 30142, 31209, 31378, 33187, 34541,
-    36074, 36300, 36845, 26015, 26389, 22519, 28503, 32221, 36655, 37878,
-    38598, 24501, 25074, 28548, 19988, 20376, 20511, 21449, 21983, 23919,
-    24046, 27425, 27492, 30923, 31642, 36425, [12190, 36554, 63746], 36974,
-    25417, 25662, 30528, 31364, 37679, 38015, 40810, 25776, 28591, 29158,
-    29864, 29914, 31428, 31762, 32386, 31922, 32408, 35738, 36106, 38013,
-    39184, 39244, 21049, 23519, 25830, 26413, 32046, 20717, [21443, 63851],
-    22649, {f: 2, c: 24920}, 25082, 26028, 31449, 35730, 35734, 20489, 20513,
-    21109, 21809, 23100, 24288, 24432, 24884, 25950, 26124, 26166, 26274,
-    27085, 28356, 28466, 29462, 30241, 31379, 33081, 33369, 33750, 33980,
-    20661, 22512, 23488, 23528, 24425, 25505, 30758, 32181, 33756, 34081,
-    37319, 37365, 20874, 26613, 31574, 36012, 20932, 22971, 24765, 34389,
-    20508, 21076, 23610, 24957, 25114, [25299, 64002], 25842, 26021, 28364,
-    30240, 33034, 36448, 38495, 38587, 20191, 21315, 21912, 22825, 24029,
-    25797, 27849, 28154, 29588, 31359, [12167, 33307], 34214, 36068, 36368,
-    36983, 37351, 38369, 38433, 38854, 20984, 21746, 21894, 24505, 25764,
-    28552, 32180, 36639, 36685, 37941, 20681, 23574, 27838, 28155, 29979,
-    30651, 31805, 31844, 35449, 35522, 22558, 22974, 24086, 25463, 29266,
-    30090, 30571, 35548, 36028, 36626, 24307, 26228, 28152, 32893, 33729,
-    35531, [12205, 38737], 39894, 21059, 26367, 28053, 28399, 32224, 35558,
-    36910, 36958, 39636, 21021, 21119, 21736, 24980, 25220, 25307, 26786,
-    26898, 26970, 27189, 28818, 28966, 30813, 30977, 30990, 31186, 31245,
-    32918, [12171, 33400], 33493, 33609, 34121, 35970, 36229, 37218, 37259,
-    37294, 20419, 22225, 29165, 30679, 34560, 35320, [12072, 23544], 24534,
-    26449, 37032, 21474, 22618, 23541, 24740, 24961, 25696, 32317, 32880,
-    34085, 37507, 25774, 20652, 23828, 26368, 22684, 25277, 25512, 26894,
-    27000, 27166, 28267, 30394, 31179, 33467, 33833, 35535, 36264, 36861,
-    37138, 37195, 37276, 37648, 37656, 37786, 38619, 39478, 39949, 19985,
-    30044, 31069, 31482, 31569, 31689, 32302, 33988, 36441, 36468, 36600,
-    36880, 26149, 26943, 29763, 20986, 26414, 40668, 20805, 24544, 27798,
-    34802, 34909, 34935, 24756, 33205, 33795, 36101, 21462, 21561, 22068,
-    23094, 23601, 28810, 32736, 32858, 33030, 33261, 36259, 37257, 39519,
-    40434, 20596, 20164, 21408, 24827, 28204, 23652, 20360, 20516, 21988,
-    23769, 24159, 24677, 26772, 27835, 28100, 29118, 30164, 30196, 30305,
-    31258, 31305, 32199, 32251, 32622, 33268, 34473, 36636, 38601, 39347,
-    [12242, 40786], 21063, 21189, 39149, 35242, 19971, 26578, 28422, 20405,
-    23522, 26517, [27784, 63858], 28024, 29723, 30759, 37341, 37756, 34756,
-    31204, 31281, 24555, 20182, 21668, 21822, 22702, 22949, 24816, 25171,
-    25302, 26422, 26965, 33333, 38464, 39345, 39389, 20524, 21331, 21828,
-    22396, 25176, 25826, 26219, 26589, 28609, 28655, 29730, 29752, 35351,
-    37944, 21585, 22022, 22374, 24392, 24986, 27470, 28760, 28845, 32187,
-    35477, 22890, 33067, 25506, 30472, 32829, 36010, 22612, 25645, 27067,
-    23445, 24081, 28271, 34153, 20812, 21488, 22826, 24608, 24907, 27526,
-    27760, 27888, 31518, 32974, 33492, 36294, 37040, 39089, 25799, 28580,
-    25745, 25860, 20814, 21520, [12063, 22303], 35342, 24927, 26742, 30171,
-    31570, 32113, 36890, 22534, 27084, 33151, 35114, 36864, 38969, 20600,
-    22871, 22956, 25237, 36879, 39722, 24925, 29305, 38358, 22369, 23110,
-    24052, 25226, 25773, 25850, 26487, 27874, 27966, 29228, 29750, 30772,
-    32631, 33453, 36315, 38935, 21028, 22338, 26495, 29256, 29923, 36009,
-    36774, 37393, 38442, [12043, 20843], 21485, 25420, 20329, 21764, 24726,
-    25943, 27803, 28031, 29260, 29437, 31255, 35207, [12185, 35997], 24429,
-    28558, 28921, 33192, 24846, [20415, 63845], 20559, 25153, [12122, 29255],
-    31687, 32232, 32745, 36941, 38829, 39449, 36022, 22378, 24179, 26544,
-    33805, 35413, 21536, 23318, 24163, 24290, 24330, 25987, 32954, 34109,
-    38281, 38491, 20296, 21253, 21261, 21263, 21638, 21754, 22275, 24067,
-    24598, 25243, 25265, 25429, 27873, 28006, 30129, 30770, 32990, 33071,
-    33502, 33889, 33970, 34957, 35090, 36875, 37610, 39165, 39825, 24133,
-    [26292, 64006], 26333, 28689, 29190, 20469, 21117, 24426, 24915, 26451,
-    27161, 28418, 29922, 31080, 34920, 35961, 39111, 39108, 39491, 21697,
-    31263, 26963, 35575, 35914, [12213, 39080], 39342, 24444, 25259, 30130,
-    [12138, 30382], 34987, 36991, 38466, 21305, 24380, 24517, [27852, 63848],
-    29644, 30050, [12134, 30091], 31558, 33534, 39325, 20047, 36924, 19979,
-    20309, 21414, 22799, 24264, 26160, 27827, 29781, 33655, 34662, 36032,
-    36944, 38686, 39957, 22737, 23416, 34384, 35604, 40372, 23506, 24680,
-    24717, 26097, 27735, 28450, 28579, 28698, 32597, 32752, {f: 2, c: 38289},
-    38480, 38867, 21106, 36676, 20989, 21547, 21688, 21859, 21898, 27323,
-    28085, 32216, 33382, 37532, 38519, 40569, 21512, 21704, 30418, 34532,
-    38308, 38356, 38492, 20130, 20233, 23022, 23270, 24055, 24658, 25239,
-    26477, 26689, 27782, 28207, 32568, 32923, 33322, 38917, 20133, 20565,
-    21683, 22419, 22874, 23401, 23475, 25032, 26999, 28023, 28707, 34809,
-    35299, 35442, 35559, 36994, 39405, 39608, 21182, 26680, 20502, 24184,
-    26447, 33607, [12175, 34892, 64008], 20139, 21521, 22190, 29670, 37141,
-    38911, 39177, 39255, [12217, 39321], 22099, 22687, 34395, 35377, 25010,
-    27382, 29563, 36562, 27463, 38570, 39511, 22869, 29184, 36203,
-    [12208, 38761], 20436, 23796, 24358, 25080, 26203, 27883, 28843,
-    [12126, 29572], 29625, 29694, 30505, 30541, 32067, 32098, 32291, 33335,
-    34898, 36066, 37449, 39023, 23377, [12147, 31348], [12174, 34880],
-    [12212, 38913], 23244, 20448, 21332, 22846, 23805, 25406, 28025, 29433,
-    33029, 33031, 33698, 37583, 38960, 20136, 20804, 21009, 22411, 24418,
-    27842, 28366, 28677, 28752, 28847, 29074, 29673, [29801, 63918], 33610,
-    34722, 34913, 36872, 37026, 37795, 39336, 20846, 24407, 24800, 24935,
-    26291, 34137, 36426, 37295, 38795, 20046, 20114, 21628, 22741, 22778,
-    22909, 23733, 24359, [12094, 25142], 25160, 26122, 26215, 27627, 28009,
-    28111, 28246, 28408, 28564, 28640, 28649, 28765, 29392, 29733, 29786,
-    29920, 30355, 31068, 31946, 32286, 32993, 33446, 33899, 33983, 34382,
-    34399, 34676, 35703, 35946, 37804, 38912, 39013, 24785, 25110, 37239,
-    23130, 26127, 28151, 28222, 29759, 39746, 24573, 24794, 31503, 21700,
-    24344, 27742, 27859, 27946, 28888, 32005, 34425, 35340, 40251, 21270,
-    21644, 23301, 27194, [12117, 28779], 30069, 31117, [12146, 31166], 33457,
-    33775, 35441, 35649, 36008, 38772, 25844, 25899, {f: 2, c: 30906}, 31339,
-    20024, 21914, 22864, 23462, 24187, 24739, 25563, 27489, 26213, 26707,
-    28185, 29029, 29872, 32008, 36996, 39529, 39973, 27963, [28369, 63748],
-    29502, 35905, 38346, 20976, 24140, 24488, 24653, 24822, 24880, 24908,
-    {f: 2, c: 26179}, 27045, 27841, 28255, 28361, 28514, 29004, 29852, 30343,
-    31681, 31783, 33618, 34647, 36945, 38541, [12232, 40643], 21295, 22238,
-    24315, 24458, 24674, 24724, 25079, 26214, 26371, 27292, 28142, 28590,
-    28784, 29546, 32362, 33214, 33588, 34516, 35496, 36036, 21123, 29554,
-    23446, 27243, 37892, 21742, 22150, 23389, 25928, 25989, 26313, 26783,
-    28045, 28102, [12120, 29243], 32948, 37237, 39501, 20399, 20505, 21402,
-    21518, 21564, 21897, 21957, 24127, 24460, 26429, 29030, 29661, 36869,
-    21211, 21235, 22628, 22734, 28932, 29071, 29179, 34224, 35347,
-    [26248, 63941], 34216, 21927, 26244, 29002, 33841, 21321, 21913, 27585,
-    24409, 24509, 25582, 26249, 28999, 35569, 36637, 40638, 20241, 25658,
-    28875, 30054, 34407, 24676, 35662, 40440, 20807, 20982, 21256, 27958,
-    33016, [12234, 40657], 26133, 27427, 28824, 30165, 21507, 23673, 32007,
-    35350, [12107, 27424], 27453, 27462, 21560, 24688, 27965, 32725, 33288,
-    20694, 20958, 21916, 22123, 22221, 23020, 23305, 24076, 24985, 24984,
-    25137, 26206, 26342, 29081, {f: 2, c: 29113}, 29351, 31143, 31232, 32690,
-    35440, {s: 163}, {f: 4, c: 12310}, {s: 14}, 8223, 8219, {f: 2, c: 8314},
-    {s: 7}, 8316, 0, {f: 2, c: 8317}, {s: 23}, 700, {s: 44}, 8942, 8759,
-    {s: 20}, {f: 10, c: 10122}, {s: 36}, {f: 26, c: 9398}, {s: 61},
-    {f: 2, c: 8826}, {f: 2, c: 8910}, {f: 2, c: 8832}, {f: 4, c: 8816}, 0,
-    8842, 0, 8843, {f: 2, c: 8822}, 8825, {f: 2, c: 8922}, {s: 5}, 8773, 8771,
-    8776, 0, 8868, {s: 78}, 8244, {s: 11}, 9839, {s: 4}, 8258, {s: 4}, 10045,
-    0, 0, 8226, {s: 4}, {f: 2, c: 8249}, {s: 16}, 10010, 10006, 0, 9711,
-    {s: 3}, 10070, 0, 9676, {s: 24}, 9775, {s: 6}, 12320, 0, {f: 10, c: 10102},
-    {s: 17}, 12306, 12342, {s: 13}, 8710, 0, 8735, 0, {f: 2, c: 8741}, 0, 8787,
-    8785, {f: 2, c: 8806}, 8723, {f: 3, c: 8853}, 0, 8980, 0, 0, 8802, 0, 9649,
-    0, 8738, 8784, 0, 0, 8867, 0, 0, {f: 2, c: 8814}, 8837, 8836, 8713, 8716,
-    {f: 2, c: 8891}, 8794, 8966, {s: 6}, 12958, 0, 8252, {s: 11}, 9702, {s: 3},
-    9663, 9653, 9657, 9667, {s: 4}, 9674, 12849, 12857, 13259, {f: 5, c: 9327},
-    {s: 18}, 8656, 8655, 8653, {s: 37}, 8657, 8659, {s: 8}, 8626, 8625, 0,
-    8628, 8624, 8627, {s: 14}, 8636, 8640, {s: 10}, {f: 2, c: 8644}, {s: 144},
-    {f: 5, c: 9347}, {s: 33}, 12948, {s: 15}, 12965, {s: 93}, 8672, 8674, 8673,
-    8675, {s: 4}, 8678, 8680, 8679, 8681, {s: 20}, 9757, 9759, {s: 76}, 12944,
-    {f: 6, c: 12938}, {s: 15}, {f: 2, c: 12318}, 8246, 0, 8245, {s: 3}, 12540,
-    0, 0, {f: 2, c: 44034}, {f: 2, c: 44037}, {f: 5, c: 44043}, 44056,
-    {f: 2, c: 44062}, {f: 3, c: 44065}, {f: 7, c: 44069}, 44078,
-    {f: 6, c: 44082}, {f: 2, c: 44090}, {f: 3, c: 44093}, {f: 10, c: 44097},
-    44108, {f: 6, c: 44110}, {f: 3, c: 44117}, {f: 3, c: 44121},
-    {f: 19, c: 44125}, {f: 2, c: 44146}, {f: 2, c: 44149}, 44153,
-    {f: 5, c: 44155}, 44162, {f: 2, c: 44167}, {f: 3, c: 44173},
-    {f: 3, c: 44177}, {f: 7, c: 44181}, 44190, {f: 6, c: 44194}, 44203,
-    {f: 2, c: 44205}, {f: 7, c: 44209}, 44218, {f: 3, c: 44222},
-    {f: 2, c: 44226}, {f: 3, c: 44229}, {f: 3, c: 44233}, {f: 8, c: 44237},
-    44246, {f: 8, c: 44248}, {f: 2, c: 44258}, {f: 2, c: 44261}, 44265, 44267,
-    {f: 2, c: 44269}, 44274, 44276, {f: 5, c: 44279}, {f: 2, c: 44286},
-    {f: 3, c: 44289}, 44293, {f: 5, c: 44295}, 44302, 44304, {f: 6, c: 44306},
-    {f: 3, c: 44313}, {f: 3, c: 44317}, {f: 8, c: 44321}, {f: 2, c: 44330},
-    {f: 6, c: 44334}, {f: 2, c: 44342}, {f: 3, c: 44345}, {f: 7, c: 44349},
-    44358, 44360, {f: 6, c: 44362}, {f: 3, c: 44369}, {f: 3, c: 44373},
-    {f: 8, c: 44377}, 44386, {f: 8, c: 44388}, {f: 2, c: 44398},
-    {f: 2, c: 44401}, {f: 4, c: 44407}, 44414, 44416, {f: 5, c: 44419},
-    {f: 2, c: 44426}, {f: 3, c: 44429}, {f: 11, c: 44433}, {f: 6, c: 44446},
-    {f: 18, c: 44453}, {f: 8, c: 44472}, {f: 2, c: 44482}, {f: 3, c: 44485},
-    {f: 7, c: 44489}, 44498, {f: 8, c: 44500}, {f: 3, c: 44509},
-    {f: 3, c: 44513}, {f: 19, c: 44517}, {f: 2, c: 44538}, {f: 2, c: 44541},
-    {f: 6, c: 44546}, 44554, 44556, {f: 6, c: 44558}, {f: 27, c: 44565},
-    {f: 2, c: 44594}, {f: 2, c: 44597}, 44601, {f: 5, c: 44603}, 44610, 44612,
-    {f: 3, c: 44615}, 44619, 44623, {f: 3, c: 44625}, 44629, {f: 5, c: 44631},
-    44638, {f: 3, c: 44642}, {f: 2, c: 44646}, {f: 2, c: 44650},
-    {f: 3, c: 44653}, {f: 7, c: 44657}, 44666, {f: 6, c: 44670},
-    {f: 6, c: 44678}, {f: 47, c: 44685}, 44735, {f: 3, c: 44737},
-    {f: 7, c: 44741}, 44750, {f: 6, c: 44754}, {f: 2, c: 44762},
-    {f: 11, c: 44765}, {f: 2, c: 44777}, 44780, {f: 6, c: 44782},
-    {f: 3, c: 44789}, {f: 3, c: 44793}, {f: 10, c: 44797}, {f: 4, c: 44809},
-    {f: 2, c: 44814}, {f: 27, c: 44817}, {f: 2, c: 44846}, 44849, 44851,
-    {f: 7, c: 44853}, 44862, 44864, {f: 4, c: 44868}, {f: 6, c: 44874},
-    {f: 11, c: 44881}, {f: 6, c: 44894}, {f: 19, c: 44902}, {f: 6, c: 44922},
-    {f: 3, c: 44929}, {f: 3, c: 44933}, {f: 7, c: 44937}, {f: 3, c: 44946},
-    {f: 6, c: 44950}, {f: 27, c: 44957}, {f: 2, c: 44986}, {f: 3, c: 44989},
-    {f: 6, c: 44993}, 45002, 45004, {f: 5, c: 45007}, {f: 7, c: 45013},
-    {f: 11, c: 45021}, {f: 6, c: 45034}, {f: 2, c: 45042}, {f: 3, c: 45045},
-    {f: 7, c: 45049}, {f: 2, c: 45058}, {f: 7, c: 45061}, {f: 3, c: 45069},
-    {f: 3, c: 45073}, {f: 7, c: 45077}, {f: 10, c: 45086}, {f: 27, c: 45097},
-    {f: 2, c: 45126}, 45129, 45131, 45133, {f: 4, c: 45135}, 45142, 45144,
-    {f: 3, c: 45146}, {f: 30, c: 45150}, {f: 2, c: 45182}, {f: 3, c: 45185},
-    {f: 7, c: 45189}, 45198, 45200, {f: 6, c: 45202}, 45211, {f: 2, c: 45213},
-    {f: 5, c: 45219}, 45226, 45232, 45234, {f: 2, c: 45238}, {f: 3, c: 45241},
-    {f: 7, c: 45245}, 45254, {f: 6, c: 45258}, {f: 2, c: 45266},
-    {f: 3, c: 45269}, {f: 7, c: 45273}, {f: 4, c: 45281}, {f: 34, c: 45286},
-    45322, {f: 3, c: 45325}, 45329, {f: 4, c: 45332}, 45338, {f: 5, c: 45342},
-    {f: 2, c: 45350}, {f: 3, c: 45353}, {f: 7, c: 45357}, 45366,
-    {f: 6, c: 45370}, {f: 2, c: 45378}, {f: 3, c: 45381}, {f: 7, c: 45385},
-    {f: 2, c: 45394}, {f: 2, c: 45398}, {f: 3, c: 45401}, {f: 3, c: 45405},
-    {f: 23, c: 45409}, {f: 2, c: 45434}, {f: 3, c: 45437}, 45441,
-    {f: 5, c: 45443}, 45450, 45452, {f: 4, c: 45454}, {f: 3, c: 45461},
-    {f: 3, c: 45465}, {f: 11, c: 45469}, {f: 35, c: 45481}, {f: 3, c: 45517},
-    {f: 3, c: 45521}, {f: 7, c: 45525}, 45534, {f: 8, c: 45536},
-    {f: 2, c: 45546}, {f: 3, c: 45549}, {f: 8, c: 45553}, 45562, 45564,
-    {f: 6, c: 45566}, {f: 2, c: 45574}, {f: 2, c: 45577}, {f: 7, c: 45581},
-    45590, 45592, {f: 6, c: 45594}, {f: 19, c: 45601}, {f: 7, c: 45621},
-    {f: 27, c: 45629}, {f: 3, c: 45657}, {f: 3, c: 45661}, {f: 7, c: 45665},
-    {f: 10, c: 45674}, {f: 6, c: 45686}, {f: 7, c: 45693}, {f: 3, c: 45702},
-    {f: 6, c: 45706}, {f: 2, c: 45714}, {f: 3, c: 45717}, {f: 5, c: 45723},
-    45730, 45732, {f: 3, c: 45735}, 45739, {f: 3, c: 45741}, {f: 3, c: 45745},
-    {f: 19, c: 45749}, {f: 2, c: 45770}, {f: 3, c: 45773}, 45777,
-    {f: 5, c: 45779}, 45786, 45788, {f: 4, c: 45790}, 45795, 45799,
-    {f: 2, c: 45801}, {f: 3, c: 45808}, 45814, {f: 3, c: 45820},
-    {f: 2, c: 45826}, {f: 3, c: 45829}, {f: 7, c: 45833}, 45842,
-    {f: 6, c: 45846}, {f: 55, c: 45853}, 45911, {f: 2, c: 45913}, 45917,
-    {f: 4, c: 45920}, 45926, 45928, 45930, {f: 2, c: 45932}, 45935,
-    {f: 2, c: 45938}, {f: 3, c: 45941}, {f: 7, c: 45945}, 45954,
-    {f: 6, c: 45958}, {f: 3, c: 45965}, {f: 3, c: 45969}, {f: 11, c: 45973},
-    {f: 6, c: 45986}, {f: 3, c: 45993}, {f: 23, c: 45997}, {f: 2, c: 46022},
-    {f: 2, c: 46025}, 46029, 46031, {f: 3, c: 46033}, 46038, 46040, 46042,
-    46044, {f: 2, c: 46046}, {f: 3, c: 46049}, {f: 3, c: 46053},
-    {f: 19, c: 46057}, {f: 19, c: 46077}, {f: 7, c: 46097}, {f: 3, c: 46105},
-    {f: 3, c: 46109}, {f: 7, c: 46113}, 46122, {f: 8, c: 46124},
-    {f: 27, c: 46133}, {f: 2, c: 46162}, {f: 3, c: 46165}, {f: 7, c: 46169},
-    46178, 46180, {f: 6, c: 46182}, {f: 19, c: 46189}, {f: 7, c: 46209},
-    {f: 20, c: 46217}, {f: 6, c: 46238}, {f: 3, c: 46245}, {f: 3, c: 46249},
-    {f: 8, c: 46253}, 46262, 46264, {f: 6, c: 46266}, {f: 3, c: 46273},
-    {f: 3, c: 46277}, {f: 7, c: 46281}, {f: 4, c: 46289}, {f: 6, c: 46294},
-    {f: 2, c: 46302}, {f: 2, c: 46305}, 46309, {f: 5, c: 46311}, 46318, 46320,
-    {f: 6, c: 46322}, {f: 27, c: 46329}, {f: 2, c: 46358}, {f: 2, c: 46361},
-    {f: 7, c: 46365}, 46374, {f: 5, c: 46379}, {f: 2, c: 46386},
-    {f: 3, c: 46389}, {f: 7, c: 46393}, 46402, {f: 5, c: 46406},
-    {f: 2, c: 46414}, {f: 3, c: 46417}, {f: 7, c: 46421}, 46430,
-    {f: 62, c: 46434}, {f: 2, c: 46498}, {f: 3, c: 46501}, 46505,
-    {f: 4, c: 46508}, 46514, {f: 5, c: 46518}, {f: 2, c: 46526},
-    {f: 3, c: 46529}, {f: 7, c: 46533}, 46542, {f: 6, c: 46546},
-    {f: 19, c: 46553}, {f: 35, c: 46573}, {f: 2, c: 46610}, {f: 3, c: 46613},
-    {f: 12, c: 46617}, {f: 6, c: 46630}, {f: 7, c: 46637}, {f: 19, c: 46645},
-    {f: 27, c: 46665}, {f: 3, c: 46693}, {f: 51, c: 46697}, {f: 2, c: 46750},
-    {f: 3, c: 46753}, {f: 6, c: 46757}, {f: 4, c: 46765}, {f: 34, c: 46770},
-    {f: 27, c: 46805}, {f: 3, c: 46833}, {f: 3, c: 46837}, {f: 7, c: 46841},
-    {f: 3, c: 46850}, {f: 34, c: 46854}, {f: 2, c: 46890}, {f: 2, c: 46893},
-    {f: 7, c: 46897}, 46906, {f: 8, c: 46908}, {f: 3, c: 46917},
-    {f: 3, c: 46921}, {f: 7, c: 46925}, {f: 10, c: 46934}, {f: 3, c: 46945},
-    {f: 3, c: 46949}, {f: 7, c: 46953}, 46962, 46964, {f: 6, c: 46966},
-    {f: 2, c: 46974}, {f: 3, c: 46977}, {f: 7, c: 46981}, 46990,
-    {f: 3, c: 46995}, {f: 2, c: 47002}, {f: 3, c: 47005}, {f: 7, c: 47009},
-    47018, {f: 6, c: 47022}, {f: 2, c: 47030}, {f: 14, c: 47033}, 47048,
-    {f: 34, c: 47050}, {f: 2, c: 47086}, {f: 3, c: 47089}, {f: 7, c: 47093},
-    47102, {f: 5, c: 47106}, {f: 2, c: 47114}, {f: 3, c: 47117},
-    {f: 7, c: 47121}, 47130, 47132, {f: 6, c: 47134}, {f: 2, c: 47142},
-    {f: 3, c: 47145}, {f: 7, c: 47149}, 47158, {f: 6, c: 47162},
-    {f: 3, c: 47169}, {f: 12, c: 47173}, 47186, {f: 8, c: 47188},
-    {f: 2, c: 47198}, {f: 3, c: 47201}, {f: 7, c: 47205}, 47214, 47216,
-    {f: 6, c: 47218}, {f: 3, c: 47225}, {f: 16, c: 47229}, {f: 26, c: 47246},
-    {f: 7, c: 47273}, {f: 3, c: 47281}, {f: 3, c: 47285}, {f: 7, c: 47289},
-    47298, 47300, {f: 6, c: 47302}, {f: 3, c: 47309}, {f: 3, c: 47313},
-    {f: 8, c: 47317}, 47326, 47328, {f: 6, c: 47330}, {f: 2, c: 47338},
-    {f: 3, c: 47341}, {f: 7, c: 47345}, 47354, 47356, {f: 6, c: 47358},
-    {f: 19, c: 47365}, {f: 7, c: 47385}, {f: 27, c: 47393}, {f: 2, c: 47422},
-    {f: 3, c: 47425}, {f: 7, c: 47429}, {f: 2, c: 47437}, 47440,
-    {f: 6, c: 47442}, {f: 2, c: 47450}, {f: 3, c: 47453}, {f: 7, c: 47457},
-    47466, 47468, {f: 6, c: 47470}, {f: 2, c: 47478}, {f: 3, c: 47481},
-    {f: 7, c: 47485}, 47494, 47496, {f: 2, c: 47499}, {f: 29, c: 47503},
-    {f: 2, c: 47534}, {f: 3, c: 47537}, {f: 7, c: 47541}, 47550, 47552,
-    {f: 6, c: 47554}, {f: 2, c: 47562}, 47565, {f: 5, c: 47571}, 47578, 47580,
-    {f: 2, c: 47583}, 47586, {f: 2, c: 47590}, {f: 3, c: 47593},
-    {f: 7, c: 47597}, 47606, {f: 5, c: 47611}, {f: 6, c: 47618},
-    {f: 12, c: 47625}, {f: 34, c: 47638}, {f: 2, c: 47674}, {f: 3, c: 47677},
-    47681, {f: 5, c: 47683}, 47690, 47692, {f: 4, c: 47695}, {f: 2, c: 47702},
-    {f: 3, c: 47705}, {f: 7, c: 47709}, 47718, {f: 6, c: 47722},
-    {f: 2, c: 47730}, {f: 3, c: 47733}, {f: 10, c: 47737}, 47750,
-    {f: 4, c: 47752}, {f: 27, c: 47757}, 47786, {f: 3, c: 47789}, 47793,
-    {f: 5, c: 47795}, 47802, 47804, {f: 6, c: 47806}, {f: 3, c: 47813},
-    {f: 15, c: 47817}, {f: 34, c: 47834}, {f: 3, c: 47869}, {f: 3, c: 47873},
-    {f: 8, c: 47877}, 47886, 47888, {f: 6, c: 47890}, {f: 3, c: 47897},
-    {f: 3, c: 47901}, {f: 8, c: 47905}, 47914, {f: 8, c: 47916}, 47927,
-    {f: 2, c: 47929}, {f: 5, c: 47935}, 47942, 47944, {f: 3, c: 47946}, 47950,
-    {f: 3, c: 47953}, {f: 3, c: 47957}, {f: 8, c: 47961}, 47970,
-    {f: 8, c: 47972}, {f: 27, c: 47981}, {f: 3, c: 48009}, {f: 3, c: 48013},
-    {f: 19, c: 48017}, {f: 3, c: 48037}, {f: 3, c: 48041}, {f: 7, c: 48045},
-    {f: 2, c: 48053}, {f: 8, c: 48056}, {f: 3, c: 48065}, {f: 3, c: 48069},
-    {f: 7, c: 48073}, {f: 2, c: 48081}, {f: 36, c: 48084}, {f: 2, c: 48122},
-    {f: 2, c: 48125}, 48129, {f: 5, c: 48131}, 48138, 48142, 48144,
-    {f: 2, c: 48146}, {f: 2, c: 48153}, {f: 4, c: 48160}, 48166, 48168,
-    {f: 3, c: 48170}, {f: 2, c: 48174}, {f: 2, c: 48178}, {f: 3, c: 48181},
-    {f: 7, c: 48185}, 48194, {f: 3, c: 48198}, {f: 2, c: 48202},
-    {f: 2, c: 48206}, {f: 12, c: 48209}, {f: 38, c: 48222}, {f: 2, c: 48262},
-    {f: 2, c: 48265}, 48269, {f: 5, c: 48271}, 48278, 48280, {f: 5, c: 48283},
-    {f: 2, c: 48290}, {f: 2, c: 48293}, {f: 7, c: 48297}, 48306,
-    {f: 6, c: 48310}, {f: 2, c: 48318}, {f: 3, c: 48321}, {f: 8, c: 48325},
-    48334, {f: 3, c: 48338}, {f: 2, c: 48342}, {f: 3, c: 48345},
-    {f: 23, c: 48349}, 48375, {f: 3, c: 48377}, {f: 7, c: 48381}, 48390, 48392,
-    {f: 6, c: 48394}, {f: 3, c: 48401}, {f: 15, c: 48405}, {f: 7, c: 48421},
-    {f: 19, c: 48429}, {f: 7, c: 48449}, {f: 2, c: 48458}, {f: 3, c: 48461},
-    {f: 7, c: 48465}, {f: 10, c: 48474}, {f: 3, c: 48485}, {f: 23, c: 48489},
-    {f: 2, c: 48514}, {f: 2, c: 48517}, {f: 5, c: 48523}, 48530, 48532,
-    {f: 3, c: 48534}, 48539, {f: 7, c: 48541}, {f: 11, c: 48549},
-    {f: 7, c: 48561}, {f: 27, c: 48569}, {f: 2, c: 48598}, {f: 3, c: 48601},
-    {f: 12, c: 48605}, {f: 6, c: 48618}, {f: 3, c: 48625}, {f: 3, c: 48629},
-    {f: 7, c: 48633}, {f: 2, c: 48641}, 48644, {f: 6, c: 48646},
-    {f: 2, c: 48654}, {f: 3, c: 48657}, {f: 7, c: 48661}, 48670,
-    {f: 36, c: 48672}, {f: 2, c: 48710}, {f: 3, c: 48713}, 48717,
-    {f: 5, c: 48719}, 48726, 48728, {f: 4, c: 48732}, {f: 2, c: 48738},
-    {f: 3, c: 48741}, 48745, {f: 5, c: 48747}, 48754, {f: 5, c: 48758},
-    {f: 2, c: 48766}, {f: 3, c: 48769}, {f: 7, c: 48773}, 48782,
-    {f: 6, c: 48786}, {f: 14, c: 48794}, {f: 39, c: 48809}, {f: 2, c: 48850},
-    {f: 2, c: 48853}, {f: 7, c: 48857}, {f: 2, c: 48865}, {f: 6, c: 48870},
-    {f: 20, c: 48877}, {f: 6, c: 48898}, {f: 14, c: 48906}, 48922,
-    {f: 34, c: 48926}, {f: 2, c: 48962}, {f: 3, c: 48965}, {f: 7, c: 48969},
-    {f: 3, c: 48978}, {f: 62, c: 48982}, {f: 27, c: 49045}, {f: 20, c: 49073},
-    {f: 6, c: 49094}, {f: 2, c: 49102}, {f: 3, c: 49105}, {f: 7, c: 49109},
-    {f: 2, c: 49117}, 49120, {f: 90, c: 49122}, {f: 20, c: 49213},
-    {f: 6, c: 49234}, {f: 3, c: 49241}, {f: 3, c: 49245}, {f: 7, c: 49249},
-    {f: 38, c: 49258}, {f: 2, c: 49298}, {f: 3, c: 49301}, {f: 7, c: 49305},
-    49314, 49316, {f: 6, c: 49318}, 49326, {f: 2, c: 49329}, {f: 5, c: 49335},
-    49342, {f: 3, c: 49346}, {f: 2, c: 49350}, {f: 2, c: 49354},
-    {f: 3, c: 49357}, {f: 7, c: 49361}, 49370, {f: 6, c: 49374},
-    {f: 2, c: 49382}, {f: 3, c: 49385}, {f: 7, c: 49389}, 49398, 49400,
-    {f: 6, c: 49402}, {f: 3, c: 49409}, {f: 3, c: 49413}, {f: 7, c: 49417},
-    {f: 4, c: 49425}, {f: 6, c: 49430}, {f: 2, c: 49441}, 49445,
-    {f: 4, c: 49448}, 49454, {f: 4, c: 49458}, 49463, {f: 2, c: 49466},
-    {f: 3, c: 49469}, {f: 7, c: 49473}, 49482, {f: 6, c: 49486},
-    {f: 2, c: 49494}, {f: 3, c: 49497}, {f: 7, c: 49501}, 49510,
-    {f: 6, c: 49514}, {f: 3, c: 49521}, {f: 3, c: 49525}, {f: 12, c: 49529},
-    {f: 6, c: 49542}, 49551, {f: 3, c: 49553}, 49557, {f: 5, c: 49559}, 49566,
-    49568, {f: 3, c: 49570}, {f: 2, c: 49574}, {f: 2, c: 49578},
-    {f: 3, c: 49581}, {f: 12, c: 49585}, {f: 6, c: 49598}, {f: 3, c: 49605},
-    {f: 3, c: 49609}, {f: 7, c: 49613}, {f: 2, c: 49621}, {f: 7, c: 49625},
-    {f: 3, c: 49633}, {f: 3, c: 49637}, {f: 7, c: 49641}, 49650,
-    {f: 8, c: 49652}, {f: 2, c: 49662}, {f: 3, c: 49665}, {f: 7, c: 49669},
-    49678, 49680, {f: 6, c: 49682}, {f: 2, c: 49690}, {f: 2, c: 49693},
-    {f: 7, c: 49697}, 49706, 49708, 49710, 49712, 49715, {f: 19, c: 49717},
-    {f: 7, c: 49737}, {f: 2, c: 49746}, {f: 3, c: 49749}, {f: 7, c: 49753},
-    {f: 4, c: 49761}, {f: 6, c: 49766}, {f: 2, c: 49774}, {f: 3, c: 49777},
-    {f: 7, c: 49781}, 49790, 49792, {f: 6, c: 49794}, {f: 6, c: 49802},
-    {f: 7, c: 49809}, {f: 2, c: 49817}, 49820, {f: 6, c: 49822},
-    {f: 2, c: 49830}, {f: 3, c: 49833}, {f: 6, c: 49838}, 49846, 49848,
-    {f: 34, c: 49850}, {f: 2, c: 49886}, {f: 2, c: 49889}, {f: 6, c: 49893},
-    49902, 49904, {f: 4, c: 49906}, 49911, 49914, {f: 3, c: 49917},
-    {f: 7, c: 49921}, {f: 2, c: 49930}, {f: 5, c: 49934}, {f: 2, c: 49942},
-    {f: 3, c: 49945}, {f: 7, c: 49949}, {f: 2, c: 49958}, {f: 27, c: 49962},
-    {f: 34, c: 49990}, {f: 2, c: 50026}, {f: 3, c: 50029}, 50033,
-    {f: 5, c: 50035}, {f: 2, c: 50042}, {f: 6, c: 50046}, {f: 3, c: 50053},
-    {f: 3, c: 50057}, {f: 51, c: 50061}, {f: 23, c: 50113}, {f: 2, c: 50138},
-    {f: 2, c: 50141}, 50145, {f: 5, c: 50147}, {f: 3, c: 50154},
-    {f: 6, c: 50158}, {f: 2, c: 50166}, {f: 15, c: 50169}, {f: 7, c: 50185},
-    {f: 19, c: 50193}, {f: 7, c: 50213}, {f: 3, c: 50221}, {f: 3, c: 50225},
-    {f: 7, c: 50229}, {f: 10, c: 50238}, {f: 27, c: 50249}, {f: 2, c: 50278},
-    {f: 3, c: 50281}, {f: 7, c: 50285}, {f: 3, c: 50294}, {f: 6, c: 50298},
-    {f: 19, c: 50305}, {f: 7, c: 50325}, {f: 27, c: 50333}, {f: 3, c: 50361},
-    {f: 44, c: 50365}, {f: 6, c: 50410}, {f: 2, c: 50418}, {f: 3, c: 50421},
-    50425, {f: 4, c: 50427}, {f: 10, c: 50434}, {f: 3, c: 50445},
-    {f: 3, c: 50449}, {f: 7, c: 50453}, {f: 11, c: 50461}, {f: 2, c: 50474},
-    {f: 3, c: 50477}, {f: 7, c: 50481}, 50490, 50492, {f: 6, c: 50494},
-    {f: 2, c: 50502}, 50507, {f: 4, c: 50511}, 50518, {f: 3, c: 50522}, 50527,
-    {f: 2, c: 50530}, {f: 3, c: 50533}, {f: 7, c: 50537}, 50546,
-    {f: 6, c: 50550}, {f: 2, c: 50558}, {f: 3, c: 50561}, {f: 2, c: 50565},
-    {f: 4, c: 50568}, 50574, 50576, {f: 3, c: 50578}, 50582, {f: 3, c: 50585},
-    {f: 3, c: 50589}, {f: 8, c: 50593}, {f: 10, c: 50602}, {f: 2, c: 50614},
-    50618, {f: 5, c: 50623}, 50635, 50637, 50639, {f: 2, c: 50642},
-    {f: 3, c: 50645}, {f: 7, c: 50649}, 50658, 50660, {f: 6, c: 50662}, 50671,
-    {f: 3, c: 50673}, 50677, {f: 4, c: 50680}, {f: 3, c: 50690},
-    {f: 3, c: 50697}, {f: 3, c: 50701}, {f: 7, c: 50705}, 50714,
-    {f: 7, c: 50717}, {f: 2, c: 50726}, {f: 3, c: 50729}, 50735,
-    {f: 2, c: 50737}, 50742, 50744, 50746, {f: 4, c: 50748}, {f: 2, c: 50754},
-    {f: 3, c: 50757}, {f: 7, c: 50761}, 50770, {f: 6, c: 50774},
-    {f: 2, c: 50782}, {f: 11, c: 50785}, {f: 2, c: 50797}, 50800,
-    {f: 6, c: 50802}, {f: 2, c: 50810}, {f: 3, c: 50813}, {f: 7, c: 50817},
-    50826, 50828, {f: 6, c: 50830}, {f: 2, c: 50838}, {f: 3, c: 50841},
-    {f: 7, c: 50845}, 50854, 50856, {f: 6, c: 50858}, {f: 2, c: 50866},
-    {f: 3, c: 50869}, {f: 5, c: 50875}, 50882, 50884, {f: 6, c: 50886},
-    {f: 2, c: 50894}, {f: 3, c: 50897}, {f: 7, c: 50901}, {f: 2, c: 50910},
-    {f: 6, c: 50914}, {f: 2, c: 50922}, {f: 3, c: 50925}, {f: 7, c: 50929},
-    {f: 3, c: 50938}, {f: 6, c: 50942}, {f: 2, c: 50950}, {f: 3, c: 50953},
-    {f: 7, c: 50957}, 50966, 50968, {f: 6, c: 50970}, {f: 2, c: 50978},
-    {f: 3, c: 50981}, {f: 7, c: 50985}, 50994, 50996, 50998, {f: 4, c: 51000},
-    {f: 2, c: 51006}, {f: 3, c: 51009}, {f: 5, c: 51013}, 51019, 51022, 51024,
-    {f: 3, c: 51033}, {f: 3, c: 51037}, {f: 7, c: 51041}, {f: 2, c: 51049},
-    {f: 8, c: 51052}, {f: 2, c: 51062}, {f: 3, c: 51065}, {f: 4, c: 51071},
-    51078, {f: 3, c: 51083}, 51087, {f: 2, c: 51090}, 51093, 51097,
-    {f: 5, c: 51099}, 51106, {f: 5, c: 51111}, {f: 2, c: 51118},
-    {f: 3, c: 51121}, {f: 7, c: 51125}, 51134, {f: 6, c: 51138},
-    {f: 2, c: 51146}, 51149, 51151, {f: 7, c: 51153}, {f: 4, c: 51161},
-    {f: 6, c: 51166}, {f: 3, c: 51173}, {f: 3, c: 51177}, {f: 19, c: 51181},
-    {f: 2, c: 51202}, {f: 3, c: 51205}, 51209, {f: 5, c: 51211}, 51218, 51220,
-    {f: 5, c: 51223}, {f: 2, c: 51230}, {f: 3, c: 51233}, {f: 7, c: 51237},
-    51246, 51248, {f: 6, c: 51250}, {f: 3, c: 51257}, {f: 3, c: 51261},
-    {f: 7, c: 51265}, {f: 2, c: 51274}, {f: 6, c: 51278}, {f: 27, c: 51285},
-    {f: 2, c: 51314}, {f: 3, c: 51317}, 51321, {f: 5, c: 51323}, 51330, 51332,
-    {f: 3, c: 51336}, {f: 6, c: 51342}, {f: 8, c: 51349}, 51358, 51360,
-    {f: 6, c: 51362}, {f: 19, c: 51369}, {f: 6, c: 51390}, {f: 3, c: 51397},
-    {f: 3, c: 51401}, {f: 7, c: 51405}, 51414, 51416, {f: 6, c: 51418},
-    {f: 2, c: 51426}, {f: 16, c: 51429}, {f: 6, c: 51446}, {f: 2, c: 51454},
-    {f: 3, c: 51457}, {f: 5, c: 51463}, 51470, 51472, {f: 6, c: 51474},
-    {f: 19, c: 51481}, {f: 7, c: 51501}, {f: 27, c: 51509}, {f: 2, c: 51538},
-    {f: 3, c: 51541}, {f: 7, c: 51545}, 51554, {f: 8, c: 51556},
-    {f: 3, c: 51565}, {f: 3, c: 51569}, {f: 7, c: 51573}, {f: 11, c: 51581},
-    {f: 2, c: 51594}, {f: 3, c: 51597}, {f: 7, c: 51601}, 51610, 51612,
-    {f: 34, c: 51614}, {f: 2, c: 51650}, {f: 2, c: 51653}, 51657,
-    {f: 5, c: 51659}, 51666, 51668, {f: 2, c: 51671}, 51675, {f: 2, c: 51678},
-    51681, 51683, {f: 2, c: 51685}, {f: 4, c: 51688}, 51694, {f: 6, c: 51698},
-    {f: 2, c: 51706}, {f: 3, c: 51709}, {f: 7, c: 51713}, 51722,
-    {f: 6, c: 51726}, {f: 3, c: 51733}, {f: 16, c: 51737}, {f: 34, c: 51754},
-    {f: 2, c: 51790}, {f: 3, c: 51793}, {f: 7, c: 51797}, 51806,
-    {f: 6, c: 51810}, {f: 20, c: 51817}, {f: 6, c: 51838}, {f: 19, c: 51845},
-    {f: 35, c: 51865}, {f: 2, c: 51902}, {f: 3, c: 51905}, {f: 7, c: 51909},
-    51918, 51920, 51922, {f: 4, c: 51924}, {f: 6, c: 51930}, {f: 11, c: 51937},
-    {f: 7, c: 51949}, {f: 19, c: 51957}, {f: 7, c: 51977}, {f: 3, c: 51985},
-    {f: 3, c: 51989}, {f: 7, c: 51993}, {f: 31, c: 52002}, {f: 6, c: 52034},
-    {f: 2, c: 52042}, {f: 3, c: 52045}, {f: 7, c: 52049}, {f: 3, c: 52058},
-    {f: 6, c: 52062}, {f: 19, c: 52069}, {f: 34, c: 52090}, {f: 27, c: 52125},
-    {f: 27, c: 52153}, {f: 15, c: 52181}, {f: 2, c: 52197}, 52200,
-    {f: 34, c: 52202}, {f: 2, c: 52238}, {f: 3, c: 52241}, {f: 7, c: 52245},
-    {f: 3, c: 52254}, {f: 4, c: 52259}, {f: 2, c: 52266}, 52269, 52271,
-    {f: 7, c: 52273}, 52282, {f: 5, c: 52287}, {f: 2, c: 52294},
-    {f: 3, c: 52297}, {f: 7, c: 52301}, 52310, {f: 6, c: 52314},
-    {f: 3, c: 52321}, 52325, 52327, {f: 7, c: 52329}, {f: 4, c: 52337},
-    {f: 34, c: 52342}, {f: 2, c: 52378}, {f: 3, c: 52381}, {f: 7, c: 52385},
-    52394, {f: 6, c: 52398}, {f: 2, c: 52406}, {f: 3, c: 52409},
-    {f: 7, c: 52413}, 52422, 52424, {f: 6, c: 52426}, {f: 3, c: 52433},
-    {f: 15, c: 52437}, {f: 7, c: 52453}, {f: 3, c: 52461}, {f: 16, c: 52465},
-    {f: 6, c: 52482}, {f: 2, c: 52490}, {f: 3, c: 52493}, {f: 7, c: 52497},
-    52506, 52508, {f: 6, c: 52510}, {f: 3, c: 52517}, {f: 3, c: 52521},
-    {f: 12, c: 52525}, {f: 34, c: 52538}, {f: 3, c: 52573}, {f: 3, c: 52577},
-    {f: 7, c: 52581}, 52590, 52592, {f: 6, c: 52594}, {f: 15, c: 52601},
-    {f: 11, c: 52617}, {f: 2, c: 52630}, {f: 3, c: 52633}, {f: 7, c: 52637},
-    52646, 52648, {f: 6, c: 52650}, {f: 19, c: 52657}, {f: 7, c: 52677},
-    {f: 3, c: 52685}, {f: 23, c: 52689}, {f: 3, c: 52713}, {f: 3, c: 52717},
-    {f: 7, c: 52721}, 52730, 52732, {f: 6, c: 52734}, {f: 3, c: 52741},
-    {f: 3, c: 52745}, {f: 7, c: 52749}, {f: 4, c: 52757}, {f: 6, c: 52762},
-    {f: 2, c: 52770}, {f: 3, c: 52773}, {f: 7, c: 52777}, 52786, 52788,
-    {f: 34, c: 52790}, {f: 2, c: 52826}, {f: 2, c: 52829}, {f: 6, c: 52834},
-    52842, 52844, {f: 6, c: 52846}, {f: 2, c: 52854}, {f: 3, c: 52857},
-    {f: 7, c: 52861}, 52870, 52872, {f: 6, c: 52874}, {f: 2, c: 52882},
-    {f: 3, c: 52885}, {f: 7, c: 52889}, 52898, {f: 6, c: 52902},
-    {f: 19, c: 52910}, {f: 34, c: 52930}, {f: 2, c: 52966}, {f: 2, c: 52969},
-    {f: 7, c: 52973}, 52982, {f: 6, c: 52986}, {f: 2, c: 52994},
-    {f: 3, c: 52997}, {f: 7, c: 53001}, 53010, 53012, {f: 6, c: 53014},
-    {f: 3, c: 53021}, {f: 3, c: 53025}, {f: 7, c: 53029}, 53038,
-    {f: 6, c: 53042}, {f: 27, c: 53049}, {f: 2, c: 53078}, {f: 3, c: 53081},
-    {f: 7, c: 53085}, 53094, 53096, {f: 6, c: 53098}, {f: 2, c: 53106},
-    {f: 3, c: 53109}, {f: 7, c: 53113}, {f: 4, c: 53121}, {f: 6, c: 53126},
-    {f: 20, c: 53133}, {f: 6, c: 53154}, {f: 7, c: 53161}, {f: 19, c: 53169},
-    {f: 27, c: 53189}, {f: 2, c: 53218}, {f: 3, c: 53221}, {f: 7, c: 53225},
-    53234, 53236, {f: 6, c: 53238}, {f: 3, c: 53245}, {f: 3, c: 53249},
-    {f: 12, c: 53253}, {f: 6, c: 53266}, {f: 20, c: 53273}, {f: 6, c: 53294},
-    {f: 2, c: 53302}, {f: 3, c: 53305}, {f: 7, c: 53309}, 53318, 53320,
-    {f: 6, c: 53322}, {f: 3, c: 53329}, {f: 3, c: 53333}, {f: 7, c: 53337},
-    {f: 11, c: 53345}, {f: 2, c: 53358}, {f: 3, c: 53361}, {f: 7, c: 53365},
-    {f: 3, c: 53374}, {f: 34, c: 53378}, {f: 2, c: 53414}, {f: 3, c: 53417},
-    {f: 7, c: 53421}, 53430, 53432, {f: 6, c: 53434}, {f: 2, c: 53442},
-    {f: 3, c: 53445}, {f: 6, c: 53450}, 53458, {f: 6, c: 53462},
-    {f: 2, c: 53470}, {f: 3, c: 53473}, {f: 7, c: 53477}, 53486,
-    {f: 6, c: 53490}, {f: 20, c: 53497}, {f: 34, c: 53518}, {f: 2, c: 53554},
-    {f: 3, c: 53557}, 53561, {f: 5, c: 53563}, 53570, {f: 6, c: 53574},
-    {f: 2, c: 53582}, {f: 3, c: 53585}, {f: 7, c: 53589}, 53598, 53600,
-    {f: 6, c: 53602}, {f: 3, c: 53609}, {f: 15, c: 53613}, {f: 7, c: 53629},
-    {f: 3, c: 53637}, {f: 23, c: 53641}, {f: 2, c: 53666}, {f: 3, c: 53669},
-    {f: 7, c: 53673}, 53682, 53684, {f: 4, c: 53686}, 53691, {f: 3, c: 53693},
-    {f: 23, c: 53697}, {f: 27, c: 53721}, {f: 3, c: 53749}, {f: 14, c: 53753},
-    53768, {f: 6, c: 53770}, {f: 27, c: 53777}, {f: 2, c: 53806},
-    {f: 3, c: 53809}, {f: 7, c: 53813}, 53822, 53824, {f: 6, c: 53826},
-    {f: 19, c: 53833}, {f: 7, c: 53853}, {f: 27, c: 53861}, {f: 2, c: 53890},
-    {f: 3, c: 53893}, {f: 7, c: 53897}, {f: 3, c: 53906}, {f: 6, c: 53910},
-    {f: 3, c: 53917}, {f: 3, c: 53921}, {f: 7, c: 53925}, {f: 4, c: 53933},
-    {f: 6, c: 53938}, {f: 2, c: 53946}, {f: 2, c: 53949}, 53953,
-    {f: 5, c: 53955}, 53962, {f: 8, c: 53964}, {f: 3, c: 53973},
-    {f: 3, c: 53977}, {f: 7, c: 53981}, {f: 10, c: 53990}, {f: 2, c: 54002},
-    {f: 3, c: 54005}, {f: 7, c: 54009}, 54018, 54020, {f: 6, c: 54022}, 54031,
-    {f: 3, c: 54033}, 54037, {f: 5, c: 54039}, 54046, {f: 3, c: 54050},
-    {f: 2, c: 54054}, {f: 2, c: 54058}, {f: 3, c: 54061}, {f: 7, c: 54065},
-    54074, {f: 6, c: 54078}, {f: 54, c: 54086}, {f: 2, c: 54142},
-    {f: 3, c: 54145}, {f: 7, c: 54149}, 54158, {f: 6, c: 54162},
-    {f: 2, c: 54170}, {f: 3, c: 54173}, {f: 7, c: 54177}, 54186, 54188,
-    {f: 6, c: 54190}, {f: 3, c: 54197}, {f: 3, c: 54201}, {f: 7, c: 54205},
-    {f: 2, c: 54214}, {f: 6, c: 54218}, {f: 7, c: 54225}, {f: 8, c: 54233},
-    54242, {f: 8, c: 54244}, {f: 2, c: 54254}, {f: 3, c: 54257},
-    {f: 7, c: 54261}, 54270, 54272, {f: 6, c: 54274}, {f: 20, c: 54281},
-    {f: 34, c: 54302}, {f: 3, c: 54337}, {f: 23, c: 54341}, {f: 3, c: 54365},
-    {f: 3, c: 54369}, {f: 8, c: 54373}, 54382, {f: 8, c: 54384},
-    {f: 2, c: 54394}, {f: 2, c: 54397}, 54401, {f: 5, c: 54403}, 54410, 54412,
-    {f: 6, c: 54414}, {f: 20, c: 54421}, {f: 34, c: 54442}, {f: 3, c: 54477},
-    {f: 3, c: 54481}, {f: 7, c: 54485}, {f: 2, c: 54493}, {f: 8, c: 54496},
-    {f: 3, c: 54505}, {f: 3, c: 54509}, {f: 7, c: 54513}, {f: 2, c: 54521},
-    54524, {f: 6, c: 54526}, {f: 3, c: 54533}, {f: 3, c: 54537},
-    {f: 7, c: 54541}, 54550, {f: 36, c: 54552}, {f: 2, c: 54590},
-    {f: 3, c: 54593}, {f: 7, c: 54597}, 54606, 54608, {f: 6, c: 54610},
-    {f: 2, c: 54618}, {f: 3, c: 54621}, {f: 4, c: 54625}, {f: 2, c: 54630},
-    54634, 54636, {f: 6, c: 54638}, {f: 2, c: 54646}, {f: 3, c: 54649},
-    {f: 7, c: 54653}, 54662, {f: 6, c: 54666}, {f: 20, c: 54673},
-    {f: 34, c: 54694}, {f: 2, c: 54730}, {f: 3, c: 54733}, 54737,
-    {f: 5, c: 54739}, 54746, 54748, {f: 6, c: 54750}, {f: 2, c: 54758},
-    {f: 3, c: 54761}, {f: 7, c: 54765}, 54774, 54776, {f: 6, c: 54778},
-    {f: 2, c: 54786}, {f: 3, c: 54789}, {f: 7, c: 54793}, 54802,
-    {f: 6, c: 54806}, {f: 3, c: 54813}, {f: 3, c: 54817}, {f: 8, c: 54821},
-    {f: 10, c: 54830}, {f: 2, c: 54842}, {f: 3, c: 54845}, {f: 4, c: 54849},
-    {f: 2, c: 54854}, 54858, 54860, {f: 3, c: 54862}, {f: 2, c: 54866},
-    {f: 2, c: 54870}, {f: 3, c: 54873}, {f: 10, c: 54877}, 54888,
-    {f: 6, c: 54890}, {f: 2, c: 54898}, {f: 14, c: 54901}, 54916,
-    {f: 6, c: 54918}, {f: 2, c: 54926}, {f: 3, c: 54929}, {f: 8, c: 54933},
-    54942, 54944, {f: 6, c: 54946}, {f: 3, c: 54953}, {f: 3, c: 54957},
-    {f: 8, c: 54961}, 54970, {f: 8, c: 54972}, {f: 2, c: 54982},
-    {f: 3, c: 54985}, {f: 4, c: 54989}, {f: 2, c: 54994}, {f: 2, c: 54997},
-    55000, {f: 6, c: 55002}, {f: 3, c: 55009}, {f: 3, c: 55013},
-    {f: 7, c: 55017}, {f: 4, c: 55025}, {f: 6, c: 55030}, {f: 2, c: 55038},
-    {f: 3, c: 55041}, {f: 12, c: 55045}, {f: 6, c: 55058}, {f: 2, c: 55066},
-    {f: 3, c: 55069}, {f: 7, c: 55073}, 55082, 55084, {f: 6, c: 55086},
-    {f: 2, c: 55094}, {f: 3, c: 55097}, {f: 7, c: 55101}, {f: 2, c: 55109},
-    55112, {f: 6, c: 55114}, {f: 2, c: 55122}, 55125, {f: 6, c: 55130}, 55138,
-    55140, {f: 3, c: 55142}, {f: 2, c: 55146}, {f: 3, c: 55149},
-    {f: 3, c: 55153}, {f: 7, c: 55157}, {f: 3, c: 55166}, {f: 6, c: 55170},
-    {f: 2, c: 55178}, {f: 3, c: 55181}, {f: 7, c: 55185}, 55194, 55196,
-    {f: 6, c: 55198}],
-  'Adobe-CNS1': [{f: 95, c: 32}, {s: 3}, 12288, 65292, {f: 2, c: 12289}, 65294,
-    8226, 65307, 65306, 65311, 65281, 65072, 8230, 8229, 65104, 65380, 65106,
-    183, {f: 4, c: 65108}, 65372, 8211, 65073, 8212, {s: 4}, {f: 2, c: 65288},
-    {f: 2, c: 65077}, 65371, 65373, {f: 2, c: 65079}, {f: 2, c: 12308},
-    {f: 2, c: 65081}, {f: 2, c: 12304}, {f: 2, c: 65083}, {f: 2, c: 12298},
-    {f: 2, c: 65085}, {f: 2, c: 12296}, {f: 2, c: 65087}, {f: 2, c: 12300},
-    {f: 2, c: 65089}, {f: 2, c: 12302}, {f: 2, c: 65091}, {f: 6, c: 65113},
-    {f: 2, c: 8216}, {f: 2, c: 8220}, {f: 2, c: 12317}, 8245, 8242, 65283,
-    65286, 65290, 8251, 167, 12291, 9675, 9679, 9651, 9650, 9678, 9734, 9733,
-    9671, 9670, 9633, 9632, 9661, 9660, 12963, 8453, 8254, 0, 65343, 0,
-    {f: 2, c: 65097}, {f: 2, c: 65101}, {f: 2, c: 65099}, {f: 3, c: 65119},
-    65291, 65293, 215, 247, 177, 8730, 65308, 65310, 65309, {f: 2, c: 8806},
-    8800, 8734, 8786, 8801, {f: 5, c: 65122}, 8764, {f: 2, c: 8745}, 8869,
-    8736, 8735, 8895, 13266, 13265, 8747, 8750, 8757, 8756, 9792, 9794, 9793,
-    9737, 8593, 8595, 8594, 8592, {f: 2, c: 8598}, 8601, 8600, 8741, 8739, 0,
-    0, 65295, 65340, 65284, 165, 12306, {f: 2, c: 162}, 65285, 65312, 8451,
-    8457, {f: 3, c: 65129}, 13269, {f: 3, c: 13212}, 13262, 13217,
-    {f: 2, c: 13198}, 13252, 176, [20825, 58834], [20827, 58835],
-    [20830, 58837], [20829, 58836], 20833, 20835, 21991, [29929, 58044],
-    [31950, 58191], {f: 8, c: 9601}, 9615, 9614, 9613, 9612, 9611, 9610, 9609,
-    9532, 9524, 9516, 9508, 9500, 9620, 9472, 9474, 9621, 9484, 9488, 9492,
-    9496, {f: 2, c: 9581}, 9584, 9583, 9552, 9566, 9578, 9569, {f: 2, c: 9698},
-    9701, 9700, {f: 3, c: 9585}, {f: 10, c: 65296}, {f: 10, c: 8544},
-    {f: 9, c: 12321}, 0, [21316, 57443], 0, {f: 26, c: 65313},
-    {f: 26, c: 65345}, {f: 17, c: 913}, {f: 7, c: 931}, {f: 17, c: 945},
-    {f: 7, c: 963}, {f: 37, c: 12549}, 729, 714, 711, 715, [9312, 63153],
-    [9313, 63154], [9314, 63155], [9315, 63156], [9316, 63157], [9317, 63158],
-    [9318, 63159], [9319, 63160], [9320, 63161], [9321, 63162], [9332, 63163],
-    [9333, 63164], [9334, 63165], [9335, 63166], [9336, 63167], [9337, 63168],
-    [9338, 63169], [9339, 63170], [9340, 63171], [9341, 63172], [8560, 63173],
-    [8561, 63174], [8562, 63175], [8563, 63176], [8564, 63177], [8565, 63178],
-    [8566, 63179], [8567, 63180], [8568, 63181], [8569, 63182], [12033, 20008],
-    [12034, 20022, 63183], [12035, 20031, 63184], [12037, 20101, 63185],
-    [12039, 20128, 63186], [12044, 20866, 63187], [12045, 20886, 63188],
-    [12046, 20907, 63189], [12051, 21241, 63190], [12054, 21304, 63191],
-    [12057, 21353, 63192], [12059, 21430, 63193],
-    [12065, 12066, 22786, 22794, 63194], [12071, 23424, 63195],
-    [12078, 24027, 63196], [12083, 24186, 63197], [12084, 24191, 63198],
-    [12085, 24308], [12089, 24400, 63200], [12090, 24417, 63201],
-    [12097, 25908, 63202], [12102, 26080], [12135, 30098, 63204],
-    [12136, 30326], [12193, 36789, 63206], [12202, 38582], {f: 32, c: 9216},
-    9249, [12032, 19968], [12036, 20057], 19969, 19971, 20035, 20061, 20102,
-    [12038, 20108], [12040, 20154], [12041, 20799], [12042, 20837],
-    [12043, 20843], [12047, 20960], [12049, 20992], 20993, [12050, 21147],
-    [12052, 21269], [12055, 21313], [12056, 21340], [12060, 21448], 19977,
-    19979, 19976, 19978, 20011, 20024, 20961, 20037, 20040, 20063, 20062,
-    20110, 20129, [20800, 64012], 20995, 21242, 21315, 21449, [12061, 21475],
-    [12063, 22303], [12064, 22763], [12067, 22805], [12068, 22823],
-    [12069, 22899], [12070, 23376], 23377, 23379, [12072, 23544],
-    [12073, 23567], [12074, 23586], [12075, 23608], [12077, 23665], 24029,
-    [12079, 24037], [12080, 24049], {f: 2, c: 24050}, [12081, 24062],
-    [12082, 24178], [12086, 24318], [12087, 24331], [12088, 24339], 25165,
-    19985, 19984, 19981, 20013, 20016, 20025, 20043, 23609, 20104, 20113,
-    20117, 20114, 20116, 20130, 20161, 20160, 20163, {f: 2, c: 20166}, 20173,
-    {f: 2, c: 20170}, 20164, 20803, 20801, 20839, {f: 2, c: 20845}, 20844,
-    20887, 20982, {f: 3, c: 20998}, 21243, {f: 2, c: 21246}, 21270, 21305,
-    21320, 21319, 21317, 21342, 21380, 21451, 21450, 21453, 22764, 22825,
-    22827, 22826, 22829, 23380, 23569, 23588, 23610, 23663, 24052, 24187,
-    24319, {f: 2, c: 24340}, [12092, 24515], [12093, 25096], [12094, 25142],
-    [12095, 25163], 25166, [12096, 25903], [12098, 25991], [12099, 26007],
-    [12100, 26020], [12101, 26041], [12103, 26085], [12104, 26352],
-    [12105, 26376], [12106, 26408], [12107, 27424], [12108, 27490],
-    [12109, 27513], [12111, 27595], [12112, 27604], [12113, 27611],
-    [12114, 27663], [12116, 27700], [12117, 28779], [12118, 29226],
-    [12119, 29238], [12120, 29243], [12122, 29255], [12123, 29273],
-    [12124, 29275], [12125, 29356], 29579, 19993, 19990, 19989, 19988, 19992,
-    20027, 20045, 20047, 20046, 20197, 20184, {f: 4, c: 20180},
-    {f: 2, c: 20195}, 20185, 20190, 20805, 20804, {f: 2, c: 20873}, 20908,
-    {f: 2, c: 20985}, 20984, 21002, 21152, 21151, [21253, 57435], 21254, 21271,
-    21277, 20191, 21322, 21321, 21345, 21344, 21359, 21358, 21435, 21487,
-    21476, 21491, 21484, 21486, 21481, 21480, 21500, 21496, 21493, 21483,
-    21478, 21482, 21490, 21489, 21488, 21477, 21485, 21499, 22235, 22234,
-    22806, 22830, 22833, 22900, 22902, 23381, 23427, 23612, 24040, 24039,
-    24038, {f: 2, c: 24066}, 24179, 24188, 24321, 24344, 24343, 24517, 25098,
-    {f: 2, c: 25171}, 25170, 25169, 26021, 26086, 26414, 26412,
-    {f: 2, c: 26410}, 26413, 27491, 27597, 27665, 27664, 27704, 27713, 27712,
-    27710, 29359, [12126, 29572], [12127, 29577], [12128, 29916],
-    [12129, 29926], [12130, 29976], [12131, 29983], [12132, 29992], 29993,
-    [12133, 30000], {f: 3, c: 30001}, [12134, 30091], [12137, 30333],
-    [12138, 30382], [12139, 30399], [12140, 30446], [12141, 30683],
-    [12142, 30690], [12143, 30707], [12144, 31034], [12146, 31166],
-    [12147, 31348], [12148, 31435], {f: 2, c: 19998}, {f: 2, c: 20050}, 20073,
-    20121, 20132, 20134, 20133, 20223, 20233, 20249, 20234, 20245, 20237,
-    {f: 2, c: 20240}, 20239, 20210, 20214, 20219, 20208, 20211, 20221, 20225,
-    20235, 20809, 20807, 20806, 20808, 20840, 20849, 20877, 20912, 21015,
-    {f: 2, c: 21009}, 21006, 21014, 21155, 21256, 21281, 21280,
-    {f: 2, c: 21360}, 21513, 21519, 21516, 21514, 21520, 21505, 21515, 21508,
-    21521, 21517, 21512, 21507, 21518, 21510, 21522, 22240, 22238, 22237,
-    22323, 22320, 22312, 22317, 22316, 22319, 22313, {f: 2, c: 22809},
-    {f: 2, c: 22839}, 22916, 22904, 22915, 22909, 22905, 22914, 22913,
-    {f: 2, c: 23383}, {f: 2, c: 23431}, 23429, 23433, 23546, 23574, 23673,
-    24030, 24070, 24182, 24180, 24335, 24347, 24537, 24534, 25102,
-    {f: 2, c: 25100}, 25104, 25187, 25179, 25176, 25910, 26089, 26088,
-    {f: 2, c: 26092}, {f: 2, c: 26354}, 26377, 26429, 26420, 26417, 26421,
-    27425, 27492, 27515, 27670, 27741, 27735, 27737, {f: 2, c: 27743}, 27728,
-    27733, 27745, 27739, {f: 2, c: 27725}, 28784, 29279, 29277, 30334,
-    [12149, 31481], [12150, 31859], [12151, 31992], [12152, 32566],
-    [12154, 32650], [12155, 32701], [12156, 32769], 32771, [12157, 32780],
-    [12158, 32786], [12159, 32819], [12160, 32895], [12161, 32905],
-    {f: 2, c: 32907}, [12162, 33251], [12163, 33258], [12164, 33267],
-    [12165, 33276], [12166, 33292], [12167, 33307], [12168, 33311],
-    [12169, 33390], [12170, 33394], 33406, [12173, 34411], [12174, 34880],
-    [12175, 34892], [12176, 34915], 35199, 38433, 20018, 20136, 20301, 20303,
-    20295, 20311, 20318, 20276, 20315, 20309, 20272, {f: 2, c: 20304}, 20285,
-    20282, 20280, 20291, 20308, 20284, 20294, 20323, 20316, 20320, 20271,
-    20302, 20278, 20313, 20317, 20296, 20314, 20812, 20811, 20813, 20853,
-    {f: 2, c: 20918}, 21029, 21028, {f: 2, c: 21033}, 21032, 21163,
-    {f: 2, c: 21161}, 21164, 21283, 21363, 21365, 21533, 21549, 21534, 21566,
-    21542, 21582, 21543, 21574, 21571, 21555, 21576, 21570, 21531, 21545,
-    21578, 21561, 21563, 21560, 21550, {f: 2, c: 21557}, 21536, 21564, 21568,
-    21553, 21547, 21535, 21548, 22250, 22256, 22244, 22251, 22346, 22353,
-    22336, 22349, 22343, 22350, 22334, 22352, 22351, 22331, 22767, 22846,
-    22941, 22930, 22952, 22942, 22947, 22937, 22934, 22925, 22948, 22931,
-    22922, 22949, 23389, 23388, {f: 2, c: 23386}, 23436, 23435, 23439, 23596,
-    {f: 2, c: 23616}, 23615, 23614, {f: 2, c: 23696}, 23700, 23692, 24043,
-    24076, 24207, 24199, 24202, 24311, 24324, 24351, 24420, 24418, 24439,
-    24441, 24536, 24524, 24535, 24525, 24561, 24555, 24568, 24554, 25106,
-    25105, 25220, 25239, 25238, 25216, 25206, 25225, 25197, 25226, 25212,
-    25214, 25209, 25203, 25234, 25199, 25240, 25198, 25237, 25235, 25233,
-    25222, 25913, 25915, 25912, 26097, 26356, 26463, {f: 4, c: 26446}, 26460,
-    26454, [26462, 57801], 26441, 26438, 26464, 26451, 26455, 27493, 27599,
-    27714, 27742, 27801, 27777, {f: 2, c: 27784}, 27781, 27803, 27754, 27770,
-    27792, 27760, 27788, 27752, 27798, 27794, 27773, 27779, 27762, 27774,
-    27764, 27782, 27766, 27789, 27796, 27800, 27778, 28790, {f: 2, c: 28796},
-    28792, 29282, 29281, 29280, 29380, 29378, 29590, 29996, 29995,
-    {f: 2, c: 30007}, 30338, 30447, 30691, 31169, 31168, 31167, 31350, 31995,
-    32597, 32918, 32915, 32925, 32920, 32923, 32922, 32946, 33391, 33426,
-    33419, 33421, [12178, 35211], [12179, 35282], [12180, 35328],
-    [12181, 35895], [12182, 35910], [12183, 35925], [12185, 35997],
-    [12186, 36196], [12187, 36208], [12188, 36275], [12189, 36523],
-    [12190, 36554], [12191, 36763], [12192, 36784], 36802, 36806, 36805, 36804,
-    24033, [12194, 37009], 37026, 37034, 37030, 37027, [12195, 37193],
-    [12196, 37318], [12197, 37324], 38450, 38446, 38449, 38442, 38444, 20006,
-    20054, 20083, 20107, 20123, 20126, {f: 2, c: 20139}, 20335, 20381, 20365,
-    20339, 20351, 20332, 20379, 20363, 20358, 20355, 20336, 20341, 20360,
-    20329, 20347, 20374, 20350, 20367, 20369, 20346, 20820, 20818, 20821,
-    20841, 20855, 20854, 20856, 20925, 20989, 21051, 21048, 21047, 21050,
-    21040, 21038, 21046, 21057, 21182, 21179, 21330, 21332, 21331, 21329,
-    21350, {f: 3, c: 21367}, 21462, 21460, 21463, 21619, 21621, 21654, 21624,
-    21653, 21632, 21627, 21623, 21636, 21650, 21638, 21628, 21648, 21617,
-    21622, 21644, 21658, 21602, 21608, 21643, 21629, 21646, 22266, 22403,
-    22391, 22378, 22377, 22369, 22374, 22372, 22396, 22812, 22857,
-    {f: 2, c: 22855}, 22852, 22868, 22974, 22971, 22996, 22969, 22958, 22993,
-    22982, 22992, 22989, 22987, 22995, 22986, 22959, 22963, 22994, 22981,
-    23391, 23396, 23395, 23447, 23450, 23448, 23452, 23449, 23451, 23578,
-    23624, {f: 2, c: 23621}, 23735, 23713, 23736, 23721, 23723, 23729, 23731,
-    24088, 24090, 24086, 24085, 24091, 24081, 24184, 24218, 24215, 24220,
-    {f: 2, c: 24213}, 24310, {f: 2, c: 24358}, 24361, {f: 2, c: 24448}, 24447,
-    24444, 24541, 24544, 24573, 24565, 24575, 24591, 24596, 24623, 24629,
-    24598, 24618, 24597, 24609, 24615, 24617, 24619, 24603, 25110, 25109,
-    25151, 25150, 25152, 25215, 25289, 25292, 25284, 25279, 25282, 25273,
-    25298, 25307, 25259, {f: 2, c: 25299}, 25291, 25288, 25256, 25277, 25276,
-    [25296, 60582], 25305, 25287, 25293, 25269, 25306, 25265, 25304,
-    {f: 2, c: 25302}, 25286, 25260, [25294, 61010], 25918, 26023, 26044, 26106,
-    26132, 26131, 26124, 26118, 26114, 26126, 26112, 26127, 26133, 26122,
-    26119, 26381, 26379, 26477, 26507, 26517, 26481, 26524, 26483, 26487,
-    26503, 26525, 26519, {f: 2, c: 26479}, 26495, 26505, 26494, 26512, 26485,
-    26522, 26515, 26492, 26474, 26482, 27427, {f: 2, c: 27494}, 27519, 27667,
-    27675, 27875, 27880, 27891, 27825, 27852, 27877, 27827, {f: 2, c: 27837},
-    27836, 27874, 27819, 27861, 27859, 27832, 27844, 27833, 27841, 27822,
-    27863, 27845, 27889, 27839, 27835, 27873, 27867, 27850, 27820, 27887,
-    27868, 27862, 27872, 28821, 28814, 28818, 28810, 28825, {f: 2, c: 29228},
-    29240, 29256, 29287, 29289, 29376, 29390, 29401, 29399, 29392, 29609,
-    29608, 29599, 29611, 29605, 30013, 30109, {f: 2, c: 30105}, 30340, 30402,
-    30450, 30452, 30693, 30717, 31038, {f: 2, c: 31040}, 31177, 31176, 31354,
-    31353, 31482, 31998, 32596, 32652, 32651, [32773, 58236], 32954, 32933,
-    32930, 32945, 32929, 32939, 32937, 32948, 32938, 32943, 33253, 33278,
-    33293, 33459, 33437, 33433, 33453, 33469, 33439, 33465, 33457, 33452,
-    33445, 33455, 33464, 33443, 33456, 33470, 33463, 34382, 34417, 21021,
-    34920, 36555, 36814, 36820, 36817, 37045, 37048, 37041, 37046, 37319,
-    [12198, 37329], [12199, 38263], [12200, 38272], [12201, 38428], 38464,
-    38463, 38459, 38468, 38466, [12203, 38585], [12204, 38632], 38738,
-    [12206, 38750], 20127, {f: 2, c: 20141}, 20449, 20405, 20399, 20415, 20448,
-    20433, 20431, 20445, 20419, 20406, 20440, 20447, 20426, 20439, 20398,
-    20432, 20420, 20418, 20442, 20430, 20446, 20407, 20823, 20882, 20881,
-    20896, 21070, 21059, 21066, 21069, 21068, 21067, 21063, 21191, 21193,
-    21187, 21185, 21261, 21335, 21371, 21402, 21467, 21676, 21696, 21672,
-    21710, 21705, 21688, 21670, 21683, 21703, 21698, 21693, 21674, 21697,
-    21700, 21704, 21679, 21675, 21681, 21691, 21673, 21671, 21695, 22271,
-    22402, 22411, 22432, 22435, 22434, 22478, 22446, 22419, 22869, 22865,
-    22863, 22862, 22864, 23004, 23000, 23039, 23011, 23016, 23043, 23013,
-    23018, 23002, 23014, 23041, 23035, 23401, 23459, 23462, 23460, 23458,
-    23461, 23553, {f: 2, c: 23630}, 23629, 23627, 23769, 23762, 24055, 24093,
-    24101, 24095, 24189, 24224, 24230, 24314, 24328, 24365, 24421, 24456,
-    24453, {f: 2, c: 24458}, 24455, 24460, 24457, 24594, 24605, 24608, 24613,
-    24590, 24616, 24653, 24688, 24680, [24674, 60712], 24646, 24643, 24684,
-    24683, 24682, 24676, 25153, 25308, 25366, 25353, 25340, 25325, 25345,
-    25326, 25341, 25351, 25329, 25335, 25327, 25324, 25342, 25332, 25361,
-    25346, 25919, 25925, 26027, 26045, 26082, 26149, 26157, 26144, 26151,
-    26159, 26143, 26152, 26161, 26148, 26359, 26623, 26579, 26609, 26580,
-    26576, 26604, 26550, 26543, 26613, 26601, 26607, 26564, 26577, 26548,
-    26586, 26597, 26552, 26575, 26590, 26611, 26544, 26585, 26594, 26589,
-    26578, 27498, 27523, 27526, 27573, 27602, 27607, 27679, 27849, 27915,
-    27954, 27946, 27969, 27941, 27916, 27953, 27934, 27927, 27963,
-    {f: 2, c: 27965}, 27958, 27931, 27893, 27961, 27943, 27960, 27945, 27950,
-    27957, 27918, 27947, 28843, 28858, 28851, 28844, 28847, 28845, 28856,
-    28846, 28836, 29232, 29298, 29295, 29300, 29417, {f: 2, c: 29408}, 29623,
-    29642, 29627, 29618, 29645, 29632, 29619, 29978, 29997, 30031, 30028,
-    30030, 30027, 30123, {f: 2, c: 30116}, {f: 2, c: 30114}, 30328,
-    {f: 3, c: 30342}, 30408, 30406, 30403, 30405, 30465, 30457, 30456, 30473,
-    30475, 30462, 30460, 30471, 30684, 30722, 30740, {f: 2, c: 30732}, 31046,
-    31049, 31048, 31047, {f: 2, c: 31161}, {f: 2, c: 31185}, 31179, 31359,
-    31361, 31487, 31485, 31869, 32002, 32005, 32000, 32009, 32007, 32004,
-    32006, 32568, 32654, 32703, 32784, 32781, 32785, 32822, 32982, 32997,
-    32986, {f: 2, c: 32963}, 32972, 32993, 32987, 32974, 32990, 32996, 32989,
-    33268, 33314, 33511, 33539, 33541, 33507, 33499, 33510, 33540, 33509,
-    33538, 33545, 33490, 33495, 33521, 33537, 33500, 33492, 33489, 33502,
-    33491, 33503, 33519, 33542, 34384, 34425, 34427, 34426, 34893, 34923,
-    35201, 35284, 35336, {f: 2, c: 35330}, 35998, 36000, 36212, 36211, 36276,
-    36557, 36556, 36848, 36838, 36834, 36842, 36837, 36845, 36843, 36836,
-    36840, 37066, 37070, 37057, 37059, 37195, 37194, 37325, 38274, 38480,
-    {f: 3, c: 38475}, [12207, 38754], [12208, 38761], [12209, 38859],
-    [12210, 38893], [12211, 38899], [12212, 38913], [12213, 39080],
-    [12214, 39131], [12215, 39135], [12216, 39318], [12217, 39321], 20056,
-    20147, {f: 2, c: 20492}, 20515, 20463, 20518, 20517, 20472, [20521, 57375],
-    20502, 20486, 20540, 20511, 20506, 20498, 20497, 20474, 20480, 20500,
-    20520, 20465, 20513, 20491, 20505, 20504, 20467, 20462, 20525, 20522,
-    20478, 20523, 20489, 20860, {f: 2, c: 20900}, 20898, 20941, 20940, 20934,
-    20939, 21078, 21084, 21076, 21083, 21085, 21290, [21375, 57459], 21407,
-    21405, 21471, 21736, 21776, 21761, 21815, 21756, 21733, 21746, 21766,
-    21754, 21780, 21737, 21741, 21729, 21769, 21742, 21738, 21734, 21799,
-    21767, 21757, 21775, {f: 2, c: 22275}, 22466, 22484, 22475, 22467, 22537,
-    22799, {f: 2, c: 22871}, 22874, 23057, 23064, 23068, 23071, 23067, 23059,
-    23020, 23072, 23075, 23081, 23077, 23052, 23049, 23403, 23640, 23472,
-    23475, 23478, 23476, 23470, 23477, 23481, 23480, 23556, 23633, 23637,
-    23632, 23789, 23805, 23803, 23786, 23784, 23792, 23798, 23809, 23796,
-    24046, 24109, 24107, 24235, 24237, 24231, 24369, 24466, 24465, 24464,
-    24665, 24675, 24677, 24656, 24661, 24685, 24681, 24687, 24708, 24735,
-    24730, 24717, 24724, 24716, 24709, 24726, 25159, 25331, 25352, 25343,
-    25422, 25406, 25391, 25429, 25410, 25414, 25423, 25417, 25402, 25424,
-    25405, {f: 2, c: 25386}, 25384, 25421, 25420, {f: 2, c: 25928}, 26009,
-    26049, 26053, 26178, 26185, 26191, 26179, 26194, 26188, 26181, 26177,
-    26360, {f: 2, c: 26388}, 26391, 26657, 26680, 26696, 26694, 26707, 26681,
-    26690, 26708, 26665, 26803, 26647, 26700, 26705, 26685, 26612, 26704,
-    26688, 26684, 26691, 26666, 26693, 26643, 26648, 26689, 27530, 27529,
-    27575, 27683, {f: 2, c: 27687}, 27686, 27684, 27888, 28010, 28053, 28040,
-    28039, 28006, 28024, 28023, 27993, 28051, 28012, 28041, 28014, 27994,
-    28020, 28009, 28044, 28042, 28025, 28037, 28005, 28052, 28874, 28888,
-    28900, 28889, 28872, 28879, 29241, 29305, 29436, 29433, 29437, 29432,
-    29431, 29574, 29677, 29705, 29678, 29664, 29674, 29662, 30036, 30045,
-    30044, 30042, 30041, 30142, 30149, 30151, {f: 2, c: 30130}, 30141, 30140,
-    30137, 30146, 30136, 30347, 30384, 30410, {f: 2, c: 30413}, 30505,
-    {f: 2, c: 30495}, 30504, 30697, 30768, 30759, 30776, 30749, 30772, 30775,
-    30757, 30765, 30752, 30751, 30770, 31061, 31056, 31072, 31071, 31062,
-    31070, 31069, 31063, 31066, 31204, [31203, 60418], 31207, 31199, 31206,
-    31209, 31192, 31364, 31368, 31449, 31494, 31505, 31881, 32033, 32023,
-    32011, 32010, 32032, 32034, 32020, 32016, 32021, 32026, 32028, 32013,
-    32025, 32027, 32570, 32607, 32660, 32709, 32705, 32774, 32772, 32792,
-    32789, 32793, 32791, 32829, 32831, 33009, 33026, 33008, 33029, 33005,
-    33012, 33030, 33016, 33011, 33032, 33021, 33034, 33020, 33007, 33261,
-    33260, 33280, 33296, {f: 2, c: 33322}, 33320, 33324, 33467, 33579, 33618,
-    33620, 33610, 33592, 33616, 33609, 33589, 33588, 33615, 33586, 33593,
-    33590, 33559, 33600, 33585, 33576, 33603, 34388, 34442, 34474, 34451,
-    34468, 34473, 34444, 34467, 34460, 34928, 34935, {f: 2, c: 34945}, 34941,
-    34937, 35352, 35344, 35342, 35340, 35349, 35338, 35351, 35347, 35350,
-    35343, 35345, 35912, 35962, 35961, {f: 2, c: 36001}, [36215, 58442], 36524,
-    36562, 36564, 36559, 36785, 36865, 36870, 36855, 36864, 36858, 36852,
-    36867, 36861, 36869, 36856, 37013, 37089, 37085, 37090, 37202, 37197,
-    37196, 37336, 37341, 37335, 37340, 37337, 38275, {f: 2, c: 38498}, 38497,
-    38491, 38493, 38500, 38488, 38494, 38587, 39138, [12218, 39340],
-    [12219, 39592], [12220, 39640], [12222, 39717], [12224, 39730],
-    [12225, 39740], 20094, 20602, [20605, 57382], 20572, 20551, 20547, 20556,
-    20570, 20553, 20581, 20598, 20558, 20565, 20597, 20596, 20599, 20559,
-    20495, 20591, 20589, 20828, 20885, 20976, 21098, 21103, 21202, 21209,
-    21208, 21205, 21264, 21263, 21273, {f: 2, c: 21311}, 21310, 21443, 26364,
-    21830, 21866, 21862, 21828, 21854, 21857, 21827, 21834, 21809, 21846,
-    21839, 21845, 21807, 21860, 21816, 21806, 21852, 21804, 21859, 21811,
-    21825, 21847, 22280, 22283, 22281, 22495, 22533, 22538, 22534, 22496,
-    22500, 22522, 22530, 22581, 22519, 22521, 22816, 22882, 23094, 23105,
-    23113, 23142, 23146, 23104, 23100, 23138, 23130, 23110, 23114, 23408,
-    23495, 23493, 23492, 23490, 23487, 23494, 23561, 23560, 23559, 23648,
-    {f: 2, c: 23644}, 23815, 23814, 23822, 23835, 23830, 23842, 23825, 23849,
-    23828, 23833, 23844, 23847, 23831, 24034, 24120, 24118, 24115, 24119,
-    {f: 2, c: 24247}, 24246, 24245, 24254, 24373, 24375, 24407, 24428, 24425,
-    24427, 24471, 24473, 24478, 24472, 24481, 24480, 24476, 24703, 24739,
-    24713, 24736, 24744, 24779, 24756, 24806, 24765, 24773, 24763, 24757,
-    24796, 24764, 24792, 24789, 24774, 24799, 24760, 24794, 24775,
-    {f: 2, c: 25114}, 25160, 25504, 25511, 25458, 25494, 25506, 25509, 25463,
-    25447, 25496, 25514, 25457, 25513, 25481, 25475, 25499, 25451, 25512,
-    25476, 25480, 25497, 25505, 25516, 25490, 25487, 25472, 25467, 25449,
-    25448, 25466, 25949, 25942, 25937, 25945, 25943, 21855, 25935, 25944,
-    25941, 25940, 26012, 26011, 26028, 26063, {f: 2, c: 26059}, 26062, 26205,
-    26202, 26212, 26216, 26214, 26206, 26361, 21207, 26395, 26753, 26799,
-    26786, 26771, 26805, 26751, 26742, 26801, 26791, 26775, 26800, 26755,
-    26820, 26797, 26758, 26757, 26772, 26781, 26792, 26783, 26785, 26754,
-    27442, 27578, {f: 2, c: 27627}, 27691, 28046, 28092, 28147, 28121, 28082,
-    28129, 28108, 28132, 28155, 28154, 28165, 28103, 28107, 28079, 28113,
-    28078, 28126, 28153, 28088, 28151, 28149, 28101, 28114, 28186, 28085,
-    28122, 28139, 28120, 28138, 28145, 28142, 28136, 28102, 28100, 28074,
-    28140, 28095, 28134, 28921, {f: 2, c: 28937}, 28925, 28911, 29245, 29309,
-    29313, 29468, 29467, 29462, 29459, 29465, 29575, 29701, 29706, 29699,
-    29702, 29694, 29709, 29920, {f: 2, c: 29942}, 29980, 29986,
-    {f: 2, c: 30053}, 30050, 30064, 30095, {f: 2, c: 30164}, 30133, 30154,
-    30157, 30350, 30420, 30418, 30427, 30519, 30526, 30524, 30518, 30520,
-    30522, 30827, 30787, 30798, 31077, 31080, 31085, 31227, 31378, 31381,
-    31520, 31528, 31515, 31532, 31526, 31513, 31518, 31534, 31890, 31895,
-    31893, 32070, 32067, 32113, 32046, 32057, 32060, 32064, 32048, 32051,
-    32068, 32047, 32066, 32050, 32049, 32573, 32670, 32666, 32716, 32718,
-    32722, 32796, 32842, 32838, 33071, 33046, 33059, 33067, 33065, 33072,
-    33060, 33282, 33333, 33335, 33334, 33337, 33678, 33694, 33688, 33656,
-    33698, 33686, 33725, 33707, 33682, 33674, 33683, 33673, 33696, 33655,
-    {f: 2, c: 33659}, 33670, 33703, 34389, 24426, 34503, 34496, 34486, 34500,
-    34485, 34502, 34507, 34481, 34479, 34505, 34899, 34974, 34952, 34987,
-    34962, 34966, 34957, 34955, 35219, 35215, 35370, 35357, 35363, 35365,
-    35377, 35373, 35359, 35355, 35362, 35913, 35930, 36009, 36012, 36011,
-    36008, 36010, 36007, 36199, 36198, 36286, 36282, 36571, 36575, 36889,
-    36877, 36890, 36887, 36899, 36895, 36893, 36880, 36885, 36894, 36896,
-    36879, 36898, 36886, 36891, 36884, 37096, 37101, [37117, 58488], 37207,
-    37326, 37365, 37350, 37347, 37351, 37357, 37353, 38281, 38506, 38517,
-    38515, 38520, 38512, 38516, {f: 2, c: 38518}, 38508, 38592, 38634, 38633,
-    31456, 31455, {f: 2, c: 38914}, [12226, 39770], [12227, 40165],
-    [12228, 40565], [12229, 40575], [12230, 40613], [12231, 40635], 20642,
-    20621, 20613, 20633, 20625, 20608, 20630, 20632, 20634, 26368, 20977,
-    21106, {f: 2, c: 21108}, 21097, 21214, 21213, 21211, 21338, 21413, 21883,
-    21888, 21927, 21884, 21898, 21917, 21912, 21890, 21916, 21930, 21908,
-    21895, 21899, 21891, 21939, 21934, 21919, 21822, 21938, 21914, 21947,
-    21932, 21937, 21886, 21897, 21931, 21913, 22285, 22575, 22570, 22580,
-    22564, {f: 2, c: 22576}, 22561, 22557, 22560, {f: 2, c: 22777}, 22880,
-    [23159, 57587], 23194, 23167, 23186, 23195, 23207, 23411, 23409, 23506,
-    23500, 23507, 23504, {f: 2, c: 23562}, 23601, 23884, 23888, 23860, 23879,
-    24061, 24133, 24125, 24128, 24131, 24190, 24266, {f: 2, c: 24257}, 24260,
-    24380, 24429, {f: 2, c: 24489}, 24488, 24785, 24801, 24754, 24758, 24800,
-    24860, 24867, 24826, 24853, 24816, 24827, 24820, 24936, 24817, 24846,
-    24822, 24841, 24832, 24850, 25119, 25161, 25507, 25484, 25551, 25536,
-    25577, 25545, 25542, 25549, 25554, 25571, 25552, 25569, 25558,
-    {f: 2, c: 25581}, 25462, 25588, 25578, 25563, 25682, 25562, 25593, 25950,
-    25958, {f: 2, c: 25954}, 26001, 26000, 26031, 26222, 26224, [26228, 57786],
-    26230, 26223, 26257, 26234, 26238, 26231, {f: 2, c: 26366}, 26399, 26397,
-    26874, 26837, 26848, 26840, 26839, 26885, 26847, 26869, 26862, 26855,
-    26873, 26834, 26866, 26851, 26827, 26829, 26893, 26898, 26894, 26825,
-    26842, 26990, 26875, 27454, 27450, 27453, 27544, 27542, 27580, 27631,
-    {f: 2, c: 27694}, 27692, [28207, 57904], 28216, 28244, 28193, 28210, 28263,
-    28234, 28192, 28197, 28195, 28187, 28251, 28248, 28196, 28246, 28270,
-    28205, 28198, 28271, 28212, 28237, 28218, 28204, 28227, [28189, 57901],
-    28222, 28363, 28297, 28185, 28238, 28259, 28228, 28274, 28265, 28255,
-    {f: 2, c: 28953}, 28966, 28976, 28961, 28982, [29038, 57958], 28956, 29260,
-    29316, 29312, 29494, 29477, 29492, 29481, 29754, 29738, 29747, 29730,
-    29733, {f: 2, c: 29749}, 29748, 29743, 29723, 29734, 29736,
-    {f: 2, c: 29989}, 30059, 30058, 30178, 30171, 30179, 30169, 30168, 30174,
-    30176, {f: 2, c: 30331}, 30358, 30355, 30388, 30428, 30543, 30701, 30813,
-    30828, 30831, 31245, 31240, 31243, 31237, 31232, 31384, 31383, 31382,
-    31461, 31459, 31561, 31574, 31558, 31568, 31570, 31572, 31565, 31563,
-    31567, [31569, 60510], 31903, 31909, 32094, 32080, 32104, 32085, 32043,
-    32110, 32114, 32097, 32102, 32098, 32112, 32115, 21892, {f: 2, c: 32724},
-    32779, 32850, 32901, 33109, 33108, 33099, 33105, 33102, 33081, 33094,
-    33086, 33100, 33107, 33140, 33298, 33308, 33769, 33795, 33784, 33805,
-    33760, 33733, 33803, [33729, 58309], 33775, 33777, 33780, 33879, 33802,
-    33776, 33804, 33740, 33789, 33778, 33738, 33848, 33806, 33796, 33756,
-    33799, 33748, 33759, 34395, 34527, 34521, 34541, 34516, 34523, 34532,
-    34512, 34526, 34903, {f: 2, c: 35009}, 34993, 35203, 35222, 35387, 35424,
-    35413, 35422, 35388, 35393, 35412, 35419, 35408, 35398, 35380, 35386,
-    35382, 35414, 35937, 35970, 36015, 36028, 36019, 36029, 36033, 36027,
-    36032, 36020, 36023, 36022, 36031, 36024, 36234, 36229, 36225, 36302,
-    36317, 36299, 36314, 36305, 36300, 36315, 36294, 36603, 36600, 36604,
-    36764, 36910, 36917, 36913, 36920, 36914, 36918, 37122, 37109, 37129,
-    37118, 37219, 37221, 37327, {f: 2, c: 37396}, 37411, 37385, 37406, 37389,
-    37392, 37383, 37393, 38292, 38287, 38283, 38289, 38291, 38290, 38286,
-    38538, 38542, 38539, 38525, {f: 2, c: 38533}, 38541, 38514, 38532, 38593,
-    38597, 38596, {f: 2, c: 38598}, 38639, 38642, 38860, {f: 2, c: 38917},
-    38920, 39143, 39146, 39151, 39145, 39154, 39149, 39342, 39341,
-    [12232, 40643], [12233, 40653], [12234, 40657], 20098, 20653, 20661,
-    {f: 2, c: 20658}, 20677, 20670, 20652, 20663, 20667, 20655, 20679, 21119,
-    21111, 21117, 21215, 21222, 21220, {f: 2, c: 21218}, 21295, 21983, 21992,
-    21971, 21990, 21966, 21980, 21959, 21969, {f: 2, c: 21987}, 21999, 21978,
-    21985, {f: 2, c: 21957}, 21989, 21961, {f: 2, c: 22290}, 22622, 22609,
-    22616, 22615, 22618, 22612, 22635, 22604, 22637, 22602, 22626, 22610,
-    22603, 22887, 23233, 23241, 23244, 23230, 23229, 23228, 23219, 23234,
-    23218, 23913, 23919, 24140, 24185, 24265, 24264, 24338, 24409, 24492,
-    24494, 24858, 24847, 24904, 24863, 24819, 24859, 24825, 24833, 24840,
-    24910, 24908, 24900, 24909, 24894, 24884, 24871, 24845, 24838, 24887,
-    {f: 2, c: 25121}, 25619, 25662, 25630, 25642, 25645, 25661, 25644, 25615,
-    25628, 25620, 25613, 25654, {f: 2, c: 25622}, 25606, 25964, 26015, 26032,
-    26263, 26249, {f: 2, c: 26247}, 26262, 26244, 26264, 26253, 26371, 27028,
-    26989, 26970, 26999, 26976, 26964, 26997, 26928, 27010, 26954, 26984,
-    26987, 26974, 26963, 27001, 27014, 26973, 26979, 26971, 27463, 27506,
-    27584, 27583, 27603, 27645, 28322, 28335, 28371, 28342, 28354, 28304,
-    28317, 28359, 28357, 28325, 28312, 28348, 28346, 28331, 28369, 28310,
-    28316, 28356, 28372, 28330, 28327, 28340, 29006, 29017, 29033, 29028,
-    29001, 29031, 29020, 29036, 29030, 29004, 29029, 29022, 28998, 29032,
-    29014, 29242, 29266, 29495, 29509, 29503, 29502, 29807, 29786, 29781,
-    29791, 29790, 29761, 29759, 29785, 29787, [29788, 58019], 30070, 30072,
-    30208, 30192, 30209, 30194, 30193, 30202, 30207, 30196, 30195,
-    {f: 2, c: 30430}, 30555, 30571, 30566, 30558, 30563, 30585, 30570, 30572,
-    30556, 30565, 30568, 30562, 30702, 30862, 30896, {f: 2, c: 30871}, 30860,
-    30857, 30844, 30865, 30867, 30847, 31098, 31103, 31105, 33836, 31165,
-    31260, 31258, 31264, 31252, 31263, 31262, {f: 2, c: 31391}, 31607, 31680,
-    31584, 31598, 31591, 31921, 31923, 31925, 32147, 32121, 32145, 32129,
-    32143, 32091, 32622, {f: 2, c: 32617}, 32626, 32681, 32680, 32676, 32854,
-    32856, 32902, 32900, 33137, 33136, 33144, 33125, 33134, 33139, 33131,
-    {f: 2, c: 33145}, 33126, 33285, 33351, 33922, 33911, 33853, 33841, 33909,
-    33894, 33899, 33865, 33900, 33883, 33852, 33845, 33889, 33891, 33897,
-    33901, 33862, 34398, 34396, 34399, 34553, 34579, 34568, 34567, 34560,
-    34558, 34555, {f: 2, c: 34562}, 34566, 34570, 34905, 35039, 35028, 35033,
-    35036, 35032, 35037, 35041, 35018, 35029, 35026, 35228, 35299, 35435,
-    {f: 2, c: 35442}, 35430, 35433, 35440, 35463, 35452, 35427, 35488, 35441,
-    35461, 35437, 35426, 35438, 35436, 35449, 35451, 35390, 35432, 35938,
-    35978, 35977, 36042, {f: 2, c: 36039}, 36036, 36018, 36035, 36034, 36037,
-    36321, 36319, 36328, 36335, 36339, 36346, 36330, 36324, 36326, 36530,
-    36611, 36617, 36606, 36618, 36767, 36786, 36939, 36938, 36947, 36930,
-    36948, 36924, 36949, 36944, 36935, 36943, 36942, 36941, 36945, 36926,
-    36929, 37138, 37143, 37228, 37226, 37225, 37321, 37431, 37463, 37432,
-    37437, 37440, 37438, 37467, 37451, 37476, 37457, 37428, 37449, 37453,
-    37445, 37433, 37439, 37466, 38296, 38552, {f: 2, c: 38548}, 38605, 38603,
-    {f: 2, c: 38601}, 38647, 38651, 38649, 38646, 38742, 38772, 38774,
-    {f: 2, c: 38928}, 38931, 38922, 38930, 38924, 39164, 39156,
-    {f: 2, c: 39165}, 39347, 39345, 39348, 39649, 40169, 40578, [12237, 40718],
-    [12238, 40723], [12239, 40736], 20711, 20718, 20709, 20694, [20717, 60903],
-    20698, 20693, 20687, 20689, 20721, 20686, 20713, 20834, 20979, 21123,
-    21122, 21297, 21421, 22014, 22016, 22043, 22039, 22013, 22036, 22022,
-    22025, {f: 2, c: 22029}, 22007, 22038, 22047, 22024, 22032, 22006, 22296,
-    22294, 22645, 22654, 22659, 22675, 22666, 22649, 22661, 22653, 22781,
-    22821, 22818, 22820, 22890, 22889, 23265, 23270, 23273, 23255, 23254,
-    23256, 23267, 23413, 23518, 23527, 23521, {f: 2, c: 23525}, 23528, 23522,
-    23524, 23519, 23565, 23650, 23940, 23943, 24155, 24163, 24149, 24151,
-    24148, 24275, 24278, 24330, 24390, 24432, 24505, 24903, 24895, 24907,
-    24951, {f: 2, c: 24930}, 24927, 24922, 24920, 24949, 25130, 25735, 25688,
-    25684, 25764, 25720, 25695, 25722, 25681, 25703, 25652, 25709, 25723,
-    25970, 26017, 26071, 26070, 26274, 26280, 26269, 27036, 27048, 27029,
-    27073, 27054, 27091, 27083, 27035, 27063, 27067, 27051, 27060, 27088,
-    27085, 27053, 27084, 27046, 27075, 27043, 27465, 27468, 27699, 28467,
-    28436, 28414, 28435, 28404, 28457, 28478, 28448, 28460, 28431, 28418,
-    28450, 28415, 28399, 28422, 28465, 28472, 28466, 28451, 28437, 28459,
-    28463, 28552, 28458, 28396, 28417, 28402, 28364, 28407, 29076, 29081,
-    29053, 29066, 29060, 29074, 29246, 29330, 29334, 29508, 29520, 29796,
-    29795, 29802, 29808, 29805, 29956, 30097, 30247, 30221, 30219, 30217,
-    30227, 30433, 30435, 30596, 30589, 30591, 30561, 30913, 30879, 30887,
-    30899, 30889, 30883, {f: 2, c: 31118}, 31117, 31278, 31281, 31402, 31401,
-    31469, 31471, 31649, 31637, 31627, 31605, 31639, 31645, 31636, 31631,
-    [31672, 58170], 31623, 31620, 31929, {f: 2, c: 31933}, 32187, 32176, 32156,
-    {f: 2, c: 32189}, 32160, 32202, 32180, 32178, 32177, 32186, 32162, 32191,
-    32181, 32184, 32173, [32210, 58202], 32199, 32172, 32624, {f: 2, c: 32736},
-    32735, 32862, 32858, 32903, 33104, 33152, 33167, 33160, 33162, 33151,
-    33154, 33255, 33274, 33287, 33300, 33310, 33355, 33993, 33983, 33990,
-    33988, 33945, 33950, 33970, 33948, 33995, 33976, 33984, 34003, 33936,
-    33980, 34001, 33994, 34623, 34588, 34619, 34594, 34597, 34612, 34584,
-    34645, 34615, 34601, 35059, 35074, 35060, 35065, 35064, 35069, 35048,
-    35098, 35055, 35494, 35468, 35486, 35491, 35469, 35489, 35475, 35492,
-    35498, 35493, 35496, 35480, 35473, 35482, 35495, 35946, 35981, 35980,
-    36051, {f: 2, c: 36049}, 36203, 36249, 36245, 36348, 36628, 36626, 36629,
-    36627, 36771, 36960, 36952, 36956, 36963, 36953, 36958, 36962, 36957,
-    36955, 37145, 37144, 37150, 37237, 37240, 37239, 37236, 37496, 37548,
-    37504, 37509, 37528, 37526, 37499, 37523, 37532, 37544, 37500, 37521,
-    38305, {f: 2, c: 38312}, 38307, 38309, 38308, 38553, 38556, 38555, 38604,
-    38610, 38656, 38780, 38789, 38902, {f: 2, c: 38935}, 39087, 39089, 39171,
-    39173, 39180, 39177, 39361, {f: 2, c: 39599}, 39654, {f: 2, c: 39745},
-    40180, 40182, 40179, 40636, [12240, 40763], [12241, 40778], 20740, 20736,
-    20731, 20725, 20729, 20738, {f: 2, c: 20744}, 20741, 20956,
-    {f: 3, c: 21127}, 21133, 21130, 21232, 21426, 22062, 22075, 22073, 22066,
-    22079, 22068, 22057, 22099, 22094, 22103, 22132, 22070, {f: 2, c: 22063},
-    22656, 22687, 22686, 22707, 22684, 22702, 22697, 22694, 22893, 23305,
-    23291, 23307, 23285, 23308, 23304, 23534, 23532, 23529, 23531,
-    {f: 2, c: 23652}, 23965, 23956, 24162, 24159, 24161, 24290, 24282, 24287,
-    24285, 24291, 24288, 24392, 24433, 24503, 24501, 24950, 24935, 24942,
-    24925, 24917, 24962, 24956, 24944, 24939, 24958, 24999, 24976, 25003,
-    24974, 25004, 24986, 24996, 24980, 25006, 25134, 25705, 25711, 25721,
-    25758, 25778, 25736, [25744, 57745], 25776, 25765, 25747, 25749, 25769,
-    25746, 25774, 25773, 25771, 25754, 25772, 25753, 25762, 25779, 25973,
-    {f: 2, c: 25975}, 26286, 26283, 26292, 26289, 27171, 27167, 27112, 27137,
-    27166, 27161, 27133, 27169, 27155, 27146, 27123, 27138, 27141, 27117,
-    27153, 27472, 27470, 27556, {f: 2, c: 27589}, 28479, 28540, 28548, 28497,
-    28518, 28500, 28550, 28525, 28507, 28536, 28526, 28558, 28538, 28528,
-    28516, 28567, 28504, 28373, 28527, 28512, 28511, 29087, 29100, 29105,
-    29096, 29270, 29339, 29518, 29527, 29801, 29835, 29827, 29822, 29824,
-    30079, 30240, 30249, 30239, 30244, 30246, {f: 2, c: 30241}, 30362, 30394,
-    30436, 30606, 30599, 30604, 30609, 30603, 30923, 30917, 30906, 30922,
-    30910, 30933, 30908, 30928, 31295, 31292, 31296, 31293, 31287, 31291,
-    31407, 31406, 31661, 31665, 31684, 31668, {f: 2, c: 31686}, 31681, 31648,
-    31692, 31946, 32224, 32244, 32239, 32251, 32216, 32236, 32221, 32232,
-    32227, 32218, 32222, 32233, 32158, 32217, 32242, 32249, 32629, 32631,
-    32687, 32745, 32806, {f: 3, c: 33179}, 33184, 33178, 33176, 34071, 34109,
-    34074, 34030, {f: 2, c: 34092}, 34067, 34065, 34083, 34081, 34068, 34028,
-    34085, 34047, 34054, 34690, 34676, 34678, 34656, 34662, 34680, 34664,
-    34649, 34647, 34636, 34643, 34907, 34909, 35088, 35079, {f: 2, c: 35090},
-    35093, 35082, 35516, 35538, 35527, 35524, 35477, 35531, 35576, 35506,
-    35529, 35522, 35519, 35504, 35542, 35533, 35510, 35513, 35547, 35916,
-    35918, 35948, 36064, 36062, 36070, 36068, {f: 2, c: 36076},
-    {f: 2, c: 36066}, 36060, 36074, 36065, 36205, 36255, 36259, 36395, 36368,
-    36381, 36386, 36367, 36393, 36383, 36385, 36382, 36538, 36637, 36635,
-    36639, 36649, 36646, 36650, 36636, 36638, 36645, 36969, 36974, 36968,
-    36973, 36983, 37168, 37165, 37159, 37169, 37255, 37257, 37259, 37251,
-    37573, 37563, 37559, 37610, 37604, 37569, 37555, 37564, 37586, 37575,
-    37616, 37554, 38317, 38321, 38660, {f: 2, c: 38662}, 38665, 38752, 38797,
-    38795, 38799, 38945, 38955, 38940, 39091, 39178, 39187, 39186, 39192,
-    39389, 39376, 39391, 39387, 39377, 39381, 39378, 39385, 39607,
-    {f: 2, c: 39662}, 39719, 39749, 39748, 39799, 39791, 40198, 40201, 40195,
-    40617, 40638, 40654, 22696, [12242, 40786], 20754, 20760, 20756, 20752,
-    20757, 20864, 20906, 20957, 21137, 21139, 21235, 22105, 22123, 22137,
-    22121, 22116, 22136, 22122, 22120, 22117, 22129, 22127, 22124, 22114,
-    22134, 22721, 22718, 22727, 22725, 22894, 23325, 23348, 23416, 23536,
-    23566, 24394, 25010, 24977, 25001, 24970, 25037, 25014, 25022, 25034,
-    25032, 25136, 25797, 25793, 25803, {f: 2, c: 25787}, 25818, 25796, 25799,
-    25794, 25805, 25791, 25810, 25812, 25790, 25972, 26310, 26313, 26297,
-    26308, 26311, 26296, 27197, 27192, 27194, 27225, 27243, 27224, 27193,
-    27204, 27234, 27233, 27211, 27207, 27189, 27231, 27208, 27481, 27511,
-    27653, 28610, 28593, 28577, 28611, 28580, 28609, 28583, 28595, 28608,
-    28601, [28598, 60318], 28582, 28576, 28596, 29118, 29129, 29136, 29138,
-    29128, 29141, 29113, 29134, 29145, 29148, {f: 2, c: 29123}, 29544, 29852,
-    29859, 29848, 29855, 29854, 29922, {f: 2, c: 29964}, 30260, 30264, 30266,
-    30439, 30437, 30624, {f: 2, c: 30622}, 30629, 30952, 30938, 30956, 30951,
-    31142, {f: 2, c: 31309}, 31302, 31308, 31307, 31418, 31705, 31761, 31689,
-    31716, 31707, 31713, 31721, 31718, {f: 2, c: 31957}, 32266, 32273, 32264,
-    32283, 32291, 32286, [32285, 58211], 32265, 32272, 32633, 32690,
-    {f: 2, c: 32752}, 32750, [32808, 58239], 33203, 33193, 33192, 33275, 33288,
-    {f: 2, c: 33368}, 34122, 34137, 34120, {f: 2, c: 34152}, 34115, 34121,
-    34157, 34154, 34142, 34691, 34719, 34718, 34722, 34701, 34913, 35114,
-    35122, 35109, 35115, 35105, 35242, [35238, 58391], 35558, 35578, 35563,
-    35569, 35584, 35548, 35559, 35566, 35582, {f: 2, c: 35585}, 35575, 35565,
-    35571, 35574, 35580, 35947, 35949, 35987, 36084, 36420, 36401, 36404,
-    36418, 36409, 36405, 36667, 36655, 36664, 36659, 36776, 36774, 36981,
-    36980, 36984, 36978, 36988, 36986, 37172, 37266, 37664, 37686, 37624,
-    37683, 37679, 37666, 37628, 37675, 37636, 37658, 37648, 37670, 37665,
-    37653, 37678, 37657, 38331, {f: 2, c: 38567}, 38570, 38613, 38670, 38673,
-    38678, 38669, 38675, 38671, 38747, [38748, 58565], 38758, 38808, 38960,
-    38968, 38971, 38967, 38957, 38969, 38948, 39184, 39208, 39198, 39195,
-    39201, 39194, 39405, 39394, 39409, 39608, 39612, 39675, 39661, 39720,
-    39825, 40213, 40227, 40230, 40232, 40210, 40219, 40664, 40660,
-    [12243, 40845], [12244, 40860], 20778, 20767, 20769, 20786, 21237, 22158,
-    22144, 22160, 22149, 22151, 22159, 22741, 22739, 22737, 22734, 23344,
-    23338, 23332, 23418, 23607, 23656, 23996, 23994, 23997, 23992, 24171,
-    24396, 24509, 25033, 25026, 25031, 25062, 25035, 25138, 25140, 25806,
-    25802, 25816, 25824, 25840, 25830, 25836, 25841, 25826, 25837,
-    {f: 2, c: 25986}, 26329, 26326, 27264, 27284, 27268, 27298, 27292, 27355,
-    27299, 27262, 27287, 27280, 27296, 27484, 27566, 27610, 27656, 28632,
-    28657, {f: 2, c: 28639}, 28635, 28644, 28651, 28655, 28544, 28652, 28641,
-    28649, 28629, 28654, 28656, 29159, [29151, 60361], 29166, 29158, 29157,
-    29165, 29164, 29172, 29152, 29237, 29254, 29552, 29554, 29865, 29872,
-    29862, 29864, 30278, 30274, 30284, 30442, 30643, 30634, 30640, 30636,
-    30631, 30637, 30703, 30967, 30970, 30964, 30959, 30977, 31143, 31146,
-    31319, 31423, 31751, 31757, 31742, 31735, 31756, 31712, 31968, 31964,
-    31966, 31970, 31967, 31961, 31965, 32302, 32318, 32326, 32311, 32306,
-    32323, 32299, 32317, 32305, 32325, 32321, 32308, 32313, 32328, 32309,
-    32319, 32303, 32580, 32755, 32764, {f: 2, c: 32881}, 32880, 32879, 32883,
-    33222, 33219, 33210, 33218, 33216, 33215, 33213, 33225, 33214, 33256,
-    33289, 33393, 34218, 34180, 34174, 34204, 34193, 34196, 34223, 34203,
-    34183, 34216, 34186, 34214, 34407, 34752, 34769, 34739, 34770, 34758,
-    34731, 34747, 34746, 34760, 34763, 35131, 35126, 35140, 35128, 35133,
-    35244, 35598, 35607, 35609, 35611, 35594, 35616, 35613, 35588, 35600,
-    35905, 35903, 35955, 36090, 36093, 36092, 36088, 36091, 36264, 36425,
-    36427, 36424, 36426, 36676, 36670, 36674, 36677, 36671, 36991, 36989,
-    36996, {f: 2, c: 36993}, 36992, 37177, 37283, 37278, 37276, 37709, 37762,
-    37672, 37749, 37706, 37733, 37707, 37656, 37758, 37740, 37723, 37744,
-    37722, 37716, {f: 3, c: 38346}, 38344, 38342, 38577, 38584, 38614, 38684,
-    38686, 38816, 38867, 38982, 39094, 39221, 39425, 39423, 39854, 39851,
-    39850, 39853, 40251, 40255, 40587, 40655, 40670, {f: 2, c: 40668}, 40667,
-    40766, 40779, 21474, 22165, 22190, 22745, 22744, 23352, 24413, 25059,
-    25139, 25844, 25842, 25854, 25862, {f: 2, c: 25850}, 25847, 26039, 26332,
-    26406, 27315, 27308, 27331, 27323, 27320, 27330, {f: 2, c: 27310}, 27487,
-    27512, 27567, 28681, 28683, 28670, 28678, 28666, 28689, 28687,
-    {f: 2, c: 29179}, 29182, 29176, 29559, 29557, 29863, 29887, 29973, 30294,
-    30296, 30290, 30653, 30655, {f: 2, c: 30651}, 30990, 31150,
-    {f: 2, c: 31329}, 31328, {f: 2, c: 31428}, 31787, 31783, 31786, 31774,
-    31779, 31777, 31975, {f: 2, c: 32340}, 32350, 32346, 32353, 32338, 32345,
-    32584, 32761, 32763, 32887, 32886, 33229, 33231, 33290, 34255, 34217,
-    34253, 34256, 34249, 34224, 34234, 34233, 34799, 34796, 34802, 34784,
-    35206, 35250, 35316, 35624, 35641, 35628, 35627, 35920, 36101, 36441,
-    36451, 36454, 36452, 36447, 36437, 36544, 36681, 36685, 36999, 36995,
-    37000, {f: 2, c: 37291}, 37328, 37780, 37770, 37782, 37794, 37811, 37806,
-    37804, 37808, 37784, 37786, 37783, 38356, 38358, 38352, 38357, 38626,
-    38620, 38617, 38619, 38622, 38692, 38819, 38822, 38829, 38905, 38989,
-    38991, 38988, 38990, 38995, 39098, {f: 2, c: 39230}, 39229, 39214, 39333,
-    39438, 39617, 39683, 39686, 39759, 39758, 39757, 39882, 39881, 39933,
-    39880, 39872, 40273, 40285, 40288, 40672, 40725, 40748, 20787, 22181,
-    22184, {f: 2, c: 22750}, 22754, 23541, 40848, 24300, 25074, 25079, 25078,
-    25077, 25856, 25871, 26336, 26333, 27365, 27357, 27354, 27347, 28699,
-    28703, 28712, 28698, 28701, 28693, 28696, 29190, 29197, 29272, 29346,
-    29560, 29562, 29885, 29898, 29923, 30087, 30086, 30303, 30305, 30663,
-    31001, 31153, 31339, 31337, {f: 2, c: 31806}, 31800, 31805, 31799, 31808,
-    32363, 32365, 32377, {f: 2, c: 32361}, 32371, 32645, 32694, 32697, 32696,
-    33240, 34281, 34269, 34282, 34261, {f: 2, c: 34276}, 34295, 34811, 34821,
-    34829, 34809, 34814, 35168, 35167, 35158, 35166, 35649, 35676, 35672,
-    35657, 35674, {f: 2, c: 35662}, 35654, 35673, 36104, 36106, 36476, 36466,
-    36487, 36470, 36460, 36474, 36468, 36692, 36686, 36781, {f: 2, c: 37002},
-    37297, 37294, 37857, 37841, 37855, 37827, 37832, {f: 2, c: 37852}, 37846,
-    37858, 37837, 37848, 37860, 37847, 37864, 38364, 38580, 38627, 38698,
-    38695, 38753, 38876, 38907, 39006, 39000, 39003, 39100, 39237, 39241,
-    39446, 39449, 39693, 39912, 39911, 39894, 39899, 40329, 40289, 40306,
-    40298, 40300, 40594, 40599, 40595, 40628, 21240, 22199, 22198, 22196,
-    22204, 22756, 23360, 23363, 23421, 23542, 24009, 25080, 25082, 25880,
-    25876, 25881, 26342, 26407, 27372, 28734, 28720, 28722, 29200, 29563,
-    29903, 30306, 30309, 31014, 31018, 31020, 31019, 31431, 31478, 31820,
-    31811, 31821, {f: 2, c: 31983}, 36782, 32381, 32380, 32386, 32588, 32768,
-    33242, 33382, 34299, 34297, 34321, 34298, 34310, 34315, 34311, 34314,
-    {f: 2, c: 34836}, 35172, 35258, 35320, 35696, 35692, 35686, 35695, 35679,
-    35691, 36111, 36109, 36489, 36481, 36485, 36482, 37300, 37323, 37912,
-    37891, 37885, 38369, 38704, 39108, 39250, 39249, 39336, 39467, 39472,
-    39479, 39477, 39955, 39949, 40569, 40629, 40680, 40751, 40799, 40803,
-    40801, {f: 2, c: 20791}, 22209, 22208, 22210, 22804, 23660, 24013, 25084,
-    25086, 25885, 25884, 26005, 26345, 27387, 27396, 27386, 27570, 28748,
-    29211, 29351, 29910, 29908, 30313, 30675, 31824, 32399, 32396, 32700,
-    34327, 34349, 34330, 34851, 34850, 34849, 34847, 35178, 35180, 35261,
-    35700, 35703, 35709, 36115, 36490, 36493, 36491, 36703, 36783, 37306,
-    37934, 37939, 37941, 37946, 37944, 37938, 37931, 38370, {f: 2, c: 38712},
-    38706, [38911, 58586], 39015, 39013, 39255, 39493, 39491, 39488, 39486,
-    39631, 39764, 39761, 39981, 39973, 40367, 40372, 40386, 40376, 40605,
-    40687, 40729, 40796, {f: 2, c: 40806}, 20796, 20795, 22216, 22218, 22217,
-    23423, 24020, 24018, 24398, 25087, 25892, 27402, 27489, 28753, 28760,
-    29568, 29924, 30090, 30318, 30316, 31155, 31840, 31839, 32894, 32893,
-    33247, 35186, 35183, 35324, 35712, {f: 2, c: 36118}, 36497, 36499, 36705,
-    37192, 37956, {f: 2, c: 37969}, {f: 2, c: 38717}, 38851, 38849, 39019,
-    39253, 39509, 39501, 39634, 39706, 40009, 39985, 39998, 39995, 40403,
-    40407, 40756, 40812, 40810, 40852, 22220, 24022, 25088, 25891, 25899,
-    25898, 26348, 27408, 29914, 31434, 31844, 31843, 31845, 32403, 32406,
-    32404, 33250, 34360, 34367, 34865, 35722, 37008, 37007, 37987, 37984,
-    37988, 38760, 39023, 39260, {f: 2, c: 39514}, 39511, {f: 2, c: 39635},
-    39633, 40020, 40023, 40022, 40421, 40607, 40692, 22225, 22761, 25900,
-    28766, {f: 2, c: 30321}, [30679, 60226], 32592, 32648, 34870, 34873, 34914,
-    35731, 35730, 35734, 33399, 36123, 37312, 37994, 38722, 38728, 38724,
-    38854, 39024, 39519, 39714, 39768, 40031, {f: 2, c: 40441},
-    {f: 2, c: 40572}, 40711, 40823, 40818, 24307, 27414, 28771, 31852, 31854,
-    34875, 35264, 36513, 37313, 38002, 38000, 39025, 39262, 39638, 39715,
-    40652, 28772, 30682, 35738, 38007, 38857, 39522, 39525, 32412, 35740,
-    36522, 37317, {f: 2, c: 38013}, 38012, {f: 2, c: 40055}, 40695, 35924,
-    38015, 40474, 29224, 39530, 39729, 40475, 40478, 31858, 20034, 20060,
-    [12048, 20981], [12053, 21274], [12058, 21378], 19975, 19980, 20039, 20109,
-    [12062, 22231], [12076, 23662], [12091, 24435], 19983, 20871, 19982, 20014,
-    20115, 20162, 20169, 20168, 20888, 21244, 21356, 21433, 22304, 22787,
-    22828, [23568, 60417], 24063, 26081, [12110, 27571], 27596, [12115, 27668],
-    [12121, 29247], 20017, 20028, 20200, 20188, 20201, 20193, 20189, 20186,
-    21004, 21001, 21276, 21324, {f: 2, c: 22306}, 22807, 22831, 23425, 23428,
-    23570, 23611, 23668, 23667, 24068, 24192, 24194, 24521, 25097, 25168,
-    27669, 27702, 27715, 27711, 27707, 29358, 29360, 29578, [12145, 31160],
-    32906, 38430, 20238, 20248, 20268, 20213, 20244, 20209, 20224, 20215,
-    20232, 20253, 20226, 20229, 20258, 20243, 20228, 20212, 20242, 20913,
-    21011, 21008, 21158, 21282, 21279, 21325, 21386, 21511, 22241, 22239,
-    22318, 22314, 22324, 22844, 22912, 22908, 22917, 22907, 22910, 22903,
-    22911, 23382, 23573, 23589, 23676, {f: 2, c: 23674}, 23678, 24031,
-    [24181, 57646], 24196, 24322, 24346, 24436, 24533, 24532, 24527, 25180,
-    25182, 25188, 25185, 25190, 25186, 25177, 25184, 25178, 25189, 25911,
-    26095, 26094, 26430, 26425, 26424, 26427, 26426, 26431, 26428, 26419,
-    27672, 27718, 27730, 27740, 27727, [27722, 60796], 27732, {f: 2, c: 27723},
-    28785, 29278, {f: 2, c: 29364}, 29582, 29994, 30335, 31349, [12153, 32593],
-    [12171, 33400], 33404, 33408, 33405, 33407, [12172, 34381], [12177, 35198],
-    37017, [37015, 59347], 37016, 37019, 37012, 38434, 38436, 38432, 38435,
-    20310, 20283, 20322, 20297, 20307, 20324, 20286, 20327, 20306, 20319,
-    20289, 20312, 20269, 20275, 20287, 20321, 20879, 20921, 21020, 21022,
-    21025, {f: 2, c: 21165}, 21257, 21347, 21362, {f: 2, c: 21390}, 21552,
-    21559, 21546, 21588, 21573, 21529, 21532, 21541, 21528, 21565, 21583,
-    21569, 21544, 21540, 21575, 22254, 22247, 22245, 22337, 22341, 22348,
-    22345, 22347, 22354, 22790, 22848, 22950, 22936, 22944, 22935, 22926,
-    22946, 22928, 22927, 22951, 22945, 23438, 23442, 23592, 23594, 23693,
-    23695, 23688, 23691, 23689, 23698, 23690, 23686, 23699, 23701, 24032,
-    24074, 24078, 24203, 24201, 24204, 24200, 24205, 24325, 24349, 24440,
-    24438, 24530, 24529, 24528, 24557, 24552, 24558, 24563, 24545, 24548,
-    24547, 24570, 24559, 24567, 24571, 24576, 24564, 25146, 25219, 25228,
-    {f: 2, c: 25230}, 25236, 25223, 25201, 25211, 25210, 25200, 25217, 25224,
-    25207, 25213, 25202, 25204, 26096, 26100, 26099, 26098, 26101, 26437,
-    26439, 26457, 26453, 26444, 26440, 26461, 26445, 26458, 26443, 27600,
-    {f: 2, c: 27673}, 27768, 27751, 27755, 27780, 27787, 27791, 27761, 27759,
-    27753, 27802, 27757, 27783, 27797, [27804, 57900], 27750, 27763, 27749,
-    27771, 27790, 28788, 28794, 29283, 29375, 29373, 29379, 29382, 29377,
-    29370, 29381, 29589, 29591, {f: 2, c: 29587}, 29586, 30010, 30009,
-    {f: 2, c: 30100}, 30337, 31037, 32820, 32917, 32921, 32912, 32914, 32924,
-    33424, 33423, 33413, 33422, 33425, 33427, 33418, {f: 2, c: 33411},
-    [12184, 35960], 36809, 36799, 37023, 37025, 37029, 37022, 37031, 37024,
-    38448, 38440, 38447, 38445, 20019, 20376, 20348, 20357, 20349, 20352,
-    20359, 20342, 20340, 20361, 20356, 20343, 20300, 20375, 20330, 20378,
-    20345, 20353, 20344, 20368, 20380, 20372, 20382, 20370, 20354, 20373,
-    20331, 20334, 20894, 20924, 20926, 21045, {f: 2, c: 21042}, 21062, 21041,
-    21180, {f: 2, c: 21258}, 21308, 21394, 21396, 21639, 21631, 21633, 21649,
-    21634, 21640, 21611, 21626, 21630, 21605, 21612, 21620, 21606, 21645,
-    21615, 21601, 21600, 21656, 21603, 21607, 21604, 22263, 22265, 22383,
-    22386, 22381, 22379, 22385, 22384, 22390, 22400, 22389, 22395,
-    {f: 2, c: 22387}, 22370, 22376, 22397, 22796, 22853, 22965, 22970, 22991,
-    22990, 22962, 22988, 22977, 22966, 22972, 22979, 22998, 22961, 22973,
-    22976, 22984, 22964, 22983, 23394, 23397, 23443, 23445, 23620, 23623,
-    23726, 23716, 23712, 23733, 23727, 23720, 23724, 23711, 23715, 23725,
-    23714, 23722, 23719, 23709, 23717, 23734, 23728, 23718, 24087, 24084,
-    24089, 24360, {f: 3, c: 24354}, 24404, 24450, 24446, 24445, 24542, 24549,
-    24621, 24614, 24601, 24626, 24587, 24628, 24586, 24599, 24627, 24602,
-    24606, 24620, 24610, 24589, 24592, 24622, 24595, 24593, 24588, 24585,
-    24604, 25108, 25149, 25261, 25268, 25297, 25278, 25258, 25270, 25290,
-    25262, 25267, 25263, 25275, 25257, 25264, 25272, 25917, 26024, 26043,
-    26121, 26108, 26116, 26130, 26120, 26107, 26115, 26123, 26125, 26117,
-    26109, 26129, 26128, 26358, 26378, 26501, 26476, 26510, 26514, 26486,
-    26491, 26520, 26502, 26500, 26484, 26509, 26508, 26490, 26527, 26513,
-    26521, 26499, 26493, 26497, {f: 2, c: 26488}, 26516, 27429, 27520, 27518,
-    27614, 27677, 27795, 27884, 27883, 27886, 27865, 27830, 27860, 27821,
-    27879, 27831, 27856, 27842, 27834, 27843, 27846, 27885, 27890, 27858,
-    27869, 27828, 27786, 27805, 27776, 27870, 27840, 27952, 27853, 27847,
-    27824, 27897, 27855, 27881, 27857, 28820, 28824, 28805, 28819, 28806,
-    28804, 28817, 28822, 28802, 28826, 28803, 29290, 29398, 29387, 29400,
-    29385, 29404, 29394, 29396, 29402, 29388, 29393, 29604, 29601, 29613,
-    29606, 29602, 29600, 29612, 29597, 29917, 29928, {f: 2, c: 30015}, 30014,
-    30092, 30104, 30383, 30451, 30449, 30448, 30453, 30712, 30716, 30713,
-    30715, 30714, 30711, 31042, 31039, 31173, 31352, 31355, 31483, 31861,
-    31997, 32821, 32911, 32942, 32931, 32952, 32949, 32941, 33312, 33440,
-    33472, 33451, 33434, 33432, 33435, 33461, 33447, 33454, 33468, 33438,
-    33466, 33460, 33448, 33441, 33449, 33474, 33444, 33475, 33462, 33442,
-    34416, 34415, {f: 2, c: 34413}, 35926, 36818, 36811, 36819, 36813, 36822,
-    36821, 36823, 37042, 37044, 37039, 37043, 37040, 38457, 38461, 38460,
-    38458, 38467, 20429, 20421, 20435, 20402, 20425, 20427, 20417, 20436,
-    20444, 20441, [20411, 60346], 20403, 20443, 20423, 20438, 20410, 20416,
-    20409, 20460, 21060, 21065, 21184, 21186, 21309, 21372, 21399, 21398,
-    21401, 21400, 21690, 21665, 21677, 21669, 21711, 21699, 33549, 21687,
-    21678, 21718, 21686, {f: 2, c: 21701}, 21664, 21616, 21692, 21666, 21694,
-    21618, 21726, 21680, 22453, {f: 2, c: 22430}, 22436, 22412, 22423, 22429,
-    22427, 22420, 22424, 22415, 22425, 22437, 22426, 22421, 22772, 22797,
-    22867, 23009, 23006, 23022, 23040, 23025, 23005, 23034, 23037, 23036,
-    23030, 23012, 23026, 23031, 23003, 23017, 23027, 23029, 23008, 23038,
-    23028, 23021, 23464, 23628, 23760, 23768, 23756, 23767, 23755, 23771,
-    23774, 23770, 23753, 23751, 23754, 23766, {f: 2, c: 23763}, 23759, 23752,
-    23750, 23758, 23775, 23800, 24057, {f: 3, c: 24097}, 24096, 24100, 24240,
-    24228, 24226, 24219, 24227, 24229, 24327, 24366, 24406, 24454, 24631,
-    24633, 24660, 24690, 24670, 24645, 24659, 24647, 24649, 24667, 24652,
-    24640, 24642, 24671, 24612, 24644, 24664, 24678, 24686, {f: 2, c: 25154},
-    25295, 25357, 25355, 25333, 25358, 25347, 25323, 25337, 25359, 25356,
-    25336, 25334, 25344, {f: 2, c: 25363}, 25338, 25365, 25339, 25328, 25921,
-    25923, 26026, 26047, 26166, 26145, 26162, 26165, 26140, 26150, 26146,
-    26163, 26155, 26170, 26141, 26164, 26169, 26158, {f: 2, c: 26383}, 26561,
-    26610, 26568, 26554, 26588, 26555, 26616, 26584, 26560, 26551, 26565,
-    26603, 26596, 26591, 26549, 26573, 26547, 26615, 26614, 26606, 26595,
-    26562, 26553, 26574, 26599, 26608, 26546, 26620, 26566, 26605, 26572,
-    26542, 26598, 26587, 26618, {f: 2, c: 26569}, 26563, 26602, 26571, 27432,
-    27522, 27524, 27574, 27606, 27608, 27616, {f: 2, c: 27680}, 27944, 27956,
-    27949, 27935, 27964, 27967, 27922, 27914, 27866, 27955, 27908, 27929,
-    27962, 27930, 27921, 27904, 27933, 27970, 27905, 27928, 27959, 27907,
-    27919, 27968, 27911, 27936, 27948, 27912, 27938, 27913, 27920, 28855,
-    28831, 28862, 28849, 28848, 28833, {f: 2, c: 28852}, 28841, 29249,
-    {f: 2, c: 29257}, 29292, 29296, 29299, 29294, 29386, 29412, 29416, 29419,
-    29407, 29418, 29414, 29411, 29573, 29644, 29634, 29640, 29637, 29625,
-    29622, 29621, 29620, 29675, 29631, 29639, 29630, 29635, 29638, 29624,
-    29643, 29932, 29934, 29998, {f: 2, c: 30023}, 30119, 30122, 30329, 30404,
-    30472, {f: 3, c: 30467}, 30474, 30455, 30459, 30458, {f: 2, c: 30695},
-    30726, {f: 2, c: 30737}, 30725, 30736, 30735, 30734, [30729, 58095], 30723,
-    30739, 31050, 31052, 31051, 31045, 31044, 31189, 31181, 31183, 31190,
-    31182, 31360, 31358, 31441, {f: 2, c: 31488}, 31866, {f: 2, c: 31864},
-    {f: 3, c: 31871}, 32003, 32008, 32001, 32600, 32657, 32653, 32702, 32775,
-    {f: 2, c: 32782}, 32788, 32823, 32984, 32967, 32992, 32977, 32968, 32962,
-    32976, 32965, 32995, 32985, 32988, 32970, 32981, 32969, 32975, 32983,
-    32998, 32973, 33279, 33313, 33428, 33497, 33534, 33529, 33543, 33512,
-    33536, 33493, 33594, 33515, 33494, 33524, 33516, 33505, 33522, 33525,
-    33548, 33531, 33526, 33520, 33514, 33508, 33504, 33530, 33523, 33517,
-    34423, 34420, 34428, 34419, 34881, 34894, 34919, 34922, 34921, 35283,
-    35332, 35335, 36210, 36835, 36833, 36846, 36832, 37105, 37053, 37055,
-    37077, 37061, 37054, 37063, 37067, 37064, [37332, 60294], 37331, 38484,
-    38479, 38481, 38483, 38474, 38478, 20510, 20485, 20487, 20499, 20514,
-    20528, 20507, 20469, 20468, 20531, 20535, 20524, {f: 2, c: 20470}, 20503,
-    20508, 20512, 20519, 20533, 20527, 20529, 20494, 20826, 20884, 20883,
-    20938, {f: 2, c: 20932}, 20936, 20942, 21089, 21082, 21074,
-    {f: 2, c: 21086}, 21077, 21090, 21197, 21262, 21406, 21798, 21730, 21783,
-    21778, 21735, 21747, 21732, 21786, 21759, 21764, 21768, 21739, 21777,
-    21765, 21745, 21770, 21755, {f: 2, c: 21751}, 21728, 21774, 21763, 21771,
-    {f: 2, c: 22273}, 22476, 22578, 22485, 22482, 22458, 22470, 22461, 22460,
-    22456, 22454, 22463, 22471, 22480, 22457, 22465, 22798, 22858, 23065,
-    23062, {f: 2, c: 23085}, 23061, 23055, 23063, 23050, 23070, 23091, 23404,
-    23463, 23469, 23468, 23555, 23638, 23636, 23788, 23807, 23790, 23793,
-    23799, 23808, 23801, 24105, 24104, 24232, 24238, 24234, 24236, 24371,
-    24368, 24423, 24669, 24666, 24679, 24641, 24738, 24712, 24704, 24722,
-    24705, 24733, 24707, 24725, 24731, 24727, 24711, 24732, 24718, 25113,
-    25158, 25330, 25360, 25430, 25388, {f: 2, c: 25412}, 25398, 25411, 25572,
-    25401, 25419, 25418, 25404, 25385, 25409, 25396, 25432, 25428, 25433,
-    25389, 25415, 25395, 25434, 25425, 25400, 25431, 25408, 25416, 25930,
-    25926, 26054, {f: 2, c: 26051}, 26050, 26186, 26207, 26183, 26193,
-    {f: 2, c: 26386}, 26655, 26650, 26697, {f: 2, c: 26674}, 26683, 26699,
-    26703, 26646, 26673, 26652, 26677, 26667, 26669, 26671, 26702, 26692,
-    26676, 26653, 26642, 26644, 26662, 26664, 26670, 26701, 26682, 26661,
-    26656, 27436, 27439, 27437, 27441, 27444, 27501, 32898, 27528, 27622,
-    27620, 27624, 27619, 27618, 27623, 27685, 28026, {f: 2, c: 28003}, 28022,
-    27917, 28001, 28050, 27992, 28002, 28013, 28015, 28049, 28045, 28143,
-    28031, 28038, 27998, [28007, 59078], 28000, 28055, 28016, 28028, 27999,
-    28034, 28056, 27951, 28008, 28043, 28030, 28032, 28036, 27926, 28035,
-    28027, 28029, 28021, 28048, 28892, 28883, 28881, 28893, 28875, 32569,
-    28898, 28887, 28882, 28894, 28896, 28884, 28877, {f: 3, c: 28869}, 28890,
-    28878, 28897, 29250, 29304, 29303, 29302, 29440, 29434, 29428, 29438,
-    29430, 29427, 29435, 29441, 29651, 29657, 29669, 29654, 29628, 29671,
-    29667, 29673, 29660, 29650, 29659, 29652, 29661, 29658, {f: 2, c: 29655},
-    29672, {f: 2, c: 29918}, {f: 2, c: 29940}, 29985, 30043, 30047, 30128,
-    30145, 30139, 30148, 30144, 30143, 30134, 30138, 30346, 30409, 30493,
-    30491, 30480, 30483, 30482, 30499, 30481, 30485, {f: 2, c: 30489}, 30498,
-    30503, 30755, 30764, 30754, 30773, 30767, 30760, 30766, 30763, 30753,
-    30761, 30771, 30762, 30769, 31060, 31067, 31055, 31068, 31059, 31058,
-    31057, {f: 2, c: 31211}, 31200, 31214, 31213, 31210, 31196, 31198, 31197,
-    31366, 31369, 31365, {f: 2, c: 31371}, 31370, 31367, 31448, 31504, 31492,
-    31507, 31493, 31503, 31496, 31498, 31502, 31497, 31506, 31876, 31889,
-    31882, 31884, 31880, 31885, 31877, 32030, 32029, 32017, 32014, 32024,
-    32022, 32019, 32031, 32018, 32015, 32012, 32604, 32609, 32606, 32608,
-    32605, 32603, 32662, 32658, 32707, 32706, 32704, 32790, 32830, 32825,
-    33018, 33010, 33017, 33013, 33025, 33019, 33024, 33281, 33327, 33317,
-    33587, 33581, 33604, 33561, 33617, 33573, 33622, 33599, 33601, 33574,
-    33564, 33570, 33602, 33614, 33563, 33578, 33544, 33596, 33613, 33558,
-    33572, 33568, 33591, 33583, 33577, 33607, 33605, 33612, 33619, 33566,
-    33580, 33611, 33575, 33608, 34387, 34386, 34466, 34472, 34454, 34445,
-    34449, 34462, 34439, 34455, 34438, 34443, 34458, 34437, 34469, 34457,
-    34465, 34471, 34453, 34456, 34446, 34461, 34448, 34452, {f: 2, c: 34883},
-    34925, {f: 2, c: 34933}, 34930, 34944, 34929, 34943, 34927, 34947, 34942,
-    34932, 34940, 35346, 35911, 35927, 35963, 36004, 36003, 36214, 36216,
-    36277, 36279, 36278, 36561, 36563, 36862, 36853, 36866, 36863, 36859,
-    36868, 36860, 36854, 37078, 37088, {f: 2, c: 37081}, 37091, 37087, 37093,
-    37080, 37083, 37079, 37084, 37092, 37200, {f: 2, c: 37198}, 37333, 37346,
-    37338, 38492, 38495, 38588, 39139, [12221, 39647], [12223, 39727], 20095,
-    20592, 20586, 20577, 20574, 20576, 20563, 20555, 20573, 20594, 20552,
-    20557, 20545, 20571, 20554, 20578, 20501, 20549, 20575, 20585, 20587,
-    {f: 2, c: 20579}, 20550, 20544, 20590, 20595, 20567, 20561, 20944, 21099,
-    21101, 21100, 21102, 21206, 21203, 21293, 21404, {f: 2, c: 21877}, 21820,
-    21837, 21840, 21812, 21802, 21841, 21858, 21814, 21813, 21808, 21842,
-    21829, 21772, 21810, 21861, 21838, 21817, 21832, 21805, 21819, 21824,
-    21835, 22282, 22279, 22523, 22548, 22498, 22518, 22492, 22516, 22528,
-    22509, 22525, 22536, 22520, 22539, 22515, 22479, 22535, 22510, 22499,
-    22514, 22501, 22508, 22497, 22542, 22524, 22544, 22503, 22529, 22540,
-    22513, 22505, 22512, 22541, 22532, 22876, 23136, 23128, 23125,
-    [23143, 60437], 23134, 23096, 23093, 23149, 23120, 23135, 23141, 23148,
-    23123, 23140, 23127, 23107, 23133, 23122, 23108, 23131, 23112, 23182,
-    23102, 23117, 23097, 23116, 23152, 23145, 23111, 23121, 23126, 23106,
-    23132, 23410, 23406, 23489, 23488, 23641, 23838, 23819, 23837, 23834,
-    23840, 23820, 23848, 23821, 23846, 23845, 23823, 23856, 23826, 23843,
-    23839, 23854, 24126, 24116, 24241, 24244, 24249, {f: 2, c: 24242}, 24374,
-    24376, 24475, 24470, 24479, 24714, 24720, 24710, 24766, 24752, 24762,
-    {f: 2, c: 24787}, 24783, 24804, 24793, 24797, 24776, 24753, 24795, 24759,
-    24778, 24767, 24771, 24781, 24768, 25394, 25445, 25482, 25474, 25469,
-    25533, 25502, 25517, 25501, 25495, 25515, 25486, 25455, 25479, 25488,
-    25454, 25519, 25461, 25500, 25453, 25518, 25468, 25508, 25403, 25503,
-    25464, 25477, 25473, 25489, 25485, 25456, 25939, 26061, 26213, 26209,
-    26203, 26201, 26204, 26210, 26392, 26745, 26759, 26768, 26780,
-    {f: 2, c: 26733}, 26798, 26795, 26966, 26735, 26787, 26796, 26793, 26741,
-    26740, 26802, 26767, 26743, 26770, 26748, 26731, 26738, 26794, 26752,
-    26737, 26750, 26779, 26774, 26763, 26784, 26761, 26788, 26744, 26747,
-    26769, 26764, 26762, 26749, 27446, 27443, {f: 2, c: 27447}, 27537, 27535,
-    {f: 2, c: 27533}, 27532, 27690, 28096, 28075, 28084, 28083, 28276, 28076,
-    28137, 28130, 28087, 28150, 28116, 28160, 28104, 28128, 28127, 28118,
-    28094, 28133, {f: 2, c: 28124}, 28123, 28148, 28106, 28093, 28141, 28144,
-    28090, 28117, 28098, 28111, 28105, 28112, 28146, 28115, 28157, 28119,
-    28109, 28131, 28091, 28922, 28941, 28919, 28951, 28916, 28940, 28912,
-    28932, 28915, 28944, 28924, 28927, 28934, 28947, 28928, 28920, 28918,
-    28939, 28930, 28942, 29310, {f: 2, c: 29307}, 29311, 29469, 29463, 29447,
-    29457, 29464, 29450, 29448, 29439, 29455, 29470, 29576, 29686, 29688,
-    29685, 29700, 29697, 29693, 29703, 29696, 29690, 29692, 29695, 29708,
-    29707, 29684, 29704, 30052, 30051, 30158, 30162, 30159, {f: 2, c: 30155},
-    30161, 30160, 30351, 30345, 30419, 30521, 30511, 30509, {f: 2, c: 30513},
-    30516, 30515, 30525, 30501, 30523, 30517, 30792, 30802, 30793, 30797,
-    30794, 30796, 30758, 30789, 30800, 31076, 31079, {f: 2, c: 31081}, 31075,
-    31083, 31073, 31163, 31226, 31224, {f: 2, c: 31222}, 31375, 31380, 31376,
-    31541, 31547, 31540, 31525, 31536, 31522, 31524, 31539, 31512, 31530,
-    31517, 31537, 31531, 31533, 31535, 31538, 31544, 31514, 31523, 31892,
-    31896, 31894, 31907, 32053, 32061, 32056, 32054, 32058, 32069, 32044,
-    32041, 32065, 32071, {f: 2, c: 32062}, 32074, 32059, 32040, 32611, 32661,
-    {f: 2, c: 32668}, 32667, {f: 2, c: 32714}, 32717, {f: 2, c: 32720}, 32711,
-    32719, 32713, 32799, 32798, 32795, 32839, 32835, 32840, 33048, 33061,
-    33049, 33051, 33069, 33055, 33068, 33054, 33057, 33045, 33063, 33053,
-    33058, 33297, 33336, 33331, 33338, 33332, 33330, 33396, 33680, 33699,
-    33704, 33677, 33658, 33651, 33700, 33652, 33679, 33665, 33685, 33689,
-    33653, 33684, 33705, 33661, 33667, 33676, 33693, 33691, 33706, 33675,
-    33662, 33701, 33711, 33672, 33687, 33712, 33663, 33702, 33671, 33710,
-    33654, 34393, 34390, 34495, 34487, 34498, 34497, 34501, 34490, 34480,
-    34504, 34489, 34483, 34488, 34508, 34484, {f: 2, c: 34491}, 34499,
-    {f: 2, c: 34493}, 34898, 34953, 34965, 34984, 34978, 34986, 34970, 34961,
-    34977, 34975, 34968, 34983, 34969, 34971, 34967, 34980, 34988, 34956,
-    34963, 34958, 35202, 35286, 35289, 35285, 35376, 35367, 35372, 35358,
-    35897, 35899, {f: 2, c: 35932}, 35965, 36005, 36221, 36219, 36217, 36284,
-    36290, 36281, 36287, 36289, 36568, 36574, 36573, 36572, 36567,
-    {f: 2, c: 36576}, 36900, 36875, 36881, 36892, 36876, 36897, 37103, 37098,
-    37104, 37108, {f: 2, c: 37106}, 37076, {f: 2, c: 37099}, 37097, 37206,
-    37208, 37210, 37203, 37205, 37356, 37364, 37361, 37363, 37368, 37348,
-    37369, {f: 2, c: 37354}, 37367, 37352, 37358, 38266, 38278, 38280, 38524,
-    38509, 38507, 38513, 38511, 38591, 38762, 38916, 39141, 39319, 20635,
-    20629, 20628, 20638, 20619, 20643, 20611, 20620, 20622, 20637, 20584,
-    20636, 20626, 20610, 20615, 20831, 20948, 21266, 21265, 21412, 21415,
-    21905, 21928, 21925, 21933, 21879, 22085, 21922, 21907, 21896, 21903,
-    21941, 21889, 21923, 21906, 21924, 21885, 21900, 21926, 21887, 21909,
-    21921, 21902, 22284, 22569, 22583, 22553, 22558, 22567, 22563, 22568,
-    22517, 22600, 22565, 22556, 22555, 22579, 22591, 22582, 22574, 22585,
-    22584, 22573, 22572, 22587, 22881, 23215, 23188, 23199, 23162, 23202,
-    23198, 23160, 23206, 23164, 23205, 23212, 23189, 23214, 23095, 23172,
-    23178, 23191, 23171, 23179, 23209, 23163, 23165, 23180, 23196, 23183,
-    23187, 23197, 23530, 23501, 23499, 23508, 23505, 23498, 23502, 23564,
-    23600, 23863, 23875, 23915, 23873, 23883, 23871, 23861, 23889, 23886,
-    23893, 23859, 23866, 23890, 23869, 23857, 23897, 23874, 23865, 23881,
-    23864, 23868, 23858, 23862, 23872, 23877, 24132, 24129, [24408, 57673],
-    24486, 24485, 24491, 24777, 24761, 24780, 24802, 24782, 24772, 24852,
-    24818, 24842, 24854, 24837, 24821, 24851, 24824, 24828, 24830, 24769,
-    24835, 24856, 24861, 24848, 24831, 24836, 24843, 25162, 25492, 25521,
-    25520, 25550, 25573, 25576, 25583, 25539, 25757, 25587, 25546, 25568,
-    25590, 25557, 25586, 25589, 25697, 25567, 25534, 25565, 25564, 25540,
-    25560, 25555, 25538, 25543, 25548, 25547, 25544, 25584, 25559, 25561,
-    25906, 25959, 25962, 25956, 25948, 25960, 25957, 25996, {f: 2, c: 26013},
-    26030, 26064, 26066, 26236, 26220, 26235, 26240, 26225, 26233, 26218,
-    26226, 26369, 26892, 26835, 26884, 26844, 26922, 26860, 26858, 26865,
-    26895, 26838, 26871, 26859, 26852, 26870, 26899, 26896, 26867, 26849,
-    26887, 26828, 26888, 26992, 26804, 26897, 26863, 26822, 26900, 26872,
-    26832, 26877, 26876, 26856, 26891, 26890, 26903, 26830, 26824,
-    {f: 2, c: 26845}, 26854, 26868, 26833, 26886, 26836, 26857, 26901, 26917,
-    26823, 27449, 27451, 27455, 27452, 27540, 27543, 27545, 27541, 27581,
-    27632, {f: 2, c: 27634}, 27696, 28156, {f: 2, c: 28230}, 28191, 28233,
-    28296, {f: 2, c: 28220}, 28229, 28258, 28203, 28223, 28225, 28253, 28275,
-    28188, 28211, 28235, 28224, 28241, 28219, 28163, 28206, 28254, 28264,
-    28252, 28257, 28209, 28200, 28256, 28273, 28267, 28217, 28194, 28208,
-    28243, 28261, 28199, 28280, 28260, 28279, 28245, 28281, 28242, 28262,
-    {f: 2, c: 28213}, 28250, 28960, 28958, 28975, 28923, 28974, 28977, 28963,
-    28965, 28962, 28978, 28959, 28968, 28986, 28955, 29259, 29274,
-    {f: 2, c: 29320}, 29318, 29317, 29323, 29458, 29451, 29488, 29474, 29489,
-    29491, 29479, 29490, 29485, 29478, 29475, 29493, 29452, 29742, 29740,
-    29744, 29739, 29718, 29722, 29729, 29741, 29745, 29732, 29731, 29725,
-    29737, 29728, 29746, 29947, 29999, 30063, 30060, 30183, 30170, 30177,
-    30182, 30173, 30175, 30180, 30167, 30357, 30354, 30426, {f: 2, c: 30534},
-    30532, 30541, 30533, 30538, 30542, {f: 2, c: 30539}, 30686, 30700, 30816,
-    {f: 2, c: 30820}, 30812, 30829, 30833, 30826, 30830, 30832, 30825, 30824,
-    30814, 30818, 31092, 31091, 31090, 31088, 31234, 31242, 31235, 31244,
-    31236, 31385, 31462, 31460, 31562, 31559, 31556, 31560, 31564, 31566,
-    31552, 31576, 31557, 31906, 31902, 31912, 31905, 32088, 32111, 32099,
-    32083, 32086, 32103, 32106, 32079, 32109, 32092, 32107, 32082, 32084,
-    32105, 32081, 32095, 32078, {f: 2, c: 32574}, {f: 2, c: 32613}, 32674,
-    {f: 2, c: 32672}, 32727, 32849, {f: 2, c: 32847}, 33022, 32980, 33091,
-    33098, 33106, 33103, 33095, 33085, 33101, 33082, 33254, 33262,
-    {f: 3, c: 33271}, 33284, {f: 2, c: 33340}, 33343, 33397, 33595,
-    [33743, 60382], 33785, 33827, 33728, 33768, 33810, 33767, 33764, 33788,
-    33782, 33808, 33734, 33736, 33771, 33763, 33727, 33793, 33757, 33765,
-    33752, 33791, 33761, 33739, 33742, 33750, 33781, 33737, 33801,
-    [33807, 58332], 33758, 33809, 33798, 33730, 33779, 33749, 33786, 33735,
-    33745, 33770, 33811, 33690, 33731, 33772, 33774, 33732, 33787, 33751,
-    33762, 33819, 33755, 33790, 34520, 34530, 34534, 34515, 34531, 34522,
-    34538, 34525, 34539, 34524, 34540, 34537, 34519, 34536, 34513, 34888,
-    34902, 34901, 35002, 35031, 35001, 35000, 35008, 35006, 34998, 35004,
-    34999, 35005, 34994, 35073, 35017, 35221, 35224, 35223, 35293,
-    {f: 2, c: 35290}, 35406, 35405, 35385, 35417, 35392, {f: 2, c: 35415},
-    {f: 2, c: 35396}, 35410, 35400, 35409, 35402, 35404, 35407, 35935, 35969,
-    35968, 36026, 36030, 36016, 36025, 36021, 36228, 36224, 36233, 36312,
-    36307, 36301, 36295, 36310, 36316, 36303, 36309, 36313, 36296, 36311,
-    36293, 36591, 36599, 36602, 36601, 36582, 36590, 36581, 36597,
-    {f: 2, c: 36583}, 36598, 36587, 36593, 36588, 36596, 36585, 36909, 36916,
-    36911, 37126, 37164, [37124, 60367], 37119, 37116, 37128, 37113, 37115,
-    37121, 37120, 37127, 37125, 37123, 37217, 37220, 37215, 37218, 37216,
-    37377, 37386, 37413, 37379, 37402, 37414, 37391, 37388, 37376, 37394,
-    37375, 37373, 37382, 37380, 37415, 37378, 37404, 37412, 37401, 37399,
-    37381, 37398, 38267, 38285, 38284, 38288, 38535, 38526, {f: 2, c: 38536},
-    38531, 38528, 38594, 38600, 38595, 38641, 38640, 38764, 38768, 38766,
-    38919, 39081, 39147, 40166, [12235, 40697], {f: 2, c: 20099}, 20150, 20669,
-    20671, 20678, 20654, 20676, 20682, 20660, 20680, 20674, 20656, 20673,
-    20666, 20657, 20683, 20681, 20662, 20664, 20951, 21114, 21112,
-    {f: 2, c: 21115}, 21955, 21979, 21964, 21968, 21963, 21962, 21981,
-    [21952, 64013], 21972, 21956, 21993, 21951, 21970, 21901, 21967, 21973,
-    21986, 21974, 21960, 22002, 21965, 21977, 21954, 22292, 22611, 22632,
-    22628, 22607, 22605, 22601, 22639, 22613, 22606, 22621, 22617, 22629,
-    22619, 22589, 22627, 22641, 22780, 23239, 23236, 23243, 23226, 23224,
-    23217, 23221, 23216, 23231, 23240, 23227, 23238, 23223, 23232, 23242,
-    23220, 23222, 23245, 23225, 23184, 23510, {f: 2, c: 23512}, 23583, 23603,
-    23921, 23907, 23882, 23909, 23922, 23916, 23902, 23912, 23911, 23906,
-    24048, 24143, 24142, 24138, 24141, 24139, 24261, 24268, 24262, 24267,
-    24263, 24384, 24495, 24493, 24823, {f: 2, c: 24905}, 24875, 24901, 24886,
-    24882, 24878, 24902, 24879, 24911, 24873, 24896, 25120, 37224, 25123,
-    25125, 25124, 25541, 25585, 25579, 25616, 25618, 25609, 25632, 25636,
-    25651, 25667, 25631, 25621, 25624, 25657, 25655, {f: 2, c: 25634}, 25612,
-    25638, 25648, 25640, 25665, 25653, 25647, 25610, 25626, 25664, 25637,
-    25639, 25611, 25575, 25627, 25646, 25633, 25614, 25967, 26002, 26067,
-    26246, 26252, 26261, 26256, 26251, 26250, 26265, 26260, 26232, 26400,
-    26982, 26975, 26936, 26958, 26978, 26993, 26943, 26949, 26986, 26937,
-    26946, 26967, 26969, 27002, {f: 2, c: 26952}, 26933, 26988, 26931, 26941,
-    26981, 26864, 27000, 26932, 26985, 26944, 26991, 26948, 26998, 26968,
-    26945, 26996, 26956, 26939, 26955, 26935, 26972, 26959, 26961, 26930,
-    26962, 26927, 27003, 26940, 27462, 27461, 27459, 27458, 27464, 27457,
-    27547, {f: 2, c: 27643}, 27641, {f: 2, c: 27639}, 28315, 28374, 28360,
-    28303, 28352, 28319, {f: 2, c: 28307}, 28320, 28337, 28345, 28358, 28370,
-    28349, 28353, 28318, 28361, 28343, 28336, 28365, 28326, 28367, 28338,
-    28350, 28355, 28380, 28376, 28313, 28306, 28302, 28301, 28324, 28321,
-    28351, 28339, 28368, 28362, 28311, 28334, 28323, 28999, 29012, 29010,
-    29027, 29024, 28993, 29021, [29026, 61080], 29042, 29048, 29034, 29025,
-    28994, 29016, 28995, 29003, 29040, 29023, 29008, 29011, 28996, 29005,
-    29018, 29263, 29325, 29324, 29329, 29328, 29326, 29500, 29506, 29499,
-    29498, 29504, 29514, 29513, 29764, {f: 2, c: 29770}, 29778, 29777, 29783,
-    29760, {f: 2, c: 29775}, 29774, 29762, 29766, 29773, 29780, 29921, 29951,
-    29950, 29949, 29981, 30073, 30071, 27011, 30191, 30223, 30211, 30199,
-    30206, 30204, [30201, 60782], 30200, 30224, 30203, 30198, 30189, 30197,
-    30205, 30361, 30389, 30429, 30549, {f: 2, c: 30559}, 30546, 30550, 30554,
-    30569, 30567, 30548, 30553, 30573, 30688, 30855, 30874, 30868, 30863,
-    30852, 30869, {f: 2, c: 30853}, 30881, 30851, 30841, 30873, 30848, 30870,
-    30843, 31100, 31106, 31101, 31097, 31249, {f: 2, c: 31256}, 31250, 31255,
-    31253, 31266, 31251, 31259, 31248, 31395, 31394, 31390, 31467, 31590,
-    31588, 31597, 31604, 31593, 31602, 31589, 31603, 31601, 31600, 31585,
-    31608, 31606, 31587, 31922, 31924, 31919, 32136, 32134, 32128, 32141,
-    32127, 32133, 32122, 32142, 32123, 32131, 32124, 32140, 32148, 32132,
-    32125, 32146, 32621, 32619, {f: 2, c: 32615}, 32620, 32678, 32677, 32679,
-    {f: 2, c: 32731}, 32801, 33124, 33120, 33143, 33116, 33129, 33115, 33122,
-    33138, 26401, 33118, 33142, 33127, 33135, 33092, 33121, 33309, 33353,
-    33348, 33344, 33346, 33349, 34033, 33855, 33878, 33910, 33913, 33935,
-    33933, 33893, 33873, 33856, 33926, 33895, 33840, 33869, 33917, 33882,
-    33881, 33908, 33907, 33885, 34055, 33886, 33847, 33850, 33844, 33914,
-    33859, 33912, 33842, 33861, 33833, 33753, 33867, 33839, 33858, 33837,
-    33887, 33904, 33849, 33870, 33868, 33874, 33903, 33989, 33934, 33851,
-    33863, 33846, 33843, 33896, 33918, 33860, 33835, 33888, 33876, 33902,
-    33872, 34571, 34564, 34551, 34572, 34554, 34518, 34549, 34637, 34552,
-    34574, 34569, 34561, 34550, 34573, 34565, 35030, 35019, {f: 2, c: 35021},
-    35038, 35035, 35034, 35020, 35024, 35205, 35227, 35295, 35301, 35300,
-    35297, 35296, 35298, 35292, 35302, 35446, 35462, 35455, 35425, 35391,
-    35447, 35458, 35460, 35445, 35459, 35457, 35444, 35450, 35900, 35915,
-    35914, 35941, 35940, 35942, 35974, {f: 2, c: 35972}, 36044,
-    {f: 2, c: 36200}, 36241, 36236, {f: 2, c: 36238}, 36237, {f: 2, c: 36243},
-    36240, 36242, 36336, 36320, 36332, 36337, 36334, 36304, 36329, 36323,
-    36322, 36327, 36338, 36331, 36340, 36614, 36607, 36609, 36608, 36613,
-    {f: 2, c: 36615}, 36610, [36619, 60507], 36946, 36927, 36932, 36937, 36925,
-    37136, 37133, 37135, 37137, 37142, 37140, 37131, 37134, {f: 2, c: 37230},
-    37448, 37458, 37424, 37434, 37478, 37427, 37477, 37470, 37507, 37422,
-    37450, 37446, 37485, 37484, 37455, 37472, 37479, 37487, 37430, 37473,
-    37488, 37425, 37460, 37475, 37456, 37490, 37454, 37459, 37452, 37462,
-    37426, 38303, 38300, 38302, 38299, {f: 2, c: 38546}, 38545, 38551, 38606,
-    38650, 38653, 38648, 38645, 38771, {f: 2, c: 38775}, 38770, 38927,
-    {f: 2, c: 38925}, 39084, 39158, 39161, 39343, 39346, 39344, 39349, 39597,
-    39595, 39771, 40170, 40173, 40167, 40576, [12236, 40701], 20710, 20692,
-    20695, 20712, 20723, 20699, 20714, 20701, 20708, 20691, 20716, 20720,
-    20719, 20707, 20704, 20952, {f: 2, c: 21120}, 21225, 21227, 21296, 21420,
-    22055, 22037, 22028, 22034, 22012, 22031, 22044, 22017, 22035, 22018,
-    22010, 22045, 22020, 22015, 22009, 22665, 22652, 22672, 22680, 22662,
-    22657, 22655, 22644, 22667, 22650, 22663, 22673, 22670, 22646, 22658,
-    22664, 22651, 22676, 22671, 22782, 22891, 23260, 23278, 23269, 23253,
-    23274, 23258, 23277, 23275, 23283, 23266, 23264, 23259, 23276, 23262,
-    23261, 23257, 23272, 23263, 23415, 23520, 23523, 23651, 23938, 23936,
-    23933, 23942, 23930, 23937, 23927, 23946, 23945, 23944, 23934, 23932,
-    23949, 23929, 23935, {f: 2, c: 24152}, 24147, 24280, 24273, 24279, 24270,
-    24284, 24277, 24281, 24274, 24276, 24388, 24387, 24431, 24502, 24876,
-    24872, 24897, 24926, 24945, 24947, {f: 2, c: 24914}, 24946, 24940, 24960,
-    24948, 24916, 24954, 24923, 24933, 24891, 24938, 24929, 24918, 25129,
-    25127, 25131, 25643, 25677, 25691, 25693, 25716, 25718, {f: 2, c: 25714},
-    25725, 25717, 25702, 25766, 25678, 25730, 25694, 25692, 25675, 25683,
-    25696, 25680, 25727, 25663, 25708, 25707, 25689, 25701, 25719, 25971,
-    26016, 26273, 26272, 26271, 26373, 26372, 26402, 27057, 27062, 27081,
-    27040, 27086, 27030, 27056, 27052, 27068, 27025, 27033, 27022, 27047,
-    27021, 27049, 27070, 27055, 27071, 27076, 27069, 27044, 27092, 27065,
-    27082, 27034, 27087, 27059, 27027, 27050, 27041, 27038, 27097, 27031,
-    27024, 27074, 27061, 27045, 27078, 27466, 27469, 27467, {f: 3, c: 27550},
-    {f: 2, c: 27587}, 27646, 28366, 28405, 28401, 28419, 28453, 28408, 28471,
-    28411, 28462, 28425, 28494, {f: 2, c: 28441}, 28455, 28440, 28475, 28434,
-    28397, 28426, 28470, 28531, 28409, 28398, 28461, 28480, 28464, 28476,
-    28469, 28395, 28423, 28430, 28483, 28421, 28413, 28406, 28473, 28444,
-    28412, 28474, 28447, 28429, 28446, 28424, 28449, 29063, 29072, 29065,
-    29056, 29061, 29058, 29071, 29051, 29062, 29057, 29079, 29252, 29267,
-    29335, 29333, 29331, 29507, 29517, 29521, 29516, 29794, 29811, 29809,
-    29813, 29810, 29799, 29806, 29952, {f: 2, c: 29954}, 30077, 30096, 30230,
-    30216, 30220, 30229, 30225, 30218, 30228, 30392, 30593, 30588, 30597,
-    30594, 30574, 30592, 30575, 30590, 30595, 30898, 30890, 30900, 30893,
-    30888, 30846, 30891, 30878, 30885, 30880, 30892, 30882, 30884, 31128,
-    {f: 2, c: 31114}, 31126, 31125, 31124, 31123, 31127, 31112, 31122, 31120,
-    31275, 31306, 31280, 31279, 31272, 31270, 31400, {f: 2, c: 31403}, 31470,
-    31624, 31644, 31626, 31633, 31632, 31638, 31629, 31628, 31643, 31630,
-    31621, 31640, 21124, 31641, 31652, 31618, 31931, 31935, 31932, 31930,
-    32167, 32183, 32194, 32163, 32170, 32193, 32192, 32197, 32157, 32206,
-    32196, 32198, {f: 2, c: 32203}, 32175, 32185, 32150, 32188, 32159, 32166,
-    32174, 32169, 32161, 32201, 32627, {f: 2, c: 32738}, 32741, 32734, 32804,
-    32861, 32860, 33161, 33158, 33155, 33159, 33165, 33164, 33163, 33301,
-    33943, 33956, 33953, 33951, 33978, 33998, 33986, 33964, 33966, 33963,
-    33977, 33972, 33985, 33997, 33962, 33946, 33969, 34000, 33949, 33959,
-    33979, 33954, 33940, 33991, 33996, 33947, 33961, 33967, [33960, 58327],
-    34006, 33944, 33974, 33999, 33952, 34007, 34004, 34002, 34011, 33968,
-    33937, 34401, 34611, 34595, 34600, 34667, 34624, 34606, 34590, 34593,
-    34585, 34587, 34627, 34604, 34625, 34622, 34630, 34592, 34610, 34602,
-    34605, 34620, 34578, 34618, 34609, 34613, 34626, {f: 2, c: 34598}, 34616,
-    34596, 34586, 34608, 34577, 35063, 35047, {f: 2, c: 35057}, 35066, 35070,
-    35054, 35068, 35062, 35067, 35056, 35052, 35051, 35229, 35233, 35231,
-    35230, 35305, 35307, 35304, 35499, 35481, 35467, 35474, 35471, 35478,
-    35901, {f: 2, c: 35944}, 36053, 36047, 36055, 36246, 36361, 36354, 36351,
-    36365, 36349, 36362, 36355, 36359, 36358, 36357, 36350, 36352, 36356,
-    {f: 2, c: 36624}, 36622, 36621, 37155, 37148, 37152, 37154, 37151, 37149,
-    37146, 37156, 37153, 37147, 37242, 37234, 37241, 37235, 37541, 37540,
-    37494, 37531, 37498, 37536, 37524, 37546, 37517, 37542, 37530, 37547,
-    37497, 37527, 37503, 37539, 37614, 37518, 37506, 37525, 37538, 37501,
-    37512, 37537, 37514, 37510, 37516, 37529, 37543, 37502, 37511, 37545,
-    37533, 37515, 37421, 38558, 38561, 38655, 38744, 38781, 38778, 38782,
-    38787, 38784, 38786, 38779, 38788, 38785, 38783, 38862, 38861, 38934,
-    {f: 2, c: 39085}, 39170, 39168, 39175, 39325, 39324, 39363, 39353, 39355,
-    39354, 39362, 39357, 39367, 39601, 39651, 39655, {f: 2, c: 39742},
-    {f: 2, c: 39776}, 39775, {f: 2, c: 40177}, 40181, 40615, 20735, 20739,
-    20784, 20728, {f: 2, c: 20742}, 20726, 20734, {f: 2, c: 20747}, 20733,
-    20746, {f: 2, c: 21131}, 21233, 21231, 22088, 22082, 22092, 22069, 22081,
-    22090, 22089, 22086, 22104, 22106, 22080, 22067, 22077, 22060, 22078,
-    22072, 22058, 22074, 22298, 22699, 22685, 22705, 22688, 22691, 22703,
-    22700, 22693, 22689, 22783, 23295, 23284, 23293, 23287, 23286, 23299,
-    23288, 23298, 23289, 23297, 23303, 23301, 23311, 23655, 23961, 23959,
-    23967, 23954, 23970, 23955, 23957, 23968, 23964, 23969, 23962, 23966,
-    24169, 24157, 24160, 24156, 32243, 24283, 24286, 24289, 24393, 24498,
-    24971, 24963, 24953, 25009, 25008, 24994, 24969, 24987, 24979, 25007,
-    25005, 24991, 24978, 25002, 24993, 24973, 24934, 25011, 25133, 25710,
-    25712, 25750, 25760, 25733, 25751, 25756, 25743, 25739, 25738, 25740,
-    25763, 25759, 25704, 25777, 25752, 25974, 25978, 25977, 25979,
-    {f: 2, c: 26034}, 26293, 26288, 26281, 26290, 26295, 26282, 26287, 27136,
-    27142, 27159, 27109, 27128, 27157, 27121, 27108, 27168, 27135, 27116,
-    27106, 27163, 27165, 27134, 27175, 27122, 27118, 27156, 27127, 27111,
-    27200, 27144, 27110, 27131, 27149, 27132, 27115, 27145, 27140, 27160,
-    27173, 27151, 27126, 27174, 27143, 27124, 27158, 27473, 27557, 27555,
-    27554, 27558, 27649, 27648, 27647, 27650, 28481, 28454, 28542, 28551,
-    28614, 28562, 28557, 28553, 28556, 28514, 28495, 28549, 28506, 28566,
-    28534, 28524, 28546, 28501, 28530, 28498, 28496, 28503, 28564, 28563,
-    28509, 28416, 28513, 28523, 28541, 28519, 28560, 28499, 28555, 28521,
-    28543, 28565, 28515, 28535, 28522, 28539, 29106, 29103, 29083, 29104,
-    29088, 29082, 29097, 29109, 29085, 29093, 29086, 29092, 29089, 29098,
-    29084, 29095, 29107, 29336, 29338, 29528, 29522, {f: 3, c: 29534}, 29533,
-    29531, 29537, 29530, 29529, 29538, 29831, {f: 2, c: 29833}, 29830, 29825,
-    29821, 29829, 29832, 29820, [29817, 58868], 29960, 29959, 30078, 30245,
-    30238, 30233, 30237, 30236, 30243, 30234, 30248, 30235, {f: 3, c: 30364},
-    30363, 30605, 30607, 30601, 30600, 30925, 30907, 30927, 30924, 30929,
-    30926, 30932, 30920, {f: 2, c: 30915}, 30921, 31130, 31137, 31136, 31132,
-    31138, [31131, 59175], 27510, 31289, 31410, 31412, 31411, 31671, 31691,
-    31678, 31660, 31694, 31663, 31673, 31690, 31669, 31941, 31944, 31948,
-    31947, 32247, 32219, 32234, 32231, 32215, 32225, 32259, 32250, 32230,
-    32246, 32241, 32240, 32238, 32223, 32630, 32684, 32688, 32685, 32749,
-    32747, 32746, 32748, 32742, 32744, 32868, 32871, 33187, 33183, 33182,
-    33173, 33186, 33177, 33175, 33302, 33359, 33363, 33362, 33360, 33358,
-    33361, 34084, 34107, 34063, 34048, 34089, 34062, 34057, 34061, 34079,
-    34058, 34087, 34076, 34043, 34091, 34042, 34056, 34060, 34036, 34090,
-    34034, 34069, 34039, 34027, 34035, 34044, 34066, 34026, 34025, 34070,
-    34046, 34088, 34077, 34094, 34050, 34045, 34078, 34038, 34097, 34086,
-    {f: 2, c: 34023}, 34032, 34031, 34041, 34072, 34080, 34096, 34059, 34073,
-    34095, 34402, 34646, {f: 2, c: 34659}, 34679, 34785, 34675, 34648, 34644,
-    34651, 34642, 34657, 34650, 34641, 34654, 34669, 34666, 34640, 34638,
-    34655, 34653, 34671, 34668, 34682, 34670, 34652, 34661, 34639, 34683,
-    34677, 34658, 34663, 34665, 34906, 35077, 35084, 35092, 35083,
-    {f: 3, c: 35095}, 35078, 35094, 35089, 35086, 35081, 35234, 35236, 35235,
-    35309, 35312, 35308, 35535, 35526, 35512, 35539, 35537, {f: 2, c: 35540},
-    35515, 35543, 35518, 35520, 35525, 35544, 35523, 35514, 35517, 35545,
-    35902, 35917, 35983, 36069, 36063, 36057, 36072, 36058, 36061, 36071,
-    36256, 36252, 36257, 36251, 36384, 36387, 36389, 36388, 36398, 36373,
-    36379, 36374, 36369, 36377, {f: 2, c: 36390}, 36372, 36370, 36376, 36371,
-    36380, 36375, 36378, 36652, 36644, 36632, 36634, 36640, 36643,
-    {f: 2, c: 36630}, 36979, 36976, 36975, 36967, 36971, 37167, 37163,
-    {f: 2, c: 37161}, 37170, 37158, 37166, {f: 2, c: 37253}, 37258,
-    {f: 2, c: 37249}, 37252, 37248, 37584, {f: 2, c: 37571}, 37568, 37593,
-    37558, 37583, 37617, 37599, 37592, 37609, 37591, 37597, 37580, 37615,
-    37570, 37608, 37578, 37576, 37582, 37606, 37581, 37589, 37577, 37600,
-    37598, 37607, 37585, 37587, 37557, 37601, 37669, 37574, 37556, 38268,
-    38316, 38315, 38318, 38320, 38564, 38562, 38611, 38661, 38664, 38658,
-    38746, 38794, 38798, 38792, 38864, 38863, 38942, 38941, 38950, 38953,
-    38952, 38944, 38939, 38951, 39090, 39176, 39162, 39185, 39188,
-    {f: 2, c: 39190}, 39189, 39388, 39373, 39375, {f: 2, c: 39379}, 39374,
-    39369, [39382, 60270], 39384, 39371, 39383, 39372, 39603, 39660, 39659,
-    39667, 39666, 39665, 39750, 39747, 39783, 39796, 39793, 39782, 39798,
-    39797, 39792, 39784, 39780, 39788, 40188, 40186, 40189, 40191, 40183,
-    40199, 40192, 40185, 40187, 40200, 40197, 40196, 40579, 40659,
-    {f: 2, c: 40719}, 20764, 20755, 20759, 20762, 20753, 20958, 21300, 21473,
-    22128, 22112, 22126, 22131, 22118, 22115, 22125, 22130, 22110, 22135,
-    22300, 22299, 22728, 22717, 22729, 22719, 22714, 22722, 22716, 22726,
-    23319, 23321, 23323, 23329, 23316, 23315, 23312, 23318, [23336, 59539],
-    23322, 23328, 23326, 23535, 23980, 23985, 23977, 23975, 23989, 23984,
-    23982, 23978, 23976, 23986, 23981, 23983, 23988, {f: 2, c: 24167}, 24166,
-    24175, 24297, 24295, 24294, 24296, 24293, 24395, 24508, 24507, 24989,
-    25000, 24982, 25029, 25012, 25030, 25025, 25036, 25018, 25023, 25016,
-    24972, 25815, 25814, 25808, 25807, 25801, 25789, 25737, 25795, 25819,
-    25843, 25817, 25907, 25983, 25980, 26018, 26312, 26302, 26304,
-    {f: 2, c: 26314}, 26319, 26301, 26299, 26298, 26316, 26403, 27188, 27238,
-    27209, 27239, 27186, 27240, 27198, 27229, 27245, 27254, 27227, 27217,
-    27176, 27226, 27195, 27199, 27201, 27242, 27236, 27216, 27215, 27220,
-    27247, 27241, 27232, 27196, 27230, 27222, 27221, {f: 2, c: 27213}, 27206,
-    27477, 27476, 27478, 27559, {f: 2, c: 27562}, 27592, 27591, 27652, 27651,
-    27654, 28589, 28619, 28579, 28615, 28604, 28622, 28616, 28510, 28612,
-    28605, 28574, 28618, 28584, 28676, 28581, 28590, 28602, 28588, 28586,
-    28623, 28607, 28600, 28578, 28617, 28587, 28621, 28591, 28594, 28592,
-    29125, 29122, 29119, 29112, 29142, {f: 2, c: 29120}, 29131, 29140, 29130,
-    29127, 29135, 29117, 29144, 29116, 29126, {f: 2, c: 29146},
-    {f: 2, c: 29341}, 29545, {f: 2, c: 29542}, 29548, 29541, 29547, 29546,
-    29823, 29850, 29856, 29844, 29842, 29845, 29857, 29963, 30080, 30255,
-    30253, 30257, 30269, 30259, 30268, 30261, 30258, 30256, 30395, 30438,
-    30618, 30621, 30625, 30620, 30619, {f: 2, c: 30626}, 30613, 30617, 30615,
-    30941, 30953, 30949, 30954, 30942, 30947, 30939, {f: 2, c: 30945}, 30957,
-    {f: 2, c: 30943}, 31140, 31300, 31304, 31303, 31414, 31416, 31413, 31409,
-    31415, 31710, 31715, 31719, 31709, 31701, 31717, 31706, 31720, 31737,
-    31700, 31722, 31714, 31708, 31723, 31704, 31711, 31954, 31956, 31959,
-    {f: 2, c: 31952}, 32274, 32289, 32279, 32268, {f: 2, c: 32287}, 32275,
-    32270, 32284, 32277, 32282, 32290, 32267, 32271, 32278, 32269, 32276,
-    32293, 32292, 32579, {f: 2, c: 32635}, 32634, 32689, 32751, 32810, 32809,
-    32876, 33201, 33190, 33198, 33209, 33205, 33195, 33200, 33196, 33204,
-    33202, 33207, 33191, 33266, {f: 3, c: 33365}, 34134, 34117, 34155, 34125,
-    34131, 34145, 34136, 34112, 34118, 34148, 34113, 34146, 34116, 34129,
-    34119, 34147, 34110, 34139, 34161, 34126, 34158, 34165, 34133, 34151,
-    34144, 34188, 34150, 34141, 34132, 34149, 34156, 34403, 34405, 34404,
-    34724, 34715, 34703, 34711, 34707, 34706, 34696, 34689, 34710, 34712,
-    34681, 34695, 34723, 34693, {f: 2, c: 34704}, 34717, 34692, 34708, 34716,
-    34714, 34697, 35102, 35110, 35120, {f: 2, c: 35117}, 35111, 35121, 35106,
-    35113, 35107, 35119, 35116, 35103, 35313, 35552, 35554, 35570,
-    {f: 2, c: 35572}, 35549, 35604, 35556, 35551, 35568, 35528, 35550, 35553,
-    35560, 35583, 35567, 35579, {f: 2, c: 35985}, 35984, 36085, 36078, 36081,
-    36080, 36083, 36204, 36206, 36261, 36263, 36403, 36414, 36408, 36416,
-    36421, 36406, {f: 2, c: 36412}, 36417, 36400, 36415, 36541, [36662, 60329],
-    36654, 36661, 36658, 36665, 36663, 36660, 36982, 36985, 36987, 36998,
-    37114, 37171, {f: 2, c: 37173}, 37267, {f: 2, c: 37264}, 37261, 37263,
-    37671, 37662, 37640, 37663, 37638, 37647, 37754, 37688, 37692, 37659,
-    37667, 37650, 37633, 37702, 37677, 37646, 37645, 37579, 37661, 37626,
-    37651, 37625, 37623, 37684, 37634, 37668, 37631, 37673, 37689, 37685,
-    37674, 37652, 37644, 37643, 37630, 37641, 37632, 37627, 37654, 38332,
-    38349, 38334, {f: 2, c: 38329}, 38326, 38335, 38325, 38333, 38569, 38612,
-    38667, 38674, 38672, 38809, 38807, 38804, 38896, 38904, 38965, 38959,
-    38962, 39204, 39199, 39207, 39209, 39326, 39406, 39404, 39397, 39396,
-    39408, 39395, 39402, 39401, 39399, 39609, 39615, 39604, 39611, 39670,
-    39674, 39673, 39671, 39731, 39808, 39813, 39815, 39804, 39806, 39803,
-    39810, 39827, 39826, 39824, 39802, 39829, 39805, 39816, 40229, 40215,
-    40224, 40222, 40212, 40233, 40221, 40216, 40226, 40208, 40217, 40223,
-    40584, {f: 2, c: 40582}, 40622, 40621, {f: 2, c: 40661}, 40698, 40722,
-    40765, 20774, 20773, 20770, 20772, 20768, 20777, 21236, 22163,
-    {f: 2, c: 22156}, 22150, 22148, 22147, 22142, 22146, 22143, 22145, 22742,
-    22740, 22735, 22738, 23341, 23333, 23346, 23331, 23340, 23335, 23334,
-    23343, 23342, 23419, {f: 2, c: 23537}, 23991, 24172, 24170, 24510, 25027,
-    25013, 25020, 25063, 25056, 25061, 25060, 25064, 25054, 25839, 25833,
-    25827, 25835, 25828, 25832, 25985, 25984, 26038, 26074, 26322, 27277,
-    27286, 27265, 27301, 27273, 27295, 27291, 27297, 27294, 27271, 27283,
-    27278, 27285, 27267, 27304, 27300, 27281, 27263, 27302, 27290, 27269,
-    27276, 27282, 27483, 27565, 27657, 28620, 28585, 28660, 28628, 28643,
-    28636, 28653, 28647, 28646, 28638, 28658, 28637, 28642, 28648, 29153,
-    29169, 29160, 29170, 29156, 29168, 29154, 29555, {f: 2, c: 29550}, 29847,
-    29874, 29867, 29840, 29866, 29869, 29873, 29861, 29871, {f: 3, c: 29968},
-    29967, 30084, 30275, {f: 2, c: 30280}, 30279, 30372, 30441, 30645, 30635,
-    30642, 30647, 30646, 30644, 30641, 30632, 30704, 30963, 30973, 30978,
-    {f: 2, c: 30971}, 30975, 30962, 30981, 30969, 30974, 30980, 31147, 31144,
-    31324, 31323, 31318, 31320, 31316, 31322, 31422, {f: 2, c: 31424}, 31749,
-    31759, 31730, 31744, 31743, 31739, 31758, 31732, 31755, 31731, 31746,
-    31753, 31747, 31745, 31736, 31741, [31750, 58176], {f: 2, c: 31728}, 31760,
-    31754, 31976, 32301, 32316, 32322, 32307, 38984, 32312, 32298, 32329,
-    32320, 32327, 32297, 32332, 32304, 32315, 32310, 32324, 32314, 32581,
-    32639, 32638, 32637, 32756, 32754, 32812, 33211, 33220, 33228, 33226,
-    33221, 33223, 33212, 33257, 33371, 33370, 33372, 34179, 34176, 34191,
-    34215, 34197, 34208, 34187, 34211, 34171, 34212, 34202, 34206, 34167,
-    34172, 34185, 34209, 34170, 34168, 34135, 34190, 34198, 34182, 34189,
-    34201, 34205, 34177, 34210, 34178, 34184, 34181, 34169, 34166, 34200,
-    34192, 34207, 34408, 34750, 34730, 34733, 34757, 34736, 34732, 34745,
-    34741, 34748, 34734, 34761, 34755, 34754, 34764, 34743, 34735, 34756,
-    34762, 34740, 34742, 34751, 34744, 34749, 34782, 34738, 35125, 35123,
-    35132, 35134, 35137, 35154, 35127, 35138, 35245, 35247, 35246,
-    {f: 2, c: 35314}, 35614, 35608, 35606, 35601, 35589, 35595, 35618, 35599,
-    35602, 35605, 35591, 35597, 35592, 35590, 35612, 35603, 35610, 35919,
-    35952, 35954, 35953, 35951, 35989, 35988, 36089, 36207, 36430, 36429,
-    36435, 36432, 36428, 36423, 36675, 36672, 36997, 36990, 37176, 37274,
-    37282, 37275, 37273, 37279, 37281, 37277, 37280, 37793, 37763, 37807,
-    37732, 37718, 37703, 37756, 37720, 37724, 37750, 37705, {f: 2, c: 37712},
-    37728, 37741, 37775, 37708, 37738, 37753, 37719, 37717, 37714, 37711,
-    37745, 37751, 37755, 37729, 37726, 37731, 37735, 37710, 37721, 38343,
-    38336, 38345, 38339, 38341, 38327, 38574, 38576, 38572, 38688, 38687,
-    38680, 38685, 38681, 38810, 38817, 38812, 38814, 38813, 38869, 38868,
-    38897, 38977, 38980, 38986, 38985, 38981, 38979, 39205, {f: 2, c: 39211},
-    39210, 39219, 39218, 39215, 39213, 39217, 39216, 39320, 39331, 39329,
-    39426, 39418, 39412, 39415, 39417, 39416, 39414, 39419, {f: 2, c: 39421},
-    39420, 39427, 39614, 39678, 39677, 39681, 39676, 39752, 39834, 39848,
-    39838, 39835, 39846, 39841, 39845, 39844, 39814, 39842, 39840, 39855,
-    40243, 40257, 40295, 40246, {f: 2, c: 40238}, 40241, 40248, 40240, 40261,
-    {f: 2, c: 40258}, 40254, 40247, 40256, 40253, 32757, 40237, 40586, 40585,
-    40589, 40624, 40648, 40666, 40699, 40703, 40740, 40739, 40738, 40788,
-    [12245, 40864], 20785, {f: 2, c: 20781}, 22168, 22172, 22167, 22170, 22173,
-    22169, 22896, 23356, {f: 2, c: 23657}, 24000, {f: 2, c: 24173}, 25048,
-    25055, {f: 2, c: 25069}, 25073, 25066, 25072, 25067, 25046, 25065, 25855,
-    25860, 25853, 25848, 25857, 25859, 25852, 26004, 26075, {f: 2, c: 26330},
-    26328, 27333, 27321, 27325, 27361, 27334, 27322, {f: 2, c: 27318}, 27335,
-    27316, 27309, 27486, 27593, 27659, 28679, {f: 2, c: 28684}, 28673, 28677,
-    28692, 28686, {f: 2, c: 28671}, 28667, 28710, 28668, 28663, 28682,
-    [29185, 60224], 29183, 29177, 29187, 29181, 29558, 29880, 29888, 29877,
-    29889, 29886, 29878, 29883, 29890, 29972, 29971, 30300, 30308, 30297,
-    30288, 30291, 30295, 30298, 30374, 30397, 30444, 30658, 30650, 30988,
-    {f: 2, c: 30995}, 30985, 30992, 30994, 30993, 31149, 31148, 31327, 31772,
-    31785, 31769, 31776, 31775, 31789, 31773, 31782, 31784, 31778, 31781,
-    31792, 32348, 32336, 32342, 32355, 32344, 32354, 32351, 32337, 32352,
-    32343, 32339, 32693, 32691, {f: 2, c: 32759}, 32885, {f: 2, c: 33233},
-    33232, 33375, 33374, 34228, 34246, 34240, 34243, 34242, 34227, 34229,
-    34237, 34247, 34244, 34239, 34251, 34254, 34248, 34245, 34225, 34230,
-    34258, 34340, 34232, 34231, 34238, 34409, 34791, 34790, 34786, 34779,
-    34795, 34794, 34789, 34783, 34803, 34788, 34772, 34780, 34771, 34797,
-    34776, 34787, 34775, 34777, 34817, 34804, 34792, 34781, 35155, 35147,
-    35151, 35148, 35142, {f: 2, c: 35152}, 35145, 35626, 35623, 35619, 35635,
-    35632, 35637, 35655, 35631, 35644, 35646, 35633, 35621, 35639, 35622,
-    35638, 35630, 35620, 35643, 35645, 35642, 35906, 35957, 35993, 35992,
-    35991, 36094, 36100, 36098, 36096, 36444, 36450, 36448, 36439, 36438,
-    36446, 36453, 36455, 36443, 36442, 36449, 36445, 36457, 36436,
-    {f: 3, c: 36678}, 36683, 37160, {f: 2, c: 37178}, 37182, 37288, 37285,
-    37287, 37295, 37290, 37813, 37772, 37778, 37815, 37787, 37789, 37769,
-    37799, 37774, 37802, 37790, 37798, 37781, 37768, 37785, 37791, 37760,
-    37773, 37809, 37777, 37810, 37796, 37800, 37812, 37795, {f: 2, c: 38354},
-    38353, 38579, 38615, 38618, 24002, 38623, 38616, 38621, 38691, 38690,
-    38693, 38828, 38830, 38824, 38827, 38820, 38826, 38818, 38821, 38871,
-    38873, 38870, 38872, 38906, {f: 3, c: 38992}, 39096, 39233, 39228, 39226,
-    39439, 39435, 39433, 39437, 39428, 39441, 39434, 39429, 39431, 39430,
-    39616, 39644, 39688, {f: 2, c: 39684}, 39721, 39733, 39754, 39756, 39755,
-    39879, 39878, 39875, 39871, 39873, 39861, 39864, 39891, 39862, 39876,
-    39865, 39869, 40284, 40275, 40271, 40266, 40283, 40267, 40281, 40278,
-    40268, 40279, 40274, 40276, 40287, 40280, 40282, 40590, 40588, 40671,
-    40705, 40704, [40726, 58693], 40741, 40747, 40746, 40745, 40744, 40780,
-    40789, {f: 2, c: 20788}, 21142, 21239, 21428, 22187, 22189,
-    {f: 2, c: 22182}, 22186, 22188, 22746, 22749, 22747, 22802,
-    {f: 3, c: 23357}, 24003, 24176, 24511, 25083, 25863, 25872, 25869, 25865,
-    25868, 25870, 25988, 26078, 26077, 26334, 27367, 27360, 27340, 27345,
-    27353, 27339, 27359, 27356, 27344, 27371, 27343, 27341, 27358, 27488,
-    27568, 27660, 28697, 28711, 28704, 28694, 28715, {f: 3, c: 28705}, 28713,
-    28695, 28708, 28700, 29196, 29194, 29191, 29186, 29189, {f: 2, c: 29349},
-    29348, 29347, 29345, 29899, 29893, 29879, 29891, 29974, 30304,
-    {f: 2, c: 30665}, 30660, 30705, 31005, 31003, 31009, 31004, 30999, 31006,
-    31152, {f: 2, c: 31335}, 31795, 31804, 31801, 31788, 31803, 31980, 31978,
-    32374, 32373, 32376, 32368, 32375, 32367, 32378, 32370, 32372, 32360,
-    32587, 32586, 32643, 32646, 32695, {f: 2, c: 32765}, 32888, 33239, 33237,
-    33291, 33380, 33377, 33379, 34283, 34289, 34285, 34265, 34273, 34280,
-    34266, 34263, 34284, 34290, 34296, 34264, 34271, 34275, 34268, 34257,
-    34288, 34278, 34287, 34270, 34274, 34816, 34810, 34819, {f: 2, c: 34806},
-    34825, 34828, 34827, 34822, 34812, 34824, 34815, 34826, 34818, 35170,
-    {f: 2, c: 35162}, 35159, 35169, 35164, 35160, 35165, 35161, 35208, 35255,
-    35254, 35318, 35664, 35656, 35658, 35648, 35667, 35670, 35668, 35659,
-    35669, 35665, 35650, 35666, 35671, 35907, 35959, 35958, 35994,
-    {f: 2, c: 36102}, 36105, 36268, 36266, 36269, 36267, 36461, 36472, 36467,
-    36458, 36463, 36475, 36546, 36690, 36689, {f: 2, c: 36687}, 36691, 36788,
-    37184, 37183, 37296, 37293, 37854, 37831, 37839, 37826, 37850, 37840,
-    37881, 37868, 37836, 37849, 37801, 37862, 37834, 37844, 37870, 37859,
-    37845, 37828, 37838, 37824, 37842, 37797, 37863, 38269, {f: 2, c: 38362},
-    38625, 38697, {f: 2, c: 38699}, 38696, 38694, 38835, 38839, 38838,
-    {f: 3, c: 38877}, 39004, 39001, 39005, 38999, 39103, 39101, 39099, 39102,
-    39240, 39239, 39235, {f: 2, c: 39334}, 39450, 39445, 39461, 39453, 39460,
-    39451, 39458, 39456, 39463, 39459, 39454, 39452, 39444, 39618, 39691,
-    39690, 39694, 39692, 39735, {f: 2, c: 39914}, 39904, 39902, 39908, 39910,
-    39906, 39920, 39892, 39895, 39916, 39900, 39897, 39909, 39893, 39905,
-    39898, 40311, 40321, 40330, 40324, 40328, 40305, 40320, 40312, 40326,
-    {f: 2, c: 40331}, 40317, 40299, {f: 2, c: 40308}, 40304, 40297, 40325,
-    40307, 40315, 40322, 40303, 40313, 40319, 40327, 40296, 40596, 40593,
-    40640, 40700, 40749, {f: 2, c: 40768}, 40781, {f: 3, c: 40790}, 21303,
-    22194, 22197, 22195, 22755, 23365, {f: 2, c: 24006}, {f: 2, c: 24302},
-    {f: 2, c: 24512}, 25081, 25879, 25878, 25877, 25875, 26079, 26344,
-    {f: 2, c: 26339}, 27379, 27376, 27370, 27368, 27385, 27377,
-    {f: 2, c: 27374}, 28732, 28725, 28719, 28727, 28724, 28721, 28738, 28728,
-    28735, 28730, 28729, 28714, 28736, 28731, 28723, 28737, {f: 2, c: 29203},
-    29352, 29565, 29564, 29882, 30379, 30378, 30398, 30445, 30668,
-    {f: 2, c: 30670}, 30669, 30706, 31013, 31011, {f: 2, c: 31015}, 31012,
-    31017, 31154, 31342, {f: 2, c: 31340}, 31479, 31817, 31816, 31818, 31815,
-    31813, 31982, 32379, 32382, 32385, 32384, 32698, 32767, 32889, 33243,
-    33241, {f: 2, c: 33384}, 34338, 34303, 34305, 34302, 34331, 34304, 34294,
-    34308, 34313, 34309, 34316, 34301, 34841, {f: 2, c: 34832}, 34839, 34835,
-    34838, 35171, 35174, 35257, 35319, 35680, 35690, 35677, 35688, 35683,
-    35685, 35687, 35693, 36270, 36486, 36488, 36484, 36697, {f: 2, c: 36694},
-    36693, 36696, 36698, 37005, 37187, 37185, 37303, 37301, {f: 2, c: 37298},
-    37899, 37907, 37883, 37920, 37903, 37908, 37886, 37909, 37904, 37928,
-    37913, 37901, 37877, 37888, 37879, 37895, 37902, 37910, 37906, 37882,
-    37897, 37880, 37948, 37898, 37887, 37884, 37900, 37878, 37905, 37894,
-    38366, 38368, 38367, {f: 2, c: 38702}, 38841, 38843, {f: 2, c: 38909},
-    39008, {f: 2, c: 39010}, 39007, {f: 2, c: 39105}, 39248, 39246, 39257,
-    39244, 39243, 39251, 39474, 39476, 39473, 39468, 39466, 39478, 39465,
-    39470, 39480, 39469, 39623, 39626, 39622, 39696, 39698, 39697, 39947,
-    39944, 39927, 39941, 39954, 39928, 40000, 39943, 39950, 39942, 39959,
-    39956, 39945, 40351, 40345, 40356, 40349, 40338, 40344, 40336, 40347,
-    40352, 40340, 40348, 40362, 40343, 40353, 40346, 40354, 40360, 40350,
-    40355, 40383, 40361, 40342, {f: 2, c: 40358}, 40601, 40603, 40602, 40677,
-    40676, 40679, 40678, 40752, 40750, 40795, 40800, 40798, 40797, 40793,
-    40849, 20794, 20793, 21144, 21143, 22211, {f: 2, c: 22205}, 23368, 23367,
-    24011, 24015, 24305, 25085, 25883, 27394, 27388, 27395, 27384, 27392,
-    {f: 2, c: 28739}, 28746, {f: 2, c: 28744}, {f: 2, c: 28741}, 29213, 29210,
-    29209, 29566, 29975, 30314, 30672, 31021, 31025, 31023, 31828, 31827,
-    31986, 32394, [32391, 60229], 32392, 32395, 32390, 32397, 32589, 32699,
-    32816, 33245, 34328, 34346, 34342, 34335, 34339, 34332, 34329, 34343,
-    34350, 34337, 34336, 34345, 34334, 34341, 34857, 34845, 34843, 34848,
-    34852, 34844, 34859, 34890, 35181, 35177, 35182, 35179, 35322, 35705,
-    35704, 35653, {f: 2, c: 35706}, 36112, 36116, 36271, 36494, 36492, 36702,
-    36699, 36701, 37190, {f: 2, c: 37188}, 37305, 37951, 37947, 37942, 37929,
-    37949, 37936, 37945, 37930, 37943, 37932, 37952, 37937, 38373, 38372,
-    38371, 38709, 38714, 38847, 38881, 39012, 39113, 39110, 39104, 39256,
-    39254, 39481, 39485, 39494, 39492, 39490, 39489, 39482, 39487, 39629,
-    39701, {f: 2, c: 39703}, 39702, 39738, 39762, 39979, 39965, 39964, 39980,
-    39971, {f: 2, c: 39976}, 39972, 39969, 40375, 40374, 40380, 40385, 40391,
-    40394, 40399, 40382, 40389, 40387, 40379, 40373, 40398, {f: 2, c: 40377},
-    40364, 40392, 40369, 40365, 40396, 40371, 40397, 40370, 40570, 40604,
-    40683, 40686, 40685, 40731, 40728, 40730, 40753, 40782, 40805, 40804,
-    40850, 20153, 22214, 22213, 22219, 22897, {f: 2, c: 23371}, 24021, 24017,
-    24306, 25889, 25888, 25894, 25890, 27403, {f: 2, c: 27400}, 27661,
-    {f: 3, c: 28757}, 28754, {f: 2, c: 29214}, 29353, 29567, 29912, 29909,
-    29913, 29911, 30317, 30381, 31029, 31156, {f: 2, c: 31344}, 31831, 31836,
-    31833, 31835, 31834, 31988, 31985, 32401, 32591, 32647, 33246, 33387,
-    {f: 2, c: 34356}, 34355, 34348, 34354, 34358, 34860, 34856, 34854, 34858,
-    34853, 35185, 35263, 35262, 35323, 35710, 35716, 35714, 35718, 35717,
-    35711, 36117, 36501, 36500, 36506, 36498, 36496, {f: 2, c: 36502}, 36704,
-    36706, 37191, 37964, 37968, {f: 2, c: 37962}, 37967, 37959, 37957,
-    {f: 2, c: 37960}, 37958, 38719, 38883, 39018, 39017, 39115, 39252, 39259,
-    39502, {f: 2, c: 39507}, 39500, 39503, 39496, 39498, 39497, 39506, 39504,
-    39632, 39705, 39723, 39739, 39766, 39765, 40006, 40008, 39999, 40004,
-    39993, 39987, 40001, 39996, 39991, 39988, 39986, 39997, 39990, 40411,
-    40402, 40414, 40410, 40395, 40400, 40412, 40401, 40415, 40425, 40409,
-    40408, 40406, 40437, 40405, 40413, 40630, 40688, 40757, 40755, 40754,
-    40770, 40811, 40853, 40866, 20797, 21145, 22760, 22759, 22898, 23373,
-    24024, 34863, 24399, 25089, {f: 2, c: 25091}, 25897, 25893, 26006, 26347,
-    {f: 2, c: 27409}, 27407, 27594, 28763, 28762, 29218, 29570, 29569, 29571,
-    30320, 30676, 31847, 31846, 32405, 33388, 34362, 34368, 34361, 34364,
-    34353, 34363, 34366, 34864, 34866, 34862, 34867, 35190, 35188, 35187,
-    35326, 35724, 35726, 35723, 35720, 35909, 36121, 36504, 36708, 36707,
-    37308, 37986, 37973, 37981, 37975, 37982, {f: 2, c: 38852}, 38912, 39510,
-    39513, {f: 3, c: 39710}, 40018, 40024, 40016, 40010, 40013, 40011, 40021,
-    40025, 40012, 40014, 40443, 40439, 40431, 40419, 40427, 40440, 40420,
-    40438, 40417, 40430, 40422, 40434, [40432, 60370], 40418, 40428, 40436,
-    40435, 40424, 40429, 40642, 40656, {f: 2, c: 40690}, 40710, 40732, 40760,
-    40759, 40758, 40771, 40783, 40817, 40816, {f: 2, c: 40814}, 22227, 22221,
-    23374, 23661, 25901, {f: 2, c: 26349}, 27411, 28767, 28769, 28765, 28768,
-    29219, 29915, 29925, 30677, 31032, 31159, 31158, 31850, 32407, 32649,
-    33389, 34371, 34872, 34871, 34869, 34891, {f: 2, c: 35732},
-    {f: 3, c: 36510}, 36509, 37310, 37309, 37314, 37995, {f: 2, c: 37992},
-    38629, 38726, 38723, 38727, 38855, 38885, 39518, 39637, 39769, 40035,
-    40039, 40038, 40034, 40030, 40032, 40450, 40446, 40455, 40451, 40454,
-    40453, {f: 2, c: 40448}, 40457, 40447, 40445, 40452, 40608, 40734, 40774,
-    {f: 3, c: 40820}, 22228, 25902, 26040, {f: 2, c: 27416}, 27415, 27418,
-    28770, 29222, 29354, {f: 2, c: 30680}, 31033, 31849, 31851, 31990, 32410,
-    32408, 32411, 32409, {f: 2, c: 33248}, {f: 3, c: 34374}, {f: 2, c: 35193},
-    35196, 35195, 35327, {f: 2, c: 35736}, 36517, 36516, 36515, 37998, 37997,
-    37999, 38001, 38003, 38729, 39026, 39263, 40040, 40046, 40045, 40459,
-    40461, 40464, 40463, 40466, 40465, 40609, 40693, 40713, 40775, 40824,
-    40827, 40826, 40825, 22302, 28774, 31855, 34876, 36274, 36518, 37315,
-    38004, 38008, 38006, 38005, 39520, [39726, 60830], 40052, 40051, 40049,
-    40053, 40468, 40467, 40694, 40714, 40868, 28776, 28773, 31991, 34410,
-    34878, 34877, 34879, 35742, 35996, 36521, 36553, 38731, {f: 2, c: 39027},
-    39116, 39265, 39339, 39524, {f: 2, c: 39526}, 39716, 40469, 40471, 40776,
-    25095, 27422, 29223, 34380, 36520, 38018, {f: 2, c: 38016}, 39529, 39528,
-    40473, 34379, 35743, 38019, 40057, 40631, 30325, 39531, 40058, 40477,
-    {f: 2, c: 28777}, 29225, 40612, 40830, 40777, 40856, {s: 97}, 65075, 0,
-    65076, 65103, [168, 776, 63208], [710, 63209, 65342], [12541, 63210],
-    [12542, 63211], [12445, 63212], [12446, 63213], 0, [12293, 63216],
-    [12294, 63217], [12295, 63218], [12540, 63219], [63220, 65339],
-    [63221, 65341], [10045, 63222], [12353, 63223], [12354, 63224],
-    [12355, 63225], [12356, 63226], [12357, 63227], [12358, 63228],
-    [12359, 63229], [12360, 63230], [12361, 63231], [12362, 63232],
-    [12363, 63233], [12364, 63234], [12365, 63235], [12366, 63236],
-    [12367, 63237], [12368, 63238], [12369, 63239], [12370, 63240],
-    [12371, 63241], [12372, 63242], [12373, 63243], [12374, 63244],
-    [12375, 63245], [12376, 63246], [12377, 63247], [12378, 63248],
-    [12379, 63249], [12380, 63250], [12381, 63251], [12382, 63252],
-    [12383, 63253], [12384, 63254], [12385, 63255], [12386, 63256],
-    [12387, 63257], [12388, 63258], [12389, 63259], [12390, 63260],
-    [12391, 63261], [12392, 63262], [12393, 63263], [12394, 63264],
-    [12395, 63265], [12396, 63266], [12397, 63267], [12398, 63268],
-    [12399, 63269], [12400, 63270], [12401, 63271], [12402, 63272],
-    [12403, 63273], [12404, 63274], [12405, 63275], [12406, 63276],
-    [12407, 63277], [12408, 63278], [12409, 63279], [12410, 63280],
-    [12411, 63281], [12412, 63282], [12413, 63283], [12414, 63284],
-    [12415, 63285], [12416, 63286], [12417, 63287], [12418, 63288],
-    [12419, 63289], [12420, 63290], [12421, 63291], [12422, 63292],
-    [12423, 63293], [12424, 63294], [12425, 63295], [12426, 63296],
-    [12427, 63297], [12428, 63298], [12429, 63299], [12430, 63300],
-    [12431, 63301], [12432, 63302], [12433, 63303], [12434, 63304],
-    [12435, 63305], [12449, 63306], [12450, 63307], [12451, 63308],
-    [12452, 63309], [12453, 63310], [12454, 63311], [12455, 63312],
-    [12456, 63313], [12457, 63314], [12458, 63315], [12459, 63316],
-    [12460, 63317], [12461, 63318], [12462, 63319], [12463, 63320],
-    [12464, 63321], [12465, 63322], [12466, 63323], [12467, 63324],
-    [12468, 63325], [12469, 63326], [12470, 63327], [12471, 63328],
-    [12472, 63329], [12473, 63330], [12474, 63331], [12475, 63332],
-    [12476, 63333], [12477, 63334], [12478, 63335], [12479, 63336],
-    [12480, 63337], [12481, 63338], [12482, 63339], [12483, 63340],
-    [12484, 63341], [12485, 63342], [12486, 63343], [12487, 63344],
-    [12488, 63345], [12489, 63346], [12490, 63347], [12491, 63348],
-    [12492, 63349], [12493, 63350], [12494, 63351], [12495, 63352],
-    [12496, 63353], [12497, 63354], [12498, 63355], [12499, 63356],
-    [12500, 63357], [12501, 63358], [12502, 63359], [12503, 63360],
-    [12504, 63361], [12505, 63362], [12506, 63363], [12507, 63364],
-    [12508, 63365], [12509, 63366], [12510, 63367], [12511, 63368],
-    [12512, 63369], [12513, 63370], [12514, 63371], [12515, 63372],
-    [12516, 63373], [12517, 63374], [12518, 63375], [12519, 63376],
-    [12520, 63377], [12521, 63378], [12522, 63379], [12523, 63380],
-    [12524, 63381], [12525, 63382], [12526, 63383], [12527, 63384],
-    [12528, 63385], [12529, 63386], [12530, 63387], [12531, 63388],
-    [12532, 63389], [12533, 63390], [12534, 63391], [1040, 63392],
-    [1041, 63393], [1042, 63394], [1043, 63395], [1044, 63396], [1045, 63397],
-    [1025, 63398], [1046, 63399], [1047, 63400], [1048, 63401], [1049, 63402],
-    [1050, 63403], [1051, 63404], [1052, 63405], [1053, 63406], [1054, 63407],
-    [1055, 63408], [1056, 63409], [1057, 63410], [1058, 63411], [1059, 63412],
-    [1060, 63413], [1061, 63414], [1062, 63415], [1063, 63416], [1064, 63417],
-    [1065, 63418], [1066, 63419], [1067, 63420], [1068, 63421], [1069, 63422],
-    [1070, 63423], [1071, 63424], [1072, 63425], [1073, 63426], [1074, 63427],
-    [1075, 63428], [1076, 63429], [1077, 63430], [1105, 63431], [1078, 63432],
-    [1079, 63433], [1080, 63434], [1081, 63435], [1082, 63436], [1083, 63437],
-    [1084, 63438], [1085, 63439], [1086, 63440], [1087, 63441], [1088, 63442],
-    [1089, 63443], [1090, 63444], [1091, 63445], [1092, 63446], [1093, 63447],
-    [1094, 63448], [1095, 63449], [1096, 63450], [1097, 63451], [1098, 63452],
-    [1099, 63453], [1100, 63454], [1101, 63455], [1102, 63456], [1103, 63457],
-    [8679, 63458], [8632, 63459], [8633, 63460], [20033, 63461],
-    [63462, 131276], [20058, 63463], [63464, 131210], [20994, 63465],
-    [17553, 63466], 63467, [20872, 63468], [13853, 63469], [63470, 161287],
-    {s: 40}, [172, 63511, 65506], [63512, 65508], [63513, 65287],
-    [63514, 65282], [12849, 63515], [8470, 63516], [8481, 63517], 30849,
-    [37561, 58501], 35023, 22715, 24658, 31911, 23290, 9556, 9574, 9559, 9568,
-    9580, 9571, 9562, 9577, 9565, 9554, 9572, 9557, {s: 3}, 9560, 9575, 9563,
-    9555, 9573, 9558, 9567, 9579, 9570, 9561, 9576, 9564, 9553, {s: 5}, 9619,
-    {s: 26}, [58129, 147159], [22462, 58130], [58131, 159443], [28990, 58132],
-    [58133, 153568], [27042, 58135], [58136, 166889], [23412, 58137],
-    [31305, 58138], [58139, 153825], [58140, 169177], [31333, 58141],
-    [31357, 58142], [58143, 154028], [31419, 58144], [31408, 58145],
-    [31426, 58146], [31427, 58147], [29137, 58148], [58149, 156813],
-    [16842, 58150], [31450, 58151], [31453, 58152], [31466, 58153],
-    [16879, 58154], [21682, 58155], [58156, 154625], [31499, 58157],
-    [31573, 58158], [31529, 58159], [58160, 152334], [58161, 154878],
-    [31650, 58162], [31599, 58163], [33692, 58164], [58165, 154548],
-    [58166, 158847], [31696, 58167], [33825, 58168], [31634, 58169], 0,
-    [58171, 154912], 0, [33938, 58174], [31738, 58175], 0, [31797, 58177],
-    [58178, 154817], [31812, 58179], [31875, 58180], [58181, 149634],
-    [31910, 58182], [58184, 148856], [31945, 58185], [31943, 58186],
-    [31974, 58187], 0, [31987, 58189], [31989, 58190], [32359, 58192],
-    [17693, 58193], [58194, 159300], [32093, 58195], [58196, 159446],
-    [32137, 58198], [32171, 58199], [28981, 58200], [32179, 58201], 32214,
-    [58203, 147543], [58204, 155689], [32228, 58205], [15635, 58206],
-    [32245, 58207], [58208, 137209], [32229, 58209], [58210, 164717], 0,
-    [58212, 155937], [58213, 155994], [32366, 58214], 0, [17195, 58216],
-    [37996, 58217], [32295, 58218], [32576, 58219], [32577, 58220],
-    [32583, 58221], [31030, 58222], [58223, 156368], [39393, 58224],
-    [32663, 58225], [58226, 156497], [32675, 58227], [58228, 136801],
-    [58229, 131176], [17756, 58230], [58231, 145254], [58233, 164666],
-    [32762, 58234], [58235, 156809], 0, [32776, 58237], [32797, 58238], 0,
-    [32815, 58240], [58241, 172167], [58242, 158915], [32827, 58243],
-    [32828, 58244], [32865, 58245], [58246, 141076], [18825, 58247],
-    [58248, 157222], [58249, 146915], [58250, 157416], [26405, 58251],
-    [32935, 58252], [58253, 166472], [33031, 58254], [33050, 58255],
-    [22704, 58256], [58257, 141046], [27775, 58258], [58259, 156824],
-    [25831, 58261], [58262, 136330], [33304, 58263], [58264, 137310],
-    [27219, 58265], [58266, 150117], [58267, 150165], [17530, 58268],
-    [33321, 58269], [58271, 158290], [58272, 146814], [20473, 58273],
-    [58274, 136445], [34018, 58275], [33634, 58276], 0, [58278, 149927],
-    [58279, 144688], [58280, 137075], [58281, 146936], [33450, 58282],
-    [26907, 58283], [58284, 194964], [16859, 58285], [34123, 58286],
-    [33488, 58287], [33562, 58288], [58289, 134678], [58290, 137140],
-    [14017, 58291], [58292, 143741], [58293, 144730], [33403, 58294],
-    [33506, 58295], [33560, 58296], [58297, 147083], [58298, 159139],
-    [58299, 158469], [58300, 158615], [58301, 144846], [15807, 58302],
-    [33565, 58303], [21996, 58304], [33669, 58305], [17675, 58306],
-    [58307, 159141], [33708, 58308], 0, [33747, 58310], [58312, 159444],
-    [27223, 58313], [34138, 58314], [13462, 58315], [58316, 159298],
-    [33880, 58318], [58319, 154596], [33905, 58320], [15827, 58321],
-    [17636, 58322], [27303, 58323], [33866, 58324], [31064, 58326], 0,
-    [58328, 158614], [58329, 159351], [58330, 159299], [34014, 58331], 0,
-    [33681, 58333], [17568, 58334], [33939, 58335], [34020, 58336],
-    [58337, 154769], [16960, 58338], [58339, 154816], [17731, 58340],
-    [34100, 58341], [23282, 58342], 0, [17703, 58344], [34163, 58345],
-    [17686, 58346], [26559, 58347], [34326, 58348], [58349, 165413],
-    [58350, 165435], [34241, 58351], [58352, 159880], [34306, 58353],
-    [58354, 136578], [58355, 159949], [58356, 194994], [17770, 58357],
-    [34344, 58358], [13896, 58359], [58360, 137378], [21495, 58361],
-    [58362, 160666], [34430, 58363], 0, [58365, 172280], [34798, 58366],
-    [58367, 142375], [34737, 58368], [34778, 58369], [34831, 58370, 60990],
-    [22113, 58371], [34412, 58372], [26710, 58373], [17935, 58374],
-    [34885, 58375], [34886, 58376], [58377, 161248], [58378, 146873],
-    [58379, 161252], [34910, 58380], [34972, 58381], [18011, 58382],
-    [34996, 58383], [34997, 58384], [35013, 58386], [58388, 161551],
-    [35207, 58389], {s: 3}, [35239, 58393], [35260, 58394], [58395, 166437],
-    [35303, 58396], [58397, 162084], [58398, 162493], [35484, 58399],
-    [30611, 58400], [37374, 58401], [35472, 58402], [58403, 162393],
-    [31465, 58404], [58405, 162618], [18195, 58407], [58408, 162616],
-    [29052, 58409], [35596, 58410], [35615, 58411], [58412, 152624],
-    [58413, 152933], [35647, 58414], 0, [35661, 58416], [35497, 58417],
-    [58418, 150138], [35728, 58419], [35739, 58420], [35503, 58421],
-    [58422, 136927], [17941, 58423], [34895, 58424], [35995, 58425],
-    [58426, 163156], [58427, 163215], [58428, 195028], [14117, 58429],
-    [58430, 163155], [36054, 58431], [58432, 163224], [58433, 163261],
-    [36114, 58434], [36099, 58435], [58436, 137488], [36059, 58437],
-    [28764, 58438], [36113, 58439], [16080, 58441], 0, [36265, 58443],
-    [58444, 163842], [58445, 135188], [58446, 149898], [15228, 58447],
-    [58448, 164284], [58449, 160012], [31463, 58450], [36525, 58451],
-    [36534, 58452], [36547, 58453], [37588, 58454], [36633, 58455],
-    [36653, 58456], [58457, 164709], [58458, 164882], [36773, 58459],
-    [37635, 58460], [58461, 172703], [58462, 133712], [36787, 58463], 0,
-    [58465, 166366], [58466, 165181], [58467, 146875], [24312, 58468],
-    [58469, 143970], [36857, 58470], 0, [58474, 140069], [14720, 58475],
-    [58476, 159447], [36919, 58477], [58478, 165180], [58479, 162494],
-    [36961, 58480], [58481, 165228], [58482, 165387], [37032, 58483],
-    [58484, 165651], [37060, 58485], [58486, 165606], [37038, 58487], 0,
-    [37223, 58489], [37289, 58491], [37316, 58492], [31916, 58493],
-    [58494, 166195], [58495, 138889], [37390, 58496], [27807, 58497],
-    [37441, 58498], [37474, 58499], [58500, 153017], [58502, 166598],
-    [58503, 146587], [58504, 166668], [58505, 153051], [58506, 134449],
-    [37676, 58507], [37739, 58508], [58509, 166625], [58510, 166891],
-    [23235, 58512], [58513, 166626], [58514, 166629], [18789, 58515],
-    [37444, 58516], [58517, 166892], [58518, 166969], [58519, 166911],
-    [37747, 58520], [37979, 58521], [36540, 58522], [38277, 58523],
-    [38310, 58524], [37926, 58525], [38304, 58526], [28662, 58527],
-    [17081, 58528], [58530, 165592], [58531, 135804], [58532, 146990],
-    [18911, 58533], [27676, 58534], [38523, 58535], [38550, 58536],
-    [16748, 58537], [38563, 58538], [58539, 159445], [25050, 58540], 58541,
-    [30965, 58542], [58543, 166624], [38589, 58544], [21452, 58545],
-    [18849, 58546], [58547, 158904], [58548, 131700], [58549, 156688],
-    [58550, 168111], [58551, 168165], [58552, 150225], [58553, 137493],
-    [58554, 144138], [38705, 58555], [34370, 58556], [38710, 58557],
-    [18959, 58558], [17725, 58559], [17797, 58560], [58561, 150249],
-    [28789, 58562], [23361, 58563], [38683, 58564], 0, [58566, 168405],
-    [38743, 58567], [23370, 58568], [58569, 168427], [38751, 58570],
-    [37925, 58571], [20688, 58572], [58573, 143543], [58574, 143548],
-    [38793, 58575], [38815, 58576], [38833, 58577], [38846, 58578],
-    [38848, 58579], [38866, 58580], [38880, 58581], [58582, 152684],
-    [38894, 58583], [29724, 58584], [58585, 169011], 0, [38901, 58587],
-    [58588, 168989], [58589, 162170], [19153, 58590], [38964, 58591],
-    [38963, 58592], [38987, 58593], [39014, 58594], [15118, 58595],
-    [58596, 160117], [15697, 58597], [58598, 132656], [58599, 147804],
-    [58600, 153350], [39114, 58601], [39095, 58602], [39112, 58603],
-    [39111, 58604], [19199, 58605], [58606, 159015], [58607, 136915],
-    [21936, 58608], [39137, 58609], [39142, 58610], [39148, 58611],
-    [37752, 58612], [39225, 58613], [58614, 150057], [19314, 58615],
-    [58616, 170071], [58617, 170245], [39413, 58618], [39436, 58619],
-    [39483, 58620], [39440, 58621], [39512, 58622], [58623, 153381],
-    [14020, 58624], [58625, 168113], [58626, 170965], [39648, 58627],
-    [39650, 58628], [58629, 170757], [39668, 58630], [19470, 58631],
-    [39700, 58632], [39725, 58633], [58634, 165376], [20532, 58635],
-    [39732, 58636], [14531, 58638], [58639, 143485], [39760, 58640],
-    [39744, 58641], [58642, 171326], [23109, 58643], [58644, 137315],
-    [39822, 58645], [39938, 58647], [39935, 58648], [39948, 58649],
-    [58650, 171624], [40404, 58651], [58652, 171959], [58653, 172434],
-    [58654, 172459], [58655, 172257], [58656, 172323], [58657, 172511],
-    [40318, 58658], [40323, 58659], [58660, 172340], [40462, 58661],
-    [40388, 58663], [58665, 172435], [58666, 172576], [58667, 137531],
-    [58668, 172595], [40249, 58669], [58670, 172217], [58671, 172724],
-    [40592, 58672], [40597, 58673], [40606, 58674], [40610, 58675],
-    [19764, 58676], [40618, 58677], [40623, 58678], [58679, 148324],
-    [40641, 58680], [15200, 58681], [14821, 58682], [15645, 58683],
-    [20274, 58684], [14270, 58685], [58686, 166955], [40706, 58687],
-    [40712, 58688], [19350, 58689], [37924, 58690], [58691, 159138],
-    [40727, 58692, 60836], 0, [40761, 58694], [22175, 58695], [22154, 58696],
-    [40773, 58697], [39352, 58698], [58699, 168075], [38898, 58700],
-    [33919, 58701], 0, [40809, 58703], [31452, 58704], [40846, 58705],
-    [29206, 58706], [19390, 58707], [58708, 149877], [58709, 149947],
-    [29047, 58710], [58711, 150008], [58712, 148296], [58713, 150097],
-    [29598, 58714], [58715, 166874], [58716, 137466], [31135, 58717],
-    [58718, 166270], [58719, 167478], [37737, 58720], [37875, 58721],
-    [58722, 166468], [37612, 58723], [37761, 58724], [37835, 58725],
-    [58726, 166252], [58727, 148665], [29207, 58728], [16107, 58729],
-    [30578, 58730], [31299, 58731], [28880, 58732], [58733, 148595],
-    [58734, 148472], [29054, 58735], [58736, 137199], [28835, 58737],
-    [58738, 137406], [58739, 144793], [16071, 58740], [58741, 137349],
-    [58742, 152623], [58743, 137208], [14114, 58744], [58745, 136955],
-    [58746, 137273], [14049, 58747], [58748, 137076], [58749, 137425],
-    [58750, 155467], [14115, 58751], [58752, 136896], [22363, 58753],
-    [58754, 150053], [58755, 136190], [58756, 135848], [58757, 136134],
-    [58758, 136374], [34051, 58759, 58761], [58760, 145062], 0, [33877, 58762],
-    [58763, 149908], [58764, 160101], [58765, 146993], [58766, 152924],
-    [58767, 147195], [58768, 159826], [17652, 58769], [58770, 145134],
-    [58771, 170397], [58772, 159526], [26617, 58773], [14131, 58774],
-    [15381, 58775], [15847, 58776], [22636, 58777], [58778, 137506],
-    [26640, 58779], [16471, 58780], [58781, 145215], [58782, 147681],
-    [58783, 147595], [58784, 147727], [58785, 158753], [21707, 58786],
-    [22174, 58787], [58788, 157361], [22162, 58789], [58790, 135135],
-    [58791, 134056], [58792, 134669], 0, [58794, 166675], [37788, 58795],
-    [20216, 58796], [20779, 58797], [14361, 58798], [58799, 148534],
-    [20156, 58800], [58801, 132197], 0, [20299, 58803], [20362, 58804],
-    [58805, 153169], [23144, 58806], [58807, 131499], [58808, 132043],
-    [14745, 58809], [58810, 131850], [58811, 132116], [13365, 58812],
-    [20265, 58813], [58814, 131776], [58815, 167603], [58816, 131701],
-    [35546, 58817], [58818, 131596], [20120, 58819], [20685, 58820],
-    [20749, 58821], [20386, 58822], [20227, 58823], [58824, 150030],
-    [58825, 147082], [20290, 58826], [20526, 58827], [20588, 58828],
-    [20609, 58829], [20428, 58830], [20453, 58831], [20568, 58832],
-    [20732, 58833], [28278, 58838], [58839, 144789], [58840, 147001],
-    [58841, 147135], [28018, 58842], [58843, 137348], [58844, 147081],
-    [20904, 58845], [20931, 58846], [58847, 132576], [17629, 58848],
-    [58849, 132259], [58850, 132242], [58851, 132241], [36218, 58852],
-    [58853, 166556], [58854, 132878], [21081, 58855], [21156, 58856],
-    [58857, 133235], [21217, 58858], 0, [18042, 58860], [29068, 58861],
-    [58862, 148364], [58863, 134176], [58864, 149932], [58865, 135396],
-    [27089, 58866], [58867, 134685], 0, [16094, 58869], [29849, 58870],
-    [29716, 58871], [29782, 58872], [29592, 58873], [19342, 58874],
-    [58875, 150204], [58876, 147597], [21456, 58877], [13700, 58878],
-    [29199, 58879], [58880, 147657], [21940, 58881], [58882, 131909],
-    [21709, 58883], [58884, 134086], [22301, 58885], [37469, 58886],
-    [38644, 58887], [22493, 58889], [22413, 58890], [22399, 58891],
-    [13886, 58892], [22731, 58893], [23193, 58894], [58895, 166470],
-    [58896, 136954], [58897, 137071], [58898, 136976], [23084, 58899],
-    [22968, 58900], [23166, 58902], [23247, 58903], [23058, 58904],
-    [58905, 153926], [58906, 137715], [58907, 137313], [58908, 148117],
-    [14069, 58909], [27909, 58910], [29763, 58911], [23073, 58912],
-    [58913, 155267], [23169, 58914], [58915, 166871], [58916, 132115],
-    [37856, 58917], [29836, 58918], [58919, 135939], [28933, 58920],
-    [18802, 58921], [37896, 58922], [58923, 166395], [37821, 58924],
-    [14240, 58925], [23582, 58926], [23710, 58927], [24158, 58928],
-    [24136, 58929], [58930, 137622], [58931, 137596], [58932, 146158],
-    [24269, 58933], [23375, 58934], [58935, 137475], [58936, 137476],
-    [14081, 58937], [58938, 137376], [14045, 58939], [58940, 136958],
-    [14035, 58941], [33066, 58942], [58943, 166471], [58944, 138682],
-    [58945, 144498], [58946, 166312], [24332, 58947, 60916], [24334, 58948],
-    [58949, 137511], [58950, 137131], [23147, 58951], [58952, 137019],
-    [23364, 58953], [58955, 161277], [34912, 58956], [24702, 58957],
-    [58958, 141408], [58959, 140843], [24539, 58960], [16056, 58961],
-    [58962, 140719], [58963, 140734], [58964, 168072], [58965, 159603],
-    [25024, 58966], [58967, 131134], [58968, 131142], [58969, 140827],
-    [24985, 58970], [24984, 58971], [24693, 58972], [58973, 142491],
-    [58974, 142599], [58975, 149204], [58976, 168269], [25713, 58977],
-    [58978, 149093], [58979, 142186], [14889, 58980], [58981, 142114],
-    [58982, 144464], [58983, 170218], [58984, 142968], [25399, 58985],
-    [25782, 58987], [25393, 58988], [25553, 58989], [58990, 149987],
-    [58991, 142695], [25252, 58992], [58993, 142497], [25659, 58994],
-    [25963, 58995], [26994, 58996], [15348, 58997], [58998, 143502],
-    [58999, 144045], [59000, 149897], [59001, 144043], [21773, 59002],
-    [59003, 144096], [59004, 137433], [59005, 169023], [26318, 59006],
-    [59007, 144009], [59008, 143795], [15072, 59009], [59011, 152964],
-    [59012, 166690], [59013, 152975], [59014, 136956], [59015, 152923],
-    [59016, 152613], [30958, 59017], [59018, 143619], [59019, 137258],
-    [59020, 143924], [13412, 59021], [59022, 143887], [59023, 143746],
-    [59024, 148169], [26254, 59025], [59026, 159012], [26219, 59027],
-    [19347, 59028], [26160, 59029], [59030, 161904], [59031, 138731],
-    [26211, 59032], [59033, 144082], [59034, 144097], [26142, 59035],
-    [59036, 153714], [14545, 59037], [59038, 145466], [59039, 145340],
-    [15257, 59040], [59041, 145314], [59042, 144382], [29904, 59043],
-    [15254, 59044], [59046, 149034], [26806, 59047], 0, [15300, 59049],
-    [27326, 59050], [59052, 145365], [59053, 148615], [27187, 59054],
-    [27218, 59055], [27337, 59056], [27397, 59057], [59058, 137490],
-    [25873, 59059], [26776, 59060], [27212, 59061], [15319, 59062],
-    [27258, 59063], [27479, 59064], [59065, 147392], [59066, 146586],
-    [37792, 59067], [37618, 59068], [59069, 166890], [59070, 166603],
-    [37513, 59071], [59072, 163870], [59073, 166364], [37991, 59074],
-    [28069, 59075], [28427, 59076], 0, [59079, 147327], [15759, 59080],
-    [28164, 59081], [59082, 147516], [23101, 59083], [28170, 59084],
-    [22599, 59085], [27940, 59086], [30786, 59087], [28987, 59088],
-    [59089, 148250], [59090, 148086], [28913, 59091], [29264, 59092, 61085],
-    [29319, 59093], [29332, 59094], [59095, 149391], [59096, 149285],
-    [20857, 59097], [59098, 150180], [59099, 132587], [29818, 59100],
-    [59101, 147192], [59102, 144991], [59103, 150090], [59104, 149783],
-    [59105, 155617], [16134, 59106], [16049, 59107], [59108, 150239],
-    [59109, 166947], [59110, 147253], [24743, 59111], [16115, 59112],
-    [29900, 59113], [29756, 59114], [37767, 59115], [29751, 59116],
-    [17567, 59117], [59118, 159210], [17745, 59119], [30083, 59120],
-    [16227, 59121], [59122, 150745], [59123, 150790], [16216, 59124],
-    [30037, 59125], [30323, 59126], [59127, 173510], 0, [29800, 59129, 61070],
-    [59130, 166604], [59131, 149931], [59132, 149902], [15099, 59133],
-    [15821, 59134], [59135, 150094], [16127, 59136], [59137, 149957],
-    [59138, 149747], [37370, 59139], [22322, 59140], [37698, 59141],
-    [59142, 166627], [59143, 137316], [20703, 59144], [59145, 152097],
-    [59146, 152039], [30584, 59147], [59148, 143922], [30478, 59149],
-    [30479, 59150], [30587, 59151], [59152, 149143], [59153, 145281],
-    [14942, 59154], [59155, 149744], [29752, 59156], [29851, 59157],
-    [16063, 59158], [59159, 150202], [59160, 150215], [16584, 59161],
-    [59162, 150166], [59163, 156078], [37639, 59164], [59165, 152961],
-    [30750, 59166], [30861, 59167], [30856, 59168], [30930, 59169],
-    [29648, 59170], [31065, 59171], [59172, 161601], [59173, 153315],
-    [16654, 59174], 0, 0, [31141, 59177], [27181, 59178], [59179, 147194],
-    [31290, 59180], [31220, 59181], [16750, 59182], [59183, 136934],
-    [16690, 59184], [37429, 59185], [31217, 59186], [59187, 134476],
-    [59188, 149900], [59189, 131737], [59190, 146874], [59191, 137070],
-    [13719, 59192], [21867, 59193], [13680, 59194], [13994, 59195],
-    [59196, 131540], [59197, 134157], [31458, 59198], [23129, 59199],
-    [59200, 141045], [59201, 154287], [59202, 154268], [23053, 59203],
-    [59204, 131675], [30960, 59205], [23082, 59206], [59207, 154566],
-    [31486, 59208], [16889, 59209], [31837, 59210], [31853, 59211],
-    [16913, 59212], [59213, 154547], [59214, 155324], [59215, 155302],
-    [31949, 59216], [59217, 150009], [59218, 137136], [31886, 59219],
-    [31868, 59220], [31918, 59221], [27314, 59222], [32220, 59223],
-    [32263, 59224], [32211, 59225], [32590, 59226], [59227, 156257],
-    [59228, 155996], [59229, 162632], [32151, 59230], [59231, 155266],
-    [17002, 59232], [59233, 158581], [59234, 133398], [26582, 59235],
-    [59236, 131150], [59237, 144847], [22468, 59238], [59239, 156690],
-    [59240, 156664], [32733, 59242], [31527, 59243], [59244, 133164],
-    [59245, 154345], [59246, 154947], [31500, 59247], [59248, 155150],
-    [39398, 59249], [34373, 59250], [39523, 59251], [27164, 59252],
-    [59253, 144447], [59255, 150007], [59256, 157101], [39455, 59257],
-    [59258, 157088], 0, [59260, 160039], [59261, 158929], [17642, 59262],
-    [33079, 59263], [17410, 59264], [32966, 59265], [33033, 59266],
-    [33090, 59267], [59268, 157620], [39107, 59269], [59270, 158274],
-    [33378, 59271], [33381, 59272], [59273, 158289], [33875, 59274],
-    [59275, 159143], [34320, 59276], [59277, 160283], [23174, 59278],
-    [16767, 59279], [59280, 137280], [23339, 59281], [59282, 137377],
-    [23268, 59283], [59284, 137432], [34464, 59285], [59286, 195004],
-    [59287, 146831], [34861, 59288], [59289, 160802], [23042, 59290],
-    [34926, 59291], [20293, 59292], [34951, 59293], [35007, 59294],
-    [35046, 59295], [35173, 59296], [35149, 59297], [59298, 153219],
-    [35156, 59299], [59300, 161669], [59301, 161668], [59302, 166901],
-    [59303, 166873], [59304, 166812], [59305, 166393], [16045, 59306],
-    [33955, 59307], [18165, 59308], [18127, 59309], [14322, 59310],
-    [35389, 59311], [35356, 59312], [59313, 169032], [24397, 59314],
-    [37419, 59315], [59316, 148100], [26068, 59317], [28969, 59318],
-    [28868, 59319], [59320, 137285], [40301, 59321], [35999, 59322],
-    [36073, 59323], [59324, 163292], [22938, 59325], [30659, 59326],
-    [23024, 59327], [14036, 59329], [36394, 59330], [36519, 59331],
-    [59332, 150537], [36656, 59333], [36682, 59334], [17140, 59335],
-    [27736, 59336], [28603, 59337], [59338, 140065], [18587, 59339],
-    [28537, 59340], [28299, 59341], [59342, 137178], [39913, 59343],
-    [14005, 59344], [59345, 149807], [37051, 59346], 0, [21873, 59348],
-    [18694, 59349], [37307, 59350], [37892, 59351], [59352, 166475],
-    [16482, 59353], [59354, 166652], [37927, 59355], [59356, 166941],
-    [59357, 166971], [34021, 59358], [35371, 59359], [38297, 59360],
-    [38311, 59361], [38295, 59362], [38294, 59363], [59364, 167220],
-    [29765, 59365], [16066, 59366], [59367, 149759], [59368, 150082],
-    [59369, 148458], [16103, 59370], [59371, 143909], [38543, 59372],
-    [59373, 167655], [59374, 167526], [59375, 167525], [16076, 59376],
-    [59377, 149997], [59378, 150136], [59379, 147438], [29714, 59380],
-    [29803, 59381], [16124, 59382], [38721, 59383], [59384, 168112],
-    [26695, 59385], [18973, 59386], [59387, 168083], [59388, 153567], 0,
-    [37736, 59390], [59391, 166281], [59392, 166950], [59393, 166703],
-    [59394, 156606], [37562, 59395], [23313, 59396], [35689, 59397],
-    [18748, 59398], [29689, 59399], [59400, 147995], [38811, 59401], 0,
-    [39224, 59403], [59404, 134950], [24001, 59405], [59406, 166853],
-    [59407, 150194], [38943, 59408], [59409, 169178], [37622, 59410],
-    [59411, 169431], [37349, 59412], [17600, 59413], [59414, 166736],
-    [59415, 150119], [59416, 166756], [39132, 59417], [59418, 166469],
-    [16128, 59419], [37418, 59420], [18725, 59421], [33812, 59422],
-    [39227, 59423], [39245, 59424], [59425, 162566], [15869, 59426], 0,
-    [19311, 59428], [39338, 59429], [39516, 59430], [59431, 166757],
-    [59432, 153800], [27279, 59433], [39457, 59434], [23294, 59435],
-    [39471, 59436], [59437, 170225], [19344, 59438], [59439, 170312],
-    [39356, 59440], [19389, 59441], [19351, 59442], [37757, 59443],
-    [22642, 59444], [59445, 135938], [22562, 59446], [59447, 149944],
-    [59448, 136424], [30788, 59449], [59450, 141087], [59451, 146872],
-    [26821, 59452], [15741, 59453], [37976, 59454], [14631, 59455],
-    [24912, 59456], [59457, 141185], [59458, 141675], [24839, 59459],
-    [40015, 59460], [40019, 59461], [40059, 59462], [39989, 59463],
-    [39952, 59464], [39807, 59465], [39887, 59466], [59467, 171565],
-    [39839, 59468], [59469, 172533], [59470, 172286], [40225, 59471],
-    [19630, 59472], [59473, 147716], [40472, 59474], [19632, 59475],
-    [40204, 59476], [59477, 172468], [59478, 172269], [59479, 172275],
-    [59480, 170287], [40357, 59481], [33981, 59482], [59483, 159250],
-    [59484, 159711], [59485, 158594], [34300, 59486], [17715, 59487],
-    [59488, 159140], [59489, 159364], [59490, 159216], [33824, 59491],
-    [34286, 59492], [59493, 159232], [59494, 145367], [59495, 155748],
-    [31202, 59496], [59497, 144796], [59498, 144960], [59500, 149982],
-    [15714, 59501], [37851, 59502], [37566, 59503], [37704, 59504],
-    [59505, 131775], [30905, 59506], [37495, 59507], [37965, 59508],
-    [20452, 59509], [13376, 59510], [36964, 59511], [59512, 152925],
-    [30781, 59513], [30804, 59514], [30902, 59515], [30795, 59516],
-    [59517, 137047], [59518, 143817], [59519, 149825], [13978, 59520],
-    [20338, 59521], [28634, 59522], [28633, 59523], 0, [28702, 59524, 59525],
-    [21524, 59526], [59527, 147893], [22459, 59528], [22771, 59529],
-    [22410, 59530], [40214, 59531], [22487, 59532], [28980, 59533],
-    [13487, 59534], [59535, 147884], [29163, 59536], [59537, 158784],
-    [59538, 151447], 0, [59540, 137141], [59541, 166473], [24844, 59542],
-    [23246, 59543], [23051, 59544], [17084, 59545], [59546, 148616],
-    [14124, 59547], [19323, 59548], [59549, 166396], [37819, 59550],
-    [37816, 59551], [59552, 137430], [59553, 134941], [33906, 59554],
-    [59555, 158912], [59556, 136211], [59557, 148218], [59558, 142374],
-    [59559, 148417], [22932, 59560], [59561, 146871], [59562, 157505],
-    [32168, 59563], [59564, 155995], [59565, 155812], [59566, 149945],
-    [59567, 149899], [59568, 166394], [37605, 59569], [29666, 59570],
-    [16105, 59571], [29876, 59572], [59573, 166755], [59574, 137375],
-    [16097, 59575], [59576, 150195], [27352, 59577], [29683, 59578],
-    [29691, 59579], [16086, 59580], [59581, 150078], [59582, 150164],
-    [59583, 137177], [59584, 150118], [59585, 132007], [59586, 136228],
-    [59587, 149989], [29768, 59588], [59589, 149782], [28837, 59590],
-    [59591, 149878], [37508, 59592], [29670, 59593], [37727, 59594],
-    [59595, 132350], [37681, 59596], [59597, 166606], [59598, 166422],
-    [37766, 59599], [59600, 166887], [59601, 153045], [18741, 59602],
-    [59603, 166530], [29035, 59604], [59605, 149827], [59606, 134399],
-    [22180, 59607], [59608, 132634], [59609, 134123], [59610, 134328],
-    [21762, 59611], [31172, 59612], [59613, 137210], [32254, 59614],
-    [59615, 136898], [59616, 150096], [59617, 137298], [17710, 59618],
-    [37889, 59619], [14090, 59620], [59621, 166592], [59622, 149933],
-    [22960, 59623], [59624, 137407], [59625, 137347], [59626, 160900],
-    [23201, 59627], [14050, 59628], [59629, 146779], [14000, 59630],
-    [37471, 59631], [23161, 59632], [59633, 166529], [59634, 137314],
-    [37748, 59635], [15565, 59636], [59637, 133812], [19094, 59638],
-    [14730, 59639], [20724, 59640], [15721, 59641], [15692, 59642],
-    [59643, 136092], [29045, 59644], [17147, 59645], [59646, 164376],
-    [28175, 59647], [59648, 168164], [17643, 59649], [27991, 59650],
-    [59651, 163407], [28775, 59652], [27823, 59653], [15574, 59654],
-    [59655, 147437], [59656, 146989], [28162, 59657], [28428, 59658],
-    [15727, 59659], [59660, 132085], [30033, 59661], [14012, 59662],
-    [13512, 59663], [18048, 59664], [16090, 59665], [18545, 59666],
-    [22980, 59667], [37486, 59668], [18750, 59669], [36673, 59670],
-    [59671, 166940], [59672, 158656], [22546, 59673], [22472, 59674],
-    [14038, 59675], [59676, 136274], [28926, 59677], [59678, 148322],
-    [59679, 150129], [59680, 143331], [59681, 135856], [59682, 140221],
-    [26809, 59683], [26983, 59684], [59685, 136088], [59686, 144613],
-    [59687, 162804], [59688, 145119], [59689, 166531], [59690, 145366],
-    [59691, 144378], [59692, 150687], [27162, 59693], [59694, 145069],
-    [59695, 158903], [33854, 59696], [17631, 59697], [17614, 59698],
-    [59699, 159014], [59700, 159057], [59701, 158850], [59702, 159710], 0, 0,
-    [33597, 59705], [59706, 137018], [33773, 59707], [59708, 158848],
-    [59709, 159827], [59710, 137179], [22921, 59711], [23170, 59712],
-    [59713, 137139], [23137, 59714], [23153, 59715], [59716, 137477],
-    [59717, 147964], [14125, 59718], [23023, 59719], [59720, 137020],
-    [14023, 59721], [29070, 59722], [37776, 59723], [26266, 59724],
-    [59725, 148133], [23150, 59726], [23083, 59727], [59728, 148115],
-    [27179, 59729], [59730, 147193], [59731, 161590], [59732, 148571],
-    [59733, 148170], [28957, 59734], [59735, 148057], [59736, 166369],
-    [20400, 59737], [59738, 159016], [23746, 59739], [59740, 148686],
-    [59741, 163405], [59742, 148413], [27148, 59743], [59744, 148054],
-    [59745, 135940], 0, [28979, 59747], [59748, 148457], [15781, 59749],
-    [27871, 59750], [59751, 194597], [23019, 59754], [24412, 59757],
-    [59764, 144128], [31955, 59776], [59783, 162548], [59786, 153334],
-    [59790, 162584], [36972, 59791], [33270, 59795], [30476, 59797],
-    [27810, 59799], [22269, 59800], [22633, 59828], [26465, 59832],
-    [23646, 59838], [22770, 59841], [28857, 59843], [26627, 59853],
-    [36795, 59859], [36796, 59861], [20001, 59871], [31545, 59898],
-    [15820, 59902], [29482, 57990, 59909], [30048, 59912], [22586, 59920],
-    [33446, 59932], [27018, 59940], [24803, 59944], [20206, 59984],
-    [39364, 60002], [40639, 60023], [21249, 60025], [26528, 60038],
-    [24808, 60046], [20916, 60053], [31363, 60064], [39994, 60075],
-    [31432, 60093], [26906, 60098], [22956, 60100], [22592, 60102],
-    [21610, 60114], [24807, 60123], [22138, 60125], [26965, 60132],
-    [39983, 60133], [34725, 60134], [23584, 60141], [24075, 60143],
-    [26398, 60147], [33965, 60157], [35713, 60161], [20088, 60166],
-    [25283, 60176], [26709, 60180], 0, [33533, 60190], [35237, 60194],
-    [36768, 60196], [38840, 60198], [38983, 60200], [39613, 60201],
-    [24497, 60218], [26184, 60219], [26303, 60220], [60221, 162425], 0,
-    [60225, 149946], 0, 0, [60230, 131910], [26382, 60232], [26904, 60233],
-    [60235, 161367], [60236, 155618], [60239, 161278], [60240, 139418],
-    [18640, 60241], [19128, 60242], [60244, 166554], [60247, 147515],
-    [60250, 150085], [60251, 132554], [20946, 60252], [60253, 132625],
-    [22943, 60254], [60255, 138920], [15294, 60256], [60257, 146687],
-    [14747, 60262], [60264, 165352], [60265, 170441], [14178, 60266],
-    [60267, 139715], [35678, 60268], [60269, 166734], 0, [29193, 60274],
-    [60276, 134264], [60280, 132985], [36570, 60281], [21135, 60283],
-    [29041, 60285], [60288, 147274], [60289, 150183], [21948, 60290],
-    [60293, 158546], [13427, 60295], [60297, 161330], [18200, 60299],
-    [60303, 149823], [20582, 60305], [13563, 60306], [60307, 144332], 0,
-    [18300, 60310], [60311, 166216], [60315, 138640], 0, [60320, 162834],
-    [36950, 60321], [60323, 151450], [35682, 60324], [23899, 60327],
-    [60328, 158711], 0, [60331, 137500], [35562, 60332], [60333, 150006],
-    [60335, 147439], [19392, 60337], [60340, 141083], [37989, 60341],
-    [60342, 153569], [24981, 60343], [23079, 60344], [60345, 194765], 0,
-    [60348, 148769], [20074, 60350], [60351, 149812], [38486, 60352],
-    [28047, 60353], [60354, 158909], [35191, 60356], [60359, 156689], 0,
-    [31554, 60363], [60364, 168128], [60365, 133649], 0, [31301, 60369],
-    [39462, 60372], [13919, 60374], [60375, 156777], [60376, 131105],
-    [31107, 60377], [23852, 60380], [60381, 144665], 0, [18128, 60384],
-    [30011, 60386], [34917, 60387], [22710, 60389], [14108, 60390],
-    [60391, 140685], [15444, 60394], [37505, 60397], [60398, 139642],
-    [37680, 60400], [60402, 149968], [27705, 60403], [60406, 134904],
-    [34855, 60407], [35061, 60408], [60409, 141606], [60410, 164979],
-    [60411, 137137], [28344, 60412], [60413, 150058], [60414, 137248],
-    [14756, 60415], 0, 0, [17727, 60419], [26294, 60420], [60421, 171181],
-    [60422, 170148], [35139, 60423], [16607, 60427], [60428, 136714],
-    [14753, 60429], [60430, 145199], [60431, 164072], [60432, 136133],
-    [29101, 60433], [33638, 60434], [60436, 168360], 0, [19639, 60438],
-    [60439, 159919], [60440, 166315], [60445, 147834], [31555, 60446],
-    [31102, 60447], [28597, 60449], [60450, 172767], [27139, 60451],
-    [60452, 164632], [21410, 60453], [60454, 159239], [37823, 60455],
-    [26678, 60456], [38749, 59389, 60457], [60458, 164207], [60460, 158133],
-    [60461, 136173], [60462, 143919], [23941, 60464], [60465, 166960],
-    [22293, 60467], [38947, 60468], [60469, 166217], [23979, 60470],
-    [60471, 149896], [26046, 60472], [27093, 60473], [21458, 60474],
-    [60475, 150181], [60476, 147329], [15377, 60477], [26422, 60478],
-    [60482, 139169], [13770, 60490], [18682, 60493], 0, [30728, 60496],
-    [37461, 60497], [17394, 60499], [17375, 60501], [23032, 60505], 0,
-    [22155, 60518], [60520, 169449], [36882, 60541], [21953, 60546],
-    [17673, 60551], [32383, 60552], [28502, 60553], [27313, 60554],
-    [13540, 60556], [60558, 161949], [14138, 60559], 0, [60562, 163876],
-    [60565, 162366], [15851, 60567], [60569, 146615], [60574, 156248],
-    [22207, 60575], [36366, 60577], [23405, 60578], [25566, 60581], 0,
-    [25904, 60585], [22061, 60586], [21530, 60588], [60591, 171416],
-    [19581, 60592], [22050, 60593], [22046, 60594], [32585, 60595],
-    [22901, 60597], [60598, 146752], [34672, 60599], [33047, 60604],
-    [40286, 60605], [36120, 60606], [30267, 60607], [40005, 60608],
-    [30286, 60609], [30649, 60610], [37701, 60611], [21554, 60612],
-    [33096, 60613], [33527, 60614], [22053, 60615], [33074, 60616],
-    [33816, 60617], [32957, 60618], [21994, 60619], [31074, 60620],
-    [22083, 60621], [21526, 60622], [60623, 134813], [13774, 60624],
-    [22021, 57509, 60625], [22001, 60626], [26353, 60627], [60628, 164578],
-    [13869, 60629], [30004, 60630], [22000, 60631], [21946, 60632],
-    [21655, 60633], [21874, 60634], [60635, 134209], [60636, 134294],
-    [24272, 57652, 60637], [60639, 134774], [60640, 142434], [60641, 134818],
-    [40619, 60642], [32090, 60643], 0, [60645, 135285], [25245, 60646],
-    [38765, 60647], [21652, 60648], [36045, 60649], [29174, 60650],
-    [37238, 60651], [25596, 60652], [25529, 60653], [25598, 60654],
-    [21865, 60655], [60656, 142147], [40050, 60657], [60658, 143027],
-    [20890, 60659], [13535, 60660], [60661, 134567], [20903, 60662],
-    [21581, 60663], [21790, 60664], [21779, 60665], [30310, 60666],
-    [36397, 60667], [60668, 157834], [30129, 60669], [32950, 60670],
-    [34820, 60671], 0, [35015, 60673], [33206, 60674], [33820, 60675],
-    [17644, 60677], [29444, 60678], [33547, 60681], [22139, 60683],
-    [37232, 60690], [37384, 60692], [60696, 134905], [29286, 60697],
-    [18254, 60699], [60701, 163833], [16634, 60703], [40029, 60704],
-    [25887, 60705], [18675, 60707], [60708, 149472], [60709, 171388], 0,
-    [60713, 161187], 60715, [60716, 155720], [29091, 60718], [32398, 60719],
-    [40272, 60720], [13687, 60723], [27826, 60725], [21351, 60726],
-    [14812, 60728], [60731, 149016], [33325, 60734], [21579, 60735], 60739,
-    [14930, 60740], [29556, 60742], [60743, 171692], [19721, 60744],
-    [39917, 60745], 0, [19547, 60748], [60751, 171998], [33884, 60752],
-    [60754, 160434], [25390, 60757], [32037, 60758], [14890, 60761],
-    [36872, 60762], [21196, 60763], [15988, 60764], [13946, 60765],
-    [17897, 60766], [60767, 132238], [30272, 60768], [23280, 60769],
-    [60770, 134838], [30842, 60771], [18358, 60772], [22695, 60773],
-    [16575, 60774], [22140, 60775], [39819, 60776], [23924, 60777],
-    [30292, 60778], [60779, 173108], [40581, 60780], [19681, 60781], 0,
-    [14331, 60783], [24857, 60784], [60786, 148466], 60787, [22109, 60788],
-    [60792, 171526], [21044, 60793], [13741, 60795], 0, [40316, 60797],
-    [31830, 60798], [39737, 60799], [22494, 60800], [23635, 60802],
-    [25811, 60803], [60804, 169168], [60805, 156469], [34477, 60807],
-    [60808, 134440], [60811, 134513], 60812, [20990, 60813], [60814, 139023],
-    [23950, 60815], [38659, 60816], [60817, 138705], [40577, 60818],
-    [36940, 60819], [31519, 60820], [39682, 60821], [23761, 60822],
-    [31651, 60823], [25192, 60824], [25397, 60825], [39679, 60826],
-    [31695, 60827], [39722, 60828], [31870, 60829], 0, [31810, 60831],
-    [31878, 60832], [39957, 60833], [31740, 60834], [39689, 60835], 0, 39982,
-    [40794, 60839], [21875, 60840], [23491, 60841], [20477, 60842],
-    [40600, 60843], [20466, 60844], [21088, 60845], [21201, 60847],
-    [22375, 60848], [20566, 60849], [22967, 60850], [24082, 60851],
-    [38856, 60852], [40363, 60853], [36700, 60854], [21609, 60855],
-    [38836, 60856], [39232, 60857], [38842, 60858], [21292, 60859],
-    [24880, 60860], [26924, 60861], [21466, 60862], [39946, 60863],
-    [40194, 60864], [19515, 60865], [38465, 60866], [27008, 60867],
-    [20646, 60868], [30022, 60869], [60870, 137069], [39386, 60871],
-    [21107, 60872], 60873, [37209, 60874], [38529, 60875], [37212, 60876],
-    60877, [37201, 60878], [60879, 167575], [25471, 60880], [27338, 60882],
-    [22033, 60883], [37262, 60884], [30074, 60885], [25221, 60886],
-    [29519, 60888], [31856, 60889], [60890, 154657], 60892, [30422, 60894],
-    [39837, 60895], [20010, 60896], [60897, 134356], [33726, 60898],
-    [34882, 60899], 60900, [23626, 60901], [27072, 60902], 0, 0,
-    [21023, 60905], [24053, 60906], [20174, 60907], [27697, 60908],
-    [60909, 131570], [20281, 60910], [21660, 60911], 0, [21146, 60913],
-    [36226, 60914], [13822, 60915], 0, [13811, 60917], 60918, [27474, 60919],
-    [37244, 60920], [40869, 60921], [39831, 60922], [38958, 60923],
-    [39092, 60924], [39610, 60925], [40616, 60926], [40580, 60927],
-    [31508, 60929], 60930, [27642, 60931], [34840, 60932], [32632, 60933],
-    60934, [22048, 60935], [60936, 173642], [36471, 60937], [40787, 60938],
-    60939, [36308, 60940], [36431, 60941], [40476, 60942], [36353, 60943],
-    [25218, 60944], [60945, 164733], [36392, 60946], [36469, 60947],
-    [31443, 60948], [31294, 60950], [30936, 60951], [27882, 60952],
-    [35431, 60953], [30215, 60954], [40742, 60956], [27854, 60957],
-    [34774, 60958], [30147, 60959], [60960, 172722], [30803, 60961],
-    [36108, 60963], [29410, 60964], [29553, 60965], [35629, 60966],
-    [29442, 60967], [29937, 60968], [36075, 60969], [60970, 150203],
-    [34351, 60971], [24506, 60972], [34976, 60973], [17591, 60974], 60975,
-    [60977, 159237], 60978, [35454, 60979], [60980, 140571], 60981,
-    [24829, 60982], [30311, 60983], [39639, 60984], [40260, 60985],
-    [37742, 58859, 60986], [39823, 60987], [34805, 60988], 60989, 0,
-    [36087, 60991], [29484, 60992], [38689, 60993], [39856, 60994],
-    [13782, 60995], [29362, 60996], [19463, 60997], [31825, 60998],
-    [39242, 60999], [24921, 61001], [19460, 61002], [40598, 61003],
-    [24957, 61004], 61005, [22367, 61006], [24943, 61007], [25254, 61008],
-    [25145, 61009], 0, [14940, 61011], [25058, 61012], [21418, 61013],
-    [25444, 61015], [26626, 61016], [13778, 61017], [23895, 61018],
-    [36826, 61020], [61021, 167481], 61022, [20697, 61023], [30982, 61025],
-    [21298, 61026], [38456, 61027], [61028, 134971], [16485, 61029], 61030,
-    [30718, 61031], 61032, [31938, 61033], [61034, 155418], [31962, 61035],
-    [31277, 61036], [32870, 61037], [32867, 61038], [32077, 61039],
-    [29957, 61040], [29938, 61041], [35220, 61042], [33306, 61043],
-    [26380, 61044], [32866, 61045], [61046, 160902], [32859, 61047],
-    [29936, 61048], [33027, 61049], [30500, 61050], [35209, 61051],
-    [61052, 157644], [30035, 61053], [34729, 61055], [34766, 61056],
-    [33224, 61057], [34700, 61058], [35401, 61059], [36013, 61060],
-    [35651, 61061], [30507, 61062], [29944, 61063], [34010, 61064],
-    [27058, 61066], [36262, 61067], 61068, [35241, 58392, 61069], 0,
-    [28089, 61071], [34753, 61072], [61073, 147473], [29927, 61074],
-    [15835, 61075], [29046, 61076], [24740, 57702, 61077], [24988, 61078],
-    [15569, 61079], 0, [24695, 61081], 61082, [32625, 61083], 0,
-    [24809, 61086], [19326, 61087], [57344, 132423], [37595, 57345],
-    [57346, 132575], [57347, 147397], [34124, 57348], [17077, 57349],
-    [29679, 57350], [20917, 57351], [13897, 57352], [57353, 149826],
-    [57354, 166372], [37700, 57355], [57356, 137691], [33518, 57357],
-    [57358, 146632], [30780, 57359], [26436, 57360], [25311, 57361],
-    [57362, 149811], [57363, 166314], [57364, 131744], [57365, 158643],
-    [57366, 135941], [20395, 57367], [57368, 140525], [20488, 57369],
-    [57370, 159017], [57371, 162436], [57372, 144896], [57373, 150193],
-    [57374, 140563], 0, [57376, 131966], [24484, 57377], [57378, 131968],
-    [57379, 131911], [28379, 57380], [57381, 132127], 20702, [20737, 57383],
-    [13434, 57384], [20750, 57385], [39020, 57386], [14147, 57387],
-    [33814, 57388], [57389, 149924], [57390, 132231], [20832, 57391],
-    [57392, 144308], [20842, 57393], [57394, 134143], [57395, 139516],
-    [57396, 131813], [57397, 140592], [57398, 132494], [57399, 143923],
-    [57400, 137603], [23426, 57401], [34685, 57402], [57403, 132531],
-    [57404, 146585], [20914, 57405], [20920, 57406], [40244, 57407],
-    [20937, 57408], [20943, 57409], [20945, 57410], [15580, 57411],
-    [20947, 57412], [57413, 150182], [20915, 57414], 0, 0, [20973, 57417],
-    [33741, 57418], [26942, 57419], [57420, 145197], [24443, 57421],
-    [21003, 57422], [21030, 57423], [21052, 57424], [21173, 57425],
-    [21079, 57426], [21140, 57427], [21177, 57428], [21189, 57429],
-    [31765, 57430], [34114, 57431], [21216, 57432], [34317, 57433],
-    [57434, 158483], 0, [57436, 166622], [21833, 57437], [28377, 57438],
-    [57439, 147328], [57440, 133460], [57441, 147436], [21299, 57442], 0,
-    [57444, 134114], [27851, 57445], [57446, 136998], [26651, 57447],
-    [29653, 57448], [24650, 57449], [16042, 57450], [14540, 57451],
-    [57452, 136936], [29149, 57453], [17570, 57454], [21357, 57455],
-    [21364, 57456], [57457, 165547], [21374, 57458], 0, [57460, 136598],
-    [57461, 136723], [30694, 57462], [21395, 57463], [57464, 166555],
-    [21408, 57465], [21419, 57466], [21422, 57467], [29607, 57468],
-    [57469, 153458], [16217, 57470], [29596, 57471], [21441, 57472],
-    [21445, 57473], [27721, 57474], [20041, 57475], [22526, 57476],
-    [21465, 57477], [15019, 57478], [57479, 134031], [21472, 57480],
-    [57481, 147435], [57482, 142755], [21494, 57483], [57484, 134263],
-    [21523, 57485], [28793, 57486], [21803, 57487], [26199, 57488],
-    [27995, 57489], [21613, 57490], [57491, 158547], [57492, 134516],
-    [21853, 57493], [21647, 57494], [21668, 57495], [18342, 57496],
-    [57497, 136973], [57498, 134877], [15796, 57499], [57500, 134477],
-    [57501, 166332], [57502, 140952], [21831, 57503], [19693, 57504],
-    [21551, 57505], [29719, 57506], [21894, 57507], [21929, 57508], 0,
-    [57510, 137431], [57511, 147514], [17746, 57512], [57513, 148533],
-    [26291, 57514], [57515, 135348], [22071, 57516], [26317, 57517],
-    [57518, 144010], [26276, 57519], 0, [22093, 57521], [22095, 57522],
-    [30961, 57523], [22257, 57524], [38791, 57525], [21502, 57526],
-    [22272, 57527], [22255, 57528], [22253, 57529], [57530, 166758],
-    [13859, 57531], [57532, 135759], [22342, 57533], [57534, 147877],
-    [27758, 57535], [28811, 57536], [22338, 57537], [14001, 57538],
-    [57539, 158846], [22502, 57540], [57541, 136214], [22531, 57542],
-    [57543, 136276], [57544, 148323], [22566, 57545], [57546, 150517], 0,
-    [22698, 57548], [13665, 57549], [22752, 57550], [22748, 57551],
-    [57552, 135740], [22779, 57553], [23551, 57554], [22339, 57555],
-    [57556, 172368], [57557, 148088], [37843, 57558], [13729, 57559],
-    [22815, 57560], [26790, 57561], [14019, 57562], [28249, 57563],
-    [57564, 136766], [23076, 57565], 0, [57567, 136850], [34053, 57568],
-    [22985, 57569], [57570, 134478], [57571, 158849], [57572, 159018],
-    [57573, 137180], [23001, 57574], [57575, 137211], [57576, 137138],
-    [57577, 159142], [28017, 57578], [57579, 137256], [57580, 136917],
-    [23033, 57581], [57582, 159301], [23211, 57583], [23139, 57584],
-    [14054, 57585], [57586, 149929], 0, [14088, 57588], [23190, 57589],
-    [29797, 57590], [23251, 57591], [57592, 159649], [57593, 140628],
-    [57595, 137489], [14130, 57596], [57597, 136888], [24195, 57598],
-    [21200, 57599], [23414, 57600], [25992, 57601], [23420, 57602],
-    [57603, 162318], [16388, 57604], [18525, 57605], [57606, 131588],
-    [23509, 57607], [57609, 137780], [57610, 154060], [57611, 132517],
-    [23539, 57612], [23453, 57613], [19728, 57614], [23557, 57615],
-    [57616, 138052], [23571, 57617], [29646, 57618], [23572, 57619],
-    [57620, 138405], [57621, 158504], [23625, 57622], [18653, 57623],
-    [23685, 57624], [23785, 57625], [23791, 57626], [23947, 57627],
-    [57628, 138745], [57629, 138807], [23824, 57630], [23832, 57631],
-    [23878, 57632], [57633, 138916], [23738, 57634], [24023, 57635],
-    [33532, 57636], [14381, 57637], [57638, 149761], [57639, 139337],
-    [57640, 139635], [33415, 57641], [14390, 57642], [15298, 57643],
-    [24110, 57644], [27274, 57645], 0, 57647, [57648, 148668], [57649, 134355],
-    [21414, 57650], [20151, 57651], 0, [21416, 57653], [57654, 137073],
-    [24073, 57655], 57656, [57657, 164994], [24313, 57658], [24315, 57659],
-    [14496, 57660], [24316, 57661], [26686, 57662], [37915, 57663],
-    [24333, 57664], [57665, 131521], [57666, 194708], [15070, 57667],
-    [57669, 135994], [24378, 57670], [57671, 157832], [57672, 140240],
-    [57674, 140401], [24419, 57675], [57677, 159342], [24434, 57678],
-    [37696, 57679], [57680, 166454], [24487, 57681], [23990, 57682],
-    [15711, 57683], [57684, 152144], [57685, 139114], [57686, 159992],
-    [57687, 140904], [37334, 57688], [57689, 131742], [57690, 166441],
-    [24625, 57691], [26245, 57692], [14691, 57694], [15815, 57695],
-    [13881, 57696], [22416, 57697], [57698, 141236], [31089, 57699],
-    [15936, 57700], [24734, 57701], 0, 0, [57704, 149890], [57705, 149903],
-    [57706, 162387], [29860, 57707], [20705, 57708], [23200, 57709],
-    [24932, 57710], [24898, 57712], [57713, 194726], [57714, 159442],
-    [24961, 57715], [20980, 57716], [57717, 132694], [24967, 57718],
-    [23466, 57719], [57720, 147383], [57721, 141407], [25043, 57722],
-    [57723, 166813], [57724, 170333], [25040, 57725], [14642, 57726],
-    [57727, 141696], [57728, 141505], [24611, 57729], [24924, 57730],
-    [25886, 57731], [25483, 57732], [57733, 131352], [25285, 57734],
-    [57735, 137072], [25301, 57736], [57737, 142861], [25452, 57738],
-    [57739, 149983], [14871, 57740], [25656, 57741], [25592, 57742],
-    [57743, 136078], [57744, 137212], [28554, 57746], [57747, 142902], 0,
-    [57750, 153373], [25825, 57751], [25829, 57752], [38011, 57753],
-    [14950, 57754], [25658, 57755], [14935, 57756], [25933, 57757],
-    [28438, 57758], [57759, 150056], [57760, 150051], [25989, 57761],
-    [25965, 57762], [25951, 57763], 0, [26037, 57765], [57766, 149824],
-    [19255, 57767], [26065, 57768], [16600, 57769], [57770, 137257], 57771,
-    [26083, 57772], [24543, 57773], [57774, 144384], [26136, 57775],
-    [57776, 143863], [57777, 143864], [26180, 57778], [57779, 143780],
-    [57780, 143781], [26187, 57781], [57782, 134773], [26215, 57783],
-    [57784, 152038], [26227, 57785], 0, [57788, 143921], [57789, 165364],
-    [57790, 143816], [57791, 152339], [30661, 57792], [57793, 141559],
-    [39332, 57794], [26370, 57795], [57796, 148380], [57797, 150049],
-    [27130, 57799], [57800, 145346], 0, [26471, 57802], [26466, 57803],
-    [57804, 147917], [57805, 168173], [26583, 57806], [17641, 57807],
-    [26658, 57808], [28240, 57809], [37436, 57810], [26625, 57811],
-    [57812, 144358], [57813, 159136], [26717, 57814], [57815, 144495],
-    [27105, 57816], [27147, 57817], [57818, 166623], [26995, 57819],
-    [26819, 57820], [57821, 144845], [26881, 57822], [26880, 57823],
-    [14849, 57825], [57826, 144956], [15232, 57827], [26540, 57828],
-    [26977, 57829], [57830, 166474], [17148, 57831], [26934, 57832],
-    [27032, 57833], [15265, 57834], [57835, 132041], [33635, 57836],
-    [20624, 57837], [27129, 57838], [57839, 144985], [57840, 139562],
-    [27205, 57841], [57842, 145155], [27293, 57843], [15347, 57844],
-    [26545, 57845], [27336, 57846], [57847, 168348], [15373, 57848],
-    [27421, 57849], [57850, 133411], [24798, 57851, 60308], [27445, 57852],
-    [27508, 57853], [57854, 141261], [28341, 57855], [57856, 146139], 0,
-    [57858, 137560], [14144, 57859], [21537, 57860], [57861, 146266],
-    [27617, 57862], [57863, 147196], [27612, 57864], [27703, 57865],
-    [57866, 140427], [57867, 149745], [57868, 158545], [27738, 57869],
-    [33318, 57870], [27769, 57871], [57872, 146876], [17605, 57873],
-    [57874, 146877], [57875, 147876], [57876, 149772], [57877, 149760],
-    [57878, 146633], [14053, 57879], [15595, 57880], [57881, 134450],
-    [39811, 57882], [57883, 143865], [57884, 140433], [32655, 57885],
-    [26679, 57886], [57887, 159013], [57888, 159137], [57889, 159211],
-    [28054, 57890], [27996, 57891], [28284, 57892], [28420, 57893],
-    [57894, 149887], [57895, 147589], [57896, 159346], [34099, 57897],
-    [57898, 159604], [20935, 57899], 0, 0, [33838, 57902], [57903, 166689], 0,
-    [57905, 146991], [29779, 57906], [57907, 147330], [31180, 57908],
-    [28239, 57909], [23185, 57910], [57911, 143435], [28664, 57912],
-    [14093, 57913], [28573, 57914], [57915, 146992], [28410, 57916],
-    [57917, 136343], [57918, 147517], [17749, 57919], [37872, 57920],
-    [28484, 57921], [28508, 57922], [15694, 57923], [28532, 57924],
-    [57925, 168304], [15675, 57926], [28575, 57927], [57928, 147780],
-    [28627, 57929], [57930, 147601], [57931, 147797], [57932, 147513],
-    [57933, 147440], [57934, 147380], [57935, 147775], [20959, 57936],
-    [57937, 147798], [57938, 147799], [57939, 147776], [57940, 156125],
-    [28747, 57941], [28798, 57942], [28839, 57943], 0, [28876, 57945],
-    [28885, 57946], [28886, 57947], [28895, 57948], [16644, 57949],
-    [15848, 57950], [29108, 57951], [29078, 57952], [57953, 148087],
-    [28971, 57954], [28997, 57955], [23176, 57956], [29002, 57957], 0,
-    [57960, 148325], [29007, 57961], [37730, 57962], [57963, 148161],
-    [28972, 57964], [57965, 148570], [57966, 150055], [57967, 150050],
-    [29114, 57968], [57969, 166888], [28861, 57970], [29198, 57971],
-    [37954, 57972], [29205, 57973], [22801, 57974], [37955, 57975],
-    [29220, 57976], [37697, 57977], [57978, 153093], [29230, 57979],
-    [29248, 57980], [57981, 149876], [26813, 57982], [29269, 57983],
-    [29271, 57984], [15957, 57985], [57986, 143428], [26637, 57987],
-    [28477, 57988], [29314, 57989], 0, [29483, 57991], [57992, 149539],
-    [57993, 165931], [18669, 57994], [57995, 165892], [29480, 57996],
-    [29486, 57997], [29647, 57998], [29610, 57999], [58000, 134202],
-    [58001, 158254], [29641, 58002], [29769, 58003], [58004, 147938],
-    [58005, 136935], [58006, 150052], [26147, 58007], [14021, 58008],
-    [58009, 149943], [58010, 149901], [58011, 150011], [29687, 58012],
-    [29717, 58013], [26883, 58014], [58015, 150054], [29753, 58016],
-    [16087, 58018], 0, [58020, 141485], [29792, 58021], [58022, 167602],
-    [29767, 58023], [29668, 58024], [29814, 58025], [33721, 58026],
-    [29804, 58027], [29812, 58029], [37873, 58030], [27180, 58031],
-    [29826, 58032], [18771, 58033], [58034, 150156], [58035, 147807],
-    [58036, 150137], [58037, 166799], [23366, 58038], [58039, 166915],
-    [58040, 137374], [29896, 58041], [58042, 137608], [29966, 58043],
-    [29982, 58045], [58046, 167641], [58047, 137803], [23511, 58048],
-    [58049, 167596], [37765, 58050], [30029, 58051], [30026, 58052],
-    [30055, 58053], [30062, 58054], [58055, 151426], [16132, 58056],
-    [58057, 150803], [30094, 58058], [29789, 58059], [30110, 58060],
-    [30132, 58061], [30210, 58062], [30252, 58063], [30289, 58064],
-    [30287, 58065], [30319, 58066], 58067, [58068, 156661], [30352, 58069],
-    [33263, 58070], [14328, 58071], [58072, 157969], [58073, 157966],
-    [30369, 58074], [30373, 58075], [30391, 58076], [30412, 58077],
-    [58078, 159647], [33890, 58079], [58080, 151709], [58081, 151933],
-    [58082, 138780], [30494, 58083], [30502, 58084], [30528, 58085],
-    [25775, 58086], [58087, 152096], [30552, 58088], [58089, 144044],
-    [30639, 58090], [58091, 166244], [58092, 166248], [58093, 136897],
-    [30708, 58094], 0, [26826, 58098], [30895, 58099], [30919, 58100],
-    [30931, 58101], [38565, 58102], [31022, 58103], [58104, 153056],
-    [30935, 58105], [31028, 58106], [30897, 58107], [58108, 161292],
-    [36792, 58109], [34948, 58110], [58113, 140828], [31110, 58114],
-    [35072, 58115], [26882, 58116], [31104, 58117], [58118, 153687],
-    [31133, 58119], [58120, 162617], [31036, 58121], [31145, 58122],
-    [28202, 58123], [58124, 160038], [16040, 58125], [31174, 58126],
-    [58127, 168205], [31188, 58128], 0, [21797, 62526], 0, [62528, 134210],
-    [62529, 134421], [62530, 151851], [21904, 62531], [62532, 142534],
-    [14828, 62533], [62534, 131905], [36422, 62535], [62536, 150968],
-    [62537, 169189], 0, [62539, 164030], [30586, 62540], [62541, 142392],
-    [14900, 62542], [18389, 62543], [62544, 164189], [62545, 158194],
-    [62546, 151018], [25821, 62547], [62548, 134524], [62549, 135092],
-    [62550, 134357], 0, [25741, 62552], [36478, 62553], [62554, 134806], 0,
-    [62556, 135012], [62557, 142505], [62558, 164438], [62559, 148691], 0,
-    [62561, 134470], [62562, 170573], [62563, 164073], [18420, 62564],
-    [62565, 151207], [62566, 142530], [39602, 62567], [14951, 62568],
-    [62569, 169460], [16365, 62570], [13574, 62571], [62572, 152263],
-    [62573, 169940], 0, [62575, 142660], [40302, 62576], [38933, 62577], 0,
-    [17369, 62579], 0, [25780, 62581], [21731, 62582], 0, [62584, 142282], 0,
-    [14843, 62586], 0, [62588, 157402], [62589, 157462], [62590, 162208],
-    [25834, 62591], [62592, 151634], [62593, 134211], [36456, 62594], 0,
-    [62596, 166732], [62597, 132913], 0, [18443, 62599], [62600, 131497],
-    [16378, 62601], [22643, 62602], [62603, 142733], 0, [62605, 148936],
-    [62606, 132348], [62607, 155799], [62608, 134988], 0, [21881, 62610], 0,
-    [17338, 62612], 0, [19124, 62614], [62615, 141926], [62616, 135325],
-    [33194, 62617], [39157, 62618], [62619, 134556], [25465, 62620],
-    [14846, 62621], [62622, 141173], [36288, 62623], [22177, 62624],
-    [25724, 62625], [15939, 62626], 0, [62628, 173569], [62629, 134665],
-    [62630, 142031], 0, 0, [62633, 135368], [62634, 145858], [14738, 62635],
-    [14854, 62636], [62637, 164507], [13688, 62638], [62639, 155209],
-    [62640, 139463], 0, 0, [62643, 142514], [62644, 169760], [13500, 62645],
-    [27709, 62646], [62647, 151099], 0, 0, [62650, 161140], [62651, 142987],
-    [62652, 139784], [62653, 173659], [62654, 167117], [62655, 134778],
-    [62656, 134196], [62683, 161337], [62684, 142286], [62687, 142417],
-    [14872, 62689], [62691, 135367], [62693, 173618], [62695, 167122],
-    [62696, 167321], [62697, 167114], [38314, 62698], 0, [62706, 161630],
-    [28992, 62708], 0, [20822, 62385], 0, [20616, 62487], 0, [13459, 62489],
-    [20870, 62491], [24130, 63037], [20997, 62495], [21031, 62436],
-    [21113, 62497], 0, [13651, 62504], [21442, 62505], [21343, 62715], 0,
-    [21823, 62520], 0, [21976, 59986], [13789, 62722], [22049, 63067], 0,
-    [22100, 60044], [60148, 135291], 0, [60153, 135379], 0, [61095, 135934], 0,
-    0, [14265, 60104], [23745, 61099], [23829, 63066], [23894, 63030],
-    [14392, 63036], [20097, 62477], [24253, 63038], [14612, 63042],
-    [25017, 63050], [25232, 63054], [25368, 63056], [25690, 63063],
-    [25745, 62381], [33133, 62709], [33156, 59922], [33171, 59924],
-    [26624, 63080], [15292, 63093], [29327, 60517], [29389, 59781], 0,
-    [29497, 59785], [30018, 59811], [30172, 59817], [16320, 59818],
-    [60278, 151205], [16343, 59820], 0, 30336, [30348, 59824, 151388],
-    [16552, 59845], [30777, 59846], [16643, 59855], [31377, 59863],
-    [31771, 59876], [31981, 59884], [32659, 62658], [32686, 59892], 0,
-    [33535, 59936], [22623, 59981], [34482, 59960], 0, [34699, 59963],
-    [35143, 59969], 0, [35369, 59972], 0, [36465, 59988], [60484, 164233],
-    [36528, 59990], 0, [37214, 62443], [37260, 62441], [39182, 60051],
-    [39196, 60054], 0, 0, [39809, 60066], [40384, 60080], [40339, 60078],
-    [40620, 60085], [19857, 60540], 0, 37818, [40571, 60084], [28809, 63148],
-    [29512, 59788], 0, [31129, 59858], [36791, 59997], 0, [39234, 60056],
-    {s: 193}, 8364, {s: 4}, [12443, 63518], [12444, 63519], [11904, 63520],
-    {f: 5, c: 62211}, [62216, 131340], 62217, [62218, 131281], [62219, 131277],
-    {f: 2, c: 62220}, [62222, 131275], [62223, 139240], 62224, [62225, 131274],
-    {f: 4, c: 62226}, [62230, 131342], {f: 2, c: 62231}, {f: 2, c: 62776},
-    [62778, 138177], [62779, 194680], [12205, 38737, 62780], [62781, 131206],
-    [20059, 62782], [20155, 62783], [13630, 62784], [23587, 62785],
-    [24401, 62786], [24516, 62787], [14586, 62788], [25164, 62789],
-    [25909, 62790], [27514, 62791], [27701, 62792], [27706, 62793],
-    [28780, 62794], [29227, 62795], [20012, 62796], [29357, 62797],
-    [62798, 149737], [32594, 62799], [31035, 62800], [31993, 62801],
-    [32595, 62802], [62803, 156266], [13505, 62804], [62806, 156491],
-    [32770, 62807], [32896, 62808], [62809, 157202], [62810, 158033],
-    [21341, 62811], [34916, 62812], [35265, 62813], [62814, 161970],
-    [35744, 62815], [36125, 62816], [38021, 62817], [38264, 62818],
-    [38271, 62819], [38376, 62820], [62821, 167439], [38886, 62822],
-    [39029, 62823], [39118, 62824], [39134, 62825], [39267, 62826],
-    [62827, 170000], [40060, 62828], [40479, 62829], [40644, 62830],
-    [27503, 62831], [62832, 63751], [20023, 62833], [62834, 131207],
-    [38429, 62835], [25143, 62836], [38050, 62837], [11908, 63521],
-    [11910, 63522], [11911, 63523], [11912, 63524], [11914, 63525],
-    [11916, 63526], [11917, 63527], [11925, 63528], [11932, 63529],
-    [11941, 63531], [11943, 63532], [11946, 63533], [11948, 63534],
-    [11950, 63535], [11958, 63536], [11964, 63537], [11966, 63538],
-    [11978, 63540], [11980, 63541], [11981, 63542], [11983, 63543],
-    [11990, 63544], [11991, 63545], [11998, 63546], [62368, 172969],
-    [62369, 135493], [25866, 62371], [20029, 62374], [28381, 62375],
-    [40270, 62376], [37343, 62377], [62380, 161589], [20250, 62382],
-    [20264, 62383], [20392, 62384], [20852, 62386], [20892, 62387],
-    [20964, 62388], [21153, 62389], [21160, 62390], [21307, 62391],
-    [21326, 62392], [21457, 62393], [21464, 62394], [22242, 62395],
-    [22768, 62396], [22788, 62397], [22791, 62398], [22834, 62399],
-    [22836, 62400], [23398, 62401], [23454, 62402], [23455, 62403],
-    [23706, 62404], [24198, 62405], [24635, 62406], [25993, 62407],
-    [26622, 62408], [26628, 62409], [26725, 62410], [27982, 62411],
-    [28860, 62412], [30005, 62413], [32420, 62414], [32428, 62415],
-    [32442, 62416], [32455, 62417], [32463, 62418], [32479, 62419],
-    [32518, 62420], [32567, 62421], [33402, 62422], [33487, 62423],
-    [33647, 62424], [35270, 62425], [35774, 62426], [35810, 62427],
-    [36710, 62428], [36711, 62429], [36718, 62430], [29713, 62431],
-    [31996, 62432], [32205, 62433], [26950, 62434], [31433, 62435],
-    [30904, 62442], [32956, 62444], [36107, 62446], [33014, 62447],
-    [62448, 133607], [32927, 62451], [40647, 62452], [19661, 62453],
-    [40393, 62454], [40460, 62455], [19518, 62456], [62457, 171510],
-    [62458, 159758], [40458, 62459], [62460, 172339], [13761, 62461],
-    [28314, 62463], [33342, 62464], [29977, 62465], [18705, 62467],
-    [39532, 62468], [39567, 62469], [40857, 62470], [31111, 62471],
-    [62472, 164972], [62473, 138698], [62474, 132560], [62475, 142054],
-    [20004, 62476], [20096, 62478], [20103, 62479], [20159, 62480],
-    [20203, 62481], [20279, 62482], [13388, 62483], [20413, 62484],
-    [15944, 62485], [20483, 62486], [13437, 62488], [13477, 62490],
-    [22789, 62492], [20955, 62493], [20988, 62494], [20105, 62496],
-    [21136, 62498], [21287, 62499], [13767, 62500], [21417, 62501],
-    [13649, 62502], [21424, 62503], [21539, 62506], [13677, 62507],
-    [13682, 62508], [13953, 62509], [21651, 62510], [21667, 62511],
-    [21684, 62512], [21689, 62513], [21712, 62514], [21743, 62515],
-    [21784, 62516], [21795, 62517], [21800, 62518], [13720, 62519],
-    [13733, 62521], [13759, 62522], [21975, 62523], [13765, 62524],
-    [62525, 163204], [16467, 62538], [62551, 135412], [62555, 134155],
-    [62574, 161992], [62580, 155813], [62583, 142668], [62585, 135287],
-    [62587, 135279], [62595, 139681], [62609, 134550], [16571, 62611],
-    [62631, 142537], [22098, 62641], [62642, 134961], [62657, 157724],
-    [62659, 135375], [62660, 141315], [62661, 141625], [13819, 62662],
-    [62663, 152035], [62664, 134796], [62665, 135053], [62666, 134826],
-    [16275, 62667], [62668, 134960], [62669, 134471], [62670, 135503],
-    [62671, 134732], [62673, 134827], [62674, 134057], [62675, 134472],
-    [62676, 135360], [62677, 135485], [16377, 62678], [62679, 140950],
-    [25650, 62680], [62681, 135085], [62682, 144372], [62685, 134526],
-    [62686, 134527], [62688, 142421], [62690, 134808], [62692, 134958],
-    [62694, 158544], [21708, 62699], [33476, 62700], [21945, 62701],
-    [62703, 171715], [39974, 62704], [39606, 62705], [62707, 142830],
-    [33004, 62710], [23580, 62711], [62712, 157042], [33076, 62713],
-    [14231, 62714], [62716, 164029], [37302, 62717], [62718, 134906],
-    [62719, 134671], [62720, 134775], [62721, 134907], [62723, 151019],
-    [13833, 62724], [62725, 134358], [22191, 62726], [62727, 141237],
-    [62728, 135369], [62729, 134672], [62730, 134776], [62731, 135288],
-    [62732, 135496], [62733, 164359], [62734, 136277], [62735, 134777],
-    [62736, 151120], [62737, 142756], [23124, 62738], [62739, 135197],
-    [62740, 135198], [62741, 135413], [62742, 135414], [22428, 62743],
-    [62744, 134673], [62745, 161428], [62746, 164557], [62747, 135093],
-    [62748, 134779], [62749, 151934], [14083, 62750], [62751, 135094],
-    [62752, 135552], [62753, 152280], [62754, 172733], [62755, 149978],
-    [62756, 137274], [62757, 147831], [62758, 164476], [22681, 62759],
-    [21096, 62760], [13850, 62761], [62762, 153405], [31666, 62763],
-    [23400, 62764], [18432, 62765], [19244, 62766], [40743, 62767],
-    [18919, 62768], [39967, 62769], [39821, 62770], [62771, 154484],
-    [62772, 143677], [22011, 62773], [13810, 62774], [22153, 62775],
-    [23870, 63028], [23880, 63029], [15868, 63031], [14351, 63032],
-    [23972, 63033], [23993, 63034], [14368, 63035], [24357, 63039],
-    [24451, 63040], [14600, 63041], [14655, 63043], [14669, 63044],
-    [24791, 63045], [24893, 63046], [23781, 63047], [14729, 63048],
-    [25015, 63049], [25039, 63051], [14776, 63052], [25132, 63053],
-    [25317, 63055], [14840, 63057], [22193, 63058], [14851, 63059],
-    [25570, 63060], [25595, 63061], [25607, 63062], [14923, 63064],
-    [25792, 63065], [40863, 63068], [14999, 63069], [25990, 63070],
-    [15037, 63071], [26111, 63072], [26195, 63073], [15090, 63074],
-    [26258, 63075], [15138, 63076], [26390, 63077], [15170, 63078],
-    [26532, 63079], [15192, 63081], [26698, 63082], [26756, 63083],
-    [15218, 63084], [15217, 63085], [15227, 63086], [26889, 63087],
-    [26947, 63088], [29276, 63089], [26980, 63090], [27039, 63091],
-    [27013, 63092], [27094, 63094], [15325, 63095], [27237, 63096],
-    [27252, 63097], [27249, 63098], [27266, 63099], [15340, 63100],
-    [27289, 63101], [15346, 63102], [27307, 63103], [27317, 63104],
-    [27348, 63105], [27382, 63106], [27521, 63107], [27585, 63108],
-    [27626, 63109], [27765, 63110], [27818, 63111], [15563, 63112],
-    [27906, 63113], [27910, 63114], [27942, 63115], [28033, 63116],
-    [15599, 63117], [28068, 63118], [28081, 63119], [28181, 63120],
-    [28184, 63121], [28201, 63122], [28294, 63123], [63124, 166336],
-    [28347, 63125], [28386, 63126], [28378, 63127], [40831, 63128],
-    [28392, 63129], [28393, 63130], [28452, 63131], [28468, 63132],
-    [15686, 63133], [63134, 147265], [28545, 63135], [28606, 63136],
-    [15722, 63137], [15733, 63138], [29111, 63139], [23705, 63140],
-    [15754, 63141], [28716, 63142], [15761, 63143], [28752, 63144],
-    [28756, 63145], [28783, 63146], [28799, 63147], [63149, 131877],
-    [17345, 63150], [13809, 63151], [63152, 134872], [13902, 58134],
-    [15789, 58172], [58173, 154725], [26237, 58183], [31860, 58188],
-    [29837, 58197], [32402, 58215], [17667, 58232], [58260, 151480],
-    [58270, 133901], [58277, 158474], [13438, 58311], [58317, 143087],
-    [58325, 146613], [58343, 159385], [34673, 58364], [25537, 58385],
-    [30583, 58387], [35210, 58390], [58406, 147343], [35660, 58415],
-    [58440, 150729], [18730, 58464], [58471, 172052], [58472, 165564],
-    [58473, 165121], [15088, 58490], [28815, 58511], [58529, 140922],
-    [58637, 158120], [58646, 148043], [26760, 58662], [58664, 139611],
-    [40802, 58702], [37830, 58793], [58802, 131967], [37734, 58888],
-    [37519, 58901], [34324, 58954], [58986, 173147], [16784, 59010],
-    [26511, 59045], [26654, 59048], [14435, 59051], [59077, 149996],
-    [15129, 59128], [33942, 59176], [59241, 149858], [14818, 59254],
-    [33920, 59259], [17262, 59328], [38769, 59402], [39323, 59427],
-    [18733, 59499], [28439, 59703], [59704, 160009], [28838, 59746],
-    [59752, 150095], [32357, 59753], [23855, 59755], [15859, 59756],
-    [59758, 150109], [59759, 137183], [32164, 59760], [33830, 59761],
-    [21637, 59762], [59763, 146170], [59765, 131604], [22398, 59766],
-    [59767, 133333], [59768, 132633], [16357, 59769], [59770, 139166],
-    [59771, 172726], [28675, 59772], [59773, 168283], [23920, 59774],
-    [29583, 59775], [59777, 166489], [59778, 168992], [20424, 59779],
-    [32743, 59780], [29456, 59782], [29496, 59784], [29505, 59787],
-    [16041, 59789], [29173, 59792], [59793, 149746], [29665, 59794],
-    [16074, 59796], [16081, 59798], [29721, 59801], [29726, 59802],
-    [29727, 59803], [16098, 59804], [16112, 59805], [16116, 59806],
-    [16122, 59807], [29907, 59808], [16142, 59809], [16211, 59810],
-    [30061, 59812], [30066, 59813], [30093, 59814], [16252, 59815],
-    [30152, 59816], [30285, 59819], [30324, 59821], [16348, 59822],
-    [30330, 59823], [29064, 59825], [22051, 59826], [35200, 59827],
-    [16413, 59829], [30531, 59830], [16441, 59831], [16453, 59833],
-    [13787, 59834], [30616, 59835], [16490, 59836], [16495, 59837],
-    [30654, 59839], [30667, 59840], [30744, 59842], [30748, 59844],
-    [30791, 59847], [30801, 59848], [30822, 59849], [33864, 59850],
-    [59851, 152885], [31027, 59852], [31026, 59854], [16649, 59856],
-    [31121, 59857], [31238, 59860], [16743, 59862], [16818, 59864],
-    [31420, 59865], [33401, 59866], [16836, 59867], [31439, 59868],
-    [31451, 59869], [16847, 59870], [31586, 59872], [31596, 59873],
-    [31611, 59874], [31762, 59875], [16992, 59877], [17018, 59878],
-    [31867, 59879], [31900, 59880], [17036, 59881], [31928, 59882],
-    [17044, 59883], [36755, 59885], [28864, 59886], [59887, 134351],
-    [32207, 59888], [32212, 59889], [32208, 59890], [32253, 59891],
-    [32692, 59893], [29343, 59894], [17303, 59895], [32800, 59896],
-    [32805, 59897], [32814, 59899], [32817, 59900], [32852, 59901],
-    [22452, 59903], [28832, 59904], [32951, 59905], [33001, 59906],
-    [17389, 59907], [33036, 59908], [33038, 59910], [33042, 59911],
-    [33044, 59913], [17409, 59914], [15161, 59915], [33110, 59916],
-    [33113, 59917], [33114, 59918], [17427, 59919], [33148, 59921],
-    [17445, 59923], [17453, 59925], [33189, 59926], [22511, 59927],
-    [33217, 59928], [33252, 59929], [33364, 59930], [17551, 59931],
-    [33398, 59933], [33482, 59934], [33496, 59935], [17584, 59937],
-    [33623, 59938], [38505, 59939], [33797, 59941], [28917, 59942],
-    [33892, 59943], [33928, 59945], [17668, 59946], [33982, 59947],
-    [34017, 59948], [34040, 59949], [34064, 59950], [34104, 59951],
-    [34130, 59952], [17723, 59953], [34159, 59954], [34160, 59955],
-    [34272, 59956], [17783, 59957], [34418, 59958], [34450, 59959],
-    [34543, 59961], [38469, 59962], [17926, 59964], [17943, 59965],
-    [34990, 59966], [35071, 59967], [35108, 59968], [35217, 59970],
-    [59971, 162151], [35384, 59973], [35476, 59974], [35508, 59975],
-    [35921, 59976], [36052, 59977], [36082, 59978], [36124, 59979],
-    [18328, 59980], [36291, 59982], [18413, 59983], [36410, 59985],
-    [22356, 59987], [22005, 59989], [18487, 59991], [36558, 59992],
-    [36578, 59993], [36580, 59994], [36589, 59995], [36594, 59996],
-    [36801, 59998], [36810, 59999], [36812, 60000], [36915, 60001],
-    [18605, 60003], [39136, 60004], [37395, 60005], [18718, 60006],
-    [37416, 60007], [37464, 60008], [37483, 60009], [37553, 60010],
-    [37550, 60011], [37567, 60012], [37603, 60013], [37611, 60014],
-    [37619, 60015], [37620, 60016], [37629, 60017], [37699, 60018],
-    [37764, 60019], [37805, 60020], [18757, 60021], [18769, 60022],
-    [37911, 60024], [37917, 60026], [37933, 60027], [37950, 60028],
-    [18794, 60029], [37972, 60030], [38009, 60031], [38189, 60032],
-    [38306, 60033], [18855, 60034], [38388, 60035], [38451, 60036],
-    [18917, 60037], [18980, 60039], [38720, 60040], [18997, 60041],
-    [38834, 60042], [38850, 60043], [19172, 60045], [39097, 60047],
-    [19225, 60048], [39153, 60049], [22596, 60050], [39193, 60052],
-    [39223, 60055], [39261, 60057], [39266, 60058], [19312, 60059],
-    [39365, 60060], [19357, 60061], [39484, 60062], [39695, 60063],
-    [39785, 60065], [39901, 60067], [39921, 60068], [39924, 60069],
-    [19565, 60070], [39968, 60071], [14191, 60072], [60073, 138178],
-    [40265, 60074], [40702, 60076], [22096, 60077], [40381, 60079],
-    [40444, 60081], [38134, 60082], [36790, 60083], [40625, 60086],
-    [40637, 60087], [40646, 60088], [38108, 60089], [40674, 60090],
-    [40689, 60091], [40696, 60092], [40772, 60094], [60095, 131220],
-    [60096, 131767], [60097, 132000], [38083, 60099], [60101, 132311],
-    [38081, 60103], [60105, 132565], [60106, 132629], [60107, 132726],
-    [60108, 136890], [22359, 60109], [29043, 60110], [60111, 133826],
-    [60112, 133837], [60113, 134079], [60115, 194619], [60116, 134091],
-    [21662, 60117], [60118, 134139], [60119, 134203], [60120, 134227],
-    [60121, 134245], [60122, 134268], [60124, 134285], [60126, 134325],
-    [60127, 134365], [60128, 134381], [60129, 134511], [60130, 134578],
-    [60131, 134600], [60135, 134660], [60136, 134670], [60137, 134871],
-    [60138, 135056], [60139, 134957], [60140, 134771], [60142, 135100],
-    [60144, 135260], [60145, 135247], [60146, 135286], [60149, 135304],
-    [60150, 135318], [13895, 60151], [60152, 135359], [60154, 135471],
-    [60155, 135483], [21348, 60156], [60158, 135907], [60159, 136053],
-    [60160, 135990], [60162, 136567], [60163, 136729], [60164, 137155],
-    [60165, 137159], [28859, 60167], [60168, 137261], [60169, 137578],
-    [60170, 137773], [60171, 137797], [60172, 138282], [60173, 138352],
-    [60174, 138412], [60175, 138952], [60177, 138965], [60178, 139029],
-    [29080, 60179], [60181, 139333], [27113, 60182], [14024, 60183],
-    [60184, 139900], [60185, 140247], [60186, 140282], [60187, 141098],
-    [60188, 141425], [60189, 141647], [60191, 141671], [60192, 141715],
-    [60193, 142037], [60195, 142056], [60197, 142094], [60199, 142143],
-    [60202, 142412], [60204, 142472], [60205, 142519], [60206, 154600],
-    [60207, 142600], [60208, 142610], [60209, 142775], [60210, 142741],
-    [60211, 142914], [60212, 143220], [60213, 143308], [60214, 143411],
-    [60215, 143462], [60216, 144159], [60217, 144350], [60222, 144743],
-    [60223, 144883], [60227, 144922], [60228, 145174], [22709, 60231],
-    [60234, 146087], [60237, 146961], [60238, 147129], [60243, 147737],
-    [60245, 148206], [60246, 148237], [60248, 148276], [60249, 148374],
-    [60258, 148484], [60259, 148694], [22408, 60260], [60261, 149108],
-    [60263, 149295], [60271, 149522], [60272, 149755], [60273, 150037],
-    [60275, 150208], [22885, 60277], [60279, 151430], [60282, 151596],
-    [22335, 60284], [60286, 152217], [60287, 152601], [60291, 152646],
-    [60292, 152686], [60296, 152895], [60298, 152926], [60300, 152930],
-    [60301, 152934], [60302, 153543], [60304, 153693], [60309, 153859],
-    [60312, 154286], [60313, 154505], [60314, 154630], [22433, 60316],
-    [29009, 60317], [60319, 155906], [60322, 156082], [60325, 156674],
-    [60326, 156746], [60330, 156804], [60334, 156808], [60336, 156946],
-    [60338, 157119], [60339, 157365], [22201, 60347], [60349, 157436],
-    [13848, 60355], [60357, 157593], [60358, 157806], [60360, 157790],
-    [60362, 157895], [60366, 157990], [60368, 158009], [60371, 158202],
-    [60373, 158253], [60378, 158260], [60379, 158555], [60383, 158621],
-    [60385, 158884], [60388, 159150], [60392, 159819], [60393, 160205],
-    [60395, 160384], [60396, 160389], [60399, 160395], [60401, 160486],
-    [38047, 60404], [60405, 160848], [14009, 60416], [60424, 161740],
-    [60425, 161880], [22230, 60426], [60435, 162269], [60441, 162301],
-    [60442, 162314], [60443, 162571], [60444, 163174], [60448, 163849],
-    [60459, 163875], [60463, 163912], [60466, 163971], [60479, 163984],
-    [60480, 164084], [60481, 164142], [60483, 164175], [60485, 164271],
-    [60486, 164378], [60487, 164614], [60488, 164655], [60489, 164746],
-    [60491, 164968], [60492, 165546], [25574, 60494], [60495, 166230],
-    [60498, 166328], [60500, 166375], [60502, 166376], [60503, 166726],
-    [60504, 166868], [60506, 166921], [60508, 167877], [60509, 168172],
-    [60511, 168208], [60512, 168252], [15863, 60513], [60514, 168286],
-    [60515, 150218], [36816, 60516], [60519, 169191], [60521, 169392],
-    [60522, 169400], [60523, 169778], [60524, 170193], [60525, 170313],
-    [60526, 170346], [60527, 170435], [60528, 170536], [60529, 170766],
-    [60530, 171354], [60531, 171419], [32415, 60532], [60533, 171768],
-    [60534, 171811], [19620, 60535], [38215, 60536], [60537, 172691],
-    [29090, 60538], [60539, 172799], [60542, 173515], [19868, 60543],
-    [60544, 134300], [36798, 60545], [36794, 60547], [60548, 140464],
-    [36793, 60549], [60550, 150163], [20202, 60555], [60557, 166700],
-    [36480, 60560], [60561, 137205], [60563, 166764], [60564, 166809],
-    [60566, 157359], [60568, 161365], [60570, 153141], [60571, 153942],
-    [20122, 60572], [60573, 155265], [60576, 134765], [60579, 147080],
-    [60580, 150686], [60583, 137206], [60584, 137339], [60587, 154698],
-    [60589, 152337], [15814, 60590], [60596, 155352], [19996, 60600],
-    [60601, 135146], [60602, 134473], [60603, 145082], [60638, 151880],
-    [21982, 60644], [34694, 60672], [60676, 135361], [60679, 149254],
-    [23440, 60680], [60682, 157843], [60684, 141044], [60685, 163119],
-    [60686, 147875], [60687, 163187], [60688, 159440], [60689, 160438],
-    [60691, 135641], [60693, 146684], [60694, 173737], [60695, 134828],
-    [60698, 138402], [60700, 151490], [60702, 135147], [60706, 142752],
-    [60710, 135148], [60711, 134666], [60714, 135149], [60717, 135559],
-    [19994, 60721], [19972, 60722], [23309, 60724], [13996, 60727],
-    [21373, 60729], [13989, 60730], [22682, 60732], [60733, 150382],
-    [22442, 60736], [60737, 154261], [60738, 133497], [60741, 140389],
-    [60746, 146686], [60747, 171824], [60749, 151465], [60750, 169374],
-    [60753, 146870], [60755, 157619], [60756, 145184], [60759, 147191],
-    [60760, 146988], [60785, 143578], [60789, 135849], [22439, 60790],
-    [60791, 149859], [60794, 159918], [60801, 137068], [60806, 160100],
-    [60809, 159010], [60810, 150242], [39963, 60837], [60838, 149822],
-    [15878, 60846], [60881, 159011], [60887, 132092], [60891, 146685],
-    [60893, 149785], [22394, 60904], [21722, 60912], [29050, 60928],
-    [60949, 150135], [60955, 166490], [60962, 194624], [60976, 137275],
-    [61000, 155993], [61014, 144373], [61019, 166850], [61024, 138566],
-    [61054, 159441], [13877, 61065], [61084, 166701], [21024, 61088],
-    [15384, 61089], [61090, 146631], [61091, 155351], [61092, 161366],
-    [61093, 152881], [61094, 137540], [61096, 170243], [61097, 159196],
-    [61098, 159917], [61100, 156077], [61101, 166415], [61102, 145015],
-    [61103, 131310], [61104, 157766], [61105, 151310], [17762, 61106],
-    [23327, 61107], [61108, 156492], [40784, 61109], [40614, 61110],
-    [61111, 156267], [20962, 57415], [21314, 57416], [26285, 57520],
-    [22620, 57547], [21843, 57566], [15749, 57594], [24928, 57608],
-    [18606, 57668], [38845, 57676], [57693, 137335], [24755, 57703],
-    [33828, 57711], [38932, 57748], [57749, 147596], [57764, 143486],
-    [57787, 138813], [15147, 57798], [15666, 57824], [57857, 132021],
-    [28801, 57944], [23708, 57959], [58017, 132547], [14128, 58028],
-    [58096, 136054], [58097, 150034], [58111, 166699], [58112, 155779],
-    [256, 62233], [193, 62234], [461, 62235], [192, 62236], [274, 62237],
-    [201, 62238], [282, 62239], [200, 62240], [332, 62241], [211, 62242],
-    [465, 62243], [210, 62244], 62245, [7870, 62246], 62247, [7872, 62248],
-    [202, 62249], [257, 62250], [225, 62251], [462, 62252], [224, 62253],
-    [593, 62254], [275, 62255], [233, 62256], [283, 62257], [232, 62258],
-    [299, 62259], [237, 62260], [464, 62261], [236, 62262], [333, 62263],
-    [243, 62264], [466, 62265], [242, 62266], [363, 62267], [250, 62268],
-    [468, 62269], [249, 62270], [470, 62271], [472, 62272], [474, 62273],
-    [476, 62274], [252, 62275], 62276, [7871, 62277], 62278, [7873, 62279],
-    [234, 62280], [609, 62281], [643, 63551], [592, 63552], [603, 63553],
-    [596, 63554], [629, 63555], [339, 63556], [248, 63557], [331, 63558],
-    [650, 63559], [618, 63560], {f: 2, c: 62282}, [11933, 63530],
-    [11974, 63539], [12003, 63547], 20539, 28158, [62841, 171123], 62842,
-    [15817, 62843], 34959, [62845, 147790], 28791, 23797, [19232, 62848],
-    [62849, 152013], [13657, 62850], [62851, 154928], 24866, [62853, 166450],
-    36775, 37366, 29073, 26393, 29626, [62859, 144001], [62860, 172295],
-    [15499, 62861], [62862, 137600], [19216, 62863], 30948, 29698, 20910,
-    [62867, 165647], [16393, 62868], 27235, [62870, 172730], [16931, 62871],
-    34319, 31274, [62875, 170311], [62876, 166634], 38741, 28749, 21284,
-    [62880, 139390], 37876, 30425, [62883, 166371], 62884, 30685, 20131, 20464,
-    20668, 20015, 20247, 62891, 21556, 32139, 22674, 22736, [62896, 138678],
-    24210, 24217, 24514, [62900, 141074], 25995, [62902, 144377], 26905, 27203,
-    [62905, 146531], 27903, 29184, [62909, 148741], 29580, [16091, 62911],
-    [62912, 150035], 23317, 29881, 35715, [62916, 154788], [62917, 153237],
-    31379, 31724, 31939, 32364, 33528, 34199, 62924, 34960, 62926, 36537,
-    62928, 36815, 34143, 39392, 37409, 62933, [62934, 167353], [62935, 136255],
-    [16497, 62936], [17058, 62937], 23066, 39016, 26475, [17014, 62944], 22333,
-    34262, [62948, 149883], 33471, [62950, 160013], [19585, 62951],
-    [62952, 159092], 23931, [62954, 158485], [62955, 159678], {f: 2, c: 62956},
-    23446, 62959, 32347],
-  'Adobe-GB1': [{f: 95, c: 32}, {f: 3, c: 12288}, [183, 12539], 713, 711, 168,
-    12291, 12293, 8212, 65374, 8214, [8230, 8943], {f: 2, c: 8216},
-    {f: 2, c: 8220}, {f: 2, c: 12308}, {f: 8, c: 12296}, {f: 2, c: 12310},
-    {f: 2, c: 12304}, 177, 215, 247, 8758, {f: 2, c: 8743}, 8721, 8719, 8746,
-    8745, 8712, 8759, 8730, 8869, 8741, 8736, 8978, 8857, 8747, 8750, 8801,
-    8780, 8776, 8765, 8733, 8800, {f: 2, c: 8814}, {f: 2, c: 8804}, 8734, 8757,
-    8756, 9794, 9792, 176, {f: 2, c: 8242}, 8451, 65284, 164, {f: 2, c: 65504},
-    8240, 167, 8470, 9734, 9733, 9675, 9679, 9678, 9671, 9670, 9633, 9632,
-    9651, 9650, 8251, 8594, {f: 2, c: 8592}, 8595, 12307, {f: 20, c: 9352},
-    {f: 20, c: 9332}, {f: 10, c: 9312}, {f: 10, c: 12832}, {f: 12, c: 8544},
-    {f: 3, c: 65281}, 65509, {f: 89, c: 65285}, 65507, {f: 83, c: 12353},
-    {f: 86, c: 12449}, {f: 17, c: 913}, {f: 7, c: 931}, {f: 17, c: 945},
-    {f: 7, c: 963}, {f: 7, c: 59277}, {f: 2, c: 65077}, {f: 2, c: 65081},
-    {f: 2, c: 65087}, {f: 2, c: 65085}, {f: 4, c: 65089}, {f: 2, c: 59284},
-    {f: 2, c: 65083}, {f: 2, c: 65079}, 65073, 59286, {f: 2, c: 65075},
-    {f: 6, c: 1040}, 1025, {f: 32, c: 1046}, 1105, {f: 26, c: 1078}, 257, 225,
-    462, 224, 275, 233, 283, 232, 299, 237, 464, 236, 333, 243, 466, 242, 363,
-    250, 468, 249, 470, 472, 474, 476, 252, 234, 593, 7743, 324, 328, 505, 609,
-    {f: 37, c: 12549}, 0, {f: 76, c: 9472}, {s: 126}, 21834, 38463, 22467,
-    25384, 21710, 21769, 21696, 30353, 30284, 34108, 30702, 33406, 30861,
-    29233, 38552, 38797, 27688, 23433, 20474, 25353, 26263, 23736, 33018,
-    26696, 32942, 26114, 30414, 20985, 25942, 29100, 32753, 34948, 20658,
-    22885, 25034, 28595, 33453, 25420, 25170, 21485, 21543, 31494,
-    [12043, 20843], 30116, 24052, 25300, 36299, 38774, 25226, 32793, 22365,
-    38712, 32610, 29240, [12137, 30333], 26575, 30334, 25670, 20336, 36133,
-    25308, 31255, 26001, 29677, 25644, 25203, 33324, 39041, 26495, 29256,
-    25198, 25292, 20276, 29923, 21322, 21150, 32458, 37030, 24110, 26758,
-    27036, 33152, 32465, 26834, 30917, 34444, 38225, 20621, 35876, 33502,
-    32990, 21253, 35090, 21093, 34180, 38649, 20445, 22561, 39281, 23453,
-    25265, 25253, 26292, 35961, 40077, 29190, 26479, 30865, 24754, 21329,
-    21271, 36744, 32972, 36125, 38049, 20493, 29384, 22791, 24811, 28953,
-    34987, 22868, 33519, 26412, 31528, 23849, 32503, 29997, 27893, 36454,
-    36856, 36924, [12240, 40763], [12112, 27604], 37145, 31508, 24444, 30887,
-    34006, 34109, 27605, 27609, 27606, 24065, 24199, 30201, 38381, 25949,
-    24330, 24517, 36767, 22721, 33218, 36991, 38491, 38829, 36793, 32534,
-    36140, 25153, 20415, 21464, 21342, {f: 2, c: 36776}, 36779, 36941, 26631,
-    24426, 33176, 34920, 40150, 24971, 21035, 30250, 24428, 25996, 28626,
-    28392, 23486, 25672, 20853, 20912, 26564, 19993, 31177, 39292, 28851,
-    30149, 24182, 29627, 33760, 25773, 25320, 38069, 27874, 21338, 21187,
-    25615, 38082, 31636, 20271, 24091, 33334, 33046, 33162, 28196, 27850,
-    39539, 25429, [12056, 21340], 21754, 34917, 22496, 19981, 24067, 27493,
-    31807, 37096, 24598, 25830, 29468, 35009, 26448, 25165, 36130, 30572,
-    36393, 37319, 24425, 33756, 34081, 39184, 21442, 34453, 27531, 24813,
-    24808, 28799, 33485, 33329, 20179, 27815, 34255, 25805, 31961, 27133,
-    26361, 33609, 21397, 31574, 20391, 20876, 27979, 23618, 36461, 25554,
-    21449, 33580, 33590, 26597, 30900, 25661, 23519, 23700, 24046, 35815,
-    25286, 26612, 35962, 25600, 25530, 34633, 39307, 35863, 32544, 38130,
-    20135, 38416, 39076, 26124, 29462, 22330, 23581, 24120, 38271, 20607,
-    32928, [12058, 21378], 25950, 30021, 21809, 20513, 36229, 25220, 38046,
-    26397, 22066, 28526, 24034, 21557, 28818, 36710, 25199, 25764, 25507,
-    24443, 28552, 37108, [12162, 33251], [12192, 36784], 23576, 26216, 24561,
-    27785, 38472, 36225, 34924, 25745, 31216, 22478, 27225, 25104, 21576,
-    20056, 31243, 24809, 28548, 35802, 25215, 36894, 39563, 31204, 21507,
-    30196, 25345, 21273, 27744, 36831, 24347, 39536, 32827, 40831, 20360,
-    23610, [12186, 36196], 32709, 26021, 28861, 20805, 20914, [12173, 34411],
-    23815, 23456, 25277, 37228, 30068, 36364, 31264, 24833, 31609, 20167,
-    32504, 30597, 19985, 33261, 21021, 20986, 27249, 21416, 36487, 38148,
-    38607, 28353, 38500, 26970, 30784, 20648, 30679, 25616, 35302, 22788,
-    25571, 24029, 31359, 26941, 20256, 33337, 21912, 20018, 30126, 31383,
-    24162, 24202, 38383, 21019, 21561, 28810, 25462, 38180, 22402, 26149,
-    26943, 37255, 21767, 28147, 32431, 34850, 25139, 32496, 30133, 33576,
-    30913, 38604, 36766, 24904, 29943, 35789, 27492, 21050, 36176, 27425,
-    32874, 33905, 22257, 21254, 20174, 19995, 20945, 31895, 37259, 31751,
-    20419, 36479, 31713, 31388, 25703, 23828, 20652, 33030, 30209, 31929,
-    28140, 32736, 26449, 23384, [12072, 23544], 30923, 25774, 25619, 25514,
-    25387, 38169, 25645, 36798, 31572, 30249, 25171, [12068, 22823], 21574,
-    [12109, 27513], 20643, 25140, 24102, 27526, 20195, 36151, 34955, 24453,
-    36910, 24608, 32829, 25285, 20025, 21333, 37112, 25528, 32966, 26086,
-    27694, 20294, 24814, 28129, 35806, 24377, 34507, 24403, 25377, 20826,
-    33633, 26723, [12049, 20992], 25443, 36424, 20498, 23707, 31095, 23548,
-    21040, 31291, 24764, 36947, 30423, 24503, 24471, 30340, 36460, 28783,
-    30331, 31561, 30634, 20979, 37011, 22564, 20302, 28404, 36842, 25932,
-    31515, 29380, 28068, 32735, 23265, 25269, 24213, 22320, 33922, 31532,
-    24093, 24351, 36882, 32532, 39072, 25474, 28359, 30872, 28857, 20856,
-    38747, 22443, 30005, 20291, 30008, 24215, 24806, 22880, 28096, 27583,
-    30857, 21500, 38613, 20939, 20993, 25481, 21514, 38035, 35843, 36300,
-    29241, 30879, 34678, 36845, 35853, 21472, 19969, 30447, 21486, 38025,
-    39030, [12237, 40718], 38189, 23450, 35746, 20002, 19996, 20908, 33891,
-    25026, 21160, 26635, 20375, 24683, 20923, 27934, 20828, 25238,
-    [12099, 26007], 38497, [12182, 35910], 36887, 30168, 37117, 30563, 27602,
-    29322, 29420, 35835, 22581, 30585, 36172, 26460, 38208, 32922, 24230,
-    28193, 22930, 31471, 30701, 38203, 27573, 26029, 32526, 22534, 20817,
-    38431, 23545, 22697, 21544, 36466, 25958, 39039, 22244, 38045, 30462,
-    36929, 25479, 21702, 22810, 22842, 22427, 36530, 26421, 36346, 33333,
-    21057, 24816, 22549, 34558, 23784, 40517, 20420, 39069, 35769, 23077,
-    24694, 21380, 25212, 36943, 37122, 39295, 24681, [12157, 32780],
-    [12041, 20799], [12159, 32819], 23572, 39285, 27953, [12038, 20108], 36144,
-    21457, 32602, 31567, 20240, 20047, 38400, 27861, 29648, 34281, 24070,
-    30058, 32763, 27146, 30718, 38034, 32321, 20961, 28902, 21453, 36820,
-    33539, 36137, 29359, 39277, 27867, 22346, 33459, [12101, 26041], 32938,
-    25151, 38450, 22952, 20223, 35775, 32442, 25918, 33778, [12206, 38750],
-    21857, 39134, 32933, 21290, 35837, 21536, 32954, 24223, 27832, 36153,
-    33452, 37210, 21545, 27675, 20998, 32439, 22367, 28954, 27774, 31881,
-    22859, 20221, 24575, 24868, 31914, 20016, 23553, 26539, 34562, 23792,
-    38155, 39118, 30127, 28925, 36898, 20911, 32541, 35773, 22857, 20964,
-    20315, 21542, 22827, 25975, 32932, 23413, 25206, 25282, 36752, 24133,
-    27679, 31526, 20239, 20440, 26381, 28014, 28074, 31119, 34993, 24343,
-    29995, 25242, 36741, 20463, 37340, 26023, 33071, 33105, 24220, 33104,
-    36212, 21103, 35206, 36171, 22797, 20613, 20184, [12201, 38428],
-    [12119, 29238], 33145, 36127, 23500, 35747, 38468, 22919, 32538, 21648,
-    22134, 22030, 35813, 25913, 27010, 38041, 30422, 28297, [12082, 24178],
-    [12130, 29976], 26438, 26577, 31487, 32925, 36214, 24863, 31174, 25954,
-    36195, 20872, 21018, 38050, 32568, 32923, 32434, 23703, 28207, 26464,
-    31705, 30347, [12220, 39640], 33167, 32660, 31957, 25630, 38224, 31295,
-    21578, 21733, 27468, 25601, [12093, 25096], 40509, 33011, 30105, 21106,
-    [12208, 38761], 33883, 26684, 34532, 38401, 38548, 38124, 20010, 21508,
-    32473, 26681, 36319, 32789, 26356, 24218, 32697, 22466, 32831, 26775,
-    [12079, 24037], 25915, 21151, 24685, 40858, 20379, 36524, 20844, 23467,
-    [12088, 24339], 24041, 27742, 25329, 36129, 20849, 38057, 21246, 27807,
-    33503, 29399, 22434, 26500, 36141, 22815, 36764, 33735, 21653, 31629,
-    20272, 27837, 23396, 22993, [12238, 40723], 21476, 34506, [12219, 39592],
-    [12181, 35895], 32929, 25925, 39038, 22266, 38599, 21038, [12128, 29916],
-    21072, 23521, 25346, 35074, 20054, 25296, 24618, 26874, 20851, 23448,
-    20896, 35266, 31649, 39302, 32592, 24815, 28748, 36143, 20809,
-    [12084, 24191], 36891, 29808, 35268, 22317, 30789, 24402, 40863, 38394,
-    36712, [12225, 39740], 35809, 30328, 26690, 26588, 36330, 36149, 21053,
-    36746, 28378, 26829, 38149, 37101, 22269, 26524, 35065, 36807, 21704,
-    39608, 23401, 28023, 27686, 20133, 23475, 39559, 37219, 25000, 37039,
-    38889, 21547, 28085, 23506, 20989, 21898, 32597, 32752, 25788, 25421,
-    26097, 25022, 24717, 28938, 27735, 27721, 22831, 26477, 33322, 22741,
-    22158, 35946, 27627, 37085, 22909, 32791, 21495, 28009, 21621, 21917,
-    33655, 33743, 26680, [12146, 31166], 21644, 20309, 21512, 30418, 35977,
-    38402, 27827, 28088, 36203, 35088, 40548, 36154, 22079, [12234, 40657],
-    30165, 24456, 29408, 24680, 21756, 20136, 27178, 34913, 24658, 36720,
-    21700, 28888, 34425, 40511, 27946, 23439, 24344, 32418, 21897, 20399,
-    29492, 21564, 21402, 20505, 21518, 21628, 20046, 24573, 29786, 22774,
-    33899, 32993, 34676, 29392, 31946, 28246, 24359, 34382, 21804, 25252,
-    20114, 27818, 25143, 33457, 21719, 21326, 29502, 28369, 30011, 21010,
-    21270, 35805, 27088, 24458, 24576, 28142, 22351, 27426, 29615, 26707,
-    36824, 32531, 25442, 24739, 21796, 30186, 35938, 28949, 28067, 23462,
-    24187, 33618, 24908, 40644, 30970, 34647, 31783, 30343, 20976, 24822,
-    29004, 26179, 24140, 24653, 35854, 28784, 25381, 36745, 24509, 24674,
-    34516, 22238, 27585, 24724, 24935, 21321, 24800, 26214, 36159, 31229,
-    20250, 28905, 27719, 35763, 35826, 32472, 33636, 26127, 23130, 39746,
-    27985, 28151, 35905, 27963, 20249, [12117, 28779], 33719, 25110, 24785,
-    38669, 36135, 31096, 20987, 22334, 22522, 26426, 30072, 31293, 31215,
-    31637, 32908, 39269, 36857, 28608, 35749, 40481, 23020, 32489, 32521,
-    21513, 26497, 26840, 36753, 31821, 38598, 21450, 24613, 30142, 27762,
-    21363, 23241, 32423, 25380, [12047, 20960], 33034, [12080, 24049], 34015,
-    25216, 20864, 23395, 20238, 31085, 21058, 24760, 27982, 23492, 23490,
-    35745, 35760, 26082, 24524, 38469, 22931, 32487, 32426, 22025, 26551,
-    22841, 20339, 23478, 21152, 33626, 39050, 36158, 30002, 38078, 20551,
-    31292, 20215, 26550, 39550, 23233, 27516, 30417, 22362, 23574, 31546,
-    38388, 29006, 20860, 32937, 33392, 22904, 32516, 33575, 26816, 26604,
-    30897, 30839, 25315, 25441, 31616, 20461, 21098, 20943, 33616, 27099,
-    37492, 36341, 36145, 35265, 38190, 31661, 20214, 20581, 33328, 21073,
-    39279, 28176, 28293, 28071, 24314, 20725, 23004, 23558, 27974, 27743,
-    30086, 33931, 26728, 22870, 35762, 21280, 37233, 38477, 34121, 26898,
-    30977, 28966, 33014, 20132, 37066, 27975, 39556, 23047, 22204, 25605,
-    38128, 30699, 20389, 33050, 29409, [12179, 35282], 39290, 32564, 32478,
-    21119, 25945, 37237, 36735, 36739, 21483, 31382, 25581, 25509, 30342,
-    31224, 34903, 38454, 25130, 21163, 33410, 26708, 26480, 25463, 30571,
-    31469, 27905, 32467, 35299, 22992, 25106, 34249, 33445, 30028, 20511,
-    20171, 30117, 35819, 23626, [12081, 24062], 31563, [12100, 26020],
-    [12198, 37329], 20170, 27941, 35167, 32039, 38182, 20165, 35880, 36827,
-    38771, 26187, 31105, 36817, 28908, 28024, 23613, 21170, 33606, 20834,
-    33550, 30555, 26230, 40120, 20140, 24778, 31934, 31923, 32463, 20117,
-    35686, 26223, 39048, 38745, 22659, 25964, 38236, 24452, 30153, 38742,
-    31455, 31454, 20928, 28847, 31384, 25578, 31350, 32416, 29590,
-    [12210, 38893], 20037, 28792, 20061, 37202, 21417, 25937, 26087,
-    [12165, 33276], 33285, 21646, 23601, 30106, 38816, 25304, 29401, 30141,
-    23621, 39545, 33738, 23616, 21632, 30697, 20030, 27822, 32858, 25298,
-    25454, 24040, 20855, 36317, 36382, 38191, 20465, 21477, 24807, 28844,
-    21095, 25424, 40515, 23071, 20518, 30519, 21367, 32482, 25733, 25899,
-    25225, 25496, 20500, 29237, 35273, 20915, 35776, 32477, 22343, 33740,
-    38055, 20891, 21531, 23803, 20426, 31459, 27994, 37089, 39567, 21888,
-    21654, 21345, 21679, 24320, 25577, 26999, 20975, 24936, 21002, 22570,
-    21208, 22350, 30733, 30475, 24247, 24951, 31968, 25179, 25239, 20130,
-    28821, 32771, 25335, 28900, 38752, 22391, 33499, 26607, 26869, 30933,
-    39063, 31185, 22771, 21683, 21487, 28212, 20811, 21051, 23458, 35838,
-    32943, 21827, 22438, 24691, 22353, 21549, 31354, 24656, 23380, 25511,
-    25248, [12061, 21475], 25187, 23495, 26543, 21741, 31391, 33510, 37239,
-    24211, 35044, 22840, 22446, 25358, 36328, 33007, 22359, 31607, 20393,
-    24555, 23485, 27454, 21281, 31568, 29378, 26694, 30719, 30518, 26103,
-    20917, 20111, 30420, 23743, 31397, 33909, 22862, 39745, 20608, 39304,
-    24871, 28291, 22372, 26118, 25414, 22256, 25324, 25193, 24275, 38420,
-    22403, 25289, 21895, 34593, 33098, 36771, 21862, 33713, 26469, 36182,
-    34013, 23146, 26639, 25318, 31726, 38417, 20848, 28572, 35888, 25597,
-    35272, 25042, 32518, 28866, 28389, 29701, 27028, 29436, 24266, 37070,
-    26391, 28010, 25438, 21171, 29282, [12156, 32769], 20332, 23013, 37226,
-    28889, 28061, 21202, 20048, 38647, 38253, 34174, 30922, 32047, 20769,
-    22418, 25794, 32907, 31867, 27882, 26865, 26974, 20919, 21400, 26792,
-    29313, 40654, 31729, 29432, 31163, 28435, 29702, 26446, [12197, 37324],
-    40100, 31036, 33673, 33620, 21519, 26647, 20029, 21385, 21169, 30782,
-    21382, 21033, 20616, 20363, 20432, 30178, [12148, 31435], 31890, 27813,
-    [12202, 38582], [12050, 21147], 29827, 21737, 20457, 32852, 33714, 36830,
-    38256, 24265, 24604, 28063, 24088, 25947, 33080, 38142, 24651, 28860,
-    32451, 31918, 20937, 26753, 31921, 33391, 20004, 36742, 37327, 26238,
-    20142, 35845, 25769, 32842, 20698, 30103, 29134, 23525, 36797, 28518,
-    20102, 25730, 38243, 24278, 26009, 21015, 35010, 28872, 21155, 29454,
-    29747, 26519, 30967, 38678, 20020, 37051, 40158, 28107, 20955, 36161,
-    21533, 25294, 29618, 33777, 38646, 40836, 38083, 20278, 32666, 20940,
-    28789, 38517, 23725, 39046, 21478, 20196, 28316, 29705, 27060, 30827,
-    39311, 30041, 21016, 30244, 27969, 26611, 20845, 40857, 32843, 21657,
-    31548, 31423, 38534, 22404, 25314, 38471, 27004, 23044, 25602, 31699,
-    28431, 38475, 33446, 21346, 39045, 24208, 28809, 25523, 21348, 34383,
-    40065, 40595, 30860, 38706, 36335, 36162, [12229, 40575], 28510, 31108,
-    24405, 38470, 25134, 39540, 21525, 38109, 20387, 26053, 23653, 23649,
-    32533, 34385, 27695, 24459, 29575, 28388, 32511, 23782, 25371, 23402,
-    28390, 21365, 20081, 25504, 30053, 25249, 36718, 20262, 20177, 27814,
-    32438, 35770, 33821, 34746, 32599, 36923, 38179, 31657, 39585, 35064,
-    33853, 27931, 39558, 32476, 22920, [12231, 40635], 29595, 30721, 34434,
-    39532, 39554, 22043, 21527, 22475, 20080, 40614, 21334, 36808, 33033,
-    30610, 39314, 34542, 28385, 34067, 26364, 24930, 28459, 35881, 33426,
-    33579, 30450, 27667, 24537, 33725, 29483, 33541, 38170, [12113, 27611],
-    [12141, 30683], 38086, 21359, 33538, 20882, 24125, 35980, 36152, 20040,
-    29611, 26522, 26757, 37238, 38665, 29028, 27809, 30473, 23186, 38209,
-    27599, 32654, 26151, 23504, 22969, 23194, 38376, 38391, 20204, 33804,
-    33945, 27308, 30431, 38192, 29467, 26790, 23391, 30511, 37274, 38753,
-    31964, 36855, 35868, 24357, [12150, 31859], 31192, 35269, 27852, 34588,
-    23494, 24130, 26825, 30496, 32501, 20885, 20813, 21193, 23081, 32517,
-    [12207, 38754], 33495, 25551, 30596, 34256, 31186, 28218, 24217, 22937,
-    34065, 28781, 27665, 25279, [12139, 30399], 25935, 24751, 38397, 26126,
-    34719, 40483, 38125, 21517, 21629, 35884, {f: 2, c: 25720}, 34321, 27169,
-    33180, 30952, 25705, 39764, 25273, 26411, 33707, 22696, 40664, 27819,
-    28448, 23518, 38476, 35851, 29279, 26576, 25287, 29281, 20137, 22982,
-    27597, 22675, 26286, 24149, 21215, 24917, [12106, 26408], [12140, 30446],
-    30566, 29287, 31302, 25343, 21738, 21584, 38048, 37027, 23068, 32435,
-    27670, 20035, 22902, 32784, 22856, 21335, 30007, 38590, 22218, 25376,
-    33041, 24700, 38393, 28118, 21602, 39297, 20869, 23273, 33021, 22958,
-    38675, 20522, 27877, 23612, 25311, 20320, 21311, 33147, 36870, 28346,
-    34091, 25288, 24180, 30910, 25781, 25467, 24565, 23064, 37247, 40479,
-    23615, 25423, 32834, 23421, 21870, 38218, 38221, 28037, 24744, 26592,
-    29406, 20957, 23425, 25319, 27870, [12124, 29275], 25197, 38062, 32445,
-    33043, 27987, 20892, 24324, 22900, 21162, 24594, [12069, 22899], 26262,
-    34384, 30111, 25386, 25062, 31983, 35834, 21734, 27431, 40485, 27572,
-    34261, 21589, 20598, 27812, 21866, 36276, 29228, 24085, 24597, 29750,
-    25293, 25490, 29260, 24472, 28227, 27966, 25856, 28504, 30424, 30928,
-    30460, 30036, 21028, 21467, 20051, 24222, 26049, 32810, 32982, 25243,
-    21638, 21032, 28846, 34957, 36305, 27873, 21624, 32986, 22521, 35060,
-    36180, 38506, 37197, 20329, 27803, 21943, 30406, 30768, 25256, 28921,
-    28558, 24429, 34028, 26842, 30844, 31735, 33192, 26379, 40527, 25447,
-    30896, 22383, 30738, 38713, 25209, 25259, 21128, 29749, 27607, 21860,
-    33086, 30130, [12138, 30382], 21305, 30174, 20731, 23617, 35692, 31687,
-    20559, [12122, 29255], 39575, 39128, 28418, 29922, 31080, 25735, 30629,
-    25340, 39057, 36139, 21697, 32856, 20050, 22378, 33529, 33805, 24179,
-    20973, 29942, 35780, 23631, 22369, 27900, 39047, 23110, 30772, 39748,
-    36843, 31893, 21078, 25169, 38138, 20166, 33670, 33889, 33769, 33970,
-    22484, 26420, 22275, 26222, 28006, 35889, 26333, 28689, 26399, 27450,
-    26646, 25114, 22971, 19971, 20932, 28422, 26578, 27791, 20854, 26827,
-    22855, 27495, 30054, 23822, 33040, 40784, 26071, 31048, 31041, 39569,
-    36215, 23682, 20062, 20225, 21551, 22865, 30732, 22120, [12115, 27668],
-    36804, 24323, 27773, 27875, 35755, 25488, 24688, 27965, 29301, 25190,
-    38030, 38085, 21315, 36801, 31614, 20191, 35878, 20094, 40660, 38065,
-    38067, 21069, 28508, 36963, 27973, 35892, 22545, 23884, [12107, 27424],
-    27465, 26538, 21595, 33108, 32652, 22681, 34103, 24378, 25250, 27207,
-    38201, 25970, 24708, 26725, 30631, 20052, 20392, 24039, 38808, 25772,
-    32728, 23789, 20431, 31373, 20999, 33540, 19988, 24623, 31363, 38054,
-    20405, 20146, 31206, 29748, 21220, 33465, 25810, 31165, 23517, 27777,
-    38738, 36731, 27682, 20542, 21375, 28165, 25806, 26228, 27696, 24773,
-    39031, 35831, 24198, 29756, 31351, 31179, 19992, 37041, 29699, 27714,
-    22234, 37195, 27845, 36235, 21306, 34502, 26354, 36527, 23624, 39537,
-    28192, 21462, 23094, 40843, 36259, 21435, 22280, 39079, 26435, 37275,
-    27849, 20840, 30154, 25331, [12125, 29356], 21048, 21149, 32570, 28820,
-    30264, 21364, 40522, 27063, 30830, 38592, 35033, 32676, 28982, 29123,
-    20873, 26579, 29924, 22756, 25880, 22199, 35753, 39286, 25200, 32469,
-    24825, 28909, 22764, 20161, [12040, 20154], 24525, 38887, 20219, 35748,
-    20995, 22922, 32427, 25172, 20173, [12103, 26085], 25102, 33592, 33993,
-    33635, 34701, 29076, 28342, 23481, 32466, 20887, 25545, 26580,
-    [12161, 32905], 33593, 34837, 20754, 23418, 22914, 36785, 20083, 27741,
-    [12042, 20837], 35109, 36719, 38446, 34122, 29790, 38160, 38384, 28070,
-    33509, 24369, 25746, 27922, 33832, 33134, 40131, 22622, 36187, 19977,
-    21441, 20254, 25955, 26705, 21971, 20007, 25620, 39578, 25195, 23234,
-    29791, [12170, 33394], 28073, 26862, 20711, 33678, 30722, 26432, 21049,
-    27801, 32433, 20667, 21861, 29022, 31579, 26194, 29642, 33515, 26441,
-    [12077, 23665], 21024, 29053, 34923, 38378, 38485, 25797, 36193, 33203,
-    21892, 27733, 25159, 32558, 22674, 20260, 21830, 36175, 26188, 19978,
-    23578, 35059, 26786, 25422, 31245, 28903, 33421, 21242, 38902, 23569,
-    21736, 37045, 32461, 22882, 36170, 34503, [12166, 33292], 33293, 36198,
-    25668, 23556, 24913, 28041, 31038, 35774, 30775, 30003, 21627, 20280,
-    [12189, 36523], 28145, 23072, 32453, 31070, 27784, 23457, 23158, 29978,
-    32958, 24910, 28183, 22768, [12131, 29983], 29989, 29298, 21319, 32499,
-    30465, 30427, 21097, 32988, 22307, 24072, 22833, 29422, 26045, 28287,
-    35799, [12075, 23608], 34417, [12055, 21313], [12143, 30707], 25342, 26102,
-    20160, [12215, 39135], 34432, 23454, 35782, 21490, [12142, 30690], 20351,
-    23630, 39542, 22987, 24335, [12144, 31034], [12064, 22763], 19990, 26623,
-    20107, 25325, 35475, 36893, 21183, 26159, 21980, 22124, 36866, 20181,
-    20365, 37322, 39280, [12114, 27663], 24066, 24643, 23460, 35270, 35797,
-    25910, [12095, 25163], [12216, 39318], 23432, 23551, 25480, 21806, 21463,
-    30246, 20861, 34092, 26530, 26803, 27530, 25234, 36755, 21460, 33298,
-    28113, 30095, 20070, 36174, 23408, 29087, 34223, 26257, 26329, 32626,
-    34560, [12233, 40653], [12239, 40736], 23646, 26415, 36848, 26641, 26463,
-    25101, 31446, 22661, 24246, 25968, 28465, 24661, 21047, 32781, 25684,
-    34928, 29993, 24069, 26643, 25332, 38684, 21452, 29245, 35841,
-    [12116, 27700], 30561, 31246, 21550, 30636, 39034, 33308, 35828, 30805,
-    26388, 28865, 26031, 25749, 22070, 24605, 31169, 21496, 19997, 27515,
-    32902, 23546, 21987, 22235, 20282, 20284, 39282, 24051, 26494, 32824,
-    24578, 39042, 36865, 23435, 35772, 35829, 25628, 33368, 25822, 22013,
-    33487, 37221, 20439, 32032, 36895, 31903, 20723, 22609, 28335, 23487,
-    35785, 32899, 37240, 33948, 31639, 34429, 38539, 38543, 32485, 39635,
-    30862, 23681, 31319, 36930, 38567, 31071, 23385, 25439, 31499, 34001,
-    26797, 21766, 32553, 29712, 32034, 38145, 25152, 22604, 20182, 23427,
-    22905, 22612, 29549, 25374, 36427, 36367, 32974, 33492, 25260, 21488,
-    27888, 37214, 22826, 24577, 27760, 22349, 25674, 36138, 30251, 28393,
-    22363, 27264, 30192, 28525, 35885, 35848, 22374, 27631, 34962, 30899,
-    25506, 21497, 28845, 27748, 22616, 25642, 22530, 26848, 33179, 21776,
-    31958, 20504, 36538, 28108, 36255, 28907, 25487, 28059, 28372, 32486,
-    33796, 26691, 36867, 28120, 38518, 35752, 22871, 29305, 34276, 33150,
-    30140, 35466, 26799, 21076, 36386, 38161, 25552, 39064, 36420, 21884,
-    20307, 26367, 22159, 24789, 28053, 21059, 23625, 22825, 28155, 22635,
-    [12133, 30000], 29980, 24684, 33300, 33094, 25361, 26465, 36834, 30522,
-    36339, 36148, 38081, 24086, 21381, 21548, 28867, 27712, 24311, 20572,
-    20141, 24237, 25402, 33351, 36890, 26704, 37230, 30643, 21516, 38108,
-    24420, 31461, 26742, 25413, 31570, 32479, 30171, 20599, 25237, 22836,
-    36879, 20984, 31171, 31361, 22270, 24466, 36884, 28034, 23648,
-    [12063, 22303], 21520, 20820, 28237, 22242, 25512, 39059, 33151, 34581,
-    35114, 36864, 21534, 23663, 33216, 25302, 25176, 33073, 40501, 38464,
-    39534, 39548, 26925, 22949, 25299, 21822, 25366, 21703, 34521, 27964,
-    23043, [12129, 29926], 34972, 27498, 22806, 35916, 24367, 28286, 29609,
-    39037, 20024, 28919, 23436, 30871, 25405, 26202, 30358, 24779, 23451,
-    23113, 19975, 33109, 27754, 29579, 20129, 26505, [12153, 32593], 24448,
-    26106, 26395, 24536, 22916, 23041, 24013, 24494, 21361, 38886, 36829,
-    26693, 22260, 21807, 24799, 20026, 28493, 32500, 33479, 33806, 22996,
-    20255, 20266, 23614, 32428, 26410, 34074, 21619, 30031, 32963, 21890,
-    39759, 20301, 28205, 35859, 23561, 24944, 21355, 30239, 28201, 34442,
-    [12098, 25991], 38395, 32441, 21563, 31283, 32010, 38382, 21985, 32705,
-    29934, 25373, 34583, 28065, 31389, 25105, 26017, 21351, 25569, 27779,
-    24043, 21596, 38056, 20044, 27745, 35820, 23627, [12102, 26080], 33436,
-    26791, 21566, 21556, [12111, 27595], 27494, 20116, 25410, 21320, 33310,
-    20237, 20398, 22366, 25098, 38654, 26212, 29289, 21247, 21153, 24735,
-    35823, 26132, 29081, 26512, 35199, 30802, 30717, 26224, 22075, 21560,
-    38177, 29306, 31232, 24687, 24076, 24713, 33181, [12067, 22805], 24796,
-    29060, 28911, 28330, 27728, 29312, 27268, 34989, 24109, 20064, 23219,
-    21916, 38115, 27927, 31995, 38553, 25103, 32454, 30606, 34430, 21283,
-    38686, 36758, 26247, 23777, 20384, 29421, 19979, 21414, 22799, 21523,
-    25472, 38184, 20808, 20185, 40092, 32420, 21688, 36132, 34900, 33335,
-    38386, 28046, 24358, 23244, 26174, 38505, 29616, 29486, 21439, 33146,
-    39301, 32673, 23466, 38519, 38480, 32447, 30456, 21410, 38262,
-    [12217, 39321], 31665, 35140, 28248, 20065, 32724, 31077, 35814, 24819,
-    21709, 20139, 39033, 24055, 27233, 20687, 21521, 35937, 33831, 30813,
-    38660, 21066, 21742, 22179, 38144, 28040, 23477, 28102, 26195,
-    [12073, 23567], 23389, 26657, 32918, 21880, 31505, 25928, 26964, 20123,
-    27463, 34638, 38795, 21327, 25375, 25658, 37034, 26012, 32961, 35856,
-    20889, 26800, 21368, 34809, 25032, 27844, 27899, 35874, 23633, 34218,
-    33455, 38156, 27427, [12191, 36763], 26032, 24571, [12092, 24515], 20449,
-    34885, 26143, 33125, 29481, 24826, 20852, 21009, 22411, 24418, 37026,
-    [12175, 34892], 37266, 24184, 26447, 24615, 22995, 20804, 20982, 33016,
-    21256, 27769, 38596, 29066, 20241, 20462, 32670, 26429, 21957, 38152,
-    31168, 34966, 32483, 22687, 25100, 38656, 34394, 22040, 39035, 24464,
-    35768, 33988, 37207, 21465, 26093, 24207, 30044, 24676, 32110, 23167,
-    32490, 32493, 36713, 21927, 23459, 24748, 26059, [12126, 29572], 36873,
-    30307, 30505, 32474, 38772, 34203, 23398, [12147, 31348], 38634,
-    [12174, 34880], 21195, 29071, 24490, 26092, 35810, 23547, 39535, 24033,
-    27529, 27739, 35757, 35759, 36874, 36805, 21387, 25276, 40486, 40493,
-    21568, 20011, 33469, [12123, 29273], 34460, 23830, 34905, 28079, 38597,
-    21713, 20122, 35766, 28937, 21693, 38409, 28895, 28153, 30416, 20005,
-    30740, 34578, 23721, 24310, [12180, 35328], 39068, 38414, 28814, 27839,
-    22852, 25513, 30524, 34893, 28436, 33395, 22576, 29141, 21388, 30746,
-    38593, 21761, 24422, 28976, 23476, 35866, 39564, 27523, 22830, 40495,
-    31207, 26472, 25196, 20335, 30113, [12154, 32650], 27915, 38451, 27687,
-    20208, 30162, 20859, 26679, 28478, 36992, 33136, 22934, 29814, 25671,
-    23591, 36965, 31377, 35875, 23002, 21676, 33280, 33647, 35201, 32768,
-    26928, 22094, 32822, 29239, 37326, 20918, 20063, 39029, 25494, 19994,
-    21494, 26355, 33099, 22812, 28082, [12032, 19968], 22777, 21307, 25558,
-    38129, 20381, 20234, [12176, 34915], 39056, 22839, 36951, 31227, 20202,
-    33008, 30097, 27778, 23452, 23016, 24413, 26885, 34433, 20506, 24050,
-    [12036, 20057], 30691, 20197, 33402, 25233, 26131, [12194, 37009], 23673,
-    20159, 24441, 33222, 36920, 32900, 30123, 20134, 35028, 24847, 27589,
-    24518, 20041, 30410, 28322, 35811, 35758, 35850, 35793, 24322, 32764,
-    32716, 32462, 33589, 33643, 22240, 27575, [12211, 38899], 38452, 23035,
-    21535, 38134, 28139, 23493, 39278, 23609, 24341, 38544, 21360, 33521,
-    27185, 23156, 40560, 24212, 32552, 33721, {f: 2, c: 33828}, 33639, 34631,
-    36814, 36194, 30408, 24433, 39062, 30828, 26144, 21727, 25317, 20323,
-    33219, 30152, 24248, 38605, 36362, 34553, 21647, 27891, 28044, 27704,
-    24703, 21191, [12132, 29992], 24189, 20248, 24736, 24551, 23588, 30001,
-    37038, 38080, 29369, 27833, 28216, [12195, 37193], 26377, 21451, 21491,
-    20305, 37321, 35825, [12060, 21448], 24188, 36802, 28132, 20110, 30402,
-    27014, 34398, 24858, 33286, 20313, 20446, 36926, 40060, 24841, 28189,
-    28180, 38533, 20104, 23089, [12204, 38632], 19982, 23679, 31161, 23431,
-    35821, [12155, 32701], [12127, 29577], 22495, 33419, 37057, 21505, 36935,
-    21947, 23786, 24481, 24840, 27442, 29425, 32946, 35465, 28020, 23507,
-    35029, 39044, 35947, 39533, 40499, 28170, 20900, 20803, 22435, 34945,
-    21407, 25588, 36757, 22253, 21592, 22278, 29503, 28304, 32536, 36828,
-    33489, 24895, 24616, 38498, [12104, 26352], 32422, 36234, 36291, 38053,
-    23731, 31908, [12105, 26376], 24742, 38405, 32792, 20113, 37095, 21248,
-    38504, 20801, 36816, 34164, 37213, 26197, 38901, 23381, 21277, 30776,
-    26434, 26685, 21705, 28798, 23472, 36733, 20877, 22312, 21681, 25874,
-    26242, 36190, 36163, 33039, 33900, 36973, 31967, 20991, 34299, 26531,
-    26089, 28577, 34468, 36481, 22122, 36896, 30338, 28790, 29157, 36131,
-    25321, 21017, 27901, 36156, 24590, 22686, 24974, 26366, 36192, 25166,
-    21939, 28195, 26413, 36711, 38113, 38392, 30504, 26629, 27048, 21643,
-    20045, 28856, 35784, 25688, 25995, 23429, 31364, 20538, 23528, 30651,
-    27617, 35449, 31896, 27838, 30415, 26025, 36759, 23853, 23637, 34360,
-    26632, 21344, 25112, 31449, 28251, 32509, 27167, 31456, 24432, 28467,
-    24352, 25484, 28072, 26454, 19976, 24080, 36134, 20183, 32960, 30260,
-    38556, 25307, 26157, 25214, 27836, 36213, 29031, 32617, 20806, 32903,
-    21484, 36974, 25240, 21746, 34544, 36761, 32773, 38167, 34071, 36825,
-    27993, 29645, 26015, 30495, 29956, 30759, 33275, 36126, 38024, 20390,
-    26517, 30137, 35786, 38663, 25391, 38215, 38453, 33976, 25379, 30529,
-    24449, 29424, 20105, 24596, 25972, 25327, 27491, 25919, 24103, 30151,
-    37073, 35777, 33437, 26525, [12096, 25903], 21553, 34584, 30693, 32930,
-    33026, 27713, 20043, 32455, 32844, 30452, 26893, 27542, 25191, 20540,
-    20356, 22336, 25351, [12108, 27490], 36286, 21482, 26088, 32440, 24535,
-    25370, 25527, [12164, 33267], 33268, 32622, 24092, 23769, 21046, 26234,
-    31209, 31258, 36136, 28825, 30164, 28382, 27835, 31378, 20013, 30405,
-    24544, 38047, 34935, 32456, 31181, 32959, 37325, 20210, 20247,
-    [12168, 33311], 21608, 24030, 27954, 35788, 31909, 36724, 32920, 24090,
-    21650, 30385, 23449, 26172, 39588, 29664, 26666, 34523, 26417, 29482,
-    35832, 35803, 36880, [12149, 31481], 28891, 29038, 25284, 30633, 22065,
-    20027, 33879, 26609, 21161, 34496, 36142, 38136, 31569, 20303, 27880,
-    31069, 39547, 25235, [12118, 29226], 25341, 19987, 30742, 36716, 25776,
-    36186, 31686, 26729, 24196, 35013, 22918, 25758, 22766, 29366, 26894,
-    38181, 36861, 36184, 22368, 32512, 35846, 20934, 25417, 25305, 21331,
-    26700, 29730, 33537, 37196, 21828, 30528, 28796, 27978, 20857, 21672,
-    36164, 23039, 28363, 28100, 23388, 32043, 20180, 31869, 28371,
-    [12070, 23376], [12163, 33258], 28173, 23383, 39683, 26837, 36394, 23447,
-    32508, 24635, 32437, 37049, [12187, 36208], 22863, 25549, 31199,
-    [12188, 36275], 21330, 26063, 31062, 35781, 38459, 32452, 38075, 32386,
-    22068, 37257, 26368, 32618, 23562, 36981, 26152, 24038, 20304, 26590,
-    20570, 20316, 22352, 24231, 20109, 19980, 20800, 19984, 24319, 21317,
-    19989, 20120, 19998, [12224, 39730], 23404, 22121, [12033, 20008], 31162,
-    [12035, 20031], [12052, 21269], 20039, 22829, [12120, 29243], 21358, 27664,
-    22239, 32996, 39319, 27603, 30590, 40727, [12034, 20022], 20127, 40720,
-    20060, 20073, 20115, 33416, 23387, 21868, 22031, 20164, 21389, 21405,
-    21411, 21413, 21422, 38757, 36189, [12053, 21274], 21493, 21286, 21294,
-    21310, 36188, 21350, 21347, 20994, 21000, 21006, 21037, 21043,
-    {f: 2, c: 21055}, 21068, 21086, 21089, 21084, 33967, 21117, 21122, 21121,
-    21136, 21139, [12044, 20866], 32596, 20155, 20163, 20169, 20162, 20200,
-    20193, 20203, 20190, 20251, 20211, 20258, 20324, 20213, 20261, 20263,
-    20233, 20267, 20318, 20327, 25912, 20314, 20317, 20319, 20311, 20274,
-    20285, 20342, 20340, 20369, 20361, 20355, 20367, 20350, 20347, 20394,
-    20348, 20396, 20372, 20454, 20456, 20458, 20421, 20442, 20451, 20444,
-    20433, 20447, 20472, 20521, 20556, 20467, 20524, 20495, 20526, 20525,
-    20478, 20508, 20492, 20517, 20520, 20606, 20547, 20565, 20552, 20558,
-    20588, 20603, 20645, 20647, 20649, 20666, 20694, 20742, 20717, 20716,
-    20710, 20718, 20743, 20747, 20189, 27709, 20312, 20325, 20430,
-    [12245, 40864], 27718, 31860, 20846, 24061, 40649, 39320, 20865, 22804,
-    [12051, 21241], 21261, 35335, 21264, 20971, 22809, 20821, [12039, 20128],
-    20822, 20147, 34926, 34980, 20149, 33044, 35026, 31104, 23348, 34819,
-    32696, [12046, 20907], 20913, 20925, 20924, 20935, [12045, 20886], 20898,
-    20901, 35744, {f: 2, c: 35750}, 35754, {f: 2, c: 35764}, 35767,
-    {f: 2, c: 35778}, 35787, 35791, 35790, {f: 3, c: 35794}, 35798,
-    {f: 2, c: 35800}, 35804, {f: 2, c: 35807}, 35812, {f: 2, c: 35816}, 35822,
-    35824, 35827, 35830, 35833, 35836, {f: 2, c: 35839}, 35842, 35844, 35847,
-    35852, 35855, {f: 2, c: 35857}, {f: 3, c: 35860}, 35865, 35867, 35864,
-    35869, {f: 3, c: 35871}, 35877, 35879, {f: 2, c: 35882}, {f: 2, c: 35886},
-    {f: 2, c: 35890}, {f: 2, c: 35893}, [12057, 21353], 21370, 38429, 38434,
-    38433, 38449, 38442, 38461, 38460, 38466, 38473, 38484, 38495, 38503,
-    38508, 38514, 38516, 38536, 38541, 38551, 38576, 37015, 37019, 37021,
-    37017, 37036, 37025, 37044, 37043, 37046, 37050, 37048, 37040, 37071,
-    37061, 37054, 37072, 37060, 37063, 37075, 37094, 37090, 37084, 37079,
-    37083, 37099, 37103, 37118, 37124, 37154, 37150, 37155, 37169, 37167,
-    37177, 37187, 37190, 21005, 22850, 21154, {f: 2, c: 21164}, 21182, 21759,
-    21200, 21206, 21232, 21471, 29166, 30669, [12085, 24308], [12048, 20981],
-    20988, [12223, 39727], [12059, 21430], 24321, 30042, 24047, 22348, 22441,
-    22433, 22654, 22716, 22725, 22737, 22313, 22316, 22314, 22323, 22329,
-    {f: 2, c: 22318}, 22364, 22331, 22338, 22377, 22405, 22379, 22406, 22396,
-    22395, 22376, 22381, 22390, 22387, 22445, 22436, 22412, 22450, 22479,
-    22439, 22452, 22419, 22432, 22485, 22488, 22490, 22489, 22482, 22456,
-    22516, 22511, 22520, 22500, 22493, 22539, 22541, 22525, 22509, 22528,
-    22558, 22553, 22596, 22560, 22629, 22636, 22657, 22665, 22682, 22656,
-    39336, 40729, 25087, 33401, 33405, 33407, 33423, 33418, 33448, 33412,
-    33422, 33425, 33431, 33433, 33451, 33464, 33470, 33456, 33480, 33482,
-    33507, 33432, 33463, 33454, {f: 2, c: 33483}, 33473, 33449, 33460, 33441,
-    33450, 33439, 33476, 33486, 33444, 33505, 33545, 33527, 33508, 33551,
-    33543, 33500, 33524, 33490, 33496, 33548, 33531, 33491, 33553, 33562,
-    33542, {f: 2, c: 33556}, 33504, 33493, 33564, 33617, {f: 2, c: 33627},
-    33544, 33682, 33596, 33588, 33585, 33691, 33630, 33583, 33615, 33607,
-    33603, 33631, 33600, 33559, 33632, 33581, 33594, 33587, 33638, 33637,
-    33640, 33563, 33641, 33644, 33642, {f: 2, c: 33645}, 33712, 33656,
-    {f: 2, c: 33715}, 33696, 33706, 33683, 33692, 33669, 33660, 33718, 33705,
-    33661, 33720, 33659, 33688, 33694, 33704, 33722, 33724, 33729, 33793,
-    33765, 33752, 22535, 33816, 33803, 33757, 33789, 33750, 33820, 33848,
-    33809, 33798, 33748, 33759, 33807, 33795, {f: 2, c: 33784}, 33770, 33733,
-    33728, 33830, 33776, 33761, 33884, 33873, 33882, 33881, 33907,
-    {f: 2, c: 33927}, 33914, 33929, 33912, 33852, 33862, 33897, 33910, 33932,
-    33934, 33841, 33901, 33985, 33997, 34000, 34022, 33981, 34003, 33994,
-    33983, 33978, 34016, 33953, 33977, 33972, 33943, 34021, 34019, 34060,
-    29965, 34104, 34032, 34105, 34079, 34106, 34134, 34107, 34047, 34044,
-    34137, 34120, 34152, 34148, 34142, 34170, 30626, 34115, 34162, 34171,
-    34212, 34216, 34183, 34191, 34169, 34222, 34204, 34181, 34233, 34231,
-    34224, 34259, 34241, 34268, 34303, 34343, 34309, 34345, 34326, 34364,
-    [12086, 24318], 24328, 22844, 22849, 32823, 22869, 22874, 22872, 21263,
-    [12074, 23586], 23589, 23596, 23604, 25164, 25194, 25247, 25275, 25290,
-    25306, 25303, 25326, 25378, 25334, 25401, 25419, 25411, 25517, 25590,
-    25457, 25466, 25486, 25524, 25453, 25516, 25482, 25449, 25518, 25532,
-    25586, 25592, 25568, 25599, 25540, 25566, 25550, 25682, 25542, 25534,
-    25669, 25665, 25611, 25627, 25632, 25612, 25638, 25633, 25694, 25732,
-    25709, 25750, 25722, {f: 2, c: 25783}, 25753, 25786, 25792, 25808, 25815,
-    25828, 25826, 25865, 25893, 25902, [12087, 24331], 24530, 29977, 24337,
-    21343, 21489, 21501, 21481, 21480, 21499, 21522, 21526, 21510, 21579,
-    {f: 3, c: 21586}, 21590, 21571, 21537, 21591, 21593, 21539, 21554, 21634,
-    21652, 21623, 21617, 21604, {f: 2, c: 21658}, 21636, 21622, 21606, 21661,
-    21712, 21677, 21698, 21684, 21714, 21671, 21670, {f: 2, c: 21715}, 21618,
-    21667, 21717, 21691, 21695, 21708, {f: 2, c: 21721}, 21724,
-    {f: 2, c: 21673}, 21668, 21725, 21711, 21726, 21787, 21735, 21792, 21757,
-    21780, 21747, {f: 2, c: 21794}, 21775, 21777, 21799, 21802, 21863, 21903,
-    21941, 21833, 21869, 21825, 21845, 21823, 21840, 21820, 21815, 21846,
-    {f: 3, c: 21877}, 21811, 21808, 21852, 21899, 21970, 21891, 21937, 21945,
-    21896, 21889, 21919, 21886, 21974, 21905, 21883, 21983, {f: 2, c: 21949},
-    21908, 21913, 21994, 22007, 21961, 22047, 21969, {f: 2, c: 21995}, 21972,
-    21990, 21981, 21956, 21999, 21989, {f: 2, c: 22002}, {f: 2, c: 21964},
-    21992, 22005, 21988, 36756, 22046, 22024, 22028, 22017, 22052, 22051,
-    22014, 22016, 22055, 22061, 22104, 22073, 22103, 22060, 22093, 22114,
-    22105, 22108, 22092, 22100, 22150, 22116, 22129, 22123, {f: 2, c: 22139},
-    22149, 22163, 22191, 22228, [12062, 22231], 22237, 22241, 22261, 22251,
-    22265, 22271, 22276, 22282, 22281, 22300, 24079, 24089, 24084, 24081,
-    24113, {f: 2, c: 24123}, 24119, 24132, 24148, 24155, 24158, 24161, 23692,
-    23674, 23693, 23696, 23702, 23688, {f: 2, c: 23704}, 23697, 23706, 23708,
-    23733, 23714, 23741, 23724, 23723, 23729, 23715, 23745, 23735, 23748,
-    23762, 23780, 23755, 23781, {f: 2, c: 23810}, 23847, 23846, 23854, 23844,
-    23838, 23814, 23835, 23896, 23870, 23860, 23869, 23916, 23899, 23919,
-    23901, 23915, 23883, 23882, 23913, 23924, 23938, 23961, 23965, 35955,
-    23991, 24005, [12091, 24435], 24439, 24450, 24455, 24457, 24460, 24469,
-    24473, 24476, 24488, 24493, 24501, 24508, 34914, [12090, 24417], 29357,
-    29360, 29364, {f: 2, c: 29367}, 29379, 29377, 29390, 29389, 29394, 29416,
-    29423, 29417, 29426, 29428, 29431, 29441, 29427, 29443, {f: 2, c: 29434},
-    29463, 29459, 29473, 29450, 29470, 29469, 29461, 29474, 29497, 29477,
-    29484, 29496, 29489, 29520, 29517, 29527, 29536, 29548, 29551, 29566,
-    [12167, 33307], 22821, 39143, 22820, [12065, 22786], 39267,
-    {f: 6, c: 39271}, 39284, 39287, 39293, 39296, 39300, 39303, 39306, 39309,
-    {f: 2, c: 39312}, {f: 3, c: 39315}, 24192, 24209, 24203, 24214, 24229,
-    24224, 24249, 24245, 24254, 24243, 36179, 24274, 24273, 24283, 24296,
-    24298, 33210, 24516, 24521, 24534, 24527, 24579, 24558, 24580, 24545,
-    24548, 24574, {f: 2, c: 24581}, 24554, 24557, 24568, 24601, 24629, 24614,
-    24603, 24591, 24589, 24617, 24619, 24586, 24639, 24609, {f: 2, c: 24696},
-    24699, 24698, 24642, 24682, 24701, 24726, 24730, 24749, 24733, 24707,
-    24722, 24716, 24731, 24812, 24763, 24753, 24797, 24792, 24774, 24794,
-    24756, 24864, 24870, 24853, 24867, 24820, 24832, 24846, 24875, 24906,
-    24949, 25004, 24980, 24999, 25015, 25044, 25077, 24541, 38579, 38377,
-    38379, 38385, 38387, {f: 2, c: 38389}, 38396, 38398, {f: 2, c: 38403},
-    38406, 38408, {f: 4, c: 38410}, 38415, 38418, {f: 3, c: 38421},
-    {f: 2, c: 38425}, 20012, [12121, 29247], 25109, 27701, 27732, 27740, 27722,
-    27811, 27781, 27792, 27796, 27788, {f: 2, c: 27752}, 27764, 27766, 27782,
-    27817, 27856, 27860, 27821, {f: 2, c: 27895}, 27889, 27863, 27826, 27872,
-    27862, 27898, 27883, 27886, 27825, 27859, 27887, 27902, 27961, 27943,
-    27916, 27971, 27976, 27911, 27908, 27929, 27918, 27947, 27981, 27950,
-    27957, 27930, 27983, 27986, 27988, 27955, 28049, 28015, 28062, 28064,
-    27998, {f: 2, c: 28051}, 27996, 28000, 28028, 28003, 28186, 28103, 28101,
-    28126, 28174, 28095, 28128, 28177, 28134, 28125, 28121, 28182, 28075,
-    28172, 28078, 28203, 28270, 28238, 28267, 28338, 28255, 28294,
-    {f: 2, c: 28243}, 28210, 28197, 28228, 28383, 28337, 28312, 28384, 28461,
-    28386, 28325, 28327, 28349, 28347, 28343, 28375, 28340, 28367, 28303,
-    28354, 28319, 28514, {f: 2, c: 28486}, 28452, 28437, 28409, 28463, 28470,
-    28491, 28532, 28458, 28425, 28457, 28553, 28557, 28556, 28536, 28530,
-    28540, 28538, 28625, 28617, 28583, 28601, 28598, 28610, 28641, 28654,
-    28638, 28640, 28655, 28698, 28707, 28699, 28729, 28725, 28751, 28766,
-    [12071, 23424], 23428, 23445, 23443, 23461, 23480, 29999, 39582, 25652,
-    23524, 23534, 35120, 23536, 36423, 35591, 36790, 36819, 36821, 36837,
-    36846, 36836, 36841, 36838, 36851, 36840, 36869, 36868, 36875, 36902,
-    36881, 36877, 36886, 36897, {f: 2, c: 36917}, 36909, 36911, 36932,
-    {f: 2, c: 36945}, 36944, 36968, 36952, 36962, 36955, 26297, 36980, 36989,
-    36994, 37000, 36995, 37003, [12089, 24400], 24407, 24406, 24408, 23611,
-    21675, 23632, 23641, 23409, 23651, 23654, 32700, 24362, 24361, 24365,
-    33396, 24380, 39739, [12076, 23662], 22913, 22915, 22925, {f: 2, c: 22953},
-    22947, 22935, 22986, 22955, 22942, 22948, 22994, 22962, 22959, 22999,
-    22974, {f: 2, c: 23045}, 23005, 23048, 23011, 23000, 23033, 23052, 23049,
-    23090, 23092, 23057, 23075, 23059, 23104, 23143, 23114, 23125, 23100,
-    23138, 23157, 33004, 23210, 23195, 23159, 23162, 23230, 23275, 23218,
-    23250, 23252, 23224, 23264, 23267, 23281, 23254, 23270, 23256, 23260,
-    23305, 23319, 23318, 23346, 23351, 23360, 23573, 23580, 23386, 23397,
-    23411, 23377, 23379, 23394, 39541, {f: 2, c: 39543}, 39546, 39551, 39549,
-    {f: 2, c: 39552}, 39557, 39560, 39562, 39568, {f: 2, c: 39570}, 39574,
-    39576, {f: 3, c: 39579}, {f: 2, c: 39583}, {f: 2, c: 39586}, 39589, 39591,
-    32415, 32417, 32419, 32421, {f: 2, c: 32424}, 32429, 32432, 32446,
-    {f: 3, c: 32448}, 32457, {f: 2, c: 32459}, 32464, 32468, 32471, 32475,
-    {f: 2, c: 32480}, 32488, 32491, {f: 2, c: 32494}, {f: 2, c: 32497}, 32525,
-    32502, {f: 2, c: 32506}, 32510, {f: 3, c: 32513}, {f: 2, c: 32519},
-    {f: 2, c: 32523}, 32527, {f: 2, c: 32529}, 32535, 32537, 32540, 32539,
-    32543, {f: 7, c: 32545}, {f: 4, c: 32554}, {f: 5, c: 32559}, 32565,
-    [12083, 24186], 30079, [12078, 24027], 30014, 37013, 29582, 29585, 29614,
-    29602, 29599, 29647, 29634, 29649, 29623, 29619, 29632, 29641, 29640,
-    29669, 29657, 39036, 29706, 29673, 29671, 29662, 29626, 29682, 29711,
-    29738, 29787, 29734, 29733, 29736, 29744, 29742, 29740, 29723, 29722,
-    29761, 29788, 29783, 29781, 29785, 29815, 29805, 29822, 29852, 29838,
-    {f: 2, c: 29824}, 29831, 29835, 29854, {f: 2, c: 29864}, 29840, 29863,
-    29906, 29882, {f: 3, c: 38890}, 26444, 26451, 26462, 26440, 26473, 26533,
-    26503, 26474, 26483, 26520, 26535, 26485, 26536, 26526, 26541, 26507,
-    26487, 26492, 26608, 26633, 26584, 26634, 26601, 26544, 26636, 26585,
-    26549, 26586, 26547, 26589, 26624, 26563, 26552, 26594, 26638, 26561,
-    26621, {f: 2, c: 26674}, {f: 2, c: 26720}, 26702, 26722, 26692, 26724,
-    26755, 26653, 26709, 26726, 26689, 26727, 26688, 26686, 26698, 26697,
-    26665, 26805, 26767, 26740, 26743, 26771, 26731, 26818, 26990, 26876,
-    {f: 2, c: 26911}, 26873, 26916, 26864, 26891, 26881, 26967, 26851, 26896,
-    26993, 26937, 26976, 26946, 26973, 27012, 26987, 27008, 27032, 27000,
-    26932, 27084, {f: 2, c: 27015}, 27086, 27017, 26982, 26979, 27001, 27035,
-    27047, 27067, 27051, 27053, 27092, 27057, 27073, 27082, 27103, 27029,
-    27104, 27021, 27135, 27183, 27117, {f: 2, c: 27159}, 27237, 27122, 27204,
-    27198, 27296, 27216, 27227, 27189, 27278, 27257, 27197, 27176, 27224,
-    27260, 27281, 27280, 27305, 27287, 27307, 29495, 29522, {f: 2, c: 27521},
-    27527, 27524, {f: 2, c: 27538}, 27533, {f: 2, c: 27546}, 27553, 27562,
-    36715, 36717, {f: 3, c: 36721}, {f: 2, c: 36725}, 36728, 36727,
-    {f: 2, c: 36729}, 36732, 36734, {f: 2, c: 36737}, 36740, 36743, 36747,
-    {f: 3, c: 36749}, 36760, 36762, 36558, 25099, 25111, 25115, 25119, 25122,
-    25121, 25125, 25124, 25132, 33255, 29935, 29940, 29951, 29967, 29969,
-    29971, [12097, 25908], {f: 3, c: 26094}, 26122, 26137, 26482, 26115, 26133,
-    26112, 28805, 26359, 26141, 26164, 26161, 26166, 26165, 32774, 26207,
-    26196, 26177, 26191, 26198, 26209, 26199, 26231, 26244, 26252, 26279,
-    26269, 26302, {f: 2, c: 26331}, 26342, 26345, {f: 2, c: 36146}, 36150,
-    36155, 36157, 36160, {f: 2, c: 36165}, {f: 2, c: 36168}, 36167, 36173,
-    36181, 36185, 35271, {f: 3, c: 35274}, {f: 4, c: 35278}, 29294, 29343,
-    29277, 29286, 29295, {f: 2, c: 29310}, 29316, 29323, 29325, 29327, 29330,
-    25352, 25394, 25520, 25663, 25816, 32772, 27626, 27635, 27645, 27637,
-    27641, 27653, 27655, 27654, 27661, 27669, {f: 3, c: 27672}, 27681, 27689,
-    27684, 27690, 27698, 25909, 25941, 25963, 29261, 29266, 29270, 29232,
-    34402, 21014, 32927, 32924, 32915, 32956, 26378, 32957, 32945, 32939,
-    32941, 32948, 32951, {f: 4, c: 32999}, 32987, 32962, 32964, 32985, 32973,
-    32983, 26384, 32989, 33003, 33009, 33012, 33005, {f: 2, c: 33037}, 33010,
-    33020, 26389, 33042, 35930, 33078, 33054, 33068, 33048, 33074, 33096,
-    33100, 33107, 33140, {f: 2, c: 33113}, 33137, 33120, 33129,
-    {f: 2, c: 33148}, 33133, 33127, 22605, 23221, 33160, 33154, 33169, 28373,
-    33187, 33194, 33228, 26406, 33226, 33211, 33217, 33190, 27428, 27447,
-    27449, 27459, 27462, 27481, {f: 3, c: 39121}, 39125, {f: 2, c: 39129},
-    [12110, 27571], 24384, 27586, 35315, 26000, 40785, 26003, 26044, 26054,
-    26052, 26051, 26060, 26062, 26066, 26070, 28800, 28828, 28822, 28829,
-    28859, 28864, 28855, 28843, 28849, 28904, 28874, 28944, 28947, 28950,
-    28975, 28977, 29043, 29020, 29032, 28997, 29042, 29002, 29048, 29050,
-    29080, 29107, 29109, 29096, 29088, 29152, 29140, 29159, 29177, 29213,
-    29224, 28780, 28952, 29030, 29113, 25150, 25149, 25155, {f: 2, c: 25160},
-    31035, 31040, 31046, 31049, {f: 2, c: 31067}, 31059, 31066, 31074, 31063,
-    31072, 31087, 31079, 31098, 31109, 31114, 31130, 31143, 31155, 24529,
-    24528, 24636, 24669, 24666, 24679, 24641, 24665, 24675, 24747, 24838,
-    24845, 24925, 25001, 24989, 25035, 25041, 25094, 32896, [12160, 32895],
-    27795, 27894, 28156, 30710, 30712, 30720, 30729, {f: 2, c: 30743}, 30737,
-    26027, 30765, {f: 2, c: 30748}, {f: 3, c: 30777}, 30751, 30780, 30757,
-    30764, 30755, 30761, 30798, 30829, {f: 2, c: 30806}, 30758, 30800, 30791,
-    30796, 30826, 30875, 30867, 30874, 30855, 30876, 30881, 30883, 30898,
-    30905, 30885, 30932, 30937, 30921, 30956, 30962, 30981, 30964, 30995,
-    31012, 31006, 31028, 40859, [12235, 40697], {f: 2, c: 40699}, 30449, 30468,
-    30477, 30457, {f: 2, c: 30471}, 30490, 30498, 30489, 30509, 30502, 30517,
-    30520, {f: 2, c: 30544}, 30535, 30531, 30554, 30568, 30562, 30565, 30591,
-    30605, 30589, 30592, 30604, 30609, {f: 2, c: 30623}, 30640, 30645, 30653,
-    30010, 30016, 30030, 30027, 30024, 30043, 30066, 30073, 30083, 32600,
-    32609, 32607, 35400, 32616, 32628, 32625, 32633, 32641, 32638, 30413,
-    30437, 34866, {f: 3, c: 38021}, 38027, 38026, {f: 2, c: 38028},
-    {f: 2, c: 38031}, 38036, 38039, 38037, {f: 3, c: 38042}, {f: 2, c: 38051},
-    38059, 38058, 38061, 38060, {f: 2, c: 38063}, 38066, 38068,
-    {f: 5, c: 38070}, {f: 2, c: 38076}, 38079, 38084, {f: 7, c: 38088},
-    {f: 3, c: 38096}, {f: 3, c: 38101}, 38105, 38104, 38107, {f: 3, c: 38110},
-    38114, {f: 2, c: 38116}, {f: 2, c: 38119}, 38122, 38121, 38123,
-    {f: 2, c: 38126}, {f: 3, c: 38131}, 38135, 38137, {f: 2, c: 38140}, 38143,
-    38147, 38146, {f: 2, c: 38150}, {f: 2, c: 38153}, {f: 3, c: 38157},
-    {f: 5, c: 38162}, 38168, 38171, {f: 3, c: 38173}, 38178, {f: 2, c: 38186},
-    38185, 38188, {f: 2, c: 38193}, 38196, {f: 3, c: 38198}, 38204,
-    {f: 2, c: 38206}, 38210, 38197, {f: 3, c: 38212}, 38217, 38220,
-    {f: 2, c: 38222}, {f: 3, c: 38226}, {f: 4, c: 38230}, 38235,
-    {f: 2, c: 38238}, 38237, {f: 2, c: 38241}, {f: 9, c: 38244}, 38255,
-    {f: 3, c: 38257}, 38202, 30695, 30700, 38601, 31189, 31213, 31203, 31211,
-    31238, 23879, 31235, 31234, 31262, 31252, 31289, 31287, 31313, 40655,
-    39333, 31344, 30344, 30350, 30355, 30361, 30372, 29918, 29920, 29996,
-    40480, 40482, {f: 5, c: 40488}, 40498, 40497, 40502, 40504, 40503,
-    {f: 2, c: 40505}, 40510, {f: 2, c: 40513}, 40516, {f: 4, c: 40518},
-    {f: 2, c: 40523}, 40526, 40529, 40533, 40535, {f: 3, c: 40538}, 40542,
-    40547, {f: 7, c: 40550}, 40561, 40557, 40563, [12135, 30098], 30100, 30102,
-    30112, 30109, 30124, 30115, {f: 2, c: 30131}, 30136, 30148, 30129, 30128,
-    30147, 30146, 30166, 30157, 30179, 30184, 30182, 30180, 30187, 30183,
-    30211, 30193, 30204, 30207, 30224, 30208, 30213, 30220, 30231, 30218,
-    30245, 30232, 30229, 30233, 30235, 30268, 30242, 30240, 30272, 30253,
-    30256, 30271, 30261, 30275, 30270, 30259, 30285, 30302, 30292, 30300,
-    30294, 30315, 30319, 32714, 31462, {f: 2, c: 31352}, 31360, 31366, 31368,
-    31381, 31398, 31392, 31404, 31400, 31405, 31411, 34916, 34921, 34930,
-    34941, 34943, 34946, 34978, 35014, 34999, 35004, 35017, 35042, 35022,
-    35043, 35045, 35057, 35098, 35068, 35048, 35070, 35056, 35105, 35097,
-    35091, 35099, 35082, 35124, 35115, 35126, 35137, 35174, 35195,
-    [12134, 30091], 32997, 30386, 30388, 30684, [12158, 32786], 32788, 32790,
-    32796, 32800, 32802, {f: 3, c: 32805}, 32809, 32808, 32817, 32779, 32821,
-    32835, 32838, 32845, 32850, 32873, 32881, 35203, 39032, 39040, 39043,
-    39049, {f: 2, c: 39052}, 39055, 39060, {f: 2, c: 39066}, {f: 2, c: 39070},
-    {f: 2, c: 39073}, {f: 2, c: 39077}, [12172, 34381], 34388, 34412, 34414,
-    34431, 34426, 34428, 34427, 34472, 34445, 34443, 34476, 34461, 34471,
-    34467, 34474, 34451, 34473, 34486, 34500, 34485, 34510, 34480, 34490,
-    34481, 34479, 34505, 34511, 34484, 34537, {f: 2, c: 34545}, 34541, 34547,
-    34512, 34579, 34526, 34548, 34527, 34520, 34513, 34563, 34567, 34552,
-    34568, 34570, 34573, 34569, 34595, 34619, 34590, 34597, 34606, 34586,
-    34622, 34632, 34612, 34609, 34601, 34615, 34623, 34690, 34594,
-    {f: 2, c: 34685}, 34683, 34656, 34672, 34636, 34670, 34699, 34643, 34659,
-    34684, 34660, 34649, 34661, 34707, 34735, 34728, 34770, 34758, 34696,
-    34693, 34733, 34711, 34691, 34731, 34789, 34732, 34741, 34739, 34763,
-    34771, 34749, 34769, 34752, 34762, 34779, 34794, 34784, 34798, 34838,
-    34835, 34814, 34826, 34843, 34849, 34873, 34876, [12152, 32566], 32578,
-    {f: 2, c: 32580}, 33296, 31482, 31485, 31496, {f: 2, c: 31491}, 31509,
-    31498, 31531, 31503, 31559, 31544, 31530, 31513, 31534, 31537, 31520,
-    31525, 31524, 31539, 31550, 31518, 31576, 31578, 31557, 31605, 31564,
-    31581, 31584, 31598, 31611, 31586, 31602, 31601, 31632, {f: 2, c: 31654},
-    31672, 31660, 31645, 31656, 31621, 31658, 31644, 31650, 31659, 31668,
-    31697, 31681, 31692, 31709, 31706, {f: 2, c: 31717}, 31722, 31756, 31742,
-    31740, 31759, 31766, 31755, 31775, 31786, 31782, 31800, 31809, 31808,
-    33278, {f: 2, c: 33281}, 33284, 33260, 34884, {f: 3, c: 33313}, 33325,
-    33327, 33320, 33323, 33336, 33339, {f: 2, c: 33331}, 33342, 33348, 33353,
-    33355, 33359, 33370, 33375, 33384, 34942, 34949, 34952, 35032, 35039,
-    35166, 32669, 32671, 32679, {f: 2, c: 32687}, 32690, 31868, 25929, 31889,
-    31901, 31900, 31902, 31906, 31922, {f: 2, c: 31932}, 31937, 31943,
-    {f: 2, c: 31948}, 31944, 31941, 31959, 31976, [12169, 33390], 26280, 32703,
-    32718, 32725, 32741, 32737, 32742, 32745, 32750, 32755, [12151, 31992],
-    32119, 32166, 32174, 32327, 32411, 40632, 40628, 36211, 36228, 36244,
-    36241, 36273, 36199, 36205, 35911, 35913, 37194, 37200, {f: 2, c: 37198},
-    37220, 37218, 37217, 37232, 37225, 37231, {f: 2, c: 37245}, 37234, 37236,
-    37241, 37260, 37253, 37264, 37261, 37265, {f: 2, c: 37282}, 37290,
-    {f: 3, c: 37293}, 37301, 37300, 37306, [12183, 35925], 40574, 36280, 36331,
-    36357, 36441, 36457, 36277, 36287, 36284, 36282, 36292, {f: 2, c: 36310},
-    36314, 36318, {f: 2, c: 36302}, 36315, 36294, 36332, {f: 2, c: 36343},
-    36323, 36345, 36347, 36324, 36361, 36349, 36372, 36381, 36383, 36396,
-    36398, 36387, 36399, 36410, 36416, 36409, 36405, 36413, 36401, 36425,
-    {f: 2, c: 36417}, {f: 2, c: 36433}, 36426, 36464, 36470, 36476, 36463,
-    36468, 36485, 36495, 36500, 36496, 36508, 36510, [12184, 35960], 35970,
-    35978, 35973, 35992, 35988, 26011, 35286, 35294, 35290, 35292, 35301,
-    35307, 35311, 35390, 35622, 38739, 38633, 38643, 38639, 38662, 38657,
-    38664, 38671, 38670, 38698, 38701, 38704, 38718, 40832, 40835,
-    {f: 6, c: 40837}, 40844, 40702, 40715, 40717, [12203, 38585],
-    {f: 2, c: 38588}, 38606, 38610, 30655, 38624, 37518, 37550, 37576, 37694,
-    37738, 37834, 37775, 37950, 37995, 40063, 40066, {f: 4, c: 40069}, 31267,
-    40075, 40078, {f: 3, c: 40080}, {f: 2, c: 40084}, {f: 2, c: 40090},
-    {f: 6, c: 40094}, {f: 5, c: 40101}, 40107, {f: 2, c: 40109},
-    {f: 8, c: 40112}, {f: 4, c: 40122}, {f: 4, c: 40132}, {f: 7, c: 40138},
-    {f: 3, c: 40147}, {f: 3, c: 40151}, {f: 2, c: 40156}, 40159, 40162, 38780,
-    38789, {f: 2, c: 38801}, 38804, 38831, 38827, 38819, 38834, 38836, 39601,
-    39600, 39607, 40536, 39606, 39610, 39612, 39617, 39616, 39621, 39618,
-    {f: 2, c: 39627}, 39633, 39749, 39747, 39751, 39753, 39752, 39757, 39761,
-    39144, 39181, 39214, 39253, 39252, [12221, 39647], 39649, 39654, 39663,
-    39659, 39675, 39661, 39673, 39688, 39695, 39699, 39711, 39715,
-    {f: 2, c: 40637}, 32315, 40578, {f: 2, c: 40583}, 40587, 40594, 37846,
-    40605, 40607, {f: 3, c: 40667}, 40672, 40671, 40674, 40681, 40679, 40677,
-    40682, 40687, 40738, 40748, 40751, 40761, 40759, {f: 2, c: 40765}, 40772,
-    12295, {s: 13}, 30362, 34297, 31001, 24859, 39599, 35158, 22761, 32631,
-    25850, 25943, 38930, 36774, 32070, 24171, 32129, 37770, 35607, 39165,
-    23542, 22577, 39825, 36649, [12185, 35997], 37575, 29437, 20633, 24970,
-    32179, 31558, 30050, 25987, 24163, 38281, 37002, 32232, 36022, 35722,
-    36783, 36782, 27161, 40009, 30303, 28693, 28657, 36051, 25839, 39173,
-    25765, 37474, 37457, 39361, 35036, 36001, 21443, 34870, 27544, 24922,
-    24920, 29158, 33980, 33369, 20489, 28356, 21408, 20596, 28204, 23652,
-    35435, 25881, 25723, 34796, 39262, 35730, 32399, 37855, 29987, 38369,
-    39019, 22580, 22039, [12199, 38263], 20767, 33144, 24288, 26274, 37396,
-    [12190, 36554], 24505, 22645, 38515, 35183, 31281, 25074, 35488, 39425,
-    36978, 39347, [12242, 40786], 29118, 34909, 34802, 23541, 30087, 36490,
-    31820, 32162, 37276, 37604, 38619, 30990, 20786, 35320, 34389, 20659,
-    30241, 38358, 21109, 37656, 32020, 32189, 36781, 35422, 36060, 32880,
-    24478, 21474, 36517, 31428, 37679, 36948, 24118, 36024, 25812, 21934,
-    37170, 25763, 33213, 24986, 35477, 24392, 30070, 25803, 40680, 34153,
-    27284, 25623, 23798, 31153, 23566, 29128, 37159, 25973, 28364, 36958,
-    32224, 39003, 40670, 22666, 38651, 28593, 37347, 35519, 35548, 37336,
-    38914, 37664, 35330, 26481, 21205, 26847, 20941, [12222, 39717], 29346,
-    29544, 35712, 36077, 37709, 37723, 26039, 32222, 38538, 23565, 22136,
-    38931, 37389, 22890, 22702, 40285, 38989, 35355, 24801, 39187, 20818,
-    29246, 39180, 36019, 30332, 32624, 38309, 31020, 37353, 29033, 31684,
-    36009, 39151, 35370, 32033, [12214, 39131], 35513, 24290, 36027, 32027,
-    22707, 22894, 24996, 31966, 35920, 26963, 37586, [12213, 39080], 30219,
-    39342, 32299, 35575, 40179, 33178, 36667, 25771, 36628, 36070, 24489,
-    36000, 35331, 23142, 32283, 35442, 37411, 33995, 24185, 36245, 36123,
-    23713, 21083, 37628, 32177, 23831, 37804, 25841, 40255, 38307, 37499,
-    20491, 32102, 40852, 38799, 36002, 37390, 28317, 27083, 36092, 34865,
-    39015, 21102, 38364, 35264, 39208, 24931, 36011, 24291, 35215, 27512,
-    [12244, 40860], 38312, 36556, 35437, 27331, 36020, 21130, 36645, 37707,
-    22283, 36942, 39405, 38867, 28450, 34399, 38305, 40372, 36032, 36703,
-    40251, 32005, 22778, 35703, 28396, 22057, 33775, 30059, 21123, 35441,
-    25079, 22750, 27489, 29872, 36996, 32233, 35594, 25582, 36637, 36036,
-    31330, 26371, 29172, 21295, 35569, 35496, 32362, 33911, 28222, 29554,
-    36008, 31117, 25802, 27231, 31309, 39249, 35663, 40388, 32318, 32221,
-    26997, 36655, 32026, 25824, 24190, 34186, 21137, 28639, 35336, 35352,
-    38555, 32380, 32000, 22846, 33698, 38960, 36040, 37440, 20729, 39381,
-    27570, 30435, 22533, 31627, 38291, 33393, 32216, 32365, 27298, 40572,
-    25536, 25791, 31777, 20745, 34214, 27323, 37970, 36368, 36068,
-    [12178, 35211], 37749, 33382, 21133, 39198, 28472, 28666, 28567, 23559,
-    28479, 34083, 27123, 22892, 35611, 37292, 33184, 28550, 39509, 23308,
-    25898, 37496, 30703, 20709, 39171, 32371, 32094, 36686, 36611, 38542,
-    31680, 28500, 32080, 35489, 32202, 37670, 20677, 35641, 36914, 29180,
-    30433, 21185, 33686, 39912, 39514, 32147, 38968, 37857, 24465, 30169,
-    31478, 31998, 33290, 39378, 33289, 25818, 37624, 25084, 21127, 40273,
-    32121, 35258, 35363, 32118, 37406, 36557, 39423, 38283, 20977, 38982,
-    27579, 35506, 22718, 25031, 25715, 24235, 35122, 35463, 22602, 20744,
-    23532, 31014, 26336, 34407, 24011, 31418, 39243, 28528, 25844, 38346,
-    34847, 33240, 33802, 20358, 36084, 34253, 27396, 25876, 31811, 38348,
-    34349, 28734, 35733, 25900, 35261, 25078, 32412, 29211, 28651, 25736,
-    21214, 28551, 27138, 37939, 22744, 39006, 31852, 38626, 28757, 35023,
-    39881, 31150, 40599, 21426, 21237, 31019, 27511, 28701, 38584, 20486,
-    32879, 34030, 36899, 37934, 24976, 28451, 31806, 25986, 33225, 37832,
-    25088, 29001, 32244, 31975, 20841, 36635, 35538, 30274, 36988, 37904,
-    29557, 33256, 37168, 40023, 36035, 40801, 37428, 38728, 23994, 38936,
-    39230, 21129, [12243, 40845], 32894, 22184, 31840, 22751, 25871, 38580,
-    27155, 23105, 25695, 31757, 34310, 30439, 39025, 24300, 29200, 25796,
-    28407, 34396, 39791, 36034, 37682, 38520, 39522, 37569, 23650, 32311,
-    24942, 28670, 32209, 24018, 25891, 23423, 28772, 20098, 25476, 36650,
-    20523, 20374, 28138, 32184, 35542, 34367, 32645, 37007, 38012, 31854,
-    39486, 39409, 32097, 23229, 29802, 30908, 34718, [12218, 39340], 39393,
-    21966, 36023, [12230, 40613], 36067, 36993, 30622, 39237, 34875, 28415,
-    35646, 37672, 37466, 36031, 37762, [12200, 38272], 24758, 20497, 37683,
-    22818, 35598, 24396, 35219, 32191, 32236, 24287, 28357, 25003, 38313,
-    40180, 37528, 35628, 35584, 30045, 37385, 32013, 38627, 25747, 33126,
-    24817, 39719, 39186, 25836, 33193, 25862, 37312, [12227, 40165], 32886,
-    22169, 38007, 37811, 27320, 29552, 23527, 25840, 28632, 37397, 32016,
-    33215, 28611, 36786, 30247, 35582, 27472, 40407, 27590, 22036, 28442,
-    30436, 40848, 36064, 22132, 40300, 39449, 39108, 38971, 36007, 34315,
-    24977, 35413, 28497, 38935, 25778, 37610, 20693, 27192, 35676, 33229,
-    [12241, 40778], 39438, 35912, 21843, 27683, 35350, 29309, 37370, 37467,
-    36983, 31805, 35609, 37666, 37463, 28154, 35700, 22649, 27085, 21958,
-    22715, 34196, 25654, 37740, 27211, 21932, 20689, 32761, 31429, 31434,
-    27453, 35242, 23522, 36629, 27691, 20670, 38915, 35531, 24950, 29898,
-    31406, 36264, 21312, 36544, 39493, 40818, 39028, 27402, 21240, 40306,
-    30906, 35731, 39250, 25854, 32350, 29105, 38860, 35469, 32009, 27054,
-    32104, 36575, 37613, 38287, 28516, 28753, 34217, 39955, 36093, 20632,
-    21930, 39479, 25475, 28544, 27578, 32023, 31721, 26348, 38275, 38493,
-    36109, 32341, 20663, 36062, 29138, 32057, 36050, 25448, 25885, 25086,
-    35373, 32051, 23529, 23352, 33102, 28402, 32882, 32361, 21213, 32854,
-    24107, 29509, 28629, 35433, 26178, 34645, 23526, 35672, 39387, 21218,
-    36969, 37323, 39166, 35222, 35430, 22781, 29560, 27166, 36664, 26360,
-    36118, 23660, 34899, 27193, 31466, 25976, 24101, 38617, 35504, 38918,
-    35500, 30889, 29197, 32114, 39164, 39686, 32883, 24939, 38924, 35359,
-    35494, 25851, 34311, 35380, 32901, 38614, 38568, 32143, 27506, 23403,
-    25613, 32302, 29795, 37782, 29562, 25787, 33274, 24907, 25892, 36010,
-    30321, 28760, 22727, 35674, 35527, 22022, 28271, 29145, 28644, 32295,
-    35342, 39472, 35588, 37563, 38988, 39636, 26781, 36028, 37941, 24307,
-    32893, 28916, 37509, 32113, 38957, 22294, 22615, 22296, 38973, 40213,
-    39345, 39389, 27234, 31402, 35178, 24398, 28771, 38929, 33836, 32178,
-    [12209, 38859], 36949, 22285, 29234, 28656, 32173, 33894, 20553, 20702,
-    32239, 35586, 34907, 32862, 32011, 31337, 21839, 25790, 34680, 28198,
-    31401, 21978, 37794, 28879, 35491, 28961, 34154, 22626, 38695, 21209,
-    35492, 37675, 29351, 35186, 32722, 37521, 25138, 32048, 34662, 36676,
-    23805, 20448, 29433, 22151, 37697, 39854, 32406, 36066, 37532, 38289,
-    39023, 38570, 29694, 29563, 32291, 39201, 25010, 32171, 38002, 37129,
-    35443, 38911, 38917, 34157, 22210, 37559, 26313, 22063, 21332, 25406,
-    33029, 35559, 23531, 28681, 35613, 37573, 37313, 33288, 37561, 32137,
-    38920, 35377, 32210, 32396, 36562, 25080, 36984, 30316, 32098, 23416,
-    21211, 35426, 23563, 39348, 35347, 35338, 36956, 22739, 40201, 40232,
-    21854, 20126, 35357, 38329, 40573, 22196, 38996, 38331, 33399, 21421,
-    30831, 35578, 39511, 40230, 26954, 25562, 30221, 38525, 30306, 39178,
-    27171, 22575, 35617, 34277, 29242, [12212, 38913], 26989, 33865, 37291,
-    37541, 38948, 36986, 20736, 34811, 34269, 20740, 25014, 32681, 35427,
-    35696, 35516, 35695, 32377, 34093, 38512, 37504, 39154, 38577, 27387,
-    23344, 40441, 25033, 32403, 29801, 34722, 29151, 29074, 34821, 36111,
-    31310, 21938, 25793, 20653, 30320, 36404, 20778, 24962, 37109, 37438,
-    29494, 35480, 36671, 39192, [12226, 39770], 28417, 33287, 23996, 35486,
-    39729, 29508, 35709, 38928, 39341, 40219, 28149, 36677, 22290, 21729,
-    22291, 32227, 36960, 39000, 32004, 36493, 38000, 38322, 38642, 37142,
-    38549, 36939, 34292, 37270, 26248, 38620, 36617, 25890, 26283, 36106,
-    36124, 33247, 38015, 26839, 31432, 36012, 25799, 21063, 28580, 36042,
-    36104, 36555, 37720, 38296, 35408, 40779, 20661, 27656, 30430, 26028,
-    36670, 23940, 26855, 25136, 32187, 24373, 28466, 24115, 36076, 33081,
-    36249, 34756, 36685, 37754, 36889, 35998, 37341, 20597, 35386, 37806,
-    38499, 24128, 30309, 37165, 35657, 32340, 32887, 22519, 34937, 32025,
-    25711, 25842, 24159, 36074, 28399, 37912, 32066, 31278, 33131, 34886,
-    35589, 36600, 30394, 26205, 39519, 35576, 35461, 29165, 30682, 22225,
-    36015, 37956, 31689, 39376, 23560, 30938, 36681, 36090, 27137, 33674,
-    35037, 22941, 22767, 29376, 37648, 36101, 22684, 32180, 35524, 28310,
-    28609, 36039, 28460, 32156, 32317, 32305, 37138, 35419, 32068, 38013,
-    21959, 21401, 21428, 38760, 36107, 21293, 21297, 36094, 21060, 21132,
-    21108, 20660, 20480, 20630, 20757, 20738, 20756, 20796, 20791, 20712,
-    20674, 20795, 20752, 20794, 20681, 31988, 40652, 22213, 40172, 35131,
-    33248, 35329, 35344, 35340, 35349, 35635, 35406, 35365, 35393, 35382,
-    35398, 35412, 35416, 35410, 35462, 35460, 35455, 35440, 35452, 35445,
-    35436, 35438, 35533, 35554, 35425, 35482, 35493, {f: 2, c: 35473}, 35535,
-    35537, 35529, 35547, 35543, 35522, 35510, 35574, 35563, 35604, 35585,
-    35556, 35565, 35580, 35571, 35558, 35566, 35550, 35624, 35740, 35606,
-    35610, 35600, 35627, 35629, 35670, 35673, 35662, 35742, 35691, 35734,
-    38488, 37178, 37140, 37172, 37087, 37174, 37126, 37192, 33467, 21233,
-    24048, 22538, 22745, 22754, 22752, 22746, 22497, 22607, 22550, 22610,
-    22557, 22628, 34188, 34131, 34294, 33703, 33799, 34031, 33511, 34338,
-    34086, 22603, 29026, 34136, 34045, 34126, 34184, 34234, 29334, 28366,
-    34113, 34254, 34130, 33984, 33874, 33892, 33940, 33845, 34207, 34133,
-    40367, 33939, 32264, 34118, 34146, 34078, 39488, 34362, 37795, 34167,
-    34334, 34298, 34308, 34282, 34330, 22889, 23607, 25451, 25718, 25759,
-    25681, 25692, 25779, 25860, 25878, 25847, 25852, 25883, 22064, 22072,
-    22216, 22182, 21764, 21692, 22144, 22109, 22112, 22069, 22006, 22118,
-    22130, 22156, 22117, 22044, 22062, 21993, 22038, 22208, 22029, 22195,
-    22209, 22127, 36705, 22198, 22165, 22279, 24131, 24172, 24152, 24151,
-    23943, 23796, 23888, 23852, 23975, 23968, 23959, 23821, 23992, 23937,
-    24020, 24480, 29559, 29505, 29546, 29499, 29547, 29568, 29564, 39136,
-    39219, 39145, 39228, {f: 2, c: 39146}, 39149, 39156, 39177, 39185, 39195,
-    39223, 39231, 39235, {f: 3, c: 39240}, 39244, 39266, 24289, 36065, 25082,
-    25006, 24938, 24894, 24757, 24884, 25036, 24927, 25064, 24827, 24887,
-    24818, 24947, 24860, 24978, 38274, 38278, 38344, 38286, 38292, 38284,
-    38373, 38317, 38315, 39726, 38316, 38334, 38326, 39721, 38335, 38333,
-    38332, 38339, 38347, 38356, 38352, 38357, 38366, 28739, 28505, 28711,
-    28696, 28668, 28039, 28025, 28254, 28590, 28687, 28408, 28527, 28150,
-    28543, 28678, 28576, 28683, 28775, 28740, 28677, 28535, 28704, 28703,
-    28722, 28712, 28765, 39467, 36999, 36885, 37008, 23656, 24371, 23285,
-    23255, 23296, 23149, 23304, 23372, 23207, 23291, 23307, 23329, 23338,
-    23321, 39380, 39391, 39385, 39478, 39515, 39377, 39384, 39501, 39498,
-    39394, 39530, 39439, 39437, 39429, 39490, 39469, 39446, 39489, 39470,
-    39480, {f: 2, c: 39491}, 39503, 39525, 39524, 31993, 32006, 32002,
-    {f: 2, c: 32007}, 32394, 32028, 32021, 32019, 32058, 32050, 32049, 32272,
-    32060, 32064, 32063, 32093, 32078, 32115, 32134, 32131, 32136, 32190,
-    32186, 32203, 32212, 32196, 32158, 32172, 32185, 32163, 32176, 32199,
-    32217, 32215, 32249, 32242, 32354, 32230, 32246, 32241, 32267, 32225,
-    32265, 32285, 32287, 32286, 32301, 32266, 32273, 32381, 32313, 32309,
-    32306, 32326, 32325, 32392, 32346, 32338, 32366, 32382, 32368, 32367,
-    32408, 29859, 29771, 29903, 38922, 29885, 29759, 29833, 29862, 29908,
-    29914, 38873, 38878, 38876, 27050, 27370, 26776, 26838, 27141, 26783,
-    27355, 27379, 27368, 27359, 27273, 26895, 27208, 26984, 27071, 27194,
-    27292, 27410, 27422, 27357, 27111, 27407, 27414, 27372, 27354, 27384,
-    27315, 27367, 27299, 27347, 27358, 27556, 27550, 27566, 27563, 27567,
-    36564, 36571, 36594, 36603, 36708, 36601, 36604, 36587, 36580, 36706,
-    36602, 36606, 36618, 36615, 36613, 36626, 36646, {f: 2, c: 36638}, 36636,
-    36659, 36678, 36692, 25108, 25127, 29964, 26311, 26308, 26249, 26326,
-    36033, 36016, 36026, 36029, 36100, 36018, 36037, 36112, 36049, 36058,
-    36053, 36075, 36071, 36091, 35224, 35244, 35233, 35263, 35238, 35247,
-    35250, 35255, 27647, 27660, 27692, 29272, 26407, 33110, 33242, 33051,
-    33214, 33121, 33231, 27487, {f: 2, c: 39086}, 39094, 39100, 39110, 39112,
-    36674, 40783, 26005, 29036, 29010, 29079, 29121, 29148, 29182, 31152,
-    31118, 31146, 25055, 24932, 25059, 25095, 28585, 30959, 30893, 30824,
-    30904, 31018, 31025, 30820, 30973, 30951, 30947, 40853, 30616, 30558,
-    30652, 32646, 32648, {f: 3, c: 37330}, 37337, 37335, 37333, 37367, 37351,
-    37348, 37702, 37365, 37369, 37384, 37414, 37445, 37393, 37392, 37377,
-    37415, 37380, 37413, 37376, 37434, 37478, 37431, 37427, 37461, 37437,
-    37432, 37470, {f: 2, c: 37484}, 37439, 37984, 37424, 37449, 37448, 37453,
-    37422, 37433, 37944, 37548, 37536, 37498, 37546, 37614, 37583, 37891,
-    37603, 37946, 37553, 37542, 37799, 37526, 37580, 37545, 37877, 37523,
-    37503, 37801, 37530, 37658, 37547, 37507, 37899, 37544, 37539, 37906,
-    37688, 37617, 37847, 37605, 37616, 37615, 37608, 37564, 37597, 37622,
-    {f: 2, c: 37926}, 37571, 37599, 37606, 37650, 37638, 37737, 37659, 37696,
-    37633, 37653, 37678, 37699, {f: 2, c: 37639}, 37663, 37657, 37733, 37703,
-    37750, 37716, 37732, 37802, 37744, 37764, 37860, 37848, 37928, 37767,
-    37836, 37784, 37816, 37823, 37798, 37808, 37813, 37964, 37858,
-    {f: 2, c: 37852}, 37837, 37854, 37827, 37831, 37841, 37908, 37917, 37879,
-    37989, 37907, 37997, 37920, 38009, 37881, 37913, 37962, 37938, 37951,
-    37972, 37987, 37758, 31329, 40169, 40182, 40199, 40198, 40227, 40327,
-    40469, 40221, 40223, 40421, 40239, 40409, 40240, 40258, 40478, 40275,
-    40477, 40288, 40274, 40435, 40284, 40289, 40339, 40298, 40303, 40329,
-    40344, 40346, 40384, 40357, 40361, 40386, 40380, 40474, 40403, 40410,
-    40431, 40422, 40434, 40440, 40460, 40442, 40475, 30308, 30296, 30311,
-    30210, {f: 2, c: 30278}, 30281, 30238, 30267, {f: 2, c: 30317}, 30313,
-    30322, 31431, 31414, 35168, 35123, 35165, 35143, 35128, 35172, 30392,
-    32814, 32812, 32889, 32885, 38919, {f: 2, c: 38926}, 38945, 38940, 28481,
-    38950, 38967, 38990, 38995, 39027, 39010, 39001, 39013, 39020, 39024,
-    34787, 34822, 34566, 34851, 34806, 34554, 34799, 34692, 34832, 34760,
-    34833, 34747, 34766, 32588, 31716, 31591, 31849, 31731, 31744, 31691,
-    31836, 31774, 31787, 31779, 31850, 31839, 33380, 33387, 35018, 32677,
-    31986, 31990, 31965, 32310, 40617, 36274, 37317, 37315, 40570, 36489,
-    36428, 36498, 36474, 36437, 36506, 36491, 36499, 36497, 36513, 36451,
-    36522, 36518, 35316, 35318, 38746, 38722, 38717, 38724, 40788, 40799,
-    40793, 40800, 40796, 40806, 40812, 40810, 40823, [12236, 40701], 40703,
-    40713, 35726, 38014, 37864, 39799, 39796, 39809, 39811, 39822, 40056,
-    31308, 39826, 40031, 39824, 39853, 39834, 39850, 39838, 40045, 39851,
-    39837, 40024, 39873, 40058, 39985, 39993, 39971, 39991, 39872, 39882,
-    39879, 39933, 39894, {f: 2, c: 39914}, 39905, 39908, 39911, 39901, 39906,
-    39920, 39899, 39924, 39892, 40029, 39944, 39952, 39949, 39954, 39945,
-    39935, 39968, 39986, 39981, 39976, 39973, 39977, 39987, 39998, 40008,
-    39995, 39989, 40005, 40022, 40020, 40018, 40039, 38851, 38845, 38857,
-    40379, 39631, 39638, 39637, 39768, 39758, 39255, 39260, 39714, 40695,
-    40690, 35180, 38342, 37686, 24390, 34068, 32404, 40803, 22137, 40725,
-    22081, 39662, 35079, 31296, 39091, 38308, 39693, 36852, 24409, 31339,
-    39138, 20642, 34193, 20760, 25458, 21067, 30543, 32397, 26310, 30637,
-    [12228, 40565], 22217, 40692, 28635, 25054, 30663, 28720, 40629, 34890,
-    38370, 38854, 31844, 32308, 38822, 40623, 22220, 39089, 27311, 32590,
-    31984, 20418, 32363, 40569, 22190, 39706, 33903, 31142, 31858, 39634,
-    38587, 32251, 35069, 30787, {f: 10, c: 8560}, {f: 2, c: 714}, 729, 8211,
-    8213, 8229, 8245, 8453, 8457, {f: 4, c: 8598}, 8725, 8735, 8739, 8786,
-    {f: 2, c: 8806}, 8895, {f: 36, c: 9552}, {f: 15, c: 9601}, {f: 3, c: 9619},
-    {f: 2, c: 9660}, {f: 4, c: 9698}, 9737, 8853, 12306, {f: 2, c: 12317},
-    {f: 9, c: 12321}, 12963, {f: 2, c: 13198}, {f: 3, c: 13212}, 13217, 13252,
-    13262, {f: 2, c: 13265}, 13269, 65072, 65506, 65508, 8481, 12849, 8208,
-    12540, {f: 2, c: 12443}, {f: 2, c: 12541}, 12294, {f: 2, c: 12445},
-    {f: 10, c: 65097}, {f: 4, c: 65108}, {f: 14, c: 65113}, {f: 4, c: 65128},
-    12350, {f: 12, c: 12272}, 19970, {f: 3, c: 19972}, 19983, 19986, 19991,
-    {f: 3, c: 19999}, 20003, 20006, 20009, {f: 2, c: 20014}, 20017, 20019,
-    20021, 20023, 20028, {f: 3, c: 20032}, 20036, 20038, 20042, 20049, 20053,
-    20055, {f: 2, c: 20058}, {f: 4, c: 20066}, {f: 2, c: 20071},
-    {f: 6, c: 20074}, 20082, {f: 10, c: 20084}, {f: 3, c: 20095},
-    {f: 2, c: 20099}, [12037, 20101], 20103, 20106, 20112, {f: 2, c: 20118},
-    20121, {f: 2, c: 20124}, 20131, 20138, {f: 3, c: 20143}, 20148,
-    {f: 4, c: 20150}, {f: 3, c: 20156}, 20168, 20172, {f: 2, c: 20175}, 20178,
-    {f: 3, c: 20186}, 20192, 20194, {f: 2, c: 20198}, 20201, {f: 3, c: 20205},
-    20209, 20212, {f: 3, c: 20216}, 20220, 20222, 20224, {f: 7, c: 20226},
-    {f: 2, c: 20235}, {f: 5, c: 20242}, {f: 2, c: 20252}, 20257, 20259,
-    {f: 2, c: 20264}, {f: 3, c: 20268}, 20273, 20275, 20277, 20279, 20281,
-    20283, {f: 5, c: 20286}, {f: 2, c: 20292}, {f: 6, c: 20295}, 20306, 20308,
-    20310, {f: 2, c: 20321}, 20326, 20328, {f: 2, c: 20330}, {f: 2, c: 20333},
-    {f: 2, c: 20337}, 20341, {f: 4, c: 20343}, 20349, {f: 3, c: 20352}, 20357,
-    20359, 20362, 20364, 20366, 20368, {f: 2, c: 20370}, 20373,
-    {f: 3, c: 20376}, 20380, {f: 2, c: 20382}, {f: 2, c: 20385}, 20388, 20395,
-    20397, {f: 5, c: 20400}, {f: 9, c: 20406}, {f: 2, c: 20416},
-    {f: 4, c: 20422}, {f: 3, c: 20427}, {f: 5, c: 20434}, 20441, 20443, 20450,
-    {f: 2, c: 20452}, 20455, {f: 2, c: 20459}, 20464, 20466, {f: 4, c: 20468},
-    20473, {f: 3, c: 20475}, 20479, {f: 5, c: 20481}, {f: 2, c: 20487}, 20490,
-    20494, 20496, 20499, {f: 3, c: 20501}, 20507, {f: 2, c: 20509}, 20512,
-    {f: 3, c: 20514}, 20519, {f: 11, c: 20527}, 20539, 20541, {f: 4, c: 20543},
-    {f: 3, c: 20548}, {f: 2, c: 20554}, 20557, {f: 5, c: 20560},
-    {f: 4, c: 20566}, 20571, {f: 8, c: 20573}, {f: 6, c: 20582},
-    {f: 7, c: 20589}, {f: 3, c: 20600}, {f: 2, c: 20604}, {f: 4, c: 20609},
-    {f: 2, c: 20614}, {f: 4, c: 20617}, {f: 8, c: 20622}, 20631,
-    {f: 8, c: 20634}, 20644, 20646, {f: 2, c: 20650}, {f: 4, c: 20654}, 20662,
-    {f: 2, c: 20664}, {f: 2, c: 20668}, {f: 3, c: 20671}, {f: 2, c: 20675},
-    {f: 3, c: 20678}, {f: 5, c: 20682}, 20688, {f: 3, c: 20690},
-    {f: 3, c: 20695}, {f: 3, c: 20699}, {f: 6, c: 20703}, {f: 3, c: 20713},
-    {f: 4, c: 20719}, 20724, {f: 3, c: 20726}, 20730, {f: 4, c: 20732}, 20737,
-    20739, 20741, 20746, {f: 4, c: 20748}, 20753, 20755, {f: 2, c: 20758},
-    {f: 6, c: 20761}, 20768, {f: 8, c: 20770}, {f: 7, c: 20779},
-    {f: 4, c: 20787}, {f: 2, c: 20792}, {f: 2, c: 20797}, 20802, 20807, 20810,
-    20812, {f: 3, c: 20814}, 20819, {f: 3, c: 20823}, 20827, {f: 5, c: 20829},
-    {f: 2, c: 20835}, {f: 2, c: 20838}, 20842, 20847, 20850, 20858,
-    {f: 2, c: 20862}, {f: 2, c: 20867}, {f: 2, c: 20870}, {f: 2, c: 20874},
-    {f: 4, c: 20878}, {f: 2, c: 20883}, 20888, 20890, {f: 3, c: 20893}, 20897,
-    20899, {f: 5, c: 20902}, {f: 2, c: 20909}, 20916, {f: 3, c: 20920},
-    {f: 2, c: 20926}, {f: 3, c: 20929}, 20933, 20936, 20938, 20942, 20944,
-    {f: 9, c: 20946}, 20956, {f: 2, c: 20958}, {f: 2, c: 20962},
-    {f: 6, c: 20965}, 20972, 20974, 20978, 20980, 20983, 20990,
-    {f: 2, c: 20996}, 21001, {f: 2, c: 21003}, {f: 2, c: 21007},
-    {f: 3, c: 21011}, 21020, {f: 2, c: 21022}, {f: 3, c: 21025},
-    {f: 3, c: 21029}, 21034, 21036, 21039, {f: 2, c: 21041}, {f: 2, c: 21044},
-    21052, 21054, {f: 2, c: 21061}, {f: 2, c: 21064}, {f: 2, c: 21070},
-    {f: 2, c: 21074}, 21077, {f: 4, c: 21079}, 21085, {f: 2, c: 21087},
-    {f: 3, c: 21090}, 21094, 21096, {f: 3, c: 21099}, {f: 2, c: 21104}, 21107,
-    {f: 7, c: 21110}, 21118, 21120, {f: 3, c: 21124}, 21131, {f: 2, c: 21134},
-    21138, {f: 7, c: 21140}, 21148, {f: 4, c: 21156}, {f: 3, c: 21166},
-    {f: 10, c: 21172}, 21184, 21186, {f: 3, c: 21188}, 21192, 21194,
-    {f: 4, c: 21196}, 21201, {f: 2, c: 21203}, 21207, 21210, 21212,
-    {f: 2, c: 21216}, 21219, {f: 11, c: 21221}, {f: 3, c: 21234},
-    {f: 2, c: 21238}, {f: 3, c: 21243}, {f: 4, c: 21249}, 21255,
-    {f: 4, c: 21257}, 21262, {f: 4, c: 21265}, 21272, {f: 2, c: 21275},
-    {f: 2, c: 21278}, 21282, {f: 2, c: 21284}, {f: 3, c: 21287},
-    {f: 2, c: 21291}, 21296, {f: 6, c: 21298}, [12054, 21304],
-    {f: 2, c: 21308}, 21314, 21316, 21318, {f: 3, c: 21323}, 21328,
-    {f: 2, c: 21336}, 21339, 21341, 21349, 21352, 21354, {f: 2, c: 21356},
-    21362, 21366, 21369, {f: 4, c: 21371}, {f: 2, c: 21376}, 21379,
-    {f: 2, c: 21383}, 21386, {f: 7, c: 21390}, {f: 2, c: 21398},
-    {f: 2, c: 21403}, 21406, 21409, 21412, 21415, {f: 3, c: 21418},
-    {f: 3, c: 21423}, 21427, 21429, {f: 4, c: 21431}, {f: 3, c: 21436}, 21440,
-    {f: 4, c: 21444}, {f: 3, c: 21454}, {f: 2, c: 21458}, 21461, 21466,
-    {f: 3, c: 21468}, 21473, 21479, 21492, 21498, {f: 3, c: 21502}, 21506,
-    21509, 21511, 21515, 21524, {f: 3, c: 21528}, 21532, 21538,
-    {f: 2, c: 21540}, 21546, 21552, 21555, {f: 2, c: 21558}, 21562, 21565,
-    21567, {f: 2, c: 21569}, {f: 2, c: 21572}, 21575, 21577, {f: 4, c: 21580},
-    21585, 21594, {f: 5, c: 21597}, 21603, 21605, 21607, {f: 8, c: 21609},
-    21620, {f: 2, c: 21625}, {f: 2, c: 21630}, 21633, 21635, 21637,
-    {f: 4, c: 21639}, 21645, 21649, 21651, {f: 2, c: 21655}, 21660,
-    {f: 5, c: 21662}, 21669, 21678, 21680, 21682, {f: 3, c: 21685},
-    {f: 2, c: 21689}, 21694, 21699, 21701, {f: 2, c: 21706}, 21718, 21720,
-    21723, 21728, {f: 3, c: 21730}, {f: 2, c: 21739}, {f: 3, c: 21743},
-    {f: 6, c: 21748}, 21755, 21758, 21760, {f: 2, c: 21762}, 21765, 21768,
-    {f: 5, c: 21770}, {f: 2, c: 21778}, {f: 6, c: 21781}, {f: 4, c: 21788},
-    21793, {f: 2, c: 21797}, {f: 2, c: 21800}, 21803, 21805, 21810,
-    {f: 3, c: 21812}, {f: 4, c: 21816}, 21821, 21824, 21826, 21829,
-    {f: 2, c: 21831}, {f: 4, c: 21835}, {f: 2, c: 21841}, 21844,
-    {f: 5, c: 21847}, 21853, {f: 2, c: 21855}, {f: 2, c: 21858},
-    {f: 2, c: 21864}, 21867, {f: 6, c: 21871}, {f: 2, c: 21881}, 21885, 21887,
-    {f: 2, c: 21893}, {f: 3, c: 21900}, 21904, {f: 2, c: 21906},
-    {f: 3, c: 21909}, {f: 2, c: 21914}, 21918, {f: 7, c: 21920},
-    {f: 2, c: 21928}, 21931, 21933, {f: 2, c: 21935}, 21940, 21942, 21944,
-    21946, 21948, {f: 5, c: 21951}, 21960, {f: 2, c: 21962}, {f: 2, c: 21967},
-    21973, {f: 3, c: 21975}, 21979, 21982, 21984, 21986, 21991,
-    {f: 2, c: 21997}, {f: 2, c: 22000}, 22004, {f: 5, c: 22008}, 22015,
-    {f: 4, c: 22018}, 22023, {f: 2, c: 22026}, {f: 4, c: 22032}, 22037,
-    {f: 2, c: 22041}, 22045, {f: 3, c: 22048}, {f: 2, c: 22053}, 22056,
-    {f: 2, c: 22058}, 22067, 22071, 22074, {f: 3, c: 22076}, 22080,
-    {f: 10, c: 22082}, {f: 5, c: 22095}, {f: 2, c: 22101}, {f: 2, c: 22106},
-    {f: 2, c: 22110}, 22113, 22115, 22119, {f: 2, c: 22125}, 22128, 22131,
-    22133, 22135, 22138, {f: 3, c: 22141}, {f: 4, c: 22145}, {f: 4, c: 22152},
-    22157, {f: 3, c: 22160}, 22164, {f: 3, c: 22166}, {f: 9, c: 22170},
-    {f: 2, c: 22180}, 22183, {f: 5, c: 22185}, {f: 3, c: 22192}, 22197,
-    {f: 4, c: 22200}, {f: 3, c: 22205}, {f: 2, c: 22211}, {f: 2, c: 22214},
-    22219, {f: 4, c: 22221}, {f: 2, c: 22226}, {f: 2, c: 22229},
-    {f: 2, c: 22232}, 22236, 22243, {f: 6, c: 22245}, 22252, {f: 2, c: 22254},
-    {f: 2, c: 22258}, {f: 3, c: 22262}, {f: 2, c: 22267}, {f: 3, c: 22272},
-    22277, 22284, {f: 4, c: 22286}, {f: 2, c: 22292}, 22295, {f: 3, c: 22297},
-    {f: 2, c: 22301}, {f: 3, c: 22304}, {f: 4, c: 22308}, 22315,
-    {f: 2, c: 22321}, {f: 5, c: 22324}, {f: 2, c: 22332}, 22335, 22337,
-    {f: 4, c: 22339}, {f: 2, c: 22344}, 22347, {f: 5, c: 22354},
-    {f: 2, c: 22360}, {f: 2, c: 22370}, 22373, 22375, 22380, 22382,
-    {f: 3, c: 22384}, {f: 2, c: 22388}, {f: 3, c: 22392}, {f: 5, c: 22397},
-    {f: 4, c: 22407}, {f: 5, c: 22413}, {f: 7, c: 22420}, {f: 4, c: 22428},
-    22437, 22440, 22442, 22444, {f: 3, c: 22447}, 22451, {f: 3, c: 22453},
-    {f: 9, c: 22457}, {f: 7, c: 22468}, {f: 2, c: 22476}, {f: 2, c: 22480},
-    22483, {f: 2, c: 22486}, {f: 2, c: 22491}, 22494, {f: 2, c: 22498},
-    {f: 8, c: 22501}, 22510, {f: 4, c: 22512}, {f: 2, c: 22517},
-    {f: 2, c: 22523}, {f: 2, c: 22526}, 22529, {f: 2, c: 22531},
-    {f: 2, c: 22536}, 22540, {f: 3, c: 22542}, {f: 3, c: 22546},
-    {f: 2, c: 22551}, {f: 3, c: 22554}, 22559, {f: 2, c: 22562},
-    {f: 5, c: 22565}, {f: 4, c: 22571}, {f: 2, c: 22578}, {f: 14, c: 22582},
-    {f: 5, c: 22597}, 22606, 22608, 22611, {f: 2, c: 22613}, {f: 5, c: 22617},
-    {f: 3, c: 22623}, 22627, {f: 5, c: 22630}, {f: 8, c: 22637},
-    {f: 3, c: 22646}, {f: 4, c: 22650}, 22655, 22658, 22660, {f: 3, c: 22662},
-    {f: 7, c: 22667}, {f: 5, c: 22676}, 22683, 22685, {f: 8, c: 22688},
-    {f: 4, c: 22698}, {f: 4, c: 22703}, {f: 7, c: 22708}, 22717,
-    {f: 2, c: 22719}, {f: 3, c: 22722}, 22726, {f: 9, c: 22728}, 22738, 22740,
-    {f: 2, c: 22742}, {f: 3, c: 22747}, 22753, 22755, {f: 4, c: 22757}, 22762,
-    22765, {f: 2, c: 22769}, {f: 2, c: 22772}, {f: 2, c: 22775},
-    {f: 2, c: 22779}, {f: 4, c: 22782}, 22787, {f: 2, c: 22789},
-    {f: 2, c: 22792}, [12066, 22794], {f: 2, c: 22795}, 22798,
-    {f: 4, c: 22800}, {f: 2, c: 22807}, 22811, {f: 2, c: 22813},
-    {f: 2, c: 22816}, 22819, 22822, 22824, 22828, 22832, {f: 2, c: 22834},
-    {f: 2, c: 22837}, 22843, 22845, {f: 2, c: 22847}, 22851, {f: 2, c: 22853},
-    22858, {f: 2, c: 22860}, 22864, {f: 2, c: 22866}, 22873, {f: 5, c: 22875},
-    22881, {f: 2, c: 22883}, {f: 3, c: 22886}, 22891, 22893, {f: 4, c: 22895},
-    22901, 22903, {f: 3, c: 22906}, {f: 3, c: 22910}, 22917, 22921,
-    {f: 2, c: 22923}, {f: 4, c: 22926}, {f: 2, c: 22932}, 22936,
-    {f: 3, c: 22938}, {f: 4, c: 22943}, {f: 2, c: 22950}, {f: 2, c: 22956},
-    {f: 2, c: 22960}, {f: 6, c: 22963}, 22970, {f: 2, c: 22972},
-    {f: 7, c: 22975}, {f: 3, c: 22983}, {f: 4, c: 22988}, {f: 2, c: 22997},
-    23001, 23003, {f: 5, c: 23006}, 23012, {f: 2, c: 23014}, {f: 3, c: 23017},
-    {f: 12, c: 23021}, 23034, {f: 3, c: 23036}, 23040, 23042, {f: 2, c: 23050},
-    {f: 4, c: 23053}, 23058, {f: 4, c: 23060}, {f: 3, c: 23065},
-    {f: 2, c: 23069}, {f: 2, c: 23073}, 23076, {f: 3, c: 23078},
-    {f: 7, c: 23082}, 23091, 23093, {f: 5, c: 23095}, {f: 3, c: 23101},
-    {f: 4, c: 23106}, {f: 2, c: 23111}, {f: 10, c: 23115}, {f: 4, c: 23126},
-    {f: 7, c: 23131}, {f: 3, c: 23139}, {f: 2, c: 23144}, {f: 2, c: 23147},
-    {f: 6, c: 23150}, {f: 2, c: 23160}, {f: 4, c: 23163}, {f: 18, c: 23168},
-    {f: 7, c: 23187}, {f: 11, c: 23196}, {f: 2, c: 23208}, {f: 7, c: 23211},
-    23220, {f: 2, c: 23222}, {f: 4, c: 23225}, {f: 2, c: 23231},
-    {f: 6, c: 23235}, {f: 2, c: 23242}, {f: 5, c: 23245}, 23251, 23253,
-    {f: 3, c: 23257}, {f: 3, c: 23261}, 23266, {f: 2, c: 23268},
-    {f: 2, c: 23271}, 23274, {f: 5, c: 23276}, {f: 3, c: 23282},
-    {f: 5, c: 23286}, {f: 4, c: 23292}, {f: 7, c: 23297}, 23306,
-    {f: 9, c: 23309}, 23320, {f: 7, c: 23322}, {f: 8, c: 23330},
-    {f: 5, c: 23339}, 23345, 23347, {f: 2, c: 23349}, {f: 7, c: 23353},
-    {f: 11, c: 23361}, {f: 3, c: 23373}, 23378, 23382, 23390, {f: 2, c: 23392},
-    {f: 2, c: 23399}, {f: 3, c: 23405}, 23410, 23412, {f: 2, c: 23414}, 23417,
-    {f: 2, c: 23419}, 23422, 23426, 23430, 23434, {f: 2, c: 23437},
-    {f: 3, c: 23440}, 23444, 23446, 23455, {f: 3, c: 23463}, {f: 4, c: 23468},
-    {f: 2, c: 23473}, 23479, {f: 3, c: 23482}, {f: 2, c: 23488}, 23491,
-    {f: 4, c: 23496}, {f: 3, c: 23501}, 23505, {f: 9, c: 23508}, 23520, 23523,
-    23530, 23533, 23535, {f: 4, c: 23537}, 23543, {f: 2, c: 23549}, 23552,
-    {f: 2, c: 23554}, 23557, 23564, 23568, {f: 2, c: 23570}, 23575, 23577,
-    23579, {f: 4, c: 23582}, 23587, 23590, {f: 4, c: 23592}, {f: 4, c: 23597},
-    {f: 2, c: 23602}, {f: 2, c: 23605}, {f: 2, c: 23619}, {f: 2, c: 23622},
-    {f: 2, c: 23628}, {f: 3, c: 23634}, {f: 3, c: 23638}, {f: 4, c: 23642},
-    23647, 23655, {f: 3, c: 23657}, 23661, 23664, {f: 7, c: 23666},
-    {f: 4, c: 23675}, 23680, {f: 5, c: 23683}, {f: 3, c: 23689},
-    {f: 2, c: 23694}, {f: 2, c: 23698}, 23701, {f: 4, c: 23709},
-    {f: 5, c: 23716}, 23722, {f: 3, c: 23726}, 23730, 23732, 23734,
-    {f: 4, c: 23737}, 23742, 23744, {f: 2, c: 23746}, {f: 6, c: 23749},
-    {f: 6, c: 23756}, {f: 6, c: 23763}, {f: 7, c: 23770}, {f: 2, c: 23778},
-    23783, 23785, {f: 2, c: 23787}, {f: 2, c: 23790}, {f: 3, c: 23793}, 23797,
-    {f: 4, c: 23799}, 23804, {f: 4, c: 23806}, {f: 2, c: 23812},
-    {f: 5, c: 23816}, {f: 5, c: 23823}, 23829, {f: 3, c: 23832},
-    {f: 2, c: 23836}, {f: 5, c: 23839}, 23845, 23848, {f: 2, c: 23850},
-    {f: 5, c: 23855}, {f: 8, c: 23861}, {f: 8, c: 23871}, {f: 2, c: 23880},
-    {f: 3, c: 23885}, {f: 7, c: 23889}, {f: 2, c: 23897}, 23900,
-    {f: 11, c: 23902}, 23914, {f: 2, c: 23917}, {f: 4, c: 23920},
-    {f: 12, c: 23925}, 23939, {f: 2, c: 23941}, {f: 15, c: 23944}, 23960,
-    {f: 3, c: 23962}, {f: 2, c: 23966}, {f: 6, c: 23969}, {f: 15, c: 23976},
-    23993, 23995, {f: 8, c: 23997}, {f: 5, c: 24006}, 24012, {f: 4, c: 24014},
-    24019, {f: 6, c: 24021}, 24028, {f: 2, c: 24031}, {f: 2, c: 24035}, 24042,
-    {f: 2, c: 24044}, {f: 2, c: 24053}, {f: 5, c: 24056}, {f: 2, c: 24063},
-    24068, 24071, {f: 3, c: 24073}, {f: 2, c: 24077}, {f: 2, c: 24082}, 24087,
-    {f: 7, c: 24094}, {f: 3, c: 24104}, 24108, {f: 2, c: 24111}, 24114,
-    {f: 2, c: 24116}, {f: 2, c: 24121}, {f: 2, c: 24126}, 24129,
-    {f: 6, c: 24134}, {f: 7, c: 24141}, 24150, {f: 2, c: 24153},
-    {f: 2, c: 24156}, 24160, {f: 7, c: 24164}, {f: 5, c: 24173}, 24181, 24183,
-    {f: 3, c: 24193}, 24197, {f: 2, c: 24200}, {f: 3, c: 24204}, 24210, 24216,
-    24219, 24221, {f: 4, c: 24225}, {f: 3, c: 24232}, 24236, {f: 5, c: 24238},
-    24244, {f: 4, c: 24250}, {f: 10, c: 24255}, {f: 6, c: 24267},
-    {f: 2, c: 24276}, {f: 4, c: 24279}, {f: 3, c: 24284}, {f: 4, c: 24292},
-    24297, 24299, {f: 6, c: 24301}, 24309, {f: 2, c: 24312}, {f: 3, c: 24315},
-    {f: 3, c: 24325}, 24329, {f: 3, c: 24332}, 24336, 24338, 24340, 24342,
-    {f: 2, c: 24345}, {f: 3, c: 24348}, {f: 4, c: 24353}, 24360,
-    {f: 2, c: 24363}, 24366, 24368, 24370, 24372, {f: 3, c: 24374}, 24379,
-    {f: 3, c: 24381}, {f: 5, c: 24385}, 24391, {f: 3, c: 24393}, 24397, 24399,
-    24401, 24404, {f: 3, c: 24410}, {f: 3, c: 24414}, 24419, 24421,
-    {f: 2, c: 24423}, 24427, {f: 2, c: 24430}, 24434, {f: 3, c: 24436}, 24440,
-    24442, {f: 3, c: 24445}, 24451, 24454, {f: 3, c: 24461}, {f: 2, c: 24467},
-    24470, {f: 2, c: 24474}, 24477, 24479, {f: 6, c: 24482}, {f: 2, c: 24491},
-    {f: 6, c: 24495}, 24502, 24504, {f: 2, c: 24506}, {f: 5, c: 24510},
-    {f: 2, c: 24519}, {f: 2, c: 24522}, 24526, {f: 3, c: 24531},
-    {f: 3, c: 24538}, {f: 2, c: 24542}, {f: 2, c: 24546}, {f: 2, c: 24549},
-    {f: 2, c: 24552}, 24556, {f: 2, c: 24559}, {f: 3, c: 24562},
-    {f: 2, c: 24566}, {f: 2, c: 24569}, 24572, {f: 3, c: 24583},
-    {f: 2, c: 24587}, {f: 2, c: 24592}, 24595, {f: 2, c: 24599}, 24602,
-    {f: 2, c: 24606}, {f: 3, c: 24610}, {f: 3, c: 24620}, {f: 5, c: 24624},
-    {f: 5, c: 24630}, {f: 2, c: 24637}, 24640, {f: 7, c: 24644}, 24652,
-    {f: 2, c: 24654}, 24657, {f: 2, c: 24659}, {f: 3, c: 24662},
-    {f: 2, c: 24667}, {f: 4, c: 24670}, {f: 2, c: 24677}, 24686,
-    {f: 2, c: 24689}, {f: 2, c: 24692}, 24695, 24702, {f: 3, c: 24704},
-    {f: 4, c: 24709}, {f: 2, c: 24714}, {f: 4, c: 24718}, 24723, 24725,
-    {f: 3, c: 24727}, 24732, 24734, {f: 2, c: 24737}, {f: 2, c: 24740}, 24743,
-    {f: 2, c: 24745}, 24750, 24752, 24755, 24759, {f: 2, c: 24761},
-    {f: 8, c: 24765}, {f: 3, c: 24775}, {f: 5, c: 24780}, {f: 3, c: 24786},
-    {f: 2, c: 24790}, 24793, 24795, 24798, {f: 4, c: 24802}, 24810, 24821,
-    {f: 2, c: 24823}, {f: 4, c: 24828}, {f: 4, c: 24834}, 24839,
-    {f: 3, c: 24842}, {f: 5, c: 24848}, {f: 4, c: 24854}, {f: 2, c: 24861},
-    {f: 2, c: 24865}, 24869, {f: 3, c: 24872}, {f: 8, c: 24876},
-    {f: 2, c: 24885}, {f: 6, c: 24888}, {f: 8, c: 24896}, 24905, 24909,
-    {f: 2, c: 24911}, {f: 3, c: 24914}, {f: 2, c: 24918}, 24921,
-    {f: 2, c: 24923}, 24926, {f: 2, c: 24928}, {f: 2, c: 24933}, 24937,
-    {f: 2, c: 24940}, 24943, {f: 2, c: 24945}, 24948, {f: 10, c: 24952},
-    {f: 7, c: 24963}, {f: 2, c: 24972}, 24975, 24979, {f: 5, c: 24981},
-    {f: 2, c: 24987}, {f: 6, c: 24990}, {f: 2, c: 24997}, 25002, 25005,
-    {f: 3, c: 25007}, {f: 3, c: 25011}, {f: 6, c: 25016}, {f: 3, c: 25023},
-    {f: 4, c: 25027}, {f: 4, c: 25037}, 25043, {f: 9, c: 25045},
-    {f: 3, c: 25056}, {f: 2, c: 25060}, 25063, {f: 9, c: 25065},
-    {f: 2, c: 25075}, 25081, 25083, 25085, {f: 5, c: 25089}, 25097, 25107,
-    25113, {f: 3, c: 25116}, 25120, 25123, 25126, {f: 2, c: 25128}, 25131,
-    25133, 25135, 25137, 25141, [12094, 25142], {f: 5, c: 25144}, 25154,
-    {f: 3, c: 25156}, 25162, {f: 2, c: 25167}, {f: 3, c: 25173},
-    {f: 2, c: 25177}, {f: 7, c: 25180}, {f: 2, c: 25188}, 25192,
-    {f: 2, c: 25201}, {f: 2, c: 25204}, {f: 2, c: 25207}, {f: 2, c: 25210},
-    25213, {f: 3, c: 25217}, {f: 4, c: 25221}, {f: 6, c: 25227}, 25236, 25241,
-    {f: 3, c: 25244}, 25251, {f: 2, c: 25254}, {f: 2, c: 25257},
-    {f: 4, c: 25261}, {f: 3, c: 25266}, {f: 3, c: 25270}, 25274, 25278,
-    {f: 2, c: 25280}, 25283, 25291, 25295, 25297, 25301, {f: 2, c: 25309},
-    {f: 2, c: 25312}, 25316, {f: 2, c: 25322}, 25328, 25330, 25333,
-    {f: 4, c: 25336}, 25344, {f: 4, c: 25347}, {f: 4, c: 25354},
-    {f: 2, c: 25359}, {f: 4, c: 25362}, {f: 3, c: 25367}, 25372,
-    {f: 2, c: 25382}, 25385, {f: 3, c: 25388}, {f: 2, c: 25392},
-    {f: 6, c: 25395}, {f: 2, c: 25403}, {f: 3, c: 25407}, 25412,
-    {f: 2, c: 25415}, 25418, {f: 4, c: 25425}, {f: 8, c: 25430}, 25440,
-    {f: 3, c: 25444}, 25450, 25452, {f: 2, c: 25455}, {f: 3, c: 25459},
-    {f: 2, c: 25464}, {f: 4, c: 25468}, 25473, {f: 2, c: 25477}, 25483, 25485,
-    25489, {f: 3, c: 25491}, 25495, {f: 7, c: 25497}, 25505, 25508, 25510,
-    25515, 25519, {f: 2, c: 25521}, {f: 2, c: 25525}, 25529, 25531, 25533,
-    25535, {f: 3, c: 25537}, 25541, {f: 2, c: 25543}, {f: 3, c: 25546}, 25553,
-    {f: 3, c: 25555}, {f: 3, c: 25559}, {f: 3, c: 25563}, 25567, 25570,
-    {f: 5, c: 25572}, {f: 2, c: 25579}, {f: 3, c: 25583}, 25587, 25589, 25591,
-    {f: 4, c: 25593}, 25598, {f: 2, c: 25603}, {f: 5, c: 25606}, 25614,
-    {f: 2, c: 25617}, {f: 2, c: 25621}, {f: 3, c: 25624}, 25629, 25631,
-    {f: 4, c: 25634}, {f: 3, c: 25639}, 25643, {f: 6, c: 25646}, 25653,
-    {f: 3, c: 25655}, {f: 2, c: 25659}, 25662, 25664, {f: 2, c: 25666}, 25673,
-    {f: 6, c: 25675}, 25683, {f: 3, c: 25685}, {f: 3, c: 25689}, 25693,
-    {f: 7, c: 25696}, 25704, {f: 3, c: 25706}, 25710, {f: 3, c: 25712},
-    {f: 2, c: 25716}, 25719, {f: 6, c: 25724}, 25731, 25734, {f: 8, c: 25737},
-    25748, {f: 2, c: 25751}, {f: 4, c: 25754}, {f: 3, c: 25760},
-    {f: 3, c: 25766}, 25770, 25775, 25777, 25780, 25782, 25785, 25789, 25795,
-    25798, {f: 2, c: 25800}, 25804, 25807, 25809, 25811, {f: 2, c: 25813},
-    25817, {f: 3, c: 25819}, 25823, 25825, 25827, 25829, {f: 5, c: 25831},
-    {f: 2, c: 25837}, 25843, {f: 2, c: 25845}, {f: 2, c: 25848}, 25853, 25855,
-    {f: 3, c: 25857}, 25861, {f: 2, c: 25863}, {f: 5, c: 25866},
-    {f: 2, c: 25872}, 25875, 25877, 25879, 25882, 25884, {f: 4, c: 25886},
-    {f: 4, c: 25894}, 25901, {f: 4, c: 25904}, 25911, 25914, {f: 2, c: 25916},
-    {f: 5, c: 25920}, {f: 2, c: 25926}, {f: 2, c: 25930}, {f: 2, c: 25933},
-    25936, {f: 3, c: 25938}, 25944, 25946, 25948, {f: 3, c: 25951},
-    {f: 2, c: 25956}, {f: 4, c: 25959}, {f: 3, c: 25965}, 25969, 25971, 25974,
-    {f: 9, c: 25977}, {f: 3, c: 25988}, {f: 3, c: 25992}, {f: 3, c: 25997},
-    26002, 26004, 26006, 26008, 26010, {f: 2, c: 26013}, 26016,
-    {f: 2, c: 26018}, 26022, 26024, 26026, 26030, {f: 6, c: 26033}, 26040,
-    {f: 2, c: 26042}, {f: 3, c: 26046}, 26050, {f: 4, c: 26055}, 26061,
-    {f: 2, c: 26064}, {f: 3, c: 26067}, {f: 8, c: 26072}, 26081,
-    {f: 2, c: 26083}, {f: 2, c: 26090}, {f: 4, c: 26098}, {f: 2, c: 26104},
-    {f: 5, c: 26107}, 26113, {f: 2, c: 26116}, {f: 3, c: 26119}, 26123, 26125,
-    {f: 3, c: 26128}, {f: 3, c: 26134}, {f: 3, c: 26138}, 26142,
-    {f: 4, c: 26145}, 26150, {f: 4, c: 26153}, 26158, 26160, {f: 2, c: 26162},
-    {f: 5, c: 26167}, 26173, {f: 2, c: 26175}, {f: 7, c: 26180},
-    {f: 2, c: 26189}, {f: 2, c: 26192}, {f: 2, c: 26200}, {f: 2, c: 26203},
-    26206, 26208, {f: 2, c: 26210}, 26213, 26215, {f: 5, c: 26217},
-    {f: 3, c: 26225}, 26229, {f: 2, c: 26232}, {f: 3, c: 26235},
-    {f: 3, c: 26239}, 26243, {f: 2, c: 26245}, {f: 2, c: 26250},
-    {f: 4, c: 26253}, {f: 4, c: 26258}, {f: 5, c: 26264}, {f: 4, c: 26270},
-    {f: 4, c: 26275}, {f: 2, c: 26281}, {f: 2, c: 26284}, {f: 5, c: 26287},
-    {f: 4, c: 26293}, {f: 4, c: 26298}, {f: 5, c: 26303}, 26309, 26312,
-    {f: 12, c: 26314}, {f: 2, c: 26327}, 26330, {f: 2, c: 26334},
-    {f: 5, c: 26337}, {f: 2, c: 26343}, {f: 2, c: 26346}, {f: 3, c: 26349},
-    26353, {f: 2, c: 26357}, {f: 2, c: 26362}, 26365, {f: 2, c: 26369},
-    {f: 4, c: 26372}, 26380, {f: 2, c: 26382}, {f: 3, c: 26385}, 26390,
-    {f: 3, c: 26392}, 26396, 26398, {f: 6, c: 26400}, 26409, 26414, 26416,
-    {f: 2, c: 26418}, {f: 4, c: 26422}, {f: 2, c: 26427}, {f: 2, c: 26430},
-    26433, {f: 2, c: 26436}, 26439, {f: 2, c: 26442}, 26445, 26450,
-    {f: 2, c: 26452}, {f: 5, c: 26455}, 26461, {f: 3, c: 26466},
-    {f: 2, c: 26470}, {f: 2, c: 26475}, 26478, 26484, 26486, {f: 4, c: 26488},
-    26493, 26496, {f: 2, c: 26498}, {f: 2, c: 26501}, 26504, 26506,
-    {f: 4, c: 26508}, {f: 4, c: 26513}, 26518, 26521, 26523, {f: 3, c: 26527},
-    26532, 26534, 26537, 26540, 26542, {f: 2, c: 26545}, 26548,
-    {f: 8, c: 26553}, 26562, {f: 10, c: 26565}, {f: 3, c: 26581}, 26587, 26591,
-    26593, {f: 2, c: 26595}, {f: 3, c: 26598}, {f: 2, c: 26602},
-    {f: 2, c: 26605}, 26610, {f: 8, c: 26613}, 26622, {f: 4, c: 26625}, 26630,
-    26637, 26640, 26642, {f: 2, c: 26644}, {f: 5, c: 26648}, {f: 3, c: 26654},
-    {f: 7, c: 26658}, {f: 7, c: 26667}, {f: 3, c: 26676}, {f: 2, c: 26682},
-    26687, 26695, 26699, 26701, 26703, 26706, {f: 10, c: 26710}, 26730,
-    {f: 8, c: 26732}, 26741, {f: 9, c: 26744}, 26754, 26756, {f: 8, c: 26759},
-    {f: 3, c: 26768}, {f: 3, c: 26772}, {f: 4, c: 26777}, 26782,
-    {f: 2, c: 26784}, {f: 3, c: 26787}, {f: 4, c: 26793}, 26798,
-    {f: 2, c: 26801}, 26804, {f: 10, c: 26806}, 26817, {f: 6, c: 26819}, 26826,
-    26828, {f: 4, c: 26830}, {f: 2, c: 26835}, 26841, {f: 4, c: 26843},
-    {f: 2, c: 26849}, {f: 3, c: 26852}, {f: 6, c: 26856}, 26863,
-    {f: 3, c: 26866}, {f: 3, c: 26870}, 26875, {f: 4, c: 26877},
-    {f: 3, c: 26882}, {f: 5, c: 26886}, 26892, 26897, {f: 12, c: 26899},
-    {f: 3, c: 26913}, {f: 8, c: 26917}, {f: 2, c: 26926}, {f: 3, c: 26929},
-    {f: 4, c: 26933}, {f: 3, c: 26938}, 26942, {f: 2, c: 26944},
-    {f: 7, c: 26947}, {f: 8, c: 26955}, {f: 2, c: 26965}, {f: 2, c: 26968},
-    {f: 2, c: 26971}, 26975, {f: 2, c: 26977}, {f: 2, c: 26980}, 26983,
-    {f: 2, c: 26985}, 26988, {f: 2, c: 26991}, {f: 3, c: 26994}, 26998,
-    {f: 2, c: 27002}, {f: 3, c: 27005}, 27009, 27011, 27013, {f: 3, c: 27018},
-    {f: 6, c: 27022}, {f: 2, c: 27030}, {f: 2, c: 27033}, {f: 10, c: 27037},
-    27049, 27052, {f: 2, c: 27055}, {f: 2, c: 27058}, {f: 2, c: 27061},
-    {f: 3, c: 27064}, {f: 3, c: 27068}, 27072, {f: 8, c: 27074}, 27087,
-    {f: 3, c: 27089}, {f: 6, c: 27093}, {f: 3, c: 27100}, {f: 6, c: 27105},
-    {f: 5, c: 27112}, {f: 4, c: 27118}, {f: 9, c: 27124}, 27134, 27136,
-    {f: 2, c: 27139}, {f: 4, c: 27142}, {f: 8, c: 27147}, {f: 3, c: 27156},
-    {f: 4, c: 27162}, 27168, 27170, {f: 4, c: 27172}, 27177, {f: 4, c: 27179},
-    27184, {f: 3, c: 27186}, {f: 2, c: 27190}, {f: 2, c: 27195},
-    {f: 5, c: 27199}, {f: 2, c: 27205}, {f: 2, c: 27209}, {f: 4, c: 27212},
-    {f: 7, c: 27217}, 27226, {f: 3, c: 27228}, 27232, {f: 2, c: 27235},
-    {f: 11, c: 27238}, {f: 7, c: 27250}, {f: 2, c: 27258}, {f: 3, c: 27261},
-    {f: 3, c: 27265}, {f: 4, c: 27269}, {f: 4, c: 27274}, 27279,
-    {f: 2, c: 27282}, {f: 2, c: 27285}, {f: 4, c: 27288}, {f: 3, c: 27293},
-    27297, {f: 5, c: 27300}, 27306, {f: 2, c: 27309}, {f: 3, c: 27312},
-    {f: 4, c: 27316}, {f: 2, c: 27321}, {f: 7, c: 27324}, {f: 15, c: 27332},
-    {f: 6, c: 27348}, 27356, {f: 7, c: 27360}, 27369, 27371, {f: 6, c: 27373},
-    {f: 4, c: 27380}, {f: 2, c: 27385}, {f: 8, c: 27388}, {f: 5, c: 27397},
-    {f: 4, c: 27403}, {f: 2, c: 27408}, {f: 3, c: 27411}, {f: 7, c: 27415},
-    27423, {f: 2, c: 27429}, {f: 10, c: 27432}, {f: 4, c: 27443}, 27448,
-    {f: 2, c: 27451}, {f: 4, c: 27455}, {f: 2, c: 27460}, 27464,
-    {f: 2, c: 27466}, {f: 3, c: 27469}, {f: 8, c: 27473}, {f: 5, c: 27482},
-    27488, {f: 2, c: 27496}, {f: 7, c: 27499}, {f: 4, c: 27507}, 27514,
-    {f: 4, c: 27517}, 27525, 27528, 27532, {f: 4, c: 27534}, {f: 2, c: 27540},
-    27543, 27545, {f: 2, c: 27548}, {f: 2, c: 27551}, {f: 2, c: 27554},
-    {f: 5, c: 27557}, {f: 2, c: 27564}, {f: 2, c: 27568}, 27574,
-    {f: 2, c: 27576}, {f: 3, c: 27580}, 27584, {f: 2, c: 27587},
-    {f: 4, c: 27591}, 27596, 27598, {f: 2, c: 27600}, 27608, 27610,
-    {f: 5, c: 27612}, {f: 8, c: 27618}, {f: 3, c: 27628}, {f: 3, c: 27632},
-    27636, {f: 3, c: 27638}, {f: 3, c: 27642}, 27646, {f: 5, c: 27648},
-    {f: 3, c: 27657}, 27662, 27666, 27671, {f: 3, c: 27676}, 27680, 27685,
-    27693, 27697, 27699, {f: 2, c: 27702}, {f: 4, c: 27705}, {f: 2, c: 27710},
-    {f: 3, c: 27715}, 27720, {f: 5, c: 27723}, {f: 3, c: 27729}, 27734,
-    {f: 3, c: 27736}, {f: 2, c: 27746}, {f: 3, c: 27749}, {f: 5, c: 27755},
-    27761, 27763, 27765, {f: 2, c: 27767}, {f: 3, c: 27770}, {f: 2, c: 27775},
-    27780, 27783, {f: 2, c: 27786}, {f: 2, c: 27789}, {f: 2, c: 27793},
-    {f: 4, c: 27797}, 27802, {f: 3, c: 27804}, 27808, 27810, 27816, 27820,
-    {f: 2, c: 27823}, {f: 4, c: 27828}, 27834, {f: 4, c: 27840},
-    {f: 3, c: 27846}, 27851, {f: 3, c: 27853}, {f: 2, c: 27857},
-    {f: 3, c: 27864}, {f: 2, c: 27868}, 27871, 27876, {f: 2, c: 27878}, 27881,
-    {f: 2, c: 27884}, 27890, 27892, 27897, {f: 2, c: 27903}, {f: 2, c: 27906},
-    {f: 2, c: 27909}, {f: 3, c: 27912}, 27917, {f: 3, c: 27919},
-    {f: 4, c: 27923}, 27928, {f: 2, c: 27932}, {f: 6, c: 27935}, 27942,
-    {f: 2, c: 27944}, {f: 2, c: 27948}, {f: 2, c: 27951}, 27956,
-    {f: 3, c: 27958}, 27962, {f: 2, c: 27967}, 27970, 27972, 27977, 27980,
-    27984, {f: 4, c: 27989}, 27995, 27997, 27999, {f: 2, c: 28001},
-    {f: 2, c: 28004}, {f: 2, c: 28007}, {f: 3, c: 28011}, {f: 4, c: 28016},
-    {f: 2, c: 28021}, {f: 2, c: 28026}, {f: 5, c: 28029}, {f: 2, c: 28035},
-    28038, {f: 2, c: 28042}, 28045, {f: 2, c: 28047}, 28050, {f: 5, c: 28054},
-    28060, 28066, 28069, {f: 2, c: 28076}, {f: 2, c: 28080}, {f: 2, c: 28083},
-    {f: 2, c: 28086}, {f: 6, c: 28089}, {f: 3, c: 28097}, {f: 3, c: 28104},
-    {f: 4, c: 28109}, {f: 4, c: 28114}, 28119, {f: 3, c: 28122}, 28127,
-    {f: 2, c: 28130}, 28133, {f: 3, c: 28135}, 28141, {f: 2, c: 28143}, 28146,
-    28148, 28152, {f: 8, c: 28157}, {f: 4, c: 28166}, 28171, 28175,
-    {f: 2, c: 28178}, 28181, {f: 2, c: 28184}, {f: 2, c: 28187},
-    {f: 2, c: 28190}, 28194, {f: 2, c: 28199}, 28202, 28206, {f: 2, c: 28208},
-    28211, {f: 3, c: 28213}, 28217, {f: 3, c: 28219}, {f: 4, c: 28223},
-    {f: 8, c: 28229}, {f: 4, c: 28239}, 28245, 28247, {f: 2, c: 28249},
-    {f: 2, c: 28252}, {f: 11, c: 28256}, {f: 2, c: 28268}, {f: 14, c: 28272},
-    {f: 3, c: 28288}, 28292, {f: 2, c: 28295}, {f: 5, c: 28298},
-    {f: 5, c: 28305}, 28311, {f: 3, c: 28313}, 28318, {f: 2, c: 28320},
-    {f: 2, c: 28323}, 28326, {f: 2, c: 28328}, {f: 4, c: 28331}, 28336, 28339,
-    28341, {f: 2, c: 28344}, 28348, {f: 3, c: 28350}, 28355, 28358,
-    {f: 3, c: 28360}, 28365, 28368, 28370, 28374, {f: 2, c: 28376},
-    {f: 3, c: 28379}, 28387, 28391, {f: 2, c: 28394}, {f: 2, c: 28397},
-    {f: 2, c: 28400}, 28403, {f: 2, c: 28405}, {f: 5, c: 28410}, 28416,
-    {f: 3, c: 28419}, {f: 2, c: 28423}, {f: 5, c: 28426}, {f: 3, c: 28432},
-    {f: 4, c: 28438}, {f: 5, c: 28443}, 28449, {f: 4, c: 28453}, 28462, 28464,
-    {f: 2, c: 28468}, 28471, {f: 5, c: 28473}, 28480, {f: 4, c: 28482},
-    {f: 3, c: 28488}, 28492, {f: 3, c: 28494}, {f: 2, c: 28498},
-    {f: 3, c: 28501}, {f: 2, c: 28506}, 28509, {f: 3, c: 28511}, 28515, 28517,
-    {f: 6, c: 28519}, 28529, 28531, {f: 2, c: 28533}, 28537, 28539,
-    {f: 2, c: 28541}, {f: 3, c: 28545}, 28549, {f: 2, c: 28554},
-    {f: 8, c: 28559}, {f: 4, c: 28568}, {f: 3, c: 28573}, {f: 2, c: 28578},
-    {f: 2, c: 28581}, 28584, {f: 4, c: 28586}, {f: 2, c: 28591}, 28594,
-    {f: 2, c: 28596}, {f: 2, c: 28599}, {f: 6, c: 28602}, {f: 5, c: 28612},
-    {f: 7, c: 28618}, {f: 2, c: 28627}, {f: 2, c: 28630}, {f: 2, c: 28633},
-    {f: 2, c: 28636}, {f: 2, c: 28642}, {f: 6, c: 28645}, {f: 2, c: 28652},
-    {f: 8, c: 28658}, 28667, 28669, {f: 6, c: 28671}, {f: 2, c: 28679}, 28682,
-    {f: 3, c: 28684}, 28688, {f: 3, c: 28690}, {f: 2, c: 28694}, 28697, 28700,
-    28702, {f: 2, c: 28705}, {f: 3, c: 28708}, {f: 7, c: 28713}, 28721,
-    {f: 2, c: 28723}, {f: 3, c: 28726}, {f: 4, c: 28730}, {f: 4, c: 28735},
-    {f: 7, c: 28741}, {f: 2, c: 28749}, 28752, {f: 3, c: 28754},
-    {f: 2, c: 28758}, {f: 4, c: 28761}, {f: 4, c: 28767}, {f: 2, c: 28773},
-    {f: 3, c: 28776}, 28782, {f: 4, c: 28785}, 28791, {f: 3, c: 28793}, 28797,
-    {f: 4, c: 28801}, {f: 3, c: 28806}, {f: 3, c: 28811}, {f: 3, c: 28815},
-    28819, {f: 2, c: 28823}, {f: 2, c: 28826}, {f: 13, c: 28830}, 28848, 28850,
-    {f: 3, c: 28852}, 28858, {f: 2, c: 28862}, {f: 4, c: 28868}, 28873,
-    {f: 4, c: 28875}, {f: 8, c: 28880}, 28890, {f: 3, c: 28892},
-    {f: 4, c: 28896}, 28901, 28906, 28910, {f: 4, c: 28912}, {f: 2, c: 28917},
-    28920, {f: 3, c: 28922}, {f: 11, c: 28926}, {f: 5, c: 28939},
-    {f: 2, c: 28945}, 28948, 28951, {f: 6, c: 28955}, {f: 4, c: 28962},
-    {f: 8, c: 28967}, {f: 4, c: 28978}, {f: 14, c: 28983}, {f: 3, c: 28998},
-    29003, 29005, {f: 3, c: 29007}, {f: 9, c: 29011}, 29021, {f: 3, c: 29023},
-    29027, 29029, {f: 2, c: 29034}, 29037, {f: 3, c: 29039}, {f: 4, c: 29044},
-    29049, {f: 2, c: 29051}, {f: 6, c: 29054}, {f: 5, c: 29061},
-    {f: 4, c: 29067}, {f: 2, c: 29072}, 29075, {f: 2, c: 29077},
-    {f: 5, c: 29082}, {f: 7, c: 29089}, {f: 3, c: 29097}, {f: 4, c: 29101},
-    29106, 29108, {f: 3, c: 29110}, {f: 4, c: 29114}, {f: 2, c: 29119}, 29122,
-    {f: 4, c: 29124}, {f: 5, c: 29129}, {f: 3, c: 29135}, 29139,
-    {f: 3, c: 29142}, {f: 2, c: 29146}, {f: 2, c: 29149}, {f: 4, c: 29153},
-    {f: 5, c: 29160}, {f: 5, c: 29167}, {f: 4, c: 29173}, {f: 2, c: 29178},
-    29181, {f: 7, c: 29183}, {f: 6, c: 29191}, {f: 2, c: 29198},
-    {f: 10, c: 29201}, 29212, {f: 10, c: 29214}, 29225, 29227,
-    {f: 3, c: 29229}, {f: 2, c: 29235}, 29244, {f: 7, c: 29248},
-    {f: 3, c: 29257}, {f: 4, c: 29262}, {f: 3, c: 29267}, 29271, 29274, 29276,
-    29278, 29280, {f: 3, c: 29283}, 29288, {f: 4, c: 29290}, {f: 2, c: 29296},
-    {f: 2, c: 29299}, {f: 3, c: 29302}, {f: 2, c: 29307}, {f: 2, c: 29314},
-    {f: 5, c: 29317}, 29324, 29326, {f: 2, c: 29328}, {f: 3, c: 29331},
-    {f: 8, c: 29335}, {f: 2, c: 29344}, {f: 4, c: 29347}, {f: 4, c: 29352},
-    29358, {f: 3, c: 29361}, 29365, {f: 6, c: 29370}, {f: 3, c: 29381},
-    {f: 4, c: 29385}, 29391, 29393, {f: 4, c: 29395}, 29400, {f: 4, c: 29402},
-    29407, {f: 6, c: 29410}, {f: 2, c: 29418}, {f: 2, c: 29429},
-    {f: 3, c: 29438}, 29442, {f: 6, c: 29444}, {f: 3, c: 29451},
-    {f: 4, c: 29455}, 29460, {f: 3, c: 29464}, {f: 2, c: 29471},
-    {f: 2, c: 29475}, {f: 3, c: 29478}, 29485, {f: 2, c: 29487},
-    {f: 2, c: 29490}, 29493, 29498, {f: 2, c: 29500}, 29504, {f: 2, c: 29506},
-    {f: 7, c: 29510}, {f: 2, c: 29518}, 29521, {f: 4, c: 29523},
-    {f: 8, c: 29528}, {f: 7, c: 29537}, 29545, 29550, 29553, {f: 2, c: 29555},
-    29558, 29561, 29565, 29567, {f: 3, c: 29569}, {f: 2, c: 29573}, 29576,
-    29578, {f: 2, c: 29580}, {f: 2, c: 29583}, {f: 4, c: 29586},
-    {f: 4, c: 29591}, {f: 3, c: 29596}, {f: 2, c: 29600}, {f: 6, c: 29603},
-    29610, {f: 2, c: 29612}, 29617, {f: 3, c: 29620}, {f: 2, c: 29624},
-    {f: 4, c: 29628}, 29633, {f: 5, c: 29635}, {f: 2, c: 29643}, 29646,
-    {f: 7, c: 29650}, {f: 4, c: 29658}, 29663, {f: 4, c: 29665}, 29670, 29672,
-    {f: 3, c: 29674}, {f: 4, c: 29678}, {f: 11, c: 29683}, {f: 4, c: 29695},
-    29700, {f: 2, c: 29703}, {f: 4, c: 29707}, {f: 9, c: 29713},
-    {f: 6, c: 29724}, {f: 2, c: 29731}, 29735, 29737, 29739, 29741, 29743,
-    {f: 2, c: 29745}, {f: 5, c: 29751}, {f: 2, c: 29757}, 29760,
-    {f: 9, c: 29762}, {f: 9, c: 29772}, 29782, 29784, 29789, {f: 3, c: 29792},
-    {f: 5, c: 29796}, {f: 2, c: 29803}, {f: 2, c: 29806}, {f: 5, c: 29809},
-    {f: 6, c: 29816}, 29823, 29826, {f: 3, c: 29828}, 29832, 29834,
-    {f: 2, c: 29836}, 29839, {f: 11, c: 29841}, 29853, {f: 4, c: 29855},
-    {f: 2, c: 29860}, {f: 6, c: 29866}, {f: 9, c: 29873}, {f: 2, c: 29883},
-    {f: 12, c: 29886}, {f: 4, c: 29899}, {f: 2, c: 29904}, 29907,
-    {f: 5, c: 29909}, 29915, 29917, 29919, 29921, 29925, {f: 7, c: 29927},
-    {f: 4, c: 29936}, 29941, {f: 7, c: 29944}, {f: 4, c: 29952},
-    {f: 7, c: 29957}, 29966, 29968, 29970, {f: 4, c: 29972}, 29979,
-    {f: 2, c: 29981}, {f: 3, c: 29984}, 29988, {f: 2, c: 29990}, 29994, 29998,
-    30004, 30006, 30009, {f: 2, c: 30012}, 30015, {f: 4, c: 30017},
-    {f: 2, c: 30022}, {f: 2, c: 30025}, 30029, {f: 4, c: 30032},
-    {f: 4, c: 30037}, {f: 4, c: 30046}, {f: 2, c: 30051}, {f: 3, c: 30055},
-    {f: 6, c: 30060}, 30067, 30069, 30071, {f: 5, c: 30074}, {f: 3, c: 30080},
-    {f: 2, c: 30084}, {f: 3, c: 30088}, {f: 3, c: 30092}, 30096, 30099, 30101,
-    30104, {f: 2, c: 30107}, 30110, 30114, {f: 5, c: 30118}, 30125,
-    {f: 2, c: 30134}, {f: 2, c: 30138}, {f: 3, c: 30143}, 30150,
-    {f: 2, c: 30155}, {f: 4, c: 30158}, 30163, 30167, 30170, {f: 2, c: 30172},
-    {f: 3, c: 30175}, 30181, 30185, {f: 4, c: 30188}, {f: 2, c: 30194},
-    {f: 4, c: 30197}, {f: 2, c: 30202}, {f: 2, c: 30205}, 30212,
-    {f: 4, c: 30214}, {f: 2, c: 30222}, {f: 4, c: 30225}, 30230, 30234,
-    {f: 2, c: 30236}, 30243, 30248, 30252, {f: 2, c: 30254}, {f: 2, c: 30257},
-    {f: 2, c: 30262}, {f: 2, c: 30265}, 30269, 30273, {f: 2, c: 30276}, 30280,
-    {f: 2, c: 30282}, {f: 6, c: 30286}, 30293, 30295, {f: 3, c: 30297}, 30301,
-    {f: 2, c: 30304}, 30310, 30312, 30314, {f: 3, c: 30323}, [12136, 30326],
-    30327, {f: 2, c: 30329}, {f: 3, c: 30335}, 30339, 30341, {f: 2, c: 30345},
-    {f: 2, c: 30348}, {f: 2, c: 30351}, 30354, {f: 2, c: 30356},
-    {f: 2, c: 30359}, {f: 9, c: 30363}, {f: 9, c: 30373}, {f: 2, c: 30383},
-    30387, {f: 3, c: 30389}, 30393, {f: 4, c: 30395}, {f: 2, c: 30400},
-    {f: 2, c: 30403}, 30407, 30409, {f: 2, c: 30411}, 30419, 30421,
-    {f: 2, c: 30425}, {f: 2, c: 30428}, 30432, 30434, 30438, {f: 6, c: 30440},
-    30448, 30451, {f: 3, c: 30453}, {f: 2, c: 30458}, 30461, {f: 2, c: 30463},
-    {f: 2, c: 30466}, {f: 2, c: 30469}, 30474, 30476, {f: 11, c: 30478},
-    {f: 4, c: 30491}, 30497, {f: 3, c: 30499}, 30503, {f: 3, c: 30506}, 30510,
-    {f: 5, c: 30512}, 30521, 30523, {f: 3, c: 30525}, 30530, {f: 3, c: 30532},
-    {f: 7, c: 30536}, {f: 8, c: 30546}, {f: 2, c: 30556}, {f: 2, c: 30559},
-    30564, 30567, {f: 2, c: 30569}, {f: 12, c: 30573}, {f: 3, c: 30586},
-    {f: 3, c: 30593}, {f: 6, c: 30598}, {f: 2, c: 30607}, {f: 5, c: 30611},
-    {f: 5, c: 30617}, 30625, {f: 2, c: 30627}, 30630, 30632, 30635,
-    {f: 2, c: 30638}, {f: 2, c: 30641}, 30644, {f: 5, c: 30646}, 30654,
-    {f: 7, c: 30656}, {f: 5, c: 30664}, {f: 9, c: 30670}, {f: 2, c: 30680},
-    {f: 5, c: 30685}, 30692, 30694, 30696, 30698, {f: 3, c: 30704},
-    {f: 2, c: 30708}, 30711, {f: 4, c: 30713}, {f: 6, c: 30723},
-    {f: 2, c: 30730}, {f: 3, c: 30734}, 30739, 30741, 30745, 30747, 30750,
-    {f: 3, c: 30752}, 30756, 30760, {f: 2, c: 30762}, {f: 2, c: 30766},
-    {f: 3, c: 30769}, {f: 2, c: 30773}, 30781, 30783, {f: 2, c: 30785}, 30788,
-    30790, {f: 4, c: 30792}, 30797, 30799, 30801, {f: 2, c: 30803},
-    {f: 5, c: 30808}, {f: 6, c: 30814}, {f: 3, c: 30821}, 30825,
-    {f: 7, c: 30832}, {f: 4, c: 30840}, {f: 10, c: 30845}, 30856,
-    {f: 2, c: 30858}, {f: 2, c: 30863}, 30866, {f: 3, c: 30868}, 30873,
-    {f: 2, c: 30877}, 30880, 30882, 30884, 30886, 30888, {f: 3, c: 30890},
-    {f: 2, c: 30894}, {f: 3, c: 30901}, 30907, 30909, {f: 2, c: 30911},
-    {f: 3, c: 30914}, {f: 3, c: 30918}, {f: 4, c: 30924}, {f: 3, c: 30929},
-    {f: 3, c: 30934}, {f: 8, c: 30939}, {f: 3, c: 30948}, {f: 3, c: 30953},
-    {f: 2, c: 30957}, {f: 2, c: 30960}, 30963, {f: 2, c: 30965},
-    {f: 2, c: 30968}, {f: 2, c: 30971}, {f: 3, c: 30974}, {f: 3, c: 30978},
-    {f: 8, c: 30982}, {f: 4, c: 30991}, {f: 5, c: 30996}, {f: 4, c: 31002},
-    {f: 5, c: 31007}, 31013, {f: 3, c: 31015}, {f: 4, c: 31021},
-    {f: 2, c: 31026}, {f: 5, c: 31029}, 31037, 31039, {f: 4, c: 31042}, 31047,
-    {f: 9, c: 31050}, {f: 2, c: 31060}, {f: 2, c: 31064}, 31073,
-    {f: 2, c: 31075}, 31078, {f: 4, c: 31081}, 31086, {f: 7, c: 31088}, 31097,
-    {f: 5, c: 31099}, {f: 2, c: 31106}, {f: 4, c: 31110}, {f: 2, c: 31115},
-    {f: 10, c: 31120}, {f: 11, c: 31131}, {f: 2, c: 31144}, {f: 3, c: 31147},
-    31151, 31154, {f: 4, c: 31156}, [12145, 31160], 31164, 31167, 31170,
-    {f: 2, c: 31172}, {f: 2, c: 31175}, 31178, 31180, {f: 3, c: 31182},
-    {f: 2, c: 31187}, {f: 2, c: 31190}, {f: 6, c: 31193}, {f: 3, c: 31200},
-    31205, 31208, 31210, 31212, 31214, {f: 7, c: 31217}, {f: 2, c: 31225},
-    31228, {f: 2, c: 31230}, 31233, {f: 2, c: 31236}, {f: 4, c: 31239}, 31244,
-    {f: 5, c: 31247}, {f: 2, c: 31253}, {f: 2, c: 31256}, {f: 3, c: 31259},
-    31263, {f: 2, c: 31265}, {f: 10, c: 31268}, {f: 2, c: 31279}, 31282,
-    {f: 3, c: 31284}, 31288, 31290, 31294, {f: 5, c: 31297}, {f: 5, c: 31303},
-    {f: 2, c: 31311}, {f: 5, c: 31314}, {f: 9, c: 31320}, {f: 6, c: 31331},
-    31338, {f: 4, c: 31340}, {f: 3, c: 31345}, 31349, {f: 4, c: 31355}, 31362,
-    31365, 31367, {f: 4, c: 31369}, {f: 3, c: 31374}, {f: 2, c: 31379},
-    {f: 3, c: 31385}, 31390, {f: 4, c: 31393}, 31399, 31403, {f: 4, c: 31407},
-    {f: 2, c: 31412}, {f: 3, c: 31415}, {f: 4, c: 31419}, {f: 4, c: 31424},
-    31430, 31433, {f: 10, c: 31436}, {f: 2, c: 31447}, {f: 4, c: 31450},
-    {f: 2, c: 31457}, 31460, {f: 3, c: 31463}, {f: 2, c: 31467}, 31470,
-    {f: 6, c: 31472}, {f: 2, c: 31479}, {f: 2, c: 31483}, 31486,
-    {f: 3, c: 31488}, 31493, 31495, 31497, {f: 3, c: 31500}, 31504,
-    {f: 2, c: 31506}, {f: 3, c: 31510}, 31514, {f: 2, c: 31516}, 31519,
-    {f: 3, c: 31521}, 31527, 31529, 31533, {f: 2, c: 31535}, 31538,
-    {f: 4, c: 31540}, 31545, 31547, 31549, {f: 6, c: 31551}, 31560, 31562,
-    {f: 2, c: 31565}, 31571, 31573, 31575, 31577, 31580, {f: 2, c: 31582},
-    31585, {f: 4, c: 31587}, {f: 6, c: 31592}, {f: 2, c: 31599},
-    {f: 2, c: 31603}, 31606, 31608, 31610, {f: 2, c: 31612}, 31615,
-    {f: 4, c: 31617}, {f: 5, c: 31622}, 31628, {f: 2, c: 31630},
-    {f: 3, c: 31633}, 31638, {f: 4, c: 31640}, {f: 3, c: 31646},
-    {f: 3, c: 31651}, {f: 3, c: 31662}, {f: 2, c: 31666}, {f: 3, c: 31669},
-    {f: 7, c: 31673}, {f: 2, c: 31682}, 31685, 31688, 31690, {f: 4, c: 31693},
-    31698, {f: 5, c: 31700}, {f: 2, c: 31707}, {f: 3, c: 31710},
-    {f: 2, c: 31714}, {f: 2, c: 31719}, {f: 3, c: 31723}, {f: 2, c: 31727},
-    31730, {f: 3, c: 31732}, {f: 4, c: 31736}, 31741, 31743, {f: 6, c: 31745},
-    {f: 3, c: 31752}, 31758, {f: 6, c: 31760}, {f: 7, c: 31767}, 31776, 31778,
-    {f: 2, c: 31780}, {f: 2, c: 31784}, {f: 12, c: 31788}, {f: 4, c: 31801},
-    31810, {f: 8, c: 31812}, {f: 14, c: 31822}, {f: 2, c: 31837},
-    {f: 3, c: 31841}, {f: 4, c: 31845}, 31851, 31853, {f: 3, c: 31855},
-    {f: 6, c: 31861}, {f: 11, c: 31870}, {f: 7, c: 31882}, {f: 2, c: 31891},
-    31894, {f: 3, c: 31897}, {f: 2, c: 31904}, 31907, {f: 4, c: 31910},
-    {f: 3, c: 31915}, {f: 2, c: 31919}, {f: 5, c: 31924}, {f: 2, c: 31930},
-    {f: 2, c: 31935}, {f: 3, c: 31938}, 31942, 31945, 31947, {f: 7, c: 31950},
-    31960, {f: 2, c: 31962}, {f: 6, c: 31969}, {f: 6, c: 31977}, 31985, 31987,
-    31989, 31991, 31994, {f: 2, c: 31996}, 31999, 32001, 32003, 32012,
-    {f: 2, c: 32014}, {f: 2, c: 32017}, 32022, 32024, {f: 3, c: 32029},
-    {f: 4, c: 32035}, {f: 3, c: 32040}, {f: 3, c: 32044}, {f: 5, c: 32052},
-    32059, {f: 2, c: 32061}, 32065, 32067, 32069, {f: 7, c: 32071}, 32079,
-    {f: 12, c: 32081}, {f: 2, c: 32095}, {f: 3, c: 32099}, 32103,
-    {f: 5, c: 32105}, {f: 2, c: 32111}, {f: 2, c: 32116}, 32120,
-    {f: 7, c: 32122}, 32130, {f: 2, c: 32132}, 32135, {f: 5, c: 32138},
-    {f: 3, c: 32144}, {f: 8, c: 32148}, 32157, {f: 3, c: 32159},
-    {f: 2, c: 32164}, {f: 4, c: 32167}, 32175, {f: 3, c: 32181}, 32188,
-    {f: 4, c: 32192}, {f: 2, c: 32197}, {f: 2, c: 32200}, {f: 5, c: 32204},
-    32211, {f: 2, c: 32213}, {f: 3, c: 32218}, 32223, 32226, {f: 2, c: 32228},
-    32231, {f: 2, c: 32234}, {f: 2, c: 32237}, 32240, 32243, 32245,
-    {f: 2, c: 32247}, 32250, {f: 12, c: 32252}, {f: 4, c: 32268},
-    {f: 9, c: 32274}, 32284, {f: 3, c: 32288}, {f: 3, c: 32292},
-    {f: 3, c: 32296}, 32300, {f: 2, c: 32303}, 32307, 32312, 32314, 32316,
-    {f: 2, c: 32319}, {f: 3, c: 32322}, {f: 10, c: 32328}, 32339,
-    {f: 4, c: 32342}, {f: 3, c: 32347}, {f: 3, c: 32351}, {f: 6, c: 32355},
-    32364, {f: 2, c: 32369}, {f: 5, c: 32372}, {f: 2, c: 32378},
-    {f: 3, c: 32383}, {f: 5, c: 32387}, 32393, 32395, 32398, {f: 3, c: 32400},
-    32405, 32407, {f: 2, c: 32409}, {f: 2, c: 32413}, 32430, 32436,
-    {f: 2, c: 32443}, 32470, 32484, 32492, 32505, 32522, 32528, 32542, 32567,
-    32569, {f: 7, c: 32571}, 32579, {f: 6, c: 32582}, 32589, 32591,
-    {f: 2, c: 32594}, 32598, 32601, {f: 4, c: 32603}, 32608, {f: 5, c: 32611},
-    {f: 3, c: 32619}, 32623, 32627, {f: 2, c: 32629}, 32632, {f: 4, c: 32634},
-    {f: 2, c: 32639}, {f: 3, c: 32642}, 32647, 32649, 32651, 32653,
-    {f: 5, c: 32655}, {f: 5, c: 32661}, {f: 2, c: 32667}, 32672,
-    {f: 2, c: 32674}, 32678, 32680, {f: 5, c: 32682}, 32689, {f: 5, c: 32691},
-    {f: 2, c: 32698}, 32702, 32704, {f: 3, c: 32706}, {f: 4, c: 32710}, 32715,
-    32717, {f: 3, c: 32719}, 32723, {f: 2, c: 32726}, {f: 6, c: 32729},
-    {f: 3, c: 32738}, {f: 2, c: 32743}, {f: 4, c: 32746}, 32751, 32754,
-    {f: 5, c: 32756}, 32762, {f: 3, c: 32765}, 32770, {f: 4, c: 32775},
-    {f: 2, c: 32782}, 32785, 32787, {f: 2, c: 32794}, {f: 3, c: 32797}, 32801,
-    {f: 2, c: 32803}, 32811, 32813, {f: 2, c: 32815}, 32818, 32820,
-    {f: 2, c: 32825}, 32828, 32830, {f: 2, c: 32832}, {f: 2, c: 32836},
-    {f: 3, c: 32839}, {f: 4, c: 32846}, 32851, 32853, 32855, 32857,
-    {f: 3, c: 32859}, {f: 10, c: 32863}, {f: 4, c: 32875}, 32884, 32888,
-    {f: 3, c: 32890}, {f: 2, c: 32897}, 32904, 32906, {f: 6, c: 32909},
-    {f: 2, c: 32916}, 32919, 32921, 32926, 32931, {f: 3, c: 32934}, 32940,
-    32944, 32947, {f: 2, c: 32949}, {f: 2, c: 32952}, 32955, 32965,
-    {f: 5, c: 32967}, {f: 7, c: 32975}, 32984, {f: 2, c: 32991},
-    {f: 2, c: 32994}, 32998, 33006, 33013, 33015, 33017, 33019,
-    {f: 4, c: 33022}, {f: 2, c: 33027}, {f: 2, c: 33031}, {f: 2, c: 33035},
-    33045, 33047, 33049, {f: 2, c: 33052}, {f: 13, c: 33055}, {f: 2, c: 33069},
-    33072, {f: 3, c: 33075}, 33079, {f: 4, c: 33082}, {f: 7, c: 33087}, 33095,
-    33097, 33101, 33103, 33106, {f: 2, c: 33111}, {f: 5, c: 33115},
-    {f: 3, c: 33122}, 33128, 33130, 33132, 33135, {f: 2, c: 33138},
-    {f: 3, c: 33141}, 33153, {f: 5, c: 33155}, 33161, {f: 4, c: 33163}, 33168,
-    {f: 6, c: 33170}, 33177, {f: 2, c: 33182}, {f: 2, c: 33185},
-    {f: 2, c: 33188}, 33191, {f: 8, c: 33195}, {f: 6, c: 33204}, 33212,
-    {f: 2, c: 33220}, {f: 2, c: 33223}, 33227, 33230, {f: 8, c: 33232}, 33241,
-    {f: 4, c: 33243}, {f: 2, c: 33249}, {f: 3, c: 33252}, 33257, 33259,
-    {f: 5, c: 33262}, {f: 5, c: 33269}, 33277, 33279, 33283, 33291,
-    {f: 2, c: 33294}, 33297, 33299, {f: 6, c: 33301}, 33309, 33312,
-    {f: 4, c: 33316}, 33321, 33326, 33330, 33338, {f: 2, c: 33340},
-    {f: 5, c: 33343}, {f: 2, c: 33349}, 33352, 33354, {f: 3, c: 33356},
-    {f: 8, c: 33360}, {f: 4, c: 33371}, {f: 4, c: 33376}, 33381, 33383,
-    {f: 2, c: 33385}, {f: 2, c: 33388}, {f: 2, c: 33397}, [12171, 33400],
-    {f: 2, c: 33403}, {f: 2, c: 33408}, 33411, {f: 3, c: 33413}, 33417, 33420,
-    33424, {f: 4, c: 33427}, {f: 2, c: 33434}, 33438, 33440, {f: 2, c: 33442},
-    33447, 33458, {f: 2, c: 33461}, 33466, 33468, {f: 2, c: 33471},
-    {f: 2, c: 33474}, {f: 2, c: 33477}, 33481, 33488, 33494, {f: 2, c: 33497},
-    33501, 33506, {f: 3, c: 33512}, {f: 3, c: 33516}, 33520, {f: 2, c: 33522},
-    {f: 2, c: 33525}, 33528, 33530, {f: 5, c: 33532}, {f: 2, c: 33546}, 33549,
-    33552, {f: 2, c: 33554}, 33558, {f: 2, c: 33560}, {f: 10, c: 33565},
-    {f: 2, c: 33577}, 33582, 33584, 33586, 33591, 33595, {f: 3, c: 33597},
-    {f: 2, c: 33601}, {f: 2, c: 33604}, 33608, {f: 5, c: 33610}, 33619,
-    {f: 5, c: 33621}, 33629, 33634, {f: 7, c: 33648}, {f: 2, c: 33657},
-    {f: 7, c: 33662}, {f: 2, c: 33671}, {f: 3, c: 33675}, {f: 3, c: 33679},
-    {f: 2, c: 33684}, 33687, {f: 2, c: 33689}, 33693, 33695, 33697,
-    {f: 4, c: 33699}, {f: 4, c: 33708}, 33717, 33723, {f: 2, c: 33726},
-    {f: 3, c: 33730}, 33734, {f: 2, c: 33736}, 33739, {f: 2, c: 33741},
-    {f: 4, c: 33744}, 33749, 33751, {f: 3, c: 33753}, 33758, {f: 3, c: 33762},
-    {f: 3, c: 33766}, {f: 4, c: 33771}, {f: 5, c: 33779}, {f: 3, c: 33786},
-    {f: 3, c: 33790}, 33794, 33797, {f: 2, c: 33800}, 33808, {f: 6, c: 33810},
-    {f: 3, c: 33817}, {f: 6, c: 33822}, {f: 3, c: 33833}, {f: 4, c: 33837},
-    {f: 3, c: 33842}, {f: 2, c: 33846}, {f: 3, c: 33849}, {f: 8, c: 33854},
-    {f: 2, c: 33863}, {f: 7, c: 33866}, {f: 4, c: 33875}, 33880,
-    {f: 4, c: 33885}, 33890, 33893, {f: 2, c: 33895}, 33898, 33902, 33904,
-    33906, 33908, 33913, {f: 7, c: 33915}, {f: 4, c: 33923}, 33930, 33933,
-    {f: 4, c: 33935}, {f: 2, c: 33941}, 33944, {f: 2, c: 33946},
-    {f: 4, c: 33949}, {f: 13, c: 33954}, {f: 2, c: 33968}, 33971,
-    {f: 3, c: 33973}, 33979, 33982, {f: 2, c: 33986}, {f: 4, c: 33989}, 33996,
-    {f: 2, c: 33998}, 34002, {f: 2, c: 34004}, {f: 6, c: 34007}, 34014,
-    {f: 2, c: 34017}, 34020, {f: 5, c: 34023}, 34029, {f: 11, c: 34033}, 34046,
-    {f: 12, c: 34048}, {f: 4, c: 34061}, 34066, {f: 2, c: 34069},
-    {f: 2, c: 34072}, {f: 3, c: 34075}, 34080, 34082, {f: 2, c: 34084},
-    {f: 4, c: 34087}, {f: 9, c: 34094}, {f: 3, c: 34110}, 34114,
-    {f: 2, c: 34116}, 34119, {f: 3, c: 34123}, {f: 3, c: 34127}, 34132, 34135,
-    {f: 4, c: 34138}, {f: 3, c: 34143}, 34147, {f: 3, c: 34149},
-    {f: 2, c: 34155}, {f: 4, c: 34158}, 34163, {f: 2, c: 34165}, 34168,
-    {f: 2, c: 34172}, {f: 5, c: 34175}, 34182, 34185, 34187, {f: 2, c: 34189},
-    34192, {f: 2, c: 34194}, {f: 6, c: 34197}, {f: 2, c: 34205},
-    {f: 4, c: 34208}, 34213, 34215, {f: 3, c: 34219}, {f: 6, c: 34225}, 34232,
-    {f: 6, c: 34235}, {f: 7, c: 34242}, {f: 3, c: 34250}, {f: 2, c: 34257},
-    34260, {f: 6, c: 34262}, {f: 6, c: 34270}, {f: 3, c: 34278},
-    {f: 9, c: 34283}, 34293, {f: 2, c: 34295}, {f: 3, c: 34300},
-    {f: 4, c: 34304}, {f: 3, c: 34312}, {f: 5, c: 34316}, {f: 4, c: 34322},
-    {f: 3, c: 34327}, {f: 3, c: 34331}, {f: 3, c: 34335}, {f: 4, c: 34339},
-    34344, {f: 3, c: 34346}, {f: 10, c: 34350}, 34361, 34363, {f: 2, c: 34365},
-    {f: 13, c: 34368}, {f: 2, c: 34386}, {f: 4, c: 34390}, 34395, 34397,
-    {f: 2, c: 34400}, {f: 4, c: 34403}, {f: 3, c: 34408}, 34413,
-    {f: 2, c: 34415}, {f: 7, c: 34418}, {f: 7, c: 34435}, {f: 5, c: 34446},
-    34452, {f: 6, c: 34454}, {f: 5, c: 34462}, {f: 2, c: 34469}, 34475,
-    {f: 2, c: 34477}, {f: 2, c: 34482}, {f: 3, c: 34487}, {f: 5, c: 34491},
-    {f: 3, c: 34497}, 34501, 34504, {f: 2, c: 34508}, {f: 2, c: 34514},
-    {f: 3, c: 34517}, 34522, {f: 2, c: 34524}, {f: 4, c: 34528},
-    {f: 4, c: 34533}, {f: 3, c: 34538}, 34543, {f: 3, c: 34549},
-    {f: 3, c: 34555}, 34559, 34561, {f: 2, c: 34564}, {f: 2, c: 34571},
-    {f: 4, c: 34574}, 34580, 34582, 34585, 34587, 34589, {f: 2, c: 34591},
-    34596, {f: 3, c: 34598}, {f: 4, c: 34602}, {f: 2, c: 34607},
-    {f: 2, c: 34610}, {f: 2, c: 34613}, {f: 3, c: 34616}, {f: 2, c: 34620},
-    {f: 7, c: 34624}, {f: 2, c: 34634}, 34637, {f: 4, c: 34639}, 34644, 34646,
-    34648, {f: 6, c: 34650}, {f: 2, c: 34657}, {f: 7, c: 34663}, 34671,
-    {f: 3, c: 34673}, 34677, 34679, {f: 2, c: 34681}, {f: 3, c: 34687},
-    {f: 2, c: 34694}, {f: 2, c: 34697}, 34700, {f: 5, c: 34702},
-    {f: 3, c: 34708}, {f: 6, c: 34712}, {f: 2, c: 34720}, {f: 5, c: 34723},
-    {f: 2, c: 34729}, 34734, {f: 3, c: 34736}, 34740, {f: 4, c: 34742}, 34748,
-    {f: 2, c: 34750}, {f: 3, c: 34753}, 34757, 34759, 34761, {f: 2, c: 34764},
-    {f: 2, c: 34767}, {f: 7, c: 34772}, {f: 4, c: 34780}, {f: 2, c: 34785},
-    34788, {f: 4, c: 34790}, 34795, 34797, {f: 2, c: 34800}, {f: 3, c: 34803},
-    {f: 2, c: 34807}, 34810, {f: 2, c: 34812}, {f: 4, c: 34815}, 34820,
-    {f: 3, c: 34823}, {f: 5, c: 34827}, 34834, 34836, {f: 4, c: 34839},
-    {f: 3, c: 34844}, 34848, {f: 13, c: 34852}, {f: 3, c: 34867},
-    {f: 2, c: 34871}, 34874, {f: 3, c: 34877}, {f: 3, c: 34881},
-    {f: 3, c: 34887}, 34891, {f: 5, c: 34894}, {f: 2, c: 34901}, 34904, 34906,
-    34908, {f: 3, c: 34910}, {f: 2, c: 34918}, 34922, 34925, 34927, 34929,
-    {f: 4, c: 34931}, 34936, {f: 3, c: 34938}, 34944, 34947, {f: 2, c: 34950},
-    {f: 2, c: 34953}, 34956, {f: 4, c: 34958}, {f: 3, c: 34963},
-    {f: 5, c: 34967}, {f: 5, c: 34973}, 34979, {f: 6, c: 34981}, 34988,
-    {f: 3, c: 34990}, {f: 5, c: 34994}, {f: 4, c: 35000}, {f: 4, c: 35005},
-    {f: 2, c: 35011}, {f: 2, c: 35015}, {f: 3, c: 35019}, {f: 2, c: 35024},
-    35027, {f: 2, c: 35030}, {f: 2, c: 35034}, 35038, {f: 2, c: 35040},
-    {f: 2, c: 35046}, {f: 7, c: 35049}, 35058, {f: 3, c: 35061},
-    {f: 2, c: 35066}, {f: 3, c: 35071}, {f: 4, c: 35075}, {f: 2, c: 35080},
-    {f: 5, c: 35083}, 35089, {f: 5, c: 35092}, {f: 5, c: 35100},
-    {f: 3, c: 35106}, {f: 4, c: 35110}, {f: 4, c: 35116}, 35121, 35125, 35127,
-    {f: 2, c: 35129}, {f: 5, c: 35132}, {f: 2, c: 35138}, {f: 2, c: 35141},
-    {f: 14, c: 35144}, {f: 6, c: 35159}, {f: 3, c: 35169}, 35173,
-    {f: 3, c: 35175}, 35179, {f: 2, c: 35181}, {f: 2, c: 35184},
-    {f: 8, c: 35187}, {f: 2, c: 35196}, [12177, 35198], 35200, 35202,
-    {f: 2, c: 35204}, {f: 4, c: 35207}, {f: 3, c: 35212}, {f: 3, c: 35216},
-    {f: 2, c: 35220}, 35223, {f: 8, c: 35225}, {f: 4, c: 35234},
-    {f: 3, c: 35239}, 35243, {f: 2, c: 35245}, {f: 2, c: 35248},
-    {f: 4, c: 35251}, {f: 2, c: 35256}, {f: 2, c: 35259}, 35262, 35267, 35277,
-    {f: 3, c: 35283}, {f: 3, c: 35287}, 35291, 35293, {f: 4, c: 35295}, 35300,
-    {f: 4, c: 35303}, {f: 3, c: 35308}, {f: 3, c: 35312}, 35317, 35319,
-    {f: 7, c: 35321}, {f: 3, c: 35332}, 35337, 35339, 35341, 35343,
-    {f: 2, c: 35345}, 35348, 35351, {f: 2, c: 35353}, 35356, 35358,
-    {f: 3, c: 35360}, 35364, {f: 4, c: 35366}, {f: 2, c: 35371},
-    {f: 3, c: 35374}, {f: 2, c: 35378}, 35381, {f: 3, c: 35383},
-    {f: 3, c: 35387}, {f: 2, c: 35391}, {f: 4, c: 35394}, 35399,
-    {f: 5, c: 35401}, 35407, 35409, 35411, {f: 2, c: 35414}, {f: 2, c: 35417},
-    {f: 2, c: 35420}, {f: 2, c: 35423}, {f: 2, c: 35428}, {f: 2, c: 35431},
-    35434, 35439, 35444, {f: 3, c: 35446}, {f: 2, c: 35450}, {f: 2, c: 35453},
-    {f: 4, c: 35456}, 35464, {f: 2, c: 35467}, {f: 3, c: 35470}, 35476,
-    {f: 2, c: 35478}, 35481, {f: 3, c: 35483}, 35487, 35490, 35495,
-    {f: 3, c: 35497}, {f: 3, c: 35501}, 35505, {f: 3, c: 35507},
-    {f: 2, c: 35511}, {f: 2, c: 35514}, {f: 2, c: 35517}, {f: 2, c: 35520},
-    35523, {f: 2, c: 35525}, 35528, 35530, 35532, 35534, 35536,
-    {f: 3, c: 35539}, {f: 3, c: 35544}, 35549, {f: 3, c: 35551}, 35555, 35557,
-    {f: 3, c: 35560}, 35564, {f: 2, c: 35567}, 35570, {f: 2, c: 35572}, 35577,
-    35579, 35581, 35583, 35587, 35590, {f: 2, c: 35592}, {f: 3, c: 35595},
-    35599, {f: 3, c: 35601}, 35605, 35608, 35612, {f: 3, c: 35614},
-    {f: 4, c: 35618}, 35623, {f: 2, c: 35625}, {f: 5, c: 35630},
-    {f: 5, c: 35636}, {f: 4, c: 35642}, {f: 10, c: 35647}, {f: 4, c: 35658},
-    {f: 6, c: 35664}, 35671, 35675, {f: 9, c: 35677}, {f: 4, c: 35687},
-    {f: 2, c: 35693}, {f: 3, c: 35697}, {f: 2, c: 35701}, {f: 5, c: 35704},
-    {f: 2, c: 35710}, {f: 9, c: 35713}, {f: 3, c: 35723}, {f: 3, c: 35727},
-    35732, {f: 5, c: 35735}, 35741, 35743, 35756, 35761, 35771, 35783, 35792,
-    35818, 35849, 35870, {f: 9, c: 35896}, {f: 4, c: 35906}, {f: 2, c: 35914},
-    {f: 3, c: 35917}, {f: 4, c: 35921}, {f: 4, c: 35926}, {f: 6, c: 35931},
-    {f: 7, c: 35939}, {f: 7, c: 35948}, {f: 4, c: 35956}, {f: 7, c: 35963},
-    {f: 2, c: 35971}, {f: 3, c: 35974}, 35979, {f: 7, c: 35981},
-    {f: 3, c: 35989}, {f: 4, c: 35993}, 35999, {f: 4, c: 36003},
-    {f: 2, c: 36013}, 36017, 36021, 36025, 36030, 36038, 36041,
-    {f: 6, c: 36043}, 36052, {f: 4, c: 36054}, 36059, 36061, 36063, 36069,
-    {f: 2, c: 36072}, {f: 6, c: 36078}, {f: 5, c: 36085}, {f: 5, c: 36095},
-    {f: 2, c: 36102}, 36105, 36108, 36110, {f: 5, c: 36113}, {f: 4, c: 36119},
-    36128, {f: 2, c: 36177}, 36183, 36191, 36197, {f: 3, c: 36200}, 36204,
-    {f: 2, c: 36206}, {f: 2, c: 36209}, {f: 9, c: 36216}, {f: 2, c: 36226},
-    {f: 4, c: 36230}, {f: 5, c: 36236}, {f: 2, c: 36242}, {f: 3, c: 36246},
-    {f: 5, c: 36250}, {f: 3, c: 36256}, {f: 4, c: 36260}, {f: 8, c: 36265},
-    {f: 2, c: 36278}, 36281, 36283, 36285, {f: 3, c: 36288}, 36293,
-    {f: 4, c: 36295}, 36301, 36304, {f: 4, c: 36306}, {f: 2, c: 36312}, 36316,
-    {f: 3, c: 36320}, {f: 3, c: 36325}, 36329, {f: 2, c: 36333},
-    {f: 3, c: 36336}, 36340, 36342, 36348, {f: 7, c: 36350}, {f: 3, c: 36358},
-    36363, {f: 2, c: 36365}, {f: 3, c: 36369}, {f: 8, c: 36373},
-    {f: 2, c: 36384}, {f: 5, c: 36388}, 36395, 36397, 36400, {f: 2, c: 36402},
-    {f: 3, c: 36406}, {f: 2, c: 36411}, {f: 2, c: 36414}, 36419,
-    {f: 2, c: 36421}, {f: 4, c: 36429}, {f: 2, c: 36435}, {f: 3, c: 36438},
-    {f: 9, c: 36442}, {f: 2, c: 36452}, {f: 2, c: 36455}, {f: 2, c: 36458},
-    36462, 36465, 36467, 36469, {f: 3, c: 36471}, 36475, {f: 2, c: 36477},
-    36480, {f: 3, c: 36482}, 36486, 36488, 36492, 36494, {f: 5, c: 36501},
-    36507, 36509, {f: 2, c: 36511}, {f: 3, c: 36514}, {f: 3, c: 36519},
-    {f: 2, c: 36525}, {f: 2, c: 36528}, {f: 7, c: 36531}, {f: 5, c: 36539},
-    {f: 9, c: 36545}, {f: 3, c: 36559}, 36563, {f: 6, c: 36565},
-    {f: 3, c: 36572}, {f: 4, c: 36576}, {f: 6, c: 36581}, {f: 6, c: 36588},
-    {f: 5, c: 36595}, 36605, {f: 4, c: 36607}, 36612, 36614, 36616,
-    {f: 7, c: 36619}, 36627, {f: 5, c: 36630}, {f: 5, c: 36640},
-    {f: 2, c: 36647}, {f: 4, c: 36651}, {f: 3, c: 36656}, {f: 4, c: 36660},
-    {f: 2, c: 36665}, {f: 2, c: 36668}, {f: 2, c: 36672}, 36675,
-    {f: 2, c: 36679}, {f: 3, c: 36682}, {f: 5, c: 36687}, {f: 10, c: 36693},
-    36704, 36707, 36709, 36714, 36736, 36748, 36754, 36765, {f: 3, c: 36768},
-    {f: 2, c: 36772}, 36775, 36778, 36780, {f: 2, c: 36787}, [12193, 36789],
-    {f: 2, c: 36791}, {f: 3, c: 36794}, {f: 2, c: 36799}, 36803, 36806,
-    {f: 5, c: 36809}, 36815, 36818, {f: 2, c: 36822}, 36826, {f: 2, c: 36832},
-    36835, 36839, 36844, 36847, {f: 2, c: 36849}, {f: 2, c: 36853},
-    {f: 3, c: 36858}, {f: 2, c: 36862}, {f: 2, c: 36871}, 36876, 36878, 36883,
-    36888, 36892, {f: 2, c: 36900}, {f: 6, c: 36903}, {f: 2, c: 36912},
-    {f: 2, c: 36915}, 36919, {f: 2, c: 36921}, 36925, {f: 2, c: 36927}, 36931,
-    {f: 2, c: 36933}, {f: 3, c: 36936}, 36940, 36950, {f: 2, c: 36953}, 36957,
-    36959, 36961, 36964, {f: 2, c: 36966}, {f: 3, c: 36970}, {f: 3, c: 36975},
-    36979, 36982, 36985, 36987, 36990, {f: 2, c: 36997}, 37001,
-    {f: 3, c: 37004}, 37010, 37012, 37014, 37016, 37018, 37020,
-    {f: 3, c: 37022}, {f: 2, c: 37028}, {f: 3, c: 37031}, 37035, 37037, 37042,
-    37047, {f: 2, c: 37052}, {f: 2, c: 37055}, {f: 2, c: 37058}, 37062,
-    {f: 2, c: 37064}, {f: 3, c: 37067}, 37074, {f: 3, c: 37076},
-    {f: 3, c: 37080}, 37086, 37088, {f: 3, c: 37091}, {f: 2, c: 37097}, 37100,
-    37102, {f: 4, c: 37104}, {f: 2, c: 37110}, {f: 4, c: 37113},
-    {f: 3, c: 37119}, 37123, 37125, {f: 2, c: 37127}, {f: 8, c: 37130}, 37139,
-    37141, {f: 2, c: 37143}, {f: 4, c: 37146}, {f: 3, c: 37151},
-    {f: 3, c: 37156}, {f: 5, c: 37160}, 37166, 37171, 37173, {f: 2, c: 37175},
-    {f: 8, c: 37179}, {f: 2, c: 37188}, 37191, 37201, {f: 4, c: 37203},
-    {f: 2, c: 37208}, {f: 2, c: 37211}, {f: 2, c: 37215}, {f: 3, c: 37222},
-    37227, 37229, 37235, {f: 3, c: 37242}, {f: 5, c: 37248}, 37254, 37256,
-    37258, {f: 2, c: 37262}, {f: 3, c: 37267}, {f: 3, c: 37271},
-    {f: 5, c: 37277}, {f: 6, c: 37284}, {f: 4, c: 37296}, {f: 4, c: 37302},
-    {f: 5, c: 37307}, 37314, 37316, [12196, 37318], 37320, 37328, 37334,
-    {f: 2, c: 37338}, {f: 5, c: 37342}, {f: 2, c: 37349}, 37352,
-    {f: 11, c: 37354}, 37366, 37368, {f: 5, c: 37371}, {f: 2, c: 37378},
-    {f: 3, c: 37381}, {f: 3, c: 37386}, 37391, {f: 2, c: 37394},
-    {f: 8, c: 37398}, {f: 4, c: 37407}, 37412, {f: 6, c: 37416}, 37423,
-    {f: 2, c: 37425}, {f: 2, c: 37429}, {f: 2, c: 37435}, {f: 4, c: 37441},
-    {f: 2, c: 37446}, {f: 3, c: 37450}, {f: 3, c: 37454}, {f: 3, c: 37458},
-    37462, {f: 2, c: 37464}, {f: 2, c: 37468}, {f: 3, c: 37471},
-    {f: 3, c: 37475}, {f: 5, c: 37479}, {f: 6, c: 37486}, {f: 3, c: 37493},
-    37497, {f: 3, c: 37500}, {f: 2, c: 37505}, 37508, {f: 8, c: 37510},
-    {f: 2, c: 37519}, 37522, {f: 2, c: 37524}, 37527, 37529, 37531,
-    {f: 3, c: 37533}, {f: 2, c: 37537}, 37540, 37543, 37549, {f: 2, c: 37551},
-    {f: 5, c: 37554}, 37560, 37562, {f: 4, c: 37565}, 37570, 37572, 37574,
-    {f: 3, c: 37577}, {f: 2, c: 37581}, {f: 2, c: 37584}, {f: 10, c: 37587},
-    37598, {f: 3, c: 37600}, 37607, 37609, {f: 2, c: 37611}, {f: 4, c: 37618},
-    37623, {f: 3, c: 37625}, {f: 4, c: 37629}, {f: 4, c: 37634},
-    {f: 7, c: 37641}, 37649, {f: 2, c: 37651}, {f: 2, c: 37654},
-    {f: 3, c: 37660}, 37665, {f: 3, c: 37667}, 37671, {f: 2, c: 37673},
-    {f: 2, c: 37676}, {f: 2, c: 37680}, {f: 2, c: 37684}, 37687,
-    {f: 5, c: 37689}, 37695, 37698, {f: 2, c: 37700}, {f: 3, c: 37704}, 37708,
-    {f: 6, c: 37710}, {f: 3, c: 37717}, {f: 2, c: 37721}, {f: 8, c: 37724},
-    {f: 3, c: 37734}, 37739, {f: 3, c: 37741}, {f: 4, c: 37745},
-    {f: 3, c: 37751}, {f: 3, c: 37755}, {f: 3, c: 37759}, 37763,
-    {f: 2, c: 37765}, {f: 2, c: 37768}, {f: 4, c: 37771}, {f: 6, c: 37776},
-    37783, {f: 9, c: 37785}, {f: 2, c: 37796}, 37800, 37803, 37805, 37807,
-    {f: 2, c: 37809}, 37812, {f: 2, c: 37814}, {f: 6, c: 37817},
-    {f: 3, c: 37824}, {f: 3, c: 37828}, 37833, 37835, {f: 3, c: 37838},
-    {f: 4, c: 37842}, {f: 3, c: 37849}, 37856, 37859, {f: 3, c: 37861},
-    {f: 12, c: 37865}, 37878, 37880, {f: 9, c: 37882}, {f: 7, c: 37892},
-    {f: 4, c: 37900}, 37905, {f: 3, c: 37909}, {f: 3, c: 37914},
-    {f: 2, c: 37918}, {f: 5, c: 37921}, {f: 5, c: 37929}, {f: 3, c: 37935},
-    37940, {f: 2, c: 37942}, 37945, {f: 3, c: 37947}, {f: 4, c: 37952},
-    {f: 5, c: 37957}, 37963, {f: 5, c: 37965}, 37971, {f: 11, c: 37973},
-    {f: 2, c: 37985}, 37988, {f: 5, c: 37990}, 37996, {f: 2, c: 37998}, 38001,
-    {f: 4, c: 38003}, 38008, {f: 2, c: 38010}, {f: 5, c: 38016}, 38033, 38038,
-    38040, 38087, 38095, {f: 2, c: 38099}, 38106, 38118, 38139, 38172, 38176,
-    38183, 38195, 38205, 38211, 38216, 38219, 38229, 38234, 38240, 38254,
-    {f: 2, c: 38260}, {f: 7, c: 38264}, 38273, {f: 2, c: 38276},
-    {f: 2, c: 38279}, 38282, 38285, 38288, 38290, {f: 3, c: 38293},
-    {f: 8, c: 38297}, 38306, {f: 2, c: 38310}, 38314, {f: 4, c: 38318},
-    {f: 3, c: 38323}, {f: 2, c: 38327}, 38330, {f: 3, c: 38336},
-    {f: 2, c: 38340}, 38343, 38345, {f: 3, c: 38349}, {f: 3, c: 38353},
-    {f: 5, c: 38359}, 38365, {f: 2, c: 38367}, {f: 2, c: 38371},
-    {f: 2, c: 38374}, 38380, 38399, 38407, 38419, 38424, 38427, 38430, 38432,
-    {f: 7, c: 38435}, {f: 3, c: 38443}, {f: 2, c: 38447}, {f: 4, c: 38455},
-    38462, 38465, 38467, 38474, {f: 2, c: 38478}, {f: 3, c: 38481},
-    {f: 2, c: 38486}, {f: 2, c: 38489}, 38492, 38494, 38496, {f: 2, c: 38501},
-    38507, {f: 3, c: 38509}, 38513, {f: 4, c: 38521}, {f: 7, c: 38526}, 38535,
-    38537, 38540, {f: 3, c: 38545}, 38550, 38554, {f: 10, c: 38557}, 38569,
-    {f: 5, c: 38571}, 38578, 38581, 38583, 38586, 38591, {f: 2, c: 38594},
-    38600, {f: 2, c: 38602}, {f: 2, c: 38608}, {f: 2, c: 38611},
-    {f: 2, c: 38615}, 38618, {f: 3, c: 38621}, 38625, {f: 4, c: 38628},
-    {f: 4, c: 38635}, {f: 2, c: 38640}, {f: 2, c: 38644}, 38648, 38650,
-    {f: 2, c: 38652}, 38655, {f: 2, c: 38658}, 38661, {f: 3, c: 38666},
-    {f: 3, c: 38672}, {f: 2, c: 38676}, {f: 5, c: 38679}, 38685,
-    {f: 8, c: 38687}, {f: 2, c: 38696}, {f: 2, c: 38699}, {f: 2, c: 38702},
-    38705, {f: 5, c: 38707}, {f: 3, c: 38714}, {f: 3, c: 38719}, 38723,
-    {f: 3, c: 38725}, {f: 8, c: 38729}, [12205, 38737], {f: 2, c: 38740},
-    {f: 2, c: 38743}, {f: 2, c: 38748}, 38751, {f: 2, c: 38755},
-    {f: 2, c: 38758}, {f: 9, c: 38762}, 38773, {f: 5, c: 38775},
-    {f: 8, c: 38781}, {f: 5, c: 38790}, 38796, 38798, 38800, 38803,
-    {f: 3, c: 38805}, {f: 7, c: 38809}, {f: 2, c: 38817}, {f: 2, c: 38820},
-    {f: 4, c: 38823}, 38828, 38830, {f: 2, c: 38832}, 38835, {f: 8, c: 38837},
-    {f: 5, c: 38846}, {f: 2, c: 38852}, {f: 2, c: 38855}, 38858,
-    {f: 6, c: 38861}, {f: 5, c: 38868}, {f: 2, c: 38874}, 38877,
-    {f: 7, c: 38879}, 38888, {f: 5, c: 38894}, 38900, {f: 8, c: 38903}, 38912,
-    38916, 38921, 38923, 38925, {f: 3, c: 38932}, {f: 3, c: 38937},
-    {f: 4, c: 38941}, {f: 2, c: 38946}, 38949, {f: 6, c: 38951},
-    {f: 2, c: 38958}, {f: 6, c: 38961}, {f: 2, c: 38969}, 38972,
-    {f: 8, c: 38974}, {f: 5, c: 38983}, {f: 4, c: 38991}, {f: 3, c: 38997},
-    39002, {f: 2, c: 39004}, {f: 3, c: 39007}, {f: 2, c: 39011}, 39014,
-    {f: 3, c: 39016}, {f: 2, c: 39021}, 39026, 39051, 39054, 39058, 39061,
-    39065, 39075, {f: 5, c: 39081}, 39088, 39090, {f: 2, c: 39092},
-    {f: 5, c: 39095}, {f: 7, c: 39101}, 39109, 39111, {f: 5, c: 39113},
-    {f: 2, c: 39119}, 39124, {f: 2, c: 39126}, {f: 2, c: 39132}, 39137,
-    {f: 4, c: 39139}, 39148, 39150, {f: 2, c: 39152}, 39155, {f: 7, c: 39157},
-    {f: 4, c: 39167}, 39172, {f: 3, c: 39174}, 39179, {f: 2, c: 39182},
-    {f: 4, c: 39188}, {f: 2, c: 39193}, {f: 2, c: 39196}, {f: 2, c: 39199},
-    {f: 6, c: 39202}, {f: 5, c: 39209}, {f: 4, c: 39215}, {f: 3, c: 39220},
-    {f: 4, c: 39224}, 39229, {f: 3, c: 39232}, 39236, {f: 2, c: 39238},
-    {f: 4, c: 39245}, 39251, 39254, {f: 4, c: 39256}, 39261, {f: 3, c: 39263},
-    39268, 39270, 39283, {f: 2, c: 39288}, 39291, 39294, {f: 2, c: 39298},
-    39305, 39308, 39310, {f: 11, c: 39322}, {f: 2, c: 39334}, {f: 3, c: 39337},
-    {f: 2, c: 39343}, 39346, {f: 12, c: 39349}, {f: 14, c: 39362}, 39379,
-    {f: 2, c: 39382}, 39386, 39388, 39390, 39392, {f: 10, c: 39395},
-    {f: 3, c: 39406}, {f: 13, c: 39410}, 39424, {f: 3, c: 39426},
-    {f: 7, c: 39430}, {f: 6, c: 39440}, {f: 2, c: 39447}, {f: 17, c: 39450},
-    39468, 39471, {f: 5, c: 39473}, {f: 5, c: 39481}, 39487, {f: 4, c: 39494},
-    {f: 2, c: 39499}, 39502, {f: 5, c: 39504}, 39510, {f: 2, c: 39512},
-    {f: 3, c: 39516}, {f: 2, c: 39520}, 39523, {f: 4, c: 39526}, 39531, 39538,
-    39555, 39561, {f: 2, c: 39565}, {f: 2, c: 39572}, 39577, 39590,
-    {f: 6, c: 39593}, {f: 4, c: 39602}, 39609, 39611, {f: 3, c: 39613},
-    {f: 2, c: 39619}, {f: 5, c: 39622}, {f: 2, c: 39629}, 39632, 39639,
-    {f: 6, c: 39641}, 39648, {f: 4, c: 39650}, {f: 4, c: 39655}, 39660,
-    {f: 9, c: 39664}, 39674, {f: 7, c: 39676}, {f: 2, c: 39684}, 39687,
-    {f: 4, c: 39689}, 39694, {f: 3, c: 39696}, {f: 6, c: 39700},
-    {f: 4, c: 39707}, {f: 2, c: 39712}, 39716, 39718, 39720, {f: 4, c: 39722},
-    39728, {f: 8, c: 39731}, {f: 4, c: 39741}, 39750, {f: 3, c: 39754}, 39760,
-    {f: 2, c: 39762}, {f: 3, c: 39765}, 39769, {f: 20, c: 39771},
-    {f: 4, c: 39792}, {f: 2, c: 39797}, {f: 9, c: 39800}, 39810,
-    {f: 10, c: 39812}, 39823, {f: 7, c: 39827}, {f: 2, c: 39835},
-    {f: 11, c: 39839}, 39852, {f: 17, c: 39855}, {f: 5, c: 39874}, 39880,
-    {f: 9, c: 39883}, 39893, {f: 4, c: 39895}, 39900, {f: 3, c: 39902}, 39907,
-    {f: 2, c: 39909}, 39913, {f: 4, c: 39916}, {f: 3, c: 39921},
-    {f: 8, c: 39925}, 39934, {f: 8, c: 39936}, {f: 3, c: 39946},
-    {f: 2, c: 39950}, 39953, {f: 12, c: 39956}, {f: 2, c: 39969}, 39972,
-    {f: 2, c: 39974}, {f: 3, c: 39978}, {f: 3, c: 39982}, 39988, 39990, 39992,
-    39994, {f: 2, c: 39996}, {f: 6, c: 39999}, {f: 2, c: 40006},
-    {f: 8, c: 40010}, 40019, 40021, {f: 4, c: 40025}, 40030, {f: 7, c: 40032},
-    {f: 5, c: 40040}, {f: 10, c: 40046}, 40057, 40059, {f: 2, c: 40061}, 40064,
-    {f: 2, c: 40067}, {f: 2, c: 40073}, 40076, 40079, 40083, {f: 4, c: 40086},
-    40093, 40106, 40108, 40111, 40121, {f: 5, c: 40126}, {f: 2, c: 40136},
-    {f: 2, c: 40145}, {f: 2, c: 40154}, {f: 2, c: 40160}, {f: 2, c: 40163},
-    {f: 3, c: 40166}, {f: 2, c: 40170}, {f: 6, c: 40173}, 40181,
-    {f: 15, c: 40183}, 40200, {f: 11, c: 40202}, {f: 5, c: 40214}, 40220,
-    40222, {f: 3, c: 40224}, {f: 2, c: 40228}, 40231, {f: 6, c: 40233},
-    {f: 10, c: 40241}, {f: 3, c: 40252}, {f: 2, c: 40256}, {f: 14, c: 40259},
-    {f: 8, c: 40276}, {f: 2, c: 40286}, {f: 8, c: 40290}, 40299,
-    {f: 2, c: 40301}, {f: 2, c: 40304}, {f: 20, c: 40307}, 40328,
-    {f: 9, c: 40330}, {f: 4, c: 40340}, 40345, {f: 10, c: 40347},
-    {f: 3, c: 40358}, {f: 5, c: 40362}, {f: 4, c: 40368}, {f: 6, c: 40373},
-    {f: 3, c: 40381}, 40385, 40387, {f: 14, c: 40389}, {f: 3, c: 40404}, 40408,
-    {f: 10, c: 40411}, {f: 8, c: 40423}, {f: 2, c: 40432}, {f: 4, c: 40436},
-    {f: 17, c: 40443}, {f: 8, c: 40461}, {f: 4, c: 40470}, 40476, 40484, 40487,
-    40494, 40496, 40500, {f: 2, c: 40507}, 40512, 40525, 40528,
-    {f: 3, c: 40530}, 40534, 40537, 40541, {f: 4, c: 40543}, 40549,
-    {f: 2, c: 40558}, 40562, 40564, {f: 3, c: 40566}, 40571, {f: 2, c: 40576},
-    {f: 4, c: 40579}, {f: 2, c: 40585}, {f: 6, c: 40588}, {f: 3, c: 40596},
-    {f: 5, c: 40600}, 40606, {f: 5, c: 40608}, {f: 2, c: 40615},
-    {f: 5, c: 40618}, {f: 4, c: 40624}, {f: 2, c: 40630}, {f: 2, c: 40633},
-    40636, {f: 4, c: 40639}, [12232, 40643], {f: 4, c: 40645},
-    {f: 2, c: 40650}, 40656, {f: 2, c: 40658}, {f: 3, c: 40661},
-    {f: 2, c: 40665}, 40673, {f: 2, c: 40675}, 40678, {f: 4, c: 40683},
-    {f: 2, c: 40688}, 40691, {f: 2, c: 40693}, 40696, 40698, {f: 9, c: 40704},
-    40714, 40716, 40719, {f: 2, c: 40721}, 40724, 40726, 40728,
-    {f: 6, c: 40730}, 40737, {f: 9, c: 40739}, {f: 2, c: 40749},
-    {f: 7, c: 40752}, 40760, 40762, 40764, {f: 5, c: 40767}, {f: 5, c: 40773},
-    {f: 3, c: 40780}, 40787, {f: 4, c: 40789}, {f: 2, c: 40794},
-    {f: 2, c: 40797}, 40802, {f: 2, c: 40804}, {f: 3, c: 40807}, 40811,
-    {f: 5, c: 40813}, {f: 4, c: 40819}, {f: 7, c: 40824}, {f: 2, c: 40833},
-    {f: 2, c: 40846}, {f: 3, c: 40849}, {f: 3, c: 40854}, {f: 2, c: 40861},
-    {f: 5, c: 40865}, 63788, {f: 3, c: 64013}, 64017, {f: 2, c: 64019}, 64024,
-    {f: 3, c: 64031}, {f: 2, c: 64035}, {f: 3, c: 64039}, 11905,
-    [59414, 131207], [59415, 131209], [59416, 131276], 11908, 13427, 13383,
-    11912, 11915, 59422, 13726, 13850, 13838, 11916, 11927, 14702, 14616,
-    59430, 14799, 14815, 14963, 14800, {f: 2, c: 59435}, 15182, 15470, 15584,
-    11943, [59441, 136663], 59442, 11946, 16470, 16735, 11950, 17207, 11955,
-    {f: 2, c: 11958}, [59451, 141711], 17329, 17324, 11963, 17373, 17622,
-    18017, 17996, [59459, 132361], 18211, 18217, 18300, 18317, 11978, 18759,
-    18810, 18813, {f: 2, c: 18818}, {f: 2, c: 18821}, 18847, 18843, 18871,
-    18870, [59476, 133533], [59477, 147966], 19619, {f: 3, c: 19615}, 19575,
-    19618, {f: 7, c: 19731}, 19886, 59492, {s: 226}, 8364, 165, 0, 0, 12351,
-    {s: 17}, 12436, {s: 14}, 12535, 12537, 12536, 12538, 0, {f: 3, c: 12339},
-    {f: 3, c: 12344}, {f: 3, c: 12586}, {f: 24, c: 12704}, 11904,
-    {f: 2, c: 11906}, {f: 3, c: 11909}, {f: 2, c: 11913}, {f: 10, c: 11917},
-    {f: 2, c: 11928}, {f: 12, c: 11931}, {f: 2, c: 11944}, {f: 3, c: 11947},
-    {f: 4, c: 11951}, {f: 2, c: 11956}, {f: 3, c: 11960}, {f: 14, c: 11964},
-    {f: 41, c: 11979}, {f: 71, c: 13312}, {f: 43, c: 13384},
-    {f: 298, c: 13428}, {f: 111, c: 13727}, {f: 11, c: 13839},
-    {f: 765, c: 13851}, {f: 85, c: 14617}, {f: 96, c: 14703},
-    {f: 14, c: 14801}, {f: 147, c: 14816}, {f: 218, c: 14964},
-    {f: 287, c: 15183}, {f: 113, c: 15471}, {f: 885, c: 15585},
-    {f: 264, c: 16471}, {f: 471, c: 16736}, {f: 116, c: 17208},
-    {f: 4, c: 17325}, {f: 43, c: 17330}, {f: 248, c: 17374},
-    {f: 373, c: 17623}, {f: 20, c: 17997}, {f: 193, c: 18018},
-    {f: 5, c: 18212}, {f: 82, c: 18218}, {f: 16, c: 18301}, {f: 441, c: 18318},
-    {f: 50, c: 18760}, {f: 2, c: 18811}, {f: 4, c: 18814}, 18820,
-    {f: 20, c: 18823}, {f: 3, c: 18844}, {f: 22, c: 18848}, {f: 703, c: 18872},
-    {f: 39, c: 19576}, {f: 111, c: 19620}, {f: 148, c: 19738},
-    {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: */
-
-'use strict';
-
-var ColorSpace = (function ColorSpaceClosure() {
-  // Constructor should define this.numComps, this.defaultColor, this.name
-  function ColorSpace() {
-    error('should not call ColorSpace constructor');
-  }
-
-  ColorSpace.prototype = {
-    // Input: array of size numComps representing color component values
-    // Output: array of rgb values, each value ranging from [0.1]
-    getRgb: function ColorSpace_getRgb(color) {
-      error('Should not call ColorSpace.getRgb: ' + color);
-    },
-    // Input: Uint8Array of component values, each value scaled to [0,255]
-    // Output: Uint8Array of rgb values, each value scaled to [0,255]
-    getRgbBuffer: function ColorSpace_getRgbBuffer(input) {
-      error('Should not call ColorSpace.getRgbBuffer: ' + input);
-    }
-  };
-
-  ColorSpace.parse = function ColorSpace_parse(cs, xref, res) {
-    var IR = ColorSpace.parseToIR(cs, xref, res);
-    if (IR instanceof AlternateCS)
-      return IR;
-
-    return ColorSpace.fromIR(IR);
-  };
-
-  ColorSpace.fromIR = function ColorSpace_fromIR(IR) {
-    var name = isArray(IR) ? IR[0] : IR;
-
-    switch (name) {
-      case 'DeviceGrayCS':
-        return new DeviceGrayCS();
-      case 'DeviceRgbCS':
-        return new DeviceRgbCS();
-      case 'DeviceCmykCS':
-        return new DeviceCmykCS();
-      case 'PatternCS':
-        var basePatternCS = IR[1];
-        if (basePatternCS)
-          basePatternCS = ColorSpace.fromIR(basePatternCS);
-        return new PatternCS(basePatternCS);
-      case 'IndexedCS':
-        var baseIndexedCS = IR[1];
-        var hiVal = IR[2];
-        var lookup = IR[3];
-        return new IndexedCS(ColorSpace.fromIR(baseIndexedCS), hiVal, lookup);
-      case 'AlternateCS':
-        var numComps = IR[1];
-        var alt = IR[2];
-        var tintFnIR = IR[3];
-
-        return new AlternateCS(numComps, ColorSpace.fromIR(alt),
-                                PDFFunction.fromIR(tintFnIR));
-      case 'LabCS':
-        var whitePoint = IR[1].WhitePoint;
-        var blackPoint = IR[1].BlackPoint;
-        var range = IR[1].Range;
-        return new LabCS(whitePoint, blackPoint, range);
-      default:
-        error('Unkown name ' + name);
-    }
-    return null;
-  };
-
-  ColorSpace.parseToIR = function ColorSpace_parseToIR(cs, xref, res) {
-    if (isName(cs)) {
-      var colorSpaces = res.get('ColorSpace');
-      if (isDict(colorSpaces)) {
-        var refcs = colorSpaces.get(cs.name);
-        if (refcs)
-          cs = refcs;
-      }
-    }
-
-    cs = xref.fetchIfRef(cs);
-    var mode;
-
-    if (isName(cs)) {
-      mode = cs.name;
-      this.mode = mode;
-
-      switch (mode) {
-        case 'DeviceGray':
-        case 'G':
-          return 'DeviceGrayCS';
-        case 'DeviceRGB':
-        case 'RGB':
-          return 'DeviceRgbCS';
-        case 'DeviceCMYK':
-        case 'CMYK':
-          return 'DeviceCmykCS';
-        case 'Pattern':
-          return ['PatternCS', null];
-        default:
-          error('unrecognized colorspace ' + mode);
-      }
-    } else if (isArray(cs)) {
-      mode = cs[0].name;
-      this.mode = mode;
-
-      switch (mode) {
-        case 'DeviceGray':
-        case 'G':
-          return 'DeviceGrayCS';
-        case 'DeviceRGB':
-        case 'RGB':
-          return 'DeviceRgbCS';
-        case 'DeviceCMYK':
-        case 'CMYK':
-          return 'DeviceCmykCS';
-        case 'CalGray':
-          return 'DeviceGrayCS';
-        case 'CalRGB':
-          return 'DeviceRgbCS';
-        case 'ICCBased':
-          var stream = xref.fetchIfRef(cs[1]);
-          var dict = stream.dict;
-          var numComps = dict.get('N');
-          if (numComps == 1)
-            return 'DeviceGrayCS';
-          if (numComps == 3)
-            return 'DeviceRgbCS';
-          if (numComps == 4)
-            return 'DeviceCmykCS';
-          break;
-        case 'Pattern':
-          var basePatternCS = cs[1];
-          if (basePatternCS)
-            basePatternCS = ColorSpace.parseToIR(basePatternCS, xref, res);
-          return ['PatternCS', basePatternCS];
-        case 'Indexed':
-        case 'I':
-          var baseIndexedCS = ColorSpace.parseToIR(cs[1], xref, res);
-          var hiVal = cs[2] + 1;
-          var lookup = xref.fetchIfRef(cs[3]);
-          return ['IndexedCS', baseIndexedCS, hiVal, lookup];
-        case 'Separation':
-        case 'DeviceN':
-          var name = cs[1];
-          var numComps = 1;
-          if (isName(name))
-            numComps = 1;
-          else if (isArray(name))
-            numComps = name.length;
-          var alt = ColorSpace.parseToIR(cs[2], xref, res);
-          var tintFnIR = PDFFunction.getIR(xref, xref.fetchIfRef(cs[3]));
-          return ['AlternateCS', numComps, alt, tintFnIR];
-        case 'Lab':
-          var params = cs[1].getAll();
-          return ['LabCS', params];
-        default:
-          error('unimplemented color space object "' + mode + '"');
-      }
-    } else {
-      error('unrecognized color space object: "' + cs + '"');
-    }
-    return null;
-  };
-  /**
-   * Checks if a decode map matches the default decode map for a color space.
-   * This handles the general decode maps where there are two values per
-   * component. e.g. [0, 1, 0, 1, 0, 1] for a RGB color.
-   * This does not handle Lab, Indexed, or Pattern decode maps since they are
-   * slightly different.
-   * @param {Array} decode Decode map (usually from an image).
-   * @param {Number} n Number of components the color space has.
-   */
-  ColorSpace.isDefaultDecode = function ColorSpace_isDefaultDecode(decode, n) {
-    if (!decode)
-      return true;
-
-    if (n * 2 !== decode.length) {
-      warning('The decode map is not the correct length');
-      return true;
-    }
-    for (var i = 0, ii = decode.length; i < ii; i += 2) {
-      if (decode[i] != 0 || decode[i + 1] != 1)
-        return false;
-    }
-    return true;
-  };
-
-  return ColorSpace;
-})();
-
-/**
- * Alternate color space handles both Separation and DeviceN color spaces.  A
- * Separation color space is actually just a DeviceN with one color component.
- * Both color spaces use a tinting function to convert colors to a base color
- * space.
- */
-var AlternateCS = (function AlternateCSClosure() {
-  function AlternateCS(numComps, base, tintFn) {
-    this.name = 'Alternate';
-    this.numComps = numComps;
-    this.defaultColor = [];
-    for (var i = 0; i < numComps; ++i)
-      this.defaultColor.push(1);
-    this.base = base;
-    this.tintFn = tintFn;
-  }
-
-  AlternateCS.prototype = {
-    getRgb: function AlternateCS_getRgb(color) {
-      var tinted = this.tintFn(color);
-      return this.base.getRgb(tinted);
-    },
-    getRgbBuffer: function AlternateCS_getRgbBuffer(input, bits) {
-      var tintFn = this.tintFn;
-      var base = this.base;
-      var scale = 1 / ((1 << bits) - 1);
-      var length = input.length;
-      var pos = 0;
-      var baseNumComps = base.numComps;
-      var baseBuf = new Uint8Array(baseNumComps * length);
-      var numComps = this.numComps;
-      var scaled = [];
-
-      for (var i = 0; i < length; i += numComps) {
-        for (var z = 0; z < numComps; ++z)
-          scaled[z] = input[i + z] * scale;
-
-        var tinted = tintFn(scaled);
-        for (var j = 0; j < baseNumComps; ++j)
-          baseBuf[pos++] = 255 * tinted[j];
-      }
-      return base.getRgbBuffer(baseBuf, 8);
-    },
-    isDefaultDecode: function AlternateCS_isDefaultDecode(decodeMap) {
-      return ColorSpace.isDefaultDecode(decodeMap, this.numComps);
-    }
-  };
-
-  return AlternateCS;
-})();
-
-var PatternCS = (function PatternCSClosure() {
-  function PatternCS(baseCS) {
-    this.name = 'Pattern';
-    this.base = baseCS;
-  }
-  PatternCS.prototype = {};
-
-  return PatternCS;
-})();
-
-var IndexedCS = (function IndexedCSClosure() {
-  function IndexedCS(base, highVal, lookup) {
-    this.name = 'Indexed';
-    this.numComps = 1;
-    this.defaultColor = [0];
-    this.base = base;
-    this.highVal = highVal;
-
-    var baseNumComps = base.numComps;
-    var length = baseNumComps * highVal;
-    var lookupArray = new Uint8Array(length);
-
-    if (isStream(lookup)) {
-      var bytes = lookup.getBytes(length);
-      lookupArray.set(bytes);
-    } else if (isString(lookup)) {
-      for (var i = 0; i < length; ++i)
-        lookupArray[i] = lookup.charCodeAt(i);
-    } else {
-      error('Unrecognized lookup table: ' + lookup);
-    }
-    this.lookup = lookupArray;
-  }
-
-  IndexedCS.prototype = {
-    getRgb: function IndexedCS_getRgb(color) {
-      var numComps = this.base.numComps;
-      var start = color[0] * numComps;
-      var c = [];
-
-      for (var i = start, ii = start + numComps; i < ii; ++i)
-        c.push(this.lookup[i]);
-
-      return this.base.getRgb(c);
-    },
-    getRgbBuffer: function IndexedCS_getRgbBuffer(input) {
-      var base = this.base;
-      var numComps = base.numComps;
-      var lookup = this.lookup;
-      var length = input.length;
-      var baseBuf = new Uint8Array(length * numComps);
-      var baseBufPos = 0;
-
-      for (var i = 0; i < length; ++i) {
-        var lookupPos = input[i] * numComps;
-        for (var j = 0; j < numComps; ++j) {
-          baseBuf[baseBufPos++] = lookup[lookupPos + j];
-        }
-      }
-
-      return base.getRgbBuffer(baseBuf, 8);
-    },
-    isDefaultDecode: function IndexedCS_isDefaultDecode(decodeMap) {
-      // indexed color maps shouldn't be changed
-      return true;
-    }
-  };
-  return IndexedCS;
-})();
-
-var DeviceGrayCS = (function DeviceGrayCSClosure() {
-  function DeviceGrayCS() {
-    this.name = 'DeviceGray';
-    this.numComps = 1;
-    this.defaultColor = [0];
-  }
-
-  DeviceGrayCS.prototype = {
-    getRgb: function DeviceGrayCS_getRgb(color) {
-      var c = color[0];
-      return [c, c, c];
-    },
-    getRgbBuffer: function DeviceGrayCS_getRgbBuffer(input, bits) {
-      var scale = 255 / ((1 << bits) - 1);
-      var length = input.length;
-      var rgbBuf = new Uint8Array(length * 3);
-      for (var i = 0, j = 0; i < length; ++i) {
-        var c = (scale * input[i]) | 0;
-        rgbBuf[j++] = c;
-        rgbBuf[j++] = c;
-        rgbBuf[j++] = c;
-      }
-      return rgbBuf;
-    },
-    isDefaultDecode: function DeviceGrayCS_isDefaultDecode(decodeMap) {
-      return ColorSpace.isDefaultDecode(decodeMap, this.numComps);
-    }
-  };
-  return DeviceGrayCS;
-})();
-
-var DeviceRgbCS = (function DeviceRgbCSClosure() {
-  function DeviceRgbCS() {
-    this.name = 'DeviceRGB';
-    this.numComps = 3;
-    this.defaultColor = [0, 0, 0];
-  }
-  DeviceRgbCS.prototype = {
-    getRgb: function DeviceRgbCS_getRgb(color) {
-      return color;
-    },
-    getRgbBuffer: function DeviceRgbCS_getRgbBuffer(input, bits) {
-      if (bits == 8)
-        return input;
-      var scale = 255 / ((1 << bits) - 1);
-      var i, length = input.length;
-      var rgbBuf = new Uint8Array(length);
-      for (i = 0; i < length; ++i)
-        rgbBuf[i] = (scale * input[i]) | 0;
-      return rgbBuf;
-    },
-    isDefaultDecode: function DeviceRgbCS_isDefaultDecode(decodeMap) {
-      return ColorSpace.isDefaultDecode(decodeMap, this.numComps);
-    }
-  };
-  return DeviceRgbCS;
-})();
-
-var DeviceCmykCS = (function DeviceCmykCSClosure() {
-  function DeviceCmykCS() {
-    this.name = 'DeviceCMYK';
-    this.numComps = 4;
-    this.defaultColor = [0, 0, 0, 1];
-  }
-  DeviceCmykCS.prototype = {
-    getRgb: function DeviceCmykCS_getRgb(color) {
-      var c = color[0], m = color[1], y = color[2], k = color[3];
-
-      // CMYK -> CMY: http://www.easyrgb.com/index.php?X=MATH&H=14#text14
-      c = (c * (1 - k) + k);
-      m = (m * (1 - k) + k);
-      y = (y * (1 - k) + k);
-
-      // CMY -> RGB: http://www.easyrgb.com/index.php?X=MATH&H=12#text12
-      var r = (1 - c);
-      var g = (1 - m);
-      var b = (1 - y);
-
-      return [r, g, b];
-    },
-    getRgbBuffer: function DeviceCmykCS_getRgbBuffer(colorBuf, bits) {
-      var scale = 1 / ((1 << bits) - 1);
-      var length = colorBuf.length / 4;
-      var rgbBuf = new Uint8Array(length * 3);
-      var rgbBufPos = 0;
-      var colorBufPos = 0;
-
-      for (var i = 0; i < length; i++) {
-        var cmyk = [];
-        for (var j = 0; j < 4; ++j)
-          cmyk.push(scale * colorBuf[colorBufPos++]);
-
-        var rgb = this.getRgb(cmyk);
-        for (var j = 0; j < 3; ++j)
-          rgbBuf[rgbBufPos++] = Math.round(rgb[j] * 255);
-      }
-
-      return rgbBuf;
-    },
-    isDefaultDecode: function DeviceCmykCS_isDefaultDecode(decodeMap) {
-      return ColorSpace.isDefaultDecode(decodeMap, this.numComps);
-    }
-  };
-
-  return DeviceCmykCS;
-})();
-
-//
-// LabCS: Based on "PDF Reference, Sixth Ed", p.250
-//
-var LabCS = (function LabCSClosure() {
-  function LabCS(whitePoint, blackPoint, range) {
-    this.name = 'Lab';
-    this.numComps = 3;
-    this.defaultColor = [0, 0, 0];
-
-    if (!whitePoint)
-      error('WhitePoint missing - required for color space Lab');
-    blackPoint = blackPoint || [0, 0, 0];
-    range = range || [-100, 100, -100, 100];
-
-    // Translate args to spec variables
-    this.XW = whitePoint[0];
-    this.YW = whitePoint[1];
-    this.ZW = whitePoint[2];
-    this.amin = range[0];
-    this.amax = range[1];
-    this.bmin = range[2];
-    this.bmax = range[3];
-
-    // These are here just for completeness - the spec doesn't offer any
-    // formulas that use BlackPoint in Lab
-    this.XB = blackPoint[0];
-    this.YB = blackPoint[1];
-    this.ZB = blackPoint[2];
-
-    // Validate vars as per spec
-    if (this.XW < 0 || this.ZW < 0 || this.YW !== 1)
-      error('Invalid WhitePoint components, no fallback available');
-
-    if (this.XB < 0 || this.YB < 0 || this.ZB < 0) {
-      info('Invalid BlackPoint, falling back to default');
-      this.XB = this.YB = this.ZB = 0;
-    }
-
-    if (this.amin > this.amax || this.bmin > this.bmax) {
-      info('Invalid Range, falling back to defaults');
-      this.amin = -100;
-      this.amax = 100;
-      this.bmin = -100;
-      this.bmax = 100;
-    }
-  };
-
-  // Function g(x) from spec
-  function g(x) {
-    if (x >= 6 / 29)
-      return x * x * x;
-    else
-      return (108 / 841) * (x - 4 / 29);
-  }
-
-  LabCS.prototype = {
-    getRgb: function LabCS_getRgb(color) {
-      // Ls,as,bs <---> L*,a*,b* in the spec
-      var Ls = color[0], as = color[1], bs = color[2];
-
-      // Adjust limits of 'as' and 'bs'
-      as = as > this.amax ? this.amax : as;
-      as = as < this.amin ? this.amin : as;
-      bs = bs > this.bmax ? this.bmax : bs;
-      bs = bs < this.bmin ? this.bmin : bs;
-
-      // Computes intermediate variables X,Y,Z as per spec
-      var M = (Ls + 16) / 116;
-      var L = M + (as / 500);
-      var N = M - (bs / 200);
-      var X = this.XW * g(L);
-      var Y = this.YW * g(M);
-      var Z = this.ZW * g(N);
-
-      // XYZ to RGB 3x3 matrix, from:
-      // http://www.poynton.com/notes/colour_and_gamma/ColorFAQ.html#RTFToC18
-      var XYZtoRGB = [3.240479, -1.537150, -0.498535,
-                      -0.969256, 1.875992, 0.041556,
-                      0.055648, -0.204043, 1.057311];
-
-      return Util.apply3dTransform(XYZtoRGB, [X, Y, Z]);
-    },
-    getRgbBuffer: function LabCS_getRgbBuffer(input, bits) {
-      if (bits == 8)
-        return input;
-      var scale = 255 / ((1 << bits) - 1);
-      var i, length = input.length / 3;
-      var rgbBuf = new Uint8Array(length);
-
-      var j = 0;
-      for (i = 0; i < length; ++i) {
-        // Convert L*, a*, s* into RGB
-        var rgb = this.getRgb([input[i], input[i + 1], input[i + 2]]);
-        rgbBuf[j++] = rgb[0];
-        rgbBuf[j++] = rgb[1];
-        rgbBuf[j++] = rgb[2];
-      }
-
-      return rgbBuf;
-    },
-    isDefaultDecode: function LabCS_isDefaultDecode(decodeMap) {
-      // From Table 90 in Adobe's:
-      // "Document management - Portable document format", 1st ed, 2008
-      if (decodeMap[0] === 0 && decodeMap[1] === 100 &&
-          decodeMap[2] === this.amin && decodeMap[3] === this.amax &&
-          decodeMap[4] === this.bmin && decodeMap[5] === this.bmax)
-        return true;
-      else
-        return false;
-    }
-  };
-  return LabCS;
-})();
-
-/* -*- 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 ARCFourCipher = (function ARCFourCipherClosure() {
-  function ARCFourCipher(key) {
-    this.a = 0;
-    this.b = 0;
-    var s = new Uint8Array(256);
-    var i, j = 0, tmp, keyLength = key.length;
-    for (i = 0; i < 256; ++i)
-      s[i] = i;
-    for (i = 0; i < 256; ++i) {
-      tmp = s[i];
-      j = (j + tmp + key[i % keyLength]) & 0xFF;
-      s[i] = s[j];
-      s[j] = tmp;
-    }
-    this.s = s;
-  }
-
-  ARCFourCipher.prototype = {
-    encryptBlock: function ARCFourCipher_encryptBlock(data) {
-      var i, n = data.length, tmp, tmp2;
-      var a = this.a, b = this.b, s = this.s;
-      var output = new Uint8Array(n);
-      for (i = 0; i < n; ++i) {
-        a = (a + 1) & 0xFF;
-        tmp = s[a];
-        b = (b + tmp) & 0xFF;
-        tmp2 = s[b];
-        s[a] = tmp2;
-        s[b] = tmp;
-        output[i] = data[i] ^ s[(tmp + tmp2) & 0xFF];
-      }
-      this.a = a;
-      this.b = b;
-      return output;
-    }
-  };
-  ARCFourCipher.prototype.decryptBlock = ARCFourCipher.prototype.encryptBlock;
-
-  return ARCFourCipher;
-})();
-
-var calculateMD5 = (function calculateMD5Closure() {
-  var r = new Uint8Array([
-    7, 12, 17, 22, 7, 12, 17, 22, 7, 12, 17, 22, 7, 12, 17, 22,
-    5, 9, 14, 20, 5, 9, 14, 20, 5, 9, 14, 20, 5, 9, 14, 20,
-    4, 11, 16, 23, 4, 11, 16, 23, 4, 11, 16, 23, 4, 11, 16, 23,
-    6, 10, 15, 21, 6, 10, 15, 21, 6, 10, 15, 21, 6, 10, 15, 21]);
-
-  var k = new Int32Array([
-    -680876936, -389564586, 606105819, -1044525330, -176418897, 1200080426,
-    -1473231341, -45705983, 1770035416, -1958414417, -42063, -1990404162,
-    1804603682, -40341101, -1502002290, 1236535329, -165796510, -1069501632,
-    643717713, -373897302, -701558691, 38016083, -660478335, -405537848,
-    568446438, -1019803690, -187363961, 1163531501, -1444681467, -51403784,
-    1735328473, -1926607734, -378558, -2022574463, 1839030562, -35309556,
-    -1530992060, 1272893353, -155497632, -1094730640, 681279174, -358537222,
-    -722521979, 76029189, -640364487, -421815835, 530742520, -995338651,
-    -198630844, 1126891415, -1416354905, -57434055, 1700485571, -1894986606,
-    -1051523, -2054922799, 1873313359, -30611744, -1560198380, 1309151649,
-    -145523070, -1120210379, 718787259, -343485551]);
-
-  function hash(data, offset, length) {
-    var h0 = 1732584193, h1 = -271733879, h2 = -1732584194, h3 = 271733878;
-    // pre-processing
-    var paddedLength = (length + 72) & ~63; // data + 9 extra bytes
-    var padded = new Uint8Array(paddedLength);
-    var i, j, n;
-    for (i = 0; i < length; ++i)
-      padded[i] = data[offset++];
-    padded[i++] = 0x80;
-    n = paddedLength - 8;
-    while (i < n)
-      padded[i++] = 0;
-    padded[i++] = (length << 3) & 0xFF;
-    padded[i++] = (length >> 5) & 0xFF;
-    padded[i++] = (length >> 13) & 0xFF;
-    padded[i++] = (length >> 21) & 0xFF;
-    padded[i++] = (length >>> 29) & 0xFF;
-    padded[i++] = 0;
-    padded[i++] = 0;
-    padded[i++] = 0;
-    // chunking
-    // TODO ArrayBuffer ?
-    var w = new Int32Array(16);
-    for (i = 0; i < paddedLength;) {
-      for (j = 0; j < 16; ++j, i += 4) {
-        w[j] = (padded[i] | (padded[i + 1] << 8) |
-                (padded[i + 2] << 16) | (padded[i + 3] << 24));
-      }
-      var a = h0, b = h1, c = h2, d = h3, f, g;
-      for (j = 0; j < 64; ++j) {
-        if (j < 16) {
-          f = (b & c) | ((~b) & d);
-          g = j;
-        } else if (j < 32) {
-          f = (d & b) | ((~d) & c);
-          g = (5 * j + 1) & 15;
-        } else if (j < 48) {
-          f = b ^ c ^ d;
-          g = (3 * j + 5) & 15;
-        } else {
-          f = c ^ (b | (~d));
-          g = (7 * j) & 15;
-        }
-        var tmp = d, rotateArg = (a + f + k[j] + w[g]) | 0, rotate = r[j];
-        d = c;
-        c = b;
-        b = (b + ((rotateArg << rotate) | (rotateArg >>> (32 - rotate)))) | 0;
-        a = tmp;
-      }
-      h0 = (h0 + a) | 0;
-      h1 = (h1 + b) | 0;
-      h2 = (h2 + c) | 0;
-      h3 = (h3 + d) | 0;
-    }
-    return new Uint8Array([
-        h0 & 0xFF, (h0 >> 8) & 0xFF, (h0 >> 16) & 0xFF, (h0 >>> 24) & 0xFF,
-        h1 & 0xFF, (h1 >> 8) & 0xFF, (h1 >> 16) & 0xFF, (h1 >>> 24) & 0xFF,
-        h2 & 0xFF, (h2 >> 8) & 0xFF, (h2 >> 16) & 0xFF, (h2 >>> 24) & 0xFF,
-        h3 & 0xFF, (h3 >> 8) & 0xFF, (h3 >> 16) & 0xFF, (h3 >>> 24) & 0xFF
-    ]);
-  }
-  return hash;
-})();
-
-var NullCipher = (function NullCipherClosure() {
-  function NullCipher() {
-  }
-
-  NullCipher.prototype = {
-    decryptBlock: function NullCipher_decryptBlock(data) {
-      return data;
-    }
-  };
-
-  return NullCipher;
-})();
-
-var AES128Cipher = (function AES128CipherClosure() {
-  var rcon = new Uint8Array([
-    0x8d, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x1b, 0x36, 0x6c,
-    0xd8, 0xab, 0x4d, 0x9a, 0x2f, 0x5e, 0xbc, 0x63, 0xc6, 0x97, 0x35, 0x6a,
-    0xd4, 0xb3, 0x7d, 0xfa, 0xef, 0xc5, 0x91, 0x39, 0x72, 0xe4, 0xd3, 0xbd,
-    0x61, 0xc2, 0x9f, 0x25, 0x4a, 0x94, 0x33, 0x66, 0xcc, 0x83, 0x1d, 0x3a,
-    0x74, 0xe8, 0xcb, 0x8d, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80,
-    0x1b, 0x36, 0x6c, 0xd8, 0xab, 0x4d, 0x9a, 0x2f, 0x5e, 0xbc, 0x63, 0xc6,
-    0x97, 0x35, 0x6a, 0xd4, 0xb3, 0x7d, 0xfa, 0xef, 0xc5, 0x91, 0x39, 0x72,
-    0xe4, 0xd3, 0xbd, 0x61, 0xc2, 0x9f, 0x25, 0x4a, 0x94, 0x33, 0x66, 0xcc,
-    0x83, 0x1d, 0x3a, 0x74, 0xe8, 0xcb, 0x8d, 0x01, 0x02, 0x04, 0x08, 0x10,
-    0x20, 0x40, 0x80, 0x1b, 0x36, 0x6c, 0xd8, 0xab, 0x4d, 0x9a, 0x2f, 0x5e,
-    0xbc, 0x63, 0xc6, 0x97, 0x35, 0x6a, 0xd4, 0xb3, 0x7d, 0xfa, 0xef, 0xc5,
-    0x91, 0x39, 0x72, 0xe4, 0xd3, 0xbd, 0x61, 0xc2, 0x9f, 0x25, 0x4a, 0x94,
-    0x33, 0x66, 0xcc, 0x83, 0x1d, 0x3a, 0x74, 0xe8, 0xcb, 0x8d, 0x01, 0x02,
-    0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x1b, 0x36, 0x6c, 0xd8, 0xab, 0x4d,
-    0x9a, 0x2f, 0x5e, 0xbc, 0x63, 0xc6, 0x97, 0x35, 0x6a, 0xd4, 0xb3, 0x7d,
-    0xfa, 0xef, 0xc5, 0x91, 0x39, 0x72, 0xe4, 0xd3, 0xbd, 0x61, 0xc2, 0x9f,
-    0x25, 0x4a, 0x94, 0x33, 0x66, 0xcc, 0x83, 0x1d, 0x3a, 0x74, 0xe8, 0xcb,
-    0x8d, 0x01, 0x02, 0x04, 0x08, 0x10, 0x20, 0x40, 0x80, 0x1b, 0x36, 0x6c,
-    0xd8, 0xab, 0x4d, 0x9a, 0x2f, 0x5e, 0xbc, 0x63, 0xc6, 0x97, 0x35, 0x6a,
-    0xd4, 0xb3, 0x7d, 0xfa, 0xef, 0xc5, 0x91, 0x39, 0x72, 0xe4, 0xd3, 0xbd,
-    0x61, 0xc2, 0x9f, 0x25, 0x4a, 0x94, 0x33, 0x66, 0xcc, 0x83, 0x1d, 0x3a,
-    0x74, 0xe8, 0xcb, 0x8d]);
-
-  var s = new Uint8Array([
-    0x63, 0x7c, 0x77, 0x7b, 0xf2, 0x6b, 0x6f, 0xc5, 0x30, 0x01, 0x67, 0x2b,
-    0xfe, 0xd7, 0xab, 0x76, 0xca, 0x82, 0xc9, 0x7d, 0xfa, 0x59, 0x47, 0xf0,
-    0xad, 0xd4, 0xa2, 0xaf, 0x9c, 0xa4, 0x72, 0xc0, 0xb7, 0xfd, 0x93, 0x26,
-    0x36, 0x3f, 0xf7, 0xcc, 0x34, 0xa5, 0xe5, 0xf1, 0x71, 0xd8, 0x31, 0x15,
-    0x04, 0xc7, 0x23, 0xc3, 0x18, 0x96, 0x05, 0x9a, 0x07, 0x12, 0x80, 0xe2,
-    0xeb, 0x27, 0xb2, 0x75, 0x09, 0x83, 0x2c, 0x1a, 0x1b, 0x6e, 0x5a, 0xa0,
-    0x52, 0x3b, 0xd6, 0xb3, 0x29, 0xe3, 0x2f, 0x84, 0x53, 0xd1, 0x00, 0xed,
-    0x20, 0xfc, 0xb1, 0x5b, 0x6a, 0xcb, 0xbe, 0x39, 0x4a, 0x4c, 0x58, 0xcf,
-    0xd0, 0xef, 0xaa, 0xfb, 0x43, 0x4d, 0x33, 0x85, 0x45, 0xf9, 0x02, 0x7f,
-    0x50, 0x3c, 0x9f, 0xa8, 0x51, 0xa3, 0x40, 0x8f, 0x92, 0x9d, 0x38, 0xf5,
-    0xbc, 0xb6, 0xda, 0x21, 0x10, 0xff, 0xf3, 0xd2, 0xcd, 0x0c, 0x13, 0xec,
-    0x5f, 0x97, 0x44, 0x17, 0xc4, 0xa7, 0x7e, 0x3d, 0x64, 0x5d, 0x19, 0x73,
-    0x60, 0x81, 0x4f, 0xdc, 0x22, 0x2a, 0x90, 0x88, 0x46, 0xee, 0xb8, 0x14,
-    0xde, 0x5e, 0x0b, 0xdb, 0xe0, 0x32, 0x3a, 0x0a, 0x49, 0x06, 0x24, 0x5c,
-    0xc2, 0xd3, 0xac, 0x62, 0x91, 0x95, 0xe4, 0x79, 0xe7, 0xc8, 0x37, 0x6d,
-    0x8d, 0xd5, 0x4e, 0xa9, 0x6c, 0x56, 0xf4, 0xea, 0x65, 0x7a, 0xae, 0x08,
-    0xba, 0x78, 0x25, 0x2e, 0x1c, 0xa6, 0xb4, 0xc6, 0xe8, 0xdd, 0x74, 0x1f,
-    0x4b, 0xbd, 0x8b, 0x8a, 0x70, 0x3e, 0xb5, 0x66, 0x48, 0x03, 0xf6, 0x0e,
-    0x61, 0x35, 0x57, 0xb9, 0x86, 0xc1, 0x1d, 0x9e, 0xe1, 0xf8, 0x98, 0x11,
-    0x69, 0xd9, 0x8e, 0x94, 0x9b, 0x1e, 0x87, 0xe9, 0xce, 0x55, 0x28, 0xdf,
-    0x8c, 0xa1, 0x89, 0x0d, 0xbf, 0xe6, 0x42, 0x68, 0x41, 0x99, 0x2d, 0x0f,
-    0xb0, 0x54, 0xbb, 0x16]);
-
-  var inv_s = new Uint8Array([
-    0x52, 0x09, 0x6a, 0xd5, 0x30, 0x36, 0xa5, 0x38, 0xbf, 0x40, 0xa3, 0x9e,
-    0x81, 0xf3, 0xd7, 0xfb, 0x7c, 0xe3, 0x39, 0x82, 0x9b, 0x2f, 0xff, 0x87,
-    0x34, 0x8e, 0x43, 0x44, 0xc4, 0xde, 0xe9, 0xcb, 0x54, 0x7b, 0x94, 0x32,
-    0xa6, 0xc2, 0x23, 0x3d, 0xee, 0x4c, 0x95, 0x0b, 0x42, 0xfa, 0xc3, 0x4e,
-    0x08, 0x2e, 0xa1, 0x66, 0x28, 0xd9, 0x24, 0xb2, 0x76, 0x5b, 0xa2, 0x49,
-    0x6d, 0x8b, 0xd1, 0x25, 0x72, 0xf8, 0xf6, 0x64, 0x86, 0x68, 0x98, 0x16,
-    0xd4, 0xa4, 0x5c, 0xcc, 0x5d, 0x65, 0xb6, 0x92, 0x6c, 0x70, 0x48, 0x50,
-    0xfd, 0xed, 0xb9, 0xda, 0x5e, 0x15, 0x46, 0x57, 0xa7, 0x8d, 0x9d, 0x84,
-    0x90, 0xd8, 0xab, 0x00, 0x8c, 0xbc, 0xd3, 0x0a, 0xf7, 0xe4, 0x58, 0x05,
-    0xb8, 0xb3, 0x45, 0x06, 0xd0, 0x2c, 0x1e, 0x8f, 0xca, 0x3f, 0x0f, 0x02,
-    0xc1, 0xaf, 0xbd, 0x03, 0x01, 0x13, 0x8a, 0x6b, 0x3a, 0x91, 0x11, 0x41,
-    0x4f, 0x67, 0xdc, 0xea, 0x97, 0xf2, 0xcf, 0xce, 0xf0, 0xb4, 0xe6, 0x73,
-    0x96, 0xac, 0x74, 0x22, 0xe7, 0xad, 0x35, 0x85, 0xe2, 0xf9, 0x37, 0xe8,
-    0x1c, 0x75, 0xdf, 0x6e, 0x47, 0xf1, 0x1a, 0x71, 0x1d, 0x29, 0xc5, 0x89,
-    0x6f, 0xb7, 0x62, 0x0e, 0xaa, 0x18, 0xbe, 0x1b, 0xfc, 0x56, 0x3e, 0x4b,
-    0xc6, 0xd2, 0x79, 0x20, 0x9a, 0xdb, 0xc0, 0xfe, 0x78, 0xcd, 0x5a, 0xf4,
-    0x1f, 0xdd, 0xa8, 0x33, 0x88, 0x07, 0xc7, 0x31, 0xb1, 0x12, 0x10, 0x59,
-    0x27, 0x80, 0xec, 0x5f, 0x60, 0x51, 0x7f, 0xa9, 0x19, 0xb5, 0x4a, 0x0d,
-    0x2d, 0xe5, 0x7a, 0x9f, 0x93, 0xc9, 0x9c, 0xef, 0xa0, 0xe0, 0x3b, 0x4d,
-    0xae, 0x2a, 0xf5, 0xb0, 0xc8, 0xeb, 0xbb, 0x3c, 0x83, 0x53, 0x99, 0x61,
-    0x17, 0x2b, 0x04, 0x7e, 0xba, 0x77, 0xd6, 0x26, 0xe1, 0x69, 0x14, 0x63,
-    0x55, 0x21, 0x0c, 0x7d]);
-
-  var mix = new Uint32Array([
-    0x00000000, 0x0e090d0b, 0x1c121a16, 0x121b171d, 0x3824342c, 0x362d3927,
-    0x24362e3a, 0x2a3f2331, 0x70486858, 0x7e416553, 0x6c5a724e, 0x62537f45,
-    0x486c5c74, 0x4665517f, 0x547e4662, 0x5a774b69, 0xe090d0b0, 0xee99ddbb,
-    0xfc82caa6, 0xf28bc7ad, 0xd8b4e49c, 0xd6bde997, 0xc4a6fe8a, 0xcaaff381,
-    0x90d8b8e8, 0x9ed1b5e3, 0x8ccaa2fe, 0x82c3aff5, 0xa8fc8cc4, 0xa6f581cf,
-    0xb4ee96d2, 0xbae79bd9, 0xdb3bbb7b, 0xd532b670, 0xc729a16d, 0xc920ac66,
-    0xe31f8f57, 0xed16825c, 0xff0d9541, 0xf104984a, 0xab73d323, 0xa57ade28,
-    0xb761c935, 0xb968c43e, 0x9357e70f, 0x9d5eea04, 0x8f45fd19, 0x814cf012,
-    0x3bab6bcb, 0x35a266c0, 0x27b971dd, 0x29b07cd6, 0x038f5fe7, 0x0d8652ec,
-    0x1f9d45f1, 0x119448fa, 0x4be30393, 0x45ea0e98, 0x57f11985, 0x59f8148e,
-    0x73c737bf, 0x7dce3ab4, 0x6fd52da9, 0x61dc20a2, 0xad766df6, 0xa37f60fd,
-    0xb16477e0, 0xbf6d7aeb, 0x955259da, 0x9b5b54d1, 0x894043cc, 0x87494ec7,
-    0xdd3e05ae, 0xd33708a5, 0xc12c1fb8, 0xcf2512b3, 0xe51a3182, 0xeb133c89,
-    0xf9082b94, 0xf701269f, 0x4de6bd46, 0x43efb04d, 0x51f4a750, 0x5ffdaa5b,
-    0x75c2896a, 0x7bcb8461, 0x69d0937c, 0x67d99e77, 0x3daed51e, 0x33a7d815,
-    0x21bccf08, 0x2fb5c203, 0x058ae132, 0x0b83ec39, 0x1998fb24, 0x1791f62f,
-    0x764dd68d, 0x7844db86, 0x6a5fcc9b, 0x6456c190, 0x4e69e2a1, 0x4060efaa,
-    0x527bf8b7, 0x5c72f5bc, 0x0605bed5, 0x080cb3de, 0x1a17a4c3, 0x141ea9c8,
-    0x3e218af9, 0x302887f2, 0x223390ef, 0x2c3a9de4, 0x96dd063d, 0x98d40b36,
-    0x8acf1c2b, 0x84c61120, 0xaef93211, 0xa0f03f1a, 0xb2eb2807, 0xbce2250c,
-    0xe6956e65, 0xe89c636e, 0xfa877473, 0xf48e7978, 0xdeb15a49, 0xd0b85742,
-    0xc2a3405f, 0xccaa4d54, 0x41ecdaf7, 0x4fe5d7fc, 0x5dfec0e1, 0x53f7cdea,
-    0x79c8eedb, 0x77c1e3d0, 0x65daf4cd, 0x6bd3f9c6, 0x31a4b2af, 0x3fadbfa4,
-    0x2db6a8b9, 0x23bfa5b2, 0x09808683, 0x07898b88, 0x15929c95, 0x1b9b919e,
-    0xa17c0a47, 0xaf75074c, 0xbd6e1051, 0xb3671d5a, 0x99583e6b, 0x97513360,
-    0x854a247d, 0x8b432976, 0xd134621f, 0xdf3d6f14, 0xcd267809, 0xc32f7502,
-    0xe9105633, 0xe7195b38, 0xf5024c25, 0xfb0b412e, 0x9ad7618c, 0x94de6c87,
-    0x86c57b9a, 0x88cc7691, 0xa2f355a0, 0xacfa58ab, 0xbee14fb6, 0xb0e842bd,
-    0xea9f09d4, 0xe49604df, 0xf68d13c2, 0xf8841ec9, 0xd2bb3df8, 0xdcb230f3,
-    0xcea927ee, 0xc0a02ae5, 0x7a47b13c, 0x744ebc37, 0x6655ab2a, 0x685ca621,
-    0x42638510, 0x4c6a881b, 0x5e719f06, 0x5078920d, 0x0a0fd964, 0x0406d46f,
-    0x161dc372, 0x1814ce79, 0x322bed48, 0x3c22e043, 0x2e39f75e, 0x2030fa55,
-    0xec9ab701, 0xe293ba0a, 0xf088ad17, 0xfe81a01c, 0xd4be832d, 0xdab78e26,
-    0xc8ac993b, 0xc6a59430, 0x9cd2df59, 0x92dbd252, 0x80c0c54f, 0x8ec9c844,
-    0xa4f6eb75, 0xaaffe67e, 0xb8e4f163, 0xb6edfc68, 0x0c0a67b1, 0x02036aba,
-    0x10187da7, 0x1e1170ac, 0x342e539d, 0x3a275e96, 0x283c498b, 0x26354480,
-    0x7c420fe9, 0x724b02e2, 0x605015ff, 0x6e5918f4, 0x44663bc5, 0x4a6f36ce,
-    0x587421d3, 0x567d2cd8, 0x37a10c7a, 0x39a80171, 0x2bb3166c, 0x25ba1b67,
-    0x0f853856, 0x018c355d, 0x13972240, 0x1d9e2f4b, 0x47e96422, 0x49e06929,
-    0x5bfb7e34, 0x55f2733f, 0x7fcd500e, 0x71c45d05, 0x63df4a18, 0x6dd64713,
-    0xd731dcca, 0xd938d1c1, 0xcb23c6dc, 0xc52acbd7, 0xef15e8e6, 0xe11ce5ed,
-    0xf307f2f0, 0xfd0efffb, 0xa779b492, 0xa970b999, 0xbb6bae84, 0xb562a38f,
-    0x9f5d80be, 0x91548db5, 0x834f9aa8, 0x8d4697a3]);
-
-  function expandKey128(cipherKey) {
-    var b = 176, result = new Uint8Array(b);
-    result.set(cipherKey);
-    for (var j = 16, i = 1; j < b; ++i) {
-      // RotWord
-      var t1 = result[j - 3], t2 = result[j - 2],
-          t3 = result[j - 1], t4 = result[j - 4];
-      // SubWord
-      t1 = s[t1]; t2 = s[t2]; t3 = s[t3]; t4 = s[t4];
-      // Rcon
-      t1 = t1 ^ rcon[i];
-      for (var n = 0; n < 4; ++n) {
-        result[j] = (t1 ^= result[j - 16]); j++;
-        result[j] = (t2 ^= result[j - 16]); j++;
-        result[j] = (t3 ^= result[j - 16]); j++;
-        result[j] = (t4 ^= result[j - 16]); j++;
-      }
-    }
-    return result;
-  }
-
-  function decrypt128(input, key) {
-    var state = new Uint8Array(16);
-    state.set(input);
-    var i, j, k;
-    var t, u, v;
-    // AddRoundKey
-    for (j = 0, k = 160; j < 16; ++j, ++k)
-      state[j] ^= key[k];
-    for (i = 9; i >= 1; --i) {
-      // InvShiftRows
-      t = state[13]; state[13] = state[9]; state[9] = state[5];
-      state[5] = state[1]; state[1] = t;
-      t = state[14]; u = state[10]; state[14] = state[6];
-      state[10] = state[2]; state[6] = t; state[2] = u;
-      t = state[15]; u = state[11]; v = state[7]; state[15] = state[3];
-      state[11] = t; state[7] = u; state[3] = v;
-      // InvSubBytes
-      for (j = 0; j < 16; ++j)
-        state[j] = inv_s[state[j]];
-      // AddRoundKey
-      for (j = 0, k = i * 16; j < 16; ++j, ++k)
-        state[j] ^= key[k];
-      // InvMixColumns
-      for (j = 0; j < 16; j += 4) {
-        var s0 = mix[state[j]], s1 = mix[state[j + 1]],
-            s2 = mix[state[j + 2]], s3 = mix[state[j + 3]];
-        t = (s0 ^ (s1 >>> 8) ^ (s1 << 24) ^ (s2 >>> 16) ^ (s2 << 16) ^
-            (s3 >>> 24) ^ (s3 << 8));
-        state[j] = (t >>> 24) & 0xFF;
-        state[j + 1] = (t >> 16) & 0xFF;
-        state[j + 2] = (t >> 8) & 0xFF;
-        state[j + 3] = t & 0xFF;
-      }
-    }
-    // InvShiftRows
-    t = state[13]; state[13] = state[9]; state[9] = state[5];
-    state[5] = state[1]; state[1] = t;
-    t = state[14]; u = state[10]; state[14] = state[6];
-    state[10] = state[2]; state[6] = t; state[2] = u;
-    t = state[15]; u = state[11]; v = state[7]; state[15] = state[3];
-    state[11] = t; state[7] = u; state[3] = v;
-    for (j = 0; j < 16; ++j) {
-      // InvSubBytes
-      state[j] = inv_s[state[j]];
-      // AddRoundKey
-      state[j] ^= key[j];
-    }
-    return state;
-  }
-
-  function AES128Cipher(key) {
-    this.key = expandKey128(key);
-    this.buffer = new Uint8Array(16);
-    this.bufferPosition = 0;
-  }
-
-  function decryptBlock2(data) {
-    var i, j, ii, sourceLength = data.length,
-        buffer = this.buffer, bufferLength = this.bufferPosition,
-        result = [], iv = this.iv;
-    for (i = 0; i < sourceLength; ++i) {
-      buffer[bufferLength] = data[i];
-      ++bufferLength;
-      if (bufferLength < 16)
-        continue;
-      // buffer is full, decrypting
-      var plain = decrypt128(buffer, this.key);
-      // xor-ing the IV vector to get plain text
-      for (j = 0; j < 16; ++j)
-        plain[j] ^= iv[j];
-      iv = buffer;
-      result.push(plain);
-      buffer = new Uint8Array(16);
-      bufferLength = 0;
-    }
-    // saving incomplete buffer
-    this.buffer = buffer;
-    this.bufferLength = bufferLength;
-    this.iv = iv;
-    if (result.length == 0)
-      return new Uint8Array([]);
-    if (result.length == 1)
-      return result[0];
-    // combining plain text blocks into one
-    var output = new Uint8Array(16 * result.length);
-    for (i = 0, j = 0, ii = result.length; i < ii; ++i, j += 16)
-      output.set(result[i], j);
-    return output;
-  }
-
-  AES128Cipher.prototype = {
-    decryptBlock: function AES128Cipher_decryptBlock(data) {
-      var i, sourceLength = data.length;
-      var buffer = this.buffer, bufferLength = this.bufferPosition;
-      // waiting for IV values -- they are at the start of the stream
-      for (i = 0; bufferLength < 16 && i < sourceLength; ++i, ++bufferLength)
-        buffer[bufferLength] = data[i];
-      if (bufferLength < 16) {
-        // need more data
-        this.bufferLength = bufferLength;
-        return new Uint8Array([]);
-      }
-      this.iv = buffer;
-      this.buffer = new Uint8Array(16);
-      this.bufferLength = 0;
-      // starting decryption
-      this.decryptBlock = decryptBlock2;
-      return this.decryptBlock(data.subarray(16));
-    }
-  };
-
-  return AES128Cipher;
-})();
-
-var CipherTransform = (function CipherTransformClosure() {
-  function CipherTransform(stringCipherConstructor, streamCipherConstructor) {
-    this.stringCipherConstructor = stringCipherConstructor;
-    this.streamCipherConstructor = streamCipherConstructor;
-  }
-  CipherTransform.prototype = {
-    createStream: function CipherTransform_createStream(stream) {
-      var cipher = new this.streamCipherConstructor();
-      return new DecryptStream(stream,
-        function cipherTransformDecryptStream(data) {
-          return cipher.decryptBlock(data);
-        }
-      );
-    },
-    decryptString: function CipherTransform_decryptString(s) {
-      var cipher = new this.stringCipherConstructor();
-      var data = stringToBytes(s);
-      data = cipher.decryptBlock(data);
-      return bytesToString(data);
-    }
-  };
-  return CipherTransform;
-})();
-
-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 hashData = new Uint8Array(100), i = 0, j, n;
-    if (password) {
-      n = Math.min(32, password.length);
-      for (; i < n; ++i)
-        hashData[i] = password[i];
-    }
-    j = 0;
-    while (i < 32) {
-      hashData[i++] = defaultPasswordBytes[j++];
-    }
-    // as now the padded password in the hashData[0..i]
-    for (j = 0, n = ownerPassword.length; j < n; ++j)
-      hashData[i++] = ownerPassword[j];
-    hashData[i++] = flags & 0xFF;
-    hashData[i++] = (flags >> 8) & 0xFF;
-    hashData[i++] = (flags >> 16) & 0xFF;
-    hashData[i++] = (flags >>> 24) & 0xFF;
-    for (j = 0, n = fileId.length; j < n; ++j)
-      hashData[i++] = fileId[j];
-    if (revision >= 4 && !encryptMetadata) {
-      hashData[i++] = 0xFF;
-      hashData[i++] = 0xFF;
-      hashData[i++] = 0xFF;
-      hashData[i++] = 0xFF;
-    }
-    var hash = calculateMD5(hashData, 0, i);
-    var keyLengthInBytes = keyLength >> 3;
-    if (revision >= 3) {
-      for (j = 0; j < 50; ++j) {
-         hash = calculateMD5(hash, 0, keyLengthInBytes);
-      }
-    }
-    var encryptionKey = hash.subarray(0, keyLengthInBytes);
-    var cipher, checkData;
-
-    if (revision >= 3) {
-      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);
-      var checkData = cipher.encryptBlock(calculateMD5(hashData, 0, i));
-      n = encryptionKey.length;
-      var derivedKey = new Uint8Array(n), k;
-      for (j = 1; j <= 19; ++j) {
-        for (k = 0; k < n; ++k)
-          derivedKey[k] = encryptionKey[k] ^ j;
-        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(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');
-
-  function CipherTransformFactory(dict, fileId, password) {
-    var filter = dict.get('Filter');
-    if (!isName(filter) || filter.name != 'Standard')
-      error('unknown encryption method');
-    this.dict = dict;
-    var algorithm = dict.get('V');
-    if (!isInt(algorithm) ||
-      (algorithm != 1 && algorithm != 2 && algorithm != 4))
-      error('unsupported encryption algorithm');
-    this.algorithm = algorithm;
-    var keyLength = dict.get('Length') || 40;
-    if (!isInt(keyLength) ||
-      keyLength < 40 || (keyLength % 8) != 0)
-      error('invalid key length');
-    // prepare keys
-    var ownerPassword = stringToBytes(dict.get('O'));
-    var userPassword = stringToBytes(dict.get('U'));
-    var flags = dict.get('P');
-    var revision = dict.get('R');
-    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);
-
-    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;
-      this.strf = dict.get('StrF') || identityName;
-      this.eff = dict.get('EFF') || this.strf;
-    }
-  }
-
-  function buildObjectKey(num, gen, encryptionKey, isAes) {
-    var key = new Uint8Array(encryptionKey.length + 9), i, n;
-    for (i = 0, n = encryptionKey.length; i < n; ++i)
-      key[i] = encryptionKey[i];
-    key[i++] = num & 0xFF;
-    key[i++] = (num >> 8) & 0xFF;
-    key[i++] = (num >> 16) & 0xFF;
-    key[i++] = gen & 0xFF;
-    key[i++] = (gen >> 8) & 0xFF;
-    if (isAes) {
-      key[i++] = 0x73;
-      key[i++] = 0x41;
-      key[i++] = 0x6C;
-      key[i++] = 0x54;
-    }
-    var hash = calculateMD5(key, 0, i);
-    return hash.subarray(0, Math.min(encryptionKey.length + 5, 16));
-  }
-
-  function buildCipherConstructor(cf, name, num, gen, key) {
-    var cryptFilter = cf.get(name.name);
-    var cfm;
-    if (cryptFilter != null)
-      cfm = cryptFilter.get('CFM');
-    if (!cfm || cfm.name == 'None') {
-      return function cipherTransformFactoryBuildCipherConstructorNone() {
-        return new NullCipher();
-      };
-    }
-    if ('V2' == cfm.name) {
-      return function cipherTransformFactoryBuildCipherConstructorV2() {
-        return new ARCFourCipher(
-          buildObjectKey(num, gen, key, false));
-      };
-    }
-    if ('AESV2' == cfm.name) {
-      return function cipherTransformFactoryBuildCipherConstructorAESV2() {
-        return new AES128Cipher(
-          buildObjectKey(num, gen, key, true));
-      };
-    }
-    error('Unknown crypto method');
-  }
-
-  CipherTransformFactory.prototype = {
-    createCipherTransform:
-      function CipherTransformFactory_createCipherTransform(num, gen) {
-      if (this.algorithm == 4) {
-        return new CipherTransform(
-          buildCipherConstructor(this.cf, this.stmf,
-            num, gen, this.encryptionKey),
-          buildCipherConstructor(this.cf, this.strf,
-            num, gen, this.encryptionKey));
-      }
-      // algorithms 1 and 2
-      var key = buildObjectKey(num, gen, this.encryptionKey, false);
-      var cipherConstructor = function buildCipherCipherConstructor() {
-        return new ARCFourCipher(key);
-      };
-      return new CipherTransform(cipherConstructor, cipherConstructor);
-    }
-  };
-
-  return CipherTransformFactory;
-})();
-
-
-/* -*- 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 PartialEvaluator = (function PartialEvaluatorClosure() {
-  function PartialEvaluator(xref, handler, uniquePrefix) {
-    this.state = new EvalState();
-    this.stateStack = [];
-
-    this.xref = xref;
-    this.handler = handler;
-    this.uniquePrefix = uniquePrefix;
-    this.objIdCounter = 0;
-  }
-
-  var OP_MAP = {
-    // Graphics state
-    w: 'setLineWidth',
-    J: 'setLineCap',
-    j: 'setLineJoin',
-    M: 'setMiterLimit',
-    d: 'setDash',
-    ri: 'setRenderingIntent',
-    i: 'setFlatness',
-    gs: 'setGState',
-    q: 'save',
-    Q: 'restore',
-    cm: 'transform',
-
-    // Path
-    m: 'moveTo',
-    l: 'lineTo',
-    c: 'curveTo',
-    v: 'curveTo2',
-    y: 'curveTo3',
-    h: 'closePath',
-    re: 'rectangle',
-    S: 'stroke',
-    s: 'closeStroke',
-    f: 'fill',
-    F: 'fill',
-    'f*': 'eoFill',
-    B: 'fillStroke',
-    'B*': 'eoFillStroke',
-    b: 'closeFillStroke',
-    'b*': 'closeEOFillStroke',
-    n: 'endPath',
-
-    // Clipping
-    W: 'clip',
-    'W*': 'eoClip',
-
-    // Text
-    BT: 'beginText',
-    ET: 'endText',
-    Tc: 'setCharSpacing',
-    Tw: 'setWordSpacing',
-    Tz: 'setHScale',
-    TL: 'setLeading',
-    Tf: 'setFont',
-    Tr: 'setTextRenderingMode',
-    Ts: 'setTextRise',
-    Td: 'moveText',
-    TD: 'setLeadingMoveText',
-    Tm: 'setTextMatrix',
-    'T*': 'nextLine',
-    Tj: 'showText',
-    TJ: 'showSpacedText',
-    "'": 'nextLineShowText',
-    '"': 'nextLineSetSpacingShowText',
-
-    // Type3 fonts
-    d0: 'setCharWidth',
-    d1: 'setCharWidthAndBounds',
-
-    // Color
-    CS: 'setStrokeColorSpace',
-    cs: 'setFillColorSpace',
-    SC: 'setStrokeColor',
-    SCN: 'setStrokeColorN',
-    sc: 'setFillColor',
-    scn: 'setFillColorN',
-    G: 'setStrokeGray',
-    g: 'setFillGray',
-    RG: 'setStrokeRGBColor',
-    rg: 'setFillRGBColor',
-    K: 'setStrokeCMYKColor',
-    k: 'setFillCMYKColor',
-
-    // Shading
-    sh: 'shadingFill',
-
-    // Images
-    BI: 'beginInlineImage',
-    ID: 'beginImageData',
-    EI: 'endInlineImage',
-
-    // XObjects
-    Do: 'paintXObject',
-
-    // Marked content
-    MP: 'markPoint',
-    DP: 'markPointProps',
-    BMC: 'beginMarkedContent',
-    BDC: 'beginMarkedContentProps',
-    EMC: 'endMarkedContent',
-
-    // Compatibility
-    BX: 'beginCompat',
-    EX: 'endCompat',
-
-    // (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,
-                                                               resources,
-                                                               dependency,
-                                                               queue) {
-
-      var self = this;
-      var xref = this.xref;
-      var handler = this.handler;
-      var uniquePrefix = this.uniquePrefix || '';
-
-      function insertDependency(depList) {
-        fnArray.push('dependency');
-        argsArray.push(depList);
-        for (var i = 0, ii = depList.length; i < ii; i++) {
-          var dep = depList[i];
-          if (dependency.indexOf(dep) == -1) {
-            dependency.push(depList[i]);
-          }
-        }
-      }
-
-      function handleSetFont(fontName, font) {
-        var loadedName = null;
-
-        var fontRes = resources.get('Font');
-
-        assert(fontRes, 'fontRes not available');
-
-        font = xref.fetchIfRef(font) || fontRes.get(fontName);
-        assertWellFormed(isDict(font));
-
-        ++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;
-            font.translated.properties.loadedName = loadedName;
-            font.loadedName = loadedName;
-
-            var translated = font.translated;
-            // Convert the file to an ArrayBuffer which will be turned back into
-            // a Stream in the main thread.
-            if (translated.file)
-              translated.file = translated.file.getBytes();
-            if (translated.properties.file) {
-              translated.properties.file =
-                  translated.properties.file.getBytes();
-            }
-
-            handler.send('obj', [
-                loadedName,
-                'Font',
-                translated.name,
-                translated.file,
-                translated.properties
-            ]);
-          }
-        }
-        loadedName = loadedName || font.loadedName;
-
-        // Ensure the font is ready before the font is set
-        // and later on used for drawing.
-        // OPTIMIZE: This should get insert to the operatorList only once per
-        // page.
-        insertDependency([loadedName]);
-        return loadedName;
-      }
-
-      function buildPaintImageXObject(image, inline) {
-        var dict = image.dict;
-        var w = dict.get('Width', 'W');
-        var h = dict.get('Height', 'H');
-
-        var imageMask = dict.get('ImageMask', 'IM') || false;
-        if (imageMask) {
-          // This depends on a tmpCanvas beeing filled with the
-          // current fillStyle, such that processing the pixel
-          // data can't be done here. Instead of creating a
-          // complete PDFImage, only read the information needed
-          // for later.
-
-          var width = dict.get('Width', 'W');
-          var height = dict.get('Height', 'H');
-          var bitStrideLength = (width + 7) >> 3;
-          var imgArray = image.getBytes(bitStrideLength * height);
-          var decode = dict.get('Decode', 'D');
-          var inverseDecode = !!decode && decode[0] > 0;
-
-          fn = 'paintImageMaskXObject';
-          args = [imgArray, inverseDecode, width, height];
-          return;
-        }
-
-        // If there is no imageMask, create the PDFImage and a lot
-        // of image processing can be done here.
-        var objId = 'img_' + uniquePrefix + (++self.objIdCounter);
-        insertDependency([objId]);
-        args = [objId, w, h];
-
-        var softMask = dict.get('SMask', 'IM') || false;
-        if (!softMask && image instanceof JpegStream &&
-            image.isNativelySupported(xref, resources)) {
-          // These JPEGs don't need any more processing so we can just send it.
-          fn = 'paintJpegXObject';
-          handler.send('obj', [objId, 'JpegStream', image.getIR()]);
-          return;
-        }
-
-        fn = 'paintImageXObject';
-
-        PDFImage.buildImage(function(imageObj) {
-            var drawWidth = imageObj.drawWidth;
-            var drawHeight = imageObj.drawHeight;
-            var imgData = {
-              width: drawWidth,
-              height: drawHeight,
-              data: new Uint8Array(drawWidth * drawHeight * 4)
-            };
-            var pixels = imgData.data;
-            imageObj.fillRgbaBuffer(pixels, drawWidth, drawHeight);
-            handler.send('obj', [objId, 'Image', imgData]);
-          }, handler, xref, resources, image, inline);
-      }
-
-      if (!queue)
-        queue = {};
-
-      if (!queue.argsArray) {
-        queue.argsArray = [];
-      }
-      if (!queue.fnArray) {
-        queue.fnArray = [];
-      }
-
-      var fnArray = queue.fnArray, argsArray = queue.argsArray;
-      var dependencyArray = dependency || [];
-
-      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, OP_MAP), false, xref);
-      var res = resources;
-      var args = [], obj;
-      var TILING_PATTERN = 1, SHADING_PATTERN = 2;
-
-      while (true) {
-        obj = parser.getObj();
-        if (isEOF(obj))
-          break;
-
-        if (isCmd(obj)) {
-          var cmd = obj.cmd;
-          var fn = OP_MAP[cmd];
-          assertWellFormed(fn, 'Unknown command "' + cmd + '"');
-          // TODO figure out how to type-check vararg functions
-
-          if ((cmd == 'SCN' || cmd == 'scn') && !args[args.length - 1].code) {
-            // compile tiling patterns
-            var patternName = args[args.length - 1];
-            // SCN/scn applies patterns along with normal colors
-            if (isName(patternName)) {
-              var pattern = patterns.get(patternName.name);
-              if (pattern) {
-                var dict = isStream(pattern) ? pattern.dict : pattern;
-                var typeNum = dict.get('PatternType');
-
-                if (typeNum == TILING_PATTERN) {
-                  // Create an IR of the pattern code.
-                  var depIdx = dependencyArray.length;
-                  var operatorList = this.getOperatorList(pattern,
-                      dict.get('Resources') || resources, dependencyArray);
-
-                  // Add the dependencies that are required to execute the
-                  // operatorList.
-                  insertDependency(dependencyArray.slice(depIdx));
-
-                  args = TilingPattern.getIR(operatorList, dict, args);
-                }
-                else if (typeNum == SHADING_PATTERN) {
-                  var shading = dict.get('Shading');
-                  var matrix = dict.get('Matrix');
-                  var pattern = Pattern.parseShading(shading, matrix, xref,
-                                                     res);
-                  args = pattern.getIR();
-                } else {
-                  error('Unkown PatternType ' + typeNum);
-                }
-              }
-            }
-          } else if (cmd == 'Do' && !args[0].code) {
-            // eagerly compile XForm objects
-            var name = args[0].name;
-            var xobj = xobjs.get(name);
-            if (xobj) {
-              assertWellFormed(isStream(xobj), 'XObject should be a stream');
-
-              var type = xobj.dict.get('Subtype');
-              assertWellFormed(
-                isName(type),
-                'XObject should have a Name subtype'
-              );
-
-              if ('Form' == type.name) {
-                var matrix = xobj.dict.get('Matrix');
-                var bbox = xobj.dict.get('BBox');
-
-                fnArray.push('paintFormXObjectBegin');
-                argsArray.push([matrix, bbox]);
-
-                // This adds the operatorList of the xObj to the current queue.
-                var depIdx = dependencyArray.length;
-
-                // Pass in the current `queue` object. That means the `fnArray`
-                // and the `argsArray` in this scope is reused and new commands
-                // are added to them.
-                this.getOperatorList(xobj,
-                    xobj.dict.get('Resources') || resources,
-                    dependencyArray, queue);
-
-               // Add the dependencies that are required to execute the
-               // operatorList.
-               insertDependency(dependencyArray.slice(depIdx));
-
-                fn = 'paintFormXObjectEnd';
-                args = [];
-              } else if ('Image' == type.name) {
-                buildPaintImageXObject(xobj, false);
-              } else {
-                error('Unhandled XObject subtype ' + type.name);
-              }
-            }
-          } else if (cmd == 'Tf') { // eagerly collect all fonts
-            args[0] = handleSetFont(args[0].name);
-          } else if (cmd == 'EI') {
-            buildPaintImageXObject(args[0], true);
-          }
-
-          switch (fn) {
-            // Parse the ColorSpace data to a raw format.
-            case 'setFillColorSpace':
-            case 'setStrokeColorSpace':
-              args = [ColorSpace.parseToIR(args[0], xref, resources)];
-              break;
-            case 'shadingFill':
-              var shadingRes = res.get('Shading');
-              if (!shadingRes)
-                error('No shading resource found');
-
-              var shading = shadingRes.get(args[0].name);
-              if (!shading)
-                error('No shading object found');
-
-              var shadingFill = Pattern.parseShading(shading, null, xref, res);
-              var patternIR = shadingFill.getIR();
-              args = [patternIR];
-              fn = 'shadingFill';
-              break;
-            case 'setGState':
-              var dictName = args[0];
-              var extGState = resources.get('ExtGState');
-
-              if (!isDict(extGState) || !extGState.has(dictName.name))
-                break;
-
-              var gsState = extGState.get(dictName.name);
-
-              // This array holds the converted/processed state data.
-              var gsStateObj = [];
-
-              gsState.forEach(
-                function canvasGraphicsSetGStateForEach(key, value) {
-                  switch (key) {
-                    case 'Type':
-                      break;
-                    case 'LW':
-                    case 'LC':
-                    case 'LJ':
-                    case 'ML':
-                    case 'D':
-                    case 'RI':
-                    case 'FL':
-                    case 'CA':
-                    case 'ca':
-                      gsStateObj.push([key, value]);
-                      break;
-                    case 'Font':
-                      gsStateObj.push([
-                        'Font',
-                        handleSetFont(null, value[0]),
-                        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':
-                    case 'BG':
-                    case 'BG2':
-                    case 'UCR':
-                    case 'UCR2':
-                    case 'TR':
-                    case 'TR2':
-                    case 'HT':
-                    case 'SM':
-                    case 'SA':
-                    case 'AIS':
-                    case 'TK':
-                      // TODO implement these operators.
-                      info('graphic state operator ' + key);
-                      break;
-                    default:
-                      info('Unknown graphic state operator ' + key);
-                      break;
-                  }
-                }
-              );
-              args = [gsStateObj];
-              break;
-          } // switch
-
-          fnArray.push(fn);
-          argsArray.push(args);
-          args = [];
-        } else if (obj != null) {
-          assertWellFormed(args.length <= 33, 'Too many arguments');
-          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) {
-      // 9.10.2
-      var toUnicode = dict.get('ToUnicode') ||
-        baseDict.get('ToUnicode');
-      if (toUnicode)
-        properties.toUnicode = this.readToUnicode(toUnicode, xref, properties);
-
-      if (properties.composite) {
-        // CIDSystemInfo helps to match CID to glyphs
-        var cidSystemInfo = dict.get('CIDSystemInfo');
-        if (isDict(cidSystemInfo)) {
-          properties.cidSystemInfo = {
-            registry: cidSystemInfo.get('Registry'),
-            ordering: cidSystemInfo.get('Ordering'),
-            supplement: cidSystemInfo.get('Supplement')
-          };
-        }
-
-        var cidToGidMap = dict.get('CIDToGIDMap');
-        if (isStream(cidToGidMap))
-          properties.cidToGidMap = this.readCidToGidMap(cidToGidMap);
-      }
-
-      var flags = properties.flags;
-      var differences = [];
-      var baseEncoding = !!(flags & FontFlags.Symbolic) ?
-                         Encodings.symbolsEncoding : Encodings.StandardEncoding;
-      var hasEncoding = dict.has('Encoding');
-      if (hasEncoding) {
-        var encoding = dict.get('Encoding');
-        if (isDict(encoding)) {
-          var baseName = encoding.get('BaseEncoding');
-          if (baseName)
-            baseEncoding = Encodings[baseName.name];
-          else
-            hasEncoding = false; // base encoding was not provided
-
-          // Load the differences between the base and original
-          if (encoding.has('Differences')) {
-            var diffEncoding = encoding.get('Differences');
-            var index = 0;
-            for (var j = 0, jj = diffEncoding.length; j < jj; j++) {
-              var data = diffEncoding[j];
-              if (isNum(data))
-                index = data;
-              else
-                differences[index++] = data.name;
-            }
-          }
-        } else if (isName(encoding)) {
-          baseEncoding = Encodings[encoding.name];
-        } else {
-          error('Encoding is not a Name nor a Dict');
-        }
-      }
-
-      properties.differences = differences;
-      properties.baseEncoding = baseEncoding;
-      properties.hasEncoding = hasEncoding;
-    },
-
-    readToUnicode: function PartialEvaluator_readToUnicode(toUnicode, xref,
-                                                           properties) {
-      var cmapObj = toUnicode;
-      var charToUnicode = [];
-      if (isName(cmapObj)) {
-        var isIdentityMap = cmapObj.name.substr(0, 9) == 'Identity-';
-        if (!isIdentityMap)
-          error('ToUnicode file cmap translation not implemented');
-      } else if (isStream(cmapObj)) {
-        var tokens = [];
-        var token = '';
-        var beginArrayToken = {};
-
-        var cmap = cmapObj.getBytes(cmapObj.length);
-        for (var i = 0, ii = cmap.length; i < ii; i++) {
-          var octet = cmap[i];
-          if (octet == 0x20 || octet == 0x0D || octet == 0x0A ||
-              octet == 0x3C || octet == 0x5B || octet == 0x5D) {
-            switch (token) {
-              case 'usecmap':
-                error('usecmap is not implemented');
-                break;
-
-              case 'beginbfchar':
-              case 'beginbfrange':
-              case 'begincidchar':
-              case 'begincidrange':
-                token = '';
-                tokens = [];
-                break;
-
-              case 'endcidrange':
-              case 'endbfrange':
-                for (var j = 0, jj = tokens.length; j < jj; j += 3) {
-                  var startRange = tokens[j];
-                  var endRange = tokens[j + 1];
-                  var code = tokens[j + 2];
-                  if (code == 0xFFFF) {
-                    // CMap is broken, assuming code == startRange
-                    code = startRange;
-                  }
-                  if (isArray(code)) {
-                    var codeindex = 0;
-                    while (startRange <= endRange) {
-                      charToUnicode[startRange] = code[codeindex++];
-                      ++startRange;
-                    }
-                  } else {
-                    while (startRange <= endRange) {
-                      charToUnicode[startRange] = code++;
-                      ++startRange;
-                    }
-                  }
-                }
-                break;
-
-              case 'endcidchar':
-              case 'endbfchar':
-                for (var j = 0, jj = tokens.length; j < jj; j += 2) {
-                  var index = tokens[j];
-                  var code = tokens[j + 1];
-                  charToUnicode[index] = code;
-                }
-                break;
-
-              case '':
-                break;
-
-              default:
-                if (token[0] >= '0' && token[0] <= '9')
-                  token = parseInt(token, 10); // a number
-                tokens.push(token);
-                token = '';
-            }
-            switch (octet) {
-              case 0x5B:
-                // begin list parsing
-                tokens.push(beginArrayToken);
-                break;
-              case 0x5D:
-                // collect array items
-                var items = [], item;
-                while (tokens.length &&
-                       (item = tokens.pop()) != beginArrayToken)
-                  items.unshift(item);
-                tokens.push(items);
-                break;
-            }
-          } 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));
-                token = '';
-              } else {
-                // parsing hex UTF-16BE numbers
-                var str = [];
-                for (var k = 0, kk = token.length; k < kk; k += 4) {
-                  var b = parseInt(token.substr(k, 4), 16);
-                  if (b <= 0x10) {
-                    k += 4;
-                    b = (b << 16) | parseInt(token.substr(k, 4), 16);
-                    b -= 0x10000;
-                    str.push(0xD800 | (b >> 10));
-                    str.push(0xDC00 | (b & 0x3FF));
-                    break;
-                  }
-                  str.push(b);
-                }
-                tokens.push(String.fromCharCode.apply(String, str));
-                token = '';
-              }
-            }
-          } else {
-            token += String.fromCharCode(octet);
-          }
-        }
-      }
-      return charToUnicode;
-    },
-    readCidToGidMap: function PartialEvaluator_readCidToGidMap(cidToGidStream) {
-      // Extract the encoding from the CIDToGIDMap
-      var glyphsData = cidToGidStream.getBytes();
-
-      // Set encoding 0 to later verify the font has an encoding
-      var result = [];
-      for (var j = 0, jj = glyphsData.length; j < jj; j++) {
-        var glyphID = (glyphsData[j++] << 8) | glyphsData[j];
-        if (glyphID == 0)
-          continue;
-
-        var code = j >> 1;
-        result[code] = glyphID;
-      }
-      return result;
-    },
-
-    extractWidths: function PartialEvaluator_extractWidths(dict,
-                                                   xref,
-                                                   descriptor,
-                                                   properties) {
-      var glyphsWidths = [];
-      var defaultWidth = 0;
-      if (properties.composite) {
-        defaultWidth = dict.get('DW') || 1000;
-
-        var widths = dict.get('W');
-        if (widths) {
-          var start = 0, end = 0;
-          for (var i = 0, ii = widths.length; i < ii; i++) {
-            var code = widths[i];
-            if (isArray(code)) {
-              for (var j = 0, jj = code.length; j < jj; j++)
-                glyphsWidths[start++] = code[j];
-              start = 0;
-            } else if (start) {
-              var width = widths[++i];
-              for (var j = start; j <= code; j++)
-                glyphsWidths[j] = width;
-              start = 0;
-            } else {
-              start = code;
-            }
-          }
-        }
-      } else {
-        var firstChar = properties.firstChar;
-        var widths = dict.get('Widths');
-        if (widths) {
-          var j = firstChar;
-          for (var i = 0, ii = widths.length; i < ii; i++)
-            glyphsWidths[j++] = widths[i];
-          defaultWidth = parseFloat(descriptor.get('MissingWidth')) || 0;
-        } else {
-          // Trying get the BaseFont metrics (see comment above).
-          var baseFontName = dict.get('BaseFont');
-          if (isName(baseFontName)) {
-            var metrics = this.getBaseFontMetrics(baseFontName.name);
-
-            glyphsWidths = metrics.widths;
-            defaultWidth = metrics.defaultWidth;
-          }
-        }
-      }
-
-      properties.defaultWidth = defaultWidth;
-      properties.widths = glyphsWidths;
-    },
-
-    getBaseFontMetrics: function PartialEvaluator_getBaseFontMetrics(name) {
-      var defaultWidth = 0, widths = [];
-      var glyphWidths = Metrics[stdFontMap[name] || name];
-      if (isNum(glyphWidths)) {
-        defaultWidth = glyphWidths;
-      } else {
-        widths = glyphWidths;
-      }
-
-      return {
-        defaultWidth: defaultWidth,
-        widths: widths
-      };
-    },
-
-    translateFont: function PartialEvaluator_translateFont(dict,
-                                                           xref,
-                                                           resources,
-                                                           dependency) {
-      var baseDict = dict;
-      var type = dict.get('Subtype');
-      assertWellFormed(isName(type), 'invalid font Subtype');
-
-      var composite = false;
-      if (type.name == 'Type0') {
-        // If font is a composite
-        //  - get the descendant font
-        //  - set the type according to the descendant font
-        //  - get the FontDescriptor from the descendant font
-        var df = dict.get('DescendantFonts');
-        if (!df)
-          return null;
-
-        dict = isArray(df) ? xref.fetchIfRef(df[0]) : df;
-
-        type = dict.get('Subtype');
-        assertWellFormed(isName(type), 'invalid font Subtype');
-        composite = true;
-      }
-      var maxCharIndex = composite ? 0xFFFF : 0xFF;
-
-      var descriptor = dict.get('FontDescriptor');
-      if (!descriptor) {
-        if (type.name == 'Type3') {
-          // FontDescriptor is only required for Type3 fonts when the document
-          // is a tagged pdf. Create a barbebones one to get by.
-          descriptor = new Dict();
-          descriptor.set('FontName', new Name(type.name));
-        } else {
-          // Before PDF 1.5 if the font was one of the base 14 fonts, having a
-          // FontDescriptor was not required.
-          // This case is here for compatibility.
-          var baseFontName = dict.get('BaseFont');
-          if (!isName(baseFontName))
-            return null;
-
-          // Using base font name as a font name.
-          baseFontName = baseFontName.name.replace(/[,_]/g, '-');
-          var metrics = this.getBaseFontMetrics(baseFontName);
-
-          // Simulating descriptor flags attribute
-          var fontNameWoStyle = baseFontName.split('-')[0];
-          var flags = (serifFonts[fontNameWoStyle] ||
-            (fontNameWoStyle.search(/serif/gi) != -1) ? FontFlags.Serif : 0) |
-            (symbolsFonts[fontNameWoStyle] ? FontFlags.Symbolic :
-            FontFlags.Nonsymbolic);
-
-          var properties = {
-            type: type.name,
-            widths: metrics.widths,
-            defaultWidth: metrics.defaultWidth,
-            flags: flags,
-            firstChar: 0,
-            lastChar: maxCharIndex
-          };
-          this.extractDataStructures(dict, dict, xref, properties);
-
-          return {
-            name: baseFontName,
-            dict: baseDict,
-            properties: properties
-          };
-        }
-      }
-
-      // According to the spec if 'FontDescriptor' is declared, 'FirstChar',
-      // 'LastChar' and 'Widths' should exist too, but some PDF encoders seem
-      // to ignore this rule when a variant of a standart font is used.
-      // TODO Fill the width array depending on which of the base font this is
-      // a variant.
-      var firstChar = dict.get('FirstChar') || 0;
-      var lastChar = dict.get('LastChar') || maxCharIndex;
-      var fontName = descriptor.get('FontName');
-      // Some bad pdf's have a string as the font name.
-      if (isString(fontName))
-        fontName = new Name(fontName);
-      assertWellFormed(isName(fontName), 'invalid font name');
-
-      var fontFile = descriptor.get('FontFile', 'FontFile2', 'FontFile3');
-      if (fontFile) {
-        if (fontFile.dict) {
-          var subtype = fontFile.dict.get('Subtype');
-          if (subtype)
-            subtype = subtype.name;
-
-          var length1 = fontFile.dict.get('Length1');
-
-          var length2 = fontFile.dict.get('Length2');
-        }
-      }
-
-      var properties = {
-        type: type.name,
-        subtype: subtype,
-        file: fontFile,
-        length1: length1,
-        length2: length2,
-        composite: composite,
-        wideChars: composite,
-        fixedPitch: false,
-        fontMatrix: dict.get('FontMatrix') || IDENTITY_MATRIX,
-        firstChar: firstChar || 0,
-        lastChar: lastChar || maxCharIndex,
-        bbox: descriptor.get('FontBBox'),
-        ascent: descriptor.get('Ascent'),
-        descent: descriptor.get('Descent'),
-        xHeight: descriptor.get('XHeight'),
-        capHeight: descriptor.get('CapHeight'),
-        flags: descriptor.get('Flags'),
-        italicAngle: descriptor.get('ItalicAngle'),
-        coded: false
-      };
-      this.extractWidths(dict, xref, descriptor, properties);
-      this.extractDataStructures(dict, baseDict, xref, properties);
-
-      if (type.name === 'Type3') {
-        properties.coded = true;
-        var charProcs = dict.get('CharProcs').getAll();
-        var fontResources = dict.get('Resources') || resources;
-        properties.charProcOperatorList = {};
-        for (var key in charProcs) {
-          var glyphStream = charProcs[key];
-          properties.charProcOperatorList[key] =
-            this.getOperatorList(glyphStream, fontResources, dependency);
-        }
-      }
-
-      return {
-        name: fontName.name,
-        dict: baseDict,
-        file: fontFile,
-        properties: properties
-      };
-    }
-  };
-
-  return PartialEvaluator;
-})();
-
-var EvalState = (function EvalStateClosure() {
-  function EvalState() {
-    // Are soft masks and alpha values shapes or opacities?
-    this.alphaIsShape = false;
-    this.fontSize = 0;
-    this.textMatrix = IDENTITY_MATRIX;
-    this.leading = 0;
-    // Start of text line (in text coordinates)
-    this.lineX = 0;
-    this.lineY = 0;
-    // Character and word spacing
-    this.charSpacing = 0;
-    this.wordSpacing = 0;
-    this.textHScale = 1;
-    // Color spaces
-    this.fillColorSpace = null;
-    this.strokeColorSpace = null;
-  }
-  EvalState.prototype = {
-  };
-  return EvalState;
-})();
-
-
-/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
-
-'use strict';
-
-/**
- * Maximum time to wait for a font to be loaded by font-face rules.
- */
-var kMaxWaitForFontFace = 1000;
-
-// Unicode Private Use Area
-var kCmapGlyphOffset = 0xE000;
-var kSizeOfGlyphArea = 0x1900;
-var kSymbolicFontGlyphOffset = 0xF000;
-
-// PDF Glyph Space Units are one Thousandth of a TextSpace Unit
-// except for Type 3 fonts
-var kPDFGlyphSpaceUnits = 1000;
-
-// Until hinting is fully supported this constant can be used
-var kHintingEnabled = false;
-
-var FontFlags = {
-  FixedPitch: 1,
-  Serif: 2,
-  Symbolic: 4,
-  Script: 8,
-  Nonsymbolic: 32,
-  Italic: 64,
-  AllCap: 65536,
-  SmallCap: 131072,
-  ForceBold: 262144
-};
-
-var Encodings = {
-  ExpertEncoding: ['', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
-    '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
-    'space', 'exclamsmall', 'Hungarumlautsmall', '', 'dollaroldstyle',
-    'dollarsuperior', 'ampersandsmall', 'Acutesmall', 'parenleftsuperior',
-    'parenrightsuperior', 'twodotenleader', 'onedotenleader', 'comma',
-    'hyphen', 'period', 'fraction', 'zerooldstyle', 'oneoldstyle',
-    'twooldstyle', 'threeoldstyle', 'fouroldstyle', 'fiveoldstyle',
-    'sixoldstyle', 'sevenoldstyle', 'eightoldstyle', 'nineoldstyle', 'colon',
-    'semicolon', 'commasuperior', 'threequartersemdash', 'periodsuperior',
-    'questionsmall', '', 'asuperior', 'bsuperior', 'centsuperior', 'dsuperior',
-    'esuperior', '', '', 'isuperior', '', '', 'lsuperior', 'msuperior',
-    'nsuperior', 'osuperior', '', '', 'rsuperior', 'ssuperior', 'tsuperior',
-    '', 'ff', 'fi', 'fl', 'ffi', 'ffl', 'parenleftinferior', '',
-    'parenrightinferior', 'Circumflexsmall', 'hyphensuperior', 'Gravesmall',
-    'Asmall', 'Bsmall', 'Csmall', 'Dsmall', 'Esmall', 'Fsmall', 'Gsmall',
-    'Hsmall', 'Ismall', 'Jsmall', 'Ksmall', 'Lsmall', 'Msmall', 'Nsmall',
-    'Osmall', 'Psmall', 'Qsmall', 'Rsmall', 'Ssmall', 'Tsmall', 'Usmall',
-    'Vsmall', 'Wsmall', 'Xsmall', 'Ysmall', 'Zsmall', 'colonmonetary',
-    'onefitted', 'rupiah', 'Tildesmall', '', '', '', '', '', '', '', '', '',
-    '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
-    '', '', '', '', '', '', 'exclamdownsmall', 'centoldstyle', 'Lslashsmall',
-    '', '', 'Scaronsmall', 'Zcaronsmall', 'Dieresissmall', 'Brevesmall',
-    'Caronsmall', '', 'Dotaccentsmall', '', '', 'Macronsmall', '', '',
-    'figuredash', 'hypheninferior', '', '', 'Ogoneksmall', 'Ringsmall',
-    'Cedillasmall', '', '', '', 'onequarter', 'onehalf', 'threequarters',
-    'questiondownsmall', 'oneeighth', 'threeeighths', 'fiveeighths',
-    'seveneighths', 'onethird', 'twothirds', '', '', 'zerosuperior',
-    'onesuperior', 'twosuperior', 'threesuperior', 'foursuperior',
-    'fivesuperior', 'sixsuperior', 'sevensuperior', 'eightsuperior',
-    'ninesuperior', 'zeroinferior', 'oneinferior', 'twoinferior',
-    'threeinferior', 'fourinferior', 'fiveinferior', 'sixinferior',
-    'seveninferior', 'eightinferior', 'nineinferior', 'centinferior',
-    'dollarinferior', 'periodinferior', 'commainferior', 'Agravesmall',
-    'Aacutesmall', 'Acircumflexsmall', 'Atildesmall', 'Adieresissmall',
-    'Aringsmall', 'AEsmall', 'Ccedillasmall', 'Egravesmall', 'Eacutesmall',
-    'Ecircumflexsmall', 'Edieresissmall', 'Igravesmall', 'Iacutesmall',
-    'Icircumflexsmall', 'Idieresissmall', 'Ethsmall', 'Ntildesmall',
-    'Ogravesmall', 'Oacutesmall', 'Ocircumflexsmall', 'Otildesmall',
-    'Odieresissmall', 'OEsmall', 'Oslashsmall', 'Ugravesmall', 'Uacutesmall',
-    'Ucircumflexsmall', 'Udieresissmall', 'Yacutesmall', 'Thornsmall',
-    'Ydieresissmall'],
-  MacExpertEncoding: ['', '', '', '', '', '', '', '', '', '', '', '', '', '',
-    '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
-    'space', 'exclamsmall', 'Hungarumlautsmall', 'centoldstyle',
-    'dollaroldstyle', 'dollarsuperior', 'ampersandsmall', 'Acutesmall',
-    'parenleftsuperior', 'parenrightsuperior', 'twodotenleader',
-    'onedotenleader', 'comma', 'hyphen', 'period', 'fraction', 'zerooldstyle',
-    'oneoldstyle', 'twooldstyle', 'threeoldstyle', 'fouroldstyle',
-    'fiveoldstyle', 'sixoldstyle', 'sevenoldstyle', 'eightoldstyle',
-    'nineoldstyle', 'colon', 'semicolon', '', 'threequartersemdash', '',
-    'questionsmall', '', '', '', '', 'Ethsmall', '', '', 'onequarter',
-    'onehalf', 'threequarters', 'oneeighth', 'threeeighths', 'fiveeighths',
-    'seveneighths', 'onethird', 'twothirds', '', '', '', '', '', '', 'ff',
-    'fi', 'fl', 'ffi', 'ffl', 'parenleftinferior', '', 'parenrightinferior',
-    'Circumflexsmall', 'hypheninferior', 'Gravesmall', 'Asmall', 'Bsmall',
-    'Csmall', 'Dsmall', 'Esmall', 'Fsmall', 'Gsmall', 'Hsmall', 'Ismall',
-    'Jsmall', 'Ksmall', 'Lsmall', 'Msmall', 'Nsmall', 'Osmall', 'Psmall',
-    'Qsmall', 'Rsmall', 'Ssmall', 'Tsmall', 'Usmall', 'Vsmall', 'Wsmall',
-    'Xsmall', 'Ysmall', 'Zsmall', 'colonmonetary', 'onefitted', 'rupiah',
-    'Tildesmall', '', '', 'asuperior', 'centsuperior', '', '', '', '',
-    'Aacutesmall', 'Agravesmall', 'Acircumflexsmall', 'Adieresissmall',
-    'Atildesmall', 'Aringsmall', 'Ccedillasmall', 'Eacutesmall', 'Egravesmall',
-    'Ecircumflexsmall', 'Edieresissmall', 'Iacutesmall', 'Igravesmall',
-    'Icircumflexsmall', 'Idieresissmall', 'Ntildesmall', 'Oacutesmall',
-    'Ogravesmall', 'Ocircumflexsmall', 'Odieresissmall', 'Otildesmall',
-    'Uacutesmall', 'Ugravesmall', 'Ucircumflexsmall', 'Udieresissmall', '',
-    'eightsuperior', 'fourinferior', 'threeinferior', 'sixinferior',
-    'eightinferior', 'seveninferior', 'Scaronsmall', '', 'centinferior',
-    'twoinferior', '', 'Dieresissmall', '', 'Caronsmall', 'osuperior',
-    'fiveinferior', '', 'commainferior', 'periodinferior', 'Yacutesmall', '',
-    'dollarinferior', '', 'Thornsmall', '', 'nineinferior', 'zeroinferior',
-    'Zcaronsmall', 'AEsmall', 'Oslashsmall', 'questiondownsmall',
-    'oneinferior', 'Lslashsmall', '', '', '', '', '', '', 'Cedillasmall', '',
-    '', '', '', '', 'OEsmall', 'figuredash', 'hyphensuperior', '', '', '', '',
-    'exclamdownsmall', '', 'Ydieresissmall', '', 'onesuperior', 'twosuperior',
-    'threesuperior', 'foursuperior', 'fivesuperior', 'sixsuperior',
-    'sevensuperior', 'ninesuperior', 'zerosuperior', '', 'esuperior',
-    'rsuperior', 'tsuperior', '', '', 'isuperior', 'ssuperior', 'dsuperior',
-    '', '', '', '', '', 'lsuperior', 'Ogoneksmall', 'Brevesmall',
-    'Macronsmall', 'bsuperior', 'nsuperior', 'msuperior', 'commasuperior',
-    'periodsuperior', 'Dotaccentsmall', 'Ringsmall'],
-  MacRomanEncoding: ['', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
-    '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
-    'space', 'exclam', 'quotedbl', 'numbersign', 'dollar', 'percent',
-    'ampersand', 'quotesingle', 'parenleft', 'parenright', 'asterisk', 'plus',
-    'comma', 'hyphen', 'period', 'slash', 'zero', 'one', 'two', 'three',
-    'four', 'five', 'six', 'seven', 'eight', 'nine', 'colon', 'semicolon',
-    'less', 'equal', 'greater', 'question', 'at', 'A', 'B', 'C', 'D', 'E', 'F',
-    'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U',
-    'V', 'W', 'X', 'Y', 'Z', 'bracketleft', 'backslash', 'bracketright',
-    'asciicircum', 'underscore', 'grave', 'a', 'b', 'c', 'd', 'e', 'f', 'g',
-    'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v',
-    'w', 'x', 'y', 'z', 'braceleft', 'bar', 'braceright', 'asciitilde', '',
-    'Adieresis', 'Aring', 'Ccedilla', 'Eacute', 'Ntilde', 'Odieresis',
-    'Udieresis', 'aacute', 'agrave', 'acircumflex', 'adieresis', 'atilde',
-    'aring', 'ccedilla', 'eacute', 'egrave', 'ecircumflex', 'edieresis',
-    'iacute', 'igrave', 'icircumflex', 'idieresis', 'ntilde', 'oacute',
-    'ograve', 'ocircumflex', 'odieresis', 'otilde', 'uacute', 'ugrave',
-    'ucircumflex', 'udieresis', 'dagger', 'degree', 'cent', 'sterling',
-    'section', 'bullet', 'paragraph', 'germandbls', 'registered', 'copyright',
-    'trademark', 'acute', 'dieresis', 'notequal', 'AE', 'Oslash', 'infinity',
-    'plusminus', 'lessequal', 'greaterequal', 'yen', 'mu', 'partialdiff',
-    'summation', 'product', 'pi', 'integral', 'ordfeminine', 'ordmasculine',
-    'Omega', 'ae', 'oslash', 'questiondown', 'exclamdown', 'logicalnot',
-    'radical', 'florin', 'approxequal', 'Delta', 'guillemotleft',
-    'guillemotright', 'ellipsis', '', 'Agrave', 'Atilde', 'Otilde', 'OE',
-    'oe', 'endash', 'emdash', 'quotedblleft', 'quotedblright', 'quoteleft',
-    'quoteright', 'divide', 'lozenge', 'ydieresis', 'Ydieresis', 'fraction',
-    'currency', 'guilsinglleft', 'guilsinglright', 'fi', 'fl', 'daggerdbl',
-    'periodcentered', 'quotesinglbase', 'quotedblbase', 'perthousand',
-    'Acircumflex', 'Ecircumflex', 'Aacute', 'Edieresis', 'Egrave', 'Iacute',
-    'Icircumflex', 'Idieresis', 'Igrave', 'Oacute', 'Ocircumflex', 'apple',
-    'Ograve', 'Uacute', 'Ucircumflex', 'Ugrave', 'dotlessi', 'circumflex',
-    'tilde', 'macron', 'breve', 'dotaccent', 'ring', 'cedilla', 'hungarumlaut',
-    'ogonek', 'caron'],
-  StandardEncoding: ['', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
-    '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
-    'space', 'exclam', 'quotedbl', 'numbersign', 'dollar', 'percent',
-    'ampersand', 'quoteright', 'parenleft', 'parenright', 'asterisk', 'plus',
-    'comma', 'hyphen', 'period', 'slash', 'zero', 'one', 'two', 'three',
-    'four', 'five', 'six', 'seven', 'eight', 'nine', 'colon', 'semicolon',
-    'less', 'equal', 'greater', 'question', 'at', 'A', 'B', 'C', 'D', 'E', 'F',
-    'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U',
-    'V', 'W', 'X', 'Y', 'Z', 'bracketleft', 'backslash', 'bracketright',
-    'asciicircum', 'underscore', 'quoteleft', 'a', 'b', 'c', 'd', 'e', 'f',
-    'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u',
-    'v', 'w', 'x', 'y', 'z', 'braceleft', 'bar', 'braceright', 'asciitilde',
-    '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
-    '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', 'exclamdown',
-    'cent', 'sterling', 'fraction', 'yen', 'florin', 'section', 'currency',
-    'quotesingle', 'quotedblleft', 'guillemotleft', 'guilsinglleft',
-    'guilsinglright', 'fi', 'fl', '', 'endash', 'dagger', 'daggerdbl',
-    'periodcentered', '', 'paragraph', 'bullet', 'quotesinglbase',
-    'quotedblbase', 'quotedblright', 'guillemotright', 'ellipsis',
-    'perthousand', '', 'questiondown', '', 'grave', 'acute', 'circumflex',
-    'tilde', 'macron', 'breve', 'dotaccent', 'dieresis', '', 'ring', 'cedilla',
-    '', 'hungarumlaut', 'ogonek', 'caron', 'emdash', '', '', '', '', '', '',
-    '', '', '', '', '', '', '', '', '', '', 'AE', '', 'ordfeminine', '', '',
-    '', '', 'Lslash', 'Oslash', 'OE', 'ordmasculine', '', '', '', '', '', 'ae',
-    '', '', '', 'dotlessi', '', '', 'lslash', 'oslash', 'oe', 'germandbls'],
-  WinAnsiEncoding: ['', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
-    '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
-    'space', 'exclam', 'quotedbl', 'numbersign', 'dollar', 'percent',
-    'ampersand', 'quotesingle', 'parenleft', 'parenright', 'asterisk', 'plus',
-    'comma', 'hyphen', 'period', 'slash', 'zero', 'one', 'two', 'three',
-    'four', 'five', 'six', 'seven', 'eight', 'nine', 'colon', 'semicolon',
-    'less', 'equal', 'greater', 'question', 'at', 'A', 'B', 'C', 'D', 'E', 'F',
-    'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U',
-    'V', 'W', 'X', 'Y', 'Z', 'bracketleft', 'backslash', 'bracketright',
-    'asciicircum', 'underscore', 'grave', 'a', 'b', 'c', 'd', 'e', 'f', 'g',
-    'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v',
-    'w', 'x', 'y', 'z', 'braceleft', 'bar', 'braceright', 'asciitilde',
-    'bullet', 'Euro', 'bullet', 'quotesinglbase', 'florin', 'quotedblbase',
-    'ellipsis', 'dagger', 'daggerdbl', 'circumflex', 'perthousand', 'Scaron',
-    'guilsinglleft', 'OE', 'bullet', 'Zcaron', 'bullet', 'bullet', 'quoteleft',
-    'quoteright', 'quotedblleft', 'quotedblright', 'bullet', 'endash',
-    'emdash', 'tilde', 'trademark', 'scaron', 'guilsinglright', 'oe', 'bullet',
-    'zcaron', 'Ydieresis', '', 'exclamdown', 'cent', 'sterling',
-    'currency', 'yen', 'brokenbar', 'section', 'dieresis', 'copyright',
-    'ordfeminine', 'guillemotleft', 'logicalnot', 'hyphen', 'registered',
-    'macron', 'degree', 'plusminus', 'twosuperior', 'threesuperior', 'acute',
-    'mu', 'paragraph', 'periodcentered', 'cedilla', 'onesuperior',
-    'ordmasculine', 'guillemotright', 'onequarter', 'onehalf', 'threequarters',
-    'questiondown', 'Agrave', 'Aacute', 'Acircumflex', 'Atilde', 'Adieresis',
-    'Aring', 'AE', 'Ccedilla', 'Egrave', 'Eacute', 'Ecircumflex', 'Edieresis',
-    'Igrave', 'Iacute', 'Icircumflex', 'Idieresis', 'Eth', 'Ntilde', 'Ograve',
-    'Oacute', 'Ocircumflex', 'Otilde', 'Odieresis', 'multiply', 'Oslash',
-    'Ugrave', 'Uacute', 'Ucircumflex', 'Udieresis', 'Yacute', 'Thorn',
-    'germandbls', 'agrave', 'aacute', 'acircumflex', 'atilde', 'adieresis',
-    'aring', 'ae', 'ccedilla', 'egrave', 'eacute', 'ecircumflex', 'edieresis',
-    'igrave', 'iacute', 'icircumflex', 'idieresis', 'eth', 'ntilde', 'ograve',
-    'oacute', 'ocircumflex', 'otilde', 'odieresis', 'divide', 'oslash',
-    'ugrave', 'uacute', 'ucircumflex', 'udieresis', 'yacute', 'thorn',
-    'ydieresis'],
-  symbolsEncoding: ['', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
-    '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
-    'space', 'exclam', 'universal', 'numbersign', 'existential', 'percent',
-    'ampersand', 'suchthat', 'parenleft', 'parenright', 'asteriskmath', 'plus',
-    'comma', 'minus', 'period', 'slash', 'zero', 'one', 'two', 'three', 'four',
-    'five', 'six', 'seven', 'eight', 'nine', 'colon', 'semicolon', 'less',
-    'equal', 'greater', 'question', 'congruent', 'Alpha', 'Beta', 'Chi',
-    'Delta', 'Epsilon', 'Phi', 'Gamma', 'Eta', 'Iota', 'theta1', 'Kappa',
-    'Lambda', 'Mu', 'Nu', 'Omicron', 'Pi', 'Theta', 'Rho', 'Sigma', 'Tau',
-    'Upsilon', 'sigma1', 'Omega', 'Xi', 'Psi', 'Zeta', 'bracketleft',
-    'therefore', 'bracketright', 'perpendicular', 'underscore', 'radicalex',
-    'alpha', 'beta', 'chi', 'delta', 'epsilon', 'phi', 'gamma', 'eta', 'iota',
-    'phi1', 'kappa', 'lambda', 'mu', 'nu', 'omicron', 'pi', 'theta', 'rho',
-    'sigma', 'tau', 'upsilon', 'omega1', 'omega', 'xi', 'psi', 'zeta',
-    'braceleft', 'bar', 'braceright', 'similar', '', '', '', '', '', '', '',
-    '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
-    '', '', '', '', '', '', '', 'Euro', 'Upsilon1', 'minute', 'lessequal',
-    'fraction', 'infinity', 'florin', 'club', 'diamond', 'heart', 'spade',
-    'arrowboth', 'arrowleft', 'arrowup', 'arrowright', 'arrowdown', 'degree',
-    'plusminus', 'second', 'greaterequal', 'multiply', 'proportional',
-    'partialdiff', 'bullet', 'divide', 'notequal', 'equivalence',
-    'approxequal', 'ellipsis', 'arrowvertex', 'arrowhorizex', 'carriagereturn',
-    'aleph', 'Ifraktur', 'Rfraktur', 'weierstrass', 'circlemultiply',
-    'circleplus', 'emptyset', 'intersection', 'union', 'propersuperset',
-    'reflexsuperset', 'notsubset', 'propersubset', 'reflexsubset', 'element',
-    'notelement', 'angle', 'gradient', 'registerserif', 'copyrightserif',
-    'trademarkserif', 'product', 'radical', 'dotmath', 'logicalnot',
-    'logicaland', 'logicalor', 'arrowdblboth', 'arrowdblleft', 'arrowdblup',
-    'arrowdblright', 'arrowdbldown', 'lozenge', 'angleleft', 'registersans',
-    'copyrightsans', 'trademarksans', 'summation', 'parenlefttp',
-    'parenleftex', 'parenleftbt', 'bracketlefttp', 'bracketleftex',
-    'bracketleftbt', 'bracelefttp', 'braceleftmid', 'braceleftbt', 'braceex',
-    '', 'angleright', 'integral', 'integraltp', 'integralex', 'integralbt',
-    'parenrighttp', 'parenrightex', 'parenrightbt', 'bracketrighttp',
-    'bracketrightex', 'bracketrightbt', 'bracerighttp', 'bracerightmid',
-    'bracerightbt'],
-  zapfDingbatsEncoding: ['', '', '', '', '', '', '', '', '', '', '', '', '', '',
-    '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
-    'space', 'a1', 'a2', 'a202', 'a3', 'a4', 'a5', 'a119', 'a118', 'a117',
-    'a11', 'a12', 'a13', 'a14', 'a15', 'a16', 'a105', 'a17', 'a18', 'a19',
-    'a20', 'a21', 'a22', 'a23', 'a24', 'a25', 'a26', 'a27', 'a28', 'a6', 'a7',
-    'a8', 'a9', 'a10', 'a29', 'a30', 'a31', 'a32', 'a33', 'a34', 'a35', 'a36',
-    'a37', 'a38', 'a39', 'a40', 'a41', 'a42', 'a43', 'a44', 'a45', 'a46',
-    'a47', 'a48', 'a49', 'a50', 'a51', 'a52', 'a53', 'a54', 'a55', 'a56',
-    'a57', 'a58', 'a59', 'a60', 'a61', 'a62', 'a63', 'a64', 'a65', 'a66',
-    'a67', 'a68', 'a69', 'a70', 'a71', 'a72', 'a73', 'a74', 'a203', 'a75',
-    'a204', 'a76', 'a77', 'a78', 'a79', 'a81', 'a82', 'a83', 'a84', 'a97',
-    'a98', 'a99', 'a100', '', '', '', '', '', '', '', '', '', '', '', '', '',
-    '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '', '',
-    '', '', 'a101', 'a102', 'a103', 'a104', 'a106', 'a107', 'a108', 'a112',
-    'a111', 'a110', 'a109', 'a120', 'a121', 'a122', 'a123', 'a124', 'a125',
-    'a126', 'a127', 'a128', 'a129', 'a130', 'a131', 'a132', 'a133', 'a134',
-    'a135', 'a136', 'a137', 'a138', 'a139', 'a140', 'a141', 'a142', 'a143',
-    'a144', 'a145', 'a146', 'a147', 'a148', 'a149', 'a150', 'a151', 'a152',
-    'a153', 'a154', 'a155', 'a156', 'a157', 'a158', 'a159', 'a160', 'a161',
-    'a163', 'a164', 'a196', 'a165', 'a192', 'a166', 'a167', 'a168', 'a169',
-    'a170', 'a171', 'a172', 'a173', 'a162', 'a174', 'a175', 'a176', 'a177',
-    'a178', 'a179', 'a193', 'a180', 'a199', 'a181', 'a200', 'a182', '', 'a201',
-    'a183', 'a184', 'a197', 'a185', 'a194', 'a198', 'a186', 'a195', 'a187',
-    'a188', 'a189', 'a190', 'a191']
-};
-
-/**
- * Hold a map of decoded fonts and of the standard fourteen Type1
- * fonts and their acronyms.
- */
-var stdFontMap = {
-  'ArialNarrow': 'Helvetica',
-  'ArialNarrow-Bold': 'Helvetica-Bold',
-  'ArialNarrow-BoldItalic': 'Helvetica-BoldOblique',
-  'ArialNarrow-Italic': 'Helvetica-Oblique',
-  'ArialBlack': 'Helvetica',
-  'ArialBlack-Bold': 'Helvetica-Bold',
-  'ArialBlack-BoldItalic': 'Helvetica-BoldOblique',
-  'ArialBlack-Italic': 'Helvetica-Oblique',
-  'Arial': 'Helvetica',
-  'Arial-Bold': 'Helvetica-Bold',
-  'Arial-BoldItalic': 'Helvetica-BoldOblique',
-  'Arial-Italic': 'Helvetica-Oblique',
-  'Arial-BoldItalicMT': 'Helvetica-BoldOblique',
-  'Arial-BoldMT': 'Helvetica-Bold',
-  'Arial-ItalicMT': 'Helvetica-Oblique',
-  'ArialMT': 'Helvetica',
-  'Courier-Bold': 'Courier-Bold',
-  'Courier-BoldItalic': 'Courier-BoldOblique',
-  'Courier-Italic': 'Courier-Oblique',
-  'CourierNew': 'Courier',
-  'CourierNew-Bold': 'Courier-Bold',
-  'CourierNew-BoldItalic': 'Courier-BoldOblique',
-  'CourierNew-Italic': 'Courier-Oblique',
-  'CourierNewPS-BoldItalicMT': 'Courier-BoldOblique',
-  'CourierNewPS-BoldMT': 'Courier-Bold',
-  'CourierNewPS-ItalicMT': 'Courier-Oblique',
-  'CourierNewPSMT': 'Courier',
-  'Helvetica-Bold': 'Helvetica-Bold',
-  'Helvetica-BoldItalic': 'Helvetica-BoldOblique',
-  'Helvetica-Italic': 'Helvetica-Oblique',
-  'Symbol-Bold': 'Symbol',
-  'Symbol-BoldItalic': 'Symbol',
-  'Symbol-Italic': 'Symbol',
-  'TimesNewRoman': 'Times-Roman',
-  'TimesNewRoman-Bold': 'Times-Bold',
-  'TimesNewRoman-BoldItalic': 'Times-BoldItalic',
-  'TimesNewRoman-Italic': 'Times-Italic',
-  'TimesNewRomanPS': 'Times-Roman',
-  'TimesNewRomanPS-Bold': 'Times-Bold',
-  'TimesNewRomanPS-BoldItalic': 'Times-BoldItalic',
-  'TimesNewRomanPS-BoldItalicMT': 'Times-BoldItalic',
-  'TimesNewRomanPS-BoldMT': 'Times-Bold',
-  'TimesNewRomanPS-Italic': 'Times-Italic',
-  'TimesNewRomanPS-ItalicMT': 'Times-Italic',
-  'TimesNewRomanPSMT': 'Times-Roman',
-  'TimesNewRomanPSMT-Bold': 'Times-Bold',
-  'TimesNewRomanPSMT-BoldItalic': 'Times-BoldItalic',
-  'TimesNewRomanPSMT-Italic': 'Times-Italic'
-};
-
-/**
- * Holds the map of the non-standard fonts that might be included as a standard
- * fonts without glyph data.
- */
-var nonStdFontMap = {
-  'ComicSansMS': 'Comic Sans MS',
-  'ComicSansMS-Bold': 'Comic Sans MS-Bold',
-  'ComicSansMS-BoldItalic': 'Comic Sans MS-BoldItalic',
-  'ComicSansMS-Italic': 'Comic Sans MS-Italic',
-  'LucidaConsole': 'Courier',
-  'LucidaConsole-Bold': 'Courier-Bold',
-  'LucidaConsole-BoldItalic': 'Courier-BoldOblique',
-  'LucidaConsole-Italic': 'Courier-Oblique'
-};
-
-var serifFonts = {
-  'Adobe Jenson': true, 'Adobe Text': true, 'Albertus': true,
-  'Aldus': true, 'Alexandria': true, 'Algerian': true,
-  'American Typewriter': true, 'Antiqua': true, 'Apex': true,
-  'Arno': true, 'Aster': true, 'Aurora': true,
-  'Baskerville': true, 'Bell': true, 'Bembo': true,
-  'Bembo Schoolbook': true, 'Benguiat': true, 'Berkeley Old Style': true,
-  'Bernhard Modern': true, 'Berthold City': true, 'Bodoni': true,
-  'Bauer Bodoni': true, 'Book Antiqua': true, 'Bookman': true,
-  'Bordeaux Roman': true, 'Californian FB': true, 'Calisto': true,
-  'Calvert': true, 'Capitals': true, 'Cambria': true,
-  'Cartier': true, 'Caslon': true, 'Catull': true,
-  'Centaur': true, 'Century Old Style': true, 'Century Schoolbook': true,
-  'Chaparral': true, 'Charis SIL': true, 'Cheltenham': true,
-  'Cholla Slab': true, 'Clarendon': true, 'Clearface': true,
-  'Cochin': true, 'Colonna': true, 'Computer Modern': true,
-  'Concrete Roman': true, 'Constantia': true, 'Cooper Black': true,
-  'Corona': true, 'Ecotype': true, 'Egyptienne': true,
-  'Elephant': true, 'Excelsior': true, 'Fairfield': true,
-  'FF Scala': true, 'Folkard': true, 'Footlight': true,
-  'FreeSerif': true, 'Friz Quadrata': true, 'Garamond': true,
-  'Gentium': true, 'Georgia': true, 'Gloucester': true,
-  'Goudy Old Style': true, 'Goudy Schoolbook': true, 'Goudy Pro Font': true,
-  'Granjon': true, 'Guardian Egyptian': true, 'Heather': true,
-  'Hercules': true, 'High Tower Text': true, 'Hiroshige': true,
-  'Hoefler Text': true, 'Humana Serif': true, 'Imprint': true,
-  'Ionic No. 5': true, 'Janson': true, 'Joanna': true,
-  'Korinna': true, 'Lexicon': true, 'Liberation Serif': true,
-  'Linux Libertine': true, 'Literaturnaya': true, 'Lucida': true,
-  'Lucida Bright': true, 'Melior': true, 'Memphis': true,
-  'Miller': true, 'Minion': true, 'Modern': true,
-  'Mona Lisa': true, 'Mrs Eaves': true, 'MS Serif': true,
-  'Museo Slab': true, 'New York': true, 'Nimbus Roman': true,
-  'NPS Rawlinson Roadway': true, 'Palatino': true, 'Perpetua': true,
-  'Plantin': true, 'Plantin Schoolbook': true, 'Playbill': true,
-  'Poor Richard': true, 'Rawlinson Roadway': true, 'Renault': true,
-  'Requiem': true, 'Rockwell': true, 'Roman': true,
-  'Rotis Serif': true, 'Sabon': true, 'Scala': true,
-  'Seagull': true, 'Sistina': true, 'Souvenir': true,
-  'STIX': true, 'Stone Informal': true, 'Stone Serif': true,
-  'Sylfaen': true, 'Times': true, 'Trajan': true,
-  'Trinité': true, 'Trump Mediaeval': true, 'Utopia': true,
-  'Vale Type': true, 'Bitstream Vera': true, 'Vera Serif': true,
-  'Versailles': true, 'Wanted': true, 'Weiss': true,
-  'Wide Latin': true, 'Windsor': true, 'XITS': true
-};
-
-var symbolsFonts = {
-  'Dingbats': true, 'Symbol': true, 'ZapfDingbats': true
-};
-
-// Some characters, e.g. copyrightserif, mapped to the private use area and
-// might not be displayed using standard fonts. Mapping/hacking well-known chars
-// to the similar equivalents in the normal characters range.
-function mapPrivateUseChars(code) {
-  switch (code) {
-    case 0xF8E9: // copyrightsans
-    case 0xF6D9: // copyrightserif
-      return 0x00A9; // copyright
-    default:
-      return code;
-  }
-}
-
-var FontLoader = {
-  listeningForFontLoad: false,
-
-  bind: function fontLoaderBind(fonts, callback) {
-    function checkFontsLoaded() {
-      for (var i = 0, ii = fonts.length; i < ii; i++) {
-        var fontObj = fonts[i];
-        if (fontObj.loading) {
-          return false;
-        }
-      }
-
-      document.documentElement.removeEventListener(
-        'pdfjsFontLoad', checkFontsLoaded, false);
-
-      callback();
-      return true;
-    }
-
-    var rules = [], names = [], fontsToLoad = [];
-    var fontCreateTimer = 0;
-
-    for (var i = 0, ii = fonts.length; i < ii; i++) {
-      var font = fonts[i];
-
-      // Add the font to the DOM only once or skip if the font
-      // is already loaded.
-      if (font.attached || font.loading == false) {
-        continue;
-      }
-      font.attached = true;
-
-      fontsToLoad.push(font);
-
-      var str = '';
-      var data = font.data;
-      if (data) {
-        var length = data.length;
-        for (var j = 0; j < length; j++)
-          str += String.fromCharCode(data[j]);
-
-        var rule = font.bindDOM(str);
-        if (rule) {
-          rules.push(rule);
-          names.push(font.loadedName);
-        }
-      }
-    }
-
-    this.listeningForFontLoad = false;
-    if (!isWorker && rules.length) {
-      FontLoader.prepareFontLoadEvent(rules, names, fontsToLoad);
-    }
-
-    if (!checkFontsLoaded()) {
-      document.documentElement.addEventListener(
-        'pdfjsFontLoad', checkFontsLoaded, false);
-    }
-  },
-  // Set things up so that at least one pdfjsFontLoad event is
-  // dispatched when all the @font-face |rules| for |names| have been
-  // loaded in a subdocument.  It's expected that the load of |rules|
-  // has already started in this (outer) document, so that they should
-  // be ordered before the load in the subdocument.
-  prepareFontLoadEvent: function fontLoaderPrepareFontLoadEvent(rules, names,
-                                                                fonts) {
-      /** Hack begin */
-      // There's no event when a font has finished downloading so the
-      // following code is a dirty hack to 'guess' when a font is
-      // ready.  This code will be obsoleted by Mozilla bug 471915.
-      //
-      // The only reliable way to know if a font is loaded in Gecko
-      // (at the moment) is document.onload in a document with
-      // a @font-face rule defined in a "static" stylesheet.  We use a
-      // subdocument in an <iframe>, set up properly, to know when
-      // our @font-face rule was loaded.  However, the subdocument and
-      // outer document can't share CSS rules, so the inner document
-      // is only part of the puzzle.  The second piece is an invisible
-      // div created in order to force loading of the @font-face in
-      // the *outer* document.  (The font still needs to be loaded for
-      // its metrics, for reflow).  We create the div first for the
-      // outer document, then create the iframe.  Unless something
-      // goes really wonkily, we expect the @font-face for the outer
-      // document to be processed before the inner.  That's still
-      // fragile, but seems to work in practice.
-      //
-      // The postMessage() hackery was added to work around chrome bug
-      // 82402.
-
-      // Validate the names parameter -- the values can used to construct HTML.
-      if (!/^\w+$/.test(names.join(''))) {
-        error('Invalid font name(s): ' + names.join());
-
-        // Normally the error-function throws. But if a malicious code
-        // intercepts the function call then the return is needed.
-        return;
-      }
-
-      var div = document.createElement('div');
-      div.setAttribute('style',
-                       'visibility: hidden;' +
-                       'width: 10px; height: 10px;' +
-                       'position: absolute; top: 0px; left: 0px;');
-      var html = '';
-      for (var i = 0, ii = names.length; i < ii; ++i) {
-        html += '<span style="font-family:' + names[i] + '">Hi</span>';
-      }
-      div.innerHTML = html;
-      document.body.appendChild(div);
-
-      if (!this.listeningForFontLoad) {
-        window.addEventListener(
-          'message',
-          function fontLoaderMessage(e) {
-            var fontNames = JSON.parse(e.data);
-            for (var i = 0, ii = fonts.length; i < ii; ++i) {
-              var font = fonts[i];
-              font.loading = false;
-            }
-            var evt = document.createEvent('Events');
-            evt.initEvent('pdfjsFontLoad', true, false);
-            document.documentElement.dispatchEvent(evt);
-          },
-          false);
-        this.listeningForFontLoad = true;
-      }
-
-      // XXX we should have a time-out here too, and maybe fire
-      // pdfjsFontLoadFailed?
-      var src = '<!DOCTYPE HTML><html><head>';
-      src += '<style type="text/css">';
-      for (var i = 0, ii = rules.length; i < ii; ++i) {
-        src += rules[i];
-      }
-      src += '</style>';
-      src += '<script type="application/javascript">';
-      var fontNamesArray = '';
-      for (var i = 0, ii = names.length; i < ii; ++i) {
-        fontNamesArray += '"' + names[i] + '", ';
-      }
-      src += '  var fontNames=[' + fontNamesArray + '];\n';
-      src += '  window.onload = function fontLoaderOnload() {\n';
-      src += '    parent.postMessage(JSON.stringify(fontNames), "*");\n';
-      src += '  }';
-      // Hack so the end script tag isn't counted if this is inline JS.
-      src += '</scr' + 'ipt></head><body>';
-      for (var i = 0, ii = names.length; i < ii; ++i) {
-        src += '<p style="font-family:\'' + names[i] + '\'">Hi</p>';
-      }
-      src += '</body></html>';
-      var frame = document.createElement('iframe');
-      frame.src = 'data:text/html,' + src;
-      frame.setAttribute('style',
-                         'visibility: hidden;' +
-                         'width: 10px; height: 10px;' +
-                         'position: absolute; top: 0px; left: 0px;');
-      document.body.appendChild(frame);
-      /** Hack end */
-  }
-};
-
-var UnicodeRanges = [
-  { 'begin': 0x0000, 'end': 0x007F }, // Basic Latin
-  { 'begin': 0x0080, 'end': 0x00FF }, // Latin-1 Supplement
-  { 'begin': 0x0100, 'end': 0x017F }, // Latin Extended-A
-  { 'begin': 0x0180, 'end': 0x024F }, // Latin Extended-B
-  { 'begin': 0x0250, 'end': 0x02AF }, // IPA Extensions
-  { 'begin': 0x02B0, 'end': 0x02FF }, // Spacing Modifier Letters
-  { 'begin': 0x0300, 'end': 0x036F }, // Combining Diacritical Marks
-  { 'begin': 0x0370, 'end': 0x03FF }, // Greek and Coptic
-  { 'begin': 0x2C80, 'end': 0x2CFF }, // Coptic
-  { 'begin': 0x0400, 'end': 0x04FF }, // Cyrillic
-  { 'begin': 0x0530, 'end': 0x058F }, // Armenian
-  { 'begin': 0x0590, 'end': 0x05FF }, // Hebrew
-  { 'begin': 0xA500, 'end': 0xA63F }, // Vai
-  { 'begin': 0x0600, 'end': 0x06FF }, // Arabic
-  { 'begin': 0x07C0, 'end': 0x07FF }, // NKo
-  { 'begin': 0x0900, 'end': 0x097F }, // Devanagari
-  { 'begin': 0x0980, 'end': 0x09FF }, // Bengali
-  { 'begin': 0x0A00, 'end': 0x0A7F }, // Gurmukhi
-  { 'begin': 0x0A80, 'end': 0x0AFF }, // Gujarati
-  { 'begin': 0x0B00, 'end': 0x0B7F }, // Oriya
-  { 'begin': 0x0B80, 'end': 0x0BFF }, // Tamil
-  { 'begin': 0x0C00, 'end': 0x0C7F }, // Telugu
-  { 'begin': 0x0C80, 'end': 0x0CFF }, // Kannada
-  { 'begin': 0x0D00, 'end': 0x0D7F }, // Malayalam
-  { 'begin': 0x0E00, 'end': 0x0E7F }, // Thai
-  { 'begin': 0x0E80, 'end': 0x0EFF }, // Lao
-  { 'begin': 0x10A0, 'end': 0x10FF }, // Georgian
-  { 'begin': 0x1B00, 'end': 0x1B7F }, // Balinese
-  { 'begin': 0x1100, 'end': 0x11FF }, // Hangul Jamo
-  { 'begin': 0x1E00, 'end': 0x1EFF }, // Latin Extended Additional
-  { 'begin': 0x1F00, 'end': 0x1FFF }, // Greek Extended
-  { 'begin': 0x2000, 'end': 0x206F }, // General Punctuation
-  { 'begin': 0x2070, 'end': 0x209F }, // Superscripts And Subscripts
-  { 'begin': 0x20A0, 'end': 0x20CF }, // Currency Symbol
-  { 'begin': 0x20D0, 'end': 0x20FF }, // Combining Diacritical Marks For Symbols
-  { 'begin': 0x2100, 'end': 0x214F }, // Letterlike Symbols
-  { 'begin': 0x2150, 'end': 0x218F }, // Number Forms
-  { 'begin': 0x2190, 'end': 0x21FF }, // Arrows
-  { 'begin': 0x2200, 'end': 0x22FF }, // Mathematical Operators
-  { 'begin': 0x2300, 'end': 0x23FF }, // Miscellaneous Technical
-  { 'begin': 0x2400, 'end': 0x243F }, // Control Pictures
-  { 'begin': 0x2440, 'end': 0x245F }, // Optical Character Recognition
-  { 'begin': 0x2460, 'end': 0x24FF }, // Enclosed Alphanumerics
-  { 'begin': 0x2500, 'end': 0x257F }, // Box Drawing
-  { 'begin': 0x2580, 'end': 0x259F }, // Block Elements
-  { 'begin': 0x25A0, 'end': 0x25FF }, // Geometric Shapes
-  { 'begin': 0x2600, 'end': 0x26FF }, // Miscellaneous Symbols
-  { 'begin': 0x2700, 'end': 0x27BF }, // Dingbats
-  { 'begin': 0x3000, 'end': 0x303F }, // CJK Symbols And Punctuation
-  { 'begin': 0x3040, 'end': 0x309F }, // Hiragana
-  { 'begin': 0x30A0, 'end': 0x30FF }, // Katakana
-  { 'begin': 0x3100, 'end': 0x312F }, // Bopomofo
-  { 'begin': 0x3130, 'end': 0x318F }, // Hangul Compatibility Jamo
-  { 'begin': 0xA840, 'end': 0xA87F }, // Phags-pa
-  { 'begin': 0x3200, 'end': 0x32FF }, // Enclosed CJK Letters And Months
-  { 'begin': 0x3300, 'end': 0x33FF }, // CJK Compatibility
-  { 'begin': 0xAC00, 'end': 0xD7AF }, // Hangul Syllables
-  { 'begin': 0xD800, 'end': 0xDFFF }, // Non-Plane 0 *
-  { 'begin': 0x10900, 'end': 0x1091F }, // Phoenicia
-  { 'begin': 0x4E00, 'end': 0x9FFF }, // CJK Unified Ideographs
-  { 'begin': 0xE000, 'end': 0xF8FF }, // Private Use Area (plane 0)
-  { 'begin': 0x31C0, 'end': 0x31EF }, // CJK Strokes
-  { 'begin': 0xFB00, 'end': 0xFB4F }, // Alphabetic Presentation Forms
-  { 'begin': 0xFB50, 'end': 0xFDFF }, // Arabic Presentation Forms-A
-  { 'begin': 0xFE20, 'end': 0xFE2F }, // Combining Half Marks
-  { 'begin': 0xFE10, 'end': 0xFE1F }, // Vertical Forms
-  { 'begin': 0xFE50, 'end': 0xFE6F }, // Small Form Variants
-  { 'begin': 0xFE70, 'end': 0xFEFF }, // Arabic Presentation Forms-B
-  { 'begin': 0xFF00, 'end': 0xFFEF }, // Halfwidth And Fullwidth Forms
-  { 'begin': 0xFFF0, 'end': 0xFFFF }, // Specials
-  { 'begin': 0x0F00, 'end': 0x0FFF }, // Tibetan
-  { 'begin': 0x0700, 'end': 0x074F }, // Syriac
-  { 'begin': 0x0780, 'end': 0x07BF }, // Thaana
-  { 'begin': 0x0D80, 'end': 0x0DFF }, // Sinhala
-  { 'begin': 0x1000, 'end': 0x109F }, // Myanmar
-  { 'begin': 0x1200, 'end': 0x137F }, // Ethiopic
-  { 'begin': 0x13A0, 'end': 0x13FF }, // Cherokee
-  { 'begin': 0x1400, 'end': 0x167F }, // Unified Canadian Aboriginal Syllabics
-  { 'begin': 0x1680, 'end': 0x169F }, // Ogham
-  { 'begin': 0x16A0, 'end': 0x16FF }, // Runic
-  { 'begin': 0x1780, 'end': 0x17FF }, // Khmer
-  { 'begin': 0x1800, 'end': 0x18AF }, // Mongolian
-  { 'begin': 0x2800, 'end': 0x28FF }, // Braille Patterns
-  { 'begin': 0xA000, 'end': 0xA48F }, // Yi Syllables
-  { 'begin': 0x1700, 'end': 0x171F }, // Tagalog
-  { 'begin': 0x10300, 'end': 0x1032F }, // Old Italic
-  { 'begin': 0x10330, 'end': 0x1034F }, // Gothic
-  { 'begin': 0x10400, 'end': 0x1044F }, // Deseret
-  { 'begin': 0x1D000, 'end': 0x1D0FF }, // Byzantine Musical Symbols
-  { 'begin': 0x1D400, 'end': 0x1D7FF }, // Mathematical Alphanumeric Symbols
-  { 'begin': 0xFF000, 'end': 0xFFFFD }, // Private Use (plane 15)
-  { 'begin': 0xFE00, 'end': 0xFE0F }, // Variation Selectors
-  { 'begin': 0xE0000, 'end': 0xE007F }, // Tags
-  { 'begin': 0x1900, 'end': 0x194F }, // Limbu
-  { 'begin': 0x1950, 'end': 0x197F }, // Tai Le
-  { 'begin': 0x1980, 'end': 0x19DF }, // New Tai Lue
-  { 'begin': 0x1A00, 'end': 0x1A1F }, // Buginese
-  { 'begin': 0x2C00, 'end': 0x2C5F }, // Glagolitic
-  { 'begin': 0x2D30, 'end': 0x2D7F }, // Tifinagh
-  { 'begin': 0x4DC0, 'end': 0x4DFF }, // Yijing Hexagram Symbols
-  { 'begin': 0xA800, 'end': 0xA82F }, // Syloti Nagri
-  { 'begin': 0x10000, 'end': 0x1007F }, // Linear B Syllabary
-  { 'begin': 0x10140, 'end': 0x1018F }, // Ancient Greek Numbers
-  { 'begin': 0x10380, 'end': 0x1039F }, // Ugaritic
-  { 'begin': 0x103A0, 'end': 0x103DF }, // Old Persian
-  { 'begin': 0x10450, 'end': 0x1047F }, // Shavian
-  { 'begin': 0x10480, 'end': 0x104AF }, // Osmanya
-  { 'begin': 0x10800, 'end': 0x1083F }, // Cypriot Syllabary
-  { 'begin': 0x10A00, 'end': 0x10A5F }, // Kharoshthi
-  { 'begin': 0x1D300, 'end': 0x1D35F }, // Tai Xuan Jing Symbols
-  { 'begin': 0x12000, 'end': 0x123FF }, // Cuneiform
-  { 'begin': 0x1D360, 'end': 0x1D37F }, // Counting Rod Numerals
-  { 'begin': 0x1B80, 'end': 0x1BBF }, // Sundanese
-  { 'begin': 0x1C00, 'end': 0x1C4F }, // Lepcha
-  { 'begin': 0x1C50, 'end': 0x1C7F }, // Ol Chiki
-  { 'begin': 0xA880, 'end': 0xA8DF }, // Saurashtra
-  { 'begin': 0xA900, 'end': 0xA92F }, // Kayah Li
-  { 'begin': 0xA930, 'end': 0xA95F }, // Rejang
-  { 'begin': 0xAA00, 'end': 0xAA5F }, // Cham
-  { 'begin': 0x10190, 'end': 0x101CF }, // Ancient Symbols
-  { 'begin': 0x101D0, 'end': 0x101FF }, // Phaistos Disc
-  { 'begin': 0x102A0, 'end': 0x102DF }, // Carian
-  { 'begin': 0x1F030, 'end': 0x1F09F }  // Domino Tiles
-];
-
-var MacStandardGlyphOrdering = [
-  '.notdef', '.null', 'nonmarkingreturn', 'space', 'exclam', 'quotedbl',
-  'numbersign', 'dollar', 'percent', 'ampersand', 'quotesingle', 'parenleft',
-  'parenright', 'asterisk', 'plus', 'comma', 'hyphen', 'period', 'slash',
-  'zero', 'one', 'two', 'three', 'four', 'five', 'six', 'seven', 'eight',
-  'nine', 'colon', 'semicolon', 'less', 'equal', 'greater', 'question', 'at',
-  'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H', 'I', 'J', 'K', 'L', 'M', 'N', 'O',
-  'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W', 'X', 'Y', 'Z', 'bracketleft',
-  'backslash', 'bracketright', 'asciicircum', 'underscore', 'grave', 'a', 'b',
-  'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j', 'k', 'l', 'm', 'n', 'o', 'p', 'q',
-  'r', 's', 't', 'u', 'v', 'w', 'x', 'y', 'z', 'braceleft', 'bar', 'braceright',
-  'asciitilde', 'Adieresis', 'Aring', 'Ccedilla', 'Eacute', 'Ntilde',
-  'Odieresis', 'Udieresis', 'aacute', 'agrave', 'acircumflex', 'adieresis',
-  'atilde', 'aring', 'ccedilla', 'eacute', 'egrave', 'ecircumflex', 'edieresis',
-  'iacute', 'igrave', 'icircumflex', 'idieresis', 'ntilde', 'oacute', 'ograve',
-  'ocircumflex', 'odieresis', 'otilde', 'uacute', 'ugrave', 'ucircumflex',
-  'udieresis', 'dagger', 'degree', 'cent', 'sterling', 'section', 'bullet',
-  'paragraph', 'germandbls', 'registered', 'copyright', 'trademark', 'acute',
-  'dieresis', 'notequal', 'AE', 'Oslash', 'infinity', 'plusminus', 'lessequal',
-  'greaterequal', 'yen', 'mu', 'partialdiff', 'summation', 'product', 'pi',
-  'integral', 'ordfeminine', 'ordmasculine', 'Omega', 'ae', 'oslash',
-  'questiondown', 'exclamdown', 'logicalnot', 'radical', 'florin',
-  'approxequal', 'Delta', 'guillemotleft', 'guillemotright', 'ellipsis',
-  'nonbreakingspace', 'Agrave', 'Atilde', 'Otilde', 'OE', 'oe', 'endash',
-  'emdash', 'quotedblleft', 'quotedblright', 'quoteleft', 'quoteright',
-  'divide', 'lozenge', 'ydieresis', 'Ydieresis', 'fraction', 'currency',
-  'guilsinglleft', 'guilsinglright', 'fi', 'fl', 'daggerdbl', 'periodcentered',
-  'quotesinglbase', 'quotedblbase', 'perthousand', 'Acircumflex',
-  'Ecircumflex', 'Aacute', 'Edieresis', 'Egrave', 'Iacute', 'Icircumflex',
-  'Idieresis', 'Igrave', 'Oacute', 'Ocircumflex', 'apple', 'Ograve', 'Uacute',
-  'Ucircumflex', 'Ugrave', 'dotlessi', 'circumflex', 'tilde', 'macron',
-  'breve', 'dotaccent', 'ring', 'cedilla', 'hungarumlaut', 'ogonek', 'caron',
-  'Lslash', 'lslash', 'Scaron', 'scaron', 'Zcaron', 'zcaron', 'brokenbar',
-  'Eth', 'eth', 'Yacute', 'yacute', 'Thorn', 'thorn', 'minus', 'multiply',
-  'onesuperior', 'twosuperior', 'threesuperior', 'onehalf', 'onequarter',
-  'threequarters', 'franc', 'Gbreve', 'gbreve', 'Idotaccent', 'Scedilla',
-  'scedilla', 'Cacute', 'cacute', 'Ccaron', 'ccaron', 'dcroat'];
-
-function getUnicodeRangeFor(value) {
-  for (var i = 0, ii = UnicodeRanges.length; i < ii; i++) {
-    var range = UnicodeRanges[i];
-    if (value >= range.begin && value < range.end)
-      return i;
-  }
-  return -1;
-}
-
-function isRTLRangeFor(value) {
-  var range = UnicodeRanges[13];
-  if (value >= range.begin && value < range.end)
-    return true;
-  range = UnicodeRanges[11];
-  if (value >= range.begin && value < range.end)
-    return true;
-  return false;
-}
-
-function isSpecialUnicode(unicode) {
-  return (unicode <= 0x1F || (unicode >= 127 && unicode < kSizeOfGlyphArea)) ||
-    (unicode >= kCmapGlyphOffset &&
-    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).
- *
- * For example to read a Type1 font and to attach it to the document:
- *   var type1Font = new Font("MyFontName", binaryFile, propertiesObject);
- *   type1Font.bind();
- */
-var Font = (function FontClosure() {
-  function Font(name, file, properties) {
-    this.name = name;
-    this.coded = properties.coded;
-    this.charProcOperatorList = properties.charProcOperatorList;
-    this.sizes = [];
-
-    var names = name.split('+');
-    names = names.length > 1 ? names[1] : names[0];
-    names = names.split(/[-,_]/g)[0];
-    this.isSerifFont = !!(properties.flags & FontFlags.Serif);
-    this.isSymbolicFont = !!(properties.flags & FontFlags.Symbolic);
-
-    var type = properties.type;
-    this.type = type;
-
-    // If the font is to be ignored, register it like an already loaded font
-    // to avoid the cost of waiting for it be be loaded by the platform.
-    if (properties.ignore) {
-      this.loadedName = this.isSerifFont ? 'serif' : 'sans-serif';
-      this.loading = false;
-      return;
-    }
-
-    this.differences = properties.differences;
-    this.widths = properties.widths;
-    this.defaultWidth = properties.defaultWidth;
-    this.composite = properties.composite;
-    this.wideChars = properties.wideChars;
-    this.hasEncoding = properties.hasEncoding;
-
-    this.fontMatrix = properties.fontMatrix;
-    this.widthMultiplier = 1.0;
-    if (properties.type == 'Type3') {
-      this.encoding = properties.baseEncoding;
-      return;
-    }
-
-    // Trying to fix encoding using glyph CIDSystemInfo.
-    this.loadCidToUnicode(properties);
-
-    if (properties.toUnicode)
-      this.toUnicode = properties.toUnicode;
-    else
-      this.rebuildToUnicode(properties);
-
-    this.toFontChar = this.buildToFontChar(this.toUnicode);
-
-    if (!file) {
-      // The file data is not specified. Trying to fix the font name
-      // to be used with the canvas.font.
-      var fontName = name.replace(/[,_]/g, '-');
-      fontName = stdFontMap[fontName] || nonStdFontMap[fontName] || fontName;
-
-      this.bold = (fontName.search(/bold/gi) != -1);
-      this.italic = (fontName.search(/oblique/gi) != -1) ||
-                    (fontName.search(/italic/gi) != -1);
-
-      // Use 'name' instead of 'fontName' here because the original
-      // name ArialBlack for example will be replaced by Helvetica.
-      this.black = (name.search(/Black/g) != -1);
-
-      this.encoding = properties.baseEncoding;
-      this.noUnicodeAdaptation = true;
-      this.loadedName = fontName.split('-')[0];
-      this.loading = false;
-      return;
-    }
-
-    var data;
-    switch (type) {
-      case 'Type1':
-      case 'CIDFontType0':
-        this.mimetype = 'font/opentype';
-
-        var subtype = properties.subtype;
-        var cff = (subtype == 'Type1C' || subtype == 'CIDFontType0C') ?
-          new CFFFont(file, properties) : new Type1Font(name, file, properties);
-
-        // Wrap the CFF data inside an OTF font file
-        data = this.convert(name, cff, properties);
-        break;
-
-      case 'TrueType':
-      case 'CIDFontType2':
-        this.mimetype = 'font/opentype';
-
-        // Repair the TrueType file. It is can be damaged in the point of
-        // view of the sanitizer
-        data = this.checkAndRepair(name, file, properties);
-        break;
-
-      default:
-        warn('Font ' + properties.type + ' is not supported');
-        break;
-    }
-
-    this.data = data;
-    this.fontMatrix = properties.fontMatrix;
-    this.widthMultiplier = !properties.fontMatrix ? 1.0 :
-      1.0 / properties.fontMatrix[0];
-    this.encoding = properties.baseEncoding;
-    this.loadedName = properties.loadedName;
-    this.loading = true;
-  };
-
-  var numFonts = 0;
-  function getUniqueName() {
-    return 'pdfFont' + numFonts++;
-  }
-
-  function stringToArray(str) {
-    var array = [];
-    for (var i = 0, ii = str.length; i < ii; ++i)
-      array[i] = str.charCodeAt(i);
-
-    return array;
-  };
-
-  function arrayToString(arr) {
-    var str = '';
-    for (var i = 0, ii = arr.length; i < ii; ++i)
-      str += String.fromCharCode(arr[i]);
-
-    return str;
-  };
-
-  function int16(bytes) {
-    return (bytes[0] << 8) + (bytes[1] & 0xff);
-  };
-
-  function int32(bytes) {
-    return (bytes[0] << 24) + (bytes[1] << 16) +
-           (bytes[2] << 8) + (bytes[3] & 0xff);
-  };
-
-  function getMaxPower2(number) {
-    var maxPower = 0;
-    var value = number;
-    while (value >= 2) {
-      value /= 2;
-      maxPower++;
-    }
-
-    value = 2;
-    for (var i = 1; i < maxPower; i++)
-      value *= 2;
-    return value;
-  };
-
-  function string16(value) {
-    return String.fromCharCode((value >> 8) & 0xff) +
-           String.fromCharCode(value & 0xff);
-  };
-
-  function safeString16(value) {
-    // clamp value to the 16-bit int range
-    value = value > 0x7FFF ? 0x7FFF : value < -0x8000 ? -0x8000 : value;
-    return String.fromCharCode((value >> 8) & 0xff) +
-           String.fromCharCode(value & 0xff);
-  };
-
-  function string32(value) {
-    return String.fromCharCode((value >> 24) & 0xff) +
-           String.fromCharCode((value >> 16) & 0xff) +
-           String.fromCharCode((value >> 8) & 0xff) +
-           String.fromCharCode(value & 0xff);
-  };
-
-  function createOpenTypeHeader(sfnt, file, numTables) {
-    // Windows hates the Mac TrueType sfnt version number
-    if (sfnt == 'true')
-      sfnt = string32(0x00010000);
-
-    // sfnt version (4 bytes)
-    var header = sfnt;
-
-    // numTables (2 bytes)
-    header += string16(numTables);
-
-    // searchRange (2 bytes)
-    var tablesMaxPower2 = getMaxPower2(numTables);
-    var searchRange = tablesMaxPower2 * 16;
-    header += string16(searchRange);
-
-    // entrySelector (2 bytes)
-    header += string16(Math.log(tablesMaxPower2) / Math.log(2));
-
-    // rangeShift (2 bytes)
-    header += string16(numTables * 16 - searchRange);
-
-    file.file += header;
-    file.virtualOffset += header.length;
-  };
-
-  function createTableEntry(file, tag, data) {
-    // offset
-    var offset = file.virtualOffset;
-
-    // length
-    var length = data.length;
-
-    // Per spec tables must be 4-bytes align so add padding as needed
-    while (data.length & 3)
-      data.push(0x00);
-
-    while (file.virtualOffset & 3)
-      file.virtualOffset++;
-
-    // checksum
-    var checksum = 0, n = data.length;
-    for (var i = 0; i < n; i += 4)
-      checksum = (checksum + int32([data[i], data[i + 1], data[i + 2],
-                                    data[i + 3]])) | 0;
-
-    var tableEntry = (tag + string32(checksum) +
-                      string32(offset) + string32(length));
-    file.file += tableEntry;
-    file.virtualOffset += data.length;
-  };
-
-  function getRanges(glyphs) {
-    // Array.sort() sorts by characters, not numerically, so convert to an
-    // array of characters.
-    var codes = [];
-    var length = glyphs.length;
-    for (var n = 0; n < length; ++n)
-      codes.push({ unicode: glyphs[n].unicode, code: n });
-    codes.sort(function fontGetRangesSort(a, b) {
-      return a.unicode - b.unicode;
-    });
-
-    // Split the sorted codes into ranges.
-    var ranges = [];
-    for (var n = 0; n < length; ) {
-      var start = codes[n].unicode;
-      var codeIndices = [codes[n].code];
-      ++n;
-      var end = start;
-      while (n < length && end + 1 == codes[n].unicode) {
-        codeIndices.push(codes[n].code);
-        ++end;
-        ++n;
-      }
-      ranges.push([start, end, codeIndices]);
-    }
-
-    return ranges;
-  };
-
-  function createCMapTable(glyphs, deltas) {
-    var ranges = getRanges(glyphs);
-
-    var numTables = 1;
-    var cmap = '\x00\x00' + // version
-               string16(numTables) +  // numTables
-               '\x00\x03' + // platformID
-               '\x00\x01' + // encodingID
-               string32(4 + numTables * 8); // start of the table record
-
-    var segCount = ranges.length + 1;
-    var segCount2 = segCount * 2;
-    var searchRange = getMaxPower2(segCount) * 2;
-    var searchEntry = Math.log(segCount) / Math.log(2);
-    var rangeShift = 2 * segCount - searchRange;
-
-    // Fill up the 4 parallel arrays describing the segments.
-    var startCount = '';
-    var endCount = '';
-    var idDeltas = '';
-    var idRangeOffsets = '';
-    var glyphsIds = '';
-    var bias = 0;
-
-    if (deltas) {
-      for (var i = 0; i < segCount - 1; i++) {
-        var range = ranges[i];
-        var start = range[0];
-        var end = range[1];
-        var offset = (segCount - i) * 2 + bias * 2;
-        bias += (end - start + 1);
-
-        startCount += string16(start);
-        endCount += string16(end);
-        idDeltas += string16(0);
-        idRangeOffsets += string16(offset);
-
-        var codes = range[2];
-        for (var j = 0, jj = codes.length; j < jj; ++j)
-          glyphsIds += string16(deltas[codes[j]]);
-      }
-    } else {
-      for (var i = 0; i < segCount - 1; i++) {
-        var range = ranges[i];
-        var start = range[0];
-        var end = range[1];
-        var startCode = range[2][0];
-
-        startCount += string16(start);
-        endCount += string16(end);
-        idDeltas += string16((startCode - start + 1) & 0xFFFF);
-        idRangeOffsets += string16(0);
-      }
-    }
-
-    endCount += '\xFF\xFF';
-    startCount += '\xFF\xFF';
-    idDeltas += '\x00\x01';
-    idRangeOffsets += '\x00\x00';
-
-    var format314 = '\x00\x00' + // language
-                    string16(segCount2) +
-                    string16(searchRange) +
-                    string16(searchEntry) +
-                    string16(rangeShift) +
-                    endCount + '\x00\x00' + startCount +
-                    idDeltas + idRangeOffsets + glyphsIds;
-
-    return stringToArray(cmap +
-                         '\x00\x04' + // format
-                         string16(format314.length + 4) + // length
-                         format314);
-  };
-
-  function createOS2Table(properties, charstrings, override) {
-    override = override || {
-      unitsPerEm: 0,
-      yMax: 0,
-      yMin: 0,
-      ascent: 0,
-      descent: 0
-    };
-
-    var ulUnicodeRange1 = 0;
-    var ulUnicodeRange2 = 0;
-    var ulUnicodeRange3 = 0;
-    var ulUnicodeRange4 = 0;
-
-    var firstCharIndex = null;
-    var lastCharIndex = 0;
-
-    if (charstrings) {
-      for (var i = 0; i < charstrings.length; ++i) {
-        var code = charstrings[i].unicode;
-        if (firstCharIndex > code || !firstCharIndex)
-          firstCharIndex = code;
-        if (lastCharIndex < code)
-          lastCharIndex = code;
-
-        var position = getUnicodeRangeFor(code);
-        if (position < 32) {
-          ulUnicodeRange1 |= 1 << position;
-        } else if (position < 64) {
-          ulUnicodeRange2 |= 1 << position - 32;
-        } else if (position < 96) {
-          ulUnicodeRange3 |= 1 << position - 64;
-        } else if (position < 123) {
-          ulUnicodeRange4 |= 1 << position - 96;
-        } else {
-          error('Unicode ranges Bits > 123 are reserved for internal usage');
-        }
-      }
-    } else {
-      // TODO
-      firstCharIndex = 0;
-      lastCharIndex = 255;
-    }
-
-    var unitsPerEm = override.unitsPerEm || kPDFGlyphSpaceUnits;
-    var typoAscent = override.ascent || properties.ascent;
-    var typoDescent = override.descent || properties.descent;
-    var winAscent = override.yMax || typoAscent;
-    var winDescent = -override.yMin || -typoDescent;
-
-    // if there is a units per em value but no other override
-    // then scale the calculated ascent
-    if (unitsPerEm != kPDFGlyphSpaceUnits &&
-        'undefined' == typeof(override.ascent)) {
-      // if the font units differ to the PDF glyph space units
-      // then scale up the values
-      typoAscent = Math.round(typoAscent * unitsPerEm / kPDFGlyphSpaceUnits);
-      typoDescent = Math.round(typoDescent * unitsPerEm / kPDFGlyphSpaceUnits);
-      winAscent = typoAscent;
-      winDescent = -typoDescent;
-    }
-
-    return '\x00\x03' + // version
-           '\x02\x24' + // xAvgCharWidth
-           '\x01\xF4' + // usWeightClass
-           '\x00\x05' + // usWidthClass
-           '\x00\x00' + // fstype (0 to let the font loads via font-face on IE)
-           '\x02\x8A' + // ySubscriptXSize
-           '\x02\xBB' + // ySubscriptYSize
-           '\x00\x00' + // ySubscriptXOffset
-           '\x00\x8C' + // ySubscriptYOffset
-           '\x02\x8A' + // ySuperScriptXSize
-           '\x02\xBB' + // ySuperScriptYSize
-           '\x00\x00' + // ySuperScriptXOffset
-           '\x01\xDF' + // ySuperScriptYOffset
-           '\x00\x31' + // yStrikeOutSize
-           '\x01\x02' + // yStrikeOutPosition
-           '\x00\x00' + // sFamilyClass
-           '\x00\x00\x06' +
-           String.fromCharCode(properties.fixedPitch ? 0x09 : 0x00) +
-           '\x00\x00\x00\x00\x00\x00' + // Panose
-           string32(ulUnicodeRange1) + // ulUnicodeRange1 (Bits 0-31)
-           string32(ulUnicodeRange2) + // ulUnicodeRange2 (Bits 32-63)
-           string32(ulUnicodeRange3) + // ulUnicodeRange3 (Bits 64-95)
-           string32(ulUnicodeRange4) + // ulUnicodeRange4 (Bits 96-127)
-           '\x2A\x32\x31\x2A' + // achVendID
-           string16(properties.italicAngle ? 1 : 0) + // fsSelection
-           string16(firstCharIndex ||
-                    properties.firstChar) + // usFirstCharIndex
-           string16(lastCharIndex || properties.lastChar) +  // usLastCharIndex
-           string16(typoAscent) + // sTypoAscender
-           string16(typoDescent) + // sTypoDescender
-           '\x00\x64' + // sTypoLineGap (7%-10% of the unitsPerEM value)
-           string16(winAscent) + // usWinAscent
-           string16(winDescent) + // usWinDescent
-           '\x00\x00\x00\x00' + // ulCodePageRange1 (Bits 0-31)
-           '\x00\x00\x00\x00' + // ulCodePageRange2 (Bits 32-63)
-           string16(properties.xHeight) + // sxHeight
-           string16(properties.capHeight) + // sCapHeight
-           string16(0) + // usDefaultChar
-           string16(firstCharIndex || properties.firstChar) + // usBreakChar
-           '\x00\x03';  // usMaxContext
-  };
-
-  function createPostTable(properties) {
-    var angle = Math.floor(properties.italicAngle * (Math.pow(2, 16)));
-    return '\x00\x03\x00\x00' + // Version number
-           string32(angle) + // italicAngle
-           '\x00\x00' + // underlinePosition
-           '\x00\x00' + // underlineThickness
-           string32(properties.fixedPitch) + // isFixedPitch
-           '\x00\x00\x00\x00' + // minMemType42
-           '\x00\x00\x00\x00' + // maxMemType42
-           '\x00\x00\x00\x00' + // minMemType1
-           '\x00\x00\x00\x00';  // maxMemType1
-  };
-
-  function createNameTable(name) {
-    var strings = [
-      'Original licence',  // 0.Copyright
-      name,                // 1.Font family
-      'Unknown',           // 2.Font subfamily (font weight)
-      'uniqueID',          // 3.Unique ID
-      name,                // 4.Full font name
-      'Version 0.11',      // 5.Version
-      '',                  // 6.Postscript name
-      'Unknown',           // 7.Trademark
-      'Unknown',           // 8.Manufacturer
-      'Unknown'            // 9.Designer
-    ];
-
-    // Mac want 1-byte per character strings while Windows want
-    // 2-bytes per character, so duplicate the names table
-    var stringsUnicode = [];
-    for (var i = 0, ii = strings.length; i < ii; i++) {
-      var str = strings[i];
-
-      var strUnicode = '';
-      for (var j = 0, jj = str.length; j < jj; j++)
-        strUnicode += string16(str.charCodeAt(j));
-      stringsUnicode.push(strUnicode);
-    }
-
-    var names = [strings, stringsUnicode];
-    var platforms = ['\x00\x01', '\x00\x03'];
-    var encodings = ['\x00\x00', '\x00\x01'];
-    var languages = ['\x00\x00', '\x04\x09'];
-
-    var namesRecordCount = strings.length * platforms.length;
-    var nameTable =
-      '\x00\x00' +                           // format
-      string16(namesRecordCount) +           // Number of names Record
-      string16(namesRecordCount * 12 + 6);   // Storage
-
-    // Build the name records field
-    var strOffset = 0;
-    for (var i = 0, ii = platforms.length; i < ii; i++) {
-      var strs = names[i];
-      for (var j = 0, jj = strs.length; j < jj; j++) {
-        var str = strs[j];
-        var nameRecord =
-          platforms[i] + // platform ID
-          encodings[i] + // encoding ID
-          languages[i] + // language ID
-          string16(j) + // name ID
-          string16(str.length) +
-          string16(strOffset);
-        nameTable += nameRecord;
-        strOffset += str.length;
-      }
-    }
-
-    nameTable += strings.join('') + stringsUnicode.join('');
-    return nameTable;
-  }
-
-  Font.prototype = {
-    name: null,
-    font: null,
-    mimetype: null,
-    encoding: null,
-
-    checkAndRepair: function Font_checkAndRepair(name, font, properties) {
-      function readTableEntry(file) {
-        var tag = file.getBytes(4);
-        tag = String.fromCharCode(tag[0]) +
-              String.fromCharCode(tag[1]) +
-              String.fromCharCode(tag[2]) +
-              String.fromCharCode(tag[3]);
-
-        var checksum = int32(file.getBytes(4));
-        var offset = int32(file.getBytes(4));
-        var length = int32(file.getBytes(4));
-
-        // Read the table associated data
-        var previousPosition = file.pos;
-        file.pos = file.start ? file.start : 0;
-        file.skip(offset);
-        var data = file.getBytes(length);
-        file.pos = previousPosition;
-
-        if (tag == 'head') {
-          // clearing checksum adjustment
-          data[8] = data[9] = data[10] = data[11] = 0;
-          data[17] |= 0x20; //Set font optimized for cleartype flag
-        }
-
-        return {
-          tag: tag,
-          checksum: checksum,
-          length: length,
-          offset: offset,
-          data: data
-        };
-      };
-
-      function readOpenTypeHeader(ttf) {
-        return {
-          version: arrayToString(ttf.getBytes(4)),
-          numTables: int16(ttf.getBytes(2)),
-          searchRange: int16(ttf.getBytes(2)),
-          entrySelector: int16(ttf.getBytes(2)),
-          rangeShift: int16(ttf.getBytes(2))
-        };
-      };
-
-      function createGlyphNameMap(glyphs, ids, properties) {
-        var glyphNames = properties.glyphNames;
-        if (!glyphNames) {
-          properties.glyphNameMap = {};
-          return;
-        }
-        var glyphsLength = glyphs.length;
-        var glyphNameMap = {};
-        var encoding = [];
-        for (var i = 0; i < glyphsLength; ++i) {
-          var glyphName = glyphNames[ids[i]];
-          if (!glyphName)
-            continue;
-          var unicode = glyphs[i].unicode;
-          glyphNameMap[glyphName] = unicode;
-          var code = glyphs[i].code;
-          encoding[code] = glyphName;
-        }
-        properties.glyphNameMap = glyphNameMap;
-        if (!properties.hasEncoding)
-          properties.baseEncoding = encoding;
-      }
-
-      function readCMapTable(cmap, font) {
-        var start = (font.start ? font.start : 0) + cmap.offset;
-        font.pos = start;
-
-        var version = int16(font.getBytes(2));
-        var numRecords = int16(font.getBytes(2));
-
-        var records = [];
-        for (var i = 0; i < numRecords; i++) {
-          records.push({
-            platformID: int16(font.getBytes(2)),
-            encodingID: int16(font.getBytes(2)),
-            offset: int32(font.getBytes(4))
-          });
-        }
-
-        // Check that table are sorted by platformID then encodingID,
-        records.sort(function fontReadCMapTableSort(a, b) {
-          return ((a.platformID << 16) + a.encodingID) -
-                 ((b.platformID << 16) + b.encodingID);
-        });
-
-        var tables = [records[0]];
-        for (var i = 1; i < numRecords; i++) {
-          // The sanitizer will drop the font if 2 tables have the same
-          // platformID and the same encodingID, this will be correct for
-          // most cases but if the font has been made for Mac it could
-          // exist a few platformID: 1, encodingID: 0 but with a different
-          // language field and that's correct. But the sanitizer does not
-          // seem to support this case.
-          var current = records[i];
-          var previous = records[i - 1];
-          if (((current.platformID << 16) + current.encodingID) <=
-             ((previous.platformID << 16) + previous.encodingID))
-                continue;
-          tables.push(current);
-        }
-
-        var missing = numRecords - tables.length;
-        if (missing) {
-          numRecords = tables.length;
-          var data = string16(version) + string16(numRecords);
-
-          for (var i = 0; i < numRecords; i++) {
-            var table = tables[i];
-            data += string16(table.platformID) +
-                    string16(table.encodingID) +
-                    string32(table.offset);
-          }
-
-          for (var i = 0, ii = data.length; i < ii; i++)
-            cmap.data[i] = data.charCodeAt(i);
-        }
-
-        for (var i = 0; i < numRecords; i++) {
-          var table = tables[i];
-          font.pos = start + table.offset;
-
-          var format = int16(font.getBytes(2));
-          var length = int16(font.getBytes(2));
-          var language = int16(font.getBytes(2));
-
-          if (format == 0) {
-            // Characters below 0x20 are controls characters that are hardcoded
-            // into the platform so if some characters in the font are assigned
-            // under this limit they will not be displayed so let's rewrite the
-            // CMap.
-            var glyphs = [];
-            var ids = [];
-            for (var j = 0; j < 256; j++) {
-              var index = font.getByte();
-              if (index) {
-                glyphs.push({ unicode: j, code: j });
-                ids.push(index);
-              }
-            }
-            return {
-              glyphs: glyphs,
-              ids: ids,
-              hasShortCmap: true
-            };
-          } else if (format == 4) {
-            // re-creating the table in format 4 since the encoding
-            // might be changed
-            var segCount = (int16(font.getBytes(2)) >> 1);
-            font.getBytes(6); // skipping range fields
-            var segIndex, segments = [];
-            for (segIndex = 0; segIndex < segCount; segIndex++) {
-              segments.push({ end: int16(font.getBytes(2)) });
-            }
-            font.getBytes(2);
-            for (segIndex = 0; segIndex < segCount; segIndex++) {
-              segments[segIndex].start = int16(font.getBytes(2));
-            }
-
-            for (segIndex = 0; segIndex < segCount; segIndex++) {
-              segments[segIndex].delta = int16(font.getBytes(2));
-            }
-
-            var offsetsCount = 0;
-            for (segIndex = 0; segIndex < segCount; segIndex++) {
-              var segment = segments[segIndex];
-              var rangeOffset = int16(font.getBytes(2));
-              if (!rangeOffset) {
-                segment.offsetIndex = -1;
-                continue;
-              }
-
-              var offsetIndex = (rangeOffset >> 1) - (segCount - segIndex);
-              segment.offsetIndex = offsetIndex;
-              offsetsCount = Math.max(offsetsCount, offsetIndex +
-                segment.end - segment.start + 1);
-            }
-
-            var offsets = [];
-            for (var j = 0; j < offsetsCount; j++)
-              offsets.push(int16(font.getBytes(2)));
-
-            var glyphs = [], ids = [];
-
-            for (segIndex = 0; segIndex < segCount; segIndex++) {
-              var segment = segments[segIndex];
-              var start = segment.start, end = segment.end;
-              var delta = segment.delta, offsetIndex = segment.offsetIndex;
-
-              for (var j = start; j <= end; j++) {
-                if (j == 0xFFFF)
-                  continue;
-
-                var glyphCode = offsetIndex < 0 ? j :
-                  offsets[offsetIndex + j - start];
-                glyphCode = (glyphCode + delta) & 0xFFFF;
-                if (glyphCode == 0)
-                  continue;
-
-                glyphs.push({ unicode: j, code: j });
-                ids.push(glyphCode);
-              }
-            }
-
-            return {
-              glyphs: glyphs,
-              ids: ids
-            };
-          } else if (format == 6) {
-            // Format 6 is a 2-bytes dense mapping, which means the font data
-            // lives glue together even if they are pretty far in the unicode
-            // table. (This looks weird, so I can have missed something), this
-            // works on Linux but seems to fails on Mac so let's rewrite the
-            // cmap table to a 3-1-4 style
-            var firstCode = int16(font.getBytes(2));
-            var entryCount = int16(font.getBytes(2));
-
-            var glyphs = [];
-            var ids = [];
-            for (var j = 0; j < entryCount; j++) {
-              var glyphCode = int16(font.getBytes(2));
-              var code = firstCode + j;
-
-              glyphs.push({ unicode: code, code: code });
-              ids.push(glyphCode);
-            }
-
-            return {
-              glyphs: glyphs,
-              ids: ids
-            };
-          }
-        }
-        error('Unsupported cmap table format');
-      };
-
-      function sanitizeMetrics(font, header, metrics, numGlyphs) {
-        if (!header && !metrics)
-          return;
-
-        // The vhea/vmtx tables are not required, so it happens that
-        // some fonts embed a vmtx table without a vhea table. In this
-        // situation the sanitizer assume numOfLongVerMetrics = 1. As
-        // a result it tries to read numGlyphs - 1 SHORT from the vmtx
-        // table, and if it is not possible, the font is rejected.
-        // So remove the vmtx table if there is no vhea table.
-        if (!header && metrics) {
-          metrics.data = null;
-          return;
-        }
-
-        font.pos = (font.start ? font.start : 0) + header.offset;
-        font.pos += header.length - 2;
-        var numOfMetrics = int16(font.getBytes(2));
-
-        var numOfSidebearings = numGlyphs - numOfMetrics;
-        var numMissing = numOfSidebearings -
-          ((hmtx.length - numOfMetrics * 4) >> 1);
-        if (numMissing > 0) {
-          font.pos = (font.start ? font.start : 0) + metrics.offset;
-          var entries = '';
-          for (var i = 0, ii = hmtx.length; i < ii; i++)
-            entries += String.fromCharCode(font.getByte());
-          for (var i = 0; i < numMissing; i++)
-            entries += '\x00\x00';
-          metrics.data = stringToArray(entries);
-        }
-      };
-
-      function sanitizeGlyph(source, sourceStart, sourceEnd, dest, destStart) {
-        if (sourceEnd - sourceStart <= 12) {
-          // glyph with data less than 12 is invalid one
-          return 0;
-        }
-        var glyf = source.subarray(sourceStart, sourceEnd);
-        var contoursCount = (glyf[0] << 8) | glyf[1];
-        if (contoursCount & 0x8000) {
-          // complex glyph, writing as is
-          dest.set(glyf, destStart);
-          return glyf.length;
-        }
-
-        var j = 10, flagsCount = 0;
-        for (var i = 0; i < contoursCount; i++) {
-          var endPoint = (glyf[j] << 8) | glyf[j + 1];
-          flagsCount = endPoint + 1;
-          j += 2;
-        }
-        // skipping instructions
-        var instructionsLength = (glyf[j] << 8) | glyf[j + 1];
-        j += 2 + instructionsLength;
-        // validating flags
-        var coordinatesLength = 0;
-        for (var i = 0; i < flagsCount; i++) {
-          var flag = glyf[j++];
-          if (flag & 0xC0) {
-            // reserved flags must be zero, rejecting
-            return 0;
-          }
-          var xyLength = ((flag & 2) ? 1 : (flag & 16) ? 0 : 2) +
-                         ((flag & 4) ? 1 : (flag & 32) ? 0 : 2);
-          coordinatesLength += xyLength;
-          if (flag & 8) {
-            var repeat = glyf[j++];
-            i += repeat;
-            coordinatesLength += repeat * xyLength;
-          }
-        }
-        var glyphDataLength = j + coordinatesLength;
-        if (glyphDataLength > glyf.length) {
-          // not enough data for coordinates
-          return 0;
-        }
-        if (glyf.length - glyphDataLength > 3) {
-          // truncating and aligning to 4 bytes the long glyph data
-          glyphDataLength = (glyphDataLength + 3) & ~3;
-          dest.set(glyf.subarray(0, glyphDataLength), destStart);
-          return glyphDataLength;
-        }
-        // glyph data is fine
-        dest.set(glyf, destStart);
-        return glyf.length;
-      }
-
-      function sanitizeGlyphLocations(loca, glyf, numGlyphs,
-                                      isGlyphLocationsLong) {
-        var itemSize, itemDecode, itemEncode;
-        if (isGlyphLocationsLong) {
-          itemSize = 4;
-          itemDecode = function fontItemDecodeLong(data, offset) {
-            return (data[offset] << 24) | (data[offset + 1] << 16) |
-                   (data[offset + 2] << 8) | data[offset + 3];
-          };
-          itemEncode = function fontItemEncodeLong(data, offset, value) {
-            data[offset] = (value >>> 24) & 0xFF;
-            data[offset + 1] = (value >> 16) & 0xFF;
-            data[offset + 2] = (value >> 8) & 0xFF;
-            data[offset + 3] = value & 0xFF;
-          };
-        } else {
-          itemSize = 2;
-          itemDecode = function fontItemDecode(data, offset) {
-            return (data[offset] << 9) | (data[offset + 1] << 1);
-          };
-          itemEncode = function fontItemEncode(data, offset, value) {
-            data[offset] = (value >> 9) & 0xFF;
-            data[offset + 1] = (value >> 1) & 0xFF;
-          };
-        }
-        var locaData = loca.data;
-        // removing the invalid glyphs
-        var oldGlyfData = glyf.data;
-        var oldGlyfDataLength = oldGlyfData.length;
-        var newGlyfData = new Uint8Array(oldGlyfDataLength);
-        var startOffset = itemDecode(locaData, 0);
-        var writeOffset = 0;
-        itemEncode(locaData, 0, writeOffset);
-        for (var i = 0, j = itemSize; i < numGlyphs; i++, j += itemSize) {
-          var endOffset = itemDecode(locaData, j);
-          if (endOffset > oldGlyfDataLength) {
-            // glyph end offset points outside glyf data, rejecting the glyph
-            itemEncode(locaData, j, writeOffset);
-            startOffset = endOffset;
-            continue;
-          }
-
-          var newLength = sanitizeGlyph(oldGlyfData, startOffset, endOffset,
-                                        newGlyfData, writeOffset);
-          writeOffset += newLength;
-          itemEncode(locaData, j, writeOffset);
-          startOffset = endOffset;
-        }
-
-        if (writeOffset == 0) {
-          // glyf table cannot be empty -- redoing the glyf and loca tables
-          // to have single glyph with one point
-          var simpleGlyph = new Uint8Array(
-            [0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 49, 0]);
-          for (var i = 0, j = itemSize; i < numGlyphs; i++, j += itemSize)
-            itemEncode(locaData, j, simpleGlyph.length);
-          glyf.data = simpleGlyph;
-          return;
-        }
-
-        glyf.data = newGlyfData.subarray(0, writeOffset);
-      }
-
-      function findEmptyGlyphs(locaTable, isGlyphLocationsLong, emptyGlyphIds) {
-        var itemSize, itemDecode;
-        if (isGlyphLocationsLong) {
-          itemSize = 4;
-          itemDecode = function fontItemDecodeLong(data, offset) {
-            return (data[offset] << 24) | (data[offset + 1] << 16) |
-                   (data[offset + 2] << 8) | data[offset + 3];
-          };
-        } else {
-          itemSize = 2;
-          itemDecode = function fontItemDecode(data, offset) {
-            return (data[offset] << 9) | (data[offset + 1] << 1);
-          };
-        }
-        var data = locaTable.data, length = data.length;
-        var lastOffset = itemDecode(data, 0);
-        for (var i = itemSize, j = 0; i < length; i += itemSize, j++) {
-          var offset = itemDecode(data, i);
-          if (offset == lastOffset)
-            emptyGlyphIds[j] = true;
-          lastOffset = offset;
-        }
-      }
-
-      function readGlyphNameMap(post, properties) {
-        var start = (font.start ? font.start : 0) + post.offset;
-        font.pos = start;
-
-        var length = post.length, end = start + length;
-        var version = int32(font.getBytes(4));
-        // skip rest to the tables
-        font.getBytes(28);
-
-        var glyphNames;
-        switch (version) {
-          case 0x00010000:
-            glyphNames = MacStandardGlyphOrdering;
-            break;
-          case 0x00020000:
-            var numGlyphs = int16(font.getBytes(2));
-            var glyphNameIndexes = [];
-            for (var i = 0; i < numGlyphs; ++i)
-              glyphNameIndexes.push(int16(font.getBytes(2)));
-            var customNames = [];
-            while (font.pos < end) {
-              var stringLength = font.getByte();
-              var string = '';
-              for (var i = 0; i < stringLength; ++i)
-                string += font.getChar();
-              customNames.push(string);
-            }
-            glyphNames = [];
-            for (var i = 0; i < numGlyphs; ++i) {
-              var j = glyphNameIndexes[i];
-              if (j < 258) {
-                glyphNames.push(MacStandardGlyphOrdering[j]);
-                continue;
-              }
-              glyphNames.push(customNames[j - 258]);
-            }
-            break;
-          case 0x00030000:
-            break;
-          default:
-            warn('Unknown/unsupported post table version ' + version);
-            break;
-        }
-        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'];
-
-      var header = readOpenTypeHeader(font);
-      var numTables = header.numTables;
-
-      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);
-        var index = requiredTables.indexOf(table.tag);
-        if (index != -1) {
-          if (table.tag == 'cmap')
-            cmap = table;
-          else if (table.tag == 'post')
-            post = table;
-          else if (table.tag == 'maxp')
-            maxp = table;
-          else if (table.tag == 'hhea')
-            hhea = table;
-          else if (table.tag == 'hmtx')
-            hmtx = table;
-          else if (table.tag == 'head')
-            head = table;
-          else if (table.tag == 'OS/2')
-            os2 = table;
-
-          requiredTables.splice(index, 1);
-        } else {
-          if (table.tag == 'vmtx')
-            vmtx = table;
-          else if (table.tag == 'vhea')
-            vhea = table;
-          else if (table.tag == 'loca')
-            loca = table;
-          else if (table.tag == 'glyf')
-            glyf = table;
-        }
-        tables.push(table);
-      }
-
-      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
-      // data of a particular table;
-      var ttf = {
-        file: '',
-        virtualOffset: numTables * (4 * 4)
-      };
-
-      // The new numbers of tables will be the last one plus the num
-      // of missing tables
-      createOpenTypeHeader(header.version, ttf, numTables);
-
-      // 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
-      // sidebearings information for numGlyphs in the maxp table
-      font.pos = (font.start || 0) + maxp.offset;
-      var version = int16(font.getBytes(4));
-      var numGlyphs = int16(font.getBytes(2));
-
-      sanitizeMetrics(font, hhea, hmtx, numGlyphs);
-      sanitizeMetrics(font, vhea, vmtx, numGlyphs);
-
-      var isGlyphLocationsLong = int16([head.data[50], head.data[51]]);
-      if (head && loca && glyf) {
-        sanitizeGlyphLocations(loca, glyf, numGlyphs, isGlyphLocationsLong);
-      }
-
-      var emptyGlyphIds = [];
-      if (glyf)
-        findEmptyGlyphs(loca, isGlyphLocationsLong, emptyGlyphIds);
-
-      // Sanitizer reduces the glyph advanceWidth to the maxAdvanceWidth
-      // Sometimes it's 0. That needs to be fixed
-      if (hhea.data[10] == 0 && hhea.data[11] == 0) {
-        hhea.data[10] = 0xFF;
-        hhea.data[11] = 0xFF;
-      }
-
-      // The 'post' table has glyphs names.
-      if (post) {
-        readGlyphNameMap(post, properties);
-      }
-
-      var glyphs, ids;
-      if (properties.type == 'CIDFontType2') {
-        // Replace the old CMAP table with a shiny new one
-        // Type2 composite fonts map characters directly to glyphs so the cmap
-        // table must be replaced.
-        // canvas fillText will reencode some characters even if the font has a
-        // glyph at that position - e.g. newline is converted to a space and
-        // U+00AD (soft hyphen) is not drawn.
-        // So, offset all the glyphs by 0xFF to avoid these cases and use
-        // the encoding to map incoming characters to the new glyph positions
-        if (!cmap) {
-          cmap = {
-            tag: 'cmap',
-            data: null
-          };
-          tables.push(cmap);
-        }
-
-        var cidToGidMap = properties.cidToGidMap || [];
-        var gidToCidMap = [0];
-        if (cidToGidMap.length > 0) {
-          for (var j = cidToGidMap.length - 1; j >= 0; j--) {
-            var gid = cidToGidMap[j];
-            if (gid)
-              gidToCidMap[gid] = j;
-          }
-          // filling the gaps using CID above the CIDs currently used in font
-          var nextCid = cidToGidMap.length;
-          for (var i = 1; i < numGlyphs; i++) {
-            if (!gidToCidMap[i])
-              gidToCidMap[i] = nextCid++;
-          }
-        }
-
-        glyphs = [];
-        ids = [];
-
-        var usedUnicodes = [];
-        var unassignedUnicodeItems = [];
-        for (var i = 1; i < numGlyphs; i++) {
-          var cid = gidToCidMap[i] || i;
-          var unicode = this.toFontChar[cid];
-          if (!unicode || typeof unicode !== 'number' ||
-              isSpecialUnicode(unicode) || unicode in usedUnicodes) {
-            unassignedUnicodeItems.push(i);
-            continue;
-          }
-          usedUnicodes[unicode] = true;
-          glyphs.push({ unicode: unicode, code: cid });
-          ids.push(i);
-        }
-        // trying to fit as many unassigned symbols as we can
-        // in the range allocated for the user defined symbols
-        var unusedUnicode = kCmapGlyphOffset;
-        for (var j = 0, jj = unassignedUnicodeItems.length; j < jj; j++) {
-          var i = unassignedUnicodeItems[j];
-          var cid = gidToCidMap[i] || i;
-          while (unusedUnicode in usedUnicodes)
-            unusedUnicode++;
-          if (unusedUnicode >= kCmapGlyphOffset + kSizeOfGlyphArea)
-            break;
-          var unicode = unusedUnicode++;
-          this.toFontChar[cid] = unicode;
-          usedUnicodes[unicode] = true;
-          glyphs.push({ unicode: unicode, code: cid });
-          ids.push(i);
-        }
-      } else {
-        var cmapTable = readCMapTable(cmap, font);
-
-        glyphs = cmapTable.glyphs;
-        ids = cmapTable.ids;
-
-        var hasShortCmap = !!cmapTable.hasShortCmap;
-        var toFontChar = this.toFontChar;
-
-        if (hasShortCmap && ids.length == numGlyphs) {
-          // Fixes the short cmap tables -- some generators use incorrect
-          // glyph id.
-          for (var i = 0, ii = ids.length; i < ii; i++)
-            ids[i] = i;
-        }
-
-        var unusedUnicode = kCmapGlyphOffset;
-        var glyphNames = properties.glyphNames || [];
-        var encoding = properties.baseEncoding;
-        var differences = properties.differences;
-        if (toFontChar && toFontChar.length > 0) {
-          // checking if cmap is just identity map
-          var isIdentity = true;
-          for (var i = 0, ii = glyphs.length; i < ii; i++) {
-            if (glyphs[i].unicode != i + 1) {
-              isIdentity = false;
-              break;
-            }
-          }
-          // if it is, replacing with meaningful toUnicode values
-          if (isIdentity && !this.isSymbolicFont) {
-            var usedUnicodes = [], unassignedUnicodeItems = [];
-            for (var i = 0, ii = glyphs.length; i < ii; i++) {
-              var unicode = toFontChar[i + 1];
-              if (!unicode || typeof unicode !== 'number' ||
-                  unicode in usedUnicodes) {
-                unassignedUnicodeItems.push(i);
-                continue;
-              }
-              glyphs[i].unicode = unicode;
-              usedUnicodes[unicode] = true;
-            }
-            for (var j = 0, jj = unassignedUnicodeItems.length; j < jj; j++) {
-              var i = unassignedUnicodeItems[j];
-              while (unusedUnicode in usedUnicodes)
-                unusedUnicode++;
-              var cid = i + 1;
-              // override only if unicode mapping is not specified
-              if (!(cid in toFontChar))
-                toFontChar[cid] = unusedUnicode;
-              glyphs[i].unicode = unusedUnicode++;
-            }
-            this.useToFontChar = true;
-          }
-        }
-
-        // remove glyph references outside range of avaialable glyphs or empty
-        var glyphsRemoved = 0;
-        for (var i = ids.length - 1; i >= 0; i--) {
-          if (ids[i] < numGlyphs &&
-              (!emptyGlyphIds[ids[i]] || this.isSymbolicFont))
-            continue;
-          ids.splice(i, 1);
-          glyphs.splice(i, 1);
-          glyphsRemoved++;
-        }
-
-        // checking if it's a "true" symbolic font
-        if (this.isSymbolicFont) {
-          var minUnicode = 0xFFFF, maxUnicode = 0;
-          for (var i = 0, ii = glyphs.length; i < ii; i++) {
-            var unicode = glyphs[i].unicode;
-            minUnicode = Math.min(minUnicode, unicode);
-            maxUnicode = Math.max(maxUnicode, unicode);
-          }
-          // high byte must be the same for min and max unicodes
-          if ((maxUnicode & 0xFF00) != (minUnicode & 0xFF00))
-            this.isSymbolicFont = false;
-        }
-
-        // 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;
-        }
-
-        if (hasShortCmap && this.hasEncoding && !this.isSymbolicFont) {
-          // Re-encode short map encoding to unicode -- that simplifies the
-          // resolution of MacRoman encoded glyphs logic for TrueType fonts:
-          // copying all characters to private use area, all mapping all known
-          // glyphs to the unicodes. The glyphs and ids arrays will grow.
-          var usedUnicodes = [];
-          for (var i = 0, ii = glyphs.length; i < ii; i++) {
-            var code = glyphs[i].unicode;
-            var gid = ids[i];
-            glyphs[i].unicode += kCmapGlyphOffset;
-            toFontChar[code] = glyphs[i].unicode;
-
-            var glyphName = glyphNames[gid] || encoding[code];
-            if (glyphName in GlyphsUnicode) {
-              var unicode = GlyphsUnicode[glyphName];
-              if (unicode in usedUnicodes)
-                continue;
-
-              usedUnicodes[unicode] = true;
-              glyphs.push({
-                unicode: unicode,
-                code: glyphs[i].code
-              });
-              ids.push(gid);
-              toFontChar[code] = unicode;
-            }
-          }
-          this.useToFontChar = true;
-        } else if (!this.isSymbolicFont && (this.hasEncoding ||
-                    properties.glyphNames || differences.length > 0)) {
-          // Re-encode cmap encoding to unicode, based on the 'post' table data
-          // diffrence array or base encoding
-          var reverseMap = [];
-          for (var i = 0, ii = glyphs.length; i < ii; i++)
-            reverseMap[glyphs[i].unicode] = i;
-
-          var newGlyphUnicodes = [];
-          for (var i = 0, ii = glyphs.length; i < ii; i++) {
-            var code = glyphs[i].unicode;
-            var changeCode = false;
-            var gid = ids[i];
-
-            var glyphName = glyphNames[gid];
-            if (!glyphName) {
-              glyphName = differences[code] || encoding[code];
-              changeCode = true;
-            }
-            if (glyphName in GlyphsUnicode) {
-              var unicode = GlyphsUnicode[glyphName];
-              if (!unicode || reverseMap[unicode] === i)
-                continue; // unknown glyph name or in its own place
-
-              newGlyphUnicodes[i] = unicode;
-              if (changeCode)
-                toFontChar[code] = unicode;
-              delete reverseMap[code];
-            }
-          }
-          for (var index in newGlyphUnicodes) {
-            var unicode = newGlyphUnicodes[index];
-            if (reverseMap[unicode]) {
-              // avoiding assigning to the same unicode
-              glyphs[index].unicode = unusedUnicode++;
-              continue;
-            }
-            glyphs[index].unicode = unicode;
-            reverseMap[unicode] = index;
-          }
-          this.useToFontChar = true;
-        }
-
-        // Moving all symbolic font glyphs into 0xF000 - 0xF0FF range.
-        if (this.isSymbolicFont) {
-          for (var i = 0, ii = glyphs.length; i < ii; i++) {
-            var code = glyphs[i].unicode & 0xFF;
-            var fontCharCode = kSymbolicFontGlyphOffset | code;
-            glyphs[i].unicode = toFontChar[code] = fontCharCode;
-          }
-          this.useToFontChar = true;
-        }
-
-        createGlyphNameMap(glyphs, ids, properties);
-        this.glyphNameMap = properties.glyphNameMap;
-      }
-
-      // Converting glyphs and ids into font's cmap table
-      cmap.data = createCMapTable(glyphs, ids);
-      var unicodeIsEnabled = [];
-      for (var i = 0, ii = glyphs.length; i < ii; i++) {
-        unicodeIsEnabled[glyphs[i].unicode] = true;
-      }
-      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({
-          tag: 'post',
-          data: stringToArray(createPostTable(properties))
-        });
-      }
-
-      // Rewrite the 'name' table if needed
-      if (requiredTables.indexOf('name') != -1) {
-        tables.push({
-          tag: 'name',
-          data: stringToArray(createNameTable(this.name))
-        });
-      }
-
-      // Tables needs to be written by ascendant alphabetic order
-      tables.sort(function tables_sort(a, b) {
-        return (a.tag > b.tag) - (a.tag < b.tag);
-      });
-
-      // rewrite the tables but tweak offsets
-      for (var i = 0, ii = tables.length; i < ii; i++) {
-        var table = tables[i];
-        var data = [];
-
-        var tableData = table.data;
-        for (var j = 0, jj = tableData.length; j < jj; j++)
-          data.push(tableData[j]);
-        createTableEntry(ttf, table.tag, data);
-      }
-
-      // Add the table datas
-      for (var i = 0, ii = tables.length; i < ii; i++) {
-        var table = tables[i];
-        var tableData = table.data;
-        ttf.file += arrayToString(tableData);
-
-        // 4-byte aligned data
-        while (ttf.file.length & 3)
-          ttf.file += String.fromCharCode(0);
-      }
-
-      return stringToArray(ttf.file);
-    },
-
-    convert: function Font_convert(fontName, font, properties) {
-      function isFixedPitch(glyphs) {
-        for (var i = 0, ii = glyphs.length - 1; i < ii; i++) {
-          if (glyphs[i] != glyphs[i + 1])
-            return false;
-        }
-        return true;
-      }
-
-      // The offsets object holds at the same time a representation of where
-      // to write the table entry information about a table and another offset
-      // representing the offset where to draw the actual data of a particular
-      // table
-      var kRequiredTablesCount = 9;
-
-      var otf = {
-        file: '',
-        virtualOffset: 9 * (4 * 4)
-      };
-
-      createOpenTypeHeader('\x4F\x54\x54\x4F', otf, 9);
-
-      var charstrings = font.charstrings;
-      properties.fixedPitch = isFixedPitch(charstrings);
-
-      var glyphNameMap = {};
-      for (var i = 0; i < charstrings.length; ++i) {
-        var charstring = charstrings[i];
-        glyphNameMap[charstring.glyph] = charstring.unicode;
-      }
-      this.glyphNameMap = glyphNameMap;
-
-      if (!properties.hasEncoding && (properties.subtype == 'Type1C' ||
-          properties.subtype == 'CIDFontType0C')) {
-        var encoding = [];
-        for (var i = 0; i < charstrings.length; ++i) {
-          var charstring = charstrings[i];
-          encoding[charstring.code] = charstring.glyph;
-        }
-        properties.baseEncoding = encoding;
-      }
-      if (properties.subtype == 'CIDFontType0C') {
-        var toFontChar = [];
-        for (var i = 0; i < charstrings.length; ++i) {
-          var charstring = charstrings[i];
-          toFontChar[charstring.code] = charstring.unicode;
-        }
-        this.toFontChar = toFontChar;
-      }
-
-      var fields = {
-        // PostScript Font Program
-        'CFF ': font.data,
-
-        // OS/2 and Windows Specific metrics
-        'OS/2': stringToArray(createOS2Table(properties, charstrings)),
-
-        // Character to glyphs mapping
-        'cmap': createCMapTable(charstrings.slice(),
-                                ('glyphIds' in font) ? font.glyphIds : null),
-
-        // Font header
-        'head': (function fontFieldsHead() {
-          return stringToArray(
-              '\x00\x01\x00\x00' + // Version number
-              '\x00\x00\x10\x00' + // fontRevision
-              '\x00\x00\x00\x00' + // checksumAdjustement
-              '\x5F\x0F\x3C\xF5' + // magicNumber
-              '\x00\x00' + // Flags
-              '\x03\xE8' + // unitsPerEM (defaulting to 1000)
-              '\x00\x00\x00\x00\x9e\x0b\x7e\x27' + // creation date
-              '\x00\x00\x00\x00\x9e\x0b\x7e\x27' + // modifification date
-              '\x00\x00' + // xMin
-              safeString16(properties.descent) + // yMin
-              '\x0F\xFF' + // xMax
-              safeString16(properties.ascent) + // yMax
-              string16(properties.italicAngle ? 2 : 0) + // macStyle
-              '\x00\x11' + // lowestRecPPEM
-              '\x00\x00' + // fontDirectionHint
-              '\x00\x00' + // indexToLocFormat
-              '\x00\x00');  // glyphDataFormat
-        })(),
-
-        // Horizontal header
-        'hhea': (function fontFieldsHhea() {
-          return stringToArray(
-              '\x00\x01\x00\x00' + // Version number
-              safeString16(properties.ascent) + // Typographic Ascent
-              safeString16(properties.descent) + // Typographic Descent
-              '\x00\x00' + // Line Gap
-              '\xFF\xFF' + // advanceWidthMax
-              '\x00\x00' + // minLeftSidebearing
-              '\x00\x00' + // minRightSidebearing
-              '\x00\x00' + // xMaxExtent
-              safeString16(properties.capHeight) + // caretSlopeRise
-              safeString16(Math.tan(properties.italicAngle) *
-                       properties.xHeight) + // caretSlopeRun
-              '\x00\x00' + // caretOffset
-              '\x00\x00' + // -reserved-
-              '\x00\x00' + // -reserved-
-              '\x00\x00' + // -reserved-
-              '\x00\x00' + // -reserved-
-              '\x00\x00' + // metricDataFormat
-              string16(charstrings.length + 1)); // Number of HMetrics
-        })(),
-
-        // Horizontal metrics
-        'hmtx': (function fontFieldsHmtx() {
-          var hmtx = '\x00\x00\x00\x00'; // Fake .notdef
-          for (var i = 0, ii = charstrings.length; i < ii; i++) {
-            var charstring = charstrings[i];
-            var width = 'width' in charstring ? charstring.width : 0;
-            hmtx += string16(width) + string16(0);
-          }
-          return stringToArray(hmtx);
-        })(),
-
-        // Maximum profile
-        'maxp': (function fontFieldsMaxp() {
-          return stringToArray(
-              '\x00\x00\x50\x00' + // Version number
-             string16(charstrings.length + 1)); // Num of glyphs
-        })(),
-
-        // Naming tables
-        'name': stringToArray(createNameTable(fontName)),
-
-        // PostScript informations
-        'post': stringToArray(createPostTable(properties))
-      };
-
-      for (var field in fields)
-        createTableEntry(otf, field, fields[field]);
-
-      for (var field in fields) {
-        var table = fields[field];
-        otf.file += arrayToString(table);
-      }
-
-      return stringToArray(otf.file);
-    },
-
-    buildToFontChar: function Font_buildToFontChar(toUnicode) {
-      var result = [];
-      var unusedUnicode = kCmapGlyphOffset;
-      for (var i = 0, ii = toUnicode.length; i < ii; i++) {
-        var unicode = toUnicode[i];
-        var fontCharCode = typeof unicode === 'object' ? unusedUnicode++ :
-          unicode;
-        if (typeof unicode !== 'undefined')
-          result[i] = fontCharCode;
-      }
-      return result;
-    },
-
-    rebuildToUnicode: function Font_rebuildToUnicode(properties) {
-      var firstChar = properties.firstChar, lastChar = properties.lastChar;
-      var map = [];
-      if (properties.composite) {
-        var isIdentityMap = this.cidToUnicode.length == 0;
-        for (var i = firstChar, ii = lastChar; i <= ii; i++) {
-          // TODO missing map the character according font's CMap
-          var cid = i;
-          map[i] = isIdentityMap ? cid : this.cidToUnicode[cid];
-        }
-      } else {
-        for (var i = firstChar, ii = lastChar; i <= ii; i++) {
-          var glyph = properties.differences[i];
-          if (!glyph)
-            glyph = properties.baseEncoding[i];
-          if (!!glyph && (glyph in GlyphsUnicode))
-            map[i] = GlyphsUnicode[glyph];
-        }
-      }
-      this.toUnicode = map;
-    },
-
-    loadCidToUnicode: function Font_loadCidToUnicode(properties) {
-      if (!properties.cidSystemInfo)
-        return;
-
-      var cidToUnicodeMap = [], unicodeToCIDMap = [];
-      this.cidToUnicode = cidToUnicodeMap;
-      this.unicodeToCID = unicodeToCIDMap;
-
-      var cidSystemInfo = properties.cidSystemInfo;
-      var cidToUnicode;
-      if (cidSystemInfo) {
-        cidToUnicode = CIDToUnicodeMaps[
-          cidSystemInfo.registry + '-' + cidSystemInfo.ordering];
-      }
-
-      if (!cidToUnicode)
-        return; // identity encoding
-
-      var cid = 1, i, j, k, ii;
-      for (i = 0, ii = cidToUnicode.length; i < ii; ++i) {
-        var unicode = cidToUnicode[i];
-        if (isArray(unicode)) {
-          var length = unicode.length;
-          for (j = 0; j < length; j++) {
-            cidToUnicodeMap[cid] = unicode[j];
-            unicodeToCIDMap[unicode[j]] = cid;
-          }
-          cid++;
-        } else if (typeof unicode === 'object') {
-          var fillLength = unicode.f;
-          if (fillLength) {
-            k = unicode.c;
-            for (j = 0; j < fillLength; ++j) {
-              cidToUnicodeMap[cid] = k;
-              unicodeToCIDMap[k] = cid;
-              cid++;
-              k++;
-            }
-          } else
-            cid += unicode.s;
-        } else if (unicode) {
-          cidToUnicodeMap[cid] = unicode;
-          unicodeToCIDMap[unicode] = cid;
-          cid++;
-        } else
-          cid++;
-      }
-    },
-
-    bindDOM: function Font_bindDOM(data) {
-      var fontName = this.loadedName;
-
-      // Add the font-face rule to the document
-      var url = ('url(data:' + this.mimetype + ';base64,' +
-                 window.btoa(data) + ');');
-      var rule = "@font-face { font-family:'" + fontName + "';src:" + url + '}';
-
-      var styleElement = document.createElement('style');
-      document.documentElement.getElementsByTagName('head')[0].appendChild(
-        styleElement);
-
-      var styleSheet = styleElement.sheet;
-      styleSheet.insertRule(rule, styleSheet.cssRules.length);
-
-      if (PDFJS.pdfBug && FontInspector.enabled)
-        FontInspector.fontAdded(this, url);
-
-      return rule;
-    },
-
-    get spaceWidth() {
-      // trying to estimate space character width
-      var possibleSpaceReplacements = ['space', 'minus', 'one', 'i'];
-      var width;
-      for (var i = 0, ii = possibleSpaceReplacements.length; i < ii; i++) {
-        var glyphName = possibleSpaceReplacements[i];
-        // if possible, getting width by glyph name
-        if (glyphName in this.widths) {
-          width = this.widths[glyphName];
-          break;
-        }
-        var glyphUnicode = GlyphsUnicode[glyphName];
-        // finding the charcode via unicodeToCID map
-        var charcode = 0;
-        if (this.composite)
-          charcode = this.unicodeToCID[glyphUnicode];
-        // ... via toUnicode map
-        if (!charcode && 'toUnicode' in this)
-          charcode = this.toUnicode.indexOf(glyphUnicode);
-        // setting it to unicode if negative or undefined
-        if (!(charcode > 0))
-          charcode = glyphUnicode;
-        // trying to get width via charcode
-        width = this.widths[charcode];
-        if (width)
-          break; // the non-zero width found
-      }
-      width = (width || this.defaultWidth) * this.widthMultiplier;
-      return shadow(this, 'spaceWidth', width);
-    },
-
-    charToGlyph: function Font_charToGlyph(charcode) {
-      var fontCharCode, width, operatorList, disabled;
-
-      var width = this.widths[charcode];
-
-      switch (this.type) {
-        case 'CIDFontType0':
-          if (this.noUnicodeAdaptation) {
-            width = this.widths[this.unicodeToCID[charcode] || charcode];
-            fontCharCode = mapPrivateUseChars(charcode);
-            break;
-          }
-          fontCharCode = this.toFontChar[charcode] || charcode;
-          break;
-        case 'CIDFontType2':
-          if (this.noUnicodeAdaptation) {
-            width = this.widths[this.unicodeToCID[charcode] || charcode];
-            fontCharCode = mapPrivateUseChars(charcode);
-            break;
-          }
-          fontCharCode = this.toFontChar[charcode] || charcode;
-          break;
-        case 'Type1':
-          var glyphName = this.differences[charcode] || this.encoding[charcode];
-          if (!isNum(width))
-            width = this.widths[glyphName];
-          if (this.noUnicodeAdaptation) {
-            fontCharCode = mapPrivateUseChars(GlyphsUnicode[glyphName] ||
-              charcode);
-            break;
-          }
-          fontCharCode = this.glyphNameMap[glyphName] ||
-            GlyphsUnicode[glyphName] || charcode;
-          break;
-        case 'Type3':
-          var glyphName = this.differences[charcode] || this.encoding[charcode];
-          operatorList = this.charProcOperatorList[glyphName];
-          fontCharCode = charcode;
-          break;
-        case 'TrueType':
-          if (this.useToFontChar) {
-            fontCharCode = this.toFontChar[charcode] || charcode;
-            break;
-          }
-          var glyphName = this.differences[charcode] || this.encoding[charcode];
-          if (!glyphName)
-            glyphName = Encodings.StandardEncoding[charcode];
-          if (!isNum(width))
-            width = this.widths[glyphName];
-          if (this.noUnicodeAdaptation) {
-            fontCharCode = GlyphsUnicode[glyphName] || charcode;
-            break;
-          }
-          if (!this.hasEncoding || this.isSymbolicFont) {
-            fontCharCode = this.useToFontChar ? this.toFontChar[charcode] :
-              charcode;
-            break;
-          }
-
-          // MacRoman encoding address by re-encoding the cmap table
-
-          fontCharCode = glyphName in this.glyphNameMap ?
-            this.glyphNameMap[glyphName] : GlyphsUnicode[glyphName];
-          break;
-        default:
-          warn('Unsupported font type: ' + this.type);
-          break;
-      }
-
-      var unicodeChars = !('toUnicode' in this) ? charcode :
-        this.toUnicode[charcode] || charcode;
-      if (typeof unicodeChars === 'number')
-        unicodeChars = String.fromCharCode(unicodeChars);
-
-      width = (isNum(width) ? width : this.defaultWidth) * this.widthMultiplier;
-      disabled = this.unicodeIsEnabled ?
-        !this.unicodeIsEnabled[fontCharCode] : false;
-
-      return {
-        fontChar: String.fromCharCode(fontCharCode),
-        unicode: unicodeChars,
-        width: width,
-        disabled: disabled,
-        operatorList: operatorList
-      };
-    },
-
-    charsToGlyphs: function Font_charsToGlyphs(chars) {
-      var charsCache = this.charsCache;
-      var glyphs;
-
-      // if we translated this string before, just grab it from the cache
-      if (charsCache) {
-        glyphs = charsCache[chars];
-        if (glyphs)
-          return glyphs;
-      }
-
-      // lazily create the translation cache
-      if (!charsCache)
-        charsCache = this.charsCache = Object.create(null);
-
-      glyphs = [];
-
-      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
-        // correct byte encoding according to the PDF spec
-        var length = chars.length - 1; // looping over two bytes at a time so
-                                       // loop should never end on the last byte
-        for (var i = 0; i < length; i++) {
-          var charcode = int16([chars.charCodeAt(i++), chars.charCodeAt(i)]);
-          var glyph = this.charToGlyph(charcode);
-          glyphs.push(glyph);
-          // placing null after each word break charcode (ASCII SPACE)
-          if (charcode == 0x20)
-            glyphs.push(null);
-        }
-      }
-      else {
-        for (var i = 0, ii = chars.length; i < ii; ++i) {
-          var charcode = chars.charCodeAt(i);
-          var glyph = this.charToGlyph(charcode);
-          glyphs.push(glyph);
-          if (charcode == 0x20)
-            glyphs.push(null);
-        }
-      }
-
-      // Enter the translated string into the cache
-      return (charsCache[chars] = glyphs);
-    }
-  };
-
-  return Font;
-})();
-
-/*
- * Type1Parser encapsulate the needed code for parsing a Type1 font
- * program. Some of its logic depends on the Type2 charstrings
- * structure.
- */
-var Type1Parser = function type1Parser() {
-  /*
-   * Decrypt a Sequence of Ciphertext Bytes to Produce the Original Sequence
-   * of Plaintext Bytes. The function took a key as a parameter which can be
-   * for decrypting the eexec block of for decoding charStrings.
-   */
-  var kEexecEncryptionKey = 55665;
-  var kCharStringsEncryptionKey = 4330;
-
-  function decrypt(stream, key, discardNumber) {
-    var r = key, c1 = 52845, c2 = 22719;
-    var decryptedString = [];
-
-    var value = '';
-    var count = stream.length;
-    for (var i = 0; i < count; i++) {
-      value = stream[i];
-      decryptedString[i] = value ^ (r >> 8);
-      r = ((value + r) * c1 + c2) & ((1 << 16) - 1);
-    }
-    return decryptedString.slice(discardNumber);
-  }
-
-  /*
-   * CharStrings are encoded following the the CharString Encoding sequence
-   * describe in Chapter 6 of the "Adobe Type1 Font Format" specification.
-   * The value in a byte indicates a command, a number, or subsequent bytes
-   * that are to be interpreted in a special way.
-   *
-   * CharString Number Encoding:
-   *  A CharString byte containing the values from 32 through 255 inclusive
-   *  indicate an integer. These values are decoded in four ranges.
-   *
-   * 1. A CharString byte containing a value, v, between 32 and 246 inclusive,
-   * indicate the integer v - 139. Thus, the integer values from -107 through
-   * 107 inclusive may be encoded in single byte.
-   *
-   * 2. A CharString byte containing a value, v, between 247 and 250 inclusive,
-   * indicates an integer involving the next byte, w, according to the formula:
-   * [(v - 247) x 256] + w + 108
-   *
-   * 3. A CharString byte containing a value, v, between 251 and 254 inclusive,
-   * indicates an integer involving the next byte, w, according to the formula:
-   * -[(v - 251) * 256] - w - 108
-   *
-   * 4. A CharString containing the value 255 indicates that the next 4 bytes
-   * are a two complement signed integer. The first of these bytes contains the
-   * highest order bits, the second byte contains the next higher order bits
-   * and the fourth byte contain the lowest order bits.
-   *
-   *
-   * CharString Command Encoding:
-   *  CharStrings commands are encoded in 1 or 2 bytes.
-   *
-   *  Single byte commands are encoded in 1 byte that contains a value between
-   *  0 and 31 inclusive.
-   *  If a command byte contains the value 12, then the value in the next byte
-   *  indicates a command. This "escape" mechanism allows many extra commands
-   * to be encoded and this encoding technique helps to minimize the length of
-   * the charStrings.
-   */
-  var charStringDictionary = {
-    '1': 'hstem',
-    '3': 'vstem',
-    '4': 'vmoveto',
-    '5': 'rlineto',
-    '6': 'hlineto',
-    '7': 'vlineto',
-    '8': 'rrcurveto',
-
-    // closepath is a Type1 command that do not take argument and is useless
-    // in Type2 and it can simply be ignored.
-    '9': null, // closepath
-
-    '10': 'callsubr',
-
-    // return is normally used inside sub-routines to tells to the execution
-    // flow that it can be back to normal.
-    // During the translation process Type1 charstrings will be flattened and
-    // sub-routines will be embedded directly into the charstring directly, so
-    // this can be ignored safely.
-    '11': 'return',
-
-    '12': {
-      // dotsection is a Type1 command to specify some hinting feature for dots
-      // that do not take a parameter and it can safely be ignored for Type2.
-      '0': null, // dotsection
-
-      // [vh]stem3 are Type1 only and Type2 supports [vh]stem with multiple
-      // parameters, so instead of returning [vh]stem3 take a shortcut and
-      // return [vhstem] instead.
-      '1': 'vstem',
-      '2': 'hstem',
-
-      // Type1 only command with command not (yet) built-in ,throw an error
-      '6': -1, // seac
-      '7': -1, // sbw
-
-      '11': 'sub',
-      '12': 'div',
-
-      // callothersubr is a mechanism to make calls on the postscript
-      // interpreter, this is not supported by Type2 charstring but hopefully
-      // most of the default commands can be ignored safely.
-      '16': 'callothersubr',
-
-      '17': 'pop',
-
-      // setcurrentpoint sets the current point to x, y without performing a
-      // moveto (this is a one shot positionning command). This is used only
-      // with the return of an OtherSubrs call.
-      // TODO Implement the OtherSubrs charstring embedding and replace this
-      // call by a no-op, like 2 'pop' commands for example.
-      '33': null // setcurrentpoint
-    },
-    '13': 'hsbw',
-    '14': 'endchar',
-    '21': 'rmoveto',
-    '22': 'hmoveto',
-    '30': 'vhcurveto',
-    '31': 'hvcurveto'
-  };
-
-  var kEscapeCommand = 12;
-
-  function decodeCharString(array) {
-    var charstring = [];
-    var lsb = 0;
-    var width = 0;
-    var flexState = 0;
-
-    var value = '';
-    var count = array.length;
-    for (var i = 0; i < count; i++) {
-      value = array[i];
-
-      if (value < 32) {
-        var command = null;
-        if (value == kEscapeCommand) {
-          var escape = array[++i];
-
-          // TODO Clean this code
-          if (escape == 16) {
-            var index = charstring.pop();
-            var argc = charstring.pop();
-            for (var j = 0; j < argc; j++)
-              charstring.push('drop');
-
-            // If the flex mechanism is not used in a font program, Adobe
-            // states that entries 0, 1 and 2 can simply be replaced by
-            // {}, which means that we can simply ignore them.
-            if (index < 3) {
-              continue;
-            }
-
-            // This is the same things about hint replacement, if it is not used
-            // entry 3 can be replaced by {3}
-            // TODO support hint replacment
-            if (index == 3) {
-              charstring.push(3);
-              i++;
-              continue;
-            }
-          } else if (escape == 17 || escape == 33) {
-            // pop or setcurrentpoint commands can be ignored
-            // since we are not doing callothersubr
-            continue;
-          } else if (!kHintingEnabled && (escape == 1 || escape == 2)) {
-            charstring.push('drop', 'drop', 'drop', 'drop', 'drop', 'drop');
-            continue;
-          }
-
-          command = charStringDictionary['12'][escape];
-        } else {
-          // TODO Clean this code
-          if (value == 13) { // hsbw
-            if (charstring.length == 2) {
-              lsb = charstring[0];
-              width = charstring[1];
-              charstring.splice(0, 1);
-            } else if (charstring.length == 4 && charstring[3] == 'div') {
-              lsb = charstring[0];
-              width = charstring[1] / charstring[2];
-              charstring.splice(0, 1);
-            } else if (charstring.length == 4 && charstring[2] == 'div') {
-              lsb = charstring[0] / charstring[1];
-              width = charstring[3];
-              charstring.splice(0, 3);
-            } else {
-              error('Unsupported hsbw format: ' + charstring);
-            }
-
-            charstring.push(lsb, 'hmoveto');
-            continue;
-          } else if (value == 10) { // callsubr
-            if (charstring[charstring.length - 1] < 3) { // subr #0..2
-              var subrNumber = charstring.pop();
-              switch (subrNumber) {
-                case 1:
-                  flexState = 1; // prepare for flex coordinates
-                  break;
-                case 2:
-                  flexState = 2; // flex in progress
-                  break;
-                case 0:
-                  // type2 flex command does not need final coords
-                  charstring.push('exch', 'drop', 'exch', 'drop');
-                  charstring.push('flex');
-                  flexState = 0;
-                  break;
-              }
-              continue;
-            }
-          } else if (value == 21 && flexState > 0) {
-            if (flexState > 1)
-              continue; // ignoring rmoveto
-            value = 5; // first segment replacing with rlineto
-          } else if (!kHintingEnabled && (value == 1 || value == 3)) {
-            charstring.push('drop', 'drop');
-            continue;
-          }
-          command = charStringDictionary[value];
-        }
-
-        // Some charstring commands are meaningless in Type2 and will return
-        // a null, let's just ignored them
-        if (!command && i < count) {
-          continue;
-        } else if (!command) {
-          break;
-        } else if (command == -1) {
-          warn('Support for Type1 command ' + value +
-                ' (' + escape + ') is not implemented in charstring: ' +
-                charstring);
-          if (value == 12) {
-            // we know how to ignore only some the Type1 commands
-            switch (escape) {
-              case 7:
-                charstring.push('drop', 'drop', 'drop', 'drop');
-                continue;
-              case 8:
-                charstring.push('drop');
-                continue;
-            }
-          }
-        }
-
-        value = command;
-      } else if (value <= 246) {
-        value = value - 139;
-      } else if (value <= 250) {
-        value = ((value - 247) * 256) + array[++i] + 108;
-      } else if (value <= 254) {
-        value = -((value - 251) * 256) - array[++i] - 108;
-      } else {
-        value = (array[++i] & 0xff) << 24 | (array[++i] & 0xff) << 16 |
-                (array[++i] & 0xff) << 8 | (array[++i] & 0xff) << 0;
-      }
-
-      charstring.push(value);
-    }
-
-    return { charstring: charstring, width: width, lsb: lsb };
-  }
-
-  /*
-   * Returns an object containing a Subrs array and a CharStrings
-   * array extracted from and eexec encrypted block of data
-   */
-  function readNumberArray(str, index) {
-    var start = index;
-    while (str[index++] != '[')
-      start++;
-    start++;
-
-    var count = 0;
-    while (str[index++] != ']')
-      count++;
-
-    str = str.substr(start, count);
-
-    str = str.trim();
-    // Remove adjacent spaces
-    str = str.replace(/\s+/g, ' ');
-
-    var array = str.split(' ');
-    for (var i = 0, ii = array.length; i < ii; i++)
-      array[i] = parseFloat(array[i] || 0);
-    return array;
-  }
-
-  function readNumber(str, index) {
-    while (str[index] == ' ')
-      index++;
-
-    var start = index;
-
-    var count = 0;
-    while (str[index++] != ' ')
-      count++;
-
-    return parseFloat(str.substr(start, count) || 0);
-  }
-
-  function isSeparator(c) {
-    return c == ' ' || c == '\n' || c == '\x0d';
-  }
-
-  this.extractFontProgram = function Type1Parser_extractFontProgram(stream) {
-    var eexec = decrypt(stream, kEexecEncryptionKey, 4);
-    var eexecStr = '';
-    for (var i = 0, ii = eexec.length; i < ii; i++)
-      eexecStr += String.fromCharCode(eexec[i]);
-
-    var glyphsSection = false, subrsSection = false;
-    var program = {
-      subrs: [],
-      charstrings: [],
-      properties: {
-        'privateData': {
-          'lenIV': 4
-        }
-      }
-    };
-
-    var glyph = '';
-    var token = '';
-    var length = 0;
-
-    var c = '';
-    var count = eexecStr.length;
-    for (var i = 0; i < count; i++) {
-      var getToken = function getToken() {
-        while (i < count && isSeparator(eexecStr[i]))
-          ++i;
-
-        var token = '';
-        while (i < count && !isSeparator(eexecStr[i]))
-          token += eexecStr[i++];
-
-        return token;
-      };
-      var c = eexecStr[i];
-
-      if ((glyphsSection || subrsSection) &&
-          (token == 'RD' || token == '-|')) {
-        i++;
-        var data = eexec.slice(i, i + length);
-        var lenIV = program.properties.privateData['lenIV'];
-        var encoded = decrypt(data, kCharStringsEncryptionKey, lenIV);
-        var str = decodeCharString(encoded);
-
-        if (glyphsSection) {
-          program.charstrings.push({
-            glyph: glyph,
-            data: str.charstring,
-            lsb: str.lsb,
-            width: str.width
-          });
-        } else {
-          program.subrs.push(str.charstring);
-        }
-        i += length;
-        token = '';
-      } else if (isSeparator(c)) {
-        length = parseInt(token, 10);
-        token = '';
-      } else {
-        token += c;
-        if (!glyphsSection) {
-          switch (token) {
-            case '/CharString':
-              glyphsSection = true;
-              break;
-            case '/Subrs':
-              ++i;
-              var num = parseInt(getToken(), 10);
-              getToken(); // read in 'array'
-              for (var j = 0; j < num; ++j) {
-                var t = getToken(); // read in 'dup'
-                if (t == 'ND' || t == '|-' || t == 'noaccess')
-                  break;
-                var index = parseInt(getToken(), 10);
-                if (index > j)
-                  j = index;
-                var length = parseInt(getToken(), 10);
-                getToken(); // read in 'RD'
-                var data = eexec.slice(i + 1, i + 1 + length);
-                var lenIV = program.properties.privateData['lenIV'];
-                var encoded = decrypt(data, kCharStringsEncryptionKey, lenIV);
-                var str = decodeCharString(encoded);
-                i = i + 1 + length;
-                t = getToken(); // read in 'NP'
-                if (t == 'noaccess')
-                  getToken(); // read in 'put'
-                program.subrs[index] = str.charstring;
-              }
-              break;
-            case '/BlueValues':
-            case '/OtherBlues':
-            case '/FamilyBlues':
-            case '/FamilyOtherBlues':
-            case '/StemSnapH':
-            case '/StemSnapV':
-              program.properties.privateData[token.substring(1)] =
-                readNumberArray(eexecStr, i + 1);
-              break;
-            case '/StdHW':
-            case '/StdVW':
-              program.properties.privateData[token.substring(1)] =
-                readNumberArray(eexecStr, i + 2)[0];
-              break;
-            case '/BlueShift':
-            case '/lenIV':
-            case '/BlueFuzz':
-            case '/BlueScale':
-            case '/LanguageGroup':
-            case '/ExpansionFactor':
-              program.properties.privateData[token.substring(1)] =
-                readNumber(eexecStr, i + 1);
-              break;
-          }
-        } else if (c == '/') {
-          token = glyph = '';
-          while ((c = eexecStr[++i]) != ' ')
-            glyph += c;
-        }
-      }
-    }
-
-    return program;
-  };
-
-  this.extractFontHeader = function Type1Parser_extractFontHeader(stream,
-                                                                  properties) {
-    var headerString = '';
-    for (var i = 0, ii = stream.length; i < ii; i++)
-      headerString += String.fromCharCode(stream[i]);
-
-    var token = '';
-    var count = headerString.length;
-    for (var i = 0; i < count; i++) {
-      var getToken = function getToken() {
-        var character = headerString[i];
-        while (i < count && (isSeparator(character) || character == '/'))
-          character = headerString[++i];
-
-        var token = '';
-        while (i < count && !(isSeparator(character) || character == '/')) {
-          token += character;
-          character = headerString[++i];
-        }
-
-        return token;
-      };
-
-      var c = headerString[i];
-      if (isSeparator(c)) {
-        switch (token) {
-          case '/FontMatrix':
-            var matrix = readNumberArray(headerString, i + 1);
-
-            // The FontMatrix is in unitPerEm, so make it pixels
-            for (var j = 0, jj = matrix.length; j < jj; j++)
-              matrix[j] *= 1000;
-
-            // Make the angle into the right direction
-            matrix[2] *= -1;
-
-            properties.fontMatrix = matrix;
-            break;
-          case '/Encoding':
-            var encodingArg = getToken();
-            var encoding;
-            if (!/^\d+$/.test(encodingArg)) {
-              // encoding name is specified
-              encoding = Encodings[encodingArg];
-            } else {
-              encoding = [];
-              var size = parseInt(encodingArg, 10);
-              getToken(); // read in 'array'
-
-              for (var j = 0; j < size; j++) {
-                var token = getToken();
-                if (token == 'dup') {
-                  var index = parseInt(getToken(), 10);
-                  var glyph = getToken();
-                  encoding[index] = glyph;
-                  getToken(); // read the in 'put'
-                }
-              }
-            }
-            if (!properties.hasEncoding && encoding) {
-              properties.baseEncoding = encoding;
-              break;
-            }
-            break;
-        }
-        token = '';
-      } else {
-        token += c;
-      }
-    }
-  };
-};
-
-/**
- * The CFF class takes a Type1 file and wrap it into a
- * 'Compact Font Format' which itself embed Type2 charstrings.
- */
-var CFFStandardStrings = [
-  '.notdef', 'space', 'exclam', 'quotedbl', 'numbersign', 'dollar', 'percent',
-  'ampersand', 'quoteright', 'parenleft', 'parenright', 'asterisk', 'plus',
-  'comma', 'hyphen', 'period', 'slash', 'zero', 'one', 'two', 'three', 'four',
-  'five', 'six', 'seven', 'eight', 'nine', 'colon', 'semicolon', 'less',
-  'equal', 'greater', 'question', 'at', 'A', 'B', 'C', 'D', 'E', 'F', 'G', 'H',
-  'I', 'J', 'K', 'L', 'M', 'N', 'O', 'P', 'Q', 'R', 'S', 'T', 'U', 'V', 'W',
-  'X', 'Y', 'Z', 'bracketleft', 'backslash', 'bracketright', 'asciicircum',
-  'underscore', 'quoteleft', 'a', 'b', 'c', 'd', 'e', 'f', 'g', 'h', 'i', 'j',
-  'k', 'l', 'm', 'n', 'o', 'p', 'q', 'r', 's', 't', 'u', 'v', 'w', 'x', 'y',
-  'z', 'braceleft', 'bar', 'braceright', 'asciitilde', 'exclamdown', 'cent',
-  'sterling', 'fraction', 'yen', 'florin', 'section', 'currency',
-  'quotesingle', 'quotedblleft', 'guillemotleft', 'guilsinglleft',
-  'guilsinglright', 'fi', 'fl', 'endash', 'dagger', 'daggerdbl',
-  'periodcentered', 'paragraph', 'bullet', 'quotesinglbase', 'quotedblbase',
-  'quotedblright', 'guillemotright', 'ellipsis', 'perthousand', 'questiondown',
-  'grave', 'acute', 'circumflex', 'tilde', 'macron', 'breve', 'dotaccent',
-  'dieresis', 'ring', 'cedilla', 'hungarumlaut', 'ogonek', 'caron', 'emdash',
-  'AE', 'ordfeminine', 'Lslash', 'Oslash', 'OE', 'ordmasculine', 'ae',
-  'dotlessi', 'lslash', 'oslash', 'oe', 'germandbls', 'onesuperior',
-  'logicalnot', 'mu', 'trademark', 'Eth', 'onehalf', 'plusminus', 'Thorn',
-  'onequarter', 'divide', 'brokenbar', 'degree', 'thorn', 'threequarters',
-  'twosuperior', 'registered', 'minus', 'eth', 'multiply', 'threesuperior',
-  'copyright', 'Aacute', 'Acircumflex', 'Adieresis', 'Agrave', 'Aring',
-  'Atilde', 'Ccedilla', 'Eacute', 'Ecircumflex', 'Edieresis', 'Egrave',
-  'Iacute', 'Icircumflex', 'Idieresis', 'Igrave', 'Ntilde', 'Oacute',
-  'Ocircumflex', 'Odieresis', 'Ograve', 'Otilde', 'Scaron', 'Uacute',
-  'Ucircumflex', 'Udieresis', 'Ugrave', 'Yacute', 'Ydieresis', 'Zcaron',
-  'aacute', 'acircumflex', 'adieresis', 'agrave', 'aring', 'atilde',
-  'ccedilla', 'eacute', 'ecircumflex', 'edieresis', 'egrave', 'iacute',
-  'icircumflex', 'idieresis', 'igrave', 'ntilde', 'oacute', 'ocircumflex',
-  'odieresis', 'ograve', 'otilde', 'scaron', 'uacute', 'ucircumflex',
-  'udieresis', 'ugrave', 'yacute', 'ydieresis', 'zcaron', 'exclamsmall',
-  'Hungarumlautsmall', 'dollaroldstyle', 'dollarsuperior', 'ampersandsmall',
-  'Acutesmall', 'parenleftsuperior', 'parenrightsuperior', '266 ff',
-  'onedotenleader', 'zerooldstyle', 'oneoldstyle', 'twooldstyle',
-  'threeoldstyle', 'fouroldstyle', 'fiveoldstyle', 'sixoldstyle',
-  'sevenoldstyle', 'eightoldstyle', 'nineoldstyle', 'commasuperior',
-  'threequartersemdash', 'periodsuperior', 'questionsmall', 'asuperior',
-  'bsuperior', 'centsuperior', 'dsuperior', 'esuperior', 'isuperior',
-  'lsuperior', 'msuperior', 'nsuperior', 'osuperior', 'rsuperior', 'ssuperior',
-  'tsuperior', 'ff', 'ffi', 'ffl', 'parenleftinferior', 'parenrightinferior',
-  'Circumflexsmall', 'hyphensuperior', 'Gravesmall', 'Asmall', 'Bsmall',
-  'Csmall', 'Dsmall', 'Esmall', 'Fsmall', 'Gsmall', 'Hsmall', 'Ismall',
-  'Jsmall', 'Ksmall', 'Lsmall', 'Msmall', 'Nsmall', 'Osmall', 'Psmall',
-  'Qsmall', 'Rsmall', 'Ssmall', 'Tsmall', 'Usmall', 'Vsmall', 'Wsmall',
-  'Xsmall', 'Ysmall', 'Zsmall', 'colonmonetary', 'onefitted', 'rupiah',
-  'Tildesmall', 'exclamdownsmall', 'centoldstyle', 'Lslashsmall',
-  'Scaronsmall', 'Zcaronsmall', 'Dieresissmall', 'Brevesmall', 'Caronsmall',
-  'Dotaccentsmall', 'Macronsmall', 'figuredash', 'hypheninferior',
-  'Ogoneksmall', 'Ringsmall', 'Cedillasmall', 'questiondownsmall', 'oneeighth',
-  'threeeighths', 'fiveeighths', 'seveneighths', 'onethird', 'twothirds',
-  'zerosuperior', 'foursuperior', 'fivesuperior', 'sixsuperior',
-  'sevensuperior', 'eightsuperior', 'ninesuperior', 'zeroinferior',
-  'oneinferior', 'twoinferior', 'threeinferior', 'fourinferior',
-  'fiveinferior', 'sixinferior', 'seveninferior', 'eightinferior',
-  'nineinferior', 'centinferior', 'dollarinferior', 'periodinferior',
-  'commainferior', 'Agravesmall', 'Aacutesmall', 'Acircumflexsmall',
-  'Atildesmall', 'Adieresissmall', 'Aringsmall', 'AEsmall', 'Ccedillasmall',
-  'Egravesmall', 'Eacutesmall', 'Ecircumflexsmall', 'Edieresissmall',
-  'Igravesmall', 'Iacutesmall', 'Icircumflexsmall', 'Idieresissmall',
-  'Ethsmall', 'Ntildesmall', 'Ogravesmall', 'Oacutesmall', 'Ocircumflexsmall',
-  'Otildesmall', 'Odieresissmall', 'OEsmall', 'Oslashsmall', 'Ugravesmall',
-  'Uacutesmall', 'Ucircumflexsmall', 'Udieresissmall', 'Yacutesmall',
-  'Thornsmall', 'Ydieresissmall', '001.000', '001.001', '001.002', '001.003',
-  'Black', 'Bold', 'Book', 'Light', 'Medium', 'Regular', 'Roman', 'Semibold'
-];
-
-var type1Parser = new Type1Parser();
-
-// Type1Font is also a CIDFontType0.
-var Type1Font = function Type1Font(name, file, properties) {
-  // Get the data block containing glyphs and subrs informations
-  var headerBlock = file.getBytes(properties.length1);
-  type1Parser.extractFontHeader(headerBlock, properties);
-
-  // Decrypt the data blocks and retrieve it's content
-  var eexecBlock = file.getBytes(properties.length2);
-  var data = type1Parser.extractFontProgram(eexecBlock);
-  for (var info in data.properties)
-    properties[info] = data.properties[info];
-
-  var charstrings = this.getOrderedCharStrings(data.charstrings, properties);
-  var type2Charstrings = this.getType2Charstrings(charstrings);
-  var subrs = this.getType2Subrs(data.subrs);
-
-  this.charstrings = charstrings;
-  this.data = this.wrap(name, type2Charstrings, this.charstrings,
-                        subrs, properties);
-};
-
-Type1Font.prototype = {
-  createCFFIndexHeader: function Type1Font_createCFFIndexHeader(objects,
-                                                                isByte) {
-    // First 2 bytes contains the number of objects contained into this index
-    var count = objects.length;
-
-    // If there is no object, just create an array saying that with another
-    // offset byte.
-    if (count == 0)
-      return '\x00\x00\x00';
-
-    var data = String.fromCharCode((count >> 8) & 0xFF, count & 0xff);
-
-    // Next byte contains the offset size use to reference object in the file
-    // Actually we're using 0x04 to be sure to be able to store everything
-    // without thinking of it while coding.
-    data += '\x04';
-
-    // Add another offset after this one because we need a new offset
-    var relativeOffset = 1;
-    for (var i = 0; i < count + 1; i++) {
-      data += String.fromCharCode((relativeOffset >>> 24) & 0xFF,
-                                  (relativeOffset >> 16) & 0xFF,
-                                  (relativeOffset >> 8) & 0xFF,
-                                  relativeOffset & 0xFF);
-
-      if (objects[i])
-        relativeOffset += objects[i].length;
-    }
-
-    for (var i = 0; i < count; i++) {
-      for (var j = 0, jj = objects[i].length; j < jj; j++)
-        data += isByte ? String.fromCharCode(objects[i][j] & 0xFF) :
-                objects[i][j];
-    }
-    return data;
-  },
-
-  encodeNumber: function Type1Font_encodeNumber(value) {
-    // some of the fonts has ouf-of-range values
-    // they are just arithmetic overflows
-    // make sanitizer happy
-    value |= 0;
-    if (value >= -32768 && value <= 32767) {
-      return '\x1c' +
-             String.fromCharCode((value >> 8) & 0xFF) +
-             String.fromCharCode(value & 0xFF);
-    } else {
-      return '\x1d' +
-             String.fromCharCode((value >> 24) & 0xFF) +
-             String.fromCharCode((value >> 16) & 0xFF) +
-             String.fromCharCode((value >> 8) & 0xFF) +
-             String.fromCharCode(value & 0xFF);
-    }
-  },
-
-  getOrderedCharStrings: function Type1Font_getOrderedCharStrings(glyphs,
-                                                            properties) {
-    var charstrings = [];
-    var i, length, glyphName;
-    var unusedUnicode = kCmapGlyphOffset;
-    for (i = 0, length = glyphs.length; i < length; i++) {
-      var item = glyphs[i];
-      var glyphName = item.glyph;
-      var unicode = glyphName in GlyphsUnicode ?
-        GlyphsUnicode[glyphName] : unusedUnicode++;
-      charstrings.push({
-        glyph: glyphName,
-        unicode: unicode,
-        gid: i,
-        charstring: item.data,
-        width: item.width,
-        lsb: item.lsb
-      });
-    }
-
-    charstrings.sort(function charstrings_sort(a, b) {
-      return a.unicode - b.unicode;
-    });
-    return charstrings;
-  },
-
-  getType2Charstrings: function Type1Font_getType2Charstrings(
-                                  type1Charstrings) {
-    var type2Charstrings = [];
-    var count = type1Charstrings.length;
-    for (var i = 0; i < count; i++) {
-      var charstring = type1Charstrings[i].charstring;
-      type2Charstrings.push(this.flattenCharstring(charstring.slice(),
-                                                   this.commandsMap));
-    }
-    return type2Charstrings;
-  },
-
-  getType2Subrs: function Type1Font_getType2Subrs(type1Subrs) {
-    var bias = 0;
-    var count = type1Subrs.length;
-    if (count < 1240)
-      bias = 107;
-    else if (count < 33900)
-      bias = 1131;
-    else
-      bias = 32768;
-
-    // Add a bunch of empty subrs to deal with the Type2 bias
-    var type2Subrs = [];
-    for (var i = 0; i < bias; i++)
-      type2Subrs.push([0x0B]);
-
-    for (var i = 0; i < count; i++) {
-      var subr = type1Subrs[i];
-      if (!subr)
-        subr = [0x0B];
-
-      type2Subrs.push(this.flattenCharstring(subr, this.commandsMap));
-    }
-
-    return type2Subrs;
-  },
-
-  /*
-   * Flatten the commands by interpreting the postscript code and replacing
-   * every 'callsubr', 'callothersubr' by the real commands.
-   */
-  commandsMap: {
-    'hstem': 1,
-    'vstem': 3,
-    'vmoveto': 4,
-    'rlineto': 5,
-    'hlineto': 6,
-    'vlineto': 7,
-    'rrcurveto': 8,
-    'callsubr': 10,
-    'return': 11,
-    'sub': [12, 11],
-    'div': [12, 12],
-    'exch': [12, 28],
-    'flex': [12, 35],
-    'drop' : [12, 18],
-    'endchar': 14,
-    'rmoveto': 21,
-    'hmoveto': 22,
-    'vhcurveto': 30,
-    'hvcurveto': 31
-  },
-
-  flattenCharstring: function Type1Font_flattenCharstring(charstring, map) {
-    // charstring changes size - can't cache .length in loop
-    for (var i = 0; i < charstring.length; i++) {
-      var command = charstring[i];
-      if (command.charAt) {
-        var cmd = map[command];
-        assert(cmd, 'Unknow command: ' + command);
-
-        if (isArray(cmd))
-          charstring.splice(i++, 1, cmd[0], cmd[1]);
-        else
-          charstring[i] = cmd;
-      } else {
-        // Type1 charstring use a division for number above 32000
-        if (command > 32000) {
-          var divisor = charstring[i + 1];
-          command /= divisor;
-          charstring.splice(i, 3, 28, command >> 8, command & 0xff);
-        } else {
-          charstring.splice(i, 1, 28, command >> 8, command & 0xff);
-        }
-        i += 2;
-      }
-    }
-    return charstring;
-  },
-
-  wrap: function Type1Font_wrap(name, glyphs, charstrings, subrs, properties) {
-    var fields = {
-      // major version, minor version, header size, offset size
-      'header': '\x01\x00\x04\x04',
-
-      'names': this.createCFFIndexHeader([name]),
-
-      'topDict': (function topDict(self) {
-        return function cffWrapTopDict() {
-          var header = '\x00\x01\x01\x01';
-          var dict =
-              '\xf8\x1b\x00' + // version
-              '\xf8\x1c\x01' + // Notice
-              '\xf8\x1d\x02' + // FullName
-              '\xf8\x1e\x03' + // FamilyName
-              '\xf8\x1f\x04' +  // Weight
-              '\x1c\x00\x00\x10'; // Encoding
-
-          var boundingBox = properties.bbox;
-          for (var i = 0, ii = boundingBox.length; i < ii; i++)
-            dict += self.encodeNumber(boundingBox[i]);
-          dict += '\x05'; // FontBBox;
-
-          var offset = fields.header.length +
-                       fields.names.length +
-                       (header.length + 1) +
-                       (dict.length + (4 + 4)) +
-                       fields.strings.length +
-                       fields.globalSubrs.length;
-
-          // If the offset if over 32767, encodeNumber is going to return
-          // 5 bytes to encode the position instead of 3.
-          if ((offset + fields.charstrings.length) > 32767) {
-            offset += 9;
-          } else {
-            offset += 7;
-          }
-
-          dict += self.encodeNumber(offset) + '\x0f'; // Charset
-
-          offset = offset + (glyphs.length * 2) + 1;
-          dict += self.encodeNumber(offset) + '\x11'; // Charstrings
-
-          offset = offset + fields.charstrings.length;
-          dict += self.encodeNumber(fields.privateData.length);
-          dict += self.encodeNumber(offset) + '\x12'; // Private
-
-          return header + String.fromCharCode(dict.length + 1) + dict;
-        };
-      })(this),
-
-      'strings': (function strings(self) {
-        var strings = [
-          'Version 0.11',         // Version
-          'See original notice',  // Notice
-          name,                   // FullName
-          name,                   // FamilyName
-          'Medium'                // Weight
-        ];
-        return self.createCFFIndexHeader(strings);
-      })(this),
-
-      'globalSubrs': this.createCFFIndexHeader([]),
-
-      'charset': (function charset(self) {
-        var charsetString = '\x00'; // Encoding
-
-        var count = glyphs.length;
-        for (var i = 0; i < count; i++) {
-          var index = CFFStandardStrings.indexOf(charstrings[i].glyph);
-          // Some characters like asterikmath && circlecopyrt are
-          // missing from the original strings, for the moment let's
-          // map them to .notdef and see later if it cause any
-          // problems
-          if (index == -1)
-            index = 0;
-
-          charsetString += String.fromCharCode(index >> 8, index & 0xff);
-        }
-        return charsetString;
-      })(this),
-
-      'charstrings': this.createCFFIndexHeader([[0x8B, 0x0E]].concat(glyphs),
-                                               true),
-
-      'privateData': (function cffWrapPrivate(self) {
-        var data =
-            '\x8b\x14' + // defaultWidth
-            '\x8b\x15';  // nominalWidth
-        var fieldMap = {
-          BlueValues: '\x06',
-          OtherBlues: '\x07',
-          FamilyBlues: '\x08',
-          FamilyOtherBlues: '\x09',
-          StemSnapH: '\x0c\x0c',
-          StemSnapV: '\x0c\x0d',
-          BlueShift: '\x0c\x0a',
-          BlueFuzz: '\x0c\x0b',
-          BlueScale: '\x0c\x09',
-          LanguageGroup: '\x0c\x11',
-          ExpansionFactor: '\x0c\x18'
-        };
-        for (var field in fieldMap) {
-          if (!properties.privateData.hasOwnProperty(field))
-            continue;
-          var value = properties.privateData[field];
-
-          if (isArray(value)) {
-            data += self.encodeNumber(value[0]);
-            for (var i = 1, ii = value.length; i < ii; i++)
-              data += self.encodeNumber(value[i] - value[i - 1]);
-          } else {
-            data += self.encodeNumber(value);
-          }
-          data += fieldMap[field];
-        }
-
-        data += self.encodeNumber(data.length + 4) + '\x13'; // Subrs offset
-
-        return data;
-      })(this),
-
-      'localSubrs': this.createCFFIndexHeader(subrs, true)
-    };
-    fields.topDict = fields.topDict();
-
-
-    var cff = [];
-    for (var index in fields) {
-      var field = fields[index];
-      for (var i = 0, ii = field.length; i < ii; i++)
-        cff.push(field.charCodeAt(i));
-    }
-
-    return cff;
-  }
-};
-
-var CFFFont = (function CFFFontClosure() {
-  function CFFFont(file, properties) {
-    this.properties = properties;
-
-    var parser = new CFFParser(file, properties);
-    var cff = parser.parse(true);
-    var compiler = new CFFCompiler(cff);
-    this.readExtra(cff);
-    try {
-      this.data = compiler.compile();
-    } catch (e) {
-      warn('Failed to compile font ' + properties.loadedName);
-      // There may have just been an issue with the compiler, set the data
-      // anyway and hope the font loaded.
-      this.data = file;
-    }
-  }
-
-  CFFFont.prototype = {
-    readExtra: function CFFFont_readExtra(cff) {
-      // charstrings contains info about glyphs (one element per glyph
-      // containing mappings for {unicode, width})
-      var charset = cff.charset.charset;
-      var encoding = cff.encoding ? cff.encoding.encoding : null;
-      var charstrings = this.getCharStrings(charset, encoding);
-
-      // create the mapping between charstring and glyph id
-      var glyphIds = [];
-      for (var i = 0, ii = charstrings.length; i < ii; i++)
-        glyphIds.push(charstrings[i].gid);
-
-      this.charstrings = charstrings;
-      this.glyphIds = glyphIds;
-    },
-    getCharStrings: function CFFFont_getCharStrings(charsets, encoding) {
-      var charstrings = [];
-      var unicodeUsed = [];
-      var unassignedUnicodeItems = [];
-      var inverseEncoding = [];
-      // CID fonts don't have an encoding.
-      if (encoding !== null)
-        for (var charcode in encoding)
-          inverseEncoding[encoding[charcode]] = charcode | 0;
-      else
-        inverseEncoding = charsets;
-      for (var i = 0, ii = charsets.length; i < ii; i++) {
-        var glyph = charsets[i];
-        if (glyph == '.notdef')
-          continue;
-
-        var code = inverseEncoding[i];
-        if (!code || isSpecialUnicode(code)) {
-          unassignedUnicodeItems.push(i);
-          continue;
-        }
-        charstrings.push({
-          unicode: code,
-          code: code,
-          gid: i,
-          glyph: glyph
-        });
-        unicodeUsed[code] = true;
-      }
-
-      var nextUnusedUnicode = kCmapGlyphOffset;
-      for (var j = 0, jj = unassignedUnicodeItems.length; j < jj; ++j) {
-        var i = unassignedUnicodeItems[j];
-        // giving unicode value anyway
-        while (nextUnusedUnicode in unicodeUsed)
-          nextUnusedUnicode++;
-        var unicode = nextUnusedUnicode++;
-        charstrings.push({
-          unicode: unicode,
-          code: inverseEncoding[i] || 0,
-          gid: i,
-          glyph: charsets[i]
-        });
-      }
-
-      // sort the array by the unicode value (again)
-      charstrings.sort(function getCharStringsSort(a, b) {
-        return a.unicode - b.unicode;
-      });
-      return charstrings;
-    }
-  };
-
-  return CFFFont;
-})();
-
-var CFFParser = (function CFFParserClosure() {
-  function CFFParser(file, properties) {
-    this.bytes = file.getBytes();
-    this.properties = properties;
-  }
-  CFFParser.prototype = {
-    parse: function CFFParser_parse(normalizeCIDData) {
-      var properties = this.properties;
-      var cff = new CFF();
-      this.cff = cff;
-
-      // The first five sections must be in order, all the others are reached
-      // via offsets contained in one of the below.
-      var header = this.parseHeader();
-      var nameIndex = this.parseIndex(header.endPos);
-      var topDictIndex = this.parseIndex(nameIndex.endPos);
-      var stringIndex = this.parseIndex(topDictIndex.endPos);
-      var globalSubrIndex = this.parseIndex(stringIndex.endPos);
-
-      var topDictParsed = this.parseDict(topDictIndex.obj.get(0));
-      var topDict = this.createDict(CFFTopDict, topDictParsed, cff.strings);
-
-      cff.header = header.obj;
-      cff.names = this.parseNameIndex(nameIndex.obj);
-      cff.strings = this.parseStringIndex(stringIndex.obj);
-      cff.topDict = topDict;
-      cff.globalSubrIndex = globalSubrIndex.obj;
-
-      this.parsePrivateDict(cff.topDict);
-
-      cff.isCIDFont = topDict.hasName('ROS');
-
-      var charStringOffset = topDict.getByName('CharStrings');
-      cff.charStrings = this.parseCharStrings(charStringOffset);
-
-      var charset, encoding;
-      if (cff.isCIDFont) {
-        var fdArrayIndex = this.parseIndex(topDict.getByName('FDArray')).obj;
-        for (var i = 0, ii = fdArrayIndex.count; i < ii; ++i) {
-          var dictRaw = fdArrayIndex.get(i);
-          var fontDict = this.createDict(CFFTopDict, this.parseDict(dictRaw),
-                                         cff.strings);
-          this.parsePrivateDict(fontDict);
-          cff.fdArray.push(fontDict);
-        }
-        // cid fonts don't have an encoding
-        encoding = null;
-        charset = this.parseCharsets(topDict.getByName('charset'),
-                                     cff.charStrings.count, cff.strings, true);
-        cff.fdSelect = this.parseFDSelect(topDict.getByName('FDSelect'),
-                                             cff.charStrings.count);
-      } else {
-        charset = this.parseCharsets(topDict.getByName('charset'),
-                                     cff.charStrings.count, cff.strings, false);
-        encoding = this.parseEncoding(topDict.getByName('Encoding'),
-                                      properties,
-                                      cff.strings, charset.charset);
-      }
-      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() {
-      var bytes = this.bytes;
-      var offset = 0;
-
-      while (bytes[offset] != 1)
-        ++offset;
-
-      if (offset != 0) {
-        info('cff data is shifted');
-        bytes = bytes.subarray(offset);
-        this.bytes = bytes;
-      }
-      var major = bytes[0];
-      var minor = bytes[1];
-      var hdrSize = bytes[2];
-      var offSize = bytes[3];
-      var header = new CFFHeader(major, minor, hdrSize, offSize);
-      return {obj: header, endPos: hdrSize};
-    },
-    parseDict: function CFFParser_parseDict(dict) {
-      var pos = 0;
-
-      function parseOperand() {
-        var value = dict[pos++];
-        if (value === 30) {
-          return parseFloatOperand(pos);
-        } else if (value === 28) {
-          value = dict[pos++];
-          value = (value << 8) | dict[pos++];
-          return value;
-        } else if (value === 29) {
-          value = dict[pos++];
-          value = (value << 8) | dict[pos++];
-          value = (value << 8) | dict[pos++];
-          value = (value << 8) | dict[pos++];
-          return value;
-        } else if (value >= 32 && value <= 246) {
-          return value - 139;
-        } else if (value >= 247 && value <= 250) {
-          return ((value - 247) * 256) + dict[pos++] + 108;
-        } else if (value >= 251 && value <= 254) {
-          return -((value - 251) * 256) - dict[pos++] - 108;
-        } else {
-          error('255 is not a valid DICT command');
-        }
-        return -1;
-      }
-
-      function parseFloatOperand() {
-        var str = '';
-        var eof = 15;
-        var lookup = ['0', '1', '2', '3', '4', '5', '6', '7', '8',
-            '9', '.', 'E', 'E-', null, '-'];
-        var length = dict.length;
-        while (pos < length) {
-          var b = dict[pos++];
-          var b1 = b >> 4;
-          var b2 = b & 15;
-
-          if (b1 == eof)
-            break;
-          str += lookup[b1];
-
-          if (b2 == eof)
-            break;
-          str += lookup[b2];
-        }
-        return parseFloat(str);
-      }
-
-      var operands = [];
-      var entries = [];
-
-      var pos = 0;
-      var end = dict.length;
-      while (pos < end) {
-        var b = dict[pos];
-        if (b <= 21) {
-          if (b === 12)
-            b = (b << 8) | dict[++pos];
-          entries.push([b, operands]);
-          operands = [];
-          ++pos;
-        } else {
-          operands.push(parseOperand());
-        }
-      }
-      return entries;
-    },
-    parseIndex: function CFFParser_parseIndex(pos) {
-      var cffIndex = new CFFIndex();
-      var bytes = this.bytes;
-      var count = (bytes[pos++] << 8) | bytes[pos++];
-      var offsets = [];
-      var start = pos;
-      var end = pos;
-
-      if (count != 0) {
-        var offsetSize = bytes[pos++];
-        // add 1 for offset to determine size of last object
-        var startPos = pos + ((count + 1) * offsetSize) - 1;
-
-        for (var i = 0, ii = count + 1; i < ii; ++i) {
-          var offset = 0;
-          for (var j = 0; j < offsetSize; ++j) {
-            offset <<= 8;
-            offset += bytes[pos++];
-          }
-          offsets.push(startPos + offset);
-        }
-        end = offsets[count];
-      }
-      for (var i = 0, ii = offsets.length - 1; i < ii; ++i) {
-        var offsetStart = offsets[i];
-        var offsetEnd = offsets[i + 1];
-        cffIndex.add(bytes.subarray(offsetStart, offsetEnd));
-      }
-      return {obj: cffIndex, endPos: end};
-    },
-    parseNameIndex: function CFFParser_parseNameIndex(index) {
-      var names = [];
-      for (var i = 0, ii = index.count; i < ii; ++i) {
-        var name = index.get(i);
-        // OTS doesn't allow names to be over 127 characters.
-        var length = Math.min(name.length, 127);
-        var data = [];
-        // OTS also only permits certain characters in the name.
-        for (var j = 0; j < length; ++j) {
-          var c = name[j];
-          if (j === 0 && c === 0) {
-            data[j] = c;
-            continue;
-          }
-          if ((c < 33 || c > 126) || c === 91 /* [ */ || c === 93 /* ] */ ||
-              c === 40 /* ( */ || c === 41 /* ) */ || c === 123 /* { */ ||
-              c === 125 /* } */ || c === 60 /* < */ || c === 62 /* > */ ||
-              c === 47 /* / */ || c === 37 /* % */) {
-            data[j] = 95;
-            continue;
-          }
-          data[j] = c;
-        }
-        names.push(String.fromCharCode.apply(null, data));
-      }
-      return names;
-    },
-    parseStringIndex: function CFFParser_parseStringIndex(index) {
-      var strings = new CFFStrings();
-      for (var i = 0, ii = index.count; i < ii; ++i) {
-        var data = index.get(i);
-        strings.add(String.fromCharCode.apply(null, data));
-      }
-      return strings;
-    },
-    createDict: function CFFParser_createDict(type, dict, strings) {
-      var cffDict = new type(strings);
-      var types = cffDict.types;
-
-      for (var i = 0, ii = dict.length; i < ii; ++i) {
-        var pair = dict[i];
-        var key = pair[0];
-        var value = pair[1];
-        cffDict.setByKey(key, value);
-      }
-      return cffDict;
-    },
-    parseCharStrings: function CFFParser_parseCharStrings(charStringOffset) {
-      var charStrings = this.parseIndex(charStringOffset).obj;
-      // The CFF specification state that the 'dotsection' command
-      // (12, 0) is deprecated and treated as a no-op, but all Type2
-      // charstrings processors should support them. Unfortunately
-      // the font sanitizer don't. As a workaround the sequence (12, 0)
-      // is replaced by a useless (0, hmoveto).
-      var count = charStrings.count;
-      for (var i = 0; i < count; i++) {
-        var charstring = charStrings.get(i);
-
-        var data = charstring;
-        var length = data.length;
-        for (var j = 0; j <= length; j) {
-          var value = data[j++];
-          if (value == 12 && data[j++] == 0) {
-              data[j - 2] = 139;
-              data[j - 1] = 22;
-          } else if (value === 28) {
-            j += 2;
-          } else if (value >= 247 && value <= 254) {
-            j++;
-          } else if (value == 255) {
-            j += 4;
-          }
-        }
-      }
-      return charStrings;
-    },
-    parsePrivateDict: function CFFParser_parsePrivateDict(parentDict) {
-      // no private dict, do nothing
-      if (!parentDict.hasName('Private'))
-        return;
-      var privateOffset = parentDict.getByName('Private');
-      // make sure the params are formatted correctly
-      if (!isArray(privateOffset) || privateOffset.length !== 2) {
-        parentDict.removeByName('Private');
-        return;
-      }
-      var size = privateOffset[0];
-      var offset = privateOffset[1];
-      // remove empty dicts or ones that refer to invalid location
-      if (size === 0 || offset >= this.bytes.length) {
-        parentDict.removeByName('Private');
-        return;
-      }
-
-      var privateDictEnd = offset + size;
-      var dictData = this.bytes.subarray(offset, privateDictEnd);
-      var dict = this.parseDict(dictData);
-      var privateDict = this.createDict(CFFPrivateDict, dict,
-                                        parentDict.strings);
-      parentDict.privateDict = privateDict;
-
-      // Parse the Subrs index also since it's relative to the private dict.
-      if (!privateDict.getByName('Subrs'))
-        return;
-      var subrsOffset = privateDict.getByName('Subrs');
-      var relativeOffset = offset + subrsOffset;
-      // Validate the offset.
-      if (subrsOffset === 0 || relativeOffset >= this.bytes.length) {
-        privateDict.removeByName('Subrs');
-        return;
-      }
-      var subrsIndex = this.parseIndex(relativeOffset);
-      privateDict.subrsIndex = subrsIndex.obj;
-    },
-    parseCharsets: function CFFParser_parseCharsets(pos, length, strings, cid) {
-      if (pos == 0) {
-        return new CFFCharset(true, CFFCharsetPredefinedTypes.ISO_ADOBE,
-                              ISOAdobeCharset);
-      } else if (pos == 1) {
-        return new CFFCharset(true, CFFCharsetPredefinedTypes.EXPERT,
-                              ExpertCharset);
-      } else if (pos == 2) {
-        return new CFFCharset(true, CFFCharsetPredefinedTypes.EXPERT_SUBSET,
-                              ExpertSubsetCharset);
-      }
-
-      var bytes = this.bytes;
-      var start = pos;
-      var format = bytes[pos++];
-      var charset = ['.notdef'];
-
-      // subtract 1 for the .notdef glyph
-      length -= 1;
-
-      switch (format) {
-        case 0:
-          for (var i = 0; i < length; i++) {
-            var id = (bytes[pos++] << 8) | bytes[pos++];
-            charset.push(cid ? id : strings.get(id));
-          }
-          break;
-        case 1:
-          while (charset.length <= length) {
-            var id = (bytes[pos++] << 8) | bytes[pos++];
-            var count = bytes[pos++];
-            for (var i = 0; i <= count; i++)
-              charset.push(cid ? id++ : strings.get(id++));
-          }
-          break;
-        case 2:
-          while (charset.length <= length) {
-            var id = (bytes[pos++] << 8) | bytes[pos++];
-            var count = (bytes[pos++] << 8) | bytes[pos++];
-            for (var i = 0; i <= count; i++)
-              charset.push(cid ? id++ : strings.get(id++));
-          }
-          break;
-        default:
-          error('Unknown charset format');
-      }
-      // Raw won't be needed if we actually compile the charset.
-      var end = pos;
-      var raw = bytes.subarray(start, end);
-
-      return new CFFCharset(false, format, charset, raw);
-    },
-    parseEncoding: function CFFParser_parseEncoding(pos,
-                                                    properties,
-                                                    strings,
-                                                    charset) {
-      var encoding = {};
-      var bytes = this.bytes;
-      var predefined = false;
-      var hasSupplement = false;
-      var format;
-      var raw = null;
-
-      function readSupplement() {
-        var supplementsCount = bytes[pos++];
-        for (var i = 0; i < supplementsCount; i++) {
-          var code = bytes[pos++];
-          var sid = (bytes[pos++] << 8) + (bytes[pos++] & 0xff);
-          encoding[code] = properties.differences.indexOf(strings.get(sid));
-        }
-      }
-
-      if (pos == 0 || pos == 1) {
-        predefined = true;
-        format = pos;
-        var gid = 1;
-        var baseEncoding = pos ? Encodings.ExpertEncoding :
-                                 Encodings.StandardEncoding;
-        for (var i = 0, ii = charset.length; i < ii; i++) {
-          var index = baseEncoding.indexOf(charset[i]);
-          if (index != -1)
-            encoding[index] = gid++;
-        }
-      } else {
-        var dataStart = pos;
-        var format = bytes[pos++];
-        switch (format & 0x7f) {
-          case 0:
-            var glyphsCount = bytes[pos++];
-            for (var i = 1; i <= glyphsCount; i++)
-              encoding[bytes[pos++]] = i;
-            break;
-
-          case 1:
-            var rangesCount = bytes[pos++];
-            var gid = 1;
-            for (var i = 0; i < rangesCount; i++) {
-              var start = bytes[pos++];
-              var left = bytes[pos++];
-              for (var j = start; j <= start + left; j++)
-                encoding[j] = gid++;
-            }
-            break;
-
-          default:
-            error('Unknow encoding format: ' + format + ' in CFF');
-            break;
-        }
-        var dataEnd = pos;
-        if (format & 0x80) {
-          // The font sanitizer does not support CFF encoding with a
-          // supplement, since the encoding is not really used to map
-          // between gid to glyph, let's overwrite what is declared in
-          // the top dictionary to let the sanitizer think the font use
-          // StandardEncoding, that's a lie but that's ok.
-          bytes[dataStart] &= 0x7f;
-          readSupplement();
-          hasSupplement = true;
-        }
-        raw = bytes.subarray(dataStart, dataEnd);
-      }
-      format = format & 0x7f;
-      return new CFFEncoding(predefined, format, encoding, raw);
-    },
-    parseFDSelect: function CFFParser_parseFDSelect(pos, length) {
-      var start = pos;
-      var bytes = this.bytes;
-      var format = bytes[pos++];
-      var fdSelect = [];
-      switch (format) {
-        case 0:
-          for (var i = 0; i < length; ++i) {
-            var id = bytes[pos++];
-            fdSelect.push(id);
-          }
-          break;
-        case 3:
-          var rangesCount = (bytes[pos++] << 8) | bytes[pos++];
-          for (var i = 0; i < rangesCount; ++i) {
-            var first = (bytes[pos++] << 8) | bytes[pos++];
-            var fdIndex = bytes[pos++];
-            var next = (bytes[pos] << 8) | bytes[pos + 1];
-            for (var j = first; j < next; ++j)
-              fdSelect.push(fdIndex);
-          }
-          // Advance past the sentinel(next).
-          pos += 2;
-          break;
-        default:
-          error('Unknown fdselect format ' + format);
-          break;
-      }
-      var end = pos;
-      return new CFFFDSelect(fdSelect, bytes.subarray(start, end));
-    }
-  };
-  return CFFParser;
-})();
-
-// Compact Font Format
-var CFF = (function CFFClosure() {
-  function CFF() {
-    this.header = null;
-    this.names = [];
-    this.topDict = null;
-    this.strings = new CFFStrings();
-    this.globalSubrIndex = null;
-
-    // The following could really be per font, but since we only have one font
-    // store them here.
-    this.encoding = null;
-    this.charset = null;
-    this.charStrings = null;
-    this.fdArray = [];
-    this.fdSelect = null;
-
-    this.isCIDFont = false;
-  }
-  return CFF;
-})();
-
-var CFFHeader = (function CFFHeaderClosure() {
-  function CFFHeader(major, minor, hdrSize, offSize) {
-    this.major = major;
-    this.minor = minor;
-    this.hdrSize = hdrSize;
-    this.offSize = offSize;
-  }
-  return CFFHeader;
-})();
-
-var CFFStrings = (function CFFStringsClosure() {
-  function CFFStrings() {
-    this.strings = [];
-  }
-  CFFStrings.prototype = {
-    get: function CFFStrings_get(index) {
-      if (index >= 0 && index <= 390)
-        return CFFStandardStrings[index];
-      if (index - 391 <= this.strings.length)
-        return this.strings[index - 391];
-      return CFFStandardStrings[0];
-    },
-    add: function CFFStrings_add(value) {
-      this.strings.push(value);
-    },
-    get count() {
-      return this.strings.length;
-    }
-  };
-  return CFFStrings;
-})();
-
-var CFFIndex = (function CFFIndexClosure() {
-  function CFFIndex() {
-    this.objects = [];
-    this.length = 0;
-  }
-  CFFIndex.prototype = {
-    add: function CFFIndex_add(data) {
-      this.length += data.length;
-      this.objects.push(data);
-    },
-    get: function CFFIndex_get(index) {
-      return this.objects[index];
-    },
-    get count() {
-      return this.objects.length;
-    }
-  };
-  return CFFIndex;
-})();
-
-var CFFDict = (function CFFDictClosure() {
-  function CFFDict(tables, strings) {
-    this.keyToNameMap = tables.keyToNameMap;
-    this.nameToKeyMap = tables.nameToKeyMap;
-    this.defaults = tables.defaults;
-    this.types = tables.types;
-    this.opcodes = tables.opcodes;
-    this.order = tables.order;
-    this.strings = strings;
-    this.values = {};
-  }
-  CFFDict.prototype = {
-    // value should always be an array
-    setByKey: function CFFDict_setByKey(key, value) {
-      if (!(key in this.keyToNameMap))
-        return false;
-      // ignore empty values
-      if (value.length === 0)
-        return true;
-      var type = this.types[key];
-      // remove the array wrapping these types of values
-      if (type === 'num' || type === 'sid' || type === 'offset')
-        value = value[0];
-      this.values[key] = value;
-      return true;
-    },
-    hasName: function CFFDict_hasName(name) {
-      return this.nameToKeyMap[name] in this.values;
-    },
-    getByName: function CFFDict_getByName(name) {
-      if (!(name in this.nameToKeyMap))
-        error('Invalid dictionary name "' + name + '"');
-      var key = this.nameToKeyMap[name];
-      if (!(key in this.values))
-        return this.defaults[key];
-      return this.values[key];
-    },
-    removeByName: function CFFDict_removeByName(name) {
-      delete this.values[this.nameToKeyMap[name]];
-    }
-  };
-  CFFDict.createTables = function CFFDict_createTables(layout) {
-    var tables = {
-      keyToNameMap: {},
-      nameToKeyMap: {},
-      defaults: {},
-      types: {},
-      opcodes: {},
-      order: []
-    };
-    for (var i = 0, ii = layout.length; i < ii; ++i) {
-      var entry = layout[i];
-      var key = isArray(entry[0]) ? (entry[0][0] << 8) + entry[0][1] : entry[0];
-      tables.keyToNameMap[key] = entry[1];
-      tables.nameToKeyMap[entry[1]] = key;
-      tables.types[key] = entry[2];
-      tables.defaults[key] = entry[3];
-      tables.opcodes[key] = isArray(entry[0]) ? entry[0] : [entry[0]];
-      tables.order.push(key);
-    }
-    return tables;
-  };
-  return CFFDict;
-})();
-
-var CFFTopDict = (function CFFTopDictClosure() {
-  var layout = [
-    [[12, 30], 'ROS', ['sid', 'sid', 'num'], null],
-    [[12, 20], 'SyntheticBase', 'num', null],
-    [0, 'version', 'sid', null],
-    [1, 'Notice', 'sid', null],
-    [[12, 0], 'Copyright', 'sid', null],
-    [2, 'FullName', 'sid', null],
-    [3, 'FamilyName', 'sid', null],
-    [4, 'Weight', 'sid', null],
-    [[12, 1], 'isFixedPitch', 'num', 0],
-    [[12, 2], 'ItalicAngle', 'num', 0],
-    [[12, 3], 'UnderlinePosition', 'num', -100],
-    [[12, 4], 'UnderlineThickness', 'num', 50],
-    [[12, 5], 'PaintType', 'num', 0],
-    [[12, 6], 'CharstringType', 'num', 2],
-    [[12, 7], 'FontMatrix', ['num', 'num', 'num', 'num', 'num', 'num'],
-                            [.001, 0, 0, .001, 0, 0]],
-    [13, 'UniqueID', 'num', null],
-    [5, 'FontBBox', ['num', 'num', 'num', 'num'], [0, 0, 0, 0]],
-    [[12, 8], 'StrokeWidth', 'num', 0],
-    [14, 'XUID', 'array', null],
-    [15, 'charset', 'offset', 0],
-    [16, 'Encoding', 'offset', 0],
-    [17, 'CharStrings', 'offset', 0],
-    [18, 'Private', ['offset', 'offset'], null],
-    [[12, 21], 'PostScript', 'sid', null],
-    [[12, 22], 'BaseFontName', 'sid', null],
-    [[12, 23], 'BaseFontBlend', 'delta', null],
-    [[12, 31], 'CIDFontVersion', 'num', 0],
-    [[12, 32], 'CIDFontRevision', 'num', 0],
-    [[12, 33], 'CIDFontType', 'num', 0],
-    [[12, 34], 'CIDCount', 'num', 8720],
-    [[12, 35], 'UIDBase', 'num', null],
-    [[12, 36], 'FDArray', 'offset', null],
-    [[12, 37], 'FDSelect', 'offset', null],
-    [[12, 38], 'FontName', 'sid', null]];
-  var tables = null;
-  function CFFTopDict(strings) {
-    if (tables === null)
-      tables = CFFDict.createTables(layout);
-    CFFDict.call(this, tables, strings);
-    this.privateDict = null;
-  }
-  CFFTopDict.prototype = Object.create(CFFDict.prototype);
-  return CFFTopDict;
-})();
-
-var CFFPrivateDict = (function CFFPrivateDictClosure() {
-  var layout = [
-    [6, 'BlueValues', 'delta', null],
-    [7, 'OtherBlues', 'delta', null],
-    [8, 'FamilyBlues', 'delta', null],
-    [9, 'FamilyOtherBlues', 'delta', null],
-    [[12, 9], 'BlueScale', 'num', 0.039625],
-    [[12, 10], 'BlueShift', 'num', 7],
-    [[12, 11], 'BlueFuzz', 'num', 1],
-    [10, 'StdHW', 'num', null],
-    [11, 'StdVW', 'num', null],
-    [[12, 12], 'StemSnapH', 'delta', null],
-    [[12, 13], 'StemSnapV', 'delta', null],
-    [[12, 14], 'ForceBold', 'num', 0],
-    [[12, 17], 'LanguageGroup', 'num', 0],
-    [[12, 18], 'ExpansionFactor', 'num', 0.06],
-    [[12, 19], 'initialRandomSeed', 'num', 0],
-    [20, 'defaultWidthX', 'num', 0],
-    [21, 'nominalWidthX', 'num', 0],
-    [19, 'Subrs', 'offset', null]
-  ];
-  var tables = null;
-  function CFFPrivateDict(strings) {
-    if (tables === null)
-      tables = CFFDict.createTables(layout);
-    CFFDict.call(this, tables, strings);
-    this.subrsIndex = null;
-  }
-  CFFPrivateDict.prototype = Object.create(CFFDict.prototype);
-  return CFFPrivateDict;
-})();
-
-var CFFCharsetPredefinedTypes = {
-  ISO_ADOBE: 0,
-  EXPERT: 1,
-  EXPERT_SUBSET: 2
-};
-var CFFCharsetEmbeddedTypes = {
-  FORMAT0: 0,
-  FORMAT1: 1,
-  FORMAT2: 2
-};
-var CFFCharset = (function CFFCharsetClosure() {
-  function CFFCharset(predefined, format, charset, raw) {
-    this.predefined = predefined;
-    this.format = format;
-    this.charset = charset;
-    this.raw = raw;
-  }
-  return CFFCharset;
-})();
-
-var CFFEncodingPredefinedTypes = {
-  STANDARD: 0,
-  EXPERT: 1
-};
-var CFFCharsetEmbeddedTypes = {
-  FORMAT0: 0,
-  FORMAT1: 1
-};
-var CFFEncoding = (function CFFEncodingClosure() {
-  function CFFEncoding(predefined, format, encoding, raw) {
-    this.predefined = predefined;
-    this.format = format;
-    this.encoding = encoding;
-    this.raw = raw;
-  }
-  return CFFEncoding;
-})();
-
-var CFFFDSelect = (function CFFFDSelectClosure() {
-  function CFFFDSelect(fdSelect, raw) {
-    this.fdSelect = fdSelect;
-    this.raw = raw;
-  }
-  return CFFFDSelect;
-})();
-
-// Helper class to keep track of where an offset is within the data and helps
-// filling in that offset once it's known.
-var CFFOffsetTracker = (function CFFOffsetTrackerClosure() {
-  function CFFOffsetTracker() {
-    this.offsets = {};
-  }
-  CFFOffsetTracker.prototype = {
-    isTracking: function CFFOffsetTracker_isTracking(key) {
-      return key in this.offsets;
-    },
-    track: function CFFOffsetTracker_track(key, location) {
-      if (key in this.offsets)
-        error('Already tracking location of ' + key);
-      this.offsets[key] = location;
-    },
-    offset: function CFFOffsetTracker_offset(value) {
-      for (var key in this.offsets) {
-        this.offsets[key] += value;
-      }
-    },
-    setEntryLocation: function CFFOffsetTracker_setEntryLocation(key,
-                                                                 values,
-                                                                 output) {
-      if (!(key in this.offsets))
-        error('Not tracking location of ' + key);
-      var data = output.data;
-      var dataOffset = this.offsets[key];
-      var size = 5;
-      for (var i = 0, ii = values.length; i < ii; ++i) {
-        var offset0 = i * size + dataOffset;
-        var offset1 = offset0 + 1;
-        var offset2 = offset0 + 2;
-        var offset3 = offset0 + 3;
-        var offset4 = offset0 + 4;
-        // It's easy to screw up offsets so perform this sanity check.
-        if (data[offset0] !== 0x1d || data[offset1] !== 0 ||
-            data[offset2] !== 0 || data[offset3] !== 0 || data[offset4] !== 0)
-          error('writing to an offset that is not empty');
-        var value = values[i];
-        data[offset0] = 0x1d;
-        data[offset1] = (value >> 24) & 0xFF;
-        data[offset2] = (value >> 16) & 0xFF;
-        data[offset3] = (value >> 8) & 0xFF;
-        data[offset4] = value & 0xFF;
-      }
-    }
-  };
-  return CFFOffsetTracker;
-})();
-
-// Takes a CFF and converts it to the binary representation.
-var CFFCompiler = (function CFFCompilerClosure() {
-  function stringToArray(str) {
-    var array = [];
-    for (var i = 0, ii = str.length; i < ii; ++i)
-      array[i] = str.charCodeAt(i);
-
-    return array;
-  };
-  function CFFCompiler(cff) {
-    this.cff = cff;
-  }
-  CFFCompiler.prototype = {
-    compile: function CFFCompiler_compile() {
-      var cff = this.cff;
-      var output = {
-        data: [],
-        length: 0,
-        add: function CFFCompiler_add(data) {
-          this.data = this.data.concat(data);
-          this.length = this.data.length;
-        }
-      };
-
-      // Compile the five entries that must be in order.
-      var header = this.compileHeader(cff.header);
-      output.add(header);
-
-      var nameIndex = this.compileNameIndex(cff.names);
-      output.add(nameIndex);
-
-      var compiled = this.compileTopDicts([cff.topDict], output.length);
-      output.add(compiled.output);
-      var topDictTracker = compiled.trackers[0];
-
-      var stringIndex = this.compileStringIndex(cff.strings.strings);
-      output.add(stringIndex);
-
-      var globalSubrIndex = this.compileIndex(cff.globalSubrIndex);
-      output.add(globalSubrIndex);
-
-      // Now start on the other entries that have no specfic order.
-      if (cff.encoding && cff.topDict.hasName('Encoding')) {
-        if (cff.encoding.predefined) {
-          topDictTracker.setEntryLocation('Encoding', [cff.encoding.format],
-                                          output);
-        } else {
-          var encoding = this.compileEncoding(cff.encoding);
-          topDictTracker.setEntryLocation('Encoding', [output.length], output);
-          output.add(encoding);
-        }
-      }
-
-      if (cff.charset && cff.topDict.hasName('charset')) {
-        if (cff.charset.predefined) {
-          topDictTracker.setEntryLocation('charset', [cff.charset.format],
-                                          output);
-        } else {
-          var charset = this.compileCharset(cff.charset);
-          topDictTracker.setEntryLocation('charset', [output.length], output);
-          output.add(charset);
-        }
-      }
-
-      var charStrings = this.compileCharStrings(cff.charStrings);
-      topDictTracker.setEntryLocation('CharStrings', [output.length], output);
-      output.add(charStrings);
-
-      if (cff.isCIDFont) {
-        // For some reason FDSelect must be in front of FDArray on windows. OSX
-        // and linux don't seem to care.
-        topDictTracker.setEntryLocation('FDSelect', [output.length], output);
-        var fdSelect = this.compileFDSelect(cff.fdSelect.raw);
-        output.add(fdSelect);
-
-        var compiled = this.compileTopDicts(cff.fdArray, output.length);
-        topDictTracker.setEntryLocation('FDArray', [output.length], output);
-        output.add(compiled.output);
-        var fontDictTrackers = compiled.trackers;
-
-        this.compilePrivateDicts(cff.fdArray, fontDictTrackers, output);
-      }
-
-      this.compilePrivateDicts([cff.topDict], [topDictTracker], output);
-
-      return output.data;
-    },
-    encodeNumber: function CFFCompiler_encodeNumber(value) {
-      if (parseFloat(value) == parseInt(value) && !isNaN(value)) // isInt
-        return this.encodeInteger(value);
-      else
-        return this.encodeFloat(value);
-    },
-    encodeFloat: function CFFCompiler_encodeFloat(value) {
-      value = value.toString();
-      // Strip off the any leading zeros.
-      if (value.substr(0, 2) === '0.')
-        value = value.substr(1);
-      else if (value.substr(0, 3) === '-0.')
-        value = '-' + value.substr(2);
-      var nibbles = [];
-      for (var i = 0, ii = value.length; i < ii; ++i) {
-        var a = value.charAt(i), b = value.charAt(i + 1);
-        var nibble;
-        if (a === 'e' && b === '-') {
-          nibble = 0xc;
-          ++i;
-        } else if (a === '.') {
-          nibble = 0xa;
-        } else if (a === 'E') {
-          nibble = 0xb;
-        } else if (a === '-') {
-          nibble = 0xe;
-        } else {
-          nibble = a;
-        }
-        nibbles.push(nibble);
-      }
-      nibbles.push(0xf);
-      if (nibbles.length % 2)
-        nibbles.push(0xf);
-      var out = [30];
-      for (var i = 0, ii = nibbles.length; i < ii; i += 2)
-        out.push(nibbles[i] << 4 | nibbles[i + 1]);
-      return out;
-    },
-    encodeInteger: function CFFCompiler_encodeInteger(value) {
-      var code;
-      if (value >= -107 && value <= 107) {
-        code = [value + 139];
-      } else if (value >= 108 && value <= 1131) {
-        value = [value - 108];
-        code = [(value >> 8) + 247, value & 0xFF];
-      } else if (value >= -1131 && value <= -108) {
-        value = -value - 108;
-        code = [(value >> 8) + 251, value & 0xFF];
-      } else if (value >= -32768 && value <= 32767) {
-        code = [0x1c, (value >> 8) & 0xFF, value & 0xFF];
-      } else {
-        code = [0x1d,
-                (value >> 24) & 0xFF,
-                (value >> 16) & 0xFF,
-                (value >> 8) & 0xFF,
-                 value & 0xFF];
-      }
-      return code;
-    },
-    compileHeader: function CFFCompiler_compileHeader(header) {
-      return [
-        header.major,
-        header.minor,
-        header.hdrSize,
-        header.offSize
-      ];
-    },
-    compileNameIndex: function CFFCompiler_compileNameIndex(names) {
-      var nameIndex = new CFFIndex();
-      for (var i = 0, ii = names.length; i < ii; ++i)
-        nameIndex.add(stringToArray(names[i]));
-      return this.compileIndex(nameIndex);
-    },
-    compileTopDicts: function CFFCompiler_compileTopDicts(dicts, length) {
-      var fontDictTrackers = [];
-      var fdArrayIndex = new CFFIndex();
-      for (var i = 0, ii = dicts.length; i < ii; ++i) {
-        var fontDict = dicts[i];
-        var fontDictTracker = new CFFOffsetTracker();
-        var fontDictData = this.compileDict(fontDict, fontDictTracker);
-        fontDictTrackers.push(fontDictTracker);
-        fdArrayIndex.add(fontDictData);
-        fontDictTracker.offset(length);
-      }
-      fdArrayIndex = this.compileIndex(fdArrayIndex, fontDictTrackers);
-      return {
-        trackers: fontDictTrackers,
-        output: fdArrayIndex
-      };
-    },
-    compilePrivateDicts: function CFFCompiler_compilePrivateDicts(dicts,
-                                                                  trackers,
-                                                                  output) {
-      for (var i = 0, ii = dicts.length; i < ii; ++i) {
-        var fontDict = dicts[i];
-        if (!fontDict.privateDict || !fontDict.hasName('Private'))
-          continue;
-        var privateDict = fontDict.privateDict;
-        var privateDictTracker = new CFFOffsetTracker();
-        var privateDictData = this.compileDict(privateDict, privateDictTracker);
-
-        privateDictTracker.offset(output.length);
-        trackers[i].setEntryLocation('Private',
-                                     [privateDictData.length, output.length],
-                                     output);
-        output.add(privateDictData);
-
-        if (privateDict.subrsIndex && privateDict.hasName('Subrs')) {
-          var subrs = this.compileIndex(privateDict.subrsIndex);
-          privateDictTracker.setEntryLocation('Subrs', [privateDictData.length],
-                                              output);
-          output.add(subrs);
-        }
-      }
-    },
-    compileDict: function CFFCompiler_compileDict(dict, offsetTracker) {
-      var out = [];
-      // The dictionary keys must be in a certain order.
-      var order = dict.order;
-      for (var i = 0; i < order.length; ++i) {
-        var key = order[i];
-        if (!(key in dict.values))
-          continue;
-        var values = dict.values[key];
-        var types = dict.types[key];
-        if (!isArray(types)) types = [types];
-        if (!isArray(values)) values = [values];
-
-        // Remove any empty dict values.
-        if (values.length === 0)
-          continue;
-
-        for (var j = 0, jj = types.length; j < jj; ++j) {
-          var type = types[j];
-          var value = values[j];
-          switch (type) {
-            case 'num':
-            case 'sid':
-              out = out.concat(this.encodeNumber(value));
-              break;
-            case 'offset':
-              // For offsets we just insert a 32bit integer so we don't have to
-              // deal with figuring out the length of the offset when it gets
-              // replaced later on by the compiler.
-              var name = dict.keyToNameMap[key];
-              // Some offsets have the offset and the length, so just record the
-              // position of the first one.
-              if (!offsetTracker.isTracking(name))
-                offsetTracker.track(name, out.length);
-              out = out.concat([0x1d, 0, 0, 0, 0]);
-              break;
-            case 'array':
-            case 'delta':
-              out = out.concat(this.encodeNumber(value));
-              for (var k = 1, kk = values.length; k < kk; ++k)
-                out = out.concat(this.encodeNumber(values[k]));
-              break;
-            default:
-              error('Unknown data type of ' + type);
-              break;
-          }
-        }
-        out = out.concat(dict.opcodes[key]);
-      }
-      return out;
-    },
-    compileStringIndex: function CFFCompiler_compileStringIndex(strings) {
-      var stringIndex = new CFFIndex();
-      for (var i = 0, ii = strings.length; i < ii; ++i)
-        stringIndex.add(stringToArray(strings[i]));
-      return this.compileIndex(stringIndex);
-    },
-    compileGlobalSubrIndex: function CFFCompiler_compileGlobalSubrIndex() {
-      var globalSubrIndex = this.cff.globalSubrIndex;
-      this.out.writeByteArray(this.compileIndex(globalSubrIndex));
-    },
-    compileCharStrings: function CFFCompiler_compileCharStrings(charStrings) {
-      return this.compileIndex(charStrings);
-    },
-    compileCharset: function CFFCompiler_compileCharset(charset) {
-      return this.compileTypedArray(charset.raw);
-    },
-    compileEncoding: function CFFCompiler_compileEncoding(encoding) {
-      return this.compileTypedArray(encoding.raw);
-    },
-    compileFDSelect: function CFFCompiler_compileFDSelect(fdSelect) {
-      return this.compileTypedArray(fdSelect);
-    },
-    compileTypedArray: function CFFCompiler_compileTypedArray(data) {
-      var out = [];
-      for (var i = 0, ii = data.length; i < ii; ++i)
-        out[i] = data[i];
-      return out;
-    },
-    compileIndex: function CFFCompiler_compileIndex(index, trackers) {
-      trackers = trackers || [];
-      var objects = index.objects;
-      // First 2 bytes contains the number of objects contained into this index
-      var count = objects.length;
-
-      // If there is no object, just create an index. This technically
-      // should just be [0, 0] but OTS has an issue with that.
-      if (count == 0)
-        return [0, 0, 0];
-
-      var data = [(count >> 8) & 0xFF, count & 0xff];
-
-      var lastOffset = 1;
-      for (var i = 0; i < count; ++i)
-        lastOffset += objects[i].length;
-
-      var offsetSize;
-      if (lastOffset < 0x100)
-        offsetSize = 1;
-      else if (lastOffset < 0x10000)
-        offsetSize = 2;
-      else if (lastOffset < 0x1000000)
-        offsetSize = 3;
-      else
-        offsetSize = 4;
-
-      // Next byte contains the offset size use to reference object in the file
-      data.push(offsetSize);
-
-      // Add another offset after this one because we need a new offset
-      var relativeOffset = 1;
-      for (var i = 0; i < count + 1; i++) {
-        if (offsetSize === 1) {
-          data.push(relativeOffset & 0xFF);
-        } else if (offsetSize === 2) {
-          data.push((relativeOffset >> 8) & 0xFF,
-                     relativeOffset & 0xFF);
-        } else if (offsetSize === 3) {
-          data.push((relativeOffset >> 16) & 0xFF,
-                    (relativeOffset >> 8) & 0xFF,
-                     relativeOffset & 0xFF);
-        } else {
-          data.push((relativeOffset >>> 24) & 0xFF,
-                    (relativeOffset >> 16) & 0xFF,
-                    (relativeOffset >> 8) & 0xFF,
-                     relativeOffset & 0xFF);
-        }
-
-        if (objects[i])
-          relativeOffset += objects[i].length;
-      }
-      var offset = data.length;
-
-      for (var i = 0; i < count; i++) {
-        // Notify the tracker where the object will be offset in the data.
-        if (trackers[i])
-          trackers[i].offset(data.length);
-        for (var j = 0, jj = objects[i].length; j < jj; j++)
-          data.push(objects[i][j]);
-      }
-      return data;
-    }
-  };
-  return CFFCompiler;
-})();
-
-
-/* -*- 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 GlyphsUnicode = {
-  A: 0x0041,
-  AE: 0x00C6,
-  AEacute: 0x01FC,
-  AEmacron: 0x01E2,
-  AEsmall: 0xF7E6,
-  Aacute: 0x00C1,
-  Aacutesmall: 0xF7E1,
-  Abreve: 0x0102,
-  Abreveacute: 0x1EAE,
-  Abrevecyrillic: 0x04D0,
-  Abrevedotbelow: 0x1EB6,
-  Abrevegrave: 0x1EB0,
-  Abrevehookabove: 0x1EB2,
-  Abrevetilde: 0x1EB4,
-  Acaron: 0x01CD,
-  Acircle: 0x24B6,
-  Acircumflex: 0x00C2,
-  Acircumflexacute: 0x1EA4,
-  Acircumflexdotbelow: 0x1EAC,
-  Acircumflexgrave: 0x1EA6,
-  Acircumflexhookabove: 0x1EA8,
-  Acircumflexsmall: 0xF7E2,
-  Acircumflextilde: 0x1EAA,
-  Acute: 0xF6C9,
-  Acutesmall: 0xF7B4,
-  Acyrillic: 0x0410,
-  Adblgrave: 0x0200,
-  Adieresis: 0x00C4,
-  Adieresiscyrillic: 0x04D2,
-  Adieresismacron: 0x01DE,
-  Adieresissmall: 0xF7E4,
-  Adotbelow: 0x1EA0,
-  Adotmacron: 0x01E0,
-  Agrave: 0x00C0,
-  Agravesmall: 0xF7E0,
-  Ahookabove: 0x1EA2,
-  Aiecyrillic: 0x04D4,
-  Ainvertedbreve: 0x0202,
-  Alpha: 0x0391,
-  Alphatonos: 0x0386,
-  Amacron: 0x0100,
-  Amonospace: 0xFF21,
-  Aogonek: 0x0104,
-  Aring: 0x00C5,
-  Aringacute: 0x01FA,
-  Aringbelow: 0x1E00,
-  Aringsmall: 0xF7E5,
-  Asmall: 0xF761,
-  Atilde: 0x00C3,
-  Atildesmall: 0xF7E3,
-  Aybarmenian: 0x0531,
-  B: 0x0042,
-  Bcircle: 0x24B7,
-  Bdotaccent: 0x1E02,
-  Bdotbelow: 0x1E04,
-  Becyrillic: 0x0411,
-  Benarmenian: 0x0532,
-  Beta: 0x0392,
-  Bhook: 0x0181,
-  Blinebelow: 0x1E06,
-  Bmonospace: 0xFF22,
-  Brevesmall: 0xF6F4,
-  Bsmall: 0xF762,
-  Btopbar: 0x0182,
-  C: 0x0043,
-  Caarmenian: 0x053E,
-  Cacute: 0x0106,
-  Caron: 0xF6CA,
-  Caronsmall: 0xF6F5,
-  Ccaron: 0x010C,
-  Ccedilla: 0x00C7,
-  Ccedillaacute: 0x1E08,
-  Ccedillasmall: 0xF7E7,
-  Ccircle: 0x24B8,
-  Ccircumflex: 0x0108,
-  Cdot: 0x010A,
-  Cdotaccent: 0x010A,
-  Cedillasmall: 0xF7B8,
-  Chaarmenian: 0x0549,
-  Cheabkhasiancyrillic: 0x04BC,
-  Checyrillic: 0x0427,
-  Chedescenderabkhasiancyrillic: 0x04BE,
-  Chedescendercyrillic: 0x04B6,
-  Chedieresiscyrillic: 0x04F4,
-  Cheharmenian: 0x0543,
-  Chekhakassiancyrillic: 0x04CB,
-  Cheverticalstrokecyrillic: 0x04B8,
-  Chi: 0x03A7,
-  Chook: 0x0187,
-  Circumflexsmall: 0xF6F6,
-  Cmonospace: 0xFF23,
-  Coarmenian: 0x0551,
-  Csmall: 0xF763,
-  D: 0x0044,
-  DZ: 0x01F1,
-  DZcaron: 0x01C4,
-  Daarmenian: 0x0534,
-  Dafrican: 0x0189,
-  Dcaron: 0x010E,
-  Dcedilla: 0x1E10,
-  Dcircle: 0x24B9,
-  Dcircumflexbelow: 0x1E12,
-  Dcroat: 0x0110,
-  Ddotaccent: 0x1E0A,
-  Ddotbelow: 0x1E0C,
-  Decyrillic: 0x0414,
-  Deicoptic: 0x03EE,
-  Delta: 0x2206,
-  Deltagreek: 0x0394,
-  Dhook: 0x018A,
-  Dieresis: 0xF6CB,
-  DieresisAcute: 0xF6CC,
-  DieresisGrave: 0xF6CD,
-  Dieresissmall: 0xF7A8,
-  Digammagreek: 0x03DC,
-  Djecyrillic: 0x0402,
-  Dlinebelow: 0x1E0E,
-  Dmonospace: 0xFF24,
-  Dotaccentsmall: 0xF6F7,
-  Dslash: 0x0110,
-  Dsmall: 0xF764,
-  Dtopbar: 0x018B,
-  Dz: 0x01F2,
-  Dzcaron: 0x01C5,
-  Dzeabkhasiancyrillic: 0x04E0,
-  Dzecyrillic: 0x0405,
-  Dzhecyrillic: 0x040F,
-  E: 0x0045,
-  Eacute: 0x00C9,
-  Eacutesmall: 0xF7E9,
-  Ebreve: 0x0114,
-  Ecaron: 0x011A,
-  Ecedillabreve: 0x1E1C,
-  Echarmenian: 0x0535,
-  Ecircle: 0x24BA,
-  Ecircumflex: 0x00CA,
-  Ecircumflexacute: 0x1EBE,
-  Ecircumflexbelow: 0x1E18,
-  Ecircumflexdotbelow: 0x1EC6,
-  Ecircumflexgrave: 0x1EC0,
-  Ecircumflexhookabove: 0x1EC2,
-  Ecircumflexsmall: 0xF7EA,
-  Ecircumflextilde: 0x1EC4,
-  Ecyrillic: 0x0404,
-  Edblgrave: 0x0204,
-  Edieresis: 0x00CB,
-  Edieresissmall: 0xF7EB,
-  Edot: 0x0116,
-  Edotaccent: 0x0116,
-  Edotbelow: 0x1EB8,
-  Efcyrillic: 0x0424,
-  Egrave: 0x00C8,
-  Egravesmall: 0xF7E8,
-  Eharmenian: 0x0537,
-  Ehookabove: 0x1EBA,
-  Eightroman: 0x2167,
-  Einvertedbreve: 0x0206,
-  Eiotifiedcyrillic: 0x0464,
-  Elcyrillic: 0x041B,
-  Elevenroman: 0x216A,
-  Emacron: 0x0112,
-  Emacronacute: 0x1E16,
-  Emacrongrave: 0x1E14,
-  Emcyrillic: 0x041C,
-  Emonospace: 0xFF25,
-  Encyrillic: 0x041D,
-  Endescendercyrillic: 0x04A2,
-  Eng: 0x014A,
-  Enghecyrillic: 0x04A4,
-  Enhookcyrillic: 0x04C7,
-  Eogonek: 0x0118,
-  Eopen: 0x0190,
-  Epsilon: 0x0395,
-  Epsilontonos: 0x0388,
-  Ercyrillic: 0x0420,
-  Ereversed: 0x018E,
-  Ereversedcyrillic: 0x042D,
-  Escyrillic: 0x0421,
-  Esdescendercyrillic: 0x04AA,
-  Esh: 0x01A9,
-  Esmall: 0xF765,
-  Eta: 0x0397,
-  Etarmenian: 0x0538,
-  Etatonos: 0x0389,
-  Eth: 0x00D0,
-  Ethsmall: 0xF7F0,
-  Etilde: 0x1EBC,
-  Etildebelow: 0x1E1A,
-  Euro: 0x20AC,
-  Ezh: 0x01B7,
-  Ezhcaron: 0x01EE,
-  Ezhreversed: 0x01B8,
-  F: 0x0046,
-  Fcircle: 0x24BB,
-  Fdotaccent: 0x1E1E,
-  Feharmenian: 0x0556,
-  Feicoptic: 0x03E4,
-  Fhook: 0x0191,
-  Fitacyrillic: 0x0472,
-  Fiveroman: 0x2164,
-  Fmonospace: 0xFF26,
-  Fourroman: 0x2163,
-  Fsmall: 0xF766,
-  G: 0x0047,
-  GBsquare: 0x3387,
-  Gacute: 0x01F4,
-  Gamma: 0x0393,
-  Gammaafrican: 0x0194,
-  Gangiacoptic: 0x03EA,
-  Gbreve: 0x011E,
-  Gcaron: 0x01E6,
-  Gcedilla: 0x0122,
-  Gcircle: 0x24BC,
-  Gcircumflex: 0x011C,
-  Gcommaaccent: 0x0122,
-  Gdot: 0x0120,
-  Gdotaccent: 0x0120,
-  Gecyrillic: 0x0413,
-  Ghadarmenian: 0x0542,
-  Ghemiddlehookcyrillic: 0x0494,
-  Ghestrokecyrillic: 0x0492,
-  Gheupturncyrillic: 0x0490,
-  Ghook: 0x0193,
-  Gimarmenian: 0x0533,
-  Gjecyrillic: 0x0403,
-  Gmacron: 0x1E20,
-  Gmonospace: 0xFF27,
-  Grave: 0xF6CE,
-  Gravesmall: 0xF760,
-  Gsmall: 0xF767,
-  Gsmallhook: 0x029B,
-  Gstroke: 0x01E4,
-  H: 0x0048,
-  H18533: 0x25CF,
-  H18543: 0x25AA,
-  H18551: 0x25AB,
-  H22073: 0x25A1,
-  HPsquare: 0x33CB,
-  Haabkhasiancyrillic: 0x04A8,
-  Hadescendercyrillic: 0x04B2,
-  Hardsigncyrillic: 0x042A,
-  Hbar: 0x0126,
-  Hbrevebelow: 0x1E2A,
-  Hcedilla: 0x1E28,
-  Hcircle: 0x24BD,
-  Hcircumflex: 0x0124,
-  Hdieresis: 0x1E26,
-  Hdotaccent: 0x1E22,
-  Hdotbelow: 0x1E24,
-  Hmonospace: 0xFF28,
-  Hoarmenian: 0x0540,
-  Horicoptic: 0x03E8,
-  Hsmall: 0xF768,
-  Hungarumlaut: 0xF6CF,
-  Hungarumlautsmall: 0xF6F8,
-  Hzsquare: 0x3390,
-  I: 0x0049,
-  IAcyrillic: 0x042F,
-  IJ: 0x0132,
-  IUcyrillic: 0x042E,
-  Iacute: 0x00CD,
-  Iacutesmall: 0xF7ED,
-  Ibreve: 0x012C,
-  Icaron: 0x01CF,
-  Icircle: 0x24BE,
-  Icircumflex: 0x00CE,
-  Icircumflexsmall: 0xF7EE,
-  Icyrillic: 0x0406,
-  Idblgrave: 0x0208,
-  Idieresis: 0x00CF,
-  Idieresisacute: 0x1E2E,
-  Idieresiscyrillic: 0x04E4,
-  Idieresissmall: 0xF7EF,
-  Idot: 0x0130,
-  Idotaccent: 0x0130,
-  Idotbelow: 0x1ECA,
-  Iebrevecyrillic: 0x04D6,
-  Iecyrillic: 0x0415,
-  Ifraktur: 0x2111,
-  Igrave: 0x00CC,
-  Igravesmall: 0xF7EC,
-  Ihookabove: 0x1EC8,
-  Iicyrillic: 0x0418,
-  Iinvertedbreve: 0x020A,
-  Iishortcyrillic: 0x0419,
-  Imacron: 0x012A,
-  Imacroncyrillic: 0x04E2,
-  Imonospace: 0xFF29,
-  Iniarmenian: 0x053B,
-  Iocyrillic: 0x0401,
-  Iogonek: 0x012E,
-  Iota: 0x0399,
-  Iotaafrican: 0x0196,
-  Iotadieresis: 0x03AA,
-  Iotatonos: 0x038A,
-  Ismall: 0xF769,
-  Istroke: 0x0197,
-  Itilde: 0x0128,
-  Itildebelow: 0x1E2C,
-  Izhitsacyrillic: 0x0474,
-  Izhitsadblgravecyrillic: 0x0476,
-  J: 0x004A,
-  Jaarmenian: 0x0541,
-  Jcircle: 0x24BF,
-  Jcircumflex: 0x0134,
-  Jecyrillic: 0x0408,
-  Jheharmenian: 0x054B,
-  Jmonospace: 0xFF2A,
-  Jsmall: 0xF76A,
-  K: 0x004B,
-  KBsquare: 0x3385,
-  KKsquare: 0x33CD,
-  Kabashkircyrillic: 0x04A0,
-  Kacute: 0x1E30,
-  Kacyrillic: 0x041A,
-  Kadescendercyrillic: 0x049A,
-  Kahookcyrillic: 0x04C3,
-  Kappa: 0x039A,
-  Kastrokecyrillic: 0x049E,
-  Kaverticalstrokecyrillic: 0x049C,
-  Kcaron: 0x01E8,
-  Kcedilla: 0x0136,
-  Kcircle: 0x24C0,
-  Kcommaaccent: 0x0136,
-  Kdotbelow: 0x1E32,
-  Keharmenian: 0x0554,
-  Kenarmenian: 0x053F,
-  Khacyrillic: 0x0425,
-  Kheicoptic: 0x03E6,
-  Khook: 0x0198,
-  Kjecyrillic: 0x040C,
-  Klinebelow: 0x1E34,
-  Kmonospace: 0xFF2B,
-  Koppacyrillic: 0x0480,
-  Koppagreek: 0x03DE,
-  Ksicyrillic: 0x046E,
-  Ksmall: 0xF76B,
-  L: 0x004C,
-  LJ: 0x01C7,
-  LL: 0xF6BF,
-  Lacute: 0x0139,
-  Lambda: 0x039B,
-  Lcaron: 0x013D,
-  Lcedilla: 0x013B,
-  Lcircle: 0x24C1,
-  Lcircumflexbelow: 0x1E3C,
-  Lcommaaccent: 0x013B,
-  Ldot: 0x013F,
-  Ldotaccent: 0x013F,
-  Ldotbelow: 0x1E36,
-  Ldotbelowmacron: 0x1E38,
-  Liwnarmenian: 0x053C,
-  Lj: 0x01C8,
-  Ljecyrillic: 0x0409,
-  Llinebelow: 0x1E3A,
-  Lmonospace: 0xFF2C,
-  Lslash: 0x0141,
-  Lslashsmall: 0xF6F9,
-  Lsmall: 0xF76C,
-  M: 0x004D,
-  MBsquare: 0x3386,
-  Macron: 0xF6D0,
-  Macronsmall: 0xF7AF,
-  Macute: 0x1E3E,
-  Mcircle: 0x24C2,
-  Mdotaccent: 0x1E40,
-  Mdotbelow: 0x1E42,
-  Menarmenian: 0x0544,
-  Mmonospace: 0xFF2D,
-  Msmall: 0xF76D,
-  Mturned: 0x019C,
-  Mu: 0x039C,
-  N: 0x004E,
-  NJ: 0x01CA,
-  Nacute: 0x0143,
-  Ncaron: 0x0147,
-  Ncedilla: 0x0145,
-  Ncircle: 0x24C3,
-  Ncircumflexbelow: 0x1E4A,
-  Ncommaaccent: 0x0145,
-  Ndotaccent: 0x1E44,
-  Ndotbelow: 0x1E46,
-  Nhookleft: 0x019D,
-  Nineroman: 0x2168,
-  Nj: 0x01CB,
-  Njecyrillic: 0x040A,
-  Nlinebelow: 0x1E48,
-  Nmonospace: 0xFF2E,
-  Nowarmenian: 0x0546,
-  Nsmall: 0xF76E,
-  Ntilde: 0x00D1,
-  Ntildesmall: 0xF7F1,
-  Nu: 0x039D,
-  O: 0x004F,
-  OE: 0x0152,
-  OEsmall: 0xF6FA,
-  Oacute: 0x00D3,
-  Oacutesmall: 0xF7F3,
-  Obarredcyrillic: 0x04E8,
-  Obarreddieresiscyrillic: 0x04EA,
-  Obreve: 0x014E,
-  Ocaron: 0x01D1,
-  Ocenteredtilde: 0x019F,
-  Ocircle: 0x24C4,
-  Ocircumflex: 0x00D4,
-  Ocircumflexacute: 0x1ED0,
-  Ocircumflexdotbelow: 0x1ED8,
-  Ocircumflexgrave: 0x1ED2,
-  Ocircumflexhookabove: 0x1ED4,
-  Ocircumflexsmall: 0xF7F4,
-  Ocircumflextilde: 0x1ED6,
-  Ocyrillic: 0x041E,
-  Odblacute: 0x0150,
-  Odblgrave: 0x020C,
-  Odieresis: 0x00D6,
-  Odieresiscyrillic: 0x04E6,
-  Odieresissmall: 0xF7F6,
-  Odotbelow: 0x1ECC,
-  Ogoneksmall: 0xF6FB,
-  Ograve: 0x00D2,
-  Ogravesmall: 0xF7F2,
-  Oharmenian: 0x0555,
-  Ohm: 0x2126,
-  Ohookabove: 0x1ECE,
-  Ohorn: 0x01A0,
-  Ohornacute: 0x1EDA,
-  Ohorndotbelow: 0x1EE2,
-  Ohorngrave: 0x1EDC,
-  Ohornhookabove: 0x1EDE,
-  Ohorntilde: 0x1EE0,
-  Ohungarumlaut: 0x0150,
-  Oi: 0x01A2,
-  Oinvertedbreve: 0x020E,
-  Omacron: 0x014C,
-  Omacronacute: 0x1E52,
-  Omacrongrave: 0x1E50,
-  Omega: 0x2126,
-  Omegacyrillic: 0x0460,
-  Omegagreek: 0x03A9,
-  Omegaroundcyrillic: 0x047A,
-  Omegatitlocyrillic: 0x047C,
-  Omegatonos: 0x038F,
-  Omicron: 0x039F,
-  Omicrontonos: 0x038C,
-  Omonospace: 0xFF2F,
-  Oneroman: 0x2160,
-  Oogonek: 0x01EA,
-  Oogonekmacron: 0x01EC,
-  Oopen: 0x0186,
-  Oslash: 0x00D8,
-  Oslashacute: 0x01FE,
-  Oslashsmall: 0xF7F8,
-  Osmall: 0xF76F,
-  Ostrokeacute: 0x01FE,
-  Otcyrillic: 0x047E,
-  Otilde: 0x00D5,
-  Otildeacute: 0x1E4C,
-  Otildedieresis: 0x1E4E,
-  Otildesmall: 0xF7F5,
-  P: 0x0050,
-  Pacute: 0x1E54,
-  Pcircle: 0x24C5,
-  Pdotaccent: 0x1E56,
-  Pecyrillic: 0x041F,
-  Peharmenian: 0x054A,
-  Pemiddlehookcyrillic: 0x04A6,
-  Phi: 0x03A6,
-  Phook: 0x01A4,
-  Pi: 0x03A0,
-  Piwrarmenian: 0x0553,
-  Pmonospace: 0xFF30,
-  Psi: 0x03A8,
-  Psicyrillic: 0x0470,
-  Psmall: 0xF770,
-  Q: 0x0051,
-  Qcircle: 0x24C6,
-  Qmonospace: 0xFF31,
-  Qsmall: 0xF771,
-  R: 0x0052,
-  Raarmenian: 0x054C,
-  Racute: 0x0154,
-  Rcaron: 0x0158,
-  Rcedilla: 0x0156,
-  Rcircle: 0x24C7,
-  Rcommaaccent: 0x0156,
-  Rdblgrave: 0x0210,
-  Rdotaccent: 0x1E58,
-  Rdotbelow: 0x1E5A,
-  Rdotbelowmacron: 0x1E5C,
-  Reharmenian: 0x0550,
-  Rfraktur: 0x211C,
-  Rho: 0x03A1,
-  Ringsmall: 0xF6FC,
-  Rinvertedbreve: 0x0212,
-  Rlinebelow: 0x1E5E,
-  Rmonospace: 0xFF32,
-  Rsmall: 0xF772,
-  Rsmallinverted: 0x0281,
-  Rsmallinvertedsuperior: 0x02B6,
-  S: 0x0053,
-  SF010000: 0x250C,
-  SF020000: 0x2514,
-  SF030000: 0x2510,
-  SF040000: 0x2518,
-  SF050000: 0x253C,
-  SF060000: 0x252C,
-  SF070000: 0x2534,
-  SF080000: 0x251C,
-  SF090000: 0x2524,
-  SF100000: 0x2500,
-  SF110000: 0x2502,
-  SF190000: 0x2561,
-  SF200000: 0x2562,
-  SF210000: 0x2556,
-  SF220000: 0x2555,
-  SF230000: 0x2563,
-  SF240000: 0x2551,
-  SF250000: 0x2557,
-  SF260000: 0x255D,
-  SF270000: 0x255C,
-  SF280000: 0x255B,
-  SF360000: 0x255E,
-  SF370000: 0x255F,
-  SF380000: 0x255A,
-  SF390000: 0x2554,
-  SF400000: 0x2569,
-  SF410000: 0x2566,
-  SF420000: 0x2560,
-  SF430000: 0x2550,
-  SF440000: 0x256C,
-  SF450000: 0x2567,
-  SF460000: 0x2568,
-  SF470000: 0x2564,
-  SF480000: 0x2565,
-  SF490000: 0x2559,
-  SF500000: 0x2558,
-  SF510000: 0x2552,
-  SF520000: 0x2553,
-  SF530000: 0x256B,
-  SF540000: 0x256A,
-  Sacute: 0x015A,
-  Sacutedotaccent: 0x1E64,
-  Sampigreek: 0x03E0,
-  Scaron: 0x0160,
-  Scarondotaccent: 0x1E66,
-  Scaronsmall: 0xF6FD,
-  Scedilla: 0x015E,
-  Schwa: 0x018F,
-  Schwacyrillic: 0x04D8,
-  Schwadieresiscyrillic: 0x04DA,
-  Scircle: 0x24C8,
-  Scircumflex: 0x015C,
-  Scommaaccent: 0x0218,
-  Sdotaccent: 0x1E60,
-  Sdotbelow: 0x1E62,
-  Sdotbelowdotaccent: 0x1E68,
-  Seharmenian: 0x054D,
-  Sevenroman: 0x2166,
-  Shaarmenian: 0x0547,
-  Shacyrillic: 0x0428,
-  Shchacyrillic: 0x0429,
-  Sheicoptic: 0x03E2,
-  Shhacyrillic: 0x04BA,
-  Shimacoptic: 0x03EC,
-  Sigma: 0x03A3,
-  Sixroman: 0x2165,
-  Smonospace: 0xFF33,
-  Softsigncyrillic: 0x042C,
-  Ssmall: 0xF773,
-  Stigmagreek: 0x03DA,
-  T: 0x0054,
-  Tau: 0x03A4,
-  Tbar: 0x0166,
-  Tcaron: 0x0164,
-  Tcedilla: 0x0162,
-  Tcircle: 0x24C9,
-  Tcircumflexbelow: 0x1E70,
-  Tcommaaccent: 0x0162,
-  Tdotaccent: 0x1E6A,
-  Tdotbelow: 0x1E6C,
-  Tecyrillic: 0x0422,
-  Tedescendercyrillic: 0x04AC,
-  Tenroman: 0x2169,
-  Tetsecyrillic: 0x04B4,
-  Theta: 0x0398,
-  Thook: 0x01AC,
-  Thorn: 0x00DE,
-  Thornsmall: 0xF7FE,
-  Threeroman: 0x2162,
-  Tildesmall: 0xF6FE,
-  Tiwnarmenian: 0x054F,
-  Tlinebelow: 0x1E6E,
-  Tmonospace: 0xFF34,
-  Toarmenian: 0x0539,
-  Tonefive: 0x01BC,
-  Tonesix: 0x0184,
-  Tonetwo: 0x01A7,
-  Tretroflexhook: 0x01AE,
-  Tsecyrillic: 0x0426,
-  Tshecyrillic: 0x040B,
-  Tsmall: 0xF774,
-  Twelveroman: 0x216B,
-  Tworoman: 0x2161,
-  U: 0x0055,
-  Uacute: 0x00DA,
-  Uacutesmall: 0xF7FA,
-  Ubreve: 0x016C,
-  Ucaron: 0x01D3,
-  Ucircle: 0x24CA,
-  Ucircumflex: 0x00DB,
-  Ucircumflexbelow: 0x1E76,
-  Ucircumflexsmall: 0xF7FB,
-  Ucyrillic: 0x0423,
-  Udblacute: 0x0170,
-  Udblgrave: 0x0214,
-  Udieresis: 0x00DC,
-  Udieresisacute: 0x01D7,
-  Udieresisbelow: 0x1E72,
-  Udieresiscaron: 0x01D9,
-  Udieresiscyrillic: 0x04F0,
-  Udieresisgrave: 0x01DB,
-  Udieresismacron: 0x01D5,
-  Udieresissmall: 0xF7FC,
-  Udotbelow: 0x1EE4,
-  Ugrave: 0x00D9,
-  Ugravesmall: 0xF7F9,
-  Uhookabove: 0x1EE6,
-  Uhorn: 0x01AF,
-  Uhornacute: 0x1EE8,
-  Uhorndotbelow: 0x1EF0,
-  Uhorngrave: 0x1EEA,
-  Uhornhookabove: 0x1EEC,
-  Uhorntilde: 0x1EEE,
-  Uhungarumlaut: 0x0170,
-  Uhungarumlautcyrillic: 0x04F2,
-  Uinvertedbreve: 0x0216,
-  Ukcyrillic: 0x0478,
-  Umacron: 0x016A,
-  Umacroncyrillic: 0x04EE,
-  Umacrondieresis: 0x1E7A,
-  Umonospace: 0xFF35,
-  Uogonek: 0x0172,
-  Upsilon: 0x03A5,
-  Upsilon1: 0x03D2,
-  Upsilonacutehooksymbolgreek: 0x03D3,
-  Upsilonafrican: 0x01B1,
-  Upsilondieresis: 0x03AB,
-  Upsilondieresishooksymbolgreek: 0x03D4,
-  Upsilonhooksymbol: 0x03D2,
-  Upsilontonos: 0x038E,
-  Uring: 0x016E,
-  Ushortcyrillic: 0x040E,
-  Usmall: 0xF775,
-  Ustraightcyrillic: 0x04AE,
-  Ustraightstrokecyrillic: 0x04B0,
-  Utilde: 0x0168,
-  Utildeacute: 0x1E78,
-  Utildebelow: 0x1E74,
-  V: 0x0056,
-  Vcircle: 0x24CB,
-  Vdotbelow: 0x1E7E,
-  Vecyrillic: 0x0412,
-  Vewarmenian: 0x054E,
-  Vhook: 0x01B2,
-  Vmonospace: 0xFF36,
-  Voarmenian: 0x0548,
-  Vsmall: 0xF776,
-  Vtilde: 0x1E7C,
-  W: 0x0057,
-  Wacute: 0x1E82,
-  Wcircle: 0x24CC,
-  Wcircumflex: 0x0174,
-  Wdieresis: 0x1E84,
-  Wdotaccent: 0x1E86,
-  Wdotbelow: 0x1E88,
-  Wgrave: 0x1E80,
-  Wmonospace: 0xFF37,
-  Wsmall: 0xF777,
-  X: 0x0058,
-  Xcircle: 0x24CD,
-  Xdieresis: 0x1E8C,
-  Xdotaccent: 0x1E8A,
-  Xeharmenian: 0x053D,
-  Xi: 0x039E,
-  Xmonospace: 0xFF38,
-  Xsmall: 0xF778,
-  Y: 0x0059,
-  Yacute: 0x00DD,
-  Yacutesmall: 0xF7FD,
-  Yatcyrillic: 0x0462,
-  Ycircle: 0x24CE,
-  Ycircumflex: 0x0176,
-  Ydieresis: 0x0178,
-  Ydieresissmall: 0xF7FF,
-  Ydotaccent: 0x1E8E,
-  Ydotbelow: 0x1EF4,
-  Yericyrillic: 0x042B,
-  Yerudieresiscyrillic: 0x04F8,
-  Ygrave: 0x1EF2,
-  Yhook: 0x01B3,
-  Yhookabove: 0x1EF6,
-  Yiarmenian: 0x0545,
-  Yicyrillic: 0x0407,
-  Yiwnarmenian: 0x0552,
-  Ymonospace: 0xFF39,
-  Ysmall: 0xF779,
-  Ytilde: 0x1EF8,
-  Yusbigcyrillic: 0x046A,
-  Yusbigiotifiedcyrillic: 0x046C,
-  Yuslittlecyrillic: 0x0466,
-  Yuslittleiotifiedcyrillic: 0x0468,
-  Z: 0x005A,
-  Zaarmenian: 0x0536,
-  Zacute: 0x0179,
-  Zcaron: 0x017D,
-  Zcaronsmall: 0xF6FF,
-  Zcircle: 0x24CF,
-  Zcircumflex: 0x1E90,
-  Zdot: 0x017B,
-  Zdotaccent: 0x017B,
-  Zdotbelow: 0x1E92,
-  Zecyrillic: 0x0417,
-  Zedescendercyrillic: 0x0498,
-  Zedieresiscyrillic: 0x04DE,
-  Zeta: 0x0396,
-  Zhearmenian: 0x053A,
-  Zhebrevecyrillic: 0x04C1,
-  Zhecyrillic: 0x0416,
-  Zhedescendercyrillic: 0x0496,
-  Zhedieresiscyrillic: 0x04DC,
-  Zlinebelow: 0x1E94,
-  Zmonospace: 0xFF3A,
-  Zsmall: 0xF77A,
-  Zstroke: 0x01B5,
-  a: 0x0061,
-  aabengali: 0x0986,
-  aacute: 0x00E1,
-  aadeva: 0x0906,
-  aagujarati: 0x0A86,
-  aagurmukhi: 0x0A06,
-  aamatragurmukhi: 0x0A3E,
-  aarusquare: 0x3303,
-  aavowelsignbengali: 0x09BE,
-  aavowelsigndeva: 0x093E,
-  aavowelsigngujarati: 0x0ABE,
-  abbreviationmarkarmenian: 0x055F,
-  abbreviationsigndeva: 0x0970,
-  abengali: 0x0985,
-  abopomofo: 0x311A,
-  abreve: 0x0103,
-  abreveacute: 0x1EAF,
-  abrevecyrillic: 0x04D1,
-  abrevedotbelow: 0x1EB7,
-  abrevegrave: 0x1EB1,
-  abrevehookabove: 0x1EB3,
-  abrevetilde: 0x1EB5,
-  acaron: 0x01CE,
-  acircle: 0x24D0,
-  acircumflex: 0x00E2,
-  acircumflexacute: 0x1EA5,
-  acircumflexdotbelow: 0x1EAD,
-  acircumflexgrave: 0x1EA7,
-  acircumflexhookabove: 0x1EA9,
-  acircumflextilde: 0x1EAB,
-  acute: 0x00B4,
-  acutebelowcmb: 0x0317,
-  acutecmb: 0x0301,
-  acutecomb: 0x0301,
-  acutedeva: 0x0954,
-  acutelowmod: 0x02CF,
-  acutetonecmb: 0x0341,
-  acyrillic: 0x0430,
-  adblgrave: 0x0201,
-  addakgurmukhi: 0x0A71,
-  adeva: 0x0905,
-  adieresis: 0x00E4,
-  adieresiscyrillic: 0x04D3,
-  adieresismacron: 0x01DF,
-  adotbelow: 0x1EA1,
-  adotmacron: 0x01E1,
-  ae: 0x00E6,
-  aeacute: 0x01FD,
-  aekorean: 0x3150,
-  aemacron: 0x01E3,
-  afii00208: 0x2015,
-  afii08941: 0x20A4,
-  afii10017: 0x0410,
-  afii10018: 0x0411,
-  afii10019: 0x0412,
-  afii10020: 0x0413,
-  afii10021: 0x0414,
-  afii10022: 0x0415,
-  afii10023: 0x0401,
-  afii10024: 0x0416,
-  afii10025: 0x0417,
-  afii10026: 0x0418,
-  afii10027: 0x0419,
-  afii10028: 0x041A,
-  afii10029: 0x041B,
-  afii10030: 0x041C,
-  afii10031: 0x041D,
-  afii10032: 0x041E,
-  afii10033: 0x041F,
-  afii10034: 0x0420,
-  afii10035: 0x0421,
-  afii10036: 0x0422,
-  afii10037: 0x0423,
-  afii10038: 0x0424,
-  afii10039: 0x0425,
-  afii10040: 0x0426,
-  afii10041: 0x0427,
-  afii10042: 0x0428,
-  afii10043: 0x0429,
-  afii10044: 0x042A,
-  afii10045: 0x042B,
-  afii10046: 0x042C,
-  afii10047: 0x042D,
-  afii10048: 0x042E,
-  afii10049: 0x042F,
-  afii10050: 0x0490,
-  afii10051: 0x0402,
-  afii10052: 0x0403,
-  afii10053: 0x0404,
-  afii10054: 0x0405,
-  afii10055: 0x0406,
-  afii10056: 0x0407,
-  afii10057: 0x0408,
-  afii10058: 0x0409,
-  afii10059: 0x040A,
-  afii10060: 0x040B,
-  afii10061: 0x040C,
-  afii10062: 0x040E,
-  afii10063: 0xF6C4,
-  afii10064: 0xF6C5,
-  afii10065: 0x0430,
-  afii10066: 0x0431,
-  afii10067: 0x0432,
-  afii10068: 0x0433,
-  afii10069: 0x0434,
-  afii10070: 0x0435,
-  afii10071: 0x0451,
-  afii10072: 0x0436,
-  afii10073: 0x0437,
-  afii10074: 0x0438,
-  afii10075: 0x0439,
-  afii10076: 0x043A,
-  afii10077: 0x043B,
-  afii10078: 0x043C,
-  afii10079: 0x043D,
-  afii10080: 0x043E,
-  afii10081: 0x043F,
-  afii10082: 0x0440,
-  afii10083: 0x0441,
-  afii10084: 0x0442,
-  afii10085: 0x0443,
-  afii10086: 0x0444,
-  afii10087: 0x0445,
-  afii10088: 0x0446,
-  afii10089: 0x0447,
-  afii10090: 0x0448,
-  afii10091: 0x0449,
-  afii10092: 0x044A,
-  afii10093: 0x044B,
-  afii10094: 0x044C,
-  afii10095: 0x044D,
-  afii10096: 0x044E,
-  afii10097: 0x044F,
-  afii10098: 0x0491,
-  afii10099: 0x0452,
-  afii10100: 0x0453,
-  afii10101: 0x0454,
-  afii10102: 0x0455,
-  afii10103: 0x0456,
-  afii10104: 0x0457,
-  afii10105: 0x0458,
-  afii10106: 0x0459,
-  afii10107: 0x045A,
-  afii10108: 0x045B,
-  afii10109: 0x045C,
-  afii10110: 0x045E,
-  afii10145: 0x040F,
-  afii10146: 0x0462,
-  afii10147: 0x0472,
-  afii10148: 0x0474,
-  afii10192: 0xF6C6,
-  afii10193: 0x045F,
-  afii10194: 0x0463,
-  afii10195: 0x0473,
-  afii10196: 0x0475,
-  afii10831: 0xF6C7,
-  afii10832: 0xF6C8,
-  afii10846: 0x04D9,
-  afii299: 0x200E,
-  afii300: 0x200F,
-  afii301: 0x200D,
-  afii57381: 0x066A,
-  afii57388: 0x060C,
-  afii57392: 0x0660,
-  afii57393: 0x0661,
-  afii57394: 0x0662,
-  afii57395: 0x0663,
-  afii57396: 0x0664,
-  afii57397: 0x0665,
-  afii57398: 0x0666,
-  afii57399: 0x0667,
-  afii57400: 0x0668,
-  afii57401: 0x0669,
-  afii57403: 0x061B,
-  afii57407: 0x061F,
-  afii57409: 0x0621,
-  afii57410: 0x0622,
-  afii57411: 0x0623,
-  afii57412: 0x0624,
-  afii57413: 0x0625,
-  afii57414: 0x0626,
-  afii57415: 0x0627,
-  afii57416: 0x0628,
-  afii57417: 0x0629,
-  afii57418: 0x062A,
-  afii57419: 0x062B,
-  afii57420: 0x062C,
-  afii57421: 0x062D,
-  afii57422: 0x062E,
-  afii57423: 0x062F,
-  afii57424: 0x0630,
-  afii57425: 0x0631,
-  afii57426: 0x0632,
-  afii57427: 0x0633,
-  afii57428: 0x0634,
-  afii57429: 0x0635,
-  afii57430: 0x0636,
-  afii57431: 0x0637,
-  afii57432: 0x0638,
-  afii57433: 0x0639,
-  afii57434: 0x063A,
-  afii57440: 0x0640,
-  afii57441: 0x0641,
-  afii57442: 0x0642,
-  afii57443: 0x0643,
-  afii57444: 0x0644,
-  afii57445: 0x0645,
-  afii57446: 0x0646,
-  afii57448: 0x0648,
-  afii57449: 0x0649,
-  afii57450: 0x064A,
-  afii57451: 0x064B,
-  afii57452: 0x064C,
-  afii57453: 0x064D,
-  afii57454: 0x064E,
-  afii57455: 0x064F,
-  afii57456: 0x0650,
-  afii57457: 0x0651,
-  afii57458: 0x0652,
-  afii57470: 0x0647,
-  afii57505: 0x06A4,
-  afii57506: 0x067E,
-  afii57507: 0x0686,
-  afii57508: 0x0698,
-  afii57509: 0x06AF,
-  afii57511: 0x0679,
-  afii57512: 0x0688,
-  afii57513: 0x0691,
-  afii57514: 0x06BA,
-  afii57519: 0x06D2,
-  afii57534: 0x06D5,
-  afii57636: 0x20AA,
-  afii57645: 0x05BE,
-  afii57658: 0x05C3,
-  afii57664: 0x05D0,
-  afii57665: 0x05D1,
-  afii57666: 0x05D2,
-  afii57667: 0x05D3,
-  afii57668: 0x05D4,
-  afii57669: 0x05D5,
-  afii57670: 0x05D6,
-  afii57671: 0x05D7,
-  afii57672: 0x05D8,
-  afii57673: 0x05D9,
-  afii57674: 0x05DA,
-  afii57675: 0x05DB,
-  afii57676: 0x05DC,
-  afii57677: 0x05DD,
-  afii57678: 0x05DE,
-  afii57679: 0x05DF,
-  afii57680: 0x05E0,
-  afii57681: 0x05E1,
-  afii57682: 0x05E2,
-  afii57683: 0x05E3,
-  afii57684: 0x05E4,
-  afii57685: 0x05E5,
-  afii57686: 0x05E6,
-  afii57687: 0x05E7,
-  afii57688: 0x05E8,
-  afii57689: 0x05E9,
-  afii57690: 0x05EA,
-  afii57694: 0xFB2A,
-  afii57695: 0xFB2B,
-  afii57700: 0xFB4B,
-  afii57705: 0xFB1F,
-  afii57716: 0x05F0,
-  afii57717: 0x05F1,
-  afii57718: 0x05F2,
-  afii57723: 0xFB35,
-  afii57793: 0x05B4,
-  afii57794: 0x05B5,
-  afii57795: 0x05B6,
-  afii57796: 0x05BB,
-  afii57797: 0x05B8,
-  afii57798: 0x05B7,
-  afii57799: 0x05B0,
-  afii57800: 0x05B2,
-  afii57801: 0x05B1,
-  afii57802: 0x05B3,
-  afii57803: 0x05C2,
-  afii57804: 0x05C1,
-  afii57806: 0x05B9,
-  afii57807: 0x05BC,
-  afii57839: 0x05BD,
-  afii57841: 0x05BF,
-  afii57842: 0x05C0,
-  afii57929: 0x02BC,
-  afii61248: 0x2105,
-  afii61289: 0x2113,
-  afii61352: 0x2116,
-  afii61573: 0x202C,
-  afii61574: 0x202D,
-  afii61575: 0x202E,
-  afii61664: 0x200C,
-  afii63167: 0x066D,
-  afii64937: 0x02BD,
-  agrave: 0x00E0,
-  agujarati: 0x0A85,
-  agurmukhi: 0x0A05,
-  ahiragana: 0x3042,
-  ahookabove: 0x1EA3,
-  aibengali: 0x0990,
-  aibopomofo: 0x311E,
-  aideva: 0x0910,
-  aiecyrillic: 0x04D5,
-  aigujarati: 0x0A90,
-  aigurmukhi: 0x0A10,
-  aimatragurmukhi: 0x0A48,
-  ainarabic: 0x0639,
-  ainfinalarabic: 0xFECA,
-  aininitialarabic: 0xFECB,
-  ainmedialarabic: 0xFECC,
-  ainvertedbreve: 0x0203,
-  aivowelsignbengali: 0x09C8,
-  aivowelsigndeva: 0x0948,
-  aivowelsigngujarati: 0x0AC8,
-  akatakana: 0x30A2,
-  akatakanahalfwidth: 0xFF71,
-  akorean: 0x314F,
-  alef: 0x05D0,
-  alefarabic: 0x0627,
-  alefdageshhebrew: 0xFB30,
-  aleffinalarabic: 0xFE8E,
-  alefhamzaabovearabic: 0x0623,
-  alefhamzaabovefinalarabic: 0xFE84,
-  alefhamzabelowarabic: 0x0625,
-  alefhamzabelowfinalarabic: 0xFE88,
-  alefhebrew: 0x05D0,
-  aleflamedhebrew: 0xFB4F,
-  alefmaddaabovearabic: 0x0622,
-  alefmaddaabovefinalarabic: 0xFE82,
-  alefmaksuraarabic: 0x0649,
-  alefmaksurafinalarabic: 0xFEF0,
-  alefmaksurainitialarabic: 0xFEF3,
-  alefmaksuramedialarabic: 0xFEF4,
-  alefpatahhebrew: 0xFB2E,
-  alefqamatshebrew: 0xFB2F,
-  aleph: 0x2135,
-  allequal: 0x224C,
-  alpha: 0x03B1,
-  alphatonos: 0x03AC,
-  amacron: 0x0101,
-  amonospace: 0xFF41,
-  ampersand: 0x0026,
-  ampersandmonospace: 0xFF06,
-  ampersandsmall: 0xF726,
-  amsquare: 0x33C2,
-  anbopomofo: 0x3122,
-  angbopomofo: 0x3124,
-  angbracketleft: 0x3008, // This glyph is missing from Adobe's original list.
-  angbracketright: 0x3009, // This glyph is missing from Adobe's original list.
-  angkhankhuthai: 0x0E5A,
-  angle: 0x2220,
-  anglebracketleft: 0x3008,
-  anglebracketleftvertical: 0xFE3F,
-  anglebracketright: 0x3009,
-  anglebracketrightvertical: 0xFE40,
-  angleleft: 0x2329,
-  angleright: 0x232A,
-  angstrom: 0x212B,
-  anoteleia: 0x0387,
-  anudattadeva: 0x0952,
-  anusvarabengali: 0x0982,
-  anusvaradeva: 0x0902,
-  anusvaragujarati: 0x0A82,
-  aogonek: 0x0105,
-  apaatosquare: 0x3300,
-  aparen: 0x249C,
-  apostrophearmenian: 0x055A,
-  apostrophemod: 0x02BC,
-  apple: 0xF8FF,
-  approaches: 0x2250,
-  approxequal: 0x2248,
-  approxequalorimage: 0x2252,
-  approximatelyequal: 0x2245,
-  araeaekorean: 0x318E,
-  araeakorean: 0x318D,
-  arc: 0x2312,
-  arighthalfring: 0x1E9A,
-  aring: 0x00E5,
-  aringacute: 0x01FB,
-  aringbelow: 0x1E01,
-  arrowboth: 0x2194,
-  arrowdashdown: 0x21E3,
-  arrowdashleft: 0x21E0,
-  arrowdashright: 0x21E2,
-  arrowdashup: 0x21E1,
-  arrowdblboth: 0x21D4,
-  arrowdbldown: 0x21D3,
-  arrowdblleft: 0x21D0,
-  arrowdblright: 0x21D2,
-  arrowdblup: 0x21D1,
-  arrowdown: 0x2193,
-  arrowdownleft: 0x2199,
-  arrowdownright: 0x2198,
-  arrowdownwhite: 0x21E9,
-  arrowheaddownmod: 0x02C5,
-  arrowheadleftmod: 0x02C2,
-  arrowheadrightmod: 0x02C3,
-  arrowheadupmod: 0x02C4,
-  arrowhorizex: 0xF8E7,
-  arrowleft: 0x2190,
-  arrowleftdbl: 0x21D0,
-  arrowleftdblstroke: 0x21CD,
-  arrowleftoverright: 0x21C6,
-  arrowleftwhite: 0x21E6,
-  arrowright: 0x2192,
-  arrowrightdblstroke: 0x21CF,
-  arrowrightheavy: 0x279E,
-  arrowrightoverleft: 0x21C4,
-  arrowrightwhite: 0x21E8,
-  arrowtableft: 0x21E4,
-  arrowtabright: 0x21E5,
-  arrowup: 0x2191,
-  arrowupdn: 0x2195,
-  arrowupdnbse: 0x21A8,
-  arrowupdownbase: 0x21A8,
-  arrowupleft: 0x2196,
-  arrowupleftofdown: 0x21C5,
-  arrowupright: 0x2197,
-  arrowupwhite: 0x21E7,
-  arrowvertex: 0xF8E6,
-  asciicircum: 0x005E,
-  asciicircummonospace: 0xFF3E,
-  asciitilde: 0x007E,
-  asciitildemonospace: 0xFF5E,
-  ascript: 0x0251,
-  ascriptturned: 0x0252,
-  asmallhiragana: 0x3041,
-  asmallkatakana: 0x30A1,
-  asmallkatakanahalfwidth: 0xFF67,
-  asterisk: 0x002A,
-  asteriskaltonearabic: 0x066D,
-  asteriskarabic: 0x066D,
-  asteriskmath: 0x2217,
-  asteriskmonospace: 0xFF0A,
-  asterisksmall: 0xFE61,
-  asterism: 0x2042,
-  asuperior: 0xF6E9,
-  asymptoticallyequal: 0x2243,
-  at: 0x0040,
-  atilde: 0x00E3,
-  atmonospace: 0xFF20,
-  atsmall: 0xFE6B,
-  aturned: 0x0250,
-  aubengali: 0x0994,
-  aubopomofo: 0x3120,
-  audeva: 0x0914,
-  augujarati: 0x0A94,
-  augurmukhi: 0x0A14,
-  aulengthmarkbengali: 0x09D7,
-  aumatragurmukhi: 0x0A4C,
-  auvowelsignbengali: 0x09CC,
-  auvowelsigndeva: 0x094C,
-  auvowelsigngujarati: 0x0ACC,
-  avagrahadeva: 0x093D,
-  aybarmenian: 0x0561,
-  ayin: 0x05E2,
-  ayinaltonehebrew: 0xFB20,
-  ayinhebrew: 0x05E2,
-  b: 0x0062,
-  babengali: 0x09AC,
-  backslash: 0x005C,
-  backslashmonospace: 0xFF3C,
-  badeva: 0x092C,
-  bagujarati: 0x0AAC,
-  bagurmukhi: 0x0A2C,
-  bahiragana: 0x3070,
-  bahtthai: 0x0E3F,
-  bakatakana: 0x30D0,
-  bar: 0x007C,
-  barmonospace: 0xFF5C,
-  bbopomofo: 0x3105,
-  bcircle: 0x24D1,
-  bdotaccent: 0x1E03,
-  bdotbelow: 0x1E05,
-  beamedsixteenthnotes: 0x266C,
-  because: 0x2235,
-  becyrillic: 0x0431,
-  beharabic: 0x0628,
-  behfinalarabic: 0xFE90,
-  behinitialarabic: 0xFE91,
-  behiragana: 0x3079,
-  behmedialarabic: 0xFE92,
-  behmeeminitialarabic: 0xFC9F,
-  behmeemisolatedarabic: 0xFC08,
-  behnoonfinalarabic: 0xFC6D,
-  bekatakana: 0x30D9,
-  benarmenian: 0x0562,
-  bet: 0x05D1,
-  beta: 0x03B2,
-  betasymbolgreek: 0x03D0,
-  betdagesh: 0xFB31,
-  betdageshhebrew: 0xFB31,
-  bethebrew: 0x05D1,
-  betrafehebrew: 0xFB4C,
-  bhabengali: 0x09AD,
-  bhadeva: 0x092D,
-  bhagujarati: 0x0AAD,
-  bhagurmukhi: 0x0A2D,
-  bhook: 0x0253,
-  bihiragana: 0x3073,
-  bikatakana: 0x30D3,
-  bilabialclick: 0x0298,
-  bindigurmukhi: 0x0A02,
-  birusquare: 0x3331,
-  blackcircle: 0x25CF,
-  blackdiamond: 0x25C6,
-  blackdownpointingtriangle: 0x25BC,
-  blackleftpointingpointer: 0x25C4,
-  blackleftpointingtriangle: 0x25C0,
-  blacklenticularbracketleft: 0x3010,
-  blacklenticularbracketleftvertical: 0xFE3B,
-  blacklenticularbracketright: 0x3011,
-  blacklenticularbracketrightvertical: 0xFE3C,
-  blacklowerlefttriangle: 0x25E3,
-  blacklowerrighttriangle: 0x25E2,
-  blackrectangle: 0x25AC,
-  blackrightpointingpointer: 0x25BA,
-  blackrightpointingtriangle: 0x25B6,
-  blacksmallsquare: 0x25AA,
-  blacksmilingface: 0x263B,
-  blacksquare: 0x25A0,
-  blackstar: 0x2605,
-  blackupperlefttriangle: 0x25E4,
-  blackupperrighttriangle: 0x25E5,
-  blackuppointingsmalltriangle: 0x25B4,
-  blackuppointingtriangle: 0x25B2,
-  blank: 0x2423,
-  blinebelow: 0x1E07,
-  block: 0x2588,
-  bmonospace: 0xFF42,
-  bobaimaithai: 0x0E1A,
-  bohiragana: 0x307C,
-  bokatakana: 0x30DC,
-  bparen: 0x249D,
-  bqsquare: 0x33C3,
-  braceex: 0xF8F4,
-  braceleft: 0x007B,
-  braceleftbt: 0xF8F3,
-  braceleftmid: 0xF8F2,
-  braceleftmonospace: 0xFF5B,
-  braceleftsmall: 0xFE5B,
-  bracelefttp: 0xF8F1,
-  braceleftvertical: 0xFE37,
-  braceright: 0x007D,
-  bracerightbt: 0xF8FE,
-  bracerightmid: 0xF8FD,
-  bracerightmonospace: 0xFF5D,
-  bracerightsmall: 0xFE5C,
-  bracerighttp: 0xF8FC,
-  bracerightvertical: 0xFE38,
-  bracketleft: 0x005B,
-  bracketleftbt: 0xF8F0,
-  bracketleftex: 0xF8EF,
-  bracketleftmonospace: 0xFF3B,
-  bracketlefttp: 0xF8EE,
-  bracketright: 0x005D,
-  bracketrightbt: 0xF8FB,
-  bracketrightex: 0xF8FA,
-  bracketrightmonospace: 0xFF3D,
-  bracketrighttp: 0xF8F9,
-  breve: 0x02D8,
-  brevebelowcmb: 0x032E,
-  brevecmb: 0x0306,
-  breveinvertedbelowcmb: 0x032F,
-  breveinvertedcmb: 0x0311,
-  breveinverteddoublecmb: 0x0361,
-  bridgebelowcmb: 0x032A,
-  bridgeinvertedbelowcmb: 0x033A,
-  brokenbar: 0x00A6,
-  bstroke: 0x0180,
-  bsuperior: 0xF6EA,
-  btopbar: 0x0183,
-  buhiragana: 0x3076,
-  bukatakana: 0x30D6,
-  bullet: 0x2022,
-  bulletinverse: 0x25D8,
-  bulletoperator: 0x2219,
-  bullseye: 0x25CE,
-  c: 0x0063,
-  caarmenian: 0x056E,
-  cabengali: 0x099A,
-  cacute: 0x0107,
-  cadeva: 0x091A,
-  cagujarati: 0x0A9A,
-  cagurmukhi: 0x0A1A,
-  calsquare: 0x3388,
-  candrabindubengali: 0x0981,
-  candrabinducmb: 0x0310,
-  candrabindudeva: 0x0901,
-  candrabindugujarati: 0x0A81,
-  capslock: 0x21EA,
-  careof: 0x2105,
-  caron: 0x02C7,
-  caronbelowcmb: 0x032C,
-  caroncmb: 0x030C,
-  carriagereturn: 0x21B5,
-  cbopomofo: 0x3118,
-  ccaron: 0x010D,
-  ccedilla: 0x00E7,
-  ccedillaacute: 0x1E09,
-  ccircle: 0x24D2,
-  ccircumflex: 0x0109,
-  ccurl: 0x0255,
-  cdot: 0x010B,
-  cdotaccent: 0x010B,
-  cdsquare: 0x33C5,
-  cedilla: 0x00B8,
-  cedillacmb: 0x0327,
-  cent: 0x00A2,
-  centigrade: 0x2103,
-  centinferior: 0xF6DF,
-  centmonospace: 0xFFE0,
-  centoldstyle: 0xF7A2,
-  centsuperior: 0xF6E0,
-  chaarmenian: 0x0579,
-  chabengali: 0x099B,
-  chadeva: 0x091B,
-  chagujarati: 0x0A9B,
-  chagurmukhi: 0x0A1B,
-  chbopomofo: 0x3114,
-  cheabkhasiancyrillic: 0x04BD,
-  checkmark: 0x2713,
-  checyrillic: 0x0447,
-  chedescenderabkhasiancyrillic: 0x04BF,
-  chedescendercyrillic: 0x04B7,
-  chedieresiscyrillic: 0x04F5,
-  cheharmenian: 0x0573,
-  chekhakassiancyrillic: 0x04CC,
-  cheverticalstrokecyrillic: 0x04B9,
-  chi: 0x03C7,
-  chieuchacirclekorean: 0x3277,
-  chieuchaparenkorean: 0x3217,
-  chieuchcirclekorean: 0x3269,
-  chieuchkorean: 0x314A,
-  chieuchparenkorean: 0x3209,
-  chochangthai: 0x0E0A,
-  chochanthai: 0x0E08,
-  chochingthai: 0x0E09,
-  chochoethai: 0x0E0C,
-  chook: 0x0188,
-  cieucacirclekorean: 0x3276,
-  cieucaparenkorean: 0x3216,
-  cieuccirclekorean: 0x3268,
-  cieuckorean: 0x3148,
-  cieucparenkorean: 0x3208,
-  cieucuparenkorean: 0x321C,
-  circle: 0x25CB,
-  circlecopyrt: 0x00A9, // This glyph is missing from Adobe's original list.
-  circlemultiply: 0x2297,
-  circleot: 0x2299,
-  circleplus: 0x2295,
-  circlepostalmark: 0x3036,
-  circlewithlefthalfblack: 0x25D0,
-  circlewithrighthalfblack: 0x25D1,
-  circumflex: 0x02C6,
-  circumflexbelowcmb: 0x032D,
-  circumflexcmb: 0x0302,
-  clear: 0x2327,
-  clickalveolar: 0x01C2,
-  clickdental: 0x01C0,
-  clicklateral: 0x01C1,
-  clickretroflex: 0x01C3,
-  club: 0x2663,
-  clubsuitblack: 0x2663,
-  clubsuitwhite: 0x2667,
-  cmcubedsquare: 0x33A4,
-  cmonospace: 0xFF43,
-  cmsquaredsquare: 0x33A0,
-  coarmenian: 0x0581,
-  colon: 0x003A,
-  colonmonetary: 0x20A1,
-  colonmonospace: 0xFF1A,
-  colonsign: 0x20A1,
-  colonsmall: 0xFE55,
-  colontriangularhalfmod: 0x02D1,
-  colontriangularmod: 0x02D0,
-  comma: 0x002C,
-  commaabovecmb: 0x0313,
-  commaaboverightcmb: 0x0315,
-  commaaccent: 0xF6C3,
-  commaarabic: 0x060C,
-  commaarmenian: 0x055D,
-  commainferior: 0xF6E1,
-  commamonospace: 0xFF0C,
-  commareversedabovecmb: 0x0314,
-  commareversedmod: 0x02BD,
-  commasmall: 0xFE50,
-  commasuperior: 0xF6E2,
-  commaturnedabovecmb: 0x0312,
-  commaturnedmod: 0x02BB,
-  compass: 0x263C,
-  congruent: 0x2245,
-  contourintegral: 0x222E,
-  control: 0x2303,
-  controlACK: 0x0006,
-  controlBEL: 0x0007,
-  controlBS: 0x0008,
-  controlCAN: 0x0018,
-  controlCR: 0x000D,
-  controlDC1: 0x0011,
-  controlDC2: 0x0012,
-  controlDC3: 0x0013,
-  controlDC4: 0x0014,
-  controlDEL: 0x007F,
-  controlDLE: 0x0010,
-  controlEM: 0x0019,
-  controlENQ: 0x0005,
-  controlEOT: 0x0004,
-  controlESC: 0x001B,
-  controlETB: 0x0017,
-  controlETX: 0x0003,
-  controlFF: 0x000C,
-  controlFS: 0x001C,
-  controlGS: 0x001D,
-  controlHT: 0x0009,
-  controlLF: 0x000A,
-  controlNAK: 0x0015,
-  controlRS: 0x001E,
-  controlSI: 0x000F,
-  controlSO: 0x000E,
-  controlSOT: 0x0002,
-  controlSTX: 0x0001,
-  controlSUB: 0x001A,
-  controlSYN: 0x0016,
-  controlUS: 0x001F,
-  controlVT: 0x000B,
-  copyright: 0x00A9,
-  copyrightsans: 0xF8E9,
-  copyrightserif: 0xF6D9,
-  cornerbracketleft: 0x300C,
-  cornerbracketlefthalfwidth: 0xFF62,
-  cornerbracketleftvertical: 0xFE41,
-  cornerbracketright: 0x300D,
-  cornerbracketrighthalfwidth: 0xFF63,
-  cornerbracketrightvertical: 0xFE42,
-  corporationsquare: 0x337F,
-  cosquare: 0x33C7,
-  coverkgsquare: 0x33C6,
-  cparen: 0x249E,
-  cruzeiro: 0x20A2,
-  cstretched: 0x0297,
-  curlyand: 0x22CF,
-  curlyor: 0x22CE,
-  currency: 0x00A4,
-  cyrBreve: 0xF6D1,
-  cyrFlex: 0xF6D2,
-  cyrbreve: 0xF6D4,
-  cyrflex: 0xF6D5,
-  d: 0x0064,
-  daarmenian: 0x0564,
-  dabengali: 0x09A6,
-  dadarabic: 0x0636,
-  dadeva: 0x0926,
-  dadfinalarabic: 0xFEBE,
-  dadinitialarabic: 0xFEBF,
-  dadmedialarabic: 0xFEC0,
-  dagesh: 0x05BC,
-  dageshhebrew: 0x05BC,
-  dagger: 0x2020,
-  daggerdbl: 0x2021,
-  dagujarati: 0x0AA6,
-  dagurmukhi: 0x0A26,
-  dahiragana: 0x3060,
-  dakatakana: 0x30C0,
-  dalarabic: 0x062F,
-  dalet: 0x05D3,
-  daletdagesh: 0xFB33,
-  daletdageshhebrew: 0xFB33,
-  dalethebrew: 0x05D3,
-  dalfinalarabic: 0xFEAA,
-  dammaarabic: 0x064F,
-  dammalowarabic: 0x064F,
-  dammatanaltonearabic: 0x064C,
-  dammatanarabic: 0x064C,
-  danda: 0x0964,
-  dargahebrew: 0x05A7,
-  dargalefthebrew: 0x05A7,
-  dasiapneumatacyrilliccmb: 0x0485,
-  dblGrave: 0xF6D3,
-  dblanglebracketleft: 0x300A,
-  dblanglebracketleftvertical: 0xFE3D,
-  dblanglebracketright: 0x300B,
-  dblanglebracketrightvertical: 0xFE3E,
-  dblarchinvertedbelowcmb: 0x032B,
-  dblarrowleft: 0x21D4,
-  dblarrowright: 0x21D2,
-  dbldanda: 0x0965,
-  dblgrave: 0xF6D6,
-  dblgravecmb: 0x030F,
-  dblintegral: 0x222C,
-  dbllowline: 0x2017,
-  dbllowlinecmb: 0x0333,
-  dbloverlinecmb: 0x033F,
-  dblprimemod: 0x02BA,
-  dblverticalbar: 0x2016,
-  dblverticallineabovecmb: 0x030E,
-  dbopomofo: 0x3109,
-  dbsquare: 0x33C8,
-  dcaron: 0x010F,
-  dcedilla: 0x1E11,
-  dcircle: 0x24D3,
-  dcircumflexbelow: 0x1E13,
-  dcroat: 0x0111,
-  ddabengali: 0x09A1,
-  ddadeva: 0x0921,
-  ddagujarati: 0x0AA1,
-  ddagurmukhi: 0x0A21,
-  ddalarabic: 0x0688,
-  ddalfinalarabic: 0xFB89,
-  dddhadeva: 0x095C,
-  ddhabengali: 0x09A2,
-  ddhadeva: 0x0922,
-  ddhagujarati: 0x0AA2,
-  ddhagurmukhi: 0x0A22,
-  ddotaccent: 0x1E0B,
-  ddotbelow: 0x1E0D,
-  decimalseparatorarabic: 0x066B,
-  decimalseparatorpersian: 0x066B,
-  decyrillic: 0x0434,
-  degree: 0x00B0,
-  dehihebrew: 0x05AD,
-  dehiragana: 0x3067,
-  deicoptic: 0x03EF,
-  dekatakana: 0x30C7,
-  deleteleft: 0x232B,
-  deleteright: 0x2326,
-  delta: 0x03B4,
-  deltaturned: 0x018D,
-  denominatorminusonenumeratorbengali: 0x09F8,
-  dezh: 0x02A4,
-  dhabengali: 0x09A7,
-  dhadeva: 0x0927,
-  dhagujarati: 0x0AA7,
-  dhagurmukhi: 0x0A27,
-  dhook: 0x0257,
-  dialytikatonos: 0x0385,
-  dialytikatonoscmb: 0x0344,
-  diamond: 0x2666,
-  diamondsuitwhite: 0x2662,
-  dieresis: 0x00A8,
-  dieresisacute: 0xF6D7,
-  dieresisbelowcmb: 0x0324,
-  dieresiscmb: 0x0308,
-  dieresisgrave: 0xF6D8,
-  dieresistonos: 0x0385,
-  dihiragana: 0x3062,
-  dikatakana: 0x30C2,
-  dittomark: 0x3003,
-  divide: 0x00F7,
-  divides: 0x2223,
-  divisionslash: 0x2215,
-  djecyrillic: 0x0452,
-  dkshade: 0x2593,
-  dlinebelow: 0x1E0F,
-  dlsquare: 0x3397,
-  dmacron: 0x0111,
-  dmonospace: 0xFF44,
-  dnblock: 0x2584,
-  dochadathai: 0x0E0E,
-  dodekthai: 0x0E14,
-  dohiragana: 0x3069,
-  dokatakana: 0x30C9,
-  dollar: 0x0024,
-  dollarinferior: 0xF6E3,
-  dollarmonospace: 0xFF04,
-  dollaroldstyle: 0xF724,
-  dollarsmall: 0xFE69,
-  dollarsuperior: 0xF6E4,
-  dong: 0x20AB,
-  dorusquare: 0x3326,
-  dotaccent: 0x02D9,
-  dotaccentcmb: 0x0307,
-  dotbelowcmb: 0x0323,
-  dotbelowcomb: 0x0323,
-  dotkatakana: 0x30FB,
-  dotlessi: 0x0131,
-  dotlessj: 0xF6BE,
-  dotlessjstrokehook: 0x0284,
-  dotmath: 0x22C5,
-  dottedcircle: 0x25CC,
-  doubleyodpatah: 0xFB1F,
-  doubleyodpatahhebrew: 0xFB1F,
-  downtackbelowcmb: 0x031E,
-  downtackmod: 0x02D5,
-  dparen: 0x249F,
-  dsuperior: 0xF6EB,
-  dtail: 0x0256,
-  dtopbar: 0x018C,
-  duhiragana: 0x3065,
-  dukatakana: 0x30C5,
-  dz: 0x01F3,
-  dzaltone: 0x02A3,
-  dzcaron: 0x01C6,
-  dzcurl: 0x02A5,
-  dzeabkhasiancyrillic: 0x04E1,
-  dzecyrillic: 0x0455,
-  dzhecyrillic: 0x045F,
-  e: 0x0065,
-  eacute: 0x00E9,
-  earth: 0x2641,
-  ebengali: 0x098F,
-  ebopomofo: 0x311C,
-  ebreve: 0x0115,
-  ecandradeva: 0x090D,
-  ecandragujarati: 0x0A8D,
-  ecandravowelsigndeva: 0x0945,
-  ecandravowelsigngujarati: 0x0AC5,
-  ecaron: 0x011B,
-  ecedillabreve: 0x1E1D,
-  echarmenian: 0x0565,
-  echyiwnarmenian: 0x0587,
-  ecircle: 0x24D4,
-  ecircumflex: 0x00EA,
-  ecircumflexacute: 0x1EBF,
-  ecircumflexbelow: 0x1E19,
-  ecircumflexdotbelow: 0x1EC7,
-  ecircumflexgrave: 0x1EC1,
-  ecircumflexhookabove: 0x1EC3,
-  ecircumflextilde: 0x1EC5,
-  ecyrillic: 0x0454,
-  edblgrave: 0x0205,
-  edeva: 0x090F,
-  edieresis: 0x00EB,
-  edot: 0x0117,
-  edotaccent: 0x0117,
-  edotbelow: 0x1EB9,
-  eegurmukhi: 0x0A0F,
-  eematragurmukhi: 0x0A47,
-  efcyrillic: 0x0444,
-  egrave: 0x00E8,
-  egujarati: 0x0A8F,
-  eharmenian: 0x0567,
-  ehbopomofo: 0x311D,
-  ehiragana: 0x3048,
-  ehookabove: 0x1EBB,
-  eibopomofo: 0x311F,
-  eight: 0x0038,
-  eightarabic: 0x0668,
-  eightbengali: 0x09EE,
-  eightcircle: 0x2467,
-  eightcircleinversesansserif: 0x2791,
-  eightdeva: 0x096E,
-  eighteencircle: 0x2471,
-  eighteenparen: 0x2485,
-  eighteenperiod: 0x2499,
-  eightgujarati: 0x0AEE,
-  eightgurmukhi: 0x0A6E,
-  eighthackarabic: 0x0668,
-  eighthangzhou: 0x3028,
-  eighthnotebeamed: 0x266B,
-  eightideographicparen: 0x3227,
-  eightinferior: 0x2088,
-  eightmonospace: 0xFF18,
-  eightoldstyle: 0xF738,
-  eightparen: 0x247B,
-  eightperiod: 0x248F,
-  eightpersian: 0x06F8,
-  eightroman: 0x2177,
-  eightsuperior: 0x2078,
-  eightthai: 0x0E58,
-  einvertedbreve: 0x0207,
-  eiotifiedcyrillic: 0x0465,
-  ekatakana: 0x30A8,
-  ekatakanahalfwidth: 0xFF74,
-  ekonkargurmukhi: 0x0A74,
-  ekorean: 0x3154,
-  elcyrillic: 0x043B,
-  element: 0x2208,
-  elevencircle: 0x246A,
-  elevenparen: 0x247E,
-  elevenperiod: 0x2492,
-  elevenroman: 0x217A,
-  ellipsis: 0x2026,
-  ellipsisvertical: 0x22EE,
-  emacron: 0x0113,
-  emacronacute: 0x1E17,
-  emacrongrave: 0x1E15,
-  emcyrillic: 0x043C,
-  emdash: 0x2014,
-  emdashvertical: 0xFE31,
-  emonospace: 0xFF45,
-  emphasismarkarmenian: 0x055B,
-  emptyset: 0x2205,
-  enbopomofo: 0x3123,
-  encyrillic: 0x043D,
-  endash: 0x2013,
-  endashvertical: 0xFE32,
-  endescendercyrillic: 0x04A3,
-  eng: 0x014B,
-  engbopomofo: 0x3125,
-  enghecyrillic: 0x04A5,
-  enhookcyrillic: 0x04C8,
-  enspace: 0x2002,
-  eogonek: 0x0119,
-  eokorean: 0x3153,
-  eopen: 0x025B,
-  eopenclosed: 0x029A,
-  eopenreversed: 0x025C,
-  eopenreversedclosed: 0x025E,
-  eopenreversedhook: 0x025D,
-  eparen: 0x24A0,
-  epsilon: 0x03B5,
-  epsilontonos: 0x03AD,
-  equal: 0x003D,
-  equalmonospace: 0xFF1D,
-  equalsmall: 0xFE66,
-  equalsuperior: 0x207C,
-  equivalence: 0x2261,
-  erbopomofo: 0x3126,
-  ercyrillic: 0x0440,
-  ereversed: 0x0258,
-  ereversedcyrillic: 0x044D,
-  escyrillic: 0x0441,
-  esdescendercyrillic: 0x04AB,
-  esh: 0x0283,
-  eshcurl: 0x0286,
-  eshortdeva: 0x090E,
-  eshortvowelsigndeva: 0x0946,
-  eshreversedloop: 0x01AA,
-  eshsquatreversed: 0x0285,
-  esmallhiragana: 0x3047,
-  esmallkatakana: 0x30A7,
-  esmallkatakanahalfwidth: 0xFF6A,
-  estimated: 0x212E,
-  esuperior: 0xF6EC,
-  eta: 0x03B7,
-  etarmenian: 0x0568,
-  etatonos: 0x03AE,
-  eth: 0x00F0,
-  etilde: 0x1EBD,
-  etildebelow: 0x1E1B,
-  etnahtafoukhhebrew: 0x0591,
-  etnahtafoukhlefthebrew: 0x0591,
-  etnahtahebrew: 0x0591,
-  etnahtalefthebrew: 0x0591,
-  eturned: 0x01DD,
-  eukorean: 0x3161,
-  euro: 0x20AC,
-  evowelsignbengali: 0x09C7,
-  evowelsigndeva: 0x0947,
-  evowelsigngujarati: 0x0AC7,
-  exclam: 0x0021,
-  exclamarmenian: 0x055C,
-  exclamdbl: 0x203C,
-  exclamdown: 0x00A1,
-  exclamdownsmall: 0xF7A1,
-  exclammonospace: 0xFF01,
-  exclamsmall: 0xF721,
-  existential: 0x2203,
-  ezh: 0x0292,
-  ezhcaron: 0x01EF,
-  ezhcurl: 0x0293,
-  ezhreversed: 0x01B9,
-  ezhtail: 0x01BA,
-  f: 0x0066,
-  fadeva: 0x095E,
-  fagurmukhi: 0x0A5E,
-  fahrenheit: 0x2109,
-  fathaarabic: 0x064E,
-  fathalowarabic: 0x064E,
-  fathatanarabic: 0x064B,
-  fbopomofo: 0x3108,
-  fcircle: 0x24D5,
-  fdotaccent: 0x1E1F,
-  feharabic: 0x0641,
-  feharmenian: 0x0586,
-  fehfinalarabic: 0xFED2,
-  fehinitialarabic: 0xFED3,
-  fehmedialarabic: 0xFED4,
-  feicoptic: 0x03E5,
-  female: 0x2640,
-  ff: 0xFB00,
-  ffi: 0xFB03,
-  ffl: 0xFB04,
-  fi: 0xFB01,
-  fifteencircle: 0x246E,
-  fifteenparen: 0x2482,
-  fifteenperiod: 0x2496,
-  figuredash: 0x2012,
-  filledbox: 0x25A0,
-  filledrect: 0x25AC,
-  finalkaf: 0x05DA,
-  finalkafdagesh: 0xFB3A,
-  finalkafdageshhebrew: 0xFB3A,
-  finalkafhebrew: 0x05DA,
-  finalmem: 0x05DD,
-  finalmemhebrew: 0x05DD,
-  finalnun: 0x05DF,
-  finalnunhebrew: 0x05DF,
-  finalpe: 0x05E3,
-  finalpehebrew: 0x05E3,
-  finaltsadi: 0x05E5,
-  finaltsadihebrew: 0x05E5,
-  firsttonechinese: 0x02C9,
-  fisheye: 0x25C9,
-  fitacyrillic: 0x0473,
-  five: 0x0035,
-  fivearabic: 0x0665,
-  fivebengali: 0x09EB,
-  fivecircle: 0x2464,
-  fivecircleinversesansserif: 0x278E,
-  fivedeva: 0x096B,
-  fiveeighths: 0x215D,
-  fivegujarati: 0x0AEB,
-  fivegurmukhi: 0x0A6B,
-  fivehackarabic: 0x0665,
-  fivehangzhou: 0x3025,
-  fiveideographicparen: 0x3224,
-  fiveinferior: 0x2085,
-  fivemonospace: 0xFF15,
-  fiveoldstyle: 0xF735,
-  fiveparen: 0x2478,
-  fiveperiod: 0x248C,
-  fivepersian: 0x06F5,
-  fiveroman: 0x2174,
-  fivesuperior: 0x2075,
-  fivethai: 0x0E55,
-  fl: 0xFB02,
-  florin: 0x0192,
-  fmonospace: 0xFF46,
-  fmsquare: 0x3399,
-  fofanthai: 0x0E1F,
-  fofathai: 0x0E1D,
-  fongmanthai: 0x0E4F,
-  forall: 0x2200,
-  four: 0x0034,
-  fourarabic: 0x0664,
-  fourbengali: 0x09EA,
-  fourcircle: 0x2463,
-  fourcircleinversesansserif: 0x278D,
-  fourdeva: 0x096A,
-  fourgujarati: 0x0AEA,
-  fourgurmukhi: 0x0A6A,
-  fourhackarabic: 0x0664,
-  fourhangzhou: 0x3024,
-  fourideographicparen: 0x3223,
-  fourinferior: 0x2084,
-  fourmonospace: 0xFF14,
-  fournumeratorbengali: 0x09F7,
-  fouroldstyle: 0xF734,
-  fourparen: 0x2477,
-  fourperiod: 0x248B,
-  fourpersian: 0x06F4,
-  fourroman: 0x2173,
-  foursuperior: 0x2074,
-  fourteencircle: 0x246D,
-  fourteenparen: 0x2481,
-  fourteenperiod: 0x2495,
-  fourthai: 0x0E54,
-  fourthtonechinese: 0x02CB,
-  fparen: 0x24A1,
-  fraction: 0x2044,
-  franc: 0x20A3,
-  g: 0x0067,
-  gabengali: 0x0997,
-  gacute: 0x01F5,
-  gadeva: 0x0917,
-  gafarabic: 0x06AF,
-  gaffinalarabic: 0xFB93,
-  gafinitialarabic: 0xFB94,
-  gafmedialarabic: 0xFB95,
-  gagujarati: 0x0A97,
-  gagurmukhi: 0x0A17,
-  gahiragana: 0x304C,
-  gakatakana: 0x30AC,
-  gamma: 0x03B3,
-  gammalatinsmall: 0x0263,
-  gammasuperior: 0x02E0,
-  gangiacoptic: 0x03EB,
-  gbopomofo: 0x310D,
-  gbreve: 0x011F,
-  gcaron: 0x01E7,
-  gcedilla: 0x0123,
-  gcircle: 0x24D6,
-  gcircumflex: 0x011D,
-  gcommaaccent: 0x0123,
-  gdot: 0x0121,
-  gdotaccent: 0x0121,
-  gecyrillic: 0x0433,
-  gehiragana: 0x3052,
-  gekatakana: 0x30B2,
-  geometricallyequal: 0x2251,
-  gereshaccenthebrew: 0x059C,
-  gereshhebrew: 0x05F3,
-  gereshmuqdamhebrew: 0x059D,
-  germandbls: 0x00DF,
-  gershayimaccenthebrew: 0x059E,
-  gershayimhebrew: 0x05F4,
-  getamark: 0x3013,
-  ghabengali: 0x0998,
-  ghadarmenian: 0x0572,
-  ghadeva: 0x0918,
-  ghagujarati: 0x0A98,
-  ghagurmukhi: 0x0A18,
-  ghainarabic: 0x063A,
-  ghainfinalarabic: 0xFECE,
-  ghaininitialarabic: 0xFECF,
-  ghainmedialarabic: 0xFED0,
-  ghemiddlehookcyrillic: 0x0495,
-  ghestrokecyrillic: 0x0493,
-  gheupturncyrillic: 0x0491,
-  ghhadeva: 0x095A,
-  ghhagurmukhi: 0x0A5A,
-  ghook: 0x0260,
-  ghzsquare: 0x3393,
-  gihiragana: 0x304E,
-  gikatakana: 0x30AE,
-  gimarmenian: 0x0563,
-  gimel: 0x05D2,
-  gimeldagesh: 0xFB32,
-  gimeldageshhebrew: 0xFB32,
-  gimelhebrew: 0x05D2,
-  gjecyrillic: 0x0453,
-  glottalinvertedstroke: 0x01BE,
-  glottalstop: 0x0294,
-  glottalstopinverted: 0x0296,
-  glottalstopmod: 0x02C0,
-  glottalstopreversed: 0x0295,
-  glottalstopreversedmod: 0x02C1,
-  glottalstopreversedsuperior: 0x02E4,
-  glottalstopstroke: 0x02A1,
-  glottalstopstrokereversed: 0x02A2,
-  gmacron: 0x1E21,
-  gmonospace: 0xFF47,
-  gohiragana: 0x3054,
-  gokatakana: 0x30B4,
-  gparen: 0x24A2,
-  gpasquare: 0x33AC,
-  gradient: 0x2207,
-  grave: 0x0060,
-  gravebelowcmb: 0x0316,
-  gravecmb: 0x0300,
-  gravecomb: 0x0300,
-  gravedeva: 0x0953,
-  gravelowmod: 0x02CE,
-  gravemonospace: 0xFF40,
-  gravetonecmb: 0x0340,
-  greater: 0x003E,
-  greaterequal: 0x2265,
-  greaterequalorless: 0x22DB,
-  greatermonospace: 0xFF1E,
-  greaterorequivalent: 0x2273,
-  greaterorless: 0x2277,
-  greateroverequal: 0x2267,
-  greatersmall: 0xFE65,
-  gscript: 0x0261,
-  gstroke: 0x01E5,
-  guhiragana: 0x3050,
-  guillemotleft: 0x00AB,
-  guillemotright: 0x00BB,
-  guilsinglleft: 0x2039,
-  guilsinglright: 0x203A,
-  gukatakana: 0x30B0,
-  guramusquare: 0x3318,
-  gysquare: 0x33C9,
-  h: 0x0068,
-  haabkhasiancyrillic: 0x04A9,
-  haaltonearabic: 0x06C1,
-  habengali: 0x09B9,
-  hadescendercyrillic: 0x04B3,
-  hadeva: 0x0939,
-  hagujarati: 0x0AB9,
-  hagurmukhi: 0x0A39,
-  haharabic: 0x062D,
-  hahfinalarabic: 0xFEA2,
-  hahinitialarabic: 0xFEA3,
-  hahiragana: 0x306F,
-  hahmedialarabic: 0xFEA4,
-  haitusquare: 0x332A,
-  hakatakana: 0x30CF,
-  hakatakanahalfwidth: 0xFF8A,
-  halantgurmukhi: 0x0A4D,
-  hamzaarabic: 0x0621,
-  hamzalowarabic: 0x0621,
-  hangulfiller: 0x3164,
-  hardsigncyrillic: 0x044A,
-  harpoonleftbarbup: 0x21BC,
-  harpoonrightbarbup: 0x21C0,
-  hasquare: 0x33CA,
-  hatafpatah: 0x05B2,
-  hatafpatah16: 0x05B2,
-  hatafpatah23: 0x05B2,
-  hatafpatah2f: 0x05B2,
-  hatafpatahhebrew: 0x05B2,
-  hatafpatahnarrowhebrew: 0x05B2,
-  hatafpatahquarterhebrew: 0x05B2,
-  hatafpatahwidehebrew: 0x05B2,
-  hatafqamats: 0x05B3,
-  hatafqamats1b: 0x05B3,
-  hatafqamats28: 0x05B3,
-  hatafqamats34: 0x05B3,
-  hatafqamatshebrew: 0x05B3,
-  hatafqamatsnarrowhebrew: 0x05B3,
-  hatafqamatsquarterhebrew: 0x05B3,
-  hatafqamatswidehebrew: 0x05B3,
-  hatafsegol: 0x05B1,
-  hatafsegol17: 0x05B1,
-  hatafsegol24: 0x05B1,
-  hatafsegol30: 0x05B1,
-  hatafsegolhebrew: 0x05B1,
-  hatafsegolnarrowhebrew: 0x05B1,
-  hatafsegolquarterhebrew: 0x05B1,
-  hatafsegolwidehebrew: 0x05B1,
-  hbar: 0x0127,
-  hbopomofo: 0x310F,
-  hbrevebelow: 0x1E2B,
-  hcedilla: 0x1E29,
-  hcircle: 0x24D7,
-  hcircumflex: 0x0125,
-  hdieresis: 0x1E27,
-  hdotaccent: 0x1E23,
-  hdotbelow: 0x1E25,
-  he: 0x05D4,
-  heart: 0x2665,
-  heartsuitblack: 0x2665,
-  heartsuitwhite: 0x2661,
-  hedagesh: 0xFB34,
-  hedageshhebrew: 0xFB34,
-  hehaltonearabic: 0x06C1,
-  heharabic: 0x0647,
-  hehebrew: 0x05D4,
-  hehfinalaltonearabic: 0xFBA7,
-  hehfinalalttwoarabic: 0xFEEA,
-  hehfinalarabic: 0xFEEA,
-  hehhamzaabovefinalarabic: 0xFBA5,
-  hehhamzaaboveisolatedarabic: 0xFBA4,
-  hehinitialaltonearabic: 0xFBA8,
-  hehinitialarabic: 0xFEEB,
-  hehiragana: 0x3078,
-  hehmedialaltonearabic: 0xFBA9,
-  hehmedialarabic: 0xFEEC,
-  heiseierasquare: 0x337B,
-  hekatakana: 0x30D8,
-  hekatakanahalfwidth: 0xFF8D,
-  hekutaarusquare: 0x3336,
-  henghook: 0x0267,
-  herutusquare: 0x3339,
-  het: 0x05D7,
-  hethebrew: 0x05D7,
-  hhook: 0x0266,
-  hhooksuperior: 0x02B1,
-  hieuhacirclekorean: 0x327B,
-  hieuhaparenkorean: 0x321B,
-  hieuhcirclekorean: 0x326D,
-  hieuhkorean: 0x314E,
-  hieuhparenkorean: 0x320D,
-  hihiragana: 0x3072,
-  hikatakana: 0x30D2,
-  hikatakanahalfwidth: 0xFF8B,
-  hiriq: 0x05B4,
-  hiriq14: 0x05B4,
-  hiriq21: 0x05B4,
-  hiriq2d: 0x05B4,
-  hiriqhebrew: 0x05B4,
-  hiriqnarrowhebrew: 0x05B4,
-  hiriqquarterhebrew: 0x05B4,
-  hiriqwidehebrew: 0x05B4,
-  hlinebelow: 0x1E96,
-  hmonospace: 0xFF48,
-  hoarmenian: 0x0570,
-  hohipthai: 0x0E2B,
-  hohiragana: 0x307B,
-  hokatakana: 0x30DB,
-  hokatakanahalfwidth: 0xFF8E,
-  holam: 0x05B9,
-  holam19: 0x05B9,
-  holam26: 0x05B9,
-  holam32: 0x05B9,
-  holamhebrew: 0x05B9,
-  holamnarrowhebrew: 0x05B9,
-  holamquarterhebrew: 0x05B9,
-  holamwidehebrew: 0x05B9,
-  honokhukthai: 0x0E2E,
-  hookabovecomb: 0x0309,
-  hookcmb: 0x0309,
-  hookpalatalizedbelowcmb: 0x0321,
-  hookretroflexbelowcmb: 0x0322,
-  hoonsquare: 0x3342,
-  horicoptic: 0x03E9,
-  horizontalbar: 0x2015,
-  horncmb: 0x031B,
-  hotsprings: 0x2668,
-  house: 0x2302,
-  hparen: 0x24A3,
-  hsuperior: 0x02B0,
-  hturned: 0x0265,
-  huhiragana: 0x3075,
-  huiitosquare: 0x3333,
-  hukatakana: 0x30D5,
-  hukatakanahalfwidth: 0xFF8C,
-  hungarumlaut: 0x02DD,
-  hungarumlautcmb: 0x030B,
-  hv: 0x0195,
-  hyphen: 0x002D,
-  hypheninferior: 0xF6E5,
-  hyphenmonospace: 0xFF0D,
-  hyphensmall: 0xFE63,
-  hyphensuperior: 0xF6E6,
-  hyphentwo: 0x2010,
-  i: 0x0069,
-  iacute: 0x00ED,
-  iacyrillic: 0x044F,
-  ibengali: 0x0987,
-  ibopomofo: 0x3127,
-  ibreve: 0x012D,
-  icaron: 0x01D0,
-  icircle: 0x24D8,
-  icircumflex: 0x00EE,
-  icyrillic: 0x0456,
-  idblgrave: 0x0209,
-  ideographearthcircle: 0x328F,
-  ideographfirecircle: 0x328B,
-  ideographicallianceparen: 0x323F,
-  ideographiccallparen: 0x323A,
-  ideographiccentrecircle: 0x32A5,
-  ideographicclose: 0x3006,
-  ideographiccomma: 0x3001,
-  ideographiccommaleft: 0xFF64,
-  ideographiccongratulationparen: 0x3237,
-  ideographiccorrectcircle: 0x32A3,
-  ideographicearthparen: 0x322F,
-  ideographicenterpriseparen: 0x323D,
-  ideographicexcellentcircle: 0x329D,
-  ideographicfestivalparen: 0x3240,
-  ideographicfinancialcircle: 0x3296,
-  ideographicfinancialparen: 0x3236,
-  ideographicfireparen: 0x322B,
-  ideographichaveparen: 0x3232,
-  ideographichighcircle: 0x32A4,
-  ideographiciterationmark: 0x3005,
-  ideographiclaborcircle: 0x3298,
-  ideographiclaborparen: 0x3238,
-  ideographicleftcircle: 0x32A7,
-  ideographiclowcircle: 0x32A6,
-  ideographicmedicinecircle: 0x32A9,
-  ideographicmetalparen: 0x322E,
-  ideographicmoonparen: 0x322A,
-  ideographicnameparen: 0x3234,
-  ideographicperiod: 0x3002,
-  ideographicprintcircle: 0x329E,
-  ideographicreachparen: 0x3243,
-  ideographicrepresentparen: 0x3239,
-  ideographicresourceparen: 0x323E,
-  ideographicrightcircle: 0x32A8,
-  ideographicsecretcircle: 0x3299,
-  ideographicselfparen: 0x3242,
-  ideographicsocietyparen: 0x3233,
-  ideographicspace: 0x3000,
-  ideographicspecialparen: 0x3235,
-  ideographicstockparen: 0x3231,
-  ideographicstudyparen: 0x323B,
-  ideographicsunparen: 0x3230,
-  ideographicsuperviseparen: 0x323C,
-  ideographicwaterparen: 0x322C,
-  ideographicwoodparen: 0x322D,
-  ideographiczero: 0x3007,
-  ideographmetalcircle: 0x328E,
-  ideographmooncircle: 0x328A,
-  ideographnamecircle: 0x3294,
-  ideographsuncircle: 0x3290,
-  ideographwatercircle: 0x328C,
-  ideographwoodcircle: 0x328D,
-  ideva: 0x0907,
-  idieresis: 0x00EF,
-  idieresisacute: 0x1E2F,
-  idieresiscyrillic: 0x04E5,
-  idotbelow: 0x1ECB,
-  iebrevecyrillic: 0x04D7,
-  iecyrillic: 0x0435,
-  ieungacirclekorean: 0x3275,
-  ieungaparenkorean: 0x3215,
-  ieungcirclekorean: 0x3267,
-  ieungkorean: 0x3147,
-  ieungparenkorean: 0x3207,
-  igrave: 0x00EC,
-  igujarati: 0x0A87,
-  igurmukhi: 0x0A07,
-  ihiragana: 0x3044,
-  ihookabove: 0x1EC9,
-  iibengali: 0x0988,
-  iicyrillic: 0x0438,
-  iideva: 0x0908,
-  iigujarati: 0x0A88,
-  iigurmukhi: 0x0A08,
-  iimatragurmukhi: 0x0A40,
-  iinvertedbreve: 0x020B,
-  iishortcyrillic: 0x0439,
-  iivowelsignbengali: 0x09C0,
-  iivowelsigndeva: 0x0940,
-  iivowelsigngujarati: 0x0AC0,
-  ij: 0x0133,
-  ikatakana: 0x30A4,
-  ikatakanahalfwidth: 0xFF72,
-  ikorean: 0x3163,
-  ilde: 0x02DC,
-  iluyhebrew: 0x05AC,
-  imacron: 0x012B,
-  imacroncyrillic: 0x04E3,
-  imageorapproximatelyequal: 0x2253,
-  imatragurmukhi: 0x0A3F,
-  imonospace: 0xFF49,
-  increment: 0x2206,
-  infinity: 0x221E,
-  iniarmenian: 0x056B,
-  integral: 0x222B,
-  integralbottom: 0x2321,
-  integralbt: 0x2321,
-  integralex: 0xF8F5,
-  integraltop: 0x2320,
-  integraltp: 0x2320,
-  intersection: 0x2229,
-  intisquare: 0x3305,
-  invbullet: 0x25D8,
-  invcircle: 0x25D9,
-  invsmileface: 0x263B,
-  iocyrillic: 0x0451,
-  iogonek: 0x012F,
-  iota: 0x03B9,
-  iotadieresis: 0x03CA,
-  iotadieresistonos: 0x0390,
-  iotalatin: 0x0269,
-  iotatonos: 0x03AF,
-  iparen: 0x24A4,
-  irigurmukhi: 0x0A72,
-  ismallhiragana: 0x3043,
-  ismallkatakana: 0x30A3,
-  ismallkatakanahalfwidth: 0xFF68,
-  issharbengali: 0x09FA,
-  istroke: 0x0268,
-  isuperior: 0xF6ED,
-  iterationhiragana: 0x309D,
-  iterationkatakana: 0x30FD,
-  itilde: 0x0129,
-  itildebelow: 0x1E2D,
-  iubopomofo: 0x3129,
-  iucyrillic: 0x044E,
-  ivowelsignbengali: 0x09BF,
-  ivowelsigndeva: 0x093F,
-  ivowelsigngujarati: 0x0ABF,
-  izhitsacyrillic: 0x0475,
-  izhitsadblgravecyrillic: 0x0477,
-  j: 0x006A,
-  jaarmenian: 0x0571,
-  jabengali: 0x099C,
-  jadeva: 0x091C,
-  jagujarati: 0x0A9C,
-  jagurmukhi: 0x0A1C,
-  jbopomofo: 0x3110,
-  jcaron: 0x01F0,
-  jcircle: 0x24D9,
-  jcircumflex: 0x0135,
-  jcrossedtail: 0x029D,
-  jdotlessstroke: 0x025F,
-  jecyrillic: 0x0458,
-  jeemarabic: 0x062C,
-  jeemfinalarabic: 0xFE9E,
-  jeeminitialarabic: 0xFE9F,
-  jeemmedialarabic: 0xFEA0,
-  jeharabic: 0x0698,
-  jehfinalarabic: 0xFB8B,
-  jhabengali: 0x099D,
-  jhadeva: 0x091D,
-  jhagujarati: 0x0A9D,
-  jhagurmukhi: 0x0A1D,
-  jheharmenian: 0x057B,
-  jis: 0x3004,
-  jmonospace: 0xFF4A,
-  jparen: 0x24A5,
-  jsuperior: 0x02B2,
-  k: 0x006B,
-  kabashkircyrillic: 0x04A1,
-  kabengali: 0x0995,
-  kacute: 0x1E31,
-  kacyrillic: 0x043A,
-  kadescendercyrillic: 0x049B,
-  kadeva: 0x0915,
-  kaf: 0x05DB,
-  kafarabic: 0x0643,
-  kafdagesh: 0xFB3B,
-  kafdageshhebrew: 0xFB3B,
-  kaffinalarabic: 0xFEDA,
-  kafhebrew: 0x05DB,
-  kafinitialarabic: 0xFEDB,
-  kafmedialarabic: 0xFEDC,
-  kafrafehebrew: 0xFB4D,
-  kagujarati: 0x0A95,
-  kagurmukhi: 0x0A15,
-  kahiragana: 0x304B,
-  kahookcyrillic: 0x04C4,
-  kakatakana: 0x30AB,
-  kakatakanahalfwidth: 0xFF76,
-  kappa: 0x03BA,
-  kappasymbolgreek: 0x03F0,
-  kapyeounmieumkorean: 0x3171,
-  kapyeounphieuphkorean: 0x3184,
-  kapyeounpieupkorean: 0x3178,
-  kapyeounssangpieupkorean: 0x3179,
-  karoriisquare: 0x330D,
-  kashidaautoarabic: 0x0640,
-  kashidaautonosidebearingarabic: 0x0640,
-  kasmallkatakana: 0x30F5,
-  kasquare: 0x3384,
-  kasraarabic: 0x0650,
-  kasratanarabic: 0x064D,
-  kastrokecyrillic: 0x049F,
-  katahiraprolongmarkhalfwidth: 0xFF70,
-  kaverticalstrokecyrillic: 0x049D,
-  kbopomofo: 0x310E,
-  kcalsquare: 0x3389,
-  kcaron: 0x01E9,
-  kcedilla: 0x0137,
-  kcircle: 0x24DA,
-  kcommaaccent: 0x0137,
-  kdotbelow: 0x1E33,
-  keharmenian: 0x0584,
-  kehiragana: 0x3051,
-  kekatakana: 0x30B1,
-  kekatakanahalfwidth: 0xFF79,
-  kenarmenian: 0x056F,
-  kesmallkatakana: 0x30F6,
-  kgreenlandic: 0x0138,
-  khabengali: 0x0996,
-  khacyrillic: 0x0445,
-  khadeva: 0x0916,
-  khagujarati: 0x0A96,
-  khagurmukhi: 0x0A16,
-  khaharabic: 0x062E,
-  khahfinalarabic: 0xFEA6,
-  khahinitialarabic: 0xFEA7,
-  khahmedialarabic: 0xFEA8,
-  kheicoptic: 0x03E7,
-  khhadeva: 0x0959,
-  khhagurmukhi: 0x0A59,
-  khieukhacirclekorean: 0x3278,
-  khieukhaparenkorean: 0x3218,
-  khieukhcirclekorean: 0x326A,
-  khieukhkorean: 0x314B,
-  khieukhparenkorean: 0x320A,
-  khokhaithai: 0x0E02,
-  khokhonthai: 0x0E05,
-  khokhuatthai: 0x0E03,
-  khokhwaithai: 0x0E04,
-  khomutthai: 0x0E5B,
-  khook: 0x0199,
-  khorakhangthai: 0x0E06,
-  khzsquare: 0x3391,
-  kihiragana: 0x304D,
-  kikatakana: 0x30AD,
-  kikatakanahalfwidth: 0xFF77,
-  kiroguramusquare: 0x3315,
-  kiromeetorusquare: 0x3316,
-  kirosquare: 0x3314,
-  kiyeokacirclekorean: 0x326E,
-  kiyeokaparenkorean: 0x320E,
-  kiyeokcirclekorean: 0x3260,
-  kiyeokkorean: 0x3131,
-  kiyeokparenkorean: 0x3200,
-  kiyeoksioskorean: 0x3133,
-  kjecyrillic: 0x045C,
-  klinebelow: 0x1E35,
-  klsquare: 0x3398,
-  kmcubedsquare: 0x33A6,
-  kmonospace: 0xFF4B,
-  kmsquaredsquare: 0x33A2,
-  kohiragana: 0x3053,
-  kohmsquare: 0x33C0,
-  kokaithai: 0x0E01,
-  kokatakana: 0x30B3,
-  kokatakanahalfwidth: 0xFF7A,
-  kooposquare: 0x331E,
-  koppacyrillic: 0x0481,
-  koreanstandardsymbol: 0x327F,
-  koroniscmb: 0x0343,
-  kparen: 0x24A6,
-  kpasquare: 0x33AA,
-  ksicyrillic: 0x046F,
-  ktsquare: 0x33CF,
-  kturned: 0x029E,
-  kuhiragana: 0x304F,
-  kukatakana: 0x30AF,
-  kukatakanahalfwidth: 0xFF78,
-  kvsquare: 0x33B8,
-  kwsquare: 0x33BE,
-  l: 0x006C,
-  labengali: 0x09B2,
-  lacute: 0x013A,
-  ladeva: 0x0932,
-  lagujarati: 0x0AB2,
-  lagurmukhi: 0x0A32,
-  lakkhangyaothai: 0x0E45,
-  lamaleffinalarabic: 0xFEFC,
-  lamalefhamzaabovefinalarabic: 0xFEF8,
-  lamalefhamzaaboveisolatedarabic: 0xFEF7,
-  lamalefhamzabelowfinalarabic: 0xFEFA,
-  lamalefhamzabelowisolatedarabic: 0xFEF9,
-  lamalefisolatedarabic: 0xFEFB,
-  lamalefmaddaabovefinalarabic: 0xFEF6,
-  lamalefmaddaaboveisolatedarabic: 0xFEF5,
-  lamarabic: 0x0644,
-  lambda: 0x03BB,
-  lambdastroke: 0x019B,
-  lamed: 0x05DC,
-  lameddagesh: 0xFB3C,
-  lameddageshhebrew: 0xFB3C,
-  lamedhebrew: 0x05DC,
-  lamfinalarabic: 0xFEDE,
-  lamhahinitialarabic: 0xFCCA,
-  laminitialarabic: 0xFEDF,
-  lamjeeminitialarabic: 0xFCC9,
-  lamkhahinitialarabic: 0xFCCB,
-  lamlamhehisolatedarabic: 0xFDF2,
-  lammedialarabic: 0xFEE0,
-  lammeemhahinitialarabic: 0xFD88,
-  lammeeminitialarabic: 0xFCCC,
-  largecircle: 0x25EF,
-  lbar: 0x019A,
-  lbelt: 0x026C,
-  lbopomofo: 0x310C,
-  lcaron: 0x013E,
-  lcedilla: 0x013C,
-  lcircle: 0x24DB,
-  lcircumflexbelow: 0x1E3D,
-  lcommaaccent: 0x013C,
-  ldot: 0x0140,
-  ldotaccent: 0x0140,
-  ldotbelow: 0x1E37,
-  ldotbelowmacron: 0x1E39,
-  leftangleabovecmb: 0x031A,
-  lefttackbelowcmb: 0x0318,
-  less: 0x003C,
-  lessequal: 0x2264,
-  lessequalorgreater: 0x22DA,
-  lessmonospace: 0xFF1C,
-  lessorequivalent: 0x2272,
-  lessorgreater: 0x2276,
-  lessoverequal: 0x2266,
-  lesssmall: 0xFE64,
-  lezh: 0x026E,
-  lfblock: 0x258C,
-  lhookretroflex: 0x026D,
-  lira: 0x20A4,
-  liwnarmenian: 0x056C,
-  lj: 0x01C9,
-  ljecyrillic: 0x0459,
-  ll: 0xF6C0,
-  lladeva: 0x0933,
-  llagujarati: 0x0AB3,
-  llinebelow: 0x1E3B,
-  llladeva: 0x0934,
-  llvocalicbengali: 0x09E1,
-  llvocalicdeva: 0x0961,
-  llvocalicvowelsignbengali: 0x09E3,
-  llvocalicvowelsigndeva: 0x0963,
-  lmiddletilde: 0x026B,
-  lmonospace: 0xFF4C,
-  lmsquare: 0x33D0,
-  lochulathai: 0x0E2C,
-  logicaland: 0x2227,
-  logicalnot: 0x00AC,
-  logicalnotreversed: 0x2310,
-  logicalor: 0x2228,
-  lolingthai: 0x0E25,
-  longs: 0x017F,
-  lowlinecenterline: 0xFE4E,
-  lowlinecmb: 0x0332,
-  lowlinedashed: 0xFE4D,
-  lozenge: 0x25CA,
-  lparen: 0x24A7,
-  lslash: 0x0142,
-  lsquare: 0x2113,
-  lsuperior: 0xF6EE,
-  ltshade: 0x2591,
-  luthai: 0x0E26,
-  lvocalicbengali: 0x098C,
-  lvocalicdeva: 0x090C,
-  lvocalicvowelsignbengali: 0x09E2,
-  lvocalicvowelsigndeva: 0x0962,
-  lxsquare: 0x33D3,
-  m: 0x006D,
-  mabengali: 0x09AE,
-  macron: 0x00AF,
-  macronbelowcmb: 0x0331,
-  macroncmb: 0x0304,
-  macronlowmod: 0x02CD,
-  macronmonospace: 0xFFE3,
-  macute: 0x1E3F,
-  madeva: 0x092E,
-  magujarati: 0x0AAE,
-  magurmukhi: 0x0A2E,
-  mahapakhhebrew: 0x05A4,
-  mahapakhlefthebrew: 0x05A4,
-  mahiragana: 0x307E,
-  maichattawalowleftthai: 0xF895,
-  maichattawalowrightthai: 0xF894,
-  maichattawathai: 0x0E4B,
-  maichattawaupperleftthai: 0xF893,
-  maieklowleftthai: 0xF88C,
-  maieklowrightthai: 0xF88B,
-  maiekthai: 0x0E48,
-  maiekupperleftthai: 0xF88A,
-  maihanakatleftthai: 0xF884,
-  maihanakatthai: 0x0E31,
-  maitaikhuleftthai: 0xF889,
-  maitaikhuthai: 0x0E47,
-  maitholowleftthai: 0xF88F,
-  maitholowrightthai: 0xF88E,
-  maithothai: 0x0E49,
-  maithoupperleftthai: 0xF88D,
-  maitrilowleftthai: 0xF892,
-  maitrilowrightthai: 0xF891,
-  maitrithai: 0x0E4A,
-  maitriupperleftthai: 0xF890,
-  maiyamokthai: 0x0E46,
-  makatakana: 0x30DE,
-  makatakanahalfwidth: 0xFF8F,
-  male: 0x2642,
-  mansyonsquare: 0x3347,
-  maqafhebrew: 0x05BE,
-  mars: 0x2642,
-  masoracirclehebrew: 0x05AF,
-  masquare: 0x3383,
-  mbopomofo: 0x3107,
-  mbsquare: 0x33D4,
-  mcircle: 0x24DC,
-  mcubedsquare: 0x33A5,
-  mdotaccent: 0x1E41,
-  mdotbelow: 0x1E43,
-  meemarabic: 0x0645,
-  meemfinalarabic: 0xFEE2,
-  meeminitialarabic: 0xFEE3,
-  meemmedialarabic: 0xFEE4,
-  meemmeeminitialarabic: 0xFCD1,
-  meemmeemisolatedarabic: 0xFC48,
-  meetorusquare: 0x334D,
-  mehiragana: 0x3081,
-  meizierasquare: 0x337E,
-  mekatakana: 0x30E1,
-  mekatakanahalfwidth: 0xFF92,
-  mem: 0x05DE,
-  memdagesh: 0xFB3E,
-  memdageshhebrew: 0xFB3E,
-  memhebrew: 0x05DE,
-  menarmenian: 0x0574,
-  merkhahebrew: 0x05A5,
-  merkhakefulahebrew: 0x05A6,
-  merkhakefulalefthebrew: 0x05A6,
-  merkhalefthebrew: 0x05A5,
-  mhook: 0x0271,
-  mhzsquare: 0x3392,
-  middledotkatakanahalfwidth: 0xFF65,
-  middot: 0x00B7,
-  mieumacirclekorean: 0x3272,
-  mieumaparenkorean: 0x3212,
-  mieumcirclekorean: 0x3264,
-  mieumkorean: 0x3141,
-  mieumpansioskorean: 0x3170,
-  mieumparenkorean: 0x3204,
-  mieumpieupkorean: 0x316E,
-  mieumsioskorean: 0x316F,
-  mihiragana: 0x307F,
-  mikatakana: 0x30DF,
-  mikatakanahalfwidth: 0xFF90,
-  minus: 0x2212,
-  minusbelowcmb: 0x0320,
-  minuscircle: 0x2296,
-  minusmod: 0x02D7,
-  minusplus: 0x2213,
-  minute: 0x2032,
-  miribaarusquare: 0x334A,
-  mirisquare: 0x3349,
-  mlonglegturned: 0x0270,
-  mlsquare: 0x3396,
-  mmcubedsquare: 0x33A3,
-  mmonospace: 0xFF4D,
-  mmsquaredsquare: 0x339F,
-  mohiragana: 0x3082,
-  mohmsquare: 0x33C1,
-  mokatakana: 0x30E2,
-  mokatakanahalfwidth: 0xFF93,
-  molsquare: 0x33D6,
-  momathai: 0x0E21,
-  moverssquare: 0x33A7,
-  moverssquaredsquare: 0x33A8,
-  mparen: 0x24A8,
-  mpasquare: 0x33AB,
-  mssquare: 0x33B3,
-  msuperior: 0xF6EF,
-  mturned: 0x026F,
-  mu: 0x00B5,
-  mu1: 0x00B5,
-  muasquare: 0x3382,
-  muchgreater: 0x226B,
-  muchless: 0x226A,
-  mufsquare: 0x338C,
-  mugreek: 0x03BC,
-  mugsquare: 0x338D,
-  muhiragana: 0x3080,
-  mukatakana: 0x30E0,
-  mukatakanahalfwidth: 0xFF91,
-  mulsquare: 0x3395,
-  multiply: 0x00D7,
-  mumsquare: 0x339B,
-  munahhebrew: 0x05A3,
-  munahlefthebrew: 0x05A3,
-  musicalnote: 0x266A,
-  musicalnotedbl: 0x266B,
-  musicflatsign: 0x266D,
-  musicsharpsign: 0x266F,
-  mussquare: 0x33B2,
-  muvsquare: 0x33B6,
-  muwsquare: 0x33BC,
-  mvmegasquare: 0x33B9,
-  mvsquare: 0x33B7,
-  mwmegasquare: 0x33BF,
-  mwsquare: 0x33BD,
-  n: 0x006E,
-  nabengali: 0x09A8,
-  nabla: 0x2207,
-  nacute: 0x0144,
-  nadeva: 0x0928,
-  nagujarati: 0x0AA8,
-  nagurmukhi: 0x0A28,
-  nahiragana: 0x306A,
-  nakatakana: 0x30CA,
-  nakatakanahalfwidth: 0xFF85,
-  napostrophe: 0x0149,
-  nasquare: 0x3381,
-  nbopomofo: 0x310B,
-  nbspace: 0x00A0,
-  ncaron: 0x0148,
-  ncedilla: 0x0146,
-  ncircle: 0x24DD,
-  ncircumflexbelow: 0x1E4B,
-  ncommaaccent: 0x0146,
-  ndotaccent: 0x1E45,
-  ndotbelow: 0x1E47,
-  nehiragana: 0x306D,
-  nekatakana: 0x30CD,
-  nekatakanahalfwidth: 0xFF88,
-  newsheqelsign: 0x20AA,
-  nfsquare: 0x338B,
-  ngabengali: 0x0999,
-  ngadeva: 0x0919,
-  ngagujarati: 0x0A99,
-  ngagurmukhi: 0x0A19,
-  ngonguthai: 0x0E07,
-  nhiragana: 0x3093,
-  nhookleft: 0x0272,
-  nhookretroflex: 0x0273,
-  nieunacirclekorean: 0x326F,
-  nieunaparenkorean: 0x320F,
-  nieuncieuckorean: 0x3135,
-  nieuncirclekorean: 0x3261,
-  nieunhieuhkorean: 0x3136,
-  nieunkorean: 0x3134,
-  nieunpansioskorean: 0x3168,
-  nieunparenkorean: 0x3201,
-  nieunsioskorean: 0x3167,
-  nieuntikeutkorean: 0x3166,
-  nihiragana: 0x306B,
-  nikatakana: 0x30CB,
-  nikatakanahalfwidth: 0xFF86,
-  nikhahitleftthai: 0xF899,
-  nikhahitthai: 0x0E4D,
-  nine: 0x0039,
-  ninearabic: 0x0669,
-  ninebengali: 0x09EF,
-  ninecircle: 0x2468,
-  ninecircleinversesansserif: 0x2792,
-  ninedeva: 0x096F,
-  ninegujarati: 0x0AEF,
-  ninegurmukhi: 0x0A6F,
-  ninehackarabic: 0x0669,
-  ninehangzhou: 0x3029,
-  nineideographicparen: 0x3228,
-  nineinferior: 0x2089,
-  ninemonospace: 0xFF19,
-  nineoldstyle: 0xF739,
-  nineparen: 0x247C,
-  nineperiod: 0x2490,
-  ninepersian: 0x06F9,
-  nineroman: 0x2178,
-  ninesuperior: 0x2079,
-  nineteencircle: 0x2472,
-  nineteenparen: 0x2486,
-  nineteenperiod: 0x249A,
-  ninethai: 0x0E59,
-  nj: 0x01CC,
-  njecyrillic: 0x045A,
-  nkatakana: 0x30F3,
-  nkatakanahalfwidth: 0xFF9D,
-  nlegrightlong: 0x019E,
-  nlinebelow: 0x1E49,
-  nmonospace: 0xFF4E,
-  nmsquare: 0x339A,
-  nnabengali: 0x09A3,
-  nnadeva: 0x0923,
-  nnagujarati: 0x0AA3,
-  nnagurmukhi: 0x0A23,
-  nnnadeva: 0x0929,
-  nohiragana: 0x306E,
-  nokatakana: 0x30CE,
-  nokatakanahalfwidth: 0xFF89,
-  nonbreakingspace: 0x00A0,
-  nonenthai: 0x0E13,
-  nonuthai: 0x0E19,
-  noonarabic: 0x0646,
-  noonfinalarabic: 0xFEE6,
-  noonghunnaarabic: 0x06BA,
-  noonghunnafinalarabic: 0xFB9F,
-  nooninitialarabic: 0xFEE7,
-  noonjeeminitialarabic: 0xFCD2,
-  noonjeemisolatedarabic: 0xFC4B,
-  noonmedialarabic: 0xFEE8,
-  noonmeeminitialarabic: 0xFCD5,
-  noonmeemisolatedarabic: 0xFC4E,
-  noonnoonfinalarabic: 0xFC8D,
-  notcontains: 0x220C,
-  notelement: 0x2209,
-  notelementof: 0x2209,
-  notequal: 0x2260,
-  notgreater: 0x226F,
-  notgreaternorequal: 0x2271,
-  notgreaternorless: 0x2279,
-  notidentical: 0x2262,
-  notless: 0x226E,
-  notlessnorequal: 0x2270,
-  notparallel: 0x2226,
-  notprecedes: 0x2280,
-  notsubset: 0x2284,
-  notsucceeds: 0x2281,
-  notsuperset: 0x2285,
-  nowarmenian: 0x0576,
-  nparen: 0x24A9,
-  nssquare: 0x33B1,
-  nsuperior: 0x207F,
-  ntilde: 0x00F1,
-  nu: 0x03BD,
-  nuhiragana: 0x306C,
-  nukatakana: 0x30CC,
-  nukatakanahalfwidth: 0xFF87,
-  nuktabengali: 0x09BC,
-  nuktadeva: 0x093C,
-  nuktagujarati: 0x0ABC,
-  nuktagurmukhi: 0x0A3C,
-  numbersign: 0x0023,
-  numbersignmonospace: 0xFF03,
-  numbersignsmall: 0xFE5F,
-  numeralsigngreek: 0x0374,
-  numeralsignlowergreek: 0x0375,
-  numero: 0x2116,
-  nun: 0x05E0,
-  nundagesh: 0xFB40,
-  nundageshhebrew: 0xFB40,
-  nunhebrew: 0x05E0,
-  nvsquare: 0x33B5,
-  nwsquare: 0x33BB,
-  nyabengali: 0x099E,
-  nyadeva: 0x091E,
-  nyagujarati: 0x0A9E,
-  nyagurmukhi: 0x0A1E,
-  o: 0x006F,
-  oacute: 0x00F3,
-  oangthai: 0x0E2D,
-  obarred: 0x0275,
-  obarredcyrillic: 0x04E9,
-  obarreddieresiscyrillic: 0x04EB,
-  obengali: 0x0993,
-  obopomofo: 0x311B,
-  obreve: 0x014F,
-  ocandradeva: 0x0911,
-  ocandragujarati: 0x0A91,
-  ocandravowelsigndeva: 0x0949,
-  ocandravowelsigngujarati: 0x0AC9,
-  ocaron: 0x01D2,
-  ocircle: 0x24DE,
-  ocircumflex: 0x00F4,
-  ocircumflexacute: 0x1ED1,
-  ocircumflexdotbelow: 0x1ED9,
-  ocircumflexgrave: 0x1ED3,
-  ocircumflexhookabove: 0x1ED5,
-  ocircumflextilde: 0x1ED7,
-  ocyrillic: 0x043E,
-  odblacute: 0x0151,
-  odblgrave: 0x020D,
-  odeva: 0x0913,
-  odieresis: 0x00F6,
-  odieresiscyrillic: 0x04E7,
-  odotbelow: 0x1ECD,
-  oe: 0x0153,
-  oekorean: 0x315A,
-  ogonek: 0x02DB,
-  ogonekcmb: 0x0328,
-  ograve: 0x00F2,
-  ogujarati: 0x0A93,
-  oharmenian: 0x0585,
-  ohiragana: 0x304A,
-  ohookabove: 0x1ECF,
-  ohorn: 0x01A1,
-  ohornacute: 0x1EDB,
-  ohorndotbelow: 0x1EE3,
-  ohorngrave: 0x1EDD,
-  ohornhookabove: 0x1EDF,
-  ohorntilde: 0x1EE1,
-  ohungarumlaut: 0x0151,
-  oi: 0x01A3,
-  oinvertedbreve: 0x020F,
-  okatakana: 0x30AA,
-  okatakanahalfwidth: 0xFF75,
-  okorean: 0x3157,
-  olehebrew: 0x05AB,
-  omacron: 0x014D,
-  omacronacute: 0x1E53,
-  omacrongrave: 0x1E51,
-  omdeva: 0x0950,
-  omega: 0x03C9,
-  omega1: 0x03D6,
-  omegacyrillic: 0x0461,
-  omegalatinclosed: 0x0277,
-  omegaroundcyrillic: 0x047B,
-  omegatitlocyrillic: 0x047D,
-  omegatonos: 0x03CE,
-  omgujarati: 0x0AD0,
-  omicron: 0x03BF,
-  omicrontonos: 0x03CC,
-  omonospace: 0xFF4F,
-  one: 0x0031,
-  onearabic: 0x0661,
-  onebengali: 0x09E7,
-  onecircle: 0x2460,
-  onecircleinversesansserif: 0x278A,
-  onedeva: 0x0967,
-  onedotenleader: 0x2024,
-  oneeighth: 0x215B,
-  onefitted: 0xF6DC,
-  onegujarati: 0x0AE7,
-  onegurmukhi: 0x0A67,
-  onehackarabic: 0x0661,
-  onehalf: 0x00BD,
-  onehangzhou: 0x3021,
-  oneideographicparen: 0x3220,
-  oneinferior: 0x2081,
-  onemonospace: 0xFF11,
-  onenumeratorbengali: 0x09F4,
-  oneoldstyle: 0xF731,
-  oneparen: 0x2474,
-  oneperiod: 0x2488,
-  onepersian: 0x06F1,
-  onequarter: 0x00BC,
-  oneroman: 0x2170,
-  onesuperior: 0x00B9,
-  onethai: 0x0E51,
-  onethird: 0x2153,
-  oogonek: 0x01EB,
-  oogonekmacron: 0x01ED,
-  oogurmukhi: 0x0A13,
-  oomatragurmukhi: 0x0A4B,
-  oopen: 0x0254,
-  oparen: 0x24AA,
-  openbullet: 0x25E6,
-  option: 0x2325,
-  ordfeminine: 0x00AA,
-  ordmasculine: 0x00BA,
-  orthogonal: 0x221F,
-  oshortdeva: 0x0912,
-  oshortvowelsigndeva: 0x094A,
-  oslash: 0x00F8,
-  oslashacute: 0x01FF,
-  osmallhiragana: 0x3049,
-  osmallkatakana: 0x30A9,
-  osmallkatakanahalfwidth: 0xFF6B,
-  ostrokeacute: 0x01FF,
-  osuperior: 0xF6F0,
-  otcyrillic: 0x047F,
-  otilde: 0x00F5,
-  otildeacute: 0x1E4D,
-  otildedieresis: 0x1E4F,
-  oubopomofo: 0x3121,
-  overline: 0x203E,
-  overlinecenterline: 0xFE4A,
-  overlinecmb: 0x0305,
-  overlinedashed: 0xFE49,
-  overlinedblwavy: 0xFE4C,
-  overlinewavy: 0xFE4B,
-  overscore: 0x00AF,
-  ovowelsignbengali: 0x09CB,
-  ovowelsigndeva: 0x094B,
-  ovowelsigngujarati: 0x0ACB,
-  p: 0x0070,
-  paampssquare: 0x3380,
-  paasentosquare: 0x332B,
-  pabengali: 0x09AA,
-  pacute: 0x1E55,
-  padeva: 0x092A,
-  pagedown: 0x21DF,
-  pageup: 0x21DE,
-  pagujarati: 0x0AAA,
-  pagurmukhi: 0x0A2A,
-  pahiragana: 0x3071,
-  paiyannoithai: 0x0E2F,
-  pakatakana: 0x30D1,
-  palatalizationcyrilliccmb: 0x0484,
-  palochkacyrillic: 0x04C0,
-  pansioskorean: 0x317F,
-  paragraph: 0x00B6,
-  parallel: 0x2225,
-  parenleft: 0x0028,
-  parenleftaltonearabic: 0xFD3E,
-  parenleftbt: 0xF8ED,
-  parenleftex: 0xF8EC,
-  parenleftinferior: 0x208D,
-  parenleftmonospace: 0xFF08,
-  parenleftsmall: 0xFE59,
-  parenleftsuperior: 0x207D,
-  parenlefttp: 0xF8EB,
-  parenleftvertical: 0xFE35,
-  parenright: 0x0029,
-  parenrightaltonearabic: 0xFD3F,
-  parenrightbt: 0xF8F8,
-  parenrightex: 0xF8F7,
-  parenrightinferior: 0x208E,
-  parenrightmonospace: 0xFF09,
-  parenrightsmall: 0xFE5A,
-  parenrightsuperior: 0x207E,
-  parenrighttp: 0xF8F6,
-  parenrightvertical: 0xFE36,
-  partialdiff: 0x2202,
-  paseqhebrew: 0x05C0,
-  pashtahebrew: 0x0599,
-  pasquare: 0x33A9,
-  patah: 0x05B7,
-  patah11: 0x05B7,
-  patah1d: 0x05B7,
-  patah2a: 0x05B7,
-  patahhebrew: 0x05B7,
-  patahnarrowhebrew: 0x05B7,
-  patahquarterhebrew: 0x05B7,
-  patahwidehebrew: 0x05B7,
-  pazerhebrew: 0x05A1,
-  pbopomofo: 0x3106,
-  pcircle: 0x24DF,
-  pdotaccent: 0x1E57,
-  pe: 0x05E4,
-  pecyrillic: 0x043F,
-  pedagesh: 0xFB44,
-  pedageshhebrew: 0xFB44,
-  peezisquare: 0x333B,
-  pefinaldageshhebrew: 0xFB43,
-  peharabic: 0x067E,
-  peharmenian: 0x057A,
-  pehebrew: 0x05E4,
-  pehfinalarabic: 0xFB57,
-  pehinitialarabic: 0xFB58,
-  pehiragana: 0x307A,
-  pehmedialarabic: 0xFB59,
-  pekatakana: 0x30DA,
-  pemiddlehookcyrillic: 0x04A7,
-  perafehebrew: 0xFB4E,
-  percent: 0x0025,
-  percentarabic: 0x066A,
-  percentmonospace: 0xFF05,
-  percentsmall: 0xFE6A,
-  period: 0x002E,
-  periodarmenian: 0x0589,
-  periodcentered: 0x00B7,
-  periodhalfwidth: 0xFF61,
-  periodinferior: 0xF6E7,
-  periodmonospace: 0xFF0E,
-  periodsmall: 0xFE52,
-  periodsuperior: 0xF6E8,
-  perispomenigreekcmb: 0x0342,
-  perpendicular: 0x22A5,
-  perthousand: 0x2030,
-  peseta: 0x20A7,
-  pfsquare: 0x338A,
-  phabengali: 0x09AB,
-  phadeva: 0x092B,
-  phagujarati: 0x0AAB,
-  phagurmukhi: 0x0A2B,
-  phi: 0x03C6,
-  phi1: 0x03D5,
-  phieuphacirclekorean: 0x327A,
-  phieuphaparenkorean: 0x321A,
-  phieuphcirclekorean: 0x326C,
-  phieuphkorean: 0x314D,
-  phieuphparenkorean: 0x320C,
-  philatin: 0x0278,
-  phinthuthai: 0x0E3A,
-  phisymbolgreek: 0x03D5,
-  phook: 0x01A5,
-  phophanthai: 0x0E1E,
-  phophungthai: 0x0E1C,
-  phosamphaothai: 0x0E20,
-  pi: 0x03C0,
-  pieupacirclekorean: 0x3273,
-  pieupaparenkorean: 0x3213,
-  pieupcieuckorean: 0x3176,
-  pieupcirclekorean: 0x3265,
-  pieupkiyeokkorean: 0x3172,
-  pieupkorean: 0x3142,
-  pieupparenkorean: 0x3205,
-  pieupsioskiyeokkorean: 0x3174,
-  pieupsioskorean: 0x3144,
-  pieupsiostikeutkorean: 0x3175,
-  pieupthieuthkorean: 0x3177,
-  pieuptikeutkorean: 0x3173,
-  pihiragana: 0x3074,
-  pikatakana: 0x30D4,
-  pisymbolgreek: 0x03D6,
-  piwrarmenian: 0x0583,
-  plus: 0x002B,
-  plusbelowcmb: 0x031F,
-  pluscircle: 0x2295,
-  plusminus: 0x00B1,
-  plusmod: 0x02D6,
-  plusmonospace: 0xFF0B,
-  plussmall: 0xFE62,
-  plussuperior: 0x207A,
-  pmonospace: 0xFF50,
-  pmsquare: 0x33D8,
-  pohiragana: 0x307D,
-  pointingindexdownwhite: 0x261F,
-  pointingindexleftwhite: 0x261C,
-  pointingindexrightwhite: 0x261E,
-  pointingindexupwhite: 0x261D,
-  pokatakana: 0x30DD,
-  poplathai: 0x0E1B,
-  postalmark: 0x3012,
-  postalmarkface: 0x3020,
-  pparen: 0x24AB,
-  precedes: 0x227A,
-  prescription: 0x211E,
-  primemod: 0x02B9,
-  primereversed: 0x2035,
-  product: 0x220F,
-  projective: 0x2305,
-  prolongedkana: 0x30FC,
-  propellor: 0x2318,
-  propersubset: 0x2282,
-  propersuperset: 0x2283,
-  proportion: 0x2237,
-  proportional: 0x221D,
-  psi: 0x03C8,
-  psicyrillic: 0x0471,
-  psilipneumatacyrilliccmb: 0x0486,
-  pssquare: 0x33B0,
-  puhiragana: 0x3077,
-  pukatakana: 0x30D7,
-  pvsquare: 0x33B4,
-  pwsquare: 0x33BA,
-  q: 0x0071,
-  qadeva: 0x0958,
-  qadmahebrew: 0x05A8,
-  qafarabic: 0x0642,
-  qaffinalarabic: 0xFED6,
-  qafinitialarabic: 0xFED7,
-  qafmedialarabic: 0xFED8,
-  qamats: 0x05B8,
-  qamats10: 0x05B8,
-  qamats1a: 0x05B8,
-  qamats1c: 0x05B8,
-  qamats27: 0x05B8,
-  qamats29: 0x05B8,
-  qamats33: 0x05B8,
-  qamatsde: 0x05B8,
-  qamatshebrew: 0x05B8,
-  qamatsnarrowhebrew: 0x05B8,
-  qamatsqatanhebrew: 0x05B8,
-  qamatsqatannarrowhebrew: 0x05B8,
-  qamatsqatanquarterhebrew: 0x05B8,
-  qamatsqatanwidehebrew: 0x05B8,
-  qamatsquarterhebrew: 0x05B8,
-  qamatswidehebrew: 0x05B8,
-  qarneyparahebrew: 0x059F,
-  qbopomofo: 0x3111,
-  qcircle: 0x24E0,
-  qhook: 0x02A0,
-  qmonospace: 0xFF51,
-  qof: 0x05E7,
-  qofdagesh: 0xFB47,
-  qofdageshhebrew: 0xFB47,
-  qofhebrew: 0x05E7,
-  qparen: 0x24AC,
-  quarternote: 0x2669,
-  qubuts: 0x05BB,
-  qubuts18: 0x05BB,
-  qubuts25: 0x05BB,
-  qubuts31: 0x05BB,
-  qubutshebrew: 0x05BB,
-  qubutsnarrowhebrew: 0x05BB,
-  qubutsquarterhebrew: 0x05BB,
-  qubutswidehebrew: 0x05BB,
-  question: 0x003F,
-  questionarabic: 0x061F,
-  questionarmenian: 0x055E,
-  questiondown: 0x00BF,
-  questiondownsmall: 0xF7BF,
-  questiongreek: 0x037E,
-  questionmonospace: 0xFF1F,
-  questionsmall: 0xF73F,
-  quotedbl: 0x0022,
-  quotedblbase: 0x201E,
-  quotedblleft: 0x201C,
-  quotedblmonospace: 0xFF02,
-  quotedblprime: 0x301E,
-  quotedblprimereversed: 0x301D,
-  quotedblright: 0x201D,
-  quoteleft: 0x2018,
-  quoteleftreversed: 0x201B,
-  quotereversed: 0x201B,
-  quoteright: 0x2019,
-  quoterightn: 0x0149,
-  quotesinglbase: 0x201A,
-  quotesingle: 0x0027,
-  quotesinglemonospace: 0xFF07,
-  r: 0x0072,
-  raarmenian: 0x057C,
-  rabengali: 0x09B0,
-  racute: 0x0155,
-  radeva: 0x0930,
-  radical: 0x221A,
-  radicalex: 0xF8E5,
-  radoverssquare: 0x33AE,
-  radoverssquaredsquare: 0x33AF,
-  radsquare: 0x33AD,
-  rafe: 0x05BF,
-  rafehebrew: 0x05BF,
-  ragujarati: 0x0AB0,
-  ragurmukhi: 0x0A30,
-  rahiragana: 0x3089,
-  rakatakana: 0x30E9,
-  rakatakanahalfwidth: 0xFF97,
-  ralowerdiagonalbengali: 0x09F1,
-  ramiddlediagonalbengali: 0x09F0,
-  ramshorn: 0x0264,
-  ratio: 0x2236,
-  rbopomofo: 0x3116,
-  rcaron: 0x0159,
-  rcedilla: 0x0157,
-  rcircle: 0x24E1,
-  rcommaaccent: 0x0157,
-  rdblgrave: 0x0211,
-  rdotaccent: 0x1E59,
-  rdotbelow: 0x1E5B,
-  rdotbelowmacron: 0x1E5D,
-  referencemark: 0x203B,
-  reflexsubset: 0x2286,
-  reflexsuperset: 0x2287,
-  registered: 0x00AE,
-  registersans: 0xF8E8,
-  registerserif: 0xF6DA,
-  reharabic: 0x0631,
-  reharmenian: 0x0580,
-  rehfinalarabic: 0xFEAE,
-  rehiragana: 0x308C,
-  rekatakana: 0x30EC,
-  rekatakanahalfwidth: 0xFF9A,
-  resh: 0x05E8,
-  reshdageshhebrew: 0xFB48,
-  reshhebrew: 0x05E8,
-  reversedtilde: 0x223D,
-  reviahebrew: 0x0597,
-  reviamugrashhebrew: 0x0597,
-  revlogicalnot: 0x2310,
-  rfishhook: 0x027E,
-  rfishhookreversed: 0x027F,
-  rhabengali: 0x09DD,
-  rhadeva: 0x095D,
-  rho: 0x03C1,
-  rhook: 0x027D,
-  rhookturned: 0x027B,
-  rhookturnedsuperior: 0x02B5,
-  rhosymbolgreek: 0x03F1,
-  rhotichookmod: 0x02DE,
-  rieulacirclekorean: 0x3271,
-  rieulaparenkorean: 0x3211,
-  rieulcirclekorean: 0x3263,
-  rieulhieuhkorean: 0x3140,
-  rieulkiyeokkorean: 0x313A,
-  rieulkiyeoksioskorean: 0x3169,
-  rieulkorean: 0x3139,
-  rieulmieumkorean: 0x313B,
-  rieulpansioskorean: 0x316C,
-  rieulparenkorean: 0x3203,
-  rieulphieuphkorean: 0x313F,
-  rieulpieupkorean: 0x313C,
-  rieulpieupsioskorean: 0x316B,
-  rieulsioskorean: 0x313D,
-  rieulthieuthkorean: 0x313E,
-  rieultikeutkorean: 0x316A,
-  rieulyeorinhieuhkorean: 0x316D,
-  rightangle: 0x221F,
-  righttackbelowcmb: 0x0319,
-  righttriangle: 0x22BF,
-  rihiragana: 0x308A,
-  rikatakana: 0x30EA,
-  rikatakanahalfwidth: 0xFF98,
-  ring: 0x02DA,
-  ringbelowcmb: 0x0325,
-  ringcmb: 0x030A,
-  ringhalfleft: 0x02BF,
-  ringhalfleftarmenian: 0x0559,
-  ringhalfleftbelowcmb: 0x031C,
-  ringhalfleftcentered: 0x02D3,
-  ringhalfright: 0x02BE,
-  ringhalfrightbelowcmb: 0x0339,
-  ringhalfrightcentered: 0x02D2,
-  rinvertedbreve: 0x0213,
-  rittorusquare: 0x3351,
-  rlinebelow: 0x1E5F,
-  rlongleg: 0x027C,
-  rlonglegturned: 0x027A,
-  rmonospace: 0xFF52,
-  rohiragana: 0x308D,
-  rokatakana: 0x30ED,
-  rokatakanahalfwidth: 0xFF9B,
-  roruathai: 0x0E23,
-  rparen: 0x24AD,
-  rrabengali: 0x09DC,
-  rradeva: 0x0931,
-  rragurmukhi: 0x0A5C,
-  rreharabic: 0x0691,
-  rrehfinalarabic: 0xFB8D,
-  rrvocalicbengali: 0x09E0,
-  rrvocalicdeva: 0x0960,
-  rrvocalicgujarati: 0x0AE0,
-  rrvocalicvowelsignbengali: 0x09C4,
-  rrvocalicvowelsigndeva: 0x0944,
-  rrvocalicvowelsigngujarati: 0x0AC4,
-  rsuperior: 0xF6F1,
-  rtblock: 0x2590,
-  rturned: 0x0279,
-  rturnedsuperior: 0x02B4,
-  ruhiragana: 0x308B,
-  rukatakana: 0x30EB,
-  rukatakanahalfwidth: 0xFF99,
-  rupeemarkbengali: 0x09F2,
-  rupeesignbengali: 0x09F3,
-  rupiah: 0xF6DD,
-  ruthai: 0x0E24,
-  rvocalicbengali: 0x098B,
-  rvocalicdeva: 0x090B,
-  rvocalicgujarati: 0x0A8B,
-  rvocalicvowelsignbengali: 0x09C3,
-  rvocalicvowelsigndeva: 0x0943,
-  rvocalicvowelsigngujarati: 0x0AC3,
-  s: 0x0073,
-  sabengali: 0x09B8,
-  sacute: 0x015B,
-  sacutedotaccent: 0x1E65,
-  sadarabic: 0x0635,
-  sadeva: 0x0938,
-  sadfinalarabic: 0xFEBA,
-  sadinitialarabic: 0xFEBB,
-  sadmedialarabic: 0xFEBC,
-  sagujarati: 0x0AB8,
-  sagurmukhi: 0x0A38,
-  sahiragana: 0x3055,
-  sakatakana: 0x30B5,
-  sakatakanahalfwidth: 0xFF7B,
-  sallallahoualayhewasallamarabic: 0xFDFA,
-  samekh: 0x05E1,
-  samekhdagesh: 0xFB41,
-  samekhdageshhebrew: 0xFB41,
-  samekhhebrew: 0x05E1,
-  saraaathai: 0x0E32,
-  saraaethai: 0x0E41,
-  saraaimaimalaithai: 0x0E44,
-  saraaimaimuanthai: 0x0E43,
-  saraamthai: 0x0E33,
-  saraathai: 0x0E30,
-  saraethai: 0x0E40,
-  saraiileftthai: 0xF886,
-  saraiithai: 0x0E35,
-  saraileftthai: 0xF885,
-  saraithai: 0x0E34,
-  saraothai: 0x0E42,
-  saraueeleftthai: 0xF888,
-  saraueethai: 0x0E37,
-  saraueleftthai: 0xF887,
-  sarauethai: 0x0E36,
-  sarauthai: 0x0E38,
-  sarauuthai: 0x0E39,
-  sbopomofo: 0x3119,
-  scaron: 0x0161,
-  scarondotaccent: 0x1E67,
-  scedilla: 0x015F,
-  schwa: 0x0259,
-  schwacyrillic: 0x04D9,
-  schwadieresiscyrillic: 0x04DB,
-  schwahook: 0x025A,
-  scircle: 0x24E2,
-  scircumflex: 0x015D,
-  scommaaccent: 0x0219,
-  sdotaccent: 0x1E61,
-  sdotbelow: 0x1E63,
-  sdotbelowdotaccent: 0x1E69,
-  seagullbelowcmb: 0x033C,
-  second: 0x2033,
-  secondtonechinese: 0x02CA,
-  section: 0x00A7,
-  seenarabic: 0x0633,
-  seenfinalarabic: 0xFEB2,
-  seeninitialarabic: 0xFEB3,
-  seenmedialarabic: 0xFEB4,
-  segol: 0x05B6,
-  segol13: 0x05B6,
-  segol1f: 0x05B6,
-  segol2c: 0x05B6,
-  segolhebrew: 0x05B6,
-  segolnarrowhebrew: 0x05B6,
-  segolquarterhebrew: 0x05B6,
-  segoltahebrew: 0x0592,
-  segolwidehebrew: 0x05B6,
-  seharmenian: 0x057D,
-  sehiragana: 0x305B,
-  sekatakana: 0x30BB,
-  sekatakanahalfwidth: 0xFF7E,
-  semicolon: 0x003B,
-  semicolonarabic: 0x061B,
-  semicolonmonospace: 0xFF1B,
-  semicolonsmall: 0xFE54,
-  semivoicedmarkkana: 0x309C,
-  semivoicedmarkkanahalfwidth: 0xFF9F,
-  sentisquare: 0x3322,
-  sentosquare: 0x3323,
-  seven: 0x0037,
-  sevenarabic: 0x0667,
-  sevenbengali: 0x09ED,
-  sevencircle: 0x2466,
-  sevencircleinversesansserif: 0x2790,
-  sevendeva: 0x096D,
-  seveneighths: 0x215E,
-  sevengujarati: 0x0AED,
-  sevengurmukhi: 0x0A6D,
-  sevenhackarabic: 0x0667,
-  sevenhangzhou: 0x3027,
-  sevenideographicparen: 0x3226,
-  seveninferior: 0x2087,
-  sevenmonospace: 0xFF17,
-  sevenoldstyle: 0xF737,
-  sevenparen: 0x247A,
-  sevenperiod: 0x248E,
-  sevenpersian: 0x06F7,
-  sevenroman: 0x2176,
-  sevensuperior: 0x2077,
-  seventeencircle: 0x2470,
-  seventeenparen: 0x2484,
-  seventeenperiod: 0x2498,
-  seventhai: 0x0E57,
-  sfthyphen: 0x00AD,
-  shaarmenian: 0x0577,
-  shabengali: 0x09B6,
-  shacyrillic: 0x0448,
-  shaddaarabic: 0x0651,
-  shaddadammaarabic: 0xFC61,
-  shaddadammatanarabic: 0xFC5E,
-  shaddafathaarabic: 0xFC60,
-  shaddakasraarabic: 0xFC62,
-  shaddakasratanarabic: 0xFC5F,
-  shade: 0x2592,
-  shadedark: 0x2593,
-  shadelight: 0x2591,
-  shademedium: 0x2592,
-  shadeva: 0x0936,
-  shagujarati: 0x0AB6,
-  shagurmukhi: 0x0A36,
-  shalshelethebrew: 0x0593,
-  shbopomofo: 0x3115,
-  shchacyrillic: 0x0449,
-  sheenarabic: 0x0634,
-  sheenfinalarabic: 0xFEB6,
-  sheeninitialarabic: 0xFEB7,
-  sheenmedialarabic: 0xFEB8,
-  sheicoptic: 0x03E3,
-  sheqel: 0x20AA,
-  sheqelhebrew: 0x20AA,
-  sheva: 0x05B0,
-  sheva115: 0x05B0,
-  sheva15: 0x05B0,
-  sheva22: 0x05B0,
-  sheva2e: 0x05B0,
-  shevahebrew: 0x05B0,
-  shevanarrowhebrew: 0x05B0,
-  shevaquarterhebrew: 0x05B0,
-  shevawidehebrew: 0x05B0,
-  shhacyrillic: 0x04BB,
-  shimacoptic: 0x03ED,
-  shin: 0x05E9,
-  shindagesh: 0xFB49,
-  shindageshhebrew: 0xFB49,
-  shindageshshindot: 0xFB2C,
-  shindageshshindothebrew: 0xFB2C,
-  shindageshsindot: 0xFB2D,
-  shindageshsindothebrew: 0xFB2D,
-  shindothebrew: 0x05C1,
-  shinhebrew: 0x05E9,
-  shinshindot: 0xFB2A,
-  shinshindothebrew: 0xFB2A,
-  shinsindot: 0xFB2B,
-  shinsindothebrew: 0xFB2B,
-  shook: 0x0282,
-  sigma: 0x03C3,
-  sigma1: 0x03C2,
-  sigmafinal: 0x03C2,
-  sigmalunatesymbolgreek: 0x03F2,
-  sihiragana: 0x3057,
-  sikatakana: 0x30B7,
-  sikatakanahalfwidth: 0xFF7C,
-  siluqhebrew: 0x05BD,
-  siluqlefthebrew: 0x05BD,
-  similar: 0x223C,
-  sindothebrew: 0x05C2,
-  siosacirclekorean: 0x3274,
-  siosaparenkorean: 0x3214,
-  sioscieuckorean: 0x317E,
-  sioscirclekorean: 0x3266,
-  sioskiyeokkorean: 0x317A,
-  sioskorean: 0x3145,
-  siosnieunkorean: 0x317B,
-  siosparenkorean: 0x3206,
-  siospieupkorean: 0x317D,
-  siostikeutkorean: 0x317C,
-  six: 0x0036,
-  sixarabic: 0x0666,
-  sixbengali: 0x09EC,
-  sixcircle: 0x2465,
-  sixcircleinversesansserif: 0x278F,
-  sixdeva: 0x096C,
-  sixgujarati: 0x0AEC,
-  sixgurmukhi: 0x0A6C,
-  sixhackarabic: 0x0666,
-  sixhangzhou: 0x3026,
-  sixideographicparen: 0x3225,
-  sixinferior: 0x2086,
-  sixmonospace: 0xFF16,
-  sixoldstyle: 0xF736,
-  sixparen: 0x2479,
-  sixperiod: 0x248D,
-  sixpersian: 0x06F6,
-  sixroman: 0x2175,
-  sixsuperior: 0x2076,
-  sixteencircle: 0x246F,
-  sixteencurrencydenominatorbengali: 0x09F9,
-  sixteenparen: 0x2483,
-  sixteenperiod: 0x2497,
-  sixthai: 0x0E56,
-  slash: 0x002F,
-  slashmonospace: 0xFF0F,
-  slong: 0x017F,
-  slongdotaccent: 0x1E9B,
-  smileface: 0x263A,
-  smonospace: 0xFF53,
-  sofpasuqhebrew: 0x05C3,
-  softhyphen: 0x00AD,
-  softsigncyrillic: 0x044C,
-  sohiragana: 0x305D,
-  sokatakana: 0x30BD,
-  sokatakanahalfwidth: 0xFF7F,
-  soliduslongoverlaycmb: 0x0338,
-  solidusshortoverlaycmb: 0x0337,
-  sorusithai: 0x0E29,
-  sosalathai: 0x0E28,
-  sosothai: 0x0E0B,
-  sosuathai: 0x0E2A,
-  space: 0x0020,
-  spacehackarabic: 0x0020,
-  spade: 0x2660,
-  spadesuitblack: 0x2660,
-  spadesuitwhite: 0x2664,
-  sparen: 0x24AE,
-  squarebelowcmb: 0x033B,
-  squarecc: 0x33C4,
-  squarecm: 0x339D,
-  squarediagonalcrosshatchfill: 0x25A9,
-  squarehorizontalfill: 0x25A4,
-  squarekg: 0x338F,
-  squarekm: 0x339E,
-  squarekmcapital: 0x33CE,
-  squareln: 0x33D1,
-  squarelog: 0x33D2,
-  squaremg: 0x338E,
-  squaremil: 0x33D5,
-  squaremm: 0x339C,
-  squaremsquared: 0x33A1,
-  squareorthogonalcrosshatchfill: 0x25A6,
-  squareupperlefttolowerrightfill: 0x25A7,
-  squareupperrighttolowerleftfill: 0x25A8,
-  squareverticalfill: 0x25A5,
-  squarewhitewithsmallblack: 0x25A3,
-  srsquare: 0x33DB,
-  ssabengali: 0x09B7,
-  ssadeva: 0x0937,
-  ssagujarati: 0x0AB7,
-  ssangcieuckorean: 0x3149,
-  ssanghieuhkorean: 0x3185,
-  ssangieungkorean: 0x3180,
-  ssangkiyeokkorean: 0x3132,
-  ssangnieunkorean: 0x3165,
-  ssangpieupkorean: 0x3143,
-  ssangsioskorean: 0x3146,
-  ssangtikeutkorean: 0x3138,
-  ssuperior: 0xF6F2,
-  sterling: 0x00A3,
-  sterlingmonospace: 0xFFE1,
-  strokelongoverlaycmb: 0x0336,
-  strokeshortoverlaycmb: 0x0335,
-  subset: 0x2282,
-  subsetnotequal: 0x228A,
-  subsetorequal: 0x2286,
-  succeeds: 0x227B,
-  suchthat: 0x220B,
-  suhiragana: 0x3059,
-  sukatakana: 0x30B9,
-  sukatakanahalfwidth: 0xFF7D,
-  sukunarabic: 0x0652,
-  summation: 0x2211,
-  sun: 0x263C,
-  superset: 0x2283,
-  supersetnotequal: 0x228B,
-  supersetorequal: 0x2287,
-  svsquare: 0x33DC,
-  syouwaerasquare: 0x337C,
-  t: 0x0074,
-  tabengali: 0x09A4,
-  tackdown: 0x22A4,
-  tackleft: 0x22A3,
-  tadeva: 0x0924,
-  tagujarati: 0x0AA4,
-  tagurmukhi: 0x0A24,
-  taharabic: 0x0637,
-  tahfinalarabic: 0xFEC2,
-  tahinitialarabic: 0xFEC3,
-  tahiragana: 0x305F,
-  tahmedialarabic: 0xFEC4,
-  taisyouerasquare: 0x337D,
-  takatakana: 0x30BF,
-  takatakanahalfwidth: 0xFF80,
-  tatweelarabic: 0x0640,
-  tau: 0x03C4,
-  tav: 0x05EA,
-  tavdages: 0xFB4A,
-  tavdagesh: 0xFB4A,
-  tavdageshhebrew: 0xFB4A,
-  tavhebrew: 0x05EA,
-  tbar: 0x0167,
-  tbopomofo: 0x310A,
-  tcaron: 0x0165,
-  tccurl: 0x02A8,
-  tcedilla: 0x0163,
-  tcheharabic: 0x0686,
-  tchehfinalarabic: 0xFB7B,
-  tchehinitialarabic: 0xFB7C,
-  tchehmedialarabic: 0xFB7D,
-  tcircle: 0x24E3,
-  tcircumflexbelow: 0x1E71,
-  tcommaaccent: 0x0163,
-  tdieresis: 0x1E97,
-  tdotaccent: 0x1E6B,
-  tdotbelow: 0x1E6D,
-  tecyrillic: 0x0442,
-  tedescendercyrillic: 0x04AD,
-  teharabic: 0x062A,
-  tehfinalarabic: 0xFE96,
-  tehhahinitialarabic: 0xFCA2,
-  tehhahisolatedarabic: 0xFC0C,
-  tehinitialarabic: 0xFE97,
-  tehiragana: 0x3066,
-  tehjeeminitialarabic: 0xFCA1,
-  tehjeemisolatedarabic: 0xFC0B,
-  tehmarbutaarabic: 0x0629,
-  tehmarbutafinalarabic: 0xFE94,
-  tehmedialarabic: 0xFE98,
-  tehmeeminitialarabic: 0xFCA4,
-  tehmeemisolatedarabic: 0xFC0E,
-  tehnoonfinalarabic: 0xFC73,
-  tekatakana: 0x30C6,
-  tekatakanahalfwidth: 0xFF83,
-  telephone: 0x2121,
-  telephoneblack: 0x260E,
-  telishagedolahebrew: 0x05A0,
-  telishaqetanahebrew: 0x05A9,
-  tencircle: 0x2469,
-  tenideographicparen: 0x3229,
-  tenparen: 0x247D,
-  tenperiod: 0x2491,
-  tenroman: 0x2179,
-  tesh: 0x02A7,
-  tet: 0x05D8,
-  tetdagesh: 0xFB38,
-  tetdageshhebrew: 0xFB38,
-  tethebrew: 0x05D8,
-  tetsecyrillic: 0x04B5,
-  tevirhebrew: 0x059B,
-  tevirlefthebrew: 0x059B,
-  thabengali: 0x09A5,
-  thadeva: 0x0925,
-  thagujarati: 0x0AA5,
-  thagurmukhi: 0x0A25,
-  thalarabic: 0x0630,
-  thalfinalarabic: 0xFEAC,
-  thanthakhatlowleftthai: 0xF898,
-  thanthakhatlowrightthai: 0xF897,
-  thanthakhatthai: 0x0E4C,
-  thanthakhatupperleftthai: 0xF896,
-  theharabic: 0x062B,
-  thehfinalarabic: 0xFE9A,
-  thehinitialarabic: 0xFE9B,
-  thehmedialarabic: 0xFE9C,
-  thereexists: 0x2203,
-  therefore: 0x2234,
-  theta: 0x03B8,
-  theta1: 0x03D1,
-  thetasymbolgreek: 0x03D1,
-  thieuthacirclekorean: 0x3279,
-  thieuthaparenkorean: 0x3219,
-  thieuthcirclekorean: 0x326B,
-  thieuthkorean: 0x314C,
-  thieuthparenkorean: 0x320B,
-  thirteencircle: 0x246C,
-  thirteenparen: 0x2480,
-  thirteenperiod: 0x2494,
-  thonangmonthothai: 0x0E11,
-  thook: 0x01AD,
-  thophuthaothai: 0x0E12,
-  thorn: 0x00FE,
-  thothahanthai: 0x0E17,
-  thothanthai: 0x0E10,
-  thothongthai: 0x0E18,
-  thothungthai: 0x0E16,
-  thousandcyrillic: 0x0482,
-  thousandsseparatorarabic: 0x066C,
-  thousandsseparatorpersian: 0x066C,
-  three: 0x0033,
-  threearabic: 0x0663,
-  threebengali: 0x09E9,
-  threecircle: 0x2462,
-  threecircleinversesansserif: 0x278C,
-  threedeva: 0x0969,
-  threeeighths: 0x215C,
-  threegujarati: 0x0AE9,
-  threegurmukhi: 0x0A69,
-  threehackarabic: 0x0663,
-  threehangzhou: 0x3023,
-  threeideographicparen: 0x3222,
-  threeinferior: 0x2083,
-  threemonospace: 0xFF13,
-  threenumeratorbengali: 0x09F6,
-  threeoldstyle: 0xF733,
-  threeparen: 0x2476,
-  threeperiod: 0x248A,
-  threepersian: 0x06F3,
-  threequarters: 0x00BE,
-  threequartersemdash: 0xF6DE,
-  threeroman: 0x2172,
-  threesuperior: 0x00B3,
-  threethai: 0x0E53,
-  thzsquare: 0x3394,
-  tihiragana: 0x3061,
-  tikatakana: 0x30C1,
-  tikatakanahalfwidth: 0xFF81,
-  tikeutacirclekorean: 0x3270,
-  tikeutaparenkorean: 0x3210,
-  tikeutcirclekorean: 0x3262,
-  tikeutkorean: 0x3137,
-  tikeutparenkorean: 0x3202,
-  tilde: 0x02DC,
-  tildebelowcmb: 0x0330,
-  tildecmb: 0x0303,
-  tildecomb: 0x0303,
-  tildedoublecmb: 0x0360,
-  tildeoperator: 0x223C,
-  tildeoverlaycmb: 0x0334,
-  tildeverticalcmb: 0x033E,
-  timescircle: 0x2297,
-  tipehahebrew: 0x0596,
-  tipehalefthebrew: 0x0596,
-  tippigurmukhi: 0x0A70,
-  titlocyrilliccmb: 0x0483,
-  tiwnarmenian: 0x057F,
-  tlinebelow: 0x1E6F,
-  tmonospace: 0xFF54,
-  toarmenian: 0x0569,
-  tohiragana: 0x3068,
-  tokatakana: 0x30C8,
-  tokatakanahalfwidth: 0xFF84,
-  tonebarextrahighmod: 0x02E5,
-  tonebarextralowmod: 0x02E9,
-  tonebarhighmod: 0x02E6,
-  tonebarlowmod: 0x02E8,
-  tonebarmidmod: 0x02E7,
-  tonefive: 0x01BD,
-  tonesix: 0x0185,
-  tonetwo: 0x01A8,
-  tonos: 0x0384,
-  tonsquare: 0x3327,
-  topatakthai: 0x0E0F,
-  tortoiseshellbracketleft: 0x3014,
-  tortoiseshellbracketleftsmall: 0xFE5D,
-  tortoiseshellbracketleftvertical: 0xFE39,
-  tortoiseshellbracketright: 0x3015,
-  tortoiseshellbracketrightsmall: 0xFE5E,
-  tortoiseshellbracketrightvertical: 0xFE3A,
-  totaothai: 0x0E15,
-  tpalatalhook: 0x01AB,
-  tparen: 0x24AF,
-  trademark: 0x2122,
-  trademarksans: 0xF8EA,
-  trademarkserif: 0xF6DB,
-  tretroflexhook: 0x0288,
-  triagdn: 0x25BC,
-  triaglf: 0x25C4,
-  triagrt: 0x25BA,
-  triagup: 0x25B2,
-  ts: 0x02A6,
-  tsadi: 0x05E6,
-  tsadidagesh: 0xFB46,
-  tsadidageshhebrew: 0xFB46,
-  tsadihebrew: 0x05E6,
-  tsecyrillic: 0x0446,
-  tsere: 0x05B5,
-  tsere12: 0x05B5,
-  tsere1e: 0x05B5,
-  tsere2b: 0x05B5,
-  tserehebrew: 0x05B5,
-  tserenarrowhebrew: 0x05B5,
-  tserequarterhebrew: 0x05B5,
-  tserewidehebrew: 0x05B5,
-  tshecyrillic: 0x045B,
-  tsuperior: 0xF6F3,
-  ttabengali: 0x099F,
-  ttadeva: 0x091F,
-  ttagujarati: 0x0A9F,
-  ttagurmukhi: 0x0A1F,
-  tteharabic: 0x0679,
-  ttehfinalarabic: 0xFB67,
-  ttehinitialarabic: 0xFB68,
-  ttehmedialarabic: 0xFB69,
-  tthabengali: 0x09A0,
-  tthadeva: 0x0920,
-  tthagujarati: 0x0AA0,
-  tthagurmukhi: 0x0A20,
-  tturned: 0x0287,
-  tuhiragana: 0x3064,
-  tukatakana: 0x30C4,
-  tukatakanahalfwidth: 0xFF82,
-  tusmallhiragana: 0x3063,
-  tusmallkatakana: 0x30C3,
-  tusmallkatakanahalfwidth: 0xFF6F,
-  twelvecircle: 0x246B,
-  twelveparen: 0x247F,
-  twelveperiod: 0x2493,
-  twelveroman: 0x217B,
-  twentycircle: 0x2473,
-  twentyhangzhou: 0x5344,
-  twentyparen: 0x2487,
-  twentyperiod: 0x249B,
-  two: 0x0032,
-  twoarabic: 0x0662,
-  twobengali: 0x09E8,
-  twocircle: 0x2461,
-  twocircleinversesansserif: 0x278B,
-  twodeva: 0x0968,
-  twodotenleader: 0x2025,
-  twodotleader: 0x2025,
-  twodotleadervertical: 0xFE30,
-  twogujarati: 0x0AE8,
-  twogurmukhi: 0x0A68,
-  twohackarabic: 0x0662,
-  twohangzhou: 0x3022,
-  twoideographicparen: 0x3221,
-  twoinferior: 0x2082,
-  twomonospace: 0xFF12,
-  twonumeratorbengali: 0x09F5,
-  twooldstyle: 0xF732,
-  twoparen: 0x2475,
-  twoperiod: 0x2489,
-  twopersian: 0x06F2,
-  tworoman: 0x2171,
-  twostroke: 0x01BB,
-  twosuperior: 0x00B2,
-  twothai: 0x0E52,
-  twothirds: 0x2154,
-  u: 0x0075,
-  uacute: 0x00FA,
-  ubar: 0x0289,
-  ubengali: 0x0989,
-  ubopomofo: 0x3128,
-  ubreve: 0x016D,
-  ucaron: 0x01D4,
-  ucircle: 0x24E4,
-  ucircumflex: 0x00FB,
-  ucircumflexbelow: 0x1E77,
-  ucyrillic: 0x0443,
-  udattadeva: 0x0951,
-  udblacute: 0x0171,
-  udblgrave: 0x0215,
-  udeva: 0x0909,
-  udieresis: 0x00FC,
-  udieresisacute: 0x01D8,
-  udieresisbelow: 0x1E73,
-  udieresiscaron: 0x01DA,
-  udieresiscyrillic: 0x04F1,
-  udieresisgrave: 0x01DC,
-  udieresismacron: 0x01D6,
-  udotbelow: 0x1EE5,
-  ugrave: 0x00F9,
-  ugujarati: 0x0A89,
-  ugurmukhi: 0x0A09,
-  uhiragana: 0x3046,
-  uhookabove: 0x1EE7,
-  uhorn: 0x01B0,
-  uhornacute: 0x1EE9,
-  uhorndotbelow: 0x1EF1,
-  uhorngrave: 0x1EEB,
-  uhornhookabove: 0x1EED,
-  uhorntilde: 0x1EEF,
-  uhungarumlaut: 0x0171,
-  uhungarumlautcyrillic: 0x04F3,
-  uinvertedbreve: 0x0217,
-  ukatakana: 0x30A6,
-  ukatakanahalfwidth: 0xFF73,
-  ukcyrillic: 0x0479,
-  ukorean: 0x315C,
-  umacron: 0x016B,
-  umacroncyrillic: 0x04EF,
-  umacrondieresis: 0x1E7B,
-  umatragurmukhi: 0x0A41,
-  umonospace: 0xFF55,
-  underscore: 0x005F,
-  underscoredbl: 0x2017,
-  underscoremonospace: 0xFF3F,
-  underscorevertical: 0xFE33,
-  underscorewavy: 0xFE4F,
-  union: 0x222A,
-  universal: 0x2200,
-  uogonek: 0x0173,
-  uparen: 0x24B0,
-  upblock: 0x2580,
-  upperdothebrew: 0x05C4,
-  upsilon: 0x03C5,
-  upsilondieresis: 0x03CB,
-  upsilondieresistonos: 0x03B0,
-  upsilonlatin: 0x028A,
-  upsilontonos: 0x03CD,
-  uptackbelowcmb: 0x031D,
-  uptackmod: 0x02D4,
-  uragurmukhi: 0x0A73,
-  uring: 0x016F,
-  ushortcyrillic: 0x045E,
-  usmallhiragana: 0x3045,
-  usmallkatakana: 0x30A5,
-  usmallkatakanahalfwidth: 0xFF69,
-  ustraightcyrillic: 0x04AF,
-  ustraightstrokecyrillic: 0x04B1,
-  utilde: 0x0169,
-  utildeacute: 0x1E79,
-  utildebelow: 0x1E75,
-  uubengali: 0x098A,
-  uudeva: 0x090A,
-  uugujarati: 0x0A8A,
-  uugurmukhi: 0x0A0A,
-  uumatragurmukhi: 0x0A42,
-  uuvowelsignbengali: 0x09C2,
-  uuvowelsigndeva: 0x0942,
-  uuvowelsigngujarati: 0x0AC2,
-  uvowelsignbengali: 0x09C1,
-  uvowelsigndeva: 0x0941,
-  uvowelsigngujarati: 0x0AC1,
-  v: 0x0076,
-  vadeva: 0x0935,
-  vagujarati: 0x0AB5,
-  vagurmukhi: 0x0A35,
-  vakatakana: 0x30F7,
-  vav: 0x05D5,
-  vavdagesh: 0xFB35,
-  vavdagesh65: 0xFB35,
-  vavdageshhebrew: 0xFB35,
-  vavhebrew: 0x05D5,
-  vavholam: 0xFB4B,
-  vavholamhebrew: 0xFB4B,
-  vavvavhebrew: 0x05F0,
-  vavyodhebrew: 0x05F1,
-  vcircle: 0x24E5,
-  vdotbelow: 0x1E7F,
-  vecyrillic: 0x0432,
-  veharabic: 0x06A4,
-  vehfinalarabic: 0xFB6B,
-  vehinitialarabic: 0xFB6C,
-  vehmedialarabic: 0xFB6D,
-  vekatakana: 0x30F9,
-  venus: 0x2640,
-  verticalbar: 0x007C,
-  verticallineabovecmb: 0x030D,
-  verticallinebelowcmb: 0x0329,
-  verticallinelowmod: 0x02CC,
-  verticallinemod: 0x02C8,
-  vewarmenian: 0x057E,
-  vhook: 0x028B,
-  vikatakana: 0x30F8,
-  viramabengali: 0x09CD,
-  viramadeva: 0x094D,
-  viramagujarati: 0x0ACD,
-  visargabengali: 0x0983,
-  visargadeva: 0x0903,
-  visargagujarati: 0x0A83,
-  vmonospace: 0xFF56,
-  voarmenian: 0x0578,
-  voicediterationhiragana: 0x309E,
-  voicediterationkatakana: 0x30FE,
-  voicedmarkkana: 0x309B,
-  voicedmarkkanahalfwidth: 0xFF9E,
-  vokatakana: 0x30FA,
-  vparen: 0x24B1,
-  vtilde: 0x1E7D,
-  vturned: 0x028C,
-  vuhiragana: 0x3094,
-  vukatakana: 0x30F4,
-  w: 0x0077,
-  wacute: 0x1E83,
-  waekorean: 0x3159,
-  wahiragana: 0x308F,
-  wakatakana: 0x30EF,
-  wakatakanahalfwidth: 0xFF9C,
-  wakorean: 0x3158,
-  wasmallhiragana: 0x308E,
-  wasmallkatakana: 0x30EE,
-  wattosquare: 0x3357,
-  wavedash: 0x301C,
-  wavyunderscorevertical: 0xFE34,
-  wawarabic: 0x0648,
-  wawfinalarabic: 0xFEEE,
-  wawhamzaabovearabic: 0x0624,
-  wawhamzaabovefinalarabic: 0xFE86,
-  wbsquare: 0x33DD,
-  wcircle: 0x24E6,
-  wcircumflex: 0x0175,
-  wdieresis: 0x1E85,
-  wdotaccent: 0x1E87,
-  wdotbelow: 0x1E89,
-  wehiragana: 0x3091,
-  weierstrass: 0x2118,
-  wekatakana: 0x30F1,
-  wekorean: 0x315E,
-  weokorean: 0x315D,
-  wgrave: 0x1E81,
-  whitebullet: 0x25E6,
-  whitecircle: 0x25CB,
-  whitecircleinverse: 0x25D9,
-  whitecornerbracketleft: 0x300E,
-  whitecornerbracketleftvertical: 0xFE43,
-  whitecornerbracketright: 0x300F,
-  whitecornerbracketrightvertical: 0xFE44,
-  whitediamond: 0x25C7,
-  whitediamondcontainingblacksmalldiamond: 0x25C8,
-  whitedownpointingsmalltriangle: 0x25BF,
-  whitedownpointingtriangle: 0x25BD,
-  whiteleftpointingsmalltriangle: 0x25C3,
-  whiteleftpointingtriangle: 0x25C1,
-  whitelenticularbracketleft: 0x3016,
-  whitelenticularbracketright: 0x3017,
-  whiterightpointingsmalltriangle: 0x25B9,
-  whiterightpointingtriangle: 0x25B7,
-  whitesmallsquare: 0x25AB,
-  whitesmilingface: 0x263A,
-  whitesquare: 0x25A1,
-  whitestar: 0x2606,
-  whitetelephone: 0x260F,
-  whitetortoiseshellbracketleft: 0x3018,
-  whitetortoiseshellbracketright: 0x3019,
-  whiteuppointingsmalltriangle: 0x25B5,
-  whiteuppointingtriangle: 0x25B3,
-  wihiragana: 0x3090,
-  wikatakana: 0x30F0,
-  wikorean: 0x315F,
-  wmonospace: 0xFF57,
-  wohiragana: 0x3092,
-  wokatakana: 0x30F2,
-  wokatakanahalfwidth: 0xFF66,
-  won: 0x20A9,
-  wonmonospace: 0xFFE6,
-  wowaenthai: 0x0E27,
-  wparen: 0x24B2,
-  wring: 0x1E98,
-  wsuperior: 0x02B7,
-  wturned: 0x028D,
-  wynn: 0x01BF,
-  x: 0x0078,
-  xabovecmb: 0x033D,
-  xbopomofo: 0x3112,
-  xcircle: 0x24E7,
-  xdieresis: 0x1E8D,
-  xdotaccent: 0x1E8B,
-  xeharmenian: 0x056D,
-  xi: 0x03BE,
-  xmonospace: 0xFF58,
-  xparen: 0x24B3,
-  xsuperior: 0x02E3,
-  y: 0x0079,
-  yaadosquare: 0x334E,
-  yabengali: 0x09AF,
-  yacute: 0x00FD,
-  yadeva: 0x092F,
-  yaekorean: 0x3152,
-  yagujarati: 0x0AAF,
-  yagurmukhi: 0x0A2F,
-  yahiragana: 0x3084,
-  yakatakana: 0x30E4,
-  yakatakanahalfwidth: 0xFF94,
-  yakorean: 0x3151,
-  yamakkanthai: 0x0E4E,
-  yasmallhiragana: 0x3083,
-  yasmallkatakana: 0x30E3,
-  yasmallkatakanahalfwidth: 0xFF6C,
-  yatcyrillic: 0x0463,
-  ycircle: 0x24E8,
-  ycircumflex: 0x0177,
-  ydieresis: 0x00FF,
-  ydotaccent: 0x1E8F,
-  ydotbelow: 0x1EF5,
-  yeharabic: 0x064A,
-  yehbarreearabic: 0x06D2,
-  yehbarreefinalarabic: 0xFBAF,
-  yehfinalarabic: 0xFEF2,
-  yehhamzaabovearabic: 0x0626,
-  yehhamzaabovefinalarabic: 0xFE8A,
-  yehhamzaaboveinitialarabic: 0xFE8B,
-  yehhamzaabovemedialarabic: 0xFE8C,
-  yehinitialarabic: 0xFEF3,
-  yehmedialarabic: 0xFEF4,
-  yehmeeminitialarabic: 0xFCDD,
-  yehmeemisolatedarabic: 0xFC58,
-  yehnoonfinalarabic: 0xFC94,
-  yehthreedotsbelowarabic: 0x06D1,
-  yekorean: 0x3156,
-  yen: 0x00A5,
-  yenmonospace: 0xFFE5,
-  yeokorean: 0x3155,
-  yeorinhieuhkorean: 0x3186,
-  yerahbenyomohebrew: 0x05AA,
-  yerahbenyomolefthebrew: 0x05AA,
-  yericyrillic: 0x044B,
-  yerudieresiscyrillic: 0x04F9,
-  yesieungkorean: 0x3181,
-  yesieungpansioskorean: 0x3183,
-  yesieungsioskorean: 0x3182,
-  yetivhebrew: 0x059A,
-  ygrave: 0x1EF3,
-  yhook: 0x01B4,
-  yhookabove: 0x1EF7,
-  yiarmenian: 0x0575,
-  yicyrillic: 0x0457,
-  yikorean: 0x3162,
-  yinyang: 0x262F,
-  yiwnarmenian: 0x0582,
-  ymonospace: 0xFF59,
-  yod: 0x05D9,
-  yoddagesh: 0xFB39,
-  yoddageshhebrew: 0xFB39,
-  yodhebrew: 0x05D9,
-  yodyodhebrew: 0x05F2,
-  yodyodpatahhebrew: 0xFB1F,
-  yohiragana: 0x3088,
-  yoikorean: 0x3189,
-  yokatakana: 0x30E8,
-  yokatakanahalfwidth: 0xFF96,
-  yokorean: 0x315B,
-  yosmallhiragana: 0x3087,
-  yosmallkatakana: 0x30E7,
-  yosmallkatakanahalfwidth: 0xFF6E,
-  yotgreek: 0x03F3,
-  yoyaekorean: 0x3188,
-  yoyakorean: 0x3187,
-  yoyakthai: 0x0E22,
-  yoyingthai: 0x0E0D,
-  yparen: 0x24B4,
-  ypogegrammeni: 0x037A,
-  ypogegrammenigreekcmb: 0x0345,
-  yr: 0x01A6,
-  yring: 0x1E99,
-  ysuperior: 0x02B8,
-  ytilde: 0x1EF9,
-  yturned: 0x028E,
-  yuhiragana: 0x3086,
-  yuikorean: 0x318C,
-  yukatakana: 0x30E6,
-  yukatakanahalfwidth: 0xFF95,
-  yukorean: 0x3160,
-  yusbigcyrillic: 0x046B,
-  yusbigiotifiedcyrillic: 0x046D,
-  yuslittlecyrillic: 0x0467,
-  yuslittleiotifiedcyrillic: 0x0469,
-  yusmallhiragana: 0x3085,
-  yusmallkatakana: 0x30E5,
-  yusmallkatakanahalfwidth: 0xFF6D,
-  yuyekorean: 0x318B,
-  yuyeokorean: 0x318A,
-  yyabengali: 0x09DF,
-  yyadeva: 0x095F,
-  z: 0x007A,
-  zaarmenian: 0x0566,
-  zacute: 0x017A,
-  zadeva: 0x095B,
-  zagurmukhi: 0x0A5B,
-  zaharabic: 0x0638,
-  zahfinalarabic: 0xFEC6,
-  zahinitialarabic: 0xFEC7,
-  zahiragana: 0x3056,
-  zahmedialarabic: 0xFEC8,
-  zainarabic: 0x0632,
-  zainfinalarabic: 0xFEB0,
-  zakatakana: 0x30B6,
-  zaqefgadolhebrew: 0x0595,
-  zaqefqatanhebrew: 0x0594,
-  zarqahebrew: 0x0598,
-  zayin: 0x05D6,
-  zayindagesh: 0xFB36,
-  zayindageshhebrew: 0xFB36,
-  zayinhebrew: 0x05D6,
-  zbopomofo: 0x3117,
-  zcaron: 0x017E,
-  zcircle: 0x24E9,
-  zcircumflex: 0x1E91,
-  zcurl: 0x0291,
-  zdot: 0x017C,
-  zdotaccent: 0x017C,
-  zdotbelow: 0x1E93,
-  zecyrillic: 0x0437,
-  zedescendercyrillic: 0x0499,
-  zedieresiscyrillic: 0x04DF,
-  zehiragana: 0x305C,
-  zekatakana: 0x30BC,
-  zero: 0x0030,
-  zeroarabic: 0x0660,
-  zerobengali: 0x09E6,
-  zerodeva: 0x0966,
-  zerogujarati: 0x0AE6,
-  zerogurmukhi: 0x0A66,
-  zerohackarabic: 0x0660,
-  zeroinferior: 0x2080,
-  zeromonospace: 0xFF10,
-  zerooldstyle: 0xF730,
-  zeropersian: 0x06F0,
-  zerosuperior: 0x2070,
-  zerothai: 0x0E50,
-  zerowidthjoiner: 0xFEFF,
-  zerowidthnonjoiner: 0x200C,
-  zerowidthspace: 0x200B,
-  zeta: 0x03B6,
-  zhbopomofo: 0x3113,
-  zhearmenian: 0x056A,
-  zhebrevecyrillic: 0x04C2,
-  zhecyrillic: 0x0436,
-  zhedescendercyrillic: 0x0497,
-  zhedieresiscyrillic: 0x04DD,
-  zihiragana: 0x3058,
-  zikatakana: 0x30B8,
-  zinorhebrew: 0x05AE,
-  zlinebelow: 0x1E95,
-  zmonospace: 0xFF5A,
-  zohiragana: 0x305E,
-  zokatakana: 0x30BE,
-  zparen: 0x24B5,
-  zretroflexhook: 0x0290,
-  zstroke: 0x01B6,
-  zuhiragana: 0x305A,
-  zukatakana: 0x30BA,
-  '.notdef': 0x0000
-};
-
-
-/* -*- 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 PDFImage = (function PDFImageClosure() {
-  /**
-   * Decode the image in the main thread if it supported. Resovles the promise
-   * when the image data is ready.
-   */
-  function handleImageData(handler, xref, res, image, promise) {
-    if (image instanceof JpegStream && image.isNativelyDecodable(xref, res)) {
-      // For natively supported jpegs send them to the main thread for decoding.
-      var dict = image.dict;
-      var colorSpace = dict.get('ColorSpace', 'CS');
-      colorSpace = ColorSpace.parse(colorSpace, xref, res);
-      var numComps = colorSpace.numComps;
-      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);
-      });
-    } else {
-      promise.resolve(image);
-    }
-  }
-  /**
-   * Decode and clamp a value. The formula is different from the spec because we
-   * don't decode to float range [0,1], we decode it in the [0,max] range.
-   */
-  function decodeAndClamp(value, addend, coefficient, max) {
-    value = addend + value * coefficient;
-    // Clamp the value to the range
-    return value < 0 ? 0 : value > max ? max : value;
-  }
-  function PDFImage(xref, res, image, inline, smask) {
-    this.image = image;
-    if (image.getParams) {
-      // JPX/JPEG2000 streams directly contain bits per component
-      // and color space mode information.
-      TODO('get params from actual stream');
-      // var bits = ...
-      // var colorspace = ...
-    }
-    // TODO cache rendered images?
-
-    var dict = image.dict;
-    this.width = dict.get('Width', 'W');
-    this.height = dict.get('Height', 'H');
-
-    if (this.width < 1 || this.height < 1)
-      error('Invalid image width: ' + this.width + ' or height: ' +
-            this.height);
-
-    this.interpolate = dict.get('Interpolate', 'I') || false;
-    this.imageMask = dict.get('ImageMask', 'IM') || false;
-
-    var bitsPerComponent = image.bitsPerComponent;
-    if (!bitsPerComponent) {
-      bitsPerComponent = dict.get('BitsPerComponent', 'BPC');
-      if (!bitsPerComponent) {
-        if (this.imageMask)
-          bitsPerComponent = 1;
-        else
-          error('Bits per component missing in image: ' + this.imageMask);
-      }
-    }
-    this.bpc = bitsPerComponent;
-
-    if (!this.imageMask) {
-      var colorSpace = dict.get('ColorSpace', 'CS');
-      if (!colorSpace) {
-        TODO('JPX images (which don"t require color spaces');
-        colorSpace = new Name('DeviceRGB');
-      }
-      this.colorSpace = ColorSpace.parse(colorSpace, xref, res);
-      this.numComps = this.colorSpace.numComps;
-    }
-
-    this.decode = dict.get('Decode', 'D');
-    this.needsDecode = false;
-    if (this.decode && this.colorSpace &&
-        !this.colorSpace.isDefaultDecode(this.decode)) {
-      this.needsDecode = true;
-      // Do some preprocessing to avoid more math.
-      var max = (1 << bitsPerComponent) - 1;
-      this.decodeCoefficients = [];
-      this.decodeAddends = [];
-      for (var i = 0, j = 0; i < this.decode.length; i += 2, ++j) {
-        var dmin = this.decode[i];
-        var dmax = this.decode[i + 1];
-        this.decodeCoefficients[j] = dmax - dmin;
-        this.decodeAddends[j] = max * dmin;
-      }
-    }
-
-    var mask = dict.get('Mask');
-
-    if (mask) {
-      TODO('masked images');
-    } else if (smask) {
-      this.smask = new PDFImage(xref, res, smask, false);
-    }
-  }
-  /**
-   * Handles processing of image data and calls the callback with an argument
-   * of a PDFImage when the image is ready to be used.
-   */
-  PDFImage.buildImage = function PDFImage_buildImage(callback, handler, xref,
-                                                     res, image, inline) {
-    var imageDataPromise = new Promise();
-    var smaskPromise = new Promise();
-    // The image data and smask data may not be ready yet, wait till both are
-    // resolved.
-    Promise.all([imageDataPromise, smaskPromise]).then(function(results) {
-      var imageData = results[0], smaskData = results[1];
-      var image = new PDFImage(xref, res, imageData, inline, smaskData);
-      callback(image);
-    });
-
-    handleImageData(handler, xref, res, image, imageDataPromise);
-
-    var smask = image.dict.get('SMask');
-    if (smask)
-      handleImageData(handler, xref, res, smask, smaskPromise);
-    else
-      smaskPromise.resolve(null);
-  };
-
-  /**
-   * Resize an image using the nearest neighbor algorithm.  Currently only
-   * supports one and three component images.
-   * @param {TypedArray} pixels The original image with one component.
-   * @param {Number} bpc Number of bits per component.
-   * @param {Number} components Number of color components, 1 or 3 is supported.
-   * @param {Number} w1 Original width.
-   * @param {Number} h1 Original height.
-   * @param {Number} w2 New width.
-   * @param {Number} h2 New height.
-   * @return {TypedArray} Resized image data.
-   */
-  PDFImage.resize = function PDFImage_resize(pixels, bpc, components,
-                                             w1, h1, w2, h2) {
-    var length = w2 * h2 * components;
-    var temp = bpc <= 8 ? new Uint8Array(length) :
-        bpc <= 16 ? new Uint16Array(length) : new Uint32Array(length);
-    var xRatio = w1 / w2;
-    var yRatio = h1 / h2;
-    var px, py, newIndex, oldIndex;
-    for (var i = 0; i < h2; i++) {
-      for (var j = 0; j < w2; j++) {
-        px = Math.floor(j * xRatio);
-        py = Math.floor(i * yRatio);
-        newIndex = (i * w2) + j;
-        oldIndex = ((py * w1) + px);
-        if (components === 1) {
-          temp[newIndex] = pixels[oldIndex];
-        } else if (components === 3) {
-          newIndex *= 3;
-          oldIndex *= 3;
-          temp[newIndex] = pixels[oldIndex];
-          temp[newIndex + 1] = pixels[oldIndex + 1];
-          temp[newIndex + 2] = pixels[oldIndex + 2];
-        }
-      }
-    }
-    return temp;
-  };
-
-  PDFImage.prototype = {
-    get drawWidth() {
-      if (!this.smask)
-        return this.width;
-      return Math.max(this.width, this.smask.width);
-    },
-    get drawHeight() {
-      if (!this.smask)
-        return this.height;
-      return Math.max(this.height, this.smask.height);
-    },
-    getComponents: function PDFImage_getComponents(buffer) {
-      var bpc = this.bpc;
-      var needsDecode = this.needsDecode;
-      var decodeMap = this.decode;
-
-      // This image doesn't require any extra work.
-      if (bpc == 8 && !needsDecode)
-        return buffer;
-
-      var bufferLength = buffer.length;
-      var width = this.width;
-      var height = this.height;
-      var numComps = this.numComps;
-
-      var length = width * height * numComps;
-      var bufferPos = 0;
-      var output = bpc <= 8 ? new Uint8Array(length) :
-        bpc <= 16 ? new Uint16Array(length) : new Uint32Array(length);
-      var rowComps = width * numComps;
-      var decodeAddends, decodeCoefficients;
-      if (needsDecode) {
-        decodeAddends = this.decodeAddends;
-        decodeCoefficients = this.decodeCoefficients;
-      }
-      var max = (1 << bpc) - 1;
-
-      if (bpc == 8) {
-        // Optimization for reading 8 bpc images that have a decode.
-        for (var i = 0, ii = length; i < ii; ++i) {
-          var compIndex = i % numComps;
-          var value = buffer[i];
-          value = decodeAndClamp(value, decodeAddends[compIndex],
-                          decodeCoefficients[compIndex], max);
-          output[i] = value;
-        }
-      } else if (bpc == 1) {
-        // Optimization for reading 1 bpc images.
-        var valueZero = 0, valueOne = 1;
-        if (decodeMap) {
-          valueZero = decodeMap[0] ? 1 : 0;
-          valueOne = decodeMap[1] ? 1 : 0;
-        }
-        var mask = 0;
-        var buf = 0;
-
-        for (var i = 0, ii = length; i < ii; ++i) {
-          if (i % rowComps == 0) {
-            mask = 0;
-            buf = 0;
-          } else {
-            mask >>= 1;
-          }
-
-          if (mask <= 0) {
-            buf = buffer[bufferPos++];
-            mask = 128;
-          }
-
-          output[i] = !(buf & mask) ? valueZero : valueOne;
-        }
-      } else {
-        // The general case that handles all other bpc values.
-        var bits = 0, buf = 0;
-        for (var i = 0, ii = length; i < ii; ++i) {
-          if (i % rowComps == 0) {
-            buf = 0;
-            bits = 0;
-          }
-
-          while (bits < bpc) {
-            buf = (buf << 8) | buffer[bufferPos++];
-            bits += 8;
-          }
-
-          var remainingBits = bits - bpc;
-          var value = buf >> remainingBits;
-          if (needsDecode) {
-            var compIndex = i % numComps;
-            value = decodeAndClamp(value, decodeAddends[compIndex],
-                            decodeCoefficients[compIndex], max);
-          }
-          output[i] = value;
-          buf = buf & ((1 << remainingBits) - 1);
-          bits = remainingBits;
-        }
-      }
-      return output;
-    },
-    getOpacity: function PDFImage_getOpacity(width, height) {
-      var smask = this.smask;
-      var originalWidth = this.width;
-      var originalHeight = this.height;
-      var buf;
-
-      if (smask) {
-        var sw = smask.width;
-        var sh = smask.height;
-        buf = new Uint8Array(sw * sh);
-        smask.fillGrayBuffer(buf);
-        if (sw != width || sh != height)
-          buf = PDFImage.resize(buf, smask.bps, 1, sw, sh, width, height);
-      } else {
-        buf = new Uint8Array(width * height);
-        for (var i = 0, ii = width * height; i < ii; ++i)
-          buf[i] = 255;
-      }
-      return buf;
-    },
-    applyStencilMask: function PDFImage_applyStencilMask(buffer,
-                                                         inverseDecode) {
-      var width = this.width, height = this.height;
-      var bitStrideLength = (width + 7) >> 3;
-      var imgArray = this.getImageBytes(bitStrideLength * height);
-      var imgArrayPos = 0;
-      var i, j, mask, buf;
-      // removing making non-masked pixels transparent
-      var bufferPos = 3; // alpha component offset
-      for (i = 0; i < height; i++) {
-        mask = 0;
-        for (j = 0; j < width; j++) {
-          if (!mask) {
-            buf = imgArray[imgArrayPos++];
-            mask = 128;
-          }
-          if (!(buf & mask) == inverseDecode) {
-            buffer[bufferPos] = 0;
-          }
-          bufferPos += 4;
-          mask >>= 1;
-        }
-      }
-    },
-    fillRgbaBuffer: function PDFImage_fillRgbaBuffer(buffer, width, height) {
-      var numComps = this.numComps;
-      var originalWidth = this.width;
-      var originalHeight = this.height;
-      var bpc = this.bpc;
-
-      // rows start at byte boundary;
-      var rowBytes = (originalWidth * numComps * bpc + 7) >> 3;
-      var imgArray = this.getImageBytes(originalHeight * rowBytes);
-
-      var comps = this.colorSpace.getRgbBuffer(
-        this.getComponents(imgArray), bpc);
-      if (originalWidth != width || originalHeight != height)
-        comps = PDFImage.resize(comps, this.bpc, 3, originalWidth,
-                                originalHeight, width, height);
-      var compsPos = 0;
-      var opacity = this.getOpacity(width, height);
-      var opacityPos = 0;
-      var length = width * height * 4;
-
-      for (var i = 0; i < length; i += 4) {
-        buffer[i] = comps[compsPos++];
-        buffer[i + 1] = comps[compsPos++];
-        buffer[i + 2] = comps[compsPos++];
-        buffer[i + 3] = opacity[opacityPos++];
-      }
-    },
-    fillGrayBuffer: function PDFImage_fillGrayBuffer(buffer) {
-      var numComps = this.numComps;
-      if (numComps != 1)
-        error('Reading gray scale from a color image: ' + numComps);
-
-      var width = this.width;
-      var height = this.height;
-      var bpc = this.bpc;
-
-      // rows start at byte boundary;
-      var rowBytes = (width * numComps * bpc + 7) >> 3;
-      var imgArray = this.getImageBytes(height * rowBytes);
-
-      var comps = this.getComponents(imgArray);
-      var length = width * height;
-      // we aren't using a colorspace so we need to scale the value
-      var scale = 255 / ((1 << bpc) - 1);
-      for (var i = 0; i < length; ++i)
-        buffer[i] = (scale * comps[i]) | 0;
-    },
-    getImageBytes: function PDFImage_getImageBytes(length) {
-      this.image.reset();
-      return this.image.getBytes(length);
-    }
-  };
-  return PDFImage;
-})();
-
-function loadJpegStream(id, imageData, objs) {
-  var img = new Image();
-  img.onload = (function loadJpegStream_onloadClosure() {
-    objs.resolve(id, img);
-  });
-  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: */
-
-'use strict';
-
-// The Metrics object contains glyph widths (in glyph space units).
-// As per PDF spec, for most fonts (Type 3 being an exception) a glyph
-// space unit corresponds to 1/1000th of text space unit.
-var Metrics = {
-  'Courier': 600,
-  'Courier-Bold': 600,
-  'Courier-BoldOblique': 600,
-  'Courier-Oblique': 600,
-  'Helvetica' : {
-    'space': 278,
-    'exclam': 278,
-    'quotedbl': 355,
-    'numbersign': 556,
-    'dollar': 556,
-    'percent': 889,
-    'ampersand': 667,
-    'quoteright': 222,
-    'parenleft': 333,
-    'parenright': 333,
-    'asterisk': 389,
-    'plus': 584,
-    'comma': 278,
-    'hyphen': 333,
-    'period': 278,
-    'slash': 278,
-    'zero': 556,
-    'one': 556,
-    'two': 556,
-    'three': 556,
-    'four': 556,
-    'five': 556,
-    'six': 556,
-    'seven': 556,
-    'eight': 556,
-    'nine': 556,
-    'colon': 278,
-    'semicolon': 278,
-    'less': 584,
-    'equal': 584,
-    'greater': 584,
-    'question': 556,
-    'at': 1015,
-    'A': 667,
-    'B': 667,
-    'C': 722,
-    'D': 722,
-    'E': 667,
-    'F': 611,
-    'G': 778,
-    'H': 722,
-    'I': 278,
-    'J': 500,
-    'K': 667,
-    'L': 556,
-    'M': 833,
-    'N': 722,
-    'O': 778,
-    'P': 667,
-    'Q': 778,
-    'R': 722,
-    'S': 667,
-    'T': 611,
-    'U': 722,
-    'V': 667,
-    'W': 944,
-    'X': 667,
-    'Y': 667,
-    'Z': 611,
-    'bracketleft': 278,
-    'backslash': 278,
-    'bracketright': 278,
-    'asciicircum': 469,
-    'underscore': 556,
-    'quoteleft': 222,
-    'a': 556,
-    'b': 556,
-    'c': 500,
-    'd': 556,
-    'e': 556,
-    'f': 278,
-    'g': 556,
-    'h': 556,
-    'i': 222,
-    'j': 222,
-    'k': 500,
-    'l': 222,
-    'm': 833,
-    'n': 556,
-    'o': 556,
-    'p': 556,
-    'q': 556,
-    'r': 333,
-    's': 500,
-    't': 278,
-    'u': 556,
-    'v': 500,
-    'w': 722,
-    'x': 500,
-    'y': 500,
-    'z': 500,
-    'braceleft': 334,
-    'bar': 260,
-    'braceright': 334,
-    'asciitilde': 584,
-    'exclamdown': 333,
-    'cent': 556,
-    'sterling': 556,
-    'fraction': 167,
-    'yen': 556,
-    'florin': 556,
-    'section': 556,
-    'currency': 556,
-    'quotesingle': 191,
-    'quotedblleft': 333,
-    'guillemotleft': 556,
-    'guilsinglleft': 333,
-    'guilsinglright': 333,
-    'fi': 500,
-    'fl': 500,
-    'endash': 556,
-    'dagger': 556,
-    'daggerdbl': 556,
-    'periodcentered': 278,
-    'paragraph': 537,
-    'bullet': 350,
-    'quotesinglbase': 222,
-    'quotedblbase': 333,
-    'quotedblright': 333,
-    'guillemotright': 556,
-    'ellipsis': 1000,
-    'perthousand': 1000,
-    'questiondown': 611,
-    'grave': 333,
-    'acute': 333,
-    'circumflex': 333,
-    'tilde': 333,
-    'macron': 333,
-    'breve': 333,
-    'dotaccent': 333,
-    'dieresis': 333,
-    'ring': 333,
-    'cedilla': 333,
-    'hungarumlaut': 333,
-    'ogonek': 333,
-    'caron': 333,
-    'emdash': 1000,
-    'AE': 1000,
-    'ordfeminine': 370,
-    'Lslash': 556,
-    'Oslash': 778,
-    'OE': 1000,
-    'ordmasculine': 365,
-    'ae': 889,
-    'dotlessi': 278,
-    'lslash': 222,
-    'oslash': 611,
-    'oe': 944,
-    'germandbls': 611,
-    'Idieresis': 278,
-    'eacute': 556,
-    'abreve': 556,
-    'uhungarumlaut': 556,
-    'ecaron': 556,
-    'Ydieresis': 667,
-    'divide': 584,
-    'Yacute': 667,
-    'Acircumflex': 667,
-    'aacute': 556,
-    'Ucircumflex': 722,
-    'yacute': 500,
-    'scommaaccent': 500,
-    'ecircumflex': 556,
-    'Uring': 722,
-    'Udieresis': 722,
-    'aogonek': 556,
-    'Uacute': 722,
-    'uogonek': 556,
-    'Edieresis': 667,
-    'Dcroat': 722,
-    'commaaccent': 250,
-    'copyright': 737,
-    'Emacron': 667,
-    'ccaron': 500,
-    'aring': 556,
-    'Ncommaaccent': 722,
-    'lacute': 222,
-    'agrave': 556,
-    'Tcommaaccent': 611,
-    'Cacute': 722,
-    'atilde': 556,
-    'Edotaccent': 667,
-    'scaron': 500,
-    'scedilla': 500,
-    'iacute': 278,
-    'lozenge': 471,
-    'Rcaron': 722,
-    'Gcommaaccent': 778,
-    'ucircumflex': 556,
-    'acircumflex': 556,
-    'Amacron': 667,
-    'rcaron': 333,
-    'ccedilla': 500,
-    'Zdotaccent': 611,
-    'Thorn': 667,
-    'Omacron': 778,
-    'Racute': 722,
-    'Sacute': 667,
-    'dcaron': 643,
-    'Umacron': 722,
-    'uring': 556,
-    'threesuperior': 333,
-    'Ograve': 778,
-    'Agrave': 667,
-    'Abreve': 667,
-    'multiply': 584,
-    'uacute': 556,
-    'Tcaron': 611,
-    'partialdiff': 476,
-    'ydieresis': 500,
-    'Nacute': 722,
-    'icircumflex': 278,
-    'Ecircumflex': 667,
-    'adieresis': 556,
-    'edieresis': 556,
-    'cacute': 500,
-    'nacute': 556,
-    'umacron': 556,
-    'Ncaron': 722,
-    'Iacute': 278,
-    'plusminus': 584,
-    'brokenbar': 260,
-    'registered': 737,
-    'Gbreve': 778,
-    'Idotaccent': 278,
-    'summation': 600,
-    'Egrave': 667,
-    'racute': 333,
-    'omacron': 556,
-    'Zacute': 611,
-    'Zcaron': 611,
-    'greaterequal': 549,
-    'Eth': 722,
-    'Ccedilla': 722,
-    'lcommaaccent': 222,
-    'tcaron': 317,
-    'eogonek': 556,
-    'Uogonek': 722,
-    'Aacute': 667,
-    'Adieresis': 667,
-    'egrave': 556,
-    'zacute': 500,
-    'iogonek': 222,
-    'Oacute': 778,
-    'oacute': 556,
-    'amacron': 556,
-    'sacute': 500,
-    'idieresis': 278,
-    'Ocircumflex': 778,
-    'Ugrave': 722,
-    'Delta': 612,
-    'thorn': 556,
-    'twosuperior': 333,
-    'Odieresis': 778,
-    'mu': 556,
-    'igrave': 278,
-    'ohungarumlaut': 556,
-    'Eogonek': 667,
-    'dcroat': 556,
-    'threequarters': 834,
-    'Scedilla': 667,
-    'lcaron': 299,
-    'Kcommaaccent': 667,
-    'Lacute': 556,
-    'trademark': 1000,
-    'edotaccent': 556,
-    'Igrave': 278,
-    'Imacron': 278,
-    'Lcaron': 556,
-    'onehalf': 834,
-    'lessequal': 549,
-    'ocircumflex': 556,
-    'ntilde': 556,
-    'Uhungarumlaut': 722,
-    'Eacute': 667,
-    'emacron': 556,
-    'gbreve': 556,
-    'onequarter': 834,
-    'Scaron': 667,
-    'Scommaaccent': 667,
-    'Ohungarumlaut': 778,
-    'degree': 400,
-    'ograve': 556,
-    'Ccaron': 722,
-    'ugrave': 556,
-    'radical': 453,
-    'Dcaron': 722,
-    'rcommaaccent': 333,
-    'Ntilde': 722,
-    'otilde': 556,
-    'Rcommaaccent': 722,
-    'Lcommaaccent': 556,
-    'Atilde': 667,
-    'Aogonek': 667,
-    'Aring': 667,
-    'Otilde': 778,
-    'zdotaccent': 500,
-    'Ecaron': 667,
-    'Iogonek': 278,
-    'kcommaaccent': 500,
-    'minus': 584,
-    'Icircumflex': 278,
-    'ncaron': 556,
-    'tcommaaccent': 278,
-    'logicalnot': 584,
-    'odieresis': 556,
-    'udieresis': 556,
-    'notequal': 549,
-    'gcommaaccent': 556,
-    'eth': 556,
-    'zcaron': 500,
-    'ncommaaccent': 556,
-    'onesuperior': 333,
-    'imacron': 278,
-    'Euro': 556
-  },
-  'Helvetica-Bold': {
-    'space': 278,
-    'exclam': 333,
-    'quotedbl': 474,
-    'numbersign': 556,
-    'dollar': 556,
-    'percent': 889,
-    'ampersand': 722,
-    'quoteright': 278,
-    'parenleft': 333,
-    'parenright': 333,
-    'asterisk': 389,
-    'plus': 584,
-    'comma': 278,
-    'hyphen': 333,
-    'period': 278,
-    'slash': 278,
-    'zero': 556,
-    'one': 556,
-    'two': 556,
-    'three': 556,
-    'four': 556,
-    'five': 556,
-    'six': 556,
-    'seven': 556,
-    'eight': 556,
-    'nine': 556,
-    'colon': 333,
-    'semicolon': 333,
-    'less': 584,
-    'equal': 584,
-    'greater': 584,
-    'question': 611,
-    'at': 975,
-    'A': 722,
-    'B': 722,
-    'C': 722,
-    'D': 722,
-    'E': 667,
-    'F': 611,
-    'G': 778,
-    'H': 722,
-    'I': 278,
-    'J': 556,
-    'K': 722,
-    'L': 611,
-    'M': 833,
-    'N': 722,
-    'O': 778,
-    'P': 667,
-    'Q': 778,
-    'R': 722,
-    'S': 667,
-    'T': 611,
-    'U': 722,
-    'V': 667,
-    'W': 944,
-    'X': 667,
-    'Y': 667,
-    'Z': 611,
-    'bracketleft': 333,
-    'backslash': 278,
-    'bracketright': 333,
-    'asciicircum': 584,
-    'underscore': 556,
-    'quoteleft': 278,
-    'a': 556,
-    'b': 611,
-    'c': 556,
-    'd': 611,
-    'e': 556,
-    'f': 333,
-    'g': 611,
-    'h': 611,
-    'i': 278,
-    'j': 278,
-    'k': 556,
-    'l': 278,
-    'm': 889,
-    'n': 611,
-    'o': 611,
-    'p': 611,
-    'q': 611,
-    'r': 389,
-    's': 556,
-    't': 333,
-    'u': 611,
-    'v': 556,
-    'w': 778,
-    'x': 556,
-    'y': 556,
-    'z': 500,
-    'braceleft': 389,
-    'bar': 280,
-    'braceright': 389,
-    'asciitilde': 584,
-    'exclamdown': 333,
-    'cent': 556,
-    'sterling': 556,
-    'fraction': 167,
-    'yen': 556,
-    'florin': 556,
-    'section': 556,
-    'currency': 556,
-    'quotesingle': 238,
-    'quotedblleft': 500,
-    'guillemotleft': 556,
-    'guilsinglleft': 333,
-    'guilsinglright': 333,
-    'fi': 611,
-    'fl': 611,
-    'endash': 556,
-    'dagger': 556,
-    'daggerdbl': 556,
-    'periodcentered': 278,
-    'paragraph': 556,
-    'bullet': 350,
-    'quotesinglbase': 278,
-    'quotedblbase': 500,
-    'quotedblright': 500,
-    'guillemotright': 556,
-    'ellipsis': 1000,
-    'perthousand': 1000,
-    'questiondown': 611,
-    'grave': 333,
-    'acute': 333,
-    'circumflex': 333,
-    'tilde': 333,
-    'macron': 333,
-    'breve': 333,
-    'dotaccent': 333,
-    'dieresis': 333,
-    'ring': 333,
-    'cedilla': 333,
-    'hungarumlaut': 333,
-    'ogonek': 333,
-    'caron': 333,
-    'emdash': 1000,
-    'AE': 1000,
-    'ordfeminine': 370,
-    'Lslash': 611,
-    'Oslash': 778,
-    'OE': 1000,
-    'ordmasculine': 365,
-    'ae': 889,
-    'dotlessi': 278,
-    'lslash': 278,
-    'oslash': 611,
-    'oe': 944,
-    'germandbls': 611,
-    'Idieresis': 278,
-    'eacute': 556,
-    'abreve': 556,
-    'uhungarumlaut': 611,
-    'ecaron': 556,
-    'Ydieresis': 667,
-    'divide': 584,
-    'Yacute': 667,
-    'Acircumflex': 722,
-    'aacute': 556,
-    'Ucircumflex': 722,
-    'yacute': 556,
-    'scommaaccent': 556,
-    'ecircumflex': 556,
-    'Uring': 722,
-    'Udieresis': 722,
-    'aogonek': 556,
-    'Uacute': 722,
-    'uogonek': 611,
-    'Edieresis': 667,
-    'Dcroat': 722,
-    'commaaccent': 250,
-    'copyright': 737,
-    'Emacron': 667,
-    'ccaron': 556,
-    'aring': 556,
-    'Ncommaaccent': 722,
-    'lacute': 278,
-    'agrave': 556,
-    'Tcommaaccent': 611,
-    'Cacute': 722,
-    'atilde': 556,
-    'Edotaccent': 667,
-    'scaron': 556,
-    'scedilla': 556,
-    'iacute': 278,
-    'lozenge': 494,
-    'Rcaron': 722,
-    'Gcommaaccent': 778,
-    'ucircumflex': 611,
-    'acircumflex': 556,
-    'Amacron': 722,
-    'rcaron': 389,
-    'ccedilla': 556,
-    'Zdotaccent': 611,
-    'Thorn': 667,
-    'Omacron': 778,
-    'Racute': 722,
-    'Sacute': 667,
-    'dcaron': 743,
-    'Umacron': 722,
-    'uring': 611,
-    'threesuperior': 333,
-    'Ograve': 778,
-    'Agrave': 722,
-    'Abreve': 722,
-    'multiply': 584,
-    'uacute': 611,
-    'Tcaron': 611,
-    'partialdiff': 494,
-    'ydieresis': 556,
-    'Nacute': 722,
-    'icircumflex': 278,
-    'Ecircumflex': 667,
-    'adieresis': 556,
-    'edieresis': 556,
-    'cacute': 556,
-    'nacute': 611,
-    'umacron': 611,
-    'Ncaron': 722,
-    'Iacute': 278,
-    'plusminus': 584,
-    'brokenbar': 280,
-    'registered': 737,
-    'Gbreve': 778,
-    'Idotaccent': 278,
-    'summation': 600,
-    'Egrave': 667,
-    'racute': 389,
-    'omacron': 611,
-    'Zacute': 611,
-    'Zcaron': 611,
-    'greaterequal': 549,
-    'Eth': 722,
-    'Ccedilla': 722,
-    'lcommaaccent': 278,
-    'tcaron': 389,
-    'eogonek': 556,
-    'Uogonek': 722,
-    'Aacute': 722,
-    'Adieresis': 722,
-    'egrave': 556,
-    'zacute': 500,
-    'iogonek': 278,
-    'Oacute': 778,
-    'oacute': 611,
-    'amacron': 556,
-    'sacute': 556,
-    'idieresis': 278,
-    'Ocircumflex': 778,
-    'Ugrave': 722,
-    'Delta': 612,
-    'thorn': 611,
-    'twosuperior': 333,
-    'Odieresis': 778,
-    'mu': 611,
-    'igrave': 278,
-    'ohungarumlaut': 611,
-    'Eogonek': 667,
-    'dcroat': 611,
-    'threequarters': 834,
-    'Scedilla': 667,
-    'lcaron': 400,
-    'Kcommaaccent': 722,
-    'Lacute': 611,
-    'trademark': 1000,
-    'edotaccent': 556,
-    'Igrave': 278,
-    'Imacron': 278,
-    'Lcaron': 611,
-    'onehalf': 834,
-    'lessequal': 549,
-    'ocircumflex': 611,
-    'ntilde': 611,
-    'Uhungarumlaut': 722,
-    'Eacute': 667,
-    'emacron': 556,
-    'gbreve': 611,
-    'onequarter': 834,
-    'Scaron': 667,
-    'Scommaaccent': 667,
-    'Ohungarumlaut': 778,
-    'degree': 400,
-    'ograve': 611,
-    'Ccaron': 722,
-    'ugrave': 611,
-    'radical': 549,
-    'Dcaron': 722,
-    'rcommaaccent': 389,
-    'Ntilde': 722,
-    'otilde': 611,
-    'Rcommaaccent': 722,
-    'Lcommaaccent': 611,
-    'Atilde': 722,
-    'Aogonek': 722,
-    'Aring': 722,
-    'Otilde': 778,
-    'zdotaccent': 500,
-    'Ecaron': 667,
-    'Iogonek': 278,
-    'kcommaaccent': 556,
-    'minus': 584,
-    'Icircumflex': 278,
-    'ncaron': 611,
-    'tcommaaccent': 333,
-    'logicalnot': 584,
-    'odieresis': 611,
-    'udieresis': 611,
-    'notequal': 549,
-    'gcommaaccent': 611,
-    'eth': 611,
-    'zcaron': 500,
-    'ncommaaccent': 611,
-    'onesuperior': 333,
-    'imacron': 278,
-    'Euro': 556
-  },
-  'Helvetica-BoldOblique': {
-    'space': 278,
-    'exclam': 333,
-    'quotedbl': 474,
-    'numbersign': 556,
-    'dollar': 556,
-    'percent': 889,
-    'ampersand': 722,
-    'quoteright': 278,
-    'parenleft': 333,
-    'parenright': 333,
-    'asterisk': 389,
-    'plus': 584,
-    'comma': 278,
-    'hyphen': 333,
-    'period': 278,
-    'slash': 278,
-    'zero': 556,
-    'one': 556,
-    'two': 556,
-    'three': 556,
-    'four': 556,
-    'five': 556,
-    'six': 556,
-    'seven': 556,
-    'eight': 556,
-    'nine': 556,
-    'colon': 333,
-    'semicolon': 333,
-    'less': 584,
-    'equal': 584,
-    'greater': 584,
-    'question': 611,
-    'at': 975,
-    'A': 722,
-    'B': 722,
-    'C': 722,
-    'D': 722,
-    'E': 667,
-    'F': 611,
-    'G': 778,
-    'H': 722,
-    'I': 278,
-    'J': 556,
-    'K': 722,
-    'L': 611,
-    'M': 833,
-    'N': 722,
-    'O': 778,
-    'P': 667,
-    'Q': 778,
-    'R': 722,
-    'S': 667,
-    'T': 611,
-    'U': 722,
-    'V': 667,
-    'W': 944,
-    'X': 667,
-    'Y': 667,
-    'Z': 611,
-    'bracketleft': 333,
-    'backslash': 278,
-    'bracketright': 333,
-    'asciicircum': 584,
-    'underscore': 556,
-    'quoteleft': 278,
-    'a': 556,
-    'b': 611,
-    'c': 556,
-    'd': 611,
-    'e': 556,
-    'f': 333,
-    'g': 611,
-    'h': 611,
-    'i': 278,
-    'j': 278,
-    'k': 556,
-    'l': 278,
-    'm': 889,
-    'n': 611,
-    'o': 611,
-    'p': 611,
-    'q': 611,
-    'r': 389,
-    's': 556,
-    't': 333,
-    'u': 611,
-    'v': 556,
-    'w': 778,
-    'x': 556,
-    'y': 556,
-    'z': 500,
-    'braceleft': 389,
-    'bar': 280,
-    'braceright': 389,
-    'asciitilde': 584,
-    'exclamdown': 333,
-    'cent': 556,
-    'sterling': 556,
-    'fraction': 167,
-    'yen': 556,
-    'florin': 556,
-    'section': 556,
-    'currency': 556,
-    'quotesingle': 238,
-    'quotedblleft': 500,
-    'guillemotleft': 556,
-    'guilsinglleft': 333,
-    'guilsinglright': 333,
-    'fi': 611,
-    'fl': 611,
-    'endash': 556,
-    'dagger': 556,
-    'daggerdbl': 556,
-    'periodcentered': 278,
-    'paragraph': 556,
-    'bullet': 350,
-    'quotesinglbase': 278,
-    'quotedblbase': 500,
-    'quotedblright': 500,
-    'guillemotright': 556,
-    'ellipsis': 1000,
-    'perthousand': 1000,
-    'questiondown': 611,
-    'grave': 333,
-    'acute': 333,
-    'circumflex': 333,
-    'tilde': 333,
-    'macron': 333,
-    'breve': 333,
-    'dotaccent': 333,
-    'dieresis': 333,
-    'ring': 333,
-    'cedilla': 333,
-    'hungarumlaut': 333,
-    'ogonek': 333,
-    'caron': 333,
-    'emdash': 1000,
-    'AE': 1000,
-    'ordfeminine': 370,
-    'Lslash': 611,
-    'Oslash': 778,
-    'OE': 1000,
-    'ordmasculine': 365,
-    'ae': 889,
-    'dotlessi': 278,
-    'lslash': 278,
-    'oslash': 611,
-    'oe': 944,
-    'germandbls': 611,
-    'Idieresis': 278,
-    'eacute': 556,
-    'abreve': 556,
-    'uhungarumlaut': 611,
-    'ecaron': 556,
-    'Ydieresis': 667,
-    'divide': 584,
-    'Yacute': 667,
-    'Acircumflex': 722,
-    'aacute': 556,
-    'Ucircumflex': 722,
-    'yacute': 556,
-    'scommaaccent': 556,
-    'ecircumflex': 556,
-    'Uring': 722,
-    'Udieresis': 722,
-    'aogonek': 556,
-    'Uacute': 722,
-    'uogonek': 611,
-    'Edieresis': 667,
-    'Dcroat': 722,
-    'commaaccent': 250,
-    'copyright': 737,
-    'Emacron': 667,
-    'ccaron': 556,
-    'aring': 556,
-    'Ncommaaccent': 722,
-    'lacute': 278,
-    'agrave': 556,
-    'Tcommaaccent': 611,
-    'Cacute': 722,
-    'atilde': 556,
-    'Edotaccent': 667,
-    'scaron': 556,
-    'scedilla': 556,
-    'iacute': 278,
-    'lozenge': 494,
-    'Rcaron': 722,
-    'Gcommaaccent': 778,
-    'ucircumflex': 611,
-    'acircumflex': 556,
-    'Amacron': 722,
-    'rcaron': 389,
-    'ccedilla': 556,
-    'Zdotaccent': 611,
-    'Thorn': 667,
-    'Omacron': 778,
-    'Racute': 722,
-    'Sacute': 667,
-    'dcaron': 743,
-    'Umacron': 722,
-    'uring': 611,
-    'threesuperior': 333,
-    'Ograve': 778,
-    'Agrave': 722,
-    'Abreve': 722,
-    'multiply': 584,
-    'uacute': 611,
-    'Tcaron': 611,
-    'partialdiff': 494,
-    'ydieresis': 556,
-    'Nacute': 722,
-    'icircumflex': 278,
-    'Ecircumflex': 667,
-    'adieresis': 556,
-    'edieresis': 556,
-    'cacute': 556,
-    'nacute': 611,
-    'umacron': 611,
-    'Ncaron': 722,
-    'Iacute': 278,
-    'plusminus': 584,
-    'brokenbar': 280,
-    'registered': 737,
-    'Gbreve': 778,
-    'Idotaccent': 278,
-    'summation': 600,
-    'Egrave': 667,
-    'racute': 389,
-    'omacron': 611,
-    'Zacute': 611,
-    'Zcaron': 611,
-    'greaterequal': 549,
-    'Eth': 722,
-    'Ccedilla': 722,
-    'lcommaaccent': 278,
-    'tcaron': 389,
-    'eogonek': 556,
-    'Uogonek': 722,
-    'Aacute': 722,
-    'Adieresis': 722,
-    'egrave': 556,
-    'zacute': 500,
-    'iogonek': 278,
-    'Oacute': 778,
-    'oacute': 611,
-    'amacron': 556,
-    'sacute': 556,
-    'idieresis': 278,
-    'Ocircumflex': 778,
-    'Ugrave': 722,
-    'Delta': 612,
-    'thorn': 611,
-    'twosuperior': 333,
-    'Odieresis': 778,
-    'mu': 611,
-    'igrave': 278,
-    'ohungarumlaut': 611,
-    'Eogonek': 667,
-    'dcroat': 611,
-    'threequarters': 834,
-    'Scedilla': 667,
-    'lcaron': 400,
-    'Kcommaaccent': 722,
-    'Lacute': 611,
-    'trademark': 1000,
-    'edotaccent': 556,
-    'Igrave': 278,
-    'Imacron': 278,
-    'Lcaron': 611,
-    'onehalf': 834,
-    'lessequal': 549,
-    'ocircumflex': 611,
-    'ntilde': 611,
-    'Uhungarumlaut': 722,
-    'Eacute': 667,
-    'emacron': 556,
-    'gbreve': 611,
-    'onequarter': 834,
-    'Scaron': 667,
-    'Scommaaccent': 667,
-    'Ohungarumlaut': 778,
-    'degree': 400,
-    'ograve': 611,
-    'Ccaron': 722,
-    'ugrave': 611,
-    'radical': 549,
-    'Dcaron': 722,
-    'rcommaaccent': 389,
-    'Ntilde': 722,
-    'otilde': 611,
-    'Rcommaaccent': 722,
-    'Lcommaaccent': 611,
-    'Atilde': 722,
-    'Aogonek': 722,
-    'Aring': 722,
-    'Otilde': 778,
-    'zdotaccent': 500,
-    'Ecaron': 667,
-    'Iogonek': 278,
-    'kcommaaccent': 556,
-    'minus': 584,
-    'Icircumflex': 278,
-    'ncaron': 611,
-    'tcommaaccent': 333,
-    'logicalnot': 584,
-    'odieresis': 611,
-    'udieresis': 611,
-    'notequal': 549,
-    'gcommaaccent': 611,
-    'eth': 611,
-    'zcaron': 500,
-    'ncommaaccent': 611,
-    'onesuperior': 333,
-    'imacron': 278,
-    'Euro': 556
-  },
-  'Helvetica-Oblique' : {
-    'space': 278,
-    'exclam': 278,
-    'quotedbl': 355,
-    'numbersign': 556,
-    'dollar': 556,
-    'percent': 889,
-    'ampersand': 667,
-    'quoteright': 222,
-    'parenleft': 333,
-    'parenright': 333,
-    'asterisk': 389,
-    'plus': 584,
-    'comma': 278,
-    'hyphen': 333,
-    'period': 278,
-    'slash': 278,
-    'zero': 556,
-    'one': 556,
-    'two': 556,
-    'three': 556,
-    'four': 556,
-    'five': 556,
-    'six': 556,
-    'seven': 556,
-    'eight': 556,
-    'nine': 556,
-    'colon': 278,
-    'semicolon': 278,
-    'less': 584,
-    'equal': 584,
-    'greater': 584,
-    'question': 556,
-    'at': 1015,
-    'A': 667,
-    'B': 667,
-    'C': 722,
-    'D': 722,
-    'E': 667,
-    'F': 611,
-    'G': 778,
-    'H': 722,
-    'I': 278,
-    'J': 500,
-    'K': 667,
-    'L': 556,
-    'M': 833,
-    'N': 722,
-    'O': 778,
-    'P': 667,
-    'Q': 778,
-    'R': 722,
-    'S': 667,
-    'T': 611,
-    'U': 722,
-    'V': 667,
-    'W': 944,
-    'X': 667,
-    'Y': 667,
-    'Z': 611,
-    'bracketleft': 278,
-    'backslash': 278,
-    'bracketright': 278,
-    'asciicircum': 469,
-    'underscore': 556,
-    'quoteleft': 222,
-    'a': 556,
-    'b': 556,
-    'c': 500,
-    'd': 556,
-    'e': 556,
-    'f': 278,
-    'g': 556,
-    'h': 556,
-    'i': 222,
-    'j': 222,
-    'k': 500,
-    'l': 222,
-    'm': 833,
-    'n': 556,
-    'o': 556,
-    'p': 556,
-    'q': 556,
-    'r': 333,
-    's': 500,
-    't': 278,
-    'u': 556,
-    'v': 500,
-    'w': 722,
-    'x': 500,
-    'y': 500,
-    'z': 500,
-    'braceleft': 334,
-    'bar': 260,
-    'braceright': 334,
-    'asciitilde': 584,
-    'exclamdown': 333,
-    'cent': 556,
-    'sterling': 556,
-    'fraction': 167,
-    'yen': 556,
-    'florin': 556,
-    'section': 556,
-    'currency': 556,
-    'quotesingle': 191,
-    'quotedblleft': 333,
-    'guillemotleft': 556,
-    'guilsinglleft': 333,
-    'guilsinglright': 333,
-    'fi': 500,
-    'fl': 500,
-    'endash': 556,
-    'dagger': 556,
-    'daggerdbl': 556,
-    'periodcentered': 278,
-    'paragraph': 537,
-    'bullet': 350,
-    'quotesinglbase': 222,
-    'quotedblbase': 333,
-    'quotedblright': 333,
-    'guillemotright': 556,
-    'ellipsis': 1000,
-    'perthousand': 1000,
-    'questiondown': 611,
-    'grave': 333,
-    'acute': 333,
-    'circumflex': 333,
-    'tilde': 333,
-    'macron': 333,
-    'breve': 333,
-    'dotaccent': 333,
-    'dieresis': 333,
-    'ring': 333,
-    'cedilla': 333,
-    'hungarumlaut': 333,
-    'ogonek': 333,
-    'caron': 333,
-    'emdash': 1000,
-    'AE': 1000,
-    'ordfeminine': 370,
-    'Lslash': 556,
-    'Oslash': 778,
-    'OE': 1000,
-    'ordmasculine': 365,
-    'ae': 889,
-    'dotlessi': 278,
-    'lslash': 222,
-    'oslash': 611,
-    'oe': 944,
-    'germandbls': 611,
-    'Idieresis': 278,
-    'eacute': 556,
-    'abreve': 556,
-    'uhungarumlaut': 556,
-    'ecaron': 556,
-    'Ydieresis': 667,
-    'divide': 584,
-    'Yacute': 667,
-    'Acircumflex': 667,
-    'aacute': 556,
-    'Ucircumflex': 722,
-    'yacute': 500,
-    'scommaaccent': 500,
-    'ecircumflex': 556,
-    'Uring': 722,
-    'Udieresis': 722,
-    'aogonek': 556,
-    'Uacute': 722,
-    'uogonek': 556,
-    'Edieresis': 667,
-    'Dcroat': 722,
-    'commaaccent': 250,
-    'copyright': 737,
-    'Emacron': 667,
-    'ccaron': 500,
-    'aring': 556,
-    'Ncommaaccent': 722,
-    'lacute': 222,
-    'agrave': 556,
-    'Tcommaaccent': 611,
-    'Cacute': 722,
-    'atilde': 556,
-    'Edotaccent': 667,
-    'scaron': 500,
-    'scedilla': 500,
-    'iacute': 278,
-    'lozenge': 471,
-    'Rcaron': 722,
-    'Gcommaaccent': 778,
-    'ucircumflex': 556,
-    'acircumflex': 556,
-    'Amacron': 667,
-    'rcaron': 333,
-    'ccedilla': 500,
-    'Zdotaccent': 611,
-    'Thorn': 667,
-    'Omacron': 778,
-    'Racute': 722,
-    'Sacute': 667,
-    'dcaron': 643,
-    'Umacron': 722,
-    'uring': 556,
-    'threesuperior': 333,
-    'Ograve': 778,
-    'Agrave': 667,
-    'Abreve': 667,
-    'multiply': 584,
-    'uacute': 556,
-    'Tcaron': 611,
-    'partialdiff': 476,
-    'ydieresis': 500,
-    'Nacute': 722,
-    'icircumflex': 278,
-    'Ecircumflex': 667,
-    'adieresis': 556,
-    'edieresis': 556,
-    'cacute': 500,
-    'nacute': 556,
-    'umacron': 556,
-    'Ncaron': 722,
-    'Iacute': 278,
-    'plusminus': 584,
-    'brokenbar': 260,
-    'registered': 737,
-    'Gbreve': 778,
-    'Idotaccent': 278,
-    'summation': 600,
-    'Egrave': 667,
-    'racute': 333,
-    'omacron': 556,
-    'Zacute': 611,
-    'Zcaron': 611,
-    'greaterequal': 549,
-    'Eth': 722,
-    'Ccedilla': 722,
-    'lcommaaccent': 222,
-    'tcaron': 317,
-    'eogonek': 556,
-    'Uogonek': 722,
-    'Aacute': 667,
-    'Adieresis': 667,
-    'egrave': 556,
-    'zacute': 500,
-    'iogonek': 222,
-    'Oacute': 778,
-    'oacute': 556,
-    'amacron': 556,
-    'sacute': 500,
-    'idieresis': 278,
-    'Ocircumflex': 778,
-    'Ugrave': 722,
-    'Delta': 612,
-    'thorn': 556,
-    'twosuperior': 333,
-    'Odieresis': 778,
-    'mu': 556,
-    'igrave': 278,
-    'ohungarumlaut': 556,
-    'Eogonek': 667,
-    'dcroat': 556,
-    'threequarters': 834,
-    'Scedilla': 667,
-    'lcaron': 299,
-    'Kcommaaccent': 667,
-    'Lacute': 556,
-    'trademark': 1000,
-    'edotaccent': 556,
-    'Igrave': 278,
-    'Imacron': 278,
-    'Lcaron': 556,
-    'onehalf': 834,
-    'lessequal': 549,
-    'ocircumflex': 556,
-    'ntilde': 556,
-    'Uhungarumlaut': 722,
-    'Eacute': 667,
-    'emacron': 556,
-    'gbreve': 556,
-    'onequarter': 834,
-    'Scaron': 667,
-    'Scommaaccent': 667,
-    'Ohungarumlaut': 778,
-    'degree': 400,
-    'ograve': 556,
-    'Ccaron': 722,
-    'ugrave': 556,
-    'radical': 453,
-    'Dcaron': 722,
-    'rcommaaccent': 333,
-    'Ntilde': 722,
-    'otilde': 556,
-    'Rcommaaccent': 722,
-    'Lcommaaccent': 556,
-    'Atilde': 667,
-    'Aogonek': 667,
-    'Aring': 667,
-    'Otilde': 778,
-    'zdotaccent': 500,
-    'Ecaron': 667,
-    'Iogonek': 278,
-    'kcommaaccent': 500,
-    'minus': 584,
-    'Icircumflex': 278,
-    'ncaron': 556,
-    'tcommaaccent': 278,
-    'logicalnot': 584,
-    'odieresis': 556,
-    'udieresis': 556,
-    'notequal': 549,
-    'gcommaaccent': 556,
-    'eth': 556,
-    'zcaron': 500,
-    'ncommaaccent': 556,
-    'onesuperior': 333,
-    'imacron': 278,
-    'Euro': 556
-  },
-  'Symbol': {
-    'space': 250,
-    'exclam': 333,
-    'universal': 713,
-    'numbersign': 500,
-    'existential': 549,
-    'percent': 833,
-    'ampersand': 778,
-    'suchthat': 439,
-    'parenleft': 333,
-    'parenright': 333,
-    'asteriskmath': 500,
-    'plus': 549,
-    'comma': 250,
-    'minus': 549,
-    'period': 250,
-    'slash': 278,
-    'zero': 500,
-    'one': 500,
-    'two': 500,
-    'three': 500,
-    'four': 500,
-    'five': 500,
-    'six': 500,
-    'seven': 500,
-    'eight': 500,
-    'nine': 500,
-    'colon': 278,
-    'semicolon': 278,
-    'less': 549,
-    'equal': 549,
-    'greater': 549,
-    'question': 444,
-    'congruent': 549,
-    'Alpha': 722,
-    'Beta': 667,
-    'Chi': 722,
-    'Delta': 612,
-    'Epsilon': 611,
-    'Phi': 763,
-    'Gamma': 603,
-    'Eta': 722,
-    'Iota': 333,
-    'theta1': 631,
-    'Kappa': 722,
-    'Lambda': 686,
-    'Mu': 889,
-    'Nu': 722,
-    'Omicron': 722,
-    'Pi': 768,
-    'Theta': 741,
-    'Rho': 556,
-    'Sigma': 592,
-    'Tau': 611,
-    'Upsilon': 690,
-    'sigma1': 439,
-    'Omega': 768,
-    'Xi': 645,
-    'Psi': 795,
-    'Zeta': 611,
-    'bracketleft': 333,
-    'therefore': 863,
-    'bracketright': 333,
-    'perpendicular': 658,
-    'underscore': 500,
-    'radicalex': 500,
-    'alpha': 631,
-    'beta': 549,
-    'chi': 549,
-    'delta': 494,
-    'epsilon': 439,
-    'phi': 521,
-    'gamma': 411,
-    'eta': 603,
-    'iota': 329,
-    'phi1': 603,
-    'kappa': 549,
-    'lambda': 549,
-    'mu': 576,
-    'nu': 521,
-    'omicron': 549,
-    'pi': 549,
-    'theta': 521,
-    'rho': 549,
-    'sigma': 603,
-    'tau': 439,
-    'upsilon': 576,
-    'omega1': 713,
-    'omega': 686,
-    'xi': 493,
-    'psi': 686,
-    'zeta': 494,
-    'braceleft': 480,
-    'bar': 200,
-    'braceright': 480,
-    'similar': 549,
-    'Euro': 750,
-    'Upsilon1': 620,
-    'minute': 247,
-    'lessequal': 549,
-    'fraction': 167,
-    'infinity': 713,
-    'florin': 500,
-    'club': 753,
-    'diamond': 753,
-    'heart': 753,
-    'spade': 753,
-    'arrowboth': 1042,
-    'arrowleft': 987,
-    'arrowup': 603,
-    'arrowright': 987,
-    'arrowdown': 603,
-    'degree': 400,
-    'plusminus': 549,
-    'second': 411,
-    'greaterequal': 549,
-    'multiply': 549,
-    'proportional': 713,
-    'partialdiff': 494,
-    'bullet': 460,
-    'divide': 549,
-    'notequal': 549,
-    'equivalence': 549,
-    'approxequal': 549,
-    'ellipsis': 1000,
-    'arrowvertex': 603,
-    'arrowhorizex': 1000,
-    'carriagereturn': 658,
-    'aleph': 823,
-    'Ifraktur': 686,
-    'Rfraktur': 795,
-    'weierstrass': 987,
-    'circlemultiply': 768,
-    'circleplus': 768,
-    'emptyset': 823,
-    'intersection': 768,
-    'union': 768,
-    'propersuperset': 713,
-    'reflexsuperset': 713,
-    'notsubset': 713,
-    'propersubset': 713,
-    'reflexsubset': 713,
-    'element': 713,
-    'notelement': 713,
-    'angle': 768,
-    'gradient': 713,
-    'registerserif': 790,
-    'copyrightserif': 790,
-    'trademarkserif': 890,
-    'product': 823,
-    'radical': 549,
-    'dotmath': 250,
-    'logicalnot': 713,
-    'logicaland': 603,
-    'logicalor': 603,
-    'arrowdblboth': 1042,
-    'arrowdblleft': 987,
-    'arrowdblup': 603,
-    'arrowdblright': 987,
-    'arrowdbldown': 603,
-    'lozenge': 494,
-    'angleleft': 329,
-    'registersans': 790,
-    'copyrightsans': 790,
-    'trademarksans': 786,
-    'summation': 713,
-    'parenlefttp': 384,
-    'parenleftex': 384,
-    'parenleftbt': 384,
-    'bracketlefttp': 384,
-    'bracketleftex': 384,
-    'bracketleftbt': 384,
-    'bracelefttp': 494,
-    'braceleftmid': 494,
-    'braceleftbt': 494,
-    'braceex': 494,
-    'angleright': 329,
-    'integral': 274,
-    'integraltp': 686,
-    'integralex': 686,
-    'integralbt': 686,
-    'parenrighttp': 384,
-    'parenrightex': 384,
-    'parenrightbt': 384,
-    'bracketrighttp': 384,
-    'bracketrightex': 384,
-    'bracketrightbt': 384,
-    'bracerighttp': 494,
-    'bracerightmid': 494,
-    'bracerightbt': 494,
-    'apple': 790
-  },
-  'Times-Roman': {
-    'space': 250,
-    'exclam': 333,
-    'quotedbl': 408,
-    'numbersign': 500,
-    'dollar': 500,
-    'percent': 833,
-    'ampersand': 778,
-    'quoteright': 333,
-    'parenleft': 333,
-    'parenright': 333,
-    'asterisk': 500,
-    'plus': 564,
-    'comma': 250,
-    'hyphen': 333,
-    'period': 250,
-    'slash': 278,
-    'zero': 500,
-    'one': 500,
-    'two': 500,
-    'three': 500,
-    'four': 500,
-    'five': 500,
-    'six': 500,
-    'seven': 500,
-    'eight': 500,
-    'nine': 500,
-    'colon': 278,
-    'semicolon': 278,
-    'less': 564,
-    'equal': 564,
-    'greater': 564,
-    'question': 444,
-    'at': 921,
-    'A': 722,
-    'B': 667,
-    'C': 667,
-    'D': 722,
-    'E': 611,
-    'F': 556,
-    'G': 722,
-    'H': 722,
-    'I': 333,
-    'J': 389,
-    'K': 722,
-    'L': 611,
-    'M': 889,
-    'N': 722,
-    'O': 722,
-    'P': 556,
-    'Q': 722,
-    'R': 667,
-    'S': 556,
-    'T': 611,
-    'U': 722,
-    'V': 722,
-    'W': 944,
-    'X': 722,
-    'Y': 722,
-    'Z': 611,
-    'bracketleft': 333,
-    'backslash': 278,
-    'bracketright': 333,
-    'asciicircum': 469,
-    'underscore': 500,
-    'quoteleft': 333,
-    'a': 444,
-    'b': 500,
-    'c': 444,
-    'd': 500,
-    'e': 444,
-    'f': 333,
-    'g': 500,
-    'h': 500,
-    'i': 278,
-    'j': 278,
-    'k': 500,
-    'l': 278,
-    'm': 778,
-    'n': 500,
-    'o': 500,
-    'p': 500,
-    'q': 500,
-    'r': 333,
-    's': 389,
-    't': 278,
-    'u': 500,
-    'v': 500,
-    'w': 722,
-    'x': 500,
-    'y': 500,
-    'z': 444,
-    'braceleft': 480,
-    'bar': 200,
-    'braceright': 480,
-    'asciitilde': 541,
-    'exclamdown': 333,
-    'cent': 500,
-    'sterling': 500,
-    'fraction': 167,
-    'yen': 500,
-    'florin': 500,
-    'section': 500,
-    'currency': 500,
-    'quotesingle': 180,
-    'quotedblleft': 444,
-    'guillemotleft': 500,
-    'guilsinglleft': 333,
-    'guilsinglright': 333,
-    'fi': 556,
-    'fl': 556,
-    'endash': 500,
-    'dagger': 500,
-    'daggerdbl': 500,
-    'periodcentered': 250,
-    'paragraph': 453,
-    'bullet': 350,
-    'quotesinglbase': 333,
-    'quotedblbase': 444,
-    'quotedblright': 444,
-    'guillemotright': 500,
-    'ellipsis': 1000,
-    'perthousand': 1000,
-    'questiondown': 444,
-    'grave': 333,
-    'acute': 333,
-    'circumflex': 333,
-    'tilde': 333,
-    'macron': 333,
-    'breve': 333,
-    'dotaccent': 333,
-    'dieresis': 333,
-    'ring': 333,
-    'cedilla': 333,
-    'hungarumlaut': 333,
-    'ogonek': 333,
-    'caron': 333,
-    'emdash': 1000,
-    'AE': 889,
-    'ordfeminine': 276,
-    'Lslash': 611,
-    'Oslash': 722,
-    'OE': 889,
-    'ordmasculine': 310,
-    'ae': 667,
-    'dotlessi': 278,
-    'lslash': 278,
-    'oslash': 500,
-    'oe': 722,
-    'germandbls': 500,
-    'Idieresis': 333,
-    'eacute': 444,
-    'abreve': 444,
-    'uhungarumlaut': 500,
-    'ecaron': 444,
-    'Ydieresis': 722,
-    'divide': 564,
-    'Yacute': 722,
-    'Acircumflex': 722,
-    'aacute': 444,
-    'Ucircumflex': 722,
-    'yacute': 500,
-    'scommaaccent': 389,
-    'ecircumflex': 444,
-    'Uring': 722,
-    'Udieresis': 722,
-    'aogonek': 444,
-    'Uacute': 722,
-    'uogonek': 500,
-    'Edieresis': 611,
-    'Dcroat': 722,
-    'commaaccent': 250,
-    'copyright': 760,
-    'Emacron': 611,
-    'ccaron': 444,
-    'aring': 444,
-    'Ncommaaccent': 722,
-    'lacute': 278,
-    'agrave': 444,
-    'Tcommaaccent': 611,
-    'Cacute': 667,
-    'atilde': 444,
-    'Edotaccent': 611,
-    'scaron': 389,
-    'scedilla': 389,
-    'iacute': 278,
-    'lozenge': 471,
-    'Rcaron': 667,
-    'Gcommaaccent': 722,
-    'ucircumflex': 500,
-    'acircumflex': 444,
-    'Amacron': 722,
-    'rcaron': 333,
-    'ccedilla': 444,
-    'Zdotaccent': 611,
-    'Thorn': 556,
-    'Omacron': 722,
-    'Racute': 667,
-    'Sacute': 556,
-    'dcaron': 588,
-    'Umacron': 722,
-    'uring': 500,
-    'threesuperior': 300,
-    'Ograve': 722,
-    'Agrave': 722,
-    'Abreve': 722,
-    'multiply': 564,
-    'uacute': 500,
-    'Tcaron': 611,
-    'partialdiff': 476,
-    'ydieresis': 500,
-    'Nacute': 722,
-    'icircumflex': 278,
-    'Ecircumflex': 611,
-    'adieresis': 444,
-    'edieresis': 444,
-    'cacute': 444,
-    'nacute': 500,
-    'umacron': 500,
-    'Ncaron': 722,
-    'Iacute': 333,
-    'plusminus': 564,
-    'brokenbar': 200,
-    'registered': 760,
-    'Gbreve': 722,
-    'Idotaccent': 333,
-    'summation': 600,
-    'Egrave': 611,
-    'racute': 333,
-    'omacron': 500,
-    'Zacute': 611,
-    'Zcaron': 611,
-    'greaterequal': 549,
-    'Eth': 722,
-    'Ccedilla': 667,
-    'lcommaaccent': 278,
-    'tcaron': 326,
-    'eogonek': 444,
-    'Uogonek': 722,
-    'Aacute': 722,
-    'Adieresis': 722,
-    'egrave': 444,
-    'zacute': 444,
-    'iogonek': 278,
-    'Oacute': 722,
-    'oacute': 500,
-    'amacron': 444,
-    'sacute': 389,
-    'idieresis': 278,
-    'Ocircumflex': 722,
-    'Ugrave': 722,
-    'Delta': 612,
-    'thorn': 500,
-    'twosuperior': 300,
-    'Odieresis': 722,
-    'mu': 500,
-    'igrave': 278,
-    'ohungarumlaut': 500,
-    'Eogonek': 611,
-    'dcroat': 500,
-    'threequarters': 750,
-    'Scedilla': 556,
-    'lcaron': 344,
-    'Kcommaaccent': 722,
-    'Lacute': 611,
-    'trademark': 980,
-    'edotaccent': 444,
-    'Igrave': 333,
-    'Imacron': 333,
-    'Lcaron': 611,
-    'onehalf': 750,
-    'lessequal': 549,
-    'ocircumflex': 500,
-    'ntilde': 500,
-    'Uhungarumlaut': 722,
-    'Eacute': 611,
-    'emacron': 444,
-    'gbreve': 500,
-    'onequarter': 750,
-    'Scaron': 556,
-    'Scommaaccent': 556,
-    'Ohungarumlaut': 722,
-    'degree': 400,
-    'ograve': 500,
-    'Ccaron': 667,
-    'ugrave': 500,
-    'radical': 453,
-    'Dcaron': 722,
-    'rcommaaccent': 333,
-    'Ntilde': 722,
-    'otilde': 500,
-    'Rcommaaccent': 667,
-    'Lcommaaccent': 611,
-    'Atilde': 722,
-    'Aogonek': 722,
-    'Aring': 722,
-    'Otilde': 722,
-    'zdotaccent': 444,
-    'Ecaron': 611,
-    'Iogonek': 333,
-    'kcommaaccent': 500,
-    'minus': 564,
-    'Icircumflex': 333,
-    'ncaron': 500,
-    'tcommaaccent': 278,
-    'logicalnot': 564,
-    'odieresis': 500,
-    'udieresis': 500,
-    'notequal': 549,
-    'gcommaaccent': 500,
-    'eth': 500,
-    'zcaron': 444,
-    'ncommaaccent': 500,
-    'onesuperior': 300,
-    'imacron': 278,
-    'Euro': 500
-  },
-  'Times-Bold': {
-    'space': 250,
-    'exclam': 333,
-    'quotedbl': 555,
-    'numbersign': 500,
-    'dollar': 500,
-    'percent': 1000,
-    'ampersand': 833,
-    'quoteright': 333,
-    'parenleft': 333,
-    'parenright': 333,
-    'asterisk': 500,
-    'plus': 570,
-    'comma': 250,
-    'hyphen': 333,
-    'period': 250,
-    'slash': 278,
-    'zero': 500,
-    'one': 500,
-    'two': 500,
-    'three': 500,
-    'four': 500,
-    'five': 500,
-    'six': 500,
-    'seven': 500,
-    'eight': 500,
-    'nine': 500,
-    'colon': 333,
-    'semicolon': 333,
-    'less': 570,
-    'equal': 570,
-    'greater': 570,
-    'question': 500,
-    'at': 930,
-    'A': 722,
-    'B': 667,
-    'C': 722,
-    'D': 722,
-    'E': 667,
-    'F': 611,
-    'G': 778,
-    'H': 778,
-    'I': 389,
-    'J': 500,
-    'K': 778,
-    'L': 667,
-    'M': 944,
-    'N': 722,
-    'O': 778,
-    'P': 611,
-    'Q': 778,
-    'R': 722,
-    'S': 556,
-    'T': 667,
-    'U': 722,
-    'V': 722,
-    'W': 1000,
-    'X': 722,
-    'Y': 722,
-    'Z': 667,
-    'bracketleft': 333,
-    'backslash': 278,
-    'bracketright': 333,
-    'asciicircum': 581,
-    'underscore': 500,
-    'quoteleft': 333,
-    'a': 500,
-    'b': 556,
-    'c': 444,
-    'd': 556,
-    'e': 444,
-    'f': 333,
-    'g': 500,
-    'h': 556,
-    'i': 278,
-    'j': 333,
-    'k': 556,
-    'l': 278,
-    'm': 833,
-    'n': 556,
-    'o': 500,
-    'p': 556,
-    'q': 556,
-    'r': 444,
-    's': 389,
-    't': 333,
-    'u': 556,
-    'v': 500,
-    'w': 722,
-    'x': 500,
-    'y': 500,
-    'z': 444,
-    'braceleft': 394,
-    'bar': 220,
-    'braceright': 394,
-    'asciitilde': 520,
-    'exclamdown': 333,
-    'cent': 500,
-    'sterling': 500,
-    'fraction': 167,
-    'yen': 500,
-    'florin': 500,
-    'section': 500,
-    'currency': 500,
-    'quotesingle': 278,
-    'quotedblleft': 500,
-    'guillemotleft': 500,
-    'guilsinglleft': 333,
-    'guilsinglright': 333,
-    'fi': 556,
-    'fl': 556,
-    'endash': 500,
-    'dagger': 500,
-    'daggerdbl': 500,
-    'periodcentered': 250,
-    'paragraph': 540,
-    'bullet': 350,
-    'quotesinglbase': 333,
-    'quotedblbase': 500,
-    'quotedblright': 500,
-    'guillemotright': 500,
-    'ellipsis': 1000,
-    'perthousand': 1000,
-    'questiondown': 500,
-    'grave': 333,
-    'acute': 333,
-    'circumflex': 333,
-    'tilde': 333,
-    'macron': 333,
-    'breve': 333,
-    'dotaccent': 333,
-    'dieresis': 333,
-    'ring': 333,
-    'cedilla': 333,
-    'hungarumlaut': 333,
-    'ogonek': 333,
-    'caron': 333,
-    'emdash': 1000,
-    'AE': 1000,
-    'ordfeminine': 300,
-    'Lslash': 667,
-    'Oslash': 778,
-    'OE': 1000,
-    'ordmasculine': 330,
-    'ae': 722,
-    'dotlessi': 278,
-    'lslash': 278,
-    'oslash': 500,
-    'oe': 722,
-    'germandbls': 556,
-    'Idieresis': 389,
-    'eacute': 444,
-    'abreve': 500,
-    'uhungarumlaut': 556,
-    'ecaron': 444,
-    'Ydieresis': 722,
-    'divide': 570,
-    'Yacute': 722,
-    'Acircumflex': 722,
-    'aacute': 500,
-    'Ucircumflex': 722,
-    'yacute': 500,
-    'scommaaccent': 389,
-    'ecircumflex': 444,
-    'Uring': 722,
-    'Udieresis': 722,
-    'aogonek': 500,
-    'Uacute': 722,
-    'uogonek': 556,
-    'Edieresis': 667,
-    'Dcroat': 722,
-    'commaaccent': 250,
-    'copyright': 747,
-    'Emacron': 667,
-    'ccaron': 444,
-    'aring': 500,
-    'Ncommaaccent': 722,
-    'lacute': 278,
-    'agrave': 500,
-    'Tcommaaccent': 667,
-    'Cacute': 722,
-    'atilde': 500,
-    'Edotaccent': 667,
-    'scaron': 389,
-    'scedilla': 389,
-    'iacute': 278,
-    'lozenge': 494,
-    'Rcaron': 722,
-    'Gcommaaccent': 778,
-    'ucircumflex': 556,
-    'acircumflex': 500,
-    'Amacron': 722,
-    'rcaron': 444,
-    'ccedilla': 444,
-    'Zdotaccent': 667,
-    'Thorn': 611,
-    'Omacron': 778,
-    'Racute': 722,
-    'Sacute': 556,
-    'dcaron': 672,
-    'Umacron': 722,
-    'uring': 556,
-    'threesuperior': 300,
-    'Ograve': 778,
-    'Agrave': 722,
-    'Abreve': 722,
-    'multiply': 570,
-    'uacute': 556,
-    'Tcaron': 667,
-    'partialdiff': 494,
-    'ydieresis': 500,
-    'Nacute': 722,
-    'icircumflex': 278,
-    'Ecircumflex': 667,
-    'adieresis': 500,
-    'edieresis': 444,
-    'cacute': 444,
-    'nacute': 556,
-    'umacron': 556,
-    'Ncaron': 722,
-    'Iacute': 389,
-    'plusminus': 570,
-    'brokenbar': 220,
-    'registered': 747,
-    'Gbreve': 778,
-    'Idotaccent': 389,
-    'summation': 600,
-    'Egrave': 667,
-    'racute': 444,
-    'omacron': 500,
-    'Zacute': 667,
-    'Zcaron': 667,
-    'greaterequal': 549,
-    'Eth': 722,
-    'Ccedilla': 722,
-    'lcommaaccent': 278,
-    'tcaron': 416,
-    'eogonek': 444,
-    'Uogonek': 722,
-    'Aacute': 722,
-    'Adieresis': 722,
-    'egrave': 444,
-    'zacute': 444,
-    'iogonek': 278,
-    'Oacute': 778,
-    'oacute': 500,
-    'amacron': 500,
-    'sacute': 389,
-    'idieresis': 278,
-    'Ocircumflex': 778,
-    'Ugrave': 722,
-    'Delta': 612,
-    'thorn': 556,
-    'twosuperior': 300,
-    'Odieresis': 778,
-    'mu': 556,
-    'igrave': 278,
-    'ohungarumlaut': 500,
-    'Eogonek': 667,
-    'dcroat': 556,
-    'threequarters': 750,
-    'Scedilla': 556,
-    'lcaron': 394,
-    'Kcommaaccent': 778,
-    'Lacute': 667,
-    'trademark': 1000,
-    'edotaccent': 444,
-    'Igrave': 389,
-    'Imacron': 389,
-    'Lcaron': 667,
-    'onehalf': 750,
-    'lessequal': 549,
-    'ocircumflex': 500,
-    'ntilde': 556,
-    'Uhungarumlaut': 722,
-    'Eacute': 667,
-    'emacron': 444,
-    'gbreve': 500,
-    'onequarter': 750,
-    'Scaron': 556,
-    'Scommaaccent': 556,
-    'Ohungarumlaut': 778,
-    'degree': 400,
-    'ograve': 500,
-    'Ccaron': 722,
-    'ugrave': 556,
-    'radical': 549,
-    'Dcaron': 722,
-    'rcommaaccent': 444,
-    'Ntilde': 722,
-    'otilde': 500,
-    'Rcommaaccent': 722,
-    'Lcommaaccent': 667,
-    'Atilde': 722,
-    'Aogonek': 722,
-    'Aring': 722,
-    'Otilde': 778,
-    'zdotaccent': 444,
-    'Ecaron': 667,
-    'Iogonek': 389,
-    'kcommaaccent': 556,
-    'minus': 570,
-    'Icircumflex': 389,
-    'ncaron': 556,
-    'tcommaaccent': 333,
-    'logicalnot': 570,
-    'odieresis': 500,
-    'udieresis': 556,
-    'notequal': 549,
-    'gcommaaccent': 500,
-    'eth': 500,
-    'zcaron': 444,
-    'ncommaaccent': 556,
-    'onesuperior': 300,
-    'imacron': 278,
-    'Euro': 500
-  },
-  'Times-BoldItalic': {
-    'space': 250,
-    'exclam': 389,
-    'quotedbl': 555,
-    'numbersign': 500,
-    'dollar': 500,
-    'percent': 833,
-    'ampersand': 778,
-    'quoteright': 333,
-    'parenleft': 333,
-    'parenright': 333,
-    'asterisk': 500,
-    'plus': 570,
-    'comma': 250,
-    'hyphen': 333,
-    'period': 250,
-    'slash': 278,
-    'zero': 500,
-    'one': 500,
-    'two': 500,
-    'three': 500,
-    'four': 500,
-    'five': 500,
-    'six': 500,
-    'seven': 500,
-    'eight': 500,
-    'nine': 500,
-    'colon': 333,
-    'semicolon': 333,
-    'less': 570,
-    'equal': 570,
-    'greater': 570,
-    'question': 500,
-    'at': 832,
-    'A': 667,
-    'B': 667,
-    'C': 667,
-    'D': 722,
-    'E': 667,
-    'F': 667,
-    'G': 722,
-    'H': 778,
-    'I': 389,
-    'J': 500,
-    'K': 667,
-    'L': 611,
-    'M': 889,
-    'N': 722,
-    'O': 722,
-    'P': 611,
-    'Q': 722,
-    'R': 667,
-    'S': 556,
-    'T': 611,
-    'U': 722,
-    'V': 667,
-    'W': 889,
-    'X': 667,
-    'Y': 611,
-    'Z': 611,
-    'bracketleft': 333,
-    'backslash': 278,
-    'bracketright': 333,
-    'asciicircum': 570,
-    'underscore': 500,
-    'quoteleft': 333,
-    'a': 500,
-    'b': 500,
-    'c': 444,
-    'd': 500,
-    'e': 444,
-    'f': 333,
-    'g': 500,
-    'h': 556,
-    'i': 278,
-    'j': 278,
-    'k': 500,
-    'l': 278,
-    'm': 778,
-    'n': 556,
-    'o': 500,
-    'p': 500,
-    'q': 500,
-    'r': 389,
-    's': 389,
-    't': 278,
-    'u': 556,
-    'v': 444,
-    'w': 667,
-    'x': 500,
-    'y': 444,
-    'z': 389,
-    'braceleft': 348,
-    'bar': 220,
-    'braceright': 348,
-    'asciitilde': 570,
-    'exclamdown': 389,
-    'cent': 500,
-    'sterling': 500,
-    'fraction': 167,
-    'yen': 500,
-    'florin': 500,
-    'section': 500,
-    'currency': 500,
-    'quotesingle': 278,
-    'quotedblleft': 500,
-    'guillemotleft': 500,
-    'guilsinglleft': 333,
-    'guilsinglright': 333,
-    'fi': 556,
-    'fl': 556,
-    'endash': 500,
-    'dagger': 500,
-    'daggerdbl': 500,
-    'periodcentered': 250,
-    'paragraph': 500,
-    'bullet': 350,
-    'quotesinglbase': 333,
-    'quotedblbase': 500,
-    'quotedblright': 500,
-    'guillemotright': 500,
-    'ellipsis': 1000,
-    'perthousand': 1000,
-    'questiondown': 500,
-    'grave': 333,
-    'acute': 333,
-    'circumflex': 333,
-    'tilde': 333,
-    'macron': 333,
-    'breve': 333,
-    'dotaccent': 333,
-    'dieresis': 333,
-    'ring': 333,
-    'cedilla': 333,
-    'hungarumlaut': 333,
-    'ogonek': 333,
-    'caron': 333,
-    'emdash': 1000,
-    'AE': 944,
-    'ordfeminine': 266,
-    'Lslash': 611,
-    'Oslash': 722,
-    'OE': 944,
-    'ordmasculine': 300,
-    'ae': 722,
-    'dotlessi': 278,
-    'lslash': 278,
-    'oslash': 500,
-    'oe': 722,
-    'germandbls': 500,
-    'Idieresis': 389,
-    'eacute': 444,
-    'abreve': 500,
-    'uhungarumlaut': 556,
-    'ecaron': 444,
-    'Ydieresis': 611,
-    'divide': 570,
-    'Yacute': 611,
-    'Acircumflex': 667,
-    'aacute': 500,
-    'Ucircumflex': 722,
-    'yacute': 444,
-    'scommaaccent': 389,
-    'ecircumflex': 444,
-    'Uring': 722,
-    'Udieresis': 722,
-    'aogonek': 500,
-    'Uacute': 722,
-    'uogonek': 556,
-    'Edieresis': 667,
-    'Dcroat': 722,
-    'commaaccent': 250,
-    'copyright': 747,
-    'Emacron': 667,
-    'ccaron': 444,
-    'aring': 500,
-    'Ncommaaccent': 722,
-    'lacute': 278,
-    'agrave': 500,
-    'Tcommaaccent': 611,
-    'Cacute': 667,
-    'atilde': 500,
-    'Edotaccent': 667,
-    'scaron': 389,
-    'scedilla': 389,
-    'iacute': 278,
-    'lozenge': 494,
-    'Rcaron': 667,
-    'Gcommaaccent': 722,
-    'ucircumflex': 556,
-    'acircumflex': 500,
-    'Amacron': 667,
-    'rcaron': 389,
-    'ccedilla': 444,
-    'Zdotaccent': 611,
-    'Thorn': 611,
-    'Omacron': 722,
-    'Racute': 667,
-    'Sacute': 556,
-    'dcaron': 608,
-    'Umacron': 722,
-    'uring': 556,
-    'threesuperior': 300,
-    'Ograve': 722,
-    'Agrave': 667,
-    'Abreve': 667,
-    'multiply': 570,
-    'uacute': 556,
-    'Tcaron': 611,
-    'partialdiff': 494,
-    'ydieresis': 444,
-    'Nacute': 722,
-    'icircumflex': 278,
-    'Ecircumflex': 667,
-    'adieresis': 500,
-    'edieresis': 444,
-    'cacute': 444,
-    'nacute': 556,
-    'umacron': 556,
-    'Ncaron': 722,
-    'Iacute': 389,
-    'plusminus': 570,
-    'brokenbar': 220,
-    'registered': 747,
-    'Gbreve': 722,
-    'Idotaccent': 389,
-    'summation': 600,
-    'Egrave': 667,
-    'racute': 389,
-    'omacron': 500,
-    'Zacute': 611,
-    'Zcaron': 611,
-    'greaterequal': 549,
-    'Eth': 722,
-    'Ccedilla': 667,
-    'lcommaaccent': 278,
-    'tcaron': 366,
-    'eogonek': 444,
-    'Uogonek': 722,
-    'Aacute': 667,
-    'Adieresis': 667,
-    'egrave': 444,
-    'zacute': 389,
-    'iogonek': 278,
-    'Oacute': 722,
-    'oacute': 500,
-    'amacron': 500,
-    'sacute': 389,
-    'idieresis': 278,
-    'Ocircumflex': 722,
-    'Ugrave': 722,
-    'Delta': 612,
-    'thorn': 500,
-    'twosuperior': 300,
-    'Odieresis': 722,
-    'mu': 576,
-    'igrave': 278,
-    'ohungarumlaut': 500,
-    'Eogonek': 667,
-    'dcroat': 500,
-    'threequarters': 750,
-    'Scedilla': 556,
-    'lcaron': 382,
-    'Kcommaaccent': 667,
-    'Lacute': 611,
-    'trademark': 1000,
-    'edotaccent': 444,
-    'Igrave': 389,
-    'Imacron': 389,
-    'Lcaron': 611,
-    'onehalf': 750,
-    'lessequal': 549,
-    'ocircumflex': 500,
-    'ntilde': 556,
-    'Uhungarumlaut': 722,
-    'Eacute': 667,
-    'emacron': 444,
-    'gbreve': 500,
-    'onequarter': 750,
-    'Scaron': 556,
-    'Scommaaccent': 556,
-    'Ohungarumlaut': 722,
-    'degree': 400,
-    'ograve': 500,
-    'Ccaron': 667,
-    'ugrave': 556,
-    'radical': 549,
-    'Dcaron': 722,
-    'rcommaaccent': 389,
-    'Ntilde': 722,
-    'otilde': 500,
-    'Rcommaaccent': 667,
-    'Lcommaaccent': 611,
-    'Atilde': 667,
-    'Aogonek': 667,
-    'Aring': 667,
-    'Otilde': 722,
-    'zdotaccent': 389,
-    'Ecaron': 667,
-    'Iogonek': 389,
-    'kcommaaccent': 500,
-    'minus': 606,
-    'Icircumflex': 389,
-    'ncaron': 556,
-    'tcommaaccent': 278,
-    'logicalnot': 606,
-    'odieresis': 500,
-    'udieresis': 556,
-    'notequal': 549,
-    'gcommaaccent': 500,
-    'eth': 500,
-    'zcaron': 389,
-    'ncommaaccent': 556,
-    'onesuperior': 300,
-    'imacron': 278,
-    'Euro': 500
-  },
-  'Times-Italic': {
-    'space': 250,
-    'exclam': 333,
-    'quotedbl': 420,
-    'numbersign': 500,
-    'dollar': 500,
-    'percent': 833,
-    'ampersand': 778,
-    'quoteright': 333,
-    'parenleft': 333,
-    'parenright': 333,
-    'asterisk': 500,
-    'plus': 675,
-    'comma': 250,
-    'hyphen': 333,
-    'period': 250,
-    'slash': 278,
-    'zero': 500,
-    'one': 500,
-    'two': 500,
-    'three': 500,
-    'four': 500,
-    'five': 500,
-    'six': 500,
-    'seven': 500,
-    'eight': 500,
-    'nine': 500,
-    'colon': 333,
-    'semicolon': 333,
-    'less': 675,
-    'equal': 675,
-    'greater': 675,
-    'question': 500,
-    'at': 920,
-    'A': 611,
-    'B': 611,
-    'C': 667,
-    'D': 722,
-    'E': 611,
-    'F': 611,
-    'G': 722,
-    'H': 722,
-    'I': 333,
-    'J': 444,
-    'K': 667,
-    'L': 556,
-    'M': 833,
-    'N': 667,
-    'O': 722,
-    'P': 611,
-    'Q': 722,
-    'R': 611,
-    'S': 500,
-    'T': 556,
-    'U': 722,
-    'V': 611,
-    'W': 833,
-    'X': 611,
-    'Y': 556,
-    'Z': 556,
-    'bracketleft': 389,
-    'backslash': 278,
-    'bracketright': 389,
-    'asciicircum': 422,
-    'underscore': 500,
-    'quoteleft': 333,
-    'a': 500,
-    'b': 500,
-    'c': 444,
-    'd': 500,
-    'e': 444,
-    'f': 278,
-    'g': 500,
-    'h': 500,
-    'i': 278,
-    'j': 278,
-    'k': 444,
-    'l': 278,
-    'm': 722,
-    'n': 500,
-    'o': 500,
-    'p': 500,
-    'q': 500,
-    'r': 389,
-    's': 389,
-    't': 278,
-    'u': 500,
-    'v': 444,
-    'w': 667,
-    'x': 444,
-    'y': 444,
-    'z': 389,
-    'braceleft': 400,
-    'bar': 275,
-    'braceright': 400,
-    'asciitilde': 541,
-    'exclamdown': 389,
-    'cent': 500,
-    'sterling': 500,
-    'fraction': 167,
-    'yen': 500,
-    'florin': 500,
-    'section': 500,
-    'currency': 500,
-    'quotesingle': 214,
-    'quotedblleft': 556,
-    'guillemotleft': 500,
-    'guilsinglleft': 333,
-    'guilsinglright': 333,
-    'fi': 500,
-    'fl': 500,
-    'endash': 500,
-    'dagger': 500,
-    'daggerdbl': 500,
-    'periodcentered': 250,
-    'paragraph': 523,
-    'bullet': 350,
-    'quotesinglbase': 333,
-    'quotedblbase': 556,
-    'quotedblright': 556,
-    'guillemotright': 500,
-    'ellipsis': 889,
-    'perthousand': 1000,
-    'questiondown': 500,
-    'grave': 333,
-    'acute': 333,
-    'circumflex': 333,
-    'tilde': 333,
-    'macron': 333,
-    'breve': 333,
-    'dotaccent': 333,
-    'dieresis': 333,
-    'ring': 333,
-    'cedilla': 333,
-    'hungarumlaut': 333,
-    'ogonek': 333,
-    'caron': 333,
-    'emdash': 889,
-    'AE': 889,
-    'ordfeminine': 276,
-    'Lslash': 556,
-    'Oslash': 722,
-    'OE': 944,
-    'ordmasculine': 310,
-    'ae': 667,
-    'dotlessi': 278,
-    'lslash': 278,
-    'oslash': 500,
-    'oe': 667,
-    'germandbls': 500,
-    'Idieresis': 333,
-    'eacute': 444,
-    'abreve': 500,
-    'uhungarumlaut': 500,
-    'ecaron': 444,
-    'Ydieresis': 556,
-    'divide': 675,
-    'Yacute': 556,
-    'Acircumflex': 611,
-    'aacute': 500,
-    'Ucircumflex': 722,
-    'yacute': 444,
-    'scommaaccent': 389,
-    'ecircumflex': 444,
-    'Uring': 722,
-    'Udieresis': 722,
-    'aogonek': 500,
-    'Uacute': 722,
-    'uogonek': 500,
-    'Edieresis': 611,
-    'Dcroat': 722,
-    'commaaccent': 250,
-    'copyright': 760,
-    'Emacron': 611,
-    'ccaron': 444,
-    'aring': 500,
-    'Ncommaaccent': 667,
-    'lacute': 278,
-    'agrave': 500,
-    'Tcommaaccent': 556,
-    'Cacute': 667,
-    'atilde': 500,
-    'Edotaccent': 611,
-    'scaron': 389,
-    'scedilla': 389,
-    'iacute': 278,
-    'lozenge': 471,
-    'Rcaron': 611,
-    'Gcommaaccent': 722,
-    'ucircumflex': 500,
-    'acircumflex': 500,
-    'Amacron': 611,
-    'rcaron': 389,
-    'ccedilla': 444,
-    'Zdotaccent': 556,
-    'Thorn': 611,
-    'Omacron': 722,
-    'Racute': 611,
-    'Sacute': 500,
-    'dcaron': 544,
-    'Umacron': 722,
-    'uring': 500,
-    'threesuperior': 300,
-    'Ograve': 722,
-    'Agrave': 611,
-    'Abreve': 611,
-    'multiply': 675,
-    'uacute': 500,
-    'Tcaron': 556,
-    'partialdiff': 476,
-    'ydieresis': 444,
-    'Nacute': 667,
-    'icircumflex': 278,
-    'Ecircumflex': 611,
-    'adieresis': 500,
-    'edieresis': 444,
-    'cacute': 444,
-    'nacute': 500,
-    'umacron': 500,
-    'Ncaron': 667,
-    'Iacute': 333,
-    'plusminus': 675,
-    'brokenbar': 275,
-    'registered': 760,
-    'Gbreve': 722,
-    'Idotaccent': 333,
-    'summation': 600,
-    'Egrave': 611,
-    'racute': 389,
-    'omacron': 500,
-    'Zacute': 556,
-    'Zcaron': 556,
-    'greaterequal': 549,
-    'Eth': 722,
-    'Ccedilla': 667,
-    'lcommaaccent': 278,
-    'tcaron': 300,
-    'eogonek': 444,
-    'Uogonek': 722,
-    'Aacute': 611,
-    'Adieresis': 611,
-    'egrave': 444,
-    'zacute': 389,
-    'iogonek': 278,
-    'Oacute': 722,
-    'oacute': 500,
-    'amacron': 500,
-    'sacute': 389,
-    'idieresis': 278,
-    'Ocircumflex': 722,
-    'Ugrave': 722,
-    'Delta': 612,
-    'thorn': 500,
-    'twosuperior': 300,
-    'Odieresis': 722,
-    'mu': 500,
-    'igrave': 278,
-    'ohungarumlaut': 500,
-    'Eogonek': 611,
-    'dcroat': 500,
-    'threequarters': 750,
-    'Scedilla': 500,
-    'lcaron': 300,
-    'Kcommaaccent': 667,
-    'Lacute': 556,
-    'trademark': 980,
-    'edotaccent': 444,
-    'Igrave': 333,
-    'Imacron': 333,
-    'Lcaron': 611,
-    'onehalf': 750,
-    'lessequal': 549,
-    'ocircumflex': 500,
-    'ntilde': 500,
-    'Uhungarumlaut': 722,
-    'Eacute': 611,
-    'emacron': 444,
-    'gbreve': 500,
-    'onequarter': 750,
-    'Scaron': 500,
-    'Scommaaccent': 500,
-    'Ohungarumlaut': 722,
-    'degree': 400,
-    'ograve': 500,
-    'Ccaron': 667,
-    'ugrave': 500,
-    'radical': 453,
-    'Dcaron': 722,
-    'rcommaaccent': 389,
-    'Ntilde': 667,
-    'otilde': 500,
-    'Rcommaaccent': 611,
-    'Lcommaaccent': 556,
-    'Atilde': 611,
-    'Aogonek': 611,
-    'Aring': 611,
-    'Otilde': 722,
-    'zdotaccent': 389,
-    'Ecaron': 611,
-    'Iogonek': 333,
-    'kcommaaccent': 444,
-    'minus': 675,
-    'Icircumflex': 333,
-    'ncaron': 500,
-    'tcommaaccent': 278,
-    'logicalnot': 675,
-    'odieresis': 500,
-    'udieresis': 500,
-    'notequal': 549,
-    'gcommaaccent': 500,
-    'eth': 500,
-    'zcaron': 389,
-    'ncommaaccent': 500,
-    'onesuperior': 300,
-    'imacron': 278,
-    'Euro': 500
-  },
-  'ZapfDingbats': {
-    'space': 278,
-    'a1': 974,
-    'a2': 961,
-    'a202': 974,
-    'a3': 980,
-    'a4': 719,
-    'a5': 789,
-    'a119': 790,
-    'a118': 791,
-    'a117': 690,
-    'a11': 960,
-    'a12': 939,
-    'a13': 549,
-    'a14': 855,
-    'a15': 911,
-    'a16': 933,
-    'a105': 911,
-    'a17': 945,
-    'a18': 974,
-    'a19': 755,
-    'a20': 846,
-    'a21': 762,
-    'a22': 761,
-    'a23': 571,
-    'a24': 677,
-    'a25': 763,
-    'a26': 760,
-    'a27': 759,
-    'a28': 754,
-    'a6': 494,
-    'a7': 552,
-    'a8': 537,
-    'a9': 577,
-    'a10': 692,
-    'a29': 786,
-    'a30': 788,
-    'a31': 788,
-    'a32': 790,
-    'a33': 793,
-    'a34': 794,
-    'a35': 816,
-    'a36': 823,
-    'a37': 789,
-    'a38': 841,
-    'a39': 823,
-    'a40': 833,
-    'a41': 816,
-    'a42': 831,
-    'a43': 923,
-    'a44': 744,
-    'a45': 723,
-    'a46': 749,
-    'a47': 790,
-    'a48': 792,
-    'a49': 695,
-    'a50': 776,
-    'a51': 768,
-    'a52': 792,
-    'a53': 759,
-    'a54': 707,
-    'a55': 708,
-    'a56': 682,
-    'a57': 701,
-    'a58': 826,
-    'a59': 815,
-    'a60': 789,
-    'a61': 789,
-    'a62': 707,
-    'a63': 687,
-    'a64': 696,
-    'a65': 689,
-    'a66': 786,
-    'a67': 787,
-    'a68': 713,
-    'a69': 791,
-    'a70': 785,
-    'a71': 791,
-    'a72': 873,
-    'a73': 761,
-    'a74': 762,
-    'a203': 762,
-    'a75': 759,
-    'a204': 759,
-    'a76': 892,
-    'a77': 892,
-    'a78': 788,
-    'a79': 784,
-    'a81': 438,
-    'a82': 138,
-    'a83': 277,
-    'a84': 415,
-    'a97': 392,
-    'a98': 392,
-    'a99': 668,
-    'a100': 668,
-    'a89': 390,
-    'a90': 390,
-    'a93': 317,
-    'a94': 317,
-    'a91': 276,
-    'a92': 276,
-    'a205': 509,
-    'a85': 509,
-    'a206': 410,
-    'a86': 410,
-    'a87': 234,
-    'a88': 234,
-    'a95': 334,
-    'a96': 334,
-    'a101': 732,
-    'a102': 544,
-    'a103': 544,
-    'a104': 910,
-    'a106': 667,
-    'a107': 760,
-    'a108': 760,
-    'a112': 776,
-    'a111': 595,
-    'a110': 694,
-    'a109': 626,
-    'a120': 788,
-    'a121': 788,
-    'a122': 788,
-    'a123': 788,
-    'a124': 788,
-    'a125': 788,
-    'a126': 788,
-    'a127': 788,
-    'a128': 788,
-    'a129': 788,
-    'a130': 788,
-    'a131': 788,
-    'a132': 788,
-    'a133': 788,
-    'a134': 788,
-    'a135': 788,
-    'a136': 788,
-    'a137': 788,
-    'a138': 788,
-    'a139': 788,
-    'a140': 788,
-    'a141': 788,
-    'a142': 788,
-    'a143': 788,
-    'a144': 788,
-    'a145': 788,
-    'a146': 788,
-    'a147': 788,
-    'a148': 788,
-    'a149': 788,
-    'a150': 788,
-    'a151': 788,
-    'a152': 788,
-    'a153': 788,
-    'a154': 788,
-    'a155': 788,
-    'a156': 788,
-    'a157': 788,
-    'a158': 788,
-    'a159': 788,
-    'a160': 894,
-    'a161': 838,
-    'a163': 1016,
-    'a164': 458,
-    'a196': 748,
-    'a165': 924,
-    'a192': 748,
-    'a166': 918,
-    'a167': 927,
-    'a168': 928,
-    'a169': 928,
-    'a170': 834,
-    'a171': 873,
-    'a172': 828,
-    'a173': 924,
-    'a162': 924,
-    'a174': 917,
-    'a175': 930,
-    'a176': 931,
-    'a177': 463,
-    'a178': 883,
-    'a179': 836,
-    'a193': 836,
-    'a180': 867,
-    'a199': 867,
-    'a181': 696,
-    'a200': 696,
-    'a182': 874,
-    'a201': 874,
-    'a183': 760,
-    'a184': 946,
-    'a197': 771,
-    'a185': 865,
-    'a194': 771,
-    'a198': 888,
-    'a186': 967,
-    'a195': 888,
-    'a187': 831,
-    'a188': 873,
-    'a189': 927,
-    'a190': 970,
-    'a191': 918
-  }
-};
-
-
-/* -*- 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 EOF = {};
-
-function isEOF(v) {
-  return v == EOF;
-}
-
-var Parser = (function ParserClosure() {
-  function Parser(lexer, allowStreams, xref) {
-    this.lexer = lexer;
-    this.allowStreams = allowStreams;
-    this.xref = xref;
-    this.inlineImg = 0;
-    this.refill();
-  }
-
-  Parser.prototype = {
-    refill: function Parser_refill() {
-      this.buf1 = this.lexer.getObj();
-      this.buf2 = this.lexer.getObj();
-    },
-    shift: function Parser_shift() {
-      if (isCmd(this.buf2, 'ID')) {
-        this.buf1 = this.buf2;
-        this.buf2 = null;
-        // skip byte after ID
-        this.lexer.skip();
-      } else {
-        this.buf1 = this.buf2;
-        this.buf2 = this.lexer.getObj();
-      }
-    },
-    getObj: function Parser_getObj(cipherTransform) {
-      if (isCmd(this.buf1, 'BI')) { // inline image
-        this.shift();
-        return this.makeInlineImage(cipherTransform);
-      }
-      if (isCmd(this.buf1, '[')) { // array
-        this.shift();
-        var array = [];
-        while (!isCmd(this.buf1, ']') && !isEOF(this.buf1))
-          array.push(this.getObj());
-        if (isEOF(this.buf1))
-          error('End of file inside array');
-        this.shift();
-        return array;
-      }
-      if (isCmd(this.buf1, '<<')) { // dictionary or stream
-        this.shift();
-        var dict = new Dict(this.xref);
-        while (!isCmd(this.buf1, '>>') && !isEOF(this.buf1)) {
-          if (!isName(this.buf1))
-            error('Dictionary key must be a name object');
-
-          var key = this.buf1.name;
-          this.shift();
-          if (isEOF(this.buf1))
-            break;
-          dict.set(key, this.getObj(cipherTransform));
-        }
-        if (isEOF(this.buf1))
-          error('End of file inside dictionary');
-
-        // stream objects are not allowed inside content streams or
-        // object streams
-        if (isCmd(this.buf2, 'stream')) {
-          return this.allowStreams ?
-            this.makeStream(dict, cipherTransform) : dict;
-        }
-        this.shift();
-        return dict;
-      }
-      if (isInt(this.buf1)) { // indirect reference or integer
-        var num = this.buf1;
-        this.shift();
-        if (isInt(this.buf1) && isCmd(this.buf2, 'R')) {
-          var ref = new Ref(num, this.buf1);
-          this.shift();
-          this.shift();
-          return ref;
-        }
-        return num;
-      }
-      if (isString(this.buf1)) { // string
-        var str = this.buf1;
-        this.shift();
-        if (cipherTransform)
-          str = cipherTransform.decryptString(str);
-        return str;
-      }
-
-      // simple object
-      var obj = this.buf1;
-      this.shift();
-      return obj;
-    },
-    makeInlineImage: function Parser_makeInlineImage(cipherTransform) {
-      var lexer = this.lexer;
-      var stream = lexer.stream;
-
-      // parse dictionary
-      var dict = new Dict();
-      while (!isCmd(this.buf1, 'ID') && !isEOF(this.buf1)) {
-        if (!isName(this.buf1))
-          error('Dictionary key must be a name object');
-
-        var key = this.buf1.name;
-        this.shift();
-        if (isEOF(this.buf1))
-          break;
-        dict.set(key, this.getObj(cipherTransform));
-      }
-
-      // parse image stream
-      var startPos = stream.pos;
-
-      // searching for the /EI\s/
-      var state = 0, ch;
-      while (state != 4 && (ch = stream.getByte()) != null) {
-        switch (ch) {
-          case 0x20:
-          case 0x0D:
-          case 0x0A:
-            state = state === 3 ? 4 : 0;
-            break;
-          case 0x45:
-            state = 2;
-            break;
-          case 0x49:
-            state = state === 2 ? 3 : 0;
-            break;
-          default:
-            state = 0;
-            break;
-        }
-      }
-
-      // TODO improve the small images performance to remove the limit
-      var inlineImgLimit = 500;
-      if (++this.inlineImg >= inlineImgLimit) {
-        if (this.inlineImg === inlineImgLimit)
-          warn('Too many inline images');
-        this.shift();
-        return null;
-      }
-
-      var length = (stream.pos - 4) - startPos;
-      var imageStream = stream.makeSubStream(startPos, length, dict);
-      if (cipherTransform)
-        imageStream = cipherTransform.createStream(imageStream);
-      imageStream = this.filter(imageStream, dict, length);
-      imageStream.parameters = dict;
-
-      this.buf2 = Cmd.get('EI');
-      this.shift();
-
-      return imageStream;
-    },
-    fetchIfRef: function Parser_fetchIfRef(obj) {
-      // not relying on the xref.fetchIfRef -- xref might not be set
-      return isRef(obj) ? this.xref.fetch(obj) : obj;
-    },
-    makeStream: function Parser_makeStream(dict, cipherTransform) {
-      var lexer = this.lexer;
-      var stream = lexer.stream;
-
-      // get stream start position
-      lexer.skipToNextLine();
-      var pos = stream.pos;
-
-      // get length
-      var length = this.fetchIfRef(dict.get('Length'));
-      if (!isInt(length))
-        error('Bad ' + length + ' attribute in stream');
-
-      // skip over the stream data
-      stream.pos = pos + length;
-      this.shift(); // '>>'
-      this.shift(); // 'stream'
-      if (!isCmd(this.buf1, 'endstream'))
-        error('Missing endstream');
-      this.shift();
-
-      stream = stream.makeSubStream(pos, length, dict);
-      if (cipherTransform)
-        stream = cipherTransform.createStream(stream);
-      stream = this.filter(stream, dict, length);
-      stream.parameters = dict;
-      return stream;
-    },
-    filter: function Parser_filter(stream, dict, length) {
-      var filter = this.fetchIfRef(dict.get('Filter', 'F'));
-      var params = this.fetchIfRef(dict.get('DecodeParms', 'DP'));
-      if (isName(filter))
-        return this.makeFilter(stream, filter.name, length, params);
-      if (isArray(filter)) {
-        var filterArray = filter;
-        var paramsArray = params;
-        for (var i = 0, ii = filterArray.length; i < ii; ++i) {
-          filter = filterArray[i];
-          if (!isName(filter))
-            error('Bad filter name: ' + filter);
-
-          params = null;
-          if (isArray(paramsArray) && (i in paramsArray))
-            params = paramsArray[i];
-          stream = this.makeFilter(stream, filter.name, length, params);
-          // after the first stream the length variable is invalid
-          length = null;
-        }
-      }
-      return stream;
-    },
-    makeFilter: function Parser_makeFilter(stream, name, length, params) {
-      if (name == 'FlateDecode' || name == 'Fl') {
-        if (params) {
-          return new PredictorStream(new FlateStream(stream), params);
-        }
-        return new FlateStream(stream);
-      }
-      if (name == 'LZWDecode' || name == 'LZW') {
-        var earlyChange = 1;
-        if (params) {
-          if (params.has('EarlyChange'))
-            earlyChange = params.get('EarlyChange');
-          return new PredictorStream(
-            new LZWStream(stream, earlyChange), params);
-        }
-        return new LZWStream(stream, earlyChange);
-      }
-      if (name == 'DCTDecode' || name == 'DCT') {
-        var bytes = stream.getBytes(length);
-        return new JpegStream(bytes, stream.dict, this.xref);
-      }
-      if (name == 'JPXDecode' || name == 'JPX') {
-        var bytes = stream.getBytes(length);
-        return new JpxStream(bytes, stream.dict);
-      }
-      if (name == 'ASCII85Decode' || name == 'A85') {
-        return new Ascii85Stream(stream);
-      }
-      if (name == 'ASCIIHexDecode' || name == 'AHx') {
-        return new AsciiHexStream(stream);
-      }
-      if (name == 'CCITTFaxDecode' || name == 'CCF') {
-        return new CCITTFaxStream(stream, params);
-      }
-      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;
-    }
-  };
-
-  return Parser;
-})();
-
-var Lexer = (function LexerClosure() {
-  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) {
-    return ch == ' ' || ch == '\t' || ch == '\x0d' || ch == '\x0a';
-  };
-
-  // A '1' in this array means the character is white space.  A '1' or
-  // '2' means the character ends a name or command.
-  var specialChars = [
-    1, 0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 0, 1, 1, 0, 0,   // 0x
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   // 1x
-    1, 0, 0, 0, 0, 2, 0, 0, 2, 2, 0, 0, 0, 0, 0, 2,   // 2x
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 2, 0,   // 3x
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   // 4x
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 2, 0, 0,   // 5x
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   // 6x
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 2, 0, 2, 0, 0,   // 7x
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   // 8x
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   // 9x
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   // ax
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   // bx
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   // cx
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   // dx
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,   // ex
-    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0    // fx
-  ];
-
-  function toHexDigit(ch) {
-    if (ch >= '0' && ch <= '9')
-      return ch.charCodeAt(0) - 48;
-    ch = ch.toUpperCase();
-    if (ch >= 'A' && ch <= 'F')
-      return ch.charCodeAt(0) - 55;
-    return -1;
-  }
-
-  Lexer.prototype = {
-    getNumber: function Lexer_getNumber(ch) {
-      var floating = false;
-      var str = ch;
-      var stream = this.stream;
-      for (;;) {
-        ch = stream.lookChar();
-        if (ch == '.' && !floating) {
-          str += ch;
-          floating = true;
-        } else if (ch == '-') {
-          // ignore minus signs in the middle of numbers to match
-          // Adobe's behavior
-          warn('Badly formated number');
-        } else if (ch >= '0' && ch <= '9') {
-          str += ch;
-        } else if (ch == 'e' || ch == 'E') {
-          floating = true;
-        } else {
-          // the last character doesn't belong to us
-          break;
-        }
-        stream.skip();
-      }
-      var value = parseFloat(str);
-      if (isNaN(value))
-        error('Invalid floating point number: ' + value);
-      return value;
-    },
-    getString: function Lexer_getString() {
-      var numParen = 1;
-      var done = false;
-      var str = '';
-      var stream = this.stream;
-      var ch;
-      do {
-        ch = stream.getChar();
-        switch (ch) {
-          case undefined:
-            warn('Unterminated string');
-            done = true;
-            break;
-          case '(':
-            ++numParen;
-            str += ch;
-            break;
-          case ')':
-            if (--numParen == 0) {
-              done = true;
-            } else {
-              str += ch;
-            }
-            break;
-          case '\\':
-            ch = stream.getChar();
-            switch (ch) {
-              case undefined:
-                warn('Unterminated string');
-                done = true;
-                break;
-              case 'n':
-                str += '\n';
-                break;
-              case 'r':
-                str += '\r';
-                break;
-              case 't':
-                str += '\t';
-                break;
-              case 'b':
-                str += '\b';
-                break;
-              case 'f':
-                str += '\f';
-                break;
-              case '\\':
-              case '(':
-              case ')':
-                str += ch;
-                break;
-              case '0': case '1': case '2': case '3':
-              case '4': case '5': case '6': case '7':
-                var x = ch - '0';
-                ch = stream.lookChar();
-                if (ch >= '0' && ch <= '7') {
-                  stream.skip();
-                  x = (x << 3) + (ch - '0');
-                  ch = stream.lookChar();
-                  if (ch >= '0' && ch <= '7') {
-                    stream.skip();
-                    x = (x << 3) + (ch - '0');
-                  }
-                }
-
-                str += String.fromCharCode(x);
-                break;
-              case '\r':
-                ch = stream.lookChar();
-                if (ch == '\n')
-                  stream.skip();
-                break;
-              case '\n':
-                break;
-              default:
-                str += ch;
-            }
-            break;
-          default:
-            str += ch;
-        }
-      } while (!done);
-      return str;
-    },
-    getName: function Lexer_getName(ch) {
-      var str = '';
-      var stream = this.stream;
-      while (!!(ch = stream.lookChar()) && !specialChars[ch.charCodeAt(0)]) {
-        stream.skip();
-        if (ch == '#') {
-          ch = stream.lookChar();
-          var x = toHexDigit(ch);
-          if (x != -1) {
-            stream.skip();
-            var x2 = toHexDigit(stream.getChar());
-            if (x2 == -1)
-              error('Illegal digit in hex char in name: ' + x2);
-            str += String.fromCharCode((x << 4) | x2);
-          } else {
-            str += '#';
-            str += ch;
-          }
-        } else {
-          str += ch;
-        }
-      }
-      if (str.length > 128)
-        error('Warning: name token is longer than allowed by the spec: ' +
-              str.length);
-      return new Name(str);
-    },
-    getHexString: function Lexer_getHexString(ch) {
-      var str = '';
-      var stream = this.stream;
-      for (;;) {
-        ch = stream.getChar();
-        if (ch == '>') {
-          break;
-        }
-        if (!ch) {
-          warn('Unterminated hex string');
-          break;
-        }
-        if (specialChars[ch.charCodeAt(0)] != 1) {
-          var x, x2;
-          if ((x = toHexDigit(ch)) == -1)
-            error('Illegal character in hex string: ' + ch);
-
-          ch = stream.getChar();
-          while (specialChars[ch.charCodeAt(0)] == 1)
-            ch = stream.getChar();
-
-          if ((x2 = toHexDigit(ch)) == -1)
-            error('Illegal character in hex string: ' + ch);
-
-          str += String.fromCharCode((x << 4) | x2);
-        }
-      }
-      return str;
-    },
-    getObj: function Lexer_getObj() {
-      // skip whitespace and comments
-      var comment = false;
-      var stream = this.stream;
-      var ch;
-      while (true) {
-        if (!(ch = stream.getChar()))
-          return EOF;
-        if (comment) {
-          if (ch == '\r' || ch == '\n')
-            comment = false;
-        } else if (ch == '%') {
-          comment = true;
-        } else if (specialChars[ch.charCodeAt(0)] != 1) {
-          break;
-        }
-      }
-
-      // start reading token
-      switch (ch) {
-        case '0': case '1': case '2': case '3': case '4':
-        case '5': case '6': case '7': case '8': case '9':
-        case '+': case '-': case '.':
-          return this.getNumber(ch);
-        case '(':
-          return this.getString();
-        case '/':
-          return this.getName(ch);
-        // array punctuation
-        case '[':
-        case ']':
-          return Cmd.get(ch);
-        // hex string or dict punctuation
-        case '<':
-          ch = stream.lookChar();
-          if (ch == '<') {
-            // dict punctuation
-            stream.skip();
-            return Cmd.get('<<');
-          }
-          return this.getHexString(ch);
-        // dict punctuation
-        case '>':
-          ch = stream.lookChar();
-          if (ch == '>') {
-            stream.skip();
-            return Cmd.get('>>');
-          }
-        case '{':
-        case '}':
-          return Cmd.get(ch);
-        // fall through
-        case ')':
-          error('Illegal character: ' + ch);
-      }
-
-      // 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;
-      if (str == 'false')
-        return false;
-      if (str == 'null')
-        return null;
-      return Cmd.get(str);
-    },
-    skipToNextLine: function Lexer_skipToNextLine() {
-      var stream = this.stream;
-      while (true) {
-        var ch = stream.getChar();
-        if (!ch || ch == '\n')
-          return;
-        if (ch == '\r') {
-          if ((ch = stream.lookChar()) == '\n')
-            stream.skip();
-          return;
-        }
-      }
-    },
-    skip: function Lexer_skip() {
-      this.stream.skip();
-    }
-  };
-
-  return Lexer;
-})();
-
-var Linearization = (function LinearizationClosure() {
-  function Linearization(stream) {
-    this.parser = new Parser(new Lexer(stream), false, null);
-    var obj1 = this.parser.getObj();
-    var obj2 = this.parser.getObj();
-    var obj3 = this.parser.getObj();
-    this.linDict = this.parser.getObj();
-    if (isInt(obj1) && isInt(obj2) && isCmd(obj3, 'obj') &&
-        isDict(this.linDict)) {
-      var obj = this.linDict.get('Linearized');
-      if (!(isNum(obj) && obj > 0))
-        this.linDict = null;
-    }
-  }
-
-  Linearization.prototype = {
-    getInt: function Linearization_getInt(name) {
-      var linDict = this.linDict;
-      var obj;
-      if (isDict(linDict) &&
-          isInt(obj = linDict.get(name)) &&
-          obj > 0) {
-        return obj;
-      }
-      error('"' + name + '" field in linearization table is invalid');
-    },
-    getHint: function Linearization_getHint(index) {
-      var linDict = this.linDict;
-      var obj1, obj2;
-      if (isDict(linDict) &&
-          isArray(obj1 = linDict.get('H')) &&
-          obj1.length >= 2 &&
-          isInt(obj2 = obj1[index]) &&
-          obj2 > 0) {
-        return obj2;
-      }
-      error('Hints table in linearization table is invalid: ' + index);
-    },
-    get length() {
-      if (!isDict(this.linDict))
-        return 0;
-      return this.getInt('L');
-    },
-    get hintsOffset() {
-      return this.getHint(0);
-    },
-    get hintsLength() {
-      return this.getHint(1);
-    },
-    get hintsOffset2() {
-      return this.getHint(2);
-    },
-    get hintsLenth2() {
-      return this.getHint(3);
-    },
-    get objectNumberFirst() {
-      return this.getInt('O');
-    },
-    get endFirst() {
-      return this.getInt('E');
-    },
-    get numPages() {
-      return this.getInt('N');
-    },
-    get mainXRefEntriesOffset() {
-      return this.getInt('T');
-    },
-    get pageFirst() {
-      return this.getInt('P');
-    }
-  };
-
-  return Linearization;
-})();
-
-
-/* -*- 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 PatternType = {
-  AXIAL: 2,
-  RADIAL: 3
-};
-
-var Pattern = (function PatternClosure() {
-  // Constructor should define this.getPattern
-  function Pattern() {
-    error('should not call Pattern constructor');
-  }
-
-  Pattern.prototype = {
-    // Input: current Canvas context
-    // Output: the appropriate fillStyle or strokeStyle
-    getPattern: function Pattern_getPattern(ctx) {
-      error('Should not call Pattern.getStyle: ' + ctx);
-    }
-  };
-
-  Pattern.shadingFromIR = function Pattern_shadingFromIR(raw) {
-    return Shadings[raw[0]].fromIR(raw);
-  };
-
-  Pattern.parseShading = function Pattern_parseShading(shading, matrix, xref,
-                                                       res) {
-
-    var dict = isStream(shading) ? shading.dict : shading;
-    var type = dict.get('ShadingType');
-
-    switch (type) {
-      case PatternType.AXIAL:
-      case PatternType.RADIAL:
-        // Both radial and axial shadings are handled by RadialAxial shading.
-        return new Shadings.RadialAxial(dict, matrix, xref, res);
-      default:
-        return new Shadings.Dummy();
-    }
-  };
-  return Pattern;
-})();
-
-var Shadings = {};
-
-// Radial and axial shading have very similar implementations
-// If needed, the implementations can be broken into two classes
-Shadings.RadialAxial = (function RadialAxialClosure() {
-  function RadialAxial(dict, matrix, xref, res, ctx) {
-    this.matrix = matrix;
-    this.coordsArr = dict.get('Coords');
-    this.shadingType = dict.get('ShadingType');
-    this.type = 'Pattern';
-
-    this.ctx = ctx;
-    var cs = dict.get('ColorSpace', 'CS');
-    cs = ColorSpace.parse(cs, xref, res);
-    this.cs = cs;
-
-    var t0 = 0.0, t1 = 1.0;
-    if (dict.has('Domain')) {
-      var domainArr = dict.get('Domain');
-      t0 = domainArr[0];
-      t1 = domainArr[1];
-    }
-
-    var extendStart = false, extendEnd = false;
-    if (dict.has('Extend')) {
-      var extendArr = dict.get('Extend');
-      extendStart = extendArr[0];
-      extendEnd = extendArr[1];
-      TODO('Support extend');
-    }
-
-    this.extendStart = extendStart;
-    this.extendEnd = extendEnd;
-
-    var fnObj = dict.get('Function');
-    if (isArray(fnObj))
-      error('No support for array of functions');
-    if (!isPDFFunction(fnObj))
-      error('Invalid function');
-    var fn = PDFFunction.parse(xref, fnObj);
-
-    // 10 samples seems good enough for now, but probably won't work
-    // if there are sharp color changes. Ideally, we would implement
-    // the spec faithfully and add lossless optimizations.
-    var step = (t1 - t0) / 10;
-    var diff = t1 - t0;
-
-    var colorStops = [];
-    for (var i = t0; i <= t1; i += step) {
-      var rgbColor = cs.getRgb(fn([i]));
-      var cssColor = Util.makeCssRgb(rgbColor[0], rgbColor[1], rgbColor[2]);
-      colorStops.push([(i - t0) / diff, cssColor]);
-    }
-
-    this.colorStops = colorStops;
-  }
-
-  RadialAxial.fromIR = function RadialAxial_fromIR(raw) {
-    var type = raw[1];
-    var colorStops = raw[2];
-    var p0 = raw[3];
-    var p1 = raw[4];
-    var r0 = raw[5];
-    var r1 = raw[6];
-    return {
-      type: 'Pattern',
-      getPattern: function RadialAxial_getPattern(ctx) {
-        var curMatrix = ctx.mozCurrentTransform;
-        if (curMatrix) {
-          var userMatrix = ctx.mozCurrentTransformInverse;
-
-          p0 = Util.applyTransform(p0, curMatrix);
-          p0 = Util.applyTransform(p0, userMatrix);
-
-          p1 = Util.applyTransform(p1, curMatrix);
-          p1 = Util.applyTransform(p1, userMatrix);
-        }
-
-        var grad;
-        if (type == PatternType.AXIAL)
-          grad = ctx.createLinearGradient(p0[0], p0[1], p1[0], p1[1]);
-        else if (type == PatternType.RADIAL)
-          grad = ctx.createRadialGradient(p0[0], p0[1], r0, p1[0], p1[1], r1);
-
-        for (var i = 0, ii = colorStops.length; i < ii; ++i) {
-          var c = colorStops[i];
-          grad.addColorStop(c[0], c[1]);
-        }
-        return grad;
-      }
-    };
-  };
-
-  RadialAxial.prototype = {
-    getIR: function RadialAxial_getIR() {
-      var coordsArr = this.coordsArr;
-      var type = this.shadingType;
-      if (type == PatternType.AXIAL) {
-        var p0 = [coordsArr[0], coordsArr[1]];
-        var p1 = [coordsArr[2], coordsArr[3]];
-        var r0 = null;
-        var r1 = null;
-      } else if (type == PatternType.RADIAL) {
-        var p0 = [coordsArr[0], coordsArr[1]];
-        var p1 = [coordsArr[3], coordsArr[4]];
-        var r0 = coordsArr[2];
-        var r1 = coordsArr[5];
-      } else {
-        error('getPattern type unknown: ' + type);
-      }
-
-      var matrix = this.matrix;
-      if (matrix) {
-        p0 = Util.applyTransform(p0, matrix);
-        p1 = Util.applyTransform(p1, matrix);
-      }
-
-      return ['RadialAxial', type, this.colorStops, p0, p1, r0, r1];
-    }
-  };
-
-  return RadialAxial;
-})();
-
-Shadings.Dummy = (function DummyClosure() {
-  function Dummy() {
-    this.type = 'Pattern';
-  }
-
-  Dummy.fromIR = function Dummy_fromIR() {
-    return 'hotpink';
-  };
-
-  Dummy.prototype = {
-    getIR: function Dummy_getIR() {
-      return ['Dummy'];
-    }
-  };
-  return Dummy;
-})();
-
-var TilingPattern = (function TilingPatternClosure() {
-  var PaintType = {
-    COLORED: 1,
-    UNCOLORED: 2
-  };
-  var MAX_PATTERN_SIZE = 512;
-
-  function TilingPattern(IR, color, ctx, objs) {
-    var operatorList = IR[2];
-    this.matrix = IR[3];
-    var bbox = IR[4];
-    var xstep = IR[5];
-    var ystep = IR[6];
-    var paintType = IR[7];
-
-    TODO('TilingType');
-
-    this.curMatrix = ctx.mozCurrentTransform;
-    this.invMatrix = ctx.mozCurrentTransformInverse;
-    this.ctx = ctx;
-    this.type = 'Pattern';
-
-    var x0 = bbox[0], y0 = bbox[1], x1 = bbox[2], y1 = bbox[3];
-
-    var topLeft = [x0, y0];
-    // we want the canvas to be as large as the step size
-    var botRight = [x0 + xstep, y0 + ystep];
-
-    var width = botRight[0] - topLeft[0];
-    var height = botRight[1] - topLeft[1];
-
-    // TODO: hack to avoid OOM, we would ideally compute the tiling
-    // pattern to be only as large as the acual size in device space
-    // This could be computed with .mozCurrentTransform, but still
-    // needs to be implemented
-    while (Math.abs(width) > MAX_PATTERN_SIZE ||
-           Math.abs(height) > MAX_PATTERN_SIZE) {
-      width = height = MAX_PATTERN_SIZE;
-    }
-
-    var tmpCanvas = createScratchCanvas(width, height);
-
-    // set the new canvas element context as the graphics context
-    var tmpCtx = tmpCanvas.getContext('2d');
-    var graphics = new CanvasGraphics(tmpCtx, objs);
-
-    switch (paintType) {
-      case PaintType.COLORED:
-        tmpCtx.fillStyle = ctx.fillStyle;
-        tmpCtx.strokeStyle = ctx.strokeStyle;
-        break;
-      case PaintType.UNCOLORED:
-        var cssColor = Util.makeCssRgb(this, color[0], color[1], color[2]);
-        tmpCtx.fillStyle = cssColor;
-        tmpCtx.strokeStyle = cssColor;
-        break;
-      default:
-        error('Unsupported paint type: ' + paintType);
-    }
-
-    var scale = [width / xstep, height / ystep];
-    this.scale = scale;
-
-    // transform coordinates to pattern space
-    var tmpTranslate = [1, 0, 0, 1, -topLeft[0], -topLeft[1]];
-    var tmpScale = [scale[0], 0, 0, scale[1], 0, 0];
-    graphics.transform.apply(graphics, tmpScale);
-    graphics.transform.apply(graphics, tmpTranslate);
-
-    if (bbox && isArray(bbox) && 4 == bbox.length) {
-      var bboxWidth = x1 - x0;
-      var bboxHeight = y1 - y0;
-      graphics.rectangle(x0, y0, bboxWidth, bboxHeight);
-      graphics.clip();
-      graphics.endPath();
-    }
-
-    graphics.executeOperatorList(operatorList);
-
-    this.canvas = tmpCanvas;
-  }
-
-  TilingPattern.getIR = function TilingPattern_getIR(operatorList, dict, args) {
-    var matrix = dict.get('Matrix');
-    var bbox = dict.get('BBox');
-    var xstep = dict.get('XStep');
-    var ystep = dict.get('YStep');
-    var paintType = dict.get('PaintType');
-
-    return [
-      'TilingPattern', args, operatorList, matrix, bbox, xstep, ystep, paintType
-    ];
-  };
-
-  TilingPattern.prototype = {
-    getPattern: function TilingPattern_getPattern() {
-      var matrix = this.matrix;
-      var curMatrix = this.curMatrix;
-      var ctx = this.ctx;
-
-      if (curMatrix)
-        ctx.setTransform.apply(ctx, curMatrix);
-
-      if (matrix)
-        ctx.transform.apply(ctx, matrix);
-
-      var scale = this.scale;
-      ctx.scale(1 / scale[0], 1 / scale[1]);
-
-      return ctx.createPattern(this.canvas, 'repeat');
-    }
-  };
-
-  return TilingPattern;
-})();
-
-
-/* -*- 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 Stream = (function StreamClosure() {
-  function Stream(arrayBuffer, start, length, dict) {
-    this.bytes = new Uint8Array(arrayBuffer);
-    this.start = start || 0;
-    this.pos = this.start;
-    this.end = (start + length) || this.bytes.length;
-    this.dict = dict;
-  }
-
-  // required methods for a stream. if a particular stream does not
-  // implement these, an error should be thrown
-  Stream.prototype = {
-    get length() {
-      return this.end - this.start;
-    },
-    getByte: function Stream_getByte() {
-      if (this.pos >= this.end)
-        return null;
-      return this.bytes[this.pos++];
-    },
-    // returns subarray of original buffer
-    // should only be read
-    getBytes: function Stream_getBytes(length) {
-      var bytes = this.bytes;
-      var pos = this.pos;
-      var strEnd = this.end;
-
-      if (!length)
-        return bytes.subarray(pos, strEnd);
-
-      var end = pos + length;
-      if (end > strEnd)
-        end = strEnd;
-
-      this.pos = end;
-      return bytes.subarray(pos, end);
-    },
-    lookChar: function Stream_lookChar() {
-      if (this.pos >= this.end)
-        return null;
-      return String.fromCharCode(this.bytes[this.pos]);
-    },
-    getChar: function Stream_getChar() {
-      if (this.pos >= this.end)
-        return null;
-      return String.fromCharCode(this.bytes[this.pos++]);
-    },
-    skip: function Stream_skip(n) {
-      if (!n)
-        n = 1;
-      this.pos += n;
-    },
-    reset: function Stream_reset() {
-      this.pos = this.start;
-    },
-    moveStart: function Stream_moveStart() {
-      this.start = this.pos;
-    },
-    makeSubStream: function Stream_makeSubStream(start, length, dict) {
-      return new Stream(this.bytes.buffer, start, length, dict);
-    },
-    isStream: true
-  };
-
-  return Stream;
-})();
-
-var StringStream = (function StringStreamClosure() {
-  function StringStream(str) {
-    var length = str.length;
-    var bytes = new Uint8Array(length);
-    for (var n = 0; n < length; ++n)
-      bytes[n] = str.charCodeAt(n);
-    Stream.call(this, bytes);
-  }
-
-  StringStream.prototype = Stream.prototype;
-
-  return StringStream;
-})();
-
-// super class for the decoding streams
-var DecodeStream = (function DecodeStreamClosure() {
-  function DecodeStream() {
-    this.pos = 0;
-    this.bufferLength = 0;
-    this.eof = false;
-    this.buffer = null;
-  }
-
-  DecodeStream.prototype = {
-    ensureBuffer: function DecodeStream_ensureBuffer(requested) {
-      var buffer = this.buffer;
-      var current = buffer ? buffer.byteLength : 0;
-      if (requested < current)
-        return buffer;
-      var size = 512;
-      while (size < requested)
-        size <<= 1;
-      var buffer2 = new Uint8Array(size);
-      for (var i = 0; i < current; ++i)
-        buffer2[i] = buffer[i];
-      return (this.buffer = buffer2);
-    },
-    getByte: function DecodeStream_getByte() {
-      var pos = this.pos;
-      while (this.bufferLength <= pos) {
-        if (this.eof)
-          return null;
-        this.readBlock();
-      }
-      return this.buffer[this.pos++];
-    },
-    getBytes: function DecodeStream_getBytes(length) {
-      var end, pos = this.pos;
-
-      if (length) {
-        this.ensureBuffer(pos + length);
-        end = pos + length;
-
-        while (!this.eof && this.bufferLength < end)
-          this.readBlock();
-
-        var bufEnd = this.bufferLength;
-        if (end > bufEnd)
-          end = bufEnd;
-      } else {
-        while (!this.eof)
-          this.readBlock();
-
-        end = this.bufferLength;
-
-        // checking if bufferLength is still 0 then
-        // the buffer has to be initialized
-        if (!end)
-          this.buffer = new Uint8Array(0);
-      }
-
-      this.pos = end;
-      return this.buffer.subarray(pos, end);
-    },
-    lookChar: function DecodeStream_lookChar() {
-      var pos = this.pos;
-      while (this.bufferLength <= pos) {
-        if (this.eof)
-          return null;
-        this.readBlock();
-      }
-      return String.fromCharCode(this.buffer[this.pos]);
-    },
-    getChar: function DecodeStream_getChar() {
-      var pos = this.pos;
-      while (this.bufferLength <= pos) {
-        if (this.eof)
-          return null;
-        this.readBlock();
-      }
-      return String.fromCharCode(this.buffer[this.pos++]);
-    },
-    makeSubStream: function DecodeStream_makeSubStream(start, length, dict) {
-      var end = start + length;
-      while (this.bufferLength <= end && !this.eof)
-        this.readBlock();
-      return new Stream(this.buffer, start, length, dict);
-    },
-    skip: function DecodeStream_skip(n) {
-      if (!n)
-        n = 1;
-      this.pos += n;
-    },
-    reset: function DecodeStream_reset() {
-      this.pos = 0;
-    }
-  };
-
-  return DecodeStream;
-})();
-
-var FakeStream = (function FakeStreamClosure() {
-  function FakeStream(stream) {
-    this.dict = stream.dict;
-    DecodeStream.call(this);
-  }
-
-  FakeStream.prototype = Object.create(DecodeStream.prototype);
-  FakeStream.prototype.readBlock = function FakeStream_readBlock() {
-    var bufferLength = this.bufferLength;
-    bufferLength += 1024;
-    var buffer = this.ensureBuffer(bufferLength);
-    this.bufferLength = bufferLength;
-  };
-
-  FakeStream.prototype.getBytes = function FakeStream_getBytes(length) {
-    var end, pos = this.pos;
-
-    if (length) {
-      this.ensureBuffer(pos + length);
-      end = pos + length;
-
-      while (!this.eof && this.bufferLength < end)
-        this.readBlock();
-
-      var bufEnd = this.bufferLength;
-      if (end > bufEnd)
-        end = bufEnd;
-    } else {
-      this.eof = true;
-      end = this.bufferLength;
-    }
-
-    this.pos = end;
-    return this.buffer.subarray(pos, end);
-  };
-
-  return FakeStream;
-})();
-
-var StreamsSequenceStream = (function StreamsSequenceStreamClosure() {
-  function StreamsSequenceStream(streams) {
-    this.streams = streams;
-    DecodeStream.call(this);
-  }
-
-  StreamsSequenceStream.prototype = Object.create(DecodeStream.prototype);
-
-  StreamsSequenceStream.prototype.readBlock =
-    function streamSequenceStreamReadBlock() {
-
-    var streams = this.streams;
-    if (streams.length == 0) {
-      this.eof = true;
-      return;
-    }
-    var stream = streams.shift();
-    var chunk = stream.getBytes();
-    var bufferLength = this.bufferLength;
-    var newLength = bufferLength + chunk.length;
-    var buffer = this.ensureBuffer(newLength);
-    buffer.set(chunk, bufferLength);
-    this.bufferLength = newLength;
-  };
-
-  return StreamsSequenceStream;
-})();
-
-var FlateStream = (function FlateStreamClosure() {
-  var codeLenCodeMap = new Uint32Array([
-    16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15
-  ]);
-
-  var lengthDecode = new Uint32Array([
-    0x00003, 0x00004, 0x00005, 0x00006, 0x00007, 0x00008, 0x00009, 0x0000a,
-    0x1000b, 0x1000d, 0x1000f, 0x10011, 0x20013, 0x20017, 0x2001b, 0x2001f,
-    0x30023, 0x3002b, 0x30033, 0x3003b, 0x40043, 0x40053, 0x40063, 0x40073,
-    0x50083, 0x500a3, 0x500c3, 0x500e3, 0x00102, 0x00102, 0x00102
-  ]);
-
-  var distDecode = new Uint32Array([
-    0x00001, 0x00002, 0x00003, 0x00004, 0x10005, 0x10007, 0x20009, 0x2000d,
-    0x30011, 0x30019, 0x40021, 0x40031, 0x50041, 0x50061, 0x60081, 0x600c1,
-    0x70101, 0x70181, 0x80201, 0x80301, 0x90401, 0x90601, 0xa0801, 0xa0c01,
-    0xb1001, 0xb1801, 0xc2001, 0xc3001, 0xd4001, 0xd6001
-  ]);
-
-  var fixedLitCodeTab = [new Uint32Array([
-    0x70100, 0x80050, 0x80010, 0x80118, 0x70110, 0x80070, 0x80030, 0x900c0,
-    0x70108, 0x80060, 0x80020, 0x900a0, 0x80000, 0x80080, 0x80040, 0x900e0,
-    0x70104, 0x80058, 0x80018, 0x90090, 0x70114, 0x80078, 0x80038, 0x900d0,
-    0x7010c, 0x80068, 0x80028, 0x900b0, 0x80008, 0x80088, 0x80048, 0x900f0,
-    0x70102, 0x80054, 0x80014, 0x8011c, 0x70112, 0x80074, 0x80034, 0x900c8,
-    0x7010a, 0x80064, 0x80024, 0x900a8, 0x80004, 0x80084, 0x80044, 0x900e8,
-    0x70106, 0x8005c, 0x8001c, 0x90098, 0x70116, 0x8007c, 0x8003c, 0x900d8,
-    0x7010e, 0x8006c, 0x8002c, 0x900b8, 0x8000c, 0x8008c, 0x8004c, 0x900f8,
-    0x70101, 0x80052, 0x80012, 0x8011a, 0x70111, 0x80072, 0x80032, 0x900c4,
-    0x70109, 0x80062, 0x80022, 0x900a4, 0x80002, 0x80082, 0x80042, 0x900e4,
-    0x70105, 0x8005a, 0x8001a, 0x90094, 0x70115, 0x8007a, 0x8003a, 0x900d4,
-    0x7010d, 0x8006a, 0x8002a, 0x900b4, 0x8000a, 0x8008a, 0x8004a, 0x900f4,
-    0x70103, 0x80056, 0x80016, 0x8011e, 0x70113, 0x80076, 0x80036, 0x900cc,
-    0x7010b, 0x80066, 0x80026, 0x900ac, 0x80006, 0x80086, 0x80046, 0x900ec,
-    0x70107, 0x8005e, 0x8001e, 0x9009c, 0x70117, 0x8007e, 0x8003e, 0x900dc,
-    0x7010f, 0x8006e, 0x8002e, 0x900bc, 0x8000e, 0x8008e, 0x8004e, 0x900fc,
-    0x70100, 0x80051, 0x80011, 0x80119, 0x70110, 0x80071, 0x80031, 0x900c2,
-    0x70108, 0x80061, 0x80021, 0x900a2, 0x80001, 0x80081, 0x80041, 0x900e2,
-    0x70104, 0x80059, 0x80019, 0x90092, 0x70114, 0x80079, 0x80039, 0x900d2,
-    0x7010c, 0x80069, 0x80029, 0x900b2, 0x80009, 0x80089, 0x80049, 0x900f2,
-    0x70102, 0x80055, 0x80015, 0x8011d, 0x70112, 0x80075, 0x80035, 0x900ca,
-    0x7010a, 0x80065, 0x80025, 0x900aa, 0x80005, 0x80085, 0x80045, 0x900ea,
-    0x70106, 0x8005d, 0x8001d, 0x9009a, 0x70116, 0x8007d, 0x8003d, 0x900da,
-    0x7010e, 0x8006d, 0x8002d, 0x900ba, 0x8000d, 0x8008d, 0x8004d, 0x900fa,
-    0x70101, 0x80053, 0x80013, 0x8011b, 0x70111, 0x80073, 0x80033, 0x900c6,
-    0x70109, 0x80063, 0x80023, 0x900a6, 0x80003, 0x80083, 0x80043, 0x900e6,
-    0x70105, 0x8005b, 0x8001b, 0x90096, 0x70115, 0x8007b, 0x8003b, 0x900d6,
-    0x7010d, 0x8006b, 0x8002b, 0x900b6, 0x8000b, 0x8008b, 0x8004b, 0x900f6,
-    0x70103, 0x80057, 0x80017, 0x8011f, 0x70113, 0x80077, 0x80037, 0x900ce,
-    0x7010b, 0x80067, 0x80027, 0x900ae, 0x80007, 0x80087, 0x80047, 0x900ee,
-    0x70107, 0x8005f, 0x8001f, 0x9009e, 0x70117, 0x8007f, 0x8003f, 0x900de,
-    0x7010f, 0x8006f, 0x8002f, 0x900be, 0x8000f, 0x8008f, 0x8004f, 0x900fe,
-    0x70100, 0x80050, 0x80010, 0x80118, 0x70110, 0x80070, 0x80030, 0x900c1,
-    0x70108, 0x80060, 0x80020, 0x900a1, 0x80000, 0x80080, 0x80040, 0x900e1,
-    0x70104, 0x80058, 0x80018, 0x90091, 0x70114, 0x80078, 0x80038, 0x900d1,
-    0x7010c, 0x80068, 0x80028, 0x900b1, 0x80008, 0x80088, 0x80048, 0x900f1,
-    0x70102, 0x80054, 0x80014, 0x8011c, 0x70112, 0x80074, 0x80034, 0x900c9,
-    0x7010a, 0x80064, 0x80024, 0x900a9, 0x80004, 0x80084, 0x80044, 0x900e9,
-    0x70106, 0x8005c, 0x8001c, 0x90099, 0x70116, 0x8007c, 0x8003c, 0x900d9,
-    0x7010e, 0x8006c, 0x8002c, 0x900b9, 0x8000c, 0x8008c, 0x8004c, 0x900f9,
-    0x70101, 0x80052, 0x80012, 0x8011a, 0x70111, 0x80072, 0x80032, 0x900c5,
-    0x70109, 0x80062, 0x80022, 0x900a5, 0x80002, 0x80082, 0x80042, 0x900e5,
-    0x70105, 0x8005a, 0x8001a, 0x90095, 0x70115, 0x8007a, 0x8003a, 0x900d5,
-    0x7010d, 0x8006a, 0x8002a, 0x900b5, 0x8000a, 0x8008a, 0x8004a, 0x900f5,
-    0x70103, 0x80056, 0x80016, 0x8011e, 0x70113, 0x80076, 0x80036, 0x900cd,
-    0x7010b, 0x80066, 0x80026, 0x900ad, 0x80006, 0x80086, 0x80046, 0x900ed,
-    0x70107, 0x8005e, 0x8001e, 0x9009d, 0x70117, 0x8007e, 0x8003e, 0x900dd,
-    0x7010f, 0x8006e, 0x8002e, 0x900bd, 0x8000e, 0x8008e, 0x8004e, 0x900fd,
-    0x70100, 0x80051, 0x80011, 0x80119, 0x70110, 0x80071, 0x80031, 0x900c3,
-    0x70108, 0x80061, 0x80021, 0x900a3, 0x80001, 0x80081, 0x80041, 0x900e3,
-    0x70104, 0x80059, 0x80019, 0x90093, 0x70114, 0x80079, 0x80039, 0x900d3,
-    0x7010c, 0x80069, 0x80029, 0x900b3, 0x80009, 0x80089, 0x80049, 0x900f3,
-    0x70102, 0x80055, 0x80015, 0x8011d, 0x70112, 0x80075, 0x80035, 0x900cb,
-    0x7010a, 0x80065, 0x80025, 0x900ab, 0x80005, 0x80085, 0x80045, 0x900eb,
-    0x70106, 0x8005d, 0x8001d, 0x9009b, 0x70116, 0x8007d, 0x8003d, 0x900db,
-    0x7010e, 0x8006d, 0x8002d, 0x900bb, 0x8000d, 0x8008d, 0x8004d, 0x900fb,
-    0x70101, 0x80053, 0x80013, 0x8011b, 0x70111, 0x80073, 0x80033, 0x900c7,
-    0x70109, 0x80063, 0x80023, 0x900a7, 0x80003, 0x80083, 0x80043, 0x900e7,
-    0x70105, 0x8005b, 0x8001b, 0x90097, 0x70115, 0x8007b, 0x8003b, 0x900d7,
-    0x7010d, 0x8006b, 0x8002b, 0x900b7, 0x8000b, 0x8008b, 0x8004b, 0x900f7,
-    0x70103, 0x80057, 0x80017, 0x8011f, 0x70113, 0x80077, 0x80037, 0x900cf,
-    0x7010b, 0x80067, 0x80027, 0x900af, 0x80007, 0x80087, 0x80047, 0x900ef,
-    0x70107, 0x8005f, 0x8001f, 0x9009f, 0x70117, 0x8007f, 0x8003f, 0x900df,
-    0x7010f, 0x8006f, 0x8002f, 0x900bf, 0x8000f, 0x8008f, 0x8004f, 0x900ff
-  ]), 9];
-
-  var fixedDistCodeTab = [new Uint32Array([
-    0x50000, 0x50010, 0x50008, 0x50018, 0x50004, 0x50014, 0x5000c, 0x5001c,
-    0x50002, 0x50012, 0x5000a, 0x5001a, 0x50006, 0x50016, 0x5000e, 0x00000,
-    0x50001, 0x50011, 0x50009, 0x50019, 0x50005, 0x50015, 0x5000d, 0x5001d,
-    0x50003, 0x50013, 0x5000b, 0x5001b, 0x50007, 0x50017, 0x5000f, 0x00000
-  ]), 5];
-
-  function FlateStream(stream) {
-    var bytes = stream.getBytes();
-    var bytesPos = 0;
-
-    this.dict = stream.dict;
-    var cmf = bytes[bytesPos++];
-    var flg = bytes[bytesPos++];
-    if (cmf == -1 || flg == -1)
-      error('Invalid header in flate stream: ' + cmf + ', ' + flg);
-    if ((cmf & 0x0f) != 0x08)
-      error('Unknown compression method in flate stream: ' + cmf + ', ' + flg);
-    if ((((cmf << 8) + flg) % 31) != 0)
-      error('Bad FCHECK in flate stream: ' + cmf + ', ' + flg);
-    if (flg & 0x20)
-      error('FDICT bit set in flate stream: ' + cmf + ', ' + flg);
-
-    this.bytes = bytes;
-    this.bytesPos = bytesPos;
-
-    this.codeSize = 0;
-    this.codeBuf = 0;
-
-    DecodeStream.call(this);
-  }
-
-  FlateStream.prototype = Object.create(DecodeStream.prototype);
-
-  FlateStream.prototype.getBits = function FlateStream_getBits(bits) {
-    var codeSize = this.codeSize;
-    var codeBuf = this.codeBuf;
-    var bytes = this.bytes;
-    var bytesPos = this.bytesPos;
-
-    var b;
-    while (codeSize < bits) {
-      if (typeof (b = bytes[bytesPos++]) == 'undefined')
-        error('Bad encoding in flate stream');
-      codeBuf |= b << codeSize;
-      codeSize += 8;
-    }
-    b = codeBuf & ((1 << bits) - 1);
-    this.codeBuf = codeBuf >> bits;
-    this.codeSize = codeSize -= bits;
-    this.bytesPos = bytesPos;
-    return b;
-  };
-
-  FlateStream.prototype.getCode = function FlateStream_getCode(table) {
-    var codes = table[0];
-    var maxLen = table[1];
-    var codeSize = this.codeSize;
-    var codeBuf = this.codeBuf;
-    var bytes = this.bytes;
-    var bytesPos = this.bytesPos;
-
-    while (codeSize < maxLen) {
-      var b;
-      if (typeof (b = bytes[bytesPos++]) == 'undefined')
-        error('Bad encoding in flate stream');
-      codeBuf |= (b << codeSize);
-      codeSize += 8;
-    }
-    var code = codes[codeBuf & ((1 << maxLen) - 1)];
-    var codeLen = code >> 16;
-    var codeVal = code & 0xffff;
-    if (codeSize == 0 || codeSize < codeLen || codeLen == 0)
-      error('Bad encoding in flate stream');
-    this.codeBuf = (codeBuf >> codeLen);
-    this.codeSize = (codeSize - codeLen);
-    this.bytesPos = bytesPos;
-    return codeVal;
-  };
-
-  FlateStream.prototype.generateHuffmanTable =
-    function flateStreamGenerateHuffmanTable(lengths) {
-    var n = lengths.length;
-
-    // find max code length
-    var maxLen = 0;
-    for (var i = 0; i < n; ++i) {
-      if (lengths[i] > maxLen)
-        maxLen = lengths[i];
-    }
-
-    // build the table
-    var size = 1 << maxLen;
-    var codes = new Uint32Array(size);
-    for (var len = 1, code = 0, skip = 2;
-         len <= maxLen;
-         ++len, code <<= 1, skip <<= 1) {
-      for (var val = 0; val < n; ++val) {
-        if (lengths[val] == len) {
-          // bit-reverse the code
-          var code2 = 0;
-          var t = code;
-          for (var i = 0; i < len; ++i) {
-            code2 = (code2 << 1) | (t & 1);
-            t >>= 1;
-          }
-
-          // fill the table entries
-          for (var i = code2; i < size; i += skip)
-            codes[i] = (len << 16) | val;
-
-          ++code;
-        }
-      }
-    }
-
-    return [codes, maxLen];
-  };
-
-  FlateStream.prototype.readBlock = function FlateStream_readBlock() {
-    // read block header
-    var hdr = this.getBits(3);
-    if (hdr & 1)
-      this.eof = true;
-    hdr >>= 1;
-
-    if (hdr == 0) { // uncompressed block
-      var bytes = this.bytes;
-      var bytesPos = this.bytesPos;
-      var b;
-
-      if (typeof (b = bytes[bytesPos++]) == 'undefined')
-        error('Bad block header in flate stream');
-      var blockLen = b;
-      if (typeof (b = bytes[bytesPos++]) == 'undefined')
-        error('Bad block header in flate stream');
-      blockLen |= (b << 8);
-      if (typeof (b = bytes[bytesPos++]) == 'undefined')
-        error('Bad block header in flate stream');
-      var check = b;
-      if (typeof (b = bytes[bytesPos++]) == 'undefined')
-        error('Bad block header in flate stream');
-      check |= (b << 8);
-      if (check != (~blockLen & 0xffff))
-        error('Bad uncompressed block length in flate stream');
-
-      this.codeBuf = 0;
-      this.codeSize = 0;
-
-      var bufferLength = this.bufferLength;
-      var buffer = this.ensureBuffer(bufferLength + blockLen);
-      var end = bufferLength + blockLen;
-      this.bufferLength = end;
-      for (var n = bufferLength; n < end; ++n) {
-        if (typeof (b = bytes[bytesPos++]) == 'undefined') {
-          this.eof = true;
-          break;
-        }
-        buffer[n] = b;
-      }
-      this.bytesPos = bytesPos;
-      return;
-    }
-
-    var litCodeTable;
-    var distCodeTable;
-    if (hdr == 1) { // compressed block, fixed codes
-      litCodeTable = fixedLitCodeTab;
-      distCodeTable = fixedDistCodeTab;
-    } else if (hdr == 2) { // compressed block, dynamic codes
-      var numLitCodes = this.getBits(5) + 257;
-      var numDistCodes = this.getBits(5) + 1;
-      var numCodeLenCodes = this.getBits(4) + 4;
-
-      // build the code lengths code table
-      var codeLenCodeLengths = new Uint8Array(codeLenCodeMap.length);
-
-      for (var i = 0; i < numCodeLenCodes; ++i)
-        codeLenCodeLengths[codeLenCodeMap[i]] = this.getBits(3);
-      var codeLenCodeTab = this.generateHuffmanTable(codeLenCodeLengths);
-
-      // build the literal and distance code tables
-      var len = 0;
-      var i = 0;
-      var codes = numLitCodes + numDistCodes;
-      var codeLengths = new Uint8Array(codes);
-      while (i < codes) {
-        var code = this.getCode(codeLenCodeTab);
-        if (code == 16) {
-          var bitsLength = 2, bitsOffset = 3, what = len;
-        } else if (code == 17) {
-          var bitsLength = 3, bitsOffset = 3, what = (len = 0);
-        } else if (code == 18) {
-          var bitsLength = 7, bitsOffset = 11, what = (len = 0);
-        } else {
-          codeLengths[i++] = len = code;
-          continue;
-        }
-
-        var repeatLength = this.getBits(bitsLength) + bitsOffset;
-        while (repeatLength-- > 0)
-          codeLengths[i++] = what;
-      }
-
-      litCodeTable =
-        this.generateHuffmanTable(codeLengths.subarray(0, numLitCodes));
-      distCodeTable =
-        this.generateHuffmanTable(codeLengths.subarray(numLitCodes, codes));
-    } else {
-      error('Unknown block type in flate stream');
-    }
-
-    var buffer = this.buffer;
-    var limit = buffer ? buffer.length : 0;
-    var pos = this.bufferLength;
-    while (true) {
-      var code1 = this.getCode(litCodeTable);
-      if (code1 < 256) {
-        if (pos + 1 >= limit) {
-          buffer = this.ensureBuffer(pos + 1);
-          limit = buffer.length;
-        }
-        buffer[pos++] = code1;
-        continue;
-      }
-      if (code1 == 256) {
-        this.bufferLength = pos;
-        return;
-      }
-      code1 -= 257;
-      code1 = lengthDecode[code1];
-      var code2 = code1 >> 16;
-      if (code2 > 0)
-        code2 = this.getBits(code2);
-      var len = (code1 & 0xffff) + code2;
-      code1 = this.getCode(distCodeTable);
-      code1 = distDecode[code1];
-      code2 = code1 >> 16;
-      if (code2 > 0)
-        code2 = this.getBits(code2);
-      var dist = (code1 & 0xffff) + code2;
-      if (pos + len >= limit) {
-        buffer = this.ensureBuffer(pos + len);
-        limit = buffer.length;
-      }
-      for (var k = 0; k < len; ++k, ++pos)
-        buffer[pos] = buffer[pos - dist];
-    }
-  };
-
-  return FlateStream;
-})();
-
-var PredictorStream = (function PredictorStreamClosure() {
-  function PredictorStream(stream, params) {
-    var predictor = this.predictor = params.get('Predictor') || 1;
-
-    if (predictor <= 1)
-      return stream; // no prediction
-    if (predictor !== 2 && (predictor < 10 || predictor > 15))
-      error('Unsupported predictor: ' + predictor);
-
-    if (predictor === 2)
-      this.readBlock = this.readBlockTiff;
-    else
-      this.readBlock = this.readBlockPng;
-
-    this.stream = stream;
-    this.dict = stream.dict;
-
-    var colors = this.colors = params.get('Colors') || 1;
-    var bits = this.bits = params.get('BitsPerComponent') || 8;
-    var columns = this.columns = params.get('Columns') || 1;
-
-    this.pixBytes = (colors * bits + 7) >> 3;
-    this.rowBytes = (columns * colors * bits + 7) >> 3;
-
-    DecodeStream.call(this);
-    return this;
-  }
-
-  PredictorStream.prototype = Object.create(DecodeStream.prototype);
-
-  PredictorStream.prototype.readBlockTiff =
-    function predictorStreamReadBlockTiff() {
-    var rowBytes = this.rowBytes;
-
-    var bufferLength = this.bufferLength;
-    var buffer = this.ensureBuffer(bufferLength + rowBytes);
-
-    var bits = this.bits;
-    var colors = this.colors;
-
-    var rawBytes = this.stream.getBytes(rowBytes);
-
-    var inbuf = 0, outbuf = 0;
-    var inbits = 0, outbits = 0;
-    var pos = bufferLength;
-
-    if (bits === 1) {
-      for (var i = 0; i < rowBytes; ++i) {
-        var c = rawBytes[i];
-        inbuf = (inbuf << 8) | c;
-        // bitwise addition is exclusive or
-        // first shift inbuf and then add
-        buffer[pos++] = (c ^ (inbuf >> colors)) & 0xFF;
-        // truncate inbuf (assumes colors < 16)
-        inbuf &= 0xFFFF;
-      }
-    } else if (bits === 8) {
-      for (var i = 0; i < colors; ++i)
-        buffer[pos++] = rawBytes[i];
-      for (; i < rowBytes; ++i) {
-        buffer[pos] = buffer[pos - colors] + rawBytes[i];
-        pos++;
-      }
-    } else {
-      var compArray = new Uint8Array(colors + 1);
-      var bitMask = (1 << bits) - 1;
-      var j = 0, k = bufferLength;
-      var columns = this.columns;
-      for (var i = 0; i < columns; ++i) {
-        for (var kk = 0; kk < colors; ++kk) {
-          if (inbits < bits) {
-            inbuf = (inbuf << 8) | (rawBytes[j++] & 0xFF);
-            inbits += 8;
-          }
-          compArray[kk] = (compArray[kk] +
-                           (inbuf >> (inbits - bits))) & bitMask;
-          inbits -= bits;
-          outbuf = (outbuf << bits) | compArray[kk];
-          outbits += bits;
-          if (outbits >= 8) {
-            buffer[k++] = (outbuf >> (outbits - 8)) & 0xFF;
-            outbits -= 8;
-          }
-        }
-      }
-      if (outbits > 0) {
-        buffer[k++] = (outbuf << (8 - outbits)) +
-        (inbuf & ((1 << (8 - outbits)) - 1));
-      }
-    }
-    this.bufferLength += rowBytes;
-  };
-
-  PredictorStream.prototype.readBlockPng =
-    function predictorStreamReadBlockPng() {
-
-    var rowBytes = this.rowBytes;
-    var pixBytes = this.pixBytes;
-
-    var predictor = this.stream.getByte();
-    var rawBytes = this.stream.getBytes(rowBytes);
-
-    var bufferLength = this.bufferLength;
-    var buffer = this.ensureBuffer(bufferLength + rowBytes);
-
-    var prevRow = buffer.subarray(bufferLength - rowBytes, bufferLength);
-    if (prevRow.length == 0)
-      prevRow = new Uint8Array(rowBytes);
-
-    var j = bufferLength;
-    switch (predictor) {
-      case 0:
-        for (var i = 0; i < rowBytes; ++i)
-          buffer[j++] = rawBytes[i];
-        break;
-      case 1:
-        for (var i = 0; i < pixBytes; ++i)
-          buffer[j++] = rawBytes[i];
-        for (; i < rowBytes; ++i) {
-          buffer[j] = (buffer[j - pixBytes] + rawBytes[i]) & 0xFF;
-          j++;
-        }
-        break;
-      case 2:
-        for (var i = 0; i < rowBytes; ++i)
-          buffer[j++] = (prevRow[i] + rawBytes[i]) & 0xFF;
-        break;
-      case 3:
-        for (var i = 0; i < pixBytes; ++i)
-          buffer[j++] = (prevRow[i] >> 1) + rawBytes[i];
-        for (; i < rowBytes; ++i) {
-          buffer[j] = (((prevRow[i] + buffer[j - pixBytes]) >> 1) +
-                           rawBytes[i]) & 0xFF;
-          j++;
-        }
-        break;
-      case 4:
-        // we need to save the up left pixels values. the simplest way
-        // is to create a new buffer
-        for (var i = 0; i < pixBytes; ++i) {
-          var up = prevRow[i];
-          var c = rawBytes[i];
-          buffer[j++] = up + c;
-        }
-        for (; i < rowBytes; ++i) {
-          var up = prevRow[i];
-          var upLeft = prevRow[i - pixBytes];
-          var left = buffer[j - pixBytes];
-          var p = left + up - upLeft;
-
-          var pa = p - left;
-          if (pa < 0)
-            pa = -pa;
-          var pb = p - up;
-          if (pb < 0)
-            pb = -pb;
-          var pc = p - upLeft;
-          if (pc < 0)
-            pc = -pc;
-
-          var c = rawBytes[i];
-          if (pa <= pb && pa <= pc)
-            buffer[j++] = left + c;
-          else if (pb <= pc)
-            buffer[j++] = up + c;
-          else
-            buffer[j++] = upLeft + c;
-        }
-        break;
-      default:
-        error('Unsupported predictor: ' + predictor);
-    }
-    this.bufferLength += rowBytes;
-  };
-
-  return PredictorStream;
-})();
-
-/**
- * Depending on the type of JPEG a JpegStream is handled in different ways. For
- * JPEG's that are supported natively such as DeviceGray and DeviceRGB the image
- * data is stored and then loaded by the browser.  For unsupported JPEG's we use
- * a library to decode these images and the stream behaves like all the other
- * DecodeStreams.
- */
-var JpegStream = (function JpegStreamClosure() {
-  function isAdobeImage(bytes) {
-    var maxBytesScanned = Math.max(bytes.length - 16, 1024);
-    // Looking for APP14, 'Adobe'
-    for (var i = 0; i < maxBytesScanned; ++i) {
-      if (bytes[i] == 0xFF && bytes[i + 1] == 0xEE &&
-          bytes[i + 2] == 0x00 && bytes[i + 3] == 0x0E &&
-          bytes[i + 4] == 0x41 && bytes[i + 5] == 0x64 &&
-          bytes[i + 6] == 0x6F && bytes[i + 7] == 0x62 &&
-          bytes[i + 8] == 0x65 && bytes[i + 9] == 0x00)
-          return true;
-      // scanning until frame tag
-      if (bytes[i] == 0xFF && bytes[i + 1] == 0xC0)
-        break;
-    }
-    return false;
-  }
-
-  function fixAdobeImage(bytes) {
-    // Inserting 'EMBED' marker after JPEG signature
-    var embedMarker = new Uint8Array([0xFF, 0xEC, 0, 8, 0x45, 0x4D, 0x42, 0x45,
-                                      0x44, 0]);
-    var newBytes = new Uint8Array(bytes.length + embedMarker.length);
-    newBytes.set(bytes, embedMarker.length);
-    // copy JPEG header
-    newBytes[0] = bytes[0];
-    newBytes[1] = bytes[1];
-    newBytes.set(embedMarker, 2);
-    return newBytes;
-  }
-
-  function JpegStream(bytes, dict, xref) {
-    // TODO: per poppler, some images may have 'junk' before that
-    // need to be removed
-    this.dict = dict;
-
-    this.isAdobeImage = false;
-    this.colorTransform = dict.get('ColorTransform') || -1;
-
-    if (isAdobeImage(bytes)) {
-      this.isAdobeImage = true;
-      bytes = fixAdobeImage(bytes);
-    }
-
-    this.bytes = bytes;
-
-    DecodeStream.call(this);
-  }
-
-  JpegStream.prototype = Object.create(DecodeStream.prototype);
-
-  JpegStream.prototype.ensureBuffer = function JpegStream_ensureBuffer(req) {
-    if (this.bufferLength)
-      return;
-    try {
-      var jpegImage = new JpegImage();
-      if (this.colorTransform != -1)
-        jpegImage.colorTransform = this.colorTransform;
-      jpegImage.parse(this.bytes);
-      var width = jpegImage.width;
-      var height = jpegImage.height;
-      var data = jpegImage.getData(width, height);
-      this.buffer = data;
-      this.bufferLength = data.length;
-    } catch (e) {
-      error('JPEG error: ' + e);
-    }
-  };
-  JpegStream.prototype.getIR = function JpegStream_getIR() {
-    return bytesToString(this.bytes);
-  };
-  JpegStream.prototype.getChar = function JpegStream_getChar() {
-    error('internal error: getChar is not valid on JpegStream');
-  };
-  /**
-   * Checks if the image can be decoded and displayed by the browser without any
-   * further processing such as color space conversions.
-   */
-  JpegStream.prototype.isNativelySupported =
-    function JpegStream_isNativelySupported(xref, res) {
-    var cs = ColorSpace.parse(this.dict.get('ColorSpace'), xref, res);
-    // when bug 674619 lands, let's check if browser can do
-    // normal cmyk and then we won't need to decode in JS
-    if (cs.name === 'DeviceGray' || cs.name === 'DeviceRGB')
-      return true;
-    if (cs.name === 'DeviceCMYK' && !this.isAdobeImage &&
-        this.colorTransform < 1)
-      return true;
-    return false;
-  };
-  /**
-   * Checks if the image can be decoded by the browser.
-   */
-  JpegStream.prototype.isNativelyDecodable =
-    function JpegStream_isNativelyDecodable(xref, res) {
-    var cs = ColorSpace.parse(this.dict.get('ColorSpace'), xref, res);
-    var numComps = cs.numComps;
-    if (numComps == 1 || numComps == 3)
-      return true;
-
-    return false;
-  };
-
-  return JpegStream;
-})();
-
-/**
- * For JPEG 2000's we use a library to decode these images and
- * the stream behaves like all the other DecodeStreams.
- */
-var JpxStream = (function JpxStreamClosure() {
-  function JpxStream(bytes, dict) {
-    this.dict = dict;
-    this.bytes = bytes;
-
-    DecodeStream.call(this);
-  }
-
-  JpxStream.prototype = Object.create(DecodeStream.prototype);
-
-  JpxStream.prototype.ensureBuffer = function JpxStream_ensureBuffer(req) {
-    if (this.bufferLength)
-      return;
-
-    var jpxImage = new JpxImage();
-    jpxImage.parse(this.bytes);
-
-    var width = jpxImage.width;
-    var height = jpxImage.height;
-    var componentsCount = jpxImage.componentsCount;
-    if (componentsCount != 1 && componentsCount != 3 && componentsCount != 4)
-      error('JPX with ' + componentsCount + ' components is not supported');
-
-    var data = new Uint8Array(width * height * componentsCount);
-
-    for (var k = 0, kk = jpxImage.tiles.length; k < kk; k++) {
-      var tileCompoments = jpxImage.tiles[k];
-      var tileWidth = tileCompoments[0].width;
-      var tileHeight = tileCompoments[0].height;
-      var tileLeft = tileCompoments[0].left;
-      var tileTop = tileCompoments[0].top;
-
-      var dataPosition, sourcePosition, data0, data1, data2, data3, rowFeed;
-      switch (componentsCount) {
-        case 1:
-          data0 = tileCompoments[0].items;
-
-          dataPosition = width * tileTop + tileLeft;
-          rowFeed = width - tileWidth;
-          sourcePosition = 0;
-          for (var j = 0; j < tileHeight; j++) {
-            for (var i = 0; i < tileWidth; i++)
-              data[dataPosition++] = data0[sourcePosition++];
-            dataPosition += rowFeed;
-          }
-          break;
-        case 3:
-          data0 = tileCompoments[0].items;
-          data1 = tileCompoments[1].items;
-          data2 = tileCompoments[2].items;
-
-          dataPosition = (width * tileTop + tileLeft) * 3;
-          rowFeed = (width - tileWidth) * 3;
-          sourcePosition = 0;
-          for (var j = 0; j < tileHeight; j++) {
-            for (var i = 0; i < tileWidth; i++) {
-              data[dataPosition++] = data0[sourcePosition];
-              data[dataPosition++] = data1[sourcePosition];
-              data[dataPosition++] = data2[sourcePosition];
-              sourcePosition++;
-            }
-            dataPosition += rowFeed;
-          }
-          break;
-        case 4:
-          data0 = tileCompoments[0].items;
-          data1 = tileCompoments[1].items;
-          data2 = tileCompoments[2].items;
-          data3 = tileCompoments[3].items;
-
-          dataPosition = (width * tileTop + tileLeft) * 4;
-          rowFeed = (width - tileWidth) * 4;
-          sourcePosition = 0;
-          for (var j = 0; j < tileHeight; j++) {
-            for (var i = 0; i < tileWidth; i++) {
-              data[dataPosition++] = data0[sourcePosition];
-              data[dataPosition++] = data1[sourcePosition];
-              data[dataPosition++] = data2[sourcePosition];
-              data[dataPosition++] = data3[sourcePosition];
-              sourcePosition++;
-            }
-            dataPosition += rowFeed;
-          }
-          break;
-      }
-    }
-
-    this.buffer = data;
-    this.bufferLength = data.length;
-  };
-  JpxStream.prototype.getChar = function JpxStream_getChar() {
-    error('internal error: getChar is not valid on JpxStream');
-  };
-
-  return JpxStream;
-})();
-
-var DecryptStream = (function DecryptStreamClosure() {
-  function DecryptStream(str, decrypt) {
-    this.str = str;
-    this.dict = str.dict;
-    this.decrypt = decrypt;
-
-    DecodeStream.call(this);
-  }
-
-  var chunkSize = 512;
-
-  DecryptStream.prototype = Object.create(DecodeStream.prototype);
-
-  DecryptStream.prototype.readBlock = function DecryptStream_readBlock() {
-    var chunk = this.str.getBytes(chunkSize);
-    if (!chunk || chunk.length == 0) {
-      this.eof = true;
-      return;
-    }
-    var decrypt = this.decrypt;
-    chunk = decrypt(chunk);
-
-    var bufferLength = this.bufferLength;
-    var i, n = chunk.length;
-    var buffer = this.ensureBuffer(bufferLength + n);
-    for (i = 0; i < n; i++)
-      buffer[bufferLength++] = chunk[i];
-    this.bufferLength = bufferLength;
-  };
-
-  return DecryptStream;
-})();
-
-var Ascii85Stream = (function Ascii85StreamClosure() {
-  function Ascii85Stream(str) {
-    this.str = str;
-    this.dict = str.dict;
-    this.input = new Uint8Array(5);
-
-    DecodeStream.call(this);
-  }
-
-  Ascii85Stream.prototype = Object.create(DecodeStream.prototype);
-
-  Ascii85Stream.prototype.readBlock = function Ascii85Stream_readBlock() {
-    var tildaCode = '~'.charCodeAt(0);
-    var zCode = 'z'.charCodeAt(0);
-    var str = this.str;
-
-    var c = str.getByte();
-    while (Lexer.isSpace(String.fromCharCode(c)))
-      c = str.getByte();
-
-    if (!c || c === tildaCode) {
-      this.eof = true;
-      return;
-    }
-
-    var bufferLength = this.bufferLength, buffer;
-
-    // special code for z
-    if (c == zCode) {
-      buffer = this.ensureBuffer(bufferLength + 4);
-      for (var i = 0; i < 4; ++i)
-        buffer[bufferLength + i] = 0;
-      this.bufferLength += 4;
-    } else {
-      var input = this.input;
-      input[0] = c;
-      for (var i = 1; i < 5; ++i) {
-        c = str.getByte();
-        while (Lexer.isSpace(String.fromCharCode(c)))
-          c = str.getByte();
-
-        input[i] = c;
-
-        if (!c || c == tildaCode)
-          break;
-      }
-      buffer = this.ensureBuffer(bufferLength + i - 1);
-      this.bufferLength += i - 1;
-
-      // partial ending;
-      if (i < 5) {
-        for (; i < 5; ++i)
-          input[i] = 0x21 + 84;
-        this.eof = true;
-      }
-      var t = 0;
-      for (var i = 0; i < 5; ++i)
-        t = t * 85 + (input[i] - 0x21);
-
-      for (var i = 3; i >= 0; --i) {
-        buffer[bufferLength + i] = t & 0xFF;
-        t >>= 8;
-      }
-    }
-  };
-
-  return Ascii85Stream;
-})();
-
-var AsciiHexStream = (function AsciiHexStreamClosure() {
-  function AsciiHexStream(str) {
-    this.str = str;
-    this.dict = str.dict;
-
-    DecodeStream.call(this);
-  }
-
-  var hexvalueMap = {
-      9: -1, // \t
-      32: -1, // space
-      48: 0,
-      49: 1,
-      50: 2,
-      51: 3,
-      52: 4,
-      53: 5,
-      54: 6,
-      55: 7,
-      56: 8,
-      57: 9,
-      65: 10,
-      66: 11,
-      67: 12,
-      68: 13,
-      69: 14,
-      70: 15,
-      97: 10,
-      98: 11,
-      99: 12,
-      100: 13,
-      101: 14,
-      102: 15
-  };
-
-  AsciiHexStream.prototype = Object.create(DecodeStream.prototype);
-
-  AsciiHexStream.prototype.readBlock = function AsciiHexStream_readBlock() {
-    var gtCode = '>'.charCodeAt(0), bytes = this.str.getBytes(), c, n,
-        decodeLength, buffer, bufferLength, i, length;
-
-    decodeLength = (bytes.length + 1) >> 1;
-    buffer = this.ensureBuffer(this.bufferLength + decodeLength);
-    bufferLength = this.bufferLength;
-
-    for (i = 0, length = bytes.length; i < length; i++) {
-      c = hexvalueMap[bytes[i]];
-      while (c == -1 && (i + 1) < length) {
-        c = hexvalueMap[bytes[++i]];
-      }
-
-      if ((i + 1) < length && (bytes[i + 1] !== gtCode)) {
-        n = hexvalueMap[bytes[++i]];
-        buffer[bufferLength++] = c * 16 + n;
-      } else {
-        // EOD marker at an odd number, behave as if a 0 followed the last
-        // digit.
-        if (bytes[i] !== gtCode) {
-          buffer[bufferLength++] = c * 16;
-        }
-      }
-    }
-
-    this.bufferLength = bufferLength;
-    this.eof = true;
-  };
-
-  return AsciiHexStream;
-})();
-
-var RunLengthStream = (function RunLengthStreamClosure() {
-  function RunLengthStream(str) {
-    this.str = str;
-    this.dict = str.dict;
-
-    DecodeStream.call(this);
-  }
-
-  RunLengthStream.prototype = Object.create(DecodeStream.prototype);
-
-  RunLengthStream.prototype.readBlock = function RunLengthStream_readBlock() {
-    // The repeatHeader has following format. The first byte defines type of run
-    // and amount of bytes to repeat/copy: n = 0 through 127 - copy next n bytes
-    // (in addition to the second byte from the header), n = 129 through 255 -
-    // duplicate the second byte from the header (257 - n) times, n = 128 - end.
-    var repeatHeader = this.str.getBytes(2);
-    if (!repeatHeader || repeatHeader.length < 2 || repeatHeader[0] == 128) {
-      this.eof = true;
-      return;
-    }
-
-    var bufferLength = this.bufferLength;
-    var n = repeatHeader[0];
-    if (n < 128) {
-      // copy n bytes
-      var buffer = this.ensureBuffer(bufferLength + n + 1);
-      buffer[bufferLength++] = repeatHeader[1];
-      if (n > 0) {
-        var source = this.str.getBytes(n);
-        buffer.set(source, bufferLength);
-        bufferLength += n;
-      }
-    } else {
-      n = 257 - n;
-      var b = repeatHeader[1];
-      var buffer = this.ensureBuffer(bufferLength + n + 1);
-      for (var i = 0; i < n; i++)
-        buffer[bufferLength++] = b;
-    }
-    this.bufferLength = bufferLength;
-  };
-
-  return RunLengthStream;
-})();
-
-var CCITTFaxStream = (function CCITTFaxStreamClosure() {
-
-  var ccittEOL = -2;
-  var twoDimPass = 0;
-  var twoDimHoriz = 1;
-  var twoDimVert0 = 2;
-  var twoDimVertR1 = 3;
-  var twoDimVertL1 = 4;
-  var twoDimVertR2 = 5;
-  var twoDimVertL2 = 6;
-  var twoDimVertR3 = 7;
-  var twoDimVertL3 = 8;
-
-  var twoDimTable = [
-    [-1, -1], [-1, -1],                   // 000000x
-    [7, twoDimVertL3],                    // 0000010
-    [7, twoDimVertR3],                    // 0000011
-    [6, twoDimVertL2], [6, twoDimVertL2], // 000010x
-    [6, twoDimVertR2], [6, twoDimVertR2], // 000011x
-    [4, twoDimPass], [4, twoDimPass],     // 0001xxx
-    [4, twoDimPass], [4, twoDimPass],
-    [4, twoDimPass], [4, twoDimPass],
-    [4, twoDimPass], [4, twoDimPass],
-    [3, twoDimHoriz], [3, twoDimHoriz],   // 001xxxx
-    [3, twoDimHoriz], [3, twoDimHoriz],
-    [3, twoDimHoriz], [3, twoDimHoriz],
-    [3, twoDimHoriz], [3, twoDimHoriz],
-    [3, twoDimHoriz], [3, twoDimHoriz],
-    [3, twoDimHoriz], [3, twoDimHoriz],
-    [3, twoDimHoriz], [3, twoDimHoriz],
-    [3, twoDimHoriz], [3, twoDimHoriz],
-    [3, twoDimVertL1], [3, twoDimVertL1], // 010xxxx
-    [3, twoDimVertL1], [3, twoDimVertL1],
-    [3, twoDimVertL1], [3, twoDimVertL1],
-    [3, twoDimVertL1], [3, twoDimVertL1],
-    [3, twoDimVertL1], [3, twoDimVertL1],
-    [3, twoDimVertL1], [3, twoDimVertL1],
-    [3, twoDimVertL1], [3, twoDimVertL1],
-    [3, twoDimVertL1], [3, twoDimVertL1],
-    [3, twoDimVertR1], [3, twoDimVertR1], // 011xxxx
-    [3, twoDimVertR1], [3, twoDimVertR1],
-    [3, twoDimVertR1], [3, twoDimVertR1],
-    [3, twoDimVertR1], [3, twoDimVertR1],
-    [3, twoDimVertR1], [3, twoDimVertR1],
-    [3, twoDimVertR1], [3, twoDimVertR1],
-    [3, twoDimVertR1], [3, twoDimVertR1],
-    [3, twoDimVertR1], [3, twoDimVertR1],
-    [1, twoDimVert0], [1, twoDimVert0],   // 1xxxxxx
-    [1, twoDimVert0], [1, twoDimVert0],
-    [1, twoDimVert0], [1, twoDimVert0],
-    [1, twoDimVert0], [1, twoDimVert0],
-    [1, twoDimVert0], [1, twoDimVert0],
-    [1, twoDimVert0], [1, twoDimVert0],
-    [1, twoDimVert0], [1, twoDimVert0],
-    [1, twoDimVert0], [1, twoDimVert0],
-    [1, twoDimVert0], [1, twoDimVert0],
-    [1, twoDimVert0], [1, twoDimVert0],
-    [1, twoDimVert0], [1, twoDimVert0],
-    [1, twoDimVert0], [1, twoDimVert0],
-    [1, twoDimVert0], [1, twoDimVert0],
-    [1, twoDimVert0], [1, twoDimVert0],
-    [1, twoDimVert0], [1, twoDimVert0],
-    [1, twoDimVert0], [1, twoDimVert0],
-    [1, twoDimVert0], [1, twoDimVert0],
-    [1, twoDimVert0], [1, twoDimVert0],
-    [1, twoDimVert0], [1, twoDimVert0],
-    [1, twoDimVert0], [1, twoDimVert0],
-    [1, twoDimVert0], [1, twoDimVert0],
-    [1, twoDimVert0], [1, twoDimVert0],
-    [1, twoDimVert0], [1, twoDimVert0],
-    [1, twoDimVert0], [1, twoDimVert0],
-    [1, twoDimVert0], [1, twoDimVert0],
-    [1, twoDimVert0], [1, twoDimVert0],
-    [1, twoDimVert0], [1, twoDimVert0],
-    [1, twoDimVert0], [1, twoDimVert0],
-    [1, twoDimVert0], [1, twoDimVert0],
-    [1, twoDimVert0], [1, twoDimVert0],
-    [1, twoDimVert0], [1, twoDimVert0],
-    [1, twoDimVert0], [1, twoDimVert0]
-  ];
-
-  var whiteTable1 = [
-    [-1, -1],                               // 00000
-    [12, ccittEOL],                         // 00001
-    [-1, -1], [-1, -1],                     // 0001x
-    [-1, -1], [-1, -1], [-1, -1], [-1, -1], // 001xx
-    [-1, -1], [-1, -1], [-1, -1], [-1, -1], // 010xx
-    [-1, -1], [-1, -1], [-1, -1], [-1, -1], // 011xx
-    [11, 1792], [11, 1792],                 // 1000x
-    [12, 1984],                             // 10010
-    [12, 2048],                             // 10011
-    [12, 2112],                             // 10100
-    [12, 2176],                             // 10101
-    [12, 2240],                             // 10110
-    [12, 2304],                             // 10111
-    [11, 1856], [11, 1856],                 // 1100x
-    [11, 1920], [11, 1920],                 // 1101x
-    [12, 2368],                             // 11100
-    [12, 2432],                             // 11101
-    [12, 2496],                             // 11110
-    [12, 2560]                              // 11111
-  ];
-
-  var whiteTable2 = [
-    [-1, -1], [-1, -1], [-1, -1], [-1, -1],     // 0000000xx
-    [8, 29], [8, 29],                           // 00000010x
-    [8, 30], [8, 30],                           // 00000011x
-    [8, 45], [8, 45],                           // 00000100x
-    [8, 46], [8, 46],                           // 00000101x
-    [7, 22], [7, 22], [7, 22], [7, 22],         // 0000011xx
-    [7, 23], [7, 23], [7, 23], [7, 23],         // 0000100xx
-    [8, 47], [8, 47],                           // 00001010x
-    [8, 48], [8, 48],                           // 00001011x
-    [6, 13], [6, 13], [6, 13], [6, 13],         // 000011xxx
-    [6, 13], [6, 13], [6, 13], [6, 13],
-    [7, 20], [7, 20], [7, 20], [7, 20],         // 0001000xx
-    [8, 33], [8, 33],                           // 00010010x
-    [8, 34], [8, 34],                           // 00010011x
-    [8, 35], [8, 35],                           // 00010100x
-    [8, 36], [8, 36],                           // 00010101x
-    [8, 37], [8, 37],                           // 00010110x
-    [8, 38], [8, 38],                           // 00010111x
-    [7, 19], [7, 19], [7, 19], [7, 19],         // 0001100xx
-    [8, 31], [8, 31],                           // 00011010x
-    [8, 32], [8, 32],                           // 00011011x
-    [6, 1], [6, 1], [6, 1], [6, 1],             // 000111xxx
-    [6, 1], [6, 1], [6, 1], [6, 1],
-    [6, 12], [6, 12], [6, 12], [6, 12],         // 001000xxx
-    [6, 12], [6, 12], [6, 12], [6, 12],
-    [8, 53], [8, 53],                           // 00100100x
-    [8, 54], [8, 54],                           // 00100101x
-    [7, 26], [7, 26], [7, 26], [7, 26],         // 0010011xx
-    [8, 39], [8, 39],                           // 00101000x
-    [8, 40], [8, 40],                           // 00101001x
-    [8, 41], [8, 41],                           // 00101010x
-    [8, 42], [8, 42],                           // 00101011x
-    [8, 43], [8, 43],                           // 00101100x
-    [8, 44], [8, 44],                           // 00101101x
-    [7, 21], [7, 21], [7, 21], [7, 21],         // 0010111xx
-    [7, 28], [7, 28], [7, 28], [7, 28],         // 0011000xx
-    [8, 61], [8, 61],                           // 00110010x
-    [8, 62], [8, 62],                           // 00110011x
-    [8, 63], [8, 63],                           // 00110100x
-    [8, 0], [8, 0],                             // 00110101x
-    [8, 320], [8, 320],                         // 00110110x
-    [8, 384], [8, 384],                         // 00110111x
-    [5, 10], [5, 10], [5, 10], [5, 10],         // 00111xxxx
-    [5, 10], [5, 10], [5, 10], [5, 10],
-    [5, 10], [5, 10], [5, 10], [5, 10],
-    [5, 10], [5, 10], [5, 10], [5, 10],
-    [5, 11], [5, 11], [5, 11], [5, 11],         // 01000xxxx
-    [5, 11], [5, 11], [5, 11], [5, 11],
-    [5, 11], [5, 11], [5, 11], [5, 11],
-    [5, 11], [5, 11], [5, 11], [5, 11],
-    [7, 27], [7, 27], [7, 27], [7, 27],         // 0100100xx
-    [8, 59], [8, 59],                           // 01001010x
-    [8, 60], [8, 60],                           // 01001011x
-    [9, 1472],                                  // 010011000
-    [9, 1536],                                  // 010011001
-    [9, 1600],                                  // 010011010
-    [9, 1728],                                  // 010011011
-    [7, 18], [7, 18], [7, 18], [7, 18],         // 0100111xx
-    [7, 24], [7, 24], [7, 24], [7, 24],         // 0101000xx
-    [8, 49], [8, 49],                           // 01010010x
-    [8, 50], [8, 50],                           // 01010011x
-    [8, 51], [8, 51],                           // 01010100x
-    [8, 52], [8, 52],                           // 01010101x
-    [7, 25], [7, 25], [7, 25], [7, 25],         // 0101011xx
-    [8, 55], [8, 55],                           // 01011000x
-    [8, 56], [8, 56],                           // 01011001x
-    [8, 57], [8, 57],                           // 01011010x
-    [8, 58], [8, 58],                           // 01011011x
-    [6, 192], [6, 192], [6, 192], [6, 192],     // 010111xxx
-    [6, 192], [6, 192], [6, 192], [6, 192],
-    [6, 1664], [6, 1664], [6, 1664], [6, 1664], // 011000xxx
-    [6, 1664], [6, 1664], [6, 1664], [6, 1664],
-    [8, 448], [8, 448],                         // 01100100x
-    [8, 512], [8, 512],                         // 01100101x
-    [9, 704],                                   // 011001100
-    [9, 768],                                   // 011001101
-    [8, 640], [8, 640],                         // 01100111x
-    [8, 576], [8, 576],                         // 01101000x
-    [9, 832],                                   // 011010010
-    [9, 896],                                   // 011010011
-    [9, 960],                                   // 011010100
-    [9, 1024],                                  // 011010101
-    [9, 1088],                                  // 011010110
-    [9, 1152],                                  // 011010111
-    [9, 1216],                                  // 011011000
-    [9, 1280],                                  // 011011001
-    [9, 1344],                                  // 011011010
-    [9, 1408],                                  // 011011011
-    [7, 256], [7, 256], [7, 256], [7, 256],     // 0110111xx
-    [4, 2], [4, 2], [4, 2], [4, 2],             // 0111xxxxx
-    [4, 2], [4, 2], [4, 2], [4, 2],
-    [4, 2], [4, 2], [4, 2], [4, 2],
-    [4, 2], [4, 2], [4, 2], [4, 2],
-    [4, 2], [4, 2], [4, 2], [4, 2],
-    [4, 2], [4, 2], [4, 2], [4, 2],
-    [4, 2], [4, 2], [4, 2], [4, 2],
-    [4, 2], [4, 2], [4, 2], [4, 2],
-    [4, 3], [4, 3], [4, 3], [4, 3],             // 1000xxxxx
-    [4, 3], [4, 3], [4, 3], [4, 3],
-    [4, 3], [4, 3], [4, 3], [4, 3],
-    [4, 3], [4, 3], [4, 3], [4, 3],
-    [4, 3], [4, 3], [4, 3], [4, 3],
-    [4, 3], [4, 3], [4, 3], [4, 3],
-    [4, 3], [4, 3], [4, 3], [4, 3],
-    [4, 3], [4, 3], [4, 3], [4, 3],
-    [5, 128], [5, 128], [5, 128], [5, 128],     // 10010xxxx
-    [5, 128], [5, 128], [5, 128], [5, 128],
-    [5, 128], [5, 128], [5, 128], [5, 128],
-    [5, 128], [5, 128], [5, 128], [5, 128],
-    [5, 8], [5, 8], [5, 8], [5, 8],             // 10011xxxx
-    [5, 8], [5, 8], [5, 8], [5, 8],
-    [5, 8], [5, 8], [5, 8], [5, 8],
-    [5, 8], [5, 8], [5, 8], [5, 8],
-    [5, 9], [5, 9], [5, 9], [5, 9],             // 10100xxxx
-    [5, 9], [5, 9], [5, 9], [5, 9],
-    [5, 9], [5, 9], [5, 9], [5, 9],
-    [5, 9], [5, 9], [5, 9], [5, 9],
-    [6, 16], [6, 16], [6, 16], [6, 16],         // 101010xxx
-    [6, 16], [6, 16], [6, 16], [6, 16],
-    [6, 17], [6, 17], [6, 17], [6, 17],         // 101011xxx
-    [6, 17], [6, 17], [6, 17], [6, 17],
-    [4, 4], [4, 4], [4, 4], [4, 4],             // 1011xxxxx
-    [4, 4], [4, 4], [4, 4], [4, 4],
-    [4, 4], [4, 4], [4, 4], [4, 4],
-    [4, 4], [4, 4], [4, 4], [4, 4],
-    [4, 4], [4, 4], [4, 4], [4, 4],
-    [4, 4], [4, 4], [4, 4], [4, 4],
-    [4, 4], [4, 4], [4, 4], [4, 4],
-    [4, 4], [4, 4], [4, 4], [4, 4],
-    [4, 5], [4, 5], [4, 5], [4, 5],             // 1100xxxxx
-    [4, 5], [4, 5], [4, 5], [4, 5],
-    [4, 5], [4, 5], [4, 5], [4, 5],
-    [4, 5], [4, 5], [4, 5], [4, 5],
-    [4, 5], [4, 5], [4, 5], [4, 5],
-    [4, 5], [4, 5], [4, 5], [4, 5],
-    [4, 5], [4, 5], [4, 5], [4, 5],
-    [4, 5], [4, 5], [4, 5], [4, 5],
-    [6, 14], [6, 14], [6, 14], [6, 14],         // 110100xxx
-    [6, 14], [6, 14], [6, 14], [6, 14],
-    [6, 15], [6, 15], [6, 15], [6, 15],         // 110101xxx
-    [6, 15], [6, 15], [6, 15], [6, 15],
-    [5, 64], [5, 64], [5, 64], [5, 64],         // 11011xxxx
-    [5, 64], [5, 64], [5, 64], [5, 64],
-    [5, 64], [5, 64], [5, 64], [5, 64],
-    [5, 64], [5, 64], [5, 64], [5, 64],
-    [4, 6], [4, 6], [4, 6], [4, 6],             // 1110xxxxx
-    [4, 6], [4, 6], [4, 6], [4, 6],
-    [4, 6], [4, 6], [4, 6], [4, 6],
-    [4, 6], [4, 6], [4, 6], [4, 6],
-    [4, 6], [4, 6], [4, 6], [4, 6],
-    [4, 6], [4, 6], [4, 6], [4, 6],
-    [4, 6], [4, 6], [4, 6], [4, 6],
-    [4, 6], [4, 6], [4, 6], [4, 6],
-    [4, 7], [4, 7], [4, 7], [4, 7],             // 1111xxxxx
-    [4, 7], [4, 7], [4, 7], [4, 7],
-    [4, 7], [4, 7], [4, 7], [4, 7],
-    [4, 7], [4, 7], [4, 7], [4, 7],
-    [4, 7], [4, 7], [4, 7], [4, 7],
-    [4, 7], [4, 7], [4, 7], [4, 7],
-    [4, 7], [4, 7], [4, 7], [4, 7],
-    [4, 7], [4, 7], [4, 7], [4, 7]
-  ];
-
-  var blackTable1 = [
-    [-1, -1], [-1, -1],                             // 000000000000x
-    [12, ccittEOL], [12, ccittEOL],                 // 000000000001x
-    [-1, -1], [-1, -1], [-1, -1], [-1, -1],         // 00000000001xx
-    [-1, -1], [-1, -1], [-1, -1], [-1, -1],         // 00000000010xx
-    [-1, -1], [-1, -1], [-1, -1], [-1, -1],         // 00000000011xx
-    [-1, -1], [-1, -1], [-1, -1], [-1, -1],         // 00000000100xx
-    [-1, -1], [-1, -1], [-1, -1], [-1, -1],         // 00000000101xx
-    [-1, -1], [-1, -1], [-1, -1], [-1, -1],         // 00000000110xx
-    [-1, -1], [-1, -1], [-1, -1], [-1, -1],         // 00000000111xx
-    [11, 1792], [11, 1792], [11, 1792], [11, 1792], // 00000001000xx
-    [12, 1984], [12, 1984],                         // 000000010010x
-    [12, 2048], [12, 2048],                         // 000000010011x
-    [12, 2112], [12, 2112],                         // 000000010100x
-    [12, 2176], [12, 2176],                         // 000000010101x
-    [12, 2240], [12, 2240],                         // 000000010110x
-    [12, 2304], [12, 2304],                         // 000000010111x
-    [11, 1856], [11, 1856], [11, 1856], [11, 1856], // 00000001100xx
-    [11, 1920], [11, 1920], [11, 1920], [11, 1920], // 00000001101xx
-    [12, 2368], [12, 2368],                         // 000000011100x
-    [12, 2432], [12, 2432],                         // 000000011101x
-    [12, 2496], [12, 2496],                         // 000000011110x
-    [12, 2560], [12, 2560],                         // 000000011111x
-    [10, 18], [10, 18], [10, 18], [10, 18],         // 0000001000xxx
-    [10, 18], [10, 18], [10, 18], [10, 18],
-    [12, 52], [12, 52],                             // 000000100100x
-    [13, 640],                                      // 0000001001010
-    [13, 704],                                      // 0000001001011
-    [13, 768],                                      // 0000001001100
-    [13, 832],                                      // 0000001001101
-    [12, 55], [12, 55],                             // 000000100111x
-    [12, 56], [12, 56],                             // 000000101000x
-    [13, 1280],                                     // 0000001010010
-    [13, 1344],                                     // 0000001010011
-    [13, 1408],                                     // 0000001010100
-    [13, 1472],                                     // 0000001010101
-    [12, 59], [12, 59],                             // 000000101011x
-    [12, 60], [12, 60],                             // 000000101100x
-    [13, 1536],                                     // 0000001011010
-    [13, 1600],                                     // 0000001011011
-    [11, 24], [11, 24], [11, 24], [11, 24],         // 00000010111xx
-    [11, 25], [11, 25], [11, 25], [11, 25],         // 00000011000xx
-    [13, 1664],                                     // 0000001100100
-    [13, 1728],                                     // 0000001100101
-    [12, 320], [12, 320],                           // 000000110011x
-    [12, 384], [12, 384],                           // 000000110100x
-    [12, 448], [12, 448],                           // 000000110101x
-    [13, 512],                                      // 0000001101100
-    [13, 576],                                      // 0000001101101
-    [12, 53], [12, 53],                             // 000000110111x
-    [12, 54], [12, 54],                             // 000000111000x
-    [13, 896],                                      // 0000001110010
-    [13, 960],                                      // 0000001110011
-    [13, 1024],                                     // 0000001110100
-    [13, 1088],                                     // 0000001110101
-    [13, 1152],                                     // 0000001110110
-    [13, 1216],                                     // 0000001110111
-    [10, 64], [10, 64], [10, 64], [10, 64],         // 0000001111xxx
-    [10, 64], [10, 64], [10, 64], [10, 64]
-  ];
-
-  var blackTable2 = [
-    [8, 13], [8, 13], [8, 13], [8, 13],     // 00000100xxxx
-    [8, 13], [8, 13], [8, 13], [8, 13],
-    [8, 13], [8, 13], [8, 13], [8, 13],
-    [8, 13], [8, 13], [8, 13], [8, 13],
-    [11, 23], [11, 23],                     // 00000101000x
-    [12, 50],                               // 000001010010
-    [12, 51],                               // 000001010011
-    [12, 44],                               // 000001010100
-    [12, 45],                               // 000001010101
-    [12, 46],                               // 000001010110
-    [12, 47],                               // 000001010111
-    [12, 57],                               // 000001011000
-    [12, 58],                               // 000001011001
-    [12, 61],                               // 000001011010
-    [12, 256],                              // 000001011011
-    [10, 16], [10, 16], [10, 16], [10, 16], // 0000010111xx
-    [10, 17], [10, 17], [10, 17], [10, 17], // 0000011000xx
-    [12, 48],                               // 000001100100
-    [12, 49],                               // 000001100101
-    [12, 62],                               // 000001100110
-    [12, 63],                               // 000001100111
-    [12, 30],                               // 000001101000
-    [12, 31],                               // 000001101001
-    [12, 32],                               // 000001101010
-    [12, 33],                               // 000001101011
-    [12, 40],                               // 000001101100
-    [12, 41],                               // 000001101101
-    [11, 22], [11, 22],                     // 00000110111x
-    [8, 14], [8, 14], [8, 14], [8, 14],     // 00000111xxxx
-    [8, 14], [8, 14], [8, 14], [8, 14],
-    [8, 14], [8, 14], [8, 14], [8, 14],
-    [8, 14], [8, 14], [8, 14], [8, 14],
-    [7, 10], [7, 10], [7, 10], [7, 10],     // 0000100xxxxx
-    [7, 10], [7, 10], [7, 10], [7, 10],
-    [7, 10], [7, 10], [7, 10], [7, 10],
-    [7, 10], [7, 10], [7, 10], [7, 10],
-    [7, 10], [7, 10], [7, 10], [7, 10],
-    [7, 10], [7, 10], [7, 10], [7, 10],
-    [7, 10], [7, 10], [7, 10], [7, 10],
-    [7, 10], [7, 10], [7, 10], [7, 10],
-    [7, 11], [7, 11], [7, 11], [7, 11],     // 0000101xxxxx
-    [7, 11], [7, 11], [7, 11], [7, 11],
-    [7, 11], [7, 11], [7, 11], [7, 11],
-    [7, 11], [7, 11], [7, 11], [7, 11],
-    [7, 11], [7, 11], [7, 11], [7, 11],
-    [7, 11], [7, 11], [7, 11], [7, 11],
-    [7, 11], [7, 11], [7, 11], [7, 11],
-    [7, 11], [7, 11], [7, 11], [7, 11],
-    [9, 15], [9, 15], [9, 15], [9, 15],     // 000011000xxx
-    [9, 15], [9, 15], [9, 15], [9, 15],
-    [12, 128],                              // 000011001000
-    [12, 192],                              // 000011001001
-    [12, 26],                               // 000011001010
-    [12, 27],                               // 000011001011
-    [12, 28],                               // 000011001100
-    [12, 29],                               // 000011001101
-    [11, 19], [11, 19],                     // 00001100111x
-    [11, 20], [11, 20],                     // 00001101000x
-    [12, 34],                               // 000011010010
-    [12, 35],                               // 000011010011
-    [12, 36],                               // 000011010100
-    [12, 37],                               // 000011010101
-    [12, 38],                               // 000011010110
-    [12, 39],                               // 000011010111
-    [11, 21], [11, 21],                     // 00001101100x
-    [12, 42],                               // 000011011010
-    [12, 43],                               // 000011011011
-    [10, 0], [10, 0], [10, 0], [10, 0],     // 0000110111xx
-    [7, 12], [7, 12], [7, 12], [7, 12],     // 0000111xxxxx
-    [7, 12], [7, 12], [7, 12], [7, 12],
-    [7, 12], [7, 12], [7, 12], [7, 12],
-    [7, 12], [7, 12], [7, 12], [7, 12],
-    [7, 12], [7, 12], [7, 12], [7, 12],
-    [7, 12], [7, 12], [7, 12], [7, 12],
-    [7, 12], [7, 12], [7, 12], [7, 12],
-    [7, 12], [7, 12], [7, 12], [7, 12]
-  ];
-
-  var blackTable3 = [
-    [-1, -1], [-1, -1], [-1, -1], [-1, -1], // 0000xx
-    [6, 9],                                 // 000100
-    [6, 8],                                 // 000101
-    [5, 7], [5, 7],                         // 00011x
-    [4, 6], [4, 6], [4, 6], [4, 6],         // 0010xx
-    [4, 5], [4, 5], [4, 5], [4, 5],         // 0011xx
-    [3, 1], [3, 1], [3, 1], [3, 1],         // 010xxx
-    [3, 1], [3, 1], [3, 1], [3, 1],
-    [3, 4], [3, 4], [3, 4], [3, 4],         // 011xxx
-    [3, 4], [3, 4], [3, 4], [3, 4],
-    [2, 3], [2, 3], [2, 3], [2, 3],         // 10xxxx
-    [2, 3], [2, 3], [2, 3], [2, 3],
-    [2, 3], [2, 3], [2, 3], [2, 3],
-    [2, 3], [2, 3], [2, 3], [2, 3],
-    [2, 2], [2, 2], [2, 2], [2, 2],         // 11xxxx
-    [2, 2], [2, 2], [2, 2], [2, 2],
-    [2, 2], [2, 2], [2, 2], [2, 2],
-    [2, 2], [2, 2], [2, 2], [2, 2]
-  ];
-
-  function CCITTFaxStream(str, params) {
-    this.str = str;
-    this.dict = str.dict;
-
-    params = params || new Dict();
-
-    this.encoding = params.get('K') || 0;
-    this.eoline = params.get('EndOfLine') || false;
-    this.byteAlign = params.get('EncodedByteAlign') || false;
-    this.columns = params.get('Columns') || 1728;
-    this.rows = params.get('Rows') || 0;
-    var eoblock = params.get('EndOfBlock');
-    if (eoblock == null)
-      eoblock = true;
-    this.eoblock = eoblock;
-    this.black = params.get('BlackIs1') || false;
-
-    this.codingLine = new Uint32Array(this.columns + 1);
-    this.refLine = new Uint32Array(this.columns + 2);
-
-    this.codingLine[0] = this.columns;
-    this.codingPos = 0;
-
-    this.row = 0;
-    this.nextLine2D = this.encoding < 0;
-    this.inputBits = 0;
-    this.inputBuf = 0;
-    this.outputBits = 0;
-    this.buf = EOF;
-
-    var code1;
-    while ((code1 = this.lookBits(12)) == 0) {
-      this.eatBits(1);
-    }
-    if (code1 == 1) {
-      this.eatBits(12);
-    }
-    if (this.encoding > 0) {
-      this.nextLine2D = !this.lookBits(1);
-      this.eatBits(1);
-    }
-
-    DecodeStream.call(this);
-  }
-
-  CCITTFaxStream.prototype = Object.create(DecodeStream.prototype);
-
-  CCITTFaxStream.prototype.readBlock = function CCITTFaxStream_readBlock() {
-    while (!this.eof) {
-      var c = this.lookChar();
-      this.buf = EOF;
-      this.ensureBuffer(this.bufferLength + 1);
-      this.buffer[this.bufferLength++] = c;
-    }
-  };
-
-  CCITTFaxStream.prototype.addPixels =
-    function ccittFaxStreamAddPixels(a1, blackPixels) {
-    var codingLine = this.codingLine;
-    var codingPos = this.codingPos;
-
-    if (a1 > codingLine[codingPos]) {
-      if (a1 > this.columns) {
-        info('row is wrong length');
-        this.err = true;
-        a1 = this.columns;
-      }
-      if ((codingPos & 1) ^ blackPixels) {
-        ++codingPos;
-      }
-
-      codingLine[codingPos] = a1;
-    }
-    this.codingPos = codingPos;
-  };
-
-  CCITTFaxStream.prototype.addPixelsNeg =
-    function ccittFaxStreamAddPixelsNeg(a1, blackPixels) {
-    var codingLine = this.codingLine;
-    var codingPos = this.codingPos;
-
-    if (a1 > codingLine[codingPos]) {
-      if (a1 > this.columns) {
-        info('row is wrong length');
-        this.err = true;
-        a1 = this.columns;
-      }
-      if ((codingPos & 1) ^ blackPixels)
-        ++codingPos;
-
-      codingLine[codingPos] = a1;
-    } else if (a1 < codingLine[codingPos]) {
-      if (a1 < 0) {
-        info('invalid code');
-        this.err = true;
-        a1 = 0;
-      }
-      while (codingPos > 0 && a1 < codingLine[codingPos - 1])
-        --codingPos;
-      codingLine[codingPos] = a1;
-    }
-
-    this.codingPos = codingPos;
-  };
-
-  CCITTFaxStream.prototype.lookChar = function CCITTFaxStream_lookChar() {
-    if (this.buf != EOF)
-      return this.buf;
-
-    var refLine = this.refLine;
-    var codingLine = this.codingLine;
-    var columns = this.columns;
-
-    var refPos, blackPixels, bits;
-
-    if (this.outputBits == 0) {
-      if (this.eof)
-        return null;
-
-      this.err = false;
-
-      var code1, code2, code3;
-      if (this.nextLine2D) {
-        for (var i = 0; codingLine[i] < columns; ++i)
-          refLine[i] = codingLine[i];
-
-        refLine[i++] = columns;
-        refLine[i] = columns;
-        codingLine[0] = 0;
-        this.codingPos = 0;
-        refPos = 0;
-        blackPixels = 0;
-
-        while (codingLine[this.codingPos] < columns) {
-          code1 = this.getTwoDimCode();
-          switch (code1) {
-            case twoDimPass:
-              this.addPixels(refLine[refPos + 1], blackPixels);
-              if (refLine[refPos + 1] < columns)
-                refPos += 2;
-              break;
-            case twoDimHoriz:
-              code1 = code2 = 0;
-              if (blackPixels) {
-                do {
-                  code1 += (code3 = this.getBlackCode());
-                } while (code3 >= 64);
-                do {
-                  code2 += (code3 = this.getWhiteCode());
-                } while (code3 >= 64);
-              } else {
-                do {
-                  code1 += (code3 = this.getWhiteCode());
-                } while (code3 >= 64);
-                do {
-                  code2 += (code3 = this.getBlackCode());
-                } while (code3 >= 64);
-              }
-              this.addPixels(codingLine[this.codingPos] +
-                             code1, blackPixels);
-              if (codingLine[this.codingPos] < columns) {
-                this.addPixels(codingLine[this.codingPos] + code2,
-                               blackPixels ^ 1);
-              }
-              while (refLine[refPos] <= codingLine[this.codingPos] &&
-                     refLine[refPos] < columns) {
-                refPos += 2;
-              }
-              break;
-            case twoDimVertR3:
-              this.addPixels(refLine[refPos] + 3, blackPixels);
-              blackPixels ^= 1;
-              if (codingLine[this.codingPos] < columns) {
-                ++refPos;
-                while (refLine[refPos] <= codingLine[this.codingPos] &&
-                       refLine[refPos] < columns)
-                  refPos += 2;
-              }
-              break;
-            case twoDimVertR2:
-              this.addPixels(refLine[refPos] + 2, blackPixels);
-              blackPixels ^= 1;
-              if (codingLine[this.codingPos] < columns) {
-                ++refPos;
-                while (refLine[refPos] <= codingLine[this.codingPos] &&
-                       refLine[refPos] < columns) {
-                  refPos += 2;
-                }
-              }
-              break;
-            case twoDimVertR1:
-              this.addPixels(refLine[refPos] + 1, blackPixels);
-              blackPixels ^= 1;
-              if (codingLine[this.codingPos] < columns) {
-                ++refPos;
-                while (refLine[refPos] <= codingLine[this.codingPos] &&
-                       refLine[refPos] < columns)
-                  refPos += 2;
-              }
-              break;
-            case twoDimVert0:
-              this.addPixels(refLine[refPos], blackPixels);
-              blackPixels ^= 1;
-              if (codingLine[this.codingPos] < columns) {
-                ++refPos;
-                while (refLine[refPos] <= codingLine[this.codingPos] &&
-                       refLine[refPos] < columns)
-                  refPos += 2;
-              }
-              break;
-            case twoDimVertL3:
-              this.addPixelsNeg(refLine[refPos] - 3, blackPixels);
-              blackPixels ^= 1;
-              if (codingLine[this.codingPos] < columns) {
-                if (refPos > 0)
-                  --refPos;
-                else
-                  ++refPos;
-                while (refLine[refPos] <= codingLine[this.codingPos] &&
-                       refLine[refPos] < columns)
-                  refPos += 2;
-              }
-              break;
-            case twoDimVertL2:
-              this.addPixelsNeg(refLine[refPos] - 2, blackPixels);
-              blackPixels ^= 1;
-              if (codingLine[this.codingPos] < columns) {
-                if (refPos > 0)
-                  --refPos;
-                else
-                  ++refPos;
-                while (refLine[refPos] <= codingLine[this.codingPos] &&
-                       refLine[refPos] < columns)
-                  refPos += 2;
-              }
-              break;
-            case twoDimVertL1:
-              this.addPixelsNeg(refLine[refPos] - 1, blackPixels);
-              blackPixels ^= 1;
-              if (codingLine[this.codingPos] < columns) {
-                if (refPos > 0)
-                  --refPos;
-                else
-                  ++refPos;
-
-                while (refLine[refPos] <= codingLine[this.codingPos] &&
-                       refLine[refPos] < columns)
-                  refPos += 2;
-              }
-              break;
-            case EOF:
-              this.addPixels(columns, 0);
-              this.eof = true;
-              break;
-            default:
-              info('bad 2d code');
-              this.addPixels(columns, 0);
-              this.err = true;
-          }
-        }
-      } else {
-        codingLine[0] = 0;
-        this.codingPos = 0;
-        blackPixels = 0;
-        while (codingLine[this.codingPos] < columns) {
-          code1 = 0;
-          if (blackPixels) {
-            do {
-              code1 += (code3 = this.getBlackCode());
-            } while (code3 >= 64);
-          } else {
-            do {
-              code1 += (code3 = this.getWhiteCode());
-            } while (code3 >= 64);
-          }
-          this.addPixels(codingLine[this.codingPos] + code1, blackPixels);
-          blackPixels ^= 1;
-        }
-      }
-
-      if (this.byteAlign)
-        this.inputBits &= ~7;
-
-      var gotEOL = false;
-
-      if (!this.eoblock && this.row == this.rows - 1) {
-        this.eof = true;
-      } else {
-        code1 = this.lookBits(12);
-        while (code1 == 0) {
-          this.eatBits(1);
-          code1 = this.lookBits(12);
-        }
-        if (code1 == 1) {
-          this.eatBits(12);
-          gotEOL = true;
-        } else if (code1 == EOF) {
-          this.eof = true;
-        }
-      }
-
-      if (!this.eof && this.encoding > 0) {
-        this.nextLine2D = !this.lookBits(1);
-        this.eatBits(1);
-      }
-
-      if (this.eoblock && gotEOL) {
-        code1 = this.lookBits(12);
-        if (code1 == 1) {
-          this.eatBits(12);
-          if (this.encoding > 0) {
-            this.lookBits(1);
-            this.eatBits(1);
-          }
-          if (this.encoding >= 0) {
-            for (var i = 0; i < 4; ++i) {
-              code1 = this.lookBits(12);
-              if (code1 != 1)
-                info('bad rtc code: ' + code1);
-              this.eatBits(12);
-              if (this.encoding > 0) {
-                this.lookBits(1);
-                this.eatBits(1);
-              }
-            }
-          }
-          this.eof = true;
-        }
-      } else if (this.err && this.eoline) {
-        while (true) {
-          code1 = this.lookBits(13);
-          if (code1 == EOF) {
-            this.eof = true;
-            return null;
-          }
-          if ((code1 >> 1) == 1) {
-            break;
-          }
-          this.eatBits(1);
-        }
-        this.eatBits(12);
-        if (this.encoding > 0) {
-          this.eatBits(1);
-          this.nextLine2D = !(code1 & 1);
-        }
-      }
-
-      if (codingLine[0] > 0)
-        this.outputBits = codingLine[this.codingPos = 0];
-      else
-        this.outputBits = codingLine[this.codingPos = 1];
-      this.row++;
-    }
-
-    if (this.outputBits >= 8) {
-      this.buf = (this.codingPos & 1) ? 0 : 0xFF;
-      this.outputBits -= 8;
-      if (this.outputBits == 0 && codingLine[this.codingPos] < columns) {
-        this.codingPos++;
-        this.outputBits = (codingLine[this.codingPos] -
-                           codingLine[this.codingPos - 1]);
-      }
-    } else {
-      var bits = 8;
-      this.buf = 0;
-      do {
-        if (this.outputBits > bits) {
-          this.buf <<= bits;
-          if (!(this.codingPos & 1)) {
-            this.buf |= 0xFF >> (8 - bits);
-          }
-          this.outputBits -= bits;
-          bits = 0;
-        } else {
-          this.buf <<= this.outputBits;
-          if (!(this.codingPos & 1)) {
-            this.buf |= 0xFF >> (8 - this.outputBits);
-          }
-          bits -= this.outputBits;
-          this.outputBits = 0;
-          if (codingLine[this.codingPos] < columns) {
-            this.codingPos++;
-            this.outputBits = (codingLine[this.codingPos] -
-                               codingLine[this.codingPos - 1]);
-          } else if (bits > 0) {
-            this.buf <<= bits;
-            bits = 0;
-          }
-        }
-      } while (bits);
-    }
-    if (this.black) {
-      this.buf ^= 0xFF;
-    }
-    return this.buf;
-  };
-
-  // This functions returns the code found from the table.
-  // The start and end parameters set the boundaries for searching the table.
-  // The limit parameter is optional. Function returns an array with three
-  // values. The first array element indicates whether a valid code is being
-  // returned. The second array element is the actual code. The third array
-  // element indicates whether EOF was reached.
-  CCITTFaxStream.prototype.findTableCode =
-    function ccittFaxStreamFindTableCode(start, end, table, limit) {
-
-    var limitValue = limit || 0;
-    for (var i = start; i <= end; ++i) {
-      var code = this.lookBits(i);
-      if (code == EOF)
-        return [true, 1, false];
-      if (i < end)
-        code <<= end - i;
-      if (!limitValue || code >= limitValue) {
-        var p = table[code - limitValue];
-        if (p[0] == i) {
-          this.eatBits(i);
-          return [true, p[1], true];
-        }
-      }
-    }
-    return [false, 0, false];
-  };
-
-  CCITTFaxStream.prototype.getTwoDimCode =
-    function ccittFaxStreamGetTwoDimCode() {
-
-    var code = 0;
-    var p;
-    if (this.eoblock) {
-      code = this.lookBits(7);
-      p = twoDimTable[code];
-      if (p && p[0] > 0) {
-        this.eatBits(p[0]);
-        return p[1];
-      }
-    } else {
-      var result = this.findTableCode(1, 7, twoDimTable);
-      if (result[0] && result[2])
-        return result[1];
-    }
-    info('Bad two dim code');
-    return EOF;
-  };
-
-  CCITTFaxStream.prototype.getWhiteCode =
-    function ccittFaxStreamGetWhiteCode() {
-
-    var code = 0;
-    var p;
-    var n;
-    if (this.eoblock) {
-      code = this.lookBits(12);
-      if (code == EOF)
-        return 1;
-
-      if ((code >> 5) == 0)
-        p = whiteTable1[code];
-      else
-        p = whiteTable2[code >> 3];
-
-      if (p[0] > 0) {
-        this.eatBits(p[0]);
-        return p[1];
-      }
-    } else {
-      var result = this.findTableCode(1, 9, whiteTable2);
-      if (result[0])
-        return result[1];
-
-      result = this.findTableCode(11, 12, whiteTable1);
-      if (result[0])
-        return result[1];
-    }
-    info('bad white code');
-    this.eatBits(1);
-    return 1;
-  };
-
-  CCITTFaxStream.prototype.getBlackCode =
-    function ccittFaxStreamGetBlackCode() {
-
-    var code, p;
-    if (this.eoblock) {
-      code = this.lookBits(13);
-      if (code == EOF)
-        return 1;
-      if ((code >> 7) == 0)
-        p = blackTable1[code];
-      else if ((code >> 9) == 0 && (code >> 7) != 0)
-        p = blackTable2[(code >> 1) - 64];
-      else
-        p = blackTable3[code >> 7];
-
-      if (p[0] > 0) {
-        this.eatBits(p[0]);
-        return p[1];
-      }
-    } else {
-      var result = this.findTableCode(2, 6, blackTable3);
-      if (result[0])
-        return result[1];
-
-      result = this.findTableCode(7, 12, blackTable2, 64);
-      if (result[0])
-        return result[1];
-
-      result = this.findTableCode(10, 13, blackTable1);
-      if (result[0])
-        return result[1];
-    }
-    info('bad black code');
-    this.eatBits(1);
-    return 1;
-  };
-
-  CCITTFaxStream.prototype.lookBits = function CCITTFaxStream_lookBits(n) {
-    var c;
-    while (this.inputBits < n) {
-      if ((c = this.str.getByte()) == null) {
-        if (this.inputBits == 0)
-          return EOF;
-        return ((this.inputBuf << (n - this.inputBits)) &
-                (0xFFFF >> (16 - n)));
-      }
-      this.inputBuf = (this.inputBuf << 8) + c;
-      this.inputBits += 8;
-    }
-    return (this.inputBuf >> (this.inputBits - n)) & (0xFFFF >> (16 - n));
-  };
-
-  CCITTFaxStream.prototype.eatBits = function CCITTFaxStream_eatBits(n) {
-    if ((this.inputBits -= n) < 0)
-      this.inputBits = 0;
-  };
-
-  return CCITTFaxStream;
-})();
-
-var LZWStream = (function LZWStreamClosure() {
-  function LZWStream(str, earlyChange) {
-    this.str = str;
-    this.dict = str.dict;
-    this.cachedData = 0;
-    this.bitsCached = 0;
-
-    var maxLzwDictionarySize = 4096;
-    var lzwState = {
-      earlyChange: earlyChange,
-      codeLength: 9,
-      nextCode: 258,
-      dictionaryValues: new Uint8Array(maxLzwDictionarySize),
-      dictionaryLengths: new Uint16Array(maxLzwDictionarySize),
-      dictionaryPrevCodes: new Uint16Array(maxLzwDictionarySize),
-      currentSequence: new Uint8Array(maxLzwDictionarySize),
-      currentSequenceLength: 0
-    };
-    for (var i = 0; i < 256; ++i) {
-      lzwState.dictionaryValues[i] = i;
-      lzwState.dictionaryLengths[i] = 1;
-    }
-    this.lzwState = lzwState;
-
-    DecodeStream.call(this);
-  }
-
-  LZWStream.prototype = Object.create(DecodeStream.prototype);
-
-  LZWStream.prototype.readBits = function LZWStream_readBits(n) {
-    var bitsCached = this.bitsCached;
-    var cachedData = this.cachedData;
-    while (bitsCached < n) {
-      var c = this.str.getByte();
-      if (c == null) {
-        this.eof = true;
-        return null;
-      }
-      cachedData = (cachedData << 8) | c;
-      bitsCached += 8;
-    }
-    this.bitsCached = (bitsCached -= n);
-    this.cachedData = cachedData;
-    this.lastCode = null;
-    return (cachedData >>> bitsCached) & ((1 << n) - 1);
-  };
-
-  LZWStream.prototype.readBlock = function LZWStream_readBlock() {
-    var blockSize = 512;
-    var estimatedDecodedSize = blockSize * 2, decodedSizeDelta = blockSize;
-    var i, j, q;
-
-    var lzwState = this.lzwState;
-    if (!lzwState)
-      return; // eof was found
-
-    var earlyChange = lzwState.earlyChange;
-    var nextCode = lzwState.nextCode;
-    var dictionaryValues = lzwState.dictionaryValues;
-    var dictionaryLengths = lzwState.dictionaryLengths;
-    var dictionaryPrevCodes = lzwState.dictionaryPrevCodes;
-    var codeLength = lzwState.codeLength;
-    var prevCode = lzwState.prevCode;
-    var currentSequence = lzwState.currentSequence;
-    var currentSequenceLength = lzwState.currentSequenceLength;
-
-    var decodedLength = 0;
-    var currentBufferLength = this.bufferLength;
-    var buffer = this.ensureBuffer(this.bufferLength + estimatedDecodedSize);
-
-    for (i = 0; i < blockSize; i++) {
-      var code = this.readBits(codeLength);
-      var hasPrev = currentSequenceLength > 0;
-      if (code < 256) {
-        currentSequence[0] = code;
-        currentSequenceLength = 1;
-      } else if (code >= 258) {
-        if (code < nextCode) {
-          currentSequenceLength = dictionaryLengths[code];
-          for (j = currentSequenceLength - 1, q = code; j >= 0; j--) {
-            currentSequence[j] = dictionaryValues[q];
-            q = dictionaryPrevCodes[q];
-          }
-        } else {
-          currentSequence[currentSequenceLength++] = currentSequence[0];
-        }
-      } else if (code == 256) {
-        codeLength = 9;
-        nextCode = 258;
-        currentSequenceLength = 0;
-        continue;
-      } else {
-        this.eof = true;
-        delete this.lzwState;
-        break;
-      }
-
-      if (hasPrev) {
-        dictionaryPrevCodes[nextCode] = prevCode;
-        dictionaryLengths[nextCode] = dictionaryLengths[prevCode] + 1;
-        dictionaryValues[nextCode] = currentSequence[0];
-        nextCode++;
-        codeLength = (nextCode + earlyChange) & (nextCode + earlyChange - 1) ?
-          codeLength : Math.min(Math.log(nextCode + earlyChange) /
-          0.6931471805599453 + 1, 12) | 0;
-      }
-      prevCode = code;
-
-      decodedLength += currentSequenceLength;
-      if (estimatedDecodedSize < decodedLength) {
-        do {
-          estimatedDecodedSize += decodedSizeDelta;
-        } while (estimatedDecodedSize < decodedLength);
-        buffer = this.ensureBuffer(this.bufferLength + estimatedDecodedSize);
-      }
-      for (j = 0; j < currentSequenceLength; j++)
-        buffer[currentBufferLength++] = currentSequence[j];
-    }
-    lzwState.nextCode = nextCode;
-    lzwState.codeLength = codeLength;
-    lzwState.prevCode = prevCode;
-    lzwState.currentSequenceLength = currentSequenceLength;
-
-    this.bufferLength = currentBufferLength;
-  };
-
-  return LZWStream;
-})();
-
-
-/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
-
-'use strict';
-
-function MessageHandler(name, comObj) {
-  this.name = name;
-  this.comObj = comObj;
-  this.callbackIndex = 1;
-  var callbacks = this.callbacks = {};
-  var ah = this.actionHandler = {};
-
-  ah['console_log'] = [function ahConsoleLog(data) {
-    console.log.apply(console, data);
-  }];
-  ah['console_error'] = [function ahConsoleError(data) {
-    console.error.apply(console, data);
-  }];
-  ah['_warn'] = [function ah_Warn(data) {
-    warn(data);
-  }];
-
-  comObj.onmessage = function messageHandlerComObjOnMessage(event) {
-    var data = event.data;
-    if (data.isReply) {
-      var callbackId = data.callbackId;
-      if (data.callbackId in callbacks) {
-        var callback = callbacks[callbackId];
-        delete callbacks[callbackId];
-        callback(data.data);
-      } else {
-        error('Cannot resolve callback ' + callbackId);
-      }
-    } else if (data.action in ah) {
-      var action = ah[data.action];
-      if (data.callbackId) {
-        var promise = new Promise();
-        promise.then(function(resolvedData) {
-          comObj.postMessage({
-            isReply: true,
-            callbackId: data.callbackId,
-            data: resolvedData
-          });
-        });
-        action[0].call(action[1], data.data, promise);
-      } else {
-        action[0].call(action[1], data.data);
-      }
-    } else {
-      error('Unkown action from worker: ' + data.action);
-    }
-  };
-}
-
-MessageHandler.prototype = {
-  on: function messageHandlerOn(actionName, handler, scope) {
-    var ah = this.actionHandler;
-    if (ah[actionName]) {
-      error('There is already an actionName called "' + actionName + '"');
-    }
-    ah[actionName] = [handler, scope];
-  },
-  /**
-   * Sends a message to the comObj to invoke the action with the supplied data.
-   * @param {String} actionName Action to call.
-   * @param {JSON} data JSON data to send.
-   * @param {function} [callback] Optional callback that will handle a reply.
-   */
-  send: function messageHandlerSend(actionName, data, callback) {
-    var message = {
-      action: actionName,
-      data: data
-    };
-    if (callback) {
-      var callbackId = this.callbackIndex++;
-      this.callbacks[callbackId] = callback;
-      message.callbackId = callbackId;
-    }
-    this.comObj.postMessage(message);
-  }
-};
-
-var WorkerMessageHandler = {
-  setup: function wphSetup(handler) {
-    var pdfModel = null;
-
-    handler.on('test', function wphSetupTest(data) {
-      handler.send('test', data instanceof Uint8Array);
-    });
-
-    handler.on('GetDocRequest', function wphSetupDoc(data) {
-      // Create only the model of the PDFDoc, which is enough for
-      // processing the content of the pdf.
-      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('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
-      // result back to the main thread.
-      var gfx = new CanvasGraphics(null);
-
-      var start = Date.now();
-
-      var dependency = [];
-      var operatorList = null;
-      try {
-        var page = pdfModel.getPage(pageNum);
-        // Pre compile the pdf page and fetch the fonts/images.
-        operatorList = page.getOperatorList(handler, dependency);
-      } catch (e) {
-        var minimumStackMessage =
-            'worker.js: while trying to getPage() and getOperatorList()';
-
-        // Turn the error into an obj that can be serialized
-        if (typeof e === 'string') {
-          e = {
-            message: e,
-            stack: minimumStackMessage
-          };
-        } else if (typeof e === 'object') {
-          e = {
-            message: e.message || e.toString(),
-            stack: e.stack || minimumStackMessage
-          };
-        } else {
-          e = {
-            message: 'Unknown exception type: ' + (typeof e),
-            stack: minimumStackMessage
-          };
-        }
-
-        handler.send('PageError', {
-          pageNum: pageNum,
-          error: e
-        });
-        return;
-      }
-
-      console.log('page=%d - getOperatorList: time=%dms, len=%d', pageNum,
-                              Date.now() - start, operatorList.fnArray.length);
-
-      // Filter the dependecies for fonts.
-      var fonts = {};
-      for (var i = 0, ii = dependency.length; i < ii; i++) {
-        var dep = dependency[i];
-        if (dep.indexOf('font_') == 0) {
-          fonts[dep] = true;
-        }
-      }
-      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);
-    });
-  }
-};
-
-var consoleTimer = {};
-
-var workerConsole = {
-  log: function log() {
-    var args = Array.prototype.slice.call(arguments);
-    postMessage({
-      action: 'console_log',
-      data: args
-    });
-  },
-
-  error: function error() {
-    var args = Array.prototype.slice.call(arguments);
-    postMessage({
-      action: 'console_error',
-      data: args
-    });
-    throw 'pdf.js execution error';
-  },
-
-  time: function time(name) {
-    consoleTimer[name] = Date.now();
-  },
-
-  timeEnd: function timeEnd(name) {
-    var time = consoleTimer[name];
-    if (time == null) {
-      error('Unkown timer name ' + name);
-    }
-    this.log('Timer:', name, Date.now() - time);
-  }
-};
-
-// Worker thread?
-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: */
-
-// - The JPEG specification can be found in the ITU CCITT Recommendation T.81
-//   (www.w3.org/Graphics/JPEG/itu-t81.pdf)
-// - The JFIF specification can be found in the JPEG File Interchange Format
-//   (www.w3.org/Graphics/JPEG/jfif3.pdf)
-// - The Adobe Application-Specific JPEG markers in the Supporting the DCT Filters
-//   in PostScript Level 2, Technical Note #5116
-//   (partners.adobe.com/public/developer/en/ps/sdk/5116.DCT_Filter.pdf)
-
-var JpegImage = (function jpegImage() {
-  "use strict";
-  var dctZigZag = new Int32Array([
-     0,
-     1,  8,
-    16,  9,  2,
-     3, 10, 17, 24,
-    32, 25, 18, 11, 4,
-     5, 12, 19, 26, 33, 40,
-    48, 41, 34, 27, 20, 13,  6,
-     7, 14, 21, 28, 35, 42, 49, 56,
-    57, 50, 43, 36, 29, 22, 15,
-    23, 30, 37, 44, 51, 58,
-    59, 52, 45, 38, 31,
-    39, 46, 53, 60,
-    61, 54, 47,
-    55, 62,
-    63
-  ]);
-
-  var dctCos1  =  4017   // cos(pi/16)
-  var dctSin1  =   799   // sin(pi/16)
-  var dctCos3  =  3406   // cos(3*pi/16)
-  var dctSin3  =  2276   // sin(3*pi/16)
-  var dctCos6  =  1567   // cos(6*pi/16)
-  var dctSin6  =  3784   // sin(6*pi/16)
-  var dctSqrt2 =  5793   // sqrt(2)
-  var dctSqrt1d2 = 2896  // sqrt(2) / 2
-
-  function constructor() {
-  }
-
-  function buildHuffmanTable(codeLengths, values) {
-    var k = 0, code = [], i, j, length = 16;
-    while (length > 0 && !codeLengths[length - 1])
-      length--;
-    code.push({children: [], index: 0});
-    var p = code[0], q;
-    for (i = 0; i < length; i++) {
-      for (j = 0; j < codeLengths[i]; j++) {
-        p = code.pop();
-        p.children[p.index] = values[k];
-        while (p.index > 0) {
-          p = code.pop();
-        }
-        p.index++;
-        code.push(p);
-        while (code.length <= i) {
-          code.push(q = {children: [], index: 0});
-          p.children[p.index] = q.children;
-          p = q;
-        }
-        k++;
-      }
-      if (i + 1 < length) {
-        // p here points to last code
-        code.push(q = {children: [], index: 0});
-        p.children[p.index] = q.children;
-        p = q;
-      }
-    }
-    return code[0].children;
-  }
-
-  function decodeScan(data, offset,
-                      frame, components, resetInterval,
-                      spectralStart, spectralEnd,
-                      successivePrev, successive) {
-    var precision = frame.precision;
-    var samplesPerLine = frame.samplesPerLine;
-    var scanLines = frame.scanLines;
-    var mcusPerLine = frame.mcusPerLine;
-    var progressive = frame.progressive;
-    var maxH = frame.maxH, maxV = frame.maxV;
-
-    var startOffset = offset, bitsData = 0, bitsCount = 0;
-    function readBit() {
-      if (bitsCount > 0) {
-        bitsCount--;
-        return (bitsData >> bitsCount) & 1;
-      }
-      bitsData = data[offset++];
-      if (bitsData == 0xFF) {
-        var nextByte = data[offset++];
-        if (nextByte) {
-          throw "unexpected marker: " + ((bitsData << 8) | nextByte).toString(16);
-        }
-        // unstuff 0
-      }
-      bitsCount = 7;
-      return bitsData >>> 7;
-    }
-    function decodeHuffman(tree) {
-      var node = tree, bit;
-      while ((bit = readBit()) !== null) {
-        node = node[bit];
-        if (typeof node === 'number')
-          return node;
-        if (typeof node !== 'object')
-          throw "invalid huffman sequence";
-      }
-      return null;
-    }
-    function receive(length) {
-      var n = 0;
-      while (length > 0) {
-        var bit = readBit();
-        if (bit === null) return;
-        n = (n << 1) | bit;
-        length--;
-      }
-      return n;
-    }
-    function receiveAndExtend(length) {
-      var n = receive(length);
-      if (n >= 1 << (length - 1))
-        return n;
-      return n + (-1 << length) + 1;
-    }
-    function decodeBaseline(component, zz) {
-      var t = decodeHuffman(component.huffmanTableDC);
-      var diff = t === 0 ? 0 : receiveAndExtend(t);
-      zz[0]= (component.pred += diff);
-      var k = 1;
-      while (k < 64) {
-        var rs = decodeHuffman(component.huffmanTableAC);
-        var s = rs & 15, r = rs >> 4;
-        if (s === 0) {
-          if (r < 15)
-            break;
-          k += 16;
-          continue;
-        }
-        k += r;
-        var z = dctZigZag[k];
-        zz[z] = receiveAndExtend(s);
-        k++;
-      }
-    }
-    function decodeDCFirst(component, zz) {
-      var t = decodeHuffman(component.huffmanTableDC);
-      var diff = t === 0 ? 0 : (receiveAndExtend(t) << successive);
-      zz[0] = (component.pred += diff);
-    }
-    function decodeDCSuccessive(component, zz) {
-      zz[0] |= readBit() << successive;
-    }
-    var eobrun = 0;
-    function decodeACFirst(component, zz) {
-      if (eobrun > 0) {
-        eobrun--;
-        return;
-      }
-      var k = spectralStart, e = spectralEnd;
-      while (k <= e) {
-        var rs = decodeHuffman(component.huffmanTableAC);
-        var s = rs & 15, r = rs >> 4;
-        if (s === 0) {
-          if (r < 15) {
-            eobrun = receive(r) + (1 << r) - 1;
-            break;
-          }
-          k += 16;
-          continue;
-        }
-        k += r;
-        var z = dctZigZag[k];
-        zz[z] = receiveAndExtend(s) * (1 << successive);
-        k++;
-      }
-    }
-    var successiveACState = 0, successiveACNextValue;
-    function decodeACSuccessive(component, zz) {
-      var k = spectralStart, e = spectralEnd, r = 0;
-      while (k <= e) {
-        var z = dctZigZag[k];
-        switch (successiveACState) {
-        case 0: // initial state
-          var rs = decodeHuffman(component.huffmanTableAC);
-          var s = rs & 15, r = rs >> 4;
-          if (s === 0) {
-            if (r < 15) {
-              eobrun = receive(r) + (1 << r);
-              successiveACState = 4;
-            } else {
-              r = 16;
-              successiveACState = 1;
-            }
-          } else {
-            if (s !== 1)
-              throw "invalid ACn encoding";
-            successiveACNextValue = receiveAndExtend(s);
-            successiveACState = r ? 2 : 3;
-          }
-          continue;
-        case 1: // skipping r zero items
-        case 2:
-          if (zz[z])
-            zz[z] += (readBit() << successive);
-          else {
-            r--;
-            if (r === 0)
-              successiveACState = successiveACState == 2 ? 3 : 0;
-          }
-          break;
-        case 3: // set value for a zero item
-          if (zz[z])
-            zz[z] += (readBit() << successive);
-          else {
-            zz[z] = successiveACNextValue << successive;
-            successiveACState = 0;
-          }
-          break;
-        case 4: // eob
-          if (zz[z])
-            zz[z] += (readBit() << successive);
-          break;
-        }
-        k++;
-      }
-      if (successiveACState === 4) {
-        eobrun--;
-        if (eobrun === 0)
-          successiveACState = 0;
-      }
-    }
-    function decodeMcu(component, decode, mcu, row, col) {
-      var mcuRow = (mcu / mcusPerLine) | 0;
-      var mcuCol = mcu % mcusPerLine;
-      var blockRow = mcuRow * component.v + row;
-      var blockCol = mcuCol * component.h + col;
-      decode(component, component.blocks[blockRow][blockCol]);
-    }
-    function decodeBlock(component, decode, mcu) {
-      var blockRow = (mcu / component.blocksPerLine) | 0;
-      var blockCol = mcu % component.blocksPerLine;
-      decode(component, component.blocks[blockRow][blockCol]);
-    }
-
-    var componentsLength = components.length;
-    var component, i, j, k, n;
-    var decodeFn;
-    if (progressive) {
-      if (spectralStart === 0)
-        decodeFn = successivePrev === 0 ? decodeDCFirst : decodeDCSuccessive;
-      else
-        decodeFn = successivePrev === 0 ? decodeACFirst : decodeACSuccessive;
-    } else {
-      decodeFn = decodeBaseline;
-    }
-
-    var mcu = 0, marker;
-    var mcuExpected;
-    if (componentsLength == 1) {
-      mcuExpected = components[0].blocksPerLine * components[0].blocksPerColumn;
-    } else {
-      mcuExpected = mcusPerLine * frame.mcusPerColumn;
-    }
-    if (!resetInterval) resetInterval = mcuExpected;
-
-    var h, v;
-    while (mcu < mcuExpected) {
-      // reset interval stuff
-      for (i = 0; i < componentsLength; i++)
-        components[i].pred = 0;
-      eobrun = 0;
-
-      if (componentsLength == 1) {
-        component = components[0];
-        for (n = 0; n < resetInterval; n++) {
-          decodeBlock(component, decodeFn, mcu);
-          mcu++;
-        }
-      } else {
-        for (n = 0; n < resetInterval; n++) {
-          for (i = 0; i < componentsLength; i++) {
-            component = components[i];
-            h = component.h;
-            v = component.v;
-            for (j = 0; j < v; j++) {
-              for (k = 0; k < h; k++) {
-                decodeMcu(component, decodeFn, mcu, j, k);
-              }
-            }
-          }
-          mcu++;
-        }
-      }
-
-      // find marker
-      bitsCount = 0;
-      marker = (data[offset] << 8) | data[offset + 1];
-      if (marker <= 0xFF00) {
-        throw "marker was not found";
-      }
-
-      if (marker >= 0xFFD0 && marker <= 0xFFD7) { // RSTx
-        offset += 2;
-      }
-      else
-        break;
-    }
-
-    return offset - startOffset;
-  }
-
-  function buildComponentData(frame, component) {
-    var lines = [];
-    var blocksPerLine = component.blocksPerLine;
-    var blocksPerColumn = component.blocksPerColumn;
-    var samplesPerLine = blocksPerLine << 3;
-    var R = new Int32Array(64), r = new Uint8Array(64);
-
-    // A port of poppler's IDCT method which in turn is taken from:
-    //   Christoph Loeffler, Adriaan Ligtenberg, George S. Moschytz,
-    //   "Practical Fast 1-D DCT Algorithms with 11 Multiplications",
-    //   IEEE Intl. Conf. on Acoustics, Speech & Signal Processing, 1989,
-    //   988-991.
-    function quantizeAndInverse(zz, dataOut, dataIn) {
-      var qt = component.quantizationTable;
-      var v0, v1, v2, v3, v4, v5, v6, v7, t;
-      var p = dataIn;
-      var i;
-
-      // dequant
-      for (i = 0; i < 64; i++)
-        p[i] = zz[i] * qt[i];
-
-      // inverse DCT on rows
-      for (i = 0; i < 8; ++i) {
-        var row = 8 * i;
-
-        // check for all-zero AC coefficients
-        if (p[1 + row] == 0 && p[2 + row] == 0 && p[3 + row] == 0 &&
-            p[4 + row] == 0 && p[5 + row] == 0 && p[6 + row] == 0 &&
-            p[7 + row] == 0) {
-          t = (dctSqrt2 * p[0 + row] + 512) >> 10;
-          p[0 + row] = t;
-          p[1 + row] = t;
-          p[2 + row] = t;
-          p[3 + row] = t;
-          p[4 + row] = t;
-          p[5 + row] = t;
-          p[6 + row] = t;
-          p[7 + row] = t;
-          continue;
-        }
-
-        // stage 4
-        v0 = (dctSqrt2 * p[0 + row] + 128) >> 8;
-        v1 = (dctSqrt2 * p[4 + row] + 128) >> 8;
-        v2 = p[2 + row];
-        v3 = p[6 + row];
-        v4 = (dctSqrt1d2 * (p[1 + row] - p[7 + row]) + 128) >> 8;
-        v7 = (dctSqrt1d2 * (p[1 + row] + p[7 + row]) + 128) >> 8;
-        v5 = p[3 + row] << 4;
-        v6 = p[5 + row] << 4;
-
-        // stage 3
-        t = (v0 - v1+ 1) >> 1;
-        v0 = (v0 + v1 + 1) >> 1;
-        v1 = t;
-        t = (v2 * dctSin6 + v3 * dctCos6 + 128) >> 8;
-        v2 = (v2 * dctCos6 - v3 * dctSin6 + 128) >> 8;
-        v3 = t;
-        t = (v4 - v6 + 1) >> 1;
-        v4 = (v4 + v6 + 1) >> 1;
-        v6 = t;
-        t = (v7 + v5 + 1) >> 1;
-        v5 = (v7 - v5 + 1) >> 1;
-        v7 = t;
-
-        // stage 2
-        t = (v0 - v3 + 1) >> 1;
-        v0 = (v0 + v3 + 1) >> 1;
-        v3 = t;
-        t = (v1 - v2 + 1) >> 1;
-        v1 = (v1 + v2 + 1) >> 1;
-        v2 = t;
-        t = (v4 * dctSin3 + v7 * dctCos3 + 2048) >> 12;
-        v4 = (v4 * dctCos3 - v7 * dctSin3 + 2048) >> 12;
-        v7 = t;
-        t = (v5 * dctSin1 + v6 * dctCos1 + 2048) >> 12;
-        v5 = (v5 * dctCos1 - v6 * dctSin1 + 2048) >> 12;
-        v6 = t;
-
-        // stage 1
-        p[0 + row] = v0 + v7;
-        p[7 + row] = v0 - v7;
-        p[1 + row] = v1 + v6;
-        p[6 + row] = v1 - v6;
-        p[2 + row] = v2 + v5;
-        p[5 + row] = v2 - v5;
-        p[3 + row] = v3 + v4;
-        p[4 + row] = v3 - v4;
-      }
-
-      // inverse DCT on columns
-      for (i = 0; i < 8; ++i) {
-        var col = i;
-
-        // check for all-zero AC coefficients
-        if (p[1*8 + col] == 0 && p[2*8 + col] == 0 && p[3*8 + col] == 0 &&
-            p[4*8 + col] == 0 && p[5*8 + col] == 0 && p[6*8 + col] == 0 &&
-            p[7*8 + col] == 0) {
-          t = (dctSqrt2 * dataIn[i+0] + 8192) >> 14;
-          p[0*8 + col] = t;
-          p[1*8 + col] = t;
-          p[2*8 + col] = t;
-          p[3*8 + col] = t;
-          p[4*8 + col] = t;
-          p[5*8 + col] = t;
-          p[6*8 + col] = t;
-          p[7*8 + col] = t;
-          continue;
-        }
-
-        // stage 4
-        v0 = (dctSqrt2 * p[0*8 + col] + 2048) >> 12;
-        v1 = (dctSqrt2 * p[4*8 + col] + 2048) >> 12;
-        v2 = p[2*8 + col];
-        v3 = p[6*8 + col];
-        v4 = (dctSqrt1d2 * (p[1*8 + col] - p[7*8 + col]) + 2048) >> 12;
-        v7 = (dctSqrt1d2 * (p[1*8 + col] + p[7*8 + col]) + 2048) >> 12;
-        v5 = p[3*8 + col];
-        v6 = p[5*8 + col];
-
-        // stage 3
-        t = (v0 - v1 + 1) >> 1;
-        v0 = (v0 + v1 + 1) >> 1;
-        v1 = t;
-        t = (v2 * dctSin6 + v3 * dctCos6 + 2048) >> 12;
-        v2 = (v2 * dctCos6 - v3 * dctSin6 + 2048) >> 12;
-        v3 = t;
-        t = (v4 - v6 + 1) >> 1;
-        v4 = (v4 + v6 + 1) >> 1;
-        v6 = t;
-        t = (v7 + v5 + 1) >> 1;
-        v5 = (v7 - v5 + 1) >> 1;
-        v7 = t;
-
-        // stage 2
-        t = (v0 - v3 + 1) >> 1;
-        v0 = (v0 + v3 + 1) >> 1;
-        v3 = t;
-        t = (v1 - v2 + 1) >> 1;
-        v1 = (v1 + v2 + 1) >> 1;
-        v2 = t;
-        t = (v4 * dctSin3 + v7 * dctCos3 + 2048) >> 12;
-        v4 = (v4 * dctCos3 - v7 * dctSin3 + 2048) >> 12;
-        v7 = t;
-        t = (v5 * dctSin1 + v6 * dctCos1 + 2048) >> 12;
-        v5 = (v5 * dctCos1 - v6 * dctSin1 + 2048) >> 12;
-        v6 = t;
-
-        // stage 1
-        p[0*8 + col] = v0 + v7;
-        p[7*8 + col] = v0 - v7;
-        p[1*8 + col] = v1 + v6;
-        p[6*8 + col] = v1 - v6;
-        p[2*8 + col] = v2 + v5;
-        p[5*8 + col] = v2 - v5;
-        p[3*8 + col] = v3 + v4;
-        p[4*8 + col] = v3 - v4;
-      }
-
-      // convert to 8-bit integers
-      for (i = 0; i < 64; ++i) {
-        var sample = 128 + ((p[i] + 8) >> 4);
-        dataOut[i] = sample < 0 ? 0 : sample > 0xFF ? 0xFF : sample;
-      }
-    }
-
-    var i, j;
-    for (var blockRow = 0; blockRow < blocksPerColumn; blockRow++) {
-      var scanLine = blockRow << 3;
-      for (i = 0; i < 8; i++)
-        lines.push(new Uint8Array(samplesPerLine));
-      for (var blockCol = 0; blockCol < blocksPerLine; blockCol++) {
-        quantizeAndInverse(component.blocks[blockRow][blockCol], r, R);
-
-        var offset = 0, sample = blockCol << 3;
-        for (j = 0; j < 8; j++) {
-          var line = lines[scanLine + j];
-          for (i = 0; i < 8; i++)
-            line[sample + i] = r[offset++];
-        }
-      }
-    }
-    return lines;
-  }
-
-  constructor.prototype = {
-    load: function load(path) {
-      var xhr = new XMLHttpRequest();
-      xhr.open("GET", path, true);
-      xhr.responseType = "arraybuffer";
-      xhr.onload = (function() {
-        // TODO catch parse error
-        var data = new Uint8Array(xhr.response || xhr.mozResponseArrayBuffer);
-        this.parse(data);
-        if (this.onload)
-          this.onload();
-      }).bind(this);
-      xhr.send(null);
-    },
-    parse: function parse(data) {
-      var offset = 0, length = data.length;
-      function readUint16() {
-        var value = (data[offset] << 8) | data[offset + 1];
-        offset += 2;
-        return value;
-      }
-      function readDataBlock() {
-        var length = readUint16();
-        var array = data.subarray(offset, offset + length - 2);
-        offset += array.length;
-        return array;
-      }
-      function prepareComponents(frame) {
-        var maxH = 0, maxV = 0;
-        var component, componentId;
-        for (componentId in frame.components) {
-          if (frame.components.hasOwnProperty(componentId)) {
-            component = frame.components[componentId];
-            if (maxH < component.h) maxH = component.h;
-            if (maxV < component.v) maxV = component.v;
-          }
-        }
-        var mcusPerLine = Math.ceil(frame.samplesPerLine / 8 / maxH);
-        var mcusPerColumn = Math.ceil(frame.scanLines / 8 / maxV);
-        for (componentId in frame.components) {
-          if (frame.components.hasOwnProperty(componentId)) {
-            component = frame.components[componentId];
-            var blocksPerLine = Math.ceil(Math.ceil(frame.samplesPerLine / 8) * component.h / maxH);
-            var blocksPerColumn = Math.ceil(Math.ceil(frame.scanLines  / 8) * component.v / maxV);
-            var blocksPerLineForMcu = mcusPerLine * component.h;
-            var blocksPerColumnForMcu = mcusPerColumn * component.v;
-            var blocks = [];
-            for (var i = 0; i < blocksPerColumnForMcu; i++) {
-              var row = [];
-              for (var j = 0; j < blocksPerLineForMcu; j++)
-                row.push(new Int32Array(64));
-              blocks.push(row);
-            }
-            component.blocksPerLine = blocksPerLine;
-            component.blocksPerColumn = blocksPerColumn;
-            component.blocks = blocks;
-          }
-        }
-        frame.maxH = maxH;
-        frame.maxV = maxV;
-        frame.mcusPerLine = mcusPerLine;
-        frame.mcusPerColumn = mcusPerColumn;
-      }
-      var jfif = null;
-      var adobe = null;
-      var pixels = null;
-      var frame, resetInterval;
-      var quantizationTables = [], frames = [];
-      var huffmanTablesAC = [], huffmanTablesDC = [];
-      var fileMarker = readUint16();
-      if (fileMarker != 0xFFD8) { // SOI (Start of Image)
-        throw "SOI not found";
-      }
-
-      fileMarker = readUint16();
-      while (fileMarker != 0xFFD9) { // EOI (End of image)
-        var i, j, l;
-        switch(fileMarker) {
-          case 0xFFE0: // APP0 (Application Specific)
-          case 0xFFE1: // APP1
-          case 0xFFE2: // APP2
-          case 0xFFE3: // APP3
-          case 0xFFE4: // APP4
-          case 0xFFE5: // APP5
-          case 0xFFE6: // APP6
-          case 0xFFE7: // APP7
-          case 0xFFE8: // APP8
-          case 0xFFE9: // APP9
-          case 0xFFEA: // APP10
-          case 0xFFEB: // APP11
-          case 0xFFEC: // APP12
-          case 0xFFED: // APP13
-          case 0xFFEE: // APP14
-          case 0xFFEF: // APP15
-          case 0xFFFE: // COM (Comment)
-            var appData = readDataBlock();
-
-            if (fileMarker === 0xFFE0) {
-              if (appData[0] === 0x4A && appData[1] === 0x46 && appData[2] === 0x49 &&
-                appData[3] === 0x46 && appData[4] === 0) { // 'JFIF\x00'
-                jfif = {
-                  version: { major: appData[5], minor: appData[6] },
-                  densityUnits: appData[7],
-                  xDensity: (appData[8] << 8) | appData[9],
-                  yDensity: (appData[10] << 8) | appData[11],
-                  thumbWidth: appData[12],
-                  thumbHeight: appData[13],
-                  thumbData: appData.subarray(14, 14 + 3 * appData[12] * appData[13])
-                };
-              }
-            }
-            // TODO APP1 - Exif
-            if (fileMarker === 0xFFEE) {
-              if (appData[0] === 0x41 && appData[1] === 0x64 && appData[2] === 0x6F &&
-                appData[3] === 0x62 && appData[4] === 0x65 && appData[5] === 0) { // 'Adobe\x00'
-                adobe = {
-                  version: appData[6],
-                  flags0: (appData[7] << 8) | appData[8],
-                  flags1: (appData[9] << 8) | appData[10],
-                  transformCode: appData[11]
-                };
-              }
-            }
-            break;
-
-          case 0xFFDB: // DQT (Define Quantization Tables)
-            var quantizationTableCount = Math.floor((readUint16() - 2) / 65);
-            for (i = 0; i < quantizationTableCount; i++) {
-              var quantizationTableSpec = data[offset++];
-              var tableData = new Int32Array(64);
-              if ((quantizationTableSpec >> 4) === 0) { // 8 bit values
-                for (j = 0; j < 64; j++) {
-                  var z = dctZigZag[j];
-                  tableData[z] = data[offset++];
-                }
-              } else if ((quantizationTableSpec >> 4) === 1) { //16 bit
-                for (j = 0; j < 64; j++) {
-                  var z = dctZigZag[j];
-                  tableData[z] = readUint16();
-                }
-              } else
-                throw "DQT: invalid table spec";
-              quantizationTables[quantizationTableSpec & 15] = tableData;
-            }
-            break;
-
-          case 0xFFC0: // SOF0 (Start of Frame, Baseline DCT)
-          case 0xFFC2: // SOF2 (Start of Frame, Progressive DCT)
-            readUint16(); // skip data length
-            frame = {};
-            frame.progressive = (fileMarker === 0xFFC2);
-            frame.precision = data[offset++];
-            frame.scanLines = readUint16();
-            frame.samplesPerLine = readUint16();
-            frame.components = {};
-            frame.componentsOrder = [];
-            var componentsCount = data[offset++], componentId;
-            var maxH = 0, maxV = 0;
-            for (i = 0; i < componentsCount; i++) {
-              componentId = data[offset];
-              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,
-                quantizationTable: quantizationTables[qId]
-              };
-              offset += 3;
-            }
-            prepareComponents(frame);
-            frames.push(frame);
-            break;
-
-          case 0xFFC4: // DHT (Define Huffman Tables)
-            var huffmanLength = readUint16();
-            for (i = 2; i < huffmanLength;) {
-              var huffmanTableSpec = data[offset++];
-              var codeLengths = new Uint8Array(16);
-              var codeLengthSum = 0;
-              for (j = 0; j < 16; j++, offset++)
-                codeLengthSum += (codeLengths[j] = data[offset]);
-              var huffmanValues = new Uint8Array(codeLengthSum);
-              for (j = 0; j < codeLengthSum; j++, offset++)
-                huffmanValues[j] = data[offset];
-              i += 17 + codeLengthSum;
-
-              ((huffmanTableSpec >> 4) === 0 ? 
-                huffmanTablesDC : huffmanTablesAC)[huffmanTableSpec & 15] =
-                buildHuffmanTable(codeLengths, huffmanValues);
-            }
-            break;
-
-          case 0xFFDD: // DRI (Define Restart Interval)
-            readUint16(); // skip data length
-            resetInterval = readUint16();
-            break;
-
-          case 0xFFDA: // SOS (Start of Scan)
-            var scanLength = readUint16();
-            var selectorsCount = data[offset++];
-            var components = [], component;
-            for (i = 0; i < selectorsCount; i++) {
-              component = frame.components[data[offset++]];
-              var tableSpec = data[offset++];
-              component.huffmanTableDC = huffmanTablesDC[tableSpec >> 4];
-              component.huffmanTableAC = huffmanTablesAC[tableSpec & 15];
-              components.push(component);
-            }
-            var spectralStart = data[offset++];
-            var spectralEnd = data[offset++];
-            var successiveApproximation = data[offset++];
-            var processed = decodeScan(data, offset,
-              frame, components, resetInterval,
-              spectralStart, spectralEnd,
-              successiveApproximation >> 4, successiveApproximation & 15);
-            offset += processed;
-            break;
-          default:
-            throw "unknown JPEG marker " + fileMarker.toString(16);
-        }
-        fileMarker = readUint16();
-      }
-      if (frames.length != 1)
-        throw "only single frame JPEGs supported";
-
-      this.width = frame.samplesPerLine;
-      this.height = frame.scanLines;
-      this.jfif = jfif;
-      this.adobe = adobe;
-      this.components = [];
-      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) {
-      function clampTo8bit(a) {
-        return a < 0 ? 0 : a > 255 ? 255 : a;
-      }
-      var scaleX = this.width / width, scaleY = this.height / height;
-
-      var component1, component2, component3, component4;
-      var component1Line, component2Line, component3Line, component4Line;
-      var x, y;
-      var offset = 0;
-      var Y, Cb, Cr, K, C, M, Ye, R, G, B;
-      var colorTransform;
-      var dataLength = width * height * this.components.length;
-      var data = new Uint8Array(dataLength);
-      switch (this.components.length) {
-        case 1:
-          component1 = this.components[0];
-          for (y = 0; y < height; y++) {
-            component1Line = component1.lines[0 | (y * component1.scaleY * scaleY)];
-            for (x = 0; x < width; x++) {
-              Y = component1Line[0 | (x * component1.scaleX * scaleX)];
-
-              data[offset++] = Y;
-            }
-          }
-          break;
-        case 3:
-          // The default transform for three components is true
-          colorTransform = true;
-          // The adobe transform marker overrides any previous setting
-          if (this.adobe && this.adobe.transformCode)
-            colorTransform = true;
-          else if (typeof this.colorTransform !== 'undefined')
-            colorTransform = !!this.colorTransform;
-
-          component1 = this.components[0];
-          component2 = this.components[1];
-          component3 = this.components[2];
-          for (y = 0; y < height; y++) {
-            component1Line = component1.lines[0 | (y * component1.scaleY * scaleY)];
-            component2Line = component2.lines[0 | (y * component2.scaleY * scaleY)];
-            component3Line = component3.lines[0 | (y * component3.scaleY * scaleY)];
-            for (x = 0; x < width; x++) {
-              if (!colorTransform) {
-                R = component1Line[0 | (x * component1.scaleX * scaleX)];
-                G = component2Line[0 | (x * component2.scaleX * scaleX)];
-                B = component3Line[0 | (x * component3.scaleX * scaleX)];
-              } else {
-                Y = component1Line[0 | (x * component1.scaleX * scaleX)];
-                Cb = component2Line[0 | (x * component2.scaleX * scaleX)];
-                Cr = component3Line[0 | (x * component3.scaleX * scaleX)];
-
-                R = clampTo8bit(Y + 1.402 * (Cr - 128));
-                G = clampTo8bit(Y - 0.3441363 * (Cb - 128) - 0.71413636 * (Cr - 128));
-                B = clampTo8bit(Y + 1.772 * (Cb - 128));
-              }
-
-              data[offset++] = R;
-              data[offset++] = G;
-              data[offset++] = B;
-            }
-          }
-          break;
-        case 4:
-          if (!this.adobe)
-            throw 'Unsupported color mode (4 components)';
-          // The default transform for four components is false
-          colorTransform = false;
-          // The adobe transform marker overrides any previous setting
-          if (this.adobe && this.adobe.transformCode)
-            colorTransform = true;
-          else if (typeof this.colorTransform !== 'undefined')
-            colorTransform = !!this.colorTransform;
-
-          component1 = this.components[0];
-          component2 = this.components[1];
-          component3 = this.components[2];
-          component4 = this.components[3];
-          for (y = 0; y < height; y++) {
-            component1Line = component1.lines[0 | (y * component1.scaleY * scaleY)];
-            component2Line = component2.lines[0 | (y * component2.scaleY * scaleY)];
-            component3Line = component3.lines[0 | (y * component3.scaleY * scaleY)];
-            component4Line = component4.lines[0 | (y * component4.scaleY * scaleY)];
-            for (x = 0; x < width; x++) {
-              if (!colorTransform) {
-                C = component1Line[0 | (x * component1.scaleX * scaleX)];
-                M = component2Line[0 | (x * component2.scaleX * scaleX)];
-                Ye = component3Line[0 | (x * component3.scaleX * scaleX)];
-                K = component4Line[0 | (x * component4.scaleX * scaleX)];
-              } else {
-                Y = component1Line[0 | (x * component1.scaleX * scaleX)];
-                Cb = component2Line[0 | (x * component2.scaleX * scaleX)];
-                Cr = component3Line[0 | (x * component3.scaleX * scaleX)];
-                K = component4Line[0 | (x * component4.scaleX * scaleX)];
-
-                C = 255 - clampTo8bit(Y + 1.402 * (Cr - 128));
-                M = 255 - clampTo8bit(Y - 0.3441363 * (Cb - 128) - 0.71413636 * (Cr - 128));
-                Ye = 255 - clampTo8bit(Y + 1.772 * (Cb - 128));
-              }
-              data[offset++] = C;
-              data[offset++] = M;
-              data[offset++] = Ye;
-              data[offset++] = K;
-            }
-          }
-          break;
-        default:
-          throw 'Unsupported color mode';
-      }
-      return data;
-    },
-    copyToImageData: function copyToImageData(imageData) {
-      var width = imageData.width, height = imageData.height;
-      var imageDataArray = imageData.data;
-      var data = this.getData(width, height);
-      var i = 0, j = 0, x, y;
-      var Y, K, C, M, R, G, B;
-      switch (this.components.length) {
-        case 1:
-          for (y = 0; y < height; y++) {
-            for (x = 0; x < width; x++) {
-              Y = data[i++];
-
-              imageDataArray[j++] = Y;
-              imageDataArray[j++] = Y;
-              imageDataArray[j++] = Y;
-              imageDataArray[j++] = 255;
-            }
-          }
-          break;
-        case 3:
-          for (y = 0; y < height; y++) {
-            for (x = 0; x < width; x++) {
-              R = data[i++];
-              G = data[i++];
-              B = data[i++];
-
-              imageDataArray[j++] = R;
-              imageDataArray[j++] = G;
-              imageDataArray[j++] = B;
-              imageDataArray[j++] = 255;
-            }
-          }
-          break;
-        case 4:
-          for (y = 0; y < height; y++) {
-            for (x = 0; x < width; x++) {
-              C = data[i++];
-              M = data[i++];
-              Y = data[i++];
-              K = data[i++];
-
-              R = 255 - clampTo8bit(C * (1 - K / 255) + K);
-              G = 255 - clampTo8bit(M * (1 - K / 255) + K);
-              B = 255 - clampTo8bit(Y * (1 - K / 255) + K);
-
-              imageDataArray[j++] = R;
-              imageDataArray[j++] = G;
-              imageDataArray[j++] = B;
-              imageDataArray[j++] = 255;
-            }
-          }
-          break;
-        default:
-          throw 'Unsupported color mode';
-      }
-    }
-  };
-
-  return constructor;
-})();
-/* -*- 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 JpxImage = (function JpxImageClosure() {
-  // Table E.1
-  var SubbandsGainLog2 = {
-    'LL': 0,
-    'LH': 1,
-    'HL': 1,
-    'HH': 2
-  };
-  function JpxImage() {
-    this.failOnCorruptedImage = false;
-  }
-  JpxImage.prototype = {
-    load: function JpxImage_load(url) {
-      var xhr = new XMLHttpRequest();
-      xhr.open('GET', url, true);
-      xhr.responseType = 'arraybuffer';
-      xhr.onload = (function() {
-        // TODO catch parse error
-        var data = new Uint8Array(xhr.response || xhr.mozResponseArrayBuffer);
-        this.parse(data);
-        if (this.onload)
-          this.onload();
-      }).bind(this);
-      xhr.send(null);
-    },
-    parse: function JpxImage_parse(data) {
-      function ReadUint(data, offset, bytes) {
-        var n = 0;
-        for (var i = 0; i < bytes; i++)
-          n = n * 256 + (data[offset + i] & 0xFF);
-        return n;
-      }
-      var position = 0, length = data.length;
-      while (position < length) {
-        var headerSize = 8;
-        var lbox = ReadUint(data, position, 4);
-        var tbox = ReadUint(data, position + 4, 4);
-        position += headerSize;
-        if (lbox == 1) {
-          lbox = ReadUint(data, position, 8);
-          position += 8;
-          headerSize += 8;
-        }
-        if (lbox == 0)
-          lbox = length - position + headerSize;
-        if (lbox < headerSize)
-          error('JPX error: Invalid box field size');
-        var dataLength = lbox - headerSize;
-        var jumpDataLength = true;
-        switch (tbox) {
-          case 0x6A501A1A: // 'jP\032\032'
-            // TODO
-            break;
-          case 0x6A703268: // 'jp2h'
-            jumpDataLength = false; // parsing child boxes
-            break;
-          case 0x636F6C72: // 'colr'
-            // TODO
-            break;
-          case 0x6A703263: // 'jp2c'
-            this.parseCodestream(data, position, position + dataLength);
-            break;
-        }
-        if (jumpDataLength)
-          position += dataLength;
-      }
-    },
-    parseCodestream: function JpxImage_parseCodestream(data, start, end) {
-      var context = {};
-      try {
-        var position = start;
-        while (position < end) {
-          var code = readUint16(data, position);
-          position += 2;
-
-          var length = 0, j;
-          switch (code) {
-            case 0xFF4F: // Start of codestream (SOC)
-              context.mainHeader = true;
-              break;
-            case 0xFFD9: // End of codestream (EOC)
-              break;
-            case 0xFF51: // Image and tile size (SIZ)
-              length = readUint16(data, position);
-              var siz = {};
-              siz.Xsiz = readUint32(data, position + 4);
-              siz.Ysiz = readUint32(data, position + 8);
-              siz.XOsiz = readUint32(data, position + 12);
-              siz.YOsiz = readUint32(data, position + 16);
-              siz.XTsiz = readUint32(data, position + 20);
-              siz.YTsiz = readUint32(data, position + 24);
-              siz.XTOsiz = readUint32(data, position + 28);
-              siz.YTOsiz = readUint32(data, position + 32);
-              var componentsCount = readUint16(data, position + 36);
-              siz.Csiz = componentsCount;
-              var components = [];
-              j = position + 38;
-              for (var i = 0; i < componentsCount; i++) {
-                var component = {
-                  precision: (data[j] & 0x7F) + 1,
-                  isSigned: !!(data[j] & 0x80),
-                  XRsiz: data[j + 1],
-                  YRsiz: data[j + 1]
-                };
-                calculateComponentDimensions(component, siz);
-                components.push(component);
-              }
-              context.SIZ = siz;
-              context.components = components;
-              calculateTileGrids(context, components);
-              context.QCC = [];
-              context.COC = [];
-              break;
-            case 0xFF5C: // Quantization default (QCD)
-              length = readUint16(data, position);
-              var qcd = {};
-              j = position + 2;
-              var sqcd = data[j++];
-              var spqcdSize, scalarExpounded;
-              switch (sqcd & 0x1F) {
-                case 0:
-                  spqcdSize = 8;
-                  scalarExpounded = true;
-                  break;
-                case 1:
-                  spqcdSize = 16;
-                  scalarExpounded = false;
-                  break;
-                case 2:
-                  spqcdSize = 16;
-                  scalarExpounded = true;
-                  break;
-                default:
-                  throw 'Invalid SQcd value ' + sqcd;
-              }
-              qcd.noQuantization = spqcdSize == 8;
-              qcd.scalarExpounded = scalarExpounded;
-              qcd.guardBits = sqcd >> 5;
-              var spqcds = [];
-              while (j < length + position) {
-                var spqcd = {};
-                if (spqcdSize == 8) {
-                  spqcd.epsilon = data[j++] >> 3;
-                  spqcd.mu = 0;
-                } else {
-                  spqcd.epsilon = data[j] >> 3;
-                  spqcd.mu = ((data[j] & 0x7) << 8) | data[j + 1];
-                  j += 2;
-                }
-                spqcds.push(spqcd);
-              }
-              qcd.SPqcds = spqcds;
-              if (context.mainHeader)
-                context.QCD = qcd;
-              else {
-                context.currentTile.QCD = qcd;
-                context.currentTile.QCC = [];
-              }
-              break;
-            case 0xFF5D: // Quantization component (QCC)
-              length = readUint16(data, position);
-              var qcc = {};
-              j = position + 2;
-              var cqcc;
-              if (context.SIZ.Csiz < 257)
-                cqcc = data[j++];
-              else {
-                cqcc = readUint16(data, j);
-                j += 2;
-              }
-              var sqcd = data[j++];
-              var spqcdSize, scalarExpounded;
-              switch (sqcd & 0x1F) {
-                case 0:
-                  spqcdSize = 8;
-                  scalarExpounded = true;
-                  break;
-                case 1:
-                  spqcdSize = 16;
-                  scalarExpounded = false;
-                  break;
-                case 2:
-                  spqcdSize = 16;
-                  scalarExpounded = true;
-                  break;
-                default:
-                  throw 'Invalid SQcd value ' + sqcd;
-              }
-              qcc.noQuantization = spqcdSize == 8;
-              qcc.scalarExpounded = scalarExpounded;
-              qcc.guardBits = sqcd >> 5;
-              var spqcds = [];
-              while (j < length + position) {
-                var spqcd = {};
-                if (spqcdSize == 8) {
-                  spqcd.epsilon = data[j++] >> 3;
-                  spqcd.mu = 0;
-                } else {
-                  spqcd.epsilon = data[j] >> 3;
-                  spqcd.mu = ((data[j] & 0x7) << 8) | data[j + 1];
-                  j += 2;
-                }
-                spqcds.push(spqcd);
-              }
-              qcc.SPqcds = spqcds;
-              if (context.mainHeader)
-                context.QCC[cqcc] = qcc;
-              else
-                context.currentTile.QCC[cqcc] = qcc;
-              break;
-            case 0xFF52: // Coding style default (COD)
-              length = readUint16(data, position);
-              var cod = {};
-              j = position + 2;
-              var scod = data[j++];
-              cod.entropyCoderWithCustomPrecincts = !!(scod & 1);
-              cod.sopMarkerUsed = !!(scod & 2);
-              cod.ephMarkerUsed = !!(scod & 4);
-              var codingStyle = {};
-              cod.progressionOrder = data[j++];
-              cod.layersCount = readUint16(data, j);
-              j += 2;
-              cod.multipleComponentTransform = data[j++];
-
-              cod.decompositionLevelsCount = data[j++];
-              cod.xcb = (data[j++] & 0xF) + 2;
-              cod.ycb = (data[j++] & 0xF) + 2;
-              var blockStyle = data[j++];
-              cod.selectiveArithmeticCodingBypass = !!(blockStyle & 1);
-              cod.resetContextProbabilities = !!(blockStyle & 2);
-              cod.terminationOnEachCodingPass = !!(blockStyle & 4);
-              cod.verticalyStripe = !!(blockStyle & 8);
-              cod.predictableTermination = !!(blockStyle & 16);
-              cod.segmentationSymbolUsed = !!(blockStyle & 32);
-              cod.transformation = data[j++];
-              if (cod.entropyCoderWithCustomPrecincts) {
-                var precinctsSizes = {};
-                while (j < length + position) {
-                  var precinctsSize = data[j];
-                  precinctsSizes.push({
-                    PPx: precinctsSize & 0xF,
-                    PPy: precinctsSize >> 4
-                  });
-                }
-                cod.precinctsSizes = precinctsSizes;
-              }
-
-              if (cod.sopMarkerUsed || cod.ephMarkerUsed ||
-                  cod.selectiveArithmeticCodingBypass ||
-                  cod.resetContextProbabilities ||
-                  cod.terminationOnEachCodingPass ||
-                  cod.verticalyStripe || cod.predictableTermination ||
-                  cod.segmentationSymbolUsed)
-                throw 'Unsupported COD options: ' + uneval(cod);
-
-              if (context.mainHeader)
-                context.COD = cod;
-              else {
-                context.currentTile.COD = cod;
-                context.currentTile.COC = [];
-              }
-              break;
-            case 0xFF90: // Start of tile-part (SOT)
-              length = readUint16(data, position);
-              var tile = {};
-              tile.index = readUint16(data, position + 2);
-              tile.length = readUint32(data, position + 4);
-              tile.dataEnd = tile.length + position - 2;
-              tile.partIndex = data[position + 8];
-              tile.partsCount = data[position + 9];
-
-              context.mainHeader = false;
-              if (tile.partIndex == 0) {
-                // reset component specific settings
-                tile.COD = context.COD;
-                tile.COC = context.COC.slice(0); // clone of the global COC
-                tile.QCD = context.QCD;
-                tile.QCC = context.QCC.slice(0); // clone of the global COC
-              }
-              context.currentTile = tile;
-              break;
-            case 0xFF93: // Start of data (SOD)
-              var tile = context.currentTile;
-              if (tile.partIndex == 0) {
-                initializeTile(context, tile.index);
-                buildPackets(context);
-              }
-
-              // moving to the end of the data
-              length = tile.dataEnd - position;
-
-              parseTilePackets(context, data, position, length);
-              break;
-            case 0xFF64: // Comment (COM)
-              length = readUint16(data, position);
-              // skipping content
-              break;
-            default:
-              throw 'Unknown codestream code: ' + code.toString(16);
-          }
-          position += length;
-        }
-      } catch (e) {
-        if (this.failOnCorruptedImage)
-          error('JPX error: ' + e);
-        else
-          warn('JPX error: ' + e + '. Trying to recover');
-      }
-      this.tiles = transformComponents(context);
-      this.width = context.SIZ.Xsiz - context.SIZ.XOsiz;
-      this.height = context.SIZ.Ysiz - context.SIZ.YOsiz;
-      this.componentsCount = context.SIZ.Csiz;
-    }
-  };
-  function readUint32(data, offset) {
-    return (data[offset] << 24) | (data[offset + 1] << 16) |
-      (data[offset + 2] << 8) | data[offset + 3];
-  }
-  function readUint16(data, offset) {
-    return (data[offset] << 8) | data[offset + 1];
-  }
-  function log2(x) {
-    var n = 1, i = 0;
-    while (x > n) {
-      n <<= 1;
-      i++;
-    }
-    return i;
-  }
-  function calculateComponentDimensions(component, siz) {
-    // Section B.2 Component mapping
-    component.x0 = Math.ceil(siz.XOsiz / component.XRsiz);
-    component.x1 = Math.ceil(siz.Xsiz / component.XRsiz);
-    component.y0 = Math.ceil(siz.YOsiz / component.YRsiz);
-    component.y1 = Math.ceil(siz.Ysiz / component.YRsiz);
-    component.width = component.x1 - component.x0;
-    component.height = component.y1 - component.y0;
-  }
-  function calculateTileGrids(context, components) {
-    var siz = context.SIZ;
-    // Section B.3 Division into tile and tile-components
-    var tiles = [];
-    var numXtiles = Math.ceil((siz.Xsiz - siz.XTOsiz) / siz.XTsiz);
-    var numYtiles = Math.ceil((siz.Ysiz - siz.YTOsiz) / siz.YTsiz);
-    for (var q = 0; q < numYtiles; q++) {
-      for (var p = 0; p < numXtiles; p++) {
-        var tile = {};
-        tile.tx0 = Math.max(siz.XTOsiz + p * siz.XTsiz, siz.XOsiz);
-        tile.ty0 = Math.max(siz.YTOsiz + q * siz.YTsiz, siz.YOsiz);
-        tile.tx1 = Math.min(siz.XTOsiz + (p + 1) * siz.XTsiz, siz.Xsiz);
-        tile.ty1 = Math.min(siz.YTOsiz + (q + 1) * siz.YTsiz, siz.Ysiz);
-        tile.width = tile.tx1 - tile.tx0;
-        tile.height = tile.ty1 - tile.ty0;
-        tile.components = [];
-        tiles.push(tile);
-      }
-    }
-    context.tiles = tiles;
-
-    var componentsCount = siz.Csiz;
-    for (var i = 0, ii = componentsCount; i < ii; i++) {
-      var component = components[i];
-      var tileComponents = [];
-      for (var j = 0, jj = tiles.length; j < jj; j++) {
-        var tileComponent = {}, tile = tiles[j];
-        tileComponent.tcx0 = Math.ceil(tile.tx0 / component.XRsiz);
-        tileComponent.tcy0 = Math.ceil(tile.ty0 / component.YRsiz);
-        tileComponent.tcx1 = Math.ceil(tile.tx1 / component.XRsiz);
-        tileComponent.tcy1 = Math.ceil(tile.ty1 / component.YRsiz);
-        tileComponent.width = tileComponent.tcx1 - tileComponent.tcx0;
-        tileComponent.height = tileComponent.tcy1 - tileComponent.tcy0;
-        tile.components[i] = tileComponent;
-      }
-    }
-  }
-  function getBlocksDimensions(context, component, r) {
-    var codOrCoc = component.codingStyleParameters;
-    var result = {};
-    if (!codOrCoc.entropyCoderWithCustomPrecincts) {
-      result.PPx = 15;
-      result.PPy = 15;
-    } else {
-      result.PPx = codOrCoc.precinctsSizes[r].PPx;
-      result.PPy = codOrCoc.precinctsSizes[r].PPy;
-    }
-    // calculate codeblock size as described in section B.7
-    result.xcb_ = r > 0 ? Math.min(codOrCoc.xcb, result.PPx - 1) :
-      Math.min(codOrCoc.xcb, result.PPx);
-    result.ycb_ = r > 0 ? Math.min(codOrCoc.ycb, result.PPy - 1) :
-      Math.min(codOrCoc.ycb, result.PPy);
-    return result;
-  }
-  function buildPrecincts(context, resolution, dimensions) {
-    // Section B.6 Division resolution to precincts
-    var precinctWidth = 1 << dimensions.PPx;
-    var precinctHeight = 1 << dimensions.PPy;
-    var numprecinctswide = resolution.trx1 > resolution.trx0 ?
-      Math.ceil(resolution.trx1 / precinctWidth) -
-      Math.floor(resolution.trx0 / precinctWidth) : 0;
-    var numprecinctshigh = resolution.try1 > resolution.try0 ?
-      Math.ceil(resolution.try1 / precinctHeight) -
-      Math.floor(resolution.try0 / precinctHeight) : 0;
-    var numprecincts = numprecinctswide * numprecinctshigh;
-    var precinctXOffset = Math.floor(resolution.trx0 / precinctWidth) *
-      precinctWidth;
-    var precinctYOffset = Math.floor(resolution.try0 / precinctHeight) *
-      precinctHeight;
-    resolution.precinctParameters = {
-      precinctXOffset: precinctXOffset,
-      precinctYOffset: precinctYOffset,
-      precinctWidth: precinctWidth,
-      precinctHeight: precinctHeight,
-      numprecinctswide: numprecinctswide,
-      numprecinctshigh: numprecinctshigh,
-      numprecincts: numprecincts
-    };
-  }
-  function buildCodeblocks(context, subband, dimensions) {
-    // Section B.7 Division sub-band into code-blocks
-    var xcb_ = dimensions.xcb_;
-    var ycb_ = dimensions.ycb_;
-    var codeblockWidth = 1 << xcb_;
-    var codeblockHeight = 1 << ycb_;
-    var cbx0 = Math.floor(subband.tbx0 / codeblockWidth);
-    var cby0 = Math.floor(subband.tby0 / codeblockHeight);
-    var cbx1 = Math.ceil(subband.tbx1 / codeblockWidth);
-    var cby1 = Math.ceil(subband.tby1 / codeblockHeight);
-    var precinctParameters = subband.resolution.precinctParameters;
-    var codeblocks = [];
-    var precincts = [];
-    for (var j = cby0; j < cby1; j++) {
-      for (var i = cbx0; i < cbx1; i++) {
-        var codeblock = {
-          cbx: i,
-          cby: j,
-          tbx0: codeblockWidth * i,
-          tby0: codeblockHeight * j,
-          tbx1: codeblockWidth * (i + 1),
-          tby1: codeblockHeight * (j + 1)
-        };
-        // calculate precinct number
-        var pi = Math.floor((codeblock.tbx0 -
-          precinctParameters.precinctXOffset) /
-          precinctParameters.precinctWidth);
-        var pj = Math.floor((codeblock.tby0 -
-          precinctParameters.precinctYOffset) /
-          precinctParameters.precinctHeight);
-        var precinctNumber = pj +
-          pi * precinctParameters.numprecinctswide;
-        codeblock.tbx0_ = Math.max(subband.tbx0, codeblock.tbx0);
-        codeblock.tby0_ = Math.max(subband.tby0, codeblock.tby0);
-        codeblock.tbx1_ = Math.min(subband.tbx1, codeblock.tbx1);
-        codeblock.tby1_ = Math.min(subband.tby1, codeblock.tby1);
-        codeblock.precinctNumber = precinctNumber;
-        codeblock.subbandType = subband.type;
-        var coefficientsLength = (codeblock.tbx1_ - codeblock.tbx0_) *
-          (codeblock.tby1_ - codeblock.tby0_);
-        codeblock.Lblock = 3;
-        codeblocks.push(codeblock);
-        // building precinct for the sub-band
-        var precinct;
-        if (precinctNumber in precincts) {
-          precinct = precincts[precinctNumber];
-          precinct.cbxMin = Math.min(precinct.cbxMin, i);
-          precinct.cbyMin = Math.min(precinct.cbyMin, j);
-          precinct.cbxMax = Math.max(precinct.cbxMax, i);
-          precinct.cbyMax = Math.max(precinct.cbyMax, j);
-        } else {
-          precincts[precinctNumber] = precinct = {
-            cbxMin: i,
-            cbyMin: j,
-            cbxMax: i,
-            cbyMax: j
-          };
-        }
-        codeblock.precinct = precinct;
-      }
-    }
-    subband.codeblockParameters = {
-      codeblockWidth: xcb_,
-      codeblockHeight: ycb_,
-      numcodeblockwide: cbx1 - cbx0 + 1,
-      numcodeblockhigh: cby1 - cby1 + 1
-    };
-    subband.codeblocks = codeblocks;
-    for (var i = 0, ii = codeblocks.length; i < ii; i++) {
-      var codeblock = codeblocks[i];
-      var precinctNumber = codeblock.precinctNumber;
-    }
-    subband.precincts = precincts;
-  }
-  function createPacket(resolution, precinctNumber, layerNumber) {
-    var precinctCodeblocks = [];
-    // Section B.10.8 Order of info in packet
-    var subbands = resolution.subbands;
-    // sub-bands already ordered in 'LL', 'HL', 'LH', and 'HH' sequence
-    for (var i = 0, ii = subbands.length; i < ii; i++) {
-      var subband = subbands[i];
-      var codeblocks = subband.codeblocks;
-      for (var j = 0, jj = codeblocks.length; j < jj; j++) {
-        var codeblock = codeblocks[j];
-        if (codeblock.precinctNumber != precinctNumber)
-          continue;
-        precinctCodeblocks.push(codeblock);
-      }
-    }
-    return {
-      layerNumber: layerNumber,
-      codeblocks: precinctCodeblocks
-    };
-  }
-  function LayerResolutionComponentPositionIterator(context) {
-    var siz = context.SIZ;
-    var tileIndex = context.currentTile.index;
-    var tile = context.tiles[tileIndex];
-    var layersCount = tile.codingStyleDefaultParameters.layersCount;
-    var componentsCount = siz.Csiz;
-    var maxDecompositionLevelsCount = 0;
-    for (var q = 0; q < componentsCount; q++) {
-      maxDecompositionLevelsCount = Math.max(maxDecompositionLevelsCount,
-        tile.components[q].codingStyleParameters.decompositionLevelsCount);
-    }
-
-    var l = 0, r = 0, i = 0, k = 0;
-
-    this.nextPacket = function JpxImage_nextPacket() {
-      // Section B.12.1.1 Layer-resolution-component-position
-      for (; l < layersCount; l++) {
-        for (; r <= maxDecompositionLevelsCount; r++) {
-          for (; i < componentsCount; i++) {
-            var component = tile.components[i];
-            if (r > component.codingStyleParameters.decompositionLevelsCount)
-              continue;
-
-            var resolution = component.resolutions[r];
-            var numprecincts = resolution.precinctParameters.numprecincts;
-            for (; k < numprecincts;) {
-              var packet = createPacket(resolution, k, l);
-              k++;
-              return packet;
-            }
-            k = 0;
-          }
-          i = 0;
-        }
-        r = 0;
-      }
-      throw 'Out of packets';
-    };
-  }
-  function ResolutionLayerComponentPositionIterator(context) {
-    var siz = context.SIZ;
-    var tileIndex = context.currentTile.index;
-    var tile = context.tiles[tileIndex];
-    var layersCount = tile.codingStyleDefaultParameters.layersCount;
-    var componentsCount = siz.Csiz;
-    var maxDecompositionLevelsCount = 0;
-    for (var q = 0; q < componentsCount; q++) {
-      maxDecompositionLevelsCount = Math.max(maxDecompositionLevelsCount,
-        tile.components[q].codingStyleParameters.decompositionLevelsCount);
-    }
-
-    var r = 0, l = 0, i = 0, k = 0;
-
-    this.nextPacket = function JpxImage_nextPacket() {
-      // Section B.12.1.2 Resolution-layer-component-position
-      for (; r <= maxDecompositionLevelsCount; r++) {
-        for (; l < layersCount; l++) {
-          for (; i < componentsCount; i++) {
-            var component = tile.components[i];
-            if (r > component.codingStyleParameters.decompositionLevelsCount)
-              continue;
-
-            var resolution = component.resolutions[r];
-            var numprecincts = resolution.precinctParameters.numprecincts;
-            for (; k < numprecincts;) {
-              var packet = createPacket(resolution, k, l);
-              k++;
-              return packet;
-            }
-            k = 0;
-          }
-          i = 0;
-        }
-        l = 0;
-      }
-      throw 'Out of packets';
-    };
-  }
-  function buildPackets(context) {
-    var siz = context.SIZ;
-    var tileIndex = context.currentTile.index;
-    var tile = context.tiles[tileIndex];
-    var componentsCount = siz.Csiz;
-    // Creating resolutions and sub-bands for each component
-    for (var c = 0; c < componentsCount; c++) {
-      var component = tile.components[c];
-      var decompositionLevelsCount =
-        component.codingStyleParameters.decompositionLevelsCount;
-      // Section B.5 Resolution levels and sub-bands
-      var resolutions = [];
-      var subbands = [];
-      for (var r = 0; r <= decompositionLevelsCount; r++) {
-        var blocksDimensions = getBlocksDimensions(context, component, r);
-        var resolution = {};
-        var scale = 1 << (decompositionLevelsCount - r);
-        resolution.trx0 = Math.ceil(component.tcx0 / scale);
-        resolution.try0 = Math.ceil(component.tcy0 / scale);
-        resolution.trx1 = Math.ceil(component.tcx1 / scale);
-        resolution.try1 = Math.ceil(component.tcy1 / scale);
-        buildPrecincts(context, resolution, blocksDimensions);
-        resolutions.push(resolution);
-
-        var subband;
-        if (r == 0) {
-          // one sub-band (LL) with last decomposition
-          subband = {};
-          subband.type = 'LL';
-          subband.tbx0 = Math.ceil(component.tcx0 / scale);
-          subband.tby0 = Math.ceil(component.tcy0 / scale);
-          subband.tbx1 = Math.ceil(component.tcx1 / scale);
-          subband.tby1 = Math.ceil(component.tcy1 / scale);
-          subband.resolution = resolution;
-          buildCodeblocks(context, subband, blocksDimensions);
-          subbands.push(subband);
-          resolution.subbands = [subband];
-        } else {
-          var bscale = 1 << (decompositionLevelsCount - r + 1);
-          var resolutionSubbands = [];
-          // three sub-bands (HL, LH and HH) with rest of decompositions
-          subband = {};
-          subband.type = 'HL';
-          subband.tbx0 = Math.ceil(component.tcx0 / bscale - 0.5);
-          subband.tby0 = Math.ceil(component.tcy0 / bscale);
-          subband.tbx1 = Math.ceil(component.tcx1 / bscale - 0.5);
-          subband.tby1 = Math.ceil(component.tcy1 / bscale);
-          subband.resolution = resolution;
-          buildCodeblocks(context, subband, blocksDimensions);
-          subbands.push(subband);
-          resolutionSubbands.push(subband);
-
-          subband = {};
-          subband.type = 'LH';
-          subband.tbx0 = Math.ceil(component.tcx0 / bscale);
-          subband.tby0 = Math.ceil(component.tcy0 / bscale - 0.5);
-          subband.tbx1 = Math.ceil(component.tcx1 / bscale);
-          subband.tby1 = Math.ceil(component.tcy1 / bscale - 0.5);
-          subband.resolution = resolution;
-          buildCodeblocks(context, subband, blocksDimensions);
-          subbands.push(subband);
-          resolutionSubbands.push(subband);
-
-          subband = {};
-          subband.type = 'HH';
-          subband.tbx0 = Math.ceil(component.tcx0 / bscale - 0.5);
-          subband.tby0 = Math.ceil(component.tcy0 / bscale - 0.5);
-          subband.tbx1 = Math.ceil(component.tcx1 / bscale - 0.5);
-          subband.tby1 = Math.ceil(component.tcy1 / bscale - 0.5);
-          subband.resolution = resolution;
-          buildCodeblocks(context, subband, blocksDimensions);
-          subbands.push(subband);
-          resolutionSubbands.push(subband);
-
-          resolution.subbands = resolutionSubbands;
-        }
-      }
-      component.resolutions = resolutions;
-      component.subbands = subbands;
-    }
-    // Generate the packets sequence
-    var progressionOrder = tile.codingStyleDefaultParameters.progressionOrder;
-    var packetsIterator;
-    switch (progressionOrder) {
-      case 0:
-        tile.packetsIterator =
-          new LayerResolutionComponentPositionIterator(context);
-        break;
-      case 1:
-        tile.packetsIterator =
-          new ResolutionLayerComponentPositionIterator(context);
-        break;
-      default:
-        throw 'Unsupported progression order ' + progressionOrder;
-    }
-  }
-  function parseTilePackets(context, data, offset, dataLength) {
-    var position = 0;
-    var buffer, bufferSize = 0, skipNextBit = false;
-    function readBits(count) {
-      while (bufferSize < count) {
-        var b = data[offset + position];
-        position++;
-        if (skipNextBit) {
-          buffer = (buffer << 7) | b;
-          bufferSize += 7;
-          skipNextBit = false;
-        } else {
-          buffer = (buffer << 8) | b;
-          bufferSize += 8;
-        }
-        if (b == 0xFF) {
-          skipNextBit = true;
-        }
-      }
-      bufferSize -= count;
-      return (buffer >>> bufferSize) & ((1 << count) - 1);
-    }
-    function alignToByte() {
-      bufferSize = 0;
-      if (skipNextBit) {
-        position++;
-        skipNextBit = false;
-      }
-    }
-    function readCodingpasses() {
-      var value = readBits(1);
-      if (value == 0)
-        return 1;
-      value = (value << 1) | readBits(1);
-      if (value == 0x02)
-        return 2;
-      value = (value << 2) | readBits(2);
-      if (value <= 0x0E)
-        return (value & 0x03) + 3;
-      value = (value << 5) | readBits(5);
-      if (value <= 0x1FE)
-        return (value & 0x1F) + 6;
-      value = (value << 7) | readBits(7);
-      return (value & 0x7F) + 37;
-    }
-    var tileIndex = context.currentTile.index;
-    var tile = context.tiles[tileIndex];
-    var packetsIterator = tile.packetsIterator;
-    while (position < dataLength) {
-      var packet = packetsIterator.nextPacket();
-      if (!readBits(1)) {
-        alignToByte();
-        continue;
-      }
-      var layerNumber = packet.layerNumber;
-      var queue = [];
-      for (var i = 0, ii = packet.codeblocks.length; i < ii; i++) {
-        var codeblock = packet.codeblocks[i];
-        var precinct = codeblock.precinct;
-        var codeblockColumn = codeblock.cbx - precinct.cbxMin;
-        var codeblockRow = codeblock.cby - precinct.cbyMin;
-        var codeblockIncluded = false;
-        var firstTimeInclusion = false;
-        if ('included' in codeblock) {
-          codeblockIncluded = !!readBits(1);
-        } else {
-          // reading inclusion tree
-          var precinct = codeblock.precinct;
-          var inclusionTree, zeroBitPlanesTree;
-          if ('inclusionTree' in precinct) {
-            inclusionTree = precinct.inclusionTree;
-          } else {
-            // building inclusion and zero bit-planes trees
-            var width = precinct.cbxMax - precinct.cbxMin + 1;
-            var height = precinct.cbyMax - precinct.cbyMin + 1;
-            inclusionTree = new InclusionTree(width, height, layerNumber);
-            zeroBitPlanesTree = new TagTree(width, height);
-            precinct.inclusionTree = inclusionTree;
-            precinct.zeroBitPlanesTree = zeroBitPlanesTree;
-          }
-
-          if (inclusionTree.reset(codeblockColumn, codeblockRow, layerNumber)) {
-            while (true) {
-              if (readBits(1)) {
-                var valueReady = !inclusionTree.nextLevel();
-                if (valueReady) {
-                  codeblock.included = true;
-                  codeblockIncluded = firstTimeInclusion = true;
-                  break;
-                }
-              } else {
-                inclusionTree.incrementValue(layerNumber);
-                break;
-              }
-            }
-          }
-        }
-        if (!codeblockIncluded)
-          continue;
-        if (firstTimeInclusion) {
-          zeroBitPlanesTree = precinct.zeroBitPlanesTree;
-          zeroBitPlanesTree.reset(codeblockColumn, codeblockRow);
-          while (true) {
-            if (readBits(1)) {
-              var valueReady = !zeroBitPlanesTree.nextLevel();
-              if (valueReady)
-                break;
-            } else
-              zeroBitPlanesTree.incrementValue();
-          }
-          codeblock.zeroBitPlanes = zeroBitPlanesTree.value;
-        }
-        var codingpasses = readCodingpasses();
-        while (readBits(1))
-          codeblock.Lblock++;
-        var codingpassesLog2 = log2(codingpasses);
-        // rounding down log2
-        var bits = ((codingpasses < (1 << codingpassesLog2)) ?
-          codingpassesLog2 - 1 : codingpassesLog2) + codeblock.Lblock;
-        var codedDataLength = readBits(bits);
-        queue.push({
-          codeblock: codeblock,
-          codingpasses: codingpasses,
-          dataLength: codedDataLength
-        });
-      }
-      alignToByte();
-      while (queue.length > 0) {
-        var packetItem = queue.shift();
-        var codeblock = packetItem.codeblock;
-        if (!('data' in codeblock))
-          codeblock.data = [];
-        codeblock.data.push({
-          data: data,
-          start: offset + position,
-          end: offset + position + packetItem.dataLength,
-          codingpasses: packetItem.codingpasses
-        });
-        position += packetItem.dataLength;
-      }
-    }
-    return position;
-  }
-  function copyCoefficients(coefficients, x0, y0, width, height,
-                            delta, mb, codeblocks, transformation) {
-    var r = 0.5; // formula (E-6)
-    for (var i = 0, ii = codeblocks.length; i < ii; ++i) {
-      var codeblock = codeblocks[i];
-      var blockWidth = codeblock.tbx1_ - codeblock.tbx0_;
-      var blockHeight = codeblock.tby1_ - codeblock.tby0_;
-      if (blockWidth == 0 || blockHeight == 0)
-        continue;
-      if (!('data' in codeblock))
-        continue;
-
-      var bitModel, currentCodingpassType;
-      bitModel = new BitModel(blockWidth, blockHeight, codeblock.subbandType,
-        codeblock.zeroBitPlanes);
-      currentCodingpassType = 2; // first bit plane starts from cleanup
-
-      // collect data
-      var data = codeblock.data, totalLength = 0, codingpasses = 0;
-      for (var q = 0, qq = data.length; q < qq; q++) {
-        var dataItem = data[q];
-        totalLength += dataItem.end - dataItem.start;
-        codingpasses += dataItem.codingpasses;
-      }
-      var encodedData = new Uint8Array(totalLength), k = 0;
-      for (var q = 0, qq = data.length; q < qq; q++) {
-        var dataItem = data[q];
-        var chunk = dataItem.data.subarray(dataItem.start, dataItem.end);
-        encodedData.set(chunk, k);
-        k += chunk.length;
-      }
-      // decoding the item
-      var decoder = new ArithmeticDecoder(encodedData, 0, totalLength);
-      bitModel.setDecoder(decoder);
-
-      for (var q = 0; q < codingpasses; q++) {
-        switch (currentCodingpassType) {
-          case 0:
-            bitModel.runSignificancePropogationPass();
-            break;
-          case 1:
-            bitModel.runMagnitudeRefinementPass();
-            break;
-          case 2:
-            bitModel.runCleanupPass();
-            break;
-        }
-        currentCodingpassType = (currentCodingpassType + 1) % 3;
-      }
-
-      var offset = (codeblock.tbx0_ - x0) + (codeblock.tby0_ - y0) * width;
-      var position = 0;
-      for (var j = 0; j < blockHeight; j++) {
-        for (var k = 0; k < blockWidth; k++) {
-          var n = (bitModel.coefficentsSign[position] ? -1 : 1) *
-            bitModel.coefficentsMagnitude[position];
-          var nb = bitModel.bitsDecoded[position], correction;
-          if (transformation == 0 || mb > nb) {
-            // use r only if transformation is irreversible or
-            // not all bitplanes were decoded for reversible transformation
-            n += n < 0 ? n - r : n > 0 ? n + r : 0;
-            correction = 1 << (mb - nb);
-          } else
-            correction = 1;
-          coefficients[offset++] = n * correction * delta;
-          position++;
-        }
-        offset += width - blockWidth;
-      }
-    }
-  }
-  function transformTile(context, tile, c) {
-    var component = tile.components[c];
-    var codingStyleParameters = component.codingStyleParameters;
-    var quantizationParameters = component.quantizationParameters;
-    var decompositionLevelsCount =
-      codingStyleParameters.decompositionLevelsCount;
-    var spqcds = quantizationParameters.SPqcds;
-    var scalarExpounded = quantizationParameters.scalarExpounded;
-    var guardBits = quantizationParameters.guardBits;
-    var transformation = codingStyleParameters.transformation;
-    var precision = context.components[c].precision;
-
-    var subbandCoefficients = [];
-    var k = 0, b = 0;
-    for (var i = 0; i <= decompositionLevelsCount; i++) {
-      var resolution = component.resolutions[i];
-
-      for (var j = 0, jj = resolution.subbands.length; j < jj; j++) {
-        var mu, epsilon;
-        if (!scalarExpounded) {
-          // formula E-5
-          mu = spqcds[0].mu;
-          epsilon = spqcds[0].epsilon + (i > 0 ? 1 - i : 0);
-        } else {
-          mu = spqcds[b].mu;
-          epsilon = spqcds[b].epsilon;
-        }
-
-        var subband = resolution.subbands[j];
-        var width = subband.tbx1 - subband.tbx0;
-        var height = subband.tby1 - subband.tby0;
-        var gainLog2 = SubbandsGainLog2[subband.type];
-
-        // calulate quantization coefficient (Section E.1.1.1)
-        var delta = Math.pow(2, (precision + gainLog2) - epsilon) *
-          (1 + mu / 2048);
-        var mb = (guardBits + epsilon - 1);
-
-        var coefficients = new Float32Array(width * height);
-        copyCoefficients(coefficients, subband.tbx0, subband.tby0,
-          width, height, delta, mb, subband.codeblocks, transformation);
-
-        subbandCoefficients.push({
-          width: width,
-          height: height,
-          items: coefficients
-        });
-
-        b++;
-      }
-    }
-
-    var transformation = codingStyleParameters.transformation;
-    var transform = transformation == 0 ? new IrreversibleTransform() :
-      new ReversibleTransform();
-    var result = transform.calculate(subbandCoefficients,
-      component.tcx0, component.tcy0);
-    return {
-      left: component.tcx0,
-      top: component.tcy0,
-      width: result.width,
-      height: result.height,
-      items: result.items
-    };
-  }
-  function transformComponents(context) {
-    var siz = context.SIZ;
-    var components = context.components;
-    var componentsCount = siz.Csiz;
-    var resultImages = [];
-    for (var i = 0, ii = context.tiles.length; i < ii; i++) {
-      var tile = context.tiles[i];
-      var result = [];
-      for (var c = 0; c < componentsCount; c++) {
-        var image = transformTile(context, tile, c);
-        result.push(image);
-      }
-
-      // Section G.2.2 Inverse multi component transform
-      if (tile.codingStyleDefaultParameters.multipleComponentTransform) {
-        var y0items = result[0].items;
-        var y1items = result[1].items;
-        var y2items = result[2].items;
-        for (var j = 0, jj = y0items.length; j < jj; j++) {
-          var y0 = y0items[j], y1 = y1items[j], y2 = y2items[j];
-          var i1 = y0 - ((y2 + y1) >> 2);
-          y1items[j] = i1;
-          y0items[j] = y2 + i1;
-          y2items[j] = y1 + i1;
-        }
-      }
-
-      // Section G.1 DC level shifting to unsigned component values
-      for (var c = 0; c < componentsCount; c++) {
-        var component = components[c];
-        if (component.isSigned)
-          continue;
-
-        var offset = 1 << (component.precision - 1);
-        var tileImage = result[c];
-        var items = tileImage.items;
-        for (var j = 0, jj = items.length; j < jj; j++)
-          items[j] += offset;
-      }
-
-      // To simplify things: shift and clamp output to 8 bit unsigned
-      for (var c = 0; c < componentsCount; c++) {
-        var component = components[c];
-        var offset = component.isSigned ? 128 : 0;
-        var shift = component.precision - 8;
-        var tileImage = result[c];
-        var items = tileImage.items;
-        var data = new Uint8Array(items.length);
-        for (var j = 0, jj = items.length; j < jj; j++) {
-          var value = (items[j] >> shift) + offset;
-          data[j] = value < 0 ? 0 : value > 255 ? 255 : value;
-        }
-        result[c].items = data;
-      }
-
-      resultImages.push(result);
-    }
-    return resultImages;
-  }
-  function initializeTile(context, tileIndex) {
-    var siz = context.SIZ;
-    var componentsCount = siz.Csiz;
-    var tile = context.tiles[tileIndex];
-    var resultTiles = [];
-    for (var c = 0; c < componentsCount; c++) {
-      var component = tile.components[c];
-      var qcdOrQcc = c in context.currentTile.QCC ?
-        context.currentTile.QCC[c] : context.currentTile.QCD;
-      component.quantizationParameters = qcdOrQcc;
-      var codOrCoc = c in context.currentTile.COC ?
-        context.currentTile.COC[c] : context.currentTile.COD;
-      component.codingStyleParameters = codOrCoc;
-    }
-    tile.codingStyleDefaultParameters = context.currentTile.COD;
-  }
-
-  // Section B.10.2 Tag trees
-  var TagTree = (function TagTreeClosure() {
-    function TagTree(width, height) {
-      var levelsLength = log2(Math.max(width, height)) + 1;
-      this.levels = [];
-      for (var i = 0; i < levelsLength; i++) {
-        var level = {
-          width: width,
-          height: height,
-          items: []
-        };
-        this.levels.push(level);
-        width = Math.ceil(width / 2);
-        height = Math.ceil(height / 2);
-      }
-    }
-    TagTree.prototype = {
-      reset: function TagTree_reset(i, j) {
-        var currentLevel = 0, value = 0;
-        while (currentLevel < this.levels.length) {
-          var level = this.levels[currentLevel];
-          var index = i + j * level.width;
-          if (index in level.items) {
-            value = level.items[index];
-            break;
-          }
-          level.index = index;
-          i >>= 1;
-          j >>= 1;
-          currentLevel++;
-        }
-        currentLevel--;
-        var level = this.levels[currentLevel];
-        level.items[level.index] = value;
-        this.currentLevel = currentLevel;
-        delete this.value;
-      },
-      incrementValue: function TagTree_incrementValue() {
-        var level = this.levels[this.currentLevel];
-        level.items[level.index]++;
-      },
-      nextLevel: function TagTree_nextLevel() {
-        var currentLevel = this.currentLevel;
-        var level = this.levels[currentLevel];
-        var value = level.items[level.index];
-        currentLevel--;
-        if (currentLevel < 0) {
-          this.value = value;
-          return false;
-        }
-
-        this.currentLevel = currentLevel;
-        var level = this.levels[currentLevel];
-        level.items[level.index] = value;
-        return true;
-      }
-    };
-    return TagTree;
-  })();
-
-  var InclusionTree = (function InclusionTreeClosure() {
-    function InclusionTree(width, height,  defaultValue) {
-      var levelsLength = log2(Math.max(width, height)) + 1;
-      this.levels = [];
-      for (var i = 0; i < levelsLength; i++) {
-        var items = new Uint8Array(width * height);
-        for (var j = 0, jj = items.length; j < jj; j++)
-          items[j] = defaultValue;
-
-        var level = {
-          width: width,
-          height: height,
-          items: items
-        };
-        this.levels.push(level);
-
-        width = Math.ceil(width / 2);
-        height = Math.ceil(height / 2);
-      }
-    }
-    InclusionTree.prototype = {
-      reset: function InclusionTree_reset(i, j, stopValue) {
-        var currentLevel = 0;
-        while (currentLevel < this.levels.length) {
-          var level = this.levels[currentLevel];
-          var index = i + j * level.width;
-          level.index = index;
-          var value = level.items[index];
-
-          if (value == 0xFF)
-            break;
-
-          if (value > stopValue) {
-            this.currentLevel = currentLevel;
-            // already know about this one, propagating the value to top levels
-            this.propagateValues();
-            return false;
-          }
-
-          i >>= 1;
-          j >>= 1;
-          currentLevel++;
-        }
-        this.currentLevel = currentLevel - 1;
-        return true;
-      },
-      incrementValue: function InclusionTree_incrementValue(stopValue) {
-        var level = this.levels[this.currentLevel];
-        level.items[level.index] = stopValue + 1;
-        this.propagateValues();
-      },
-      propagateValues: function InclusionTree_propagateValues() {
-        var levelIndex = this.currentLevel;
-        var level = this.levels[levelIndex];
-        var currentValue = level.items[level.index];
-        while (--levelIndex >= 0) {
-          var level = this.levels[levelIndex];
-          level.items[level.index] = currentValue;
-        }
-      },
-      nextLevel: function InclusionTree_nextLevel() {
-        var currentLevel = this.currentLevel;
-        var level = this.levels[currentLevel];
-        var value = level.items[level.index];
-        level.items[level.index] = 0xFF;
-        currentLevel--;
-        if (currentLevel < 0)
-          return false;
-
-        this.currentLevel = currentLevel;
-        var level = this.levels[currentLevel];
-        level.items[level.index] = value;
-        return true;
-      }
-    };
-    return InclusionTree;
-  })();
-
-  // Implements C.3. Arithmetic decoding procedures
-  var ArithmeticDecoder = (function ArithmeticDecoderClosure() {
-    var QeTable = [
-      {qe: 0x5601, nmps: 1, nlps: 1, switchFlag: 1},
-      {qe: 0x3401, nmps: 2, nlps: 6, switchFlag: 0},
-      {qe: 0x1801, nmps: 3, nlps: 9, switchFlag: 0},
-      {qe: 0x0AC1, nmps: 4, nlps: 12, switchFlag: 0},
-      {qe: 0x0521, nmps: 5, nlps: 29, switchFlag: 0},
-      {qe: 0x0221, nmps: 38, nlps: 33, switchFlag: 0},
-      {qe: 0x5601, nmps: 7, nlps: 6, switchFlag: 1},
-      {qe: 0x5401, nmps: 8, nlps: 14, switchFlag: 0},
-      {qe: 0x4801, nmps: 9, nlps: 14, switchFlag: 0},
-      {qe: 0x3801, nmps: 10, nlps: 14, switchFlag: 0},
-      {qe: 0x3001, nmps: 11, nlps: 17, switchFlag: 0},
-      {qe: 0x2401, nmps: 12, nlps: 18, switchFlag: 0},
-      {qe: 0x1C01, nmps: 13, nlps: 20, switchFlag: 0},
-      {qe: 0x1601, nmps: 29, nlps: 21, switchFlag: 0},
-      {qe: 0x5601, nmps: 15, nlps: 14, switchFlag: 1},
-      {qe: 0x5401, nmps: 16, nlps: 14, switchFlag: 0},
-      {qe: 0x5101, nmps: 17, nlps: 15, switchFlag: 0},
-      {qe: 0x4801, nmps: 18, nlps: 16, switchFlag: 0},
-      {qe: 0x3801, nmps: 19, nlps: 17, switchFlag: 0},
-      {qe: 0x3401, nmps: 20, nlps: 18, switchFlag: 0},
-      {qe: 0x3001, nmps: 21, nlps: 19, switchFlag: 0},
-      {qe: 0x2801, nmps: 22, nlps: 19, switchFlag: 0},
-      {qe: 0x2401, nmps: 23, nlps: 20, switchFlag: 0},
-      {qe: 0x2201, nmps: 24, nlps: 21, switchFlag: 0},
-      {qe: 0x1C01, nmps: 25, nlps: 22, switchFlag: 0},
-      {qe: 0x1801, nmps: 26, nlps: 23, switchFlag: 0},
-      {qe: 0x1601, nmps: 27, nlps: 24, switchFlag: 0},
-      {qe: 0x1401, nmps: 28, nlps: 25, switchFlag: 0},
-      {qe: 0x1201, nmps: 29, nlps: 26, switchFlag: 0},
-      {qe: 0x1101, nmps: 30, nlps: 27, switchFlag: 0},
-      {qe: 0x0AC1, nmps: 31, nlps: 28, switchFlag: 0},
-      {qe: 0x09C1, nmps: 32, nlps: 29, switchFlag: 0},
-      {qe: 0x08A1, nmps: 33, nlps: 30, switchFlag: 0},
-      {qe: 0x0521, nmps: 34, nlps: 31, switchFlag: 0},
-      {qe: 0x0441, nmps: 35, nlps: 32, switchFlag: 0},
-      {qe: 0x02A1, nmps: 36, nlps: 33, switchFlag: 0},
-      {qe: 0x0221, nmps: 37, nlps: 34, switchFlag: 0},
-      {qe: 0x0141, nmps: 38, nlps: 35, switchFlag: 0},
-      {qe: 0x0111, nmps: 39, nlps: 36, switchFlag: 0},
-      {qe: 0x0085, nmps: 40, nlps: 37, switchFlag: 0},
-      {qe: 0x0049, nmps: 41, nlps: 38, switchFlag: 0},
-      {qe: 0x0025, nmps: 42, nlps: 39, switchFlag: 0},
-      {qe: 0x0015, nmps: 43, nlps: 40, switchFlag: 0},
-      {qe: 0x0009, nmps: 44, nlps: 41, switchFlag: 0},
-      {qe: 0x0005, nmps: 45, nlps: 42, switchFlag: 0},
-      {qe: 0x0001, nmps: 45, nlps: 43, switchFlag: 0},
-      {qe: 0x5601, nmps: 46, nlps: 46, switchFlag: 0}
-    ];
-
-    function ArithmeticDecoder(data, start, end) {
-      this.data = data;
-      this.bp = start;
-      this.dataEnd = end;
-
-      this.chigh = data[start];
-      this.clow = 0;
-
-      this.byteIn();
-
-      this.chigh = ((this.chigh << 7) & 0xFFFF) | ((this.clow >> 9) & 0x7F);
-      this.clow = (this.clow << 7) & 0xFFFF;
-      this.ct -= 7;
-      this.a = 0x8000;
-    }
-
-    ArithmeticDecoder.prototype = {
-      byteIn: function ArithmeticDecoder_byteIn() {
-        var data = this.data;
-        var bp = this.bp;
-        if (data[bp] == 0xFF) {
-          var b1 = data[bp + 1];
-          if (b1 > 0x8F) {
-            this.clow += 0xFF00;
-            this.ct = 8;
-          } else {
-            bp++;
-            this.clow += (data[bp] << 9);
-            this.ct = 7;
-            this.bp = bp;
-          }
-        } else {
-          bp++;
-          this.clow += bp < this.dataEnd ? (data[bp] << 8) : 0xFF00;
-          this.ct = 8;
-          this.bp = bp;
-        }
-        if (this.clow > 0xFFFF) {
-          this.chigh += (this.clow >> 16);
-          this.clow &= 0xFFFF;
-        }
-      },
-      readBit: function ArithmeticDecoder_readBit(cx) {
-        var qeIcx = QeTable[cx.index].qe;
-        this.a -= qeIcx;
-
-        if (this.chigh < qeIcx) {
-          var d = this.exchangeLps(cx);
-          this.renormD();
-          return d;
-        } else {
-          this.chigh -= qeIcx;
-          if ((this.a & 0x8000) == 0) {
-            var d = this.exchangeMps(cx);
-            this.renormD();
-            return d;
-          } else {
-            return cx.mps;
-          }
-        }
-      },
-      renormD: function ArithmeticDecoder_renormD() {
-        do {
-          if (this.ct == 0)
-            this.byteIn();
-
-          this.a <<= 1;
-          this.chigh = ((this.chigh << 1) & 0xFFFF) | ((this.clow >> 15) & 1);
-          this.clow = (this.clow << 1) & 0xFFFF;
-          this.ct--;
-        } while ((this.a & 0x8000) == 0);
-      },
-      exchangeMps: function ArithmeticDecoder_exchangeMps(cx) {
-        var d;
-        var qeTableIcx = QeTable[cx.index];
-        if (this.a < qeTableIcx.qe) {
-          d = 1 - cx.mps;
-
-          if (qeTableIcx.switchFlag == 1) {
-            cx.mps = 1 - cx.mps;
-          }
-          cx.index = qeTableIcx.nlps;
-        } else {
-          d = cx.mps;
-          cx.index = qeTableIcx.nmps;
-        }
-        return d;
-      },
-      exchangeLps: function ArithmeticDecoder_exchangeLps(cx) {
-        var d;
-        var qeTableIcx = QeTable[cx.index];
-        if (this.a < qeTableIcx.qe) {
-          this.a = qeTableIcx.qe;
-          d = cx.mps;
-          cx.index = qeTableIcx.nmps;
-        } else {
-          this.a = qeTableIcx.qe;
-          d = 1 - cx.mps;
-
-          if (qeTableIcx.switchFlag == 1) {
-            cx.mps = 1 - cx.mps;
-          }
-          cx.index = qeTableIcx.nlps;
-        }
-        return d;
-      }
-    };
-
-    return ArithmeticDecoder;
-  })();
-
-  // Section D. Coefficient bit modeling
-  var BitModel = (function BitModelClosure() {
-    // Table D-1
-    // The index is binary presentation: 0dddvvhh, ddd - sum of Di (0..4),
-    // vv - sum of Vi (0..2), and hh - sum of Hi (0..2)
-    var LLAndLHContextsLabel = new Uint8Array([
-      0, 5, 8, 0, 3, 7, 8, 0, 4, 7, 8, 0, 0, 0, 0, 0, 1, 6, 8, 0, 3, 7, 8, 0, 4,
-      7, 8, 0, 0, 0, 0, 0, 2, 6, 8, 0, 3, 7, 8, 0, 4, 7, 8, 0, 0, 0, 0, 0, 2, 6,
-      8, 0, 3, 7, 8, 0, 4, 7, 8, 0, 0, 0, 0, 0, 2, 6, 8, 0, 3, 7, 8, 0, 4, 7, 8
-    ]);
-    var HLContextLabel = new Uint8Array([
-      0, 3, 4, 0, 5, 7, 7, 0, 8, 8, 8, 0, 0, 0, 0, 0, 1, 3, 4, 0, 6, 7, 7, 0, 8,
-      8, 8, 0, 0, 0, 0, 0, 2, 3, 4, 0, 6, 7, 7, 0, 8, 8, 8, 0, 0, 0, 0, 0, 2, 3,
-      4, 0, 6, 7, 7, 0, 8, 8, 8, 0, 0, 0, 0, 0, 2, 3, 4, 0, 6, 7, 7, 0, 8, 8, 8
-    ]);
-    var HHContextLabel = new Uint8Array([
-      0, 1, 2, 0, 1, 2, 2, 0, 2, 2, 2, 0, 0, 0, 0, 0, 3, 4, 5, 0, 4, 5, 5, 0, 5,
-      5, 5, 0, 0, 0, 0, 0, 6, 7, 7, 0, 7, 7, 7, 0, 7, 7, 7, 0, 0, 0, 0, 0, 8, 8,
-      8, 0, 8, 8, 8, 0, 8, 8, 8, 0, 0, 0, 0, 0, 8, 8, 8, 0, 8, 8, 8, 0, 8, 8, 8
-    ]);
-
-    // Table D-2
-    function calcSignContribution(significance0, sign0, significance1, sign1) {
-      if (significance1) {
-        if (!sign1)
-          return significance0 ? (!sign0 ? 1 : 0) : 1;
-        else
-          return significance0 ? (!sign0 ? 0 : -1) : -1;
-      } else
-        return significance0 ? (!sign0 ? 1 : -1) : 0;
-    }
-    // Table D-3
-    var SignContextLabels = [
-      {contextLabel: 13, xorBit: 0},
-      {contextLabel: 12, xorBit: 0},
-      {contextLabel: 11, xorBit: 0},
-      {contextLabel: 10, xorBit: 0},
-      {contextLabel: 9, xorBit: 0},
-      {contextLabel: 10, xorBit: 1},
-      {contextLabel: 11, xorBit: 1},
-      {contextLabel: 12, xorBit: 1},
-      {contextLabel: 13, xorBit: 1}
-    ];
-
-    function BitModel(width, height, subband, zeroBitPlanes) {
-      this.width = width;
-      this.height = height;
-
-      this.contextLabelTable = subband == 'HH' ? HHContextLabel :
-        subband == 'HL' ? HLContextLabel : LLAndLHContextsLabel;
-
-      var coefficientCount = width * height;
-
-      // coefficients outside the encoding region treated as insignificant
-      // add border state cells for significanceState
-      this.neighborsSignificance = new Uint8Array(coefficientCount);
-      this.coefficentsSign = new Uint8Array(coefficientCount);
-      this.coefficentsMagnitude = new Uint32Array(coefficientCount);
-      this.processingFlags = new Uint8Array(coefficientCount);
-
-      var bitsDecoded = new Uint8Array(this.width * this.height);
-      for (var i = 0, ii = bitsDecoded.length; i < ii; i++)
-        bitsDecoded[i] = zeroBitPlanes;
-      this.bitsDecoded = bitsDecoded;
-
-      this.reset();
-    }
-
-    BitModel.prototype = {
-      setDecoder: function BitModel_setDecoder(decoder) {
-        this.decoder = decoder;
-      },
-      reset: function BitModel_reset() {
-        this.uniformContext = {index: 46, mps: 0};
-        this.runLengthContext = {index: 3, mps: 0};
-        this.contexts = [];
-        this.contexts.push({index: 4, mps: 0});
-        for (var i = 1; i <= 16; i++)
-          this.contexts.push({index: 0, mps: 0});
-      },
-      setNeighborsSignificance:
-        function BitModel_setNeighborsSignificance(row, column) {
-        var neighborsSignificance = this.neighborsSignificance;
-        var width = this.width, height = this.height;
-        var index = row * width + column;
-        if (row > 0) {
-          if (column > 0)
-            neighborsSignificance[index - width - 1] += 0x10;
-          if (column + 1 < width)
-            neighborsSignificance[index - width + 1] += 0x10;
-          neighborsSignificance[index - width] += 0x04;
-        }
-        if (row + 1 < height) {
-          if (column > 0)
-            neighborsSignificance[index + width - 1] += 0x10;
-          if (column + 1 < width)
-            neighborsSignificance[index + width + 1] += 0x10;
-          neighborsSignificance[index + width] += 0x04;
-        }
-        if (column > 0)
-          neighborsSignificance[index - 1] += 0x01;
-        if (column + 1 < width)
-          neighborsSignificance[index + 1] += 0x01;
-        neighborsSignificance[index] |= 0x80;
-      },
-      runSignificancePropogationPass:
-        function BitModel_runSignificancePropogationPass() {
-        var decoder = this.decoder;
-        var width = this.width, height = this.height;
-        var coefficentsMagnitude = this.coefficentsMagnitude;
-        var coefficentsSign = this.coefficentsSign;
-        var contextLabels = this.contextLabels;
-        var neighborsSignificance = this.neighborsSignificance;
-        var processingFlags = this.processingFlags;
-        var contexts = this.contexts;
-        var labels = this.contextLabelTable;
-        var bitsDecoded = this.bitsDecoded;
-        // clear processed flag
-        var processedInverseMask = ~1;
-        var processedMask = 1;
-        var firstMagnitudeBitMask = 2;
-        for (var q = 0, qq = width * height; q < qq; q++)
-          processingFlags[q] &= processedInverseMask;
-
-        for (var i0 = 0; i0 < height; i0 += 4) {
-          for (var j = 0; j < width; j++) {
-            var index = i0 * width + j;
-            for (var i1 = 0; i1 < 4; i1++, index += width) {
-              var i = i0 + i1;
-              if (i >= height)
-                break;
-
-              if (coefficentsMagnitude[index] || !neighborsSignificance[index])
-                continue;
-
-              var contextLabel = labels[neighborsSignificance[index]];
-              var cx = contexts[contextLabel];
-              var decision = decoder.readBit(cx);
-              if (decision) {
-                var sign = this.decodeSignBit(i, j);
-                coefficentsSign[index] = sign;
-                coefficentsMagnitude[index] = 1;
-                this.setNeighborsSignificance(i, j);
-                processingFlags[index] |= firstMagnitudeBitMask;
-              }
-              bitsDecoded[index]++;
-              processingFlags[index] |= processedMask;
-            }
-          }
-        }
-      },
-      decodeSignBit: function BitModel_decodeSignBit(row, column) {
-        var width = this.width, height = this.height;
-        var index = row * width + column;
-        var coefficentsMagnitude = this.coefficentsMagnitude;
-        var coefficentsSign = this.coefficentsSign;
-        var horizontalContribution = calcSignContribution(
-          column > 0 && coefficentsMagnitude[index - 1],
-          coefficentsSign[index - 1],
-          column + 1 < width && coefficentsMagnitude[index + 1],
-          coefficentsSign[index + 1]);
-        var verticalContribution = calcSignContribution(
-          row > 0 && coefficentsMagnitude[index - width],
-          coefficentsSign[index - width],
-          row + 1 < height && coefficentsMagnitude[index + width],
-          coefficentsSign[index + width]);
-
-        var contextLabelAndXor = SignContextLabels[
-          3 * (1 - horizontalContribution) + (1 - verticalContribution)];
-        var contextLabel = contextLabelAndXor.contextLabel;
-        var cx = this.contexts[contextLabel];
-        var decoded = this.decoder.readBit(cx);
-        return decoded ^ contextLabelAndXor.xorBit;
-      },
-      runMagnitudeRefinementPass:
-        function BitModel_runMagnitudeRefinementPass() {
-        var decoder = this.decoder;
-        var width = this.width, height = this.height;
-        var coefficentsMagnitude = this.coefficentsMagnitude;
-        var neighborsSignificance = this.neighborsSignificance;
-        var contexts = this.contexts;
-        var bitsDecoded = this.bitsDecoded;
-        var processingFlags = this.processingFlags;
-        var processedMask = 1;
-        var firstMagnitudeBitMask = 2;
-        for (var i0 = 0; i0 < height; i0 += 4) {
-          for (var j = 0; j < width; j++) {
-            for (var i1 = 0; i1 < 4; i1++) {
-              var i = i0 + i1;
-              if (i >= height)
-                break;
-              var index = i * width + j;
-
-              // significant but not those that have just become
-              if (!coefficentsMagnitude[index] ||
-                (processingFlags[index] & processedMask) != 0)
-                continue;
-
-              var contextLabel = 16;
-              if ((processingFlags[index] &
-                firstMagnitudeBitMask) != 0) {
-                processingFlags[i * width + j] ^= firstMagnitudeBitMask;
-                // first refinement
-                var significance = neighborsSignificance[index];
-                var sumOfSignificance = (significance & 3) +
-                  ((significance >> 2) & 3) + ((significance >> 4) & 7);
-                contextLabel = sumOfSignificance >= 1 ? 15 : 14;
-              }
-
-              var cx = contexts[contextLabel];
-              var bit = decoder.readBit(cx);
-              coefficentsMagnitude[index] =
-                (coefficentsMagnitude[index] << 1) | bit;
-              bitsDecoded[index]++;
-              processingFlags[index] |= processedMask;
-            }
-          }
-        }
-      },
-      runCleanupPass: function BitModel_runCleanupPass() {
-        var decoder = this.decoder;
-        var width = this.width, height = this.height;
-        var neighborsSignificance = this.neighborsSignificance;
-        var significanceState = this.significanceState;
-        var coefficentsMagnitude = this.coefficentsMagnitude;
-        var coefficentsSign = this.coefficentsSign;
-        var contexts = this.contexts;
-        var labels = this.contextLabelTable;
-        var bitsDecoded = this.bitsDecoded;
-        var processingFlags = this.processingFlags;
-        var processedMask = 1;
-        var firstMagnitudeBitMask = 2;
-        var oneRowDown = width;
-        var twoRowsDown = width * 2;
-        var threeRowsDown = width * 3;
-        for (var i0 = 0; i0 < height; i0 += 4) {
-          for (var j = 0; j < width; j++) {
-            var index0 = i0 * width + j;
-            // using the property: labels[neighborsSignificance[index]] == 0
-            // when neighborsSignificance[index] == 0
-            var allEmpty = i0 + 3 < height &&
-              processingFlags[index0] == 0 &&
-              processingFlags[index0 + oneRowDown] == 0 &&
-              processingFlags[index0 + twoRowsDown] == 0 &&
-              processingFlags[index0 + threeRowsDown] == 0 &&
-              neighborsSignificance[index0] == 0 &&
-              neighborsSignificance[index0 + oneRowDown] == 0 &&
-              neighborsSignificance[index0 + twoRowsDown] == 0 &&
-              neighborsSignificance[index0 + threeRowsDown] == 0;
-            var i1 = 0, index = index0;
-            var cx, i;
-            if (allEmpty) {
-              cx = this.runLengthContext;
-              var hasSignificantCoefficent = decoder.readBit(cx);
-              if (!hasSignificantCoefficent) {
-                bitsDecoded[index0]++;
-                bitsDecoded[index0 + oneRowDown]++;
-                bitsDecoded[index0 + twoRowsDown]++;
-                bitsDecoded[index0 + threeRowsDown]++;
-                continue; // next column
-              }
-              cx = this.uniformContext;
-              i1 = (decoder.readBit(cx) << 1) | decoder.readBit(cx);
-              i = i0 + i1;
-              index += i1 * width;
-
-              var sign = this.decodeSignBit(i, j);
-              coefficentsSign[index] = sign;
-              coefficentsMagnitude[index] = 1;
-              this.setNeighborsSignificance(i, j);
-              processingFlags[index] |= firstMagnitudeBitMask;
-
-              index = index0;
-              for (var i2 = i0; i2 <= i; i2++, index += width)
-                bitsDecoded[index]++;
-
-              i1++;
-            }
-            for (; i1 < 4; i1++, index += width) {
-              i = i0 + i1;
-              if (i >= height)
-                break;
-
-              if (coefficentsMagnitude[index] ||
-                (processingFlags[index] & processedMask) != 0)
-                continue;
-
-              var contextLabel = labels[neighborsSignificance[index]];
-              cx = contexts[contextLabel];
-              var decision = decoder.readBit(cx);
-              if (decision == 1) {
-                var sign = this.decodeSignBit(i, j);
-                coefficentsSign[index] = sign;
-                coefficentsMagnitude[index] = 1;
-                this.setNeighborsSignificance(i, j);
-                processingFlags[index] |= firstMagnitudeBitMask;
-              }
-              bitsDecoded[index]++;
-            }
-          }
-        }
-      }
-    };
-
-    return BitModel;
-  })();
-
-  // Section F, Discrete wavelet transofrmation
-  var Transform = (function TransformClosure() {
-    function Transform() {
-    }
-    Transform.prototype.calculate =
-      function transformCalculate(subbands, u0, v0) {
-      var ll = subbands[0];
-      for (var i = 1, ii = subbands.length, j = 1; i < ii; i += 3, j++) {
-        ll = this.iterate(ll, subbands[i], subbands[i + 1],
-                          subbands[i + 2], u0, v0);
-      }
-      return ll;
-    };
-    Transform.prototype.iterate = function Transform_iterate(ll, hl, lh, hh,
-                                                            u0, v0) {
-      var llWidth = ll.width, llHeight = ll.height, llItems = ll.items;
-      var hlWidth = hl.width, hlHeight = hl.height, hlItems = hl.items;
-      var lhWidth = lh.width, lhHeight = lh.height, lhItems = lh.items;
-      var hhWidth = hh.width, hhHeight = hh.height, hhItems = hh.items;
-
-      // Section F.3.3 interleave
-      var width = llWidth + hlWidth;
-      var height = llHeight + lhHeight;
-      var items = new Float32Array(width * height);
-      for (var i = 0, ii = llHeight; i < ii; i++) {
-        var k = i * llWidth, l = i * 2 * width;
-        for (var j = 0, jj = llWidth; j < jj; j++, k++, l += 2)
-          items[l] = llItems[k];
-      }
-      for (var i = 0, ii = hlHeight; i < ii; i++) {
-        var k = i * hlWidth, l = i * 2 * width + 1;
-        for (var j = 0, jj = hlWidth; j < jj; j++, k++, l += 2)
-          items[l] = hlItems[k];
-      }
-      for (var i = 0, ii = lhHeight; i < ii; i++) {
-        var k = i * lhWidth, l = (i * 2 + 1) * width;
-        for (var j = 0, jj = lhWidth; j < jj; j++, k++, l += 2)
-          items[l] = lhItems[k];
-      }
-      for (var i = 0, ii = hhHeight; i < ii; i++) {
-        var k = i * hhWidth, l = (i * 2 + 1) * width + 1;
-        for (var j = 0, jj = hhWidth; j < jj; j++, k++, l += 2)
-          items[l] = hhItems[k];
-      }
-
-      var bufferPadding = 4;
-      var bufferLength = new Float32Array(Math.max(width, height) +
-        2 * bufferPadding);
-      var buffer = new Float32Array(bufferLength);
-      var bufferOut = new Float32Array(bufferLength);
-
-      // Section F.3.4 HOR_SR
-      for (var v = 0; v < height; v++) {
-        if (width == 1) {
-          // if width = 1, when u0 even keep items as is, when odd divide by 2
-          if ((u0 % 1) != 0) {
-            items[v * width] /= 2;
-          }
-          continue;
-        }
-
-        var k = v * width;
-        var l = bufferPadding;
-        for (var u = 0; u < width; u++, k++, l++)
-          buffer[l] = items[k];
-
-        // Section F.3.7 extending... using max extension of 4
-        var i1 = bufferPadding - 1, j1 = bufferPadding + 1;
-        var i2 = bufferPadding + width - 2, j2 = bufferPadding + width;
-        buffer[i1--] = buffer[j1++];
-        buffer[j2++] = buffer[i2--];
-        buffer[i1--] = buffer[j1++];
-        buffer[j2++] = buffer[i2--];
-        buffer[i1--] = buffer[j1++];
-        buffer[j2++] = buffer[i2--];
-        buffer[i1--] = buffer[j1++];
-        buffer[j2++] = buffer[i2--];
-
-        this.filter(buffer, bufferPadding, width, u0, bufferOut);
-
-        k = v * width;
-        l = bufferPadding;
-        for (var u = 0; u < width; u++, k++, l++)
-          items[k] = bufferOut[l];
-      }
-
-      // Section F.3.5 VER_SR
-      for (var u = 0; u < width; u++) {
-        if (height == 1) {
-          // if height = 1, when v0 even keep items as is, when odd divide by 2
-          if ((v0 % 1) != 0) {
-            items[u] /= 2;
-          }
-          continue;
-        }
-
-        var k = u;
-        var l = bufferPadding;
-        for (var v = 0; v < height; v++, k += width, l++)
-          buffer[l] = items[k];
-
-        // Section F.3.7 extending... using max extension of 4
-        var i1 = bufferPadding - 1, j1 = bufferPadding + 1;
-        var i2 = bufferPadding + height - 2, j2 = bufferPadding + height;
-        buffer[i1--] = buffer[j1++];
-        buffer[j2++] = buffer[i2--];
-        buffer[i1--] = buffer[j1++];
-        buffer[j2++] = buffer[i2--];
-        buffer[i1--] = buffer[j1++];
-        buffer[j2++] = buffer[i2--];
-        buffer[i1--] = buffer[j1++];
-        buffer[j2++] = buffer[i2--];
-
-        this.filter(buffer, bufferPadding, height, v0, bufferOut);
-
-        k = u;
-        l = bufferPadding;
-        for (var v = 0; v < height; v++, k += width, l++)
-          items[k] = bufferOut[l];
-      }
-      return {
-        width: width,
-        height: height,
-        items: items
-      };
-    };
-    return Transform;
-  })();
-
-  // Section 3.8.2 Irreversible 9-7 filter
-  var IrreversibleTransform = (function IrreversibleTransformClosure() {
-    function IrreversibleTransform() {
-      Transform.call(this);
-    }
-
-    IrreversibleTransform.prototype = Object.create(Transform.prototype);
-    IrreversibleTransform.prototype.filter =
-      function irreversibleTransformFilter(y, offset, length, i0, x) {
-      var i0_ = Math.floor(i0 / 2);
-      var i1_ = Math.floor((i0 + length) / 2);
-      var offset_ = offset - (i0 % 1);
-
-      var alpha = -1.586134342059924;
-      var beta = -0.052980118572961;
-      var gamma = 0.882911075530934;
-      var delta = 0.443506852043971;
-      var K = 1.230174104914001;
-      var K_ = 1 / K;
-
-      // step 1
-      var j = offset_ - 2;
-      for (var n = i0_ - 1, nn = i1_ + 2; n < nn; n++, j += 2)
-        x[j] = K * y[j];
-
-      // step 2
-      var j = offset_ - 3;
-      for (var n = i0_ - 2, nn = i1_ + 2; n < nn; n++, j += 2)
-        x[j] = K_ * y[j];
-
-      // step 3
-      var j = offset_ - 2;
-      for (var n = i0_ - 1, nn = i1_ + 2; n < nn; n++, j += 2)
-        x[j] -= delta * (x[j - 1] + x[j + 1]);
-
-      // step 4
-      var j = offset_ - 1;
-      for (var n = i0_ - 1, nn = i1_ + 1; n < nn; n++, j += 2)
-        x[j] -= gamma * (x[j - 1] + x[j + 1]);
-
-      // step 5
-      var j = offset_;
-      for (var n = i0_, nn = i1_ + 1; n < nn; n++, j += 2)
-        x[j] -= beta * (x[j - 1] + x[j + 1]);
-
-      // step 6
-      var j = offset_ + 1;
-      for (var n = i0_, nn = i1_; n < nn; n++, j += 2)
-        x[j] -= alpha * (x[j - 1] + x[j + 1]);
-    };
-
-    return IrreversibleTransform;
-  })();
-
-  // Section 3.8.1 Reversible 5-3 filter
-  var ReversibleTransform = (function ReversibleTransformClosure() {
-    function ReversibleTransform() {
-      Transform.call(this);
-    }
-
-    ReversibleTransform.prototype = Object.create(Transform.prototype);
-    ReversibleTransform.prototype.filter =
-      function reversibleTransformFilter(y, offset, length, i0, x) {
-      var i0_ = Math.floor(i0 / 2);
-      var i1_ = Math.floor((i0 + length) / 2);
-      var offset_ = offset - (i0 % 1);
-
-      for (var n = i0_, nn = i1_ + 1, j = offset_; n < nn; n++, j += 2)
-        x[j] = y[j] - Math.floor((y[j - 1] + y[j + 1] + 2) / 4);
-
-      for (var n = i0_, nn = i1_, j = offset_ + 1; n < nn; n++, j += 2)
-        x[j] = y[j] + Math.floor((x[j - 1] + x[j + 1]) / 2);
-    };
-
-    return ReversibleTransform;
-  })();
-
-  return JpxImage;
-})();
-
-
-/* -*- 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 bidi = PDFJS.bidi = (function bidiClosure() {
-  // Character types for symbols from 0000 to 00FF.
-  var baseTypes = [
-    'BN', 'BN', 'BN', 'BN', 'BN', 'BN', 'BN', 'BN', 'BN', 'S', 'B', 'S', 'WS',
-    'B', 'BN', 'BN', 'BN', 'BN', 'BN', 'BN', 'BN', 'BN', 'BN', 'BN', 'BN', 'BN',
-    'BN', 'BN', 'B', 'B', 'B', 'S', 'WS', 'ON', 'ON', 'ET', 'ET', 'ET', 'ON',
-    'ON', 'ON', 'ON', 'ON', 'ON', 'CS', 'ON', 'CS', 'ON', 'EN', 'EN', 'EN',
-    'EN', 'EN', 'EN', 'EN', 'EN', 'EN', 'EN', 'ON', 'ON', 'ON', 'ON', 'ON',
-    'ON', 'ON', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L',
-    'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'ON', 'ON',
-    'ON', 'ON', 'ON', 'ON', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L',
-    'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L',
-    'L', 'ON', 'ON', 'ON', 'ON', 'BN', 'BN', 'BN', 'BN', 'BN', 'BN', 'B', 'BN',
-    'BN', 'BN', 'BN', 'BN', 'BN', 'BN', 'BN', 'BN', 'BN', 'BN', 'BN', 'BN',
-    'BN', 'BN', 'BN', 'BN', 'BN', 'BN', 'BN', 'BN', 'BN', 'BN', 'BN', 'BN',
-    'BN', 'CS', 'ON', 'ET', 'ET', 'ET', 'ET', 'ON', 'ON', 'ON', 'ON', 'L', 'ON',
-    'ON', 'ON', 'ON', 'ON', 'ET', 'ET', 'EN', 'EN', 'ON', 'L', 'ON', 'ON', 'ON',
-    'EN', 'L', 'ON', 'ON', 'ON', 'ON', 'ON', 'L', 'L', 'L', 'L', 'L', 'L', 'L',
-    'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L',
-    'L', 'ON', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L',
-    'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L',
-    'L', 'L', 'L', 'ON', 'L', 'L', 'L', 'L', 'L', 'L', 'L', 'L'
-  ];
-
-  // Character types for symbols from 0600 to 06FF
-  var arabicTypes = [
-    'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL',
-    'CS', 'AL', 'ON', 'ON', 'NSM', 'NSM', 'NSM', 'NSM', 'NSM', 'NSM', 'AL',
-    'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL',
-    'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL',
-    'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL',
-    'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL',
-    'AL', 'AL', 'AL', 'AL', 'NSM', 'NSM', 'NSM', 'NSM', 'NSM', 'NSM', 'NSM',
-    'NSM', 'NSM', 'NSM', 'NSM', 'NSM', 'NSM', 'NSM', 'AL', 'AL', 'AL', 'AL',
-    'AL', 'AL', 'AL', 'AN', 'AN', 'AN', 'AN', 'AN', 'AN', 'AN', 'AN', 'AN',
-    'AN', 'ET', 'AN', 'AN', 'AL', 'AL', 'AL', 'NSM', 'AL', 'AL', 'AL', 'AL',
-    'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL',
-    'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL',
-    'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL',
-    'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL',
-    'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL',
-    'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL',
-    'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL',
-    'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL',
-    'AL', 'NSM', 'NSM', 'NSM', 'NSM', 'NSM', 'NSM', 'NSM', 'NSM', 'NSM', 'NSM',
-    'NSM', 'NSM', 'NSM', 'NSM', 'NSM', 'NSM', 'NSM', 'NSM', 'NSM', 'ON', 'NSM',
-    'NSM', 'NSM', 'NSM', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL',
-    'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL', 'AL'
-  ];
-
-  function isOdd(i) {
-    return (i & 1) != 0;
-  }
-
-  function isEven(i) {
-    return (i & 1) == 0;
-  }
-
-  function findUnequal(arr, start, value) {
-    var j;
-    for (var j = start, jj = arr.length; j < jj; ++j) {
-      if (arr[j] != value)
-        return j;
-    }
-    return j;
-  }
-
-  function setValues(arr, start, end, value) {
-    for (var j = start; j < end; ++j) {
-      arr[j] = value;
-    }
-  }
-
-  function reverseValues(arr, start, end) {
-    for (var i = start, j = end - 1; i < j; ++i, --j) {
-      var temp = arr[i];
-      arr[i] = arr[j];
-      arr[j] = temp;
-    }
-  }
-
-  function mirrorGlyphs(c) {
-    /*
-     # BidiMirroring-1.txt
-     0028; 0029 # LEFT PARENTHESIS
-     0029; 0028 # RIGHT PARENTHESIS
-     003C; 003E # LESS-THAN SIGN
-     003E; 003C # GREATER-THAN SIGN
-     005B; 005D # LEFT SQUARE BRACKET
-     005D; 005B # RIGHT SQUARE BRACKET
-     007B; 007D # LEFT CURLY BRACKET
-     007D; 007B # RIGHT CURLY BRACKET
-     00AB; 00BB # LEFT-POINTING DOUBLE ANGLE QUOTATION MARK
-     00BB; 00AB # RIGHT-POINTING DOUBLE ANGLE QUOTATION MARK
-     */
-    switch (c) {
-      case '(':
-        return ')';
-      case ')':
-        return '(';
-      case '<':
-        return '>';
-      case '>':
-        return '<';
-      case ']':
-        return '[';
-      case '[':
-        return ']';
-      case '}':
-        return '{';
-      case '{':
-        return '}';
-      case '\u00AB':
-        return '\u00BB';
-      case '\u00BB':
-        return '\u00AB';
-      default:
-        return c;
-    }
-  }
-
-  function bidi(text, startLevel) {
-    var str = text.str;
-    var strLength = str.length;
-    if (strLength == 0)
-      return str;
-
-    // get types, fill arrays
-
-    var chars = [];
-    var types = [];
-    var oldtypes = [];
-    var numBidi = 0;
-
-    for (var i = 0; i < strLength; ++i) {
-      chars[i] = str.charAt(i);
-
-      var charCode = str.charCodeAt(i);
-      var charType = 'L';
-      if (charCode <= 0x00ff)
-        charType = baseTypes[charCode];
-      else if (0x0590 <= charCode && charCode <= 0x05f4)
-        charType = 'R';
-      else if (0x0600 <= charCode && charCode <= 0x06ff)
-        charType = arabicTypes[charCode & 0xff];
-      else if (0x0700 <= charCode && charCode <= 0x08AC)
-        charType = 'AL';
-
-      if (charType == 'R' || charType == 'AL' || charType == 'AN')
-        numBidi++;
-
-      oldtypes[i] = types[i] = charType;
-    }
-
-    // detect the bidi method
-    //  if there are no rtl characters then no bidi needed
-    //  if less than 30% chars are rtl then string is primarily ltr
-    //  if more than 30% chars are rtl then string is primarily rtl
-    if (numBidi == 0) {
-      text.direction = 'ltr';
-      return str;
-    }
-
-    if (startLevel == -1) {
-      if ((strLength / numBidi) < 0.3) {
-        text.direction = 'ltr';
-        startLevel = 0;
-      } else {
-        text.direction = 'rtl';
-        startLevel = 1;
-      }
-    }
-
-    var levels = [];
-
-    for (var i = 0; i < strLength; ++i) {
-      levels[i] = startLevel;
-    }
-
-    /*
-     X1-X10: skip most of this, since we are NOT doing the embeddings.
-     */
-
-    var e = isOdd(startLevel) ? 'R' : 'L';
-    var sor = e;
-    var eor = sor;
-
-    /*
-     W1. Examine each non-spacing mark (NSM) in the level run, and change the
-     type of the NSM to the type of the previous character. If the NSM is at the
-     start of the level run, it will get the type of sor.
-     */
-
-    var lastType = sor;
-    for (var i = 0; i < strLength; ++i) {
-      if (types[i] == 'NSM')
-        types[i] = lastType;
-      else
-        lastType = types[i];
-    }
-
-    /*
-     W2. Search backwards from each instance of a European number until the
-     first strong type (R, L, AL, or sor) is found.  If an AL is found, change
-     the type of the European number to Arabic number.
-     */
-
-    var lastType = sor;
-    for (var i = 0; i < strLength; ++i) {
-      var t = types[i];
-      if (t == 'EN')
-        types[i] = (lastType == 'AL') ? 'AN' : 'EN';
-      else if (t == 'R' || t == 'L' || t == 'AL')
-        lastType = t;
-    }
-
-    /*
-     W3. Change all ALs to R.
-     */
-
-    for (var i = 0; i < strLength; ++i) {
-      var t = types[i];
-      if (t == 'AL')
-        types[i] = 'R';
-    }
-
-    /*
-     W4. A single European separator between two European numbers changes to a
-     European number. A single common separator between two numbers of the same
-     type changes to that type:
-     */
-
-    for (var i = 1; i < strLength - 1; ++i) {
-      if (types[i] == 'ES' && types[i - 1] == 'EN' && types[i + 1] == 'EN')
-        types[i] = 'EN';
-      if (types[i] == 'CS' && (types[i - 1] == 'EN' || types[i - 1] == 'AN') &&
-          types[i + 1] == types[i - 1])
-        types[i] = types[i - 1];
-    }
-
-    /*
-     W5. A sequence of European terminators adjacent to European numbers changes
-     to all European numbers:
-     */
-
-    for (var i = 0; i < strLength; ++i) {
-      if (types[i] == 'EN') {
-        // do before
-        for (var j = i - 1; j >= 0; --j) {
-          if (types[j] != 'ET')
-            break;
-          types[j] = 'EN';
-        }
-        // do after
-        for (var j = i + 1; j < strLength; --j) {
-          if (types[j] != 'ET')
-            break;
-          types[j] = 'EN';
-        }
-      }
-    }
-
-    /*
-     W6. Otherwise, separators and terminators change to Other Neutral:
-     */
-
-    for (var i = 0; i < strLength; ++i) {
-      var t = types[i];
-      if (t == 'WS' || t == 'ES' || t == 'ET' || t == 'CS')
-        types[i] = 'ON';
-    }
-
-    /*
-     W7. Search backwards from each instance of a European number until the
-     first strong type (R, L, or sor) is found. If an L is found,  then change
-     the type of the European number to L.
-     */
-
-    var lastType = sor;
-    for (var i = 0; i < strLength; ++i) {
-      var t = types[i];
-      if (t == 'EN')
-        types[i] = (lastType == 'L') ? 'L' : 'EN';
-      else if (t == 'R' || t == 'L')
-        lastType = t;
-    }
-
-    /*
-     N1. A sequence of neutrals takes the direction of the surrounding strong
-     text if the text on both sides has the same direction. European and Arabic
-     numbers are treated as though they were R. Start-of-level-run (sor) and
-     end-of-level-run (eor) are used at level run boundaries.
-     */
-
-    for (var i = 0; i < strLength; ++i) {
-      if (types[i] == 'ON') {
-        var end = findUnequal(types, i + 1, 'ON');
-        var before = sor;
-        if (i > 0)
-          before = types[i - 1];
-        var after = eor;
-        if (end + 1 < strLength)
-          after = types[end + 1];
-        if (before != 'L')
-          before = 'R';
-        if (after != 'L')
-          after = 'R';
-        if (before == after)
-          setValues(types, i, end, before);
-        i = end - 1; // reset to end (-1 so next iteration is ok)
-      }
-    }
-
-    /*
-     N2. Any remaining neutrals take the embedding direction.
-     */
-
-    for (var i = 0; i < strLength; ++i) {
-      if (types[i] == 'ON')
-        types[i] = e;
-    }
-
-    /*
-     I1. For all characters with an even (left-to-right) embedding direction,
-     those of type R go up one level and those of type AN or EN go up two
-     levels.
-     I2. For all characters with an odd (right-to-left) embedding direction,
-     those of type L, EN or AN go up one level.
-     */
-
-    for (var i = 0; i < strLength; ++i) {
-      var t = types[i];
-      if (isEven(levels[i])) {
-        if (t == 'R') {
-          levels[i] += 1;
-        } else if (t == 'AN' || t == 'EN') {
-          levels[i] += 2;
-        }
-      } else { // isOdd, so
-        if (t == 'L' || t == 'AN' || t == 'EN') {
-          levels[i] += 1;
-        }
-      }
-    }
-
-    /*
-     L1. On each line, reset the embedding level of the following characters to
-     the paragraph embedding level:
-
-     segment separators,
-     paragraph separators,
-     any sequence of whitespace characters preceding a segment separator or
-     paragraph separator, and any sequence of white space characters at the end
-     of the line.
-     */
-
-    // don't bother as text is only single line
-
-    /*
-     L2. From the highest level found in the text to the lowest odd level on
-     each line, reverse any contiguous sequence of characters that are at that
-     level or higher.
-     */
-
-    // find highest level & lowest odd level
-
-    var highestLevel = -1;
-    var lowestOddLevel = 99;
-    for (var i = 0, ii = levels.length; i < ii; ++i) {
-      var level = levels[i];
-      if (highestLevel < level)
-        highestLevel = level;
-      if (lowestOddLevel > level && isOdd(level))
-        lowestOddLevel = level;
-    }
-
-    // now reverse between those limits
-
-    for (var level = highestLevel; level >= lowestOddLevel; --level) {
-      // find segments to reverse
-      var start = -1;
-      for (var i = 0, ii = levels.length; i < ii; ++i) {
-        if (levels[i] < level) {
-          if (start >= 0) {
-            reverseValues(chars, start, i);
-            start = -1;
-          }
-        } else if (start < 0) {
-          start = i;
-        }
-      }
-      if (start >= 0) {
-        reverseValues(chars, start, levels.length);
-      }
-    }
-
-    /*
-     L3. Combining marks applied to a right-to-left base character will at this
-     point precede their base character. If the rendering engine expects them to
-     follow the base characters in the final display process, then the ordering
-     of the marks and the base character must be reversed.
-     */
-
-    // don't bother for now
-
-    /*
-     L4. A character that possesses the mirrored property as specified by
-     Section 4.7, Mirrored, must be depicted by a mirrored glyph if the resolved
-     directionality of that character is R.
-     */
-
-    // don't mirror as characters are already mirrored in the pdf
-
-    // Finally, return string
-
-    var result = '';
-    for (var i = 0, ii = chars.length; i < ii; ++i) {
-      var ch = chars[i];
-      if (ch != '<' && ch != '>')
-        result += ch;
-    }
-    return result;
-  }
-
-  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)) {
-      error('Metadata: Invalid metadata object');
-    }
-
-    this.metaDocument = meta;
-    this.metadata = {};
-    this.parse();
-  }
-
-  Metadata.prototype = {
-    parse: function Metadata_parse() {
-      var doc = this.metaDocument;
-      var rdf = doc.documentElement;
-
-      if (rdf.nodeName.toLowerCase() !== 'rdf:rdf') { // Wrapped in <xmpmeta>
-        rdf = rdf.firstChild;
-        while (rdf && rdf.nodeName.toLowerCase() !== 'rdf:rdf')
-          rdf = rdf.nextSibling;
-      }
-
-      var nodeName = (rdf) ? rdf.nodeName.toLowerCase() : null;
-      if (!rdf || nodeName !== 'rdf:rdf' || !rdf.hasChildNodes())
-        return;
-
-      var childNodes = rdf.childNodes, desc, namespace, entries, entry;
-
-      for (var i = 0, length = childNodes.length; i < length; i++) {
-        desc = childNodes[i];
-        if (desc.nodeName.toLowerCase() !== 'rdf:description')
-          continue;
-
-        entries = [];
-        for (var ii = 0, iLength = desc.childNodes.length; ii < iLength; ii++) {
-          if (desc.childNodes[ii].nodeName.toLowerCase() !== '#text')
-            entries.push(desc.childNodes[ii]);
-        }
-
-        for (ii = 0, iLength = entries.length; ii < iLength; ii++) {
-          var entry = entries[ii];
-          var name = entry.nodeName.toLowerCase();
-          this.metadata[name] = entry.textContent.trim();
-        }
-      }
-    },
-
-    get: function Metadata_get(name) {
-      return this.metadata[name] || null;
-    },
-
-    has: function Metadata_has(name) {
-      return typeof this.metadata[name] !== 'undefined';
-    }
-  };
-
-  return Metadata;
-})();
-
-}).call((typeof window === 'undefined') ? this : window);
diff --git a/apps/files_pdfviewer/js/pdfjs/compatibility.js b/apps/files_pdfviewer/js/pdfjs/compatibility.js
deleted file mode 100644
index 528841bb61..0000000000
--- a/apps/files_pdfviewer/js/pdfjs/compatibility.js
+++ /dev/null
@@ -1,340 +0,0 @@
-/* -*- 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
deleted file mode 100755
index df100e780b..0000000000
--- a/apps/files_pdfviewer/js/pdfjs/update.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-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
deleted file mode 100644
index 90dd1eef02..0000000000
--- a/apps/files_pdfviewer/js/pdfjs/viewer.js
+++ /dev/null
@@ -1,1873 +0,0 @@
-/* -*- 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 container = document.getElementById('viewer');
-  if (!container)
-    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 && PDFView.active &&
-      (document.getElementById('pageWidthOption').selected ||
-      document.getElementById('pageFitOption').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);
-
-
diff --git a/apps/files_pdfviewer/js/pdfjs/web/images/bookmark.svg b/apps/files_pdfviewer/js/pdfjs/web/images/bookmark.svg
deleted file mode 100644
index bee6efefdf..0000000000
--- a/apps/files_pdfviewer/js/pdfjs/web/images/bookmark.svg
+++ /dev/null
@@ -1,662 +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://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"
-   inkscape:export-ydpi="240.00000"
-   inkscape:export-xdpi="240.00000"
-   inkscape:export-filename="/home/jimmac/gfx/novell/pdes/trunk/docs/BIGmime-text.png"
-   sodipodi:docname="bookmark.svg"
-   inkscape:version="0.48.1 r9760"
-   sodipodi:version="0.32"
-   id="svg249"
-   height="48.000000px"
-   width="48.000000px"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   version="1.1"
-   viewbox="0 0 48 48">
-  <defs
-     id="defs3">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 24 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="48 : 24 : 1"
-       inkscape:persp3d-origin="24 : 16 : 1"
-       id="perspective100" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5060"
-       id="radialGradient5031"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)"
-       cx="605.71429"
-       cy="486.64789"
-       fx="605.71429"
-       fy="486.64789"
-       r="117.14286" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5060">
-      <stop
-         style="stop-color:black;stop-opacity:1;"
-         offset="0"
-         id="stop5062" />
-      <stop
-         style="stop-color:black;stop-opacity:0;"
-         offset="1"
-         id="stop5064" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5060"
-       id="radialGradient5029"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)"
-       cx="605.71429"
-       cy="486.64789"
-       fx="605.71429"
-       fy="486.64789"
-       r="117.14286" />
-    <linearGradient
-       id="linearGradient5048">
-      <stop
-         style="stop-color:black;stop-opacity:0;"
-         offset="0"
-         id="stop5050" />
-      <stop
-         id="stop5056"
-         offset="0.5"
-         style="stop-color:black;stop-opacity:1;" />
-      <stop
-         style="stop-color:black;stop-opacity:0;"
-         offset="1"
-         id="stop5052" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5048"
-       id="linearGradient5027"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)"
-       x1="302.85715"
-       y1="366.64789"
-       x2="302.85715"
-       y2="609.50507" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient2906">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop2908" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop2910" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient2896">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop2898" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop2900" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2598">
-      <stop
-         style="stop-color:#859dbc;stop-opacity:1;"
-         offset="0"
-         id="stop2600" />
-      <stop
-         style="stop-color:#547299;stop-opacity:1;"
-         offset="1"
-         id="stop2602" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2590">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop2592" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop2594" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient5897">
-      <stop
-         style="stop-color:#000000;stop-opacity:0.0000000;"
-         offset="0.0000000"
-         id="stop5899" />
-      <stop
-         id="stop5905"
-         offset="0.50000000"
-         style="stop-color:#000000;stop-opacity:0.56701028;" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0.0000000;"
-         offset="1.0000000"
-         id="stop5901" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5866">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop5868" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop5870" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4404">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop4406" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop4408" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4542">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop4544" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop4546" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient15662">
-      <stop
-         id="stop15664"
-         offset="0.0000000"
-         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
-      <stop
-         id="stop15666"
-         offset="1.0000000"
-         style="stop-color:#f8f8f8;stop-opacity:1.0000000;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient269">
-      <stop
-         id="stop270"
-         offset="0.0000000"
-         style="stop-color:#a3a3a3;stop-opacity:1.0000000;" />
-      <stop
-         id="stop271"
-         offset="1.0000000"
-         style="stop-color:#4c4c4c;stop-opacity:1.0000000;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient259">
-      <stop
-         id="stop260"
-         offset="0.0000000"
-         style="stop-color:#fafafa;stop-opacity:1.0000000;" />
-      <stop
-         id="stop261"
-         offset="1.0000000"
-         style="stop-color:#bbbbbb;stop-opacity:1.0000000;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient12512">
-      <stop
-         id="stop12513"
-         offset="0.0000000"
-         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
-      <stop
-         id="stop12517"
-         offset="0.50000000"
-         style="stop-color:#fff520;stop-opacity:0.89108908;" />
-      <stop
-         id="stop12514"
-         offset="1.0000000"
-         style="stop-color:#fff300;stop-opacity:0.0000000;" />
-    </linearGradient>
-    <radialGradient
-       r="14.375000"
-       fy="125.00000"
-       fx="55.000000"
-       cy="125.00000"
-       cx="55.000000"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient278"
-       xlink:href="#linearGradient12512"
-       inkscape:collect="always" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient269"
-       id="radialGradient15656"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.968273,0.000000,0.000000,1.036374,3.250000,0.489522)"
-       cx="8.8244190"
-       cy="3.7561285"
-       fx="8.8244190"
-       fy="3.7561285"
-       r="37.751713" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient259"
-       id="radialGradient15658"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.960493,0.000000,0.000000,1.044769,-0.103553,-0.159183)"
-       cx="33.966679"
-       cy="35.736916"
-       fx="33.966679"
-       fy="35.736916"
-       r="86.708450" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient15662"
-       id="radialGradient15668"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.973033,0.000000,0.000000,1.034937,3.168754,0.555277)"
-       cx="8.1435566"
-       cy="7.2678967"
-       fx="8.1435566"
-       fy="7.2678967"
-       r="38.158695" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4542"
-       id="radialGradient4548"
-       cx="24.306795"
-       cy="42.07798"
-       fx="24.306795"
-       fy="42.07798"
-       r="15.821514"
-       gradientTransform="matrix(1.000000,0.000000,0.000000,0.284916,0.000000,30.08928)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4404"
-       id="linearGradient4410"
-       x1="16.812500"
-       y1="1.8750000"
-       x2="16.812500"
-       y2="4.7187500"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.319549,0.000000,0.000000,1.362060,40.38853,-0.362057)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5866"
-       id="linearGradient5872"
-       x1="19.452349"
-       y1="13.174174"
-       x2="19.685436"
-       y2="27.095339"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.224255,0.000000,0.000000,1.282176,0.371569,0.264657)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5897"
-       id="linearGradient5903"
-       x1="19.000000"
-       y1="9.7738247"
-       x2="19.000000"
-       y2="15.635596"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.319549,0.000000,0.000000,2.133926,-4.476133,-14.64845)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2590"
-       id="linearGradient2596"
-       x1="19.970377"
-       y1="6.1167107"
-       x2="19.970377"
-       y2="2.53125"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.319549,0.000000,0.000000,1.280356,-5.745298,0.249007)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2598"
-       id="linearGradient2604"
-       x1="18.431311"
-       y1="19.119474"
-       x2="18.402472"
-       y2="4.2702327"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.319549,0.000000,0.000000,1.299013,-3.106200,-1.336165)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2896"
-       id="linearGradient2902"
-       x1="14.584077"
-       y1="1.6392649"
-       x2="14.552828"
-       y2="2.4912448"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.000000,0.000000,0.000000,1.594214,0.000000,-0.790249)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2906"
-       id="linearGradient2912"
-       x1="13.354311"
-       y1="1.4866425"
-       x2="14.075844"
-       y2="2.4017651"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.000000,0.000000,0.000000,1.184816,0.000000,-0.727880)" />
-  </defs>
-  <sodipodi:namedview
-     inkscape:window-y="158"
-     inkscape:window-x="433"
-     inkscape:window-height="690"
-     inkscape:window-width="872"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     showgrid="false"
-     inkscape:current-layer="layer5"
-     inkscape:cy="24"
-     inkscape:cx="24"
-     inkscape:zoom="9.8333333"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     borderopacity="0.25490196"
-     bordercolor="#666666"
-     pagecolor="#ffffff"
-     id="base"
-     inkscape:showpageshadow="false"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata4">
-    <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>New Bookmark</dc:title>
-        <dc:subject>
-          <rdf:Bag>
-            <rdf:li>bookmark</rdf:li>
-            <rdf:li>remember</rdf:li>
-            <rdf:li>favorite</rdf:li>
-          </rdf:Bag>
-        </dc:subject>
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/publicdomain/" />
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Andreas Nilsson</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <dc:source />
-        <dc:contributor>
-          <cc:Agent>
-            <dc:title>Jakub Steiner</dc:title>
-          </cc:Agent>
-        </dc:contributor>
-        <dc:description>create bookmark action</dc:description>
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/publicdomain/">
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Reproduction" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Distribution" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:groupmode="layer"
-     id="layer6"
-     inkscape:label="Shadow">
-    <g
-       style="display:inline"
-       id="g5022"
-       transform="matrix(2.165152e-2,0,0,1.485743e-2,43.0076,42.68539)">
-      <rect
-         y="-150.69685"
-         x="-1559.2523"
-         height="478.35718"
-         width="1339.6335"
-         id="rect4173"
-         style="opacity:0.40206185;color:black;fill:url(#linearGradient5027);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;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" />
-      <path
-         sodipodi:nodetypes="cccc"
-         id="path5058"
-         d="M -219.61876,-150.68038 C -219.61876,-150.68038 -219.61876,327.65041 -219.61876,327.65041 C -76.744594,328.55086 125.78146,220.48075 125.78138,88.454235 C 125.78138,-43.572302 -33.655436,-150.68036 -219.61876,-150.68038 z "
-         style="opacity:0.40206185;color:black;fill:url(#radialGradient5029);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;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" />
-      <path
-         style="opacity:0.40206185;color:black;fill:url(#radialGradient5031);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;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"
-         d="M -1559.2523,-150.68038 C -1559.2523,-150.68038 -1559.2523,327.65041 -1559.2523,327.65041 C -1702.1265,328.55086 -1904.6525,220.48075 -1904.6525,88.454235 C -1904.6525,-43.572302 -1745.2157,-150.68036 -1559.2523,-150.68038 z "
-         id="path5018"
-         sodipodi:nodetypes="cccc" />
-    </g>
-  </g>
-  <g
-     style="display:inline"
-     inkscape:groupmode="layer"
-     inkscape:label="Base"
-     id="layer1">
-    <rect
-       style="color:#000000;fill:url(#radialGradient15658);fill-opacity:1.0000000;fill-rule:nonzero;stroke:url(#radialGradient15656);stroke-width:0.99999982;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:block;overflow:visible"
-       id="rect15391"
-       width="34.875000"
-       height="41.063431"
-       x="6.5000000"
-       y="3.5000000"
-       ry="1.1490481"
-       rx="1.1490486" />
-    <rect
-       style="color:#000000;fill:none;fill-opacity:1.0000000;fill-rule:nonzero;stroke:url(#radialGradient15668);stroke-width:0.99999958;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:block;overflow:visible"
-       id="rect15660"
-       width="32.937012"
-       height="39.028210"
-       x="7.5024552"
-       y="4.5010486"
-       ry="0.14904849"
-       rx="0.14904852" />
-    <path
-       style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:0.98855311;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:0.017543854"
-       d="M 11.505723,5.4942766 L 11.505723,43.400869"
-       id="path15672"
-       sodipodi:nodetypes="cc" />
-    <path
-       style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4.0000000;stroke-opacity:0.20467831"
-       d="M 12.500000,5.0205154 L 12.500000,43.038228"
-       id="path15674"
-       sodipodi:nodetypes="cc" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer5"
-     inkscape:label="Text"
-     style="display:inline">
-    <g
-       id="g2188">
-      <rect
-         style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;visibility:visible;display:block;overflow:visible"
-         id="rect15686"
-         width="20.000006"
-         height="1.0000000"
-         x="15.999994"
-         y="9.0000000"
-         rx="0.13778631"
-         ry="0.065390877" />
-      <rect
-         style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;visibility:visible;display:block;overflow:visible"
-         id="rect15688"
-         width="20.000006"
-         height="1.0000000"
-         x="15.999994"
-         y="11.000000"
-         rx="0.13778631"
-         ry="0.065390877" />
-      <rect
-         style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;visibility:visible;display:block;overflow:visible"
-         id="rect15690"
-         width="20.000006"
-         height="1.0000000"
-         x="15.999994"
-         y="13.000000"
-         rx="0.13778631"
-         ry="0.065390877" />
-      <rect
-         style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;visibility:visible;display:block;overflow:visible"
-         id="rect15692"
-         width="20.000006"
-         height="1.0000000"
-         x="15.999994"
-         y="15.000000"
-         rx="0.13778631"
-         ry="0.065390877" />
-      <rect
-         style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;visibility:visible;display:block;overflow:visible"
-         id="rect15694"
-         width="20.000006"
-         height="1.0000000"
-         x="15.999994"
-         y="17.000000"
-         rx="0.13778631"
-         ry="0.065390877" />
-      <rect
-         style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;visibility:visible;display:block;overflow:visible"
-         id="rect15696"
-         width="20.000006"
-         height="1.0000000"
-         x="15.999994"
-         y="19.000000"
-         rx="0.13778631"
-         ry="0.065390877" />
-      <rect
-         style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;visibility:visible;display:block;overflow:visible"
-         id="rect15698"
-         width="20.000006"
-         height="1.0000000"
-         x="15.999994"
-         y="21.000000"
-         rx="0.13778631"
-         ry="0.065390877" />
-      <rect
-         style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;visibility:visible;display:block;overflow:visible"
-         id="rect15700"
-         width="20.000006"
-         height="1.0000000"
-         x="15.999994"
-         y="23.000000"
-         rx="0.13778631"
-         ry="0.065390877" />
-      <rect
-         style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;visibility:visible;display:block;overflow:visible"
-         id="rect15732"
-         width="9.0000057"
-         height="1.0000000"
-         x="15.999986"
-         y="25.000000"
-         rx="0.062003858"
-         ry="0.065390877" />
-      <rect
-         style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;visibility:visible;display:block;overflow:visible"
-         id="rect15736"
-         width="20.000006"
-         height="1.0000000"
-         x="15.999986"
-         y="29.000000"
-         rx="0.13778631"
-         ry="0.065390877" />
-      <rect
-         style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;visibility:visible;display:block;overflow:visible"
-         id="rect15738"
-         width="20.000006"
-         height="1.0000000"
-         x="15.999986"
-         y="31.000000"
-         rx="0.13778631"
-         ry="0.065390877" />
-      <rect
-         style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;visibility:visible;display:block;overflow:visible"
-         id="rect15740"
-         width="20.000006"
-         height="1.0000000"
-         x="15.999986"
-         y="33.000000"
-         rx="0.13778631"
-         ry="0.065390877" />
-      <rect
-         style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;visibility:visible;display:block;overflow:visible"
-         id="rect15742"
-         width="20.000006"
-         height="1.0000000"
-         x="15.999986"
-         y="35.000000"
-         rx="0.13778631"
-         ry="0.065390877" />
-      <rect
-         style="color:#000000;fill:#9b9b9b;fill-opacity:0.54970759;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:0.081871338;visibility:visible;display:block;overflow:visible"
-         id="rect15744"
-         width="14.000014"
-         height="1.0000000"
-         x="15.999986"
-         y="37.000000"
-         rx="0.096450485"
-         ry="0.065390877" />
-    </g>
-    <path
-       style="opacity:0.28021976;fill:url(#linearGradient5872);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.25pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 28.245858,31.324906 L 21.147869,27.133701 L 14.30757,30.8838 L 13.761859,3.9475667 L 28.549598,3.9475667 L 28.245858,31.324906 z "
-       id="path5138"
-       sodipodi:nodetypes="cccccc" />
-    <path
-       style="fill:url(#linearGradient2604);fill-opacity:1;fill-rule:evenodd;stroke:#364878;stroke-width:0.99999988;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;display:inline"
-       d="M 12.427339,3.5180202 C 12.427339,3.5180202 12.240033,0.60520607 15.107867,0.54270607 L 25.119343,0.50728624 C 26.277287,0.50728624 26.581888,1.1910178 26.581888,2.1095589 L 26.581888,29.729916 L 20.545426,24.533862 L 14.674346,29.729916 L 14.591655,3.519629 L 12.427339,3.5180202 z "
-       id="path2204"
-       sodipodi:nodetypes="ccccccccc" />
-    <path
-       style="opacity:0.4450549;fill:url(#linearGradient4410);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.25pt;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 13.030252,3.0117919 C 13.011046,2.225362 13.312918,1.0801307 15.375418,1.0176307 L 25.027906,1 C 25.640922,1 26.090152,1.1674319 26.090152,1.7994802 L 26.060994,10.491851 L 15.317102,10.491851 L 15.192102,2.9993251 C 15.192102,2.9993251 13.030252,3.0117919 13.030252,3.0117919 z "
-       id="path3668"
-       sodipodi:nodetypes="cccccccs" />
-    <rect
-       style="opacity:0.28021976;fill:url(#linearGradient5903);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="rect5895"
-       width="10.556392"
-       height="12.803556"
-       x="15.317101"
-       y="6.6907959"
-       rx="0.062003858"
-       ry="0.065390877" />
-    <path
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient2596);stroke-width:1.00000012;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:0.19125683;display:inline"
-       d="M 24.476832,2.2095507 L 25.575535,3.113139 L 25.547445,27.511911 L 20.497463,23.203758 L 15.704084,27.415203 L 15.699081,2.7495618 L 24.476832,2.2095507 z "
-       id="path5969"
-       sodipodi:nodetypes="ccccccc" />
-    <path
-       style="opacity:0.48295456;color:#000000;fill:url(#linearGradient2912);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.10533953;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"
-       d="M 15.158602,3.9384083 L 15.114407,1.0335178 C 12.983906,1.0335178 12.993087,2.9680775 12.993087,3.9384083 L 15.158602,3.9384083 z "
-       id="path2894"
-       sodipodi:nodetypes="cccc" />
-    <path
-       sodipodi:nodetypes="cccc"
-       id="path2904"
-       d="M 15.158602,3.9384086 L 15.114407,1.8247593 C 12.81631,1.8426926 12.993087,3.9384086 12.993087,3.9384086 L 15.158602,3.9384086 z "
-       style="opacity:0.35795455;color:#000000;fill:url(#linearGradient2902);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1.10533953;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" />
-  </g>
-</svg>
diff --git a/apps/files_pdfviewer/js/pdfjs/web/images/check.svg b/apps/files_pdfviewer/js/pdfjs/web/images/check.svg
deleted file mode 100644
index e0e1590a93..0000000000
--- a/apps/files_pdfviewer/js/pdfjs/web/images/check.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg height="40" width="40" xmlns="http://www.w3.org/2000/svg">
-  <path d="M2.379,14.729 5.208,11.899 12.958,19.648 25.877,6.733 28.707,9.561 12.958,25.308z" fill="#333333"></path>
-</svg>
diff --git a/apps/files_pdfviewer/js/pdfjs/web/images/comment.svg b/apps/files_pdfviewer/js/pdfjs/web/images/comment.svg
deleted file mode 100644
index 84feef1c89..0000000000
--- a/apps/files_pdfviewer/js/pdfjs/web/images/comment.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg height="40" width="40" xmlns="http://www.w3.org/2000/svg">
-  <path d="M16,5.333c-7.732,0-14,4.701-14,10.5c0,1.982,0.741,3.833,2.016,5.414L2,25.667l5.613-1.441c2.339,1.317,5.237,2.107,8.387,2.107c7.732,0,14-4.701,14-10.5C30,10.034,23.732,5.333,16,5.333z" fill="#333333"></path>
-</svg>
diff --git a/apps/files_pdfviewer/js/pdfjs/web/images/document-print.svg b/apps/files_pdfviewer/js/pdfjs/web/images/document-print.svg
deleted file mode 100644
index 4d062fbb69..0000000000
--- a/apps/files_pdfviewer/js/pdfjs/web/images/document-print.svg
+++ /dev/null
@@ -1,533 +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://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"
-   sodipodi:docname="document-print.svg"
-   sodipodi:docbase="/home/jimmac/src/cvs/tango-icon-theme/scalable/actions"
-   inkscape:version="0.46"
-   sodipodi:version="0.32"
-   id="svg2994"
-   height="48px"
-   width="48px"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   viewbox="0 0 48 48">
-  <defs
-     id="defs3">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 24 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="48 : 24 : 1"
-       inkscape:persp3d-origin="24 : 16 : 1"
-       id="perspective84" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5060"
-       id="radialGradient5031"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)"
-       cx="605.71429"
-       cy="486.64789"
-       fx="605.71429"
-       fy="486.64789"
-       r="117.14286" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5060">
-      <stop
-         style="stop-color:black;stop-opacity:1;"
-         offset="0"
-         id="stop5062" />
-      <stop
-         style="stop-color:black;stop-opacity:0;"
-         offset="1"
-         id="stop5064" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5060"
-       id="radialGradient5029"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)"
-       cx="605.71429"
-       cy="486.64789"
-       fx="605.71429"
-       fy="486.64789"
-       r="117.14286" />
-    <linearGradient
-       id="linearGradient5048">
-      <stop
-         style="stop-color:black;stop-opacity:0;"
-         offset="0"
-         id="stop5050" />
-      <stop
-         id="stop5056"
-         offset="0.5"
-         style="stop-color:black;stop-opacity:1;" />
-      <stop
-         style="stop-color:black;stop-opacity:0;"
-         offset="1"
-         id="stop5052" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5048"
-       id="linearGradient5027"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)"
-       x1="302.85715"
-       y1="366.64789"
-       x2="302.85715"
-       y2="609.50507" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient7612">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop7614" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop7616" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7612"
-       id="radialGradient7618"
-       cx="24.000000"
-       cy="41.875000"
-       fx="24.000000"
-       fy="41.875000"
-       r="19.125000"
-       gradientTransform="matrix(1.000000,0.000000,0.000000,0.333333,0.000000,27.91667)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient4762">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.12371134;"
-         offset="0.0000000"
-         id="stop4764" />
-      <stop
-         id="stop4768"
-         offset="0.10344828"
-         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop4766" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4741">
-      <stop
-         id="stop4743"
-         offset="0.0000000"
-         style="stop-color:#dcdcda;stop-opacity:1.0000000;" />
-      <stop
-         id="stop4745"
-         offset="1.0000000"
-         style="stop-color:#bab9b7;stop-opacity:1.0000000;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4733">
-      <stop
-         id="stop4735"
-         offset="0.0000000"
-         style="stop-color:#000000;stop-opacity:0.23711340;" />
-      <stop
-         id="stop4737"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4698">
-      <stop
-         id="stop4700"
-         offset="0.0000000"
-         style="stop-color:#fffffd;stop-opacity:1.0000000;" />
-      <stop
-         style="stop-color:#bbbbb9;stop-opacity:1.0000000;"
-         offset="0.50000000"
-         id="stop4706" />
-      <stop
-         id="stop4702"
-         offset="1.0000000"
-         style="stop-color:#000000;stop-opacity:1.0000000;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4688">
-      <stop
-         id="stop4690"
-         offset="0.0000000"
-         style="stop-color:#666666;stop-opacity:1.0000000;" />
-      <stop
-         id="stop4692"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4680"
-       inkscape:collect="always">
-      <stop
-         id="stop4682"
-         offset="0"
-         style="stop-color:#f7f6f5;stop-opacity:1;" />
-      <stop
-         id="stop4684"
-         offset="1"
-         style="stop-color:#f7f6f5;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4668">
-      <stop
-         id="stop4670"
-         offset="0"
-         style="stop-color:#8e8d87;stop-opacity:1;" />
-      <stop
-         style="stop-color:#cbc9c1;stop-opacity:1.0000000;"
-         offset="0.27586207"
-         id="stop4676" />
-      <stop
-         id="stop4672"
-         offset="1.0000000"
-         style="stop-color:#8e8d87;stop-opacity:1.0000000;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient259">
-      <stop
-         id="stop260"
-         offset="0.0000000"
-         style="stop-color:#e0e0e0;stop-opacity:1.0000000;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1.0000000;"
-         offset="0.40546969"
-         id="stop4886" />
-      <stop
-         style="stop-color:#cdcdcd;stop-opacity:1.0000000;"
-         offset="0.53448278"
-         id="stop4884" />
-      <stop
-         id="stop261"
-         offset="1.0000000"
-         style="stop-color:#494949;stop-opacity:1.0000000;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient15662">
-      <stop
-         id="stop15664"
-         offset="0.0000000"
-         style="stop-color:#ffffff;stop-opacity:0.0000000;" />
-      <stop
-         id="stop15666"
-         offset="1.0000000"
-         style="stop-color:#f8f8f8;stop-opacity:1.0000000;" />
-    </linearGradient>
-    <radialGradient
-       r="2.1227016"
-       fy="26.925594"
-       fx="9.1295490"
-       cy="26.925594"
-       cx="9.1295490"
-       gradientUnits="userSpaceOnUse"
-       id="radialGradient1433"
-       xlink:href="#linearGradient4698"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="72.064316"
-       x2="9.9128132"
-       y1="57.227650"
-       x1="9.8698082"
-       gradientTransform="matrix(2.772086,0.000000,0.000000,0.360739,0.618718,2.883883)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient1447"
-       xlink:href="#linearGradient4733"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="54.136139"
-       x2="10.338233"
-       y1="64.652260"
-       x1="10.338233"
-       gradientTransform="matrix(2.369844,0.000000,0.000000,0.421969,0.000000,2.000000)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient1451"
-       xlink:href="#linearGradient4680"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="62.282467"
-       x2="9.7052784"
-       y1="70.724976"
-       x1="9.7316532"
-       gradientTransform="matrix(2.369844,0.000000,0.000000,0.421969,0.000000,2.000000)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient1453"
-       xlink:href="#linearGradient4688"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="19.337463"
-       x2="20.717800"
-       y1="25.140253"
-       x1="20.771229"
-       gradientTransform="matrix(1.198769,0,0,0.853565,-0.143086,2.034513)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient1456"
-       xlink:href="#linearGradient15662"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="25.247311"
-       x2="24.789707"
-       y1="3.6785457"
-       x1="25.056711"
-       gradientTransform="matrix(0.944939,0,0,1.076147,6.844577e-2,4.093177)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient1459"
-       xlink:href="#linearGradient259"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="58.831264"
-       x2="15.487823"
-       y1="32.539238"
-       x1="15.387969"
-       gradientTransform="matrix(1.490161,0,0,0.668741,8.895132e-2,2)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient1464"
-       xlink:href="#linearGradient4762"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="88.294930"
-       x2="18.972126"
-       y1="88.294930"
-       x1="1.8456430"
-       gradientTransform="matrix(2.291824,0,0,0.434269,8.855179e-2,2)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient1468"
-       xlink:href="#linearGradient4741"
-       inkscape:collect="always" />
-    <linearGradient
-       y2="88.294933"
-       x2="18.972126"
-       y1="88.294933"
-       x1="1.8456431"
-       gradientTransform="matrix(2.30272,0,0,0.437918,0,0.584034)"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient1471"
-       xlink:href="#linearGradient4668"
-       inkscape:collect="always" />
-  </defs>
-  <sodipodi:namedview
-     inkscape:window-y="160"
-     inkscape:window-x="331"
-     inkscape:window-height="688"
-     inkscape:window-width="872"
-     inkscape:guide-bbox="true"
-     showguides="true"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     showgrid="false"
-     inkscape:current-layer="layer1"
-     inkscape:cy="-18.264187"
-     inkscape:cx="-72.591911"
-     inkscape:zoom="1"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     borderopacity="0.090196078"
-     bordercolor="#666666"
-     pagecolor="#ffffff"
-     id="base"
-     inkscape:showpageshadow="false"
-     fill="#729fcf" />
-  <metadata
-     id="metadata4">
-    <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>Print Document</dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Jakub Steiner</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/publicdomain/" />
-        <dc:source>http://jimmac.musichall.cz</dc:source>
-        <dc:subject>
-          <rdf:Bag>
-            <rdf:li>document</rdf:li>
-            <rdf:li>lpr</rdf:li>
-            <rdf:li>print</rdf:li>
-            <rdf:li>local</rdf:li>
-            <rdf:li>laser</rdf:li>
-            <rdf:li>bubblejet</rdf:li>
-            <rdf:li>inkjet</rdf:li>
-            <rdf:li>print</rdf:li>
-            <rdf:li>output</rdf:li>
-            <rdf:li>cups</rdf:li>
-            <rdf:li>lpd</rdf:li>
-          </rdf:Bag>
-        </dc:subject>
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/publicdomain/">
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Reproduction" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Distribution" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
-     id="layer1">
-    <g
-       style="display:inline"
-       id="g5022"
-       transform="matrix(2.411405e-2,0,0,1.929202e-2,45.48953,39.75228)">
-      <rect
-         y="-150.69685"
-         x="-1559.2523"
-         height="478.35718"
-         width="1339.6335"
-         id="rect4173"
-         style="opacity:0.40206185;color:black;fill:url(#linearGradient5027);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;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" />
-      <path
-         sodipodi:nodetypes="cccc"
-         id="path5058"
-         d="M -219.61876,-150.68038 C -219.61876,-150.68038 -219.61876,327.65041 -219.61876,327.65041 C -76.744594,328.55086 125.78146,220.48075 125.78138,88.454235 C 125.78138,-43.572302 -33.655436,-150.68036 -219.61876,-150.68038 z "
-         style="opacity:0.40206185;color:black;fill:url(#radialGradient5029);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;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" />
-      <path
-         style="opacity:0.40206185;color:black;fill:url(#radialGradient5031);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;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"
-         d="M -1559.2523,-150.68038 C -1559.2523,-150.68038 -1559.2523,327.65041 -1559.2523,327.65041 C -1702.1265,328.55086 -1904.6525,220.48075 -1904.6525,88.454235 C -1904.6525,-43.572302 -1745.2157,-150.68036 -1559.2523,-150.68038 z "
-         id="path5018"
-         sodipodi:nodetypes="cccc" />
-    </g>
-    <rect
-       ry="1.7115477"
-       rx="1.7115483"
-       y="36.004189"
-       x="4.75"
-       height="6.4915943"
-       width="38.4375"
-       id="rect4652"
-       style="fill:url(#linearGradient1471);fill-opacity:1;stroke:#595959;stroke-width:0.99999982;stroke-miterlimit:4;stroke-opacity:1" />
-    <path
-       sodipodi:nodetypes="cssssssssssss"
-       id="rect4609"
-       d="M 7.1308961,21.5 L 40.870615,21.5 C 41.255661,21.5 41.747648,21.788155 42.051049,22.223919 C 42.354451,22.659684 43.787518,24.83394 44.109448,25.297964 C 44.431378,25.761987 44.502397,26.201852 44.502397,26.774049 L 44.502397,38.850951 C 44.502397,39.764524 43.770402,40.5 42.861152,40.5 L 5.1403596,40.5 C 4.2311094,40.5 3.4991138,39.764524 3.4991138,38.850951 L 3.4991138,26.774049 C 3.4991138,26.280031 3.6002798,25.571641 3.9455202,25.120718 C 4.3811666,24.551713 5.5498664,22.57277 5.8581276,22.153118 C 6.1663887,21.733467 6.7324461,21.5 7.1308961,21.5 z "
-       style="color:#000000;fill:url(#linearGradient1468);fill-opacity:1;fill-rule:nonzero;stroke:#676767;stroke-width:1.00000036;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-    <path
-       sodipodi:nodetypes="cssssssss"
-       id="path4718"
-       d="M 7.705278,21.975532 C 7.20729,21.975532 6.5669691,22.107308 6.3043987,22.511224 L 4.4657443,25.339651 C 4.169761,25.794966 4.4993705,26.868141 5.3900051,26.868141 L 42.678553,26.868141 C 43.883282,26.868141 43.8868,25.858073 43.602814,25.428039 L 41.851714,22.776389 C 41.534204,22.295589 41.418956,21.975532 40.625945,21.975532 L 7.705278,21.975532 z "
-       style="fill:#fbfbfb;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-    <path
-       style="color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient1464);stroke-width:0.94696701;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       d="M 7.6002951,22.445756 L 40.374658,22.445756 C 40.739745,22.445756 41.206233,22.718629 41.493909,23.131283 C 41.781585,23.543938 42.788049,25.160945 43.093293,25.60036 C 43.398536,26.039775 43.528159,26.456312 43.528159,26.998164 L 43.528159,38.279261 C 43.528159,39.144385 43.394653,39.528356 42.532529,39.528356 L 5.530506,39.528356 C 4.6683828,39.528356 4.472593,39.144385 4.472593,38.279261 L 4.472593,26.998164 C 4.472593,26.530345 4.6930819,25.859523 5.0204282,25.432514 C 5.4334949,24.893685 6.1012112,23.461633 6.393495,23.064237 C 6.6857789,22.666841 7.222497,22.445756 7.6002951,22.445756 z "
-       id="path4750"
-       sodipodi:nodetypes="cssssssssssss" />
-    <path
-       sodipodi:nodetypes="ccccccc"
-       id="rect15391"
-       d="M 11.68177,4.4977642 L 36.313839,4.4977642 C 36.964072,4.4977642 37.487546,5.007949 37.487546,5.6416762 L 37.487546,24.348117 L 10.508063,24.348117 L 10.508063,5.6416762 C 10.508063,5.007949 11.031536,4.4977642 11.68177,4.4977642 z "
-       style="color:#000000;fill:url(#linearGradient1459);fill-opacity:1;fill-rule:nonzero;stroke:#898989;stroke-width:1.00000012;stroke-linecap:round;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible" />
-    <rect
-       style="color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient1456);stroke-width:1.00000024;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:block;overflow:visible"
-       id="rect15660"
-       width="25.000576"
-       height="18.836374"
-       x="11.498513"
-       y="5.4992466"
-       ry="0.17677675"
-       rx="0.17677672" />
-    <rect
-       ry="1.7115483"
-       rx="1.7115483"
-       y="27.375000"
-       x="6.8750000"
-       height="5.1875000"
-       width="33.750000"
-       id="rect4678"
-       style="fill:url(#linearGradient1451);fill-opacity:1.0000000;stroke:url(#linearGradient1453);stroke-width:1.0000000;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000" />
-    <path
-       transform="translate(0.000000,2.000000)"
-       d="M 10.871767 27.626486 A 1.2816310 1.2816310 0 1 1  8.3085046,27.626486 A 1.2816310 1.2816310 0 1 1  10.871767 27.626486 z"
-       sodipodi:ry="1.2816310"
-       sodipodi:rx="1.2816310"
-       sodipodi:cy="27.626486"
-       sodipodi:cx="9.5901356"
-       id="path4696"
-       style="fill:url(#radialGradient1433);fill-opacity:1.0000000;stroke:none;stroke-width:1.0000000;stroke-miterlimit:4.0000000;stroke-opacity:1.0000000"
-       sodipodi:type="arc" />
-    <path
-       sodipodi:nodetypes="csscssssc"
-       id="path4731"
-       d="M 11.743718,25.416053 L 37.306218,25.478553 C 37.993716,25.480234 38.294038,25.107558 38.243718,24.478553 L 38.118718,22.916053 L 39.984835,22.916053 C 40.797335,22.916053 40.975035,23.108616 41.172335,23.478553 L 41.672335,24.416053 C 42.199130,25.403793 43.483508,26.390165 42.170495,26.390165 C 37.667784,26.390165 13.993718,26.041053 11.743718,25.416053 z "
-       style="fill:url(#linearGradient1447);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;opacity:0.36571429" />
-    <path
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#ffffff;stroke-width:1px;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1"
-       d="M 42.9375,26.5 L 4.8125,26.5"
-       id="path4760"
-       sodipodi:nodetypes="cc" />
-    <g
-       transform="translate(0.000000,2.000000)"
-       style="opacity:0.43575415"
-       id="g4849">
-      <rect
-         style="color:#000000;fill:#000000;fill-opacity:0.29239765;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible"
-         id="rect4831"
-         width="19.000000"
-         height="1.0000000"
-         x="14.000000"
-         y="5.0000000" />
-      <rect
-         y="7.0000000"
-         x="14.000000"
-         height="1.0000000"
-         width="19.000000"
-         id="rect4833"
-         style="color:#000000;fill:#000000;fill-opacity:0.29239765;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible" />
-      <rect
-         style="color:#000000;fill:#000000;fill-opacity:0.29239765;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible"
-         id="rect4835"
-         width="19.000000"
-         height="1.0000000"
-         x="14.000000"
-         y="9.0000000" />
-      <rect
-         y="11.000000"
-         x="14.000000"
-         height="1.0000000"
-         width="19.000000"
-         id="rect4837"
-         style="color:#000000;fill:#000000;fill-opacity:0.29239765;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible" />
-      <rect
-         style="color:#000000;fill:#000000;fill-opacity:0.29239765;fill-rule:nonzero;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:4.0000000;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible"
-         id="rect4839"
-         width="11.000000"
-         height="1.0000000"
-         x="14.000000"
-         y="13.000000" />
-    </g>
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer2"
-     inkscape:label="arrow">
-    <path
-       sodipodi:nodetypes="cccccccc"
-       id="path8643"
-       d="M 21.02159,20.989431 L 27.989391,20.989431 L 27.989391,16.064984 L 31,16.064984 L 24.553756,8 L 17.435622,15.986875 L 21.023684,15.986875 L 21.02159,20.989431 z "
-       style="opacity:1;color:#000000;fill:#a7a7a7;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.99999958;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/files_pdfviewer/js/pdfjs/web/images/download.svg b/apps/files_pdfviewer/js/pdfjs/web/images/download.svg
deleted file mode 100644
index 884e3deed5..0000000000
--- a/apps/files_pdfviewer/js/pdfjs/web/images/download.svg
+++ /dev/null
@@ -1,620 +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://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"
-   sodipodi:docname="document-save.svg"
-   sodipodi:docbase="/home/jimmac/src/cvs/tango-icon-theme/scalable/actions"
-   inkscape:version="0.46"
-   sodipodi:version="0.32"
-   id="svg2913"
-   height="48px"
-   width="48px"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   viewbox="0 0 48 48">
-  <defs
-     id="defs3">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 24 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="48 : 24 : 1"
-       inkscape:persp3d-origin="24 : 16 : 1"
-       id="perspective104" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5060"
-       id="radialGradient5031"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-2.774389,0,0,1.969706,112.7623,-872.8854)"
-       cx="605.71429"
-       cy="486.64789"
-       fx="605.71429"
-       fy="486.64789"
-       r="117.14286" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient5060">
-      <stop
-         style="stop-color:black;stop-opacity:1;"
-         offset="0"
-         id="stop5062" />
-      <stop
-         style="stop-color:black;stop-opacity:0;"
-         offset="1"
-         id="stop5064" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5060"
-       id="radialGradient5029"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.774389,0,0,1.969706,-1891.633,-872.8854)"
-       cx="605.71429"
-       cy="486.64789"
-       fx="605.71429"
-       fy="486.64789"
-       r="117.14286" />
-    <linearGradient
-       id="linearGradient5048">
-      <stop
-         style="stop-color:black;stop-opacity:0;"
-         offset="0"
-         id="stop5050" />
-      <stop
-         id="stop5056"
-         offset="0.5"
-         style="stop-color:black;stop-opacity:1;" />
-      <stop
-         style="stop-color:black;stop-opacity:0;"
-         offset="1"
-         id="stop5052" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient5048"
-       id="linearGradient5027"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(2.774389,0,0,1.969706,-1892.179,-872.8854)"
-       x1="302.85715"
-       y1="366.64789"
-       x2="302.85715"
-       y2="609.50507" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient6925">
-      <stop
-         style="stop-color:#204a87;stop-opacity:1;"
-         offset="0"
-         id="stop6927" />
-      <stop
-         style="stop-color:#204a87;stop-opacity:0;"
-         offset="1"
-         id="stop6929" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient6901">
-      <stop
-         style="stop-color:#3465a4;stop-opacity:1;"
-         offset="0"
-         id="stop6903" />
-      <stop
-         style="stop-color:#3465a4;stop-opacity:0;"
-         offset="1"
-         id="stop6905" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient4991">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop4993" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop4995" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient4991"
-       id="radialGradient4997"
-       cx="23.447077"
-       cy="6.4576745"
-       fx="23.447077"
-       fy="6.4576745"
-       r="19.0625"
-       gradientTransform="matrix(-1.314471,-1.006312e-2,-1.022964e-2,1.336221,46.22108,-4.909887)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient2187"
-       inkscape:collect="always">
-      <stop
-         id="stop2189"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop2191"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2187"
-       id="linearGradient1764"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.914114,1.412791e-16,-1.412791e-16,0.914114,-3.868698,-2.706902)"
-       x1="33.059906"
-       y1="27.394117"
-       x2="12.624337"
-       y2="12.583769" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient8662">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop8664" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop8666" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8662"
-       id="radialGradient8668"
-       cx="24.837126"
-       cy="36.421127"
-       fx="24.837126"
-       fy="36.421127"
-       r="15.644737"
-       gradientTransform="matrix(1.000000,-7.816467e-32,-1.132409e-32,0.536723,-5.897962e-14,16.87306)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient2555">
-      <stop
-         id="stop2557"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         style="stop-color:#e6e6e6;stop-opacity:1.0000000;"
-         offset="0.50000000"
-         id="stop2561" />
-      <stop
-         id="stop2563"
-         offset="0.75000000"
-         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
-      <stop
-         style="stop-color:#e1e1e1;stop-opacity:1.0000000;"
-         offset="0.84166664"
-         id="stop2565" />
-      <stop
-         id="stop2559"
-         offset="1.0000000"
-         style="stop-color:#ffffff;stop-opacity:1.0000000;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4274">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.25490198;"
-         offset="0.0000000"
-         id="stop4276" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1.0000000;"
-         offset="1.0000000"
-         id="stop4278" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4264"
-       inkscape:collect="always">
-      <stop
-         id="stop4266"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         id="stop4268"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4254"
-       inkscape:collect="always">
-      <stop
-         id="stop4256"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop4258"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4244">
-      <stop
-         id="stop4246"
-         offset="0.0000000"
-         style="stop-color:#e4e4e4;stop-opacity:1.0000000;" />
-      <stop
-         id="stop4248"
-         offset="1.0000000"
-         style="stop-color:#d3d3d3;stop-opacity:1.0000000;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4236"
-       inkscape:collect="always">
-      <stop
-         id="stop4238"
-         offset="0"
-         style="stop-color:#eeeeee;stop-opacity:1;" />
-      <stop
-         id="stop4240"
-         offset="1"
-         style="stop-color:#eeeeee;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4228">
-      <stop
-         id="stop4230"
-         offset="0.0000000"
-         style="stop-color:#bbbbbb;stop-opacity:1.0000000;" />
-      <stop
-         id="stop4232"
-         offset="1.0000000"
-         style="stop-color:#9f9f9f;stop-opacity:1.0000000;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient4184">
-      <stop
-         id="stop4186"
-         offset="0.0000000"
-         style="stop-color:#838383;stop-opacity:1.0000000;" />
-      <stop
-         id="stop4188"
-         offset="1.0000000"
-         style="stop-color:#bbbbbb;stop-opacity:0.0000000;" />
-    </linearGradient>
-    <linearGradient
-       gradientTransform="translate(0.795493,3.799180)"
-       y2="35.281250"
-       x2="24.687500"
-       y1="35.281250"
-       x1="7.0625000"
-       gradientUnits="userSpaceOnUse"
-       id="linearGradient4209"
-       xlink:href="#linearGradient4184"
-       inkscape:collect="always" />
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       y2="40.943935"
-       x2="36.183067"
-       y1="28.481176"
-       x1="7.6046205"
-       id="linearGradient4234"
-       xlink:href="#linearGradient4228"
-       inkscape:collect="always"
-       gradientTransform="translate(0.000000,5.125000)" />
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       y2="33.758667"
-       x2="12.221823"
-       y1="37.205811"
-       x1="12.277412"
-       id="linearGradient4242"
-       xlink:href="#linearGradient4236"
-       inkscape:collect="always"
-       gradientTransform="translate(0.000000,5.125000)" />
-    <radialGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.286242,0.781698,-0.710782,1.169552,-2.354348,0.248140)"
-       r="20.935817"
-       fy="2.9585190"
-       fx="15.571491"
-       cy="2.9585190"
-       cx="15.571491"
-       id="radialGradient4250"
-       xlink:href="#linearGradient4244"
-       inkscape:collect="always" />
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       y2="47.620636"
-       x2="44.096100"
-       y1="4.4331360"
-       x1="12.378357"
-       id="linearGradient4260"
-       xlink:href="#linearGradient4254"
-       inkscape:collect="always"
-       gradientTransform="translate(0.000000,5.125000)" />
-    <radialGradient
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.000000,0.000000,0.000000,0.651032,-2.885063e-16,9.455693)"
-       r="23.555494"
-       fy="27.096155"
-       fx="23.201941"
-       cy="27.096155"
-       cx="23.201941"
-       id="radialGradient4270"
-       xlink:href="#linearGradient4264"
-       inkscape:collect="always" />
-    <linearGradient
-       gradientUnits="userSpaceOnUse"
-       y2="26.357183"
-       x2="23.688078"
-       y1="11.318835"
-       x1="23.688078"
-       id="linearGradient4272"
-       xlink:href="#linearGradient4274"
-       inkscape:collect="always"
-       gradientTransform="translate(0.000000,5.125000)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2555"
-       id="linearGradient2553"
-       x1="33.431175"
-       y1="31.964777"
-       x2="21.747974"
-       y2="11.780679"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6901"
-       id="linearGradient6907"
-       x1="14.751649"
-       y1="15.868432"
-       x2="8.8953285"
-       y2="16.743431"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient6925"
-       id="linearGradient6931"
-       x1="12.25"
-       y1="18.25"
-       x2="7"
-       y2="21.118431"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
-  <sodipodi:namedview
-     inkscape:window-y="30"
-     inkscape:window-x="0"
-     inkscape:window-height="818"
-     inkscape:window-width="999"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     showgrid="false"
-     inkscape:current-layer="layer2"
-     inkscape:cy="11.891468"
-     inkscape:cx="-133.68151"
-     inkscape:zoom="1"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     borderopacity="0.22745098"
-     bordercolor="#666666"
-     pagecolor="#ffffff"
-     id="base"
-     inkscape:showpageshadow="false"
-     fill="#3465a4"
-     stroke="#204a87" />
-  <metadata
-     id="metadata4">
-    <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>Save</dc:title>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Jakub Steiner</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <dc:subject>
-          <rdf:Bag>
-            <rdf:li>hdd</rdf:li>
-            <rdf:li>hard drive</rdf:li>
-            <rdf:li>save</rdf:li>
-            <rdf:li>io</rdf:li>
-            <rdf:li>store</rdf:li>
-          </rdf:Bag>
-        </dc:subject>
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/publicdomain/" />
-        <dc:identifier />
-        <dc:source>http://jimmac.musichall.cz</dc:source>
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/publicdomain/">
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Reproduction" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Distribution" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="pix"
-     id="layer2"
-     inkscape:groupmode="layer">
-    <g
-       style="display:inline"
-       id="g5022"
-       transform="matrix(2.411405e-2,0,0,1.929202e-2,45.48953,41.75228)">
-      <rect
-         y="-150.69685"
-         x="-1559.2523"
-         height="478.35718"
-         width="1339.6335"
-         id="rect4173"
-         style="opacity:0.40206185;color:black;fill:url(#linearGradient5027);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;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" />
-      <path
-         sodipodi:nodetypes="cccc"
-         id="path5058"
-         d="M -219.61876,-150.68038 C -219.61876,-150.68038 -219.61876,327.65041 -219.61876,327.65041 C -76.744594,328.55086 125.78146,220.48075 125.78138,88.454235 C 125.78138,-43.572302 -33.655436,-150.68036 -219.61876,-150.68038 z "
-         style="opacity:0.40206185;color:black;fill:url(#radialGradient5029);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;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" />
-      <path
-         style="opacity:0.40206185;color:black;fill:url(#radialGradient5031);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;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"
-         d="M -1559.2523,-150.68038 C -1559.2523,-150.68038 -1559.2523,327.65041 -1559.2523,327.65041 C -1702.1265,328.55086 -1904.6525,220.48075 -1904.6525,88.454235 C -1904.6525,-43.572302 -1745.2157,-150.68036 -1559.2523,-150.68038 z "
-         id="path5018"
-         sodipodi:nodetypes="cccc" />
-    </g>
-    <path
-       sodipodi:nodetypes="cccsccccccccc"
-       id="path4196"
-       d="M 11.28569,13.087628 C 10.66069,13.087628 10.254441,13.377808 10.004442,13.931381 C 10.004441,13.931381 3.5356915,31.034938 3.5356915,31.034938 C 3.5356915,31.034938 3.2856915,31.706497 3.2856915,32.816188 C 3.2856915,32.816188 3.2856915,42.466156 3.2856915,42.466156 C 3.2856915,43.548769 3.943477,44.091158 4.9419415,44.091156 L 43.50444,44.091156 C 44.489293,44.091156 45.09819,43.372976 45.09819,42.247406 L 45.09819,32.597438 C 45.09819,32.597438 45.204153,31.827015 45.00444,31.284938 L 38.28569,14.087631 C 38.101165,13.575725 37.648785,13.099533 37.16069,13.087628 L 11.28569,13.087628 z "
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#535353;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
-    <path
-       sodipodi:nodetypes="ccccccccc"
-       id="path4170"
-       d="M 3.2735915,32.121812 L 4.0381936,31.429597 L 41.647883,31.492097 L 45.11029,31.809395 L 45.11029,42.247927 C 45.11029,43.373496 44.503272,44.091258 43.518419,44.091258 L 4.9354314,44.091258 C 3.9369667,44.091258 3.2735915,43.549207 3.2735915,42.466594 L 3.2735915,32.121812 z "
-       style="fill:url(#linearGradient4234);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.02044296px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-    <path
-       sodipodi:nodetypes="csccccccs"
-       id="path3093"
-       d="M 3.5490842,31.039404 C 2.8347985,32.50369 3.5484686,33.432261 4.5847985,33.432261 C 4.5847985,33.432261 43.584797,33.432261 43.584797,33.432261 C 44.703844,33.408451 45.430035,32.420356 45.013368,31.289403 L 38.299082,14.078704 C 38.114558,13.566798 37.64432,13.090606 37.156225,13.078701 L 11.299083,13.078701 C 10.674083,13.078701 10.263369,13.382274 10.01337,13.935847 C 10.01337,13.935847 3.5490842,31.039404 3.5490842,31.039404 z "
-       style="fill:url(#radialGradient4250);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-    <rect
-       y="36.299183"
-       x="7.857996"
-       height="5.5625"
-       width="17.625"
-       id="rect4174"
-       style="opacity:1;color:#000000;fill:url(#linearGradient4209);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2.40899992;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" />
-    <path
-       sodipodi:nodetypes="cscc"
-       id="path4194"
-       d="M 7.8579947,41.86168 C 7.8579947,41.86168 7.8579947,37.850195 7.8579947,37.850195 C 9.6935221,41.029421 16.154485,41.86168 20.795492,41.86168 C 20.795492,41.86168 7.8579947,41.86168 7.8579947,41.86168 z "
-       style="opacity:0.81142853;fill:url(#linearGradient4242);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-    <path
-       sodipodi:nodetypes="cccccccc"
-       id="path4201"
-       d="M 44.796162,30.753688 C 44.859684,32.003662 44.382159,33.069528 43.474046,33.097438 C 43.474046,33.097438 5.3553296,33.097437 5.3553297,33.097438 C 4.0660978,33.097438 3.4875937,32.772491 3.271279,32.229382 C 3.3630404,33.173714 4.0970964,33.878688 5.3553297,33.878688 C 5.3553296,33.878687 43.474046,33.878688 43.474046,33.878688 C 44.550053,33.845617 45.226851,32.454664 44.82621,30.883897 L 44.796162,30.753688 z "
-       style="fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-    <path
-       id="path4211"
-       d="M 10.96875,15.28125 C 10.922675,15.481571 10.78125,15.668047 10.78125,15.875 C 10.78125,16.823605 11.37223,17.664474 12.125,18.46875 C 12.365268,18.314675 12.490117,18.114342 12.75,17.96875 C 11.809691,17.152746 11.196604,16.252168 10.96875,15.28125 z M 37.625,15.28125 C 37.396273,16.250866 36.782988,17.153676 35.84375,17.96875 C 36.117894,18.122332 36.247738,18.33699 36.5,18.5 C 37.257262,17.693344 37.8125,16.826956 37.8125,15.875 C 37.8125,15.668047 37.670906,15.481571 37.625,15.28125 z M 39.8125,23.71875 C 39.198709,27.758861 32.513887,30.96875 24.28125,30.96875 C 16.068996,30.968751 9.4211001,27.775964 8.78125,23.75 C 8.7488928,23.947132 8.65625,24.141882 8.65625,24.34375 C 8.6562503,28.661697 15.645354,32.187501 24.28125,32.1875 C 32.917146,32.1875 39.937499,28.661698 39.9375,24.34375 C 39.9375,24.130826 39.848449,23.926394 39.8125,23.71875 z "
-       style="opacity:0.69142857;color:#000000;fill:url(#linearGradient4272);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:2;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" />
-    <path
-       transform="translate(8.838843e-2,5.301780)"
-       d="M 8.5736699 25.593554 A 1.3700194 1.016466 0 1 1  5.833631,25.593554 A 1.3700194 1.016466 0 1 1  8.5736699 25.593554 z"
-       sodipodi:ry="1.016466"
-       sodipodi:rx="1.3700194"
-       sodipodi:cy="25.593554"
-       sodipodi:cx="7.2036505"
-       id="path4224"
-       style="opacity:1;color:#000000;fill:#ffffff;fill-opacity:0.45762706;fill-rule:evenodd;stroke:none;stroke-width:2;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"
-       sodipodi:type="arc" />
-    <path
-       sodipodi:type="arc"
-       style="opacity:1;color:#000000;fill:#ffffff;fill-opacity:0.45762706;fill-rule:evenodd;stroke:none;stroke-width:2;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="path4226"
-       sodipodi:cx="7.2036505"
-       sodipodi:cy="25.593554"
-       sodipodi:rx="1.3700194"
-       sodipodi:ry="1.016466"
-       d="M 8.5736699 25.593554 A 1.3700194 1.016466 0 1 1  5.833631,25.593554 A 1.3700194 1.016466 0 1 1  8.5736699 25.593554 z"
-       transform="translate(33.96705,5.213390)" />
-    <path
-       style="fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient4260);stroke-width:1.00000024;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
-       d="M 11.642515,13.540723 C 11.040823,13.540723 10.649724,13.820081 10.409049,14.35301 C 10.409048,14.35301 3.9940341,30.943732 3.9940341,30.943732 C 3.9940341,30.943732 3.7533573,31.590247 3.7533573,32.658555 C 3.7533573,32.658555 3.7533573,41.948651 3.7533573,41.948651 C 3.7533573,43.303391 4.1974134,43.57555 5.3478414,43.57555 L 43.034746,43.57555 C 44.357872,43.57555 44.569062,43.259153 44.569062,41.738058 L 44.569062,32.447962 C 44.569062,32.447962 44.671072,31.706271 44.478807,31.184409 L 37.885616,14.378434 C 37.707973,13.885617 37.334964,13.552184 36.865071,13.540723 L 11.642515,13.540723 z "
-       id="path4252"
-       sodipodi:nodetypes="cccsccccccccc" />
-    <path
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.00000048px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.42372885"
-       d="M 40.5,36.554166 L 40.5,41.575101"
-       id="path4282" />
-    <path
-       id="path4284"
-       d="M 38.5,36.613943 L 38.5,41.634878"
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.00000048px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.42372885" />
-    <path
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.00000048px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.42372885"
-       d="M 36.5,36.613943 L 36.5,41.634878"
-       id="path4286" />
-    <path
-       id="path4288"
-       d="M 34.5,36.613943 L 34.5,41.634878"
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.00000048px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.42372885" />
-    <path
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.00000048px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.42372885"
-       d="M 32.5,36.613943 L 32.5,41.634878"
-       id="path4290" />
-    <path
-       id="path4292"
-       d="M 30.5,36.613943 L 30.5,41.634878"
-       style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.00000048px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:0.42372885" />
-    <path
-       id="path4294"
-       d="M 39.5,36.604065 L 39.5,41.625"
-       style="opacity:0.09714284;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000048px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" />
-    <path
-       style="opacity:0.09714284;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000048px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 37.5,36.663842 L 37.5,41.684777"
-       id="path4296" />
-    <path
-       id="path4298"
-       d="M 35.5,36.663842 L 35.5,41.684777"
-       style="opacity:0.09714284;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000048px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" />
-    <path
-       style="opacity:0.09714284;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000048px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1"
-       d="M 33.5,36.663842 L 33.5,41.684777"
-       id="path4300" />
-    <path
-       id="path4302"
-       d="M 31.5,36.663842 L 31.5,41.684777"
-       style="opacity:0.09714284;fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:#000000;stroke-width:1.00000048px;stroke-linecap:square;stroke-linejoin:miter;stroke-opacity:1" />
-    <path
-       id="path4572"
-       d="M 7.875,36.3125 L 7.875,41.84375 L 20.4375,41.84375 L 8.21875,41.5 L 7.875,36.3125 z "
-       style="opacity:0.43999999;fill:#ffffff;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-    <path
-       sodipodi:type="arc"
-       style="opacity:0.20571427;color:#000000;fill:url(#linearGradient2553);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:0.93365198;stroke-linecap:square;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:0.42372879;visibility:visible;display:inline;overflow:visible"
-       id="path2545"
-       sodipodi:cx="25"
-       sodipodi:cy="19.5625"
-       sodipodi:rx="14.875"
-       sodipodi:ry="6.6875"
-       d="M 39.875 19.5625 A 14.875 6.6875 0 1 1  10.125,19.5625 A 14.875 6.6875 0 1 1  39.875 19.5625 z"
-       transform="matrix(1.037815,0.000000,0.000000,1.060747,-1.632878,3.030370)" />
-  </g>
-  <g
-     inkscape:groupmode="layer"
-     id="layer1"
-     inkscape:label="down">
-    <path
-       transform="matrix(1.130190,1.178179e-16,7.918544e-17,-0.759601,-3.909725,53.66554)"
-       d="M 40.481863 36.421127 A 15.644737 8.3968935 0 1 1  9.1923885,36.421127 A 15.644737 8.3968935 0 1 1  40.481863 36.421127 z"
-       sodipodi:ry="8.3968935"
-       sodipodi:rx="15.644737"
-       sodipodi:cy="36.421127"
-       sodipodi:cx="24.837126"
-       id="path8660"
-       style="opacity:0.14117647;color:#000000;fill:url(#radialGradient8668);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:10;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-       sodipodi:type="arc" />
-    <path
-       style="opacity:1;color:#000000;fill:url(#linearGradient6907);fill-opacity:1.0;fill-rule:nonzero;stroke:url(#linearGradient6931);stroke-width:0.99999982;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:block;overflow:visible"
-       d="M 3.2034501,25.835194 C 2.1729477,-5.3853369 28.741616,-0.4511153 28.582416,15.788689 L 35.89533,15.788689 L 24.517652,28.774671 L 12.585426,15.788689 C 12.585426,15.788689 20.126859,15.788689 20.126859,15.788689 C 20.583921,4.8193225 3.4092324,1.6100346 3.2034501,25.835194 z "
-       id="path1432"
-       sodipodi:nodetypes="ccccccc" />
-    <path
-       sodipodi:nodetypes="ccccccc"
-       id="path2177"
-       d="M 7.6642103,9.1041047 C 12.40638,-0.0400306 28.122336,2.7175443 27.761604,16.579393 L 34.078976,16.579393 C 34.078976,16.579393 24.513151,27.536769 24.513151,27.536769 L 14.41668,16.579393 C 14.41668,16.579393 20.87332,16.579393 20.87332,16.579393 C 21.144975,5.0041615 10.922265,5.5345215 7.6642103,9.1041047 z "
-       style="opacity:0.47159091;color:#000000;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient1764);stroke-width:0.99999934;stroke-linecap:butt;stroke-linejoin:miter;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:block;overflow:visible" />
-    <path
-       style="opacity:0.49431817;color:#000000;fill:url(#radialGradient4997);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.9999997;stroke-linecap:butt;stroke-linejoin:miter;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"
-       d="M 34.767155,16.211613 L 32.782979,18.757322 C 27.372947,17.241029 24.896829,21.486664 17.109284,20.489112 L 13.247998,16.080077 L 20.434468,16.162862 C 20.483219,4.3164571 8.3443098,4.998966 5.0292663,13.627829 C 8.8372201,-1.2611216 27.893316,0.8064118 28.28332,16.114112 L 34.767155,16.211613 z "
-       id="path4989"
-       sodipodi:nodetypes="cccccccc" />
-  </g>
-</svg>
diff --git a/apps/files_pdfviewer/js/pdfjs/web/images/go-down.svg b/apps/files_pdfviewer/js/pdfjs/web/images/go-down.svg
deleted file mode 100644
index 655fdba16d..0000000000
--- a/apps/files_pdfviewer/js/pdfjs/web/images/go-down.svg
+++ /dev/null
@@ -1,201 +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://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"
-   sodipodi:docname="go-down.svg"
-   sodipodi:docbase="/home/tigert/cvs/freedesktop.org/tango-icon-theme/scalable/actions"
-   inkscape:version="0.46"
-   sodipodi:version="0.32"
-   id="svg11300"
-   height="48px"
-   width="48px"
-   inkscape:export-filename="/home/jimmac/Desktop/wi-fi.png"
-   inkscape:export-xdpi="90.000000"
-   inkscape:export-ydpi="90.000000"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   viewbox="0 0 48 48">
-  <defs
-     id="defs3">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 24 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="48 : 24 : 1"
-       inkscape:persp3d-origin="24 : 16 : 1"
-       id="perspective24" />
-    <linearGradient
-       id="linearGradient1442">
-      <stop
-         id="stop1444"
-         offset="0"
-         style="stop-color:#73d216" />
-      <stop
-         id="stop1446"
-         offset="1.0000000"
-         style="stop-color:#4e9a06" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient8662"
-       inkscape:collect="always">
-      <stop
-         id="stop8664"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         id="stop8666"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient8650"
-       inkscape:collect="always">
-      <stop
-         id="stop8652"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop8654"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8662"
-       id="radialGradient1444"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.000000,0.000000,0.000000,0.536723,1.614716e-15,16.87306)"
-       cx="24.837126"
-       cy="36.421127"
-       fx="24.837126"
-       fy="36.421127"
-       r="15.644737" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1442"
-       id="radialGradient1469"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.871885e-16,-0.843022,1.020168,2.265228e-16,0.606436,42.58614)"
-       cx="35.292667"
-       cy="20.494493"
-       fx="35.292667"
-       fy="20.494493"
-       r="16.956199" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8650"
-       id="radialGradient1471"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(3.749427e-16,-2.046729,-1.557610,-2.853404e-16,44.11559,66.93275)"
-       cx="15.987216"
-       cy="1.5350308"
-       fx="15.987216"
-       fy="1.5350308"
-       r="17.171415" />
-  </defs>
-  <sodipodi:namedview
-     inkscape:window-y="30"
-     inkscape:window-x="0"
-     inkscape:window-height="818"
-     inkscape:window-width="1280"
-     inkscape:showpageshadow="false"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     showgrid="false"
-     inkscape:current-layer="layer1"
-     inkscape:cy="23.239067"
-     inkscape:cx="15.972815"
-     inkscape:zoom="11.313708"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     borderopacity="0.25490196"
-     bordercolor="#666666"
-     pagecolor="#ffffff"
-     id="base"
-     fill="#4e9a06"
-     stroke="#4e9a06" />
-  <metadata
-     id="metadata4">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Jakub Steiner</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <dc:source>http://jimmac.musichall.cz</dc:source>
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/publicdomain/" />
-        <dc:title>Go Down</dc:title>
-        <dc:subject>
-          <rdf:Bag>
-            <rdf:li>go</rdf:li>
-            <rdf:li>lower</rdf:li>
-            <rdf:li>down</rdf:li>
-            <rdf:li>arrow</rdf:li>
-            <rdf:li>pointer</rdf:li>
-            <rdf:li>&gt;</rdf:li>
-          </rdf:Bag>
-        </dc:subject>
-        <dc:contributor>
-          <cc:Agent>
-            <dc:title>Andreas Nilsson</dc:title>
-          </cc:Agent>
-        </dc:contributor>
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/publicdomain/">
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Reproduction" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Distribution" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
-     id="layer1">
-    <path
-       transform="matrix(1.214466,0.000000,0.000000,0.595458,-6.163846,16.31275)"
-       d="M 40.481863 36.421127 A 15.644737 8.3968935 0 1 1  9.1923885,36.421127 A 15.644737 8.3968935 0 1 1  40.481863 36.421127 z"
-       sodipodi:ry="8.3968935"
-       sodipodi:rx="15.644737"
-       sodipodi:cy="36.421127"
-       sodipodi:cx="24.837126"
-       id="path8660"
-       style="opacity:0.20454545;color:#000000;fill:url(#radialGradient1444);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10.000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible"
-       sodipodi:type="arc" />
-    <g
-       id="g1464"
-       transform="matrix(-1.000000,0.000000,0.000000,-1.000000,47.02856,43.99921)">
-      <path
-         style="opacity:1.0000000;color:#000000;fill:url(#radialGradient1469);fill-opacity:1.0000000;fill-rule:evenodd;stroke:#3a7304;stroke-width:1.0000004;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10.000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1;visibility:visible;display:inline;overflow:visible"
-         d="M 14.519136,38.500000 L 32.524165,38.496094 L 32.524165,25.504468 L 40.519531,25.496656 L 23.374809,5.4992135 L 6.5285585,25.497284 L 14.524440,25.501074 L 14.519136,38.500000 z "
-         id="path8643"
-         sodipodi:nodetypes="cccccccc" />
-      <path
-         style="opacity:0.50802141;color:#000000;fill:url(#radialGradient1471);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10.000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible"
-         d="M 39.429889,24.993467 L 32.023498,25.005186 L 32.026179,37.998023 L 16.647623,37.98887 C 17.417545,19.64788 27.370272,26.995797 32.029282,16.341991 L 39.429889,24.993467 z "
-         id="path8645"
-         sodipodi:nodetypes="cccccc" />
-      <path
-         sodipodi:nodetypes="cccccccc"
-         id="path8658"
-         d="M 15.520704,37.496094 L 31.522109,37.500000 L 31.522109,24.507050 L 38.338920,24.491425 L 23.384644,7.0388396 L 8.6781173,24.495782 L 15.518018,24.501029 L 15.520704,37.496094 z "
-         style="opacity:0.48128340;color:#000000;fill:none;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.0000004;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10.000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible" />
-    </g>
-  </g>
-</svg>
diff --git a/apps/files_pdfviewer/js/pdfjs/web/images/go-up.svg b/apps/files_pdfviewer/js/pdfjs/web/images/go-up.svg
deleted file mode 100644
index 5e2f9a2c64..0000000000
--- a/apps/files_pdfviewer/js/pdfjs/web/images/go-up.svg
+++ /dev/null
@@ -1,197 +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://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"
-   sodipodi:docname="go-up.svg"
-   sodipodi:docbase="/home/tigert/cvs/freedesktop.org/tango-icon-theme/scalable/actions"
-   inkscape:version="0.46"
-   sodipodi:version="0.32"
-   id="svg11300"
-   height="48px"
-   width="48px"
-   inkscape:export-filename="/home/jimmac/Desktop/wi-fi.png"
-   inkscape:export-xdpi="90.000000"
-   inkscape:export-ydpi="90.000000"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   viewbox="0 0 48 48">
-  <defs
-     id="defs3">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 24 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="48 : 24 : 1"
-       inkscape:persp3d-origin="24 : 16 : 1"
-       id="perspective23" />
-    <linearGradient
-       id="linearGradient2304">
-      <stop
-         id="stop2306"
-         offset="0"
-         style="stop-color:#73d216" />
-      <stop
-         id="stop2308"
-         offset="1.0000000"
-         style="stop-color:#4e9a06" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient8662"
-       inkscape:collect="always">
-      <stop
-         id="stop8664"
-         offset="0"
-         style="stop-color:#000000;stop-opacity:1;" />
-      <stop
-         id="stop8666"
-         offset="1"
-         style="stop-color:#000000;stop-opacity:0;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient8650"
-       inkscape:collect="always">
-      <stop
-         id="stop8652"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         id="stop8654"
-         offset="1"
-         style="stop-color:#ffffff;stop-opacity:0;" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8650"
-       id="radialGradient1438"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-3.749427e-16,-2.046729,1.557610,-2.853404e-16,2.767009,66.93275)"
-       cx="24.53788"
-       cy="0.40010813"
-       fx="24.53788"
-       fy="0.40010813"
-       r="17.171415" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2304"
-       id="radialGradient1441"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.871885e-16,-0.843022,1.020168,2.265228e-16,0.606436,42.58614)"
-       cx="11.319205"
-       cy="22.454971"
-       fx="11.319205"
-       fy="22.454971"
-       r="16.956199" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8662"
-       id="radialGradient1444"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.000000,0.000000,0.000000,0.536723,1.614716e-15,16.87306)"
-       cx="24.837126"
-       cy="36.421127"
-       fx="24.837126"
-       fy="36.421127"
-       r="15.644737" />
-  </defs>
-  <sodipodi:namedview
-     inkscape:window-y="30"
-     inkscape:window-x="0"
-     inkscape:window-height="818"
-     inkscape:window-width="1280"
-     inkscape:showpageshadow="false"
-     inkscape:document-units="px"
-     inkscape:grid-bbox="true"
-     showgrid="false"
-     inkscape:current-layer="layer1"
-     inkscape:cy="25.620377"
-     inkscape:cx="9.6380363"
-     inkscape:zoom="13.059378"
-     inkscape:pageshadow="2"
-     inkscape:pageopacity="0.0"
-     borderopacity="0.25490196"
-     bordercolor="#666666"
-     pagecolor="#ffffff"
-     id="base"
-     fill="#73d216"
-     stroke="#73d216" />
-  <metadata
-     id="metadata4">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Jakub Steiner</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <dc:source>http://jimmac.musichall.cz</dc:source>
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/publicdomain/" />
-        <dc:title>Go Up</dc:title>
-        <dc:subject>
-          <rdf:Bag>
-            <rdf:li>go</rdf:li>
-            <rdf:li>higher</rdf:li>
-            <rdf:li>up</rdf:li>
-            <rdf:li>arrow</rdf:li>
-            <rdf:li>pointer</rdf:li>
-            <rdf:li>&gt;</rdf:li>
-          </rdf:Bag>
-        </dc:subject>
-        <dc:contributor>
-          <cc:Agent>
-            <dc:title>Andreas Nilsson</dc:title>
-          </cc:Agent>
-        </dc:contributor>
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/publicdomain/">
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Reproduction" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Distribution" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:groupmode="layer"
-     inkscape:label="Layer 1"
-     id="layer1">
-    <path
-       transform="matrix(1.214466,0.000000,0.000000,0.595458,-6.163846,16.31275)"
-       d="M 40.481863 36.421127 A 15.644737 8.3968935 0 1 1  9.1923885,36.421127 A 15.644737 8.3968935 0 1 1  40.481863 36.421127 z"
-       sodipodi:ry="8.3968935"
-       sodipodi:rx="15.644737"
-       sodipodi:cy="36.421127"
-       sodipodi:cx="24.837126"
-       id="path8660"
-       style="opacity:0.29946521;color:#000000;fill:url(#radialGradient1444);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:1.0000000;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10.000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible"
-       sodipodi:type="arc" />
-    <path
-       sodipodi:nodetypes="cccccccc"
-       id="path8643"
-       d="M 14.491792,38.500000 L 32.469477,38.500000 L 32.469477,25.547437 L 40.500000,25.547437 L 23.374809,5.4992135 L 6.5285585,25.489471 L 14.497096,25.555762 L 14.491792,38.500000 z "
-       style="opacity:1.0000000;color:#000000;fill:url(#radialGradient1441);fill-opacity:1.0000000;fill-rule:evenodd;stroke:#3a7304;stroke-width:1.0000004;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10.000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1;visibility:visible;display:inline;overflow:visible" />
-    <path
-       sodipodi:nodetypes="cccscc"
-       id="path8645"
-       d="M 7.5855237,25.03253 L 14.995821,25.03253 L 15.062422,31.594339 C 20.718034,20.593878 31.055517,22.749928 31.656768,15.966674 C 31.656768,15.966674 23.366938,6.4219692 23.366938,6.4219692 L 7.5855237,25.03253 z "
-       style="opacity:0.50802141;color:#000000;fill:url(#radialGradient1438);fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:1.0000000;stroke-linecap:round;stroke-linejoin:round;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10.000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible" />
-    <path
-       style="opacity:0.48128340;color:#000000;fill:none;fill-opacity:1.0000000;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.0000004;stroke-linecap:butt;stroke-linejoin:miter;marker:none;marker-start:none;marker-mid:none;marker-end:none;stroke-miterlimit:10.000000;stroke-dasharray:none;stroke-dashoffset:0.0000000;stroke-opacity:1.0000000;visibility:visible;display:inline;overflow:visible"
-       d="M 15.602735,37.500000 L 31.502578,37.500000 L 31.502578,24.507050 L 38.311576,24.507050 L 23.361206,7.0700896 L 8.6546798,24.550470 L 15.475049,24.528373 L 15.602735,37.500000 z "
-       id="path8658"
-       sodipodi:nodetypes="cccccccc" />
-  </g>
-</svg>
diff --git a/apps/files_pdfviewer/js/pdfjs/web/images/nav-outline.svg b/apps/files_pdfviewer/js/pdfjs/web/images/nav-outline.svg
deleted file mode 100644
index 4d4323ce37..0000000000
--- a/apps/files_pdfviewer/js/pdfjs/web/images/nav-outline.svg
+++ /dev/null
@@ -1,202 +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://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="48px"
-   height="48px"
-   id="svg3007"
-   version="1.1"
-   inkscape:version="0.48.1 r9760"
-   sodipodi:docname="nav-outline.svg">
-  <defs
-     id="defs3009">
-    <filter
-       inkscape:collect="always"
-       id="filter5333"
-       x="-0.16623206"
-       width="1.3324641"
-       y="-0.030014125"
-       height="1.0600282">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.47888561"
-         id="feGaussianBlur5335" />
-    </filter>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.945051"
-     inkscape:cx="20.614872"
-     inkscape:cy="23.423899"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="1440"
-     inkscape:window-height="773"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata3012">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <rect
-       style="fill:#f0f0f0;fill-rule:evenodd;stroke:#808080;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1;fill-opacity:1"
-       id="rect3783"
-       width="46.16272"
-       height="45.59861"
-       x="1.0341953"
-       y="0.99112236" />
-    <rect
-       style="fill:#404040;fill-opacity:1;stroke:none"
-       id="rect3787"
-       width="2.8205326"
-       height="2.7823999"
-       x="4.2307992"
-       y="4.093708" />
-    <rect
-       style="fill:#404040;fill-opacity:1;stroke:none"
-       id="rect5257"
-       width="24.68285"
-       height="1.4102663"
-       x="8.0855274"
-       y="4.657815" />
-    <rect
-       y="8.4185247"
-       x="8.4615984"
-       height="2.7823999"
-       width="2.8205326"
-       id="rect5259"
-       style="fill:#404040;fill-opacity:1;stroke:none" />
-    <rect
-       y="9.0766497"
-       x="12.410344"
-       height="1.4102663"
-       width="30.498053"
-       id="rect5261"
-       style="fill:#404040;fill-opacity:1;stroke:none" />
-    <rect
-       style="fill:#404040;fill-opacity:1;stroke:none"
-       id="rect5263"
-       width="2.8205326"
-       height="2.7823999"
-       x="8.4615984"
-       y="13.307448" />
-    <rect
-       style="fill:#404040;fill-opacity:1;stroke:none"
-       id="rect5265"
-       width="24.972752"
-       height="1.4102663"
-       x="12.410344"
-       y="13.965573" />
-    <rect
-       y="17.444229"
-       x="4.3248172"
-       height="2.7823999"
-       width="2.8205326"
-       id="rect5267"
-       style="fill:#404040;fill-opacity:1;stroke:none" />
-    <rect
-       y="18.008337"
-       x="8.1795454"
-       height="1.4102663"
-       width="25.101433"
-       id="rect5269"
-       style="fill:#404040;fill-opacity:1;stroke:none" />
-    <rect
-       style="fill:#404040;fill-opacity:1;stroke:none"
-       id="rect5271"
-       width="2.8205326"
-       height="2.7823999"
-       x="8.5556164"
-       y="21.769047" />
-    <rect
-       style="fill:#404040;fill-opacity:1;stroke:none"
-       id="rect5273"
-       width="28.782515"
-       height="1.4102663"
-       x="12.880433"
-       y="22.427172" />
-    <rect
-       y="26.65797"
-       x="13.475181"
-       height="2.7823999"
-       width="2.8205326"
-       id="rect5275"
-       style="fill:#404040;fill-opacity:1;stroke:none" />
-    <rect
-       y="27.316095"
-       x="17.479"
-       height="1.4102663"
-       width="23.681646"
-       id="rect5277"
-       style="fill:#404040;fill-opacity:1;stroke:none" />
-    <rect
-       style="fill:#404040;fill-opacity:1;stroke:none"
-       id="rect5279"
-       width="2.8205326"
-       height="2.7823999"
-       x="8.5130949"
-       y="31.006269" />
-    <rect
-       style="fill:#404040;fill-opacity:1;stroke:none"
-       id="rect5281"
-       width="24.557148"
-       height="1.4102663"
-       x="12.592034"
-       y="31.636858" />
-    <rect
-       y="35.464046"
-       x="13.475181"
-       height="2.7823999"
-       width="2.8205326"
-       id="rect5283"
-       style="fill:#404040;fill-opacity:1;stroke:none" />
-    <rect
-       y="36.055695"
-       x="17.744923"
-       height="1.4102663"
-       width="18.577394"
-       id="rect5285"
-       style="fill:#404040;fill-opacity:1;stroke:none" />
-    <rect
-       style="fill:#404040;fill-opacity:1;stroke:none"
-       id="rect5287"
-       width="2.8205326"
-       height="2.7823999"
-       x="13.54166"
-       y="40.35297" />
-    <rect
-       style="fill:#404040;fill-opacity:1;stroke:none"
-       id="rect5289"
-       width="23.080858"
-       height="1.4102663"
-       x="17.678442"
-       y="40.944618" />
-  </g>
-</svg>
diff --git a/apps/files_pdfviewer/js/pdfjs/web/images/nav-thumbs.svg b/apps/files_pdfviewer/js/pdfjs/web/images/nav-thumbs.svg
deleted file mode 100644
index 8737b8cb63..0000000000
--- a/apps/files_pdfviewer/js/pdfjs/web/images/nav-thumbs.svg
+++ /dev/null
@@ -1,283 +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://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="48px"
-   height="48px"
-   id="svg3007"
-   version="1.1"
-   inkscape:version="0.48.1 r9760"
-   sodipodi:docname="nav-thumbs.svg">
-  <defs
-     id="defs3009">
-    <filter
-       inkscape:collect="always"
-       id="filter5333"
-       x="-0.16623206"
-       width="1.3324641"
-       y="-0.030014125"
-       height="1.0600282">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.47888561"
-         id="feGaussianBlur5335" />
-    </filter>
-    <filter
-       inkscape:collect="always"
-       id="filter5966">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="0.3570515"
-         id="feGaussianBlur5968" />
-    </filter>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="11.945051"
-     inkscape:cx="9.375932"
-     inkscape:cy="24.942259"
-     inkscape:current-layer="layer1"
-     showgrid="true"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="1440"
-     inkscape:window-height="773"
-     inkscape:window-x="0"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata3012">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <rect
-       style="fill:#484848;fill-rule:evenodd;stroke:#808080;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1;fill-opacity:1"
-       id="rect3783"
-       width="46.16272"
-       height="45.59861"
-       x="1.0341953"
-       y="0.99112236" />
-    <rect
-       y="4.7876148"
-       x="14.359808"
-       height="12.764274"
-       width="9.7061672"
-       id="rect5960"
-       style="fill:#000000;fill-opacity:1;stroke:none;filter:url(#filter5966)"
-       transform="matrix(1.0465713,0,0,1.0642851,3.6426579,-2.1141417)" />
-    <rect
-       style="fill:#ffffff;fill-opacity:1;stroke:none"
-       id="rect5958"
-       width="9.7061672"
-       height="12.764274"
-       x="18.897236"
-       y="3.1920807" />
-    <rect
-       transform="matrix(1.0465713,0,0,1.0642851,3.6426579,13.043433)"
-       style="fill:#000000;fill-opacity:1;stroke:none;filter:url(#filter5966)"
-       id="rect5970"
-       width="9.7061672"
-       height="12.764274"
-       x="14.359808"
-       y="4.7876148" />
-    <rect
-       y="18.349655"
-       x="18.897236"
-       height="12.764274"
-       width="9.7061672"
-       id="rect5972"
-       style="fill:#ffffff;fill-opacity:1;stroke:none" />
-    <rect
-       y="4.7876148"
-       x="14.359808"
-       height="12.764274"
-       width="9.7061672"
-       id="rect5974"
-       style="fill:#000000;fill-opacity:1;stroke:none;filter:url(#filter5966)"
-       transform="matrix(1.0465713,0,0,0.9368834,3.6426579,29.209842)" />
-    <rect
-       style="fill:#ffffff;fill-opacity:1;stroke:none"
-       id="rect5976"
-       width="9.7061672"
-       height="11.833546"
-       x="18.897236"
-       y="33.906113" />
-    <rect
-       y="4.905829"
-       x="19.960924"
-       height="0.66480595"
-       width="7.7117486"
-       id="rect5995"
-       style="fill:#808080;fill-opacity:1;stroke:none" />
-    <rect
-       style="fill:#808080;fill-opacity:1;stroke:none"
-       id="rect6177"
-       width="3.6219761"
-       height="0.66480595"
-       x="19.960924"
-       y="6.0340419" />
-    <rect
-       style="fill:#808080;fill-opacity:1;stroke:none"
-       id="rect6179"
-       width="7.7117486"
-       height="0.66480595"
-       x="19.960924"
-       y="7.2562728" />
-    <rect
-       y="8.3844862"
-       x="19.960924"
-       height="0.66480595"
-       width="5.6903667"
-       id="rect6181"
-       style="fill:#808080;fill-opacity:1;stroke:none" />
-    <rect
-       y="9.7007341"
-       x="19.960924"
-       height="0.66480595"
-       width="7.7117486"
-       id="rect6183"
-       style="fill:#808080;fill-opacity:1;stroke:none" />
-    <rect
-       style="fill:#808080;fill-opacity:1;stroke:none"
-       id="rect6185"
-       width="7.7117486"
-       height="0.66480595"
-       x="19.960924"
-       y="10.828948" />
-    <rect
-       y="12.051179"
-       x="19.960924"
-       height="0.66480595"
-       width="7.7117486"
-       id="rect6187"
-       style="fill:#808080;fill-opacity:1;stroke:none" />
-    <rect
-       y="14.213587"
-       x="23.204536"
-       height="0.66480595"
-       width="1.2245234"
-       id="rect6189"
-       style="fill:#808080;fill-opacity:1;stroke:none" />
-    <rect
-       style="fill:#808080;fill-opacity:1;stroke:none"
-       id="rect6209"
-       width="7.7117486"
-       height="0.66480595"
-       x="19.772888"
-       y="19.854652" />
-    <rect
-       y="39.08128"
-       x="19.913914"
-       height="0.66480595"
-       width="3.6219761"
-       id="rect6211"
-       style="fill:#808080;fill-opacity:1;stroke:none" />
-    <rect
-       y="22.205095"
-       x="19.772888"
-       height="0.66480595"
-       width="6.6305442"
-       id="rect6213"
-       style="fill:#808080;fill-opacity:1;stroke:none" />
-    <rect
-       style="fill:#808080;fill-opacity:1;stroke:none"
-       id="rect6215"
-       width="7.7587576"
-       height="0.66480595"
-       x="19.866905"
-       y="37.859051" />
-    <rect
-       style="fill:#808080;fill-opacity:1;stroke:none"
-       id="rect6217"
-       width="7.7117486"
-       height="0.66480595"
-       x="19.772888"
-       y="21.029873" />
-    <rect
-       y="25.777771"
-       x="19.772888"
-       height="0.66480595"
-       width="7.7117486"
-       id="rect6219"
-       style="fill:#808080;fill-opacity:1;stroke:none" />
-    <rect
-       style="fill:#808080;fill-opacity:1;stroke:none"
-       id="rect6221"
-       width="7.7117486"
-       height="0.66480595"
-       x="19.772888"
-       y="27.000002" />
-    <rect
-       style="fill:#808080;fill-opacity:1;stroke:none"
-       id="rect6223"
-       width="1.2245234"
-       height="0.66480595"
-       x="23.204536"
-       y="28.974375" />
-    <rect
-       style="fill:#808080;fill-opacity:1;stroke:none"
-       id="rect6225"
-       width="3.6219761"
-       height="0.66480595"
-       x="19.960922"
-       y="42.983021" />
-    <rect
-       style="fill:#808080;fill-opacity:1;stroke:none"
-       id="rect6227"
-       width="7.7117486"
-       height="0.66480595"
-       x="19.913914"
-       y="36.777847" />
-    <rect
-       y="35.602627"
-       x="19.913914"
-       height="0.66480595"
-       width="7.7117486"
-       id="rect6231"
-       style="fill:#808080;fill-opacity:1;stroke:none" />
-    <rect
-       style="fill:#808080;fill-opacity:1;stroke:none"
-       id="rect6233"
-       width="7.7117486"
-       height="0.66480595"
-       x="19.913914"
-       y="40.350525" />
-    <rect
-       y="41.572754"
-       x="19.913914"
-       height="0.66480595"
-       width="7.7117486"
-       id="rect6235"
-       style="fill:#808080;fill-opacity:1;stroke:none" />
-    <rect
-       style="fill:#0000e6;fill-opacity:0.44444448;stroke:none"
-       id="rect6237"
-       width="3.5256658"
-       height="1.927364"
-       x="22.077036"
-       y="23.367346" />
-  </g>
-</svg>
diff --git a/apps/files_pdfviewer/js/pdfjs/web/images/pin-down.svg b/apps/files_pdfviewer/js/pdfjs/web/images/pin-down.svg
deleted file mode 100644
index 357667600b..0000000000
--- a/apps/files_pdfviewer/js/pdfjs/web/images/pin-down.svg
+++ /dev/null
@@ -1,297 +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://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"
-   width="48"
-   height="48"
-   id="svg3075"
-   version="1.1"
-   inkscape:version="0.48.1 r9760"
-   sodipodi:docname="pin-down.svg"
-   viewPort="0 0 48 48">
-  <defs
-     id="defs3077">
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient3804">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop3806" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop3808" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3965">
-      <stop
-         id="stop3967"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="1"
-         id="stop3969" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3885">
-      <stop
-         style="stop-color:#a8b5e9;stop-opacity:1;"
-         offset="0"
-         id="stop3889" />
-      <stop
-         id="stop3891"
-         offset="1"
-         style="stop-color:#1d4488;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3865">
-      <stop
-         style="stop-color:#0e0ec3;stop-opacity:0"
-         offset="0"
-         id="stop3867" />
-      <stop
-         id="stop3883"
-         offset="0.5"
-         style="stop-color:#95b1e4;stop-opacity:1;" />
-      <stop
-         style="stop-color:#0d29c0;stop-opacity:1;"
-         offset="1"
-         id="stop3869" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3853">
-      <stop
-         style="stop-color:#717171;stop-opacity:1;"
-         offset="0"
-         id="stop3855" />
-      <stop
-         id="stop3861"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         style="stop-color:#818181;stop-opacity:1;"
-         offset="1"
-         id="stop3857" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3885"
-       id="radialGradient3792"
-       cx="13.508819"
-       cy="30.521608"
-       fx="13.508819"
-       fy="30.521608"
-       r="13.254341"
-       gradientTransform="matrix(1,0,0,1.045977,0,-1.4434017)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3885"
-       id="linearGradient3802"
-       x1="15.306904"
-       y1="13.407407"
-       x2="29.35461"
-       y2="30.15519"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2304178,0,0,1.1235308,-2.1158755,998.83747)" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3804"
-       id="radialGradient3812"
-       cx="20.111172"
-       cy="28.238274"
-       fx="20.111172"
-       fy="28.238274"
-       r="7.6291947"
-       gradientTransform="matrix(1.2304178,0,0,1.1452771,-2.1158755,998.22337)"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3885"
-       id="radialGradient3822"
-       cx="23.985939"
-       cy="24.847366"
-       fx="23.985939"
-       fy="24.847366"
-       r="10.593476"
-       gradientTransform="matrix(0.63682384,0.44303926,-1.1714282,1.6838088,35.523491,-26.055439)"
-       gradientUnits="userSpaceOnUse" />
-    <filter
-       inkscape:collect="always"
-       id="filter3856"
-       x="-0.30370581"
-       width="1.6074116"
-       y="-0.32771564"
-       height="1.6554313">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="4.7808869"
-         id="feGaussianBlur3858" />
-    </filter>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3885"
-       id="radialGradient3865"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,1.045977,0,-1.4434017)"
-       cx="13.508819"
-       cy="30.521608"
-       fx="13.508819"
-       fy="30.521608"
-       r="13.254341" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3885"
-       id="linearGradient3867"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2304178,0,0,1.1235308,-2.1158755,998.83747)"
-       x1="15.306904"
-       y1="13.407407"
-       x2="29.35461"
-       y2="30.15519" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3804"
-       id="radialGradient3869"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.2304178,0,0,1.1452771,-2.1158755,998.22337)"
-       cx="20.111172"
-       cy="28.238274"
-       fx="20.111172"
-       fy="28.238274"
-       r="7.6291947" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3885"
-       id="radialGradient3871"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.63682384,0.44303926,-1.1714282,1.6838088,35.523491,-26.055439)"
-       cx="23.985939"
-       cy="24.847366"
-       fx="23.985939"
-       fy="24.847366"
-       r="10.593476" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3885"
-       id="linearGradient3875"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(0.98683814,0,0,0.9524914,3.4991888,1004.1467)"
-       x1="15.306904"
-       y1="13.407407"
-       x2="29.35461"
-       y2="30.15519" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3804"
-       id="radialGradient3877"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.195641,0.23932984,-0.18533175,0.95255553,4.5333676,999.33159)"
-       cx="20.111172"
-       cy="28.238274"
-       fx="20.111172"
-       fy="28.238274"
-       r="7.6291947" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3885"
-       id="radialGradient3880"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.5847553,0.52693722,-0.99805104,2.7064773,14.11088,-45.304477)"
-       cx="18.133854"
-       cy="19.778509"
-       fx="18.133854"
-       fy="19.778509"
-       r="10.593476" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3885"
-       id="radialGradient3882"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,1.045977,0,-1.4434017)"
-       cx="13.508819"
-       cy="30.521608"
-       fx="13.508819"
-       fy="30.521608"
-       r="13.254341" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="4.9558805"
-     inkscape:cx="3.0237013"
-     inkscape:cy="17.287267"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="1291"
-     inkscape:window-height="776"
-     inkscape:window-x="16"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata3080">
-    <rdf:RDF>
-      <cc:Work
-         rdf:about="">
-        <dc:format>image/svg+xml</dc:format>
-        <dc:type
-           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title />
-      </cc:Work>
-    </rdf:RDF>
-  </metadata>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1004.3622)">
-    <path
-       style="fill:#ffffff;fill-opacity:1;stroke:none;filter:url(#filter3856)"
-       d="m 14.326415,1019.2702 c -8.3327876,4.0675 -9.8235436,10.8833 -8.8783416,15.1336 4.6840646,7.9754 8.3608166,13.8165 24.0118786,12.9139 9.657617,-3.7312 12.9762,-9.3269 13.519293,-15.7389 -0.547269,-4.3839 -1.957958,-9.3396 -5.649854,-14.9317 -3.965534,-2.471 -6.300859,-4.4246 -10.290805,-4.2374 -8.25193,0.5026 -8.752485,4.4502 -12.712171,6.8605 z"
-       id="path3826"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccccc"
-       transform="matrix(0.69099294,0,0,0.75978808,7.3427938,249.11025)" />
-    <path
-       sodipodi:type="arc"
-       style="fill:url(#radialGradient3882);fill-opacity:1;stroke:none"
-       id="path3011"
-       sodipodi:cx="21.176477"
-       sodipodi:cy="31.393986"
-       sodipodi:rx="13.254341"
-       sodipodi:ry="13.863736"
-       d="m 34.430819,31.393986 a 13.254341,13.863736 0 1 1 -26.5086827,0 13.254341,13.863736 0 1 1 26.5086827,0 z"
-       transform="matrix(0.98683814,0,0,0.83062636,2.696034,1005.3655)" />
-    <path
-       style="fill:url(#linearGradient3875);fill-opacity:1;stroke:url(#radialGradient3877);stroke-width:0.9695127;stroke-opacity:1"
-       d="m 17.246758,1026.7905 c -1.7156,4.5052 -2.482464,10.6205 8.726963,10.7476 4.849099,-1.8941 3.522783,-5.3561 6.021544,-11.8282 l -10.973104,-1.5977 z"
-       id="path3794"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       sodipodi:type="arc"
-       style="fill:url(#radialGradient3880);fill-opacity:1;stroke:none"
-       id="path3814"
-       sodipodi:cx="24.718111"
-       sodipodi:cy="23.38278"
-       sodipodi:rx="10.593476"
-       sodipodi:ry="9.6854639"
-       d="m 35.311587,23.38278 a 10.593476,9.6854639 0 1 1 -21.186952,0 10.593476,9.6854639 0 1 1 21.186952,0 z"
-       transform="matrix(0.85425691,0,0,0.84187503,3.9779774,1006.7561)" />
-  </g>
-</svg>
diff --git a/apps/files_pdfviewer/js/pdfjs/web/images/pin-up.svg b/apps/files_pdfviewer/js/pdfjs/web/images/pin-up.svg
deleted file mode 100644
index e55cec7a04..0000000000
--- a/apps/files_pdfviewer/js/pdfjs/web/images/pin-up.svg
+++ /dev/null
@@ -1,230 +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://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"
-   width="48"
-   height="48"
-   id="svg3075"
-   version="1.1"
-   inkscape:version="0.48.1 r9760"
-   sodipodi:docname="pin-up.svg"
-   viewPort="0 0 48 48">
-  <defs
-     id="defs3077">
-    <linearGradient
-       id="linearGradient3965">
-      <stop
-         id="stop3967"
-         offset="0"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0"
-         offset="1"
-         id="stop3969" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3885">
-      <stop
-         style="stop-color:#a8b5e9;stop-opacity:1;"
-         offset="0"
-         id="stop3889" />
-      <stop
-         id="stop3891"
-         offset="1"
-         style="stop-color:#1d4488;stop-opacity:1;" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3865">
-      <stop
-         style="stop-color:#0e0ec3;stop-opacity:1;"
-         offset="0"
-         id="stop3867" />
-      <stop
-         id="stop3883"
-         offset="0.5"
-         style="stop-color:#95b1e4;stop-opacity:1;" />
-      <stop
-         style="stop-color:#0d29c0;stop-opacity:1;"
-         offset="1"
-         id="stop3869" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient3853">
-      <stop
-         style="stop-color:#717171;stop-opacity:1;"
-         offset="0"
-         id="stop3855" />
-      <stop
-         id="stop3861"
-         offset="0.5"
-         style="stop-color:#ffffff;stop-opacity:1;" />
-      <stop
-         style="stop-color:#818181;stop-opacity:1;"
-         offset="1"
-         id="stop3857" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3853"
-       id="linearGradient3859"
-       x1="7.7696066"
-       y1="34.979828"
-       x2="11.854106"
-       y2="39.107044"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(4.8388015,1001.6582)" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3885"
-       id="radialGradient3871"
-       cx="14.801222"
-       cy="1030.6609"
-       fx="14.801222"
-       fy="1030.6609"
-       r="10.177785"
-       gradientTransform="matrix(1,0,0,1.0108042,4.8388015,-13.880529)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3865"
-       id="linearGradient3881"
-       x1="15.012629"
-       y1="11.922465"
-       x2="31.098303"
-       y2="28.858271"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1,0,0,0.97315436,4.8388015,1002.4769)" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3885"
-       id="radialGradient3909"
-       cx="16.437693"
-       cy="22.596292"
-       fx="16.437693"
-       fy="22.596292"
-       r="1.7789712"
-       gradientTransform="matrix(1,0,0,8.3599999,0,-166.30871)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3865"
-       id="linearGradient3927"
-       x1="26.47109"
-       y1="1010.7343"
-       x2="35.294788"
-       y2="1019.8425"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(4.5541661,-2.1347654)" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient3965"
-       id="radialGradient3995"
-       cx="23.189369"
-       cy="25.704245"
-       fx="23.189369"
-       fy="25.704245"
-       r="37.336674"
-       gradientTransform="matrix(1,0,0,1.0332422,0,-0.85446479)"
-       gradientUnits="userSpaceOnUse" />
-    <filter
-       inkscape:collect="always"
-       id="filter4009"
-       x="-0.19299152"
-       width="1.385983"
-       y="-0.18351803"
-       height="1.3670361">
-      <feGaussianBlur
-         inkscape:collect="always"
-         stdDeviation="3.8667902"
-         id="feGaussianBlur4011" />
-    </filter>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="3.2819435"
-     inkscape:cx="18.697469"
-     inkscape:cy="17.287267"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:window-width="970"
-     inkscape:window-height="778"
-     inkscape:window-x="284"
-     inkscape:window-y="0"
-     inkscape:window-maximized="0" />
-  <metadata
-     id="metadata3080">
-    <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>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1004.3622)">
-    <path
-       style="fill:url(#radialGradient3995);stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1.0;filter:url(#filter4009)"
-       d="M -0.85390618,50.988672 14.231769,27.790888 C 12.21393,25.133052 9.5514307,24.605255 9.9622384,18.824874 13.947134,14.236899 17.362759,16.258973 21.347654,16.54779 l 8.966014,-8.6813789 c 1.467204,-2.4778468 -1.023584,-4.6422045 0.569271,-7.25820222 4.802307,-0.84764718 6.662499,1.15219542 11.527733,6.26197842 4.061691,4.1873637 5.648882,7.0611607 4.411848,9.5352857 -1.075122,2.776443 -4.518349,-0.692782 -5.835025,0.56927 l -9.108332,10.104556 c -0.418785,3.74872 2.078647,7.861968 -1.280859,11.243098 -4.132171,0.818036 -6.734336,-1.933944 -9.819921,-3.557942 z"
-       id="path3955"
-       inkscape:connector-curvature="0"
-       transform="translate(0,1004.3622)"
-       sodipodi:nodetypes="ccccccccccccc" />
-    <g
-       id="g3929">
-      <path
-         sodipodi:nodetypes="cccc"
-         inkscape:connector-curvature="0"
-         id="path3083"
-         d="m 3.2884874,1051.0662 c 3.1862139,-6.2911 11.3693156,-15.19 15.4471616,-20.0327 l 2.86533,3.0086 c -3.476851,3.6575 -10.192375,10.8664 -18.3124916,17.0241 z"
-         style="fill:url(#linearGradient3859);fill-opacity:1;stroke:#a5a5a5;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         id="path3863"
-         d="m 11.10078,1023.3294 c 5.038264,10.1095 11.83652,14.8875 18.358981,18.2167 1.196291,-2.5422 1.454996,-5.6203 0,-9.6776 l -8.539061,-8.6814 c -3.704654,-1.8936 -6.871076,-1.3652 -9.81992,0.1423 z"
-         style="fill:url(#radialGradient3871);fill-opacity:1;stroke:none" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         id="path3873"
-         d="m 33.729292,1011.5171 -13.235545,11.4952 c 2.869602,4.2703 6.221839,7.4544 9.108332,9.1408 l 11.385416,-13.0187 z"
-         style="fill:url(#linearGradient3881);fill-opacity:1;stroke:none" />
-      <path
-         sodipodi:nodetypes="ccccc"
-         inkscape:connector-curvature="0"
-         id="path3893"
-         d="m 33.228885,1011.6148 c 1.843189,2.7806 3.431654,5.6597 7.19852,7.6953 l 5.398891,1.7423 c -7.6738,-4.7914 -10.989683,-9.5828 -13.947133,-14.3741 z"
-         style="fill:url(#linearGradient3927);fill-opacity:1;stroke:none" />
-      <path
-         transform="matrix(0.68275275,-0.5590416,0.45791123,0.47036287,17.42507,1012.2127)"
-         d="m 18.216664,22.596292 a 1.7789712,14.872199 0 1 1 -3.557943,0 1.7789712,14.872199 0 1 1 3.557943,0 z"
-         sodipodi:ry="14.872199"
-         sodipodi:rx="1.7789712"
-         sodipodi:cy="22.596292"
-         sodipodi:cx="16.437693"
-         id="path3901"
-         style="fill:url(#radialGradient3909);fill-opacity:1;stroke:none"
-         sodipodi:type="arc" />
-    </g>
-  </g>
-</svg>
diff --git a/apps/files_pdfviewer/js/pdfjs/web/images/zoom-in.svg b/apps/files_pdfviewer/js/pdfjs/web/images/zoom-in.svg
deleted file mode 100644
index 48ee42dd9b..0000000000
--- a/apps/files_pdfviewer/js/pdfjs/web/images/zoom-in.svg
+++ /dev/null
@@ -1,437 +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://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"
-   width="48px"
-   height="48px"
-   id="svg6431"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   sodipodi:docbase="/home/jimmac/src/cvs/tango-icon-theme/scalable/actions"
-   sodipodi:docname="list-add.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   viewbox="0 0 48 48">
-  <defs
-     id="defs6433">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 24 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="48 : 24 : 1"
-       inkscape:persp3d-origin="24 : 16 : 1"
-       id="perspective70" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient2091">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop2093" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop2095" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient7916">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop7918" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.34020618;"
-         offset="1.0000000"
-         id="stop7920" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient8662">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop8664" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop8666" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8662"
-       id="radialGradient1503"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.000000,0.000000,0.000000,0.536723,-1.018989e-13,16.87306)"
-       cx="24.837126"
-       cy="36.421127"
-       fx="24.837126"
-       fy="36.421127"
-       r="15.644737" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient2847">
-      <stop
-         style="stop-color:#3465a4;stop-opacity:1;"
-         offset="0"
-         id="stop2849" />
-      <stop
-         style="stop-color:#3465a4;stop-opacity:0;"
-         offset="1"
-         id="stop2851" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2847"
-       id="linearGradient1488"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.000000,0.000000,0.000000,-1.000000,-1.242480,40.08170)"
-       x1="37.128052"
-       y1="29.729605"
-       x2="37.065414"
-       y2="26.194071" />
-    <linearGradient
-       id="linearGradient2831">
-      <stop
-         style="stop-color:#3465a4;stop-opacity:1;"
-         offset="0"
-         id="stop2833" />
-      <stop
-         id="stop2855"
-         offset="0.33333334"
-         style="stop-color:#5b86be;stop-opacity:1;" />
-      <stop
-         style="stop-color:#83a8d8;stop-opacity:0;"
-         offset="1"
-         id="stop2835" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2831"
-       id="linearGradient1486"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-48.30498,-6.043298)"
-       x1="13.478554"
-       y1="10.612206"
-       x2="15.419417"
-       y2="19.115122" />
-    <linearGradient
-       id="linearGradient2380">
-      <stop
-         style="stop-color:#b9cfe7;stop-opacity:1"
-         offset="0"
-         id="stop2382" />
-      <stop
-         style="stop-color:#729fcf;stop-opacity:1"
-         offset="1"
-         id="stop2384" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2682">
-      <stop
-         style="stop-color:#3977c3;stop-opacity:1;"
-         offset="0"
-         id="stop2684" />
-      <stop
-         style="stop-color:#89aedc;stop-opacity:0;"
-         offset="1"
-         id="stop2686" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2682"
-       id="linearGradient2688"
-       x1="36.713837"
-       y1="31.455952"
-       x2="37.124462"
-       y2="24.842253"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-48.77039,-5.765705)" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient2690">
-      <stop
-         style="stop-color:#c4d7eb;stop-opacity:1;"
-         offset="0"
-         id="stop2692" />
-      <stop
-         style="stop-color:#c4d7eb;stop-opacity:0;"
-         offset="1"
-         id="stop2694" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2690"
-       id="linearGradient2696"
-       x1="32.647972"
-       y1="30.748846"
-       x2="37.124462"
-       y2="24.842253"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-48.77039,-5.765705)" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient2871">
-      <stop
-         style="stop-color:#3465a4;stop-opacity:1;"
-         offset="0"
-         id="stop2873" />
-      <stop
-         style="stop-color:#3465a4;stop-opacity:1"
-         offset="1"
-         id="stop2875" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2402">
-      <stop
-         style="stop-color:#729fcf;stop-opacity:1;"
-         offset="0"
-         id="stop2404" />
-      <stop
-         style="stop-color:#528ac5;stop-opacity:1;"
-         offset="1"
-         id="stop2406" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2797"
-       id="linearGradient1493"
-       gradientUnits="userSpaceOnUse"
-       x1="5.9649176"
-       y1="26.048164"
-       x2="52.854097"
-       y2="26.048164" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient2797">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop2799" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop2801" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2797"
-       id="linearGradient1491"
-       gradientUnits="userSpaceOnUse"
-       x1="5.9649176"
-       y1="26.048164"
-       x2="52.854097"
-       y2="26.048164" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient7179">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop7181" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop7183" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2316">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop2318" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.65979379;"
-         offset="1"
-         id="stop2320" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient1322">
-      <stop
-         id="stop1324"
-         offset="0.0000000"
-         style="stop-color:#729fcf" />
-      <stop
-         id="stop1326"
-         offset="1.0000000"
-         style="stop-color:#5187d6;stop-opacity:1.0000000;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1322"
-       id="linearGradient4975"
-       x1="34.892849"
-       y1="36.422989"
-       x2="45.918697"
-       y2="48.547989"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-18.01785,-13.57119)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7179"
-       id="linearGradient7185"
-       x1="13.435029"
-       y1="13.604306"
-       x2="22.374878"
-       y2="23.554308"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7179"
-       id="linearGradient7189"
-       gradientUnits="userSpaceOnUse"
-       x1="13.435029"
-       y1="13.604306"
-       x2="22.374878"
-       y2="23.554308"
-       gradientTransform="matrix(-1.000000,0.000000,0.000000,-1.000000,47.93934,50.02474)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2380"
-       id="linearGradient7180"
-       gradientUnits="userSpaceOnUse"
-       x1="62.513836"
-       y1="36.061237"
-       x2="15.984863"
-       y2="20.60858" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2871"
-       id="linearGradient7182"
-       gradientUnits="userSpaceOnUse"
-       x1="46.834816"
-       y1="45.264122"
-       x2="45.380436"
-       y2="50.939667" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2402"
-       id="linearGradient7184"
-       gradientUnits="userSpaceOnUse"
-       x1="18.935766"
-       y1="23.667896"
-       x2="53.588622"
-       y2="26.649362" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2871"
-       id="linearGradient7186"
-       gradientUnits="userSpaceOnUse"
-       x1="46.834816"
-       y1="45.264122"
-       x2="45.380436"
-       y2="50.939667" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7916"
-       id="linearGradient7922"
-       x1="16.874998"
-       y1="22.851799"
-       x2="27.900846"
-       y2="34.976799"
-       gradientUnits="userSpaceOnUse" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2091"
-       id="radialGradient2097"
-       cx="23.070683"
-       cy="35.127438"
-       fx="23.070683"
-       fy="35.127438"
-       r="10.319340"
-       gradientTransform="matrix(0.914812,1.265023e-2,-8.21502e-3,0.213562,2.253914,27.18889)"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="0.15686275"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="-123.56934"
-     inkscape:cy="0.031886897"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="1280"
-     inkscape:window-height="818"
-     inkscape:window-x="0"
-     inkscape:window-y="30"
-     showguides="true"
-     inkscape:guide-bbox="true"
-     inkscape:showpageshadow="false" />
-  <metadata
-     id="metadata6436">
-    <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>Add</dc:title>
-        <dc:date>2006-01-04</dc:date>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Andreas Nilsson</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <dc:source>http://tango-project.org</dc:source>
-        <dc:subject>
-          <rdf:Bag>
-            <rdf:li>add</rdf:li>
-            <rdf:li>plus</rdf:li>
-          </rdf:Bag>
-        </dc:subject>
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/publicdomain/" />
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/publicdomain/">
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Reproduction" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Distribution" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <path
-       sodipodi:type="arc"
-       style="opacity:0.10824742;fill:url(#radialGradient2097);fill-opacity:1;stroke:none;stroke-width:3;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
-       id="path1361"
-       sodipodi:cx="22.958872"
-       sodipodi:cy="34.94062"
-       sodipodi:rx="10.31934"
-       sodipodi:ry="2.320194"
-       d="M 33.278212 34.94062 A 10.31934 2.320194 0 1 1  12.639532,34.94062 A 10.31934 2.320194 0 1 1  33.278212 34.94062 z"
-       transform="matrix(1.550487,0,0,1.978714,-12.4813,-32.49103)" />
-    <path
-       style="fill:#75a1d0;fill-opacity:1.0000000;stroke:#3465a4;stroke-width:1.0000004px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000"
-       d="M 27.514356,37.542682 L 27.514356,28.515722 L 37.492820,28.475543 L 37.492820,21.480219 L 27.523285,21.480219 L 27.514356,11.520049 L 20.498082,11.531210 L 20.502546,21.462362 L 10.512920,21.536022 L 10.477206,28.504561 L 20.511475,28.475543 L 20.518171,37.515896 L 27.514356,37.542682 z "
-       id="text1314"
-       sodipodi:nodetypes="ccccccccccccc" />
-    <path
-       style="opacity:0.40860215;fill:url(#linearGradient4975);fill-opacity:1.0000000;stroke:url(#linearGradient7922);stroke-width:1.0000006px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000"
-       d="M 26.498702,36.533920 L 26.498702,27.499738 L 36.501304,27.499738 L 36.494607,22.475309 L 26.507630,22.475309 L 26.507630,12.480335 L 21.512796,12.498193 L 21.521725,22.475309 L 11.495536,22.493166 L 11.468750,27.466256 L 21.533143,27.475185 L 21.519750,36.502670 L 26.498702,36.533920 z "
-       id="path7076"
-       sodipodi:nodetypes="ccccccccccccc" />
-    <path
-       style="fill:#ffffff;fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;opacity:0.31182796"
-       d="M 11.000000,25.000000 C 11.000000,26.937500 36.984375,24.031250 36.984375,24.968750 L 36.984375,21.968750 L 27.000000,22.000000 L 27.000000,12.034772 L 21.000000,12.034772 L 21.000000,22.000000 L 11.000000,22.000000 L 11.000000,25.000000 z "
-       id="path7914"
-       sodipodi:nodetypes="ccccccccc" />
-  </g>
-</svg>
diff --git a/apps/files_pdfviewer/js/pdfjs/web/images/zoom-out.svg b/apps/files_pdfviewer/js/pdfjs/web/images/zoom-out.svg
deleted file mode 100644
index eb13b60e37..0000000000
--- a/apps/files_pdfviewer/js/pdfjs/web/images/zoom-out.svg
+++ /dev/null
@@ -1,425 +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://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"
-   width="48px"
-   height="48px"
-   id="svg6431"
-   sodipodi:version="0.32"
-   inkscape:version="0.46"
-   sodipodi:docbase="/home/jimmac/src/cvs/tango-icon-theme/scalable/actions"
-   sodipodi:docname="list-remove.svg"
-   inkscape:output_extension="org.inkscape.output.svg.inkscape"
-   viewbox="0 0 48 48">
-  <defs
-     id="defs6433">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 24 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="48 : 24 : 1"
-       inkscape:persp3d-origin="24 : 16 : 1"
-       id="perspective69" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient2091">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop2093" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop2095" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2091"
-       id="radialGradient2097"
-       cx="23.070683"
-       cy="35.127438"
-       fx="23.070683"
-       fy="35.127438"
-       r="10.319340"
-       gradientTransform="matrix(0.914812,1.265023e-2,-8.21502e-3,0.213562,2.253914,27.18889)"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       id="linearGradient7916">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop7918" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.34020618;"
-         offset="1.0000000"
-         id="stop7920" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient8662">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop8664" />
-      <stop
-         style="stop-color:#000000;stop-opacity:0;"
-         offset="1"
-         id="stop8666" />
-    </linearGradient>
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient8662"
-       id="radialGradient1503"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(1.000000,0.000000,0.000000,0.536723,-1.018989e-13,16.87306)"
-       cx="24.837126"
-       cy="36.421127"
-       fx="24.837126"
-       fy="36.421127"
-       r="15.644737" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient2847">
-      <stop
-         style="stop-color:#3465a4;stop-opacity:1;"
-         offset="0"
-         id="stop2849" />
-      <stop
-         style="stop-color:#3465a4;stop-opacity:0;"
-         offset="1"
-         id="stop2851" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2847"
-       id="linearGradient1488"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="matrix(-1.000000,0.000000,0.000000,-1.000000,-1.242480,40.08170)"
-       x1="37.128052"
-       y1="29.729605"
-       x2="37.065414"
-       y2="26.194071" />
-    <linearGradient
-       id="linearGradient2831">
-      <stop
-         style="stop-color:#3465a4;stop-opacity:1;"
-         offset="0"
-         id="stop2833" />
-      <stop
-         id="stop2855"
-         offset="0.33333334"
-         style="stop-color:#5b86be;stop-opacity:1;" />
-      <stop
-         style="stop-color:#83a8d8;stop-opacity:0;"
-         offset="1"
-         id="stop2835" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2831"
-       id="linearGradient1486"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-48.30498,-6.043298)"
-       x1="13.478554"
-       y1="10.612206"
-       x2="15.419417"
-       y2="19.115122" />
-    <linearGradient
-       id="linearGradient2380">
-      <stop
-         style="stop-color:#b9cfe7;stop-opacity:1"
-         offset="0"
-         id="stop2382" />
-      <stop
-         style="stop-color:#729fcf;stop-opacity:1"
-         offset="1"
-         id="stop2384" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2682">
-      <stop
-         style="stop-color:#3977c3;stop-opacity:1;"
-         offset="0"
-         id="stop2684" />
-      <stop
-         style="stop-color:#89aedc;stop-opacity:0;"
-         offset="1"
-         id="stop2686" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2682"
-       id="linearGradient2688"
-       x1="36.713837"
-       y1="31.455952"
-       x2="37.124462"
-       y2="24.842253"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-48.77039,-5.765705)" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient2690">
-      <stop
-         style="stop-color:#c4d7eb;stop-opacity:1;"
-         offset="0"
-         id="stop2692" />
-      <stop
-         style="stop-color:#c4d7eb;stop-opacity:0;"
-         offset="1"
-         id="stop2694" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2690"
-       id="linearGradient2696"
-       x1="32.647972"
-       y1="30.748846"
-       x2="37.124462"
-       y2="24.842253"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-48.77039,-5.765705)" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient2871">
-      <stop
-         style="stop-color:#3465a4;stop-opacity:1;"
-         offset="0"
-         id="stop2873" />
-      <stop
-         style="stop-color:#3465a4;stop-opacity:1"
-         offset="1"
-         id="stop2875" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2402">
-      <stop
-         style="stop-color:#729fcf;stop-opacity:1;"
-         offset="0"
-         id="stop2404" />
-      <stop
-         style="stop-color:#528ac5;stop-opacity:1;"
-         offset="1"
-         id="stop2406" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2797"
-       id="linearGradient1493"
-       gradientUnits="userSpaceOnUse"
-       x1="5.9649176"
-       y1="26.048164"
-       x2="52.854097"
-       y2="26.048164" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient2797">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop2799" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop2801" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2797"
-       id="linearGradient1491"
-       gradientUnits="userSpaceOnUse"
-       x1="5.9649176"
-       y1="26.048164"
-       x2="52.854097"
-       y2="26.048164" />
-    <linearGradient
-       inkscape:collect="always"
-       id="linearGradient7179">
-      <stop
-         style="stop-color:#ffffff;stop-opacity:1;"
-         offset="0"
-         id="stop7181" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0;"
-         offset="1"
-         id="stop7183" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient2316">
-      <stop
-         style="stop-color:#000000;stop-opacity:1;"
-         offset="0"
-         id="stop2318" />
-      <stop
-         style="stop-color:#ffffff;stop-opacity:0.65979379;"
-         offset="1"
-         id="stop2320" />
-    </linearGradient>
-    <linearGradient
-       id="linearGradient1322">
-      <stop
-         id="stop1324"
-         offset="0.0000000"
-         style="stop-color:#729fcf" />
-      <stop
-         id="stop1326"
-         offset="1.0000000"
-         style="stop-color:#5187d6;stop-opacity:1.0000000;" />
-    </linearGradient>
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient1322"
-       id="linearGradient4975"
-       x1="34.892849"
-       y1="36.422989"
-       x2="45.918697"
-       y2="48.547989"
-       gradientUnits="userSpaceOnUse"
-       gradientTransform="translate(-18.01785,-13.57119)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7179"
-       id="linearGradient7185"
-       x1="13.435029"
-       y1="13.604306"
-       x2="22.374878"
-       y2="23.554308"
-       gradientUnits="userSpaceOnUse" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7179"
-       id="linearGradient7189"
-       gradientUnits="userSpaceOnUse"
-       x1="13.435029"
-       y1="13.604306"
-       x2="22.374878"
-       y2="23.554308"
-       gradientTransform="matrix(-1.000000,0.000000,0.000000,-1.000000,47.93934,50.02474)" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2380"
-       id="linearGradient7180"
-       gradientUnits="userSpaceOnUse"
-       x1="62.513836"
-       y1="36.061237"
-       x2="15.984863"
-       y2="20.60858" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2871"
-       id="linearGradient7182"
-       gradientUnits="userSpaceOnUse"
-       x1="46.834816"
-       y1="45.264122"
-       x2="45.380436"
-       y2="50.939667" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2402"
-       id="linearGradient7184"
-       gradientUnits="userSpaceOnUse"
-       x1="18.935766"
-       y1="23.667896"
-       x2="53.588622"
-       y2="26.649362" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2871"
-       id="linearGradient7186"
-       gradientUnits="userSpaceOnUse"
-       x1="46.834816"
-       y1="45.264122"
-       x2="45.380436"
-       y2="50.939667" />
-    <linearGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient7916"
-       id="linearGradient7922"
-       x1="16.874998"
-       y1="22.851799"
-       x2="27.900846"
-       y2="34.976799"
-       gradientUnits="userSpaceOnUse" />
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="0.10980392"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="-123.27226"
-     inkscape:cy="26.474252"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     inkscape:grid-bbox="true"
-     inkscape:document-units="px"
-     inkscape:window-width="1280"
-     inkscape:window-height="818"
-     inkscape:window-x="0"
-     inkscape:window-y="30"
-     inkscape:showpageshadow="false" />
-  <metadata
-     id="metadata6436">
-    <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>Remove</dc:title>
-        <dc:date>2006-01-04</dc:date>
-        <dc:creator>
-          <cc:Agent>
-            <dc:title>Andreas Nilsson</dc:title>
-          </cc:Agent>
-        </dc:creator>
-        <dc:source>http://tango-project.org</dc:source>
-        <dc:subject>
-          <rdf:Bag>
-            <rdf:li>remove</rdf:li>
-            <rdf:li>delete</rdf:li>
-          </rdf:Bag>
-        </dc:subject>
-        <cc:license
-           rdf:resource="http://creativecommons.org/licenses/publicdomain/" />
-      </cc:Work>
-      <cc:License
-         rdf:about="http://creativecommons.org/licenses/publicdomain/">
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Reproduction" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#Distribution" />
-        <cc:permits
-           rdf:resource="http://creativecommons.org/ns#DerivativeWorks" />
-      </cc:License>
-    </rdf:RDF>
-  </metadata>
-  <g
-     id="layer1"
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer">
-    <path
-       style="fill:#75a1d0;fill-opacity:1.0000000;stroke:#3465a4;stroke-width:1.0000004px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000"
-       d="M 27.514356,28.359472 L 39.633445,28.475543 L 39.633445,21.480219 L 27.523285,21.480219 L 20.502546,21.462362 L 8.5441705,21.489147 L 8.5084565,28.457686 L 20.511475,28.475543 L 27.514356,28.359472 z "
-       id="text1314"
-       sodipodi:nodetypes="ccccccccc" />
-    <path
-       style="opacity:0.40860215;fill:url(#linearGradient4975);fill-opacity:1.0000000;stroke:url(#linearGradient7922);stroke-width:1.0000006px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000"
-       d="M 38.579429,27.484113 L 38.588357,22.475309 L 9.5267863,22.493166 L 9.5000003,27.466256 L 38.579429,27.484113 z "
-       id="path7076"
-       sodipodi:nodetypes="ccccc" />
-    <path
-       style="fill:#ffffff;fill-opacity:1.0000000;fill-rule:evenodd;stroke:none;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000;opacity:0.31182796"
-       d="M 9.0000000,25.000000 C 9.0000000,26.937500 39.125000,24.062500 39.125000,25.000000 L 39.125000,22.000000 L 9.0000000,22.000000 L 9.0000000,25.000000 z "
-       id="path7914"
-       sodipodi:nodetypes="ccccc" />
-  </g>
-</svg>
diff --git a/apps/files_pdfviewer/js/pdfview.js b/apps/files_pdfviewer/js/pdfview.js
deleted file mode 100644
index 51f6e169f7..0000000000
--- a/apps/files_pdfviewer/js/pdfview.js
+++ /dev/null
@@ -1,762 +0,0 @@
-/* -*- Mode: Java; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* vim: set shiftwidth=2 tabstop=2 autoindent cindent expandtab: */
-
-/* FROM PDF.JS, ADAPTED */
-
-'use strict';
-
-var kDefaultURL = 'compressed.tracemonkey-pldi-09.pdf';
-var kDefaultScale = 1.25;
-var kDefaultScaleDelta = 1.1;
-var kCacheSize = 20;
-var kCssUnits = 96.0 / 72.0;
-var kScrollbarPadding = 40;
-var kMinScale = 0.25;
-var kMaxScale = 4.0;
-
-
-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().update();
-  };
-};
-
-var cache = new Cache(kCacheSize);
-var currentPageNumber = 1;
-
-var PDFView = {
-  active: false,
-  pages: [],
-  thumbnails: [],
-  currentScale: kDefaultScale,
-  initialBookmark: document.location.hash.substring(1),
-
-  setScale: function pdfViewSetScale(val, resetAutoSettings) {
-    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);
-    if (scale) {
-      this.setScale(scale, true);
-      return;
-    }
-
-    var currentPage = this.pages[this.page - 1];
-    var pageWidthScale = ($("#content").width() - kScrollbarPadding) /
-                          currentPage.width / kCssUnits;
-    var pageHeightScale = ($("#content").height() - kScrollbarPadding) /
-                           currentPage.height / kCssUnits;
-    if ('page-width' == value)
-      this.setScale(pageWidthScale, resetAutoSettings);
-    if ('page-height' == value)
-      this.setScale(pageHeightScale, resetAutoSettings);
-    if ('page-fit' == value) {
-      this.setScale(
-        Math.min(pageWidthScale, pageHeightScale), resetAutoSettings);
-    }
-  },
-
-  zoomIn: function pdfViewZoomIn() {
-    var newScale = Math.min(kMaxScale, this.currentScale * kDefaultScaleDelta);
-    this.setScale(newScale, true);
-  },
-
-  zoomOut: function pdfViewZoomOut() {
-    var newScale = Math.max(kMinScale, this.currentScale / kDefaultScaleDelta);
-    this.setScale(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;
-    }
-
-    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) {
-    document.title = PDFView.Ptitle;
-    this.url = url;
-    var self = this;
-    PDFJS.getPdf(
-      {
-        url: url,
-        progress: function getPdfProgress(evt) {
-          if (evt.lengthComputable)
-            self.progress(evt.loaded / evt.total);
-        },
-        error: self.error
-      },
-      function getPdfLoad(data) {
-        self.loading = true;
-        self.load(data, scale);
-        self.loading = false;
-      });
-  },
-
-  download: function pdfViewDownload() {
-    window.open(this.url + '#pdfjs.action=download', '_parent');
-  },
-
-  navigateTo: function pdfViewNavigateTo(dest) {
-    if (typeof dest === 'string')
-		if(!this.destinations || ! this.destinations[dest]){
-			return; // invalid destination
-		}
-      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.page = pageNumber;
-      var currentPage = this.pages[pageNumber - 1];
-      currentPage.scrollIntoView(dest);
-    }
-  },
-
-  getDestinationHash: function pdfViewGetDestinationHash(dest) {
-    if (typeof dest === 'string')
-      return '#' + 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 = '#page=' + pageNumber;
-        if (isName(dest[1], '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 '';
-  },
-
-  error: function pdfViewError() {
-    var loadingIndicator = document.getElementById('loading');
-    loadingIndicator.innerHTML = 'Error';
-  },
-
-  progress: function pdfViewProgress(level) {
-    var percent = Math.round(level * 100);
-    var loadingIndicator = document.getElementById('loading');
-    loadingIndicator.innerHTML = 'Loading... ' + percent + '%';
-  },
-
-  load: function pdfViewLoad(data, scale) {
-    var loadingIndicator = document.getElementById('loading');
-    loadingIndicator.setAttribute('hidden', 'true');
-
-    var container = document.getElementById('viewer');
-    while (container.hasChildNodes())
-      container.removeChild(container.lastChild);
-
-    var pdf = new PDFJS.PDFDoc(data);
-    var pagesCount = pdf.numPages;
-    document.getElementById('numPages').innerHTML = pagesCount;
-    document.getElementById('pageNumber').max = pagesCount;
-
-    var pages = this.pages = [];
-    var pagesRefMap = {};
-    var thumbnails = this.thumbnails = [];
-    for (var i = 1; i <= pagesCount; i++) {
-      var page = pdf.getPage(i);
-      pages.push(new PageView(container, page, i, page.width, page.height,
-                              page.stats, this.navigateTo.bind(this)));
-      /*thumbnails.push(new ThumbnailView(sidebar, page, i,
-                                        page.width / page.height));*/
-      var pageRef = page.ref;
-      pagesRefMap[pageRef.num + ' ' + pageRef.gen + ' R'] = i;
-    }
-
-    this.setScale(scale || kDefaultScale, true);
-
-    /*this.pagesRefMap = pagesRefMap;
-    this.destinations = pdf.catalog.destinations;
-    if (pdf.catalog.documentOutline) {
-      this.outline = new DocumentOutlineView(pdf.catalog.documentOutline);
-      var outlineSwitchButton = document.getElementById('outlineSwitch');
-      outlineSwitchButton.removeAttribute('disabled');
-      this.switchSidebarView('outline');
-    }*/
-    this.page = 1;
-
-    /*if (this.initialBookmark) {
-      this.setHash(this.initialBookmark);
-      this.initialBookmark = null;
-    }
-    else
-      this.page = 1;*/
-  },
-
-  setHash: function pdfViewSetHash(hash) {
-    if (!hash)
-      return;
-
-    if (hash.indexOf('=') >= 0) {
-      // parsing query string
-      var paramsPairs = hash.split('&');
-      var params = {};
-      for (var i = 0; i < paramsPairs.length; ++i) {
-        var paramPair = paramsPairs[i].split('=');
-        params[paramPair[0]] = paramPair[1];
-      }
-      // 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
-          var dest = [null, new Name('XYZ'), (zoomArgs[1] | 0),
-            (zoomArgs[2] | 0), (zoomArgs[0] | 0) / 100];
-          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 thumbsScrollView = document.getElementById('sidebarScrollView');
-    var outlineScrollView = document.getElementById('outlineScrollView');
-    var thumbsSwitchButton = document.getElementById('thumbsSwitch');
-    var outlineSwitchButton = document.getElementById('outlineSwitch');
-    switch (view) {
-      case 'thumbs':
-        thumbsScrollView.removeAttribute('hidden');
-        outlineScrollView.setAttribute('hidden', 'true');
-        thumbsSwitchButton.setAttribute('data-selected', true);
-        outlineSwitchButton.removeAttribute('data-selected');
-        break;
-      case 'outline':
-        thumbsScrollView.setAttribute('hidden', 'true');
-        outlineScrollView.removeAttribute('hidden');
-        thumbsSwitchButton.removeAttribute('data-selected');
-        outlineSwitchButton.setAttribute('data-selected', true);
-        break;
-    }
-  },*/
-
-  getVisiblePages: function pdfViewGetVisiblePages() {
-    var pages = this.pages;
-    var kBottomMargin = 10;
-    var visiblePages = [];
-
-    var currentHeight = kBottomMargin;
-    var windowTop = window.pageYOffset;
-    for (var i = 1; i <= pages.length; ++i) {
-      var page = pages[i - 1];
-      var pageHeight = page.height * page.scale + kBottomMargin;
-      if (currentHeight + pageHeight > windowTop)
-        break;
-
-      currentHeight += pageHeight;
-    }
-
-    var windowBottom = window.pageYOffset + window.innerHeight;
-    for (; i <= pages.length && currentHeight < windowBottom; ++i) {
-      var singlePage = pages[i - 1];
-      visiblePages.push({ id: singlePage.id, y: currentHeight,
-                          view: singlePage });
-      currentHeight += singlePage.height * singlePage.scale + kBottomMargin;
-    }
-    return visiblePages;
-  }
-};
-
-var PageView = function pageView(container, content, id, pageWidth, pageHeight,
-                                 stats, navigateTo) {
-  this.id = id;
-  this.content = content;
-
-  var view = this.content.view;
-  this.x = view.x;
-  this.y = view.y;
-  this.width = view.width;
-  this.height = view.height;
-
-  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.update = function pageViewUpdate(scale) {
-    this.scale = scale || this.scale;
-    div.style.width = (this.width * this.scale) + 'px';
-    
-    div.style.height = (this.height * this.scale) + 'px';
-
-    var container = document.getElementById('viewer');
-    container.style.left = (document.getElementById("content").offsetWidth-(this.width))/2 + 'px';
-
-    while (div.hasChildNodes())
-      div.removeChild(div.lastChild);
-    div.removeAttribute('data-loaded');
-  };
-
-  function setupLinks(content, scale) {
-    function bindLink(link, dest) {
-      link.href = PDFView.getDestinationHash(dest);
-      link.onclick = function pageViewSetupLinksOnclick() {
-        if (dest)
-          PDFView.navigateTo(dest);
-        return false;
-      };
-    }
-
-    var links = content.getLinks();
-    for (var i = 0; i < links.length; i++) {
-      var link = document.createElement('a');
-      link.style.left = (Math.floor(links[i].x - view.x) * scale) + 'px';
-      link.style.top = (Math.floor(links[i].y - view.y) * scale) + 'px';
-      link.style.width = Math.ceil(links[i].width * scale) + 'px';
-      link.style.height = Math.ceil(links[i].height * scale) + 'px';
-      link.href = links[i].url || '';
-      if (!links[i].url)
-        bindLink(link, ('dest' in links[i]) ? links[i].dest : null);
-      div.appendChild(link);
-    }
-  }
-
-  this.getPagePoint = function pageViewGetPagePoint(x, y) {
-    var scale = PDFView.currentScale;
-    return this.content.rotatePoint(x / scale, y / scale);
-  };
-
-  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 = (window.innerWidth - kScrollbarPadding) /
-            width / kCssUnits;
-          heightScale = (window.innerHeight - kScrollbarPadding) /
-            height / kCssUnits;
-          scale = Math.min(widthScale, heightScale);
-          break;
-        default:
-          return;
-      }
-
-      var boundingRect = [
-        this.content.rotatePoint(x, y),
-        this.content.rotatePoint(x + width, y + height)
-      ];
-
-      if (scale && scale !== PDFView.currentScale)
-        PDFView.setScale(scale, true);
-
-      setTimeout(function pageViewScrollIntoViewRelayout() {
-        // letting page to re-layout before scrolling
-        var scale = PDFView.currentScale;
-        var x = Math.min(boundingRect[0].x, boundingRect[1].x);
-        var y = Math.min(boundingRect[0].y, boundingRect[1].y);
-        var width = Math.abs(boundingRect[0].x - boundingRect[1].x);
-        var height = Math.abs(boundingRect[0].y - boundingRect[1].y);
-
-        // using temporary div to scroll it into view
-        var tempDiv = document.createElement('div');
-        tempDiv.style.position = 'absolute';
-        tempDiv.style.left = Math.floor(x * scale) + 'px';
-        tempDiv.style.top = Math.floor(y * scale) + 'px';
-        tempDiv.style.width = Math.ceil(width * scale) + 'px';
-        tempDiv.style.height = Math.ceil(height * scale) + 'px';
-        div.appendChild(tempDiv);
-        tempDiv.scrollIntoView(true);
-        div.removeChild(tempDiv);
-      }, 0);
-  };
-
-  this.draw = function pageviewDraw() {
-    if (div.hasChildNodes()) {
-      this.updateStats();
-      return false;
-    }
-
-    var canvas = document.createElement('canvas');
-    canvas.id = 'page' + this.id;
-    canvas.mozOpaque = true;
-    div.appendChild(canvas);
-
-    var scale = this.scale;
-    canvas.width = pageWidth * scale;
-    canvas.height = pageHeight * scale;
-
-    var ctx = canvas.getContext('2d');
-    ctx.save();
-    ctx.fillStyle = 'rgb(255, 255, 255)';
-    ctx.fillRect(0, 0, canvas.width, canvas.height);
-    ctx.restore();
-    ctx.translate(-this.x * scale, -this.y * scale);
-
-    stats.begin = Date.now();
-    this.content.startRendering(ctx, this.updateStats);
-
-    setupLinks(this.content, this.scale);
-    div.setAttribute('data-loaded', true);
-
-    return true;
-  };
-
-  this.updateStats = function pageViewUpdateStats() {
-    var t1 = stats.compile, t2 = stats.fonts, t3 = stats.render;
-    var str = 'Time to compile/fonts/render: ' +
-              (t1 - stats.begin) + '/' + (t2 - t1) + '/' + (t3 - t2) + ' ms';
-  };
-};
-
-var ThumbnailView = function thumbnailView(container, page, id, pageRatio) {
-  var anchor = document.createElement('a');
-  anchor.href = '#' + id;
-  anchor.onclick = function stopNivigation() {
-    PDFView.page = id;
-    return false;
-  };
-
-  var div = document.createElement('div');
-  div.id = 'thumbnailContainer' + id;
-  div.className = 'thumbnail';
-
-  anchor.appendChild(div);
-  container.appendChild(anchor);
-
-  this.draw = function thumbnailViewDraw() {
-    if (div.hasChildNodes())
-      return;
-
-    var canvas = document.createElement('canvas');
-    canvas.id = 'thumbnail' + id;
-    canvas.mozOpaque = true;
-
-    var maxThumbSize = 134;
-    canvas.width = pageRatio >= 1 ? maxThumbSize :
-      maxThumbSize * pageRatio;
-    canvas.height = pageRatio <= 1 ? maxThumbSize :
-      maxThumbSize / pageRatio;
-
-    div.setAttribute('data-loaded', true);
-    div.appendChild(canvas);
-
-    var ctx = canvas.getContext('2d');
-    ctx.save();
-    ctx.fillStyle = 'rgb(255, 255, 255)';
-    ctx.fillRect(0, 0, canvas.width, canvas.height);
-    ctx.restore();
-
-    var view = page.view;
-    var scaleX = (canvas.width / page.width);
-    var scaleY = (canvas.height / page.height);
-    ctx.translate(-view.x * scaleX, -view.y * scaleY);
-    div.style.width = (view.width * scaleX) + 'px';
-    div.style.height = (view.height * scaleY) + 'px';
-    div.style.lineHeight = (view.height * scaleY) + 'px';
-
-    page.startRendering(ctx, function thumbnailViewDrawStartRendering() {});
-  };
-};
-
-var DocumentOutlineView = function documentOutlineView(outline) {
-  var outlineView = document.getElementById('outlineView');
-
-  function bindItemLink(domObj, item) {
-    domObj.href = PDFView.getDestinationHash(item.dest);
-    domObj.onclick = function documentOutlineViewOnclick(e) {
-      PDFView.navigateTo(item.dest);
-      return false;
-    };
-  }
-
-  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);
-    }
-  }
-};
-
-function webViewerLoad(url) {
-  var scale = kDefaultScale;
-  PDFView.open(url, parseFloat(PDFView.parseScale(scale)));
-
-  if (!window.File || !window.FileReader || !window.FileList || !window.Blob)
-    document.getElementById('fileInput').setAttribute('hidden', 'true');
-  else
-    document.getElementById('fileInput').value = null;
-}
-
-window.addEventListener('unload', function webViewerUnload(evt) {
-  window.scrollTo(0, 0);
-}, true);
-
-function updateViewarea() {
-  var visiblePages = PDFView.getVisiblePages();
-  for (var i = 0; i < visiblePages.length; i++) {
-    var page = visiblePages[i];
-    if (PDFView.pages[page.id - 1].draw())
-      cache.push(page.view);
-  }
-
-  if (!visiblePages.length)
-    return;
-
-  updateViewarea.inProgress = true; // used in "set page"
-  var currentId = PDFView.page;
-  var firstPage = visiblePages[0];
-  PDFView.page = firstPage.id;
-  updateViewarea.inProgress = false;
-
-  var kViewerTopMargin = 52;
-  var pageNumber = firstPage.id;
-  var pdfOpenParams = '#page=' + pageNumber;
-  pdfOpenParams += '&zoom=' + Math.round(PDFView.currentScale * 100);
-  var currentPage = PDFView.pages[pageNumber - 1];
-  var topLeft = currentPage.getPagePoint(window.pageXOffset,
-    window.pageYOffset - firstPage.y - kViewerTopMargin);
-  pdfOpenParams += ',' + Math.round(topLeft.x) + ',' + Math.round(topLeft.y);
-}
-
-window.addEventListener('scroll', function webViewerScroll(evt) {
-	if(!PDFView.active){
-		return;
-	}
-  updateViewarea();
-}, true);
-
-window.addEventListener('resize', function webViewerResize(evt) {
-	if(!PDFView.active){
-		return;
-	}
-  if (document.getElementById('pageWidthOption').selected ||
-      document.getElementById('pageFitOption').selected)
-      PDFView.parseScale(document.getElementById('scaleSelect').value);
-  updateViewarea();
-});
-
-window.addEventListener('hashchange', function webViewerHashchange(evt) {
-	if(!PDFView.active){
-		return;
-	}
-  PDFView.setHash(document.location.hash.substring(1));
-});
-
-window.addEventListener('change', function webViewerChange(evt) {
-	if(!PDFView.active){
-		return;
-	}
-  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.load(uint8Array);
-  };
-
-  // Read as a binary string since "readAsArrayBuffer" is not yet
-  // implemented in Firefox.
-  var file = files[0];
-  fileReader.readAsBinaryString(file);
-
-  document.title = PDFView.Ptitle;
-
-  // URL does not reflect proper document location - hiding some icons.
-  document.getElementById('download').setAttribute('hidden', 'true');
-}, true);
-
-window.addEventListener('scalechange', function scalechange(evt) {
-	if(!PDFView.active){
-		return;
-	}
-  var customScaleOption = document.getElementById('customScaleOption');
-  customScaleOption.selected = false;
-
-  if (!evt.resetAutoSettings &&
-       (document.getElementById('pageWidthOption').selected ||
-        document.getElementById('pageFitOption').selected)) {
-      updateViewarea();
-      return;
-  }
-
-  var options = document.getElementById('scaleSelect').options;
-  var predefinedValueFound = false;
-  var value = '' + evt.scale;
-  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;
-  }
-
-  if (!predefinedValueFound) {
-    customScaleOption.textContent = Math.round(evt.scale * 10000) / 100 + '%';
-    customScaleOption.selected = true;
-  }
-
-  updateViewarea();
-}, true);
-
-window.addEventListener('pagechange', function pagechange(evt) {
-	if(!PDFView.active){
-		return;
-	}
-  var page = evt.pageNumber;
-  if (document.getElementById('pageNumber').value != page)
-    document.getElementById('pageNumber').value = page;
-  document.getElementById('previous').disabled = (page <= 1);
-  document.getElementById('next').disabled = (page >= PDFView.pages.length);
-}, true);
-
-window.addEventListener('keydown', function keydown(evt) {
-	if(!PDFView.active){
-		return;
-	}
-  var curElement = document.activeElement;
-  var controlsElement = document.getElementById('controls2');
-  while (curElement) {
-    if (curElement === controlsElement)
-      return; // ignoring if the 'controls' element is focused
-    curElement = curElement.parentNode;
-  }
-  switch (evt.keyCode) {
-    case 61: // FF/Mac '='
-    case 107: // FF '+' and '='
-    case 187: // Chrome '+'
-      PDFView.zoomIn();
-      break;
-    case 109: // FF '-'
-    case 189: // Chrome '-'
-      PDFView.zoomOut();
-      break;
-    case 48: // '0'
-      PDFView.setScale(kDefaultScale, true);
-      break;
-  }
-});
-
-
diff --git a/apps/files_pdfviewer/js/viewer.js b/apps/files_pdfviewer/js/viewer.js
deleted file mode 100644
index 4f9cc1a0d4..0000000000
--- a/apps/files_pdfviewer/js/viewer.js
+++ /dev/null
@@ -1,59 +0,0 @@
-function hidePDFviewer() {
-	showPDFviewer.shown = false;
-	$('table').show();
-	$('#controls').html(showPDFviewer.oldcode);
-	$("#viewer").remove();
-	$("#loading").remove()
-	$("#editor").show();
-	document.title = showPDFviewer.lastTitle;
-	PDFView.active=false;
-	$('iframe').remove();
-}
-
-function showPDFviewer(dir,filename){
-	if(!showPDFviewer.shown){
-		$("#editor").hide();
-		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();
-		$("#controls").empty();
-		$("#controls").html(
-			'<button id="previous" onclick="PDFView.page--;" oncontextmenu="return false;"><img src="'+im('go-up.svg')+'" align="top" height="10"/>'+t('files_odfviewer','Previous')+'</button>'+
-			'<button id="next" onclick="PDFView.page++;" oncontextmenu="return false;"><img src="'+im('go-down.svg')+'" align="top" height="10"/>'+t('files_odfviewer','Next')+'</button>'+
-			'<div class="separator"></div><input style="width:25px;" type="number" id="pageNumber" onchange="PDFView.page = this.value;" value="1" size="4" min="1" /><span>/</span><span id="numPages">--</span><div class="separator"></div>'+
-			'<button id="zoomOut" title="Zoom Out" onclick="PDFView.zoomOut();" oncontextmenu="return false;"><img src="'+im('zoom-out.svg')+'" align="top" height="10"/></button>'+
-			'<button id="zoomIn" title="Zoom In" onclick="PDFView.zoomIn();" oncontextmenu="return false;"><img src="'+im('zoom-in.svg')+ '" align="top" height="10"/></button>'+
-			'<div class="separator"></div><select id="scaleSelect" onchange="PDFView.parseScale(this.value);" oncontextmenu="return false;"><option id="customScaleOption" value="custom"></option>'+
-			'<option value="0.5">50%</option><option value="0.75">75%</option><option value="1">100%</option><option value="1.25" selected="selected">125%</option><option value="1.5">150%</option><option value="2">200%</option>'+
-			'<option id="pageWidthOption" value="page-width">'+t('files_odfviewer', 'Page Width')+'</option><option id="pageFitOption" value="page-fit">'+t('files_odfviewer', 'Page Fit')+'</option></select>'+
-			'<div class="separator"></div><button id="print" onclick="window.print();" oncontextmenu="return false;"><img src="'+im('document-print.svg')+'" align="top" height="10"/>'+t('files_odfviewer', 'Print')+'</button>'+
-			'<button id="download" title="Download" onclick="PDFView.download();" oncontextmenu="return false;">'+
-			'<img src="'+im('download.svg')+'" align="top" height="10"/>'+t('files_odfviewer', 'Download')+'</button><button id="close" title="Close viewer" onclick="hidePDFviewer();" oncontextmenu="return false;">x</button><span id="info">--</span></div>');
-		var oldcontent = $("#content").html();
-		$("#content").html(oldcontent+'<div id="loading">Loading... 0%</div><div id="viewer"></div>');
-		showPDFviewer.lastTitle = document.title;
-		PDFView.Ptitle = filename;
-		PDFView.open(url,1.00);
-		PDFView.active=true;
-		$("#pageWidthOption").attr("selected","selected");
-		showPDFviewer.shown = true;
-	}
-}
-showPDFviewer.shown=false;
-showPDFviewer.oldCode='';
-showPDFviewer.lastTitle='';
-
-$(document).ready(function(){
-	if(!$.browser.msie){//doesnt work on IE
-		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', FileActions.PERMISSION_READ, '',function(filename){
-					showPDFviewer($('#dir').val(),filename);
-				});
-				FileActions.setDefault('application/pdf','Edit');
-			}
-		}
-	}
-});
diff --git a/apps/files_pdfviewer/l10n/.gitkeep b/apps/files_pdfviewer/l10n/.gitkeep
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/apps/files_pdfviewer/l10n/de.php b/apps/files_pdfviewer/l10n/de.php
deleted file mode 100644
index d2d2312ca7..0000000000
--- a/apps/files_pdfviewer/l10n/de.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Previous" => "Zurück",
-"Next" => "Weiter"
-);
diff --git a/apps/files_sharing_log/appinfo/app.php b/apps/files_sharing_log/appinfo/app.php
deleted file mode 100644
index 23cae61fbf..0000000000
--- a/apps/files_sharing_log/appinfo/app.php
+++ /dev/null
@@ -1,22 +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.
- */
-
-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
deleted file mode 100644
index dae811f87f..0000000000
--- a/apps/files_sharing_log/appinfo/database.xml
+++ /dev/null
@@ -1,44 +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*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
deleted file mode 100644
index d5e3283df3..0000000000
--- a/apps/files_sharing_log/appinfo/info.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?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
deleted file mode 100644
index 49d59571fb..0000000000
--- a/apps/files_sharing_log/appinfo/version
+++ /dev/null
@@ -1 +0,0 @@
-0.1
diff --git a/apps/files_sharing_log/css/style.css b/apps/files_sharing_log/css/style.css
deleted file mode 100644
index 069d3a45e0..0000000000
--- a/apps/files_sharing_log/css/style.css
+++ /dev/null
@@ -1,7 +0,0 @@
-#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
deleted file mode 100644
index 8d05e3fbd0..0000000000
--- a/apps/files_sharing_log/index.php
+++ /dev/null
@@ -1,21 +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.
- */
-
-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
deleted file mode 100644
index a032d635ac..0000000000
--- a/apps/files_sharing_log/log.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?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
deleted file mode 100644
index 55bfc1d6a3..0000000000
--- a/apps/files_sharing_log/templates/index.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<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>
diff --git a/apps/files_texteditor/ajax/loadfile.php b/apps/files_texteditor/ajax/loadfile.php
deleted file mode 100644
index 5a5affa46b..0000000000
--- a/apps/files_texteditor/ajax/loadfile.php
+++ /dev/null
@@ -1,51 +0,0 @@
-<?php
-/**
- * ownCloud - files_texteditor
- *
- * @author Tom Needham
- * @copyright 2011 Tom Needham contact@tomneedham.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/>.
- *
- */
-
-// Init owncloud
- 
-
-
-// Check if we are a user
-OCP\JSON::checkLoggedIn();
-
-// Set the session key for the file we are about to edit.
-$dir = isset($_GET['dir']) ? $_GET['dir'] : '';
-$filename = isset($_GET['file']) ? $_GET['file'] : '';
-if(!empty($filename))
-{	
-	$path = $dir.'/'.$filename;
-	if(OC_Filesystem::is_writable($path))
-	{
-		$mtime = OC_Filesystem::filemtime($path);
-		$filecontents = OC_Filesystem::file_get_contents($path);
-		OCP\JSON::success(array('data' => array('filecontents' => $filecontents, 'write' => 'true', 'mtime' => $mtime)));
-	}
-	else
-	{
-		$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 {
-	OCP\JSON::error(array('data' => array( 'message' => 'Invalid file path supplied.')));	
-}
\ No newline at end of file
diff --git a/apps/files_texteditor/ajax/mtime.php b/apps/files_texteditor/ajax/mtime.php
deleted file mode 100644
index ee683722ad..0000000000
--- a/apps/files_texteditor/ajax/mtime.php
+++ /dev/null
@@ -1,49 +0,0 @@
-<?php
-/**
- * ownCloud - files_texteditor
- *
- * @author Tom Needham
- * @copyright 2011 Tom Needham contact@tomneedham.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/>.
- *
- */
-
-// Init owncloud
- 
-
-
-// Check if we are a user
-OCP\JSON::checkLoggedIn();
-
-// Get the path from GET
-$path = isset($_GEt['path']) ? $_GET['path'] : '';
-
-if($path != '')
-{
-	// Find the mtime
-	$mtime = OC_Filesystem::filemtime($path);
-	if($mtime)
-	{
-		OCP\JSON::success(array('data' => array('path' => $path, 'mtime' => $mtime)));
-	}
-	else
-	{
-		OCP\JSON::error();
-	}	
-}
-else
-{
-	OCP\JSON::error();	
-}
\ No newline at end of file
diff --git a/apps/files_texteditor/ajax/savefile.php b/apps/files_texteditor/ajax/savefile.php
deleted file mode 100644
index f3ac323e32..0000000000
--- a/apps/files_texteditor/ajax/savefile.php
+++ /dev/null
@@ -1,76 +0,0 @@
-<?php
-/**
- * ownCloud - files_texteditor
- *
- * @author Tom Needham
- * @copyright 2011 Tom Needham contact@tomneedham.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/>.
- *
- */
-
-// Init owncloud
- 
-
-
-// Check if we are a user
-OCP\JSON::checkLoggedIn();
-OCP\JSON::callCheck();
-
-// Get paramteres
-$filecontents = isset($_POST['filecontents']) ? $_POST['filecontents'] : false;
-$path = isset($_POST['path']) ? $_POST['path'] : '';
-$mtime = isset($_POST['mtime']) ? $_POST['mtime'] : '';
-
-if($path != '' && $mtime != '' && $filecontents)
-{
-	// Get file mtime
-	$filemtime = OC_Filesystem::filemtime($path);
-	if($mtime != $filemtime)
-	{
-		// Then the file has changed since opening
-		OCP\JSON::error();
-		OCP\Util::writeLog('files_texteditor',"File: ".$path." modified since opening.",OCP\Util::ERROR);	
-	}
-	else
-	{
-		// File same as when opened
-		// 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();
-			// Get new mtime
-			$newmtime = OC_Filesystem::filemtime($path);
-			OCP\JSON::success(array('data' => array('mtime' => $newmtime)));
-		}
-		else
-		{
-			// Not writeable!
-			OCP\JSON::error(array('data' => array( 'message' => 'Insufficient permissions')));	
-			OCP\Util::writeLog('files_texteditor',"User does not have permission to write to file: ".$path,OCP\Util::ERROR);
-		}
-	}
-} else if($path == ''){
-	OCP\JSON::error(array('data' => array( 'message' => 'File path not supplied')));
-	OCP\Util::writeLog('files_texteditor','No file path supplied', OCP\Util::ERROR);
-} else if($mtime == ''){
-	OCP\JSON::error(array('data' => array( 'message' => 'File mtime not supplied')));
-	OCP\Util::writeLog('files_texteditor','No file mtime supplied' ,OCP\Util::ERROR);
-} else if(!$filecontents){
-	OCP\JSON::error(array('data' => array( 'message' => 'File contents not supplied')));
-	OCP\Util::writeLog('files_texteditor','The file contents was not supplied',OCP\Util::ERROR);	
-}
diff --git a/apps/files_texteditor/appinfo/app.php b/apps/files_texteditor/appinfo/app.php
deleted file mode 100644
index 1f9773bca3..0000000000
--- a/apps/files_texteditor/appinfo/app.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?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/appinfo/info.xml b/apps/files_texteditor/appinfo/info.xml
deleted file mode 100644
index e3c6615e04..0000000000
--- a/apps/files_texteditor/appinfo/info.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0"?> 
-<info>
-	<id>files_texteditor</id>
-	<name>Text Editor</name>
-	<description>Simple plain text editor based on Ace editor.</description>
-	<licence>AGPL</licence>
-	<author>Tom Needham</author>
-	<require>4</require>
-	<shipped>true</shipped>
-	<default_enable/>
-</info>
diff --git a/apps/files_texteditor/appinfo/version b/apps/files_texteditor/appinfo/version
deleted file mode 100644
index 1d71ef9744..0000000000
--- a/apps/files_texteditor/appinfo/version
+++ /dev/null
@@ -1 +0,0 @@
-0.3
\ No newline at end of file
diff --git a/apps/files_texteditor/css/DroidSansMono/DroidSansMono-webfont.eot b/apps/files_texteditor/css/DroidSansMono/DroidSansMono-webfont.eot
deleted file mode 100644
index bc2d524aa76ff0076e9ccb518ead122edbded050..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 78034
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
AWB>pF

diff --git a/apps/files_texteditor/css/DroidSansMono/DroidSansMono-webfont.svg b/apps/files_texteditor/css/DroidSansMono/DroidSansMono-webfont.svg
deleted file mode 100644
index 4ca5fc20dc..0000000000
--- a/apps/files_texteditor/css/DroidSansMono/DroidSansMono-webfont.svg
+++ /dev/null
@@ -1,630 +0,0 @@
-<?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
deleted file mode 100644
index e125bc1f314316f8f1cb856b9ddeb6c781820f76..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 77800
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

diff --git a/apps/files_texteditor/css/DroidSansMono/DroidSansMono-webfont.woff b/apps/files_texteditor/css/DroidSansMono/DroidSansMono-webfont.woff
deleted file mode 100644
index 31d51be4a70549ed180284e9310313a8423c55ce..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 46192
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

diff --git a/apps/files_texteditor/css/DroidSansMono/Google Android License.txt b/apps/files_texteditor/css/DroidSansMono/Google Android License.txt
deleted file mode 100644
index 0a010886a1..0000000000
--- a/apps/files_texteditor/css/DroidSansMono/Google Android License.txt	
+++ /dev/null
@@ -1,18 +0,0 @@
-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
deleted file mode 100644
index e305598817..0000000000
--- a/apps/files_texteditor/css/DroidSansMono/demo.html
+++ /dev/null
@@ -1,33 +0,0 @@
-<!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
deleted file mode 100644
index 4d814b262d..0000000000
--- a/apps/files_texteditor/css/DroidSansMono/stylesheet.css
+++ /dev/null
@@ -1,15 +0,0 @@
-/* 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%/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/files_texteditor/css/style.css b/apps/files_texteditor/css/style.css
deleted file mode 100644
index 14a1c4a9bb..0000000000
--- a/apps/files_texteditor/css/style.css
+++ /dev/null
@@ -1,11 +0,0 @@
-#editor{
-	position: fixed;
-	display: block;
-	top: 6.8em;
-	left: 12.5em;
-	z-index: 20;
-}
-#editor_save{
-	margin-left: 7px;
-	float: left;
-}
diff --git a/apps/files_texteditor/js/aceeditor/LICENSE b/apps/files_texteditor/js/aceeditor/LICENSE
deleted file mode 100644
index 853e4fd5a5..0000000000
--- a/apps/files_texteditor/js/aceeditor/LICENSE
+++ /dev/null
@@ -1,476 +0,0 @@
-Licensed under the tri-license MPL/LGPL/GPL.
-
-                          MOZILLA PUBLIC LICENSE
-                                Version 1.1
-
-                              ---------------
-
-1. Definitions.
-
-     1.0.1. "Commercial Use" means distribution or otherwise making the
-     Covered Code available to a third party.
-
-     1.1. "Contributor" means each entity that creates or contributes to
-     the creation of Modifications.
-
-     1.2. "Contributor Version" means the combination of the Original
-     Code, prior Modifications used by a Contributor, and the Modifications
-     made by that particular Contributor.
-
-     1.3. "Covered Code" means the Original Code or Modifications or the
-     combination of the Original Code and Modifications, in each case
-     including portions thereof.
-
-     1.4. "Electronic Distribution Mechanism" means a mechanism generally
-     accepted in the software development community for the electronic
-     transfer of data.
-
-     1.5. "Executable" means Covered Code in any form other than Source
-     Code.
-
-     1.6. "Initial Developer" means the individual or entity identified
-     as the Initial Developer in the Source Code notice required by Exhibit
-     A.
-
-     1.7. "Larger Work" means a work which combines Covered Code or
-     portions thereof with code not governed by the terms of this License.
-
-     1.8. "License" means this document.
-
-     1.8.1. "Licensable" means having the right to grant, to the maximum
-     extent possible, whether at the time of the initial grant or
-     subsequently acquired, any and all of the rights conveyed herein.
-
-     1.9. "Modifications" means any addition to or deletion from the
-     substance or structure of either the Original Code or any previous
-     Modifications. When Covered Code is released as a series of files, a
-     Modification is:
-          A. Any addition to or deletion from the contents of a file
-          containing Original Code or previous Modifications.
-
-          B. Any new file that contains any part of the Original Code or
-          previous Modifications.
-
-     1.10. "Original Code" means Source Code of computer software code
-     which is described in the Source Code notice required by Exhibit A as
-     Original Code, and which, at the time of its release under this
-     License is not already Covered Code governed by this License.
-
-     1.10.1. "Patent Claims" means any patent claim(s), now owned or
-     hereafter acquired, including without limitation,  method, process,
-     and apparatus claims, in any patent Licensable by grantor.
-
-     1.11. "Source Code" means the preferred form of the Covered Code for
-     making modifications to it, including all modules it contains, plus
-     any associated interface definition files, scripts used to control
-     compilation and installation of an Executable, or source code
-     differential comparisons against either the Original Code or another
-     well known, available Covered Code of the Contributor's choice. The
-     Source Code can be in a compressed or archival form, provided the
-     appropriate decompression or de-archiving software is widely available
-     for no charge.
-
-     1.12. "You" (or "Your")  means an individual or a legal entity
-     exercising rights under, and complying with all of the terms of, this
-     License or a future version of this License issued under Section 6.1.
-     For legal entities, "You" includes any entity which controls, is
-     controlled by, or is under common control with You. For purposes of
-     this definition, "control" means (a) the power, direct or indirect,
-     to cause the direction or management of such entity, whether by
-     contract or otherwise, or (b) ownership of more than fifty percent
-     (50%) of the outstanding shares or beneficial ownership of such
-     entity.
-
-2. Source Code License.
-
-     2.1. The Initial Developer Grant.
-     The Initial Developer hereby grants You a world-wide, royalty-free,
-     non-exclusive license, subject to third party intellectual property
-     claims:
-          (a)  under intellectual property rights (other than patent or
-          trademark) Licensable by Initial Developer to use, reproduce,
-          modify, display, perform, sublicense and distribute the Original
-          Code (or portions thereof) with or without Modifications, and/or
-          as part of a Larger Work; and
-
-          (b) under Patents Claims infringed by the making, using or
-          selling of Original Code, to make, have made, use, practice,
-          sell, and offer for sale, and/or otherwise dispose of the
-          Original Code (or portions thereof).
-
-          (c) the licenses granted in this Section 2.1(a) and (b) are
-          effective on the date Initial Developer first distributes
-          Original Code under the terms of this License.
-
-          (d) Notwithstanding Section 2.1(b) above, no patent license is
-          granted: 1) for code that You delete from the Original Code; 2)
-          separate from the Original Code;  or 3) for infringements caused
-          by: i) the modification of the Original Code or ii) the
-          combination of the Original Code with other software or devices.
-
-     2.2. Contributor Grant.
-     Subject to third party intellectual property claims, each Contributor
-     hereby grants You a world-wide, royalty-free, non-exclusive license
-
-          (a)  under intellectual property rights (other than patent or
-          trademark) Licensable by Contributor, to use, reproduce, modify,
-          display, perform, sublicense and distribute the Modifications
-          created by such Contributor (or portions thereof) either on an
-          unmodified basis, with other Modifications, as Covered Code
-          and/or as part of a Larger Work; and
-
-          (b) under Patent Claims infringed by the making, using, or
-          selling of  Modifications made by that Contributor either alone
-          and/or in combination with its Contributor Version (or portions
-          of such combination), to make, use, sell, offer for sale, have
-          made, and/or otherwise dispose of: 1) Modifications made by that
-          Contributor (or portions thereof); and 2) the combination of
-          Modifications made by that Contributor with its Contributor
-          Version (or portions of such combination).
-
-          (c) the licenses granted in Sections 2.2(a) and 2.2(b) are
-          effective on the date Contributor first makes Commercial Use of
-          the Covered Code.
-
-          (d)    Notwithstanding Section 2.2(b) above, no patent license is
-          granted: 1) for any code that Contributor has deleted from the
-          Contributor Version; 2)  separate from the Contributor Version;
-          3)  for infringements caused by: i) third party modifications of
-          Contributor Version or ii)  the combination of Modifications made
-          by that Contributor with other software  (except as part of the
-          Contributor Version) or other devices; or 4) under Patent Claims
-          infringed by Covered Code in the absence of Modifications made by
-          that Contributor.
-
-3. Distribution Obligations.
-
-     3.1. Application of License.
-     The Modifications which You create or to which You contribute are
-     governed by the terms of this License, including without limitation
-     Section 2.2. The Source Code version of Covered Code may be
-     distributed only under the terms of this License or a future version
-     of this License released under Section 6.1, and You must include a
-     copy of this License with every copy of the Source Code You
-     distribute. You may not offer or impose any terms on any Source Code
-     version that alters or restricts the applicable version of this
-     License or the recipients' rights hereunder. However, You may include
-     an additional document offering the additional rights described in
-     Section 3.5.
-
-     3.2. Availability of Source Code.
-     Any Modification which You create or to which You contribute must be
-     made available in Source Code form under the terms of this License
-     either on the same media as an Executable version or via an accepted
-     Electronic Distribution Mechanism to anyone to whom you made an
-     Executable version available; and if made available via Electronic
-     Distribution Mechanism, must remain available for at least twelve (12)
-     months after the date it initially became available, or at least six
-     (6) months after a subsequent version of that particular Modification
-     has been made available to such recipients. You are responsible for
-     ensuring that the Source Code version remains available even if the
-     Electronic Distribution Mechanism is maintained by a third party.
-
-     3.3. Description of Modifications.
-     You must cause all Covered Code to which You contribute to contain a
-     file documenting the changes You made to create that Covered Code and
-     the date of any change. You must include a prominent statement that
-     the Modification is derived, directly or indirectly, from Original
-     Code provided by the Initial Developer and including the name of the
-     Initial Developer in (a) the Source Code, and (b) in any notice in an
-     Executable version or related documentation in which You describe the
-     origin or ownership of the Covered Code.
-
-     3.4. Intellectual Property Matters
-          (a) Third Party Claims.
-          If Contributor has knowledge that a license under a third party's
-          intellectual property rights is required to exercise the rights
-          granted by such Contributor under Sections 2.1 or 2.2,
-          Contributor must include a text file with the Source Code
-          distribution titled "LEGAL" which describes the claim and the
-          party making the claim in sufficient detail that a recipient will
-          know whom to contact. If Contributor obtains such knowledge after
-          the Modification is made available as described in Section 3.2,
-          Contributor shall promptly modify the LEGAL file in all copies
-          Contributor makes available thereafter and shall take other steps
-          (such as notifying appropriate mailing lists or newsgroups)
-          reasonably calculated to inform those who received the Covered
-          Code that new knowledge has been obtained.
-
-          (b) Contributor APIs.
-          If Contributor's Modifications include an application programming
-          interface and Contributor has knowledge of patent licenses which
-          are reasonably necessary to implement that API, Contributor must
-          also include this information in the LEGAL file.
-
-               (c)    Representations.
-          Contributor represents that, except as disclosed pursuant to
-          Section 3.4(a) above, Contributor believes that Contributor's
-          Modifications are Contributor's original creation(s) and/or
-          Contributor has sufficient rights to grant the rights conveyed by
-          this License.
-
-     3.5. Required Notices.
-     You must duplicate the notice in Exhibit A in each file of the Source
-     Code.  If it is not possible to put such notice in a particular Source
-     Code file due to its structure, then You must include such notice in a
-     location (such as a relevant directory) where a user would be likely
-     to look for such a notice.  If You created one or more Modification(s)
-     You may add your name as a Contributor to the notice described in
-     Exhibit A.  You must also duplicate this License in any documentation
-     for the Source Code where You describe recipients' rights or ownership
-     rights relating to Covered Code.  You may choose to offer, and to
-     charge a fee for, warranty, support, indemnity or liability
-     obligations to one or more recipients of Covered Code. However, You
-     may do so only on Your own behalf, and not on behalf of the Initial
-     Developer or any Contributor. You must make it absolutely clear than
-     any such warranty, support, indemnity or liability obligation is
-     offered by You alone, and You hereby agree to indemnify the Initial
-     Developer and every Contributor for any liability incurred by the
-     Initial Developer or such Contributor as a result of warranty,
-     support, indemnity or liability terms You offer.
-
-     3.6. Distribution of Executable Versions.
-     You may distribute Covered Code in Executable form only if the
-     requirements of Section 3.1-3.5 have been met for that Covered Code,
-     and if You include a notice stating that the Source Code version of
-     the Covered Code is available under the terms of this License,
-     including a description of how and where You have fulfilled the
-     obligations of Section 3.2. The notice must be conspicuously included
-     in any notice in an Executable version, related documentation or
-     collateral in which You describe recipients' rights relating to the
-     Covered Code. You may distribute the Executable version of Covered
-     Code or ownership rights under a license of Your choice, which may
-     contain terms different from this License, provided that You are in
-     compliance with the terms of this License and that the license for the
-     Executable version does not attempt to limit or alter the recipient's
-     rights in the Source Code version from the rights set forth in this
-     License. If You distribute the Executable version under a different
-     license You must make it absolutely clear that any terms which differ
-     from this License are offered by You alone, not by the Initial
-     Developer or any Contributor. You hereby agree to indemnify the
-     Initial Developer and every Contributor for any liability incurred by
-     the Initial Developer or such Contributor as a result of any such
-     terms You offer.
-
-     3.7. Larger Works.
-     You may create a Larger Work by combining Covered Code with other code
-     not governed by the terms of this License and distribute the Larger
-     Work as a single product. In such a case, You must make sure the
-     requirements of this License are fulfilled for the Covered Code.
-
-4. Inability to Comply Due to Statute or Regulation.
-
-     If it is impossible for You to comply with any of the terms of this
-     License with respect to some or all of the Covered Code due to
-     statute, judicial order, or regulation then You must: (a) comply with
-     the terms of this License to the maximum extent possible; and (b)
-     describe the limitations and the code they affect. Such description
-     must be included in the LEGAL file described in Section 3.4 and must
-     be included with all distributions of the Source Code. Except to the
-     extent prohibited by statute or regulation, such description must be
-     sufficiently detailed for a recipient of ordinary skill to be able to
-     understand it.
-
-5. Application of this License.
-
-     This License applies to code to which the Initial Developer has
-     attached the notice in Exhibit A and to related Covered Code.
-
-6. Versions of the License.
-
-     6.1. New Versions.
-     Netscape Communications Corporation ("Netscape") may publish revised
-     and/or new versions of the License from time to time. Each version
-     will be given a distinguishing version number.
-
-     6.2. Effect of New Versions.
-     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 Netscape. No one
-     other than Netscape has the right to modify the terms applicable to
-     Covered Code created under this License.
-
-     6.3. Derivative Works.
-     If You create or use a modified version of this License (which you may
-     only do in order to apply it to code which is not already Covered Code
-     governed by this License), You must (a) rename Your license so that
-     the phrases "Mozilla", "MOZILLAPL", "MOZPL", "Netscape",
-     "MPL", "NPL" or any confusingly similar phrase do not appear in your
-     license (except to note that your license differs from this License)
-     and (b) otherwise make it clear that Your version of the license
-     contains terms which differ from the Mozilla Public License and
-     Netscape Public License. (Filling in the name of the Initial
-     Developer, Original Code or Contributor in the notice described in
-     Exhibit A shall not of themselves be deemed to be modifications of
-     this License.)
-
-7. DISCLAIMER OF WARRANTY.
-
-     COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS,
-     WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING,
-     WITHOUT LIMITATION, WARRANTIES THAT THE COVERED CODE IS FREE OF
-     DEFECTS, MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING.
-     THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE COVERED CODE
-     IS WITH YOU. SHOULD ANY COVERED CODE PROVE DEFECTIVE IN ANY RESPECT,
-     YOU (NOT THE INITIAL DEVELOPER OR ANY OTHER CONTRIBUTOR) ASSUME THE
-     COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER
-     OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF
-     ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
-
-8. TERMINATION.
-
-     8.1.  This License and the rights granted hereunder will terminate
-     automatically if You fail to comply with terms herein and fail to cure
-     such breach within 30 days of becoming aware of the breach. All
-     sublicenses to the Covered Code which are properly granted shall
-     survive any termination of this License. Provisions which, by their
-     nature, must remain in effect beyond the termination of this License
-     shall survive.
-
-     8.2.  If You initiate litigation by asserting a patent infringement
-     claim (excluding declatory judgment actions) against Initial Developer
-     or a Contributor (the Initial Developer or Contributor against whom
-     You file such action is referred to as "Participant")  alleging that:
-
-     (a)  such Participant's Contributor Version directly or indirectly
-     infringes any patent, then any and all rights granted by such
-     Participant to You under Sections 2.1 and/or 2.2 of this License
-     shall, upon 60 days notice from Participant terminate prospectively,
-     unless if within 60 days after receipt of notice You either: (i)
-     agree in writing to pay Participant a mutually agreeable reasonable
-     royalty for Your past and future use of Modifications made by such
-     Participant, or (ii) withdraw Your litigation claim with respect to
-     the Contributor Version against such Participant.  If within 60 days
-     of notice, a reasonable royalty and payment arrangement are not
-     mutually agreed upon in writing by the parties or the litigation claim
-     is not withdrawn, the rights granted by Participant to You under
-     Sections 2.1 and/or 2.2 automatically terminate at the expiration of
-     the 60 day notice period specified above.
-
-     (b)  any software, hardware, or device, other than such Participant's
-     Contributor Version, directly or indirectly infringes any patent, then
-     any rights granted to You by such Participant under Sections 2.1(b)
-     and 2.2(b) are revoked effective as of the date You first made, used,
-     sold, distributed, or had made, Modifications made by that
-     Participant.
-
-     8.3.  If You assert a patent infringement claim against Participant
-     alleging that such Participant's Contributor Version directly or
-     indirectly infringes any patent where such claim is resolved (such as
-     by license or settlement) prior to the initiation of patent
-     infringement litigation, then the reasonable value of the licenses
-     granted by such Participant under Sections 2.1 or 2.2 shall be taken
-     into account in determining the amount or value of any payment or
-     license.
-
-     8.4.  In the event of termination under Sections 8.1 or 8.2 above,
-     all end user license agreements (excluding distributors and resellers)
-     which have been validly granted by You or any distributor hereunder
-     prior to termination shall survive termination.
-
-9. LIMITATION OF LIABILITY.
-
-     UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT
-     (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL
-     DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE,
-     OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR
-     ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY
-     CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL,
-     WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER
-     COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN
-     INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF
-     LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY
-     RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW
-     PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE
-     EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO
-     THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
-
-10. U.S. GOVERNMENT END USERS.
-
-     The Covered Code is a "commercial item," as that term is defined in
-     48 C.F.R. 2.101 (Oct. 1995), consisting of "commercial computer
-     software" and "commercial computer software documentation," as such
-     terms are used in 48 C.F.R. 12.212 (Sept. 1995). Consistent with 48
-     C.F.R. 12.212 and 48 C.F.R. 227.7202-1 through 227.7202-4 (June 1995),
-     all U.S. Government End Users acquire Covered Code with only those
-     rights set forth herein.
-
-11. MISCELLANEOUS.
-
-     This License represents the complete agreement concerning subject
-     matter hereof. If any provision of this License is held to be
-     unenforceable, such provision shall be reformed only to the extent
-     necessary to make it enforceable. This License shall be governed by
-     California law provisions (except to the extent applicable law, if
-     any, provides otherwise), excluding its conflict-of-law provisions.
-     With respect to disputes in which at least one party is a citizen of,
-     or an entity chartered or registered to do business in the United
-     States of America, any litigation relating to this License shall be
-     subject to the jurisdiction of the Federal Courts of the Northern
-     District of California, with venue lying in Santa Clara County,
-     California, with the losing party responsible for costs, including
-     without limitation, court costs and reasonable attorneys' fees and
-     expenses. The application of the United Nations Convention on
-     Contracts for the International Sale of Goods is expressly excluded.
-     Any law or regulation which provides that the language of a contract
-     shall be construed against the drafter shall not apply to this
-     License.
-
-12. RESPONSIBILITY FOR CLAIMS.
-
-     As between Initial Developer and the Contributors, each party is
-     responsible for claims and damages arising, directly or indirectly,
-     out of its utilization of rights under this License and You agree to
-     work with Initial Developer and Contributors to distribute such
-     responsibility on an equitable basis. Nothing herein is intended or
-     shall be deemed to constitute any admission of liability.
-
-13. MULTIPLE-LICENSED CODE.
-
-     Initial Developer may designate portions of the Covered Code as
-     "Multiple-Licensed".  "Multiple-Licensed" means that the Initial
-     Developer permits you to utilize portions of the Covered Code under
-     Your choice of the NPL or the alternative licenses, if any, specified
-     by the Initial Developer in the file described in Exhibit A.
-
-EXHIBIT A -Mozilla Public License.
-
-     ``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 Initial Developer of the Original Code is ________________________.
-     Portions created by ______________________ are Copyright (C) ______
-     _______________________. All Rights Reserved.
-
-     Contributor(s): ______________________________________.
-
-     Alternatively, the contents of this file may be used under the terms
-     of the _____ license (the  "[___] License"), in which case the
-     provisions of [______] License are applicable instead of those
-     above.  If you wish to allow use of your version of this file only
-     under the terms of the [____] License and not to allow others to use
-     your version of this file under the MPL, indicate your decision by
-     deleting  the provisions above and replace  them with the notice and
-     other provisions required by the [___] License.  If you do not delete
-     the provisions above, a recipient may use your version of this file
-     under either the MPL or the [___] License."
-
-     [NOTE: The text of this Exhibit A may differ slightly from the text of
-     the notices in the Source Code files of the Original Code. You should
-     use the text of this Exhibit A rather than the text found in the
-     Original Code Source Code for Your Modifications.]
-
-
-
-                   GNU LESSER GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/ace-compat-uncompressed.js b/apps/files_texteditor/js/aceeditor/ace-compat-uncompressed.js
deleted file mode 100644
index 50efbe1443..0000000000
--- a/apps/files_texteditor/js/aceeditor/ace-compat-uncompressed.js
+++ /dev/null
@@ -1,480 +0,0 @@
-/* vim:ts=4:sts=4:sw=4:
- * ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('pilot/index', ['require', 'exports', 'module' , 'pilot/browser_focus', 'pilot/dom', 'pilot/event', 'pilot/event_emitter', 'pilot/fixoldbrowsers', 'pilot/keys', 'pilot/lang', 'pilot/oop', 'pilot/useragent', 'pilot/canon'], function(require, exports, module) {
-    require("pilot/browser_focus");
-    require("pilot/dom");
-    require("pilot/event");
-    require("pilot/event_emitter");
-    require("pilot/fixoldbrowsers");
-    require("pilot/keys");
-    require("pilot/lang");
-    require("pilot/oop");
-    require("pilot/useragent");
-    require("pilot/canon");
-});
-/* vim:ts=4:sts=4:sw=4:
- * ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('pilot/browser_focus', ['require', 'exports', 'module' , 'ace/lib/browser_focus'], function(require, exports, module) {
-    console.warn("DEPRECATED: 'pilot/browser_focus' is deprecated. Use 'ace/lib/browser_focus' instead");
-    module.exports = require("ace/lib/browser_focus");
-});
-/* vim:ts=4:sts=4:sw=4:
- * ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('pilot/dom', ['require', 'exports', 'module' , 'ace/lib/dom'], function(require, exports, module) {
-    console.warn("DEPRECATED: 'pilot/dom' is deprecated. Use 'ace/lib/dom' instead");
-    module.exports = require("ace/lib/dom");
-});
-/* vim:ts=4:sts=4:sw=4:
- * ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('pilot/event', ['require', 'exports', 'module' , 'ace/lib/event'], function(require, exports, module) {
-    console.warn("DEPRECATED: 'pilot/event' is deprecated. Use 'ace/lib/event' instead");
-    module.exports = require("ace/lib/event");
-});
-/* vim:ts=4:sts=4:sw=4:
- * ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('pilot/event_emitter', ['require', 'exports', 'module' , 'ace/lib/event_emitter'], function(require, exports, module) {
-    console.warn("DEPRECATED: 'pilot/event_emitter' is deprecated. Use 'ace/lib/event_emitter' instead");
-    module.exports = require("ace/lib/event_emitter");
-});
-/* vim:ts=4:sts=4:sw=4:
- * ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('pilot/fixoldbrowsers', ['require', 'exports', 'module' , 'ace/lib/fixoldbrowsers'], function(require, exports, module) {
-    console.warn("DEPRECATED: 'pilot/fixoldbrowsers' is deprecated. Use 'ace/lib/fixoldbrowsers' instead");
-    module.exports = require("ace/lib/fixoldbrowsers");
-});
-/* vim:ts=4:sts=4:sw=4:
- * ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('pilot/keys', ['require', 'exports', 'module' , 'ace/lib/keys'], function(require, exports, module) {
-    console.warn("DEPRECATED: 'pilot/keys' is deprecated. Use 'ace/lib/keys' instead");
-    module.exports = require("ace/lib/keys");
-});
-/* vim:ts=4:sts=4:sw=4:
- * ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('pilot/lang', ['require', 'exports', 'module' , 'ace/lib/lang'], function(require, exports, module) {
-    console.warn("DEPRECATED: 'pilot/lang' is deprecated. Use 'ace/lib/lang' instead");
-    module.exports = require("ace/lib/lang");
-});
-/* vim:ts=4:sts=4:sw=4:
- * ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('pilot/oop', ['require', 'exports', 'module' , 'ace/lib/oop'], function(require, exports, module) {
-    console.warn("DEPRECATED: 'pilot/oop' is deprecated. Use 'ace/lib/oop' instead");
-    module.exports = require("ace/lib/oop");
-});
-/* vim:ts=4:sts=4:sw=4:
- * ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('pilot/useragent', ['require', 'exports', 'module' , 'ace/lib/useragent'], function(require, exports, module) {
-    console.warn("DEPRECATED: 'pilot/useragent' is deprecated. Use 'ace/lib/useragent' instead");
-    module.exports = require("ace/lib/useragent");
-});
-/* vim:ts=4:sts=4:sw=4:
- * ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('pilot/canon', ['require', 'exports', 'module' ], function(require, exports, module) {
-    console.warn("DEPRECATED: 'pilot/canon' is deprecated.");
-    //return require("ace/lib/dom");
-    
-    exports.addCommand = function() {
-        console.warn("DEPRECATED: 'canon.addCommand()' is deprecated. Use 'editor.commands.addCommand(command)' instead.");
-        console.trace();
-    }
-    
-    exports.removeCommand = function() {
-        console.warn("DEPRECATED: 'canon.removeCommand()' is deprecated. Use 'editor.commands.removeCommand(command)' instead.");
-        console.trace();
-    }
-});
diff --git a/apps/files_texteditor/js/aceeditor/ace-compat.js b/apps/files_texteditor/js/aceeditor/ace-compat.js
deleted file mode 100644
index 18d2ed78d0..0000000000
--- a/apps/files_texteditor/js/aceeditor/ace-compat.js
+++ /dev/null
@@ -1 +0,0 @@
-define("pilot/index",["require","exports","module","pilot/browser_focus","pilot/dom","pilot/event","pilot/event_emitter","pilot/fixoldbrowsers","pilot/keys","pilot/lang","pilot/oop","pilot/useragent","pilot/canon"],function(a,b,c){a("pilot/browser_focus"),a("pilot/dom"),a("pilot/event"),a("pilot/event_emitter"),a("pilot/fixoldbrowsers"),a("pilot/keys"),a("pilot/lang"),a("pilot/oop"),a("pilot/useragent"),a("pilot/canon")}),define("pilot/browser_focus",["require","exports","module","ace/lib/browser_focus"],function(a,b,c){console.warn("DEPRECATED: 'pilot/browser_focus' is deprecated. Use 'ace/lib/browser_focus' instead"),c.exports=a("ace/lib/browser_focus")}),define("pilot/dom",["require","exports","module","ace/lib/dom"],function(a,b,c){console.warn("DEPRECATED: 'pilot/dom' is deprecated. Use 'ace/lib/dom' instead"),c.exports=a("ace/lib/dom")}),define("pilot/event",["require","exports","module","ace/lib/event"],function(a,b,c){console.warn("DEPRECATED: 'pilot/event' is deprecated. Use 'ace/lib/event' instead"),c.exports=a("ace/lib/event")}),define("pilot/event_emitter",["require","exports","module","ace/lib/event_emitter"],function(a,b,c){console.warn("DEPRECATED: 'pilot/event_emitter' is deprecated. Use 'ace/lib/event_emitter' instead"),c.exports=a("ace/lib/event_emitter")}),define("pilot/fixoldbrowsers",["require","exports","module","ace/lib/fixoldbrowsers"],function(a,b,c){console.warn("DEPRECATED: 'pilot/fixoldbrowsers' is deprecated. Use 'ace/lib/fixoldbrowsers' instead"),c.exports=a("ace/lib/fixoldbrowsers")}),define("pilot/keys",["require","exports","module","ace/lib/keys"],function(a,b,c){console.warn("DEPRECATED: 'pilot/keys' is deprecated. Use 'ace/lib/keys' instead"),c.exports=a("ace/lib/keys")}),define("pilot/lang",["require","exports","module","ace/lib/lang"],function(a,b,c){console.warn("DEPRECATED: 'pilot/lang' is deprecated. Use 'ace/lib/lang' instead"),c.exports=a("ace/lib/lang")}),define("pilot/oop",["require","exports","module","ace/lib/oop"],function(a,b,c){console.warn("DEPRECATED: 'pilot/oop' is deprecated. Use 'ace/lib/oop' instead"),c.exports=a("ace/lib/oop")}),define("pilot/useragent",["require","exports","module","ace/lib/useragent"],function(a,b,c){console.warn("DEPRECATED: 'pilot/useragent' is deprecated. Use 'ace/lib/useragent' instead"),c.exports=a("ace/lib/useragent")}),define("pilot/canon",["require","exports","module"],function(a,b,c){console.warn("DEPRECATED: 'pilot/canon' is deprecated."),b.addCommand=function(){console.warn("DEPRECATED: 'canon.addCommand()' is deprecated. Use 'editor.commands.addCommand(command)' instead."),console.trace()},b.removeCommand=function(){console.warn("DEPRECATED: 'canon.removeCommand()' is deprecated. Use 'editor.commands.removeCommand(command)' instead."),console.trace()}})
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/ace-uncompressed.js b/apps/files_texteditor/js/aceeditor/ace-uncompressed.js
deleted file mode 100644
index 74bb44b16d..0000000000
--- a/apps/files_texteditor/js/aceeditor/ace-uncompressed.js
+++ /dev/null
@@ -1,16616 +0,0 @@
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-/**
- * Define a module along with a payload
- * @param module a name for the payload
- * @param payload a function to call with (require, exports, module) params
- */
-
-(function() {
-
-var ACE_NAMESPACE = "";
-
-var global = (function() {
-    return this;
-})();
-
-var _define = function(module, deps, payload) {
-    if (typeof module !== 'string') {
-        if (_define.original)
-            _define.original.apply(window, arguments);
-        else {
-            console.error('dropping module because define wasn\'t a string.');
-            console.trace();
-        }
-        return;
-    }
-
-    if (arguments.length == 2)
-        payload = deps;
-
-    if (!_define.modules)
-        _define.modules = {};
-
-    _define.modules[module] = payload;
-};
-
-/**
- * Get at functionality define()ed using the function above
- */
-var _require = function(parentId, module, callback) {
-    if (Object.prototype.toString.call(module) === "[object Array]") {
-        var params = [];
-        for (var i = 0, l = module.length; i < l; ++i) {
-            var dep = lookup(parentId, module[i]);
-            if (!dep && _require.original)
-                return _require.original.apply(window, arguments);
-            params.push(dep);
-        }
-        if (callback) {
-            callback.apply(null, params);
-        }
-    }
-    else if (typeof module === 'string') {
-        var payload = lookup(parentId, module);
-        if (!payload && _require.original)
-            return _require.original.apply(window, arguments);
-
-        if (callback) {
-            callback();
-        }
-
-        return payload;
-    }
-    else {
-        if (_require.original)
-            return _require.original.apply(window, arguments);
-    }
-};
-
-var normalizeModule = function(parentId, moduleName) {
-    // normalize plugin requires
-    if (moduleName.indexOf("!") !== -1) {
-        var chunks = moduleName.split("!");
-        return normalizeModule(parentId, chunks[0]) + "!" + normalizeModule(parentId, chunks[1]);
-    }
-    // normalize relative requires
-    if (moduleName.charAt(0) == ".") {
-        var base = parentId.split("/").slice(0, -1).join("/");
-        moduleName = base + "/" + moduleName;
-
-        while(moduleName.indexOf(".") !== -1 && previous != moduleName) {
-            var previous = moduleName;
-            moduleName = moduleName.replace(/\/\.\//, "/").replace(/[^\/]+\/\.\.\//, "");
-        }
-    }
-
-    return moduleName;
-};
-
-/**
- * Internal function to lookup moduleNames and resolve them by calling the
- * definition function if needed.
- */
-var lookup = function(parentId, moduleName) {
-
-    moduleName = normalizeModule(parentId, moduleName);
-
-    var module = _define.modules[moduleName];
-    if (!module) {
-        return null;
-    }
-
-    if (typeof module === 'function') {
-        var exports = {};
-        var mod = {
-            id: moduleName,
-            uri: '',
-            exports: exports,
-            packaged: true
-        };
-
-        var req = function(module, callback) {
-            return _require(moduleName, module, callback);
-        };
-
-        var returnValue = module(req, exports, mod);
-        exports = returnValue || mod.exports;
-
-        // cache the resulting module object for next time
-        _define.modules[moduleName] = exports;
-        return exports;
-    }
-
-    return module;
-};
-
-function exportAce(ns) {
-
-    if (typeof requirejs !== "undefined") {
-
-        var define = global.define;
-        global.define = function(id, deps, callback) {
-            if (typeof callback !== "function")
-                return define.apply(this, arguments);
-
-            return define(id, deps, function(require, exports, module) {
-                if (deps[2] == "module")
-                    module.packaged = true;
-                return callback.apply(this, arguments);
-            });
-        };
-        global.define.packaged = true;
-
-        return;
-    }
-
-    var require = function(module, callback) {
-        return _require("", module, callback);
-    };
-    require.packaged = true;
-
-    var root = global;
-    if (ns) {
-        if (!global[ns])
-            global[ns] = {};
-        root = global[ns];
-    }
-
-    if (root.define)
-        _define.original = root.define;
-
-    root.define = _define;
-
-    if (root.require)
-        _require.original = root.require;
-
-    root.require = require;
-}
-
-exportAce(ACE_NAMESPACE);
-
-})();/* ***** 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 Mozilla Skywriter.
- *
- * The Initial Developer of the Original Code is
- * Mozilla.
- * Portions created by the Initial Developer are Copyright (C) 2009
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Kevin Dangoor (kdangoor@mozilla.com)
- *
- * 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 ***** */
-
-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(require, exports, module) {
-"use strict";
-
-require("./lib/fixoldbrowsers");
-
-var Dom = require("./lib/dom");
-var Event = require("./lib/event");
-
-var Editor = require("./editor").Editor;
-var EditSession = require("./edit_session").EditSession;
-var UndoManager = require("./undomanager").UndoManager;
-var Renderer = require("./virtual_renderer").VirtualRenderer;
-var MultiSelect = require("./multi_select").MultiSelect;
-
-// The following require()s are for inclusion in the built ace file
-require("./worker/worker_client");
-require("./keyboard/hash_handler");
-require("./keyboard/state_handler");
-require("./placeholder");
-require("./config").init();
-
-exports.edit = function(el) {
-    if (typeof(el) == "string") {
-        el = document.getElementById(el);
-    }
-
-    var doc = new EditSession(Dom.getInnerText(el));
-    doc.setUndoManager(new UndoManager());
-    el.innerHTML = '';
-
-    var editor = new Editor(new Renderer(el, require("./theme/textmate")));
-    new MultiSelect(editor);
-    editor.setSession(doc);
-
-    var env = {};
-    env.document = doc;
-    env.editor = editor;
-    editor.resize();
-    Event.addListener(window, "resize", function() {
-        editor.resize();
-    });
-    el.env = env;
-    // Store env on editor such that it can be accessed later on from
-    // the returned object.
-    editor.env = env;
-    return editor;
-};
-
-});// vim:set ts=4 sts=4 sw=4 st:
-// -- kriskowal Kris Kowal Copyright (C) 2009-2010 MIT License
-// -- tlrobinson Tom Robinson Copyright (C) 2009-2010 MIT License (Narwhal Project)
-// -- dantman Daniel Friesen Copyright(C) 2010 XXX No License Specified
-// -- fschaefer Florian Schäfer Copyright (C) 2010 MIT License
-// -- Irakli Gozalishvili Copyright (C) 2010 MIT License
-
-/*!
-    Copyright (c) 2009, 280 North Inc. http://280north.com/
-    MIT License. http://github.com/280north/narwhal/blob/master/README.md
-*/
-
-define('ace/lib/fixoldbrowsers', ['require', 'exports', 'module' , 'ace/lib/regexp', 'ace/lib/es5-shim'], function(require, exports, module) {
-"use strict";
-
-require("./regexp");
-require("./es5-shim");
-
-});/**
- *  Based on code from:
- *
- * XRegExp 1.5.0
- * (c) 2007-2010 Steven Levithan
- * MIT License
- * <http://xregexp.com>
- * Provides an augmented, extensible, cross-browser implementation of regular expressions,
- * including support for additional syntax, flags, and methods
- */
- 
-define('ace/lib/regexp', ['require', 'exports', 'module' ], function(require, exports, module) {
-"use strict";
-
-    //---------------------------------
-    //  Private variables
-    //---------------------------------
-
-    var real = {
-            exec: RegExp.prototype.exec,
-            test: RegExp.prototype.test,
-            match: String.prototype.match,
-            replace: String.prototype.replace,
-            split: String.prototype.split
-        },
-        compliantExecNpcg = real.exec.call(/()??/, "")[1] === undefined, // check `exec` handling of nonparticipating capturing groups
-        compliantLastIndexIncrement = function () {
-            var x = /^/g;
-            real.test.call(x, "");
-            return !x.lastIndex;
-        }();
-
-    //---------------------------------
-    //  Overriden native methods
-    //---------------------------------
-
-    // Adds named capture support (with backreferences returned as `result.name`), and fixes two
-    // cross-browser issues per ES3:
-    // - Captured values for nonparticipating capturing groups should be returned as `undefined`,
-    //   rather than the empty string.
-    // - `lastIndex` should not be incremented after zero-length matches.
-    RegExp.prototype.exec = function (str) {
-        var match = real.exec.apply(this, arguments),
-            name, r2;
-        if ( typeof(str) == 'string' && match) {
-            // Fix browsers whose `exec` methods don't consistently return `undefined` for
-            // nonparticipating capturing groups
-            if (!compliantExecNpcg && match.length > 1 && indexOf(match, "") > -1) {
-                r2 = RegExp(this.source, real.replace.call(getNativeFlags(this), "g", ""));
-                // Using `str.slice(match.index)` rather than `match[0]` in case lookahead allowed
-                // matching due to characters outside the match
-                real.replace.call(str.slice(match.index), r2, function () {
-                    for (var i = 1; i < arguments.length - 2; i++) {
-                        if (arguments[i] === undefined)
-                            match[i] = undefined;
-                    }
-                });
-            }
-            // Attach named capture properties
-            if (this._xregexp && this._xregexp.captureNames) {
-                for (var i = 1; i < match.length; i++) {
-                    name = this._xregexp.captureNames[i - 1];
-                    if (name)
-                       match[name] = match[i];
-                }
-            }
-            // Fix browsers that increment `lastIndex` after zero-length matches
-            if (!compliantLastIndexIncrement && this.global && !match[0].length && (this.lastIndex > match.index))
-                this.lastIndex--;
-        }
-        return match;
-    };
-
-    // Don't override `test` if it won't change anything
-    if (!compliantLastIndexIncrement) {
-        // Fix browser bug in native method
-        RegExp.prototype.test = function (str) {
-            // Use the native `exec` to skip some processing overhead, even though the overriden
-            // `exec` would take care of the `lastIndex` fix
-            var match = real.exec.call(this, str);
-            // Fix browsers that increment `lastIndex` after zero-length matches
-            if (match && this.global && !match[0].length && (this.lastIndex > match.index))
-                this.lastIndex--;
-            return !!match;
-        };
-    }
-
-    //---------------------------------
-    //  Private helper functions
-    //---------------------------------
-
-    function getNativeFlags (regex) {
-        return (regex.global     ? "g" : "") +
-               (regex.ignoreCase ? "i" : "") +
-               (regex.multiline  ? "m" : "") +
-               (regex.extended   ? "x" : "") + // Proposed for ES4; included in AS3
-               (regex.sticky     ? "y" : "");
-    };
-
-    function indexOf (array, item, from) {
-        if (Array.prototype.indexOf) // Use the native array method if available
-            return array.indexOf(item, from);
-        for (var i = from || 0; i < array.length; i++) {
-            if (array[i] === item)
-                return i;
-        }
-        return -1;
-    };
-
-});
-// vim: ts=4 sts=4 sw=4 expandtab
-// -- kriskowal Kris Kowal Copyright (C) 2009-2011 MIT License
-// -- tlrobinson Tom Robinson Copyright (C) 2009-2010 MIT License (Narwhal Project)
-// -- dantman Daniel Friesen Copyright (C) 2010 XXX TODO License or CLA
-// -- fschaefer Florian Schäfer Copyright (C) 2010 MIT License
-// -- Gozala Irakli Gozalishvili Copyright (C) 2010 MIT License
-// -- kitcambridge Kit Cambridge Copyright (C) 2011 MIT License
-// -- kossnocorp Sasha Koss XXX TODO License or CLA
-// -- bryanforbes Bryan Forbes XXX TODO License or CLA
-// -- killdream Quildreen Motta Copyright (C) 2011 MIT Licence
-// -- michaelficarra Michael Ficarra Copyright (C) 2011 3-clause BSD License
-// -- sharkbrainguy Gerard Paapu Copyright (C) 2011 MIT License
-// -- bbqsrc Brendan Molloy (C) 2011 Creative Commons Zero (public domain)
-// -- iwyg XXX TODO License or CLA
-// -- DomenicDenicola Domenic Denicola Copyright (C) 2011 MIT License
-// -- xavierm02 Montillet Xavier XXX TODO License or CLA
-// -- Raynos Raynos XXX TODO License or CLA
-// -- samsonjs Sami Samhuri Copyright (C) 2010 MIT License
-// -- rwldrn Rick Waldron Copyright (C) 2011 MIT License
-// -- lexer Alexey Zakharov XXX TODO License or CLA
-
-/*!
-    Copyright (c) 2009, 280 North Inc. http://280north.com/
-    MIT License. http://github.com/280north/narwhal/blob/master/README.md
-*/
-
-define('ace/lib/es5-shim', ['require', 'exports', 'module' ], function(require, exports, module) {
-
-/**
- * Brings an environment as close to ECMAScript 5 compliance
- * as is possible with the facilities of erstwhile engines.
- *
- * Annotated ES5: http://es5.github.com/ (specific links below)
- * ES5 Spec: http://www.ecma-international.org/publications/files/ECMA-ST/Ecma-262.pdf
- *
- * @module
- */
-
-/*whatsupdoc*/
-
-//
-// Function
-// ========
-//
-
-// ES-5 15.3.4.5
-// http://es5.github.com/#x15.3.4.5
-
-if (!Function.prototype.bind) {
-    Function.prototype.bind = function bind(that) { // .length is 1
-        // 1. Let Target be the this value.
-        var target = this;
-        // 2. If IsCallable(Target) is false, throw a TypeError exception.
-        if (typeof target != "function")
-            throw new TypeError(); // TODO message
-        // 3. Let A be a new (possibly empty) internal list of all of the
-        //   argument values provided after thisArg (arg1, arg2 etc), in order.
-        // XXX slicedArgs will stand in for "A" if used
-        var args = slice.call(arguments, 1); // for normal call
-        // 4. Let F be a new native ECMAScript object.
-        // 11. Set the [[Prototype]] internal property of F to the standard
-        //   built-in Function prototype object as specified in 15.3.3.1.
-        // 12. Set the [[Call]] internal property of F as described in
-        //   15.3.4.5.1.
-        // 13. Set the [[Construct]] internal property of F as described in
-        //   15.3.4.5.2.
-        // 14. Set the [[HasInstance]] internal property of F as described in
-        //   15.3.4.5.3.
-        var bound = function () {
-
-            if (this instanceof bound) {
-                // 15.3.4.5.2 [[Construct]]
-                // When the [[Construct]] internal method of a function object,
-                // F that was created using the bind function is called with a
-                // list of arguments ExtraArgs, the following steps are taken:
-                // 1. Let target be the value of F's [[TargetFunction]]
-                //   internal property.
-                // 2. If target has no [[Construct]] internal method, a
-                //   TypeError exception is thrown.
-                // 3. Let boundArgs be the value of F's [[BoundArgs]] internal
-                //   property.
-                // 4. Let args be a new list containing the same values as the
-                //   list boundArgs in the same order followed by the same
-                //   values as the list ExtraArgs in the same order.
-                // 5. Return the result of calling the [[Construct]] internal 
-                //   method of target providing args as the arguments.
-
-                var F = function(){};
-                F.prototype = target.prototype;
-                var self = new F;
-
-                var result = target.apply(
-                    self,
-                    args.concat(slice.call(arguments))
-                );
-                if (result !== null && Object(result) === result)
-                    return result;
-                return self;
-
-            } else {
-                // 15.3.4.5.1 [[Call]]
-                // When the [[Call]] internal method of a function object, F,
-                // which was created using the bind function is called with a
-                // this value and a list of arguments ExtraArgs, the following
-                // steps are taken:
-                // 1. Let boundArgs be the value of F's [[BoundArgs]] internal
-                //   property.
-                // 2. Let boundThis be the value of F's [[BoundThis]] internal
-                //   property.
-                // 3. Let target be the value of F's [[TargetFunction]] internal
-                //   property.
-                // 4. Let args be a new list containing the same values as the 
-                //   list boundArgs in the same order followed by the same 
-                //   values as the list ExtraArgs in the same order.
-                // 5. Return the result of calling the [[Call]] internal method 
-                //   of target providing boundThis as the this value and 
-                //   providing args as the arguments.
-
-                // equiv: target.call(this, ...boundArgs, ...args)
-                return target.apply(
-                    that,
-                    args.concat(slice.call(arguments))
-                );
-
-            }
-
-        };
-        // XXX bound.length is never writable, so don't even try
-        //
-        // 15. If the [[Class]] internal property of Target is "Function", then
-        //     a. Let L be the length property of Target minus the length of A.
-        //     b. Set the length own property of F to either 0 or L, whichever is 
-        //       larger.
-        // 16. Else set the length own property of F to 0.
-        // 17. Set the attributes of the length own property of F to the values
-        //   specified in 15.3.5.1.
-
-        // TODO
-        // 18. Set the [[Extensible]] internal property of F to true.
-        
-        // TODO
-        // 19. Let thrower be the [[ThrowTypeError]] function Object (13.2.3).
-        // 20. Call the [[DefineOwnProperty]] internal method of F with 
-        //   arguments "caller", PropertyDescriptor {[[Get]]: thrower, [[Set]]:
-        //   thrower, [[Enumerable]]: false, [[Configurable]]: false}, and 
-        //   false.
-        // 21. Call the [[DefineOwnProperty]] internal method of F with 
-        //   arguments "arguments", PropertyDescriptor {[[Get]]: thrower, 
-        //   [[Set]]: thrower, [[Enumerable]]: false, [[Configurable]]: false},
-        //   and false.
-
-        // TODO
-        // NOTE Function objects created using Function.prototype.bind do not 
-        // have a prototype property or the [[Code]], [[FormalParameters]], and
-        // [[Scope]] internal properties.
-        // XXX can't delete prototype in pure-js.
-
-        // 22. Return F.
-        return bound;
-    };
-}
-
-// Shortcut to an often accessed properties, in order to avoid multiple
-// dereference that costs universally.
-// _Please note: Shortcuts are defined after `Function.prototype.bind` as we
-// us it in defining shortcuts.
-var call = Function.prototype.call;
-var prototypeOfArray = Array.prototype;
-var prototypeOfObject = Object.prototype;
-var slice = prototypeOfArray.slice;
-var toString = call.bind(prototypeOfObject.toString);
-var owns = call.bind(prototypeOfObject.hasOwnProperty);
-
-// If JS engine supports accessors creating shortcuts.
-var defineGetter;
-var defineSetter;
-var lookupGetter;
-var lookupSetter;
-var supportsAccessors;
-if ((supportsAccessors = owns(prototypeOfObject, "__defineGetter__"))) {
-    defineGetter = call.bind(prototypeOfObject.__defineGetter__);
-    defineSetter = call.bind(prototypeOfObject.__defineSetter__);
-    lookupGetter = call.bind(prototypeOfObject.__lookupGetter__);
-    lookupSetter = call.bind(prototypeOfObject.__lookupSetter__);
-}
-
-//
-// Array
-// =====
-//
-
-// ES5 15.4.3.2
-// http://es5.github.com/#x15.4.3.2
-// https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/isArray
-if (!Array.isArray) {
-    Array.isArray = function isArray(obj) {
-        return toString(obj) == "[object Array]";
-    };
-}
-
-// The IsCallable() check in the Array functions
-// has been replaced with a strict check on the
-// internal class of the object to trap cases where
-// the provided function was actually a regular
-// expression literal, which in V8 and
-// JavaScriptCore is a typeof "function".  Only in
-// V8 are regular expression literals permitted as
-// reduce parameters, so it is desirable in the
-// general case for the shim to match the more
-// strict and common behavior of rejecting regular
-// expressions.
-
-// ES5 15.4.4.18
-// http://es5.github.com/#x15.4.4.18
-// https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/array/forEach
-if (!Array.prototype.forEach) {
-    Array.prototype.forEach = function forEach(fun /*, thisp*/) {
-        var self = toObject(this),
-            thisp = arguments[1],
-            i = 0,
-            length = self.length >>> 0;
-
-        // If no callback function or if callback is not a callable function
-        if (toString(fun) != "[object Function]") {
-            throw new TypeError(); // TODO message
-        }
-
-        while (i < length) {
-            if (i in self) {
-                // Invoke the callback function with call, passing arguments:
-                // context, property value, property key, thisArg object context
-                fun.call(thisp, self[i], i, self);
-            }
-            i++;
-        }
-    };
-}
-
-// ES5 15.4.4.19
-// http://es5.github.com/#x15.4.4.19
-// https://developer.mozilla.org/en/Core_JavaScript_1.5_Reference/Objects/Array/map
-if (!Array.prototype.map) {
-    Array.prototype.map = function map(fun /*, thisp*/) {
-        var self = toObject(this),
-            length = self.length >>> 0,
-            result = Array(length),
-            thisp = arguments[1];
-
-        // If no callback function or if callback is not a callable function
-        if (toString(fun) != "[object Function]") {
-            throw new TypeError(); // TODO message
-        }
-
-        for (var i = 0; i < length; i++) {
-            if (i in self)
-                result[i] = fun.call(thisp, self[i], i, self);
-        }
-        return result;
-    };
-}
-
-// ES5 15.4.4.20
-// http://es5.github.com/#x15.4.4.20
-// https://developer.mozilla.org/en/Core_JavaScript_1.5_Reference/Objects/Array/filter
-if (!Array.prototype.filter) {
-    Array.prototype.filter = function filter(fun /*, thisp */) {
-        var self = toObject(this),
-            length = self.length >>> 0,
-            result = [],
-            thisp = arguments[1];
-
-        // If no callback function or if callback is not a callable function
-        if (toString(fun) != "[object Function]") {
-            throw new TypeError(); // TODO message
-        }
-
-        for (var i = 0; i < length; i++) {
-            if (i in self && fun.call(thisp, self[i], i, self))
-                result.push(self[i]);
-        }
-        return result;
-    };
-}
-
-// ES5 15.4.4.16
-// http://es5.github.com/#x15.4.4.16
-// https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/every
-if (!Array.prototype.every) {
-    Array.prototype.every = function every(fun /*, thisp */) {
-        var self = toObject(this),
-            length = self.length >>> 0,
-            thisp = arguments[1];
-
-        // If no callback function or if callback is not a callable function
-        if (toString(fun) != "[object Function]") {
-            throw new TypeError(); // TODO message
-        }
-
-        for (var i = 0; i < length; i++) {
-            if (i in self && !fun.call(thisp, self[i], i, self))
-                return false;
-        }
-        return true;
-    };
-}
-
-// ES5 15.4.4.17
-// http://es5.github.com/#x15.4.4.17
-// https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/some
-if (!Array.prototype.some) {
-    Array.prototype.some = function some(fun /*, thisp */) {
-        var self = toObject(this),
-            length = self.length >>> 0,
-            thisp = arguments[1];
-
-        // If no callback function or if callback is not a callable function
-        if (toString(fun) != "[object Function]") {
-            throw new TypeError(); // TODO message
-        }
-
-        for (var i = 0; i < length; i++) {
-            if (i in self && fun.call(thisp, self[i], i, self))
-                return true;
-        }
-        return false;
-    };
-}
-
-// ES5 15.4.4.21
-// http://es5.github.com/#x15.4.4.21
-// https://developer.mozilla.org/en/Core_JavaScript_1.5_Reference/Objects/Array/reduce
-if (!Array.prototype.reduce) {
-    Array.prototype.reduce = function reduce(fun /*, initial*/) {
-        var self = toObject(this),
-            length = self.length >>> 0;
-
-        // If no callback function or if callback is not a callable function
-        if (toString(fun) != "[object Function]") {
-            throw new TypeError(); // TODO message
-        }
-
-        // no value to return if no initial value and an empty array
-        if (!length && arguments.length == 1)
-            throw new TypeError(); // TODO message
-
-        var i = 0;
-        var result;
-        if (arguments.length >= 2) {
-            result = arguments[1];
-        } else {
-            do {
-                if (i in self) {
-                    result = self[i++];
-                    break;
-                }
-
-                // if array contains no values, no initial value to return
-                if (++i >= length)
-                    throw new TypeError(); // TODO message
-            } while (true);
-        }
-
-        for (; i < length; i++) {
-            if (i in self)
-                result = fun.call(void 0, result, self[i], i, self);
-        }
-
-        return result;
-    };
-}
-
-// ES5 15.4.4.22
-// http://es5.github.com/#x15.4.4.22
-// https://developer.mozilla.org/en/Core_JavaScript_1.5_Reference/Objects/Array/reduceRight
-if (!Array.prototype.reduceRight) {
-    Array.prototype.reduceRight = function reduceRight(fun /*, initial*/) {
-        var self = toObject(this),
-            length = self.length >>> 0;
-
-        // If no callback function or if callback is not a callable function
-        if (toString(fun) != "[object Function]") {
-            throw new TypeError(); // TODO message
-        }
-
-        // no value to return if no initial value, empty array
-        if (!length && arguments.length == 1)
-            throw new TypeError(); // TODO message
-
-        var result, i = length - 1;
-        if (arguments.length >= 2) {
-            result = arguments[1];
-        } else {
-            do {
-                if (i in self) {
-                    result = self[i--];
-                    break;
-                }
-
-                // if array contains no values, no initial value to return
-                if (--i < 0)
-                    throw new TypeError(); // TODO message
-            } while (true);
-        }
-
-        do {
-            if (i in this)
-                result = fun.call(void 0, result, self[i], i, self);
-        } while (i--);
-
-        return result;
-    };
-}
-
-// ES5 15.4.4.14
-// http://es5.github.com/#x15.4.4.14
-// https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/indexOf
-if (!Array.prototype.indexOf) {
-    Array.prototype.indexOf = function indexOf(sought /*, fromIndex */ ) {
-        var self = toObject(this),
-            length = self.length >>> 0;
-
-        if (!length)
-            return -1;
-
-        var i = 0;
-        if (arguments.length > 1)
-            i = toInteger(arguments[1]);
-
-        // handle negative indices
-        i = i >= 0 ? i : Math.max(0, length + i);
-        for (; i < length; i++) {
-            if (i in self && self[i] === sought) {
-                return i;
-            }
-        }
-        return -1;
-    };
-}
-
-// ES5 15.4.4.15
-// http://es5.github.com/#x15.4.4.15
-// https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/lastIndexOf
-if (!Array.prototype.lastIndexOf) {
-    Array.prototype.lastIndexOf = function lastIndexOf(sought /*, fromIndex */) {
-        var self = toObject(this),
-            length = self.length >>> 0;
-
-        if (!length)
-            return -1;
-        var i = length - 1;
-        if (arguments.length > 1)
-            i = Math.min(i, toInteger(arguments[1]));
-        // handle negative indices
-        i = i >= 0 ? i : length - Math.abs(i);
-        for (; i >= 0; i--) {
-            if (i in self && sought === self[i])
-                return i;
-        }
-        return -1;
-    };
-}
-
-//
-// Object
-// ======
-//
-
-// ES5 15.2.3.2
-// http://es5.github.com/#x15.2.3.2
-if (!Object.getPrototypeOf) {
-    // https://github.com/kriskowal/es5-shim/issues#issue/2
-    // http://ejohn.org/blog/objectgetprototypeof/
-    // recommended by fschaefer on github
-    Object.getPrototypeOf = function getPrototypeOf(object) {
-        return object.__proto__ || (
-            object.constructor ?
-            object.constructor.prototype :
-            prototypeOfObject
-        );
-    };
-}
-
-// ES5 15.2.3.3
-// http://es5.github.com/#x15.2.3.3
-if (!Object.getOwnPropertyDescriptor) {
-    var ERR_NON_OBJECT = "Object.getOwnPropertyDescriptor called on a " +
-                         "non-object: ";
-    Object.getOwnPropertyDescriptor = function getOwnPropertyDescriptor(object, property) {
-        if ((typeof object != "object" && typeof object != "function") || object === null)
-            throw new TypeError(ERR_NON_OBJECT + object);
-        // If object does not owns property return undefined immediately.
-        if (!owns(object, property))
-            return;
-
-        var descriptor, getter, setter;
-
-        // If object has a property then it's for sure both `enumerable` and
-        // `configurable`.
-        descriptor =  { enumerable: true, configurable: true };
-
-        // If JS engine supports accessor properties then property may be a
-        // getter or setter.
-        if (supportsAccessors) {
-            // Unfortunately `__lookupGetter__` will return a getter even
-            // if object has own non getter property along with a same named
-            // inherited getter. To avoid misbehavior we temporary remove
-            // `__proto__` so that `__lookupGetter__` will return getter only
-            // if it's owned by an object.
-            var prototype = object.__proto__;
-            object.__proto__ = prototypeOfObject;
-
-            var getter = lookupGetter(object, property);
-            var setter = lookupSetter(object, property);
-
-            // Once we have getter and setter we can put values back.
-            object.__proto__ = prototype;
-
-            if (getter || setter) {
-                if (getter) descriptor.get = getter;
-                if (setter) descriptor.set = setter;
-
-                // If it was accessor property we're done and return here
-                // in order to avoid adding `value` to the descriptor.
-                return descriptor;
-            }
-        }
-
-        // If we got this far we know that object has an own property that is
-        // not an accessor so we set it as a value and return descriptor.
-        descriptor.value = object[property];
-        return descriptor;
-    };
-}
-
-// ES5 15.2.3.4
-// http://es5.github.com/#x15.2.3.4
-if (!Object.getOwnPropertyNames) {
-    Object.getOwnPropertyNames = function getOwnPropertyNames(object) {
-        return Object.keys(object);
-    };
-}
-
-// ES5 15.2.3.5
-// http://es5.github.com/#x15.2.3.5
-if (!Object.create) {
-    Object.create = function create(prototype, properties) {
-        var object;
-        if (prototype === null) {
-            object = { "__proto__": null };
-        } else {
-            if (typeof prototype != "object")
-                throw new TypeError("typeof prototype["+(typeof prototype)+"] != 'object'");
-            var Type = function () {};
-            Type.prototype = prototype;
-            object = new Type();
-            // IE has no built-in implementation of `Object.getPrototypeOf`
-            // neither `__proto__`, but this manually setting `__proto__` will
-            // guarantee that `Object.getPrototypeOf` will work as expected with
-            // objects created using `Object.create`
-            object.__proto__ = prototype;
-        }
-        if (properties !== void 0)
-            Object.defineProperties(object, properties);
-        return object;
-    };
-}
-
-// ES5 15.2.3.6
-// http://es5.github.com/#x15.2.3.6
-
-// Patch for WebKit and IE8 standard mode
-// Designed by hax <hax.github.com>
-// related issue: https://github.com/kriskowal/es5-shim/issues#issue/5
-// IE8 Reference:
-//     http://msdn.microsoft.com/en-us/library/dd282900.aspx
-//     http://msdn.microsoft.com/en-us/library/dd229916.aspx
-// WebKit Bugs:
-//     https://bugs.webkit.org/show_bug.cgi?id=36423
-
-function doesDefinePropertyWork(object) {
-    try {
-        Object.defineProperty(object, "sentinel", {});
-        return "sentinel" in object;
-    } catch (exception) {
-        // returns falsy
-    }
-}
-
-// check whether defineProperty works if it's given. Otherwise,
-// shim partially.
-if (Object.defineProperty) {
-    var definePropertyWorksOnObject = doesDefinePropertyWork({});
-    var definePropertyWorksOnDom = typeof document == "undefined" ||
-        doesDefinePropertyWork(document.createElement("div"));
-    if (!definePropertyWorksOnObject || !definePropertyWorksOnDom) {
-        var definePropertyFallback = Object.defineProperty;
-    }
-}
-
-if (!Object.defineProperty || definePropertyFallback) {
-    var ERR_NON_OBJECT_DESCRIPTOR = "Property description must be an object: ";
-    var ERR_NON_OBJECT_TARGET = "Object.defineProperty called on non-object: "
-    var ERR_ACCESSORS_NOT_SUPPORTED = "getters & setters can not be defined " +
-                                      "on this javascript engine";
-
-    Object.defineProperty = function defineProperty(object, property, descriptor) {
-        if ((typeof object != "object" && typeof object != "function") || object === null)
-            throw new TypeError(ERR_NON_OBJECT_TARGET + object);
-        if ((typeof descriptor != "object" && typeof descriptor != "function") || descriptor === null)
-            throw new TypeError(ERR_NON_OBJECT_DESCRIPTOR + descriptor);
-
-        // make a valiant attempt to use the real defineProperty
-        // for I8's DOM elements.
-        if (definePropertyFallback) {
-            try {
-                return definePropertyFallback.call(Object, object, property, descriptor);
-            } catch (exception) {
-                // try the shim if the real one doesn't work
-            }
-        }
-
-        // If it's a data property.
-        if (owns(descriptor, "value")) {
-            // fail silently if "writable", "enumerable", or "configurable"
-            // are requested but not supported
-            /*
-            // alternate approach:
-            if ( // can't implement these features; allow false but not true
-                !(owns(descriptor, "writable") ? descriptor.writable : true) ||
-                !(owns(descriptor, "enumerable") ? descriptor.enumerable : true) ||
-                !(owns(descriptor, "configurable") ? descriptor.configurable : true)
-            )
-                throw new RangeError(
-                    "This implementation of Object.defineProperty does not " +
-                    "support configurable, enumerable, or writable."
-                );
-            */
-
-            if (supportsAccessors && (lookupGetter(object, property) ||
-                                      lookupSetter(object, property)))
-            {
-                // As accessors are supported only on engines implementing
-                // `__proto__` we can safely override `__proto__` while defining
-                // a property to make sure that we don't hit an inherited
-                // accessor.
-                var prototype = object.__proto__;
-                object.__proto__ = prototypeOfObject;
-                // Deleting a property anyway since getter / setter may be
-                // defined on object itself.
-                delete object[property];
-                object[property] = descriptor.value;
-                // Setting original `__proto__` back now.
-                object.__proto__ = prototype;
-            } else {
-                object[property] = descriptor.value;
-            }
-        } else {
-            if (!supportsAccessors)
-                throw new TypeError(ERR_ACCESSORS_NOT_SUPPORTED);
-            // If we got that far then getters and setters can be defined !!
-            if (owns(descriptor, "get"))
-                defineGetter(object, property, descriptor.get);
-            if (owns(descriptor, "set"))
-                defineSetter(object, property, descriptor.set);
-        }
-
-        return object;
-    };
-}
-
-// ES5 15.2.3.7
-// http://es5.github.com/#x15.2.3.7
-if (!Object.defineProperties) {
-    Object.defineProperties = function defineProperties(object, properties) {
-        for (var property in properties) {
-            if (owns(properties, property))
-                Object.defineProperty(object, property, properties[property]);
-        }
-        return object;
-    };
-}
-
-// ES5 15.2.3.8
-// http://es5.github.com/#x15.2.3.8
-if (!Object.seal) {
-    Object.seal = function seal(object) {
-        // this is misleading and breaks feature-detection, but
-        // allows "securable" code to "gracefully" degrade to working
-        // but insecure code.
-        return object;
-    };
-}
-
-// ES5 15.2.3.9
-// http://es5.github.com/#x15.2.3.9
-if (!Object.freeze) {
-    Object.freeze = function freeze(object) {
-        // this is misleading and breaks feature-detection, but
-        // allows "securable" code to "gracefully" degrade to working
-        // but insecure code.
-        return object;
-    };
-}
-
-// detect a Rhino bug and patch it
-try {
-    Object.freeze(function () {});
-} catch (exception) {
-    Object.freeze = (function freeze(freezeObject) {
-        return function freeze(object) {
-            if (typeof object == "function") {
-                return object;
-            } else {
-                return freezeObject(object);
-            }
-        };
-    })(Object.freeze);
-}
-
-// ES5 15.2.3.10
-// http://es5.github.com/#x15.2.3.10
-if (!Object.preventExtensions) {
-    Object.preventExtensions = function preventExtensions(object) {
-        // this is misleading and breaks feature-detection, but
-        // allows "securable" code to "gracefully" degrade to working
-        // but insecure code.
-        return object;
-    };
-}
-
-// ES5 15.2.3.11
-// http://es5.github.com/#x15.2.3.11
-if (!Object.isSealed) {
-    Object.isSealed = function isSealed(object) {
-        return false;
-    };
-}
-
-// ES5 15.2.3.12
-// http://es5.github.com/#x15.2.3.12
-if (!Object.isFrozen) {
-    Object.isFrozen = function isFrozen(object) {
-        return false;
-    };
-}
-
-// ES5 15.2.3.13
-// http://es5.github.com/#x15.2.3.13
-if (!Object.isExtensible) {
-    Object.isExtensible = function isExtensible(object) {
-        // 1. If Type(O) is not Object throw a TypeError exception.
-        if (Object(object) === object) {
-            throw new TypeError(); // TODO message
-        }
-        // 2. Return the Boolean value of the [[Extensible]] internal property of O.
-        var name = '';
-        while (owns(object, name)) {
-            name += '?';
-        }
-        object[name] = true;
-        var returnValue = owns(object, name);
-        delete object[name];
-        return returnValue;
-    };
-}
-
-// ES5 15.2.3.14
-// http://es5.github.com/#x15.2.3.14
-if (!Object.keys) {
-    // http://whattheheadsaid.com/2010/10/a-safer-object-keys-compatibility-implementation
-    var hasDontEnumBug = true,
-        dontEnums = [
-            "toString",
-            "toLocaleString",
-            "valueOf",
-            "hasOwnProperty",
-            "isPrototypeOf",
-            "propertyIsEnumerable",
-            "constructor"
-        ],
-        dontEnumsLength = dontEnums.length;
-
-    for (var key in {"toString": null})
-        hasDontEnumBug = false;
-
-    Object.keys = function keys(object) {
-
-        if ((typeof object != "object" && typeof object != "function") || object === null)
-            throw new TypeError("Object.keys called on a non-object");
-
-        var keys = [];
-        for (var name in object) {
-            if (owns(object, name)) {
-                keys.push(name);
-            }
-        }
-
-        if (hasDontEnumBug) {
-            for (var i = 0, ii = dontEnumsLength; i < ii; i++) {
-                var dontEnum = dontEnums[i];
-                if (owns(object, dontEnum)) {
-                    keys.push(dontEnum);
-                }
-            }
-        }
-
-        return keys;
-    };
-
-}
-
-//
-// Date
-// ====
-//
-
-// ES5 15.9.5.43
-// http://es5.github.com/#x15.9.5.43
-// This function returns a String value represent the instance in time 
-// represented by this Date object. The format of the String is the Date Time 
-// string format defined in 15.9.1.15. All fields are present in the String. 
-// The time zone is always UTC, denoted by the suffix Z. If the time value of 
-// this object is not a finite Number a RangeError exception is thrown.
-if (!Date.prototype.toISOString || (new Date(-62198755200000).toISOString().indexOf('-000001') === -1)) {
-    Date.prototype.toISOString = function toISOString() {
-        var result, length, value, year;
-        if (!isFinite(this))
-            throw new RangeError;
-
-        // the date time string format is specified in 15.9.1.15.
-        result = [this.getUTCMonth() + 1, this.getUTCDate(),
-            this.getUTCHours(), this.getUTCMinutes(), this.getUTCSeconds()];
-        year = this.getUTCFullYear();
-        year = (year < 0 ? '-' : (year > 9999 ? '+' : '')) + ('00000' + Math.abs(year)).slice(0 <= year && year <= 9999 ? -4 : -6);
-
-        length = result.length;
-        while (length--) {
-            value = result[length];
-            // pad months, days, hours, minutes, and seconds to have two digits.
-            if (value < 10)
-                result[length] = "0" + value;
-        }
-        // pad milliseconds to have three digits.
-        return year + "-" + result.slice(0, 2).join("-") + "T" + result.slice(2).join(":") + "." +
-            ("000" + this.getUTCMilliseconds()).slice(-3) + "Z";
-    }
-}
-
-// ES5 15.9.4.4
-// http://es5.github.com/#x15.9.4.4
-if (!Date.now) {
-    Date.now = function now() {
-        return new Date().getTime();
-    };
-}
-
-// ES5 15.9.5.44
-// http://es5.github.com/#x15.9.5.44
-// This function provides a String representation of a Date object for use by 
-// JSON.stringify (15.12.3).
-if (!Date.prototype.toJSON) {
-    Date.prototype.toJSON = function toJSON(key) {
-        // When the toJSON method is called with argument key, the following 
-        // steps are taken:
-
-        // 1.  Let O be the result of calling ToObject, giving it the this
-        // value as its argument.
-        // 2. Let tv be ToPrimitive(O, hint Number).
-        // 3. If tv is a Number and is not finite, return null.
-        // XXX
-        // 4. Let toISO be the result of calling the [[Get]] internal method of
-        // O with argument "toISOString".
-        // 5. If IsCallable(toISO) is false, throw a TypeError exception.
-        if (typeof this.toISOString != "function")
-            throw new TypeError(); // TODO message
-        // 6. Return the result of calling the [[Call]] internal method of
-        //  toISO with O as the this value and an empty argument list.
-        return this.toISOString();
-
-        // NOTE 1 The argument is ignored.
-
-        // NOTE 2 The toJSON function is intentionally generic; it does not
-        // require that its this value be a Date object. Therefore, it can be
-        // transferred to other kinds of objects for use as a method. However,
-        // it does require that any such object have a toISOString method. An
-        // object is free to use the argument key to filter its
-        // stringification.
-    };
-}
-
-// ES5 15.9.4.2
-// http://es5.github.com/#x15.9.4.2
-// based on work shared by Daniel Friesen (dantman)
-// http://gist.github.com/303249
-if (Date.parse("+275760-09-13T00:00:00.000Z") !== 8.64e15) {
-    // XXX global assignment won't work in embeddings that use
-    // an alternate object for the context.
-    Date = (function(NativeDate) {
-
-        // Date.length === 7
-        var Date = function Date(Y, M, D, h, m, s, ms) {
-            var length = arguments.length;
-            if (this instanceof NativeDate) {
-                var date = length == 1 && String(Y) === Y ? // isString(Y)
-                    // We explicitly pass it through parse:
-                    new NativeDate(Date.parse(Y)) :
-                    // We have to manually make calls depending on argument
-                    // length here
-                    length >= 7 ? new NativeDate(Y, M, D, h, m, s, ms) :
-                    length >= 6 ? new NativeDate(Y, M, D, h, m, s) :
-                    length >= 5 ? new NativeDate(Y, M, D, h, m) :
-                    length >= 4 ? new NativeDate(Y, M, D, h) :
-                    length >= 3 ? new NativeDate(Y, M, D) :
-                    length >= 2 ? new NativeDate(Y, M) :
-                    length >= 1 ? new NativeDate(Y) :
-                                  new NativeDate();
-                // Prevent mixups with unfixed Date object
-                date.constructor = Date;
-                return date;
-            }
-            return NativeDate.apply(this, arguments);
-        };
-
-        // 15.9.1.15 Date Time String Format.
-        var isoDateExpression = new RegExp("^" +
-            "(\\d{4}|[\+\-]\\d{6})" + // four-digit year capture or sign + 6-digit extended year
-            "(?:-(\\d{2})" + // optional month capture
-            "(?:-(\\d{2})" + // optional day capture
-            "(?:" + // capture hours:minutes:seconds.milliseconds
-                "T(\\d{2})" + // hours capture
-                ":(\\d{2})" + // minutes capture
-                "(?:" + // optional :seconds.milliseconds
-                    ":(\\d{2})" + // seconds capture
-                    "(?:\\.(\\d{3}))?" + // milliseconds capture
-                ")?" +
-            "(?:" + // capture UTC offset component
-                "Z|" + // UTC capture
-                "(?:" + // offset specifier +/-hours:minutes
-                    "([-+])" + // sign capture
-                    "(\\d{2})" + // hours offset capture
-                    ":(\\d{2})" + // minutes offset capture
-                ")" +
-            ")?)?)?)?" +
-        "$");
-
-        // Copy any custom methods a 3rd party library may have added
-        for (var key in NativeDate)
-            Date[key] = NativeDate[key];
-
-        // Copy "native" methods explicitly; they may be non-enumerable
-        Date.now = NativeDate.now;
-        Date.UTC = NativeDate.UTC;
-        Date.prototype = NativeDate.prototype;
-        Date.prototype.constructor = Date;
-
-        // Upgrade Date.parse to handle simplified ISO 8601 strings
-        Date.parse = function parse(string) {
-            var match = isoDateExpression.exec(string);
-            if (match) {
-                match.shift(); // kill match[0], the full match
-                // parse months, days, hours, minutes, seconds, and milliseconds
-                for (var i = 1; i < 7; i++) {
-                    // provide default values if necessary
-                    match[i] = +(match[i] || (i < 3 ? 1 : 0));
-                    // match[1] is the month. Months are 0-11 in JavaScript
-                    // `Date` objects, but 1-12 in ISO notation, so we
-                    // decrement.
-                    if (i == 1)
-                        match[i]--;
-                }
-
-                // parse the UTC offset component
-                var minuteOffset = +match.pop(), hourOffset = +match.pop(), sign = match.pop();
-
-                // compute the explicit time zone offset if specified
-                var offset = 0;
-                if (sign) {
-                    // detect invalid offsets and return early
-                    if (hourOffset > 23 || minuteOffset > 59)
-                        return NaN;
-
-                    // express the provided time zone offset in minutes. The offset is
-                    // negative for time zones west of UTC; positive otherwise.
-                    offset = (hourOffset * 60 + minuteOffset) * 6e4 * (sign == "+" ? -1 : 1);
-                }
-
-                // Date.UTC for years between 0 and 99 converts year to 1900 + year
-                // The Gregorian calendar has a 400-year cycle, so 
-                // to Date.UTC(year + 400, .... ) - 12622780800000 == Date.UTC(year, ...),
-                // where 12622780800000 - number of milliseconds in Gregorian calendar 400 years
-                var year = +match[0];
-                if (0 <= year && year <= 99) {
-                    match[0] = year + 400;
-                    return NativeDate.UTC.apply(this, match) + offset - 12622780800000;
-                }
-
-                // compute a new UTC date value, accounting for the optional offset
-                return NativeDate.UTC.apply(this, match) + offset;
-            }
-            return NativeDate.parse.apply(this, arguments);
-        };
-
-        return Date;
-    })(Date);
-}
-
-//
-// String
-// ======
-//
-
-// ES5 15.5.4.20
-// http://es5.github.com/#x15.5.4.20
-var ws = "\x09\x0A\x0B\x0C\x0D\x20\xA0\u1680\u180E\u2000\u2001\u2002\u2003" +
-    "\u2004\u2005\u2006\u2007\u2008\u2009\u200A\u202F\u205F\u3000\u2028" +
-    "\u2029\uFEFF";
-if (!String.prototype.trim || ws.trim()) {
-    // http://blog.stevenlevithan.com/archives/faster-trim-javascript
-    // http://perfectionkills.com/whitespace-deviations/
-    ws = "[" + ws + "]";
-    var trimBeginRegexp = new RegExp("^" + ws + ws + "*"),
-        trimEndRegexp = new RegExp(ws + ws + "*$");
-    String.prototype.trim = function trim() {
-        return String(this).replace(trimBeginRegexp, "").replace(trimEndRegexp, "");
-    };
-}
-
-//
-// Util
-// ======
-//
-
-// ES5 9.4
-// http://es5.github.com/#x9.4
-// http://jsperf.com/to-integer
-var toInteger = function (n) {
-    n = +n;
-    if (n !== n) // isNaN
-        n = 0;
-    else if (n !== 0 && n !== (1/0) && n !== -(1/0))
-        n = (n > 0 || -1) * Math.floor(Math.abs(n));
-    return n;
-};
-
-var prepareString = "a"[0] != "a",
-    // ES5 9.9
-    // http://es5.github.com/#x9.9
-    toObject = function (o) {
-        if (o == null) { // this matches both null and undefined
-            throw new TypeError(); // TODO message
-        }
-        // If the implementation doesn't support by-index access of
-        // string characters (ex. IE < 7), split the string
-        if (prepareString && typeof o == "string" && o) {
-            return o.split("");
-        }
-        return Object(o);
-    };
-});/* vim:ts=4:sts=4:sw=4:
- * ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *      Mihai Sucan <mihai AT sucan AT gmail ODT com>
- *      Irakli Gozalishvili <rfobic@gmail.com> (http://jeditoolkit.com)
- *
- * 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 ***** */
-
-define('ace/lib/dom', ['require', 'exports', 'module' ], function(require, exports, module) {
-"use strict";
-
-var XHTML_NS = "http://www.w3.org/1999/xhtml";
-
-exports.createElement = function(tag, ns) {
-    return document.createElementNS ?
-           document.createElementNS(ns || XHTML_NS, tag) :
-           document.createElement(tag);
-};
-
-exports.setText = function(elem, text) {
-    if (elem.innerText !== undefined) {
-        elem.innerText = text;
-    }
-    if (elem.textContent !== undefined) {
-        elem.textContent = text;
-    }
-};
-
-exports.hasCssClass = function(el, name) {
-    var classes = el.className.split(/\s+/g);
-    return classes.indexOf(name) !== -1;
-};
-
-/**
-* Add a CSS class to the list of classes on the given node
-*/
-exports.addCssClass = function(el, name) {
-    if (!exports.hasCssClass(el, name)) {
-        el.className += " " + name;
-    }
-};
-
-/**
-* Remove a CSS class from the list of classes on the given node
-*/
-exports.removeCssClass = function(el, name) {
-    var classes = el.className.split(/\s+/g);
-    while (true) {
-        var index = classes.indexOf(name);
-        if (index == -1) {
-            break;
-        }
-        classes.splice(index, 1);
-    }
-    el.className = classes.join(" ");
-};
-
-exports.toggleCssClass = function(el, name) {
-    var classes = el.className.split(/\s+/g), add = true;
-    while (true) {
-        var index = classes.indexOf(name);
-        if (index == -1) {
-            break;
-        }
-        add = false;
-        classes.splice(index, 1);
-    }
-    if(add)
-        classes.push(name);
-
-    el.className = classes.join(" ");
-    return add;
-};
-
-/**
- * Add or remove a CSS class from the list of classes on the given node
- * depending on the value of <tt>include</tt>
- */
-exports.setCssClass = function(node, className, include) {
-    if (include) {
-        exports.addCssClass(node, className);
-    } else {
-        exports.removeCssClass(node, className);
-    }
-};
-
-exports.hasCssString = function(id, doc) {
-    var index = 0, sheets;
-    doc = doc || document;
-
-    if (doc.createStyleSheet && (sheets = doc.styleSheets)) {
-        while (index < sheets.length)
-            if (sheets[index++].owningElement.id === id) return true;
-    } else if ((sheets = doc.getElementsByTagName("style"))) {
-        while (index < sheets.length)
-            if (sheets[index++].id === id) return true;
-    }
-
-    return false;
-};
-
-exports.importCssString = function importCssString(cssText, id, doc) {
-    doc = doc || document;
-    // If style is already imported return immediately.
-    if (id && exports.hasCssString(id, doc))
-        return null;
-    
-    var style;
-    
-    if (doc.createStyleSheet) {
-        style = doc.createStyleSheet();
-        style.cssText = cssText;
-        if (id)
-            style.owningElement.id = id;
-    } else {
-        style = doc.createElementNS
-            ? doc.createElementNS(XHTML_NS, "style")
-            : doc.createElement("style");
-
-        style.appendChild(doc.createTextNode(cssText));
-        if (id)
-            style.id = id;
-
-        var head = doc.getElementsByTagName("head")[0] || doc.documentElement;
-        head.appendChild(style);
-    }
-};
-
-exports.importCssStylsheet = function(uri, doc) {
-    if (doc.createStyleSheet) {
-        doc.createStyleSheet(uri);
-    } else {
-        var link = exports.createElement('link');
-        link.rel = 'stylesheet';
-        link.href = uri;
-
-        var head = doc.getElementsByTagName("head")[0] || doc.documentElement;
-        head.appendChild(link);
-    }
-};
-
-exports.getInnerWidth = function(element) {
-    return (
-        parseInt(exports.computedStyle(element, "paddingLeft"), 10) +
-        parseInt(exports.computedStyle(element, "paddingRight"), 10) + 
-        element.clientWidth
-    );
-};
-
-exports.getInnerHeight = function(element) {
-    return (
-        parseInt(exports.computedStyle(element, "paddingTop"), 10) +
-        parseInt(exports.computedStyle(element, "paddingBottom"), 10) +
-        element.clientHeight
-    );
-};
-
-if (window.pageYOffset !== undefined) {
-    exports.getPageScrollTop = function() {
-        return window.pageYOffset;
-    };
-
-    exports.getPageScrollLeft = function() {
-        return window.pageXOffset;
-    };
-}
-else {
-    exports.getPageScrollTop = function() {
-        return document.body.scrollTop;
-    };
-
-    exports.getPageScrollLeft = function() {
-        return document.body.scrollLeft;
-    };
-}
-
-if (window.getComputedStyle)
-    exports.computedStyle = function(element, style) {
-        if (style)
-            return (window.getComputedStyle(element, "") || {})[style] || "";
-        return window.getComputedStyle(element, "") || {};
-    };
-else
-    exports.computedStyle = function(element, style) {
-        if (style)
-            return element.currentStyle[style];
-        return element.currentStyle;
-    };
-
-exports.scrollbarWidth = function(document) {
-
-    var inner = exports.createElement("p");
-    inner.style.width = "100%";
-    inner.style.minWidth = "0px";
-    inner.style.height = "200px";
-
-    var outer = exports.createElement("div");
-    var style = outer.style;
-
-    style.position = "absolute";
-    style.left = "-10000px";
-    style.overflow = "hidden";
-    style.width = "200px";
-    style.minWidth = "0px";
-    style.height = "150px";
-
-    outer.appendChild(inner);
-
-    var body = document.body || document.documentElement;
-    body.appendChild(outer);
-
-    var noScrollbar = inner.offsetWidth;
-
-    style.overflow = "scroll";
-    var withScrollbar = inner.offsetWidth;
-
-    if (noScrollbar == withScrollbar) {
-        withScrollbar = outer.clientWidth;
-    }
-
-    body.removeChild(outer);
-
-    return noScrollbar-withScrollbar;
-};
-
-/**
- * Optimized set innerHTML. This is faster than plain innerHTML if the element
- * already contains a lot of child elements.
- *
- * See http://blog.stevenlevithan.com/archives/faster-than-innerhtml for details
- */
-exports.setInnerHtml = function(el, innerHtml) {
-    var element = el.cloneNode(false);//document.createElement("div");
-    element.innerHTML = innerHtml;
-    el.parentNode.replaceChild(element, el);
-    return element;
-};
-
-exports.setInnerText = function(el, innerText) {
-    var document = el.ownerDocument;
-    if (document.body && "textContent" in document.body)
-        el.textContent = innerText;
-    else
-        el.innerText = innerText;
-
-};
-
-exports.getInnerText = function(el) {
-    var document = el.ownerDocument;
-    if (document.body && "textContent" in document.body)
-        return el.textContent;
-    else
-         return el.innerText || el.textContent || "";
-};
-
-exports.getParentWindow = function(document) {
-    return document.defaultView || document.parentWindow;
-};
-
-});/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/lib/event', ['require', 'exports', 'module' , 'ace/lib/keys', 'ace/lib/useragent', 'ace/lib/dom'], function(require, exports, module) {
-"use strict";
-
-var keys = require("./keys");
-var useragent = require("./useragent");
-var dom = require("./dom");
-
-exports.addListener = function(elem, type, callback) {
-    if (elem.addEventListener) {
-        return elem.addEventListener(type, callback, false);
-    }
-    if (elem.attachEvent) {
-        var wrapper = function() {
-            callback(window.event);
-        };
-        callback._wrapper = wrapper;
-        elem.attachEvent("on" + type, wrapper);
-    }
-};
-
-exports.removeListener = function(elem, type, callback) {
-    if (elem.removeEventListener) {
-        return elem.removeEventListener(type, callback, false);
-    }
-    if (elem.detachEvent) {
-        elem.detachEvent("on" + type, callback._wrapper || callback);
-    }
-};
-
-/**
-* Prevents propagation and clobbers the default action of the passed event
-*/
-exports.stopEvent = function(e) {
-    exports.stopPropagation(e);
-    exports.preventDefault(e);
-    return false;
-};
-
-exports.stopPropagation = function(e) {
-    if (e.stopPropagation)
-        e.stopPropagation();
-    else
-        e.cancelBubble = true;
-};
-
-exports.preventDefault = function(e) {
-    if (e.preventDefault)
-        e.preventDefault();
-    else
-        e.returnValue = false;
-};
-
-exports.getDocumentX = function(e) {
-    if (e.clientX) {
-        return e.clientX + dom.getPageScrollLeft();
-    } else {
-        return e.pageX;
-    }
-};
-
-exports.getDocumentY = function(e) {
-    if (e.clientY) {
-        return e.clientY + dom.getPageScrollTop();
-    } else {
-        return e.pageY;
-    }
-};
-
-/**
- * @return {Number} 0 for left button, 1 for middle button, 2 for right button
- */
-exports.getButton = function(e) {
-    if (e.type == "dblclick")
-        return 0;
-    else if (e.type == "contextmenu")
-        return 2;
-
-    // DOM Event
-    if (e.preventDefault) {
-        return e.button;
-    }
-    // old IE
-    else {
-        return {1:0, 2:2, 4:1}[e.button];
-    }
-};
-
-if (document.documentElement.setCapture) {
-    exports.capture = function(el, eventHandler, releaseCaptureHandler) {
-        function onMouseMove(e) {
-            eventHandler(e);
-            return exports.stopPropagation(e);
-        }
-
-        var called = false;
-        function onReleaseCapture(e) {
-            eventHandler(e);
-
-            if (!called) {
-                called = true;
-                releaseCaptureHandler(e);
-            }
-
-            exports.removeListener(el, "mousemove", eventHandler);
-            exports.removeListener(el, "mouseup", onReleaseCapture);
-            exports.removeListener(el, "losecapture", onReleaseCapture);
-
-            el.releaseCapture();
-        }
-
-        exports.addListener(el, "mousemove", eventHandler);
-        exports.addListener(el, "mouseup", onReleaseCapture);
-        exports.addListener(el, "losecapture", onReleaseCapture);
-        el.setCapture();
-    };
-}
-else {
-    exports.capture = function(el, eventHandler, releaseCaptureHandler) {
-        function onMouseMove(e) {
-            eventHandler(e);
-            e.stopPropagation();
-        }
-
-        function onMouseUp(e) {
-            eventHandler && eventHandler(e);
-            releaseCaptureHandler && releaseCaptureHandler(e);
-
-            document.removeEventListener("mousemove", onMouseMove, true);
-            document.removeEventListener("mouseup", onMouseUp, true);
-
-            e.stopPropagation();
-        }
-
-        document.addEventListener("mousemove", onMouseMove, true);
-        document.addEventListener("mouseup", onMouseUp, true);
-    };
-}
-
-exports.addMouseWheelListener = function(el, callback) {
-    var factor = 8;
-    var listener = function(e) {
-        if (e.wheelDelta !== undefined) {
-            if (e.wheelDeltaX !== undefined) {
-                e.wheelX = -e.wheelDeltaX / factor;
-                e.wheelY = -e.wheelDeltaY / factor;
-            } else {
-                e.wheelX = 0;
-                e.wheelY = -e.wheelDelta / factor;
-            }
-        }
-        else {
-            if (e.axis && e.axis == e.HORIZONTAL_AXIS) {
-                e.wheelX = (e.detail || 0) * 5;
-                e.wheelY = 0;
-            } else {
-                e.wheelX = 0;
-                e.wheelY = (e.detail || 0) * 5;
-            }
-        }
-        callback(e);
-    };
-    exports.addListener(el, "DOMMouseScroll", listener);
-    exports.addListener(el, "mousewheel", listener);
-};
-
-exports.addMultiMouseDownListener = function(el, button, count, timeout, callback) {
-    var clicks = 0;
-    var startX, startY;
-
-    var listener = function(e) {
-        clicks += 1;
-        if (clicks == 1) {
-            startX = e.clientX;
-            startY = e.clientY;
-
-            setTimeout(function() {
-                clicks = 0;
-            }, timeout || 600);
-        }
-
-        var isButton = exports.getButton(e) == button;
-        if (!isButton || Math.abs(e.clientX - startX) > 5 || Math.abs(e.clientY - startY) > 5)
-            clicks = 0;
-
-        if (clicks == count) {
-            clicks = 0;
-            callback(e);
-        }
-
-        if (isButton)
-            return exports.preventDefault(e);
-    };
-
-    exports.addListener(el, "mousedown", listener);
-    useragent.isOldIE && exports.addListener(el, "dblclick", listener);
-};
-
-function normalizeCommandKeys(callback, e, keyCode) {
-    var hashId = 0;
-    if (useragent.isOpera && useragent.isMac) {
-        hashId = 0 | (e.metaKey ? 1 : 0) | (e.altKey ? 2 : 0)
-            | (e.shiftKey ? 4 : 0) | (e.ctrlKey ? 8 : 0);
-    } else {
-        hashId = 0 | (e.ctrlKey ? 1 : 0) | (e.altKey ? 2 : 0)
-            | (e.shiftKey ? 4 : 0) | (e.metaKey ? 8 : 0);
-    }
-
-    if (keyCode in keys.MODIFIER_KEYS) {
-        switch (keys.MODIFIER_KEYS[keyCode]) {
-            case "Alt":
-                hashId = 2;
-                break;
-            case "Shift":
-                hashId = 4;
-                break;
-            case "Ctrl":
-                hashId = 1;
-                break;
-            default:
-                hashId = 8;
-                break;
-        }
-        keyCode = 0;
-    }
-
-    if (hashId & 8 && (keyCode == 91 || keyCode == 93)) {
-        keyCode = 0;
-    }
-
-    // If there is no hashID and the keyCode is not a function key, then
-    // we don't call the callback as we don't handle a command key here
-    // (it's a normal key/character input).
-    if (!hashId && !(keyCode in keys.FUNCTION_KEYS) && !(keyCode in keys.PRINTABLE_KEYS)) {
-        return false;
-    }
-    return callback(e, hashId, keyCode);
-}
-
-exports.addCommandKeyListener = function(el, callback) {
-    var addListener = exports.addListener;
-    if (useragent.isOldGecko || useragent.isOpera) {
-        // Old versions of Gecko aka. Firefox < 4.0 didn't repeat the keydown
-        // event if the user pressed the key for a longer time. Instead, the
-        // keydown event was fired once and later on only the keypress event.
-        // To emulate the 'right' keydown behavior, the keyCode of the initial
-        // keyDown event is stored and in the following keypress events the
-        // stores keyCode is used to emulate a keyDown event.
-        var lastKeyDownKeyCode = null;
-        addListener(el, "keydown", function(e) {
-            lastKeyDownKeyCode = e.keyCode;
-        });
-        addListener(el, "keypress", function(e) {
-            return normalizeCommandKeys(callback, e, lastKeyDownKeyCode);
-        });
-    } else {
-        var lastDown = null;
-
-        addListener(el, "keydown", function(e) {
-            lastDown = e.keyIdentifier || e.keyCode;
-            return normalizeCommandKeys(callback, e, e.keyCode);
-        });
-    }
-};
-
-if (window.postMessage) {
-    var postMessageId = 1;
-    exports.nextTick = function(callback, win) {
-        win = win || window;
-        var messageName = "zero-timeout-message-" + postMessageId;            
-        exports.addListener(win, "message", function listener(e) {
-            if (e.data == messageName) {
-                exports.stopPropagation(e);
-                exports.removeListener(win, "message", listener);
-                callback();
-            }
-        });
-        win.postMessage(messageName, "*");
-    };
-}
-else {
-    exports.nextTick = function(callback, win) {
-        win = win || window;
-        window.setTimeout(callback, 0);
-    };
-}
-
-});
-/*! @license
-==========================================================================
-SproutCore -- JavaScript Application Framework
-copyright 2006-2009, Sprout Systems Inc., Apple Inc. and contributors.
-
-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.
-
-SproutCore and the SproutCore logo are trademarks of Sprout Systems, Inc.
-
-For more information about SproutCore, visit http://www.sproutcore.com
-
-
-==========================================================================
-@license */
-
-// Most of the following code is taken from SproutCore with a few changes.
-
-define('ace/lib/keys', ['require', 'exports', 'module' , 'ace/lib/oop'], function(require, exports, module) {
-"use strict";
-
-var oop = require("./oop");
-
-/**
- * Helper functions and hashes for key handling.
- */
-var Keys = (function() {
-    var ret = {
-        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: '\"'
-        }
-    };
-
-    // A reverse map of FUNCTION_KEYS
-    for (var i in ret.FUNCTION_KEYS) {
-        var name = ret.FUNCTION_KEYS[i].toUpperCase();
-        ret[name] = parseInt(i, 10);
-    }
-
-    // Add the MODIFIER_KEYS, FUNCTION_KEYS and PRINTABLE_KEYS to the KEY
-    // variables as well.
-    oop.mixin(ret, ret.MODIFIER_KEYS);
-    oop.mixin(ret, ret.PRINTABLE_KEYS);
-    oop.mixin(ret, ret.FUNCTION_KEYS);
-
-    return ret;
-})();
-oop.mixin(exports, Keys);
-
-exports.keyCodeToString = function(keyCode) {
-    return (Keys[keyCode] || String.fromCharCode(keyCode)).toLowerCase();
-}
-
-});/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/lib/oop', ['require', 'exports', 'module' ], function(require, exports, module) {
-"use strict";
-
-exports.inherits = (function() {
-    var tempCtor = function() {};
-    return function(ctor, superCtor) {
-        tempCtor.prototype = superCtor.prototype;
-        ctor.super_ = superCtor.prototype;
-        ctor.prototype = new tempCtor();
-        ctor.prototype.constructor = ctor;
-    };
-}());
-
-exports.mixin = function(obj, mixin) {
-    for (var key in mixin) {
-        obj[key] = mixin[key];
-    }
-};
-
-exports.implement = function(proto, mixin) {
-    exports.mixin(proto, mixin);
-};
-
-});
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/lib/useragent', ['require', 'exports', 'module' ], function(require, exports, module) {
-"use strict";
-
-var os = (navigator.platform.match(/mac|win|linux/i) || ["other"])[0].toLowerCase();
-var ua = navigator.userAgent;
-
-/** Is the user using a browser that identifies itself as Windows */
-exports.isWin = (os == "win");
-
-/** Is the user using a browser that identifies itself as Mac OS */
-exports.isMac = (os == "mac");
-
-/** Is the user using a browser that identifies itself as Linux */
-exports.isLinux = (os == "linux");
-
-exports.isIE = 
-    navigator.appName == "Microsoft Internet Explorer"
-    && parseFloat(navigator.userAgent.match(/MSIE ([0-9]+[\.0-9]+)/)[1]);
-    
-exports.isOldIE = exports.isIE && exports.isIE < 9;
-
-/** Is this Firefox or related? */
-exports.isGecko = exports.isMozilla = window.controllers && window.navigator.product === "Gecko";
-
-/** oldGecko == rev < 2.0 **/
-exports.isOldGecko = exports.isGecko && parseInt((navigator.userAgent.match(/rv\:(\d+)/)||[])[1], 10) < 4;
-
-/** Is this Opera */
-exports.isOpera = window.opera && Object.prototype.toString.call(window.opera) == "[object Opera]";
-
-/** Is the user using a browser that identifies itself as WebKit */
-exports.isWebKit = parseFloat(ua.split("WebKit/")[1]) || undefined;
-
-exports.isChrome = parseFloat(ua.split(" Chrome/")[1]) || undefined;
-
-exports.isAIR = ua.indexOf("AdobeAIR") >= 0;
-
-exports.isIPad = ua.indexOf("iPad") >= 0;
-
-exports.isTouchPad = ua.indexOf("TouchPad") >= 0;
-
-/**
- * I hate doing this, but we need some way to determine if the user is on a Mac
- * The reason is that users have different expectations of their key combinations.
- *
- * Take copy as an example, Mac people expect to use CMD or APPLE + C
- * Windows folks expect to use CTRL + C
- */
-exports.OS = {
-    LINUX: "LINUX",
-    MAC: "MAC",
-    WINDOWS: "WINDOWS"
-};
-
-/**
- * Return an exports.OS constant
- */
-exports.getOS = function() {
-    if (exports.isMac) {
-        return exports.OS.MAC;
-    } else if (exports.isLinux) {
-        return exports.OS.LINUX;
-    } else {
-        return exports.OS.WINDOWS;
-    }
-};
-
-});
-/* vim:ts=4:sts=4:sw=4:
- * ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *      Irakli Gozalishvili <rfobic@gmail.com> (http://jeditoolkit.com)
- *      Julian Viereck <julian.viereck@gmail.com>
- *
- * 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 ***** */
-
-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(require, exports, module) {
-"use strict";
-
-require("./lib/fixoldbrowsers");
-
-var oop = require("./lib/oop");
-var lang = require("./lib/lang");
-var useragent = require("./lib/useragent");
-var TextInput = require("./keyboard/textinput").TextInput;
-var MouseHandler = require("./mouse/mouse_handler").MouseHandler;
-var FoldHandler = require("./mouse/fold_handler").FoldHandler;
-//var TouchHandler = require("./touch_handler").TouchHandler;
-var KeyBinding = require("./keyboard/keybinding").KeyBinding;
-var EditSession = require("./edit_session").EditSession;
-var Search = require("./search").Search;
-var Range = require("./range").Range;
-var EventEmitter = require("./lib/event_emitter").EventEmitter;
-var CommandManager = require("./commands/command_manager").CommandManager;
-var defaultCommands = require("./commands/default_commands").commands;
-
-var Editor = function(renderer, session) {
-    var container = renderer.getContainerElement();
-    this.container = container;
-    this.renderer = renderer;
-
-    this.textInput  = new TextInput(renderer.getTextAreaContainer(), this);
-    this.keyBinding = new KeyBinding(this);
-
-    // TODO detect touch event support
-    if (useragent.isIPad) {
-        //this.$mouseHandler = new TouchHandler(this);
-    } else {
-        this.$mouseHandler = new MouseHandler(this);
-        new FoldHandler(this);
-    }
-
-    this.$blockScrolling = 0;
-    this.$search = new Search().set({
-        wrap: true
-    });
-
-    this.commands = new CommandManager(useragent.isMac ? "mac" : "win", defaultCommands);
-    this.setSession(session || new EditSession(""));
-};
-
-(function(){
-
-    oop.implement(this, EventEmitter);
-
-    this.setKeyboardHandler = function(keyboardHandler) {
-        this.keyBinding.setKeyboardHandler(keyboardHandler);
-    };
-
-    this.getKeyboardHandler = function() {
-        return this.keyBinding.getKeyboardHandler();
-    };
-
-    this.setSession = function(session) {
-        if (this.session == session)
-            return;
-
-        if (this.session) {
-            var oldSession = 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 selection = this.session.getSelection();
-            selection.removeEventListener("changeCursor", this.$onCursorChange);
-            selection.removeEventListener("changeSelection", this.$onSelectionChange);
-        }
-
-        this.session = session;
-
-        this.$onDocumentChange = this.onDocumentChange.bind(this);
-        session.addEventListener("change", this.$onDocumentChange);
-        this.renderer.setSession(session);
-
-        this.$onChangeMode = this.onChangeMode.bind(this);
-        session.addEventListener("changeMode", this.$onChangeMode);
-
-        this.$onTokenizerUpdate = this.onTokenizerUpdate.bind(this);
-        session.addEventListener("tokenizerUpdate", this.$onTokenizerUpdate);
-
-        this.$onChangeTabSize = this.renderer.updateText.bind(this.renderer);
-        session.addEventListener("changeTabSize", this.$onChangeTabSize);
-
-        this.$onChangeWrapLimit = this.onChangeWrapLimit.bind(this);
-        session.addEventListener("changeWrapLimit", this.$onChangeWrapLimit);
-
-        this.$onChangeWrapMode = this.onChangeWrapMode.bind(this);
-        session.addEventListener("changeWrapMode", this.$onChangeWrapMode);
-
-        this.$onChangeFold = this.onChangeFold.bind(this);
-        session.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 = session.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: session,
-            oldSession: oldSession
-        });
-    };
-
-    this.getSession = function() {
-        return this.session;
-    };
-
-    this.getSelection = function() {
-        return this.selection;
-    };
-
-    this.resize = function() {
-        this.renderer.onResize();
-    };
-
-    this.setTheme = function(theme) {
-        this.renderer.setTheme(theme);
-    };
-
-    this.getTheme = function() {
-        return this.renderer.getTheme();
-    };
-
-    this.setStyle = function(style) {
-        this.renderer.setStyle(style);
-    };
-
-    this.unsetStyle = function(style) {
-        this.renderer.unsetStyle(style);
-    };
-
-    this.setFontSize = function(size) {
-        this.container.style.fontSize = size;
-        this.renderer.updateFontSize();
-    };
-
-    this.$highlightBrackets = function() {
-        if (this.session.$bracketHighlight) {
-            this.session.removeMarker(this.session.$bracketHighlight);
-            this.session.$bracketHighlight = null;
-        }
-
-        if (this.$highlightPending) {
-            return;
-        }
-
-        // perform highlight async to not block the browser during navigation
-        var self = this;
-        this.$highlightPending = true;
-        setTimeout(function() {
-            self.$highlightPending = false;
-
-            var pos = self.session.findMatchingBracket(self.getCursorPosition());
-            if (pos) {
-                var range = new Range(pos.row, pos.column, pos.row, pos.column+1);
-                self.session.$bracketHighlight = self.session.addMarker(range, "ace_bracket", "text");
-            }
-        }, 10);
-    };
-
-    this.focus = function() {
-        // Safari needs the timeout
-        // iOS and Firefox need it called immediately
-        // to be on the save side we do both
-        var _self = this;
-        setTimeout(function() {
-            _self.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(e) {
-        var delta = e.data;
-        var range = delta.range;
-        var lastRow;
-
-        if (range.start.row == range.end.row && delta.action != "insertLines" && delta.action != "removeLines")
-            lastRow = range.end.row;
-        else
-            lastRow = Infinity;
-        this.renderer.updateLines(range.start.row, lastRow);
-
-        this._emit("change", e);
-
-        // update cursor because tab characters can influence the cursor position
-        this.onCursorChange();
-    };
-
-    this.onTokenizerUpdate = function(e) {
-        var rows = e.data;
-        this.renderer.updateLines(rows.first, rows.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();
-
-        if (!this.$blockScrolling) {
-            this.renderer.scrollCursorIntoView();
-        }
-
-        // move text input over the cursor
-        // this is required for iOS and IME
-        this.renderer.moveTextAreaToCursor(this.textInput.getElement());
-
-        this.$highlightBrackets();
-        this.$updateHighlightActiveLine();
-    };
-
-    this.$updateHighlightActiveLine = function() {
-        var session = this.getSession();
-
-        if (session.$highlightLineMarker)
-            session.removeMarker(session.$highlightLineMarker);
-        if (typeof this.$lastrow == "number")
-            this.renderer.removeGutterDecoration(this.$lastrow, "ace_gutter_active_line");
-
-        session.$highlightLineMarker = null;
-        this.$lastrow = null;
-
-        if (this.getHighlightActiveLine()) {
-            var cursor = this.getCursorPosition(),
-                foldLine = this.session.getFoldLine(cursor.row);
-
-            if ((this.getSelectionStyle() != "line" || !this.selection.isMultiLine())) {
-                var range;
-                if (foldLine) {
-                    range = new Range(foldLine.start.row, 0, foldLine.end.row + 1, 0);
-                } else {
-                    range = new Range(cursor.row, 0, cursor.row+1, 0);
-                }
-                session.$highlightLineMarker = session.addMarker(range, "ace_active_line", "background");
-            }
-
-            this.renderer.addGutterDecoration(this.$lastrow = cursor.row, "ace_gutter_active_line");
-        }
-    };
-
-    this.onSelectionChange = function(e) {
-        var session = this.getSession();
-
-        if (session.$selectionMarker) {
-            session.removeMarker(session.$selectionMarker);
-        }
-        session.$selectionMarker = null;
-
-        if (!this.selection.isEmpty()) {
-            var range = this.selection.getRange();
-            var style = this.getSelectionStyle();
-            session.$selectionMarker = session.addMarker(range, "ace_selection", style);
-        } else {
-            this.$updateHighlightActiveLine();
-        }
-
-        if (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(true);
-    };
-
-    this.onChangeFold = function() {
-        // Update the active line marker as due to folding changes the current
-        // line range on the screen might have changed.
-        this.$updateHighlightActiveLine();
-        // TODO: This might be too much updating. Okay for now.
-        this.renderer.updateFull();
-    };
-
-    this.getCopyText = function() {
-        var text = "";
-        if (!this.selection.isEmpty())
-            text = this.session.getTextRange(this.getSelectionRange());
-
-        this._emit("copy", text);
-        return text;
-    };
-
-    this.onCut = function() {
-        this.commands.exec("cut", this);
-    };
-
-    this.insert = function(text) {
-        var session = this.session;
-        var mode = session.getMode();
-
-        var cursor = this.getCursorPosition();
-
-        if (this.getBehavioursEnabled()) {
-            // Get a transform if the current mode wants one.
-            var transform = mode.transformAction(session.getState(cursor.row), 'insertion', this, session, text);
-            if (transform)
-                text = transform.text;
-        }
-
-        text = text.replace("\t", this.session.getTabString());
-
-        // remove selected text
-        if (!this.selection.isEmpty()) {
-            cursor = this.session.remove(this.getSelectionRange());
-            this.clearSelection();
-        }
-        else if (this.session.getOverwrite()) {
-            var range = new Range.fromPoints(cursor, cursor);
-            range.end.column += text.length;
-            this.session.remove(range);
-        }
-
-        this.clearSelection();
-
-        var start = cursor.column;
-        var lineState = session.getState(cursor.row);
-        var shouldOutdent = mode.checkOutdent(lineState, session.getLine(cursor.row), text);
-        var line = session.getLine(cursor.row);
-        var lineIndent = mode.getNextLineIndent(lineState, line.slice(0, cursor.column), session.getTabString());
-        var end = session.insert(cursor, text);
-
-        if (transform && transform.selection) {
-            if (transform.selection.length == 2) { // Transform relative to the current column
-                this.selection.setSelectionRange(
-                    new Range(cursor.row, start + transform.selection[0],
-                              cursor.row, start + transform.selection[1]));
-            } else { // Transform relative to the current row.
-                this.selection.setSelectionRange(
-                    new Range(cursor.row + transform.selection[0],
-                              transform.selection[1],
-                              cursor.row + transform.selection[2],
-                              transform.selection[3]));
-            }
-        }
-
-        var lineState = session.getState(cursor.row);
-
-        // TODO disabled multiline auto indent
-        // possibly doing the indent before inserting the text
-        // if (cursor.row !== end.row) {
-        if (session.getDocument().isNewLine(text)) {
-            this.moveCursorTo(cursor.row+1, 0);
-
-            var size = session.getTabSize();
-            var minIndent = Number.MAX_VALUE;
-
-            for (var row = cursor.row + 1; row <= end.row; ++row) {
-                var indent = 0;
-
-                line = session.getLine(row);
-                for (var i = 0; i < line.length; ++i)
-                    if (line.charAt(i) == '\t')
-                        indent += size;
-                    else if (line.charAt(i) == ' ')
-                        indent += 1;
-                    else
-                        break;
-                if (/[^\s]/.test(line))
-                    minIndent = Math.min(indent, minIndent);
-            }
-
-            for (var row = cursor.row + 1; row <= end.row; ++row) {
-                var outdent = minIndent;
-
-                line = session.getLine(row);
-                for (var i = 0; i < line.length && outdent > 0; ++i)
-                    if (line.charAt(i) == '\t')
-                        outdent -= size;
-                    else if (line.charAt(i) == ' ')
-                        outdent -= 1;
-                session.remove(new Range(row, 0, row, i));
-            }
-            session.indentRows(cursor.row + 1, end.row, lineIndent);
-        }
-        if (shouldOutdent)
-            mode.autoOutdent(lineState, session, cursor.row);
-    };
-
-    this.onTextInput = function(text, pasted) {
-        if (pasted)
-            this._emit("paste", text);
-
-        this.keyBinding.onTextInput(text, pasted);
-    };
-
-    this.onCommandKey = function(e, hashId, keyCode) {
-        this.keyBinding.onCommandKey(e, hashId, keyCode);
-    };
-
-    this.setOverwrite = function(overwrite) {
-        this.session.setOverwrite(overwrite);
-    };
-
-    this.getOverwrite = function() {
-        return this.session.getOverwrite();
-    };
-
-    this.toggleOverwrite = function() {
-        this.session.toggleOverwrite();
-    };
-
-    this.setScrollSpeed = function(speed) {
-        this.$mouseHandler.setScrollSpeed(speed);
-    };
-
-    this.getScrollSpeed = function() {
-        return this.$mouseHandler.getScrollSpeed();
-    };
-
-    this.setDragDelay = function(dragDelay) {
-        this.$mouseHandler.setDragDelay(dragDelay);
-    };
-
-    this.getDragDelay = function() {
-        return this.$mouseHandler.getDragDelay();
-    };
-
-    this.$selectionStyle = "line";
-    this.setSelectionStyle = function(style) {
-        if (this.$selectionStyle == style) return;
-
-        this.$selectionStyle = style;
-        this.onSelectionChange();
-        this._emit("changeSelectionStyle", {data: style});
-    };
-
-    this.getSelectionStyle = function() {
-        return this.$selectionStyle;
-    };
-
-    this.$highlightActiveLine = true;
-    this.setHighlightActiveLine = function(shouldHighlight) {
-        if (this.$highlightActiveLine == shouldHighlight) return;
-
-        this.$highlightActiveLine = shouldHighlight;
-        this.$updateHighlightActiveLine();
-    };
-
-    this.getHighlightActiveLine = function() {
-        return this.$highlightActiveLine;
-    };
-
-    this.$highlightSelectedWord = true;
-    this.setHighlightSelectedWord = function(shouldHighlight) {
-        if (this.$highlightSelectedWord == shouldHighlight)
-            return;
-
-        this.$highlightSelectedWord = shouldHighlight;
-        if (shouldHighlight)
-            this.session.getMode().highlightSelection(this);
-        else
-            this.session.getMode().clearSelectionHighlight(this);
-    };
-
-    this.getHighlightSelectedWord = function() {
-        return this.$highlightSelectedWord;
-    };
-
-    this.setAnimatedScroll = function(shouldAnimate){
-        this.renderer.setAnimatedScroll(shouldAnimate);
-    };
-
-    this.getAnimatedScroll = function(){
-        return this.renderer.getAnimatedScroll();
-    };
-
-    this.setShowInvisibles = function(showInvisibles) {
-        if (this.getShowInvisibles() == showInvisibles)
-            return;
-
-        this.renderer.setShowInvisibles(showInvisibles);
-    };
-
-    this.getShowInvisibles = function() {
-        return this.renderer.getShowInvisibles();
-    };
-
-    this.setShowPrintMargin = function(showPrintMargin) {
-        this.renderer.setShowPrintMargin(showPrintMargin);
-    };
-
-    this.getShowPrintMargin = function() {
-        return this.renderer.getShowPrintMargin();
-    };
-
-    this.setPrintMarginColumn = function(showPrintMargin) {
-        this.renderer.setPrintMarginColumn(showPrintMargin);
-    };
-
-    this.getPrintMarginColumn = function() {
-        return this.renderer.getPrintMarginColumn();
-    };
-
-    this.$readOnly = false;
-    this.setReadOnly = function(readOnly) {
-        this.$readOnly = readOnly;
-    };
-
-    this.getReadOnly = function() {
-        return this.$readOnly;
-    };
-
-    this.$modeBehaviours = true;
-    this.setBehavioursEnabled = function (enabled) {
-        this.$modeBehaviours = enabled;
-    };
-
-    this.getBehavioursEnabled = function () {
-        return this.$modeBehaviours;
-    };
-
-    this.setShowFoldWidgets = function(show) {
-        var gutter = this.renderer.$gutterLayer;
-        if (gutter.getShowFoldWidgets() == show)
-            return;
-
-        this.renderer.$gutterLayer.setShowFoldWidgets(show);
-        this.$showFoldWidgets = show;
-        this.renderer.updateFull();
-    };
-
-    this.getShowFoldWidgets = function() {
-        return this.renderer.$gutterLayer.getShowFoldWidgets();
-    };
-
-    this.remove = function(dir) {
-        if (this.selection.isEmpty()){
-            if(dir == "left")
-                this.selection.selectLeft();
-            else
-                this.selection.selectRight();
-        }
-
-        var range = this.getSelectionRange();
-        if (this.getBehavioursEnabled()) {
-            var session = this.session;
-            var state = session.getState(range.start.row);
-            var new_range = session.getMode().transformAction(state, 'deletion', this, session, range);
-            if (new_range)
-                range = new_range;
-        }
-
-        this.session.remove(range);
-        this.clearSelection();
-    };
-
-    this.removeWordRight = function() {
-        if (this.selection.isEmpty())
-            this.selection.selectWordRight();
-
-        this.session.remove(this.getSelectionRange());
-        this.clearSelection();
-    };
-
-    this.removeWordLeft = function() {
-        if (this.selection.isEmpty())
-            this.selection.selectWordLeft();
-
-        this.session.remove(this.getSelectionRange());
-        this.clearSelection();
-    };
-
-    this.removeToLineStart = function() {
-        if (this.selection.isEmpty())
-            this.selection.selectLineStart();
-
-        this.session.remove(this.getSelectionRange());
-        this.clearSelection();
-    };
-
-    this.removeToLineEnd = function() {
-        if (this.selection.isEmpty())
-            this.selection.selectLineEnd();
-
-        var range = this.getSelectionRange();
-        if (range.start.column == range.end.column && range.start.row == range.end.row) {
-            range.end.column = 0;
-            range.end.row++;
-        }
-
-        this.session.remove(range);
-        this.clearSelection();
-    };
-
-    this.splitLine = function() {
-        if (!this.selection.isEmpty()) {
-            this.session.remove(this.getSelectionRange());
-            this.clearSelection();
-        }
-
-        var cursor = this.getCursorPosition();
-        this.insert("\n");
-        this.moveCursorToPosition(cursor);
-    };
-
-    this.transposeLetters = function() {
-        if (!this.selection.isEmpty()) {
-            return;
-        }
-
-        var cursor = this.getCursorPosition();
-        var column = cursor.column;
-        if (column === 0)
-            return;
-
-        var line = this.session.getLine(cursor.row);
-        var swap, range;
-        if (column < line.length) {
-            swap = line.charAt(column) + line.charAt(column-1);
-            range = new Range(cursor.row, column-1, cursor.row, column+1);
-        }
-        else {
-            swap = line.charAt(column-1) + line.charAt(column-2);
-            range = new Range(cursor.row, column-2, cursor.row, column);
-        }
-        this.session.replace(range, swap);
-    };
-
-    this.toLowerCase = function() {
-        var originalRange = this.getSelectionRange();
-        if (this.selection.isEmpty()) {
-            this.selection.selectWord();
-        }
-
-        var range = this.getSelectionRange();
-        var text = this.session.getTextRange(range);
-        this.session.replace(range, text.toLowerCase());
-        this.selection.setSelectionRange(originalRange);
-    };
-
-    this.toUpperCase = function() {
-        var originalRange = this.getSelectionRange();
-        if (this.selection.isEmpty()) {
-            this.selection.selectWord();
-        }
-
-        var range = this.getSelectionRange();
-        var text = this.session.getTextRange(range);
-        this.session.replace(range, text.toUpperCase());
-        this.selection.setSelectionRange(originalRange);
-    };
-
-    this.indent = function() {
-        var session = this.session;
-        var range = this.getSelectionRange();
-
-        if (range.start.row < range.end.row || range.start.column < range.end.column) {
-            var rows = this.$getSelectedRows();
-            session.indentRows(rows.first, rows.last, "\t");
-        } else {
-            var indentString;
-
-            if (this.session.getUseSoftTabs()) {
-                var size        = session.getTabSize(),
-                    position    = this.getCursorPosition(),
-                    column      = session.documentToScreenColumn(position.row, position.column),
-                    count       = (size - column % size);
-
-                indentString = lang.stringRepeat(" ", count);
-            } else
-                indentString = "\t";
-            return this.insert(indentString);
-        }
-    };
-
-    this.blockOutdent = function() {
-        var selection = this.session.getSelection();
-        this.session.outdentRows(selection.getRange());
-    };
-
-    this.toggleCommentLines = function() {
-        var state = this.session.getState(this.getCursorPosition().row);
-        var rows = this.$getSelectedRows();
-        this.session.getMode().toggleCommentLines(state, this.session, rows.first, rows.last);
-    };
-
-    this.removeLines = function() {
-        var rows = this.$getSelectedRows();
-        var range;
-        if (rows.first === 0 || rows.last+1 < this.session.getLength())
-            range = new Range(rows.first, 0, rows.last+1, 0);
-        else
-            range = new Range(
-                rows.first-1, this.session.getLine(rows.first-1).length,
-                rows.last, this.session.getLine(rows.last).length
-            );
-        this.session.remove(range);
-        this.clearSelection();
-    };
-
-    this.moveLinesDown = function() {
-        this.$moveLines(function(firstRow, lastRow) {
-            return this.session.moveLinesDown(firstRow, lastRow);
-        });
-    };
-
-    this.moveLinesUp = function() {
-        this.$moveLines(function(firstRow, lastRow) {
-            return this.session.moveLinesUp(firstRow, lastRow);
-        });
-    };
-
-    this.moveText = function(range, toPosition) {
-        if (this.$readOnly)
-            return null;
-
-        return this.session.moveText(range, toPosition);
-    };
-
-    this.copyLinesUp = function() {
-        this.$moveLines(function(firstRow, lastRow) {
-            this.session.duplicateLines(firstRow, lastRow);
-            return 0;
-        });
-    };
-
-    this.copyLinesDown = function() {
-        this.$moveLines(function(firstRow, lastRow) {
-            return this.session.duplicateLines(firstRow, lastRow);
-        });
-    };
-
-
-    this.$moveLines = function(mover) {
-        var rows = this.$getSelectedRows();
-        var selection = this.selection;
-        if (!selection.isMultiLine()) {
-            var range = selection.getRange();
-            var reverse = selection.isBackwards();
-        }
-
-        var linesMoved = mover.call(this, rows.first, rows.last);
-
-        if (range) {
-            range.start.row += linesMoved;
-            range.end.row += linesMoved;
-            selection.setSelectionRange(range, reverse);
-        }
-        else {
-            selection.setSelectionAnchor(rows.last+linesMoved+1, 0);
-            selection.$moveSelection(function() {
-                selection.moveCursorTo(rows.first+linesMoved, 0);
-            });
-        }
-    };
-
-    this.$getSelectedRows = function() {
-        var range = this.getSelectionRange().collapseRows();
-
-        return {
-            first: range.start.row,
-            last: range.end.row
-        };
-    };
-
-    this.onCompositionStart = function(text) {
-        this.renderer.showComposition(this.getCursorPosition());
-    };
-
-    this.onCompositionUpdate = function(text) {
-        this.renderer.setCompositionText(text);
-    };
-
-    this.onCompositionEnd = function() {
-        this.renderer.hideComposition();
-    };
-
-    this.getFirstVisibleRow = function() {
-        return this.renderer.getFirstVisibleRow();
-    };
-
-    this.getLastVisibleRow = function() {
-        return this.renderer.getLastVisibleRow();
-    };
-
-    this.isRowVisible = function(row) {
-        return (row >= this.getFirstVisibleRow() && row <= this.getLastVisibleRow());
-    };
-
-    this.isRowFullyVisible = function(row) {
-        return (row >= this.renderer.getFirstFullyVisibleRow() && row <= 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 firstRow = this.renderer.getScrollTopRow();
-        var lastRow = this.renderer.getScrollBottomRow();
-
-        return firstRow - (lastRow - firstRow);
-    };
-
-    this.selectPageDown = function() {
-        var row = this.$getPageDownRow() + Math.floor(this.$getVisibleRowCount() / 2);
-
-        this.scrollPageDown();
-
-        var selection = this.getSelection();
-        var leadScreenPos = this.session.documentToScreenPosition(selection.getSelectionLead());
-        var dest = this.session.screenToDocumentPosition(row, leadScreenPos.column);
-        selection.selectTo(dest.row, dest.column);
-    };
-
-    this.selectPageUp = function() {
-        var visibleRows = this.renderer.getScrollTopRow() - this.renderer.getScrollBottomRow();
-        var row = this.$getPageUpRow() + Math.round(visibleRows / 2);
-
-        this.scrollPageUp();
-
-        var selection = this.getSelection();
-        var leadScreenPos = this.session.documentToScreenPosition(selection.getSelectionLead());
-        var dest = this.session.screenToDocumentPosition(row, leadScreenPos.column);
-        selection.selectTo(dest.row, dest.column);
-    };
-
-    this.gotoPageDown = function() {
-        var row = this.$getPageDownRow();
-        var column = this.getCursorPositionScreen().column;
-
-        this.scrollToRow(row);
-        this.getSelection().moveCursorToScreen(row, column);
-    };
-
-    this.gotoPageUp = function() {
-        var row = this.$getPageUpRow();
-        var column = this.getCursorPositionScreen().column;
-
-       this.scrollToRow(row);
-       this.getSelection().moveCursorToScreen(row, column);
-    };
-
-    this.scrollPageDown = function() {
-        this.scrollToRow(this.$getPageDownRow());
-    };
-
-    this.scrollPageUp = function() {
-        this.renderer.scrollToRow(this.$getPageUpRow());
-    };
-
-    this.scrollToRow = function(row) {
-        this.renderer.scrollToRow(row);
-    };
-
-    this.scrollToLine = function(line, center) {
-        this.renderer.scrollToLine(line, center);
-    };
-
-    this.centerSelection = function() {
-        var range = this.getSelectionRange();
-        var line = Math.floor(range.start.row + (range.end.row - range.start.row) / 2);
-        this.renderer.scrollToLine(line, true);
-    };
-
-    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(row, column) {
-        this.selection.moveCursorTo(row, column);
-    };
-
-    this.moveCursorToPosition = function(pos) {
-        this.selection.moveCursorToPosition(pos);
-    };
-
-    this.jumpToMatching = function() {
-        var cursor = this.getCursorPosition();
-        var pos = this.session.findMatchingBracket(cursor);
-        if (!pos) {
-            cursor.column += 1;
-            pos = this.session.findMatchingBracket(cursor);
-        }
-        if (!pos) {
-            cursor.column -= 2;
-            pos = this.session.findMatchingBracket(cursor);
-        }
-
-        if (pos) {
-            this.clearSelection();
-            this.moveCursorTo(pos.row, pos.column);
-        }
-    };
-
-    this.gotoLine = function(lineNumber, column) {
-        this.selection.clearSelection();
-        this.session.unfold({row: lineNumber - 1, column: column || 0});
-
-        this.$blockScrolling += 1;
-        this.moveCursorTo(lineNumber-1, column || 0);
-        this.$blockScrolling -= 1;
-        if (!this.isRowFullyVisible(this.getCursorPosition().row))
-            this.scrollToLine(lineNumber, true);
-    };
-
-    this.navigateTo = function(row, column) {
-        this.clearSelection();
-        this.moveCursorTo(row, column);
-    };
-
-    this.navigateUp = function(times) {
-        this.selection.clearSelection();
-        times = times || 1;
-        this.selection.moveCursorBy(-times, 0);
-    };
-
-    this.navigateDown = function(times) {
-        this.selection.clearSelection();
-        times = times || 1;
-        this.selection.moveCursorBy(times, 0);
-    };
-
-    this.navigateLeft = function(times) {
-        if (!this.selection.isEmpty()) {
-            var selectionStart = this.getSelectionRange().start;
-            this.moveCursorToPosition(selectionStart);
-        }
-        else {
-            times = times || 1;
-            while (times--) {
-                this.selection.moveCursorLeft();
-            }
-        }
-        this.clearSelection();
-    };
-
-    this.navigateRight = function(times) {
-        if (!this.selection.isEmpty()) {
-            var selectionEnd = this.getSelectionRange().end;
-            this.moveCursorToPosition(selectionEnd);
-        }
-        else {
-            times = times || 1;
-            while (times--) {
-                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(replacement, options) {
-        if (options)
-            this.$search.set(options);
-
-        var range = this.$search.find(this.session);
-        var replaced = 0;
-        if (!range)
-            return replaced;
-
-        if (this.$tryReplace(range, replacement)) {
-            replaced = 1;
-        }
-        if (range !== null) {
-            this.selection.setSelectionRange(range);
-            this.renderer.scrollSelectionIntoView(range.start, range.end);
-        }
-
-        return replaced;
-    };
-
-    this.replaceAll = function(replacement, options) {
-        if (options) {
-            this.$search.set(options);
-        }
-
-        var ranges = this.$search.findAll(this.session);
-        var replaced = 0;
-        if (!ranges.length)
-            return replaced;
-
-        var selection = this.getSelectionRange();
-        this.clearSelection();
-        this.selection.moveCursorTo(0, 0);
-
-        this.$blockScrolling += 1;
-        for (var i = ranges.length - 1; i >= 0; --i) {
-            if(this.$tryReplace(ranges[i], replacement)) {
-                replaced++;
-            }
-        }
-
-        this.selection.setSelectionRange(selection);
-        this.$blockScrolling -= 1;
-
-        return replaced;
-    };
-
-    this.$tryReplace = function(range, replacement) {
-        var input = this.session.getTextRange(range);
-        replacement = this.$search.replace(input, replacement);
-        if (replacement !== null) {
-            range.end = this.session.replace(range, replacement);
-            return range;
-        } else {
-            return null;
-        }
-    };
-
-    this.getLastSearchOptions = function() {
-        return this.$search.getOptions();
-    };
-
-    this.find = function(needle, options) {
-        this.clearSelection();
-        options = options || {};
-        options.needle = needle;
-        this.$search.set(options);
-        this.$find();
-    };
-
-    this.findNext = function(options) {
-        options = options || {};
-        if (typeof options.backwards == "undefined")
-            options.backwards = false;
-        this.$search.set(options);
-        this.$find();
-    };
-
-    this.findPrevious = function(options) {
-        options = options || {};
-        if (typeof options.backwards == "undefined")
-            options.backwards = true;
-        this.$search.set(options);
-        this.$find();
-    };
-
-    this.$find = function(backwards) {
-        if (!this.selection.isEmpty())
-            this.$search.set({needle: this.session.getTextRange(this.getSelectionRange())});
-
-        if (typeof backwards != "undefined")
-            this.$search.set({backwards: backwards});
-
-        var range = this.$search.find(this.session);
-        if (range) {
-            this.session.unfold(range);
-
-            this.$blockScrolling += 1;
-            this.selection.setSelectionRange(range);
-            this.$blockScrolling -= 1;
-
-            if (this.getAnimatedScroll()) {
-                var cursor = this.getCursorPosition();
-                if (!this.isRowFullyVisible(cursor.row))
-                    this.scrollToLine(cursor.row, true);
-    
-                //@todo scroll X
-                //if (!this.isColumnFullyVisible(cursor.column))
-                    //this.scrollToRow(cursor.column);
-            }
-            else {
-                this.renderer.scrollSelectionIntoView(range.start, range.end);
-            }
-        }
-    };
-
-    this.undo = function() {
-        this.session.getUndoManager().undo();
-    };
-
-    this.redo = function() {
-        this.session.getUndoManager().redo();
-    };
-
-    this.destroy = function() {
-        this.renderer.destroy();
-    };
-
-}).call(Editor.prototype);
-
-
-exports.Editor = Editor;
-});
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/lib/lang', ['require', 'exports', 'module' ], function(require, exports, module) {
-"use strict";
-
-exports.stringReverse = function(string) {
-    return string.split("").reverse().join("");
-};
-
-exports.stringRepeat = function (string, count) {
-     return new Array(count + 1).join(string);
-};
-
-var trimBeginRegexp = /^\s\s*/;
-var trimEndRegexp = /\s\s*$/;
-
-exports.stringTrimLeft = function (string) {
-    return string.replace(trimBeginRegexp, '');
-};
-
-exports.stringTrimRight = function (string) {
-    return string.replace(trimEndRegexp, '');
-};
-
-exports.copyObject = function(obj) {
-    var copy = {};
-    for (var key in obj) {
-        copy[key] = obj[key];
-    }
-    return copy;
-};
-
-exports.copyArray = function(array){
-    var copy = [];
-    for (var i=0, l=array.length; i<l; i++) {
-        if (array[i] && typeof array[i] == "object")
-            copy[i] = this.copyObject( array[i] );
-        else 
-            copy[i] = array[i];
-    }
-    return copy;
-};
-
-exports.deepCopy = function (obj) {
-    if (typeof obj != "object") {
-        return obj;
-    }
-    
-    var copy = obj.constructor();
-    for (var key in obj) {
-        if (typeof obj[key] == "object") {
-            copy[key] = this.deepCopy(obj[key]);
-        } else {
-            copy[key] = obj[key];
-        }
-    }
-    return copy;
-};
-
-exports.arrayToMap = function(arr) {
-    var map = {};
-    for (var i=0; i<arr.length; i++) {
-        map[arr[i]] = 1;
-    }
-    return map;
-
-};
-
-/**
- * splice out of 'array' anything that === 'value'
- */
-exports.arrayRemove = function(array, value) {
-  for (var i = 0; i <= array.length; i++) {
-    if (value === array[i]) {
-      array.splice(i, 1);
-    }
-  }
-};
-
-exports.escapeRegExp = function(str) {
-    return str.replace(/([.*+?^${}()|[\]\/\\])/g, '\\$1');
-};
-
-exports.deferredCall = function(fcn) {
-
-    var timer = null;
-    var callback = function() {
-        timer = null;
-        fcn();
-    };
-
-    var deferred = function(timeout) {
-        deferred.cancel();
-        timer = setTimeout(callback, timeout || 0);
-        return deferred;
-    };
-
-    deferred.schedule = deferred;
-
-    deferred.call = function() {
-        this.cancel();
-        fcn();
-        return deferred;
-    };
-
-    deferred.cancel = function() {
-        clearTimeout(timer);
-        timer = null;
-        return deferred;
-    };
-
-    return deferred;
-};
-
-});
-/* vim:ts=4:sts=4:sw=4:
- * ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *      Mihai Sucan <mihai DOT sucan AT gmail DOT com>
- *
- * 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 ***** */
-
-define('ace/keyboard/textinput', ['require', 'exports', 'module' , 'ace/lib/event', 'ace/lib/useragent', 'ace/lib/dom'], function(require, exports, module) {
-"use strict";
-
-var event = require("../lib/event");
-var useragent = require("../lib/useragent");
-var dom = require("../lib/dom");
-
-var TextInput = function(parentNode, host) {
-
-    var text = dom.createElement("textarea");
-    if (useragent.isTouchPad)
-        text.setAttribute("x-palm-disable-auto-cap", true);
-        
-    text.style.left = "-10000px";
-    text.style.position = "fixed";
-    parentNode.insertBefore(text, parentNode.firstChild);
-
-    var PLACEHOLDER = String.fromCharCode(0);
-    sendText();
-
-    var inCompostion = false;
-    var copied = false;
-    var pasted = false;
-    var tempStyle = '';
-
-    function select() {
-        try {
-            text.select();
-        } catch (e) {}
-    }
-
-    function sendText(valueToSend) {
-        if (!copied) {
-            var value = valueToSend || text.value;
-            if (value) {
-                if (value.charCodeAt(value.length-1) == PLACEHOLDER.charCodeAt(0)) {
-                    value = value.slice(0, -1);
-                    if (value)
-                        host.onTextInput(value, pasted);
-                }
-                else {
-                    host.onTextInput(value, pasted);
-                }
-
-                // If editor is no longer focused we quit immediately, since
-                // it means that something else is in charge now.
-                if (!isFocused())
-                    return false;
-            }
-        }
-
-        copied = false;
-        pasted = false;
-
-        // Safari doesn't fire copy events if no text is selected
-        text.value = PLACEHOLDER;
-        select();
-    }
-
-    var onTextInput = function(e) {
-        setTimeout(function () {
-            if (!inCompostion)
-                sendText(e.data);                
-        }, 0);
-    };
-    
-    var onPropertyChange = function(e) {
-        if (useragent.isOldIE && text.value.charCodeAt(0) > 128) return;
-        setTimeout(function() {
-            if (!inCompostion)
-                sendText();
-        }, 0);
-    };
-
-    var onCompositionStart = function(e) {
-        inCompostion = true;
-        host.onCompositionStart();
-        if (!useragent.isGecko) setTimeout(onCompositionUpdate, 0);
-    };
-
-    var onCompositionUpdate = function() {
-        if (!inCompostion) return;
-        host.onCompositionUpdate(text.value);
-    };
-
-    var onCompositionEnd = function(e) {
-        inCompostion = false;
-        host.onCompositionEnd();
-    };
-
-    var onCopy = function(e) {
-        copied = true;
-        var copyText = host.getCopyText();
-        if(copyText)
-            text.value = copyText;
-        else
-            e.preventDefault();
-        select();
-        setTimeout(function () {
-            sendText();
-        }, 0);
-    };
-    
-    var onCut = function(e) {
-        copied = true;
-        var copyText = host.getCopyText();
-        if(copyText) {
-            text.value = copyText;
-            host.onCut();
-        } else
-            e.preventDefault();
-        select();
-        setTimeout(function () {
-            sendText();
-        }, 0);
-    };
-
-    event.addCommandKeyListener(text, host.onCommandKey.bind(host));
-    if (useragent.isOldIE) {
-        var keytable = { 13:1, 27:1 };
-        event.addListener(text, "keyup", function (e) {
-            if (inCompostion && (!text.value || keytable[e.keyCode]))
-                setTimeout(onCompositionEnd, 0);
-            if ((text.value.charCodeAt(0)|0) < 129) {
-                return;
-            }
-            inCompostion ? onCompositionUpdate() : onCompositionStart();
-        });
-    }
-    
-    if ("onpropertychange" in text && !("oninput" in text))
-        event.addListener(text, "propertychange", onPropertyChange);
-    else
-        event.addListener(text, "input", onTextInput);
-    
-    event.addListener(text, "paste", function(e) {
-        // Mark that the next input text comes from past.
-        pasted = true;
-        // Some browsers support the event.clipboardData API. Use this to get
-        // the pasted content which increases speed if pasting a lot of lines.
-        if (e.clipboardData && e.clipboardData.getData) {
-            sendText(e.clipboardData.getData("text/plain"));
-            e.preventDefault();
-        } 
-        else {
-            // If a browser doesn't support any of the things above, use the regular
-            // method to detect the pasted input.
-            onPropertyChange();
-        }
-    });
-
-    if ("onbeforecopy" in text && typeof clipboardData !== "undefined") {
-        event.addListener(text, "beforecopy", function(e) {
-            var copyText = host.getCopyText();
-            if (copyText)
-                clipboardData.setData("Text", copyText);
-            else
-                e.preventDefault();
-        });
-        event.addListener(parentNode, "keydown", function(e) {
-            if (e.ctrlKey && e.keyCode == 88) {
-                var copyText = host.getCopyText();
-                if (copyText) {
-                    clipboardData.setData("Text", copyText);
-                    host.onCut();
-                }
-                event.preventDefault(e);
-            }
-        });
-    }
-    else {
-        event.addListener(text, "copy", onCopy);
-        event.addListener(text, "cut", onCut);
-    }
-
-    event.addListener(text, "compositionstart", onCompositionStart);
-    if (useragent.isGecko) {
-        event.addListener(text, "text", onCompositionUpdate);
-    }
-    if (useragent.isWebKit) {
-        event.addListener(text, "keyup", onCompositionUpdate);
-    }
-    event.addListener(text, "compositionend", onCompositionEnd);
-
-    event.addListener(text, "blur", function() {
-        host.onBlur();
-    });
-
-    event.addListener(text, "focus", function() {
-        host.onFocus();
-        select();
-    });
-
-    this.focus = function() {
-        host.onFocus();
-        select();
-        text.focus();
-    };
-
-    this.blur = function() {
-        text.blur();
-    };
-
-    function isFocused() {
-        return document.activeElement === text;
-    }
-    this.isFocused = isFocused;
-
-    this.getElement = function() {
-        return text;
-    };
-
-    this.onContextMenu = function(mousePos, isEmpty){
-        if (mousePos) {
-            if (!tempStyle)
-                tempStyle = text.style.cssText;
-                
-            text.style.cssText = 
-                'position:fixed; z-index:1000;' +
-                'left:' + (mousePos.x - 2) + 'px; top:' + (mousePos.y - 2) + 'px;';
-
-        }
-        if (isEmpty)
-            text.value='';
-    };
-
-    this.onContextMenuClose = function(){
-        setTimeout(function () {
-            if (tempStyle) {
-                text.style.cssText = tempStyle;
-                tempStyle = '';
-            }
-            sendText();
-        }, 0);
-    };
-};
-
-exports.TextInput = TextInput;
-});
-/* vim:ts=4:sts=4:sw=4:
- * ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *      Mihai Sucan <mihai DOT sucan AT gmail DOT com>
- *
- * 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 ***** */
-
-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(require, exports, module) {
-"use strict";
-
-var event = require("../lib/event");
-var DefaultHandlers = require("./default_handlers").DefaultHandlers;
-var DefaultGutterHandler = require("./default_gutter_handler").GutterHandler;
-var MouseEvent = require("./mouse_event").MouseEvent;
-
-var MouseHandler = function(editor) {
-    this.editor = editor;
-    
-    new DefaultHandlers(editor);
-    new DefaultGutterHandler(editor);
-    
-    event.addListener(editor.container, "mousedown", function(e) {
-        editor.focus();
-        return event.preventDefault(e);
-    });
-    event.addListener(editor.container, "selectstart", function(e) {
-        return event.preventDefault(e);
-    });
-
-    var mouseTarget = editor.renderer.getMouseEventTarget();
-    event.addListener(mouseTarget, "mousedown", this.onMouseEvent.bind(this, "mousedown"));
-    event.addListener(mouseTarget, "click", this.onMouseEvent.bind(this, "click"));
-    event.addListener(mouseTarget, "mousemove", this.onMouseMove.bind(this, "mousemove"));
-    event.addMultiMouseDownListener(mouseTarget, 0, 2, 500, this.onMouseEvent.bind(this, "dblclick"));
-    event.addMultiMouseDownListener(mouseTarget, 0, 3, 600, this.onMouseEvent.bind(this, "tripleclick"));
-    event.addMultiMouseDownListener(mouseTarget, 0, 4, 600, this.onMouseEvent.bind(this, "quadclick"));
-    event.addMouseWheelListener(editor.container, this.onMouseWheel.bind(this, "mousewheel"));
-    
-    var gutterEl = editor.renderer.$gutter;
-    event.addListener(gutterEl, "mousedown", this.onMouseEvent.bind(this, "guttermousedown"));
-    event.addListener(gutterEl, "click", this.onMouseEvent.bind(this, "gutterclick"));
-    event.addListener(gutterEl, "dblclick", this.onMouseEvent.bind(this, "gutterdblclick"));
-    event.addListener(gutterEl, "mousemove", this.onMouseMove.bind(this, "gutter"));
-};
-
-(function() {
-
-    this.$scrollSpeed = 1;
-    this.setScrollSpeed = function(speed) {
-        this.$scrollSpeed = speed;
-    };
-
-    this.getScrollSpeed = function() {
-        return this.$scrollSpeed;
-    };
-
-    this.onMouseEvent = function(name, e) {
-        this.editor._emit(name, new MouseEvent(e, this.editor));
-    };
-    
-    this.$dragDelay = 250;
-    this.setDragDelay = function(dragDelay) {
-        this.$dragDelay = dragDelay;
-    };
-
-    this.getDragDelay = function() {
-        return this.$dragDelay;
-    };
-
-    this.onMouseMove = function(name, e) {
-        // optimization, because mousemove doesn't have a default handler.
-        var listeners = this.editor._eventRegistry && this.editor._eventRegistry.mousemove;
-        if (!listeners || !listeners.length)
-            return;
-
-        this.editor._emit(name, new MouseEvent(e, this.editor));
-    };
-
-    this.onMouseWheel = function(name, e) {
-        var mouseEvent = new MouseEvent(e, this.editor);
-        mouseEvent.speed = this.$scrollSpeed * 2;
-        mouseEvent.wheelX = e.wheelX;
-        mouseEvent.wheelY = e.wheelY;
-        
-        this.editor._emit(name, mouseEvent);
-    };
-
-}).call(MouseHandler.prototype);
-
-exports.MouseHandler = MouseHandler;
-});
-/* vim:ts=4:sts=4:sw=4:
- * ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *      Mike de Boer <mike AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mouse/default_handlers', ['require', 'exports', 'module' , 'ace/lib/event', 'ace/lib/dom', 'ace/lib/browser_focus'], function(require, exports, module) {
-"use strict";
-
-var event = require("../lib/event");
-var dom = require("../lib/dom");
-var BrowserFocus = require("../lib/browser_focus").BrowserFocus;
-
-var STATE_UNKNOWN = 0;
-var STATE_SELECT = 1;
-var STATE_DRAG = 2;
-
-var DRAG_OFFSET = 5; // pixels
-
-function DefaultHandlers(editor) {
-    this.editor = editor;
-    this.$clickSelection = null;
-    this.browserFocus = new BrowserFocus();
-
-    editor.setDefaultHandler("mousedown", this.onMouseDown.bind(this));
-    editor.setDefaultHandler("dblclick", this.onDoubleClick.bind(this));
-    editor.setDefaultHandler("tripleclick", this.onTripleClick.bind(this));
-    editor.setDefaultHandler("quadclick", this.onQuadClick.bind(this));
-    editor.setDefaultHandler("mousewheel", this.onScroll.bind(this));
-}
-
-(function() {
-    
-    this.onMouseDown = function(ev) {
-        var inSelection = ev.inSelection();
-        var pageX = ev.pageX;
-        var pageY = ev.pageY;
-        var pos = ev.getDocumentPosition();
-        var editor = this.editor;
-        var _self = this;
-        
-        var selectionRange = editor.getSelectionRange();
-        var selectionEmpty = selectionRange.isEmpty();
-        var state = STATE_UNKNOWN;
-        
-        // if this click caused the editor to be focused should not clear the
-        // selection
-        if (
-            inSelection && (
-                !this.browserFocus.isFocused()
-                || new Date().getTime() - this.browserFocus.lastFocus < 20
-                || !editor.isFocused()
-            )
-        ) {
-            editor.focus();
-            return;
-        }
-
-        var button = ev.getButton();
-        if (button !== 0) {
-            if (selectionEmpty) {
-                editor.moveCursorToPosition(pos);
-            }
-            if (button == 2) {
-                editor.textInput.onContextMenu({x: ev.clientX, y: ev.clientY}, selectionEmpty);
-                event.capture(editor.container, function(){}, editor.textInput.onContextMenuClose);
-            }
-            return;
-        }
-
-        if (!inSelection) {
-            // Directly pick STATE_SELECT, since the user is not clicking inside
-            // a selection.
-            onStartSelect(pos);
-        }
-
-        var mousePageX = pageX, mousePageY = pageY;
-        var mousedownTime = (new Date()).getTime();
-        var dragCursor, dragRange, dragSelectionMarker;
-
-        var onMouseSelection = function(e) {
-            mousePageX = event.getDocumentX(e);
-            mousePageY = event.getDocumentY(e);
-        };
-
-        var onMouseSelectionEnd = function(e) {
-            clearInterval(timerId);
-            if (state == STATE_UNKNOWN)
-                onStartSelect(pos);
-            else if (state == STATE_DRAG)
-                onMouseDragSelectionEnd(e);
-
-            _self.$clickSelection = null;
-            state = STATE_UNKNOWN;
-        };
-
-        var onMouseDragSelectionEnd = function(e) {
-            dom.removeCssClass(editor.container, "ace_dragging");
-            editor.session.removeMarker(dragSelectionMarker);
-
-            if (!editor.$mouseHandler.$clickSelection) {
-                if (!dragCursor) {
-                    editor.moveCursorToPosition(pos);
-                    editor.selection.clearSelection();
-                }
-            }
-
-            if (!dragCursor)
-                return;
-
-            if (dragRange.contains(dragCursor.row, dragCursor.column)) {
-                dragCursor = null;
-                return;
-            }
-
-            editor.clearSelection();
-            if (e && (e.ctrlKey || e.altKey)) {
-                var session = editor.session;
-                var newRange = session.insert(dragCursor, session.getTextRange(dragRange));
-            } else {
-                var newRange = editor.moveText(dragRange, dragCursor);
-            }
-            if (!newRange) {
-                dragCursor = null;
-                return;
-            }
-
-            editor.selection.setSelectionRange(newRange);
-        };
-
-        var onSelectionInterval = function() {
-            if (state == STATE_UNKNOWN) {
-                var distance = calcDistance(pageX, pageY, mousePageX, mousePageY);
-                var time = (new Date()).getTime();
-
-                if (distance > DRAG_OFFSET) {
-                    state = STATE_SELECT;
-                    var cursor = editor.renderer.screenToTextCoordinates(mousePageX, mousePageY);
-                    onStartSelect(cursor);
-                }
-                else if ((time - mousedownTime) > editor.getDragDelay()) {
-                    state = STATE_DRAG;
-                    dragRange = editor.getSelectionRange();
-                    var style = editor.getSelectionStyle();
-                    dragSelectionMarker = editor.session.addMarker(dragRange, "ace_selection", style);
-                    editor.clearSelection();
-                    dom.addCssClass(editor.container, "ace_dragging");
-                }
-
-            }
-
-            if (state == STATE_DRAG)
-                onDragSelectionInterval();
-            else if (state == STATE_SELECT)
-                onUpdateSelectionInterval();
-        };
-
-        function onStartSelect(pos) {
-            if (ev.getShiftKey()) {
-                editor.selection.selectToPosition(pos);
-            }
-            else {
-                if (!_self.$clickSelection) {
-                    editor.moveCursorToPosition(pos);
-                    editor.selection.clearSelection();
-                }
-            }
-            state = STATE_SELECT;
-        }
-
-        var onUpdateSelectionInterval = function() {
-            var anchor;
-            var cursor = editor.renderer.screenToTextCoordinates(mousePageX, mousePageY);
-
-            if (_self.$clickSelection) {
-                if (_self.$clickSelection.contains(cursor.row, cursor.column)) {
-                    editor.selection.setSelectionRange(_self.$clickSelection);
-                }
-                else {
-                    if (_self.$clickSelection.compare(cursor.row, cursor.column) == -1) {
-                        anchor = _self.$clickSelection.end;
-                    }
-                    else {
-                        anchor = _self.$clickSelection.start;
-                    }
-                    editor.selection.setSelectionAnchor(anchor.row, anchor.column);
-                    editor.selection.selectToPosition(cursor);
-                }
-            }
-            else {
-                editor.selection.selectToPosition(cursor);
-            }
-
-            editor.renderer.scrollCursorIntoView();
-        };
-
-        var onDragSelectionInterval = function() {
-            dragCursor = editor.renderer.screenToTextCoordinates(mousePageX, mousePageY);
-            editor.moveCursorToPosition(dragCursor);
-        };
-
-        event.capture(editor.container, onMouseSelection, onMouseSelectionEnd);
-        var timerId = setInterval(onSelectionInterval, 20);
-
-        return ev.preventDefault();
-    };
-    
-    this.onDoubleClick = function(ev) {
-        var pos = ev.getDocumentPosition();
-        var editor = this.editor;
-        
-        editor.moveCursorToPosition(pos);
-        editor.selection.selectWord();
-        this.$clickSelection = editor.getSelectionRange();
-    };
-    
-    this.onTripleClick = function(ev) {
-        var pos = ev.getDocumentPosition();
-        var editor = this.editor;
-        
-        editor.moveCursorToPosition(pos);
-        editor.selection.selectLine();
-        this.$clickSelection = editor.getSelectionRange();
-    };
-    
-    this.onQuadClick = function(ev) {
-        var editor = this.editor;
-        
-        editor.selectAll();
-        this.$clickSelection = editor.getSelectionRange();
-    };
-    
-    this.onScroll = function(ev) {
-        var editor = this.editor;
-        
-        editor.renderer.scrollBy(ev.wheelX * ev.speed, ev.wheelY * ev.speed);
-        if (editor.renderer.isScrollableBy(ev.wheelX * ev.speed, ev.wheelY * ev.speed))
-            return ev.preventDefault();
-    };
-    
-}).call(DefaultHandlers.prototype);
-
-exports.DefaultHandlers = DefaultHandlers;
-
-function calcDistance(ax, ay, bx, by) {
-    return Math.sqrt(Math.pow(bx - ax, 2) + Math.pow(by - ay, 2));
-}
-
-});
-/* vim:ts=4:sts=4:sw=4:
- * ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *      Irakli Gozalishvili <rfobic@gmail.com> (http://jeditoolkit.com)
- *      Julian Viereck <julian.viereck@gmail.com>
- *
- * 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 ***** */
-
-define('ace/lib/browser_focus', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/event', 'ace/lib/event_emitter'], function(require, exports, module) {
-"use strict";
-
-var oop = require("./oop");
-var event = require("./event");
-var EventEmitter = require("./event_emitter").EventEmitter;
-
-/**
- * This class keeps track of the focus state of the given window.
- * Focus changes for example when the user switches a browser tab,
- * goes to the location bar or switches to another application.
- */ 
-var BrowserFocus = function(win) {
-    win = win || window;
-    
-    this.lastFocus = new Date().getTime();
-    this._isFocused = true;
-    
-    var _self = this;
-
-    // IE < 9 supports focusin and focusout events
-    if ("onfocusin" in win.document) {
-        event.addListener(win.document, "focusin", function(e) {
-            _self._setFocused(true);
-        });
-
-        event.addListener(win.document, "focusout", function(e) {
-            _self._setFocused(!!e.toElement);
-        });
-    }
-    else {
-        event.addListener(win, "blur", function(e) {
-            _self._setFocused(false);
-        });
-
-        event.addListener(win, "focus", function(e) {
-            _self._setFocused(true);
-        });
-    }
-};
-
-(function(){
-
-    oop.implement(this, EventEmitter);
-    
-    this.isFocused = function() {
-        return this._isFocused;
-    };
-    
-    this._setFocused = function(isFocused) {
-        if (this._isFocused == isFocused)
-            return;
-            
-        if (isFocused)
-            this.lastFocus = new Date().getTime();
-            
-        this._isFocused = isFocused;
-        this._emit("changeFocus");
-    };
-
-}).call(BrowserFocus.prototype);
-
-
-exports.BrowserFocus = BrowserFocus;
-});
-/* vim:ts=4:sts=4:sw=4:
- * ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *      Irakli Gozalishvili <rfobic@gmail.com> (http://jeditoolkit.com)
- *      Mike de Boer <mike AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/lib/event_emitter', ['require', 'exports', 'module' ], function(require, exports, module) {
-"use strict";
-
-var EventEmitter = {};
-
-EventEmitter._emit =
-EventEmitter._dispatchEvent = function(eventName, e) {
-    this._eventRegistry = this._eventRegistry || {};
-    this._defaultHandlers = this._defaultHandlers || {};
-
-    var listeners = this._eventRegistry[eventName] || [];
-    var defaultHandler = this._defaultHandlers[eventName];
-    if (!listeners.length && !defaultHandler)
-        return;
-
-    e = e || {};
-    e.type = eventName;
-    
-    if (!e.stopPropagation) {
-        e.stopPropagation = function() {
-            this.propagationStopped = true;
-        };
-    }
-    
-    if (!e.preventDefault) {
-        e.preventDefault = function() {
-            this.defaultPrevented = true;
-        };
-    }
-
-    for (var i=0; i<listeners.length; i++) {
-        listeners[i](e);
-        if (e.propagationStopped)
-            break;
-    }
-    
-    if (defaultHandler && !e.defaultPrevented)
-        defaultHandler(e);
-};
-
-EventEmitter.setDefaultHandler = function(eventName, callback) {
-    this._defaultHandlers = this._defaultHandlers || {};
-    
-    if (this._defaultHandlers[eventName])
-        throw new Error("The default handler for '" + eventName + "' is already set");
-        
-    this._defaultHandlers[eventName] = callback;
-};
-
-EventEmitter.on =
-EventEmitter.addEventListener = function(eventName, callback) {
-    this._eventRegistry = this._eventRegistry || {};
-
-    var listeners = this._eventRegistry[eventName];
-    if (!listeners)
-        var listeners = this._eventRegistry[eventName] = [];
-
-    if (listeners.indexOf(callback) == -1)
-        listeners.push(callback);
-};
-
-EventEmitter.removeListener =
-EventEmitter.removeEventListener = function(eventName, callback) {
-    this._eventRegistry = this._eventRegistry || {};
-
-    var listeners = this._eventRegistry[eventName];
-    if (!listeners)
-        return;
-
-    var index = listeners.indexOf(callback);
-    if (index !== -1)
-        listeners.splice(index, 1);
-};
-
-EventEmitter.removeAllListeners = function(eventName) {
-    if (this._eventRegistry) this._eventRegistry[eventName] = [];
-};
-
-exports.EventEmitter = EventEmitter;
-
-});/* vim:ts=4:sts=4:sw=4:
- * ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mouse/default_gutter_handler', ['require', 'exports', 'module' ], function(require, exports, module) {
-"use strict";
-
-function GutterHandler(editor) {
-    editor.setDefaultHandler("gutterclick", function(e) {
-        var row = e.getDocumentPosition().row;
-        var selection = editor.session.selection;
-        
-        selection.moveCursorTo(row, 0);
-        selection.selectLine();
-    });
-}
-
-exports.GutterHandler = GutterHandler;
-
-});/* vim:ts=4:sts=4:sw=4:
- * ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mouse/mouse_event', ['require', 'exports', 'module' , 'ace/lib/event'], function(require, exports, module) {
-"use strict";
-
-var event = require("../lib/event");
-
-/**
- * Custom Ace mouse event
- */
-var MouseEvent = exports.MouseEvent = function(domEvent, editor) {
-    this.domEvent = domEvent;
-    this.editor = editor;
-    
-    this.pageX = event.getDocumentX(domEvent);
-    this.pageY = event.getDocumentY(domEvent);
-    
-    this.clientX = domEvent.clientX;
-    this.clientY = domEvent.clientY;
-
-    this.$pos = null;
-    this.$inSelection = null;
-    
-    this.propagationStopped = false;
-    this.defaultPrevented = false;
-};
-
-(function() {  
-    
-    this.stopPropagation = function() {
-        event.stopPropagation(this.domEvent);
-        this.propagationStopped = true;
-    };
-    
-    this.preventDefault = function() {
-        event.preventDefault(this.domEvent);
-        this.defaultPrevented = true;
-    };
-    
-    this.stop = function() {
-        this.stopPropagation();
-        this.preventDefault();
-    };
-
-    /**
-     * Get the document position below the mouse cursor
-     * 
-     * @return {Object} 'row' and 'column' of the document position
-     */
-    this.getDocumentPosition = function() {
-        if (this.$pos)
-            return this.$pos;
-            
-        var pageX = event.getDocumentX(this.domEvent);
-        var pageY = event.getDocumentY(this.domEvent);
-        this.$pos = this.editor.renderer.screenToTextCoordinates(pageX, pageY);
-        return this.$pos;
-    };
-    
-    /**
-     * Check if the mouse cursor is inside of the text selection
-     * 
-     * @return {Boolean} whether the mouse cursor is inside of the selection
-     */
-    this.inSelection = function() {
-        if (this.$inSelection !== null)
-            return this.$inSelection;
-            
-        var editor = this.editor;
-        
-        if (editor.getReadOnly()) {
-            this.$inSelection = false;
-        }
-        else {
-            var selectionRange = editor.getSelectionRange();
-            if (selectionRange.isEmpty())
-                this.$inSelection = false;
-            else {
-                var pos = this.getDocumentPosition();
-                this.$inSelection = selectionRange.contains(pos.row, pos.column);
-            }
-        }
-        return this.$inSelection;
-    };
-    
-    /**
-     * Get the clicked mouse button
-     * 
-     * @return {Number} 0 for left button, 1 for middle button, 2 for right button
-     */
-    this.getButton = function() {
-        return event.getButton(this.domEvent);
-    };
-    
-    /**
-     * @return {Boolean} whether the shift key was pressed when the event was emitted
-     */
-    this.getShiftKey = function() {
-        return this.domEvent.shiftKey;
-    };
-    
-    this.getAccelKey = function() {
-        return this.domEvent.ctrlKey || this.domEvent.metaKey ;
-    };
-    
-}).call(MouseEvent.prototype);
-
-});
-/* vim:ts=4:sts=4:sw=4:
- * ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mouse/fold_handler', ['require', 'exports', 'module' ], function(require, exports, module) {
-"use strict";
-
-function FoldHandler(editor) {
-    
-    editor.on("click", function(e) {
-        var position = e.getDocumentPosition();
-        var session = editor.session;
-        
-        // If the user clicked on a fold, then expand it.
-        var fold = session.getFoldAt(position.row, position.column, 1);
-        if (fold) {
-            if (e.getAccelKey())
-                session.removeFold(fold);
-            else
-                session.expandFold(fold);
-                
-            e.stop();
-        }
-    });
-    
-    editor.on("gutterclick", function(e) {
-        if (e.domEvent.target.className.indexOf("ace_fold-widget") != -1) {
-            var row = e.getDocumentPosition().row;
-            editor.session.onFoldWidgetClick(row, e.domEvent);
-            e.stop();
-        }
-    });
-}
-
-exports.FoldHandler = FoldHandler;
-
-});/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *      Julian Viereck <julian.viereck@gmail.com>
- *      Harutyun Amirjanyan <amirjanyan@gmail.com>
- *
- * 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 ***** */
-
-define('ace/keyboard/keybinding', ['require', 'exports', 'module' , 'ace/lib/keys', 'ace/lib/event', 'ace/commands/default_commands'], function(require, exports, module) {
-"use strict";
-
-var keyUtil  = require("../lib/keys");
-var event = require("../lib/event");
-require("../commands/default_commands");
-
-var KeyBinding = function(editor) {
-    this.$editor = editor;
-    this.$data = { };
-    this.$handlers = [this];
-};
-
-(function() {
-    this.setKeyboardHandler = function(keyboardHandler) {
-        if (this.$handlers[this.$handlers.length - 1] == keyboardHandler)
-            return;
-        this.$data = { };
-        this.$handlers = keyboardHandler ? [this, keyboardHandler] : [this];
-    };
-
-    this.addKeyboardHandler = function(keyboardHandler) {
-        this.removeKeyboardHandler(keyboardHandler);
-        this.$handlers.push(keyboardHandler);
-    };
-
-    this.removeKeyboardHandler = function(keyboardHandler) {
-        var i = this.$handlers.indexOf(keyboardHandler);
-        if (i == -1)
-            return false;
-        this.$handlers.splice(i, 1);
-        return true;
-    };
-
-    this.getKeyboardHandler = function() {
-        return this.$handlers[this.$handlers.length - 1];
-    };
-
-    this.$callKeyboardHandlers = function (hashId, keyString, keyCode, e) {
-        var toExecute;
-        for (var i = this.$handlers.length; i--;) {
-            toExecute = this.$handlers[i].handleKeyboard(
-                this.$data, hashId, keyString, keyCode, e
-            );
-            if (toExecute && toExecute.command)
-                break;
-        }
-
-        if (!toExecute || !toExecute.command)
-            return false;
-
-        var success = false;
-        var commands = this.$editor.commands;
-
-        // allow keyboardHandler to consume keys
-        if (toExecute.command != "null")
-            success = commands.exec(toExecute.command, this.$editor, toExecute.args);
-        else
-            success = true;
-
-        if (success && e)
-            event.stopEvent(e);
-
-        return success;
-    };
-
-    this.handleKeyboard = function(data, hashId, keyString) {
-        return {
-            command: this.$editor.commands.findKeyCommand(hashId, keyString)
-        };
-    };
-
-    this.onCommandKey = function(e, hashId, keyCode) {
-        var keyString = keyUtil.keyCodeToString(keyCode);
-        this.$callKeyboardHandlers(hashId, keyString, keyCode, e);
-    };
-
-    this.onTextInput = function(text, pasted) {
-        var success = false;
-        if (!pasted && text.length == 1)
-            success = this.$callKeyboardHandlers(0, text);
-        if (!success)
-            this.$editor.commands.exec("insertstring", this.$editor, text);
-    };
-
-}).call(KeyBinding.prototype);
-
-exports.KeyBinding = KeyBinding;
-});
-/* vim:ts=4:sts=4:sw=4:
- * ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *      Julian Viereck <julian.viereck@gmail.com>
- *      Mihai Sucan <mihai.sucan@gmail.com>
- *
- * 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 ***** */
-
-define('ace/commands/default_commands', ['require', 'exports', 'module' , 'ace/lib/lang'], function(require, exports, module) {
-"use strict";
-
-var lang = require("../lib/lang");
-
-function bindKey(win, mac) {
-    return {
-        win: win,
-        mac: mac
-    };
-}
-
-exports.commands = [{
-    name: "selectall",
-    bindKey: bindKey("Ctrl-A", "Command-A"),
-    exec: function(editor) { editor.selectAll(); },
-    readOnly: true
-}, {
-    name: "centerselection",
-    bindKey: bindKey(null, "Ctrl-L"),
-    exec: function(editor) { editor.centerSelection(); },
-    readOnly: true
-}, {
-    name: "gotoline",
-    bindKey: bindKey("Ctrl-L", "Command-L"),
-    exec: function(editor) {
-        var line = parseInt(prompt("Enter line number:"), 10);
-        if (!isNaN(line)) {
-            editor.gotoLine(line);
-        }
-    },
-    readOnly: true
-}, {
-    name: "fold",
-    bindKey: bindKey("Alt-L", "Alt-L"),
-    exec: function(editor) { editor.session.toggleFold(false); },
-    readOnly: true
-}, {
-    name: "unfold",
-    bindKey: bindKey("Alt-Shift-L", "Alt-Shift-L"),
-    exec: function(editor) { editor.session.toggleFold(true); },
-    readOnly: true
-}, {
-    name: "foldall",
-    bindKey: bindKey("Alt-0", "Alt-0"),
-    exec: function(editor) { editor.session.foldAll(); },
-    readOnly: true
-}, {
-    name: "unfoldall",
-    bindKey: bindKey("Alt-Shift-0", "Alt-Shift-0"),
-    exec: function(editor) { editor.session.unfold(); },
-    readOnly: true
-}, {
-    name: "findnext",
-    bindKey: bindKey("Ctrl-K", "Command-G"),
-    exec: function(editor) { editor.findNext(); },
-    readOnly: true
-}, {
-    name: "findprevious",
-    bindKey: bindKey("Ctrl-Shift-K", "Command-Shift-G"),
-    exec: function(editor) { editor.findPrevious(); },
-    readOnly: true
-}, {
-    name: "find",
-    bindKey: bindKey("Ctrl-F", "Command-F"),
-    exec: function(editor) {
-        var needle = prompt("Find:", editor.getCopyText());
-        editor.find(needle);
-    },
-    readOnly: true
-}, {
-    name: "overwrite",
-    bindKey: bindKey("Insert", "Insert"),
-    exec: function(editor) { editor.toggleOverwrite(); },
-    readOnly: true
-}, {
-    name: "selecttostart",
-    bindKey: bindKey("Ctrl-Shift-Home|Alt-Shift-Up", "Command-Shift-Up"),
-    exec: function(editor) { editor.getSelection().selectFileStart(); },
-    readOnly: true
-}, {
-    name: "gotostart",
-    bindKey: bindKey("Ctrl-Home|Ctrl-Up", "Command-Home|Command-Up"),
-    exec: function(editor) { editor.navigateFileStart(); },
-    readOnly: true
-}, {
-    name: "selectup",
-    bindKey: bindKey("Shift-Up", "Shift-Up"),
-    exec: function(editor) { editor.getSelection().selectUp(); },
-    multiSelectAction: "forEach",
-    readOnly: true
-}, {
-    name: "golineup",
-    bindKey: bindKey("Up", "Up|Ctrl-P"),
-    exec: function(editor, args) { editor.navigateUp(args.times); },
-    multiSelectAction: "forEach",
-    readOnly: true
-}, {
-    name: "selecttoend",
-    bindKey: bindKey("Ctrl-Shift-End|Alt-Shift-Down", "Command-Shift-Down"),
-    exec: function(editor) { editor.getSelection().selectFileEnd(); },
-    multiSelectAction: "forEach",
-    readOnly: true
-}, {
-    name: "gotoend",
-    bindKey: bindKey("Ctrl-End|Ctrl-Down", "Command-End|Command-Down"),
-    exec: function(editor) { editor.navigateFileEnd(); },
-    multiSelectAction: "forEach",
-    readOnly: true
-}, {
-    name: "selectdown",
-    bindKey: bindKey("Shift-Down", "Shift-Down"),
-    exec: function(editor) { editor.getSelection().selectDown(); },
-    multiSelectAction: "forEach",
-    readOnly: true
-}, {
-    name: "golinedown",
-    bindKey: bindKey("Down", "Down|Ctrl-N"),
-    exec: function(editor, args) { editor.navigateDown(args.times); },
-    multiSelectAction: "forEach",
-    readOnly: true
-}, {
-    name: "selectwordleft",
-    bindKey: bindKey("Ctrl-Shift-Left", "Option-Shift-Left"),
-    exec: function(editor) { editor.getSelection().selectWordLeft(); },
-    multiSelectAction: "forEach",
-    readOnly: true
-}, {
-    name: "gotowordleft",
-    bindKey: bindKey("Ctrl-Left", "Option-Left"),
-    exec: function(editor) { editor.navigateWordLeft(); },
-    multiSelectAction: "forEach",
-    readOnly: true
-}, {
-    name: "selecttolinestart",
-    bindKey: bindKey("Alt-Shift-Left", "Command-Shift-Left"),
-    exec: function(editor) { editor.getSelection().selectLineStart(); },
-    multiSelectAction: "forEach",
-    readOnly: true
-}, {
-    name: "gotolinestart",
-    bindKey: bindKey("Alt-Left|Home", "Command-Left|Home|Ctrl-A"),
-    exec: function(editor) { editor.navigateLineStart(); },
-    multiSelectAction: "forEach",
-    readOnly: true
-}, {
-    name: "selectleft",
-    bindKey: bindKey("Shift-Left", "Shift-Left"),
-    exec: function(editor) { editor.getSelection().selectLeft(); },
-    multiSelectAction: "forEach",
-    readOnly: true
-}, {
-    name: "gotoleft",
-    bindKey: bindKey("Left", "Left|Ctrl-B"),
-    exec: function(editor, args) { editor.navigateLeft(args.times); },
-    multiSelectAction: "forEach",
-    readOnly: true
-}, {
-    name: "selectwordright",
-    bindKey: bindKey("Ctrl-Shift-Right", "Option-Shift-Right"),
-    exec: function(editor) { editor.getSelection().selectWordRight(); },
-    multiSelectAction: "forEach",
-    readOnly: true
-}, {
-    name: "gotowordright",
-    bindKey: bindKey("Ctrl-Right", "Option-Right"),
-    exec: function(editor) { editor.navigateWordRight(); },
-    multiSelectAction: "forEach",
-    readOnly: true
-}, {
-    name: "selecttolineend",
-    bindKey: bindKey("Alt-Shift-Right", "Command-Shift-Right"),
-    exec: function(editor) { editor.getSelection().selectLineEnd(); },
-    multiSelectAction: "forEach",
-    readOnly: true
-}, {
-    name: "gotolineend",
-    bindKey: bindKey("Alt-Right|End", "Command-Right|End|Ctrl-E"),
-    exec: function(editor) { editor.navigateLineEnd(); },
-    multiSelectAction: "forEach",
-    readOnly: true
-}, {
-    name: "selectright",
-    bindKey: bindKey("Shift-Right", "Shift-Right"),
-    exec: function(editor) { editor.getSelection().selectRight(); },
-    multiSelectAction: "forEach",
-    readOnly: true
-}, {
-    name: "gotoright",
-    bindKey: bindKey("Right", "Right|Ctrl-F"),
-    exec: function(editor, args) { editor.navigateRight(args.times); },
-    multiSelectAction: "forEach",
-    readOnly: true
-}, {
-    name: "selectpagedown",
-    bindKey: bindKey("Shift-PageDown", "Shift-PageDown"),
-    exec: function(editor) { editor.selectPageDown(); },
-    readOnly: true
-}, {
-    name: "pagedown",
-    bindKey: bindKey(null, "PageDown"),
-    exec: function(editor) { editor.scrollPageDown(); },
-    readOnly: true
-}, {
-    name: "gotopagedown",
-    bindKey: bindKey("PageDown", "Option-PageDown|Ctrl-V"),
-    exec: function(editor) { editor.gotoPageDown(); },
-    readOnly: true
-}, {
-    name: "selectpageup",
-    bindKey: bindKey("Shift-PageUp", "Shift-PageUp"),
-    exec: function(editor) { editor.selectPageUp(); },
-    readOnly: true
-}, {
-    name: "pageup",
-    bindKey: bindKey(null, "PageUp"),
-    exec: function(editor) { editor.scrollPageUp(); },
-    readOnly: true
-}, {
-    name: "gotopageup",
-    bindKey: bindKey("PageUp", "Option-PageUp"),
-    exec: function(editor) { editor.gotoPageUp(); },
-    readOnly: true
-}, {
-    name: "selectlinestart",
-    bindKey: bindKey("Shift-Home", "Shift-Home"),
-    exec: function(editor) { editor.getSelection().selectLineStart(); },
-    multiSelectAction: "forEach",
-    readOnly: true
-}, {
-    name: "selectlineend",
-    bindKey: bindKey("Shift-End", "Shift-End"),
-    exec: function(editor) { editor.getSelection().selectLineEnd(); },
-    multiSelectAction: "forEach",
-    readOnly: true
-}, {
-    name: "togglerecording",
-    bindKey: bindKey("Ctrl-Alt-E", "Command-Option-E"),
-    exec: function(editor) { editor.commands.toggleRecording(); },
-    readOnly: true
-}, {
-    name: "replaymacro",
-    bindKey: bindKey("Ctrl-Shift-E", "Command-Shift-E"),
-    exec: function(editor) { editor.commands.replay(editor); },
-    readOnly: true
-}, {
-    name: "jumptomatching",
-    bindKey: bindKey("Ctrl-Shift-P", "Ctrl-Shift-P"),
-    exec: function(editor) { editor.jumpToMatching(); },
-    multiSelectAction: "forEach",
-    readOnly: true
-}, 
-
-// commands disabled in readOnly mode
-{
-    name: "cut",
-    exec: function(editor) {
-        var range = editor.getSelectionRange();
-        editor._emit("cut", range);
-
-        if (!editor.selection.isEmpty()) {
-            editor.session.remove(range);
-            editor.clearSelection();
-        }
-    },
-    multiSelectAction: "forEach"
-}, {
-    name: "removeline",
-    bindKey: bindKey("Ctrl-D", "Command-D"),
-    exec: function(editor) { editor.removeLines(); },
-    multiSelectAction: "forEach"
-}, {
-    name: "togglecomment",
-    bindKey: bindKey("Ctrl-7", "Command-7"),
-    exec: function(editor) { editor.toggleCommentLines(); },
-    multiSelectAction: "forEach"
-}, {
-    name: "replace",
-    bindKey: bindKey("Ctrl-R", "Command-Option-F"),
-    exec: function(editor) {
-        var needle = prompt("Find:", editor.getCopyText());
-        if (!needle)
-            return;
-        var replacement = prompt("Replacement:");
-        if (!replacement)
-            return;
-        editor.replace(replacement, {needle: needle});
-    }
-}, {
-    name: "replaceall",
-    bindKey: bindKey("Ctrl-Shift-R", "Command-Shift-Option-F"),
-    exec: function(editor) {
-        var needle = prompt("Find:");
-        if (!needle)
-            return;
-        var replacement = prompt("Replacement:");
-        if (!replacement)
-            return;
-        editor.replaceAll(replacement, {needle: needle});
-    }
-}, {
-    name: "undo",
-    bindKey: bindKey("Ctrl-Z", "Command-Z"),
-    exec: function(editor) { editor.undo(); }
-}, {
-    name: "redo",
-    bindKey: bindKey("Ctrl-Shift-Z|Ctrl-Y", "Command-Shift-Z|Command-Y"),
-    exec: function(editor) { editor.redo(); }
-}, {
-    name: "copylinesup",
-    bindKey: bindKey("Ctrl-Alt-Up", "Command-Option-Up"),
-    exec: function(editor) { editor.copyLinesUp(); }
-}, {
-    name: "movelinesup",
-    bindKey: bindKey("Alt-Up", "Option-Up"),
-    exec: function(editor) { editor.moveLinesUp(); }
-}, {
-    name: "copylinesdown",
-    bindKey: bindKey("Ctrl-Alt-Down", "Command-Option-Down"),
-    exec: function(editor) { editor.copyLinesDown(); }
-}, {
-    name: "movelinesdown",
-    bindKey: bindKey("Alt-Down", "Option-Down"),
-    exec: function(editor) { editor.moveLinesDown(); }
-}, {
-    name: "del",
-    bindKey: bindKey("Delete", "Delete|Ctrl-D"),
-    exec: function(editor) { editor.remove("right"); },
-    multiSelectAction: "forEach"
-}, {
-    name: "backspace",
-    bindKey: bindKey(
-        "Command-Backspace|Option-Backspace|Shift-Backspace|Backspace",
-        "Ctrl-Backspace|Command-Backspace|Shift-Backspace|Backspace|Ctrl-H"
-    ),
-    exec: function(editor) { editor.remove("left"); },
-    multiSelectAction: "forEach"
-}, {
-    name: "removetolinestart",
-    bindKey: bindKey("Alt-Backspace", "Command-Backspace"),
-    exec: function(editor) { editor.removeToLineStart(); },
-    multiSelectAction: "forEach"
-}, {
-    name: "removetolineend",
-    bindKey: bindKey("Alt-Delete", "Ctrl-K"),
-    exec: function(editor) { editor.removeToLineEnd(); },
-    multiSelectAction: "forEach"
-}, {
-    name: "removewordleft",
-    bindKey: bindKey("Ctrl-Backspace", "Alt-Backspace|Ctrl-Alt-Backspace"),
-    exec: function(editor) { editor.removeWordLeft(); },
-    multiSelectAction: "forEach"
-}, {
-    name: "removewordright",
-    bindKey: bindKey("Ctrl-Delete", "Alt-Delete"),
-    exec: function(editor) { editor.removeWordRight(); },
-    multiSelectAction: "forEach"
-}, {
-    name: "outdent",
-    bindKey: bindKey("Shift-Tab", "Shift-Tab"),
-    exec: function(editor) { editor.blockOutdent(); },
-    multiSelectAction: "forEach"
-}, {
-    name: "indent",
-    bindKey: bindKey("Tab", "Tab"),
-    exec: function(editor) { editor.indent(); },
-    multiSelectAction: "forEach"
-}, {
-    name: "insertstring",
-    exec: function(editor, str) { editor.insert(str); },
-    multiSelectAction: "forEach"
-}, {
-    name: "inserttext",
-    exec: function(editor, args) {
-        editor.insert(lang.stringRepeat(args.text  || "", args.times || 1));
-    },
-    multiSelectAction: "forEach"
-}, {
-    name: "splitline",
-    bindKey: bindKey(null, "Ctrl-O"),
-    exec: function(editor) { editor.splitLine(); },
-    multiSelectAction: "forEach"
-}, {
-    name: "transposeletters",
-    bindKey: bindKey("Ctrl-T", "Ctrl-T"),
-    exec: function(editor) { editor.transposeLetters(); },
-    multiSelectAction: function(editor) {editor.transposeSelections(1); }
-}, {
-    name: "touppercase",
-    bindKey: bindKey("Ctrl-U", "Ctrl-U"),
-    exec: function(editor) { editor.toUpperCase(); },
-    multiSelectAction: "forEach"
-}, {
-    name: "tolowercase",
-    bindKey: bindKey("Ctrl-Shift-U", "Ctrl-Shift-U"),
-    exec: function(editor) { editor.toLowerCase(); },
-    multiSelectAction: "forEach"
-}];
-
-});
-/* vim:ts=4:sts=4:sw=4:
- * ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *      Mihai Sucan <mihai DOT sucan AT gmail DOT com>
- *      Julian Viereck <julian DOT viereck AT gmail DOT com>
- *
- * 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 ***** */
-
-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(require, exports, module) {
-"use strict";
-
-var config = require("./config");
-var oop = require("./lib/oop");
-var lang = require("./lib/lang");
-var net = require("./lib/net");
-var EventEmitter = require("./lib/event_emitter").EventEmitter;
-var Selection = require("./selection").Selection;
-var TextMode = require("./mode/text").Mode;
-var Range = require("./range").Range;
-var Document = require("./document").Document;
-var BackgroundTokenizer = require("./background_tokenizer").BackgroundTokenizer;
-
-var EditSession = function(text, mode) {
-    this.$modified = true;
-    this.$breakpoints = [];
-    this.$frontMarkers = {};
-    this.$backMarkers = {};
-    this.$markerId = 1;
-    this.$rowCache = [];
-    this.$wrapData = [];
-    this.$foldData = [];
-    this.$undoSelect = true;
-    this.$foldData.toString = function() {
-        var str = "";
-        this.forEach(function(foldLine) {
-            str += "\n" + foldLine.toString();
-        });
-        return str;
-    }
-
-    if (text instanceof Document) {
-        this.setDocument(text);
-    } else {
-        this.setDocument(new Document(text));
-    }
-
-    this.selection = new Selection(this);
-    if (mode)
-        this.setMode(mode);
-    else
-        this.setMode(new TextMode());
-};
-
-
-(function() {
-
-    oop.implement(this, EventEmitter);
-
-    this.setDocument = function(doc) {
-        if (this.doc)
-            throw new Error("Document is already set");
-
-        this.doc = doc;
-        doc.on("change", this.onChange.bind(this));
-        this.on("changeFold", this.onChangeFold.bind(this));
-
-        if (this.bgTokenizer) {
-            this.bgTokenizer.setDocument(this.getDocument());
-            this.bgTokenizer.start(0);
-        }
-    };
-
-    this.getDocument = function() {
-        return this.doc;
-    };
-
-    this.$resetRowCache = function(row) {
-        if (row == 0) {
-            this.$rowCache = [];
-            return;
-        }
-        var rowCache = this.$rowCache;
-        for (var i = 0; i < rowCache.length; i++) {
-            if (rowCache[i].docRow >= row) {
-                rowCache.splice(i, rowCache.length);
-                return;
-            }
-        }
-    };
-
-    this.onChangeFold = function(e) {
-        var fold = e.data;
-        this.$resetRowCache(fold.start.row);
-    };
-
-    this.onChange = function(e) {
-        var delta = e.data;
-        this.$modified = true;
-
-        this.$resetRowCache(delta.range.start.row);
-
-        var removedFolds = this.$updateInternalDataOnChange(e);
-        if (!this.$fromUndo && this.$undoManager && !delta.ignore) {
-            this.$deltasDoc.push(delta);
-            if (removedFolds && removedFolds.length != 0) {
-                this.$deltasFold.push({
-                    action: "removeFolds",
-                    folds:  removedFolds
-                });
-            }
-
-            this.$informUndoManager.schedule();
-        }
-
-        this.bgTokenizer.start(delta.range.start.row);
-        this._emit("change", e);
-    };
-
-    this.setValue = function(text) {
-        this.doc.setValue(text);
-        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(row) {
-        return this.bgTokenizer.getState(row);
-    };
-
-    this.getTokens = function(firstRow, lastRow) {
-        return this.bgTokenizer.getTokens(firstRow, lastRow);
-    };
-
-    this.getTokenAt = function(row, column) {
-        var tokens = this.bgTokenizer.getTokens(row, row)[0].tokens;
-        var token, c = 0;
-        if (column == null) {
-            i = tokens.length - 1;
-            c = this.getLine(row).length;
-        } else {
-            for (var i = 0; i < tokens.length; i++) {
-                c += tokens[i].value.length;
-                if (c >= column)
-                    break;
-            }
-        }
-        token = tokens[i];
-        if (!token)
-            return null;
-        token.index = i;
-        token.start = c - token.value.length;
-        return token;
-    };
-
-    this.setUndoManager = function(undoManager) {
-        this.$undoManager = undoManager;
-        this.$resetRowCache(0);
-        this.$deltas = [];
-        this.$deltasDoc = [];
-        this.$deltasFold = [];
-
-        if (this.$informUndoManager)
-            this.$informUndoManager.cancel();
-
-        if (undoManager) {
-            var self = this;
-            this.$syncInformUndoManager = function() {
-                self.$informUndoManager.cancel();
-
-                if (self.$deltasFold.length) {
-                    self.$deltas.push({
-                        group: "fold",
-                        deltas: self.$deltasFold
-                    });
-                    self.$deltasFold = [];
-                }
-
-                if (self.$deltasDoc.length) {
-                    self.$deltas.push({
-                        group: "doc",
-                        deltas: self.$deltasDoc
-                    });
-                    self.$deltasDoc = [];
-                }
-
-                if (self.$deltas.length > 0) {
-                    undoManager.execute({
-                        action: "aceupdate",
-                        args: [self.$deltas, self]
-                    });
-                }
-
-                self.$deltas = [];
-            }
-            this.$informUndoManager =
-                lang.deferredCall(this.$syncInformUndoManager);
-        }
-    };
-
-    this.$defaultUndoManager = {
-        undo: function() {},
-        redo: function() {},
-        reset: function() {}
-    };
-
-    this.getUndoManager = function() {
-        return this.$undoManager || this.$defaultUndoManager;
-    },
-
-    this.getTabString = function() {
-        if (this.getUseSoftTabs()) {
-            return lang.stringRepeat(" ", this.getTabSize());
-        } else {
-            return "\t";
-        }
-    };
-
-    this.$useSoftTabs = true;
-    this.setUseSoftTabs = function(useSoftTabs) {
-        if (this.$useSoftTabs === useSoftTabs) return;
-
-        this.$useSoftTabs = useSoftTabs;
-    };
-
-    this.getUseSoftTabs = function() {
-        return this.$useSoftTabs;
-    };
-
-    this.$tabSize = 4;
-    this.setTabSize = function(tabSize) {
-        if (isNaN(tabSize) || this.$tabSize === tabSize) return;
-
-        this.$modified = true;
-        this.$tabSize = tabSize;
-        this._emit("changeTabSize");
-    };
-
-    this.getTabSize = function() {
-        return this.$tabSize;
-    };
-
-    this.isTabStop = function(position) {
-        return this.$useSoftTabs && (position.column % this.$tabSize == 0);
-    };
-
-    this.$overwrite = false;
-    this.setOverwrite = function(overwrite) {
-        if (this.$overwrite == overwrite) return;
-
-        this.$overwrite = overwrite;
-        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(rows) {
-        this.$breakpoints = [];
-        for (var i=0; i<rows.length; i++) {
-            this.$breakpoints[rows[i]] = true;
-        }
-        this._emit("changeBreakpoint", {});
-    };
-
-    this.clearBreakpoints = function() {
-        this.$breakpoints = [];
-        this._emit("changeBreakpoint", {});
-    };
-
-    this.setBreakpoint = function(row) {
-        this.$breakpoints[row] = true;
-        this._emit("changeBreakpoint", {});
-    };
-
-    this.clearBreakpoint = function(row) {
-        delete this.$breakpoints[row];
-        this._emit("changeBreakpoint", {});
-    };
-
-    this.getBreakpoints = function() {
-        return this.$breakpoints;
-    };
-
-    this.addMarker = function(range, clazz, type, inFront) {
-        var id = this.$markerId++;
-
-        var marker = {
-            range : range,
-            type : type || "line",
-            renderer: typeof type == "function" ? type : null,
-            clazz : clazz,
-            inFront: !!inFront
-        }
-
-        if (inFront) {
-            this.$frontMarkers[id] = marker;
-            this._emit("changeFrontMarker")
-        } else {
-            this.$backMarkers[id] = marker;
-            this._emit("changeBackMarker")
-        }
-
-        return id;
-    };
-
-    this.removeMarker = function(markerId) {
-        var marker = this.$frontMarkers[markerId] || this.$backMarkers[markerId];
-        if (!marker)
-            return;
-
-        var markers = marker.inFront ? this.$frontMarkers : this.$backMarkers;
-        if (marker) {
-            delete (markers[markerId]);
-            this._emit(marker.inFront ? "changeFrontMarker" : "changeBackMarker");
-        }
-    };
-
-    this.getMarkers = function(inFront) {
-        return inFront ? this.$frontMarkers : this.$backMarkers;
-    };
-
-    /**
-     * Error:
-     *  {
-     *    row: 12,
-     *    column: 2, //can be undefined
-     *    text: "Missing argument",
-     *    type: "error" // or "warning" or "info"
-     *  }
-     */
-    this.setAnnotations = function(annotations) {
-        this.$annotations = {};
-        for (var i=0; i<annotations.length; i++) {
-            var annotation = annotations[i];
-            var row = annotation.row;
-            if (this.$annotations[row])
-                this.$annotations[row].push(annotation);
-            else
-                this.$annotations[row] = [annotation];
-        }
-        this._emit("changeAnnotation", {});
-    };
-
-    this.getAnnotations = function() {
-        return this.$annotations || {};
-    };
-
-    this.clearAnnotations = function() {
-        this.$annotations = {};
-        this._emit("changeAnnotation", {});
-    };
-
-    this.$detectNewLine = function(text) {
-        var match = text.match(/^.*?(\r?\n)/m);
-        if (match) {
-            this.$autoNewLine = match[1];
-        } else {
-            this.$autoNewLine = "\n";
-        }
-    };
-
-    this.getWordRange = function(row, column) {
-        var line = this.getLine(row);
-
-        var inToken = false;
-        if (column > 0) {
-            inToken = !!line.charAt(column - 1).match(this.tokenRe);
-        }
-
-        if (!inToken) {
-            inToken = !!line.charAt(column).match(this.tokenRe);
-        }
-
-        var re = inToken ? this.tokenRe : this.nonTokenRe;
-
-        var start = column;
-        if (start > 0) {
-            do {
-                start--;
-            }
-            while (start >= 0 && line.charAt(start).match(re));
-            start++;
-        }
-
-        var end = column;
-        while (end < line.length && line.charAt(end).match(re)) {
-            end++;
-        }
-
-        return new Range(row, start, row, end);
-    };
-
-    // Gets the range of a word including its right whitespace
-    this.getAWordRange = function(row, column) {
-        var wordRange = this.getWordRange(row, column);
-        var line = this.getLine(wordRange.end.row);
-
-        while (line.charAt(wordRange.end.column).match(/[ \t]/)) {
-            wordRange.end.column += 1;
-        }
-        return wordRange;
-    };
-
-    this.setNewLineMode = function(newLineMode) {
-        this.doc.setNewLineMode(newLineMode);
-    };
-
-    this.getNewLineMode = function() {
-        return this.doc.getNewLineMode();
-    };
-
-    this.$useWorker = true;
-    this.setUseWorker = function(useWorker) {
-        if (this.$useWorker == useWorker)
-            return;
-
-        this.$useWorker = useWorker;
-
-        this.$stopWorker();
-        if (useWorker)
-            this.$startWorker();
-    };
-
-    this.getUseWorker = function() {
-        return this.$useWorker;
-    };
-
-    this.onReloadTokenizer = function(e) {
-        var rows = e.data;
-        this.bgTokenizer.start(rows.first);
-        this._emit("tokenizerUpdate", e);
-    };
-
-    this.$modes = {};
-    this._loadMode = function(mode, callback) {
-        if (this.$modes[mode])
-            return callback(this.$modes[mode]);
-        
-        var _self = this;
-        var module;
-        try {
-            module = require(mode);
-        } catch (e) {};
-        if (module)
-            return done(module);
-            
-        fetch(function() {
-            require([mode], done);
-        });
-        
-        function done(module) {
-            if (_self.$modes[mode])
-                return callback(_self.$modes[mode]);
-            
-            _self.$modes[mode] = new module.Mode();
-            _self._emit("loadmode", {
-                name: mode,
-                mode: _self.$modes[mode]
-            });
-            callback(_self.$modes[mode]);
-        }
-
-        function fetch(callback) {
-            if (!config.get("packaged"))
-                return callback();
-                
-            var base = mode.split("/").pop();
-            var filename = config.get("modePath") + "/mode-" + base + config.get("suffix");
-            net.loadScript(filename, callback);
-        }
-    };
-
-    this.$mode = null;
-    this.$origMode = null;
-    this.setMode = function(mode) {
-        this.$origMode = mode;
-        
-        // load on demand
-        if (typeof mode === "string") {
-            var _self = this;
-            this._loadMode(mode, function(module) {
-                if (_self.$origMode !== mode)
-                    return;
-            
-                _self.setMode(module);
-            });
-            return;
-        }
-        
-        if (this.$mode === mode) return;
-        this.$mode = mode;
-        
-
-        this.$stopWorker();
-
-        if (this.$useWorker)
-            this.$startWorker();
-
-        var tokenizer = mode.getTokenizer();
-
-        if(tokenizer.addEventListener !== undefined) {
-            var onReloadTokenizer = this.onReloadTokenizer.bind(this);
-            tokenizer.addEventListener("update", onReloadTokenizer);
-        }
-
-        if (!this.bgTokenizer) {
-            this.bgTokenizer = new BackgroundTokenizer(tokenizer);
-            var _self = this;
-            this.bgTokenizer.addEventListener("update", function(e) {
-                _self._emit("tokenizerUpdate", e);
-            });
-        } else {
-            this.bgTokenizer.setTokenizer(tokenizer);
-        }
-
-        this.bgTokenizer.setDocument(this.getDocument());
-        this.bgTokenizer.start(0);
-
-        this.tokenRe = mode.tokenRe;
-        this.nonTokenRe = mode.nonTokenRe;
-
-        this.$setFolding(mode.foldingRules);
-
-        this._emit("changeMode");
-    };
-
-    this.$stopWorker = function() {
-        if (this.$worker)
-            this.$worker.terminate();
-
-        this.$worker = null;
-    };
-
-    this.$startWorker = function() {
-        if (typeof Worker !== "undefined" && !require.noWorker) {
-            try {
-                this.$worker = this.$mode.createWorker(this);
-            } catch (e) {
-                console.log("Could not load worker");
-                console.log(e);
-                this.$worker = null;
-            }
-        }
-        else
-            this.$worker = null;
-    };
-
-    this.getMode = function() {
-        return this.$mode;
-    };
-    
-    this.$scrollTop = 0;
-    this.setScrollTop = function(scrollTop) {
-        scrollTop = Math.round(Math.max(0, scrollTop));
-        if (this.$scrollTop === scrollTop)
-            return;
-
-        this.$scrollTop = scrollTop;
-        this._emit("changeScrollTop", scrollTop);
-    };
-
-    this.getScrollTop = function() {
-        return this.$scrollTop;
-    };
-    
-    this.$scrollLeft = 0;
-    this.setScrollLeft = function(scrollLeft) {
-        scrollLeft = Math.round(Math.max(0, scrollLeft));
-        if (this.$scrollLeft === scrollLeft)
-            return;
-
-        this.$scrollLeft = scrollLeft;
-        this._emit("changeScrollLeft", scrollLeft);
-    };
-
-    this.getScrollLeft = function() {
-        return this.$scrollLeft;
-    };
-
-    this.getWidth = function() {
-        this.$computeWidth();
-        return this.width;
-    };
-
-    this.getScreenWidth = function() {
-        this.$computeWidth();
-        return this.screenWidth;
-    };
-
-    this.$computeWidth = function(force) {
-        if (this.$modified || force) {
-            this.$modified = false;
-
-            var lines = this.doc.getAllLines();
-            var longestLine = 0;
-            var longestScreenLine = 0;
-
-            for ( var i = 0; i < lines.length; i++) {
-                var foldLine = this.getFoldLine(i),
-                    line, len;
-
-                line = lines[i];
-                if (foldLine) {
-                    var end = foldLine.range.end;
-                    line = this.getFoldDisplayLine(foldLine);
-                    // Continue after the foldLine.end.row. All the lines in
-                    // between are folded.
-                    i = end.row;
-                }
-                len = line.length;
-                longestLine = Math.max(longestLine, len);
-                if (!this.$useWrapMode) {
-                    longestScreenLine = Math.max(
-                        longestScreenLine,
-                        this.$getStringScreenWidth(line)[0]
-                    );
-                }
-            }
-            this.width = longestLine;
-
-            if (this.$useWrapMode) {
-                this.screenWidth = this.$wrapLimit;
-            } else {
-                this.screenWidth = longestScreenLine;
-            }
-        }
-    };
-
-    /**
-     * Get a verbatim copy of the given line as it is in the document
-     */
-    this.getLine = function(row) {
-        return this.doc.getLine(row);
-    };
-
-    this.getLines = function(firstRow, lastRow) {
-        return this.doc.getLines(firstRow, lastRow);
-    };
-
-    this.getLength = function() {
-        return this.doc.getLength();
-    };
-
-    this.getTextRange = function(range) {
-        return this.doc.getTextRange(range);
-    };
-
-    this.insert = function(position, text) {
-        return this.doc.insert(position, text);
-    };
-
-    this.remove = function(range) {
-        return this.doc.remove(range);
-    };
-
-    this.undoChanges = function(deltas, dontSelect) {
-        if (!deltas.length)
-            return;
-
-        this.$fromUndo = true;
-        var lastUndoRange = null;
-        for (var i = deltas.length - 1; i != -1; i--) {
-            var delta = deltas[i];
-            if (delta.group == "doc") {
-                this.doc.revertDeltas(delta.deltas);
-                lastUndoRange =
-                    this.$getUndoSelection(delta.deltas, true, lastUndoRange);
-            } else {
-                delta.deltas.forEach(function(foldDelta) {
-                    this.addFolds(foldDelta.folds);
-                }, this);
-            }
-        }
-        this.$fromUndo = false;
-        lastUndoRange &&
-            this.$undoSelect &&
-            !dontSelect &&
-            this.selection.setSelectionRange(lastUndoRange);
-        return lastUndoRange;
-    };
-
-    this.redoChanges = function(deltas, dontSelect) {
-        if (!deltas.length)
-            return;
-
-        this.$fromUndo = true;
-        var lastUndoRange = null;
-        for (var i = 0; i < deltas.length; i++) {
-            var delta = deltas[i];
-            if (delta.group == "doc") {
-                this.doc.applyDeltas(delta.deltas);
-                lastUndoRange =
-                    this.$getUndoSelection(delta.deltas, false, lastUndoRange);
-            }
-        }
-        this.$fromUndo = false;
-        lastUndoRange &&
-            this.$undoSelect &&
-            !dontSelect &&
-            this.selection.setSelectionRange(lastUndoRange);
-        return lastUndoRange;
-    };
-    
-    this.setUndoSelect = function(enable) {
-        this.$undoSelect = enable;
-    };
-
-    this.$getUndoSelection = function(deltas, isUndo, lastUndoRange) {
-        function isInsert(delta) {
-            var insert =
-                delta.action == "insertText" || delta.action == "insertLines";
-            return isUndo ? !insert : insert;
-        }
-
-        var delta = deltas[0];
-        var range, point;
-        var lastDeltaIsInsert = false;
-        if (isInsert(delta)) {
-            range = delta.range.clone();
-            lastDeltaIsInsert = true;
-        } else {
-            range = Range.fromPoints(delta.range.start, delta.range.start);
-            lastDeltaIsInsert = false;
-        }
-
-        for (var i = 1; i < deltas.length; i++) {
-            delta = deltas[i];
-            if (isInsert(delta)) {
-                point = delta.range.start;
-                if (range.compare(point.row, point.column) == -1) {
-                    range.setStart(delta.range.start);
-                }
-                point = delta.range.end;
-                if (range.compare(point.row, point.column) == 1) {
-                    range.setEnd(delta.range.end);
-                }
-                lastDeltaIsInsert = true;
-            } else {
-                point = delta.range.start;
-                if (range.compare(point.row, point.column) == -1) {
-                    range =
-                        Range.fromPoints(delta.range.start, delta.range.start);
-                }
-                lastDeltaIsInsert = false;
-            }
-        }
-
-        // Check if this range and the last undo range has something in common.
-        // If true, merge the ranges.
-        if (lastUndoRange != null) {
-            var cmp = lastUndoRange.compareRange(range);
-            if (cmp == 1) {
-                range.setStart(lastUndoRange.start);
-            } else if (cmp == -1) {
-                range.setEnd(lastUndoRange.end);
-            }
-        }
-
-        return range;
-    },
-
-    this.replace = function(range, text) {
-        return this.doc.replace(range, text);
-    };
-
-    /**
-     * Move a range of text from the given range to the given position.
-     *
-     * @param fromRange {Range} The range of text you want moved within the
-     * document.
-     * @param toPosition {Object} The location (row and column) where you want
-     * to move the text to.
-     * @return {Range} The new range where the text was moved to.
-     */
-    this.moveText = function(fromRange, toPosition) {
-        var text = this.getTextRange(fromRange);
-        this.remove(fromRange);
-
-        var toRow = toPosition.row;
-        var toColumn = toPosition.column;
-
-        // Make sure to update the insert location, when text is removed in
-        // front of the chosen point of insertion.
-        if (!fromRange.isMultiLine() && fromRange.start.row == toRow &&
-            fromRange.end.column < toColumn)
-            toColumn -= text.length;
-
-        if (fromRange.isMultiLine() && fromRange.end.row < toRow) {
-            var lines = this.doc.$split(text);
-            toRow -= lines.length - 1;
-        }
-
-        var endRow = toRow + fromRange.end.row - fromRange.start.row;
-        var endColumn = fromRange.isMultiLine() ?
-                        fromRange.end.column :
-                        toColumn + fromRange.end.column - fromRange.start.column;
-
-        var toRange = new Range(toRow, toColumn, endRow, endColumn);
-
-        this.insert(toRange.start, text);
-
-        return toRange;
-    };
-
-    this.indentRows = function(startRow, endRow, indentString) {
-        indentString = indentString.replace(/\t/g, this.getTabString());
-        for (var row=startRow; row<=endRow; row++)
-            this.insert({row: row, column:0}, indentString);
-    };
-
-    this.outdentRows = function (range) {
-        var rowRange = range.collapseRows();
-        var deleteRange = new Range(0, 0, 0, 0);
-        var size = this.getTabSize();
-
-        for (var i = rowRange.start.row; i <= rowRange.end.row; ++i) {
-            var line = this.getLine(i);
-
-            deleteRange.start.row = i;
-            deleteRange.end.row = i;
-            for (var j = 0; j < size; ++j)
-                if (line.charAt(j) != ' ')
-                    break;
-            if (j < size && line.charAt(j) == '\t') {
-                deleteRange.start.column = j;
-                deleteRange.end.column = j + 1;
-            } else {
-                deleteRange.start.column = 0;
-                deleteRange.end.column = j;
-            }
-            this.remove(deleteRange);
-        }
-    };
-
-    this.moveLinesUp = function(firstRow, lastRow) {
-        if (firstRow <= 0) return 0;
-
-        var removed = this.doc.removeLines(firstRow, lastRow);
-        this.doc.insertLines(firstRow - 1, removed);
-        return -1;
-    };
-
-    this.moveLinesDown = function(firstRow, lastRow) {
-        if (lastRow >= this.doc.getLength()-1) return 0;
-
-        var removed = this.doc.removeLines(firstRow, lastRow);
-        this.doc.insertLines(firstRow+1, removed);
-        return 1;
-    };
-
-    this.duplicateLines = function(firstRow, lastRow) {
-        var firstRow = this.$clipRowToDocument(firstRow);
-        var lastRow = this.$clipRowToDocument(lastRow);
-
-        var lines = this.getLines(firstRow, lastRow);
-        this.doc.insertLines(firstRow, lines);
-
-        var addedRows = lastRow - firstRow + 1;
-        return addedRows;
-    };
-
-    this.$clipRowToDocument = function(row) {
-        return Math.max(0, Math.min(row, this.doc.getLength()-1));
-    };
-
-    this.$clipColumnToRow = function(row, column) {
-        if (column < 0)
-            return 0;
-        return Math.min(this.doc.getLine(row).length, column);
-    };
-
-    this.$clipPositionToDocument = function(row, column) {
-        column = Math.max(0, column);
-
-        if (row < 0) {
-            row = 0;
-            column = 0;
-        } else {
-            var len = this.doc.getLength();
-            if (row >= len) {
-                row = len - 1;
-                column = this.doc.getLine(len-1).length;
-            } else {
-                column = Math.min(this.doc.getLine(row).length, column);
-            }
-        }
-
-        return {
-            row: row,
-            column: column
-        };
-    };
-
-    this.$clipRangeToDocument = function(range) {
-        if (range.start.row < 0) {
-            range.start.row = 0;
-            range.start.column = 0
-        } else {
-            range.start.column = this.$clipColumnToRow(
-                range.start.row,
-                range.start.column
-            );
-        }
-        
-        var len = this.doc.getLength() - 1;
-        if (range.end.row > len) {
-            range.end.row = len;
-            range.end.column = this.doc.getLine(len).length;
-        } else {
-            range.end.column = this.$clipColumnToRow(
-                range.end.row,
-                range.end.column
-            );
-        }
-        return range;
-    };
-
-    // WRAPMODE
-    this.$wrapLimit = 80;
-    this.$useWrapMode = false;
-    this.$wrapLimitRange = {
-        min : null,
-        max : null
-    };
-
-    this.setUseWrapMode = function(useWrapMode) {
-        if (useWrapMode != this.$useWrapMode) {
-            this.$useWrapMode = useWrapMode;
-            this.$modified = true;
-            this.$resetRowCache(0);
-
-            // If wrapMode is activaed, the wrapData array has to be initialized.
-            if (useWrapMode) {
-                var len = this.getLength();
-                this.$wrapData = [];
-                for (var i = 0; i < len; i++) {
-                    this.$wrapData.push([]);
-                }
-                this.$updateWrapData(0, len - 1);
-            }
-
-            this._emit("changeWrapMode");
-        }
-    };
-
-    this.getUseWrapMode = function() {
-        return this.$useWrapMode;
-    };
-
-    // Allow the wrap limit to move freely between min and max. Either
-    // parameter can be null to allow the wrap limit to be unconstrained
-    // in that direction. Or set both parameters to the same number to pin
-    // the limit to that value.
-    this.setWrapLimitRange = function(min, max) {
-        if (this.$wrapLimitRange.min !== min || this.$wrapLimitRange.max !== max) {
-            this.$wrapLimitRange.min = min;
-            this.$wrapLimitRange.max = max;
-            this.$modified = true;
-            // This will force a recalculation of the wrap limit
-            this._emit("changeWrapMode");
-        }
-    };
-
-    // This should generally only be called by the renderer when a resize
-    // is detected.
-    this.adjustWrapLimit = function(desiredLimit) {
-        var wrapLimit = this.$constrainWrapLimit(desiredLimit);
-        if (wrapLimit != this.$wrapLimit && wrapLimit > 0) {
-            this.$wrapLimit = wrapLimit;
-            this.$modified = true;
-            if (this.$useWrapMode) {
-                this.$updateWrapData(0, this.getLength() - 1);
-                this.$resetRowCache(0)
-                this._emit("changeWrapLimit");
-            }
-            return true;
-        }
-        return false;
-    };
-
-    this.$constrainWrapLimit = function(wrapLimit) {
-        var min = this.$wrapLimitRange.min;
-        if (min)
-            wrapLimit = Math.max(min, wrapLimit);
-
-        var max = this.$wrapLimitRange.max;
-        if (max)
-            wrapLimit = Math.min(max, wrapLimit);
-
-        // What would a limit of 0 even mean?
-        return Math.max(1, wrapLimit);
-    };
-
-    this.getWrapLimit = function() {
-        return this.$wrapLimit;
-    };
-
-    this.getWrapLimitRange = function() {
-        // Avoid unexpected mutation by returning a copy
-        return {
-            min : this.$wrapLimitRange.min,
-            max : this.$wrapLimitRange.max
-        };
-    };
-
-    this.$updateInternalDataOnChange = function(e) {
-        var useWrapMode = this.$useWrapMode;
-        var len;
-        var action = e.data.action;
-        var firstRow = e.data.range.start.row;
-        var lastRow = e.data.range.end.row;
-        var start = e.data.range.start;
-        var end = e.data.range.end;
-        var removedFolds = null;
-
-        if (action.indexOf("Lines") != -1) {
-            if (action == "insertLines") {
-                lastRow = firstRow + (e.data.lines.length);
-            } else {
-                lastRow = firstRow;
-            }
-            len = e.data.lines ? e.data.lines.length : lastRow - firstRow;
-        } else {
-            len = lastRow - firstRow;
-        }
-
-        if (len != 0) {
-            if (action.indexOf("remove") != -1) {
-                useWrapMode && this.$wrapData.splice(firstRow, len);
-
-                var foldLines = this.$foldData;
-                removedFolds = this.getFoldsInRange(e.data.range);
-                this.removeFolds(removedFolds);
-
-                var foldLine = this.getFoldLine(end.row);
-                var idx = 0;
-                if (foldLine) {
-                    foldLine.addRemoveChars(end.row, end.column, start.column - end.column);
-                    foldLine.shiftRow(-len);
-
-                    var foldLineBefore = this.getFoldLine(firstRow);
-                    if (foldLineBefore && foldLineBefore !== foldLine) {
-                        foldLineBefore.merge(foldLine);
-                        foldLine = foldLineBefore;
-                    }
-                    idx = foldLines.indexOf(foldLine) + 1;
-                }
-
-                for (idx; idx < foldLines.length; idx++) {
-                    var foldLine = foldLines[idx];
-                    if (foldLine.start.row >= end.row) {
-                        foldLine.shiftRow(-len);
-                    }
-                }
-
-                lastRow = firstRow;
-            } else {
-                var args;
-                if (useWrapMode) {
-                    args = [firstRow, 0];
-                    for (var i = 0; i < len; i++) args.push([]);
-                    this.$wrapData.splice.apply(this.$wrapData, args);
-                }
-
-                // If some new line is added inside of a foldLine, then split
-                // the fold line up.
-                var foldLines = this.$foldData;
-                var foldLine = this.getFoldLine(firstRow);
-                var idx = 0;
-                if (foldLine) {
-                    var cmp = foldLine.range.compareInside(start.row, start.column)
-                    // Inside of the foldLine range. Need to split stuff up.
-                    if (cmp == 0) {
-                        foldLine = foldLine.split(start.row, start.column);
-                        foldLine.shiftRow(len);
-                        foldLine.addRemoveChars(
-                            lastRow, 0, end.column - start.column);
-                    } else
-                    // Infront of the foldLine but same row. Need to shift column.
-                    if (cmp == -1) {
-                        foldLine.addRemoveChars(firstRow, 0, end.column - start.column);
-                        foldLine.shiftRow(len);
-                    }
-                    // Nothing to do if the insert is after the foldLine.
-                    idx = foldLines.indexOf(foldLine) + 1;
-                }
-
-                for (idx; idx < foldLines.length; idx++) {
-                    var foldLine = foldLines[idx];
-                    if (foldLine.start.row >= firstRow) {
-                        foldLine.shiftRow(len);
-                    }
-                }
-            }
-        } else {
-            // Realign folds. E.g. if you add some new chars before a fold, the
-            // fold should "move" to the right.
-            len = Math.abs(e.data.range.start.column - e.data.range.end.column);
-            if (action.indexOf("remove") != -1) {
-                // Get all the folds in the change range and remove them.
-                removedFolds = this.getFoldsInRange(e.data.range);
-                this.removeFolds(removedFolds);
-
-                len = -len;
-            }
-            var foldLine = this.getFoldLine(firstRow);
-            if (foldLine) {
-                foldLine.addRemoveChars(firstRow, start.column, len);
-            }
-        }
-
-        if (useWrapMode && this.$wrapData.length != this.doc.getLength()) {
-            console.error("doc.getLength() and $wrapData.length have to be the same!");
-        }
-
-        useWrapMode && this.$updateWrapData(firstRow, lastRow);
-
-        return removedFolds;
-    };
-
-    this.$updateWrapData = function(firstRow, lastRow) {
-        var lines = this.doc.getAllLines();
-        var tabSize = this.getTabSize();
-        var wrapData = this.$wrapData;
-        var wrapLimit = this.$wrapLimit;
-        var tokens;
-        var foldLine;
-
-        var row = firstRow;
-        lastRow = Math.min(lastRow, lines.length - 1);
-        while (row <= lastRow) {
-            foldLine = this.getFoldLine(row, foldLine);
-            if (!foldLine) {
-                tokens = this.$getDisplayTokens(lang.stringTrimRight(lines[row]));
-                wrapData[row] = this.$computeWrapSplits(tokens, wrapLimit, tabSize);
-                row ++;
-            } else {
-                tokens = [];
-                foldLine.walk(
-                    function(placeholder, row, column, lastColumn) {
-                        var walkTokens;
-                        if (placeholder) {
-                            walkTokens = this.$getDisplayTokens(
-                                            placeholder, tokens.length);
-                            walkTokens[0] = PLACEHOLDER_START;
-                            for (var i = 1; i < walkTokens.length; i++) {
-                                walkTokens[i] = PLACEHOLDER_BODY;
-                            }
-                        } else {
-                            walkTokens = this.$getDisplayTokens(
-                                lines[row].substring(lastColumn, column),
-                                tokens.length);
-                        }
-                        tokens = tokens.concat(walkTokens);
-                    }.bind(this),
-                    foldLine.end.row,
-                    lines[foldLine.end.row].length + 1
-                );
-                // Remove spaces/tabs from the back of the token array.
-                while (tokens.length != 0 && tokens[tokens.length - 1] >= SPACE)
-                    tokens.pop();
-
-                wrapData[foldLine.start.row]
-                    = this.$computeWrapSplits(tokens, wrapLimit, tabSize);
-                row = foldLine.end.row + 1;
-            }
-        }
-    };
-
-    // "Tokens"
-    var CHAR = 1,
-        CHAR_EXT = 2,
-        PLACEHOLDER_START = 3,
-        PLACEHOLDER_BODY =  4,
-        PUNCTUATION = 9,
-        SPACE = 10,
-        TAB = 11,
-        TAB_SPACE = 12;
-
-    this.$computeWrapSplits = function(tokens, wrapLimit) {
-        if (tokens.length == 0) {
-            return [];
-        }
-
-        var splits = [];
-        var displayLength = tokens.length;
-        var lastSplit = 0, lastDocSplit = 0;
-
-        function addSplit(screenPos) {
-            var displayed = tokens.slice(lastSplit, screenPos);
-
-            // The document size is the current size - the extra width for tabs
-            // and multipleWidth characters.
-            var len = displayed.length;
-            displayed.join("").
-                // Get all the TAB_SPACEs.
-                replace(/12/g, function() {
-                    len -= 1;
-                }).
-                // Get all the CHAR_EXT/multipleWidth characters.
-                replace(/2/g, function() {
-                    len -= 1;
-                });
-
-            lastDocSplit += len;
-            splits.push(lastDocSplit);
-            lastSplit = screenPos;
-        }
-
-        while (displayLength - lastSplit > wrapLimit) {
-            // This is, where the split should be.
-            var split = lastSplit + wrapLimit;
-
-            // If there is a space or tab at this split position, then making
-            // a split is simple.
-            if (tokens[split] >= SPACE) {
-                // Include all following spaces + tabs in this split as well.
-                while (tokens[split] >= SPACE) {
-                    split ++;
-                }
-                addSplit(split);
-                continue;
-            }
-
-            // === ELSE ===
-            // Check if split is inside of a placeholder. Placeholder are
-            // not splitable. Therefore, seek the beginning of the placeholder
-            // and try to place the split beofre the placeholder's start.
-            if (tokens[split] == PLACEHOLDER_START
-                || tokens[split] == PLACEHOLDER_BODY)
-            {
-                // Seek the start of the placeholder and do the split
-                // before the placeholder. By definition there always
-                // a PLACEHOLDER_START between split and lastSplit.
-                for (split; split != lastSplit - 1; split--) {
-                    if (tokens[split] == PLACEHOLDER_START) {
-                        // split++; << No incremental here as we want to
-                        //  have the position before the Placeholder.
-                        break;
-                    }
-                }
-
-                // If the PLACEHOLDER_START is not the index of the
-                // last split, then we can do the split
-                if (split > lastSplit) {
-                    addSplit(split);
-                    continue;
-                }
-
-                // If the PLACEHOLDER_START IS the index of the last
-                // split, then we have to place the split after the
-                // placeholder. So, let's seek for the end of the placeholder.
-                split = lastSplit + wrapLimit;
-                for (split; split < tokens.length; split++) {
-                    if (tokens[split] != PLACEHOLDER_BODY)
-                    {
-                        break;
-                    }
-                }
-
-                // If spilt == tokens.length, then the placeholder is the last
-                // thing in the line and adding a new split doesn't make sense.
-                if (split == tokens.length) {
-                    break;  // Breaks the while-loop.
-                }
-
-                // Finally, add the split...
-                addSplit(split);
-                continue;
-            }
-
-            // === ELSE ===
-            // Search for the first non space/tab/placeholder/punctuation token backwards.
-            var minSplit = Math.max(split - 10, lastSplit - 1);
-            while (split > minSplit && tokens[split] < PLACEHOLDER_START) {
-                split --;
-            }
-            while (split > minSplit && tokens[split] == PUNCTUATION) {
-                split --;
-            }
-            // If we found one, then add the split.
-            if (split > minSplit) {
-                addSplit(++split);
-                continue;
-            }
-
-            // === ELSE ===
-            split = lastSplit + wrapLimit;
-            // The split is inside of a CHAR or CHAR_EXT token and no space
-            // around -> force a split.
-            addSplit(split);
-        }
-        return splits;
-    }
-
-    /**
-     * @param
-     *   offset: The offset in screenColumn at which position str starts.
-     *           Important for calculating the realTabSize.
-     */
-    this.$getDisplayTokens = function(str, offset) {
-        var arr = [];
-        var tabSize;
-        offset = offset || 0;
-
-        for (var i = 0; i < str.length; i++) {
-            var c = str.charCodeAt(i);
-            // Tab
-            if (c == 9) {
-                tabSize = this.getScreenTabSize(arr.length + offset);
-                arr.push(TAB);
-                for (var n = 1; n < tabSize; n++) {
-                    arr.push(TAB_SPACE);
-                }
-            }
-            // Space
-            else if (c == 32) {
-                arr.push(SPACE);
-            } else if((c > 39 && c < 48) || (c > 57 && c < 64)) {
-                arr.push(PUNCTUATION);
-            }
-            // full width characters
-            else if (c >= 0x1100 && isFullWidth(c)) {
-                arr.push(CHAR, CHAR_EXT);
-            } else {
-                arr.push(CHAR);
-            }
-        }
-        return arr;
-    }
-
-    /**
-     * Calculates the width of the a string on the screen while assuming that
-     * the string starts at the first column on the screen.
-     *
-     * @param string str String to calculate the screen width of
-     * @return array
-     *      [0]: number of columns for str on screen.
-     *      [1]: docColumn position that was read until (useful with screenColumn)
-     */
-    this.$getStringScreenWidth = function(str, maxScreenColumn, screenColumn) {
-        if (maxScreenColumn == 0) {
-            return [0, 0];
-        }
-        if (maxScreenColumn == null) {
-            maxScreenColumn = screenColumn +
-                str.length * Math.max(this.getTabSize(), 2);
-        }
-        screenColumn = screenColumn || 0;
-
-        var c, column;
-        for (column = 0; column < str.length; column++) {
-            c = str.charCodeAt(column);
-            // tab
-            if (c == 9) {
-                screenColumn += this.getScreenTabSize(screenColumn);
-            }
-            // full width characters
-            else if (c >= 0x1100 && isFullWidth(c)) {
-                screenColumn += 2;
-            } else {
-                screenColumn += 1;
-            }
-            if (screenColumn > maxScreenColumn) {
-                break
-            }
-        }
-
-        return [screenColumn, column];
-    }
-
-    /**
-     * Returns the number of rows required to render this row on the screen
-     */
-    this.getRowLength = function(row) {
-        if (!this.$useWrapMode || !this.$wrapData[row]) {
-            return 1;
-        } else {
-            return this.$wrapData[row].length + 1;
-        }
-    }
-
-    /**
-     * Returns the height in pixels required to render this row on the screen
-     **/
-    this.getRowHeight = function(config, row) {
-        return this.getRowLength(row) * config.lineHeight;
-    }
-
-    this.getScreenLastRowColumn = function(screenRow) {
-        var pos = this.screenToDocumentPosition(screenRow, Number.MAX_VALUE)
-        return this.documentToScreenColumn(pos.row, pos.column);
-    };
-
-    this.getDocumentLastRowColumn = function(docRow, docColumn) {
-        var screenRow = this.documentToScreenRow(docRow, docColumn);
-        return this.getScreenLastRowColumn(screenRow);
-    };
-
-    this.getDocumentLastRowColumnPosition = function(docRow, docColumn) {
-        var screenRow = this.documentToScreenRow(docRow, docColumn);
-        return this.screenToDocumentPosition(screenRow, Number.MAX_VALUE / 10);
-    };
-
-    this.getRowSplitData = function(row) {
-        if (!this.$useWrapMode) {
-            return undefined;
-        } else {
-            return this.$wrapData[row];
-        }
-    };
-
-    /**
-     * Returns the width of a tab character at screenColumn.
-     */
-    this.getScreenTabSize = function(screenColumn) {
-        return this.$tabSize - screenColumn % this.$tabSize;
-    };
-
-    this.screenToDocumentRow = function(screenRow, screenColumn) {
-        return this.screenToDocumentPosition(screenRow, screenColumn).row;
-    };
-
-    this.screenToDocumentColumn = function(screenRow, screenColumn) {
-        return this.screenToDocumentPosition(screenRow, screenColumn).column;
-    };
-
-    this.screenToDocumentPosition = function(screenRow, screenColumn) {
-        if (screenRow < 0) {
-            return {
-                row: 0,
-                column: 0
-            }
-        }
-
-        var line;
-        var docRow = 0;
-        var docColumn = 0;
-        var column;
-        var row = 0;
-        var rowLength = 0;
-
-        var rowCache = this.$rowCache;
-        for (var i = 0; i < rowCache.length; i++) {
-            if (rowCache[i].screenRow < screenRow) {
-                row = rowCache[i].screenRow;
-                docRow = rowCache[i].docRow;
-            }
-            else {
-                break;
-            }
-        }
-        var doCache = !rowCache.length || i == rowCache.length;
-
-        var maxRow = this.getLength() - 1;
-        var foldLine = this.getNextFoldLine(docRow);
-        var foldStart = foldLine ? foldLine.start.row : Infinity;
-
-        while (row <= screenRow) {
-            rowLength = this.getRowLength(docRow);
-            if (row + rowLength - 1 >= screenRow || docRow >= maxRow) {
-                break;
-            } else {
-                row += rowLength;
-                docRow++;
-                if (docRow > foldStart) {
-                    docRow = foldLine.end.row+1;
-                    foldLine = this.getNextFoldLine(docRow, foldLine);
-                    foldStart = foldLine ? foldLine.start.row : Infinity;
-                }
-            }
-            if (doCache) {
-                rowCache.push({
-                    docRow: docRow,
-                    screenRow: row
-                });
-            }
-        }
-
-        if (foldLine && foldLine.start.row <= docRow) {
-            line = this.getFoldDisplayLine(foldLine);
-            docRow = foldLine.start.row;
-        } else if (row + rowLength <= screenRow || docRow > maxRow) {
-            // clip at the end of the document
-            return {
-                row: maxRow,
-                column: this.getLine(maxRow).length
-            }
-        } else {
-            line = this.getLine(docRow);
-            foldLine = null;
-        }
-
-        if (this.$useWrapMode) {
-            var splits = this.$wrapData[docRow];
-            if (splits) {
-                column = splits[screenRow - row];
-                if(screenRow > row && splits.length) {
-                    docColumn = splits[screenRow - row - 1] || splits[splits.length - 1];
-                    line = line.substring(docColumn);
-                }
-            }
-        }
-
-        docColumn += this.$getStringScreenWidth(line, screenColumn)[1];
-
-        // We remove one character at the end so that the docColumn
-        // position returned is not associated to the next row on the screen.
-        if (this.$useWrapMode && docColumn >= column) {
-            docColumn = column - 1;
-        }
-
-        if (foldLine) {
-            return foldLine.idxToPosition(docColumn);
-        }
-
-        return {
-            row: docRow,
-            column: docColumn
-        }
-    };
-
-    this.documentToScreenPosition = function(docRow, docColumn) {
-        // Normalize the passed in arguments.
-        if (typeof docColumn === "undefined")
-            var pos = this.$clipPositionToDocument(docRow.row, docRow.column);
-        else
-            pos = this.$clipPositionToDocument(docRow, docColumn);
-
-        docRow = pos.row;
-        docColumn = pos.column;
-
-        var wrapData;
-        // Special case in wrapMode if the doc is at the end of the document.
-        if (this.$useWrapMode) {
-            wrapData = this.$wrapData;
-            if (docRow > wrapData.length - 1) {
-                return {
-                    row: this.getScreenLength(),
-                    column: wrapData.length == 0
-                        ? 0
-                        : (wrapData[wrapData.length - 1].length - 1)
-                };
-            }
-        }
-
-        var screenRow = 0;
-        var foldStartRow = null;
-        var fold = null;
-
-        // Clamp the docRow position in case it's inside of a folded block.
-        fold = this.getFoldAt(docRow, docColumn, 1);
-        if (fold) {
-            docRow = fold.start.row;
-            docColumn = fold.start.column;
-        }
-
-        var rowEnd, row = 0;
-        var rowCache = this.$rowCache;
-
-        for (var i = 0; i < rowCache.length; i++) {
-            if (rowCache[i].docRow < docRow) {
-                screenRow = rowCache[i].screenRow;
-                row = rowCache[i].docRow;
-            } else {
-                break;
-            }
-        }
-        var doCache = !rowCache.length || i == rowCache.length;
-
-        var foldLine = this.getNextFoldLine(row);
-        var foldStart = foldLine ?foldLine.start.row :Infinity;
-
-        while (row < docRow) {
-            if (row >= foldStart) {
-                rowEnd = foldLine.end.row + 1;
-                if (rowEnd > docRow)
-                    break;
-                foldLine = this.getNextFoldLine(rowEnd, foldLine);
-                foldStart = foldLine ?foldLine.start.row :Infinity;
-            }
-            else {
-                rowEnd = row + 1;
-            }
-
-            screenRow += this.getRowLength(row);
-            row = rowEnd;
-
-            if (doCache) {
-                rowCache.push({
-                    docRow: row,
-                    screenRow: screenRow
-                });
-            }
-        }
-
-        // Calculate the text line that is displayed in docRow on the screen.
-        var textLine = "";
-        // Check if the final row we want to reach is inside of a fold.
-        if (foldLine && row >= foldStart) {
-            textLine = this.getFoldDisplayLine(foldLine, docRow, docColumn);
-            foldStartRow = foldLine.start.row;
-        } else {
-            textLine = this.getLine(docRow).substring(0, docColumn);
-            foldStartRow = docRow;
-        }
-        // Clamp textLine if in wrapMode.
-        if (this.$useWrapMode) {
-            var wrapRow = wrapData[foldStartRow];
-            var screenRowOffset = 0;
-            while (textLine.length >= wrapRow[screenRowOffset]) {
-                screenRow ++;
-                screenRowOffset++;
-            }
-            textLine = textLine.substring(
-                wrapRow[screenRowOffset - 1] || 0, textLine.length
-            );
-        }
-
-        return {
-            row: screenRow,
-            column: this.$getStringScreenWidth(textLine)[0]
-        };
-    };
-
-    this.documentToScreenColumn = function(row, docColumn) {
-        return this.documentToScreenPosition(row, docColumn).column;
-    };
-
-    this.documentToScreenRow = function(docRow, docColumn) {
-        return this.documentToScreenPosition(docRow, docColumn).row;
-    };
-
-    this.getScreenLength = function() {
-        var screenRows = 0;
-        var fold = null;
-        if (!this.$useWrapMode) {
-            screenRows = this.getLength();
-
-            // Remove the folded lines again.
-            var foldData = this.$foldData;
-            for (var i = 0; i < foldData.length; i++) {
-                fold = foldData[i];
-                screenRows -= fold.end.row - fold.start.row;
-            }
-        } else {
-            var lastRow = this.$wrapData.length;
-            var row = 0, i = 0;
-            var fold = this.$foldData[i++];
-            var foldStart = fold ? fold.start.row :Infinity;
-
-            while (row < lastRow) {
-                screenRows += this.$wrapData[row].length + 1;
-                row ++;
-                if (row > foldStart) {
-                    row = fold.end.row+1;
-                    fold = this.$foldData[i++];
-                    foldStart = fold ?fold.start.row :Infinity;
-                }
-            }
-        }
-
-        return screenRows;
-    }
-
-    // For every keystroke this gets called once per char in the whole doc!!
-    // Wouldn't hurt to make it a bit faster for c >= 0x1100
-    function isFullWidth(c) {
-        if (c < 0x1100)
-            return false;
-        return c >= 0x1100 && c <= 0x115F ||
-               c >= 0x11A3 && c <= 0x11A7 ||
-               c >= 0x11FA && c <= 0x11FF ||
-               c >= 0x2329 && c <= 0x232A ||
-               c >= 0x2E80 && c <= 0x2E99 ||
-               c >= 0x2E9B && c <= 0x2EF3 ||
-               c >= 0x2F00 && c <= 0x2FD5 ||
-               c >= 0x2FF0 && c <= 0x2FFB ||
-               c >= 0x3000 && c <= 0x303E ||
-               c >= 0x3041 && c <= 0x3096 ||
-               c >= 0x3099 && c <= 0x30FF ||
-               c >= 0x3105 && c <= 0x312D ||
-               c >= 0x3131 && c <= 0x318E ||
-               c >= 0x3190 && c <= 0x31BA ||
-               c >= 0x31C0 && c <= 0x31E3 ||
-               c >= 0x31F0 && c <= 0x321E ||
-               c >= 0x3220 && c <= 0x3247 ||
-               c >= 0x3250 && c <= 0x32FE ||
-               c >= 0x3300 && c <= 0x4DBF ||
-               c >= 0x4E00 && c <= 0xA48C ||
-               c >= 0xA490 && c <= 0xA4C6 ||
-               c >= 0xA960 && c <= 0xA97C ||
-               c >= 0xAC00 && c <= 0xD7A3 ||
-               c >= 0xD7B0 && c <= 0xD7C6 ||
-               c >= 0xD7CB && c <= 0xD7FB ||
-               c >= 0xF900 && c <= 0xFAFF ||
-               c >= 0xFE10 && c <= 0xFE19 ||
-               c >= 0xFE30 && c <= 0xFE52 ||
-               c >= 0xFE54 && c <= 0xFE66 ||
-               c >= 0xFE68 && c <= 0xFE6B ||
-               c >= 0xFF01 && c <= 0xFF60 ||
-               c >= 0xFFE0 && c <= 0xFFE6;
-    };
-
-}).call(EditSession.prototype);
-
-require("./edit_session/folding").Folding.call(EditSession.prototype);
-require("./edit_session/bracket_match").BracketMatch.call(EditSession.prototype);
-
-exports.EditSession = EditSession;
-});
-/* vim:ts=4:sts=4:sw=4:
- * ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/config', ['require', 'exports', 'module' , 'ace/lib/lang'], function(require, exports, module) {
-"no use strict";
-
-var lang = require("./lib/lang");
-
-var global = (function() {
-    return this;
-})();
-
-var options = {
-    packaged: false,
-    workerPath: "",
-    modePath: "",
-    themePath: "",
-    suffix: ".js"
-};
-
-exports.get = function(key) {
-    if (!options.hasOwnProperty(key))
-        throw new Error("Unknown confik key: " + key);
-        
-    return options[key];
-};
-
-exports.set = function(key, value) {
-    if (!options.hasOwnProperty(key))
-        throw new Error("Unknown confik key: " + key);
-        
-    options[key] = value;
-};
-
-exports.all = function() {
-    return lang.copyObject(options);
-};
-
-exports.init = function() {
-    options.packaged = require.packaged || module.packaged || (global.define && define.packaged);
-
-    if (!global.document)
-        return "";
-
-    var scriptOptions = {};
-    var scriptUrl = "";
-    var suffix;
-    
-    var scripts = document.getElementsByTagName("script");
-    for (var i=0; i<scripts.length; i++) {
-        var script = scripts[i];
-
-        var src = script.src || script.getAttribute("src");
-        if (!src) {
-            continue;
-        }
-        
-        var attributes = script.attributes;
-        for (var j=0, l=attributes.length; j < l; j++) {
-            var attr = attributes[j];
-            if (attr.name.indexOf("data-ace-") === 0) {
-                scriptOptions[deHyphenate(attr.name.replace(/^data-ace-/, ""))] = attr.value;
-            }
-        }
-
-        var m = src.match(/^(?:(.*\/)ace\.js|(.*\/)ace((-uncompressed)?(-noconflict)?\.js))(?:\?|$)/);
-        if (m) {
-            scriptUrl = m[1] || m[2];
-            suffix = m[3];
-        }
-    }
-    
-    if (scriptUrl) {
-        scriptOptions.base = scriptOptions.base || scriptUrl;
-        scriptOptions.packaged = true;
-    }
-    
-    scriptOptions.suffix = scriptOptions.suffix || suffix;
-    scriptOptions.workerPath = scriptOptions.workerPath || scriptOptions.base;
-    scriptOptions.modePath = scriptOptions.modePath || scriptOptions.base;
-    scriptOptions.themePath = scriptOptions.themePath || scriptOptions.base;
-    delete scriptOptions.base;
-    
-    for (var key in scriptOptions)
-        if (typeof scriptOptions[key] !== "undefined")
-            exports.set(key, scriptOptions[key]);
-};
-
-function deHyphenate(str) {
-    return str.replace(/-(.)/g, function(m, m1) { return m1.toUpperCase(); });
-}
-
-});/**
- * based on code from:
- * 
- * @license RequireJS text 0.25.0 Copyright (c) 2010-2011, The Dojo Foundation All Rights Reserved.
- * Available via the MIT or new BSD license.
- * see: http://github.com/jrburke/requirejs for details
- */
-define('ace/lib/net', ['require', 'exports', 'module' ], function(require, exports, module) {
-"use strict";
-
-exports.get = function (url, callback) {
-    var xhr = exports.createXhr();
-    xhr.open('GET', url, true);
-    xhr.onreadystatechange = function (evt) {
-        //Do not explicitly handle errors, those should be
-        //visible via console output in the browser.
-        if (xhr.readyState === 4) {
-            callback(xhr.responseText);
-        }
-    };
-    xhr.send(null);
-};
-
-var progIds = ['Msxml2.XMLHTTP', 'Microsoft.XMLHTTP', 'Msxml2.XMLHTTP.4.0'];
-
-exports.createXhr = function() {
-    //Would love to dump the ActiveX crap in here. Need IE 6 to die first.
-    var xhr, i, progId;
-    if (typeof XMLHttpRequest !== "undefined") {
-        return new XMLHttpRequest();
-    } else {
-        for (i = 0; i < 3; i++) {
-            progId = progIds[i];
-            try {
-                xhr = new ActiveXObject(progId);
-            } catch (e) {}
-
-            if (xhr) {
-                progIds = [progId];  // so faster next time
-                break;
-            }
-        }
-    }
-
-    if (!xhr) {
-        throw new Error("createXhr(): XMLHttpRequest not available");
-    }
-
-    return xhr;
-};
-
-exports.loadScript = function(path, callback) {
-    var head = document.getElementsByTagName('head')[0];
-    var s = document.createElement('script');
-
-    s.src = path;
-    head.appendChild(s);
-    
-    s.onload = callback;
-};
-
-});/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *      Julian Viereck <julian.viereck@gmail.com>
- *
- * 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 ***** */
-
-define('ace/selection', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/lang', 'ace/lib/event_emitter', 'ace/range'], function(require, exports, module) {
-"use strict";
-
-var oop = require("./lib/oop");
-var lang = require("./lib/lang");
-var EventEmitter = require("./lib/event_emitter").EventEmitter;
-var Range = require("./range").Range;
-
-/**
- * Keeps cursor position and the text selection of an edit session.
- *
- * The row/columns used in the selection are in document coordinates
- * representing ths coordinates as thez appear in the document
- * before applying soft wrap and folding.
- */
-var Selection = function(session) {
-    this.session = session;
-    this.doc = session.getDocument();
-
-    this.clearSelection();
-    this.selectionLead = this.doc.createAnchor(0, 0);
-    this.selectionAnchor = this.doc.createAnchor(0, 0);
-
-    var self = this;
-    this.selectionLead.on("change", function(e) {
-        self._emit("changeCursor");
-        if (!self.$isEmpty)
-            self._emit("changeSelection");
-        if (!self.$keepDesiredColumnOnChange && e.old.column != e.value.column)
-            self.$desiredColumn = null;
-    });
-
-    this.selectionAnchor.on("change", function() {
-        if (!self.$isEmpty)
-            self._emit("changeSelection");
-    });
-};
-
-(function() {
-
-    oop.implement(this, EventEmitter);
-
-    this.isEmpty = function() {
-        return (this.$isEmpty || (
-            this.selectionAnchor.row == this.selectionLead.row &&
-            this.selectionAnchor.column == this.selectionLead.column
-        ));
-    };
-
-    this.isMultiLine = function() {
-        if (this.isEmpty()) {
-            return false;
-        }
-
-        return this.getRange().isMultiLine();
-    };
-
-    this.getCursor = function() {
-        return this.selectionLead.getPosition();
-    };
-
-    this.setSelectionAnchor = function(row, column) {
-        this.selectionAnchor.setPosition(row, column);
-
-        if (this.$isEmpty) {
-            this.$isEmpty = false;
-            this._emit("changeSelection");
-        }
-    };
-
-    this.getSelectionAnchor = function() {
-        if (this.$isEmpty)
-            return this.getSelectionLead()
-        else
-            return this.selectionAnchor.getPosition();
-    };
-
-    this.getSelectionLead = function() {
-        return this.selectionLead.getPosition();
-    };
-
-    this.shiftSelection = function(columns) {
-        if (this.$isEmpty) {
-            this.moveCursorTo(this.selectionLead.row, this.selectionLead.column + columns);
-            return;
-        };
-
-        var anchor = this.getSelectionAnchor();
-        var lead = this.getSelectionLead();
-
-        var isBackwards = this.isBackwards();
-
-        if (!isBackwards || anchor.column !== 0)
-            this.setSelectionAnchor(anchor.row, anchor.column + columns);
-
-        if (isBackwards || lead.column !== 0) {
-            this.$moveSelection(function() {
-                this.moveCursorTo(lead.row, lead.column + columns);
-            });
-        }
-    };
-
-    this.isBackwards = function() {
-        var anchor = this.selectionAnchor;
-        var lead = this.selectionLead;
-        return (anchor.row > lead.row || (anchor.row == lead.row && anchor.column > lead.column));
-    };
-
-    this.getRange = function() {
-        var anchor = this.selectionAnchor;
-        var lead = this.selectionLead;
-
-        if (this.isEmpty())
-            return Range.fromPoints(lead, lead);
-
-        if (this.isBackwards()) {
-            return Range.fromPoints(lead, anchor);
-        }
-        else {
-            return Range.fromPoints(anchor, lead);
-        }
-    };
-
-    this.clearSelection = function() {
-        if (!this.$isEmpty) {
-            this.$isEmpty = true;
-            this._emit("changeSelection");
-        }
-    };
-
-    this.selectAll = function() {
-        var lastRow = this.doc.getLength() - 1;
-        this.setSelectionAnchor(lastRow, this.doc.getLine(lastRow).length);
-        this.moveCursorTo(0, 0);
-    };
-
-    this.setSelectionRange = function(range, reverse) {
-        if (reverse) {
-            this.setSelectionAnchor(range.end.row, range.end.column);
-            this.selectTo(range.start.row, range.start.column);
-        } else {
-            this.setSelectionAnchor(range.start.row, range.start.column);
-            this.selectTo(range.end.row, range.end.column);
-        }
-        this.$desiredColumn = null;
-    };
-
-    this.$moveSelection = function(mover) {
-        var lead = this.selectionLead;
-        if (this.$isEmpty)
-            this.setSelectionAnchor(lead.row, lead.column);
-
-        mover.call(this);
-    };
-
-    this.selectTo = function(row, column) {
-        this.$moveSelection(function() {
-            this.moveCursorTo(row, column);
-        });
-    };
-
-    this.selectToPosition = function(pos) {
-        this.$moveSelection(function() {
-            this.moveCursorToPosition(pos);
-        });
-    };
-
-    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 cursor = this.getCursor();
-        var range  = this.session.getWordRange(cursor.row, cursor.column);
-        this.setSelectionRange(range);
-    };
-
-    // Selects a word including its right whitespace
-    this.selectAWord = function() {
-        var cursor = this.getCursor();
-        var range = this.session.getAWordRange(cursor.row, cursor.column);
-        this.setSelectionRange(range);
-    };
-
-    this.selectLine = function() {
-        var rowStart = this.selectionLead.row;
-        var rowEnd;
-
-        var foldLine = this.session.getFoldLine(rowStart);
-        if (foldLine) {
-            rowStart = foldLine.start.row;
-            rowEnd = foldLine.end.row;
-        } else {
-            rowEnd = rowStart;
-        }
-        this.setSelectionAnchor(rowStart, 0);
-        this.$moveSelection(function() {
-            this.moveCursorTo(rowEnd + 1, 0);
-        });
-    };
-
-    this.moveCursorUp = function() {
-        this.moveCursorBy(-1, 0);
-    };
-
-    this.moveCursorDown = function() {
-        this.moveCursorBy(1, 0);
-    };
-
-    this.moveCursorLeft = function() {
-        var cursor = this.selectionLead.getPosition(),
-            fold;
-
-        if (fold = this.session.getFoldAt(cursor.row, cursor.column, -1)) {
-            this.moveCursorTo(fold.start.row, fold.start.column);
-        } else if (cursor.column == 0) {
-            // cursor is a line (start
-            if (cursor.row > 0) {
-                this.moveCursorTo(cursor.row - 1, this.doc.getLine(cursor.row - 1).length);
-            }
-        }
-        else {
-            var tabSize = this.session.getTabSize();
-            if (this.session.isTabStop(cursor) && this.doc.getLine(cursor.row).slice(cursor.column-tabSize, cursor.column).split(" ").length-1 == tabSize)
-                this.moveCursorBy(0, -tabSize);
-            else
-                this.moveCursorBy(0, -1);
-        }
-    };
-
-    this.moveCursorRight = function() {
-        var cursor = this.selectionLead.getPosition(),
-            fold;
-        if (fold = this.session.getFoldAt(cursor.row, cursor.column, 1)) {
-            this.moveCursorTo(fold.end.row, fold.end.column);
-        }
-        else if (this.selectionLead.column == this.doc.getLine(this.selectionLead.row).length) {
-            if (this.selectionLead.row < this.doc.getLength() - 1) {
-                this.moveCursorTo(this.selectionLead.row + 1, 0);
-            }
-        }
-        else {
-            var tabSize = this.session.getTabSize();
-            var cursor = this.selectionLead;
-            if (this.session.isTabStop(cursor) && this.doc.getLine(cursor.row).slice(cursor.column, cursor.column+tabSize).split(" ").length-1 == tabSize)
-                this.moveCursorBy(0, tabSize);
-            else
-                this.moveCursorBy(0, 1);
-        }
-    };
-
-    this.moveCursorLineStart = function() {
-        var row = this.selectionLead.row;
-        var column = this.selectionLead.column;
-        var screenRow = this.session.documentToScreenRow(row, column);
-
-        // Determ the doc-position of the first character at the screen line.
-        var firstColumnPosition = this.session.screenToDocumentPosition(screenRow, 0);
-
-        // Determ the line
-        var beforeCursor = this.session.getDisplayLine(
-            row, null,
-            firstColumnPosition.row, firstColumnPosition.column
-        );
-
-        var leadingSpace = beforeCursor.match(/^\s*/);
-        if (leadingSpace[0].length == column) {
-            this.moveCursorTo(
-                firstColumnPosition.row, firstColumnPosition.column
-            );
-        }
-        else {
-            this.moveCursorTo(
-                firstColumnPosition.row,
-                firstColumnPosition.column + leadingSpace[0].length
-            );
-        }
-    };
-
-    this.moveCursorLineEnd = function() {
-        var lead = this.selectionLead;
-        var lastRowColumnPosition =
-            this.session.getDocumentLastRowColumnPosition(lead.row, lead.column);
-        this.moveCursorTo(
-            lastRowColumnPosition.row,
-            lastRowColumnPosition.column
-        );
-    };
-
-    this.moveCursorFileEnd = function() {
-        var row = this.doc.getLength() - 1;
-        var column = this.doc.getLine(row).length;
-        this.moveCursorTo(row, column);
-    };
-
-    this.moveCursorFileStart = function() {
-        this.moveCursorTo(0, 0);
-    };
-
-    this.moveCursorWordRight = function() {
-        var row = this.selectionLead.row;
-        var column = this.selectionLead.column;
-        var line = this.doc.getLine(row);
-        var rightOfCursor = line.substring(column);
-
-        var match;
-        this.session.nonTokenRe.lastIndex = 0;
-        this.session.tokenRe.lastIndex = 0;
-
-        // skip folds
-        var fold = this.session.getFoldAt(row, column, 1);
-        if (fold) {
-            this.moveCursorTo(fold.end.row, fold.end.column);
-            return;
-        }
-
-        // first skip space
-        if (match = this.session.nonTokenRe.exec(rightOfCursor)) {
-            column += this.session.nonTokenRe.lastIndex;
-            this.session.nonTokenRe.lastIndex = 0;
-            rightOfCursor = line.substring(column);
-        }
-
-        // if at line end proceed with next line
-        if (column >= line.length) {
-            this.moveCursorTo(row, line.length);
-            this.moveCursorRight();
-            if (row < this.doc.getLength() - 1)
-                this.moveCursorWordRight();
-            return;
-        }
-
-        // advance to the end of the next token
-        if (match = this.session.tokenRe.exec(rightOfCursor)) {
-            column += this.session.tokenRe.lastIndex;
-            this.session.tokenRe.lastIndex = 0;
-        }
-
-        this.moveCursorTo(row, column);
-    };
-
-    this.moveCursorWordLeft = function() {
-        var row = this.selectionLead.row;
-        var column = this.selectionLead.column;
-
-        // skip folds
-        var fold;
-        if (fold = this.session.getFoldAt(row, column, -1)) {
-            this.moveCursorTo(fold.start.row, fold.start.column);
-            return;
-        }
-
-        var str = this.session.getFoldStringAt(row, column, -1);
-        if (str == null) {
-            str = this.doc.getLine(row).substring(0, column)
-        }
-
-        var leftOfCursor = lang.stringReverse(str);
-        var match;
-        this.session.nonTokenRe.lastIndex = 0;
-        this.session.tokenRe.lastIndex = 0;
-
-        // skip whitespace
-        if (match = this.session.nonTokenRe.exec(leftOfCursor)) {
-            column -= this.session.nonTokenRe.lastIndex;
-            leftOfCursor = leftOfCursor.slice(this.session.nonTokenRe.lastIndex);
-            this.session.nonTokenRe.lastIndex = 0;
-        }
-
-        // if at begin of the line proceed in line above
-        if (column <= 0) {
-            this.moveCursorTo(row, 0);
-            this.moveCursorLeft();
-            if (row > 0)
-                this.moveCursorWordLeft();
-            return;
-        }
-
-        // move to the begin of the word
-        if (match = this.session.tokenRe.exec(leftOfCursor)) {
-            column -= this.session.tokenRe.lastIndex;
-            this.session.tokenRe.lastIndex = 0;
-        }
-
-        this.moveCursorTo(row, column);
-    };
-
-    this.moveCursorBy = function(rows, chars) {
-        var screenPos = this.session.documentToScreenPosition(
-            this.selectionLead.row,
-            this.selectionLead.column
-        );
-
-        if (chars === 0) {
-            if (this.$desiredColumn)
-                screenPos.column = this.$desiredColumn;
-            else
-                this.$desiredColumn = screenPos.column;
-        }
-
-        var docPos = this.session.screenToDocumentPosition(screenPos.row + rows, screenPos.column);
-
-        // move the cursor and update the desired column
-        this.moveCursorTo(docPos.row, docPos.column + chars, chars === 0);
-    };
-
-    this.moveCursorToPosition = function(position) {
-        this.moveCursorTo(position.row, position.column);
-    };
-
-    this.moveCursorTo = function(row, column, keepDesiredColumn) {
-        // Ensure the row/column is not inside of a fold.
-        var fold = this.session.getFoldAt(row, column, 1);
-        if (fold) {
-            row = fold.start.row;
-            column = fold.start.column;
-        }
-
-        this.$keepDesiredColumnOnChange = true;
-        this.selectionLead.setPosition(row, column);
-        this.$keepDesiredColumnOnChange = false;
-
-        if (!keepDesiredColumn)
-            this.$desiredColumn = null;
-    };
-
-    this.moveCursorToScreen = function(row, column, keepDesiredColumn) {
-        var pos = this.session.screenToDocumentPosition(row, column);
-        this.moveCursorTo(pos.row, pos.column, keepDesiredColumn);
-    };
-
-    // remove listeners from document
-    this.detach = function() {
-        this.selectionLead.detach();
-        this.selectionAnchor.detach();
-        this.session = this.doc = null;
-    }
-
-    this.fromOrientedRange = function(range) {
-        this.setSelectionRange(range, range.cursor == range.start);
-        this.$desiredColumn = range.desiredColumn || this.$desiredColumn;
-    }
-
-    this.toOrientedRange = function(range) {
-        var r = this.getRange();
-        if (range) {
-            range.start.column = r.start.column;
-            range.start.row = r.start.row;
-            range.end.column = r.end.column;
-            range.end.row = r.end.row;
-        } else {
-            range = r;
-        }
-
-        range.cursor = this.isBackwards() ? range.start : range.end;
-        range.desiredColumn = this.$desiredColumn;
-        return range;
-    }
-
-}).call(Selection.prototype);
-
-exports.Selection = Selection;
-});
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/range', ['require', 'exports', 'module' ], function(require, exports, module) {
-"use strict";
-
-var Range = function(startRow, startColumn, endRow, endColumn) {
-    this.start = {
-        row: startRow,
-        column: startColumn
-    };
-
-    this.end = {
-        row: endRow,
-        column: endColumn
-    };
-};
-
-(function() {
-    this.isEqual = function(range) {
-        return this.start.row == range.start.row &&
-            this.end.row == range.end.row &&
-            this.start.column == range.start.column &&
-            this.end.column == range.end.column
-    };
-
-    this.toString = function() {
-        return ("Range: [" + this.start.row + "/" + this.start.column +
-            "] -> [" + this.end.row + "/" + this.end.column + "]");
-    };
-
-    this.contains = function(row, column) {
-        return this.compare(row, column) == 0;
-    };
-
-    /**
-     * Compares this range (A) with another range (B), where B is the passed in
-     * range.
-     *
-     * Return values:
-     *  -2: (B) is infront of (A) and doesn't intersect with (A)
-     *  -1: (B) begins before (A) but ends inside of (A)
-     *   0: (B) is completly inside of (A) OR (A) is complety inside of (B)
-     *  +1: (B) begins inside of (A) but ends outside of (A)
-     *  +2: (B) is after (A) and doesn't intersect with (A)
-     *
-     *  42: FTW state: (B) ends in (A) but starts outside of (A)
-     */
-    this.compareRange = function(range) {
-        var cmp,
-            end = range.end,
-            start = range.start;
-
-        cmp = this.compare(end.row, end.column);
-        if (cmp == 1) {
-            cmp = this.compare(start.row, start.column);
-            if (cmp == 1) {
-                return 2;
-            } else if (cmp == 0) {
-                return 1;
-            } else {
-                return 0;
-            }
-        } else if (cmp == -1) {
-            return -2;
-        } else {
-            cmp = this.compare(start.row, start.column);
-            if (cmp == -1) {
-                return -1;
-            } else if (cmp == 1) {
-                return 42;
-            } else {
-                return 0;
-            }
-        }
-    }
-
-    this.comparePoint = function(p) {
-        return this.compare(p.row, p.column);
-    }
-
-    this.containsRange = function(range) {
-        return this.comparePoint(range.start) == 0 && this.comparePoint(range.end) == 0;
-    }
-
-    this.intersectsRange = function(range) {
-        var cmp = this.compareRange(range);
-        return (cmp == -1 || cmp == 0 || cmp == 1);
-    }
-
-    this.isEnd = function(row, column) {
-        return this.end.row == row && this.end.column == column;
-    }
-
-    this.isStart = function(row, column) {
-        return this.start.row == row && this.start.column == column;
-    }
-
-    this.setStart = function(row, column) {
-        if (typeof row == "object") {
-            this.start.column = row.column;
-            this.start.row = row.row;
-        } else {
-            this.start.row = row;
-            this.start.column = column;
-        }
-    }
-
-    this.setEnd = function(row, column) {
-        if (typeof row == "object") {
-            this.end.column = row.column;
-            this.end.row = row.row;
-        } else {
-            this.end.row = row;
-            this.end.column = column;
-        }
-    }
-
-    this.inside = function(row, column) {
-        if (this.compare(row, column) == 0) {
-            if (this.isEnd(row, column) || this.isStart(row, column)) {
-                return false;
-            } else {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    this.insideStart = function(row, column) {
-        if (this.compare(row, column) == 0) {
-            if (this.isEnd(row, column)) {
-                return false;
-            } else {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    this.insideEnd = function(row, column) {
-        if (this.compare(row, column) == 0) {
-            if (this.isStart(row, column)) {
-                return false;
-            } else {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    this.compare = function(row, column) {
-        if (!this.isMultiLine()) {
-            if (row === this.start.row) {
-                return column < this.start.column ? -1 : (column > this.end.column ? 1 : 0);
-            };
-        }
-
-        if (row < this.start.row)
-            return -1;
-
-        if (row > this.end.row)
-            return 1;
-
-        if (this.start.row === row)
-            return column >= this.start.column ? 0 : -1;
-
-        if (this.end.row === row)
-            return column <= this.end.column ? 0 : 1;
-
-        return 0;
-    };
-
-    /**
-     * Like .compare(), but if isStart is true, return -1;
-     */
-    this.compareStart = function(row, column) {
-        if (this.start.row == row && this.start.column == column) {
-            return -1;
-        } else {
-            return this.compare(row, column);
-        }
-    }
-
-    /**
-     * Like .compare(), but if isEnd is true, return 1;
-     */
-    this.compareEnd = function(row, column) {
-        if (this.end.row == row && this.end.column == column) {
-            return 1;
-        } else {
-            return this.compare(row, column);
-        }
-    }
-
-    this.compareInside = function(row, column) {
-        if (this.end.row == row && this.end.column == column) {
-            return 1;
-        } else if (this.start.row == row && this.start.column == column) {
-            return -1;
-        } else {
-            return this.compare(row, column);
-        }
-    }
-
-    this.clipRows = function(firstRow, lastRow) {
-        if (this.end.row > lastRow) {
-            var end = {
-                row: lastRow+1,
-                column: 0
-            };
-        }
-
-        if (this.start.row > lastRow) {
-            var start = {
-                row: lastRow+1,
-                column: 0
-            };
-        }
-
-        if (this.start.row < firstRow) {
-            var start = {
-                row: firstRow,
-                column: 0
-            };
-        }
-
-        if (this.end.row < firstRow) {
-            var end = {
-                row: firstRow,
-                column: 0
-            };
-        }
-        return Range.fromPoints(start || this.start, end || this.end);
-    };
-
-    this.extend = function(row, column) {
-        var cmp = this.compare(row, column);
-
-        if (cmp == 0)
-            return this;
-        else if (cmp == -1)
-            var start = {row: row, column: column};
-        else
-            var end = {row: row, column: column};
-
-        return Range.fromPoints(start || this.start, end || 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 false;
-        }
-        
-        var temp = this.start;
-        this.end = this.start;
-        this.start = temp;
-        return true;
-    };
-
-
-    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 Range.fromPoints(this.start, this.end);
-    };
-
-    this.collapseRows = function() {
-        if (this.end.column == 0)
-            return new Range(this.start.row, 0, Math.max(this.start.row, this.end.row-1), 0)
-        else
-            return new Range(this.start.row, 0, this.end.row, 0)
-    };
-
-    this.toScreenRange = function(session) {
-        var screenPosStart =
-            session.documentToScreenPosition(this.start);
-        var screenPosEnd =
-            session.documentToScreenPosition(this.end);
-
-        return new Range(
-            screenPosStart.row, screenPosStart.column,
-            screenPosEnd.row, screenPosEnd.column
-        );
-    };
-
-}).call(Range.prototype);
-
-
-Range.fromPoints = function(start, end) {
-    return new Range(start.row, start.column, end.row, end.column);
-};
-
-exports.Range = Range;
-});
-/* vim:ts=4:sts=4:sw=4:
- * ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *      Mihai Sucan <mihai DOT sucan AT gmail DOT com>
- *      Chris Spencer <chris.ag.spencer AT googlemail DOT com>
- *
- * 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 ***** */
-
-define('ace/mode/text', ['require', 'exports', 'module' , 'ace/tokenizer', 'ace/mode/text_highlight_rules', 'ace/mode/behaviour', 'ace/unicode'], function(require, exports, module) {
-"use strict";
-
-var Tokenizer = require("../tokenizer").Tokenizer;
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-var Behaviour = require("./behaviour").Behaviour;
-var unicode = require("../unicode");
-
-var Mode = function() {
-    this.$tokenizer = new Tokenizer(new TextHighlightRules().getRules());
-    this.$behaviour = new Behaviour();
-};
-
-(function() {
-
-    this.tokenRe = new RegExp("^["
-        + unicode.packages.L
-        + unicode.packages.Mn + unicode.packages.Mc
-        + unicode.packages.Nd
-        + unicode.packages.Pc + "\\$_]+", "g"
-    );
-    
-    this.nonTokenRe = new RegExp("^(?:[^"
-        + unicode.packages.L
-        + unicode.packages.Mn + unicode.packages.Mc
-        + unicode.packages.Nd
-        + unicode.packages.Pc + "\\$_]|\s])+", "g"
-    );
-
-    this.getTokenizer = function() {
-        return this.$tokenizer;
-    };
-
-    this.toggleCommentLines = function(state, doc, startRow, endRow) {
-    };
-
-    this.getNextLineIndent = function(state, line, tab) {
-        return "";
-    };
-
-    this.checkOutdent = function(state, line, input) {
-        return false;
-    };
-
-    this.autoOutdent = function(state, doc, row) {
-    };
-
-    this.$getIndent = function(line) {
-        var match = line.match(/^(\s+)/);
-        if (match) {
-            return match[1];
-        }
-
-        return "";
-    };
-    
-    this.createWorker = function(session) {
-        return null;
-    };
-
-    this.highlightSelection = function(editor) {
-        var session = editor.session;
-        if (!session.$selectionOccurrences)
-            session.$selectionOccurrences = [];
-
-        if (session.$selectionOccurrences.length)
-            this.clearSelectionHighlight(editor);
-
-        var selection = editor.getSelectionRange();
-        if (selection.isEmpty() || selection.isMultiLine())
-            return;
-
-        var startOuter = selection.start.column - 1;
-        var endOuter = selection.end.column + 1;
-        var line = session.getLine(selection.start.row);
-        var lineCols = line.length;
-        var needle = line.substring(Math.max(startOuter, 0),
-                                    Math.min(endOuter, lineCols));
-
-        // Make sure the outer characters are not part of the word.
-        if ((startOuter >= 0 && /^[\w\d]/.test(needle)) ||
-            (endOuter <= lineCols && /[\w\d]$/.test(needle)))
-            return;
-
-        needle = line.substring(selection.start.column, selection.end.column);
-        if (!/^[\w\d]+$/.test(needle))
-            return;
-
-        var cursor = editor.getCursorPosition();
-
-        var newOptions = {
-            wrap: true,
-            wholeWord: true,
-            caseSensitive: true,
-            needle: needle
-        };
-
-        var currentOptions = editor.$search.getOptions();
-        editor.$search.set(newOptions);
-
-        var ranges = editor.$search.findAll(session);
-        ranges.forEach(function(range) {
-            if (!range.contains(cursor.row, cursor.column)) {
-                var marker = session.addMarker(range, "ace_selected_word", "text");
-                session.$selectionOccurrences.push(marker);
-            }
-        });
-
-        editor.$search.set(currentOptions);
-    };
-
-    this.clearSelectionHighlight = function(editor) {
-        if (!editor.session.$selectionOccurrences)
-            return;
-
-        editor.session.$selectionOccurrences.forEach(function(marker) {
-            editor.session.removeMarker(marker);
-        });
-
-        editor.session.$selectionOccurrences = [];
-    };
-    
-    this.createModeDelegates = function (mapping) {
-        if (!this.$embeds) {
-            return;
-        }
-        this.$modes = {};
-        for (var i = 0; i < this.$embeds.length; i++) {
-            if (mapping[this.$embeds[i]]) {
-                this.$modes[this.$embeds[i]] = new mapping[this.$embeds[i]]();
-            }
-        }
-        
-        var delegations = ['toggleCommentLines', 'getNextLineIndent', 'checkOutdent', 'autoOutdent', 'transformAction'];
-
-        for (var i = 0; i < delegations.length; i++) {
-            (function(scope) {
-              var functionName = delegations[i];
-              var defaultHandler = scope[functionName];
-              scope[delegations[i]] = function() {
-                  return this.$delegator(functionName, arguments, defaultHandler);
-              }
-            } (this));
-        }
-    }
-    
-    this.$delegator = function(method, args, defaultHandler) {
-        var state = args[0];
-        
-        for (var i = 0; i < this.$embeds.length; i++) {
-            if (!this.$modes[this.$embeds[i]]) continue;
-            
-            var split = state.split(this.$embeds[i]);
-            if (!split[0] && split[1]) {
-                args[0] = split[1];
-                var mode = this.$modes[this.$embeds[i]];
-                return mode[method].apply(mode, args);
-            }
-        }
-        var ret = defaultHandler.apply(this, args);
-        return defaultHandler ? ret : undefined;
-    };
-    
-    this.transformAction = function(state, action, editor, session, param) {
-        if (this.$behaviour) {
-            var behaviours = this.$behaviour.getBehaviours();
-            for (var key in behaviours) {
-                if (behaviours[key][action]) {
-                    var ret = behaviours[key][action].apply(this, arguments);
-                    if (ret) {
-                        return ret;
-                    }
-                }
-            }
-        }
-    }
-    
-}).call(Mode.prototype);
-
-exports.Mode = Mode;
-});
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/tokenizer', ['require', 'exports', 'module' ], function(require, exports, module) {
-"use strict";
-
-var Tokenizer = function(rules, flag) {
-    flag = flag ? "g" + flag : "g";
-    this.rules = rules;
-
-    this.regExps = {};
-    this.matchMappings = {};
-    for ( var key in this.rules) {
-        var rule = this.rules[key];
-        var state = rule;
-        var ruleRegExps = [];
-        var matchTotal = 0;
-        var mapping = this.matchMappings[key] = {};
-
-        for ( var i = 0; i < state.length; i++) {
-
-            if (state[i].regex instanceof RegExp)
-                state[i].regex = state[i].regex.toString().slice(1, -1);
-
-            // Count number of matching groups. 2 extra groups from the full match
-            // And the catch-all on the end (used to force a match);
-            var matchcount = new RegExp("(?:(" + state[i].regex + ")|(.))").exec("a").length - 2;
-
-            // Replace any backreferences and offset appropriately.
-            var adjustedregex = state[i].regex.replace(/\\([0-9]+)/g, function (match, digit) {
-                return "\\" + (parseInt(digit, 10) + matchTotal + 1);
-            });
-
-            if (matchcount > 1 && state[i].token.length !== matchcount-1)
-                throw new Error("Matching groups and length of the token array don't match in rule #" + i + " of state " + key);
-
-            mapping[matchTotal] = {
-                rule: i,
-                len: matchcount
-            };
-            matchTotal += matchcount;
-
-            ruleRegExps.push(adjustedregex);
-        }
-
-        this.regExps[key] = new RegExp("(?:(" + ruleRegExps.join(")|(") + ")|(.))", flag);
-    }
-};
-
-(function() {
-
-    this.getLineTokens = function(line, startState) {
-        var currentState = startState;
-        var state = this.rules[currentState];
-        var mapping = this.matchMappings[currentState];
-        var re = this.regExps[currentState];
-        re.lastIndex = 0;
-
-        var match, tokens = [];
-
-        var lastIndex = 0;
-
-        var token = {
-            type: null,
-            value: ""
-        };
-
-        while (match = re.exec(line)) {
-            var type = "text";
-            var rule = null;
-            var value = [match[0]];
-
-            for (var i = 0; i < match.length-2; i++) {
-                if (match[i + 1] === undefined)
-                    continue;
-
-                rule = state[mapping[i].rule];
-
-                if (mapping[i].len > 1)
-                    value = match.slice(i+2, i+1+mapping[i].len);
-
-                // compute token type
-                if (typeof rule.token == "function")
-                    type = rule.token.apply(this, value);
-                else
-                    type = rule.token;
-
-                var next = rule.next;
-                if (next && next !== currentState) {
-                    currentState = next;
-                    state = this.rules[currentState];
-                    mapping = this.matchMappings[currentState];
-                    lastIndex = re.lastIndex;
-
-                    re = this.regExps[currentState];
-                    re.lastIndex = lastIndex;
-                }
-                break;
-            }
-
-            if (value[0]) {
-                if (typeof type == "string") {
-                    value = [value.join("")];
-                    type = [type];
-                }
-                for (var i = 0; i < value.length; i++) {
-                    if (!value[i])
-                        continue;
-
-                    if ((!rule || rule.merge || type[i] === "text") && token.type === type[i]) {
-                        token.value += value[i];
-                    } else {
-                        if (token.type)
-                            tokens.push(token);
-
-                        token = {
-                            type: type[i],
-                            value: value[i]
-                        };
-                    }
-                }
-            }
-
-            if (lastIndex == line.length)
-                break;
-
-            lastIndex = re.lastIndex;
-        }
-
-        if (token.type)
-            tokens.push(token);
-
-        return {
-            tokens : tokens,
-            state : currentState
-        };
-    };
-
-}).call(Tokenizer.prototype);
-
-exports.Tokenizer = Tokenizer;
-});
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/text_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/lang'], function(require, exports, module) {
-"use strict";
-
-var lang = require("../lib/lang");
-
-var TextHighlightRules = function() {
-
-    // regexp must not have capturing parentheses
-    // regexps are ordered -> the first match is used
-
-    this.$rules = {
-        "start" : [{
-            token : "empty_line",
-            regex : '^$'
-        }, {
-            token : "text",
-            regex : ".+"
-        }]
-    };
-};
-
-(function() {
-
-    this.addRules = function(rules, prefix) {
-        for (var key in rules) {
-            var state = rules[key];
-            for (var i=0; i<state.length; i++) {
-                var rule = state[i];
-                if (rule.next) {
-                    rule.next = prefix + rule.next;
-                } else {
-                    rule.next = prefix + key;
-                }
-            }
-            this.$rules[prefix + key] = state;
-        }
-    };
-
-    this.getRules = function() {
-        return this.$rules;
-    };
-    
-    this.embedRules = function (HighlightRules, prefix, escapeRules, states) {
-        var embedRules = new HighlightRules().getRules();
-        if (states) {
-            for (var i = 0; i < states.length; i++) {
-                states[i] = prefix + states[i];
-            }
-        } else {
-            states = [];
-            for (var key in embedRules) {
-                states.push(prefix + key);
-            }
-        }
-        this.addRules(embedRules, prefix);
-        
-        for (var i = 0; i < states.length; i++) {
-            Array.prototype.unshift.apply(this.$rules[states[i]], lang.deepCopy(escapeRules));
-        }
-        
-        if (!this.$embeds) {
-            this.$embeds = [];
-        }
-        this.$embeds.push(prefix);
-    }
-    
-    this.getEmbeds = function() {
-        return this.$embeds;
-    }
-
-}).call(TextHighlightRules.prototype);
-
-exports.TextHighlightRules = TextHighlightRules;
-});
-/* vim:ts=4:sts=4:sw=4:
- * ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Chris Spencer <chris.ag.spencer AT googlemail DOT com>
- *
- * 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 ***** */
-
-define('ace/mode/behaviour', ['require', 'exports', 'module' ], function(require, exports, module) {
-"use strict";
-
-var Behaviour = function() {
-   this.$behaviours = {};
-};
-
-(function () {
-
-    this.add = function (name, action, callback) {
-        switch (undefined) {
-          case this.$behaviours:
-              this.$behaviours = {};
-          case this.$behaviours[name]:
-              this.$behaviours[name] = {};
-        }
-        this.$behaviours[name][action] = callback;
-    }
-    
-    this.addBehaviours = function (behaviours) {
-        for (var key in behaviours) {
-            for (var action in behaviours[key]) {
-                this.add(key, action, behaviours[key][action]);
-            }
-        }
-    }
-    
-    this.remove = function (name) {
-        if (this.$behaviours && this.$behaviours[name]) {
-            delete this.$behaviours[name];
-        }
-    }
-    
-    this.inherit = function (mode, filter) {
-        if (typeof mode === "function") {
-            var behaviours = new mode().getBehaviours(filter);
-        } else {
-            var behaviours = mode.getBehaviours(filter);
-        }
-        this.addBehaviours(behaviours);
-    }
-    
-    this.getBehaviours = function (filter) {
-        if (!filter) {
-            return this.$behaviours;
-        } else {
-            var ret = {}
-            for (var i = 0; i < filter.length; i++) {
-                if (this.$behaviours[filter[i]]) {
-                    ret[filter[i]] = this.$behaviours[filter[i]];
-                }
-            }
-            return ret;
-        }
-    }
-
-}).call(Behaviour.prototype);
-
-exports.Behaviour = Behaviour;
-});define('ace/unicode', ['require', 'exports', 'module' ], function(require, exports, module) {
-"use strict";
-
-/*
-XRegExp Unicode plugin pack: Categories 1.0
-(c) 2010 Steven Levithan
-MIT License
-<http://xregexp.com>
-Uses the Unicode 5.2 character database
-
-This package for the XRegExp Unicode plugin enables the following Unicode categories (aka properties):
-
-L - Letter (the top-level Letter category is included in the Unicode plugin base script)
-    Ll - Lowercase letter
-    Lu - Uppercase letter
-    Lt - Titlecase letter
-    Lm - Modifier letter
-    Lo - Letter without case
-M - Mark
-    Mn - Non-spacing mark
-    Mc - Spacing combining mark
-    Me - Enclosing mark
-N - Number
-    Nd - Decimal digit
-    Nl - Letter number
-    No -  Other number
-P - Punctuation
-    Pd - Dash punctuation
-    Ps - Open punctuation
-    Pe - Close punctuation
-    Pi - Initial punctuation
-    Pf - Final punctuation
-    Pc - Connector punctuation
-    Po - Other punctuation
-S - Symbol
-    Sm - Math symbol
-    Sc - Currency symbol
-    Sk - Modifier symbol
-    So - Other symbol
-Z - Separator
-    Zs - Space separator
-    Zl - Line separator
-    Zp - Paragraph separator
-C - Other
-    Cc - Control
-    Cf - Format
-    Co - Private use
-    Cs - Surrogate
-    Cn - Unassigned
-
-Example usage:
-
-    \p{N}
-    \p{Cn}
-*/
-
-
-// will be populated by addUnicodePackage
-exports.packages = {};
-
-addUnicodePackage({
-    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"
-});
-
-function addUnicodePackage (pack) {
-    var codePoint = /\w{4}/g;
-    for (var name in pack)
-        exports.packages[name] = pack[name].replace(codePoint, "\\u$&");
-};
-
-});/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/document', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/event_emitter', 'ace/range', 'ace/anchor'], function(require, exports, module) {
-"use strict";
-
-var oop = require("./lib/oop");
-var EventEmitter = require("./lib/event_emitter").EventEmitter;
-var Range = require("./range").Range;
-var Anchor = require("./anchor").Anchor;
-
-var Document = function(text) {
-    this.$lines = [];
-
-    if (Array.isArray(text)) {
-        this.insertLines(0, text);
-    }
-    // There has to be one line at least in the document. If you pass an empty
-    // string to the insert function, nothing will happen. Workaround.
-    else if (text.length == 0) {
-        this.$lines = [""];
-    } else {
-        this.insert({row: 0, column:0}, text);
-    }
-};
-
-(function() {
-
-    oop.implement(this, EventEmitter);
-
-    this.setValue = function(text) {
-        var len = this.getLength();
-        this.remove(new Range(0, 0, len, this.getLine(len-1).length));
-        this.insert({row: 0, column:0}, text);
-    };
-
-    this.getValue = function() {
-        return this.getAllLines().join(this.getNewLineCharacter());
-    };
-
-    this.createAnchor = function(row, column) {
-        return new Anchor(this, row, column);
-    };
-
-    // check for IE split bug
-    if ("aaa".split(/a/).length == 0)
-        this.$split = function(text) {
-            return text.replace(/\r\n|\r/g, "\n").split("\n");
-        }
-    else
-        this.$split = function(text) {
-            return text.split(/\r\n|\r|\n/);
-        };
-
-
-    this.$detectNewLine = function(text) {
-        var match = text.match(/^.*?(\r\n|\r|\n)/m);
-        if (match) {
-            this.$autoNewLine = match[1];
-        } else {
-            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(newLineMode) {
-        if (this.$newLineMode === newLineMode)
-            return;
-
-        this.$newLineMode = newLineMode;
-    };
-
-    this.getNewLineMode = function() {
-        return this.$newLineMode;
-    };
-
-    this.isNewLine = function(text) {
-        return (text == "\r\n" || text == "\r" || text == "\n");
-    };
-
-    /**
-     * Get a verbatim copy of the given line as it is in the document
-     */
-    this.getLine = function(row) {
-        return this.$lines[row] || "";
-    };
-
-    this.getLines = function(firstRow, lastRow) {
-        return this.$lines.slice(firstRow, lastRow + 1);
-    };
-
-    /**
-     * Returns all lines in the document as string array. Warning: The caller
-     * should not modify this array!
-     */
-    this.getAllLines = function() {
-        return this.getLines(0, this.getLength());
-    };
-
-    this.getLength = function() {
-        return this.$lines.length;
-    };
-
-    this.getTextRange = function(range) {
-        if (range.start.row == range.end.row) {
-            return this.$lines[range.start.row].substring(range.start.column,
-                                                         range.end.column);
-        }
-        else {
-            var lines = [];
-            lines.push(this.$lines[range.start.row].substring(range.start.column));
-            lines.push.apply(lines, this.getLines(range.start.row+1, range.end.row-1));
-            lines.push(this.$lines[range.end.row].substring(0, range.end.column));
-            return lines.join(this.getNewLineCharacter());
-        }
-    };
-
-    this.$clipPosition = function(position) {
-        var length = this.getLength();
-        if (position.row >= length) {
-            position.row = Math.max(0, length - 1);
-            position.column = this.getLine(length-1).length;
-        }
-        return position;
-    };
-
-    this.insert = function(position, text) {
-        if (!text || text.length === 0)
-            return position;
-
-        position = this.$clipPosition(position);
-
-        // only detect new lines if the document has no line break yet
-        if (this.getLength() <= 1)
-            this.$detectNewLine(text);
-
-        var lines = this.$split(text);
-        var firstLine = lines.splice(0, 1)[0];
-        var lastLine = lines.length == 0 ? null : lines.splice(lines.length - 1, 1)[0];
-
-        position = this.insertInLine(position, firstLine);
-        if (lastLine !== null) {
-            position = this.insertNewLine(position); // terminate first line
-            position = this.insertLines(position.row, lines);
-            position = this.insertInLine(position, lastLine || "");
-        }
-        return position;
-    };
-
-    this.insertLines = function(row, lines) {
-        if (lines.length == 0)
-            return {row: row, column: 0};
-
-        var args = [row, 0];
-        args.push.apply(args, lines);
-        this.$lines.splice.apply(this.$lines, args);
-
-        var range = new Range(row, 0, row + lines.length, 0);
-        var delta = {
-            action: "insertLines",
-            range: range,
-            lines: lines
-        };
-        this._emit("change", { data: delta });
-        return range.end;
-    };
-
-    this.insertNewLine = function(position) {
-        position = this.$clipPosition(position);
-        var line = this.$lines[position.row] || "";
-
-        this.$lines[position.row] = line.substring(0, position.column);
-        this.$lines.splice(position.row + 1, 0, line.substring(position.column, line.length));
-
-        var end = {
-            row : position.row + 1,
-            column : 0
-        };
-
-        var delta = {
-            action: "insertText",
-            range: Range.fromPoints(position, end),
-            text: this.getNewLineCharacter()
-        };
-        this._emit("change", { data: delta });
-
-        return end;
-    };
-
-    this.insertInLine = function(position, text) {
-        if (text.length == 0)
-            return position;
-
-        var line = this.$lines[position.row] || "";
-
-        this.$lines[position.row] = line.substring(0, position.column) + text
-                + line.substring(position.column);
-
-        var end = {
-            row : position.row,
-            column : position.column + text.length
-        };
-
-        var delta = {
-            action: "insertText",
-            range: Range.fromPoints(position, end),
-            text: text
-        };
-        this._emit("change", { data: delta });
-
-        return end;
-    };
-
-    this.remove = function(range) {
-        // clip to document
-        range.start = this.$clipPosition(range.start);
-        range.end = this.$clipPosition(range.end);
-
-        if (range.isEmpty())
-            return range.start;
-
-        var firstRow = range.start.row;
-        var lastRow = range.end.row;
-
-        if (range.isMultiLine()) {
-            var firstFullRow = range.start.column == 0 ? firstRow : firstRow + 1;
-            var lastFullRow = lastRow - 1;
-
-            if (range.end.column > 0)
-                this.removeInLine(lastRow, 0, range.end.column);
-
-            if (lastFullRow >= firstFullRow)
-                this.removeLines(firstFullRow, lastFullRow);
-
-            if (firstFullRow != firstRow) {
-                this.removeInLine(firstRow, range.start.column, this.getLine(firstRow).length);
-                this.removeNewLine(range.start.row);
-            }
-        }
-        else {
-            this.removeInLine(firstRow, range.start.column, range.end.column);
-        }
-        return range.start;
-    };
-
-    this.removeInLine = function(row, startColumn, endColumn) {
-        if (startColumn == endColumn)
-            return;
-
-        var range = new Range(row, startColumn, row, endColumn);
-        var line = this.getLine(row);
-        var removed = line.substring(startColumn, endColumn);
-        var newLine = line.substring(0, startColumn) + line.substring(endColumn, line.length);
-        this.$lines.splice(row, 1, newLine);
-
-        var delta = {
-            action: "removeText",
-            range: range,
-            text: removed
-        };
-        this._emit("change", { data: delta });
-        return range.start;
-    };
-
-    /**
-     * Removes a range of full lines
-     *
-     * @param firstRow {Integer} The first row to be removed
-     * @param lastRow {Integer} The last row to be removed
-     * @return {String[]} The removed lines
-     */
-    this.removeLines = function(firstRow, lastRow) {
-        var range = new Range(firstRow, 0, lastRow + 1, 0);
-        var removed = this.$lines.splice(firstRow, lastRow - firstRow + 1);
-
-        var delta = {
-            action: "removeLines",
-            range: range,
-            nl: this.getNewLineCharacter(),
-            lines: removed
-        };
-        this._emit("change", { data: delta });
-        return removed;
-    };
-
-    this.removeNewLine = function(row) {
-        var firstLine = this.getLine(row);
-        var secondLine = this.getLine(row+1);
-
-        var range = new Range(row, firstLine.length, row+1, 0);
-        var line = firstLine + secondLine;
-
-        this.$lines.splice(row, 2, line);
-
-        var delta = {
-            action: "removeText",
-            range: range,
-            text: this.getNewLineCharacter()
-        };
-        this._emit("change", { data: delta });
-    };
-
-    this.replace = function(range, text) {
-        if (text.length == 0 && range.isEmpty())
-            return range.start;
-
-        // Shortcut: If the text we want to insert is the same as it is already
-        // in the document, we don't have to replace anything.
-        if (text == this.getTextRange(range))
-            return range.end;
-
-        this.remove(range);
-        if (text) {
-            var end = this.insert(range.start, text);
-        }
-        else {
-            end = range.start;
-        }
-
-        return end;
-    };
-
-    this.applyDeltas = function(deltas) {
-        for (var i=0; i<deltas.length; i++) {
-            var delta = deltas[i];
-            var range = Range.fromPoints(delta.range.start, delta.range.end);
-
-            if (delta.action == "insertLines")
-                this.insertLines(range.start.row, delta.lines);
-            else if (delta.action == "insertText")
-                this.insert(range.start, delta.text);
-            else if (delta.action == "removeLines")
-                this.removeLines(range.start.row, range.end.row - 1);
-            else if (delta.action == "removeText")
-                this.remove(range);
-        }
-    };
-
-    this.revertDeltas = function(deltas) {
-        for (var i=deltas.length-1; i>=0; i--) {
-            var delta = deltas[i];
-
-            var range = Range.fromPoints(delta.range.start, delta.range.end);
-
-            if (delta.action == "insertLines")
-                this.removeLines(range.start.row, range.end.row - 1);
-            else if (delta.action == "insertText")
-                this.remove(range);
-            else if (delta.action == "removeLines")
-                this.insertLines(range.start.row, delta.lines);
-            else if (delta.action == "removeText")
-                this.insert(range.start, delta.text);
-        }
-    };
-
-}).call(Document.prototype);
-
-exports.Document = Document;
-});
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/anchor', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/event_emitter'], function(require, exports, module) {
-"use strict";
-
-var oop = require("./lib/oop");
-var EventEmitter = require("./lib/event_emitter").EventEmitter;
-
-/**
- * An Anchor is a floating pointer in the document. Whenever text is inserted or
- * deleted before the cursor, the position of the cursor is updated
- */
-var Anchor = exports.Anchor = function(doc, row, column) {
-    this.document = doc;
-    
-    if (typeof column == "undefined")
-        this.setPosition(row.row, row.column);
-    else
-        this.setPosition(row, column);
-
-    this.$onChange = this.onChange.bind(this);
-    doc.on("change", this.$onChange);
-};
-
-(function() {
-
-    oop.implement(this, EventEmitter);
-    
-    this.getPosition = function() {
-        return this.$clipPositionToDocument(this.row, this.column);
-    };
-    
-    this.getDocument = function() {
-        return this.document;
-    };
-    
-    this.onChange = function(e) {
-        var delta = e.data;
-        var range = delta.range;
-            
-        if (range.start.row == range.end.row && range.start.row != this.row)
-            return;
-            
-        if (range.start.row > this.row)
-            return;
-            
-        if (range.start.row == this.row && range.start.column > this.column)
-            return;
-    
-        var row = this.row;
-        var column = this.column;
-        
-        if (delta.action === "insertText") {
-            if (range.start.row === row && range.start.column <= column) {
-                if (range.start.row === range.end.row) {
-                    column += range.end.column - range.start.column;
-                }
-                else {
-                    column -= range.start.column;
-                    row += range.end.row - range.start.row;
-                }
-            }
-            else if (range.start.row !== range.end.row && range.start.row < row) {
-                row += range.end.row - range.start.row;
-            }
-        } else if (delta.action === "insertLines") {
-            if (range.start.row <= row) {
-                row += range.end.row - range.start.row;
-            }
-        }
-        else if (delta.action == "removeText") {
-            if (range.start.row == row && range.start.column < column) {
-                if (range.end.column >= column)
-                    column = range.start.column;
-                else
-                    column = Math.max(0, column - (range.end.column - range.start.column));
-                
-            } else if (range.start.row !== range.end.row && range.start.row < row) {
-                if (range.end.row == row) {
-                    column = Math.max(0, column - range.end.column) + range.start.column;
-                }
-                row -= (range.end.row - range.start.row);
-            }
-            else if (range.end.row == row) {
-                row -= range.end.row - range.start.row;
-                column = Math.max(0, column - range.end.column) + range.start.column;
-            }
-        } else if (delta.action == "removeLines") {
-            if (range.start.row <= row) {
-                if (range.end.row <= row)
-                    row -= range.end.row - range.start.row;
-                else {
-                    row = range.start.row;
-                    column = 0;
-                }
-            }
-        }
-
-        this.setPosition(row, column, true);
-    };
-
-    this.setPosition = function(row, column, noClip) {
-        var pos;
-        if (noClip) {
-            pos = {
-                row: row,
-                column: column
-            };
-        }
-        else {
-            pos = this.$clipPositionToDocument(row, column);
-        }
-        
-        if (this.row == pos.row && this.column == pos.column)
-            return;
-            
-        var old = {
-            row: this.row,
-            column: this.column
-        };
-        
-        this.row = pos.row;
-        this.column = pos.column;
-        this._emit("change", {
-            old: old,
-            value: pos
-        });
-    };
-    
-    this.detach = function() {
-        this.document.removeEventListener("change", this.$onChange);
-    };
-    
-    this.$clipPositionToDocument = function(row, column) {
-        var pos = {};
-    
-        if (row >= this.document.getLength()) {
-            pos.row = Math.max(0, this.document.getLength() - 1);
-            pos.column = this.document.getLine(pos.row).length;
-        }
-        else if (row < 0) {
-            pos.row = 0;
-            pos.column = 0;
-        }
-        else {
-            pos.row = row;
-            pos.column = Math.min(this.document.getLine(pos.row).length, Math.max(0, column));
-        }
-        
-        if (column < 0)
-            pos.column = 0;
-            
-        return pos;
-    };
-    
-}).call(Anchor.prototype);
-
-});
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/background_tokenizer', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/event_emitter'], function(require, exports, module) {
-"use strict";
-
-var oop = require("./lib/oop");
-var EventEmitter = require("./lib/event_emitter").EventEmitter;
-
-var BackgroundTokenizer = function(tokenizer, editor) {
-    this.running = false;    
-    this.lines = [];
-    this.currentLine = 0;
-    this.tokenizer = tokenizer;
-
-    var self = this;
-
-    this.$worker = function() {
-        if (!self.running) { return; }
-
-        var workerStart = new Date();
-        var startLine = self.currentLine;
-        var doc = self.doc;
-
-        var processedLines = 0;
-
-        var len = doc.getLength();
-        while (self.currentLine < len) {
-            self.lines[self.currentLine] = self.$tokenizeRows(self.currentLine, self.currentLine)[0];
-            self.currentLine++;
-
-            // only check every 5 lines
-            processedLines += 1;
-            if ((processedLines % 5 == 0) && (new Date() - workerStart) > 20) {
-                self.fireUpdateEvent(startLine, self.currentLine-1);
-                self.running = setTimeout(self.$worker, 20);
-                return;
-            }
-        }
-
-        self.running = false;
-
-        self.fireUpdateEvent(startLine, len - 1);
-    };
-};
-
-(function(){
-
-    oop.implement(this, EventEmitter);
-
-    this.setTokenizer = function(tokenizer) {
-        this.tokenizer = tokenizer;
-        this.lines = [];
-
-        this.start(0);
-    };
-
-    this.setDocument = function(doc) {
-        this.doc = doc;
-        this.lines = [];
-
-        this.stop();
-    };
-
-    this.fireUpdateEvent = function(firstRow, lastRow) {
-        var data = {
-            first: firstRow,
-            last: lastRow
-        };
-        this._emit("update", {data: data});
-    };
-
-    this.start = function(startRow) {
-        this.currentLine = Math.min(startRow || 0, this.currentLine,
-                                    this.doc.getLength());
-
-        // remove all cached items below this line
-        this.lines.splice(this.currentLine, this.lines.length);
-
-        this.stop();
-        // pretty long delay to prevent the tokenizer from interfering with the user
-        this.running = setTimeout(this.$worker, 700);
-    };
-
-    this.stop = function() {
-        if (this.running)
-            clearTimeout(this.running);
-        this.running = false;
-    };
-
-    this.getTokens = function(firstRow, lastRow) {
-        return this.$tokenizeRows(firstRow, lastRow);
-    };
-
-    this.getState = function(row) {
-        return this.$tokenizeRows(row, row)[0].state;
-    };
-
-    this.$tokenizeRows = function(firstRow, lastRow) {
-        if (!this.doc || isNaN(firstRow) || isNaN(lastRow))
-            return [{'state':'start','tokens':[]}];
-            
-        var rows = [];
-
-        // determine start state
-        var state = "start";
-        var doCache = false;
-        if (firstRow > 0 && this.lines[firstRow - 1]) {
-            state = this.lines[firstRow - 1].state;
-            doCache = true;
-        } else if (firstRow == 0) {
-            state = "start";
-            doCache = true;
-        } else if (this.lines.length > 0) {
-            // Guess that we haven't changed state.
-            state = this.lines[this.lines.length-1].state;
-        }
-
-        var lines = this.doc.getLines(firstRow, lastRow);
-        for (var row=firstRow; row<=lastRow; row++) {
-            if (!this.lines[row]) {
-                var tokens = this.tokenizer.getLineTokens(lines[row-firstRow] || "", state);
-                var state = tokens.state;
-                rows.push(tokens);
-
-                if (doCache) {
-                    this.lines[row] = tokens;
-                }
-            }
-            else {
-                var tokens = this.lines[row];
-                state = tokens.state;
-                rows.push(tokens);
-            }
-        }
-        return rows;
-    };
-
-}).call(BackgroundTokenizer.prototype);
-
-exports.BackgroundTokenizer = BackgroundTokenizer;
-});
-/* vim:ts=4:sts=4:sw=4:
- * ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Julian Viereck <julian DOT viereck AT gmail DOT com>
- *
- * 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 ***** */
-
-define('ace/edit_session/folding', ['require', 'exports', 'module' , 'ace/range', 'ace/edit_session/fold_line', 'ace/edit_session/fold', 'ace/token_iterator'], function(require, exports, module) {
-"use strict";
-
-var Range = require("../range").Range;
-var FoldLine = require("./fold_line").FoldLine;
-var Fold = require("./fold").Fold;
-var TokenIterator = require("../token_iterator").TokenIterator;
-
-function Folding() {
-    /**
-     * Looks up a fold at a given row/column. Possible values for side:
-     *   -1: ignore a fold if fold.start = row/column
-     *   +1: ignore a fold if fold.end = row/column
-     */
-    this.getFoldAt = function(row, column, side) {
-        var foldLine = this.getFoldLine(row);
-        if (!foldLine)
-            return null;
-
-        var folds = foldLine.folds;
-        for (var i = 0; i < folds.length; i++) {
-            var fold = folds[i];
-            if (fold.range.contains(row, column)) {
-                if (side == 1 && fold.range.isEnd(row, column)) {
-                    continue;
-                } else if (side == -1 && fold.range.isStart(row, column)) {
-                    continue;
-                }
-                return fold;
-            }
-        }
-    };
-
-    /**
-     * Returns all folds in the given range. Note, that this will return folds
-     *
-     */
-    this.getFoldsInRange = function(range) {
-        range = range.clone();
-        var start = range.start;
-        var end = range.end;
-        var foldLines = this.$foldData;
-        var foundFolds = [];
-
-        start.column += 1;
-        end.column -= 1;
-
-        for (var i = 0; i < foldLines.length; i++) {
-            var cmp = foldLines[i].range.compareRange(range);
-            if (cmp == 2) {
-                // Range is before foldLine. No intersection. This means,
-                // there might be other foldLines that intersect.
-                continue;
-            }
-            else if (cmp == -2) {
-                // Range is after foldLine. There can't be any other foldLines then,
-                // so let's give up.
-                break;
-            }
-
-            var folds = foldLines[i].folds;
-            for (var j = 0; j < folds.length; j++) {
-                var fold = folds[j];
-                cmp = fold.range.compareRange(range);
-                if (cmp == -2) {
-                    break;
-                } else if (cmp == 2) {
-                    continue;
-                } else
-                // WTF-state: Can happen due to -1/+1 to start/end column.
-                if (cmp == 42) {
-                    break;
-                }
-                foundFolds.push(fold);
-            }
-        }
-        return foundFolds;
-    };
-    
-    /**
-     * Returns all folds in the document
-     */
-    this.getAllFolds = function() {
-        var folds = [];
-        var foldLines = this.$foldData;
-        
-        function addFold(fold) {
-            folds.push(fold);
-            if (!fold.subFolds)
-                return;
-                
-            for (var i = 0; i < fold.subFolds.length; i++)
-                addFold(fold.subFolds[i]);
-        }
-        
-        for (var i = 0; i < foldLines.length; i++)
-            for (var j = 0; j < foldLines[i].folds.length; j++)
-                addFold(foldLines[i].folds[j]);
-
-        return folds;
-    };
-
-    /**
-     * Returns the string between folds at the given position.
-     * E.g.
-     *  foo<fold>b|ar<fold>wolrd -> "bar"
-     *  foo<fold>bar<fold>wol|rd -> "world"
-     *  foo<fold>bar<fo|ld>wolrd -> <null>
-     *
-     * where | means the position of row/column
-     *
-     * The trim option determs if the return string should be trimed according
-     * to the "side" passed with the trim value:
-     *
-     * E.g.
-     *  foo<fold>b|ar<fold>wolrd -trim=-1> "b"
-     *  foo<fold>bar<fold>wol|rd -trim=+1> "rld"
-     *  fo|o<fold>bar<fold>wolrd -trim=00> "foo"
-     */
-    this.getFoldStringAt = function(row, column, trim, foldLine) {
-        foldLine = foldLine || this.getFoldLine(row);
-        if (!foldLine)
-            return null;
-
-        var lastFold = {
-            end: { column: 0 }
-        };
-        // TODO: Refactor to use getNextFoldTo function.
-        var str, fold;
-        for (var i = 0; i < foldLine.folds.length; i++) {
-            fold = foldLine.folds[i];
-            var cmp = fold.range.compareEnd(row, column);
-            if (cmp == -1) {
-                str = this
-                    .getLine(fold.start.row)
-                    .substring(lastFold.end.column, fold.start.column);
-                break;
-            }
-            else if (cmp === 0) {
-                return null;
-            }
-            lastFold = fold;
-        }
-        if (!str)
-            str = this.getLine(fold.start.row).substring(lastFold.end.column);
-
-        if (trim == -1)
-            return str.substring(0, column - lastFold.end.column);
-        else if (trim == 1)
-            return str.substring(column - lastFold.end.column);
-        else
-            return str;
-    };
-
-    this.getFoldLine = function(docRow, startFoldLine) {
-        var foldData = this.$foldData;
-        var i = 0;
-        if (startFoldLine)
-            i = foldData.indexOf(startFoldLine);
-        if (i == -1)
-            i = 0;
-        for (i; i < foldData.length; i++) {
-            var foldLine = foldData[i];
-            if (foldLine.start.row <= docRow && foldLine.end.row >= docRow) {
-                return foldLine;
-            } else if (foldLine.end.row > docRow) {
-                return null;
-            }
-        }
-        return null;
-    };
-
-    // returns the fold which starts after or contains docRow
-    this.getNextFoldLine = function(docRow, startFoldLine) {
-        var foldData = this.$foldData;
-        var i = 0;
-        if (startFoldLine)
-            i = foldData.indexOf(startFoldLine);
-        if (i == -1)
-            i = 0;
-        for (i; i < foldData.length; i++) {
-            var foldLine = foldData[i];
-            if (foldLine.end.row >= docRow) {
-                return foldLine;
-            }
-        }
-        return null;
-    };
-
-    this.getFoldedRowCount = function(first, last) {
-        var foldData = this.$foldData, rowCount = last-first+1;
-        for (var i = 0; i < foldData.length; i++) {
-            var foldLine = foldData[i],
-                end = foldLine.end.row,
-                start = foldLine.start.row;
-            if (end >= last) {
-                if(start < last) {
-                    if(start >= first)
-                        rowCount -= last-start;
-                    else
-                        rowCount = 0;//in one fold
-                }
-                break;
-            } else if(end >= first){
-                if (start >= first) //fold inside range
-                    rowCount -=  end-start;
-                else
-                    rowCount -=  end-first+1;
-            }
-        }
-        return rowCount;
-    };
-
-    this.$addFoldLine = function(foldLine) {
-        this.$foldData.push(foldLine);
-        this.$foldData.sort(function(a, b) {
-            return a.start.row - b.start.row;
-        });
-        return foldLine;
-    };
-
-    /**
-     * Adds a new fold.
-     *
-     * @returns
-     *      The new created Fold object or an existing fold object in case the
-     *      passed in range fits an existing fold exactly.
-     */
-    this.addFold = function(placeholder, range) {
-        var foldData = this.$foldData;
-        var added = false;
-        var fold;
-        
-        if (placeholder instanceof Fold)
-            fold = placeholder;
-        else
-            fold = new Fold(range, placeholder);
-
-        this.$clipRangeToDocument(fold.range);
-
-        var startRow = fold.start.row;
-        var startColumn = fold.start.column;
-        var endRow = fold.end.row;
-        var endColumn = fold.end.column;
-
-        // --- Some checking ---
-        if (fold.placeholder.length < 2)
-            throw "Placeholder has to be at least 2 characters";
-
-        if (startRow == endRow && endColumn - startColumn < 2)
-            throw "The range has to be at least 2 characters width";
-
-        var startFold = this.getFoldAt(startRow, startColumn, 1);
-        var endFold = this.getFoldAt(endRow, endColumn, -1);
-        if (startFold && endFold == startFold)
-            return startFold.addSubFold(fold);
-
-        if (
-            (startFold && !startFold.range.isStart(startRow, startColumn))
-            || (endFold && !endFold.range.isEnd(endRow, endColumn))
-        ) {
-            throw "A fold can't intersect already existing fold" + fold.range + startFold.range;
-        }
-
-        // Check if there are folds in the range we create the new fold for.
-        var folds = this.getFoldsInRange(fold.range);
-        if (folds.length > 0) {
-            // Remove the folds from fold data.
-            this.removeFolds(folds);
-            // Add the removed folds as subfolds on the new fold.
-            fold.subFolds = folds;
-        }
-
-        for (var i = 0; i < foldData.length; i++) {
-            var foldLine = foldData[i];
-            if (endRow == foldLine.start.row) {
-                foldLine.addFold(fold);
-                added = true;
-                break;
-            }
-            else if (startRow == foldLine.end.row) {
-                foldLine.addFold(fold);
-                added = true;
-                if (!fold.sameRow) {
-                    // Check if we might have to merge two FoldLines.
-                    var foldLineNext = foldData[i + 1];
-                    if (foldLineNext && foldLineNext.start.row == endRow) {
-                        // We need to merge!
-                        foldLine.merge(foldLineNext);
-                        break;
-                    }
-                }
-                break;
-            }
-            else if (endRow <= foldLine.start.row) {
-                break;
-            }
-        }
-
-        if (!added)
-            foldLine = this.$addFoldLine(new FoldLine(this.$foldData, fold));
-
-        if (this.$useWrapMode)
-            this.$updateWrapData(foldLine.start.row, foldLine.start.row);
-
-        // Notify that fold data has changed.
-        this.$modified = true;
-        this._emit("changeFold", { data: fold });
-
-        return fold;
-    };
-
-    this.addFolds = function(folds) {
-        folds.forEach(function(fold) {
-            this.addFold(fold);
-        }, this);
-    };
-
-    this.removeFold = function(fold) {
-        var foldLine = fold.foldLine;
-        var startRow = foldLine.start.row;
-        var endRow = foldLine.end.row;
-
-        var foldLines = this.$foldData;
-        var folds = foldLine.folds;
-        // Simple case where there is only one fold in the FoldLine such that
-        // the entire fold line can get removed directly.
-        if (folds.length == 1) {
-            foldLines.splice(foldLines.indexOf(foldLine), 1);
-        } else
-        // If the fold is the last fold of the foldLine, just remove it.
-        if (foldLine.range.isEnd(fold.end.row, fold.end.column)) {
-            folds.pop();
-            foldLine.end.row = folds[folds.length - 1].end.row;
-            foldLine.end.column = folds[folds.length - 1].end.column;
-        } else
-        // If the fold is the first fold of the foldLine, just remove it.
-        if (foldLine.range.isStart(fold.start.row, fold.start.column)) {
-            folds.shift();
-            foldLine.start.row = folds[0].start.row;
-            foldLine.start.column = folds[0].start.column;
-        } else
-        // We know there are more then 2 folds and the fold is not at the edge.
-        // This means, the fold is somewhere in between.
-        //
-        // If the fold is in one row, we just can remove it.
-        if (fold.sameRow) {
-            folds.splice(folds.indexOf(fold), 1);
-        } else
-        // The fold goes over more then one row. This means remvoing this fold
-        // will cause the fold line to get splitted up. newFoldLine is the second part
-        {
-            var newFoldLine = foldLine.split(fold.start.row, fold.start.column);
-            folds = newFoldLine.folds;
-            folds.shift();
-            newFoldLine.start.row = folds[0].start.row;
-            newFoldLine.start.column = folds[0].start.column;
-        }
-
-        if (this.$useWrapMode) {
-            this.$updateWrapData(startRow, endRow);
-        }
-
-        // Notify that fold data has changed.
-        this.$modified = true;
-        this._emit("changeFold", { data: fold });
-    };
-
-    this.removeFolds = function(folds) {
-        // We need to clone the folds array passed in as it might be the folds
-        // array of a fold line and as we call this.removeFold(fold), folds
-        // are removed from folds and changes the current index.
-        var cloneFolds = [];
-        for (var i = 0; i < folds.length; i++) {
-            cloneFolds.push(folds[i]);
-        }
-
-        cloneFolds.forEach(function(fold) {
-            this.removeFold(fold);
-        }, this);
-        this.$modified = true;
-    };
-
-    this.expandFold = function(fold) {
-        this.removeFold(fold);
-        fold.subFolds.forEach(function(fold) {
-            this.addFold(fold);
-        }, this);
-        fold.subFolds = [];
-    };
-
-    this.expandFolds = function(folds) {
-        folds.forEach(function(fold) {
-            this.expandFold(fold);
-        }, this);
-    };
-
-    this.unfold = function(location, expandInner) {
-        var range, folds;
-        if (location == null)
-            range = new Range(0, 0, this.getLength(), 0);
-        else if (typeof location == "number")
-            range = new Range(location, 0, location, this.getLine(location).length);
-        else if ("row" in location)
-            range = Range.fromPoints(location, location);
-        else
-            range = location;
-
-        folds = this.getFoldsInRange(range);
-        if (expandInner) {
-            this.removeFolds(folds);
-        } else {
-            // TODO: might need to remove and add folds in one go instead of using
-            // expandFolds several times.
-            while (folds.length) {
-                this.expandFolds(folds);
-                folds = this.getFoldsInRange(range);
-            }
-        }
-    };
-
-    /**
-     * Checks if a given documentRow is folded. This is true if there are some
-     * folded parts such that some parts of the line is still visible.
-     **/
-    this.isRowFolded = function(docRow, startFoldRow) {
-        return !!this.getFoldLine(docRow, startFoldRow);
-    };
-
-    this.getRowFoldEnd = function(docRow, startFoldRow) {
-        var foldLine = this.getFoldLine(docRow, startFoldRow);
-        return (foldLine
-            ? foldLine.end.row
-            : docRow);
-    };
-
-    this.getFoldDisplayLine = function(foldLine, endRow, endColumn, startRow, startColumn) {
-        if (startRow == null) {
-            startRow = foldLine.start.row;
-            startColumn = 0;
-        }
-
-        if (endRow == null) {
-            endRow = foldLine.end.row;
-            endColumn = this.getLine(endRow).length;
-        }
-
-        // Build the textline using the FoldLine walker.
-        var doc = this.doc;
-        var textLine = "";
-
-        foldLine.walk(function(placeholder, row, column, lastColumn) {
-            if (row < startRow) {
-                return;
-            } else if (row == startRow) {
-                if (column < startColumn) {
-                    return;
-                }
-                lastColumn = Math.max(startColumn, lastColumn);
-            }
-            if (placeholder) {
-                textLine += placeholder;
-            } else {
-                textLine += doc.getLine(row).substring(lastColumn, column);
-            }
-        }.bind(this), endRow, endColumn);
-        return textLine;
-    };
-
-    this.getDisplayLine = function(row, endColumn, startRow, startColumn) {
-        var foldLine = this.getFoldLine(row);
-
-        if (!foldLine) {
-            var line;
-            line = this.doc.getLine(row);
-            return line.substring(startColumn || 0, endColumn || line.length);
-        } else {
-            return this.getFoldDisplayLine(
-                foldLine, row, endColumn, startRow, startColumn);
-        }
-    };
-
-    this.$cloneFoldData = function() {
-        var fd = [];
-        fd = this.$foldData.map(function(foldLine) {
-            var folds = foldLine.folds.map(function(fold) {
-                return fold.clone();
-            });
-            return new FoldLine(fd, folds);
-        });
-
-        return fd;
-    };
-
-    this.toggleFold = function(tryToUnfold) {
-        var selection = this.selection;
-        var range = selection.getRange();
-        var fold;
-        var bracketPos;
-
-        if (range.isEmpty()) {
-            var cursor = range.start;
-            fold = this.getFoldAt(cursor.row, cursor.column);
-
-            if (fold) {
-                this.expandFold(fold);
-                return;
-            }
-            else if (bracketPos = this.findMatchingBracket(cursor)) {
-                if (range.comparePoint(bracketPos) == 1) {
-                    range.end = bracketPos;
-                } 
-                else {
-                    range.start = bracketPos;
-                    range.start.column++;
-                    range.end.column--;
-                }
-            }
-            else if (bracketPos = this.findMatchingBracket({row: cursor.row, column: cursor.column + 1})) {
-                if (range.comparePoint(bracketPos) == 1)
-                    range.end = bracketPos;
-                else
-                    range.start = bracketPos;
-
-                range.start.column++;
-            }
-            else {
-                range = this.getCommentFoldRange(cursor.row, cursor.column) || range;
-            }
-        } else {
-            var folds = this.getFoldsInRange(range);
-            if (tryToUnfold && folds.length) {
-                this.expandFolds(folds);
-                return;
-            } 
-            else if (folds.length == 1 ) {
-                fold = folds[0];
-            }
-        }
-
-        if (!fold)
-            fold = this.getFoldAt(range.start.row, range.start.column);
-
-        if (fold && fold.range.toString() == range.toString()) {
-            this.expandFold(fold);
-            return;
-        }
-
-        var placeholder = "...";
-        if (!range.isMultiLine()) {
-            placeholder = this.getTextRange(range);
-            if(placeholder.length < 4)
-                return;
-            placeholder = placeholder.trim().substring(0, 2) + "..";
-        }
-
-        this.addFold(placeholder, range);
-    };
-
-    this.getCommentFoldRange = function(row, column) {
-        var iterator = new TokenIterator(this, row, column);
-        var token = iterator.getCurrentToken();
-        if (token && /^comment|string/.test(token.type)) {
-            var range = new Range();
-            var re = new RegExp(token.type.replace(/\..*/, "\\."));
-            do {
-                token = iterator.stepBackward();
-            } while(token && re.test(token.type));
-
-            iterator.stepForward();
-            range.start.row = iterator.getCurrentTokenRow();
-            range.start.column = iterator.getCurrentTokenColumn() + 2;
-
-            iterator = new TokenIterator(this, row, column);
-
-            do {
-                token = iterator.stepForward();
-            } while(token && re.test(token.type));
-            
-            token = iterator.stepBackward();
-
-            range.end.row = iterator.getCurrentTokenRow();
-            range.end.column = iterator.getCurrentTokenColumn() + token.value.length;
-            return range;
-        }
-    };
-
-    this.foldAll = function(startRow, endRow) {
-        var foldWidgets = this.foldWidgets;
-        endRow = endRow || this.getLength();
-        for (var row = startRow || 0; row < endRow; row++) {
-            if (foldWidgets[row] == null)
-                foldWidgets[row] = this.getFoldWidget(row);
-            if (foldWidgets[row] != "start")
-                continue;
-
-            var range = this.getFoldWidgetRange(row);
-            // sometimes range can be incompatible with existing fold
-            // wouldn't it be better for addFold to return null istead of throwing?
-            if (range && range.end.row < endRow) try {
-                this.addFold("...", range);
-            } catch(e) {}
-        }
-    };
-    
-    this.$foldStyles = {
-        "manual": 1,
-        "markbegin": 1,
-        "markbeginend": 1
-    };
-    this.$foldStyle = "markbegin";
-    this.setFoldStyle = function(style) {
-        if (!this.$foldStyles[style])
-            throw new Error("invalid fold style: " + style + "[" + Object.keys(this.$foldStyles).join(", ") + "]");
-        
-        if (this.$foldStyle == style)
-            return;
-
-        this.$foldStyle = style;
-        
-        if (style == "manual")
-            this.unfold();
-        
-        // reset folding
-        var mode = this.$foldMode;
-        this.$setFolding(null);
-        this.$setFolding(mode);
-    };
-
-    // structured folding
-    this.$setFolding = function(foldMode) {
-        if (this.$foldMode == foldMode)
-            return;
-            
-        this.$foldMode = foldMode;
-        
-        this.removeListener('change', this.$updateFoldWidgets);
-        this._emit("changeAnnotation");
-        
-        if (!foldMode || this.$foldStyle == "manual") {
-            this.foldWidgets = null;
-            return;
-        }
-        
-        this.foldWidgets = [];
-        this.getFoldWidget = foldMode.getFoldWidget.bind(foldMode, this, this.$foldStyle);
-        this.getFoldWidgetRange = foldMode.getFoldWidgetRange.bind(foldMode, this, this.$foldStyle);
-        
-        this.$updateFoldWidgets = this.updateFoldWidgets.bind(this);
-        this.on('change', this.$updateFoldWidgets);
-        
-    };
-
-    this.onFoldWidgetClick = function(row, e) {
-        var type = this.getFoldWidget(row);
-        var line = this.getLine(row);
-        var onlySubfolds = e.shiftKey;
-        var addSubfolds = onlySubfolds || e.ctrlKey || e.altKey || e.metaKey;
-        var fold;
-
-        if (type == "end")
-            fold = this.getFoldAt(row, 0, -1);
-        else
-            fold = this.getFoldAt(row, line.length, 1);
-
-        if (fold) {
-            if (addSubfolds)
-                this.removeFold(fold);
-            else
-                this.expandFold(fold);
-            return;
-        }
-
-        var range = this.getFoldWidgetRange(row);
-        if (range) {
-            // sometimes singleline folds can be missed by the code above
-            if (!range.isMultiLine()) {
-                fold = this.getFoldAt(range.start.row, range.start.column, 1);
-                if (fold && range.isEqual(fold.range)) {
-                    this.removeFold(fold);
-                    return;
-                }
-            }
-            
-            if (!onlySubfolds)
-                this.addFold("...", range);
-
-            if (addSubfolds)
-                this.foldAll(range.start.row + 1, range.end.row);
-        } else {
-            if (addSubfolds)
-                this.foldAll(row + 1, this.getLength());
-            e.target.className += " invalid"
-        }
-    };
-    
-    this.updateFoldWidgets = function(e) {
-        var delta = e.data;
-        var range = delta.range;
-        var firstRow = range.start.row;
-        var len = range.end.row - firstRow;
-
-        if (len === 0) {
-            this.foldWidgets[firstRow] = null;
-        } else if (delta.action == "removeText" || delta.action == "removeLines") {
-            this.foldWidgets.splice(firstRow, len + 1, null);
-        } else {
-            var args = Array(len + 1);
-            args.unshift(firstRow, 1);
-            this.foldWidgets.splice.apply(this.foldWidgets, args);
-        }
-    };
-
-}
-
-exports.Folding = Folding;
-
-});
-/* vim:ts=4:sts=4:sw=4:
- * ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Julian Viereck <julian DOT viereck AT gmail DOT com>
- *
- * 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 ***** */
-
-define('ace/edit_session/fold_line', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
-"use strict";
-
-var Range = require("../range").Range;
-
-/**
- * If an array is passed in, the folds are expected to be sorted already.
- */
-function FoldLine(foldData, folds) {
-    this.foldData = foldData;
-    if (Array.isArray(folds)) {
-        this.folds = folds;
-    } else {
-        folds = this.folds = [ folds ];
-    }
-
-    var last = folds[folds.length - 1]
-    this.range = new Range(folds[0].start.row, folds[0].start.column,
-                           last.end.row, last.end.column);
-    this.start = this.range.start;
-    this.end   = this.range.end;
-
-    this.folds.forEach(function(fold) {
-        fold.setFoldLine(this);
-    }, this);
-}
-
-(function() {
-    /**
-     * Note: This doesn't update wrapData!
-     */
-    this.shiftRow = function(shift) {
-        this.start.row += shift;
-        this.end.row += shift;
-        this.folds.forEach(function(fold) {
-            fold.start.row += shift;
-            fold.end.row += shift;
-        });
-    }
-
-    this.addFold = function(fold) {
-        if (fold.sameRow) {
-            if (fold.start.row < this.startRow || fold.endRow > this.endRow) {
-                throw "Can't add a fold to this FoldLine as it has no connection";
-            }
-            this.folds.push(fold);
-            this.folds.sort(function(a, b) {
-                return -a.range.compareEnd(b.start.row, b.start.column);
-            });
-            if (this.range.compareEnd(fold.start.row, fold.start.column) > 0) {
-                this.end.row = fold.end.row;
-                this.end.column =  fold.end.column;
-            } else if (this.range.compareStart(fold.end.row, fold.end.column) < 0) {
-                this.start.row = fold.start.row;
-                this.start.column = fold.start.column;
-            }
-        } else if (fold.start.row == this.end.row) {
-            this.folds.push(fold);
-            this.end.row = fold.end.row;
-            this.end.column = fold.end.column;
-        } else if (fold.end.row == this.start.row) {
-            this.folds.unshift(fold);
-            this.start.row = fold.start.row;
-            this.start.column = fold.start.column;
-        } else {
-            throw "Trying to add fold to FoldRow that doesn't have a matching row";
-        }
-        fold.foldLine = this;
-    }
-
-    this.containsRow = function(row) {
-        return row >= this.start.row && row <= this.end.row;
-    }
-
-    this.walk = function(callback, endRow, endColumn) {
-        var lastEnd = 0,
-            folds = this.folds,
-            fold,
-            comp, stop, isNewRow = true;
-
-        if (endRow == null) {
-            endRow = this.end.row;
-            endColumn = this.end.column;
-        }
-
-        for (var i = 0; i < folds.length; i++) {
-            fold = folds[i];
-
-            comp = fold.range.compareStart(endRow, endColumn);
-            // This fold is after the endRow/Column.
-            if (comp == -1) {
-                callback(null, endRow, endColumn, lastEnd, isNewRow);
-                return;
-            }
-
-            stop = callback(null, fold.start.row, fold.start.column, lastEnd, isNewRow);
-            stop = !stop && callback(fold.placeholder, fold.start.row, fold.start.column, lastEnd);
-
-            // If the user requested to stop the walk or endRow/endColumn is
-            // inside of this fold (comp == 0), then end here.
-            if (stop || comp == 0) {
-                return;
-            }
-
-            // Note the new lastEnd might not be on the same line. However,
-            // it's the callback's job to recognize this.
-            isNewRow = !fold.sameRow;
-            lastEnd = fold.end.column;
-        }
-        callback(null, endRow, endColumn, lastEnd, isNewRow);
-    }
-
-    this.getNextFoldTo = function(row, column) {
-        var fold, cmp;
-        for (var i = 0; i < this.folds.length; i++) {
-            fold = this.folds[i];
-            cmp = fold.range.compareEnd(row, column);
-            if (cmp == -1) {
-                return {
-                    fold: fold,
-                    kind: "after"
-                };
-            } else if (cmp == 0) {
-                return {
-                    fold: fold,
-                    kind: "inside"
-                }
-            }
-        }
-        return null;
-    }
-
-    this.addRemoveChars = function(row, column, len) {
-        var ret = this.getNextFoldTo(row, column),
-            fold, folds;
-        if (ret) {
-            fold = ret.fold;
-            if (ret.kind == "inside"
-                && fold.start.column != column
-                && fold.start.row != row)
-            {
-                throw "Moving characters inside of a fold should never be reached";
-            } else if (fold.start.row == row) {
-                folds = this.folds;
-                var i = folds.indexOf(fold);
-                if (i == 0) {
-                    this.start.column += len;
-                }
-                for (i; i < folds.length; i++) {
-                    fold = folds[i];
-                    fold.start.column += len;
-                    if (!fold.sameRow) {
-                        return;
-                    }
-                    fold.end.column += len;
-                }
-                this.end.column += len;
-            }
-        }
-    }
-
-    this.split = function(row, column) {
-        var fold = this.getNextFoldTo(row, column).fold,
-            folds = this.folds;
-        var foldData = this.foldData;
-
-        if (!fold) {
-            return null;
-        }
-        var i = folds.indexOf(fold);
-        var foldBefore = folds[i - 1];
-        this.end.row = foldBefore.end.row;
-        this.end.column = foldBefore.end.column;
-
-        // Remove the folds after row/column and create a new FoldLine
-        // containing these removed folds.
-        folds = folds.splice(i, folds.length - i);
-
-        var newFoldLine = new FoldLine(foldData, folds);
-        foldData.splice(foldData.indexOf(this) + 1, 0, newFoldLine);
-        return newFoldLine;
-    }
-
-    this.merge = function(foldLineNext) {
-        var folds = foldLineNext.folds;
-        for (var i = 0; i < folds.length; i++) {
-            this.addFold(folds[i]);
-        }
-        // Remove the foldLineNext - no longer needed, as
-        // it's merged now with foldLineNext.
-        var foldData = this.foldData;
-        foldData.splice(foldData.indexOf(foldLineNext), 1);
-    }
-
-    this.toString = function() {
-        var ret = [this.range.toString() + ": [" ];
-
-        this.folds.forEach(function(fold) {
-            ret.push("  " + fold.toString());
-        });
-        ret.push("]")
-        return ret.join("\n");
-    }
-
-    this.idxToPosition = function(idx) {
-        var lastFoldEndColumn = 0;
-        var fold;
-
-        for (var i = 0; i < this.folds.length; i++) {
-            var fold = this.folds[i];
-
-            idx -= fold.start.column - lastFoldEndColumn;
-            if (idx < 0) {
-                return {
-                    row: fold.start.row,
-                    column: fold.start.column + idx
-                };
-            }
-
-            idx -= fold.placeholder.length;
-            if (idx < 0) {
-                return fold.start;
-            }
-
-            lastFoldEndColumn = fold.end.column;
-        }
-
-        return {
-            row: this.end.row,
-            column: this.end.column + idx
-        };
-    }
-}).call(FoldLine.prototype);
-
-exports.FoldLine = FoldLine;
-});/* vim:ts=4:sts=4:sw=4:
- * ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Julian Viereck <julian DOT viereck AT gmail DOT com>
- *
- * 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 ***** */
-
-define('ace/edit_session/fold', ['require', 'exports', 'module' ], function(require, exports, module) {
-"use strict";
-
-/**
- * Simple fold-data struct.
- **/
-var Fold = exports.Fold = function(range, placeholder) {
-    this.foldLine = null;
-    this.placeholder = placeholder;
-    this.range = range;
-    this.start = range.start;
-    this.end = range.end;
-
-    this.sameRow = range.start.row == range.end.row;
-    this.subFolds = [];
-};
-
-(function() {
-
-    this.toString = function() {
-        return '"' + this.placeholder + '" ' + this.range.toString();
-    };
-
-    this.setFoldLine = function(foldLine) {
-        this.foldLine = foldLine;
-        this.subFolds.forEach(function(fold) {
-            fold.setFoldLine(foldLine);
-        });
-    };
-
-    this.clone = function() {
-        var range = this.range.clone();
-        var fold = new Fold(range, this.placeholder);
-        this.subFolds.forEach(function(subFold) {
-            fold.subFolds.push(subFold.clone());
-        });
-        return fold;
-    };
-
-    this.addSubFold = function(fold) {
-        if (this.range.isEqual(fold))
-            return this;
-
-        if (!this.range.containsRange(fold))
-            throw "A fold can't intersect already existing fold" + fold.range + this.range;
-
-        var row = fold.range.start.row, column = fold.range.start.column;
-        for (var i = 0, cmp = -1; i < this.subFolds.length; i++) {
-            cmp = this.subFolds[i].range.compare(row, column);
-            if (cmp != 1)
-                break;
-        }
-        var afterStart = this.subFolds[i];
-
-        if (cmp == 0)
-            return afterStart.addSubFold(fold)
-
-        // cmp == -1
-        var row = fold.range.end.row, column = fold.range.end.column;
-        for (var j = i, cmp = -1; j < this.subFolds.length; j++) {
-            cmp = this.subFolds[j].range.compare(row, column);
-            if (cmp != 1)
-                break;
-        }
-        var afterEnd = this.subFolds[j];
-
-        if (cmp == 0)
-            throw "A fold can't intersect already existing fold" + fold.range + this.range;
-
-        var consumedFolds = this.subFolds.splice(i, j - i, fold)
-        fold.setFoldLine(this.foldLine);
-
-        return fold;
-    }
-
-}).call(Fold.prototype);
-
-});/* vim:ts=4:sts=4:sw=4:
- * ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/token_iterator', ['require', 'exports', 'module' ], function(require, exports, module) {
-"use strict";
-
-var TokenIterator = function(session, initialRow, initialColumn) {
-    this.$session = session;
-    this.$row = initialRow;
-    this.$rowTokens = session.getTokens(initialRow, initialRow)[0].tokens;
-
-    var token = session.getTokenAt(initialRow, initialColumn);
-    this.$tokenIndex = token ? token.index : -1;
-};
-
-(function() {
-    
-    this.stepBackward = function() {
-        this.$tokenIndex -= 1;
-        
-        while (this.$tokenIndex < 0) {
-            this.$row -= 1;
-            if (this.$row < 0) {
-                this.$row = 0;
-                return 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 rowCount = this.$session.getLength();
-        this.$tokenIndex += 1;
-        
-        while (this.$tokenIndex >= this.$rowTokens.length) {
-            this.$row += 1;
-            if (this.$row >= rowCount) {
-                this.$row = rowCount - 1;
-                return 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 rowTokens = this.$rowTokens;
-        var tokenIndex = this.$tokenIndex;
-        
-        // If a column was cached by EditSession.getTokenAt, then use it
-        var column = rowTokens[tokenIndex].start;
-        if (column !== undefined)
-            return column;
-            
-        column = 0;
-        while (tokenIndex > 0) {
-            tokenIndex -= 1;
-            column += rowTokens[tokenIndex].value.length;
-        }
-        
-        return column;  
-    };
-            
-}).call(TokenIterator.prototype);
-
-exports.TokenIterator = TokenIterator;
-});
-/* vim:ts=4:sts=4:sw=4:
- * ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/edit_session/bracket_match', ['require', 'exports', 'module' , 'ace/token_iterator'], function(require, exports, module) {
-"use strict";
-
-var TokenIterator = require("../token_iterator").TokenIterator;
-
-function BracketMatch() {
-
-    this.findMatchingBracket = function(position) {
-        if (position.column == 0) return null;
-
-        var charBeforeCursor = this.getLine(position.row).charAt(position.column-1);
-        if (charBeforeCursor == "") return null;
-
-        var match = charBeforeCursor.match(/([\(\[\{])|([\)\]\}])/);
-        if (!match) {
-            return null;
-        }
-
-        if (match[1]) {
-            return this.$findClosingBracket(match[1], position);
-        } else {
-            return this.$findOpeningBracket(match[2], position);
-        }
-    };
-
-    this.$brackets = {
-        ")": "(",
-        "(": ")",
-        "]": "[",
-        "[": "]",
-        "{": "}",
-        "}": "{"
-    };
-
-    this.$findOpeningBracket = function(bracket, position) {
-        var openBracket = this.$brackets[bracket];
-        var depth = 1;
-
-        var iterator = new TokenIterator(this, position.row, position.column);
-        var token = iterator.getCurrentToken();
-        if (!token) return null;
-        
-        // token.type contains a period-delimited list of token identifiers
-        // (e.g.: "constant.numeric" or "paren.lparen").  Create a pattern that
-        // matches any token containing the same identifiers or a subset.  In
-        // addition, if token.type includes "rparen", then also match "lparen".
-        // So if type.token is "paren.rparen", then typeRe will match "lparen.paren".
-        var typeRe = new RegExp("(\\.?" +
-            token.type.replace(".", "|").replace("rparen", "lparen|rparen") + ")+");
-        
-        // Start searching in token, just before the character at position.column
-        var valueIndex = position.column - iterator.getCurrentTokenColumn() - 2;
-        var value = token.value;
-        
-        while (true) {
-        
-            while (valueIndex >= 0) {
-                var chr = value.charAt(valueIndex);
-                if (chr == openBracket) {
-                    depth -= 1;
-                    if (depth == 0) {
-                        return {row: iterator.getCurrentTokenRow(),
-                            column: valueIndex + iterator.getCurrentTokenColumn()};
-                    }
-                }
-                else if (chr == bracket) {
-                    depth += 1;
-                }
-                valueIndex -= 1;
-            }
-
-            // Scan backward through the document, looking for the next token
-            // whose type matches typeRe
-            do {
-                token = iterator.stepBackward();
-            } while (token && !typeRe.test(token.type));
-
-            if (token == null)
-                break;
-                
-            value = token.value;
-            valueIndex = value.length - 1;
-        }
-        
-        return null;
-    };
-
-    this.$findClosingBracket = function(bracket, position) {
-        var closingBracket = this.$brackets[bracket];
-        var depth = 1;
-
-        var iterator = new TokenIterator(this, position.row, position.column);
-        var token = iterator.getCurrentToken();
-        if (!token) return null;
-
-        // token.type contains a period-delimited list of token identifiers
-        // (e.g.: "constant.numeric" or "paren.lparen").  Create a pattern that
-        // matches any token containing the same identifiers or a subset.  In
-        // addition, if token.type includes "lparen", then also match "rparen".
-        // So if type.token is "lparen.paren", then typeRe will match "paren.rparen".
-        var typeRe = new RegExp("(\\.?" +
-            token.type.replace(".", "|").replace("lparen", "lparen|rparen") + ")+");
-
-        // Start searching in token, after the character at position.column
-        var valueIndex = position.column - iterator.getCurrentTokenColumn();
-
-        while (true) {
-
-            var value = token.value;
-            var valueLength = value.length;
-            while (valueIndex < valueLength) {
-                var chr = value.charAt(valueIndex);
-                if (chr == closingBracket) {
-                    depth -= 1;
-                    if (depth == 0) {
-                        return {row: iterator.getCurrentTokenRow(),
-                            column: valueIndex + iterator.getCurrentTokenColumn()};
-                    }
-                }
-                else if (chr == bracket) {
-                    depth += 1;
-                }
-                valueIndex += 1;
-            }
-
-            // Scan forward through the document, looking for the next token
-            // whose type matches typeRe
-            do {
-                token = iterator.stepForward();
-            } while (token && !typeRe.test(token.type));
-
-            if (token == null)
-                break;
-
-            valueIndex = 0;
-        }
-        
-        return null;
-    };
-}
-exports.BracketMatch = BracketMatch;
-
-});
-/* vim:ts=4:sts=4:sw=4:
- * ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *      Mihai Sucan <mihai DOT sucan AT gmail DOT com>
- *
- * 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 ***** */
-
-define('ace/search', ['require', 'exports', 'module' , 'ace/lib/lang', 'ace/lib/oop', 'ace/range'], function(require, exports, module) {
-"use strict";
-
-var lang = require("./lib/lang");
-var oop = require("./lib/oop");
-var Range = require("./range").Range;
-
-var Search = function() {
-    this.$options = {
-        needle: "",
-        backwards: false,
-        wrap: false,
-        caseSensitive: false,
-        wholeWord: false,
-        scope: Search.ALL,
-        regExp: false
-    };
-};
-
-Search.ALL = 1;
-Search.SELECTION = 2;
-
-(function() {
-
-    this.set = function(options) {
-        oop.mixin(this.$options, options);
-        return this;
-    };
-    
-    this.getOptions = function() {
-        return lang.copyObject(this.$options);
-    };
-
-    this.find = function(session) {
-        if (!this.$options.needle)
-            return null;
-
-        if (this.$options.backwards) {
-            var iterator = this.$backwardMatchIterator(session);
-        } else {
-            iterator = this.$forwardMatchIterator(session);
-        }
-
-        var firstRange = null;
-        iterator.forEach(function(range) {
-            firstRange = range;
-            return true;
-        });
-
-        return firstRange;
-    };
-
-    this.findAll = function(session) {
-        var options = this.$options;
-        if (!options.needle)
-            return [];
-
-        if (options.backwards) {
-            var iterator = this.$backwardMatchIterator(session);
-        } else {
-            iterator = this.$forwardMatchIterator(session);
-        }
-
-        var ignoreCursor = !options.start && options.wrap && options.scope == Search.ALL;
-        if (ignoreCursor)
-            options.start = {row: 0, column: 0};
-
-        var ranges = [];
-        iterator.forEach(function(range) {
-            ranges.push(range);
-        });
-
-        if (ignoreCursor)
-            options.start = null;
-
-        return ranges;
-    };
-
-    this.replace = function(input, replacement) {
-        var re = this.$assembleRegExp();
-        var match = re.exec(input);
-        if (match && match[0].length == input.length) {
-            if (this.$options.regExp) {
-                return input.replace(re, replacement);
-            } else {
-                return replacement;
-            }
-        } else {
-            return null;
-        }
-    };
-
-    this.$forwardMatchIterator = function(session) {
-        var re = this.$assembleRegExp();
-        var self = this;
-
-        return {
-            forEach: function(callback) {
-                self.$forwardLineIterator(session).forEach(function(line, startIndex, row) {
-                    if (startIndex) {
-                        line = line.substring(startIndex);
-                    }
-
-                    var matches = [];
-
-                    line.replace(re, function(str) {
-                        var offset = arguments[arguments.length-2];
-                        matches.push({
-                            str: str,
-                            offset: startIndex + offset
-                        });
-                        return str;
-                    });
-
-                    for (var i=0; i<matches.length; i++) {
-                        var match = matches[i];
-                        var range = self.$rangeFromMatch(row, match.offset, match.str.length);
-                        if (callback(range))
-                            return true;
-                    }
-
-                });
-            }
-        };
-    };
-
-    this.$backwardMatchIterator = function(session) {
-        var re = this.$assembleRegExp();
-        var self = this;
-
-        return {
-            forEach: function(callback) {
-                self.$backwardLineIterator(session).forEach(function(line, startIndex, row) {
-                    if (startIndex) {
-                        line = line.substring(startIndex);
-                    }
-
-                    var matches = [];
-
-                    line.replace(re, function(str, offset) {
-                        matches.push({
-                            str: str,
-                            offset: startIndex + offset
-                        });
-                        return str;
-                    });
-
-                    for (var i=matches.length-1; i>= 0; i--) {
-                        var match = matches[i];
-                        var range = self.$rangeFromMatch(row, match.offset, match.str.length);
-                        if (callback(range))
-                            return true;
-                    }
-                });
-            }
-        };
-    };
-
-    this.$rangeFromMatch = function(row, column, length) {
-        return new Range(row, column, row, column+length);
-    };
-
-    this.$assembleRegExp = function() {
-        if (this.$options.regExp) {
-            var needle = this.$options.needle;
-        } else {
-            needle = lang.escapeRegExp(this.$options.needle);
-        }
-
-        if (this.$options.wholeWord) {
-            needle = "\\b" + needle + "\\b";
-        }
-
-        var modifier = "g";
-        if (!this.$options.caseSensitive) {
-            modifier += "i";
-        }
-
-        var re = new RegExp(needle, modifier);
-        return re;
-    };
-
-    this.$forwardLineIterator = function(session) {
-        var searchSelection = this.$options.scope == Search.SELECTION;
-
-        var range = this.$options.range || session.getSelection().getRange();
-        var start = this.$options.start || range[searchSelection ? "start" : "end"];
-
-        var firstRow = searchSelection ? range.start.row : 0;
-        var firstColumn = searchSelection ? range.start.column : 0;
-        var lastRow = searchSelection ? range.end.row : session.getLength() - 1;
-
-        var wrap = this.$options.wrap;
-        var inWrap = false;
-
-        function getLine(row) {
-            var line = session.getLine(row);
-            if (searchSelection && row == range.end.row) {
-                line = line.substring(0, range.end.column);
-            }
-            if (inWrap && row == start.row) {
-                line = line.substring(0, start.column);
-            }
-            return line;
-        }
-
-        return {
-            forEach: function(callback) {
-                var row = start.row;
-
-                var line = getLine(row);
-                var startIndex = start.column;
-
-                var stop = false;
-                inWrap = false;
-
-                while (!callback(line, startIndex, row)) {
-
-                    if (stop) {
-                        return;
-                    }
-
-                    row++;
-                    startIndex = 0;
-
-                    if (row > lastRow) {
-                        if (wrap) {
-                            row = firstRow;
-                            startIndex = firstColumn;
-                            inWrap = true;
-                        } else {
-                            return;
-                        }
-                    }
-
-                    if (row == start.row)
-                        stop = true;
-
-                    line = getLine(row);
-                }
-            }
-        };
-    };
-
-    this.$backwardLineIterator = function(session) {
-        var searchSelection = this.$options.scope == Search.SELECTION;
-
-        var range = this.$options.range || session.getSelection().getRange();
-        var start = this.$options.start || range[searchSelection ? "end" : "start"];
-
-        var firstRow = searchSelection ? range.start.row : 0;
-        var firstColumn = searchSelection ? range.start.column : 0;
-        var lastRow = searchSelection ? range.end.row : session.getLength() - 1;
-
-        var wrap = this.$options.wrap;
-
-        return {
-            forEach : function(callback) {
-                var row = start.row;
-
-                var line = session.getLine(row).substring(0, start.column);
-                var startIndex = 0;
-                var stop = false;
-                var inWrap = false;
-
-                while (!callback(line, startIndex, row)) {
-
-                    if (stop)
-                        return;
-
-                    row--;
-                    startIndex = 0;
-
-                    if (row < firstRow) {
-                        if (wrap) {
-                            row = lastRow;
-                            inWrap = true;
-                        } else {
-                            return;
-                        }
-                    }
-
-                    if (row == start.row)
-                        stop = true;
-
-                    line = session.getLine(row);
-                    if (searchSelection) {
-                        if (row == firstRow)
-                            startIndex = firstColumn;
-                        else if (row == lastRow)
-                            line = line.substring(0, range.end.column);
-                    }
-
-                    if (inWrap && row == start.row)
-                        startIndex = start.column;
-                }
-            }
-        };
-    };
-
-}).call(Search.prototype);
-
-exports.Search = Search;
-});
-define('ace/commands/command_manager', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/keyboard/hash_handler', 'ace/lib/event_emitter'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var HashHandler = require("../keyboard/hash_handler").HashHandler;
-var EventEmitter = require("../lib/event_emitter").EventEmitter;
-
-var CommandManager = function(platform, commands) {
-    this.platform = platform;
-    this.commands = {};
-    this.commmandKeyBinding = {};
-
-    this.addCommands(commands);
-    
-    this.setDefaultHandler("exec", function(e) {
-        e.command.exec(e.editor, e.args || {});
-    });
-};
-
-oop.inherits(CommandManager, HashHandler);
-
-(function() {
-
-    oop.implement(this, EventEmitter);
-
-    this.exec = function(command, editor, args) {
-        if (typeof command === 'string')
-            command = this.commands[command];
-
-        if (!command)
-            return false;
-
-        if (editor && editor.$readOnly && !command.readOnly)
-            return false;
-
-        this._emit("exec", {editor: editor, command: command, args: args});
-        return true;
-    };
-
-    this.toggleRecording = function() {
-        if (this.$inReplay)
-            return;
-        if (this.recording) {
-            this.macro.pop();
-            this.removeEventListener("exec", this.$addCommandToMacro);
-
-            if (!this.macro.length)
-                this.macro = this.oldMacro;
-
-            return this.recording = false;
-        }
-        if (!this.$addCommandToMacro) {
-            this.$addCommandToMacro = function(e) {
-                    this.macro.push([e.command, e.args]);
-                }.bind(this);
-        }
-
-        this.oldMacro = this.macro;
-        this.macro = [];
-        this.on("exec", this.$addCommandToMacro);
-        return this.recording = true;
-    };
-
-    this.replay = function(editor) {
-        if (this.$inReplay || !this.macro)
-            return;
-
-        if (this.recording)
-            return this.toggleRecording();
-
-        try {
-            this.$inReplay = true;
-            this.macro.forEach(function(x) {
-                if (typeof x == "string")
-                    this.exec(x, editor);
-                else
-                    this.exec(x[0], editor, x[1]);
-            }, this);
-        } finally {
-            this.$inReplay = false;
-        }
-    };
-
-    this.trimMacro = function(m) {
-        return m.map(function(x){
-            if (typeof x[0] != "string")
-                x[0] = x[0].name;
-            if (!x[1])
-                x = x[0];
-            return x;
-        });
-    };
-
-}).call(CommandManager.prototype);
-
-exports.CommandManager = CommandManager;
-
-});
-/* ***** 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 Mozilla Skywriter.
- *
- * The Initial Developer of the Original Code is
- * Mozilla.
- * Portions created by the Initial Developer are Copyright (C) 2009
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Fabian Jakobs <fabian AT ajax DOT org>
- *   Julian Viereck (julian.viereck@gmail.com)
- *
- * 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 ***** */
-
-define('ace/keyboard/hash_handler', ['require', 'exports', 'module' , 'ace/lib/keys'], function(require, exports, module) {
-"use strict";
-
-var keyUtil  = require("../lib/keys");
-
-function HashHandler(config, platform) {
-    this.platform = platform;
-    this.commands = {};
-    this.commmandKeyBinding = {};
-
-    this.addCommands(config);
-};
-
-(function() {
-
-    this.addCommand = function(command) {
-        if (this.commands[command.name])
-            this.removeCommand(command);
-
-        this.commands[command.name] = command;
-
-        if (command.bindKey) {
-            this._buildKeyHash(command);
-        }
-    };
-
-    this.removeCommand = function(command) {
-        var name = (typeof command === 'string' ? command : command.name);
-        command = this.commands[name];
-        delete this.commands[name];
-
-        // exhaustive search is brute force but since removeCommand is
-        // not a performance critical operation this should be OK
-        var ckb = this.commmandKeyBinding;
-        for (var hashId in ckb) {
-            for (var key in ckb[hashId]) {
-                if (ckb[hashId][key] == command)
-                    delete ckb[hashId][key];
-            }
-        }
-    };
-
-    this.addCommands = function(commands) {
-        commands && Object.keys(commands).forEach(function(name) {
-            var command = commands[name];
-            if (typeof command === "string")
-                return this.bindKey(command, name);
-
-            if (typeof command === "function")
-                command = { exec: command };
-
-            if (!command.name)
-                command.name = name;
-
-            this.addCommand(command);
-        }, this);
-    };
-
-    this.removeCommands = function(commands) {
-        Object.keys(commands).forEach(function(name) {
-            this.removeCommand(commands[name]);
-        }, this);
-    };
-
-    this.bindKey = function(key, command) {
-        if(!key)
-            return;
-
-        var ckb = this.commmandKeyBinding;
-        key.split("|").forEach(function(keyPart) {
-            var binding = parseKeys(keyPart, command);
-            var hashId = binding.hashId;
-            (ckb[hashId] || (ckb[hashId] = {}))[binding.key] = command;
-        });
-    };
-
-    this.bindKeys = function(keyList) {
-        Object.keys(keyList).forEach(function(key) {
-            this.bindKey(key, keyList[key]);
-        }, this);
-    };
-
-    this._buildKeyHash = function(command) {
-        var binding = command.bindKey;
-        if (!binding)
-            return;
-
-        var key = typeof binding == "string" ? binding: binding[this.platform];
-        this.bindKey(key, command);
-    };
-
-    function parseKeys(keys, val, ret) {
-        var key;
-        var hashId = 0;
-        var parts = splitSafe(keys.toLowerCase());
-
-        for (var i = 0, l = parts.length; i < l; i++) {
-            if (keyUtil.KEY_MODS[parts[i]])
-                hashId = hashId | keyUtil.KEY_MODS[parts[i]];
-            else
-                key = parts[i] || "-"; //when empty, the splitSafe removed a '-'
-        }
-
-        return {
-            key: key,
-            hashId: hashId
-        };
-    }
-
-    function splitSafe(s) {
-        return (s.trim()
-            .split(new RegExp("[\\s ]*\\-[\\s ]*", "g"), 999));
-    }
-
-    this.findKeyCommand = function findKeyCommand(hashId, keyString) {
-        var ckbr = this.commmandKeyBinding;
-        return ckbr[hashId] && ckbr[hashId][keyString.toLowerCase()];
-    }
-
-    this.handleKeyboard = function(data, hashId, keyString, keyCode) {
-        return {
-            command: this.findKeyCommand(hashId, keyString)
-        };
-    };
-
-}).call(HashHandler.prototype)
-
-exports.HashHandler = HashHandler;
-});
-/* vim:ts=4:sts=4:sw=4:
- * ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *      Mihai Sucan <mihai DOT sucan AT gmail DOT com>
- *
- * 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 ***** */
-
-define('ace/undomanager', ['require', 'exports', 'module' ], function(require, exports, module) {
-"use strict";
-
-var UndoManager = function() {
-    this.reset();
-};
-
-(function() {
-
-    this.execute = function(options) {
-        var deltas = options.args[0];
-        this.$doc  = options.args[1];
-        this.$undoStack.push(deltas);
-        this.$redoStack = [];
-    };
-
-    this.undo = function(dontSelect) {
-        var deltas = this.$undoStack.pop();
-        var undoSelectionRange = null;
-        if (deltas) {
-            undoSelectionRange =
-                this.$doc.undoChanges(deltas, dontSelect);
-            this.$redoStack.push(deltas);
-        }
-        return undoSelectionRange;
-    };
-
-    this.redo = function(dontSelect) {
-        var deltas = this.$redoStack.pop();
-        var redoSelectionRange = null;
-        if (deltas) {
-            redoSelectionRange =
-                this.$doc.redoChanges(deltas, dontSelect);
-            this.$undoStack.push(deltas);
-        }
-        return redoSelectionRange;
-    };
-
-    this.reset = function() {
-        this.$undoStack = [];
-        this.$redoStack = [];
-    };
-
-    this.hasUndo = function() {
-        return this.$undoStack.length > 0;
-    };
-
-    this.hasRedo = function() {
-        return this.$redoStack.length > 0;
-    };
-
-}).call(UndoManager.prototype);
-
-exports.UndoManager = UndoManager;
-});
-/* vim:ts=4:sts=4:sw=4:
- * ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian@ajax.org>
- *      Irakli Gozalishvili <rfobic@gmail.com> (http://jeditoolkit.com)
- *      Julian Viereck <julian.viereck@gmail.com>
- *
- * 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 ***** */
-
-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(require, exports, module) {
-"use strict";
-
-var oop = require("./lib/oop");
-var dom = require("./lib/dom");
-var event = require("./lib/event");
-var useragent = require("./lib/useragent");
-var config = require("./config");
-var net = require("./lib/net");
-var GutterLayer = require("./layer/gutter").Gutter;
-var MarkerLayer = require("./layer/marker").Marker;
-var TextLayer = require("./layer/text").Text;
-var CursorLayer = require("./layer/cursor").Cursor;
-var ScrollBar = require("./scrollbar").ScrollBar;
-var RenderLoop = require("./renderloop").RenderLoop;
-var EventEmitter = require("./lib/event_emitter").EventEmitter;
-var editorCss = require("text!./css/editor.css");
-
-dom.importCssString(editorCss, "ace_editor");
-
-var VirtualRenderer = function(container, theme) {
-    var _self = this;
-
-    this.container = container;
-
-    // TODO: this breaks rendering in Cloud9 with multiple ace instances
-//    // Imports CSS once per DOM document ('ace_editor' serves as an identifier).
-//    dom.importCssString(editorCss, "ace_editor", container.ownerDocument);
-
-    dom.addCssClass(container, "ace_editor");
-
-    this.setTheme(theme);
-
-    this.$gutter = dom.createElement("div");
-    this.$gutter.className = "ace_gutter";
-    this.container.appendChild(this.$gutter);
-
-    this.scroller = dom.createElement("div");
-    this.scroller.className = "ace_scroller";
-    this.container.appendChild(this.scroller);
-
-    this.content = dom.createElement("div");
-    this.content.className = "ace_content";
-    this.scroller.appendChild(this.content);
-
-    this.$gutterLayer = new GutterLayer(this.$gutter);
-    this.$gutterLayer.on("changeGutterWidth", this.onResize.bind(this, true));
-
-    this.$markerBack = new MarkerLayer(this.content);
-
-    var textLayer = this.$textLayer = new TextLayer(this.content);
-    this.canvas = textLayer.element;
-
-    this.$markerFront = new MarkerLayer(this.content);
-
-    this.characterWidth = textLayer.getCharacterWidth();
-    this.lineHeight = textLayer.getLineHeight();
-
-    this.$cursorLayer = new CursorLayer(this.content);
-    this.$cursorPadding = 8;
-
-    // Indicates whether the horizontal scrollbar is visible
-    this.$horizScroll = true;
-    this.$horizScrollAlwaysVisible = true;
-
-    this.$animatedScroll = false;
-
-    this.scrollBar = new ScrollBar(container);
-    this.scrollBar.addEventListener("scroll", function(e) {
-        _self.session.setScrollTop(e.data);
-    });
-
-    this.scrollTop = 0;
-    this.scrollLeft = 0;
-
-    event.addListener(this.scroller, "scroll", function() {
-        var scrollLeft = _self.scroller.scrollLeft;
-        _self.scrollLeft = scrollLeft;
-        _self.session.setScrollLeft(scrollLeft);
-
-        if (scrollLeft == 0) {
-            _self.$gutter.className = "ace_gutter";
-        }
-        else {
-            _self.$gutter.className = "ace_gutter horscroll";
-        }
-    });
-
-    this.cursorPos = {
-        row : 0,
-        column : 0
-    };
-
-    this.$textLayer.addEventListener("changeCharacterSize", function() {
-        _self.characterWidth = textLayer.getCharacterWidth();
-        _self.lineHeight = textLayer.getLineHeight();
-        _self.$updatePrintMargin();
-        _self.onResize(true);
-
-        _self.$loop.schedule(_self.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 RenderLoop(
-        this.$renderChanges.bind(this),
-        this.container.ownerDocument.defaultView
-    );
-    this.$loop.schedule(this.CHANGE_FULL);
-
-    this.setPadding(4);
-    this.$updatePrintMargin();
-};
-
-(function() {
-    this.showGutter = true;
-
-    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;
-
-    oop.implement(this, EventEmitter);
-
-    this.setSession = function(session) {
-        this.session = session;
-        this.$cursorLayer.setSession(session);
-        this.$markerBack.setSession(session);
-        this.$markerFront.setSession(session);
-        this.$gutterLayer.setSession(session);
-        this.$textLayer.setSession(session);
-        this.$loop.schedule(this.CHANGE_FULL);
-    };
-
-    /**
-     * Triggers partial update of the text layer
-     */
-    this.updateLines = function(firstRow, lastRow) {
-        if (lastRow === undefined)
-            lastRow = Infinity;
-
-        if (!this.$changedLines) {
-            this.$changedLines = {
-                firstRow: firstRow,
-                lastRow: lastRow
-            };
-        }
-        else {
-            if (this.$changedLines.firstRow > firstRow)
-                this.$changedLines.firstRow = firstRow;
-
-            if (this.$changedLines.lastRow < lastRow)
-                this.$changedLines.lastRow = lastRow;
-        }
-
-        this.$loop.schedule(this.CHANGE_LINES);
-    };
-
-    /**
-     * Triggers full update of the text layer
-     */
-    this.updateText = function() {
-        this.$loop.schedule(this.CHANGE_TEXT);
-    };
-
-    /**
-     * Triggers a full update of all layers
-     */
-    this.updateFull = function() {
-        this.$loop.schedule(this.CHANGE_FULL);
-    };
-
-    this.updateFontSize = function() {
-        this.$textLayer.checkForSizeChanges();
-    };
-
-    /**
-     * Triggers resize of the editor
-     */
-    this.onResize = function(force) {
-        var changes = this.CHANGE_SIZE;
-        var size = this.$size;
-
-        var height = dom.getInnerHeight(this.container);
-        if (force || size.height != height) {
-            size.height = height;
-
-            this.scroller.style.height = height + "px";
-            size.scrollerHeight = this.scroller.clientHeight;
-            this.scrollBar.setHeight(size.scrollerHeight);
-
-            if (this.session) {
-                this.session.setScrollTop(this.getScrollTop());
-                changes = changes | this.CHANGE_FULL;
-            }
-        }
-
-        var width = dom.getInnerWidth(this.container);
-        if (force || size.width != width) {
-            size.width = width;
-
-            var gutterWidth = this.showGutter ? this.$gutter.offsetWidth : 0;
-            this.scroller.style.left = gutterWidth + "px";
-            size.scrollerWidth = Math.max(0, width - gutterWidth - this.scrollBar.getWidth());
-            this.scroller.style.width = size.scrollerWidth + "px";
-
-            if (this.session.getUseWrapMode() && this.adjustWrapLimit() || force)
-                changes = changes | this.CHANGE_FULL;
-        }
-
-        this.$loop.schedule(changes);
-    };
-
-    this.adjustWrapLimit = function() {
-        var availableWidth = this.$size.scrollerWidth - this.$padding * 2;
-        var limit = Math.floor(availableWidth / this.characterWidth);
-        return this.session.adjustWrapLimit(limit);
-    };
-
-    this.setAnimatedScroll = function(shouldAnimate){
-        this.$animatedScroll = shouldAnimate;
-    };
-
-    this.getAnimatedScroll = function() {
-        return this.$animatedScroll;
-    };
-
-    this.setShowInvisibles = function(showInvisibles) {
-        if (this.$textLayer.setShowInvisibles(showInvisibles))
-            this.$loop.schedule(this.CHANGE_TEXT);
-    };
-
-    this.getShowInvisibles = function() {
-        return this.$textLayer.showInvisibles;
-    };
-
-    this.$showPrintMargin = true;
-    this.setShowPrintMargin = function(showPrintMargin) {
-        this.$showPrintMargin = showPrintMargin;
-        this.$updatePrintMargin();
-    };
-
-    this.getShowPrintMargin = function() {
-        return this.$showPrintMargin;
-    };
-
-    this.$printMarginColumn = 80;
-    this.setPrintMarginColumn = function(showPrintMargin) {
-        this.$printMarginColumn = showPrintMargin;
-        this.$updatePrintMargin();
-    };
-
-    this.getPrintMarginColumn = function() {
-        return this.$printMarginColumn;
-    };
-
-    this.getShowGutter = function(){
-        return this.showGutter;
-    };
-
-    this.setShowGutter = function(show){
-        if(this.showGutter === show)
-            return;
-        this.$gutter.style.display = show ? "block" : "none";
-        this.showGutter = show;
-        this.onResize(true);
-    };
-
-    this.$updatePrintMargin = function() {
-        var containerEl;
-
-        if (!this.$showPrintMargin && !this.$printMarginEl)
-            return;
-
-        if (!this.$printMarginEl) {
-            containerEl = dom.createElement("div");
-            containerEl.className = "ace_print_margin_layer";
-            this.$printMarginEl = dom.createElement("div");
-            this.$printMarginEl.className = "ace_print_margin";
-            containerEl.appendChild(this.$printMarginEl);
-            this.content.insertBefore(containerEl, this.$textLayer.element);
-        }
-
-        var style = this.$printMarginEl.style;
-        style.left = ((this.characterWidth * this.$printMarginColumn) + this.$padding) + "px";
-        style.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(textarea) {
-        // in IE the native cursor always shines through
-        // this persists in IE9
-        if (useragent.isIE)
-            return;
-
-        if (this.layerConfig.lastRow === 0)
-            return;
-
-        var pos = this.$cursorLayer.getPixelPosition();
-        if (!pos)
-            return;
-
-        var bounds = this.content.getBoundingClientRect();
-        var offset = this.layerConfig.offset;
-
-        textarea.style.left = (bounds.left + pos.left) + "px";
-        textarea.style.top = (bounds.top + pos.top - this.scrollTop + offset) + "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 flint = Math.floor((this.layerConfig.height + this.layerConfig.offset) / this.layerConfig.lineHeight);
-        return this.layerConfig.firstRow - 1 + flint;
-    };
-
-    this.getLastVisibleRow = function() {
-        return this.layerConfig.lastRow;
-    };
-
-    this.$padding = null;
-    this.setPadding = function(padding) {
-        this.$padding = padding;
-        this.$textLayer.setPadding(padding);
-        this.$cursorLayer.setPadding(padding);
-        this.$markerFront.setPadding(padding);
-        this.$markerBack.setPadding(padding);
-        this.$loop.schedule(this.CHANGE_FULL);
-        this.$updatePrintMargin();
-    };
-
-    this.getHScrollBarAlwaysVisible = function() {
-        return this.$horizScrollAlwaysVisible;
-    };
-
-    this.setHScrollBarAlwaysVisible = function(alwaysVisible) {
-        if (this.$horizScrollAlwaysVisible != alwaysVisible) {
-            this.$horizScrollAlwaysVisible = alwaysVisible;
-            if (!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(changes) {
-        if (!changes || !this.session || !this.container.offsetWidth)
-            return;
-
-        // text, scrolling and resize changes can cause the view port size to change
-        if (changes & this.CHANGE_FULL ||
-            changes & this.CHANGE_SIZE ||
-            changes & this.CHANGE_TEXT ||
-            changes & this.CHANGE_LINES ||
-            changes & this.CHANGE_SCROLL
-        )
-            this.$computeLayerConfig();
-
-        // horizontal scrolling
-        if (changes & this.CHANGE_H_SCROLL) {
-            this.scroller.scrollLeft = this.scrollLeft;
-
-            // read the value after writing it since the value might get clipped
-            var scrollLeft = this.scroller.scrollLeft;
-            this.scrollLeft = scrollLeft;
-            this.session.setScrollLeft(scrollLeft);
-        }
-
-        // full
-        if (changes & this.CHANGE_FULL) {
-            this.$textLayer.checkForSizeChanges();
-            // update scrollbar first to not lose scroll position when gutter calls resize
-            this.$updateScrollBar();
-            this.$textLayer.update(this.layerConfig);
-            if (this.showGutter)
-                this.$gutterLayer.update(this.layerConfig);
-            this.$markerBack.update(this.layerConfig);
-            this.$markerFront.update(this.layerConfig);
-            this.$cursorLayer.update(this.layerConfig);
-            return;
-        }
-
-        // scrolling
-        if (changes & this.CHANGE_SCROLL) {
-            this.$updateScrollBar();
-            if (changes & this.CHANGE_TEXT || changes & this.CHANGE_LINES)
-                this.$textLayer.update(this.layerConfig);
-            else
-                this.$textLayer.scrollLines(this.layerConfig);
-
-            if (this.showGutter)
-                this.$gutterLayer.update(this.layerConfig);
-            this.$markerBack.update(this.layerConfig);
-            this.$markerFront.update(this.layerConfig);
-            this.$cursorLayer.update(this.layerConfig);
-            return;
-        }
-
-        if (changes & this.CHANGE_TEXT) {
-            this.$textLayer.update(this.layerConfig);
-            if (this.showGutter)
-                this.$gutterLayer.update(this.layerConfig);
-        }
-        else if (changes & this.CHANGE_LINES) {
-            if (this.$updateLines()) {
-                this.$updateScrollBar();
-                if (this.showGutter)
-                    this.$gutterLayer.update(this.layerConfig);
-            }
-        } else if (changes & this.CHANGE_GUTTER) {
-            if (this.showGutter)
-                this.$gutterLayer.update(this.layerConfig);
-        }
-
-        if (changes & this.CHANGE_CURSOR)
-            this.$cursorLayer.update(this.layerConfig);
-
-        if (changes & (this.CHANGE_MARKER | this.CHANGE_MARKER_FRONT)) {
-            this.$markerFront.update(this.layerConfig);
-        }
-
-        if (changes & (this.CHANGE_MARKER | this.CHANGE_MARKER_BACK)) {
-            this.$markerBack.update(this.layerConfig);
-        }
-
-        if (changes & this.CHANGE_SIZE)
-            this.$updateScrollBar();
-    };
-
-    this.$computeLayerConfig = function() {
-        var session = this.session;
-
-        var offset = this.scrollTop % this.lineHeight;
-        var minHeight = this.$size.scrollerHeight + this.lineHeight;
-
-        var longestLine = this.$getLongestLine();
-
-        var horizScroll = this.$horizScrollAlwaysVisible || this.$size.scrollerWidth - longestLine < 0;
-        var horizScrollChanged = this.$horizScroll !== horizScroll;
-        this.$horizScroll = horizScroll;
-        if (horizScrollChanged) {
-            this.scroller.style.overflowX = horizScroll ? "scroll" : "hidden";
-            // when we hide scrollbar scroll event isn't emited
-            // leaving session with wrong scrollLeft value
-            if (!horizScroll)
-                this.session.setScrollLeft(0);
-        }
-        var maxHeight = this.session.getScreenLength() * this.lineHeight;
-        this.session.setScrollTop(Math.max(0, Math.min(this.scrollTop, maxHeight - this.$size.scrollerHeight)));
-
-        var lineCount = Math.ceil(minHeight / this.lineHeight) - 1;
-        var firstRow = Math.max(0, Math.round((this.scrollTop - offset) / this.lineHeight));
-        var lastRow = firstRow + lineCount;
-
-        // Map lines on the screen to lines in the document.
-        var firstRowScreen, firstRowHeight;
-        var lineHeight = { lineHeight: this.lineHeight };
-        firstRow = session.screenToDocumentRow(firstRow, 0);
-
-        // Check if firstRow is inside of a foldLine. If true, then use the first
-        // row of the foldLine.
-        var foldLine = session.getFoldLine(firstRow);
-        if (foldLine) {
-            firstRow = foldLine.start.row;
-        }
-
-        firstRowScreen = session.documentToScreenRow(firstRow, 0);
-        firstRowHeight = session.getRowHeight(lineHeight, firstRow);
-
-        lastRow = Math.min(session.screenToDocumentRow(lastRow, 0), session.getLength() - 1);
-        minHeight = this.$size.scrollerHeight + session.getRowHeight(lineHeight, lastRow)+
-                                                firstRowHeight;
-
-        offset = this.scrollTop - firstRowScreen * this.lineHeight;
-
-        this.layerConfig = {
-            width : longestLine,
-            padding : this.$padding,
-            firstRow : firstRow,
-            firstRowScreen: firstRowScreen,
-            lastRow : lastRow,
-            lineHeight : this.lineHeight,
-            characterWidth : this.characterWidth,
-            minHeight : minHeight,
-            maxHeight : maxHeight,
-            offset : offset,
-            height : this.$size.scrollerHeight
-        };
-
-        // For debugging.
-        // console.log(JSON.stringify(this.layerConfig));
-
-        this.$gutterLayer.element.style.marginTop = (-offset) + "px";
-        this.content.style.marginTop = (-offset) + "px";
-        this.content.style.width = longestLine + 2 * this.$padding + "px";
-        this.content.style.height = minHeight + "px";
-
-        // Horizontal scrollbar visibility may have changed, which changes
-        // the client height of the scroller
-        if (horizScrollChanged)
-            this.onResize(true);
-    };
-
-    this.$updateLines = function() {
-        var firstRow = this.$changedLines.firstRow;
-        var lastRow = this.$changedLines.lastRow;
-        this.$changedLines = null;
-
-        var layerConfig = this.layerConfig;
-
-        // if the update changes the width of the document do a full redraw
-        if (layerConfig.width != this.$getLongestLine())
-            return this.$textLayer.update(layerConfig);
-
-        if (firstRow > layerConfig.lastRow + 1) { return; }
-        if (lastRow < layerConfig.firstRow) { return; }
-
-        // if the last row is unknown -> redraw everything
-        if (lastRow === Infinity) {
-            if (this.showGutter)
-                this.$gutterLayer.update(layerConfig);
-            this.$textLayer.update(layerConfig);
-            return;
-        }
-
-        // else update only the changed rows
-        this.$textLayer.updateLines(layerConfig, firstRow, lastRow);
-        return true;
-    };
-
-    this.$getLongestLine = function() {
-        var charCount = this.session.getScreenWidth();
-        if (this.$textLayer.showInvisibles)
-            charCount += 1;
-
-        return Math.max(this.$size.scrollerWidth - 2 * this.$padding, Math.round(charCount * this.characterWidth));
-    };
-
-    this.updateFrontMarkers = function() {
-        this.$markerFront.setMarkers(this.session.getMarkers(true));
-        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(row, className){
-        this.$gutterLayer.addGutterDecoration(row, className);
-        this.$loop.schedule(this.CHANGE_GUTTER);
-    };
-
-    this.removeGutterDecoration = function(row, className){
-        this.$gutterLayer.removeGutterDecoration(row, className);
-        this.$loop.schedule(this.CHANGE_GUTTER);
-    };
-
-    this.setBreakpoints = function(rows) {
-        this.$gutterLayer.setBreakpoints(rows);
-        this.$loop.schedule(this.CHANGE_GUTTER);
-    };
-
-    this.setAnnotations = function(annotations) {
-        this.$gutterLayer.setAnnotations(annotations);
-        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(anchor, lead) {
-        // first scroll anchor into view then scroll lead into view
-        this.scrollCursorIntoView(anchor);
-        this.scrollCursorIntoView(lead);
-    };
-
-    this.scrollCursorIntoView = function(cursor) {
-        // the editor is not visible
-        if (this.$size.scrollerHeight === 0)
-            return;
-
-        var pos = this.$cursorLayer.getPixelPosition(cursor);
-
-        var left = pos.left;
-        var top = pos.top;
-
-        if (this.scrollTop > top) {
-            this.session.setScrollTop(top);
-        }
-
-        if (this.scrollTop + this.$size.scrollerHeight < top + this.lineHeight) {
-            this.session.setScrollTop(top + this.lineHeight - this.$size.scrollerHeight);
-        }
-
-        var scrollLeft = this.scrollLeft;
-
-        if (scrollLeft > left) {
-            if (left < this.$padding + 2 * this.layerConfig.characterWidth)
-                left = 0;
-            this.session.setScrollLeft(left);
-        }
-
-        if (scrollLeft + this.$size.scrollerWidth < left + this.characterWidth) {
-            this.session.setScrollLeft(Math.round(left + 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(row) {
-        this.session.setScrollTop(row * this.lineHeight);
-    };
-
-    this.STEPS = 10;
-    this.$calcSteps = function(fromValue, toValue){
-        var i = 0;
-        var l = this.STEPS;
-        var steps = [];
-
-        var func  = function(t, x_min, dx) {
-            if ((t /= .5) < 1)
-                return dx / 2 * Math.pow(t, 3) + x_min;
-            return dx / 2 * (Math.pow(t - 2, 3) + 2) + x_min;
-        };
-
-        for (i = 0; i < l; ++i)
-            steps.push(func(i / this.STEPS, fromValue, toValue - fromValue));
-        steps.push(toValue);
-
-        return steps;
-    };
-
-    this.scrollToLine = function(line, center) {
-        var pos = this.$cursorLayer.getPixelPosition({row: line, column: 0});
-        var offset = pos.top;
-        if (center)
-            offset -= this.$size.scrollerHeight / 2;
-
-        if (this.$animatedScroll && Math.abs(offset - this.scrollTop) < 10000) {
-            var _self = this;
-            var steps = _self.$calcSteps(this.scrollTop, offset);
-
-            clearInterval(this.$timer);
-            this.$timer = setInterval(function() {
-                _self.session.setScrollTop(steps.shift());
-                
-                if (!steps.length)
-                    clearInterval(_self.$timer);
-            }, 10);
-        }
-        else {
-            this.session.setScrollTop(offset);
-        }
-    };
-
-    this.scrollToY = function(scrollTop) {
-        // after calling scrollBar.setScrollTop
-        // scrollbar sends us event with same scrollTop. ignore it
-        if (this.scrollTop !== scrollTop) {
-            this.$loop.schedule(this.CHANGE_SCROLL);
-            this.scrollTop = scrollTop;
-        }
-    };
-
-    this.scrollToX = function(scrollLeft) {
-        if (scrollLeft <= this.$padding)
-            scrollLeft = 0;
-
-        if (this.scrollLeft !== scrollLeft)
-            this.scrollLeft = scrollLeft;
-        this.$loop.schedule(this.CHANGE_H_SCROLL);
-    };
-
-    this.scrollBy = function(deltaX, deltaY) {
-        deltaY && this.session.setScrollTop(this.session.getScrollTop() + deltaY);
-        deltaX && this.session.setScrollLeft(this.session.getScrollLeft() + deltaX);
-    };
-
-    this.isScrollableBy = function(deltaX, deltaY) {
-        if (deltaY < 0 && this.session.getScrollTop() > 0)
-           return true;
-        if (deltaY > 0 && this.session.getScrollTop() + this.$size.scrollerHeight < this.layerConfig.maxHeight)
-           return true;
-        // todo: handle horizontal scrolling
-    };
-
-    this.pixelToScreenCoordinates = function(pageX, pageY) {
-        var canvasPos = this.scroller.getBoundingClientRect();
-
-        var col = Math.round(
-            (pageX + this.scrollLeft - canvasPos.left - this.$padding - dom.getPageScrollLeft()) / this.characterWidth
-        );
-        var row = Math.floor(
-            (pageY + this.scrollTop - canvasPos.top - dom.getPageScrollTop()) / this.lineHeight
-        );
-
-        return {row: row, column: col};
-    };
-
-    this.screenToTextCoordinates = function(pageX, pageY) {
-        var canvasPos = this.scroller.getBoundingClientRect();
-
-        var col = Math.round(
-            (pageX + this.scrollLeft - canvasPos.left - this.$padding - dom.getPageScrollLeft()) / this.characterWidth
-        );
-        var row = Math.floor(
-            (pageY + this.scrollTop - canvasPos.top - dom.getPageScrollTop()) / this.lineHeight
-        );
-
-        return this.session.screenToDocumentPosition(row, Math.max(col, 0));
-    };
-
-    this.textToScreenCoordinates = function(row, column) {
-        var canvasPos = this.scroller.getBoundingClientRect();
-        var pos = this.session.documentToScreenPosition(row, column);
-
-        var x = this.$padding + Math.round(pos.column * this.characterWidth);
-        var y = pos.row * this.lineHeight;
-
-        return {
-            pageX: canvasPos.left + x - this.scrollLeft,
-            pageY: canvasPos.top + y - this.scrollTop
-        };
-    };
-
-    this.visualizeFocus = function() {
-        dom.addCssClass(this.container, "ace_focus");
-    };
-
-    this.visualizeBlur = function() {
-        dom.removeCssClass(this.container, "ace_focus");
-    };
-
-    this.showComposition = function(position) {
-        if (!this.$composition) {
-            this.$composition = dom.createElement("div");
-            this.$composition.className = "ace_composition";
-            this.content.appendChild(this.$composition);
-        }
-
-        this.$composition.innerHTML = "&#160;";
-
-        var pos = this.$cursorLayer.getPixelPosition();
-        var style = this.$composition.style;
-        style.top = pos.top + "px";
-        style.left = (pos.left + this.$padding) + "px";
-        style.height = this.lineHeight + "px";
-
-        this.hideCursor();
-    };
-
-    this.setCompositionText = function(text) {
-        dom.setInnerText(this.$composition, text);
-    };
-
-    this.hideComposition = function() {
-        this.showCursor();
-
-        if (!this.$composition)
-            return;
-
-        var style = this.$composition.style;
-        style.top = "-10000px";
-        style.left = "-10000px";
-    };
-
-    this._loadTheme = function(name, callback) {
-        if (!config.get("packaged"))
-            return callback();
-
-        var base = name.split("/").pop();
-        var filename = config.get("themePath") + "/theme-" + base + config.get("suffix");
-        net.loadScript(filename, callback);
-    };
-
-    this.setTheme = function(theme) {
-        var _self = this;
-
-        this.$themeValue = theme;
-        if (!theme || typeof theme == "string") {
-            var moduleName = theme || "ace/theme/textmate";
-
-            var module;
-            try {
-                module = require(moduleName);
-            } catch (e) {};
-            if (module)
-                return afterLoad(module);
-
-            _self._loadTheme(moduleName, function() {
-                require([moduleName], function(module) {
-                    if (_self.$themeValue !== theme)
-                        return;
-
-                    afterLoad(module);
-                });
-            });
-        } else {
-            afterLoad(theme);
-        }
-
-        function afterLoad(theme) {
-            dom.importCssString(
-                theme.cssText,
-                theme.cssClass,
-                _self.container.ownerDocument
-            );
-
-            if (_self.$theme)
-                dom.removeCssClass(_self.container, _self.$theme);
-
-            _self.$theme = theme ? theme.cssClass : null;
-
-            if (_self.$theme)
-                dom.addCssClass(_self.container, _self.$theme);
-
-            if (theme && theme.isDark)
-                dom.addCssClass(_self.container, "ace_dark");
-            else
-                dom.removeCssClass(_self.container, "ace_dark");
-
-            // force re-measure of the gutter width
-            if (_self.$size) {
-                _self.$size.width = 0;
-                _self.onResize();
-            }
-        }
-    };
-
-    this.getTheme = function() {
-        return this.$themeValue;
-    };
-
-    // Methods allows to add / remove CSS classnames to the editor element.
-    // This feature can be used by plug-ins to provide a visual indication of
-    // a certain mode that editor is in.
-
-    this.setStyle = function setStyle(style) {
-      dom.addCssClass(this.container, style);
-    };
-
-    this.unsetStyle = function unsetStyle(style) {
-      dom.removeCssClass(this.container, style);
-    };
-
-    this.destroy = function() {
-        this.$textLayer.destroy();
-        this.$cursorLayer.destroy();
-    };
-
-}).call(VirtualRenderer.prototype);
-
-exports.VirtualRenderer = VirtualRenderer;
-});
-/* vim:ts=4:sts=4:sw=4:
- * ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *      Julian Viereck <julian DOT viereck AT gmail DOT com>
- *
- * 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 ***** */
-
-define('ace/layer/gutter', ['require', 'exports', 'module' , 'ace/lib/dom', 'ace/lib/oop', 'ace/lib/event_emitter'], function(require, exports, module) {
-"use strict";
-
-var dom = require("../lib/dom");
-var oop = require("../lib/oop");
-var EventEmitter = require("../lib/event_emitter").EventEmitter;
-
-var Gutter = function(parentEl) {
-    this.element = dom.createElement("div");
-    this.element.className = "ace_layer ace_gutter-layer";
-    parentEl.appendChild(this.element);
-    this.setShowFoldWidgets(this.$showFoldWidgets);
-    
-    this.gutterWidth = 0;
-
-    this.$breakpoints = [];
-    this.$annotations = [];
-    this.$decorations = [];
-};
-
-(function() {
-
-    oop.implement(this, EventEmitter);
-    
-    this.setSession = function(session) {
-        this.session = session;
-    };
-
-    this.addGutterDecoration = function(row, className){
-        if (!this.$decorations[row])
-            this.$decorations[row] = "";
-        this.$decorations[row] += " " + className;
-    };
-
-    this.removeGutterDecoration = function(row, className){
-        this.$decorations[row] = this.$decorations[row].replace(" " + className, "");
-    };
-
-    this.setBreakpoints = function(rows) {
-        this.$breakpoints = rows.concat();
-    };
-
-    this.setAnnotations = function(annotations) {
-        // iterate over sparse array
-        this.$annotations = [];
-        for (var row in annotations) if (annotations.hasOwnProperty(row)) {
-            var rowAnnotations = annotations[row];
-            if (!rowAnnotations)
-                continue;
-
-            var rowInfo = this.$annotations[row] = {
-                text: []
-            };
-            for (var i=0; i<rowAnnotations.length; i++) {
-                var annotation = rowAnnotations[i];
-                var annoText = annotation.text.replace(/"/g, "&quot;").replace(/'/g, "&#8217;").replace(/</, "&lt;");
-                if (rowInfo.text.indexOf(annoText) === -1)
-                    rowInfo.text.push(annoText);
-                var type = annotation.type;
-                if (type == "error")
-                    rowInfo.className = "ace_error";
-                else if (type == "warning" && rowInfo.className != "ace_error")
-                    rowInfo.className = "ace_warning";
-                else if (type == "info" && (!rowInfo.className))
-                    rowInfo.className = "ace_info";
-            }
-        }
-    };
-
-    this.update = function(config) {
-        this.$config = config;
-
-        var emptyAnno = {className: "", text: []};
-        var html = [];
-        var i = config.firstRow;
-        var lastRow = config.lastRow;
-        var fold = this.session.getNextFoldLine(i);
-        var foldStart = fold ? fold.start.row : Infinity;
-        var foldWidgets = this.$showFoldWidgets && this.session.foldWidgets;
-
-        while (true) {
-            if(i > foldStart) {
-                i = fold.end.row + 1;
-                fold = this.session.getNextFoldLine(i, fold);
-                foldStart = fold ?fold.start.row :Infinity;
-            }
-            if(i > lastRow)
-                break;
-
-            var annotation = this.$annotations[i] || emptyAnno;
-            html.push("<div class='ace_gutter-cell",
-                this.$decorations[i] || "",
-                this.$breakpoints[i] ? " ace_breakpoint " : " ",
-                annotation.className,
-                "' title='", annotation.text.join("\n"),
-                "' style='height:", config.lineHeight, "px;'>", (i+1));
-
-            if (foldWidgets) {
-                var c = foldWidgets[i];
-                // check if cached value is invalidated and we need to recompute
-                if (c == null)
-                    c = foldWidgets[i] = this.session.getFoldWidget(i);
-                if (c)
-                    html.push(
-                        "<span class='ace_fold-widget ", c,
-                        c == "start" && i == foldStart && i < fold.end.row ? " closed" : " open",
-                        "'></span>"
-                    );
-            }
-
-            var wrappedRowLength = this.session.getRowLength(i) - 1;
-            while (wrappedRowLength--) {
-                html.push("</div><div class='ace_gutter-cell' style='height:", config.lineHeight, "px'>\xA6");
-            }
-
-            html.push("</div>");
-
-            i++;
-        }
-        this.element = dom.setInnerHtml(this.element, html.join(""));
-        this.element.style.height = config.minHeight + "px";
-        
-        var gutterWidth = this.element.offsetWidth;
-        if (gutterWidth !== this.gutterWidth) {
-            this.gutterWidth = gutterWidth;
-            this._emit("changeGutterWidth", gutterWidth);
-        }
-    };
-
-    this.$showFoldWidgets = true;
-    this.setShowFoldWidgets = function(show) {
-        if (show)
-            dom.addCssClass(this.element, "ace_folding-enabled");
-        else
-            dom.removeCssClass(this.element, "ace_folding-enabled");
-
-        this.$showFoldWidgets = show;
-    };
-    
-    this.getShowFoldWidgets = function() {
-        return this.$showFoldWidgets;
-    };
-
-}).call(Gutter.prototype);
-
-exports.Gutter = Gutter;
-
-});
-/* vim:ts=4:sts=4:sw=4:
- * ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *      Julian Viereck <julian.viereck@gmail.com>
- *
- * 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 ***** */
-
-define('ace/layer/marker', ['require', 'exports', 'module' , 'ace/range', 'ace/lib/dom'], function(require, exports, module) {
-"use strict";
-
-var Range = require("../range").Range;
-var dom = require("../lib/dom");
-
-var Marker = function(parentEl) {
-    this.element = dom.createElement("div");
-    this.element.className = "ace_layer ace_marker-layer";
-    parentEl.appendChild(this.element);
-};
-
-(function() {
-
-    this.$padding = 0;
-
-    this.setPadding = function(padding) {
-        this.$padding = padding;
-    };
-    this.setSession = function(session) {
-        this.session = session;
-    };
-    
-    this.setMarkers = function(markers) {
-        this.markers = markers;
-    };
-
-    this.update = function(config) {
-        var config = config || this.config;
-        if (!config)
-            return;
-
-        this.config = config;
-
-
-        var html = [];
-        for ( var key in this.markers) {
-            var marker = this.markers[key];
-
-            var range = marker.range.clipRows(config.firstRow, config.lastRow);
-            if (range.isEmpty()) continue;
-
-            range = range.toScreenRange(this.session);
-            if (marker.renderer) {
-                var top = this.$getTop(range.start.row, config);
-                var left = Math.round(
-                    this.$padding + range.start.column * config.characterWidth
-                );
-                marker.renderer(html, range, left, top, config);
-            }
-            else if (range.isMultiLine()) {
-                if (marker.type == "text") {
-                    this.drawTextMarker(html, range, marker.clazz, config);
-                } else {
-                    this.drawMultiLineMarker(
-                        html, range, marker.clazz, config,
-                        marker.type
-                    );
-                }
-            }
-            else {
-                this.drawSingleLineMarker(
-                    html, range, marker.clazz, config,
-                    null, marker.type
-                );
-            }
-        }
-        this.element = dom.setInnerHtml(this.element, html.join(""));
-    };
-
-    this.$getTop = function(row, layerConfig) {
-        return (row - layerConfig.firstRowScreen) * layerConfig.lineHeight;
-    };
-
-    /**
-     * Draws a marker, which spans a range of text on multiple lines
-     */ 
-    this.drawTextMarker = function(stringBuilder, range, clazz, layerConfig) {
-        // selection start
-        var row = range.start.row;
-
-        var lineRange = new Range(
-            row, range.start.column,
-            row, this.session.getScreenLastRowColumn(row)
-        );
-        this.drawSingleLineMarker(stringBuilder, lineRange, clazz, layerConfig, 1, "text");
-
-        // selection end
-        row = range.end.row;
-        lineRange = new Range(row, 0, row, range.end.column);
-        this.drawSingleLineMarker(stringBuilder, lineRange, clazz, layerConfig, 0, "text");
-
-        for (row = range.start.row + 1; row < range.end.row; row++) {
-            lineRange.start.row = row;
-            lineRange.end.row = row;
-            lineRange.end.column = this.session.getScreenLastRowColumn(row);
-            this.drawSingleLineMarker(stringBuilder, lineRange, clazz, layerConfig, 1, "text");
-        }
-    };
-
-    /**
-     * Draws a multi line marker, where lines span the full width
-     */
-     this.drawMultiLineMarker = function(stringBuilder, range, clazz, layerConfig, type) {
-        var padding = type === "background" ? 0 : this.$padding;
-        var layerWidth = layerConfig.width + 2 * this.$padding - padding;
-        // from selection start to the end of the line
-        var height = layerConfig.lineHeight;
-        var width = Math.round(layerWidth - (range.start.column * layerConfig.characterWidth));
-        var top = this.$getTop(range.start.row, layerConfig);
-        var left = Math.round(
-            padding + range.start.column * layerConfig.characterWidth
-        );
-
-        stringBuilder.push(
-            "<div class='", clazz, "' style='",
-            "height:", height, "px;",
-            "width:", width, "px;",
-            "top:", top, "px;",
-            "left:", left, "px;'></div>"
-        );
-
-        // from start of the last line to the selection end
-        top = this.$getTop(range.end.row, layerConfig);
-        width = Math.round(range.end.column * layerConfig.characterWidth);
-
-        stringBuilder.push(
-            "<div class='", clazz, "' style='",
-            "height:", height, "px;",
-            "width:", width, "px;",
-            "top:", top, "px;",
-            "left:", padding, "px;'></div>"
-        );
-
-        // all the complete lines
-        height = (range.end.row - range.start.row - 1) * layerConfig.lineHeight;
-        if (height < 0)
-            return;
-        top = this.$getTop(range.start.row + 1, layerConfig);
-
-        stringBuilder.push(
-            "<div class='", clazz, "' style='",
-            "height:", height, "px;",
-            "width:", layerWidth, "px;",
-            "top:", top, "px;",
-            "left:", padding, "px;'></div>"
-        );
-    };
-
-    /**
-     * Draws a marker which covers part or whole width of a single screen line
-     */
-    this.drawSingleLineMarker = function(stringBuilder, range, clazz, layerConfig, extraLength, type) {
-        var padding = type === "background" ? 0 : this.$padding;
-        var height = layerConfig.lineHeight;
-
-        if (type === "background")
-            var width = layerConfig.width;
-        else
-            width = Math.round((range.end.column + (extraLength || 0) - range.start.column) * layerConfig.characterWidth);
-
-        var top = this.$getTop(range.start.row, layerConfig);
-        var left = Math.round(
-            padding + range.start.column * layerConfig.characterWidth
-        );
-
-        stringBuilder.push(
-            "<div class='", clazz, "' style='",
-            "height:", height, "px;",
-            "width:", width, "px;",
-            "top:", top, "px;",
-            "left:", left,"px;'></div>"
-        );
-    };
-
-}).call(Marker.prototype);
-
-exports.Marker = Marker;
-
-});
-/* vim:ts=4:sts=4:sw=4:
- * ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *      Julian Viereck <julian DOT viereck AT gmail DOT com>
- *      Mihai Sucan <mihai.sucan@gmail.com>
- *      Irakli Gozalishvili <rfobic@gmail.com> (http://jeditoolkit.com)
- *
- * 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 ***** */
-
-define('ace/layer/text', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/dom', 'ace/lib/lang', 'ace/lib/useragent', 'ace/lib/event_emitter'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var dom = require("../lib/dom");
-var lang = require("../lib/lang");
-var useragent = require("../lib/useragent");
-var EventEmitter = require("../lib/event_emitter").EventEmitter;
-
-var Text = function(parentEl) {
-    this.element = dom.createElement("div");
-    this.element.className = "ace_layer ace_text-layer";
-    parentEl.appendChild(this.element);
-
-    this.$characterSize = this.$measureSizes() || {width: 0, height: 0};
-    this.$pollSizeChanges();
-};
-
-(function() {
-
-    oop.implement(this, EventEmitter);
-
-    this.EOF_CHAR = "\xB6"; //"&para;";
-    this.EOL_CHAR = "\xAC"; //"&not;";
-    this.TAB_CHAR = "\u2192"; //"&rarr;";
-    this.SPACE_CHAR = "\xB7"; //"&middot;";
-    this.$padding = 0;
-
-    this.setPadding = function(padding) {
-        this.$padding = padding;
-        this.element.style.padding = "0 " + padding + "px";
-    };
-
-    this.getLineHeight = function() {
-        return this.$characterSize.height || 1;
-    };
-
-    this.getCharacterWidth = function() {
-        return this.$characterSize.width || 1;
-    };
-
-    this.checkForSizeChanges = function() {
-        var size = this.$measureSizes();
-        if (size && (this.$characterSize.width !== size.width || this.$characterSize.height !== size.height)) {
-            this.$characterSize = size;
-            this._emit("changeCharacterSize", {data: size});
-        }
-    };
-
-    this.$pollSizeChanges = function() {
-        var self = this;
-        this.$pollSizeChangesTimer = setInterval(function() {
-            self.checkForSizeChanges();
-        }, 500);
-    };
-
-    this.$fontStyles = {
-        fontFamily : 1,
-        fontSize : 1,
-        fontWeight : 1,
-        fontStyle : 1,
-        lineHeight : 1
-    };
-
-    this.$measureSizes = useragent.isIE || useragent.isOldGecko ? function() {
-        var n = 1000;
-        if (!this.$measureNode) {
-            var measureNode = this.$measureNode = dom.createElement("div");
-            var style = measureNode.style;
-
-            style.width = style.height = "auto";
-            style.left = style.top = (-n * 40)  + "px";
-
-            style.visibility = "hidden";
-            style.position = "fixed";
-            style.overflow = "visible";
-            style.whiteSpace = "nowrap";
-
-            // in FF 3.6 monospace fonts can have a fixed sub pixel width.
-            // that's why we have to measure many characters
-            // Note: characterWidth can be a float!
-            measureNode.innerHTML = lang.stringRepeat("Xy", n);
-
-            if (this.element.ownerDocument.body) {
-                this.element.ownerDocument.body.appendChild(measureNode);
-            } else {
-                var container = this.element.parentNode;
-                while (!dom.hasCssClass(container, "ace_editor"))
-                    container = container.parentNode;
-                container.appendChild(measureNode);
-            }
-        }
-        
-        // Size and width can be null if the editor is not visible or
-        // detached from the document
-        if (!this.element.offsetWidth)
-            return null;
-
-        var style = this.$measureNode.style;
-        var computedStyle = dom.computedStyle(this.element);
-        for (var prop in this.$fontStyles)
-            style[prop] = computedStyle[prop];
-
-        var size = {
-            height: this.$measureNode.offsetHeight,
-            width: this.$measureNode.offsetWidth / (n * 2)
-        };
-
-        // Size and width can be null if the editor is not visible or
-        // detached from the document
-        if (size.width == 0 || size.height == 0)
-            return null;
-
-        return size;
-    } 
-    : function() {
-        if (!this.$measureNode) {
-            var measureNode = this.$measureNode = dom.createElement("div");
-            var style = measureNode.style;
-
-            style.width = style.height = "auto";
-            style.left = style.top = -100 + "px";
-
-            style.visibility = "hidden";
-            style.position = "fixed";
-            style.overflow = "visible";
-            style.whiteSpace = "nowrap";
-
-            measureNode.innerHTML = "X";
-
-            var container = this.element.parentNode;
-            while (container && !dom.hasCssClass(container, "ace_editor"))
-                container = container.parentNode;
-
-            if (!container)
-                return this.$measureNode = null;
-
-            container.appendChild(measureNode);
-        }
-        
-        var rect = this.$measureNode.getBoundingClientRect();
-
-        var size = {
-            height: rect.height,
-            width: rect.width
-        };
-
-        // Size and width can be null if the editor is not visible or
-        // detached from the document
-        if (size.width == 0 || size.height == 0)
-            return null;
-
-        return size;
-    };
-
-    this.setSession = function(session) {
-        this.session = session;
-    };
-
-    this.showInvisibles = false;
-    this.setShowInvisibles = function(showInvisibles) {
-        if (this.showInvisibles == showInvisibles)
-            return false;
-
-        this.showInvisibles = showInvisibles;
-        return true;
-    };
-
-    this.$tabStrings = [];
-    this.$computeTabString = function() {
-        var tabSize = this.session.getTabSize();
-        var tabStr = this.$tabStrings = [0];
-        for (var i = 1; i < tabSize + 1; i++) {
-            if (this.showInvisibles) {
-                tabStr.push("<span class='ace_invisible'>"
-                    + this.TAB_CHAR
-                    + new Array(i).join("&#160;")
-                    + "</span>");
-            } else {
-                tabStr.push(new Array(i+1).join("&#160;"));
-            }
-        }
-
-    };
-
-    this.updateLines = function(config, firstRow, lastRow) {
-        this.$computeTabString();
-        // Due to wrap line changes there can be new lines if e.g.
-        // the line to updated wrapped in the meantime.
-        if (this.config.lastRow != config.lastRow ||
-            this.config.firstRow != config.firstRow) {
-            this.scrollLines(config);
-        }
-        this.config = config;
-
-        var first = Math.max(firstRow, config.firstRow);
-        var last = Math.min(lastRow, config.lastRow);
-
-        var lineElements = this.element.childNodes;
-        var lineElementsIdx = 0;
-
-        for (var row = config.firstRow; row < first; row++) {
-            var foldLine = this.session.getFoldLine(row);
-            if (foldLine) {
-                if (foldLine.containsRow(first)) {
-                    first = foldLine.start.row;
-                    break;
-                } else {
-                    row = foldLine.end.row;
-                }
-            }
-            lineElementsIdx ++;
-        }
-
-        for (var i=first; i<=last; i++) {
-            var lineElement = lineElements[lineElementsIdx++];
-            if (!lineElement)
-                continue;
-
-            var html = [];
-            var tokens = this.session.getTokens(i, i);
-            this.$renderLine(html, i, tokens[0].tokens, !this.$useLineGroups());
-            lineElement = dom.setInnerHtml(lineElement, html.join(""));
-
-            i = this.session.getRowFoldEnd(i);
-        }
-    };
-
-    this.scrollLines = function(config) {
-        this.$computeTabString();
-        var oldConfig = this.config;
-        this.config = config;
-
-        if (!oldConfig || oldConfig.lastRow < config.firstRow)
-            return this.update(config);
-
-        if (config.lastRow < oldConfig.firstRow)
-            return this.update(config);
-
-        var el = this.element;
-        if (oldConfig.firstRow < config.firstRow)
-            for (var row=this.session.getFoldedRowCount(oldConfig.firstRow, config.firstRow - 1); row>0; row--)
-                el.removeChild(el.firstChild);
-
-        if (oldConfig.lastRow > config.lastRow)
-            for (var row=this.session.getFoldedRowCount(config.lastRow + 1, oldConfig.lastRow); row>0; row--)
-                el.removeChild(el.lastChild);
-
-        if (config.firstRow < oldConfig.firstRow) {
-            var fragment = this.$renderLinesFragment(config, config.firstRow, oldConfig.firstRow - 1);
-            if (el.firstChild)
-                el.insertBefore(fragment, el.firstChild);
-            else
-                el.appendChild(fragment);
-        }
-
-        if (config.lastRow > oldConfig.lastRow) {
-            var fragment = this.$renderLinesFragment(config, oldConfig.lastRow + 1, config.lastRow);
-            el.appendChild(fragment);
-        }
-    };
-
-    this.$renderLinesFragment = function(config, firstRow, lastRow) {
-        var fragment = this.element.ownerDocument.createDocumentFragment();
-        var row = firstRow;
-        var foldLine = this.session.getNextFoldLine(row);
-        var foldStart = foldLine ? foldLine.start.row : Infinity;
-
-        while (true) {
-            if (row > foldStart) {
-                row = foldLine.end.row+1;
-                foldLine = this.session.getNextFoldLine(row, foldLine);
-                foldStart = foldLine ? foldLine.start.row : Infinity;
-            }
-            if (row > lastRow)
-                break;
-
-            var container = dom.createElement("div");
-
-            var html = [];
-            // Get the tokens per line as there might be some lines in between
-            // beeing folded.
-            // OPTIMIZE: If there is a long block of unfolded lines, just make
-            // this call once for that big block of unfolded lines.
-            var tokens = this.session.getTokens(row, row);
-            if (tokens.length == 1)
-                this.$renderLine(html, row, tokens[0].tokens, false);
-
-            // don't use setInnerHtml since we are working with an empty DIV
-            container.innerHTML = html.join("");
-            if (this.$useLineGroups()) {
-                container.className = 'ace_line_group';
-                fragment.appendChild(container);
-            } else {
-                var lines = container.childNodes
-                while(lines.length)
-                    fragment.appendChild(lines[0]);
-            }
-
-            row++;
-        }
-        return fragment;
-    };
-
-    this.update = function(config) {
-        this.$computeTabString();
-        this.config = config;
-
-        var html = [];
-        var firstRow = config.firstRow, lastRow = config.lastRow;
-
-        var row = firstRow;
-        var foldLine = this.session.getNextFoldLine(row);
-        var foldStart = foldLine ? foldLine.start.row : Infinity;
-
-        while (true) {
-            if (row > foldStart) {
-                row = foldLine.end.row+1;
-                foldLine = this.session.getNextFoldLine(row, foldLine);
-                foldStart = foldLine ? foldLine.start.row :Infinity;
-            }
-            if (row > lastRow)
-                break;
-
-            if (this.$useLineGroups())
-                html.push("<div class='ace_line_group'>")
-
-            // Get the tokens per line as there might be some lines in between
-            // beeing folded.
-            // OPTIMIZE: If there is a long block of unfolded lines, just make
-            // this call once for that big block of unfolded lines.
-            var tokens = this.session.getTokens(row, row);
-            if (tokens.length == 1)
-                this.$renderLine(html, row, tokens[0].tokens, false);
-
-            if (this.$useLineGroups())
-                html.push("</div>"); // end the line group
-
-            row++;
-        }
-        this.element = dom.setInnerHtml(this.element, html.join(""));
-    };
-
-    this.$textToken = {
-        "text": true,
-        "rparen": true,
-        "lparen": true
-    };
-
-    this.$renderToken = function(stringBuilder, screenColumn, token, value) {        
-        var self = this;
-        var replaceReg = /\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;
-        var replaceFunc = function(c, a, b, tabIdx, idx4) {
-            if (c.charCodeAt(0) == 32) {
-                return new Array(c.length+1).join("&#160;");
-            } else if (c == "\t") {
-                var tabSize = self.session.getScreenTabSize(screenColumn + tabIdx);
-                screenColumn += tabSize - 1;
-                return self.$tabStrings[tabSize];
-            } else if (c == "&") {
-                if (useragent.isOldGecko)
-                    return "&";
-                else
-                    return "&amp;";
-            } else if (c == "<") {
-                return "&lt;";
-            } else if (c == "\u3000") {
-                // U+3000 is both invisible AND full-width, so must be handled uniquely
-                var classToUse = self.showInvisibles ? "ace_cjk ace_invisible" : "ace_cjk";
-                var space = self.showInvisibles ? self.SPACE_CHAR : "";
-                screenColumn += 1;
-                return "<span class='" + classToUse + "' style='width:" +
-                    (self.config.characterWidth * 2) +
-                    "px'>" + space + "</span>";
-            } else if (c.match(/[\v\f \u00a0\u2000\u2001\u2002\u2003\u2004\u2005\u2006\u2007\u2008\u2009\u200a\u200b\u2028\u2029\u3000]/)) {
-                if (self.showInvisibles) {
-                    var space = new Array(c.length+1).join(self.SPACE_CHAR);
-                    return "<span class='ace_invisible'>" + space + "</span>";
-                } else {
-                    return "&#160;";
-                }
-            } else {
-                screenColumn += 1;
-                return "<span class='ace_cjk' style='width:" +
-                    (self.config.characterWidth * 2) +
-                    "px'>" + c + "</span>";
-            }
-        };
-
-        var output = value.replace(replaceReg, replaceFunc);
-
-        if (!this.$textToken[token.type]) {
-            var classes = "ace_" + token.type.replace(/\./g, " ace_");
-            var style = "";
-            if (token.type == "fold")
-                style = " style='width:" + (token.value.length * this.config.characterWidth) + "px;' ";
-            stringBuilder.push("<span class='", classes, "'", style, ">", output, "</span>");
-        }
-        else {
-            stringBuilder.push(output);
-        }
-        return screenColumn + value.length;
-    };
-
-    this.$renderLineCore = function(stringBuilder, lastRow, tokens, splits, onlyContents) {
-        var chars = 0;
-        var split = 0;
-        var splitChars;
-        var screenColumn = 0;
-        var self = this;
-
-        if (!splits || splits.length == 0)
-            splitChars = Number.MAX_VALUE;
-        else
-            splitChars = splits[0];
-
-        if (!onlyContents) {
-            stringBuilder.push("<div class='ace_line' style='height:",
-                this.config.lineHeight, "px",
-                "'>"
-            );
-        }
-        
-        for (var i = 0; i < tokens.length; i++) {
-            var token = tokens[i];
-            var value = token.value;
-
-            if (chars + value.length < splitChars) {
-                screenColumn = self.$renderToken(
-                    stringBuilder, screenColumn, token, value
-                );
-                chars += value.length;
-            }
-            else {
-                while (chars + value.length >= splitChars) {
-                    screenColumn = self.$renderToken(
-                        stringBuilder, screenColumn, 
-                        token, value.substring(0, splitChars - chars)
-                    );
-                    value = value.substring(splitChars - chars);
-                    chars = splitChars;
-                    
-                    if (!onlyContents) {
-                        stringBuilder.push("</div>",
-                            "<div class='ace_line' style='height:",
-                            this.config.lineHeight, "px",
-                            "'>"
-                        );
-                    }
-
-                    split ++;
-                    screenColumn = 0;
-                    splitChars = splits[split] || Number.MAX_VALUE;
-                }
-                if (value.length != 0) {
-                    chars += value.length;
-                    screenColumn = self.$renderToken(
-                        stringBuilder, screenColumn, token, value
-                    );
-                }
-            }
-        }
-
-        if (this.showInvisibles) {
-            if (lastRow !== this.session.getLength() - 1)
-                stringBuilder.push("<span class='ace_invisible'>" + this.EOL_CHAR + "</span>");
-            else
-                stringBuilder.push("<span class='ace_invisible'>" + this.EOF_CHAR + "</span>");
-        }
-        if (!onlyContents)
-            stringBuilder.push("</div>");
-    };
-
-    this.$renderLine = function(stringBuilder, row, tokens, onlyContents) {
-        // Check if the line to render is folded or not. If not, things are
-        // simple, otherwise, we need to fake some things...
-        if (!this.session.isRowFolded(row)) {
-            var splits = this.session.getRowSplitData(row);
-            this.$renderLineCore(stringBuilder, row, tokens, splits, onlyContents);
-        } else {
-            this.$renderFoldLine(stringBuilder, row, tokens, onlyContents);
-        }
-    };
-
-    this.$renderFoldLine = function(stringBuilder, row, tokens, onlyContents) {
-        var session = this.session,
-            foldLine = session.getFoldLine(row),
-            renderTokens = [];
-
-        function addTokens(tokens, from, to) {
-            var idx = 0, col = 0;
-            while ((col + tokens[idx].value.length) < from) {
-                col += tokens[idx].value.length;
-                idx++;
-
-                if (idx == tokens.length) {
-                    return;
-                }
-            }
-            if (col != from) {
-                var value = tokens[idx].value.substring(from - col);
-                // Check if the token value is longer then the from...to spacing.
-                if (value.length > (to - from)) {
-                    value = value.substring(0, to - from);
-                }
-
-                renderTokens.push({
-                    type: tokens[idx].type,
-                    value: value
-                });
-
-                col = from + value.length;
-                idx += 1;
-            }
-
-            while (col < to) {
-                var value = tokens[idx].value;
-                if (value.length + col > to) {
-                    value = value.substring(0, to - col);
-                }
-                renderTokens.push({
-                    type: tokens[idx].type,
-                    value: value
-                });
-                col += value.length;
-                idx += 1;
-            }
-        }
-
-        foldLine.walk(function(placeholder, row, column, lastColumn, isNewRow) {
-            if (placeholder) {
-               renderTokens.push({
-                    type: "fold",
-                    value: placeholder
-                });
-            } else {
-                if (isNewRow) {
-                   tokens = this.session.getTokens(row, row)[0].tokens;
-                }
-                if (tokens.length != 0) {
-                    addTokens(tokens, lastColumn, column);
-                }
-            }
-        }.bind(this), foldLine.end.row, this.session.getLine(foldLine.end.row).length);
-
-        // TODO: Build a fake splits array!
-        var splits = this.session.$useWrapMode?this.session.$wrapData[row]:null;
-        this.$renderLineCore(stringBuilder, row, renderTokens, splits, onlyContents);
-    };
-    
-    this.$useLineGroups = function() {
-        // For the updateLines function to work correctly, it's important that the
-        // child nodes of this.element correspond on a 1-to-1 basis to rows in the 
-        // document (as distinct from lines on the screen). For sessions that are
-        // wrapped, this means we need to add a layer to the node hierarchy (tagged
-        // with the class name ace_line_group).
-        return this.session.getUseWrapMode();
-    };
-
-    this.destroy = function() {
-        clearInterval(this.$pollSizeChangesTimer);
-        if (this.$measureNode)
-            this.$measureNode.parentNode.removeChild(this.$measureNode);
-        delete this.$measureNode;
-    };
-
-}).call(Text.prototype);
-
-exports.Text = Text;
-
-});
-/* vim:ts=4:sts=4:sw=4:
- * ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *      Julian Viereck <julian.viereck@gmail.com>
- *
- * 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 ***** */
-
-define('ace/layer/cursor', ['require', 'exports', 'module' , 'ace/lib/dom'], function(require, exports, module) {
-"use strict";
-
-var dom = require("../lib/dom");
-
-var Cursor = function(parentEl) {
-    this.element = dom.createElement("div");
-    this.element.className = "ace_layer ace_cursor-layer";
-    parentEl.appendChild(this.element);
-
-    this.isVisible = false;
-
-    this.cursors = [];
-    this.cursor = this.addCursor();
-};
-
-(function() {
-
-    this.$padding = 0;
-    this.setPadding = function(padding) {
-        this.$padding = padding;
-    };
-
-    this.setSession = function(session) {
-        this.session = session;
-    };
-
-    this.addCursor = function() {
-        var el = dom.createElement("div");
-        var className = "ace_cursor";
-        if (!this.isVisible)
-            className += " ace_hidden";
-        if (this.overwrite)
-            className += " ace_overwrite";
-
-        el.className = className;
-        this.element.appendChild(el);
-        this.cursors.push(el);
-        return el;
-    };
-
-    this.removeCursor = function() {
-        if (this.cursors.length > 1) {
-            var el = this.cursors.pop();
-            el.parentNode.removeChild(el);
-            return el;
-        }
-    };
-
-    this.hideCursor = function() {
-        this.isVisible = false;
-        for (var i = this.cursors.length; i--; )
-            dom.addCssClass(this.cursors[i], "ace_hidden");
-        clearInterval(this.blinkId);
-    };
-
-    this.showCursor = function() {
-        this.isVisible = true;
-        for (var i = this.cursors.length; i--; )
-            dom.removeCssClass(this.cursors[i], "ace_hidden");
-
-        this.element.style.visibility = "";
-        this.restartTimer();
-    };
-
-    this.restartTimer = function() {
-        clearInterval(this.blinkId);
-        if (!this.isVisible)
-            return;
-
-        var element = this.element;
-        this.blinkId = setInterval(function() {
-            element.style.visibility = "hidden";
-            setTimeout(function() {
-                element.style.visibility = "visible";
-            }, 400);
-        }, 1000);
-    };
-
-    this.getPixelPosition = function(position, onScreen) {
-        if (!this.config || !this.session) {
-            return {
-                left : 0,
-                top : 0
-            };
-        }
-
-        if (!position)
-            position = this.session.selection.getCursor();
-        var pos = this.session.documentToScreenPosition(position);
-        var cursorLeft = Math.round(this.$padding +
-                                    pos.column * this.config.characterWidth);
-        var cursorTop = (pos.row - (onScreen ? this.config.firstRowScreen : 0)) *
-            this.config.lineHeight;
-
-        return {
-            left : cursorLeft,
-            top : cursorTop
-        };
-    };
-
-    this.update = function(config) {
-        this.config = config;
-
-        if (this.session.selectionMarkerCount > 1) {
-            var selections = this.session.$selectionMarkers;
-            var i = 0, sel, cursorIndex = 0;
-
-            for (var i = selections.length; i--; ) {
-                sel = selections[i];
-                var pixelPos = this.getPixelPosition(sel.cursor, true);
-
-                var style = (this.cursors[cursorIndex++] || this.addCursor()).style;
-
-                style.left = pixelPos.left + "px";
-                style.top = pixelPos.top + "px";
-                style.width = config.characterWidth + "px";
-                style.height = config.lineHeight + "px";
-            }
-            if (cursorIndex > 1)
-                while (this.cursors.length > cursorIndex)
-                    this.removeCursor();
-        } else {
-            var pixelPos = this.getPixelPosition(null, true);
-            var style = this.cursor.style;
-            style.left = pixelPos.left + "px";
-            style.top = pixelPos.top + "px";
-            style.width = config.characterWidth + "px";
-            style.height = config.lineHeight + "px";
-
-            while (this.cursors.length > 1)
-                this.removeCursor();
-        }
-
-        var overwrite = this.session.getOverwrite();
-        if (overwrite != this.overwrite)
-            this.$setOverite(overwrite);
-
-        this.restartTimer();
-    };
-
-    this.$setOverite = function(overwrite) {
-        this.overwrite = overwrite;
-        for (var i = this.cursors.length; i--; ) {
-            if (overwrite)
-                dom.addCssClass(this.cursors[i], "ace_overwrite");
-            else
-                dom.removeCssClass(this.cursors[i], "ace_overwrite");
-        }
-    };
-
-    this.destroy = function() {
-        clearInterval(this.blinkId);
-    }
-
-}).call(Cursor.prototype);
-
-exports.Cursor = Cursor;
-
-});
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *      Irakli Gozalishvili <rfobic@gmail.com> (http://jeditoolkit.com)
- *
- * 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 ***** */
-
-define('ace/scrollbar', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/dom', 'ace/lib/event', 'ace/lib/event_emitter'], function(require, exports, module) {
-"use strict";
-
-var oop = require("./lib/oop");
-var dom = require("./lib/dom");
-var event = require("./lib/event");
-var EventEmitter = require("./lib/event_emitter").EventEmitter;
-
-var ScrollBar = function(parent) {
-    this.element = dom.createElement("div");
-    this.element.className = "ace_sb";
-
-    this.inner = dom.createElement("div");
-    this.element.appendChild(this.inner);
-
-    parent.appendChild(this.element);
-
-    // in OSX lion the scrollbars appear to have no width. In this case resize
-    // the to show the scrollbar but still pretend that the scrollbar has a width
-    // of 0px
-    // in Firefox 6+ scrollbar is hidden if element has the same width as scrollbar
-    // make element a little bit wider to retain scrollbar when page is zoomed 
-    this.width = dom.scrollbarWidth(parent.ownerDocument);
-    this.element.style.width = (this.width || 15) + 5 + "px";
-
-    event.addListener(this.element, "scroll", this.onScroll.bind(this));
-};
-
-(function() {
-    oop.implement(this, EventEmitter);
-
-    this.onScroll = function() {
-        this._emit("scroll", {data: this.element.scrollTop});
-    };
-
-    this.getWidth = function() {
-        return this.width;
-    };
-
-    this.setHeight = function(height) {
-        this.element.style.height = height + "px";
-    };
-
-    this.setInnerHeight = function(height) {
-        this.inner.style.height = height + "px";
-    };
-
-    // TODO: on chrome 17+ after for small zoom levels after this function
-    // this.element.scrollTop != scrollTop which makes page to scroll up.
-    this.setScrollTop = function(scrollTop) {
-        this.element.scrollTop = scrollTop;
-    };
-
-}).call(ScrollBar.prototype);
-
-exports.ScrollBar = ScrollBar;
-});
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *      Irakli Gozalishvili <rfobic@gmail.com> (http://jeditoolkit.com)
- *
- * 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 ***** */
-
-define('ace/renderloop', ['require', 'exports', 'module' , 'ace/lib/event'], function(require, exports, module) {
-"use strict";
-
-var event = require("./lib/event");
-
-var RenderLoop = function(onRender, win) {
-    this.onRender = onRender;
-    this.pending = false;
-    this.changes = 0;
-    this.window = win || window;
-};
-
-(function() {
-
-    this.schedule = function(change) {
-        //this.onRender(change);
-        //return;
-        this.changes = this.changes | change;
-        if (!this.pending) {
-            this.pending = true;
-            var _self = this;
-            event.nextTick(function() {
-                _self.pending = false;
-                var changes;
-                while (changes = _self.changes) {
-                    _self.changes = 0;
-                    _self.onRender(changes);
-                }
-            }, this.window);
-        }
-    };
-
-}).call(RenderLoop.prototype);
-
-exports.RenderLoop = RenderLoop;
-});
-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" +
-  "");
-
-/* vim:ts=4:sts=4:sw=4:
- * ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Harutyun Amirjanyan <amirjanyan AT gmail DOT com>
- *
- * 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 ***** */
-
-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(require, exports, module) {
-
-var RangeList = require("./range_list").RangeList;
-var Range = require("./range").Range;
-var Selection = require("./selection").Selection;
-var onMouseDown = require("./mouse/multi_select_handler").onMouseDown;
-exports.commands = require("./commands/multi_select_commands");
-
-// Todo: session.find or editor.findVolatile that returns range
-var Search = require("./search").Search;
-var search = new Search();
-
-function find(session, needle, dir) {
-    search.$options.wrap = true;
-    search.$options.needle = needle;
-    search.$options.backwards = dir == -1;
-    return search.find(session);
-}
-
-// extend EditSession
-var EditSession = require("./edit_session").EditSession;
-(function() {
-    this.getSelectionMarkers = function() {
-        return this.$selectionMarkers;
-    };
-}).call(EditSession.prototype);
-
-// extend Selection
-(function() {
-    // list of ranges in reverse addition order
-    this.ranges = null;
-
-    // automatically sorted list of ranges
-    this.rangeList = null;
-
-    /**
-     * Selection.addRange(Range) -> Void
-     *
-     * adds a range to selection entering multiselect mode if necessary
-     **/
-    this.addRange = function(range) {
-        if (!this.inMultiSelectMode && this.rangeCount == 0) {
-            var oldRange = this.toOrientedRange();
-            if (!range || !range.isEqual(oldRange)) {
-                this.rangeList.add(oldRange);
-                this.$onAddRange(oldRange);
-            }
-        }
-
-        if (!range)
-            return;
-
-        if (!range.cursor)
-            range.cursor = range.end;
-
-        var removed = this.rangeList.add(range);
-
-        this.$onAddRange(range);
-
-        if (removed.length)
-            this.$onRemoveRange(removed);
-
-        if (this.rangeCount > 0 && !this.inMultiSelectMode) {
-            this._emit("multiSelect");
-            this.inMultiSelectMode = true;
-            this.session.$undoSelect = false;
-            this.rangeList.attach(this.session);
-        }
-    };
-
-    this.toSingleRange = function(range) {
-        range = range || this.ranges[0];
-        var removed = this.rangeList.removeAll();
-        if (removed.length)
-            this.$onRemoveRange(removed);
-
-        range && this.fromOrientedRange(range);
-    };
-    
-    /**
-     * Selection.addRange(pos) -> Range
-     * pos: {row, column}
-     *
-     * removes range containing pos (if exists)
-     **/
-    this.substractPoint = function(pos) {
-        var removed = this.rangeList.substractPoint(pos);
-        if (removed) {
-            this.$onRemoveRange(removed);
-            return removed[0];
-        }
-    };
-
-    /**
-     * Selection.mergeOverlappingRanges() -> Void
-     *
-     * merges overlapping ranges ensuring consistency after changes
-     **/
-    this.mergeOverlappingRanges = function() {
-        var removed = this.rangeList.merge();
-        if (removed.length)
-            this.$onRemoveRange(removed);
-        else if(this.ranges[0])
-            this.fromOrientedRange(this.ranges[0]);
-    };
-
-    this.$onAddRange = function(range) {
-        this.rangeCount = this.rangeList.ranges.length;
-        this.ranges.unshift(range);
-        this.fromOrientedRange(range);
-        this._emit("addRange", {range: range});
-    };
-
-    this.$onRemoveRange = function(removed) {
-        this.rangeCount = this.rangeList.ranges.length;
-        if (this.rangeCount == 1 && this.inMultiSelectMode) {
-            var lastRange = this.rangeList.ranges.pop();
-            removed.push(lastRange);
-            this.rangeCount = 0;
-        }
-
-        for (var i = removed.length; i--; ) {
-            var index = this.ranges.indexOf(removed[i]);
-            this.ranges.splice(index, 1);
-        }
-
-        this._emit("removeRange", {ranges: removed});
-
-        if (this.rangeCount == 0 && this.inMultiSelectMode) {
-            this.inMultiSelectMode = false;
-            this._emit("singleSelect");
-            this.session.$undoSelect = true;
-            this.rangeList.detach(this.session);
-        }
-
-        lastRange = lastRange || this.ranges[0];
-        if (lastRange && !lastRange.isEqual(this.getRange()))
-            this.fromOrientedRange(lastRange);
-    };
-
-    // adds multicursor support to selection
-    this.$initRangeList = function() {
-        if (this.rangeList)
-            return;
-
-        this.rangeList = new RangeList();
-        this.ranges = [];
-        this.rangeCount = 0;
-    };
-
-    this.getAllRanges = function() {
-        return this.rangeList.ranges.concat();
-    };
-
-    this.splitIntoLines = function () {
-        if (this.rangeCount > 1) {
-            var ranges = this.rangeList.ranges;
-            var lastRange = ranges[ranges.length - 1];
-            var range = Range.fromPoints(ranges[0].start, lastRange.end);
-
-            this.toSingleRange();
-            this.setSelectionRange(range, lastRange.cursor == lastRange.start);
-        } else {
-            var cursor = this.session.documentToScreenPosition(this.selectionLead);
-            var anchor = this.session.documentToScreenPosition(this.selectionAnchor);
-
-            var rectSel = this.rectangularRangeBlock(cursor, anchor);
-            rectSel.forEach(this.addRange, this);
-        }
-    };
-
-    /**
-     *   Selection.rectangularRangeBlock(screenCursor, screenAnchor, includeEmptyLines) -> [Range]
-     *   gets list of ranges composing rectangular block on the screen
-     *   @includeEmptyLines if true includes ranges inside the block which
-     *         are empty becuase of the clipping
-     */
-    this.rectangularRangeBlock = function(screenCursor, screenAnchor, includeEmptyLines) {
-        var rectSel = [];
-
-        var xBackwards = screenCursor.column < screenAnchor.column;
-        if (xBackwards) {
-            var startColumn = screenCursor.column;
-            var endColumn = screenAnchor.column;
-        } else {
-            var startColumn = screenAnchor.column;
-            var endColumn = screenCursor.column;
-        }
-
-        var yBackwards = screenCursor.row < screenAnchor.row;
-        if (yBackwards) {
-            var startRow = screenCursor.row;
-            var endRow = screenAnchor.row;
-        } else {
-            var startRow = screenAnchor.row;
-            var endRow = screenCursor.row;
-        }
-
-        if (startColumn < 0)
-            startColumn = 0;
-        if (startRow < 0)
-            startRow = 0;
-
-        if (startRow == endRow)
-            includeEmptyLines = true;
-
-        for (var row = startRow; row <= endRow; row++) {
-            var range = Range.fromPoints(
-                this.session.screenToDocumentPosition(row, startColumn),
-                this.session.screenToDocumentPosition(row, endColumn)
-            );
-            if (range.isEmpty()) {
-                if (docEnd && isSamePoint(range.end, docEnd))
-                    break;
-                var docEnd = range.end;
-            }
-            range.cursor = xBackwards ? range.start : range.end;
-            rectSel.push(range);
-        }
-
-        if (yBackwards)
-            rectSel.reverse();
-
-        if (!includeEmptyLines) {
-            var end = rectSel.length - 1;
-            while (rectSel[end].isEmpty() && end > 0)
-                end--;
-            if (end > 0) {
-                var start = 0;
-                while (rectSel[start].isEmpty())
-                    start++;
-            }
-            for (var i = end; i >= start; i--) {
-                if (rectSel[i].isEmpty())
-                    rectSel.splice(i, 1);
-            }
-        }
-
-        return rectSel;
-    };
-}).call(Selection.prototype);
-
-// extend Editor
-var Editor = require("./editor").Editor;
-(function() {
-    /**
-     * Editor.updateSelectionMarkers() -> Void
-     *
-     * updates cursor and marker layers
-     **/
-    this.updateSelectionMarkers = function() {
-        this.renderer.updateCursor();
-        this.renderer.updateBackMarkers();
-    };
-
-    /**
-     * Editor.addSelectionMarker(orientedRange) -> Range
-     * - orientedRange: range with cursor
-     *
-     * adds selection and cursor
-     **/
-    this.addSelectionMarker = function(orientedRange) {
-        if (!orientedRange.cursor)
-            orientedRange.cursor = orientedRange.end;
-
-        var style = this.getSelectionStyle();
-        orientedRange.marker = this.session.addMarker(orientedRange, "ace_selection", style);
-
-        this.session.$selectionMarkers.push(orientedRange);
-        this.session.selectionMarkerCount = this.session.$selectionMarkers.length;
-        return orientedRange;
-    };
-
-    this.removeSelectionMarkers = function(ranges) {
-        for (var i = ranges.length; i--; ) {
-            var range = ranges[i];
-            if (!range.marker)
-                continue;
-            this.session.removeMarker(range.marker);
-            var index = this.session.$selectionMarkers.indexOf(range);
-            if (index != -1)
-                this.session.$selectionMarkers.splice(index, 1);
-        }
-        this.session.selectionMarkerCount = this.session.$selectionMarkers.length;
-    };
-
-    this.$onAddRange = function(e) {
-        this.addSelectionMarker(e.range);
-        this.renderer.updateCursor();
-        this.renderer.updateBackMarkers();
-    };
-    
-    this.$onRemoveRange = function(e) {
-        this.removeSelectionMarkers(e.ranges);
-        this.renderer.updateCursor();
-        this.renderer.updateBackMarkers();
-    };
-    
-    this.$onMultiSelect = function(e) {
-        if (this.inMultiSelectMode)
-            return;
-        this.inMultiSelectMode = true;
-
-        this.setStyle("multiselect");
-        this.keyBinding.addKeyboardHandler(exports.commands.keyboardHandler);
-        this.commands.on("exec", this.$onMultiSelectExec);
-
-        this.renderer.updateCursor();
-        this.renderer.updateBackMarkers();
-    };
-    
-    this.$onSingleSelect = function(e) {
-        if (this.session.multiSelect.inVirtualMode)
-            return;
-        this.inMultiSelectMode = false;
-
-        this.unsetStyle("multiselect");
-        this.keyBinding.removeKeyboardHandler(exports.commands.keyboardHandler);
-
-        this.commands.removeEventListener("exec", this.$onMultiSelectExec);
-        this.renderer.updateCursor();
-        this.renderer.updateBackMarkers();
-    };
-
-    this.$onMultiSelectExec = function(e) {
-        var command = e.command;
-        var editor = e.editor;
-        if (!command.multiSelectAction) {
-            command.exec(editor, e.args || {});
-            editor.multiSelect.addRange(editor.multiSelect.toOrientedRange());
-            editor.multiSelect.mergeOverlappingRanges();
-        } else if (command.multiSelectAction == "forEach") {
-            editor.forEachSelection(command, e.args);
-        } else if (command.multiSelectAction == "single") {
-            editor.exitMultiSelectMode();
-            command.exec(editor, e.args || {});
-        } else {
-            command.multiSelectAction(editor, e.args || {});
-        }
-        e.preventDefault();
-    };
-
-    /**
-     * Editor.forEachSelection(cmd, args) -> Void
-     * - cmd: command to execute
-     * - args: arguments to the command
-     *
-     * executes command for each selection range
-     **/
-    this.forEachSelection = function(cmd, args) {
-        if (this.inVirtualSelectionMode)
-            return;
-
-        var session = this.session;
-        var selection = this.selection;
-        var rangeList = selection.rangeList;
-
-        var reg = selection._eventRegistry;
-        selection._eventRegistry = {};
-
-        var tmpSel = new Selection(session);
-        this.inVirtualSelectionMode = true;
-        for (var i = rangeList.ranges.length; i--;) {
-            tmpSel.fromOrientedRange(rangeList.ranges[i]);
-            this.selection = session.selection = tmpSel;
-            cmd.exec(this, args || {});
-            tmpSel.toOrientedRange(rangeList.ranges[i]);
-        }
-        tmpSel.detach();
-
-        this.selection = session.selection = selection;
-        this.inVirtualSelectionMode = false;
-        selection._eventRegistry = reg;
-        selection.mergeOverlappingRanges();
-
-        this.onCursorChange();
-        this.onSelectionChange();
-    };
-    
-    /**
-    * Editor.exitMultiSelectMode() -> Void
-    *
-    * removes all selections except the last added one.
-    **/
-    this.exitMultiSelectMode = function() {
-        if (this.inVirtualSelectionMode)
-            return;
-        this.multiSelect.toSingleRange();
-    };
-
-    this.getCopyText = function() {
-        var text = "";
-        if (this.inMultiSelectMode) {
-            var ranges = this.multiSelect.rangeList.ranges;
-            text = [];
-            for (var i = 0; i < ranges.length; i++) {
-                text.push(this.session.getTextRange(ranges[i]));
-            }
-            text = text.join(this.session.getDocument().getNewLineCharacter());
-        } else if (!this.selection.isEmpty()) {
-            text = this.session.getTextRange(this.getSelectionRange());
-        }
-
-        return text;
-    };
-
-
-    // commands
-    /**
-     * Editor.selectMoreLines(dir, skip) -> Void
-     * - dir: -1 up, 1 down
-     * - skip: remove active selection range if true
-     *
-     * adds cursor above or bellow active cursor
-     **/
-    this.selectMoreLines = function(dir, skip) {
-        var range = this.selection.toOrientedRange();
-        var isBackwards = range.cursor == range.end;
-
-        var screenLead = this.session.documentToScreenPosition(range.cursor);
-        if (this.selection.$desiredColumn)
-            screenLead.column = this.selection.$desiredColumn;
-
-        var lead = this.session.screenToDocumentPosition(screenLead.row + dir, screenLead.column);
-
-        if (!range.isEmpty()) {
-            var screenAnchor = this.session.documentToScreenPosition(isBackwards ? range.end : range.start);
-            var anchor = this.session.screenToDocumentPosition(screenAnchor.row + dir, screenAnchor.column);
-        } else {
-            var anchor = lead;
-        }
-
-        if (isBackwards) {
-            var newRange = Range.fromPoints(lead, anchor);
-            newRange.cursor = newRange.start;
-        } else {
-            var newRange = Range.fromPoints(anchor, lead);
-            newRange.cursor = newRange.end;
-        }
-
-        newRange.desiredColumn = screenLead.column;
-        if (!this.selection.inMultiSelectMode) {
-            this.selection.addRange(range);
-        } else {
-            if (skip)
-                var toRemove = range.cursor;
-        }
-
-        this.selection.addRange(newRange);
-        if (toRemove)
-            this.selection.substractPoint(toRemove);
-    };
-
-    /**
-     * Editor.transposeSelections(dir) -> Void
-     * - dir: direction to rotate selections
-     *
-     * contents 
-     * empty ranges are expanded to word
-     **/
-    this.transposeSelections = function(dir) {
-        var session = this.session;
-        var sel = session.multiSelect;
-        var all = sel.ranges;
-
-        for (var i = all.length; i--; ) {
-            var range = all[i];
-            if (range.isEmpty()) {
-                var tmp = session.getWordRange(range.start.row, range.start.column);
-                range.start.row = tmp.start.row;
-                range.start.column = tmp.start.column;
-                range.end.row = tmp.end.row;
-                range.end.column = tmp.end.column;
-            }
-        }
-        sel.mergeOverlappingRanges();
-        
-        var words = [];
-        for (var i = all.length; i--; ) {
-            var range = all[i];
-            words.unshift(session.getTextRange(range));
-        }
-
-        if (dir < 0)
-            words.unshift(words.pop());
-        else
-            words.push(words.shift());
-
-        for (var i = all.length; i--; ) {
-            var range = all[i];
-            var tmp = range.clone();
-            session.replace(range, words[i]);
-            range.start.row = tmp.start.row;
-            range.start.column = tmp.start.column;
-        }
-    }
-
-    /**
-     * Editor.selectMore(dir, skip) -> Void
-     * - dir: 1 next, -1 previous
-     * - skip: remove active selection range if true
-     *
-     * finds next occurence of text in active selection
-     * and adds it to the selections
-     **/
-    this.selectMore = function (dir, skip) {
-        var session = this.session;
-        var sel = session.multiSelect;
-
-        var range = sel.toOrientedRange();
-        if (range.isEmpty()) {
-            var range = session.getWordRange(range.start.row, range.start.column);
-            range.cursor = range.end;
-            this.multiSelect.addRange(range);
-        }
-        var needle = session.getTextRange(range);
-
-        var newRange = find(session, needle, dir);
-        if (newRange) {
-            newRange.cursor = dir == -1 ? newRange.start : newRange.end;
-            this.multiSelect.addRange(newRange);
-        }
-        if (skip)
-            this.multiSelect.substractPoint(range.cursor);
-    };
-}).call(Editor.prototype);
-
-
-function isSamePoint(p1, p2) {
-    return p1.row == p2.row && p1.column == p2.column;
-}
-
-// patch
-// adds multicursor support to a session
-exports.onSessionChange = function(e) {
-    var session = e.session;
-    if (!session.multiSelect) {
-        session.$selectionMarkers = [];
-        session.selection.$initRangeList();
-        session.multiSelect = session.selection;
-    }
-    this.multiSelect = session.multiSelect;
-
-    var oldSession = e.oldSession;
-    if (oldSession) {
-        // todo use events
-        if (oldSession.multiSelect && oldSession.multiSelect.editor == this)
-            oldSession.multiSelect.editor = null;
-
-        session.multiSelect.removeEventListener("addRange", this.$onAddRange);
-        session.multiSelect.removeEventListener("removeRange", this.$onRemoveRange);
-        session.multiSelect.removeEventListener("multiSelect", this.$onMultiSelect);
-        session.multiSelect.removeEventListener("singleSelect", this.$onSingleSelect);
-    }
-
-    session.multiSelect.on("addRange", this.$onAddRange);
-    session.multiSelect.on("removeRange", this.$onRemoveRange);
-    session.multiSelect.on("multiSelect", this.$onMultiSelect);
-    session.multiSelect.on("singleSelect", this.$onSingleSelect);
-
-    // this.$onSelectionChange = this.onSelectionChange.bind(this);
-
-    if (this.inMultiSelectMode != session.selection.inMultiSelectMode) {
-        if (session.selection.inMultiSelectMode)
-            this.$onMultiSelect();
-        else
-            this.$onSingleSelect();
-    }
-};
-
-/**
- * MultiSelect(editor) -> Void
- *
- * adds multiple selection support to the editor
- * (note: should be called only once for each editor instance)
- **/
-function MultiSelect(editor) {
-    editor.$onAddRange = editor.$onAddRange.bind(editor);
-    editor.$onRemoveRange = editor.$onRemoveRange.bind(editor);
-    editor.$onMultiSelect = editor.$onMultiSelect.bind(editor);
-    editor.$onSingleSelect = editor.$onSingleSelect.bind(editor);
-
-    exports.onSessionChange.call(editor, editor);
-    editor.on("changeSession", exports.onSessionChange.bind(editor));
-
-    editor.on("mousedown", onMouseDown);
-    editor.commands.addCommands(exports.commands.defaultCommands);
-}
-
-exports.MultiSelect = MultiSelect;
-
-});/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Harutyun Amirjanyan <amirjanyan AT gmail DOT com>
- *
- * 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 ***** */
-
-define('ace/range_list', ['require', 'exports', 'module' ], function(require, exports, module) {
-"use strict";
-
-
-var RangeList = function() {
-    this.ranges = [];
-};
-
-(function() {
-    this.comparePoints = function(p1, p2) {
-        return p1.row - p2.row || p1.column - p2.column;
-    };
-
-    this.pointIndex = function(pos, startIndex) {
-        var list = this.ranges;
-
-        for (var i = startIndex || 0; i < list.length; i++) {
-            var range = list[i];
-            var cmp = this.comparePoints(pos, range.end);
-
-            if (cmp > 0)
-                continue;
-            if (cmp == 0)
-                return i;
-            cmp = this.comparePoints(pos, range.start);
-            if (cmp >= 0)
-                return i;
-
-            return -i-1;
-        }
-        return -i - 1;
-    };
-
-    this.add = function(range) {
-        var startIndex = this.pointIndex(range.start);
-        if (startIndex < 0)
-            startIndex = -startIndex - 1;
-
-        var endIndex = this.pointIndex(range.end, startIndex);
-
-        if (endIndex < 0)
-            endIndex = -endIndex - 1;
-        else
-            endIndex++;
-
-        return this.ranges.splice(startIndex, endIndex - startIndex, range);
-    };
-
-    this.addList = function(list) {
-        var removed = [];
-        for (var i = list.length; i--; ) {
-            removed.push.call(removed, this.add(list[i]));
-        }
-        return removed;
-    };
-
-    this.substractPoint = function(pos) {
-        var i = this.pointIndex(pos);
-
-        if (i >= 0)
-            return this.ranges.splice(i, 1);
-    };
-
-    // merge overlapping ranges
-    this.merge = function() {
-        var removed = [];
-        var list = this.ranges;
-        var next = list[0], range;
-        for (var i = 1; i < list.length; i++) {
-            range = next;
-            next = list[i];
-            var cmp = this.comparePoints(range.end, next.start);
-            if (cmp < 0)
-                continue;
-
-            if (cmp == 0 && !(range.isEmpty() || next.isEmpty()))
-                continue;
-
-            if (this.comparePoints(range.end, next.end) < 0) {
-                range.end.row = next.end.row;
-                range.end.column = next.end.column;
-            }
-
-            list.splice(i, 1);
-            removed.push(next);
-            next = range;
-            i--;
-        }
-
-        return removed;
-    };
-
-    this.contains = function(row, column) {
-        return this.pointIndex({row: row, column: column}) >= 0;
-    };
-
-    this.containsPoint = function(pos) {
-        return this.pointIndex(pos) >= 0;
-    };
-
-    this.rangeAtPoint = function(pos) {
-        var i = this.pointIndex(pos);
-        if (i >= 0)
-            return this.ranges[i];
-    };
-
-
-    this.clipRows = function(startRow, endRow) {
-        var list = this.ranges;
-        if (list[0].start.row > endRow || list[list.length - 1].start.row < startRow)
-            return [];
-
-        var startIndex = this.pointIndex({row: startRow, column: 0});
-        if (startIndex < 0)
-            startIndex = -startIndex - 1;
-        var endIndex = this.pointIndex({row: endRow, column: 0}, startIndex);
-        if (endIndex < 0)
-            endIndex = -endIndex - 1;
-
-        var clipped = [];
-        for (var i = startIndex; i < endIndex; i++) {
-            clipped.push(list[i]);
-        }
-        return clipped;
-    };
-
-    this.removeAll = function() {
-        return this.ranges.splice(0, this.ranges.length);
-    };
-
-    this.attach = function(session) {
-        if (this.session)
-            this.detach();
-
-        this.session = session;
-        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(e) {
-        var changeRange = e.data.range;
-        if (e.data.action[0] == "i"){
-            var start = changeRange.start;
-            var end = changeRange.end;
-        } else {
-            var end = changeRange.start;
-            var start = changeRange.end;
-        }
-        var startRow = start.row;
-        var endRow = end.row;
-        var lineDif = endRow - startRow;
-
-        var colDiff = -start.column + end.column;
-
-        var ranges = this.ranges;
-
-        for (var i=0, n = ranges.length; i < n; i++) {
-            var r = ranges[i];
-            if (r.end.row < startRow)
-                continue;
-            if (r.start.row > startRow)
-                break;
-
-            if (r.start.row == startRow && r.start.column >= start.column ) {
-                r.start.column += colDiff;
-                r.start.row += lineDif;
-            }
-            if (r.end.row == startRow && r.end.column >=  start.column) {
-                r.end.column += colDiff;
-                r.end.row += lineDif;
-            }
-        }
-
-        if (lineDif != 0 && i < n) {
-            for (; i < n; i++) {
-                var r = ranges[i];
-                r.start.row += lineDif;
-                r.end.row += lineDif;
-            }
-        }
-    };
-
-}).call(RangeList.prototype);
-
-exports.RangeList = RangeList;
-});
-/* vim:ts=4:sts=4:sw=4:
- * ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Harutyun Amirjanyan <amirjanyan AT gmail DOT com>
- *
- * 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 ***** */
-
-define('ace/mouse/multi_select_handler', ['require', 'exports', 'module' , 'ace/lib/event'], function(require, exports, module) {
-
-var event = require("../lib/event");
-
-
-// mouse
-function isSamePoint(p1, p2) {
-    return p1.row == p2.row && p1.column == p2.column;
-}
-
-function onMouseDown(e) {
-    var ev = e.domEvent;
-    var alt = ev.altKey;
-    var shift = ev.shiftKey;
-    var ctrl = e.getAccelKey();
-    var button = e.getButton();
-
-    if (!ctrl && !alt) {
-        if (e.editor.inMultiSelectMode) {
-            if (button == 0) {
-                e.editor.exitMultiSelectMode();
-            } else if (button == 2) {
-                var editor = e.editor;
-                var selectionEmpty = editor.selection.isEmpty();
-                editor.textInput.onContextMenu({x: e.clientX, y: e.clientY}, selectionEmpty);
-                event.capture(editor.container, function(){}, editor.textInput.onContextMenuClose);
-                e.stop();
-            }
-        }
-        return;
-    }
-
-    var editor = e.editor;
-    var selection = editor.selection;
-    var isMultiSelect = editor.inMultiSelectMode;
-    var pos = e.getDocumentPosition();
-    var cursor = selection.getCursor();
-    var inSelection = e.inSelection() || (selection.isEmpty() && isSamePoint(pos, cursor));
-
-
-    var mouseX = e.pageX, mouseY = e.pageY;
-    var onMouseSelection = function(e) {
-        mouseX = event.getDocumentX(e);
-        mouseY = event.getDocumentY(e);
-    };
-
-    var blockSelect = function() {
-        var newCursor = editor.renderer.pixelToScreenCoordinates(mouseX, mouseY);
-        var cursor = session.screenToDocumentPosition(newCursor.row, newCursor.column);
-
-        if (isSamePoint(screenCursor, newCursor)
-            && isSamePoint(cursor, selection.selectionLead))
-            return;
-        screenCursor = newCursor;
-
-        editor.selection.moveCursorToPosition(cursor);
-        editor.selection.clearSelection();
-        editor.renderer.scrollCursorIntoView();
-
-        editor.removeSelectionMarkers(rectSel);
-        rectSel = selection.rectangularRangeBlock(screenCursor, screenAnchor);
-        rectSel.forEach(editor.addSelectionMarker, editor);
-        editor.updateSelectionMarkers();
-    };
-    
-    var session = editor.session;
-    var screenAnchor = editor.renderer.pixelToScreenCoordinates(mouseX, mouseY);
-    var screenCursor = screenAnchor;
-
-    
-
-    if (ctrl && !shift && !alt && button == 0) {
-        if (!isMultiSelect && inSelection)
-            return; // dragging
-
-        if (!isMultiSelect)
-            selection.addRange(selection.toOrientedRange());
-
-
-        var oldRange = selection.rangeList.rangeAtPoint(pos);
-
-        event.capture(editor.container, function(){}, function() {
-            var tmpSel = selection.toOrientedRange();
-
-            if (oldRange && tmpSel.isEmpty() && isSamePoint(oldRange.cursor, tmpSel.cursor))
-                selection.substractPoint(tmpSel.cursor);
-            else
-                selection.addRange(tmpSel);
-        });
-
-    } else if (!shift && alt && button == 0) {
-        e.stop();
-
-        if (isMultiSelect && !ctrl)
-            selection.toSingleRange();
-        else if (!isMultiSelect && ctrl)
-            selection.addRange();
-
-        selection.moveCursorToPosition(pos);
-        selection.clearSelection();
-
-        var rectSel = [];
-
-        var onMouseSelectionEnd = function(e) {
-            clearInterval(timerId);
-            editor.removeSelectionMarkers(rectSel);
-            for (var i = 0; i < rectSel.length; i++)
-                selection.addRange(rectSel[i]);
-        };
-
-        var onSelectionInterval = blockSelect;
-
-        event.capture(editor.container, onMouseSelection, onMouseSelectionEnd);
-        var timerId = setInterval(function() {onSelectionInterval();}, 20);
-
-        return e.preventDefault();
-    }
-}
-
-
-exports.onMouseDown = onMouseDown;
-
-});/* vim:ts=4:sts=4:sw=4:
- * ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Harutyun Amirjanyan <amirjanyan AT gmail DOT com>
- *
- * 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 ***** */
-
-define('ace/commands/multi_select_commands', ['require', 'exports', 'module' , 'ace/keyboard/hash_handler'], function(require, exports, module) {
-
-// commands to enter multiselect mode
-exports.defaultCommands = [{
-    name: "addCursorAbove",
-    exec: function(editor) { editor.selectMoreLines(-1); },
-    bindKey: {win: "Ctrl-Alt-Up", mac: "Ctrl-Alt-Up"},
-    readonly: true
-}, {
-    name: "addCursorBelow",
-    exec: function(editor) { editor.selectMoreLines(1); },
-    bindKey: {win: "Ctrl-Alt-Down", mac: "Ctrl-Alt-Down"},
-    readonly: true
-}, {
-    name: "addCursorAboveSkipCurrent",
-    exec: function(editor) { editor.selectMoreLines(-1, true); },
-    bindKey: {win: "Ctrl-Alt-Shift-Up", mac: "Ctrl-Alt-Shift-Up"},
-    readonly: true
-}, {
-    name: "addCursorBelowSkipCurrent",
-    exec: function(editor) { editor.selectMoreLines(1, true); },
-    bindKey: {win: "Ctrl-Alt-Shift-Down", mac: "Ctrl-Alt-Shift-Down"},
-    readonly: true
-}, {
-    name: "selectMoreBefore",
-    exec: function(editor) { editor.selectMore(-1); },
-    bindKey: {win: "Ctrl-Alt-Left", mac: "Ctrl-Alt-Left"},
-    readonly: true
-}, {
-    name: "selectMoreAfter",
-    exec: function(editor) { editor.selectMore(1); },
-    bindKey: {win: "Ctrl-Alt-Right", mac: "Ctrl-Alt-Right"},
-    readonly: true
-}, {
-    name: "selectNextBefore",
-    exec: function(editor) { editor.selectMore(-1, true); },
-    bindKey: {win: "Ctrl-Alt-Shift-Left", mac: "Ctrl-Alt-Shift-Left"},
-    readonly: true
-}, {
-    name: "selectNextAfter",
-    exec: function(editor) { editor.selectMore(1, true); },
-    bindKey: {win: "Ctrl-Alt-Shift-Right", mac: "Ctrl-Alt-Shift-Right"},
-    readonly: true
-},  {
-    name: "splitIntoLines",
-    exec: function(editor) { editor.multiSelect.splitIntoLines(); },
-    bindKey: {win: "Ctrl-Shift-L", mac: "Ctrl-Shift-L"},
-    readonly: true
-}];
-
-// commands active in multiselect mode
-exports.multiEditCommands = [{
-    name: "singleSelection",
-    bindKey: "esc",
-    exec: function(editor) { editor.exitMultiSelectMode(); },
-    readonly: true
-}];
-
-var HashHandler = require("../keyboard/hash_handler").HashHandler;
-exports.keyboardHandler = new HashHandler(exports.multiEditCommands);
-
-});/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/worker/worker_client', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/event_emitter', 'ace/config'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var EventEmitter = require("../lib/event_emitter").EventEmitter;
-var config = require("../config");
-
-var WorkerClient = function(topLevelNamespaces, packagedJs, mod, classname) {
-
-    this.changeListener = this.changeListener.bind(this);
-
-    if (config.get("packaged")) {
-        this.$worker = new Worker(config.get("workerPath") + "/" + packagedJs);
-    }
-    else {
-        var workerUrl = this.$normalizePath(require.nameToUrl("ace/worker/worker", null, "_"));
-        this.$worker = new Worker(workerUrl);
-
-        var tlns = {};
-        for (var i=0; i<topLevelNamespaces.length; i++) {
-            var ns = topLevelNamespaces[i];
-            var path = this.$normalizePath(require.nameToUrl(ns, null, "_").replace(/.js$/, ""));
-
-            tlns[ns] = path;
-        }
-    }
-
-    this.$worker.postMessage({
-        init : true,
-        tlns: tlns,
-        module: mod,
-        classname: classname
-    });
-
-    this.callbackId = 1;
-    this.callbacks = {};
-
-    var _self = this;
-    this.$worker.onerror = function(e) {
-        window.console && console.log && console.log(e);
-        throw e;
-    };
-    this.$worker.onmessage = function(e) {
-        var msg = e.data;
-        switch(msg.type) {
-            case "log":
-                window.console && console.log && console.log(msg.data);
-                break;
-
-            case "event":
-                _self._emit(msg.name, {data: msg.data});
-                break;
-
-            case "call":
-                var callback = _self.callbacks[msg.id];
-                if (callback) {
-                    callback(msg.data);
-                    delete _self.callbacks[msg.id];
-                }
-                break;
-        }
-    };
-};
-
-(function(){
-
-    oop.implement(this, EventEmitter);
-
-    this.$normalizePath = function(path) {
-        path = path.replace(/^[a-z]+:\/\/[^\/]+/, ""); // Remove domain name and rebuild it
-        path = location.protocol + "//" + location.host
-            // paths starting with a slash are relative to the root (host)
-            + (path.charAt(0) == "/" ? "" : location.pathname.replace(/\/[^\/]*$/, ""))
-            + "/" + path.replace(/^[\/]+/, "");
-        return path;
-    };
-
-    this.terminate = function() {
-        this._emit("terminate", {});
-        this.$worker.terminate();
-        this.$worker = null;
-        this.$doc.removeEventListener("change", this.changeListener);
-        this.$doc = null;
-    };
-
-    this.send = function(cmd, args) {
-        this.$worker.postMessage({command: cmd, args: args});
-    };
-
-    this.call = function(cmd, args, callback) {
-        if (callback) {
-            var id = this.callbackId++;
-            this.callbacks[id] = callback;
-            args.push(id);
-        }
-        this.send(cmd, args);
-    };
-
-    this.emit = function(event, data) {
-        try {
-            // firefox refuses to clone objects which have function properties
-            // TODO: cleanup event
-            this.$worker.postMessage({event: event, data: {data: data.data}});
-        }
-        catch(ex) {}
-    };
-
-    this.attachToDocument = function(doc) {
-        if(this.$doc)
-            this.terminate();
-
-        this.$doc = doc;
-        this.call("setValue", [doc.getValue()]);
-        doc.on("change", this.changeListener);
-    };
-
-    this.changeListener = function(e) {
-        e.range = {
-            start: e.data.range.start,
-            end: e.data.range.end
-        };
-        this.emit("change", e);
-    };
-
-}).call(WorkerClient.prototype);
-
-exports.WorkerClient = WorkerClient;
-
-});
-/* ***** 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 Mozilla Skywriter.
- *
- * The Initial Developer of the Original Code is
- * Mozilla.
- * Portions created by the Initial Developer are Copyright (C) 2009
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Julian Viereck (julian.viereck@gmail.com)
- *
- * 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 ***** */
-
-define('ace/keyboard/state_handler', ['require', 'exports', 'module' ], function(require, exports, module) {
-"use strict";
-
-// If you're developing a new keymapping and want to get an idea what's going
-// on, then enable debugging.
-var DEBUG = false;
-
-function StateHandler(keymapping) {
-    this.keymapping = this.$buildKeymappingRegex(keymapping);
-}
-
-StateHandler.prototype = {
-    /**
-     * Build the RegExp from the keymapping as RegExp can't stored directly
-     * in the metadata JSON and as the RegExp used to match the keys/buffer
-     * need to be adapted.
-     */
-    $buildKeymappingRegex: function(keymapping) {
-        for (var state in keymapping) {
-            this.$buildBindingsRegex(keymapping[state]);
-        }
-        return keymapping;
-    },
-
-    $buildBindingsRegex: function(bindings) {
-        // Escape a given Regex string.
-        bindings.forEach(function(binding) {
-            if (binding.key) {
-                binding.key = new RegExp('^' + binding.key + '$');
-            } else if (Array.isArray(binding.regex)) {
-                if (!('key' in binding))
-                  binding.key = new RegExp('^' + binding.regex[1] + '$');
-                binding.regex = new RegExp(binding.regex.join('') + '$');
-            } else if (binding.regex) {
-                binding.regex = new RegExp(binding.regex + '$');
-            }
-        });
-    },
-
-    $composeBuffer: function(data, hashId, key, e) {
-        // Initialize the data object.
-        if (data.state == null || data.buffer == null) {
-            data.state = "start";
-            data.buffer = "";
-        }
-
-        var keyArray = [];
-        if (hashId & 1) keyArray.push("ctrl");
-        if (hashId & 8) keyArray.push("command");
-        if (hashId & 2) keyArray.push("option");
-        if (hashId & 4) keyArray.push("shift");
-        if (key)        keyArray.push(key);
-
-        var symbolicName = keyArray.join("-");
-        var bufferToUse = data.buffer + symbolicName;
-
-        // Don't add the symbolic name to the key buffer if the alt_ key is
-        // part of the symbolic name. If it starts with alt_, this means
-        // that the user hit an alt keycombo and there will be a single,
-        // new character detected after this event, which then will be
-        // added to the buffer (e.g. alt_j will result in ∆).
-        //
-        // We test for 2 and not for & 2 as we only want to exclude the case where
-        // the option key is pressed alone.
-        if (hashId != 2) {
-            data.buffer = bufferToUse;
-        }
-
-        var bufferObj = {
-            bufferToUse: bufferToUse,
-            symbolicName: symbolicName,
-        };
-
-        if (e) {
-            bufferObj.keyIdentifier = e.keyIdentifier
-        }
-
-        return bufferObj;
-    },
-
-    $find: function(data, buffer, symbolicName, hashId, key, keyIdentifier) {
-        // Holds the command to execute and the args if a command matched.
-        var result = {};
-
-        // Loop over all the bindings of the keymap until a match is found.
-        this.keymapping[data.state].some(function(binding) {
-            var match;
-
-            // Check if the key matches.
-            if (binding.key && !binding.key.test(symbolicName)) {
-                return false;
-            }
-
-            // Check if the regex matches.
-            if (binding.regex && !(match = binding.regex.exec(buffer))) {
-                return false;
-            }
-
-            // Check if the match function matches.
-            if (binding.match && !binding.match(buffer, hashId, key, symbolicName, keyIdentifier)) {
-                return false;
-            }
-
-            // Check for disallowed matches.
-            if (binding.disallowMatches) {
-                for (var i = 0; i < binding.disallowMatches.length; i++) {
-                    if (!!match[binding.disallowMatches[i]]) {
-                        return false;
-                    }
-                }
-            }
-
-            // If there is a command to execute, then figure out the
-            // command and the arguments.
-            if (binding.exec) {
-                result.command = binding.exec;
-
-                // Build the arguments.
-                if (binding.params) {
-                    var value;
-                    result.args = {};
-                    binding.params.forEach(function(param) {
-                        if (param.match != null && match != null) {
-                            value = match[param.match] || param.defaultValue;
-                        } else {
-                            value = param.defaultValue;
-                        }
-
-                        if (param.type === 'number') {
-                            value = parseInt(value);
-                        }
-
-                        result.args[param.name] = value;
-                    });
-                }
-                data.buffer = "";
-            }
-
-            // Handle the 'then' property.
-            if (binding.then) {
-                data.state = binding.then;
-                data.buffer = "";
-            }
-
-            // If no command is set, then execute the "null" fake command.
-            if (result.command == null) {
-                result.command = "null";
-            }
-
-            if (DEBUG) {
-                console.log("KeyboardStateMapper#find", binding);
-            }
-            return true;
-        });
-
-        if (result.command) {
-            return result;
-        } else {
-            data.buffer = "";
-            return false;
-        }
-    },
-
-    /**
-     * This function is called by keyBinding.
-     */
-    handleKeyboard: function(data, hashId, key, keyCode, e) {
-        // If we pressed any command key but no other key, then ignore the input.
-        // Otherwise "shift-" is added to the buffer, and later on "shift-g"
-        // which results in "shift-shift-g" which doesn't make sense.
-        if (hashId != 0 && (key == "" || key == String.fromCharCode(0))) {
-            return null;
-        }
-
-        // Compute the current value of the keyboard input buffer.
-        var r = this.$composeBuffer(data, hashId, key, e);
-        var buffer = r.bufferToUse;
-        var symbolicName = r.symbolicName;
-        var keyId = r.keyIdentifier;
-
-        r = this.$find(data, buffer, symbolicName, hashId, key, keyId);
-        if (DEBUG) {
-            console.log("KeyboardStateMapper#match", buffer, symbolicName, r);
-        }
-
-        return r;
-    }
-}
-
-/**
- * This is a useful matching function and therefore is defined here so that
- * users of KeyboardStateMapper can use it.
- *
- * @return boolean
- *          If no command key (Command|Option|Shift|Ctrl) is pressed, it
- *          returns true. If the only the Shift key is pressed + a character
- *          true is returned as well. Otherwise, false is returned.
- *          Summing up, the function returns true whenever the user typed
- *          a normal character on the keyboard and no shortcut.
- */
-exports.matchCharacterOnly = function(buffer, hashId, key, symbolicName) {
-    // If no command keys are pressed, then catch the input.
-    if (hashId == 0) {
-        return true;
-    }
-    // If only the shift key is pressed and a character key, then
-    // catch that input as well.
-    else if ((hashId == 4) && key.length == 1) {
-        return true;
-    }
-    // Otherwise, we let the input got through.
-    else {
-        return false;
-    }
-};
-
-exports.StateHandler = StateHandler;
-});
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Zef Hemel <zef@c9.io>
- *
- * 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 ***** */
-define('ace/placeholder', ['require', 'exports', 'module' , 'ace/range', 'ace/lib/event_emitter', 'ace/lib/oop'], function(require, exports, module) {
-"use strict";
-
-var Range = require('./range').Range;
-var EventEmitter = require("./lib/event_emitter").EventEmitter;
-var oop = require("./lib/oop");
-
-var PlaceHolder = function(session, length, pos, others, mainClass, othersClass) {
-    var _self = this;
-    this.length = length;
-    this.session = session;
-    this.doc = session.getDocument();
-    this.mainClass = mainClass;
-    this.othersClass = othersClass;
-    this.$onUpdate = this.onUpdate.bind(this);
-    this.doc.on("change", this.$onUpdate);
-    this.$others = others;
-    
-    this.$onCursorChange = function() {
-        setTimeout(function() {
-            _self.onCursorChange();
-        });
-    };
-    
-    this.$pos = pos;
-    // Used for reset
-    var undoStack = session.getUndoManager().$undoStack || session.getUndoManager().$undostack || {length: -1};
-    this.$undoStackDepth =  undoStack.length;
-    this.setup();
-
-    session.selection.on("changeCursor", this.$onCursorChange);
-};
-
-(function() {
-
-    oop.implement(this, EventEmitter);
-
-    this.setup = function() {
-        var _self = this;
-        var doc = this.doc;
-        var session = this.session;
-        var pos = this.$pos;
-
-        this.pos = doc.createAnchor(pos.row, pos.column);
-        this.markerId = session.addMarker(new Range(pos.row, pos.column, pos.row, pos.column + this.length), this.mainClass, null, false);
-        this.pos.on("change", function(event) {
-            session.removeMarker(_self.markerId);
-            _self.markerId = session.addMarker(new Range(event.value.row, event.value.column, event.value.row, event.value.column+_self.length), _self.mainClass, null, false);
-        });
-        this.others = [];
-        this.$others.forEach(function(other) {
-            var anchor = doc.createAnchor(other.row, other.column);
-            _self.others.push(anchor);
-        });
-        session.setUndoSelect(false);
-    };
-    
-    this.showOtherMarkers = function() {
-        if(this.othersActive) return;
-        var session = this.session;
-        var _self = this;
-        this.othersActive = true;
-        this.others.forEach(function(anchor) {
-            anchor.markerId = session.addMarker(new Range(anchor.row, anchor.column, anchor.row, anchor.column+_self.length), _self.othersClass, null, false);
-            anchor.on("change", function(event) {
-                session.removeMarker(anchor.markerId);
-                anchor.markerId = session.addMarker(new Range(event.value.row, event.value.column, event.value.row, event.value.column+_self.length), _self.othersClass, null, false);
-            });
-        });
-    };
-    
-    this.hideOtherMarkers = function() {
-        if(!this.othersActive) return;
-        this.othersActive = false;
-        for (var i = 0; i < this.others.length; i++) {
-            this.session.removeMarker(this.others[i].markerId);
-        }
-    };
-
-    this.onUpdate = function(event) {
-        var delta = event.data;
-        var range = delta.range;
-        if(range.start.row !== range.end.row) return;
-        if(range.start.row !== this.pos.row) return;
-        if (this.$updating) return;
-        this.$updating = true;
-        var lengthDiff = delta.action === "insertText" ? range.end.column - range.start.column : range.start.column - range.end.column;
-        
-        if(range.start.column >= this.pos.column && range.start.column <= this.pos.column + this.length + 1) {
-            var distanceFromStart = range.start.column - this.pos.column;
-            this.length += lengthDiff;
-            if(!this.session.$fromUndo) {
-                if(delta.action === "insertText") {
-                    for (var i = this.others.length - 1; i >= 0; i--) {
-                        var otherPos = this.others[i];
-                        var newPos = {row: otherPos.row, column: otherPos.column + distanceFromStart};
-                        if(otherPos.row === range.start.row && range.start.column < otherPos.column)
-                            newPos.column += lengthDiff;
-                        this.doc.insert(newPos, delta.text);
-                    }
-                } else if(delta.action === "removeText") {
-                    for (var i = this.others.length - 1; i >= 0; i--) {
-                        var otherPos = this.others[i];
-                        var newPos = {row: otherPos.row, column: otherPos.column + distanceFromStart};
-                        if(otherPos.row === range.start.row && range.start.column < otherPos.column)
-                            newPos.column += lengthDiff;
-                        this.doc.remove(new Range(newPos.row, newPos.column, newPos.row, newPos.column - lengthDiff));
-                    }
-                }
-                // Special case: insert in beginning
-                if(range.start.column === this.pos.column && delta.action === "insertText") {
-                    setTimeout(function() {
-                        this.pos.setPosition(this.pos.row, this.pos.column - lengthDiff);
-                        for (var i = 0; i < this.others.length; i++) {
-                            var other = this.others[i];
-                            var newPos = {row: other.row, column: other.column - lengthDiff};
-                            if(other.row === range.start.row && range.start.column < other.column)
-                                newPos.column += lengthDiff;
-                            other.setPosition(newPos.row, newPos.column);
-                        }
-                    }.bind(this), 0);
-                }
-                else if(range.start.column === this.pos.column && delta.action === "removeText") {
-                    setTimeout(function() {
-                        for (var i = 0; i < this.others.length; i++) {
-                            var other = this.others[i];
-                            if(other.row === range.start.row && range.start.column < other.column) {
-                                other.setPosition(other.row, other.column - lengthDiff);
-                            }
-                        }
-                    }.bind(this), 0);
-                }
-            }
-            this.pos._emit("change", {value: this.pos});
-            for (var i = 0; i < this.others.length; i++) {
-                this.others[i]._emit("change", {value: this.others[i]});
-            }
-        }
-        this.$updating = false;
-    };
-    
-    this.onCursorChange = function(event) {
-        if (this.$updating) return;
-        var pos = this.session.selection.getCursor();
-        if(pos.row === this.pos.row && pos.column >= this.pos.column && pos.column <= this.pos.column + this.length) {
-            this.showOtherMarkers();
-            this._emit("cursorEnter", event);
-        } else {
-            this.hideOtherMarkers();
-            this._emit("cursorLeave", event);
-        }
-    };
-    
-    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 i = 0; i < this.others.length; i++) {
-            this.others[i].detach();
-        }
-        this.session.setUndoSelect(true);
-    };
-    
-    this.cancel = function() {
-        if(this.$undoStackDepth === -1)
-            throw Error("Canceling placeholders only supported with undo manager attached to session.");
-        var undoManager = this.session.getUndoManager();
-        var undosRequired = (undoManager.$undoStack || undoManager.$undostack).length - this.$undoStackDepth;
-        for (var i = 0; i < undosRequired; i++) {
-            undoManager.undo(true);
-        }
-    };
-}).call(PlaceHolder.prototype);
-
-
-exports.PlaceHolder = PlaceHolder;
-});
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/theme/textmate', ['require', 'exports', 'module' , 'ace/lib/dom'], function(require, exports, module) {
-"use strict";
-
-exports.isDark = false;
-exports.cssClass = "ace-tm";
-exports.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 dom = require("../lib/dom");
-dom.importCssString(exports.cssText, exports.cssClass);
-});
-;
-            (function() {
-                window.require(["ace/ace"], function(a) {
-                    if (!window.ace)
-                        window.ace = {};
-                    for (var key in a) if (a.hasOwnProperty(key))
-                        ace[key] = a[key];
-                });
-            })();
-        
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/ace.js b/apps/files_texteditor/js/aceeditor/ace.js
deleted file mode 100644
index 679230926e..0000000000
--- a/apps/files_texteditor/js/aceeditor/ace.js
+++ /dev/null
@@ -1,9 +0,0 @@
-(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)
-                        window.ace = {};
-                    for (var key in a) if (a.hasOwnProperty(key))
-                        ace[key] = a[key];
-                });
-            })();
diff --git a/apps/files_texteditor/js/aceeditor/keybinding-emacs-uncompressed.js b/apps/files_texteditor/js/aceeditor/keybinding-emacs-uncompressed.js
deleted file mode 100644
index 757c908c9f..0000000000
--- a/apps/files_texteditor/js/aceeditor/keybinding-emacs-uncompressed.js
+++ /dev/null
@@ -1,150 +0,0 @@
-/* ***** 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 Mozilla Skywriter.
- *
- * The Initial Developer of the Original Code is
- * Mozilla.
- * Portions created by the Initial Developer are Copyright (C) 2009
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Julian Viereck (julian.viereck@gmail.com)
- *
- * 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 ***** */
-
-define('ace/keyboard/keybinding/emacs', ['require', 'exports', 'module' , 'ace/keyboard/state_handler'], function(require, exports, module) {
-"use strict";
-
-var StateHandler = require("../state_handler").StateHandler;
-var matchCharacterOnly =  require("../state_handler").matchCharacterOnly;
-
-var emacsState = {
-    start: [
-        {
-            key:    "ctrl-x",
-            then:   "c-x"
-        },
-        {
-            regex:  [ "(?:command-([0-9]*))*", "(down|ctrl-n)" ],
-            exec:   "golinedown",
-            params: [
-                {
-                    name: "times",
-                    match: 1,
-                    type: "number",
-                    defaultValue: 1
-                }
-            ]
-        },
-        {
-            regex: [ "(?:command-([0-9]*))*", "(right|ctrl-f)" ],
-            exec: "gotoright",
-            params: [
-                {
-                    name: "times",
-                    match: 1,
-                    type: "number",
-                    defaultValue: 1
-                }
-            ]
-        },
-        {
-            regex: [ "(?:command-([0-9]*))*", "(up|ctrl-p)" ],
-            exec: "golineup",
-            params: [
-                {
-                    name: "times",
-                    match: 1,
-                    type: "number",
-                    defaultValue: 1
-                }
-            ]
-        },
-        {
-            regex: [ "(?:command-([0-9]*))*", "(left|ctrl-b)" ],
-            exec: "gotoleft",
-            params: [
-                {
-                    name: "times",
-                    match: 1,
-                    type: "number",
-                    defaultValue: 1
-                }
-            ]
-        },
-        {
-            comment: "This binding matches all printable characters except numbers as long as they are no numbers and print them n times.",
-            regex:  [ "(?:command-([0-9]*))", "([^0-9]+)*" ],
-            match:  matchCharacterOnly,
-            exec:   "inserttext",
-            params: [
-                {
-                    name: "times",
-                    match: 1,
-                    type: "number",
-                    defaultValue: "1"
-                },
-                {
-                    name: "text",
-                    match: 2
-                }
-            ]
-        },
-        {
-            comment: "This binding matches numbers as long as there is no meta_number in the buffer.",
-            regex:  [ "(command-[0-9]*)*", "([0-9]+)" ],
-            match:  matchCharacterOnly,
-            disallowMatches:  [ 1 ],
-            exec:   "inserttext",
-            params: [
-                {
-                    name: "text",
-                    match: 2,
-                    type: "text"
-                }
-            ]
-        },
-        {
-            regex: [ "command-([0-9]*)", "(command-[0-9]|[0-9])" ],
-            comment: "Stops execution if the regex /meta_[0-9]+/ matches to avoid resetting the buffer."
-        }
-    ],
-    "c-x": [
-        {
-            key: "ctrl-g",
-            then: "start"
-        },
-        {
-            key: "ctrl-s",
-            exec: "save",
-            then: "start"
-        }
-    ]
-};
-
-exports.Emacs = new StateHandler(emacsState);
-
-});
diff --git a/apps/files_texteditor/js/aceeditor/keybinding-emacs.js b/apps/files_texteditor/js/aceeditor/keybinding-emacs.js
deleted file mode 100644
index f2eb354a9d..0000000000
--- a/apps/files_texteditor/js/aceeditor/keybinding-emacs.js
+++ /dev/null
@@ -1 +0,0 @@
-define("ace/keyboard/keybinding/emacs",["require","exports","module","ace/keyboard/state_handler"],function(a,b,c){"use strict";var d=a("../state_handler").StateHandler,e=a("../state_handler").matchCharacterOnly,f={start:[{key:"ctrl-x",then:"c-x"},{regex:["(?:command-([0-9]*))*","(down|ctrl-n)"],exec:"golinedown",params:[{name:"times",match:1,type:"number",defaultValue:1}]},{regex:["(?:command-([0-9]*))*","(right|ctrl-f)"],exec:"gotoright",params:[{name:"times",match:1,type:"number",defaultValue:1}]},{regex:["(?:command-([0-9]*))*","(up|ctrl-p)"],exec:"golineup",params:[{name:"times",match:1,type:"number",defaultValue:1}]},{regex:["(?:command-([0-9]*))*","(left|ctrl-b)"],exec:"gotoleft",params:[{name:"times",match:1,type:"number",defaultValue:1}]},{comment:"This binding matches all printable characters except numbers as long as they are no numbers and print them n times.",regex:["(?:command-([0-9]*))","([^0-9]+)*"],match:e,exec:"inserttext",params:[{name:"times",match:1,type:"number",defaultValue:"1"},{name:"text",match:2}]},{comment:"This binding matches numbers as long as there is no meta_number in the buffer.",regex:["(command-[0-9]*)*","([0-9]+)"],match:e,disallowMatches:[1],exec:"inserttext",params:[{name:"text",match:2,type:"text"}]},{regex:["command-([0-9]*)","(command-[0-9]|[0-9])"],comment:"Stops execution if the regex /meta_[0-9]+/ matches to avoid resetting the buffer."}],"c-x":[{key:"ctrl-g",then:"start"},{key:"ctrl-s",exec:"save",then:"start"}]};b.Emacs=new d(f)})
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/keybinding-vim-uncompressed.js b/apps/files_texteditor/js/aceeditor/keybinding-vim-uncompressed.js
deleted file mode 100644
index 3643eb3fd6..0000000000
--- a/apps/files_texteditor/js/aceeditor/keybinding-vim-uncompressed.js
+++ /dev/null
@@ -1,138 +0,0 @@
-/* ***** 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 Mozilla Skywriter.
- *
- * The Initial Developer of the Original Code is
- * Mozilla.
- * Portions created by the Initial Developer are Copyright (C) 2009
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Julian Viereck (julian.viereck@gmail.com)
- *
- * 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 ***** */
-
-define('ace/keyboard/keybinding/vim', ['require', 'exports', 'module' , 'ace/keyboard/state_handler'], function(require, exports, module) {
-"use strict";
-
-var StateHandler = require("../state_handler").StateHandler;
-var matchCharacterOnly =  require("../state_handler").matchCharacterOnly;
-
-var vimcommand = function(key, exec, then) {
-    return {
-        regex:  [ "([0-9]*)", key ],
-        exec:   exec,
-        params: [
-            {
-                name:     "times",
-                match:    1,
-                type:     "number",
-                defaultValue:     1
-            }
-        ],
-        then:   then
-    }
-}
-
-var vimStates = {
-    start: [
-        {
-            key:    "i",
-            then:   "insertMode"
-        },
-        {
-            key:    "d",
-            then:   "deleteMode"
-        },
-        {
-            key:    "a",
-            exec:   "gotoright",
-            then:   "insertMode"
-        },
-        {
-            key:    "shift-i",
-            exec:   "gotolinestart",
-            then:   "insertMode"
-        },
-        {
-            key:    "shift-a",
-            exec:   "gotolineend",
-            then:   "insertMode"
-        },
-        {
-            key:    "shift-c",
-            exec:   "removetolineend",
-            then:   "insertMode"
-        },
-        {
-            key:    "shift-r",
-            exec:   "overwrite",
-            then:   "replaceMode"
-        },
-        vimcommand("(k|up)", "golineup"),
-        vimcommand("(j|down)", "golinedown"),
-        vimcommand("(l|right)", "gotoright"),
-        vimcommand("(h|left)", "gotoleft"),
-        {
-            key:    "shift-g",
-            exec:   "gotoend"
-        },
-        vimcommand("b", "gotowordleft"),
-        vimcommand("e", "gotowordright"),
-        vimcommand("x", "del"),
-        vimcommand("shift-x", "backspace"),
-        vimcommand("shift-d", "removetolineend"),
-        vimcommand("u", "undo"), // [count] on this may/may not work, depending on browser implementation...
-        {
-            comment:    "Catch some keyboard input to stop it here",
-            match:      matchCharacterOnly
-        }
-    ],
-    insertMode: [
-        {
-            key:      "esc",
-            then:     "start"
-        }
-    ],
-    replaceMode: [
-        {
-            key:      "esc",
-            exec:     "overwrite",
-            then:     "start"
-        }
-    ],
-    deleteMode: [
-        {
-            key:      "d",
-            exec:     "removeline",
-            then:     "start"
-        }
-    ]
-};
-
-exports.Vim = new StateHandler(vimStates);
-
-});
diff --git a/apps/files_texteditor/js/aceeditor/keybinding-vim.js b/apps/files_texteditor/js/aceeditor/keybinding-vim.js
deleted file mode 100644
index 124607d8e6..0000000000
--- a/apps/files_texteditor/js/aceeditor/keybinding-vim.js
+++ /dev/null
@@ -1 +0,0 @@
-define("ace/keyboard/keybinding/vim",["require","exports","module","ace/keyboard/state_handler"],function(a,b,c){"use strict";var d=a("../state_handler").StateHandler,e=a("../state_handler").matchCharacterOnly,f=function(a,b,c){return{regex:["([0-9]*)",a],exec:b,params:[{name:"times",match:1,type:"number",defaultValue:1}],then:c}},g={start:[{key:"i",then:"insertMode"},{key:"d",then:"deleteMode"},{key:"a",exec:"gotoright",then:"insertMode"},{key:"shift-i",exec:"gotolinestart",then:"insertMode"},{key:"shift-a",exec:"gotolineend",then:"insertMode"},{key:"shift-c",exec:"removetolineend",then:"insertMode"},{key:"shift-r",exec:"overwrite",then:"replaceMode"},f("(k|up)","golineup"),f("(j|down)","golinedown"),f("(l|right)","gotoright"),f("(h|left)","gotoleft"),{key:"shift-g",exec:"gotoend"},f("b","gotowordleft"),f("e","gotowordright"),f("x","del"),f("shift-x","backspace"),f("shift-d","removetolineend"),f("u","undo"),{comment:"Catch some keyboard input to stop it here",match:e}],insertMode:[{key:"esc",then:"start"}],replaceMode:[{key:"esc",exec:"overwrite",then:"start"}],deleteMode:[{key:"d",exec:"removeline",then:"start"}]};b.Vim=new d(g)})
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/mode-c_cpp-uncompressed.js b/apps/files_texteditor/js/aceeditor/mode-c_cpp-uncompressed.js
deleted file mode 100644
index abd3190bfb..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-c_cpp-uncompressed.js
+++ /dev/null
@@ -1,920 +0,0 @@
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *      Gastón Kleiman <gaston.kleiman AT gmail DOT com>
- *
- * 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 ***** */
-
-define('ace/mode/c_cpp', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text', 'ace/tokenizer', 'ace/mode/c_cpp_highlight_rules', 'ace/mode/matching_brace_outdent', 'ace/range', 'ace/mode/behaviour/cstyle', 'ace/mode/folding/cstyle'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
-var c_cppHighlightRules = require("./c_cpp_highlight_rules").c_cppHighlightRules;
-var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
-var Range = require("../range").Range;
-var CstyleBehaviour = require("./behaviour/cstyle").CstyleBehaviour;
-var CStyleFoldMode = require("./folding/cstyle").FoldMode;
-
-var Mode = function() {
-    this.$tokenizer = new Tokenizer(new c_cppHighlightRules().getRules());
-    this.$outdent = new MatchingBraceOutdent();
-    this.$behaviour = new CstyleBehaviour();
-    this.foldingRules = new CStyleFoldMode();
-};
-oop.inherits(Mode, TextMode);
-
-(function() {
-
-    this.toggleCommentLines = function(state, doc, startRow, endRow) {
-        var outdent = true;
-        var re = /^(\s*)\/\//;
-
-        for (var i=startRow; i<= endRow; i++) {
-            if (!re.test(doc.getLine(i))) {
-                outdent = false;
-                break;
-            }
-        }
-
-        if (outdent) {
-            var deleteRange = new Range(0, 0, 0, 0);
-            for (var i=startRow; i<= endRow; i++)
-            {
-                var line = doc.getLine(i);
-                var m = line.match(re);
-                deleteRange.start.row = i;
-                deleteRange.end.row = i;
-                deleteRange.end.column = m[0].length;
-                doc.replace(deleteRange, m[1]);
-            }
-        }
-        else {
-            doc.indentRows(startRow, endRow, "//");
-        }
-    };
-
-    this.getNextLineIndent = function(state, line, tab) {
-        var indent = this.$getIndent(line);
-
-        var tokenizedLine = this.$tokenizer.getLineTokens(line, state);
-        var tokens = tokenizedLine.tokens;
-        var endState = tokenizedLine.state;
-
-        if (tokens.length && tokens[tokens.length-1].type == "comment") {
-            return indent;
-        }
-
-        if (state == "start") {
-            var match = line.match(/^.*[\{\(\[]\s*$/);
-            if (match) {
-                indent += tab;
-            }
-        } else if (state == "doc-start") {
-            if (endState == "start") {
-                return "";
-            }
-            var match = line.match(/^\s*(\/?)\*/);
-            if (match) {
-                if (match[1]) {
-                    indent += " ";
-                }
-                indent += "* ";
-            }
-        }
-
-        return indent;
-    };
-
-    this.checkOutdent = function(state, line, input) {
-        return this.$outdent.checkOutdent(line, input);
-    };
-
-    this.autoOutdent = function(state, doc, row) {
-        this.$outdent.autoOutdent(doc, row);
-    };
-
-}).call(Mode.prototype);
-
-exports.Mode = Mode;
-});
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *      Gastón Kleiman <gaston.kleiman AT gmail DOT com>
- *
- * Based on Bespin's C/C++ Syntax Plugin by Marc McIntyre.
- *
- * 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 ***** */
-
-define('ace/mode/c_cpp_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/lang', 'ace/mode/doc_comment_highlight_rules', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var lang = require("../lib/lang");
-var DocCommentHighlightRules = require("./doc_comment_highlight_rules").DocCommentHighlightRules;
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-
-var c_cppHighlightRules = function() {
-
-    var keywords = lang.arrayToMap(
-        ("and|double|not_eq|throw|and_eq|dynamic_cast|operator|true|" +
-        "asm|else|or|try|auto|enum|or_eq|typedef|bitand|explicit|private|" +
-        "typeid|bitor|extern|protected|typename|bool|false|public|union|" +
-        "break|float|register|unsigned|case|fro|reinterpret-cast|using|catch|" +
-        "friend|return|virtual|char|goto|short|void|class|if|signed|volatile|" +
-        "compl|inline|sizeof|wchar_t|const|int|static|while|const-cast|long|" +
-        "static_cast|xor|continue|mutable|struct|xor_eq|default|namespace|" +
-        "switch|delete|new|template|do|not|this|for").split("|")
-    );
-
-    var buildinConstants = lang.arrayToMap(
-        ("NULL").split("|")
-    );
-
-    // regexp must not have capturing parentheses. Use (?:) instead.
-    // regexps are ordered -> the first match is used
-
-    this.$rules = {
-        "start" : [
-            {
-                token : "comment",
-                regex : "\\/\\/.*$"
-            },
-            new DocCommentHighlightRules().getStartRule("doc-start"),
-            {
-                token : "comment", // multi line comment
-                merge : true,
-                regex : "\\/\\*",
-                next : "comment"
-            }, {
-                token : "string", // single line
-                regex : '["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'
-            }, {
-                token : "string", // multi line string start
-                merge : true,
-                regex : '["].*\\\\$',
-                next : "qqstring"
-            }, {
-                token : "string", // single line
-                regex : "['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"
-            }, {
-                token : "string", // multi line string start
-                merge : true,
-                regex : "['].*\\\\$",
-                next : "qstring"
-            }, {
-                token : "constant.numeric", // hex
-                regex : "0[xX][0-9a-fA-F]+\\b"
-            }, {
-                token : "constant.numeric", // float
-                regex : "[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"
-            }, {
-              token : "constant", // <CONSTANT>
-              regex : "<[a-zA-Z0-9.]+>"
-            }, {
-              token : "keyword", // pre-compiler directivs
-              regex : "(?:#include|#pragma|#line|#define|#undef|#ifdef|#else|#elif|#endif|#ifndef)"
-          }, {
-                token : function(value) {
-                    if (value == "this")
-                        return "variable.language";
-                    else if (keywords.hasOwnProperty(value))
-                        return "keyword";
-                    else if (buildinConstants.hasOwnProperty(value))
-                        return "constant.language";
-                    else
-                        return "identifier";
-                },
-                regex : "[a-zA-Z_$][a-zA-Z0-9_$]*\\b"
-            }, {
-                token : "keyword.operator",
-                regex : "!|\\$|%|&|\\*|\\-\\-|\\-|\\+\\+|\\+|~|==|=|!=|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\\|\\||\\?\\:|\\*=|%=|\\+=|\\-=|&=|\\^=|\\b(?:in|new|delete|typeof|void)"
-            }, {
-              token : "punctuation.operator",
-              regex : "\\?|\\:|\\,|\\;|\\."
-            }, {
-                token : "paren.lparen",
-                regex : "[[({]"
-            }, {
-                token : "paren.rparen",
-                regex : "[\\])}]"
-            }, {
-                token : "text",
-                regex : "\\s+"
-            }
-        ],
-        "comment" : [
-            {
-                token : "comment", // closing comment
-                regex : ".*?\\*\\/",
-                next : "start"
-            }, {
-                token : "comment", // comment spanning whole line
-                merge : true,
-                regex : ".+"
-            }
-        ],
-        "qqstring" : [
-            {
-                token : "string",
-                regex : '(?:(?:\\\\.)|(?:[^"\\\\]))*?"',
-                next : "start"
-            }, {
-                token : "string",
-                merge : true,
-                regex : '.+'
-            }
-        ],
-        "qstring" : [
-            {
-                token : "string",
-                regex : "(?:(?:\\\\.)|(?:[^'\\\\]))*?'",
-                next : "start"
-            }, {
-                token : "string",
-                merge : true,
-                regex : '.+'
-            }
-        ]
-    };
-    
-    this.embedRules(DocCommentHighlightRules, "doc-",
-        [ new DocCommentHighlightRules().getEndRule("start") ]);
-};
-
-oop.inherits(c_cppHighlightRules, TextHighlightRules);
-
-exports.c_cppHighlightRules = c_cppHighlightRules;
-});
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/doc_comment_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-
-var DocCommentHighlightRules = function() {
-
-    this.$rules = {
-        "start" : [ {
-            token : "comment.doc.tag",
-            regex : "@[\\w\\d_]+" // TODO: fix email addresses
-        }, {
-            token : "comment.doc",
-            merge : true,
-            regex : "\\s+"
-        }, {
-            token : "comment.doc",
-            merge : true,
-            regex : "TODO"
-        }, {
-            token : "comment.doc",
-            merge : true,
-            regex : "[^@\\*]+"
-        }, {
-            token : "comment.doc",
-            merge : true,
-            regex : "."
-        }]
-    };
-};
-
-oop.inherits(DocCommentHighlightRules, TextHighlightRules);
-
-(function() {
-
-    this.getStartRule = function(start) {
-        return {
-            token : "comment.doc", // doc comment
-            merge : true,
-            regex : "\\/\\*(?=\\*)",
-            next  : start
-        };
-    };
-    
-    this.getEndRule = function (start) {
-        return {
-            token : "comment.doc", // closing comment
-            merge : true,
-            regex : "\\*\\/",
-            next  : start
-        };
-    };
-
-}).call(DocCommentHighlightRules.prototype);
-
-exports.DocCommentHighlightRules = DocCommentHighlightRules;
-
-});
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/matching_brace_outdent', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
-"use strict";
-
-var Range = require("../range").Range;
-
-var MatchingBraceOutdent = function() {};
-
-(function() {
-
-    this.checkOutdent = function(line, input) {
-        if (! /^\s+$/.test(line))
-            return false;
-
-        return /^\s*\}/.test(input);
-    };
-
-    this.autoOutdent = function(doc, row) {
-        var line = doc.getLine(row);
-        var match = line.match(/^(\s*\})/);
-
-        if (!match) return 0;
-
-        var column = match[1].length;
-        var openBracePos = doc.findMatchingBracket({row: row, column: column});
-
-        if (!openBracePos || openBracePos.row == row) return 0;
-
-        var indent = this.$getIndent(doc.getLine(openBracePos.row));
-        doc.replace(new Range(row, 0, row, column-1), indent);
-    };
-
-    this.$getIndent = function(line) {
-        var match = line.match(/^(\s+)/);
-        if (match) {
-            return match[1];
-        }
-
-        return "";
-    };
-
-}).call(MatchingBraceOutdent.prototype);
-
-exports.MatchingBraceOutdent = MatchingBraceOutdent;
-});
-/* vim:ts=4:sts=4:sw=4:
- * ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Chris Spencer <chris.ag.spencer AT googlemail DOT com>
- *
- * 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 ***** */
-
-define('ace/mode/behaviour/cstyle', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/behaviour'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../../lib/oop");
-var Behaviour = require('../behaviour').Behaviour;
-
-var CstyleBehaviour = function () {
-
-    this.add("braces", "insertion", function (state, action, editor, session, text) {
-        if (text == '{') {
-            var selection = editor.getSelectionRange();
-            var selected = session.doc.getTextRange(selection);
-            if (selected !== "") {
-                return {
-                    text: '{' + selected + '}',
-                    selection: false
-                };
-            } else {
-                return {
-                    text: '{}',
-                    selection: [1, 1]
-                };
-            }
-        } else if (text == '}') {
-            var cursor = editor.getCursorPosition();
-            var line = session.doc.getLine(cursor.row);
-            var rightChar = line.substring(cursor.column, cursor.column + 1);
-            if (rightChar == '}') {
-                var matching = session.$findOpeningBracket('}', {column: cursor.column + 1, row: cursor.row});
-                if (matching !== null) {
-                    return {
-                        text: '',
-                        selection: [1, 1]
-                    };
-                }
-            }
-        } else if (text == "\n") {
-            var cursor = editor.getCursorPosition();
-            var line = session.doc.getLine(cursor.row);
-            var rightChar = line.substring(cursor.column, cursor.column + 1);
-            if (rightChar == '}') {
-                var openBracePos = session.findMatchingBracket({row: cursor.row, column: cursor.column + 1});
-                if (!openBracePos)
-                     return null;
-
-                var indent = this.getNextLineIndent(state, line.substring(0, line.length - 1), session.getTabString());
-                var next_indent = this.$getIndent(session.doc.getLine(openBracePos.row));
-
-                return {
-                    text: '\n' + indent + '\n' + next_indent,
-                    selection: [1, indent.length, 1, indent.length]
-                };
-            }
-        }
-    });
-
-    this.add("braces", "deletion", function (state, action, editor, session, range) {
-        var selected = session.doc.getTextRange(range);
-        if (!range.isMultiLine() && selected == '{') {
-            var line = session.doc.getLine(range.start.row);
-            var rightChar = line.substring(range.end.column, range.end.column + 1);
-            if (rightChar == '}') {
-                range.end.column++;
-                return range;
-            }
-        }
-    });
-
-    this.add("parens", "insertion", function (state, action, editor, session, text) {
-        if (text == '(') {
-            var selection = editor.getSelectionRange();
-            var selected = session.doc.getTextRange(selection);
-            if (selected !== "") {
-                return {
-                    text: '(' + selected + ')',
-                    selection: false
-                };
-            } else {
-                return {
-                    text: '()',
-                    selection: [1, 1]
-                };
-            }
-        } else if (text == ')') {
-            var cursor = editor.getCursorPosition();
-            var line = session.doc.getLine(cursor.row);
-            var rightChar = line.substring(cursor.column, cursor.column + 1);
-            if (rightChar == ')') {
-                var matching = session.$findOpeningBracket(')', {column: cursor.column + 1, row: cursor.row});
-                if (matching !== null) {
-                    return {
-                        text: '',
-                        selection: [1, 1]
-                    };
-                }
-            }
-        }
-    });
-
-    this.add("parens", "deletion", function (state, action, editor, session, range) {
-        var selected = session.doc.getTextRange(range);
-        if (!range.isMultiLine() && selected == '(') {
-            var line = session.doc.getLine(range.start.row);
-            var rightChar = line.substring(range.start.column + 1, range.start.column + 2);
-            if (rightChar == ')') {
-                range.end.column++;
-                return range;
-            }
-        }
-    });
-
-    this.add("string_dquotes", "insertion", function (state, action, editor, session, text) {
-        if (text == '"' || text == "'") {
-            var quote = text;
-            var selection = editor.getSelectionRange();
-            var selected = session.doc.getTextRange(selection);
-            if (selected !== "") {
-                return {
-                    text: quote + selected + quote,
-                    selection: false
-                };
-            } else {
-                var cursor = editor.getCursorPosition();
-                var line = session.doc.getLine(cursor.row);
-                var leftChar = line.substring(cursor.column-1, cursor.column);
-
-                // We're escaped.
-                if (leftChar == '\\') {
-                    return null;
-                }
-
-                // Find what token we're inside.
-                var tokens = session.getTokens(selection.start.row, selection.start.row)[0].tokens;
-                var col = 0, token;
-                var quotepos = -1; // Track whether we're inside an open quote.
-
-                for (var x = 0; x < tokens.length; x++) {
-                    token = tokens[x];
-                    if (token.type == "string") {
-                      quotepos = -1;
-                    } else if (quotepos < 0) {
-                      quotepos = token.value.indexOf(quote);
-                    }
-                    if ((token.value.length + col) > selection.start.column) {
-                        break;
-                    }
-                    col += tokens[x].value.length;
-                }
-
-                // Try and be smart about when we auto insert.
-                if (!token || (quotepos < 0 && token.type !== "comment" && (token.type !== "string" || ((selection.start.column !== token.value.length+col-1) && token.value.lastIndexOf(quote) === token.value.length-1)))) {
-                    return {
-                        text: quote + quote,
-                        selection: [1,1]
-                    };
-                } else if (token && token.type === "string") {
-                    // Ignore input and move right one if we're typing over the closing quote.
-                    var rightChar = line.substring(cursor.column, cursor.column + 1);
-                    if (rightChar == quote) {
-                        return {
-                            text: '',
-                            selection: [1, 1]
-                        };
-                    }
-                }
-            }
-        }
-    });
-
-    this.add("string_dquotes", "deletion", function (state, action, editor, session, range) {
-        var selected = session.doc.getTextRange(range);
-        if (!range.isMultiLine() && (selected == '"' || selected == "'")) {
-            var line = session.doc.getLine(range.start.row);
-            var rightChar = line.substring(range.start.column + 1, range.start.column + 2);
-            if (rightChar == '"') {
-                range.end.column++;
-                return range;
-            }
-        }
-    });
-
-};
-
-oop.inherits(CstyleBehaviour, Behaviour);
-
-exports.CstyleBehaviour = CstyleBehaviour;
-});/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/folding/cstyle', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/range', 'ace/mode/folding/fold_mode'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../../lib/oop");
-var Range = require("../../range").Range;
-var BaseFoldMode = require("./fold_mode").FoldMode;
-
-var FoldMode = exports.FoldMode = function() {};
-oop.inherits(FoldMode, BaseFoldMode);
-
-(function() {
-
-    this.foldingStartMarker = /(\{|\[)[^\}\]]*$|^\s*(\/\*)/;
-    this.foldingStopMarker = /^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/;
-    
-    this.getFoldWidgetRange = function(session, foldStyle, row) {
-        var line = session.getLine(row);
-        var match = line.match(this.foldingStartMarker);
-        if (match) {
-            var i = match.index;
-
-            if (match[1])
-                return this.openingBracketBlock(session, match[1], row, i);
-
-            var range = session.getCommentFoldRange(row, i + match[0].length);
-            range.end.column -= 2;
-            return range;
-        }
-
-        if (foldStyle !== "markbeginend")
-            return;
-            
-        var match = line.match(this.foldingStopMarker);
-        if (match) {
-            var i = match.index + match[0].length;
-
-            if (match[2]) {
-                var range = session.getCommentFoldRange(row, i);
-                range.end.column -= 2;
-                return range;
-            }
-
-            var end = {row: row, column: i};
-            var start = session.$findOpeningBracket(match[1], end);
-            
-            if (!start)
-                return;
-
-            start.column++;
-            end.column--;
-
-            return  Range.fromPoints(start, end);
-        }
-    };
-    
-}).call(FoldMode.prototype);
-
-});/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/folding/fold_mode', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
-"use strict";
-
-var Range = require("../../range").Range;
-
-var FoldMode = exports.FoldMode = function() {};
-
-(function() {
-
-    this.foldingStartMarker = null;
-    this.foldingStopMarker = null;
-
-    // must return "" if there's no fold, to enable caching
-    this.getFoldWidget = function(session, foldStyle, row) {
-        var line = session.getLine(row);
-        if (this.foldingStartMarker.test(line))
-            return "start";
-        if (foldStyle == "markbeginend"
-                && this.foldingStopMarker
-                && this.foldingStopMarker.test(line))
-            return "end";
-        return "";
-    };
-    
-    this.getFoldWidgetRange = function(session, foldStyle, row) {
-        return null;
-    };
-
-    this.indentationBlock = function(session, row, column) {
-        var re = /^\s*/;
-        var startRow = row;
-        var endRow = row;
-        var line = session.getLine(row);
-        var startColumn = column || line.length;
-        var startLevel = line.match(re)[0].length;
-        var maxRow = session.getLength()
-        
-        while (++row < maxRow) {
-            line = session.getLine(row);
-            var level = line.match(re)[0].length;
-
-            if (level == line.length)
-                continue;
-
-            if (level <= startLevel)
-                break;
-
-            endRow = row;
-        }
-
-        if (endRow > startRow) {
-            var endColumn = session.getLine(endRow).length;
-            return new Range(startRow, startColumn, endRow, endColumn);
-        }
-    };
-
-    this.openingBracketBlock = function(session, bracket, row, column) {
-        var start = {row: row, column: column + 1};
-        var end = session.$findClosingBracket(bracket, start);
-        if (!end)
-            return;
-
-        var fw = session.foldWidgets[end.row];
-        if (fw == null)
-            fw = this.getFoldWidget(session, end.row);
-
-        if (fw == "start") {
-            end.row --;
-            end.column = session.getLine(end.row).length;
-        }
-        return Range.fromPoints(start, end);
-    };
-
-}).call(FoldMode.prototype);
-
-});
diff --git a/apps/files_texteditor/js/aceeditor/mode-c_cpp.js b/apps/files_texteditor/js/aceeditor/mode-c_cpp.js
deleted file mode 100644
index 078afcaa78..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-c_cpp.js
+++ /dev/null
@@ -1 +0,0 @@
-define("ace/mode/c_cpp",["require","exports","module","ace/lib/oop","ace/mode/text","ace/tokenizer","ace/mode/c_cpp_highlight_rules","ace/mode/matching_brace_outdent","ace/range","ace/mode/behaviour/cstyle","ace/mode/folding/cstyle"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text").Mode,f=a("../tokenizer").Tokenizer,g=a("./c_cpp_highlight_rules").c_cppHighlightRules,h=a("./matching_brace_outdent").MatchingBraceOutdent,i=a("../range").Range,j=a("./behaviour/cstyle").CstyleBehaviour,k=a("./folding/cstyle").FoldMode,l=function(){this.$tokenizer=new f((new g).getRules()),this.$outdent=new h,this.$behaviour=new j,this.foldingRules=new k};d.inherits(l,e),function(){this.toggleCommentLines=function(a,b,c,d){var e=!0,f=/^(\s*)\/\//;for(var g=c;g<=d;g++)if(!f.test(b.getLine(g))){e=!1;break}if(e){var h=new i(0,0,0,0);for(var g=c;g<=d;g++){var j=b.getLine(g),k=j.match(f);h.start.row=g,h.end.row=g,h.end.column=k[0].length,b.replace(h,k[1])}}else b.indentRows(c,d,"//")},this.getNextLineIndent=function(a,b,c){var d=this.$getIndent(b),e=this.$tokenizer.getLineTokens(b,a),f=e.tokens,g=e.state;if(f.length&&f[f.length-1].type=="comment")return d;if(a=="start"){var h=b.match(/^.*[\{\(\[]\s*$/);h&&(d+=c)}else if(a=="doc-start"){if(g=="start")return"";var h=b.match(/^\s*(\/?)\*/);h&&(h[1]&&(d+=" "),d+="* ")}return d},this.checkOutdent=function(a,b,c){return this.$outdent.checkOutdent(b,c)},this.autoOutdent=function(a,b,c){this.$outdent.autoOutdent(b,c)}}.call(l.prototype),b.Mode=l}),define("ace/mode/c_cpp_highlight_rules",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/mode/doc_comment_highlight_rules","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("../lib/lang"),f=a("./doc_comment_highlight_rules").DocCommentHighlightRules,g=a("./text_highlight_rules").TextHighlightRules,h=function(){var a=e.arrayToMap("and|double|not_eq|throw|and_eq|dynamic_cast|operator|true|asm|else|or|try|auto|enum|or_eq|typedef|bitand|explicit|private|typeid|bitor|extern|protected|typename|bool|false|public|union|break|float|register|unsigned|case|fro|reinterpret-cast|using|catch|friend|return|virtual|char|goto|short|void|class|if|signed|volatile|compl|inline|sizeof|wchar_t|const|int|static|while|const-cast|long|static_cast|xor|continue|mutable|struct|xor_eq|default|namespace|switch|delete|new|template|do|not|this|for".split("|")),b=e.arrayToMap("NULL".split("|"));this.$rules={start:[{token:"comment",regex:"\\/\\/.*$"},(new f).getStartRule("doc-start"),{token:"comment",merge:!0,regex:"\\/\\*",next:"comment"},{token:"string",regex:'["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'},{token:"string",merge:!0,regex:'["].*\\\\$',next:"qqstring"},{token:"string",regex:"['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"},{token:"string",merge:!0,regex:"['].*\\\\$",next:"qstring"},{token:"constant.numeric",regex:"0[xX][0-9a-fA-F]+\\b"},{token:"constant.numeric",regex:"[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"},{token:"constant",regex:"<[a-zA-Z0-9.]+>"},{token:"keyword",regex:"(?:#include|#pragma|#line|#define|#undef|#ifdef|#else|#elif|#endif|#ifndef)"},{token:function(c){return c=="this"?"variable.language":a.hasOwnProperty(c)?"keyword":b.hasOwnProperty(c)?"constant.language":"identifier"},regex:"[a-zA-Z_$][a-zA-Z0-9_$]*\\b"},{token:"keyword.operator",regex:"!|\\$|%|&|\\*|\\-\\-|\\-|\\+\\+|\\+|~|==|=|!=|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\\|\\||\\?\\:|\\*=|%=|\\+=|\\-=|&=|\\^=|\\b(?:in|new|delete|typeof|void)"},{token:"punctuation.operator",regex:"\\?|\\:|\\,|\\;|\\."},{token:"paren.lparen",regex:"[[({]"},{token:"paren.rparen",regex:"[\\])}]"},{token:"text",regex:"\\s+"}],comment:[{token:"comment",regex:".*?\\*\\/",next:"start"},{token:"comment",merge:!0,regex:".+"}],qqstring:[{token:"string",regex:'(?:(?:\\\\.)|(?:[^"\\\\]))*?"',next:"start"},{token:"string",merge:!0,regex:".+"}],qstring:[{token:"string",regex:"(?:(?:\\\\.)|(?:[^'\\\\]))*?'",next:"start"},{token:"string",merge:!0,regex:".+"}]},this.embedRules(f,"doc-",[(new f).getEndRule("start")])};d.inherits(h,g),b.c_cppHighlightRules=h}),define("ace/mode/doc_comment_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text_highlight_rules").TextHighlightRules,f=function(){this.$rules={start:[{token:"comment.doc.tag",regex:"@[\\w\\d_]+"},{token:"comment.doc",merge:!0,regex:"\\s+"},{token:"comment.doc",merge:!0,regex:"TODO"},{token:"comment.doc",merge:!0,regex:"[^@\\*]+"},{token:"comment.doc",merge:!0,regex:"."}]}};d.inherits(f,e),function(){this.getStartRule=function(a){return{token:"comment.doc",merge:!0,regex:"\\/\\*(?=\\*)",next:a}},this.getEndRule=function(a){return{token:"comment.doc",merge:!0,regex:"\\*\\/",next:a}}}.call(f.prototype),b.DocCommentHighlightRules=f}),define("ace/mode/matching_brace_outdent",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../range").Range,e=function(){};(function(){this.checkOutdent=function(a,b){return/^\s+$/.test(a)?/^\s*\}/.test(b):!1},this.autoOutdent=function(a,b){var c=a.getLine(b),e=c.match(/^(\s*\})/);if(!e)return 0;var f=e[1].length,g=a.findMatchingBracket({row:b,column:f});if(!g||g.row==b)return 0;var h=this.$getIndent(a.getLine(g.row));a.replace(new d(b,0,b,f-1),h)},this.$getIndent=function(a){var b=a.match(/^(\s+)/);return b?b[1]:""}}).call(e.prototype),b.MatchingBraceOutdent=e}),define("ace/mode/behaviour/cstyle",["require","exports","module","ace/lib/oop","ace/mode/behaviour"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../behaviour").Behaviour,f=function(){this.add("braces","insertion",function(a,b,c,d,e){if(e=="{"){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"{"+g+"}",selection:!1}:{text:"{}",selection:[1,1]}}if(e=="}"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var k=d.$findOpeningBracket("}",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}else if(e=="\n"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var l=d.findMatchingBracket({row:h.row,column:h.column+1});if(!l)return null;var m=this.getNextLineIndent(a,i.substring(0,i.length-1),d.getTabString()),n=this.$getIndent(d.doc.getLine(l.row));return{text:"\n"+m+"\n"+n,selection:[1,m.length,1,m.length]}}}}),this.add("braces","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="{"){var g=d.doc.getLine(e.start.row),h=g.substring(e.end.column,e.end.column+1);if(h=="}")return e.end.column++,e}}),this.add("parens","insertion",function(a,b,c,d,e){if(e=="("){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"("+g+")",selection:!1}:{text:"()",selection:[1,1]}}if(e==")"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j==")"){var k=d.$findOpeningBracket(")",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}}),this.add("parens","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="("){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h==")")return e.end.column++,e}}),this.add("string_dquotes","insertion",function(a,b,c,d,e){if(e=='"'||e=="'"){var f=e,g=c.getSelectionRange(),h=d.doc.getTextRange(g);if(h!=="")return{text:f+h+f,selection:!1};var i=c.getCursorPosition(),j=d.doc.getLine(i.row),k=j.substring(i.column-1,i.column);if(k=="\\")return null;var l=d.getTokens(g.start.row,g.start.row)[0].tokens,m=0,n,o=-1;for(var p=0;p<l.length;p++){n=l[p],n.type=="string"?o=-1:o<0&&(o=n.value.indexOf(f));if(n.value.length+m>g.start.column)break;m+=l[p].value.length}if(!n||o<0&&n.type!=="comment"&&(n.type!=="string"||g.start.column!==n.value.length+m-1&&n.value.lastIndexOf(f)===n.value.length-1))return{text:f+f,selection:[1,1]};if(n&&n.type==="string"){var q=j.substring(i.column,i.column+1);if(q==f)return{text:"",selection:[1,1]}}}}),this.add("string_dquotes","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&(f=='"'||f=="'")){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h=='"')return e.end.column++,e}})};d.inherits(f,e),b.CstyleBehaviour=f}),define("ace/mode/folding/cstyle",["require","exports","module","ace/lib/oop","ace/range","ace/mode/folding/fold_mode"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../../range").Range,f=a("./fold_mode").FoldMode,g=b.FoldMode=function(){};d.inherits(g,f),function(){this.foldingStartMarker=/(\{|\[)[^\}\]]*$|^\s*(\/\*)/,this.foldingStopMarker=/^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/,this.getFoldWidgetRange=function(a,b,c){var d=a.getLine(c),f=d.match(this.foldingStartMarker);if(f){var g=f.index;if(f[1])return this.openingBracketBlock(a,f[1],c,g);var h=a.getCommentFoldRange(c,g+f[0].length);return h.end.column-=2,h}if(b!=="markbeginend")return;var f=d.match(this.foldingStopMarker);if(f){var g=f.index+f[0].length;if(f[2]){var h=a.getCommentFoldRange(c,g);return h.end.column-=2,h}var i={row:c,column:g},j=a.$findOpeningBracket(f[1],i);if(!j)return;return j.column++,i.column--,e.fromPoints(j,i)}}}.call(g.prototype)}),define("ace/mode/folding/fold_mode",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../../range").Range,e=b.FoldMode=function(){};(function(){this.foldingStartMarker=null,this.foldingStopMarker=null,this.getFoldWidget=function(a,b,c){var d=a.getLine(c);return this.foldingStartMarker.test(d)?"start":b=="markbeginend"&&this.foldingStopMarker&&this.foldingStopMarker.test(d)?"end":""},this.getFoldWidgetRange=function(a,b,c){return null},this.indentationBlock=function(a,b,c){var e=/^\s*/,f=b,g=b,h=a.getLine(b),i=c||h.length,j=h.match(e)[0].length,k=a.getLength();while(++b<k){h=a.getLine(b);var l=h.match(e)[0].length;if(l==h.length)continue;if(l<=j)break;g=b}if(g>f){var m=a.getLine(g).length;return new d(f,i,g,m)}},this.openingBracketBlock=function(a,b,c,e){var f={row:c,column:e+1},g=a.$findClosingBracket(b,f);if(!g)return;var h=a.foldWidgets[g.row];return h==null&&(h=this.getFoldWidget(a,g.row)),h=="start"&&(g.row--,g.column=a.getLine(g.row).length),d.fromPoints(f,g)}}).call(e.prototype)})
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/mode-clojure-uncompressed.js b/apps/files_texteditor/js/aceeditor/mode-clojure-uncompressed.js
deleted file mode 100644
index cb0081316f..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-clojure-uncompressed.js
+++ /dev/null
@@ -1,422 +0,0 @@
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *      Shlomo Zalman Heigh <shlomozalmanheigh AT gmail DOT com>
- *      Carin Meier
- *
- * 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 ***** */
-
-define('ace/mode/clojure', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text', 'ace/tokenizer', 'ace/mode/clojure_highlight_rules', 'ace/mode/matching_parens_outdent', 'ace/range'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
-var ClojureHighlightRules = require("./clojure_highlight_rules").ClojureHighlightRules;
-var MatchingParensOutdent = require("./matching_parens_outdent").MatchingParensOutdent;
-var Range = require("../range").Range;
-
-var Mode = function() {
-    this.$tokenizer = new Tokenizer(new ClojureHighlightRules().getRules());
-    this.$outdent = new MatchingParensOutdent();
-};
-oop.inherits(Mode, TextMode);
-
-(function() {
-
-    this.toggleCommentLines = function(state, doc, startRow, endRow) {
-        var outdent = true;
-        var re = /^(\s*)#/;
-
-        for (var i=startRow; i<= endRow; i++) {
-            if (!re.test(doc.getLine(i))) {
-                outdent = false;
-                break;
-            }
-        }
-
-        if (outdent) {
-            var deleteRange = new Range(0, 0, 0, 0);
-            for (var i=startRow; i<= endRow; i++)
-            {
-                var line = doc.getLine(i);
-                var m = line.match(re);
-                deleteRange.start.row = i;
-                deleteRange.end.row = i;
-                deleteRange.end.column = m[0].length;
-                doc.replace(deleteRange, m[1]);
-            }
-        }
-        else {
-            doc.indentRows(startRow, endRow, ";");
-        }
-    };
-
-    this.getNextLineIndent = function(state, line, tab) {
-        var indent = this.$getIndent(line);
-
-        var tokenizedLine = this.$tokenizer.getLineTokens(line, state);
-        var tokens = tokenizedLine.tokens;
-
-        if (tokens.length && tokens[tokens.length-1].type == "comment") {
-            return indent;
-        }
-        
-        if (state == "start") {
-            var match = line.match(/[\(\[]/);
-            if (match) {
-                indent += "  ";
-            }
-            match = line.match(/[\)]/);
-            if (match) {
-              indent = "";
-            }
-        }
-
-        return indent;
-    };
-
-    this.checkOutdent = function(state, line, input) {
-        return this.$outdent.checkOutdent(line, input);
-    };
-
-    this.autoOutdent = function(state, doc, row) {
-        this.$outdent.autoOutdent(doc, row);
-    };
-
-}).call(Mode.prototype);
-
-exports.Mode = Mode;
-});
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *      Shlomo Zalman Heigh <shlomozalmanheigh AT gmail DOT com>
- *      Carin Meier
- *
- * 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 ***** */
-
-define('ace/mode/clojure_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/lang', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var lang = require("../lib/lang");
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-
-
-
-var ClojureHighlightRules = function() {
-
-       var builtinFunctions = lang.arrayToMap(
-        ('* *1 *2 *3 *agent* *allow-unresolved-vars* *assert* *clojure-version* ' +
-            '*command-line-args* *compile-files* *compile-path* *e *err* *file* ' +
-            '*flush-on-newline* *in* *macro-meta* *math-context* *ns* *out* ' +
-            '*print-dup* *print-length* *print-level* *print-meta* *print-readably* ' +
-            '*read-eval* *source-path* *use-context-classloader* ' +
-            '*warn-on-reflection* + - -> -&gt; ->> -&gt;&gt; .. / < &lt; <= &lt;= = ' +
-            '== > &gt; >= &gt;= accessor aclone ' +
-            'add-classpath add-watch agent agent-errors aget alength alias all-ns ' +
-            'alter alter-meta! alter-var-root amap ancestors and apply areduce ' +
-            'array-map aset aset-boolean aset-byte aset-char aset-double aset-float ' +
-            'aset-int aset-long aset-short assert assoc assoc! assoc-in associative? ' +
-            'atom await await-for await1 bases bean bigdec bigint binding bit-and ' +
-            'bit-and-not bit-clear bit-flip bit-not bit-or bit-set bit-shift-left ' +
-            'bit-shift-right bit-test bit-xor boolean boolean-array booleans ' +
-            'bound-fn bound-fn* butlast byte byte-array bytes cast char char-array ' +
-            'char-escape-string char-name-string char? chars chunk chunk-append ' +
-            'chunk-buffer chunk-cons chunk-first chunk-next chunk-rest chunked-seq? ' +
-            'class class? clear-agent-errors clojure-version coll? comment commute ' +
-            'comp comparator compare compare-and-set! compile complement concat cond ' +
-            'condp conj conj! cons constantly construct-proxy contains? count ' +
-            'counted? create-ns create-struct cycle dec decimal? declare definline ' +
-            'defmacro defmethod defmulti defn defn- defonce defstruct delay delay? ' +
-            'deliver deref derive descendants destructure disj disj! dissoc dissoc! ' +
-            'distinct distinct? doall doc dorun doseq dosync dotimes doto double ' +
-            'double-array doubles drop drop-last drop-while empty empty? ensure ' +
-            'enumeration-seq eval even? every? false? ffirst file-seq filter find ' +
-            'find-doc find-ns find-var first float float-array float? floats flush ' +
-            'fn fn? fnext for force format future future-call future-cancel ' +
-            'future-cancelled? future-done? future? gen-class gen-interface gensym ' +
-            'get get-in get-method get-proxy-class get-thread-bindings get-validator ' +
-            'hash hash-map hash-set identical? identity if-let if-not ifn? import ' +
-            'in-ns inc init-proxy instance? int int-array integer? interleave intern ' +
-            'interpose into into-array ints io! isa? iterate iterator-seq juxt key ' +
-            'keys keyword keyword? last lazy-cat lazy-seq let letfn line-seq list ' +
-            'list* list? load load-file load-reader load-string loaded-libs locking ' +
-            'long long-array longs loop macroexpand macroexpand-1 make-array ' +
-            'make-hierarchy map map? mapcat max max-key memfn memoize merge ' +
-            'merge-with meta method-sig methods min min-key mod name namespace neg? ' +
-            'newline next nfirst nil? nnext not not-any? not-empty not-every? not= ' +
-            'ns ns-aliases ns-imports ns-interns ns-map ns-name ns-publics ' +
-            'ns-refers ns-resolve ns-unalias ns-unmap nth nthnext num number? odd? ' +
-            'or parents partial partition pcalls peek persistent! pmap pop pop! ' +
-            'pop-thread-bindings pos? pr pr-str prefer-method prefers ' +
-            'primitives-classnames print print-ctor print-doc print-dup print-method ' +
-            'print-namespace-doc print-simple print-special-doc print-str printf ' +
-            'println println-str prn prn-str promise proxy proxy-call-with-super ' +
-            'proxy-mappings proxy-name proxy-super push-thread-bindings pvalues quot ' +
-            'rand rand-int range ratio? rational? rationalize re-find re-groups ' +
-            're-matcher re-matches re-pattern re-seq read read-line read-string ' +
-            'reduce ref ref-history-count ref-max-history ref-min-history ref-set ' +
-            'refer refer-clojure release-pending-sends rem remove remove-method ' +
-            'remove-ns remove-watch repeat repeatedly replace replicate require ' +
-            'reset! reset-meta! resolve rest resultset-seq reverse reversible? rseq ' +
-            'rsubseq second select-keys send send-off seq seq? seque sequence ' +
-            'sequential? set set-validator! set? short short-array shorts ' +
-            'shutdown-agents slurp some sort sort-by sorted-map sorted-map-by ' +
-            'sorted-set sorted-set-by sorted? special-form-anchor special-symbol? ' +
-            'split-at split-with str stream? string? struct struct-map subs subseq ' +
-            'subvec supers swap! symbol symbol? sync syntax-symbol-anchor take ' +
-            'take-last take-nth take-while test the-ns time to-array to-array-2d ' +
-            'trampoline transient tree-seq true? type unchecked-add unchecked-dec ' +
-            'unchecked-divide unchecked-inc unchecked-multiply unchecked-negate ' +
-            'unchecked-remainder unchecked-subtract underive unquote ' +
-            'unquote-splicing update-in update-proxy use val vals var-get var-set ' +
-            'var? vary-meta vec vector vector? when when-first when-let when-not ' +
-            'while with-bindings with-bindings* with-in-str with-loading-context ' +
-            'with-local-vars with-meta with-open with-out-str with-precision xml-seq ' +
-            'zero? zipmap ').split(" ")
-    );
-
-    var keywords = lang.arrayToMap(
-        ('def do fn if let loop monitor-enter monitor-exit new quote recur set! ' +
-            'throw try var').split(" ")
-    );
-
-    var buildinConstants = lang.arrayToMap(
-        ("true false nil").split(" ")
-    );
-
-
-    // regexp must not have capturing parentheses. Use (?:) instead.
-    // regexps are ordered -> the first match is used
-
-    this.$rules = {
-        "start" : [
-            {
-                token : "comment",
-                regex : ";.*$"
-            }, {
-                token : "comment", // multi line comment
-                regex : "^=begin$",
-                next : "comment"
-            }, {
-                token : "keyword", //parens
-                regex : "[\\(|\\)]"
-            }, {
-                token : "keyword", //lists
-                regex : "[\\'\\(]"
-            }, {
-                token : "keyword", //vectors
-                regex : "[\\[|\\]]"
-            }, {
-                token : "keyword", //sets and maps
-                regex : "[\\{|\\}|\\#\\{|\\#\\}]"
-            }, {
-                    token : "keyword", // ampersands
-                    regex : '[\\&]'
-            }, {
-                    token : "keyword", // metadata
-                    regex : '[\\#\\^\\{]'
-            }, {
-                    token : "keyword", // anonymous fn syntactic sugar
-                    regex : '[\\%]'
-            }, {
-                    token : "keyword", // deref reader macro
-                    regex : '[@]'
-            }, {
-                token : "constant.numeric", // hex
-                regex : "0[xX][0-9a-fA-F]+\\b"
-            }, {
-                token : "constant.numeric", // float
-                regex : "[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"
-            }, {
-                token : "constant.language",
-                regex : '[!|\\$|%|&|\\*|\\-\\-|\\-|\\+\\+|\\+||=|!=|<=|>=|<>|<|>|!|&&]'
-            }, {
-                token : function(value) {
-                    if (keywords.hasOwnProperty(value))
-                        return "keyword";
-                    else if (buildinConstants.hasOwnProperty(value))
-                        return "constant.language";
-                        else if (builtinFunctions.hasOwnProperty(value))
-                        return "support.function";
-                    else
-                        return "identifier";
-                },
-                // TODO: Unicode escape sequences
-                // TODO: Unicode identifiers
-                regex : "[a-zA-Z_$][a-zA-Z0-9_$]*\\b"
-            }, {
-                token : "string", // single line
-                regex : '["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'
-            }, {
-                token : "string", // symbol
-                regex : "[:](?:[a-zA-Z]|\\d)+"
-            }, {
-                token : "string.regexp", //Regular Expressions
-                regex : '/#"(?:\\.|(?:\\\")|[^\""\n])*"/g'
-            }
-
-        ],
-        "comment" : [
-            {
-                token : "comment", // closing comment
-                regex : "^=end$",
-                next : "start"
-            }, {
-                token : "comment", // comment spanning whole line
-                merge : true,
-                regex : ".+"
-            }
-        ]
-    };
-};
-
-oop.inherits(ClojureHighlightRules, TextHighlightRules);
-
-exports.ClojureHighlightRules = ClojureHighlightRules;
-});
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/matching_parens_outdent', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
-"use strict";
-
-var Range = require("../range").Range;
-
-var MatchingParensOutdent = function() {};
-
-(function() {
-
-    this.checkOutdent = function(line, input) {
-        if (! /^\s+$/.test(line))
-            return false;
-
-        return /^\s*\)/.test(input);
-    };
-
-    this.autoOutdent = function(doc, row) {
-        var line = doc.getLine(row);
-        var match = line.match(/^(\s*\))/);
-
-        if (!match) return 0;
-
-        var column = match[1].length;
-        var openBracePos = doc.findMatchingBracket({row: row, column: column});
-
-        if (!openBracePos || openBracePos.row == row) return 0;
-
-        var indent = this.$getIndent(doc.getLine(openBracePos.row));
-        doc.replace(new Range(row, 0, row, column-1), indent);
-    };
-
-    this.$getIndent = function(line) {
-        var match = line.match(/^(\s+)/);
-        if (match) {
-            return match[1];
-        }
-
-        return "";
-    };
-
-}).call(MatchingParensOutdent.prototype);
-
-exports.MatchingParensOutdent = MatchingParensOutdent;
-});
diff --git a/apps/files_texteditor/js/aceeditor/mode-clojure.js b/apps/files_texteditor/js/aceeditor/mode-clojure.js
deleted file mode 100644
index 3afd7673f8..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-clojure.js
+++ /dev/null
@@ -1 +0,0 @@
-define("ace/mode/clojure",["require","exports","module","ace/lib/oop","ace/mode/text","ace/tokenizer","ace/mode/clojure_highlight_rules","ace/mode/matching_parens_outdent","ace/range"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text").Mode,f=a("../tokenizer").Tokenizer,g=a("./clojure_highlight_rules").ClojureHighlightRules,h=a("./matching_parens_outdent").MatchingParensOutdent,i=a("../range").Range,j=function(){this.$tokenizer=new f((new g).getRules()),this.$outdent=new h};d.inherits(j,e),function(){this.toggleCommentLines=function(a,b,c,d){var e=!0,f=/^(\s*)#/;for(var g=c;g<=d;g++)if(!f.test(b.getLine(g))){e=!1;break}if(e){var h=new i(0,0,0,0);for(var g=c;g<=d;g++){var j=b.getLine(g),k=j.match(f);h.start.row=g,h.end.row=g,h.end.column=k[0].length,b.replace(h,k[1])}}else b.indentRows(c,d,";")},this.getNextLineIndent=function(a,b,c){var d=this.$getIndent(b),e=this.$tokenizer.getLineTokens(b,a),f=e.tokens;if(f.length&&f[f.length-1].type=="comment")return d;if(a=="start"){var g=b.match(/[\(\[]/);g&&(d+="  "),g=b.match(/[\)]/),g&&(d="")}return d},this.checkOutdent=function(a,b,c){return this.$outdent.checkOutdent(b,c)},this.autoOutdent=function(a,b,c){this.$outdent.autoOutdent(b,c)}}.call(j.prototype),b.Mode=j}),define("ace/mode/clojure_highlight_rules",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("../lib/lang"),f=a("./text_highlight_rules").TextHighlightRules,g=function(){var a=e.arrayToMap("* *1 *2 *3 *agent* *allow-unresolved-vars* *assert* *clojure-version* *command-line-args* *compile-files* *compile-path* *e *err* *file* *flush-on-newline* *in* *macro-meta* *math-context* *ns* *out* *print-dup* *print-length* *print-level* *print-meta* *print-readably* *read-eval* *source-path* *use-context-classloader* *warn-on-reflection* + - -> -&gt; ->> -&gt;&gt; .. / < &lt; <= &lt;= = == > &gt; >= &gt;= accessor aclone add-classpath add-watch agent agent-errors aget alength alias all-ns alter alter-meta! alter-var-root amap ancestors and apply areduce array-map aset aset-boolean aset-byte aset-char aset-double aset-float aset-int aset-long aset-short assert assoc assoc! assoc-in associative? atom await await-for await1 bases bean bigdec bigint binding bit-and bit-and-not bit-clear bit-flip bit-not bit-or bit-set bit-shift-left bit-shift-right bit-test bit-xor boolean boolean-array booleans bound-fn bound-fn* butlast byte byte-array bytes cast char char-array char-escape-string char-name-string char? chars chunk chunk-append chunk-buffer chunk-cons chunk-first chunk-next chunk-rest chunked-seq? class class? clear-agent-errors clojure-version coll? comment commute comp comparator compare compare-and-set! compile complement concat cond condp conj conj! cons constantly construct-proxy contains? count counted? create-ns create-struct cycle dec decimal? declare definline defmacro defmethod defmulti defn defn- defonce defstruct delay delay? deliver deref derive descendants destructure disj disj! dissoc dissoc! distinct distinct? doall doc dorun doseq dosync dotimes doto double double-array doubles drop drop-last drop-while empty empty? ensure enumeration-seq eval even? every? false? ffirst file-seq filter find find-doc find-ns find-var first float float-array float? floats flush fn fn? fnext for force format future future-call future-cancel future-cancelled? future-done? future? gen-class gen-interface gensym get get-in get-method get-proxy-class get-thread-bindings get-validator hash hash-map hash-set identical? identity if-let if-not ifn? import in-ns inc init-proxy instance? int int-array integer? interleave intern interpose into into-array ints io! isa? iterate iterator-seq juxt key keys keyword keyword? last lazy-cat lazy-seq let letfn line-seq list list* list? load load-file load-reader load-string loaded-libs locking long long-array longs loop macroexpand macroexpand-1 make-array make-hierarchy map map? mapcat max max-key memfn memoize merge merge-with meta method-sig methods min min-key mod name namespace neg? newline next nfirst nil? nnext not not-any? not-empty not-every? not= ns ns-aliases ns-imports ns-interns ns-map ns-name ns-publics ns-refers ns-resolve ns-unalias ns-unmap nth nthnext num number? odd? or parents partial partition pcalls peek persistent! pmap pop pop! pop-thread-bindings pos? pr pr-str prefer-method prefers primitives-classnames print print-ctor print-doc print-dup print-method print-namespace-doc print-simple print-special-doc print-str printf println println-str prn prn-str promise proxy proxy-call-with-super proxy-mappings proxy-name proxy-super push-thread-bindings pvalues quot rand rand-int range ratio? rational? rationalize re-find re-groups re-matcher re-matches re-pattern re-seq read read-line read-string reduce ref ref-history-count ref-max-history ref-min-history ref-set refer refer-clojure release-pending-sends rem remove remove-method remove-ns remove-watch repeat repeatedly replace replicate require reset! reset-meta! resolve rest resultset-seq reverse reversible? rseq rsubseq second select-keys send send-off seq seq? seque sequence sequential? set set-validator! set? short short-array shorts shutdown-agents slurp some sort sort-by sorted-map sorted-map-by sorted-set sorted-set-by sorted? special-form-anchor special-symbol? split-at split-with str stream? string? struct struct-map subs subseq subvec supers swap! symbol symbol? sync syntax-symbol-anchor take take-last take-nth take-while test the-ns time to-array to-array-2d trampoline transient tree-seq true? type unchecked-add unchecked-dec unchecked-divide unchecked-inc unchecked-multiply unchecked-negate unchecked-remainder unchecked-subtract underive unquote unquote-splicing update-in update-proxy use val vals var-get var-set var? vary-meta vec vector vector? when when-first when-let when-not while with-bindings with-bindings* with-in-str with-loading-context with-local-vars with-meta with-open with-out-str with-precision xml-seq zero? zipmap ".split(" ")),b=e.arrayToMap("def do fn if let loop monitor-enter monitor-exit new quote recur set! throw try var".split(" ")),c=e.arrayToMap("true false nil".split(" "));this.$rules={start:[{token:"comment",regex:";.*$"},{token:"comment",regex:"^=begin$",next:"comment"},{token:"keyword",regex:"[\\(|\\)]"},{token:"keyword",regex:"[\\'\\(]"},{token:"keyword",regex:"[\\[|\\]]"},{token:"keyword",regex:"[\\{|\\}|\\#\\{|\\#\\}]"},{token:"keyword",regex:"[\\&]"},{token:"keyword",regex:"[\\#\\^\\{]"},{token:"keyword",regex:"[\\%]"},{token:"keyword",regex:"[@]"},{token:"constant.numeric",regex:"0[xX][0-9a-fA-F]+\\b"},{token:"constant.numeric",regex:"[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"},{token:"constant.language",regex:"[!|\\$|%|&|\\*|\\-\\-|\\-|\\+\\+|\\+||=|!=|<=|>=|<>|<|>|!|&&]"},{token:function(d){return b.hasOwnProperty(d)?"keyword":c.hasOwnProperty(d)?"constant.language":a.hasOwnProperty(d)?"support.function":"identifier"},regex:"[a-zA-Z_$][a-zA-Z0-9_$]*\\b"},{token:"string",regex:'["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'},{token:"string",regex:"[:](?:[a-zA-Z]|\\d)+"},{token:"string.regexp",regex:'/#"(?:\\.|(?:\\")|[^""\n])*"/g'}],comment:[{token:"comment",regex:"^=end$",next:"start"},{token:"comment",merge:!0,regex:".+"}]}};d.inherits(g,f),b.ClojureHighlightRules=g}),define("ace/mode/matching_parens_outdent",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../range").Range,e=function(){};(function(){this.checkOutdent=function(a,b){return/^\s+$/.test(a)?/^\s*\)/.test(b):!1},this.autoOutdent=function(a,b){var c=a.getLine(b),e=c.match(/^(\s*\))/);if(!e)return 0;var f=e[1].length,g=a.findMatchingBracket({row:b,column:f});if(!g||g.row==b)return 0;var h=this.$getIndent(a.getLine(g.row));a.replace(new d(b,0,b,f-1),h)},this.$getIndent=function(a){var b=a.match(/^(\s+)/);return b?b[1]:""}}).call(e.prototype),b.MatchingParensOutdent=e})
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/mode-coffee-uncompressed.js b/apps/files_texteditor/js/aceeditor/mode-coffee-uncompressed.js
deleted file mode 100644
index de6cbf4137..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-coffee-uncompressed.js
+++ /dev/null
@@ -1,605 +0,0 @@
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Satoshi Murakami <murky.satyr AT gmail DOT com>
- *
- * 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 ***** */
-
-define('ace/mode/coffee', ['require', 'exports', 'module' , 'ace/tokenizer', 'ace/mode/coffee_highlight_rules', 'ace/mode/matching_brace_outdent', 'ace/mode/folding/pythonic', 'ace/range', 'ace/mode/text', 'ace/worker/worker_client', 'ace/lib/oop'], function(require, exports, module) {
-"use strict";
-
-var Tokenizer = require("../tokenizer").Tokenizer;
-var Rules = require("./coffee_highlight_rules").CoffeeHighlightRules;
-var Outdent = require("./matching_brace_outdent").MatchingBraceOutdent;
-var PythonFoldMode = require("./folding/pythonic").FoldMode;
-var Range = require("../range").Range;
-var TextMode = require("./text").Mode;
-var WorkerClient = require("../worker/worker_client").WorkerClient;
-var oop = require("../lib/oop");
-
-function Mode() {
-    this.$tokenizer = new Tokenizer(new Rules().getRules());
-    this.$outdent   = new Outdent();
-    this.foldingRules = new PythonFoldMode("=|=>|->|\\s*class [^#]*");
-}
-
-oop.inherits(Mode, TextMode);
-
-(function() {
-    
-    var indenter = /(?:[({[=:]|[-=]>|\b(?:else|switch|try|catch(?:\s*[$A-Za-z_\x7f-\uffff][$\w\x7f-\uffff]*)?|finally))\s*$/;
-    var commentLine = /^(\s*)#/;
-    var hereComment = /^\s*###(?!#)/;
-    var indentation = /^\s*/;
-    
-    this.getNextLineIndent = function(state, line, tab) {
-        var indent = this.$getIndent(line);
-        var tokens = this.$tokenizer.getLineTokens(line, state).tokens;
-    
-        if (!(tokens.length && tokens[tokens.length - 1].type === 'comment') &&
-            state === 'start' && indenter.test(line))
-            indent += tab;
-        return indent;
-    };
-    
-    this.toggleCommentLines = function(state, doc, startRow, endRow){
-        console.log("toggle");
-        var range = new Range(0, 0, 0, 0);
-        for (var i = startRow; i <= endRow; ++i) {
-            var line = doc.getLine(i);
-            if (hereComment.test(line))
-                continue;
-                
-            if (commentLine.test(line))
-                line = line.replace(commentLine, '$1');
-            else
-                line = line.replace(indentation, '$&#');
-    
-            range.end.row = range.start.row = i;
-            range.end.column = line.length + 1;
-            doc.replace(range, line);
-        }
-    };
-    
-    this.checkOutdent = function(state, line, input) {
-        return this.$outdent.checkOutdent(line, input);
-    };
-    
-    this.autoOutdent = function(state, doc, row) {
-        this.$outdent.autoOutdent(doc, row);
-    };
-    
-    this.createWorker = function(session) {
-        var worker = new WorkerClient(["ace"], "worker-coffee.js", "ace/mode/coffee_worker", "Worker");
-        worker.attachToDocument(session.getDocument());
-        
-        worker.on("error", function(e) {
-            session.setAnnotations([e.data]);
-        });
-        
-        worker.on("ok", function(e) {
-            session.clearAnnotations();
-        });
-        
-        return worker;
-    };
-
-}).call(Mode.prototype);
-
-exports.Mode = Mode;
-
-});/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Satoshi Murakami <murky.satyr AT gmail DOT com>
- *
- * 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 ***** */
-
-define('ace/mode/coffee_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/lang', 'ace/lib/oop', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-    var lang = require("../lib/lang");
-    var oop = require("../lib/oop");
-    var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-    
-    oop.inherits(CoffeeHighlightRules, TextHighlightRules);
-
-    function CoffeeHighlightRules() {
-        var identifier = "[$A-Za-z_\\x7f-\\uffff][$\\w\\x7f-\\uffff]*";
-        var stringfill = {
-            token : "string",
-            merge : true,
-            regex : ".+"
-        };
-
-        var keywords = lang.arrayToMap((
-            "this|throw|then|try|typeof|super|switch|return|break|by)|continue|" +
-            "catch|class|in|instanceof|is|isnt|if|else|extends|for|forown|" +
-            "finally|function|while|when|new|no|not|delete|debugger|do|loop|of|off|" +
-            "or|on|unless|until|and|yes").split("|")
-        );
-        
-        var langConstant = lang.arrayToMap((
-            "true|false|null|undefined").split("|")
-        );
-        
-        var illegal = lang.arrayToMap((
-            "case|const|default|function|var|void|with|enum|export|implements|" +
-            "interface|let|package|private|protected|public|static|yield|" +
-            "__hasProp|extends|slice|bind|indexOf").split("|")
-        );
-        
-        var supportClass = lang.arrayToMap((
-            "Array|Boolean|Date|Function|Number|Object|RegExp|ReferenceError|" +
-            "RangeError|String|SyntaxError|Error|EvalError|TypeError|URIError").split("|")
-        );
-        
-        var supportFunction = lang.arrayToMap((
-            "Math|JSON|isNaN|isFinite|parseInt|parseFloat|encodeURI|" +
-            "encodeURIComponent|decodeURI|decodeURIComponent|RangeError|String|" +
-            "SyntaxError|Error|EvalError|TypeError|URIError").split("|")
-        );
-
-        this.$rules = {
-            start : [
-                {
-                    token : "identifier",
-                    regex : "(?:(?:\\.|::)\\s*)" + identifier
-                }, {
-                    token : "variable",
-                    regex : "@(?:" + identifier + ")?"
-                }, {
-                    token: function(value) {
-                        if (keywords.hasOwnProperty(value))
-                            return "keyword";
-                        else if (langConstant.hasOwnProperty(value))
-                            return "constant.language";
-                        else if (illegal.hasOwnProperty(value))
-                            return "invalid.illegal";
-                        else if (supportClass.hasOwnProperty(value))
-                            return "language.support.class";
-                        else if (supportFunction.hasOwnProperty(value))
-                            return "language.support.function";
-                        else
-                            return "identifier";
-                    },
-                    regex : identifier
-                }, {
-                    token : "constant.numeric",
-                    regex : "(?:0x[\\da-fA-F]+|(?:\\d+(?:\\.\\d+)?|\\.\\d+)(?:[eE][+-]?\\d+)?)"
-                }, {
-                    token : "string",
-                    merge : true,
-                    regex : "'''",
-                    next : "qdoc"
-                }, {
-                    token : "string",
-                    merge : true,
-                    regex : '"""',
-                    next : "qqdoc"
-                }, {
-                    token : "string",
-                    merge : true,
-                    regex : "'",
-                    next : "qstring"
-                }, {
-                    token : "string",
-                    merge : true,
-                    regex : '"',
-                    next : "qqstring"
-                }, {
-                    token : "string",
-                    merge : true,
-                    regex : "`",
-                    next : "js"
-                }, {
-                    token : "string.regex",
-                    merge : true,
-                    regex : "///",
-                    next : "heregex"
-                }, {
-                    token : "string.regex",
-                    regex : "/(?!\\s)[^[/\\n\\\\]*(?: (?:\\\\.|\\[[^\\]\\n\\\\]*(?:\\\\.[^\\]\\n\\\\]*)*\\])[^[/\\n\\\\]*)*/[imgy]{0,4}(?!\\w)"
-                }, {
-                    token : "comment",
-                    merge : true,
-                    regex : "###(?!#)",
-                    next : "comment"
-                }, {
-                    token : "comment",
-                    regex : "#.*"
-                }, {
-                    token : "punctuation.operator",
-                    regex : "\\?|\\:|\\,|\\."
-                }, {
-                    token : "keyword.operator",
-                    regex : "(?:[\\-=]>|[-+*/%<>&|^!?=]=|>>>=?|\\-\\-|\\+\\+|::|&&=|\\|\\|=|<<=|>>=|\\?\\.|\\.{2,3}|\\!)"
-                }, {
-                    token : "paren.lparen",
-                    regex : "[({[]"
-                }, {
-                    token : "paren.rparen",
-                    regex : "[\\]})]"
-                }, {
-                    token : "text",
-                    regex : "\\s+"
-                }],
-            
-            qdoc : [{
-                token : "string",
-                regex : ".*?'''",
-                next : "start"
-            }, stringfill],
-            
-            qqdoc : [{
-                token : "string",
-                regex : '.*?"""',
-                next : "start"
-            }, stringfill],
-            
-            qstring : [{
-                token : "string",
-                regex : "[^\\\\']*(?:\\\\.[^\\\\']*)*'",
-                merge : true,
-                next : "start"
-            }, stringfill],
-            
-            qqstring : [{
-                token : "string",
-                regex : '[^\\\\"]*(?:\\\\.[^\\\\"]*)*"',
-                merge : true,
-                next : "start"
-            }, stringfill],
-            
-            js : [{
-                token : "string",
-                merge : true,
-                regex : "[^\\\\`]*(?:\\\\.[^\\\\`]*)*`",
-                next : "start"
-            }, stringfill],
-            
-            heregex : [{
-                token : "string.regex",
-                regex : '.*?///[imgy]{0,4}',
-                next : "start"
-            }, {
-                token : "comment.regex",
-                regex : "\\s+(?:#.*)?"
-            }, {
-                token : "string.regex",
-                merge : true,
-                regex : "\\S+"
-            }],
-            
-            comment : [{
-                token : "comment",
-                regex : '.*?###',
-                next : "start"
-            }, {
-                token : "comment",
-                merge : true,
-                regex : ".+"
-            }]
-        };
-    }
-
-    exports.CoffeeHighlightRules = CoffeeHighlightRules;
-});
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/matching_brace_outdent', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
-"use strict";
-
-var Range = require("../range").Range;
-
-var MatchingBraceOutdent = function() {};
-
-(function() {
-
-    this.checkOutdent = function(line, input) {
-        if (! /^\s+$/.test(line))
-            return false;
-
-        return /^\s*\}/.test(input);
-    };
-
-    this.autoOutdent = function(doc, row) {
-        var line = doc.getLine(row);
-        var match = line.match(/^(\s*\})/);
-
-        if (!match) return 0;
-
-        var column = match[1].length;
-        var openBracePos = doc.findMatchingBracket({row: row, column: column});
-
-        if (!openBracePos || openBracePos.row == row) return 0;
-
-        var indent = this.$getIndent(doc.getLine(openBracePos.row));
-        doc.replace(new Range(row, 0, row, column-1), indent);
-    };
-
-    this.$getIndent = function(line) {
-        var match = line.match(/^(\s+)/);
-        if (match) {
-            return match[1];
-        }
-
-        return "";
-    };
-
-}).call(MatchingBraceOutdent.prototype);
-
-exports.MatchingBraceOutdent = MatchingBraceOutdent;
-});
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/folding/pythonic', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/folding/fold_mode'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../../lib/oop");
-var BaseFoldMode = require("./fold_mode").FoldMode;
-
-var FoldMode = exports.FoldMode = function(markers) {
-    this.foldingStartMarker = new RegExp("(?:([\\[{])|(" + markers + "))(?:\\s*)(?:#.*)?$");
-};
-oop.inherits(FoldMode, BaseFoldMode);
-
-(function() {
-
-    this.getFoldWidgetRange = function(session, foldStyle, row) {
-        var line = session.getLine(row);
-        var match = line.match(this.foldingStartMarker);
-        if (match) {
-            if (match[1])
-                return this.openingBracketBlock(session, match[1], row, match.index);
-            if (match[2])
-                return this.indentationBlock(session, row, match.index + match[2].length);
-            return this.indentationBlock(session, row);
-        }
-    }
-
-}).call(FoldMode.prototype);
-
-});/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/folding/fold_mode', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
-"use strict";
-
-var Range = require("../../range").Range;
-
-var FoldMode = exports.FoldMode = function() {};
-
-(function() {
-
-    this.foldingStartMarker = null;
-    this.foldingStopMarker = null;
-
-    // must return "" if there's no fold, to enable caching
-    this.getFoldWidget = function(session, foldStyle, row) {
-        var line = session.getLine(row);
-        if (this.foldingStartMarker.test(line))
-            return "start";
-        if (foldStyle == "markbeginend"
-                && this.foldingStopMarker
-                && this.foldingStopMarker.test(line))
-            return "end";
-        return "";
-    };
-    
-    this.getFoldWidgetRange = function(session, foldStyle, row) {
-        return null;
-    };
-
-    this.indentationBlock = function(session, row, column) {
-        var re = /^\s*/;
-        var startRow = row;
-        var endRow = row;
-        var line = session.getLine(row);
-        var startColumn = column || line.length;
-        var startLevel = line.match(re)[0].length;
-        var maxRow = session.getLength()
-        
-        while (++row < maxRow) {
-            line = session.getLine(row);
-            var level = line.match(re)[0].length;
-
-            if (level == line.length)
-                continue;
-
-            if (level <= startLevel)
-                break;
-
-            endRow = row;
-        }
-
-        if (endRow > startRow) {
-            var endColumn = session.getLine(endRow).length;
-            return new Range(startRow, startColumn, endRow, endColumn);
-        }
-    };
-
-    this.openingBracketBlock = function(session, bracket, row, column) {
-        var start = {row: row, column: column + 1};
-        var end = session.$findClosingBracket(bracket, start);
-        if (!end)
-            return;
-
-        var fw = session.foldWidgets[end.row];
-        if (fw == null)
-            fw = this.getFoldWidget(session, end.row);
-
-        if (fw == "start") {
-            end.row --;
-            end.column = session.getLine(end.row).length;
-        }
-        return Range.fromPoints(start, end);
-    };
-
-}).call(FoldMode.prototype);
-
-});
diff --git a/apps/files_texteditor/js/aceeditor/mode-coffee.js b/apps/files_texteditor/js/aceeditor/mode-coffee.js
deleted file mode 100644
index f8a9d63788..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-coffee.js
+++ /dev/null
@@ -1 +0,0 @@
-define("ace/mode/coffee",["require","exports","module","ace/tokenizer","ace/mode/coffee_highlight_rules","ace/mode/matching_brace_outdent","ace/mode/folding/pythonic","ace/range","ace/mode/text","ace/worker/worker_client","ace/lib/oop"],function(a,b,c){function l(){this.$tokenizer=new d((new e).getRules()),this.$outdent=new f,this.foldingRules=new g("=|=>|->|\\s*class [^#]*")}"use strict";var d=a("../tokenizer").Tokenizer,e=a("./coffee_highlight_rules").CoffeeHighlightRules,f=a("./matching_brace_outdent").MatchingBraceOutdent,g=a("./folding/pythonic").FoldMode,h=a("../range").Range,i=a("./text").Mode,j=a("../worker/worker_client").WorkerClient,k=a("../lib/oop");k.inherits(l,i),function(){var a=/(?:[({[=:]|[-=]>|\b(?:else|switch|try|catch(?:\s*[$A-Za-z_\x7f-\uffff][$\w\x7f-\uffff]*)?|finally))\s*$/,b=/^(\s*)#/,c=/^\s*###(?!#)/,d=/^\s*/;this.getNextLineIndent=function(b,c,d){var e=this.$getIndent(c),f=this.$tokenizer.getLineTokens(c,b).tokens;return(!f.length||f[f.length-1].type!=="comment")&&b==="start"&&a.test(c)&&(e+=d),e},this.toggleCommentLines=function(a,e,f,g){console.log("toggle");var i=new h(0,0,0,0);for(var j=f;j<=g;++j){var k=e.getLine(j);if(c.test(k))continue;b.test(k)?k=k.replace(b,"$1"):k=k.replace(d,"$&#"),i.end.row=i.start.row=j,i.end.column=k.length+1,e.replace(i,k)}},this.checkOutdent=function(a,b,c){return this.$outdent.checkOutdent(b,c)},this.autoOutdent=function(a,b,c){this.$outdent.autoOutdent(b,c)},this.createWorker=function(a){var b=new j(["ace"],"worker-coffee.js","ace/mode/coffee_worker","Worker");return b.attachToDocument(a.getDocument()),b.on("error",function(b){a.setAnnotations([b.data])}),b.on("ok",function(b){a.clearAnnotations()}),b}}.call(l.prototype),b.Mode=l}),define("ace/mode/coffee_highlight_rules",["require","exports","module","ace/lib/lang","ace/lib/oop","ace/mode/text_highlight_rules"],function(a,b,c){function g(){var a="[$A-Za-z_\\x7f-\\uffff][$\\w\\x7f-\\uffff]*",b={token:"string",merge:!0,regex:".+"},c=d.arrayToMap("this|throw|then|try|typeof|super|switch|return|break|by)|continue|catch|class|in|instanceof|is|isnt|if|else|extends|for|forown|finally|function|while|when|new|no|not|delete|debugger|do|loop|of|off|or|on|unless|until|and|yes".split("|")),e=d.arrayToMap("true|false|null|undefined".split("|")),f=d.arrayToMap("case|const|default|function|var|void|with|enum|export|implements|interface|let|package|private|protected|public|static|yield|__hasProp|extends|slice|bind|indexOf".split("|")),g=d.arrayToMap("Array|Boolean|Date|Function|Number|Object|RegExp|ReferenceError|RangeError|String|SyntaxError|Error|EvalError|TypeError|URIError".split("|")),h=d.arrayToMap("Math|JSON|isNaN|isFinite|parseInt|parseFloat|encodeURI|encodeURIComponent|decodeURI|decodeURIComponent|RangeError|String|SyntaxError|Error|EvalError|TypeError|URIError".split("|"));this.$rules={start:[{token:"identifier",regex:"(?:(?:\\.|::)\\s*)"+a},{token:"variable",regex:"@(?:"+a+")?"},{token:function(a){return c.hasOwnProperty(a)?"keyword":e.hasOwnProperty(a)?"constant.language":f.hasOwnProperty(a)?"invalid.illegal":g.hasOwnProperty(a)?"language.support.class":h.hasOwnProperty(a)?"language.support.function":"identifier"},regex:a},{token:"constant.numeric",regex:"(?:0x[\\da-fA-F]+|(?:\\d+(?:\\.\\d+)?|\\.\\d+)(?:[eE][+-]?\\d+)?)"},{token:"string",merge:!0,regex:"'''",next:"qdoc"},{token:"string",merge:!0,regex:'"""',next:"qqdoc"},{token:"string",merge:!0,regex:"'",next:"qstring"},{token:"string",merge:!0,regex:'"',next:"qqstring"},{token:"string",merge:!0,regex:"`",next:"js"},{token:"string.regex",merge:!0,regex:"///",next:"heregex"},{token:"string.regex",regex:"/(?!\\s)[^[/\\n\\\\]*(?: (?:\\\\.|\\[[^\\]\\n\\\\]*(?:\\\\.[^\\]\\n\\\\]*)*\\])[^[/\\n\\\\]*)*/[imgy]{0,4}(?!\\w)"},{token:"comment",merge:!0,regex:"###(?!#)",next:"comment"},{token:"comment",regex:"#.*"},{token:"punctuation.operator",regex:"\\?|\\:|\\,|\\."},{token:"keyword.operator",regex:"(?:[\\-=]>|[-+*/%<>&|^!?=]=|>>>=?|\\-\\-|\\+\\+|::|&&=|\\|\\|=|<<=|>>=|\\?\\.|\\.{2,3}|\\!)"},{token:"paren.lparen",regex:"[({[]"},{token:"paren.rparen",regex:"[\\]})]"},{token:"text",regex:"\\s+"}],qdoc:[{token:"string",regex:".*?'''",next:"start"},b],qqdoc:[{token:"string",regex:'.*?"""',next:"start"},b],qstring:[{token:"string",regex:"[^\\\\']*(?:\\\\.[^\\\\']*)*'",merge:!0,next:"start"},b],qqstring:[{token:"string",regex:'[^\\\\"]*(?:\\\\.[^\\\\"]*)*"',merge:!0,next:"start"},b],js:[{token:"string",merge:!0,regex:"[^\\\\`]*(?:\\\\.[^\\\\`]*)*`",next:"start"},b],heregex:[{token:"string.regex",regex:".*?///[imgy]{0,4}",next:"start"},{token:"comment.regex",regex:"\\s+(?:#.*)?"},{token:"string.regex",merge:!0,regex:"\\S+"}],comment:[{token:"comment",regex:".*?###",next:"start"},{token:"comment",merge:!0,regex:".+"}]}}"use strict";var d=a("../lib/lang"),e=a("../lib/oop"),f=a("./text_highlight_rules").TextHighlightRules;e.inherits(g,f),b.CoffeeHighlightRules=g}),define("ace/mode/matching_brace_outdent",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../range").Range,e=function(){};(function(){this.checkOutdent=function(a,b){return/^\s+$/.test(a)?/^\s*\}/.test(b):!1},this.autoOutdent=function(a,b){var c=a.getLine(b),e=c.match(/^(\s*\})/);if(!e)return 0;var f=e[1].length,g=a.findMatchingBracket({row:b,column:f});if(!g||g.row==b)return 0;var h=this.$getIndent(a.getLine(g.row));a.replace(new d(b,0,b,f-1),h)},this.$getIndent=function(a){var b=a.match(/^(\s+)/);return b?b[1]:""}}).call(e.prototype),b.MatchingBraceOutdent=e}),define("ace/mode/folding/pythonic",["require","exports","module","ace/lib/oop","ace/mode/folding/fold_mode"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("./fold_mode").FoldMode,f=b.FoldMode=function(a){this.foldingStartMarker=new RegExp("(?:([\\[{])|("+a+"))(?:\\s*)(?:#.*)?$")};d.inherits(f,e),function(){this.getFoldWidgetRange=function(a,b,c){var d=a.getLine(c),e=d.match(this.foldingStartMarker);if(e)return e[1]?this.openingBracketBlock(a,e[1],c,e.index):e[2]?this.indentationBlock(a,c,e.index+e[2].length):this.indentationBlock(a,c)}}.call(f.prototype)}),define("ace/mode/folding/fold_mode",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../../range").Range,e=b.FoldMode=function(){};(function(){this.foldingStartMarker=null,this.foldingStopMarker=null,this.getFoldWidget=function(a,b,c){var d=a.getLine(c);return this.foldingStartMarker.test(d)?"start":b=="markbeginend"&&this.foldingStopMarker&&this.foldingStopMarker.test(d)?"end":""},this.getFoldWidgetRange=function(a,b,c){return null},this.indentationBlock=function(a,b,c){var e=/^\s*/,f=b,g=b,h=a.getLine(b),i=c||h.length,j=h.match(e)[0].length,k=a.getLength();while(++b<k){h=a.getLine(b);var l=h.match(e)[0].length;if(l==h.length)continue;if(l<=j)break;g=b}if(g>f){var m=a.getLine(g).length;return new d(f,i,g,m)}},this.openingBracketBlock=function(a,b,c,e){var f={row:c,column:e+1},g=a.$findClosingBracket(b,f);if(!g)return;var h=a.foldWidgets[g.row];return h==null&&(h=this.getFoldWidget(a,g.row)),h=="start"&&(g.row--,g.column=a.getLine(g.row).length),d.fromPoints(f,g)}}).call(e.prototype)})
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/mode-coldfusion-uncompressed.js b/apps/files_texteditor/js/aceeditor/mode-coldfusion-uncompressed.js
deleted file mode 100644
index af5e3914b5..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-coldfusion-uncompressed.js
+++ /dev/null
@@ -1,2433 +0,0 @@
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/coldfusion', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/xml', 'ace/mode/javascript', 'ace/mode/css', 'ace/tokenizer', 'ace/mode/coldfusion_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var XmlMode = require("./xml").Mode;
-var JavaScriptMode = require("./javascript").Mode;
-var CssMode = require("./css").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
-var ColdfusionHighlightRules = require("./coldfusion_highlight_rules").ColdfusionHighlightRules;
-
-var Mode = function() {
-    XmlMode.call(this);
-    
-    var highlighter = new ColdfusionHighlightRules();
-    this.$tokenizer = new Tokenizer(highlighter.getRules());
-    
-    this.$embeds = highlighter.getEmbeds();
-    this.createModeDelegates({
-      "js-": JavaScriptMode,
-      "css-": CssMode
-    });
-};
-oop.inherits(Mode, XmlMode);
-
-(function() {
-
-    this.getNextLineIndent = function(state, line, tab) {
-        return this.$getIndent(line);
-    };
-
-}).call(Mode.prototype);
-
-exports.Mode = Mode;
-});
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/xml', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text', 'ace/tokenizer', 'ace/mode/xml_highlight_rules', 'ace/mode/behaviour/xml', 'ace/mode/folding/xml'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
-var XmlHighlightRules = require("./xml_highlight_rules").XmlHighlightRules;
-var XmlBehaviour = require("./behaviour/xml").XmlBehaviour;
-var XmlFoldMode = require("./folding/xml").FoldMode;
-
-var Mode = function() {
-    this.$tokenizer = new Tokenizer(new XmlHighlightRules().getRules());
-    this.$behaviour = new XmlBehaviour();
-    this.foldingRules = new XmlFoldMode();
-};
-
-oop.inherits(Mode, TextMode);
-
-(function() {
-    
-    this.getNextLineIndent = function(state, line, tab) {
-        return this.$getIndent(line);
-    };
-
-}).call(Mode.prototype);
-
-exports.Mode = Mode;
-});
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/xml_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/xml_util', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var xmlUtil = require("./xml_util");
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-
-var XmlHighlightRules = function() {
-
-    // regexp must not have capturing parentheses
-    // regexps are ordered -> the first match is used
-    this.$rules = {
-        start : [{
-            token : "text",
-            regex : "<\\!\\[CDATA\\[",
-            next : "cdata"
-        }, {
-            token : "xml_pe",
-            regex : "<\\?.*?\\?>"
-        }, {
-            token : "comment",
-            merge : true,
-            regex : "<\\!--",
-            next : "comment"
-        }, {
-            token : "xml_pe",
-            regex : "<\\!.*?>"
-        }, {
-            token : "meta.tag", // opening tag
-            regex : "<\\/?",
-            next : "tag"
-        }, {
-            token : "text",
-            regex : "\\s+"
-        }, {
-            token : "constant.character.entity",
-            regex : "(?:&#[0-9]+;)|(?:&#x[0-9a-fA-F]+;)|(?:&[a-zA-Z0-9_:\\.-]+;)"
-        }, {
-            token : "text",
-            regex : "[^<]+"
-        }],
-        
-        cdata : [{
-            token : "text",
-            regex : "\\]\\]>",
-            next : "start"
-        }, {
-            token : "text",
-            regex : "\\s+"
-        }, {
-            token : "text",
-            regex : "(?:[^\\]]|\\](?!\\]>))+"
-        }],
-
-        comment : [{
-            token : "comment",
-            regex : ".*?-->",
-            next : "start"
-        }, {
-            token : "comment",
-            merge : true,
-            regex : ".+"
-        }]
-    };
-    
-    xmlUtil.tag(this.$rules, "tag", "start");
-};
-
-oop.inherits(XmlHighlightRules, TextHighlightRules);
-
-exports.XmlHighlightRules = XmlHighlightRules;
-});
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/xml_util', ['require', 'exports', 'module' , 'ace/lib/lang'], function(require, exports, module) {
-"use strict";
-
-var lang = require("../lib/lang");
-
-var formTags = lang.arrayToMap(
-    ("button|form|input|label|select|textarea").split("|")
-);
-
-var tableTags = lang.arrayToMap(
-    ("table|tbody|td|tfoot|th|tr").split("|")
-);
-
-function string(state) {
-    return [{
-        token : "string",
-        regex : '".*?"'
-    }, {
-        token : "string", // multi line string start
-        merge : true,
-        regex : '["].*',
-        next : state + "_qqstring"
-    }, {
-        token : "string",
-        regex : "'.*?'"
-    }, {
-        token : "string", // multi line string start
-        merge : true,
-        regex : "['].*",
-        next : state + "_qstring"
-    }];
-}
-
-function multiLineString(quote, state) {
-    return [{
-        token : "string",
-        merge : true,
-        regex : ".*?" + quote,
-        next : state
-    }, {
-        token : "string",
-        merge : true,
-        regex : '.+'
-    }];
-}
-
-exports.tag = function(states, name, nextState) {
-    states[name] = [{
-        token : "text",
-        regex : "\\s+"
-    }, {
-        //token : "meta.tag",
-        
-    token : function(value) {
-            if ( value==='a' ) {
-                return "meta.tag.anchor";
-            }
-            else if ( value==='img' ) {
-                return "meta.tag.image";
-            }
-            else if ( value==='script' ) {
-                return "meta.tag.script";
-            }
-            else if ( value==='style' ) {
-                return "meta.tag.style";
-            }
-            else if (formTags.hasOwnProperty(value.toLowerCase())) {
-                return "meta.tag.form";
-            }
-            else if (tableTags.hasOwnProperty(value.toLowerCase())) {
-                return "meta.tag.table";
-            }
-            else {
-                return "meta.tag";
-            }
-        },        
-        merge : true,
-        regex : "[-_a-zA-Z0-9:]+",
-        next : name + "_embed_attribute_list" 
-    }, {
-        token: "empty",
-        regex: "",
-        next : name + "_embed_attribute_list"
-    }];
-
-    states[name + "_qstring"] = multiLineString("'", name + "_embed_attribute_list");
-    states[name + "_qqstring"] = multiLineString("\"", name + "_embed_attribute_list");
-    
-    states[name + "_embed_attribute_list"] = [{
-        token : "meta.tag",
-        merge : true,
-        regex : "\/?>",
-        next : nextState
-    }, {
-        token : "keyword.operator",
-        regex : "="
-    }, {
-        token : "entity.other.attribute-name",
-        regex : "[-_a-zA-Z0-9:]+"
-    }, {
-        token : "constant.numeric", // float
-        regex : "[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"
-    }, {
-        token : "text",
-        regex : "\\s+"
-    }].concat(string(name));
-};
-
-});
-/* vim:ts=4:sts=4:sw=4:
- * ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Chris Spencer <chris.ag.spencer AT googlemail DOT com>
- *
- * 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 ***** */
-
-define('ace/mode/behaviour/xml', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/behaviour', 'ace/mode/behaviour/cstyle'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../../lib/oop");
-var Behaviour = require("../behaviour").Behaviour;
-var CstyleBehaviour = require("./cstyle").CstyleBehaviour;
-
-var XmlBehaviour = function () {
-    
-    this.inherit(CstyleBehaviour, ["string_dquotes"]); // Get string behaviour
-    
-    this.add("brackets", "insertion", function (state, action, editor, session, text) {
-        if (text == '<') {
-            var selection = editor.getSelectionRange();
-            var selected = session.doc.getTextRange(selection);
-            if (selected !== "") {
-                return false;
-            } else {
-                return {
-                    text: '<>',
-                    selection: [1, 1]
-                }
-            }
-        } else if (text == '>') {
-            var cursor = editor.getCursorPosition();
-            var line = session.doc.getLine(cursor.row);
-            var rightChar = line.substring(cursor.column, cursor.column + 1);
-            if (rightChar == '>') { // need some kind of matching check here
-                return {
-                    text: '',
-                    selection: [1, 1]
-                }
-            }
-        } else if (text == "\n") {
-            var cursor = editor.getCursorPosition();
-            var line = session.doc.getLine(cursor.row);
-            var rightChars = line.substring(cursor.column, cursor.column + 2);
-            if (rightChars == '</') {
-                var indent = this.$getIndent(session.doc.getLine(cursor.row)) + session.getTabString();
-                var next_indent = this.$getIndent(session.doc.getLine(cursor.row));
-
-                return {
-                    text: '\n' + indent + '\n' + next_indent,
-                    selection: [1, indent.length, 1, indent.length]
-                }
-            }
-        }
-    });
-    
-}
-oop.inherits(XmlBehaviour, Behaviour);
-
-exports.XmlBehaviour = XmlBehaviour;
-});/* vim:ts=4:sts=4:sw=4:
- * ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Chris Spencer <chris.ag.spencer AT googlemail DOT com>
- *
- * 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 ***** */
-
-define('ace/mode/behaviour/cstyle', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/behaviour'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../../lib/oop");
-var Behaviour = require('../behaviour').Behaviour;
-
-var CstyleBehaviour = function () {
-
-    this.add("braces", "insertion", function (state, action, editor, session, text) {
-        if (text == '{') {
-            var selection = editor.getSelectionRange();
-            var selected = session.doc.getTextRange(selection);
-            if (selected !== "") {
-                return {
-                    text: '{' + selected + '}',
-                    selection: false
-                };
-            } else {
-                return {
-                    text: '{}',
-                    selection: [1, 1]
-                };
-            }
-        } else if (text == '}') {
-            var cursor = editor.getCursorPosition();
-            var line = session.doc.getLine(cursor.row);
-            var rightChar = line.substring(cursor.column, cursor.column + 1);
-            if (rightChar == '}') {
-                var matching = session.$findOpeningBracket('}', {column: cursor.column + 1, row: cursor.row});
-                if (matching !== null) {
-                    return {
-                        text: '',
-                        selection: [1, 1]
-                    };
-                }
-            }
-        } else if (text == "\n") {
-            var cursor = editor.getCursorPosition();
-            var line = session.doc.getLine(cursor.row);
-            var rightChar = line.substring(cursor.column, cursor.column + 1);
-            if (rightChar == '}') {
-                var openBracePos = session.findMatchingBracket({row: cursor.row, column: cursor.column + 1});
-                if (!openBracePos)
-                     return null;
-
-                var indent = this.getNextLineIndent(state, line.substring(0, line.length - 1), session.getTabString());
-                var next_indent = this.$getIndent(session.doc.getLine(openBracePos.row));
-
-                return {
-                    text: '\n' + indent + '\n' + next_indent,
-                    selection: [1, indent.length, 1, indent.length]
-                };
-            }
-        }
-    });
-
-    this.add("braces", "deletion", function (state, action, editor, session, range) {
-        var selected = session.doc.getTextRange(range);
-        if (!range.isMultiLine() && selected == '{') {
-            var line = session.doc.getLine(range.start.row);
-            var rightChar = line.substring(range.end.column, range.end.column + 1);
-            if (rightChar == '}') {
-                range.end.column++;
-                return range;
-            }
-        }
-    });
-
-    this.add("parens", "insertion", function (state, action, editor, session, text) {
-        if (text == '(') {
-            var selection = editor.getSelectionRange();
-            var selected = session.doc.getTextRange(selection);
-            if (selected !== "") {
-                return {
-                    text: '(' + selected + ')',
-                    selection: false
-                };
-            } else {
-                return {
-                    text: '()',
-                    selection: [1, 1]
-                };
-            }
-        } else if (text == ')') {
-            var cursor = editor.getCursorPosition();
-            var line = session.doc.getLine(cursor.row);
-            var rightChar = line.substring(cursor.column, cursor.column + 1);
-            if (rightChar == ')') {
-                var matching = session.$findOpeningBracket(')', {column: cursor.column + 1, row: cursor.row});
-                if (matching !== null) {
-                    return {
-                        text: '',
-                        selection: [1, 1]
-                    };
-                }
-            }
-        }
-    });
-
-    this.add("parens", "deletion", function (state, action, editor, session, range) {
-        var selected = session.doc.getTextRange(range);
-        if (!range.isMultiLine() && selected == '(') {
-            var line = session.doc.getLine(range.start.row);
-            var rightChar = line.substring(range.start.column + 1, range.start.column + 2);
-            if (rightChar == ')') {
-                range.end.column++;
-                return range;
-            }
-        }
-    });
-
-    this.add("string_dquotes", "insertion", function (state, action, editor, session, text) {
-        if (text == '"' || text == "'") {
-            var quote = text;
-            var selection = editor.getSelectionRange();
-            var selected = session.doc.getTextRange(selection);
-            if (selected !== "") {
-                return {
-                    text: quote + selected + quote,
-                    selection: false
-                };
-            } else {
-                var cursor = editor.getCursorPosition();
-                var line = session.doc.getLine(cursor.row);
-                var leftChar = line.substring(cursor.column-1, cursor.column);
-
-                // We're escaped.
-                if (leftChar == '\\') {
-                    return null;
-                }
-
-                // Find what token we're inside.
-                var tokens = session.getTokens(selection.start.row, selection.start.row)[0].tokens;
-                var col = 0, token;
-                var quotepos = -1; // Track whether we're inside an open quote.
-
-                for (var x = 0; x < tokens.length; x++) {
-                    token = tokens[x];
-                    if (token.type == "string") {
-                      quotepos = -1;
-                    } else if (quotepos < 0) {
-                      quotepos = token.value.indexOf(quote);
-                    }
-                    if ((token.value.length + col) > selection.start.column) {
-                        break;
-                    }
-                    col += tokens[x].value.length;
-                }
-
-                // Try and be smart about when we auto insert.
-                if (!token || (quotepos < 0 && token.type !== "comment" && (token.type !== "string" || ((selection.start.column !== token.value.length+col-1) && token.value.lastIndexOf(quote) === token.value.length-1)))) {
-                    return {
-                        text: quote + quote,
-                        selection: [1,1]
-                    };
-                } else if (token && token.type === "string") {
-                    // Ignore input and move right one if we're typing over the closing quote.
-                    var rightChar = line.substring(cursor.column, cursor.column + 1);
-                    if (rightChar == quote) {
-                        return {
-                            text: '',
-                            selection: [1, 1]
-                        };
-                    }
-                }
-            }
-        }
-    });
-
-    this.add("string_dquotes", "deletion", function (state, action, editor, session, range) {
-        var selected = session.doc.getTextRange(range);
-        if (!range.isMultiLine() && (selected == '"' || selected == "'")) {
-            var line = session.doc.getLine(range.start.row);
-            var rightChar = line.substring(range.start.column + 1, range.start.column + 2);
-            if (rightChar == '"') {
-                range.end.column++;
-                return range;
-            }
-        }
-    });
-
-};
-
-oop.inherits(CstyleBehaviour, Behaviour);
-
-exports.CstyleBehaviour = CstyleBehaviour;
-});/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/folding/xml', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/lang', 'ace/range', 'ace/mode/folding/fold_mode', 'ace/token_iterator'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../../lib/oop");
-var lang = require("../../lib/lang");
-var Range = require("../../range").Range;
-var BaseFoldMode = require("./fold_mode").FoldMode;
-var TokenIterator = require("../../token_iterator").TokenIterator;
-
-var FoldMode = exports.FoldMode = function(voidElements) {
-    BaseFoldMode.call(this);
-    this.voidElements = voidElements || {};
-};
-oop.inherits(FoldMode, BaseFoldMode);
-
-(function() {
-
-    this.getFoldWidget = function(session, foldStyle, row) {
-        var tag = this._getFirstTagInLine(session, row);
-
-        if (tag.closing)
-            return foldStyle == "markbeginend" ? "end" : "";
-
-        if (!tag.tagName || this.voidElements[tag.tagName.toLowerCase()])
-            return "";
-
-        if (tag.selfClosing)
-            return "";
-
-        if (tag.value.indexOf("/" + tag.tagName) !== -1)
-            return "";
-
-        return "start";
-    };
-    
-    this._getFirstTagInLine = function(session, row) {
-        var tokens = session.getTokens(row, row)[0].tokens;
-        var value = "";
-        for (var i = 0; i < tokens.length; i++) {
-            var token = tokens[i];
-            if (token.type.indexOf("meta.tag") === 0)
-                value += token.value;
-            else
-                value += lang.stringRepeat(" ", token.value.length);
-        }
-        
-        return this._parseTag(value);
-    };
-
-    this.tagRe = /^(\s*)(<?(\/?)([-_a-zA-Z0-9:!]*)\s*(\/?)>?)/;
-    this._parseTag = function(tag) {
-        
-        var match = this.tagRe.exec(tag);
-        var column = this.tagRe.lastIndex || 0;
-        this.tagRe.lastIndex = 0;
-
-        return {
-            value: tag,
-            match: match ? match[2] : "",
-            closing: match ? !!match[3] : false,
-            selfClosing: match ? !!match[5] || match[2] == "/>" : false,
-            tagName: match ? match[4] : "",
-            column: match[1] ? column + match[1].length : column
-        };
-    };
-    
-    /**
-     * reads a full tag and places the iterator after the tag
-     */
-    this._readTagForward = function(iterator) {
-        var token = iterator.getCurrentToken();
-        if (!token)
-            return null;
-            
-        var value = "";
-        var start;
-        
-        do {
-            if (token.type.indexOf("meta.tag") === 0) {
-                if (!start) {
-                    var start = {
-                        row: iterator.getCurrentTokenRow(),
-                        column: iterator.getCurrentTokenColumn()
-                    };
-                }
-                value += token.value;
-                if (value.indexOf(">") !== -1) {
-                    var tag = this._parseTag(value);
-                    tag.start = start;
-                    tag.end = {
-                        row: iterator.getCurrentTokenRow(),
-                        column: iterator.getCurrentTokenColumn() + token.value.length
-                    };
-                    iterator.stepForward();
-                    return tag;
-                }
-            }
-        } while(token = iterator.stepForward());
-        
-        return null;
-    };
-    
-    this._readTagBackward = function(iterator) {
-        var token = iterator.getCurrentToken();
-        if (!token)
-            return null;
-            
-        var value = "";
-        var end;
-
-        do {
-            if (token.type.indexOf("meta.tag") === 0) {
-                if (!end) {
-                    end = {
-                        row: iterator.getCurrentTokenRow(),
-                        column: iterator.getCurrentTokenColumn() + token.value.length
-                    };
-                }
-                value = token.value + value;
-                if (value.indexOf("<") !== -1) {
-                    var tag = this._parseTag(value);
-                    tag.end = end;
-                    tag.start = {
-                        row: iterator.getCurrentTokenRow(),
-                        column: iterator.getCurrentTokenColumn()
-                    };
-                    iterator.stepBackward();
-                    return tag;
-                }
-            }
-        } while(token = iterator.stepBackward());
-        
-        return null;
-    };
-    
-    this._pop = function(stack, tag) {
-        while (stack.length) {
-            
-            var top = stack[stack.length-1];
-            if (!tag || top.tagName == tag.tagName) {
-                return stack.pop();
-            }
-            else if (this.voidElements[tag.tagName]) {
-                return;
-            }
-            else if (this.voidElements[top.tagName]) {
-                stack.pop();
-                continue;
-            } else {
-                return null;
-            }
-        }
-    };
-    
-    this.getFoldWidgetRange = function(session, foldStyle, row) {
-        var firstTag = this._getFirstTagInLine(session, row);
-        
-        if (!firstTag.match)
-            return null;
-        
-        var isBackward = firstTag.closing || firstTag.selfClosing;
-        var stack = [];
-        var tag;
-        
-        if (!isBackward) {
-            var iterator = new TokenIterator(session, row, firstTag.column);
-            var start = {
-                row: row,
-                column: firstTag.column + firstTag.tagName.length + 2
-            };
-            while (tag = this._readTagForward(iterator)) {
-                if (tag.selfClosing) {
-                    if (!stack.length) {
-                        tag.start.column += tag.tagName.length + 2;
-                        tag.end.column -= 2;
-                        return Range.fromPoints(tag.start, tag.end);
-                    } else
-                        continue;
-                }
-                
-                if (tag.closing) {
-                    this._pop(stack, tag);
-                    if (stack.length == 0)
-                        return Range.fromPoints(start, tag.start);
-                }
-                else {
-                    stack.push(tag)
-                }
-            }
-        }
-        else {
-            var iterator = new TokenIterator(session, row, firstTag.column + firstTag.match.length);
-            var end = {
-                row: row,
-                column: firstTag.column
-            };
-            
-            while (tag = this._readTagBackward(iterator)) {
-                if (tag.selfClosing) {
-                    if (!stack.length) {
-                        tag.start.column += tag.tagName.length + 2;
-                        tag.end.column -= 2;
-                        return Range.fromPoints(tag.start, tag.end);
-                    } else
-                        continue;
-                }
-                
-                if (!tag.closing) {
-                    this._pop(stack, tag);
-                    if (stack.length == 0) {
-                        tag.start.column += tag.tagName.length + 2;
-                        return Range.fromPoints(tag.start, end);
-                    }
-                }
-                else {
-                    stack.push(tag)
-                }
-            }
-        }
-        
-    };
-
-}).call(FoldMode.prototype);
-
-});/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/folding/fold_mode', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
-"use strict";
-
-var Range = require("../../range").Range;
-
-var FoldMode = exports.FoldMode = function() {};
-
-(function() {
-
-    this.foldingStartMarker = null;
-    this.foldingStopMarker = null;
-
-    // must return "" if there's no fold, to enable caching
-    this.getFoldWidget = function(session, foldStyle, row) {
-        var line = session.getLine(row);
-        if (this.foldingStartMarker.test(line))
-            return "start";
-        if (foldStyle == "markbeginend"
-                && this.foldingStopMarker
-                && this.foldingStopMarker.test(line))
-            return "end";
-        return "";
-    };
-    
-    this.getFoldWidgetRange = function(session, foldStyle, row) {
-        return null;
-    };
-
-    this.indentationBlock = function(session, row, column) {
-        var re = /^\s*/;
-        var startRow = row;
-        var endRow = row;
-        var line = session.getLine(row);
-        var startColumn = column || line.length;
-        var startLevel = line.match(re)[0].length;
-        var maxRow = session.getLength()
-        
-        while (++row < maxRow) {
-            line = session.getLine(row);
-            var level = line.match(re)[0].length;
-
-            if (level == line.length)
-                continue;
-
-            if (level <= startLevel)
-                break;
-
-            endRow = row;
-        }
-
-        if (endRow > startRow) {
-            var endColumn = session.getLine(endRow).length;
-            return new Range(startRow, startColumn, endRow, endColumn);
-        }
-    };
-
-    this.openingBracketBlock = function(session, bracket, row, column) {
-        var start = {row: row, column: column + 1};
-        var end = session.$findClosingBracket(bracket, start);
-        if (!end)
-            return;
-
-        var fw = session.foldWidgets[end.row];
-        if (fw == null)
-            fw = this.getFoldWidget(session, end.row);
-
-        if (fw == "start") {
-            end.row --;
-            end.column = session.getLine(end.row).length;
-        }
-        return Range.fromPoints(start, end);
-    };
-
-}).call(FoldMode.prototype);
-
-});
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/javascript', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text', 'ace/tokenizer', 'ace/mode/javascript_highlight_rules', 'ace/mode/matching_brace_outdent', 'ace/range', 'ace/worker/worker_client', 'ace/mode/behaviour/cstyle', 'ace/mode/folding/cstyle'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
-var JavaScriptHighlightRules = require("./javascript_highlight_rules").JavaScriptHighlightRules;
-var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
-var Range = require("../range").Range;
-var WorkerClient = require("../worker/worker_client").WorkerClient;
-var CstyleBehaviour = require("./behaviour/cstyle").CstyleBehaviour;
-var CStyleFoldMode = require("./folding/cstyle").FoldMode;
-
-var Mode = function() {
-    this.$tokenizer = new Tokenizer(new JavaScriptHighlightRules().getRules());
-    this.$outdent = new MatchingBraceOutdent();
-    this.$behaviour = new CstyleBehaviour();
-    this.foldingRules = new CStyleFoldMode();
-};
-oop.inherits(Mode, TextMode);
-
-(function() {
-
-
-    this.toggleCommentLines = function(state, doc, startRow, endRow) {
-        var outdent = true;
-        var re = /^(\s*)\/\//;
-
-        for (var i=startRow; i<= endRow; i++) {
-            if (!re.test(doc.getLine(i))) {
-                outdent = false;
-                break;
-            }
-        }
-
-        if (outdent) {
-            var deleteRange = new Range(0, 0, 0, 0);
-            for (var i=startRow; i<= endRow; i++)
-            {
-                var line = doc.getLine(i);
-                var m = line.match(re);
-                deleteRange.start.row = i;
-                deleteRange.end.row = i;
-                deleteRange.end.column = m[0].length;
-                doc.replace(deleteRange, m[1]);
-            }
-        }
-        else {
-            doc.indentRows(startRow, endRow, "//");
-        }
-    };
-
-    this.getNextLineIndent = function(state, line, tab) {
-        var indent = this.$getIndent(line);
-
-        var tokenizedLine = this.$tokenizer.getLineTokens(line, state);
-        var tokens = tokenizedLine.tokens;
-        var endState = tokenizedLine.state;
-
-        if (tokens.length && tokens[tokens.length-1].type == "comment") {
-            return indent;
-        }
-        
-        if (state == "start" || state == "regex_allowed") {
-            var match = line.match(/^.*(?:\bcase\b.*\:|[\{\(\[])\s*$/);
-            if (match) {
-                indent += tab;
-            }
-        } else if (state == "doc-start") {
-            if (endState == "start" || state == "regex_allowed") {
-                return "";
-            }
-            var match = line.match(/^\s*(\/?)\*/);
-            if (match) {
-                if (match[1]) {
-                    indent += " ";
-                }
-                indent += "* ";
-            }
-        }
-
-        return indent;
-    };
-
-    this.checkOutdent = function(state, line, input) {
-        return this.$outdent.checkOutdent(line, input);
-    };
-
-    this.autoOutdent = function(state, doc, row) {
-        this.$outdent.autoOutdent(doc, row);
-    };
-    
-    this.createWorker = function(session) {
-        var worker = new WorkerClient(["ace"], "worker-javascript.js", "ace/mode/javascript_worker", "JavaScriptWorker");
-        worker.attachToDocument(session.getDocument());
-            
-        worker.on("jslint", function(results) {
-            var errors = [];
-            for (var i=0; i<results.data.length; i++) {
-                var error = results.data[i];
-                if (error)
-                    errors.push({
-                        row: error.line-1,
-                        column: error.character-1,
-                        text: error.reason,
-                        type: "warning",
-                        lint: error
-                    });
-            }
-            session.setAnnotations(errors);
-        });
-        
-        worker.on("narcissus", function(e) {
-            session.setAnnotations([e.data]);
-        });
-        
-        worker.on("terminate", function() {
-            session.clearAnnotations();
-        });
-        
-        return worker;
-    };
-
-}).call(Mode.prototype);
-
-exports.Mode = Mode;
-});
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *      Mihai Sucan <mihai DOT sucan AT gmail DOT com>
- *
- * 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 ***** */
-
-define('ace/mode/javascript_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/lang', 'ace/unicode', 'ace/mode/doc_comment_highlight_rules', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var lang = require("../lib/lang");
-var unicode = require("../unicode");
-var DocCommentHighlightRules = require("./doc_comment_highlight_rules").DocCommentHighlightRules;
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-
-var JavaScriptHighlightRules = function() {
-
-    // see: https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects
-    var globals = lang.arrayToMap(
-      // Constructors
-        ("Array|Boolean|Date|Function|Iterator|Number|Object|RegExp|String|Proxy|" +
-      // E4X
-         "Namespace|QName|XML|XMLList|" +
-         "ArrayBuffer|Float32Array|Float64Array|Int16Array|Int32Array|Int8Array|" +
-         "Uint16Array|Uint32Array|Uint8Array|Uint8ClampedArray|" +
-      // Errors
-        "Error|EvalError|InternalError|RangeError|ReferenceError|StopIteration|" +
-        "SyntaxError|TypeError|URIError|" +
-      //  Non-constructor functions
-        "decodeURI|decodeURIComponent|encodeURI|encodeURIComponent|eval|isFinite|" +
-        "isNaN|parseFloat|parseInt|" +
-      // Other
-        "JSON|Math|" +
-      // Pseudo
-        "this|arguments|prototype|window|document"
-      ).split("|")
-    );
-
-    var keywords = lang.arrayToMap(
-        ("break|case|catch|continue|default|delete|do|else|finally|for|function|" +
-        "if|in|instanceof|new|return|switch|throw|try|typeof|let|var|while|with|" +
-        "const|yield|import|get|set").split("|")
-    );
-
-    // keywords which can be followed by regular expressions
-    var kwBeforeRe = "case|do|else|finally|in|instanceof|return|throw|try|typeof|yield";
-
-    var deprecated = lang.arrayToMap(
-        ("__parent__|__count__|escape|unescape|with|__proto__").split("|")
-    );
-
-    var definitions = lang.arrayToMap(("const|let|var|function").split("|"));
-
-    var buildinConstants = lang.arrayToMap(
-        ("null|Infinity|NaN|undefined").split("|")
-    );
-
-    var futureReserved = lang.arrayToMap(
-        ("class|enum|extends|super|export|implements|private|" +
-        "public|interface|package|protected|static").split("|")
-    );
-
-    // TODO: Unicode escape sequences
-    var identifierRe = "[" + unicode.packages.L + "\\$_]["
-        + unicode.packages.L
-        + unicode.packages.Mn + unicode.packages.Mc
-        + unicode.packages.Nd
-        + unicode.packages.Pc + "\\$_]*\\b";
-
-    var escapedRe = "\\\\(?:x[0-9a-fA-F]{2}|" + // hex
-        "u[0-9a-fA-F]{4}|" + // unicode
-        "[0-2][0-7]{0,2}|" + // oct
-        "3[0-6][0-7]?|" + // oct
-        "37[0-7]?|" + // oct
-        "[4-7][0-7]?|" + //oct
-        ".)";
-
-    // regexp must not have capturing parentheses. Use (?:) instead.
-    // regexps are ordered -> the first match is used
-
-    this.$rules = {
-        "start" : [
-            {
-                token : "comment",
-                regex : /\/\/.*$/
-            },
-            new DocCommentHighlightRules().getStartRule("doc-start"),
-            {
-                token : "comment", // multi line comment
-                merge : true,
-                regex : /\/\*/,
-                next : "comment"
-            }, {
-                token : "string",
-                regex : "'",
-                next  : "qstring"
-            }, {
-                token : "string",
-                regex : '"',
-                next  : "qqstring"
-            }, {
-                token : "constant.numeric", // hex
-                regex : /0[xX][0-9a-fA-F]+\b/
-            }, {
-                token : "constant.numeric", // float
-                regex : /[+-]?\d+(?:(?:\.\d*)?(?:[eE][+-]?\d+)?)?\b/
-            }, { // match stuff like: Sound.prototype.play = function() { }
-                token : [
-                    "storage.type",
-                    "punctuation.operator",
-                    "support.function",
-                    "punctuation.operator",
-                    "entity.name.function",
-                    "text",
-                    "keyword.operator",
-                    "text",
-                    "storage.type",
-                    "text",
-                    "paren.lparen",
-                    "variable.parameter",
-                    "paren.rparen"
-                ],
-                regex : "(" + identifierRe + ")(\\.)(prototype)(\\.)(" + identifierRe +")(\\s*)(=)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"
-            }, { // match stuff like: Sound.prototype.play = myfunc
-                token : [
-                    "storage.type",
-                    "punctuation.operator",
-                    "support.function",
-                    "punctuation.operator",
-                    "entity.name.function",
-                    "text",
-                    "keyword.operator",
-                    "text"
-                ],
-                regex : "(" + identifierRe + ")(\\.)(prototype)(\\.)(" + identifierRe +")(\\s*)(=)(\\s*)"
-            }, { // match stuff like: Sound.play = function() {  }
-                token : [
-                    "storage.type",
-                    "punctuation.operator",
-                    "entity.name.function",
-                    "text",
-                    "keyword.operator",
-                    "text",
-                    "storage.type",
-                    "text",
-                    "paren.lparen",
-                    "variable.parameter",
-                    "paren.rparen"
-                ],
-                regex : "(" + identifierRe + ")(\\.)(" + identifierRe +")(\\s*)(=)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"
-            }, { // match stuff like: play = function() {  }
-                token : [
-                    "entity.name.function",
-                    "text",
-                    "keyword.operator",
-                    "text",
-                    "storage.type",
-                    "text",
-                    "paren.lparen",
-                    "variable.parameter",
-                    "paren.rparen"
-                ],
-                regex : "(" + identifierRe +")(\\s*)(=)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"
-            }, { // match regular function like: function myFunc(arg) { }
-                token : [
-                    "storage.type",
-                    "text",
-                    "entity.name.function",
-                    "text",
-                    "paren.lparen",
-                    "variable.parameter",
-                    "paren.rparen"
-                ],
-                regex : "(function)(\\s+)(" + identifierRe + ")(\\s*)(\\()(.*?)(\\))"
-            }, { // match stuff like: foobar: function() { }
-                token : [
-                    "entity.name.function",
-                    "text",
-                    "punctuation.operator",
-                    "text",
-                    "storage.type",
-                    "text",
-                    "paren.lparen",
-                    "variable.parameter",
-                    "paren.rparen"
-                ],
-                regex : "(" + identifierRe + ")(\\s*)(:)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"
-            }, { // Attempt to match : function() { } (this is for issues with 'foo': function() { })
-                token : [
-                    "text",
-                    "text",
-                    "storage.type",
-                    "text",
-                    "paren.lparen",
-                    "variable.parameter",
-                    "paren.rparen"
-                ],
-                regex : "(:)(\\s*)(function)?(\\s*)(\\()([^)]*)(\\))"
-            }, {
-                token : "constant.language.boolean",
-                regex : /(?:true|false)\b/
-            }, {
-                token : "keyword",
-                regex : "(?:" + kwBeforeRe + ")\\b",
-                next : "regex_allowed"
-            }, {
-                token : ["punctuation.operator", "support.function"],
-                regex : /(\.)(s(?:h(?:ift|ow(?:Mod(?:elessDialog|alDialog)|Help))|croll(?:X|By(?:Pages|Lines)?|Y|To)?|t(?:opzzzz|rike)|i(?:n|zeToContent|debar|gnText)|ort|u(?:p|b(?:str(?:ing)?)?)|pli(?:ce|t)|e(?:nd|t(?:Re(?:sizable|questHeader)|M(?:i(?:nutes|lliseconds)|onth)|Seconds|Ho(?:tKeys|urs)|Year|Cursor|Time(?:out)?|Interval|ZOptions|Date|UTC(?:M(?:i(?:nutes|lliseconds)|onth)|Seconds|Hours|Date|FullYear)|FullYear|Active)|arch)|qrt|lice|avePreferences|mall)|h(?:ome|andleEvent)|navigate|c(?:har(?:CodeAt|At)|o(?:s|n(?:cat|textual|firm)|mpile)|eil|lear(?:Timeout|Interval)?|a(?:ptureEvents|ll)|reate(?:StyleSheet|Popup|EventObject))|t(?:o(?:GMTString|S(?:tring|ource)|U(?:TCString|pperCase)|Lo(?:caleString|werCase))|est|a(?:n|int(?:Enabled)?))|i(?:s(?:NaN|Finite)|ndexOf|talics)|d(?:isableExternalCapture|ump|etachEvent)|u(?:n(?:shift|taint|escape|watch)|pdateCommands)|j(?:oin|avaEnabled)|p(?:o(?:p|w)|ush|lugins.refresh|a(?:ddings|rse(?:Int|Float)?)|r(?:int|ompt|eference))|e(?:scape|nableExternalCapture|val|lementFromPoint|x(?:p|ec(?:Script|Command)?))|valueOf|UTC|queryCommand(?:State|Indeterm|Enabled|Value)|f(?:i(?:nd|le(?:ModifiedDate|Size|CreatedDate|UpdatedDate)|xed)|o(?:nt(?:size|color)|rward)|loor|romCharCode)|watch|l(?:ink|o(?:ad|g)|astIndexOf)|a(?:sin|nchor|cos|t(?:tachEvent|ob|an(?:2)?)|pply|lert|b(?:s|ort))|r(?:ou(?:nd|teEvents)|e(?:size(?:By|To)|calc|turnValue|place|verse|l(?:oad|ease(?:Capture|Events)))|andom)|g(?:o|et(?:ResponseHeader|M(?:i(?:nutes|lliseconds)|onth)|Se(?:conds|lection)|Hours|Year|Time(?:zoneOffset)?|Da(?:y|te)|UTC(?:M(?:i(?:nutes|lliseconds)|onth)|Seconds|Hours|Da(?:y|te)|FullYear)|FullYear|A(?:ttention|llResponseHeaders)))|m(?:in|ove(?:B(?:y|elow)|To(?:Absolute)?|Above)|ergeAttributes|a(?:tch|rgins|x))|b(?:toa|ig|o(?:ld|rderWidths)|link|ack))\b(?=\()/
-            }, {
-                token : ["punctuation.operator", "support.function.dom"],
-                regex : /(\.)(s(?:ub(?:stringData|mit)|plitText|e(?:t(?:NamedItem|Attribute(?:Node)?)|lect))|has(?:ChildNodes|Feature)|namedItem|c(?:l(?:ick|o(?:se|neNode))|reate(?:C(?:omment|DATASection|aption)|T(?:Head|extNode|Foot)|DocumentFragment|ProcessingInstruction|E(?:ntityReference|lement)|Attribute))|tabIndex|i(?:nsert(?:Row|Before|Cell|Data)|tem)|open|delete(?:Row|C(?:ell|aption)|T(?:Head|Foot)|Data)|focus|write(?:ln)?|a(?:dd|ppend(?:Child|Data))|re(?:set|place(?:Child|Data)|move(?:NamedItem|Child|Attribute(?:Node)?)?)|get(?:NamedItem|Element(?:sBy(?:Name|TagName)|ById)|Attribute(?:Node)?)|blur)\b(?=\()/
-            }, {
-                token : ["punctuation.operator", "support.constant"],
-                regex : /(\.)(s(?:ystemLanguage|cr(?:ipts|ollbars|een(?:X|Y|Top|Left))|t(?:yle(?:Sheets)?|atus(?:Text|bar)?)|ibling(?:Below|Above)|ource|uffixes|e(?:curity(?:Policy)?|l(?:ection|f)))|h(?:istory|ost(?:name)?|as(?:h|Focus))|y|X(?:MLDocument|SLDocument)|n(?:ext|ame(?:space(?:s|URI)|Prop))|M(?:IN_VALUE|AX_VALUE)|c(?:haracterSet|o(?:n(?:structor|trollers)|okieEnabled|lorDepth|mp(?:onents|lete))|urrent|puClass|l(?:i(?:p(?:boardData)?|entInformation)|osed|asses)|alle(?:e|r)|rypto)|t(?:o(?:olbar|p)|ext(?:Transform|Indent|Decoration|Align)|ags)|SQRT(?:1_2|2)|i(?:n(?:ner(?:Height|Width)|put)|ds|gnoreCase)|zIndex|o(?:scpu|n(?:readystatechange|Line)|uter(?:Height|Width)|p(?:sProfile|ener)|ffscreenBuffering)|NEGATIVE_INFINITY|d(?:i(?:splay|alog(?:Height|Top|Width|Left|Arguments)|rectories)|e(?:scription|fault(?:Status|Ch(?:ecked|arset)|View)))|u(?:ser(?:Profile|Language|Agent)|n(?:iqueID|defined)|pdateInterval)|_content|p(?:ixelDepth|ort|ersonalbar|kcs11|l(?:ugins|atform)|a(?:thname|dding(?:Right|Bottom|Top|Left)|rent(?:Window|Layer)?|ge(?:X(?:Offset)?|Y(?:Offset)?))|r(?:o(?:to(?:col|type)|duct(?:Sub)?|mpter)|e(?:vious|fix)))|e(?:n(?:coding|abledPlugin)|x(?:ternal|pando)|mbeds)|v(?:isibility|endor(?:Sub)?|Linkcolor)|URLUnencoded|P(?:I|OSITIVE_INFINITY)|f(?:ilename|o(?:nt(?:Size|Family|Weight)|rmName)|rame(?:s|Element)|gColor)|E|whiteSpace|l(?:i(?:stStyleType|n(?:eHeight|kColor))|o(?:ca(?:tion(?:bar)?|lName)|wsrc)|e(?:ngth|ft(?:Context)?)|a(?:st(?:M(?:odified|atch)|Index|Paren)|yer(?:s|X)|nguage))|a(?:pp(?:MinorVersion|Name|Co(?:deName|re)|Version)|vail(?:Height|Top|Width|Left)|ll|r(?:ity|guments)|Linkcolor|bove)|r(?:ight(?:Context)?|e(?:sponse(?:XML|Text)|adyState))|global|x|m(?:imeTypes|ultiline|enubar|argin(?:Right|Bottom|Top|Left))|L(?:N(?:10|2)|OG(?:10E|2E))|b(?:o(?:ttom|rder(?:Width|RightWidth|BottomWidth|Style|Color|TopWidth|LeftWidth))|ufferDepth|elow|ackground(?:Color|Image)))\b/
-            }, {
-                token : ["storage.type", "punctuation.operator", "support.function.firebug"],
-                regex : /(console)(\.)(warn|info|log|error|time|timeEnd|assert)\b/
-            }, {
-                token : function(value) {
-                    if (globals.hasOwnProperty(value))
-                        return "variable.language";
-                    else if (deprecated.hasOwnProperty(value))
-                        return "invalid.deprecated";
-                    else if (definitions.hasOwnProperty(value))
-                        return "storage.type";
-                    else if (keywords.hasOwnProperty(value))
-                        return "keyword";
-                    else if (buildinConstants.hasOwnProperty(value))
-                        return "constant.language";
-                    else if (futureReserved.hasOwnProperty(value))
-                        return "invalid.illegal";
-                    else if (value == "debugger")
-                        return "invalid.deprecated";
-                    else
-                        return "identifier";
-                },
-                regex : identifierRe
-            }, {
-                token : "keyword.operator",
-                regex : /!|\$|%|&|\*|\-\-|\-|\+\+|\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\|\||\?\:|\*=|%=|\+=|\-=|&=|\^=|\b(?:in|instanceof|new|delete|typeof|void)/,
-                next  : "regex_allowed"
-            }, {
-                token : "punctuation.operator",
-                regex : /\?|\:|\,|\;|\./,
-                next  : "regex_allowed"
-            }, {
-                token : "paren.lparen",
-                regex : /[\[({]/,
-                next  : "regex_allowed"
-            }, {
-                token : "paren.rparen",
-                regex : /[\])}]/
-            }, {
-                token : "keyword.operator",
-                regex : /\/=?/,
-                next  : "regex_allowed"
-            }, {
-                token: "comment",
-                regex: /^#!.*$/
-            }, {
-                token : "text",
-                regex : /\s+/
-            }
-        ],
-        // regular expressions are only allowed after certain tokens. This
-        // makes sure we don't mix up regexps with the divison operator
-        "regex_allowed": [
-            {
-                token : "comment", // multi line comment
-                merge : true,
-                regex : "\\/\\*",
-                next : "comment_regex_allowed"
-            }, {
-                token : "comment",
-                regex : "\\/\\/.*$"
-            }, {
-                token: "string.regexp",
-                regex: "\\/",
-                next: "regex",
-                merge: true
-            }, {
-                token : "text",
-                regex : "\\s+"
-            }, {
-                // immediately return to the start mode without matching
-                // anything
-                token: "empty",
-                regex: "",
-                next: "start"
-            }
-        ],
-        "regex": [
-            {
-                token: "regexp.keyword.operator",
-                regex: "\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)",
-                next: "regex"
-            }, {
-				// flag
-                token: "string.regexp",
-                regex: "/\\w*",
-                next: "start",
-                merge: true
-            }, {
-                token: "string.regexp",
-                regex: "[^\\\\/\\[]+",
-                next: "regex",
-                merge: true
-            }, {
-                token: "string.regexp.charachterclass",
-                regex: "\\[",
-                next: "regex_character_class",
-                merge: true
-            }, {
-                token: "empty",
-                regex: "",
-                next: "start"
-            }
-        ],
-        "regex_character_class": [
-            {
-                token: "regexp.keyword.operator",
-                regex: "\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)",
-                next: "regex_character_class"
-            }, {
-                token: "string.regexp.charachterclass",
-                regex: "]",
-                next: "regex",
-                merge: true
-            }, {
-                token: "string.regexp.charachterclass",
-                regex: "[^\\\\\\]]+",
-                next: "regex_character_class",
-                merge: true
-            }, {
-                token: "empty",
-                regex: "",
-                next: "start"
-            }
-        ],
-        "comment_regex_allowed" : [
-            {
-                token : "comment", // closing comment
-                regex : ".*?\\*\\/",
-                merge : true,
-                next : "regex_allowed"
-            }, {
-                token : "comment", // comment spanning whole line
-                merge : true,
-                regex : ".+"
-            }
-        ],
-        "comment" : [
-            {
-                token : "comment", // closing comment
-                regex : ".*?\\*\\/",
-                merge : true,
-                next : "start"
-            }, {
-                token : "comment", // comment spanning whole line
-                merge : true,
-                regex : ".+"
-            }
-        ],
-        "qqstring" : [
-            {
-                token : "constant.language.escape",
-                regex : escapedRe
-            }, {
-                token : "string",
-                regex : '[^"\\\\]+'
-            }, {
-                token : "string",
-                regex : '"',
-                next  : "start"
-            }
-        ],
-        "qstring" : [
-            {
-                token : "constant.language.escape",
-                regex : escapedRe
-            }, {
-                token : "string",
-                regex : "[^'\\\\]+"
-            }, {
-                token : "string",
-                regex : "'",
-                next  : "start"
-            }
-        ]
-    };
-
-    this.embedRules(DocCommentHighlightRules, "doc-",
-        [ new DocCommentHighlightRules().getEndRule("start") ]);
-};
-
-oop.inherits(JavaScriptHighlightRules, TextHighlightRules);
-
-exports.JavaScriptHighlightRules = JavaScriptHighlightRules;
-});
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/doc_comment_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-
-var DocCommentHighlightRules = function() {
-
-    this.$rules = {
-        "start" : [ {
-            token : "comment.doc.tag",
-            regex : "@[\\w\\d_]+" // TODO: fix email addresses
-        }, {
-            token : "comment.doc",
-            merge : true,
-            regex : "\\s+"
-        }, {
-            token : "comment.doc",
-            merge : true,
-            regex : "TODO"
-        }, {
-            token : "comment.doc",
-            merge : true,
-            regex : "[^@\\*]+"
-        }, {
-            token : "comment.doc",
-            merge : true,
-            regex : "."
-        }]
-    };
-};
-
-oop.inherits(DocCommentHighlightRules, TextHighlightRules);
-
-(function() {
-
-    this.getStartRule = function(start) {
-        return {
-            token : "comment.doc", // doc comment
-            merge : true,
-            regex : "\\/\\*(?=\\*)",
-            next  : start
-        };
-    };
-    
-    this.getEndRule = function (start) {
-        return {
-            token : "comment.doc", // closing comment
-            merge : true,
-            regex : "\\*\\/",
-            next  : start
-        };
-    };
-
-}).call(DocCommentHighlightRules.prototype);
-
-exports.DocCommentHighlightRules = DocCommentHighlightRules;
-
-});
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/matching_brace_outdent', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
-"use strict";
-
-var Range = require("../range").Range;
-
-var MatchingBraceOutdent = function() {};
-
-(function() {
-
-    this.checkOutdent = function(line, input) {
-        if (! /^\s+$/.test(line))
-            return false;
-
-        return /^\s*\}/.test(input);
-    };
-
-    this.autoOutdent = function(doc, row) {
-        var line = doc.getLine(row);
-        var match = line.match(/^(\s*\})/);
-
-        if (!match) return 0;
-
-        var column = match[1].length;
-        var openBracePos = doc.findMatchingBracket({row: row, column: column});
-
-        if (!openBracePos || openBracePos.row == row) return 0;
-
-        var indent = this.$getIndent(doc.getLine(openBracePos.row));
-        doc.replace(new Range(row, 0, row, column-1), indent);
-    };
-
-    this.$getIndent = function(line) {
-        var match = line.match(/^(\s+)/);
-        if (match) {
-            return match[1];
-        }
-
-        return "";
-    };
-
-}).call(MatchingBraceOutdent.prototype);
-
-exports.MatchingBraceOutdent = MatchingBraceOutdent;
-});
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/folding/cstyle', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/range', 'ace/mode/folding/fold_mode'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../../lib/oop");
-var Range = require("../../range").Range;
-var BaseFoldMode = require("./fold_mode").FoldMode;
-
-var FoldMode = exports.FoldMode = function() {};
-oop.inherits(FoldMode, BaseFoldMode);
-
-(function() {
-
-    this.foldingStartMarker = /(\{|\[)[^\}\]]*$|^\s*(\/\*)/;
-    this.foldingStopMarker = /^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/;
-    
-    this.getFoldWidgetRange = function(session, foldStyle, row) {
-        var line = session.getLine(row);
-        var match = line.match(this.foldingStartMarker);
-        if (match) {
-            var i = match.index;
-
-            if (match[1])
-                return this.openingBracketBlock(session, match[1], row, i);
-
-            var range = session.getCommentFoldRange(row, i + match[0].length);
-            range.end.column -= 2;
-            return range;
-        }
-
-        if (foldStyle !== "markbeginend")
-            return;
-            
-        var match = line.match(this.foldingStopMarker);
-        if (match) {
-            var i = match.index + match[0].length;
-
-            if (match[2]) {
-                var range = session.getCommentFoldRange(row, i);
-                range.end.column -= 2;
-                return range;
-            }
-
-            var end = {row: row, column: i};
-            var start = session.$findOpeningBracket(match[1], end);
-            
-            if (!start)
-                return;
-
-            start.column++;
-            end.column--;
-
-            return  Range.fromPoints(start, end);
-        }
-    };
-    
-}).call(FoldMode.prototype);
-
-});/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/css', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text', 'ace/tokenizer', 'ace/mode/css_highlight_rules', 'ace/mode/matching_brace_outdent', 'ace/worker/worker_client', 'ace/mode/folding/cstyle'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
-var CssHighlightRules = require("./css_highlight_rules").CssHighlightRules;
-var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
-var WorkerClient = require("../worker/worker_client").WorkerClient;
-var CStyleFoldMode = require("./folding/cstyle").FoldMode;
-
-var Mode = function() {
-    this.$tokenizer = new Tokenizer(new CssHighlightRules().getRules(), "i");
-    this.$outdent = new MatchingBraceOutdent();
-    this.foldingRules = new CStyleFoldMode();
-};
-oop.inherits(Mode, TextMode);
-
-(function() {
-
-    this.foldingRules = "cStyle";
-
-    this.getNextLineIndent = function(state, line, tab) {
-        var indent = this.$getIndent(line);
-
-        // ignore braces in comments
-        var tokens = this.$tokenizer.getLineTokens(line, state).tokens;
-        if (tokens.length && tokens[tokens.length-1].type == "comment") {
-            return indent;
-        }
-
-        var match = line.match(/^.*\{\s*$/);
-        if (match) {
-            indent += tab;
-        }
-
-        return indent;
-    };
-
-    this.checkOutdent = function(state, line, input) {
-        return this.$outdent.checkOutdent(line, input);
-    };
-
-    this.autoOutdent = function(state, doc, row) {
-        this.$outdent.autoOutdent(doc, row);
-    };
-    
-    this.createWorker = function(session) {
-        var worker = new WorkerClient(["ace"], "worker-css.js", "ace/mode/css_worker", "Worker");
-        worker.attachToDocument(session.getDocument());
-        
-        worker.on("csslint", function(e) {
-            var errors = [];
-            e.data.forEach(function(message) {
-                errors.push({
-                    row: message.line - 1,
-                    column: message.col - 1,
-                    text: message.message,
-                    type: message.type,
-                    lint: message
-                });
-            });
-            
-            session.setAnnotations(errors);
-        });
-        return worker;
-    };
-
-}).call(Mode.prototype);
-
-exports.Mode = Mode;
-
-});
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/css_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/lang', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var lang = require("../lib/lang");
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-
-var CssHighlightRules = function() {
-
-    var properties = lang.arrayToMap(
-        ("animation-fill-mode|alignment-adjust|alignment-baseline|animation-delay|animation-direction|animation-duration|animation-iteration-count|animation-name|animation-play-state|animation-timing-function|animation|appearance|azimuth|backface-visibility|background-attachment|background-break|background-clip|background-color|background-image|background-origin|background-position|background-repeat|background-size|background|baseline-shift|binding|bleed|bookmark-label|bookmark-level|bookmark-state|bookmark-target|border-bottom|border-bottom-color|border-bottom-left-radius|border-bottom-right-radius|border-bottom-style|border-bottom-width|border-collapse|border-color|border-image|border-image-outset|border-image-repeat|border-image-slice|border-image-source|border-image-width|border-left|border-left-color|border-left-style|border-left-width|border-radius|border-right|border-right-color|border-right-style|border-right-width|border-spacing|border-style|border-top|border-top-color|border-top-left-radius|border-top-right-radius|border-top-style|border-top-width|border-width|border|bottom|box-align|box-decoration-break|box-direction|box-flex-group|box-flex|box-lines|box-ordinal-group|box-orient|box-pack|box-shadow|box-sizing|break-after|break-before|break-inside|caption-side|clear|clip|color-profile|color|column-count|column-fill|column-gap|column-rule|column-rule-color|column-rule-style|column-rule-width|column-span|column-width|columns|content|counter-increment|counter-reset|crop|cue-after|cue-before|cue|cursor|direction|display|dominant-baseline|drop-initial-after-adjust|drop-initial-after-align|drop-initial-before-adjust|drop-initial-before-align|drop-initial-size|drop-initial-value|elevation|empty-cells|fit|fit-position|float-offset|float|font-family|font-size|font-size-adjust|font-stretch|font-style|font-variant|font-weight|font|grid-columns|grid-rows|hanging-punctuation|height|hyphenate-after|hyphenate-before|hyphenate-character|hyphenate-lines|hyphenate-resource|hyphens|icon|image-orientation|image-rendering|image-resolution|inline-box-align|left|letter-spacing|line-height|line-stacking-ruby|line-stacking-shift|line-stacking-strategy|line-stacking|list-style-image|list-style-position|list-style-type|list-style|margin-bottom|margin-left|margin-right|margin-top|margin|mark-after|mark-before|mark|marks|marquee-direction|marquee-play-count|marquee-speed|marquee-style|max-height|max-width|min-height|min-width|move-to|nav-down|nav-index|nav-left|nav-right|nav-up|opacity|orphans|outline-color|outline-offset|outline-style|outline-width|outline|overflow-style|overflow-x|overflow-y|overflow|padding-bottom|padding-left|padding-right|padding-top|padding|page-break-after|page-break-before|page-break-inside|page-policy|page|pause-after|pause-before|pause|perspective-origin|perspective|phonemes|pitch-range|pitch|play-during|position|presentation-level|punctuation-trim|quotes|rendering-intent|resize|rest-after|rest-before|rest|richness|right|rotation-point|rotation|ruby-align|ruby-overhang|ruby-position|ruby-span|size|speak-header|speak-numeral|speak-punctuation|speak|speech-rate|stress|string-set|table-layout|target-name|target-new|target-position|target|text-align-last|text-align|text-decoration|text-emphasis|text-height|text-indent|text-justify|text-outline|text-shadow|text-transform|text-wrap|top|transform-origin|transform-style|transform|transition-delay|transition-duration|transition-property|transition-timing-function|transition|unicode-bidi|vertical-align|visibility|voice-balance|voice-duration|voice-family|voice-pitch-range|voice-pitch|voice-rate|voice-stress|voice-volume|volume|white-space-collapse|white-space|widows|width|word-break|word-spacing|word-wrap|z-index").split("|")
-    );
-
-    var functions = lang.arrayToMap(
-        ("rgb|rgba|url|attr|counter|counters").split("|")
-    );
-
-    var constants = lang.arrayToMap(
-        ("absolute|after-edge|after|all-scroll|all|alphabetic|always|antialiased|armenian|auto|avoid-column|avoid-page|avoid|balance|baseline|before-edge|before|below|bidi-override|block-line-height|block|bold|bolder|border-box|both|bottom|box|break-all|break-word|capitalize|caps-height|caption|center|central|char|circle|cjk-ideographic|clone|close-quote|col-resize|collapse|column|consider-shifts|contain|content-box|cover|crosshair|cubic-bezier|dashed|decimal-leading-zero|decimal|default|disabled|disc|disregard-shifts|distribute-all-lines|distribute-letter|distribute-space|distribute|dotted|double|e-resize|ease-in|ease-in-out|ease-out|ease|ellipsis|end|exclude-ruby|fill|fixed|font-size|font|georgian|glyphs|grid-height|groove|hand|hanging|hebrew|help|hidden|hiragana-iroha|hiragana|horizontal|icon|ideograph-alpha|ideograph-numeric|ideograph-parenthesis|ideograph-space|ideographic|inactive|include-ruby|inherit|initial|inline-block|inline-box|inline-line-height|inline-table|inline|inset|inside|inter-ideograph|inter-word|invert|italic|justify|katakana-iroha|katakana|keep-all|last|left|lighter|line-edge|line-through|line|linear|list-item|local|loose|lower-alpha|lower-greek|lower-latin|lower-roman|lowercase|lr-tb|ltr|mathematical|max-height|max-size|medium|menu|message-box|middle|move|n-resize|ne-resize|newspaper|no-change|no-close-quote|no-drop|no-open-quote|no-repeat|none|normal|not-allowed|nowrap|nw-resize|oblique|open-quote|outset|outside|overline|padding-box|page|pointer|pre-line|pre-wrap|pre|preserve-3d|progress|relative|repeat-x|repeat-y|repeat|replaced|reset-size|ridge|right|round|row-resize|rtl|s-resize|scroll|se-resize|separate|slice|small-caps|small-caption|solid|space|square|start|static|status-bar|step-end|step-start|steps|stretch|strict|sub|super|sw-resize|table-caption|table-cell|table-column-group|table-column|table-footer-group|table-header-group|table-row-group|table-row|table|tb-rl|text-after-edge|text-before-edge|text-bottom|text-size|text-top|text|thick|thin|top|transparent|underline|upper-alpha|upper-latin|upper-roman|uppercase|use-script|vertical-ideographic|vertical-text|visible|w-resize|wait|whitespace|z-index|zero").split("|")
-    );
-
-    var colors = lang.arrayToMap(
-        ("aqua|black|blue|fuchsia|gray|green|lime|maroon|navy|olive|orange|" +
-        "purple|red|silver|teal|white|yellow").split("|")
-    );
-
-    var fonts = lang.arrayToMap(
-        ("arial|century|comic|courier|garamond|georgia|helvetica|impact|lucida|" +
-        "symbol|system|tahoma|times|trebuchet|utopia|verdana|webdings|sans-serif|" +
-        "serif|monospace").split("|")
-    );
-    
-    // regexp must not have capturing parentheses. Use (?:) instead.
-    // regexps are ordered -> the first match is used
-
-    var numRe = "\\-?(?:(?:[0-9]+)|(?:[0-9]*\\.[0-9]+))";
-    var pseudoElements = "(\\:+)\\b(after|before|first-letter|first-line|moz-selection|selection)\\b";
-    var pseudoClasses = "(:)\\b(active|checked|disabled|empty|enabled|first-child|first-of-type|focus|hover|indeterminate|invalid|last-child|last-of-type|link|not|nth-child|nth-last-child|nth-last-of-type|nth-of-type|only-child|only-of-type|required|root|target|valid|visited)\\b";
-    
-    var base_ruleset = [
-        {
-            token : "comment", // multi line comment
-            merge : true,
-            regex : "\\/\\*",
-            next : "ruleset_comment"
-        }, {
-            token : "string", // single line
-            regex : '["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'
-        }, {
-            token : "string", // single line
-            regex : "['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"
-        }, {
-            token : ["constant.numeric", "keyword"],
-            regex : "(" + numRe + ")(ch|cm|deg|em|ex|fr|gd|grad|Hz|in|kHz|mm|ms|pc|pt|px|rad|rem|s|turn|vh|vm|vw|%)"
-        }, {
-            token : ["constant.numeric"],
-            regex : "([0-9]+)"
-        }, {
-            token : "constant.numeric",  // hex6 color
-            regex : "#[a-f0-9]{6}"
-        }, {
-            token : "constant.numeric", // hex3 color
-            regex : "#[a-f0-9]{3}"
-        }, {
-            token : ["punctuation", "entity.other.attribute-name.pseudo-element.css"], 
-            regex : pseudoElements
-        }, {
-            token : ["punctuation", "entity.other.attribute-name.pseudo-class.css"], 
-            regex : pseudoClasses
-        }, {
-            token : function(value) {
-                if (properties.hasOwnProperty(value.toLowerCase())) {
-                    return "support.type";
-                }
-                else if (functions.hasOwnProperty(value.toLowerCase())) {
-                    return "support.function";
-                }
-                else if (constants.hasOwnProperty(value.toLowerCase())) {
-                    return "support.constant";
-                }
-                else if (colors.hasOwnProperty(value.toLowerCase())) {
-                    return "support.constant.color";
-                }
-                else if (fonts.hasOwnProperty(value.toLowerCase())) {
-                    return "support.constant.fonts";
-                }
-                else {
-                    return "text";
-                }
-            },
-            regex : "\\-?[a-zA-Z_][a-zA-Z0-9_\\-]*"
-        } 
-      ];
-
-    var ruleset = lang.copyArray(base_ruleset);
-    ruleset.unshift({
-        token : "paren.rparen",
-        regex : "\\}",
-        next:   "start"
-    });
-
-    var media_ruleset = lang.copyArray( base_ruleset );
-    media_ruleset.unshift({
-        token : "paren.rparen",
-        regex : "\\}",
-        next:   "media"
-    });
-
-    var base_comment = [{
-          token : "comment", // comment spanning whole line
-          merge : true,
-          regex : ".+"
-    }];
-
-    var comment = lang.copyArray(base_comment);
-    comment.unshift({
-          token : "comment", // closing comment
-          regex : ".*?\\*\\/",
-          next : "start"
-    });
-
-    var media_comment = lang.copyArray(base_comment);
-    media_comment.unshift({
-          token : "comment", // closing comment
-          regex : ".*?\\*\\/",
-          next : "media"
-    });
-
-    var ruleset_comment = lang.copyArray(base_comment);
-    ruleset_comment.unshift({
-          token : "comment", // closing comment
-          regex : ".*?\\*\\/",
-          next : "ruleset"
-    });
-
-    this.$rules = {
-        "start" : [{
-            token : "comment", // multi line comment
-            merge : true,
-            regex : "\\/\\*",
-            next : "comment"
-        }, {
-            token: "paren.lparen",
-            regex: "\\{",
-            next:  "ruleset"
-        }, {
-            token: "string",
-            regex: "@.*?{",
-            next:  "media"
-        },{
-            token: "keyword",
-            regex: "#[a-z0-9-_]+"
-        },{
-            token: "variable",
-            regex: "\\.[a-z0-9-_]+"
-        },{
-            token: "string",
-            regex: ":[a-z0-9-_]+"
-        },{
-            token: "constant",
-            regex: "[a-z0-9-_]+"
-        }],
-
-        "media" : [ {
-            token : "comment", // multi line comment
-            merge : true,
-            regex : "\\/\\*",
-            next : "media_comment"
-        }, {
-            token: "paren.lparen",
-            regex: "\\{",
-            next:  "media_ruleset"
-        },{
-            token: "string",
-            regex: "\\}",
-            next:  "start"
-        },{
-            token: "keyword",
-            regex: "#[a-z0-9-_]+"
-        },{
-            token: "variable",
-            regex: "\\.[a-z0-9-_]+"
-        },{
-            token: "string",
-            regex: ":[a-z0-9-_]+"
-        },{
-            token: "constant",
-            regex: "[a-z0-9-_]+"
-        }],
-
-        "comment" : comment,
-
-        "ruleset" : ruleset,
-        "ruleset_comment" : ruleset_comment,
-
-        "media_ruleset" : media_ruleset,
-        "media_comment" : media_comment
-    };
-};
-
-oop.inherits(CssHighlightRules, TextHighlightRules);
-
-exports.CssHighlightRules = CssHighlightRules;
-
-});
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/coldfusion_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/css_highlight_rules', 'ace/mode/javascript_highlight_rules', 'ace/mode/text_highlight_rules', 'ace/mode/xml_util'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var CssHighlightRules = require("./css_highlight_rules").CssHighlightRules;
-var JavaScriptHighlightRules = require("./javascript_highlight_rules").JavaScriptHighlightRules;
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-var xml_util = require("./xml_util");
-
-var ColdfusionHighlightRules = function() {
-
-    // regexp must not have capturing parentheses
-    // regexps are ordered -> the first match is used
-
-    this.$rules = {
-        start : [ {
-            token : "text",
-            merge : true,
-            regex : "<\\!\\[CDATA\\[",
-            next : "cdata"
-        }, {
-            token : "xml_pe",
-            regex : "<\\?.*?\\?>"
-        }, {
-            token : "comment",
-            merge : true,
-            regex : "<\\!--",
-            next : "comment"
-        }, {
-            token : "meta.tag",
-            regex : "<(?=\s*script)",
-            next : "script"
-        }, {
-            token : "meta.tag",
-            regex : "<(?=\s*style)",
-            next : "style"
-        }, {
-            token : "meta.tag", // opening tag
-            regex : "<\\/?",
-            next : "tag"
-        }, {
-            token : "text",
-            regex : "\\s+"
-        }, {
-            token : "text",
-            regex : "[^<]+"
-        } ],
-    
-        cdata : [ {
-            token : "text",
-            regex : "\\]\\]>",
-            next : "start"
-        }, {
-            token : "text",
-            merge : true,
-            regex : "\\s+"
-        }, {
-            token : "text",
-            merge : true,
-            regex : ".+"
-        } ],
-
-        comment : [ {
-            token : "comment",
-            regex : ".*?-->",
-            next : "start"
-        }, {
-            token : "comment",
-            merge : true,
-            regex : ".+"
-        } ]
-    };
-    
-    xml_util.tag(this.$rules, "tag", "start");
-    xml_util.tag(this.$rules, "style", "css-start");
-    xml_util.tag(this.$rules, "script", "js-start");
-    
-    this.embedRules(JavaScriptHighlightRules, "js-", [{
-        token: "comment",
-        regex: "\\/\\/.*(?=<\\/script>)",
-        next: "tag"
-    }, {
-        token: "meta.tag",
-        regex: "<\\/(?=script)",
-        next: "tag"
-    }]);
-    
-    this.embedRules(CssHighlightRules, "css-", [{
-        token: "meta.tag",
-        regex: "<\\/(?=style)",
-        next: "tag"
-    }]);
-};
-
-oop.inherits(ColdfusionHighlightRules, TextHighlightRules);
-
-exports.ColdfusionHighlightRules = ColdfusionHighlightRules;
-});
diff --git a/apps/files_texteditor/js/aceeditor/mode-coldfusion.js b/apps/files_texteditor/js/aceeditor/mode-coldfusion.js
deleted file mode 100644
index 7080a63534..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-coldfusion.js
+++ /dev/null
@@ -1 +0,0 @@
-define("ace/mode/coldfusion",["require","exports","module","ace/lib/oop","ace/mode/xml","ace/mode/javascript","ace/mode/css","ace/tokenizer","ace/mode/coldfusion_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./xml").Mode,f=a("./javascript").Mode,g=a("./css").Mode,h=a("../tokenizer").Tokenizer,i=a("./coldfusion_highlight_rules").ColdfusionHighlightRules,j=function(){e.call(this);var a=new i;this.$tokenizer=new h(a.getRules()),this.$embeds=a.getEmbeds(),this.createModeDelegates({"js-":f,"css-":g})};d.inherits(j,e),function(){this.getNextLineIndent=function(a,b,c){return this.$getIndent(b)}}.call(j.prototype),b.Mode=j}),define("ace/mode/xml",["require","exports","module","ace/lib/oop","ace/mode/text","ace/tokenizer","ace/mode/xml_highlight_rules","ace/mode/behaviour/xml","ace/mode/folding/xml"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text").Mode,f=a("../tokenizer").Tokenizer,g=a("./xml_highlight_rules").XmlHighlightRules,h=a("./behaviour/xml").XmlBehaviour,i=a("./folding/xml").FoldMode,j=function(){this.$tokenizer=new f((new g).getRules()),this.$behaviour=new h,this.foldingRules=new i};d.inherits(j,e),function(){this.getNextLineIndent=function(a,b,c){return this.$getIndent(b)}}.call(j.prototype),b.Mode=j}),define("ace/mode/xml_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/xml_util","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./xml_util"),f=a("./text_highlight_rules").TextHighlightRules,g=function(){this.$rules={start:[{token:"text",regex:"<\\!\\[CDATA\\[",next:"cdata"},{token:"xml_pe",regex:"<\\?.*?\\?>"},{token:"comment",merge:!0,regex:"<\\!--",next:"comment"},{token:"xml_pe",regex:"<\\!.*?>"},{token:"meta.tag",regex:"<\\/?",next:"tag"},{token:"text",regex:"\\s+"},{token:"constant.character.entity",regex:"(?:&#[0-9]+;)|(?:&#x[0-9a-fA-F]+;)|(?:&[a-zA-Z0-9_:\\.-]+;)"},{token:"text",regex:"[^<]+"}],cdata:[{token:"text",regex:"\\]\\]>",next:"start"},{token:"text",regex:"\\s+"},{token:"text",regex:"(?:[^\\]]|\\](?!\\]>))+"}],comment:[{token:"comment",regex:".*?-->",next:"start"},{token:"comment",merge:!0,regex:".+"}]},e.tag(this.$rules,"tag","start")};d.inherits(g,f),b.XmlHighlightRules=g}),define("ace/mode/xml_util",["require","exports","module","ace/lib/lang"],function(a,b,c){function g(a){return[{token:"string",regex:'".*?"'},{token:"string",merge:!0,regex:'["].*',next:a+"_qqstring"},{token:"string",regex:"'.*?'"},{token:"string",merge:!0,regex:"['].*",next:a+"_qstring"}]}function h(a,b){return[{token:"string",merge:!0,regex:".*?"+a,next:b},{token:"string",merge:!0,regex:".+"}]}"use strict";var d=a("../lib/lang"),e=d.arrayToMap("button|form|input|label|select|textarea".split("|")),f=d.arrayToMap("table|tbody|td|tfoot|th|tr".split("|"));b.tag=function(a,b,c){a[b]=[{token:"text",regex:"\\s+"},{token:function(a){return a==="a"?"meta.tag.anchor":a==="img"?"meta.tag.image":a==="script"?"meta.tag.script":a==="style"?"meta.tag.style":e.hasOwnProperty(a.toLowerCase())?"meta.tag.form":f.hasOwnProperty(a.toLowerCase())?"meta.tag.table":"meta.tag"},merge:!0,regex:"[-_a-zA-Z0-9:]+",next:b+"_embed_attribute_list"},{token:"empty",regex:"",next:b+"_embed_attribute_list"}],a[b+"_qstring"]=h("'",b+"_embed_attribute_list"),a[b+"_qqstring"]=h('"',b+"_embed_attribute_list"),a[b+"_embed_attribute_list"]=[{token:"meta.tag",merge:!0,regex:"/?>",next:c},{token:"keyword.operator",regex:"="},{token:"entity.other.attribute-name",regex:"[-_a-zA-Z0-9:]+"},{token:"constant.numeric",regex:"[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"},{token:"text",regex:"\\s+"}].concat(g(b))}}),define("ace/mode/behaviour/xml",["require","exports","module","ace/lib/oop","ace/mode/behaviour","ace/mode/behaviour/cstyle"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../behaviour").Behaviour,f=a("./cstyle").CstyleBehaviour,g=function(){this.inherit(f,["string_dquotes"]),this.add("brackets","insertion",function(a,b,c,d,e){if(e=="<"){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?!1:{text:"<>",selection:[1,1]}}if(e==">"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j==">")return{text:"",selection:[1,1]}}else if(e=="\n"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),k=i.substring(h.column,h.column+2);if(k=="</"){var l=this.$getIndent(d.doc.getLine(h.row))+d.getTabString(),m=this.$getIndent(d.doc.getLine(h.row));return{text:"\n"+l+"\n"+m,selection:[1,l.length,1,l.length]}}}})};d.inherits(g,e),b.XmlBehaviour=g}),define("ace/mode/behaviour/cstyle",["require","exports","module","ace/lib/oop","ace/mode/behaviour"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../behaviour").Behaviour,f=function(){this.add("braces","insertion",function(a,b,c,d,e){if(e=="{"){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"{"+g+"}",selection:!1}:{text:"{}",selection:[1,1]}}if(e=="}"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var k=d.$findOpeningBracket("}",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}else if(e=="\n"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var l=d.findMatchingBracket({row:h.row,column:h.column+1});if(!l)return null;var m=this.getNextLineIndent(a,i.substring(0,i.length-1),d.getTabString()),n=this.$getIndent(d.doc.getLine(l.row));return{text:"\n"+m+"\n"+n,selection:[1,m.length,1,m.length]}}}}),this.add("braces","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="{"){var g=d.doc.getLine(e.start.row),h=g.substring(e.end.column,e.end.column+1);if(h=="}")return e.end.column++,e}}),this.add("parens","insertion",function(a,b,c,d,e){if(e=="("){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"("+g+")",selection:!1}:{text:"()",selection:[1,1]}}if(e==")"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j==")"){var k=d.$findOpeningBracket(")",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}}),this.add("parens","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="("){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h==")")return e.end.column++,e}}),this.add("string_dquotes","insertion",function(a,b,c,d,e){if(e=='"'||e=="'"){var f=e,g=c.getSelectionRange(),h=d.doc.getTextRange(g);if(h!=="")return{text:f+h+f,selection:!1};var i=c.getCursorPosition(),j=d.doc.getLine(i.row),k=j.substring(i.column-1,i.column);if(k=="\\")return null;var l=d.getTokens(g.start.row,g.start.row)[0].tokens,m=0,n,o=-1;for(var p=0;p<l.length;p++){n=l[p],n.type=="string"?o=-1:o<0&&(o=n.value.indexOf(f));if(n.value.length+m>g.start.column)break;m+=l[p].value.length}if(!n||o<0&&n.type!=="comment"&&(n.type!=="string"||g.start.column!==n.value.length+m-1&&n.value.lastIndexOf(f)===n.value.length-1))return{text:f+f,selection:[1,1]};if(n&&n.type==="string"){var q=j.substring(i.column,i.column+1);if(q==f)return{text:"",selection:[1,1]}}}}),this.add("string_dquotes","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&(f=='"'||f=="'")){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h=='"')return e.end.column++,e}})};d.inherits(f,e),b.CstyleBehaviour=f}),define("ace/mode/folding/xml",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/range","ace/mode/folding/fold_mode","ace/token_iterator"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../../lib/lang"),f=a("../../range").Range,g=a("./fold_mode").FoldMode,h=a("../../token_iterator").TokenIterator,i=b.FoldMode=function(a){g.call(this),this.voidElements=a||{}};d.inherits(i,g),function(){this.getFoldWidget=function(a,b,c){var d=this._getFirstTagInLine(a,c);return d.closing?b=="markbeginend"?"end":"":!d.tagName||this.voidElements[d.tagName.toLowerCase()]?"":d.selfClosing?"":d.value.indexOf("/"+d.tagName)!==-1?"":"start"},this._getFirstTagInLine=function(a,b){var c=a.getTokens(b,b)[0].tokens,d="";for(var f=0;f<c.length;f++){var g=c[f];g.type.indexOf("meta.tag")===0?d+=g.value:d+=e.stringRepeat(" ",g.value.length)}return this._parseTag(d)},this.tagRe=/^(\s*)(<?(\/?)([-_a-zA-Z0-9:!]*)\s*(\/?)>?)/,this._parseTag=function(a){var b=this.tagRe.exec(a),c=this.tagRe.lastIndex||0;return this.tagRe.lastIndex=0,{value:a,match:b?b[2]:"",closing:b?!!b[3]:!1,selfClosing:b?!!b[5]||b[2]=="/>":!1,tagName:b?b[4]:"",column:b[1]?c+b[1].length:c}},this._readTagForward=function(a){var b=a.getCurrentToken();if(!b)return null;var c="",d;do if(b.type.indexOf("meta.tag")===0){if(!d)var d={row:a.getCurrentTokenRow(),column:a.getCurrentTokenColumn()};c+=b.value;if(c.indexOf(">")!==-1){var e=this._parseTag(c);return e.start=d,e.end={row:a.getCurrentTokenRow(),column:a.getCurrentTokenColumn()+b.value.length},a.stepForward(),e}}while(b=a.stepForward());return null},this._readTagBackward=function(a){var b=a.getCurrentToken();if(!b)return null;var c="",d;do if(b.type.indexOf("meta.tag")===0){d||(d={row:a.getCurrentTokenRow(),column:a.getCurrentTokenColumn()+b.value.length}),c=b.value+c;if(c.indexOf("<")!==-1){var e=this._parseTag(c);return e.end=d,e.start={row:a.getCurrentTokenRow(),column:a.getCurrentTokenColumn()},a.stepBackward(),e}}while(b=a.stepBackward());return null},this._pop=function(a,b){while(a.length){var c=a[a.length-1];if(!b||c.tagName==b.tagName)return a.pop();if(this.voidElements[b.tagName])return;if(this.voidElements[c.tagName]){a.pop();continue}return null}},this.getFoldWidgetRange=function(a,b,c){var d=this._getFirstTagInLine(a,c);if(!d.match)return null;var e=d.closing||d.selfClosing,g=[],i;if(!e){var j=new h(a,c,d.column),k={row:c,column:d.column+d.tagName.length+2};while(i=this._readTagForward(j)){if(i.selfClosing){if(!g.length)return i.start.column+=i.tagName.length+2,i.end.column-=2,f.fromPoints(i.start,i.end);continue}if(i.closing){this._pop(g,i);if(g.length==0)return f.fromPoints(k,i.start)}else g.push(i)}}else{var j=new h(a,c,d.column+d.match.length),l={row:c,column:d.column};while(i=this._readTagBackward(j)){if(i.selfClosing){if(!g.length)return i.start.column+=i.tagName.length+2,i.end.column-=2,f.fromPoints(i.start,i.end);continue}if(!i.closing){this._pop(g,i);if(g.length==0)return i.start.column+=i.tagName.length+2,f.fromPoints(i.start,l)}else g.push(i)}}}}.call(i.prototype)}),define("ace/mode/folding/fold_mode",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../../range").Range,e=b.FoldMode=function(){};(function(){this.foldingStartMarker=null,this.foldingStopMarker=null,this.getFoldWidget=function(a,b,c){var d=a.getLine(c);return this.foldingStartMarker.test(d)?"start":b=="markbeginend"&&this.foldingStopMarker&&this.foldingStopMarker.test(d)?"end":""},this.getFoldWidgetRange=function(a,b,c){return null},this.indentationBlock=function(a,b,c){var e=/^\s*/,f=b,g=b,h=a.getLine(b),i=c||h.length,j=h.match(e)[0].length,k=a.getLength();while(++b<k){h=a.getLine(b);var l=h.match(e)[0].length;if(l==h.length)continue;if(l<=j)break;g=b}if(g>f){var m=a.getLine(g).length;return new d(f,i,g,m)}},this.openingBracketBlock=function(a,b,c,e){var f={row:c,column:e+1},g=a.$findClosingBracket(b,f);if(!g)return;var h=a.foldWidgets[g.row];return h==null&&(h=this.getFoldWidget(a,g.row)),h=="start"&&(g.row--,g.column=a.getLine(g.row).length),d.fromPoints(f,g)}}).call(e.prototype)}),define("ace/mode/javascript",["require","exports","module","ace/lib/oop","ace/mode/text","ace/tokenizer","ace/mode/javascript_highlight_rules","ace/mode/matching_brace_outdent","ace/range","ace/worker/worker_client","ace/mode/behaviour/cstyle","ace/mode/folding/cstyle"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text").Mode,f=a("../tokenizer").Tokenizer,g=a("./javascript_highlight_rules").JavaScriptHighlightRules,h=a("./matching_brace_outdent").MatchingBraceOutdent,i=a("../range").Range,j=a("../worker/worker_client").WorkerClient,k=a("./behaviour/cstyle").CstyleBehaviour,l=a("./folding/cstyle").FoldMode,m=function(){this.$tokenizer=new f((new g).getRules()),this.$outdent=new h,this.$behaviour=new k,this.foldingRules=new l};d.inherits(m,e),function(){this.toggleCommentLines=function(a,b,c,d){var e=!0,f=/^(\s*)\/\//;for(var g=c;g<=d;g++)if(!f.test(b.getLine(g))){e=!1;break}if(e){var h=new i(0,0,0,0);for(var g=c;g<=d;g++){var j=b.getLine(g),k=j.match(f);h.start.row=g,h.end.row=g,h.end.column=k[0].length,b.replace(h,k[1])}}else b.indentRows(c,d,"//")},this.getNextLineIndent=function(a,b,c){var d=this.$getIndent(b),e=this.$tokenizer.getLineTokens(b,a),f=e.tokens,g=e.state;if(f.length&&f[f.length-1].type=="comment")return d;if(a=="start"||a=="regex_allowed"){var h=b.match(/^.*(?:\bcase\b.*\:|[\{\(\[])\s*$/);h&&(d+=c)}else if(a=="doc-start"){if(g=="start"||a=="regex_allowed")return"";var h=b.match(/^\s*(\/?)\*/);h&&(h[1]&&(d+=" "),d+="* ")}return d},this.checkOutdent=function(a,b,c){return this.$outdent.checkOutdent(b,c)},this.autoOutdent=function(a,b,c){this.$outdent.autoOutdent(b,c)},this.createWorker=function(a){var b=new j(["ace"],"worker-javascript.js","ace/mode/javascript_worker","JavaScriptWorker");return b.attachToDocument(a.getDocument()),b.on("jslint",function(b){var c=[];for(var d=0;d<b.data.length;d++){var e=b.data[d];e&&c.push({row:e.line-1,column:e.character-1,text:e.reason,type:"warning",lint:e})}a.setAnnotations(c)}),b.on("narcissus",function(b){a.setAnnotations([b.data])}),b.on("terminate",function(){a.clearAnnotations()}),b}}.call(m.prototype),b.Mode=m}),define("ace/mode/javascript_highlight_rules",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/unicode","ace/mode/doc_comment_highlight_rules","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("../lib/lang"),f=a("../unicode"),g=a("./doc_comment_highlight_rules").DocCommentHighlightRules,h=a("./text_highlight_rules").TextHighlightRules,i=function(){var a=e.arrayToMap("Array|Boolean|Date|Function|Iterator|Number|Object|RegExp|String|Proxy|Namespace|QName|XML|XMLList|ArrayBuffer|Float32Array|Float64Array|Int16Array|Int32Array|Int8Array|Uint16Array|Uint32Array|Uint8Array|Uint8ClampedArray|Error|EvalError|InternalError|RangeError|ReferenceError|StopIteration|SyntaxError|TypeError|URIError|decodeURI|decodeURIComponent|encodeURI|encodeURIComponent|eval|isFinite|isNaN|parseFloat|parseInt|JSON|Math|this|arguments|prototype|window|document".split("|")),b=e.arrayToMap("break|case|catch|continue|default|delete|do|else|finally|for|function|if|in|instanceof|new|return|switch|throw|try|typeof|let|var|while|with|const|yield|import|get|set".split("|")),c="case|do|else|finally|in|instanceof|return|throw|try|typeof|yield",d=e.arrayToMap("__parent__|__count__|escape|unescape|with|__proto__".split("|")),h=e.arrayToMap("const|let|var|function".split("|")),i=e.arrayToMap("null|Infinity|NaN|undefined".split("|")),j=e.arrayToMap("class|enum|extends|super|export|implements|private|public|interface|package|protected|static".split("|")),k="["+f.packages.L+"\\$_]["+f.packages.L+f.packages.Mn+f.packages.Mc+f.packages.Nd+f.packages.Pc+"\\$_]*\\b",l="\\\\(?:x[0-9a-fA-F]{2}|u[0-9a-fA-F]{4}|[0-2][0-7]{0,2}|3[0-6][0-7]?|37[0-7]?|[4-7][0-7]?|.)";this.$rules={start:[{token:"comment",regex:/\/\/.*$/},(new g).getStartRule("doc-start"),{token:"comment",merge:!0,regex:/\/\*/,next:"comment"},{token:"string",regex:"'",next:"qstring"},{token:"string",regex:'"',next:"qqstring"},{token:"constant.numeric",regex:/0[xX][0-9a-fA-F]+\b/},{token:"constant.numeric",regex:/[+-]?\d+(?:(?:\.\d*)?(?:[eE][+-]?\d+)?)?\b/},{token:["storage.type","punctuation.operator","support.function","punctuation.operator","entity.name.function","text","keyword.operator","text","storage.type","text","paren.lparen","variable.parameter","paren.rparen"],regex:"("+k+")(\\.)(prototype)(\\.)("+k+")(\\s*)(=)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"},{token:["storage.type","punctuation.operator","support.function","punctuation.operator","entity.name.function","text","keyword.operator","text"],regex:"("+k+")(\\.)(prototype)(\\.)("+k+")(\\s*)(=)(\\s*)"},{token:["storage.type","punctuation.operator","entity.name.function","text","keyword.operator","text","storage.type","text","paren.lparen","variable.parameter","paren.rparen"],regex:"("+k+")(\\.)("+k+")(\\s*)(=)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"},{token:["entity.name.function","text","keyword.operator","text","storage.type","text","paren.lparen","variable.parameter","paren.rparen"],regex:"("+k+")(\\s*)(=)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"},{token:["storage.type","text","entity.name.function","text","paren.lparen","variable.parameter","paren.rparen"],regex:"(function)(\\s+)("+k+")(\\s*)(\\()(.*?)(\\))"},{token:["entity.name.function","text","punctuation.operator","text","storage.type","text","paren.lparen","variable.parameter","paren.rparen"],regex:"("+k+")(\\s*)(:)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"},{token:["text","text","storage.type","text","paren.lparen","variable.parameter","paren.rparen"],regex:"(:)(\\s*)(function)?(\\s*)(\\()([^)]*)(\\))"},{token:"constant.language.boolean",regex:/(?:true|false)\b/},{token:"keyword",regex:"(?:"+c+")\\b",next:"regex_allowed"},{token:["punctuation.operator","support.function"],regex:/(\.)(s(?:h(?:ift|ow(?:Mod(?:elessDialog|alDialog)|Help))|croll(?:X|By(?:Pages|Lines)?|Y|To)?|t(?:opzzzz|rike)|i(?:n|zeToContent|debar|gnText)|ort|u(?:p|b(?:str(?:ing)?)?)|pli(?:ce|t)|e(?:nd|t(?:Re(?:sizable|questHeader)|M(?:i(?:nutes|lliseconds)|onth)|Seconds|Ho(?:tKeys|urs)|Year|Cursor|Time(?:out)?|Interval|ZOptions|Date|UTC(?:M(?:i(?:nutes|lliseconds)|onth)|Seconds|Hours|Date|FullYear)|FullYear|Active)|arch)|qrt|lice|avePreferences|mall)|h(?:ome|andleEvent)|navigate|c(?:har(?:CodeAt|At)|o(?:s|n(?:cat|textual|firm)|mpile)|eil|lear(?:Timeout|Interval)?|a(?:ptureEvents|ll)|reate(?:StyleSheet|Popup|EventObject))|t(?:o(?:GMTString|S(?:tring|ource)|U(?:TCString|pperCase)|Lo(?:caleString|werCase))|est|a(?:n|int(?:Enabled)?))|i(?:s(?:NaN|Finite)|ndexOf|talics)|d(?:isableExternalCapture|ump|etachEvent)|u(?:n(?:shift|taint|escape|watch)|pdateCommands)|j(?:oin|avaEnabled)|p(?:o(?:p|w)|ush|lugins.refresh|a(?:ddings|rse(?:Int|Float)?)|r(?:int|ompt|eference))|e(?:scape|nableExternalCapture|val|lementFromPoint|x(?:p|ec(?:Script|Command)?))|valueOf|UTC|queryCommand(?:State|Indeterm|Enabled|Value)|f(?:i(?:nd|le(?:ModifiedDate|Size|CreatedDate|UpdatedDate)|xed)|o(?:nt(?:size|color)|rward)|loor|romCharCode)|watch|l(?:ink|o(?:ad|g)|astIndexOf)|a(?:sin|nchor|cos|t(?:tachEvent|ob|an(?:2)?)|pply|lert|b(?:s|ort))|r(?:ou(?:nd|teEvents)|e(?:size(?:By|To)|calc|turnValue|place|verse|l(?:oad|ease(?:Capture|Events)))|andom)|g(?:o|et(?:ResponseHeader|M(?:i(?:nutes|lliseconds)|onth)|Se(?:conds|lection)|Hours|Year|Time(?:zoneOffset)?|Da(?:y|te)|UTC(?:M(?:i(?:nutes|lliseconds)|onth)|Seconds|Hours|Da(?:y|te)|FullYear)|FullYear|A(?:ttention|llResponseHeaders)))|m(?:in|ove(?:B(?:y|elow)|To(?:Absolute)?|Above)|ergeAttributes|a(?:tch|rgins|x))|b(?:toa|ig|o(?:ld|rderWidths)|link|ack))\b(?=\()/},{token:["punctuation.operator","support.function.dom"],regex:/(\.)(s(?:ub(?:stringData|mit)|plitText|e(?:t(?:NamedItem|Attribute(?:Node)?)|lect))|has(?:ChildNodes|Feature)|namedItem|c(?:l(?:ick|o(?:se|neNode))|reate(?:C(?:omment|DATASection|aption)|T(?:Head|extNode|Foot)|DocumentFragment|ProcessingInstruction|E(?:ntityReference|lement)|Attribute))|tabIndex|i(?:nsert(?:Row|Before|Cell|Data)|tem)|open|delete(?:Row|C(?:ell|aption)|T(?:Head|Foot)|Data)|focus|write(?:ln)?|a(?:dd|ppend(?:Child|Data))|re(?:set|place(?:Child|Data)|move(?:NamedItem|Child|Attribute(?:Node)?)?)|get(?:NamedItem|Element(?:sBy(?:Name|TagName)|ById)|Attribute(?:Node)?)|blur)\b(?=\()/},{token:["punctuation.operator","support.constant"],regex:/(\.)(s(?:ystemLanguage|cr(?:ipts|ollbars|een(?:X|Y|Top|Left))|t(?:yle(?:Sheets)?|atus(?:Text|bar)?)|ibling(?:Below|Above)|ource|uffixes|e(?:curity(?:Policy)?|l(?:ection|f)))|h(?:istory|ost(?:name)?|as(?:h|Focus))|y|X(?:MLDocument|SLDocument)|n(?:ext|ame(?:space(?:s|URI)|Prop))|M(?:IN_VALUE|AX_VALUE)|c(?:haracterSet|o(?:n(?:structor|trollers)|okieEnabled|lorDepth|mp(?:onents|lete))|urrent|puClass|l(?:i(?:p(?:boardData)?|entInformation)|osed|asses)|alle(?:e|r)|rypto)|t(?:o(?:olbar|p)|ext(?:Transform|Indent|Decoration|Align)|ags)|SQRT(?:1_2|2)|i(?:n(?:ner(?:Height|Width)|put)|ds|gnoreCase)|zIndex|o(?:scpu|n(?:readystatechange|Line)|uter(?:Height|Width)|p(?:sProfile|ener)|ffscreenBuffering)|NEGATIVE_INFINITY|d(?:i(?:splay|alog(?:Height|Top|Width|Left|Arguments)|rectories)|e(?:scription|fault(?:Status|Ch(?:ecked|arset)|View)))|u(?:ser(?:Profile|Language|Agent)|n(?:iqueID|defined)|pdateInterval)|_content|p(?:ixelDepth|ort|ersonalbar|kcs11|l(?:ugins|atform)|a(?:thname|dding(?:Right|Bottom|Top|Left)|rent(?:Window|Layer)?|ge(?:X(?:Offset)?|Y(?:Offset)?))|r(?:o(?:to(?:col|type)|duct(?:Sub)?|mpter)|e(?:vious|fix)))|e(?:n(?:coding|abledPlugin)|x(?:ternal|pando)|mbeds)|v(?:isibility|endor(?:Sub)?|Linkcolor)|URLUnencoded|P(?:I|OSITIVE_INFINITY)|f(?:ilename|o(?:nt(?:Size|Family|Weight)|rmName)|rame(?:s|Element)|gColor)|E|whiteSpace|l(?:i(?:stStyleType|n(?:eHeight|kColor))|o(?:ca(?:tion(?:bar)?|lName)|wsrc)|e(?:ngth|ft(?:Context)?)|a(?:st(?:M(?:odified|atch)|Index|Paren)|yer(?:s|X)|nguage))|a(?:pp(?:MinorVersion|Name|Co(?:deName|re)|Version)|vail(?:Height|Top|Width|Left)|ll|r(?:ity|guments)|Linkcolor|bove)|r(?:ight(?:Context)?|e(?:sponse(?:XML|Text)|adyState))|global|x|m(?:imeTypes|ultiline|enubar|argin(?:Right|Bottom|Top|Left))|L(?:N(?:10|2)|OG(?:10E|2E))|b(?:o(?:ttom|rder(?:Width|RightWidth|BottomWidth|Style|Color|TopWidth|LeftWidth))|ufferDepth|elow|ackground(?:Color|Image)))\b/},{token:["storage.type","punctuation.operator","support.function.firebug"],regex:/(console)(\.)(warn|info|log|error|time|timeEnd|assert)\b/},{token:function(c){return a.hasOwnProperty(c)?"variable.language":d.hasOwnProperty(c)?"invalid.deprecated":h.hasOwnProperty(c)?"storage.type":b.hasOwnProperty(c)?"keyword":i.hasOwnProperty(c)?"constant.language":j.hasOwnProperty(c)?"invalid.illegal":c=="debugger"?"invalid.deprecated":"identifier"},regex:k},{token:"keyword.operator",regex:/!|\$|%|&|\*|\-\-|\-|\+\+|\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\|\||\?\:|\*=|%=|\+=|\-=|&=|\^=|\b(?:in|instanceof|new|delete|typeof|void)/,next:"regex_allowed"},{token:"punctuation.operator",regex:/\?|\:|\,|\;|\./,next:"regex_allowed"},{token:"paren.lparen",regex:/[\[({]/,next:"regex_allowed"},{token:"paren.rparen",regex:/[\])}]/},{token:"keyword.operator",regex:/\/=?/,next:"regex_allowed"},{token:"comment",regex:/^#!.*$/},{token:"text",regex:/\s+/}],regex_allowed:[{token:"comment",merge:!0,regex:"\\/\\*",next:"comment_regex_allowed"},{token:"comment",regex:"\\/\\/.*$"},{token:"string.regexp",regex:"\\/",next:"regex",merge:!0},{token:"text",regex:"\\s+"},{token:"empty",regex:"",next:"start"}],regex:[{token:"regexp.keyword.operator",regex:"\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)",next:"regex"},{token:"string.regexp",regex:"/\\w*",next:"start",merge:!0},{token:"string.regexp",regex:"[^\\\\/\\[]+",next:"regex",merge:!0},{token:"string.regexp.charachterclass",regex:"\\[",next:"regex_character_class",merge:!0},{token:"empty",regex:"",next:"start"}],regex_character_class:[{token:"regexp.keyword.operator",regex:"\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)",next:"regex_character_class"},{token:"string.regexp.charachterclass",regex:"]",next:"regex",merge:!0},{token:"string.regexp.charachterclass",regex:"[^\\\\\\]]+",next:"regex_character_class",merge:!0},{token:"empty",regex:"",next:"start"}],comment_regex_allowed:[{token:"comment",regex:".*?\\*\\/",merge:!0,next:"regex_allowed"},{token:"comment",merge:!0,regex:".+"}],comment:[{token:"comment",regex:".*?\\*\\/",merge:!0,next:"start"},{token:"comment",merge:!0,regex:".+"}],qqstring:[{token:"constant.language.escape",regex:l},{token:"string",regex:'[^"\\\\]+'},{token:"string",regex:'"',next:"start"}],qstring:[{token:"constant.language.escape",regex:l},{token:"string",regex:"[^'\\\\]+"},{token:"string",regex:"'",next:"start"}]},this.embedRules(g,"doc-",[(new g).getEndRule("start")])};d.inherits(i,h),b.JavaScriptHighlightRules=i}),define("ace/mode/doc_comment_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text_highlight_rules").TextHighlightRules,f=function(){this.$rules={start:[{token:"comment.doc.tag",regex:"@[\\w\\d_]+"},{token:"comment.doc",merge:!0,regex:"\\s+"},{token:"comment.doc",merge:!0,regex:"TODO"},{token:"comment.doc",merge:!0,regex:"[^@\\*]+"},{token:"comment.doc",merge:!0,regex:"."}]}};d.inherits(f,e),function(){this.getStartRule=function(a){return{token:"comment.doc",merge:!0,regex:"\\/\\*(?=\\*)",next:a}},this.getEndRule=function(a){return{token:"comment.doc",merge:!0,regex:"\\*\\/",next:a}}}.call(f.prototype),b.DocCommentHighlightRules=f}),define("ace/mode/matching_brace_outdent",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../range").Range,e=function(){};(function(){this.checkOutdent=function(a,b){return/^\s+$/.test(a)?/^\s*\}/.test(b):!1},this.autoOutdent=function(a,b){var c=a.getLine(b),e=c.match(/^(\s*\})/);if(!e)return 0;var f=e[1].length,g=a.findMatchingBracket({row:b,column:f});if(!g||g.row==b)return 0;var h=this.$getIndent(a.getLine(g.row));a.replace(new d(b,0,b,f-1),h)},this.$getIndent=function(a){var b=a.match(/^(\s+)/);return b?b[1]:""}}).call(e.prototype),b.MatchingBraceOutdent=e}),define("ace/mode/folding/cstyle",["require","exports","module","ace/lib/oop","ace/range","ace/mode/folding/fold_mode"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../../range").Range,f=a("./fold_mode").FoldMode,g=b.FoldMode=function(){};d.inherits(g,f),function(){this.foldingStartMarker=/(\{|\[)[^\}\]]*$|^\s*(\/\*)/,this.foldingStopMarker=/^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/,this.getFoldWidgetRange=function(a,b,c){var d=a.getLine(c),f=d.match(this.foldingStartMarker);if(f){var g=f.index;if(f[1])return this.openingBracketBlock(a,f[1],c,g);var h=a.getCommentFoldRange(c,g+f[0].length);return h.end.column-=2,h}if(b!=="markbeginend")return;var f=d.match(this.foldingStopMarker);if(f){var g=f.index+f[0].length;if(f[2]){var h=a.getCommentFoldRange(c,g);return h.end.column-=2,h}var i={row:c,column:g},j=a.$findOpeningBracket(f[1],i);if(!j)return;return j.column++,i.column--,e.fromPoints(j,i)}}}.call(g.prototype)}),define("ace/mode/css",["require","exports","module","ace/lib/oop","ace/mode/text","ace/tokenizer","ace/mode/css_highlight_rules","ace/mode/matching_brace_outdent","ace/worker/worker_client","ace/mode/folding/cstyle"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text").Mode,f=a("../tokenizer").Tokenizer,g=a("./css_highlight_rules").CssHighlightRules,h=a("./matching_brace_outdent").MatchingBraceOutdent,i=a("../worker/worker_client").WorkerClient,j=a("./folding/cstyle").FoldMode,k=function(){this.$tokenizer=new f((new g).getRules(),"i"),this.$outdent=new h,this.foldingRules=new j};d.inherits(k,e),function(){this.foldingRules="cStyle",this.getNextLineIndent=function(a,b,c){var d=this.$getIndent(b),e=this.$tokenizer.getLineTokens(b,a).tokens;if(e.length&&e[e.length-1].type=="comment")return d;var f=b.match(/^.*\{\s*$/);return f&&(d+=c),d},this.checkOutdent=function(a,b,c){return this.$outdent.checkOutdent(b,c)},this.autoOutdent=function(a,b,c){this.$outdent.autoOutdent(b,c)},this.createWorker=function(a){var b=new i(["ace"],"worker-css.js","ace/mode/css_worker","Worker");return b.attachToDocument(a.getDocument()),b.on("csslint",function(b){var c=[];b.data.forEach(function(a){c.push({row:a.line-1,column:a.col-1,text:a.message,type:a.type,lint:a})}),a.setAnnotations(c)}),b}}.call(k.prototype),b.Mode=k}),define("ace/mode/css_highlight_rules",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("../lib/lang"),f=a("./text_highlight_rules").TextHighlightRules,g=function(){var a=e.arrayToMap("animation-fill-mode|alignment-adjust|alignment-baseline|animation-delay|animation-direction|animation-duration|animation-iteration-count|animation-name|animation-play-state|animation-timing-function|animation|appearance|azimuth|backface-visibility|background-attachment|background-break|background-clip|background-color|background-image|background-origin|background-position|background-repeat|background-size|background|baseline-shift|binding|bleed|bookmark-label|bookmark-level|bookmark-state|bookmark-target|border-bottom|border-bottom-color|border-bottom-left-radius|border-bottom-right-radius|border-bottom-style|border-bottom-width|border-collapse|border-color|border-image|border-image-outset|border-image-repeat|border-image-slice|border-image-source|border-image-width|border-left|border-left-color|border-left-style|border-left-width|border-radius|border-right|border-right-color|border-right-style|border-right-width|border-spacing|border-style|border-top|border-top-color|border-top-left-radius|border-top-right-radius|border-top-style|border-top-width|border-width|border|bottom|box-align|box-decoration-break|box-direction|box-flex-group|box-flex|box-lines|box-ordinal-group|box-orient|box-pack|box-shadow|box-sizing|break-after|break-before|break-inside|caption-side|clear|clip|color-profile|color|column-count|column-fill|column-gap|column-rule|column-rule-color|column-rule-style|column-rule-width|column-span|column-width|columns|content|counter-increment|counter-reset|crop|cue-after|cue-before|cue|cursor|direction|display|dominant-baseline|drop-initial-after-adjust|drop-initial-after-align|drop-initial-before-adjust|drop-initial-before-align|drop-initial-size|drop-initial-value|elevation|empty-cells|fit|fit-position|float-offset|float|font-family|font-size|font-size-adjust|font-stretch|font-style|font-variant|font-weight|font|grid-columns|grid-rows|hanging-punctuation|height|hyphenate-after|hyphenate-before|hyphenate-character|hyphenate-lines|hyphenate-resource|hyphens|icon|image-orientation|image-rendering|image-resolution|inline-box-align|left|letter-spacing|line-height|line-stacking-ruby|line-stacking-shift|line-stacking-strategy|line-stacking|list-style-image|list-style-position|list-style-type|list-style|margin-bottom|margin-left|margin-right|margin-top|margin|mark-after|mark-before|mark|marks|marquee-direction|marquee-play-count|marquee-speed|marquee-style|max-height|max-width|min-height|min-width|move-to|nav-down|nav-index|nav-left|nav-right|nav-up|opacity|orphans|outline-color|outline-offset|outline-style|outline-width|outline|overflow-style|overflow-x|overflow-y|overflow|padding-bottom|padding-left|padding-right|padding-top|padding|page-break-after|page-break-before|page-break-inside|page-policy|page|pause-after|pause-before|pause|perspective-origin|perspective|phonemes|pitch-range|pitch|play-during|position|presentation-level|punctuation-trim|quotes|rendering-intent|resize|rest-after|rest-before|rest|richness|right|rotation-point|rotation|ruby-align|ruby-overhang|ruby-position|ruby-span|size|speak-header|speak-numeral|speak-punctuation|speak|speech-rate|stress|string-set|table-layout|target-name|target-new|target-position|target|text-align-last|text-align|text-decoration|text-emphasis|text-height|text-indent|text-justify|text-outline|text-shadow|text-transform|text-wrap|top|transform-origin|transform-style|transform|transition-delay|transition-duration|transition-property|transition-timing-function|transition|unicode-bidi|vertical-align|visibility|voice-balance|voice-duration|voice-family|voice-pitch-range|voice-pitch|voice-rate|voice-stress|voice-volume|volume|white-space-collapse|white-space|widows|width|word-break|word-spacing|word-wrap|z-index".split("|")),b=e.arrayToMap("rgb|rgba|url|attr|counter|counters".split("|")),c=e.arrayToMap("absolute|after-edge|after|all-scroll|all|alphabetic|always|antialiased|armenian|auto|avoid-column|avoid-page|avoid|balance|baseline|before-edge|before|below|bidi-override|block-line-height|block|bold|bolder|border-box|both|bottom|box|break-all|break-word|capitalize|caps-height|caption|center|central|char|circle|cjk-ideographic|clone|close-quote|col-resize|collapse|column|consider-shifts|contain|content-box|cover|crosshair|cubic-bezier|dashed|decimal-leading-zero|decimal|default|disabled|disc|disregard-shifts|distribute-all-lines|distribute-letter|distribute-space|distribute|dotted|double|e-resize|ease-in|ease-in-out|ease-out|ease|ellipsis|end|exclude-ruby|fill|fixed|font-size|font|georgian|glyphs|grid-height|groove|hand|hanging|hebrew|help|hidden|hiragana-iroha|hiragana|horizontal|icon|ideograph-alpha|ideograph-numeric|ideograph-parenthesis|ideograph-space|ideographic|inactive|include-ruby|inherit|initial|inline-block|inline-box|inline-line-height|inline-table|inline|inset|inside|inter-ideograph|inter-word|invert|italic|justify|katakana-iroha|katakana|keep-all|last|left|lighter|line-edge|line-through|line|linear|list-item|local|loose|lower-alpha|lower-greek|lower-latin|lower-roman|lowercase|lr-tb|ltr|mathematical|max-height|max-size|medium|menu|message-box|middle|move|n-resize|ne-resize|newspaper|no-change|no-close-quote|no-drop|no-open-quote|no-repeat|none|normal|not-allowed|nowrap|nw-resize|oblique|open-quote|outset|outside|overline|padding-box|page|pointer|pre-line|pre-wrap|pre|preserve-3d|progress|relative|repeat-x|repeat-y|repeat|replaced|reset-size|ridge|right|round|row-resize|rtl|s-resize|scroll|se-resize|separate|slice|small-caps|small-caption|solid|space|square|start|static|status-bar|step-end|step-start|steps|stretch|strict|sub|super|sw-resize|table-caption|table-cell|table-column-group|table-column|table-footer-group|table-header-group|table-row-group|table-row|table|tb-rl|text-after-edge|text-before-edge|text-bottom|text-size|text-top|text|thick|thin|top|transparent|underline|upper-alpha|upper-latin|upper-roman|uppercase|use-script|vertical-ideographic|vertical-text|visible|w-resize|wait|whitespace|z-index|zero".split("|")),d=e.arrayToMap("aqua|black|blue|fuchsia|gray|green|lime|maroon|navy|olive|orange|purple|red|silver|teal|white|yellow".split("|")),f=e.arrayToMap("arial|century|comic|courier|garamond|georgia|helvetica|impact|lucida|symbol|system|tahoma|times|trebuchet|utopia|verdana|webdings|sans-serif|serif|monospace".split("|")),g="\\-?(?:(?:[0-9]+)|(?:[0-9]*\\.[0-9]+))",h="(\\:+)\\b(after|before|first-letter|first-line|moz-selection|selection)\\b",i="(:)\\b(active|checked|disabled|empty|enabled|first-child|first-of-type|focus|hover|indeterminate|invalid|last-child|last-of-type|link|not|nth-child|nth-last-child|nth-last-of-type|nth-of-type|only-child|only-of-type|required|root|target|valid|visited)\\b",j=[{token:"comment",merge:!0,regex:"\\/\\*",next:"ruleset_comment"},{token:"string",regex:'["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'},{token:"string",regex:"['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"},{token:["constant.numeric","keyword"],regex:"("+g+")(ch|cm|deg|em|ex|fr|gd|grad|Hz|in|kHz|mm|ms|pc|pt|px|rad|rem|s|turn|vh|vm|vw|%)"},{token:["constant.numeric"],regex:"([0-9]+)"},{token:"constant.numeric",regex:"#[a-f0-9]{6}"},{token:"constant.numeric",regex:"#[a-f0-9]{3}"},{token:["punctuation","entity.other.attribute-name.pseudo-element.css"],regex:h},{token:["punctuation","entity.other.attribute-name.pseudo-class.css"],regex:i},{token:function(e){return a.hasOwnProperty(e.toLowerCase())?"support.type":b.hasOwnProperty(e.toLowerCase())?"support.function":c.hasOwnProperty(e.toLowerCase())?"support.constant":d.hasOwnProperty(e.toLowerCase())?"support.constant.color":f.hasOwnProperty(e.toLowerCase())?"support.constant.fonts":"text"},regex:"\\-?[a-zA-Z_][a-zA-Z0-9_\\-]*"}],k=e.copyArray(j);k.unshift({token:"paren.rparen",regex:"\\}",next:"start"});var l=e.copyArray(j);l.unshift({token:"paren.rparen",regex:"\\}",next:"media"});var m=[{token:"comment",merge:!0,regex:".+"}],n=e.copyArray(m);n.unshift({token:"comment",regex:".*?\\*\\/",next:"start"});var o=e.copyArray(m);o.unshift({token:"comment",regex:".*?\\*\\/",next:"media"});var p=e.copyArray(m);p.unshift({token:"comment",regex:".*?\\*\\/",next:"ruleset"}),this.$rules={start:[{token:"comment",merge:!0,regex:"\\/\\*",next:"comment"},{token:"paren.lparen",regex:"\\{",next:"ruleset"},{token:"string",regex:"@.*?{",next:"media"},{token:"keyword",regex:"#[a-z0-9-_]+"},{token:"variable",regex:"\\.[a-z0-9-_]+"},{token:"string",regex:":[a-z0-9-_]+"},{token:"constant",regex:"[a-z0-9-_]+"}],media:[{token:"comment",merge:!0,regex:"\\/\\*",next:"media_comment"},{token:"paren.lparen",regex:"\\{",next:"media_ruleset"},{token:"string",regex:"\\}",next:"start"},{token:"keyword",regex:"#[a-z0-9-_]+"},{token:"variable",regex:"\\.[a-z0-9-_]+"},{token:"string",regex:":[a-z0-9-_]+"},{token:"constant",regex:"[a-z0-9-_]+"}],comment:n,ruleset:k,ruleset_comment:p,media_ruleset:l,media_comment:o}};d.inherits(g,f),b.CssHighlightRules=g}),define("ace/mode/coldfusion_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/css_highlight_rules","ace/mode/javascript_highlight_rules","ace/mode/text_highlight_rules","ace/mode/xml_util"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./css_highlight_rules").CssHighlightRules,f=a("./javascript_highlight_rules").JavaScriptHighlightRules,g=a("./text_highlight_rules").TextHighlightRules,h=a("./xml_util"),i=function(){this.$rules={start:[{token:"text",merge:!0,regex:"<\\!\\[CDATA\\[",next:"cdata"},{token:"xml_pe",regex:"<\\?.*?\\?>"},{token:"comment",merge:!0,regex:"<\\!--",next:"comment"},{token:"meta.tag",regex:"<(?=s*script)",next:"script"},{token:"meta.tag",regex:"<(?=s*style)",next:"style"},{token:"meta.tag",regex:"<\\/?",next:"tag"},{token:"text",regex:"\\s+"},{token:"text",regex:"[^<]+"}],cdata:[{token:"text",regex:"\\]\\]>",next:"start"},{token:"text",merge:!0,regex:"\\s+"},{token:"text",merge:!0,regex:".+"}],comment:[{token:"comment",regex:".*?-->",next:"start"},{token:"comment",merge:!0,regex:".+"}]},h.tag(this.$rules,"tag","start"),h.tag(this.$rules,"style","css-start"),h.tag(this.$rules,"script","js-start"),this.embedRules(f,"js-",[{token:"comment",regex:"\\/\\/.*(?=<\\/script>)",next:"tag"},{token:"meta.tag",regex:"<\\/(?=script)",next:"tag"}]),this.embedRules(e,"css-",[{token:"meta.tag",regex:"<\\/(?=style)",next:"tag"}])};d.inherits(i,g),b.ColdfusionHighlightRules=i})
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/mode-csharp-uncompressed.js b/apps/files_texteditor/js/aceeditor/mode-csharp-uncompressed.js
deleted file mode 100644
index 3e83d27d72..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-csharp-uncompressed.js
+++ /dev/null
@@ -1,770 +0,0 @@
-define('ace/mode/csharp', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text', 'ace/tokenizer', 'ace/mode/csharp_highlight_rules', 'ace/mode/matching_brace_outdent', 'ace/mode/behaviour/cstyle', 'ace/mode/folding/cstyle'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
-var CSharpHighlightRules = require("./csharp_highlight_rules").CSharpHighlightRules;
-var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
-var CstyleBehaviour = require("./behaviour/cstyle").CstyleBehaviour;
-var CStyleFoldMode = require("./folding/cstyle").FoldMode;
-
-var Mode = function() {
-    this.$tokenizer = new Tokenizer(new CSharpHighlightRules().getRules());
-    this.$outdent = new MatchingBraceOutdent();
-    this.$behaviour = new CstyleBehaviour();
-    this.foldingRules = new CStyleFoldMode();
-};
-oop.inherits(Mode, TextMode);
-
-(function() {
-    
-    this.getNextLineIndent = function(state, line, tab) {
-        var indent = this.$getIndent(line);
-  
-        var tokenizedLine = this.$tokenizer.getLineTokens(line, state);
-        var tokens = tokenizedLine.tokens;
-  
-        if (tokens.length && tokens[tokens.length-1].type == "comment") {
-            return indent;
-        }
-    
-        if (state == "start") {
-            var match = line.match(/^.*[\{\(\[]\s*$/);
-            if (match) {
-                indent += tab;
-            }
-        }
-  
-        return indent;
-    };
-
-    this.checkOutdent = function(state, line, input) {
-        return this.$outdent.checkOutdent(line, input);
-    };
-  
-    this.autoOutdent = function(state, doc, row) {
-        this.$outdent.autoOutdent(doc, row);
-    };
-
-
-    this.createWorker = function(session) {
-        return null;
-    };
-
-}).call(Mode.prototype);
-
-exports.Mode = Mode;
-});
-define('ace/mode/csharp_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/lang', 'ace/mode/doc_comment_highlight_rules', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var lang = require("../lib/lang");
-var DocCommentHighlightRules = require("./doc_comment_highlight_rules").DocCommentHighlightRules;
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-
-var CSharpHighlightRules = function() {
-    
-    var keywords = lang.arrayToMap(
-    ("abstract|event|new|struct|as|explicit|null|switch|base|extern|object|this|bool|false|operator|throw|break|finally|out|true|byte|fixed|override|try|case|float|params|typeof|catch|for|private|uint|char|foreach|protected|ulong|checked|goto|public|unchecked|class|if|readonly|unsafe|const|implicit|ref|ushort|continue|in|return|using|decimal|int|sbyte|virtual|default|interface|sealed|volatile|delegate|internal|short|void|do|is|sizeof|while|double|lock|stackalloc|else|long|static|enum|namespace|string|var|dynamic").split("|")
-    );
-
-    var buildinConstants = lang.arrayToMap(
-        ("null|true|false").split("|")
-    );
-
-
-    // regexp must not have capturing parentheses. Use (?:) instead.
-    // regexps are ordered -> the first match is used
-
-    this.$rules = {
-        "start" : [
-            {
-                token : "comment",
-                regex : "\\/\\/.*$"
-            },
-            new DocCommentHighlightRules().getStartRule("doc-start"),
-            {
-                token : "comment", // multi line comment
-                regex : "\\/\\*",
-                merge : true,
-                next : "comment"
-            }, {
-                token : "string.regexp",
-                regex : "[/](?:(?:\\[(?:\\\\]|[^\\]])+\\])|(?:\\\\/|[^\\]/]))*[/]\\w*\\s*(?=[).,;]|$)"
-            }, {
-                token : "string", // single line
-                regex : '["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'
-            }, {
-                token : "string", // single line
-                regex : "['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"
-            }, {
-                token : "constant.numeric", // hex
-                regex : "0[xX][0-9a-fA-F]+\\b"
-            }, {
-                token : "constant.numeric", // float
-                regex : "[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"
-            }, {
-                token : "constant.language.boolean",
-                regex : "(?:true|false)\\b"
-            }, {
-                token : function(value) {
-                    if (value == "this")
-                        return "variable.language";
-                    else if (keywords.hasOwnProperty(value))
-                        return "keyword";
-                    else if (buildinConstants.hasOwnProperty(value))
-                        return "constant.language";
-                    else
-                        return "identifier";
-                },
-                // TODO: Unicode escape sequences
-                // TODO: Unicode identifiers
-                regex : "[a-zA-Z_$][a-zA-Z0-9_$]*\\b"
-            }, {
-                token : "keyword.operator",
-                regex : "!|\\$|%|&|\\*|\\-\\-|\\-|\\+\\+|\\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\\|\\||\\?\\:|\\*=|%=|\\+=|\\-=|&=|\\^=|\\b(?:in|instanceof|new|delete|typeof|void)"
-            }, {
-                token : "punctuation.operator",
-                regex : "\\?|\\:|\\,|\\;|\\."
-            }, {
-                token : "paren.lparen",
-                regex : "[[({]"
-            }, {
-                token : "paren.rparen",
-                regex : "[\\])}]"
-            }, {
-                token : "text",
-                regex : "\\s+"
-            }
-        ],
-        "comment" : [
-            {
-                token : "comment", // closing comment
-                regex : ".*?\\*\\/",
-                next : "start"
-            }, {
-                token : "comment", // comment spanning whole line
-                merge : true,
-                regex : ".+"
-            }
-        ]
-    };
-    
-    this.embedRules(DocCommentHighlightRules, "doc-",
-        [ new DocCommentHighlightRules().getEndRule("start") ]);
-};
-
-oop.inherits(CSharpHighlightRules, TextHighlightRules);
-
-exports.CSharpHighlightRules = CSharpHighlightRules;
-});
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/doc_comment_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-
-var DocCommentHighlightRules = function() {
-
-    this.$rules = {
-        "start" : [ {
-            token : "comment.doc.tag",
-            regex : "@[\\w\\d_]+" // TODO: fix email addresses
-        }, {
-            token : "comment.doc",
-            merge : true,
-            regex : "\\s+"
-        }, {
-            token : "comment.doc",
-            merge : true,
-            regex : "TODO"
-        }, {
-            token : "comment.doc",
-            merge : true,
-            regex : "[^@\\*]+"
-        }, {
-            token : "comment.doc",
-            merge : true,
-            regex : "."
-        }]
-    };
-};
-
-oop.inherits(DocCommentHighlightRules, TextHighlightRules);
-
-(function() {
-
-    this.getStartRule = function(start) {
-        return {
-            token : "comment.doc", // doc comment
-            merge : true,
-            regex : "\\/\\*(?=\\*)",
-            next  : start
-        };
-    };
-    
-    this.getEndRule = function (start) {
-        return {
-            token : "comment.doc", // closing comment
-            merge : true,
-            regex : "\\*\\/",
-            next  : start
-        };
-    };
-
-}).call(DocCommentHighlightRules.prototype);
-
-exports.DocCommentHighlightRules = DocCommentHighlightRules;
-
-});
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/matching_brace_outdent', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
-"use strict";
-
-var Range = require("../range").Range;
-
-var MatchingBraceOutdent = function() {};
-
-(function() {
-
-    this.checkOutdent = function(line, input) {
-        if (! /^\s+$/.test(line))
-            return false;
-
-        return /^\s*\}/.test(input);
-    };
-
-    this.autoOutdent = function(doc, row) {
-        var line = doc.getLine(row);
-        var match = line.match(/^(\s*\})/);
-
-        if (!match) return 0;
-
-        var column = match[1].length;
-        var openBracePos = doc.findMatchingBracket({row: row, column: column});
-
-        if (!openBracePos || openBracePos.row == row) return 0;
-
-        var indent = this.$getIndent(doc.getLine(openBracePos.row));
-        doc.replace(new Range(row, 0, row, column-1), indent);
-    };
-
-    this.$getIndent = function(line) {
-        var match = line.match(/^(\s+)/);
-        if (match) {
-            return match[1];
-        }
-
-        return "";
-    };
-
-}).call(MatchingBraceOutdent.prototype);
-
-exports.MatchingBraceOutdent = MatchingBraceOutdent;
-});
-/* vim:ts=4:sts=4:sw=4:
- * ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Chris Spencer <chris.ag.spencer AT googlemail DOT com>
- *
- * 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 ***** */
-
-define('ace/mode/behaviour/cstyle', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/behaviour'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../../lib/oop");
-var Behaviour = require('../behaviour').Behaviour;
-
-var CstyleBehaviour = function () {
-
-    this.add("braces", "insertion", function (state, action, editor, session, text) {
-        if (text == '{') {
-            var selection = editor.getSelectionRange();
-            var selected = session.doc.getTextRange(selection);
-            if (selected !== "") {
-                return {
-                    text: '{' + selected + '}',
-                    selection: false
-                };
-            } else {
-                return {
-                    text: '{}',
-                    selection: [1, 1]
-                };
-            }
-        } else if (text == '}') {
-            var cursor = editor.getCursorPosition();
-            var line = session.doc.getLine(cursor.row);
-            var rightChar = line.substring(cursor.column, cursor.column + 1);
-            if (rightChar == '}') {
-                var matching = session.$findOpeningBracket('}', {column: cursor.column + 1, row: cursor.row});
-                if (matching !== null) {
-                    return {
-                        text: '',
-                        selection: [1, 1]
-                    };
-                }
-            }
-        } else if (text == "\n") {
-            var cursor = editor.getCursorPosition();
-            var line = session.doc.getLine(cursor.row);
-            var rightChar = line.substring(cursor.column, cursor.column + 1);
-            if (rightChar == '}') {
-                var openBracePos = session.findMatchingBracket({row: cursor.row, column: cursor.column + 1});
-                if (!openBracePos)
-                     return null;
-
-                var indent = this.getNextLineIndent(state, line.substring(0, line.length - 1), session.getTabString());
-                var next_indent = this.$getIndent(session.doc.getLine(openBracePos.row));
-
-                return {
-                    text: '\n' + indent + '\n' + next_indent,
-                    selection: [1, indent.length, 1, indent.length]
-                };
-            }
-        }
-    });
-
-    this.add("braces", "deletion", function (state, action, editor, session, range) {
-        var selected = session.doc.getTextRange(range);
-        if (!range.isMultiLine() && selected == '{') {
-            var line = session.doc.getLine(range.start.row);
-            var rightChar = line.substring(range.end.column, range.end.column + 1);
-            if (rightChar == '}') {
-                range.end.column++;
-                return range;
-            }
-        }
-    });
-
-    this.add("parens", "insertion", function (state, action, editor, session, text) {
-        if (text == '(') {
-            var selection = editor.getSelectionRange();
-            var selected = session.doc.getTextRange(selection);
-            if (selected !== "") {
-                return {
-                    text: '(' + selected + ')',
-                    selection: false
-                };
-            } else {
-                return {
-                    text: '()',
-                    selection: [1, 1]
-                };
-            }
-        } else if (text == ')') {
-            var cursor = editor.getCursorPosition();
-            var line = session.doc.getLine(cursor.row);
-            var rightChar = line.substring(cursor.column, cursor.column + 1);
-            if (rightChar == ')') {
-                var matching = session.$findOpeningBracket(')', {column: cursor.column + 1, row: cursor.row});
-                if (matching !== null) {
-                    return {
-                        text: '',
-                        selection: [1, 1]
-                    };
-                }
-            }
-        }
-    });
-
-    this.add("parens", "deletion", function (state, action, editor, session, range) {
-        var selected = session.doc.getTextRange(range);
-        if (!range.isMultiLine() && selected == '(') {
-            var line = session.doc.getLine(range.start.row);
-            var rightChar = line.substring(range.start.column + 1, range.start.column + 2);
-            if (rightChar == ')') {
-                range.end.column++;
-                return range;
-            }
-        }
-    });
-
-    this.add("string_dquotes", "insertion", function (state, action, editor, session, text) {
-        if (text == '"' || text == "'") {
-            var quote = text;
-            var selection = editor.getSelectionRange();
-            var selected = session.doc.getTextRange(selection);
-            if (selected !== "") {
-                return {
-                    text: quote + selected + quote,
-                    selection: false
-                };
-            } else {
-                var cursor = editor.getCursorPosition();
-                var line = session.doc.getLine(cursor.row);
-                var leftChar = line.substring(cursor.column-1, cursor.column);
-
-                // We're escaped.
-                if (leftChar == '\\') {
-                    return null;
-                }
-
-                // Find what token we're inside.
-                var tokens = session.getTokens(selection.start.row, selection.start.row)[0].tokens;
-                var col = 0, token;
-                var quotepos = -1; // Track whether we're inside an open quote.
-
-                for (var x = 0; x < tokens.length; x++) {
-                    token = tokens[x];
-                    if (token.type == "string") {
-                      quotepos = -1;
-                    } else if (quotepos < 0) {
-                      quotepos = token.value.indexOf(quote);
-                    }
-                    if ((token.value.length + col) > selection.start.column) {
-                        break;
-                    }
-                    col += tokens[x].value.length;
-                }
-
-                // Try and be smart about when we auto insert.
-                if (!token || (quotepos < 0 && token.type !== "comment" && (token.type !== "string" || ((selection.start.column !== token.value.length+col-1) && token.value.lastIndexOf(quote) === token.value.length-1)))) {
-                    return {
-                        text: quote + quote,
-                        selection: [1,1]
-                    };
-                } else if (token && token.type === "string") {
-                    // Ignore input and move right one if we're typing over the closing quote.
-                    var rightChar = line.substring(cursor.column, cursor.column + 1);
-                    if (rightChar == quote) {
-                        return {
-                            text: '',
-                            selection: [1, 1]
-                        };
-                    }
-                }
-            }
-        }
-    });
-
-    this.add("string_dquotes", "deletion", function (state, action, editor, session, range) {
-        var selected = session.doc.getTextRange(range);
-        if (!range.isMultiLine() && (selected == '"' || selected == "'")) {
-            var line = session.doc.getLine(range.start.row);
-            var rightChar = line.substring(range.start.column + 1, range.start.column + 2);
-            if (rightChar == '"') {
-                range.end.column++;
-                return range;
-            }
-        }
-    });
-
-};
-
-oop.inherits(CstyleBehaviour, Behaviour);
-
-exports.CstyleBehaviour = CstyleBehaviour;
-});/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/folding/cstyle', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/range', 'ace/mode/folding/fold_mode'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../../lib/oop");
-var Range = require("../../range").Range;
-var BaseFoldMode = require("./fold_mode").FoldMode;
-
-var FoldMode = exports.FoldMode = function() {};
-oop.inherits(FoldMode, BaseFoldMode);
-
-(function() {
-
-    this.foldingStartMarker = /(\{|\[)[^\}\]]*$|^\s*(\/\*)/;
-    this.foldingStopMarker = /^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/;
-    
-    this.getFoldWidgetRange = function(session, foldStyle, row) {
-        var line = session.getLine(row);
-        var match = line.match(this.foldingStartMarker);
-        if (match) {
-            var i = match.index;
-
-            if (match[1])
-                return this.openingBracketBlock(session, match[1], row, i);
-
-            var range = session.getCommentFoldRange(row, i + match[0].length);
-            range.end.column -= 2;
-            return range;
-        }
-
-        if (foldStyle !== "markbeginend")
-            return;
-            
-        var match = line.match(this.foldingStopMarker);
-        if (match) {
-            var i = match.index + match[0].length;
-
-            if (match[2]) {
-                var range = session.getCommentFoldRange(row, i);
-                range.end.column -= 2;
-                return range;
-            }
-
-            var end = {row: row, column: i};
-            var start = session.$findOpeningBracket(match[1], end);
-            
-            if (!start)
-                return;
-
-            start.column++;
-            end.column--;
-
-            return  Range.fromPoints(start, end);
-        }
-    };
-    
-}).call(FoldMode.prototype);
-
-});/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/folding/fold_mode', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
-"use strict";
-
-var Range = require("../../range").Range;
-
-var FoldMode = exports.FoldMode = function() {};
-
-(function() {
-
-    this.foldingStartMarker = null;
-    this.foldingStopMarker = null;
-
-    // must return "" if there's no fold, to enable caching
-    this.getFoldWidget = function(session, foldStyle, row) {
-        var line = session.getLine(row);
-        if (this.foldingStartMarker.test(line))
-            return "start";
-        if (foldStyle == "markbeginend"
-                && this.foldingStopMarker
-                && this.foldingStopMarker.test(line))
-            return "end";
-        return "";
-    };
-    
-    this.getFoldWidgetRange = function(session, foldStyle, row) {
-        return null;
-    };
-
-    this.indentationBlock = function(session, row, column) {
-        var re = /^\s*/;
-        var startRow = row;
-        var endRow = row;
-        var line = session.getLine(row);
-        var startColumn = column || line.length;
-        var startLevel = line.match(re)[0].length;
-        var maxRow = session.getLength()
-        
-        while (++row < maxRow) {
-            line = session.getLine(row);
-            var level = line.match(re)[0].length;
-
-            if (level == line.length)
-                continue;
-
-            if (level <= startLevel)
-                break;
-
-            endRow = row;
-        }
-
-        if (endRow > startRow) {
-            var endColumn = session.getLine(endRow).length;
-            return new Range(startRow, startColumn, endRow, endColumn);
-        }
-    };
-
-    this.openingBracketBlock = function(session, bracket, row, column) {
-        var start = {row: row, column: column + 1};
-        var end = session.$findClosingBracket(bracket, start);
-        if (!end)
-            return;
-
-        var fw = session.foldWidgets[end.row];
-        if (fw == null)
-            fw = this.getFoldWidget(session, end.row);
-
-        if (fw == "start") {
-            end.row --;
-            end.column = session.getLine(end.row).length;
-        }
-        return Range.fromPoints(start, end);
-    };
-
-}).call(FoldMode.prototype);
-
-});
diff --git a/apps/files_texteditor/js/aceeditor/mode-csharp.js b/apps/files_texteditor/js/aceeditor/mode-csharp.js
deleted file mode 100644
index 642ee6e7b1..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-csharp.js
+++ /dev/null
@@ -1 +0,0 @@
-define("ace/mode/csharp",["require","exports","module","ace/lib/oop","ace/mode/text","ace/tokenizer","ace/mode/csharp_highlight_rules","ace/mode/matching_brace_outdent","ace/mode/behaviour/cstyle","ace/mode/folding/cstyle"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text").Mode,f=a("../tokenizer").Tokenizer,g=a("./csharp_highlight_rules").CSharpHighlightRules,h=a("./matching_brace_outdent").MatchingBraceOutdent,i=a("./behaviour/cstyle").CstyleBehaviour,j=a("./folding/cstyle").FoldMode,k=function(){this.$tokenizer=new f((new g).getRules()),this.$outdent=new h,this.$behaviour=new i,this.foldingRules=new j};d.inherits(k,e),function(){this.getNextLineIndent=function(a,b,c){var d=this.$getIndent(b),e=this.$tokenizer.getLineTokens(b,a),f=e.tokens;if(f.length&&f[f.length-1].type=="comment")return d;if(a=="start"){var g=b.match(/^.*[\{\(\[]\s*$/);g&&(d+=c)}return d},this.checkOutdent=function(a,b,c){return this.$outdent.checkOutdent(b,c)},this.autoOutdent=function(a,b,c){this.$outdent.autoOutdent(b,c)},this.createWorker=function(a){return null}}.call(k.prototype),b.Mode=k}),define("ace/mode/csharp_highlight_rules",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/mode/doc_comment_highlight_rules","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("../lib/lang"),f=a("./doc_comment_highlight_rules").DocCommentHighlightRules,g=a("./text_highlight_rules").TextHighlightRules,h=function(){var a=e.arrayToMap("abstract|event|new|struct|as|explicit|null|switch|base|extern|object|this|bool|false|operator|throw|break|finally|out|true|byte|fixed|override|try|case|float|params|typeof|catch|for|private|uint|char|foreach|protected|ulong|checked|goto|public|unchecked|class|if|readonly|unsafe|const|implicit|ref|ushort|continue|in|return|using|decimal|int|sbyte|virtual|default|interface|sealed|volatile|delegate|internal|short|void|do|is|sizeof|while|double|lock|stackalloc|else|long|static|enum|namespace|string|var|dynamic".split("|")),b=e.arrayToMap("null|true|false".split("|"));this.$rules={start:[{token:"comment",regex:"\\/\\/.*$"},(new f).getStartRule("doc-start"),{token:"comment",regex:"\\/\\*",merge:!0,next:"comment"},{token:"string.regexp",regex:"[/](?:(?:\\[(?:\\\\]|[^\\]])+\\])|(?:\\\\/|[^\\]/]))*[/]\\w*\\s*(?=[).,;]|$)"},{token:"string",regex:'["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'},{token:"string",regex:"['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"},{token:"constant.numeric",regex:"0[xX][0-9a-fA-F]+\\b"},{token:"constant.numeric",regex:"[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"},{token:"constant.language.boolean",regex:"(?:true|false)\\b"},{token:function(c){return c=="this"?"variable.language":a.hasOwnProperty(c)?"keyword":b.hasOwnProperty(c)?"constant.language":"identifier"},regex:"[a-zA-Z_$][a-zA-Z0-9_$]*\\b"},{token:"keyword.operator",regex:"!|\\$|%|&|\\*|\\-\\-|\\-|\\+\\+|\\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\\|\\||\\?\\:|\\*=|%=|\\+=|\\-=|&=|\\^=|\\b(?:in|instanceof|new|delete|typeof|void)"},{token:"punctuation.operator",regex:"\\?|\\:|\\,|\\;|\\."},{token:"paren.lparen",regex:"[[({]"},{token:"paren.rparen",regex:"[\\])}]"},{token:"text",regex:"\\s+"}],comment:[{token:"comment",regex:".*?\\*\\/",next:"start"},{token:"comment",merge:!0,regex:".+"}]},this.embedRules(f,"doc-",[(new f).getEndRule("start")])};d.inherits(h,g),b.CSharpHighlightRules=h}),define("ace/mode/doc_comment_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text_highlight_rules").TextHighlightRules,f=function(){this.$rules={start:[{token:"comment.doc.tag",regex:"@[\\w\\d_]+"},{token:"comment.doc",merge:!0,regex:"\\s+"},{token:"comment.doc",merge:!0,regex:"TODO"},{token:"comment.doc",merge:!0,regex:"[^@\\*]+"},{token:"comment.doc",merge:!0,regex:"."}]}};d.inherits(f,e),function(){this.getStartRule=function(a){return{token:"comment.doc",merge:!0,regex:"\\/\\*(?=\\*)",next:a}},this.getEndRule=function(a){return{token:"comment.doc",merge:!0,regex:"\\*\\/",next:a}}}.call(f.prototype),b.DocCommentHighlightRules=f}),define("ace/mode/matching_brace_outdent",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../range").Range,e=function(){};(function(){this.checkOutdent=function(a,b){return/^\s+$/.test(a)?/^\s*\}/.test(b):!1},this.autoOutdent=function(a,b){var c=a.getLine(b),e=c.match(/^(\s*\})/);if(!e)return 0;var f=e[1].length,g=a.findMatchingBracket({row:b,column:f});if(!g||g.row==b)return 0;var h=this.$getIndent(a.getLine(g.row));a.replace(new d(b,0,b,f-1),h)},this.$getIndent=function(a){var b=a.match(/^(\s+)/);return b?b[1]:""}}).call(e.prototype),b.MatchingBraceOutdent=e}),define("ace/mode/behaviour/cstyle",["require","exports","module","ace/lib/oop","ace/mode/behaviour"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../behaviour").Behaviour,f=function(){this.add("braces","insertion",function(a,b,c,d,e){if(e=="{"){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"{"+g+"}",selection:!1}:{text:"{}",selection:[1,1]}}if(e=="}"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var k=d.$findOpeningBracket("}",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}else if(e=="\n"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var l=d.findMatchingBracket({row:h.row,column:h.column+1});if(!l)return null;var m=this.getNextLineIndent(a,i.substring(0,i.length-1),d.getTabString()),n=this.$getIndent(d.doc.getLine(l.row));return{text:"\n"+m+"\n"+n,selection:[1,m.length,1,m.length]}}}}),this.add("braces","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="{"){var g=d.doc.getLine(e.start.row),h=g.substring(e.end.column,e.end.column+1);if(h=="}")return e.end.column++,e}}),this.add("parens","insertion",function(a,b,c,d,e){if(e=="("){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"("+g+")",selection:!1}:{text:"()",selection:[1,1]}}if(e==")"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j==")"){var k=d.$findOpeningBracket(")",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}}),this.add("parens","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="("){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h==")")return e.end.column++,e}}),this.add("string_dquotes","insertion",function(a,b,c,d,e){if(e=='"'||e=="'"){var f=e,g=c.getSelectionRange(),h=d.doc.getTextRange(g);if(h!=="")return{text:f+h+f,selection:!1};var i=c.getCursorPosition(),j=d.doc.getLine(i.row),k=j.substring(i.column-1,i.column);if(k=="\\")return null;var l=d.getTokens(g.start.row,g.start.row)[0].tokens,m=0,n,o=-1;for(var p=0;p<l.length;p++){n=l[p],n.type=="string"?o=-1:o<0&&(o=n.value.indexOf(f));if(n.value.length+m>g.start.column)break;m+=l[p].value.length}if(!n||o<0&&n.type!=="comment"&&(n.type!=="string"||g.start.column!==n.value.length+m-1&&n.value.lastIndexOf(f)===n.value.length-1))return{text:f+f,selection:[1,1]};if(n&&n.type==="string"){var q=j.substring(i.column,i.column+1);if(q==f)return{text:"",selection:[1,1]}}}}),this.add("string_dquotes","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&(f=='"'||f=="'")){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h=='"')return e.end.column++,e}})};d.inherits(f,e),b.CstyleBehaviour=f}),define("ace/mode/folding/cstyle",["require","exports","module","ace/lib/oop","ace/range","ace/mode/folding/fold_mode"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../../range").Range,f=a("./fold_mode").FoldMode,g=b.FoldMode=function(){};d.inherits(g,f),function(){this.foldingStartMarker=/(\{|\[)[^\}\]]*$|^\s*(\/\*)/,this.foldingStopMarker=/^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/,this.getFoldWidgetRange=function(a,b,c){var d=a.getLine(c),f=d.match(this.foldingStartMarker);if(f){var g=f.index;if(f[1])return this.openingBracketBlock(a,f[1],c,g);var h=a.getCommentFoldRange(c,g+f[0].length);return h.end.column-=2,h}if(b!=="markbeginend")return;var f=d.match(this.foldingStopMarker);if(f){var g=f.index+f[0].length;if(f[2]){var h=a.getCommentFoldRange(c,g);return h.end.column-=2,h}var i={row:c,column:g},j=a.$findOpeningBracket(f[1],i);if(!j)return;return j.column++,i.column--,e.fromPoints(j,i)}}}.call(g.prototype)}),define("ace/mode/folding/fold_mode",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../../range").Range,e=b.FoldMode=function(){};(function(){this.foldingStartMarker=null,this.foldingStopMarker=null,this.getFoldWidget=function(a,b,c){var d=a.getLine(c);return this.foldingStartMarker.test(d)?"start":b=="markbeginend"&&this.foldingStopMarker&&this.foldingStopMarker.test(d)?"end":""},this.getFoldWidgetRange=function(a,b,c){return null},this.indentationBlock=function(a,b,c){var e=/^\s*/,f=b,g=b,h=a.getLine(b),i=c||h.length,j=h.match(e)[0].length,k=a.getLength();while(++b<k){h=a.getLine(b);var l=h.match(e)[0].length;if(l==h.length)continue;if(l<=j)break;g=b}if(g>f){var m=a.getLine(g).length;return new d(f,i,g,m)}},this.openingBracketBlock=function(a,b,c,e){var f={row:c,column:e+1},g=a.$findClosingBracket(b,f);if(!g)return;var h=a.foldWidgets[g.row];return h==null&&(h=this.getFoldWidget(a,g.row)),h=="start"&&(g.row--,g.column=a.getLine(g.row).length),d.fromPoints(f,g)}}).call(e.prototype)})
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/mode-css-uncompressed.js b/apps/files_texteditor/js/aceeditor/mode-css-uncompressed.js
deleted file mode 100644
index 44505d19b6..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-css-uncompressed.js
+++ /dev/null
@@ -1,640 +0,0 @@
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/css', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text', 'ace/tokenizer', 'ace/mode/css_highlight_rules', 'ace/mode/matching_brace_outdent', 'ace/worker/worker_client', 'ace/mode/folding/cstyle'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
-var CssHighlightRules = require("./css_highlight_rules").CssHighlightRules;
-var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
-var WorkerClient = require("../worker/worker_client").WorkerClient;
-var CStyleFoldMode = require("./folding/cstyle").FoldMode;
-
-var Mode = function() {
-    this.$tokenizer = new Tokenizer(new CssHighlightRules().getRules(), "i");
-    this.$outdent = new MatchingBraceOutdent();
-    this.foldingRules = new CStyleFoldMode();
-};
-oop.inherits(Mode, TextMode);
-
-(function() {
-
-    this.foldingRules = "cStyle";
-
-    this.getNextLineIndent = function(state, line, tab) {
-        var indent = this.$getIndent(line);
-
-        // ignore braces in comments
-        var tokens = this.$tokenizer.getLineTokens(line, state).tokens;
-        if (tokens.length && tokens[tokens.length-1].type == "comment") {
-            return indent;
-        }
-
-        var match = line.match(/^.*\{\s*$/);
-        if (match) {
-            indent += tab;
-        }
-
-        return indent;
-    };
-
-    this.checkOutdent = function(state, line, input) {
-        return this.$outdent.checkOutdent(line, input);
-    };
-
-    this.autoOutdent = function(state, doc, row) {
-        this.$outdent.autoOutdent(doc, row);
-    };
-    
-    this.createWorker = function(session) {
-        var worker = new WorkerClient(["ace"], "worker-css.js", "ace/mode/css_worker", "Worker");
-        worker.attachToDocument(session.getDocument());
-        
-        worker.on("csslint", function(e) {
-            var errors = [];
-            e.data.forEach(function(message) {
-                errors.push({
-                    row: message.line - 1,
-                    column: message.col - 1,
-                    text: message.message,
-                    type: message.type,
-                    lint: message
-                });
-            });
-            
-            session.setAnnotations(errors);
-        });
-        return worker;
-    };
-
-}).call(Mode.prototype);
-
-exports.Mode = Mode;
-
-});
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/css_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/lang', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var lang = require("../lib/lang");
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-
-var CssHighlightRules = function() {
-
-    var properties = lang.arrayToMap(
-        ("animation-fill-mode|alignment-adjust|alignment-baseline|animation-delay|animation-direction|animation-duration|animation-iteration-count|animation-name|animation-play-state|animation-timing-function|animation|appearance|azimuth|backface-visibility|background-attachment|background-break|background-clip|background-color|background-image|background-origin|background-position|background-repeat|background-size|background|baseline-shift|binding|bleed|bookmark-label|bookmark-level|bookmark-state|bookmark-target|border-bottom|border-bottom-color|border-bottom-left-radius|border-bottom-right-radius|border-bottom-style|border-bottom-width|border-collapse|border-color|border-image|border-image-outset|border-image-repeat|border-image-slice|border-image-source|border-image-width|border-left|border-left-color|border-left-style|border-left-width|border-radius|border-right|border-right-color|border-right-style|border-right-width|border-spacing|border-style|border-top|border-top-color|border-top-left-radius|border-top-right-radius|border-top-style|border-top-width|border-width|border|bottom|box-align|box-decoration-break|box-direction|box-flex-group|box-flex|box-lines|box-ordinal-group|box-orient|box-pack|box-shadow|box-sizing|break-after|break-before|break-inside|caption-side|clear|clip|color-profile|color|column-count|column-fill|column-gap|column-rule|column-rule-color|column-rule-style|column-rule-width|column-span|column-width|columns|content|counter-increment|counter-reset|crop|cue-after|cue-before|cue|cursor|direction|display|dominant-baseline|drop-initial-after-adjust|drop-initial-after-align|drop-initial-before-adjust|drop-initial-before-align|drop-initial-size|drop-initial-value|elevation|empty-cells|fit|fit-position|float-offset|float|font-family|font-size|font-size-adjust|font-stretch|font-style|font-variant|font-weight|font|grid-columns|grid-rows|hanging-punctuation|height|hyphenate-after|hyphenate-before|hyphenate-character|hyphenate-lines|hyphenate-resource|hyphens|icon|image-orientation|image-rendering|image-resolution|inline-box-align|left|letter-spacing|line-height|line-stacking-ruby|line-stacking-shift|line-stacking-strategy|line-stacking|list-style-image|list-style-position|list-style-type|list-style|margin-bottom|margin-left|margin-right|margin-top|margin|mark-after|mark-before|mark|marks|marquee-direction|marquee-play-count|marquee-speed|marquee-style|max-height|max-width|min-height|min-width|move-to|nav-down|nav-index|nav-left|nav-right|nav-up|opacity|orphans|outline-color|outline-offset|outline-style|outline-width|outline|overflow-style|overflow-x|overflow-y|overflow|padding-bottom|padding-left|padding-right|padding-top|padding|page-break-after|page-break-before|page-break-inside|page-policy|page|pause-after|pause-before|pause|perspective-origin|perspective|phonemes|pitch-range|pitch|play-during|position|presentation-level|punctuation-trim|quotes|rendering-intent|resize|rest-after|rest-before|rest|richness|right|rotation-point|rotation|ruby-align|ruby-overhang|ruby-position|ruby-span|size|speak-header|speak-numeral|speak-punctuation|speak|speech-rate|stress|string-set|table-layout|target-name|target-new|target-position|target|text-align-last|text-align|text-decoration|text-emphasis|text-height|text-indent|text-justify|text-outline|text-shadow|text-transform|text-wrap|top|transform-origin|transform-style|transform|transition-delay|transition-duration|transition-property|transition-timing-function|transition|unicode-bidi|vertical-align|visibility|voice-balance|voice-duration|voice-family|voice-pitch-range|voice-pitch|voice-rate|voice-stress|voice-volume|volume|white-space-collapse|white-space|widows|width|word-break|word-spacing|word-wrap|z-index").split("|")
-    );
-
-    var functions = lang.arrayToMap(
-        ("rgb|rgba|url|attr|counter|counters").split("|")
-    );
-
-    var constants = lang.arrayToMap(
-        ("absolute|after-edge|after|all-scroll|all|alphabetic|always|antialiased|armenian|auto|avoid-column|avoid-page|avoid|balance|baseline|before-edge|before|below|bidi-override|block-line-height|block|bold|bolder|border-box|both|bottom|box|break-all|break-word|capitalize|caps-height|caption|center|central|char|circle|cjk-ideographic|clone|close-quote|col-resize|collapse|column|consider-shifts|contain|content-box|cover|crosshair|cubic-bezier|dashed|decimal-leading-zero|decimal|default|disabled|disc|disregard-shifts|distribute-all-lines|distribute-letter|distribute-space|distribute|dotted|double|e-resize|ease-in|ease-in-out|ease-out|ease|ellipsis|end|exclude-ruby|fill|fixed|font-size|font|georgian|glyphs|grid-height|groove|hand|hanging|hebrew|help|hidden|hiragana-iroha|hiragana|horizontal|icon|ideograph-alpha|ideograph-numeric|ideograph-parenthesis|ideograph-space|ideographic|inactive|include-ruby|inherit|initial|inline-block|inline-box|inline-line-height|inline-table|inline|inset|inside|inter-ideograph|inter-word|invert|italic|justify|katakana-iroha|katakana|keep-all|last|left|lighter|line-edge|line-through|line|linear|list-item|local|loose|lower-alpha|lower-greek|lower-latin|lower-roman|lowercase|lr-tb|ltr|mathematical|max-height|max-size|medium|menu|message-box|middle|move|n-resize|ne-resize|newspaper|no-change|no-close-quote|no-drop|no-open-quote|no-repeat|none|normal|not-allowed|nowrap|nw-resize|oblique|open-quote|outset|outside|overline|padding-box|page|pointer|pre-line|pre-wrap|pre|preserve-3d|progress|relative|repeat-x|repeat-y|repeat|replaced|reset-size|ridge|right|round|row-resize|rtl|s-resize|scroll|se-resize|separate|slice|small-caps|small-caption|solid|space|square|start|static|status-bar|step-end|step-start|steps|stretch|strict|sub|super|sw-resize|table-caption|table-cell|table-column-group|table-column|table-footer-group|table-header-group|table-row-group|table-row|table|tb-rl|text-after-edge|text-before-edge|text-bottom|text-size|text-top|text|thick|thin|top|transparent|underline|upper-alpha|upper-latin|upper-roman|uppercase|use-script|vertical-ideographic|vertical-text|visible|w-resize|wait|whitespace|z-index|zero").split("|")
-    );
-
-    var colors = lang.arrayToMap(
-        ("aqua|black|blue|fuchsia|gray|green|lime|maroon|navy|olive|orange|" +
-        "purple|red|silver|teal|white|yellow").split("|")
-    );
-
-    var fonts = lang.arrayToMap(
-        ("arial|century|comic|courier|garamond|georgia|helvetica|impact|lucida|" +
-        "symbol|system|tahoma|times|trebuchet|utopia|verdana|webdings|sans-serif|" +
-        "serif|monospace").split("|")
-    );
-    
-    // regexp must not have capturing parentheses. Use (?:) instead.
-    // regexps are ordered -> the first match is used
-
-    var numRe = "\\-?(?:(?:[0-9]+)|(?:[0-9]*\\.[0-9]+))";
-    var pseudoElements = "(\\:+)\\b(after|before|first-letter|first-line|moz-selection|selection)\\b";
-    var pseudoClasses = "(:)\\b(active|checked|disabled|empty|enabled|first-child|first-of-type|focus|hover|indeterminate|invalid|last-child|last-of-type|link|not|nth-child|nth-last-child|nth-last-of-type|nth-of-type|only-child|only-of-type|required|root|target|valid|visited)\\b";
-    
-    var base_ruleset = [
-        {
-            token : "comment", // multi line comment
-            merge : true,
-            regex : "\\/\\*",
-            next : "ruleset_comment"
-        }, {
-            token : "string", // single line
-            regex : '["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'
-        }, {
-            token : "string", // single line
-            regex : "['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"
-        }, {
-            token : ["constant.numeric", "keyword"],
-            regex : "(" + numRe + ")(ch|cm|deg|em|ex|fr|gd|grad|Hz|in|kHz|mm|ms|pc|pt|px|rad|rem|s|turn|vh|vm|vw|%)"
-        }, {
-            token : ["constant.numeric"],
-            regex : "([0-9]+)"
-        }, {
-            token : "constant.numeric",  // hex6 color
-            regex : "#[a-f0-9]{6}"
-        }, {
-            token : "constant.numeric", // hex3 color
-            regex : "#[a-f0-9]{3}"
-        }, {
-            token : ["punctuation", "entity.other.attribute-name.pseudo-element.css"], 
-            regex : pseudoElements
-        }, {
-            token : ["punctuation", "entity.other.attribute-name.pseudo-class.css"], 
-            regex : pseudoClasses
-        }, {
-            token : function(value) {
-                if (properties.hasOwnProperty(value.toLowerCase())) {
-                    return "support.type";
-                }
-                else if (functions.hasOwnProperty(value.toLowerCase())) {
-                    return "support.function";
-                }
-                else if (constants.hasOwnProperty(value.toLowerCase())) {
-                    return "support.constant";
-                }
-                else if (colors.hasOwnProperty(value.toLowerCase())) {
-                    return "support.constant.color";
-                }
-                else if (fonts.hasOwnProperty(value.toLowerCase())) {
-                    return "support.constant.fonts";
-                }
-                else {
-                    return "text";
-                }
-            },
-            regex : "\\-?[a-zA-Z_][a-zA-Z0-9_\\-]*"
-        } 
-      ];
-
-    var ruleset = lang.copyArray(base_ruleset);
-    ruleset.unshift({
-        token : "paren.rparen",
-        regex : "\\}",
-        next:   "start"
-    });
-
-    var media_ruleset = lang.copyArray( base_ruleset );
-    media_ruleset.unshift({
-        token : "paren.rparen",
-        regex : "\\}",
-        next:   "media"
-    });
-
-    var base_comment = [{
-          token : "comment", // comment spanning whole line
-          merge : true,
-          regex : ".+"
-    }];
-
-    var comment = lang.copyArray(base_comment);
-    comment.unshift({
-          token : "comment", // closing comment
-          regex : ".*?\\*\\/",
-          next : "start"
-    });
-
-    var media_comment = lang.copyArray(base_comment);
-    media_comment.unshift({
-          token : "comment", // closing comment
-          regex : ".*?\\*\\/",
-          next : "media"
-    });
-
-    var ruleset_comment = lang.copyArray(base_comment);
-    ruleset_comment.unshift({
-          token : "comment", // closing comment
-          regex : ".*?\\*\\/",
-          next : "ruleset"
-    });
-
-    this.$rules = {
-        "start" : [{
-            token : "comment", // multi line comment
-            merge : true,
-            regex : "\\/\\*",
-            next : "comment"
-        }, {
-            token: "paren.lparen",
-            regex: "\\{",
-            next:  "ruleset"
-        }, {
-            token: "string",
-            regex: "@.*?{",
-            next:  "media"
-        },{
-            token: "keyword",
-            regex: "#[a-z0-9-_]+"
-        },{
-            token: "variable",
-            regex: "\\.[a-z0-9-_]+"
-        },{
-            token: "string",
-            regex: ":[a-z0-9-_]+"
-        },{
-            token: "constant",
-            regex: "[a-z0-9-_]+"
-        }],
-
-        "media" : [ {
-            token : "comment", // multi line comment
-            merge : true,
-            regex : "\\/\\*",
-            next : "media_comment"
-        }, {
-            token: "paren.lparen",
-            regex: "\\{",
-            next:  "media_ruleset"
-        },{
-            token: "string",
-            regex: "\\}",
-            next:  "start"
-        },{
-            token: "keyword",
-            regex: "#[a-z0-9-_]+"
-        },{
-            token: "variable",
-            regex: "\\.[a-z0-9-_]+"
-        },{
-            token: "string",
-            regex: ":[a-z0-9-_]+"
-        },{
-            token: "constant",
-            regex: "[a-z0-9-_]+"
-        }],
-
-        "comment" : comment,
-
-        "ruleset" : ruleset,
-        "ruleset_comment" : ruleset_comment,
-
-        "media_ruleset" : media_ruleset,
-        "media_comment" : media_comment
-    };
-};
-
-oop.inherits(CssHighlightRules, TextHighlightRules);
-
-exports.CssHighlightRules = CssHighlightRules;
-
-});
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/matching_brace_outdent', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
-"use strict";
-
-var Range = require("../range").Range;
-
-var MatchingBraceOutdent = function() {};
-
-(function() {
-
-    this.checkOutdent = function(line, input) {
-        if (! /^\s+$/.test(line))
-            return false;
-
-        return /^\s*\}/.test(input);
-    };
-
-    this.autoOutdent = function(doc, row) {
-        var line = doc.getLine(row);
-        var match = line.match(/^(\s*\})/);
-
-        if (!match) return 0;
-
-        var column = match[1].length;
-        var openBracePos = doc.findMatchingBracket({row: row, column: column});
-
-        if (!openBracePos || openBracePos.row == row) return 0;
-
-        var indent = this.$getIndent(doc.getLine(openBracePos.row));
-        doc.replace(new Range(row, 0, row, column-1), indent);
-    };
-
-    this.$getIndent = function(line) {
-        var match = line.match(/^(\s+)/);
-        if (match) {
-            return match[1];
-        }
-
-        return "";
-    };
-
-}).call(MatchingBraceOutdent.prototype);
-
-exports.MatchingBraceOutdent = MatchingBraceOutdent;
-});
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/folding/cstyle', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/range', 'ace/mode/folding/fold_mode'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../../lib/oop");
-var Range = require("../../range").Range;
-var BaseFoldMode = require("./fold_mode").FoldMode;
-
-var FoldMode = exports.FoldMode = function() {};
-oop.inherits(FoldMode, BaseFoldMode);
-
-(function() {
-
-    this.foldingStartMarker = /(\{|\[)[^\}\]]*$|^\s*(\/\*)/;
-    this.foldingStopMarker = /^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/;
-    
-    this.getFoldWidgetRange = function(session, foldStyle, row) {
-        var line = session.getLine(row);
-        var match = line.match(this.foldingStartMarker);
-        if (match) {
-            var i = match.index;
-
-            if (match[1])
-                return this.openingBracketBlock(session, match[1], row, i);
-
-            var range = session.getCommentFoldRange(row, i + match[0].length);
-            range.end.column -= 2;
-            return range;
-        }
-
-        if (foldStyle !== "markbeginend")
-            return;
-            
-        var match = line.match(this.foldingStopMarker);
-        if (match) {
-            var i = match.index + match[0].length;
-
-            if (match[2]) {
-                var range = session.getCommentFoldRange(row, i);
-                range.end.column -= 2;
-                return range;
-            }
-
-            var end = {row: row, column: i};
-            var start = session.$findOpeningBracket(match[1], end);
-            
-            if (!start)
-                return;
-
-            start.column++;
-            end.column--;
-
-            return  Range.fromPoints(start, end);
-        }
-    };
-    
-}).call(FoldMode.prototype);
-
-});/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/folding/fold_mode', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
-"use strict";
-
-var Range = require("../../range").Range;
-
-var FoldMode = exports.FoldMode = function() {};
-
-(function() {
-
-    this.foldingStartMarker = null;
-    this.foldingStopMarker = null;
-
-    // must return "" if there's no fold, to enable caching
-    this.getFoldWidget = function(session, foldStyle, row) {
-        var line = session.getLine(row);
-        if (this.foldingStartMarker.test(line))
-            return "start";
-        if (foldStyle == "markbeginend"
-                && this.foldingStopMarker
-                && this.foldingStopMarker.test(line))
-            return "end";
-        return "";
-    };
-    
-    this.getFoldWidgetRange = function(session, foldStyle, row) {
-        return null;
-    };
-
-    this.indentationBlock = function(session, row, column) {
-        var re = /^\s*/;
-        var startRow = row;
-        var endRow = row;
-        var line = session.getLine(row);
-        var startColumn = column || line.length;
-        var startLevel = line.match(re)[0].length;
-        var maxRow = session.getLength()
-        
-        while (++row < maxRow) {
-            line = session.getLine(row);
-            var level = line.match(re)[0].length;
-
-            if (level == line.length)
-                continue;
-
-            if (level <= startLevel)
-                break;
-
-            endRow = row;
-        }
-
-        if (endRow > startRow) {
-            var endColumn = session.getLine(endRow).length;
-            return new Range(startRow, startColumn, endRow, endColumn);
-        }
-    };
-
-    this.openingBracketBlock = function(session, bracket, row, column) {
-        var start = {row: row, column: column + 1};
-        var end = session.$findClosingBracket(bracket, start);
-        if (!end)
-            return;
-
-        var fw = session.foldWidgets[end.row];
-        if (fw == null)
-            fw = this.getFoldWidget(session, end.row);
-
-        if (fw == "start") {
-            end.row --;
-            end.column = session.getLine(end.row).length;
-        }
-        return Range.fromPoints(start, end);
-    };
-
-}).call(FoldMode.prototype);
-
-});
diff --git a/apps/files_texteditor/js/aceeditor/mode-css.js b/apps/files_texteditor/js/aceeditor/mode-css.js
deleted file mode 100644
index 16e482516e..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-css.js
+++ /dev/null
@@ -1 +0,0 @@
-define("ace/mode/css",["require","exports","module","ace/lib/oop","ace/mode/text","ace/tokenizer","ace/mode/css_highlight_rules","ace/mode/matching_brace_outdent","ace/worker/worker_client","ace/mode/folding/cstyle"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text").Mode,f=a("../tokenizer").Tokenizer,g=a("./css_highlight_rules").CssHighlightRules,h=a("./matching_brace_outdent").MatchingBraceOutdent,i=a("../worker/worker_client").WorkerClient,j=a("./folding/cstyle").FoldMode,k=function(){this.$tokenizer=new f((new g).getRules(),"i"),this.$outdent=new h,this.foldingRules=new j};d.inherits(k,e),function(){this.foldingRules="cStyle",this.getNextLineIndent=function(a,b,c){var d=this.$getIndent(b),e=this.$tokenizer.getLineTokens(b,a).tokens;if(e.length&&e[e.length-1].type=="comment")return d;var f=b.match(/^.*\{\s*$/);return f&&(d+=c),d},this.checkOutdent=function(a,b,c){return this.$outdent.checkOutdent(b,c)},this.autoOutdent=function(a,b,c){this.$outdent.autoOutdent(b,c)},this.createWorker=function(a){var b=new i(["ace"],"worker-css.js","ace/mode/css_worker","Worker");return b.attachToDocument(a.getDocument()),b.on("csslint",function(b){var c=[];b.data.forEach(function(a){c.push({row:a.line-1,column:a.col-1,text:a.message,type:a.type,lint:a})}),a.setAnnotations(c)}),b}}.call(k.prototype),b.Mode=k}),define("ace/mode/css_highlight_rules",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("../lib/lang"),f=a("./text_highlight_rules").TextHighlightRules,g=function(){var a=e.arrayToMap("animation-fill-mode|alignment-adjust|alignment-baseline|animation-delay|animation-direction|animation-duration|animation-iteration-count|animation-name|animation-play-state|animation-timing-function|animation|appearance|azimuth|backface-visibility|background-attachment|background-break|background-clip|background-color|background-image|background-origin|background-position|background-repeat|background-size|background|baseline-shift|binding|bleed|bookmark-label|bookmark-level|bookmark-state|bookmark-target|border-bottom|border-bottom-color|border-bottom-left-radius|border-bottom-right-radius|border-bottom-style|border-bottom-width|border-collapse|border-color|border-image|border-image-outset|border-image-repeat|border-image-slice|border-image-source|border-image-width|border-left|border-left-color|border-left-style|border-left-width|border-radius|border-right|border-right-color|border-right-style|border-right-width|border-spacing|border-style|border-top|border-top-color|border-top-left-radius|border-top-right-radius|border-top-style|border-top-width|border-width|border|bottom|box-align|box-decoration-break|box-direction|box-flex-group|box-flex|box-lines|box-ordinal-group|box-orient|box-pack|box-shadow|box-sizing|break-after|break-before|break-inside|caption-side|clear|clip|color-profile|color|column-count|column-fill|column-gap|column-rule|column-rule-color|column-rule-style|column-rule-width|column-span|column-width|columns|content|counter-increment|counter-reset|crop|cue-after|cue-before|cue|cursor|direction|display|dominant-baseline|drop-initial-after-adjust|drop-initial-after-align|drop-initial-before-adjust|drop-initial-before-align|drop-initial-size|drop-initial-value|elevation|empty-cells|fit|fit-position|float-offset|float|font-family|font-size|font-size-adjust|font-stretch|font-style|font-variant|font-weight|font|grid-columns|grid-rows|hanging-punctuation|height|hyphenate-after|hyphenate-before|hyphenate-character|hyphenate-lines|hyphenate-resource|hyphens|icon|image-orientation|image-rendering|image-resolution|inline-box-align|left|letter-spacing|line-height|line-stacking-ruby|line-stacking-shift|line-stacking-strategy|line-stacking|list-style-image|list-style-position|list-style-type|list-style|margin-bottom|margin-left|margin-right|margin-top|margin|mark-after|mark-before|mark|marks|marquee-direction|marquee-play-count|marquee-speed|marquee-style|max-height|max-width|min-height|min-width|move-to|nav-down|nav-index|nav-left|nav-right|nav-up|opacity|orphans|outline-color|outline-offset|outline-style|outline-width|outline|overflow-style|overflow-x|overflow-y|overflow|padding-bottom|padding-left|padding-right|padding-top|padding|page-break-after|page-break-before|page-break-inside|page-policy|page|pause-after|pause-before|pause|perspective-origin|perspective|phonemes|pitch-range|pitch|play-during|position|presentation-level|punctuation-trim|quotes|rendering-intent|resize|rest-after|rest-before|rest|richness|right|rotation-point|rotation|ruby-align|ruby-overhang|ruby-position|ruby-span|size|speak-header|speak-numeral|speak-punctuation|speak|speech-rate|stress|string-set|table-layout|target-name|target-new|target-position|target|text-align-last|text-align|text-decoration|text-emphasis|text-height|text-indent|text-justify|text-outline|text-shadow|text-transform|text-wrap|top|transform-origin|transform-style|transform|transition-delay|transition-duration|transition-property|transition-timing-function|transition|unicode-bidi|vertical-align|visibility|voice-balance|voice-duration|voice-family|voice-pitch-range|voice-pitch|voice-rate|voice-stress|voice-volume|volume|white-space-collapse|white-space|widows|width|word-break|word-spacing|word-wrap|z-index".split("|")),b=e.arrayToMap("rgb|rgba|url|attr|counter|counters".split("|")),c=e.arrayToMap("absolute|after-edge|after|all-scroll|all|alphabetic|always|antialiased|armenian|auto|avoid-column|avoid-page|avoid|balance|baseline|before-edge|before|below|bidi-override|block-line-height|block|bold|bolder|border-box|both|bottom|box|break-all|break-word|capitalize|caps-height|caption|center|central|char|circle|cjk-ideographic|clone|close-quote|col-resize|collapse|column|consider-shifts|contain|content-box|cover|crosshair|cubic-bezier|dashed|decimal-leading-zero|decimal|default|disabled|disc|disregard-shifts|distribute-all-lines|distribute-letter|distribute-space|distribute|dotted|double|e-resize|ease-in|ease-in-out|ease-out|ease|ellipsis|end|exclude-ruby|fill|fixed|font-size|font|georgian|glyphs|grid-height|groove|hand|hanging|hebrew|help|hidden|hiragana-iroha|hiragana|horizontal|icon|ideograph-alpha|ideograph-numeric|ideograph-parenthesis|ideograph-space|ideographic|inactive|include-ruby|inherit|initial|inline-block|inline-box|inline-line-height|inline-table|inline|inset|inside|inter-ideograph|inter-word|invert|italic|justify|katakana-iroha|katakana|keep-all|last|left|lighter|line-edge|line-through|line|linear|list-item|local|loose|lower-alpha|lower-greek|lower-latin|lower-roman|lowercase|lr-tb|ltr|mathematical|max-height|max-size|medium|menu|message-box|middle|move|n-resize|ne-resize|newspaper|no-change|no-close-quote|no-drop|no-open-quote|no-repeat|none|normal|not-allowed|nowrap|nw-resize|oblique|open-quote|outset|outside|overline|padding-box|page|pointer|pre-line|pre-wrap|pre|preserve-3d|progress|relative|repeat-x|repeat-y|repeat|replaced|reset-size|ridge|right|round|row-resize|rtl|s-resize|scroll|se-resize|separate|slice|small-caps|small-caption|solid|space|square|start|static|status-bar|step-end|step-start|steps|stretch|strict|sub|super|sw-resize|table-caption|table-cell|table-column-group|table-column|table-footer-group|table-header-group|table-row-group|table-row|table|tb-rl|text-after-edge|text-before-edge|text-bottom|text-size|text-top|text|thick|thin|top|transparent|underline|upper-alpha|upper-latin|upper-roman|uppercase|use-script|vertical-ideographic|vertical-text|visible|w-resize|wait|whitespace|z-index|zero".split("|")),d=e.arrayToMap("aqua|black|blue|fuchsia|gray|green|lime|maroon|navy|olive|orange|purple|red|silver|teal|white|yellow".split("|")),f=e.arrayToMap("arial|century|comic|courier|garamond|georgia|helvetica|impact|lucida|symbol|system|tahoma|times|trebuchet|utopia|verdana|webdings|sans-serif|serif|monospace".split("|")),g="\\-?(?:(?:[0-9]+)|(?:[0-9]*\\.[0-9]+))",h="(\\:+)\\b(after|before|first-letter|first-line|moz-selection|selection)\\b",i="(:)\\b(active|checked|disabled|empty|enabled|first-child|first-of-type|focus|hover|indeterminate|invalid|last-child|last-of-type|link|not|nth-child|nth-last-child|nth-last-of-type|nth-of-type|only-child|only-of-type|required|root|target|valid|visited)\\b",j=[{token:"comment",merge:!0,regex:"\\/\\*",next:"ruleset_comment"},{token:"string",regex:'["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'},{token:"string",regex:"['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"},{token:["constant.numeric","keyword"],regex:"("+g+")(ch|cm|deg|em|ex|fr|gd|grad|Hz|in|kHz|mm|ms|pc|pt|px|rad|rem|s|turn|vh|vm|vw|%)"},{token:["constant.numeric"],regex:"([0-9]+)"},{token:"constant.numeric",regex:"#[a-f0-9]{6}"},{token:"constant.numeric",regex:"#[a-f0-9]{3}"},{token:["punctuation","entity.other.attribute-name.pseudo-element.css"],regex:h},{token:["punctuation","entity.other.attribute-name.pseudo-class.css"],regex:i},{token:function(e){return a.hasOwnProperty(e.toLowerCase())?"support.type":b.hasOwnProperty(e.toLowerCase())?"support.function":c.hasOwnProperty(e.toLowerCase())?"support.constant":d.hasOwnProperty(e.toLowerCase())?"support.constant.color":f.hasOwnProperty(e.toLowerCase())?"support.constant.fonts":"text"},regex:"\\-?[a-zA-Z_][a-zA-Z0-9_\\-]*"}],k=e.copyArray(j);k.unshift({token:"paren.rparen",regex:"\\}",next:"start"});var l=e.copyArray(j);l.unshift({token:"paren.rparen",regex:"\\}",next:"media"});var m=[{token:"comment",merge:!0,regex:".+"}],n=e.copyArray(m);n.unshift({token:"comment",regex:".*?\\*\\/",next:"start"});var o=e.copyArray(m);o.unshift({token:"comment",regex:".*?\\*\\/",next:"media"});var p=e.copyArray(m);p.unshift({token:"comment",regex:".*?\\*\\/",next:"ruleset"}),this.$rules={start:[{token:"comment",merge:!0,regex:"\\/\\*",next:"comment"},{token:"paren.lparen",regex:"\\{",next:"ruleset"},{token:"string",regex:"@.*?{",next:"media"},{token:"keyword",regex:"#[a-z0-9-_]+"},{token:"variable",regex:"\\.[a-z0-9-_]+"},{token:"string",regex:":[a-z0-9-_]+"},{token:"constant",regex:"[a-z0-9-_]+"}],media:[{token:"comment",merge:!0,regex:"\\/\\*",next:"media_comment"},{token:"paren.lparen",regex:"\\{",next:"media_ruleset"},{token:"string",regex:"\\}",next:"start"},{token:"keyword",regex:"#[a-z0-9-_]+"},{token:"variable",regex:"\\.[a-z0-9-_]+"},{token:"string",regex:":[a-z0-9-_]+"},{token:"constant",regex:"[a-z0-9-_]+"}],comment:n,ruleset:k,ruleset_comment:p,media_ruleset:l,media_comment:o}};d.inherits(g,f),b.CssHighlightRules=g}),define("ace/mode/matching_brace_outdent",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../range").Range,e=function(){};(function(){this.checkOutdent=function(a,b){return/^\s+$/.test(a)?/^\s*\}/.test(b):!1},this.autoOutdent=function(a,b){var c=a.getLine(b),e=c.match(/^(\s*\})/);if(!e)return 0;var f=e[1].length,g=a.findMatchingBracket({row:b,column:f});if(!g||g.row==b)return 0;var h=this.$getIndent(a.getLine(g.row));a.replace(new d(b,0,b,f-1),h)},this.$getIndent=function(a){var b=a.match(/^(\s+)/);return b?b[1]:""}}).call(e.prototype),b.MatchingBraceOutdent=e}),define("ace/mode/folding/cstyle",["require","exports","module","ace/lib/oop","ace/range","ace/mode/folding/fold_mode"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../../range").Range,f=a("./fold_mode").FoldMode,g=b.FoldMode=function(){};d.inherits(g,f),function(){this.foldingStartMarker=/(\{|\[)[^\}\]]*$|^\s*(\/\*)/,this.foldingStopMarker=/^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/,this.getFoldWidgetRange=function(a,b,c){var d=a.getLine(c),f=d.match(this.foldingStartMarker);if(f){var g=f.index;if(f[1])return this.openingBracketBlock(a,f[1],c,g);var h=a.getCommentFoldRange(c,g+f[0].length);return h.end.column-=2,h}if(b!=="markbeginend")return;var f=d.match(this.foldingStopMarker);if(f){var g=f.index+f[0].length;if(f[2]){var h=a.getCommentFoldRange(c,g);return h.end.column-=2,h}var i={row:c,column:g},j=a.$findOpeningBracket(f[1],i);if(!j)return;return j.column++,i.column--,e.fromPoints(j,i)}}}.call(g.prototype)}),define("ace/mode/folding/fold_mode",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../../range").Range,e=b.FoldMode=function(){};(function(){this.foldingStartMarker=null,this.foldingStopMarker=null,this.getFoldWidget=function(a,b,c){var d=a.getLine(c);return this.foldingStartMarker.test(d)?"start":b=="markbeginend"&&this.foldingStopMarker&&this.foldingStopMarker.test(d)?"end":""},this.getFoldWidgetRange=function(a,b,c){return null},this.indentationBlock=function(a,b,c){var e=/^\s*/,f=b,g=b,h=a.getLine(b),i=c||h.length,j=h.match(e)[0].length,k=a.getLength();while(++b<k){h=a.getLine(b);var l=h.match(e)[0].length;if(l==h.length)continue;if(l<=j)break;g=b}if(g>f){var m=a.getLine(g).length;return new d(f,i,g,m)}},this.openingBracketBlock=function(a,b,c,e){var f={row:c,column:e+1},g=a.$findClosingBracket(b,f);if(!g)return;var h=a.foldWidgets[g.row];return h==null&&(h=this.getFoldWidget(a,g.row)),h=="start"&&(g.row--,g.column=a.getLine(g.row).length),d.fromPoints(f,g)}}).call(e.prototype)})
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/mode-groovy-uncompressed.js b/apps/files_texteditor/js/aceeditor/mode-groovy-uncompressed.js
deleted file mode 100644
index 8fc01d4054..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-groovy-uncompressed.js
+++ /dev/null
@@ -1,1370 +0,0 @@
-define('ace/mode/groovy', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/javascript', 'ace/tokenizer', 'ace/mode/groovy_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var JavaScriptMode = require("./javascript").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
-var GroovyHighlightRules = require("./groovy_highlight_rules").GroovyHighlightRules;
-
-var Mode = function() {
-    JavaScriptMode.call(this);
-    this.$tokenizer = new Tokenizer(new GroovyHighlightRules().getRules());
-};
-oop.inherits(Mode, JavaScriptMode);
-
-(function() {
-
-    this.createWorker = function(session) {
-        return null;
-    };
-
-}).call(Mode.prototype);
-
-exports.Mode = Mode;
-});
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/javascript', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text', 'ace/tokenizer', 'ace/mode/javascript_highlight_rules', 'ace/mode/matching_brace_outdent', 'ace/range', 'ace/worker/worker_client', 'ace/mode/behaviour/cstyle', 'ace/mode/folding/cstyle'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
-var JavaScriptHighlightRules = require("./javascript_highlight_rules").JavaScriptHighlightRules;
-var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
-var Range = require("../range").Range;
-var WorkerClient = require("../worker/worker_client").WorkerClient;
-var CstyleBehaviour = require("./behaviour/cstyle").CstyleBehaviour;
-var CStyleFoldMode = require("./folding/cstyle").FoldMode;
-
-var Mode = function() {
-    this.$tokenizer = new Tokenizer(new JavaScriptHighlightRules().getRules());
-    this.$outdent = new MatchingBraceOutdent();
-    this.$behaviour = new CstyleBehaviour();
-    this.foldingRules = new CStyleFoldMode();
-};
-oop.inherits(Mode, TextMode);
-
-(function() {
-
-
-    this.toggleCommentLines = function(state, doc, startRow, endRow) {
-        var outdent = true;
-        var re = /^(\s*)\/\//;
-
-        for (var i=startRow; i<= endRow; i++) {
-            if (!re.test(doc.getLine(i))) {
-                outdent = false;
-                break;
-            }
-        }
-
-        if (outdent) {
-            var deleteRange = new Range(0, 0, 0, 0);
-            for (var i=startRow; i<= endRow; i++)
-            {
-                var line = doc.getLine(i);
-                var m = line.match(re);
-                deleteRange.start.row = i;
-                deleteRange.end.row = i;
-                deleteRange.end.column = m[0].length;
-                doc.replace(deleteRange, m[1]);
-            }
-        }
-        else {
-            doc.indentRows(startRow, endRow, "//");
-        }
-    };
-
-    this.getNextLineIndent = function(state, line, tab) {
-        var indent = this.$getIndent(line);
-
-        var tokenizedLine = this.$tokenizer.getLineTokens(line, state);
-        var tokens = tokenizedLine.tokens;
-        var endState = tokenizedLine.state;
-
-        if (tokens.length && tokens[tokens.length-1].type == "comment") {
-            return indent;
-        }
-        
-        if (state == "start" || state == "regex_allowed") {
-            var match = line.match(/^.*(?:\bcase\b.*\:|[\{\(\[])\s*$/);
-            if (match) {
-                indent += tab;
-            }
-        } else if (state == "doc-start") {
-            if (endState == "start" || state == "regex_allowed") {
-                return "";
-            }
-            var match = line.match(/^\s*(\/?)\*/);
-            if (match) {
-                if (match[1]) {
-                    indent += " ";
-                }
-                indent += "* ";
-            }
-        }
-
-        return indent;
-    };
-
-    this.checkOutdent = function(state, line, input) {
-        return this.$outdent.checkOutdent(line, input);
-    };
-
-    this.autoOutdent = function(state, doc, row) {
-        this.$outdent.autoOutdent(doc, row);
-    };
-    
-    this.createWorker = function(session) {
-        var worker = new WorkerClient(["ace"], "worker-javascript.js", "ace/mode/javascript_worker", "JavaScriptWorker");
-        worker.attachToDocument(session.getDocument());
-            
-        worker.on("jslint", function(results) {
-            var errors = [];
-            for (var i=0; i<results.data.length; i++) {
-                var error = results.data[i];
-                if (error)
-                    errors.push({
-                        row: error.line-1,
-                        column: error.character-1,
-                        text: error.reason,
-                        type: "warning",
-                        lint: error
-                    });
-            }
-            session.setAnnotations(errors);
-        });
-        
-        worker.on("narcissus", function(e) {
-            session.setAnnotations([e.data]);
-        });
-        
-        worker.on("terminate", function() {
-            session.clearAnnotations();
-        });
-        
-        return worker;
-    };
-
-}).call(Mode.prototype);
-
-exports.Mode = Mode;
-});
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *      Mihai Sucan <mihai DOT sucan AT gmail DOT com>
- *
- * 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 ***** */
-
-define('ace/mode/javascript_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/lang', 'ace/unicode', 'ace/mode/doc_comment_highlight_rules', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var lang = require("../lib/lang");
-var unicode = require("../unicode");
-var DocCommentHighlightRules = require("./doc_comment_highlight_rules").DocCommentHighlightRules;
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-
-var JavaScriptHighlightRules = function() {
-
-    // see: https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects
-    var globals = lang.arrayToMap(
-      // Constructors
-        ("Array|Boolean|Date|Function|Iterator|Number|Object|RegExp|String|Proxy|" +
-      // E4X
-         "Namespace|QName|XML|XMLList|" +
-         "ArrayBuffer|Float32Array|Float64Array|Int16Array|Int32Array|Int8Array|" +
-         "Uint16Array|Uint32Array|Uint8Array|Uint8ClampedArray|" +
-      // Errors
-        "Error|EvalError|InternalError|RangeError|ReferenceError|StopIteration|" +
-        "SyntaxError|TypeError|URIError|" +
-      //  Non-constructor functions
-        "decodeURI|decodeURIComponent|encodeURI|encodeURIComponent|eval|isFinite|" +
-        "isNaN|parseFloat|parseInt|" +
-      // Other
-        "JSON|Math|" +
-      // Pseudo
-        "this|arguments|prototype|window|document"
-      ).split("|")
-    );
-
-    var keywords = lang.arrayToMap(
-        ("break|case|catch|continue|default|delete|do|else|finally|for|function|" +
-        "if|in|instanceof|new|return|switch|throw|try|typeof|let|var|while|with|" +
-        "const|yield|import|get|set").split("|")
-    );
-
-    // keywords which can be followed by regular expressions
-    var kwBeforeRe = "case|do|else|finally|in|instanceof|return|throw|try|typeof|yield";
-
-    var deprecated = lang.arrayToMap(
-        ("__parent__|__count__|escape|unescape|with|__proto__").split("|")
-    );
-
-    var definitions = lang.arrayToMap(("const|let|var|function").split("|"));
-
-    var buildinConstants = lang.arrayToMap(
-        ("null|Infinity|NaN|undefined").split("|")
-    );
-
-    var futureReserved = lang.arrayToMap(
-        ("class|enum|extends|super|export|implements|private|" +
-        "public|interface|package|protected|static").split("|")
-    );
-
-    // TODO: Unicode escape sequences
-    var identifierRe = "[" + unicode.packages.L + "\\$_]["
-        + unicode.packages.L
-        + unicode.packages.Mn + unicode.packages.Mc
-        + unicode.packages.Nd
-        + unicode.packages.Pc + "\\$_]*\\b";
-
-    var escapedRe = "\\\\(?:x[0-9a-fA-F]{2}|" + // hex
-        "u[0-9a-fA-F]{4}|" + // unicode
-        "[0-2][0-7]{0,2}|" + // oct
-        "3[0-6][0-7]?|" + // oct
-        "37[0-7]?|" + // oct
-        "[4-7][0-7]?|" + //oct
-        ".)";
-
-    // regexp must not have capturing parentheses. Use (?:) instead.
-    // regexps are ordered -> the first match is used
-
-    this.$rules = {
-        "start" : [
-            {
-                token : "comment",
-                regex : /\/\/.*$/
-            },
-            new DocCommentHighlightRules().getStartRule("doc-start"),
-            {
-                token : "comment", // multi line comment
-                merge : true,
-                regex : /\/\*/,
-                next : "comment"
-            }, {
-                token : "string",
-                regex : "'",
-                next  : "qstring"
-            }, {
-                token : "string",
-                regex : '"',
-                next  : "qqstring"
-            }, {
-                token : "constant.numeric", // hex
-                regex : /0[xX][0-9a-fA-F]+\b/
-            }, {
-                token : "constant.numeric", // float
-                regex : /[+-]?\d+(?:(?:\.\d*)?(?:[eE][+-]?\d+)?)?\b/
-            }, { // match stuff like: Sound.prototype.play = function() { }
-                token : [
-                    "storage.type",
-                    "punctuation.operator",
-                    "support.function",
-                    "punctuation.operator",
-                    "entity.name.function",
-                    "text",
-                    "keyword.operator",
-                    "text",
-                    "storage.type",
-                    "text",
-                    "paren.lparen",
-                    "variable.parameter",
-                    "paren.rparen"
-                ],
-                regex : "(" + identifierRe + ")(\\.)(prototype)(\\.)(" + identifierRe +")(\\s*)(=)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"
-            }, { // match stuff like: Sound.prototype.play = myfunc
-                token : [
-                    "storage.type",
-                    "punctuation.operator",
-                    "support.function",
-                    "punctuation.operator",
-                    "entity.name.function",
-                    "text",
-                    "keyword.operator",
-                    "text"
-                ],
-                regex : "(" + identifierRe + ")(\\.)(prototype)(\\.)(" + identifierRe +")(\\s*)(=)(\\s*)"
-            }, { // match stuff like: Sound.play = function() {  }
-                token : [
-                    "storage.type",
-                    "punctuation.operator",
-                    "entity.name.function",
-                    "text",
-                    "keyword.operator",
-                    "text",
-                    "storage.type",
-                    "text",
-                    "paren.lparen",
-                    "variable.parameter",
-                    "paren.rparen"
-                ],
-                regex : "(" + identifierRe + ")(\\.)(" + identifierRe +")(\\s*)(=)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"
-            }, { // match stuff like: play = function() {  }
-                token : [
-                    "entity.name.function",
-                    "text",
-                    "keyword.operator",
-                    "text",
-                    "storage.type",
-                    "text",
-                    "paren.lparen",
-                    "variable.parameter",
-                    "paren.rparen"
-                ],
-                regex : "(" + identifierRe +")(\\s*)(=)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"
-            }, { // match regular function like: function myFunc(arg) { }
-                token : [
-                    "storage.type",
-                    "text",
-                    "entity.name.function",
-                    "text",
-                    "paren.lparen",
-                    "variable.parameter",
-                    "paren.rparen"
-                ],
-                regex : "(function)(\\s+)(" + identifierRe + ")(\\s*)(\\()(.*?)(\\))"
-            }, { // match stuff like: foobar: function() { }
-                token : [
-                    "entity.name.function",
-                    "text",
-                    "punctuation.operator",
-                    "text",
-                    "storage.type",
-                    "text",
-                    "paren.lparen",
-                    "variable.parameter",
-                    "paren.rparen"
-                ],
-                regex : "(" + identifierRe + ")(\\s*)(:)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"
-            }, { // Attempt to match : function() { } (this is for issues with 'foo': function() { })
-                token : [
-                    "text",
-                    "text",
-                    "storage.type",
-                    "text",
-                    "paren.lparen",
-                    "variable.parameter",
-                    "paren.rparen"
-                ],
-                regex : "(:)(\\s*)(function)?(\\s*)(\\()([^)]*)(\\))"
-            }, {
-                token : "constant.language.boolean",
-                regex : /(?:true|false)\b/
-            }, {
-                token : "keyword",
-                regex : "(?:" + kwBeforeRe + ")\\b",
-                next : "regex_allowed"
-            }, {
-                token : ["punctuation.operator", "support.function"],
-                regex : /(\.)(s(?:h(?:ift|ow(?:Mod(?:elessDialog|alDialog)|Help))|croll(?:X|By(?:Pages|Lines)?|Y|To)?|t(?:opzzzz|rike)|i(?:n|zeToContent|debar|gnText)|ort|u(?:p|b(?:str(?:ing)?)?)|pli(?:ce|t)|e(?:nd|t(?:Re(?:sizable|questHeader)|M(?:i(?:nutes|lliseconds)|onth)|Seconds|Ho(?:tKeys|urs)|Year|Cursor|Time(?:out)?|Interval|ZOptions|Date|UTC(?:M(?:i(?:nutes|lliseconds)|onth)|Seconds|Hours|Date|FullYear)|FullYear|Active)|arch)|qrt|lice|avePreferences|mall)|h(?:ome|andleEvent)|navigate|c(?:har(?:CodeAt|At)|o(?:s|n(?:cat|textual|firm)|mpile)|eil|lear(?:Timeout|Interval)?|a(?:ptureEvents|ll)|reate(?:StyleSheet|Popup|EventObject))|t(?:o(?:GMTString|S(?:tring|ource)|U(?:TCString|pperCase)|Lo(?:caleString|werCase))|est|a(?:n|int(?:Enabled)?))|i(?:s(?:NaN|Finite)|ndexOf|talics)|d(?:isableExternalCapture|ump|etachEvent)|u(?:n(?:shift|taint|escape|watch)|pdateCommands)|j(?:oin|avaEnabled)|p(?:o(?:p|w)|ush|lugins.refresh|a(?:ddings|rse(?:Int|Float)?)|r(?:int|ompt|eference))|e(?:scape|nableExternalCapture|val|lementFromPoint|x(?:p|ec(?:Script|Command)?))|valueOf|UTC|queryCommand(?:State|Indeterm|Enabled|Value)|f(?:i(?:nd|le(?:ModifiedDate|Size|CreatedDate|UpdatedDate)|xed)|o(?:nt(?:size|color)|rward)|loor|romCharCode)|watch|l(?:ink|o(?:ad|g)|astIndexOf)|a(?:sin|nchor|cos|t(?:tachEvent|ob|an(?:2)?)|pply|lert|b(?:s|ort))|r(?:ou(?:nd|teEvents)|e(?:size(?:By|To)|calc|turnValue|place|verse|l(?:oad|ease(?:Capture|Events)))|andom)|g(?:o|et(?:ResponseHeader|M(?:i(?:nutes|lliseconds)|onth)|Se(?:conds|lection)|Hours|Year|Time(?:zoneOffset)?|Da(?:y|te)|UTC(?:M(?:i(?:nutes|lliseconds)|onth)|Seconds|Hours|Da(?:y|te)|FullYear)|FullYear|A(?:ttention|llResponseHeaders)))|m(?:in|ove(?:B(?:y|elow)|To(?:Absolute)?|Above)|ergeAttributes|a(?:tch|rgins|x))|b(?:toa|ig|o(?:ld|rderWidths)|link|ack))\b(?=\()/
-            }, {
-                token : ["punctuation.operator", "support.function.dom"],
-                regex : /(\.)(s(?:ub(?:stringData|mit)|plitText|e(?:t(?:NamedItem|Attribute(?:Node)?)|lect))|has(?:ChildNodes|Feature)|namedItem|c(?:l(?:ick|o(?:se|neNode))|reate(?:C(?:omment|DATASection|aption)|T(?:Head|extNode|Foot)|DocumentFragment|ProcessingInstruction|E(?:ntityReference|lement)|Attribute))|tabIndex|i(?:nsert(?:Row|Before|Cell|Data)|tem)|open|delete(?:Row|C(?:ell|aption)|T(?:Head|Foot)|Data)|focus|write(?:ln)?|a(?:dd|ppend(?:Child|Data))|re(?:set|place(?:Child|Data)|move(?:NamedItem|Child|Attribute(?:Node)?)?)|get(?:NamedItem|Element(?:sBy(?:Name|TagName)|ById)|Attribute(?:Node)?)|blur)\b(?=\()/
-            }, {
-                token : ["punctuation.operator", "support.constant"],
-                regex : /(\.)(s(?:ystemLanguage|cr(?:ipts|ollbars|een(?:X|Y|Top|Left))|t(?:yle(?:Sheets)?|atus(?:Text|bar)?)|ibling(?:Below|Above)|ource|uffixes|e(?:curity(?:Policy)?|l(?:ection|f)))|h(?:istory|ost(?:name)?|as(?:h|Focus))|y|X(?:MLDocument|SLDocument)|n(?:ext|ame(?:space(?:s|URI)|Prop))|M(?:IN_VALUE|AX_VALUE)|c(?:haracterSet|o(?:n(?:structor|trollers)|okieEnabled|lorDepth|mp(?:onents|lete))|urrent|puClass|l(?:i(?:p(?:boardData)?|entInformation)|osed|asses)|alle(?:e|r)|rypto)|t(?:o(?:olbar|p)|ext(?:Transform|Indent|Decoration|Align)|ags)|SQRT(?:1_2|2)|i(?:n(?:ner(?:Height|Width)|put)|ds|gnoreCase)|zIndex|o(?:scpu|n(?:readystatechange|Line)|uter(?:Height|Width)|p(?:sProfile|ener)|ffscreenBuffering)|NEGATIVE_INFINITY|d(?:i(?:splay|alog(?:Height|Top|Width|Left|Arguments)|rectories)|e(?:scription|fault(?:Status|Ch(?:ecked|arset)|View)))|u(?:ser(?:Profile|Language|Agent)|n(?:iqueID|defined)|pdateInterval)|_content|p(?:ixelDepth|ort|ersonalbar|kcs11|l(?:ugins|atform)|a(?:thname|dding(?:Right|Bottom|Top|Left)|rent(?:Window|Layer)?|ge(?:X(?:Offset)?|Y(?:Offset)?))|r(?:o(?:to(?:col|type)|duct(?:Sub)?|mpter)|e(?:vious|fix)))|e(?:n(?:coding|abledPlugin)|x(?:ternal|pando)|mbeds)|v(?:isibility|endor(?:Sub)?|Linkcolor)|URLUnencoded|P(?:I|OSITIVE_INFINITY)|f(?:ilename|o(?:nt(?:Size|Family|Weight)|rmName)|rame(?:s|Element)|gColor)|E|whiteSpace|l(?:i(?:stStyleType|n(?:eHeight|kColor))|o(?:ca(?:tion(?:bar)?|lName)|wsrc)|e(?:ngth|ft(?:Context)?)|a(?:st(?:M(?:odified|atch)|Index|Paren)|yer(?:s|X)|nguage))|a(?:pp(?:MinorVersion|Name|Co(?:deName|re)|Version)|vail(?:Height|Top|Width|Left)|ll|r(?:ity|guments)|Linkcolor|bove)|r(?:ight(?:Context)?|e(?:sponse(?:XML|Text)|adyState))|global|x|m(?:imeTypes|ultiline|enubar|argin(?:Right|Bottom|Top|Left))|L(?:N(?:10|2)|OG(?:10E|2E))|b(?:o(?:ttom|rder(?:Width|RightWidth|BottomWidth|Style|Color|TopWidth|LeftWidth))|ufferDepth|elow|ackground(?:Color|Image)))\b/
-            }, {
-                token : ["storage.type", "punctuation.operator", "support.function.firebug"],
-                regex : /(console)(\.)(warn|info|log|error|time|timeEnd|assert)\b/
-            }, {
-                token : function(value) {
-                    if (globals.hasOwnProperty(value))
-                        return "variable.language";
-                    else if (deprecated.hasOwnProperty(value))
-                        return "invalid.deprecated";
-                    else if (definitions.hasOwnProperty(value))
-                        return "storage.type";
-                    else if (keywords.hasOwnProperty(value))
-                        return "keyword";
-                    else if (buildinConstants.hasOwnProperty(value))
-                        return "constant.language";
-                    else if (futureReserved.hasOwnProperty(value))
-                        return "invalid.illegal";
-                    else if (value == "debugger")
-                        return "invalid.deprecated";
-                    else
-                        return "identifier";
-                },
-                regex : identifierRe
-            }, {
-                token : "keyword.operator",
-                regex : /!|\$|%|&|\*|\-\-|\-|\+\+|\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\|\||\?\:|\*=|%=|\+=|\-=|&=|\^=|\b(?:in|instanceof|new|delete|typeof|void)/,
-                next  : "regex_allowed"
-            }, {
-                token : "punctuation.operator",
-                regex : /\?|\:|\,|\;|\./,
-                next  : "regex_allowed"
-            }, {
-                token : "paren.lparen",
-                regex : /[\[({]/,
-                next  : "regex_allowed"
-            }, {
-                token : "paren.rparen",
-                regex : /[\])}]/
-            }, {
-                token : "keyword.operator",
-                regex : /\/=?/,
-                next  : "regex_allowed"
-            }, {
-                token: "comment",
-                regex: /^#!.*$/
-            }, {
-                token : "text",
-                regex : /\s+/
-            }
-        ],
-        // regular expressions are only allowed after certain tokens. This
-        // makes sure we don't mix up regexps with the divison operator
-        "regex_allowed": [
-            {
-                token : "comment", // multi line comment
-                merge : true,
-                regex : "\\/\\*",
-                next : "comment_regex_allowed"
-            }, {
-                token : "comment",
-                regex : "\\/\\/.*$"
-            }, {
-                token: "string.regexp",
-                regex: "\\/",
-                next: "regex",
-                merge: true
-            }, {
-                token : "text",
-                regex : "\\s+"
-            }, {
-                // immediately return to the start mode without matching
-                // anything
-                token: "empty",
-                regex: "",
-                next: "start"
-            }
-        ],
-        "regex": [
-            {
-                token: "regexp.keyword.operator",
-                regex: "\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)",
-                next: "regex"
-            }, {
-				// flag
-                token: "string.regexp",
-                regex: "/\\w*",
-                next: "start",
-                merge: true
-            }, {
-                token: "string.regexp",
-                regex: "[^\\\\/\\[]+",
-                next: "regex",
-                merge: true
-            }, {
-                token: "string.regexp.charachterclass",
-                regex: "\\[",
-                next: "regex_character_class",
-                merge: true
-            }, {
-                token: "empty",
-                regex: "",
-                next: "start"
-            }
-        ],
-        "regex_character_class": [
-            {
-                token: "regexp.keyword.operator",
-                regex: "\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)",
-                next: "regex_character_class"
-            }, {
-                token: "string.regexp.charachterclass",
-                regex: "]",
-                next: "regex",
-                merge: true
-            }, {
-                token: "string.regexp.charachterclass",
-                regex: "[^\\\\\\]]+",
-                next: "regex_character_class",
-                merge: true
-            }, {
-                token: "empty",
-                regex: "",
-                next: "start"
-            }
-        ],
-        "comment_regex_allowed" : [
-            {
-                token : "comment", // closing comment
-                regex : ".*?\\*\\/",
-                merge : true,
-                next : "regex_allowed"
-            }, {
-                token : "comment", // comment spanning whole line
-                merge : true,
-                regex : ".+"
-            }
-        ],
-        "comment" : [
-            {
-                token : "comment", // closing comment
-                regex : ".*?\\*\\/",
-                merge : true,
-                next : "start"
-            }, {
-                token : "comment", // comment spanning whole line
-                merge : true,
-                regex : ".+"
-            }
-        ],
-        "qqstring" : [
-            {
-                token : "constant.language.escape",
-                regex : escapedRe
-            }, {
-                token : "string",
-                regex : '[^"\\\\]+'
-            }, {
-                token : "string",
-                regex : '"',
-                next  : "start"
-            }
-        ],
-        "qstring" : [
-            {
-                token : "constant.language.escape",
-                regex : escapedRe
-            }, {
-                token : "string",
-                regex : "[^'\\\\]+"
-            }, {
-                token : "string",
-                regex : "'",
-                next  : "start"
-            }
-        ]
-    };
-
-    this.embedRules(DocCommentHighlightRules, "doc-",
-        [ new DocCommentHighlightRules().getEndRule("start") ]);
-};
-
-oop.inherits(JavaScriptHighlightRules, TextHighlightRules);
-
-exports.JavaScriptHighlightRules = JavaScriptHighlightRules;
-});
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/doc_comment_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-
-var DocCommentHighlightRules = function() {
-
-    this.$rules = {
-        "start" : [ {
-            token : "comment.doc.tag",
-            regex : "@[\\w\\d_]+" // TODO: fix email addresses
-        }, {
-            token : "comment.doc",
-            merge : true,
-            regex : "\\s+"
-        }, {
-            token : "comment.doc",
-            merge : true,
-            regex : "TODO"
-        }, {
-            token : "comment.doc",
-            merge : true,
-            regex : "[^@\\*]+"
-        }, {
-            token : "comment.doc",
-            merge : true,
-            regex : "."
-        }]
-    };
-};
-
-oop.inherits(DocCommentHighlightRules, TextHighlightRules);
-
-(function() {
-
-    this.getStartRule = function(start) {
-        return {
-            token : "comment.doc", // doc comment
-            merge : true,
-            regex : "\\/\\*(?=\\*)",
-            next  : start
-        };
-    };
-    
-    this.getEndRule = function (start) {
-        return {
-            token : "comment.doc", // closing comment
-            merge : true,
-            regex : "\\*\\/",
-            next  : start
-        };
-    };
-
-}).call(DocCommentHighlightRules.prototype);
-
-exports.DocCommentHighlightRules = DocCommentHighlightRules;
-
-});
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/matching_brace_outdent', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
-"use strict";
-
-var Range = require("../range").Range;
-
-var MatchingBraceOutdent = function() {};
-
-(function() {
-
-    this.checkOutdent = function(line, input) {
-        if (! /^\s+$/.test(line))
-            return false;
-
-        return /^\s*\}/.test(input);
-    };
-
-    this.autoOutdent = function(doc, row) {
-        var line = doc.getLine(row);
-        var match = line.match(/^(\s*\})/);
-
-        if (!match) return 0;
-
-        var column = match[1].length;
-        var openBracePos = doc.findMatchingBracket({row: row, column: column});
-
-        if (!openBracePos || openBracePos.row == row) return 0;
-
-        var indent = this.$getIndent(doc.getLine(openBracePos.row));
-        doc.replace(new Range(row, 0, row, column-1), indent);
-    };
-
-    this.$getIndent = function(line) {
-        var match = line.match(/^(\s+)/);
-        if (match) {
-            return match[1];
-        }
-
-        return "";
-    };
-
-}).call(MatchingBraceOutdent.prototype);
-
-exports.MatchingBraceOutdent = MatchingBraceOutdent;
-});
-/* vim:ts=4:sts=4:sw=4:
- * ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Chris Spencer <chris.ag.spencer AT googlemail DOT com>
- *
- * 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 ***** */
-
-define('ace/mode/behaviour/cstyle', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/behaviour'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../../lib/oop");
-var Behaviour = require('../behaviour').Behaviour;
-
-var CstyleBehaviour = function () {
-
-    this.add("braces", "insertion", function (state, action, editor, session, text) {
-        if (text == '{') {
-            var selection = editor.getSelectionRange();
-            var selected = session.doc.getTextRange(selection);
-            if (selected !== "") {
-                return {
-                    text: '{' + selected + '}',
-                    selection: false
-                };
-            } else {
-                return {
-                    text: '{}',
-                    selection: [1, 1]
-                };
-            }
-        } else if (text == '}') {
-            var cursor = editor.getCursorPosition();
-            var line = session.doc.getLine(cursor.row);
-            var rightChar = line.substring(cursor.column, cursor.column + 1);
-            if (rightChar == '}') {
-                var matching = session.$findOpeningBracket('}', {column: cursor.column + 1, row: cursor.row});
-                if (matching !== null) {
-                    return {
-                        text: '',
-                        selection: [1, 1]
-                    };
-                }
-            }
-        } else if (text == "\n") {
-            var cursor = editor.getCursorPosition();
-            var line = session.doc.getLine(cursor.row);
-            var rightChar = line.substring(cursor.column, cursor.column + 1);
-            if (rightChar == '}') {
-                var openBracePos = session.findMatchingBracket({row: cursor.row, column: cursor.column + 1});
-                if (!openBracePos)
-                     return null;
-
-                var indent = this.getNextLineIndent(state, line.substring(0, line.length - 1), session.getTabString());
-                var next_indent = this.$getIndent(session.doc.getLine(openBracePos.row));
-
-                return {
-                    text: '\n' + indent + '\n' + next_indent,
-                    selection: [1, indent.length, 1, indent.length]
-                };
-            }
-        }
-    });
-
-    this.add("braces", "deletion", function (state, action, editor, session, range) {
-        var selected = session.doc.getTextRange(range);
-        if (!range.isMultiLine() && selected == '{') {
-            var line = session.doc.getLine(range.start.row);
-            var rightChar = line.substring(range.end.column, range.end.column + 1);
-            if (rightChar == '}') {
-                range.end.column++;
-                return range;
-            }
-        }
-    });
-
-    this.add("parens", "insertion", function (state, action, editor, session, text) {
-        if (text == '(') {
-            var selection = editor.getSelectionRange();
-            var selected = session.doc.getTextRange(selection);
-            if (selected !== "") {
-                return {
-                    text: '(' + selected + ')',
-                    selection: false
-                };
-            } else {
-                return {
-                    text: '()',
-                    selection: [1, 1]
-                };
-            }
-        } else if (text == ')') {
-            var cursor = editor.getCursorPosition();
-            var line = session.doc.getLine(cursor.row);
-            var rightChar = line.substring(cursor.column, cursor.column + 1);
-            if (rightChar == ')') {
-                var matching = session.$findOpeningBracket(')', {column: cursor.column + 1, row: cursor.row});
-                if (matching !== null) {
-                    return {
-                        text: '',
-                        selection: [1, 1]
-                    };
-                }
-            }
-        }
-    });
-
-    this.add("parens", "deletion", function (state, action, editor, session, range) {
-        var selected = session.doc.getTextRange(range);
-        if (!range.isMultiLine() && selected == '(') {
-            var line = session.doc.getLine(range.start.row);
-            var rightChar = line.substring(range.start.column + 1, range.start.column + 2);
-            if (rightChar == ')') {
-                range.end.column++;
-                return range;
-            }
-        }
-    });
-
-    this.add("string_dquotes", "insertion", function (state, action, editor, session, text) {
-        if (text == '"' || text == "'") {
-            var quote = text;
-            var selection = editor.getSelectionRange();
-            var selected = session.doc.getTextRange(selection);
-            if (selected !== "") {
-                return {
-                    text: quote + selected + quote,
-                    selection: false
-                };
-            } else {
-                var cursor = editor.getCursorPosition();
-                var line = session.doc.getLine(cursor.row);
-                var leftChar = line.substring(cursor.column-1, cursor.column);
-
-                // We're escaped.
-                if (leftChar == '\\') {
-                    return null;
-                }
-
-                // Find what token we're inside.
-                var tokens = session.getTokens(selection.start.row, selection.start.row)[0].tokens;
-                var col = 0, token;
-                var quotepos = -1; // Track whether we're inside an open quote.
-
-                for (var x = 0; x < tokens.length; x++) {
-                    token = tokens[x];
-                    if (token.type == "string") {
-                      quotepos = -1;
-                    } else if (quotepos < 0) {
-                      quotepos = token.value.indexOf(quote);
-                    }
-                    if ((token.value.length + col) > selection.start.column) {
-                        break;
-                    }
-                    col += tokens[x].value.length;
-                }
-
-                // Try and be smart about when we auto insert.
-                if (!token || (quotepos < 0 && token.type !== "comment" && (token.type !== "string" || ((selection.start.column !== token.value.length+col-1) && token.value.lastIndexOf(quote) === token.value.length-1)))) {
-                    return {
-                        text: quote + quote,
-                        selection: [1,1]
-                    };
-                } else if (token && token.type === "string") {
-                    // Ignore input and move right one if we're typing over the closing quote.
-                    var rightChar = line.substring(cursor.column, cursor.column + 1);
-                    if (rightChar == quote) {
-                        return {
-                            text: '',
-                            selection: [1, 1]
-                        };
-                    }
-                }
-            }
-        }
-    });
-
-    this.add("string_dquotes", "deletion", function (state, action, editor, session, range) {
-        var selected = session.doc.getTextRange(range);
-        if (!range.isMultiLine() && (selected == '"' || selected == "'")) {
-            var line = session.doc.getLine(range.start.row);
-            var rightChar = line.substring(range.start.column + 1, range.start.column + 2);
-            if (rightChar == '"') {
-                range.end.column++;
-                return range;
-            }
-        }
-    });
-
-};
-
-oop.inherits(CstyleBehaviour, Behaviour);
-
-exports.CstyleBehaviour = CstyleBehaviour;
-});/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/folding/cstyle', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/range', 'ace/mode/folding/fold_mode'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../../lib/oop");
-var Range = require("../../range").Range;
-var BaseFoldMode = require("./fold_mode").FoldMode;
-
-var FoldMode = exports.FoldMode = function() {};
-oop.inherits(FoldMode, BaseFoldMode);
-
-(function() {
-
-    this.foldingStartMarker = /(\{|\[)[^\}\]]*$|^\s*(\/\*)/;
-    this.foldingStopMarker = /^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/;
-    
-    this.getFoldWidgetRange = function(session, foldStyle, row) {
-        var line = session.getLine(row);
-        var match = line.match(this.foldingStartMarker);
-        if (match) {
-            var i = match.index;
-
-            if (match[1])
-                return this.openingBracketBlock(session, match[1], row, i);
-
-            var range = session.getCommentFoldRange(row, i + match[0].length);
-            range.end.column -= 2;
-            return range;
-        }
-
-        if (foldStyle !== "markbeginend")
-            return;
-            
-        var match = line.match(this.foldingStopMarker);
-        if (match) {
-            var i = match.index + match[0].length;
-
-            if (match[2]) {
-                var range = session.getCommentFoldRange(row, i);
-                range.end.column -= 2;
-                return range;
-            }
-
-            var end = {row: row, column: i};
-            var start = session.$findOpeningBracket(match[1], end);
-            
-            if (!start)
-                return;
-
-            start.column++;
-            end.column--;
-
-            return  Range.fromPoints(start, end);
-        }
-    };
-    
-}).call(FoldMode.prototype);
-
-});/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/folding/fold_mode', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
-"use strict";
-
-var Range = require("../../range").Range;
-
-var FoldMode = exports.FoldMode = function() {};
-
-(function() {
-
-    this.foldingStartMarker = null;
-    this.foldingStopMarker = null;
-
-    // must return "" if there's no fold, to enable caching
-    this.getFoldWidget = function(session, foldStyle, row) {
-        var line = session.getLine(row);
-        if (this.foldingStartMarker.test(line))
-            return "start";
-        if (foldStyle == "markbeginend"
-                && this.foldingStopMarker
-                && this.foldingStopMarker.test(line))
-            return "end";
-        return "";
-    };
-    
-    this.getFoldWidgetRange = function(session, foldStyle, row) {
-        return null;
-    };
-
-    this.indentationBlock = function(session, row, column) {
-        var re = /^\s*/;
-        var startRow = row;
-        var endRow = row;
-        var line = session.getLine(row);
-        var startColumn = column || line.length;
-        var startLevel = line.match(re)[0].length;
-        var maxRow = session.getLength()
-        
-        while (++row < maxRow) {
-            line = session.getLine(row);
-            var level = line.match(re)[0].length;
-
-            if (level == line.length)
-                continue;
-
-            if (level <= startLevel)
-                break;
-
-            endRow = row;
-        }
-
-        if (endRow > startRow) {
-            var endColumn = session.getLine(endRow).length;
-            return new Range(startRow, startColumn, endRow, endColumn);
-        }
-    };
-
-    this.openingBracketBlock = function(session, bracket, row, column) {
-        var start = {row: row, column: column + 1};
-        var end = session.$findClosingBracket(bracket, start);
-        if (!end)
-            return;
-
-        var fw = session.foldWidgets[end.row];
-        if (fw == null)
-            fw = this.getFoldWidget(session, end.row);
-
-        if (fw == "start") {
-            end.row --;
-            end.column = session.getLine(end.row).length;
-        }
-        return Range.fromPoints(start, end);
-    };
-
-}).call(FoldMode.prototype);
-
-});
-define('ace/mode/groovy_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/lang', 'ace/mode/doc_comment_highlight_rules', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var lang = require("../lib/lang");
-var DocCommentHighlightRules = require("./doc_comment_highlight_rules").DocCommentHighlightRules;
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-
-var GroovyHighlightRules = function() {
-
-    var keywords = lang.arrayToMap(
-    ("assert|with|abstract|continue|for|new|switch|" +
-    "assert|default|goto|package|synchronized|" +
-    "boolean|do|if|private|this|" +
-    "break|double|implements|protected|throw|" +
-    "byte|else|import|public|throws|" +
-    "case|enum|instanceof|return|transient|" +
-    "catch|extends|int|short|try|" +
-    "char|final|interface|static|void|" +
-    "class|finally|long|strictfp|volatile|" +
-    "def|float|native|super|while").split("|")
-    );
-
-    var buildinConstants = lang.arrayToMap(
-        ("null|Infinity|NaN|undefined").split("|")
-    );
-
-    var langClasses = lang.arrayToMap(
-        ("AbstractMethodError|AssertionError|ClassCircularityError|"+
-        "ClassFormatError|Deprecated|EnumConstantNotPresentException|"+
-        "ExceptionInInitializerError|IllegalAccessError|"+
-        "IllegalThreadStateException|InstantiationError|InternalError|"+
-        "NegativeArraySizeException|NoSuchFieldError|Override|Process|"+
-        "ProcessBuilder|SecurityManager|StringIndexOutOfBoundsException|"+
-        "SuppressWarnings|TypeNotPresentException|UnknownError|"+
-        "UnsatisfiedLinkError|UnsupportedClassVersionError|VerifyError|"+
-        "InstantiationException|IndexOutOfBoundsException|"+
-        "ArrayIndexOutOfBoundsException|CloneNotSupportedException|"+
-        "NoSuchFieldException|IllegalArgumentException|NumberFormatException|"+
-        "SecurityException|Void|InheritableThreadLocal|IllegalStateException|"+
-        "InterruptedException|NoSuchMethodException|IllegalAccessException|"+
-        "UnsupportedOperationException|Enum|StrictMath|Package|Compiler|"+
-        "Readable|Runtime|StringBuilder|Math|IncompatibleClassChangeError|"+
-        "NoSuchMethodError|ThreadLocal|RuntimePermission|ArithmeticException|"+
-        "NullPointerException|Long|Integer|Short|Byte|Double|Number|Float|"+
-        "Character|Boolean|StackTraceElement|Appendable|StringBuffer|"+
-        "Iterable|ThreadGroup|Runnable|Thread|IllegalMonitorStateException|"+
-        "StackOverflowError|OutOfMemoryError|VirtualMachineError|"+
-        "ArrayStoreException|ClassCastException|LinkageError|"+
-        "NoClassDefFoundError|ClassNotFoundException|RuntimeException|"+
-        "Exception|ThreadDeath|Error|Throwable|System|ClassLoader|"+
-        "Cloneable|Class|CharSequence|Comparable|String|Object").split("|")
-    );
-    
-    var importClasses = lang.arrayToMap(
-        ("").split("|")
-    );
-    // regexp must not have capturing parentheses. Use (?:) instead.
-    // regexps are ordered -> the first match is used
-
-    this.$rules = {
-        "start" : [
-            {
-                token : "comment",
-                regex : "\\/\\/.*$"
-            },
-            new DocCommentHighlightRules().getStartRule("doc-start"),
-            {
-                token : "comment", // multi line comment
-                merge : true,
-                regex : "\\/\\*",
-                next : "comment"
-            }, {
-                token : "string.regexp",
-                regex : "[/](?:(?:\\[(?:\\\\]|[^\\]])+\\])|(?:\\\\/|[^\\]/]))*[/]\\w*\\s*(?=[).,;]|$)"
-            }, {
-                token : "string", // single line
-                regex : '["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'
-            }, {
-                token : "string", // single line
-                regex : "['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"
-            }, {
-                token : "constant.numeric", // hex
-                regex : "0[xX][0-9a-fA-F]+\\b"
-            }, {
-                token : "constant.numeric", // float
-                regex : "[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"
-            }, {
-                token : "constant.language.boolean",
-                regex : "(?:true|false)\\b"
-            }, {
-                token : function(value) {
-                    if (value == "this")
-                        return "variable.language";
-                    else if (keywords.hasOwnProperty(value))
-                        return "keyword";
-                    else if (langClasses.hasOwnProperty(value))
-                        return "support.function";
-                    else if (importClasses.hasOwnProperty(value))
-                        return "support.function";
-                    else if (buildinConstants.hasOwnProperty(value))
-                        return "constant.language";
-                    else
-                        return "identifier";
-                },
-                // TODO: Unicode escape sequences
-                // TODO: Unicode identifiers
-                regex : "[a-zA-Z_$][a-zA-Z0-9_$]*\\b"
-            }, {
-                token : "keyword.operator",
-                regex : "\\?:|\\?\\.|\\*\\.|<=>|=~|==~|\\.@|\\*\\.@|\\.&|as|in|is|!|\\$|%|&|\\*|\\-\\-|\\-|\\+\\+|\\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\\|\\||\\?\\:|\\*=|%=|\\+=|\\-=|&=|\\^=|\\b(?:in|instanceof|new|delete|typeof|void)"
-            }, {
-                token : "lparen",
-                regex : "[[({]"
-            }, {
-                token : "rparen",
-                regex : "[\\])}]"
-            }, {
-                token : "text",
-                regex : "\\s+"
-            }
-        ],
-        "comment" : [
-            {
-                token : "comment", // closing comment
-                regex : ".*?\\*\\/",
-                next : "start"
-            }, {
-                token : "comment", // comment spanning whole line
-                merge : true,
-                regex : ".+"
-            }
-        ]
-    };
-    
-    this.embedRules(DocCommentHighlightRules, "doc-",
-        [ new DocCommentHighlightRules().getEndRule("start") ]);
-};
-
-oop.inherits(GroovyHighlightRules, TextHighlightRules);
-
-exports.GroovyHighlightRules = GroovyHighlightRules;
-});
diff --git a/apps/files_texteditor/js/aceeditor/mode-groovy.js b/apps/files_texteditor/js/aceeditor/mode-groovy.js
deleted file mode 100644
index 1a036a462c..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-groovy.js
+++ /dev/null
@@ -1 +0,0 @@
-define("ace/mode/groovy",["require","exports","module","ace/lib/oop","ace/mode/javascript","ace/tokenizer","ace/mode/groovy_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./javascript").Mode,f=a("../tokenizer").Tokenizer,g=a("./groovy_highlight_rules").GroovyHighlightRules,h=function(){e.call(this),this.$tokenizer=new f((new g).getRules())};d.inherits(h,e),function(){this.createWorker=function(a){return null}}.call(h.prototype),b.Mode=h}),define("ace/mode/javascript",["require","exports","module","ace/lib/oop","ace/mode/text","ace/tokenizer","ace/mode/javascript_highlight_rules","ace/mode/matching_brace_outdent","ace/range","ace/worker/worker_client","ace/mode/behaviour/cstyle","ace/mode/folding/cstyle"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text").Mode,f=a("../tokenizer").Tokenizer,g=a("./javascript_highlight_rules").JavaScriptHighlightRules,h=a("./matching_brace_outdent").MatchingBraceOutdent,i=a("../range").Range,j=a("../worker/worker_client").WorkerClient,k=a("./behaviour/cstyle").CstyleBehaviour,l=a("./folding/cstyle").FoldMode,m=function(){this.$tokenizer=new f((new g).getRules()),this.$outdent=new h,this.$behaviour=new k,this.foldingRules=new l};d.inherits(m,e),function(){this.toggleCommentLines=function(a,b,c,d){var e=!0,f=/^(\s*)\/\//;for(var g=c;g<=d;g++)if(!f.test(b.getLine(g))){e=!1;break}if(e){var h=new i(0,0,0,0);for(var g=c;g<=d;g++){var j=b.getLine(g),k=j.match(f);h.start.row=g,h.end.row=g,h.end.column=k[0].length,b.replace(h,k[1])}}else b.indentRows(c,d,"//")},this.getNextLineIndent=function(a,b,c){var d=this.$getIndent(b),e=this.$tokenizer.getLineTokens(b,a),f=e.tokens,g=e.state;if(f.length&&f[f.length-1].type=="comment")return d;if(a=="start"||a=="regex_allowed"){var h=b.match(/^.*(?:\bcase\b.*\:|[\{\(\[])\s*$/);h&&(d+=c)}else if(a=="doc-start"){if(g=="start"||a=="regex_allowed")return"";var h=b.match(/^\s*(\/?)\*/);h&&(h[1]&&(d+=" "),d+="* ")}return d},this.checkOutdent=function(a,b,c){return this.$outdent.checkOutdent(b,c)},this.autoOutdent=function(a,b,c){this.$outdent.autoOutdent(b,c)},this.createWorker=function(a){var b=new j(["ace"],"worker-javascript.js","ace/mode/javascript_worker","JavaScriptWorker");return b.attachToDocument(a.getDocument()),b.on("jslint",function(b){var c=[];for(var d=0;d<b.data.length;d++){var e=b.data[d];e&&c.push({row:e.line-1,column:e.character-1,text:e.reason,type:"warning",lint:e})}a.setAnnotations(c)}),b.on("narcissus",function(b){a.setAnnotations([b.data])}),b.on("terminate",function(){a.clearAnnotations()}),b}}.call(m.prototype),b.Mode=m}),define("ace/mode/javascript_highlight_rules",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/unicode","ace/mode/doc_comment_highlight_rules","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("../lib/lang"),f=a("../unicode"),g=a("./doc_comment_highlight_rules").DocCommentHighlightRules,h=a("./text_highlight_rules").TextHighlightRules,i=function(){var a=e.arrayToMap("Array|Boolean|Date|Function|Iterator|Number|Object|RegExp|String|Proxy|Namespace|QName|XML|XMLList|ArrayBuffer|Float32Array|Float64Array|Int16Array|Int32Array|Int8Array|Uint16Array|Uint32Array|Uint8Array|Uint8ClampedArray|Error|EvalError|InternalError|RangeError|ReferenceError|StopIteration|SyntaxError|TypeError|URIError|decodeURI|decodeURIComponent|encodeURI|encodeURIComponent|eval|isFinite|isNaN|parseFloat|parseInt|JSON|Math|this|arguments|prototype|window|document".split("|")),b=e.arrayToMap("break|case|catch|continue|default|delete|do|else|finally|for|function|if|in|instanceof|new|return|switch|throw|try|typeof|let|var|while|with|const|yield|import|get|set".split("|")),c="case|do|else|finally|in|instanceof|return|throw|try|typeof|yield",d=e.arrayToMap("__parent__|__count__|escape|unescape|with|__proto__".split("|")),h=e.arrayToMap("const|let|var|function".split("|")),i=e.arrayToMap("null|Infinity|NaN|undefined".split("|")),j=e.arrayToMap("class|enum|extends|super|export|implements|private|public|interface|package|protected|static".split("|")),k="["+f.packages.L+"\\$_]["+f.packages.L+f.packages.Mn+f.packages.Mc+f.packages.Nd+f.packages.Pc+"\\$_]*\\b",l="\\\\(?:x[0-9a-fA-F]{2}|u[0-9a-fA-F]{4}|[0-2][0-7]{0,2}|3[0-6][0-7]?|37[0-7]?|[4-7][0-7]?|.)";this.$rules={start:[{token:"comment",regex:/\/\/.*$/},(new g).getStartRule("doc-start"),{token:"comment",merge:!0,regex:/\/\*/,next:"comment"},{token:"string",regex:"'",next:"qstring"},{token:"string",regex:'"',next:"qqstring"},{token:"constant.numeric",regex:/0[xX][0-9a-fA-F]+\b/},{token:"constant.numeric",regex:/[+-]?\d+(?:(?:\.\d*)?(?:[eE][+-]?\d+)?)?\b/},{token:["storage.type","punctuation.operator","support.function","punctuation.operator","entity.name.function","text","keyword.operator","text","storage.type","text","paren.lparen","variable.parameter","paren.rparen"],regex:"("+k+")(\\.)(prototype)(\\.)("+k+")(\\s*)(=)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"},{token:["storage.type","punctuation.operator","support.function","punctuation.operator","entity.name.function","text","keyword.operator","text"],regex:"("+k+")(\\.)(prototype)(\\.)("+k+")(\\s*)(=)(\\s*)"},{token:["storage.type","punctuation.operator","entity.name.function","text","keyword.operator","text","storage.type","text","paren.lparen","variable.parameter","paren.rparen"],regex:"("+k+")(\\.)("+k+")(\\s*)(=)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"},{token:["entity.name.function","text","keyword.operator","text","storage.type","text","paren.lparen","variable.parameter","paren.rparen"],regex:"("+k+")(\\s*)(=)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"},{token:["storage.type","text","entity.name.function","text","paren.lparen","variable.parameter","paren.rparen"],regex:"(function)(\\s+)("+k+")(\\s*)(\\()(.*?)(\\))"},{token:["entity.name.function","text","punctuation.operator","text","storage.type","text","paren.lparen","variable.parameter","paren.rparen"],regex:"("+k+")(\\s*)(:)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"},{token:["text","text","storage.type","text","paren.lparen","variable.parameter","paren.rparen"],regex:"(:)(\\s*)(function)?(\\s*)(\\()([^)]*)(\\))"},{token:"constant.language.boolean",regex:/(?:true|false)\b/},{token:"keyword",regex:"(?:"+c+")\\b",next:"regex_allowed"},{token:["punctuation.operator","support.function"],regex:/(\.)(s(?:h(?:ift|ow(?:Mod(?:elessDialog|alDialog)|Help))|croll(?:X|By(?:Pages|Lines)?|Y|To)?|t(?:opzzzz|rike)|i(?:n|zeToContent|debar|gnText)|ort|u(?:p|b(?:str(?:ing)?)?)|pli(?:ce|t)|e(?:nd|t(?:Re(?:sizable|questHeader)|M(?:i(?:nutes|lliseconds)|onth)|Seconds|Ho(?:tKeys|urs)|Year|Cursor|Time(?:out)?|Interval|ZOptions|Date|UTC(?:M(?:i(?:nutes|lliseconds)|onth)|Seconds|Hours|Date|FullYear)|FullYear|Active)|arch)|qrt|lice|avePreferences|mall)|h(?:ome|andleEvent)|navigate|c(?:har(?:CodeAt|At)|o(?:s|n(?:cat|textual|firm)|mpile)|eil|lear(?:Timeout|Interval)?|a(?:ptureEvents|ll)|reate(?:StyleSheet|Popup|EventObject))|t(?:o(?:GMTString|S(?:tring|ource)|U(?:TCString|pperCase)|Lo(?:caleString|werCase))|est|a(?:n|int(?:Enabled)?))|i(?:s(?:NaN|Finite)|ndexOf|talics)|d(?:isableExternalCapture|ump|etachEvent)|u(?:n(?:shift|taint|escape|watch)|pdateCommands)|j(?:oin|avaEnabled)|p(?:o(?:p|w)|ush|lugins.refresh|a(?:ddings|rse(?:Int|Float)?)|r(?:int|ompt|eference))|e(?:scape|nableExternalCapture|val|lementFromPoint|x(?:p|ec(?:Script|Command)?))|valueOf|UTC|queryCommand(?:State|Indeterm|Enabled|Value)|f(?:i(?:nd|le(?:ModifiedDate|Size|CreatedDate|UpdatedDate)|xed)|o(?:nt(?:size|color)|rward)|loor|romCharCode)|watch|l(?:ink|o(?:ad|g)|astIndexOf)|a(?:sin|nchor|cos|t(?:tachEvent|ob|an(?:2)?)|pply|lert|b(?:s|ort))|r(?:ou(?:nd|teEvents)|e(?:size(?:By|To)|calc|turnValue|place|verse|l(?:oad|ease(?:Capture|Events)))|andom)|g(?:o|et(?:ResponseHeader|M(?:i(?:nutes|lliseconds)|onth)|Se(?:conds|lection)|Hours|Year|Time(?:zoneOffset)?|Da(?:y|te)|UTC(?:M(?:i(?:nutes|lliseconds)|onth)|Seconds|Hours|Da(?:y|te)|FullYear)|FullYear|A(?:ttention|llResponseHeaders)))|m(?:in|ove(?:B(?:y|elow)|To(?:Absolute)?|Above)|ergeAttributes|a(?:tch|rgins|x))|b(?:toa|ig|o(?:ld|rderWidths)|link|ack))\b(?=\()/},{token:["punctuation.operator","support.function.dom"],regex:/(\.)(s(?:ub(?:stringData|mit)|plitText|e(?:t(?:NamedItem|Attribute(?:Node)?)|lect))|has(?:ChildNodes|Feature)|namedItem|c(?:l(?:ick|o(?:se|neNode))|reate(?:C(?:omment|DATASection|aption)|T(?:Head|extNode|Foot)|DocumentFragment|ProcessingInstruction|E(?:ntityReference|lement)|Attribute))|tabIndex|i(?:nsert(?:Row|Before|Cell|Data)|tem)|open|delete(?:Row|C(?:ell|aption)|T(?:Head|Foot)|Data)|focus|write(?:ln)?|a(?:dd|ppend(?:Child|Data))|re(?:set|place(?:Child|Data)|move(?:NamedItem|Child|Attribute(?:Node)?)?)|get(?:NamedItem|Element(?:sBy(?:Name|TagName)|ById)|Attribute(?:Node)?)|blur)\b(?=\()/},{token:["punctuation.operator","support.constant"],regex:/(\.)(s(?:ystemLanguage|cr(?:ipts|ollbars|een(?:X|Y|Top|Left))|t(?:yle(?:Sheets)?|atus(?:Text|bar)?)|ibling(?:Below|Above)|ource|uffixes|e(?:curity(?:Policy)?|l(?:ection|f)))|h(?:istory|ost(?:name)?|as(?:h|Focus))|y|X(?:MLDocument|SLDocument)|n(?:ext|ame(?:space(?:s|URI)|Prop))|M(?:IN_VALUE|AX_VALUE)|c(?:haracterSet|o(?:n(?:structor|trollers)|okieEnabled|lorDepth|mp(?:onents|lete))|urrent|puClass|l(?:i(?:p(?:boardData)?|entInformation)|osed|asses)|alle(?:e|r)|rypto)|t(?:o(?:olbar|p)|ext(?:Transform|Indent|Decoration|Align)|ags)|SQRT(?:1_2|2)|i(?:n(?:ner(?:Height|Width)|put)|ds|gnoreCase)|zIndex|o(?:scpu|n(?:readystatechange|Line)|uter(?:Height|Width)|p(?:sProfile|ener)|ffscreenBuffering)|NEGATIVE_INFINITY|d(?:i(?:splay|alog(?:Height|Top|Width|Left|Arguments)|rectories)|e(?:scription|fault(?:Status|Ch(?:ecked|arset)|View)))|u(?:ser(?:Profile|Language|Agent)|n(?:iqueID|defined)|pdateInterval)|_content|p(?:ixelDepth|ort|ersonalbar|kcs11|l(?:ugins|atform)|a(?:thname|dding(?:Right|Bottom|Top|Left)|rent(?:Window|Layer)?|ge(?:X(?:Offset)?|Y(?:Offset)?))|r(?:o(?:to(?:col|type)|duct(?:Sub)?|mpter)|e(?:vious|fix)))|e(?:n(?:coding|abledPlugin)|x(?:ternal|pando)|mbeds)|v(?:isibility|endor(?:Sub)?|Linkcolor)|URLUnencoded|P(?:I|OSITIVE_INFINITY)|f(?:ilename|o(?:nt(?:Size|Family|Weight)|rmName)|rame(?:s|Element)|gColor)|E|whiteSpace|l(?:i(?:stStyleType|n(?:eHeight|kColor))|o(?:ca(?:tion(?:bar)?|lName)|wsrc)|e(?:ngth|ft(?:Context)?)|a(?:st(?:M(?:odified|atch)|Index|Paren)|yer(?:s|X)|nguage))|a(?:pp(?:MinorVersion|Name|Co(?:deName|re)|Version)|vail(?:Height|Top|Width|Left)|ll|r(?:ity|guments)|Linkcolor|bove)|r(?:ight(?:Context)?|e(?:sponse(?:XML|Text)|adyState))|global|x|m(?:imeTypes|ultiline|enubar|argin(?:Right|Bottom|Top|Left))|L(?:N(?:10|2)|OG(?:10E|2E))|b(?:o(?:ttom|rder(?:Width|RightWidth|BottomWidth|Style|Color|TopWidth|LeftWidth))|ufferDepth|elow|ackground(?:Color|Image)))\b/},{token:["storage.type","punctuation.operator","support.function.firebug"],regex:/(console)(\.)(warn|info|log|error|time|timeEnd|assert)\b/},{token:function(c){return a.hasOwnProperty(c)?"variable.language":d.hasOwnProperty(c)?"invalid.deprecated":h.hasOwnProperty(c)?"storage.type":b.hasOwnProperty(c)?"keyword":i.hasOwnProperty(c)?"constant.language":j.hasOwnProperty(c)?"invalid.illegal":c=="debugger"?"invalid.deprecated":"identifier"},regex:k},{token:"keyword.operator",regex:/!|\$|%|&|\*|\-\-|\-|\+\+|\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\|\||\?\:|\*=|%=|\+=|\-=|&=|\^=|\b(?:in|instanceof|new|delete|typeof|void)/,next:"regex_allowed"},{token:"punctuation.operator",regex:/\?|\:|\,|\;|\./,next:"regex_allowed"},{token:"paren.lparen",regex:/[\[({]/,next:"regex_allowed"},{token:"paren.rparen",regex:/[\])}]/},{token:"keyword.operator",regex:/\/=?/,next:"regex_allowed"},{token:"comment",regex:/^#!.*$/},{token:"text",regex:/\s+/}],regex_allowed:[{token:"comment",merge:!0,regex:"\\/\\*",next:"comment_regex_allowed"},{token:"comment",regex:"\\/\\/.*$"},{token:"string.regexp",regex:"\\/",next:"regex",merge:!0},{token:"text",regex:"\\s+"},{token:"empty",regex:"",next:"start"}],regex:[{token:"regexp.keyword.operator",regex:"\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)",next:"regex"},{token:"string.regexp",regex:"/\\w*",next:"start",merge:!0},{token:"string.regexp",regex:"[^\\\\/\\[]+",next:"regex",merge:!0},{token:"string.regexp.charachterclass",regex:"\\[",next:"regex_character_class",merge:!0},{token:"empty",regex:"",next:"start"}],regex_character_class:[{token:"regexp.keyword.operator",regex:"\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)",next:"regex_character_class"},{token:"string.regexp.charachterclass",regex:"]",next:"regex",merge:!0},{token:"string.regexp.charachterclass",regex:"[^\\\\\\]]+",next:"regex_character_class",merge:!0},{token:"empty",regex:"",next:"start"}],comment_regex_allowed:[{token:"comment",regex:".*?\\*\\/",merge:!0,next:"regex_allowed"},{token:"comment",merge:!0,regex:".+"}],comment:[{token:"comment",regex:".*?\\*\\/",merge:!0,next:"start"},{token:"comment",merge:!0,regex:".+"}],qqstring:[{token:"constant.language.escape",regex:l},{token:"string",regex:'[^"\\\\]+'},{token:"string",regex:'"',next:"start"}],qstring:[{token:"constant.language.escape",regex:l},{token:"string",regex:"[^'\\\\]+"},{token:"string",regex:"'",next:"start"}]},this.embedRules(g,"doc-",[(new g).getEndRule("start")])};d.inherits(i,h),b.JavaScriptHighlightRules=i}),define("ace/mode/doc_comment_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text_highlight_rules").TextHighlightRules,f=function(){this.$rules={start:[{token:"comment.doc.tag",regex:"@[\\w\\d_]+"},{token:"comment.doc",merge:!0,regex:"\\s+"},{token:"comment.doc",merge:!0,regex:"TODO"},{token:"comment.doc",merge:!0,regex:"[^@\\*]+"},{token:"comment.doc",merge:!0,regex:"."}]}};d.inherits(f,e),function(){this.getStartRule=function(a){return{token:"comment.doc",merge:!0,regex:"\\/\\*(?=\\*)",next:a}},this.getEndRule=function(a){return{token:"comment.doc",merge:!0,regex:"\\*\\/",next:a}}}.call(f.prototype),b.DocCommentHighlightRules=f}),define("ace/mode/matching_brace_outdent",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../range").Range,e=function(){};(function(){this.checkOutdent=function(a,b){return/^\s+$/.test(a)?/^\s*\}/.test(b):!1},this.autoOutdent=function(a,b){var c=a.getLine(b),e=c.match(/^(\s*\})/);if(!e)return 0;var f=e[1].length,g=a.findMatchingBracket({row:b,column:f});if(!g||g.row==b)return 0;var h=this.$getIndent(a.getLine(g.row));a.replace(new d(b,0,b,f-1),h)},this.$getIndent=function(a){var b=a.match(/^(\s+)/);return b?b[1]:""}}).call(e.prototype),b.MatchingBraceOutdent=e}),define("ace/mode/behaviour/cstyle",["require","exports","module","ace/lib/oop","ace/mode/behaviour"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../behaviour").Behaviour,f=function(){this.add("braces","insertion",function(a,b,c,d,e){if(e=="{"){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"{"+g+"}",selection:!1}:{text:"{}",selection:[1,1]}}if(e=="}"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var k=d.$findOpeningBracket("}",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}else if(e=="\n"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var l=d.findMatchingBracket({row:h.row,column:h.column+1});if(!l)return null;var m=this.getNextLineIndent(a,i.substring(0,i.length-1),d.getTabString()),n=this.$getIndent(d.doc.getLine(l.row));return{text:"\n"+m+"\n"+n,selection:[1,m.length,1,m.length]}}}}),this.add("braces","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="{"){var g=d.doc.getLine(e.start.row),h=g.substring(e.end.column,e.end.column+1);if(h=="}")return e.end.column++,e}}),this.add("parens","insertion",function(a,b,c,d,e){if(e=="("){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"("+g+")",selection:!1}:{text:"()",selection:[1,1]}}if(e==")"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j==")"){var k=d.$findOpeningBracket(")",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}}),this.add("parens","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="("){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h==")")return e.end.column++,e}}),this.add("string_dquotes","insertion",function(a,b,c,d,e){if(e=='"'||e=="'"){var f=e,g=c.getSelectionRange(),h=d.doc.getTextRange(g);if(h!=="")return{text:f+h+f,selection:!1};var i=c.getCursorPosition(),j=d.doc.getLine(i.row),k=j.substring(i.column-1,i.column);if(k=="\\")return null;var l=d.getTokens(g.start.row,g.start.row)[0].tokens,m=0,n,o=-1;for(var p=0;p<l.length;p++){n=l[p],n.type=="string"?o=-1:o<0&&(o=n.value.indexOf(f));if(n.value.length+m>g.start.column)break;m+=l[p].value.length}if(!n||o<0&&n.type!=="comment"&&(n.type!=="string"||g.start.column!==n.value.length+m-1&&n.value.lastIndexOf(f)===n.value.length-1))return{text:f+f,selection:[1,1]};if(n&&n.type==="string"){var q=j.substring(i.column,i.column+1);if(q==f)return{text:"",selection:[1,1]}}}}),this.add("string_dquotes","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&(f=='"'||f=="'")){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h=='"')return e.end.column++,e}})};d.inherits(f,e),b.CstyleBehaviour=f}),define("ace/mode/folding/cstyle",["require","exports","module","ace/lib/oop","ace/range","ace/mode/folding/fold_mode"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../../range").Range,f=a("./fold_mode").FoldMode,g=b.FoldMode=function(){};d.inherits(g,f),function(){this.foldingStartMarker=/(\{|\[)[^\}\]]*$|^\s*(\/\*)/,this.foldingStopMarker=/^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/,this.getFoldWidgetRange=function(a,b,c){var d=a.getLine(c),f=d.match(this.foldingStartMarker);if(f){var g=f.index;if(f[1])return this.openingBracketBlock(a,f[1],c,g);var h=a.getCommentFoldRange(c,g+f[0].length);return h.end.column-=2,h}if(b!=="markbeginend")return;var f=d.match(this.foldingStopMarker);if(f){var g=f.index+f[0].length;if(f[2]){var h=a.getCommentFoldRange(c,g);return h.end.column-=2,h}var i={row:c,column:g},j=a.$findOpeningBracket(f[1],i);if(!j)return;return j.column++,i.column--,e.fromPoints(j,i)}}}.call(g.prototype)}),define("ace/mode/folding/fold_mode",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../../range").Range,e=b.FoldMode=function(){};(function(){this.foldingStartMarker=null,this.foldingStopMarker=null,this.getFoldWidget=function(a,b,c){var d=a.getLine(c);return this.foldingStartMarker.test(d)?"start":b=="markbeginend"&&this.foldingStopMarker&&this.foldingStopMarker.test(d)?"end":""},this.getFoldWidgetRange=function(a,b,c){return null},this.indentationBlock=function(a,b,c){var e=/^\s*/,f=b,g=b,h=a.getLine(b),i=c||h.length,j=h.match(e)[0].length,k=a.getLength();while(++b<k){h=a.getLine(b);var l=h.match(e)[0].length;if(l==h.length)continue;if(l<=j)break;g=b}if(g>f){var m=a.getLine(g).length;return new d(f,i,g,m)}},this.openingBracketBlock=function(a,b,c,e){var f={row:c,column:e+1},g=a.$findClosingBracket(b,f);if(!g)return;var h=a.foldWidgets[g.row];return h==null&&(h=this.getFoldWidget(a,g.row)),h=="start"&&(g.row--,g.column=a.getLine(g.row).length),d.fromPoints(f,g)}}).call(e.prototype)}),define("ace/mode/groovy_highlight_rules",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/mode/doc_comment_highlight_rules","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("../lib/lang"),f=a("./doc_comment_highlight_rules").DocCommentHighlightRules,g=a("./text_highlight_rules").TextHighlightRules,h=function(){var a=e.arrayToMap("assert|with|abstract|continue|for|new|switch|assert|default|goto|package|synchronized|boolean|do|if|private|this|break|double|implements|protected|throw|byte|else|import|public|throws|case|enum|instanceof|return|transient|catch|extends|int|short|try|char|final|interface|static|void|class|finally|long|strictfp|volatile|def|float|native|super|while".split("|")),b=e.arrayToMap("null|Infinity|NaN|undefined".split("|")),c=e.arrayToMap("AbstractMethodError|AssertionError|ClassCircularityError|ClassFormatError|Deprecated|EnumConstantNotPresentException|ExceptionInInitializerError|IllegalAccessError|IllegalThreadStateException|InstantiationError|InternalError|NegativeArraySizeException|NoSuchFieldError|Override|Process|ProcessBuilder|SecurityManager|StringIndexOutOfBoundsException|SuppressWarnings|TypeNotPresentException|UnknownError|UnsatisfiedLinkError|UnsupportedClassVersionError|VerifyError|InstantiationException|IndexOutOfBoundsException|ArrayIndexOutOfBoundsException|CloneNotSupportedException|NoSuchFieldException|IllegalArgumentException|NumberFormatException|SecurityException|Void|InheritableThreadLocal|IllegalStateException|InterruptedException|NoSuchMethodException|IllegalAccessException|UnsupportedOperationException|Enum|StrictMath|Package|Compiler|Readable|Runtime|StringBuilder|Math|IncompatibleClassChangeError|NoSuchMethodError|ThreadLocal|RuntimePermission|ArithmeticException|NullPointerException|Long|Integer|Short|Byte|Double|Number|Float|Character|Boolean|StackTraceElement|Appendable|StringBuffer|Iterable|ThreadGroup|Runnable|Thread|IllegalMonitorStateException|StackOverflowError|OutOfMemoryError|VirtualMachineError|ArrayStoreException|ClassCastException|LinkageError|NoClassDefFoundError|ClassNotFoundException|RuntimeException|Exception|ThreadDeath|Error|Throwable|System|ClassLoader|Cloneable|Class|CharSequence|Comparable|String|Object".split("|")),d=e.arrayToMap("".split("|"));this.$rules={start:[{token:"comment",regex:"\\/\\/.*$"},(new f).getStartRule("doc-start"),{token:"comment",merge:!0,regex:"\\/\\*",next:"comment"},{token:"string.regexp",regex:"[/](?:(?:\\[(?:\\\\]|[^\\]])+\\])|(?:\\\\/|[^\\]/]))*[/]\\w*\\s*(?=[).,;]|$)"},{token:"string",regex:'["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'},{token:"string",regex:"['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"},{token:"constant.numeric",regex:"0[xX][0-9a-fA-F]+\\b"},{token:"constant.numeric",regex:"[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"},{token:"constant.language.boolean",regex:"(?:true|false)\\b"},{token:function(e){return e=="this"?"variable.language":a.hasOwnProperty(e)?"keyword":c.hasOwnProperty(e)?"support.function":d.hasOwnProperty(e)?"support.function":b.hasOwnProperty(e)?"constant.language":"identifier"},regex:"[a-zA-Z_$][a-zA-Z0-9_$]*\\b"},{token:"keyword.operator",regex:"\\?:|\\?\\.|\\*\\.|<=>|=~|==~|\\.@|\\*\\.@|\\.&|as|in|is|!|\\$|%|&|\\*|\\-\\-|\\-|\\+\\+|\\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\\|\\||\\?\\:|\\*=|%=|\\+=|\\-=|&=|\\^=|\\b(?:in|instanceof|new|delete|typeof|void)"},{token:"lparen",regex:"[[({]"},{token:"rparen",regex:"[\\])}]"},{token:"text",regex:"\\s+"}],comment:[{token:"comment",regex:".*?\\*\\/",next:"start"},{token:"comment",merge:!0,regex:".+"}]},this.embedRules(f,"doc-",[(new f).getEndRule("start")])};d.inherits(h,g),b.GroovyHighlightRules=h})
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/mode-haxe-uncompressed.js b/apps/files_texteditor/js/aceeditor/mode-haxe-uncompressed.js
deleted file mode 100644
index 7efa04c5f6..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-haxe-uncompressed.js
+++ /dev/null
@@ -1,770 +0,0 @@
-define('ace/mode/haxe', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text', 'ace/tokenizer', 'ace/mode/haxe_highlight_rules', 'ace/mode/matching_brace_outdent', 'ace/mode/behaviour/cstyle', 'ace/mode/folding/cstyle'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
-var HaxeHighlightRules = require("./haxe_highlight_rules").HaxeHighlightRules;
-var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
-var CstyleBehaviour = require("./behaviour/cstyle").CstyleBehaviour;
-var CStyleFoldMode = require("./folding/cstyle").FoldMode;
-
-var Mode = function() {
-    this.$tokenizer = new Tokenizer(new HaxeHighlightRules().getRules());
-    this.$outdent = new MatchingBraceOutdent();
-    this.$behaviour = new CstyleBehaviour();
-    this.foldingRules = new CStyleFoldMode();
-};
-oop.inherits(Mode, TextMode);
-
-(function() {
-
-      this.getNextLineIndent = function(state, line, tab) {
-          var indent = this.$getIndent(line);
-
-          var tokenizedLine = this.$tokenizer.getLineTokens(line, state);
-          var tokens = tokenizedLine.tokens;
-
-          if (tokens.length && tokens[tokens.length-1].type == "comment") {
-              return indent;
-          }
-
-          if (state == "start") {
-              var match = line.match(/^.*[\{\(\[]\s*$/);
-              if (match) {
-                  indent += tab;
-              }
-          }
-
-          return indent;
-      };
-
-      this.checkOutdent = function(state, line, input) {
-          return this.$outdent.checkOutdent(line, input);
-      };
-
-      this.autoOutdent = function(state, doc, row) {
-          this.$outdent.autoOutdent(doc, row);
-      };
-
-
-    this.createWorker = function(session) {
-        return null;
-    };
-
-}).call(Mode.prototype);
-
-exports.Mode = Mode;
-});
-define('ace/mode/haxe_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/lang', 'ace/mode/doc_comment_highlight_rules', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var lang = require("../lib/lang");
-var DocCommentHighlightRules = require("./doc_comment_highlight_rules").DocCommentHighlightRules;
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-
-var HaxeHighlightRules = function() {
-
-    var keywords = lang.arrayToMap(
-        ("break|case|cast|catch|class|continue|default|else|enum|extends|for|function|if|implements|import|in|inline|interface|new|override|package|private|public|return|static|super|switch|this|throw|trace|try|typedef|untyped|var|while|Array|Void|Bool|Int|UInt|Float|Dynamic|String|List|Hash|IntHash|Error|Unknown|Type|Std").split("|")
-    );
-
-    var buildinConstants = lang.arrayToMap(
-        ("null|true|false").split("|")
-    );
-
-
-    // regexp must not have capturing parentheses. Use (?:) instead.
-    // regexps are ordered -> the first match is used
-
-    this.$rules = {
-        "start" : [
-            {
-                token : "comment",
-                regex : "\\/\\/.*$"
-            },
-            new DocCommentHighlightRules().getStartRule("doc-start"),
-            {
-                token : "comment", // multi line comment
-                regex : "\\/\\*",
-                merge : true,
-                next : "comment"
-            }, {
-                token : "string.regexp",
-                regex : "[/](?:(?:\\[(?:\\\\]|[^\\]])+\\])|(?:\\\\/|[^\\]/]))*[/]\\w*\\s*(?=[).,;]|$)"
-            }, {
-                token : "string", // single line
-                regex : '["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'
-            }, {
-                token : "string", // single line
-                regex : "['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"
-            }, {
-                token : "constant.numeric", // hex
-                regex : "0[xX][0-9a-fA-F]+\\b"
-            }, {
-                token : "constant.numeric", // float
-                regex : "[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"
-            }, {
-                token : "constant.language.boolean",
-                regex : "(?:true|false)\\b"
-            }, {
-                token : function(value) {
-                    if (value == "this")
-                        return "variable.language";
-                    else if (keywords.hasOwnProperty(value))
-                        return "keyword";
-                    else if (buildinConstants.hasOwnProperty(value))
-                        return "constant.language";
-                    else
-                        return "identifier";
-                },
-                // TODO: Unicode escape sequences
-                // TODO: Unicode identifiers
-                regex : "[a-zA-Z_$][a-zA-Z0-9_$]*\\b"
-            }, {
-                token : "keyword.operator",
-                regex : "!|\\$|%|&|\\*|\\-\\-|\\-|\\+\\+|\\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\\|\\||\\?\\:|\\*=|%=|\\+=|\\-=|&=|\\^=|\\b(?:in|instanceof|new|delete|typeof|void)"
-            }, {
-                token : "punctuation.operator",
-                regex : "\\?|\\:|\\,|\\;|\\."
-            }, {
-                token : "paren.lparen",
-                regex : "[[({<]"
-            }, {
-                token : "paren.rparen",
-                regex : "[\\])}>]"
-            }, {
-                token : "text",
-                regex : "\\s+"
-            }
-        ],
-        "comment" : [
-            {
-                token : "comment", // closing comment
-                regex : ".*?\\*\\/",
-                next : "start"
-            }, {
-                token : "comment", // comment spanning whole line
-                merge : true,
-                regex : ".+"
-            }
-        ]
-    };
-
-    this.embedRules(DocCommentHighlightRules, "doc-",
-        [ new DocCommentHighlightRules().getEndRule("start") ]);
-};
-
-oop.inherits(HaxeHighlightRules, TextHighlightRules);
-
-exports.HaxeHighlightRules = HaxeHighlightRules;
-});
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/doc_comment_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-
-var DocCommentHighlightRules = function() {
-
-    this.$rules = {
-        "start" : [ {
-            token : "comment.doc.tag",
-            regex : "@[\\w\\d_]+" // TODO: fix email addresses
-        }, {
-            token : "comment.doc",
-            merge : true,
-            regex : "\\s+"
-        }, {
-            token : "comment.doc",
-            merge : true,
-            regex : "TODO"
-        }, {
-            token : "comment.doc",
-            merge : true,
-            regex : "[^@\\*]+"
-        }, {
-            token : "comment.doc",
-            merge : true,
-            regex : "."
-        }]
-    };
-};
-
-oop.inherits(DocCommentHighlightRules, TextHighlightRules);
-
-(function() {
-
-    this.getStartRule = function(start) {
-        return {
-            token : "comment.doc", // doc comment
-            merge : true,
-            regex : "\\/\\*(?=\\*)",
-            next  : start
-        };
-    };
-    
-    this.getEndRule = function (start) {
-        return {
-            token : "comment.doc", // closing comment
-            merge : true,
-            regex : "\\*\\/",
-            next  : start
-        };
-    };
-
-}).call(DocCommentHighlightRules.prototype);
-
-exports.DocCommentHighlightRules = DocCommentHighlightRules;
-
-});
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/matching_brace_outdent', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
-"use strict";
-
-var Range = require("../range").Range;
-
-var MatchingBraceOutdent = function() {};
-
-(function() {
-
-    this.checkOutdent = function(line, input) {
-        if (! /^\s+$/.test(line))
-            return false;
-
-        return /^\s*\}/.test(input);
-    };
-
-    this.autoOutdent = function(doc, row) {
-        var line = doc.getLine(row);
-        var match = line.match(/^(\s*\})/);
-
-        if (!match) return 0;
-
-        var column = match[1].length;
-        var openBracePos = doc.findMatchingBracket({row: row, column: column});
-
-        if (!openBracePos || openBracePos.row == row) return 0;
-
-        var indent = this.$getIndent(doc.getLine(openBracePos.row));
-        doc.replace(new Range(row, 0, row, column-1), indent);
-    };
-
-    this.$getIndent = function(line) {
-        var match = line.match(/^(\s+)/);
-        if (match) {
-            return match[1];
-        }
-
-        return "";
-    };
-
-}).call(MatchingBraceOutdent.prototype);
-
-exports.MatchingBraceOutdent = MatchingBraceOutdent;
-});
-/* vim:ts=4:sts=4:sw=4:
- * ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Chris Spencer <chris.ag.spencer AT googlemail DOT com>
- *
- * 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 ***** */
-
-define('ace/mode/behaviour/cstyle', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/behaviour'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../../lib/oop");
-var Behaviour = require('../behaviour').Behaviour;
-
-var CstyleBehaviour = function () {
-
-    this.add("braces", "insertion", function (state, action, editor, session, text) {
-        if (text == '{') {
-            var selection = editor.getSelectionRange();
-            var selected = session.doc.getTextRange(selection);
-            if (selected !== "") {
-                return {
-                    text: '{' + selected + '}',
-                    selection: false
-                };
-            } else {
-                return {
-                    text: '{}',
-                    selection: [1, 1]
-                };
-            }
-        } else if (text == '}') {
-            var cursor = editor.getCursorPosition();
-            var line = session.doc.getLine(cursor.row);
-            var rightChar = line.substring(cursor.column, cursor.column + 1);
-            if (rightChar == '}') {
-                var matching = session.$findOpeningBracket('}', {column: cursor.column + 1, row: cursor.row});
-                if (matching !== null) {
-                    return {
-                        text: '',
-                        selection: [1, 1]
-                    };
-                }
-            }
-        } else if (text == "\n") {
-            var cursor = editor.getCursorPosition();
-            var line = session.doc.getLine(cursor.row);
-            var rightChar = line.substring(cursor.column, cursor.column + 1);
-            if (rightChar == '}') {
-                var openBracePos = session.findMatchingBracket({row: cursor.row, column: cursor.column + 1});
-                if (!openBracePos)
-                     return null;
-
-                var indent = this.getNextLineIndent(state, line.substring(0, line.length - 1), session.getTabString());
-                var next_indent = this.$getIndent(session.doc.getLine(openBracePos.row));
-
-                return {
-                    text: '\n' + indent + '\n' + next_indent,
-                    selection: [1, indent.length, 1, indent.length]
-                };
-            }
-        }
-    });
-
-    this.add("braces", "deletion", function (state, action, editor, session, range) {
-        var selected = session.doc.getTextRange(range);
-        if (!range.isMultiLine() && selected == '{') {
-            var line = session.doc.getLine(range.start.row);
-            var rightChar = line.substring(range.end.column, range.end.column + 1);
-            if (rightChar == '}') {
-                range.end.column++;
-                return range;
-            }
-        }
-    });
-
-    this.add("parens", "insertion", function (state, action, editor, session, text) {
-        if (text == '(') {
-            var selection = editor.getSelectionRange();
-            var selected = session.doc.getTextRange(selection);
-            if (selected !== "") {
-                return {
-                    text: '(' + selected + ')',
-                    selection: false
-                };
-            } else {
-                return {
-                    text: '()',
-                    selection: [1, 1]
-                };
-            }
-        } else if (text == ')') {
-            var cursor = editor.getCursorPosition();
-            var line = session.doc.getLine(cursor.row);
-            var rightChar = line.substring(cursor.column, cursor.column + 1);
-            if (rightChar == ')') {
-                var matching = session.$findOpeningBracket(')', {column: cursor.column + 1, row: cursor.row});
-                if (matching !== null) {
-                    return {
-                        text: '',
-                        selection: [1, 1]
-                    };
-                }
-            }
-        }
-    });
-
-    this.add("parens", "deletion", function (state, action, editor, session, range) {
-        var selected = session.doc.getTextRange(range);
-        if (!range.isMultiLine() && selected == '(') {
-            var line = session.doc.getLine(range.start.row);
-            var rightChar = line.substring(range.start.column + 1, range.start.column + 2);
-            if (rightChar == ')') {
-                range.end.column++;
-                return range;
-            }
-        }
-    });
-
-    this.add("string_dquotes", "insertion", function (state, action, editor, session, text) {
-        if (text == '"' || text == "'") {
-            var quote = text;
-            var selection = editor.getSelectionRange();
-            var selected = session.doc.getTextRange(selection);
-            if (selected !== "") {
-                return {
-                    text: quote + selected + quote,
-                    selection: false
-                };
-            } else {
-                var cursor = editor.getCursorPosition();
-                var line = session.doc.getLine(cursor.row);
-                var leftChar = line.substring(cursor.column-1, cursor.column);
-
-                // We're escaped.
-                if (leftChar == '\\') {
-                    return null;
-                }
-
-                // Find what token we're inside.
-                var tokens = session.getTokens(selection.start.row, selection.start.row)[0].tokens;
-                var col = 0, token;
-                var quotepos = -1; // Track whether we're inside an open quote.
-
-                for (var x = 0; x < tokens.length; x++) {
-                    token = tokens[x];
-                    if (token.type == "string") {
-                      quotepos = -1;
-                    } else if (quotepos < 0) {
-                      quotepos = token.value.indexOf(quote);
-                    }
-                    if ((token.value.length + col) > selection.start.column) {
-                        break;
-                    }
-                    col += tokens[x].value.length;
-                }
-
-                // Try and be smart about when we auto insert.
-                if (!token || (quotepos < 0 && token.type !== "comment" && (token.type !== "string" || ((selection.start.column !== token.value.length+col-1) && token.value.lastIndexOf(quote) === token.value.length-1)))) {
-                    return {
-                        text: quote + quote,
-                        selection: [1,1]
-                    };
-                } else if (token && token.type === "string") {
-                    // Ignore input and move right one if we're typing over the closing quote.
-                    var rightChar = line.substring(cursor.column, cursor.column + 1);
-                    if (rightChar == quote) {
-                        return {
-                            text: '',
-                            selection: [1, 1]
-                        };
-                    }
-                }
-            }
-        }
-    });
-
-    this.add("string_dquotes", "deletion", function (state, action, editor, session, range) {
-        var selected = session.doc.getTextRange(range);
-        if (!range.isMultiLine() && (selected == '"' || selected == "'")) {
-            var line = session.doc.getLine(range.start.row);
-            var rightChar = line.substring(range.start.column + 1, range.start.column + 2);
-            if (rightChar == '"') {
-                range.end.column++;
-                return range;
-            }
-        }
-    });
-
-};
-
-oop.inherits(CstyleBehaviour, Behaviour);
-
-exports.CstyleBehaviour = CstyleBehaviour;
-});/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/folding/cstyle', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/range', 'ace/mode/folding/fold_mode'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../../lib/oop");
-var Range = require("../../range").Range;
-var BaseFoldMode = require("./fold_mode").FoldMode;
-
-var FoldMode = exports.FoldMode = function() {};
-oop.inherits(FoldMode, BaseFoldMode);
-
-(function() {
-
-    this.foldingStartMarker = /(\{|\[)[^\}\]]*$|^\s*(\/\*)/;
-    this.foldingStopMarker = /^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/;
-    
-    this.getFoldWidgetRange = function(session, foldStyle, row) {
-        var line = session.getLine(row);
-        var match = line.match(this.foldingStartMarker);
-        if (match) {
-            var i = match.index;
-
-            if (match[1])
-                return this.openingBracketBlock(session, match[1], row, i);
-
-            var range = session.getCommentFoldRange(row, i + match[0].length);
-            range.end.column -= 2;
-            return range;
-        }
-
-        if (foldStyle !== "markbeginend")
-            return;
-            
-        var match = line.match(this.foldingStopMarker);
-        if (match) {
-            var i = match.index + match[0].length;
-
-            if (match[2]) {
-                var range = session.getCommentFoldRange(row, i);
-                range.end.column -= 2;
-                return range;
-            }
-
-            var end = {row: row, column: i};
-            var start = session.$findOpeningBracket(match[1], end);
-            
-            if (!start)
-                return;
-
-            start.column++;
-            end.column--;
-
-            return  Range.fromPoints(start, end);
-        }
-    };
-    
-}).call(FoldMode.prototype);
-
-});/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/folding/fold_mode', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
-"use strict";
-
-var Range = require("../../range").Range;
-
-var FoldMode = exports.FoldMode = function() {};
-
-(function() {
-
-    this.foldingStartMarker = null;
-    this.foldingStopMarker = null;
-
-    // must return "" if there's no fold, to enable caching
-    this.getFoldWidget = function(session, foldStyle, row) {
-        var line = session.getLine(row);
-        if (this.foldingStartMarker.test(line))
-            return "start";
-        if (foldStyle == "markbeginend"
-                && this.foldingStopMarker
-                && this.foldingStopMarker.test(line))
-            return "end";
-        return "";
-    };
-    
-    this.getFoldWidgetRange = function(session, foldStyle, row) {
-        return null;
-    };
-
-    this.indentationBlock = function(session, row, column) {
-        var re = /^\s*/;
-        var startRow = row;
-        var endRow = row;
-        var line = session.getLine(row);
-        var startColumn = column || line.length;
-        var startLevel = line.match(re)[0].length;
-        var maxRow = session.getLength()
-        
-        while (++row < maxRow) {
-            line = session.getLine(row);
-            var level = line.match(re)[0].length;
-
-            if (level == line.length)
-                continue;
-
-            if (level <= startLevel)
-                break;
-
-            endRow = row;
-        }
-
-        if (endRow > startRow) {
-            var endColumn = session.getLine(endRow).length;
-            return new Range(startRow, startColumn, endRow, endColumn);
-        }
-    };
-
-    this.openingBracketBlock = function(session, bracket, row, column) {
-        var start = {row: row, column: column + 1};
-        var end = session.$findClosingBracket(bracket, start);
-        if (!end)
-            return;
-
-        var fw = session.foldWidgets[end.row];
-        if (fw == null)
-            fw = this.getFoldWidget(session, end.row);
-
-        if (fw == "start") {
-            end.row --;
-            end.column = session.getLine(end.row).length;
-        }
-        return Range.fromPoints(start, end);
-    };
-
-}).call(FoldMode.prototype);
-
-});
diff --git a/apps/files_texteditor/js/aceeditor/mode-haxe.js b/apps/files_texteditor/js/aceeditor/mode-haxe.js
deleted file mode 100644
index 0c0d15f393..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-haxe.js
+++ /dev/null
@@ -1 +0,0 @@
-define("ace/mode/haxe",["require","exports","module","ace/lib/oop","ace/mode/text","ace/tokenizer","ace/mode/haxe_highlight_rules","ace/mode/matching_brace_outdent","ace/mode/behaviour/cstyle","ace/mode/folding/cstyle"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text").Mode,f=a("../tokenizer").Tokenizer,g=a("./haxe_highlight_rules").HaxeHighlightRules,h=a("./matching_brace_outdent").MatchingBraceOutdent,i=a("./behaviour/cstyle").CstyleBehaviour,j=a("./folding/cstyle").FoldMode,k=function(){this.$tokenizer=new f((new g).getRules()),this.$outdent=new h,this.$behaviour=new i,this.foldingRules=new j};d.inherits(k,e),function(){this.getNextLineIndent=function(a,b,c){var d=this.$getIndent(b),e=this.$tokenizer.getLineTokens(b,a),f=e.tokens;if(f.length&&f[f.length-1].type=="comment")return d;if(a=="start"){var g=b.match(/^.*[\{\(\[]\s*$/);g&&(d+=c)}return d},this.checkOutdent=function(a,b,c){return this.$outdent.checkOutdent(b,c)},this.autoOutdent=function(a,b,c){this.$outdent.autoOutdent(b,c)},this.createWorker=function(a){return null}}.call(k.prototype),b.Mode=k}),define("ace/mode/haxe_highlight_rules",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/mode/doc_comment_highlight_rules","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("../lib/lang"),f=a("./doc_comment_highlight_rules").DocCommentHighlightRules,g=a("./text_highlight_rules").TextHighlightRules,h=function(){var a=e.arrayToMap("break|case|cast|catch|class|continue|default|else|enum|extends|for|function|if|implements|import|in|inline|interface|new|override|package|private|public|return|static|super|switch|this|throw|trace|try|typedef|untyped|var|while|Array|Void|Bool|Int|UInt|Float|Dynamic|String|List|Hash|IntHash|Error|Unknown|Type|Std".split("|")),b=e.arrayToMap("null|true|false".split("|"));this.$rules={start:[{token:"comment",regex:"\\/\\/.*$"},(new f).getStartRule("doc-start"),{token:"comment",regex:"\\/\\*",merge:!0,next:"comment"},{token:"string.regexp",regex:"[/](?:(?:\\[(?:\\\\]|[^\\]])+\\])|(?:\\\\/|[^\\]/]))*[/]\\w*\\s*(?=[).,;]|$)"},{token:"string",regex:'["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'},{token:"string",regex:"['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"},{token:"constant.numeric",regex:"0[xX][0-9a-fA-F]+\\b"},{token:"constant.numeric",regex:"[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"},{token:"constant.language.boolean",regex:"(?:true|false)\\b"},{token:function(c){return c=="this"?"variable.language":a.hasOwnProperty(c)?"keyword":b.hasOwnProperty(c)?"constant.language":"identifier"},regex:"[a-zA-Z_$][a-zA-Z0-9_$]*\\b"},{token:"keyword.operator",regex:"!|\\$|%|&|\\*|\\-\\-|\\-|\\+\\+|\\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\\|\\||\\?\\:|\\*=|%=|\\+=|\\-=|&=|\\^=|\\b(?:in|instanceof|new|delete|typeof|void)"},{token:"punctuation.operator",regex:"\\?|\\:|\\,|\\;|\\."},{token:"paren.lparen",regex:"[[({<]"},{token:"paren.rparen",regex:"[\\])}>]"},{token:"text",regex:"\\s+"}],comment:[{token:"comment",regex:".*?\\*\\/",next:"start"},{token:"comment",merge:!0,regex:".+"}]},this.embedRules(f,"doc-",[(new f).getEndRule("start")])};d.inherits(h,g),b.HaxeHighlightRules=h}),define("ace/mode/doc_comment_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text_highlight_rules").TextHighlightRules,f=function(){this.$rules={start:[{token:"comment.doc.tag",regex:"@[\\w\\d_]+"},{token:"comment.doc",merge:!0,regex:"\\s+"},{token:"comment.doc",merge:!0,regex:"TODO"},{token:"comment.doc",merge:!0,regex:"[^@\\*]+"},{token:"comment.doc",merge:!0,regex:"."}]}};d.inherits(f,e),function(){this.getStartRule=function(a){return{token:"comment.doc",merge:!0,regex:"\\/\\*(?=\\*)",next:a}},this.getEndRule=function(a){return{token:"comment.doc",merge:!0,regex:"\\*\\/",next:a}}}.call(f.prototype),b.DocCommentHighlightRules=f}),define("ace/mode/matching_brace_outdent",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../range").Range,e=function(){};(function(){this.checkOutdent=function(a,b){return/^\s+$/.test(a)?/^\s*\}/.test(b):!1},this.autoOutdent=function(a,b){var c=a.getLine(b),e=c.match(/^(\s*\})/);if(!e)return 0;var f=e[1].length,g=a.findMatchingBracket({row:b,column:f});if(!g||g.row==b)return 0;var h=this.$getIndent(a.getLine(g.row));a.replace(new d(b,0,b,f-1),h)},this.$getIndent=function(a){var b=a.match(/^(\s+)/);return b?b[1]:""}}).call(e.prototype),b.MatchingBraceOutdent=e}),define("ace/mode/behaviour/cstyle",["require","exports","module","ace/lib/oop","ace/mode/behaviour"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../behaviour").Behaviour,f=function(){this.add("braces","insertion",function(a,b,c,d,e){if(e=="{"){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"{"+g+"}",selection:!1}:{text:"{}",selection:[1,1]}}if(e=="}"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var k=d.$findOpeningBracket("}",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}else if(e=="\n"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var l=d.findMatchingBracket({row:h.row,column:h.column+1});if(!l)return null;var m=this.getNextLineIndent(a,i.substring(0,i.length-1),d.getTabString()),n=this.$getIndent(d.doc.getLine(l.row));return{text:"\n"+m+"\n"+n,selection:[1,m.length,1,m.length]}}}}),this.add("braces","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="{"){var g=d.doc.getLine(e.start.row),h=g.substring(e.end.column,e.end.column+1);if(h=="}")return e.end.column++,e}}),this.add("parens","insertion",function(a,b,c,d,e){if(e=="("){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"("+g+")",selection:!1}:{text:"()",selection:[1,1]}}if(e==")"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j==")"){var k=d.$findOpeningBracket(")",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}}),this.add("parens","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="("){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h==")")return e.end.column++,e}}),this.add("string_dquotes","insertion",function(a,b,c,d,e){if(e=='"'||e=="'"){var f=e,g=c.getSelectionRange(),h=d.doc.getTextRange(g);if(h!=="")return{text:f+h+f,selection:!1};var i=c.getCursorPosition(),j=d.doc.getLine(i.row),k=j.substring(i.column-1,i.column);if(k=="\\")return null;var l=d.getTokens(g.start.row,g.start.row)[0].tokens,m=0,n,o=-1;for(var p=0;p<l.length;p++){n=l[p],n.type=="string"?o=-1:o<0&&(o=n.value.indexOf(f));if(n.value.length+m>g.start.column)break;m+=l[p].value.length}if(!n||o<0&&n.type!=="comment"&&(n.type!=="string"||g.start.column!==n.value.length+m-1&&n.value.lastIndexOf(f)===n.value.length-1))return{text:f+f,selection:[1,1]};if(n&&n.type==="string"){var q=j.substring(i.column,i.column+1);if(q==f)return{text:"",selection:[1,1]}}}}),this.add("string_dquotes","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&(f=='"'||f=="'")){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h=='"')return e.end.column++,e}})};d.inherits(f,e),b.CstyleBehaviour=f}),define("ace/mode/folding/cstyle",["require","exports","module","ace/lib/oop","ace/range","ace/mode/folding/fold_mode"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../../range").Range,f=a("./fold_mode").FoldMode,g=b.FoldMode=function(){};d.inherits(g,f),function(){this.foldingStartMarker=/(\{|\[)[^\}\]]*$|^\s*(\/\*)/,this.foldingStopMarker=/^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/,this.getFoldWidgetRange=function(a,b,c){var d=a.getLine(c),f=d.match(this.foldingStartMarker);if(f){var g=f.index;if(f[1])return this.openingBracketBlock(a,f[1],c,g);var h=a.getCommentFoldRange(c,g+f[0].length);return h.end.column-=2,h}if(b!=="markbeginend")return;var f=d.match(this.foldingStopMarker);if(f){var g=f.index+f[0].length;if(f[2]){var h=a.getCommentFoldRange(c,g);return h.end.column-=2,h}var i={row:c,column:g},j=a.$findOpeningBracket(f[1],i);if(!j)return;return j.column++,i.column--,e.fromPoints(j,i)}}}.call(g.prototype)}),define("ace/mode/folding/fold_mode",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../../range").Range,e=b.FoldMode=function(){};(function(){this.foldingStartMarker=null,this.foldingStopMarker=null,this.getFoldWidget=function(a,b,c){var d=a.getLine(c);return this.foldingStartMarker.test(d)?"start":b=="markbeginend"&&this.foldingStopMarker&&this.foldingStopMarker.test(d)?"end":""},this.getFoldWidgetRange=function(a,b,c){return null},this.indentationBlock=function(a,b,c){var e=/^\s*/,f=b,g=b,h=a.getLine(b),i=c||h.length,j=h.match(e)[0].length,k=a.getLength();while(++b<k){h=a.getLine(b);var l=h.match(e)[0].length;if(l==h.length)continue;if(l<=j)break;g=b}if(g>f){var m=a.getLine(g).length;return new d(f,i,g,m)}},this.openingBracketBlock=function(a,b,c,e){var f={row:c,column:e+1},g=a.$findClosingBracket(b,f);if(!g)return;var h=a.foldWidgets[g.row];return h==null&&(h=this.getFoldWidget(a,g.row)),h=="start"&&(g.row--,g.column=a.getLine(g.row).length),d.fromPoints(f,g)}}).call(e.prototype)})
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/mode-html-uncompressed.js b/apps/files_texteditor/js/aceeditor/mode-html-uncompressed.js
deleted file mode 100644
index 62d0ce1439..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-html-uncompressed.js
+++ /dev/null
@@ -1,2449 +0,0 @@
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/html', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text', 'ace/mode/javascript', 'ace/mode/css', 'ace/tokenizer', 'ace/mode/html_highlight_rules', 'ace/mode/behaviour/xml', 'ace/mode/folding/html'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var TextMode = require("./text").Mode;
-var JavaScriptMode = require("./javascript").Mode;
-var CssMode = require("./css").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
-var HtmlHighlightRules = require("./html_highlight_rules").HtmlHighlightRules;
-var XmlBehaviour = require("./behaviour/xml").XmlBehaviour;
-var HtmlFoldMode = require("./folding/html").FoldMode;
-
-var Mode = function() {
-    var highlighter = new HtmlHighlightRules();
-    this.$tokenizer = new Tokenizer(highlighter.getRules());
-    this.$behaviour = new XmlBehaviour();
-    
-    this.$embeds = highlighter.getEmbeds();
-    this.createModeDelegates({
-        "js-": JavaScriptMode,
-        "css-": CssMode
-    });
-    
-    this.foldingRules = new HtmlFoldMode();
-};
-oop.inherits(Mode, TextMode);
-
-(function() {
-
-    
-    this.toggleCommentLines = function(state, doc, startRow, endRow) {
-        return 0;
-    };
-
-    this.getNextLineIndent = function(state, line, tab) {
-        return this.$getIndent(line);
-    };
-
-    this.checkOutdent = function(state, line, input) {
-        return false;
-    };
-
-}).call(Mode.prototype);
-
-exports.Mode = Mode;
-});
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/javascript', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text', 'ace/tokenizer', 'ace/mode/javascript_highlight_rules', 'ace/mode/matching_brace_outdent', 'ace/range', 'ace/worker/worker_client', 'ace/mode/behaviour/cstyle', 'ace/mode/folding/cstyle'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
-var JavaScriptHighlightRules = require("./javascript_highlight_rules").JavaScriptHighlightRules;
-var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
-var Range = require("../range").Range;
-var WorkerClient = require("../worker/worker_client").WorkerClient;
-var CstyleBehaviour = require("./behaviour/cstyle").CstyleBehaviour;
-var CStyleFoldMode = require("./folding/cstyle").FoldMode;
-
-var Mode = function() {
-    this.$tokenizer = new Tokenizer(new JavaScriptHighlightRules().getRules());
-    this.$outdent = new MatchingBraceOutdent();
-    this.$behaviour = new CstyleBehaviour();
-    this.foldingRules = new CStyleFoldMode();
-};
-oop.inherits(Mode, TextMode);
-
-(function() {
-
-
-    this.toggleCommentLines = function(state, doc, startRow, endRow) {
-        var outdent = true;
-        var re = /^(\s*)\/\//;
-
-        for (var i=startRow; i<= endRow; i++) {
-            if (!re.test(doc.getLine(i))) {
-                outdent = false;
-                break;
-            }
-        }
-
-        if (outdent) {
-            var deleteRange = new Range(0, 0, 0, 0);
-            for (var i=startRow; i<= endRow; i++)
-            {
-                var line = doc.getLine(i);
-                var m = line.match(re);
-                deleteRange.start.row = i;
-                deleteRange.end.row = i;
-                deleteRange.end.column = m[0].length;
-                doc.replace(deleteRange, m[1]);
-            }
-        }
-        else {
-            doc.indentRows(startRow, endRow, "//");
-        }
-    };
-
-    this.getNextLineIndent = function(state, line, tab) {
-        var indent = this.$getIndent(line);
-
-        var tokenizedLine = this.$tokenizer.getLineTokens(line, state);
-        var tokens = tokenizedLine.tokens;
-        var endState = tokenizedLine.state;
-
-        if (tokens.length && tokens[tokens.length-1].type == "comment") {
-            return indent;
-        }
-        
-        if (state == "start" || state == "regex_allowed") {
-            var match = line.match(/^.*(?:\bcase\b.*\:|[\{\(\[])\s*$/);
-            if (match) {
-                indent += tab;
-            }
-        } else if (state == "doc-start") {
-            if (endState == "start" || state == "regex_allowed") {
-                return "";
-            }
-            var match = line.match(/^\s*(\/?)\*/);
-            if (match) {
-                if (match[1]) {
-                    indent += " ";
-                }
-                indent += "* ";
-            }
-        }
-
-        return indent;
-    };
-
-    this.checkOutdent = function(state, line, input) {
-        return this.$outdent.checkOutdent(line, input);
-    };
-
-    this.autoOutdent = function(state, doc, row) {
-        this.$outdent.autoOutdent(doc, row);
-    };
-    
-    this.createWorker = function(session) {
-        var worker = new WorkerClient(["ace"], "worker-javascript.js", "ace/mode/javascript_worker", "JavaScriptWorker");
-        worker.attachToDocument(session.getDocument());
-            
-        worker.on("jslint", function(results) {
-            var errors = [];
-            for (var i=0; i<results.data.length; i++) {
-                var error = results.data[i];
-                if (error)
-                    errors.push({
-                        row: error.line-1,
-                        column: error.character-1,
-                        text: error.reason,
-                        type: "warning",
-                        lint: error
-                    });
-            }
-            session.setAnnotations(errors);
-        });
-        
-        worker.on("narcissus", function(e) {
-            session.setAnnotations([e.data]);
-        });
-        
-        worker.on("terminate", function() {
-            session.clearAnnotations();
-        });
-        
-        return worker;
-    };
-
-}).call(Mode.prototype);
-
-exports.Mode = Mode;
-});
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *      Mihai Sucan <mihai DOT sucan AT gmail DOT com>
- *
- * 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 ***** */
-
-define('ace/mode/javascript_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/lang', 'ace/unicode', 'ace/mode/doc_comment_highlight_rules', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var lang = require("../lib/lang");
-var unicode = require("../unicode");
-var DocCommentHighlightRules = require("./doc_comment_highlight_rules").DocCommentHighlightRules;
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-
-var JavaScriptHighlightRules = function() {
-
-    // see: https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects
-    var globals = lang.arrayToMap(
-      // Constructors
-        ("Array|Boolean|Date|Function|Iterator|Number|Object|RegExp|String|Proxy|" +
-      // E4X
-         "Namespace|QName|XML|XMLList|" +
-         "ArrayBuffer|Float32Array|Float64Array|Int16Array|Int32Array|Int8Array|" +
-         "Uint16Array|Uint32Array|Uint8Array|Uint8ClampedArray|" +
-      // Errors
-        "Error|EvalError|InternalError|RangeError|ReferenceError|StopIteration|" +
-        "SyntaxError|TypeError|URIError|" +
-      //  Non-constructor functions
-        "decodeURI|decodeURIComponent|encodeURI|encodeURIComponent|eval|isFinite|" +
-        "isNaN|parseFloat|parseInt|" +
-      // Other
-        "JSON|Math|" +
-      // Pseudo
-        "this|arguments|prototype|window|document"
-      ).split("|")
-    );
-
-    var keywords = lang.arrayToMap(
-        ("break|case|catch|continue|default|delete|do|else|finally|for|function|" +
-        "if|in|instanceof|new|return|switch|throw|try|typeof|let|var|while|with|" +
-        "const|yield|import|get|set").split("|")
-    );
-
-    // keywords which can be followed by regular expressions
-    var kwBeforeRe = "case|do|else|finally|in|instanceof|return|throw|try|typeof|yield";
-
-    var deprecated = lang.arrayToMap(
-        ("__parent__|__count__|escape|unescape|with|__proto__").split("|")
-    );
-
-    var definitions = lang.arrayToMap(("const|let|var|function").split("|"));
-
-    var buildinConstants = lang.arrayToMap(
-        ("null|Infinity|NaN|undefined").split("|")
-    );
-
-    var futureReserved = lang.arrayToMap(
-        ("class|enum|extends|super|export|implements|private|" +
-        "public|interface|package|protected|static").split("|")
-    );
-
-    // TODO: Unicode escape sequences
-    var identifierRe = "[" + unicode.packages.L + "\\$_]["
-        + unicode.packages.L
-        + unicode.packages.Mn + unicode.packages.Mc
-        + unicode.packages.Nd
-        + unicode.packages.Pc + "\\$_]*\\b";
-
-    var escapedRe = "\\\\(?:x[0-9a-fA-F]{2}|" + // hex
-        "u[0-9a-fA-F]{4}|" + // unicode
-        "[0-2][0-7]{0,2}|" + // oct
-        "3[0-6][0-7]?|" + // oct
-        "37[0-7]?|" + // oct
-        "[4-7][0-7]?|" + //oct
-        ".)";
-
-    // regexp must not have capturing parentheses. Use (?:) instead.
-    // regexps are ordered -> the first match is used
-
-    this.$rules = {
-        "start" : [
-            {
-                token : "comment",
-                regex : /\/\/.*$/
-            },
-            new DocCommentHighlightRules().getStartRule("doc-start"),
-            {
-                token : "comment", // multi line comment
-                merge : true,
-                regex : /\/\*/,
-                next : "comment"
-            }, {
-                token : "string",
-                regex : "'",
-                next  : "qstring"
-            }, {
-                token : "string",
-                regex : '"',
-                next  : "qqstring"
-            }, {
-                token : "constant.numeric", // hex
-                regex : /0[xX][0-9a-fA-F]+\b/
-            }, {
-                token : "constant.numeric", // float
-                regex : /[+-]?\d+(?:(?:\.\d*)?(?:[eE][+-]?\d+)?)?\b/
-            }, { // match stuff like: Sound.prototype.play = function() { }
-                token : [
-                    "storage.type",
-                    "punctuation.operator",
-                    "support.function",
-                    "punctuation.operator",
-                    "entity.name.function",
-                    "text",
-                    "keyword.operator",
-                    "text",
-                    "storage.type",
-                    "text",
-                    "paren.lparen",
-                    "variable.parameter",
-                    "paren.rparen"
-                ],
-                regex : "(" + identifierRe + ")(\\.)(prototype)(\\.)(" + identifierRe +")(\\s*)(=)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"
-            }, { // match stuff like: Sound.prototype.play = myfunc
-                token : [
-                    "storage.type",
-                    "punctuation.operator",
-                    "support.function",
-                    "punctuation.operator",
-                    "entity.name.function",
-                    "text",
-                    "keyword.operator",
-                    "text"
-                ],
-                regex : "(" + identifierRe + ")(\\.)(prototype)(\\.)(" + identifierRe +")(\\s*)(=)(\\s*)"
-            }, { // match stuff like: Sound.play = function() {  }
-                token : [
-                    "storage.type",
-                    "punctuation.operator",
-                    "entity.name.function",
-                    "text",
-                    "keyword.operator",
-                    "text",
-                    "storage.type",
-                    "text",
-                    "paren.lparen",
-                    "variable.parameter",
-                    "paren.rparen"
-                ],
-                regex : "(" + identifierRe + ")(\\.)(" + identifierRe +")(\\s*)(=)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"
-            }, { // match stuff like: play = function() {  }
-                token : [
-                    "entity.name.function",
-                    "text",
-                    "keyword.operator",
-                    "text",
-                    "storage.type",
-                    "text",
-                    "paren.lparen",
-                    "variable.parameter",
-                    "paren.rparen"
-                ],
-                regex : "(" + identifierRe +")(\\s*)(=)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"
-            }, { // match regular function like: function myFunc(arg) { }
-                token : [
-                    "storage.type",
-                    "text",
-                    "entity.name.function",
-                    "text",
-                    "paren.lparen",
-                    "variable.parameter",
-                    "paren.rparen"
-                ],
-                regex : "(function)(\\s+)(" + identifierRe + ")(\\s*)(\\()(.*?)(\\))"
-            }, { // match stuff like: foobar: function() { }
-                token : [
-                    "entity.name.function",
-                    "text",
-                    "punctuation.operator",
-                    "text",
-                    "storage.type",
-                    "text",
-                    "paren.lparen",
-                    "variable.parameter",
-                    "paren.rparen"
-                ],
-                regex : "(" + identifierRe + ")(\\s*)(:)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"
-            }, { // Attempt to match : function() { } (this is for issues with 'foo': function() { })
-                token : [
-                    "text",
-                    "text",
-                    "storage.type",
-                    "text",
-                    "paren.lparen",
-                    "variable.parameter",
-                    "paren.rparen"
-                ],
-                regex : "(:)(\\s*)(function)?(\\s*)(\\()([^)]*)(\\))"
-            }, {
-                token : "constant.language.boolean",
-                regex : /(?:true|false)\b/
-            }, {
-                token : "keyword",
-                regex : "(?:" + kwBeforeRe + ")\\b",
-                next : "regex_allowed"
-            }, {
-                token : ["punctuation.operator", "support.function"],
-                regex : /(\.)(s(?:h(?:ift|ow(?:Mod(?:elessDialog|alDialog)|Help))|croll(?:X|By(?:Pages|Lines)?|Y|To)?|t(?:opzzzz|rike)|i(?:n|zeToContent|debar|gnText)|ort|u(?:p|b(?:str(?:ing)?)?)|pli(?:ce|t)|e(?:nd|t(?:Re(?:sizable|questHeader)|M(?:i(?:nutes|lliseconds)|onth)|Seconds|Ho(?:tKeys|urs)|Year|Cursor|Time(?:out)?|Interval|ZOptions|Date|UTC(?:M(?:i(?:nutes|lliseconds)|onth)|Seconds|Hours|Date|FullYear)|FullYear|Active)|arch)|qrt|lice|avePreferences|mall)|h(?:ome|andleEvent)|navigate|c(?:har(?:CodeAt|At)|o(?:s|n(?:cat|textual|firm)|mpile)|eil|lear(?:Timeout|Interval)?|a(?:ptureEvents|ll)|reate(?:StyleSheet|Popup|EventObject))|t(?:o(?:GMTString|S(?:tring|ource)|U(?:TCString|pperCase)|Lo(?:caleString|werCase))|est|a(?:n|int(?:Enabled)?))|i(?:s(?:NaN|Finite)|ndexOf|talics)|d(?:isableExternalCapture|ump|etachEvent)|u(?:n(?:shift|taint|escape|watch)|pdateCommands)|j(?:oin|avaEnabled)|p(?:o(?:p|w)|ush|lugins.refresh|a(?:ddings|rse(?:Int|Float)?)|r(?:int|ompt|eference))|e(?:scape|nableExternalCapture|val|lementFromPoint|x(?:p|ec(?:Script|Command)?))|valueOf|UTC|queryCommand(?:State|Indeterm|Enabled|Value)|f(?:i(?:nd|le(?:ModifiedDate|Size|CreatedDate|UpdatedDate)|xed)|o(?:nt(?:size|color)|rward)|loor|romCharCode)|watch|l(?:ink|o(?:ad|g)|astIndexOf)|a(?:sin|nchor|cos|t(?:tachEvent|ob|an(?:2)?)|pply|lert|b(?:s|ort))|r(?:ou(?:nd|teEvents)|e(?:size(?:By|To)|calc|turnValue|place|verse|l(?:oad|ease(?:Capture|Events)))|andom)|g(?:o|et(?:ResponseHeader|M(?:i(?:nutes|lliseconds)|onth)|Se(?:conds|lection)|Hours|Year|Time(?:zoneOffset)?|Da(?:y|te)|UTC(?:M(?:i(?:nutes|lliseconds)|onth)|Seconds|Hours|Da(?:y|te)|FullYear)|FullYear|A(?:ttention|llResponseHeaders)))|m(?:in|ove(?:B(?:y|elow)|To(?:Absolute)?|Above)|ergeAttributes|a(?:tch|rgins|x))|b(?:toa|ig|o(?:ld|rderWidths)|link|ack))\b(?=\()/
-            }, {
-                token : ["punctuation.operator", "support.function.dom"],
-                regex : /(\.)(s(?:ub(?:stringData|mit)|plitText|e(?:t(?:NamedItem|Attribute(?:Node)?)|lect))|has(?:ChildNodes|Feature)|namedItem|c(?:l(?:ick|o(?:se|neNode))|reate(?:C(?:omment|DATASection|aption)|T(?:Head|extNode|Foot)|DocumentFragment|ProcessingInstruction|E(?:ntityReference|lement)|Attribute))|tabIndex|i(?:nsert(?:Row|Before|Cell|Data)|tem)|open|delete(?:Row|C(?:ell|aption)|T(?:Head|Foot)|Data)|focus|write(?:ln)?|a(?:dd|ppend(?:Child|Data))|re(?:set|place(?:Child|Data)|move(?:NamedItem|Child|Attribute(?:Node)?)?)|get(?:NamedItem|Element(?:sBy(?:Name|TagName)|ById)|Attribute(?:Node)?)|blur)\b(?=\()/
-            }, {
-                token : ["punctuation.operator", "support.constant"],
-                regex : /(\.)(s(?:ystemLanguage|cr(?:ipts|ollbars|een(?:X|Y|Top|Left))|t(?:yle(?:Sheets)?|atus(?:Text|bar)?)|ibling(?:Below|Above)|ource|uffixes|e(?:curity(?:Policy)?|l(?:ection|f)))|h(?:istory|ost(?:name)?|as(?:h|Focus))|y|X(?:MLDocument|SLDocument)|n(?:ext|ame(?:space(?:s|URI)|Prop))|M(?:IN_VALUE|AX_VALUE)|c(?:haracterSet|o(?:n(?:structor|trollers)|okieEnabled|lorDepth|mp(?:onents|lete))|urrent|puClass|l(?:i(?:p(?:boardData)?|entInformation)|osed|asses)|alle(?:e|r)|rypto)|t(?:o(?:olbar|p)|ext(?:Transform|Indent|Decoration|Align)|ags)|SQRT(?:1_2|2)|i(?:n(?:ner(?:Height|Width)|put)|ds|gnoreCase)|zIndex|o(?:scpu|n(?:readystatechange|Line)|uter(?:Height|Width)|p(?:sProfile|ener)|ffscreenBuffering)|NEGATIVE_INFINITY|d(?:i(?:splay|alog(?:Height|Top|Width|Left|Arguments)|rectories)|e(?:scription|fault(?:Status|Ch(?:ecked|arset)|View)))|u(?:ser(?:Profile|Language|Agent)|n(?:iqueID|defined)|pdateInterval)|_content|p(?:ixelDepth|ort|ersonalbar|kcs11|l(?:ugins|atform)|a(?:thname|dding(?:Right|Bottom|Top|Left)|rent(?:Window|Layer)?|ge(?:X(?:Offset)?|Y(?:Offset)?))|r(?:o(?:to(?:col|type)|duct(?:Sub)?|mpter)|e(?:vious|fix)))|e(?:n(?:coding|abledPlugin)|x(?:ternal|pando)|mbeds)|v(?:isibility|endor(?:Sub)?|Linkcolor)|URLUnencoded|P(?:I|OSITIVE_INFINITY)|f(?:ilename|o(?:nt(?:Size|Family|Weight)|rmName)|rame(?:s|Element)|gColor)|E|whiteSpace|l(?:i(?:stStyleType|n(?:eHeight|kColor))|o(?:ca(?:tion(?:bar)?|lName)|wsrc)|e(?:ngth|ft(?:Context)?)|a(?:st(?:M(?:odified|atch)|Index|Paren)|yer(?:s|X)|nguage))|a(?:pp(?:MinorVersion|Name|Co(?:deName|re)|Version)|vail(?:Height|Top|Width|Left)|ll|r(?:ity|guments)|Linkcolor|bove)|r(?:ight(?:Context)?|e(?:sponse(?:XML|Text)|adyState))|global|x|m(?:imeTypes|ultiline|enubar|argin(?:Right|Bottom|Top|Left))|L(?:N(?:10|2)|OG(?:10E|2E))|b(?:o(?:ttom|rder(?:Width|RightWidth|BottomWidth|Style|Color|TopWidth|LeftWidth))|ufferDepth|elow|ackground(?:Color|Image)))\b/
-            }, {
-                token : ["storage.type", "punctuation.operator", "support.function.firebug"],
-                regex : /(console)(\.)(warn|info|log|error|time|timeEnd|assert)\b/
-            }, {
-                token : function(value) {
-                    if (globals.hasOwnProperty(value))
-                        return "variable.language";
-                    else if (deprecated.hasOwnProperty(value))
-                        return "invalid.deprecated";
-                    else if (definitions.hasOwnProperty(value))
-                        return "storage.type";
-                    else if (keywords.hasOwnProperty(value))
-                        return "keyword";
-                    else if (buildinConstants.hasOwnProperty(value))
-                        return "constant.language";
-                    else if (futureReserved.hasOwnProperty(value))
-                        return "invalid.illegal";
-                    else if (value == "debugger")
-                        return "invalid.deprecated";
-                    else
-                        return "identifier";
-                },
-                regex : identifierRe
-            }, {
-                token : "keyword.operator",
-                regex : /!|\$|%|&|\*|\-\-|\-|\+\+|\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\|\||\?\:|\*=|%=|\+=|\-=|&=|\^=|\b(?:in|instanceof|new|delete|typeof|void)/,
-                next  : "regex_allowed"
-            }, {
-                token : "punctuation.operator",
-                regex : /\?|\:|\,|\;|\./,
-                next  : "regex_allowed"
-            }, {
-                token : "paren.lparen",
-                regex : /[\[({]/,
-                next  : "regex_allowed"
-            }, {
-                token : "paren.rparen",
-                regex : /[\])}]/
-            }, {
-                token : "keyword.operator",
-                regex : /\/=?/,
-                next  : "regex_allowed"
-            }, {
-                token: "comment",
-                regex: /^#!.*$/
-            }, {
-                token : "text",
-                regex : /\s+/
-            }
-        ],
-        // regular expressions are only allowed after certain tokens. This
-        // makes sure we don't mix up regexps with the divison operator
-        "regex_allowed": [
-            {
-                token : "comment", // multi line comment
-                merge : true,
-                regex : "\\/\\*",
-                next : "comment_regex_allowed"
-            }, {
-                token : "comment",
-                regex : "\\/\\/.*$"
-            }, {
-                token: "string.regexp",
-                regex: "\\/",
-                next: "regex",
-                merge: true
-            }, {
-                token : "text",
-                regex : "\\s+"
-            }, {
-                // immediately return to the start mode without matching
-                // anything
-                token: "empty",
-                regex: "",
-                next: "start"
-            }
-        ],
-        "regex": [
-            {
-                token: "regexp.keyword.operator",
-                regex: "\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)",
-                next: "regex"
-            }, {
-				// flag
-                token: "string.regexp",
-                regex: "/\\w*",
-                next: "start",
-                merge: true
-            }, {
-                token: "string.regexp",
-                regex: "[^\\\\/\\[]+",
-                next: "regex",
-                merge: true
-            }, {
-                token: "string.regexp.charachterclass",
-                regex: "\\[",
-                next: "regex_character_class",
-                merge: true
-            }, {
-                token: "empty",
-                regex: "",
-                next: "start"
-            }
-        ],
-        "regex_character_class": [
-            {
-                token: "regexp.keyword.operator",
-                regex: "\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)",
-                next: "regex_character_class"
-            }, {
-                token: "string.regexp.charachterclass",
-                regex: "]",
-                next: "regex",
-                merge: true
-            }, {
-                token: "string.regexp.charachterclass",
-                regex: "[^\\\\\\]]+",
-                next: "regex_character_class",
-                merge: true
-            }, {
-                token: "empty",
-                regex: "",
-                next: "start"
-            }
-        ],
-        "comment_regex_allowed" : [
-            {
-                token : "comment", // closing comment
-                regex : ".*?\\*\\/",
-                merge : true,
-                next : "regex_allowed"
-            }, {
-                token : "comment", // comment spanning whole line
-                merge : true,
-                regex : ".+"
-            }
-        ],
-        "comment" : [
-            {
-                token : "comment", // closing comment
-                regex : ".*?\\*\\/",
-                merge : true,
-                next : "start"
-            }, {
-                token : "comment", // comment spanning whole line
-                merge : true,
-                regex : ".+"
-            }
-        ],
-        "qqstring" : [
-            {
-                token : "constant.language.escape",
-                regex : escapedRe
-            }, {
-                token : "string",
-                regex : '[^"\\\\]+'
-            }, {
-                token : "string",
-                regex : '"',
-                next  : "start"
-            }
-        ],
-        "qstring" : [
-            {
-                token : "constant.language.escape",
-                regex : escapedRe
-            }, {
-                token : "string",
-                regex : "[^'\\\\]+"
-            }, {
-                token : "string",
-                regex : "'",
-                next  : "start"
-            }
-        ]
-    };
-
-    this.embedRules(DocCommentHighlightRules, "doc-",
-        [ new DocCommentHighlightRules().getEndRule("start") ]);
-};
-
-oop.inherits(JavaScriptHighlightRules, TextHighlightRules);
-
-exports.JavaScriptHighlightRules = JavaScriptHighlightRules;
-});
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/doc_comment_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-
-var DocCommentHighlightRules = function() {
-
-    this.$rules = {
-        "start" : [ {
-            token : "comment.doc.tag",
-            regex : "@[\\w\\d_]+" // TODO: fix email addresses
-        }, {
-            token : "comment.doc",
-            merge : true,
-            regex : "\\s+"
-        }, {
-            token : "comment.doc",
-            merge : true,
-            regex : "TODO"
-        }, {
-            token : "comment.doc",
-            merge : true,
-            regex : "[^@\\*]+"
-        }, {
-            token : "comment.doc",
-            merge : true,
-            regex : "."
-        }]
-    };
-};
-
-oop.inherits(DocCommentHighlightRules, TextHighlightRules);
-
-(function() {
-
-    this.getStartRule = function(start) {
-        return {
-            token : "comment.doc", // doc comment
-            merge : true,
-            regex : "\\/\\*(?=\\*)",
-            next  : start
-        };
-    };
-    
-    this.getEndRule = function (start) {
-        return {
-            token : "comment.doc", // closing comment
-            merge : true,
-            regex : "\\*\\/",
-            next  : start
-        };
-    };
-
-}).call(DocCommentHighlightRules.prototype);
-
-exports.DocCommentHighlightRules = DocCommentHighlightRules;
-
-});
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/matching_brace_outdent', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
-"use strict";
-
-var Range = require("../range").Range;
-
-var MatchingBraceOutdent = function() {};
-
-(function() {
-
-    this.checkOutdent = function(line, input) {
-        if (! /^\s+$/.test(line))
-            return false;
-
-        return /^\s*\}/.test(input);
-    };
-
-    this.autoOutdent = function(doc, row) {
-        var line = doc.getLine(row);
-        var match = line.match(/^(\s*\})/);
-
-        if (!match) return 0;
-
-        var column = match[1].length;
-        var openBracePos = doc.findMatchingBracket({row: row, column: column});
-
-        if (!openBracePos || openBracePos.row == row) return 0;
-
-        var indent = this.$getIndent(doc.getLine(openBracePos.row));
-        doc.replace(new Range(row, 0, row, column-1), indent);
-    };
-
-    this.$getIndent = function(line) {
-        var match = line.match(/^(\s+)/);
-        if (match) {
-            return match[1];
-        }
-
-        return "";
-    };
-
-}).call(MatchingBraceOutdent.prototype);
-
-exports.MatchingBraceOutdent = MatchingBraceOutdent;
-});
-/* vim:ts=4:sts=4:sw=4:
- * ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Chris Spencer <chris.ag.spencer AT googlemail DOT com>
- *
- * 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 ***** */
-
-define('ace/mode/behaviour/cstyle', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/behaviour'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../../lib/oop");
-var Behaviour = require('../behaviour').Behaviour;
-
-var CstyleBehaviour = function () {
-
-    this.add("braces", "insertion", function (state, action, editor, session, text) {
-        if (text == '{') {
-            var selection = editor.getSelectionRange();
-            var selected = session.doc.getTextRange(selection);
-            if (selected !== "") {
-                return {
-                    text: '{' + selected + '}',
-                    selection: false
-                };
-            } else {
-                return {
-                    text: '{}',
-                    selection: [1, 1]
-                };
-            }
-        } else if (text == '}') {
-            var cursor = editor.getCursorPosition();
-            var line = session.doc.getLine(cursor.row);
-            var rightChar = line.substring(cursor.column, cursor.column + 1);
-            if (rightChar == '}') {
-                var matching = session.$findOpeningBracket('}', {column: cursor.column + 1, row: cursor.row});
-                if (matching !== null) {
-                    return {
-                        text: '',
-                        selection: [1, 1]
-                    };
-                }
-            }
-        } else if (text == "\n") {
-            var cursor = editor.getCursorPosition();
-            var line = session.doc.getLine(cursor.row);
-            var rightChar = line.substring(cursor.column, cursor.column + 1);
-            if (rightChar == '}') {
-                var openBracePos = session.findMatchingBracket({row: cursor.row, column: cursor.column + 1});
-                if (!openBracePos)
-                     return null;
-
-                var indent = this.getNextLineIndent(state, line.substring(0, line.length - 1), session.getTabString());
-                var next_indent = this.$getIndent(session.doc.getLine(openBracePos.row));
-
-                return {
-                    text: '\n' + indent + '\n' + next_indent,
-                    selection: [1, indent.length, 1, indent.length]
-                };
-            }
-        }
-    });
-
-    this.add("braces", "deletion", function (state, action, editor, session, range) {
-        var selected = session.doc.getTextRange(range);
-        if (!range.isMultiLine() && selected == '{') {
-            var line = session.doc.getLine(range.start.row);
-            var rightChar = line.substring(range.end.column, range.end.column + 1);
-            if (rightChar == '}') {
-                range.end.column++;
-                return range;
-            }
-        }
-    });
-
-    this.add("parens", "insertion", function (state, action, editor, session, text) {
-        if (text == '(') {
-            var selection = editor.getSelectionRange();
-            var selected = session.doc.getTextRange(selection);
-            if (selected !== "") {
-                return {
-                    text: '(' + selected + ')',
-                    selection: false
-                };
-            } else {
-                return {
-                    text: '()',
-                    selection: [1, 1]
-                };
-            }
-        } else if (text == ')') {
-            var cursor = editor.getCursorPosition();
-            var line = session.doc.getLine(cursor.row);
-            var rightChar = line.substring(cursor.column, cursor.column + 1);
-            if (rightChar == ')') {
-                var matching = session.$findOpeningBracket(')', {column: cursor.column + 1, row: cursor.row});
-                if (matching !== null) {
-                    return {
-                        text: '',
-                        selection: [1, 1]
-                    };
-                }
-            }
-        }
-    });
-
-    this.add("parens", "deletion", function (state, action, editor, session, range) {
-        var selected = session.doc.getTextRange(range);
-        if (!range.isMultiLine() && selected == '(') {
-            var line = session.doc.getLine(range.start.row);
-            var rightChar = line.substring(range.start.column + 1, range.start.column + 2);
-            if (rightChar == ')') {
-                range.end.column++;
-                return range;
-            }
-        }
-    });
-
-    this.add("string_dquotes", "insertion", function (state, action, editor, session, text) {
-        if (text == '"' || text == "'") {
-            var quote = text;
-            var selection = editor.getSelectionRange();
-            var selected = session.doc.getTextRange(selection);
-            if (selected !== "") {
-                return {
-                    text: quote + selected + quote,
-                    selection: false
-                };
-            } else {
-                var cursor = editor.getCursorPosition();
-                var line = session.doc.getLine(cursor.row);
-                var leftChar = line.substring(cursor.column-1, cursor.column);
-
-                // We're escaped.
-                if (leftChar == '\\') {
-                    return null;
-                }
-
-                // Find what token we're inside.
-                var tokens = session.getTokens(selection.start.row, selection.start.row)[0].tokens;
-                var col = 0, token;
-                var quotepos = -1; // Track whether we're inside an open quote.
-
-                for (var x = 0; x < tokens.length; x++) {
-                    token = tokens[x];
-                    if (token.type == "string") {
-                      quotepos = -1;
-                    } else if (quotepos < 0) {
-                      quotepos = token.value.indexOf(quote);
-                    }
-                    if ((token.value.length + col) > selection.start.column) {
-                        break;
-                    }
-                    col += tokens[x].value.length;
-                }
-
-                // Try and be smart about when we auto insert.
-                if (!token || (quotepos < 0 && token.type !== "comment" && (token.type !== "string" || ((selection.start.column !== token.value.length+col-1) && token.value.lastIndexOf(quote) === token.value.length-1)))) {
-                    return {
-                        text: quote + quote,
-                        selection: [1,1]
-                    };
-                } else if (token && token.type === "string") {
-                    // Ignore input and move right one if we're typing over the closing quote.
-                    var rightChar = line.substring(cursor.column, cursor.column + 1);
-                    if (rightChar == quote) {
-                        return {
-                            text: '',
-                            selection: [1, 1]
-                        };
-                    }
-                }
-            }
-        }
-    });
-
-    this.add("string_dquotes", "deletion", function (state, action, editor, session, range) {
-        var selected = session.doc.getTextRange(range);
-        if (!range.isMultiLine() && (selected == '"' || selected == "'")) {
-            var line = session.doc.getLine(range.start.row);
-            var rightChar = line.substring(range.start.column + 1, range.start.column + 2);
-            if (rightChar == '"') {
-                range.end.column++;
-                return range;
-            }
-        }
-    });
-
-};
-
-oop.inherits(CstyleBehaviour, Behaviour);
-
-exports.CstyleBehaviour = CstyleBehaviour;
-});/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/folding/cstyle', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/range', 'ace/mode/folding/fold_mode'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../../lib/oop");
-var Range = require("../../range").Range;
-var BaseFoldMode = require("./fold_mode").FoldMode;
-
-var FoldMode = exports.FoldMode = function() {};
-oop.inherits(FoldMode, BaseFoldMode);
-
-(function() {
-
-    this.foldingStartMarker = /(\{|\[)[^\}\]]*$|^\s*(\/\*)/;
-    this.foldingStopMarker = /^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/;
-    
-    this.getFoldWidgetRange = function(session, foldStyle, row) {
-        var line = session.getLine(row);
-        var match = line.match(this.foldingStartMarker);
-        if (match) {
-            var i = match.index;
-
-            if (match[1])
-                return this.openingBracketBlock(session, match[1], row, i);
-
-            var range = session.getCommentFoldRange(row, i + match[0].length);
-            range.end.column -= 2;
-            return range;
-        }
-
-        if (foldStyle !== "markbeginend")
-            return;
-            
-        var match = line.match(this.foldingStopMarker);
-        if (match) {
-            var i = match.index + match[0].length;
-
-            if (match[2]) {
-                var range = session.getCommentFoldRange(row, i);
-                range.end.column -= 2;
-                return range;
-            }
-
-            var end = {row: row, column: i};
-            var start = session.$findOpeningBracket(match[1], end);
-            
-            if (!start)
-                return;
-
-            start.column++;
-            end.column--;
-
-            return  Range.fromPoints(start, end);
-        }
-    };
-    
-}).call(FoldMode.prototype);
-
-});/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/folding/fold_mode', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
-"use strict";
-
-var Range = require("../../range").Range;
-
-var FoldMode = exports.FoldMode = function() {};
-
-(function() {
-
-    this.foldingStartMarker = null;
-    this.foldingStopMarker = null;
-
-    // must return "" if there's no fold, to enable caching
-    this.getFoldWidget = function(session, foldStyle, row) {
-        var line = session.getLine(row);
-        if (this.foldingStartMarker.test(line))
-            return "start";
-        if (foldStyle == "markbeginend"
-                && this.foldingStopMarker
-                && this.foldingStopMarker.test(line))
-            return "end";
-        return "";
-    };
-    
-    this.getFoldWidgetRange = function(session, foldStyle, row) {
-        return null;
-    };
-
-    this.indentationBlock = function(session, row, column) {
-        var re = /^\s*/;
-        var startRow = row;
-        var endRow = row;
-        var line = session.getLine(row);
-        var startColumn = column || line.length;
-        var startLevel = line.match(re)[0].length;
-        var maxRow = session.getLength()
-        
-        while (++row < maxRow) {
-            line = session.getLine(row);
-            var level = line.match(re)[0].length;
-
-            if (level == line.length)
-                continue;
-
-            if (level <= startLevel)
-                break;
-
-            endRow = row;
-        }
-
-        if (endRow > startRow) {
-            var endColumn = session.getLine(endRow).length;
-            return new Range(startRow, startColumn, endRow, endColumn);
-        }
-    };
-
-    this.openingBracketBlock = function(session, bracket, row, column) {
-        var start = {row: row, column: column + 1};
-        var end = session.$findClosingBracket(bracket, start);
-        if (!end)
-            return;
-
-        var fw = session.foldWidgets[end.row];
-        if (fw == null)
-            fw = this.getFoldWidget(session, end.row);
-
-        if (fw == "start") {
-            end.row --;
-            end.column = session.getLine(end.row).length;
-        }
-        return Range.fromPoints(start, end);
-    };
-
-}).call(FoldMode.prototype);
-
-});
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/css', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text', 'ace/tokenizer', 'ace/mode/css_highlight_rules', 'ace/mode/matching_brace_outdent', 'ace/worker/worker_client', 'ace/mode/folding/cstyle'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
-var CssHighlightRules = require("./css_highlight_rules").CssHighlightRules;
-var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
-var WorkerClient = require("../worker/worker_client").WorkerClient;
-var CStyleFoldMode = require("./folding/cstyle").FoldMode;
-
-var Mode = function() {
-    this.$tokenizer = new Tokenizer(new CssHighlightRules().getRules(), "i");
-    this.$outdent = new MatchingBraceOutdent();
-    this.foldingRules = new CStyleFoldMode();
-};
-oop.inherits(Mode, TextMode);
-
-(function() {
-
-    this.foldingRules = "cStyle";
-
-    this.getNextLineIndent = function(state, line, tab) {
-        var indent = this.$getIndent(line);
-
-        // ignore braces in comments
-        var tokens = this.$tokenizer.getLineTokens(line, state).tokens;
-        if (tokens.length && tokens[tokens.length-1].type == "comment") {
-            return indent;
-        }
-
-        var match = line.match(/^.*\{\s*$/);
-        if (match) {
-            indent += tab;
-        }
-
-        return indent;
-    };
-
-    this.checkOutdent = function(state, line, input) {
-        return this.$outdent.checkOutdent(line, input);
-    };
-
-    this.autoOutdent = function(state, doc, row) {
-        this.$outdent.autoOutdent(doc, row);
-    };
-    
-    this.createWorker = function(session) {
-        var worker = new WorkerClient(["ace"], "worker-css.js", "ace/mode/css_worker", "Worker");
-        worker.attachToDocument(session.getDocument());
-        
-        worker.on("csslint", function(e) {
-            var errors = [];
-            e.data.forEach(function(message) {
-                errors.push({
-                    row: message.line - 1,
-                    column: message.col - 1,
-                    text: message.message,
-                    type: message.type,
-                    lint: message
-                });
-            });
-            
-            session.setAnnotations(errors);
-        });
-        return worker;
-    };
-
-}).call(Mode.prototype);
-
-exports.Mode = Mode;
-
-});
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/css_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/lang', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var lang = require("../lib/lang");
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-
-var CssHighlightRules = function() {
-
-    var properties = lang.arrayToMap(
-        ("animation-fill-mode|alignment-adjust|alignment-baseline|animation-delay|animation-direction|animation-duration|animation-iteration-count|animation-name|animation-play-state|animation-timing-function|animation|appearance|azimuth|backface-visibility|background-attachment|background-break|background-clip|background-color|background-image|background-origin|background-position|background-repeat|background-size|background|baseline-shift|binding|bleed|bookmark-label|bookmark-level|bookmark-state|bookmark-target|border-bottom|border-bottom-color|border-bottom-left-radius|border-bottom-right-radius|border-bottom-style|border-bottom-width|border-collapse|border-color|border-image|border-image-outset|border-image-repeat|border-image-slice|border-image-source|border-image-width|border-left|border-left-color|border-left-style|border-left-width|border-radius|border-right|border-right-color|border-right-style|border-right-width|border-spacing|border-style|border-top|border-top-color|border-top-left-radius|border-top-right-radius|border-top-style|border-top-width|border-width|border|bottom|box-align|box-decoration-break|box-direction|box-flex-group|box-flex|box-lines|box-ordinal-group|box-orient|box-pack|box-shadow|box-sizing|break-after|break-before|break-inside|caption-side|clear|clip|color-profile|color|column-count|column-fill|column-gap|column-rule|column-rule-color|column-rule-style|column-rule-width|column-span|column-width|columns|content|counter-increment|counter-reset|crop|cue-after|cue-before|cue|cursor|direction|display|dominant-baseline|drop-initial-after-adjust|drop-initial-after-align|drop-initial-before-adjust|drop-initial-before-align|drop-initial-size|drop-initial-value|elevation|empty-cells|fit|fit-position|float-offset|float|font-family|font-size|font-size-adjust|font-stretch|font-style|font-variant|font-weight|font|grid-columns|grid-rows|hanging-punctuation|height|hyphenate-after|hyphenate-before|hyphenate-character|hyphenate-lines|hyphenate-resource|hyphens|icon|image-orientation|image-rendering|image-resolution|inline-box-align|left|letter-spacing|line-height|line-stacking-ruby|line-stacking-shift|line-stacking-strategy|line-stacking|list-style-image|list-style-position|list-style-type|list-style|margin-bottom|margin-left|margin-right|margin-top|margin|mark-after|mark-before|mark|marks|marquee-direction|marquee-play-count|marquee-speed|marquee-style|max-height|max-width|min-height|min-width|move-to|nav-down|nav-index|nav-left|nav-right|nav-up|opacity|orphans|outline-color|outline-offset|outline-style|outline-width|outline|overflow-style|overflow-x|overflow-y|overflow|padding-bottom|padding-left|padding-right|padding-top|padding|page-break-after|page-break-before|page-break-inside|page-policy|page|pause-after|pause-before|pause|perspective-origin|perspective|phonemes|pitch-range|pitch|play-during|position|presentation-level|punctuation-trim|quotes|rendering-intent|resize|rest-after|rest-before|rest|richness|right|rotation-point|rotation|ruby-align|ruby-overhang|ruby-position|ruby-span|size|speak-header|speak-numeral|speak-punctuation|speak|speech-rate|stress|string-set|table-layout|target-name|target-new|target-position|target|text-align-last|text-align|text-decoration|text-emphasis|text-height|text-indent|text-justify|text-outline|text-shadow|text-transform|text-wrap|top|transform-origin|transform-style|transform|transition-delay|transition-duration|transition-property|transition-timing-function|transition|unicode-bidi|vertical-align|visibility|voice-balance|voice-duration|voice-family|voice-pitch-range|voice-pitch|voice-rate|voice-stress|voice-volume|volume|white-space-collapse|white-space|widows|width|word-break|word-spacing|word-wrap|z-index").split("|")
-    );
-
-    var functions = lang.arrayToMap(
-        ("rgb|rgba|url|attr|counter|counters").split("|")
-    );
-
-    var constants = lang.arrayToMap(
-        ("absolute|after-edge|after|all-scroll|all|alphabetic|always|antialiased|armenian|auto|avoid-column|avoid-page|avoid|balance|baseline|before-edge|before|below|bidi-override|block-line-height|block|bold|bolder|border-box|both|bottom|box|break-all|break-word|capitalize|caps-height|caption|center|central|char|circle|cjk-ideographic|clone|close-quote|col-resize|collapse|column|consider-shifts|contain|content-box|cover|crosshair|cubic-bezier|dashed|decimal-leading-zero|decimal|default|disabled|disc|disregard-shifts|distribute-all-lines|distribute-letter|distribute-space|distribute|dotted|double|e-resize|ease-in|ease-in-out|ease-out|ease|ellipsis|end|exclude-ruby|fill|fixed|font-size|font|georgian|glyphs|grid-height|groove|hand|hanging|hebrew|help|hidden|hiragana-iroha|hiragana|horizontal|icon|ideograph-alpha|ideograph-numeric|ideograph-parenthesis|ideograph-space|ideographic|inactive|include-ruby|inherit|initial|inline-block|inline-box|inline-line-height|inline-table|inline|inset|inside|inter-ideograph|inter-word|invert|italic|justify|katakana-iroha|katakana|keep-all|last|left|lighter|line-edge|line-through|line|linear|list-item|local|loose|lower-alpha|lower-greek|lower-latin|lower-roman|lowercase|lr-tb|ltr|mathematical|max-height|max-size|medium|menu|message-box|middle|move|n-resize|ne-resize|newspaper|no-change|no-close-quote|no-drop|no-open-quote|no-repeat|none|normal|not-allowed|nowrap|nw-resize|oblique|open-quote|outset|outside|overline|padding-box|page|pointer|pre-line|pre-wrap|pre|preserve-3d|progress|relative|repeat-x|repeat-y|repeat|replaced|reset-size|ridge|right|round|row-resize|rtl|s-resize|scroll|se-resize|separate|slice|small-caps|small-caption|solid|space|square|start|static|status-bar|step-end|step-start|steps|stretch|strict|sub|super|sw-resize|table-caption|table-cell|table-column-group|table-column|table-footer-group|table-header-group|table-row-group|table-row|table|tb-rl|text-after-edge|text-before-edge|text-bottom|text-size|text-top|text|thick|thin|top|transparent|underline|upper-alpha|upper-latin|upper-roman|uppercase|use-script|vertical-ideographic|vertical-text|visible|w-resize|wait|whitespace|z-index|zero").split("|")
-    );
-
-    var colors = lang.arrayToMap(
-        ("aqua|black|blue|fuchsia|gray|green|lime|maroon|navy|olive|orange|" +
-        "purple|red|silver|teal|white|yellow").split("|")
-    );
-
-    var fonts = lang.arrayToMap(
-        ("arial|century|comic|courier|garamond|georgia|helvetica|impact|lucida|" +
-        "symbol|system|tahoma|times|trebuchet|utopia|verdana|webdings|sans-serif|" +
-        "serif|monospace").split("|")
-    );
-    
-    // regexp must not have capturing parentheses. Use (?:) instead.
-    // regexps are ordered -> the first match is used
-
-    var numRe = "\\-?(?:(?:[0-9]+)|(?:[0-9]*\\.[0-9]+))";
-    var pseudoElements = "(\\:+)\\b(after|before|first-letter|first-line|moz-selection|selection)\\b";
-    var pseudoClasses = "(:)\\b(active|checked|disabled|empty|enabled|first-child|first-of-type|focus|hover|indeterminate|invalid|last-child|last-of-type|link|not|nth-child|nth-last-child|nth-last-of-type|nth-of-type|only-child|only-of-type|required|root|target|valid|visited)\\b";
-    
-    var base_ruleset = [
-        {
-            token : "comment", // multi line comment
-            merge : true,
-            regex : "\\/\\*",
-            next : "ruleset_comment"
-        }, {
-            token : "string", // single line
-            regex : '["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'
-        }, {
-            token : "string", // single line
-            regex : "['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"
-        }, {
-            token : ["constant.numeric", "keyword"],
-            regex : "(" + numRe + ")(ch|cm|deg|em|ex|fr|gd|grad|Hz|in|kHz|mm|ms|pc|pt|px|rad|rem|s|turn|vh|vm|vw|%)"
-        }, {
-            token : ["constant.numeric"],
-            regex : "([0-9]+)"
-        }, {
-            token : "constant.numeric",  // hex6 color
-            regex : "#[a-f0-9]{6}"
-        }, {
-            token : "constant.numeric", // hex3 color
-            regex : "#[a-f0-9]{3}"
-        }, {
-            token : ["punctuation", "entity.other.attribute-name.pseudo-element.css"], 
-            regex : pseudoElements
-        }, {
-            token : ["punctuation", "entity.other.attribute-name.pseudo-class.css"], 
-            regex : pseudoClasses
-        }, {
-            token : function(value) {
-                if (properties.hasOwnProperty(value.toLowerCase())) {
-                    return "support.type";
-                }
-                else if (functions.hasOwnProperty(value.toLowerCase())) {
-                    return "support.function";
-                }
-                else if (constants.hasOwnProperty(value.toLowerCase())) {
-                    return "support.constant";
-                }
-                else if (colors.hasOwnProperty(value.toLowerCase())) {
-                    return "support.constant.color";
-                }
-                else if (fonts.hasOwnProperty(value.toLowerCase())) {
-                    return "support.constant.fonts";
-                }
-                else {
-                    return "text";
-                }
-            },
-            regex : "\\-?[a-zA-Z_][a-zA-Z0-9_\\-]*"
-        } 
-      ];
-
-    var ruleset = lang.copyArray(base_ruleset);
-    ruleset.unshift({
-        token : "paren.rparen",
-        regex : "\\}",
-        next:   "start"
-    });
-
-    var media_ruleset = lang.copyArray( base_ruleset );
-    media_ruleset.unshift({
-        token : "paren.rparen",
-        regex : "\\}",
-        next:   "media"
-    });
-
-    var base_comment = [{
-          token : "comment", // comment spanning whole line
-          merge : true,
-          regex : ".+"
-    }];
-
-    var comment = lang.copyArray(base_comment);
-    comment.unshift({
-          token : "comment", // closing comment
-          regex : ".*?\\*\\/",
-          next : "start"
-    });
-
-    var media_comment = lang.copyArray(base_comment);
-    media_comment.unshift({
-          token : "comment", // closing comment
-          regex : ".*?\\*\\/",
-          next : "media"
-    });
-
-    var ruleset_comment = lang.copyArray(base_comment);
-    ruleset_comment.unshift({
-          token : "comment", // closing comment
-          regex : ".*?\\*\\/",
-          next : "ruleset"
-    });
-
-    this.$rules = {
-        "start" : [{
-            token : "comment", // multi line comment
-            merge : true,
-            regex : "\\/\\*",
-            next : "comment"
-        }, {
-            token: "paren.lparen",
-            regex: "\\{",
-            next:  "ruleset"
-        }, {
-            token: "string",
-            regex: "@.*?{",
-            next:  "media"
-        },{
-            token: "keyword",
-            regex: "#[a-z0-9-_]+"
-        },{
-            token: "variable",
-            regex: "\\.[a-z0-9-_]+"
-        },{
-            token: "string",
-            regex: ":[a-z0-9-_]+"
-        },{
-            token: "constant",
-            regex: "[a-z0-9-_]+"
-        }],
-
-        "media" : [ {
-            token : "comment", // multi line comment
-            merge : true,
-            regex : "\\/\\*",
-            next : "media_comment"
-        }, {
-            token: "paren.lparen",
-            regex: "\\{",
-            next:  "media_ruleset"
-        },{
-            token: "string",
-            regex: "\\}",
-            next:  "start"
-        },{
-            token: "keyword",
-            regex: "#[a-z0-9-_]+"
-        },{
-            token: "variable",
-            regex: "\\.[a-z0-9-_]+"
-        },{
-            token: "string",
-            regex: ":[a-z0-9-_]+"
-        },{
-            token: "constant",
-            regex: "[a-z0-9-_]+"
-        }],
-
-        "comment" : comment,
-
-        "ruleset" : ruleset,
-        "ruleset_comment" : ruleset_comment,
-
-        "media_ruleset" : media_ruleset,
-        "media_comment" : media_comment
-    };
-};
-
-oop.inherits(CssHighlightRules, TextHighlightRules);
-
-exports.CssHighlightRules = CssHighlightRules;
-
-});
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/html_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/css_highlight_rules', 'ace/mode/javascript_highlight_rules', 'ace/mode/xml_util', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var CssHighlightRules = require("./css_highlight_rules").CssHighlightRules;
-var JavaScriptHighlightRules = require("./javascript_highlight_rules").JavaScriptHighlightRules;
-var xmlUtil = require("./xml_util");
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-
-var HtmlHighlightRules = function() {
-
-    // regexp must not have capturing parentheses
-    // regexps are ordered -> the first match is used
-    this.$rules = {
-        start : [{
-            token : "text",
-            merge : true,
-            regex : "<\\!\\[CDATA\\[",
-            next : "cdata"
-        }, {
-            token : "xml_pe",
-            regex : "<\\?.*?\\?>"
-        }, {
-            token : "comment",
-            merge : true,
-            regex : "<\\!--",
-            next : "comment"
-        }, {
-            token : "xml_pe",
-            regex : "<\\!.*?>"
-        }, {
-            token : "meta.tag",
-            regex : "<(?=\s*script\\b)",
-            next : "script"
-        }, {
-            token : "meta.tag",
-            regex : "<(?=\s*style\\b)",
-            next : "style"
-        }, {
-            token : "meta.tag", // opening tag
-            regex : "<\\/?",
-            next : "tag"
-        }, {
-            token : "text",
-            regex : "\\s+"
-        }, {
-            token : "constant.character.entity",
-            regex : "(?:&#[0-9]+;)|(?:&#x[0-9a-fA-F]+;)|(?:&[a-zA-Z0-9_:\\.-]+;)"
-        }, {
-            token : "text",
-            regex : "[^<]+"
-        } ],
-    
-        cdata : [ {
-            token : "text",
-            regex : "\\]\\]>",
-            next : "start"
-        }, {
-            token : "text",
-            merge : true,
-            regex : "\\s+"
-        }, {
-            token : "text",
-            merge : true,
-            regex : ".+"
-        } ],
-
-        comment : [ {
-            token : "comment",
-            regex : ".*?-->",
-            next : "start"
-        }, {
-            token : "comment",
-            merge : true,
-            regex : ".+"
-        } ]
-    };
-    
-    xmlUtil.tag(this.$rules, "tag", "start");
-    xmlUtil.tag(this.$rules, "style", "css-start");
-    xmlUtil.tag(this.$rules, "script", "js-start");
-    
-    this.embedRules(JavaScriptHighlightRules, "js-", [{
-        token: "comment",
-        regex: "\\/\\/.*(?=<\\/script>)",
-        next: "tag"
-    }, {
-        token: "meta.tag",
-        regex: "<\\/(?=script)",
-        next: "tag"
-    }]);
-    
-    this.embedRules(CssHighlightRules, "css-", [{
-        token: "meta.tag",
-        regex: "<\\/(?=style)",
-        next: "tag"
-    }]);
-};
-
-oop.inherits(HtmlHighlightRules, TextHighlightRules);
-
-exports.HtmlHighlightRules = HtmlHighlightRules;
-});
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/xml_util', ['require', 'exports', 'module' , 'ace/lib/lang'], function(require, exports, module) {
-"use strict";
-
-var lang = require("../lib/lang");
-
-var formTags = lang.arrayToMap(
-    ("button|form|input|label|select|textarea").split("|")
-);
-
-var tableTags = lang.arrayToMap(
-    ("table|tbody|td|tfoot|th|tr").split("|")
-);
-
-function string(state) {
-    return [{
-        token : "string",
-        regex : '".*?"'
-    }, {
-        token : "string", // multi line string start
-        merge : true,
-        regex : '["].*',
-        next : state + "_qqstring"
-    }, {
-        token : "string",
-        regex : "'.*?'"
-    }, {
-        token : "string", // multi line string start
-        merge : true,
-        regex : "['].*",
-        next : state + "_qstring"
-    }];
-}
-
-function multiLineString(quote, state) {
-    return [{
-        token : "string",
-        merge : true,
-        regex : ".*?" + quote,
-        next : state
-    }, {
-        token : "string",
-        merge : true,
-        regex : '.+'
-    }];
-}
-
-exports.tag = function(states, name, nextState) {
-    states[name] = [{
-        token : "text",
-        regex : "\\s+"
-    }, {
-        //token : "meta.tag",
-        
-    token : function(value) {
-            if ( value==='a' ) {
-                return "meta.tag.anchor";
-            }
-            else if ( value==='img' ) {
-                return "meta.tag.image";
-            }
-            else if ( value==='script' ) {
-                return "meta.tag.script";
-            }
-            else if ( value==='style' ) {
-                return "meta.tag.style";
-            }
-            else if (formTags.hasOwnProperty(value.toLowerCase())) {
-                return "meta.tag.form";
-            }
-            else if (tableTags.hasOwnProperty(value.toLowerCase())) {
-                return "meta.tag.table";
-            }
-            else {
-                return "meta.tag";
-            }
-        },        
-        merge : true,
-        regex : "[-_a-zA-Z0-9:]+",
-        next : name + "_embed_attribute_list" 
-    }, {
-        token: "empty",
-        regex: "",
-        next : name + "_embed_attribute_list"
-    }];
-
-    states[name + "_qstring"] = multiLineString("'", name + "_embed_attribute_list");
-    states[name + "_qqstring"] = multiLineString("\"", name + "_embed_attribute_list");
-    
-    states[name + "_embed_attribute_list"] = [{
-        token : "meta.tag",
-        merge : true,
-        regex : "\/?>",
-        next : nextState
-    }, {
-        token : "keyword.operator",
-        regex : "="
-    }, {
-        token : "entity.other.attribute-name",
-        regex : "[-_a-zA-Z0-9:]+"
-    }, {
-        token : "constant.numeric", // float
-        regex : "[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"
-    }, {
-        token : "text",
-        regex : "\\s+"
-    }].concat(string(name));
-};
-
-});
-/* vim:ts=4:sts=4:sw=4:
- * ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Chris Spencer <chris.ag.spencer AT googlemail DOT com>
- *
- * 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 ***** */
-
-define('ace/mode/behaviour/xml', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/behaviour', 'ace/mode/behaviour/cstyle'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../../lib/oop");
-var Behaviour = require("../behaviour").Behaviour;
-var CstyleBehaviour = require("./cstyle").CstyleBehaviour;
-
-var XmlBehaviour = function () {
-    
-    this.inherit(CstyleBehaviour, ["string_dquotes"]); // Get string behaviour
-    
-    this.add("brackets", "insertion", function (state, action, editor, session, text) {
-        if (text == '<') {
-            var selection = editor.getSelectionRange();
-            var selected = session.doc.getTextRange(selection);
-            if (selected !== "") {
-                return false;
-            } else {
-                return {
-                    text: '<>',
-                    selection: [1, 1]
-                }
-            }
-        } else if (text == '>') {
-            var cursor = editor.getCursorPosition();
-            var line = session.doc.getLine(cursor.row);
-            var rightChar = line.substring(cursor.column, cursor.column + 1);
-            if (rightChar == '>') { // need some kind of matching check here
-                return {
-                    text: '',
-                    selection: [1, 1]
-                }
-            }
-        } else if (text == "\n") {
-            var cursor = editor.getCursorPosition();
-            var line = session.doc.getLine(cursor.row);
-            var rightChars = line.substring(cursor.column, cursor.column + 2);
-            if (rightChars == '</') {
-                var indent = this.$getIndent(session.doc.getLine(cursor.row)) + session.getTabString();
-                var next_indent = this.$getIndent(session.doc.getLine(cursor.row));
-
-                return {
-                    text: '\n' + indent + '\n' + next_indent,
-                    selection: [1, indent.length, 1, indent.length]
-                }
-            }
-        }
-    });
-    
-}
-oop.inherits(XmlBehaviour, Behaviour);
-
-exports.XmlBehaviour = XmlBehaviour;
-});/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/folding/html', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/folding/mixed', 'ace/mode/folding/xml', 'ace/mode/folding/cstyle'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../../lib/oop");
-var MixedFoldMode = require("./mixed").FoldMode;
-var XmlFoldMode = require("./xml").FoldMode;
-var CStyleFoldMode = require("./cstyle").FoldMode;
-
-var FoldMode = exports.FoldMode = function() {
-    MixedFoldMode.call(this, new XmlFoldMode({
-        // void elements
-        "area": 1,
-        "base": 1,
-        "br": 1,
-        "col": 1,
-        "command": 1,
-        "embed": 1,
-        "hr": 1,
-        "img": 1,
-        "input": 1,
-        "keygen": 1,
-        "link": 1,
-        "meta": 1,
-        "param": 1,
-        "source": 1,
-        "track": 1,
-        "wbr": 1,
-        
-        // optional tags 
-        "li": 1,
-        "dt": 1,
-        "dd": 1,
-        "p": 1,
-        "rt": 1,
-        "rp": 1,
-        "optgroup": 1,
-        "option": 1,
-        "colgroup": 1,
-        "td": 1,
-        "th": 1
-    }), {
-        "js-": new CStyleFoldMode(),
-        "css-": new CStyleFoldMode()
-    });
-};
-
-oop.inherits(FoldMode, MixedFoldMode);
-
-});/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/folding/mixed', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/folding/fold_mode'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../../lib/oop");
-var BaseFoldMode = require("./fold_mode").FoldMode;
-
-var FoldMode = exports.FoldMode = function(defaultMode, subModes) {
-    this.defaultMode = defaultMode;
-    this.subModes = subModes;
-};
-oop.inherits(FoldMode, BaseFoldMode);
-
-(function() {
-
-
-    this.$getMode = function(state) {
-        for (var key in this.subModes) {
-            if (state.indexOf(key) === 0)
-                return this.subModes[key];
-        }
-        return null;
-    };
-    
-    this.$tryMode = function(state, session, foldStyle, row) {
-        var mode = this.$getMode(state);
-        return (mode ? mode.getFoldWidget(session, foldStyle, row) : "");
-    };
-
-    this.getFoldWidget = function(session, foldStyle, row) {
-        return (
-            this.$tryMode(session.getState(row-1), session, foldStyle, row) ||
-            this.$tryMode(session.getState(row), session, foldStyle, row) ||
-            this.defaultMode.getFoldWidget(session, foldStyle, row)
-        );
-    };
-
-    this.getFoldWidgetRange = function(session, foldStyle, row) {
-        var mode = this.$getMode(session.getState(row-1));
-        
-        if (!mode || !mode.getFoldWidget(session, foldStyle, row))
-            mode = this.$getMode(session.getState(row));
-        
-        if (!mode || !mode.getFoldWidget(session, foldStyle, row))
-            mode = this.defaultMode;
-        
-        return mode.getFoldWidgetRange(session, foldStyle, row);
-    };
-
-}).call(FoldMode.prototype);
-
-});/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/folding/xml', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/lang', 'ace/range', 'ace/mode/folding/fold_mode', 'ace/token_iterator'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../../lib/oop");
-var lang = require("../../lib/lang");
-var Range = require("../../range").Range;
-var BaseFoldMode = require("./fold_mode").FoldMode;
-var TokenIterator = require("../../token_iterator").TokenIterator;
-
-var FoldMode = exports.FoldMode = function(voidElements) {
-    BaseFoldMode.call(this);
-    this.voidElements = voidElements || {};
-};
-oop.inherits(FoldMode, BaseFoldMode);
-
-(function() {
-
-    this.getFoldWidget = function(session, foldStyle, row) {
-        var tag = this._getFirstTagInLine(session, row);
-
-        if (tag.closing)
-            return foldStyle == "markbeginend" ? "end" : "";
-
-        if (!tag.tagName || this.voidElements[tag.tagName.toLowerCase()])
-            return "";
-
-        if (tag.selfClosing)
-            return "";
-
-        if (tag.value.indexOf("/" + tag.tagName) !== -1)
-            return "";
-
-        return "start";
-    };
-    
-    this._getFirstTagInLine = function(session, row) {
-        var tokens = session.getTokens(row, row)[0].tokens;
-        var value = "";
-        for (var i = 0; i < tokens.length; i++) {
-            var token = tokens[i];
-            if (token.type.indexOf("meta.tag") === 0)
-                value += token.value;
-            else
-                value += lang.stringRepeat(" ", token.value.length);
-        }
-        
-        return this._parseTag(value);
-    };
-
-    this.tagRe = /^(\s*)(<?(\/?)([-_a-zA-Z0-9:!]*)\s*(\/?)>?)/;
-    this._parseTag = function(tag) {
-        
-        var match = this.tagRe.exec(tag);
-        var column = this.tagRe.lastIndex || 0;
-        this.tagRe.lastIndex = 0;
-
-        return {
-            value: tag,
-            match: match ? match[2] : "",
-            closing: match ? !!match[3] : false,
-            selfClosing: match ? !!match[5] || match[2] == "/>" : false,
-            tagName: match ? match[4] : "",
-            column: match[1] ? column + match[1].length : column
-        };
-    };
-    
-    /**
-     * reads a full tag and places the iterator after the tag
-     */
-    this._readTagForward = function(iterator) {
-        var token = iterator.getCurrentToken();
-        if (!token)
-            return null;
-            
-        var value = "";
-        var start;
-        
-        do {
-            if (token.type.indexOf("meta.tag") === 0) {
-                if (!start) {
-                    var start = {
-                        row: iterator.getCurrentTokenRow(),
-                        column: iterator.getCurrentTokenColumn()
-                    };
-                }
-                value += token.value;
-                if (value.indexOf(">") !== -1) {
-                    var tag = this._parseTag(value);
-                    tag.start = start;
-                    tag.end = {
-                        row: iterator.getCurrentTokenRow(),
-                        column: iterator.getCurrentTokenColumn() + token.value.length
-                    };
-                    iterator.stepForward();
-                    return tag;
-                }
-            }
-        } while(token = iterator.stepForward());
-        
-        return null;
-    };
-    
-    this._readTagBackward = function(iterator) {
-        var token = iterator.getCurrentToken();
-        if (!token)
-            return null;
-            
-        var value = "";
-        var end;
-
-        do {
-            if (token.type.indexOf("meta.tag") === 0) {
-                if (!end) {
-                    end = {
-                        row: iterator.getCurrentTokenRow(),
-                        column: iterator.getCurrentTokenColumn() + token.value.length
-                    };
-                }
-                value = token.value + value;
-                if (value.indexOf("<") !== -1) {
-                    var tag = this._parseTag(value);
-                    tag.end = end;
-                    tag.start = {
-                        row: iterator.getCurrentTokenRow(),
-                        column: iterator.getCurrentTokenColumn()
-                    };
-                    iterator.stepBackward();
-                    return tag;
-                }
-            }
-        } while(token = iterator.stepBackward());
-        
-        return null;
-    };
-    
-    this._pop = function(stack, tag) {
-        while (stack.length) {
-            
-            var top = stack[stack.length-1];
-            if (!tag || top.tagName == tag.tagName) {
-                return stack.pop();
-            }
-            else if (this.voidElements[tag.tagName]) {
-                return;
-            }
-            else if (this.voidElements[top.tagName]) {
-                stack.pop();
-                continue;
-            } else {
-                return null;
-            }
-        }
-    };
-    
-    this.getFoldWidgetRange = function(session, foldStyle, row) {
-        var firstTag = this._getFirstTagInLine(session, row);
-        
-        if (!firstTag.match)
-            return null;
-        
-        var isBackward = firstTag.closing || firstTag.selfClosing;
-        var stack = [];
-        var tag;
-        
-        if (!isBackward) {
-            var iterator = new TokenIterator(session, row, firstTag.column);
-            var start = {
-                row: row,
-                column: firstTag.column + firstTag.tagName.length + 2
-            };
-            while (tag = this._readTagForward(iterator)) {
-                if (tag.selfClosing) {
-                    if (!stack.length) {
-                        tag.start.column += tag.tagName.length + 2;
-                        tag.end.column -= 2;
-                        return Range.fromPoints(tag.start, tag.end);
-                    } else
-                        continue;
-                }
-                
-                if (tag.closing) {
-                    this._pop(stack, tag);
-                    if (stack.length == 0)
-                        return Range.fromPoints(start, tag.start);
-                }
-                else {
-                    stack.push(tag)
-                }
-            }
-        }
-        else {
-            var iterator = new TokenIterator(session, row, firstTag.column + firstTag.match.length);
-            var end = {
-                row: row,
-                column: firstTag.column
-            };
-            
-            while (tag = this._readTagBackward(iterator)) {
-                if (tag.selfClosing) {
-                    if (!stack.length) {
-                        tag.start.column += tag.tagName.length + 2;
-                        tag.end.column -= 2;
-                        return Range.fromPoints(tag.start, tag.end);
-                    } else
-                        continue;
-                }
-                
-                if (!tag.closing) {
-                    this._pop(stack, tag);
-                    if (stack.length == 0) {
-                        tag.start.column += tag.tagName.length + 2;
-                        return Range.fromPoints(tag.start, end);
-                    }
-                }
-                else {
-                    stack.push(tag)
-                }
-            }
-        }
-        
-    };
-
-}).call(FoldMode.prototype);
-
-});
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/mode-html.js b/apps/files_texteditor/js/aceeditor/mode-html.js
deleted file mode 100644
index 78701813b2..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-html.js
+++ /dev/null
@@ -1 +0,0 @@
-define("ace/mode/html",["require","exports","module","ace/lib/oop","ace/mode/text","ace/mode/javascript","ace/mode/css","ace/tokenizer","ace/mode/html_highlight_rules","ace/mode/behaviour/xml","ace/mode/folding/html"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text").Mode,f=a("./javascript").Mode,g=a("./css").Mode,h=a("../tokenizer").Tokenizer,i=a("./html_highlight_rules").HtmlHighlightRules,j=a("./behaviour/xml").XmlBehaviour,k=a("./folding/html").FoldMode,l=function(){var a=new i;this.$tokenizer=new h(a.getRules()),this.$behaviour=new j,this.$embeds=a.getEmbeds(),this.createModeDelegates({"js-":f,"css-":g}),this.foldingRules=new k};d.inherits(l,e),function(){this.toggleCommentLines=function(a,b,c,d){return 0},this.getNextLineIndent=function(a,b,c){return this.$getIndent(b)},this.checkOutdent=function(a,b,c){return!1}}.call(l.prototype),b.Mode=l}),define("ace/mode/javascript",["require","exports","module","ace/lib/oop","ace/mode/text","ace/tokenizer","ace/mode/javascript_highlight_rules","ace/mode/matching_brace_outdent","ace/range","ace/worker/worker_client","ace/mode/behaviour/cstyle","ace/mode/folding/cstyle"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text").Mode,f=a("../tokenizer").Tokenizer,g=a("./javascript_highlight_rules").JavaScriptHighlightRules,h=a("./matching_brace_outdent").MatchingBraceOutdent,i=a("../range").Range,j=a("../worker/worker_client").WorkerClient,k=a("./behaviour/cstyle").CstyleBehaviour,l=a("./folding/cstyle").FoldMode,m=function(){this.$tokenizer=new f((new g).getRules()),this.$outdent=new h,this.$behaviour=new k,this.foldingRules=new l};d.inherits(m,e),function(){this.toggleCommentLines=function(a,b,c,d){var e=!0,f=/^(\s*)\/\//;for(var g=c;g<=d;g++)if(!f.test(b.getLine(g))){e=!1;break}if(e){var h=new i(0,0,0,0);for(var g=c;g<=d;g++){var j=b.getLine(g),k=j.match(f);h.start.row=g,h.end.row=g,h.end.column=k[0].length,b.replace(h,k[1])}}else b.indentRows(c,d,"//")},this.getNextLineIndent=function(a,b,c){var d=this.$getIndent(b),e=this.$tokenizer.getLineTokens(b,a),f=e.tokens,g=e.state;if(f.length&&f[f.length-1].type=="comment")return d;if(a=="start"||a=="regex_allowed"){var h=b.match(/^.*(?:\bcase\b.*\:|[\{\(\[])\s*$/);h&&(d+=c)}else if(a=="doc-start"){if(g=="start"||a=="regex_allowed")return"";var h=b.match(/^\s*(\/?)\*/);h&&(h[1]&&(d+=" "),d+="* ")}return d},this.checkOutdent=function(a,b,c){return this.$outdent.checkOutdent(b,c)},this.autoOutdent=function(a,b,c){this.$outdent.autoOutdent(b,c)},this.createWorker=function(a){var b=new j(["ace"],"worker-javascript.js","ace/mode/javascript_worker","JavaScriptWorker");return b.attachToDocument(a.getDocument()),b.on("jslint",function(b){var c=[];for(var d=0;d<b.data.length;d++){var e=b.data[d];e&&c.push({row:e.line-1,column:e.character-1,text:e.reason,type:"warning",lint:e})}a.setAnnotations(c)}),b.on("narcissus",function(b){a.setAnnotations([b.data])}),b.on("terminate",function(){a.clearAnnotations()}),b}}.call(m.prototype),b.Mode=m}),define("ace/mode/javascript_highlight_rules",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/unicode","ace/mode/doc_comment_highlight_rules","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("../lib/lang"),f=a("../unicode"),g=a("./doc_comment_highlight_rules").DocCommentHighlightRules,h=a("./text_highlight_rules").TextHighlightRules,i=function(){var a=e.arrayToMap("Array|Boolean|Date|Function|Iterator|Number|Object|RegExp|String|Proxy|Namespace|QName|XML|XMLList|ArrayBuffer|Float32Array|Float64Array|Int16Array|Int32Array|Int8Array|Uint16Array|Uint32Array|Uint8Array|Uint8ClampedArray|Error|EvalError|InternalError|RangeError|ReferenceError|StopIteration|SyntaxError|TypeError|URIError|decodeURI|decodeURIComponent|encodeURI|encodeURIComponent|eval|isFinite|isNaN|parseFloat|parseInt|JSON|Math|this|arguments|prototype|window|document".split("|")),b=e.arrayToMap("break|case|catch|continue|default|delete|do|else|finally|for|function|if|in|instanceof|new|return|switch|throw|try|typeof|let|var|while|with|const|yield|import|get|set".split("|")),c="case|do|else|finally|in|instanceof|return|throw|try|typeof|yield",d=e.arrayToMap("__parent__|__count__|escape|unescape|with|__proto__".split("|")),h=e.arrayToMap("const|let|var|function".split("|")),i=e.arrayToMap("null|Infinity|NaN|undefined".split("|")),j=e.arrayToMap("class|enum|extends|super|export|implements|private|public|interface|package|protected|static".split("|")),k="["+f.packages.L+"\\$_]["+f.packages.L+f.packages.Mn+f.packages.Mc+f.packages.Nd+f.packages.Pc+"\\$_]*\\b",l="\\\\(?:x[0-9a-fA-F]{2}|u[0-9a-fA-F]{4}|[0-2][0-7]{0,2}|3[0-6][0-7]?|37[0-7]?|[4-7][0-7]?|.)";this.$rules={start:[{token:"comment",regex:/\/\/.*$/},(new g).getStartRule("doc-start"),{token:"comment",merge:!0,regex:/\/\*/,next:"comment"},{token:"string",regex:"'",next:"qstring"},{token:"string",regex:'"',next:"qqstring"},{token:"constant.numeric",regex:/0[xX][0-9a-fA-F]+\b/},{token:"constant.numeric",regex:/[+-]?\d+(?:(?:\.\d*)?(?:[eE][+-]?\d+)?)?\b/},{token:["storage.type","punctuation.operator","support.function","punctuation.operator","entity.name.function","text","keyword.operator","text","storage.type","text","paren.lparen","variable.parameter","paren.rparen"],regex:"("+k+")(\\.)(prototype)(\\.)("+k+")(\\s*)(=)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"},{token:["storage.type","punctuation.operator","support.function","punctuation.operator","entity.name.function","text","keyword.operator","text"],regex:"("+k+")(\\.)(prototype)(\\.)("+k+")(\\s*)(=)(\\s*)"},{token:["storage.type","punctuation.operator","entity.name.function","text","keyword.operator","text","storage.type","text","paren.lparen","variable.parameter","paren.rparen"],regex:"("+k+")(\\.)("+k+")(\\s*)(=)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"},{token:["entity.name.function","text","keyword.operator","text","storage.type","text","paren.lparen","variable.parameter","paren.rparen"],regex:"("+k+")(\\s*)(=)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"},{token:["storage.type","text","entity.name.function","text","paren.lparen","variable.parameter","paren.rparen"],regex:"(function)(\\s+)("+k+")(\\s*)(\\()(.*?)(\\))"},{token:["entity.name.function","text","punctuation.operator","text","storage.type","text","paren.lparen","variable.parameter","paren.rparen"],regex:"("+k+")(\\s*)(:)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"},{token:["text","text","storage.type","text","paren.lparen","variable.parameter","paren.rparen"],regex:"(:)(\\s*)(function)?(\\s*)(\\()([^)]*)(\\))"},{token:"constant.language.boolean",regex:/(?:true|false)\b/},{token:"keyword",regex:"(?:"+c+")\\b",next:"regex_allowed"},{token:["punctuation.operator","support.function"],regex:/(\.)(s(?:h(?:ift|ow(?:Mod(?:elessDialog|alDialog)|Help))|croll(?:X|By(?:Pages|Lines)?|Y|To)?|t(?:opzzzz|rike)|i(?:n|zeToContent|debar|gnText)|ort|u(?:p|b(?:str(?:ing)?)?)|pli(?:ce|t)|e(?:nd|t(?:Re(?:sizable|questHeader)|M(?:i(?:nutes|lliseconds)|onth)|Seconds|Ho(?:tKeys|urs)|Year|Cursor|Time(?:out)?|Interval|ZOptions|Date|UTC(?:M(?:i(?:nutes|lliseconds)|onth)|Seconds|Hours|Date|FullYear)|FullYear|Active)|arch)|qrt|lice|avePreferences|mall)|h(?:ome|andleEvent)|navigate|c(?:har(?:CodeAt|At)|o(?:s|n(?:cat|textual|firm)|mpile)|eil|lear(?:Timeout|Interval)?|a(?:ptureEvents|ll)|reate(?:StyleSheet|Popup|EventObject))|t(?:o(?:GMTString|S(?:tring|ource)|U(?:TCString|pperCase)|Lo(?:caleString|werCase))|est|a(?:n|int(?:Enabled)?))|i(?:s(?:NaN|Finite)|ndexOf|talics)|d(?:isableExternalCapture|ump|etachEvent)|u(?:n(?:shift|taint|escape|watch)|pdateCommands)|j(?:oin|avaEnabled)|p(?:o(?:p|w)|ush|lugins.refresh|a(?:ddings|rse(?:Int|Float)?)|r(?:int|ompt|eference))|e(?:scape|nableExternalCapture|val|lementFromPoint|x(?:p|ec(?:Script|Command)?))|valueOf|UTC|queryCommand(?:State|Indeterm|Enabled|Value)|f(?:i(?:nd|le(?:ModifiedDate|Size|CreatedDate|UpdatedDate)|xed)|o(?:nt(?:size|color)|rward)|loor|romCharCode)|watch|l(?:ink|o(?:ad|g)|astIndexOf)|a(?:sin|nchor|cos|t(?:tachEvent|ob|an(?:2)?)|pply|lert|b(?:s|ort))|r(?:ou(?:nd|teEvents)|e(?:size(?:By|To)|calc|turnValue|place|verse|l(?:oad|ease(?:Capture|Events)))|andom)|g(?:o|et(?:ResponseHeader|M(?:i(?:nutes|lliseconds)|onth)|Se(?:conds|lection)|Hours|Year|Time(?:zoneOffset)?|Da(?:y|te)|UTC(?:M(?:i(?:nutes|lliseconds)|onth)|Seconds|Hours|Da(?:y|te)|FullYear)|FullYear|A(?:ttention|llResponseHeaders)))|m(?:in|ove(?:B(?:y|elow)|To(?:Absolute)?|Above)|ergeAttributes|a(?:tch|rgins|x))|b(?:toa|ig|o(?:ld|rderWidths)|link|ack))\b(?=\()/},{token:["punctuation.operator","support.function.dom"],regex:/(\.)(s(?:ub(?:stringData|mit)|plitText|e(?:t(?:NamedItem|Attribute(?:Node)?)|lect))|has(?:ChildNodes|Feature)|namedItem|c(?:l(?:ick|o(?:se|neNode))|reate(?:C(?:omment|DATASection|aption)|T(?:Head|extNode|Foot)|DocumentFragment|ProcessingInstruction|E(?:ntityReference|lement)|Attribute))|tabIndex|i(?:nsert(?:Row|Before|Cell|Data)|tem)|open|delete(?:Row|C(?:ell|aption)|T(?:Head|Foot)|Data)|focus|write(?:ln)?|a(?:dd|ppend(?:Child|Data))|re(?:set|place(?:Child|Data)|move(?:NamedItem|Child|Attribute(?:Node)?)?)|get(?:NamedItem|Element(?:sBy(?:Name|TagName)|ById)|Attribute(?:Node)?)|blur)\b(?=\()/},{token:["punctuation.operator","support.constant"],regex:/(\.)(s(?:ystemLanguage|cr(?:ipts|ollbars|een(?:X|Y|Top|Left))|t(?:yle(?:Sheets)?|atus(?:Text|bar)?)|ibling(?:Below|Above)|ource|uffixes|e(?:curity(?:Policy)?|l(?:ection|f)))|h(?:istory|ost(?:name)?|as(?:h|Focus))|y|X(?:MLDocument|SLDocument)|n(?:ext|ame(?:space(?:s|URI)|Prop))|M(?:IN_VALUE|AX_VALUE)|c(?:haracterSet|o(?:n(?:structor|trollers)|okieEnabled|lorDepth|mp(?:onents|lete))|urrent|puClass|l(?:i(?:p(?:boardData)?|entInformation)|osed|asses)|alle(?:e|r)|rypto)|t(?:o(?:olbar|p)|ext(?:Transform|Indent|Decoration|Align)|ags)|SQRT(?:1_2|2)|i(?:n(?:ner(?:Height|Width)|put)|ds|gnoreCase)|zIndex|o(?:scpu|n(?:readystatechange|Line)|uter(?:Height|Width)|p(?:sProfile|ener)|ffscreenBuffering)|NEGATIVE_INFINITY|d(?:i(?:splay|alog(?:Height|Top|Width|Left|Arguments)|rectories)|e(?:scription|fault(?:Status|Ch(?:ecked|arset)|View)))|u(?:ser(?:Profile|Language|Agent)|n(?:iqueID|defined)|pdateInterval)|_content|p(?:ixelDepth|ort|ersonalbar|kcs11|l(?:ugins|atform)|a(?:thname|dding(?:Right|Bottom|Top|Left)|rent(?:Window|Layer)?|ge(?:X(?:Offset)?|Y(?:Offset)?))|r(?:o(?:to(?:col|type)|duct(?:Sub)?|mpter)|e(?:vious|fix)))|e(?:n(?:coding|abledPlugin)|x(?:ternal|pando)|mbeds)|v(?:isibility|endor(?:Sub)?|Linkcolor)|URLUnencoded|P(?:I|OSITIVE_INFINITY)|f(?:ilename|o(?:nt(?:Size|Family|Weight)|rmName)|rame(?:s|Element)|gColor)|E|whiteSpace|l(?:i(?:stStyleType|n(?:eHeight|kColor))|o(?:ca(?:tion(?:bar)?|lName)|wsrc)|e(?:ngth|ft(?:Context)?)|a(?:st(?:M(?:odified|atch)|Index|Paren)|yer(?:s|X)|nguage))|a(?:pp(?:MinorVersion|Name|Co(?:deName|re)|Version)|vail(?:Height|Top|Width|Left)|ll|r(?:ity|guments)|Linkcolor|bove)|r(?:ight(?:Context)?|e(?:sponse(?:XML|Text)|adyState))|global|x|m(?:imeTypes|ultiline|enubar|argin(?:Right|Bottom|Top|Left))|L(?:N(?:10|2)|OG(?:10E|2E))|b(?:o(?:ttom|rder(?:Width|RightWidth|BottomWidth|Style|Color|TopWidth|LeftWidth))|ufferDepth|elow|ackground(?:Color|Image)))\b/},{token:["storage.type","punctuation.operator","support.function.firebug"],regex:/(console)(\.)(warn|info|log|error|time|timeEnd|assert)\b/},{token:function(c){return a.hasOwnProperty(c)?"variable.language":d.hasOwnProperty(c)?"invalid.deprecated":h.hasOwnProperty(c)?"storage.type":b.hasOwnProperty(c)?"keyword":i.hasOwnProperty(c)?"constant.language":j.hasOwnProperty(c)?"invalid.illegal":c=="debugger"?"invalid.deprecated":"identifier"},regex:k},{token:"keyword.operator",regex:/!|\$|%|&|\*|\-\-|\-|\+\+|\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\|\||\?\:|\*=|%=|\+=|\-=|&=|\^=|\b(?:in|instanceof|new|delete|typeof|void)/,next:"regex_allowed"},{token:"punctuation.operator",regex:/\?|\:|\,|\;|\./,next:"regex_allowed"},{token:"paren.lparen",regex:/[\[({]/,next:"regex_allowed"},{token:"paren.rparen",regex:/[\])}]/},{token:"keyword.operator",regex:/\/=?/,next:"regex_allowed"},{token:"comment",regex:/^#!.*$/},{token:"text",regex:/\s+/}],regex_allowed:[{token:"comment",merge:!0,regex:"\\/\\*",next:"comment_regex_allowed"},{token:"comment",regex:"\\/\\/.*$"},{token:"string.regexp",regex:"\\/",next:"regex",merge:!0},{token:"text",regex:"\\s+"},{token:"empty",regex:"",next:"start"}],regex:[{token:"regexp.keyword.operator",regex:"\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)",next:"regex"},{token:"string.regexp",regex:"/\\w*",next:"start",merge:!0},{token:"string.regexp",regex:"[^\\\\/\\[]+",next:"regex",merge:!0},{token:"string.regexp.charachterclass",regex:"\\[",next:"regex_character_class",merge:!0},{token:"empty",regex:"",next:"start"}],regex_character_class:[{token:"regexp.keyword.operator",regex:"\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)",next:"regex_character_class"},{token:"string.regexp.charachterclass",regex:"]",next:"regex",merge:!0},{token:"string.regexp.charachterclass",regex:"[^\\\\\\]]+",next:"regex_character_class",merge:!0},{token:"empty",regex:"",next:"start"}],comment_regex_allowed:[{token:"comment",regex:".*?\\*\\/",merge:!0,next:"regex_allowed"},{token:"comment",merge:!0,regex:".+"}],comment:[{token:"comment",regex:".*?\\*\\/",merge:!0,next:"start"},{token:"comment",merge:!0,regex:".+"}],qqstring:[{token:"constant.language.escape",regex:l},{token:"string",regex:'[^"\\\\]+'},{token:"string",regex:'"',next:"start"}],qstring:[{token:"constant.language.escape",regex:l},{token:"string",regex:"[^'\\\\]+"},{token:"string",regex:"'",next:"start"}]},this.embedRules(g,"doc-",[(new g).getEndRule("start")])};d.inherits(i,h),b.JavaScriptHighlightRules=i}),define("ace/mode/doc_comment_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text_highlight_rules").TextHighlightRules,f=function(){this.$rules={start:[{token:"comment.doc.tag",regex:"@[\\w\\d_]+"},{token:"comment.doc",merge:!0,regex:"\\s+"},{token:"comment.doc",merge:!0,regex:"TODO"},{token:"comment.doc",merge:!0,regex:"[^@\\*]+"},{token:"comment.doc",merge:!0,regex:"."}]}};d.inherits(f,e),function(){this.getStartRule=function(a){return{token:"comment.doc",merge:!0,regex:"\\/\\*(?=\\*)",next:a}},this.getEndRule=function(a){return{token:"comment.doc",merge:!0,regex:"\\*\\/",next:a}}}.call(f.prototype),b.DocCommentHighlightRules=f}),define("ace/mode/matching_brace_outdent",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../range").Range,e=function(){};(function(){this.checkOutdent=function(a,b){return/^\s+$/.test(a)?/^\s*\}/.test(b):!1},this.autoOutdent=function(a,b){var c=a.getLine(b),e=c.match(/^(\s*\})/);if(!e)return 0;var f=e[1].length,g=a.findMatchingBracket({row:b,column:f});if(!g||g.row==b)return 0;var h=this.$getIndent(a.getLine(g.row));a.replace(new d(b,0,b,f-1),h)},this.$getIndent=function(a){var b=a.match(/^(\s+)/);return b?b[1]:""}}).call(e.prototype),b.MatchingBraceOutdent=e}),define("ace/mode/behaviour/cstyle",["require","exports","module","ace/lib/oop","ace/mode/behaviour"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../behaviour").Behaviour,f=function(){this.add("braces","insertion",function(a,b,c,d,e){if(e=="{"){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"{"+g+"}",selection:!1}:{text:"{}",selection:[1,1]}}if(e=="}"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var k=d.$findOpeningBracket("}",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}else if(e=="\n"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var l=d.findMatchingBracket({row:h.row,column:h.column+1});if(!l)return null;var m=this.getNextLineIndent(a,i.substring(0,i.length-1),d.getTabString()),n=this.$getIndent(d.doc.getLine(l.row));return{text:"\n"+m+"\n"+n,selection:[1,m.length,1,m.length]}}}}),this.add("braces","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="{"){var g=d.doc.getLine(e.start.row),h=g.substring(e.end.column,e.end.column+1);if(h=="}")return e.end.column++,e}}),this.add("parens","insertion",function(a,b,c,d,e){if(e=="("){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"("+g+")",selection:!1}:{text:"()",selection:[1,1]}}if(e==")"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j==")"){var k=d.$findOpeningBracket(")",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}}),this.add("parens","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="("){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h==")")return e.end.column++,e}}),this.add("string_dquotes","insertion",function(a,b,c,d,e){if(e=='"'||e=="'"){var f=e,g=c.getSelectionRange(),h=d.doc.getTextRange(g);if(h!=="")return{text:f+h+f,selection:!1};var i=c.getCursorPosition(),j=d.doc.getLine(i.row),k=j.substring(i.column-1,i.column);if(k=="\\")return null;var l=d.getTokens(g.start.row,g.start.row)[0].tokens,m=0,n,o=-1;for(var p=0;p<l.length;p++){n=l[p],n.type=="string"?o=-1:o<0&&(o=n.value.indexOf(f));if(n.value.length+m>g.start.column)break;m+=l[p].value.length}if(!n||o<0&&n.type!=="comment"&&(n.type!=="string"||g.start.column!==n.value.length+m-1&&n.value.lastIndexOf(f)===n.value.length-1))return{text:f+f,selection:[1,1]};if(n&&n.type==="string"){var q=j.substring(i.column,i.column+1);if(q==f)return{text:"",selection:[1,1]}}}}),this.add("string_dquotes","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&(f=='"'||f=="'")){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h=='"')return e.end.column++,e}})};d.inherits(f,e),b.CstyleBehaviour=f}),define("ace/mode/folding/cstyle",["require","exports","module","ace/lib/oop","ace/range","ace/mode/folding/fold_mode"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../../range").Range,f=a("./fold_mode").FoldMode,g=b.FoldMode=function(){};d.inherits(g,f),function(){this.foldingStartMarker=/(\{|\[)[^\}\]]*$|^\s*(\/\*)/,this.foldingStopMarker=/^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/,this.getFoldWidgetRange=function(a,b,c){var d=a.getLine(c),f=d.match(this.foldingStartMarker);if(f){var g=f.index;if(f[1])return this.openingBracketBlock(a,f[1],c,g);var h=a.getCommentFoldRange(c,g+f[0].length);return h.end.column-=2,h}if(b!=="markbeginend")return;var f=d.match(this.foldingStopMarker);if(f){var g=f.index+f[0].length;if(f[2]){var h=a.getCommentFoldRange(c,g);return h.end.column-=2,h}var i={row:c,column:g},j=a.$findOpeningBracket(f[1],i);if(!j)return;return j.column++,i.column--,e.fromPoints(j,i)}}}.call(g.prototype)}),define("ace/mode/folding/fold_mode",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../../range").Range,e=b.FoldMode=function(){};(function(){this.foldingStartMarker=null,this.foldingStopMarker=null,this.getFoldWidget=function(a,b,c){var d=a.getLine(c);return this.foldingStartMarker.test(d)?"start":b=="markbeginend"&&this.foldingStopMarker&&this.foldingStopMarker.test(d)?"end":""},this.getFoldWidgetRange=function(a,b,c){return null},this.indentationBlock=function(a,b,c){var e=/^\s*/,f=b,g=b,h=a.getLine(b),i=c||h.length,j=h.match(e)[0].length,k=a.getLength();while(++b<k){h=a.getLine(b);var l=h.match(e)[0].length;if(l==h.length)continue;if(l<=j)break;g=b}if(g>f){var m=a.getLine(g).length;return new d(f,i,g,m)}},this.openingBracketBlock=function(a,b,c,e){var f={row:c,column:e+1},g=a.$findClosingBracket(b,f);if(!g)return;var h=a.foldWidgets[g.row];return h==null&&(h=this.getFoldWidget(a,g.row)),h=="start"&&(g.row--,g.column=a.getLine(g.row).length),d.fromPoints(f,g)}}).call(e.prototype)}),define("ace/mode/css",["require","exports","module","ace/lib/oop","ace/mode/text","ace/tokenizer","ace/mode/css_highlight_rules","ace/mode/matching_brace_outdent","ace/worker/worker_client","ace/mode/folding/cstyle"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text").Mode,f=a("../tokenizer").Tokenizer,g=a("./css_highlight_rules").CssHighlightRules,h=a("./matching_brace_outdent").MatchingBraceOutdent,i=a("../worker/worker_client").WorkerClient,j=a("./folding/cstyle").FoldMode,k=function(){this.$tokenizer=new f((new g).getRules(),"i"),this.$outdent=new h,this.foldingRules=new j};d.inherits(k,e),function(){this.foldingRules="cStyle",this.getNextLineIndent=function(a,b,c){var d=this.$getIndent(b),e=this.$tokenizer.getLineTokens(b,a).tokens;if(e.length&&e[e.length-1].type=="comment")return d;var f=b.match(/^.*\{\s*$/);return f&&(d+=c),d},this.checkOutdent=function(a,b,c){return this.$outdent.checkOutdent(b,c)},this.autoOutdent=function(a,b,c){this.$outdent.autoOutdent(b,c)},this.createWorker=function(a){var b=new i(["ace"],"worker-css.js","ace/mode/css_worker","Worker");return b.attachToDocument(a.getDocument()),b.on("csslint",function(b){var c=[];b.data.forEach(function(a){c.push({row:a.line-1,column:a.col-1,text:a.message,type:a.type,lint:a})}),a.setAnnotations(c)}),b}}.call(k.prototype),b.Mode=k}),define("ace/mode/css_highlight_rules",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("../lib/lang"),f=a("./text_highlight_rules").TextHighlightRules,g=function(){var a=e.arrayToMap("animation-fill-mode|alignment-adjust|alignment-baseline|animation-delay|animation-direction|animation-duration|animation-iteration-count|animation-name|animation-play-state|animation-timing-function|animation|appearance|azimuth|backface-visibility|background-attachment|background-break|background-clip|background-color|background-image|background-origin|background-position|background-repeat|background-size|background|baseline-shift|binding|bleed|bookmark-label|bookmark-level|bookmark-state|bookmark-target|border-bottom|border-bottom-color|border-bottom-left-radius|border-bottom-right-radius|border-bottom-style|border-bottom-width|border-collapse|border-color|border-image|border-image-outset|border-image-repeat|border-image-slice|border-image-source|border-image-width|border-left|border-left-color|border-left-style|border-left-width|border-radius|border-right|border-right-color|border-right-style|border-right-width|border-spacing|border-style|border-top|border-top-color|border-top-left-radius|border-top-right-radius|border-top-style|border-top-width|border-width|border|bottom|box-align|box-decoration-break|box-direction|box-flex-group|box-flex|box-lines|box-ordinal-group|box-orient|box-pack|box-shadow|box-sizing|break-after|break-before|break-inside|caption-side|clear|clip|color-profile|color|column-count|column-fill|column-gap|column-rule|column-rule-color|column-rule-style|column-rule-width|column-span|column-width|columns|content|counter-increment|counter-reset|crop|cue-after|cue-before|cue|cursor|direction|display|dominant-baseline|drop-initial-after-adjust|drop-initial-after-align|drop-initial-before-adjust|drop-initial-before-align|drop-initial-size|drop-initial-value|elevation|empty-cells|fit|fit-position|float-offset|float|font-family|font-size|font-size-adjust|font-stretch|font-style|font-variant|font-weight|font|grid-columns|grid-rows|hanging-punctuation|height|hyphenate-after|hyphenate-before|hyphenate-character|hyphenate-lines|hyphenate-resource|hyphens|icon|image-orientation|image-rendering|image-resolution|inline-box-align|left|letter-spacing|line-height|line-stacking-ruby|line-stacking-shift|line-stacking-strategy|line-stacking|list-style-image|list-style-position|list-style-type|list-style|margin-bottom|margin-left|margin-right|margin-top|margin|mark-after|mark-before|mark|marks|marquee-direction|marquee-play-count|marquee-speed|marquee-style|max-height|max-width|min-height|min-width|move-to|nav-down|nav-index|nav-left|nav-right|nav-up|opacity|orphans|outline-color|outline-offset|outline-style|outline-width|outline|overflow-style|overflow-x|overflow-y|overflow|padding-bottom|padding-left|padding-right|padding-top|padding|page-break-after|page-break-before|page-break-inside|page-policy|page|pause-after|pause-before|pause|perspective-origin|perspective|phonemes|pitch-range|pitch|play-during|position|presentation-level|punctuation-trim|quotes|rendering-intent|resize|rest-after|rest-before|rest|richness|right|rotation-point|rotation|ruby-align|ruby-overhang|ruby-position|ruby-span|size|speak-header|speak-numeral|speak-punctuation|speak|speech-rate|stress|string-set|table-layout|target-name|target-new|target-position|target|text-align-last|text-align|text-decoration|text-emphasis|text-height|text-indent|text-justify|text-outline|text-shadow|text-transform|text-wrap|top|transform-origin|transform-style|transform|transition-delay|transition-duration|transition-property|transition-timing-function|transition|unicode-bidi|vertical-align|visibility|voice-balance|voice-duration|voice-family|voice-pitch-range|voice-pitch|voice-rate|voice-stress|voice-volume|volume|white-space-collapse|white-space|widows|width|word-break|word-spacing|word-wrap|z-index".split("|")),b=e.arrayToMap("rgb|rgba|url|attr|counter|counters".split("|")),c=e.arrayToMap("absolute|after-edge|after|all-scroll|all|alphabetic|always|antialiased|armenian|auto|avoid-column|avoid-page|avoid|balance|baseline|before-edge|before|below|bidi-override|block-line-height|block|bold|bolder|border-box|both|bottom|box|break-all|break-word|capitalize|caps-height|caption|center|central|char|circle|cjk-ideographic|clone|close-quote|col-resize|collapse|column|consider-shifts|contain|content-box|cover|crosshair|cubic-bezier|dashed|decimal-leading-zero|decimal|default|disabled|disc|disregard-shifts|distribute-all-lines|distribute-letter|distribute-space|distribute|dotted|double|e-resize|ease-in|ease-in-out|ease-out|ease|ellipsis|end|exclude-ruby|fill|fixed|font-size|font|georgian|glyphs|grid-height|groove|hand|hanging|hebrew|help|hidden|hiragana-iroha|hiragana|horizontal|icon|ideograph-alpha|ideograph-numeric|ideograph-parenthesis|ideograph-space|ideographic|inactive|include-ruby|inherit|initial|inline-block|inline-box|inline-line-height|inline-table|inline|inset|inside|inter-ideograph|inter-word|invert|italic|justify|katakana-iroha|katakana|keep-all|last|left|lighter|line-edge|line-through|line|linear|list-item|local|loose|lower-alpha|lower-greek|lower-latin|lower-roman|lowercase|lr-tb|ltr|mathematical|max-height|max-size|medium|menu|message-box|middle|move|n-resize|ne-resize|newspaper|no-change|no-close-quote|no-drop|no-open-quote|no-repeat|none|normal|not-allowed|nowrap|nw-resize|oblique|open-quote|outset|outside|overline|padding-box|page|pointer|pre-line|pre-wrap|pre|preserve-3d|progress|relative|repeat-x|repeat-y|repeat|replaced|reset-size|ridge|right|round|row-resize|rtl|s-resize|scroll|se-resize|separate|slice|small-caps|small-caption|solid|space|square|start|static|status-bar|step-end|step-start|steps|stretch|strict|sub|super|sw-resize|table-caption|table-cell|table-column-group|table-column|table-footer-group|table-header-group|table-row-group|table-row|table|tb-rl|text-after-edge|text-before-edge|text-bottom|text-size|text-top|text|thick|thin|top|transparent|underline|upper-alpha|upper-latin|upper-roman|uppercase|use-script|vertical-ideographic|vertical-text|visible|w-resize|wait|whitespace|z-index|zero".split("|")),d=e.arrayToMap("aqua|black|blue|fuchsia|gray|green|lime|maroon|navy|olive|orange|purple|red|silver|teal|white|yellow".split("|")),f=e.arrayToMap("arial|century|comic|courier|garamond|georgia|helvetica|impact|lucida|symbol|system|tahoma|times|trebuchet|utopia|verdana|webdings|sans-serif|serif|monospace".split("|")),g="\\-?(?:(?:[0-9]+)|(?:[0-9]*\\.[0-9]+))",h="(\\:+)\\b(after|before|first-letter|first-line|moz-selection|selection)\\b",i="(:)\\b(active|checked|disabled|empty|enabled|first-child|first-of-type|focus|hover|indeterminate|invalid|last-child|last-of-type|link|not|nth-child|nth-last-child|nth-last-of-type|nth-of-type|only-child|only-of-type|required|root|target|valid|visited)\\b",j=[{token:"comment",merge:!0,regex:"\\/\\*",next:"ruleset_comment"},{token:"string",regex:'["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'},{token:"string",regex:"['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"},{token:["constant.numeric","keyword"],regex:"("+g+")(ch|cm|deg|em|ex|fr|gd|grad|Hz|in|kHz|mm|ms|pc|pt|px|rad|rem|s|turn|vh|vm|vw|%)"},{token:["constant.numeric"],regex:"([0-9]+)"},{token:"constant.numeric",regex:"#[a-f0-9]{6}"},{token:"constant.numeric",regex:"#[a-f0-9]{3}"},{token:["punctuation","entity.other.attribute-name.pseudo-element.css"],regex:h},{token:["punctuation","entity.other.attribute-name.pseudo-class.css"],regex:i},{token:function(e){return a.hasOwnProperty(e.toLowerCase())?"support.type":b.hasOwnProperty(e.toLowerCase())?"support.function":c.hasOwnProperty(e.toLowerCase())?"support.constant":d.hasOwnProperty(e.toLowerCase())?"support.constant.color":f.hasOwnProperty(e.toLowerCase())?"support.constant.fonts":"text"},regex:"\\-?[a-zA-Z_][a-zA-Z0-9_\\-]*"}],k=e.copyArray(j);k.unshift({token:"paren.rparen",regex:"\\}",next:"start"});var l=e.copyArray(j);l.unshift({token:"paren.rparen",regex:"\\}",next:"media"});var m=[{token:"comment",merge:!0,regex:".+"}],n=e.copyArray(m);n.unshift({token:"comment",regex:".*?\\*\\/",next:"start"});var o=e.copyArray(m);o.unshift({token:"comment",regex:".*?\\*\\/",next:"media"});var p=e.copyArray(m);p.unshift({token:"comment",regex:".*?\\*\\/",next:"ruleset"}),this.$rules={start:[{token:"comment",merge:!0,regex:"\\/\\*",next:"comment"},{token:"paren.lparen",regex:"\\{",next:"ruleset"},{token:"string",regex:"@.*?{",next:"media"},{token:"keyword",regex:"#[a-z0-9-_]+"},{token:"variable",regex:"\\.[a-z0-9-_]+"},{token:"string",regex:":[a-z0-9-_]+"},{token:"constant",regex:"[a-z0-9-_]+"}],media:[{token:"comment",merge:!0,regex:"\\/\\*",next:"media_comment"},{token:"paren.lparen",regex:"\\{",next:"media_ruleset"},{token:"string",regex:"\\}",next:"start"},{token:"keyword",regex:"#[a-z0-9-_]+"},{token:"variable",regex:"\\.[a-z0-9-_]+"},{token:"string",regex:":[a-z0-9-_]+"},{token:"constant",regex:"[a-z0-9-_]+"}],comment:n,ruleset:k,ruleset_comment:p,media_ruleset:l,media_comment:o}};d.inherits(g,f),b.CssHighlightRules=g}),define("ace/mode/html_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/css_highlight_rules","ace/mode/javascript_highlight_rules","ace/mode/xml_util","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./css_highlight_rules").CssHighlightRules,f=a("./javascript_highlight_rules").JavaScriptHighlightRules,g=a("./xml_util"),h=a("./text_highlight_rules").TextHighlightRules,i=function(){this.$rules={start:[{token:"text",merge:!0,regex:"<\\!\\[CDATA\\[",next:"cdata"},{token:"xml_pe",regex:"<\\?.*?\\?>"},{token:"comment",merge:!0,regex:"<\\!--",next:"comment"},{token:"xml_pe",regex:"<\\!.*?>"},{token:"meta.tag",regex:"<(?=s*script\\b)",next:"script"},{token:"meta.tag",regex:"<(?=s*style\\b)",next:"style"},{token:"meta.tag",regex:"<\\/?",next:"tag"},{token:"text",regex:"\\s+"},{token:"constant.character.entity",regex:"(?:&#[0-9]+;)|(?:&#x[0-9a-fA-F]+;)|(?:&[a-zA-Z0-9_:\\.-]+;)"},{token:"text",regex:"[^<]+"}],cdata:[{token:"text",regex:"\\]\\]>",next:"start"},{token:"text",merge:!0,regex:"\\s+"},{token:"text",merge:!0,regex:".+"}],comment:[{token:"comment",regex:".*?-->",next:"start"},{token:"comment",merge:!0,regex:".+"}]},g.tag(this.$rules,"tag","start"),g.tag(this.$rules,"style","css-start"),g.tag(this.$rules,"script","js-start"),this.embedRules(f,"js-",[{token:"comment",regex:"\\/\\/.*(?=<\\/script>)",next:"tag"},{token:"meta.tag",regex:"<\\/(?=script)",next:"tag"}]),this.embedRules(e,"css-",[{token:"meta.tag",regex:"<\\/(?=style)",next:"tag"}])};d.inherits(i,h),b.HtmlHighlightRules=i}),define("ace/mode/xml_util",["require","exports","module","ace/lib/lang"],function(a,b,c){function g(a){return[{token:"string",regex:'".*?"'},{token:"string",merge:!0,regex:'["].*',next:a+"_qqstring"},{token:"string",regex:"'.*?'"},{token:"string",merge:!0,regex:"['].*",next:a+"_qstring"}]}function h(a,b){return[{token:"string",merge:!0,regex:".*?"+a,next:b},{token:"string",merge:!0,regex:".+"}]}"use strict";var d=a("../lib/lang"),e=d.arrayToMap("button|form|input|label|select|textarea".split("|")),f=d.arrayToMap("table|tbody|td|tfoot|th|tr".split("|"));b.tag=function(a,b,c){a[b]=[{token:"text",regex:"\\s+"},{token:function(a){return a==="a"?"meta.tag.anchor":a==="img"?"meta.tag.image":a==="script"?"meta.tag.script":a==="style"?"meta.tag.style":e.hasOwnProperty(a.toLowerCase())?"meta.tag.form":f.hasOwnProperty(a.toLowerCase())?"meta.tag.table":"meta.tag"},merge:!0,regex:"[-_a-zA-Z0-9:]+",next:b+"_embed_attribute_list"},{token:"empty",regex:"",next:b+"_embed_attribute_list"}],a[b+"_qstring"]=h("'",b+"_embed_attribute_list"),a[b+"_qqstring"]=h('"',b+"_embed_attribute_list"),a[b+"_embed_attribute_list"]=[{token:"meta.tag",merge:!0,regex:"/?>",next:c},{token:"keyword.operator",regex:"="},{token:"entity.other.attribute-name",regex:"[-_a-zA-Z0-9:]+"},{token:"constant.numeric",regex:"[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"},{token:"text",regex:"\\s+"}].concat(g(b))}}),define("ace/mode/behaviour/xml",["require","exports","module","ace/lib/oop","ace/mode/behaviour","ace/mode/behaviour/cstyle"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../behaviour").Behaviour,f=a("./cstyle").CstyleBehaviour,g=function(){this.inherit(f,["string_dquotes"]),this.add("brackets","insertion",function(a,b,c,d,e){if(e=="<"){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?!1:{text:"<>",selection:[1,1]}}if(e==">"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j==">")return{text:"",selection:[1,1]}}else if(e=="\n"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),k=i.substring(h.column,h.column+2);if(k=="</"){var l=this.$getIndent(d.doc.getLine(h.row))+d.getTabString(),m=this.$getIndent(d.doc.getLine(h.row));return{text:"\n"+l+"\n"+m,selection:[1,l.length,1,l.length]}}}})};d.inherits(g,e),b.XmlBehaviour=g}),define("ace/mode/folding/html",["require","exports","module","ace/lib/oop","ace/mode/folding/mixed","ace/mode/folding/xml","ace/mode/folding/cstyle"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("./mixed").FoldMode,f=a("./xml").FoldMode,g=a("./cstyle").FoldMode,h=b.FoldMode=function(){e.call(this,new f({area:1,base:1,br:1,col:1,command:1,embed:1,hr:1,img:1,input:1,keygen:1,link:1,meta:1,param:1,source:1,track:1,wbr:1,li:1,dt:1,dd:1,p:1,rt:1,rp:1,optgroup:1,option:1,colgroup:1,td:1,th:1}),{"js-":new g,"css-":new g})};d.inherits(h,e)}),define("ace/mode/folding/mixed",["require","exports","module","ace/lib/oop","ace/mode/folding/fold_mode"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("./fold_mode").FoldMode,f=b.FoldMode=function(a,b){this.defaultMode=a,this.subModes=b};d.inherits(f,e),function(){this.$getMode=function(a){for(var b in this.subModes)if(a.indexOf(b)===0)return this.subModes[b];return null},this.$tryMode=function(a,b,c,d){var e=this.$getMode(a);return e?e.getFoldWidget(b,c,d):""},this.getFoldWidget=function(a,b,c){return this.$tryMode(a.getState(c-1),a,b,c)||this.$tryMode(a.getState(c),a,b,c)||this.defaultMode.getFoldWidget(a,b,c)},this.getFoldWidgetRange=function(a,b,c){var d=this.$getMode(a.getState(c-1));if(!d||!d.getFoldWidget(a,b,c))d=this.$getMode(a.getState(c));if(!d||!d.getFoldWidget(a,b,c))d=this.defaultMode;return d.getFoldWidgetRange(a,b,c)}}.call(f.prototype)}),define("ace/mode/folding/xml",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/range","ace/mode/folding/fold_mode","ace/token_iterator"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../../lib/lang"),f=a("../../range").Range,g=a("./fold_mode").FoldMode,h=a("../../token_iterator").TokenIterator,i=b.FoldMode=function(a){g.call(this),this.voidElements=a||{}};d.inherits(i,g),function(){this.getFoldWidget=function(a,b,c){var d=this._getFirstTagInLine(a,c);return d.closing?b=="markbeginend"?"end":"":!d.tagName||this.voidElements[d.tagName.toLowerCase()]?"":d.selfClosing?"":d.value.indexOf("/"+d.tagName)!==-1?"":"start"},this._getFirstTagInLine=function(a,b){var c=a.getTokens(b,b)[0].tokens,d="";for(var f=0;f<c.length;f++){var g=c[f];g.type.indexOf("meta.tag")===0?d+=g.value:d+=e.stringRepeat(" ",g.value.length)}return this._parseTag(d)},this.tagRe=/^(\s*)(<?(\/?)([-_a-zA-Z0-9:!]*)\s*(\/?)>?)/,this._parseTag=function(a){var b=this.tagRe.exec(a),c=this.tagRe.lastIndex||0;return this.tagRe.lastIndex=0,{value:a,match:b?b[2]:"",closing:b?!!b[3]:!1,selfClosing:b?!!b[5]||b[2]=="/>":!1,tagName:b?b[4]:"",column:b[1]?c+b[1].length:c}},this._readTagForward=function(a){var b=a.getCurrentToken();if(!b)return null;var c="",d;do if(b.type.indexOf("meta.tag")===0){if(!d)var d={row:a.getCurrentTokenRow(),column:a.getCurrentTokenColumn()};c+=b.value;if(c.indexOf(">")!==-1){var e=this._parseTag(c);return e.start=d,e.end={row:a.getCurrentTokenRow(),column:a.getCurrentTokenColumn()+b.value.length},a.stepForward(),e}}while(b=a.stepForward());return null},this._readTagBackward=function(a){var b=a.getCurrentToken();if(!b)return null;var c="",d;do if(b.type.indexOf("meta.tag")===0){d||(d={row:a.getCurrentTokenRow(),column:a.getCurrentTokenColumn()+b.value.length}),c=b.value+c;if(c.indexOf("<")!==-1){var e=this._parseTag(c);return e.end=d,e.start={row:a.getCurrentTokenRow(),column:a.getCurrentTokenColumn()},a.stepBackward(),e}}while(b=a.stepBackward());return null},this._pop=function(a,b){while(a.length){var c=a[a.length-1];if(!b||c.tagName==b.tagName)return a.pop();if(this.voidElements[b.tagName])return;if(this.voidElements[c.tagName]){a.pop();continue}return null}},this.getFoldWidgetRange=function(a,b,c){var d=this._getFirstTagInLine(a,c);if(!d.match)return null;var e=d.closing||d.selfClosing,g=[],i;if(!e){var j=new h(a,c,d.column),k={row:c,column:d.column+d.tagName.length+2};while(i=this._readTagForward(j)){if(i.selfClosing){if(!g.length)return i.start.column+=i.tagName.length+2,i.end.column-=2,f.fromPoints(i.start,i.end);continue}if(i.closing){this._pop(g,i);if(g.length==0)return f.fromPoints(k,i.start)}else g.push(i)}}else{var j=new h(a,c,d.column+d.match.length),l={row:c,column:d.column};while(i=this._readTagBackward(j)){if(i.selfClosing){if(!g.length)return i.start.column+=i.tagName.length+2,i.end.column-=2,f.fromPoints(i.start,i.end);continue}if(!i.closing){this._pop(g,i);if(g.length==0)return i.start.column+=i.tagName.length+2,f.fromPoints(i.start,l)}else g.push(i)}}}}.call(i.prototype)})
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/mode-java-uncompressed.js b/apps/files_texteditor/js/aceeditor/mode-java-uncompressed.js
deleted file mode 100644
index f241de365d..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-java-uncompressed.js
+++ /dev/null
@@ -1,1372 +0,0 @@
-define('ace/mode/java', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/javascript', 'ace/tokenizer', 'ace/mode/java_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var JavaScriptMode = require("./javascript").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
-var JavaHighlightRules = require("./java_highlight_rules").JavaHighlightRules;
-
-var Mode = function() {
-    JavaScriptMode.call(this);
-    
-    this.$tokenizer = new Tokenizer(new JavaHighlightRules().getRules());
-};
-oop.inherits(Mode, JavaScriptMode);
-
-(function() {
-    
-    this.createWorker = function(session) {
-        return null;
-    };
-
-}).call(Mode.prototype);
-
-exports.Mode = Mode;
-});
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/javascript', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text', 'ace/tokenizer', 'ace/mode/javascript_highlight_rules', 'ace/mode/matching_brace_outdent', 'ace/range', 'ace/worker/worker_client', 'ace/mode/behaviour/cstyle', 'ace/mode/folding/cstyle'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
-var JavaScriptHighlightRules = require("./javascript_highlight_rules").JavaScriptHighlightRules;
-var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
-var Range = require("../range").Range;
-var WorkerClient = require("../worker/worker_client").WorkerClient;
-var CstyleBehaviour = require("./behaviour/cstyle").CstyleBehaviour;
-var CStyleFoldMode = require("./folding/cstyle").FoldMode;
-
-var Mode = function() {
-    this.$tokenizer = new Tokenizer(new JavaScriptHighlightRules().getRules());
-    this.$outdent = new MatchingBraceOutdent();
-    this.$behaviour = new CstyleBehaviour();
-    this.foldingRules = new CStyleFoldMode();
-};
-oop.inherits(Mode, TextMode);
-
-(function() {
-
-
-    this.toggleCommentLines = function(state, doc, startRow, endRow) {
-        var outdent = true;
-        var re = /^(\s*)\/\//;
-
-        for (var i=startRow; i<= endRow; i++) {
-            if (!re.test(doc.getLine(i))) {
-                outdent = false;
-                break;
-            }
-        }
-
-        if (outdent) {
-            var deleteRange = new Range(0, 0, 0, 0);
-            for (var i=startRow; i<= endRow; i++)
-            {
-                var line = doc.getLine(i);
-                var m = line.match(re);
-                deleteRange.start.row = i;
-                deleteRange.end.row = i;
-                deleteRange.end.column = m[0].length;
-                doc.replace(deleteRange, m[1]);
-            }
-        }
-        else {
-            doc.indentRows(startRow, endRow, "//");
-        }
-    };
-
-    this.getNextLineIndent = function(state, line, tab) {
-        var indent = this.$getIndent(line);
-
-        var tokenizedLine = this.$tokenizer.getLineTokens(line, state);
-        var tokens = tokenizedLine.tokens;
-        var endState = tokenizedLine.state;
-
-        if (tokens.length && tokens[tokens.length-1].type == "comment") {
-            return indent;
-        }
-        
-        if (state == "start" || state == "regex_allowed") {
-            var match = line.match(/^.*(?:\bcase\b.*\:|[\{\(\[])\s*$/);
-            if (match) {
-                indent += tab;
-            }
-        } else if (state == "doc-start") {
-            if (endState == "start" || state == "regex_allowed") {
-                return "";
-            }
-            var match = line.match(/^\s*(\/?)\*/);
-            if (match) {
-                if (match[1]) {
-                    indent += " ";
-                }
-                indent += "* ";
-            }
-        }
-
-        return indent;
-    };
-
-    this.checkOutdent = function(state, line, input) {
-        return this.$outdent.checkOutdent(line, input);
-    };
-
-    this.autoOutdent = function(state, doc, row) {
-        this.$outdent.autoOutdent(doc, row);
-    };
-    
-    this.createWorker = function(session) {
-        var worker = new WorkerClient(["ace"], "worker-javascript.js", "ace/mode/javascript_worker", "JavaScriptWorker");
-        worker.attachToDocument(session.getDocument());
-            
-        worker.on("jslint", function(results) {
-            var errors = [];
-            for (var i=0; i<results.data.length; i++) {
-                var error = results.data[i];
-                if (error)
-                    errors.push({
-                        row: error.line-1,
-                        column: error.character-1,
-                        text: error.reason,
-                        type: "warning",
-                        lint: error
-                    });
-            }
-            session.setAnnotations(errors);
-        });
-        
-        worker.on("narcissus", function(e) {
-            session.setAnnotations([e.data]);
-        });
-        
-        worker.on("terminate", function() {
-            session.clearAnnotations();
-        });
-        
-        return worker;
-    };
-
-}).call(Mode.prototype);
-
-exports.Mode = Mode;
-});
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *      Mihai Sucan <mihai DOT sucan AT gmail DOT com>
- *
- * 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 ***** */
-
-define('ace/mode/javascript_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/lang', 'ace/unicode', 'ace/mode/doc_comment_highlight_rules', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var lang = require("../lib/lang");
-var unicode = require("../unicode");
-var DocCommentHighlightRules = require("./doc_comment_highlight_rules").DocCommentHighlightRules;
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-
-var JavaScriptHighlightRules = function() {
-
-    // see: https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects
-    var globals = lang.arrayToMap(
-      // Constructors
-        ("Array|Boolean|Date|Function|Iterator|Number|Object|RegExp|String|Proxy|" +
-      // E4X
-         "Namespace|QName|XML|XMLList|" +
-         "ArrayBuffer|Float32Array|Float64Array|Int16Array|Int32Array|Int8Array|" +
-         "Uint16Array|Uint32Array|Uint8Array|Uint8ClampedArray|" +
-      // Errors
-        "Error|EvalError|InternalError|RangeError|ReferenceError|StopIteration|" +
-        "SyntaxError|TypeError|URIError|" +
-      //  Non-constructor functions
-        "decodeURI|decodeURIComponent|encodeURI|encodeURIComponent|eval|isFinite|" +
-        "isNaN|parseFloat|parseInt|" +
-      // Other
-        "JSON|Math|" +
-      // Pseudo
-        "this|arguments|prototype|window|document"
-      ).split("|")
-    );
-
-    var keywords = lang.arrayToMap(
-        ("break|case|catch|continue|default|delete|do|else|finally|for|function|" +
-        "if|in|instanceof|new|return|switch|throw|try|typeof|let|var|while|with|" +
-        "const|yield|import|get|set").split("|")
-    );
-
-    // keywords which can be followed by regular expressions
-    var kwBeforeRe = "case|do|else|finally|in|instanceof|return|throw|try|typeof|yield";
-
-    var deprecated = lang.arrayToMap(
-        ("__parent__|__count__|escape|unescape|with|__proto__").split("|")
-    );
-
-    var definitions = lang.arrayToMap(("const|let|var|function").split("|"));
-
-    var buildinConstants = lang.arrayToMap(
-        ("null|Infinity|NaN|undefined").split("|")
-    );
-
-    var futureReserved = lang.arrayToMap(
-        ("class|enum|extends|super|export|implements|private|" +
-        "public|interface|package|protected|static").split("|")
-    );
-
-    // TODO: Unicode escape sequences
-    var identifierRe = "[" + unicode.packages.L + "\\$_]["
-        + unicode.packages.L
-        + unicode.packages.Mn + unicode.packages.Mc
-        + unicode.packages.Nd
-        + unicode.packages.Pc + "\\$_]*\\b";
-
-    var escapedRe = "\\\\(?:x[0-9a-fA-F]{2}|" + // hex
-        "u[0-9a-fA-F]{4}|" + // unicode
-        "[0-2][0-7]{0,2}|" + // oct
-        "3[0-6][0-7]?|" + // oct
-        "37[0-7]?|" + // oct
-        "[4-7][0-7]?|" + //oct
-        ".)";
-
-    // regexp must not have capturing parentheses. Use (?:) instead.
-    // regexps are ordered -> the first match is used
-
-    this.$rules = {
-        "start" : [
-            {
-                token : "comment",
-                regex : /\/\/.*$/
-            },
-            new DocCommentHighlightRules().getStartRule("doc-start"),
-            {
-                token : "comment", // multi line comment
-                merge : true,
-                regex : /\/\*/,
-                next : "comment"
-            }, {
-                token : "string",
-                regex : "'",
-                next  : "qstring"
-            }, {
-                token : "string",
-                regex : '"',
-                next  : "qqstring"
-            }, {
-                token : "constant.numeric", // hex
-                regex : /0[xX][0-9a-fA-F]+\b/
-            }, {
-                token : "constant.numeric", // float
-                regex : /[+-]?\d+(?:(?:\.\d*)?(?:[eE][+-]?\d+)?)?\b/
-            }, { // match stuff like: Sound.prototype.play = function() { }
-                token : [
-                    "storage.type",
-                    "punctuation.operator",
-                    "support.function",
-                    "punctuation.operator",
-                    "entity.name.function",
-                    "text",
-                    "keyword.operator",
-                    "text",
-                    "storage.type",
-                    "text",
-                    "paren.lparen",
-                    "variable.parameter",
-                    "paren.rparen"
-                ],
-                regex : "(" + identifierRe + ")(\\.)(prototype)(\\.)(" + identifierRe +")(\\s*)(=)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"
-            }, { // match stuff like: Sound.prototype.play = myfunc
-                token : [
-                    "storage.type",
-                    "punctuation.operator",
-                    "support.function",
-                    "punctuation.operator",
-                    "entity.name.function",
-                    "text",
-                    "keyword.operator",
-                    "text"
-                ],
-                regex : "(" + identifierRe + ")(\\.)(prototype)(\\.)(" + identifierRe +")(\\s*)(=)(\\s*)"
-            }, { // match stuff like: Sound.play = function() {  }
-                token : [
-                    "storage.type",
-                    "punctuation.operator",
-                    "entity.name.function",
-                    "text",
-                    "keyword.operator",
-                    "text",
-                    "storage.type",
-                    "text",
-                    "paren.lparen",
-                    "variable.parameter",
-                    "paren.rparen"
-                ],
-                regex : "(" + identifierRe + ")(\\.)(" + identifierRe +")(\\s*)(=)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"
-            }, { // match stuff like: play = function() {  }
-                token : [
-                    "entity.name.function",
-                    "text",
-                    "keyword.operator",
-                    "text",
-                    "storage.type",
-                    "text",
-                    "paren.lparen",
-                    "variable.parameter",
-                    "paren.rparen"
-                ],
-                regex : "(" + identifierRe +")(\\s*)(=)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"
-            }, { // match regular function like: function myFunc(arg) { }
-                token : [
-                    "storage.type",
-                    "text",
-                    "entity.name.function",
-                    "text",
-                    "paren.lparen",
-                    "variable.parameter",
-                    "paren.rparen"
-                ],
-                regex : "(function)(\\s+)(" + identifierRe + ")(\\s*)(\\()(.*?)(\\))"
-            }, { // match stuff like: foobar: function() { }
-                token : [
-                    "entity.name.function",
-                    "text",
-                    "punctuation.operator",
-                    "text",
-                    "storage.type",
-                    "text",
-                    "paren.lparen",
-                    "variable.parameter",
-                    "paren.rparen"
-                ],
-                regex : "(" + identifierRe + ")(\\s*)(:)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"
-            }, { // Attempt to match : function() { } (this is for issues with 'foo': function() { })
-                token : [
-                    "text",
-                    "text",
-                    "storage.type",
-                    "text",
-                    "paren.lparen",
-                    "variable.parameter",
-                    "paren.rparen"
-                ],
-                regex : "(:)(\\s*)(function)?(\\s*)(\\()([^)]*)(\\))"
-            }, {
-                token : "constant.language.boolean",
-                regex : /(?:true|false)\b/
-            }, {
-                token : "keyword",
-                regex : "(?:" + kwBeforeRe + ")\\b",
-                next : "regex_allowed"
-            }, {
-                token : ["punctuation.operator", "support.function"],
-                regex : /(\.)(s(?:h(?:ift|ow(?:Mod(?:elessDialog|alDialog)|Help))|croll(?:X|By(?:Pages|Lines)?|Y|To)?|t(?:opzzzz|rike)|i(?:n|zeToContent|debar|gnText)|ort|u(?:p|b(?:str(?:ing)?)?)|pli(?:ce|t)|e(?:nd|t(?:Re(?:sizable|questHeader)|M(?:i(?:nutes|lliseconds)|onth)|Seconds|Ho(?:tKeys|urs)|Year|Cursor|Time(?:out)?|Interval|ZOptions|Date|UTC(?:M(?:i(?:nutes|lliseconds)|onth)|Seconds|Hours|Date|FullYear)|FullYear|Active)|arch)|qrt|lice|avePreferences|mall)|h(?:ome|andleEvent)|navigate|c(?:har(?:CodeAt|At)|o(?:s|n(?:cat|textual|firm)|mpile)|eil|lear(?:Timeout|Interval)?|a(?:ptureEvents|ll)|reate(?:StyleSheet|Popup|EventObject))|t(?:o(?:GMTString|S(?:tring|ource)|U(?:TCString|pperCase)|Lo(?:caleString|werCase))|est|a(?:n|int(?:Enabled)?))|i(?:s(?:NaN|Finite)|ndexOf|talics)|d(?:isableExternalCapture|ump|etachEvent)|u(?:n(?:shift|taint|escape|watch)|pdateCommands)|j(?:oin|avaEnabled)|p(?:o(?:p|w)|ush|lugins.refresh|a(?:ddings|rse(?:Int|Float)?)|r(?:int|ompt|eference))|e(?:scape|nableExternalCapture|val|lementFromPoint|x(?:p|ec(?:Script|Command)?))|valueOf|UTC|queryCommand(?:State|Indeterm|Enabled|Value)|f(?:i(?:nd|le(?:ModifiedDate|Size|CreatedDate|UpdatedDate)|xed)|o(?:nt(?:size|color)|rward)|loor|romCharCode)|watch|l(?:ink|o(?:ad|g)|astIndexOf)|a(?:sin|nchor|cos|t(?:tachEvent|ob|an(?:2)?)|pply|lert|b(?:s|ort))|r(?:ou(?:nd|teEvents)|e(?:size(?:By|To)|calc|turnValue|place|verse|l(?:oad|ease(?:Capture|Events)))|andom)|g(?:o|et(?:ResponseHeader|M(?:i(?:nutes|lliseconds)|onth)|Se(?:conds|lection)|Hours|Year|Time(?:zoneOffset)?|Da(?:y|te)|UTC(?:M(?:i(?:nutes|lliseconds)|onth)|Seconds|Hours|Da(?:y|te)|FullYear)|FullYear|A(?:ttention|llResponseHeaders)))|m(?:in|ove(?:B(?:y|elow)|To(?:Absolute)?|Above)|ergeAttributes|a(?:tch|rgins|x))|b(?:toa|ig|o(?:ld|rderWidths)|link|ack))\b(?=\()/
-            }, {
-                token : ["punctuation.operator", "support.function.dom"],
-                regex : /(\.)(s(?:ub(?:stringData|mit)|plitText|e(?:t(?:NamedItem|Attribute(?:Node)?)|lect))|has(?:ChildNodes|Feature)|namedItem|c(?:l(?:ick|o(?:se|neNode))|reate(?:C(?:omment|DATASection|aption)|T(?:Head|extNode|Foot)|DocumentFragment|ProcessingInstruction|E(?:ntityReference|lement)|Attribute))|tabIndex|i(?:nsert(?:Row|Before|Cell|Data)|tem)|open|delete(?:Row|C(?:ell|aption)|T(?:Head|Foot)|Data)|focus|write(?:ln)?|a(?:dd|ppend(?:Child|Data))|re(?:set|place(?:Child|Data)|move(?:NamedItem|Child|Attribute(?:Node)?)?)|get(?:NamedItem|Element(?:sBy(?:Name|TagName)|ById)|Attribute(?:Node)?)|blur)\b(?=\()/
-            }, {
-                token : ["punctuation.operator", "support.constant"],
-                regex : /(\.)(s(?:ystemLanguage|cr(?:ipts|ollbars|een(?:X|Y|Top|Left))|t(?:yle(?:Sheets)?|atus(?:Text|bar)?)|ibling(?:Below|Above)|ource|uffixes|e(?:curity(?:Policy)?|l(?:ection|f)))|h(?:istory|ost(?:name)?|as(?:h|Focus))|y|X(?:MLDocument|SLDocument)|n(?:ext|ame(?:space(?:s|URI)|Prop))|M(?:IN_VALUE|AX_VALUE)|c(?:haracterSet|o(?:n(?:structor|trollers)|okieEnabled|lorDepth|mp(?:onents|lete))|urrent|puClass|l(?:i(?:p(?:boardData)?|entInformation)|osed|asses)|alle(?:e|r)|rypto)|t(?:o(?:olbar|p)|ext(?:Transform|Indent|Decoration|Align)|ags)|SQRT(?:1_2|2)|i(?:n(?:ner(?:Height|Width)|put)|ds|gnoreCase)|zIndex|o(?:scpu|n(?:readystatechange|Line)|uter(?:Height|Width)|p(?:sProfile|ener)|ffscreenBuffering)|NEGATIVE_INFINITY|d(?:i(?:splay|alog(?:Height|Top|Width|Left|Arguments)|rectories)|e(?:scription|fault(?:Status|Ch(?:ecked|arset)|View)))|u(?:ser(?:Profile|Language|Agent)|n(?:iqueID|defined)|pdateInterval)|_content|p(?:ixelDepth|ort|ersonalbar|kcs11|l(?:ugins|atform)|a(?:thname|dding(?:Right|Bottom|Top|Left)|rent(?:Window|Layer)?|ge(?:X(?:Offset)?|Y(?:Offset)?))|r(?:o(?:to(?:col|type)|duct(?:Sub)?|mpter)|e(?:vious|fix)))|e(?:n(?:coding|abledPlugin)|x(?:ternal|pando)|mbeds)|v(?:isibility|endor(?:Sub)?|Linkcolor)|URLUnencoded|P(?:I|OSITIVE_INFINITY)|f(?:ilename|o(?:nt(?:Size|Family|Weight)|rmName)|rame(?:s|Element)|gColor)|E|whiteSpace|l(?:i(?:stStyleType|n(?:eHeight|kColor))|o(?:ca(?:tion(?:bar)?|lName)|wsrc)|e(?:ngth|ft(?:Context)?)|a(?:st(?:M(?:odified|atch)|Index|Paren)|yer(?:s|X)|nguage))|a(?:pp(?:MinorVersion|Name|Co(?:deName|re)|Version)|vail(?:Height|Top|Width|Left)|ll|r(?:ity|guments)|Linkcolor|bove)|r(?:ight(?:Context)?|e(?:sponse(?:XML|Text)|adyState))|global|x|m(?:imeTypes|ultiline|enubar|argin(?:Right|Bottom|Top|Left))|L(?:N(?:10|2)|OG(?:10E|2E))|b(?:o(?:ttom|rder(?:Width|RightWidth|BottomWidth|Style|Color|TopWidth|LeftWidth))|ufferDepth|elow|ackground(?:Color|Image)))\b/
-            }, {
-                token : ["storage.type", "punctuation.operator", "support.function.firebug"],
-                regex : /(console)(\.)(warn|info|log|error|time|timeEnd|assert)\b/
-            }, {
-                token : function(value) {
-                    if (globals.hasOwnProperty(value))
-                        return "variable.language";
-                    else if (deprecated.hasOwnProperty(value))
-                        return "invalid.deprecated";
-                    else if (definitions.hasOwnProperty(value))
-                        return "storage.type";
-                    else if (keywords.hasOwnProperty(value))
-                        return "keyword";
-                    else if (buildinConstants.hasOwnProperty(value))
-                        return "constant.language";
-                    else if (futureReserved.hasOwnProperty(value))
-                        return "invalid.illegal";
-                    else if (value == "debugger")
-                        return "invalid.deprecated";
-                    else
-                        return "identifier";
-                },
-                regex : identifierRe
-            }, {
-                token : "keyword.operator",
-                regex : /!|\$|%|&|\*|\-\-|\-|\+\+|\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\|\||\?\:|\*=|%=|\+=|\-=|&=|\^=|\b(?:in|instanceof|new|delete|typeof|void)/,
-                next  : "regex_allowed"
-            }, {
-                token : "punctuation.operator",
-                regex : /\?|\:|\,|\;|\./,
-                next  : "regex_allowed"
-            }, {
-                token : "paren.lparen",
-                regex : /[\[({]/,
-                next  : "regex_allowed"
-            }, {
-                token : "paren.rparen",
-                regex : /[\])}]/
-            }, {
-                token : "keyword.operator",
-                regex : /\/=?/,
-                next  : "regex_allowed"
-            }, {
-                token: "comment",
-                regex: /^#!.*$/
-            }, {
-                token : "text",
-                regex : /\s+/
-            }
-        ],
-        // regular expressions are only allowed after certain tokens. This
-        // makes sure we don't mix up regexps with the divison operator
-        "regex_allowed": [
-            {
-                token : "comment", // multi line comment
-                merge : true,
-                regex : "\\/\\*",
-                next : "comment_regex_allowed"
-            }, {
-                token : "comment",
-                regex : "\\/\\/.*$"
-            }, {
-                token: "string.regexp",
-                regex: "\\/",
-                next: "regex",
-                merge: true
-            }, {
-                token : "text",
-                regex : "\\s+"
-            }, {
-                // immediately return to the start mode without matching
-                // anything
-                token: "empty",
-                regex: "",
-                next: "start"
-            }
-        ],
-        "regex": [
-            {
-                token: "regexp.keyword.operator",
-                regex: "\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)",
-                next: "regex"
-            }, {
-				// flag
-                token: "string.regexp",
-                regex: "/\\w*",
-                next: "start",
-                merge: true
-            }, {
-                token: "string.regexp",
-                regex: "[^\\\\/\\[]+",
-                next: "regex",
-                merge: true
-            }, {
-                token: "string.regexp.charachterclass",
-                regex: "\\[",
-                next: "regex_character_class",
-                merge: true
-            }, {
-                token: "empty",
-                regex: "",
-                next: "start"
-            }
-        ],
-        "regex_character_class": [
-            {
-                token: "regexp.keyword.operator",
-                regex: "\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)",
-                next: "regex_character_class"
-            }, {
-                token: "string.regexp.charachterclass",
-                regex: "]",
-                next: "regex",
-                merge: true
-            }, {
-                token: "string.regexp.charachterclass",
-                regex: "[^\\\\\\]]+",
-                next: "regex_character_class",
-                merge: true
-            }, {
-                token: "empty",
-                regex: "",
-                next: "start"
-            }
-        ],
-        "comment_regex_allowed" : [
-            {
-                token : "comment", // closing comment
-                regex : ".*?\\*\\/",
-                merge : true,
-                next : "regex_allowed"
-            }, {
-                token : "comment", // comment spanning whole line
-                merge : true,
-                regex : ".+"
-            }
-        ],
-        "comment" : [
-            {
-                token : "comment", // closing comment
-                regex : ".*?\\*\\/",
-                merge : true,
-                next : "start"
-            }, {
-                token : "comment", // comment spanning whole line
-                merge : true,
-                regex : ".+"
-            }
-        ],
-        "qqstring" : [
-            {
-                token : "constant.language.escape",
-                regex : escapedRe
-            }, {
-                token : "string",
-                regex : '[^"\\\\]+'
-            }, {
-                token : "string",
-                regex : '"',
-                next  : "start"
-            }
-        ],
-        "qstring" : [
-            {
-                token : "constant.language.escape",
-                regex : escapedRe
-            }, {
-                token : "string",
-                regex : "[^'\\\\]+"
-            }, {
-                token : "string",
-                regex : "'",
-                next  : "start"
-            }
-        ]
-    };
-
-    this.embedRules(DocCommentHighlightRules, "doc-",
-        [ new DocCommentHighlightRules().getEndRule("start") ]);
-};
-
-oop.inherits(JavaScriptHighlightRules, TextHighlightRules);
-
-exports.JavaScriptHighlightRules = JavaScriptHighlightRules;
-});
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/doc_comment_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-
-var DocCommentHighlightRules = function() {
-
-    this.$rules = {
-        "start" : [ {
-            token : "comment.doc.tag",
-            regex : "@[\\w\\d_]+" // TODO: fix email addresses
-        }, {
-            token : "comment.doc",
-            merge : true,
-            regex : "\\s+"
-        }, {
-            token : "comment.doc",
-            merge : true,
-            regex : "TODO"
-        }, {
-            token : "comment.doc",
-            merge : true,
-            regex : "[^@\\*]+"
-        }, {
-            token : "comment.doc",
-            merge : true,
-            regex : "."
-        }]
-    };
-};
-
-oop.inherits(DocCommentHighlightRules, TextHighlightRules);
-
-(function() {
-
-    this.getStartRule = function(start) {
-        return {
-            token : "comment.doc", // doc comment
-            merge : true,
-            regex : "\\/\\*(?=\\*)",
-            next  : start
-        };
-    };
-    
-    this.getEndRule = function (start) {
-        return {
-            token : "comment.doc", // closing comment
-            merge : true,
-            regex : "\\*\\/",
-            next  : start
-        };
-    };
-
-}).call(DocCommentHighlightRules.prototype);
-
-exports.DocCommentHighlightRules = DocCommentHighlightRules;
-
-});
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/matching_brace_outdent', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
-"use strict";
-
-var Range = require("../range").Range;
-
-var MatchingBraceOutdent = function() {};
-
-(function() {
-
-    this.checkOutdent = function(line, input) {
-        if (! /^\s+$/.test(line))
-            return false;
-
-        return /^\s*\}/.test(input);
-    };
-
-    this.autoOutdent = function(doc, row) {
-        var line = doc.getLine(row);
-        var match = line.match(/^(\s*\})/);
-
-        if (!match) return 0;
-
-        var column = match[1].length;
-        var openBracePos = doc.findMatchingBracket({row: row, column: column});
-
-        if (!openBracePos || openBracePos.row == row) return 0;
-
-        var indent = this.$getIndent(doc.getLine(openBracePos.row));
-        doc.replace(new Range(row, 0, row, column-1), indent);
-    };
-
-    this.$getIndent = function(line) {
-        var match = line.match(/^(\s+)/);
-        if (match) {
-            return match[1];
-        }
-
-        return "";
-    };
-
-}).call(MatchingBraceOutdent.prototype);
-
-exports.MatchingBraceOutdent = MatchingBraceOutdent;
-});
-/* vim:ts=4:sts=4:sw=4:
- * ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Chris Spencer <chris.ag.spencer AT googlemail DOT com>
- *
- * 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 ***** */
-
-define('ace/mode/behaviour/cstyle', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/behaviour'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../../lib/oop");
-var Behaviour = require('../behaviour').Behaviour;
-
-var CstyleBehaviour = function () {
-
-    this.add("braces", "insertion", function (state, action, editor, session, text) {
-        if (text == '{') {
-            var selection = editor.getSelectionRange();
-            var selected = session.doc.getTextRange(selection);
-            if (selected !== "") {
-                return {
-                    text: '{' + selected + '}',
-                    selection: false
-                };
-            } else {
-                return {
-                    text: '{}',
-                    selection: [1, 1]
-                };
-            }
-        } else if (text == '}') {
-            var cursor = editor.getCursorPosition();
-            var line = session.doc.getLine(cursor.row);
-            var rightChar = line.substring(cursor.column, cursor.column + 1);
-            if (rightChar == '}') {
-                var matching = session.$findOpeningBracket('}', {column: cursor.column + 1, row: cursor.row});
-                if (matching !== null) {
-                    return {
-                        text: '',
-                        selection: [1, 1]
-                    };
-                }
-            }
-        } else if (text == "\n") {
-            var cursor = editor.getCursorPosition();
-            var line = session.doc.getLine(cursor.row);
-            var rightChar = line.substring(cursor.column, cursor.column + 1);
-            if (rightChar == '}') {
-                var openBracePos = session.findMatchingBracket({row: cursor.row, column: cursor.column + 1});
-                if (!openBracePos)
-                     return null;
-
-                var indent = this.getNextLineIndent(state, line.substring(0, line.length - 1), session.getTabString());
-                var next_indent = this.$getIndent(session.doc.getLine(openBracePos.row));
-
-                return {
-                    text: '\n' + indent + '\n' + next_indent,
-                    selection: [1, indent.length, 1, indent.length]
-                };
-            }
-        }
-    });
-
-    this.add("braces", "deletion", function (state, action, editor, session, range) {
-        var selected = session.doc.getTextRange(range);
-        if (!range.isMultiLine() && selected == '{') {
-            var line = session.doc.getLine(range.start.row);
-            var rightChar = line.substring(range.end.column, range.end.column + 1);
-            if (rightChar == '}') {
-                range.end.column++;
-                return range;
-            }
-        }
-    });
-
-    this.add("parens", "insertion", function (state, action, editor, session, text) {
-        if (text == '(') {
-            var selection = editor.getSelectionRange();
-            var selected = session.doc.getTextRange(selection);
-            if (selected !== "") {
-                return {
-                    text: '(' + selected + ')',
-                    selection: false
-                };
-            } else {
-                return {
-                    text: '()',
-                    selection: [1, 1]
-                };
-            }
-        } else if (text == ')') {
-            var cursor = editor.getCursorPosition();
-            var line = session.doc.getLine(cursor.row);
-            var rightChar = line.substring(cursor.column, cursor.column + 1);
-            if (rightChar == ')') {
-                var matching = session.$findOpeningBracket(')', {column: cursor.column + 1, row: cursor.row});
-                if (matching !== null) {
-                    return {
-                        text: '',
-                        selection: [1, 1]
-                    };
-                }
-            }
-        }
-    });
-
-    this.add("parens", "deletion", function (state, action, editor, session, range) {
-        var selected = session.doc.getTextRange(range);
-        if (!range.isMultiLine() && selected == '(') {
-            var line = session.doc.getLine(range.start.row);
-            var rightChar = line.substring(range.start.column + 1, range.start.column + 2);
-            if (rightChar == ')') {
-                range.end.column++;
-                return range;
-            }
-        }
-    });
-
-    this.add("string_dquotes", "insertion", function (state, action, editor, session, text) {
-        if (text == '"' || text == "'") {
-            var quote = text;
-            var selection = editor.getSelectionRange();
-            var selected = session.doc.getTextRange(selection);
-            if (selected !== "") {
-                return {
-                    text: quote + selected + quote,
-                    selection: false
-                };
-            } else {
-                var cursor = editor.getCursorPosition();
-                var line = session.doc.getLine(cursor.row);
-                var leftChar = line.substring(cursor.column-1, cursor.column);
-
-                // We're escaped.
-                if (leftChar == '\\') {
-                    return null;
-                }
-
-                // Find what token we're inside.
-                var tokens = session.getTokens(selection.start.row, selection.start.row)[0].tokens;
-                var col = 0, token;
-                var quotepos = -1; // Track whether we're inside an open quote.
-
-                for (var x = 0; x < tokens.length; x++) {
-                    token = tokens[x];
-                    if (token.type == "string") {
-                      quotepos = -1;
-                    } else if (quotepos < 0) {
-                      quotepos = token.value.indexOf(quote);
-                    }
-                    if ((token.value.length + col) > selection.start.column) {
-                        break;
-                    }
-                    col += tokens[x].value.length;
-                }
-
-                // Try and be smart about when we auto insert.
-                if (!token || (quotepos < 0 && token.type !== "comment" && (token.type !== "string" || ((selection.start.column !== token.value.length+col-1) && token.value.lastIndexOf(quote) === token.value.length-1)))) {
-                    return {
-                        text: quote + quote,
-                        selection: [1,1]
-                    };
-                } else if (token && token.type === "string") {
-                    // Ignore input and move right one if we're typing over the closing quote.
-                    var rightChar = line.substring(cursor.column, cursor.column + 1);
-                    if (rightChar == quote) {
-                        return {
-                            text: '',
-                            selection: [1, 1]
-                        };
-                    }
-                }
-            }
-        }
-    });
-
-    this.add("string_dquotes", "deletion", function (state, action, editor, session, range) {
-        var selected = session.doc.getTextRange(range);
-        if (!range.isMultiLine() && (selected == '"' || selected == "'")) {
-            var line = session.doc.getLine(range.start.row);
-            var rightChar = line.substring(range.start.column + 1, range.start.column + 2);
-            if (rightChar == '"') {
-                range.end.column++;
-                return range;
-            }
-        }
-    });
-
-};
-
-oop.inherits(CstyleBehaviour, Behaviour);
-
-exports.CstyleBehaviour = CstyleBehaviour;
-});/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/folding/cstyle', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/range', 'ace/mode/folding/fold_mode'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../../lib/oop");
-var Range = require("../../range").Range;
-var BaseFoldMode = require("./fold_mode").FoldMode;
-
-var FoldMode = exports.FoldMode = function() {};
-oop.inherits(FoldMode, BaseFoldMode);
-
-(function() {
-
-    this.foldingStartMarker = /(\{|\[)[^\}\]]*$|^\s*(\/\*)/;
-    this.foldingStopMarker = /^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/;
-    
-    this.getFoldWidgetRange = function(session, foldStyle, row) {
-        var line = session.getLine(row);
-        var match = line.match(this.foldingStartMarker);
-        if (match) {
-            var i = match.index;
-
-            if (match[1])
-                return this.openingBracketBlock(session, match[1], row, i);
-
-            var range = session.getCommentFoldRange(row, i + match[0].length);
-            range.end.column -= 2;
-            return range;
-        }
-
-        if (foldStyle !== "markbeginend")
-            return;
-            
-        var match = line.match(this.foldingStopMarker);
-        if (match) {
-            var i = match.index + match[0].length;
-
-            if (match[2]) {
-                var range = session.getCommentFoldRange(row, i);
-                range.end.column -= 2;
-                return range;
-            }
-
-            var end = {row: row, column: i};
-            var start = session.$findOpeningBracket(match[1], end);
-            
-            if (!start)
-                return;
-
-            start.column++;
-            end.column--;
-
-            return  Range.fromPoints(start, end);
-        }
-    };
-    
-}).call(FoldMode.prototype);
-
-});/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/folding/fold_mode', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
-"use strict";
-
-var Range = require("../../range").Range;
-
-var FoldMode = exports.FoldMode = function() {};
-
-(function() {
-
-    this.foldingStartMarker = null;
-    this.foldingStopMarker = null;
-
-    // must return "" if there's no fold, to enable caching
-    this.getFoldWidget = function(session, foldStyle, row) {
-        var line = session.getLine(row);
-        if (this.foldingStartMarker.test(line))
-            return "start";
-        if (foldStyle == "markbeginend"
-                && this.foldingStopMarker
-                && this.foldingStopMarker.test(line))
-            return "end";
-        return "";
-    };
-    
-    this.getFoldWidgetRange = function(session, foldStyle, row) {
-        return null;
-    };
-
-    this.indentationBlock = function(session, row, column) {
-        var re = /^\s*/;
-        var startRow = row;
-        var endRow = row;
-        var line = session.getLine(row);
-        var startColumn = column || line.length;
-        var startLevel = line.match(re)[0].length;
-        var maxRow = session.getLength()
-        
-        while (++row < maxRow) {
-            line = session.getLine(row);
-            var level = line.match(re)[0].length;
-
-            if (level == line.length)
-                continue;
-
-            if (level <= startLevel)
-                break;
-
-            endRow = row;
-        }
-
-        if (endRow > startRow) {
-            var endColumn = session.getLine(endRow).length;
-            return new Range(startRow, startColumn, endRow, endColumn);
-        }
-    };
-
-    this.openingBracketBlock = function(session, bracket, row, column) {
-        var start = {row: row, column: column + 1};
-        var end = session.$findClosingBracket(bracket, start);
-        if (!end)
-            return;
-
-        var fw = session.foldWidgets[end.row];
-        if (fw == null)
-            fw = this.getFoldWidget(session, end.row);
-
-        if (fw == "start") {
-            end.row --;
-            end.column = session.getLine(end.row).length;
-        }
-        return Range.fromPoints(start, end);
-    };
-
-}).call(FoldMode.prototype);
-
-});
-define('ace/mode/java_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/lang', 'ace/mode/doc_comment_highlight_rules', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var lang = require("../lib/lang");
-var DocCommentHighlightRules = require("./doc_comment_highlight_rules").DocCommentHighlightRules;
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-
-var JavaHighlightRules = function() {
-
-    // taken from http://download.oracle.com/javase/tutorial/java/nutsandbolts/_keywords.html
-    var keywords = lang.arrayToMap(
-    ("abstract|continue|for|new|switch|" +
-    "assert|default|goto|package|synchronized|" +
-    "boolean|do|if|private|this|" +
-    "break|double|implements|protected|throw|" +
-    "byte|else|import|public|throws|" +
-    "case|enum|instanceof|return|transient|" +
-    "catch|extends|int|short|try|" +
-    "char|final|interface|static|void|" +
-    "class|finally|long|strictfp|volatile|" +
-    "const|float|native|super|while").split("|")
-    );
-
-    var buildinConstants = lang.arrayToMap(
-        ("null|Infinity|NaN|undefined").split("|")
-    );
-
-    var langClasses = lang.arrayToMap(
-        ("AbstractMethodError|AssertionError|ClassCircularityError|"+
-        "ClassFormatError|Deprecated|EnumConstantNotPresentException|"+
-        "ExceptionInInitializerError|IllegalAccessError|"+
-        "IllegalThreadStateException|InstantiationError|InternalError|"+
-        "NegativeArraySizeException|NoSuchFieldError|Override|Process|"+
-        "ProcessBuilder|SecurityManager|StringIndexOutOfBoundsException|"+
-        "SuppressWarnings|TypeNotPresentException|UnknownError|"+
-        "UnsatisfiedLinkError|UnsupportedClassVersionError|VerifyError|"+
-        "InstantiationException|IndexOutOfBoundsException|"+
-        "ArrayIndexOutOfBoundsException|CloneNotSupportedException|"+
-        "NoSuchFieldException|IllegalArgumentException|NumberFormatException|"+
-        "SecurityException|Void|InheritableThreadLocal|IllegalStateException|"+
-        "InterruptedException|NoSuchMethodException|IllegalAccessException|"+
-        "UnsupportedOperationException|Enum|StrictMath|Package|Compiler|"+
-        "Readable|Runtime|StringBuilder|Math|IncompatibleClassChangeError|"+
-        "NoSuchMethodError|ThreadLocal|RuntimePermission|ArithmeticException|"+
-        "NullPointerException|Long|Integer|Short|Byte|Double|Number|Float|"+
-        "Character|Boolean|StackTraceElement|Appendable|StringBuffer|"+
-        "Iterable|ThreadGroup|Runnable|Thread|IllegalMonitorStateException|"+
-        "StackOverflowError|OutOfMemoryError|VirtualMachineError|"+
-        "ArrayStoreException|ClassCastException|LinkageError|"+
-        "NoClassDefFoundError|ClassNotFoundException|RuntimeException|"+
-        "Exception|ThreadDeath|Error|Throwable|System|ClassLoader|"+
-        "Cloneable|Class|CharSequence|Comparable|String|Object").split("|")
-    );
-    
-    var importClasses = lang.arrayToMap(
-        ("").split("|")
-    );
-    // regexp must not have capturing parentheses. Use (?:) instead.
-    // regexps are ordered -> the first match is used
-
-    this.$rules = {
-        "start" : [
-            {
-                token : "comment",
-                regex : "\\/\\/.*$"
-            },
-            new DocCommentHighlightRules().getStartRule("doc-start"),
-            {
-                token : "comment", // multi line comment
-                merge : true,
-                regex : "\\/\\*",
-                next : "comment"
-            }, {
-                token : "string.regexp",
-                regex : "[/](?:(?:\\[(?:\\\\]|[^\\]])+\\])|(?:\\\\/|[^\\]/]))*[/]\\w*\\s*(?=[).,;]|$)"
-            }, {
-                token : "string", // single line
-                regex : '["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'
-            }, {
-                token : "string", // single line
-                regex : "['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"
-            }, {
-                token : "constant.numeric", // hex
-                regex : "0[xX][0-9a-fA-F]+\\b"
-            }, {
-                token : "constant.numeric", // float
-                regex : "[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"
-            }, {
-                token : "constant.language.boolean",
-                regex : "(?:true|false)\\b"
-            }, {
-                token : function(value) {
-                    if (value == "this")
-                        return "variable.language";
-                    else if (keywords.hasOwnProperty(value))
-                        return "keyword";
-                    else if (langClasses.hasOwnProperty(value))
-                        return "support.function";
-                    else if (importClasses.hasOwnProperty(value))
-                        return "support.function";
-                    else if (buildinConstants.hasOwnProperty(value))
-                        return "constant.language";
-                    else
-                        return "identifier";
-                },
-                // TODO: Unicode escape sequences
-                // TODO: Unicode identifiers
-                regex : "[a-zA-Z_$][a-zA-Z0-9_$]*\\b"
-            }, {
-                token : "keyword.operator",
-                regex : "!|\\$|%|&|\\*|\\-\\-|\\-|\\+\\+|\\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\\|\\||\\?\\:|\\*=|%=|\\+=|\\-=|&=|\\^=|\\b(?:in|instanceof|new|delete|typeof|void)"
-            }, {
-                token : "lparen",
-                regex : "[[({]"
-            }, {
-                token : "rparen",
-                regex : "[\\])}]"
-            }, {
-                token : "text",
-                regex : "\\s+"
-            }
-        ],
-        "comment" : [
-            {
-                token : "comment", // closing comment
-                regex : ".*?\\*\\/",
-                next : "start"
-            }, {
-                token : "comment", // comment spanning whole line
-                merge : true,
-                regex : ".+"
-            }
-        ]
-    };
-    
-    this.embedRules(DocCommentHighlightRules, "doc-",
-        [ new DocCommentHighlightRules().getEndRule("start") ]);
-};
-
-oop.inherits(JavaHighlightRules, TextHighlightRules);
-
-exports.JavaHighlightRules = JavaHighlightRules;
-});
diff --git a/apps/files_texteditor/js/aceeditor/mode-java.js b/apps/files_texteditor/js/aceeditor/mode-java.js
deleted file mode 100644
index 9398464a18..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-java.js
+++ /dev/null
@@ -1 +0,0 @@
-define("ace/mode/java",["require","exports","module","ace/lib/oop","ace/mode/javascript","ace/tokenizer","ace/mode/java_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./javascript").Mode,f=a("../tokenizer").Tokenizer,g=a("./java_highlight_rules").JavaHighlightRules,h=function(){e.call(this),this.$tokenizer=new f((new g).getRules())};d.inherits(h,e),function(){this.createWorker=function(a){return null}}.call(h.prototype),b.Mode=h}),define("ace/mode/javascript",["require","exports","module","ace/lib/oop","ace/mode/text","ace/tokenizer","ace/mode/javascript_highlight_rules","ace/mode/matching_brace_outdent","ace/range","ace/worker/worker_client","ace/mode/behaviour/cstyle","ace/mode/folding/cstyle"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text").Mode,f=a("../tokenizer").Tokenizer,g=a("./javascript_highlight_rules").JavaScriptHighlightRules,h=a("./matching_brace_outdent").MatchingBraceOutdent,i=a("../range").Range,j=a("../worker/worker_client").WorkerClient,k=a("./behaviour/cstyle").CstyleBehaviour,l=a("./folding/cstyle").FoldMode,m=function(){this.$tokenizer=new f((new g).getRules()),this.$outdent=new h,this.$behaviour=new k,this.foldingRules=new l};d.inherits(m,e),function(){this.toggleCommentLines=function(a,b,c,d){var e=!0,f=/^(\s*)\/\//;for(var g=c;g<=d;g++)if(!f.test(b.getLine(g))){e=!1;break}if(e){var h=new i(0,0,0,0);for(var g=c;g<=d;g++){var j=b.getLine(g),k=j.match(f);h.start.row=g,h.end.row=g,h.end.column=k[0].length,b.replace(h,k[1])}}else b.indentRows(c,d,"//")},this.getNextLineIndent=function(a,b,c){var d=this.$getIndent(b),e=this.$tokenizer.getLineTokens(b,a),f=e.tokens,g=e.state;if(f.length&&f[f.length-1].type=="comment")return d;if(a=="start"||a=="regex_allowed"){var h=b.match(/^.*(?:\bcase\b.*\:|[\{\(\[])\s*$/);h&&(d+=c)}else if(a=="doc-start"){if(g=="start"||a=="regex_allowed")return"";var h=b.match(/^\s*(\/?)\*/);h&&(h[1]&&(d+=" "),d+="* ")}return d},this.checkOutdent=function(a,b,c){return this.$outdent.checkOutdent(b,c)},this.autoOutdent=function(a,b,c){this.$outdent.autoOutdent(b,c)},this.createWorker=function(a){var b=new j(["ace"],"worker-javascript.js","ace/mode/javascript_worker","JavaScriptWorker");return b.attachToDocument(a.getDocument()),b.on("jslint",function(b){var c=[];for(var d=0;d<b.data.length;d++){var e=b.data[d];e&&c.push({row:e.line-1,column:e.character-1,text:e.reason,type:"warning",lint:e})}a.setAnnotations(c)}),b.on("narcissus",function(b){a.setAnnotations([b.data])}),b.on("terminate",function(){a.clearAnnotations()}),b}}.call(m.prototype),b.Mode=m}),define("ace/mode/javascript_highlight_rules",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/unicode","ace/mode/doc_comment_highlight_rules","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("../lib/lang"),f=a("../unicode"),g=a("./doc_comment_highlight_rules").DocCommentHighlightRules,h=a("./text_highlight_rules").TextHighlightRules,i=function(){var a=e.arrayToMap("Array|Boolean|Date|Function|Iterator|Number|Object|RegExp|String|Proxy|Namespace|QName|XML|XMLList|ArrayBuffer|Float32Array|Float64Array|Int16Array|Int32Array|Int8Array|Uint16Array|Uint32Array|Uint8Array|Uint8ClampedArray|Error|EvalError|InternalError|RangeError|ReferenceError|StopIteration|SyntaxError|TypeError|URIError|decodeURI|decodeURIComponent|encodeURI|encodeURIComponent|eval|isFinite|isNaN|parseFloat|parseInt|JSON|Math|this|arguments|prototype|window|document".split("|")),b=e.arrayToMap("break|case|catch|continue|default|delete|do|else|finally|for|function|if|in|instanceof|new|return|switch|throw|try|typeof|let|var|while|with|const|yield|import|get|set".split("|")),c="case|do|else|finally|in|instanceof|return|throw|try|typeof|yield",d=e.arrayToMap("__parent__|__count__|escape|unescape|with|__proto__".split("|")),h=e.arrayToMap("const|let|var|function".split("|")),i=e.arrayToMap("null|Infinity|NaN|undefined".split("|")),j=e.arrayToMap("class|enum|extends|super|export|implements|private|public|interface|package|protected|static".split("|")),k="["+f.packages.L+"\\$_]["+f.packages.L+f.packages.Mn+f.packages.Mc+f.packages.Nd+f.packages.Pc+"\\$_]*\\b",l="\\\\(?:x[0-9a-fA-F]{2}|u[0-9a-fA-F]{4}|[0-2][0-7]{0,2}|3[0-6][0-7]?|37[0-7]?|[4-7][0-7]?|.)";this.$rules={start:[{token:"comment",regex:/\/\/.*$/},(new g).getStartRule("doc-start"),{token:"comment",merge:!0,regex:/\/\*/,next:"comment"},{token:"string",regex:"'",next:"qstring"},{token:"string",regex:'"',next:"qqstring"},{token:"constant.numeric",regex:/0[xX][0-9a-fA-F]+\b/},{token:"constant.numeric",regex:/[+-]?\d+(?:(?:\.\d*)?(?:[eE][+-]?\d+)?)?\b/},{token:["storage.type","punctuation.operator","support.function","punctuation.operator","entity.name.function","text","keyword.operator","text","storage.type","text","paren.lparen","variable.parameter","paren.rparen"],regex:"("+k+")(\\.)(prototype)(\\.)("+k+")(\\s*)(=)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"},{token:["storage.type","punctuation.operator","support.function","punctuation.operator","entity.name.function","text","keyword.operator","text"],regex:"("+k+")(\\.)(prototype)(\\.)("+k+")(\\s*)(=)(\\s*)"},{token:["storage.type","punctuation.operator","entity.name.function","text","keyword.operator","text","storage.type","text","paren.lparen","variable.parameter","paren.rparen"],regex:"("+k+")(\\.)("+k+")(\\s*)(=)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"},{token:["entity.name.function","text","keyword.operator","text","storage.type","text","paren.lparen","variable.parameter","paren.rparen"],regex:"("+k+")(\\s*)(=)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"},{token:["storage.type","text","entity.name.function","text","paren.lparen","variable.parameter","paren.rparen"],regex:"(function)(\\s+)("+k+")(\\s*)(\\()(.*?)(\\))"},{token:["entity.name.function","text","punctuation.operator","text","storage.type","text","paren.lparen","variable.parameter","paren.rparen"],regex:"("+k+")(\\s*)(:)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"},{token:["text","text","storage.type","text","paren.lparen","variable.parameter","paren.rparen"],regex:"(:)(\\s*)(function)?(\\s*)(\\()([^)]*)(\\))"},{token:"constant.language.boolean",regex:/(?:true|false)\b/},{token:"keyword",regex:"(?:"+c+")\\b",next:"regex_allowed"},{token:["punctuation.operator","support.function"],regex:/(\.)(s(?:h(?:ift|ow(?:Mod(?:elessDialog|alDialog)|Help))|croll(?:X|By(?:Pages|Lines)?|Y|To)?|t(?:opzzzz|rike)|i(?:n|zeToContent|debar|gnText)|ort|u(?:p|b(?:str(?:ing)?)?)|pli(?:ce|t)|e(?:nd|t(?:Re(?:sizable|questHeader)|M(?:i(?:nutes|lliseconds)|onth)|Seconds|Ho(?:tKeys|urs)|Year|Cursor|Time(?:out)?|Interval|ZOptions|Date|UTC(?:M(?:i(?:nutes|lliseconds)|onth)|Seconds|Hours|Date|FullYear)|FullYear|Active)|arch)|qrt|lice|avePreferences|mall)|h(?:ome|andleEvent)|navigate|c(?:har(?:CodeAt|At)|o(?:s|n(?:cat|textual|firm)|mpile)|eil|lear(?:Timeout|Interval)?|a(?:ptureEvents|ll)|reate(?:StyleSheet|Popup|EventObject))|t(?:o(?:GMTString|S(?:tring|ource)|U(?:TCString|pperCase)|Lo(?:caleString|werCase))|est|a(?:n|int(?:Enabled)?))|i(?:s(?:NaN|Finite)|ndexOf|talics)|d(?:isableExternalCapture|ump|etachEvent)|u(?:n(?:shift|taint|escape|watch)|pdateCommands)|j(?:oin|avaEnabled)|p(?:o(?:p|w)|ush|lugins.refresh|a(?:ddings|rse(?:Int|Float)?)|r(?:int|ompt|eference))|e(?:scape|nableExternalCapture|val|lementFromPoint|x(?:p|ec(?:Script|Command)?))|valueOf|UTC|queryCommand(?:State|Indeterm|Enabled|Value)|f(?:i(?:nd|le(?:ModifiedDate|Size|CreatedDate|UpdatedDate)|xed)|o(?:nt(?:size|color)|rward)|loor|romCharCode)|watch|l(?:ink|o(?:ad|g)|astIndexOf)|a(?:sin|nchor|cos|t(?:tachEvent|ob|an(?:2)?)|pply|lert|b(?:s|ort))|r(?:ou(?:nd|teEvents)|e(?:size(?:By|To)|calc|turnValue|place|verse|l(?:oad|ease(?:Capture|Events)))|andom)|g(?:o|et(?:ResponseHeader|M(?:i(?:nutes|lliseconds)|onth)|Se(?:conds|lection)|Hours|Year|Time(?:zoneOffset)?|Da(?:y|te)|UTC(?:M(?:i(?:nutes|lliseconds)|onth)|Seconds|Hours|Da(?:y|te)|FullYear)|FullYear|A(?:ttention|llResponseHeaders)))|m(?:in|ove(?:B(?:y|elow)|To(?:Absolute)?|Above)|ergeAttributes|a(?:tch|rgins|x))|b(?:toa|ig|o(?:ld|rderWidths)|link|ack))\b(?=\()/},{token:["punctuation.operator","support.function.dom"],regex:/(\.)(s(?:ub(?:stringData|mit)|plitText|e(?:t(?:NamedItem|Attribute(?:Node)?)|lect))|has(?:ChildNodes|Feature)|namedItem|c(?:l(?:ick|o(?:se|neNode))|reate(?:C(?:omment|DATASection|aption)|T(?:Head|extNode|Foot)|DocumentFragment|ProcessingInstruction|E(?:ntityReference|lement)|Attribute))|tabIndex|i(?:nsert(?:Row|Before|Cell|Data)|tem)|open|delete(?:Row|C(?:ell|aption)|T(?:Head|Foot)|Data)|focus|write(?:ln)?|a(?:dd|ppend(?:Child|Data))|re(?:set|place(?:Child|Data)|move(?:NamedItem|Child|Attribute(?:Node)?)?)|get(?:NamedItem|Element(?:sBy(?:Name|TagName)|ById)|Attribute(?:Node)?)|blur)\b(?=\()/},{token:["punctuation.operator","support.constant"],regex:/(\.)(s(?:ystemLanguage|cr(?:ipts|ollbars|een(?:X|Y|Top|Left))|t(?:yle(?:Sheets)?|atus(?:Text|bar)?)|ibling(?:Below|Above)|ource|uffixes|e(?:curity(?:Policy)?|l(?:ection|f)))|h(?:istory|ost(?:name)?|as(?:h|Focus))|y|X(?:MLDocument|SLDocument)|n(?:ext|ame(?:space(?:s|URI)|Prop))|M(?:IN_VALUE|AX_VALUE)|c(?:haracterSet|o(?:n(?:structor|trollers)|okieEnabled|lorDepth|mp(?:onents|lete))|urrent|puClass|l(?:i(?:p(?:boardData)?|entInformation)|osed|asses)|alle(?:e|r)|rypto)|t(?:o(?:olbar|p)|ext(?:Transform|Indent|Decoration|Align)|ags)|SQRT(?:1_2|2)|i(?:n(?:ner(?:Height|Width)|put)|ds|gnoreCase)|zIndex|o(?:scpu|n(?:readystatechange|Line)|uter(?:Height|Width)|p(?:sProfile|ener)|ffscreenBuffering)|NEGATIVE_INFINITY|d(?:i(?:splay|alog(?:Height|Top|Width|Left|Arguments)|rectories)|e(?:scription|fault(?:Status|Ch(?:ecked|arset)|View)))|u(?:ser(?:Profile|Language|Agent)|n(?:iqueID|defined)|pdateInterval)|_content|p(?:ixelDepth|ort|ersonalbar|kcs11|l(?:ugins|atform)|a(?:thname|dding(?:Right|Bottom|Top|Left)|rent(?:Window|Layer)?|ge(?:X(?:Offset)?|Y(?:Offset)?))|r(?:o(?:to(?:col|type)|duct(?:Sub)?|mpter)|e(?:vious|fix)))|e(?:n(?:coding|abledPlugin)|x(?:ternal|pando)|mbeds)|v(?:isibility|endor(?:Sub)?|Linkcolor)|URLUnencoded|P(?:I|OSITIVE_INFINITY)|f(?:ilename|o(?:nt(?:Size|Family|Weight)|rmName)|rame(?:s|Element)|gColor)|E|whiteSpace|l(?:i(?:stStyleType|n(?:eHeight|kColor))|o(?:ca(?:tion(?:bar)?|lName)|wsrc)|e(?:ngth|ft(?:Context)?)|a(?:st(?:M(?:odified|atch)|Index|Paren)|yer(?:s|X)|nguage))|a(?:pp(?:MinorVersion|Name|Co(?:deName|re)|Version)|vail(?:Height|Top|Width|Left)|ll|r(?:ity|guments)|Linkcolor|bove)|r(?:ight(?:Context)?|e(?:sponse(?:XML|Text)|adyState))|global|x|m(?:imeTypes|ultiline|enubar|argin(?:Right|Bottom|Top|Left))|L(?:N(?:10|2)|OG(?:10E|2E))|b(?:o(?:ttom|rder(?:Width|RightWidth|BottomWidth|Style|Color|TopWidth|LeftWidth))|ufferDepth|elow|ackground(?:Color|Image)))\b/},{token:["storage.type","punctuation.operator","support.function.firebug"],regex:/(console)(\.)(warn|info|log|error|time|timeEnd|assert)\b/},{token:function(c){return a.hasOwnProperty(c)?"variable.language":d.hasOwnProperty(c)?"invalid.deprecated":h.hasOwnProperty(c)?"storage.type":b.hasOwnProperty(c)?"keyword":i.hasOwnProperty(c)?"constant.language":j.hasOwnProperty(c)?"invalid.illegal":c=="debugger"?"invalid.deprecated":"identifier"},regex:k},{token:"keyword.operator",regex:/!|\$|%|&|\*|\-\-|\-|\+\+|\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\|\||\?\:|\*=|%=|\+=|\-=|&=|\^=|\b(?:in|instanceof|new|delete|typeof|void)/,next:"regex_allowed"},{token:"punctuation.operator",regex:/\?|\:|\,|\;|\./,next:"regex_allowed"},{token:"paren.lparen",regex:/[\[({]/,next:"regex_allowed"},{token:"paren.rparen",regex:/[\])}]/},{token:"keyword.operator",regex:/\/=?/,next:"regex_allowed"},{token:"comment",regex:/^#!.*$/},{token:"text",regex:/\s+/}],regex_allowed:[{token:"comment",merge:!0,regex:"\\/\\*",next:"comment_regex_allowed"},{token:"comment",regex:"\\/\\/.*$"},{token:"string.regexp",regex:"\\/",next:"regex",merge:!0},{token:"text",regex:"\\s+"},{token:"empty",regex:"",next:"start"}],regex:[{token:"regexp.keyword.operator",regex:"\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)",next:"regex"},{token:"string.regexp",regex:"/\\w*",next:"start",merge:!0},{token:"string.regexp",regex:"[^\\\\/\\[]+",next:"regex",merge:!0},{token:"string.regexp.charachterclass",regex:"\\[",next:"regex_character_class",merge:!0},{token:"empty",regex:"",next:"start"}],regex_character_class:[{token:"regexp.keyword.operator",regex:"\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)",next:"regex_character_class"},{token:"string.regexp.charachterclass",regex:"]",next:"regex",merge:!0},{token:"string.regexp.charachterclass",regex:"[^\\\\\\]]+",next:"regex_character_class",merge:!0},{token:"empty",regex:"",next:"start"}],comment_regex_allowed:[{token:"comment",regex:".*?\\*\\/",merge:!0,next:"regex_allowed"},{token:"comment",merge:!0,regex:".+"}],comment:[{token:"comment",regex:".*?\\*\\/",merge:!0,next:"start"},{token:"comment",merge:!0,regex:".+"}],qqstring:[{token:"constant.language.escape",regex:l},{token:"string",regex:'[^"\\\\]+'},{token:"string",regex:'"',next:"start"}],qstring:[{token:"constant.language.escape",regex:l},{token:"string",regex:"[^'\\\\]+"},{token:"string",regex:"'",next:"start"}]},this.embedRules(g,"doc-",[(new g).getEndRule("start")])};d.inherits(i,h),b.JavaScriptHighlightRules=i}),define("ace/mode/doc_comment_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text_highlight_rules").TextHighlightRules,f=function(){this.$rules={start:[{token:"comment.doc.tag",regex:"@[\\w\\d_]+"},{token:"comment.doc",merge:!0,regex:"\\s+"},{token:"comment.doc",merge:!0,regex:"TODO"},{token:"comment.doc",merge:!0,regex:"[^@\\*]+"},{token:"comment.doc",merge:!0,regex:"."}]}};d.inherits(f,e),function(){this.getStartRule=function(a){return{token:"comment.doc",merge:!0,regex:"\\/\\*(?=\\*)",next:a}},this.getEndRule=function(a){return{token:"comment.doc",merge:!0,regex:"\\*\\/",next:a}}}.call(f.prototype),b.DocCommentHighlightRules=f}),define("ace/mode/matching_brace_outdent",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../range").Range,e=function(){};(function(){this.checkOutdent=function(a,b){return/^\s+$/.test(a)?/^\s*\}/.test(b):!1},this.autoOutdent=function(a,b){var c=a.getLine(b),e=c.match(/^(\s*\})/);if(!e)return 0;var f=e[1].length,g=a.findMatchingBracket({row:b,column:f});if(!g||g.row==b)return 0;var h=this.$getIndent(a.getLine(g.row));a.replace(new d(b,0,b,f-1),h)},this.$getIndent=function(a){var b=a.match(/^(\s+)/);return b?b[1]:""}}).call(e.prototype),b.MatchingBraceOutdent=e}),define("ace/mode/behaviour/cstyle",["require","exports","module","ace/lib/oop","ace/mode/behaviour"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../behaviour").Behaviour,f=function(){this.add("braces","insertion",function(a,b,c,d,e){if(e=="{"){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"{"+g+"}",selection:!1}:{text:"{}",selection:[1,1]}}if(e=="}"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var k=d.$findOpeningBracket("}",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}else if(e=="\n"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var l=d.findMatchingBracket({row:h.row,column:h.column+1});if(!l)return null;var m=this.getNextLineIndent(a,i.substring(0,i.length-1),d.getTabString()),n=this.$getIndent(d.doc.getLine(l.row));return{text:"\n"+m+"\n"+n,selection:[1,m.length,1,m.length]}}}}),this.add("braces","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="{"){var g=d.doc.getLine(e.start.row),h=g.substring(e.end.column,e.end.column+1);if(h=="}")return e.end.column++,e}}),this.add("parens","insertion",function(a,b,c,d,e){if(e=="("){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"("+g+")",selection:!1}:{text:"()",selection:[1,1]}}if(e==")"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j==")"){var k=d.$findOpeningBracket(")",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}}),this.add("parens","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="("){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h==")")return e.end.column++,e}}),this.add("string_dquotes","insertion",function(a,b,c,d,e){if(e=='"'||e=="'"){var f=e,g=c.getSelectionRange(),h=d.doc.getTextRange(g);if(h!=="")return{text:f+h+f,selection:!1};var i=c.getCursorPosition(),j=d.doc.getLine(i.row),k=j.substring(i.column-1,i.column);if(k=="\\")return null;var l=d.getTokens(g.start.row,g.start.row)[0].tokens,m=0,n,o=-1;for(var p=0;p<l.length;p++){n=l[p],n.type=="string"?o=-1:o<0&&(o=n.value.indexOf(f));if(n.value.length+m>g.start.column)break;m+=l[p].value.length}if(!n||o<0&&n.type!=="comment"&&(n.type!=="string"||g.start.column!==n.value.length+m-1&&n.value.lastIndexOf(f)===n.value.length-1))return{text:f+f,selection:[1,1]};if(n&&n.type==="string"){var q=j.substring(i.column,i.column+1);if(q==f)return{text:"",selection:[1,1]}}}}),this.add("string_dquotes","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&(f=='"'||f=="'")){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h=='"')return e.end.column++,e}})};d.inherits(f,e),b.CstyleBehaviour=f}),define("ace/mode/folding/cstyle",["require","exports","module","ace/lib/oop","ace/range","ace/mode/folding/fold_mode"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../../range").Range,f=a("./fold_mode").FoldMode,g=b.FoldMode=function(){};d.inherits(g,f),function(){this.foldingStartMarker=/(\{|\[)[^\}\]]*$|^\s*(\/\*)/,this.foldingStopMarker=/^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/,this.getFoldWidgetRange=function(a,b,c){var d=a.getLine(c),f=d.match(this.foldingStartMarker);if(f){var g=f.index;if(f[1])return this.openingBracketBlock(a,f[1],c,g);var h=a.getCommentFoldRange(c,g+f[0].length);return h.end.column-=2,h}if(b!=="markbeginend")return;var f=d.match(this.foldingStopMarker);if(f){var g=f.index+f[0].length;if(f[2]){var h=a.getCommentFoldRange(c,g);return h.end.column-=2,h}var i={row:c,column:g},j=a.$findOpeningBracket(f[1],i);if(!j)return;return j.column++,i.column--,e.fromPoints(j,i)}}}.call(g.prototype)}),define("ace/mode/folding/fold_mode",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../../range").Range,e=b.FoldMode=function(){};(function(){this.foldingStartMarker=null,this.foldingStopMarker=null,this.getFoldWidget=function(a,b,c){var d=a.getLine(c);return this.foldingStartMarker.test(d)?"start":b=="markbeginend"&&this.foldingStopMarker&&this.foldingStopMarker.test(d)?"end":""},this.getFoldWidgetRange=function(a,b,c){return null},this.indentationBlock=function(a,b,c){var e=/^\s*/,f=b,g=b,h=a.getLine(b),i=c||h.length,j=h.match(e)[0].length,k=a.getLength();while(++b<k){h=a.getLine(b);var l=h.match(e)[0].length;if(l==h.length)continue;if(l<=j)break;g=b}if(g>f){var m=a.getLine(g).length;return new d(f,i,g,m)}},this.openingBracketBlock=function(a,b,c,e){var f={row:c,column:e+1},g=a.$findClosingBracket(b,f);if(!g)return;var h=a.foldWidgets[g.row];return h==null&&(h=this.getFoldWidget(a,g.row)),h=="start"&&(g.row--,g.column=a.getLine(g.row).length),d.fromPoints(f,g)}}).call(e.prototype)}),define("ace/mode/java_highlight_rules",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/mode/doc_comment_highlight_rules","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("../lib/lang"),f=a("./doc_comment_highlight_rules").DocCommentHighlightRules,g=a("./text_highlight_rules").TextHighlightRules,h=function(){var a=e.arrayToMap("abstract|continue|for|new|switch|assert|default|goto|package|synchronized|boolean|do|if|private|this|break|double|implements|protected|throw|byte|else|import|public|throws|case|enum|instanceof|return|transient|catch|extends|int|short|try|char|final|interface|static|void|class|finally|long|strictfp|volatile|const|float|native|super|while".split("|")),b=e.arrayToMap("null|Infinity|NaN|undefined".split("|")),c=e.arrayToMap("AbstractMethodError|AssertionError|ClassCircularityError|ClassFormatError|Deprecated|EnumConstantNotPresentException|ExceptionInInitializerError|IllegalAccessError|IllegalThreadStateException|InstantiationError|InternalError|NegativeArraySizeException|NoSuchFieldError|Override|Process|ProcessBuilder|SecurityManager|StringIndexOutOfBoundsException|SuppressWarnings|TypeNotPresentException|UnknownError|UnsatisfiedLinkError|UnsupportedClassVersionError|VerifyError|InstantiationException|IndexOutOfBoundsException|ArrayIndexOutOfBoundsException|CloneNotSupportedException|NoSuchFieldException|IllegalArgumentException|NumberFormatException|SecurityException|Void|InheritableThreadLocal|IllegalStateException|InterruptedException|NoSuchMethodException|IllegalAccessException|UnsupportedOperationException|Enum|StrictMath|Package|Compiler|Readable|Runtime|StringBuilder|Math|IncompatibleClassChangeError|NoSuchMethodError|ThreadLocal|RuntimePermission|ArithmeticException|NullPointerException|Long|Integer|Short|Byte|Double|Number|Float|Character|Boolean|StackTraceElement|Appendable|StringBuffer|Iterable|ThreadGroup|Runnable|Thread|IllegalMonitorStateException|StackOverflowError|OutOfMemoryError|VirtualMachineError|ArrayStoreException|ClassCastException|LinkageError|NoClassDefFoundError|ClassNotFoundException|RuntimeException|Exception|ThreadDeath|Error|Throwable|System|ClassLoader|Cloneable|Class|CharSequence|Comparable|String|Object".split("|")),d=e.arrayToMap("".split("|"));this.$rules={start:[{token:"comment",regex:"\\/\\/.*$"},(new f).getStartRule("doc-start"),{token:"comment",merge:!0,regex:"\\/\\*",next:"comment"},{token:"string.regexp",regex:"[/](?:(?:\\[(?:\\\\]|[^\\]])+\\])|(?:\\\\/|[^\\]/]))*[/]\\w*\\s*(?=[).,;]|$)"},{token:"string",regex:'["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'},{token:"string",regex:"['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"},{token:"constant.numeric",regex:"0[xX][0-9a-fA-F]+\\b"},{token:"constant.numeric",regex:"[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"},{token:"constant.language.boolean",regex:"(?:true|false)\\b"},{token:function(e){return e=="this"?"variable.language":a.hasOwnProperty(e)?"keyword":c.hasOwnProperty(e)?"support.function":d.hasOwnProperty(e)?"support.function":b.hasOwnProperty(e)?"constant.language":"identifier"},regex:"[a-zA-Z_$][a-zA-Z0-9_$]*\\b"},{token:"keyword.operator",regex:"!|\\$|%|&|\\*|\\-\\-|\\-|\\+\\+|\\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\\|\\||\\?\\:|\\*=|%=|\\+=|\\-=|&=|\\^=|\\b(?:in|instanceof|new|delete|typeof|void)"},{token:"lparen",regex:"[[({]"},{token:"rparen",regex:"[\\])}]"},{token:"text",regex:"\\s+"}],comment:[{token:"comment",regex:".*?\\*\\/",next:"start"},{token:"comment",merge:!0,regex:".+"}]},this.embedRules(f,"doc-",[(new f).getEndRule("start")])};d.inherits(h,g),b.JavaHighlightRules=h})
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/mode-javascript-uncompressed.js b/apps/files_texteditor/js/aceeditor/mode-javascript-uncompressed.js
deleted file mode 100644
index 8afe93503a..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-javascript-uncompressed.js
+++ /dev/null
@@ -1,1203 +0,0 @@
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/javascript', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text', 'ace/tokenizer', 'ace/mode/javascript_highlight_rules', 'ace/mode/matching_brace_outdent', 'ace/range', 'ace/worker/worker_client', 'ace/mode/behaviour/cstyle', 'ace/mode/folding/cstyle'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
-var JavaScriptHighlightRules = require("./javascript_highlight_rules").JavaScriptHighlightRules;
-var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
-var Range = require("../range").Range;
-var WorkerClient = require("../worker/worker_client").WorkerClient;
-var CstyleBehaviour = require("./behaviour/cstyle").CstyleBehaviour;
-var CStyleFoldMode = require("./folding/cstyle").FoldMode;
-
-var Mode = function() {
-    this.$tokenizer = new Tokenizer(new JavaScriptHighlightRules().getRules());
-    this.$outdent = new MatchingBraceOutdent();
-    this.$behaviour = new CstyleBehaviour();
-    this.foldingRules = new CStyleFoldMode();
-};
-oop.inherits(Mode, TextMode);
-
-(function() {
-
-
-    this.toggleCommentLines = function(state, doc, startRow, endRow) {
-        var outdent = true;
-        var re = /^(\s*)\/\//;
-
-        for (var i=startRow; i<= endRow; i++) {
-            if (!re.test(doc.getLine(i))) {
-                outdent = false;
-                break;
-            }
-        }
-
-        if (outdent) {
-            var deleteRange = new Range(0, 0, 0, 0);
-            for (var i=startRow; i<= endRow; i++)
-            {
-                var line = doc.getLine(i);
-                var m = line.match(re);
-                deleteRange.start.row = i;
-                deleteRange.end.row = i;
-                deleteRange.end.column = m[0].length;
-                doc.replace(deleteRange, m[1]);
-            }
-        }
-        else {
-            doc.indentRows(startRow, endRow, "//");
-        }
-    };
-
-    this.getNextLineIndent = function(state, line, tab) {
-        var indent = this.$getIndent(line);
-
-        var tokenizedLine = this.$tokenizer.getLineTokens(line, state);
-        var tokens = tokenizedLine.tokens;
-        var endState = tokenizedLine.state;
-
-        if (tokens.length && tokens[tokens.length-1].type == "comment") {
-            return indent;
-        }
-        
-        if (state == "start" || state == "regex_allowed") {
-            var match = line.match(/^.*(?:\bcase\b.*\:|[\{\(\[])\s*$/);
-            if (match) {
-                indent += tab;
-            }
-        } else if (state == "doc-start") {
-            if (endState == "start" || state == "regex_allowed") {
-                return "";
-            }
-            var match = line.match(/^\s*(\/?)\*/);
-            if (match) {
-                if (match[1]) {
-                    indent += " ";
-                }
-                indent += "* ";
-            }
-        }
-
-        return indent;
-    };
-
-    this.checkOutdent = function(state, line, input) {
-        return this.$outdent.checkOutdent(line, input);
-    };
-
-    this.autoOutdent = function(state, doc, row) {
-        this.$outdent.autoOutdent(doc, row);
-    };
-    
-    this.createWorker = function(session) {
-        var worker = new WorkerClient(["ace"], "worker-javascript.js", "ace/mode/javascript_worker", "JavaScriptWorker");
-        worker.attachToDocument(session.getDocument());
-            
-        worker.on("jslint", function(results) {
-            var errors = [];
-            for (var i=0; i<results.data.length; i++) {
-                var error = results.data[i];
-                if (error)
-                    errors.push({
-                        row: error.line-1,
-                        column: error.character-1,
-                        text: error.reason,
-                        type: "warning",
-                        lint: error
-                    });
-            }
-            session.setAnnotations(errors);
-        });
-        
-        worker.on("narcissus", function(e) {
-            session.setAnnotations([e.data]);
-        });
-        
-        worker.on("terminate", function() {
-            session.clearAnnotations();
-        });
-        
-        return worker;
-    };
-
-}).call(Mode.prototype);
-
-exports.Mode = Mode;
-});
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *      Mihai Sucan <mihai DOT sucan AT gmail DOT com>
- *
- * 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 ***** */
-
-define('ace/mode/javascript_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/lang', 'ace/unicode', 'ace/mode/doc_comment_highlight_rules', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var lang = require("../lib/lang");
-var unicode = require("../unicode");
-var DocCommentHighlightRules = require("./doc_comment_highlight_rules").DocCommentHighlightRules;
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-
-var JavaScriptHighlightRules = function() {
-
-    // see: https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects
-    var globals = lang.arrayToMap(
-      // Constructors
-        ("Array|Boolean|Date|Function|Iterator|Number|Object|RegExp|String|Proxy|" +
-      // E4X
-         "Namespace|QName|XML|XMLList|" +
-         "ArrayBuffer|Float32Array|Float64Array|Int16Array|Int32Array|Int8Array|" +
-         "Uint16Array|Uint32Array|Uint8Array|Uint8ClampedArray|" +
-      // Errors
-        "Error|EvalError|InternalError|RangeError|ReferenceError|StopIteration|" +
-        "SyntaxError|TypeError|URIError|" +
-      //  Non-constructor functions
-        "decodeURI|decodeURIComponent|encodeURI|encodeURIComponent|eval|isFinite|" +
-        "isNaN|parseFloat|parseInt|" +
-      // Other
-        "JSON|Math|" +
-      // Pseudo
-        "this|arguments|prototype|window|document"
-      ).split("|")
-    );
-
-    var keywords = lang.arrayToMap(
-        ("break|case|catch|continue|default|delete|do|else|finally|for|function|" +
-        "if|in|instanceof|new|return|switch|throw|try|typeof|let|var|while|with|" +
-        "const|yield|import|get|set").split("|")
-    );
-
-    // keywords which can be followed by regular expressions
-    var kwBeforeRe = "case|do|else|finally|in|instanceof|return|throw|try|typeof|yield";
-
-    var deprecated = lang.arrayToMap(
-        ("__parent__|__count__|escape|unescape|with|__proto__").split("|")
-    );
-
-    var definitions = lang.arrayToMap(("const|let|var|function").split("|"));
-
-    var buildinConstants = lang.arrayToMap(
-        ("null|Infinity|NaN|undefined").split("|")
-    );
-
-    var futureReserved = lang.arrayToMap(
-        ("class|enum|extends|super|export|implements|private|" +
-        "public|interface|package|protected|static").split("|")
-    );
-
-    // TODO: Unicode escape sequences
-    var identifierRe = "[" + unicode.packages.L + "\\$_]["
-        + unicode.packages.L
-        + unicode.packages.Mn + unicode.packages.Mc
-        + unicode.packages.Nd
-        + unicode.packages.Pc + "\\$_]*\\b";
-
-    var escapedRe = "\\\\(?:x[0-9a-fA-F]{2}|" + // hex
-        "u[0-9a-fA-F]{4}|" + // unicode
-        "[0-2][0-7]{0,2}|" + // oct
-        "3[0-6][0-7]?|" + // oct
-        "37[0-7]?|" + // oct
-        "[4-7][0-7]?|" + //oct
-        ".)";
-
-    // regexp must not have capturing parentheses. Use (?:) instead.
-    // regexps are ordered -> the first match is used
-
-    this.$rules = {
-        "start" : [
-            {
-                token : "comment",
-                regex : /\/\/.*$/
-            },
-            new DocCommentHighlightRules().getStartRule("doc-start"),
-            {
-                token : "comment", // multi line comment
-                merge : true,
-                regex : /\/\*/,
-                next : "comment"
-            }, {
-                token : "string",
-                regex : "'",
-                next  : "qstring"
-            }, {
-                token : "string",
-                regex : '"',
-                next  : "qqstring"
-            }, {
-                token : "constant.numeric", // hex
-                regex : /0[xX][0-9a-fA-F]+\b/
-            }, {
-                token : "constant.numeric", // float
-                regex : /[+-]?\d+(?:(?:\.\d*)?(?:[eE][+-]?\d+)?)?\b/
-            }, { // match stuff like: Sound.prototype.play = function() { }
-                token : [
-                    "storage.type",
-                    "punctuation.operator",
-                    "support.function",
-                    "punctuation.operator",
-                    "entity.name.function",
-                    "text",
-                    "keyword.operator",
-                    "text",
-                    "storage.type",
-                    "text",
-                    "paren.lparen",
-                    "variable.parameter",
-                    "paren.rparen"
-                ],
-                regex : "(" + identifierRe + ")(\\.)(prototype)(\\.)(" + identifierRe +")(\\s*)(=)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"
-            }, { // match stuff like: Sound.prototype.play = myfunc
-                token : [
-                    "storage.type",
-                    "punctuation.operator",
-                    "support.function",
-                    "punctuation.operator",
-                    "entity.name.function",
-                    "text",
-                    "keyword.operator",
-                    "text"
-                ],
-                regex : "(" + identifierRe + ")(\\.)(prototype)(\\.)(" + identifierRe +")(\\s*)(=)(\\s*)"
-            }, { // match stuff like: Sound.play = function() {  }
-                token : [
-                    "storage.type",
-                    "punctuation.operator",
-                    "entity.name.function",
-                    "text",
-                    "keyword.operator",
-                    "text",
-                    "storage.type",
-                    "text",
-                    "paren.lparen",
-                    "variable.parameter",
-                    "paren.rparen"
-                ],
-                regex : "(" + identifierRe + ")(\\.)(" + identifierRe +")(\\s*)(=)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"
-            }, { // match stuff like: play = function() {  }
-                token : [
-                    "entity.name.function",
-                    "text",
-                    "keyword.operator",
-                    "text",
-                    "storage.type",
-                    "text",
-                    "paren.lparen",
-                    "variable.parameter",
-                    "paren.rparen"
-                ],
-                regex : "(" + identifierRe +")(\\s*)(=)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"
-            }, { // match regular function like: function myFunc(arg) { }
-                token : [
-                    "storage.type",
-                    "text",
-                    "entity.name.function",
-                    "text",
-                    "paren.lparen",
-                    "variable.parameter",
-                    "paren.rparen"
-                ],
-                regex : "(function)(\\s+)(" + identifierRe + ")(\\s*)(\\()(.*?)(\\))"
-            }, { // match stuff like: foobar: function() { }
-                token : [
-                    "entity.name.function",
-                    "text",
-                    "punctuation.operator",
-                    "text",
-                    "storage.type",
-                    "text",
-                    "paren.lparen",
-                    "variable.parameter",
-                    "paren.rparen"
-                ],
-                regex : "(" + identifierRe + ")(\\s*)(:)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"
-            }, { // Attempt to match : function() { } (this is for issues with 'foo': function() { })
-                token : [
-                    "text",
-                    "text",
-                    "storage.type",
-                    "text",
-                    "paren.lparen",
-                    "variable.parameter",
-                    "paren.rparen"
-                ],
-                regex : "(:)(\\s*)(function)?(\\s*)(\\()([^)]*)(\\))"
-            }, {
-                token : "constant.language.boolean",
-                regex : /(?:true|false)\b/
-            }, {
-                token : "keyword",
-                regex : "(?:" + kwBeforeRe + ")\\b",
-                next : "regex_allowed"
-            }, {
-                token : ["punctuation.operator", "support.function"],
-                regex : /(\.)(s(?:h(?:ift|ow(?:Mod(?:elessDialog|alDialog)|Help))|croll(?:X|By(?:Pages|Lines)?|Y|To)?|t(?:opzzzz|rike)|i(?:n|zeToContent|debar|gnText)|ort|u(?:p|b(?:str(?:ing)?)?)|pli(?:ce|t)|e(?:nd|t(?:Re(?:sizable|questHeader)|M(?:i(?:nutes|lliseconds)|onth)|Seconds|Ho(?:tKeys|urs)|Year|Cursor|Time(?:out)?|Interval|ZOptions|Date|UTC(?:M(?:i(?:nutes|lliseconds)|onth)|Seconds|Hours|Date|FullYear)|FullYear|Active)|arch)|qrt|lice|avePreferences|mall)|h(?:ome|andleEvent)|navigate|c(?:har(?:CodeAt|At)|o(?:s|n(?:cat|textual|firm)|mpile)|eil|lear(?:Timeout|Interval)?|a(?:ptureEvents|ll)|reate(?:StyleSheet|Popup|EventObject))|t(?:o(?:GMTString|S(?:tring|ource)|U(?:TCString|pperCase)|Lo(?:caleString|werCase))|est|a(?:n|int(?:Enabled)?))|i(?:s(?:NaN|Finite)|ndexOf|talics)|d(?:isableExternalCapture|ump|etachEvent)|u(?:n(?:shift|taint|escape|watch)|pdateCommands)|j(?:oin|avaEnabled)|p(?:o(?:p|w)|ush|lugins.refresh|a(?:ddings|rse(?:Int|Float)?)|r(?:int|ompt|eference))|e(?:scape|nableExternalCapture|val|lementFromPoint|x(?:p|ec(?:Script|Command)?))|valueOf|UTC|queryCommand(?:State|Indeterm|Enabled|Value)|f(?:i(?:nd|le(?:ModifiedDate|Size|CreatedDate|UpdatedDate)|xed)|o(?:nt(?:size|color)|rward)|loor|romCharCode)|watch|l(?:ink|o(?:ad|g)|astIndexOf)|a(?:sin|nchor|cos|t(?:tachEvent|ob|an(?:2)?)|pply|lert|b(?:s|ort))|r(?:ou(?:nd|teEvents)|e(?:size(?:By|To)|calc|turnValue|place|verse|l(?:oad|ease(?:Capture|Events)))|andom)|g(?:o|et(?:ResponseHeader|M(?:i(?:nutes|lliseconds)|onth)|Se(?:conds|lection)|Hours|Year|Time(?:zoneOffset)?|Da(?:y|te)|UTC(?:M(?:i(?:nutes|lliseconds)|onth)|Seconds|Hours|Da(?:y|te)|FullYear)|FullYear|A(?:ttention|llResponseHeaders)))|m(?:in|ove(?:B(?:y|elow)|To(?:Absolute)?|Above)|ergeAttributes|a(?:tch|rgins|x))|b(?:toa|ig|o(?:ld|rderWidths)|link|ack))\b(?=\()/
-            }, {
-                token : ["punctuation.operator", "support.function.dom"],
-                regex : /(\.)(s(?:ub(?:stringData|mit)|plitText|e(?:t(?:NamedItem|Attribute(?:Node)?)|lect))|has(?:ChildNodes|Feature)|namedItem|c(?:l(?:ick|o(?:se|neNode))|reate(?:C(?:omment|DATASection|aption)|T(?:Head|extNode|Foot)|DocumentFragment|ProcessingInstruction|E(?:ntityReference|lement)|Attribute))|tabIndex|i(?:nsert(?:Row|Before|Cell|Data)|tem)|open|delete(?:Row|C(?:ell|aption)|T(?:Head|Foot)|Data)|focus|write(?:ln)?|a(?:dd|ppend(?:Child|Data))|re(?:set|place(?:Child|Data)|move(?:NamedItem|Child|Attribute(?:Node)?)?)|get(?:NamedItem|Element(?:sBy(?:Name|TagName)|ById)|Attribute(?:Node)?)|blur)\b(?=\()/
-            }, {
-                token : ["punctuation.operator", "support.constant"],
-                regex : /(\.)(s(?:ystemLanguage|cr(?:ipts|ollbars|een(?:X|Y|Top|Left))|t(?:yle(?:Sheets)?|atus(?:Text|bar)?)|ibling(?:Below|Above)|ource|uffixes|e(?:curity(?:Policy)?|l(?:ection|f)))|h(?:istory|ost(?:name)?|as(?:h|Focus))|y|X(?:MLDocument|SLDocument)|n(?:ext|ame(?:space(?:s|URI)|Prop))|M(?:IN_VALUE|AX_VALUE)|c(?:haracterSet|o(?:n(?:structor|trollers)|okieEnabled|lorDepth|mp(?:onents|lete))|urrent|puClass|l(?:i(?:p(?:boardData)?|entInformation)|osed|asses)|alle(?:e|r)|rypto)|t(?:o(?:olbar|p)|ext(?:Transform|Indent|Decoration|Align)|ags)|SQRT(?:1_2|2)|i(?:n(?:ner(?:Height|Width)|put)|ds|gnoreCase)|zIndex|o(?:scpu|n(?:readystatechange|Line)|uter(?:Height|Width)|p(?:sProfile|ener)|ffscreenBuffering)|NEGATIVE_INFINITY|d(?:i(?:splay|alog(?:Height|Top|Width|Left|Arguments)|rectories)|e(?:scription|fault(?:Status|Ch(?:ecked|arset)|View)))|u(?:ser(?:Profile|Language|Agent)|n(?:iqueID|defined)|pdateInterval)|_content|p(?:ixelDepth|ort|ersonalbar|kcs11|l(?:ugins|atform)|a(?:thname|dding(?:Right|Bottom|Top|Left)|rent(?:Window|Layer)?|ge(?:X(?:Offset)?|Y(?:Offset)?))|r(?:o(?:to(?:col|type)|duct(?:Sub)?|mpter)|e(?:vious|fix)))|e(?:n(?:coding|abledPlugin)|x(?:ternal|pando)|mbeds)|v(?:isibility|endor(?:Sub)?|Linkcolor)|URLUnencoded|P(?:I|OSITIVE_INFINITY)|f(?:ilename|o(?:nt(?:Size|Family|Weight)|rmName)|rame(?:s|Element)|gColor)|E|whiteSpace|l(?:i(?:stStyleType|n(?:eHeight|kColor))|o(?:ca(?:tion(?:bar)?|lName)|wsrc)|e(?:ngth|ft(?:Context)?)|a(?:st(?:M(?:odified|atch)|Index|Paren)|yer(?:s|X)|nguage))|a(?:pp(?:MinorVersion|Name|Co(?:deName|re)|Version)|vail(?:Height|Top|Width|Left)|ll|r(?:ity|guments)|Linkcolor|bove)|r(?:ight(?:Context)?|e(?:sponse(?:XML|Text)|adyState))|global|x|m(?:imeTypes|ultiline|enubar|argin(?:Right|Bottom|Top|Left))|L(?:N(?:10|2)|OG(?:10E|2E))|b(?:o(?:ttom|rder(?:Width|RightWidth|BottomWidth|Style|Color|TopWidth|LeftWidth))|ufferDepth|elow|ackground(?:Color|Image)))\b/
-            }, {
-                token : ["storage.type", "punctuation.operator", "support.function.firebug"],
-                regex : /(console)(\.)(warn|info|log|error|time|timeEnd|assert)\b/
-            }, {
-                token : function(value) {
-                    if (globals.hasOwnProperty(value))
-                        return "variable.language";
-                    else if (deprecated.hasOwnProperty(value))
-                        return "invalid.deprecated";
-                    else if (definitions.hasOwnProperty(value))
-                        return "storage.type";
-                    else if (keywords.hasOwnProperty(value))
-                        return "keyword";
-                    else if (buildinConstants.hasOwnProperty(value))
-                        return "constant.language";
-                    else if (futureReserved.hasOwnProperty(value))
-                        return "invalid.illegal";
-                    else if (value == "debugger")
-                        return "invalid.deprecated";
-                    else
-                        return "identifier";
-                },
-                regex : identifierRe
-            }, {
-                token : "keyword.operator",
-                regex : /!|\$|%|&|\*|\-\-|\-|\+\+|\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\|\||\?\:|\*=|%=|\+=|\-=|&=|\^=|\b(?:in|instanceof|new|delete|typeof|void)/,
-                next  : "regex_allowed"
-            }, {
-                token : "punctuation.operator",
-                regex : /\?|\:|\,|\;|\./,
-                next  : "regex_allowed"
-            }, {
-                token : "paren.lparen",
-                regex : /[\[({]/,
-                next  : "regex_allowed"
-            }, {
-                token : "paren.rparen",
-                regex : /[\])}]/
-            }, {
-                token : "keyword.operator",
-                regex : /\/=?/,
-                next  : "regex_allowed"
-            }, {
-                token: "comment",
-                regex: /^#!.*$/
-            }, {
-                token : "text",
-                regex : /\s+/
-            }
-        ],
-        // regular expressions are only allowed after certain tokens. This
-        // makes sure we don't mix up regexps with the divison operator
-        "regex_allowed": [
-            {
-                token : "comment", // multi line comment
-                merge : true,
-                regex : "\\/\\*",
-                next : "comment_regex_allowed"
-            }, {
-                token : "comment",
-                regex : "\\/\\/.*$"
-            }, {
-                token: "string.regexp",
-                regex: "\\/",
-                next: "regex",
-                merge: true
-            }, {
-                token : "text",
-                regex : "\\s+"
-            }, {
-                // immediately return to the start mode without matching
-                // anything
-                token: "empty",
-                regex: "",
-                next: "start"
-            }
-        ],
-        "regex": [
-            {
-                token: "regexp.keyword.operator",
-                regex: "\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)",
-                next: "regex"
-            }, {
-				// flag
-                token: "string.regexp",
-                regex: "/\\w*",
-                next: "start",
-                merge: true
-            }, {
-                token: "string.regexp",
-                regex: "[^\\\\/\\[]+",
-                next: "regex",
-                merge: true
-            }, {
-                token: "string.regexp.charachterclass",
-                regex: "\\[",
-                next: "regex_character_class",
-                merge: true
-            }, {
-                token: "empty",
-                regex: "",
-                next: "start"
-            }
-        ],
-        "regex_character_class": [
-            {
-                token: "regexp.keyword.operator",
-                regex: "\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)",
-                next: "regex_character_class"
-            }, {
-                token: "string.regexp.charachterclass",
-                regex: "]",
-                next: "regex",
-                merge: true
-            }, {
-                token: "string.regexp.charachterclass",
-                regex: "[^\\\\\\]]+",
-                next: "regex_character_class",
-                merge: true
-            }, {
-                token: "empty",
-                regex: "",
-                next: "start"
-            }
-        ],
-        "comment_regex_allowed" : [
-            {
-                token : "comment", // closing comment
-                regex : ".*?\\*\\/",
-                merge : true,
-                next : "regex_allowed"
-            }, {
-                token : "comment", // comment spanning whole line
-                merge : true,
-                regex : ".+"
-            }
-        ],
-        "comment" : [
-            {
-                token : "comment", // closing comment
-                regex : ".*?\\*\\/",
-                merge : true,
-                next : "start"
-            }, {
-                token : "comment", // comment spanning whole line
-                merge : true,
-                regex : ".+"
-            }
-        ],
-        "qqstring" : [
-            {
-                token : "constant.language.escape",
-                regex : escapedRe
-            }, {
-                token : "string",
-                regex : '[^"\\\\]+'
-            }, {
-                token : "string",
-                regex : '"',
-                next  : "start"
-            }
-        ],
-        "qstring" : [
-            {
-                token : "constant.language.escape",
-                regex : escapedRe
-            }, {
-                token : "string",
-                regex : "[^'\\\\]+"
-            }, {
-                token : "string",
-                regex : "'",
-                next  : "start"
-            }
-        ]
-    };
-
-    this.embedRules(DocCommentHighlightRules, "doc-",
-        [ new DocCommentHighlightRules().getEndRule("start") ]);
-};
-
-oop.inherits(JavaScriptHighlightRules, TextHighlightRules);
-
-exports.JavaScriptHighlightRules = JavaScriptHighlightRules;
-});
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/doc_comment_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-
-var DocCommentHighlightRules = function() {
-
-    this.$rules = {
-        "start" : [ {
-            token : "comment.doc.tag",
-            regex : "@[\\w\\d_]+" // TODO: fix email addresses
-        }, {
-            token : "comment.doc",
-            merge : true,
-            regex : "\\s+"
-        }, {
-            token : "comment.doc",
-            merge : true,
-            regex : "TODO"
-        }, {
-            token : "comment.doc",
-            merge : true,
-            regex : "[^@\\*]+"
-        }, {
-            token : "comment.doc",
-            merge : true,
-            regex : "."
-        }]
-    };
-};
-
-oop.inherits(DocCommentHighlightRules, TextHighlightRules);
-
-(function() {
-
-    this.getStartRule = function(start) {
-        return {
-            token : "comment.doc", // doc comment
-            merge : true,
-            regex : "\\/\\*(?=\\*)",
-            next  : start
-        };
-    };
-    
-    this.getEndRule = function (start) {
-        return {
-            token : "comment.doc", // closing comment
-            merge : true,
-            regex : "\\*\\/",
-            next  : start
-        };
-    };
-
-}).call(DocCommentHighlightRules.prototype);
-
-exports.DocCommentHighlightRules = DocCommentHighlightRules;
-
-});
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/matching_brace_outdent', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
-"use strict";
-
-var Range = require("../range").Range;
-
-var MatchingBraceOutdent = function() {};
-
-(function() {
-
-    this.checkOutdent = function(line, input) {
-        if (! /^\s+$/.test(line))
-            return false;
-
-        return /^\s*\}/.test(input);
-    };
-
-    this.autoOutdent = function(doc, row) {
-        var line = doc.getLine(row);
-        var match = line.match(/^(\s*\})/);
-
-        if (!match) return 0;
-
-        var column = match[1].length;
-        var openBracePos = doc.findMatchingBracket({row: row, column: column});
-
-        if (!openBracePos || openBracePos.row == row) return 0;
-
-        var indent = this.$getIndent(doc.getLine(openBracePos.row));
-        doc.replace(new Range(row, 0, row, column-1), indent);
-    };
-
-    this.$getIndent = function(line) {
-        var match = line.match(/^(\s+)/);
-        if (match) {
-            return match[1];
-        }
-
-        return "";
-    };
-
-}).call(MatchingBraceOutdent.prototype);
-
-exports.MatchingBraceOutdent = MatchingBraceOutdent;
-});
-/* vim:ts=4:sts=4:sw=4:
- * ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Chris Spencer <chris.ag.spencer AT googlemail DOT com>
- *
- * 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 ***** */
-
-define('ace/mode/behaviour/cstyle', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/behaviour'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../../lib/oop");
-var Behaviour = require('../behaviour').Behaviour;
-
-var CstyleBehaviour = function () {
-
-    this.add("braces", "insertion", function (state, action, editor, session, text) {
-        if (text == '{') {
-            var selection = editor.getSelectionRange();
-            var selected = session.doc.getTextRange(selection);
-            if (selected !== "") {
-                return {
-                    text: '{' + selected + '}',
-                    selection: false
-                };
-            } else {
-                return {
-                    text: '{}',
-                    selection: [1, 1]
-                };
-            }
-        } else if (text == '}') {
-            var cursor = editor.getCursorPosition();
-            var line = session.doc.getLine(cursor.row);
-            var rightChar = line.substring(cursor.column, cursor.column + 1);
-            if (rightChar == '}') {
-                var matching = session.$findOpeningBracket('}', {column: cursor.column + 1, row: cursor.row});
-                if (matching !== null) {
-                    return {
-                        text: '',
-                        selection: [1, 1]
-                    };
-                }
-            }
-        } else if (text == "\n") {
-            var cursor = editor.getCursorPosition();
-            var line = session.doc.getLine(cursor.row);
-            var rightChar = line.substring(cursor.column, cursor.column + 1);
-            if (rightChar == '}') {
-                var openBracePos = session.findMatchingBracket({row: cursor.row, column: cursor.column + 1});
-                if (!openBracePos)
-                     return null;
-
-                var indent = this.getNextLineIndent(state, line.substring(0, line.length - 1), session.getTabString());
-                var next_indent = this.$getIndent(session.doc.getLine(openBracePos.row));
-
-                return {
-                    text: '\n' + indent + '\n' + next_indent,
-                    selection: [1, indent.length, 1, indent.length]
-                };
-            }
-        }
-    });
-
-    this.add("braces", "deletion", function (state, action, editor, session, range) {
-        var selected = session.doc.getTextRange(range);
-        if (!range.isMultiLine() && selected == '{') {
-            var line = session.doc.getLine(range.start.row);
-            var rightChar = line.substring(range.end.column, range.end.column + 1);
-            if (rightChar == '}') {
-                range.end.column++;
-                return range;
-            }
-        }
-    });
-
-    this.add("parens", "insertion", function (state, action, editor, session, text) {
-        if (text == '(') {
-            var selection = editor.getSelectionRange();
-            var selected = session.doc.getTextRange(selection);
-            if (selected !== "") {
-                return {
-                    text: '(' + selected + ')',
-                    selection: false
-                };
-            } else {
-                return {
-                    text: '()',
-                    selection: [1, 1]
-                };
-            }
-        } else if (text == ')') {
-            var cursor = editor.getCursorPosition();
-            var line = session.doc.getLine(cursor.row);
-            var rightChar = line.substring(cursor.column, cursor.column + 1);
-            if (rightChar == ')') {
-                var matching = session.$findOpeningBracket(')', {column: cursor.column + 1, row: cursor.row});
-                if (matching !== null) {
-                    return {
-                        text: '',
-                        selection: [1, 1]
-                    };
-                }
-            }
-        }
-    });
-
-    this.add("parens", "deletion", function (state, action, editor, session, range) {
-        var selected = session.doc.getTextRange(range);
-        if (!range.isMultiLine() && selected == '(') {
-            var line = session.doc.getLine(range.start.row);
-            var rightChar = line.substring(range.start.column + 1, range.start.column + 2);
-            if (rightChar == ')') {
-                range.end.column++;
-                return range;
-            }
-        }
-    });
-
-    this.add("string_dquotes", "insertion", function (state, action, editor, session, text) {
-        if (text == '"' || text == "'") {
-            var quote = text;
-            var selection = editor.getSelectionRange();
-            var selected = session.doc.getTextRange(selection);
-            if (selected !== "") {
-                return {
-                    text: quote + selected + quote,
-                    selection: false
-                };
-            } else {
-                var cursor = editor.getCursorPosition();
-                var line = session.doc.getLine(cursor.row);
-                var leftChar = line.substring(cursor.column-1, cursor.column);
-
-                // We're escaped.
-                if (leftChar == '\\') {
-                    return null;
-                }
-
-                // Find what token we're inside.
-                var tokens = session.getTokens(selection.start.row, selection.start.row)[0].tokens;
-                var col = 0, token;
-                var quotepos = -1; // Track whether we're inside an open quote.
-
-                for (var x = 0; x < tokens.length; x++) {
-                    token = tokens[x];
-                    if (token.type == "string") {
-                      quotepos = -1;
-                    } else if (quotepos < 0) {
-                      quotepos = token.value.indexOf(quote);
-                    }
-                    if ((token.value.length + col) > selection.start.column) {
-                        break;
-                    }
-                    col += tokens[x].value.length;
-                }
-
-                // Try and be smart about when we auto insert.
-                if (!token || (quotepos < 0 && token.type !== "comment" && (token.type !== "string" || ((selection.start.column !== token.value.length+col-1) && token.value.lastIndexOf(quote) === token.value.length-1)))) {
-                    return {
-                        text: quote + quote,
-                        selection: [1,1]
-                    };
-                } else if (token && token.type === "string") {
-                    // Ignore input and move right one if we're typing over the closing quote.
-                    var rightChar = line.substring(cursor.column, cursor.column + 1);
-                    if (rightChar == quote) {
-                        return {
-                            text: '',
-                            selection: [1, 1]
-                        };
-                    }
-                }
-            }
-        }
-    });
-
-    this.add("string_dquotes", "deletion", function (state, action, editor, session, range) {
-        var selected = session.doc.getTextRange(range);
-        if (!range.isMultiLine() && (selected == '"' || selected == "'")) {
-            var line = session.doc.getLine(range.start.row);
-            var rightChar = line.substring(range.start.column + 1, range.start.column + 2);
-            if (rightChar == '"') {
-                range.end.column++;
-                return range;
-            }
-        }
-    });
-
-};
-
-oop.inherits(CstyleBehaviour, Behaviour);
-
-exports.CstyleBehaviour = CstyleBehaviour;
-});/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/folding/cstyle', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/range', 'ace/mode/folding/fold_mode'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../../lib/oop");
-var Range = require("../../range").Range;
-var BaseFoldMode = require("./fold_mode").FoldMode;
-
-var FoldMode = exports.FoldMode = function() {};
-oop.inherits(FoldMode, BaseFoldMode);
-
-(function() {
-
-    this.foldingStartMarker = /(\{|\[)[^\}\]]*$|^\s*(\/\*)/;
-    this.foldingStopMarker = /^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/;
-    
-    this.getFoldWidgetRange = function(session, foldStyle, row) {
-        var line = session.getLine(row);
-        var match = line.match(this.foldingStartMarker);
-        if (match) {
-            var i = match.index;
-
-            if (match[1])
-                return this.openingBracketBlock(session, match[1], row, i);
-
-            var range = session.getCommentFoldRange(row, i + match[0].length);
-            range.end.column -= 2;
-            return range;
-        }
-
-        if (foldStyle !== "markbeginend")
-            return;
-            
-        var match = line.match(this.foldingStopMarker);
-        if (match) {
-            var i = match.index + match[0].length;
-
-            if (match[2]) {
-                var range = session.getCommentFoldRange(row, i);
-                range.end.column -= 2;
-                return range;
-            }
-
-            var end = {row: row, column: i};
-            var start = session.$findOpeningBracket(match[1], end);
-            
-            if (!start)
-                return;
-
-            start.column++;
-            end.column--;
-
-            return  Range.fromPoints(start, end);
-        }
-    };
-    
-}).call(FoldMode.prototype);
-
-});/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/folding/fold_mode', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
-"use strict";
-
-var Range = require("../../range").Range;
-
-var FoldMode = exports.FoldMode = function() {};
-
-(function() {
-
-    this.foldingStartMarker = null;
-    this.foldingStopMarker = null;
-
-    // must return "" if there's no fold, to enable caching
-    this.getFoldWidget = function(session, foldStyle, row) {
-        var line = session.getLine(row);
-        if (this.foldingStartMarker.test(line))
-            return "start";
-        if (foldStyle == "markbeginend"
-                && this.foldingStopMarker
-                && this.foldingStopMarker.test(line))
-            return "end";
-        return "";
-    };
-    
-    this.getFoldWidgetRange = function(session, foldStyle, row) {
-        return null;
-    };
-
-    this.indentationBlock = function(session, row, column) {
-        var re = /^\s*/;
-        var startRow = row;
-        var endRow = row;
-        var line = session.getLine(row);
-        var startColumn = column || line.length;
-        var startLevel = line.match(re)[0].length;
-        var maxRow = session.getLength()
-        
-        while (++row < maxRow) {
-            line = session.getLine(row);
-            var level = line.match(re)[0].length;
-
-            if (level == line.length)
-                continue;
-
-            if (level <= startLevel)
-                break;
-
-            endRow = row;
-        }
-
-        if (endRow > startRow) {
-            var endColumn = session.getLine(endRow).length;
-            return new Range(startRow, startColumn, endRow, endColumn);
-        }
-    };
-
-    this.openingBracketBlock = function(session, bracket, row, column) {
-        var start = {row: row, column: column + 1};
-        var end = session.$findClosingBracket(bracket, start);
-        if (!end)
-            return;
-
-        var fw = session.foldWidgets[end.row];
-        if (fw == null)
-            fw = this.getFoldWidget(session, end.row);
-
-        if (fw == "start") {
-            end.row --;
-            end.column = session.getLine(end.row).length;
-        }
-        return Range.fromPoints(start, end);
-    };
-
-}).call(FoldMode.prototype);
-
-});
diff --git a/apps/files_texteditor/js/aceeditor/mode-javascript.js b/apps/files_texteditor/js/aceeditor/mode-javascript.js
deleted file mode 100644
index a456dad386..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-javascript.js
+++ /dev/null
@@ -1 +0,0 @@
-define("ace/mode/javascript",["require","exports","module","ace/lib/oop","ace/mode/text","ace/tokenizer","ace/mode/javascript_highlight_rules","ace/mode/matching_brace_outdent","ace/range","ace/worker/worker_client","ace/mode/behaviour/cstyle","ace/mode/folding/cstyle"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text").Mode,f=a("../tokenizer").Tokenizer,g=a("./javascript_highlight_rules").JavaScriptHighlightRules,h=a("./matching_brace_outdent").MatchingBraceOutdent,i=a("../range").Range,j=a("../worker/worker_client").WorkerClient,k=a("./behaviour/cstyle").CstyleBehaviour,l=a("./folding/cstyle").FoldMode,m=function(){this.$tokenizer=new f((new g).getRules()),this.$outdent=new h,this.$behaviour=new k,this.foldingRules=new l};d.inherits(m,e),function(){this.toggleCommentLines=function(a,b,c,d){var e=!0,f=/^(\s*)\/\//;for(var g=c;g<=d;g++)if(!f.test(b.getLine(g))){e=!1;break}if(e){var h=new i(0,0,0,0);for(var g=c;g<=d;g++){var j=b.getLine(g),k=j.match(f);h.start.row=g,h.end.row=g,h.end.column=k[0].length,b.replace(h,k[1])}}else b.indentRows(c,d,"//")},this.getNextLineIndent=function(a,b,c){var d=this.$getIndent(b),e=this.$tokenizer.getLineTokens(b,a),f=e.tokens,g=e.state;if(f.length&&f[f.length-1].type=="comment")return d;if(a=="start"||a=="regex_allowed"){var h=b.match(/^.*(?:\bcase\b.*\:|[\{\(\[])\s*$/);h&&(d+=c)}else if(a=="doc-start"){if(g=="start"||a=="regex_allowed")return"";var h=b.match(/^\s*(\/?)\*/);h&&(h[1]&&(d+=" "),d+="* ")}return d},this.checkOutdent=function(a,b,c){return this.$outdent.checkOutdent(b,c)},this.autoOutdent=function(a,b,c){this.$outdent.autoOutdent(b,c)},this.createWorker=function(a){var b=new j(["ace"],"worker-javascript.js","ace/mode/javascript_worker","JavaScriptWorker");return b.attachToDocument(a.getDocument()),b.on("jslint",function(b){var c=[];for(var d=0;d<b.data.length;d++){var e=b.data[d];e&&c.push({row:e.line-1,column:e.character-1,text:e.reason,type:"warning",lint:e})}a.setAnnotations(c)}),b.on("narcissus",function(b){a.setAnnotations([b.data])}),b.on("terminate",function(){a.clearAnnotations()}),b}}.call(m.prototype),b.Mode=m}),define("ace/mode/javascript_highlight_rules",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/unicode","ace/mode/doc_comment_highlight_rules","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("../lib/lang"),f=a("../unicode"),g=a("./doc_comment_highlight_rules").DocCommentHighlightRules,h=a("./text_highlight_rules").TextHighlightRules,i=function(){var a=e.arrayToMap("Array|Boolean|Date|Function|Iterator|Number|Object|RegExp|String|Proxy|Namespace|QName|XML|XMLList|ArrayBuffer|Float32Array|Float64Array|Int16Array|Int32Array|Int8Array|Uint16Array|Uint32Array|Uint8Array|Uint8ClampedArray|Error|EvalError|InternalError|RangeError|ReferenceError|StopIteration|SyntaxError|TypeError|URIError|decodeURI|decodeURIComponent|encodeURI|encodeURIComponent|eval|isFinite|isNaN|parseFloat|parseInt|JSON|Math|this|arguments|prototype|window|document".split("|")),b=e.arrayToMap("break|case|catch|continue|default|delete|do|else|finally|for|function|if|in|instanceof|new|return|switch|throw|try|typeof|let|var|while|with|const|yield|import|get|set".split("|")),c="case|do|else|finally|in|instanceof|return|throw|try|typeof|yield",d=e.arrayToMap("__parent__|__count__|escape|unescape|with|__proto__".split("|")),h=e.arrayToMap("const|let|var|function".split("|")),i=e.arrayToMap("null|Infinity|NaN|undefined".split("|")),j=e.arrayToMap("class|enum|extends|super|export|implements|private|public|interface|package|protected|static".split("|")),k="["+f.packages.L+"\\$_]["+f.packages.L+f.packages.Mn+f.packages.Mc+f.packages.Nd+f.packages.Pc+"\\$_]*\\b",l="\\\\(?:x[0-9a-fA-F]{2}|u[0-9a-fA-F]{4}|[0-2][0-7]{0,2}|3[0-6][0-7]?|37[0-7]?|[4-7][0-7]?|.)";this.$rules={start:[{token:"comment",regex:/\/\/.*$/},(new g).getStartRule("doc-start"),{token:"comment",merge:!0,regex:/\/\*/,next:"comment"},{token:"string",regex:"'",next:"qstring"},{token:"string",regex:'"',next:"qqstring"},{token:"constant.numeric",regex:/0[xX][0-9a-fA-F]+\b/},{token:"constant.numeric",regex:/[+-]?\d+(?:(?:\.\d*)?(?:[eE][+-]?\d+)?)?\b/},{token:["storage.type","punctuation.operator","support.function","punctuation.operator","entity.name.function","text","keyword.operator","text","storage.type","text","paren.lparen","variable.parameter","paren.rparen"],regex:"("+k+")(\\.)(prototype)(\\.)("+k+")(\\s*)(=)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"},{token:["storage.type","punctuation.operator","support.function","punctuation.operator","entity.name.function","text","keyword.operator","text"],regex:"("+k+")(\\.)(prototype)(\\.)("+k+")(\\s*)(=)(\\s*)"},{token:["storage.type","punctuation.operator","entity.name.function","text","keyword.operator","text","storage.type","text","paren.lparen","variable.parameter","paren.rparen"],regex:"("+k+")(\\.)("+k+")(\\s*)(=)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"},{token:["entity.name.function","text","keyword.operator","text","storage.type","text","paren.lparen","variable.parameter","paren.rparen"],regex:"("+k+")(\\s*)(=)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"},{token:["storage.type","text","entity.name.function","text","paren.lparen","variable.parameter","paren.rparen"],regex:"(function)(\\s+)("+k+")(\\s*)(\\()(.*?)(\\))"},{token:["entity.name.function","text","punctuation.operator","text","storage.type","text","paren.lparen","variable.parameter","paren.rparen"],regex:"("+k+")(\\s*)(:)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"},{token:["text","text","storage.type","text","paren.lparen","variable.parameter","paren.rparen"],regex:"(:)(\\s*)(function)?(\\s*)(\\()([^)]*)(\\))"},{token:"constant.language.boolean",regex:/(?:true|false)\b/},{token:"keyword",regex:"(?:"+c+")\\b",next:"regex_allowed"},{token:["punctuation.operator","support.function"],regex:/(\.)(s(?:h(?:ift|ow(?:Mod(?:elessDialog|alDialog)|Help))|croll(?:X|By(?:Pages|Lines)?|Y|To)?|t(?:opzzzz|rike)|i(?:n|zeToContent|debar|gnText)|ort|u(?:p|b(?:str(?:ing)?)?)|pli(?:ce|t)|e(?:nd|t(?:Re(?:sizable|questHeader)|M(?:i(?:nutes|lliseconds)|onth)|Seconds|Ho(?:tKeys|urs)|Year|Cursor|Time(?:out)?|Interval|ZOptions|Date|UTC(?:M(?:i(?:nutes|lliseconds)|onth)|Seconds|Hours|Date|FullYear)|FullYear|Active)|arch)|qrt|lice|avePreferences|mall)|h(?:ome|andleEvent)|navigate|c(?:har(?:CodeAt|At)|o(?:s|n(?:cat|textual|firm)|mpile)|eil|lear(?:Timeout|Interval)?|a(?:ptureEvents|ll)|reate(?:StyleSheet|Popup|EventObject))|t(?:o(?:GMTString|S(?:tring|ource)|U(?:TCString|pperCase)|Lo(?:caleString|werCase))|est|a(?:n|int(?:Enabled)?))|i(?:s(?:NaN|Finite)|ndexOf|talics)|d(?:isableExternalCapture|ump|etachEvent)|u(?:n(?:shift|taint|escape|watch)|pdateCommands)|j(?:oin|avaEnabled)|p(?:o(?:p|w)|ush|lugins.refresh|a(?:ddings|rse(?:Int|Float)?)|r(?:int|ompt|eference))|e(?:scape|nableExternalCapture|val|lementFromPoint|x(?:p|ec(?:Script|Command)?))|valueOf|UTC|queryCommand(?:State|Indeterm|Enabled|Value)|f(?:i(?:nd|le(?:ModifiedDate|Size|CreatedDate|UpdatedDate)|xed)|o(?:nt(?:size|color)|rward)|loor|romCharCode)|watch|l(?:ink|o(?:ad|g)|astIndexOf)|a(?:sin|nchor|cos|t(?:tachEvent|ob|an(?:2)?)|pply|lert|b(?:s|ort))|r(?:ou(?:nd|teEvents)|e(?:size(?:By|To)|calc|turnValue|place|verse|l(?:oad|ease(?:Capture|Events)))|andom)|g(?:o|et(?:ResponseHeader|M(?:i(?:nutes|lliseconds)|onth)|Se(?:conds|lection)|Hours|Year|Time(?:zoneOffset)?|Da(?:y|te)|UTC(?:M(?:i(?:nutes|lliseconds)|onth)|Seconds|Hours|Da(?:y|te)|FullYear)|FullYear|A(?:ttention|llResponseHeaders)))|m(?:in|ove(?:B(?:y|elow)|To(?:Absolute)?|Above)|ergeAttributes|a(?:tch|rgins|x))|b(?:toa|ig|o(?:ld|rderWidths)|link|ack))\b(?=\()/},{token:["punctuation.operator","support.function.dom"],regex:/(\.)(s(?:ub(?:stringData|mit)|plitText|e(?:t(?:NamedItem|Attribute(?:Node)?)|lect))|has(?:ChildNodes|Feature)|namedItem|c(?:l(?:ick|o(?:se|neNode))|reate(?:C(?:omment|DATASection|aption)|T(?:Head|extNode|Foot)|DocumentFragment|ProcessingInstruction|E(?:ntityReference|lement)|Attribute))|tabIndex|i(?:nsert(?:Row|Before|Cell|Data)|tem)|open|delete(?:Row|C(?:ell|aption)|T(?:Head|Foot)|Data)|focus|write(?:ln)?|a(?:dd|ppend(?:Child|Data))|re(?:set|place(?:Child|Data)|move(?:NamedItem|Child|Attribute(?:Node)?)?)|get(?:NamedItem|Element(?:sBy(?:Name|TagName)|ById)|Attribute(?:Node)?)|blur)\b(?=\()/},{token:["punctuation.operator","support.constant"],regex:/(\.)(s(?:ystemLanguage|cr(?:ipts|ollbars|een(?:X|Y|Top|Left))|t(?:yle(?:Sheets)?|atus(?:Text|bar)?)|ibling(?:Below|Above)|ource|uffixes|e(?:curity(?:Policy)?|l(?:ection|f)))|h(?:istory|ost(?:name)?|as(?:h|Focus))|y|X(?:MLDocument|SLDocument)|n(?:ext|ame(?:space(?:s|URI)|Prop))|M(?:IN_VALUE|AX_VALUE)|c(?:haracterSet|o(?:n(?:structor|trollers)|okieEnabled|lorDepth|mp(?:onents|lete))|urrent|puClass|l(?:i(?:p(?:boardData)?|entInformation)|osed|asses)|alle(?:e|r)|rypto)|t(?:o(?:olbar|p)|ext(?:Transform|Indent|Decoration|Align)|ags)|SQRT(?:1_2|2)|i(?:n(?:ner(?:Height|Width)|put)|ds|gnoreCase)|zIndex|o(?:scpu|n(?:readystatechange|Line)|uter(?:Height|Width)|p(?:sProfile|ener)|ffscreenBuffering)|NEGATIVE_INFINITY|d(?:i(?:splay|alog(?:Height|Top|Width|Left|Arguments)|rectories)|e(?:scription|fault(?:Status|Ch(?:ecked|arset)|View)))|u(?:ser(?:Profile|Language|Agent)|n(?:iqueID|defined)|pdateInterval)|_content|p(?:ixelDepth|ort|ersonalbar|kcs11|l(?:ugins|atform)|a(?:thname|dding(?:Right|Bottom|Top|Left)|rent(?:Window|Layer)?|ge(?:X(?:Offset)?|Y(?:Offset)?))|r(?:o(?:to(?:col|type)|duct(?:Sub)?|mpter)|e(?:vious|fix)))|e(?:n(?:coding|abledPlugin)|x(?:ternal|pando)|mbeds)|v(?:isibility|endor(?:Sub)?|Linkcolor)|URLUnencoded|P(?:I|OSITIVE_INFINITY)|f(?:ilename|o(?:nt(?:Size|Family|Weight)|rmName)|rame(?:s|Element)|gColor)|E|whiteSpace|l(?:i(?:stStyleType|n(?:eHeight|kColor))|o(?:ca(?:tion(?:bar)?|lName)|wsrc)|e(?:ngth|ft(?:Context)?)|a(?:st(?:M(?:odified|atch)|Index|Paren)|yer(?:s|X)|nguage))|a(?:pp(?:MinorVersion|Name|Co(?:deName|re)|Version)|vail(?:Height|Top|Width|Left)|ll|r(?:ity|guments)|Linkcolor|bove)|r(?:ight(?:Context)?|e(?:sponse(?:XML|Text)|adyState))|global|x|m(?:imeTypes|ultiline|enubar|argin(?:Right|Bottom|Top|Left))|L(?:N(?:10|2)|OG(?:10E|2E))|b(?:o(?:ttom|rder(?:Width|RightWidth|BottomWidth|Style|Color|TopWidth|LeftWidth))|ufferDepth|elow|ackground(?:Color|Image)))\b/},{token:["storage.type","punctuation.operator","support.function.firebug"],regex:/(console)(\.)(warn|info|log|error|time|timeEnd|assert)\b/},{token:function(c){return a.hasOwnProperty(c)?"variable.language":d.hasOwnProperty(c)?"invalid.deprecated":h.hasOwnProperty(c)?"storage.type":b.hasOwnProperty(c)?"keyword":i.hasOwnProperty(c)?"constant.language":j.hasOwnProperty(c)?"invalid.illegal":c=="debugger"?"invalid.deprecated":"identifier"},regex:k},{token:"keyword.operator",regex:/!|\$|%|&|\*|\-\-|\-|\+\+|\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\|\||\?\:|\*=|%=|\+=|\-=|&=|\^=|\b(?:in|instanceof|new|delete|typeof|void)/,next:"regex_allowed"},{token:"punctuation.operator",regex:/\?|\:|\,|\;|\./,next:"regex_allowed"},{token:"paren.lparen",regex:/[\[({]/,next:"regex_allowed"},{token:"paren.rparen",regex:/[\])}]/},{token:"keyword.operator",regex:/\/=?/,next:"regex_allowed"},{token:"comment",regex:/^#!.*$/},{token:"text",regex:/\s+/}],regex_allowed:[{token:"comment",merge:!0,regex:"\\/\\*",next:"comment_regex_allowed"},{token:"comment",regex:"\\/\\/.*$"},{token:"string.regexp",regex:"\\/",next:"regex",merge:!0},{token:"text",regex:"\\s+"},{token:"empty",regex:"",next:"start"}],regex:[{token:"regexp.keyword.operator",regex:"\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)",next:"regex"},{token:"string.regexp",regex:"/\\w*",next:"start",merge:!0},{token:"string.regexp",regex:"[^\\\\/\\[]+",next:"regex",merge:!0},{token:"string.regexp.charachterclass",regex:"\\[",next:"regex_character_class",merge:!0},{token:"empty",regex:"",next:"start"}],regex_character_class:[{token:"regexp.keyword.operator",regex:"\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)",next:"regex_character_class"},{token:"string.regexp.charachterclass",regex:"]",next:"regex",merge:!0},{token:"string.regexp.charachterclass",regex:"[^\\\\\\]]+",next:"regex_character_class",merge:!0},{token:"empty",regex:"",next:"start"}],comment_regex_allowed:[{token:"comment",regex:".*?\\*\\/",merge:!0,next:"regex_allowed"},{token:"comment",merge:!0,regex:".+"}],comment:[{token:"comment",regex:".*?\\*\\/",merge:!0,next:"start"},{token:"comment",merge:!0,regex:".+"}],qqstring:[{token:"constant.language.escape",regex:l},{token:"string",regex:'[^"\\\\]+'},{token:"string",regex:'"',next:"start"}],qstring:[{token:"constant.language.escape",regex:l},{token:"string",regex:"[^'\\\\]+"},{token:"string",regex:"'",next:"start"}]},this.embedRules(g,"doc-",[(new g).getEndRule("start")])};d.inherits(i,h),b.JavaScriptHighlightRules=i}),define("ace/mode/doc_comment_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text_highlight_rules").TextHighlightRules,f=function(){this.$rules={start:[{token:"comment.doc.tag",regex:"@[\\w\\d_]+"},{token:"comment.doc",merge:!0,regex:"\\s+"},{token:"comment.doc",merge:!0,regex:"TODO"},{token:"comment.doc",merge:!0,regex:"[^@\\*]+"},{token:"comment.doc",merge:!0,regex:"."}]}};d.inherits(f,e),function(){this.getStartRule=function(a){return{token:"comment.doc",merge:!0,regex:"\\/\\*(?=\\*)",next:a}},this.getEndRule=function(a){return{token:"comment.doc",merge:!0,regex:"\\*\\/",next:a}}}.call(f.prototype),b.DocCommentHighlightRules=f}),define("ace/mode/matching_brace_outdent",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../range").Range,e=function(){};(function(){this.checkOutdent=function(a,b){return/^\s+$/.test(a)?/^\s*\}/.test(b):!1},this.autoOutdent=function(a,b){var c=a.getLine(b),e=c.match(/^(\s*\})/);if(!e)return 0;var f=e[1].length,g=a.findMatchingBracket({row:b,column:f});if(!g||g.row==b)return 0;var h=this.$getIndent(a.getLine(g.row));a.replace(new d(b,0,b,f-1),h)},this.$getIndent=function(a){var b=a.match(/^(\s+)/);return b?b[1]:""}}).call(e.prototype),b.MatchingBraceOutdent=e}),define("ace/mode/behaviour/cstyle",["require","exports","module","ace/lib/oop","ace/mode/behaviour"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../behaviour").Behaviour,f=function(){this.add("braces","insertion",function(a,b,c,d,e){if(e=="{"){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"{"+g+"}",selection:!1}:{text:"{}",selection:[1,1]}}if(e=="}"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var k=d.$findOpeningBracket("}",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}else if(e=="\n"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var l=d.findMatchingBracket({row:h.row,column:h.column+1});if(!l)return null;var m=this.getNextLineIndent(a,i.substring(0,i.length-1),d.getTabString()),n=this.$getIndent(d.doc.getLine(l.row));return{text:"\n"+m+"\n"+n,selection:[1,m.length,1,m.length]}}}}),this.add("braces","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="{"){var g=d.doc.getLine(e.start.row),h=g.substring(e.end.column,e.end.column+1);if(h=="}")return e.end.column++,e}}),this.add("parens","insertion",function(a,b,c,d,e){if(e=="("){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"("+g+")",selection:!1}:{text:"()",selection:[1,1]}}if(e==")"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j==")"){var k=d.$findOpeningBracket(")",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}}),this.add("parens","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="("){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h==")")return e.end.column++,e}}),this.add("string_dquotes","insertion",function(a,b,c,d,e){if(e=='"'||e=="'"){var f=e,g=c.getSelectionRange(),h=d.doc.getTextRange(g);if(h!=="")return{text:f+h+f,selection:!1};var i=c.getCursorPosition(),j=d.doc.getLine(i.row),k=j.substring(i.column-1,i.column);if(k=="\\")return null;var l=d.getTokens(g.start.row,g.start.row)[0].tokens,m=0,n,o=-1;for(var p=0;p<l.length;p++){n=l[p],n.type=="string"?o=-1:o<0&&(o=n.value.indexOf(f));if(n.value.length+m>g.start.column)break;m+=l[p].value.length}if(!n||o<0&&n.type!=="comment"&&(n.type!=="string"||g.start.column!==n.value.length+m-1&&n.value.lastIndexOf(f)===n.value.length-1))return{text:f+f,selection:[1,1]};if(n&&n.type==="string"){var q=j.substring(i.column,i.column+1);if(q==f)return{text:"",selection:[1,1]}}}}),this.add("string_dquotes","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&(f=='"'||f=="'")){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h=='"')return e.end.column++,e}})};d.inherits(f,e),b.CstyleBehaviour=f}),define("ace/mode/folding/cstyle",["require","exports","module","ace/lib/oop","ace/range","ace/mode/folding/fold_mode"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../../range").Range,f=a("./fold_mode").FoldMode,g=b.FoldMode=function(){};d.inherits(g,f),function(){this.foldingStartMarker=/(\{|\[)[^\}\]]*$|^\s*(\/\*)/,this.foldingStopMarker=/^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/,this.getFoldWidgetRange=function(a,b,c){var d=a.getLine(c),f=d.match(this.foldingStartMarker);if(f){var g=f.index;if(f[1])return this.openingBracketBlock(a,f[1],c,g);var h=a.getCommentFoldRange(c,g+f[0].length);return h.end.column-=2,h}if(b!=="markbeginend")return;var f=d.match(this.foldingStopMarker);if(f){var g=f.index+f[0].length;if(f[2]){var h=a.getCommentFoldRange(c,g);return h.end.column-=2,h}var i={row:c,column:g},j=a.$findOpeningBracket(f[1],i);if(!j)return;return j.column++,i.column--,e.fromPoints(j,i)}}}.call(g.prototype)}),define("ace/mode/folding/fold_mode",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../../range").Range,e=b.FoldMode=function(){};(function(){this.foldingStartMarker=null,this.foldingStopMarker=null,this.getFoldWidget=function(a,b,c){var d=a.getLine(c);return this.foldingStartMarker.test(d)?"start":b=="markbeginend"&&this.foldingStopMarker&&this.foldingStopMarker.test(d)?"end":""},this.getFoldWidgetRange=function(a,b,c){return null},this.indentationBlock=function(a,b,c){var e=/^\s*/,f=b,g=b,h=a.getLine(b),i=c||h.length,j=h.match(e)[0].length,k=a.getLength();while(++b<k){h=a.getLine(b);var l=h.match(e)[0].length;if(l==h.length)continue;if(l<=j)break;g=b}if(g>f){var m=a.getLine(g).length;return new d(f,i,g,m)}},this.openingBracketBlock=function(a,b,c,e){var f={row:c,column:e+1},g=a.$findClosingBracket(b,f);if(!g)return;var h=a.foldWidgets[g.row];return h==null&&(h=this.getFoldWidget(a,g.row)),h=="start"&&(g.row--,g.column=a.getLine(g.row).length),d.fromPoints(f,g)}}).call(e.prototype)})
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/mode-json-uncompressed.js b/apps/files_texteditor/js/aceeditor/mode-json-uncompressed.js
deleted file mode 100644
index 22399889f3..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-json-uncompressed.js
+++ /dev/null
@@ -1,698 +0,0 @@
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/json', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text', 'ace/tokenizer', 'ace/mode/json_highlight_rules', 'ace/mode/matching_brace_outdent', 'ace/mode/behaviour/cstyle', 'ace/mode/folding/cstyle', 'ace/worker/worker_client'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
-var HighlightRules = require("./json_highlight_rules").JsonHighlightRules;
-var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
-var CstyleBehaviour = require("./behaviour/cstyle").CstyleBehaviour;
-var CStyleFoldMode = require("./folding/cstyle").FoldMode;
-var WorkerClient = require("../worker/worker_client").WorkerClient;
-
-var Mode = function() {
-    this.$tokenizer = new Tokenizer(new HighlightRules().getRules());
-    this.$outdent = new MatchingBraceOutdent();
-    this.$behaviour = new CstyleBehaviour();
-    this.foldingRules = new CStyleFoldMode();
-};
-oop.inherits(Mode, TextMode);
-
-(function() {
-
-    this.getNextLineIndent = function(state, line, tab) {
-        var indent = this.$getIndent(line);
-
-        if (state == "start") {
-            var match = line.match(/^.*[\{\(\[]\s*$/);
-            if (match) {
-                indent += tab;
-            }
-        }
-
-        return indent;
-    };
-
-    this.checkOutdent = function(state, line, input) {
-        return this.$outdent.checkOutdent(line, input);
-    };
-
-    this.autoOutdent = function(state, doc, row) {
-        this.$outdent.autoOutdent(doc, row);
-    };
-
-    this.createWorker = function(session) {
-        var worker = new WorkerClient(["ace"], "worker-json.js", "ace/mode/json_worker", "JsonWorker");
-        worker.attachToDocument(session.getDocument());
-
-        worker.on("error", function(e) {
-            session.setAnnotations([e.data]);
-        });
-
-        worker.on("ok", function() {
-            session.clearAnnotations();
-        });
-
-        return worker;
-    };
-
-
-}).call(Mode.prototype);
-
-exports.Mode = Mode;
-});/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *      Mihai Sucan <mihai DOT sucan AT gmail DOT com>
- *
- * 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 ***** */
-
-define('ace/mode/json_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-
-var JsonHighlightRules = function() {
-
-    // regexp must not have capturing parentheses. Use (?:) instead.
-    // regexps are ordered -> the first match is used
-    this.$rules = {
-        "start" : [
-            {
-                token : "string", // single line
-                regex : '["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'
-            }, {
-                token : "constant.numeric", // hex
-                regex : "0[xX][0-9a-fA-F]+\\b"
-            }, {
-                token : "constant.numeric", // float
-                regex : "[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"
-            }, {
-                token : "constant.language.boolean",
-                regex : "(?:true|false)\\b"
-            }, {
-                token : "invalid.illegal", // single quoted strings are not allowed
-                regex : "['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"
-            }, {
-                token : "invalid.illegal", // comments are not allowed
-                regex : "\\/\\/.*$"
-            }, {
-                token : "paren.lparen",
-                regex : "[[({]"
-            }, {
-                token : "paren.rparen",
-                regex : "[\\])}]"
-            }, {
-                token : "text",
-                regex : "\\s+"
-            }
-        ]
-    };
-    
-};
-
-oop.inherits(JsonHighlightRules, TextHighlightRules);
-
-exports.JsonHighlightRules = JsonHighlightRules;
-});
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/matching_brace_outdent', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
-"use strict";
-
-var Range = require("../range").Range;
-
-var MatchingBraceOutdent = function() {};
-
-(function() {
-
-    this.checkOutdent = function(line, input) {
-        if (! /^\s+$/.test(line))
-            return false;
-
-        return /^\s*\}/.test(input);
-    };
-
-    this.autoOutdent = function(doc, row) {
-        var line = doc.getLine(row);
-        var match = line.match(/^(\s*\})/);
-
-        if (!match) return 0;
-
-        var column = match[1].length;
-        var openBracePos = doc.findMatchingBracket({row: row, column: column});
-
-        if (!openBracePos || openBracePos.row == row) return 0;
-
-        var indent = this.$getIndent(doc.getLine(openBracePos.row));
-        doc.replace(new Range(row, 0, row, column-1), indent);
-    };
-
-    this.$getIndent = function(line) {
-        var match = line.match(/^(\s+)/);
-        if (match) {
-            return match[1];
-        }
-
-        return "";
-    };
-
-}).call(MatchingBraceOutdent.prototype);
-
-exports.MatchingBraceOutdent = MatchingBraceOutdent;
-});
-/* vim:ts=4:sts=4:sw=4:
- * ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Chris Spencer <chris.ag.spencer AT googlemail DOT com>
- *
- * 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 ***** */
-
-define('ace/mode/behaviour/cstyle', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/behaviour'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../../lib/oop");
-var Behaviour = require('../behaviour').Behaviour;
-
-var CstyleBehaviour = function () {
-
-    this.add("braces", "insertion", function (state, action, editor, session, text) {
-        if (text == '{') {
-            var selection = editor.getSelectionRange();
-            var selected = session.doc.getTextRange(selection);
-            if (selected !== "") {
-                return {
-                    text: '{' + selected + '}',
-                    selection: false
-                };
-            } else {
-                return {
-                    text: '{}',
-                    selection: [1, 1]
-                };
-            }
-        } else if (text == '}') {
-            var cursor = editor.getCursorPosition();
-            var line = session.doc.getLine(cursor.row);
-            var rightChar = line.substring(cursor.column, cursor.column + 1);
-            if (rightChar == '}') {
-                var matching = session.$findOpeningBracket('}', {column: cursor.column + 1, row: cursor.row});
-                if (matching !== null) {
-                    return {
-                        text: '',
-                        selection: [1, 1]
-                    };
-                }
-            }
-        } else if (text == "\n") {
-            var cursor = editor.getCursorPosition();
-            var line = session.doc.getLine(cursor.row);
-            var rightChar = line.substring(cursor.column, cursor.column + 1);
-            if (rightChar == '}') {
-                var openBracePos = session.findMatchingBracket({row: cursor.row, column: cursor.column + 1});
-                if (!openBracePos)
-                     return null;
-
-                var indent = this.getNextLineIndent(state, line.substring(0, line.length - 1), session.getTabString());
-                var next_indent = this.$getIndent(session.doc.getLine(openBracePos.row));
-
-                return {
-                    text: '\n' + indent + '\n' + next_indent,
-                    selection: [1, indent.length, 1, indent.length]
-                };
-            }
-        }
-    });
-
-    this.add("braces", "deletion", function (state, action, editor, session, range) {
-        var selected = session.doc.getTextRange(range);
-        if (!range.isMultiLine() && selected == '{') {
-            var line = session.doc.getLine(range.start.row);
-            var rightChar = line.substring(range.end.column, range.end.column + 1);
-            if (rightChar == '}') {
-                range.end.column++;
-                return range;
-            }
-        }
-    });
-
-    this.add("parens", "insertion", function (state, action, editor, session, text) {
-        if (text == '(') {
-            var selection = editor.getSelectionRange();
-            var selected = session.doc.getTextRange(selection);
-            if (selected !== "") {
-                return {
-                    text: '(' + selected + ')',
-                    selection: false
-                };
-            } else {
-                return {
-                    text: '()',
-                    selection: [1, 1]
-                };
-            }
-        } else if (text == ')') {
-            var cursor = editor.getCursorPosition();
-            var line = session.doc.getLine(cursor.row);
-            var rightChar = line.substring(cursor.column, cursor.column + 1);
-            if (rightChar == ')') {
-                var matching = session.$findOpeningBracket(')', {column: cursor.column + 1, row: cursor.row});
-                if (matching !== null) {
-                    return {
-                        text: '',
-                        selection: [1, 1]
-                    };
-                }
-            }
-        }
-    });
-
-    this.add("parens", "deletion", function (state, action, editor, session, range) {
-        var selected = session.doc.getTextRange(range);
-        if (!range.isMultiLine() && selected == '(') {
-            var line = session.doc.getLine(range.start.row);
-            var rightChar = line.substring(range.start.column + 1, range.start.column + 2);
-            if (rightChar == ')') {
-                range.end.column++;
-                return range;
-            }
-        }
-    });
-
-    this.add("string_dquotes", "insertion", function (state, action, editor, session, text) {
-        if (text == '"' || text == "'") {
-            var quote = text;
-            var selection = editor.getSelectionRange();
-            var selected = session.doc.getTextRange(selection);
-            if (selected !== "") {
-                return {
-                    text: quote + selected + quote,
-                    selection: false
-                };
-            } else {
-                var cursor = editor.getCursorPosition();
-                var line = session.doc.getLine(cursor.row);
-                var leftChar = line.substring(cursor.column-1, cursor.column);
-
-                // We're escaped.
-                if (leftChar == '\\') {
-                    return null;
-                }
-
-                // Find what token we're inside.
-                var tokens = session.getTokens(selection.start.row, selection.start.row)[0].tokens;
-                var col = 0, token;
-                var quotepos = -1; // Track whether we're inside an open quote.
-
-                for (var x = 0; x < tokens.length; x++) {
-                    token = tokens[x];
-                    if (token.type == "string") {
-                      quotepos = -1;
-                    } else if (quotepos < 0) {
-                      quotepos = token.value.indexOf(quote);
-                    }
-                    if ((token.value.length + col) > selection.start.column) {
-                        break;
-                    }
-                    col += tokens[x].value.length;
-                }
-
-                // Try and be smart about when we auto insert.
-                if (!token || (quotepos < 0 && token.type !== "comment" && (token.type !== "string" || ((selection.start.column !== token.value.length+col-1) && token.value.lastIndexOf(quote) === token.value.length-1)))) {
-                    return {
-                        text: quote + quote,
-                        selection: [1,1]
-                    };
-                } else if (token && token.type === "string") {
-                    // Ignore input and move right one if we're typing over the closing quote.
-                    var rightChar = line.substring(cursor.column, cursor.column + 1);
-                    if (rightChar == quote) {
-                        return {
-                            text: '',
-                            selection: [1, 1]
-                        };
-                    }
-                }
-            }
-        }
-    });
-
-    this.add("string_dquotes", "deletion", function (state, action, editor, session, range) {
-        var selected = session.doc.getTextRange(range);
-        if (!range.isMultiLine() && (selected == '"' || selected == "'")) {
-            var line = session.doc.getLine(range.start.row);
-            var rightChar = line.substring(range.start.column + 1, range.start.column + 2);
-            if (rightChar == '"') {
-                range.end.column++;
-                return range;
-            }
-        }
-    });
-
-};
-
-oop.inherits(CstyleBehaviour, Behaviour);
-
-exports.CstyleBehaviour = CstyleBehaviour;
-});/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/folding/cstyle', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/range', 'ace/mode/folding/fold_mode'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../../lib/oop");
-var Range = require("../../range").Range;
-var BaseFoldMode = require("./fold_mode").FoldMode;
-
-var FoldMode = exports.FoldMode = function() {};
-oop.inherits(FoldMode, BaseFoldMode);
-
-(function() {
-
-    this.foldingStartMarker = /(\{|\[)[^\}\]]*$|^\s*(\/\*)/;
-    this.foldingStopMarker = /^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/;
-    
-    this.getFoldWidgetRange = function(session, foldStyle, row) {
-        var line = session.getLine(row);
-        var match = line.match(this.foldingStartMarker);
-        if (match) {
-            var i = match.index;
-
-            if (match[1])
-                return this.openingBracketBlock(session, match[1], row, i);
-
-            var range = session.getCommentFoldRange(row, i + match[0].length);
-            range.end.column -= 2;
-            return range;
-        }
-
-        if (foldStyle !== "markbeginend")
-            return;
-            
-        var match = line.match(this.foldingStopMarker);
-        if (match) {
-            var i = match.index + match[0].length;
-
-            if (match[2]) {
-                var range = session.getCommentFoldRange(row, i);
-                range.end.column -= 2;
-                return range;
-            }
-
-            var end = {row: row, column: i};
-            var start = session.$findOpeningBracket(match[1], end);
-            
-            if (!start)
-                return;
-
-            start.column++;
-            end.column--;
-
-            return  Range.fromPoints(start, end);
-        }
-    };
-    
-}).call(FoldMode.prototype);
-
-});/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/folding/fold_mode', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
-"use strict";
-
-var Range = require("../../range").Range;
-
-var FoldMode = exports.FoldMode = function() {};
-
-(function() {
-
-    this.foldingStartMarker = null;
-    this.foldingStopMarker = null;
-
-    // must return "" if there's no fold, to enable caching
-    this.getFoldWidget = function(session, foldStyle, row) {
-        var line = session.getLine(row);
-        if (this.foldingStartMarker.test(line))
-            return "start";
-        if (foldStyle == "markbeginend"
-                && this.foldingStopMarker
-                && this.foldingStopMarker.test(line))
-            return "end";
-        return "";
-    };
-    
-    this.getFoldWidgetRange = function(session, foldStyle, row) {
-        return null;
-    };
-
-    this.indentationBlock = function(session, row, column) {
-        var re = /^\s*/;
-        var startRow = row;
-        var endRow = row;
-        var line = session.getLine(row);
-        var startColumn = column || line.length;
-        var startLevel = line.match(re)[0].length;
-        var maxRow = session.getLength()
-        
-        while (++row < maxRow) {
-            line = session.getLine(row);
-            var level = line.match(re)[0].length;
-
-            if (level == line.length)
-                continue;
-
-            if (level <= startLevel)
-                break;
-
-            endRow = row;
-        }
-
-        if (endRow > startRow) {
-            var endColumn = session.getLine(endRow).length;
-            return new Range(startRow, startColumn, endRow, endColumn);
-        }
-    };
-
-    this.openingBracketBlock = function(session, bracket, row, column) {
-        var start = {row: row, column: column + 1};
-        var end = session.$findClosingBracket(bracket, start);
-        if (!end)
-            return;
-
-        var fw = session.foldWidgets[end.row];
-        if (fw == null)
-            fw = this.getFoldWidget(session, end.row);
-
-        if (fw == "start") {
-            end.row --;
-            end.column = session.getLine(end.row).length;
-        }
-        return Range.fromPoints(start, end);
-    };
-
-}).call(FoldMode.prototype);
-
-});
diff --git a/apps/files_texteditor/js/aceeditor/mode-json.js b/apps/files_texteditor/js/aceeditor/mode-json.js
deleted file mode 100644
index 05729db5e6..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-json.js
+++ /dev/null
@@ -1 +0,0 @@
-define("ace/mode/json",["require","exports","module","ace/lib/oop","ace/mode/text","ace/tokenizer","ace/mode/json_highlight_rules","ace/mode/matching_brace_outdent","ace/mode/behaviour/cstyle","ace/mode/folding/cstyle","ace/worker/worker_client"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text").Mode,f=a("../tokenizer").Tokenizer,g=a("./json_highlight_rules").JsonHighlightRules,h=a("./matching_brace_outdent").MatchingBraceOutdent,i=a("./behaviour/cstyle").CstyleBehaviour,j=a("./folding/cstyle").FoldMode,k=a("../worker/worker_client").WorkerClient,l=function(){this.$tokenizer=new f((new g).getRules()),this.$outdent=new h,this.$behaviour=new i,this.foldingRules=new j};d.inherits(l,e),function(){this.getNextLineIndent=function(a,b,c){var d=this.$getIndent(b);if(a=="start"){var e=b.match(/^.*[\{\(\[]\s*$/);e&&(d+=c)}return d},this.checkOutdent=function(a,b,c){return this.$outdent.checkOutdent(b,c)},this.autoOutdent=function(a,b,c){this.$outdent.autoOutdent(b,c)},this.createWorker=function(a){var b=new k(["ace"],"worker-json.js","ace/mode/json_worker","JsonWorker");return b.attachToDocument(a.getDocument()),b.on("error",function(b){a.setAnnotations([b.data])}),b.on("ok",function(){a.clearAnnotations()}),b}}.call(l.prototype),b.Mode=l}),define("ace/mode/json_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text_highlight_rules").TextHighlightRules,f=function(){this.$rules={start:[{token:"string",regex:'["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'},{token:"constant.numeric",regex:"0[xX][0-9a-fA-F]+\\b"},{token:"constant.numeric",regex:"[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"},{token:"constant.language.boolean",regex:"(?:true|false)\\b"},{token:"invalid.illegal",regex:"['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"},{token:"invalid.illegal",regex:"\\/\\/.*$"},{token:"paren.lparen",regex:"[[({]"},{token:"paren.rparen",regex:"[\\])}]"},{token:"text",regex:"\\s+"}]}};d.inherits(f,e),b.JsonHighlightRules=f}),define("ace/mode/matching_brace_outdent",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../range").Range,e=function(){};(function(){this.checkOutdent=function(a,b){return/^\s+$/.test(a)?/^\s*\}/.test(b):!1},this.autoOutdent=function(a,b){var c=a.getLine(b),e=c.match(/^(\s*\})/);if(!e)return 0;var f=e[1].length,g=a.findMatchingBracket({row:b,column:f});if(!g||g.row==b)return 0;var h=this.$getIndent(a.getLine(g.row));a.replace(new d(b,0,b,f-1),h)},this.$getIndent=function(a){var b=a.match(/^(\s+)/);return b?b[1]:""}}).call(e.prototype),b.MatchingBraceOutdent=e}),define("ace/mode/behaviour/cstyle",["require","exports","module","ace/lib/oop","ace/mode/behaviour"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../behaviour").Behaviour,f=function(){this.add("braces","insertion",function(a,b,c,d,e){if(e=="{"){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"{"+g+"}",selection:!1}:{text:"{}",selection:[1,1]}}if(e=="}"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var k=d.$findOpeningBracket("}",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}else if(e=="\n"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var l=d.findMatchingBracket({row:h.row,column:h.column+1});if(!l)return null;var m=this.getNextLineIndent(a,i.substring(0,i.length-1),d.getTabString()),n=this.$getIndent(d.doc.getLine(l.row));return{text:"\n"+m+"\n"+n,selection:[1,m.length,1,m.length]}}}}),this.add("braces","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="{"){var g=d.doc.getLine(e.start.row),h=g.substring(e.end.column,e.end.column+1);if(h=="}")return e.end.column++,e}}),this.add("parens","insertion",function(a,b,c,d,e){if(e=="("){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"("+g+")",selection:!1}:{text:"()",selection:[1,1]}}if(e==")"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j==")"){var k=d.$findOpeningBracket(")",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}}),this.add("parens","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="("){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h==")")return e.end.column++,e}}),this.add("string_dquotes","insertion",function(a,b,c,d,e){if(e=='"'||e=="'"){var f=e,g=c.getSelectionRange(),h=d.doc.getTextRange(g);if(h!=="")return{text:f+h+f,selection:!1};var i=c.getCursorPosition(),j=d.doc.getLine(i.row),k=j.substring(i.column-1,i.column);if(k=="\\")return null;var l=d.getTokens(g.start.row,g.start.row)[0].tokens,m=0,n,o=-1;for(var p=0;p<l.length;p++){n=l[p],n.type=="string"?o=-1:o<0&&(o=n.value.indexOf(f));if(n.value.length+m>g.start.column)break;m+=l[p].value.length}if(!n||o<0&&n.type!=="comment"&&(n.type!=="string"||g.start.column!==n.value.length+m-1&&n.value.lastIndexOf(f)===n.value.length-1))return{text:f+f,selection:[1,1]};if(n&&n.type==="string"){var q=j.substring(i.column,i.column+1);if(q==f)return{text:"",selection:[1,1]}}}}),this.add("string_dquotes","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&(f=='"'||f=="'")){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h=='"')return e.end.column++,e}})};d.inherits(f,e),b.CstyleBehaviour=f}),define("ace/mode/folding/cstyle",["require","exports","module","ace/lib/oop","ace/range","ace/mode/folding/fold_mode"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../../range").Range,f=a("./fold_mode").FoldMode,g=b.FoldMode=function(){};d.inherits(g,f),function(){this.foldingStartMarker=/(\{|\[)[^\}\]]*$|^\s*(\/\*)/,this.foldingStopMarker=/^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/,this.getFoldWidgetRange=function(a,b,c){var d=a.getLine(c),f=d.match(this.foldingStartMarker);if(f){var g=f.index;if(f[1])return this.openingBracketBlock(a,f[1],c,g);var h=a.getCommentFoldRange(c,g+f[0].length);return h.end.column-=2,h}if(b!=="markbeginend")return;var f=d.match(this.foldingStopMarker);if(f){var g=f.index+f[0].length;if(f[2]){var h=a.getCommentFoldRange(c,g);return h.end.column-=2,h}var i={row:c,column:g},j=a.$findOpeningBracket(f[1],i);if(!j)return;return j.column++,i.column--,e.fromPoints(j,i)}}}.call(g.prototype)}),define("ace/mode/folding/fold_mode",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../../range").Range,e=b.FoldMode=function(){};(function(){this.foldingStartMarker=null,this.foldingStopMarker=null,this.getFoldWidget=function(a,b,c){var d=a.getLine(c);return this.foldingStartMarker.test(d)?"start":b=="markbeginend"&&this.foldingStopMarker&&this.foldingStopMarker.test(d)?"end":""},this.getFoldWidgetRange=function(a,b,c){return null},this.indentationBlock=function(a,b,c){var e=/^\s*/,f=b,g=b,h=a.getLine(b),i=c||h.length,j=h.match(e)[0].length,k=a.getLength();while(++b<k){h=a.getLine(b);var l=h.match(e)[0].length;if(l==h.length)continue;if(l<=j)break;g=b}if(g>f){var m=a.getLine(g).length;return new d(f,i,g,m)}},this.openingBracketBlock=function(a,b,c,e){var f={row:c,column:e+1},g=a.$findClosingBracket(b,f);if(!g)return;var h=a.foldWidgets[g.row];return h==null&&(h=this.getFoldWidget(a,g.row)),h=="start"&&(g.row--,g.column=a.getLine(g.row).length),d.fromPoints(f,g)}}).call(e.prototype)})
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/mode-latex-uncompressed.js b/apps/files_texteditor/js/aceeditor/mode-latex-uncompressed.js
deleted file mode 100644
index 77c42ab3f9..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-latex-uncompressed.js
+++ /dev/null
@@ -1,95 +0,0 @@
-define('ace/mode/latex', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text', 'ace/tokenizer', 'ace/mode/latex_highlight_rules', 'ace/range'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
-var LatexHighlightRules = require("./latex_highlight_rules").LatexHighlightRules;
-var Range = require("../range").Range;
-
-var Mode = function()
-{
-    this.$tokenizer = new Tokenizer(new LatexHighlightRules().getRules());
-};
-oop.inherits(Mode, TextMode);
-
-(function() {
-    this.toggleCommentLines = function(state, doc, startRow, endRow) {
-        // This code is adapted from ruby.js
-        var outdent = true;
-        
-        // LaTeX comments begin with % and go to the end of the line
-        var commentRegEx = /^(\s*)\%/;
-
-        for (var i = startRow; i <= endRow; i++) {
-            if (!commentRegEx.test(doc.getLine(i))) {
-                outdent = false;
-                break;
-            }
-        }
-
-        if (outdent) {
-            var deleteRange = new Range(0, 0, 0, 0);
-            for (var i = startRow; i <= endRow; i++) {
-                var line = doc.getLine(i);
-                var m = line.match(commentRegEx);
-                deleteRange.start.row = i;
-                deleteRange.end.row = i;
-                deleteRange.end.column = m[0].length;
-                doc.replace(deleteRange, m[1]);
-            }
-        }
-        else {
-            doc.indentRows(startRow, endRow, "%");
-        }
-    };
-    
-    // There is no universally accepted way of indenting a tex document
-    // so just maintain the indentation of the previous line
-    this.getNextLineIndent = function(state, line, tab) {
-        return this.$getIndent(line);
-    };
-    
-}).call(Mode.prototype);
-
-exports.Mode = Mode;
-
-});
-define('ace/mode/latex_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-
-var LatexHighlightRules = function() {   
-    this.$rules = {
-        "start" : [{
-            // A tex command e.g. \foo
-            token : "keyword",
-            regex : "\\\\(?:[^a-zA-Z]|[a-zA-Z]+)",
-        }, {
-            // Curly and square braces
-            token : "lparen",
-            regex : "[[({]"
-        }, {
-            // Curly and square braces
-            token : "rparen",
-            regex : "[\\])}]"
-        }, {
-            // Inline math between two $ symbols
-            token : "string",
-            regex : "\\$(?:(?:\\\\.)|(?:[^\\$\\\\]))*?\\$"
-        }, {
-            // A comment. Tex comments start with % and go to 
-            // the end of the line
-            token : "comment",
-            regex : "%.*$"
-        }]
-    };
-};
-
-oop.inherits(LatexHighlightRules, TextHighlightRules);
-
-exports.LatexHighlightRules = LatexHighlightRules;
-
-});
diff --git a/apps/files_texteditor/js/aceeditor/mode-latex.js b/apps/files_texteditor/js/aceeditor/mode-latex.js
deleted file mode 100644
index e6cfb7cc2f..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-latex.js
+++ /dev/null
@@ -1 +0,0 @@
-define("ace/mode/latex",["require","exports","module","ace/lib/oop","ace/mode/text","ace/tokenizer","ace/mode/latex_highlight_rules","ace/range"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text").Mode,f=a("../tokenizer").Tokenizer,g=a("./latex_highlight_rules").LatexHighlightRules,h=a("../range").Range,i=function(){this.$tokenizer=new f((new g).getRules())};d.inherits(i,e),function(){this.toggleCommentLines=function(a,b,c,d){var e=!0,f=/^(\s*)\%/;for(var g=c;g<=d;g++)if(!f.test(b.getLine(g))){e=!1;break}if(e){var i=new h(0,0,0,0);for(var g=c;g<=d;g++){var j=b.getLine(g),k=j.match(f);i.start.row=g,i.end.row=g,i.end.column=k[0].length,b.replace(i,k[1])}}else b.indentRows(c,d,"%")},this.getNextLineIndent=function(a,b,c){return this.$getIndent(b)}}.call(i.prototype),b.Mode=i}),define("ace/mode/latex_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text_highlight_rules").TextHighlightRules,f=function(){this.$rules={start:[{token:"keyword",regex:"\\\\(?:[^a-zA-Z]|[a-zA-Z]+)"},{token:"lparen",regex:"[[({]"},{token:"rparen",regex:"[\\])}]"},{token:"string",regex:"\\$(?:(?:\\\\.)|(?:[^\\$\\\\]))*?\\$"},{token:"comment",regex:"%.*$"}]}};d.inherits(f,e),b.LatexHighlightRules=f})
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/mode-less-uncompressed.js b/apps/files_texteditor/js/aceeditor/mode-less-uncompressed.js
deleted file mode 100644
index b59684dd28..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-less-uncompressed.js
+++ /dev/null
@@ -1,654 +0,0 @@
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *      John Roepke <john AT justjohn DOT us>
- *
- * 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 ***** */
-
-define('ace/mode/less', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text', 'ace/tokenizer', 'ace/mode/less_highlight_rules', 'ace/mode/matching_brace_outdent', 'ace/mode/folding/cstyle'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
-var LessHighlightRules = require("./less_highlight_rules").LessHighlightRules;
-var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
-var CStyleFoldMode = require("./folding/cstyle").FoldMode;
-
-var Mode = function() {
-    this.$tokenizer = new Tokenizer(new LessHighlightRules().getRules(), "i");
-    this.$outdent = new MatchingBraceOutdent();
-    this.foldingRules = new CStyleFoldMode();
-};
-oop.inherits(Mode, TextMode);
-
-(function() {
-    
-    this.getNextLineIndent = function(state, line, tab) {
-        var indent = this.$getIndent(line);
-
-        // ignore braces in comments
-        var tokens = this.$tokenizer.getLineTokens(line, state).tokens;
-        if (tokens.length && tokens[tokens.length-1].type == "comment") {
-            return indent;
-        }
-
-        var match = line.match(/^.*\{\s*$/);
-        if (match) {
-            indent += tab;
-        }
-
-        return indent;
-    };
-
-    this.checkOutdent = function(state, line, input) {
-        return this.$outdent.checkOutdent(line, input);
-    };
-
-    this.autoOutdent = function(state, doc, row) {
-        this.$outdent.autoOutdent(doc, row);
-    };
-
-}).call(Mode.prototype);
-
-exports.Mode = Mode;
-
-});
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *      John Roepke <john AT justjohn DOT us>
- *
- * 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 ***** */
-
-define('ace/mode/less_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/lang', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var lang = require("../lib/lang");
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-
-var LessHighlightRules = function() {
-    
-    var properties = lang.arrayToMap( (function () {
-
-        var browserPrefix = ("-webkit-|-moz-|-o-|-ms-|-svg-|-pie-|-khtml-").split("|");
-        
-        var prefixProperties = ("appearance|background-clip|background-inline-policy|background-origin|" + 
-             "background-size|binding|border-bottom-colors|border-left-colors|" + 
-             "border-right-colors|border-top-colors|border-end|border-end-color|" + 
-             "border-end-style|border-end-width|border-image|border-start|" + 
-             "border-start-color|border-start-style|border-start-width|box-align|" + 
-             "box-direction|box-flex|box-flexgroup|box-ordinal-group|box-orient|" + 
-             "box-pack|box-sizing|column-count|column-gap|column-width|column-rule|" + 
-             "column-rule-width|column-rule-style|column-rule-color|float-edge|" + 
-             "font-feature-settings|font-language-override|force-broken-image-icon|" + 
-             "image-region|margin-end|margin-start|opacity|outline|outline-color|" + 
-             "outline-offset|outline-radius|outline-radius-bottomleft|" + 
-             "outline-radius-bottomright|outline-radius-topleft|outline-radius-topright|" + 
-             "outline-style|outline-width|padding-end|padding-start|stack-sizing|" + 
-             "tab-size|text-blink|text-decoration-color|text-decoration-line|" + 
-             "text-decoration-style|transform|transform-origin|transition|" + 
-             "transition-delay|transition-duration|transition-property|" + 
-             "transition-timing-function|user-focus|user-input|user-modify|user-select|" +
-             "window-shadow|border-radius").split("|");
-        
-        var properties = ("azimuth|background-attachment|background-color|background-image|" +
-            "background-position|background-repeat|background|border-bottom-color|" +
-            "border-bottom-style|border-bottom-width|border-bottom|border-collapse|" +
-            "border-color|border-left-color|border-left-style|border-left-width|" +
-            "border-left|border-right-color|border-right-style|border-right-width|" +
-            "border-right|border-spacing|border-style|border-top-color|" +
-            "border-top-style|border-top-width|border-top|border-width|border|" +
-            "bottom|box-sizing|caption-side|clear|clip|color|content|counter-increment|" +
-            "counter-reset|cue-after|cue-before|cue|cursor|direction|display|" +
-            "elevation|empty-cells|float|font-family|font-size-adjust|font-size|" +
-            "font-stretch|font-style|font-variant|font-weight|font|height|left|" +
-            "letter-spacing|line-height|list-style-image|list-style-position|" +
-            "list-style-type|list-style|margin-bottom|margin-left|margin-right|" +
-            "margin-top|marker-offset|margin|marks|max-height|max-width|min-height|" +
-            "min-width|opacity|orphans|outline-color|" +
-            "outline-style|outline-width|outline|overflow|overflow-x|overflow-y|padding-bottom|" +
-            "padding-left|padding-right|padding-top|padding|page-break-after|" +
-            "page-break-before|page-break-inside|page|pause-after|pause-before|" +
-            "pause|pitch-range|pitch|play-during|position|quotes|richness|right|" +
-            "size|speak-header|speak-numeral|speak-punctuation|speech-rate|speak|" +
-            "stress|table-layout|text-align|text-decoration|text-indent|" +
-            "text-shadow|text-transform|top|unicode-bidi|vertical-align|" +
-            "visibility|voice-family|volume|white-space|widows|width|word-spacing|" +
-            "z-index").split("|");
-          
-        //The return array     
-        var ret = [];
-        
-        //All prefixProperties will get the browserPrefix in
-        //the begning by join the prefixProperties array with the value of browserPrefix
-        for (var i=0, ln=browserPrefix.length; i<ln; i++) {
-            Array.prototype.push.apply(
-                ret,
-                (( browserPrefix[i] + prefixProperties.join("|" + browserPrefix[i]) ).split("|"))
-            );
-        }
-        
-        //Add also prefixProperties and properties without any browser prefix
-        Array.prototype.push.apply(ret, prefixProperties);
-        Array.prototype.push.apply(ret, properties);
-        
-        return ret;
-        
-    })() );
-    
-
-
-    var functions = lang.arrayToMap(
-        ("hsl|hsla|rgb|rgba|url|attr|counter|counters|lighten|darken|saturate|" +
-        "desaturate|fadein|fadeout|fade|spin|mix|hue|saturation|lightness|" +
-        "alpha|round|ceil|floor|percentage|color|iscolor|isnumber|isstring|" +
-        "iskeyword|isurl|ispixel|ispercentage|isem").split("|")
-    );
-
-    var constants = lang.arrayToMap(
-        ("absolute|all-scroll|always|armenian|auto|baseline|below|bidi-override|" +
-        "block|bold|bolder|border-box|both|bottom|break-all|break-word|capitalize|center|" +
-        "char|circle|cjk-ideographic|col-resize|collapse|content-box|crosshair|dashed|" +
-        "decimal-leading-zero|decimal|default|disabled|disc|" +
-        "distribute-all-lines|distribute-letter|distribute-space|" +
-        "distribute|dotted|double|e-resize|ellipsis|fixed|georgian|groove|" +
-        "hand|hebrew|help|hidden|hiragana-iroha|hiragana|horizontal|" +
-        "ideograph-alpha|ideograph-numeric|ideograph-parenthesis|" +
-        "ideograph-space|inactive|inherit|inline-block|inline|inset|inside|" +
-        "inter-ideograph|inter-word|italic|justify|katakana-iroha|katakana|" +
-        "keep-all|left|lighter|line-edge|line-through|line|list-item|loose|" +
-        "lower-alpha|lower-greek|lower-latin|lower-roman|lowercase|lr-tb|ltr|" +
-        "medium|middle|move|n-resize|ne-resize|newspaper|no-drop|no-repeat|" +
-        "nw-resize|none|normal|not-allowed|nowrap|oblique|outset|outside|" +
-        "overline|pointer|progress|relative|repeat-x|repeat-y|repeat|right|" +
-        "ridge|row-resize|rtl|s-resize|scroll|se-resize|separate|small-caps|" +
-        "solid|square|static|strict|super|sw-resize|table-footer-group|" +
-        "table-header-group|tb-rl|text-bottom|text-top|text|thick|thin|top|" +
-        "transparent|underline|upper-alpha|upper-latin|upper-roman|uppercase|" +
-        "vertical-ideographic|vertical-text|visible|w-resize|wait|whitespace|" +
-        "zero").split("|")
-    );
-
-    var colors = lang.arrayToMap(
-        ("aqua|black|blue|fuchsia|gray|green|lime|maroon|navy|olive|orange|" +
-        "purple|red|silver|teal|white|yellow").split("|")
-    );
-    
-    var keywords = lang.arrayToMap(
-        ("@mixin|@extend|@include|@import|@media|@debug|@warn|@if|@for|@each|" +
-        "@while|@else|@font-face|@-webkit-keyframes|if|and|!default|module|" +
-        "def|end|declare|when|not|and").split("|")
-    );
-    
-    var tags = lang.arrayToMap(
-        ("a|abbr|acronym|address|applet|area|article|aside|audio|b|base|basefont|bdo|" + 
-         "big|blockquote|body|br|button|canvas|caption|center|cite|code|col|colgroup|" + 
-         "command|datalist|dd|del|details|dfn|dir|div|dl|dt|em|embed|fieldset|" + 
-         "figcaption|figure|font|footer|form|frame|frameset|h1|h2|h3|h4|h5|h6|head|" + 
-         "header|hgroup|hr|html|i|iframe|img|input|ins|keygen|kbd|label|legend|li|" + 
-         "link|map|mark|menu|meta|meter|nav|noframes|noscript|object|ol|optgroup|" + 
-         "option|output|p|param|pre|progress|q|rp|rt|ruby|s|samp|script|section|select|" + 
-         "small|source|span|strike|strong|style|sub|summary|sup|table|tbody|td|" + 
-         "textarea|tfoot|th|thead|time|title|tr|tt|u|ul|var|video|wbr|xmp").split("|")
-    );
-
-    // regexp must not have capturing parentheses. Use (?:) instead.
-    // regexps are ordered -> the first match is used
-
-    var numRe = "\\-?(?:(?:[0-9]+)|(?:[0-9]*\\.[0-9]+))";
-
-    // regexp must not have capturing parentheses. Use (?:) instead.
-    // regexps are ordered -> the first match is used
-
-    this.$rules = {
-        "start" : [
-            {
-                token : "comment",
-                regex : "\\/\\/.*$"
-            },
-            {
-                token : "comment", // multi line comment
-                merge : true,
-                regex : "\\/\\*",
-                next : "comment"
-            }, {
-                token : "string", // single line
-                regex : '["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'
-            }, {
-                token : "string", // single line
-                regex : "['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"
-            }, {
-                token : "constant.numeric",
-                regex : numRe + "(?:em|ex|px|cm|mm|in|pt|pc|deg|rad|grad|ms|s|hz|khz|%)"
-            }, {
-                token : "constant.numeric", // hex6 color
-                regex : "#[a-f0-9]{6}"
-            }, {
-                token : "constant.numeric", // hex3 color
-                regex : "#[a-f0-9]{3}"
-            }, {
-                token : "constant.numeric",
-                regex : numRe
-            }, {
-                token : function(value) {
-                    if (keywords.hasOwnProperty(value))
-                        return "keyword";
-                    else
-                        return "variable";
-                },
-                regex : "@[a-z0-9_\\-@]*\\b"
-            }, {
-                token : function(value) {
-                    if (properties.hasOwnProperty(value.toLowerCase()))
-                        return "support.type";
-                    else if (keywords.hasOwnProperty(value))
-                        return "keyword";
-                    else if (constants.hasOwnProperty(value))
-                        return "constant.language";
-                    else if (functions.hasOwnProperty(value))
-                        return "support.function";
-                    else if (colors.hasOwnProperty(value.toLowerCase()))
-                        return "support.constant.color";
-                    else if (tags.hasOwnProperty(value.toLowerCase()))
-                        return "variable.language";
-                    else
-                        return "text";
-                },
-                regex : "\\-?[@a-z_][@a-z0-9_\\-]*"
-            }, {
-                token: "variable.language",
-                regex: "#[a-z0-9-_]+"
-            }, {
-                token: "variable.language",
-                regex: "\\.[a-z0-9-_]+"
-            }, {
-                token: "variable.language",
-                regex: ":[a-z0-9-_]+"
-            }, {
-                token: "constant",
-                regex: "[a-z0-9-_]+"
-            }, {
-                token : "keyword.operator",
-                regex : "<|>|<=|>=|==|!=|-|%|#|\\+|\\$|\\+|\\*"
-            }, {
-                token : "paren.lparen",
-                regex : "[[({]"
-            }, {
-                token : "paren.rparen",
-                regex : "[\\])}]"
-            }, {
-                token : "text",
-                regex : "\\s+"
-            }
-        ],
-        "comment" : [
-            {
-                token : "comment", // closing comment
-                regex : ".*?\\*\\/",
-                next : "start"
-            }, {
-                token : "comment", // comment spanning whole line
-                merge : true,
-                regex : ".+"
-            }
-        ]
-    };
-};
-
-oop.inherits(LessHighlightRules, TextHighlightRules);
-
-exports.LessHighlightRules = LessHighlightRules;
-
-});
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/matching_brace_outdent', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
-"use strict";
-
-var Range = require("../range").Range;
-
-var MatchingBraceOutdent = function() {};
-
-(function() {
-
-    this.checkOutdent = function(line, input) {
-        if (! /^\s+$/.test(line))
-            return false;
-
-        return /^\s*\}/.test(input);
-    };
-
-    this.autoOutdent = function(doc, row) {
-        var line = doc.getLine(row);
-        var match = line.match(/^(\s*\})/);
-
-        if (!match) return 0;
-
-        var column = match[1].length;
-        var openBracePos = doc.findMatchingBracket({row: row, column: column});
-
-        if (!openBracePos || openBracePos.row == row) return 0;
-
-        var indent = this.$getIndent(doc.getLine(openBracePos.row));
-        doc.replace(new Range(row, 0, row, column-1), indent);
-    };
-
-    this.$getIndent = function(line) {
-        var match = line.match(/^(\s+)/);
-        if (match) {
-            return match[1];
-        }
-
-        return "";
-    };
-
-}).call(MatchingBraceOutdent.prototype);
-
-exports.MatchingBraceOutdent = MatchingBraceOutdent;
-});
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/folding/cstyle', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/range', 'ace/mode/folding/fold_mode'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../../lib/oop");
-var Range = require("../../range").Range;
-var BaseFoldMode = require("./fold_mode").FoldMode;
-
-var FoldMode = exports.FoldMode = function() {};
-oop.inherits(FoldMode, BaseFoldMode);
-
-(function() {
-
-    this.foldingStartMarker = /(\{|\[)[^\}\]]*$|^\s*(\/\*)/;
-    this.foldingStopMarker = /^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/;
-    
-    this.getFoldWidgetRange = function(session, foldStyle, row) {
-        var line = session.getLine(row);
-        var match = line.match(this.foldingStartMarker);
-        if (match) {
-            var i = match.index;
-
-            if (match[1])
-                return this.openingBracketBlock(session, match[1], row, i);
-
-            var range = session.getCommentFoldRange(row, i + match[0].length);
-            range.end.column -= 2;
-            return range;
-        }
-
-        if (foldStyle !== "markbeginend")
-            return;
-            
-        var match = line.match(this.foldingStopMarker);
-        if (match) {
-            var i = match.index + match[0].length;
-
-            if (match[2]) {
-                var range = session.getCommentFoldRange(row, i);
-                range.end.column -= 2;
-                return range;
-            }
-
-            var end = {row: row, column: i};
-            var start = session.$findOpeningBracket(match[1], end);
-            
-            if (!start)
-                return;
-
-            start.column++;
-            end.column--;
-
-            return  Range.fromPoints(start, end);
-        }
-    };
-    
-}).call(FoldMode.prototype);
-
-});/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/folding/fold_mode', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
-"use strict";
-
-var Range = require("../../range").Range;
-
-var FoldMode = exports.FoldMode = function() {};
-
-(function() {
-
-    this.foldingStartMarker = null;
-    this.foldingStopMarker = null;
-
-    // must return "" if there's no fold, to enable caching
-    this.getFoldWidget = function(session, foldStyle, row) {
-        var line = session.getLine(row);
-        if (this.foldingStartMarker.test(line))
-            return "start";
-        if (foldStyle == "markbeginend"
-                && this.foldingStopMarker
-                && this.foldingStopMarker.test(line))
-            return "end";
-        return "";
-    };
-    
-    this.getFoldWidgetRange = function(session, foldStyle, row) {
-        return null;
-    };
-
-    this.indentationBlock = function(session, row, column) {
-        var re = /^\s*/;
-        var startRow = row;
-        var endRow = row;
-        var line = session.getLine(row);
-        var startColumn = column || line.length;
-        var startLevel = line.match(re)[0].length;
-        var maxRow = session.getLength()
-        
-        while (++row < maxRow) {
-            line = session.getLine(row);
-            var level = line.match(re)[0].length;
-
-            if (level == line.length)
-                continue;
-
-            if (level <= startLevel)
-                break;
-
-            endRow = row;
-        }
-
-        if (endRow > startRow) {
-            var endColumn = session.getLine(endRow).length;
-            return new Range(startRow, startColumn, endRow, endColumn);
-        }
-    };
-
-    this.openingBracketBlock = function(session, bracket, row, column) {
-        var start = {row: row, column: column + 1};
-        var end = session.$findClosingBracket(bracket, start);
-        if (!end)
-            return;
-
-        var fw = session.foldWidgets[end.row];
-        if (fw == null)
-            fw = this.getFoldWidget(session, end.row);
-
-        if (fw == "start") {
-            end.row --;
-            end.column = session.getLine(end.row).length;
-        }
-        return Range.fromPoints(start, end);
-    };
-
-}).call(FoldMode.prototype);
-
-});
diff --git a/apps/files_texteditor/js/aceeditor/mode-less.js b/apps/files_texteditor/js/aceeditor/mode-less.js
deleted file mode 100644
index 8ecd9aad97..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-less.js
+++ /dev/null
@@ -1 +0,0 @@
-define("ace/mode/less",["require","exports","module","ace/lib/oop","ace/mode/text","ace/tokenizer","ace/mode/less_highlight_rules","ace/mode/matching_brace_outdent","ace/mode/folding/cstyle"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text").Mode,f=a("../tokenizer").Tokenizer,g=a("./less_highlight_rules").LessHighlightRules,h=a("./matching_brace_outdent").MatchingBraceOutdent,i=a("./folding/cstyle").FoldMode,j=function(){this.$tokenizer=new f((new g).getRules(),"i"),this.$outdent=new h,this.foldingRules=new i};d.inherits(j,e),function(){this.getNextLineIndent=function(a,b,c){var d=this.$getIndent(b),e=this.$tokenizer.getLineTokens(b,a).tokens;if(e.length&&e[e.length-1].type=="comment")return d;var f=b.match(/^.*\{\s*$/);return f&&(d+=c),d},this.checkOutdent=function(a,b,c){return this.$outdent.checkOutdent(b,c)},this.autoOutdent=function(a,b,c){this.$outdent.autoOutdent(b,c)}}.call(j.prototype),b.Mode=j}),define("ace/mode/less_highlight_rules",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("../lib/lang"),f=a("./text_highlight_rules").TextHighlightRules,g=function(){var a=e.arrayToMap(function(){var a="-webkit-|-moz-|-o-|-ms-|-svg-|-pie-|-khtml-".split("|"),b="appearance|background-clip|background-inline-policy|background-origin|background-size|binding|border-bottom-colors|border-left-colors|border-right-colors|border-top-colors|border-end|border-end-color|border-end-style|border-end-width|border-image|border-start|border-start-color|border-start-style|border-start-width|box-align|box-direction|box-flex|box-flexgroup|box-ordinal-group|box-orient|box-pack|box-sizing|column-count|column-gap|column-width|column-rule|column-rule-width|column-rule-style|column-rule-color|float-edge|font-feature-settings|font-language-override|force-broken-image-icon|image-region|margin-end|margin-start|opacity|outline|outline-color|outline-offset|outline-radius|outline-radius-bottomleft|outline-radius-bottomright|outline-radius-topleft|outline-radius-topright|outline-style|outline-width|padding-end|padding-start|stack-sizing|tab-size|text-blink|text-decoration-color|text-decoration-line|text-decoration-style|transform|transform-origin|transition|transition-delay|transition-duration|transition-property|transition-timing-function|user-focus|user-input|user-modify|user-select|window-shadow|border-radius".split("|"),c="azimuth|background-attachment|background-color|background-image|background-position|background-repeat|background|border-bottom-color|border-bottom-style|border-bottom-width|border-bottom|border-collapse|border-color|border-left-color|border-left-style|border-left-width|border-left|border-right-color|border-right-style|border-right-width|border-right|border-spacing|border-style|border-top-color|border-top-style|border-top-width|border-top|border-width|border|bottom|box-sizing|caption-side|clear|clip|color|content|counter-increment|counter-reset|cue-after|cue-before|cue|cursor|direction|display|elevation|empty-cells|float|font-family|font-size-adjust|font-size|font-stretch|font-style|font-variant|font-weight|font|height|left|letter-spacing|line-height|list-style-image|list-style-position|list-style-type|list-style|margin-bottom|margin-left|margin-right|margin-top|marker-offset|margin|marks|max-height|max-width|min-height|min-width|opacity|orphans|outline-color|outline-style|outline-width|outline|overflow|overflow-x|overflow-y|padding-bottom|padding-left|padding-right|padding-top|padding|page-break-after|page-break-before|page-break-inside|page|pause-after|pause-before|pause|pitch-range|pitch|play-during|position|quotes|richness|right|size|speak-header|speak-numeral|speak-punctuation|speech-rate|speak|stress|table-layout|text-align|text-decoration|text-indent|text-shadow|text-transform|top|unicode-bidi|vertical-align|visibility|voice-family|volume|white-space|widows|width|word-spacing|z-index".split("|"),d=[];for(var e=0,f=a.length;e<f;e++)Array.prototype.push.apply(d,(a[e]+b.join("|"+a[e])).split("|"));return Array.prototype.push.apply(d,b),Array.prototype.push.apply(d,c),d}()),b=e.arrayToMap("hsl|hsla|rgb|rgba|url|attr|counter|counters|lighten|darken|saturate|desaturate|fadein|fadeout|fade|spin|mix|hue|saturation|lightness|alpha|round|ceil|floor|percentage|color|iscolor|isnumber|isstring|iskeyword|isurl|ispixel|ispercentage|isem".split("|")),c=e.arrayToMap("absolute|all-scroll|always|armenian|auto|baseline|below|bidi-override|block|bold|bolder|border-box|both|bottom|break-all|break-word|capitalize|center|char|circle|cjk-ideographic|col-resize|collapse|content-box|crosshair|dashed|decimal-leading-zero|decimal|default|disabled|disc|distribute-all-lines|distribute-letter|distribute-space|distribute|dotted|double|e-resize|ellipsis|fixed|georgian|groove|hand|hebrew|help|hidden|hiragana-iroha|hiragana|horizontal|ideograph-alpha|ideograph-numeric|ideograph-parenthesis|ideograph-space|inactive|inherit|inline-block|inline|inset|inside|inter-ideograph|inter-word|italic|justify|katakana-iroha|katakana|keep-all|left|lighter|line-edge|line-through|line|list-item|loose|lower-alpha|lower-greek|lower-latin|lower-roman|lowercase|lr-tb|ltr|medium|middle|move|n-resize|ne-resize|newspaper|no-drop|no-repeat|nw-resize|none|normal|not-allowed|nowrap|oblique|outset|outside|overline|pointer|progress|relative|repeat-x|repeat-y|repeat|right|ridge|row-resize|rtl|s-resize|scroll|se-resize|separate|small-caps|solid|square|static|strict|super|sw-resize|table-footer-group|table-header-group|tb-rl|text-bottom|text-top|text|thick|thin|top|transparent|underline|upper-alpha|upper-latin|upper-roman|uppercase|vertical-ideographic|vertical-text|visible|w-resize|wait|whitespace|zero".split("|")),d=e.arrayToMap("aqua|black|blue|fuchsia|gray|green|lime|maroon|navy|olive|orange|purple|red|silver|teal|white|yellow".split("|")),f=e.arrayToMap("@mixin|@extend|@include|@import|@media|@debug|@warn|@if|@for|@each|@while|@else|@font-face|@-webkit-keyframes|if|and|!default|module|def|end|declare|when|not|and".split("|")),g=e.arrayToMap("a|abbr|acronym|address|applet|area|article|aside|audio|b|base|basefont|bdo|big|blockquote|body|br|button|canvas|caption|center|cite|code|col|colgroup|command|datalist|dd|del|details|dfn|dir|div|dl|dt|em|embed|fieldset|figcaption|figure|font|footer|form|frame|frameset|h1|h2|h3|h4|h5|h6|head|header|hgroup|hr|html|i|iframe|img|input|ins|keygen|kbd|label|legend|li|link|map|mark|menu|meta|meter|nav|noframes|noscript|object|ol|optgroup|option|output|p|param|pre|progress|q|rp|rt|ruby|s|samp|script|section|select|small|source|span|strike|strong|style|sub|summary|sup|table|tbody|td|textarea|tfoot|th|thead|time|title|tr|tt|u|ul|var|video|wbr|xmp".split("|")),h="\\-?(?:(?:[0-9]+)|(?:[0-9]*\\.[0-9]+))";this.$rules={start:[{token:"comment",regex:"\\/\\/.*$"},{token:"comment",merge:!0,regex:"\\/\\*",next:"comment"},{token:"string",regex:'["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'},{token:"string",regex:"['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"},{token:"constant.numeric",regex:h+"(?:em|ex|px|cm|mm|in|pt|pc|deg|rad|grad|ms|s|hz|khz|%)"},{token:"constant.numeric",regex:"#[a-f0-9]{6}"},{token:"constant.numeric",regex:"#[a-f0-9]{3}"},{token:"constant.numeric",regex:h},{token:function(a){return f.hasOwnProperty(a)?"keyword":"variable"},regex:"@[a-z0-9_\\-@]*\\b"},{token:function(e){return a.hasOwnProperty(e.toLowerCase())?"support.type":f.hasOwnProperty(e)?"keyword":c.hasOwnProperty(e)?"constant.language":b.hasOwnProperty(e)?"support.function":d.hasOwnProperty(e.toLowerCase())?"support.constant.color":g.hasOwnProperty(e.toLowerCase())?"variable.language":"text"},regex:"\\-?[@a-z_][@a-z0-9_\\-]*"},{token:"variable.language",regex:"#[a-z0-9-_]+"},{token:"variable.language",regex:"\\.[a-z0-9-_]+"},{token:"variable.language",regex:":[a-z0-9-_]+"},{token:"constant",regex:"[a-z0-9-_]+"},{token:"keyword.operator",regex:"<|>|<=|>=|==|!=|-|%|#|\\+|\\$|\\+|\\*"},{token:"paren.lparen",regex:"[[({]"},{token:"paren.rparen",regex:"[\\])}]"},{token:"text",regex:"\\s+"}],comment:[{token:"comment",regex:".*?\\*\\/",next:"start"},{token:"comment",merge:!0,regex:".+"}]}};d.inherits(g,f),b.LessHighlightRules=g}),define("ace/mode/matching_brace_outdent",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../range").Range,e=function(){};(function(){this.checkOutdent=function(a,b){return/^\s+$/.test(a)?/^\s*\}/.test(b):!1},this.autoOutdent=function(a,b){var c=a.getLine(b),e=c.match(/^(\s*\})/);if(!e)return 0;var f=e[1].length,g=a.findMatchingBracket({row:b,column:f});if(!g||g.row==b)return 0;var h=this.$getIndent(a.getLine(g.row));a.replace(new d(b,0,b,f-1),h)},this.$getIndent=function(a){var b=a.match(/^(\s+)/);return b?b[1]:""}}).call(e.prototype),b.MatchingBraceOutdent=e}),define("ace/mode/folding/cstyle",["require","exports","module","ace/lib/oop","ace/range","ace/mode/folding/fold_mode"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../../range").Range,f=a("./fold_mode").FoldMode,g=b.FoldMode=function(){};d.inherits(g,f),function(){this.foldingStartMarker=/(\{|\[)[^\}\]]*$|^\s*(\/\*)/,this.foldingStopMarker=/^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/,this.getFoldWidgetRange=function(a,b,c){var d=a.getLine(c),f=d.match(this.foldingStartMarker);if(f){var g=f.index;if(f[1])return this.openingBracketBlock(a,f[1],c,g);var h=a.getCommentFoldRange(c,g+f[0].length);return h.end.column-=2,h}if(b!=="markbeginend")return;var f=d.match(this.foldingStopMarker);if(f){var g=f.index+f[0].length;if(f[2]){var h=a.getCommentFoldRange(c,g);return h.end.column-=2,h}var i={row:c,column:g},j=a.$findOpeningBracket(f[1],i);if(!j)return;return j.column++,i.column--,e.fromPoints(j,i)}}}.call(g.prototype)}),define("ace/mode/folding/fold_mode",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../../range").Range,e=b.FoldMode=function(){};(function(){this.foldingStartMarker=null,this.foldingStopMarker=null,this.getFoldWidget=function(a,b,c){var d=a.getLine(c);return this.foldingStartMarker.test(d)?"start":b=="markbeginend"&&this.foldingStopMarker&&this.foldingStopMarker.test(d)?"end":""},this.getFoldWidgetRange=function(a,b,c){return null},this.indentationBlock=function(a,b,c){var e=/^\s*/,f=b,g=b,h=a.getLine(b),i=c||h.length,j=h.match(e)[0].length,k=a.getLength();while(++b<k){h=a.getLine(b);var l=h.match(e)[0].length;if(l==h.length)continue;if(l<=j)break;g=b}if(g>f){var m=a.getLine(g).length;return new d(f,i,g,m)}},this.openingBracketBlock=function(a,b,c,e){var f={row:c,column:e+1},g=a.$findClosingBracket(b,f);if(!g)return;var h=a.foldWidgets[g.row];return h==null&&(h=this.getFoldWidget(a,g.row)),h=="start"&&(g.row--,g.column=a.getLine(g.row).length),d.fromPoints(f,g)}}).call(e.prototype)})
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/mode-liquid-uncompressed.js b/apps/files_texteditor/js/aceeditor/mode-liquid-uncompressed.js
deleted file mode 100644
index 6e9b689e85..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-liquid-uncompressed.js
+++ /dev/null
@@ -1,1332 +0,0 @@
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/liquid', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text', 'ace/tokenizer', 'ace/mode/liquid_highlight_rules', 'ace/mode/matching_brace_outdent', 'ace/range'], function(require, exports, module) {
-
-var oop = require("../lib/oop");
-var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
-var LiquidHighlightRules = require("./liquid_highlight_rules").LiquidHighlightRules;
-var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
-var Range = require("../range").Range;
-
-var Mode = function() {
-    this.$tokenizer = new Tokenizer(new LiquidHighlightRules().getRules());
-    this.$outdent = new MatchingBraceOutdent();
-};
-oop.inherits(Mode, TextMode);
-
-(function() {
-
-    this.toggleCommentLines = function(state, doc, startRow, endRow) {
-        var outdent = true;
-        var outentedRows = [];
-        var re = /^(\s*)#/;
-
-        for (var i=startRow; i<= endRow; i++) {
-            if (!re.test(doc.getLine(i))) {
-                outdent = false;
-                break;
-            }
-        }
-
-        if (outdent) {
-            var deleteRange = new Range(0, 0, 0, 0);
-            for (var i=startRow; i<= endRow; i++)
-            {
-                var line = doc.getLine(i);
-                var m = line.match(re);
-                deleteRange.start.row = i;
-                deleteRange.end.row = i;
-                deleteRange.end.column = m[0].length;
-                doc.replace(deleteRange, m[1]);
-            }
-        }
-        else {
-            doc.indentRows(startRow, endRow, "#");
-        }
-    };
-
-    this.getNextLineIndent = function(state, line, tab) {
-        var indent = this.$getIndent(line);
-
-        var tokenizedLine = this.$tokenizer.getLineTokens(line, state);
-        var tokens = tokenizedLine.tokens;
-        var endState = tokenizedLine.state;
-
-        if (tokens.length && tokens[tokens.length-1].type == "comment") {
-            return indent;
-        }
-
-        if (state == "start") {
-            var match = line.match(/^.*[\{\(\[]\s*$/);
-            if (match) {
-                indent += tab;
-            }
-        }
-
-        return indent;
-    };
-
-    this.checkOutdent = function(state, line, input) {
-        return this.$outdent.checkOutdent(line, input);
-    };
-
-    this.autoOutdent = function(state, doc, row) {
-        this.$outdent.autoOutdent(doc, row);
-    };
-
-}).call(Mode.prototype);
-
-exports.Mode = Mode;
-});
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/liquid_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/css_highlight_rules', 'ace/mode/javascript_highlight_rules', 'ace/lib/lang', 'ace/mode/xml_util', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var CssHighlightRules = require("./css_highlight_rules").CssHighlightRules;
-var JavaScriptHighlightRules = require("./javascript_highlight_rules").JavaScriptHighlightRules;
-var lang = require("../lib/lang");
-var xmlUtil = require("./xml_util");
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-
-var LiquidHighlightRules = function() {
-
-    // see: https://developer.mozilla.org/en/Liquid/Reference/Global_Objects
-    var functions = lang.arrayToMap(
-      // Standard Filters
-        ("date|capitalize|downcase|upcase|first|last|join|sort|map|size|escape|" +
-         "escape_once|strip_html|strip_newlines|newline_to_br|replace|replace_first|" +
-         "truncate|truncatewords|prepend|append|minus|plus|times|divided_by|split"
-      ).split("|")
-    );
-
-    var keywords = lang.arrayToMap(
-      // Standard Tags
-        ("capture|endcapture|case|endcase|when|comment|endcomment|" +
-        "cycle|for|endfor|in|reversed|if|endif|else|elsif|include|endinclude|unless|endunless|" +
-     // Commonly used tags
-        "style|text|image|widget|plugin|marker|endmarker|tablerow|endtablerow").split("|")
-    );
-
-    var builtinVariables = lang.arrayToMap(
-        ['forloop']
-        // ("forloop\\.(length|index|index0|rindex|rindex0|first|last)|limit|offset|range" +
-        // "tablerowloop\\.(length|index|index0|rindex|rindex0|first|last|col|col0|"+
-        // "col_first|col_last)").split("|")
-    );
-
-    var definitions = lang.arrayToMap(("assign").split("|"));
-
-    // regexp must not have capturing parentheses. Use (?:) instead.
-    // regexps are ordered -> the first match is used
-
-    this.$rules = {
-            start : [{
-                token : "variable",
-                regex : "{%",
-                next : "liquid_start"
-            }, {
-                token : "variable",
-                regex : "{{",
-                next : "liquid_start"
-            }, {
-                token : "meta.tag",
-                merge : true,
-                regex : "<\\!\\[CDATA\\[",
-                next : "cdata"
-            }, {
-                token : "xml_pe",
-                regex : "<\\?.*?\\?>"
-            }, {
-                token : "comment",
-                merge : true,
-                regex : "<\\!--",
-                next : "comment"
-            }, {
-                token : "meta.tag",
-                regex : "<(?=\\s*script\\b)",
-                next : "script"
-            }, {
-                token : "meta.tag",
-                regex : "<(?=\\s*style\\b)",
-                next : "style"
-            }, {
-                token : "meta.tag", // opening tag
-                regex : "<\\/?",
-                next : "tag"
-            }, {
-                token : "text",
-                regex : "\\s+"
-            }, {
-                token : "text",
-                regex : "[^<]+"
-            } ],
-
-            cdata : [ {
-                token : "text",
-                regex : "\\]\\]>",
-                next : "start"
-            }, {
-                token : "text",
-                merge : true,
-                regex : "\\s+"
-            }, {
-                token : "text",
-                merge : true,
-                regex : ".+"
-            } ],
-
-            comment : [ {
-                token : "comment",
-                regex : ".*?-->",
-                next : "start"
-            }, {
-                token : "comment",
-                merge : true,
-                regex : ".+"
-            } ] ,
-
-            liquid_start : [{
-                token: "variable",
-                regex: "}}",
-                next: "start"
-            }, {
-                token: "variable",
-                regex: "%}",
-                next: "start"
-            }, {
-                token : "string", // single line
-                regex : '["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'
-            }, {
-                token : "string", // single line
-                regex : "['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"
-            }, {
-                token : "constant.numeric", // hex
-                regex : "0[xX][0-9a-fA-F]+\\b"
-            }, {
-                token : "constant.numeric", // float
-                regex : "[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"
-            }, {
-                token : "constant.language.boolean",
-                regex : "(?:true|false)\\b"
-            }, {
-                token : function(value) {
-                    if (functions.hasOwnProperty(value))
-                        return "support.function";
-                    else if (keywords.hasOwnProperty(value))
-                        return "keyword";
-                    else if (builtinVariables.hasOwnProperty(value))
-                        return "variable.language";
-                    else if (definitions.hasOwnProperty(value))
-                        return "keyword.definition";
-                    else
-                        return "identifier";
-                },
-                regex : "[a-zA-Z_$][a-zA-Z0-9_$]*\\b"
-            }, {
-                token : "keyword.operator",
-                regex : "\/|\\*|\\-|\\+|=|!=|\\?\\:"
-            }, {
-                token : "paren.lparen",
-                regex : /[\[\({]/
-            }, {
-                token : "paren.rparen",
-                regex : /[\])}]/
-            }, {
-                token : "text",
-                regex : "\\s+"
-            }]
-    };
-
-    xmlUtil.tag(this.$rules, "tag", "start");
-    xmlUtil.tag(this.$rules, "style", "css-start");
-    xmlUtil.tag(this.$rules, "script", "js-start");
-
-    this.embedRules(JavaScriptHighlightRules, "js-", [{
-        token: "comment",
-        regex: "\\/\\/.*(?=<\\/script>)",
-        next: "tag"
-    }, {
-        token: "meta.tag",
-        regex: "<\\/(?=script)",
-        next: "tag"
-    }]);
-
-    this.embedRules(CssHighlightRules, "css-", [{
-        token: "meta.tag",
-        regex: "<\\/(?=style)",
-        next: "tag"
-    }]);
-};
-oop.inherits(LiquidHighlightRules, TextHighlightRules);
-
-exports.LiquidHighlightRules = LiquidHighlightRules;
-});
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/css_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/lang', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var lang = require("../lib/lang");
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-
-var CssHighlightRules = function() {
-
-    var properties = lang.arrayToMap(
-        ("animation-fill-mode|alignment-adjust|alignment-baseline|animation-delay|animation-direction|animation-duration|animation-iteration-count|animation-name|animation-play-state|animation-timing-function|animation|appearance|azimuth|backface-visibility|background-attachment|background-break|background-clip|background-color|background-image|background-origin|background-position|background-repeat|background-size|background|baseline-shift|binding|bleed|bookmark-label|bookmark-level|bookmark-state|bookmark-target|border-bottom|border-bottom-color|border-bottom-left-radius|border-bottom-right-radius|border-bottom-style|border-bottom-width|border-collapse|border-color|border-image|border-image-outset|border-image-repeat|border-image-slice|border-image-source|border-image-width|border-left|border-left-color|border-left-style|border-left-width|border-radius|border-right|border-right-color|border-right-style|border-right-width|border-spacing|border-style|border-top|border-top-color|border-top-left-radius|border-top-right-radius|border-top-style|border-top-width|border-width|border|bottom|box-align|box-decoration-break|box-direction|box-flex-group|box-flex|box-lines|box-ordinal-group|box-orient|box-pack|box-shadow|box-sizing|break-after|break-before|break-inside|caption-side|clear|clip|color-profile|color|column-count|column-fill|column-gap|column-rule|column-rule-color|column-rule-style|column-rule-width|column-span|column-width|columns|content|counter-increment|counter-reset|crop|cue-after|cue-before|cue|cursor|direction|display|dominant-baseline|drop-initial-after-adjust|drop-initial-after-align|drop-initial-before-adjust|drop-initial-before-align|drop-initial-size|drop-initial-value|elevation|empty-cells|fit|fit-position|float-offset|float|font-family|font-size|font-size-adjust|font-stretch|font-style|font-variant|font-weight|font|grid-columns|grid-rows|hanging-punctuation|height|hyphenate-after|hyphenate-before|hyphenate-character|hyphenate-lines|hyphenate-resource|hyphens|icon|image-orientation|image-rendering|image-resolution|inline-box-align|left|letter-spacing|line-height|line-stacking-ruby|line-stacking-shift|line-stacking-strategy|line-stacking|list-style-image|list-style-position|list-style-type|list-style|margin-bottom|margin-left|margin-right|margin-top|margin|mark-after|mark-before|mark|marks|marquee-direction|marquee-play-count|marquee-speed|marquee-style|max-height|max-width|min-height|min-width|move-to|nav-down|nav-index|nav-left|nav-right|nav-up|opacity|orphans|outline-color|outline-offset|outline-style|outline-width|outline|overflow-style|overflow-x|overflow-y|overflow|padding-bottom|padding-left|padding-right|padding-top|padding|page-break-after|page-break-before|page-break-inside|page-policy|page|pause-after|pause-before|pause|perspective-origin|perspective|phonemes|pitch-range|pitch|play-during|position|presentation-level|punctuation-trim|quotes|rendering-intent|resize|rest-after|rest-before|rest|richness|right|rotation-point|rotation|ruby-align|ruby-overhang|ruby-position|ruby-span|size|speak-header|speak-numeral|speak-punctuation|speak|speech-rate|stress|string-set|table-layout|target-name|target-new|target-position|target|text-align-last|text-align|text-decoration|text-emphasis|text-height|text-indent|text-justify|text-outline|text-shadow|text-transform|text-wrap|top|transform-origin|transform-style|transform|transition-delay|transition-duration|transition-property|transition-timing-function|transition|unicode-bidi|vertical-align|visibility|voice-balance|voice-duration|voice-family|voice-pitch-range|voice-pitch|voice-rate|voice-stress|voice-volume|volume|white-space-collapse|white-space|widows|width|word-break|word-spacing|word-wrap|z-index").split("|")
-    );
-
-    var functions = lang.arrayToMap(
-        ("rgb|rgba|url|attr|counter|counters").split("|")
-    );
-
-    var constants = lang.arrayToMap(
-        ("absolute|after-edge|after|all-scroll|all|alphabetic|always|antialiased|armenian|auto|avoid-column|avoid-page|avoid|balance|baseline|before-edge|before|below|bidi-override|block-line-height|block|bold|bolder|border-box|both|bottom|box|break-all|break-word|capitalize|caps-height|caption|center|central|char|circle|cjk-ideographic|clone|close-quote|col-resize|collapse|column|consider-shifts|contain|content-box|cover|crosshair|cubic-bezier|dashed|decimal-leading-zero|decimal|default|disabled|disc|disregard-shifts|distribute-all-lines|distribute-letter|distribute-space|distribute|dotted|double|e-resize|ease-in|ease-in-out|ease-out|ease|ellipsis|end|exclude-ruby|fill|fixed|font-size|font|georgian|glyphs|grid-height|groove|hand|hanging|hebrew|help|hidden|hiragana-iroha|hiragana|horizontal|icon|ideograph-alpha|ideograph-numeric|ideograph-parenthesis|ideograph-space|ideographic|inactive|include-ruby|inherit|initial|inline-block|inline-box|inline-line-height|inline-table|inline|inset|inside|inter-ideograph|inter-word|invert|italic|justify|katakana-iroha|katakana|keep-all|last|left|lighter|line-edge|line-through|line|linear|list-item|local|loose|lower-alpha|lower-greek|lower-latin|lower-roman|lowercase|lr-tb|ltr|mathematical|max-height|max-size|medium|menu|message-box|middle|move|n-resize|ne-resize|newspaper|no-change|no-close-quote|no-drop|no-open-quote|no-repeat|none|normal|not-allowed|nowrap|nw-resize|oblique|open-quote|outset|outside|overline|padding-box|page|pointer|pre-line|pre-wrap|pre|preserve-3d|progress|relative|repeat-x|repeat-y|repeat|replaced|reset-size|ridge|right|round|row-resize|rtl|s-resize|scroll|se-resize|separate|slice|small-caps|small-caption|solid|space|square|start|static|status-bar|step-end|step-start|steps|stretch|strict|sub|super|sw-resize|table-caption|table-cell|table-column-group|table-column|table-footer-group|table-header-group|table-row-group|table-row|table|tb-rl|text-after-edge|text-before-edge|text-bottom|text-size|text-top|text|thick|thin|top|transparent|underline|upper-alpha|upper-latin|upper-roman|uppercase|use-script|vertical-ideographic|vertical-text|visible|w-resize|wait|whitespace|z-index|zero").split("|")
-    );
-
-    var colors = lang.arrayToMap(
-        ("aqua|black|blue|fuchsia|gray|green|lime|maroon|navy|olive|orange|" +
-        "purple|red|silver|teal|white|yellow").split("|")
-    );
-
-    var fonts = lang.arrayToMap(
-        ("arial|century|comic|courier|garamond|georgia|helvetica|impact|lucida|" +
-        "symbol|system|tahoma|times|trebuchet|utopia|verdana|webdings|sans-serif|" +
-        "serif|monospace").split("|")
-    );
-    
-    // regexp must not have capturing parentheses. Use (?:) instead.
-    // regexps are ordered -> the first match is used
-
-    var numRe = "\\-?(?:(?:[0-9]+)|(?:[0-9]*\\.[0-9]+))";
-    var pseudoElements = "(\\:+)\\b(after|before|first-letter|first-line|moz-selection|selection)\\b";
-    var pseudoClasses = "(:)\\b(active|checked|disabled|empty|enabled|first-child|first-of-type|focus|hover|indeterminate|invalid|last-child|last-of-type|link|not|nth-child|nth-last-child|nth-last-of-type|nth-of-type|only-child|only-of-type|required|root|target|valid|visited)\\b";
-    
-    var base_ruleset = [
-        {
-            token : "comment", // multi line comment
-            merge : true,
-            regex : "\\/\\*",
-            next : "ruleset_comment"
-        }, {
-            token : "string", // single line
-            regex : '["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'
-        }, {
-            token : "string", // single line
-            regex : "['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"
-        }, {
-            token : ["constant.numeric", "keyword"],
-            regex : "(" + numRe + ")(ch|cm|deg|em|ex|fr|gd|grad|Hz|in|kHz|mm|ms|pc|pt|px|rad|rem|s|turn|vh|vm|vw|%)"
-        }, {
-            token : ["constant.numeric"],
-            regex : "([0-9]+)"
-        }, {
-            token : "constant.numeric",  // hex6 color
-            regex : "#[a-f0-9]{6}"
-        }, {
-            token : "constant.numeric", // hex3 color
-            regex : "#[a-f0-9]{3}"
-        }, {
-            token : ["punctuation", "entity.other.attribute-name.pseudo-element.css"], 
-            regex : pseudoElements
-        }, {
-            token : ["punctuation", "entity.other.attribute-name.pseudo-class.css"], 
-            regex : pseudoClasses
-        }, {
-            token : function(value) {
-                if (properties.hasOwnProperty(value.toLowerCase())) {
-                    return "support.type";
-                }
-                else if (functions.hasOwnProperty(value.toLowerCase())) {
-                    return "support.function";
-                }
-                else if (constants.hasOwnProperty(value.toLowerCase())) {
-                    return "support.constant";
-                }
-                else if (colors.hasOwnProperty(value.toLowerCase())) {
-                    return "support.constant.color";
-                }
-                else if (fonts.hasOwnProperty(value.toLowerCase())) {
-                    return "support.constant.fonts";
-                }
-                else {
-                    return "text";
-                }
-            },
-            regex : "\\-?[a-zA-Z_][a-zA-Z0-9_\\-]*"
-        } 
-      ];
-
-    var ruleset = lang.copyArray(base_ruleset);
-    ruleset.unshift({
-        token : "paren.rparen",
-        regex : "\\}",
-        next:   "start"
-    });
-
-    var media_ruleset = lang.copyArray( base_ruleset );
-    media_ruleset.unshift({
-        token : "paren.rparen",
-        regex : "\\}",
-        next:   "media"
-    });
-
-    var base_comment = [{
-          token : "comment", // comment spanning whole line
-          merge : true,
-          regex : ".+"
-    }];
-
-    var comment = lang.copyArray(base_comment);
-    comment.unshift({
-          token : "comment", // closing comment
-          regex : ".*?\\*\\/",
-          next : "start"
-    });
-
-    var media_comment = lang.copyArray(base_comment);
-    media_comment.unshift({
-          token : "comment", // closing comment
-          regex : ".*?\\*\\/",
-          next : "media"
-    });
-
-    var ruleset_comment = lang.copyArray(base_comment);
-    ruleset_comment.unshift({
-          token : "comment", // closing comment
-          regex : ".*?\\*\\/",
-          next : "ruleset"
-    });
-
-    this.$rules = {
-        "start" : [{
-            token : "comment", // multi line comment
-            merge : true,
-            regex : "\\/\\*",
-            next : "comment"
-        }, {
-            token: "paren.lparen",
-            regex: "\\{",
-            next:  "ruleset"
-        }, {
-            token: "string",
-            regex: "@.*?{",
-            next:  "media"
-        },{
-            token: "keyword",
-            regex: "#[a-z0-9-_]+"
-        },{
-            token: "variable",
-            regex: "\\.[a-z0-9-_]+"
-        },{
-            token: "string",
-            regex: ":[a-z0-9-_]+"
-        },{
-            token: "constant",
-            regex: "[a-z0-9-_]+"
-        }],
-
-        "media" : [ {
-            token : "comment", // multi line comment
-            merge : true,
-            regex : "\\/\\*",
-            next : "media_comment"
-        }, {
-            token: "paren.lparen",
-            regex: "\\{",
-            next:  "media_ruleset"
-        },{
-            token: "string",
-            regex: "\\}",
-            next:  "start"
-        },{
-            token: "keyword",
-            regex: "#[a-z0-9-_]+"
-        },{
-            token: "variable",
-            regex: "\\.[a-z0-9-_]+"
-        },{
-            token: "string",
-            regex: ":[a-z0-9-_]+"
-        },{
-            token: "constant",
-            regex: "[a-z0-9-_]+"
-        }],
-
-        "comment" : comment,
-
-        "ruleset" : ruleset,
-        "ruleset_comment" : ruleset_comment,
-
-        "media_ruleset" : media_ruleset,
-        "media_comment" : media_comment
-    };
-};
-
-oop.inherits(CssHighlightRules, TextHighlightRules);
-
-exports.CssHighlightRules = CssHighlightRules;
-
-});
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *      Mihai Sucan <mihai DOT sucan AT gmail DOT com>
- *
- * 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 ***** */
-
-define('ace/mode/javascript_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/lang', 'ace/unicode', 'ace/mode/doc_comment_highlight_rules', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var lang = require("../lib/lang");
-var unicode = require("../unicode");
-var DocCommentHighlightRules = require("./doc_comment_highlight_rules").DocCommentHighlightRules;
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-
-var JavaScriptHighlightRules = function() {
-
-    // see: https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects
-    var globals = lang.arrayToMap(
-      // Constructors
-        ("Array|Boolean|Date|Function|Iterator|Number|Object|RegExp|String|Proxy|" +
-      // E4X
-         "Namespace|QName|XML|XMLList|" +
-         "ArrayBuffer|Float32Array|Float64Array|Int16Array|Int32Array|Int8Array|" +
-         "Uint16Array|Uint32Array|Uint8Array|Uint8ClampedArray|" +
-      // Errors
-        "Error|EvalError|InternalError|RangeError|ReferenceError|StopIteration|" +
-        "SyntaxError|TypeError|URIError|" +
-      //  Non-constructor functions
-        "decodeURI|decodeURIComponent|encodeURI|encodeURIComponent|eval|isFinite|" +
-        "isNaN|parseFloat|parseInt|" +
-      // Other
-        "JSON|Math|" +
-      // Pseudo
-        "this|arguments|prototype|window|document"
-      ).split("|")
-    );
-
-    var keywords = lang.arrayToMap(
-        ("break|case|catch|continue|default|delete|do|else|finally|for|function|" +
-        "if|in|instanceof|new|return|switch|throw|try|typeof|let|var|while|with|" +
-        "const|yield|import|get|set").split("|")
-    );
-
-    // keywords which can be followed by regular expressions
-    var kwBeforeRe = "case|do|else|finally|in|instanceof|return|throw|try|typeof|yield";
-
-    var deprecated = lang.arrayToMap(
-        ("__parent__|__count__|escape|unescape|with|__proto__").split("|")
-    );
-
-    var definitions = lang.arrayToMap(("const|let|var|function").split("|"));
-
-    var buildinConstants = lang.arrayToMap(
-        ("null|Infinity|NaN|undefined").split("|")
-    );
-
-    var futureReserved = lang.arrayToMap(
-        ("class|enum|extends|super|export|implements|private|" +
-        "public|interface|package|protected|static").split("|")
-    );
-
-    // TODO: Unicode escape sequences
-    var identifierRe = "[" + unicode.packages.L + "\\$_]["
-        + unicode.packages.L
-        + unicode.packages.Mn + unicode.packages.Mc
-        + unicode.packages.Nd
-        + unicode.packages.Pc + "\\$_]*\\b";
-
-    var escapedRe = "\\\\(?:x[0-9a-fA-F]{2}|" + // hex
-        "u[0-9a-fA-F]{4}|" + // unicode
-        "[0-2][0-7]{0,2}|" + // oct
-        "3[0-6][0-7]?|" + // oct
-        "37[0-7]?|" + // oct
-        "[4-7][0-7]?|" + //oct
-        ".)";
-
-    // regexp must not have capturing parentheses. Use (?:) instead.
-    // regexps are ordered -> the first match is used
-
-    this.$rules = {
-        "start" : [
-            {
-                token : "comment",
-                regex : /\/\/.*$/
-            },
-            new DocCommentHighlightRules().getStartRule("doc-start"),
-            {
-                token : "comment", // multi line comment
-                merge : true,
-                regex : /\/\*/,
-                next : "comment"
-            }, {
-                token : "string",
-                regex : "'",
-                next  : "qstring"
-            }, {
-                token : "string",
-                regex : '"',
-                next  : "qqstring"
-            }, {
-                token : "constant.numeric", // hex
-                regex : /0[xX][0-9a-fA-F]+\b/
-            }, {
-                token : "constant.numeric", // float
-                regex : /[+-]?\d+(?:(?:\.\d*)?(?:[eE][+-]?\d+)?)?\b/
-            }, { // match stuff like: Sound.prototype.play = function() { }
-                token : [
-                    "storage.type",
-                    "punctuation.operator",
-                    "support.function",
-                    "punctuation.operator",
-                    "entity.name.function",
-                    "text",
-                    "keyword.operator",
-                    "text",
-                    "storage.type",
-                    "text",
-                    "paren.lparen",
-                    "variable.parameter",
-                    "paren.rparen"
-                ],
-                regex : "(" + identifierRe + ")(\\.)(prototype)(\\.)(" + identifierRe +")(\\s*)(=)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"
-            }, { // match stuff like: Sound.prototype.play = myfunc
-                token : [
-                    "storage.type",
-                    "punctuation.operator",
-                    "support.function",
-                    "punctuation.operator",
-                    "entity.name.function",
-                    "text",
-                    "keyword.operator",
-                    "text"
-                ],
-                regex : "(" + identifierRe + ")(\\.)(prototype)(\\.)(" + identifierRe +")(\\s*)(=)(\\s*)"
-            }, { // match stuff like: Sound.play = function() {  }
-                token : [
-                    "storage.type",
-                    "punctuation.operator",
-                    "entity.name.function",
-                    "text",
-                    "keyword.operator",
-                    "text",
-                    "storage.type",
-                    "text",
-                    "paren.lparen",
-                    "variable.parameter",
-                    "paren.rparen"
-                ],
-                regex : "(" + identifierRe + ")(\\.)(" + identifierRe +")(\\s*)(=)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"
-            }, { // match stuff like: play = function() {  }
-                token : [
-                    "entity.name.function",
-                    "text",
-                    "keyword.operator",
-                    "text",
-                    "storage.type",
-                    "text",
-                    "paren.lparen",
-                    "variable.parameter",
-                    "paren.rparen"
-                ],
-                regex : "(" + identifierRe +")(\\s*)(=)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"
-            }, { // match regular function like: function myFunc(arg) { }
-                token : [
-                    "storage.type",
-                    "text",
-                    "entity.name.function",
-                    "text",
-                    "paren.lparen",
-                    "variable.parameter",
-                    "paren.rparen"
-                ],
-                regex : "(function)(\\s+)(" + identifierRe + ")(\\s*)(\\()(.*?)(\\))"
-            }, { // match stuff like: foobar: function() { }
-                token : [
-                    "entity.name.function",
-                    "text",
-                    "punctuation.operator",
-                    "text",
-                    "storage.type",
-                    "text",
-                    "paren.lparen",
-                    "variable.parameter",
-                    "paren.rparen"
-                ],
-                regex : "(" + identifierRe + ")(\\s*)(:)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"
-            }, { // Attempt to match : function() { } (this is for issues with 'foo': function() { })
-                token : [
-                    "text",
-                    "text",
-                    "storage.type",
-                    "text",
-                    "paren.lparen",
-                    "variable.parameter",
-                    "paren.rparen"
-                ],
-                regex : "(:)(\\s*)(function)?(\\s*)(\\()([^)]*)(\\))"
-            }, {
-                token : "constant.language.boolean",
-                regex : /(?:true|false)\b/
-            }, {
-                token : "keyword",
-                regex : "(?:" + kwBeforeRe + ")\\b",
-                next : "regex_allowed"
-            }, {
-                token : ["punctuation.operator", "support.function"],
-                regex : /(\.)(s(?:h(?:ift|ow(?:Mod(?:elessDialog|alDialog)|Help))|croll(?:X|By(?:Pages|Lines)?|Y|To)?|t(?:opzzzz|rike)|i(?:n|zeToContent|debar|gnText)|ort|u(?:p|b(?:str(?:ing)?)?)|pli(?:ce|t)|e(?:nd|t(?:Re(?:sizable|questHeader)|M(?:i(?:nutes|lliseconds)|onth)|Seconds|Ho(?:tKeys|urs)|Year|Cursor|Time(?:out)?|Interval|ZOptions|Date|UTC(?:M(?:i(?:nutes|lliseconds)|onth)|Seconds|Hours|Date|FullYear)|FullYear|Active)|arch)|qrt|lice|avePreferences|mall)|h(?:ome|andleEvent)|navigate|c(?:har(?:CodeAt|At)|o(?:s|n(?:cat|textual|firm)|mpile)|eil|lear(?:Timeout|Interval)?|a(?:ptureEvents|ll)|reate(?:StyleSheet|Popup|EventObject))|t(?:o(?:GMTString|S(?:tring|ource)|U(?:TCString|pperCase)|Lo(?:caleString|werCase))|est|a(?:n|int(?:Enabled)?))|i(?:s(?:NaN|Finite)|ndexOf|talics)|d(?:isableExternalCapture|ump|etachEvent)|u(?:n(?:shift|taint|escape|watch)|pdateCommands)|j(?:oin|avaEnabled)|p(?:o(?:p|w)|ush|lugins.refresh|a(?:ddings|rse(?:Int|Float)?)|r(?:int|ompt|eference))|e(?:scape|nableExternalCapture|val|lementFromPoint|x(?:p|ec(?:Script|Command)?))|valueOf|UTC|queryCommand(?:State|Indeterm|Enabled|Value)|f(?:i(?:nd|le(?:ModifiedDate|Size|CreatedDate|UpdatedDate)|xed)|o(?:nt(?:size|color)|rward)|loor|romCharCode)|watch|l(?:ink|o(?:ad|g)|astIndexOf)|a(?:sin|nchor|cos|t(?:tachEvent|ob|an(?:2)?)|pply|lert|b(?:s|ort))|r(?:ou(?:nd|teEvents)|e(?:size(?:By|To)|calc|turnValue|place|verse|l(?:oad|ease(?:Capture|Events)))|andom)|g(?:o|et(?:ResponseHeader|M(?:i(?:nutes|lliseconds)|onth)|Se(?:conds|lection)|Hours|Year|Time(?:zoneOffset)?|Da(?:y|te)|UTC(?:M(?:i(?:nutes|lliseconds)|onth)|Seconds|Hours|Da(?:y|te)|FullYear)|FullYear|A(?:ttention|llResponseHeaders)))|m(?:in|ove(?:B(?:y|elow)|To(?:Absolute)?|Above)|ergeAttributes|a(?:tch|rgins|x))|b(?:toa|ig|o(?:ld|rderWidths)|link|ack))\b(?=\()/
-            }, {
-                token : ["punctuation.operator", "support.function.dom"],
-                regex : /(\.)(s(?:ub(?:stringData|mit)|plitText|e(?:t(?:NamedItem|Attribute(?:Node)?)|lect))|has(?:ChildNodes|Feature)|namedItem|c(?:l(?:ick|o(?:se|neNode))|reate(?:C(?:omment|DATASection|aption)|T(?:Head|extNode|Foot)|DocumentFragment|ProcessingInstruction|E(?:ntityReference|lement)|Attribute))|tabIndex|i(?:nsert(?:Row|Before|Cell|Data)|tem)|open|delete(?:Row|C(?:ell|aption)|T(?:Head|Foot)|Data)|focus|write(?:ln)?|a(?:dd|ppend(?:Child|Data))|re(?:set|place(?:Child|Data)|move(?:NamedItem|Child|Attribute(?:Node)?)?)|get(?:NamedItem|Element(?:sBy(?:Name|TagName)|ById)|Attribute(?:Node)?)|blur)\b(?=\()/
-            }, {
-                token : ["punctuation.operator", "support.constant"],
-                regex : /(\.)(s(?:ystemLanguage|cr(?:ipts|ollbars|een(?:X|Y|Top|Left))|t(?:yle(?:Sheets)?|atus(?:Text|bar)?)|ibling(?:Below|Above)|ource|uffixes|e(?:curity(?:Policy)?|l(?:ection|f)))|h(?:istory|ost(?:name)?|as(?:h|Focus))|y|X(?:MLDocument|SLDocument)|n(?:ext|ame(?:space(?:s|URI)|Prop))|M(?:IN_VALUE|AX_VALUE)|c(?:haracterSet|o(?:n(?:structor|trollers)|okieEnabled|lorDepth|mp(?:onents|lete))|urrent|puClass|l(?:i(?:p(?:boardData)?|entInformation)|osed|asses)|alle(?:e|r)|rypto)|t(?:o(?:olbar|p)|ext(?:Transform|Indent|Decoration|Align)|ags)|SQRT(?:1_2|2)|i(?:n(?:ner(?:Height|Width)|put)|ds|gnoreCase)|zIndex|o(?:scpu|n(?:readystatechange|Line)|uter(?:Height|Width)|p(?:sProfile|ener)|ffscreenBuffering)|NEGATIVE_INFINITY|d(?:i(?:splay|alog(?:Height|Top|Width|Left|Arguments)|rectories)|e(?:scription|fault(?:Status|Ch(?:ecked|arset)|View)))|u(?:ser(?:Profile|Language|Agent)|n(?:iqueID|defined)|pdateInterval)|_content|p(?:ixelDepth|ort|ersonalbar|kcs11|l(?:ugins|atform)|a(?:thname|dding(?:Right|Bottom|Top|Left)|rent(?:Window|Layer)?|ge(?:X(?:Offset)?|Y(?:Offset)?))|r(?:o(?:to(?:col|type)|duct(?:Sub)?|mpter)|e(?:vious|fix)))|e(?:n(?:coding|abledPlugin)|x(?:ternal|pando)|mbeds)|v(?:isibility|endor(?:Sub)?|Linkcolor)|URLUnencoded|P(?:I|OSITIVE_INFINITY)|f(?:ilename|o(?:nt(?:Size|Family|Weight)|rmName)|rame(?:s|Element)|gColor)|E|whiteSpace|l(?:i(?:stStyleType|n(?:eHeight|kColor))|o(?:ca(?:tion(?:bar)?|lName)|wsrc)|e(?:ngth|ft(?:Context)?)|a(?:st(?:M(?:odified|atch)|Index|Paren)|yer(?:s|X)|nguage))|a(?:pp(?:MinorVersion|Name|Co(?:deName|re)|Version)|vail(?:Height|Top|Width|Left)|ll|r(?:ity|guments)|Linkcolor|bove)|r(?:ight(?:Context)?|e(?:sponse(?:XML|Text)|adyState))|global|x|m(?:imeTypes|ultiline|enubar|argin(?:Right|Bottom|Top|Left))|L(?:N(?:10|2)|OG(?:10E|2E))|b(?:o(?:ttom|rder(?:Width|RightWidth|BottomWidth|Style|Color|TopWidth|LeftWidth))|ufferDepth|elow|ackground(?:Color|Image)))\b/
-            }, {
-                token : ["storage.type", "punctuation.operator", "support.function.firebug"],
-                regex : /(console)(\.)(warn|info|log|error|time|timeEnd|assert)\b/
-            }, {
-                token : function(value) {
-                    if (globals.hasOwnProperty(value))
-                        return "variable.language";
-                    else if (deprecated.hasOwnProperty(value))
-                        return "invalid.deprecated";
-                    else if (definitions.hasOwnProperty(value))
-                        return "storage.type";
-                    else if (keywords.hasOwnProperty(value))
-                        return "keyword";
-                    else if (buildinConstants.hasOwnProperty(value))
-                        return "constant.language";
-                    else if (futureReserved.hasOwnProperty(value))
-                        return "invalid.illegal";
-                    else if (value == "debugger")
-                        return "invalid.deprecated";
-                    else
-                        return "identifier";
-                },
-                regex : identifierRe
-            }, {
-                token : "keyword.operator",
-                regex : /!|\$|%|&|\*|\-\-|\-|\+\+|\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\|\||\?\:|\*=|%=|\+=|\-=|&=|\^=|\b(?:in|instanceof|new|delete|typeof|void)/,
-                next  : "regex_allowed"
-            }, {
-                token : "punctuation.operator",
-                regex : /\?|\:|\,|\;|\./,
-                next  : "regex_allowed"
-            }, {
-                token : "paren.lparen",
-                regex : /[\[({]/,
-                next  : "regex_allowed"
-            }, {
-                token : "paren.rparen",
-                regex : /[\])}]/
-            }, {
-                token : "keyword.operator",
-                regex : /\/=?/,
-                next  : "regex_allowed"
-            }, {
-                token: "comment",
-                regex: /^#!.*$/
-            }, {
-                token : "text",
-                regex : /\s+/
-            }
-        ],
-        // regular expressions are only allowed after certain tokens. This
-        // makes sure we don't mix up regexps with the divison operator
-        "regex_allowed": [
-            {
-                token : "comment", // multi line comment
-                merge : true,
-                regex : "\\/\\*",
-                next : "comment_regex_allowed"
-            }, {
-                token : "comment",
-                regex : "\\/\\/.*$"
-            }, {
-                token: "string.regexp",
-                regex: "\\/",
-                next: "regex",
-                merge: true
-            }, {
-                token : "text",
-                regex : "\\s+"
-            }, {
-                // immediately return to the start mode without matching
-                // anything
-                token: "empty",
-                regex: "",
-                next: "start"
-            }
-        ],
-        "regex": [
-            {
-                token: "regexp.keyword.operator",
-                regex: "\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)",
-                next: "regex"
-            }, {
-				// flag
-                token: "string.regexp",
-                regex: "/\\w*",
-                next: "start",
-                merge: true
-            }, {
-                token: "string.regexp",
-                regex: "[^\\\\/\\[]+",
-                next: "regex",
-                merge: true
-            }, {
-                token: "string.regexp.charachterclass",
-                regex: "\\[",
-                next: "regex_character_class",
-                merge: true
-            }, {
-                token: "empty",
-                regex: "",
-                next: "start"
-            }
-        ],
-        "regex_character_class": [
-            {
-                token: "regexp.keyword.operator",
-                regex: "\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)",
-                next: "regex_character_class"
-            }, {
-                token: "string.regexp.charachterclass",
-                regex: "]",
-                next: "regex",
-                merge: true
-            }, {
-                token: "string.regexp.charachterclass",
-                regex: "[^\\\\\\]]+",
-                next: "regex_character_class",
-                merge: true
-            }, {
-                token: "empty",
-                regex: "",
-                next: "start"
-            }
-        ],
-        "comment_regex_allowed" : [
-            {
-                token : "comment", // closing comment
-                regex : ".*?\\*\\/",
-                merge : true,
-                next : "regex_allowed"
-            }, {
-                token : "comment", // comment spanning whole line
-                merge : true,
-                regex : ".+"
-            }
-        ],
-        "comment" : [
-            {
-                token : "comment", // closing comment
-                regex : ".*?\\*\\/",
-                merge : true,
-                next : "start"
-            }, {
-                token : "comment", // comment spanning whole line
-                merge : true,
-                regex : ".+"
-            }
-        ],
-        "qqstring" : [
-            {
-                token : "constant.language.escape",
-                regex : escapedRe
-            }, {
-                token : "string",
-                regex : '[^"\\\\]+'
-            }, {
-                token : "string",
-                regex : '"',
-                next  : "start"
-            }
-        ],
-        "qstring" : [
-            {
-                token : "constant.language.escape",
-                regex : escapedRe
-            }, {
-                token : "string",
-                regex : "[^'\\\\]+"
-            }, {
-                token : "string",
-                regex : "'",
-                next  : "start"
-            }
-        ]
-    };
-
-    this.embedRules(DocCommentHighlightRules, "doc-",
-        [ new DocCommentHighlightRules().getEndRule("start") ]);
-};
-
-oop.inherits(JavaScriptHighlightRules, TextHighlightRules);
-
-exports.JavaScriptHighlightRules = JavaScriptHighlightRules;
-});
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/doc_comment_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-
-var DocCommentHighlightRules = function() {
-
-    this.$rules = {
-        "start" : [ {
-            token : "comment.doc.tag",
-            regex : "@[\\w\\d_]+" // TODO: fix email addresses
-        }, {
-            token : "comment.doc",
-            merge : true,
-            regex : "\\s+"
-        }, {
-            token : "comment.doc",
-            merge : true,
-            regex : "TODO"
-        }, {
-            token : "comment.doc",
-            merge : true,
-            regex : "[^@\\*]+"
-        }, {
-            token : "comment.doc",
-            merge : true,
-            regex : "."
-        }]
-    };
-};
-
-oop.inherits(DocCommentHighlightRules, TextHighlightRules);
-
-(function() {
-
-    this.getStartRule = function(start) {
-        return {
-            token : "comment.doc", // doc comment
-            merge : true,
-            regex : "\\/\\*(?=\\*)",
-            next  : start
-        };
-    };
-    
-    this.getEndRule = function (start) {
-        return {
-            token : "comment.doc", // closing comment
-            merge : true,
-            regex : "\\*\\/",
-            next  : start
-        };
-    };
-
-}).call(DocCommentHighlightRules.prototype);
-
-exports.DocCommentHighlightRules = DocCommentHighlightRules;
-
-});
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/xml_util', ['require', 'exports', 'module' , 'ace/lib/lang'], function(require, exports, module) {
-"use strict";
-
-var lang = require("../lib/lang");
-
-var formTags = lang.arrayToMap(
-    ("button|form|input|label|select|textarea").split("|")
-);
-
-var tableTags = lang.arrayToMap(
-    ("table|tbody|td|tfoot|th|tr").split("|")
-);
-
-function string(state) {
-    return [{
-        token : "string",
-        regex : '".*?"'
-    }, {
-        token : "string", // multi line string start
-        merge : true,
-        regex : '["].*',
-        next : state + "_qqstring"
-    }, {
-        token : "string",
-        regex : "'.*?'"
-    }, {
-        token : "string", // multi line string start
-        merge : true,
-        regex : "['].*",
-        next : state + "_qstring"
-    }];
-}
-
-function multiLineString(quote, state) {
-    return [{
-        token : "string",
-        merge : true,
-        regex : ".*?" + quote,
-        next : state
-    }, {
-        token : "string",
-        merge : true,
-        regex : '.+'
-    }];
-}
-
-exports.tag = function(states, name, nextState) {
-    states[name] = [{
-        token : "text",
-        regex : "\\s+"
-    }, {
-        //token : "meta.tag",
-        
-    token : function(value) {
-            if ( value==='a' ) {
-                return "meta.tag.anchor";
-            }
-            else if ( value==='img' ) {
-                return "meta.tag.image";
-            }
-            else if ( value==='script' ) {
-                return "meta.tag.script";
-            }
-            else if ( value==='style' ) {
-                return "meta.tag.style";
-            }
-            else if (formTags.hasOwnProperty(value.toLowerCase())) {
-                return "meta.tag.form";
-            }
-            else if (tableTags.hasOwnProperty(value.toLowerCase())) {
-                return "meta.tag.table";
-            }
-            else {
-                return "meta.tag";
-            }
-        },        
-        merge : true,
-        regex : "[-_a-zA-Z0-9:]+",
-        next : name + "_embed_attribute_list" 
-    }, {
-        token: "empty",
-        regex: "",
-        next : name + "_embed_attribute_list"
-    }];
-
-    states[name + "_qstring"] = multiLineString("'", name + "_embed_attribute_list");
-    states[name + "_qqstring"] = multiLineString("\"", name + "_embed_attribute_list");
-    
-    states[name + "_embed_attribute_list"] = [{
-        token : "meta.tag",
-        merge : true,
-        regex : "\/?>",
-        next : nextState
-    }, {
-        token : "keyword.operator",
-        regex : "="
-    }, {
-        token : "entity.other.attribute-name",
-        regex : "[-_a-zA-Z0-9:]+"
-    }, {
-        token : "constant.numeric", // float
-        regex : "[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"
-    }, {
-        token : "text",
-        regex : "\\s+"
-    }].concat(string(name));
-};
-
-});
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/matching_brace_outdent', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
-"use strict";
-
-var Range = require("../range").Range;
-
-var MatchingBraceOutdent = function() {};
-
-(function() {
-
-    this.checkOutdent = function(line, input) {
-        if (! /^\s+$/.test(line))
-            return false;
-
-        return /^\s*\}/.test(input);
-    };
-
-    this.autoOutdent = function(doc, row) {
-        var line = doc.getLine(row);
-        var match = line.match(/^(\s*\})/);
-
-        if (!match) return 0;
-
-        var column = match[1].length;
-        var openBracePos = doc.findMatchingBracket({row: row, column: column});
-
-        if (!openBracePos || openBracePos.row == row) return 0;
-
-        var indent = this.$getIndent(doc.getLine(openBracePos.row));
-        doc.replace(new Range(row, 0, row, column-1), indent);
-    };
-
-    this.$getIndent = function(line) {
-        var match = line.match(/^(\s+)/);
-        if (match) {
-            return match[1];
-        }
-
-        return "";
-    };
-
-}).call(MatchingBraceOutdent.prototype);
-
-exports.MatchingBraceOutdent = MatchingBraceOutdent;
-});
diff --git a/apps/files_texteditor/js/aceeditor/mode-liquid.js b/apps/files_texteditor/js/aceeditor/mode-liquid.js
deleted file mode 100644
index 1a23cc53ab..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-liquid.js
+++ /dev/null
@@ -1 +0,0 @@
-define("ace/mode/liquid",["require","exports","module","ace/lib/oop","ace/mode/text","ace/tokenizer","ace/mode/liquid_highlight_rules","ace/mode/matching_brace_outdent","ace/range"],function(a,b,c){var d=a("../lib/oop"),e=a("./text").Mode,f=a("../tokenizer").Tokenizer,g=a("./liquid_highlight_rules").LiquidHighlightRules,h=a("./matching_brace_outdent").MatchingBraceOutdent,i=a("../range").Range,j=function(){this.$tokenizer=new f((new g).getRules()),this.$outdent=new h};d.inherits(j,e),function(){this.toggleCommentLines=function(a,b,c,d){var e=!0,f=[],g=/^(\s*)#/;for(var h=c;h<=d;h++)if(!g.test(b.getLine(h))){e=!1;break}if(e){var j=new i(0,0,0,0);for(var h=c;h<=d;h++){var k=b.getLine(h),l=k.match(g);j.start.row=h,j.end.row=h,j.end.column=l[0].length,b.replace(j,l[1])}}else b.indentRows(c,d,"#")},this.getNextLineIndent=function(a,b,c){var d=this.$getIndent(b),e=this.$tokenizer.getLineTokens(b,a),f=e.tokens,g=e.state;if(f.length&&f[f.length-1].type=="comment")return d;if(a=="start"){var h=b.match(/^.*[\{\(\[]\s*$/);h&&(d+=c)}return d},this.checkOutdent=function(a,b,c){return this.$outdent.checkOutdent(b,c)},this.autoOutdent=function(a,b,c){this.$outdent.autoOutdent(b,c)}}.call(j.prototype),b.Mode=j}),define("ace/mode/liquid_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/css_highlight_rules","ace/mode/javascript_highlight_rules","ace/lib/lang","ace/mode/xml_util","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./css_highlight_rules").CssHighlightRules,f=a("./javascript_highlight_rules").JavaScriptHighlightRules,g=a("../lib/lang"),h=a("./xml_util"),i=a("./text_highlight_rules").TextHighlightRules,j=function(){var a=g.arrayToMap("date|capitalize|downcase|upcase|first|last|join|sort|map|size|escape|escape_once|strip_html|strip_newlines|newline_to_br|replace|replace_first|truncate|truncatewords|prepend|append|minus|plus|times|divided_by|split".split("|")),b=g.arrayToMap("capture|endcapture|case|endcase|when|comment|endcomment|cycle|for|endfor|in|reversed|if|endif|else|elsif|include|endinclude|unless|endunless|style|text|image|widget|plugin|marker|endmarker|tablerow|endtablerow".split("|")),c=g.arrayToMap(["forloop"]),d=g.arrayToMap("assign".split("|"));this.$rules={start:[{token:"variable",regex:"{%",next:"liquid_start"},{token:"variable",regex:"{{",next:"liquid_start"},{token:"meta.tag",merge:!0,regex:"<\\!\\[CDATA\\[",next:"cdata"},{token:"xml_pe",regex:"<\\?.*?\\?>"},{token:"comment",merge:!0,regex:"<\\!--",next:"comment"},{token:"meta.tag",regex:"<(?=\\s*script\\b)",next:"script"},{token:"meta.tag",regex:"<(?=\\s*style\\b)",next:"style"},{token:"meta.tag",regex:"<\\/?",next:"tag"},{token:"text",regex:"\\s+"},{token:"text",regex:"[^<]+"}],cdata:[{token:"text",regex:"\\]\\]>",next:"start"},{token:"text",merge:!0,regex:"\\s+"},{token:"text",merge:!0,regex:".+"}],comment:[{token:"comment",regex:".*?-->",next:"start"},{token:"comment",merge:!0,regex:".+"}],liquid_start:[{token:"variable",regex:"}}",next:"start"},{token:"variable",regex:"%}",next:"start"},{token:"string",regex:'["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'},{token:"string",regex:"['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"},{token:"constant.numeric",regex:"0[xX][0-9a-fA-F]+\\b"},{token:"constant.numeric",regex:"[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"},{token:"constant.language.boolean",regex:"(?:true|false)\\b"},{token:function(e){return a.hasOwnProperty(e)?"support.function":b.hasOwnProperty(e)?"keyword":c.hasOwnProperty(e)?"variable.language":d.hasOwnProperty(e)?"keyword.definition":"identifier"},regex:"[a-zA-Z_$][a-zA-Z0-9_$]*\\b"},{token:"keyword.operator",regex:"/|\\*|\\-|\\+|=|!=|\\?\\:"},{token:"paren.lparen",regex:/[\[\({]/},{token:"paren.rparen",regex:/[\])}]/},{token:"text",regex:"\\s+"}]},h.tag(this.$rules,"tag","start"),h.tag(this.$rules,"style","css-start"),h.tag(this.$rules,"script","js-start"),this.embedRules(f,"js-",[{token:"comment",regex:"\\/\\/.*(?=<\\/script>)",next:"tag"},{token:"meta.tag",regex:"<\\/(?=script)",next:"tag"}]),this.embedRules(e,"css-",[{token:"meta.tag",regex:"<\\/(?=style)",next:"tag"}])};d.inherits(j,i),b.LiquidHighlightRules=j}),define("ace/mode/css_highlight_rules",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("../lib/lang"),f=a("./text_highlight_rules").TextHighlightRules,g=function(){var a=e.arrayToMap("animation-fill-mode|alignment-adjust|alignment-baseline|animation-delay|animation-direction|animation-duration|animation-iteration-count|animation-name|animation-play-state|animation-timing-function|animation|appearance|azimuth|backface-visibility|background-attachment|background-break|background-clip|background-color|background-image|background-origin|background-position|background-repeat|background-size|background|baseline-shift|binding|bleed|bookmark-label|bookmark-level|bookmark-state|bookmark-target|border-bottom|border-bottom-color|border-bottom-left-radius|border-bottom-right-radius|border-bottom-style|border-bottom-width|border-collapse|border-color|border-image|border-image-outset|border-image-repeat|border-image-slice|border-image-source|border-image-width|border-left|border-left-color|border-left-style|border-left-width|border-radius|border-right|border-right-color|border-right-style|border-right-width|border-spacing|border-style|border-top|border-top-color|border-top-left-radius|border-top-right-radius|border-top-style|border-top-width|border-width|border|bottom|box-align|box-decoration-break|box-direction|box-flex-group|box-flex|box-lines|box-ordinal-group|box-orient|box-pack|box-shadow|box-sizing|break-after|break-before|break-inside|caption-side|clear|clip|color-profile|color|column-count|column-fill|column-gap|column-rule|column-rule-color|column-rule-style|column-rule-width|column-span|column-width|columns|content|counter-increment|counter-reset|crop|cue-after|cue-before|cue|cursor|direction|display|dominant-baseline|drop-initial-after-adjust|drop-initial-after-align|drop-initial-before-adjust|drop-initial-before-align|drop-initial-size|drop-initial-value|elevation|empty-cells|fit|fit-position|float-offset|float|font-family|font-size|font-size-adjust|font-stretch|font-style|font-variant|font-weight|font|grid-columns|grid-rows|hanging-punctuation|height|hyphenate-after|hyphenate-before|hyphenate-character|hyphenate-lines|hyphenate-resource|hyphens|icon|image-orientation|image-rendering|image-resolution|inline-box-align|left|letter-spacing|line-height|line-stacking-ruby|line-stacking-shift|line-stacking-strategy|line-stacking|list-style-image|list-style-position|list-style-type|list-style|margin-bottom|margin-left|margin-right|margin-top|margin|mark-after|mark-before|mark|marks|marquee-direction|marquee-play-count|marquee-speed|marquee-style|max-height|max-width|min-height|min-width|move-to|nav-down|nav-index|nav-left|nav-right|nav-up|opacity|orphans|outline-color|outline-offset|outline-style|outline-width|outline|overflow-style|overflow-x|overflow-y|overflow|padding-bottom|padding-left|padding-right|padding-top|padding|page-break-after|page-break-before|page-break-inside|page-policy|page|pause-after|pause-before|pause|perspective-origin|perspective|phonemes|pitch-range|pitch|play-during|position|presentation-level|punctuation-trim|quotes|rendering-intent|resize|rest-after|rest-before|rest|richness|right|rotation-point|rotation|ruby-align|ruby-overhang|ruby-position|ruby-span|size|speak-header|speak-numeral|speak-punctuation|speak|speech-rate|stress|string-set|table-layout|target-name|target-new|target-position|target|text-align-last|text-align|text-decoration|text-emphasis|text-height|text-indent|text-justify|text-outline|text-shadow|text-transform|text-wrap|top|transform-origin|transform-style|transform|transition-delay|transition-duration|transition-property|transition-timing-function|transition|unicode-bidi|vertical-align|visibility|voice-balance|voice-duration|voice-family|voice-pitch-range|voice-pitch|voice-rate|voice-stress|voice-volume|volume|white-space-collapse|white-space|widows|width|word-break|word-spacing|word-wrap|z-index".split("|")),b=e.arrayToMap("rgb|rgba|url|attr|counter|counters".split("|")),c=e.arrayToMap("absolute|after-edge|after|all-scroll|all|alphabetic|always|antialiased|armenian|auto|avoid-column|avoid-page|avoid|balance|baseline|before-edge|before|below|bidi-override|block-line-height|block|bold|bolder|border-box|both|bottom|box|break-all|break-word|capitalize|caps-height|caption|center|central|char|circle|cjk-ideographic|clone|close-quote|col-resize|collapse|column|consider-shifts|contain|content-box|cover|crosshair|cubic-bezier|dashed|decimal-leading-zero|decimal|default|disabled|disc|disregard-shifts|distribute-all-lines|distribute-letter|distribute-space|distribute|dotted|double|e-resize|ease-in|ease-in-out|ease-out|ease|ellipsis|end|exclude-ruby|fill|fixed|font-size|font|georgian|glyphs|grid-height|groove|hand|hanging|hebrew|help|hidden|hiragana-iroha|hiragana|horizontal|icon|ideograph-alpha|ideograph-numeric|ideograph-parenthesis|ideograph-space|ideographic|inactive|include-ruby|inherit|initial|inline-block|inline-box|inline-line-height|inline-table|inline|inset|inside|inter-ideograph|inter-word|invert|italic|justify|katakana-iroha|katakana|keep-all|last|left|lighter|line-edge|line-through|line|linear|list-item|local|loose|lower-alpha|lower-greek|lower-latin|lower-roman|lowercase|lr-tb|ltr|mathematical|max-height|max-size|medium|menu|message-box|middle|move|n-resize|ne-resize|newspaper|no-change|no-close-quote|no-drop|no-open-quote|no-repeat|none|normal|not-allowed|nowrap|nw-resize|oblique|open-quote|outset|outside|overline|padding-box|page|pointer|pre-line|pre-wrap|pre|preserve-3d|progress|relative|repeat-x|repeat-y|repeat|replaced|reset-size|ridge|right|round|row-resize|rtl|s-resize|scroll|se-resize|separate|slice|small-caps|small-caption|solid|space|square|start|static|status-bar|step-end|step-start|steps|stretch|strict|sub|super|sw-resize|table-caption|table-cell|table-column-group|table-column|table-footer-group|table-header-group|table-row-group|table-row|table|tb-rl|text-after-edge|text-before-edge|text-bottom|text-size|text-top|text|thick|thin|top|transparent|underline|upper-alpha|upper-latin|upper-roman|uppercase|use-script|vertical-ideographic|vertical-text|visible|w-resize|wait|whitespace|z-index|zero".split("|")),d=e.arrayToMap("aqua|black|blue|fuchsia|gray|green|lime|maroon|navy|olive|orange|purple|red|silver|teal|white|yellow".split("|")),f=e.arrayToMap("arial|century|comic|courier|garamond|georgia|helvetica|impact|lucida|symbol|system|tahoma|times|trebuchet|utopia|verdana|webdings|sans-serif|serif|monospace".split("|")),g="\\-?(?:(?:[0-9]+)|(?:[0-9]*\\.[0-9]+))",h="(\\:+)\\b(after|before|first-letter|first-line|moz-selection|selection)\\b",i="(:)\\b(active|checked|disabled|empty|enabled|first-child|first-of-type|focus|hover|indeterminate|invalid|last-child|last-of-type|link|not|nth-child|nth-last-child|nth-last-of-type|nth-of-type|only-child|only-of-type|required|root|target|valid|visited)\\b",j=[{token:"comment",merge:!0,regex:"\\/\\*",next:"ruleset_comment"},{token:"string",regex:'["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'},{token:"string",regex:"['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"},{token:["constant.numeric","keyword"],regex:"("+g+")(ch|cm|deg|em|ex|fr|gd|grad|Hz|in|kHz|mm|ms|pc|pt|px|rad|rem|s|turn|vh|vm|vw|%)"},{token:["constant.numeric"],regex:"([0-9]+)"},{token:"constant.numeric",regex:"#[a-f0-9]{6}"},{token:"constant.numeric",regex:"#[a-f0-9]{3}"},{token:["punctuation","entity.other.attribute-name.pseudo-element.css"],regex:h},{token:["punctuation","entity.other.attribute-name.pseudo-class.css"],regex:i},{token:function(e){return a.hasOwnProperty(e.toLowerCase())?"support.type":b.hasOwnProperty(e.toLowerCase())?"support.function":c.hasOwnProperty(e.toLowerCase())?"support.constant":d.hasOwnProperty(e.toLowerCase())?"support.constant.color":f.hasOwnProperty(e.toLowerCase())?"support.constant.fonts":"text"},regex:"\\-?[a-zA-Z_][a-zA-Z0-9_\\-]*"}],k=e.copyArray(j);k.unshift({token:"paren.rparen",regex:"\\}",next:"start"});var l=e.copyArray(j);l.unshift({token:"paren.rparen",regex:"\\}",next:"media"});var m=[{token:"comment",merge:!0,regex:".+"}],n=e.copyArray(m);n.unshift({token:"comment",regex:".*?\\*\\/",next:"start"});var o=e.copyArray(m);o.unshift({token:"comment",regex:".*?\\*\\/",next:"media"});var p=e.copyArray(m);p.unshift({token:"comment",regex:".*?\\*\\/",next:"ruleset"}),this.$rules={start:[{token:"comment",merge:!0,regex:"\\/\\*",next:"comment"},{token:"paren.lparen",regex:"\\{",next:"ruleset"},{token:"string",regex:"@.*?{",next:"media"},{token:"keyword",regex:"#[a-z0-9-_]+"},{token:"variable",regex:"\\.[a-z0-9-_]+"},{token:"string",regex:":[a-z0-9-_]+"},{token:"constant",regex:"[a-z0-9-_]+"}],media:[{token:"comment",merge:!0,regex:"\\/\\*",next:"media_comment"},{token:"paren.lparen",regex:"\\{",next:"media_ruleset"},{token:"string",regex:"\\}",next:"start"},{token:"keyword",regex:"#[a-z0-9-_]+"},{token:"variable",regex:"\\.[a-z0-9-_]+"},{token:"string",regex:":[a-z0-9-_]+"},{token:"constant",regex:"[a-z0-9-_]+"}],comment:n,ruleset:k,ruleset_comment:p,media_ruleset:l,media_comment:o}};d.inherits(g,f),b.CssHighlightRules=g}),define("ace/mode/javascript_highlight_rules",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/unicode","ace/mode/doc_comment_highlight_rules","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("../lib/lang"),f=a("../unicode"),g=a("./doc_comment_highlight_rules").DocCommentHighlightRules,h=a("./text_highlight_rules").TextHighlightRules,i=function(){var a=e.arrayToMap("Array|Boolean|Date|Function|Iterator|Number|Object|RegExp|String|Proxy|Namespace|QName|XML|XMLList|ArrayBuffer|Float32Array|Float64Array|Int16Array|Int32Array|Int8Array|Uint16Array|Uint32Array|Uint8Array|Uint8ClampedArray|Error|EvalError|InternalError|RangeError|ReferenceError|StopIteration|SyntaxError|TypeError|URIError|decodeURI|decodeURIComponent|encodeURI|encodeURIComponent|eval|isFinite|isNaN|parseFloat|parseInt|JSON|Math|this|arguments|prototype|window|document".split("|")),b=e.arrayToMap("break|case|catch|continue|default|delete|do|else|finally|for|function|if|in|instanceof|new|return|switch|throw|try|typeof|let|var|while|with|const|yield|import|get|set".split("|")),c="case|do|else|finally|in|instanceof|return|throw|try|typeof|yield",d=e.arrayToMap("__parent__|__count__|escape|unescape|with|__proto__".split("|")),h=e.arrayToMap("const|let|var|function".split("|")),i=e.arrayToMap("null|Infinity|NaN|undefined".split("|")),j=e.arrayToMap("class|enum|extends|super|export|implements|private|public|interface|package|protected|static".split("|")),k="["+f.packages.L+"\\$_]["+f.packages.L+f.packages.Mn+f.packages.Mc+f.packages.Nd+f.packages.Pc+"\\$_]*\\b",l="\\\\(?:x[0-9a-fA-F]{2}|u[0-9a-fA-F]{4}|[0-2][0-7]{0,2}|3[0-6][0-7]?|37[0-7]?|[4-7][0-7]?|.)";this.$rules={start:[{token:"comment",regex:/\/\/.*$/},(new g).getStartRule("doc-start"),{token:"comment",merge:!0,regex:/\/\*/,next:"comment"},{token:"string",regex:"'",next:"qstring"},{token:"string",regex:'"',next:"qqstring"},{token:"constant.numeric",regex:/0[xX][0-9a-fA-F]+\b/},{token:"constant.numeric",regex:/[+-]?\d+(?:(?:\.\d*)?(?:[eE][+-]?\d+)?)?\b/},{token:["storage.type","punctuation.operator","support.function","punctuation.operator","entity.name.function","text","keyword.operator","text","storage.type","text","paren.lparen","variable.parameter","paren.rparen"],regex:"("+k+")(\\.)(prototype)(\\.)("+k+")(\\s*)(=)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"},{token:["storage.type","punctuation.operator","support.function","punctuation.operator","entity.name.function","text","keyword.operator","text"],regex:"("+k+")(\\.)(prototype)(\\.)("+k+")(\\s*)(=)(\\s*)"},{token:["storage.type","punctuation.operator","entity.name.function","text","keyword.operator","text","storage.type","text","paren.lparen","variable.parameter","paren.rparen"],regex:"("+k+")(\\.)("+k+")(\\s*)(=)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"},{token:["entity.name.function","text","keyword.operator","text","storage.type","text","paren.lparen","variable.parameter","paren.rparen"],regex:"("+k+")(\\s*)(=)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"},{token:["storage.type","text","entity.name.function","text","paren.lparen","variable.parameter","paren.rparen"],regex:"(function)(\\s+)("+k+")(\\s*)(\\()(.*?)(\\))"},{token:["entity.name.function","text","punctuation.operator","text","storage.type","text","paren.lparen","variable.parameter","paren.rparen"],regex:"("+k+")(\\s*)(:)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"},{token:["text","text","storage.type","text","paren.lparen","variable.parameter","paren.rparen"],regex:"(:)(\\s*)(function)?(\\s*)(\\()([^)]*)(\\))"},{token:"constant.language.boolean",regex:/(?:true|false)\b/},{token:"keyword",regex:"(?:"+c+")\\b",next:"regex_allowed"},{token:["punctuation.operator","support.function"],regex:/(\.)(s(?:h(?:ift|ow(?:Mod(?:elessDialog|alDialog)|Help))|croll(?:X|By(?:Pages|Lines)?|Y|To)?|t(?:opzzzz|rike)|i(?:n|zeToContent|debar|gnText)|ort|u(?:p|b(?:str(?:ing)?)?)|pli(?:ce|t)|e(?:nd|t(?:Re(?:sizable|questHeader)|M(?:i(?:nutes|lliseconds)|onth)|Seconds|Ho(?:tKeys|urs)|Year|Cursor|Time(?:out)?|Interval|ZOptions|Date|UTC(?:M(?:i(?:nutes|lliseconds)|onth)|Seconds|Hours|Date|FullYear)|FullYear|Active)|arch)|qrt|lice|avePreferences|mall)|h(?:ome|andleEvent)|navigate|c(?:har(?:CodeAt|At)|o(?:s|n(?:cat|textual|firm)|mpile)|eil|lear(?:Timeout|Interval)?|a(?:ptureEvents|ll)|reate(?:StyleSheet|Popup|EventObject))|t(?:o(?:GMTString|S(?:tring|ource)|U(?:TCString|pperCase)|Lo(?:caleString|werCase))|est|a(?:n|int(?:Enabled)?))|i(?:s(?:NaN|Finite)|ndexOf|talics)|d(?:isableExternalCapture|ump|etachEvent)|u(?:n(?:shift|taint|escape|watch)|pdateCommands)|j(?:oin|avaEnabled)|p(?:o(?:p|w)|ush|lugins.refresh|a(?:ddings|rse(?:Int|Float)?)|r(?:int|ompt|eference))|e(?:scape|nableExternalCapture|val|lementFromPoint|x(?:p|ec(?:Script|Command)?))|valueOf|UTC|queryCommand(?:State|Indeterm|Enabled|Value)|f(?:i(?:nd|le(?:ModifiedDate|Size|CreatedDate|UpdatedDate)|xed)|o(?:nt(?:size|color)|rward)|loor|romCharCode)|watch|l(?:ink|o(?:ad|g)|astIndexOf)|a(?:sin|nchor|cos|t(?:tachEvent|ob|an(?:2)?)|pply|lert|b(?:s|ort))|r(?:ou(?:nd|teEvents)|e(?:size(?:By|To)|calc|turnValue|place|verse|l(?:oad|ease(?:Capture|Events)))|andom)|g(?:o|et(?:ResponseHeader|M(?:i(?:nutes|lliseconds)|onth)|Se(?:conds|lection)|Hours|Year|Time(?:zoneOffset)?|Da(?:y|te)|UTC(?:M(?:i(?:nutes|lliseconds)|onth)|Seconds|Hours|Da(?:y|te)|FullYear)|FullYear|A(?:ttention|llResponseHeaders)))|m(?:in|ove(?:B(?:y|elow)|To(?:Absolute)?|Above)|ergeAttributes|a(?:tch|rgins|x))|b(?:toa|ig|o(?:ld|rderWidths)|link|ack))\b(?=\()/},{token:["punctuation.operator","support.function.dom"],regex:/(\.)(s(?:ub(?:stringData|mit)|plitText|e(?:t(?:NamedItem|Attribute(?:Node)?)|lect))|has(?:ChildNodes|Feature)|namedItem|c(?:l(?:ick|o(?:se|neNode))|reate(?:C(?:omment|DATASection|aption)|T(?:Head|extNode|Foot)|DocumentFragment|ProcessingInstruction|E(?:ntityReference|lement)|Attribute))|tabIndex|i(?:nsert(?:Row|Before|Cell|Data)|tem)|open|delete(?:Row|C(?:ell|aption)|T(?:Head|Foot)|Data)|focus|write(?:ln)?|a(?:dd|ppend(?:Child|Data))|re(?:set|place(?:Child|Data)|move(?:NamedItem|Child|Attribute(?:Node)?)?)|get(?:NamedItem|Element(?:sBy(?:Name|TagName)|ById)|Attribute(?:Node)?)|blur)\b(?=\()/},{token:["punctuation.operator","support.constant"],regex:/(\.)(s(?:ystemLanguage|cr(?:ipts|ollbars|een(?:X|Y|Top|Left))|t(?:yle(?:Sheets)?|atus(?:Text|bar)?)|ibling(?:Below|Above)|ource|uffixes|e(?:curity(?:Policy)?|l(?:ection|f)))|h(?:istory|ost(?:name)?|as(?:h|Focus))|y|X(?:MLDocument|SLDocument)|n(?:ext|ame(?:space(?:s|URI)|Prop))|M(?:IN_VALUE|AX_VALUE)|c(?:haracterSet|o(?:n(?:structor|trollers)|okieEnabled|lorDepth|mp(?:onents|lete))|urrent|puClass|l(?:i(?:p(?:boardData)?|entInformation)|osed|asses)|alle(?:e|r)|rypto)|t(?:o(?:olbar|p)|ext(?:Transform|Indent|Decoration|Align)|ags)|SQRT(?:1_2|2)|i(?:n(?:ner(?:Height|Width)|put)|ds|gnoreCase)|zIndex|o(?:scpu|n(?:readystatechange|Line)|uter(?:Height|Width)|p(?:sProfile|ener)|ffscreenBuffering)|NEGATIVE_INFINITY|d(?:i(?:splay|alog(?:Height|Top|Width|Left|Arguments)|rectories)|e(?:scription|fault(?:Status|Ch(?:ecked|arset)|View)))|u(?:ser(?:Profile|Language|Agent)|n(?:iqueID|defined)|pdateInterval)|_content|p(?:ixelDepth|ort|ersonalbar|kcs11|l(?:ugins|atform)|a(?:thname|dding(?:Right|Bottom|Top|Left)|rent(?:Window|Layer)?|ge(?:X(?:Offset)?|Y(?:Offset)?))|r(?:o(?:to(?:col|type)|duct(?:Sub)?|mpter)|e(?:vious|fix)))|e(?:n(?:coding|abledPlugin)|x(?:ternal|pando)|mbeds)|v(?:isibility|endor(?:Sub)?|Linkcolor)|URLUnencoded|P(?:I|OSITIVE_INFINITY)|f(?:ilename|o(?:nt(?:Size|Family|Weight)|rmName)|rame(?:s|Element)|gColor)|E|whiteSpace|l(?:i(?:stStyleType|n(?:eHeight|kColor))|o(?:ca(?:tion(?:bar)?|lName)|wsrc)|e(?:ngth|ft(?:Context)?)|a(?:st(?:M(?:odified|atch)|Index|Paren)|yer(?:s|X)|nguage))|a(?:pp(?:MinorVersion|Name|Co(?:deName|re)|Version)|vail(?:Height|Top|Width|Left)|ll|r(?:ity|guments)|Linkcolor|bove)|r(?:ight(?:Context)?|e(?:sponse(?:XML|Text)|adyState))|global|x|m(?:imeTypes|ultiline|enubar|argin(?:Right|Bottom|Top|Left))|L(?:N(?:10|2)|OG(?:10E|2E))|b(?:o(?:ttom|rder(?:Width|RightWidth|BottomWidth|Style|Color|TopWidth|LeftWidth))|ufferDepth|elow|ackground(?:Color|Image)))\b/},{token:["storage.type","punctuation.operator","support.function.firebug"],regex:/(console)(\.)(warn|info|log|error|time|timeEnd|assert)\b/},{token:function(c){return a.hasOwnProperty(c)?"variable.language":d.hasOwnProperty(c)?"invalid.deprecated":h.hasOwnProperty(c)?"storage.type":b.hasOwnProperty(c)?"keyword":i.hasOwnProperty(c)?"constant.language":j.hasOwnProperty(c)?"invalid.illegal":c=="debugger"?"invalid.deprecated":"identifier"},regex:k},{token:"keyword.operator",regex:/!|\$|%|&|\*|\-\-|\-|\+\+|\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\|\||\?\:|\*=|%=|\+=|\-=|&=|\^=|\b(?:in|instanceof|new|delete|typeof|void)/,next:"regex_allowed"},{token:"punctuation.operator",regex:/\?|\:|\,|\;|\./,next:"regex_allowed"},{token:"paren.lparen",regex:/[\[({]/,next:"regex_allowed"},{token:"paren.rparen",regex:/[\])}]/},{token:"keyword.operator",regex:/\/=?/,next:"regex_allowed"},{token:"comment",regex:/^#!.*$/},{token:"text",regex:/\s+/}],regex_allowed:[{token:"comment",merge:!0,regex:"\\/\\*",next:"comment_regex_allowed"},{token:"comment",regex:"\\/\\/.*$"},{token:"string.regexp",regex:"\\/",next:"regex",merge:!0},{token:"text",regex:"\\s+"},{token:"empty",regex:"",next:"start"}],regex:[{token:"regexp.keyword.operator",regex:"\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)",next:"regex"},{token:"string.regexp",regex:"/\\w*",next:"start",merge:!0},{token:"string.regexp",regex:"[^\\\\/\\[]+",next:"regex",merge:!0},{token:"string.regexp.charachterclass",regex:"\\[",next:"regex_character_class",merge:!0},{token:"empty",regex:"",next:"start"}],regex_character_class:[{token:"regexp.keyword.operator",regex:"\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)",next:"regex_character_class"},{token:"string.regexp.charachterclass",regex:"]",next:"regex",merge:!0},{token:"string.regexp.charachterclass",regex:"[^\\\\\\]]+",next:"regex_character_class",merge:!0},{token:"empty",regex:"",next:"start"}],comment_regex_allowed:[{token:"comment",regex:".*?\\*\\/",merge:!0,next:"regex_allowed"},{token:"comment",merge:!0,regex:".+"}],comment:[{token:"comment",regex:".*?\\*\\/",merge:!0,next:"start"},{token:"comment",merge:!0,regex:".+"}],qqstring:[{token:"constant.language.escape",regex:l},{token:"string",regex:'[^"\\\\]+'},{token:"string",regex:'"',next:"start"}],qstring:[{token:"constant.language.escape",regex:l},{token:"string",regex:"[^'\\\\]+"},{token:"string",regex:"'",next:"start"}]},this.embedRules(g,"doc-",[(new g).getEndRule("start")])};d.inherits(i,h),b.JavaScriptHighlightRules=i}),define("ace/mode/doc_comment_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text_highlight_rules").TextHighlightRules,f=function(){this.$rules={start:[{token:"comment.doc.tag",regex:"@[\\w\\d_]+"},{token:"comment.doc",merge:!0,regex:"\\s+"},{token:"comment.doc",merge:!0,regex:"TODO"},{token:"comment.doc",merge:!0,regex:"[^@\\*]+"},{token:"comment.doc",merge:!0,regex:"."}]}};d.inherits(f,e),function(){this.getStartRule=function(a){return{token:"comment.doc",merge:!0,regex:"\\/\\*(?=\\*)",next:a}},this.getEndRule=function(a){return{token:"comment.doc",merge:!0,regex:"\\*\\/",next:a}}}.call(f.prototype),b.DocCommentHighlightRules=f}),define("ace/mode/xml_util",["require","exports","module","ace/lib/lang"],function(a,b,c){function g(a){return[{token:"string",regex:'".*?"'},{token:"string",merge:!0,regex:'["].*',next:a+"_qqstring"},{token:"string",regex:"'.*?'"},{token:"string",merge:!0,regex:"['].*",next:a+"_qstring"}]}function h(a,b){return[{token:"string",merge:!0,regex:".*?"+a,next:b},{token:"string",merge:!0,regex:".+"}]}"use strict";var d=a("../lib/lang"),e=d.arrayToMap("button|form|input|label|select|textarea".split("|")),f=d.arrayToMap("table|tbody|td|tfoot|th|tr".split("|"));b.tag=function(a,b,c){a[b]=[{token:"text",regex:"\\s+"},{token:function(a){return a==="a"?"meta.tag.anchor":a==="img"?"meta.tag.image":a==="script"?"meta.tag.script":a==="style"?"meta.tag.style":e.hasOwnProperty(a.toLowerCase())?"meta.tag.form":f.hasOwnProperty(a.toLowerCase())?"meta.tag.table":"meta.tag"},merge:!0,regex:"[-_a-zA-Z0-9:]+",next:b+"_embed_attribute_list"},{token:"empty",regex:"",next:b+"_embed_attribute_list"}],a[b+"_qstring"]=h("'",b+"_embed_attribute_list"),a[b+"_qqstring"]=h('"',b+"_embed_attribute_list"),a[b+"_embed_attribute_list"]=[{token:"meta.tag",merge:!0,regex:"/?>",next:c},{token:"keyword.operator",regex:"="},{token:"entity.other.attribute-name",regex:"[-_a-zA-Z0-9:]+"},{token:"constant.numeric",regex:"[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"},{token:"text",regex:"\\s+"}].concat(g(b))}}),define("ace/mode/matching_brace_outdent",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../range").Range,e=function(){};(function(){this.checkOutdent=function(a,b){return/^\s+$/.test(a)?/^\s*\}/.test(b):!1},this.autoOutdent=function(a,b){var c=a.getLine(b),e=c.match(/^(\s*\})/);if(!e)return 0;var f=e[1].length,g=a.findMatchingBracket({row:b,column:f});if(!g||g.row==b)return 0;var h=this.$getIndent(a.getLine(g.row));a.replace(new d(b,0,b,f-1),h)},this.$getIndent=function(a){var b=a.match(/^(\s+)/);return b?b[1]:""}}).call(e.prototype),b.MatchingBraceOutdent=e})
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/mode-lua-uncompressed.js b/apps/files_texteditor/js/aceeditor/mode-lua-uncompressed.js
deleted file mode 100644
index c3f875475e..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-lua-uncompressed.js
+++ /dev/null
@@ -1,523 +0,0 @@
-/* ***** 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 Ajax.org Code Editor (ACE).
-*
-* The Initial Developer of the Original Code is
-* Ajax.org B.V.
-* Portions created by the Initial Developer are Copyright (C) 2010
-* the Initial Developer. All Rights Reserved.
-*
-* Contributor(s):
-*      Fabian Jakobs <fabian AT ajax DOT org>
-*      Colin Gourlay <colin DOT j DOT gourlay AT gmail DOT com>
-*      Lee Gao
-*
-* 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 ***** */
-
-define('ace/mode/lua', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text', 'ace/tokenizer', 'ace/mode/lua_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
-var LuaHighlightRules = require("./lua_highlight_rules").LuaHighlightRules;
-
-var Mode = function() {
-    this.$tokenizer = new Tokenizer(new LuaHighlightRules().getRules());
-};
-oop.inherits(Mode, TextMode);
-
-(function() {
-    this.getNextLineIndent = function(state, line, tab) {
-        var indent = this.$getIndent(line);
-
-        var tokenizedLine = this.$tokenizer.getLineTokens(line, state);
-        var tokens = tokenizedLine.tokens;
-	
-        var chunks = ["function", "then", "do", "repeat"];
-        
-        if (state == "start") {
-            var match = line.match(/^.*[\{\(\[]\s*$/);
-            if (match) {
-                indent += tab;
-            } else {
-                for (var i in tokens){
-                    var token = tokens[i];
-                    if (token.type != "keyword") continue;
-                    var chunk_i = chunks.indexOf(token.value);
-                    if (chunk_i != -1){
-                        indent += tab;
-                        break;
-                    }
-                }
-            }
-        } 
-
-        return indent;
-    };
-    
-}).call(Mode.prototype);
-
-exports.Mode = Mode;
-});
-
-
-/* ***** 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 Ajax.org Code Editor (ACE).
-*
-* The Initial Developer of the Original Code is
-* Ajax.org B.V.
-* Portions created by the Initial Developer are Copyright (C) 2010
-* the Initial Developer. All Rights Reserved.
-*
-* Contributor(s):
-*      Fabian Jakobs <fabian AT ajax DOT org>
-*      Colin Gourlay <colin DOT j DOT gourlay AT gmail DOT com>
-*      Lee Gao
-*
-* 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 ***** */
-
-define('ace/mode/lua_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/lang', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var lang = require("../lib/lang");
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-
-var LuaHighlightRules = function() {
-
-    var keywords = lang.arrayToMap(
-        ("break|do|else|elseif|end|for|function|if|in|local|repeat|"+
-         "return|then|until|while|or|and|not").split("|")
-    );
-
-    var builtinConstants = lang.arrayToMap(
-        ("true|false|nil|_G|_VERSION").split("|")
-    );
-
-    var builtinFunctions = lang.arrayToMap(
-        ("string|xpcall|package|tostring|print|os|unpack|require|"+
-        "getfenv|setmetatable|next|assert|tonumber|io|rawequal|"+
-        "collectgarbage|getmetatable|module|rawset|math|debug|"+
-        "pcall|table|newproxy|type|coroutine|_G|select|gcinfo|"+
-        "pairs|rawget|loadstring|ipairs|_VERSION|dofile|setfenv|"+
-        "load|error|loadfile|"+
-
-        "sub|upper|len|gfind|rep|find|match|char|dump|gmatch|"+
-        "reverse|byte|format|gsub|lower|preload|loadlib|loaded|"+
-        "loaders|cpath|config|path|seeall|exit|setlocale|date|"+
-        "getenv|difftime|remove|time|clock|tmpname|rename|execute|"+
-        "lines|write|close|flush|open|output|type|read|stderr|"+
-        "stdin|input|stdout|popen|tmpfile|log|max|acos|huge|"+
-        "ldexp|pi|cos|tanh|pow|deg|tan|cosh|sinh|random|randomseed|"+
-        "frexp|ceil|floor|rad|abs|sqrt|modf|asin|min|mod|fmod|log10|"+
-        "atan2|exp|sin|atan|getupvalue|debug|sethook|getmetatable|"+
-        "gethook|setmetatable|setlocal|traceback|setfenv|getinfo|"+
-        "setupvalue|getlocal|getregistry|getfenv|setn|insert|getn|"+
-        "foreachi|maxn|foreach|concat|sort|remove|resume|yield|"+
-        "status|wrap|create|running").split("|")
-    );
-    
-    var stdLibaries = lang.arrayToMap(
-        ("string|package|os|io|math|debug|table|coroutine").split("|")
-    );
-    
-    var metatableMethods = lang.arrayToMap(
-        ("__add|__sub|__mod|__unm|__concat|__lt|__index|__call|__gc|__metatable|"+
-         "__mul|__div|__pow|__len|__eq|__le|__newindex|__tostring|__mode|__tonumber").split("|")
-    );
-
-    var futureReserved = lang.arrayToMap(
-        ("").split("|")
-    );
-    
-    var deprecatedIn5152 = lang.arrayToMap(
-        ("setn|foreach|foreachi|gcinfo|log10|maxn").split("|")
-    );
-
-    var strPre = "";
-
-    var decimalInteger = "(?:(?:[1-9]\\d*)|(?:0))";
-    var hexInteger = "(?:0[xX][\\dA-Fa-f]+)";
-    var integer = "(?:" + decimalInteger + "|" + hexInteger + ")";
-
-    var fraction = "(?:\\.\\d+)";
-    var intPart = "(?:\\d+)";
-    var pointFloat = "(?:(?:" + intPart + "?" + fraction + ")|(?:" + intPart + "\\.))";
-    var floatNumber = "(?:" + pointFloat + ")";
-    
-    var comment_stack = [];
-    
-    this.$rules = {
-        "start" : 
-
-		
-        // bracketed comments
-        [{
-            token : "comment",           // --[[ comment
-            regex : strPre + '\\-\\-\\[\\[.*\\]\\]'
-        }, {
-            token : "comment",           // --[=[ comment
-            regex : strPre + '\\-\\-\\[\\=\\[.*\\]\\=\\]'
-        }, {
-            token : "comment",           // --[==[ comment
-            regex : strPre + '\\-\\-\\[\\={2}\\[.*\\]\\={2}\\]'
-        }, {
-            token : "comment",           // --[===[ comment
-            regex : strPre + '\\-\\-\\[\\={3}\\[.*\\]\\={3}\\]'
-        }, {
-            token : "comment",           // --[====[ comment
-            regex : strPre + '\\-\\-\\[\\={4}\\[.*\\]\\={4}\\]'
-        }, {
-            token : "comment",           // --[====+[ comment
-            regex : strPre + '\\-\\-\\[\\={5}\\=*\\[.*\\]\\={5}\\=*\\]'
-        },
-		
-		// multiline bracketed comments
-		{
-            token : "comment",           // --[[ comment
-            regex : strPre + '\\-\\-\\[\\[.*$',
-            merge : true,
-            next  : "qcomment"
-        }, {
-            token : "comment",           // --[=[ comment
-            regex : strPre + '\\-\\-\\[\\=\\[.*$',
-            merge : true,
-            next  : "qcomment1"
-        }, {
-            token : "comment",           // --[==[ comment
-            regex : strPre + '\\-\\-\\[\\={2}\\[.*$',
-            merge : true,
-            next  : "qcomment2"
-        }, {
-            token : "comment",           // --[===[ comment
-            regex : strPre + '\\-\\-\\[\\={3}\\[.*$',
-            merge : true,
-            next  : "qcomment3"
-        }, {
-            token : "comment",           // --[====[ comment
-            regex : strPre + '\\-\\-\\[\\={4}\\[.*$',
-            merge : true,
-            next  : "qcomment4"
-        }, {
-            token : function(value){     // --[====+[ comment
-                // WARNING: EXTREMELY SLOW, but this is the only way to circumvent the
-                // limits imposed by the current automaton.
-                // I've never personally seen any practical code where 5 or more '='s are
-                // used for string or commenting, so this will rarely be invoked.
-                var pattern = /\-\-\[(\=+)\[/, match;
-                // you can never be too paranoid ;)
-                if ((match = pattern.exec(value)) != null && (match = match[1]) != undefined)
-                    comment_stack.push(match.length);
-                
-                return "comment";
-            },
-            regex : strPre + '\\-\\-\\[\\={5}\\=*\\[.*$',
-            merge : true,
-            next  : "qcomment5"
-        },
-        
-        // single line comments
-        {
-            token : "comment",
-            regex : "\\-\\-.*$"
-        }, 
-        
-        // bracketed strings
-		{
-            token : "string",           // [[ string
-            regex : strPre + '\\[\\[.*\\]\\]'
-        }, {
-            token : "string",           // [=[ string
-            regex : strPre + '\\[\\=\\[.*\\]\\=\\]'
-        }, {
-            token : "string",           // [==[ string
-            regex : strPre + '\\[\\={2}\\[.*\\]\\={2}\\]'
-        }, {
-            token : "string",           // [===[ string
-            regex : strPre + '\\[\\={3}\\[.*\\]\\={3}\\]'
-        }, {
-            token : "string",           // [====[ string
-            regex : strPre + '\\[\\={4}\\[.*\\]\\={4}\\]'
-        }, {
-            token : "string",           // [====+[ string
-            regex : strPre + '\\[\\={5}\\=*\\[.*\\]\\={5}\\=*\\]'
-        },
-		
-		// multiline bracketed strings
-        {
-            token : "string",           // [[ string
-            regex : strPre + '\\[\\[.*$',
-            merge : true,
-            next  : "qstring"
-        }, {
-            token : "string",           // [=[ string
-            regex : strPre + '\\[\\=\\[.*$',
-            merge : true,
-            next  : "qstring1"
-        }, {
-            token : "string",           // [==[ string
-            regex : strPre + '\\[\\={2}\\[.*$',
-            merge : true,
-            next  : "qstring2"
-        }, {
-            token : "string",           // [===[ string
-            regex : strPre + '\\[\\={3}\\[.*$',
-            merge : true,
-            next  : "qstring3"
-        }, {
-            token : "string",           // [====[ string
-            regex : strPre + '\\[\\={4}\\[.*$',
-            merge : true,
-            next  : "qstring4"
-        }, {
-            token : function(value){     // --[====+[ string
-                // WARNING: EXTREMELY SLOW, see above.
-                var pattern = /\[(\=+)\[/, match;
-                if ((match = pattern.exec(value)) != null && (match = match[1]) != undefined)
-                    comment_stack.push(match.length);
-                
-                return "string";
-            },
-            regex : strPre + '\\[\\={5}\\=*\\[.*$',
-            merge : true,
-            next  : "qstring5"
-        }, 
-        
-        {
-            token : "string",           // " string
-            regex : strPre + '"(?:[^\\\\]|\\\\.)*?"'
-        }, {
-            token : "string",           // ' string
-            regex : strPre + "'(?:[^\\\\]|\\\\.)*?'"
-        }, {
-            token : "constant.numeric", // float
-            regex : floatNumber
-        }, {
-            token : "constant.numeric", // integer
-            regex : integer + "\\b"
-        }, {
-            token : function(value) {
-                if (keywords.hasOwnProperty(value))
-                    return "keyword";
-                else if (builtinConstants.hasOwnProperty(value))
-                    return "constant.language";
-                else if (futureReserved.hasOwnProperty(value))
-                    return "invalid.illegal";
-                else if (stdLibaries.hasOwnProperty(value))
-                    return "constant.library";
-                else if (deprecatedIn5152.hasOwnProperty(value))
-                    return "invalid.deprecated";
-                else if (builtinFunctions.hasOwnProperty(value))
-                    return "support.function";
-                else if (metatableMethods.hasOwnProperty(value))
-                    return "support.function";
-                else
-                    return "identifier";
-            },
-            regex : "[a-zA-Z_$][a-zA-Z0-9_$]*\\b"
-        }, {
-            token : "keyword.operator",
-            regex : "\\+|\\-|\\*|\\/|%|\\#|\\^|~|<|>|<=|=>|==|~=|=|\\:|\\.\\.\\.|\\.\\."
-        }, {
-            token : "paren.lparen",
-            regex : "[\\[\\(\\{]"
-        }, {
-            token : "paren.rparen",
-            regex : "[\\]\\)\\}]"
-        }, {
-            token : "text",
-            regex : "\\s+"
-        } ],
-        
-        "qcomment": [ {
-            token : "comment",
-            regex : "(?:[^\\\\]|\\\\.)*?\\]\\]",
-            next  : "start"
-        }, {
-            token : "comment",
-            merge : true,
-            regex : '.+'
-        } ],
-        "qcomment1": [ {
-            token : "comment",
-            regex : "(?:[^\\\\]|\\\\.)*?\\]\\=\\]",
-            next  : "start"
-        }, {
-            token : "comment",
-            merge : true,
-            regex : '.+'
-        } ],
-        "qcomment2": [ {
-            token : "comment",
-            regex : "(?:[^\\\\]|\\\\.)*?\\]\\={2}\\]",
-            next  : "start"
-        }, {
-            token : "comment",
-            merge : true,
-            regex : '.+'
-        } ],
-        "qcomment3": [ {
-            token : "comment",
-            regex : "(?:[^\\\\]|\\\\.)*?\\]\\={3}\\]",
-            next  : "start"
-        }, {
-            token : "comment",
-            merge : true,
-            regex : '.+'
-        } ],
-        "qcomment4": [ {
-            token : "comment",
-            regex : "(?:[^\\\\]|\\\\.)*?\\]\\={4}\\]",
-            next  : "start"
-        }, {
-            token : "comment",
-            merge : true,
-            regex : '.+'
-        } ],
-        "qcomment5": [ {
-            token : function(value){ 
-                // very hackish, mutates the qcomment5 field on the fly.
-                var pattern = /\](\=+)\]/, rule = this.rules.qcomment5[0], match;
-                rule.next = "start";
-                if ((match = pattern.exec(value)) != null && (match = match[1]) != undefined){
-                    var found = match.length, expected;
-                    if ((expected = comment_stack.pop()) != found){
-                        comment_stack.push(expected);
-                        rule.next = "qcomment5";
-                    }
-                }
-                
-                return "comment";
-            },
-            regex : "(?:[^\\\\]|\\\\.)*?\\]\\={5}\\=*\\]",
-            next  : "start"
-        }, {
-            token : "comment",
-            merge : true,
-            regex : '.+'
-        } ],
-        
-        "qstring": [ {
-            token : "string",
-            regex : "(?:[^\\\\]|\\\\.)*?\\]\\]",
-            next  : "start"
-        }, {
-            token : "string",
-            merge : true,
-            regex : '.+'
-        } ],
-        "qstring1": [ {
-            token : "string",
-            regex : "(?:[^\\\\]|\\\\.)*?\\]\\=\\]",
-            next  : "start"
-        }, {
-            token : "string",
-            merge : true,
-            regex : '.+'
-        } ],
-        "qstring2": [ {
-            token : "string",
-            regex : "(?:[^\\\\]|\\\\.)*?\\]\\={2}\\]",
-            next  : "start"
-        }, {
-            token : "string",
-            merge : true,
-            regex : '.+'
-        } ],
-        "qstring3": [ {
-            token : "string",
-            regex : "(?:[^\\\\]|\\\\.)*?\\]\\={3}\\]",
-            next  : "start"
-        }, {
-            token : "string",
-            merge : true,
-            regex : '.+'
-        } ],
-        "qstring4": [ {
-            token : "string",
-            regex : "(?:[^\\\\]|\\\\.)*?\\]\\={4}\\]",
-            next  : "start"
-        }, {
-            token : "string",
-            merge : true,
-            regex : '.+'
-        } ],
-        "qstring5": [ {
-            token : function(value){ 
-                // very hackish, mutates the qstring5 field on the fly.
-                var pattern = /\](\=+)\]/, rule = this.rules.qstring5[0], match;
-                rule.next = "start";
-                if ((match = pattern.exec(value)) != null && (match = match[1]) != undefined){
-                    var found = match.length, expected;
-                    if ((expected = comment_stack.pop()) != found){
-                        comment_stack.push(expected);
-                        rule.next = "qstring5";
-                    }
-                }
-                
-                return "string";
-            },
-            regex : "(?:[^\\\\]|\\\\.)*?\\]\\={5}\\=*\\]",
-            next  : "start"
-        }, {
-            token : "string",
-            merge : true,
-            regex : '.+'
-        } ]
-        
-    };
-
-}
-
-oop.inherits(LuaHighlightRules, TextHighlightRules);
-
-exports.LuaHighlightRules = LuaHighlightRules;
-});
diff --git a/apps/files_texteditor/js/aceeditor/mode-lua.js b/apps/files_texteditor/js/aceeditor/mode-lua.js
deleted file mode 100644
index 8f7471e7bf..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-lua.js
+++ /dev/null
@@ -1 +0,0 @@
-define("ace/mode/lua",["require","exports","module","ace/lib/oop","ace/mode/text","ace/tokenizer","ace/mode/lua_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text").Mode,f=a("../tokenizer").Tokenizer,g=a("./lua_highlight_rules").LuaHighlightRules,h=function(){this.$tokenizer=new f((new g).getRules())};d.inherits(h,e),function(){this.getNextLineIndent=function(a,b,c){var d=this.$getIndent(b),e=this.$tokenizer.getLineTokens(b,a),f=e.tokens,g=["function","then","do","repeat"];if(a=="start"){var h=b.match(/^.*[\{\(\[]\s*$/);if(h)d+=c;else for(var i in f){var j=f[i];if(j.type!="keyword")continue;var k=g.indexOf(j.value);if(k!=-1){d+=c;break}}}return d}}.call(h.prototype),b.Mode=h}),define("ace/mode/lua_highlight_rules",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("../lib/lang"),f=a("./text_highlight_rules").TextHighlightRules,g=function(){var a=e.arrayToMap("break|do|else|elseif|end|for|function|if|in|local|repeat|return|then|until|while|or|and|not".split("|")),b=e.arrayToMap("true|false|nil|_G|_VERSION".split("|")),c=e.arrayToMap("string|xpcall|package|tostring|print|os|unpack|require|getfenv|setmetatable|next|assert|tonumber|io|rawequal|collectgarbage|getmetatable|module|rawset|math|debug|pcall|table|newproxy|type|coroutine|_G|select|gcinfo|pairs|rawget|loadstring|ipairs|_VERSION|dofile|setfenv|load|error|loadfile|sub|upper|len|gfind|rep|find|match|char|dump|gmatch|reverse|byte|format|gsub|lower|preload|loadlib|loaded|loaders|cpath|config|path|seeall|exit|setlocale|date|getenv|difftime|remove|time|clock|tmpname|rename|execute|lines|write|close|flush|open|output|type|read|stderr|stdin|input|stdout|popen|tmpfile|log|max|acos|huge|ldexp|pi|cos|tanh|pow|deg|tan|cosh|sinh|random|randomseed|frexp|ceil|floor|rad|abs|sqrt|modf|asin|min|mod|fmod|log10|atan2|exp|sin|atan|getupvalue|debug|sethook|getmetatable|gethook|setmetatable|setlocal|traceback|setfenv|getinfo|setupvalue|getlocal|getregistry|getfenv|setn|insert|getn|foreachi|maxn|foreach|concat|sort|remove|resume|yield|status|wrap|create|running".split("|")),d=e.arrayToMap("string|package|os|io|math|debug|table|coroutine".split("|")),f=e.arrayToMap("__add|__sub|__mod|__unm|__concat|__lt|__index|__call|__gc|__metatable|__mul|__div|__pow|__len|__eq|__le|__newindex|__tostring|__mode|__tonumber".split("|")),g=e.arrayToMap("".split("|")),h=e.arrayToMap("setn|foreach|foreachi|gcinfo|log10|maxn".split("|")),i="",j="(?:(?:[1-9]\\d*)|(?:0))",k="(?:0[xX][\\dA-Fa-f]+)",l="(?:"+j+"|"+k+")",m="(?:\\.\\d+)",n="(?:\\d+)",o="(?:(?:"+n+"?"+m+")|(?:"+n+"\\.))",p="(?:"+o+")",q=[];this.$rules={start:[{token:"comment",regex:i+"\\-\\-\\[\\[.*\\]\\]"},{token:"comment",regex:i+"\\-\\-\\[\\=\\[.*\\]\\=\\]"},{token:"comment",regex:i+"\\-\\-\\[\\={2}\\[.*\\]\\={2}\\]"},{token:"comment",regex:i+"\\-\\-\\[\\={3}\\[.*\\]\\={3}\\]"},{token:"comment",regex:i+"\\-\\-\\[\\={4}\\[.*\\]\\={4}\\]"},{token:"comment",regex:i+"\\-\\-\\[\\={5}\\=*\\[.*\\]\\={5}\\=*\\]"},{token:"comment",regex:i+"\\-\\-\\[\\[.*$",merge:!0,next:"qcomment"},{token:"comment",regex:i+"\\-\\-\\[\\=\\[.*$",merge:!0,next:"qcomment1"},{token:"comment",regex:i+"\\-\\-\\[\\={2}\\[.*$",merge:!0,next:"qcomment2"},{token:"comment",regex:i+"\\-\\-\\[\\={3}\\[.*$",merge:!0,next:"qcomment3"},{token:"comment",regex:i+"\\-\\-\\[\\={4}\\[.*$",merge:!0,next:"qcomment4"},{token:function(a){var b=/\-\-\[(\=+)\[/,c;return(c=b.exec(a))!=null&&(c=c[1])!=undefined&&q.push(c.length),"comment"},regex:i+"\\-\\-\\[\\={5}\\=*\\[.*$",merge:!0,next:"qcomment5"},{token:"comment",regex:"\\-\\-.*$"},{token:"string",regex:i+"\\[\\[.*\\]\\]"},{token:"string",regex:i+"\\[\\=\\[.*\\]\\=\\]"},{token:"string",regex:i+"\\[\\={2}\\[.*\\]\\={2}\\]"},{token:"string",regex:i+"\\[\\={3}\\[.*\\]\\={3}\\]"},{token:"string",regex:i+"\\[\\={4}\\[.*\\]\\={4}\\]"},{token:"string",regex:i+"\\[\\={5}\\=*\\[.*\\]\\={5}\\=*\\]"},{token:"string",regex:i+"\\[\\[.*$",merge:!0,next:"qstring"},{token:"string",regex:i+"\\[\\=\\[.*$",merge:!0,next:"qstring1"},{token:"string",regex:i+"\\[\\={2}\\[.*$",merge:!0,next:"qstring2"},{token:"string",regex:i+"\\[\\={3}\\[.*$",merge:!0,next:"qstring3"},{token:"string",regex:i+"\\[\\={4}\\[.*$",merge:!0,next:"qstring4"},{token:function(a){var b=/\[(\=+)\[/,c;return(c=b.exec(a))!=null&&(c=c[1])!=undefined&&q.push(c.length),"string"},regex:i+"\\[\\={5}\\=*\\[.*$",merge:!0,next:"qstring5"},{token:"string",regex:i+'"(?:[^\\\\]|\\\\.)*?"'},{token:"string",regex:i+"'(?:[^\\\\]|\\\\.)*?'"},{token:"constant.numeric",regex:p},{token:"constant.numeric",regex:l+"\\b"},{token:function(e){return a.hasOwnProperty(e)?"keyword":b.hasOwnProperty(e)?"constant.language":g.hasOwnProperty(e)?"invalid.illegal":d.hasOwnProperty(e)?"constant.library":h.hasOwnProperty(e)?"invalid.deprecated":c.hasOwnProperty(e)?"support.function":f.hasOwnProperty(e)?"support.function":"identifier"},regex:"[a-zA-Z_$][a-zA-Z0-9_$]*\\b"},{token:"keyword.operator",regex:"\\+|\\-|\\*|\\/|%|\\#|\\^|~|<|>|<=|=>|==|~=|=|\\:|\\.\\.\\.|\\.\\."},{token:"paren.lparen",regex:"[\\[\\(\\{]"},{token:"paren.rparen",regex:"[\\]\\)\\}]"},{token:"text",regex:"\\s+"}],qcomment:[{token:"comment",regex:"(?:[^\\\\]|\\\\.)*?\\]\\]",next:"start"},{token:"comment",merge:!0,regex:".+"}],qcomment1:[{token:"comment",regex:"(?:[^\\\\]|\\\\.)*?\\]\\=\\]",next:"start"},{token:"comment",merge:!0,regex:".+"}],qcomment2:[{token:"comment",regex:"(?:[^\\\\]|\\\\.)*?\\]\\={2}\\]",next:"start"},{token:"comment",merge:!0,regex:".+"}],qcomment3:[{token:"comment",regex:"(?:[^\\\\]|\\\\.)*?\\]\\={3}\\]",next:"start"},{token:"comment",merge:!0,regex:".+"}],qcomment4:[{token:"comment",regex:"(?:[^\\\\]|\\\\.)*?\\]\\={4}\\]",next:"start"},{token:"comment",merge:!0,regex:".+"}],qcomment5:[{token:function(a){var b=/\](\=+)\]/,c=this.rules.qcomment5[0],d;c.next="start";if((d=b.exec(a))!=null&&(d=d[1])!=undefined){var e=d.length,f;(f=q.pop())!=e&&(q.push(f),c.next="qcomment5")}return"comment"},regex:"(?:[^\\\\]|\\\\.)*?\\]\\={5}\\=*\\]",next:"start"},{token:"comment",merge:!0,regex:".+"}],qstring:[{token:"string",regex:"(?:[^\\\\]|\\\\.)*?\\]\\]",next:"start"},{token:"string",merge:!0,regex:".+"}],qstring1:[{token:"string",regex:"(?:[^\\\\]|\\\\.)*?\\]\\=\\]",next:"start"},{token:"string",merge:!0,regex:".+"}],qstring2:[{token:"string",regex:"(?:[^\\\\]|\\\\.)*?\\]\\={2}\\]",next:"start"},{token:"string",merge:!0,regex:".+"}],qstring3:[{token:"string",regex:"(?:[^\\\\]|\\\\.)*?\\]\\={3}\\]",next:"start"},{token:"string",merge:!0,regex:".+"}],qstring4:[{token:"string",regex:"(?:[^\\\\]|\\\\.)*?\\]\\={4}\\]",next:"start"},{token:"string",merge:!0,regex:".+"}],qstring5:[{token:function(a){var b=/\](\=+)\]/,c=this.rules.qstring5[0],d;c.next="start";if((d=b.exec(a))!=null&&(d=d[1])!=undefined){var e=d.length,f;(f=q.pop())!=e&&(q.push(f),c.next="qstring5")}return"string"},regex:"(?:[^\\\\]|\\\\.)*?\\]\\={5}\\=*\\]",next:"start"},{token:"string",merge:!0,regex:".+"}]}};d.inherits(g,f),b.LuaHighlightRules=g})
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/mode-markdown-uncompressed.js b/apps/files_texteditor/js/aceeditor/mode-markdown-uncompressed.js
deleted file mode 100644
index a8edaafeef..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-markdown-uncompressed.js
+++ /dev/null
@@ -1,2897 +0,0 @@
-/* vim:ts=4:sts=4:sw=4:
- * ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *      Mihai Sucan <mihai DOT sucan AT gmail DOT com>
- *      Chris Spencer <chris.ag.spencer AT googlemail DOT com>
- *
- * 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 ***** */
-
-define('ace/mode/markdown', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text', 'ace/mode/javascript', 'ace/mode/xml', 'ace/mode/html', 'ace/tokenizer', 'ace/mode/markdown_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var TextMode = require("./text").Mode;
-var JavaScriptMode = require("./javascript").Mode;
-var XmlMode = require("./xml").Mode;
-var HtmlMode = require("./html").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
-var MarkdownHighlightRules = require("./markdown_highlight_rules").MarkdownHighlightRules;
-
-var Mode = function() {
-    var highlighter = new MarkdownHighlightRules();
-    
-    this.$tokenizer = new Tokenizer(highlighter.getRules());
-    this.$embeds = highlighter.getEmbeds();
-    this.createModeDelegates({
-      "js-": JavaScriptMode,
-      "xml-": XmlMode,
-      "html-": HtmlMode
-    });
-};
-oop.inherits(Mode, TextMode);
-
-(function() {
-    this.getNextLineIndent = function(state, line, tab) {
-        if (state == "listblock") {
-            var match = /^((?:.+)?)([-+*][ ]+)/.exec(line);
-            if (match) {
-                return new Array(match[1].length + 1).join(" ") + match[2];
-            } else {
-                return "";
-            }
-        } else {
-            return this.$getIndent(line);
-        }
-    };
-}).call(Mode.prototype);
-
-exports.Mode = Mode;
-});/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/javascript', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text', 'ace/tokenizer', 'ace/mode/javascript_highlight_rules', 'ace/mode/matching_brace_outdent', 'ace/range', 'ace/worker/worker_client', 'ace/mode/behaviour/cstyle', 'ace/mode/folding/cstyle'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
-var JavaScriptHighlightRules = require("./javascript_highlight_rules").JavaScriptHighlightRules;
-var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
-var Range = require("../range").Range;
-var WorkerClient = require("../worker/worker_client").WorkerClient;
-var CstyleBehaviour = require("./behaviour/cstyle").CstyleBehaviour;
-var CStyleFoldMode = require("./folding/cstyle").FoldMode;
-
-var Mode = function() {
-    this.$tokenizer = new Tokenizer(new JavaScriptHighlightRules().getRules());
-    this.$outdent = new MatchingBraceOutdent();
-    this.$behaviour = new CstyleBehaviour();
-    this.foldingRules = new CStyleFoldMode();
-};
-oop.inherits(Mode, TextMode);
-
-(function() {
-
-
-    this.toggleCommentLines = function(state, doc, startRow, endRow) {
-        var outdent = true;
-        var re = /^(\s*)\/\//;
-
-        for (var i=startRow; i<= endRow; i++) {
-            if (!re.test(doc.getLine(i))) {
-                outdent = false;
-                break;
-            }
-        }
-
-        if (outdent) {
-            var deleteRange = new Range(0, 0, 0, 0);
-            for (var i=startRow; i<= endRow; i++)
-            {
-                var line = doc.getLine(i);
-                var m = line.match(re);
-                deleteRange.start.row = i;
-                deleteRange.end.row = i;
-                deleteRange.end.column = m[0].length;
-                doc.replace(deleteRange, m[1]);
-            }
-        }
-        else {
-            doc.indentRows(startRow, endRow, "//");
-        }
-    };
-
-    this.getNextLineIndent = function(state, line, tab) {
-        var indent = this.$getIndent(line);
-
-        var tokenizedLine = this.$tokenizer.getLineTokens(line, state);
-        var tokens = tokenizedLine.tokens;
-        var endState = tokenizedLine.state;
-
-        if (tokens.length && tokens[tokens.length-1].type == "comment") {
-            return indent;
-        }
-        
-        if (state == "start" || state == "regex_allowed") {
-            var match = line.match(/^.*(?:\bcase\b.*\:|[\{\(\[])\s*$/);
-            if (match) {
-                indent += tab;
-            }
-        } else if (state == "doc-start") {
-            if (endState == "start" || state == "regex_allowed") {
-                return "";
-            }
-            var match = line.match(/^\s*(\/?)\*/);
-            if (match) {
-                if (match[1]) {
-                    indent += " ";
-                }
-                indent += "* ";
-            }
-        }
-
-        return indent;
-    };
-
-    this.checkOutdent = function(state, line, input) {
-        return this.$outdent.checkOutdent(line, input);
-    };
-
-    this.autoOutdent = function(state, doc, row) {
-        this.$outdent.autoOutdent(doc, row);
-    };
-    
-    this.createWorker = function(session) {
-        var worker = new WorkerClient(["ace"], "worker-javascript.js", "ace/mode/javascript_worker", "JavaScriptWorker");
-        worker.attachToDocument(session.getDocument());
-            
-        worker.on("jslint", function(results) {
-            var errors = [];
-            for (var i=0; i<results.data.length; i++) {
-                var error = results.data[i];
-                if (error)
-                    errors.push({
-                        row: error.line-1,
-                        column: error.character-1,
-                        text: error.reason,
-                        type: "warning",
-                        lint: error
-                    });
-            }
-            session.setAnnotations(errors);
-        });
-        
-        worker.on("narcissus", function(e) {
-            session.setAnnotations([e.data]);
-        });
-        
-        worker.on("terminate", function() {
-            session.clearAnnotations();
-        });
-        
-        return worker;
-    };
-
-}).call(Mode.prototype);
-
-exports.Mode = Mode;
-});
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *      Mihai Sucan <mihai DOT sucan AT gmail DOT com>
- *
- * 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 ***** */
-
-define('ace/mode/javascript_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/lang', 'ace/unicode', 'ace/mode/doc_comment_highlight_rules', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var lang = require("../lib/lang");
-var unicode = require("../unicode");
-var DocCommentHighlightRules = require("./doc_comment_highlight_rules").DocCommentHighlightRules;
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-
-var JavaScriptHighlightRules = function() {
-
-    // see: https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects
-    var globals = lang.arrayToMap(
-      // Constructors
-        ("Array|Boolean|Date|Function|Iterator|Number|Object|RegExp|String|Proxy|" +
-      // E4X
-         "Namespace|QName|XML|XMLList|" +
-         "ArrayBuffer|Float32Array|Float64Array|Int16Array|Int32Array|Int8Array|" +
-         "Uint16Array|Uint32Array|Uint8Array|Uint8ClampedArray|" +
-      // Errors
-        "Error|EvalError|InternalError|RangeError|ReferenceError|StopIteration|" +
-        "SyntaxError|TypeError|URIError|" +
-      //  Non-constructor functions
-        "decodeURI|decodeURIComponent|encodeURI|encodeURIComponent|eval|isFinite|" +
-        "isNaN|parseFloat|parseInt|" +
-      // Other
-        "JSON|Math|" +
-      // Pseudo
-        "this|arguments|prototype|window|document"
-      ).split("|")
-    );
-
-    var keywords = lang.arrayToMap(
-        ("break|case|catch|continue|default|delete|do|else|finally|for|function|" +
-        "if|in|instanceof|new|return|switch|throw|try|typeof|let|var|while|with|" +
-        "const|yield|import|get|set").split("|")
-    );
-
-    // keywords which can be followed by regular expressions
-    var kwBeforeRe = "case|do|else|finally|in|instanceof|return|throw|try|typeof|yield";
-
-    var deprecated = lang.arrayToMap(
-        ("__parent__|__count__|escape|unescape|with|__proto__").split("|")
-    );
-
-    var definitions = lang.arrayToMap(("const|let|var|function").split("|"));
-
-    var buildinConstants = lang.arrayToMap(
-        ("null|Infinity|NaN|undefined").split("|")
-    );
-
-    var futureReserved = lang.arrayToMap(
-        ("class|enum|extends|super|export|implements|private|" +
-        "public|interface|package|protected|static").split("|")
-    );
-
-    // TODO: Unicode escape sequences
-    var identifierRe = "[" + unicode.packages.L + "\\$_]["
-        + unicode.packages.L
-        + unicode.packages.Mn + unicode.packages.Mc
-        + unicode.packages.Nd
-        + unicode.packages.Pc + "\\$_]*\\b";
-
-    var escapedRe = "\\\\(?:x[0-9a-fA-F]{2}|" + // hex
-        "u[0-9a-fA-F]{4}|" + // unicode
-        "[0-2][0-7]{0,2}|" + // oct
-        "3[0-6][0-7]?|" + // oct
-        "37[0-7]?|" + // oct
-        "[4-7][0-7]?|" + //oct
-        ".)";
-
-    // regexp must not have capturing parentheses. Use (?:) instead.
-    // regexps are ordered -> the first match is used
-
-    this.$rules = {
-        "start" : [
-            {
-                token : "comment",
-                regex : /\/\/.*$/
-            },
-            new DocCommentHighlightRules().getStartRule("doc-start"),
-            {
-                token : "comment", // multi line comment
-                merge : true,
-                regex : /\/\*/,
-                next : "comment"
-            }, {
-                token : "string",
-                regex : "'",
-                next  : "qstring"
-            }, {
-                token : "string",
-                regex : '"',
-                next  : "qqstring"
-            }, {
-                token : "constant.numeric", // hex
-                regex : /0[xX][0-9a-fA-F]+\b/
-            }, {
-                token : "constant.numeric", // float
-                regex : /[+-]?\d+(?:(?:\.\d*)?(?:[eE][+-]?\d+)?)?\b/
-            }, { // match stuff like: Sound.prototype.play = function() { }
-                token : [
-                    "storage.type",
-                    "punctuation.operator",
-                    "support.function",
-                    "punctuation.operator",
-                    "entity.name.function",
-                    "text",
-                    "keyword.operator",
-                    "text",
-                    "storage.type",
-                    "text",
-                    "paren.lparen",
-                    "variable.parameter",
-                    "paren.rparen"
-                ],
-                regex : "(" + identifierRe + ")(\\.)(prototype)(\\.)(" + identifierRe +")(\\s*)(=)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"
-            }, { // match stuff like: Sound.prototype.play = myfunc
-                token : [
-                    "storage.type",
-                    "punctuation.operator",
-                    "support.function",
-                    "punctuation.operator",
-                    "entity.name.function",
-                    "text",
-                    "keyword.operator",
-                    "text"
-                ],
-                regex : "(" + identifierRe + ")(\\.)(prototype)(\\.)(" + identifierRe +")(\\s*)(=)(\\s*)"
-            }, { // match stuff like: Sound.play = function() {  }
-                token : [
-                    "storage.type",
-                    "punctuation.operator",
-                    "entity.name.function",
-                    "text",
-                    "keyword.operator",
-                    "text",
-                    "storage.type",
-                    "text",
-                    "paren.lparen",
-                    "variable.parameter",
-                    "paren.rparen"
-                ],
-                regex : "(" + identifierRe + ")(\\.)(" + identifierRe +")(\\s*)(=)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"
-            }, { // match stuff like: play = function() {  }
-                token : [
-                    "entity.name.function",
-                    "text",
-                    "keyword.operator",
-                    "text",
-                    "storage.type",
-                    "text",
-                    "paren.lparen",
-                    "variable.parameter",
-                    "paren.rparen"
-                ],
-                regex : "(" + identifierRe +")(\\s*)(=)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"
-            }, { // match regular function like: function myFunc(arg) { }
-                token : [
-                    "storage.type",
-                    "text",
-                    "entity.name.function",
-                    "text",
-                    "paren.lparen",
-                    "variable.parameter",
-                    "paren.rparen"
-                ],
-                regex : "(function)(\\s+)(" + identifierRe + ")(\\s*)(\\()(.*?)(\\))"
-            }, { // match stuff like: foobar: function() { }
-                token : [
-                    "entity.name.function",
-                    "text",
-                    "punctuation.operator",
-                    "text",
-                    "storage.type",
-                    "text",
-                    "paren.lparen",
-                    "variable.parameter",
-                    "paren.rparen"
-                ],
-                regex : "(" + identifierRe + ")(\\s*)(:)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"
-            }, { // Attempt to match : function() { } (this is for issues with 'foo': function() { })
-                token : [
-                    "text",
-                    "text",
-                    "storage.type",
-                    "text",
-                    "paren.lparen",
-                    "variable.parameter",
-                    "paren.rparen"
-                ],
-                regex : "(:)(\\s*)(function)?(\\s*)(\\()([^)]*)(\\))"
-            }, {
-                token : "constant.language.boolean",
-                regex : /(?:true|false)\b/
-            }, {
-                token : "keyword",
-                regex : "(?:" + kwBeforeRe + ")\\b",
-                next : "regex_allowed"
-            }, {
-                token : ["punctuation.operator", "support.function"],
-                regex : /(\.)(s(?:h(?:ift|ow(?:Mod(?:elessDialog|alDialog)|Help))|croll(?:X|By(?:Pages|Lines)?|Y|To)?|t(?:opzzzz|rike)|i(?:n|zeToContent|debar|gnText)|ort|u(?:p|b(?:str(?:ing)?)?)|pli(?:ce|t)|e(?:nd|t(?:Re(?:sizable|questHeader)|M(?:i(?:nutes|lliseconds)|onth)|Seconds|Ho(?:tKeys|urs)|Year|Cursor|Time(?:out)?|Interval|ZOptions|Date|UTC(?:M(?:i(?:nutes|lliseconds)|onth)|Seconds|Hours|Date|FullYear)|FullYear|Active)|arch)|qrt|lice|avePreferences|mall)|h(?:ome|andleEvent)|navigate|c(?:har(?:CodeAt|At)|o(?:s|n(?:cat|textual|firm)|mpile)|eil|lear(?:Timeout|Interval)?|a(?:ptureEvents|ll)|reate(?:StyleSheet|Popup|EventObject))|t(?:o(?:GMTString|S(?:tring|ource)|U(?:TCString|pperCase)|Lo(?:caleString|werCase))|est|a(?:n|int(?:Enabled)?))|i(?:s(?:NaN|Finite)|ndexOf|talics)|d(?:isableExternalCapture|ump|etachEvent)|u(?:n(?:shift|taint|escape|watch)|pdateCommands)|j(?:oin|avaEnabled)|p(?:o(?:p|w)|ush|lugins.refresh|a(?:ddings|rse(?:Int|Float)?)|r(?:int|ompt|eference))|e(?:scape|nableExternalCapture|val|lementFromPoint|x(?:p|ec(?:Script|Command)?))|valueOf|UTC|queryCommand(?:State|Indeterm|Enabled|Value)|f(?:i(?:nd|le(?:ModifiedDate|Size|CreatedDate|UpdatedDate)|xed)|o(?:nt(?:size|color)|rward)|loor|romCharCode)|watch|l(?:ink|o(?:ad|g)|astIndexOf)|a(?:sin|nchor|cos|t(?:tachEvent|ob|an(?:2)?)|pply|lert|b(?:s|ort))|r(?:ou(?:nd|teEvents)|e(?:size(?:By|To)|calc|turnValue|place|verse|l(?:oad|ease(?:Capture|Events)))|andom)|g(?:o|et(?:ResponseHeader|M(?:i(?:nutes|lliseconds)|onth)|Se(?:conds|lection)|Hours|Year|Time(?:zoneOffset)?|Da(?:y|te)|UTC(?:M(?:i(?:nutes|lliseconds)|onth)|Seconds|Hours|Da(?:y|te)|FullYear)|FullYear|A(?:ttention|llResponseHeaders)))|m(?:in|ove(?:B(?:y|elow)|To(?:Absolute)?|Above)|ergeAttributes|a(?:tch|rgins|x))|b(?:toa|ig|o(?:ld|rderWidths)|link|ack))\b(?=\()/
-            }, {
-                token : ["punctuation.operator", "support.function.dom"],
-                regex : /(\.)(s(?:ub(?:stringData|mit)|plitText|e(?:t(?:NamedItem|Attribute(?:Node)?)|lect))|has(?:ChildNodes|Feature)|namedItem|c(?:l(?:ick|o(?:se|neNode))|reate(?:C(?:omment|DATASection|aption)|T(?:Head|extNode|Foot)|DocumentFragment|ProcessingInstruction|E(?:ntityReference|lement)|Attribute))|tabIndex|i(?:nsert(?:Row|Before|Cell|Data)|tem)|open|delete(?:Row|C(?:ell|aption)|T(?:Head|Foot)|Data)|focus|write(?:ln)?|a(?:dd|ppend(?:Child|Data))|re(?:set|place(?:Child|Data)|move(?:NamedItem|Child|Attribute(?:Node)?)?)|get(?:NamedItem|Element(?:sBy(?:Name|TagName)|ById)|Attribute(?:Node)?)|blur)\b(?=\()/
-            }, {
-                token : ["punctuation.operator", "support.constant"],
-                regex : /(\.)(s(?:ystemLanguage|cr(?:ipts|ollbars|een(?:X|Y|Top|Left))|t(?:yle(?:Sheets)?|atus(?:Text|bar)?)|ibling(?:Below|Above)|ource|uffixes|e(?:curity(?:Policy)?|l(?:ection|f)))|h(?:istory|ost(?:name)?|as(?:h|Focus))|y|X(?:MLDocument|SLDocument)|n(?:ext|ame(?:space(?:s|URI)|Prop))|M(?:IN_VALUE|AX_VALUE)|c(?:haracterSet|o(?:n(?:structor|trollers)|okieEnabled|lorDepth|mp(?:onents|lete))|urrent|puClass|l(?:i(?:p(?:boardData)?|entInformation)|osed|asses)|alle(?:e|r)|rypto)|t(?:o(?:olbar|p)|ext(?:Transform|Indent|Decoration|Align)|ags)|SQRT(?:1_2|2)|i(?:n(?:ner(?:Height|Width)|put)|ds|gnoreCase)|zIndex|o(?:scpu|n(?:readystatechange|Line)|uter(?:Height|Width)|p(?:sProfile|ener)|ffscreenBuffering)|NEGATIVE_INFINITY|d(?:i(?:splay|alog(?:Height|Top|Width|Left|Arguments)|rectories)|e(?:scription|fault(?:Status|Ch(?:ecked|arset)|View)))|u(?:ser(?:Profile|Language|Agent)|n(?:iqueID|defined)|pdateInterval)|_content|p(?:ixelDepth|ort|ersonalbar|kcs11|l(?:ugins|atform)|a(?:thname|dding(?:Right|Bottom|Top|Left)|rent(?:Window|Layer)?|ge(?:X(?:Offset)?|Y(?:Offset)?))|r(?:o(?:to(?:col|type)|duct(?:Sub)?|mpter)|e(?:vious|fix)))|e(?:n(?:coding|abledPlugin)|x(?:ternal|pando)|mbeds)|v(?:isibility|endor(?:Sub)?|Linkcolor)|URLUnencoded|P(?:I|OSITIVE_INFINITY)|f(?:ilename|o(?:nt(?:Size|Family|Weight)|rmName)|rame(?:s|Element)|gColor)|E|whiteSpace|l(?:i(?:stStyleType|n(?:eHeight|kColor))|o(?:ca(?:tion(?:bar)?|lName)|wsrc)|e(?:ngth|ft(?:Context)?)|a(?:st(?:M(?:odified|atch)|Index|Paren)|yer(?:s|X)|nguage))|a(?:pp(?:MinorVersion|Name|Co(?:deName|re)|Version)|vail(?:Height|Top|Width|Left)|ll|r(?:ity|guments)|Linkcolor|bove)|r(?:ight(?:Context)?|e(?:sponse(?:XML|Text)|adyState))|global|x|m(?:imeTypes|ultiline|enubar|argin(?:Right|Bottom|Top|Left))|L(?:N(?:10|2)|OG(?:10E|2E))|b(?:o(?:ttom|rder(?:Width|RightWidth|BottomWidth|Style|Color|TopWidth|LeftWidth))|ufferDepth|elow|ackground(?:Color|Image)))\b/
-            }, {
-                token : ["storage.type", "punctuation.operator", "support.function.firebug"],
-                regex : /(console)(\.)(warn|info|log|error|time|timeEnd|assert)\b/
-            }, {
-                token : function(value) {
-                    if (globals.hasOwnProperty(value))
-                        return "variable.language";
-                    else if (deprecated.hasOwnProperty(value))
-                        return "invalid.deprecated";
-                    else if (definitions.hasOwnProperty(value))
-                        return "storage.type";
-                    else if (keywords.hasOwnProperty(value))
-                        return "keyword";
-                    else if (buildinConstants.hasOwnProperty(value))
-                        return "constant.language";
-                    else if (futureReserved.hasOwnProperty(value))
-                        return "invalid.illegal";
-                    else if (value == "debugger")
-                        return "invalid.deprecated";
-                    else
-                        return "identifier";
-                },
-                regex : identifierRe
-            }, {
-                token : "keyword.operator",
-                regex : /!|\$|%|&|\*|\-\-|\-|\+\+|\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\|\||\?\:|\*=|%=|\+=|\-=|&=|\^=|\b(?:in|instanceof|new|delete|typeof|void)/,
-                next  : "regex_allowed"
-            }, {
-                token : "punctuation.operator",
-                regex : /\?|\:|\,|\;|\./,
-                next  : "regex_allowed"
-            }, {
-                token : "paren.lparen",
-                regex : /[\[({]/,
-                next  : "regex_allowed"
-            }, {
-                token : "paren.rparen",
-                regex : /[\])}]/
-            }, {
-                token : "keyword.operator",
-                regex : /\/=?/,
-                next  : "regex_allowed"
-            }, {
-                token: "comment",
-                regex: /^#!.*$/
-            }, {
-                token : "text",
-                regex : /\s+/
-            }
-        ],
-        // regular expressions are only allowed after certain tokens. This
-        // makes sure we don't mix up regexps with the divison operator
-        "regex_allowed": [
-            {
-                token : "comment", // multi line comment
-                merge : true,
-                regex : "\\/\\*",
-                next : "comment_regex_allowed"
-            }, {
-                token : "comment",
-                regex : "\\/\\/.*$"
-            }, {
-                token: "string.regexp",
-                regex: "\\/",
-                next: "regex",
-                merge: true
-            }, {
-                token : "text",
-                regex : "\\s+"
-            }, {
-                // immediately return to the start mode without matching
-                // anything
-                token: "empty",
-                regex: "",
-                next: "start"
-            }
-        ],
-        "regex": [
-            {
-                token: "regexp.keyword.operator",
-                regex: "\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)",
-                next: "regex"
-            }, {
-				// flag
-                token: "string.regexp",
-                regex: "/\\w*",
-                next: "start",
-                merge: true
-            }, {
-                token: "string.regexp",
-                regex: "[^\\\\/\\[]+",
-                next: "regex",
-                merge: true
-            }, {
-                token: "string.regexp.charachterclass",
-                regex: "\\[",
-                next: "regex_character_class",
-                merge: true
-            }, {
-                token: "empty",
-                regex: "",
-                next: "start"
-            }
-        ],
-        "regex_character_class": [
-            {
-                token: "regexp.keyword.operator",
-                regex: "\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)",
-                next: "regex_character_class"
-            }, {
-                token: "string.regexp.charachterclass",
-                regex: "]",
-                next: "regex",
-                merge: true
-            }, {
-                token: "string.regexp.charachterclass",
-                regex: "[^\\\\\\]]+",
-                next: "regex_character_class",
-                merge: true
-            }, {
-                token: "empty",
-                regex: "",
-                next: "start"
-            }
-        ],
-        "comment_regex_allowed" : [
-            {
-                token : "comment", // closing comment
-                regex : ".*?\\*\\/",
-                merge : true,
-                next : "regex_allowed"
-            }, {
-                token : "comment", // comment spanning whole line
-                merge : true,
-                regex : ".+"
-            }
-        ],
-        "comment" : [
-            {
-                token : "comment", // closing comment
-                regex : ".*?\\*\\/",
-                merge : true,
-                next : "start"
-            }, {
-                token : "comment", // comment spanning whole line
-                merge : true,
-                regex : ".+"
-            }
-        ],
-        "qqstring" : [
-            {
-                token : "constant.language.escape",
-                regex : escapedRe
-            }, {
-                token : "string",
-                regex : '[^"\\\\]+'
-            }, {
-                token : "string",
-                regex : '"',
-                next  : "start"
-            }
-        ],
-        "qstring" : [
-            {
-                token : "constant.language.escape",
-                regex : escapedRe
-            }, {
-                token : "string",
-                regex : "[^'\\\\]+"
-            }, {
-                token : "string",
-                regex : "'",
-                next  : "start"
-            }
-        ]
-    };
-
-    this.embedRules(DocCommentHighlightRules, "doc-",
-        [ new DocCommentHighlightRules().getEndRule("start") ]);
-};
-
-oop.inherits(JavaScriptHighlightRules, TextHighlightRules);
-
-exports.JavaScriptHighlightRules = JavaScriptHighlightRules;
-});
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/doc_comment_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-
-var DocCommentHighlightRules = function() {
-
-    this.$rules = {
-        "start" : [ {
-            token : "comment.doc.tag",
-            regex : "@[\\w\\d_]+" // TODO: fix email addresses
-        }, {
-            token : "comment.doc",
-            merge : true,
-            regex : "\\s+"
-        }, {
-            token : "comment.doc",
-            merge : true,
-            regex : "TODO"
-        }, {
-            token : "comment.doc",
-            merge : true,
-            regex : "[^@\\*]+"
-        }, {
-            token : "comment.doc",
-            merge : true,
-            regex : "."
-        }]
-    };
-};
-
-oop.inherits(DocCommentHighlightRules, TextHighlightRules);
-
-(function() {
-
-    this.getStartRule = function(start) {
-        return {
-            token : "comment.doc", // doc comment
-            merge : true,
-            regex : "\\/\\*(?=\\*)",
-            next  : start
-        };
-    };
-    
-    this.getEndRule = function (start) {
-        return {
-            token : "comment.doc", // closing comment
-            merge : true,
-            regex : "\\*\\/",
-            next  : start
-        };
-    };
-
-}).call(DocCommentHighlightRules.prototype);
-
-exports.DocCommentHighlightRules = DocCommentHighlightRules;
-
-});
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/matching_brace_outdent', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
-"use strict";
-
-var Range = require("../range").Range;
-
-var MatchingBraceOutdent = function() {};
-
-(function() {
-
-    this.checkOutdent = function(line, input) {
-        if (! /^\s+$/.test(line))
-            return false;
-
-        return /^\s*\}/.test(input);
-    };
-
-    this.autoOutdent = function(doc, row) {
-        var line = doc.getLine(row);
-        var match = line.match(/^(\s*\})/);
-
-        if (!match) return 0;
-
-        var column = match[1].length;
-        var openBracePos = doc.findMatchingBracket({row: row, column: column});
-
-        if (!openBracePos || openBracePos.row == row) return 0;
-
-        var indent = this.$getIndent(doc.getLine(openBracePos.row));
-        doc.replace(new Range(row, 0, row, column-1), indent);
-    };
-
-    this.$getIndent = function(line) {
-        var match = line.match(/^(\s+)/);
-        if (match) {
-            return match[1];
-        }
-
-        return "";
-    };
-
-}).call(MatchingBraceOutdent.prototype);
-
-exports.MatchingBraceOutdent = MatchingBraceOutdent;
-});
-/* vim:ts=4:sts=4:sw=4:
- * ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Chris Spencer <chris.ag.spencer AT googlemail DOT com>
- *
- * 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 ***** */
-
-define('ace/mode/behaviour/cstyle', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/behaviour'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../../lib/oop");
-var Behaviour = require('../behaviour').Behaviour;
-
-var CstyleBehaviour = function () {
-
-    this.add("braces", "insertion", function (state, action, editor, session, text) {
-        if (text == '{') {
-            var selection = editor.getSelectionRange();
-            var selected = session.doc.getTextRange(selection);
-            if (selected !== "") {
-                return {
-                    text: '{' + selected + '}',
-                    selection: false
-                };
-            } else {
-                return {
-                    text: '{}',
-                    selection: [1, 1]
-                };
-            }
-        } else if (text == '}') {
-            var cursor = editor.getCursorPosition();
-            var line = session.doc.getLine(cursor.row);
-            var rightChar = line.substring(cursor.column, cursor.column + 1);
-            if (rightChar == '}') {
-                var matching = session.$findOpeningBracket('}', {column: cursor.column + 1, row: cursor.row});
-                if (matching !== null) {
-                    return {
-                        text: '',
-                        selection: [1, 1]
-                    };
-                }
-            }
-        } else if (text == "\n") {
-            var cursor = editor.getCursorPosition();
-            var line = session.doc.getLine(cursor.row);
-            var rightChar = line.substring(cursor.column, cursor.column + 1);
-            if (rightChar == '}') {
-                var openBracePos = session.findMatchingBracket({row: cursor.row, column: cursor.column + 1});
-                if (!openBracePos)
-                     return null;
-
-                var indent = this.getNextLineIndent(state, line.substring(0, line.length - 1), session.getTabString());
-                var next_indent = this.$getIndent(session.doc.getLine(openBracePos.row));
-
-                return {
-                    text: '\n' + indent + '\n' + next_indent,
-                    selection: [1, indent.length, 1, indent.length]
-                };
-            }
-        }
-    });
-
-    this.add("braces", "deletion", function (state, action, editor, session, range) {
-        var selected = session.doc.getTextRange(range);
-        if (!range.isMultiLine() && selected == '{') {
-            var line = session.doc.getLine(range.start.row);
-            var rightChar = line.substring(range.end.column, range.end.column + 1);
-            if (rightChar == '}') {
-                range.end.column++;
-                return range;
-            }
-        }
-    });
-
-    this.add("parens", "insertion", function (state, action, editor, session, text) {
-        if (text == '(') {
-            var selection = editor.getSelectionRange();
-            var selected = session.doc.getTextRange(selection);
-            if (selected !== "") {
-                return {
-                    text: '(' + selected + ')',
-                    selection: false
-                };
-            } else {
-                return {
-                    text: '()',
-                    selection: [1, 1]
-                };
-            }
-        } else if (text == ')') {
-            var cursor = editor.getCursorPosition();
-            var line = session.doc.getLine(cursor.row);
-            var rightChar = line.substring(cursor.column, cursor.column + 1);
-            if (rightChar == ')') {
-                var matching = session.$findOpeningBracket(')', {column: cursor.column + 1, row: cursor.row});
-                if (matching !== null) {
-                    return {
-                        text: '',
-                        selection: [1, 1]
-                    };
-                }
-            }
-        }
-    });
-
-    this.add("parens", "deletion", function (state, action, editor, session, range) {
-        var selected = session.doc.getTextRange(range);
-        if (!range.isMultiLine() && selected == '(') {
-            var line = session.doc.getLine(range.start.row);
-            var rightChar = line.substring(range.start.column + 1, range.start.column + 2);
-            if (rightChar == ')') {
-                range.end.column++;
-                return range;
-            }
-        }
-    });
-
-    this.add("string_dquotes", "insertion", function (state, action, editor, session, text) {
-        if (text == '"' || text == "'") {
-            var quote = text;
-            var selection = editor.getSelectionRange();
-            var selected = session.doc.getTextRange(selection);
-            if (selected !== "") {
-                return {
-                    text: quote + selected + quote,
-                    selection: false
-                };
-            } else {
-                var cursor = editor.getCursorPosition();
-                var line = session.doc.getLine(cursor.row);
-                var leftChar = line.substring(cursor.column-1, cursor.column);
-
-                // We're escaped.
-                if (leftChar == '\\') {
-                    return null;
-                }
-
-                // Find what token we're inside.
-                var tokens = session.getTokens(selection.start.row, selection.start.row)[0].tokens;
-                var col = 0, token;
-                var quotepos = -1; // Track whether we're inside an open quote.
-
-                for (var x = 0; x < tokens.length; x++) {
-                    token = tokens[x];
-                    if (token.type == "string") {
-                      quotepos = -1;
-                    } else if (quotepos < 0) {
-                      quotepos = token.value.indexOf(quote);
-                    }
-                    if ((token.value.length + col) > selection.start.column) {
-                        break;
-                    }
-                    col += tokens[x].value.length;
-                }
-
-                // Try and be smart about when we auto insert.
-                if (!token || (quotepos < 0 && token.type !== "comment" && (token.type !== "string" || ((selection.start.column !== token.value.length+col-1) && token.value.lastIndexOf(quote) === token.value.length-1)))) {
-                    return {
-                        text: quote + quote,
-                        selection: [1,1]
-                    };
-                } else if (token && token.type === "string") {
-                    // Ignore input and move right one if we're typing over the closing quote.
-                    var rightChar = line.substring(cursor.column, cursor.column + 1);
-                    if (rightChar == quote) {
-                        return {
-                            text: '',
-                            selection: [1, 1]
-                        };
-                    }
-                }
-            }
-        }
-    });
-
-    this.add("string_dquotes", "deletion", function (state, action, editor, session, range) {
-        var selected = session.doc.getTextRange(range);
-        if (!range.isMultiLine() && (selected == '"' || selected == "'")) {
-            var line = session.doc.getLine(range.start.row);
-            var rightChar = line.substring(range.start.column + 1, range.start.column + 2);
-            if (rightChar == '"') {
-                range.end.column++;
-                return range;
-            }
-        }
-    });
-
-};
-
-oop.inherits(CstyleBehaviour, Behaviour);
-
-exports.CstyleBehaviour = CstyleBehaviour;
-});/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/folding/cstyle', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/range', 'ace/mode/folding/fold_mode'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../../lib/oop");
-var Range = require("../../range").Range;
-var BaseFoldMode = require("./fold_mode").FoldMode;
-
-var FoldMode = exports.FoldMode = function() {};
-oop.inherits(FoldMode, BaseFoldMode);
-
-(function() {
-
-    this.foldingStartMarker = /(\{|\[)[^\}\]]*$|^\s*(\/\*)/;
-    this.foldingStopMarker = /^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/;
-    
-    this.getFoldWidgetRange = function(session, foldStyle, row) {
-        var line = session.getLine(row);
-        var match = line.match(this.foldingStartMarker);
-        if (match) {
-            var i = match.index;
-
-            if (match[1])
-                return this.openingBracketBlock(session, match[1], row, i);
-
-            var range = session.getCommentFoldRange(row, i + match[0].length);
-            range.end.column -= 2;
-            return range;
-        }
-
-        if (foldStyle !== "markbeginend")
-            return;
-            
-        var match = line.match(this.foldingStopMarker);
-        if (match) {
-            var i = match.index + match[0].length;
-
-            if (match[2]) {
-                var range = session.getCommentFoldRange(row, i);
-                range.end.column -= 2;
-                return range;
-            }
-
-            var end = {row: row, column: i};
-            var start = session.$findOpeningBracket(match[1], end);
-            
-            if (!start)
-                return;
-
-            start.column++;
-            end.column--;
-
-            return  Range.fromPoints(start, end);
-        }
-    };
-    
-}).call(FoldMode.prototype);
-
-});/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/folding/fold_mode', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
-"use strict";
-
-var Range = require("../../range").Range;
-
-var FoldMode = exports.FoldMode = function() {};
-
-(function() {
-
-    this.foldingStartMarker = null;
-    this.foldingStopMarker = null;
-
-    // must return "" if there's no fold, to enable caching
-    this.getFoldWidget = function(session, foldStyle, row) {
-        var line = session.getLine(row);
-        if (this.foldingStartMarker.test(line))
-            return "start";
-        if (foldStyle == "markbeginend"
-                && this.foldingStopMarker
-                && this.foldingStopMarker.test(line))
-            return "end";
-        return "";
-    };
-    
-    this.getFoldWidgetRange = function(session, foldStyle, row) {
-        return null;
-    };
-
-    this.indentationBlock = function(session, row, column) {
-        var re = /^\s*/;
-        var startRow = row;
-        var endRow = row;
-        var line = session.getLine(row);
-        var startColumn = column || line.length;
-        var startLevel = line.match(re)[0].length;
-        var maxRow = session.getLength()
-        
-        while (++row < maxRow) {
-            line = session.getLine(row);
-            var level = line.match(re)[0].length;
-
-            if (level == line.length)
-                continue;
-
-            if (level <= startLevel)
-                break;
-
-            endRow = row;
-        }
-
-        if (endRow > startRow) {
-            var endColumn = session.getLine(endRow).length;
-            return new Range(startRow, startColumn, endRow, endColumn);
-        }
-    };
-
-    this.openingBracketBlock = function(session, bracket, row, column) {
-        var start = {row: row, column: column + 1};
-        var end = session.$findClosingBracket(bracket, start);
-        if (!end)
-            return;
-
-        var fw = session.foldWidgets[end.row];
-        if (fw == null)
-            fw = this.getFoldWidget(session, end.row);
-
-        if (fw == "start") {
-            end.row --;
-            end.column = session.getLine(end.row).length;
-        }
-        return Range.fromPoints(start, end);
-    };
-
-}).call(FoldMode.prototype);
-
-});
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/xml', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text', 'ace/tokenizer', 'ace/mode/xml_highlight_rules', 'ace/mode/behaviour/xml', 'ace/mode/folding/xml'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
-var XmlHighlightRules = require("./xml_highlight_rules").XmlHighlightRules;
-var XmlBehaviour = require("./behaviour/xml").XmlBehaviour;
-var XmlFoldMode = require("./folding/xml").FoldMode;
-
-var Mode = function() {
-    this.$tokenizer = new Tokenizer(new XmlHighlightRules().getRules());
-    this.$behaviour = new XmlBehaviour();
-    this.foldingRules = new XmlFoldMode();
-};
-
-oop.inherits(Mode, TextMode);
-
-(function() {
-    
-    this.getNextLineIndent = function(state, line, tab) {
-        return this.$getIndent(line);
-    };
-
-}).call(Mode.prototype);
-
-exports.Mode = Mode;
-});
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/xml_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/xml_util', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var xmlUtil = require("./xml_util");
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-
-var XmlHighlightRules = function() {
-
-    // regexp must not have capturing parentheses
-    // regexps are ordered -> the first match is used
-    this.$rules = {
-        start : [{
-            token : "text",
-            regex : "<\\!\\[CDATA\\[",
-            next : "cdata"
-        }, {
-            token : "xml_pe",
-            regex : "<\\?.*?\\?>"
-        }, {
-            token : "comment",
-            merge : true,
-            regex : "<\\!--",
-            next : "comment"
-        }, {
-            token : "xml_pe",
-            regex : "<\\!.*?>"
-        }, {
-            token : "meta.tag", // opening tag
-            regex : "<\\/?",
-            next : "tag"
-        }, {
-            token : "text",
-            regex : "\\s+"
-        }, {
-            token : "constant.character.entity",
-            regex : "(?:&#[0-9]+;)|(?:&#x[0-9a-fA-F]+;)|(?:&[a-zA-Z0-9_:\\.-]+;)"
-        }, {
-            token : "text",
-            regex : "[^<]+"
-        }],
-        
-        cdata : [{
-            token : "text",
-            regex : "\\]\\]>",
-            next : "start"
-        }, {
-            token : "text",
-            regex : "\\s+"
-        }, {
-            token : "text",
-            regex : "(?:[^\\]]|\\](?!\\]>))+"
-        }],
-
-        comment : [{
-            token : "comment",
-            regex : ".*?-->",
-            next : "start"
-        }, {
-            token : "comment",
-            merge : true,
-            regex : ".+"
-        }]
-    };
-    
-    xmlUtil.tag(this.$rules, "tag", "start");
-};
-
-oop.inherits(XmlHighlightRules, TextHighlightRules);
-
-exports.XmlHighlightRules = XmlHighlightRules;
-});
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/xml_util', ['require', 'exports', 'module' , 'ace/lib/lang'], function(require, exports, module) {
-"use strict";
-
-var lang = require("../lib/lang");
-
-var formTags = lang.arrayToMap(
-    ("button|form|input|label|select|textarea").split("|")
-);
-
-var tableTags = lang.arrayToMap(
-    ("table|tbody|td|tfoot|th|tr").split("|")
-);
-
-function string(state) {
-    return [{
-        token : "string",
-        regex : '".*?"'
-    }, {
-        token : "string", // multi line string start
-        merge : true,
-        regex : '["].*',
-        next : state + "_qqstring"
-    }, {
-        token : "string",
-        regex : "'.*?'"
-    }, {
-        token : "string", // multi line string start
-        merge : true,
-        regex : "['].*",
-        next : state + "_qstring"
-    }];
-}
-
-function multiLineString(quote, state) {
-    return [{
-        token : "string",
-        merge : true,
-        regex : ".*?" + quote,
-        next : state
-    }, {
-        token : "string",
-        merge : true,
-        regex : '.+'
-    }];
-}
-
-exports.tag = function(states, name, nextState) {
-    states[name] = [{
-        token : "text",
-        regex : "\\s+"
-    }, {
-        //token : "meta.tag",
-        
-    token : function(value) {
-            if ( value==='a' ) {
-                return "meta.tag.anchor";
-            }
-            else if ( value==='img' ) {
-                return "meta.tag.image";
-            }
-            else if ( value==='script' ) {
-                return "meta.tag.script";
-            }
-            else if ( value==='style' ) {
-                return "meta.tag.style";
-            }
-            else if (formTags.hasOwnProperty(value.toLowerCase())) {
-                return "meta.tag.form";
-            }
-            else if (tableTags.hasOwnProperty(value.toLowerCase())) {
-                return "meta.tag.table";
-            }
-            else {
-                return "meta.tag";
-            }
-        },        
-        merge : true,
-        regex : "[-_a-zA-Z0-9:]+",
-        next : name + "_embed_attribute_list" 
-    }, {
-        token: "empty",
-        regex: "",
-        next : name + "_embed_attribute_list"
-    }];
-
-    states[name + "_qstring"] = multiLineString("'", name + "_embed_attribute_list");
-    states[name + "_qqstring"] = multiLineString("\"", name + "_embed_attribute_list");
-    
-    states[name + "_embed_attribute_list"] = [{
-        token : "meta.tag",
-        merge : true,
-        regex : "\/?>",
-        next : nextState
-    }, {
-        token : "keyword.operator",
-        regex : "="
-    }, {
-        token : "entity.other.attribute-name",
-        regex : "[-_a-zA-Z0-9:]+"
-    }, {
-        token : "constant.numeric", // float
-        regex : "[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"
-    }, {
-        token : "text",
-        regex : "\\s+"
-    }].concat(string(name));
-};
-
-});
-/* vim:ts=4:sts=4:sw=4:
- * ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Chris Spencer <chris.ag.spencer AT googlemail DOT com>
- *
- * 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 ***** */
-
-define('ace/mode/behaviour/xml', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/behaviour', 'ace/mode/behaviour/cstyle'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../../lib/oop");
-var Behaviour = require("../behaviour").Behaviour;
-var CstyleBehaviour = require("./cstyle").CstyleBehaviour;
-
-var XmlBehaviour = function () {
-    
-    this.inherit(CstyleBehaviour, ["string_dquotes"]); // Get string behaviour
-    
-    this.add("brackets", "insertion", function (state, action, editor, session, text) {
-        if (text == '<') {
-            var selection = editor.getSelectionRange();
-            var selected = session.doc.getTextRange(selection);
-            if (selected !== "") {
-                return false;
-            } else {
-                return {
-                    text: '<>',
-                    selection: [1, 1]
-                }
-            }
-        } else if (text == '>') {
-            var cursor = editor.getCursorPosition();
-            var line = session.doc.getLine(cursor.row);
-            var rightChar = line.substring(cursor.column, cursor.column + 1);
-            if (rightChar == '>') { // need some kind of matching check here
-                return {
-                    text: '',
-                    selection: [1, 1]
-                }
-            }
-        } else if (text == "\n") {
-            var cursor = editor.getCursorPosition();
-            var line = session.doc.getLine(cursor.row);
-            var rightChars = line.substring(cursor.column, cursor.column + 2);
-            if (rightChars == '</') {
-                var indent = this.$getIndent(session.doc.getLine(cursor.row)) + session.getTabString();
-                var next_indent = this.$getIndent(session.doc.getLine(cursor.row));
-
-                return {
-                    text: '\n' + indent + '\n' + next_indent,
-                    selection: [1, indent.length, 1, indent.length]
-                }
-            }
-        }
-    });
-    
-}
-oop.inherits(XmlBehaviour, Behaviour);
-
-exports.XmlBehaviour = XmlBehaviour;
-});/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/folding/xml', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/lang', 'ace/range', 'ace/mode/folding/fold_mode', 'ace/token_iterator'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../../lib/oop");
-var lang = require("../../lib/lang");
-var Range = require("../../range").Range;
-var BaseFoldMode = require("./fold_mode").FoldMode;
-var TokenIterator = require("../../token_iterator").TokenIterator;
-
-var FoldMode = exports.FoldMode = function(voidElements) {
-    BaseFoldMode.call(this);
-    this.voidElements = voidElements || {};
-};
-oop.inherits(FoldMode, BaseFoldMode);
-
-(function() {
-
-    this.getFoldWidget = function(session, foldStyle, row) {
-        var tag = this._getFirstTagInLine(session, row);
-
-        if (tag.closing)
-            return foldStyle == "markbeginend" ? "end" : "";
-
-        if (!tag.tagName || this.voidElements[tag.tagName.toLowerCase()])
-            return "";
-
-        if (tag.selfClosing)
-            return "";
-
-        if (tag.value.indexOf("/" + tag.tagName) !== -1)
-            return "";
-
-        return "start";
-    };
-    
-    this._getFirstTagInLine = function(session, row) {
-        var tokens = session.getTokens(row, row)[0].tokens;
-        var value = "";
-        for (var i = 0; i < tokens.length; i++) {
-            var token = tokens[i];
-            if (token.type.indexOf("meta.tag") === 0)
-                value += token.value;
-            else
-                value += lang.stringRepeat(" ", token.value.length);
-        }
-        
-        return this._parseTag(value);
-    };
-
-    this.tagRe = /^(\s*)(<?(\/?)([-_a-zA-Z0-9:!]*)\s*(\/?)>?)/;
-    this._parseTag = function(tag) {
-        
-        var match = this.tagRe.exec(tag);
-        var column = this.tagRe.lastIndex || 0;
-        this.tagRe.lastIndex = 0;
-
-        return {
-            value: tag,
-            match: match ? match[2] : "",
-            closing: match ? !!match[3] : false,
-            selfClosing: match ? !!match[5] || match[2] == "/>" : false,
-            tagName: match ? match[4] : "",
-            column: match[1] ? column + match[1].length : column
-        };
-    };
-    
-    /**
-     * reads a full tag and places the iterator after the tag
-     */
-    this._readTagForward = function(iterator) {
-        var token = iterator.getCurrentToken();
-        if (!token)
-            return null;
-            
-        var value = "";
-        var start;
-        
-        do {
-            if (token.type.indexOf("meta.tag") === 0) {
-                if (!start) {
-                    var start = {
-                        row: iterator.getCurrentTokenRow(),
-                        column: iterator.getCurrentTokenColumn()
-                    };
-                }
-                value += token.value;
-                if (value.indexOf(">") !== -1) {
-                    var tag = this._parseTag(value);
-                    tag.start = start;
-                    tag.end = {
-                        row: iterator.getCurrentTokenRow(),
-                        column: iterator.getCurrentTokenColumn() + token.value.length
-                    };
-                    iterator.stepForward();
-                    return tag;
-                }
-            }
-        } while(token = iterator.stepForward());
-        
-        return null;
-    };
-    
-    this._readTagBackward = function(iterator) {
-        var token = iterator.getCurrentToken();
-        if (!token)
-            return null;
-            
-        var value = "";
-        var end;
-
-        do {
-            if (token.type.indexOf("meta.tag") === 0) {
-                if (!end) {
-                    end = {
-                        row: iterator.getCurrentTokenRow(),
-                        column: iterator.getCurrentTokenColumn() + token.value.length
-                    };
-                }
-                value = token.value + value;
-                if (value.indexOf("<") !== -1) {
-                    var tag = this._parseTag(value);
-                    tag.end = end;
-                    tag.start = {
-                        row: iterator.getCurrentTokenRow(),
-                        column: iterator.getCurrentTokenColumn()
-                    };
-                    iterator.stepBackward();
-                    return tag;
-                }
-            }
-        } while(token = iterator.stepBackward());
-        
-        return null;
-    };
-    
-    this._pop = function(stack, tag) {
-        while (stack.length) {
-            
-            var top = stack[stack.length-1];
-            if (!tag || top.tagName == tag.tagName) {
-                return stack.pop();
-            }
-            else if (this.voidElements[tag.tagName]) {
-                return;
-            }
-            else if (this.voidElements[top.tagName]) {
-                stack.pop();
-                continue;
-            } else {
-                return null;
-            }
-        }
-    };
-    
-    this.getFoldWidgetRange = function(session, foldStyle, row) {
-        var firstTag = this._getFirstTagInLine(session, row);
-        
-        if (!firstTag.match)
-            return null;
-        
-        var isBackward = firstTag.closing || firstTag.selfClosing;
-        var stack = [];
-        var tag;
-        
-        if (!isBackward) {
-            var iterator = new TokenIterator(session, row, firstTag.column);
-            var start = {
-                row: row,
-                column: firstTag.column + firstTag.tagName.length + 2
-            };
-            while (tag = this._readTagForward(iterator)) {
-                if (tag.selfClosing) {
-                    if (!stack.length) {
-                        tag.start.column += tag.tagName.length + 2;
-                        tag.end.column -= 2;
-                        return Range.fromPoints(tag.start, tag.end);
-                    } else
-                        continue;
-                }
-                
-                if (tag.closing) {
-                    this._pop(stack, tag);
-                    if (stack.length == 0)
-                        return Range.fromPoints(start, tag.start);
-                }
-                else {
-                    stack.push(tag)
-                }
-            }
-        }
-        else {
-            var iterator = new TokenIterator(session, row, firstTag.column + firstTag.match.length);
-            var end = {
-                row: row,
-                column: firstTag.column
-            };
-            
-            while (tag = this._readTagBackward(iterator)) {
-                if (tag.selfClosing) {
-                    if (!stack.length) {
-                        tag.start.column += tag.tagName.length + 2;
-                        tag.end.column -= 2;
-                        return Range.fromPoints(tag.start, tag.end);
-                    } else
-                        continue;
-                }
-                
-                if (!tag.closing) {
-                    this._pop(stack, tag);
-                    if (stack.length == 0) {
-                        tag.start.column += tag.tagName.length + 2;
-                        return Range.fromPoints(tag.start, end);
-                    }
-                }
-                else {
-                    stack.push(tag)
-                }
-            }
-        }
-        
-    };
-
-}).call(FoldMode.prototype);
-
-});/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/html', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text', 'ace/mode/javascript', 'ace/mode/css', 'ace/tokenizer', 'ace/mode/html_highlight_rules', 'ace/mode/behaviour/xml', 'ace/mode/folding/html'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var TextMode = require("./text").Mode;
-var JavaScriptMode = require("./javascript").Mode;
-var CssMode = require("./css").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
-var HtmlHighlightRules = require("./html_highlight_rules").HtmlHighlightRules;
-var XmlBehaviour = require("./behaviour/xml").XmlBehaviour;
-var HtmlFoldMode = require("./folding/html").FoldMode;
-
-var Mode = function() {
-    var highlighter = new HtmlHighlightRules();
-    this.$tokenizer = new Tokenizer(highlighter.getRules());
-    this.$behaviour = new XmlBehaviour();
-    
-    this.$embeds = highlighter.getEmbeds();
-    this.createModeDelegates({
-        "js-": JavaScriptMode,
-        "css-": CssMode
-    });
-    
-    this.foldingRules = new HtmlFoldMode();
-};
-oop.inherits(Mode, TextMode);
-
-(function() {
-
-    
-    this.toggleCommentLines = function(state, doc, startRow, endRow) {
-        return 0;
-    };
-
-    this.getNextLineIndent = function(state, line, tab) {
-        return this.$getIndent(line);
-    };
-
-    this.checkOutdent = function(state, line, input) {
-        return false;
-    };
-
-}).call(Mode.prototype);
-
-exports.Mode = Mode;
-});
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/css', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text', 'ace/tokenizer', 'ace/mode/css_highlight_rules', 'ace/mode/matching_brace_outdent', 'ace/worker/worker_client', 'ace/mode/folding/cstyle'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
-var CssHighlightRules = require("./css_highlight_rules").CssHighlightRules;
-var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
-var WorkerClient = require("../worker/worker_client").WorkerClient;
-var CStyleFoldMode = require("./folding/cstyle").FoldMode;
-
-var Mode = function() {
-    this.$tokenizer = new Tokenizer(new CssHighlightRules().getRules(), "i");
-    this.$outdent = new MatchingBraceOutdent();
-    this.foldingRules = new CStyleFoldMode();
-};
-oop.inherits(Mode, TextMode);
-
-(function() {
-
-    this.foldingRules = "cStyle";
-
-    this.getNextLineIndent = function(state, line, tab) {
-        var indent = this.$getIndent(line);
-
-        // ignore braces in comments
-        var tokens = this.$tokenizer.getLineTokens(line, state).tokens;
-        if (tokens.length && tokens[tokens.length-1].type == "comment") {
-            return indent;
-        }
-
-        var match = line.match(/^.*\{\s*$/);
-        if (match) {
-            indent += tab;
-        }
-
-        return indent;
-    };
-
-    this.checkOutdent = function(state, line, input) {
-        return this.$outdent.checkOutdent(line, input);
-    };
-
-    this.autoOutdent = function(state, doc, row) {
-        this.$outdent.autoOutdent(doc, row);
-    };
-    
-    this.createWorker = function(session) {
-        var worker = new WorkerClient(["ace"], "worker-css.js", "ace/mode/css_worker", "Worker");
-        worker.attachToDocument(session.getDocument());
-        
-        worker.on("csslint", function(e) {
-            var errors = [];
-            e.data.forEach(function(message) {
-                errors.push({
-                    row: message.line - 1,
-                    column: message.col - 1,
-                    text: message.message,
-                    type: message.type,
-                    lint: message
-                });
-            });
-            
-            session.setAnnotations(errors);
-        });
-        return worker;
-    };
-
-}).call(Mode.prototype);
-
-exports.Mode = Mode;
-
-});
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/css_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/lang', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var lang = require("../lib/lang");
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-
-var CssHighlightRules = function() {
-
-    var properties = lang.arrayToMap(
-        ("animation-fill-mode|alignment-adjust|alignment-baseline|animation-delay|animation-direction|animation-duration|animation-iteration-count|animation-name|animation-play-state|animation-timing-function|animation|appearance|azimuth|backface-visibility|background-attachment|background-break|background-clip|background-color|background-image|background-origin|background-position|background-repeat|background-size|background|baseline-shift|binding|bleed|bookmark-label|bookmark-level|bookmark-state|bookmark-target|border-bottom|border-bottom-color|border-bottom-left-radius|border-bottom-right-radius|border-bottom-style|border-bottom-width|border-collapse|border-color|border-image|border-image-outset|border-image-repeat|border-image-slice|border-image-source|border-image-width|border-left|border-left-color|border-left-style|border-left-width|border-radius|border-right|border-right-color|border-right-style|border-right-width|border-spacing|border-style|border-top|border-top-color|border-top-left-radius|border-top-right-radius|border-top-style|border-top-width|border-width|border|bottom|box-align|box-decoration-break|box-direction|box-flex-group|box-flex|box-lines|box-ordinal-group|box-orient|box-pack|box-shadow|box-sizing|break-after|break-before|break-inside|caption-side|clear|clip|color-profile|color|column-count|column-fill|column-gap|column-rule|column-rule-color|column-rule-style|column-rule-width|column-span|column-width|columns|content|counter-increment|counter-reset|crop|cue-after|cue-before|cue|cursor|direction|display|dominant-baseline|drop-initial-after-adjust|drop-initial-after-align|drop-initial-before-adjust|drop-initial-before-align|drop-initial-size|drop-initial-value|elevation|empty-cells|fit|fit-position|float-offset|float|font-family|font-size|font-size-adjust|font-stretch|font-style|font-variant|font-weight|font|grid-columns|grid-rows|hanging-punctuation|height|hyphenate-after|hyphenate-before|hyphenate-character|hyphenate-lines|hyphenate-resource|hyphens|icon|image-orientation|image-rendering|image-resolution|inline-box-align|left|letter-spacing|line-height|line-stacking-ruby|line-stacking-shift|line-stacking-strategy|line-stacking|list-style-image|list-style-position|list-style-type|list-style|margin-bottom|margin-left|margin-right|margin-top|margin|mark-after|mark-before|mark|marks|marquee-direction|marquee-play-count|marquee-speed|marquee-style|max-height|max-width|min-height|min-width|move-to|nav-down|nav-index|nav-left|nav-right|nav-up|opacity|orphans|outline-color|outline-offset|outline-style|outline-width|outline|overflow-style|overflow-x|overflow-y|overflow|padding-bottom|padding-left|padding-right|padding-top|padding|page-break-after|page-break-before|page-break-inside|page-policy|page|pause-after|pause-before|pause|perspective-origin|perspective|phonemes|pitch-range|pitch|play-during|position|presentation-level|punctuation-trim|quotes|rendering-intent|resize|rest-after|rest-before|rest|richness|right|rotation-point|rotation|ruby-align|ruby-overhang|ruby-position|ruby-span|size|speak-header|speak-numeral|speak-punctuation|speak|speech-rate|stress|string-set|table-layout|target-name|target-new|target-position|target|text-align-last|text-align|text-decoration|text-emphasis|text-height|text-indent|text-justify|text-outline|text-shadow|text-transform|text-wrap|top|transform-origin|transform-style|transform|transition-delay|transition-duration|transition-property|transition-timing-function|transition|unicode-bidi|vertical-align|visibility|voice-balance|voice-duration|voice-family|voice-pitch-range|voice-pitch|voice-rate|voice-stress|voice-volume|volume|white-space-collapse|white-space|widows|width|word-break|word-spacing|word-wrap|z-index").split("|")
-    );
-
-    var functions = lang.arrayToMap(
-        ("rgb|rgba|url|attr|counter|counters").split("|")
-    );
-
-    var constants = lang.arrayToMap(
-        ("absolute|after-edge|after|all-scroll|all|alphabetic|always|antialiased|armenian|auto|avoid-column|avoid-page|avoid|balance|baseline|before-edge|before|below|bidi-override|block-line-height|block|bold|bolder|border-box|both|bottom|box|break-all|break-word|capitalize|caps-height|caption|center|central|char|circle|cjk-ideographic|clone|close-quote|col-resize|collapse|column|consider-shifts|contain|content-box|cover|crosshair|cubic-bezier|dashed|decimal-leading-zero|decimal|default|disabled|disc|disregard-shifts|distribute-all-lines|distribute-letter|distribute-space|distribute|dotted|double|e-resize|ease-in|ease-in-out|ease-out|ease|ellipsis|end|exclude-ruby|fill|fixed|font-size|font|georgian|glyphs|grid-height|groove|hand|hanging|hebrew|help|hidden|hiragana-iroha|hiragana|horizontal|icon|ideograph-alpha|ideograph-numeric|ideograph-parenthesis|ideograph-space|ideographic|inactive|include-ruby|inherit|initial|inline-block|inline-box|inline-line-height|inline-table|inline|inset|inside|inter-ideograph|inter-word|invert|italic|justify|katakana-iroha|katakana|keep-all|last|left|lighter|line-edge|line-through|line|linear|list-item|local|loose|lower-alpha|lower-greek|lower-latin|lower-roman|lowercase|lr-tb|ltr|mathematical|max-height|max-size|medium|menu|message-box|middle|move|n-resize|ne-resize|newspaper|no-change|no-close-quote|no-drop|no-open-quote|no-repeat|none|normal|not-allowed|nowrap|nw-resize|oblique|open-quote|outset|outside|overline|padding-box|page|pointer|pre-line|pre-wrap|pre|preserve-3d|progress|relative|repeat-x|repeat-y|repeat|replaced|reset-size|ridge|right|round|row-resize|rtl|s-resize|scroll|se-resize|separate|slice|small-caps|small-caption|solid|space|square|start|static|status-bar|step-end|step-start|steps|stretch|strict|sub|super|sw-resize|table-caption|table-cell|table-column-group|table-column|table-footer-group|table-header-group|table-row-group|table-row|table|tb-rl|text-after-edge|text-before-edge|text-bottom|text-size|text-top|text|thick|thin|top|transparent|underline|upper-alpha|upper-latin|upper-roman|uppercase|use-script|vertical-ideographic|vertical-text|visible|w-resize|wait|whitespace|z-index|zero").split("|")
-    );
-
-    var colors = lang.arrayToMap(
-        ("aqua|black|blue|fuchsia|gray|green|lime|maroon|navy|olive|orange|" +
-        "purple|red|silver|teal|white|yellow").split("|")
-    );
-
-    var fonts = lang.arrayToMap(
-        ("arial|century|comic|courier|garamond|georgia|helvetica|impact|lucida|" +
-        "symbol|system|tahoma|times|trebuchet|utopia|verdana|webdings|sans-serif|" +
-        "serif|monospace").split("|")
-    );
-    
-    // regexp must not have capturing parentheses. Use (?:) instead.
-    // regexps are ordered -> the first match is used
-
-    var numRe = "\\-?(?:(?:[0-9]+)|(?:[0-9]*\\.[0-9]+))";
-    var pseudoElements = "(\\:+)\\b(after|before|first-letter|first-line|moz-selection|selection)\\b";
-    var pseudoClasses = "(:)\\b(active|checked|disabled|empty|enabled|first-child|first-of-type|focus|hover|indeterminate|invalid|last-child|last-of-type|link|not|nth-child|nth-last-child|nth-last-of-type|nth-of-type|only-child|only-of-type|required|root|target|valid|visited)\\b";
-    
-    var base_ruleset = [
-        {
-            token : "comment", // multi line comment
-            merge : true,
-            regex : "\\/\\*",
-            next : "ruleset_comment"
-        }, {
-            token : "string", // single line
-            regex : '["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'
-        }, {
-            token : "string", // single line
-            regex : "['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"
-        }, {
-            token : ["constant.numeric", "keyword"],
-            regex : "(" + numRe + ")(ch|cm|deg|em|ex|fr|gd|grad|Hz|in|kHz|mm|ms|pc|pt|px|rad|rem|s|turn|vh|vm|vw|%)"
-        }, {
-            token : ["constant.numeric"],
-            regex : "([0-9]+)"
-        }, {
-            token : "constant.numeric",  // hex6 color
-            regex : "#[a-f0-9]{6}"
-        }, {
-            token : "constant.numeric", // hex3 color
-            regex : "#[a-f0-9]{3}"
-        }, {
-            token : ["punctuation", "entity.other.attribute-name.pseudo-element.css"], 
-            regex : pseudoElements
-        }, {
-            token : ["punctuation", "entity.other.attribute-name.pseudo-class.css"], 
-            regex : pseudoClasses
-        }, {
-            token : function(value) {
-                if (properties.hasOwnProperty(value.toLowerCase())) {
-                    return "support.type";
-                }
-                else if (functions.hasOwnProperty(value.toLowerCase())) {
-                    return "support.function";
-                }
-                else if (constants.hasOwnProperty(value.toLowerCase())) {
-                    return "support.constant";
-                }
-                else if (colors.hasOwnProperty(value.toLowerCase())) {
-                    return "support.constant.color";
-                }
-                else if (fonts.hasOwnProperty(value.toLowerCase())) {
-                    return "support.constant.fonts";
-                }
-                else {
-                    return "text";
-                }
-            },
-            regex : "\\-?[a-zA-Z_][a-zA-Z0-9_\\-]*"
-        } 
-      ];
-
-    var ruleset = lang.copyArray(base_ruleset);
-    ruleset.unshift({
-        token : "paren.rparen",
-        regex : "\\}",
-        next:   "start"
-    });
-
-    var media_ruleset = lang.copyArray( base_ruleset );
-    media_ruleset.unshift({
-        token : "paren.rparen",
-        regex : "\\}",
-        next:   "media"
-    });
-
-    var base_comment = [{
-          token : "comment", // comment spanning whole line
-          merge : true,
-          regex : ".+"
-    }];
-
-    var comment = lang.copyArray(base_comment);
-    comment.unshift({
-          token : "comment", // closing comment
-          regex : ".*?\\*\\/",
-          next : "start"
-    });
-
-    var media_comment = lang.copyArray(base_comment);
-    media_comment.unshift({
-          token : "comment", // closing comment
-          regex : ".*?\\*\\/",
-          next : "media"
-    });
-
-    var ruleset_comment = lang.copyArray(base_comment);
-    ruleset_comment.unshift({
-          token : "comment", // closing comment
-          regex : ".*?\\*\\/",
-          next : "ruleset"
-    });
-
-    this.$rules = {
-        "start" : [{
-            token : "comment", // multi line comment
-            merge : true,
-            regex : "\\/\\*",
-            next : "comment"
-        }, {
-            token: "paren.lparen",
-            regex: "\\{",
-            next:  "ruleset"
-        }, {
-            token: "string",
-            regex: "@.*?{",
-            next:  "media"
-        },{
-            token: "keyword",
-            regex: "#[a-z0-9-_]+"
-        },{
-            token: "variable",
-            regex: "\\.[a-z0-9-_]+"
-        },{
-            token: "string",
-            regex: ":[a-z0-9-_]+"
-        },{
-            token: "constant",
-            regex: "[a-z0-9-_]+"
-        }],
-
-        "media" : [ {
-            token : "comment", // multi line comment
-            merge : true,
-            regex : "\\/\\*",
-            next : "media_comment"
-        }, {
-            token: "paren.lparen",
-            regex: "\\{",
-            next:  "media_ruleset"
-        },{
-            token: "string",
-            regex: "\\}",
-            next:  "start"
-        },{
-            token: "keyword",
-            regex: "#[a-z0-9-_]+"
-        },{
-            token: "variable",
-            regex: "\\.[a-z0-9-_]+"
-        },{
-            token: "string",
-            regex: ":[a-z0-9-_]+"
-        },{
-            token: "constant",
-            regex: "[a-z0-9-_]+"
-        }],
-
-        "comment" : comment,
-
-        "ruleset" : ruleset,
-        "ruleset_comment" : ruleset_comment,
-
-        "media_ruleset" : media_ruleset,
-        "media_comment" : media_comment
-    };
-};
-
-oop.inherits(CssHighlightRules, TextHighlightRules);
-
-exports.CssHighlightRules = CssHighlightRules;
-
-});
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/html_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/css_highlight_rules', 'ace/mode/javascript_highlight_rules', 'ace/mode/xml_util', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var CssHighlightRules = require("./css_highlight_rules").CssHighlightRules;
-var JavaScriptHighlightRules = require("./javascript_highlight_rules").JavaScriptHighlightRules;
-var xmlUtil = require("./xml_util");
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-
-var HtmlHighlightRules = function() {
-
-    // regexp must not have capturing parentheses
-    // regexps are ordered -> the first match is used
-    this.$rules = {
-        start : [{
-            token : "text",
-            merge : true,
-            regex : "<\\!\\[CDATA\\[",
-            next : "cdata"
-        }, {
-            token : "xml_pe",
-            regex : "<\\?.*?\\?>"
-        }, {
-            token : "comment",
-            merge : true,
-            regex : "<\\!--",
-            next : "comment"
-        }, {
-            token : "xml_pe",
-            regex : "<\\!.*?>"
-        }, {
-            token : "meta.tag",
-            regex : "<(?=\s*script\\b)",
-            next : "script"
-        }, {
-            token : "meta.tag",
-            regex : "<(?=\s*style\\b)",
-            next : "style"
-        }, {
-            token : "meta.tag", // opening tag
-            regex : "<\\/?",
-            next : "tag"
-        }, {
-            token : "text",
-            regex : "\\s+"
-        }, {
-            token : "constant.character.entity",
-            regex : "(?:&#[0-9]+;)|(?:&#x[0-9a-fA-F]+;)|(?:&[a-zA-Z0-9_:\\.-]+;)"
-        }, {
-            token : "text",
-            regex : "[^<]+"
-        } ],
-    
-        cdata : [ {
-            token : "text",
-            regex : "\\]\\]>",
-            next : "start"
-        }, {
-            token : "text",
-            merge : true,
-            regex : "\\s+"
-        }, {
-            token : "text",
-            merge : true,
-            regex : ".+"
-        } ],
-
-        comment : [ {
-            token : "comment",
-            regex : ".*?-->",
-            next : "start"
-        }, {
-            token : "comment",
-            merge : true,
-            regex : ".+"
-        } ]
-    };
-    
-    xmlUtil.tag(this.$rules, "tag", "start");
-    xmlUtil.tag(this.$rules, "style", "css-start");
-    xmlUtil.tag(this.$rules, "script", "js-start");
-    
-    this.embedRules(JavaScriptHighlightRules, "js-", [{
-        token: "comment",
-        regex: "\\/\\/.*(?=<\\/script>)",
-        next: "tag"
-    }, {
-        token: "meta.tag",
-        regex: "<\\/(?=script)",
-        next: "tag"
-    }]);
-    
-    this.embedRules(CssHighlightRules, "css-", [{
-        token: "meta.tag",
-        regex: "<\\/(?=style)",
-        next: "tag"
-    }]);
-};
-
-oop.inherits(HtmlHighlightRules, TextHighlightRules);
-
-exports.HtmlHighlightRules = HtmlHighlightRules;
-});
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/folding/html', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/folding/mixed', 'ace/mode/folding/xml', 'ace/mode/folding/cstyle'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../../lib/oop");
-var MixedFoldMode = require("./mixed").FoldMode;
-var XmlFoldMode = require("./xml").FoldMode;
-var CStyleFoldMode = require("./cstyle").FoldMode;
-
-var FoldMode = exports.FoldMode = function() {
-    MixedFoldMode.call(this, new XmlFoldMode({
-        // void elements
-        "area": 1,
-        "base": 1,
-        "br": 1,
-        "col": 1,
-        "command": 1,
-        "embed": 1,
-        "hr": 1,
-        "img": 1,
-        "input": 1,
-        "keygen": 1,
-        "link": 1,
-        "meta": 1,
-        "param": 1,
-        "source": 1,
-        "track": 1,
-        "wbr": 1,
-        
-        // optional tags 
-        "li": 1,
-        "dt": 1,
-        "dd": 1,
-        "p": 1,
-        "rt": 1,
-        "rp": 1,
-        "optgroup": 1,
-        "option": 1,
-        "colgroup": 1,
-        "td": 1,
-        "th": 1
-    }), {
-        "js-": new CStyleFoldMode(),
-        "css-": new CStyleFoldMode()
-    });
-};
-
-oop.inherits(FoldMode, MixedFoldMode);
-
-});/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/folding/mixed', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/folding/fold_mode'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../../lib/oop");
-var BaseFoldMode = require("./fold_mode").FoldMode;
-
-var FoldMode = exports.FoldMode = function(defaultMode, subModes) {
-    this.defaultMode = defaultMode;
-    this.subModes = subModes;
-};
-oop.inherits(FoldMode, BaseFoldMode);
-
-(function() {
-
-
-    this.$getMode = function(state) {
-        for (var key in this.subModes) {
-            if (state.indexOf(key) === 0)
-                return this.subModes[key];
-        }
-        return null;
-    };
-    
-    this.$tryMode = function(state, session, foldStyle, row) {
-        var mode = this.$getMode(state);
-        return (mode ? mode.getFoldWidget(session, foldStyle, row) : "");
-    };
-
-    this.getFoldWidget = function(session, foldStyle, row) {
-        return (
-            this.$tryMode(session.getState(row-1), session, foldStyle, row) ||
-            this.$tryMode(session.getState(row), session, foldStyle, row) ||
-            this.defaultMode.getFoldWidget(session, foldStyle, row)
-        );
-    };
-
-    this.getFoldWidgetRange = function(session, foldStyle, row) {
-        var mode = this.$getMode(session.getState(row-1));
-        
-        if (!mode || !mode.getFoldWidget(session, foldStyle, row))
-            mode = this.$getMode(session.getState(row));
-        
-        if (!mode || !mode.getFoldWidget(session, foldStyle, row))
-            mode = this.defaultMode;
-        
-        return mode.getFoldWidgetRange(session, foldStyle, row);
-    };
-
-}).call(FoldMode.prototype);
-
-});/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *      Chris Spencer <chris.ag.spencer AT googlemail DOT com>
- *
- * 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 ***** */
-
-define('ace/mode/markdown_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text_highlight_rules', 'ace/mode/javascript_highlight_rules', 'ace/mode/xml_highlight_rules', 'ace/mode/html_highlight_rules', 'ace/mode/css_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-var JavaScriptHighlightRules = require("./javascript_highlight_rules").JavaScriptHighlightRules;
-var XmlHighlightRules = require("./xml_highlight_rules").XmlHighlightRules;
-var HtmlHighlightRules = require("./html_highlight_rules").HtmlHighlightRules;
-var CssHighlightRules = require("./css_highlight_rules").CssHighlightRules;
-
-function github_embed(tag, prefix) {
-    return { // Github style block
-        token : "support.function",
-        regex : "^```" + tag + "\\s*$",
-        next  : prefix + "start"
-    };
-}
-
-var MarkdownHighlightRules = function() {
-
-    // regexp must not have capturing parentheses
-    // regexps are ordered -> the first match is used
-
-    this.$rules = {
-        "start" : [ {
-            token : "empty_line",
-            regex : '^$'
-        }, { // code span `
-            token : ["support.function", "support.function", "support.function"],
-            regex : "(`+)([^\\r]*?[^`])(\\1)"
-        }, { // code block
-            token : "support.function",
-            regex : "^[ ]{4}.+"
-        }, { // h1
-            token: "markup.heading.1",
-            regex: "^=+(?=\\s*$)"
-        }, { // h2
-            token: "markup.heading.1",
-            regex: "^\\-+(?=\\s*$)"
-        }, { // header
-            token : function(value) {
-                return "markup.heading." + value.length;
-            },
-            regex : "^#{1,6}"
-        }, github_embed("javascript", "js-"),
-           github_embed("xml", "xml-"),
-           github_embed("html", "html-"),
-           github_embed("css", "css-"),
-        { // Github style block
-            token : "support.function",
-            regex : "^```[a-zA-Z]+\\s*$",
-            next  : "githubblock"
-        }, { // block quote
-            token : "string",
-            regex : "^>[ ].+$",
-            next  : "blockquote"
-        }, { // reference
-            token : ["text", "constant", "text", "url", "string", "text"],
-            regex : "^([ ]{0,3}\\[)([^\\]]+)(\\]:\\s*)([^ ]+)(\\s*(?:[\"][^\"]+[\"])?(\\s*))$"
-        }, { // link by reference
-            token : ["text", "string", "text", "constant", "text"],
-            regex : "(\\[)((?:[[^\\]]*\\]|[^\\[\\]])*)(\\][ ]?(?:\\n[ ]*)?\\[)(.*?)(\\])"
-        }, { // link by url
-            token : ["text", "string", "text", "markup.underline", "string", "text"],
-            regex : "(\\[)"+
-                    "(\\[[^\\]]*\\]|[^\\[\\]]*)"+
-                    "(\\]\\([ \\t]*)"+
-                    "(<?(?:(?:[^\\(]*?\\([^\\)]*?\\)\\S*?)|(?:.*?))>?)"+
-                    "((?:[ \t]*\"(?:.*?)\"[ \\t]*)?)"+
-                    "(\\))"
-        }, { // HR *
-            token : "constant",
-            regex : "^[ ]{0,2}(?:[ ]?\\*[ ]?){3,}\\s*$"
-        }, { // HR -
-            token : "constant",
-            regex : "^[ ]{0,2}(?:[ ]?\\-[ ]?){3,}\\s*$"
-        }, { // HR _
-            token : "constant",
-            regex : "^[ ]{0,2}(?:[ ]?\\_[ ]?){3,}\\s*$"
-        }, { // list
-            token : "markup.list",
-            regex : "^\\s{0,3}(?:[*+-]|\\d+\\.)\\s+",
-            next  : "listblock"
-        }, { // strong ** __
-            token : ["string", "string", "string"],
-            regex : "([*]{2}|[_]{2}(?=\\S))([^\\r]*?\\S[*_]*)(\\1)"
-        }, { // emphasis * _
-            token : ["string", "string", "string"],
-            regex : "([*]|[_](?=\\S))([^\\r]*?\\S[*_]*)(\\1)"
-        }, { // 
-            token : ["text", "url", "text"],
-            regex : "(<)("+
-                      "(?:https?|ftp|dict):[^'\">\\s]+"+
-                      "|"+
-                      "(?:mailto:)?[-.\\w]+\\@[-a-z0-9]+(?:\\.[-a-z0-9]+)*\\.[a-z]+"+
-                    ")(>)"
-        }, {
-            token : "text",
-            regex : "[^\\*_%$`\\[#<>]+"
-        } ],
-        
-        "listblock" : [ { // Lists only escape on completely blank lines.
-            token : "empty_line",
-            regex : "^$",
-            next  : "start"
-        }, {
-            token : "markup.list",
-            regex : ".+"
-        } ],
-        
-        "blockquote" : [ { // BLockquotes only escape on blank lines.
-            token : "empty_line",
-            regex : "^\\s*$",
-            next  : "start"
-        }, {
-            token : "string",
-            regex : ".+"
-        } ],
-        
-        "githubblock" : [ {
-            token : "support.function",
-            regex : "^```",
-            next  : "start"
-        }, {
-            token : "support.function",
-            regex : ".+"
-        } ]
-    };
-    
-    this.embedRules(JavaScriptHighlightRules, "js-", [{
-       token : "support.function",
-       regex : "^```",
-       next  : "start"
-    }]);
-    
-    this.embedRules(HtmlHighlightRules, "html-", [{
-       token : "support.function",
-       regex : "^```",
-       next  : "start"
-    }]);
-    
-    this.embedRules(CssHighlightRules, "css-", [{
-       token : "support.function",
-       regex : "^```",
-       next  : "start"
-    }]);
-    
-    this.embedRules(XmlHighlightRules, "xml-", [{
-       token : "support.function",
-       regex : "^```",
-       next  : "start"
-    }]);
-};
-oop.inherits(MarkdownHighlightRules, TextHighlightRules);
-
-exports.MarkdownHighlightRules = MarkdownHighlightRules;
-});
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/mode-markdown.js b/apps/files_texteditor/js/aceeditor/mode-markdown.js
deleted file mode 100644
index a45debe044..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-markdown.js
+++ /dev/null
@@ -1 +0,0 @@
-define("ace/mode/markdown",["require","exports","module","ace/lib/oop","ace/mode/text","ace/mode/javascript","ace/mode/xml","ace/mode/html","ace/tokenizer","ace/mode/markdown_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text").Mode,f=a("./javascript").Mode,g=a("./xml").Mode,h=a("./html").Mode,i=a("../tokenizer").Tokenizer,j=a("./markdown_highlight_rules").MarkdownHighlightRules,k=function(){var a=new j;this.$tokenizer=new i(a.getRules()),this.$embeds=a.getEmbeds(),this.createModeDelegates({"js-":f,"xml-":g,"html-":h})};d.inherits(k,e),function(){this.getNextLineIndent=function(a,b,c){if(a=="listblock"){var d=/^((?:.+)?)([-+*][ ]+)/.exec(b);return d?(new Array(d[1].length+1)).join(" ")+d[2]:""}return this.$getIndent(b)}}.call(k.prototype),b.Mode=k}),define("ace/mode/javascript",["require","exports","module","ace/lib/oop","ace/mode/text","ace/tokenizer","ace/mode/javascript_highlight_rules","ace/mode/matching_brace_outdent","ace/range","ace/worker/worker_client","ace/mode/behaviour/cstyle","ace/mode/folding/cstyle"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text").Mode,f=a("../tokenizer").Tokenizer,g=a("./javascript_highlight_rules").JavaScriptHighlightRules,h=a("./matching_brace_outdent").MatchingBraceOutdent,i=a("../range").Range,j=a("../worker/worker_client").WorkerClient,k=a("./behaviour/cstyle").CstyleBehaviour,l=a("./folding/cstyle").FoldMode,m=function(){this.$tokenizer=new f((new g).getRules()),this.$outdent=new h,this.$behaviour=new k,this.foldingRules=new l};d.inherits(m,e),function(){this.toggleCommentLines=function(a,b,c,d){var e=!0,f=/^(\s*)\/\//;for(var g=c;g<=d;g++)if(!f.test(b.getLine(g))){e=!1;break}if(e){var h=new i(0,0,0,0);for(var g=c;g<=d;g++){var j=b.getLine(g),k=j.match(f);h.start.row=g,h.end.row=g,h.end.column=k[0].length,b.replace(h,k[1])}}else b.indentRows(c,d,"//")},this.getNextLineIndent=function(a,b,c){var d=this.$getIndent(b),e=this.$tokenizer.getLineTokens(b,a),f=e.tokens,g=e.state;if(f.length&&f[f.length-1].type=="comment")return d;if(a=="start"||a=="regex_allowed"){var h=b.match(/^.*(?:\bcase\b.*\:|[\{\(\[])\s*$/);h&&(d+=c)}else if(a=="doc-start"){if(g=="start"||a=="regex_allowed")return"";var h=b.match(/^\s*(\/?)\*/);h&&(h[1]&&(d+=" "),d+="* ")}return d},this.checkOutdent=function(a,b,c){return this.$outdent.checkOutdent(b,c)},this.autoOutdent=function(a,b,c){this.$outdent.autoOutdent(b,c)},this.createWorker=function(a){var b=new j(["ace"],"worker-javascript.js","ace/mode/javascript_worker","JavaScriptWorker");return b.attachToDocument(a.getDocument()),b.on("jslint",function(b){var c=[];for(var d=0;d<b.data.length;d++){var e=b.data[d];e&&c.push({row:e.line-1,column:e.character-1,text:e.reason,type:"warning",lint:e})}a.setAnnotations(c)}),b.on("narcissus",function(b){a.setAnnotations([b.data])}),b.on("terminate",function(){a.clearAnnotations()}),b}}.call(m.prototype),b.Mode=m}),define("ace/mode/javascript_highlight_rules",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/unicode","ace/mode/doc_comment_highlight_rules","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("../lib/lang"),f=a("../unicode"),g=a("./doc_comment_highlight_rules").DocCommentHighlightRules,h=a("./text_highlight_rules").TextHighlightRules,i=function(){var a=e.arrayToMap("Array|Boolean|Date|Function|Iterator|Number|Object|RegExp|String|Proxy|Namespace|QName|XML|XMLList|ArrayBuffer|Float32Array|Float64Array|Int16Array|Int32Array|Int8Array|Uint16Array|Uint32Array|Uint8Array|Uint8ClampedArray|Error|EvalError|InternalError|RangeError|ReferenceError|StopIteration|SyntaxError|TypeError|URIError|decodeURI|decodeURIComponent|encodeURI|encodeURIComponent|eval|isFinite|isNaN|parseFloat|parseInt|JSON|Math|this|arguments|prototype|window|document".split("|")),b=e.arrayToMap("break|case|catch|continue|default|delete|do|else|finally|for|function|if|in|instanceof|new|return|switch|throw|try|typeof|let|var|while|with|const|yield|import|get|set".split("|")),c="case|do|else|finally|in|instanceof|return|throw|try|typeof|yield",d=e.arrayToMap("__parent__|__count__|escape|unescape|with|__proto__".split("|")),h=e.arrayToMap("const|let|var|function".split("|")),i=e.arrayToMap("null|Infinity|NaN|undefined".split("|")),j=e.arrayToMap("class|enum|extends|super|export|implements|private|public|interface|package|protected|static".split("|")),k="["+f.packages.L+"\\$_]["+f.packages.L+f.packages.Mn+f.packages.Mc+f.packages.Nd+f.packages.Pc+"\\$_]*\\b",l="\\\\(?:x[0-9a-fA-F]{2}|u[0-9a-fA-F]{4}|[0-2][0-7]{0,2}|3[0-6][0-7]?|37[0-7]?|[4-7][0-7]?|.)";this.$rules={start:[{token:"comment",regex:/\/\/.*$/},(new g).getStartRule("doc-start"),{token:"comment",merge:!0,regex:/\/\*/,next:"comment"},{token:"string",regex:"'",next:"qstring"},{token:"string",regex:'"',next:"qqstring"},{token:"constant.numeric",regex:/0[xX][0-9a-fA-F]+\b/},{token:"constant.numeric",regex:/[+-]?\d+(?:(?:\.\d*)?(?:[eE][+-]?\d+)?)?\b/},{token:["storage.type","punctuation.operator","support.function","punctuation.operator","entity.name.function","text","keyword.operator","text","storage.type","text","paren.lparen","variable.parameter","paren.rparen"],regex:"("+k+")(\\.)(prototype)(\\.)("+k+")(\\s*)(=)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"},{token:["storage.type","punctuation.operator","support.function","punctuation.operator","entity.name.function","text","keyword.operator","text"],regex:"("+k+")(\\.)(prototype)(\\.)("+k+")(\\s*)(=)(\\s*)"},{token:["storage.type","punctuation.operator","entity.name.function","text","keyword.operator","text","storage.type","text","paren.lparen","variable.parameter","paren.rparen"],regex:"("+k+")(\\.)("+k+")(\\s*)(=)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"},{token:["entity.name.function","text","keyword.operator","text","storage.type","text","paren.lparen","variable.parameter","paren.rparen"],regex:"("+k+")(\\s*)(=)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"},{token:["storage.type","text","entity.name.function","text","paren.lparen","variable.parameter","paren.rparen"],regex:"(function)(\\s+)("+k+")(\\s*)(\\()(.*?)(\\))"},{token:["entity.name.function","text","punctuation.operator","text","storage.type","text","paren.lparen","variable.parameter","paren.rparen"],regex:"("+k+")(\\s*)(:)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"},{token:["text","text","storage.type","text","paren.lparen","variable.parameter","paren.rparen"],regex:"(:)(\\s*)(function)?(\\s*)(\\()([^)]*)(\\))"},{token:"constant.language.boolean",regex:/(?:true|false)\b/},{token:"keyword",regex:"(?:"+c+")\\b",next:"regex_allowed"},{token:["punctuation.operator","support.function"],regex:/(\.)(s(?:h(?:ift|ow(?:Mod(?:elessDialog|alDialog)|Help))|croll(?:X|By(?:Pages|Lines)?|Y|To)?|t(?:opzzzz|rike)|i(?:n|zeToContent|debar|gnText)|ort|u(?:p|b(?:str(?:ing)?)?)|pli(?:ce|t)|e(?:nd|t(?:Re(?:sizable|questHeader)|M(?:i(?:nutes|lliseconds)|onth)|Seconds|Ho(?:tKeys|urs)|Year|Cursor|Time(?:out)?|Interval|ZOptions|Date|UTC(?:M(?:i(?:nutes|lliseconds)|onth)|Seconds|Hours|Date|FullYear)|FullYear|Active)|arch)|qrt|lice|avePreferences|mall)|h(?:ome|andleEvent)|navigate|c(?:har(?:CodeAt|At)|o(?:s|n(?:cat|textual|firm)|mpile)|eil|lear(?:Timeout|Interval)?|a(?:ptureEvents|ll)|reate(?:StyleSheet|Popup|EventObject))|t(?:o(?:GMTString|S(?:tring|ource)|U(?:TCString|pperCase)|Lo(?:caleString|werCase))|est|a(?:n|int(?:Enabled)?))|i(?:s(?:NaN|Finite)|ndexOf|talics)|d(?:isableExternalCapture|ump|etachEvent)|u(?:n(?:shift|taint|escape|watch)|pdateCommands)|j(?:oin|avaEnabled)|p(?:o(?:p|w)|ush|lugins.refresh|a(?:ddings|rse(?:Int|Float)?)|r(?:int|ompt|eference))|e(?:scape|nableExternalCapture|val|lementFromPoint|x(?:p|ec(?:Script|Command)?))|valueOf|UTC|queryCommand(?:State|Indeterm|Enabled|Value)|f(?:i(?:nd|le(?:ModifiedDate|Size|CreatedDate|UpdatedDate)|xed)|o(?:nt(?:size|color)|rward)|loor|romCharCode)|watch|l(?:ink|o(?:ad|g)|astIndexOf)|a(?:sin|nchor|cos|t(?:tachEvent|ob|an(?:2)?)|pply|lert|b(?:s|ort))|r(?:ou(?:nd|teEvents)|e(?:size(?:By|To)|calc|turnValue|place|verse|l(?:oad|ease(?:Capture|Events)))|andom)|g(?:o|et(?:ResponseHeader|M(?:i(?:nutes|lliseconds)|onth)|Se(?:conds|lection)|Hours|Year|Time(?:zoneOffset)?|Da(?:y|te)|UTC(?:M(?:i(?:nutes|lliseconds)|onth)|Seconds|Hours|Da(?:y|te)|FullYear)|FullYear|A(?:ttention|llResponseHeaders)))|m(?:in|ove(?:B(?:y|elow)|To(?:Absolute)?|Above)|ergeAttributes|a(?:tch|rgins|x))|b(?:toa|ig|o(?:ld|rderWidths)|link|ack))\b(?=\()/},{token:["punctuation.operator","support.function.dom"],regex:/(\.)(s(?:ub(?:stringData|mit)|plitText|e(?:t(?:NamedItem|Attribute(?:Node)?)|lect))|has(?:ChildNodes|Feature)|namedItem|c(?:l(?:ick|o(?:se|neNode))|reate(?:C(?:omment|DATASection|aption)|T(?:Head|extNode|Foot)|DocumentFragment|ProcessingInstruction|E(?:ntityReference|lement)|Attribute))|tabIndex|i(?:nsert(?:Row|Before|Cell|Data)|tem)|open|delete(?:Row|C(?:ell|aption)|T(?:Head|Foot)|Data)|focus|write(?:ln)?|a(?:dd|ppend(?:Child|Data))|re(?:set|place(?:Child|Data)|move(?:NamedItem|Child|Attribute(?:Node)?)?)|get(?:NamedItem|Element(?:sBy(?:Name|TagName)|ById)|Attribute(?:Node)?)|blur)\b(?=\()/},{token:["punctuation.operator","support.constant"],regex:/(\.)(s(?:ystemLanguage|cr(?:ipts|ollbars|een(?:X|Y|Top|Left))|t(?:yle(?:Sheets)?|atus(?:Text|bar)?)|ibling(?:Below|Above)|ource|uffixes|e(?:curity(?:Policy)?|l(?:ection|f)))|h(?:istory|ost(?:name)?|as(?:h|Focus))|y|X(?:MLDocument|SLDocument)|n(?:ext|ame(?:space(?:s|URI)|Prop))|M(?:IN_VALUE|AX_VALUE)|c(?:haracterSet|o(?:n(?:structor|trollers)|okieEnabled|lorDepth|mp(?:onents|lete))|urrent|puClass|l(?:i(?:p(?:boardData)?|entInformation)|osed|asses)|alle(?:e|r)|rypto)|t(?:o(?:olbar|p)|ext(?:Transform|Indent|Decoration|Align)|ags)|SQRT(?:1_2|2)|i(?:n(?:ner(?:Height|Width)|put)|ds|gnoreCase)|zIndex|o(?:scpu|n(?:readystatechange|Line)|uter(?:Height|Width)|p(?:sProfile|ener)|ffscreenBuffering)|NEGATIVE_INFINITY|d(?:i(?:splay|alog(?:Height|Top|Width|Left|Arguments)|rectories)|e(?:scription|fault(?:Status|Ch(?:ecked|arset)|View)))|u(?:ser(?:Profile|Language|Agent)|n(?:iqueID|defined)|pdateInterval)|_content|p(?:ixelDepth|ort|ersonalbar|kcs11|l(?:ugins|atform)|a(?:thname|dding(?:Right|Bottom|Top|Left)|rent(?:Window|Layer)?|ge(?:X(?:Offset)?|Y(?:Offset)?))|r(?:o(?:to(?:col|type)|duct(?:Sub)?|mpter)|e(?:vious|fix)))|e(?:n(?:coding|abledPlugin)|x(?:ternal|pando)|mbeds)|v(?:isibility|endor(?:Sub)?|Linkcolor)|URLUnencoded|P(?:I|OSITIVE_INFINITY)|f(?:ilename|o(?:nt(?:Size|Family|Weight)|rmName)|rame(?:s|Element)|gColor)|E|whiteSpace|l(?:i(?:stStyleType|n(?:eHeight|kColor))|o(?:ca(?:tion(?:bar)?|lName)|wsrc)|e(?:ngth|ft(?:Context)?)|a(?:st(?:M(?:odified|atch)|Index|Paren)|yer(?:s|X)|nguage))|a(?:pp(?:MinorVersion|Name|Co(?:deName|re)|Version)|vail(?:Height|Top|Width|Left)|ll|r(?:ity|guments)|Linkcolor|bove)|r(?:ight(?:Context)?|e(?:sponse(?:XML|Text)|adyState))|global|x|m(?:imeTypes|ultiline|enubar|argin(?:Right|Bottom|Top|Left))|L(?:N(?:10|2)|OG(?:10E|2E))|b(?:o(?:ttom|rder(?:Width|RightWidth|BottomWidth|Style|Color|TopWidth|LeftWidth))|ufferDepth|elow|ackground(?:Color|Image)))\b/},{token:["storage.type","punctuation.operator","support.function.firebug"],regex:/(console)(\.)(warn|info|log|error|time|timeEnd|assert)\b/},{token:function(c){return a.hasOwnProperty(c)?"variable.language":d.hasOwnProperty(c)?"invalid.deprecated":h.hasOwnProperty(c)?"storage.type":b.hasOwnProperty(c)?"keyword":i.hasOwnProperty(c)?"constant.language":j.hasOwnProperty(c)?"invalid.illegal":c=="debugger"?"invalid.deprecated":"identifier"},regex:k},{token:"keyword.operator",regex:/!|\$|%|&|\*|\-\-|\-|\+\+|\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\|\||\?\:|\*=|%=|\+=|\-=|&=|\^=|\b(?:in|instanceof|new|delete|typeof|void)/,next:"regex_allowed"},{token:"punctuation.operator",regex:/\?|\:|\,|\;|\./,next:"regex_allowed"},{token:"paren.lparen",regex:/[\[({]/,next:"regex_allowed"},{token:"paren.rparen",regex:/[\])}]/},{token:"keyword.operator",regex:/\/=?/,next:"regex_allowed"},{token:"comment",regex:/^#!.*$/},{token:"text",regex:/\s+/}],regex_allowed:[{token:"comment",merge:!0,regex:"\\/\\*",next:"comment_regex_allowed"},{token:"comment",regex:"\\/\\/.*$"},{token:"string.regexp",regex:"\\/",next:"regex",merge:!0},{token:"text",regex:"\\s+"},{token:"empty",regex:"",next:"start"}],regex:[{token:"regexp.keyword.operator",regex:"\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)",next:"regex"},{token:"string.regexp",regex:"/\\w*",next:"start",merge:!0},{token:"string.regexp",regex:"[^\\\\/\\[]+",next:"regex",merge:!0},{token:"string.regexp.charachterclass",regex:"\\[",next:"regex_character_class",merge:!0},{token:"empty",regex:"",next:"start"}],regex_character_class:[{token:"regexp.keyword.operator",regex:"\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)",next:"regex_character_class"},{token:"string.regexp.charachterclass",regex:"]",next:"regex",merge:!0},{token:"string.regexp.charachterclass",regex:"[^\\\\\\]]+",next:"regex_character_class",merge:!0},{token:"empty",regex:"",next:"start"}],comment_regex_allowed:[{token:"comment",regex:".*?\\*\\/",merge:!0,next:"regex_allowed"},{token:"comment",merge:!0,regex:".+"}],comment:[{token:"comment",regex:".*?\\*\\/",merge:!0,next:"start"},{token:"comment",merge:!0,regex:".+"}],qqstring:[{token:"constant.language.escape",regex:l},{token:"string",regex:'[^"\\\\]+'},{token:"string",regex:'"',next:"start"}],qstring:[{token:"constant.language.escape",regex:l},{token:"string",regex:"[^'\\\\]+"},{token:"string",regex:"'",next:"start"}]},this.embedRules(g,"doc-",[(new g).getEndRule("start")])};d.inherits(i,h),b.JavaScriptHighlightRules=i}),define("ace/mode/doc_comment_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text_highlight_rules").TextHighlightRules,f=function(){this.$rules={start:[{token:"comment.doc.tag",regex:"@[\\w\\d_]+"},{token:"comment.doc",merge:!0,regex:"\\s+"},{token:"comment.doc",merge:!0,regex:"TODO"},{token:"comment.doc",merge:!0,regex:"[^@\\*]+"},{token:"comment.doc",merge:!0,regex:"."}]}};d.inherits(f,e),function(){this.getStartRule=function(a){return{token:"comment.doc",merge:!0,regex:"\\/\\*(?=\\*)",next:a}},this.getEndRule=function(a){return{token:"comment.doc",merge:!0,regex:"\\*\\/",next:a}}}.call(f.prototype),b.DocCommentHighlightRules=f}),define("ace/mode/matching_brace_outdent",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../range").Range,e=function(){};(function(){this.checkOutdent=function(a,b){return/^\s+$/.test(a)?/^\s*\}/.test(b):!1},this.autoOutdent=function(a,b){var c=a.getLine(b),e=c.match(/^(\s*\})/);if(!e)return 0;var f=e[1].length,g=a.findMatchingBracket({row:b,column:f});if(!g||g.row==b)return 0;var h=this.$getIndent(a.getLine(g.row));a.replace(new d(b,0,b,f-1),h)},this.$getIndent=function(a){var b=a.match(/^(\s+)/);return b?b[1]:""}}).call(e.prototype),b.MatchingBraceOutdent=e}),define("ace/mode/behaviour/cstyle",["require","exports","module","ace/lib/oop","ace/mode/behaviour"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../behaviour").Behaviour,f=function(){this.add("braces","insertion",function(a,b,c,d,e){if(e=="{"){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"{"+g+"}",selection:!1}:{text:"{}",selection:[1,1]}}if(e=="}"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var k=d.$findOpeningBracket("}",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}else if(e=="\n"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var l=d.findMatchingBracket({row:h.row,column:h.column+1});if(!l)return null;var m=this.getNextLineIndent(a,i.substring(0,i.length-1),d.getTabString()),n=this.$getIndent(d.doc.getLine(l.row));return{text:"\n"+m+"\n"+n,selection:[1,m.length,1,m.length]}}}}),this.add("braces","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="{"){var g=d.doc.getLine(e.start.row),h=g.substring(e.end.column,e.end.column+1);if(h=="}")return e.end.column++,e}}),this.add("parens","insertion",function(a,b,c,d,e){if(e=="("){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"("+g+")",selection:!1}:{text:"()",selection:[1,1]}}if(e==")"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j==")"){var k=d.$findOpeningBracket(")",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}}),this.add("parens","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="("){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h==")")return e.end.column++,e}}),this.add("string_dquotes","insertion",function(a,b,c,d,e){if(e=='"'||e=="'"){var f=e,g=c.getSelectionRange(),h=d.doc.getTextRange(g);if(h!=="")return{text:f+h+f,selection:!1};var i=c.getCursorPosition(),j=d.doc.getLine(i.row),k=j.substring(i.column-1,i.column);if(k=="\\")return null;var l=d.getTokens(g.start.row,g.start.row)[0].tokens,m=0,n,o=-1;for(var p=0;p<l.length;p++){n=l[p],n.type=="string"?o=-1:o<0&&(o=n.value.indexOf(f));if(n.value.length+m>g.start.column)break;m+=l[p].value.length}if(!n||o<0&&n.type!=="comment"&&(n.type!=="string"||g.start.column!==n.value.length+m-1&&n.value.lastIndexOf(f)===n.value.length-1))return{text:f+f,selection:[1,1]};if(n&&n.type==="string"){var q=j.substring(i.column,i.column+1);if(q==f)return{text:"",selection:[1,1]}}}}),this.add("string_dquotes","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&(f=='"'||f=="'")){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h=='"')return e.end.column++,e}})};d.inherits(f,e),b.CstyleBehaviour=f}),define("ace/mode/folding/cstyle",["require","exports","module","ace/lib/oop","ace/range","ace/mode/folding/fold_mode"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../../range").Range,f=a("./fold_mode").FoldMode,g=b.FoldMode=function(){};d.inherits(g,f),function(){this.foldingStartMarker=/(\{|\[)[^\}\]]*$|^\s*(\/\*)/,this.foldingStopMarker=/^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/,this.getFoldWidgetRange=function(a,b,c){var d=a.getLine(c),f=d.match(this.foldingStartMarker);if(f){var g=f.index;if(f[1])return this.openingBracketBlock(a,f[1],c,g);var h=a.getCommentFoldRange(c,g+f[0].length);return h.end.column-=2,h}if(b!=="markbeginend")return;var f=d.match(this.foldingStopMarker);if(f){var g=f.index+f[0].length;if(f[2]){var h=a.getCommentFoldRange(c,g);return h.end.column-=2,h}var i={row:c,column:g},j=a.$findOpeningBracket(f[1],i);if(!j)return;return j.column++,i.column--,e.fromPoints(j,i)}}}.call(g.prototype)}),define("ace/mode/folding/fold_mode",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../../range").Range,e=b.FoldMode=function(){};(function(){this.foldingStartMarker=null,this.foldingStopMarker=null,this.getFoldWidget=function(a,b,c){var d=a.getLine(c);return this.foldingStartMarker.test(d)?"start":b=="markbeginend"&&this.foldingStopMarker&&this.foldingStopMarker.test(d)?"end":""},this.getFoldWidgetRange=function(a,b,c){return null},this.indentationBlock=function(a,b,c){var e=/^\s*/,f=b,g=b,h=a.getLine(b),i=c||h.length,j=h.match(e)[0].length,k=a.getLength();while(++b<k){h=a.getLine(b);var l=h.match(e)[0].length;if(l==h.length)continue;if(l<=j)break;g=b}if(g>f){var m=a.getLine(g).length;return new d(f,i,g,m)}},this.openingBracketBlock=function(a,b,c,e){var f={row:c,column:e+1},g=a.$findClosingBracket(b,f);if(!g)return;var h=a.foldWidgets[g.row];return h==null&&(h=this.getFoldWidget(a,g.row)),h=="start"&&(g.row--,g.column=a.getLine(g.row).length),d.fromPoints(f,g)}}).call(e.prototype)}),define("ace/mode/xml",["require","exports","module","ace/lib/oop","ace/mode/text","ace/tokenizer","ace/mode/xml_highlight_rules","ace/mode/behaviour/xml","ace/mode/folding/xml"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text").Mode,f=a("../tokenizer").Tokenizer,g=a("./xml_highlight_rules").XmlHighlightRules,h=a("./behaviour/xml").XmlBehaviour,i=a("./folding/xml").FoldMode,j=function(){this.$tokenizer=new f((new g).getRules()),this.$behaviour=new h,this.foldingRules=new i};d.inherits(j,e),function(){this.getNextLineIndent=function(a,b,c){return this.$getIndent(b)}}.call(j.prototype),b.Mode=j}),define("ace/mode/xml_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/xml_util","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./xml_util"),f=a("./text_highlight_rules").TextHighlightRules,g=function(){this.$rules={start:[{token:"text",regex:"<\\!\\[CDATA\\[",next:"cdata"},{token:"xml_pe",regex:"<\\?.*?\\?>"},{token:"comment",merge:!0,regex:"<\\!--",next:"comment"},{token:"xml_pe",regex:"<\\!.*?>"},{token:"meta.tag",regex:"<\\/?",next:"tag"},{token:"text",regex:"\\s+"},{token:"constant.character.entity",regex:"(?:&#[0-9]+;)|(?:&#x[0-9a-fA-F]+;)|(?:&[a-zA-Z0-9_:\\.-]+;)"},{token:"text",regex:"[^<]+"}],cdata:[{token:"text",regex:"\\]\\]>",next:"start"},{token:"text",regex:"\\s+"},{token:"text",regex:"(?:[^\\]]|\\](?!\\]>))+"}],comment:[{token:"comment",regex:".*?-->",next:"start"},{token:"comment",merge:!0,regex:".+"}]},e.tag(this.$rules,"tag","start")};d.inherits(g,f),b.XmlHighlightRules=g}),define("ace/mode/xml_util",["require","exports","module","ace/lib/lang"],function(a,b,c){function g(a){return[{token:"string",regex:'".*?"'},{token:"string",merge:!0,regex:'["].*',next:a+"_qqstring"},{token:"string",regex:"'.*?'"},{token:"string",merge:!0,regex:"['].*",next:a+"_qstring"}]}function h(a,b){return[{token:"string",merge:!0,regex:".*?"+a,next:b},{token:"string",merge:!0,regex:".+"}]}"use strict";var d=a("../lib/lang"),e=d.arrayToMap("button|form|input|label|select|textarea".split("|")),f=d.arrayToMap("table|tbody|td|tfoot|th|tr".split("|"));b.tag=function(a,b,c){a[b]=[{token:"text",regex:"\\s+"},{token:function(a){return a==="a"?"meta.tag.anchor":a==="img"?"meta.tag.image":a==="script"?"meta.tag.script":a==="style"?"meta.tag.style":e.hasOwnProperty(a.toLowerCase())?"meta.tag.form":f.hasOwnProperty(a.toLowerCase())?"meta.tag.table":"meta.tag"},merge:!0,regex:"[-_a-zA-Z0-9:]+",next:b+"_embed_attribute_list"},{token:"empty",regex:"",next:b+"_embed_attribute_list"}],a[b+"_qstring"]=h("'",b+"_embed_attribute_list"),a[b+"_qqstring"]=h('"',b+"_embed_attribute_list"),a[b+"_embed_attribute_list"]=[{token:"meta.tag",merge:!0,regex:"/?>",next:c},{token:"keyword.operator",regex:"="},{token:"entity.other.attribute-name",regex:"[-_a-zA-Z0-9:]+"},{token:"constant.numeric",regex:"[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"},{token:"text",regex:"\\s+"}].concat(g(b))}}),define("ace/mode/behaviour/xml",["require","exports","module","ace/lib/oop","ace/mode/behaviour","ace/mode/behaviour/cstyle"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../behaviour").Behaviour,f=a("./cstyle").CstyleBehaviour,g=function(){this.inherit(f,["string_dquotes"]),this.add("brackets","insertion",function(a,b,c,d,e){if(e=="<"){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?!1:{text:"<>",selection:[1,1]}}if(e==">"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j==">")return{text:"",selection:[1,1]}}else if(e=="\n"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),k=i.substring(h.column,h.column+2);if(k=="</"){var l=this.$getIndent(d.doc.getLine(h.row))+d.getTabString(),m=this.$getIndent(d.doc.getLine(h.row));return{text:"\n"+l+"\n"+m,selection:[1,l.length,1,l.length]}}}})};d.inherits(g,e),b.XmlBehaviour=g}),define("ace/mode/folding/xml",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/range","ace/mode/folding/fold_mode","ace/token_iterator"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../../lib/lang"),f=a("../../range").Range,g=a("./fold_mode").FoldMode,h=a("../../token_iterator").TokenIterator,i=b.FoldMode=function(a){g.call(this),this.voidElements=a||{}};d.inherits(i,g),function(){this.getFoldWidget=function(a,b,c){var d=this._getFirstTagInLine(a,c);return d.closing?b=="markbeginend"?"end":"":!d.tagName||this.voidElements[d.tagName.toLowerCase()]?"":d.selfClosing?"":d.value.indexOf("/"+d.tagName)!==-1?"":"start"},this._getFirstTagInLine=function(a,b){var c=a.getTokens(b,b)[0].tokens,d="";for(var f=0;f<c.length;f++){var g=c[f];g.type.indexOf("meta.tag")===0?d+=g.value:d+=e.stringRepeat(" ",g.value.length)}return this._parseTag(d)},this.tagRe=/^(\s*)(<?(\/?)([-_a-zA-Z0-9:!]*)\s*(\/?)>?)/,this._parseTag=function(a){var b=this.tagRe.exec(a),c=this.tagRe.lastIndex||0;return this.tagRe.lastIndex=0,{value:a,match:b?b[2]:"",closing:b?!!b[3]:!1,selfClosing:b?!!b[5]||b[2]=="/>":!1,tagName:b?b[4]:"",column:b[1]?c+b[1].length:c}},this._readTagForward=function(a){var b=a.getCurrentToken();if(!b)return null;var c="",d;do if(b.type.indexOf("meta.tag")===0){if(!d)var d={row:a.getCurrentTokenRow(),column:a.getCurrentTokenColumn()};c+=b.value;if(c.indexOf(">")!==-1){var e=this._parseTag(c);return e.start=d,e.end={row:a.getCurrentTokenRow(),column:a.getCurrentTokenColumn()+b.value.length},a.stepForward(),e}}while(b=a.stepForward());return null},this._readTagBackward=function(a){var b=a.getCurrentToken();if(!b)return null;var c="",d;do if(b.type.indexOf("meta.tag")===0){d||(d={row:a.getCurrentTokenRow(),column:a.getCurrentTokenColumn()+b.value.length}),c=b.value+c;if(c.indexOf("<")!==-1){var e=this._parseTag(c);return e.end=d,e.start={row:a.getCurrentTokenRow(),column:a.getCurrentTokenColumn()},a.stepBackward(),e}}while(b=a.stepBackward());return null},this._pop=function(a,b){while(a.length){var c=a[a.length-1];if(!b||c.tagName==b.tagName)return a.pop();if(this.voidElements[b.tagName])return;if(this.voidElements[c.tagName]){a.pop();continue}return null}},this.getFoldWidgetRange=function(a,b,c){var d=this._getFirstTagInLine(a,c);if(!d.match)return null;var e=d.closing||d.selfClosing,g=[],i;if(!e){var j=new h(a,c,d.column),k={row:c,column:d.column+d.tagName.length+2};while(i=this._readTagForward(j)){if(i.selfClosing){if(!g.length)return i.start.column+=i.tagName.length+2,i.end.column-=2,f.fromPoints(i.start,i.end);continue}if(i.closing){this._pop(g,i);if(g.length==0)return f.fromPoints(k,i.start)}else g.push(i)}}else{var j=new h(a,c,d.column+d.match.length),l={row:c,column:d.column};while(i=this._readTagBackward(j)){if(i.selfClosing){if(!g.length)return i.start.column+=i.tagName.length+2,i.end.column-=2,f.fromPoints(i.start,i.end);continue}if(!i.closing){this._pop(g,i);if(g.length==0)return i.start.column+=i.tagName.length+2,f.fromPoints(i.start,l)}else g.push(i)}}}}.call(i.prototype)}),define("ace/mode/html",["require","exports","module","ace/lib/oop","ace/mode/text","ace/mode/javascript","ace/mode/css","ace/tokenizer","ace/mode/html_highlight_rules","ace/mode/behaviour/xml","ace/mode/folding/html"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text").Mode,f=a("./javascript").Mode,g=a("./css").Mode,h=a("../tokenizer").Tokenizer,i=a("./html_highlight_rules").HtmlHighlightRules,j=a("./behaviour/xml").XmlBehaviour,k=a("./folding/html").FoldMode,l=function(){var a=new i;this.$tokenizer=new h(a.getRules()),this.$behaviour=new j,this.$embeds=a.getEmbeds(),this.createModeDelegates({"js-":f,"css-":g}),this.foldingRules=new k};d.inherits(l,e),function(){this.toggleCommentLines=function(a,b,c,d){return 0},this.getNextLineIndent=function(a,b,c){return this.$getIndent(b)},this.checkOutdent=function(a,b,c){return!1}}.call(l.prototype),b.Mode=l}),define("ace/mode/css",["require","exports","module","ace/lib/oop","ace/mode/text","ace/tokenizer","ace/mode/css_highlight_rules","ace/mode/matching_brace_outdent","ace/worker/worker_client","ace/mode/folding/cstyle"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text").Mode,f=a("../tokenizer").Tokenizer,g=a("./css_highlight_rules").CssHighlightRules,h=a("./matching_brace_outdent").MatchingBraceOutdent,i=a("../worker/worker_client").WorkerClient,j=a("./folding/cstyle").FoldMode,k=function(){this.$tokenizer=new f((new g).getRules(),"i"),this.$outdent=new h,this.foldingRules=new j};d.inherits(k,e),function(){this.foldingRules="cStyle",this.getNextLineIndent=function(a,b,c){var d=this.$getIndent(b),e=this.$tokenizer.getLineTokens(b,a).tokens;if(e.length&&e[e.length-1].type=="comment")return d;var f=b.match(/^.*\{\s*$/);return f&&(d+=c),d},this.checkOutdent=function(a,b,c){return this.$outdent.checkOutdent(b,c)},this.autoOutdent=function(a,b,c){this.$outdent.autoOutdent(b,c)},this.createWorker=function(a){var b=new i(["ace"],"worker-css.js","ace/mode/css_worker","Worker");return b.attachToDocument(a.getDocument()),b.on("csslint",function(b){var c=[];b.data.forEach(function(a){c.push({row:a.line-1,column:a.col-1,text:a.message,type:a.type,lint:a})}),a.setAnnotations(c)}),b}}.call(k.prototype),b.Mode=k}),define("ace/mode/css_highlight_rules",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("../lib/lang"),f=a("./text_highlight_rules").TextHighlightRules,g=function(){var a=e.arrayToMap("animation-fill-mode|alignment-adjust|alignment-baseline|animation-delay|animation-direction|animation-duration|animation-iteration-count|animation-name|animation-play-state|animation-timing-function|animation|appearance|azimuth|backface-visibility|background-attachment|background-break|background-clip|background-color|background-image|background-origin|background-position|background-repeat|background-size|background|baseline-shift|binding|bleed|bookmark-label|bookmark-level|bookmark-state|bookmark-target|border-bottom|border-bottom-color|border-bottom-left-radius|border-bottom-right-radius|border-bottom-style|border-bottom-width|border-collapse|border-color|border-image|border-image-outset|border-image-repeat|border-image-slice|border-image-source|border-image-width|border-left|border-left-color|border-left-style|border-left-width|border-radius|border-right|border-right-color|border-right-style|border-right-width|border-spacing|border-style|border-top|border-top-color|border-top-left-radius|border-top-right-radius|border-top-style|border-top-width|border-width|border|bottom|box-align|box-decoration-break|box-direction|box-flex-group|box-flex|box-lines|box-ordinal-group|box-orient|box-pack|box-shadow|box-sizing|break-after|break-before|break-inside|caption-side|clear|clip|color-profile|color|column-count|column-fill|column-gap|column-rule|column-rule-color|column-rule-style|column-rule-width|column-span|column-width|columns|content|counter-increment|counter-reset|crop|cue-after|cue-before|cue|cursor|direction|display|dominant-baseline|drop-initial-after-adjust|drop-initial-after-align|drop-initial-before-adjust|drop-initial-before-align|drop-initial-size|drop-initial-value|elevation|empty-cells|fit|fit-position|float-offset|float|font-family|font-size|font-size-adjust|font-stretch|font-style|font-variant|font-weight|font|grid-columns|grid-rows|hanging-punctuation|height|hyphenate-after|hyphenate-before|hyphenate-character|hyphenate-lines|hyphenate-resource|hyphens|icon|image-orientation|image-rendering|image-resolution|inline-box-align|left|letter-spacing|line-height|line-stacking-ruby|line-stacking-shift|line-stacking-strategy|line-stacking|list-style-image|list-style-position|list-style-type|list-style|margin-bottom|margin-left|margin-right|margin-top|margin|mark-after|mark-before|mark|marks|marquee-direction|marquee-play-count|marquee-speed|marquee-style|max-height|max-width|min-height|min-width|move-to|nav-down|nav-index|nav-left|nav-right|nav-up|opacity|orphans|outline-color|outline-offset|outline-style|outline-width|outline|overflow-style|overflow-x|overflow-y|overflow|padding-bottom|padding-left|padding-right|padding-top|padding|page-break-after|page-break-before|page-break-inside|page-policy|page|pause-after|pause-before|pause|perspective-origin|perspective|phonemes|pitch-range|pitch|play-during|position|presentation-level|punctuation-trim|quotes|rendering-intent|resize|rest-after|rest-before|rest|richness|right|rotation-point|rotation|ruby-align|ruby-overhang|ruby-position|ruby-span|size|speak-header|speak-numeral|speak-punctuation|speak|speech-rate|stress|string-set|table-layout|target-name|target-new|target-position|target|text-align-last|text-align|text-decoration|text-emphasis|text-height|text-indent|text-justify|text-outline|text-shadow|text-transform|text-wrap|top|transform-origin|transform-style|transform|transition-delay|transition-duration|transition-property|transition-timing-function|transition|unicode-bidi|vertical-align|visibility|voice-balance|voice-duration|voice-family|voice-pitch-range|voice-pitch|voice-rate|voice-stress|voice-volume|volume|white-space-collapse|white-space|widows|width|word-break|word-spacing|word-wrap|z-index".split("|")),b=e.arrayToMap("rgb|rgba|url|attr|counter|counters".split("|")),c=e.arrayToMap("absolute|after-edge|after|all-scroll|all|alphabetic|always|antialiased|armenian|auto|avoid-column|avoid-page|avoid|balance|baseline|before-edge|before|below|bidi-override|block-line-height|block|bold|bolder|border-box|both|bottom|box|break-all|break-word|capitalize|caps-height|caption|center|central|char|circle|cjk-ideographic|clone|close-quote|col-resize|collapse|column|consider-shifts|contain|content-box|cover|crosshair|cubic-bezier|dashed|decimal-leading-zero|decimal|default|disabled|disc|disregard-shifts|distribute-all-lines|distribute-letter|distribute-space|distribute|dotted|double|e-resize|ease-in|ease-in-out|ease-out|ease|ellipsis|end|exclude-ruby|fill|fixed|font-size|font|georgian|glyphs|grid-height|groove|hand|hanging|hebrew|help|hidden|hiragana-iroha|hiragana|horizontal|icon|ideograph-alpha|ideograph-numeric|ideograph-parenthesis|ideograph-space|ideographic|inactive|include-ruby|inherit|initial|inline-block|inline-box|inline-line-height|inline-table|inline|inset|inside|inter-ideograph|inter-word|invert|italic|justify|katakana-iroha|katakana|keep-all|last|left|lighter|line-edge|line-through|line|linear|list-item|local|loose|lower-alpha|lower-greek|lower-latin|lower-roman|lowercase|lr-tb|ltr|mathematical|max-height|max-size|medium|menu|message-box|middle|move|n-resize|ne-resize|newspaper|no-change|no-close-quote|no-drop|no-open-quote|no-repeat|none|normal|not-allowed|nowrap|nw-resize|oblique|open-quote|outset|outside|overline|padding-box|page|pointer|pre-line|pre-wrap|pre|preserve-3d|progress|relative|repeat-x|repeat-y|repeat|replaced|reset-size|ridge|right|round|row-resize|rtl|s-resize|scroll|se-resize|separate|slice|small-caps|small-caption|solid|space|square|start|static|status-bar|step-end|step-start|steps|stretch|strict|sub|super|sw-resize|table-caption|table-cell|table-column-group|table-column|table-footer-group|table-header-group|table-row-group|table-row|table|tb-rl|text-after-edge|text-before-edge|text-bottom|text-size|text-top|text|thick|thin|top|transparent|underline|upper-alpha|upper-latin|upper-roman|uppercase|use-script|vertical-ideographic|vertical-text|visible|w-resize|wait|whitespace|z-index|zero".split("|")),d=e.arrayToMap("aqua|black|blue|fuchsia|gray|green|lime|maroon|navy|olive|orange|purple|red|silver|teal|white|yellow".split("|")),f=e.arrayToMap("arial|century|comic|courier|garamond|georgia|helvetica|impact|lucida|symbol|system|tahoma|times|trebuchet|utopia|verdana|webdings|sans-serif|serif|monospace".split("|")),g="\\-?(?:(?:[0-9]+)|(?:[0-9]*\\.[0-9]+))",h="(\\:+)\\b(after|before|first-letter|first-line|moz-selection|selection)\\b",i="(:)\\b(active|checked|disabled|empty|enabled|first-child|first-of-type|focus|hover|indeterminate|invalid|last-child|last-of-type|link|not|nth-child|nth-last-child|nth-last-of-type|nth-of-type|only-child|only-of-type|required|root|target|valid|visited)\\b",j=[{token:"comment",merge:!0,regex:"\\/\\*",next:"ruleset_comment"},{token:"string",regex:'["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'},{token:"string",regex:"['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"},{token:["constant.numeric","keyword"],regex:"("+g+")(ch|cm|deg|em|ex|fr|gd|grad|Hz|in|kHz|mm|ms|pc|pt|px|rad|rem|s|turn|vh|vm|vw|%)"},{token:["constant.numeric"],regex:"([0-9]+)"},{token:"constant.numeric",regex:"#[a-f0-9]{6}"},{token:"constant.numeric",regex:"#[a-f0-9]{3}"},{token:["punctuation","entity.other.attribute-name.pseudo-element.css"],regex:h},{token:["punctuation","entity.other.attribute-name.pseudo-class.css"],regex:i},{token:function(e){return a.hasOwnProperty(e.toLowerCase())?"support.type":b.hasOwnProperty(e.toLowerCase())?"support.function":c.hasOwnProperty(e.toLowerCase())?"support.constant":d.hasOwnProperty(e.toLowerCase())?"support.constant.color":f.hasOwnProperty(e.toLowerCase())?"support.constant.fonts":"text"},regex:"\\-?[a-zA-Z_][a-zA-Z0-9_\\-]*"}],k=e.copyArray(j);k.unshift({token:"paren.rparen",regex:"\\}",next:"start"});var l=e.copyArray(j);l.unshift({token:"paren.rparen",regex:"\\}",next:"media"});var m=[{token:"comment",merge:!0,regex:".+"}],n=e.copyArray(m);n.unshift({token:"comment",regex:".*?\\*\\/",next:"start"});var o=e.copyArray(m);o.unshift({token:"comment",regex:".*?\\*\\/",next:"media"});var p=e.copyArray(m);p.unshift({token:"comment",regex:".*?\\*\\/",next:"ruleset"}),this.$rules={start:[{token:"comment",merge:!0,regex:"\\/\\*",next:"comment"},{token:"paren.lparen",regex:"\\{",next:"ruleset"},{token:"string",regex:"@.*?{",next:"media"},{token:"keyword",regex:"#[a-z0-9-_]+"},{token:"variable",regex:"\\.[a-z0-9-_]+"},{token:"string",regex:":[a-z0-9-_]+"},{token:"constant",regex:"[a-z0-9-_]+"}],media:[{token:"comment",merge:!0,regex:"\\/\\*",next:"media_comment"},{token:"paren.lparen",regex:"\\{",next:"media_ruleset"},{token:"string",regex:"\\}",next:"start"},{token:"keyword",regex:"#[a-z0-9-_]+"},{token:"variable",regex:"\\.[a-z0-9-_]+"},{token:"string",regex:":[a-z0-9-_]+"},{token:"constant",regex:"[a-z0-9-_]+"}],comment:n,ruleset:k,ruleset_comment:p,media_ruleset:l,media_comment:o}};d.inherits(g,f),b.CssHighlightRules=g}),define("ace/mode/html_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/css_highlight_rules","ace/mode/javascript_highlight_rules","ace/mode/xml_util","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./css_highlight_rules").CssHighlightRules,f=a("./javascript_highlight_rules").JavaScriptHighlightRules,g=a("./xml_util"),h=a("./text_highlight_rules").TextHighlightRules,i=function(){this.$rules={start:[{token:"text",merge:!0,regex:"<\\!\\[CDATA\\[",next:"cdata"},{token:"xml_pe",regex:"<\\?.*?\\?>"},{token:"comment",merge:!0,regex:"<\\!--",next:"comment"},{token:"xml_pe",regex:"<\\!.*?>"},{token:"meta.tag",regex:"<(?=s*script\\b)",next:"script"},{token:"meta.tag",regex:"<(?=s*style\\b)",next:"style"},{token:"meta.tag",regex:"<\\/?",next:"tag"},{token:"text",regex:"\\s+"},{token:"constant.character.entity",regex:"(?:&#[0-9]+;)|(?:&#x[0-9a-fA-F]+;)|(?:&[a-zA-Z0-9_:\\.-]+;)"},{token:"text",regex:"[^<]+"}],cdata:[{token:"text",regex:"\\]\\]>",next:"start"},{token:"text",merge:!0,regex:"\\s+"},{token:"text",merge:!0,regex:".+"}],comment:[{token:"comment",regex:".*?-->",next:"start"},{token:"comment",merge:!0,regex:".+"}]},g.tag(this.$rules,"tag","start"),g.tag(this.$rules,"style","css-start"),g.tag(this.$rules,"script","js-start"),this.embedRules(f,"js-",[{token:"comment",regex:"\\/\\/.*(?=<\\/script>)",next:"tag"},{token:"meta.tag",regex:"<\\/(?=script)",next:"tag"}]),this.embedRules(e,"css-",[{token:"meta.tag",regex:"<\\/(?=style)",next:"tag"}])};d.inherits(i,h),b.HtmlHighlightRules=i}),define("ace/mode/folding/html",["require","exports","module","ace/lib/oop","ace/mode/folding/mixed","ace/mode/folding/xml","ace/mode/folding/cstyle"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("./mixed").FoldMode,f=a("./xml").FoldMode,g=a("./cstyle").FoldMode,h=b.FoldMode=function(){e.call(this,new f({area:1,base:1,br:1,col:1,command:1,embed:1,hr:1,img:1,input:1,keygen:1,link:1,meta:1,param:1,source:1,track:1,wbr:1,li:1,dt:1,dd:1,p:1,rt:1,rp:1,optgroup:1,option:1,colgroup:1,td:1,th:1}),{"js-":new g,"css-":new g})};d.inherits(h,e)}),define("ace/mode/folding/mixed",["require","exports","module","ace/lib/oop","ace/mode/folding/fold_mode"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("./fold_mode").FoldMode,f=b.FoldMode=function(a,b){this.defaultMode=a,this.subModes=b};d.inherits(f,e),function(){this.$getMode=function(a){for(var b in this.subModes)if(a.indexOf(b)===0)return this.subModes[b];return null},this.$tryMode=function(a,b,c,d){var e=this.$getMode(a);return e?e.getFoldWidget(b,c,d):""},this.getFoldWidget=function(a,b,c){return this.$tryMode(a.getState(c-1),a,b,c)||this.$tryMode(a.getState(c),a,b,c)||this.defaultMode.getFoldWidget(a,b,c)},this.getFoldWidgetRange=function(a,b,c){var d=this.$getMode(a.getState(c-1));if(!d||!d.getFoldWidget(a,b,c))d=this.$getMode(a.getState(c));if(!d||!d.getFoldWidget(a,b,c))d=this.defaultMode;return d.getFoldWidgetRange(a,b,c)}}.call(f.prototype)}),define("ace/mode/markdown_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/text_highlight_rules","ace/mode/javascript_highlight_rules","ace/mode/xml_highlight_rules","ace/mode/html_highlight_rules","ace/mode/css_highlight_rules"],function(a,b,c){function j(a,b){return{token:"support.function",regex:"^```"+a+"\\s*$",next:b+"start"}}"use strict";var d=a("../lib/oop"),e=a("./text_highlight_rules").TextHighlightRules,f=a("./javascript_highlight_rules").JavaScriptHighlightRules,g=a("./xml_highlight_rules").XmlHighlightRules,h=a("./html_highlight_rules").HtmlHighlightRules,i=a("./css_highlight_rules").CssHighlightRules,k=function(){this.$rules={start:[{token:"empty_line",regex:"^$"},{token:["support.function","support.function","support.function"],regex:"(`+)([^\\r]*?[^`])(\\1)"},{token:"support.function",regex:"^[ ]{4}.+"},{token:"markup.heading.1",regex:"^=+(?=\\s*$)"},{token:"markup.heading.1",regex:"^\\-+(?=\\s*$)"},{token:function(a){return"markup.heading."+a.length},regex:"^#{1,6}"},j("javascript","js-"),j("xml","xml-"),j("html","html-"),j("css","css-"),{token:"support.function",regex:"^```[a-zA-Z]+\\s*$",next:"githubblock"},{token:"string",regex:"^>[ ].+$",next:"blockquote"},{token:["text","constant","text","url","string","text"],regex:'^([ ]{0,3}\\[)([^\\]]+)(\\]:\\s*)([^ ]+)(\\s*(?:["][^"]+["])?(\\s*))$'},{token:["text","string","text","constant","text"],regex:"(\\[)((?:[[^\\]]*\\]|[^\\[\\]])*)(\\][ ]?(?:\\n[ ]*)?\\[)(.*?)(\\])"},{token:["text","string","text","markup.underline","string","text"],regex:'(\\[)(\\[[^\\]]*\\]|[^\\[\\]]*)(\\]\\([ \\t]*)(<?(?:(?:[^\\(]*?\\([^\\)]*?\\)\\S*?)|(?:.*?))>?)((?:[ 	]*"(?:.*?)"[ \\t]*)?)(\\))'},{token:"constant",regex:"^[ ]{0,2}(?:[ ]?\\*[ ]?){3,}\\s*$"},{token:"constant",regex:"^[ ]{0,2}(?:[ ]?\\-[ ]?){3,}\\s*$"},{token:"constant",regex:"^[ ]{0,2}(?:[ ]?\\_[ ]?){3,}\\s*$"},{token:"markup.list",regex:"^\\s{0,3}(?:[*+-]|\\d+\\.)\\s+",next:"listblock"},{token:["string","string","string"],regex:"([*]{2}|[_]{2}(?=\\S))([^\\r]*?\\S[*_]*)(\\1)"},{token:["string","string","string"],regex:"([*]|[_](?=\\S))([^\\r]*?\\S[*_]*)(\\1)"},{token:["text","url","text"],regex:"(<)((?:https?|ftp|dict):[^'\">\\s]+|(?:mailto:)?[-.\\w]+\\@[-a-z0-9]+(?:\\.[-a-z0-9]+)*\\.[a-z]+)(>)"},{token:"text",regex:"[^\\*_%$`\\[#<>]+"}],listblock:[{token:"empty_line",regex:"^$",next:"start"},{token:"markup.list",regex:".+"}],blockquote:[{token:"empty_line",regex:"^\\s*$",next:"start"},{token:"string",regex:".+"}],githubblock:[{token:"support.function",regex:"^```",next:"start"},{token:"support.function",regex:".+"}]},this.embedRules(f,"js-",[{token:"support.function",regex:"^```",next:"start"}]),this.embedRules(h,"html-",[{token:"support.function",regex:"^```",next:"start"}]),this.embedRules(i,"css-",[{token:"support.function",regex:"^```",next:"start"}]),this.embedRules(g,"xml-",[{token:"support.function",regex:"^```",next:"start"}])};d.inherits(k,e),b.MarkdownHighlightRules=k})
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/mode-ocaml-uncompressed.js b/apps/files_texteditor/js/aceeditor/mode-ocaml-uncompressed.js
deleted file mode 100644
index c268a4f8ca..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-ocaml-uncompressed.js
+++ /dev/null
@@ -1,539 +0,0 @@
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Sergi Mansilla <sergi AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/ocaml', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text', 'ace/tokenizer', 'ace/mode/ocaml_highlight_rules', 'ace/mode/matching_brace_outdent', 'ace/range'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
-var OcamlHighlightRules = require("./ocaml_highlight_rules").OcamlHighlightRules;
-var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
-var Range = require("../range").Range;
-
-var Mode = function() {
-    this.$tokenizer = new Tokenizer(new OcamlHighlightRules().getRules());
-    this.$outdent   = new MatchingBraceOutdent();
-};
-oop.inherits(Mode, TextMode);
-
-var indenter = /(?:[({[=:]|[-=]>|\b(?:else|try|with))\s*$/;
-
-(function() {
-
-    this.toggleCommentLines = function(state, doc, startRow, endRow) {
-        var i, line;
-        var outdent = true;
-        var re = /^\s*\(\*(.*)\*\)/;
-
-        for (i=startRow; i<= endRow; i++) {
-            if (!re.test(doc.getLine(i))) {
-                outdent = false;
-                break;
-            }
-        }
-
-        var range = new Range(0, 0, 0, 0);
-        for (i=startRow; i<= endRow; i++) {
-            line = doc.getLine(i);
-            range.start.row  = i;
-            range.end.row    = i;
-            range.end.column = line.length;
-
-            doc.replace(range, outdent ? line.match(re)[1] : "(*" + line + "*)");
-        }
-    };
-
-    this.getNextLineIndent = function(state, line, tab) {
-        var indent = this.$getIndent(line);
-        var tokens = this.$tokenizer.getLineTokens(line, state).tokens;
-
-        if (!(tokens.length && tokens[tokens.length - 1].type === 'comment') &&
-            state === 'start' && indenter.test(line))
-            indent += tab;
-        return indent;
-    };
-
-    this.checkOutdent = function(state, line, input) {
-        return this.$outdent.checkOutdent(line, input);
-    };
-
-    this.autoOutdent = function(state, doc, row) {
-        this.$outdent.autoOutdent(doc, row);
-    };
-
-}).call(Mode.prototype);
-
-exports.Mode = Mode;
-});
-
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Sergi Mansilla <sergi AT ajax DOT org>
- *
- * 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 *****
- *
- */
-
-define('ace/mode/ocaml_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/lang', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var lang = require("../lib/lang");
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-
-var OcamlHighlightRules = function() {
-
-    var keywords = lang.arrayToMap((
-        "and|as|assert|begin|class|constraint|do|done|downto|else|end|"  +
-        "exception|external|for|fun|function|functor|if|in|include|"     +
-        "inherit|initializer|lazy|let|match|method|module|mutable|new|"  +
-        "object|of|open|or|private|rec|sig|struct|then|to|try|type|val|" +
-        "virtual|when|while|with").split("|")
-    );
-
-    var builtinConstants = lang.arrayToMap(
-        ("true|false").split("|")
-    );
-
-    var builtinFunctions = lang.arrayToMap((
-        "abs|abs_big_int|abs_float|abs_num|abstract_tag|accept|access|acos|add|" +
-        "add_available_units|add_big_int|add_buffer|add_channel|add_char|" +
-        "add_initializer|add_int_big_int|add_interfaces|add_num|add_string|" +
-        "add_substitute|add_substring|alarm|allocated_bytes|allow_only|" +
-        "allow_unsafe_modules|always|append|appname_get|appname_set|" +
-        "approx_num_exp|approx_num_fix|arg|argv|arith_status|array|" +
-        "array1_of_genarray|array2_of_genarray|array3_of_genarray|asin|asr|" +
-        "assoc|assq|at_exit|atan|atan2|auto_synchronize|background|basename|" +
-        "beginning_of_input|big_int_of_int|big_int_of_num|big_int_of_string|bind|" +
-        "bind_class|bind_tag|bits|bits_of_float|black|blit|blit_image|blue|bool|" +
-        "bool_of_string|bounded_full_split|bounded_split|bounded_split_delim|" +
-        "bprintf|break|broadcast|bscanf|button_down|c_layout|capitalize|cardinal|" +
-        "cardinal|catch|catch_break|ceil|ceiling_num|channel|char|char_of_int|" +
-        "chdir|check|check_suffix|chmod|choose|chop_extension|chop_suffix|chown|" +
-        "chown|chr|chroot|classify_float|clear|clear_available_units|" +
-        "clear_close_on_exec|clear_graph|clear_nonblock|clear_parser|" +
-        "close|close|closeTk|close_box|close_graph|close_in|close_in_noerr|" +
-        "close_out|close_out_noerr|close_process|close_process|" +
-        "close_process_full|close_process_in|close_process_out|close_subwindow|" +
-        "close_tag|close_tbox|closedir|closedir|closure_tag|code|combine|" +
-        "combine|combine|command|compact|compare|compare_big_int|compare_num|" +
-        "complex32|complex64|concat|conj|connect|contains|contains_from|contents|" +
-        "copy|cos|cosh|count|count|counters|create|create_alarm|create_image|" +
-        "create_matrix|create_matrix|create_matrix|create_object|" +
-        "create_object_and_run_initializers|create_object_opt|create_process|" +
-        "create_process|create_process_env|create_process_env|create_table|" +
-        "current|current_dir_name|current_point|current_x|current_y|curveto|" +
-        "custom_tag|cyan|data_size|decr|decr_num|default_available_units|delay|" +
-        "delete_alarm|descr_of_in_channel|descr_of_out_channel|destroy|diff|dim|" +
-        "dim1|dim2|dim3|dims|dirname|display_mode|div|div_big_int|div_num|" +
-        "double_array_tag|double_tag|draw_arc|draw_char|draw_circle|draw_ellipse|" +
-        "draw_image|draw_poly|draw_poly_line|draw_rect|draw_segments|draw_string|" +
-        "dummy_pos|dummy_table|dump_image|dup|dup2|elements|empty|end_of_input|" +
-        "environment|eprintf|epsilon_float|eq_big_int|eq_num|equal|err_formatter|" +
-        "error_message|escaped|establish_server|executable_name|execv|execve|execvp|" +
-        "execvpe|exists|exists2|exit|exp|failwith|fast_sort|fchmod|fchown|field|" +
-        "file|file_exists|fill|fill_arc|fill_circle|fill_ellipse|fill_poly|fill_rect|" +
-        "filter|final_tag|finalise|find|find_all|first_chars|firstkey|flatten|" +
-        "float|float32|float64|float_of_big_int|float_of_bits|float_of_int|" +
-        "float_of_num|float_of_string|floor|floor_num|flush|flush_all|flush_input|" +
-        "flush_str_formatter|fold|fold_left|fold_left2|fold_right|fold_right2|" +
-        "for_all|for_all2|force|force_newline|force_val|foreground|fork|" +
-        "format_of_string|formatter_of_buffer|formatter_of_out_channel|" +
-        "fortran_layout|forward_tag|fprintf|frexp|from|from_channel|from_file|" +
-        "from_file_bin|from_function|from_string|fscanf|fst|fstat|ftruncate|" +
-        "full_init|full_major|full_split|gcd_big_int|ge_big_int|ge_num|" +
-        "genarray_of_array1|genarray_of_array2|genarray_of_array3|get|" +
-        "get_all_formatter_output_functions|get_approx_printing|get_copy|" +
-        "get_ellipsis_text|get_error_when_null_denominator|get_floating_precision|" +
-        "get_formatter_output_functions|get_formatter_tag_functions|get_image|" +
-        "get_margin|get_mark_tags|get_max_boxes|get_max_indent|get_method|" +
-        "get_method_label|get_normalize_ratio|get_normalize_ratio_when_printing|" +
-        "get_print_tags|get_state|get_variable|getcwd|getegid|getegid|getenv|" +
-        "getenv|getenv|geteuid|geteuid|getgid|getgid|getgrgid|getgrgid|getgrnam|" +
-        "getgrnam|getgroups|gethostbyaddr|gethostbyname|gethostname|getitimer|" +
-        "getlogin|getpeername|getpid|getppid|getprotobyname|getprotobynumber|" +
-        "getpwnam|getpwuid|getservbyname|getservbyport|getsockname|getsockopt|" +
-        "getsockopt_float|getsockopt_int|getsockopt_optint|gettimeofday|getuid|" +
-        "global_replace|global_substitute|gmtime|green|grid|group_beginning|" +
-        "group_end|gt_big_int|gt_num|guard|handle_unix_error|hash|hash_param|" +
-        "hd|header_size|i|id|ignore|in_channel_length|in_channel_of_descr|incr|" +
-        "incr_num|index|index_from|inet_addr_any|inet_addr_of_string|infinity|" +
-        "infix_tag|init|init_class|input|input_binary_int|input_byte|input_char|" +
-        "input_line|input_value|int|int16_signed|int16_unsigned|int32|int64|" +
-        "int8_signed|int8_unsigned|int_of_big_int|int_of_char|int_of_float|" +
-        "int_of_num|int_of_string|integer_num|inter|interactive|inv|invalid_arg|" +
-        "is_block|is_empty|is_implicit|is_int|is_int_big_int|is_integer_num|" +
-        "is_relative|iter|iter2|iteri|join|junk|key_pressed|kill|kind|kprintf|" +
-        "kscanf|land|last_chars|layout|lazy_from_fun|lazy_from_val|lazy_is_val|" +
-        "lazy_tag|ldexp|le_big_int|le_num|length|lexeme|lexeme_char|lexeme_end|" +
-        "lexeme_end_p|lexeme_start|lexeme_start_p|lineto|link|list|listen|lnot|" +
-        "loadfile|loadfile_private|localtime|lock|lockf|log|log10|logand|lognot|" +
-        "logor|logxor|lor|lower_window|lowercase|lseek|lsl|lsr|lstat|lt_big_int|" +
-        "lt_num|lxor|magenta|magic|mainLoop|major|major_slice|make|make_formatter|" +
-        "make_image|make_lexer|make_matrix|make_self_init|map|map2|map_file|mapi|" +
-        "marshal|match_beginning|match_end|matched_group|matched_string|max|" +
-        "max_array_length|max_big_int|max_elt|max_float|max_int|max_num|" +
-        "max_string_length|mem|mem_assoc|mem_assq|memq|merge|min|min_big_int|" +
-        "min_elt|min_float|min_int|min_num|minor|minus_big_int|minus_num|" +
-        "minus_one|mkdir|mkfifo|mktime|mod|mod_big_int|mod_float|mod_num|modf|" +
-        "mouse_pos|moveto|mul|mult_big_int|mult_int_big_int|mult_num|nan|narrow|" +
-        "nat_of_num|nativeint|neg|neg_infinity|new_block|new_channel|new_method|" +
-        "new_variable|next|nextkey|nice|nice|no_scan_tag|norm|norm2|not|npeek|" +
-        "nth|nth_dim|num_digits_big_int|num_dims|num_of_big_int|num_of_int|" +
-        "num_of_nat|num_of_ratio|num_of_string|O|obj|object_tag|ocaml_version|" +
-        "of_array|of_channel|of_float|of_int|of_int32|of_list|of_nativeint|" +
-        "of_string|one|openTk|open_box|open_connection|open_graph|open_hbox|" +
-        "open_hovbox|open_hvbox|open_in|open_in_bin|open_in_gen|open_out|" +
-        "open_out_bin|open_out_gen|open_process|open_process_full|open_process_in|" +
-        "open_process_out|open_subwindow|open_tag|open_tbox|open_temp_file|" +
-        "open_vbox|opendbm|opendir|openfile|or|os_type|out_channel_length|" +
-        "out_channel_of_descr|output|output_binary_int|output_buffer|output_byte|" +
-        "output_char|output_string|output_value|over_max_boxes|pack|params|" +
-        "parent_dir_name|parse|parse_argv|partition|pause|peek|pipe|pixels|" +
-        "place|plot|plots|point_color|polar|poll|pop|pos_in|pos_out|pow|" +
-        "power_big_int_positive_big_int|power_big_int_positive_int|" +
-        "power_int_positive_big_int|power_int_positive_int|power_num|" +
-        "pp_close_box|pp_close_tag|pp_close_tbox|pp_force_newline|" +
-        "pp_get_all_formatter_output_functions|pp_get_ellipsis_text|" +
-        "pp_get_formatter_output_functions|pp_get_formatter_tag_functions|" +
-        "pp_get_margin|pp_get_mark_tags|pp_get_max_boxes|pp_get_max_indent|" +
-        "pp_get_print_tags|pp_open_box|pp_open_hbox|pp_open_hovbox|pp_open_hvbox|" +
-        "pp_open_tag|pp_open_tbox|pp_open_vbox|pp_over_max_boxes|pp_print_as|" +
-        "pp_print_bool|pp_print_break|pp_print_char|pp_print_cut|pp_print_float|" +
-        "pp_print_flush|pp_print_if_newline|pp_print_int|pp_print_newline|" +
-        "pp_print_space|pp_print_string|pp_print_tab|pp_print_tbreak|" +
-        "pp_set_all_formatter_output_functions|pp_set_ellipsis_text|" +
-        "pp_set_formatter_out_channel|pp_set_formatter_output_functions|" +
-        "pp_set_formatter_tag_functions|pp_set_margin|pp_set_mark_tags|" +
-        "pp_set_max_boxes|pp_set_max_indent|pp_set_print_tags|pp_set_tab|" +
-        "pp_set_tags|pred|pred_big_int|pred_num|prerr_char|prerr_endline|" +
-        "prerr_float|prerr_int|prerr_newline|prerr_string|print|print_as|" +
-        "print_bool|print_break|print_char|print_cut|print_endline|print_float|" +
-        "print_flush|print_if_newline|print_int|print_newline|print_space|" +
-        "print_stat|print_string|print_tab|print_tbreak|printf|prohibit|" +
-        "public_method_label|push|putenv|quo_num|quomod_big_int|quote|raise|" +
-        "raise_window|ratio_of_num|rcontains_from|read|read_float|read_int|" +
-        "read_key|read_line|readdir|readdir|readlink|really_input|receive|recv|" +
-        "recvfrom|red|ref|regexp|regexp_case_fold|regexp_string|" +
-        "regexp_string_case_fold|register|register_exception|rem|remember_mode|" +
-        "remove|remove_assoc|remove_assq|rename|replace|replace_first|" +
-        "replace_matched|repr|reset|reshape|reshape_1|reshape_2|reshape_3|rev|" +
-        "rev_append|rev_map|rev_map2|rewinddir|rgb|rhs_end|rhs_end_pos|rhs_start|" +
-        "rhs_start_pos|rindex|rindex_from|rlineto|rmdir|rmoveto|round_num|" +
-        "run_initializers|run_initializers_opt|scanf|search_backward|" +
-        "search_forward|seek_in|seek_out|select|self|self_init|send|sendto|set|" +
-        "set_all_formatter_output_functions|set_approx_printing|" +
-        "set_binary_mode_in|set_binary_mode_out|set_close_on_exec|" +
-        "set_close_on_exec|set_color|set_ellipsis_text|" +
-        "set_error_when_null_denominator|set_field|set_floating_precision|" +
-        "set_font|set_formatter_out_channel|set_formatter_output_functions|" +
-        "set_formatter_tag_functions|set_line_width|set_margin|set_mark_tags|" +
-        "set_max_boxes|set_max_indent|set_method|set_nonblock|set_nonblock|" +
-        "set_normalize_ratio|set_normalize_ratio_when_printing|set_print_tags|" +
-        "set_signal|set_state|set_tab|set_tag|set_tags|set_text_size|" +
-        "set_window_title|setgid|setgid|setitimer|setitimer|setsid|setsid|" +
-        "setsockopt|setsockopt|setsockopt_float|setsockopt_float|setsockopt_int|" +
-        "setsockopt_int|setsockopt_optint|setsockopt_optint|setuid|setuid|" +
-        "shift_left|shift_left|shift_left|shift_right|shift_right|shift_right|" +
-        "shift_right_logical|shift_right_logical|shift_right_logical|show_buckets|" +
-        "shutdown|shutdown|shutdown_connection|shutdown_connection|sigabrt|" +
-        "sigalrm|sigchld|sigcont|sigfpe|sighup|sigill|sigint|sigkill|sign_big_int|" +
-        "sign_num|signal|signal|sigpending|sigpending|sigpipe|sigprocmask|" +
-        "sigprocmask|sigprof|sigquit|sigsegv|sigstop|sigsuspend|sigsuspend|" +
-        "sigterm|sigtstp|sigttin|sigttou|sigusr1|sigusr2|sigvtalrm|sin|singleton|" +
-        "sinh|size|size|size_x|size_y|sleep|sleep|sleep|slice_left|slice_left|" +
-        "slice_left_1|slice_left_2|slice_right|slice_right|slice_right_1|" +
-        "slice_right_2|snd|socket|socket|socket|socketpair|socketpair|sort|sound|" +
-        "split|split_delim|sprintf|sprintf|sqrt|sqrt|sqrt_big_int|square_big_int|" +
-        "square_num|sscanf|stable_sort|stable_sort|stable_sort|stable_sort|stable_sort|" +
-        "stable_sort|stat|stat|stat|stat|stat|stats|stats|std_formatter|stdbuf|" +
-        "stderr|stderr|stderr|stdib|stdin|stdin|stdin|stdout|stdout|stdout|" +
-        "str_formatter|string|string_after|string_before|string_match|" +
-        "string_of_big_int|string_of_bool|string_of_float|string_of_format|" +
-        "string_of_inet_addr|string_of_inet_addr|string_of_int|string_of_num|" +
-        "string_partial_match|string_tag|sub|sub|sub_big_int|sub_left|sub_num|" +
-        "sub_right|subset|subset|substitute_first|substring|succ|succ|" +
-        "succ|succ|succ_big_int|succ_num|symbol_end|symbol_end_pos|symbol_start|" +
-        "symbol_start_pos|symlink|symlink|sync|synchronize|system|system|system|" +
-        "tag|take|tan|tanh|tcdrain|tcdrain|tcflow|tcflow|tcflush|tcflush|" +
-        "tcgetattr|tcgetattr|tcsendbreak|tcsendbreak|tcsetattr|tcsetattr|" +
-        "temp_file|text_size|time|time|time|timed_read|timed_write|times|times|" +
-        "tl|tl|tl|to_buffer|to_channel|to_float|to_hex|to_int|to_int32|to_list|" +
-        "to_list|to_list|to_nativeint|to_string|to_string|to_string|to_string|" +
-        "to_string|top|top|total_size|transfer|transp|truncate|truncate|truncate|" +
-        "truncate|truncate|truncate|try_lock|umask|umask|uncapitalize|uncapitalize|" +
-        "uncapitalize|union|union|unit_big_int|unlink|unlink|unlock|unmarshal|" +
-        "unsafe_blit|unsafe_fill|unsafe_get|unsafe_get|unsafe_set|unsafe_set|" +
-        "update|uppercase|uppercase|uppercase|uppercase|usage|utimes|utimes|wait|" +
-        "wait|wait|wait|wait_next_event|wait_pid|wait_read|wait_signal|" +
-        "wait_timed_read|wait_timed_write|wait_write|waitpid|white|" +
-        "widen|window_id|word_size|wrap|wrap_abort|write|yellow|yield|zero|zero_big_int|" +
-
-        "Arg|Arith_status|Array|Array1|Array2|Array3|ArrayLabels|Big_int|Bigarray|" +
-        "Buffer|Callback|CamlinternalOO|Char|Complex|Condition|Dbm|Digest|Dynlink|" +
-        "Event|Filename|Format|Gc|Genarray|Genlex|Graphics|GraphicsX11|Hashtbl|" +
-        "Int32|Int64|LargeFile|Lazy|Lexing|List|ListLabels|Make|Map|Marshal|" +
-        "MoreLabels|Mutex|Nativeint|Num|Obj|Oo|Parsing|Pervasives|Printexc|" +
-        "Printf|Queue|Random|Scanf|Scanning|Set|Sort|Stack|State|StdLabels|Str|" +
-        "Stream|String|StringLabels|Sys|Thread|ThreadUnix|Tk|Unix|UnixLabels|Weak"
-    ).split("|"));
-
-    var decimalInteger = "(?:(?:[1-9]\\d*)|(?:0))";
-    var octInteger = "(?:0[oO]?[0-7]+)";
-    var hexInteger = "(?:0[xX][\\dA-Fa-f]+)";
-    var binInteger = "(?:0[bB][01]+)";
-    var integer = "(?:" + decimalInteger + "|" + octInteger + "|" + hexInteger + "|" + binInteger + ")";
-
-    var exponent = "(?:[eE][+-]?\\d+)";
-    var fraction = "(?:\\.\\d+)";
-    var intPart = "(?:\\d+)";
-    var pointFloat = "(?:(?:" + intPart + "?" + fraction + ")|(?:" + intPart + "\\.))";
-    var exponentFloat = "(?:(?:" + pointFloat + "|" +  intPart + ")" + exponent + ")";
-    var floatNumber = "(?:" + exponentFloat + "|" + pointFloat + ")";
-
-    this.$rules = {
-        "start" : [
-            {
-                token : "comment",
-                regex : '\\(\\*.*?\\*\\)\\s*?$'
-            },
-            {
-                token : "comment",
-                merge : true,
-                regex : '\\(\\*.*',
-                next : "comment"
-            },
-            {
-                token : "string", // single line
-                regex : '["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'
-            },
-            {
-                token : "string", // single char
-                regex : "'.'"
-            },
-            {
-                token : "string", // " string
-                merge : true,
-                regex : '"',
-                next  : "qstring"
-            },
-            {
-                token : "constant.numeric", // imaginary
-                regex : "(?:" + floatNumber + "|\\d+)[jJ]\\b"
-            },
-            {
-                token : "constant.numeric", // float
-                regex : floatNumber
-            },
-            {
-                token : "constant.numeric", // integer
-                regex : integer + "\\b"
-            },
-            {
-                token : function(value) {
-                    if (keywords.hasOwnProperty(value))
-                        return "keyword";
-                    else if (builtinConstants.hasOwnProperty(value))
-                        return "constant.language";
-                    else if (builtinFunctions.hasOwnProperty(value))
-                        return "support.function";
-                    else
-                        return "identifier";
-                },
-                regex : "[a-zA-Z_$][a-zA-Z0-9_$]*\\b"
-            },
-            {
-                token : "keyword.operator",
-                regex : "\\+\\.|\\-\\.|\\*\\.|\\/\\.|#|;;|\\+|\\-|\\*|\\*\\*\\/|\\/\\/|%|<<|>>|&|\\||\\^|~|<|>|<=|=>|==|!=|<>|<-|="
-            },
-            {
-                token : "paren.lparen",
-                regex : "[[({]"
-            },
-            {
-                token : "paren.rparen",
-                regex : "[\\])}]"
-            },
-            {
-                token : "text",
-                regex : "\\s+"
-            }
-        ],
-        "comment" : [
-            {
-                token : "comment", // closing comment
-                regex : ".*?\\*\\)",
-                next : "start"
-            },
-            {
-                token : "comment", // comment spanning whole line
-                merge : true,
-                regex : ".+"
-            }
-        ],
-
-        "qstring" : [
-            {
-                token : "string",
-                regex : '"',
-                next : "start"
-            }, {
-                token : "string",
-                merge : true,
-                regex : '.+'
-            }
-        ]
-    };
-};
-
-oop.inherits(OcamlHighlightRules, TextHighlightRules);
-
-exports.OcamlHighlightRules = OcamlHighlightRules;
-});
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/matching_brace_outdent', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
-"use strict";
-
-var Range = require("../range").Range;
-
-var MatchingBraceOutdent = function() {};
-
-(function() {
-
-    this.checkOutdent = function(line, input) {
-        if (! /^\s+$/.test(line))
-            return false;
-
-        return /^\s*\}/.test(input);
-    };
-
-    this.autoOutdent = function(doc, row) {
-        var line = doc.getLine(row);
-        var match = line.match(/^(\s*\})/);
-
-        if (!match) return 0;
-
-        var column = match[1].length;
-        var openBracePos = doc.findMatchingBracket({row: row, column: column});
-
-        if (!openBracePos || openBracePos.row == row) return 0;
-
-        var indent = this.$getIndent(doc.getLine(openBracePos.row));
-        doc.replace(new Range(row, 0, row, column-1), indent);
-    };
-
-    this.$getIndent = function(line) {
-        var match = line.match(/^(\s+)/);
-        if (match) {
-            return match[1];
-        }
-
-        return "";
-    };
-
-}).call(MatchingBraceOutdent.prototype);
-
-exports.MatchingBraceOutdent = MatchingBraceOutdent;
-});
diff --git a/apps/files_texteditor/js/aceeditor/mode-ocaml.js b/apps/files_texteditor/js/aceeditor/mode-ocaml.js
deleted file mode 100644
index 622f817e30..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-ocaml.js
+++ /dev/null
@@ -1 +0,0 @@
-define("ace/mode/ocaml",["require","exports","module","ace/lib/oop","ace/mode/text","ace/tokenizer","ace/mode/ocaml_highlight_rules","ace/mode/matching_brace_outdent","ace/range"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text").Mode,f=a("../tokenizer").Tokenizer,g=a("./ocaml_highlight_rules").OcamlHighlightRules,h=a("./matching_brace_outdent").MatchingBraceOutdent,i=a("../range").Range,j=function(){this.$tokenizer=new f((new g).getRules()),this.$outdent=new h};d.inherits(j,e);var k=/(?:[({[=:]|[-=]>|\b(?:else|try|with))\s*$/;(function(){this.toggleCommentLines=function(a,b,c,d){var e,f,g=!0,h=/^\s*\(\*(.*)\*\)/;for(e=c;e<=d;e++)if(!h.test(b.getLine(e))){g=!1;break}var j=new i(0,0,0,0);for(e=c;e<=d;e++)f=b.getLine(e),j.start.row=e,j.end.row=e,j.end.column=f.length,b.replace(j,g?f.match(h)[1]:"(*"+f+"*)")},this.getNextLineIndent=function(a,b,c){var d=this.$getIndent(b),e=this.$tokenizer.getLineTokens(b,a).tokens;return(!e.length||e[e.length-1].type!=="comment")&&a==="start"&&k.test(b)&&(d+=c),d},this.checkOutdent=function(a,b,c){return this.$outdent.checkOutdent(b,c)},this.autoOutdent=function(a,b,c){this.$outdent.autoOutdent(b,c)}}).call(j.prototype),b.Mode=j}),define("ace/mode/ocaml_highlight_rules",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("../lib/lang"),f=a("./text_highlight_rules").TextHighlightRules,g=function(){var a=e.arrayToMap("and|as|assert|begin|class|constraint|do|done|downto|else|end|exception|external|for|fun|function|functor|if|in|include|inherit|initializer|lazy|let|match|method|module|mutable|new|object|of|open|or|private|rec|sig|struct|then|to|try|type|val|virtual|when|while|with".split("|")),b=e.arrayToMap("true|false".split("|")),c=e.arrayToMap("abs|abs_big_int|abs_float|abs_num|abstract_tag|accept|access|acos|add|add_available_units|add_big_int|add_buffer|add_channel|add_char|add_initializer|add_int_big_int|add_interfaces|add_num|add_string|add_substitute|add_substring|alarm|allocated_bytes|allow_only|allow_unsafe_modules|always|append|appname_get|appname_set|approx_num_exp|approx_num_fix|arg|argv|arith_status|array|array1_of_genarray|array2_of_genarray|array3_of_genarray|asin|asr|assoc|assq|at_exit|atan|atan2|auto_synchronize|background|basename|beginning_of_input|big_int_of_int|big_int_of_num|big_int_of_string|bind|bind_class|bind_tag|bits|bits_of_float|black|blit|blit_image|blue|bool|bool_of_string|bounded_full_split|bounded_split|bounded_split_delim|bprintf|break|broadcast|bscanf|button_down|c_layout|capitalize|cardinal|cardinal|catch|catch_break|ceil|ceiling_num|channel|char|char_of_int|chdir|check|check_suffix|chmod|choose|chop_extension|chop_suffix|chown|chown|chr|chroot|classify_float|clear|clear_available_units|clear_close_on_exec|clear_graph|clear_nonblock|clear_parser|close|close|closeTk|close_box|close_graph|close_in|close_in_noerr|close_out|close_out_noerr|close_process|close_process|close_process_full|close_process_in|close_process_out|close_subwindow|close_tag|close_tbox|closedir|closedir|closure_tag|code|combine|combine|combine|command|compact|compare|compare_big_int|compare_num|complex32|complex64|concat|conj|connect|contains|contains_from|contents|copy|cos|cosh|count|count|counters|create|create_alarm|create_image|create_matrix|create_matrix|create_matrix|create_object|create_object_and_run_initializers|create_object_opt|create_process|create_process|create_process_env|create_process_env|create_table|current|current_dir_name|current_point|current_x|current_y|curveto|custom_tag|cyan|data_size|decr|decr_num|default_available_units|delay|delete_alarm|descr_of_in_channel|descr_of_out_channel|destroy|diff|dim|dim1|dim2|dim3|dims|dirname|display_mode|div|div_big_int|div_num|double_array_tag|double_tag|draw_arc|draw_char|draw_circle|draw_ellipse|draw_image|draw_poly|draw_poly_line|draw_rect|draw_segments|draw_string|dummy_pos|dummy_table|dump_image|dup|dup2|elements|empty|end_of_input|environment|eprintf|epsilon_float|eq_big_int|eq_num|equal|err_formatter|error_message|escaped|establish_server|executable_name|execv|execve|execvp|execvpe|exists|exists2|exit|exp|failwith|fast_sort|fchmod|fchown|field|file|file_exists|fill|fill_arc|fill_circle|fill_ellipse|fill_poly|fill_rect|filter|final_tag|finalise|find|find_all|first_chars|firstkey|flatten|float|float32|float64|float_of_big_int|float_of_bits|float_of_int|float_of_num|float_of_string|floor|floor_num|flush|flush_all|flush_input|flush_str_formatter|fold|fold_left|fold_left2|fold_right|fold_right2|for_all|for_all2|force|force_newline|force_val|foreground|fork|format_of_string|formatter_of_buffer|formatter_of_out_channel|fortran_layout|forward_tag|fprintf|frexp|from|from_channel|from_file|from_file_bin|from_function|from_string|fscanf|fst|fstat|ftruncate|full_init|full_major|full_split|gcd_big_int|ge_big_int|ge_num|genarray_of_array1|genarray_of_array2|genarray_of_array3|get|get_all_formatter_output_functions|get_approx_printing|get_copy|get_ellipsis_text|get_error_when_null_denominator|get_floating_precision|get_formatter_output_functions|get_formatter_tag_functions|get_image|get_margin|get_mark_tags|get_max_boxes|get_max_indent|get_method|get_method_label|get_normalize_ratio|get_normalize_ratio_when_printing|get_print_tags|get_state|get_variable|getcwd|getegid|getegid|getenv|getenv|getenv|geteuid|geteuid|getgid|getgid|getgrgid|getgrgid|getgrnam|getgrnam|getgroups|gethostbyaddr|gethostbyname|gethostname|getitimer|getlogin|getpeername|getpid|getppid|getprotobyname|getprotobynumber|getpwnam|getpwuid|getservbyname|getservbyport|getsockname|getsockopt|getsockopt_float|getsockopt_int|getsockopt_optint|gettimeofday|getuid|global_replace|global_substitute|gmtime|green|grid|group_beginning|group_end|gt_big_int|gt_num|guard|handle_unix_error|hash|hash_param|hd|header_size|i|id|ignore|in_channel_length|in_channel_of_descr|incr|incr_num|index|index_from|inet_addr_any|inet_addr_of_string|infinity|infix_tag|init|init_class|input|input_binary_int|input_byte|input_char|input_line|input_value|int|int16_signed|int16_unsigned|int32|int64|int8_signed|int8_unsigned|int_of_big_int|int_of_char|int_of_float|int_of_num|int_of_string|integer_num|inter|interactive|inv|invalid_arg|is_block|is_empty|is_implicit|is_int|is_int_big_int|is_integer_num|is_relative|iter|iter2|iteri|join|junk|key_pressed|kill|kind|kprintf|kscanf|land|last_chars|layout|lazy_from_fun|lazy_from_val|lazy_is_val|lazy_tag|ldexp|le_big_int|le_num|length|lexeme|lexeme_char|lexeme_end|lexeme_end_p|lexeme_start|lexeme_start_p|lineto|link|list|listen|lnot|loadfile|loadfile_private|localtime|lock|lockf|log|log10|logand|lognot|logor|logxor|lor|lower_window|lowercase|lseek|lsl|lsr|lstat|lt_big_int|lt_num|lxor|magenta|magic|mainLoop|major|major_slice|make|make_formatter|make_image|make_lexer|make_matrix|make_self_init|map|map2|map_file|mapi|marshal|match_beginning|match_end|matched_group|matched_string|max|max_array_length|max_big_int|max_elt|max_float|max_int|max_num|max_string_length|mem|mem_assoc|mem_assq|memq|merge|min|min_big_int|min_elt|min_float|min_int|min_num|minor|minus_big_int|minus_num|minus_one|mkdir|mkfifo|mktime|mod|mod_big_int|mod_float|mod_num|modf|mouse_pos|moveto|mul|mult_big_int|mult_int_big_int|mult_num|nan|narrow|nat_of_num|nativeint|neg|neg_infinity|new_block|new_channel|new_method|new_variable|next|nextkey|nice|nice|no_scan_tag|norm|norm2|not|npeek|nth|nth_dim|num_digits_big_int|num_dims|num_of_big_int|num_of_int|num_of_nat|num_of_ratio|num_of_string|O|obj|object_tag|ocaml_version|of_array|of_channel|of_float|of_int|of_int32|of_list|of_nativeint|of_string|one|openTk|open_box|open_connection|open_graph|open_hbox|open_hovbox|open_hvbox|open_in|open_in_bin|open_in_gen|open_out|open_out_bin|open_out_gen|open_process|open_process_full|open_process_in|open_process_out|open_subwindow|open_tag|open_tbox|open_temp_file|open_vbox|opendbm|opendir|openfile|or|os_type|out_channel_length|out_channel_of_descr|output|output_binary_int|output_buffer|output_byte|output_char|output_string|output_value|over_max_boxes|pack|params|parent_dir_name|parse|parse_argv|partition|pause|peek|pipe|pixels|place|plot|plots|point_color|polar|poll|pop|pos_in|pos_out|pow|power_big_int_positive_big_int|power_big_int_positive_int|power_int_positive_big_int|power_int_positive_int|power_num|pp_close_box|pp_close_tag|pp_close_tbox|pp_force_newline|pp_get_all_formatter_output_functions|pp_get_ellipsis_text|pp_get_formatter_output_functions|pp_get_formatter_tag_functions|pp_get_margin|pp_get_mark_tags|pp_get_max_boxes|pp_get_max_indent|pp_get_print_tags|pp_open_box|pp_open_hbox|pp_open_hovbox|pp_open_hvbox|pp_open_tag|pp_open_tbox|pp_open_vbox|pp_over_max_boxes|pp_print_as|pp_print_bool|pp_print_break|pp_print_char|pp_print_cut|pp_print_float|pp_print_flush|pp_print_if_newline|pp_print_int|pp_print_newline|pp_print_space|pp_print_string|pp_print_tab|pp_print_tbreak|pp_set_all_formatter_output_functions|pp_set_ellipsis_text|pp_set_formatter_out_channel|pp_set_formatter_output_functions|pp_set_formatter_tag_functions|pp_set_margin|pp_set_mark_tags|pp_set_max_boxes|pp_set_max_indent|pp_set_print_tags|pp_set_tab|pp_set_tags|pred|pred_big_int|pred_num|prerr_char|prerr_endline|prerr_float|prerr_int|prerr_newline|prerr_string|print|print_as|print_bool|print_break|print_char|print_cut|print_endline|print_float|print_flush|print_if_newline|print_int|print_newline|print_space|print_stat|print_string|print_tab|print_tbreak|printf|prohibit|public_method_label|push|putenv|quo_num|quomod_big_int|quote|raise|raise_window|ratio_of_num|rcontains_from|read|read_float|read_int|read_key|read_line|readdir|readdir|readlink|really_input|receive|recv|recvfrom|red|ref|regexp|regexp_case_fold|regexp_string|regexp_string_case_fold|register|register_exception|rem|remember_mode|remove|remove_assoc|remove_assq|rename|replace|replace_first|replace_matched|repr|reset|reshape|reshape_1|reshape_2|reshape_3|rev|rev_append|rev_map|rev_map2|rewinddir|rgb|rhs_end|rhs_end_pos|rhs_start|rhs_start_pos|rindex|rindex_from|rlineto|rmdir|rmoveto|round_num|run_initializers|run_initializers_opt|scanf|search_backward|search_forward|seek_in|seek_out|select|self|self_init|send|sendto|set|set_all_formatter_output_functions|set_approx_printing|set_binary_mode_in|set_binary_mode_out|set_close_on_exec|set_close_on_exec|set_color|set_ellipsis_text|set_error_when_null_denominator|set_field|set_floating_precision|set_font|set_formatter_out_channel|set_formatter_output_functions|set_formatter_tag_functions|set_line_width|set_margin|set_mark_tags|set_max_boxes|set_max_indent|set_method|set_nonblock|set_nonblock|set_normalize_ratio|set_normalize_ratio_when_printing|set_print_tags|set_signal|set_state|set_tab|set_tag|set_tags|set_text_size|set_window_title|setgid|setgid|setitimer|setitimer|setsid|setsid|setsockopt|setsockopt|setsockopt_float|setsockopt_float|setsockopt_int|setsockopt_int|setsockopt_optint|setsockopt_optint|setuid|setuid|shift_left|shift_left|shift_left|shift_right|shift_right|shift_right|shift_right_logical|shift_right_logical|shift_right_logical|show_buckets|shutdown|shutdown|shutdown_connection|shutdown_connection|sigabrt|sigalrm|sigchld|sigcont|sigfpe|sighup|sigill|sigint|sigkill|sign_big_int|sign_num|signal|signal|sigpending|sigpending|sigpipe|sigprocmask|sigprocmask|sigprof|sigquit|sigsegv|sigstop|sigsuspend|sigsuspend|sigterm|sigtstp|sigttin|sigttou|sigusr1|sigusr2|sigvtalrm|sin|singleton|sinh|size|size|size_x|size_y|sleep|sleep|sleep|slice_left|slice_left|slice_left_1|slice_left_2|slice_right|slice_right|slice_right_1|slice_right_2|snd|socket|socket|socket|socketpair|socketpair|sort|sound|split|split_delim|sprintf|sprintf|sqrt|sqrt|sqrt_big_int|square_big_int|square_num|sscanf|stable_sort|stable_sort|stable_sort|stable_sort|stable_sort|stable_sort|stat|stat|stat|stat|stat|stats|stats|std_formatter|stdbuf|stderr|stderr|stderr|stdib|stdin|stdin|stdin|stdout|stdout|stdout|str_formatter|string|string_after|string_before|string_match|string_of_big_int|string_of_bool|string_of_float|string_of_format|string_of_inet_addr|string_of_inet_addr|string_of_int|string_of_num|string_partial_match|string_tag|sub|sub|sub_big_int|sub_left|sub_num|sub_right|subset|subset|substitute_first|substring|succ|succ|succ|succ|succ_big_int|succ_num|symbol_end|symbol_end_pos|symbol_start|symbol_start_pos|symlink|symlink|sync|synchronize|system|system|system|tag|take|tan|tanh|tcdrain|tcdrain|tcflow|tcflow|tcflush|tcflush|tcgetattr|tcgetattr|tcsendbreak|tcsendbreak|tcsetattr|tcsetattr|temp_file|text_size|time|time|time|timed_read|timed_write|times|times|tl|tl|tl|to_buffer|to_channel|to_float|to_hex|to_int|to_int32|to_list|to_list|to_list|to_nativeint|to_string|to_string|to_string|to_string|to_string|top|top|total_size|transfer|transp|truncate|truncate|truncate|truncate|truncate|truncate|try_lock|umask|umask|uncapitalize|uncapitalize|uncapitalize|union|union|unit_big_int|unlink|unlink|unlock|unmarshal|unsafe_blit|unsafe_fill|unsafe_get|unsafe_get|unsafe_set|unsafe_set|update|uppercase|uppercase|uppercase|uppercase|usage|utimes|utimes|wait|wait|wait|wait|wait_next_event|wait_pid|wait_read|wait_signal|wait_timed_read|wait_timed_write|wait_write|waitpid|white|widen|window_id|word_size|wrap|wrap_abort|write|yellow|yield|zero|zero_big_int|Arg|Arith_status|Array|Array1|Array2|Array3|ArrayLabels|Big_int|Bigarray|Buffer|Callback|CamlinternalOO|Char|Complex|Condition|Dbm|Digest|Dynlink|Event|Filename|Format|Gc|Genarray|Genlex|Graphics|GraphicsX11|Hashtbl|Int32|Int64|LargeFile|Lazy|Lexing|List|ListLabels|Make|Map|Marshal|MoreLabels|Mutex|Nativeint|Num|Obj|Oo|Parsing|Pervasives|Printexc|Printf|Queue|Random|Scanf|Scanning|Set|Sort|Stack|State|StdLabels|Str|Stream|String|StringLabels|Sys|Thread|ThreadUnix|Tk|Unix|UnixLabels|Weak".split("|")),d="(?:(?:[1-9]\\d*)|(?:0))",f="(?:0[oO]?[0-7]+)",g="(?:0[xX][\\dA-Fa-f]+)",h="(?:0[bB][01]+)",i="(?:"+d+"|"+f+"|"+g+"|"+h+")",j="(?:[eE][+-]?\\d+)",k="(?:\\.\\d+)",l="(?:\\d+)",m="(?:(?:"+l+"?"+k+")|(?:"+l+"\\.))",n="(?:(?:"+m+"|"+l+")"+j+")",o="(?:"+n+"|"+m+")";this.$rules={start:[{token:"comment",regex:"\\(\\*.*?\\*\\)\\s*?$"},{token:"comment",merge:!0,regex:"\\(\\*.*",next:"comment"},{token:"string",regex:'["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'},{token:"string",regex:"'.'"},{token:"string",merge:!0,regex:'"',next:"qstring"},{token:"constant.numeric",regex:"(?:"+o+"|\\d+)[jJ]\\b"},{token:"constant.numeric",regex:o},{token:"constant.numeric",regex:i+"\\b"},{token:function(d){return a.hasOwnProperty(d)?"keyword":b.hasOwnProperty(d)?"constant.language":c.hasOwnProperty(d)?"support.function":"identifier"},regex:"[a-zA-Z_$][a-zA-Z0-9_$]*\\b"},{token:"keyword.operator",regex:"\\+\\.|\\-\\.|\\*\\.|\\/\\.|#|;;|\\+|\\-|\\*|\\*\\*\\/|\\/\\/|%|<<|>>|&|\\||\\^|~|<|>|<=|=>|==|!=|<>|<-|="},{token:"paren.lparen",regex:"[[({]"},{token:"paren.rparen",regex:"[\\])}]"},{token:"text",regex:"\\s+"}],comment:[{token:"comment",regex:".*?\\*\\)",next:"start"},{token:"comment",merge:!0,regex:".+"}],qstring:[{token:"string",regex:'"',next:"start"},{token:"string",merge:!0,regex:".+"}]}};d.inherits(g,f),b.OcamlHighlightRules=g}),define("ace/mode/matching_brace_outdent",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../range").Range,e=function(){};(function(){this.checkOutdent=function(a,b){return/^\s+$/.test(a)?/^\s*\}/.test(b):!1},this.autoOutdent=function(a,b){var c=a.getLine(b),e=c.match(/^(\s*\})/);if(!e)return 0;var f=e[1].length,g=a.findMatchingBracket({row:b,column:f});if(!g||g.row==b)return 0;var h=this.$getIndent(a.getLine(g.row));a.replace(new d(b,0,b,f-1),h)},this.$getIndent=function(a){var b=a.match(/^(\s+)/);return b?b[1]:""}}).call(e.prototype),b.MatchingBraceOutdent=e})
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/mode-perl-uncompressed.js b/apps/files_texteditor/js/aceeditor/mode-perl-uncompressed.js
deleted file mode 100644
index 04796f61ae..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-perl-uncompressed.js
+++ /dev/null
@@ -1,573 +0,0 @@
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Panagiotis Astithas <pastith AT gmail DOT com>
- *
- * 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 ***** */
-
-define('ace/mode/perl', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text', 'ace/tokenizer', 'ace/mode/perl_highlight_rules', 'ace/mode/matching_brace_outdent', 'ace/range', 'ace/mode/folding/cstyle'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
-var PerlHighlightRules = require("./perl_highlight_rules").PerlHighlightRules;
-var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
-var Range = require("../range").Range;
-var CStyleFoldMode = require("./folding/cstyle").FoldMode;
-
-var Mode = function() {
-    this.$tokenizer = new Tokenizer(new PerlHighlightRules().getRules());
-    this.$outdent = new MatchingBraceOutdent();
-    this.foldingRules = new CStyleFoldMode();
-};
-oop.inherits(Mode, TextMode);
-
-(function() {
-
-    this.toggleCommentLines = function(state, doc, startRow, endRow) {
-        var outdent = true;
-        var re = /^(\s*)#/;
-
-        for (var i=startRow; i<= endRow; i++) {
-            if (!re.test(doc.getLine(i))) {
-                outdent = false;
-                break;
-            }
-        }
-
-        if (outdent) {
-            var deleteRange = new Range(0, 0, 0, 0);
-            for (var i=startRow; i<= endRow; i++)
-            {
-                var line = doc.getLine(i);
-                var m = line.match(re);
-                deleteRange.start.row = i;
-                deleteRange.end.row = i;
-                deleteRange.end.column = m[0].length;
-                doc.replace(deleteRange, m[1]);
-            }
-        }
-        else {
-            doc.indentRows(startRow, endRow, "#");
-        }
-    };
-
-    this.getNextLineIndent = function(state, line, tab) {
-        var indent = this.$getIndent(line);
-
-        var tokenizedLine = this.$tokenizer.getLineTokens(line, state);
-        var tokens = tokenizedLine.tokens;
-
-        if (tokens.length && tokens[tokens.length-1].type == "comment") {
-            return indent;
-        }
-
-        if (state == "start") {
-            var match = line.match(/^.*[\{\(\[\:]\s*$/);
-            if (match) {
-                indent += tab;
-            }
-        }
-
-        return indent;
-    };
-
-    this.checkOutdent = function(state, line, input) {
-        return this.$outdent.checkOutdent(line, input);
-    };
-
-    this.autoOutdent = function(state, doc, row) {
-        this.$outdent.autoOutdent(doc, row);
-    };
-
-}).call(Mode.prototype);
-
-exports.Mode = Mode;
-});
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Panagiotis Astithas <pastith AT gmail DOT com>
- *
- * 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 ***** */
-
-define('ace/mode/perl_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/lang', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var lang = require("../lib/lang");
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-
-var PerlHighlightRules = function() {
-
-    var keywords = lang.arrayToMap(
-        ("base|constant|continue|else|elsif|for|foreach|format|goto|if|last|local|my|next|" +
-         "no|package|parent|redo|require|scalar|sub|unless|until|while|use|vars").split("|")
-    );
-
-    var buildinConstants = lang.arrayToMap(
-        ("ARGV|ENV|INC|SIG").split("|")
-    );
-
-    var builtinFunctions = lang.arrayToMap(
-        ("getprotobynumber|getprotobyname|getservbyname|gethostbyaddr|" +
-         "gethostbyname|getservbyport|getnetbyaddr|getnetbyname|getsockname|" +
-         "getpeername|setpriority|getprotoent|setprotoent|getpriority|" +
-         "endprotoent|getservent|setservent|endservent|sethostent|socketpair|" +
-         "getsockopt|gethostent|endhostent|setsockopt|setnetent|quotemeta|" +
-         "localtime|prototype|getnetent|endnetent|rewinddir|wantarray|getpwuid|" +
-         "closedir|getlogin|readlink|endgrent|getgrgid|getgrnam|shmwrite|" +
-         "shutdown|readline|endpwent|setgrent|readpipe|formline|truncate|" +
-         "dbmclose|syswrite|setpwent|getpwnam|getgrent|getpwent|ucfirst|sysread|" +
-         "setpgrp|shmread|sysseek|sysopen|telldir|defined|opendir|connect|" +
-         "lcfirst|getppid|binmode|syscall|sprintf|getpgrp|readdir|seekdir|" +
-         "waitpid|reverse|unshift|symlink|dbmopen|semget|msgrcv|rename|listen|" +
-         "chroot|msgsnd|shmctl|accept|unpack|exists|fileno|shmget|system|" +
-         "unlink|printf|gmtime|msgctl|semctl|values|rindex|substr|splice|" +
-         "length|msgget|select|socket|return|caller|delete|alarm|ioctl|index|" +
-         "undef|lstat|times|srand|chown|fcntl|close|write|umask|rmdir|study|" +
-         "sleep|chomp|untie|print|utime|mkdir|atan2|split|crypt|flock|chmod|" +
-         "BEGIN|bless|chdir|semop|shift|reset|link|stat|chop|grep|fork|dump|" +
-         "join|open|tell|pipe|exit|glob|warn|each|bind|sort|pack|eval|push|" +
-         "keys|getc|kill|seek|sqrt|send|wait|rand|tied|read|time|exec|recv|" +
-         "eof|chr|int|ord|exp|pos|pop|sin|log|abs|oct|hex|tie|cos|vec|END|ref|" +
-         "map|die|uc|lc|do").split("|")
-    );
-
-    // regexp must not have capturing parentheses. Use (?:) instead.
-    // regexps are ordered -> the first match is used
-
-    this.$rules = {
-        "start" : [
-            {
-                token : "comment",
-                regex : "#.*$"
-            }, {
-                token : "string.regexp",
-                regex : "[/](?:(?:\\[(?:\\\\]|[^\\]])+\\])|(?:\\\\/|[^\\]/]))*[/]\\w*\\s*(?=[).,;]|$)"
-            }, {
-                token : "string", // single line
-                regex : '["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'
-            }, {
-                token : "string", // multi line string start
-                merge : true,
-                regex : '["].*\\\\$',
-                next : "qqstring"
-            }, {
-                token : "string", // single line
-                regex : "['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"
-            }, {
-                token : "string", // multi line string start
-                merge : true,
-                regex : "['].*\\\\$",
-                next : "qstring"
-            }, {
-                token : "constant.numeric", // hex
-                regex : "0x[0-9a-fA-F]+\\b"
-            }, {
-                token : "constant.numeric", // float
-                regex : "[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"
-            }, {
-                token : function(value) {
-                    if (keywords.hasOwnProperty(value))
-                        return "keyword";
-                    else if (buildinConstants.hasOwnProperty(value))
-                        return "constant.language";
-                    else if (builtinFunctions.hasOwnProperty(value))
-                        return "support.function";
-                    else
-                        return "identifier";
-                },
-                regex : "[a-zA-Z_$][a-zA-Z0-9_$]*\\b"
-            }, {
-                token : "keyword.operator",
-                regex : "\\.\\.\\.|\\|\\|=|>>=|<<=|<=>|&&=|=>|!~|\\^=|&=|\\|=|\\.=|x=|%=|\\/=|\\*=|\\-=|\\+=|=~|\\*\\*|\\-\\-|\\.\\.|\\|\\||&&|\\+\\+|\\->|!=|==|>=|<=|>>|<<|,|=|\\?\\:|\\^|\\||x|%|\\/|\\*|<|&|\\\\|~|!|>|\\.|\\-|\\+|\\-C|\\-b|\\-S|\\-u|\\-t|\\-p|\\-l|\\-d|\\-f|\\-g|\\-s|\\-z|\\-k|\\-e|\\-O|\\-T|\\-B|\\-M|\\-A|\\-X|\\-W|\\-c|\\-R|\\-o|\\-x|\\-w|\\-r|\\b(?:and|cmp|eq|ge|gt|le|lt|ne|not|or|xor)"
-            }, {
-                token : "lparen",
-                regex : "[[({]"
-            }, {
-                token : "rparen",
-                regex : "[\\])}]"
-            }, {
-                token : "text",
-                regex : "\\s+"
-            }
-        ],
-        "qqstring" : [
-            {
-                token : "string",
-                regex : '(?:(?:\\\\.)|(?:[^"\\\\]))*?"',
-                next : "start"
-            }, {
-                token : "string",
-                merge : true,
-                regex : '.+'
-            }
-        ],
-        "qstring" : [
-            {
-                token : "string",
-                regex : "(?:(?:\\\\.)|(?:[^'\\\\]))*?'",
-                next : "start"
-            }, {
-                token : "string",
-                merge : true,
-                regex : '.+'
-            }
-        ]
-    };
-};
-
-oop.inherits(PerlHighlightRules, TextHighlightRules);
-
-exports.PerlHighlightRules = PerlHighlightRules;
-});
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/matching_brace_outdent', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
-"use strict";
-
-var Range = require("../range").Range;
-
-var MatchingBraceOutdent = function() {};
-
-(function() {
-
-    this.checkOutdent = function(line, input) {
-        if (! /^\s+$/.test(line))
-            return false;
-
-        return /^\s*\}/.test(input);
-    };
-
-    this.autoOutdent = function(doc, row) {
-        var line = doc.getLine(row);
-        var match = line.match(/^(\s*\})/);
-
-        if (!match) return 0;
-
-        var column = match[1].length;
-        var openBracePos = doc.findMatchingBracket({row: row, column: column});
-
-        if (!openBracePos || openBracePos.row == row) return 0;
-
-        var indent = this.$getIndent(doc.getLine(openBracePos.row));
-        doc.replace(new Range(row, 0, row, column-1), indent);
-    };
-
-    this.$getIndent = function(line) {
-        var match = line.match(/^(\s+)/);
-        if (match) {
-            return match[1];
-        }
-
-        return "";
-    };
-
-}).call(MatchingBraceOutdent.prototype);
-
-exports.MatchingBraceOutdent = MatchingBraceOutdent;
-});
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/folding/cstyle', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/range', 'ace/mode/folding/fold_mode'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../../lib/oop");
-var Range = require("../../range").Range;
-var BaseFoldMode = require("./fold_mode").FoldMode;
-
-var FoldMode = exports.FoldMode = function() {};
-oop.inherits(FoldMode, BaseFoldMode);
-
-(function() {
-
-    this.foldingStartMarker = /(\{|\[)[^\}\]]*$|^\s*(\/\*)/;
-    this.foldingStopMarker = /^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/;
-    
-    this.getFoldWidgetRange = function(session, foldStyle, row) {
-        var line = session.getLine(row);
-        var match = line.match(this.foldingStartMarker);
-        if (match) {
-            var i = match.index;
-
-            if (match[1])
-                return this.openingBracketBlock(session, match[1], row, i);
-
-            var range = session.getCommentFoldRange(row, i + match[0].length);
-            range.end.column -= 2;
-            return range;
-        }
-
-        if (foldStyle !== "markbeginend")
-            return;
-            
-        var match = line.match(this.foldingStopMarker);
-        if (match) {
-            var i = match.index + match[0].length;
-
-            if (match[2]) {
-                var range = session.getCommentFoldRange(row, i);
-                range.end.column -= 2;
-                return range;
-            }
-
-            var end = {row: row, column: i};
-            var start = session.$findOpeningBracket(match[1], end);
-            
-            if (!start)
-                return;
-
-            start.column++;
-            end.column--;
-
-            return  Range.fromPoints(start, end);
-        }
-    };
-    
-}).call(FoldMode.prototype);
-
-});/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/folding/fold_mode', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
-"use strict";
-
-var Range = require("../../range").Range;
-
-var FoldMode = exports.FoldMode = function() {};
-
-(function() {
-
-    this.foldingStartMarker = null;
-    this.foldingStopMarker = null;
-
-    // must return "" if there's no fold, to enable caching
-    this.getFoldWidget = function(session, foldStyle, row) {
-        var line = session.getLine(row);
-        if (this.foldingStartMarker.test(line))
-            return "start";
-        if (foldStyle == "markbeginend"
-                && this.foldingStopMarker
-                && this.foldingStopMarker.test(line))
-            return "end";
-        return "";
-    };
-    
-    this.getFoldWidgetRange = function(session, foldStyle, row) {
-        return null;
-    };
-
-    this.indentationBlock = function(session, row, column) {
-        var re = /^\s*/;
-        var startRow = row;
-        var endRow = row;
-        var line = session.getLine(row);
-        var startColumn = column || line.length;
-        var startLevel = line.match(re)[0].length;
-        var maxRow = session.getLength()
-        
-        while (++row < maxRow) {
-            line = session.getLine(row);
-            var level = line.match(re)[0].length;
-
-            if (level == line.length)
-                continue;
-
-            if (level <= startLevel)
-                break;
-
-            endRow = row;
-        }
-
-        if (endRow > startRow) {
-            var endColumn = session.getLine(endRow).length;
-            return new Range(startRow, startColumn, endRow, endColumn);
-        }
-    };
-
-    this.openingBracketBlock = function(session, bracket, row, column) {
-        var start = {row: row, column: column + 1};
-        var end = session.$findClosingBracket(bracket, start);
-        if (!end)
-            return;
-
-        var fw = session.foldWidgets[end.row];
-        if (fw == null)
-            fw = this.getFoldWidget(session, end.row);
-
-        if (fw == "start") {
-            end.row --;
-            end.column = session.getLine(end.row).length;
-        }
-        return Range.fromPoints(start, end);
-    };
-
-}).call(FoldMode.prototype);
-
-});
diff --git a/apps/files_texteditor/js/aceeditor/mode-perl.js b/apps/files_texteditor/js/aceeditor/mode-perl.js
deleted file mode 100644
index 909781418b..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-perl.js
+++ /dev/null
@@ -1 +0,0 @@
-define("ace/mode/perl",["require","exports","module","ace/lib/oop","ace/mode/text","ace/tokenizer","ace/mode/perl_highlight_rules","ace/mode/matching_brace_outdent","ace/range","ace/mode/folding/cstyle"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text").Mode,f=a("../tokenizer").Tokenizer,g=a("./perl_highlight_rules").PerlHighlightRules,h=a("./matching_brace_outdent").MatchingBraceOutdent,i=a("../range").Range,j=a("./folding/cstyle").FoldMode,k=function(){this.$tokenizer=new f((new g).getRules()),this.$outdent=new h,this.foldingRules=new j};d.inherits(k,e),function(){this.toggleCommentLines=function(a,b,c,d){var e=!0,f=/^(\s*)#/;for(var g=c;g<=d;g++)if(!f.test(b.getLine(g))){e=!1;break}if(e){var h=new i(0,0,0,0);for(var g=c;g<=d;g++){var j=b.getLine(g),k=j.match(f);h.start.row=g,h.end.row=g,h.end.column=k[0].length,b.replace(h,k[1])}}else b.indentRows(c,d,"#")},this.getNextLineIndent=function(a,b,c){var d=this.$getIndent(b),e=this.$tokenizer.getLineTokens(b,a),f=e.tokens;if(f.length&&f[f.length-1].type=="comment")return d;if(a=="start"){var g=b.match(/^.*[\{\(\[\:]\s*$/);g&&(d+=c)}return d},this.checkOutdent=function(a,b,c){return this.$outdent.checkOutdent(b,c)},this.autoOutdent=function(a,b,c){this.$outdent.autoOutdent(b,c)}}.call(k.prototype),b.Mode=k}),define("ace/mode/perl_highlight_rules",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("../lib/lang"),f=a("./text_highlight_rules").TextHighlightRules,g=function(){var a=e.arrayToMap("base|constant|continue|else|elsif|for|foreach|format|goto|if|last|local|my|next|no|package|parent|redo|require|scalar|sub|unless|until|while|use|vars".split("|")),b=e.arrayToMap("ARGV|ENV|INC|SIG".split("|")),c=e.arrayToMap("getprotobynumber|getprotobyname|getservbyname|gethostbyaddr|gethostbyname|getservbyport|getnetbyaddr|getnetbyname|getsockname|getpeername|setpriority|getprotoent|setprotoent|getpriority|endprotoent|getservent|setservent|endservent|sethostent|socketpair|getsockopt|gethostent|endhostent|setsockopt|setnetent|quotemeta|localtime|prototype|getnetent|endnetent|rewinddir|wantarray|getpwuid|closedir|getlogin|readlink|endgrent|getgrgid|getgrnam|shmwrite|shutdown|readline|endpwent|setgrent|readpipe|formline|truncate|dbmclose|syswrite|setpwent|getpwnam|getgrent|getpwent|ucfirst|sysread|setpgrp|shmread|sysseek|sysopen|telldir|defined|opendir|connect|lcfirst|getppid|binmode|syscall|sprintf|getpgrp|readdir|seekdir|waitpid|reverse|unshift|symlink|dbmopen|semget|msgrcv|rename|listen|chroot|msgsnd|shmctl|accept|unpack|exists|fileno|shmget|system|unlink|printf|gmtime|msgctl|semctl|values|rindex|substr|splice|length|msgget|select|socket|return|caller|delete|alarm|ioctl|index|undef|lstat|times|srand|chown|fcntl|close|write|umask|rmdir|study|sleep|chomp|untie|print|utime|mkdir|atan2|split|crypt|flock|chmod|BEGIN|bless|chdir|semop|shift|reset|link|stat|chop|grep|fork|dump|join|open|tell|pipe|exit|glob|warn|each|bind|sort|pack|eval|push|keys|getc|kill|seek|sqrt|send|wait|rand|tied|read|time|exec|recv|eof|chr|int|ord|exp|pos|pop|sin|log|abs|oct|hex|tie|cos|vec|END|ref|map|die|uc|lc|do".split("|"));this.$rules={start:[{token:"comment",regex:"#.*$"},{token:"string.regexp",regex:"[/](?:(?:\\[(?:\\\\]|[^\\]])+\\])|(?:\\\\/|[^\\]/]))*[/]\\w*\\s*(?=[).,;]|$)"},{token:"string",regex:'["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'},{token:"string",merge:!0,regex:'["].*\\\\$',next:"qqstring"},{token:"string",regex:"['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"},{token:"string",merge:!0,regex:"['].*\\\\$",next:"qstring"},{token:"constant.numeric",regex:"0x[0-9a-fA-F]+\\b"},{token:"constant.numeric",regex:"[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"},{token:function(d){return a.hasOwnProperty(d)?"keyword":b.hasOwnProperty(d)?"constant.language":c.hasOwnProperty(d)?"support.function":"identifier"},regex:"[a-zA-Z_$][a-zA-Z0-9_$]*\\b"},{token:"keyword.operator",regex:"\\.\\.\\.|\\|\\|=|>>=|<<=|<=>|&&=|=>|!~|\\^=|&=|\\|=|\\.=|x=|%=|\\/=|\\*=|\\-=|\\+=|=~|\\*\\*|\\-\\-|\\.\\.|\\|\\||&&|\\+\\+|\\->|!=|==|>=|<=|>>|<<|,|=|\\?\\:|\\^|\\||x|%|\\/|\\*|<|&|\\\\|~|!|>|\\.|\\-|\\+|\\-C|\\-b|\\-S|\\-u|\\-t|\\-p|\\-l|\\-d|\\-f|\\-g|\\-s|\\-z|\\-k|\\-e|\\-O|\\-T|\\-B|\\-M|\\-A|\\-X|\\-W|\\-c|\\-R|\\-o|\\-x|\\-w|\\-r|\\b(?:and|cmp|eq|ge|gt|le|lt|ne|not|or|xor)"},{token:"lparen",regex:"[[({]"},{token:"rparen",regex:"[\\])}]"},{token:"text",regex:"\\s+"}],qqstring:[{token:"string",regex:'(?:(?:\\\\.)|(?:[^"\\\\]))*?"',next:"start"},{token:"string",merge:!0,regex:".+"}],qstring:[{token:"string",regex:"(?:(?:\\\\.)|(?:[^'\\\\]))*?'",next:"start"},{token:"string",merge:!0,regex:".+"}]}};d.inherits(g,f),b.PerlHighlightRules=g}),define("ace/mode/matching_brace_outdent",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../range").Range,e=function(){};(function(){this.checkOutdent=function(a,b){return/^\s+$/.test(a)?/^\s*\}/.test(b):!1},this.autoOutdent=function(a,b){var c=a.getLine(b),e=c.match(/^(\s*\})/);if(!e)return 0;var f=e[1].length,g=a.findMatchingBracket({row:b,column:f});if(!g||g.row==b)return 0;var h=this.$getIndent(a.getLine(g.row));a.replace(new d(b,0,b,f-1),h)},this.$getIndent=function(a){var b=a.match(/^(\s+)/);return b?b[1]:""}}).call(e.prototype),b.MatchingBraceOutdent=e}),define("ace/mode/folding/cstyle",["require","exports","module","ace/lib/oop","ace/range","ace/mode/folding/fold_mode"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../../range").Range,f=a("./fold_mode").FoldMode,g=b.FoldMode=function(){};d.inherits(g,f),function(){this.foldingStartMarker=/(\{|\[)[^\}\]]*$|^\s*(\/\*)/,this.foldingStopMarker=/^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/,this.getFoldWidgetRange=function(a,b,c){var d=a.getLine(c),f=d.match(this.foldingStartMarker);if(f){var g=f.index;if(f[1])return this.openingBracketBlock(a,f[1],c,g);var h=a.getCommentFoldRange(c,g+f[0].length);return h.end.column-=2,h}if(b!=="markbeginend")return;var f=d.match(this.foldingStopMarker);if(f){var g=f.index+f[0].length;if(f[2]){var h=a.getCommentFoldRange(c,g);return h.end.column-=2,h}var i={row:c,column:g},j=a.$findOpeningBracket(f[1],i);if(!j)return;return j.column++,i.column--,e.fromPoints(j,i)}}}.call(g.prototype)}),define("ace/mode/folding/fold_mode",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../../range").Range,e=b.FoldMode=function(){};(function(){this.foldingStartMarker=null,this.foldingStopMarker=null,this.getFoldWidget=function(a,b,c){var d=a.getLine(c);return this.foldingStartMarker.test(d)?"start":b=="markbeginend"&&this.foldingStopMarker&&this.foldingStopMarker.test(d)?"end":""},this.getFoldWidgetRange=function(a,b,c){return null},this.indentationBlock=function(a,b,c){var e=/^\s*/,f=b,g=b,h=a.getLine(b),i=c||h.length,j=h.match(e)[0].length,k=a.getLength();while(++b<k){h=a.getLine(b);var l=h.match(e)[0].length;if(l==h.length)continue;if(l<=j)break;g=b}if(g>f){var m=a.getLine(g).length;return new d(f,i,g,m)}},this.openingBracketBlock=function(a,b,c,e){var f={row:c,column:e+1},g=a.$findClosingBracket(b,f);if(!g)return;var h=a.foldWidgets[g.row];return h==null&&(h=this.getFoldWidget(a,g.row)),h=="start"&&(g.row--,g.column=a.getLine(g.row).length),d.fromPoints(f,g)}}).call(e.prototype)})
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/mode-pgsql-uncompressed.js b/apps/files_texteditor/js/aceeditor/mode-pgsql-uncompressed.js
deleted file mode 100644
index 344647c792..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-pgsql-uncompressed.js
+++ /dev/null
@@ -1,1107 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
-* The Original Code is Ajax.org Code Editor (ACE).
-*
-* Contributor(s):
-*      Jonathan Camile <jonathan.camile AT gmail DOT com>
-*
-* 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 ***** */
-
-define('ace/mode/pgsql', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text', 'ace/tokenizer', 'ace/mode/pgsql_highlight_rules', 'ace/range'], function(require, exports, module) {
-
-    var oop = require("ace/lib/oop");
-    var TextMode = require("ace/mode/text").Mode;
-    var Tokenizer = require("ace/tokenizer").Tokenizer;
-    var PgsqlHighlightRules = require("ace/mode/pgsql_highlight_rules").PgsqlHighlightRules;
-    var Range = require("ace/range").Range;
-    // var EditSession = require("ace/edit_session").EditSession;
-
-    var Mode = function() {
-        this.$tokenizer = new Tokenizer(new PgsqlHighlightRules().getRules());
-    };
-    oop.inherits(Mode, TextMode);
-
-    (function() {
-
-        this.toggleCommentLines = function(state, doc, startRow, endRow) {
-            var outdent = true;
-            // var outentedRows = [];
-            var re = /^(\s*)--/;
-
-            for (var i=startRow; i<= endRow; i++) {
-                if (!re.test(doc.getLine(i))) {
-                    outdent = false;
-                    break;
-                }
-            }
-
-            if (outdent) {
-                var deleteRange = new Range(0, 0, 0, 0);
-                for (var i=startRow; i<= endRow; i++)
-                {
-                    var line = doc.getLine(i);
-                    var m = line.match(re);
-                    deleteRange.start.row = i;
-                    deleteRange.end.row = i;
-                    deleteRange.end.column = m[0].length;
-                    doc.replace(deleteRange, m[1]);
-                }
-            }
-            else {
-                doc.indentRows(startRow, endRow, "--");
-            }
-        };
-
-
-        this.getNextLineIndent = function(state, line, tab) { 
-            if (state == "start" || state == "keyword.statementEnd") {
-                return "";
-            } else {
-                return this.$getIndent(line); // Keep whatever indent the previous line has
-            }
-        }
-
-    }).call(Mode.prototype);
-
-    exports.Mode = Mode;
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * Contributor(s):
- *      John DeSoi, Ph.D. <desoi AT pgedit DOT com>
- *
- * 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 *****
- *
- */
-
-
-define('ace/mode/pgsql_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/lang', 'ace/mode/doc_comment_highlight_rules', 'ace/mode/text_highlight_rules', 'ace/mode/perl_highlight_rules', 'ace/mode/python_highlight_rules'], function(require, exports, module) {
-
-var oop = require("ace/lib/oop");
-var lang = require("ace/lib/lang");
-var DocCommentHighlightRules = require("./doc_comment_highlight_rules").DocCommentHighlightRules;
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-// Supporting perl and python for now -- both in pg core and ace
-var PerlHighlightRules = require("./perl_highlight_rules").PerlHighlightRules;
-var PythonHighlightRules = require("./python_highlight_rules").PythonHighlightRules;
-
-var PgsqlHighlightRules = function() {
-    
-    // Keywords, functions, operators last updated for pg 9.1.
-    var keywords = lang.arrayToMap(
-        ("abort|absolute|abstime|access|aclitem|action|add|admin|after|aggregate|all|also|alter|always|" +
-        "analyse|analyze|and|any|anyarray|anyelement|anyenum|anynonarray|array|as|asc|assertion|" +
-        "assignment|asymmetric|at|attribute|authorization|backward|before|begin|between|bigint|" +
-        "binary|bit|bool|boolean|both|box|bpchar|by|bytea|cache|called|cascade|cascaded|case|cast|" +
-        "catalog|chain|char|character|characteristics|check|checkpoint|cid|cidr|circle|class|close|" +
-        "cluster|coalesce|collate|collation|column|comment|comments|commit|committed|concurrently|" +
-        "configuration|connection|constraint|constraints|content|continue|conversion|copy|cost|" +
-        "create|cross|cstring|csv|current|current_catalog|current_date|current_role|" +
-        "current_schema|current_time|current_timestamp|current_user|cursor|cycle|data|database|" +
-        "date|day|deallocate|dec|decimal|declare|default|defaults|deferrable|deferred|definer|delete|" +
-        "delimiter|delimiters|desc|dictionary|disable|discard|distinct|do|document|domain|double|" +
-        "drop|each|else|enable|encoding|encrypted|end|enum|escape|except|exclude|excluding|exclusive|" +
-        "execute|exists|explain|extension|external|extract|false|family|fdw_handler|fetch|first|" +
-        "float|float4|float8|following|for|force|foreign|forward|freeze|from|full|function|functions|" +
-        "global|grant|granted|greatest|group|gtsvector|handler|having|header|hold|hour|identity|if|" +
-        "ilike|immediate|immutable|implicit|in|including|increment|index|indexes|inet|inherit|" +
-        "inherits|initially|inline|inner|inout|input|insensitive|insert|instead|int|int2|int2vector|" +
-        "int4|int8|integer|internal|intersect|interval|into|invoker|is|isnull|isolation|join|key|label|" +
-        "language|language_handler|large|last|lc_collate|lc_ctype|leading|least|left|level|like|" +
-        "limit|line|listen|load|local|localtime|localtimestamp|location|lock|lseg|macaddr|mapping|" +
-        "match|maxvalue|minute|minvalue|mode|money|month|move|name|names|national|natural|nchar|next|no|" +
-        "none|not|nothing|notify|notnull|nowait|null|nullif|nulls|numeric|object|of|off|offset|oid|oids|" +
-        "oidvector|on|only|opaque|operator|option|options|or|order|out|outer|over|overlaps|overlay|" +
-        "owned|owner|parser|partial|partition|passing|password|path|pg_attribute|pg_auth_members|" +
-        "pg_authid|pg_class|pg_database|pg_node_tree|pg_proc|pg_type|placing|plans|point|polygon|" +
-        "position|preceding|precision|prepare|prepared|preserve|primary|prior|privileges|" +
-        "procedural|procedure|quote|range|read|real|reassign|recheck|record|recursive|ref|refcursor|" +
-        "references|regclass|regconfig|regdictionary|regoper|regoperator|regproc|regprocedure|" +
-        "regtype|reindex|relative|release|reltime|rename|repeatable|replace|replica|reset|restart|" +
-        "restrict|returning|returns|revoke|right|role|rollback|row|rows|rule|savepoint|schema|scroll|" +
-        "search|second|security|select|sequence|sequences|serializable|server|session|session_user|" +
-        "set|setof|share|show|similar|simple|smallint|smgr|some|stable|standalone|start|statement|" +
-        "statistics|stdin|stdout|storage|strict|strip|substring|symmetric|sysid|system|table|tables|" +
-        "tablespace|temp|template|temporary|text|then|tid|time|timestamp|timestamptz|timetz|" +
-        "tinterval|to|trailing|transaction|treat|trigger|trim|true|truncate|trusted|tsquery|tsvector|" +
-        "txid_snapshot|type|unbounded|uncommitted|unencrypted|union|unique|unknown|unlisten|" +
-        "unlogged|until|update|user|using|uuid|vacuum|valid|validate|validator|value|values|varbit|" +
-        "varchar|variadic|varying|verbose|version|view|void|volatile|when|where|whitespace|window|" +
-        "with|without|work|wrapper|write|xid|xml|xmlattributes|xmlconcat|xmlelement|xmlexists|" +
-        "xmlforest|xmlparse|xmlpi|xmlroot|xmlserialize|year|yes|zone").split("|")
-    );
-    
-    
-    var builtinFunctions = lang.arrayToMap(
-        ("RI_FKey_cascade_del|RI_FKey_cascade_upd|RI_FKey_check_ins|RI_FKey_check_upd|" +
-        "RI_FKey_noaction_del|RI_FKey_noaction_upd|RI_FKey_restrict_del|RI_FKey_restrict_upd|" +
-        "RI_FKey_setdefault_del|RI_FKey_setdefault_upd|RI_FKey_setnull_del|" +
-        "RI_FKey_setnull_upd|abbrev|abs|abstime|abstimeeq|abstimege|abstimegt|abstimein|abstimele|" +
-        "abstimelt|abstimene|abstimeout|abstimerecv|abstimesend|aclcontains|aclexplode|aclinsert|" +
-        "aclitemeq|aclitemin|aclitemout|aclremove|acos|age|any_in|any_out|anyarray_in|anyarray_out|" +
-        "anyarray_recv|anyarray_send|anyelement_in|anyelement_out|anyenum_in|anyenum_out|" +
-        "anynonarray_in|anynonarray_out|anytextcat|area|areajoinsel|areasel|array_agg|" +
-        "array_agg_finalfn|array_agg_transfn|array_append|array_cat|array_dims|array_eq|" +
-        "array_fill|array_ge|array_gt|array_in|array_larger|array_le|array_length|array_lower|" +
-        "array_lt|array_ndims|array_ne|array_out|array_prepend|array_recv|array_send|" +
-        "array_smaller|array_to_string|array_upper|arraycontained|arraycontains|arrayoverlap|" +
-        "ascii|ascii_to_mic|ascii_to_utf8|asin|atan|atan2|avg|big5_to_euc_tw|big5_to_mic|" +
-        "big5_to_utf8|bit_and|bit_in|bit_length|bit_or|bit_out|bit_recv|bit_send|bitand|bitcat|" +
-        "bitcmp|biteq|bitge|bitgt|bitle|bitlt|bitne|bitnot|bitor|bitshiftleft|bitshiftright|" +
-        "bittypmodin|bittypmodout|bitxor|bool|bool_and|bool_or|booland_statefunc|booleq|boolge|" +
-        "boolgt|boolin|boolle|boollt|boolne|boolor_statefunc|boolout|boolrecv|boolsend|box|" +
-        "box_above|box_above_eq|box_add|box_below|box_below_eq|box_center|box_contain|" +
-        "box_contain_pt|box_contained|box_distance|box_div|box_eq|box_ge|box_gt|box_in|" +
-        "box_intersect|box_le|box_left|box_lt|box_mul|box_out|box_overabove|box_overbelow|" +
-        "box_overlap|box_overleft|box_overright|box_recv|box_right|box_same|box_send|box_sub|" +
-        "bpchar_larger|bpchar_pattern_ge|bpchar_pattern_gt|bpchar_pattern_le|" +
-        "bpchar_pattern_lt|bpchar_smaller|bpcharcmp|bpchareq|bpcharge|bpchargt|bpchariclike|" +
-        "bpcharicnlike|bpcharicregexeq|bpcharicregexne|bpcharin|bpcharle|bpcharlike|bpcharlt|" +
-        "bpcharne|bpcharnlike|bpcharout|bpcharrecv|bpcharregexeq|bpcharregexne|bpcharsend|" +
-        "bpchartypmodin|bpchartypmodout|broadcast|btabstimecmp|btarraycmp|btbeginscan|btboolcmp|" +
-        "btbpchar_pattern_cmp|btbuild|btbuildempty|btbulkdelete|btcharcmp|btcostestimate|" +
-        "btendscan|btfloat48cmp|btfloat4cmp|btfloat84cmp|btfloat8cmp|btgetbitmap|btgettuple|" +
-        "btinsert|btint24cmp|btint28cmp|btint2cmp|btint42cmp|btint48cmp|btint4cmp|btint82cmp|" +
-        "btint84cmp|btint8cmp|btmarkpos|btnamecmp|btoidcmp|btoidvectorcmp|btoptions|btrecordcmp|" +
-        "btreltimecmp|btrescan|btrestrpos|btrim|bttext_pattern_cmp|bttextcmp|bttidcmp|" +
-        "bttintervalcmp|btvacuumcleanup|byteacat|byteacmp|byteaeq|byteage|byteagt|byteain|byteale|" +
-        "bytealike|bytealt|byteane|byteanlike|byteaout|bytearecv|byteasend|cash_cmp|cash_div_cash|" +
-        "cash_div_flt4|cash_div_flt8|cash_div_int2|cash_div_int4|cash_eq|cash_ge|cash_gt|cash_in|" +
-        "cash_le|cash_lt|cash_mi|cash_mul_flt4|cash_mul_flt8|cash_mul_int2|cash_mul_int4|cash_ne|" +
-        "cash_out|cash_pl|cash_recv|cash_send|cash_words|cashlarger|cashsmaller|cbrt|ceil|ceiling|" +
-        "center|char|char_length|character_length|chareq|charge|chargt|charin|charle|charlt|charne|" +
-        "charout|charrecv|charsend|chr|cideq|cidin|cidout|cidr|cidr_in|cidr_out|cidr_recv|cidr_send|" +
-        "cidrecv|cidsend|circle|circle_above|circle_add_pt|circle_below|circle_center|" +
-        "circle_contain|circle_contain_pt|circle_contained|circle_distance|circle_div_pt|" +
-        "circle_eq|circle_ge|circle_gt|circle_in|circle_le|circle_left|circle_lt|circle_mul_pt|" +
-        "circle_ne|circle_out|circle_overabove|circle_overbelow|circle_overlap|circle_overleft|" +
-        "circle_overright|circle_recv|circle_right|circle_same|circle_send|circle_sub_pt|" +
-        "clock_timestamp|close_lb|close_ls|close_lseg|close_pb|close_pl|close_ps|close_sb|" +
-        "close_sl|col_description|concat|concat_ws|contjoinsel|contsel|convert|convert_from|" +
-        "convert_to|corr|cos|cot|count|covar_pop|covar_samp|cstring_in|cstring_out|cstring_recv|" +
-        "cstring_send|cume_dist|current_database|current_query|current_schema|current_schemas|" +
-        "current_setting|current_user|currtid|currtid2|currval|cursor_to_xml|" +
-        "cursor_to_xmlschema|database_to_xml|database_to_xml_and_xmlschema|" +
-        "database_to_xmlschema|date|date_cmp|date_cmp_timestamp|date_cmp_timestamptz|date_eq|" +
-        "date_eq_timestamp|date_eq_timestamptz|date_ge|date_ge_timestamp|date_ge_timestamptz|" +
-        "date_gt|date_gt_timestamp|date_gt_timestamptz|date_in|date_larger|date_le|" +
-        "date_le_timestamp|date_le_timestamptz|date_lt|date_lt_timestamp|date_lt_timestamptz|" +
-        "date_mi|date_mi_interval|date_mii|date_ne|date_ne_timestamp|date_ne_timestamptz|" +
-        "date_out|date_part|date_pl_interval|date_pli|date_recv|date_send|date_smaller|" +
-        "date_trunc|datetime_pl|datetimetz_pl|dcbrt|decode|degrees|dense_rank|dexp|diagonal|" +
-        "diameter|dispell_init|dispell_lexize|dist_cpoly|dist_lb|dist_pb|dist_pc|dist_pl|" +
-        "dist_ppath|dist_ps|dist_sb|dist_sl|div|dlog1|dlog10|domain_in|domain_recv|dpow|dround|" +
-        "dsimple_init|dsimple_lexize|dsnowball_init|dsnowball_lexize|dsqrt|dsynonym_init|" +
-        "dsynonym_lexize|dtrunc|encode|enum_cmp|enum_eq|enum_first|enum_ge|enum_gt|enum_in|" +
-        "enum_larger|enum_last|enum_le|enum_lt|enum_ne|enum_out|enum_range|enum_recv|enum_send|" +
-        "enum_smaller|eqjoinsel|eqsel|euc_cn_to_mic|euc_cn_to_utf8|" +
-        "euc_jis_2004_to_shift_jis_2004|euc_jis_2004_to_utf8|euc_jp_to_mic|euc_jp_to_sjis|" +
-        "euc_jp_to_utf8|euc_kr_to_mic|euc_kr_to_utf8|euc_tw_to_big5|euc_tw_to_mic|" +
-        "euc_tw_to_utf8|every|exp|factorial|family|fdw_handler_in|fdw_handler_out|first_value|" +
-        "float4|float48div|float48eq|float48ge|float48gt|float48le|float48lt|float48mi|float48mul|" +
-        "float48ne|float48pl|float4_accum|float4abs|float4div|float4eq|float4ge|float4gt|float4in|" +
-        "float4larger|float4le|float4lt|float4mi|float4mul|float4ne|float4out|float4pl|float4recv|" +
-        "float4send|float4smaller|float4um|float4up|float8|float84div|float84eq|float84ge|" +
-        "float84gt|float84le|float84lt|float84mi|float84mul|float84ne|float84pl|float8_accum|" +
-        "float8_avg|float8_corr|float8_covar_pop|float8_covar_samp|float8_regr_accum|" +
-        "float8_regr_avgx|float8_regr_avgy|float8_regr_intercept|float8_regr_r2|" +
-        "float8_regr_slope|float8_regr_sxx|float8_regr_sxy|float8_regr_syy|float8_stddev_pop|" +
-        "float8_stddev_samp|float8_var_pop|float8_var_samp|float8abs|float8div|float8eq|" +
-        "float8ge|float8gt|float8in|float8larger|float8le|float8lt|float8mi|float8mul|float8ne|" +
-        "float8out|float8pl|float8recv|float8send|float8smaller|float8um|float8up|floor|" +
-        "flt4_mul_cash|flt8_mul_cash|fmgr_c_validator|fmgr_internal_validator|" +
-        "fmgr_sql_validator|format|format_type|gb18030_to_utf8|gbk_to_utf8|generate_series|" +
-        "generate_subscripts|get_bit|get_byte|get_current_ts_config|getdatabaseencoding|" +
-        "getpgusername|gin_cmp_prefix|gin_cmp_tslexeme|gin_extract_tsquery|" +
-        "gin_extract_tsvector|gin_tsquery_consistent|ginarrayconsistent|ginarrayextract|" +
-        "ginbeginscan|ginbuild|ginbuildempty|ginbulkdelete|gincostestimate|ginendscan|" +
-        "gingetbitmap|gininsert|ginmarkpos|ginoptions|ginqueryarrayextract|ginrescan|" +
-        "ginrestrpos|ginvacuumcleanup|gist_box_compress|gist_box_consistent|" +
-        "gist_box_decompress|gist_box_penalty|gist_box_picksplit|gist_box_same|gist_box_union|" +
-        "gist_circle_compress|gist_circle_consistent|gist_point_compress|" +
-        "gist_point_consistent|gist_point_distance|gist_poly_compress|gist_poly_consistent|" +
-        "gistbeginscan|gistbuild|gistbuildempty|gistbulkdelete|gistcostestimate|gistendscan|" +
-        "gistgetbitmap|gistgettuple|gistinsert|gistmarkpos|gistoptions|gistrescan|gistrestrpos|" +
-        "gistvacuumcleanup|gtsquery_compress|gtsquery_consistent|gtsquery_decompress|" +
-        "gtsquery_penalty|gtsquery_picksplit|gtsquery_same|gtsquery_union|gtsvector_compress|" +
-        "gtsvector_consistent|gtsvector_decompress|gtsvector_penalty|gtsvector_picksplit|" +
-        "gtsvector_same|gtsvector_union|gtsvectorin|gtsvectorout|has_any_column_privilege|" +
-        "has_column_privilege|has_database_privilege|has_foreign_data_wrapper_privilege|" +
-        "has_function_privilege|has_language_privilege|has_schema_privilege|" +
-        "has_sequence_privilege|has_server_privilege|has_table_privilege|" +
-        "has_tablespace_privilege|hash_aclitem|hash_array|hash_numeric|hashbeginscan|" +
-        "hashbpchar|hashbuild|hashbuildempty|hashbulkdelete|hashchar|hashcostestimate|" +
-        "hashendscan|hashenum|hashfloat4|hashfloat8|hashgetbitmap|hashgettuple|hashinet|" +
-        "hashinsert|hashint2|hashint2vector|hashint4|hashint8|hashmacaddr|hashmarkpos|hashname|" +
-        "hashoid|hashoidvector|hashoptions|hashrescan|hashrestrpos|hashtext|hashvacuumcleanup|" +
-        "hashvarlena|height|host|hostmask|iclikejoinsel|iclikesel|icnlikejoinsel|icnlikesel|" +
-        "icregexeqjoinsel|icregexeqsel|icregexnejoinsel|icregexnesel|inet_client_addr|" +
-        "inet_client_port|inet_in|inet_out|inet_recv|inet_send|inet_server_addr|" +
-        "inet_server_port|inetand|inetmi|inetmi_int8|inetnot|inetor|inetpl|initcap|int2|int24div|" +
-        "int24eq|int24ge|int24gt|int24le|int24lt|int24mi|int24mul|int24ne|int24pl|int28div|int28eq|" +
-        "int28ge|int28gt|int28le|int28lt|int28mi|int28mul|int28ne|int28pl|int2_accum|" +
-        "int2_avg_accum|int2_mul_cash|int2_sum|int2abs|int2and|int2div|int2eq|int2ge|int2gt|int2in|" +
-        "int2larger|int2le|int2lt|int2mi|int2mod|int2mul|int2ne|int2not|int2or|int2out|int2pl|" +
-        "int2recv|int2send|int2shl|int2shr|int2smaller|int2um|int2up|int2vectoreq|int2vectorin|" +
-        "int2vectorout|int2vectorrecv|int2vectorsend|int2xor|int4|int42div|int42eq|int42ge|" +
-        "int42gt|int42le|int42lt|int42mi|int42mul|int42ne|int42pl|int48div|int48eq|int48ge|int48gt|" +
-        "int48le|int48lt|int48mi|int48mul|int48ne|int48pl|int4_accum|int4_avg_accum|int4_mul_cash|" +
-        "int4_sum|int4abs|int4and|int4div|int4eq|int4ge|int4gt|int4in|int4inc|int4larger|int4le|" +
-        "int4lt|int4mi|int4mod|int4mul|int4ne|int4not|int4or|int4out|int4pl|int4recv|int4send|" +
-        "int4shl|int4shr|int4smaller|int4um|int4up|int4xor|int8|int82div|int82eq|int82ge|int82gt|" +
-        "int82le|int82lt|int82mi|int82mul|int82ne|int82pl|int84div|int84eq|int84ge|int84gt|int84le|" +
-        "int84lt|int84mi|int84mul|int84ne|int84pl|int8_accum|int8_avg|int8_avg_accum|int8_sum|" +
-        "int8abs|int8and|int8div|int8eq|int8ge|int8gt|int8in|int8inc|int8inc_any|" +
-        "int8inc_float8_float8|int8larger|int8le|int8lt|int8mi|int8mod|int8mul|int8ne|int8not|" +
-        "int8or|int8out|int8pl|int8pl_inet|int8recv|int8send|int8shl|int8shr|int8smaller|int8um|" +
-        "int8up|int8xor|integer_pl_date|inter_lb|inter_sb|inter_sl|internal_in|internal_out|" +
-        "interval_accum|interval_avg|interval_cmp|interval_div|interval_eq|interval_ge|" +
-        "interval_gt|interval_hash|interval_in|interval_larger|interval_le|interval_lt|" +
-        "interval_mi|interval_mul|interval_ne|interval_out|interval_pl|interval_pl_date|" +
-        "interval_pl_time|interval_pl_timestamp|interval_pl_timestamptz|interval_pl_timetz|" +
-        "interval_recv|interval_send|interval_smaller|interval_um|intervaltypmodin|" +
-        "intervaltypmodout|intinterval|isclosed|isfinite|ishorizontal|iso8859_1_to_utf8|" +
-        "iso8859_to_utf8|iso_to_koi8r|iso_to_mic|iso_to_win1251|iso_to_win866|isopen|isparallel|" +
-        "isperp|isvertical|johab_to_utf8|justify_days|justify_hours|justify_interval|" +
-        "koi8r_to_iso|koi8r_to_mic|koi8r_to_utf8|koi8r_to_win1251|koi8r_to_win866|" +
-        "koi8u_to_utf8|lag|language_handler_in|language_handler_out|last_value|lastval|" +
-        "latin1_to_mic|latin2_to_mic|latin2_to_win1250|latin3_to_mic|latin4_to_mic|lead|left|" +
-        "length|like|like_escape|likejoinsel|likesel|line|line_distance|line_eq|line_horizontal|" +
-        "line_in|line_interpt|line_intersect|line_out|line_parallel|line_perp|line_recv|" +
-        "line_send|line_vertical|ln|lo_close|lo_creat|lo_create|lo_export|lo_import|lo_lseek|" +
-        "lo_open|lo_tell|lo_truncate|lo_unlink|log|loread|lower|lowrite|lpad|lseg|lseg_center|" +
-        "lseg_distance|lseg_eq|lseg_ge|lseg_gt|lseg_horizontal|lseg_in|lseg_interpt|" +
-        "lseg_intersect|lseg_le|lseg_length|lseg_lt|lseg_ne|lseg_out|lseg_parallel|lseg_perp|" +
-        "lseg_recv|lseg_send|lseg_vertical|ltrim|macaddr_cmp|macaddr_eq|macaddr_ge|macaddr_gt|" +
-        "macaddr_in|macaddr_le|macaddr_lt|macaddr_ne|macaddr_out|macaddr_recv|macaddr_send|" +
-        "makeaclitem|masklen|max|md5|mic_to_ascii|mic_to_big5|mic_to_euc_cn|mic_to_euc_jp|" +
-        "mic_to_euc_kr|mic_to_euc_tw|mic_to_iso|mic_to_koi8r|mic_to_latin1|mic_to_latin2|" +
-        "mic_to_latin3|mic_to_latin4|mic_to_sjis|mic_to_win1250|mic_to_win1251|mic_to_win866|" +
-        "min|mktinterval|mod|money|mul_d_interval|name|nameeq|namege|namegt|nameiclike|nameicnlike|" +
-        "nameicregexeq|nameicregexne|namein|namele|namelike|namelt|namene|namenlike|nameout|" +
-        "namerecv|nameregexeq|nameregexne|namesend|neqjoinsel|neqsel|netmask|network|network_cmp|" +
-        "network_eq|network_ge|network_gt|network_le|network_lt|network_ne|network_sub|" +
-        "network_subeq|network_sup|network_supeq|nextval|nlikejoinsel|nlikesel|notlike|now|" +
-        "npoints|nth_value|ntile|numeric_abs|numeric_accum|numeric_add|numeric_avg|" +
-        "numeric_avg_accum|numeric_cmp|numeric_div|numeric_div_trunc|numeric_eq|numeric_exp|" +
-        "numeric_fac|numeric_ge|numeric_gt|numeric_in|numeric_inc|numeric_larger|numeric_le|" +
-        "numeric_ln|numeric_log|numeric_lt|numeric_mod|numeric_mul|numeric_ne|numeric_out|" +
-        "numeric_power|numeric_recv|numeric_send|numeric_smaller|numeric_sqrt|" +
-        "numeric_stddev_pop|numeric_stddev_samp|numeric_sub|numeric_uminus|numeric_uplus|" +
-        "numeric_var_pop|numeric_var_samp|numerictypmodin|numerictypmodout|numnode|" +
-        "obj_description|octet_length|oid|oideq|oidge|oidgt|oidin|oidlarger|oidle|oidlt|oidne|oidout|" +
-        "oidrecv|oidsend|oidsmaller|oidvectoreq|oidvectorge|oidvectorgt|oidvectorin|oidvectorle|" +
-        "oidvectorlt|oidvectorne|oidvectorout|oidvectorrecv|oidvectorsend|oidvectortypes|on_pb|" +
-        "on_pl|on_ppath|on_ps|on_sb|on_sl|opaque_in|opaque_out|overlaps|overlay|path|path_add|" +
-        "path_add_pt|path_center|path_contain_pt|path_distance|path_div_pt|path_in|path_inter|" +
-        "path_length|path_mul_pt|path_n_eq|path_n_ge|path_n_gt|path_n_le|path_n_lt|path_npoints|" +
-        "path_out|path_recv|path_send|path_sub_pt|pclose|percent_rank|pg_advisory_lock|" +
-        "pg_advisory_lock_shared|pg_advisory_unlock|pg_advisory_unlock_all|" +
-        "pg_advisory_unlock_shared|pg_advisory_xact_lock|pg_advisory_xact_lock_shared|" +
-        "pg_available_extension_versions|pg_available_extensions|pg_backend_pid|" +
-        "pg_cancel_backend|pg_char_to_encoding|pg_client_encoding|pg_collation_is_visible|" +
-        "pg_column_size|pg_conf_load_time|pg_conversion_is_visible|pg_create_restore_point|" +
-        "pg_current_xlog_insert_location|pg_current_xlog_location|pg_cursor|pg_database_size|" +
-        "pg_describe_object|pg_encoding_max_length|pg_encoding_to_char|" +
-        "pg_extension_config_dump|pg_extension_update_paths|pg_function_is_visible|" +
-        "pg_get_constraintdef|pg_get_expr|pg_get_function_arguments|" +
-        "pg_get_function_identity_arguments|pg_get_function_result|pg_get_functiondef|" +
-        "pg_get_indexdef|pg_get_keywords|pg_get_ruledef|pg_get_serial_sequence|" +
-        "pg_get_triggerdef|pg_get_userbyid|pg_get_viewdef|pg_has_role|pg_indexes_size|" +
-        "pg_is_in_recovery|pg_is_other_temp_schema|pg_is_xlog_replay_paused|" +
-        "pg_last_xact_replay_timestamp|pg_last_xlog_receive_location|" +
-        "pg_last_xlog_replay_location|pg_listening_channels|pg_lock_status|pg_ls_dir|" +
-        "pg_my_temp_schema|pg_node_tree_in|pg_node_tree_out|pg_node_tree_recv|" +
-        "pg_node_tree_send|pg_notify|pg_opclass_is_visible|pg_operator_is_visible|" +
-        "pg_options_to_table|pg_postmaster_start_time|pg_prepared_statement|pg_prepared_xact|" +
-        "pg_read_binary_file|pg_read_file|pg_relation_filenode|pg_relation_filepath|" +
-        "pg_relation_size|pg_reload_conf|pg_rotate_logfile|pg_sequence_parameters|" +
-        "pg_show_all_settings|pg_size_pretty|pg_sleep|pg_start_backup|pg_stat_clear_snapshot|" +
-        "pg_stat_file|pg_stat_get_activity|pg_stat_get_analyze_count|" +
-        "pg_stat_get_autoanalyze_count|pg_stat_get_autovacuum_count|" +
-        "pg_stat_get_backend_activity|pg_stat_get_backend_activity_start|" +
-        "pg_stat_get_backend_client_addr|pg_stat_get_backend_client_port|" +
-        "pg_stat_get_backend_dbid|pg_stat_get_backend_idset|pg_stat_get_backend_pid|" +
-        "pg_stat_get_backend_start|pg_stat_get_backend_userid|pg_stat_get_backend_waiting|" +
-        "pg_stat_get_backend_xact_start|pg_stat_get_bgwriter_buf_written_checkpoints|" +
-        "pg_stat_get_bgwriter_buf_written_clean|pg_stat_get_bgwriter_maxwritten_clean|" +
-        "pg_stat_get_bgwriter_requested_checkpoints|pg_stat_get_bgwriter_stat_reset_time|" +
-        "pg_stat_get_bgwriter_timed_checkpoints|pg_stat_get_blocks_fetched|" +
-        "pg_stat_get_blocks_hit|pg_stat_get_buf_alloc|pg_stat_get_buf_fsync_backend|" +
-        "pg_stat_get_buf_written_backend|pg_stat_get_db_blocks_fetched|" +
-        "pg_stat_get_db_blocks_hit|pg_stat_get_db_conflict_all|" +
-        "pg_stat_get_db_conflict_bufferpin|pg_stat_get_db_conflict_lock|" +
-        "pg_stat_get_db_conflict_snapshot|pg_stat_get_db_conflict_startup_deadlock|" +
-        "pg_stat_get_db_conflict_tablespace|pg_stat_get_db_numbackends|" +
-        "pg_stat_get_db_stat_reset_time|pg_stat_get_db_tuples_deleted|" +
-        "pg_stat_get_db_tuples_fetched|pg_stat_get_db_tuples_inserted|" +
-        "pg_stat_get_db_tuples_returned|pg_stat_get_db_tuples_updated|" +
-        "pg_stat_get_db_xact_commit|pg_stat_get_db_xact_rollback|pg_stat_get_dead_tuples|" +
-        "pg_stat_get_function_calls|pg_stat_get_function_self_time|" +
-        "pg_stat_get_function_time|pg_stat_get_last_analyze_time|" +
-        "pg_stat_get_last_autoanalyze_time|pg_stat_get_last_autovacuum_time|" +
-        "pg_stat_get_last_vacuum_time|pg_stat_get_live_tuples|pg_stat_get_numscans|" +
-        "pg_stat_get_tuples_deleted|pg_stat_get_tuples_fetched|" +
-        "pg_stat_get_tuples_hot_updated|pg_stat_get_tuples_inserted|" +
-        "pg_stat_get_tuples_returned|pg_stat_get_tuples_updated|pg_stat_get_vacuum_count|" +
-        "pg_stat_get_wal_senders|pg_stat_get_xact_blocks_fetched|" +
-        "pg_stat_get_xact_blocks_hit|pg_stat_get_xact_function_calls|" +
-        "pg_stat_get_xact_function_self_time|pg_stat_get_xact_function_time|" +
-        "pg_stat_get_xact_numscans|pg_stat_get_xact_tuples_deleted|" +
-        "pg_stat_get_xact_tuples_fetched|pg_stat_get_xact_tuples_hot_updated|" +
-        "pg_stat_get_xact_tuples_inserted|pg_stat_get_xact_tuples_returned|" +
-        "pg_stat_get_xact_tuples_updated|pg_stat_reset|pg_stat_reset_shared|" +
-        "pg_stat_reset_single_function_counters|pg_stat_reset_single_table_counters|" +
-        "pg_stop_backup|pg_switch_xlog|pg_table_is_visible|pg_table_size|" +
-        "pg_tablespace_databases|pg_tablespace_size|pg_terminate_backend|pg_timezone_abbrevs|" +
-        "pg_timezone_names|pg_total_relation_size|pg_try_advisory_lock|" +
-        "pg_try_advisory_lock_shared|pg_try_advisory_xact_lock|" +
-        "pg_try_advisory_xact_lock_shared|pg_ts_config_is_visible|pg_ts_dict_is_visible|" +
-        "pg_ts_parser_is_visible|pg_ts_template_is_visible|pg_type_is_visible|pg_typeof|" +
-        "pg_xlog_replay_pause|pg_xlog_replay_resume|pg_xlogfile_name|pg_xlogfile_name_offset|" +
-        "pi|plainto_tsquery|plpgsql_call_handler|plpgsql_inline_handler|plpgsql_validator|" +
-        "point|point_above|point_add|point_below|point_distance|point_div|point_eq|point_horiz|" +
-        "point_in|point_left|point_mul|point_ne|point_out|point_recv|point_right|point_send|" +
-        "point_sub|point_vert|poly_above|poly_below|poly_center|poly_contain|poly_contain_pt|" +
-        "poly_contained|poly_distance|poly_in|poly_left|poly_npoints|poly_out|poly_overabove|" +
-        "poly_overbelow|poly_overlap|poly_overleft|poly_overright|poly_recv|poly_right|" +
-        "poly_same|poly_send|polygon|popen|position|positionjoinsel|positionsel|" +
-        "postgresql_fdw_validator|pow|power|prsd_end|prsd_headline|prsd_lextype|prsd_nexttoken|" +
-        "prsd_start|pt_contained_circle|pt_contained_poly|query_to_xml|" +
-        "query_to_xml_and_xmlschema|query_to_xmlschema|querytree|quote_ident|quote_literal|" +
-        "quote_nullable|radians|radius|random|rank|record_eq|record_ge|record_gt|record_in|" +
-        "record_le|record_lt|record_ne|record_out|record_recv|record_send|regclass|regclassin|" +
-        "regclassout|regclassrecv|regclasssend|regconfigin|regconfigout|regconfigrecv|" +
-        "regconfigsend|regdictionaryin|regdictionaryout|regdictionaryrecv|regdictionarysend|" +
-        "regexeqjoinsel|regexeqsel|regexnejoinsel|regexnesel|regexp_matches|regexp_replace|" +
-        "regexp_split_to_array|regexp_split_to_table|regoperatorin|regoperatorout|" +
-        "regoperatorrecv|regoperatorsend|regoperin|regoperout|regoperrecv|regopersend|" +
-        "regprocedurein|regprocedureout|regprocedurerecv|regproceduresend|regprocin|regprocout|" +
-        "regprocrecv|regprocsend|regr_avgx|regr_avgy|regr_count|regr_intercept|regr_r2|" +
-        "regr_slope|regr_sxx|regr_sxy|regr_syy|regtypein|regtypeout|regtyperecv|regtypesend|" +
-        "reltime|reltimeeq|reltimege|reltimegt|reltimein|reltimele|reltimelt|reltimene|reltimeout|" +
-        "reltimerecv|reltimesend|repeat|replace|reverse|right|round|row_number|rpad|rtrim|" +
-        "scalargtjoinsel|scalargtsel|scalarltjoinsel|scalarltsel|schema_to_xml|" +
-        "schema_to_xml_and_xmlschema|schema_to_xmlschema|session_user|set_bit|set_byte|" +
-        "set_config|set_masklen|setseed|setval|setweight|shell_in|shell_out|" +
-        "shift_jis_2004_to_euc_jis_2004|shift_jis_2004_to_utf8|shobj_description|sign|" +
-        "similar_escape|sin|sjis_to_euc_jp|sjis_to_mic|sjis_to_utf8|slope|smgreq|smgrin|smgrne|" +
-        "smgrout|split_part|sqrt|statement_timestamp|stddev|stddev_pop|stddev_samp|string_agg|" +
-        "string_agg_finalfn|string_agg_transfn|string_to_array|strip|strpos|substr|substring|sum|" +
-        "suppress_redundant_updates_trigger|table_to_xml|table_to_xml_and_xmlschema|" +
-        "table_to_xmlschema|tan|text|text_ge|text_gt|text_larger|text_le|text_lt|text_pattern_ge|" +
-        "text_pattern_gt|text_pattern_le|text_pattern_lt|text_smaller|textanycat|textcat|texteq|" +
-        "texticlike|texticnlike|texticregexeq|texticregexne|textin|textlen|textlike|textne|" +
-        "textnlike|textout|textrecv|textregexeq|textregexne|textsend|thesaurus_init|" +
-        "thesaurus_lexize|tideq|tidge|tidgt|tidin|tidlarger|tidle|tidlt|tidne|tidout|tidrecv|tidsend|" +
-        "tidsmaller|time_cmp|time_eq|time_ge|time_gt|time_hash|time_in|time_larger|time_le|time_lt|" +
-        "time_mi_interval|time_mi_time|time_ne|time_out|time_pl_interval|time_recv|time_send|" +
-        "time_smaller|timedate_pl|timemi|timenow|timeofday|timepl|timestamp_cmp|" +
-        "timestamp_cmp_date|timestamp_cmp_timestamptz|timestamp_eq|timestamp_eq_date|" +
-        "timestamp_eq_timestamptz|timestamp_ge|timestamp_ge_date|timestamp_ge_timestamptz|" +
-        "timestamp_gt|timestamp_gt_date|timestamp_gt_timestamptz|timestamp_hash|timestamp_in|" +
-        "timestamp_larger|timestamp_le|timestamp_le_date|timestamp_le_timestamptz|" +
-        "timestamp_lt|timestamp_lt_date|timestamp_lt_timestamptz|timestamp_mi|" +
-        "timestamp_mi_interval|timestamp_ne|timestamp_ne_date|timestamp_ne_timestamptz|" +
-        "timestamp_out|timestamp_pl_interval|timestamp_recv|timestamp_send|timestamp_smaller|" +
-        "timestamptypmodin|timestamptypmodout|timestamptz_cmp|timestamptz_cmp_date|" +
-        "timestamptz_cmp_timestamp|timestamptz_eq|timestamptz_eq_date|" +
-        "timestamptz_eq_timestamp|timestamptz_ge|timestamptz_ge_date|" +
-        "timestamptz_ge_timestamp|timestamptz_gt|timestamptz_gt_date|" +
-        "timestamptz_gt_timestamp|timestamptz_in|timestamptz_larger|timestamptz_le|" +
-        "timestamptz_le_date|timestamptz_le_timestamp|timestamptz_lt|timestamptz_lt_date|" +
-        "timestamptz_lt_timestamp|timestamptz_mi|timestamptz_mi_interval|timestamptz_ne|" +
-        "timestamptz_ne_date|timestamptz_ne_timestamp|timestamptz_out|" +
-        "timestamptz_pl_interval|timestamptz_recv|timestamptz_send|timestamptz_smaller|" +
-        "timestamptztypmodin|timestamptztypmodout|timetypmodin|timetypmodout|timetz_cmp|" +
-        "timetz_eq|timetz_ge|timetz_gt|timetz_hash|timetz_in|timetz_larger|timetz_le|timetz_lt|" +
-        "timetz_mi_interval|timetz_ne|timetz_out|timetz_pl_interval|timetz_recv|timetz_send|" +
-        "timetz_smaller|timetzdate_pl|timetztypmodin|timetztypmodout|timezone|tinterval|" +
-        "tintervalct|tintervalend|tintervaleq|tintervalge|tintervalgt|tintervalin|tintervalle|" +
-        "tintervalleneq|tintervallenge|tintervallengt|tintervallenle|tintervallenlt|" +
-        "tintervallenne|tintervallt|tintervalne|tintervalout|tintervalov|tintervalrecv|" +
-        "tintervalrel|tintervalsame|tintervalsend|tintervalstart|to_ascii|to_char|to_date|to_hex|" +
-        "to_number|to_timestamp|to_tsquery|to_tsvector|transaction_timestamp|translate|" +
-        "trigger_in|trigger_out|trunc|ts_debug|ts_headline|ts_lexize|ts_match_qv|ts_match_tq|" +
-        "ts_match_tt|ts_match_vq|ts_parse|ts_rank|ts_rank_cd|ts_rewrite|ts_stat|ts_token_type|" +
-        "ts_typanalyze|tsmatchjoinsel|tsmatchsel|tsq_mcontained|tsq_mcontains|tsquery_and|" +
-        "tsquery_cmp|tsquery_eq|tsquery_ge|tsquery_gt|tsquery_le|tsquery_lt|tsquery_ne|" +
-        "tsquery_not|tsquery_or|tsqueryin|tsqueryout|tsqueryrecv|tsquerysend|tsvector_cmp|" +
-        "tsvector_concat|tsvector_eq|tsvector_ge|tsvector_gt|tsvector_le|tsvector_lt|" +
-        "tsvector_ne|tsvector_update_trigger|tsvector_update_trigger_column|tsvectorin|" +
-        "tsvectorout|tsvectorrecv|tsvectorsend|txid_current|txid_current_snapshot|" +
-        "txid_snapshot_in|txid_snapshot_out|txid_snapshot_recv|txid_snapshot_send|" +
-        "txid_snapshot_xip|txid_snapshot_xmax|txid_snapshot_xmin|txid_visible_in_snapshot|" +
-        "uhc_to_utf8|unique_key_recheck|unknownin|unknownout|unknownrecv|unknownsend|unnest|" +
-        "upper|utf8_to_ascii|utf8_to_big5|utf8_to_euc_cn|utf8_to_euc_jis_2004|utf8_to_euc_jp|" +
-        "utf8_to_euc_kr|utf8_to_euc_tw|utf8_to_gb18030|utf8_to_gbk|utf8_to_iso8859|" +
-        "utf8_to_iso8859_1|utf8_to_johab|utf8_to_koi8r|utf8_to_koi8u|utf8_to_shift_jis_2004|" +
-        "utf8_to_sjis|utf8_to_uhc|utf8_to_win|uuid_cmp|uuid_eq|uuid_ge|uuid_gt|uuid_hash|uuid_in|" +
-        "uuid_le|uuid_lt|uuid_ne|uuid_out|uuid_recv|uuid_send|var_pop|var_samp|varbit_in|" +
-        "varbit_out|varbit_recv|varbit_send|varbitcmp|varbiteq|varbitge|varbitgt|varbitle|" +
-        "varbitlt|varbitne|varbittypmodin|varbittypmodout|varcharin|varcharout|varcharrecv|" +
-        "varcharsend|varchartypmodin|varchartypmodout|variance|version|void_in|void_out|" +
-        "void_recv|void_send|width|width_bucket|win1250_to_latin2|win1250_to_mic|win1251_to_iso|" +
-        "win1251_to_koi8r|win1251_to_mic|win1251_to_win866|win866_to_iso|win866_to_koi8r|" +
-        "win866_to_mic|win866_to_win1251|win_to_utf8|xideq|xideqint4|xidin|xidout|xidrecv|xidsend|" +
-        "xml|xml_in|xml_is_well_formed|xml_is_well_formed_content|xml_is_well_formed_document|" +
-        "xml_out|xml_recv|xml_send|xmlagg|xmlcomment|xmlconcat2|xmlexists|xmlvalidate|xpath|" +
-        "xpath_exists").split("|")
-    );
-    
-    var sqlRules = [
-        {
-            token : "string", // single line string -- assume dollar strings if multi-line for now
-            regex : "['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"
-        }, {
-            token : "variable.language", // pg identifier
-            regex : '".*?"'
-        }, {
-            token : "constant.numeric", // float
-            regex : "[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"
-        }, {
-            token : function(value) {
-                value = value.toLowerCase();
-                if (keywords.hasOwnProperty(value)) {
-                    return "keyword";
-                } else if (builtinFunctions.hasOwnProperty(value)) {
-                    return "support.function";
-                } else {
-                    return "identifier";
-                }
-              },
-              regex : "[a-zA-Z_][a-zA-Z0-9_$]*\\b" // TODO - Unicode in identifiers
-          }, {
-              token : "keyword.operator",
-              regex : "!|!!|!~|!~\\*|!~~|!~~\\*|#|##|#<|#<=|#<>|#=|#>|#>=|%|\\&|\\&\\&|\\&<|\\&<\\||\\&>|\\*|\\+|" +
-                      "\\-|/|<|<#>|<\\->|<<|<<=|<<\\||<=|<>|<\\?>|<@|<\\^|=|>|>=|>>|>>=|>\\^|\\?#|\\?\\-|\\?\\-\\||" +
-                      "\\?\\||\\?\\|\\||@|@\\-@|@>|@@|@@@|\\^|\\||\\|\\&>|\\|/|\\|>>|\\|\\||\\|\\|/|~|~\\*|~<=~|~<~|" +
-                      "~=|~>=~|~>~|~~|~~\\*"
-          }, {
-              token : "lparen.paren",
-              regex : "[\\(]"
-          }, {
-              token : "paren.rparen",
-              regex : "[\\)]"
-          }, {
-              token : "text",
-              regex : "\\s+"
-          }
-    ];
-           
-
-    this.$rules = {
-        "start" : [
-            {
-                token : "comment",
-                regex : "--.*$"
-            }, 
-            new DocCommentHighlightRules().getStartRule("doc-start"),
-            {
-                token : "comment", // multi-line comment
-                merge : true,
-                regex : "\\/\\*",
-                next : "comment"
-            },{
-                token : "keyword.statementBegin",
-                regex : "^[a-zA-Z]+", // Could enumerate starting keywords but this allows things to work when new statements are added.
-                next : "statement"
-            },{
-                token : "support.buildin", // psql directive
-                regex : "^\\\\[\\S]+.*$"
-            }
-        ],
-        
-        "statement" : [
-            {
-                token : "comment",
-                regex : "--.*$"
-            }, {
-                token : "comment", // multi-line comment
-                merge : true,
-                regex : "\\/\\*",
-                next : "commentStatement"
-            }, {
-                token : "statementEnd",
-                regex : ";",
-                next : "start"
-            }, {
-                token : "string", // perl, python, tcl are in the pg default dist (no tcl highlighter)
-                regex : "\\$perl\\$",
-                next : "perl-start"
-            }, {
-                token : "string",
-                regex : "\\$python\\$",
-                next : "python-start"
-            },{
-                token : "string",
-                regex : "\\$[\\w_0-9]*\\$$", // dollar quote at the end of a line
-                next : "dollarSql"
-            }, {
-                token : "string",
-                regex : "\\$[\\w_0-9]*\\$",
-                next : "dollarStatementString"
-            }
-        ].concat(sqlRules),
-        
-        "dollarSql" : [
-            {
-                token : "comment",
-                regex : "--.*$"
-            }, {
-                token : "comment", // multi-line comment
-                merge : true,
-                regex : "\\/\\*",
-                next : "commentDollarSql"
-            }, {
-                token : "string", // end quoting with dollar at the start of a line
-                regex : "^\\$[\\w_0-9]*\\$",
-                next : "statement"
-            }, {
-                token : "string",
-                regex : "\\$[\\w_0-9]*\\$",
-                next : "dollarSqlString"
-            }
-        ].concat(sqlRules),
-        
-        "comment" : [
-            {
-                token : "comment", // closing comment
-                regex : ".*?\\*\\/",
-                next : "start"
-            }, {
-                token : "comment", // comment spanning whole line
-                merge : true,
-                regex : ".+"
-            }
-        ],
-        
-        "commentStatement" : [
-            {
-                token : "comment", // closing comment
-                regex : ".*?\\*\\/",
-                next : "statement"
-            }, {
-                token : "comment", // comment spanning whole line
-                merge : true,
-                regex : ".+"
-            }
-        ],
-        
-        "commentDollarSql" : [
-            {
-                token : "comment", // closing comment
-                regex : ".*?\\*\\/",
-                next : "dollarSql"
-            }, {
-                token : "comment", // comment spanning whole line
-                merge : true,
-                regex : ".+"
-            }
-        ],
-        
-        "dollarStatementString" : [
-            {
-                token : "string", // closing dollarstring
-                regex : ".*?\\$[\\w_0-9]*\\$",
-                next : "statement"
-            }, {
-                token : "string", // dollarstring spanning whole line
-                merge : true,
-                regex : ".+"
-            }
-        ],
-        
-        "dollarSqlString" : [
-            {
-                token : "string", // closing dollarstring
-                regex : ".*?\\$[\\w_0-9]*\\$",
-                next : "dollarSql"
-            }, {
-                token : "string", // dollarstring spanning whole line
-                merge : true,
-                regex : ".+"
-            }
-        ]
-    };
-    
-    this.embedRules(DocCommentHighlightRules, "doc-", [ new DocCommentHighlightRules().getEndRule("start") ]);
-    this.embedRules(PerlHighlightRules, "perl-", [{token : "string", regex : "\\$perl\\$", next : "statement"}]);
-    this.embedRules(PythonHighlightRules, "python-", [{token : "string", regex : "\\$python\\$", next : "statement"}]);
-};
-
-oop.inherits(PgsqlHighlightRules, TextHighlightRules);
-
-exports.PgsqlHighlightRules = PgsqlHighlightRules;
-});
-
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/doc_comment_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-
-var DocCommentHighlightRules = function() {
-
-    this.$rules = {
-        "start" : [ {
-            token : "comment.doc.tag",
-            regex : "@[\\w\\d_]+" // TODO: fix email addresses
-        }, {
-            token : "comment.doc",
-            merge : true,
-            regex : "\\s+"
-        }, {
-            token : "comment.doc",
-            merge : true,
-            regex : "TODO"
-        }, {
-            token : "comment.doc",
-            merge : true,
-            regex : "[^@\\*]+"
-        }, {
-            token : "comment.doc",
-            merge : true,
-            regex : "."
-        }]
-    };
-};
-
-oop.inherits(DocCommentHighlightRules, TextHighlightRules);
-
-(function() {
-
-    this.getStartRule = function(start) {
-        return {
-            token : "comment.doc", // doc comment
-            merge : true,
-            regex : "\\/\\*(?=\\*)",
-            next  : start
-        };
-    };
-    
-    this.getEndRule = function (start) {
-        return {
-            token : "comment.doc", // closing comment
-            merge : true,
-            regex : "\\*\\/",
-            next  : start
-        };
-    };
-
-}).call(DocCommentHighlightRules.prototype);
-
-exports.DocCommentHighlightRules = DocCommentHighlightRules;
-
-});
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Panagiotis Astithas <pastith AT gmail DOT com>
- *
- * 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 ***** */
-
-define('ace/mode/perl_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/lang', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var lang = require("../lib/lang");
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-
-var PerlHighlightRules = function() {
-
-    var keywords = lang.arrayToMap(
-        ("base|constant|continue|else|elsif|for|foreach|format|goto|if|last|local|my|next|" +
-         "no|package|parent|redo|require|scalar|sub|unless|until|while|use|vars").split("|")
-    );
-
-    var buildinConstants = lang.arrayToMap(
-        ("ARGV|ENV|INC|SIG").split("|")
-    );
-
-    var builtinFunctions = lang.arrayToMap(
-        ("getprotobynumber|getprotobyname|getservbyname|gethostbyaddr|" +
-         "gethostbyname|getservbyport|getnetbyaddr|getnetbyname|getsockname|" +
-         "getpeername|setpriority|getprotoent|setprotoent|getpriority|" +
-         "endprotoent|getservent|setservent|endservent|sethostent|socketpair|" +
-         "getsockopt|gethostent|endhostent|setsockopt|setnetent|quotemeta|" +
-         "localtime|prototype|getnetent|endnetent|rewinddir|wantarray|getpwuid|" +
-         "closedir|getlogin|readlink|endgrent|getgrgid|getgrnam|shmwrite|" +
-         "shutdown|readline|endpwent|setgrent|readpipe|formline|truncate|" +
-         "dbmclose|syswrite|setpwent|getpwnam|getgrent|getpwent|ucfirst|sysread|" +
-         "setpgrp|shmread|sysseek|sysopen|telldir|defined|opendir|connect|" +
-         "lcfirst|getppid|binmode|syscall|sprintf|getpgrp|readdir|seekdir|" +
-         "waitpid|reverse|unshift|symlink|dbmopen|semget|msgrcv|rename|listen|" +
-         "chroot|msgsnd|shmctl|accept|unpack|exists|fileno|shmget|system|" +
-         "unlink|printf|gmtime|msgctl|semctl|values|rindex|substr|splice|" +
-         "length|msgget|select|socket|return|caller|delete|alarm|ioctl|index|" +
-         "undef|lstat|times|srand|chown|fcntl|close|write|umask|rmdir|study|" +
-         "sleep|chomp|untie|print|utime|mkdir|atan2|split|crypt|flock|chmod|" +
-         "BEGIN|bless|chdir|semop|shift|reset|link|stat|chop|grep|fork|dump|" +
-         "join|open|tell|pipe|exit|glob|warn|each|bind|sort|pack|eval|push|" +
-         "keys|getc|kill|seek|sqrt|send|wait|rand|tied|read|time|exec|recv|" +
-         "eof|chr|int|ord|exp|pos|pop|sin|log|abs|oct|hex|tie|cos|vec|END|ref|" +
-         "map|die|uc|lc|do").split("|")
-    );
-
-    // regexp must not have capturing parentheses. Use (?:) instead.
-    // regexps are ordered -> the first match is used
-
-    this.$rules = {
-        "start" : [
-            {
-                token : "comment",
-                regex : "#.*$"
-            }, {
-                token : "string.regexp",
-                regex : "[/](?:(?:\\[(?:\\\\]|[^\\]])+\\])|(?:\\\\/|[^\\]/]))*[/]\\w*\\s*(?=[).,;]|$)"
-            }, {
-                token : "string", // single line
-                regex : '["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'
-            }, {
-                token : "string", // multi line string start
-                merge : true,
-                regex : '["].*\\\\$',
-                next : "qqstring"
-            }, {
-                token : "string", // single line
-                regex : "['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"
-            }, {
-                token : "string", // multi line string start
-                merge : true,
-                regex : "['].*\\\\$",
-                next : "qstring"
-            }, {
-                token : "constant.numeric", // hex
-                regex : "0x[0-9a-fA-F]+\\b"
-            }, {
-                token : "constant.numeric", // float
-                regex : "[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"
-            }, {
-                token : function(value) {
-                    if (keywords.hasOwnProperty(value))
-                        return "keyword";
-                    else if (buildinConstants.hasOwnProperty(value))
-                        return "constant.language";
-                    else if (builtinFunctions.hasOwnProperty(value))
-                        return "support.function";
-                    else
-                        return "identifier";
-                },
-                regex : "[a-zA-Z_$][a-zA-Z0-9_$]*\\b"
-            }, {
-                token : "keyword.operator",
-                regex : "\\.\\.\\.|\\|\\|=|>>=|<<=|<=>|&&=|=>|!~|\\^=|&=|\\|=|\\.=|x=|%=|\\/=|\\*=|\\-=|\\+=|=~|\\*\\*|\\-\\-|\\.\\.|\\|\\||&&|\\+\\+|\\->|!=|==|>=|<=|>>|<<|,|=|\\?\\:|\\^|\\||x|%|\\/|\\*|<|&|\\\\|~|!|>|\\.|\\-|\\+|\\-C|\\-b|\\-S|\\-u|\\-t|\\-p|\\-l|\\-d|\\-f|\\-g|\\-s|\\-z|\\-k|\\-e|\\-O|\\-T|\\-B|\\-M|\\-A|\\-X|\\-W|\\-c|\\-R|\\-o|\\-x|\\-w|\\-r|\\b(?:and|cmp|eq|ge|gt|le|lt|ne|not|or|xor)"
-            }, {
-                token : "lparen",
-                regex : "[[({]"
-            }, {
-                token : "rparen",
-                regex : "[\\])}]"
-            }, {
-                token : "text",
-                regex : "\\s+"
-            }
-        ],
-        "qqstring" : [
-            {
-                token : "string",
-                regex : '(?:(?:\\\\.)|(?:[^"\\\\]))*?"',
-                next : "start"
-            }, {
-                token : "string",
-                merge : true,
-                regex : '.+'
-            }
-        ],
-        "qstring" : [
-            {
-                token : "string",
-                regex : "(?:(?:\\\\.)|(?:[^'\\\\]))*?'",
-                next : "start"
-            }, {
-                token : "string",
-                merge : true,
-                regex : '.+'
-            }
-        ]
-    };
-};
-
-oop.inherits(PerlHighlightRules, TextHighlightRules);
-
-exports.PerlHighlightRules = PerlHighlightRules;
-});
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *      Colin Gourlay <colin DOT j DOT gourlay AT gmail DOT com>
- *
- * 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 *****
- *
- * TODO: python delimiters
- */
-
-define('ace/mode/python_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/lang', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var lang = require("../lib/lang");
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-
-var PythonHighlightRules = function() {
-
-    var keywords = lang.arrayToMap(
-        ("and|as|assert|break|class|continue|def|del|elif|else|except|exec|" +
-        "finally|for|from|global|if|import|in|is|lambda|not|or|pass|print|" +
-        "raise|return|try|while|with|yield").split("|")
-    );
-
-    var builtinConstants = lang.arrayToMap(
-        ("True|False|None|NotImplemented|Ellipsis|__debug__").split("|")
-    );
-
-    var builtinFunctions = lang.arrayToMap(
-        ("abs|divmod|input|open|staticmethod|all|enumerate|int|ord|str|any|" +
-        "eval|isinstance|pow|sum|basestring|execfile|issubclass|print|super|" +
-        "binfile|iter|property|tuple|bool|filter|len|range|type|bytearray|" +
-        "float|list|raw_input|unichr|callable|format|locals|reduce|unicode|" +
-        "chr|frozenset|long|reload|vars|classmethod|getattr|map|repr|xrange|" +
-        "cmp|globals|max|reversed|zip|compile|hasattr|memoryview|round|" +
-        "__import__|complex|hash|min|set|apply|delattr|help|next|setattr|" +
-        "buffer|dict|hex|object|slice|coerce|dir|id|oct|sorted|intern").split("|")
-    );
-
-    var futureReserved = lang.arrayToMap(
-        ("").split("|")
-    );
-
-    var strPre = "(?:r|u|ur|R|U|UR|Ur|uR)?";
-
-    var decimalInteger = "(?:(?:[1-9]\\d*)|(?:0))";
-    var octInteger = "(?:0[oO]?[0-7]+)";
-    var hexInteger = "(?:0[xX][\\dA-Fa-f]+)";
-    var binInteger = "(?:0[bB][01]+)";
-    var integer = "(?:" + decimalInteger + "|" + octInteger + "|" + hexInteger + "|" + binInteger + ")";
-
-    var exponent = "(?:[eE][+-]?\\d+)";
-    var fraction = "(?:\\.\\d+)";
-    var intPart = "(?:\\d+)";
-    var pointFloat = "(?:(?:" + intPart + "?" + fraction + ")|(?:" + intPart + "\\.))";
-    var exponentFloat = "(?:(?:" + pointFloat + "|" +  intPart + ")" + exponent + ")";
-    var floatNumber = "(?:" + exponentFloat + "|" + pointFloat + ")";
-
-    this.$rules = {
-        "start" : [ {
-            token : "comment",
-            regex : "#.*$"
-        }, {
-            token : "string",           // """ string
-            regex : strPre + '"{3}(?:[^\\\\]|\\\\.)*?"{3}'
-        }, {
-            token : "string",           // multi line """ string start
-            merge : true,
-            regex : strPre + '"{3}.*$',
-            next : "qqstring"
-        }, {
-            token : "string",           // " string
-            regex : strPre + '"(?:[^\\\\]|\\\\.)*?"'
-        }, {
-            token : "string",           // ''' string
-            regex : strPre + "'{3}(?:[^\\\\]|\\\\.)*?'{3}"
-        }, {
-            token : "string",           // multi line ''' string start
-            merge : true,
-            regex : strPre + "'{3}.*$",
-            next : "qstring"
-        }, {
-            token : "string",           // ' string
-            regex : strPre + "'(?:[^\\\\]|\\\\.)*?'"
-        }, {
-            token : "constant.numeric", // imaginary
-            regex : "(?:" + floatNumber + "|\\d+)[jJ]\\b"
-        }, {
-            token : "constant.numeric", // float
-            regex : floatNumber
-        }, {
-            token : "constant.numeric", // long integer
-            regex : integer + "[lL]\\b"
-        }, {
-            token : "constant.numeric", // integer
-            regex : integer + "\\b"
-        }, {
-            token : function(value) {
-                if (keywords.hasOwnProperty(value))
-                    return "keyword";
-                else if (builtinConstants.hasOwnProperty(value))
-                    return "constant.language";
-                else if (futureReserved.hasOwnProperty(value))
-                    return "invalid.illegal";
-                else if (builtinFunctions.hasOwnProperty(value))
-                    return "support.function";
-                else if (value == "debugger")
-                    return "invalid.deprecated";
-                else
-                    return "identifier";
-            },
-            regex : "[a-zA-Z_$][a-zA-Z0-9_$]*\\b"
-        }, {
-            token : "keyword.operator",
-            regex : "\\+|\\-|\\*|\\*\\*|\\/|\\/\\/|%|<<|>>|&|\\||\\^|~|<|>|<=|=>|==|!=|<>|="
-        }, {
-            token : "lparen.paren",
-            regex : "[\\[\\(\\{]"
-        }, {
-            token : "paren.rparen",
-            regex : "[\\]\\)\\}]"
-        }, {
-            token : "text",
-            regex : "\\s+"
-        } ],
-        "qqstring" : [ {
-            token : "string", // multi line """ string end
-            regex : '(?:[^\\\\]|\\\\.)*?"{3}',
-            next : "start"
-        }, {
-            token : "string",
-            merge : true,
-            regex : '.+'
-        } ],
-        "qstring" : [ {
-            token : "string",  // multi line ''' string end
-            regex : "(?:[^\\\\]|\\\\.)*?'{3}",
-            next : "start"
-        }, {
-            token : "string",
-            merge : true,
-            regex : '.+'
-        } ]
-    };
-};
-
-oop.inherits(PythonHighlightRules, TextHighlightRules);
-
-exports.PythonHighlightRules = PythonHighlightRules;
-});
diff --git a/apps/files_texteditor/js/aceeditor/mode-pgsql.js b/apps/files_texteditor/js/aceeditor/mode-pgsql.js
deleted file mode 100644
index 12a02277af..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-pgsql.js
+++ /dev/null
@@ -1 +0,0 @@
-define("ace/mode/pgsql",["require","exports","module","ace/lib/oop","ace/mode/text","ace/tokenizer","ace/mode/pgsql_highlight_rules","ace/range"],function(a,b,c){var d=a("ace/lib/oop"),e=a("ace/mode/text").Mode,f=a("ace/tokenizer").Tokenizer,g=a("ace/mode/pgsql_highlight_rules").PgsqlHighlightRules,h=a("ace/range").Range,i=function(){this.$tokenizer=new f((new g).getRules())};d.inherits(i,e),function(){this.toggleCommentLines=function(a,b,c,d){var e=!0,f=/^(\s*)--/;for(var g=c;g<=d;g++)if(!f.test(b.getLine(g))){e=!1;break}if(e){var i=new h(0,0,0,0);for(var g=c;g<=d;g++){var j=b.getLine(g),k=j.match(f);i.start.row=g,i.end.row=g,i.end.column=k[0].length,b.replace(i,k[1])}}else b.indentRows(c,d,"--")},this.getNextLineIndent=function(a,b,c){return a=="start"||a=="keyword.statementEnd"?"":this.$getIndent(b)}}.call(i.prototype),b.Mode=i}),define("ace/mode/pgsql_highlight_rules",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/mode/doc_comment_highlight_rules","ace/mode/text_highlight_rules","ace/mode/perl_highlight_rules","ace/mode/python_highlight_rules"],function(a,b,c){var d=a("ace/lib/oop"),e=a("ace/lib/lang"),f=a("./doc_comment_highlight_rules").DocCommentHighlightRules,g=a("./text_highlight_rules").TextHighlightRules,h=a("./perl_highlight_rules").PerlHighlightRules,i=a("./python_highlight_rules").PythonHighlightRules,j=function(){var a=e.arrayToMap("abort|absolute|abstime|access|aclitem|action|add|admin|after|aggregate|all|also|alter|always|analyse|analyze|and|any|anyarray|anyelement|anyenum|anynonarray|array|as|asc|assertion|assignment|asymmetric|at|attribute|authorization|backward|before|begin|between|bigint|binary|bit|bool|boolean|both|box|bpchar|by|bytea|cache|called|cascade|cascaded|case|cast|catalog|chain|char|character|characteristics|check|checkpoint|cid|cidr|circle|class|close|cluster|coalesce|collate|collation|column|comment|comments|commit|committed|concurrently|configuration|connection|constraint|constraints|content|continue|conversion|copy|cost|create|cross|cstring|csv|current|current_catalog|current_date|current_role|current_schema|current_time|current_timestamp|current_user|cursor|cycle|data|database|date|day|deallocate|dec|decimal|declare|default|defaults|deferrable|deferred|definer|delete|delimiter|delimiters|desc|dictionary|disable|discard|distinct|do|document|domain|double|drop|each|else|enable|encoding|encrypted|end|enum|escape|except|exclude|excluding|exclusive|execute|exists|explain|extension|external|extract|false|family|fdw_handler|fetch|first|float|float4|float8|following|for|force|foreign|forward|freeze|from|full|function|functions|global|grant|granted|greatest|group|gtsvector|handler|having|header|hold|hour|identity|if|ilike|immediate|immutable|implicit|in|including|increment|index|indexes|inet|inherit|inherits|initially|inline|inner|inout|input|insensitive|insert|instead|int|int2|int2vector|int4|int8|integer|internal|intersect|interval|into|invoker|is|isnull|isolation|join|key|label|language|language_handler|large|last|lc_collate|lc_ctype|leading|least|left|level|like|limit|line|listen|load|local|localtime|localtimestamp|location|lock|lseg|macaddr|mapping|match|maxvalue|minute|minvalue|mode|money|month|move|name|names|national|natural|nchar|next|no|none|not|nothing|notify|notnull|nowait|null|nullif|nulls|numeric|object|of|off|offset|oid|oids|oidvector|on|only|opaque|operator|option|options|or|order|out|outer|over|overlaps|overlay|owned|owner|parser|partial|partition|passing|password|path|pg_attribute|pg_auth_members|pg_authid|pg_class|pg_database|pg_node_tree|pg_proc|pg_type|placing|plans|point|polygon|position|preceding|precision|prepare|prepared|preserve|primary|prior|privileges|procedural|procedure|quote|range|read|real|reassign|recheck|record|recursive|ref|refcursor|references|regclass|regconfig|regdictionary|regoper|regoperator|regproc|regprocedure|regtype|reindex|relative|release|reltime|rename|repeatable|replace|replica|reset|restart|restrict|returning|returns|revoke|right|role|rollback|row|rows|rule|savepoint|schema|scroll|search|second|security|select|sequence|sequences|serializable|server|session|session_user|set|setof|share|show|similar|simple|smallint|smgr|some|stable|standalone|start|statement|statistics|stdin|stdout|storage|strict|strip|substring|symmetric|sysid|system|table|tables|tablespace|temp|template|temporary|text|then|tid|time|timestamp|timestamptz|timetz|tinterval|to|trailing|transaction|treat|trigger|trim|true|truncate|trusted|tsquery|tsvector|txid_snapshot|type|unbounded|uncommitted|unencrypted|union|unique|unknown|unlisten|unlogged|until|update|user|using|uuid|vacuum|valid|validate|validator|value|values|varbit|varchar|variadic|varying|verbose|version|view|void|volatile|when|where|whitespace|window|with|without|work|wrapper|write|xid|xml|xmlattributes|xmlconcat|xmlelement|xmlexists|xmlforest|xmlparse|xmlpi|xmlroot|xmlserialize|year|yes|zone".split("|")),b=e.arrayToMap("RI_FKey_cascade_del|RI_FKey_cascade_upd|RI_FKey_check_ins|RI_FKey_check_upd|RI_FKey_noaction_del|RI_FKey_noaction_upd|RI_FKey_restrict_del|RI_FKey_restrict_upd|RI_FKey_setdefault_del|RI_FKey_setdefault_upd|RI_FKey_setnull_del|RI_FKey_setnull_upd|abbrev|abs|abstime|abstimeeq|abstimege|abstimegt|abstimein|abstimele|abstimelt|abstimene|abstimeout|abstimerecv|abstimesend|aclcontains|aclexplode|aclinsert|aclitemeq|aclitemin|aclitemout|aclremove|acos|age|any_in|any_out|anyarray_in|anyarray_out|anyarray_recv|anyarray_send|anyelement_in|anyelement_out|anyenum_in|anyenum_out|anynonarray_in|anynonarray_out|anytextcat|area|areajoinsel|areasel|array_agg|array_agg_finalfn|array_agg_transfn|array_append|array_cat|array_dims|array_eq|array_fill|array_ge|array_gt|array_in|array_larger|array_le|array_length|array_lower|array_lt|array_ndims|array_ne|array_out|array_prepend|array_recv|array_send|array_smaller|array_to_string|array_upper|arraycontained|arraycontains|arrayoverlap|ascii|ascii_to_mic|ascii_to_utf8|asin|atan|atan2|avg|big5_to_euc_tw|big5_to_mic|big5_to_utf8|bit_and|bit_in|bit_length|bit_or|bit_out|bit_recv|bit_send|bitand|bitcat|bitcmp|biteq|bitge|bitgt|bitle|bitlt|bitne|bitnot|bitor|bitshiftleft|bitshiftright|bittypmodin|bittypmodout|bitxor|bool|bool_and|bool_or|booland_statefunc|booleq|boolge|boolgt|boolin|boolle|boollt|boolne|boolor_statefunc|boolout|boolrecv|boolsend|box|box_above|box_above_eq|box_add|box_below|box_below_eq|box_center|box_contain|box_contain_pt|box_contained|box_distance|box_div|box_eq|box_ge|box_gt|box_in|box_intersect|box_le|box_left|box_lt|box_mul|box_out|box_overabove|box_overbelow|box_overlap|box_overleft|box_overright|box_recv|box_right|box_same|box_send|box_sub|bpchar_larger|bpchar_pattern_ge|bpchar_pattern_gt|bpchar_pattern_le|bpchar_pattern_lt|bpchar_smaller|bpcharcmp|bpchareq|bpcharge|bpchargt|bpchariclike|bpcharicnlike|bpcharicregexeq|bpcharicregexne|bpcharin|bpcharle|bpcharlike|bpcharlt|bpcharne|bpcharnlike|bpcharout|bpcharrecv|bpcharregexeq|bpcharregexne|bpcharsend|bpchartypmodin|bpchartypmodout|broadcast|btabstimecmp|btarraycmp|btbeginscan|btboolcmp|btbpchar_pattern_cmp|btbuild|btbuildempty|btbulkdelete|btcharcmp|btcostestimate|btendscan|btfloat48cmp|btfloat4cmp|btfloat84cmp|btfloat8cmp|btgetbitmap|btgettuple|btinsert|btint24cmp|btint28cmp|btint2cmp|btint42cmp|btint48cmp|btint4cmp|btint82cmp|btint84cmp|btint8cmp|btmarkpos|btnamecmp|btoidcmp|btoidvectorcmp|btoptions|btrecordcmp|btreltimecmp|btrescan|btrestrpos|btrim|bttext_pattern_cmp|bttextcmp|bttidcmp|bttintervalcmp|btvacuumcleanup|byteacat|byteacmp|byteaeq|byteage|byteagt|byteain|byteale|bytealike|bytealt|byteane|byteanlike|byteaout|bytearecv|byteasend|cash_cmp|cash_div_cash|cash_div_flt4|cash_div_flt8|cash_div_int2|cash_div_int4|cash_eq|cash_ge|cash_gt|cash_in|cash_le|cash_lt|cash_mi|cash_mul_flt4|cash_mul_flt8|cash_mul_int2|cash_mul_int4|cash_ne|cash_out|cash_pl|cash_recv|cash_send|cash_words|cashlarger|cashsmaller|cbrt|ceil|ceiling|center|char|char_length|character_length|chareq|charge|chargt|charin|charle|charlt|charne|charout|charrecv|charsend|chr|cideq|cidin|cidout|cidr|cidr_in|cidr_out|cidr_recv|cidr_send|cidrecv|cidsend|circle|circle_above|circle_add_pt|circle_below|circle_center|circle_contain|circle_contain_pt|circle_contained|circle_distance|circle_div_pt|circle_eq|circle_ge|circle_gt|circle_in|circle_le|circle_left|circle_lt|circle_mul_pt|circle_ne|circle_out|circle_overabove|circle_overbelow|circle_overlap|circle_overleft|circle_overright|circle_recv|circle_right|circle_same|circle_send|circle_sub_pt|clock_timestamp|close_lb|close_ls|close_lseg|close_pb|close_pl|close_ps|close_sb|close_sl|col_description|concat|concat_ws|contjoinsel|contsel|convert|convert_from|convert_to|corr|cos|cot|count|covar_pop|covar_samp|cstring_in|cstring_out|cstring_recv|cstring_send|cume_dist|current_database|current_query|current_schema|current_schemas|current_setting|current_user|currtid|currtid2|currval|cursor_to_xml|cursor_to_xmlschema|database_to_xml|database_to_xml_and_xmlschema|database_to_xmlschema|date|date_cmp|date_cmp_timestamp|date_cmp_timestamptz|date_eq|date_eq_timestamp|date_eq_timestamptz|date_ge|date_ge_timestamp|date_ge_timestamptz|date_gt|date_gt_timestamp|date_gt_timestamptz|date_in|date_larger|date_le|date_le_timestamp|date_le_timestamptz|date_lt|date_lt_timestamp|date_lt_timestamptz|date_mi|date_mi_interval|date_mii|date_ne|date_ne_timestamp|date_ne_timestamptz|date_out|date_part|date_pl_interval|date_pli|date_recv|date_send|date_smaller|date_trunc|datetime_pl|datetimetz_pl|dcbrt|decode|degrees|dense_rank|dexp|diagonal|diameter|dispell_init|dispell_lexize|dist_cpoly|dist_lb|dist_pb|dist_pc|dist_pl|dist_ppath|dist_ps|dist_sb|dist_sl|div|dlog1|dlog10|domain_in|domain_recv|dpow|dround|dsimple_init|dsimple_lexize|dsnowball_init|dsnowball_lexize|dsqrt|dsynonym_init|dsynonym_lexize|dtrunc|encode|enum_cmp|enum_eq|enum_first|enum_ge|enum_gt|enum_in|enum_larger|enum_last|enum_le|enum_lt|enum_ne|enum_out|enum_range|enum_recv|enum_send|enum_smaller|eqjoinsel|eqsel|euc_cn_to_mic|euc_cn_to_utf8|euc_jis_2004_to_shift_jis_2004|euc_jis_2004_to_utf8|euc_jp_to_mic|euc_jp_to_sjis|euc_jp_to_utf8|euc_kr_to_mic|euc_kr_to_utf8|euc_tw_to_big5|euc_tw_to_mic|euc_tw_to_utf8|every|exp|factorial|family|fdw_handler_in|fdw_handler_out|first_value|float4|float48div|float48eq|float48ge|float48gt|float48le|float48lt|float48mi|float48mul|float48ne|float48pl|float4_accum|float4abs|float4div|float4eq|float4ge|float4gt|float4in|float4larger|float4le|float4lt|float4mi|float4mul|float4ne|float4out|float4pl|float4recv|float4send|float4smaller|float4um|float4up|float8|float84div|float84eq|float84ge|float84gt|float84le|float84lt|float84mi|float84mul|float84ne|float84pl|float8_accum|float8_avg|float8_corr|float8_covar_pop|float8_covar_samp|float8_regr_accum|float8_regr_avgx|float8_regr_avgy|float8_regr_intercept|float8_regr_r2|float8_regr_slope|float8_regr_sxx|float8_regr_sxy|float8_regr_syy|float8_stddev_pop|float8_stddev_samp|float8_var_pop|float8_var_samp|float8abs|float8div|float8eq|float8ge|float8gt|float8in|float8larger|float8le|float8lt|float8mi|float8mul|float8ne|float8out|float8pl|float8recv|float8send|float8smaller|float8um|float8up|floor|flt4_mul_cash|flt8_mul_cash|fmgr_c_validator|fmgr_internal_validator|fmgr_sql_validator|format|format_type|gb18030_to_utf8|gbk_to_utf8|generate_series|generate_subscripts|get_bit|get_byte|get_current_ts_config|getdatabaseencoding|getpgusername|gin_cmp_prefix|gin_cmp_tslexeme|gin_extract_tsquery|gin_extract_tsvector|gin_tsquery_consistent|ginarrayconsistent|ginarrayextract|ginbeginscan|ginbuild|ginbuildempty|ginbulkdelete|gincostestimate|ginendscan|gingetbitmap|gininsert|ginmarkpos|ginoptions|ginqueryarrayextract|ginrescan|ginrestrpos|ginvacuumcleanup|gist_box_compress|gist_box_consistent|gist_box_decompress|gist_box_penalty|gist_box_picksplit|gist_box_same|gist_box_union|gist_circle_compress|gist_circle_consistent|gist_point_compress|gist_point_consistent|gist_point_distance|gist_poly_compress|gist_poly_consistent|gistbeginscan|gistbuild|gistbuildempty|gistbulkdelete|gistcostestimate|gistendscan|gistgetbitmap|gistgettuple|gistinsert|gistmarkpos|gistoptions|gistrescan|gistrestrpos|gistvacuumcleanup|gtsquery_compress|gtsquery_consistent|gtsquery_decompress|gtsquery_penalty|gtsquery_picksplit|gtsquery_same|gtsquery_union|gtsvector_compress|gtsvector_consistent|gtsvector_decompress|gtsvector_penalty|gtsvector_picksplit|gtsvector_same|gtsvector_union|gtsvectorin|gtsvectorout|has_any_column_privilege|has_column_privilege|has_database_privilege|has_foreign_data_wrapper_privilege|has_function_privilege|has_language_privilege|has_schema_privilege|has_sequence_privilege|has_server_privilege|has_table_privilege|has_tablespace_privilege|hash_aclitem|hash_array|hash_numeric|hashbeginscan|hashbpchar|hashbuild|hashbuildempty|hashbulkdelete|hashchar|hashcostestimate|hashendscan|hashenum|hashfloat4|hashfloat8|hashgetbitmap|hashgettuple|hashinet|hashinsert|hashint2|hashint2vector|hashint4|hashint8|hashmacaddr|hashmarkpos|hashname|hashoid|hashoidvector|hashoptions|hashrescan|hashrestrpos|hashtext|hashvacuumcleanup|hashvarlena|height|host|hostmask|iclikejoinsel|iclikesel|icnlikejoinsel|icnlikesel|icregexeqjoinsel|icregexeqsel|icregexnejoinsel|icregexnesel|inet_client_addr|inet_client_port|inet_in|inet_out|inet_recv|inet_send|inet_server_addr|inet_server_port|inetand|inetmi|inetmi_int8|inetnot|inetor|inetpl|initcap|int2|int24div|int24eq|int24ge|int24gt|int24le|int24lt|int24mi|int24mul|int24ne|int24pl|int28div|int28eq|int28ge|int28gt|int28le|int28lt|int28mi|int28mul|int28ne|int28pl|int2_accum|int2_avg_accum|int2_mul_cash|int2_sum|int2abs|int2and|int2div|int2eq|int2ge|int2gt|int2in|int2larger|int2le|int2lt|int2mi|int2mod|int2mul|int2ne|int2not|int2or|int2out|int2pl|int2recv|int2send|int2shl|int2shr|int2smaller|int2um|int2up|int2vectoreq|int2vectorin|int2vectorout|int2vectorrecv|int2vectorsend|int2xor|int4|int42div|int42eq|int42ge|int42gt|int42le|int42lt|int42mi|int42mul|int42ne|int42pl|int48div|int48eq|int48ge|int48gt|int48le|int48lt|int48mi|int48mul|int48ne|int48pl|int4_accum|int4_avg_accum|int4_mul_cash|int4_sum|int4abs|int4and|int4div|int4eq|int4ge|int4gt|int4in|int4inc|int4larger|int4le|int4lt|int4mi|int4mod|int4mul|int4ne|int4not|int4or|int4out|int4pl|int4recv|int4send|int4shl|int4shr|int4smaller|int4um|int4up|int4xor|int8|int82div|int82eq|int82ge|int82gt|int82le|int82lt|int82mi|int82mul|int82ne|int82pl|int84div|int84eq|int84ge|int84gt|int84le|int84lt|int84mi|int84mul|int84ne|int84pl|int8_accum|int8_avg|int8_avg_accum|int8_sum|int8abs|int8and|int8div|int8eq|int8ge|int8gt|int8in|int8inc|int8inc_any|int8inc_float8_float8|int8larger|int8le|int8lt|int8mi|int8mod|int8mul|int8ne|int8not|int8or|int8out|int8pl|int8pl_inet|int8recv|int8send|int8shl|int8shr|int8smaller|int8um|int8up|int8xor|integer_pl_date|inter_lb|inter_sb|inter_sl|internal_in|internal_out|interval_accum|interval_avg|interval_cmp|interval_div|interval_eq|interval_ge|interval_gt|interval_hash|interval_in|interval_larger|interval_le|interval_lt|interval_mi|interval_mul|interval_ne|interval_out|interval_pl|interval_pl_date|interval_pl_time|interval_pl_timestamp|interval_pl_timestamptz|interval_pl_timetz|interval_recv|interval_send|interval_smaller|interval_um|intervaltypmodin|intervaltypmodout|intinterval|isclosed|isfinite|ishorizontal|iso8859_1_to_utf8|iso8859_to_utf8|iso_to_koi8r|iso_to_mic|iso_to_win1251|iso_to_win866|isopen|isparallel|isperp|isvertical|johab_to_utf8|justify_days|justify_hours|justify_interval|koi8r_to_iso|koi8r_to_mic|koi8r_to_utf8|koi8r_to_win1251|koi8r_to_win866|koi8u_to_utf8|lag|language_handler_in|language_handler_out|last_value|lastval|latin1_to_mic|latin2_to_mic|latin2_to_win1250|latin3_to_mic|latin4_to_mic|lead|left|length|like|like_escape|likejoinsel|likesel|line|line_distance|line_eq|line_horizontal|line_in|line_interpt|line_intersect|line_out|line_parallel|line_perp|line_recv|line_send|line_vertical|ln|lo_close|lo_creat|lo_create|lo_export|lo_import|lo_lseek|lo_open|lo_tell|lo_truncate|lo_unlink|log|loread|lower|lowrite|lpad|lseg|lseg_center|lseg_distance|lseg_eq|lseg_ge|lseg_gt|lseg_horizontal|lseg_in|lseg_interpt|lseg_intersect|lseg_le|lseg_length|lseg_lt|lseg_ne|lseg_out|lseg_parallel|lseg_perp|lseg_recv|lseg_send|lseg_vertical|ltrim|macaddr_cmp|macaddr_eq|macaddr_ge|macaddr_gt|macaddr_in|macaddr_le|macaddr_lt|macaddr_ne|macaddr_out|macaddr_recv|macaddr_send|makeaclitem|masklen|max|md5|mic_to_ascii|mic_to_big5|mic_to_euc_cn|mic_to_euc_jp|mic_to_euc_kr|mic_to_euc_tw|mic_to_iso|mic_to_koi8r|mic_to_latin1|mic_to_latin2|mic_to_latin3|mic_to_latin4|mic_to_sjis|mic_to_win1250|mic_to_win1251|mic_to_win866|min|mktinterval|mod|money|mul_d_interval|name|nameeq|namege|namegt|nameiclike|nameicnlike|nameicregexeq|nameicregexne|namein|namele|namelike|namelt|namene|namenlike|nameout|namerecv|nameregexeq|nameregexne|namesend|neqjoinsel|neqsel|netmask|network|network_cmp|network_eq|network_ge|network_gt|network_le|network_lt|network_ne|network_sub|network_subeq|network_sup|network_supeq|nextval|nlikejoinsel|nlikesel|notlike|now|npoints|nth_value|ntile|numeric_abs|numeric_accum|numeric_add|numeric_avg|numeric_avg_accum|numeric_cmp|numeric_div|numeric_div_trunc|numeric_eq|numeric_exp|numeric_fac|numeric_ge|numeric_gt|numeric_in|numeric_inc|numeric_larger|numeric_le|numeric_ln|numeric_log|numeric_lt|numeric_mod|numeric_mul|numeric_ne|numeric_out|numeric_power|numeric_recv|numeric_send|numeric_smaller|numeric_sqrt|numeric_stddev_pop|numeric_stddev_samp|numeric_sub|numeric_uminus|numeric_uplus|numeric_var_pop|numeric_var_samp|numerictypmodin|numerictypmodout|numnode|obj_description|octet_length|oid|oideq|oidge|oidgt|oidin|oidlarger|oidle|oidlt|oidne|oidout|oidrecv|oidsend|oidsmaller|oidvectoreq|oidvectorge|oidvectorgt|oidvectorin|oidvectorle|oidvectorlt|oidvectorne|oidvectorout|oidvectorrecv|oidvectorsend|oidvectortypes|on_pb|on_pl|on_ppath|on_ps|on_sb|on_sl|opaque_in|opaque_out|overlaps|overlay|path|path_add|path_add_pt|path_center|path_contain_pt|path_distance|path_div_pt|path_in|path_inter|path_length|path_mul_pt|path_n_eq|path_n_ge|path_n_gt|path_n_le|path_n_lt|path_npoints|path_out|path_recv|path_send|path_sub_pt|pclose|percent_rank|pg_advisory_lock|pg_advisory_lock_shared|pg_advisory_unlock|pg_advisory_unlock_all|pg_advisory_unlock_shared|pg_advisory_xact_lock|pg_advisory_xact_lock_shared|pg_available_extension_versions|pg_available_extensions|pg_backend_pid|pg_cancel_backend|pg_char_to_encoding|pg_client_encoding|pg_collation_is_visible|pg_column_size|pg_conf_load_time|pg_conversion_is_visible|pg_create_restore_point|pg_current_xlog_insert_location|pg_current_xlog_location|pg_cursor|pg_database_size|pg_describe_object|pg_encoding_max_length|pg_encoding_to_char|pg_extension_config_dump|pg_extension_update_paths|pg_function_is_visible|pg_get_constraintdef|pg_get_expr|pg_get_function_arguments|pg_get_function_identity_arguments|pg_get_function_result|pg_get_functiondef|pg_get_indexdef|pg_get_keywords|pg_get_ruledef|pg_get_serial_sequence|pg_get_triggerdef|pg_get_userbyid|pg_get_viewdef|pg_has_role|pg_indexes_size|pg_is_in_recovery|pg_is_other_temp_schema|pg_is_xlog_replay_paused|pg_last_xact_replay_timestamp|pg_last_xlog_receive_location|pg_last_xlog_replay_location|pg_listening_channels|pg_lock_status|pg_ls_dir|pg_my_temp_schema|pg_node_tree_in|pg_node_tree_out|pg_node_tree_recv|pg_node_tree_send|pg_notify|pg_opclass_is_visible|pg_operator_is_visible|pg_options_to_table|pg_postmaster_start_time|pg_prepared_statement|pg_prepared_xact|pg_read_binary_file|pg_read_file|pg_relation_filenode|pg_relation_filepath|pg_relation_size|pg_reload_conf|pg_rotate_logfile|pg_sequence_parameters|pg_show_all_settings|pg_size_pretty|pg_sleep|pg_start_backup|pg_stat_clear_snapshot|pg_stat_file|pg_stat_get_activity|pg_stat_get_analyze_count|pg_stat_get_autoanalyze_count|pg_stat_get_autovacuum_count|pg_stat_get_backend_activity|pg_stat_get_backend_activity_start|pg_stat_get_backend_client_addr|pg_stat_get_backend_client_port|pg_stat_get_backend_dbid|pg_stat_get_backend_idset|pg_stat_get_backend_pid|pg_stat_get_backend_start|pg_stat_get_backend_userid|pg_stat_get_backend_waiting|pg_stat_get_backend_xact_start|pg_stat_get_bgwriter_buf_written_checkpoints|pg_stat_get_bgwriter_buf_written_clean|pg_stat_get_bgwriter_maxwritten_clean|pg_stat_get_bgwriter_requested_checkpoints|pg_stat_get_bgwriter_stat_reset_time|pg_stat_get_bgwriter_timed_checkpoints|pg_stat_get_blocks_fetched|pg_stat_get_blocks_hit|pg_stat_get_buf_alloc|pg_stat_get_buf_fsync_backend|pg_stat_get_buf_written_backend|pg_stat_get_db_blocks_fetched|pg_stat_get_db_blocks_hit|pg_stat_get_db_conflict_all|pg_stat_get_db_conflict_bufferpin|pg_stat_get_db_conflict_lock|pg_stat_get_db_conflict_snapshot|pg_stat_get_db_conflict_startup_deadlock|pg_stat_get_db_conflict_tablespace|pg_stat_get_db_numbackends|pg_stat_get_db_stat_reset_time|pg_stat_get_db_tuples_deleted|pg_stat_get_db_tuples_fetched|pg_stat_get_db_tuples_inserted|pg_stat_get_db_tuples_returned|pg_stat_get_db_tuples_updated|pg_stat_get_db_xact_commit|pg_stat_get_db_xact_rollback|pg_stat_get_dead_tuples|pg_stat_get_function_calls|pg_stat_get_function_self_time|pg_stat_get_function_time|pg_stat_get_last_analyze_time|pg_stat_get_last_autoanalyze_time|pg_stat_get_last_autovacuum_time|pg_stat_get_last_vacuum_time|pg_stat_get_live_tuples|pg_stat_get_numscans|pg_stat_get_tuples_deleted|pg_stat_get_tuples_fetched|pg_stat_get_tuples_hot_updated|pg_stat_get_tuples_inserted|pg_stat_get_tuples_returned|pg_stat_get_tuples_updated|pg_stat_get_vacuum_count|pg_stat_get_wal_senders|pg_stat_get_xact_blocks_fetched|pg_stat_get_xact_blocks_hit|pg_stat_get_xact_function_calls|pg_stat_get_xact_function_self_time|pg_stat_get_xact_function_time|pg_stat_get_xact_numscans|pg_stat_get_xact_tuples_deleted|pg_stat_get_xact_tuples_fetched|pg_stat_get_xact_tuples_hot_updated|pg_stat_get_xact_tuples_inserted|pg_stat_get_xact_tuples_returned|pg_stat_get_xact_tuples_updated|pg_stat_reset|pg_stat_reset_shared|pg_stat_reset_single_function_counters|pg_stat_reset_single_table_counters|pg_stop_backup|pg_switch_xlog|pg_table_is_visible|pg_table_size|pg_tablespace_databases|pg_tablespace_size|pg_terminate_backend|pg_timezone_abbrevs|pg_timezone_names|pg_total_relation_size|pg_try_advisory_lock|pg_try_advisory_lock_shared|pg_try_advisory_xact_lock|pg_try_advisory_xact_lock_shared|pg_ts_config_is_visible|pg_ts_dict_is_visible|pg_ts_parser_is_visible|pg_ts_template_is_visible|pg_type_is_visible|pg_typeof|pg_xlog_replay_pause|pg_xlog_replay_resume|pg_xlogfile_name|pg_xlogfile_name_offset|pi|plainto_tsquery|plpgsql_call_handler|plpgsql_inline_handler|plpgsql_validator|point|point_above|point_add|point_below|point_distance|point_div|point_eq|point_horiz|point_in|point_left|point_mul|point_ne|point_out|point_recv|point_right|point_send|point_sub|point_vert|poly_above|poly_below|poly_center|poly_contain|poly_contain_pt|poly_contained|poly_distance|poly_in|poly_left|poly_npoints|poly_out|poly_overabove|poly_overbelow|poly_overlap|poly_overleft|poly_overright|poly_recv|poly_right|poly_same|poly_send|polygon|popen|position|positionjoinsel|positionsel|postgresql_fdw_validator|pow|power|prsd_end|prsd_headline|prsd_lextype|prsd_nexttoken|prsd_start|pt_contained_circle|pt_contained_poly|query_to_xml|query_to_xml_and_xmlschema|query_to_xmlschema|querytree|quote_ident|quote_literal|quote_nullable|radians|radius|random|rank|record_eq|record_ge|record_gt|record_in|record_le|record_lt|record_ne|record_out|record_recv|record_send|regclass|regclassin|regclassout|regclassrecv|regclasssend|regconfigin|regconfigout|regconfigrecv|regconfigsend|regdictionaryin|regdictionaryout|regdictionaryrecv|regdictionarysend|regexeqjoinsel|regexeqsel|regexnejoinsel|regexnesel|regexp_matches|regexp_replace|regexp_split_to_array|regexp_split_to_table|regoperatorin|regoperatorout|regoperatorrecv|regoperatorsend|regoperin|regoperout|regoperrecv|regopersend|regprocedurein|regprocedureout|regprocedurerecv|regproceduresend|regprocin|regprocout|regprocrecv|regprocsend|regr_avgx|regr_avgy|regr_count|regr_intercept|regr_r2|regr_slope|regr_sxx|regr_sxy|regr_syy|regtypein|regtypeout|regtyperecv|regtypesend|reltime|reltimeeq|reltimege|reltimegt|reltimein|reltimele|reltimelt|reltimene|reltimeout|reltimerecv|reltimesend|repeat|replace|reverse|right|round|row_number|rpad|rtrim|scalargtjoinsel|scalargtsel|scalarltjoinsel|scalarltsel|schema_to_xml|schema_to_xml_and_xmlschema|schema_to_xmlschema|session_user|set_bit|set_byte|set_config|set_masklen|setseed|setval|setweight|shell_in|shell_out|shift_jis_2004_to_euc_jis_2004|shift_jis_2004_to_utf8|shobj_description|sign|similar_escape|sin|sjis_to_euc_jp|sjis_to_mic|sjis_to_utf8|slope|smgreq|smgrin|smgrne|smgrout|split_part|sqrt|statement_timestamp|stddev|stddev_pop|stddev_samp|string_agg|string_agg_finalfn|string_agg_transfn|string_to_array|strip|strpos|substr|substring|sum|suppress_redundant_updates_trigger|table_to_xml|table_to_xml_and_xmlschema|table_to_xmlschema|tan|text|text_ge|text_gt|text_larger|text_le|text_lt|text_pattern_ge|text_pattern_gt|text_pattern_le|text_pattern_lt|text_smaller|textanycat|textcat|texteq|texticlike|texticnlike|texticregexeq|texticregexne|textin|textlen|textlike|textne|textnlike|textout|textrecv|textregexeq|textregexne|textsend|thesaurus_init|thesaurus_lexize|tideq|tidge|tidgt|tidin|tidlarger|tidle|tidlt|tidne|tidout|tidrecv|tidsend|tidsmaller|time_cmp|time_eq|time_ge|time_gt|time_hash|time_in|time_larger|time_le|time_lt|time_mi_interval|time_mi_time|time_ne|time_out|time_pl_interval|time_recv|time_send|time_smaller|timedate_pl|timemi|timenow|timeofday|timepl|timestamp_cmp|timestamp_cmp_date|timestamp_cmp_timestamptz|timestamp_eq|timestamp_eq_date|timestamp_eq_timestamptz|timestamp_ge|timestamp_ge_date|timestamp_ge_timestamptz|timestamp_gt|timestamp_gt_date|timestamp_gt_timestamptz|timestamp_hash|timestamp_in|timestamp_larger|timestamp_le|timestamp_le_date|timestamp_le_timestamptz|timestamp_lt|timestamp_lt_date|timestamp_lt_timestamptz|timestamp_mi|timestamp_mi_interval|timestamp_ne|timestamp_ne_date|timestamp_ne_timestamptz|timestamp_out|timestamp_pl_interval|timestamp_recv|timestamp_send|timestamp_smaller|timestamptypmodin|timestamptypmodout|timestamptz_cmp|timestamptz_cmp_date|timestamptz_cmp_timestamp|timestamptz_eq|timestamptz_eq_date|timestamptz_eq_timestamp|timestamptz_ge|timestamptz_ge_date|timestamptz_ge_timestamp|timestamptz_gt|timestamptz_gt_date|timestamptz_gt_timestamp|timestamptz_in|timestamptz_larger|timestamptz_le|timestamptz_le_date|timestamptz_le_timestamp|timestamptz_lt|timestamptz_lt_date|timestamptz_lt_timestamp|timestamptz_mi|timestamptz_mi_interval|timestamptz_ne|timestamptz_ne_date|timestamptz_ne_timestamp|timestamptz_out|timestamptz_pl_interval|timestamptz_recv|timestamptz_send|timestamptz_smaller|timestamptztypmodin|timestamptztypmodout|timetypmodin|timetypmodout|timetz_cmp|timetz_eq|timetz_ge|timetz_gt|timetz_hash|timetz_in|timetz_larger|timetz_le|timetz_lt|timetz_mi_interval|timetz_ne|timetz_out|timetz_pl_interval|timetz_recv|timetz_send|timetz_smaller|timetzdate_pl|timetztypmodin|timetztypmodout|timezone|tinterval|tintervalct|tintervalend|tintervaleq|tintervalge|tintervalgt|tintervalin|tintervalle|tintervalleneq|tintervallenge|tintervallengt|tintervallenle|tintervallenlt|tintervallenne|tintervallt|tintervalne|tintervalout|tintervalov|tintervalrecv|tintervalrel|tintervalsame|tintervalsend|tintervalstart|to_ascii|to_char|to_date|to_hex|to_number|to_timestamp|to_tsquery|to_tsvector|transaction_timestamp|translate|trigger_in|trigger_out|trunc|ts_debug|ts_headline|ts_lexize|ts_match_qv|ts_match_tq|ts_match_tt|ts_match_vq|ts_parse|ts_rank|ts_rank_cd|ts_rewrite|ts_stat|ts_token_type|ts_typanalyze|tsmatchjoinsel|tsmatchsel|tsq_mcontained|tsq_mcontains|tsquery_and|tsquery_cmp|tsquery_eq|tsquery_ge|tsquery_gt|tsquery_le|tsquery_lt|tsquery_ne|tsquery_not|tsquery_or|tsqueryin|tsqueryout|tsqueryrecv|tsquerysend|tsvector_cmp|tsvector_concat|tsvector_eq|tsvector_ge|tsvector_gt|tsvector_le|tsvector_lt|tsvector_ne|tsvector_update_trigger|tsvector_update_trigger_column|tsvectorin|tsvectorout|tsvectorrecv|tsvectorsend|txid_current|txid_current_snapshot|txid_snapshot_in|txid_snapshot_out|txid_snapshot_recv|txid_snapshot_send|txid_snapshot_xip|txid_snapshot_xmax|txid_snapshot_xmin|txid_visible_in_snapshot|uhc_to_utf8|unique_key_recheck|unknownin|unknownout|unknownrecv|unknownsend|unnest|upper|utf8_to_ascii|utf8_to_big5|utf8_to_euc_cn|utf8_to_euc_jis_2004|utf8_to_euc_jp|utf8_to_euc_kr|utf8_to_euc_tw|utf8_to_gb18030|utf8_to_gbk|utf8_to_iso8859|utf8_to_iso8859_1|utf8_to_johab|utf8_to_koi8r|utf8_to_koi8u|utf8_to_shift_jis_2004|utf8_to_sjis|utf8_to_uhc|utf8_to_win|uuid_cmp|uuid_eq|uuid_ge|uuid_gt|uuid_hash|uuid_in|uuid_le|uuid_lt|uuid_ne|uuid_out|uuid_recv|uuid_send|var_pop|var_samp|varbit_in|varbit_out|varbit_recv|varbit_send|varbitcmp|varbiteq|varbitge|varbitgt|varbitle|varbitlt|varbitne|varbittypmodin|varbittypmodout|varcharin|varcharout|varcharrecv|varcharsend|varchartypmodin|varchartypmodout|variance|version|void_in|void_out|void_recv|void_send|width|width_bucket|win1250_to_latin2|win1250_to_mic|win1251_to_iso|win1251_to_koi8r|win1251_to_mic|win1251_to_win866|win866_to_iso|win866_to_koi8r|win866_to_mic|win866_to_win1251|win_to_utf8|xideq|xideqint4|xidin|xidout|xidrecv|xidsend|xml|xml_in|xml_is_well_formed|xml_is_well_formed_content|xml_is_well_formed_document|xml_out|xml_recv|xml_send|xmlagg|xmlcomment|xmlconcat2|xmlexists|xmlvalidate|xpath|xpath_exists".split("|")),c=[{token:"string",regex:"['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"},{token:"variable.language",regex:'".*?"'},{token:"constant.numeric",regex:"[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"},{token:function(c){return c=c.toLowerCase(),a.hasOwnProperty(c)?"keyword":b.hasOwnProperty(c)?"support.function":"identifier"},regex:"[a-zA-Z_][a-zA-Z0-9_$]*\\b"},{token:"keyword.operator",regex:"!|!!|!~|!~\\*|!~~|!~~\\*|#|##|#<|#<=|#<>|#=|#>|#>=|%|\\&|\\&\\&|\\&<|\\&<\\||\\&>|\\*|\\+|\\-|/|<|<#>|<\\->|<<|<<=|<<\\||<=|<>|<\\?>|<@|<\\^|=|>|>=|>>|>>=|>\\^|\\?#|\\?\\-|\\?\\-\\||\\?\\||\\?\\|\\||@|@\\-@|@>|@@|@@@|\\^|\\||\\|\\&>|\\|/|\\|>>|\\|\\||\\|\\|/|~|~\\*|~<=~|~<~|~=|~>=~|~>~|~~|~~\\*"},{token:"lparen.paren",regex:"[\\(]"},{token:"paren.rparen",regex:"[\\)]"},{token:"text",regex:"\\s+"}];this.$rules={start:[{token:"comment",regex:"--.*$"},(new f).getStartRule("doc-start"),{token:"comment",merge:!0,regex:"\\/\\*",next:"comment"},{token:"keyword.statementBegin",regex:"^[a-zA-Z]+",next:"statement"},{token:"support.buildin",regex:"^\\\\[\\S]+.*$"}],statement:[{token:"comment",regex:"--.*$"},{token:"comment",merge:!0,regex:"\\/\\*",next:"commentStatement"},{token:"statementEnd",regex:";",next:"start"},{token:"string",regex:"\\$perl\\$",next:"perl-start"},{token:"string",regex:"\\$python\\$",next:"python-start"},{token:"string",regex:"\\$[\\w_0-9]*\\$$",next:"dollarSql"},{token:"string",regex:"\\$[\\w_0-9]*\\$",next:"dollarStatementString"}].concat(c),dollarSql:[{token:"comment",regex:"--.*$"},{token:"comment",merge:!0,regex:"\\/\\*",next:"commentDollarSql"},{token:"string",regex:"^\\$[\\w_0-9]*\\$",next:"statement"},{token:"string",regex:"\\$[\\w_0-9]*\\$",next:"dollarSqlString"}].concat(c),comment:[{token:"comment",regex:".*?\\*\\/",next:"start"},{token:"comment",merge:!0,regex:".+"}],commentStatement:[{token:"comment",regex:".*?\\*\\/",next:"statement"},{token:"comment",merge:!0,regex:".+"}],commentDollarSql:[{token:"comment",regex:".*?\\*\\/",next:"dollarSql"},{token:"comment",merge:!0,regex:".+"}],dollarStatementString:[{token:"string",regex:".*?\\$[\\w_0-9]*\\$",next:"statement"},{token:"string",merge:!0,regex:".+"}],dollarSqlString:[{token:"string",regex:".*?\\$[\\w_0-9]*\\$",next:"dollarSql"},{token:"string",merge:!0,regex:".+"}]},this.embedRules(f,"doc-",[(new f).getEndRule("start")]),this.embedRules(h,"perl-",[{token:"string",regex:"\\$perl\\$",next:"statement"}]),this.embedRules(i,"python-",[{token:"string",regex:"\\$python\\$",next:"statement"}])};d.inherits(j,g),b.PgsqlHighlightRules=j}),define("ace/mode/doc_comment_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text_highlight_rules").TextHighlightRules,f=function(){this.$rules={start:[{token:"comment.doc.tag",regex:"@[\\w\\d_]+"},{token:"comment.doc",merge:!0,regex:"\\s+"},{token:"comment.doc",merge:!0,regex:"TODO"},{token:"comment.doc",merge:!0,regex:"[^@\\*]+"},{token:"comment.doc",merge:!0,regex:"."}]}};d.inherits(f,e),function(){this.getStartRule=function(a){return{token:"comment.doc",merge:!0,regex:"\\/\\*(?=\\*)",next:a}},this.getEndRule=function(a){return{token:"comment.doc",merge:!0,regex:"\\*\\/",next:a}}}.call(f.prototype),b.DocCommentHighlightRules=f}),define("ace/mode/perl_highlight_rules",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("../lib/lang"),f=a("./text_highlight_rules").TextHighlightRules,g=function(){var a=e.arrayToMap("base|constant|continue|else|elsif|for|foreach|format|goto|if|last|local|my|next|no|package|parent|redo|require|scalar|sub|unless|until|while|use|vars".split("|")),b=e.arrayToMap("ARGV|ENV|INC|SIG".split("|")),c=e.arrayToMap("getprotobynumber|getprotobyname|getservbyname|gethostbyaddr|gethostbyname|getservbyport|getnetbyaddr|getnetbyname|getsockname|getpeername|setpriority|getprotoent|setprotoent|getpriority|endprotoent|getservent|setservent|endservent|sethostent|socketpair|getsockopt|gethostent|endhostent|setsockopt|setnetent|quotemeta|localtime|prototype|getnetent|endnetent|rewinddir|wantarray|getpwuid|closedir|getlogin|readlink|endgrent|getgrgid|getgrnam|shmwrite|shutdown|readline|endpwent|setgrent|readpipe|formline|truncate|dbmclose|syswrite|setpwent|getpwnam|getgrent|getpwent|ucfirst|sysread|setpgrp|shmread|sysseek|sysopen|telldir|defined|opendir|connect|lcfirst|getppid|binmode|syscall|sprintf|getpgrp|readdir|seekdir|waitpid|reverse|unshift|symlink|dbmopen|semget|msgrcv|rename|listen|chroot|msgsnd|shmctl|accept|unpack|exists|fileno|shmget|system|unlink|printf|gmtime|msgctl|semctl|values|rindex|substr|splice|length|msgget|select|socket|return|caller|delete|alarm|ioctl|index|undef|lstat|times|srand|chown|fcntl|close|write|umask|rmdir|study|sleep|chomp|untie|print|utime|mkdir|atan2|split|crypt|flock|chmod|BEGIN|bless|chdir|semop|shift|reset|link|stat|chop|grep|fork|dump|join|open|tell|pipe|exit|glob|warn|each|bind|sort|pack|eval|push|keys|getc|kill|seek|sqrt|send|wait|rand|tied|read|time|exec|recv|eof|chr|int|ord|exp|pos|pop|sin|log|abs|oct|hex|tie|cos|vec|END|ref|map|die|uc|lc|do".split("|"));this.$rules={start:[{token:"comment",regex:"#.*$"},{token:"string.regexp",regex:"[/](?:(?:\\[(?:\\\\]|[^\\]])+\\])|(?:\\\\/|[^\\]/]))*[/]\\w*\\s*(?=[).,;]|$)"},{token:"string",regex:'["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'},{token:"string",merge:!0,regex:'["].*\\\\$',next:"qqstring"},{token:"string",regex:"['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"},{token:"string",merge:!0,regex:"['].*\\\\$",next:"qstring"},{token:"constant.numeric",regex:"0x[0-9a-fA-F]+\\b"},{token:"constant.numeric",regex:"[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"},{token:function(d){return a.hasOwnProperty(d)?"keyword":b.hasOwnProperty(d)?"constant.language":c.hasOwnProperty(d)?"support.function":"identifier"},regex:"[a-zA-Z_$][a-zA-Z0-9_$]*\\b"},{token:"keyword.operator",regex:"\\.\\.\\.|\\|\\|=|>>=|<<=|<=>|&&=|=>|!~|\\^=|&=|\\|=|\\.=|x=|%=|\\/=|\\*=|\\-=|\\+=|=~|\\*\\*|\\-\\-|\\.\\.|\\|\\||&&|\\+\\+|\\->|!=|==|>=|<=|>>|<<|,|=|\\?\\:|\\^|\\||x|%|\\/|\\*|<|&|\\\\|~|!|>|\\.|\\-|\\+|\\-C|\\-b|\\-S|\\-u|\\-t|\\-p|\\-l|\\-d|\\-f|\\-g|\\-s|\\-z|\\-k|\\-e|\\-O|\\-T|\\-B|\\-M|\\-A|\\-X|\\-W|\\-c|\\-R|\\-o|\\-x|\\-w|\\-r|\\b(?:and|cmp|eq|ge|gt|le|lt|ne|not|or|xor)"},{token:"lparen",regex:"[[({]"},{token:"rparen",regex:"[\\])}]"},{token:"text",regex:"\\s+"}],qqstring:[{token:"string",regex:'(?:(?:\\\\.)|(?:[^"\\\\]))*?"',next:"start"},{token:"string",merge:!0,regex:".+"}],qstring:[{token:"string",regex:"(?:(?:\\\\.)|(?:[^'\\\\]))*?'",next:"start"},{token:"string",merge:!0,regex:".+"}]}};d.inherits(g,f),b.PerlHighlightRules=g}),define("ace/mode/python_highlight_rules",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("../lib/lang"),f=a("./text_highlight_rules").TextHighlightRules,g=function(){var a=e.arrayToMap("and|as|assert|break|class|continue|def|del|elif|else|except|exec|finally|for|from|global|if|import|in|is|lambda|not|or|pass|print|raise|return|try|while|with|yield".split("|")),b=e.arrayToMap("True|False|None|NotImplemented|Ellipsis|__debug__".split("|")),c=e.arrayToMap("abs|divmod|input|open|staticmethod|all|enumerate|int|ord|str|any|eval|isinstance|pow|sum|basestring|execfile|issubclass|print|super|binfile|iter|property|tuple|bool|filter|len|range|type|bytearray|float|list|raw_input|unichr|callable|format|locals|reduce|unicode|chr|frozenset|long|reload|vars|classmethod|getattr|map|repr|xrange|cmp|globals|max|reversed|zip|compile|hasattr|memoryview|round|__import__|complex|hash|min|set|apply|delattr|help|next|setattr|buffer|dict|hex|object|slice|coerce|dir|id|oct|sorted|intern".split("|")),d=e.arrayToMap("".split("|")),f="(?:r|u|ur|R|U|UR|Ur|uR)?",g="(?:(?:[1-9]\\d*)|(?:0))",h="(?:0[oO]?[0-7]+)",i="(?:0[xX][\\dA-Fa-f]+)",j="(?:0[bB][01]+)",k="(?:"+g+"|"+h+"|"+i+"|"+j+")",l="(?:[eE][+-]?\\d+)",m="(?:\\.\\d+)",n="(?:\\d+)",o="(?:(?:"+n+"?"+m+")|(?:"+n+"\\.))",p="(?:(?:"+o+"|"+n+")"+l+")",q="(?:"+p+"|"+o+")";this.$rules={start:[{token:"comment",regex:"#.*$"},{token:"string",regex:f+'"{3}(?:[^\\\\]|\\\\.)*?"{3}'},{token:"string",merge:!0,regex:f+'"{3}.*$',next:"qqstring"},{token:"string",regex:f+'"(?:[^\\\\]|\\\\.)*?"'},{token:"string",regex:f+"'{3}(?:[^\\\\]|\\\\.)*?'{3}"},{token:"string",merge:!0,regex:f+"'{3}.*$",next:"qstring"},{token:"string",regex:f+"'(?:[^\\\\]|\\\\.)*?'"},{token:"constant.numeric",regex:"(?:"+q+"|\\d+)[jJ]\\b"},{token:"constant.numeric",regex:q},{token:"constant.numeric",regex:k+"[lL]\\b"},{token:"constant.numeric",regex:k+"\\b"},{token:function(e){return a.hasOwnProperty(e)?"keyword":b.hasOwnProperty(e)?"constant.language":d.hasOwnProperty(e)?"invalid.illegal":c.hasOwnProperty(e)?"support.function":e=="debugger"?"invalid.deprecated":"identifier"},regex:"[a-zA-Z_$][a-zA-Z0-9_$]*\\b"},{token:"keyword.operator",regex:"\\+|\\-|\\*|\\*\\*|\\/|\\/\\/|%|<<|>>|&|\\||\\^|~|<|>|<=|=>|==|!=|<>|="},{token:"lparen.paren",regex:"[\\[\\(\\{]"},{token:"paren.rparen",regex:"[\\]\\)\\}]"},{token:"text",regex:"\\s+"}],qqstring:[{token:"string",regex:'(?:[^\\\\]|\\\\.)*?"{3}',next:"start"},{token:"string",merge:!0,regex:".+"}],qstring:[{token:"string",regex:"(?:[^\\\\]|\\\\.)*?'{3}",next:"start"},{token:"string",merge:!0,regex:".+"}]}};d.inherits(g,f),b.PythonHighlightRules=g})
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/mode-php-uncompressed.js b/apps/files_texteditor/js/aceeditor/mode-php-uncompressed.js
deleted file mode 100644
index 3b0c2f8de1..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-php-uncompressed.js
+++ /dev/null
@@ -1,1886 +0,0 @@
-/* ***** 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 Ajax.org Code Editor (ACE).
-*
-* The Initial Developer of the Original Code is
-* Ajax.org B.V.
-* Portions created by the Initial Developer are Copyright (C) 2010
-* the Initial Developer. All Rights Reserved.
-*
-* Contributor(s):
-*      André Fiedler <fiedler dot andre a t gmail dot com>
-*
-* 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 ***** */
-
-define('ace/mode/php', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text', 'ace/tokenizer', 'ace/mode/php_highlight_rules', 'ace/mode/matching_brace_outdent', 'ace/range', 'ace/mode/behaviour/cstyle', 'ace/mode/folding/cstyle'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
-var PhpHighlightRules = require("./php_highlight_rules").PhpHighlightRules;
-var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
-var Range = require("../range").Range;
-var CstyleBehaviour = require("./behaviour/cstyle").CstyleBehaviour;
-var CStyleFoldMode = require("./folding/cstyle").FoldMode;
-
-var Mode = function() {
-    this.$tokenizer = new Tokenizer(new PhpHighlightRules().getRules());
-    this.$outdent = new MatchingBraceOutdent();
-    this.$behaviour = new CstyleBehaviour();
-    this.foldingRules = new CStyleFoldMode();
-};
-oop.inherits(Mode, TextMode);
-
-(function() {
-
-    this.toggleCommentLines = function(state, doc, startRow, endRow) {
-        var outdent = true;
-        var re = /^(\s*)#/;
-
-        for (var i=startRow; i<= endRow; i++) {
-            if (!re.test(doc.getLine(i))) {
-                outdent = false;
-                break;
-            }
-        }
-
-        if (outdent) {
-            var deleteRange = new Range(0, 0, 0, 0);
-            for (var i=startRow; i<= endRow; i++)
-            {
-                var line = doc.getLine(i);
-                var m = line.match(re);
-                deleteRange.start.row = i;
-                deleteRange.end.row = i;
-                deleteRange.end.column = m[0].length;
-                doc.replace(deleteRange, m[1]);
-            }
-        }
-        else {
-            doc.indentRows(startRow, endRow, "#");
-        }
-    };
-
-    this.getNextLineIndent = function(state, line, tab) {
-        var indent = this.$getIndent(line);
-
-        var tokenizedLine = this.$tokenizer.getLineTokens(line, state);
-        var tokens = tokenizedLine.tokens;
-
-        if (tokens.length && tokens[tokens.length-1].type == "comment") {
-            return indent;
-        }
-
-        if (state == "start") {
-            var match = line.match(/^.*[\{\(\[\:]\s*$/);
-            if (match) {
-                indent += tab;
-            }
-        }
-
-        return indent;
-    };
-
-    this.checkOutdent = function(state, line, input) {
-        return this.$outdent.checkOutdent(line, input);
-    };
-
-    this.autoOutdent = function(state, doc, row) {
-        this.$outdent.autoOutdent(doc, row);
-    };
-
-}).call(Mode.prototype);
-
-exports.Mode = Mode;
-});
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      André Fiedler <fiedler dot andre a t gmail dot com>
- *
- * 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 *****
- */
-
-define('ace/mode/php_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/lang', 'ace/mode/doc_comment_highlight_rules', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var lang = require("../lib/lang");
-var DocCommentHighlightRules = require("./doc_comment_highlight_rules").DocCommentHighlightRules;
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-
-var PhpHighlightRules = function() {
-    var docComment = new DocCommentHighlightRules();
-    // http://php.net/quickref.php
-    var builtinFunctions = lang.arrayToMap(
-        ('abs|acos|acosh|addcslashes|addslashes|aggregate|aggregate_info|aggregate_methods|aggregate_methods_by_list|aggregate_methods_by_regexp|' +
-        'aggregate_properties|aggregate_properties_by_list|aggregate_properties_by_regexp|aggregation_info|amqpconnection|amqpexchange|amqpqueue|' +
-        'apache_child_terminate|apache_get_modules|apache_get_version|apache_getenv|apache_lookup_uri|apache_note|apache_request_headers|' +
-        'apache_reset_timeout|apache_response_headers|apache_setenv|apc_add|apc_bin_dump|apc_bin_dumpfile|apc_bin_load|apc_bin_loadfile|' +
-        'apc_cache_info|apc_cas|apc_clear_cache|apc_compile_file|apc_dec|apc_define_constants|apc_delete|apc_delete_file|apc_exists|apc_fetch|' +
-        'apc_inc|apc_load_constants|apc_sma_info|apc_store|apciterator|apd_breakpoint|apd_callstack|apd_clunk|apd_continue|apd_croak|' +
-        'apd_dump_function_table|apd_dump_persistent_resources|apd_dump_regular_resources|apd_echo|apd_get_active_symbols|apd_set_pprof_trace|' +
-        'apd_set_session|apd_set_session_trace|apd_set_session_trace_socket|appenditerator|array|array_change_key_case|array_chunk|array_combine|' +
-        'array_count_values|array_diff|array_diff_assoc|array_diff_key|array_diff_uassoc|array_diff_ukey|array_fill|array_fill_keys|array_filter|' +
-        'array_flip|array_intersect|array_intersect_assoc|array_intersect_key|array_intersect_uassoc|array_intersect_ukey|array_key_exists|' +
-        'array_keys|array_map|array_merge|array_merge_recursive|array_multisort|array_pad|array_pop|array_product|array_push|array_rand|' +
-        'array_reduce|array_replace|array_replace_recursive|array_reverse|array_search|array_shift|array_slice|array_splice|array_sum|array_udiff|' +
-        'array_udiff_assoc|array_udiff_uassoc|array_uintersect|array_uintersect_assoc|array_uintersect_uassoc|array_unique|array_unshift|' +
-        'array_values|array_walk|array_walk_recursive|arrayaccess|arrayiterator|arrayobject|arsort|asin|asinh|asort|assert|assert_options|atan|' +
-        'atan2|atanh|audioproperties|badfunctioncallexception|badmethodcallexception|base64_decode|base64_encode|base_convert|basename|' +
-        'bbcode_add_element|bbcode_add_smiley|bbcode_create|bbcode_destroy|bbcode_parse|bbcode_set_arg_parser|bbcode_set_flags|bcadd|bccomp|bcdiv|' +
-        'bcmod|bcmul|bcompiler_load|bcompiler_load_exe|bcompiler_parse_class|bcompiler_read|bcompiler_write_class|bcompiler_write_constant|' +
-        'bcompiler_write_exe_footer|bcompiler_write_file|bcompiler_write_footer|bcompiler_write_function|bcompiler_write_functions_from_file|' +
-        'bcompiler_write_header|bcompiler_write_included_filename|bcpow|bcpowmod|bcscale|bcsqrt|bcsub|bin2hex|bind_textdomain_codeset|bindec|' +
-        'bindtextdomain|bson_decode|bson_encode|bumpValue|bzclose|bzcompress|bzdecompress|bzerrno|bzerror|bzerrstr|bzflush|bzopen|bzread|bzwrite|' +
-        'cachingiterator|cairo|cairo_create|cairo_font_face_get_type|cairo_font_face_status|cairo_font_options_create|cairo_font_options_equal|' +
-        'cairo_font_options_get_antialias|cairo_font_options_get_hint_metrics|cairo_font_options_get_hint_style|' +
-        'cairo_font_options_get_subpixel_order|cairo_font_options_hash|cairo_font_options_merge|cairo_font_options_set_antialias|' +
-        'cairo_font_options_set_hint_metrics|cairo_font_options_set_hint_style|cairo_font_options_set_subpixel_order|cairo_font_options_status|' +
-        'cairo_format_stride_for_width|cairo_image_surface_create|cairo_image_surface_create_for_data|cairo_image_surface_create_from_png|' +
-        'cairo_image_surface_get_data|cairo_image_surface_get_format|cairo_image_surface_get_height|cairo_image_surface_get_stride|' +
-        'cairo_image_surface_get_width|cairo_matrix_create_scale|cairo_matrix_create_translate|cairo_matrix_invert|cairo_matrix_multiply|' +
-        'cairo_matrix_rotate|cairo_matrix_transform_distance|cairo_matrix_transform_point|cairo_matrix_translate|cairo_pattern_add_color_stop_rgb|' +
-        'cairo_pattern_add_color_stop_rgba|cairo_pattern_create_for_surface|cairo_pattern_create_linear|cairo_pattern_create_radial|' +
-        'cairo_pattern_create_rgb|cairo_pattern_create_rgba|cairo_pattern_get_color_stop_count|cairo_pattern_get_color_stop_rgba|' +
-        'cairo_pattern_get_extend|cairo_pattern_get_filter|cairo_pattern_get_linear_points|cairo_pattern_get_matrix|' +
-        'cairo_pattern_get_radial_circles|cairo_pattern_get_rgba|cairo_pattern_get_surface|cairo_pattern_get_type|cairo_pattern_set_extend|' +
-        'cairo_pattern_set_filter|cairo_pattern_set_matrix|cairo_pattern_status|cairo_pdf_surface_create|cairo_pdf_surface_set_size|' +
-        'cairo_ps_get_levels|cairo_ps_level_to_string|cairo_ps_surface_create|cairo_ps_surface_dsc_begin_page_setup|' +
-        'cairo_ps_surface_dsc_begin_setup|cairo_ps_surface_dsc_comment|cairo_ps_surface_get_eps|cairo_ps_surface_restrict_to_level|' +
-        'cairo_ps_surface_set_eps|cairo_ps_surface_set_size|cairo_scaled_font_create|cairo_scaled_font_extents|cairo_scaled_font_get_ctm|' +
-        'cairo_scaled_font_get_font_face|cairo_scaled_font_get_font_matrix|cairo_scaled_font_get_font_options|cairo_scaled_font_get_scale_matrix|' +
-        'cairo_scaled_font_get_type|cairo_scaled_font_glyph_extents|cairo_scaled_font_status|cairo_scaled_font_text_extents|' +
-        'cairo_surface_copy_page|cairo_surface_create_similar|cairo_surface_finish|cairo_surface_flush|cairo_surface_get_content|' +
-        'cairo_surface_get_device_offset|cairo_surface_get_font_options|cairo_surface_get_type|cairo_surface_mark_dirty|' +
-        'cairo_surface_mark_dirty_rectangle|cairo_surface_set_device_offset|cairo_surface_set_fallback_resolution|cairo_surface_show_page|' +
-        'cairo_surface_status|cairo_surface_write_to_png|cairo_svg_surface_create|cairo_svg_surface_restrict_to_version|' +
-        'cairo_svg_version_to_string|cairoantialias|cairocontent|cairocontext|cairoexception|cairoextend|cairofillrule|cairofilter|cairofontface|' +
-        'cairofontoptions|cairofontslant|cairofonttype|cairofontweight|cairoformat|cairogradientpattern|cairohintmetrics|cairohintstyle|' +
-        'cairoimagesurface|cairolineargradient|cairolinecap|cairolinejoin|cairomatrix|cairooperator|cairopath|cairopattern|cairopatterntype|' +
-        'cairopdfsurface|cairopslevel|cairopssurface|cairoradialgradient|cairoscaledfont|cairosolidpattern|cairostatus|cairosubpixelorder|' +
-        'cairosurface|cairosurfacepattern|cairosurfacetype|cairosvgsurface|cairosvgversion|cairotoyfontface|cal_days_in_month|cal_from_jd|cal_info|' +
-        'cal_to_jd|calcul_hmac|calculhmac|call_user_func|call_user_func_array|call_user_method|call_user_method_array|callbackfilteriterator|ceil|' +
-        'chdb|chdb_create|chdir|checkdate|checkdnsrr|chgrp|chmod|chop|chown|chr|chroot|chunk_split|class_alias|class_exists|class_implements|' +
-        'class_parents|classkit_import|classkit_method_add|classkit_method_copy|classkit_method_redefine|classkit_method_remove|' +
-        'classkit_method_rename|clearstatcache|clone|closedir|closelog|collator|com|com_addref|com_create_guid|com_event_sink|com_get|' +
-        'com_get_active_object|com_invoke|com_isenum|com_load|com_load_typelib|com_message_pump|com_print_typeinfo|com_propget|com_propput|' +
-        'com_propset|com_release|com_set|compact|connection_aborted|connection_status|connection_timeout|constant|construct|construct|construct|' +
-        'convert_cyr_string|convert_uudecode|convert_uuencode|copy|cos|cosh|count|count_chars|countable|counter_bump|counter_bump_value|' +
-        'counter_create|counter_get|counter_get_meta|counter_get_named|counter_get_value|counter_reset|counter_reset_value|crack_check|' +
-        'crack_closedict|crack_getlastmessage|crack_opendict|crc32|create_function|crypt|ctype_alnum|ctype_alpha|ctype_cntrl|ctype_digit|' +
-        'ctype_graph|ctype_lower|ctype_print|ctype_punct|ctype_space|ctype_upper|ctype_xdigit|cubrid_affected_rows|cubrid_bind|' +
-        'cubrid_client_encoding|cubrid_close|cubrid_close_prepare|cubrid_close_request|cubrid_col_get|cubrid_col_size|cubrid_column_names|' +
-        'cubrid_column_types|cubrid_commit|cubrid_connect|cubrid_connect_with_url|cubrid_current_oid|cubrid_data_seek|cubrid_db_name|' +
-        'cubrid_disconnect|cubrid_drop|cubrid_errno|cubrid_error|cubrid_error_code|cubrid_error_code_facility|cubrid_error_msg|cubrid_execute|' +
-        'cubrid_fetch|cubrid_fetch_array|cubrid_fetch_assoc|cubrid_fetch_field|cubrid_fetch_lengths|cubrid_fetch_object|cubrid_fetch_row|' +
-        'cubrid_field_flags|cubrid_field_len|cubrid_field_name|cubrid_field_seek|cubrid_field_table|cubrid_field_type|cubrid_free_result|' +
-        'cubrid_get|cubrid_get_autocommit|cubrid_get_charset|cubrid_get_class_name|cubrid_get_client_info|cubrid_get_db_parameter|' +
-        'cubrid_get_server_info|cubrid_insert_id|cubrid_is_instance|cubrid_list_dbs|cubrid_load_from_glo|cubrid_lob_close|cubrid_lob_export|' +
-        'cubrid_lob_get|cubrid_lob_send|cubrid_lob_size|cubrid_lock_read|cubrid_lock_write|cubrid_move_cursor|cubrid_new_glo|cubrid_next_result|' +
-        'cubrid_num_cols|cubrid_num_fields|cubrid_num_rows|cubrid_ping|cubrid_prepare|cubrid_put|cubrid_query|cubrid_real_escape_string|' +
-        'cubrid_result|cubrid_rollback|cubrid_save_to_glo|cubrid_schema|cubrid_send_glo|cubrid_seq_drop|cubrid_seq_insert|cubrid_seq_put|' +
-        'cubrid_set_add|cubrid_set_autocommit|cubrid_set_db_parameter|cubrid_set_drop|cubrid_unbuffered_query|cubrid_version|curl_close|' +
-        'curl_copy_handle|curl_errno|curl_error|curl_exec|curl_getinfo|curl_init|curl_multi_add_handle|curl_multi_close|curl_multi_exec|' +
-        'curl_multi_getcontent|curl_multi_info_read|curl_multi_init|curl_multi_remove_handle|curl_multi_select|curl_setopt|curl_setopt_array|' +
-        'curl_version|current|cyrus_authenticate|cyrus_bind|cyrus_close|cyrus_connect|cyrus_query|cyrus_unbind|date|date_add|date_create|' +
-        'date_create_from_format|date_date_set|date_default_timezone_get|date_default_timezone_set|date_diff|date_format|date_get_last_errors|' +
-        'date_interval_create_from_date_string|date_interval_format|date_isodate_set|date_modify|date_offset_get|date_parse|date_parse_from_format|' +
-        'date_sub|date_sun_info|date_sunrise|date_sunset|date_time_set|date_timestamp_get|date_timestamp_set|date_timezone_get|date_timezone_set|' +
-        'dateinterval|dateperiod|datetime|datetimezone|db2_autocommit|db2_bind_param|db2_client_info|db2_close|db2_column_privileges|db2_columns|' +
-        'db2_commit|db2_conn_error|db2_conn_errormsg|db2_connect|db2_cursor_type|db2_escape_string|db2_exec|db2_execute|db2_fetch_array|' +
-        'db2_fetch_assoc|db2_fetch_both|db2_fetch_object|db2_fetch_row|db2_field_display_size|db2_field_name|db2_field_num|db2_field_precision|' +
-        'db2_field_scale|db2_field_type|db2_field_width|db2_foreign_keys|db2_free_result|db2_free_stmt|db2_get_option|db2_last_insert_id|' +
-        'db2_lob_read|db2_next_result|db2_num_fields|db2_num_rows|db2_pclose|db2_pconnect|db2_prepare|db2_primary_keys|db2_procedure_columns|' +
-        'db2_procedures|db2_result|db2_rollback|db2_server_info|db2_set_option|db2_special_columns|db2_statistics|db2_stmt_error|db2_stmt_errormsg|' +
-        'db2_table_privileges|db2_tables|dba_close|dba_delete|dba_exists|dba_fetch|dba_firstkey|dba_handlers|dba_insert|dba_key_split|dba_list|' +
-        'dba_nextkey|dba_open|dba_optimize|dba_popen|dba_replace|dba_sync|dbase_add_record|dbase_close|dbase_create|dbase_delete_record|' +
-        'dbase_get_header_info|dbase_get_record|dbase_get_record_with_names|dbase_numfields|dbase_numrecords|dbase_open|dbase_pack|' +
-        'dbase_replace_record|dbplus_add|dbplus_aql|dbplus_chdir|dbplus_close|dbplus_curr|dbplus_errcode|dbplus_errno|dbplus_find|dbplus_first|' +
-        'dbplus_flush|dbplus_freealllocks|dbplus_freelock|dbplus_freerlocks|dbplus_getlock|dbplus_getunique|dbplus_info|dbplus_last|dbplus_lockrel|' +
-        'dbplus_next|dbplus_open|dbplus_prev|dbplus_rchperm|dbplus_rcreate|dbplus_rcrtexact|dbplus_rcrtlike|dbplus_resolve|dbplus_restorepos|' +
-        'dbplus_rkeys|dbplus_ropen|dbplus_rquery|dbplus_rrename|dbplus_rsecindex|dbplus_runlink|dbplus_rzap|dbplus_savepos|dbplus_setindex|' +
-        'dbplus_setindexbynumber|dbplus_sql|dbplus_tcl|dbplus_tremove|dbplus_undo|dbplus_undoprepare|dbplus_unlockrel|dbplus_unselect|' +
-        'dbplus_update|dbplus_xlockrel|dbplus_xunlockrel|dbx_close|dbx_compare|dbx_connect|dbx_error|dbx_escape_string|dbx_fetch_row|dbx_query|' +
-        'dbx_sort|dcgettext|dcngettext|deaggregate|debug_backtrace|debug_print_backtrace|debug_zval_dump|decbin|dechex|decoct|define|' +
-        'define_syslog_variables|defined|deg2rad|delete|dgettext|die|dio_close|dio_fcntl|dio_open|dio_read|dio_seek|dio_stat|dio_tcsetattr|' +
-        'dio_truncate|dio_write|dir|directoryiterator|dirname|disk_free_space|disk_total_space|diskfreespace|dl|dngettext|dns_check_record|' +
-        'dns_get_mx|dns_get_record|dom_import_simplexml|domainexception|domattr|domattribute_name|domattribute_set_value|domattribute_specified|' +
-        'domattribute_value|domcharacterdata|domcomment|domdocument|domdocument_add_root|domdocument_create_attribute|' +
-        'domdocument_create_cdata_section|domdocument_create_comment|domdocument_create_element|domdocument_create_element_ns|' +
-        'domdocument_create_entity_reference|domdocument_create_processing_instruction|domdocument_create_text_node|domdocument_doctype|' +
-        'domdocument_document_element|domdocument_dump_file|domdocument_dump_mem|domdocument_get_element_by_id|domdocument_get_elements_by_tagname|' +
-        'domdocument_html_dump_mem|domdocument_xinclude|domdocumentfragment|domdocumenttype|domdocumenttype_entities|' +
-        'domdocumenttype_internal_subset|domdocumenttype_name|domdocumenttype_notations|domdocumenttype_public_id|domdocumenttype_system_id|' +
-        'domelement|domelement_get_attribute|domelement_get_attribute_node|domelement_get_elements_by_tagname|domelement_has_attribute|' +
-        'domelement_remove_attribute|domelement_set_attribute|domelement_set_attribute_node|domelement_tagname|domentity|domentityreference|' +
-        'domexception|domimplementation|domnamednodemap|domnode|domnode_add_namespace|domnode_append_child|domnode_append_sibling|' +
-        'domnode_attributes|domnode_child_nodes|domnode_clone_node|domnode_dump_node|domnode_first_child|domnode_get_content|' +
-        'domnode_has_attributes|domnode_has_child_nodes|domnode_insert_before|domnode_is_blank_node|domnode_last_child|domnode_next_sibling|' +
-        'domnode_node_name|domnode_node_type|domnode_node_value|domnode_owner_document|domnode_parent_node|domnode_prefix|domnode_previous_sibling|' +
-        'domnode_remove_child|domnode_replace_child|domnode_replace_node|domnode_set_content|domnode_set_name|domnode_set_namespace|' +
-        'domnode_unlink_node|domnodelist|domnotation|domprocessinginstruction|domprocessinginstruction_data|domprocessinginstruction_target|' +
-        'domtext|domxml_new_doc|domxml_open_file|domxml_open_mem|domxml_version|domxml_xmltree|domxml_xslt_stylesheet|domxml_xslt_stylesheet_doc|' +
-        'domxml_xslt_stylesheet_file|domxml_xslt_version|domxpath|domxsltstylesheet_process|domxsltstylesheet_result_dump_file|' +
-        'domxsltstylesheet_result_dump_mem|dotnet|dotnet_load|doubleval|each|easter_date|easter_days|echo|empty|emptyiterator|' +
-        'enchant_broker_describe|enchant_broker_dict_exists|enchant_broker_free|enchant_broker_free_dict|enchant_broker_get_error|' +
-        'enchant_broker_init|enchant_broker_list_dicts|enchant_broker_request_dict|enchant_broker_request_pwl_dict|enchant_broker_set_ordering|' +
-        'enchant_dict_add_to_personal|enchant_dict_add_to_session|enchant_dict_check|enchant_dict_describe|enchant_dict_get_error|' +
-        'enchant_dict_is_in_session|enchant_dict_quick_check|enchant_dict_store_replacement|enchant_dict_suggest|end|ereg|ereg_replace|eregi|' +
-        'eregi_replace|error_get_last|error_log|error_reporting|errorexception|escapeshellarg|escapeshellcmd|eval|event_add|event_base_free|' +
-        'event_base_loop|event_base_loopbreak|event_base_loopexit|event_base_new|event_base_priority_init|event_base_set|event_buffer_base_set|' +
-        'event_buffer_disable|event_buffer_enable|event_buffer_fd_set|event_buffer_free|event_buffer_new|event_buffer_priority_set|' +
-        'event_buffer_read|event_buffer_set_callback|event_buffer_timeout_set|event_buffer_watermark_set|event_buffer_write|event_del|event_free|' +
-        'event_new|event_set|exception|exec|exif_imagetype|exif_read_data|exif_tagname|exif_thumbnail|exit|exp|expect_expectl|expect_popen|explode|' +
-        'expm1|export|export|extension_loaded|extract|ezmlm_hash|fam_cancel_monitor|fam_close|fam_monitor_collection|fam_monitor_directory|' +
-        'fam_monitor_file|fam_next_event|fam_open|fam_pending|fam_resume_monitor|fam_suspend_monitor|fbsql_affected_rows|fbsql_autocommit|' +
-        'fbsql_blob_size|fbsql_change_user|fbsql_clob_size|fbsql_close|fbsql_commit|fbsql_connect|fbsql_create_blob|fbsql_create_clob|' +
-        'fbsql_create_db|fbsql_data_seek|fbsql_database|fbsql_database_password|fbsql_db_query|fbsql_db_status|fbsql_drop_db|fbsql_errno|' +
-        'fbsql_error|fbsql_fetch_array|fbsql_fetch_assoc|fbsql_fetch_field|fbsql_fetch_lengths|fbsql_fetch_object|fbsql_fetch_row|' +
-        'fbsql_field_flags|fbsql_field_len|fbsql_field_name|fbsql_field_seek|fbsql_field_table|fbsql_field_type|fbsql_free_result|' +
-        'fbsql_get_autostart_info|fbsql_hostname|fbsql_insert_id|fbsql_list_dbs|fbsql_list_fields|fbsql_list_tables|fbsql_next_result|' +
-        'fbsql_num_fields|fbsql_num_rows|fbsql_password|fbsql_pconnect|fbsql_query|fbsql_read_blob|fbsql_read_clob|fbsql_result|fbsql_rollback|' +
-        'fbsql_rows_fetched|fbsql_select_db|fbsql_set_characterset|fbsql_set_lob_mode|fbsql_set_password|fbsql_set_transaction|fbsql_start_db|' +
-        'fbsql_stop_db|fbsql_table_name|fbsql_tablename|fbsql_username|fbsql_warnings|fclose|fdf_add_doc_javascript|fdf_add_template|fdf_close|' +
-        'fdf_create|fdf_enum_values|fdf_errno|fdf_error|fdf_get_ap|fdf_get_attachment|fdf_get_encoding|fdf_get_file|fdf_get_flags|fdf_get_opt|' +
-        'fdf_get_status|fdf_get_value|fdf_get_version|fdf_header|fdf_next_field_name|fdf_open|fdf_open_string|fdf_remove_item|fdf_save|' +
-        'fdf_save_string|fdf_set_ap|fdf_set_encoding|fdf_set_file|fdf_set_flags|fdf_set_javascript_action|fdf_set_on_import_javascript|fdf_set_opt|' +
-        'fdf_set_status|fdf_set_submit_form_action|fdf_set_target_frame|fdf_set_value|fdf_set_version|feof|fflush|fgetc|fgetcsv|fgets|fgetss|file|' +
-        'file_exists|file_get_contents|file_put_contents|fileatime|filectime|filegroup|fileinode|filemtime|fileowner|fileperms|filepro|' +
-        'filepro_fieldcount|filepro_fieldname|filepro_fieldtype|filepro_fieldwidth|filepro_retrieve|filepro_rowcount|filesize|filesystemiterator|' +
-        'filetype|filter_has_var|filter_id|filter_input|filter_input_array|filter_list|filter_var|filter_var_array|filteriterator|finfo_buffer|' +
-        'finfo_close|finfo_file|finfo_open|finfo_set_flags|floatval|flock|floor|flush|fmod|fnmatch|fopen|forward_static_call|' +
-        'forward_static_call_array|fpassthru|fprintf|fputcsv|fputs|fread|frenchtojd|fribidi_log2vis|fscanf|fseek|fsockopen|fstat|ftell|ftok|' +
-        'ftp_alloc|ftp_cdup|ftp_chdir|ftp_chmod|ftp_close|ftp_connect|ftp_delete|ftp_exec|ftp_fget|ftp_fput|ftp_get|ftp_get_option|ftp_login|' +
-        'ftp_mdtm|ftp_mkdir|ftp_nb_continue|ftp_nb_fget|ftp_nb_fput|ftp_nb_get|ftp_nb_put|ftp_nlist|ftp_pasv|ftp_put|ftp_pwd|ftp_quit|ftp_raw|' +
-        'ftp_rawlist|ftp_rename|ftp_rmdir|ftp_set_option|ftp_site|ftp_size|ftp_ssl_connect|ftp_systype|ftruncate|func_get_arg|func_get_args|' +
-        'func_num_args|function_exists|fwrite|gc_collect_cycles|gc_disable|gc_enable|gc_enabled|gd_info|gearmanclient|gearmanjob|gearmantask|' +
-        'gearmanworker|geoip_continent_code_by_name|geoip_country_code3_by_name|geoip_country_code_by_name|geoip_country_name_by_name|' +
-        'geoip_database_info|geoip_db_avail|geoip_db_filename|geoip_db_get_all_info|geoip_id_by_name|geoip_isp_by_name|geoip_org_by_name|' +
-        'geoip_record_by_name|geoip_region_by_name|geoip_region_name_by_code|geoip_time_zone_by_country_and_region|getMeta|getNamed|getValue|' +
-        'get_browser|get_called_class|get_cfg_var|get_class|get_class_methods|get_class_vars|get_current_user|get_declared_classes|' +
-        'get_declared_interfaces|get_defined_constants|get_defined_functions|get_defined_vars|get_extension_funcs|get_headers|' +
-        'get_html_translation_table|get_include_path|get_included_files|get_loaded_extensions|get_magic_quotes_gpc|get_magic_quotes_runtime|' +
-        'get_meta_tags|get_object_vars|get_parent_class|get_required_files|get_resource_type|getallheaders|getconstant|getconstants|getconstructor|' +
-        'getcwd|getdate|getdefaultproperties|getdoccomment|getendline|getenv|getextension|getextensionname|getfilename|gethostbyaddr|gethostbyname|' +
-        'gethostbynamel|gethostname|getimagesize|getinterfacenames|getinterfaces|getlastmod|getmethod|getmethods|getmodifiers|getmxrr|getmygid|' +
-        'getmyinode|getmypid|getmyuid|getname|getnamespacename|getopt|getparentclass|getproperties|getproperty|getprotobyname|getprotobynumber|' +
-        'getrandmax|getrusage|getservbyname|getservbyport|getshortname|getstartline|getstaticproperties|getstaticpropertyvalue|gettext|' +
-        'gettimeofday|gettype|glob|globiterator|gmagick|gmagickdraw|gmagickpixel|gmdate|gmmktime|gmp_abs|gmp_add|gmp_and|gmp_clrbit|gmp_cmp|' +
-        'gmp_com|gmp_div|gmp_div_q|gmp_div_qr|gmp_div_r|gmp_divexact|gmp_fact|gmp_gcd|gmp_gcdext|gmp_hamdist|gmp_init|gmp_intval|gmp_invert|' +
-        'gmp_jacobi|gmp_legendre|gmp_mod|gmp_mul|gmp_neg|gmp_nextprime|gmp_or|gmp_perfect_square|gmp_popcount|gmp_pow|gmp_powm|gmp_prob_prime|' +
-        'gmp_random|gmp_scan0|gmp_scan1|gmp_setbit|gmp_sign|gmp_sqrt|gmp_sqrtrem|gmp_strval|gmp_sub|gmp_testbit|gmp_xor|gmstrftime|' +
-        'gnupg_adddecryptkey|gnupg_addencryptkey|gnupg_addsignkey|gnupg_cleardecryptkeys|gnupg_clearencryptkeys|gnupg_clearsignkeys|gnupg_decrypt|' +
-        'gnupg_decryptverify|gnupg_encrypt|gnupg_encryptsign|gnupg_export|gnupg_geterror|gnupg_getprotocol|gnupg_import|gnupg_init|gnupg_keyinfo|' +
-        'gnupg_setarmor|gnupg_seterrormode|gnupg_setsignmode|gnupg_sign|gnupg_verify|gopher_parsedir|grapheme_extract|grapheme_stripos|' +
-        'grapheme_stristr|grapheme_strlen|grapheme_strpos|grapheme_strripos|grapheme_strrpos|grapheme_strstr|grapheme_substr|gregoriantojd|' +
-        'gupnp_context_get_host_ip|gupnp_context_get_port|gupnp_context_get_subscription_timeout|gupnp_context_host_path|gupnp_context_new|' +
-        'gupnp_context_set_subscription_timeout|gupnp_context_timeout_add|gupnp_context_unhost_path|gupnp_control_point_browse_start|' +
-        'gupnp_control_point_browse_stop|gupnp_control_point_callback_set|gupnp_control_point_new|gupnp_device_action_callback_set|' +
-        'gupnp_device_info_get|gupnp_device_info_get_service|gupnp_root_device_get_available|gupnp_root_device_get_relative_location|' +
-        'gupnp_root_device_new|gupnp_root_device_set_available|gupnp_root_device_start|gupnp_root_device_stop|gupnp_service_action_get|' +
-        'gupnp_service_action_return|gupnp_service_action_return_error|gupnp_service_action_set|gupnp_service_freeze_notify|gupnp_service_info_get|' +
-        'gupnp_service_info_get_introspection|gupnp_service_introspection_get_state_variable|gupnp_service_notify|gupnp_service_proxy_action_get|' +
-        'gupnp_service_proxy_action_set|gupnp_service_proxy_add_notify|gupnp_service_proxy_callback_set|gupnp_service_proxy_get_subscribed|' +
-        'gupnp_service_proxy_remove_notify|gupnp_service_proxy_set_subscribed|gupnp_service_thaw_notify|gzclose|gzcompress|gzdecode|gzdeflate|' +
-        'gzencode|gzeof|gzfile|gzgetc|gzgets|gzgetss|gzinflate|gzopen|gzpassthru|gzputs|gzread|gzrewind|gzseek|gztell|gzuncompress|gzwrite|' +
-        'halt_compiler|haruannotation|haruannotation_setborderstyle|haruannotation_sethighlightmode|haruannotation_seticon|' +
-        'haruannotation_setopened|harudestination|harudestination_setfit|harudestination_setfitb|harudestination_setfitbh|harudestination_setfitbv|' +
-        'harudestination_setfith|harudestination_setfitr|harudestination_setfitv|harudestination_setxyz|harudoc|harudoc_addpage|' +
-        'harudoc_addpagelabel|harudoc_construct|harudoc_createoutline|harudoc_getcurrentencoder|harudoc_getcurrentpage|harudoc_getencoder|' +
-        'harudoc_getfont|harudoc_getinfoattr|harudoc_getpagelayout|harudoc_getpagemode|harudoc_getstreamsize|harudoc_insertpage|harudoc_loadjpeg|' +
-        'harudoc_loadpng|harudoc_loadraw|harudoc_loadttc|harudoc_loadttf|harudoc_loadtype1|harudoc_output|harudoc_readfromstream|' +
-        'harudoc_reseterror|harudoc_resetstream|harudoc_save|harudoc_savetostream|harudoc_setcompressionmode|harudoc_setcurrentencoder|' +
-        'harudoc_setencryptionmode|harudoc_setinfoattr|harudoc_setinfodateattr|harudoc_setopenaction|harudoc_setpagelayout|harudoc_setpagemode|' +
-        'harudoc_setpagesconfiguration|harudoc_setpassword|harudoc_setpermission|harudoc_usecnsencodings|harudoc_usecnsfonts|' +
-        'harudoc_usecntencodings|harudoc_usecntfonts|harudoc_usejpencodings|harudoc_usejpfonts|harudoc_usekrencodings|harudoc_usekrfonts|' +
-        'haruencoder|haruencoder_getbytetype|haruencoder_gettype|haruencoder_getunicode|haruencoder_getwritingmode|haruexception|harufont|' +
-        'harufont_getascent|harufont_getcapheight|harufont_getdescent|harufont_getencodingname|harufont_getfontname|harufont_gettextwidth|' +
-        'harufont_getunicodewidth|harufont_getxheight|harufont_measuretext|haruimage|haruimage_getbitspercomponent|haruimage_getcolorspace|' +
-        'haruimage_getheight|haruimage_getsize|haruimage_getwidth|haruimage_setcolormask|haruimage_setmaskimage|haruoutline|' +
-        'haruoutline_setdestination|haruoutline_setopened|harupage|harupage_arc|harupage_begintext|harupage_circle|harupage_closepath|' +
-        'harupage_concat|harupage_createdestination|harupage_createlinkannotation|harupage_createtextannotation|harupage_createurlannotation|' +
-        'harupage_curveto|harupage_curveto2|harupage_curveto3|harupage_drawimage|harupage_ellipse|harupage_endpath|harupage_endtext|' +
-        'harupage_eofill|harupage_eofillstroke|harupage_fill|harupage_fillstroke|harupage_getcharspace|harupage_getcmykfill|harupage_getcmykstroke|' +
-        'harupage_getcurrentfont|harupage_getcurrentfontsize|harupage_getcurrentpos|harupage_getcurrenttextpos|harupage_getdash|' +
-        'harupage_getfillingcolorspace|harupage_getflatness|harupage_getgmode|harupage_getgrayfill|harupage_getgraystroke|harupage_getheight|' +
-        'harupage_gethorizontalscaling|harupage_getlinecap|harupage_getlinejoin|harupage_getlinewidth|harupage_getmiterlimit|harupage_getrgbfill|' +
-        'harupage_getrgbstroke|harupage_getstrokingcolorspace|harupage_gettextleading|harupage_gettextmatrix|harupage_gettextrenderingmode|' +
-        'harupage_gettextrise|harupage_gettextwidth|harupage_gettransmatrix|harupage_getwidth|harupage_getwordspace|harupage_lineto|' +
-        'harupage_measuretext|harupage_movetextpos|harupage_moveto|harupage_movetonextline|harupage_rectangle|harupage_setcharspace|' +
-        'harupage_setcmykfill|harupage_setcmykstroke|harupage_setdash|harupage_setflatness|harupage_setfontandsize|harupage_setgrayfill|' +
-        'harupage_setgraystroke|harupage_setheight|harupage_sethorizontalscaling|harupage_setlinecap|harupage_setlinejoin|harupage_setlinewidth|' +
-        'harupage_setmiterlimit|harupage_setrgbfill|harupage_setrgbstroke|harupage_setrotate|harupage_setsize|harupage_setslideshow|' +
-        'harupage_settextleading|harupage_settextmatrix|harupage_settextrenderingmode|harupage_settextrise|harupage_setwidth|harupage_setwordspace|' +
-        'harupage_showtext|harupage_showtextnextline|harupage_stroke|harupage_textout|harupage_textrect|hasconstant|hash|hash_algos|hash_copy|' +
-        'hash_file|hash_final|hash_hmac|hash_hmac_file|hash_init|hash_update|hash_update_file|hash_update_stream|hasmethod|hasproperty|header|' +
-        'header_register_callback|header_remove|headers_list|headers_sent|hebrev|hebrevc|hex2bin|hexdec|highlight_file|highlight_string|' +
-        'html_entity_decode|htmlentities|htmlspecialchars|htmlspecialchars_decode|http_build_cookie|http_build_query|http_build_str|http_build_url|' +
-        'http_cache_etag|http_cache_last_modified|http_chunked_decode|http_date|http_deflate|http_get|http_get_request_body|' +
-        'http_get_request_body_stream|http_get_request_headers|http_head|http_inflate|http_match_etag|http_match_modified|' +
-        'http_match_request_header|http_negotiate_charset|http_negotiate_content_type|http_negotiate_language|http_parse_cookie|http_parse_headers|' +
-        'http_parse_message|http_parse_params|http_persistent_handles_clean|http_persistent_handles_count|http_persistent_handles_ident|' +
-        'http_post_data|http_post_fields|http_put_data|http_put_file|http_put_stream|http_redirect|http_request|http_request_body_encode|' +
-        'http_request_method_exists|http_request_method_name|http_request_method_register|http_request_method_unregister|http_response_code|' +
-        'http_send_content_disposition|http_send_content_type|http_send_data|http_send_file|http_send_last_modified|http_send_status|' +
-        'http_send_stream|http_support|http_throttle|httpdeflatestream|httpdeflatestream_construct|httpdeflatestream_factory|' +
-        'httpdeflatestream_finish|httpdeflatestream_flush|httpdeflatestream_update|httpinflatestream|httpinflatestream_construct|' +
-        'httpinflatestream_factory|httpinflatestream_finish|httpinflatestream_flush|httpinflatestream_update|httpmessage|httpmessage_addheaders|' +
-        'httpmessage_construct|httpmessage_detach|httpmessage_factory|httpmessage_fromenv|httpmessage_fromstring|httpmessage_getbody|' +
-        'httpmessage_getheader|httpmessage_getheaders|httpmessage_gethttpversion|httpmessage_getparentmessage|httpmessage_getrequestmethod|' +
-        'httpmessage_getrequesturl|httpmessage_getresponsecode|httpmessage_getresponsestatus|httpmessage_gettype|httpmessage_guesscontenttype|' +
-        'httpmessage_prepend|httpmessage_reverse|httpmessage_send|httpmessage_setbody|httpmessage_setheaders|httpmessage_sethttpversion|' +
-        'httpmessage_setrequestmethod|httpmessage_setrequesturl|httpmessage_setresponsecode|httpmessage_setresponsestatus|httpmessage_settype|' +
-        'httpmessage_tomessagetypeobject|httpmessage_tostring|httpquerystring|httpquerystring_construct|httpquerystring_get|httpquerystring_mod|' +
-        'httpquerystring_set|httpquerystring_singleton|httpquerystring_toarray|httpquerystring_tostring|httpquerystring_xlate|httprequest|' +
-        'httprequest_addcookies|httprequest_addheaders|httprequest_addpostfields|httprequest_addpostfile|httprequest_addputdata|' +
-        'httprequest_addquerydata|httprequest_addrawpostdata|httprequest_addssloptions|httprequest_clearhistory|httprequest_construct|' +
-        'httprequest_enablecookies|httprequest_getcontenttype|httprequest_getcookies|httprequest_getheaders|httprequest_gethistory|' +
-        'httprequest_getmethod|httprequest_getoptions|httprequest_getpostfields|httprequest_getpostfiles|httprequest_getputdata|' +
-        'httprequest_getputfile|httprequest_getquerydata|httprequest_getrawpostdata|httprequest_getrawrequestmessage|' +
-        'httprequest_getrawresponsemessage|httprequest_getrequestmessage|httprequest_getresponsebody|httprequest_getresponsecode|' +
-        'httprequest_getresponsecookies|httprequest_getresponsedata|httprequest_getresponseheader|httprequest_getresponseinfo|' +
-        'httprequest_getresponsemessage|httprequest_getresponsestatus|httprequest_getssloptions|httprequest_geturl|httprequest_resetcookies|' +
-        'httprequest_send|httprequest_setcontenttype|httprequest_setcookies|httprequest_setheaders|httprequest_setmethod|httprequest_setoptions|' +
-        'httprequest_setpostfields|httprequest_setpostfiles|httprequest_setputdata|httprequest_setputfile|httprequest_setquerydata|' +
-        'httprequest_setrawpostdata|httprequest_setssloptions|httprequest_seturl|httprequestpool|httprequestpool_attach|httprequestpool_construct|' +
-        'httprequestpool_destruct|httprequestpool_detach|httprequestpool_getattachedrequests|httprequestpool_getfinishedrequests|' +
-        'httprequestpool_reset|httprequestpool_send|httprequestpool_socketperform|httprequestpool_socketselect|httpresponse|httpresponse_capture|' +
-        'httpresponse_getbuffersize|httpresponse_getcache|httpresponse_getcachecontrol|httpresponse_getcontentdisposition|' +
-        'httpresponse_getcontenttype|httpresponse_getdata|httpresponse_getetag|httpresponse_getfile|httpresponse_getgzip|httpresponse_getheader|' +
-        'httpresponse_getlastmodified|httpresponse_getrequestbody|httpresponse_getrequestbodystream|httpresponse_getrequestheaders|' +
-        'httpresponse_getstream|httpresponse_getthrottledelay|httpresponse_guesscontenttype|httpresponse_redirect|httpresponse_send|' +
-        'httpresponse_setbuffersize|httpresponse_setcache|httpresponse_setcachecontrol|httpresponse_setcontentdisposition|' +
-        'httpresponse_setcontenttype|httpresponse_setdata|httpresponse_setetag|httpresponse_setfile|httpresponse_setgzip|httpresponse_setheader|' +
-        'httpresponse_setlastmodified|httpresponse_setstream|httpresponse_setthrottledelay|httpresponse_status|hw_array2objrec|hw_changeobject|' +
-        'hw_children|hw_childrenobj|hw_close|hw_connect|hw_connection_info|hw_cp|hw_deleteobject|hw_docbyanchor|hw_docbyanchorobj|' +
-        'hw_document_attributes|hw_document_bodytag|hw_document_content|hw_document_setcontent|hw_document_size|hw_dummy|hw_edittext|hw_error|' +
-        'hw_errormsg|hw_free_document|hw_getanchors|hw_getanchorsobj|hw_getandlock|hw_getchildcoll|hw_getchildcollobj|hw_getchilddoccoll|' +
-        'hw_getchilddoccollobj|hw_getobject|hw_getobjectbyquery|hw_getobjectbyquerycoll|hw_getobjectbyquerycollobj|hw_getobjectbyqueryobj|' +
-        'hw_getparents|hw_getparentsobj|hw_getrellink|hw_getremote|hw_getremotechildren|hw_getsrcbydestobj|hw_gettext|hw_getusername|hw_identify|' +
-        'hw_incollections|hw_info|hw_inscoll|hw_insdoc|hw_insertanchors|hw_insertdocument|hw_insertobject|hw_mapid|hw_modifyobject|hw_mv|' +
-        'hw_new_document|hw_objrec2array|hw_output_document|hw_pconnect|hw_pipedocument|hw_root|hw_setlinkroot|hw_stat|hw_unlock|hw_who|' +
-        'hwapi_attribute|hwapi_attribute_key|hwapi_attribute_langdepvalue|hwapi_attribute_value|hwapi_attribute_values|hwapi_checkin|' +
-        'hwapi_checkout|hwapi_children|hwapi_content|hwapi_content_mimetype|hwapi_content_read|hwapi_copy|hwapi_dbstat|hwapi_dcstat|' +
-        'hwapi_dstanchors|hwapi_dstofsrcanchor|hwapi_error_count|hwapi_error_reason|hwapi_find|hwapi_ftstat|hwapi_hgcsp|hwapi_hwstat|' +
-        'hwapi_identify|hwapi_info|hwapi_insert|hwapi_insertanchor|hwapi_insertcollection|hwapi_insertdocument|hwapi_link|hwapi_lock|hwapi_move|' +
-        'hwapi_new_content|hwapi_object|hwapi_object_assign|hwapi_object_attreditable|hwapi_object_count|hwapi_object_insert|hwapi_object_new|' +
-        'hwapi_object_remove|hwapi_object_title|hwapi_object_value|hwapi_objectbyanchor|hwapi_parents|hwapi_reason_description|hwapi_reason_type|' +
-        'hwapi_remove|hwapi_replace|hwapi_setcommittedversion|hwapi_srcanchors|hwapi_srcsofdst|hwapi_unlock|hwapi_user|hwapi_userlist|hypot|' +
-        'ibase_add_user|ibase_affected_rows|ibase_backup|ibase_blob_add|ibase_blob_cancel|ibase_blob_close|ibase_blob_create|ibase_blob_echo|' +
-        'ibase_blob_get|ibase_blob_import|ibase_blob_info|ibase_blob_open|ibase_close|ibase_commit|ibase_commit_ret|ibase_connect|ibase_db_info|' +
-        'ibase_delete_user|ibase_drop_db|ibase_errcode|ibase_errmsg|ibase_execute|ibase_fetch_assoc|ibase_fetch_object|ibase_fetch_row|' +
-        'ibase_field_info|ibase_free_event_handler|ibase_free_query|ibase_free_result|ibase_gen_id|ibase_maintain_db|ibase_modify_user|' +
-        'ibase_name_result|ibase_num_fields|ibase_num_params|ibase_param_info|ibase_pconnect|ibase_prepare|ibase_query|ibase_restore|' +
-        'ibase_rollback|ibase_rollback_ret|ibase_server_info|ibase_service_attach|ibase_service_detach|ibase_set_event_handler|ibase_timefmt|' +
-        'ibase_trans|ibase_wait_event|iconv|iconv_get_encoding|iconv_mime_decode|iconv_mime_decode_headers|iconv_mime_encode|iconv_set_encoding|' +
-        'iconv_strlen|iconv_strpos|iconv_strrpos|iconv_substr|id3_get_frame_long_name|id3_get_frame_short_name|id3_get_genre_id|id3_get_genre_list|' +
-        'id3_get_genre_name|id3_get_tag|id3_get_version|id3_remove_tag|id3_set_tag|id3v2attachedpictureframe|id3v2frame|id3v2tag|idate|' +
-        'idn_to_ascii|idn_to_unicode|idn_to_utf8|ifx_affected_rows|ifx_blobinfile_mode|ifx_byteasvarchar|ifx_close|ifx_connect|ifx_copy_blob|' +
-        'ifx_create_blob|ifx_create_char|ifx_do|ifx_error|ifx_errormsg|ifx_fetch_row|ifx_fieldproperties|ifx_fieldtypes|ifx_free_blob|' +
-        'ifx_free_char|ifx_free_result|ifx_get_blob|ifx_get_char|ifx_getsqlca|ifx_htmltbl_result|ifx_nullformat|ifx_num_fields|ifx_num_rows|' +
-        'ifx_pconnect|ifx_prepare|ifx_query|ifx_textasvarchar|ifx_update_blob|ifx_update_char|ifxus_close_slob|ifxus_create_slob|ifxus_free_slob|' +
-        'ifxus_open_slob|ifxus_read_slob|ifxus_seek_slob|ifxus_tell_slob|ifxus_write_slob|ignore_user_abort|iis_add_server|iis_get_dir_security|' +
-        'iis_get_script_map|iis_get_server_by_comment|iis_get_server_by_path|iis_get_server_rights|iis_get_service_state|iis_remove_server|' +
-        'iis_set_app_settings|iis_set_dir_security|iis_set_script_map|iis_set_server_rights|iis_start_server|iis_start_service|iis_stop_server|' +
-        'iis_stop_service|image2wbmp|image_type_to_extension|image_type_to_mime_type|imagealphablending|imageantialias|imagearc|imagechar|' +
-        'imagecharup|imagecolorallocate|imagecolorallocatealpha|imagecolorat|imagecolorclosest|imagecolorclosestalpha|imagecolorclosesthwb|' +
-        'imagecolordeallocate|imagecolorexact|imagecolorexactalpha|imagecolormatch|imagecolorresolve|imagecolorresolvealpha|imagecolorset|' +
-        'imagecolorsforindex|imagecolorstotal|imagecolortransparent|imageconvolution|imagecopy|imagecopymerge|imagecopymergegray|' +
-        'imagecopyresampled|imagecopyresized|imagecreate|imagecreatefromgd|imagecreatefromgd2|imagecreatefromgd2part|imagecreatefromgif|' +
-        'imagecreatefromjpeg|imagecreatefrompng|imagecreatefromstring|imagecreatefromwbmp|imagecreatefromxbm|imagecreatefromxpm|' +
-        'imagecreatetruecolor|imagedashedline|imagedestroy|imageellipse|imagefill|imagefilledarc|imagefilledellipse|imagefilledpolygon|' +
-        'imagefilledrectangle|imagefilltoborder|imagefilter|imagefontheight|imagefontwidth|imageftbbox|imagefttext|imagegammacorrect|imagegd|' +
-        'imagegd2|imagegif|imagegrabscreen|imagegrabwindow|imageinterlace|imageistruecolor|imagejpeg|imagelayereffect|imageline|imageloadfont|' +
-        'imagepalettecopy|imagepng|imagepolygon|imagepsbbox|imagepsencodefont|imagepsextendfont|imagepsfreefont|imagepsloadfont|imagepsslantfont|' +
-        'imagepstext|imagerectangle|imagerotate|imagesavealpha|imagesetbrush|imagesetpixel|imagesetstyle|imagesetthickness|imagesettile|' +
-        'imagestring|imagestringup|imagesx|imagesy|imagetruecolortopalette|imagettfbbox|imagettftext|imagetypes|imagewbmp|imagexbm|imagick|' +
-        'imagick_adaptiveblurimage|imagick_adaptiveresizeimage|imagick_adaptivesharpenimage|imagick_adaptivethresholdimage|imagick_addimage|' +
-        'imagick_addnoiseimage|imagick_affinetransformimage|imagick_animateimages|imagick_annotateimage|imagick_appendimages|imagick_averageimages|' +
-        'imagick_blackthresholdimage|imagick_blurimage|imagick_borderimage|imagick_charcoalimage|imagick_chopimage|imagick_clear|imagick_clipimage|' +
-        'imagick_clippathimage|imagick_clone|imagick_clutimage|imagick_coalesceimages|imagick_colorfloodfillimage|imagick_colorizeimage|' +
-        'imagick_combineimages|imagick_commentimage|imagick_compareimagechannels|imagick_compareimagelayers|imagick_compareimages|' +
-        'imagick_compositeimage|imagick_construct|imagick_contrastimage|imagick_contraststretchimage|imagick_convolveimage|imagick_cropimage|' +
-        'imagick_cropthumbnailimage|imagick_current|imagick_cyclecolormapimage|imagick_decipherimage|imagick_deconstructimages|' +
-        'imagick_deleteimageartifact|imagick_despeckleimage|imagick_destroy|imagick_displayimage|imagick_displayimages|imagick_distortimage|' +
-        'imagick_drawimage|imagick_edgeimage|imagick_embossimage|imagick_encipherimage|imagick_enhanceimage|imagick_equalizeimage|' +
-        'imagick_evaluateimage|imagick_extentimage|imagick_flattenimages|imagick_flipimage|imagick_floodfillpaintimage|imagick_flopimage|' +
-        'imagick_frameimage|imagick_fximage|imagick_gammaimage|imagick_gaussianblurimage|imagick_getcolorspace|imagick_getcompression|' +
-        'imagick_getcompressionquality|imagick_getcopyright|imagick_getfilename|imagick_getfont|imagick_getformat|imagick_getgravity|' +
-        'imagick_gethomeurl|imagick_getimage|imagick_getimagealphachannel|imagick_getimageartifact|imagick_getimagebackgroundcolor|' +
-        'imagick_getimageblob|imagick_getimageblueprimary|imagick_getimagebordercolor|imagick_getimagechanneldepth|' +
-        'imagick_getimagechanneldistortion|imagick_getimagechanneldistortions|imagick_getimagechannelextrema|imagick_getimagechannelmean|' +
-        'imagick_getimagechannelrange|imagick_getimagechannelstatistics|imagick_getimageclipmask|imagick_getimagecolormapcolor|' +
-        'imagick_getimagecolors|imagick_getimagecolorspace|imagick_getimagecompose|imagick_getimagecompression|imagick_getimagecompressionquality|' +
-        'imagick_getimagedelay|imagick_getimagedepth|imagick_getimagedispose|imagick_getimagedistortion|imagick_getimageextrema|' +
-        'imagick_getimagefilename|imagick_getimageformat|imagick_getimagegamma|imagick_getimagegeometry|imagick_getimagegravity|' +
-        'imagick_getimagegreenprimary|imagick_getimageheight|imagick_getimagehistogram|imagick_getimageindex|imagick_getimageinterlacescheme|' +
-        'imagick_getimageinterpolatemethod|imagick_getimageiterations|imagick_getimagelength|imagick_getimagemagicklicense|imagick_getimagematte|' +
-        'imagick_getimagemattecolor|imagick_getimageorientation|imagick_getimagepage|imagick_getimagepixelcolor|imagick_getimageprofile|' +
-        'imagick_getimageprofiles|imagick_getimageproperties|imagick_getimageproperty|imagick_getimageredprimary|imagick_getimageregion|' +
-        'imagick_getimagerenderingintent|imagick_getimageresolution|imagick_getimagesblob|imagick_getimagescene|imagick_getimagesignature|' +
-        'imagick_getimagesize|imagick_getimagetickspersecond|imagick_getimagetotalinkdensity|imagick_getimagetype|imagick_getimageunits|' +
-        'imagick_getimagevirtualpixelmethod|imagick_getimagewhitepoint|imagick_getimagewidth|imagick_getinterlacescheme|imagick_getiteratorindex|' +
-        'imagick_getnumberimages|imagick_getoption|imagick_getpackagename|imagick_getpage|imagick_getpixeliterator|imagick_getpixelregioniterator|' +
-        'imagick_getpointsize|imagick_getquantumdepth|imagick_getquantumrange|imagick_getreleasedate|imagick_getresource|imagick_getresourcelimit|' +
-        'imagick_getsamplingfactors|imagick_getsize|imagick_getsizeoffset|imagick_getversion|imagick_hasnextimage|imagick_haspreviousimage|' +
-        'imagick_identifyimage|imagick_implodeimage|imagick_labelimage|imagick_levelimage|imagick_linearstretchimage|imagick_liquidrescaleimage|' +
-        'imagick_magnifyimage|imagick_mapimage|imagick_mattefloodfillimage|imagick_medianfilterimage|imagick_mergeimagelayers|imagick_minifyimage|' +
-        'imagick_modulateimage|imagick_montageimage|imagick_morphimages|imagick_mosaicimages|imagick_motionblurimage|imagick_negateimage|' +
-        'imagick_newimage|imagick_newpseudoimage|imagick_nextimage|imagick_normalizeimage|imagick_oilpaintimage|imagick_opaquepaintimage|' +
-        'imagick_optimizeimagelayers|imagick_orderedposterizeimage|imagick_paintfloodfillimage|imagick_paintopaqueimage|' +
-        'imagick_painttransparentimage|imagick_pingimage|imagick_pingimageblob|imagick_pingimagefile|imagick_polaroidimage|imagick_posterizeimage|' +
-        'imagick_previewimages|imagick_previousimage|imagick_profileimage|imagick_quantizeimage|imagick_quantizeimages|imagick_queryfontmetrics|' +
-        'imagick_queryfonts|imagick_queryformats|imagick_radialblurimage|imagick_raiseimage|imagick_randomthresholdimage|imagick_readimage|' +
-        'imagick_readimageblob|imagick_readimagefile|imagick_recolorimage|imagick_reducenoiseimage|imagick_removeimage|imagick_removeimageprofile|' +
-        'imagick_render|imagick_resampleimage|imagick_resetimagepage|imagick_resizeimage|imagick_rollimage|imagick_rotateimage|' +
-        'imagick_roundcorners|imagick_sampleimage|imagick_scaleimage|imagick_separateimagechannel|imagick_sepiatoneimage|' +
-        'imagick_setbackgroundcolor|imagick_setcolorspace|imagick_setcompression|imagick_setcompressionquality|imagick_setfilename|' +
-        'imagick_setfirstiterator|imagick_setfont|imagick_setformat|imagick_setgravity|imagick_setimage|imagick_setimagealphachannel|' +
-        'imagick_setimageartifact|imagick_setimagebackgroundcolor|imagick_setimagebias|imagick_setimageblueprimary|imagick_setimagebordercolor|' +
-        'imagick_setimagechanneldepth|imagick_setimageclipmask|imagick_setimagecolormapcolor|imagick_setimagecolorspace|imagick_setimagecompose|' +
-        'imagick_setimagecompression|imagick_setimagecompressionquality|imagick_setimagedelay|imagick_setimagedepth|imagick_setimagedispose|' +
-        'imagick_setimageextent|imagick_setimagefilename|imagick_setimageformat|imagick_setimagegamma|imagick_setimagegravity|' +
-        'imagick_setimagegreenprimary|imagick_setimageindex|imagick_setimageinterlacescheme|imagick_setimageinterpolatemethod|' +
-        'imagick_setimageiterations|imagick_setimagematte|imagick_setimagemattecolor|imagick_setimageopacity|imagick_setimageorientation|' +
-        'imagick_setimagepage|imagick_setimageprofile|imagick_setimageproperty|imagick_setimageredprimary|imagick_setimagerenderingintent|' +
-        'imagick_setimageresolution|imagick_setimagescene|imagick_setimagetickspersecond|imagick_setimagetype|imagick_setimageunits|' +
-        'imagick_setimagevirtualpixelmethod|imagick_setimagewhitepoint|imagick_setinterlacescheme|imagick_setiteratorindex|imagick_setlastiterator|' +
-        'imagick_setoption|imagick_setpage|imagick_setpointsize|imagick_setresolution|imagick_setresourcelimit|imagick_setsamplingfactors|' +
-        'imagick_setsize|imagick_setsizeoffset|imagick_settype|imagick_shadeimage|imagick_shadowimage|imagick_sharpenimage|imagick_shaveimage|' +
-        'imagick_shearimage|imagick_sigmoidalcontrastimage|imagick_sketchimage|imagick_solarizeimage|imagick_spliceimage|imagick_spreadimage|' +
-        'imagick_steganoimage|imagick_stereoimage|imagick_stripimage|imagick_swirlimage|imagick_textureimage|imagick_thresholdimage|' +
-        'imagick_thumbnailimage|imagick_tintimage|imagick_transformimage|imagick_transparentpaintimage|imagick_transposeimage|' +
-        'imagick_transverseimage|imagick_trimimage|imagick_uniqueimagecolors|imagick_unsharpmaskimage|imagick_valid|imagick_vignetteimage|' +
-        'imagick_waveimage|imagick_whitethresholdimage|imagick_writeimage|imagick_writeimagefile|imagick_writeimages|imagick_writeimagesfile|' +
-        'imagickdraw|imagickdraw_affine|imagickdraw_annotation|imagickdraw_arc|imagickdraw_bezier|imagickdraw_circle|imagickdraw_clear|' +
-        'imagickdraw_clone|imagickdraw_color|imagickdraw_comment|imagickdraw_composite|imagickdraw_construct|imagickdraw_destroy|' +
-        'imagickdraw_ellipse|imagickdraw_getclippath|imagickdraw_getcliprule|imagickdraw_getclipunits|imagickdraw_getfillcolor|' +
-        'imagickdraw_getfillopacity|imagickdraw_getfillrule|imagickdraw_getfont|imagickdraw_getfontfamily|imagickdraw_getfontsize|' +
-        'imagickdraw_getfontstyle|imagickdraw_getfontweight|imagickdraw_getgravity|imagickdraw_getstrokeantialias|imagickdraw_getstrokecolor|' +
-        'imagickdraw_getstrokedasharray|imagickdraw_getstrokedashoffset|imagickdraw_getstrokelinecap|imagickdraw_getstrokelinejoin|' +
-        'imagickdraw_getstrokemiterlimit|imagickdraw_getstrokeopacity|imagickdraw_getstrokewidth|imagickdraw_gettextalignment|' +
-        'imagickdraw_gettextantialias|imagickdraw_gettextdecoration|imagickdraw_gettextencoding|imagickdraw_gettextundercolor|' +
-        'imagickdraw_getvectorgraphics|imagickdraw_line|imagickdraw_matte|imagickdraw_pathclose|imagickdraw_pathcurvetoabsolute|' +
-        'imagickdraw_pathcurvetoquadraticbezierabsolute|imagickdraw_pathcurvetoquadraticbezierrelative|' +
-        'imagickdraw_pathcurvetoquadraticbeziersmoothabsolute|imagickdraw_pathcurvetoquadraticbeziersmoothrelative|imagickdraw_pathcurvetorelative|' +
-        'imagickdraw_pathcurvetosmoothabsolute|imagickdraw_pathcurvetosmoothrelative|imagickdraw_pathellipticarcabsolute|' +
-        'imagickdraw_pathellipticarcrelative|imagickdraw_pathfinish|imagickdraw_pathlinetoabsolute|imagickdraw_pathlinetohorizontalabsolute|' +
-        'imagickdraw_pathlinetohorizontalrelative|imagickdraw_pathlinetorelative|imagickdraw_pathlinetoverticalabsolute|' +
-        'imagickdraw_pathlinetoverticalrelative|imagickdraw_pathmovetoabsolute|imagickdraw_pathmovetorelative|imagickdraw_pathstart|' +
-        'imagickdraw_point|imagickdraw_polygon|imagickdraw_polyline|imagickdraw_pop|imagickdraw_popclippath|imagickdraw_popdefs|' +
-        'imagickdraw_poppattern|imagickdraw_push|imagickdraw_pushclippath|imagickdraw_pushdefs|imagickdraw_pushpattern|imagickdraw_rectangle|' +
-        'imagickdraw_render|imagickdraw_rotate|imagickdraw_roundrectangle|imagickdraw_scale|imagickdraw_setclippath|imagickdraw_setcliprule|' +
-        'imagickdraw_setclipunits|imagickdraw_setfillalpha|imagickdraw_setfillcolor|imagickdraw_setfillopacity|imagickdraw_setfillpatternurl|' +
-        'imagickdraw_setfillrule|imagickdraw_setfont|imagickdraw_setfontfamily|imagickdraw_setfontsize|imagickdraw_setfontstretch|' +
-        'imagickdraw_setfontstyle|imagickdraw_setfontweight|imagickdraw_setgravity|imagickdraw_setstrokealpha|imagickdraw_setstrokeantialias|' +
-        'imagickdraw_setstrokecolor|imagickdraw_setstrokedasharray|imagickdraw_setstrokedashoffset|imagickdraw_setstrokelinecap|' +
-        'imagickdraw_setstrokelinejoin|imagickdraw_setstrokemiterlimit|imagickdraw_setstrokeopacity|imagickdraw_setstrokepatternurl|' +
-        'imagickdraw_setstrokewidth|imagickdraw_settextalignment|imagickdraw_settextantialias|imagickdraw_settextdecoration|' +
-        'imagickdraw_settextencoding|imagickdraw_settextundercolor|imagickdraw_setvectorgraphics|imagickdraw_setviewbox|imagickdraw_skewx|' +
-        'imagickdraw_skewy|imagickdraw_translate|imagickpixel|imagickpixel_clear|imagickpixel_construct|imagickpixel_destroy|imagickpixel_getcolor|' +
-        'imagickpixel_getcolorasstring|imagickpixel_getcolorcount|imagickpixel_getcolorvalue|imagickpixel_gethsl|imagickpixel_issimilar|' +
-        'imagickpixel_setcolor|imagickpixel_setcolorvalue|imagickpixel_sethsl|imagickpixeliterator|imagickpixeliterator_clear|' +
-        'imagickpixeliterator_construct|imagickpixeliterator_destroy|imagickpixeliterator_getcurrentiteratorrow|' +
-        'imagickpixeliterator_getiteratorrow|imagickpixeliterator_getnextiteratorrow|imagickpixeliterator_getpreviousiteratorrow|' +
-        'imagickpixeliterator_newpixeliterator|imagickpixeliterator_newpixelregioniterator|imagickpixeliterator_resetiterator|' +
-        'imagickpixeliterator_setiteratorfirstrow|imagickpixeliterator_setiteratorlastrow|imagickpixeliterator_setiteratorrow|' +
-        'imagickpixeliterator_synciterator|imap_8bit|imap_alerts|imap_append|imap_base64|imap_binary|imap_body|imap_bodystruct|imap_check|' +
-        'imap_clearflag_full|imap_close|imap_create|imap_createmailbox|imap_delete|imap_deletemailbox|imap_errors|imap_expunge|imap_fetch_overview|' +
-        'imap_fetchbody|imap_fetchheader|imap_fetchmime|imap_fetchstructure|imap_fetchtext|imap_gc|imap_get_quota|imap_get_quotaroot|imap_getacl|' +
-        'imap_getmailboxes|imap_getsubscribed|imap_header|imap_headerinfo|imap_headers|imap_last_error|imap_list|imap_listmailbox|imap_listscan|' +
-        'imap_listsubscribed|imap_lsub|imap_mail|imap_mail_compose|imap_mail_copy|imap_mail_move|imap_mailboxmsginfo|imap_mime_header_decode|' +
-        'imap_msgno|imap_num_msg|imap_num_recent|imap_open|imap_ping|imap_qprint|imap_rename|imap_renamemailbox|imap_reopen|' +
-        'imap_rfc822_parse_adrlist|imap_rfc822_parse_headers|imap_rfc822_write_address|imap_savebody|imap_scan|imap_scanmailbox|imap_search|' +
-        'imap_set_quota|imap_setacl|imap_setflag_full|imap_sort|imap_status|imap_subscribe|imap_thread|imap_timeout|imap_uid|imap_undelete|' +
-        'imap_unsubscribe|imap_utf7_decode|imap_utf7_encode|imap_utf8|implementsinterface|implode|import_request_variables|in_array|include|' +
-        'include_once|inclued_get_data|inet_ntop|inet_pton|infiniteiterator|ingres_autocommit|ingres_autocommit_state|ingres_charset|ingres_close|' +
-        'ingres_commit|ingres_connect|ingres_cursor|ingres_errno|ingres_error|ingres_errsqlstate|ingres_escape_string|ingres_execute|' +
-        'ingres_fetch_array|ingres_fetch_assoc|ingres_fetch_object|ingres_fetch_proc_return|ingres_fetch_row|ingres_field_length|ingres_field_name|' +
-        'ingres_field_nullable|ingres_field_precision|ingres_field_scale|ingres_field_type|ingres_free_result|ingres_next_error|ingres_num_fields|' +
-        'ingres_num_rows|ingres_pconnect|ingres_prepare|ingres_query|ingres_result_seek|ingres_rollback|ingres_set_environment|' +
-        'ingres_unbuffered_query|ini_alter|ini_get|ini_get_all|ini_restore|ini_set|innamespace|inotify_add_watch|inotify_init|inotify_queue_len|' +
-        'inotify_read|inotify_rm_watch|interface_exists|intl_error_name|intl_get_error_code|intl_get_error_message|intl_is_failure|' +
-        'intldateformatter|intval|invalidargumentexception|invoke|invokeargs|ip2long|iptcembed|iptcparse|is_a|is_array|is_bool|is_callable|is_dir|' +
-        'is_double|is_executable|is_file|is_finite|is_float|is_infinite|is_int|is_integer|is_link|is_long|is_nan|is_null|is_numeric|is_object|' +
-        'is_readable|is_real|is_resource|is_scalar|is_soap_fault|is_string|is_subclass_of|is_uploaded_file|is_writable|is_writeable|isabstract|' +
-        'iscloneable|isdisabled|isfinal|isinstance|isinstantiable|isinterface|isinternal|isiterateable|isset|issubclassof|isuserdefined|iterator|' +
-        'iterator_apply|iterator_count|iterator_to_array|iteratoraggregate|iteratoriterator|java_last_exception_clear|java_last_exception_get|' +
-        'jddayofweek|jdmonthname|jdtofrench|jdtogregorian|jdtojewish|jdtojulian|jdtounix|jewishtojd|join|jpeg2wbmp|json_decode|json_encode|' +
-        'json_last_error|jsonserializable|judy|judy_type|judy_version|juliantojd|kadm5_chpass_principal|kadm5_create_principal|' +
-        'kadm5_delete_principal|kadm5_destroy|kadm5_flush|kadm5_get_policies|kadm5_get_principal|kadm5_get_principals|kadm5_init_with_password|' +
-        'kadm5_modify_principal|key|krsort|ksort|lcfirst|lcg_value|lchgrp|lchown|ldap_8859_to_t61|ldap_add|ldap_bind|ldap_close|ldap_compare|' +
-        'ldap_connect|ldap_count_entries|ldap_delete|ldap_dn2ufn|ldap_err2str|ldap_errno|ldap_error|ldap_explode_dn|ldap_first_attribute|' +
-        'ldap_first_entry|ldap_first_reference|ldap_free_result|ldap_get_attributes|ldap_get_dn|ldap_get_entries|ldap_get_option|ldap_get_values|' +
-        'ldap_get_values_len|ldap_list|ldap_mod_add|ldap_mod_del|ldap_mod_replace|ldap_modify|ldap_next_attribute|ldap_next_entry|' +
-        'ldap_next_reference|ldap_parse_reference|ldap_parse_result|ldap_read|ldap_rename|ldap_sasl_bind|ldap_search|ldap_set_option|' +
-        'ldap_set_rebind_proc|ldap_sort|ldap_start_tls|ldap_t61_to_8859|ldap_unbind|lengthexception|levenshtein|libxml_clear_errors|' +
-        'libxml_disable_entity_loader|libxml_get_errors|libxml_get_last_error|libxml_set_streams_context|libxml_use_internal_errors|libxmlerror|' +
-        'limititerator|link|linkinfo|list|locale|localeconv|localtime|log|log10|log1p|logicexception|long2ip|lstat|ltrim|lzf_compress|' +
-        'lzf_decompress|lzf_optimized_for|m_checkstatus|m_completeauthorizations|m_connect|m_connectionerror|m_deletetrans|m_destroyconn|' +
-        'm_destroyengine|m_getcell|m_getcellbynum|m_getcommadelimited|m_getheader|m_initconn|m_initengine|m_iscommadelimited|m_maxconntimeout|' +
-        'm_monitor|m_numcolumns|m_numrows|m_parsecommadelimited|m_responsekeys|m_responseparam|m_returnstatus|m_setblocking|m_setdropfile|m_setip|' +
-        'm_setssl|m_setssl_cafile|m_setssl_files|m_settimeout|m_sslcert_gen_hash|m_transactionssent|m_transinqueue|m_transkeyval|m_transnew|' +
-        'm_transsend|m_uwait|m_validateidentifier|m_verifyconnection|m_verifysslcert|magic_quotes_runtime|mail|' +
-        'mailparse_determine_best_xfer_encoding|mailparse_msg_create|mailparse_msg_extract_part|mailparse_msg_extract_part_file|' +
-        'mailparse_msg_extract_whole_part_file|mailparse_msg_free|mailparse_msg_get_part|mailparse_msg_get_part_data|mailparse_msg_get_structure|' +
-        'mailparse_msg_parse|mailparse_msg_parse_file|mailparse_rfc822_parse_addresses|mailparse_stream_encode|mailparse_uudecode_all|main|max|' +
-        'maxdb_affected_rows|maxdb_autocommit|maxdb_bind_param|maxdb_bind_result|maxdb_change_user|maxdb_character_set_name|maxdb_client_encoding|' +
-        'maxdb_close|maxdb_close_long_data|maxdb_commit|maxdb_connect|maxdb_connect_errno|maxdb_connect_error|maxdb_data_seek|maxdb_debug|' +
-        'maxdb_disable_reads_from_master|maxdb_disable_rpl_parse|maxdb_dump_debug_info|maxdb_embedded_connect|maxdb_enable_reads_from_master|' +
-        'maxdb_enable_rpl_parse|maxdb_errno|maxdb_error|maxdb_escape_string|maxdb_execute|maxdb_fetch|maxdb_fetch_array|maxdb_fetch_assoc|' +
-        'maxdb_fetch_field|maxdb_fetch_field_direct|maxdb_fetch_fields|maxdb_fetch_lengths|maxdb_fetch_object|maxdb_fetch_row|maxdb_field_count|' +
-        'maxdb_field_seek|maxdb_field_tell|maxdb_free_result|maxdb_get_client_info|maxdb_get_client_version|maxdb_get_host_info|maxdb_get_metadata|' +
-        'maxdb_get_proto_info|maxdb_get_server_info|maxdb_get_server_version|maxdb_info|maxdb_init|maxdb_insert_id|maxdb_kill|maxdb_master_query|' +
-        'maxdb_more_results|maxdb_multi_query|maxdb_next_result|maxdb_num_fields|maxdb_num_rows|maxdb_options|maxdb_param_count|maxdb_ping|' +
-        'maxdb_prepare|maxdb_query|maxdb_real_connect|maxdb_real_escape_string|maxdb_real_query|maxdb_report|maxdb_rollback|' +
-        'maxdb_rpl_parse_enabled|maxdb_rpl_probe|maxdb_rpl_query_type|maxdb_select_db|maxdb_send_long_data|maxdb_send_query|maxdb_server_end|' +
-        'maxdb_server_init|maxdb_set_opt|maxdb_sqlstate|maxdb_ssl_set|maxdb_stat|maxdb_stmt_affected_rows|maxdb_stmt_bind_param|' +
-        'maxdb_stmt_bind_result|maxdb_stmt_close|maxdb_stmt_close_long_data|maxdb_stmt_data_seek|maxdb_stmt_errno|maxdb_stmt_error|' +
-        'maxdb_stmt_execute|maxdb_stmt_fetch|maxdb_stmt_free_result|maxdb_stmt_init|maxdb_stmt_num_rows|maxdb_stmt_param_count|maxdb_stmt_prepare|' +
-        'maxdb_stmt_reset|maxdb_stmt_result_metadata|maxdb_stmt_send_long_data|maxdb_stmt_sqlstate|maxdb_stmt_store_result|maxdb_store_result|' +
-        'maxdb_thread_id|maxdb_thread_safe|maxdb_use_result|maxdb_warning_count|mb_check_encoding|mb_convert_case|mb_convert_encoding|' +
-        'mb_convert_kana|mb_convert_variables|mb_decode_mimeheader|mb_decode_numericentity|mb_detect_encoding|mb_detect_order|mb_encode_mimeheader|' +
-        'mb_encode_numericentity|mb_encoding_aliases|mb_ereg|mb_ereg_match|mb_ereg_replace|mb_ereg_search|mb_ereg_search_getpos|' +
-        'mb_ereg_search_getregs|mb_ereg_search_init|mb_ereg_search_pos|mb_ereg_search_regs|mb_ereg_search_setpos|mb_eregi|mb_eregi_replace|' +
-        'mb_get_info|mb_http_input|mb_http_output|mb_internal_encoding|mb_language|mb_list_encodings|mb_output_handler|mb_parse_str|' +
-        'mb_preferred_mime_name|mb_regex_encoding|mb_regex_set_options|mb_send_mail|mb_split|mb_strcut|mb_strimwidth|mb_stripos|mb_stristr|' +
-        'mb_strlen|mb_strpos|mb_strrchr|mb_strrichr|mb_strripos|mb_strrpos|mb_strstr|mb_strtolower|mb_strtoupper|mb_strwidth|' +
-        'mb_substitute_character|mb_substr|mb_substr_count|mcrypt_cbc|mcrypt_cfb|mcrypt_create_iv|mcrypt_decrypt|mcrypt_ecb|' +
-        'mcrypt_enc_get_algorithms_name|mcrypt_enc_get_block_size|mcrypt_enc_get_iv_size|mcrypt_enc_get_key_size|mcrypt_enc_get_modes_name|' +
-        'mcrypt_enc_get_supported_key_sizes|mcrypt_enc_is_block_algorithm|mcrypt_enc_is_block_algorithm_mode|mcrypt_enc_is_block_mode|' +
-        'mcrypt_enc_self_test|mcrypt_encrypt|mcrypt_generic|mcrypt_generic_deinit|mcrypt_generic_end|mcrypt_generic_init|mcrypt_get_block_size|' +
-        'mcrypt_get_cipher_name|mcrypt_get_iv_size|mcrypt_get_key_size|mcrypt_list_algorithms|mcrypt_list_modes|mcrypt_module_close|' +
-        'mcrypt_module_get_algo_block_size|mcrypt_module_get_algo_key_size|mcrypt_module_get_supported_key_sizes|mcrypt_module_is_block_algorithm|' +
-        'mcrypt_module_is_block_algorithm_mode|mcrypt_module_is_block_mode|mcrypt_module_open|mcrypt_module_self_test|mcrypt_ofb|md5|md5_file|' +
-        'mdecrypt_generic|memcache|memcache_debug|memcached|memory_get_peak_usage|memory_get_usage|messageformatter|metaphone|method_exists|mhash|' +
-        'mhash_count|mhash_get_block_size|mhash_get_hash_name|mhash_keygen_s2k|microtime|mime_content_type|min|ming_keypress|' +
-        'ming_setcubicthreshold|ming_setscale|ming_setswfcompression|ming_useconstants|ming_useswfversion|mkdir|mktime|money_format|mongo|' +
-        'mongobindata|mongocode|mongocollection|mongoconnectionexception|mongocursor|mongocursorexception|mongocursortimeoutexception|mongodate|' +
-        'mongodb|mongodbref|mongoexception|mongogridfs|mongogridfscursor|mongogridfsexception|mongogridfsfile|mongoid|mongoint32|mongoint64|' +
-        'mongomaxkey|mongominkey|mongoregex|mongotimestamp|move_uploaded_file|mpegfile|mqseries_back|mqseries_begin|mqseries_close|mqseries_cmit|' +
-        'mqseries_conn|mqseries_connx|mqseries_disc|mqseries_get|mqseries_inq|mqseries_open|mqseries_put|mqseries_put1|mqseries_set|' +
-        'mqseries_strerror|msession_connect|msession_count|msession_create|msession_destroy|msession_disconnect|msession_find|msession_get|' +
-        'msession_get_array|msession_get_data|msession_inc|msession_list|msession_listvar|msession_lock|msession_plugin|msession_randstr|' +
-        'msession_set|msession_set_array|msession_set_data|msession_timeout|msession_uniq|msession_unlock|msg_get_queue|msg_queue_exists|' +
-        'msg_receive|msg_remove_queue|msg_send|msg_set_queue|msg_stat_queue|msql|msql_affected_rows|msql_close|msql_connect|msql_create_db|' +
-        'msql_createdb|msql_data_seek|msql_db_query|msql_dbname|msql_drop_db|msql_error|msql_fetch_array|msql_fetch_field|msql_fetch_object|' +
-        'msql_fetch_row|msql_field_flags|msql_field_len|msql_field_name|msql_field_seek|msql_field_table|msql_field_type|msql_fieldflags|' +
-        'msql_fieldlen|msql_fieldname|msql_fieldtable|msql_fieldtype|msql_free_result|msql_list_dbs|msql_list_fields|msql_list_tables|' +
-        'msql_num_fields|msql_num_rows|msql_numfields|msql_numrows|msql_pconnect|msql_query|msql_regcase|msql_result|msql_select_db|msql_tablename|' +
-        'mssql_bind|mssql_close|mssql_connect|mssql_data_seek|mssql_execute|mssql_fetch_array|mssql_fetch_assoc|mssql_fetch_batch|' +
-        'mssql_fetch_field|mssql_fetch_object|mssql_fetch_row|mssql_field_length|mssql_field_name|mssql_field_seek|mssql_field_type|' +
-        'mssql_free_result|mssql_free_statement|mssql_get_last_message|mssql_guid_string|mssql_init|mssql_min_error_severity|' +
-        'mssql_min_message_severity|mssql_next_result|mssql_num_fields|mssql_num_rows|mssql_pconnect|mssql_query|mssql_result|mssql_rows_affected|' +
-        'mssql_select_db|mt_getrandmax|mt_rand|mt_srand|multipleiterator|mysql_affected_rows|mysql_client_encoding|mysql_close|mysql_connect|' +
-        'mysql_create_db|mysql_data_seek|mysql_db_name|mysql_db_query|mysql_drop_db|mysql_errno|mysql_error|mysql_escape_string|mysql_fetch_array|' +
-        'mysql_fetch_assoc|mysql_fetch_field|mysql_fetch_lengths|mysql_fetch_object|mysql_fetch_row|mysql_field_flags|mysql_field_len|' +
-        'mysql_field_name|mysql_field_seek|mysql_field_table|mysql_field_type|mysql_free_result|mysql_get_client_info|mysql_get_host_info|' +
-        'mysql_get_proto_info|mysql_get_server_info|mysql_info|mysql_insert_id|mysql_list_dbs|mysql_list_fields|mysql_list_processes|' +
-        'mysql_list_tables|mysql_num_fields|mysql_num_rows|mysql_pconnect|mysql_ping|mysql_query|mysql_real_escape_string|mysql_result|' +
-        'mysql_select_db|mysql_set_charset|mysql_stat|mysql_tablename|mysql_thread_id|mysql_unbuffered_query|mysqli|mysqli_bind_param|' +
-        'mysqli_bind_result|mysqli_client_encoding|mysqli_connect|mysqli_disable_reads_from_master|mysqli_disable_rpl_parse|mysqli_driver|' +
-        'mysqli_enable_reads_from_master|mysqli_enable_rpl_parse|mysqli_escape_string|mysqli_execute|mysqli_fetch|mysqli_get_metadata|' +
-        'mysqli_master_query|mysqli_param_count|mysqli_report|mysqli_result|mysqli_rpl_parse_enabled|mysqli_rpl_probe|mysqli_rpl_query_type|' +
-        'mysqli_send_long_data|mysqli_send_query|mysqli_set_opt|mysqli_slave_query|mysqli_stmt|mysqli_warning|mysqlnd_ms_get_stats|' +
-        'mysqlnd_ms_query_is_select|mysqlnd_ms_set_user_pick_server|mysqlnd_qc_change_handler|mysqlnd_qc_clear_cache|mysqlnd_qc_get_cache_info|' +
-        'mysqlnd_qc_get_core_stats|mysqlnd_qc_get_handler|mysqlnd_qc_get_query_trace_log|mysqlnd_qc_set_user_handlers|natcasesort|natsort|' +
-        'ncurses_addch|ncurses_addchnstr|ncurses_addchstr|ncurses_addnstr|ncurses_addstr|ncurses_assume_default_colors|ncurses_attroff|' +
-        'ncurses_attron|ncurses_attrset|ncurses_baudrate|ncurses_beep|ncurses_bkgd|ncurses_bkgdset|ncurses_border|ncurses_bottom_panel|' +
-        'ncurses_can_change_color|ncurses_cbreak|ncurses_clear|ncurses_clrtobot|ncurses_clrtoeol|ncurses_color_content|ncurses_color_set|' +
-        'ncurses_curs_set|ncurses_def_prog_mode|ncurses_def_shell_mode|ncurses_define_key|ncurses_del_panel|ncurses_delay_output|ncurses_delch|' +
-        'ncurses_deleteln|ncurses_delwin|ncurses_doupdate|ncurses_echo|ncurses_echochar|ncurses_end|ncurses_erase|ncurses_erasechar|ncurses_filter|' +
-        'ncurses_flash|ncurses_flushinp|ncurses_getch|ncurses_getmaxyx|ncurses_getmouse|ncurses_getyx|ncurses_halfdelay|ncurses_has_colors|' +
-        'ncurses_has_ic|ncurses_has_il|ncurses_has_key|ncurses_hide_panel|ncurses_hline|ncurses_inch|ncurses_init|ncurses_init_color|' +
-        'ncurses_init_pair|ncurses_insch|ncurses_insdelln|ncurses_insertln|ncurses_insstr|ncurses_instr|ncurses_isendwin|ncurses_keyok|' +
-        'ncurses_keypad|ncurses_killchar|ncurses_longname|ncurses_meta|ncurses_mouse_trafo|ncurses_mouseinterval|ncurses_mousemask|ncurses_move|' +
-        'ncurses_move_panel|ncurses_mvaddch|ncurses_mvaddchnstr|ncurses_mvaddchstr|ncurses_mvaddnstr|ncurses_mvaddstr|ncurses_mvcur|' +
-        'ncurses_mvdelch|ncurses_mvgetch|ncurses_mvhline|ncurses_mvinch|ncurses_mvvline|ncurses_mvwaddstr|ncurses_napms|ncurses_new_panel|' +
-        'ncurses_newpad|ncurses_newwin|ncurses_nl|ncurses_nocbreak|ncurses_noecho|ncurses_nonl|ncurses_noqiflush|ncurses_noraw|' +
-        'ncurses_pair_content|ncurses_panel_above|ncurses_panel_below|ncurses_panel_window|ncurses_pnoutrefresh|ncurses_prefresh|ncurses_putp|' +
-        'ncurses_qiflush|ncurses_raw|ncurses_refresh|ncurses_replace_panel|ncurses_reset_prog_mode|ncurses_reset_shell_mode|ncurses_resetty|' +
-        'ncurses_savetty|ncurses_scr_dump|ncurses_scr_init|ncurses_scr_restore|ncurses_scr_set|ncurses_scrl|ncurses_show_panel|ncurses_slk_attr|' +
-        'ncurses_slk_attroff|ncurses_slk_attron|ncurses_slk_attrset|ncurses_slk_clear|ncurses_slk_color|ncurses_slk_init|ncurses_slk_noutrefresh|' +
-        'ncurses_slk_refresh|ncurses_slk_restore|ncurses_slk_set|ncurses_slk_touch|ncurses_standend|ncurses_standout|ncurses_start_color|' +
-        'ncurses_termattrs|ncurses_termname|ncurses_timeout|ncurses_top_panel|ncurses_typeahead|ncurses_ungetch|ncurses_ungetmouse|' +
-        'ncurses_update_panels|ncurses_use_default_colors|ncurses_use_env|ncurses_use_extended_names|ncurses_vidattr|ncurses_vline|ncurses_waddch|' +
-        'ncurses_waddstr|ncurses_wattroff|ncurses_wattron|ncurses_wattrset|ncurses_wborder|ncurses_wclear|ncurses_wcolor_set|ncurses_werase|' +
-        'ncurses_wgetch|ncurses_whline|ncurses_wmouse_trafo|ncurses_wmove|ncurses_wnoutrefresh|ncurses_wrefresh|ncurses_wstandend|' +
-        'ncurses_wstandout|ncurses_wvline|newinstance|newinstanceargs|newt_bell|newt_button|newt_button_bar|newt_centered_window|newt_checkbox|' +
-        'newt_checkbox_get_value|newt_checkbox_set_flags|newt_checkbox_set_value|newt_checkbox_tree|newt_checkbox_tree_add_item|' +
-        'newt_checkbox_tree_find_item|newt_checkbox_tree_get_current|newt_checkbox_tree_get_entry_value|newt_checkbox_tree_get_multi_selection|' +
-        'newt_checkbox_tree_get_selection|newt_checkbox_tree_multi|newt_checkbox_tree_set_current|newt_checkbox_tree_set_entry|' +
-        'newt_checkbox_tree_set_entry_value|newt_checkbox_tree_set_width|newt_clear_key_buffer|newt_cls|newt_compact_button|' +
-        'newt_component_add_callback|newt_component_takes_focus|newt_create_grid|newt_cursor_off|newt_cursor_on|newt_delay|newt_draw_form|' +
-        'newt_draw_root_text|newt_entry|newt_entry_get_value|newt_entry_set|newt_entry_set_filter|newt_entry_set_flags|newt_finished|newt_form|' +
-        'newt_form_add_component|newt_form_add_components|newt_form_add_hot_key|newt_form_destroy|newt_form_get_current|newt_form_run|' +
-        'newt_form_set_background|newt_form_set_height|newt_form_set_size|newt_form_set_timer|newt_form_set_width|newt_form_watch_fd|' +
-        'newt_get_screen_size|newt_grid_add_components_to_form|newt_grid_basic_window|newt_grid_free|newt_grid_get_size|newt_grid_h_close_stacked|' +
-        'newt_grid_h_stacked|newt_grid_place|newt_grid_set_field|newt_grid_simple_window|newt_grid_v_close_stacked|newt_grid_v_stacked|' +
-        'newt_grid_wrapped_window|newt_grid_wrapped_window_at|newt_init|newt_label|newt_label_set_text|newt_listbox|newt_listbox_append_entry|' +
-        'newt_listbox_clear|newt_listbox_clear_selection|newt_listbox_delete_entry|newt_listbox_get_current|newt_listbox_get_selection|' +
-        'newt_listbox_insert_entry|newt_listbox_item_count|newt_listbox_select_item|newt_listbox_set_current|newt_listbox_set_current_by_key|' +
-        'newt_listbox_set_data|newt_listbox_set_entry|newt_listbox_set_width|newt_listitem|newt_listitem_get_data|newt_listitem_set|' +
-        'newt_open_window|newt_pop_help_line|newt_pop_window|newt_push_help_line|newt_radio_get_current|newt_radiobutton|newt_redraw_help_line|' +
-        'newt_reflow_text|newt_refresh|newt_resize_screen|newt_resume|newt_run_form|newt_scale|newt_scale_set|newt_scrollbar_set|' +
-        'newt_set_help_callback|newt_set_suspend_callback|newt_suspend|newt_textbox|newt_textbox_get_num_lines|newt_textbox_reflowed|' +
-        'newt_textbox_set_height|newt_textbox_set_text|newt_vertical_scrollbar|newt_wait_for_key|newt_win_choice|newt_win_entries|newt_win_menu|' +
-        'newt_win_message|newt_win_messagev|newt_win_ternary|next|ngettext|nl2br|nl_langinfo|norewinditerator|normalizer|notes_body|notes_copy_db|' +
-        'notes_create_db|notes_create_note|notes_drop_db|notes_find_note|notes_header_info|notes_list_msgs|notes_mark_read|notes_mark_unread|' +
-        'notes_nav_create|notes_search|notes_unread|notes_version|nsapi_request_headers|nsapi_response_headers|nsapi_virtual|nthmac|number_format|' +
-        'numberformatter|oauth|oauth_get_sbs|oauth_urlencode|oauthexception|oauthprovider|ob_clean|ob_deflatehandler|ob_end_clean|ob_end_flush|' +
-        'ob_etaghandler|ob_flush|ob_get_clean|ob_get_contents|ob_get_flush|ob_get_length|ob_get_level|ob_get_status|ob_gzhandler|ob_iconv_handler|' +
-        'ob_implicit_flush|ob_inflatehandler|ob_list_handlers|ob_start|ob_tidyhandler|oci_bind_array_by_name|oci_bind_by_name|oci_cancel|' +
-        'oci_client_version|oci_close|oci_collection_append|oci_collection_assign|oci_collection_element_assign|oci_collection_element_get|' +
-        'oci_collection_free|oci_collection_max|oci_collection_size|oci_collection_trim|oci_commit|oci_connect|oci_define_by_name|oci_error|' +
-        'oci_execute|oci_fetch|oci_fetch_all|oci_fetch_array|oci_fetch_assoc|oci_fetch_object|oci_fetch_row|oci_field_is_null|oci_field_name|' +
-        'oci_field_precision|oci_field_scale|oci_field_size|oci_field_type|oci_field_type_raw|oci_free_statement|oci_internal_debug|oci_lob_append|' +
-        'oci_lob_close|oci_lob_copy|oci_lob_eof|oci_lob_erase|oci_lob_export|oci_lob_flush|oci_lob_free|oci_lob_getbuffering|oci_lob_import|' +
-        'oci_lob_is_equal|oci_lob_load|oci_lob_read|oci_lob_rewind|oci_lob_save|oci_lob_savefile|oci_lob_seek|oci_lob_setbuffering|oci_lob_size|' +
-        'oci_lob_tell|oci_lob_truncate|oci_lob_write|oci_lob_writetemporary|oci_lob_writetofile|oci_new_collection|oci_new_connect|oci_new_cursor|' +
-        'oci_new_descriptor|oci_num_fields|oci_num_rows|oci_parse|oci_password_change|oci_pconnect|oci_result|oci_rollback|oci_server_version|' +
-        'oci_set_action|oci_set_client_identifier|oci_set_client_info|oci_set_edition|oci_set_module_name|oci_set_prefetch|oci_statement_type|' +
-        'ocibindbyname|ocicancel|ocicloselob|ocicollappend|ocicollassign|ocicollassignelem|ocicollgetelem|ocicollmax|ocicollsize|ocicolltrim|' +
-        'ocicolumnisnull|ocicolumnname|ocicolumnprecision|ocicolumnscale|ocicolumnsize|ocicolumntype|ocicolumntyperaw|ocicommit|ocidefinebyname|' +
-        'ocierror|ociexecute|ocifetch|ocifetchinto|ocifetchstatement|ocifreecollection|ocifreecursor|ocifreedesc|ocifreestatement|ociinternaldebug|' +
-        'ociloadlob|ocilogoff|ocilogon|ocinewcollection|ocinewcursor|ocinewdescriptor|ocinlogon|ocinumcols|ociparse|ociplogon|ociresult|' +
-        'ocirollback|ocirowcount|ocisavelob|ocisavelobfile|ociserverversion|ocisetprefetch|ocistatementtype|ociwritelobtofile|ociwritetemporarylob|' +
-        'octdec|odbc_autocommit|odbc_binmode|odbc_close|odbc_close_all|odbc_columnprivileges|odbc_columns|odbc_commit|odbc_connect|odbc_cursor|' +
-        'odbc_data_source|odbc_do|odbc_error|odbc_errormsg|odbc_exec|odbc_execute|odbc_fetch_array|odbc_fetch_into|odbc_fetch_object|' +
-        'odbc_fetch_row|odbc_field_len|odbc_field_name|odbc_field_num|odbc_field_precision|odbc_field_scale|odbc_field_type|odbc_foreignkeys|' +
-        'odbc_free_result|odbc_gettypeinfo|odbc_longreadlen|odbc_next_result|odbc_num_fields|odbc_num_rows|odbc_pconnect|odbc_prepare|' +
-        'odbc_primarykeys|odbc_procedurecolumns|odbc_procedures|odbc_result|odbc_result_all|odbc_rollback|odbc_setoption|odbc_specialcolumns|' +
-        'odbc_statistics|odbc_tableprivileges|odbc_tables|openal_buffer_create|openal_buffer_data|openal_buffer_destroy|openal_buffer_get|' +
-        'openal_buffer_loadwav|openal_context_create|openal_context_current|openal_context_destroy|openal_context_process|openal_context_suspend|' +
-        'openal_device_close|openal_device_open|openal_listener_get|openal_listener_set|openal_source_create|openal_source_destroy|' +
-        'openal_source_get|openal_source_pause|openal_source_play|openal_source_rewind|openal_source_set|openal_source_stop|openal_stream|opendir|' +
-        'openlog|openssl_cipher_iv_length|openssl_csr_export|openssl_csr_export_to_file|openssl_csr_get_public_key|openssl_csr_get_subject|' +
-        'openssl_csr_new|openssl_csr_sign|openssl_decrypt|openssl_dh_compute_key|openssl_digest|openssl_encrypt|openssl_error_string|' +
-        'openssl_free_key|openssl_get_cipher_methods|openssl_get_md_methods|openssl_get_privatekey|openssl_get_publickey|openssl_open|' +
-        'openssl_pkcs12_export|openssl_pkcs12_export_to_file|openssl_pkcs12_read|openssl_pkcs7_decrypt|openssl_pkcs7_encrypt|openssl_pkcs7_sign|' +
-        'openssl_pkcs7_verify|openssl_pkey_export|openssl_pkey_export_to_file|openssl_pkey_free|openssl_pkey_get_details|openssl_pkey_get_private|' +
-        'openssl_pkey_get_public|openssl_pkey_new|openssl_private_decrypt|openssl_private_encrypt|openssl_public_decrypt|openssl_public_encrypt|' +
-        'openssl_random_pseudo_bytes|openssl_seal|openssl_sign|openssl_verify|openssl_x509_check_private_key|openssl_x509_checkpurpose|' +
-        'openssl_x509_export|openssl_x509_export_to_file|openssl_x509_free|openssl_x509_parse|openssl_x509_read|ord|outeriterator|' +
-        'outofboundsexception|outofrangeexception|output_add_rewrite_var|output_reset_rewrite_vars|overflowexception|overload|override_function|' +
-        'ovrimos_close|ovrimos_commit|ovrimos_connect|ovrimos_cursor|ovrimos_exec|ovrimos_execute|ovrimos_fetch_into|ovrimos_fetch_row|' +
-        'ovrimos_field_len|ovrimos_field_name|ovrimos_field_num|ovrimos_field_type|ovrimos_free_result|ovrimos_longreadlen|ovrimos_num_fields|' +
-        'ovrimos_num_rows|ovrimos_prepare|ovrimos_result|ovrimos_result_all|ovrimos_rollback|pack|parentiterator|parse_ini_file|parse_ini_string|' +
-        'parse_str|parse_url|parsekit_compile_file|parsekit_compile_string|parsekit_func_arginfo|passthru|pathinfo|pclose|pcntl_alarm|pcntl_exec|' +
-        'pcntl_fork|pcntl_getpriority|pcntl_setpriority|pcntl_signal|pcntl_signal_dispatch|pcntl_sigprocmask|pcntl_sigtimedwait|pcntl_sigwaitinfo|' +
-        'pcntl_wait|pcntl_waitpid|pcntl_wexitstatus|pcntl_wifexited|pcntl_wifsignaled|pcntl_wifstopped|pcntl_wstopsig|pcntl_wtermsig|' +
-        'pdf_activate_item|pdf_add_annotation|pdf_add_bookmark|pdf_add_launchlink|pdf_add_locallink|pdf_add_nameddest|pdf_add_note|pdf_add_outline|' +
-        'pdf_add_pdflink|pdf_add_table_cell|pdf_add_textflow|pdf_add_thumbnail|pdf_add_weblink|pdf_arc|pdf_arcn|pdf_attach_file|pdf_begin_document|' +
-        'pdf_begin_font|pdf_begin_glyph|pdf_begin_item|pdf_begin_layer|pdf_begin_page|pdf_begin_page_ext|pdf_begin_pattern|pdf_begin_template|' +
-        'pdf_begin_template_ext|pdf_circle|pdf_clip|pdf_close|pdf_close_image|pdf_close_pdi|pdf_close_pdi_page|pdf_closepath|' +
-        'pdf_closepath_fill_stroke|pdf_closepath_stroke|pdf_concat|pdf_continue_text|pdf_create_3dview|pdf_create_action|pdf_create_annotation|' +
-        'pdf_create_bookmark|pdf_create_field|pdf_create_fieldgroup|pdf_create_gstate|pdf_create_pvf|pdf_create_textflow|pdf_curveto|' +
-        'pdf_define_layer|pdf_delete|pdf_delete_pvf|pdf_delete_table|pdf_delete_textflow|pdf_encoding_set_char|pdf_end_document|pdf_end_font|' +
-        'pdf_end_glyph|pdf_end_item|pdf_end_layer|pdf_end_page|pdf_end_page_ext|pdf_end_pattern|pdf_end_template|pdf_endpath|pdf_fill|' +
-        'pdf_fill_imageblock|pdf_fill_pdfblock|pdf_fill_stroke|pdf_fill_textblock|pdf_findfont|pdf_fit_image|pdf_fit_pdi_page|pdf_fit_table|' +
-        'pdf_fit_textflow|pdf_fit_textline|pdf_get_apiname|pdf_get_buffer|pdf_get_errmsg|pdf_get_errnum|pdf_get_font|pdf_get_fontname|' +
-        'pdf_get_fontsize|pdf_get_image_height|pdf_get_image_width|pdf_get_majorversion|pdf_get_minorversion|pdf_get_parameter|' +
-        'pdf_get_pdi_parameter|pdf_get_pdi_value|pdf_get_value|pdf_info_font|pdf_info_matchbox|pdf_info_table|pdf_info_textflow|pdf_info_textline|' +
-        'pdf_initgraphics|pdf_lineto|pdf_load_3ddata|pdf_load_font|pdf_load_iccprofile|pdf_load_image|pdf_makespotcolor|pdf_moveto|pdf_new|' +
-        'pdf_open_ccitt|pdf_open_file|pdf_open_gif|pdf_open_image|pdf_open_image_file|pdf_open_jpeg|pdf_open_memory_image|pdf_open_pdi|' +
-        'pdf_open_pdi_document|pdf_open_pdi_page|pdf_open_tiff|pdf_pcos_get_number|pdf_pcos_get_stream|pdf_pcos_get_string|pdf_place_image|' +
-        'pdf_place_pdi_page|pdf_process_pdi|pdf_rect|pdf_restore|pdf_resume_page|pdf_rotate|pdf_save|pdf_scale|pdf_set_border_color|' +
-        'pdf_set_border_dash|pdf_set_border_style|pdf_set_char_spacing|pdf_set_duration|pdf_set_gstate|pdf_set_horiz_scaling|pdf_set_info|' +
-        'pdf_set_info_author|pdf_set_info_creator|pdf_set_info_keywords|pdf_set_info_subject|pdf_set_info_title|pdf_set_layer_dependency|' +
-        'pdf_set_leading|pdf_set_parameter|pdf_set_text_matrix|pdf_set_text_pos|pdf_set_text_rendering|pdf_set_text_rise|pdf_set_value|' +
-        'pdf_set_word_spacing|pdf_setcolor|pdf_setdash|pdf_setdashpattern|pdf_setflat|pdf_setfont|pdf_setgray|pdf_setgray_fill|pdf_setgray_stroke|' +
-        'pdf_setlinecap|pdf_setlinejoin|pdf_setlinewidth|pdf_setmatrix|pdf_setmiterlimit|pdf_setpolydash|pdf_setrgbcolor|pdf_setrgbcolor_fill|' +
-        'pdf_setrgbcolor_stroke|pdf_shading|pdf_shading_pattern|pdf_shfill|pdf_show|pdf_show_boxed|pdf_show_xy|pdf_skew|pdf_stringwidth|pdf_stroke|' +
-        'pdf_suspend_page|pdf_translate|pdf_utf16_to_utf8|pdf_utf32_to_utf16|pdf_utf8_to_utf16|pdo|pdo_cubrid_schema|pdo_pgsqllobcreate|' +
-        'pdo_pgsqllobopen|pdo_pgsqllobunlink|pdo_sqlitecreateaggregate|pdo_sqlitecreatefunction|pdoexception|pdostatement|pfsockopen|' +
-        'pg_affected_rows|pg_cancel_query|pg_client_encoding|pg_close|pg_connect|pg_connection_busy|pg_connection_reset|pg_connection_status|' +
-        'pg_convert|pg_copy_from|pg_copy_to|pg_dbname|pg_delete|pg_end_copy|pg_escape_bytea|pg_escape_string|pg_execute|pg_fetch_all|' +
-        'pg_fetch_all_columns|pg_fetch_array|pg_fetch_assoc|pg_fetch_object|pg_fetch_result|pg_fetch_row|pg_field_is_null|pg_field_name|' +
-        'pg_field_num|pg_field_prtlen|pg_field_size|pg_field_table|pg_field_type|pg_field_type_oid|pg_free_result|pg_get_notify|pg_get_pid|' +
-        'pg_get_result|pg_host|pg_insert|pg_last_error|pg_last_notice|pg_last_oid|pg_lo_close|pg_lo_create|pg_lo_export|pg_lo_import|pg_lo_open|' +
-        'pg_lo_read|pg_lo_read_all|pg_lo_seek|pg_lo_tell|pg_lo_unlink|pg_lo_write|pg_meta_data|pg_num_fields|pg_num_rows|pg_options|' +
-        'pg_parameter_status|pg_pconnect|pg_ping|pg_port|pg_prepare|pg_put_line|pg_query|pg_query_params|pg_result_error|pg_result_error_field|' +
-        'pg_result_seek|pg_result_status|pg_select|pg_send_execute|pg_send_prepare|pg_send_query|pg_send_query_params|pg_set_client_encoding|' +
-        'pg_set_error_verbosity|pg_trace|pg_transaction_status|pg_tty|pg_unescape_bytea|pg_untrace|pg_update|pg_version|php_check_syntax|' +
-        'php_ini_loaded_file|php_ini_scanned_files|php_logo_guid|php_sapi_name|php_strip_whitespace|php_uname|phpcredits|phpinfo|phpversion|pi|' +
-        'png2wbmp|popen|pos|posix_access|posix_ctermid|posix_errno|posix_get_last_error|posix_getcwd|posix_getegid|posix_geteuid|posix_getgid|' +
-        'posix_getgrgid|posix_getgrnam|posix_getgroups|posix_getlogin|posix_getpgid|posix_getpgrp|posix_getpid|posix_getppid|posix_getpwnam|' +
-        'posix_getpwuid|posix_getrlimit|posix_getsid|posix_getuid|posix_initgroups|posix_isatty|posix_kill|posix_mkfifo|posix_mknod|posix_setegid|' +
-        'posix_seteuid|posix_setgid|posix_setpgid|posix_setsid|posix_setuid|posix_strerror|posix_times|posix_ttyname|posix_uname|pow|preg_filter|' +
-        'preg_grep|preg_last_error|preg_match|preg_match_all|preg_quote|preg_replace|preg_replace_callback|preg_split|prev|print|print_r|' +
-        'printer_abort|printer_close|printer_create_brush|printer_create_dc|printer_create_font|printer_create_pen|printer_delete_brush|' +
-        'printer_delete_dc|printer_delete_font|printer_delete_pen|printer_draw_bmp|printer_draw_chord|printer_draw_elipse|printer_draw_line|' +
-        'printer_draw_pie|printer_draw_rectangle|printer_draw_roundrect|printer_draw_text|printer_end_doc|printer_end_page|printer_get_option|' +
-        'printer_list|printer_logical_fontheight|printer_open|printer_select_brush|printer_select_font|printer_select_pen|printer_set_option|' +
-        'printer_start_doc|printer_start_page|printer_write|printf|proc_close|proc_get_status|proc_nice|proc_open|proc_terminate|property_exists|' +
-        'ps_add_bookmark|ps_add_launchlink|ps_add_locallink|ps_add_note|ps_add_pdflink|ps_add_weblink|ps_arc|ps_arcn|ps_begin_page|' +
-        'ps_begin_pattern|ps_begin_template|ps_circle|ps_clip|ps_close|ps_close_image|ps_closepath|ps_closepath_stroke|ps_continue_text|ps_curveto|' +
-        'ps_delete|ps_end_page|ps_end_pattern|ps_end_template|ps_fill|ps_fill_stroke|ps_findfont|ps_get_buffer|ps_get_parameter|ps_get_value|' +
-        'ps_hyphenate|ps_include_file|ps_lineto|ps_makespotcolor|ps_moveto|ps_new|ps_open_file|ps_open_image|ps_open_image_file|' +
-        'ps_open_memory_image|ps_place_image|ps_rect|ps_restore|ps_rotate|ps_save|ps_scale|ps_set_border_color|ps_set_border_dash|' +
-        'ps_set_border_style|ps_set_info|ps_set_parameter|ps_set_text_pos|ps_set_value|ps_setcolor|ps_setdash|ps_setflat|ps_setfont|ps_setgray|' +
-        'ps_setlinecap|ps_setlinejoin|ps_setlinewidth|ps_setmiterlimit|ps_setoverprintmode|ps_setpolydash|ps_shading|ps_shading_pattern|ps_shfill|' +
-        'ps_show|ps_show2|ps_show_boxed|ps_show_xy|ps_show_xy2|ps_string_geometry|ps_stringwidth|ps_stroke|ps_symbol|ps_symbol_name|' +
-        'ps_symbol_width|ps_translate|pspell_add_to_personal|pspell_add_to_session|pspell_check|pspell_clear_session|pspell_config_create|' +
-        'pspell_config_data_dir|pspell_config_dict_dir|pspell_config_ignore|pspell_config_mode|pspell_config_personal|pspell_config_repl|' +
-        'pspell_config_runtogether|pspell_config_save_repl|pspell_new|pspell_new_config|pspell_new_personal|pspell_save_wordlist|' +
-        'pspell_store_replacement|pspell_suggest|putenv|px_close|px_create_fp|px_date2string|px_delete|px_delete_record|px_get_field|px_get_info|' +
-        'px_get_parameter|px_get_record|px_get_schema|px_get_value|px_insert_record|px_new|px_numfields|px_numrecords|px_open_fp|px_put_record|' +
-        'px_retrieve_record|px_set_blob_file|px_set_parameter|px_set_tablename|px_set_targetencoding|px_set_value|px_timestamp2string|' +
-        'px_update_record|qdom_error|qdom_tree|quoted_printable_decode|quoted_printable_encode|quotemeta|rad2deg|radius_acct_open|' +
-        'radius_add_server|radius_auth_open|radius_close|radius_config|radius_create_request|radius_cvt_addr|radius_cvt_int|radius_cvt_string|' +
-        'radius_demangle|radius_demangle_mppe_key|radius_get_attr|radius_get_vendor_attr|radius_put_addr|radius_put_attr|radius_put_int|' +
-        'radius_put_string|radius_put_vendor_addr|radius_put_vendor_attr|radius_put_vendor_int|radius_put_vendor_string|' +
-        'radius_request_authenticator|radius_send_request|radius_server_secret|radius_strerror|rand|range|rangeexception|rar_wrapper_cache_stats|' +
-        'rararchive|rarentry|rarexception|rawurldecode|rawurlencode|read_exif_data|readdir|readfile|readgzfile|readline|readline_add_history|' +
-        'readline_callback_handler_install|readline_callback_handler_remove|readline_callback_read_char|readline_clear_history|' +
-        'readline_completion_function|readline_info|readline_list_history|readline_on_new_line|readline_read_history|readline_redisplay|' +
-        'readline_write_history|readlink|realpath|realpath_cache_get|realpath_cache_size|recode|recode_file|recode_string|recursivearrayiterator|' +
-        'recursivecachingiterator|recursivecallbackfilteriterator|recursivedirectoryiterator|recursivefilteriterator|recursiveiterator|' +
-        'recursiveiteratoriterator|recursiveregexiterator|recursivetreeiterator|reflection|reflectionclass|reflectionexception|reflectionextension|' +
-        'reflectionfunction|reflectionfunctionabstract|reflectionmethod|reflectionobject|reflectionparameter|reflectionproperty|reflector|' +
-        'regexiterator|register_shutdown_function|register_tick_function|rename|rename_function|require|require_once|reset|resetValue|' +
-        'resourcebundle|restore_error_handler|restore_exception_handler|restore_include_path|return|rewind|rewinddir|rmdir|round|rpm_close|' +
-        'rpm_get_tag|rpm_is_valid|rpm_open|rpm_version|rrd_create|rrd_error|rrd_fetch|rrd_first|rrd_graph|rrd_info|rrd_last|rrd_lastupdate|' +
-        'rrd_restore|rrd_tune|rrd_update|rrd_xport|rrdcreator|rrdgraph|rrdupdater|rsort|rtrim|runkit_class_adopt|runkit_class_emancipate|' +
-        'runkit_constant_add|runkit_constant_redefine|runkit_constant_remove|runkit_function_add|runkit_function_copy|runkit_function_redefine|' +
-        'runkit_function_remove|runkit_function_rename|runkit_import|runkit_lint|runkit_lint_file|runkit_method_add|runkit_method_copy|' +
-        'runkit_method_redefine|runkit_method_remove|runkit_method_rename|runkit_return_value_used|runkit_sandbox_output_handler|' +
-        'runkit_superglobals|runtimeexception|samconnection_commit|samconnection_connect|samconnection_constructor|samconnection_disconnect|' +
-        'samconnection_errno|samconnection_error|samconnection_isconnected|samconnection_peek|samconnection_peekall|samconnection_receive|' +
-        'samconnection_remove|samconnection_rollback|samconnection_send|samconnection_setDebug|samconnection_subscribe|samconnection_unsubscribe|' +
-        'sammessage_body|sammessage_constructor|sammessage_header|sca_createdataobject|sca_getservice|sca_localproxy_createdataobject|' +
-        'sca_soapproxy_createdataobject|scandir|sdo_das_changesummary_beginlogging|sdo_das_changesummary_endlogging|' +
-        'sdo_das_changesummary_getchangeddataobjects|sdo_das_changesummary_getchangetype|sdo_das_changesummary_getoldcontainer|' +
-        'sdo_das_changesummary_getoldvalues|sdo_das_changesummary_islogging|sdo_das_datafactory_addpropertytotype|sdo_das_datafactory_addtype|' +
-        'sdo_das_datafactory_getdatafactory|sdo_das_dataobject_getchangesummary|sdo_das_relational_applychanges|sdo_das_relational_construct|' +
-        'sdo_das_relational_createrootdataobject|sdo_das_relational_executepreparedquery|sdo_das_relational_executequery|' +
-        'sdo_das_setting_getlistindex|sdo_das_setting_getpropertyindex|sdo_das_setting_getpropertyname|sdo_das_setting_getvalue|' +
-        'sdo_das_setting_isset|sdo_das_xml_addtypes|sdo_das_xml_create|sdo_das_xml_createdataobject|sdo_das_xml_createdocument|' +
-        'sdo_das_xml_document_getrootdataobject|sdo_das_xml_document_getrootelementname|sdo_das_xml_document_getrootelementuri|' +
-        'sdo_das_xml_document_setencoding|sdo_das_xml_document_setxmldeclaration|sdo_das_xml_document_setxmlversion|sdo_das_xml_loadfile|' +
-        'sdo_das_xml_loadstring|sdo_das_xml_savefile|sdo_das_xml_savestring|sdo_datafactory_create|sdo_dataobject_clear|' +
-        'sdo_dataobject_createdataobject|sdo_dataobject_getcontainer|sdo_dataobject_getsequence|sdo_dataobject_gettypename|' +
-        'sdo_dataobject_gettypenamespaceuri|sdo_exception_getcause|sdo_list_insert|sdo_model_property_getcontainingtype|' +
-        'sdo_model_property_getdefault|sdo_model_property_getname|sdo_model_property_gettype|sdo_model_property_iscontainment|' +
-        'sdo_model_property_ismany|sdo_model_reflectiondataobject_construct|sdo_model_reflectiondataobject_export|' +
-        'sdo_model_reflectiondataobject_getcontainmentproperty|sdo_model_reflectiondataobject_getinstanceproperties|' +
-        'sdo_model_reflectiondataobject_gettype|sdo_model_type_getbasetype|sdo_model_type_getname|sdo_model_type_getnamespaceuri|' +
-        'sdo_model_type_getproperties|sdo_model_type_getproperty|sdo_model_type_isabstracttype|sdo_model_type_isdatatype|sdo_model_type_isinstance|' +
-        'sdo_model_type_isopentype|sdo_model_type_issequencedtype|sdo_sequence_getproperty|sdo_sequence_insert|sdo_sequence_move|seekableiterator|' +
-        'sem_acquire|sem_get|sem_release|sem_remove|serializable|serialize|session_cache_expire|session_cache_limiter|session_commit|' +
-        'session_decode|session_destroy|session_encode|session_get_cookie_params|session_id|session_is_registered|session_module_name|session_name|' +
-        'session_pgsql_add_error|session_pgsql_get_error|session_pgsql_get_field|session_pgsql_reset|session_pgsql_set_field|session_pgsql_status|' +
-        'session_regenerate_id|session_register|session_save_path|session_set_cookie_params|session_set_save_handler|session_start|' +
-        'session_unregister|session_unset|session_write_close|setCounterClass|set_error_handler|set_exception_handler|set_file_buffer|' +
-        'set_include_path|set_magic_quotes_runtime|set_socket_blocking|set_time_limit|setcookie|setlocale|setproctitle|setrawcookie|' +
-        'setstaticpropertyvalue|setthreadtitle|settype|sha1|sha1_file|shell_exec|shm_attach|shm_detach|shm_get_var|shm_has_var|shm_put_var|' +
-        'shm_remove|shm_remove_var|shmop_close|shmop_delete|shmop_open|shmop_read|shmop_size|shmop_write|show_source|shuffle|signeurlpaiement|' +
-        'similar_text|simplexml_import_dom|simplexml_load_file|simplexml_load_string|simplexmlelement|simplexmliterator|sin|sinh|sizeof|sleep|snmp|' +
-        'snmp2_get|snmp2_getnext|snmp2_real_walk|snmp2_set|snmp2_walk|snmp3_get|snmp3_getnext|snmp3_real_walk|snmp3_set|snmp3_walk|' +
-        'snmp_get_quick_print|snmp_get_valueretrieval|snmp_read_mib|snmp_set_enum_print|snmp_set_oid_numeric_print|snmp_set_oid_output_format|' +
-        'snmp_set_quick_print|snmp_set_valueretrieval|snmpget|snmpgetnext|snmprealwalk|snmpset|snmpwalk|snmpwalkoid|soapclient|soapfault|' +
-        'soapheader|soapparam|soapserver|soapvar|socket_accept|socket_bind|socket_clear_error|socket_close|socket_connect|socket_create|' +
-        'socket_create_listen|socket_create_pair|socket_get_option|socket_get_status|socket_getpeername|socket_getsockname|socket_last_error|' +
-        'socket_listen|socket_read|socket_recv|socket_recvfrom|socket_select|socket_send|socket_sendto|socket_set_block|socket_set_blocking|' +
-        'socket_set_nonblock|socket_set_option|socket_set_timeout|socket_shutdown|socket_strerror|socket_write|solr_get_version|solrclient|' +
-        'solrclientexception|solrdocument|solrdocumentfield|solrexception|solrgenericresponse|solrillegalargumentexception|' +
-        'solrillegaloperationexception|solrinputdocument|solrmodifiableparams|solrobject|solrparams|solrpingresponse|solrquery|solrqueryresponse|' +
-        'solrresponse|solrupdateresponse|solrutils|sort|soundex|sphinxclient|spl_autoload|spl_autoload_call|spl_autoload_extensions|' +
-        'spl_autoload_functions|spl_autoload_register|spl_autoload_unregister|spl_classes|spl_object_hash|splbool|spldoublylinkedlist|splenum|' +
-        'splfileinfo|splfileobject|splfixedarray|splfloat|splheap|splint|split|spliti|splmaxheap|splminheap|splobjectstorage|splobserver|' +
-        'splpriorityqueue|splqueue|splstack|splstring|splsubject|spltempfileobject|spoofchecker|sprintf|sql_regcase|sqlite3|sqlite3result|' +
-        'sqlite3stmt|sqlite_array_query|sqlite_busy_timeout|sqlite_changes|sqlite_close|sqlite_column|sqlite_create_aggregate|' +
-        'sqlite_create_function|sqlite_current|sqlite_error_string|sqlite_escape_string|sqlite_exec|sqlite_factory|sqlite_fetch_all|' +
-        'sqlite_fetch_array|sqlite_fetch_column_types|sqlite_fetch_object|sqlite_fetch_single|sqlite_fetch_string|sqlite_field_name|' +
-        'sqlite_has_more|sqlite_has_prev|sqlite_key|sqlite_last_error|sqlite_last_insert_rowid|sqlite_libencoding|sqlite_libversion|sqlite_next|' +
-        'sqlite_num_fields|sqlite_num_rows|sqlite_open|sqlite_popen|sqlite_prev|sqlite_query|sqlite_rewind|sqlite_seek|sqlite_single_query|' +
-        'sqlite_udf_decode_binary|sqlite_udf_encode_binary|sqlite_unbuffered_query|sqlite_valid|sqrt|srand|sscanf|ssdeep_fuzzy_compare|' +
-        'ssdeep_fuzzy_hash|ssdeep_fuzzy_hash_filename|ssh2_auth_hostbased_file|ssh2_auth_none|ssh2_auth_password|ssh2_auth_pubkey_file|' +
-        'ssh2_connect|ssh2_exec|ssh2_fetch_stream|ssh2_fingerprint|ssh2_methods_negotiated|ssh2_publickey_add|ssh2_publickey_init|' +
-        'ssh2_publickey_list|ssh2_publickey_remove|ssh2_scp_recv|ssh2_scp_send|ssh2_sftp|ssh2_sftp_lstat|ssh2_sftp_mkdir|ssh2_sftp_readlink|' +
-        'ssh2_sftp_realpath|ssh2_sftp_rename|ssh2_sftp_rmdir|ssh2_sftp_stat|ssh2_sftp_symlink|ssh2_sftp_unlink|ssh2_shell|ssh2_tunnel|stat|' +
-        'stats_absolute_deviation|stats_cdf_beta|stats_cdf_binomial|stats_cdf_cauchy|stats_cdf_chisquare|stats_cdf_exponential|stats_cdf_f|' +
-        'stats_cdf_gamma|stats_cdf_laplace|stats_cdf_logistic|stats_cdf_negative_binomial|stats_cdf_noncentral_chisquare|stats_cdf_noncentral_f|' +
-        'stats_cdf_poisson|stats_cdf_t|stats_cdf_uniform|stats_cdf_weibull|stats_covariance|stats_den_uniform|stats_dens_beta|stats_dens_cauchy|' +
-        'stats_dens_chisquare|stats_dens_exponential|stats_dens_f|stats_dens_gamma|stats_dens_laplace|stats_dens_logistic|' +
-        'stats_dens_negative_binomial|stats_dens_normal|stats_dens_pmf_binomial|stats_dens_pmf_hypergeometric|stats_dens_pmf_poisson|stats_dens_t|' +
-        'stats_dens_weibull|stats_harmonic_mean|stats_kurtosis|stats_rand_gen_beta|stats_rand_gen_chisquare|stats_rand_gen_exponential|' +
-        'stats_rand_gen_f|stats_rand_gen_funiform|stats_rand_gen_gamma|stats_rand_gen_ibinomial|stats_rand_gen_ibinomial_negative|' +
-        'stats_rand_gen_int|stats_rand_gen_ipoisson|stats_rand_gen_iuniform|stats_rand_gen_noncenral_chisquare|stats_rand_gen_noncentral_f|' +
-        'stats_rand_gen_noncentral_t|stats_rand_gen_normal|stats_rand_gen_t|stats_rand_get_seeds|stats_rand_phrase_to_seeds|stats_rand_ranf|' +
-        'stats_rand_setall|stats_skew|stats_standard_deviation|stats_stat_binomial_coef|stats_stat_correlation|stats_stat_gennch|' +
-        'stats_stat_independent_t|stats_stat_innerproduct|stats_stat_noncentral_t|stats_stat_paired_t|stats_stat_percentile|stats_stat_powersum|' +
-        'stats_variance|stomp|stomp_connect_error|stomp_version|stompexception|stompframe|str_getcsv|str_ireplace|str_pad|str_repeat|str_replace|' +
-        'str_rot13|str_shuffle|str_split|str_word_count|strcasecmp|strchr|strcmp|strcoll|strcspn|stream_bucket_append|stream_bucket_make_writeable|' +
-        'stream_bucket_new|stream_bucket_prepend|stream_context_create|stream_context_get_default|stream_context_get_options|' +
-        'stream_context_get_params|stream_context_set_default|stream_context_set_option|stream_context_set_params|stream_copy_to_stream|' +
-        'stream_encoding|stream_filter_append|stream_filter_prepend|stream_filter_register|stream_filter_remove|stream_get_contents|' +
-        'stream_get_filters|stream_get_line|stream_get_meta_data|stream_get_transports|stream_get_wrappers|stream_is_local|' +
-        'stream_notification_callback|stream_register_wrapper|stream_resolve_include_path|stream_select|stream_set_blocking|stream_set_read_buffer|' +
-        'stream_set_timeout|stream_set_write_buffer|stream_socket_accept|stream_socket_client|stream_socket_enable_crypto|stream_socket_get_name|' +
-        'stream_socket_pair|stream_socket_recvfrom|stream_socket_sendto|stream_socket_server|stream_socket_shutdown|stream_supports_lock|' +
-        'stream_wrapper_register|stream_wrapper_restore|stream_wrapper_unregister|streamwrapper|strftime|strip_tags|stripcslashes|stripos|' +
-        'stripslashes|stristr|strlen|strnatcasecmp|strnatcmp|strncasecmp|strncmp|strpbrk|strpos|strptime|strrchr|strrev|strripos|strrpos|strspn|' +
-        'strstr|strtok|strtolower|strtotime|strtoupper|strtr|strval|substr|substr_compare|substr_count|substr_replace|svm|svmmodel|svn_add|' +
-        'svn_auth_get_parameter|svn_auth_set_parameter|svn_blame|svn_cat|svn_checkout|svn_cleanup|svn_client_version|svn_commit|svn_delete|' +
-        'svn_diff|svn_export|svn_fs_abort_txn|svn_fs_apply_text|svn_fs_begin_txn2|svn_fs_change_node_prop|svn_fs_check_path|' +
-        'svn_fs_contents_changed|svn_fs_copy|svn_fs_delete|svn_fs_dir_entries|svn_fs_file_contents|svn_fs_file_length|svn_fs_is_dir|svn_fs_is_file|' +
-        'svn_fs_make_dir|svn_fs_make_file|svn_fs_node_created_rev|svn_fs_node_prop|svn_fs_props_changed|svn_fs_revision_prop|svn_fs_revision_root|' +
-        'svn_fs_txn_root|svn_fs_youngest_rev|svn_import|svn_log|svn_ls|svn_mkdir|svn_repos_create|svn_repos_fs|svn_repos_fs_begin_txn_for_commit|' +
-        'svn_repos_fs_commit_txn|svn_repos_hotcopy|svn_repos_open|svn_repos_recover|svn_revert|svn_status|svn_update|swf_actiongeturl|' +
-        'swf_actiongotoframe|swf_actiongotolabel|swf_actionnextframe|swf_actionplay|swf_actionprevframe|swf_actionsettarget|swf_actionstop|' +
-        'swf_actiontogglequality|swf_actionwaitforframe|swf_addbuttonrecord|swf_addcolor|swf_closefile|swf_definebitmap|swf_definefont|' +
-        'swf_defineline|swf_definepoly|swf_definerect|swf_definetext|swf_endbutton|swf_enddoaction|swf_endshape|swf_endsymbol|swf_fontsize|' +
-        'swf_fontslant|swf_fonttracking|swf_getbitmapinfo|swf_getfontinfo|swf_getframe|swf_labelframe|swf_lookat|swf_modifyobject|swf_mulcolor|' +
-        'swf_nextid|swf_oncondition|swf_openfile|swf_ortho|swf_ortho2|swf_perspective|swf_placeobject|swf_polarview|swf_popmatrix|swf_posround|' +
-        'swf_pushmatrix|swf_removeobject|swf_rotate|swf_scale|swf_setfont|swf_setframe|swf_shapearc|swf_shapecurveto|swf_shapecurveto3|' +
-        'swf_shapefillbitmapclip|swf_shapefillbitmaptile|swf_shapefilloff|swf_shapefillsolid|swf_shapelinesolid|swf_shapelineto|swf_shapemoveto|' +
-        'swf_showframe|swf_startbutton|swf_startdoaction|swf_startshape|swf_startsymbol|swf_textwidth|swf_translate|swf_viewport|swfaction|' +
-        'swfbitmap|swfbutton|swfdisplayitem|swffill|swffont|swffontchar|swfgradient|swfmorph|swfmovie|swfprebuiltclip|swfshape|swfsound|' +
-        'swfsoundinstance|swfsprite|swftext|swftextfield|swfvideostream|swish_construct|swish_getmetalist|swish_getpropertylist|swish_prepare|' +
-        'swish_query|swishresult_getmetalist|swishresult_stem|swishresults_getparsedwords|swishresults_getremovedstopwords|swishresults_nextresult|' +
-        'swishresults_seekresult|swishsearch_execute|swishsearch_resetlimit|swishsearch_setlimit|swishsearch_setphrasedelimiter|' +
-        'swishsearch_setsort|swishsearch_setstructure|sybase_affected_rows|sybase_close|sybase_connect|sybase_data_seek|' +
-        'sybase_deadlock_retry_count|sybase_fetch_array|sybase_fetch_assoc|sybase_fetch_field|sybase_fetch_object|sybase_fetch_row|' +
-        'sybase_field_seek|sybase_free_result|sybase_get_last_message|sybase_min_client_severity|sybase_min_error_severity|' +
-        'sybase_min_message_severity|sybase_min_server_severity|sybase_num_fields|sybase_num_rows|sybase_pconnect|sybase_query|sybase_result|' +
-        'sybase_select_db|sybase_set_message_handler|sybase_unbuffered_query|symlink|sys_get_temp_dir|sys_getloadavg|syslog|system|tag|tan|tanh|' +
-        'tcpwrap_check|tempnam|textdomain|tidy|tidy_access_count|tidy_config_count|tidy_diagnose|tidy_error_count|tidy_get_error_buffer|' +
-        'tidy_get_output|tidy_load_config|tidy_reset_config|tidy_save_config|tidy_set_encoding|tidy_setopt|tidy_warning_count|tidynode|time|' +
-        'time_nanosleep|time_sleep_until|timezone_abbreviations_list|timezone_identifiers_list|timezone_location_get|timezone_name_from_abbr|' +
-        'timezone_name_get|timezone_offset_get|timezone_open|timezone_transitions_get|timezone_version_get|tmpfile|token_get_all|token_name|' +
-        'tokyotyrant|tokyotyrantquery|tokyotyranttable|tostring|tostring|touch|transliterator|traversable|trigger_error|trim|uasort|ucfirst|' +
-        'ucwords|udm_add_search_limit|udm_alloc_agent|udm_alloc_agent_array|udm_api_version|udm_cat_list|udm_cat_path|udm_check_charset|' +
-        'udm_check_stored|udm_clear_search_limits|udm_close_stored|udm_crc32|udm_errno|udm_error|udm_find|udm_free_agent|udm_free_ispell_data|' +
-        'udm_free_res|udm_get_doc_count|udm_get_res_field|udm_get_res_param|udm_hash32|udm_load_ispell_data|udm_open_stored|udm_set_agent_param|' +
-        'uksort|umask|underflowexception|unexpectedvalueexception|uniqid|unixtojd|unlink|unpack|unregister_tick_function|unserialize|unset|' +
-        'urldecode|urlencode|use_soap_error_handler|user_error|usleep|usort|utf8_decode|utf8_encode|v8js|v8jsexception|var_dump|var_export|variant|' +
-        'variant_abs|variant_add|variant_and|variant_cast|variant_cat|variant_cmp|variant_date_from_timestamp|variant_date_to_timestamp|' +
-        'variant_div|variant_eqv|variant_fix|variant_get_type|variant_idiv|variant_imp|variant_int|variant_mod|variant_mul|variant_neg|variant_not|' +
-        'variant_or|variant_pow|variant_round|variant_set|variant_set_type|variant_sub|variant_xor|version_compare|vfprintf|virtual|' +
-        'vpopmail_add_alias_domain|vpopmail_add_alias_domain_ex|vpopmail_add_domain|vpopmail_add_domain_ex|vpopmail_add_user|vpopmail_alias_add|' +
-        'vpopmail_alias_del|vpopmail_alias_del_domain|vpopmail_alias_get|vpopmail_alias_get_all|vpopmail_auth_user|vpopmail_del_domain|' +
-        'vpopmail_del_domain_ex|vpopmail_del_user|vpopmail_error|vpopmail_passwd|vpopmail_set_user_quota|vprintf|vsprintf|w32api_deftype|' +
-        'w32api_init_dtype|w32api_invoke_function|w32api_register_function|w32api_set_call_method|wddx_add_vars|wddx_deserialize|wddx_packet_end|' +
-        'wddx_packet_start|wddx_serialize_value|wddx_serialize_vars|win32_continue_service|win32_create_service|win32_delete_service|' +
-        'win32_get_last_control_message|win32_pause_service|win32_ps_list_procs|win32_ps_stat_mem|win32_ps_stat_proc|win32_query_service_status|' +
-        'win32_set_service_status|win32_start_service|win32_start_service_ctrl_dispatcher|win32_stop_service|wincache_fcache_fileinfo|' +
-        'wincache_fcache_meminfo|wincache_lock|wincache_ocache_fileinfo|wincache_ocache_meminfo|wincache_refresh_if_changed|' +
-        'wincache_rplist_fileinfo|wincache_rplist_meminfo|wincache_scache_info|wincache_scache_meminfo|wincache_ucache_add|wincache_ucache_cas|' +
-        'wincache_ucache_clear|wincache_ucache_dec|wincache_ucache_delete|wincache_ucache_exists|wincache_ucache_get|wincache_ucache_inc|' +
-        'wincache_ucache_info|wincache_ucache_meminfo|wincache_ucache_set|wincache_unlock|wordwrap|xattr_get|xattr_list|xattr_remove|xattr_set|' +
-        'xattr_supported|xdiff_file_bdiff|xdiff_file_bdiff_size|xdiff_file_bpatch|xdiff_file_diff|xdiff_file_diff_binary|xdiff_file_merge3|' +
-        'xdiff_file_patch|xdiff_file_patch_binary|xdiff_file_rabdiff|xdiff_string_bdiff|xdiff_string_bdiff_size|xdiff_string_bpatch|' +
-        'xdiff_string_diff|xdiff_string_diff_binary|xdiff_string_merge3|xdiff_string_patch|xdiff_string_patch_binary|xdiff_string_rabdiff|' +
-        'xhprof_disable|xhprof_enable|xhprof_sample_disable|xhprof_sample_enable|xml_error_string|xml_get_current_byte_index|' +
-        'xml_get_current_column_number|xml_get_current_line_number|xml_get_error_code|xml_parse|xml_parse_into_struct|xml_parser_create|' +
-        'xml_parser_create_ns|xml_parser_free|xml_parser_get_option|xml_parser_set_option|xml_set_character_data_handler|xml_set_default_handler|' +
-        'xml_set_element_handler|xml_set_end_namespace_decl_handler|xml_set_external_entity_ref_handler|xml_set_notation_decl_handler|' +
-        'xml_set_object|xml_set_processing_instruction_handler|xml_set_start_namespace_decl_handler|xml_set_unparsed_entity_decl_handler|xmlreader|' +
-        'xmlrpc_decode|xmlrpc_decode_request|xmlrpc_encode|xmlrpc_encode_request|xmlrpc_get_type|xmlrpc_is_fault|xmlrpc_parse_method_descriptions|' +
-        'xmlrpc_server_add_introspection_data|xmlrpc_server_call_method|xmlrpc_server_create|xmlrpc_server_destroy|' +
-        'xmlrpc_server_register_introspection_callback|xmlrpc_server_register_method|xmlrpc_set_type|xmlwriter_end_attribute|xmlwriter_end_cdata|' +
-        'xmlwriter_end_comment|xmlwriter_end_document|xmlwriter_end_dtd|xmlwriter_end_dtd_attlist|xmlwriter_end_dtd_element|' +
-        'xmlwriter_end_dtd_entity|xmlwriter_end_element|xmlwriter_end_pi|xmlwriter_flush|xmlwriter_full_end_element|xmlwriter_open_memory|' +
-        'xmlwriter_open_uri|xmlwriter_output_memory|xmlwriter_set_indent|xmlwriter_set_indent_string|xmlwriter_start_attribute|' +
-        'xmlwriter_start_attribute_ns|xmlwriter_start_cdata|xmlwriter_start_comment|xmlwriter_start_document|xmlwriter_start_dtd|' +
-        'xmlwriter_start_dtd_attlist|xmlwriter_start_dtd_element|xmlwriter_start_dtd_entity|xmlwriter_start_element|xmlwriter_start_element_ns|' +
-        'xmlwriter_start_pi|xmlwriter_text|xmlwriter_write_attribute|xmlwriter_write_attribute_ns|xmlwriter_write_cdata|xmlwriter_write_comment|' +
-        'xmlwriter_write_dtd|xmlwriter_write_dtd_attlist|xmlwriter_write_dtd_element|xmlwriter_write_dtd_entity|xmlwriter_write_element|' +
-        'xmlwriter_write_element_ns|xmlwriter_write_pi|xmlwriter_write_raw|xpath_eval|xpath_eval_expression|xpath_new_context|xpath_register_ns|' +
-        'xpath_register_ns_auto|xptr_eval|xptr_new_context|xslt_backend_info|xslt_backend_name|xslt_backend_version|xslt_create|xslt_errno|' +
-        'xslt_error|xslt_free|xslt_getopt|xslt_process|xslt_set_base|xslt_set_encoding|xslt_set_error_handler|xslt_set_log|xslt_set_object|' +
-        'xslt_set_sax_handler|xslt_set_sax_handlers|xslt_set_scheme_handler|xslt_set_scheme_handlers|xslt_setopt|xsltprocessor|yaml_emit|' +
-        'yaml_emit_file|yaml_parse|yaml_parse_file|yaml_parse_url|yaz_addinfo|yaz_ccl_conf|yaz_ccl_parse|yaz_close|yaz_connect|yaz_database|' +
-        'yaz_element|yaz_errno|yaz_error|yaz_es|yaz_es_result|yaz_get_option|yaz_hits|yaz_itemorder|yaz_present|yaz_range|yaz_record|yaz_scan|' +
-        'yaz_scan_result|yaz_schema|yaz_search|yaz_set_option|yaz_sort|yaz_syntax|yaz_wait|yp_all|yp_cat|yp_err_string|yp_errno|yp_first|' +
-        'yp_get_default_domain|yp_master|yp_match|yp_next|yp_order|zend_logo_guid|zend_thread_id|zend_version|zip_close|zip_entry_close|' +
-        'zip_entry_compressedsize|zip_entry_compressionmethod|zip_entry_filesize|zip_entry_name|zip_entry_open|zip_entry_read|zip_open|zip_read|' +
-        'ziparchive|ziparchive_addemptydir|ziparchive_addfile|ziparchive_addfromstring|ziparchive_close|ziparchive_deleteindex|' +
-        'ziparchive_deletename|ziparchive_extractto|ziparchive_getarchivecomment|ziparchive_getcommentindex|ziparchive_getcommentname|' +
-        'ziparchive_getfromindex|ziparchive_getfromname|ziparchive_getnameindex|ziparchive_getstatusstring|ziparchive_getstream|' +
-        'ziparchive_locatename|ziparchive_open|ziparchive_renameindex|ziparchive_renamename|ziparchive_setCommentName|ziparchive_setarchivecomment|' +
-        'ziparchive_setcommentindex|ziparchive_statindex|ziparchive_statname|ziparchive_unchangeall|ziparchive_unchangearchive|' +
-        'ziparchive_unchangeindex|ziparchive_unchangename|zlib_get_coding_type').split('|')
-    );
-
-    // http://php.net/manual/en/reserved.keywords.php
-    var keywords = lang.arrayToMap(
-        ('abstract|and|array|as|break|case|catch|class|clone|const|continue|declare|default|do|else|elseif|enddeclare|endfor|endforeach|endif|' +
-        'endswitch|endwhile|extends|final|for|foreach|function|global|goto|if|implements|interface|instanceof|namespace|new|or|private|protected|' +
-        'public|static|switch|throw|try|use|var|while|xor').split('|')
-    );
-
-    // http://php.net/manual/en/reserved.keywords.php
-    var languageConstructs = lang.arrayToMap(
-        ('die|echo|empty|exit|eval|include|include_once|isset|list|require|require_once|return|print|unset').split('|')
-    );
-
-    var builtinConstants = lang.arrayToMap(
-        ('true|false|null|__CLASS__|__DIR__|__FILE__|__LINE__|__METHOD__|__FUNCTION__|__NAMESPACE__').split('|')
-    );
-
-    var builtinVariables = lang.arrayToMap(
-        ('$GLOBALS|$_SERVER|$_GET|$_POST|$_FILES|$_REQUEST|$_SESSION|$_ENV|$_COOKIE|$php_errormsg|$HTTP_RAW_POST_DATA|' +
-        '$http_response_header|$argc|$argv').split('|')
-    );
-
-    // Discovery done by downloading 'Many HTML files' from:  http://php.net/download-docs.php
-    // Then search for files containing 'deprecated' (case-insensitive) and look at each file that turns up.
-    var builtinFunctionsDeprecated = lang.arrayToMap(
-        ('key_exists|cairo_matrix_create_scale|cairo_matrix_create_translate|call_user_method|call_user_method_array|com_addref|com_get|' +
-        'com_invoke|com_isenum|com_load|com_release|com_set|connection_timeout|cubrid_load_from_glo|cubrid_new_glo|cubrid_save_to_glo|' +
-        'cubrid_send_glo|define_syslog_variables|dl|ereg|ereg_replace|eregi|eregi_replace|hw_documentattributes|hw_documentbodytag|' +
-        'hw_documentsize|hw_outputdocument|imagedashedline|maxdb_bind_param|maxdb_bind_result|maxdb_client_encoding|maxdb_close_long_data|' +
-        'maxdb_execute|maxdb_fetch|maxdb_get_metadata|maxdb_param_count|maxdb_send_long_data|mcrypt_ecb|mcrypt_generic_end|mime_content_type|' +
-        'mysql_createdb|mysql_dbname|mysql_db_query|mysql_drop_db|mysql_dropdb|mysql_escape_string|mysql_fieldflags|mysql_fieldflags|' +
-        'mysql_fieldname|mysql_fieldtable|mysql_fieldtype|mysql_freeresult|mysql_listdbs|mysql_list_fields|mysql_listfields|mysql_list_tables|' +
-        'mysql_listtables|mysql_numfields|mysql_numrows|mysql_selectdb|mysql_tablename|mysqli_bind_param|mysqli_bind_result|' +
-        'mysqli_disable_reads_from_master|mysqli_disable_rpl_parse|mysqli_enable_reads_from_master|mysqli_enable_rpl_parse|mysqli_execute|' +
-        'mysqli_fetch|mysqli_get_metadata|mysqli_master_query|mysqli_param_count|mysqli_rpl_parse_enabled|mysqli_rpl_probe|mysqli_rpl_query_type|' +
-        'mysqli_send_long_data|mysqli_send_query|mysqli_slave_query|ocibindbyname|ocicancel|ocicloselob|ocicollappend|ocicollassign|' +
-        'ocicollassignelem|ocicollgetelem|ocicollmax|ocicollsize|ocicolltrim|ocicolumnisnull|ocicolumnname|ocicolumnprecision|ocicolumnscale|' +
-        'ocicolumnsize|ocicolumntype|ocicolumntyperaw|ocicommit|ocidefinebyname|ocierror|ociexecute|ocifetch|ocifetchinto|ocifetchstatement|' +
-        'ocifreecollection|ocifreecursor|ocifreedesc|ocifreestatement|ociinternaldebug|ociloadlob|ocilogoff|ocilogon|ocinewcollection|' +
-        'ocinewcursor|ocinewdescriptor|ocinlogon|ocinumcols|ociparse|ociplogon|ociresult|ocirollback|ocirowcount|ocisavelob|ocisavelobfile|' +
-        'ociserverversion|ocisetprefetch|ocistatementtype|ociwritelobtofile|ociwritetemporarylob|PDF_add_annotation|PDF_add_bookmark|' +
-        'PDF_add_launchlink|PDF_add_locallink|PDF_add_note|PDF_add_outline|PDF_add_pdflink|PDF_add_weblink|PDF_attach_file|PDF_begin_page|' +
-        'PDF_begin_template|PDF_close_pdi|PDF_close|PDF_findfont|PDF_get_font|PDF_get_fontname|PDF_get_fontsize|PDF_get_image_height|' +
-        'PDF_get_image_width|PDF_get_majorversion|PDF_get_minorversion|PDF_get_pdi_parameter|PDF_get_pdi_value|PDF_open_ccitt|PDF_open_file|' +
-        'PDF_open_gif|PDF_open_image_file|PDF_open_image|PDF_open_jpeg|PDF_open_pdi|PDF_open_tiff|PDF_place_image|PDF_place_pdi_page|' +
-        'PDF_set_border_color|PDF_set_border_dash|PDF_set_border_style|PDF_set_char_spacing|PDF_set_duration|PDF_set_horiz_scaling|' +
-        'PDF_set_info_author|PDF_set_info_creator|PDF_set_info_keywords|PDF_set_info_subject|PDF_set_info_title|PDF_set_leading|' +
-        'PDF_set_text_matrix|PDF_set_text_rendering|PDF_set_text_rise|PDF_set_word_spacing|PDF_setgray_fill|PDF_setgray_stroke|PDF_setgray|' +
-        'PDF_setpolydash|PDF_setrgbcolor_fill|PDF_setrgbcolor_stroke|PDF_setrgbcolor|PDF_show_boxed|php_check_syntax|px_set_tablename|' +
-        'px_set_targetencoding|runkit_sandbox_output_handler|session_is_registered|session_register|session_unregister' +
-        'set_magic_quotes_runtime|magic_quotes_runtime|set_socket_blocking|socket_set_blocking|set_socket_timeout|socket_set_timeout|split|spliti|' +
-        'sql_regcase').split('|')
-    );
-
-    var keywordsDeprecated = lang.arrayToMap(
-        ('cfunction|old_function').split('|')
-    );
-
-    var futureReserved = lang.arrayToMap([]);
-
-    // regexp must not have capturing parentheses. Use (?:) instead.
-    // regexps are ordered -> the first match is used
-
-    this.$rules = {
-        "start" : [
-            {
-                token : "support.php_tag", // php open tag
-                regex : "<\\?(?:php|\\=)"
-            },
-            {
-                token : "support.php_tag", // php close tag
-                regex : "\\?>"
-            },
-            {
-                token : "comment",
-                regex : "<\\!--",
-                next : "htmlcomment"
-            }, 
-            {
-                token : "meta.tag",
-                regex : "<style",
-                next : "css"
-            },
-            {
-                token : "meta.tag", // opening tag
-                regex : "<\\/?[-_a-zA-Z0-9:]+",
-                next : "htmltag"
-            },
-            {
-                token : 'meta.tag',
-                regex : '<\!DOCTYPE.*?>'
-            },
-            {
-                token : "comment",
-                regex : "\\/\\/.*$"
-            },
-            {
-               token : "comment",
-               regex : "#.*$"
-            },
-            docComment.getStartRule("doc-start"),
-            {
-                token : "comment", // multi line comment
-                regex : "\\/\\*",
-                next : "comment"
-            }, {
-                token : "string.regexp",
-                regex : "[/](?:(?:\\[(?:\\\\]|[^\\]])+\\])|(?:\\\\/|[^\\]/]))*[/][gimy]*\\s*(?=[).,;]|$)"
-            }, {
-                token : "string", // single line
-                regex : '["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'
-            }, {
-                token : "string", // multi line string start
-                regex : '["][\\s\\S]*',
-                next : "qqstring"
-            }, {
-                token : "string", // single line
-                regex : "['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"
-            }, {
-                token : "string", // multi line string start
-                regex : "['][\\s\\S]+",
-                next : "qstring"
-            }, {
-                token : "constant.numeric", // hex
-                regex : "0[xX][0-9a-fA-F]+\\b"
-            }, {
-                token : "constant.numeric", // float
-                regex : "[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"
-            }, {
-                token : "constant.language", // constants
-                regex : "\\b(?:DEFAULT_INCLUDE_PATH|E_(?:ALL|CO(?:MPILE_(?:ERROR|WARNING)|RE_(?:ERROR|WARNING))|" +
-                        "ERROR|NOTICE|PARSE|STRICT|USER_(?:ERROR|NOTICE|WARNING)|WARNING)|P(?:EAR_(?:EXTENSION_DIR|INSTALL_DIR)|" +
-                        "HP_(?:BINDIR|CONFIG_FILE_(?:PATH|SCAN_DIR)|DATADIR|E(?:OL|XTENSION_DIR)|INT_(?:MAX|SIZE)|" +
-                        "L(?:IBDIR|OCALSTATEDIR)|O(?:S|UTPUT_HANDLER_(?:CONT|END|START))|PREFIX|S(?:API|HLIB_SUFFIX|YSCONFDIR)|" +
-                        "VERSION))|__COMPILER_HALT_OFFSET__)\\b"
-            }, {
-                token : "constant.language", // constants
-                regex : "\\b(?:A(?:B(?:DAY_(?:1|2|3|4|5|6|7)|MON_(?:1(?:0|1|2|)|2|3|4|5|6|7|8|9))|LT_DIGITS|M_STR|" +
-                        "SSERT_(?:ACTIVE|BAIL|CALLBACK|QUIET_EVAL|WARNING))|C(?:ASE_(?:LOWER|UPPER)|HAR_MAX|" +
-                        "O(?:DESET|NNECTION_(?:ABORTED|NORMAL|TIMEOUT)|UNT_(?:NORMAL|RECURSIVE))|" +
-                        "R(?:EDITS_(?:ALL|DOCS|FULLPAGE|G(?:ENERAL|ROUP)|MODULES|QA|SAPI)|NCYSTR|" +
-                        "YPT_(?:BLOWFISH|EXT_DES|MD5|S(?:ALT_LENGTH|TD_DES)))|URRENCY_SYMBOL)|D(?:AY_(?:1|2|3|4|5|6|7)|" +
-                        "ECIMAL_POINT|IRECTORY_SEPARATOR|_(?:FMT|T_FMT))|E(?:NT_(?:COMPAT|NOQUOTES|QUOTES)|RA(?:_(?:D_(?:FMT|T_FMT)|" +
-                        "T_FMT|YEAR)|)|XTR_(?:IF_EXISTS|OVERWRITE|PREFIX_(?:ALL|I(?:F_EXISTS|NVALID)|SAME)|SKIP))|FRAC_DIGITS|GROUPING|" +
-                        "HTML_(?:ENTITIES|SPECIALCHARS)|IN(?:FO_(?:ALL|C(?:ONFIGURATION|REDITS)|ENVIRONMENT|GENERAL|LICENSE|MODULES|VARIABLES)|" +
-                        "I_(?:ALL|PERDIR|SYSTEM|USER)|T_(?:CURR_SYMBOL|FRAC_DIGITS))|L(?:C_(?:ALL|C(?:OLLATE|TYPE)|M(?:ESSAGES|ONETARY)|NUMERIC|TIME)|" +
-                        "O(?:CK_(?:EX|NB|SH|UN)|G_(?:A(?:LERT|UTH(?:PRIV|))|C(?:ONS|R(?:IT|ON))|D(?:AEMON|EBUG)|E(?:MERG|RR)|INFO|KERN|" +
-                        "L(?:OCAL(?:0|1|2|3|4|5|6|7)|PR)|MAIL|N(?:DELAY|EWS|O(?:TICE|WAIT))|ODELAY|P(?:ERROR|ID)|SYSLOG|U(?:SER|UCP)|WARNING)))|" +
-                        "M(?:ON_(?:1(?:0|1|2|)|2|3|4|5|6|7|8|9|DECIMAL_POINT|GROUPING|THOUSANDS_SEP)|_(?:1_PI|2_(?:PI|SQRTPI)|E|L(?:N(?:10|2)|" +
-                        "OG(?:10E|2E))|PI(?:_(?:2|4)|)|SQRT(?:1_2|2)))|N(?:EGATIVE_SIGN|O(?:EXPR|STR)|_(?:CS_PRECEDES|S(?:EP_BY_SPACE|IGN_POSN)))|" +
-                        "P(?:ATH(?:INFO_(?:BASENAME|DIRNAME|EXTENSION)|_SEPARATOR)|M_STR|OSITIVE_SIGN|_(?:CS_PRECEDES|S(?:EP_BY_SPACE|IGN_POSN)))|" +
-                        "RADIXCHAR|S(?:EEK_(?:CUR|END|SET)|ORT_(?:ASC|DESC|NUMERIC|REGULAR|STRING)|TR_PAD_(?:BOTH|LEFT|RIGHT))|" +
-                        "T(?:HOUS(?:ANDS_SEP|EP)|_FMT(?:_AMPM|))|YES(?:EXPR|STR)|STD(?:IN|OUT|ERR))\\b"
-            }, {
-                token : function(value) {
-                    if (keywords.hasOwnProperty(value))
-                        return "keyword";
-                    else if (builtinConstants.hasOwnProperty(value))
-                        return "constant.language";
-                    else if (builtinVariables.hasOwnProperty(value))
-                        return "variable.language";
-                    else if (futureReserved.hasOwnProperty(value))
-                        return "invalid.illegal";
-                    else if (builtinFunctions.hasOwnProperty(value))
-                        return "support.function";
-                    else if (value == "debugger")
-                        return "invalid.deprecated";
-                    else
-                        if(value.match(/^(\$[a-zA-Z][a-zA-Z0-9_]*|self|parent)$/))
-                            return "variable";
-                        return "identifier";
-                },
-                // TODO: Unicode escape sequences
-                // TODO: Unicode identifiers
-                regex : "[a-zA-Z_$][a-zA-Z0-9_$]*\\b"
-            }, {
-                token : "keyword.operator",
-                regex : "!|\\$|%|&|\\*|\\-\\-|\\-|\\+\\+|\\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\\|\\||\\?\\:|\\*=|%=|\\+=|\\-=|&=|\\^=|\\b(?:in|instanceof|new|delete|typeof|void)"
-            }, {
-                token : "lparen",
-                regex : "[[({]"
-            }, {
-                token : "rparen",
-                regex : "[\\])}]"
-            }, {
-                token : "text",
-                regex : "\\s+"
-            }
-        ],
-        "comment" : [
-            {
-                token : "comment", // closing comment
-                regex : ".*?\\*\\/",
-                next : "start"
-            }, {
-                token : "comment", // comment spanning whole line
-                regex : ".+"
-            }
-        ],
-        "qqstring" : [
-            {
-                token : "string",
-                regex : '"',
-                next : "start"
-            }, {
-                token : "string",
-                regex : '[^"]+'
-            }
-        ],
-        "qstring" : [
-            {
-                token : "string",
-                regex : "'",
-                next : "start"
-            }, {
-                token : "string",
-                regex : "[^']+"
-            }
-        ],
-        "htmlcomment" : [
-             {
-                 token : "comment",
-                 regex : ".*?-->",
-                 next : "start"
-             }, {
-                 token : "comment",
-                 regex : ".+"
-             } 
-         ],
-         "htmltag" : [ 
-             {
-                 token : "meta.tag",
-                 regex : ">",
-                 next : "start"
-             }, {
-                 token : "text",
-                 regex : "[-_a-zA-Z0-9:]+"
-             }, {
-                 token : "text",
-                 regex : "\\s+"
-             }, {
-                 token : "string",
-                 regex : '".*?"'
-             }, {
-                 token : "string",
-                 regex : "'.*?'"
-             } 
-         ],
-        "css" : [ 
-             {
-                 token : "meta.tag",
-                 regex : "<\/style>",
-                 next : "htmltag"
-             }, {
-                 token : "meta.tag",
-                 regex : ">"
-             }, {
-                 token : 'text',
-                 regex : "(?:media|type|href)"
-             }, {
-                 token : 'string',
-                 regex : '=".*?"'
-             }, {
-                 token : "paren.lparen",
-                 regex : "\{",
-                 next : "cssdeclaration"
-             }, {
-                 token : "keyword",
-                 regex : "#[A-Za-z0-9\-\_\.]+"
-             }, {
-                 token : "variable",
-                 regex : "\\.[A-Za-z0-9\-\_\.]+"
-             }, {
-                 token : "constant",
-                 regex : "[A-Za-z0-9]+"
-             }
-         ],
-         "cssdeclaration" : [
-             {
-                 token : "support.type",
-                 regex : "[\-a-zA-Z]+",
-                 next  : "cssvalue"
-             }, 
-             {
-                 token : "paren.rparen",
-                 regex : '\}',
-                 next : "css"
-             }
-         ],
-         "cssvalue" : [
-               {
-                   token : "text",
-                   regex : "\:"
-               }, 
-               {
-                   token : "constant",
-                   regex : "#[0-9a-zA-Z]+"
-               },
-               {
-                   token : "text",
-                   regex : "[\-\_0-9a-zA-Z\"' ,%]+"
-               },
-               {
-                   token : "text",
-                   regex : ";",
-                   next : "cssdeclaration"
-               }
-         ]
-    };
-
-    this.embedRules(DocCommentHighlightRules, "doc-",
-        [ new DocCommentHighlightRules().getEndRule("start") ]);
-};
-
-oop.inherits(PhpHighlightRules, TextHighlightRules);
-
-exports.PhpHighlightRules = PhpHighlightRules;
-});
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/doc_comment_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-
-var DocCommentHighlightRules = function() {
-
-    this.$rules = {
-        "start" : [ {
-            token : "comment.doc.tag",
-            regex : "@[\\w\\d_]+" // TODO: fix email addresses
-        }, {
-            token : "comment.doc",
-            merge : true,
-            regex : "\\s+"
-        }, {
-            token : "comment.doc",
-            merge : true,
-            regex : "TODO"
-        }, {
-            token : "comment.doc",
-            merge : true,
-            regex : "[^@\\*]+"
-        }, {
-            token : "comment.doc",
-            merge : true,
-            regex : "."
-        }]
-    };
-};
-
-oop.inherits(DocCommentHighlightRules, TextHighlightRules);
-
-(function() {
-
-    this.getStartRule = function(start) {
-        return {
-            token : "comment.doc", // doc comment
-            merge : true,
-            regex : "\\/\\*(?=\\*)",
-            next  : start
-        };
-    };
-    
-    this.getEndRule = function (start) {
-        return {
-            token : "comment.doc", // closing comment
-            merge : true,
-            regex : "\\*\\/",
-            next  : start
-        };
-    };
-
-}).call(DocCommentHighlightRules.prototype);
-
-exports.DocCommentHighlightRules = DocCommentHighlightRules;
-
-});
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/matching_brace_outdent', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
-"use strict";
-
-var Range = require("../range").Range;
-
-var MatchingBraceOutdent = function() {};
-
-(function() {
-
-    this.checkOutdent = function(line, input) {
-        if (! /^\s+$/.test(line))
-            return false;
-
-        return /^\s*\}/.test(input);
-    };
-
-    this.autoOutdent = function(doc, row) {
-        var line = doc.getLine(row);
-        var match = line.match(/^(\s*\})/);
-
-        if (!match) return 0;
-
-        var column = match[1].length;
-        var openBracePos = doc.findMatchingBracket({row: row, column: column});
-
-        if (!openBracePos || openBracePos.row == row) return 0;
-
-        var indent = this.$getIndent(doc.getLine(openBracePos.row));
-        doc.replace(new Range(row, 0, row, column-1), indent);
-    };
-
-    this.$getIndent = function(line) {
-        var match = line.match(/^(\s+)/);
-        if (match) {
-            return match[1];
-        }
-
-        return "";
-    };
-
-}).call(MatchingBraceOutdent.prototype);
-
-exports.MatchingBraceOutdent = MatchingBraceOutdent;
-});
-/* vim:ts=4:sts=4:sw=4:
- * ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Chris Spencer <chris.ag.spencer AT googlemail DOT com>
- *
- * 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 ***** */
-
-define('ace/mode/behaviour/cstyle', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/behaviour'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../../lib/oop");
-var Behaviour = require('../behaviour').Behaviour;
-
-var CstyleBehaviour = function () {
-
-    this.add("braces", "insertion", function (state, action, editor, session, text) {
-        if (text == '{') {
-            var selection = editor.getSelectionRange();
-            var selected = session.doc.getTextRange(selection);
-            if (selected !== "") {
-                return {
-                    text: '{' + selected + '}',
-                    selection: false
-                };
-            } else {
-                return {
-                    text: '{}',
-                    selection: [1, 1]
-                };
-            }
-        } else if (text == '}') {
-            var cursor = editor.getCursorPosition();
-            var line = session.doc.getLine(cursor.row);
-            var rightChar = line.substring(cursor.column, cursor.column + 1);
-            if (rightChar == '}') {
-                var matching = session.$findOpeningBracket('}', {column: cursor.column + 1, row: cursor.row});
-                if (matching !== null) {
-                    return {
-                        text: '',
-                        selection: [1, 1]
-                    };
-                }
-            }
-        } else if (text == "\n") {
-            var cursor = editor.getCursorPosition();
-            var line = session.doc.getLine(cursor.row);
-            var rightChar = line.substring(cursor.column, cursor.column + 1);
-            if (rightChar == '}') {
-                var openBracePos = session.findMatchingBracket({row: cursor.row, column: cursor.column + 1});
-                if (!openBracePos)
-                     return null;
-
-                var indent = this.getNextLineIndent(state, line.substring(0, line.length - 1), session.getTabString());
-                var next_indent = this.$getIndent(session.doc.getLine(openBracePos.row));
-
-                return {
-                    text: '\n' + indent + '\n' + next_indent,
-                    selection: [1, indent.length, 1, indent.length]
-                };
-            }
-        }
-    });
-
-    this.add("braces", "deletion", function (state, action, editor, session, range) {
-        var selected = session.doc.getTextRange(range);
-        if (!range.isMultiLine() && selected == '{') {
-            var line = session.doc.getLine(range.start.row);
-            var rightChar = line.substring(range.end.column, range.end.column + 1);
-            if (rightChar == '}') {
-                range.end.column++;
-                return range;
-            }
-        }
-    });
-
-    this.add("parens", "insertion", function (state, action, editor, session, text) {
-        if (text == '(') {
-            var selection = editor.getSelectionRange();
-            var selected = session.doc.getTextRange(selection);
-            if (selected !== "") {
-                return {
-                    text: '(' + selected + ')',
-                    selection: false
-                };
-            } else {
-                return {
-                    text: '()',
-                    selection: [1, 1]
-                };
-            }
-        } else if (text == ')') {
-            var cursor = editor.getCursorPosition();
-            var line = session.doc.getLine(cursor.row);
-            var rightChar = line.substring(cursor.column, cursor.column + 1);
-            if (rightChar == ')') {
-                var matching = session.$findOpeningBracket(')', {column: cursor.column + 1, row: cursor.row});
-                if (matching !== null) {
-                    return {
-                        text: '',
-                        selection: [1, 1]
-                    };
-                }
-            }
-        }
-    });
-
-    this.add("parens", "deletion", function (state, action, editor, session, range) {
-        var selected = session.doc.getTextRange(range);
-        if (!range.isMultiLine() && selected == '(') {
-            var line = session.doc.getLine(range.start.row);
-            var rightChar = line.substring(range.start.column + 1, range.start.column + 2);
-            if (rightChar == ')') {
-                range.end.column++;
-                return range;
-            }
-        }
-    });
-
-    this.add("string_dquotes", "insertion", function (state, action, editor, session, text) {
-        if (text == '"' || text == "'") {
-            var quote = text;
-            var selection = editor.getSelectionRange();
-            var selected = session.doc.getTextRange(selection);
-            if (selected !== "") {
-                return {
-                    text: quote + selected + quote,
-                    selection: false
-                };
-            } else {
-                var cursor = editor.getCursorPosition();
-                var line = session.doc.getLine(cursor.row);
-                var leftChar = line.substring(cursor.column-1, cursor.column);
-
-                // We're escaped.
-                if (leftChar == '\\') {
-                    return null;
-                }
-
-                // Find what token we're inside.
-                var tokens = session.getTokens(selection.start.row, selection.start.row)[0].tokens;
-                var col = 0, token;
-                var quotepos = -1; // Track whether we're inside an open quote.
-
-                for (var x = 0; x < tokens.length; x++) {
-                    token = tokens[x];
-                    if (token.type == "string") {
-                      quotepos = -1;
-                    } else if (quotepos < 0) {
-                      quotepos = token.value.indexOf(quote);
-                    }
-                    if ((token.value.length + col) > selection.start.column) {
-                        break;
-                    }
-                    col += tokens[x].value.length;
-                }
-
-                // Try and be smart about when we auto insert.
-                if (!token || (quotepos < 0 && token.type !== "comment" && (token.type !== "string" || ((selection.start.column !== token.value.length+col-1) && token.value.lastIndexOf(quote) === token.value.length-1)))) {
-                    return {
-                        text: quote + quote,
-                        selection: [1,1]
-                    };
-                } else if (token && token.type === "string") {
-                    // Ignore input and move right one if we're typing over the closing quote.
-                    var rightChar = line.substring(cursor.column, cursor.column + 1);
-                    if (rightChar == quote) {
-                        return {
-                            text: '',
-                            selection: [1, 1]
-                        };
-                    }
-                }
-            }
-        }
-    });
-
-    this.add("string_dquotes", "deletion", function (state, action, editor, session, range) {
-        var selected = session.doc.getTextRange(range);
-        if (!range.isMultiLine() && (selected == '"' || selected == "'")) {
-            var line = session.doc.getLine(range.start.row);
-            var rightChar = line.substring(range.start.column + 1, range.start.column + 2);
-            if (rightChar == '"') {
-                range.end.column++;
-                return range;
-            }
-        }
-    });
-
-};
-
-oop.inherits(CstyleBehaviour, Behaviour);
-
-exports.CstyleBehaviour = CstyleBehaviour;
-});/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/folding/cstyle', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/range', 'ace/mode/folding/fold_mode'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../../lib/oop");
-var Range = require("../../range").Range;
-var BaseFoldMode = require("./fold_mode").FoldMode;
-
-var FoldMode = exports.FoldMode = function() {};
-oop.inherits(FoldMode, BaseFoldMode);
-
-(function() {
-
-    this.foldingStartMarker = /(\{|\[)[^\}\]]*$|^\s*(\/\*)/;
-    this.foldingStopMarker = /^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/;
-    
-    this.getFoldWidgetRange = function(session, foldStyle, row) {
-        var line = session.getLine(row);
-        var match = line.match(this.foldingStartMarker);
-        if (match) {
-            var i = match.index;
-
-            if (match[1])
-                return this.openingBracketBlock(session, match[1], row, i);
-
-            var range = session.getCommentFoldRange(row, i + match[0].length);
-            range.end.column -= 2;
-            return range;
-        }
-
-        if (foldStyle !== "markbeginend")
-            return;
-            
-        var match = line.match(this.foldingStopMarker);
-        if (match) {
-            var i = match.index + match[0].length;
-
-            if (match[2]) {
-                var range = session.getCommentFoldRange(row, i);
-                range.end.column -= 2;
-                return range;
-            }
-
-            var end = {row: row, column: i};
-            var start = session.$findOpeningBracket(match[1], end);
-            
-            if (!start)
-                return;
-
-            start.column++;
-            end.column--;
-
-            return  Range.fromPoints(start, end);
-        }
-    };
-    
-}).call(FoldMode.prototype);
-
-});/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/folding/fold_mode', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
-"use strict";
-
-var Range = require("../../range").Range;
-
-var FoldMode = exports.FoldMode = function() {};
-
-(function() {
-
-    this.foldingStartMarker = null;
-    this.foldingStopMarker = null;
-
-    // must return "" if there's no fold, to enable caching
-    this.getFoldWidget = function(session, foldStyle, row) {
-        var line = session.getLine(row);
-        if (this.foldingStartMarker.test(line))
-            return "start";
-        if (foldStyle == "markbeginend"
-                && this.foldingStopMarker
-                && this.foldingStopMarker.test(line))
-            return "end";
-        return "";
-    };
-    
-    this.getFoldWidgetRange = function(session, foldStyle, row) {
-        return null;
-    };
-
-    this.indentationBlock = function(session, row, column) {
-        var re = /^\s*/;
-        var startRow = row;
-        var endRow = row;
-        var line = session.getLine(row);
-        var startColumn = column || line.length;
-        var startLevel = line.match(re)[0].length;
-        var maxRow = session.getLength()
-        
-        while (++row < maxRow) {
-            line = session.getLine(row);
-            var level = line.match(re)[0].length;
-
-            if (level == line.length)
-                continue;
-
-            if (level <= startLevel)
-                break;
-
-            endRow = row;
-        }
-
-        if (endRow > startRow) {
-            var endColumn = session.getLine(endRow).length;
-            return new Range(startRow, startColumn, endRow, endColumn);
-        }
-    };
-
-    this.openingBracketBlock = function(session, bracket, row, column) {
-        var start = {row: row, column: column + 1};
-        var end = session.$findClosingBracket(bracket, start);
-        if (!end)
-            return;
-
-        var fw = session.foldWidgets[end.row];
-        if (fw == null)
-            fw = this.getFoldWidget(session, end.row);
-
-        if (fw == "start") {
-            end.row --;
-            end.column = session.getLine(end.row).length;
-        }
-        return Range.fromPoints(start, end);
-    };
-
-}).call(FoldMode.prototype);
-
-});
diff --git a/apps/files_texteditor/js/aceeditor/mode-php.js b/apps/files_texteditor/js/aceeditor/mode-php.js
deleted file mode 100644
index 8b156ab98b..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-php.js
+++ /dev/null
@@ -1 +0,0 @@
-define("ace/mode/php",["require","exports","module","ace/lib/oop","ace/mode/text","ace/tokenizer","ace/mode/php_highlight_rules","ace/mode/matching_brace_outdent","ace/range","ace/mode/behaviour/cstyle","ace/mode/folding/cstyle"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text").Mode,f=a("../tokenizer").Tokenizer,g=a("./php_highlight_rules").PhpHighlightRules,h=a("./matching_brace_outdent").MatchingBraceOutdent,i=a("../range").Range,j=a("./behaviour/cstyle").CstyleBehaviour,k=a("./folding/cstyle").FoldMode,l=function(){this.$tokenizer=new f((new g).getRules()),this.$outdent=new h,this.$behaviour=new j,this.foldingRules=new k};d.inherits(l,e),function(){this.toggleCommentLines=function(a,b,c,d){var e=!0,f=/^(\s*)#/;for(var g=c;g<=d;g++)if(!f.test(b.getLine(g))){e=!1;break}if(e){var h=new i(0,0,0,0);for(var g=c;g<=d;g++){var j=b.getLine(g),k=j.match(f);h.start.row=g,h.end.row=g,h.end.column=k[0].length,b.replace(h,k[1])}}else b.indentRows(c,d,"#")},this.getNextLineIndent=function(a,b,c){var d=this.$getIndent(b),e=this.$tokenizer.getLineTokens(b,a),f=e.tokens;if(f.length&&f[f.length-1].type=="comment")return d;if(a=="start"){var g=b.match(/^.*[\{\(\[\:]\s*$/);g&&(d+=c)}return d},this.checkOutdent=function(a,b,c){return this.$outdent.checkOutdent(b,c)},this.autoOutdent=function(a,b,c){this.$outdent.autoOutdent(b,c)}}.call(l.prototype),b.Mode=l}),define("ace/mode/php_highlight_rules",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/mode/doc_comment_highlight_rules","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("../lib/lang"),f=a("./doc_comment_highlight_rules").DocCommentHighlightRules,g=a("./text_highlight_rules").TextHighlightRules,h=function(){var a=new f,b=e.arrayToMap("abs|acos|acosh|addcslashes|addslashes|aggregate|aggregate_info|aggregate_methods|aggregate_methods_by_list|aggregate_methods_by_regexp|aggregate_properties|aggregate_properties_by_list|aggregate_properties_by_regexp|aggregation_info|amqpconnection|amqpexchange|amqpqueue|apache_child_terminate|apache_get_modules|apache_get_version|apache_getenv|apache_lookup_uri|apache_note|apache_request_headers|apache_reset_timeout|apache_response_headers|apache_setenv|apc_add|apc_bin_dump|apc_bin_dumpfile|apc_bin_load|apc_bin_loadfile|apc_cache_info|apc_cas|apc_clear_cache|apc_compile_file|apc_dec|apc_define_constants|apc_delete|apc_delete_file|apc_exists|apc_fetch|apc_inc|apc_load_constants|apc_sma_info|apc_store|apciterator|apd_breakpoint|apd_callstack|apd_clunk|apd_continue|apd_croak|apd_dump_function_table|apd_dump_persistent_resources|apd_dump_regular_resources|apd_echo|apd_get_active_symbols|apd_set_pprof_trace|apd_set_session|apd_set_session_trace|apd_set_session_trace_socket|appenditerator|array|array_change_key_case|array_chunk|array_combine|array_count_values|array_diff|array_diff_assoc|array_diff_key|array_diff_uassoc|array_diff_ukey|array_fill|array_fill_keys|array_filter|array_flip|array_intersect|array_intersect_assoc|array_intersect_key|array_intersect_uassoc|array_intersect_ukey|array_key_exists|array_keys|array_map|array_merge|array_merge_recursive|array_multisort|array_pad|array_pop|array_product|array_push|array_rand|array_reduce|array_replace|array_replace_recursive|array_reverse|array_search|array_shift|array_slice|array_splice|array_sum|array_udiff|array_udiff_assoc|array_udiff_uassoc|array_uintersect|array_uintersect_assoc|array_uintersect_uassoc|array_unique|array_unshift|array_values|array_walk|array_walk_recursive|arrayaccess|arrayiterator|arrayobject|arsort|asin|asinh|asort|assert|assert_options|atan|atan2|atanh|audioproperties|badfunctioncallexception|badmethodcallexception|base64_decode|base64_encode|base_convert|basename|bbcode_add_element|bbcode_add_smiley|bbcode_create|bbcode_destroy|bbcode_parse|bbcode_set_arg_parser|bbcode_set_flags|bcadd|bccomp|bcdiv|bcmod|bcmul|bcompiler_load|bcompiler_load_exe|bcompiler_parse_class|bcompiler_read|bcompiler_write_class|bcompiler_write_constant|bcompiler_write_exe_footer|bcompiler_write_file|bcompiler_write_footer|bcompiler_write_function|bcompiler_write_functions_from_file|bcompiler_write_header|bcompiler_write_included_filename|bcpow|bcpowmod|bcscale|bcsqrt|bcsub|bin2hex|bind_textdomain_codeset|bindec|bindtextdomain|bson_decode|bson_encode|bumpValue|bzclose|bzcompress|bzdecompress|bzerrno|bzerror|bzerrstr|bzflush|bzopen|bzread|bzwrite|cachingiterator|cairo|cairo_create|cairo_font_face_get_type|cairo_font_face_status|cairo_font_options_create|cairo_font_options_equal|cairo_font_options_get_antialias|cairo_font_options_get_hint_metrics|cairo_font_options_get_hint_style|cairo_font_options_get_subpixel_order|cairo_font_options_hash|cairo_font_options_merge|cairo_font_options_set_antialias|cairo_font_options_set_hint_metrics|cairo_font_options_set_hint_style|cairo_font_options_set_subpixel_order|cairo_font_options_status|cairo_format_stride_for_width|cairo_image_surface_create|cairo_image_surface_create_for_data|cairo_image_surface_create_from_png|cairo_image_surface_get_data|cairo_image_surface_get_format|cairo_image_surface_get_height|cairo_image_surface_get_stride|cairo_image_surface_get_width|cairo_matrix_create_scale|cairo_matrix_create_translate|cairo_matrix_invert|cairo_matrix_multiply|cairo_matrix_rotate|cairo_matrix_transform_distance|cairo_matrix_transform_point|cairo_matrix_translate|cairo_pattern_add_color_stop_rgb|cairo_pattern_add_color_stop_rgba|cairo_pattern_create_for_surface|cairo_pattern_create_linear|cairo_pattern_create_radial|cairo_pattern_create_rgb|cairo_pattern_create_rgba|cairo_pattern_get_color_stop_count|cairo_pattern_get_color_stop_rgba|cairo_pattern_get_extend|cairo_pattern_get_filter|cairo_pattern_get_linear_points|cairo_pattern_get_matrix|cairo_pattern_get_radial_circles|cairo_pattern_get_rgba|cairo_pattern_get_surface|cairo_pattern_get_type|cairo_pattern_set_extend|cairo_pattern_set_filter|cairo_pattern_set_matrix|cairo_pattern_status|cairo_pdf_surface_create|cairo_pdf_surface_set_size|cairo_ps_get_levels|cairo_ps_level_to_string|cairo_ps_surface_create|cairo_ps_surface_dsc_begin_page_setup|cairo_ps_surface_dsc_begin_setup|cairo_ps_surface_dsc_comment|cairo_ps_surface_get_eps|cairo_ps_surface_restrict_to_level|cairo_ps_surface_set_eps|cairo_ps_surface_set_size|cairo_scaled_font_create|cairo_scaled_font_extents|cairo_scaled_font_get_ctm|cairo_scaled_font_get_font_face|cairo_scaled_font_get_font_matrix|cairo_scaled_font_get_font_options|cairo_scaled_font_get_scale_matrix|cairo_scaled_font_get_type|cairo_scaled_font_glyph_extents|cairo_scaled_font_status|cairo_scaled_font_text_extents|cairo_surface_copy_page|cairo_surface_create_similar|cairo_surface_finish|cairo_surface_flush|cairo_surface_get_content|cairo_surface_get_device_offset|cairo_surface_get_font_options|cairo_surface_get_type|cairo_surface_mark_dirty|cairo_surface_mark_dirty_rectangle|cairo_surface_set_device_offset|cairo_surface_set_fallback_resolution|cairo_surface_show_page|cairo_surface_status|cairo_surface_write_to_png|cairo_svg_surface_create|cairo_svg_surface_restrict_to_version|cairo_svg_version_to_string|cairoantialias|cairocontent|cairocontext|cairoexception|cairoextend|cairofillrule|cairofilter|cairofontface|cairofontoptions|cairofontslant|cairofonttype|cairofontweight|cairoformat|cairogradientpattern|cairohintmetrics|cairohintstyle|cairoimagesurface|cairolineargradient|cairolinecap|cairolinejoin|cairomatrix|cairooperator|cairopath|cairopattern|cairopatterntype|cairopdfsurface|cairopslevel|cairopssurface|cairoradialgradient|cairoscaledfont|cairosolidpattern|cairostatus|cairosubpixelorder|cairosurface|cairosurfacepattern|cairosurfacetype|cairosvgsurface|cairosvgversion|cairotoyfontface|cal_days_in_month|cal_from_jd|cal_info|cal_to_jd|calcul_hmac|calculhmac|call_user_func|call_user_func_array|call_user_method|call_user_method_array|callbackfilteriterator|ceil|chdb|chdb_create|chdir|checkdate|checkdnsrr|chgrp|chmod|chop|chown|chr|chroot|chunk_split|class_alias|class_exists|class_implements|class_parents|classkit_import|classkit_method_add|classkit_method_copy|classkit_method_redefine|classkit_method_remove|classkit_method_rename|clearstatcache|clone|closedir|closelog|collator|com|com_addref|com_create_guid|com_event_sink|com_get|com_get_active_object|com_invoke|com_isenum|com_load|com_load_typelib|com_message_pump|com_print_typeinfo|com_propget|com_propput|com_propset|com_release|com_set|compact|connection_aborted|connection_status|connection_timeout|constant|construct|construct|construct|convert_cyr_string|convert_uudecode|convert_uuencode|copy|cos|cosh|count|count_chars|countable|counter_bump|counter_bump_value|counter_create|counter_get|counter_get_meta|counter_get_named|counter_get_value|counter_reset|counter_reset_value|crack_check|crack_closedict|crack_getlastmessage|crack_opendict|crc32|create_function|crypt|ctype_alnum|ctype_alpha|ctype_cntrl|ctype_digit|ctype_graph|ctype_lower|ctype_print|ctype_punct|ctype_space|ctype_upper|ctype_xdigit|cubrid_affected_rows|cubrid_bind|cubrid_client_encoding|cubrid_close|cubrid_close_prepare|cubrid_close_request|cubrid_col_get|cubrid_col_size|cubrid_column_names|cubrid_column_types|cubrid_commit|cubrid_connect|cubrid_connect_with_url|cubrid_current_oid|cubrid_data_seek|cubrid_db_name|cubrid_disconnect|cubrid_drop|cubrid_errno|cubrid_error|cubrid_error_code|cubrid_error_code_facility|cubrid_error_msg|cubrid_execute|cubrid_fetch|cubrid_fetch_array|cubrid_fetch_assoc|cubrid_fetch_field|cubrid_fetch_lengths|cubrid_fetch_object|cubrid_fetch_row|cubrid_field_flags|cubrid_field_len|cubrid_field_name|cubrid_field_seek|cubrid_field_table|cubrid_field_type|cubrid_free_result|cubrid_get|cubrid_get_autocommit|cubrid_get_charset|cubrid_get_class_name|cubrid_get_client_info|cubrid_get_db_parameter|cubrid_get_server_info|cubrid_insert_id|cubrid_is_instance|cubrid_list_dbs|cubrid_load_from_glo|cubrid_lob_close|cubrid_lob_export|cubrid_lob_get|cubrid_lob_send|cubrid_lob_size|cubrid_lock_read|cubrid_lock_write|cubrid_move_cursor|cubrid_new_glo|cubrid_next_result|cubrid_num_cols|cubrid_num_fields|cubrid_num_rows|cubrid_ping|cubrid_prepare|cubrid_put|cubrid_query|cubrid_real_escape_string|cubrid_result|cubrid_rollback|cubrid_save_to_glo|cubrid_schema|cubrid_send_glo|cubrid_seq_drop|cubrid_seq_insert|cubrid_seq_put|cubrid_set_add|cubrid_set_autocommit|cubrid_set_db_parameter|cubrid_set_drop|cubrid_unbuffered_query|cubrid_version|curl_close|curl_copy_handle|curl_errno|curl_error|curl_exec|curl_getinfo|curl_init|curl_multi_add_handle|curl_multi_close|curl_multi_exec|curl_multi_getcontent|curl_multi_info_read|curl_multi_init|curl_multi_remove_handle|curl_multi_select|curl_setopt|curl_setopt_array|curl_version|current|cyrus_authenticate|cyrus_bind|cyrus_close|cyrus_connect|cyrus_query|cyrus_unbind|date|date_add|date_create|date_create_from_format|date_date_set|date_default_timezone_get|date_default_timezone_set|date_diff|date_format|date_get_last_errors|date_interval_create_from_date_string|date_interval_format|date_isodate_set|date_modify|date_offset_get|date_parse|date_parse_from_format|date_sub|date_sun_info|date_sunrise|date_sunset|date_time_set|date_timestamp_get|date_timestamp_set|date_timezone_get|date_timezone_set|dateinterval|dateperiod|datetime|datetimezone|db2_autocommit|db2_bind_param|db2_client_info|db2_close|db2_column_privileges|db2_columns|db2_commit|db2_conn_error|db2_conn_errormsg|db2_connect|db2_cursor_type|db2_escape_string|db2_exec|db2_execute|db2_fetch_array|db2_fetch_assoc|db2_fetch_both|db2_fetch_object|db2_fetch_row|db2_field_display_size|db2_field_name|db2_field_num|db2_field_precision|db2_field_scale|db2_field_type|db2_field_width|db2_foreign_keys|db2_free_result|db2_free_stmt|db2_get_option|db2_last_insert_id|db2_lob_read|db2_next_result|db2_num_fields|db2_num_rows|db2_pclose|db2_pconnect|db2_prepare|db2_primary_keys|db2_procedure_columns|db2_procedures|db2_result|db2_rollback|db2_server_info|db2_set_option|db2_special_columns|db2_statistics|db2_stmt_error|db2_stmt_errormsg|db2_table_privileges|db2_tables|dba_close|dba_delete|dba_exists|dba_fetch|dba_firstkey|dba_handlers|dba_insert|dba_key_split|dba_list|dba_nextkey|dba_open|dba_optimize|dba_popen|dba_replace|dba_sync|dbase_add_record|dbase_close|dbase_create|dbase_delete_record|dbase_get_header_info|dbase_get_record|dbase_get_record_with_names|dbase_numfields|dbase_numrecords|dbase_open|dbase_pack|dbase_replace_record|dbplus_add|dbplus_aql|dbplus_chdir|dbplus_close|dbplus_curr|dbplus_errcode|dbplus_errno|dbplus_find|dbplus_first|dbplus_flush|dbplus_freealllocks|dbplus_freelock|dbplus_freerlocks|dbplus_getlock|dbplus_getunique|dbplus_info|dbplus_last|dbplus_lockrel|dbplus_next|dbplus_open|dbplus_prev|dbplus_rchperm|dbplus_rcreate|dbplus_rcrtexact|dbplus_rcrtlike|dbplus_resolve|dbplus_restorepos|dbplus_rkeys|dbplus_ropen|dbplus_rquery|dbplus_rrename|dbplus_rsecindex|dbplus_runlink|dbplus_rzap|dbplus_savepos|dbplus_setindex|dbplus_setindexbynumber|dbplus_sql|dbplus_tcl|dbplus_tremove|dbplus_undo|dbplus_undoprepare|dbplus_unlockrel|dbplus_unselect|dbplus_update|dbplus_xlockrel|dbplus_xunlockrel|dbx_close|dbx_compare|dbx_connect|dbx_error|dbx_escape_string|dbx_fetch_row|dbx_query|dbx_sort|dcgettext|dcngettext|deaggregate|debug_backtrace|debug_print_backtrace|debug_zval_dump|decbin|dechex|decoct|define|define_syslog_variables|defined|deg2rad|delete|dgettext|die|dio_close|dio_fcntl|dio_open|dio_read|dio_seek|dio_stat|dio_tcsetattr|dio_truncate|dio_write|dir|directoryiterator|dirname|disk_free_space|disk_total_space|diskfreespace|dl|dngettext|dns_check_record|dns_get_mx|dns_get_record|dom_import_simplexml|domainexception|domattr|domattribute_name|domattribute_set_value|domattribute_specified|domattribute_value|domcharacterdata|domcomment|domdocument|domdocument_add_root|domdocument_create_attribute|domdocument_create_cdata_section|domdocument_create_comment|domdocument_create_element|domdocument_create_element_ns|domdocument_create_entity_reference|domdocument_create_processing_instruction|domdocument_create_text_node|domdocument_doctype|domdocument_document_element|domdocument_dump_file|domdocument_dump_mem|domdocument_get_element_by_id|domdocument_get_elements_by_tagname|domdocument_html_dump_mem|domdocument_xinclude|domdocumentfragment|domdocumenttype|domdocumenttype_entities|domdocumenttype_internal_subset|domdocumenttype_name|domdocumenttype_notations|domdocumenttype_public_id|domdocumenttype_system_id|domelement|domelement_get_attribute|domelement_get_attribute_node|domelement_get_elements_by_tagname|domelement_has_attribute|domelement_remove_attribute|domelement_set_attribute|domelement_set_attribute_node|domelement_tagname|domentity|domentityreference|domexception|domimplementation|domnamednodemap|domnode|domnode_add_namespace|domnode_append_child|domnode_append_sibling|domnode_attributes|domnode_child_nodes|domnode_clone_node|domnode_dump_node|domnode_first_child|domnode_get_content|domnode_has_attributes|domnode_has_child_nodes|domnode_insert_before|domnode_is_blank_node|domnode_last_child|domnode_next_sibling|domnode_node_name|domnode_node_type|domnode_node_value|domnode_owner_document|domnode_parent_node|domnode_prefix|domnode_previous_sibling|domnode_remove_child|domnode_replace_child|domnode_replace_node|domnode_set_content|domnode_set_name|domnode_set_namespace|domnode_unlink_node|domnodelist|domnotation|domprocessinginstruction|domprocessinginstruction_data|domprocessinginstruction_target|domtext|domxml_new_doc|domxml_open_file|domxml_open_mem|domxml_version|domxml_xmltree|domxml_xslt_stylesheet|domxml_xslt_stylesheet_doc|domxml_xslt_stylesheet_file|domxml_xslt_version|domxpath|domxsltstylesheet_process|domxsltstylesheet_result_dump_file|domxsltstylesheet_result_dump_mem|dotnet|dotnet_load|doubleval|each|easter_date|easter_days|echo|empty|emptyiterator|enchant_broker_describe|enchant_broker_dict_exists|enchant_broker_free|enchant_broker_free_dict|enchant_broker_get_error|enchant_broker_init|enchant_broker_list_dicts|enchant_broker_request_dict|enchant_broker_request_pwl_dict|enchant_broker_set_ordering|enchant_dict_add_to_personal|enchant_dict_add_to_session|enchant_dict_check|enchant_dict_describe|enchant_dict_get_error|enchant_dict_is_in_session|enchant_dict_quick_check|enchant_dict_store_replacement|enchant_dict_suggest|end|ereg|ereg_replace|eregi|eregi_replace|error_get_last|error_log|error_reporting|errorexception|escapeshellarg|escapeshellcmd|eval|event_add|event_base_free|event_base_loop|event_base_loopbreak|event_base_loopexit|event_base_new|event_base_priority_init|event_base_set|event_buffer_base_set|event_buffer_disable|event_buffer_enable|event_buffer_fd_set|event_buffer_free|event_buffer_new|event_buffer_priority_set|event_buffer_read|event_buffer_set_callback|event_buffer_timeout_set|event_buffer_watermark_set|event_buffer_write|event_del|event_free|event_new|event_set|exception|exec|exif_imagetype|exif_read_data|exif_tagname|exif_thumbnail|exit|exp|expect_expectl|expect_popen|explode|expm1|export|export|extension_loaded|extract|ezmlm_hash|fam_cancel_monitor|fam_close|fam_monitor_collection|fam_monitor_directory|fam_monitor_file|fam_next_event|fam_open|fam_pending|fam_resume_monitor|fam_suspend_monitor|fbsql_affected_rows|fbsql_autocommit|fbsql_blob_size|fbsql_change_user|fbsql_clob_size|fbsql_close|fbsql_commit|fbsql_connect|fbsql_create_blob|fbsql_create_clob|fbsql_create_db|fbsql_data_seek|fbsql_database|fbsql_database_password|fbsql_db_query|fbsql_db_status|fbsql_drop_db|fbsql_errno|fbsql_error|fbsql_fetch_array|fbsql_fetch_assoc|fbsql_fetch_field|fbsql_fetch_lengths|fbsql_fetch_object|fbsql_fetch_row|fbsql_field_flags|fbsql_field_len|fbsql_field_name|fbsql_field_seek|fbsql_field_table|fbsql_field_type|fbsql_free_result|fbsql_get_autostart_info|fbsql_hostname|fbsql_insert_id|fbsql_list_dbs|fbsql_list_fields|fbsql_list_tables|fbsql_next_result|fbsql_num_fields|fbsql_num_rows|fbsql_password|fbsql_pconnect|fbsql_query|fbsql_read_blob|fbsql_read_clob|fbsql_result|fbsql_rollback|fbsql_rows_fetched|fbsql_select_db|fbsql_set_characterset|fbsql_set_lob_mode|fbsql_set_password|fbsql_set_transaction|fbsql_start_db|fbsql_stop_db|fbsql_table_name|fbsql_tablename|fbsql_username|fbsql_warnings|fclose|fdf_add_doc_javascript|fdf_add_template|fdf_close|fdf_create|fdf_enum_values|fdf_errno|fdf_error|fdf_get_ap|fdf_get_attachment|fdf_get_encoding|fdf_get_file|fdf_get_flags|fdf_get_opt|fdf_get_status|fdf_get_value|fdf_get_version|fdf_header|fdf_next_field_name|fdf_open|fdf_open_string|fdf_remove_item|fdf_save|fdf_save_string|fdf_set_ap|fdf_set_encoding|fdf_set_file|fdf_set_flags|fdf_set_javascript_action|fdf_set_on_import_javascript|fdf_set_opt|fdf_set_status|fdf_set_submit_form_action|fdf_set_target_frame|fdf_set_value|fdf_set_version|feof|fflush|fgetc|fgetcsv|fgets|fgetss|file|file_exists|file_get_contents|file_put_contents|fileatime|filectime|filegroup|fileinode|filemtime|fileowner|fileperms|filepro|filepro_fieldcount|filepro_fieldname|filepro_fieldtype|filepro_fieldwidth|filepro_retrieve|filepro_rowcount|filesize|filesystemiterator|filetype|filter_has_var|filter_id|filter_input|filter_input_array|filter_list|filter_var|filter_var_array|filteriterator|finfo_buffer|finfo_close|finfo_file|finfo_open|finfo_set_flags|floatval|flock|floor|flush|fmod|fnmatch|fopen|forward_static_call|forward_static_call_array|fpassthru|fprintf|fputcsv|fputs|fread|frenchtojd|fribidi_log2vis|fscanf|fseek|fsockopen|fstat|ftell|ftok|ftp_alloc|ftp_cdup|ftp_chdir|ftp_chmod|ftp_close|ftp_connect|ftp_delete|ftp_exec|ftp_fget|ftp_fput|ftp_get|ftp_get_option|ftp_login|ftp_mdtm|ftp_mkdir|ftp_nb_continue|ftp_nb_fget|ftp_nb_fput|ftp_nb_get|ftp_nb_put|ftp_nlist|ftp_pasv|ftp_put|ftp_pwd|ftp_quit|ftp_raw|ftp_rawlist|ftp_rename|ftp_rmdir|ftp_set_option|ftp_site|ftp_size|ftp_ssl_connect|ftp_systype|ftruncate|func_get_arg|func_get_args|func_num_args|function_exists|fwrite|gc_collect_cycles|gc_disable|gc_enable|gc_enabled|gd_info|gearmanclient|gearmanjob|gearmantask|gearmanworker|geoip_continent_code_by_name|geoip_country_code3_by_name|geoip_country_code_by_name|geoip_country_name_by_name|geoip_database_info|geoip_db_avail|geoip_db_filename|geoip_db_get_all_info|geoip_id_by_name|geoip_isp_by_name|geoip_org_by_name|geoip_record_by_name|geoip_region_by_name|geoip_region_name_by_code|geoip_time_zone_by_country_and_region|getMeta|getNamed|getValue|get_browser|get_called_class|get_cfg_var|get_class|get_class_methods|get_class_vars|get_current_user|get_declared_classes|get_declared_interfaces|get_defined_constants|get_defined_functions|get_defined_vars|get_extension_funcs|get_headers|get_html_translation_table|get_include_path|get_included_files|get_loaded_extensions|get_magic_quotes_gpc|get_magic_quotes_runtime|get_meta_tags|get_object_vars|get_parent_class|get_required_files|get_resource_type|getallheaders|getconstant|getconstants|getconstructor|getcwd|getdate|getdefaultproperties|getdoccomment|getendline|getenv|getextension|getextensionname|getfilename|gethostbyaddr|gethostbyname|gethostbynamel|gethostname|getimagesize|getinterfacenames|getinterfaces|getlastmod|getmethod|getmethods|getmodifiers|getmxrr|getmygid|getmyinode|getmypid|getmyuid|getname|getnamespacename|getopt|getparentclass|getproperties|getproperty|getprotobyname|getprotobynumber|getrandmax|getrusage|getservbyname|getservbyport|getshortname|getstartline|getstaticproperties|getstaticpropertyvalue|gettext|gettimeofday|gettype|glob|globiterator|gmagick|gmagickdraw|gmagickpixel|gmdate|gmmktime|gmp_abs|gmp_add|gmp_and|gmp_clrbit|gmp_cmp|gmp_com|gmp_div|gmp_div_q|gmp_div_qr|gmp_div_r|gmp_divexact|gmp_fact|gmp_gcd|gmp_gcdext|gmp_hamdist|gmp_init|gmp_intval|gmp_invert|gmp_jacobi|gmp_legendre|gmp_mod|gmp_mul|gmp_neg|gmp_nextprime|gmp_or|gmp_perfect_square|gmp_popcount|gmp_pow|gmp_powm|gmp_prob_prime|gmp_random|gmp_scan0|gmp_scan1|gmp_setbit|gmp_sign|gmp_sqrt|gmp_sqrtrem|gmp_strval|gmp_sub|gmp_testbit|gmp_xor|gmstrftime|gnupg_adddecryptkey|gnupg_addencryptkey|gnupg_addsignkey|gnupg_cleardecryptkeys|gnupg_clearencryptkeys|gnupg_clearsignkeys|gnupg_decrypt|gnupg_decryptverify|gnupg_encrypt|gnupg_encryptsign|gnupg_export|gnupg_geterror|gnupg_getprotocol|gnupg_import|gnupg_init|gnupg_keyinfo|gnupg_setarmor|gnupg_seterrormode|gnupg_setsignmode|gnupg_sign|gnupg_verify|gopher_parsedir|grapheme_extract|grapheme_stripos|grapheme_stristr|grapheme_strlen|grapheme_strpos|grapheme_strripos|grapheme_strrpos|grapheme_strstr|grapheme_substr|gregoriantojd|gupnp_context_get_host_ip|gupnp_context_get_port|gupnp_context_get_subscription_timeout|gupnp_context_host_path|gupnp_context_new|gupnp_context_set_subscription_timeout|gupnp_context_timeout_add|gupnp_context_unhost_path|gupnp_control_point_browse_start|gupnp_control_point_browse_stop|gupnp_control_point_callback_set|gupnp_control_point_new|gupnp_device_action_callback_set|gupnp_device_info_get|gupnp_device_info_get_service|gupnp_root_device_get_available|gupnp_root_device_get_relative_location|gupnp_root_device_new|gupnp_root_device_set_available|gupnp_root_device_start|gupnp_root_device_stop|gupnp_service_action_get|gupnp_service_action_return|gupnp_service_action_return_error|gupnp_service_action_set|gupnp_service_freeze_notify|gupnp_service_info_get|gupnp_service_info_get_introspection|gupnp_service_introspection_get_state_variable|gupnp_service_notify|gupnp_service_proxy_action_get|gupnp_service_proxy_action_set|gupnp_service_proxy_add_notify|gupnp_service_proxy_callback_set|gupnp_service_proxy_get_subscribed|gupnp_service_proxy_remove_notify|gupnp_service_proxy_set_subscribed|gupnp_service_thaw_notify|gzclose|gzcompress|gzdecode|gzdeflate|gzencode|gzeof|gzfile|gzgetc|gzgets|gzgetss|gzinflate|gzopen|gzpassthru|gzputs|gzread|gzrewind|gzseek|gztell|gzuncompress|gzwrite|halt_compiler|haruannotation|haruannotation_setborderstyle|haruannotation_sethighlightmode|haruannotation_seticon|haruannotation_setopened|harudestination|harudestination_setfit|harudestination_setfitb|harudestination_setfitbh|harudestination_setfitbv|harudestination_setfith|harudestination_setfitr|harudestination_setfitv|harudestination_setxyz|harudoc|harudoc_addpage|harudoc_addpagelabel|harudoc_construct|harudoc_createoutline|harudoc_getcurrentencoder|harudoc_getcurrentpage|harudoc_getencoder|harudoc_getfont|harudoc_getinfoattr|harudoc_getpagelayout|harudoc_getpagemode|harudoc_getstreamsize|harudoc_insertpage|harudoc_loadjpeg|harudoc_loadpng|harudoc_loadraw|harudoc_loadttc|harudoc_loadttf|harudoc_loadtype1|harudoc_output|harudoc_readfromstream|harudoc_reseterror|harudoc_resetstream|harudoc_save|harudoc_savetostream|harudoc_setcompressionmode|harudoc_setcurrentencoder|harudoc_setencryptionmode|harudoc_setinfoattr|harudoc_setinfodateattr|harudoc_setopenaction|harudoc_setpagelayout|harudoc_setpagemode|harudoc_setpagesconfiguration|harudoc_setpassword|harudoc_setpermission|harudoc_usecnsencodings|harudoc_usecnsfonts|harudoc_usecntencodings|harudoc_usecntfonts|harudoc_usejpencodings|harudoc_usejpfonts|harudoc_usekrencodings|harudoc_usekrfonts|haruencoder|haruencoder_getbytetype|haruencoder_gettype|haruencoder_getunicode|haruencoder_getwritingmode|haruexception|harufont|harufont_getascent|harufont_getcapheight|harufont_getdescent|harufont_getencodingname|harufont_getfontname|harufont_gettextwidth|harufont_getunicodewidth|harufont_getxheight|harufont_measuretext|haruimage|haruimage_getbitspercomponent|haruimage_getcolorspace|haruimage_getheight|haruimage_getsize|haruimage_getwidth|haruimage_setcolormask|haruimage_setmaskimage|haruoutline|haruoutline_setdestination|haruoutline_setopened|harupage|harupage_arc|harupage_begintext|harupage_circle|harupage_closepath|harupage_concat|harupage_createdestination|harupage_createlinkannotation|harupage_createtextannotation|harupage_createurlannotation|harupage_curveto|harupage_curveto2|harupage_curveto3|harupage_drawimage|harupage_ellipse|harupage_endpath|harupage_endtext|harupage_eofill|harupage_eofillstroke|harupage_fill|harupage_fillstroke|harupage_getcharspace|harupage_getcmykfill|harupage_getcmykstroke|harupage_getcurrentfont|harupage_getcurrentfontsize|harupage_getcurrentpos|harupage_getcurrenttextpos|harupage_getdash|harupage_getfillingcolorspace|harupage_getflatness|harupage_getgmode|harupage_getgrayfill|harupage_getgraystroke|harupage_getheight|harupage_gethorizontalscaling|harupage_getlinecap|harupage_getlinejoin|harupage_getlinewidth|harupage_getmiterlimit|harupage_getrgbfill|harupage_getrgbstroke|harupage_getstrokingcolorspace|harupage_gettextleading|harupage_gettextmatrix|harupage_gettextrenderingmode|harupage_gettextrise|harupage_gettextwidth|harupage_gettransmatrix|harupage_getwidth|harupage_getwordspace|harupage_lineto|harupage_measuretext|harupage_movetextpos|harupage_moveto|harupage_movetonextline|harupage_rectangle|harupage_setcharspace|harupage_setcmykfill|harupage_setcmykstroke|harupage_setdash|harupage_setflatness|harupage_setfontandsize|harupage_setgrayfill|harupage_setgraystroke|harupage_setheight|harupage_sethorizontalscaling|harupage_setlinecap|harupage_setlinejoin|harupage_setlinewidth|harupage_setmiterlimit|harupage_setrgbfill|harupage_setrgbstroke|harupage_setrotate|harupage_setsize|harupage_setslideshow|harupage_settextleading|harupage_settextmatrix|harupage_settextrenderingmode|harupage_settextrise|harupage_setwidth|harupage_setwordspace|harupage_showtext|harupage_showtextnextline|harupage_stroke|harupage_textout|harupage_textrect|hasconstant|hash|hash_algos|hash_copy|hash_file|hash_final|hash_hmac|hash_hmac_file|hash_init|hash_update|hash_update_file|hash_update_stream|hasmethod|hasproperty|header|header_register_callback|header_remove|headers_list|headers_sent|hebrev|hebrevc|hex2bin|hexdec|highlight_file|highlight_string|html_entity_decode|htmlentities|htmlspecialchars|htmlspecialchars_decode|http_build_cookie|http_build_query|http_build_str|http_build_url|http_cache_etag|http_cache_last_modified|http_chunked_decode|http_date|http_deflate|http_get|http_get_request_body|http_get_request_body_stream|http_get_request_headers|http_head|http_inflate|http_match_etag|http_match_modified|http_match_request_header|http_negotiate_charset|http_negotiate_content_type|http_negotiate_language|http_parse_cookie|http_parse_headers|http_parse_message|http_parse_params|http_persistent_handles_clean|http_persistent_handles_count|http_persistent_handles_ident|http_post_data|http_post_fields|http_put_data|http_put_file|http_put_stream|http_redirect|http_request|http_request_body_encode|http_request_method_exists|http_request_method_name|http_request_method_register|http_request_method_unregister|http_response_code|http_send_content_disposition|http_send_content_type|http_send_data|http_send_file|http_send_last_modified|http_send_status|http_send_stream|http_support|http_throttle|httpdeflatestream|httpdeflatestream_construct|httpdeflatestream_factory|httpdeflatestream_finish|httpdeflatestream_flush|httpdeflatestream_update|httpinflatestream|httpinflatestream_construct|httpinflatestream_factory|httpinflatestream_finish|httpinflatestream_flush|httpinflatestream_update|httpmessage|httpmessage_addheaders|httpmessage_construct|httpmessage_detach|httpmessage_factory|httpmessage_fromenv|httpmessage_fromstring|httpmessage_getbody|httpmessage_getheader|httpmessage_getheaders|httpmessage_gethttpversion|httpmessage_getparentmessage|httpmessage_getrequestmethod|httpmessage_getrequesturl|httpmessage_getresponsecode|httpmessage_getresponsestatus|httpmessage_gettype|httpmessage_guesscontenttype|httpmessage_prepend|httpmessage_reverse|httpmessage_send|httpmessage_setbody|httpmessage_setheaders|httpmessage_sethttpversion|httpmessage_setrequestmethod|httpmessage_setrequesturl|httpmessage_setresponsecode|httpmessage_setresponsestatus|httpmessage_settype|httpmessage_tomessagetypeobject|httpmessage_tostring|httpquerystring|httpquerystring_construct|httpquerystring_get|httpquerystring_mod|httpquerystring_set|httpquerystring_singleton|httpquerystring_toarray|httpquerystring_tostring|httpquerystring_xlate|httprequest|httprequest_addcookies|httprequest_addheaders|httprequest_addpostfields|httprequest_addpostfile|httprequest_addputdata|httprequest_addquerydata|httprequest_addrawpostdata|httprequest_addssloptions|httprequest_clearhistory|httprequest_construct|httprequest_enablecookies|httprequest_getcontenttype|httprequest_getcookies|httprequest_getheaders|httprequest_gethistory|httprequest_getmethod|httprequest_getoptions|httprequest_getpostfields|httprequest_getpostfiles|httprequest_getputdata|httprequest_getputfile|httprequest_getquerydata|httprequest_getrawpostdata|httprequest_getrawrequestmessage|httprequest_getrawresponsemessage|httprequest_getrequestmessage|httprequest_getresponsebody|httprequest_getresponsecode|httprequest_getresponsecookies|httprequest_getresponsedata|httprequest_getresponseheader|httprequest_getresponseinfo|httprequest_getresponsemessage|httprequest_getresponsestatus|httprequest_getssloptions|httprequest_geturl|httprequest_resetcookies|httprequest_send|httprequest_setcontenttype|httprequest_setcookies|httprequest_setheaders|httprequest_setmethod|httprequest_setoptions|httprequest_setpostfields|httprequest_setpostfiles|httprequest_setputdata|httprequest_setputfile|httprequest_setquerydata|httprequest_setrawpostdata|httprequest_setssloptions|httprequest_seturl|httprequestpool|httprequestpool_attach|httprequestpool_construct|httprequestpool_destruct|httprequestpool_detach|httprequestpool_getattachedrequests|httprequestpool_getfinishedrequests|httprequestpool_reset|httprequestpool_send|httprequestpool_socketperform|httprequestpool_socketselect|httpresponse|httpresponse_capture|httpresponse_getbuffersize|httpresponse_getcache|httpresponse_getcachecontrol|httpresponse_getcontentdisposition|httpresponse_getcontenttype|httpresponse_getdata|httpresponse_getetag|httpresponse_getfile|httpresponse_getgzip|httpresponse_getheader|httpresponse_getlastmodified|httpresponse_getrequestbody|httpresponse_getrequestbodystream|httpresponse_getrequestheaders|httpresponse_getstream|httpresponse_getthrottledelay|httpresponse_guesscontenttype|httpresponse_redirect|httpresponse_send|httpresponse_setbuffersize|httpresponse_setcache|httpresponse_setcachecontrol|httpresponse_setcontentdisposition|httpresponse_setcontenttype|httpresponse_setdata|httpresponse_setetag|httpresponse_setfile|httpresponse_setgzip|httpresponse_setheader|httpresponse_setlastmodified|httpresponse_setstream|httpresponse_setthrottledelay|httpresponse_status|hw_array2objrec|hw_changeobject|hw_children|hw_childrenobj|hw_close|hw_connect|hw_connection_info|hw_cp|hw_deleteobject|hw_docbyanchor|hw_docbyanchorobj|hw_document_attributes|hw_document_bodytag|hw_document_content|hw_document_setcontent|hw_document_size|hw_dummy|hw_edittext|hw_error|hw_errormsg|hw_free_document|hw_getanchors|hw_getanchorsobj|hw_getandlock|hw_getchildcoll|hw_getchildcollobj|hw_getchilddoccoll|hw_getchilddoccollobj|hw_getobject|hw_getobjectbyquery|hw_getobjectbyquerycoll|hw_getobjectbyquerycollobj|hw_getobjectbyqueryobj|hw_getparents|hw_getparentsobj|hw_getrellink|hw_getremote|hw_getremotechildren|hw_getsrcbydestobj|hw_gettext|hw_getusername|hw_identify|hw_incollections|hw_info|hw_inscoll|hw_insdoc|hw_insertanchors|hw_insertdocument|hw_insertobject|hw_mapid|hw_modifyobject|hw_mv|hw_new_document|hw_objrec2array|hw_output_document|hw_pconnect|hw_pipedocument|hw_root|hw_setlinkroot|hw_stat|hw_unlock|hw_who|hwapi_attribute|hwapi_attribute_key|hwapi_attribute_langdepvalue|hwapi_attribute_value|hwapi_attribute_values|hwapi_checkin|hwapi_checkout|hwapi_children|hwapi_content|hwapi_content_mimetype|hwapi_content_read|hwapi_copy|hwapi_dbstat|hwapi_dcstat|hwapi_dstanchors|hwapi_dstofsrcanchor|hwapi_error_count|hwapi_error_reason|hwapi_find|hwapi_ftstat|hwapi_hgcsp|hwapi_hwstat|hwapi_identify|hwapi_info|hwapi_insert|hwapi_insertanchor|hwapi_insertcollection|hwapi_insertdocument|hwapi_link|hwapi_lock|hwapi_move|hwapi_new_content|hwapi_object|hwapi_object_assign|hwapi_object_attreditable|hwapi_object_count|hwapi_object_insert|hwapi_object_new|hwapi_object_remove|hwapi_object_title|hwapi_object_value|hwapi_objectbyanchor|hwapi_parents|hwapi_reason_description|hwapi_reason_type|hwapi_remove|hwapi_replace|hwapi_setcommittedversion|hwapi_srcanchors|hwapi_srcsofdst|hwapi_unlock|hwapi_user|hwapi_userlist|hypot|ibase_add_user|ibase_affected_rows|ibase_backup|ibase_blob_add|ibase_blob_cancel|ibase_blob_close|ibase_blob_create|ibase_blob_echo|ibase_blob_get|ibase_blob_import|ibase_blob_info|ibase_blob_open|ibase_close|ibase_commit|ibase_commit_ret|ibase_connect|ibase_db_info|ibase_delete_user|ibase_drop_db|ibase_errcode|ibase_errmsg|ibase_execute|ibase_fetch_assoc|ibase_fetch_object|ibase_fetch_row|ibase_field_info|ibase_free_event_handler|ibase_free_query|ibase_free_result|ibase_gen_id|ibase_maintain_db|ibase_modify_user|ibase_name_result|ibase_num_fields|ibase_num_params|ibase_param_info|ibase_pconnect|ibase_prepare|ibase_query|ibase_restore|ibase_rollback|ibase_rollback_ret|ibase_server_info|ibase_service_attach|ibase_service_detach|ibase_set_event_handler|ibase_timefmt|ibase_trans|ibase_wait_event|iconv|iconv_get_encoding|iconv_mime_decode|iconv_mime_decode_headers|iconv_mime_encode|iconv_set_encoding|iconv_strlen|iconv_strpos|iconv_strrpos|iconv_substr|id3_get_frame_long_name|id3_get_frame_short_name|id3_get_genre_id|id3_get_genre_list|id3_get_genre_name|id3_get_tag|id3_get_version|id3_remove_tag|id3_set_tag|id3v2attachedpictureframe|id3v2frame|id3v2tag|idate|idn_to_ascii|idn_to_unicode|idn_to_utf8|ifx_affected_rows|ifx_blobinfile_mode|ifx_byteasvarchar|ifx_close|ifx_connect|ifx_copy_blob|ifx_create_blob|ifx_create_char|ifx_do|ifx_error|ifx_errormsg|ifx_fetch_row|ifx_fieldproperties|ifx_fieldtypes|ifx_free_blob|ifx_free_char|ifx_free_result|ifx_get_blob|ifx_get_char|ifx_getsqlca|ifx_htmltbl_result|ifx_nullformat|ifx_num_fields|ifx_num_rows|ifx_pconnect|ifx_prepare|ifx_query|ifx_textasvarchar|ifx_update_blob|ifx_update_char|ifxus_close_slob|ifxus_create_slob|ifxus_free_slob|ifxus_open_slob|ifxus_read_slob|ifxus_seek_slob|ifxus_tell_slob|ifxus_write_slob|ignore_user_abort|iis_add_server|iis_get_dir_security|iis_get_script_map|iis_get_server_by_comment|iis_get_server_by_path|iis_get_server_rights|iis_get_service_state|iis_remove_server|iis_set_app_settings|iis_set_dir_security|iis_set_script_map|iis_set_server_rights|iis_start_server|iis_start_service|iis_stop_server|iis_stop_service|image2wbmp|image_type_to_extension|image_type_to_mime_type|imagealphablending|imageantialias|imagearc|imagechar|imagecharup|imagecolorallocate|imagecolorallocatealpha|imagecolorat|imagecolorclosest|imagecolorclosestalpha|imagecolorclosesthwb|imagecolordeallocate|imagecolorexact|imagecolorexactalpha|imagecolormatch|imagecolorresolve|imagecolorresolvealpha|imagecolorset|imagecolorsforindex|imagecolorstotal|imagecolortransparent|imageconvolution|imagecopy|imagecopymerge|imagecopymergegray|imagecopyresampled|imagecopyresized|imagecreate|imagecreatefromgd|imagecreatefromgd2|imagecreatefromgd2part|imagecreatefromgif|imagecreatefromjpeg|imagecreatefrompng|imagecreatefromstring|imagecreatefromwbmp|imagecreatefromxbm|imagecreatefromxpm|imagecreatetruecolor|imagedashedline|imagedestroy|imageellipse|imagefill|imagefilledarc|imagefilledellipse|imagefilledpolygon|imagefilledrectangle|imagefilltoborder|imagefilter|imagefontheight|imagefontwidth|imageftbbox|imagefttext|imagegammacorrect|imagegd|imagegd2|imagegif|imagegrabscreen|imagegrabwindow|imageinterlace|imageistruecolor|imagejpeg|imagelayereffect|imageline|imageloadfont|imagepalettecopy|imagepng|imagepolygon|imagepsbbox|imagepsencodefont|imagepsextendfont|imagepsfreefont|imagepsloadfont|imagepsslantfont|imagepstext|imagerectangle|imagerotate|imagesavealpha|imagesetbrush|imagesetpixel|imagesetstyle|imagesetthickness|imagesettile|imagestring|imagestringup|imagesx|imagesy|imagetruecolortopalette|imagettfbbox|imagettftext|imagetypes|imagewbmp|imagexbm|imagick|imagick_adaptiveblurimage|imagick_adaptiveresizeimage|imagick_adaptivesharpenimage|imagick_adaptivethresholdimage|imagick_addimage|imagick_addnoiseimage|imagick_affinetransformimage|imagick_animateimages|imagick_annotateimage|imagick_appendimages|imagick_averageimages|imagick_blackthresholdimage|imagick_blurimage|imagick_borderimage|imagick_charcoalimage|imagick_chopimage|imagick_clear|imagick_clipimage|imagick_clippathimage|imagick_clone|imagick_clutimage|imagick_coalesceimages|imagick_colorfloodfillimage|imagick_colorizeimage|imagick_combineimages|imagick_commentimage|imagick_compareimagechannels|imagick_compareimagelayers|imagick_compareimages|imagick_compositeimage|imagick_construct|imagick_contrastimage|imagick_contraststretchimage|imagick_convolveimage|imagick_cropimage|imagick_cropthumbnailimage|imagick_current|imagick_cyclecolormapimage|imagick_decipherimage|imagick_deconstructimages|imagick_deleteimageartifact|imagick_despeckleimage|imagick_destroy|imagick_displayimage|imagick_displayimages|imagick_distortimage|imagick_drawimage|imagick_edgeimage|imagick_embossimage|imagick_encipherimage|imagick_enhanceimage|imagick_equalizeimage|imagick_evaluateimage|imagick_extentimage|imagick_flattenimages|imagick_flipimage|imagick_floodfillpaintimage|imagick_flopimage|imagick_frameimage|imagick_fximage|imagick_gammaimage|imagick_gaussianblurimage|imagick_getcolorspace|imagick_getcompression|imagick_getcompressionquality|imagick_getcopyright|imagick_getfilename|imagick_getfont|imagick_getformat|imagick_getgravity|imagick_gethomeurl|imagick_getimage|imagick_getimagealphachannel|imagick_getimageartifact|imagick_getimagebackgroundcolor|imagick_getimageblob|imagick_getimageblueprimary|imagick_getimagebordercolor|imagick_getimagechanneldepth|imagick_getimagechanneldistortion|imagick_getimagechanneldistortions|imagick_getimagechannelextrema|imagick_getimagechannelmean|imagick_getimagechannelrange|imagick_getimagechannelstatistics|imagick_getimageclipmask|imagick_getimagecolormapcolor|imagick_getimagecolors|imagick_getimagecolorspace|imagick_getimagecompose|imagick_getimagecompression|imagick_getimagecompressionquality|imagick_getimagedelay|imagick_getimagedepth|imagick_getimagedispose|imagick_getimagedistortion|imagick_getimageextrema|imagick_getimagefilename|imagick_getimageformat|imagick_getimagegamma|imagick_getimagegeometry|imagick_getimagegravity|imagick_getimagegreenprimary|imagick_getimageheight|imagick_getimagehistogram|imagick_getimageindex|imagick_getimageinterlacescheme|imagick_getimageinterpolatemethod|imagick_getimageiterations|imagick_getimagelength|imagick_getimagemagicklicense|imagick_getimagematte|imagick_getimagemattecolor|imagick_getimageorientation|imagick_getimagepage|imagick_getimagepixelcolor|imagick_getimageprofile|imagick_getimageprofiles|imagick_getimageproperties|imagick_getimageproperty|imagick_getimageredprimary|imagick_getimageregion|imagick_getimagerenderingintent|imagick_getimageresolution|imagick_getimagesblob|imagick_getimagescene|imagick_getimagesignature|imagick_getimagesize|imagick_getimagetickspersecond|imagick_getimagetotalinkdensity|imagick_getimagetype|imagick_getimageunits|imagick_getimagevirtualpixelmethod|imagick_getimagewhitepoint|imagick_getimagewidth|imagick_getinterlacescheme|imagick_getiteratorindex|imagick_getnumberimages|imagick_getoption|imagick_getpackagename|imagick_getpage|imagick_getpixeliterator|imagick_getpixelregioniterator|imagick_getpointsize|imagick_getquantumdepth|imagick_getquantumrange|imagick_getreleasedate|imagick_getresource|imagick_getresourcelimit|imagick_getsamplingfactors|imagick_getsize|imagick_getsizeoffset|imagick_getversion|imagick_hasnextimage|imagick_haspreviousimage|imagick_identifyimage|imagick_implodeimage|imagick_labelimage|imagick_levelimage|imagick_linearstretchimage|imagick_liquidrescaleimage|imagick_magnifyimage|imagick_mapimage|imagick_mattefloodfillimage|imagick_medianfilterimage|imagick_mergeimagelayers|imagick_minifyimage|imagick_modulateimage|imagick_montageimage|imagick_morphimages|imagick_mosaicimages|imagick_motionblurimage|imagick_negateimage|imagick_newimage|imagick_newpseudoimage|imagick_nextimage|imagick_normalizeimage|imagick_oilpaintimage|imagick_opaquepaintimage|imagick_optimizeimagelayers|imagick_orderedposterizeimage|imagick_paintfloodfillimage|imagick_paintopaqueimage|imagick_painttransparentimage|imagick_pingimage|imagick_pingimageblob|imagick_pingimagefile|imagick_polaroidimage|imagick_posterizeimage|imagick_previewimages|imagick_previousimage|imagick_profileimage|imagick_quantizeimage|imagick_quantizeimages|imagick_queryfontmetrics|imagick_queryfonts|imagick_queryformats|imagick_radialblurimage|imagick_raiseimage|imagick_randomthresholdimage|imagick_readimage|imagick_readimageblob|imagick_readimagefile|imagick_recolorimage|imagick_reducenoiseimage|imagick_removeimage|imagick_removeimageprofile|imagick_render|imagick_resampleimage|imagick_resetimagepage|imagick_resizeimage|imagick_rollimage|imagick_rotateimage|imagick_roundcorners|imagick_sampleimage|imagick_scaleimage|imagick_separateimagechannel|imagick_sepiatoneimage|imagick_setbackgroundcolor|imagick_setcolorspace|imagick_setcompression|imagick_setcompressionquality|imagick_setfilename|imagick_setfirstiterator|imagick_setfont|imagick_setformat|imagick_setgravity|imagick_setimage|imagick_setimagealphachannel|imagick_setimageartifact|imagick_setimagebackgroundcolor|imagick_setimagebias|imagick_setimageblueprimary|imagick_setimagebordercolor|imagick_setimagechanneldepth|imagick_setimageclipmask|imagick_setimagecolormapcolor|imagick_setimagecolorspace|imagick_setimagecompose|imagick_setimagecompression|imagick_setimagecompressionquality|imagick_setimagedelay|imagick_setimagedepth|imagick_setimagedispose|imagick_setimageextent|imagick_setimagefilename|imagick_setimageformat|imagick_setimagegamma|imagick_setimagegravity|imagick_setimagegreenprimary|imagick_setimageindex|imagick_setimageinterlacescheme|imagick_setimageinterpolatemethod|imagick_setimageiterations|imagick_setimagematte|imagick_setimagemattecolor|imagick_setimageopacity|imagick_setimageorientation|imagick_setimagepage|imagick_setimageprofile|imagick_setimageproperty|imagick_setimageredprimary|imagick_setimagerenderingintent|imagick_setimageresolution|imagick_setimagescene|imagick_setimagetickspersecond|imagick_setimagetype|imagick_setimageunits|imagick_setimagevirtualpixelmethod|imagick_setimagewhitepoint|imagick_setinterlacescheme|imagick_setiteratorindex|imagick_setlastiterator|imagick_setoption|imagick_setpage|imagick_setpointsize|imagick_setresolution|imagick_setresourcelimit|imagick_setsamplingfactors|imagick_setsize|imagick_setsizeoffset|imagick_settype|imagick_shadeimage|imagick_shadowimage|imagick_sharpenimage|imagick_shaveimage|imagick_shearimage|imagick_sigmoidalcontrastimage|imagick_sketchimage|imagick_solarizeimage|imagick_spliceimage|imagick_spreadimage|imagick_steganoimage|imagick_stereoimage|imagick_stripimage|imagick_swirlimage|imagick_textureimage|imagick_thresholdimage|imagick_thumbnailimage|imagick_tintimage|imagick_transformimage|imagick_transparentpaintimage|imagick_transposeimage|imagick_transverseimage|imagick_trimimage|imagick_uniqueimagecolors|imagick_unsharpmaskimage|imagick_valid|imagick_vignetteimage|imagick_waveimage|imagick_whitethresholdimage|imagick_writeimage|imagick_writeimagefile|imagick_writeimages|imagick_writeimagesfile|imagickdraw|imagickdraw_affine|imagickdraw_annotation|imagickdraw_arc|imagickdraw_bezier|imagickdraw_circle|imagickdraw_clear|imagickdraw_clone|imagickdraw_color|imagickdraw_comment|imagickdraw_composite|imagickdraw_construct|imagickdraw_destroy|imagickdraw_ellipse|imagickdraw_getclippath|imagickdraw_getcliprule|imagickdraw_getclipunits|imagickdraw_getfillcolor|imagickdraw_getfillopacity|imagickdraw_getfillrule|imagickdraw_getfont|imagickdraw_getfontfamily|imagickdraw_getfontsize|imagickdraw_getfontstyle|imagickdraw_getfontweight|imagickdraw_getgravity|imagickdraw_getstrokeantialias|imagickdraw_getstrokecolor|imagickdraw_getstrokedasharray|imagickdraw_getstrokedashoffset|imagickdraw_getstrokelinecap|imagickdraw_getstrokelinejoin|imagickdraw_getstrokemiterlimit|imagickdraw_getstrokeopacity|imagickdraw_getstrokewidth|imagickdraw_gettextalignment|imagickdraw_gettextantialias|imagickdraw_gettextdecoration|imagickdraw_gettextencoding|imagickdraw_gettextundercolor|imagickdraw_getvectorgraphics|imagickdraw_line|imagickdraw_matte|imagickdraw_pathclose|imagickdraw_pathcurvetoabsolute|imagickdraw_pathcurvetoquadraticbezierabsolute|imagickdraw_pathcurvetoquadraticbezierrelative|imagickdraw_pathcurvetoquadraticbeziersmoothabsolute|imagickdraw_pathcurvetoquadraticbeziersmoothrelative|imagickdraw_pathcurvetorelative|imagickdraw_pathcurvetosmoothabsolute|imagickdraw_pathcurvetosmoothrelative|imagickdraw_pathellipticarcabsolute|imagickdraw_pathellipticarcrelative|imagickdraw_pathfinish|imagickdraw_pathlinetoabsolute|imagickdraw_pathlinetohorizontalabsolute|imagickdraw_pathlinetohorizontalrelative|imagickdraw_pathlinetorelative|imagickdraw_pathlinetoverticalabsolute|imagickdraw_pathlinetoverticalrelative|imagickdraw_pathmovetoabsolute|imagickdraw_pathmovetorelative|imagickdraw_pathstart|imagickdraw_point|imagickdraw_polygon|imagickdraw_polyline|imagickdraw_pop|imagickdraw_popclippath|imagickdraw_popdefs|imagickdraw_poppattern|imagickdraw_push|imagickdraw_pushclippath|imagickdraw_pushdefs|imagickdraw_pushpattern|imagickdraw_rectangle|imagickdraw_render|imagickdraw_rotate|imagickdraw_roundrectangle|imagickdraw_scale|imagickdraw_setclippath|imagickdraw_setcliprule|imagickdraw_setclipunits|imagickdraw_setfillalpha|imagickdraw_setfillcolor|imagickdraw_setfillopacity|imagickdraw_setfillpatternurl|imagickdraw_setfillrule|imagickdraw_setfont|imagickdraw_setfontfamily|imagickdraw_setfontsize|imagickdraw_setfontstretch|imagickdraw_setfontstyle|imagickdraw_setfontweight|imagickdraw_setgravity|imagickdraw_setstrokealpha|imagickdraw_setstrokeantialias|imagickdraw_setstrokecolor|imagickdraw_setstrokedasharray|imagickdraw_setstrokedashoffset|imagickdraw_setstrokelinecap|imagickdraw_setstrokelinejoin|imagickdraw_setstrokemiterlimit|imagickdraw_setstrokeopacity|imagickdraw_setstrokepatternurl|imagickdraw_setstrokewidth|imagickdraw_settextalignment|imagickdraw_settextantialias|imagickdraw_settextdecoration|imagickdraw_settextencoding|imagickdraw_settextundercolor|imagickdraw_setvectorgraphics|imagickdraw_setviewbox|imagickdraw_skewx|imagickdraw_skewy|imagickdraw_translate|imagickpixel|imagickpixel_clear|imagickpixel_construct|imagickpixel_destroy|imagickpixel_getcolor|imagickpixel_getcolorasstring|imagickpixel_getcolorcount|imagickpixel_getcolorvalue|imagickpixel_gethsl|imagickpixel_issimilar|imagickpixel_setcolor|imagickpixel_setcolorvalue|imagickpixel_sethsl|imagickpixeliterator|imagickpixeliterator_clear|imagickpixeliterator_construct|imagickpixeliterator_destroy|imagickpixeliterator_getcurrentiteratorrow|imagickpixeliterator_getiteratorrow|imagickpixeliterator_getnextiteratorrow|imagickpixeliterator_getpreviousiteratorrow|imagickpixeliterator_newpixeliterator|imagickpixeliterator_newpixelregioniterator|imagickpixeliterator_resetiterator|imagickpixeliterator_setiteratorfirstrow|imagickpixeliterator_setiteratorlastrow|imagickpixeliterator_setiteratorrow|imagickpixeliterator_synciterator|imap_8bit|imap_alerts|imap_append|imap_base64|imap_binary|imap_body|imap_bodystruct|imap_check|imap_clearflag_full|imap_close|imap_create|imap_createmailbox|imap_delete|imap_deletemailbox|imap_errors|imap_expunge|imap_fetch_overview|imap_fetchbody|imap_fetchheader|imap_fetchmime|imap_fetchstructure|imap_fetchtext|imap_gc|imap_get_quota|imap_get_quotaroot|imap_getacl|imap_getmailboxes|imap_getsubscribed|imap_header|imap_headerinfo|imap_headers|imap_last_error|imap_list|imap_listmailbox|imap_listscan|imap_listsubscribed|imap_lsub|imap_mail|imap_mail_compose|imap_mail_copy|imap_mail_move|imap_mailboxmsginfo|imap_mime_header_decode|imap_msgno|imap_num_msg|imap_num_recent|imap_open|imap_ping|imap_qprint|imap_rename|imap_renamemailbox|imap_reopen|imap_rfc822_parse_adrlist|imap_rfc822_parse_headers|imap_rfc822_write_address|imap_savebody|imap_scan|imap_scanmailbox|imap_search|imap_set_quota|imap_setacl|imap_setflag_full|imap_sort|imap_status|imap_subscribe|imap_thread|imap_timeout|imap_uid|imap_undelete|imap_unsubscribe|imap_utf7_decode|imap_utf7_encode|imap_utf8|implementsinterface|implode|import_request_variables|in_array|include|include_once|inclued_get_data|inet_ntop|inet_pton|infiniteiterator|ingres_autocommit|ingres_autocommit_state|ingres_charset|ingres_close|ingres_commit|ingres_connect|ingres_cursor|ingres_errno|ingres_error|ingres_errsqlstate|ingres_escape_string|ingres_execute|ingres_fetch_array|ingres_fetch_assoc|ingres_fetch_object|ingres_fetch_proc_return|ingres_fetch_row|ingres_field_length|ingres_field_name|ingres_field_nullable|ingres_field_precision|ingres_field_scale|ingres_field_type|ingres_free_result|ingres_next_error|ingres_num_fields|ingres_num_rows|ingres_pconnect|ingres_prepare|ingres_query|ingres_result_seek|ingres_rollback|ingres_set_environment|ingres_unbuffered_query|ini_alter|ini_get|ini_get_all|ini_restore|ini_set|innamespace|inotify_add_watch|inotify_init|inotify_queue_len|inotify_read|inotify_rm_watch|interface_exists|intl_error_name|intl_get_error_code|intl_get_error_message|intl_is_failure|intldateformatter|intval|invalidargumentexception|invoke|invokeargs|ip2long|iptcembed|iptcparse|is_a|is_array|is_bool|is_callable|is_dir|is_double|is_executable|is_file|is_finite|is_float|is_infinite|is_int|is_integer|is_link|is_long|is_nan|is_null|is_numeric|is_object|is_readable|is_real|is_resource|is_scalar|is_soap_fault|is_string|is_subclass_of|is_uploaded_file|is_writable|is_writeable|isabstract|iscloneable|isdisabled|isfinal|isinstance|isinstantiable|isinterface|isinternal|isiterateable|isset|issubclassof|isuserdefined|iterator|iterator_apply|iterator_count|iterator_to_array|iteratoraggregate|iteratoriterator|java_last_exception_clear|java_last_exception_get|jddayofweek|jdmonthname|jdtofrench|jdtogregorian|jdtojewish|jdtojulian|jdtounix|jewishtojd|join|jpeg2wbmp|json_decode|json_encode|json_last_error|jsonserializable|judy|judy_type|judy_version|juliantojd|kadm5_chpass_principal|kadm5_create_principal|kadm5_delete_principal|kadm5_destroy|kadm5_flush|kadm5_get_policies|kadm5_get_principal|kadm5_get_principals|kadm5_init_with_password|kadm5_modify_principal|key|krsort|ksort|lcfirst|lcg_value|lchgrp|lchown|ldap_8859_to_t61|ldap_add|ldap_bind|ldap_close|ldap_compare|ldap_connect|ldap_count_entries|ldap_delete|ldap_dn2ufn|ldap_err2str|ldap_errno|ldap_error|ldap_explode_dn|ldap_first_attribute|ldap_first_entry|ldap_first_reference|ldap_free_result|ldap_get_attributes|ldap_get_dn|ldap_get_entries|ldap_get_option|ldap_get_values|ldap_get_values_len|ldap_list|ldap_mod_add|ldap_mod_del|ldap_mod_replace|ldap_modify|ldap_next_attribute|ldap_next_entry|ldap_next_reference|ldap_parse_reference|ldap_parse_result|ldap_read|ldap_rename|ldap_sasl_bind|ldap_search|ldap_set_option|ldap_set_rebind_proc|ldap_sort|ldap_start_tls|ldap_t61_to_8859|ldap_unbind|lengthexception|levenshtein|libxml_clear_errors|libxml_disable_entity_loader|libxml_get_errors|libxml_get_last_error|libxml_set_streams_context|libxml_use_internal_errors|libxmlerror|limititerator|link|linkinfo|list|locale|localeconv|localtime|log|log10|log1p|logicexception|long2ip|lstat|ltrim|lzf_compress|lzf_decompress|lzf_optimized_for|m_checkstatus|m_completeauthorizations|m_connect|m_connectionerror|m_deletetrans|m_destroyconn|m_destroyengine|m_getcell|m_getcellbynum|m_getcommadelimited|m_getheader|m_initconn|m_initengine|m_iscommadelimited|m_maxconntimeout|m_monitor|m_numcolumns|m_numrows|m_parsecommadelimited|m_responsekeys|m_responseparam|m_returnstatus|m_setblocking|m_setdropfile|m_setip|m_setssl|m_setssl_cafile|m_setssl_files|m_settimeout|m_sslcert_gen_hash|m_transactionssent|m_transinqueue|m_transkeyval|m_transnew|m_transsend|m_uwait|m_validateidentifier|m_verifyconnection|m_verifysslcert|magic_quotes_runtime|mail|mailparse_determine_best_xfer_encoding|mailparse_msg_create|mailparse_msg_extract_part|mailparse_msg_extract_part_file|mailparse_msg_extract_whole_part_file|mailparse_msg_free|mailparse_msg_get_part|mailparse_msg_get_part_data|mailparse_msg_get_structure|mailparse_msg_parse|mailparse_msg_parse_file|mailparse_rfc822_parse_addresses|mailparse_stream_encode|mailparse_uudecode_all|main|max|maxdb_affected_rows|maxdb_autocommit|maxdb_bind_param|maxdb_bind_result|maxdb_change_user|maxdb_character_set_name|maxdb_client_encoding|maxdb_close|maxdb_close_long_data|maxdb_commit|maxdb_connect|maxdb_connect_errno|maxdb_connect_error|maxdb_data_seek|maxdb_debug|maxdb_disable_reads_from_master|maxdb_disable_rpl_parse|maxdb_dump_debug_info|maxdb_embedded_connect|maxdb_enable_reads_from_master|maxdb_enable_rpl_parse|maxdb_errno|maxdb_error|maxdb_escape_string|maxdb_execute|maxdb_fetch|maxdb_fetch_array|maxdb_fetch_assoc|maxdb_fetch_field|maxdb_fetch_field_direct|maxdb_fetch_fields|maxdb_fetch_lengths|maxdb_fetch_object|maxdb_fetch_row|maxdb_field_count|maxdb_field_seek|maxdb_field_tell|maxdb_free_result|maxdb_get_client_info|maxdb_get_client_version|maxdb_get_host_info|maxdb_get_metadata|maxdb_get_proto_info|maxdb_get_server_info|maxdb_get_server_version|maxdb_info|maxdb_init|maxdb_insert_id|maxdb_kill|maxdb_master_query|maxdb_more_results|maxdb_multi_query|maxdb_next_result|maxdb_num_fields|maxdb_num_rows|maxdb_options|maxdb_param_count|maxdb_ping|maxdb_prepare|maxdb_query|maxdb_real_connect|maxdb_real_escape_string|maxdb_real_query|maxdb_report|maxdb_rollback|maxdb_rpl_parse_enabled|maxdb_rpl_probe|maxdb_rpl_query_type|maxdb_select_db|maxdb_send_long_data|maxdb_send_query|maxdb_server_end|maxdb_server_init|maxdb_set_opt|maxdb_sqlstate|maxdb_ssl_set|maxdb_stat|maxdb_stmt_affected_rows|maxdb_stmt_bind_param|maxdb_stmt_bind_result|maxdb_stmt_close|maxdb_stmt_close_long_data|maxdb_stmt_data_seek|maxdb_stmt_errno|maxdb_stmt_error|maxdb_stmt_execute|maxdb_stmt_fetch|maxdb_stmt_free_result|maxdb_stmt_init|maxdb_stmt_num_rows|maxdb_stmt_param_count|maxdb_stmt_prepare|maxdb_stmt_reset|maxdb_stmt_result_metadata|maxdb_stmt_send_long_data|maxdb_stmt_sqlstate|maxdb_stmt_store_result|maxdb_store_result|maxdb_thread_id|maxdb_thread_safe|maxdb_use_result|maxdb_warning_count|mb_check_encoding|mb_convert_case|mb_convert_encoding|mb_convert_kana|mb_convert_variables|mb_decode_mimeheader|mb_decode_numericentity|mb_detect_encoding|mb_detect_order|mb_encode_mimeheader|mb_encode_numericentity|mb_encoding_aliases|mb_ereg|mb_ereg_match|mb_ereg_replace|mb_ereg_search|mb_ereg_search_getpos|mb_ereg_search_getregs|mb_ereg_search_init|mb_ereg_search_pos|mb_ereg_search_regs|mb_ereg_search_setpos|mb_eregi|mb_eregi_replace|mb_get_info|mb_http_input|mb_http_output|mb_internal_encoding|mb_language|mb_list_encodings|mb_output_handler|mb_parse_str|mb_preferred_mime_name|mb_regex_encoding|mb_regex_set_options|mb_send_mail|mb_split|mb_strcut|mb_strimwidth|mb_stripos|mb_stristr|mb_strlen|mb_strpos|mb_strrchr|mb_strrichr|mb_strripos|mb_strrpos|mb_strstr|mb_strtolower|mb_strtoupper|mb_strwidth|mb_substitute_character|mb_substr|mb_substr_count|mcrypt_cbc|mcrypt_cfb|mcrypt_create_iv|mcrypt_decrypt|mcrypt_ecb|mcrypt_enc_get_algorithms_name|mcrypt_enc_get_block_size|mcrypt_enc_get_iv_size|mcrypt_enc_get_key_size|mcrypt_enc_get_modes_name|mcrypt_enc_get_supported_key_sizes|mcrypt_enc_is_block_algorithm|mcrypt_enc_is_block_algorithm_mode|mcrypt_enc_is_block_mode|mcrypt_enc_self_test|mcrypt_encrypt|mcrypt_generic|mcrypt_generic_deinit|mcrypt_generic_end|mcrypt_generic_init|mcrypt_get_block_size|mcrypt_get_cipher_name|mcrypt_get_iv_size|mcrypt_get_key_size|mcrypt_list_algorithms|mcrypt_list_modes|mcrypt_module_close|mcrypt_module_get_algo_block_size|mcrypt_module_get_algo_key_size|mcrypt_module_get_supported_key_sizes|mcrypt_module_is_block_algorithm|mcrypt_module_is_block_algorithm_mode|mcrypt_module_is_block_mode|mcrypt_module_open|mcrypt_module_self_test|mcrypt_ofb|md5|md5_file|mdecrypt_generic|memcache|memcache_debug|memcached|memory_get_peak_usage|memory_get_usage|messageformatter|metaphone|method_exists|mhash|mhash_count|mhash_get_block_size|mhash_get_hash_name|mhash_keygen_s2k|microtime|mime_content_type|min|ming_keypress|ming_setcubicthreshold|ming_setscale|ming_setswfcompression|ming_useconstants|ming_useswfversion|mkdir|mktime|money_format|mongo|mongobindata|mongocode|mongocollection|mongoconnectionexception|mongocursor|mongocursorexception|mongocursortimeoutexception|mongodate|mongodb|mongodbref|mongoexception|mongogridfs|mongogridfscursor|mongogridfsexception|mongogridfsfile|mongoid|mongoint32|mongoint64|mongomaxkey|mongominkey|mongoregex|mongotimestamp|move_uploaded_file|mpegfile|mqseries_back|mqseries_begin|mqseries_close|mqseries_cmit|mqseries_conn|mqseries_connx|mqseries_disc|mqseries_get|mqseries_inq|mqseries_open|mqseries_put|mqseries_put1|mqseries_set|mqseries_strerror|msession_connect|msession_count|msession_create|msession_destroy|msession_disconnect|msession_find|msession_get|msession_get_array|msession_get_data|msession_inc|msession_list|msession_listvar|msession_lock|msession_plugin|msession_randstr|msession_set|msession_set_array|msession_set_data|msession_timeout|msession_uniq|msession_unlock|msg_get_queue|msg_queue_exists|msg_receive|msg_remove_queue|msg_send|msg_set_queue|msg_stat_queue|msql|msql_affected_rows|msql_close|msql_connect|msql_create_db|msql_createdb|msql_data_seek|msql_db_query|msql_dbname|msql_drop_db|msql_error|msql_fetch_array|msql_fetch_field|msql_fetch_object|msql_fetch_row|msql_field_flags|msql_field_len|msql_field_name|msql_field_seek|msql_field_table|msql_field_type|msql_fieldflags|msql_fieldlen|msql_fieldname|msql_fieldtable|msql_fieldtype|msql_free_result|msql_list_dbs|msql_list_fields|msql_list_tables|msql_num_fields|msql_num_rows|msql_numfields|msql_numrows|msql_pconnect|msql_query|msql_regcase|msql_result|msql_select_db|msql_tablename|mssql_bind|mssql_close|mssql_connect|mssql_data_seek|mssql_execute|mssql_fetch_array|mssql_fetch_assoc|mssql_fetch_batch|mssql_fetch_field|mssql_fetch_object|mssql_fetch_row|mssql_field_length|mssql_field_name|mssql_field_seek|mssql_field_type|mssql_free_result|mssql_free_statement|mssql_get_last_message|mssql_guid_string|mssql_init|mssql_min_error_severity|mssql_min_message_severity|mssql_next_result|mssql_num_fields|mssql_num_rows|mssql_pconnect|mssql_query|mssql_result|mssql_rows_affected|mssql_select_db|mt_getrandmax|mt_rand|mt_srand|multipleiterator|mysql_affected_rows|mysql_client_encoding|mysql_close|mysql_connect|mysql_create_db|mysql_data_seek|mysql_db_name|mysql_db_query|mysql_drop_db|mysql_errno|mysql_error|mysql_escape_string|mysql_fetch_array|mysql_fetch_assoc|mysql_fetch_field|mysql_fetch_lengths|mysql_fetch_object|mysql_fetch_row|mysql_field_flags|mysql_field_len|mysql_field_name|mysql_field_seek|mysql_field_table|mysql_field_type|mysql_free_result|mysql_get_client_info|mysql_get_host_info|mysql_get_proto_info|mysql_get_server_info|mysql_info|mysql_insert_id|mysql_list_dbs|mysql_list_fields|mysql_list_processes|mysql_list_tables|mysql_num_fields|mysql_num_rows|mysql_pconnect|mysql_ping|mysql_query|mysql_real_escape_string|mysql_result|mysql_select_db|mysql_set_charset|mysql_stat|mysql_tablename|mysql_thread_id|mysql_unbuffered_query|mysqli|mysqli_bind_param|mysqli_bind_result|mysqli_client_encoding|mysqli_connect|mysqli_disable_reads_from_master|mysqli_disable_rpl_parse|mysqli_driver|mysqli_enable_reads_from_master|mysqli_enable_rpl_parse|mysqli_escape_string|mysqli_execute|mysqli_fetch|mysqli_get_metadata|mysqli_master_query|mysqli_param_count|mysqli_report|mysqli_result|mysqli_rpl_parse_enabled|mysqli_rpl_probe|mysqli_rpl_query_type|mysqli_send_long_data|mysqli_send_query|mysqli_set_opt|mysqli_slave_query|mysqli_stmt|mysqli_warning|mysqlnd_ms_get_stats|mysqlnd_ms_query_is_select|mysqlnd_ms_set_user_pick_server|mysqlnd_qc_change_handler|mysqlnd_qc_clear_cache|mysqlnd_qc_get_cache_info|mysqlnd_qc_get_core_stats|mysqlnd_qc_get_handler|mysqlnd_qc_get_query_trace_log|mysqlnd_qc_set_user_handlers|natcasesort|natsort|ncurses_addch|ncurses_addchnstr|ncurses_addchstr|ncurses_addnstr|ncurses_addstr|ncurses_assume_default_colors|ncurses_attroff|ncurses_attron|ncurses_attrset|ncurses_baudrate|ncurses_beep|ncurses_bkgd|ncurses_bkgdset|ncurses_border|ncurses_bottom_panel|ncurses_can_change_color|ncurses_cbreak|ncurses_clear|ncurses_clrtobot|ncurses_clrtoeol|ncurses_color_content|ncurses_color_set|ncurses_curs_set|ncurses_def_prog_mode|ncurses_def_shell_mode|ncurses_define_key|ncurses_del_panel|ncurses_delay_output|ncurses_delch|ncurses_deleteln|ncurses_delwin|ncurses_doupdate|ncurses_echo|ncurses_echochar|ncurses_end|ncurses_erase|ncurses_erasechar|ncurses_filter|ncurses_flash|ncurses_flushinp|ncurses_getch|ncurses_getmaxyx|ncurses_getmouse|ncurses_getyx|ncurses_halfdelay|ncurses_has_colors|ncurses_has_ic|ncurses_has_il|ncurses_has_key|ncurses_hide_panel|ncurses_hline|ncurses_inch|ncurses_init|ncurses_init_color|ncurses_init_pair|ncurses_insch|ncurses_insdelln|ncurses_insertln|ncurses_insstr|ncurses_instr|ncurses_isendwin|ncurses_keyok|ncurses_keypad|ncurses_killchar|ncurses_longname|ncurses_meta|ncurses_mouse_trafo|ncurses_mouseinterval|ncurses_mousemask|ncurses_move|ncurses_move_panel|ncurses_mvaddch|ncurses_mvaddchnstr|ncurses_mvaddchstr|ncurses_mvaddnstr|ncurses_mvaddstr|ncurses_mvcur|ncurses_mvdelch|ncurses_mvgetch|ncurses_mvhline|ncurses_mvinch|ncurses_mvvline|ncurses_mvwaddstr|ncurses_napms|ncurses_new_panel|ncurses_newpad|ncurses_newwin|ncurses_nl|ncurses_nocbreak|ncurses_noecho|ncurses_nonl|ncurses_noqiflush|ncurses_noraw|ncurses_pair_content|ncurses_panel_above|ncurses_panel_below|ncurses_panel_window|ncurses_pnoutrefresh|ncurses_prefresh|ncurses_putp|ncurses_qiflush|ncurses_raw|ncurses_refresh|ncurses_replace_panel|ncurses_reset_prog_mode|ncurses_reset_shell_mode|ncurses_resetty|ncurses_savetty|ncurses_scr_dump|ncurses_scr_init|ncurses_scr_restore|ncurses_scr_set|ncurses_scrl|ncurses_show_panel|ncurses_slk_attr|ncurses_slk_attroff|ncurses_slk_attron|ncurses_slk_attrset|ncurses_slk_clear|ncurses_slk_color|ncurses_slk_init|ncurses_slk_noutrefresh|ncurses_slk_refresh|ncurses_slk_restore|ncurses_slk_set|ncurses_slk_touch|ncurses_standend|ncurses_standout|ncurses_start_color|ncurses_termattrs|ncurses_termname|ncurses_timeout|ncurses_top_panel|ncurses_typeahead|ncurses_ungetch|ncurses_ungetmouse|ncurses_update_panels|ncurses_use_default_colors|ncurses_use_env|ncurses_use_extended_names|ncurses_vidattr|ncurses_vline|ncurses_waddch|ncurses_waddstr|ncurses_wattroff|ncurses_wattron|ncurses_wattrset|ncurses_wborder|ncurses_wclear|ncurses_wcolor_set|ncurses_werase|ncurses_wgetch|ncurses_whline|ncurses_wmouse_trafo|ncurses_wmove|ncurses_wnoutrefresh|ncurses_wrefresh|ncurses_wstandend|ncurses_wstandout|ncurses_wvline|newinstance|newinstanceargs|newt_bell|newt_button|newt_button_bar|newt_centered_window|newt_checkbox|newt_checkbox_get_value|newt_checkbox_set_flags|newt_checkbox_set_value|newt_checkbox_tree|newt_checkbox_tree_add_item|newt_checkbox_tree_find_item|newt_checkbox_tree_get_current|newt_checkbox_tree_get_entry_value|newt_checkbox_tree_get_multi_selection|newt_checkbox_tree_get_selection|newt_checkbox_tree_multi|newt_checkbox_tree_set_current|newt_checkbox_tree_set_entry|newt_checkbox_tree_set_entry_value|newt_checkbox_tree_set_width|newt_clear_key_buffer|newt_cls|newt_compact_button|newt_component_add_callback|newt_component_takes_focus|newt_create_grid|newt_cursor_off|newt_cursor_on|newt_delay|newt_draw_form|newt_draw_root_text|newt_entry|newt_entry_get_value|newt_entry_set|newt_entry_set_filter|newt_entry_set_flags|newt_finished|newt_form|newt_form_add_component|newt_form_add_components|newt_form_add_hot_key|newt_form_destroy|newt_form_get_current|newt_form_run|newt_form_set_background|newt_form_set_height|newt_form_set_size|newt_form_set_timer|newt_form_set_width|newt_form_watch_fd|newt_get_screen_size|newt_grid_add_components_to_form|newt_grid_basic_window|newt_grid_free|newt_grid_get_size|newt_grid_h_close_stacked|newt_grid_h_stacked|newt_grid_place|newt_grid_set_field|newt_grid_simple_window|newt_grid_v_close_stacked|newt_grid_v_stacked|newt_grid_wrapped_window|newt_grid_wrapped_window_at|newt_init|newt_label|newt_label_set_text|newt_listbox|newt_listbox_append_entry|newt_listbox_clear|newt_listbox_clear_selection|newt_listbox_delete_entry|newt_listbox_get_current|newt_listbox_get_selection|newt_listbox_insert_entry|newt_listbox_item_count|newt_listbox_select_item|newt_listbox_set_current|newt_listbox_set_current_by_key|newt_listbox_set_data|newt_listbox_set_entry|newt_listbox_set_width|newt_listitem|newt_listitem_get_data|newt_listitem_set|newt_open_window|newt_pop_help_line|newt_pop_window|newt_push_help_line|newt_radio_get_current|newt_radiobutton|newt_redraw_help_line|newt_reflow_text|newt_refresh|newt_resize_screen|newt_resume|newt_run_form|newt_scale|newt_scale_set|newt_scrollbar_set|newt_set_help_callback|newt_set_suspend_callback|newt_suspend|newt_textbox|newt_textbox_get_num_lines|newt_textbox_reflowed|newt_textbox_set_height|newt_textbox_set_text|newt_vertical_scrollbar|newt_wait_for_key|newt_win_choice|newt_win_entries|newt_win_menu|newt_win_message|newt_win_messagev|newt_win_ternary|next|ngettext|nl2br|nl_langinfo|norewinditerator|normalizer|notes_body|notes_copy_db|notes_create_db|notes_create_note|notes_drop_db|notes_find_note|notes_header_info|notes_list_msgs|notes_mark_read|notes_mark_unread|notes_nav_create|notes_search|notes_unread|notes_version|nsapi_request_headers|nsapi_response_headers|nsapi_virtual|nthmac|number_format|numberformatter|oauth|oauth_get_sbs|oauth_urlencode|oauthexception|oauthprovider|ob_clean|ob_deflatehandler|ob_end_clean|ob_end_flush|ob_etaghandler|ob_flush|ob_get_clean|ob_get_contents|ob_get_flush|ob_get_length|ob_get_level|ob_get_status|ob_gzhandler|ob_iconv_handler|ob_implicit_flush|ob_inflatehandler|ob_list_handlers|ob_start|ob_tidyhandler|oci_bind_array_by_name|oci_bind_by_name|oci_cancel|oci_client_version|oci_close|oci_collection_append|oci_collection_assign|oci_collection_element_assign|oci_collection_element_get|oci_collection_free|oci_collection_max|oci_collection_size|oci_collection_trim|oci_commit|oci_connect|oci_define_by_name|oci_error|oci_execute|oci_fetch|oci_fetch_all|oci_fetch_array|oci_fetch_assoc|oci_fetch_object|oci_fetch_row|oci_field_is_null|oci_field_name|oci_field_precision|oci_field_scale|oci_field_size|oci_field_type|oci_field_type_raw|oci_free_statement|oci_internal_debug|oci_lob_append|oci_lob_close|oci_lob_copy|oci_lob_eof|oci_lob_erase|oci_lob_export|oci_lob_flush|oci_lob_free|oci_lob_getbuffering|oci_lob_import|oci_lob_is_equal|oci_lob_load|oci_lob_read|oci_lob_rewind|oci_lob_save|oci_lob_savefile|oci_lob_seek|oci_lob_setbuffering|oci_lob_size|oci_lob_tell|oci_lob_truncate|oci_lob_write|oci_lob_writetemporary|oci_lob_writetofile|oci_new_collection|oci_new_connect|oci_new_cursor|oci_new_descriptor|oci_num_fields|oci_num_rows|oci_parse|oci_password_change|oci_pconnect|oci_result|oci_rollback|oci_server_version|oci_set_action|oci_set_client_identifier|oci_set_client_info|oci_set_edition|oci_set_module_name|oci_set_prefetch|oci_statement_type|ocibindbyname|ocicancel|ocicloselob|ocicollappend|ocicollassign|ocicollassignelem|ocicollgetelem|ocicollmax|ocicollsize|ocicolltrim|ocicolumnisnull|ocicolumnname|ocicolumnprecision|ocicolumnscale|ocicolumnsize|ocicolumntype|ocicolumntyperaw|ocicommit|ocidefinebyname|ocierror|ociexecute|ocifetch|ocifetchinto|ocifetchstatement|ocifreecollection|ocifreecursor|ocifreedesc|ocifreestatement|ociinternaldebug|ociloadlob|ocilogoff|ocilogon|ocinewcollection|ocinewcursor|ocinewdescriptor|ocinlogon|ocinumcols|ociparse|ociplogon|ociresult|ocirollback|ocirowcount|ocisavelob|ocisavelobfile|ociserverversion|ocisetprefetch|ocistatementtype|ociwritelobtofile|ociwritetemporarylob|octdec|odbc_autocommit|odbc_binmode|odbc_close|odbc_close_all|odbc_columnprivileges|odbc_columns|odbc_commit|odbc_connect|odbc_cursor|odbc_data_source|odbc_do|odbc_error|odbc_errormsg|odbc_exec|odbc_execute|odbc_fetch_array|odbc_fetch_into|odbc_fetch_object|odbc_fetch_row|odbc_field_len|odbc_field_name|odbc_field_num|odbc_field_precision|odbc_field_scale|odbc_field_type|odbc_foreignkeys|odbc_free_result|odbc_gettypeinfo|odbc_longreadlen|odbc_next_result|odbc_num_fields|odbc_num_rows|odbc_pconnect|odbc_prepare|odbc_primarykeys|odbc_procedurecolumns|odbc_procedures|odbc_result|odbc_result_all|odbc_rollback|odbc_setoption|odbc_specialcolumns|odbc_statistics|odbc_tableprivileges|odbc_tables|openal_buffer_create|openal_buffer_data|openal_buffer_destroy|openal_buffer_get|openal_buffer_loadwav|openal_context_create|openal_context_current|openal_context_destroy|openal_context_process|openal_context_suspend|openal_device_close|openal_device_open|openal_listener_get|openal_listener_set|openal_source_create|openal_source_destroy|openal_source_get|openal_source_pause|openal_source_play|openal_source_rewind|openal_source_set|openal_source_stop|openal_stream|opendir|openlog|openssl_cipher_iv_length|openssl_csr_export|openssl_csr_export_to_file|openssl_csr_get_public_key|openssl_csr_get_subject|openssl_csr_new|openssl_csr_sign|openssl_decrypt|openssl_dh_compute_key|openssl_digest|openssl_encrypt|openssl_error_string|openssl_free_key|openssl_get_cipher_methods|openssl_get_md_methods|openssl_get_privatekey|openssl_get_publickey|openssl_open|openssl_pkcs12_export|openssl_pkcs12_export_to_file|openssl_pkcs12_read|openssl_pkcs7_decrypt|openssl_pkcs7_encrypt|openssl_pkcs7_sign|openssl_pkcs7_verify|openssl_pkey_export|openssl_pkey_export_to_file|openssl_pkey_free|openssl_pkey_get_details|openssl_pkey_get_private|openssl_pkey_get_public|openssl_pkey_new|openssl_private_decrypt|openssl_private_encrypt|openssl_public_decrypt|openssl_public_encrypt|openssl_random_pseudo_bytes|openssl_seal|openssl_sign|openssl_verify|openssl_x509_check_private_key|openssl_x509_checkpurpose|openssl_x509_export|openssl_x509_export_to_file|openssl_x509_free|openssl_x509_parse|openssl_x509_read|ord|outeriterator|outofboundsexception|outofrangeexception|output_add_rewrite_var|output_reset_rewrite_vars|overflowexception|overload|override_function|ovrimos_close|ovrimos_commit|ovrimos_connect|ovrimos_cursor|ovrimos_exec|ovrimos_execute|ovrimos_fetch_into|ovrimos_fetch_row|ovrimos_field_len|ovrimos_field_name|ovrimos_field_num|ovrimos_field_type|ovrimos_free_result|ovrimos_longreadlen|ovrimos_num_fields|ovrimos_num_rows|ovrimos_prepare|ovrimos_result|ovrimos_result_all|ovrimos_rollback|pack|parentiterator|parse_ini_file|parse_ini_string|parse_str|parse_url|parsekit_compile_file|parsekit_compile_string|parsekit_func_arginfo|passthru|pathinfo|pclose|pcntl_alarm|pcntl_exec|pcntl_fork|pcntl_getpriority|pcntl_setpriority|pcntl_signal|pcntl_signal_dispatch|pcntl_sigprocmask|pcntl_sigtimedwait|pcntl_sigwaitinfo|pcntl_wait|pcntl_waitpid|pcntl_wexitstatus|pcntl_wifexited|pcntl_wifsignaled|pcntl_wifstopped|pcntl_wstopsig|pcntl_wtermsig|pdf_activate_item|pdf_add_annotation|pdf_add_bookmark|pdf_add_launchlink|pdf_add_locallink|pdf_add_nameddest|pdf_add_note|pdf_add_outline|pdf_add_pdflink|pdf_add_table_cell|pdf_add_textflow|pdf_add_thumbnail|pdf_add_weblink|pdf_arc|pdf_arcn|pdf_attach_file|pdf_begin_document|pdf_begin_font|pdf_begin_glyph|pdf_begin_item|pdf_begin_layer|pdf_begin_page|pdf_begin_page_ext|pdf_begin_pattern|pdf_begin_template|pdf_begin_template_ext|pdf_circle|pdf_clip|pdf_close|pdf_close_image|pdf_close_pdi|pdf_close_pdi_page|pdf_closepath|pdf_closepath_fill_stroke|pdf_closepath_stroke|pdf_concat|pdf_continue_text|pdf_create_3dview|pdf_create_action|pdf_create_annotation|pdf_create_bookmark|pdf_create_field|pdf_create_fieldgroup|pdf_create_gstate|pdf_create_pvf|pdf_create_textflow|pdf_curveto|pdf_define_layer|pdf_delete|pdf_delete_pvf|pdf_delete_table|pdf_delete_textflow|pdf_encoding_set_char|pdf_end_document|pdf_end_font|pdf_end_glyph|pdf_end_item|pdf_end_layer|pdf_end_page|pdf_end_page_ext|pdf_end_pattern|pdf_end_template|pdf_endpath|pdf_fill|pdf_fill_imageblock|pdf_fill_pdfblock|pdf_fill_stroke|pdf_fill_textblock|pdf_findfont|pdf_fit_image|pdf_fit_pdi_page|pdf_fit_table|pdf_fit_textflow|pdf_fit_textline|pdf_get_apiname|pdf_get_buffer|pdf_get_errmsg|pdf_get_errnum|pdf_get_font|pdf_get_fontname|pdf_get_fontsize|pdf_get_image_height|pdf_get_image_width|pdf_get_majorversion|pdf_get_minorversion|pdf_get_parameter|pdf_get_pdi_parameter|pdf_get_pdi_value|pdf_get_value|pdf_info_font|pdf_info_matchbox|pdf_info_table|pdf_info_textflow|pdf_info_textline|pdf_initgraphics|pdf_lineto|pdf_load_3ddata|pdf_load_font|pdf_load_iccprofile|pdf_load_image|pdf_makespotcolor|pdf_moveto|pdf_new|pdf_open_ccitt|pdf_open_file|pdf_open_gif|pdf_open_image|pdf_open_image_file|pdf_open_jpeg|pdf_open_memory_image|pdf_open_pdi|pdf_open_pdi_document|pdf_open_pdi_page|pdf_open_tiff|pdf_pcos_get_number|pdf_pcos_get_stream|pdf_pcos_get_string|pdf_place_image|pdf_place_pdi_page|pdf_process_pdi|pdf_rect|pdf_restore|pdf_resume_page|pdf_rotate|pdf_save|pdf_scale|pdf_set_border_color|pdf_set_border_dash|pdf_set_border_style|pdf_set_char_spacing|pdf_set_duration|pdf_set_gstate|pdf_set_horiz_scaling|pdf_set_info|pdf_set_info_author|pdf_set_info_creator|pdf_set_info_keywords|pdf_set_info_subject|pdf_set_info_title|pdf_set_layer_dependency|pdf_set_leading|pdf_set_parameter|pdf_set_text_matrix|pdf_set_text_pos|pdf_set_text_rendering|pdf_set_text_rise|pdf_set_value|pdf_set_word_spacing|pdf_setcolor|pdf_setdash|pdf_setdashpattern|pdf_setflat|pdf_setfont|pdf_setgray|pdf_setgray_fill|pdf_setgray_stroke|pdf_setlinecap|pdf_setlinejoin|pdf_setlinewidth|pdf_setmatrix|pdf_setmiterlimit|pdf_setpolydash|pdf_setrgbcolor|pdf_setrgbcolor_fill|pdf_setrgbcolor_stroke|pdf_shading|pdf_shading_pattern|pdf_shfill|pdf_show|pdf_show_boxed|pdf_show_xy|pdf_skew|pdf_stringwidth|pdf_stroke|pdf_suspend_page|pdf_translate|pdf_utf16_to_utf8|pdf_utf32_to_utf16|pdf_utf8_to_utf16|pdo|pdo_cubrid_schema|pdo_pgsqllobcreate|pdo_pgsqllobopen|pdo_pgsqllobunlink|pdo_sqlitecreateaggregate|pdo_sqlitecreatefunction|pdoexception|pdostatement|pfsockopen|pg_affected_rows|pg_cancel_query|pg_client_encoding|pg_close|pg_connect|pg_connection_busy|pg_connection_reset|pg_connection_status|pg_convert|pg_copy_from|pg_copy_to|pg_dbname|pg_delete|pg_end_copy|pg_escape_bytea|pg_escape_string|pg_execute|pg_fetch_all|pg_fetch_all_columns|pg_fetch_array|pg_fetch_assoc|pg_fetch_object|pg_fetch_result|pg_fetch_row|pg_field_is_null|pg_field_name|pg_field_num|pg_field_prtlen|pg_field_size|pg_field_table|pg_field_type|pg_field_type_oid|pg_free_result|pg_get_notify|pg_get_pid|pg_get_result|pg_host|pg_insert|pg_last_error|pg_last_notice|pg_last_oid|pg_lo_close|pg_lo_create|pg_lo_export|pg_lo_import|pg_lo_open|pg_lo_read|pg_lo_read_all|pg_lo_seek|pg_lo_tell|pg_lo_unlink|pg_lo_write|pg_meta_data|pg_num_fields|pg_num_rows|pg_options|pg_parameter_status|pg_pconnect|pg_ping|pg_port|pg_prepare|pg_put_line|pg_query|pg_query_params|pg_result_error|pg_result_error_field|pg_result_seek|pg_result_status|pg_select|pg_send_execute|pg_send_prepare|pg_send_query|pg_send_query_params|pg_set_client_encoding|pg_set_error_verbosity|pg_trace|pg_transaction_status|pg_tty|pg_unescape_bytea|pg_untrace|pg_update|pg_version|php_check_syntax|php_ini_loaded_file|php_ini_scanned_files|php_logo_guid|php_sapi_name|php_strip_whitespace|php_uname|phpcredits|phpinfo|phpversion|pi|png2wbmp|popen|pos|posix_access|posix_ctermid|posix_errno|posix_get_last_error|posix_getcwd|posix_getegid|posix_geteuid|posix_getgid|posix_getgrgid|posix_getgrnam|posix_getgroups|posix_getlogin|posix_getpgid|posix_getpgrp|posix_getpid|posix_getppid|posix_getpwnam|posix_getpwuid|posix_getrlimit|posix_getsid|posix_getuid|posix_initgroups|posix_isatty|posix_kill|posix_mkfifo|posix_mknod|posix_setegid|posix_seteuid|posix_setgid|posix_setpgid|posix_setsid|posix_setuid|posix_strerror|posix_times|posix_ttyname|posix_uname|pow|preg_filter|preg_grep|preg_last_error|preg_match|preg_match_all|preg_quote|preg_replace|preg_replace_callback|preg_split|prev|print|print_r|printer_abort|printer_close|printer_create_brush|printer_create_dc|printer_create_font|printer_create_pen|printer_delete_brush|printer_delete_dc|printer_delete_font|printer_delete_pen|printer_draw_bmp|printer_draw_chord|printer_draw_elipse|printer_draw_line|printer_draw_pie|printer_draw_rectangle|printer_draw_roundrect|printer_draw_text|printer_end_doc|printer_end_page|printer_get_option|printer_list|printer_logical_fontheight|printer_open|printer_select_brush|printer_select_font|printer_select_pen|printer_set_option|printer_start_doc|printer_start_page|printer_write|printf|proc_close|proc_get_status|proc_nice|proc_open|proc_terminate|property_exists|ps_add_bookmark|ps_add_launchlink|ps_add_locallink|ps_add_note|ps_add_pdflink|ps_add_weblink|ps_arc|ps_arcn|ps_begin_page|ps_begin_pattern|ps_begin_template|ps_circle|ps_clip|ps_close|ps_close_image|ps_closepath|ps_closepath_stroke|ps_continue_text|ps_curveto|ps_delete|ps_end_page|ps_end_pattern|ps_end_template|ps_fill|ps_fill_stroke|ps_findfont|ps_get_buffer|ps_get_parameter|ps_get_value|ps_hyphenate|ps_include_file|ps_lineto|ps_makespotcolor|ps_moveto|ps_new|ps_open_file|ps_open_image|ps_open_image_file|ps_open_memory_image|ps_place_image|ps_rect|ps_restore|ps_rotate|ps_save|ps_scale|ps_set_border_color|ps_set_border_dash|ps_set_border_style|ps_set_info|ps_set_parameter|ps_set_text_pos|ps_set_value|ps_setcolor|ps_setdash|ps_setflat|ps_setfont|ps_setgray|ps_setlinecap|ps_setlinejoin|ps_setlinewidth|ps_setmiterlimit|ps_setoverprintmode|ps_setpolydash|ps_shading|ps_shading_pattern|ps_shfill|ps_show|ps_show2|ps_show_boxed|ps_show_xy|ps_show_xy2|ps_string_geometry|ps_stringwidth|ps_stroke|ps_symbol|ps_symbol_name|ps_symbol_width|ps_translate|pspell_add_to_personal|pspell_add_to_session|pspell_check|pspell_clear_session|pspell_config_create|pspell_config_data_dir|pspell_config_dict_dir|pspell_config_ignore|pspell_config_mode|pspell_config_personal|pspell_config_repl|pspell_config_runtogether|pspell_config_save_repl|pspell_new|pspell_new_config|pspell_new_personal|pspell_save_wordlist|pspell_store_replacement|pspell_suggest|putenv|px_close|px_create_fp|px_date2string|px_delete|px_delete_record|px_get_field|px_get_info|px_get_parameter|px_get_record|px_get_schema|px_get_value|px_insert_record|px_new|px_numfields|px_numrecords|px_open_fp|px_put_record|px_retrieve_record|px_set_blob_file|px_set_parameter|px_set_tablename|px_set_targetencoding|px_set_value|px_timestamp2string|px_update_record|qdom_error|qdom_tree|quoted_printable_decode|quoted_printable_encode|quotemeta|rad2deg|radius_acct_open|radius_add_server|radius_auth_open|radius_close|radius_config|radius_create_request|radius_cvt_addr|radius_cvt_int|radius_cvt_string|radius_demangle|radius_demangle_mppe_key|radius_get_attr|radius_get_vendor_attr|radius_put_addr|radius_put_attr|radius_put_int|radius_put_string|radius_put_vendor_addr|radius_put_vendor_attr|radius_put_vendor_int|radius_put_vendor_string|radius_request_authenticator|radius_send_request|radius_server_secret|radius_strerror|rand|range|rangeexception|rar_wrapper_cache_stats|rararchive|rarentry|rarexception|rawurldecode|rawurlencode|read_exif_data|readdir|readfile|readgzfile|readline|readline_add_history|readline_callback_handler_install|readline_callback_handler_remove|readline_callback_read_char|readline_clear_history|readline_completion_function|readline_info|readline_list_history|readline_on_new_line|readline_read_history|readline_redisplay|readline_write_history|readlink|realpath|realpath_cache_get|realpath_cache_size|recode|recode_file|recode_string|recursivearrayiterator|recursivecachingiterator|recursivecallbackfilteriterator|recursivedirectoryiterator|recursivefilteriterator|recursiveiterator|recursiveiteratoriterator|recursiveregexiterator|recursivetreeiterator|reflection|reflectionclass|reflectionexception|reflectionextension|reflectionfunction|reflectionfunctionabstract|reflectionmethod|reflectionobject|reflectionparameter|reflectionproperty|reflector|regexiterator|register_shutdown_function|register_tick_function|rename|rename_function|require|require_once|reset|resetValue|resourcebundle|restore_error_handler|restore_exception_handler|restore_include_path|return|rewind|rewinddir|rmdir|round|rpm_close|rpm_get_tag|rpm_is_valid|rpm_open|rpm_version|rrd_create|rrd_error|rrd_fetch|rrd_first|rrd_graph|rrd_info|rrd_last|rrd_lastupdate|rrd_restore|rrd_tune|rrd_update|rrd_xport|rrdcreator|rrdgraph|rrdupdater|rsort|rtrim|runkit_class_adopt|runkit_class_emancipate|runkit_constant_add|runkit_constant_redefine|runkit_constant_remove|runkit_function_add|runkit_function_copy|runkit_function_redefine|runkit_function_remove|runkit_function_rename|runkit_import|runkit_lint|runkit_lint_file|runkit_method_add|runkit_method_copy|runkit_method_redefine|runkit_method_remove|runkit_method_rename|runkit_return_value_used|runkit_sandbox_output_handler|runkit_superglobals|runtimeexception|samconnection_commit|samconnection_connect|samconnection_constructor|samconnection_disconnect|samconnection_errno|samconnection_error|samconnection_isconnected|samconnection_peek|samconnection_peekall|samconnection_receive|samconnection_remove|samconnection_rollback|samconnection_send|samconnection_setDebug|samconnection_subscribe|samconnection_unsubscribe|sammessage_body|sammessage_constructor|sammessage_header|sca_createdataobject|sca_getservice|sca_localproxy_createdataobject|sca_soapproxy_createdataobject|scandir|sdo_das_changesummary_beginlogging|sdo_das_changesummary_endlogging|sdo_das_changesummary_getchangeddataobjects|sdo_das_changesummary_getchangetype|sdo_das_changesummary_getoldcontainer|sdo_das_changesummary_getoldvalues|sdo_das_changesummary_islogging|sdo_das_datafactory_addpropertytotype|sdo_das_datafactory_addtype|sdo_das_datafactory_getdatafactory|sdo_das_dataobject_getchangesummary|sdo_das_relational_applychanges|sdo_das_relational_construct|sdo_das_relational_createrootdataobject|sdo_das_relational_executepreparedquery|sdo_das_relational_executequery|sdo_das_setting_getlistindex|sdo_das_setting_getpropertyindex|sdo_das_setting_getpropertyname|sdo_das_setting_getvalue|sdo_das_setting_isset|sdo_das_xml_addtypes|sdo_das_xml_create|sdo_das_xml_createdataobject|sdo_das_xml_createdocument|sdo_das_xml_document_getrootdataobject|sdo_das_xml_document_getrootelementname|sdo_das_xml_document_getrootelementuri|sdo_das_xml_document_setencoding|sdo_das_xml_document_setxmldeclaration|sdo_das_xml_document_setxmlversion|sdo_das_xml_loadfile|sdo_das_xml_loadstring|sdo_das_xml_savefile|sdo_das_xml_savestring|sdo_datafactory_create|sdo_dataobject_clear|sdo_dataobject_createdataobject|sdo_dataobject_getcontainer|sdo_dataobject_getsequence|sdo_dataobject_gettypename|sdo_dataobject_gettypenamespaceuri|sdo_exception_getcause|sdo_list_insert|sdo_model_property_getcontainingtype|sdo_model_property_getdefault|sdo_model_property_getname|sdo_model_property_gettype|sdo_model_property_iscontainment|sdo_model_property_ismany|sdo_model_reflectiondataobject_construct|sdo_model_reflectiondataobject_export|sdo_model_reflectiondataobject_getcontainmentproperty|sdo_model_reflectiondataobject_getinstanceproperties|sdo_model_reflectiondataobject_gettype|sdo_model_type_getbasetype|sdo_model_type_getname|sdo_model_type_getnamespaceuri|sdo_model_type_getproperties|sdo_model_type_getproperty|sdo_model_type_isabstracttype|sdo_model_type_isdatatype|sdo_model_type_isinstance|sdo_model_type_isopentype|sdo_model_type_issequencedtype|sdo_sequence_getproperty|sdo_sequence_insert|sdo_sequence_move|seekableiterator|sem_acquire|sem_get|sem_release|sem_remove|serializable|serialize|session_cache_expire|session_cache_limiter|session_commit|session_decode|session_destroy|session_encode|session_get_cookie_params|session_id|session_is_registered|session_module_name|session_name|session_pgsql_add_error|session_pgsql_get_error|session_pgsql_get_field|session_pgsql_reset|session_pgsql_set_field|session_pgsql_status|session_regenerate_id|session_register|session_save_path|session_set_cookie_params|session_set_save_handler|session_start|session_unregister|session_unset|session_write_close|setCounterClass|set_error_handler|set_exception_handler|set_file_buffer|set_include_path|set_magic_quotes_runtime|set_socket_blocking|set_time_limit|setcookie|setlocale|setproctitle|setrawcookie|setstaticpropertyvalue|setthreadtitle|settype|sha1|sha1_file|shell_exec|shm_attach|shm_detach|shm_get_var|shm_has_var|shm_put_var|shm_remove|shm_remove_var|shmop_close|shmop_delete|shmop_open|shmop_read|shmop_size|shmop_write|show_source|shuffle|signeurlpaiement|similar_text|simplexml_import_dom|simplexml_load_file|simplexml_load_string|simplexmlelement|simplexmliterator|sin|sinh|sizeof|sleep|snmp|snmp2_get|snmp2_getnext|snmp2_real_walk|snmp2_set|snmp2_walk|snmp3_get|snmp3_getnext|snmp3_real_walk|snmp3_set|snmp3_walk|snmp_get_quick_print|snmp_get_valueretrieval|snmp_read_mib|snmp_set_enum_print|snmp_set_oid_numeric_print|snmp_set_oid_output_format|snmp_set_quick_print|snmp_set_valueretrieval|snmpget|snmpgetnext|snmprealwalk|snmpset|snmpwalk|snmpwalkoid|soapclient|soapfault|soapheader|soapparam|soapserver|soapvar|socket_accept|socket_bind|socket_clear_error|socket_close|socket_connect|socket_create|socket_create_listen|socket_create_pair|socket_get_option|socket_get_status|socket_getpeername|socket_getsockname|socket_last_error|socket_listen|socket_read|socket_recv|socket_recvfrom|socket_select|socket_send|socket_sendto|socket_set_block|socket_set_blocking|socket_set_nonblock|socket_set_option|socket_set_timeout|socket_shutdown|socket_strerror|socket_write|solr_get_version|solrclient|solrclientexception|solrdocument|solrdocumentfield|solrexception|solrgenericresponse|solrillegalargumentexception|solrillegaloperationexception|solrinputdocument|solrmodifiableparams|solrobject|solrparams|solrpingresponse|solrquery|solrqueryresponse|solrresponse|solrupdateresponse|solrutils|sort|soundex|sphinxclient|spl_autoload|spl_autoload_call|spl_autoload_extensions|spl_autoload_functions|spl_autoload_register|spl_autoload_unregister|spl_classes|spl_object_hash|splbool|spldoublylinkedlist|splenum|splfileinfo|splfileobject|splfixedarray|splfloat|splheap|splint|split|spliti|splmaxheap|splminheap|splobjectstorage|splobserver|splpriorityqueue|splqueue|splstack|splstring|splsubject|spltempfileobject|spoofchecker|sprintf|sql_regcase|sqlite3|sqlite3result|sqlite3stmt|sqlite_array_query|sqlite_busy_timeout|sqlite_changes|sqlite_close|sqlite_column|sqlite_create_aggregate|sqlite_create_function|sqlite_current|sqlite_error_string|sqlite_escape_string|sqlite_exec|sqlite_factory|sqlite_fetch_all|sqlite_fetch_array|sqlite_fetch_column_types|sqlite_fetch_object|sqlite_fetch_single|sqlite_fetch_string|sqlite_field_name|sqlite_has_more|sqlite_has_prev|sqlite_key|sqlite_last_error|sqlite_last_insert_rowid|sqlite_libencoding|sqlite_libversion|sqlite_next|sqlite_num_fields|sqlite_num_rows|sqlite_open|sqlite_popen|sqlite_prev|sqlite_query|sqlite_rewind|sqlite_seek|sqlite_single_query|sqlite_udf_decode_binary|sqlite_udf_encode_binary|sqlite_unbuffered_query|sqlite_valid|sqrt|srand|sscanf|ssdeep_fuzzy_compare|ssdeep_fuzzy_hash|ssdeep_fuzzy_hash_filename|ssh2_auth_hostbased_file|ssh2_auth_none|ssh2_auth_password|ssh2_auth_pubkey_file|ssh2_connect|ssh2_exec|ssh2_fetch_stream|ssh2_fingerprint|ssh2_methods_negotiated|ssh2_publickey_add|ssh2_publickey_init|ssh2_publickey_list|ssh2_publickey_remove|ssh2_scp_recv|ssh2_scp_send|ssh2_sftp|ssh2_sftp_lstat|ssh2_sftp_mkdir|ssh2_sftp_readlink|ssh2_sftp_realpath|ssh2_sftp_rename|ssh2_sftp_rmdir|ssh2_sftp_stat|ssh2_sftp_symlink|ssh2_sftp_unlink|ssh2_shell|ssh2_tunnel|stat|stats_absolute_deviation|stats_cdf_beta|stats_cdf_binomial|stats_cdf_cauchy|stats_cdf_chisquare|stats_cdf_exponential|stats_cdf_f|stats_cdf_gamma|stats_cdf_laplace|stats_cdf_logistic|stats_cdf_negative_binomial|stats_cdf_noncentral_chisquare|stats_cdf_noncentral_f|stats_cdf_poisson|stats_cdf_t|stats_cdf_uniform|stats_cdf_weibull|stats_covariance|stats_den_uniform|stats_dens_beta|stats_dens_cauchy|stats_dens_chisquare|stats_dens_exponential|stats_dens_f|stats_dens_gamma|stats_dens_laplace|stats_dens_logistic|stats_dens_negative_binomial|stats_dens_normal|stats_dens_pmf_binomial|stats_dens_pmf_hypergeometric|stats_dens_pmf_poisson|stats_dens_t|stats_dens_weibull|stats_harmonic_mean|stats_kurtosis|stats_rand_gen_beta|stats_rand_gen_chisquare|stats_rand_gen_exponential|stats_rand_gen_f|stats_rand_gen_funiform|stats_rand_gen_gamma|stats_rand_gen_ibinomial|stats_rand_gen_ibinomial_negative|stats_rand_gen_int|stats_rand_gen_ipoisson|stats_rand_gen_iuniform|stats_rand_gen_noncenral_chisquare|stats_rand_gen_noncentral_f|stats_rand_gen_noncentral_t|stats_rand_gen_normal|stats_rand_gen_t|stats_rand_get_seeds|stats_rand_phrase_to_seeds|stats_rand_ranf|stats_rand_setall|stats_skew|stats_standard_deviation|stats_stat_binomial_coef|stats_stat_correlation|stats_stat_gennch|stats_stat_independent_t|stats_stat_innerproduct|stats_stat_noncentral_t|stats_stat_paired_t|stats_stat_percentile|stats_stat_powersum|stats_variance|stomp|stomp_connect_error|stomp_version|stompexception|stompframe|str_getcsv|str_ireplace|str_pad|str_repeat|str_replace|str_rot13|str_shuffle|str_split|str_word_count|strcasecmp|strchr|strcmp|strcoll|strcspn|stream_bucket_append|stream_bucket_make_writeable|stream_bucket_new|stream_bucket_prepend|stream_context_create|stream_context_get_default|stream_context_get_options|stream_context_get_params|stream_context_set_default|stream_context_set_option|stream_context_set_params|stream_copy_to_stream|stream_encoding|stream_filter_append|stream_filter_prepend|stream_filter_register|stream_filter_remove|stream_get_contents|stream_get_filters|stream_get_line|stream_get_meta_data|stream_get_transports|stream_get_wrappers|stream_is_local|stream_notification_callback|stream_register_wrapper|stream_resolve_include_path|stream_select|stream_set_blocking|stream_set_read_buffer|stream_set_timeout|stream_set_write_buffer|stream_socket_accept|stream_socket_client|stream_socket_enable_crypto|stream_socket_get_name|stream_socket_pair|stream_socket_recvfrom|stream_socket_sendto|stream_socket_server|stream_socket_shutdown|stream_supports_lock|stream_wrapper_register|stream_wrapper_restore|stream_wrapper_unregister|streamwrapper|strftime|strip_tags|stripcslashes|stripos|stripslashes|stristr|strlen|strnatcasecmp|strnatcmp|strncasecmp|strncmp|strpbrk|strpos|strptime|strrchr|strrev|strripos|strrpos|strspn|strstr|strtok|strtolower|strtotime|strtoupper|strtr|strval|substr|substr_compare|substr_count|substr_replace|svm|svmmodel|svn_add|svn_auth_get_parameter|svn_auth_set_parameter|svn_blame|svn_cat|svn_checkout|svn_cleanup|svn_client_version|svn_commit|svn_delete|svn_diff|svn_export|svn_fs_abort_txn|svn_fs_apply_text|svn_fs_begin_txn2|svn_fs_change_node_prop|svn_fs_check_path|svn_fs_contents_changed|svn_fs_copy|svn_fs_delete|svn_fs_dir_entries|svn_fs_file_contents|svn_fs_file_length|svn_fs_is_dir|svn_fs_is_file|svn_fs_make_dir|svn_fs_make_file|svn_fs_node_created_rev|svn_fs_node_prop|svn_fs_props_changed|svn_fs_revision_prop|svn_fs_revision_root|svn_fs_txn_root|svn_fs_youngest_rev|svn_import|svn_log|svn_ls|svn_mkdir|svn_repos_create|svn_repos_fs|svn_repos_fs_begin_txn_for_commit|svn_repos_fs_commit_txn|svn_repos_hotcopy|svn_repos_open|svn_repos_recover|svn_revert|svn_status|svn_update|swf_actiongeturl|swf_actiongotoframe|swf_actiongotolabel|swf_actionnextframe|swf_actionplay|swf_actionprevframe|swf_actionsettarget|swf_actionstop|swf_actiontogglequality|swf_actionwaitforframe|swf_addbuttonrecord|swf_addcolor|swf_closefile|swf_definebitmap|swf_definefont|swf_defineline|swf_definepoly|swf_definerect|swf_definetext|swf_endbutton|swf_enddoaction|swf_endshape|swf_endsymbol|swf_fontsize|swf_fontslant|swf_fonttracking|swf_getbitmapinfo|swf_getfontinfo|swf_getframe|swf_labelframe|swf_lookat|swf_modifyobject|swf_mulcolor|swf_nextid|swf_oncondition|swf_openfile|swf_ortho|swf_ortho2|swf_perspective|swf_placeobject|swf_polarview|swf_popmatrix|swf_posround|swf_pushmatrix|swf_removeobject|swf_rotate|swf_scale|swf_setfont|swf_setframe|swf_shapearc|swf_shapecurveto|swf_shapecurveto3|swf_shapefillbitmapclip|swf_shapefillbitmaptile|swf_shapefilloff|swf_shapefillsolid|swf_shapelinesolid|swf_shapelineto|swf_shapemoveto|swf_showframe|swf_startbutton|swf_startdoaction|swf_startshape|swf_startsymbol|swf_textwidth|swf_translate|swf_viewport|swfaction|swfbitmap|swfbutton|swfdisplayitem|swffill|swffont|swffontchar|swfgradient|swfmorph|swfmovie|swfprebuiltclip|swfshape|swfsound|swfsoundinstance|swfsprite|swftext|swftextfield|swfvideostream|swish_construct|swish_getmetalist|swish_getpropertylist|swish_prepare|swish_query|swishresult_getmetalist|swishresult_stem|swishresults_getparsedwords|swishresults_getremovedstopwords|swishresults_nextresult|swishresults_seekresult|swishsearch_execute|swishsearch_resetlimit|swishsearch_setlimit|swishsearch_setphrasedelimiter|swishsearch_setsort|swishsearch_setstructure|sybase_affected_rows|sybase_close|sybase_connect|sybase_data_seek|sybase_deadlock_retry_count|sybase_fetch_array|sybase_fetch_assoc|sybase_fetch_field|sybase_fetch_object|sybase_fetch_row|sybase_field_seek|sybase_free_result|sybase_get_last_message|sybase_min_client_severity|sybase_min_error_severity|sybase_min_message_severity|sybase_min_server_severity|sybase_num_fields|sybase_num_rows|sybase_pconnect|sybase_query|sybase_result|sybase_select_db|sybase_set_message_handler|sybase_unbuffered_query|symlink|sys_get_temp_dir|sys_getloadavg|syslog|system|tag|tan|tanh|tcpwrap_check|tempnam|textdomain|tidy|tidy_access_count|tidy_config_count|tidy_diagnose|tidy_error_count|tidy_get_error_buffer|tidy_get_output|tidy_load_config|tidy_reset_config|tidy_save_config|tidy_set_encoding|tidy_setopt|tidy_warning_count|tidynode|time|time_nanosleep|time_sleep_until|timezone_abbreviations_list|timezone_identifiers_list|timezone_location_get|timezone_name_from_abbr|timezone_name_get|timezone_offset_get|timezone_open|timezone_transitions_get|timezone_version_get|tmpfile|token_get_all|token_name|tokyotyrant|tokyotyrantquery|tokyotyranttable|tostring|tostring|touch|transliterator|traversable|trigger_error|trim|uasort|ucfirst|ucwords|udm_add_search_limit|udm_alloc_agent|udm_alloc_agent_array|udm_api_version|udm_cat_list|udm_cat_path|udm_check_charset|udm_check_stored|udm_clear_search_limits|udm_close_stored|udm_crc32|udm_errno|udm_error|udm_find|udm_free_agent|udm_free_ispell_data|udm_free_res|udm_get_doc_count|udm_get_res_field|udm_get_res_param|udm_hash32|udm_load_ispell_data|udm_open_stored|udm_set_agent_param|uksort|umask|underflowexception|unexpectedvalueexception|uniqid|unixtojd|unlink|unpack|unregister_tick_function|unserialize|unset|urldecode|urlencode|use_soap_error_handler|user_error|usleep|usort|utf8_decode|utf8_encode|v8js|v8jsexception|var_dump|var_export|variant|variant_abs|variant_add|variant_and|variant_cast|variant_cat|variant_cmp|variant_date_from_timestamp|variant_date_to_timestamp|variant_div|variant_eqv|variant_fix|variant_get_type|variant_idiv|variant_imp|variant_int|variant_mod|variant_mul|variant_neg|variant_not|variant_or|variant_pow|variant_round|variant_set|variant_set_type|variant_sub|variant_xor|version_compare|vfprintf|virtual|vpopmail_add_alias_domain|vpopmail_add_alias_domain_ex|vpopmail_add_domain|vpopmail_add_domain_ex|vpopmail_add_user|vpopmail_alias_add|vpopmail_alias_del|vpopmail_alias_del_domain|vpopmail_alias_get|vpopmail_alias_get_all|vpopmail_auth_user|vpopmail_del_domain|vpopmail_del_domain_ex|vpopmail_del_user|vpopmail_error|vpopmail_passwd|vpopmail_set_user_quota|vprintf|vsprintf|w32api_deftype|w32api_init_dtype|w32api_invoke_function|w32api_register_function|w32api_set_call_method|wddx_add_vars|wddx_deserialize|wddx_packet_end|wddx_packet_start|wddx_serialize_value|wddx_serialize_vars|win32_continue_service|win32_create_service|win32_delete_service|win32_get_last_control_message|win32_pause_service|win32_ps_list_procs|win32_ps_stat_mem|win32_ps_stat_proc|win32_query_service_status|win32_set_service_status|win32_start_service|win32_start_service_ctrl_dispatcher|win32_stop_service|wincache_fcache_fileinfo|wincache_fcache_meminfo|wincache_lock|wincache_ocache_fileinfo|wincache_ocache_meminfo|wincache_refresh_if_changed|wincache_rplist_fileinfo|wincache_rplist_meminfo|wincache_scache_info|wincache_scache_meminfo|wincache_ucache_add|wincache_ucache_cas|wincache_ucache_clear|wincache_ucache_dec|wincache_ucache_delete|wincache_ucache_exists|wincache_ucache_get|wincache_ucache_inc|wincache_ucache_info|wincache_ucache_meminfo|wincache_ucache_set|wincache_unlock|wordwrap|xattr_get|xattr_list|xattr_remove|xattr_set|xattr_supported|xdiff_file_bdiff|xdiff_file_bdiff_size|xdiff_file_bpatch|xdiff_file_diff|xdiff_file_diff_binary|xdiff_file_merge3|xdiff_file_patch|xdiff_file_patch_binary|xdiff_file_rabdiff|xdiff_string_bdiff|xdiff_string_bdiff_size|xdiff_string_bpatch|xdiff_string_diff|xdiff_string_diff_binary|xdiff_string_merge3|xdiff_string_patch|xdiff_string_patch_binary|xdiff_string_rabdiff|xhprof_disable|xhprof_enable|xhprof_sample_disable|xhprof_sample_enable|xml_error_string|xml_get_current_byte_index|xml_get_current_column_number|xml_get_current_line_number|xml_get_error_code|xml_parse|xml_parse_into_struct|xml_parser_create|xml_parser_create_ns|xml_parser_free|xml_parser_get_option|xml_parser_set_option|xml_set_character_data_handler|xml_set_default_handler|xml_set_element_handler|xml_set_end_namespace_decl_handler|xml_set_external_entity_ref_handler|xml_set_notation_decl_handler|xml_set_object|xml_set_processing_instruction_handler|xml_set_start_namespace_decl_handler|xml_set_unparsed_entity_decl_handler|xmlreader|xmlrpc_decode|xmlrpc_decode_request|xmlrpc_encode|xmlrpc_encode_request|xmlrpc_get_type|xmlrpc_is_fault|xmlrpc_parse_method_descriptions|xmlrpc_server_add_introspection_data|xmlrpc_server_call_method|xmlrpc_server_create|xmlrpc_server_destroy|xmlrpc_server_register_introspection_callback|xmlrpc_server_register_method|xmlrpc_set_type|xmlwriter_end_attribute|xmlwriter_end_cdata|xmlwriter_end_comment|xmlwriter_end_document|xmlwriter_end_dtd|xmlwriter_end_dtd_attlist|xmlwriter_end_dtd_element|xmlwriter_end_dtd_entity|xmlwriter_end_element|xmlwriter_end_pi|xmlwriter_flush|xmlwriter_full_end_element|xmlwriter_open_memory|xmlwriter_open_uri|xmlwriter_output_memory|xmlwriter_set_indent|xmlwriter_set_indent_string|xmlwriter_start_attribute|xmlwriter_start_attribute_ns|xmlwriter_start_cdata|xmlwriter_start_comment|xmlwriter_start_document|xmlwriter_start_dtd|xmlwriter_start_dtd_attlist|xmlwriter_start_dtd_element|xmlwriter_start_dtd_entity|xmlwriter_start_element|xmlwriter_start_element_ns|xmlwriter_start_pi|xmlwriter_text|xmlwriter_write_attribute|xmlwriter_write_attribute_ns|xmlwriter_write_cdata|xmlwriter_write_comment|xmlwriter_write_dtd|xmlwriter_write_dtd_attlist|xmlwriter_write_dtd_element|xmlwriter_write_dtd_entity|xmlwriter_write_element|xmlwriter_write_element_ns|xmlwriter_write_pi|xmlwriter_write_raw|xpath_eval|xpath_eval_expression|xpath_new_context|xpath_register_ns|xpath_register_ns_auto|xptr_eval|xptr_new_context|xslt_backend_info|xslt_backend_name|xslt_backend_version|xslt_create|xslt_errno|xslt_error|xslt_free|xslt_getopt|xslt_process|xslt_set_base|xslt_set_encoding|xslt_set_error_handler|xslt_set_log|xslt_set_object|xslt_set_sax_handler|xslt_set_sax_handlers|xslt_set_scheme_handler|xslt_set_scheme_handlers|xslt_setopt|xsltprocessor|yaml_emit|yaml_emit_file|yaml_parse|yaml_parse_file|yaml_parse_url|yaz_addinfo|yaz_ccl_conf|yaz_ccl_parse|yaz_close|yaz_connect|yaz_database|yaz_element|yaz_errno|yaz_error|yaz_es|yaz_es_result|yaz_get_option|yaz_hits|yaz_itemorder|yaz_present|yaz_range|yaz_record|yaz_scan|yaz_scan_result|yaz_schema|yaz_search|yaz_set_option|yaz_sort|yaz_syntax|yaz_wait|yp_all|yp_cat|yp_err_string|yp_errno|yp_first|yp_get_default_domain|yp_master|yp_match|yp_next|yp_order|zend_logo_guid|zend_thread_id|zend_version|zip_close|zip_entry_close|zip_entry_compressedsize|zip_entry_compressionmethod|zip_entry_filesize|zip_entry_name|zip_entry_open|zip_entry_read|zip_open|zip_read|ziparchive|ziparchive_addemptydir|ziparchive_addfile|ziparchive_addfromstring|ziparchive_close|ziparchive_deleteindex|ziparchive_deletename|ziparchive_extractto|ziparchive_getarchivecomment|ziparchive_getcommentindex|ziparchive_getcommentname|ziparchive_getfromindex|ziparchive_getfromname|ziparchive_getnameindex|ziparchive_getstatusstring|ziparchive_getstream|ziparchive_locatename|ziparchive_open|ziparchive_renameindex|ziparchive_renamename|ziparchive_setCommentName|ziparchive_setarchivecomment|ziparchive_setcommentindex|ziparchive_statindex|ziparchive_statname|ziparchive_unchangeall|ziparchive_unchangearchive|ziparchive_unchangeindex|ziparchive_unchangename|zlib_get_coding_type".split("|")),c=e.arrayToMap("abstract|and|array|as|break|case|catch|class|clone|const|continue|declare|default|do|else|elseif|enddeclare|endfor|endforeach|endif|endswitch|endwhile|extends|final|for|foreach|function|global|goto|if|implements|interface|instanceof|namespace|new|or|private|protected|public|static|switch|throw|try|use|var|while|xor".split("|")),d=e.arrayToMap("die|echo|empty|exit|eval|include|include_once|isset|list|require|require_once|return|print|unset".split("|")),g=e.arrayToMap("true|false|null|__CLASS__|__DIR__|__FILE__|__LINE__|__METHOD__|__FUNCTION__|__NAMESPACE__".split("|")),h=e.arrayToMap("$GLOBALS|$_SERVER|$_GET|$_POST|$_FILES|$_REQUEST|$_SESSION|$_ENV|$_COOKIE|$php_errormsg|$HTTP_RAW_POST_DATA|$http_response_header|$argc|$argv".split("|")),i=e.arrayToMap("key_exists|cairo_matrix_create_scale|cairo_matrix_create_translate|call_user_method|call_user_method_array|com_addref|com_get|com_invoke|com_isenum|com_load|com_release|com_set|connection_timeout|cubrid_load_from_glo|cubrid_new_glo|cubrid_save_to_glo|cubrid_send_glo|define_syslog_variables|dl|ereg|ereg_replace|eregi|eregi_replace|hw_documentattributes|hw_documentbodytag|hw_documentsize|hw_outputdocument|imagedashedline|maxdb_bind_param|maxdb_bind_result|maxdb_client_encoding|maxdb_close_long_data|maxdb_execute|maxdb_fetch|maxdb_get_metadata|maxdb_param_count|maxdb_send_long_data|mcrypt_ecb|mcrypt_generic_end|mime_content_type|mysql_createdb|mysql_dbname|mysql_db_query|mysql_drop_db|mysql_dropdb|mysql_escape_string|mysql_fieldflags|mysql_fieldflags|mysql_fieldname|mysql_fieldtable|mysql_fieldtype|mysql_freeresult|mysql_listdbs|mysql_list_fields|mysql_listfields|mysql_list_tables|mysql_listtables|mysql_numfields|mysql_numrows|mysql_selectdb|mysql_tablename|mysqli_bind_param|mysqli_bind_result|mysqli_disable_reads_from_master|mysqli_disable_rpl_parse|mysqli_enable_reads_from_master|mysqli_enable_rpl_parse|mysqli_execute|mysqli_fetch|mysqli_get_metadata|mysqli_master_query|mysqli_param_count|mysqli_rpl_parse_enabled|mysqli_rpl_probe|mysqli_rpl_query_type|mysqli_send_long_data|mysqli_send_query|mysqli_slave_query|ocibindbyname|ocicancel|ocicloselob|ocicollappend|ocicollassign|ocicollassignelem|ocicollgetelem|ocicollmax|ocicollsize|ocicolltrim|ocicolumnisnull|ocicolumnname|ocicolumnprecision|ocicolumnscale|ocicolumnsize|ocicolumntype|ocicolumntyperaw|ocicommit|ocidefinebyname|ocierror|ociexecute|ocifetch|ocifetchinto|ocifetchstatement|ocifreecollection|ocifreecursor|ocifreedesc|ocifreestatement|ociinternaldebug|ociloadlob|ocilogoff|ocilogon|ocinewcollection|ocinewcursor|ocinewdescriptor|ocinlogon|ocinumcols|ociparse|ociplogon|ociresult|ocirollback|ocirowcount|ocisavelob|ocisavelobfile|ociserverversion|ocisetprefetch|ocistatementtype|ociwritelobtofile|ociwritetemporarylob|PDF_add_annotation|PDF_add_bookmark|PDF_add_launchlink|PDF_add_locallink|PDF_add_note|PDF_add_outline|PDF_add_pdflink|PDF_add_weblink|PDF_attach_file|PDF_begin_page|PDF_begin_template|PDF_close_pdi|PDF_close|PDF_findfont|PDF_get_font|PDF_get_fontname|PDF_get_fontsize|PDF_get_image_height|PDF_get_image_width|PDF_get_majorversion|PDF_get_minorversion|PDF_get_pdi_parameter|PDF_get_pdi_value|PDF_open_ccitt|PDF_open_file|PDF_open_gif|PDF_open_image_file|PDF_open_image|PDF_open_jpeg|PDF_open_pdi|PDF_open_tiff|PDF_place_image|PDF_place_pdi_page|PDF_set_border_color|PDF_set_border_dash|PDF_set_border_style|PDF_set_char_spacing|PDF_set_duration|PDF_set_horiz_scaling|PDF_set_info_author|PDF_set_info_creator|PDF_set_info_keywords|PDF_set_info_subject|PDF_set_info_title|PDF_set_leading|PDF_set_text_matrix|PDF_set_text_rendering|PDF_set_text_rise|PDF_set_word_spacing|PDF_setgray_fill|PDF_setgray_stroke|PDF_setgray|PDF_setpolydash|PDF_setrgbcolor_fill|PDF_setrgbcolor_stroke|PDF_setrgbcolor|PDF_show_boxed|php_check_syntax|px_set_tablename|px_set_targetencoding|runkit_sandbox_output_handler|session_is_registered|session_register|session_unregisterset_magic_quotes_runtime|magic_quotes_runtime|set_socket_blocking|socket_set_blocking|set_socket_timeout|socket_set_timeout|split|spliti|sql_regcase".split("|")),j=e.arrayToMap("cfunction|old_function".split("|")),k=e.arrayToMap([]);this.$rules={start:[{token:"support.php_tag",regex:"<\\?(?:php|\\=)"},{token:"support.php_tag",regex:"\\?>"},{token:"comment",regex:"<\\!--",next:"htmlcomment"},{token:"meta.tag",regex:"<style",next:"css"},{token:"meta.tag",regex:"<\\/?[-_a-zA-Z0-9:]+",next:"htmltag"},{token:"meta.tag",regex:"<!DOCTYPE.*?>"},{token:"comment",regex:"\\/\\/.*$"},{token:"comment",regex:"#.*$"},a.getStartRule("doc-start"),{token:"comment",regex:"\\/\\*",next:"comment"},{token:"string.regexp",regex:"[/](?:(?:\\[(?:\\\\]|[^\\]])+\\])|(?:\\\\/|[^\\]/]))*[/][gimy]*\\s*(?=[).,;]|$)"},{token:"string",regex:'["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'},{token:"string",regex:'["][\\s\\S]*',next:"qqstring"},{token:"string",regex:"['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"},{token:"string",regex:"['][\\s\\S]+",next:"qstring"},{token:"constant.numeric",regex:"0[xX][0-9a-fA-F]+\\b"},{token:"constant.numeric",regex:"[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"},{token:"constant.language",regex:"\\b(?:DEFAULT_INCLUDE_PATH|E_(?:ALL|CO(?:MPILE_(?:ERROR|WARNING)|RE_(?:ERROR|WARNING))|ERROR|NOTICE|PARSE|STRICT|USER_(?:ERROR|NOTICE|WARNING)|WARNING)|P(?:EAR_(?:EXTENSION_DIR|INSTALL_DIR)|HP_(?:BINDIR|CONFIG_FILE_(?:PATH|SCAN_DIR)|DATADIR|E(?:OL|XTENSION_DIR)|INT_(?:MAX|SIZE)|L(?:IBDIR|OCALSTATEDIR)|O(?:S|UTPUT_HANDLER_(?:CONT|END|START))|PREFIX|S(?:API|HLIB_SUFFIX|YSCONFDIR)|VERSION))|__COMPILER_HALT_OFFSET__)\\b"},{token:"constant.language",regex:"\\b(?:A(?:B(?:DAY_(?:1|2|3|4|5|6|7)|MON_(?:1(?:0|1|2|)|2|3|4|5|6|7|8|9))|LT_DIGITS|M_STR|SSERT_(?:ACTIVE|BAIL|CALLBACK|QUIET_EVAL|WARNING))|C(?:ASE_(?:LOWER|UPPER)|HAR_MAX|O(?:DESET|NNECTION_(?:ABORTED|NORMAL|TIMEOUT)|UNT_(?:NORMAL|RECURSIVE))|R(?:EDITS_(?:ALL|DOCS|FULLPAGE|G(?:ENERAL|ROUP)|MODULES|QA|SAPI)|NCYSTR|YPT_(?:BLOWFISH|EXT_DES|MD5|S(?:ALT_LENGTH|TD_DES)))|URRENCY_SYMBOL)|D(?:AY_(?:1|2|3|4|5|6|7)|ECIMAL_POINT|IRECTORY_SEPARATOR|_(?:FMT|T_FMT))|E(?:NT_(?:COMPAT|NOQUOTES|QUOTES)|RA(?:_(?:D_(?:FMT|T_FMT)|T_FMT|YEAR)|)|XTR_(?:IF_EXISTS|OVERWRITE|PREFIX_(?:ALL|I(?:F_EXISTS|NVALID)|SAME)|SKIP))|FRAC_DIGITS|GROUPING|HTML_(?:ENTITIES|SPECIALCHARS)|IN(?:FO_(?:ALL|C(?:ONFIGURATION|REDITS)|ENVIRONMENT|GENERAL|LICENSE|MODULES|VARIABLES)|I_(?:ALL|PERDIR|SYSTEM|USER)|T_(?:CURR_SYMBOL|FRAC_DIGITS))|L(?:C_(?:ALL|C(?:OLLATE|TYPE)|M(?:ESSAGES|ONETARY)|NUMERIC|TIME)|O(?:CK_(?:EX|NB|SH|UN)|G_(?:A(?:LERT|UTH(?:PRIV|))|C(?:ONS|R(?:IT|ON))|D(?:AEMON|EBUG)|E(?:MERG|RR)|INFO|KERN|L(?:OCAL(?:0|1|2|3|4|5|6|7)|PR)|MAIL|N(?:DELAY|EWS|O(?:TICE|WAIT))|ODELAY|P(?:ERROR|ID)|SYSLOG|U(?:SER|UCP)|WARNING)))|M(?:ON_(?:1(?:0|1|2|)|2|3|4|5|6|7|8|9|DECIMAL_POINT|GROUPING|THOUSANDS_SEP)|_(?:1_PI|2_(?:PI|SQRTPI)|E|L(?:N(?:10|2)|OG(?:10E|2E))|PI(?:_(?:2|4)|)|SQRT(?:1_2|2)))|N(?:EGATIVE_SIGN|O(?:EXPR|STR)|_(?:CS_PRECEDES|S(?:EP_BY_SPACE|IGN_POSN)))|P(?:ATH(?:INFO_(?:BASENAME|DIRNAME|EXTENSION)|_SEPARATOR)|M_STR|OSITIVE_SIGN|_(?:CS_PRECEDES|S(?:EP_BY_SPACE|IGN_POSN)))|RADIXCHAR|S(?:EEK_(?:CUR|END|SET)|ORT_(?:ASC|DESC|NUMERIC|REGULAR|STRING)|TR_PAD_(?:BOTH|LEFT|RIGHT))|T(?:HOUS(?:ANDS_SEP|EP)|_FMT(?:_AMPM|))|YES(?:EXPR|STR)|STD(?:IN|OUT|ERR))\\b"},{token:function(a){return c.hasOwnProperty(a)?"keyword":g.hasOwnProperty(a)?"constant.language":h.hasOwnProperty(a)?"variable.language":k.hasOwnProperty(a)?"invalid.illegal":b.hasOwnProperty(a)?"support.function":a=="debugger"?"invalid.deprecated":a.match(/^(\$[a-zA-Z][a-zA-Z0-9_]*|self|parent)$/)?"variable":"identifier"},regex:"[a-zA-Z_$][a-zA-Z0-9_$]*\\b"},{token:"keyword.operator",regex:"!|\\$|%|&|\\*|\\-\\-|\\-|\\+\\+|\\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\\|\\||\\?\\:|\\*=|%=|\\+=|\\-=|&=|\\^=|\\b(?:in|instanceof|new|delete|typeof|void)"},{token:"lparen",regex:"[[({]"},{token:"rparen",regex:"[\\])}]"},{token:"text",regex:"\\s+"}],comment:[{token:"comment",regex:".*?\\*\\/",next:"start"},{token:"comment",regex:".+"}],qqstring:[{token:"string",regex:'"',next:"start"},{token:"string",regex:'[^"]+'}],qstring:[{token:"string",regex:"'",next:"start"},{token:"string",regex:"[^']+"}],htmlcomment:[{token:"comment",regex:".*?-->",next:"start"},{token:"comment",regex:".+"}],htmltag:[{token:"meta.tag",regex:">",next:"start"},{token:"text",regex:"[-_a-zA-Z0-9:]+"},{token:"text",regex:"\\s+"},{token:"string",regex:'".*?"'},{token:"string",regex:"'.*?'"}],css:[{token:"meta.tag",regex:"</style>",next:"htmltag"},{token:"meta.tag",regex:">"},{token:"text",regex:"(?:media|type|href)"},{token:"string",regex:'=".*?"'},{token:"paren.lparen",regex:"{",next:"cssdeclaration"},{token:"keyword",regex:"#[A-Za-z0-9-_.]+"},{token:"variable",regex:"\\.[A-Za-z0-9-_.]+"},{token:"constant",regex:"[A-Za-z0-9]+"}],cssdeclaration:[{token:"support.type",regex:"[-a-zA-Z]+",next:"cssvalue"},{token:"paren.rparen",regex:"}",next:"css"}],cssvalue:[{token:"text",regex:":"},{token:"constant",regex:"#[0-9a-zA-Z]+"},{token:"text",regex:"[-_0-9a-zA-Z\"' ,%]+"},{token:"text",regex:";",next:"cssdeclaration"}]},this.embedRules(f,"doc-",[(new f).getEndRule("start")])};d.inherits(h,g),b.PhpHighlightRules=h}),define("ace/mode/doc_comment_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text_highlight_rules").TextHighlightRules,f=function(){this.$rules={start:[{token:"comment.doc.tag",regex:"@[\\w\\d_]+"},{token:"comment.doc",merge:!0,regex:"\\s+"},{token:"comment.doc",merge:!0,regex:"TODO"},{token:"comment.doc",merge:!0,regex:"[^@\\*]+"},{token:"comment.doc",merge:!0,regex:"."}]}};d.inherits(f,e),function(){this.getStartRule=function(a){return{token:"comment.doc",merge:!0,regex:"\\/\\*(?=\\*)",next:a}},this.getEndRule=function(a){return{token:"comment.doc",merge:!0,regex:"\\*\\/",next:a}}}.call(f.prototype),b.DocCommentHighlightRules=f}),define("ace/mode/matching_brace_outdent",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../range").Range,e=function(){};(function(){this.checkOutdent=function(a,b){return/^\s+$/.test(a)?/^\s*\}/.test(b):!1},this.autoOutdent=function(a,b){var c=a.getLine(b),e=c.match(/^(\s*\})/);if(!e)return 0;var f=e[1].length,g=a.findMatchingBracket({row:b,column:f});if(!g||g.row==b)return 0;var h=this.$getIndent(a.getLine(g.row));a.replace(new d(b,0,b,f-1),h)},this.$getIndent=function(a){var b=a.match(/^(\s+)/);return b?b[1]:""}}).call(e.prototype),b.MatchingBraceOutdent=e}),define("ace/mode/behaviour/cstyle",["require","exports","module","ace/lib/oop","ace/mode/behaviour"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../behaviour").Behaviour,f=function(){this.add("braces","insertion",function(a,b,c,d,e){if(e=="{"){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"{"+g+"}",selection:!1}:{text:"{}",selection:[1,1]}}if(e=="}"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var k=d.$findOpeningBracket("}",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}else if(e=="\n"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var l=d.findMatchingBracket({row:h.row,column:h.column+1});if(!l)return null;var m=this.getNextLineIndent(a,i.substring(0,i.length-1),d.getTabString()),n=this.$getIndent(d.doc.getLine(l.row));return{text:"\n"+m+"\n"+n,selection:[1,m.length,1,m.length]}}}}),this.add("braces","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="{"){var g=d.doc.getLine(e.start.row),h=g.substring(e.end.column,e.end.column+1);if(h=="}")return e.end.column++,e}}),this.add("parens","insertion",function(a,b,c,d,e){if(e=="("){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"("+g+")",selection:!1}:{text:"()",selection:[1,1]}}if(e==")"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j==")"){var k=d.$findOpeningBracket(")",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}}),this.add("parens","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="("){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h==")")return e.end.column++,e}}),this.add("string_dquotes","insertion",function(a,b,c,d,e){if(e=='"'||e=="'"){var f=e,g=c.getSelectionRange(),h=d.doc.getTextRange(g);if(h!=="")return{text:f+h+f,selection:!1};var i=c.getCursorPosition(),j=d.doc.getLine(i.row),k=j.substring(i.column-1,i.column);if(k=="\\")return null;var l=d.getTokens(g.start.row,g.start.row)[0].tokens,m=0,n,o=-1;for(var p=0;p<l.length;p++){n=l[p],n.type=="string"?o=-1:o<0&&(o=n.value.indexOf(f));if(n.value.length+m>g.start.column)break;m+=l[p].value.length}if(!n||o<0&&n.type!=="comment"&&(n.type!=="string"||g.start.column!==n.value.length+m-1&&n.value.lastIndexOf(f)===n.value.length-1))return{text:f+f,selection:[1,1]};if(n&&n.type==="string"){var q=j.substring(i.column,i.column+1);if(q==f)return{text:"",selection:[1,1]}}}}),this.add("string_dquotes","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&(f=='"'||f=="'")){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h=='"')return e.end.column++,e}})};d.inherits(f,e),b.CstyleBehaviour=f}),define("ace/mode/folding/cstyle",["require","exports","module","ace/lib/oop","ace/range","ace/mode/folding/fold_mode"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../../range").Range,f=a("./fold_mode").FoldMode,g=b.FoldMode=function(){};d.inherits(g,f),function(){this.foldingStartMarker=/(\{|\[)[^\}\]]*$|^\s*(\/\*)/,this.foldingStopMarker=/^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/,this.getFoldWidgetRange=function(a,b,c){var d=a.getLine(c),f=d.match(this.foldingStartMarker);if(f){var g=f.index;if(f[1])return this.openingBracketBlock(a,f[1],c,g);var h=a.getCommentFoldRange(c,g+f[0].length);return h.end.column-=2,h}if(b!=="markbeginend")return;var f=d.match(this.foldingStopMarker);if(f){var g=f.index+f[0].length;if(f[2]){var h=a.getCommentFoldRange(c,g);return h.end.column-=2,h}var i={row:c,column:g},j=a.$findOpeningBracket(f[1],i);if(!j)return;return j.column++,i.column--,e.fromPoints(j,i)}}}.call(g.prototype)}),define("ace/mode/folding/fold_mode",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../../range").Range,e=b.FoldMode=function(){};(function(){this.foldingStartMarker=null,this.foldingStopMarker=null,this.getFoldWidget=function(a,b,c){var d=a.getLine(c);return this.foldingStartMarker.test(d)?"start":b=="markbeginend"&&this.foldingStopMarker&&this.foldingStopMarker.test(d)?"end":""},this.getFoldWidgetRange=function(a,b,c){return null},this.indentationBlock=function(a,b,c){var e=/^\s*/,f=b,g=b,h=a.getLine(b),i=c||h.length,j=h.match(e)[0].length,k=a.getLength();while(++b<k){h=a.getLine(b);var l=h.match(e)[0].length;if(l==h.length)continue;if(l<=j)break;g=b}if(g>f){var m=a.getLine(g).length;return new d(f,i,g,m)}},this.openingBracketBlock=function(a,b,c,e){var f={row:c,column:e+1},g=a.$findClosingBracket(b,f);if(!g)return;var h=a.foldWidgets[g.row];return h==null&&(h=this.getFoldWidget(a,g.row)),h=="start"&&(g.row--,g.column=a.getLine(g.row).length),d.fromPoints(f,g)}}).call(e.prototype)})
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/mode-powershell-uncompressed.js b/apps/files_texteditor/js/aceeditor/mode-powershell-uncompressed.js
deleted file mode 100644
index e6f9deea01..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-powershell-uncompressed.js
+++ /dev/null
@@ -1,708 +0,0 @@
-define('ace/mode/powershell', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text', 'ace/tokenizer', 'ace/mode/powershell_highlight_rules', 'ace/mode/matching_brace_outdent', 'ace/mode/behaviour/cstyle', 'ace/mode/folding/cstyle'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
-var PowershellHighlightRules = require("./powershell_highlight_rules").PowershellHighlightRules;
-var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
-var CstyleBehaviour = require("./behaviour/cstyle").CstyleBehaviour;
-var CStyleFoldMode = require("./folding/cstyle").FoldMode;
-
-var Mode = function() {
-    this.$tokenizer = new Tokenizer(new PowershellHighlightRules().getRules());
-    this.$outdent = new MatchingBraceOutdent();
-    this.$behaviour = new CstyleBehaviour();
-    this.foldingRules = new CStyleFoldMode();
-};
-oop.inherits(Mode, TextMode);
-
-(function() {
-
-    this.getNextLineIndent = function(state, line, tab) {
-        var indent = this.$getIndent(line);
-
-        var tokenizedLine = this.$tokenizer.getLineTokens(line, state);
-        var tokens = tokenizedLine.tokens;
-
-        if (tokens.length && tokens[tokens.length-1].type == "comment") {
-            return indent;
-        }
-      
-        if (state == "start") {
-            var match = line.match(/^.*[\{\(\[]\s*$/);
-            if (match) {
-                indent += tab;
-            }
-        }
-
-        return indent;
-    };
-
-    this.checkOutdent = function(state, line, input) {
-        return this.$outdent.checkOutdent(line, input);
-    };
-
-    this.autoOutdent = function(state, doc, row) {
-        this.$outdent.autoOutdent(doc, row);
-    };
-
-
-    this.createWorker = function(session) {
-        return null;
-    };
-
-}).call(Mode.prototype);
-
-exports.Mode = Mode;
-});
-define('ace/mode/powershell_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/lang', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var lang = require("../lib/lang");
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-
-var PowershellHighlightRules = function() {
-    
-    var keywords = lang.arrayToMap(
-      ("function|if|else|elseif|switch|while|default|for|do|until|break|continue|" + 
-       "foreach|return|filter|in|trap|throw|param|begin|process|end").split("|")
-    );
-
-    var builtinFunctions = lang.arrayToMap(
-      ("Get-Alias|Import-Alias|New-Alias|Set-Alias|Get-AuthenticodeSignature|Set-AuthenticodeSignature|" +
-       "Set-Location|Get-ChildItem|Clear-Item|Get-Command|Measure-Command|Trace-Command|" +
-       "Add-Computer|Checkpoint-Computer|Remove-Computer|Restart-Computer|Restore-Computer|Stop-Computer|" +
-       "Reset-ComputerMachinePassword|Test-ComputerSecureChannel|Add-Content|Get-Content|Set-Content|Clear-Content|" +
-       "Get-Command|Invoke-Command|Enable-ComputerRestore|Disable-ComputerRestore|Get-ComputerRestorePoint|Test-Connection|" +
-       "ConvertFrom-CSV|ConvertTo-CSV|ConvertTo-Html|ConvertTo-Xml|ConvertFrom-SecureString|ConvertTo-SecureString|" +
-       "Copy-Item|Export-Counter|Get-Counter|Import-Counter|Get-Credential|Get-Culture|" +
-       "Get-ChildItem|Get-Date|Set-Date|Remove-Item|Compare-Object|Get-Event|" +
-       "Get-WinEvent|New-Event|Remove-Event|Unregister-Event|Wait-Event|Clear-EventLog|" +
-       "Get-Eventlog|Limit-EventLog|New-Eventlog|Remove-EventLog|Show-EventLog|Write-EventLog|" +
-       "Get-EventSubscriber|Register-EngineEvent|Register-ObjectEvent|Register-WmiEvent|Get-ExecutionPolicy|Set-ExecutionPolicy|" +
-       "Export-Alias|Export-Clixml|Export-Console|Export-Csv|ForEach-Object|Format-Custom|" +
-       "Format-List|Format-Table|Format-Wide|Export-FormatData|Get-FormatData|Get-Item|" +
-       "Get-ChildItem|Get-Help|Add-History|Clear-History|Get-History|Invoke-History|" +
-       "Get-Host|Read-Host|Write-Host|Get-HotFix|Import-Clixml|Import-Csv|" +
-       "Invoke-Command|Invoke-Expression|Get-Item|Invoke-Item|New-Item|Remove-Item|" +
-       "Set-Item|Clear-ItemProperty|Copy-ItemProperty|Get-ItemProperty|Move-ItemProperty|New-ItemProperty|" +
-       "Remove-ItemProperty|Rename-ItemProperty|Set-ItemProperty|Get-Job|Receive-Job|Remove-Job|" +
-       "Start-Job|Stop-Job|Wait-Job|Stop-Process|Update-List|Get-Location|" +
-       "Pop-Location|Push-Location|Set-Location|Send-MailMessage|Add-Member|Get-Member|" +
-       "Move-Item|Compare-Object|Group-Object|Measure-Object|New-Object|Select-Object|" +
-       "Sort-Object|Where-Object|Out-Default|Out-File|Out-GridView|Out-Host|" +
-       "Out-Null|Out-Printer|Out-String|Convert-Path|Join-Path|Resolve-Path|" +
-       "Split-Path|Test-Path|Get-Pfxcertificate|Pop-Location|Push-Location|Get-Process|" +
-       "Start-Process|Stop-Process|Wait-Process|Enable-PSBreakpoint|Disable-PSBreakpoint|Get-PSBreakpoint|" +
-       "Set-PSBreakpoint|Remove-PSBreakpoint|Get-PSDrive|New-PSDrive|Remove-PSDrive|Get-PSProvider|" +
-       "Set-PSdebug|Enter-PSSession|Exit-PSSession|Export-PSSession|Get-PSSession|Import-PSSession|" +
-       "New-PSSession|Remove-PSSession|Disable-PSSessionConfiguration|Enable-PSSessionConfiguration|Get-PSSessionConfiguration|Register-PSSessionConfiguration|" +
-       "Set-PSSessionConfiguration|Unregister-PSSessionConfiguration|New-PSSessionOption|Add-PsSnapIn|Get-PsSnapin|Remove-PSSnapin|" +
-       "Get-Random|Read-Host|Remove-Item|Rename-Item|Rename-ItemProperty|Select-Object|" +
-       "Select-XML|Send-MailMessage|Get-Service|New-Service|Restart-Service|Resume-Service|" +
-       "Set-Service|Start-Service|Stop-Service|Suspend-Service|Sort-Object|Start-Sleep|" +
-       "ConvertFrom-StringData|Select-String|Tee-Object|New-Timespan|Trace-Command|Get-Tracesource|" +
-       "Set-Tracesource|Start-Transaction|Complete-Transaction|Get-Transaction|Use-Transaction|Undo-Transaction|" +
-       "Start-Transcript|Stop-Transcript|Add-Type|Update-TypeData|Get-Uiculture|Get-Unique|" +
-       "Update-Formatdata|Update-Typedata|Clear-Variable|Get-Variable|New-Variable|Remove-Variable|" +
-       "Set-Variable|New-WebServiceProxy|Where-Object|Write-Debug|Write-Error|Write-Host|" +
-       "Write-Output|Write-Progress|Write-Verbose|Write-Warning|Set-WmiInstance|Invoke-WmiMethod|" +
-       "Get-WmiObject|Remove-WmiObject|Connect-WSMan|Disconnect-WSMan|Test-WSMan|Invoke-WSManAction|" +
-       "Disable-WSManCredSSP|Enable-WSManCredSSP|Get-WSManCredSSP|New-WSManInstance|Get-WSManInstance|Set-WSManInstance|" +
-       "Remove-WSManInstance|Set-WSManQuickConfig|New-WSManSessionOption").split("|"));
-
-    var binaryOperatorsRe = "eq|ne|ge|gt|lt|le|like|notlike|match|notmatch|replace|contains|notcontains|" +
-                            "ieq|ine|ige|igt|ile|ilt|ilike|inotlike|imatch|inotmatch|ireplace|icontains|inotcontains|" +
-                            "is|isnot|as|" +
-                            "and|or|band|bor|not"; 
-
-    // regexp must not have capturing parentheses. Use (?:) instead.
-    // regexps are ordered -> the first match is used
-
-    this.$rules = {
-        "start" : [
-            {
-                token : "comment",
-                regex : "#.*$"
-            }, {
-                token : "string", // single line
-                regex : '["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'
-            }, {
-                token : "string", // single line
-                regex : "['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"
-            }, {
-                token : "constant.numeric", // hex
-                regex : "0[xX][0-9a-fA-F]+\\b"
-            }, {
-                token : "constant.numeric", // float
-                regex : "[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"
-            }, {
-                token : "constant.language.boolean",
-                regex : "[$](?:[Tt]rue|[Ff]alse)\\b"
-            }, {
-                token : "constant.language",
-                regex : "[$][Nn]ull\\b"
-            }, {
-                token : "variable.instance",
-                regex : "[$][a-zA-Z][a-zA-Z0-9_]*\\b"
-            }, {
-                token : function(value) {
-                    if (keywords.hasOwnProperty(value))
-                        return "keyword";
-                    else if (builtinFunctions.hasOwnProperty(value))
-                        return "support.function";
-                    else
-                        return "identifier";
-                },
-                // TODO: Unicode escape sequences
-                // TODO: Unicode identifiers
-                regex : "[a-zA-Z_$][a-zA-Z0-9_$\\-]*\\b"
-            }, {
-                token : "keyword.operator",
-                regex : "\\-(?:" + binaryOperatorsRe + ")"
-            }, {
-                token : "keyword.operator",
-                regex : "&|\\*|\\+|\\-|\\=|\\+=|\\-="
-            }, {
-                token : "lparen",
-                regex : "[[({]"
-            }, {
-                token : "rparen",
-                regex : "[\\])}]"
-            }, {
-                token : "text",
-                regex : "\\s+"
-            }
-        ],
-        "comment" : [
-            {
-                token : "comment", // closing comment
-                regex : ".*?\\*\\/",
-                next : "start"
-            }, {
-                token : "comment", // comment spanning whole line
-                merge : true,
-                regex : ".+"
-            }
-        ]
-    };
-};
-
-oop.inherits(PowershellHighlightRules, TextHighlightRules);
-
-exports.PowershellHighlightRules = PowershellHighlightRules;
-});
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/matching_brace_outdent', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
-"use strict";
-
-var Range = require("../range").Range;
-
-var MatchingBraceOutdent = function() {};
-
-(function() {
-
-    this.checkOutdent = function(line, input) {
-        if (! /^\s+$/.test(line))
-            return false;
-
-        return /^\s*\}/.test(input);
-    };
-
-    this.autoOutdent = function(doc, row) {
-        var line = doc.getLine(row);
-        var match = line.match(/^(\s*\})/);
-
-        if (!match) return 0;
-
-        var column = match[1].length;
-        var openBracePos = doc.findMatchingBracket({row: row, column: column});
-
-        if (!openBracePos || openBracePos.row == row) return 0;
-
-        var indent = this.$getIndent(doc.getLine(openBracePos.row));
-        doc.replace(new Range(row, 0, row, column-1), indent);
-    };
-
-    this.$getIndent = function(line) {
-        var match = line.match(/^(\s+)/);
-        if (match) {
-            return match[1];
-        }
-
-        return "";
-    };
-
-}).call(MatchingBraceOutdent.prototype);
-
-exports.MatchingBraceOutdent = MatchingBraceOutdent;
-});
-/* vim:ts=4:sts=4:sw=4:
- * ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Chris Spencer <chris.ag.spencer AT googlemail DOT com>
- *
- * 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 ***** */
-
-define('ace/mode/behaviour/cstyle', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/behaviour'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../../lib/oop");
-var Behaviour = require('../behaviour').Behaviour;
-
-var CstyleBehaviour = function () {
-
-    this.add("braces", "insertion", function (state, action, editor, session, text) {
-        if (text == '{') {
-            var selection = editor.getSelectionRange();
-            var selected = session.doc.getTextRange(selection);
-            if (selected !== "") {
-                return {
-                    text: '{' + selected + '}',
-                    selection: false
-                };
-            } else {
-                return {
-                    text: '{}',
-                    selection: [1, 1]
-                };
-            }
-        } else if (text == '}') {
-            var cursor = editor.getCursorPosition();
-            var line = session.doc.getLine(cursor.row);
-            var rightChar = line.substring(cursor.column, cursor.column + 1);
-            if (rightChar == '}') {
-                var matching = session.$findOpeningBracket('}', {column: cursor.column + 1, row: cursor.row});
-                if (matching !== null) {
-                    return {
-                        text: '',
-                        selection: [1, 1]
-                    };
-                }
-            }
-        } else if (text == "\n") {
-            var cursor = editor.getCursorPosition();
-            var line = session.doc.getLine(cursor.row);
-            var rightChar = line.substring(cursor.column, cursor.column + 1);
-            if (rightChar == '}') {
-                var openBracePos = session.findMatchingBracket({row: cursor.row, column: cursor.column + 1});
-                if (!openBracePos)
-                     return null;
-
-                var indent = this.getNextLineIndent(state, line.substring(0, line.length - 1), session.getTabString());
-                var next_indent = this.$getIndent(session.doc.getLine(openBracePos.row));
-
-                return {
-                    text: '\n' + indent + '\n' + next_indent,
-                    selection: [1, indent.length, 1, indent.length]
-                };
-            }
-        }
-    });
-
-    this.add("braces", "deletion", function (state, action, editor, session, range) {
-        var selected = session.doc.getTextRange(range);
-        if (!range.isMultiLine() && selected == '{') {
-            var line = session.doc.getLine(range.start.row);
-            var rightChar = line.substring(range.end.column, range.end.column + 1);
-            if (rightChar == '}') {
-                range.end.column++;
-                return range;
-            }
-        }
-    });
-
-    this.add("parens", "insertion", function (state, action, editor, session, text) {
-        if (text == '(') {
-            var selection = editor.getSelectionRange();
-            var selected = session.doc.getTextRange(selection);
-            if (selected !== "") {
-                return {
-                    text: '(' + selected + ')',
-                    selection: false
-                };
-            } else {
-                return {
-                    text: '()',
-                    selection: [1, 1]
-                };
-            }
-        } else if (text == ')') {
-            var cursor = editor.getCursorPosition();
-            var line = session.doc.getLine(cursor.row);
-            var rightChar = line.substring(cursor.column, cursor.column + 1);
-            if (rightChar == ')') {
-                var matching = session.$findOpeningBracket(')', {column: cursor.column + 1, row: cursor.row});
-                if (matching !== null) {
-                    return {
-                        text: '',
-                        selection: [1, 1]
-                    };
-                }
-            }
-        }
-    });
-
-    this.add("parens", "deletion", function (state, action, editor, session, range) {
-        var selected = session.doc.getTextRange(range);
-        if (!range.isMultiLine() && selected == '(') {
-            var line = session.doc.getLine(range.start.row);
-            var rightChar = line.substring(range.start.column + 1, range.start.column + 2);
-            if (rightChar == ')') {
-                range.end.column++;
-                return range;
-            }
-        }
-    });
-
-    this.add("string_dquotes", "insertion", function (state, action, editor, session, text) {
-        if (text == '"' || text == "'") {
-            var quote = text;
-            var selection = editor.getSelectionRange();
-            var selected = session.doc.getTextRange(selection);
-            if (selected !== "") {
-                return {
-                    text: quote + selected + quote,
-                    selection: false
-                };
-            } else {
-                var cursor = editor.getCursorPosition();
-                var line = session.doc.getLine(cursor.row);
-                var leftChar = line.substring(cursor.column-1, cursor.column);
-
-                // We're escaped.
-                if (leftChar == '\\') {
-                    return null;
-                }
-
-                // Find what token we're inside.
-                var tokens = session.getTokens(selection.start.row, selection.start.row)[0].tokens;
-                var col = 0, token;
-                var quotepos = -1; // Track whether we're inside an open quote.
-
-                for (var x = 0; x < tokens.length; x++) {
-                    token = tokens[x];
-                    if (token.type == "string") {
-                      quotepos = -1;
-                    } else if (quotepos < 0) {
-                      quotepos = token.value.indexOf(quote);
-                    }
-                    if ((token.value.length + col) > selection.start.column) {
-                        break;
-                    }
-                    col += tokens[x].value.length;
-                }
-
-                // Try and be smart about when we auto insert.
-                if (!token || (quotepos < 0 && token.type !== "comment" && (token.type !== "string" || ((selection.start.column !== token.value.length+col-1) && token.value.lastIndexOf(quote) === token.value.length-1)))) {
-                    return {
-                        text: quote + quote,
-                        selection: [1,1]
-                    };
-                } else if (token && token.type === "string") {
-                    // Ignore input and move right one if we're typing over the closing quote.
-                    var rightChar = line.substring(cursor.column, cursor.column + 1);
-                    if (rightChar == quote) {
-                        return {
-                            text: '',
-                            selection: [1, 1]
-                        };
-                    }
-                }
-            }
-        }
-    });
-
-    this.add("string_dquotes", "deletion", function (state, action, editor, session, range) {
-        var selected = session.doc.getTextRange(range);
-        if (!range.isMultiLine() && (selected == '"' || selected == "'")) {
-            var line = session.doc.getLine(range.start.row);
-            var rightChar = line.substring(range.start.column + 1, range.start.column + 2);
-            if (rightChar == '"') {
-                range.end.column++;
-                return range;
-            }
-        }
-    });
-
-};
-
-oop.inherits(CstyleBehaviour, Behaviour);
-
-exports.CstyleBehaviour = CstyleBehaviour;
-});/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/folding/cstyle', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/range', 'ace/mode/folding/fold_mode'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../../lib/oop");
-var Range = require("../../range").Range;
-var BaseFoldMode = require("./fold_mode").FoldMode;
-
-var FoldMode = exports.FoldMode = function() {};
-oop.inherits(FoldMode, BaseFoldMode);
-
-(function() {
-
-    this.foldingStartMarker = /(\{|\[)[^\}\]]*$|^\s*(\/\*)/;
-    this.foldingStopMarker = /^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/;
-    
-    this.getFoldWidgetRange = function(session, foldStyle, row) {
-        var line = session.getLine(row);
-        var match = line.match(this.foldingStartMarker);
-        if (match) {
-            var i = match.index;
-
-            if (match[1])
-                return this.openingBracketBlock(session, match[1], row, i);
-
-            var range = session.getCommentFoldRange(row, i + match[0].length);
-            range.end.column -= 2;
-            return range;
-        }
-
-        if (foldStyle !== "markbeginend")
-            return;
-            
-        var match = line.match(this.foldingStopMarker);
-        if (match) {
-            var i = match.index + match[0].length;
-
-            if (match[2]) {
-                var range = session.getCommentFoldRange(row, i);
-                range.end.column -= 2;
-                return range;
-            }
-
-            var end = {row: row, column: i};
-            var start = session.$findOpeningBracket(match[1], end);
-            
-            if (!start)
-                return;
-
-            start.column++;
-            end.column--;
-
-            return  Range.fromPoints(start, end);
-        }
-    };
-    
-}).call(FoldMode.prototype);
-
-});/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/folding/fold_mode', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
-"use strict";
-
-var Range = require("../../range").Range;
-
-var FoldMode = exports.FoldMode = function() {};
-
-(function() {
-
-    this.foldingStartMarker = null;
-    this.foldingStopMarker = null;
-
-    // must return "" if there's no fold, to enable caching
-    this.getFoldWidget = function(session, foldStyle, row) {
-        var line = session.getLine(row);
-        if (this.foldingStartMarker.test(line))
-            return "start";
-        if (foldStyle == "markbeginend"
-                && this.foldingStopMarker
-                && this.foldingStopMarker.test(line))
-            return "end";
-        return "";
-    };
-    
-    this.getFoldWidgetRange = function(session, foldStyle, row) {
-        return null;
-    };
-
-    this.indentationBlock = function(session, row, column) {
-        var re = /^\s*/;
-        var startRow = row;
-        var endRow = row;
-        var line = session.getLine(row);
-        var startColumn = column || line.length;
-        var startLevel = line.match(re)[0].length;
-        var maxRow = session.getLength()
-        
-        while (++row < maxRow) {
-            line = session.getLine(row);
-            var level = line.match(re)[0].length;
-
-            if (level == line.length)
-                continue;
-
-            if (level <= startLevel)
-                break;
-
-            endRow = row;
-        }
-
-        if (endRow > startRow) {
-            var endColumn = session.getLine(endRow).length;
-            return new Range(startRow, startColumn, endRow, endColumn);
-        }
-    };
-
-    this.openingBracketBlock = function(session, bracket, row, column) {
-        var start = {row: row, column: column + 1};
-        var end = session.$findClosingBracket(bracket, start);
-        if (!end)
-            return;
-
-        var fw = session.foldWidgets[end.row];
-        if (fw == null)
-            fw = this.getFoldWidget(session, end.row);
-
-        if (fw == "start") {
-            end.row --;
-            end.column = session.getLine(end.row).length;
-        }
-        return Range.fromPoints(start, end);
-    };
-
-}).call(FoldMode.prototype);
-
-});
diff --git a/apps/files_texteditor/js/aceeditor/mode-powershell.js b/apps/files_texteditor/js/aceeditor/mode-powershell.js
deleted file mode 100644
index 6ebaeae520..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-powershell.js
+++ /dev/null
@@ -1 +0,0 @@
-define("ace/mode/powershell",["require","exports","module","ace/lib/oop","ace/mode/text","ace/tokenizer","ace/mode/powershell_highlight_rules","ace/mode/matching_brace_outdent","ace/mode/behaviour/cstyle","ace/mode/folding/cstyle"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text").Mode,f=a("../tokenizer").Tokenizer,g=a("./powershell_highlight_rules").PowershellHighlightRules,h=a("./matching_brace_outdent").MatchingBraceOutdent,i=a("./behaviour/cstyle").CstyleBehaviour,j=a("./folding/cstyle").FoldMode,k=function(){this.$tokenizer=new f((new g).getRules()),this.$outdent=new h,this.$behaviour=new i,this.foldingRules=new j};d.inherits(k,e),function(){this.getNextLineIndent=function(a,b,c){var d=this.$getIndent(b),e=this.$tokenizer.getLineTokens(b,a),f=e.tokens;if(f.length&&f[f.length-1].type=="comment")return d;if(a=="start"){var g=b.match(/^.*[\{\(\[]\s*$/);g&&(d+=c)}return d},this.checkOutdent=function(a,b,c){return this.$outdent.checkOutdent(b,c)},this.autoOutdent=function(a,b,c){this.$outdent.autoOutdent(b,c)},this.createWorker=function(a){return null}}.call(k.prototype),b.Mode=k}),define("ace/mode/powershell_highlight_rules",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("../lib/lang"),f=a("./text_highlight_rules").TextHighlightRules,g=function(){var a=e.arrayToMap("function|if|else|elseif|switch|while|default|for|do|until|break|continue|foreach|return|filter|in|trap|throw|param|begin|process|end".split("|")),b=e.arrayToMap("Get-Alias|Import-Alias|New-Alias|Set-Alias|Get-AuthenticodeSignature|Set-AuthenticodeSignature|Set-Location|Get-ChildItem|Clear-Item|Get-Command|Measure-Command|Trace-Command|Add-Computer|Checkpoint-Computer|Remove-Computer|Restart-Computer|Restore-Computer|Stop-Computer|Reset-ComputerMachinePassword|Test-ComputerSecureChannel|Add-Content|Get-Content|Set-Content|Clear-Content|Get-Command|Invoke-Command|Enable-ComputerRestore|Disable-ComputerRestore|Get-ComputerRestorePoint|Test-Connection|ConvertFrom-CSV|ConvertTo-CSV|ConvertTo-Html|ConvertTo-Xml|ConvertFrom-SecureString|ConvertTo-SecureString|Copy-Item|Export-Counter|Get-Counter|Import-Counter|Get-Credential|Get-Culture|Get-ChildItem|Get-Date|Set-Date|Remove-Item|Compare-Object|Get-Event|Get-WinEvent|New-Event|Remove-Event|Unregister-Event|Wait-Event|Clear-EventLog|Get-Eventlog|Limit-EventLog|New-Eventlog|Remove-EventLog|Show-EventLog|Write-EventLog|Get-EventSubscriber|Register-EngineEvent|Register-ObjectEvent|Register-WmiEvent|Get-ExecutionPolicy|Set-ExecutionPolicy|Export-Alias|Export-Clixml|Export-Console|Export-Csv|ForEach-Object|Format-Custom|Format-List|Format-Table|Format-Wide|Export-FormatData|Get-FormatData|Get-Item|Get-ChildItem|Get-Help|Add-History|Clear-History|Get-History|Invoke-History|Get-Host|Read-Host|Write-Host|Get-HotFix|Import-Clixml|Import-Csv|Invoke-Command|Invoke-Expression|Get-Item|Invoke-Item|New-Item|Remove-Item|Set-Item|Clear-ItemProperty|Copy-ItemProperty|Get-ItemProperty|Move-ItemProperty|New-ItemProperty|Remove-ItemProperty|Rename-ItemProperty|Set-ItemProperty|Get-Job|Receive-Job|Remove-Job|Start-Job|Stop-Job|Wait-Job|Stop-Process|Update-List|Get-Location|Pop-Location|Push-Location|Set-Location|Send-MailMessage|Add-Member|Get-Member|Move-Item|Compare-Object|Group-Object|Measure-Object|New-Object|Select-Object|Sort-Object|Where-Object|Out-Default|Out-File|Out-GridView|Out-Host|Out-Null|Out-Printer|Out-String|Convert-Path|Join-Path|Resolve-Path|Split-Path|Test-Path|Get-Pfxcertificate|Pop-Location|Push-Location|Get-Process|Start-Process|Stop-Process|Wait-Process|Enable-PSBreakpoint|Disable-PSBreakpoint|Get-PSBreakpoint|Set-PSBreakpoint|Remove-PSBreakpoint|Get-PSDrive|New-PSDrive|Remove-PSDrive|Get-PSProvider|Set-PSdebug|Enter-PSSession|Exit-PSSession|Export-PSSession|Get-PSSession|Import-PSSession|New-PSSession|Remove-PSSession|Disable-PSSessionConfiguration|Enable-PSSessionConfiguration|Get-PSSessionConfiguration|Register-PSSessionConfiguration|Set-PSSessionConfiguration|Unregister-PSSessionConfiguration|New-PSSessionOption|Add-PsSnapIn|Get-PsSnapin|Remove-PSSnapin|Get-Random|Read-Host|Remove-Item|Rename-Item|Rename-ItemProperty|Select-Object|Select-XML|Send-MailMessage|Get-Service|New-Service|Restart-Service|Resume-Service|Set-Service|Start-Service|Stop-Service|Suspend-Service|Sort-Object|Start-Sleep|ConvertFrom-StringData|Select-String|Tee-Object|New-Timespan|Trace-Command|Get-Tracesource|Set-Tracesource|Start-Transaction|Complete-Transaction|Get-Transaction|Use-Transaction|Undo-Transaction|Start-Transcript|Stop-Transcript|Add-Type|Update-TypeData|Get-Uiculture|Get-Unique|Update-Formatdata|Update-Typedata|Clear-Variable|Get-Variable|New-Variable|Remove-Variable|Set-Variable|New-WebServiceProxy|Where-Object|Write-Debug|Write-Error|Write-Host|Write-Output|Write-Progress|Write-Verbose|Write-Warning|Set-WmiInstance|Invoke-WmiMethod|Get-WmiObject|Remove-WmiObject|Connect-WSMan|Disconnect-WSMan|Test-WSMan|Invoke-WSManAction|Disable-WSManCredSSP|Enable-WSManCredSSP|Get-WSManCredSSP|New-WSManInstance|Get-WSManInstance|Set-WSManInstance|Remove-WSManInstance|Set-WSManQuickConfig|New-WSManSessionOption".split("|")),c="eq|ne|ge|gt|lt|le|like|notlike|match|notmatch|replace|contains|notcontains|ieq|ine|ige|igt|ile|ilt|ilike|inotlike|imatch|inotmatch|ireplace|icontains|inotcontains|is|isnot|as|and|or|band|bor|not";this.$rules={start:[{token:"comment",regex:"#.*$"},{token:"string",regex:'["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'},{token:"string",regex:"['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"},{token:"constant.numeric",regex:"0[xX][0-9a-fA-F]+\\b"},{token:"constant.numeric",regex:"[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"},{token:"constant.language.boolean",regex:"[$](?:[Tt]rue|[Ff]alse)\\b"},{token:"constant.language",regex:"[$][Nn]ull\\b"},{token:"variable.instance",regex:"[$][a-zA-Z][a-zA-Z0-9_]*\\b"},{token:function(c){return a.hasOwnProperty(c)?"keyword":b.hasOwnProperty(c)?"support.function":"identifier"},regex:"[a-zA-Z_$][a-zA-Z0-9_$\\-]*\\b"},{token:"keyword.operator",regex:"\\-(?:"+c+")"},{token:"keyword.operator",regex:"&|\\*|\\+|\\-|\\=|\\+=|\\-="},{token:"lparen",regex:"[[({]"},{token:"rparen",regex:"[\\])}]"},{token:"text",regex:"\\s+"}],comment:[{token:"comment",regex:".*?\\*\\/",next:"start"},{token:"comment",merge:!0,regex:".+"}]}};d.inherits(g,f),b.PowershellHighlightRules=g}),define("ace/mode/matching_brace_outdent",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../range").Range,e=function(){};(function(){this.checkOutdent=function(a,b){return/^\s+$/.test(a)?/^\s*\}/.test(b):!1},this.autoOutdent=function(a,b){var c=a.getLine(b),e=c.match(/^(\s*\})/);if(!e)return 0;var f=e[1].length,g=a.findMatchingBracket({row:b,column:f});if(!g||g.row==b)return 0;var h=this.$getIndent(a.getLine(g.row));a.replace(new d(b,0,b,f-1),h)},this.$getIndent=function(a){var b=a.match(/^(\s+)/);return b?b[1]:""}}).call(e.prototype),b.MatchingBraceOutdent=e}),define("ace/mode/behaviour/cstyle",["require","exports","module","ace/lib/oop","ace/mode/behaviour"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../behaviour").Behaviour,f=function(){this.add("braces","insertion",function(a,b,c,d,e){if(e=="{"){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"{"+g+"}",selection:!1}:{text:"{}",selection:[1,1]}}if(e=="}"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var k=d.$findOpeningBracket("}",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}else if(e=="\n"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var l=d.findMatchingBracket({row:h.row,column:h.column+1});if(!l)return null;var m=this.getNextLineIndent(a,i.substring(0,i.length-1),d.getTabString()),n=this.$getIndent(d.doc.getLine(l.row));return{text:"\n"+m+"\n"+n,selection:[1,m.length,1,m.length]}}}}),this.add("braces","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="{"){var g=d.doc.getLine(e.start.row),h=g.substring(e.end.column,e.end.column+1);if(h=="}")return e.end.column++,e}}),this.add("parens","insertion",function(a,b,c,d,e){if(e=="("){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"("+g+")",selection:!1}:{text:"()",selection:[1,1]}}if(e==")"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j==")"){var k=d.$findOpeningBracket(")",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}}),this.add("parens","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="("){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h==")")return e.end.column++,e}}),this.add("string_dquotes","insertion",function(a,b,c,d,e){if(e=='"'||e=="'"){var f=e,g=c.getSelectionRange(),h=d.doc.getTextRange(g);if(h!=="")return{text:f+h+f,selection:!1};var i=c.getCursorPosition(),j=d.doc.getLine(i.row),k=j.substring(i.column-1,i.column);if(k=="\\")return null;var l=d.getTokens(g.start.row,g.start.row)[0].tokens,m=0,n,o=-1;for(var p=0;p<l.length;p++){n=l[p],n.type=="string"?o=-1:o<0&&(o=n.value.indexOf(f));if(n.value.length+m>g.start.column)break;m+=l[p].value.length}if(!n||o<0&&n.type!=="comment"&&(n.type!=="string"||g.start.column!==n.value.length+m-1&&n.value.lastIndexOf(f)===n.value.length-1))return{text:f+f,selection:[1,1]};if(n&&n.type==="string"){var q=j.substring(i.column,i.column+1);if(q==f)return{text:"",selection:[1,1]}}}}),this.add("string_dquotes","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&(f=='"'||f=="'")){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h=='"')return e.end.column++,e}})};d.inherits(f,e),b.CstyleBehaviour=f}),define("ace/mode/folding/cstyle",["require","exports","module","ace/lib/oop","ace/range","ace/mode/folding/fold_mode"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../../range").Range,f=a("./fold_mode").FoldMode,g=b.FoldMode=function(){};d.inherits(g,f),function(){this.foldingStartMarker=/(\{|\[)[^\}\]]*$|^\s*(\/\*)/,this.foldingStopMarker=/^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/,this.getFoldWidgetRange=function(a,b,c){var d=a.getLine(c),f=d.match(this.foldingStartMarker);if(f){var g=f.index;if(f[1])return this.openingBracketBlock(a,f[1],c,g);var h=a.getCommentFoldRange(c,g+f[0].length);return h.end.column-=2,h}if(b!=="markbeginend")return;var f=d.match(this.foldingStopMarker);if(f){var g=f.index+f[0].length;if(f[2]){var h=a.getCommentFoldRange(c,g);return h.end.column-=2,h}var i={row:c,column:g},j=a.$findOpeningBracket(f[1],i);if(!j)return;return j.column++,i.column--,e.fromPoints(j,i)}}}.call(g.prototype)}),define("ace/mode/folding/fold_mode",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../../range").Range,e=b.FoldMode=function(){};(function(){this.foldingStartMarker=null,this.foldingStopMarker=null,this.getFoldWidget=function(a,b,c){var d=a.getLine(c);return this.foldingStartMarker.test(d)?"start":b=="markbeginend"&&this.foldingStopMarker&&this.foldingStopMarker.test(d)?"end":""},this.getFoldWidgetRange=function(a,b,c){return null},this.indentationBlock=function(a,b,c){var e=/^\s*/,f=b,g=b,h=a.getLine(b),i=c||h.length,j=h.match(e)[0].length,k=a.getLength();while(++b<k){h=a.getLine(b);var l=h.match(e)[0].length;if(l==h.length)continue;if(l<=j)break;g=b}if(g>f){var m=a.getLine(g).length;return new d(f,i,g,m)}},this.openingBracketBlock=function(a,b,c,e){var f={row:c,column:e+1},g=a.$findClosingBracket(b,f);if(!g)return;var h=a.foldWidgets[g.row];return h==null&&(h=this.getFoldWidget(a,g.row)),h=="start"&&(g.row--,g.column=a.getLine(g.row).length),d.fromPoints(f,g)}}).call(e.prototype)})
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/mode-python-uncompressed.js b/apps/files_texteditor/js/aceeditor/mode-python-uncompressed.js
deleted file mode 100644
index 9a12decebd..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-python-uncompressed.js
+++ /dev/null
@@ -1,506 +0,0 @@
-/* ***** 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 Ajax.org Code Editor (ACE).
-*
-* The Initial Developer of the Original Code is
-* Ajax.org B.V.
-* Portions created by the Initial Developer are Copyright (C) 2010
-* the Initial Developer. All Rights Reserved.
-*
-* Contributor(s):
-*      Fabian Jakobs <fabian AT ajax DOT org>
-*      Colin Gourlay <colin DOT j DOT gourlay AT gmail DOT com>
-*
-* 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 ***** */
-
-define('ace/mode/python', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text', 'ace/tokenizer', 'ace/mode/python_highlight_rules', 'ace/mode/folding/pythonic', 'ace/range'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
-var PythonHighlightRules = require("./python_highlight_rules").PythonHighlightRules;
-var PythonFoldMode = require("./folding/pythonic").FoldMode;
-var Range = require("../range").Range;
-
-var Mode = function() {
-    this.$tokenizer = new Tokenizer(new PythonHighlightRules().getRules());
-    this.foldingRules = new PythonFoldMode("\\:");
-};
-oop.inherits(Mode, TextMode);
-
-(function() {
-
-    this.toggleCommentLines = function(state, doc, startRow, endRow) {
-        var outdent = true;
-        var re = /^(\s*)#/;
-
-        for (var i=startRow; i<= endRow; i++) {
-            if (!re.test(doc.getLine(i))) {
-                outdent = false;
-                break;
-            }
-        }
-
-        if (outdent) {
-            var deleteRange = new Range(0, 0, 0, 0);
-            for (var i=startRow; i<= endRow; i++)
-            {
-                var line = doc.getLine(i);
-                var m = line.match(re);
-                deleteRange.start.row = i;
-                deleteRange.end.row = i;
-                deleteRange.end.column = m[0].length;
-                doc.replace(deleteRange, m[1]);
-            }
-        }
-        else {
-            doc.indentRows(startRow, endRow, "#");
-        }
-    };
-
-    this.getNextLineIndent = function(state, line, tab) {
-        var indent = this.$getIndent(line);
-
-        var tokenizedLine = this.$tokenizer.getLineTokens(line, state);
-        var tokens = tokenizedLine.tokens;
-
-        if (tokens.length && tokens[tokens.length-1].type == "comment") {
-            return indent;
-        }
-
-        if (state == "start") {
-            var match = line.match(/^.*[\{\(\[\:]\s*$/);
-            if (match) {
-                indent += tab;
-            }
-        }
-
-        return indent;
-    };
-
-    var outdents = {
-        "pass": 1,
-        "return": 1,
-        "raise": 1,
-        "break": 1,
-        "continue": 1
-    };
-    
-    this.checkOutdent = function(state, line, input) {
-        if (input !== "\r\n" && input !== "\r" && input !== "\n")
-            return false;
-
-        var tokens = this.$tokenizer.getLineTokens(line.trim(), state).tokens;
-        
-        if (!tokens)
-            return false;
-        
-        // ignore trailing comments
-        do {
-            var last = tokens.pop();
-        } while (last && (last.type == "comment" || (last.type == "text" && last.value.match(/^\s+$/))));
-        
-        if (!last)
-            return false;
-        
-        return (last.type == "keyword" && outdents[last.value]);
-    };
-
-    this.autoOutdent = function(state, doc, row) {
-        // outdenting in python is slightly different because it always applies
-        // to the next line and only of a new line is inserted
-        
-        row += 1;
-        var indent = this.$getIndent(doc.getLine(row));
-        var tab = doc.getTabString();
-        if (indent.slice(-tab.length) == tab)
-            doc.remove(new Range(row, indent.length-tab.length, row, indent.length));
-    };
-
-}).call(Mode.prototype);
-
-exports.Mode = Mode;
-});
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *      Colin Gourlay <colin DOT j DOT gourlay AT gmail DOT com>
- *
- * 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 *****
- *
- * TODO: python delimiters
- */
-
-define('ace/mode/python_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/lang', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var lang = require("../lib/lang");
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-
-var PythonHighlightRules = function() {
-
-    var keywords = lang.arrayToMap(
-        ("and|as|assert|break|class|continue|def|del|elif|else|except|exec|" +
-        "finally|for|from|global|if|import|in|is|lambda|not|or|pass|print|" +
-        "raise|return|try|while|with|yield").split("|")
-    );
-
-    var builtinConstants = lang.arrayToMap(
-        ("True|False|None|NotImplemented|Ellipsis|__debug__").split("|")
-    );
-
-    var builtinFunctions = lang.arrayToMap(
-        ("abs|divmod|input|open|staticmethod|all|enumerate|int|ord|str|any|" +
-        "eval|isinstance|pow|sum|basestring|execfile|issubclass|print|super|" +
-        "binfile|iter|property|tuple|bool|filter|len|range|type|bytearray|" +
-        "float|list|raw_input|unichr|callable|format|locals|reduce|unicode|" +
-        "chr|frozenset|long|reload|vars|classmethod|getattr|map|repr|xrange|" +
-        "cmp|globals|max|reversed|zip|compile|hasattr|memoryview|round|" +
-        "__import__|complex|hash|min|set|apply|delattr|help|next|setattr|" +
-        "buffer|dict|hex|object|slice|coerce|dir|id|oct|sorted|intern").split("|")
-    );
-
-    var futureReserved = lang.arrayToMap(
-        ("").split("|")
-    );
-
-    var strPre = "(?:r|u|ur|R|U|UR|Ur|uR)?";
-
-    var decimalInteger = "(?:(?:[1-9]\\d*)|(?:0))";
-    var octInteger = "(?:0[oO]?[0-7]+)";
-    var hexInteger = "(?:0[xX][\\dA-Fa-f]+)";
-    var binInteger = "(?:0[bB][01]+)";
-    var integer = "(?:" + decimalInteger + "|" + octInteger + "|" + hexInteger + "|" + binInteger + ")";
-
-    var exponent = "(?:[eE][+-]?\\d+)";
-    var fraction = "(?:\\.\\d+)";
-    var intPart = "(?:\\d+)";
-    var pointFloat = "(?:(?:" + intPart + "?" + fraction + ")|(?:" + intPart + "\\.))";
-    var exponentFloat = "(?:(?:" + pointFloat + "|" +  intPart + ")" + exponent + ")";
-    var floatNumber = "(?:" + exponentFloat + "|" + pointFloat + ")";
-
-    this.$rules = {
-        "start" : [ {
-            token : "comment",
-            regex : "#.*$"
-        }, {
-            token : "string",           // """ string
-            regex : strPre + '"{3}(?:[^\\\\]|\\\\.)*?"{3}'
-        }, {
-            token : "string",           // multi line """ string start
-            merge : true,
-            regex : strPre + '"{3}.*$',
-            next : "qqstring"
-        }, {
-            token : "string",           // " string
-            regex : strPre + '"(?:[^\\\\]|\\\\.)*?"'
-        }, {
-            token : "string",           // ''' string
-            regex : strPre + "'{3}(?:[^\\\\]|\\\\.)*?'{3}"
-        }, {
-            token : "string",           // multi line ''' string start
-            merge : true,
-            regex : strPre + "'{3}.*$",
-            next : "qstring"
-        }, {
-            token : "string",           // ' string
-            regex : strPre + "'(?:[^\\\\]|\\\\.)*?'"
-        }, {
-            token : "constant.numeric", // imaginary
-            regex : "(?:" + floatNumber + "|\\d+)[jJ]\\b"
-        }, {
-            token : "constant.numeric", // float
-            regex : floatNumber
-        }, {
-            token : "constant.numeric", // long integer
-            regex : integer + "[lL]\\b"
-        }, {
-            token : "constant.numeric", // integer
-            regex : integer + "\\b"
-        }, {
-            token : function(value) {
-                if (keywords.hasOwnProperty(value))
-                    return "keyword";
-                else if (builtinConstants.hasOwnProperty(value))
-                    return "constant.language";
-                else if (futureReserved.hasOwnProperty(value))
-                    return "invalid.illegal";
-                else if (builtinFunctions.hasOwnProperty(value))
-                    return "support.function";
-                else if (value == "debugger")
-                    return "invalid.deprecated";
-                else
-                    return "identifier";
-            },
-            regex : "[a-zA-Z_$][a-zA-Z0-9_$]*\\b"
-        }, {
-            token : "keyword.operator",
-            regex : "\\+|\\-|\\*|\\*\\*|\\/|\\/\\/|%|<<|>>|&|\\||\\^|~|<|>|<=|=>|==|!=|<>|="
-        }, {
-            token : "lparen.paren",
-            regex : "[\\[\\(\\{]"
-        }, {
-            token : "paren.rparen",
-            regex : "[\\]\\)\\}]"
-        }, {
-            token : "text",
-            regex : "\\s+"
-        } ],
-        "qqstring" : [ {
-            token : "string", // multi line """ string end
-            regex : '(?:[^\\\\]|\\\\.)*?"{3}',
-            next : "start"
-        }, {
-            token : "string",
-            merge : true,
-            regex : '.+'
-        } ],
-        "qstring" : [ {
-            token : "string",  // multi line ''' string end
-            regex : "(?:[^\\\\]|\\\\.)*?'{3}",
-            next : "start"
-        }, {
-            token : "string",
-            merge : true,
-            regex : '.+'
-        } ]
-    };
-};
-
-oop.inherits(PythonHighlightRules, TextHighlightRules);
-
-exports.PythonHighlightRules = PythonHighlightRules;
-});
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/folding/pythonic', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/folding/fold_mode'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../../lib/oop");
-var BaseFoldMode = require("./fold_mode").FoldMode;
-
-var FoldMode = exports.FoldMode = function(markers) {
-    this.foldingStartMarker = new RegExp("(?:([\\[{])|(" + markers + "))(?:\\s*)(?:#.*)?$");
-};
-oop.inherits(FoldMode, BaseFoldMode);
-
-(function() {
-
-    this.getFoldWidgetRange = function(session, foldStyle, row) {
-        var line = session.getLine(row);
-        var match = line.match(this.foldingStartMarker);
-        if (match) {
-            if (match[1])
-                return this.openingBracketBlock(session, match[1], row, match.index);
-            if (match[2])
-                return this.indentationBlock(session, row, match.index + match[2].length);
-            return this.indentationBlock(session, row);
-        }
-    }
-
-}).call(FoldMode.prototype);
-
-});/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/folding/fold_mode', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
-"use strict";
-
-var Range = require("../../range").Range;
-
-var FoldMode = exports.FoldMode = function() {};
-
-(function() {
-
-    this.foldingStartMarker = null;
-    this.foldingStopMarker = null;
-
-    // must return "" if there's no fold, to enable caching
-    this.getFoldWidget = function(session, foldStyle, row) {
-        var line = session.getLine(row);
-        if (this.foldingStartMarker.test(line))
-            return "start";
-        if (foldStyle == "markbeginend"
-                && this.foldingStopMarker
-                && this.foldingStopMarker.test(line))
-            return "end";
-        return "";
-    };
-    
-    this.getFoldWidgetRange = function(session, foldStyle, row) {
-        return null;
-    };
-
-    this.indentationBlock = function(session, row, column) {
-        var re = /^\s*/;
-        var startRow = row;
-        var endRow = row;
-        var line = session.getLine(row);
-        var startColumn = column || line.length;
-        var startLevel = line.match(re)[0].length;
-        var maxRow = session.getLength()
-        
-        while (++row < maxRow) {
-            line = session.getLine(row);
-            var level = line.match(re)[0].length;
-
-            if (level == line.length)
-                continue;
-
-            if (level <= startLevel)
-                break;
-
-            endRow = row;
-        }
-
-        if (endRow > startRow) {
-            var endColumn = session.getLine(endRow).length;
-            return new Range(startRow, startColumn, endRow, endColumn);
-        }
-    };
-
-    this.openingBracketBlock = function(session, bracket, row, column) {
-        var start = {row: row, column: column + 1};
-        var end = session.$findClosingBracket(bracket, start);
-        if (!end)
-            return;
-
-        var fw = session.foldWidgets[end.row];
-        if (fw == null)
-            fw = this.getFoldWidget(session, end.row);
-
-        if (fw == "start") {
-            end.row --;
-            end.column = session.getLine(end.row).length;
-        }
-        return Range.fromPoints(start, end);
-    };
-
-}).call(FoldMode.prototype);
-
-});
diff --git a/apps/files_texteditor/js/aceeditor/mode-python.js b/apps/files_texteditor/js/aceeditor/mode-python.js
deleted file mode 100644
index 5401407f32..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-python.js
+++ /dev/null
@@ -1 +0,0 @@
-define("ace/mode/python",["require","exports","module","ace/lib/oop","ace/mode/text","ace/tokenizer","ace/mode/python_highlight_rules","ace/mode/folding/pythonic","ace/range"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text").Mode,f=a("../tokenizer").Tokenizer,g=a("./python_highlight_rules").PythonHighlightRules,h=a("./folding/pythonic").FoldMode,i=a("../range").Range,j=function(){this.$tokenizer=new f((new g).getRules()),this.foldingRules=new h("\\:")};d.inherits(j,e),function(){this.toggleCommentLines=function(a,b,c,d){var e=!0,f=/^(\s*)#/;for(var g=c;g<=d;g++)if(!f.test(b.getLine(g))){e=!1;break}if(e){var h=new i(0,0,0,0);for(var g=c;g<=d;g++){var j=b.getLine(g),k=j.match(f);h.start.row=g,h.end.row=g,h.end.column=k[0].length,b.replace(h,k[1])}}else b.indentRows(c,d,"#")},this.getNextLineIndent=function(a,b,c){var d=this.$getIndent(b),e=this.$tokenizer.getLineTokens(b,a),f=e.tokens;if(f.length&&f[f.length-1].type=="comment")return d;if(a=="start"){var g=b.match(/^.*[\{\(\[\:]\s*$/);g&&(d+=c)}return d};var a={pass:1,"return":1,raise:1,"break":1,"continue":1};this.checkOutdent=function(b,c,d){if(d!=="\r\n"&&d!=="\r"&&d!=="\n")return!1;var e=this.$tokenizer.getLineTokens(c.trim(),b).tokens;if(!e)return!1;do var f=e.pop();while(f&&(f.type=="comment"||f.type=="text"&&f.value.match(/^\s+$/)));return f?f.type=="keyword"&&a[f.value]:!1},this.autoOutdent=function(a,b,c){c+=1;var d=this.$getIndent(b.getLine(c)),e=b.getTabString();d.slice(-e.length)==e&&b.remove(new i(c,d.length-e.length,c,d.length))}}.call(j.prototype),b.Mode=j}),define("ace/mode/python_highlight_rules",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("../lib/lang"),f=a("./text_highlight_rules").TextHighlightRules,g=function(){var a=e.arrayToMap("and|as|assert|break|class|continue|def|del|elif|else|except|exec|finally|for|from|global|if|import|in|is|lambda|not|or|pass|print|raise|return|try|while|with|yield".split("|")),b=e.arrayToMap("True|False|None|NotImplemented|Ellipsis|__debug__".split("|")),c=e.arrayToMap("abs|divmod|input|open|staticmethod|all|enumerate|int|ord|str|any|eval|isinstance|pow|sum|basestring|execfile|issubclass|print|super|binfile|iter|property|tuple|bool|filter|len|range|type|bytearray|float|list|raw_input|unichr|callable|format|locals|reduce|unicode|chr|frozenset|long|reload|vars|classmethod|getattr|map|repr|xrange|cmp|globals|max|reversed|zip|compile|hasattr|memoryview|round|__import__|complex|hash|min|set|apply|delattr|help|next|setattr|buffer|dict|hex|object|slice|coerce|dir|id|oct|sorted|intern".split("|")),d=e.arrayToMap("".split("|")),f="(?:r|u|ur|R|U|UR|Ur|uR)?",g="(?:(?:[1-9]\\d*)|(?:0))",h="(?:0[oO]?[0-7]+)",i="(?:0[xX][\\dA-Fa-f]+)",j="(?:0[bB][01]+)",k="(?:"+g+"|"+h+"|"+i+"|"+j+")",l="(?:[eE][+-]?\\d+)",m="(?:\\.\\d+)",n="(?:\\d+)",o="(?:(?:"+n+"?"+m+")|(?:"+n+"\\.))",p="(?:(?:"+o+"|"+n+")"+l+")",q="(?:"+p+"|"+o+")";this.$rules={start:[{token:"comment",regex:"#.*$"},{token:"string",regex:f+'"{3}(?:[^\\\\]|\\\\.)*?"{3}'},{token:"string",merge:!0,regex:f+'"{3}.*$',next:"qqstring"},{token:"string",regex:f+'"(?:[^\\\\]|\\\\.)*?"'},{token:"string",regex:f+"'{3}(?:[^\\\\]|\\\\.)*?'{3}"},{token:"string",merge:!0,regex:f+"'{3}.*$",next:"qstring"},{token:"string",regex:f+"'(?:[^\\\\]|\\\\.)*?'"},{token:"constant.numeric",regex:"(?:"+q+"|\\d+)[jJ]\\b"},{token:"constant.numeric",regex:q},{token:"constant.numeric",regex:k+"[lL]\\b"},{token:"constant.numeric",regex:k+"\\b"},{token:function(e){return a.hasOwnProperty(e)?"keyword":b.hasOwnProperty(e)?"constant.language":d.hasOwnProperty(e)?"invalid.illegal":c.hasOwnProperty(e)?"support.function":e=="debugger"?"invalid.deprecated":"identifier"},regex:"[a-zA-Z_$][a-zA-Z0-9_$]*\\b"},{token:"keyword.operator",regex:"\\+|\\-|\\*|\\*\\*|\\/|\\/\\/|%|<<|>>|&|\\||\\^|~|<|>|<=|=>|==|!=|<>|="},{token:"lparen.paren",regex:"[\\[\\(\\{]"},{token:"paren.rparen",regex:"[\\]\\)\\}]"},{token:"text",regex:"\\s+"}],qqstring:[{token:"string",regex:'(?:[^\\\\]|\\\\.)*?"{3}',next:"start"},{token:"string",merge:!0,regex:".+"}],qstring:[{token:"string",regex:"(?:[^\\\\]|\\\\.)*?'{3}",next:"start"},{token:"string",merge:!0,regex:".+"}]}};d.inherits(g,f),b.PythonHighlightRules=g}),define("ace/mode/folding/pythonic",["require","exports","module","ace/lib/oop","ace/mode/folding/fold_mode"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("./fold_mode").FoldMode,f=b.FoldMode=function(a){this.foldingStartMarker=new RegExp("(?:([\\[{])|("+a+"))(?:\\s*)(?:#.*)?$")};d.inherits(f,e),function(){this.getFoldWidgetRange=function(a,b,c){var d=a.getLine(c),e=d.match(this.foldingStartMarker);if(e)return e[1]?this.openingBracketBlock(a,e[1],c,e.index):e[2]?this.indentationBlock(a,c,e.index+e[2].length):this.indentationBlock(a,c)}}.call(f.prototype)}),define("ace/mode/folding/fold_mode",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../../range").Range,e=b.FoldMode=function(){};(function(){this.foldingStartMarker=null,this.foldingStopMarker=null,this.getFoldWidget=function(a,b,c){var d=a.getLine(c);return this.foldingStartMarker.test(d)?"start":b=="markbeginend"&&this.foldingStopMarker&&this.foldingStopMarker.test(d)?"end":""},this.getFoldWidgetRange=function(a,b,c){return null},this.indentationBlock=function(a,b,c){var e=/^\s*/,f=b,g=b,h=a.getLine(b),i=c||h.length,j=h.match(e)[0].length,k=a.getLength();while(++b<k){h=a.getLine(b);var l=h.match(e)[0].length;if(l==h.length)continue;if(l<=j)break;g=b}if(g>f){var m=a.getLine(g).length;return new d(f,i,g,m)}},this.openingBracketBlock=function(a,b,c,e){var f={row:c,column:e+1},g=a.$findClosingBracket(b,f);if(!g)return;var h=a.foldWidgets[g.row];return h==null&&(h=this.getFoldWidget(a,g.row)),h=="start"&&(g.row--,g.column=a.getLine(g.row).length),d.fromPoints(f,g)}}).call(e.prototype)})
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/mode-ruby-uncompressed.js b/apps/files_texteditor/js/aceeditor/mode-ruby-uncompressed.js
deleted file mode 100644
index fa2e06a522..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-ruby-uncompressed.js
+++ /dev/null
@@ -1,391 +0,0 @@
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *      Shlomo Zalman Heigh <shlomozalmanheigh AT gmail DOT com>
- *
- * 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 ***** */
-
-define('ace/mode/ruby', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text', 'ace/tokenizer', 'ace/mode/ruby_highlight_rules', 'ace/mode/matching_brace_outdent', 'ace/range'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
-var RubyHighlightRules = require("./ruby_highlight_rules").RubyHighlightRules;
-var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
-var Range = require("../range").Range;
-
-var Mode = function() {
-    this.$tokenizer = new Tokenizer(new RubyHighlightRules().getRules());
-    this.$outdent = new MatchingBraceOutdent();
-};
-oop.inherits(Mode, TextMode);
-
-(function() {
-
-    this.toggleCommentLines = function(state, doc, startRow, endRow) {
-        var outdent = true;
-        var re = /^(\s*)#/;
-
-        for (var i=startRow; i<= endRow; i++) {
-            if (!re.test(doc.getLine(i))) {
-                outdent = false;
-                break;
-            }
-        }
-
-        if (outdent) {
-            var deleteRange = new Range(0, 0, 0, 0);
-            for (var i=startRow; i<= endRow; i++)
-            {
-                var line = doc.getLine(i);
-                var m = line.match(re);
-                deleteRange.start.row = i;
-                deleteRange.end.row = i;
-                deleteRange.end.column = m[0].length;
-                doc.replace(deleteRange, m[1]);
-            }
-        }
-        else {
-            doc.indentRows(startRow, endRow, "#");
-        }
-    };
-
-    this.getNextLineIndent = function(state, line, tab) {
-        var indent = this.$getIndent(line);
-
-        var tokenizedLine = this.$tokenizer.getLineTokens(line, state);
-        var tokens = tokenizedLine.tokens;
-
-        if (tokens.length && tokens[tokens.length-1].type == "comment") {
-            return indent;
-        }
-        
-        if (state == "start") {
-            var match = line.match(/^.*[\{\(\[]\s*$/);
-            if (match) {
-                indent += tab;
-            }
-        }
-
-        return indent;
-    };
-
-    this.checkOutdent = function(state, line, input) {
-        return this.$outdent.checkOutdent(line, input);
-    };
-
-    this.autoOutdent = function(state, doc, row) {
-        this.$outdent.autoOutdent(doc, row);
-    };
-
-}).call(Mode.prototype);
-
-exports.Mode = Mode;
-});
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *      Shlomo Zalman Heigh <shlomozalmanheigh AT gmail DOT com>
- *
- * 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 ***** */
-
-define('ace/mode/ruby_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/lang', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var lang = require("../lib/lang");
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-
-var RubyHighlightRules = function() {
-
-    var builtinFunctions = lang.arrayToMap(
-        ("abort|Array|assert|assert_equal|assert_not_equal|assert_same|assert_not_same|" +
-        "assert_nil|assert_not_nil|assert_match|assert_no_match|assert_in_delta|assert_throws|" + 
-        "assert_raise|assert_nothing_raised|assert_instance_of|assert_kind_of|assert_respond_to|" +
-        "assert_operator|assert_send|assert_difference|assert_no_difference|assert_recognizes|" +
-        "assert_generates|assert_response|assert_redirected_to|assert_template|assert_select|" +
-        "assert_select_email|assert_select_rjs|assert_select_encoded|css_select|at_exit|" +
-        "attr|attr_writer|attr_reader|attr_accessor|attr_accessible|autoload|binding|block_given?|callcc|" +
-        "caller|catch|chomp|chomp!|chop|chop!|defined?|delete_via_redirect|eval|exec|exit|" +
-        "exit!|fail|Float|flunk|follow_redirect!|fork|form_for|form_tag|format|gets|global_variables|gsub|" +
-        "gsub!|get_via_redirect|h|host!|https?|https!|include|Integer|lambda|link_to|" +
-        "link_to_unless_current|link_to_function|link_to_remote|load|local_variables|loop|open|open_session|" +
-        "p|print|printf|proc|putc|puts|post_via_redirect|put_via_redirect|raise|rand|" +
-        "raw|readline|readlines|redirect?|request_via_redirect|require|scan|select|" +
-        "set_trace_func|sleep|split|sprintf|srand|String|stylesheet_link_tag|syscall|system|sub|sub!|test|" +
-        "throw|trace_var|trap|untrace_var|atan2|cos|exp|frexp|ldexp|log|log10|sin|sqrt|tan|" +
-        "render|javascript_include_tag|csrf_meta_tag|label_tag|text_field_tag|submit_tag|check_box_tag|" +
-        "content_tag|radio_button_tag|text_area_tag|password_field_tag|hidden_field_tag|" +
-        "fields_for|select_tag|options_for_select|options_from_collection_for_select|collection_select|" +
-        "time_zone_select|select_date|select_time|select_datetime|date_select|time_select|datetime_select|" +
-        "select_year|select_month|select_day|select_hour|select_minute|select_second|file_field_tag|" +
-        "file_field|respond_to|skip_before_filter|around_filter|after_filter|verify|" +
-        "protect_from_forgery|rescue_from|helper_method|redirect_to|before_filter|" +
-        "send_data|send_file|validates_presence_of|validates_uniqueness_of|validates_length_of|" +
-        "validates_format_of|validates_acceptance_of|validates_associated|validates_exclusion_of|" +
-        "validates_inclusion_of|validates_numericality_of|validates_with|validates_each|" +
-        "authenticate_or_request_with_http_basic|authenticate_or_request_with_http_digest|" +
-        "filter_parameter_logging|match|get|post|resources|redirect|scope|assert_routing|" +
-        "translate|localize|extract_locale_from_tld|t|l|caches_page|expire_page|caches_action|expire_action|" +
-        "cache|expire_fragment|expire_cache_for|observe|cache_sweeper|" +
-        "has_many|has_one|belongs_to|has_and_belongs_to_many").split("|")
-    );
-
-    var keywords = lang.arrayToMap(
-        ("alias|and|BEGIN|begin|break|case|class|def|defined|do|else|elsif|END|end|ensure|" +
-        "__FILE__|finally|for|gem|if|in|__LINE__|module|next|not|or|private|protected|public|" + 
-        "redo|rescue|retry|return|super|then|undef|unless|until|when|while|yield").split("|")
-    );
-
-    var buildinConstants = lang.arrayToMap(
-        ("true|TRUE|false|FALSE|nil|NIL|ARGF|ARGV|DATA|ENV|RUBY_PLATFORM|RUBY_RELEASE_DATE|" +
-        "RUBY_VERSION|STDERR|STDIN|STDOUT|TOPLEVEL_BINDING").split("|")
-    );
-
-    var builtinVariables = lang.arrayToMap(
-        ("\$DEBUG|\$defout|\$FILENAME|\$LOAD_PATH|\$SAFE|\$stdin|\$stdout|\$stderr|\$VERBOSE|" +
-        "$!|root_url|flash|session|cookies|params|request|response|logger").split("|")
-    );
-
-    // regexp must not have capturing parentheses. Use (?:) instead.
-    // regexps are ordered -> the first match is used
-
-    this.$rules = {
-        "start" : [
-            {
-                token : "comment",
-                regex : "#.*$"
-            }, {
-                token : "comment", // multi line comment
-                merge : true,
-                regex : "^\=begin$",
-                next : "comment"
-            }, {
-                token : "string.regexp",
-                regex : "[/](?:(?:\\[(?:\\\\]|[^\\]])+\\])|(?:\\\\/|[^\\]/]))*[/]\\w*\\s*(?=[).,;]|$)"
-            }, {
-                token : "string", // single line
-                regex : '["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'
-            }, {
-                token : "string", // single line
-                regex : "['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"
-            }, {
-                token : "string", // backtick string
-                regex : "[`](?:(?:\\\\.)|(?:[^'\\\\]))*?[`]"
-            }, {
-                token : "text", // namespaces aren't symbols
-                regex : "::"
-            }, {
-                token : "variable.instancce", // instance variable
-                regex : "@{1,2}(?:[a-zA-Z_]|\d)+"
-            }, {
-                token : "variable.class", // class name
-                regex : "[A-Z](?:[a-zA-Z_]|\d)+"
-            }, {
-                token : "string", // symbol
-                regex : "[:](?:[A-Za-z_]|[@$](?=[a-zA-Z0-9_]))[a-zA-Z0-9_]*[!=?]?"
-           }, {
-                token : "constant.numeric", // hex
-                regex : "0[xX][0-9a-fA-F](?:[0-9a-fA-F]|_(?=[0-9a-fA-F]))*\\b"
-            }, {
-                token : "constant.numeric", // float
-                regex : "[+-]?\\d(?:\\d|_(?=\\d))*(?:(?:\\.\\d(?:\\d|_(?=\\d))*)?(?:[eE][+-]?\\d+)?)?\\b"
-            }, {
-                token : "constant.language.boolean",
-                regex : "(?:true|false)\\b"
-            }, {
-                token : function(value) {
-                    if (value == "self")
-                        return "variable.language";
-                    else if (keywords.hasOwnProperty(value))
-                        return "keyword";
-                    else if (buildinConstants.hasOwnProperty(value))
-                        return "constant.language";
-                    else if (builtinVariables.hasOwnProperty(value))
-                        return "variable.language";
-                    else if (builtinFunctions.hasOwnProperty(value))
-                        return "support.function";
-                    else if (value == "debugger")
-                        return "invalid.deprecated";
-                    else
-                        return "identifier";
-                },
-                // TODO: Unicode escape sequences
-                // TODO: Unicode identifiers
-                regex : "[a-zA-Z_$][a-zA-Z0-9_$]*\\b"
-            }, {
-                token : "keyword.operator",
-                regex : "!|\\$|%|&|\\*|\\-\\-|\\-|\\+\\+|\\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\\|\\||\\?\\:|\\*=|%=|\\+=|\\-=|&=|\\^=|\\b(?:in|instanceof|new|delete|typeof|void)"
-            }, {
-                token : "paren.lparen",
-                regex : "[[({]"
-            }, {
-                token : "paren.rparen",
-                regex : "[\\])}]"
-            }, {
-                token : "text",
-                regex : "\\s+"
-            }
-        ],
-        "comment" : [
-            {
-                token : "comment", // closing comment
-                regex : "^\=end$",
-                next : "start"
-            }, {
-                token : "comment", // comment spanning whole line
-                merge : true,
-                regex : ".+"
-            }
-        ]
-    };
-};
-
-oop.inherits(RubyHighlightRules, TextHighlightRules);
-
-exports.RubyHighlightRules = RubyHighlightRules;
-});
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/matching_brace_outdent', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
-"use strict";
-
-var Range = require("../range").Range;
-
-var MatchingBraceOutdent = function() {};
-
-(function() {
-
-    this.checkOutdent = function(line, input) {
-        if (! /^\s+$/.test(line))
-            return false;
-
-        return /^\s*\}/.test(input);
-    };
-
-    this.autoOutdent = function(doc, row) {
-        var line = doc.getLine(row);
-        var match = line.match(/^(\s*\})/);
-
-        if (!match) return 0;
-
-        var column = match[1].length;
-        var openBracePos = doc.findMatchingBracket({row: row, column: column});
-
-        if (!openBracePos || openBracePos.row == row) return 0;
-
-        var indent = this.$getIndent(doc.getLine(openBracePos.row));
-        doc.replace(new Range(row, 0, row, column-1), indent);
-    };
-
-    this.$getIndent = function(line) {
-        var match = line.match(/^(\s+)/);
-        if (match) {
-            return match[1];
-        }
-
-        return "";
-    };
-
-}).call(MatchingBraceOutdent.prototype);
-
-exports.MatchingBraceOutdent = MatchingBraceOutdent;
-});
diff --git a/apps/files_texteditor/js/aceeditor/mode-ruby.js b/apps/files_texteditor/js/aceeditor/mode-ruby.js
deleted file mode 100644
index 7b9df32177..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-ruby.js
+++ /dev/null
@@ -1 +0,0 @@
-define("ace/mode/ruby",["require","exports","module","ace/lib/oop","ace/mode/text","ace/tokenizer","ace/mode/ruby_highlight_rules","ace/mode/matching_brace_outdent","ace/range"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text").Mode,f=a("../tokenizer").Tokenizer,g=a("./ruby_highlight_rules").RubyHighlightRules,h=a("./matching_brace_outdent").MatchingBraceOutdent,i=a("../range").Range,j=function(){this.$tokenizer=new f((new g).getRules()),this.$outdent=new h};d.inherits(j,e),function(){this.toggleCommentLines=function(a,b,c,d){var e=!0,f=/^(\s*)#/;for(var g=c;g<=d;g++)if(!f.test(b.getLine(g))){e=!1;break}if(e){var h=new i(0,0,0,0);for(var g=c;g<=d;g++){var j=b.getLine(g),k=j.match(f);h.start.row=g,h.end.row=g,h.end.column=k[0].length,b.replace(h,k[1])}}else b.indentRows(c,d,"#")},this.getNextLineIndent=function(a,b,c){var d=this.$getIndent(b),e=this.$tokenizer.getLineTokens(b,a),f=e.tokens;if(f.length&&f[f.length-1].type=="comment")return d;if(a=="start"){var g=b.match(/^.*[\{\(\[]\s*$/);g&&(d+=c)}return d},this.checkOutdent=function(a,b,c){return this.$outdent.checkOutdent(b,c)},this.autoOutdent=function(a,b,c){this.$outdent.autoOutdent(b,c)}}.call(j.prototype),b.Mode=j}),define("ace/mode/ruby_highlight_rules",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("../lib/lang"),f=a("./text_highlight_rules").TextHighlightRules,g=function(){var a=e.arrayToMap("abort|Array|assert|assert_equal|assert_not_equal|assert_same|assert_not_same|assert_nil|assert_not_nil|assert_match|assert_no_match|assert_in_delta|assert_throws|assert_raise|assert_nothing_raised|assert_instance_of|assert_kind_of|assert_respond_to|assert_operator|assert_send|assert_difference|assert_no_difference|assert_recognizes|assert_generates|assert_response|assert_redirected_to|assert_template|assert_select|assert_select_email|assert_select_rjs|assert_select_encoded|css_select|at_exit|attr|attr_writer|attr_reader|attr_accessor|attr_accessible|autoload|binding|block_given?|callcc|caller|catch|chomp|chomp!|chop|chop!|defined?|delete_via_redirect|eval|exec|exit|exit!|fail|Float|flunk|follow_redirect!|fork|form_for|form_tag|format|gets|global_variables|gsub|gsub!|get_via_redirect|h|host!|https?|https!|include|Integer|lambda|link_to|link_to_unless_current|link_to_function|link_to_remote|load|local_variables|loop|open|open_session|p|print|printf|proc|putc|puts|post_via_redirect|put_via_redirect|raise|rand|raw|readline|readlines|redirect?|request_via_redirect|require|scan|select|set_trace_func|sleep|split|sprintf|srand|String|stylesheet_link_tag|syscall|system|sub|sub!|test|throw|trace_var|trap|untrace_var|atan2|cos|exp|frexp|ldexp|log|log10|sin|sqrt|tan|render|javascript_include_tag|csrf_meta_tag|label_tag|text_field_tag|submit_tag|check_box_tag|content_tag|radio_button_tag|text_area_tag|password_field_tag|hidden_field_tag|fields_for|select_tag|options_for_select|options_from_collection_for_select|collection_select|time_zone_select|select_date|select_time|select_datetime|date_select|time_select|datetime_select|select_year|select_month|select_day|select_hour|select_minute|select_second|file_field_tag|file_field|respond_to|skip_before_filter|around_filter|after_filter|verify|protect_from_forgery|rescue_from|helper_method|redirect_to|before_filter|send_data|send_file|validates_presence_of|validates_uniqueness_of|validates_length_of|validates_format_of|validates_acceptance_of|validates_associated|validates_exclusion_of|validates_inclusion_of|validates_numericality_of|validates_with|validates_each|authenticate_or_request_with_http_basic|authenticate_or_request_with_http_digest|filter_parameter_logging|match|get|post|resources|redirect|scope|assert_routing|translate|localize|extract_locale_from_tld|t|l|caches_page|expire_page|caches_action|expire_action|cache|expire_fragment|expire_cache_for|observe|cache_sweeper|has_many|has_one|belongs_to|has_and_belongs_to_many".split("|")),b=e.arrayToMap("alias|and|BEGIN|begin|break|case|class|def|defined|do|else|elsif|END|end|ensure|__FILE__|finally|for|gem|if|in|__LINE__|module|next|not|or|private|protected|public|redo|rescue|retry|return|super|then|undef|unless|until|when|while|yield".split("|")),c=e.arrayToMap("true|TRUE|false|FALSE|nil|NIL|ARGF|ARGV|DATA|ENV|RUBY_PLATFORM|RUBY_RELEASE_DATE|RUBY_VERSION|STDERR|STDIN|STDOUT|TOPLEVEL_BINDING".split("|")),d=e.arrayToMap("$DEBUG|$defout|$FILENAME|$LOAD_PATH|$SAFE|$stdin|$stdout|$stderr|$VERBOSE|$!|root_url|flash|session|cookies|params|request|response|logger".split("|"));this.$rules={start:[{token:"comment",regex:"#.*$"},{token:"comment",merge:!0,regex:"^=begin$",next:"comment"},{token:"string.regexp",regex:"[/](?:(?:\\[(?:\\\\]|[^\\]])+\\])|(?:\\\\/|[^\\]/]))*[/]\\w*\\s*(?=[).,;]|$)"},{token:"string",regex:'["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'},{token:"string",regex:"['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"},{token:"string",regex:"[`](?:(?:\\\\.)|(?:[^'\\\\]))*?[`]"},{token:"text",regex:"::"},{token:"variable.instancce",regex:"@{1,2}(?:[a-zA-Z_]|d)+"},{token:"variable.class",regex:"[A-Z](?:[a-zA-Z_]|d)+"},{token:"string",regex:"[:](?:[A-Za-z_]|[@$](?=[a-zA-Z0-9_]))[a-zA-Z0-9_]*[!=?]?"},{token:"constant.numeric",regex:"0[xX][0-9a-fA-F](?:[0-9a-fA-F]|_(?=[0-9a-fA-F]))*\\b"},{token:"constant.numeric",regex:"[+-]?\\d(?:\\d|_(?=\\d))*(?:(?:\\.\\d(?:\\d|_(?=\\d))*)?(?:[eE][+-]?\\d+)?)?\\b"},{token:"constant.language.boolean",regex:"(?:true|false)\\b"},{token:function(e){return e=="self"?"variable.language":b.hasOwnProperty(e)?"keyword":c.hasOwnProperty(e)?"constant.language":d.hasOwnProperty(e)?"variable.language":a.hasOwnProperty(e)?"support.function":e=="debugger"?"invalid.deprecated":"identifier"},regex:"[a-zA-Z_$][a-zA-Z0-9_$]*\\b"},{token:"keyword.operator",regex:"!|\\$|%|&|\\*|\\-\\-|\\-|\\+\\+|\\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\\|\\||\\?\\:|\\*=|%=|\\+=|\\-=|&=|\\^=|\\b(?:in|instanceof|new|delete|typeof|void)"},{token:"paren.lparen",regex:"[[({]"},{token:"paren.rparen",regex:"[\\])}]"},{token:"text",regex:"\\s+"}],comment:[{token:"comment",regex:"^=end$",next:"start"},{token:"comment",merge:!0,regex:".+"}]}};d.inherits(g,f),b.RubyHighlightRules=g}),define("ace/mode/matching_brace_outdent",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../range").Range,e=function(){};(function(){this.checkOutdent=function(a,b){return/^\s+$/.test(a)?/^\s*\}/.test(b):!1},this.autoOutdent=function(a,b){var c=a.getLine(b),e=c.match(/^(\s*\})/);if(!e)return 0;var f=e[1].length,g=a.findMatchingBracket({row:b,column:f});if(!g||g.row==b)return 0;var h=this.$getIndent(a.getLine(g.row));a.replace(new d(b,0,b,f-1),h)},this.$getIndent=function(a){var b=a.match(/^(\s+)/);return b?b[1]:""}}).call(e.prototype),b.MatchingBraceOutdent=e})
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/mode-scad-uncompressed.js b/apps/files_texteditor/js/aceeditor/mode-scad-uncompressed.js
deleted file mode 100644
index c944ed17e1..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-scad-uncompressed.js
+++ /dev/null
@@ -1,908 +0,0 @@
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *      Gastón Kleiman <gaston.kleiman AT gmail DOT com>
- *
- * 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 ***** */
-
-define('ace/mode/scad', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text', 'ace/tokenizer', 'ace/mode/scad_highlight_rules', 'ace/mode/matching_brace_outdent', 'ace/range', 'ace/mode/behaviour/cstyle', 'ace/mode/folding/cstyle'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
-var scadHighlightRules = require("./scad_highlight_rules").scadHighlightRules;
-var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
-var Range = require("../range").Range;
-var CstyleBehaviour = require("./behaviour/cstyle").CstyleBehaviour;
-var CStyleFoldMode = require("./folding/cstyle").FoldMode;
-
-var Mode = function() {
-    this.$tokenizer = new Tokenizer(new scadHighlightRules().getRules());
-    this.$outdent = new MatchingBraceOutdent();
-    this.$behaviour = new CstyleBehaviour();
-    this.foldingRules = new CStyleFoldMode();
-};
-oop.inherits(Mode, TextMode);
-
-(function() {
-
-    this.toggleCommentLines = function(state, doc, startRow, endRow) {
-        var outdent = true;
-        var re = /^(\s*)\/\//;
-
-        for (var i=startRow; i<= endRow; i++) {
-            if (!re.test(doc.getLine(i))) {
-                outdent = false;
-                break;
-            }
-        }
-
-        if (outdent) {
-            var deleteRange = new Range(0, 0, 0, 0);
-            for (var i=startRow; i<= endRow; i++)
-            {
-                var line = doc.getLine(i);
-                var m = line.match(re);
-                deleteRange.start.row = i;
-                deleteRange.end.row = i;
-                deleteRange.end.column = m[0].length;
-                doc.replace(deleteRange, m[1]);
-            }
-        }
-        else {
-            doc.indentRows(startRow, endRow, "//");
-        }
-    };
-
-    this.getNextLineIndent = function(state, line, tab) {
-        var indent = this.$getIndent(line);
-
-        var tokenizedLine = this.$tokenizer.getLineTokens(line, state);
-        var tokens = tokenizedLine.tokens;
-        var endState = tokenizedLine.state;
-
-        if (tokens.length && tokens[tokens.length-1].type == "comment") {
-            return indent;
-        }
-
-        if (state == "start") {
-            var match = line.match(/^.*[\{\(\[]\s*$/);
-            if (match) {
-                indent += tab;
-            }
-        } else if (state == "doc-start") {
-            if (endState == "start") {
-                return "";
-            }
-            var match = line.match(/^\s*(\/?)\*/);
-            if (match) {
-                if (match[1]) {
-                    indent += " ";
-                }
-                indent += "* ";
-            }
-        }
-
-        return indent;
-    };
-
-    this.checkOutdent = function(state, line, input) {
-        return this.$outdent.checkOutdent(line, input);
-    };
-
-    this.autoOutdent = function(state, doc, row) {
-        this.$outdent.autoOutdent(doc, row);
-    };
-
-}).call(Mode.prototype);
-
-exports.Mode = Mode;
-});
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *      Gastón Kleiman <gaston.kleiman AT gmail DOT com>
- *
- * Based on Bespin's C/C++ Syntax Plugin by Marc McIntyre.
- *
- * 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 ***** */
-
-define('ace/mode/scad_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/lang', 'ace/mode/doc_comment_highlight_rules', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var lang = require("../lib/lang");
-var DocCommentHighlightRules = require("./doc_comment_highlight_rules").DocCommentHighlightRules;
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-
-var scadHighlightRules = function() {
-
-    var keywords = lang.arrayToMap(
-        ("module|if|else|for").split("|")
-    );
-
-    var buildinConstants = lang.arrayToMap(
-        ("NULL").split("|")
-    );
-
-    // regexp must not have capturing parentheses. Use (?:) instead.
-    // regexps are ordered -> the first match is used
-
-    this.$rules = {
-        "start" : [
-            {
-                token : "comment",
-                regex : "\\/\\/.*$"
-            },
-            new DocCommentHighlightRules().getStartRule("start"),
-            {
-                token : "comment", // multi line comment
-                merge : true,
-                regex : "\\/\\*",
-                next : "comment"
-            }, {
-                token : "string", // single line
-                regex : '["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'
-            }, {
-                token : "string", // multi line string start
-                regex : '["].*\\\\$',
-                next : "qqstring"
-            }, {
-                token : "string", // single line
-                regex : "['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"
-            }, {
-                token : "string", // multi line string start
-                regex : "['].*\\\\$",
-                next : "qstring"
-            }, {
-                token : "constant.numeric", // hex
-                regex : "0[xX][0-9a-fA-F]+\\b"
-            }, {
-                token : "constant.numeric", // float
-                regex : "[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"
-            }, {
-              token : "constant", // <CONSTANT>
-              regex : "<[a-zA-Z0-9.]+>"
-            }, {
-              token : "keyword", // pre-compiler directivs
-              regex : "(?:use|include)"
-          }, {
-                token : function(value) {
-                    if (value == "this")
-                        return "variable.language";
-                    else if (keywords.hasOwnProperty(value))
-                        return "keyword";
-                    else if (buildinConstants.hasOwnProperty(value))
-                        return "constant.language";
-                    else
-                        return "identifier";
-                },
-                regex : "[a-zA-Z_$][a-zA-Z0-9_$]*\\b"
-            }, {
-                token : "keyword.operator",
-                regex : "!|\\$|%|&|\\*|\\-\\-|\\-|\\+\\+|\\+|~|==|=|!=|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\\|\\||\\?\\:|\\*=|%=|\\+=|\\-=|&=|\\^=|\\b(?:in|new|delete|typeof|void)"
-            }, {
-                token : "paren.lparen",
-                regex : "[[({]"
-            }, {
-                token : "paren.rparen",
-                regex : "[\\])}]"
-            }, {
-                token : "text",
-                regex : "\\s+"
-            }
-        ],
-        "comment" : [
-            {
-                token : "comment", // closing comment
-                regex : ".*?\\*\\/",
-                next : "start"
-            }, {
-                token : "comment", // comment spanning whole line
-                merge : true,
-                regex : ".+"
-            }
-        ],
-        "qqstring" : [
-            {
-                token : "string",
-                regex : '(?:(?:\\\\.)|(?:[^"\\\\]))*?"',
-                next : "start"
-            }, {
-                token : "string",
-                merge : true,
-                regex : '.+'
-            }
-        ],
-        "qstring" : [
-            {
-                token : "string",
-                regex : "(?:(?:\\\\.)|(?:[^'\\\\]))*?'",
-                next : "start"
-            }, {
-                token : "string",
-                merge : true,
-                regex : '.+'
-            }
-        ]
-    };
-    
-    this.embedRules(DocCommentHighlightRules, "doc-",
-        [ new DocCommentHighlightRules().getEndRule("start") ]);
-};
-
-oop.inherits(scadHighlightRules, TextHighlightRules);
-
-exports.scadHighlightRules = scadHighlightRules;
-});
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/doc_comment_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-
-var DocCommentHighlightRules = function() {
-
-    this.$rules = {
-        "start" : [ {
-            token : "comment.doc.tag",
-            regex : "@[\\w\\d_]+" // TODO: fix email addresses
-        }, {
-            token : "comment.doc",
-            merge : true,
-            regex : "\\s+"
-        }, {
-            token : "comment.doc",
-            merge : true,
-            regex : "TODO"
-        }, {
-            token : "comment.doc",
-            merge : true,
-            regex : "[^@\\*]+"
-        }, {
-            token : "comment.doc",
-            merge : true,
-            regex : "."
-        }]
-    };
-};
-
-oop.inherits(DocCommentHighlightRules, TextHighlightRules);
-
-(function() {
-
-    this.getStartRule = function(start) {
-        return {
-            token : "comment.doc", // doc comment
-            merge : true,
-            regex : "\\/\\*(?=\\*)",
-            next  : start
-        };
-    };
-    
-    this.getEndRule = function (start) {
-        return {
-            token : "comment.doc", // closing comment
-            merge : true,
-            regex : "\\*\\/",
-            next  : start
-        };
-    };
-
-}).call(DocCommentHighlightRules.prototype);
-
-exports.DocCommentHighlightRules = DocCommentHighlightRules;
-
-});
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/matching_brace_outdent', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
-"use strict";
-
-var Range = require("../range").Range;
-
-var MatchingBraceOutdent = function() {};
-
-(function() {
-
-    this.checkOutdent = function(line, input) {
-        if (! /^\s+$/.test(line))
-            return false;
-
-        return /^\s*\}/.test(input);
-    };
-
-    this.autoOutdent = function(doc, row) {
-        var line = doc.getLine(row);
-        var match = line.match(/^(\s*\})/);
-
-        if (!match) return 0;
-
-        var column = match[1].length;
-        var openBracePos = doc.findMatchingBracket({row: row, column: column});
-
-        if (!openBracePos || openBracePos.row == row) return 0;
-
-        var indent = this.$getIndent(doc.getLine(openBracePos.row));
-        doc.replace(new Range(row, 0, row, column-1), indent);
-    };
-
-    this.$getIndent = function(line) {
-        var match = line.match(/^(\s+)/);
-        if (match) {
-            return match[1];
-        }
-
-        return "";
-    };
-
-}).call(MatchingBraceOutdent.prototype);
-
-exports.MatchingBraceOutdent = MatchingBraceOutdent;
-});
-/* vim:ts=4:sts=4:sw=4:
- * ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Chris Spencer <chris.ag.spencer AT googlemail DOT com>
- *
- * 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 ***** */
-
-define('ace/mode/behaviour/cstyle', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/behaviour'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../../lib/oop");
-var Behaviour = require('../behaviour').Behaviour;
-
-var CstyleBehaviour = function () {
-
-    this.add("braces", "insertion", function (state, action, editor, session, text) {
-        if (text == '{') {
-            var selection = editor.getSelectionRange();
-            var selected = session.doc.getTextRange(selection);
-            if (selected !== "") {
-                return {
-                    text: '{' + selected + '}',
-                    selection: false
-                };
-            } else {
-                return {
-                    text: '{}',
-                    selection: [1, 1]
-                };
-            }
-        } else if (text == '}') {
-            var cursor = editor.getCursorPosition();
-            var line = session.doc.getLine(cursor.row);
-            var rightChar = line.substring(cursor.column, cursor.column + 1);
-            if (rightChar == '}') {
-                var matching = session.$findOpeningBracket('}', {column: cursor.column + 1, row: cursor.row});
-                if (matching !== null) {
-                    return {
-                        text: '',
-                        selection: [1, 1]
-                    };
-                }
-            }
-        } else if (text == "\n") {
-            var cursor = editor.getCursorPosition();
-            var line = session.doc.getLine(cursor.row);
-            var rightChar = line.substring(cursor.column, cursor.column + 1);
-            if (rightChar == '}') {
-                var openBracePos = session.findMatchingBracket({row: cursor.row, column: cursor.column + 1});
-                if (!openBracePos)
-                     return null;
-
-                var indent = this.getNextLineIndent(state, line.substring(0, line.length - 1), session.getTabString());
-                var next_indent = this.$getIndent(session.doc.getLine(openBracePos.row));
-
-                return {
-                    text: '\n' + indent + '\n' + next_indent,
-                    selection: [1, indent.length, 1, indent.length]
-                };
-            }
-        }
-    });
-
-    this.add("braces", "deletion", function (state, action, editor, session, range) {
-        var selected = session.doc.getTextRange(range);
-        if (!range.isMultiLine() && selected == '{') {
-            var line = session.doc.getLine(range.start.row);
-            var rightChar = line.substring(range.end.column, range.end.column + 1);
-            if (rightChar == '}') {
-                range.end.column++;
-                return range;
-            }
-        }
-    });
-
-    this.add("parens", "insertion", function (state, action, editor, session, text) {
-        if (text == '(') {
-            var selection = editor.getSelectionRange();
-            var selected = session.doc.getTextRange(selection);
-            if (selected !== "") {
-                return {
-                    text: '(' + selected + ')',
-                    selection: false
-                };
-            } else {
-                return {
-                    text: '()',
-                    selection: [1, 1]
-                };
-            }
-        } else if (text == ')') {
-            var cursor = editor.getCursorPosition();
-            var line = session.doc.getLine(cursor.row);
-            var rightChar = line.substring(cursor.column, cursor.column + 1);
-            if (rightChar == ')') {
-                var matching = session.$findOpeningBracket(')', {column: cursor.column + 1, row: cursor.row});
-                if (matching !== null) {
-                    return {
-                        text: '',
-                        selection: [1, 1]
-                    };
-                }
-            }
-        }
-    });
-
-    this.add("parens", "deletion", function (state, action, editor, session, range) {
-        var selected = session.doc.getTextRange(range);
-        if (!range.isMultiLine() && selected == '(') {
-            var line = session.doc.getLine(range.start.row);
-            var rightChar = line.substring(range.start.column + 1, range.start.column + 2);
-            if (rightChar == ')') {
-                range.end.column++;
-                return range;
-            }
-        }
-    });
-
-    this.add("string_dquotes", "insertion", function (state, action, editor, session, text) {
-        if (text == '"' || text == "'") {
-            var quote = text;
-            var selection = editor.getSelectionRange();
-            var selected = session.doc.getTextRange(selection);
-            if (selected !== "") {
-                return {
-                    text: quote + selected + quote,
-                    selection: false
-                };
-            } else {
-                var cursor = editor.getCursorPosition();
-                var line = session.doc.getLine(cursor.row);
-                var leftChar = line.substring(cursor.column-1, cursor.column);
-
-                // We're escaped.
-                if (leftChar == '\\') {
-                    return null;
-                }
-
-                // Find what token we're inside.
-                var tokens = session.getTokens(selection.start.row, selection.start.row)[0].tokens;
-                var col = 0, token;
-                var quotepos = -1; // Track whether we're inside an open quote.
-
-                for (var x = 0; x < tokens.length; x++) {
-                    token = tokens[x];
-                    if (token.type == "string") {
-                      quotepos = -1;
-                    } else if (quotepos < 0) {
-                      quotepos = token.value.indexOf(quote);
-                    }
-                    if ((token.value.length + col) > selection.start.column) {
-                        break;
-                    }
-                    col += tokens[x].value.length;
-                }
-
-                // Try and be smart about when we auto insert.
-                if (!token || (quotepos < 0 && token.type !== "comment" && (token.type !== "string" || ((selection.start.column !== token.value.length+col-1) && token.value.lastIndexOf(quote) === token.value.length-1)))) {
-                    return {
-                        text: quote + quote,
-                        selection: [1,1]
-                    };
-                } else if (token && token.type === "string") {
-                    // Ignore input and move right one if we're typing over the closing quote.
-                    var rightChar = line.substring(cursor.column, cursor.column + 1);
-                    if (rightChar == quote) {
-                        return {
-                            text: '',
-                            selection: [1, 1]
-                        };
-                    }
-                }
-            }
-        }
-    });
-
-    this.add("string_dquotes", "deletion", function (state, action, editor, session, range) {
-        var selected = session.doc.getTextRange(range);
-        if (!range.isMultiLine() && (selected == '"' || selected == "'")) {
-            var line = session.doc.getLine(range.start.row);
-            var rightChar = line.substring(range.start.column + 1, range.start.column + 2);
-            if (rightChar == '"') {
-                range.end.column++;
-                return range;
-            }
-        }
-    });
-
-};
-
-oop.inherits(CstyleBehaviour, Behaviour);
-
-exports.CstyleBehaviour = CstyleBehaviour;
-});/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/folding/cstyle', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/range', 'ace/mode/folding/fold_mode'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../../lib/oop");
-var Range = require("../../range").Range;
-var BaseFoldMode = require("./fold_mode").FoldMode;
-
-var FoldMode = exports.FoldMode = function() {};
-oop.inherits(FoldMode, BaseFoldMode);
-
-(function() {
-
-    this.foldingStartMarker = /(\{|\[)[^\}\]]*$|^\s*(\/\*)/;
-    this.foldingStopMarker = /^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/;
-    
-    this.getFoldWidgetRange = function(session, foldStyle, row) {
-        var line = session.getLine(row);
-        var match = line.match(this.foldingStartMarker);
-        if (match) {
-            var i = match.index;
-
-            if (match[1])
-                return this.openingBracketBlock(session, match[1], row, i);
-
-            var range = session.getCommentFoldRange(row, i + match[0].length);
-            range.end.column -= 2;
-            return range;
-        }
-
-        if (foldStyle !== "markbeginend")
-            return;
-            
-        var match = line.match(this.foldingStopMarker);
-        if (match) {
-            var i = match.index + match[0].length;
-
-            if (match[2]) {
-                var range = session.getCommentFoldRange(row, i);
-                range.end.column -= 2;
-                return range;
-            }
-
-            var end = {row: row, column: i};
-            var start = session.$findOpeningBracket(match[1], end);
-            
-            if (!start)
-                return;
-
-            start.column++;
-            end.column--;
-
-            return  Range.fromPoints(start, end);
-        }
-    };
-    
-}).call(FoldMode.prototype);
-
-});/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/folding/fold_mode', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
-"use strict";
-
-var Range = require("../../range").Range;
-
-var FoldMode = exports.FoldMode = function() {};
-
-(function() {
-
-    this.foldingStartMarker = null;
-    this.foldingStopMarker = null;
-
-    // must return "" if there's no fold, to enable caching
-    this.getFoldWidget = function(session, foldStyle, row) {
-        var line = session.getLine(row);
-        if (this.foldingStartMarker.test(line))
-            return "start";
-        if (foldStyle == "markbeginend"
-                && this.foldingStopMarker
-                && this.foldingStopMarker.test(line))
-            return "end";
-        return "";
-    };
-    
-    this.getFoldWidgetRange = function(session, foldStyle, row) {
-        return null;
-    };
-
-    this.indentationBlock = function(session, row, column) {
-        var re = /^\s*/;
-        var startRow = row;
-        var endRow = row;
-        var line = session.getLine(row);
-        var startColumn = column || line.length;
-        var startLevel = line.match(re)[0].length;
-        var maxRow = session.getLength()
-        
-        while (++row < maxRow) {
-            line = session.getLine(row);
-            var level = line.match(re)[0].length;
-
-            if (level == line.length)
-                continue;
-
-            if (level <= startLevel)
-                break;
-
-            endRow = row;
-        }
-
-        if (endRow > startRow) {
-            var endColumn = session.getLine(endRow).length;
-            return new Range(startRow, startColumn, endRow, endColumn);
-        }
-    };
-
-    this.openingBracketBlock = function(session, bracket, row, column) {
-        var start = {row: row, column: column + 1};
-        var end = session.$findClosingBracket(bracket, start);
-        if (!end)
-            return;
-
-        var fw = session.foldWidgets[end.row];
-        if (fw == null)
-            fw = this.getFoldWidget(session, end.row);
-
-        if (fw == "start") {
-            end.row --;
-            end.column = session.getLine(end.row).length;
-        }
-        return Range.fromPoints(start, end);
-    };
-
-}).call(FoldMode.prototype);
-
-});
diff --git a/apps/files_texteditor/js/aceeditor/mode-scad.js b/apps/files_texteditor/js/aceeditor/mode-scad.js
deleted file mode 100644
index eb324e4dc7..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-scad.js
+++ /dev/null
@@ -1 +0,0 @@
-define("ace/mode/scad",["require","exports","module","ace/lib/oop","ace/mode/text","ace/tokenizer","ace/mode/scad_highlight_rules","ace/mode/matching_brace_outdent","ace/range","ace/mode/behaviour/cstyle","ace/mode/folding/cstyle"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text").Mode,f=a("../tokenizer").Tokenizer,g=a("./scad_highlight_rules").scadHighlightRules,h=a("./matching_brace_outdent").MatchingBraceOutdent,i=a("../range").Range,j=a("./behaviour/cstyle").CstyleBehaviour,k=a("./folding/cstyle").FoldMode,l=function(){this.$tokenizer=new f((new g).getRules()),this.$outdent=new h,this.$behaviour=new j,this.foldingRules=new k};d.inherits(l,e),function(){this.toggleCommentLines=function(a,b,c,d){var e=!0,f=/^(\s*)\/\//;for(var g=c;g<=d;g++)if(!f.test(b.getLine(g))){e=!1;break}if(e){var h=new i(0,0,0,0);for(var g=c;g<=d;g++){var j=b.getLine(g),k=j.match(f);h.start.row=g,h.end.row=g,h.end.column=k[0].length,b.replace(h,k[1])}}else b.indentRows(c,d,"//")},this.getNextLineIndent=function(a,b,c){var d=this.$getIndent(b),e=this.$tokenizer.getLineTokens(b,a),f=e.tokens,g=e.state;if(f.length&&f[f.length-1].type=="comment")return d;if(a=="start"){var h=b.match(/^.*[\{\(\[]\s*$/);h&&(d+=c)}else if(a=="doc-start"){if(g=="start")return"";var h=b.match(/^\s*(\/?)\*/);h&&(h[1]&&(d+=" "),d+="* ")}return d},this.checkOutdent=function(a,b,c){return this.$outdent.checkOutdent(b,c)},this.autoOutdent=function(a,b,c){this.$outdent.autoOutdent(b,c)}}.call(l.prototype),b.Mode=l}),define("ace/mode/scad_highlight_rules",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/mode/doc_comment_highlight_rules","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("../lib/lang"),f=a("./doc_comment_highlight_rules").DocCommentHighlightRules,g=a("./text_highlight_rules").TextHighlightRules,h=function(){var a=e.arrayToMap("module|if|else|for".split("|")),b=e.arrayToMap("NULL".split("|"));this.$rules={start:[{token:"comment",regex:"\\/\\/.*$"},(new f).getStartRule("start"),{token:"comment",merge:!0,regex:"\\/\\*",next:"comment"},{token:"string",regex:'["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'},{token:"string",regex:'["].*\\\\$',next:"qqstring"},{token:"string",regex:"['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"},{token:"string",regex:"['].*\\\\$",next:"qstring"},{token:"constant.numeric",regex:"0[xX][0-9a-fA-F]+\\b"},{token:"constant.numeric",regex:"[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"},{token:"constant",regex:"<[a-zA-Z0-9.]+>"},{token:"keyword",regex:"(?:use|include)"},{token:function(c){return c=="this"?"variable.language":a.hasOwnProperty(c)?"keyword":b.hasOwnProperty(c)?"constant.language":"identifier"},regex:"[a-zA-Z_$][a-zA-Z0-9_$]*\\b"},{token:"keyword.operator",regex:"!|\\$|%|&|\\*|\\-\\-|\\-|\\+\\+|\\+|~|==|=|!=|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\\|\\||\\?\\:|\\*=|%=|\\+=|\\-=|&=|\\^=|\\b(?:in|new|delete|typeof|void)"},{token:"paren.lparen",regex:"[[({]"},{token:"paren.rparen",regex:"[\\])}]"},{token:"text",regex:"\\s+"}],comment:[{token:"comment",regex:".*?\\*\\/",next:"start"},{token:"comment",merge:!0,regex:".+"}],qqstring:[{token:"string",regex:'(?:(?:\\\\.)|(?:[^"\\\\]))*?"',next:"start"},{token:"string",merge:!0,regex:".+"}],qstring:[{token:"string",regex:"(?:(?:\\\\.)|(?:[^'\\\\]))*?'",next:"start"},{token:"string",merge:!0,regex:".+"}]},this.embedRules(f,"doc-",[(new f).getEndRule("start")])};d.inherits(h,g),b.scadHighlightRules=h}),define("ace/mode/doc_comment_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text_highlight_rules").TextHighlightRules,f=function(){this.$rules={start:[{token:"comment.doc.tag",regex:"@[\\w\\d_]+"},{token:"comment.doc",merge:!0,regex:"\\s+"},{token:"comment.doc",merge:!0,regex:"TODO"},{token:"comment.doc",merge:!0,regex:"[^@\\*]+"},{token:"comment.doc",merge:!0,regex:"."}]}};d.inherits(f,e),function(){this.getStartRule=function(a){return{token:"comment.doc",merge:!0,regex:"\\/\\*(?=\\*)",next:a}},this.getEndRule=function(a){return{token:"comment.doc",merge:!0,regex:"\\*\\/",next:a}}}.call(f.prototype),b.DocCommentHighlightRules=f}),define("ace/mode/matching_brace_outdent",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../range").Range,e=function(){};(function(){this.checkOutdent=function(a,b){return/^\s+$/.test(a)?/^\s*\}/.test(b):!1},this.autoOutdent=function(a,b){var c=a.getLine(b),e=c.match(/^(\s*\})/);if(!e)return 0;var f=e[1].length,g=a.findMatchingBracket({row:b,column:f});if(!g||g.row==b)return 0;var h=this.$getIndent(a.getLine(g.row));a.replace(new d(b,0,b,f-1),h)},this.$getIndent=function(a){var b=a.match(/^(\s+)/);return b?b[1]:""}}).call(e.prototype),b.MatchingBraceOutdent=e}),define("ace/mode/behaviour/cstyle",["require","exports","module","ace/lib/oop","ace/mode/behaviour"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../behaviour").Behaviour,f=function(){this.add("braces","insertion",function(a,b,c,d,e){if(e=="{"){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"{"+g+"}",selection:!1}:{text:"{}",selection:[1,1]}}if(e=="}"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var k=d.$findOpeningBracket("}",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}else if(e=="\n"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var l=d.findMatchingBracket({row:h.row,column:h.column+1});if(!l)return null;var m=this.getNextLineIndent(a,i.substring(0,i.length-1),d.getTabString()),n=this.$getIndent(d.doc.getLine(l.row));return{text:"\n"+m+"\n"+n,selection:[1,m.length,1,m.length]}}}}),this.add("braces","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="{"){var g=d.doc.getLine(e.start.row),h=g.substring(e.end.column,e.end.column+1);if(h=="}")return e.end.column++,e}}),this.add("parens","insertion",function(a,b,c,d,e){if(e=="("){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"("+g+")",selection:!1}:{text:"()",selection:[1,1]}}if(e==")"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j==")"){var k=d.$findOpeningBracket(")",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}}),this.add("parens","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="("){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h==")")return e.end.column++,e}}),this.add("string_dquotes","insertion",function(a,b,c,d,e){if(e=='"'||e=="'"){var f=e,g=c.getSelectionRange(),h=d.doc.getTextRange(g);if(h!=="")return{text:f+h+f,selection:!1};var i=c.getCursorPosition(),j=d.doc.getLine(i.row),k=j.substring(i.column-1,i.column);if(k=="\\")return null;var l=d.getTokens(g.start.row,g.start.row)[0].tokens,m=0,n,o=-1;for(var p=0;p<l.length;p++){n=l[p],n.type=="string"?o=-1:o<0&&(o=n.value.indexOf(f));if(n.value.length+m>g.start.column)break;m+=l[p].value.length}if(!n||o<0&&n.type!=="comment"&&(n.type!=="string"||g.start.column!==n.value.length+m-1&&n.value.lastIndexOf(f)===n.value.length-1))return{text:f+f,selection:[1,1]};if(n&&n.type==="string"){var q=j.substring(i.column,i.column+1);if(q==f)return{text:"",selection:[1,1]}}}}),this.add("string_dquotes","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&(f=='"'||f=="'")){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h=='"')return e.end.column++,e}})};d.inherits(f,e),b.CstyleBehaviour=f}),define("ace/mode/folding/cstyle",["require","exports","module","ace/lib/oop","ace/range","ace/mode/folding/fold_mode"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../../range").Range,f=a("./fold_mode").FoldMode,g=b.FoldMode=function(){};d.inherits(g,f),function(){this.foldingStartMarker=/(\{|\[)[^\}\]]*$|^\s*(\/\*)/,this.foldingStopMarker=/^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/,this.getFoldWidgetRange=function(a,b,c){var d=a.getLine(c),f=d.match(this.foldingStartMarker);if(f){var g=f.index;if(f[1])return this.openingBracketBlock(a,f[1],c,g);var h=a.getCommentFoldRange(c,g+f[0].length);return h.end.column-=2,h}if(b!=="markbeginend")return;var f=d.match(this.foldingStopMarker);if(f){var g=f.index+f[0].length;if(f[2]){var h=a.getCommentFoldRange(c,g);return h.end.column-=2,h}var i={row:c,column:g},j=a.$findOpeningBracket(f[1],i);if(!j)return;return j.column++,i.column--,e.fromPoints(j,i)}}}.call(g.prototype)}),define("ace/mode/folding/fold_mode",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../../range").Range,e=b.FoldMode=function(){};(function(){this.foldingStartMarker=null,this.foldingStopMarker=null,this.getFoldWidget=function(a,b,c){var d=a.getLine(c);return this.foldingStartMarker.test(d)?"start":b=="markbeginend"&&this.foldingStopMarker&&this.foldingStopMarker.test(d)?"end":""},this.getFoldWidgetRange=function(a,b,c){return null},this.indentationBlock=function(a,b,c){var e=/^\s*/,f=b,g=b,h=a.getLine(b),i=c||h.length,j=h.match(e)[0].length,k=a.getLength();while(++b<k){h=a.getLine(b);var l=h.match(e)[0].length;if(l==h.length)continue;if(l<=j)break;g=b}if(g>f){var m=a.getLine(g).length;return new d(f,i,g,m)}},this.openingBracketBlock=function(a,b,c,e){var f={row:c,column:e+1},g=a.$findClosingBracket(b,f);if(!g)return;var h=a.foldWidgets[g.row];return h==null&&(h=this.getFoldWidget(a,g.row)),h=="start"&&(g.row--,g.column=a.getLine(g.row).length),d.fromPoints(f,g)}}).call(e.prototype)})
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/mode-scala-uncompressed.js b/apps/files_texteditor/js/aceeditor/mode-scala-uncompressed.js
deleted file mode 100644
index fb6e95f6f6..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-scala-uncompressed.js
+++ /dev/null
@@ -1,1372 +0,0 @@
-define('ace/mode/scala', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/javascript', 'ace/tokenizer', 'ace/mode/scala_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var JavaScriptMode = require("./javascript").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
-var ScalaHighlightRules = require("./scala_highlight_rules").ScalaHighlightRules;
-
-var Mode = function() {
-    JavaScriptMode.call(this);
-    
-    this.$tokenizer = new Tokenizer(new ScalaHighlightRules().getRules());
-};
-oop.inherits(Mode, JavaScriptMode);
-
-(function() {
-
-    this.createWorker = function(session) {
-        return null;
-    };
-
-}).call(Mode.prototype);
-
-exports.Mode = Mode;
-});
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/javascript', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text', 'ace/tokenizer', 'ace/mode/javascript_highlight_rules', 'ace/mode/matching_brace_outdent', 'ace/range', 'ace/worker/worker_client', 'ace/mode/behaviour/cstyle', 'ace/mode/folding/cstyle'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
-var JavaScriptHighlightRules = require("./javascript_highlight_rules").JavaScriptHighlightRules;
-var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
-var Range = require("../range").Range;
-var WorkerClient = require("../worker/worker_client").WorkerClient;
-var CstyleBehaviour = require("./behaviour/cstyle").CstyleBehaviour;
-var CStyleFoldMode = require("./folding/cstyle").FoldMode;
-
-var Mode = function() {
-    this.$tokenizer = new Tokenizer(new JavaScriptHighlightRules().getRules());
-    this.$outdent = new MatchingBraceOutdent();
-    this.$behaviour = new CstyleBehaviour();
-    this.foldingRules = new CStyleFoldMode();
-};
-oop.inherits(Mode, TextMode);
-
-(function() {
-
-
-    this.toggleCommentLines = function(state, doc, startRow, endRow) {
-        var outdent = true;
-        var re = /^(\s*)\/\//;
-
-        for (var i=startRow; i<= endRow; i++) {
-            if (!re.test(doc.getLine(i))) {
-                outdent = false;
-                break;
-            }
-        }
-
-        if (outdent) {
-            var deleteRange = new Range(0, 0, 0, 0);
-            for (var i=startRow; i<= endRow; i++)
-            {
-                var line = doc.getLine(i);
-                var m = line.match(re);
-                deleteRange.start.row = i;
-                deleteRange.end.row = i;
-                deleteRange.end.column = m[0].length;
-                doc.replace(deleteRange, m[1]);
-            }
-        }
-        else {
-            doc.indentRows(startRow, endRow, "//");
-        }
-    };
-
-    this.getNextLineIndent = function(state, line, tab) {
-        var indent = this.$getIndent(line);
-
-        var tokenizedLine = this.$tokenizer.getLineTokens(line, state);
-        var tokens = tokenizedLine.tokens;
-        var endState = tokenizedLine.state;
-
-        if (tokens.length && tokens[tokens.length-1].type == "comment") {
-            return indent;
-        }
-        
-        if (state == "start" || state == "regex_allowed") {
-            var match = line.match(/^.*(?:\bcase\b.*\:|[\{\(\[])\s*$/);
-            if (match) {
-                indent += tab;
-            }
-        } else if (state == "doc-start") {
-            if (endState == "start" || state == "regex_allowed") {
-                return "";
-            }
-            var match = line.match(/^\s*(\/?)\*/);
-            if (match) {
-                if (match[1]) {
-                    indent += " ";
-                }
-                indent += "* ";
-            }
-        }
-
-        return indent;
-    };
-
-    this.checkOutdent = function(state, line, input) {
-        return this.$outdent.checkOutdent(line, input);
-    };
-
-    this.autoOutdent = function(state, doc, row) {
-        this.$outdent.autoOutdent(doc, row);
-    };
-    
-    this.createWorker = function(session) {
-        var worker = new WorkerClient(["ace"], "worker-javascript.js", "ace/mode/javascript_worker", "JavaScriptWorker");
-        worker.attachToDocument(session.getDocument());
-            
-        worker.on("jslint", function(results) {
-            var errors = [];
-            for (var i=0; i<results.data.length; i++) {
-                var error = results.data[i];
-                if (error)
-                    errors.push({
-                        row: error.line-1,
-                        column: error.character-1,
-                        text: error.reason,
-                        type: "warning",
-                        lint: error
-                    });
-            }
-            session.setAnnotations(errors);
-        });
-        
-        worker.on("narcissus", function(e) {
-            session.setAnnotations([e.data]);
-        });
-        
-        worker.on("terminate", function() {
-            session.clearAnnotations();
-        });
-        
-        return worker;
-    };
-
-}).call(Mode.prototype);
-
-exports.Mode = Mode;
-});
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *      Mihai Sucan <mihai DOT sucan AT gmail DOT com>
- *
- * 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 ***** */
-
-define('ace/mode/javascript_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/lang', 'ace/unicode', 'ace/mode/doc_comment_highlight_rules', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var lang = require("../lib/lang");
-var unicode = require("../unicode");
-var DocCommentHighlightRules = require("./doc_comment_highlight_rules").DocCommentHighlightRules;
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-
-var JavaScriptHighlightRules = function() {
-
-    // see: https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects
-    var globals = lang.arrayToMap(
-      // Constructors
-        ("Array|Boolean|Date|Function|Iterator|Number|Object|RegExp|String|Proxy|" +
-      // E4X
-         "Namespace|QName|XML|XMLList|" +
-         "ArrayBuffer|Float32Array|Float64Array|Int16Array|Int32Array|Int8Array|" +
-         "Uint16Array|Uint32Array|Uint8Array|Uint8ClampedArray|" +
-      // Errors
-        "Error|EvalError|InternalError|RangeError|ReferenceError|StopIteration|" +
-        "SyntaxError|TypeError|URIError|" +
-      //  Non-constructor functions
-        "decodeURI|decodeURIComponent|encodeURI|encodeURIComponent|eval|isFinite|" +
-        "isNaN|parseFloat|parseInt|" +
-      // Other
-        "JSON|Math|" +
-      // Pseudo
-        "this|arguments|prototype|window|document"
-      ).split("|")
-    );
-
-    var keywords = lang.arrayToMap(
-        ("break|case|catch|continue|default|delete|do|else|finally|for|function|" +
-        "if|in|instanceof|new|return|switch|throw|try|typeof|let|var|while|with|" +
-        "const|yield|import|get|set").split("|")
-    );
-
-    // keywords which can be followed by regular expressions
-    var kwBeforeRe = "case|do|else|finally|in|instanceof|return|throw|try|typeof|yield";
-
-    var deprecated = lang.arrayToMap(
-        ("__parent__|__count__|escape|unescape|with|__proto__").split("|")
-    );
-
-    var definitions = lang.arrayToMap(("const|let|var|function").split("|"));
-
-    var buildinConstants = lang.arrayToMap(
-        ("null|Infinity|NaN|undefined").split("|")
-    );
-
-    var futureReserved = lang.arrayToMap(
-        ("class|enum|extends|super|export|implements|private|" +
-        "public|interface|package|protected|static").split("|")
-    );
-
-    // TODO: Unicode escape sequences
-    var identifierRe = "[" + unicode.packages.L + "\\$_]["
-        + unicode.packages.L
-        + unicode.packages.Mn + unicode.packages.Mc
-        + unicode.packages.Nd
-        + unicode.packages.Pc + "\\$_]*\\b";
-
-    var escapedRe = "\\\\(?:x[0-9a-fA-F]{2}|" + // hex
-        "u[0-9a-fA-F]{4}|" + // unicode
-        "[0-2][0-7]{0,2}|" + // oct
-        "3[0-6][0-7]?|" + // oct
-        "37[0-7]?|" + // oct
-        "[4-7][0-7]?|" + //oct
-        ".)";
-
-    // regexp must not have capturing parentheses. Use (?:) instead.
-    // regexps are ordered -> the first match is used
-
-    this.$rules = {
-        "start" : [
-            {
-                token : "comment",
-                regex : /\/\/.*$/
-            },
-            new DocCommentHighlightRules().getStartRule("doc-start"),
-            {
-                token : "comment", // multi line comment
-                merge : true,
-                regex : /\/\*/,
-                next : "comment"
-            }, {
-                token : "string",
-                regex : "'",
-                next  : "qstring"
-            }, {
-                token : "string",
-                regex : '"',
-                next  : "qqstring"
-            }, {
-                token : "constant.numeric", // hex
-                regex : /0[xX][0-9a-fA-F]+\b/
-            }, {
-                token : "constant.numeric", // float
-                regex : /[+-]?\d+(?:(?:\.\d*)?(?:[eE][+-]?\d+)?)?\b/
-            }, { // match stuff like: Sound.prototype.play = function() { }
-                token : [
-                    "storage.type",
-                    "punctuation.operator",
-                    "support.function",
-                    "punctuation.operator",
-                    "entity.name.function",
-                    "text",
-                    "keyword.operator",
-                    "text",
-                    "storage.type",
-                    "text",
-                    "paren.lparen",
-                    "variable.parameter",
-                    "paren.rparen"
-                ],
-                regex : "(" + identifierRe + ")(\\.)(prototype)(\\.)(" + identifierRe +")(\\s*)(=)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"
-            }, { // match stuff like: Sound.prototype.play = myfunc
-                token : [
-                    "storage.type",
-                    "punctuation.operator",
-                    "support.function",
-                    "punctuation.operator",
-                    "entity.name.function",
-                    "text",
-                    "keyword.operator",
-                    "text"
-                ],
-                regex : "(" + identifierRe + ")(\\.)(prototype)(\\.)(" + identifierRe +")(\\s*)(=)(\\s*)"
-            }, { // match stuff like: Sound.play = function() {  }
-                token : [
-                    "storage.type",
-                    "punctuation.operator",
-                    "entity.name.function",
-                    "text",
-                    "keyword.operator",
-                    "text",
-                    "storage.type",
-                    "text",
-                    "paren.lparen",
-                    "variable.parameter",
-                    "paren.rparen"
-                ],
-                regex : "(" + identifierRe + ")(\\.)(" + identifierRe +")(\\s*)(=)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"
-            }, { // match stuff like: play = function() {  }
-                token : [
-                    "entity.name.function",
-                    "text",
-                    "keyword.operator",
-                    "text",
-                    "storage.type",
-                    "text",
-                    "paren.lparen",
-                    "variable.parameter",
-                    "paren.rparen"
-                ],
-                regex : "(" + identifierRe +")(\\s*)(=)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"
-            }, { // match regular function like: function myFunc(arg) { }
-                token : [
-                    "storage.type",
-                    "text",
-                    "entity.name.function",
-                    "text",
-                    "paren.lparen",
-                    "variable.parameter",
-                    "paren.rparen"
-                ],
-                regex : "(function)(\\s+)(" + identifierRe + ")(\\s*)(\\()(.*?)(\\))"
-            }, { // match stuff like: foobar: function() { }
-                token : [
-                    "entity.name.function",
-                    "text",
-                    "punctuation.operator",
-                    "text",
-                    "storage.type",
-                    "text",
-                    "paren.lparen",
-                    "variable.parameter",
-                    "paren.rparen"
-                ],
-                regex : "(" + identifierRe + ")(\\s*)(:)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"
-            }, { // Attempt to match : function() { } (this is for issues with 'foo': function() { })
-                token : [
-                    "text",
-                    "text",
-                    "storage.type",
-                    "text",
-                    "paren.lparen",
-                    "variable.parameter",
-                    "paren.rparen"
-                ],
-                regex : "(:)(\\s*)(function)?(\\s*)(\\()([^)]*)(\\))"
-            }, {
-                token : "constant.language.boolean",
-                regex : /(?:true|false)\b/
-            }, {
-                token : "keyword",
-                regex : "(?:" + kwBeforeRe + ")\\b",
-                next : "regex_allowed"
-            }, {
-                token : ["punctuation.operator", "support.function"],
-                regex : /(\.)(s(?:h(?:ift|ow(?:Mod(?:elessDialog|alDialog)|Help))|croll(?:X|By(?:Pages|Lines)?|Y|To)?|t(?:opzzzz|rike)|i(?:n|zeToContent|debar|gnText)|ort|u(?:p|b(?:str(?:ing)?)?)|pli(?:ce|t)|e(?:nd|t(?:Re(?:sizable|questHeader)|M(?:i(?:nutes|lliseconds)|onth)|Seconds|Ho(?:tKeys|urs)|Year|Cursor|Time(?:out)?|Interval|ZOptions|Date|UTC(?:M(?:i(?:nutes|lliseconds)|onth)|Seconds|Hours|Date|FullYear)|FullYear|Active)|arch)|qrt|lice|avePreferences|mall)|h(?:ome|andleEvent)|navigate|c(?:har(?:CodeAt|At)|o(?:s|n(?:cat|textual|firm)|mpile)|eil|lear(?:Timeout|Interval)?|a(?:ptureEvents|ll)|reate(?:StyleSheet|Popup|EventObject))|t(?:o(?:GMTString|S(?:tring|ource)|U(?:TCString|pperCase)|Lo(?:caleString|werCase))|est|a(?:n|int(?:Enabled)?))|i(?:s(?:NaN|Finite)|ndexOf|talics)|d(?:isableExternalCapture|ump|etachEvent)|u(?:n(?:shift|taint|escape|watch)|pdateCommands)|j(?:oin|avaEnabled)|p(?:o(?:p|w)|ush|lugins.refresh|a(?:ddings|rse(?:Int|Float)?)|r(?:int|ompt|eference))|e(?:scape|nableExternalCapture|val|lementFromPoint|x(?:p|ec(?:Script|Command)?))|valueOf|UTC|queryCommand(?:State|Indeterm|Enabled|Value)|f(?:i(?:nd|le(?:ModifiedDate|Size|CreatedDate|UpdatedDate)|xed)|o(?:nt(?:size|color)|rward)|loor|romCharCode)|watch|l(?:ink|o(?:ad|g)|astIndexOf)|a(?:sin|nchor|cos|t(?:tachEvent|ob|an(?:2)?)|pply|lert|b(?:s|ort))|r(?:ou(?:nd|teEvents)|e(?:size(?:By|To)|calc|turnValue|place|verse|l(?:oad|ease(?:Capture|Events)))|andom)|g(?:o|et(?:ResponseHeader|M(?:i(?:nutes|lliseconds)|onth)|Se(?:conds|lection)|Hours|Year|Time(?:zoneOffset)?|Da(?:y|te)|UTC(?:M(?:i(?:nutes|lliseconds)|onth)|Seconds|Hours|Da(?:y|te)|FullYear)|FullYear|A(?:ttention|llResponseHeaders)))|m(?:in|ove(?:B(?:y|elow)|To(?:Absolute)?|Above)|ergeAttributes|a(?:tch|rgins|x))|b(?:toa|ig|o(?:ld|rderWidths)|link|ack))\b(?=\()/
-            }, {
-                token : ["punctuation.operator", "support.function.dom"],
-                regex : /(\.)(s(?:ub(?:stringData|mit)|plitText|e(?:t(?:NamedItem|Attribute(?:Node)?)|lect))|has(?:ChildNodes|Feature)|namedItem|c(?:l(?:ick|o(?:se|neNode))|reate(?:C(?:omment|DATASection|aption)|T(?:Head|extNode|Foot)|DocumentFragment|ProcessingInstruction|E(?:ntityReference|lement)|Attribute))|tabIndex|i(?:nsert(?:Row|Before|Cell|Data)|tem)|open|delete(?:Row|C(?:ell|aption)|T(?:Head|Foot)|Data)|focus|write(?:ln)?|a(?:dd|ppend(?:Child|Data))|re(?:set|place(?:Child|Data)|move(?:NamedItem|Child|Attribute(?:Node)?)?)|get(?:NamedItem|Element(?:sBy(?:Name|TagName)|ById)|Attribute(?:Node)?)|blur)\b(?=\()/
-            }, {
-                token : ["punctuation.operator", "support.constant"],
-                regex : /(\.)(s(?:ystemLanguage|cr(?:ipts|ollbars|een(?:X|Y|Top|Left))|t(?:yle(?:Sheets)?|atus(?:Text|bar)?)|ibling(?:Below|Above)|ource|uffixes|e(?:curity(?:Policy)?|l(?:ection|f)))|h(?:istory|ost(?:name)?|as(?:h|Focus))|y|X(?:MLDocument|SLDocument)|n(?:ext|ame(?:space(?:s|URI)|Prop))|M(?:IN_VALUE|AX_VALUE)|c(?:haracterSet|o(?:n(?:structor|trollers)|okieEnabled|lorDepth|mp(?:onents|lete))|urrent|puClass|l(?:i(?:p(?:boardData)?|entInformation)|osed|asses)|alle(?:e|r)|rypto)|t(?:o(?:olbar|p)|ext(?:Transform|Indent|Decoration|Align)|ags)|SQRT(?:1_2|2)|i(?:n(?:ner(?:Height|Width)|put)|ds|gnoreCase)|zIndex|o(?:scpu|n(?:readystatechange|Line)|uter(?:Height|Width)|p(?:sProfile|ener)|ffscreenBuffering)|NEGATIVE_INFINITY|d(?:i(?:splay|alog(?:Height|Top|Width|Left|Arguments)|rectories)|e(?:scription|fault(?:Status|Ch(?:ecked|arset)|View)))|u(?:ser(?:Profile|Language|Agent)|n(?:iqueID|defined)|pdateInterval)|_content|p(?:ixelDepth|ort|ersonalbar|kcs11|l(?:ugins|atform)|a(?:thname|dding(?:Right|Bottom|Top|Left)|rent(?:Window|Layer)?|ge(?:X(?:Offset)?|Y(?:Offset)?))|r(?:o(?:to(?:col|type)|duct(?:Sub)?|mpter)|e(?:vious|fix)))|e(?:n(?:coding|abledPlugin)|x(?:ternal|pando)|mbeds)|v(?:isibility|endor(?:Sub)?|Linkcolor)|URLUnencoded|P(?:I|OSITIVE_INFINITY)|f(?:ilename|o(?:nt(?:Size|Family|Weight)|rmName)|rame(?:s|Element)|gColor)|E|whiteSpace|l(?:i(?:stStyleType|n(?:eHeight|kColor))|o(?:ca(?:tion(?:bar)?|lName)|wsrc)|e(?:ngth|ft(?:Context)?)|a(?:st(?:M(?:odified|atch)|Index|Paren)|yer(?:s|X)|nguage))|a(?:pp(?:MinorVersion|Name|Co(?:deName|re)|Version)|vail(?:Height|Top|Width|Left)|ll|r(?:ity|guments)|Linkcolor|bove)|r(?:ight(?:Context)?|e(?:sponse(?:XML|Text)|adyState))|global|x|m(?:imeTypes|ultiline|enubar|argin(?:Right|Bottom|Top|Left))|L(?:N(?:10|2)|OG(?:10E|2E))|b(?:o(?:ttom|rder(?:Width|RightWidth|BottomWidth|Style|Color|TopWidth|LeftWidth))|ufferDepth|elow|ackground(?:Color|Image)))\b/
-            }, {
-                token : ["storage.type", "punctuation.operator", "support.function.firebug"],
-                regex : /(console)(\.)(warn|info|log|error|time|timeEnd|assert)\b/
-            }, {
-                token : function(value) {
-                    if (globals.hasOwnProperty(value))
-                        return "variable.language";
-                    else if (deprecated.hasOwnProperty(value))
-                        return "invalid.deprecated";
-                    else if (definitions.hasOwnProperty(value))
-                        return "storage.type";
-                    else if (keywords.hasOwnProperty(value))
-                        return "keyword";
-                    else if (buildinConstants.hasOwnProperty(value))
-                        return "constant.language";
-                    else if (futureReserved.hasOwnProperty(value))
-                        return "invalid.illegal";
-                    else if (value == "debugger")
-                        return "invalid.deprecated";
-                    else
-                        return "identifier";
-                },
-                regex : identifierRe
-            }, {
-                token : "keyword.operator",
-                regex : /!|\$|%|&|\*|\-\-|\-|\+\+|\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\|\||\?\:|\*=|%=|\+=|\-=|&=|\^=|\b(?:in|instanceof|new|delete|typeof|void)/,
-                next  : "regex_allowed"
-            }, {
-                token : "punctuation.operator",
-                regex : /\?|\:|\,|\;|\./,
-                next  : "regex_allowed"
-            }, {
-                token : "paren.lparen",
-                regex : /[\[({]/,
-                next  : "regex_allowed"
-            }, {
-                token : "paren.rparen",
-                regex : /[\])}]/
-            }, {
-                token : "keyword.operator",
-                regex : /\/=?/,
-                next  : "regex_allowed"
-            }, {
-                token: "comment",
-                regex: /^#!.*$/
-            }, {
-                token : "text",
-                regex : /\s+/
-            }
-        ],
-        // regular expressions are only allowed after certain tokens. This
-        // makes sure we don't mix up regexps with the divison operator
-        "regex_allowed": [
-            {
-                token : "comment", // multi line comment
-                merge : true,
-                regex : "\\/\\*",
-                next : "comment_regex_allowed"
-            }, {
-                token : "comment",
-                regex : "\\/\\/.*$"
-            }, {
-                token: "string.regexp",
-                regex: "\\/",
-                next: "regex",
-                merge: true
-            }, {
-                token : "text",
-                regex : "\\s+"
-            }, {
-                // immediately return to the start mode without matching
-                // anything
-                token: "empty",
-                regex: "",
-                next: "start"
-            }
-        ],
-        "regex": [
-            {
-                token: "regexp.keyword.operator",
-                regex: "\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)",
-                next: "regex"
-            }, {
-				// flag
-                token: "string.regexp",
-                regex: "/\\w*",
-                next: "start",
-                merge: true
-            }, {
-                token: "string.regexp",
-                regex: "[^\\\\/\\[]+",
-                next: "regex",
-                merge: true
-            }, {
-                token: "string.regexp.charachterclass",
-                regex: "\\[",
-                next: "regex_character_class",
-                merge: true
-            }, {
-                token: "empty",
-                regex: "",
-                next: "start"
-            }
-        ],
-        "regex_character_class": [
-            {
-                token: "regexp.keyword.operator",
-                regex: "\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)",
-                next: "regex_character_class"
-            }, {
-                token: "string.regexp.charachterclass",
-                regex: "]",
-                next: "regex",
-                merge: true
-            }, {
-                token: "string.regexp.charachterclass",
-                regex: "[^\\\\\\]]+",
-                next: "regex_character_class",
-                merge: true
-            }, {
-                token: "empty",
-                regex: "",
-                next: "start"
-            }
-        ],
-        "comment_regex_allowed" : [
-            {
-                token : "comment", // closing comment
-                regex : ".*?\\*\\/",
-                merge : true,
-                next : "regex_allowed"
-            }, {
-                token : "comment", // comment spanning whole line
-                merge : true,
-                regex : ".+"
-            }
-        ],
-        "comment" : [
-            {
-                token : "comment", // closing comment
-                regex : ".*?\\*\\/",
-                merge : true,
-                next : "start"
-            }, {
-                token : "comment", // comment spanning whole line
-                merge : true,
-                regex : ".+"
-            }
-        ],
-        "qqstring" : [
-            {
-                token : "constant.language.escape",
-                regex : escapedRe
-            }, {
-                token : "string",
-                regex : '[^"\\\\]+'
-            }, {
-                token : "string",
-                regex : '"',
-                next  : "start"
-            }
-        ],
-        "qstring" : [
-            {
-                token : "constant.language.escape",
-                regex : escapedRe
-            }, {
-                token : "string",
-                regex : "[^'\\\\]+"
-            }, {
-                token : "string",
-                regex : "'",
-                next  : "start"
-            }
-        ]
-    };
-
-    this.embedRules(DocCommentHighlightRules, "doc-",
-        [ new DocCommentHighlightRules().getEndRule("start") ]);
-};
-
-oop.inherits(JavaScriptHighlightRules, TextHighlightRules);
-
-exports.JavaScriptHighlightRules = JavaScriptHighlightRules;
-});
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/doc_comment_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-
-var DocCommentHighlightRules = function() {
-
-    this.$rules = {
-        "start" : [ {
-            token : "comment.doc.tag",
-            regex : "@[\\w\\d_]+" // TODO: fix email addresses
-        }, {
-            token : "comment.doc",
-            merge : true,
-            regex : "\\s+"
-        }, {
-            token : "comment.doc",
-            merge : true,
-            regex : "TODO"
-        }, {
-            token : "comment.doc",
-            merge : true,
-            regex : "[^@\\*]+"
-        }, {
-            token : "comment.doc",
-            merge : true,
-            regex : "."
-        }]
-    };
-};
-
-oop.inherits(DocCommentHighlightRules, TextHighlightRules);
-
-(function() {
-
-    this.getStartRule = function(start) {
-        return {
-            token : "comment.doc", // doc comment
-            merge : true,
-            regex : "\\/\\*(?=\\*)",
-            next  : start
-        };
-    };
-    
-    this.getEndRule = function (start) {
-        return {
-            token : "comment.doc", // closing comment
-            merge : true,
-            regex : "\\*\\/",
-            next  : start
-        };
-    };
-
-}).call(DocCommentHighlightRules.prototype);
-
-exports.DocCommentHighlightRules = DocCommentHighlightRules;
-
-});
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/matching_brace_outdent', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
-"use strict";
-
-var Range = require("../range").Range;
-
-var MatchingBraceOutdent = function() {};
-
-(function() {
-
-    this.checkOutdent = function(line, input) {
-        if (! /^\s+$/.test(line))
-            return false;
-
-        return /^\s*\}/.test(input);
-    };
-
-    this.autoOutdent = function(doc, row) {
-        var line = doc.getLine(row);
-        var match = line.match(/^(\s*\})/);
-
-        if (!match) return 0;
-
-        var column = match[1].length;
-        var openBracePos = doc.findMatchingBracket({row: row, column: column});
-
-        if (!openBracePos || openBracePos.row == row) return 0;
-
-        var indent = this.$getIndent(doc.getLine(openBracePos.row));
-        doc.replace(new Range(row, 0, row, column-1), indent);
-    };
-
-    this.$getIndent = function(line) {
-        var match = line.match(/^(\s+)/);
-        if (match) {
-            return match[1];
-        }
-
-        return "";
-    };
-
-}).call(MatchingBraceOutdent.prototype);
-
-exports.MatchingBraceOutdent = MatchingBraceOutdent;
-});
-/* vim:ts=4:sts=4:sw=4:
- * ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Chris Spencer <chris.ag.spencer AT googlemail DOT com>
- *
- * 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 ***** */
-
-define('ace/mode/behaviour/cstyle', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/behaviour'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../../lib/oop");
-var Behaviour = require('../behaviour').Behaviour;
-
-var CstyleBehaviour = function () {
-
-    this.add("braces", "insertion", function (state, action, editor, session, text) {
-        if (text == '{') {
-            var selection = editor.getSelectionRange();
-            var selected = session.doc.getTextRange(selection);
-            if (selected !== "") {
-                return {
-                    text: '{' + selected + '}',
-                    selection: false
-                };
-            } else {
-                return {
-                    text: '{}',
-                    selection: [1, 1]
-                };
-            }
-        } else if (text == '}') {
-            var cursor = editor.getCursorPosition();
-            var line = session.doc.getLine(cursor.row);
-            var rightChar = line.substring(cursor.column, cursor.column + 1);
-            if (rightChar == '}') {
-                var matching = session.$findOpeningBracket('}', {column: cursor.column + 1, row: cursor.row});
-                if (matching !== null) {
-                    return {
-                        text: '',
-                        selection: [1, 1]
-                    };
-                }
-            }
-        } else if (text == "\n") {
-            var cursor = editor.getCursorPosition();
-            var line = session.doc.getLine(cursor.row);
-            var rightChar = line.substring(cursor.column, cursor.column + 1);
-            if (rightChar == '}') {
-                var openBracePos = session.findMatchingBracket({row: cursor.row, column: cursor.column + 1});
-                if (!openBracePos)
-                     return null;
-
-                var indent = this.getNextLineIndent(state, line.substring(0, line.length - 1), session.getTabString());
-                var next_indent = this.$getIndent(session.doc.getLine(openBracePos.row));
-
-                return {
-                    text: '\n' + indent + '\n' + next_indent,
-                    selection: [1, indent.length, 1, indent.length]
-                };
-            }
-        }
-    });
-
-    this.add("braces", "deletion", function (state, action, editor, session, range) {
-        var selected = session.doc.getTextRange(range);
-        if (!range.isMultiLine() && selected == '{') {
-            var line = session.doc.getLine(range.start.row);
-            var rightChar = line.substring(range.end.column, range.end.column + 1);
-            if (rightChar == '}') {
-                range.end.column++;
-                return range;
-            }
-        }
-    });
-
-    this.add("parens", "insertion", function (state, action, editor, session, text) {
-        if (text == '(') {
-            var selection = editor.getSelectionRange();
-            var selected = session.doc.getTextRange(selection);
-            if (selected !== "") {
-                return {
-                    text: '(' + selected + ')',
-                    selection: false
-                };
-            } else {
-                return {
-                    text: '()',
-                    selection: [1, 1]
-                };
-            }
-        } else if (text == ')') {
-            var cursor = editor.getCursorPosition();
-            var line = session.doc.getLine(cursor.row);
-            var rightChar = line.substring(cursor.column, cursor.column + 1);
-            if (rightChar == ')') {
-                var matching = session.$findOpeningBracket(')', {column: cursor.column + 1, row: cursor.row});
-                if (matching !== null) {
-                    return {
-                        text: '',
-                        selection: [1, 1]
-                    };
-                }
-            }
-        }
-    });
-
-    this.add("parens", "deletion", function (state, action, editor, session, range) {
-        var selected = session.doc.getTextRange(range);
-        if (!range.isMultiLine() && selected == '(') {
-            var line = session.doc.getLine(range.start.row);
-            var rightChar = line.substring(range.start.column + 1, range.start.column + 2);
-            if (rightChar == ')') {
-                range.end.column++;
-                return range;
-            }
-        }
-    });
-
-    this.add("string_dquotes", "insertion", function (state, action, editor, session, text) {
-        if (text == '"' || text == "'") {
-            var quote = text;
-            var selection = editor.getSelectionRange();
-            var selected = session.doc.getTextRange(selection);
-            if (selected !== "") {
-                return {
-                    text: quote + selected + quote,
-                    selection: false
-                };
-            } else {
-                var cursor = editor.getCursorPosition();
-                var line = session.doc.getLine(cursor.row);
-                var leftChar = line.substring(cursor.column-1, cursor.column);
-
-                // We're escaped.
-                if (leftChar == '\\') {
-                    return null;
-                }
-
-                // Find what token we're inside.
-                var tokens = session.getTokens(selection.start.row, selection.start.row)[0].tokens;
-                var col = 0, token;
-                var quotepos = -1; // Track whether we're inside an open quote.
-
-                for (var x = 0; x < tokens.length; x++) {
-                    token = tokens[x];
-                    if (token.type == "string") {
-                      quotepos = -1;
-                    } else if (quotepos < 0) {
-                      quotepos = token.value.indexOf(quote);
-                    }
-                    if ((token.value.length + col) > selection.start.column) {
-                        break;
-                    }
-                    col += tokens[x].value.length;
-                }
-
-                // Try and be smart about when we auto insert.
-                if (!token || (quotepos < 0 && token.type !== "comment" && (token.type !== "string" || ((selection.start.column !== token.value.length+col-1) && token.value.lastIndexOf(quote) === token.value.length-1)))) {
-                    return {
-                        text: quote + quote,
-                        selection: [1,1]
-                    };
-                } else if (token && token.type === "string") {
-                    // Ignore input and move right one if we're typing over the closing quote.
-                    var rightChar = line.substring(cursor.column, cursor.column + 1);
-                    if (rightChar == quote) {
-                        return {
-                            text: '',
-                            selection: [1, 1]
-                        };
-                    }
-                }
-            }
-        }
-    });
-
-    this.add("string_dquotes", "deletion", function (state, action, editor, session, range) {
-        var selected = session.doc.getTextRange(range);
-        if (!range.isMultiLine() && (selected == '"' || selected == "'")) {
-            var line = session.doc.getLine(range.start.row);
-            var rightChar = line.substring(range.start.column + 1, range.start.column + 2);
-            if (rightChar == '"') {
-                range.end.column++;
-                return range;
-            }
-        }
-    });
-
-};
-
-oop.inherits(CstyleBehaviour, Behaviour);
-
-exports.CstyleBehaviour = CstyleBehaviour;
-});/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/folding/cstyle', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/range', 'ace/mode/folding/fold_mode'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../../lib/oop");
-var Range = require("../../range").Range;
-var BaseFoldMode = require("./fold_mode").FoldMode;
-
-var FoldMode = exports.FoldMode = function() {};
-oop.inherits(FoldMode, BaseFoldMode);
-
-(function() {
-
-    this.foldingStartMarker = /(\{|\[)[^\}\]]*$|^\s*(\/\*)/;
-    this.foldingStopMarker = /^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/;
-    
-    this.getFoldWidgetRange = function(session, foldStyle, row) {
-        var line = session.getLine(row);
-        var match = line.match(this.foldingStartMarker);
-        if (match) {
-            var i = match.index;
-
-            if (match[1])
-                return this.openingBracketBlock(session, match[1], row, i);
-
-            var range = session.getCommentFoldRange(row, i + match[0].length);
-            range.end.column -= 2;
-            return range;
-        }
-
-        if (foldStyle !== "markbeginend")
-            return;
-            
-        var match = line.match(this.foldingStopMarker);
-        if (match) {
-            var i = match.index + match[0].length;
-
-            if (match[2]) {
-                var range = session.getCommentFoldRange(row, i);
-                range.end.column -= 2;
-                return range;
-            }
-
-            var end = {row: row, column: i};
-            var start = session.$findOpeningBracket(match[1], end);
-            
-            if (!start)
-                return;
-
-            start.column++;
-            end.column--;
-
-            return  Range.fromPoints(start, end);
-        }
-    };
-    
-}).call(FoldMode.prototype);
-
-});/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/folding/fold_mode', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
-"use strict";
-
-var Range = require("../../range").Range;
-
-var FoldMode = exports.FoldMode = function() {};
-
-(function() {
-
-    this.foldingStartMarker = null;
-    this.foldingStopMarker = null;
-
-    // must return "" if there's no fold, to enable caching
-    this.getFoldWidget = function(session, foldStyle, row) {
-        var line = session.getLine(row);
-        if (this.foldingStartMarker.test(line))
-            return "start";
-        if (foldStyle == "markbeginend"
-                && this.foldingStopMarker
-                && this.foldingStopMarker.test(line))
-            return "end";
-        return "";
-    };
-    
-    this.getFoldWidgetRange = function(session, foldStyle, row) {
-        return null;
-    };
-
-    this.indentationBlock = function(session, row, column) {
-        var re = /^\s*/;
-        var startRow = row;
-        var endRow = row;
-        var line = session.getLine(row);
-        var startColumn = column || line.length;
-        var startLevel = line.match(re)[0].length;
-        var maxRow = session.getLength()
-        
-        while (++row < maxRow) {
-            line = session.getLine(row);
-            var level = line.match(re)[0].length;
-
-            if (level == line.length)
-                continue;
-
-            if (level <= startLevel)
-                break;
-
-            endRow = row;
-        }
-
-        if (endRow > startRow) {
-            var endColumn = session.getLine(endRow).length;
-            return new Range(startRow, startColumn, endRow, endColumn);
-        }
-    };
-
-    this.openingBracketBlock = function(session, bracket, row, column) {
-        var start = {row: row, column: column + 1};
-        var end = session.$findClosingBracket(bracket, start);
-        if (!end)
-            return;
-
-        var fw = session.foldWidgets[end.row];
-        if (fw == null)
-            fw = this.getFoldWidget(session, end.row);
-
-        if (fw == "start") {
-            end.row --;
-            end.column = session.getLine(end.row).length;
-        }
-        return Range.fromPoints(start, end);
-    };
-
-}).call(FoldMode.prototype);
-
-});
-define('ace/mode/scala_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/lang', 'ace/mode/doc_comment_highlight_rules', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var lang = require("../lib/lang");
-var DocCommentHighlightRules = require("./doc_comment_highlight_rules").DocCommentHighlightRules;
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-
-var ScalaHighlightRules = function() {
-
-    // taken from http://download.oracle.com/javase/tutorial/java/nutsandbolts/_keywords.html
-    var keywords = lang.arrayToMap(
-        (
-            "case|default|do|else|for|if|match|while|throw|return|try|catch|finally|yield|" +
-            "abstract|class|def|extends|final|forSome|implicit|implicits|import|lazy|new|object|" +
-            "override|package|private|protected|sealed|super|this|trait|type|val|var|with"
-        ).split("|")
-    );
-
-    var buildinConstants = lang.arrayToMap(
-        ("true|false").split("|")
-    );
-    
-    var langClasses = lang.arrayToMap(
-        ("AbstractMethodError|AssertionError|ClassCircularityError|"+
-        "ClassFormatError|Deprecated|EnumConstantNotPresentException|"+
-        "ExceptionInInitializerError|IllegalAccessError|"+
-        "IllegalThreadStateException|InstantiationError|InternalError|"+
-
-        "NegativeArraySizeException|NoSuchFieldError|Override|Process|"+
-        "ProcessBuilder|SecurityManager|StringIndexOutOfBoundsException|"+
-        "SuppressWarnings|TypeNotPresentException|UnknownError|"+
-        "UnsatisfiedLinkError|UnsupportedClassVersionError|VerifyError|"+
-        "InstantiationException|IndexOutOfBoundsException|"+
-        "ArrayIndexOutOfBoundsException|CloneNotSupportedException|"+
-        "NoSuchFieldException|IllegalArgumentException|NumberFormatException|"+
-        "SecurityException|Void|InheritableThreadLocal|IllegalStateException|"+
-        "InterruptedException|NoSuchMethodException|IllegalAccessException|"+
-        "UnsupportedOperationException|Enum|StrictMath|Package|Compiler|"+
-        "Readable|Runtime|StringBuilder|Math|IncompatibleClassChangeError|"+
-        "NoSuchMethodError|ThreadLocal|RuntimePermission|ArithmeticException|"+
-        "NullPointerException|Long|Integer|Short|Byte|Double|Number|Float|"+
-        "Character|Boolean|StackTraceElement|Appendable|StringBuffer|"+
-        "Iterable|ThreadGroup|Runnable|Thread|IllegalMonitorStateException|"+
-        "StackOverflowError|OutOfMemoryError|VirtualMachineError|"+
-        "ArrayStoreException|ClassCastException|LinkageError|"+
-        "NoClassDefFoundError|ClassNotFoundException|RuntimeException|"+
-        "Exception|ThreadDeath|Error|Throwable|System|ClassLoader|"+
-        "Cloneable|Class|CharSequence|Comparable|String|Object|" +
-        "Unit|Any|AnyVal|AnyRef|Null|ScalaObject|Singleton|Seq|Iterable|List|" +
-        "Option|Array|Char|Byte|Short|Int|Long|Nothing"
-        
-        ).split("|")
-    );
-    
-    var importClasses = lang.arrayToMap(
-        ("").split("|")
-    );
-    // regexp must not have capturing parentheses. Use (?:) instead.
-    // regexps are ordered -> the first match is used
-
-    this.$rules = {
-        "start" : [
-            {
-                token : "comment",
-                regex : "\\/\\/.*$"
-            },
-            new DocCommentHighlightRules().getStartRule("doc-start"),
-            {
-                token : "comment", // multi line comment
-                merge : true,
-                regex : "\\/\\*",
-                next : "comment"
-            }, {
-                token : "string.regexp",
-                regex : "[/](?:(?:\\[(?:\\\\]|[^\\]])+\\])|(?:\\\\/|[^\\]/]))*[/]\\w*\\s*(?=[).,;]|$)"
-            }, {
-                token : "string", // single line
-                regex : '["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'
-            }, {
-                token : "string", // single line
-                regex : "['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"
-            }, {
-                token : "constant.numeric", // hex
-                regex : "0[xX][0-9a-fA-F]+\\b"
-            }, {
-                token : "constant.numeric", // float
-                regex : "[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"
-            }, {
-                token : "constant.language.boolean",
-                regex : "(?:true|false)\\b"
-            }, {
-                token : function(value) {
-                    if (value == "this")
-                        return "variable.language";
-                    else if (keywords.hasOwnProperty(value))
-                        return "keyword";
-                    else if (langClasses.hasOwnProperty(value))
-                        return "support.function";
-                    else if (importClasses.hasOwnProperty(value))
-                        return "support.function";
-                    else if (buildinConstants.hasOwnProperty(value))
-                        return "constant.language";
-                    else
-                        return "identifier";
-                },
-                // TODO: Unicode escape sequences
-                // TODO: Unicode identifiers
-                regex : "[a-zA-Z_$][a-zA-Z0-9_$]*\\b"
-            }, {
-                token : "keyword.operator",
-                regex : "!|\\$|%|&|\\*|\\-\\-|\\-|\\+\\+|\\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\\|\\||\\?\\:|\\*=|%=|\\+=|\\-=|&=|\\^=|\\b(?:in|instanceof|new|delete|typeof|void)"
-            }, {
-                token : "paren.lparen",
-                regex : "[[({]"
-            }, {
-                token : "paren.rparen",
-                regex : "[\\])}]"
-            }, {
-                token : "text",
-                regex : "\\s+"
-            }
-        ],
-        "comment" : [
-            {
-                token : "comment", // closing comment
-                regex : ".*?\\*\\/",
-                next : "start"
-            }, {
-                token : "comment", // comment spanning whole line
-                merge : true,
-                regex : ".+"
-            }
-        ]
-    };
-    
-    this.embedRules(DocCommentHighlightRules, "doc-",
-        [ new DocCommentHighlightRules().getEndRule("start") ]);
-};
-
-oop.inherits(ScalaHighlightRules, TextHighlightRules);
-
-exports.ScalaHighlightRules = ScalaHighlightRules;
-});
diff --git a/apps/files_texteditor/js/aceeditor/mode-scala.js b/apps/files_texteditor/js/aceeditor/mode-scala.js
deleted file mode 100644
index e0ba4b537d..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-scala.js
+++ /dev/null
@@ -1 +0,0 @@
-define("ace/mode/scala",["require","exports","module","ace/lib/oop","ace/mode/javascript","ace/tokenizer","ace/mode/scala_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./javascript").Mode,f=a("../tokenizer").Tokenizer,g=a("./scala_highlight_rules").ScalaHighlightRules,h=function(){e.call(this),this.$tokenizer=new f((new g).getRules())};d.inherits(h,e),function(){this.createWorker=function(a){return null}}.call(h.prototype),b.Mode=h}),define("ace/mode/javascript",["require","exports","module","ace/lib/oop","ace/mode/text","ace/tokenizer","ace/mode/javascript_highlight_rules","ace/mode/matching_brace_outdent","ace/range","ace/worker/worker_client","ace/mode/behaviour/cstyle","ace/mode/folding/cstyle"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text").Mode,f=a("../tokenizer").Tokenizer,g=a("./javascript_highlight_rules").JavaScriptHighlightRules,h=a("./matching_brace_outdent").MatchingBraceOutdent,i=a("../range").Range,j=a("../worker/worker_client").WorkerClient,k=a("./behaviour/cstyle").CstyleBehaviour,l=a("./folding/cstyle").FoldMode,m=function(){this.$tokenizer=new f((new g).getRules()),this.$outdent=new h,this.$behaviour=new k,this.foldingRules=new l};d.inherits(m,e),function(){this.toggleCommentLines=function(a,b,c,d){var e=!0,f=/^(\s*)\/\//;for(var g=c;g<=d;g++)if(!f.test(b.getLine(g))){e=!1;break}if(e){var h=new i(0,0,0,0);for(var g=c;g<=d;g++){var j=b.getLine(g),k=j.match(f);h.start.row=g,h.end.row=g,h.end.column=k[0].length,b.replace(h,k[1])}}else b.indentRows(c,d,"//")},this.getNextLineIndent=function(a,b,c){var d=this.$getIndent(b),e=this.$tokenizer.getLineTokens(b,a),f=e.tokens,g=e.state;if(f.length&&f[f.length-1].type=="comment")return d;if(a=="start"||a=="regex_allowed"){var h=b.match(/^.*(?:\bcase\b.*\:|[\{\(\[])\s*$/);h&&(d+=c)}else if(a=="doc-start"){if(g=="start"||a=="regex_allowed")return"";var h=b.match(/^\s*(\/?)\*/);h&&(h[1]&&(d+=" "),d+="* ")}return d},this.checkOutdent=function(a,b,c){return this.$outdent.checkOutdent(b,c)},this.autoOutdent=function(a,b,c){this.$outdent.autoOutdent(b,c)},this.createWorker=function(a){var b=new j(["ace"],"worker-javascript.js","ace/mode/javascript_worker","JavaScriptWorker");return b.attachToDocument(a.getDocument()),b.on("jslint",function(b){var c=[];for(var d=0;d<b.data.length;d++){var e=b.data[d];e&&c.push({row:e.line-1,column:e.character-1,text:e.reason,type:"warning",lint:e})}a.setAnnotations(c)}),b.on("narcissus",function(b){a.setAnnotations([b.data])}),b.on("terminate",function(){a.clearAnnotations()}),b}}.call(m.prototype),b.Mode=m}),define("ace/mode/javascript_highlight_rules",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/unicode","ace/mode/doc_comment_highlight_rules","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("../lib/lang"),f=a("../unicode"),g=a("./doc_comment_highlight_rules").DocCommentHighlightRules,h=a("./text_highlight_rules").TextHighlightRules,i=function(){var a=e.arrayToMap("Array|Boolean|Date|Function|Iterator|Number|Object|RegExp|String|Proxy|Namespace|QName|XML|XMLList|ArrayBuffer|Float32Array|Float64Array|Int16Array|Int32Array|Int8Array|Uint16Array|Uint32Array|Uint8Array|Uint8ClampedArray|Error|EvalError|InternalError|RangeError|ReferenceError|StopIteration|SyntaxError|TypeError|URIError|decodeURI|decodeURIComponent|encodeURI|encodeURIComponent|eval|isFinite|isNaN|parseFloat|parseInt|JSON|Math|this|arguments|prototype|window|document".split("|")),b=e.arrayToMap("break|case|catch|continue|default|delete|do|else|finally|for|function|if|in|instanceof|new|return|switch|throw|try|typeof|let|var|while|with|const|yield|import|get|set".split("|")),c="case|do|else|finally|in|instanceof|return|throw|try|typeof|yield",d=e.arrayToMap("__parent__|__count__|escape|unescape|with|__proto__".split("|")),h=e.arrayToMap("const|let|var|function".split("|")),i=e.arrayToMap("null|Infinity|NaN|undefined".split("|")),j=e.arrayToMap("class|enum|extends|super|export|implements|private|public|interface|package|protected|static".split("|")),k="["+f.packages.L+"\\$_]["+f.packages.L+f.packages.Mn+f.packages.Mc+f.packages.Nd+f.packages.Pc+"\\$_]*\\b",l="\\\\(?:x[0-9a-fA-F]{2}|u[0-9a-fA-F]{4}|[0-2][0-7]{0,2}|3[0-6][0-7]?|37[0-7]?|[4-7][0-7]?|.)";this.$rules={start:[{token:"comment",regex:/\/\/.*$/},(new g).getStartRule("doc-start"),{token:"comment",merge:!0,regex:/\/\*/,next:"comment"},{token:"string",regex:"'",next:"qstring"},{token:"string",regex:'"',next:"qqstring"},{token:"constant.numeric",regex:/0[xX][0-9a-fA-F]+\b/},{token:"constant.numeric",regex:/[+-]?\d+(?:(?:\.\d*)?(?:[eE][+-]?\d+)?)?\b/},{token:["storage.type","punctuation.operator","support.function","punctuation.operator","entity.name.function","text","keyword.operator","text","storage.type","text","paren.lparen","variable.parameter","paren.rparen"],regex:"("+k+")(\\.)(prototype)(\\.)("+k+")(\\s*)(=)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"},{token:["storage.type","punctuation.operator","support.function","punctuation.operator","entity.name.function","text","keyword.operator","text"],regex:"("+k+")(\\.)(prototype)(\\.)("+k+")(\\s*)(=)(\\s*)"},{token:["storage.type","punctuation.operator","entity.name.function","text","keyword.operator","text","storage.type","text","paren.lparen","variable.parameter","paren.rparen"],regex:"("+k+")(\\.)("+k+")(\\s*)(=)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"},{token:["entity.name.function","text","keyword.operator","text","storage.type","text","paren.lparen","variable.parameter","paren.rparen"],regex:"("+k+")(\\s*)(=)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"},{token:["storage.type","text","entity.name.function","text","paren.lparen","variable.parameter","paren.rparen"],regex:"(function)(\\s+)("+k+")(\\s*)(\\()(.*?)(\\))"},{token:["entity.name.function","text","punctuation.operator","text","storage.type","text","paren.lparen","variable.parameter","paren.rparen"],regex:"("+k+")(\\s*)(:)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"},{token:["text","text","storage.type","text","paren.lparen","variable.parameter","paren.rparen"],regex:"(:)(\\s*)(function)?(\\s*)(\\()([^)]*)(\\))"},{token:"constant.language.boolean",regex:/(?:true|false)\b/},{token:"keyword",regex:"(?:"+c+")\\b",next:"regex_allowed"},{token:["punctuation.operator","support.function"],regex:/(\.)(s(?:h(?:ift|ow(?:Mod(?:elessDialog|alDialog)|Help))|croll(?:X|By(?:Pages|Lines)?|Y|To)?|t(?:opzzzz|rike)|i(?:n|zeToContent|debar|gnText)|ort|u(?:p|b(?:str(?:ing)?)?)|pli(?:ce|t)|e(?:nd|t(?:Re(?:sizable|questHeader)|M(?:i(?:nutes|lliseconds)|onth)|Seconds|Ho(?:tKeys|urs)|Year|Cursor|Time(?:out)?|Interval|ZOptions|Date|UTC(?:M(?:i(?:nutes|lliseconds)|onth)|Seconds|Hours|Date|FullYear)|FullYear|Active)|arch)|qrt|lice|avePreferences|mall)|h(?:ome|andleEvent)|navigate|c(?:har(?:CodeAt|At)|o(?:s|n(?:cat|textual|firm)|mpile)|eil|lear(?:Timeout|Interval)?|a(?:ptureEvents|ll)|reate(?:StyleSheet|Popup|EventObject))|t(?:o(?:GMTString|S(?:tring|ource)|U(?:TCString|pperCase)|Lo(?:caleString|werCase))|est|a(?:n|int(?:Enabled)?))|i(?:s(?:NaN|Finite)|ndexOf|talics)|d(?:isableExternalCapture|ump|etachEvent)|u(?:n(?:shift|taint|escape|watch)|pdateCommands)|j(?:oin|avaEnabled)|p(?:o(?:p|w)|ush|lugins.refresh|a(?:ddings|rse(?:Int|Float)?)|r(?:int|ompt|eference))|e(?:scape|nableExternalCapture|val|lementFromPoint|x(?:p|ec(?:Script|Command)?))|valueOf|UTC|queryCommand(?:State|Indeterm|Enabled|Value)|f(?:i(?:nd|le(?:ModifiedDate|Size|CreatedDate|UpdatedDate)|xed)|o(?:nt(?:size|color)|rward)|loor|romCharCode)|watch|l(?:ink|o(?:ad|g)|astIndexOf)|a(?:sin|nchor|cos|t(?:tachEvent|ob|an(?:2)?)|pply|lert|b(?:s|ort))|r(?:ou(?:nd|teEvents)|e(?:size(?:By|To)|calc|turnValue|place|verse|l(?:oad|ease(?:Capture|Events)))|andom)|g(?:o|et(?:ResponseHeader|M(?:i(?:nutes|lliseconds)|onth)|Se(?:conds|lection)|Hours|Year|Time(?:zoneOffset)?|Da(?:y|te)|UTC(?:M(?:i(?:nutes|lliseconds)|onth)|Seconds|Hours|Da(?:y|te)|FullYear)|FullYear|A(?:ttention|llResponseHeaders)))|m(?:in|ove(?:B(?:y|elow)|To(?:Absolute)?|Above)|ergeAttributes|a(?:tch|rgins|x))|b(?:toa|ig|o(?:ld|rderWidths)|link|ack))\b(?=\()/},{token:["punctuation.operator","support.function.dom"],regex:/(\.)(s(?:ub(?:stringData|mit)|plitText|e(?:t(?:NamedItem|Attribute(?:Node)?)|lect))|has(?:ChildNodes|Feature)|namedItem|c(?:l(?:ick|o(?:se|neNode))|reate(?:C(?:omment|DATASection|aption)|T(?:Head|extNode|Foot)|DocumentFragment|ProcessingInstruction|E(?:ntityReference|lement)|Attribute))|tabIndex|i(?:nsert(?:Row|Before|Cell|Data)|tem)|open|delete(?:Row|C(?:ell|aption)|T(?:Head|Foot)|Data)|focus|write(?:ln)?|a(?:dd|ppend(?:Child|Data))|re(?:set|place(?:Child|Data)|move(?:NamedItem|Child|Attribute(?:Node)?)?)|get(?:NamedItem|Element(?:sBy(?:Name|TagName)|ById)|Attribute(?:Node)?)|blur)\b(?=\()/},{token:["punctuation.operator","support.constant"],regex:/(\.)(s(?:ystemLanguage|cr(?:ipts|ollbars|een(?:X|Y|Top|Left))|t(?:yle(?:Sheets)?|atus(?:Text|bar)?)|ibling(?:Below|Above)|ource|uffixes|e(?:curity(?:Policy)?|l(?:ection|f)))|h(?:istory|ost(?:name)?|as(?:h|Focus))|y|X(?:MLDocument|SLDocument)|n(?:ext|ame(?:space(?:s|URI)|Prop))|M(?:IN_VALUE|AX_VALUE)|c(?:haracterSet|o(?:n(?:structor|trollers)|okieEnabled|lorDepth|mp(?:onents|lete))|urrent|puClass|l(?:i(?:p(?:boardData)?|entInformation)|osed|asses)|alle(?:e|r)|rypto)|t(?:o(?:olbar|p)|ext(?:Transform|Indent|Decoration|Align)|ags)|SQRT(?:1_2|2)|i(?:n(?:ner(?:Height|Width)|put)|ds|gnoreCase)|zIndex|o(?:scpu|n(?:readystatechange|Line)|uter(?:Height|Width)|p(?:sProfile|ener)|ffscreenBuffering)|NEGATIVE_INFINITY|d(?:i(?:splay|alog(?:Height|Top|Width|Left|Arguments)|rectories)|e(?:scription|fault(?:Status|Ch(?:ecked|arset)|View)))|u(?:ser(?:Profile|Language|Agent)|n(?:iqueID|defined)|pdateInterval)|_content|p(?:ixelDepth|ort|ersonalbar|kcs11|l(?:ugins|atform)|a(?:thname|dding(?:Right|Bottom|Top|Left)|rent(?:Window|Layer)?|ge(?:X(?:Offset)?|Y(?:Offset)?))|r(?:o(?:to(?:col|type)|duct(?:Sub)?|mpter)|e(?:vious|fix)))|e(?:n(?:coding|abledPlugin)|x(?:ternal|pando)|mbeds)|v(?:isibility|endor(?:Sub)?|Linkcolor)|URLUnencoded|P(?:I|OSITIVE_INFINITY)|f(?:ilename|o(?:nt(?:Size|Family|Weight)|rmName)|rame(?:s|Element)|gColor)|E|whiteSpace|l(?:i(?:stStyleType|n(?:eHeight|kColor))|o(?:ca(?:tion(?:bar)?|lName)|wsrc)|e(?:ngth|ft(?:Context)?)|a(?:st(?:M(?:odified|atch)|Index|Paren)|yer(?:s|X)|nguage))|a(?:pp(?:MinorVersion|Name|Co(?:deName|re)|Version)|vail(?:Height|Top|Width|Left)|ll|r(?:ity|guments)|Linkcolor|bove)|r(?:ight(?:Context)?|e(?:sponse(?:XML|Text)|adyState))|global|x|m(?:imeTypes|ultiline|enubar|argin(?:Right|Bottom|Top|Left))|L(?:N(?:10|2)|OG(?:10E|2E))|b(?:o(?:ttom|rder(?:Width|RightWidth|BottomWidth|Style|Color|TopWidth|LeftWidth))|ufferDepth|elow|ackground(?:Color|Image)))\b/},{token:["storage.type","punctuation.operator","support.function.firebug"],regex:/(console)(\.)(warn|info|log|error|time|timeEnd|assert)\b/},{token:function(c){return a.hasOwnProperty(c)?"variable.language":d.hasOwnProperty(c)?"invalid.deprecated":h.hasOwnProperty(c)?"storage.type":b.hasOwnProperty(c)?"keyword":i.hasOwnProperty(c)?"constant.language":j.hasOwnProperty(c)?"invalid.illegal":c=="debugger"?"invalid.deprecated":"identifier"},regex:k},{token:"keyword.operator",regex:/!|\$|%|&|\*|\-\-|\-|\+\+|\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\|\||\?\:|\*=|%=|\+=|\-=|&=|\^=|\b(?:in|instanceof|new|delete|typeof|void)/,next:"regex_allowed"},{token:"punctuation.operator",regex:/\?|\:|\,|\;|\./,next:"regex_allowed"},{token:"paren.lparen",regex:/[\[({]/,next:"regex_allowed"},{token:"paren.rparen",regex:/[\])}]/},{token:"keyword.operator",regex:/\/=?/,next:"regex_allowed"},{token:"comment",regex:/^#!.*$/},{token:"text",regex:/\s+/}],regex_allowed:[{token:"comment",merge:!0,regex:"\\/\\*",next:"comment_regex_allowed"},{token:"comment",regex:"\\/\\/.*$"},{token:"string.regexp",regex:"\\/",next:"regex",merge:!0},{token:"text",regex:"\\s+"},{token:"empty",regex:"",next:"start"}],regex:[{token:"regexp.keyword.operator",regex:"\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)",next:"regex"},{token:"string.regexp",regex:"/\\w*",next:"start",merge:!0},{token:"string.regexp",regex:"[^\\\\/\\[]+",next:"regex",merge:!0},{token:"string.regexp.charachterclass",regex:"\\[",next:"regex_character_class",merge:!0},{token:"empty",regex:"",next:"start"}],regex_character_class:[{token:"regexp.keyword.operator",regex:"\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)",next:"regex_character_class"},{token:"string.regexp.charachterclass",regex:"]",next:"regex",merge:!0},{token:"string.regexp.charachterclass",regex:"[^\\\\\\]]+",next:"regex_character_class",merge:!0},{token:"empty",regex:"",next:"start"}],comment_regex_allowed:[{token:"comment",regex:".*?\\*\\/",merge:!0,next:"regex_allowed"},{token:"comment",merge:!0,regex:".+"}],comment:[{token:"comment",regex:".*?\\*\\/",merge:!0,next:"start"},{token:"comment",merge:!0,regex:".+"}],qqstring:[{token:"constant.language.escape",regex:l},{token:"string",regex:'[^"\\\\]+'},{token:"string",regex:'"',next:"start"}],qstring:[{token:"constant.language.escape",regex:l},{token:"string",regex:"[^'\\\\]+"},{token:"string",regex:"'",next:"start"}]},this.embedRules(g,"doc-",[(new g).getEndRule("start")])};d.inherits(i,h),b.JavaScriptHighlightRules=i}),define("ace/mode/doc_comment_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text_highlight_rules").TextHighlightRules,f=function(){this.$rules={start:[{token:"comment.doc.tag",regex:"@[\\w\\d_]+"},{token:"comment.doc",merge:!0,regex:"\\s+"},{token:"comment.doc",merge:!0,regex:"TODO"},{token:"comment.doc",merge:!0,regex:"[^@\\*]+"},{token:"comment.doc",merge:!0,regex:"."}]}};d.inherits(f,e),function(){this.getStartRule=function(a){return{token:"comment.doc",merge:!0,regex:"\\/\\*(?=\\*)",next:a}},this.getEndRule=function(a){return{token:"comment.doc",merge:!0,regex:"\\*\\/",next:a}}}.call(f.prototype),b.DocCommentHighlightRules=f}),define("ace/mode/matching_brace_outdent",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../range").Range,e=function(){};(function(){this.checkOutdent=function(a,b){return/^\s+$/.test(a)?/^\s*\}/.test(b):!1},this.autoOutdent=function(a,b){var c=a.getLine(b),e=c.match(/^(\s*\})/);if(!e)return 0;var f=e[1].length,g=a.findMatchingBracket({row:b,column:f});if(!g||g.row==b)return 0;var h=this.$getIndent(a.getLine(g.row));a.replace(new d(b,0,b,f-1),h)},this.$getIndent=function(a){var b=a.match(/^(\s+)/);return b?b[1]:""}}).call(e.prototype),b.MatchingBraceOutdent=e}),define("ace/mode/behaviour/cstyle",["require","exports","module","ace/lib/oop","ace/mode/behaviour"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../behaviour").Behaviour,f=function(){this.add("braces","insertion",function(a,b,c,d,e){if(e=="{"){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"{"+g+"}",selection:!1}:{text:"{}",selection:[1,1]}}if(e=="}"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var k=d.$findOpeningBracket("}",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}else if(e=="\n"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var l=d.findMatchingBracket({row:h.row,column:h.column+1});if(!l)return null;var m=this.getNextLineIndent(a,i.substring(0,i.length-1),d.getTabString()),n=this.$getIndent(d.doc.getLine(l.row));return{text:"\n"+m+"\n"+n,selection:[1,m.length,1,m.length]}}}}),this.add("braces","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="{"){var g=d.doc.getLine(e.start.row),h=g.substring(e.end.column,e.end.column+1);if(h=="}")return e.end.column++,e}}),this.add("parens","insertion",function(a,b,c,d,e){if(e=="("){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"("+g+")",selection:!1}:{text:"()",selection:[1,1]}}if(e==")"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j==")"){var k=d.$findOpeningBracket(")",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}}),this.add("parens","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="("){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h==")")return e.end.column++,e}}),this.add("string_dquotes","insertion",function(a,b,c,d,e){if(e=='"'||e=="'"){var f=e,g=c.getSelectionRange(),h=d.doc.getTextRange(g);if(h!=="")return{text:f+h+f,selection:!1};var i=c.getCursorPosition(),j=d.doc.getLine(i.row),k=j.substring(i.column-1,i.column);if(k=="\\")return null;var l=d.getTokens(g.start.row,g.start.row)[0].tokens,m=0,n,o=-1;for(var p=0;p<l.length;p++){n=l[p],n.type=="string"?o=-1:o<0&&(o=n.value.indexOf(f));if(n.value.length+m>g.start.column)break;m+=l[p].value.length}if(!n||o<0&&n.type!=="comment"&&(n.type!=="string"||g.start.column!==n.value.length+m-1&&n.value.lastIndexOf(f)===n.value.length-1))return{text:f+f,selection:[1,1]};if(n&&n.type==="string"){var q=j.substring(i.column,i.column+1);if(q==f)return{text:"",selection:[1,1]}}}}),this.add("string_dquotes","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&(f=='"'||f=="'")){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h=='"')return e.end.column++,e}})};d.inherits(f,e),b.CstyleBehaviour=f}),define("ace/mode/folding/cstyle",["require","exports","module","ace/lib/oop","ace/range","ace/mode/folding/fold_mode"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../../range").Range,f=a("./fold_mode").FoldMode,g=b.FoldMode=function(){};d.inherits(g,f),function(){this.foldingStartMarker=/(\{|\[)[^\}\]]*$|^\s*(\/\*)/,this.foldingStopMarker=/^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/,this.getFoldWidgetRange=function(a,b,c){var d=a.getLine(c),f=d.match(this.foldingStartMarker);if(f){var g=f.index;if(f[1])return this.openingBracketBlock(a,f[1],c,g);var h=a.getCommentFoldRange(c,g+f[0].length);return h.end.column-=2,h}if(b!=="markbeginend")return;var f=d.match(this.foldingStopMarker);if(f){var g=f.index+f[0].length;if(f[2]){var h=a.getCommentFoldRange(c,g);return h.end.column-=2,h}var i={row:c,column:g},j=a.$findOpeningBracket(f[1],i);if(!j)return;return j.column++,i.column--,e.fromPoints(j,i)}}}.call(g.prototype)}),define("ace/mode/folding/fold_mode",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../../range").Range,e=b.FoldMode=function(){};(function(){this.foldingStartMarker=null,this.foldingStopMarker=null,this.getFoldWidget=function(a,b,c){var d=a.getLine(c);return this.foldingStartMarker.test(d)?"start":b=="markbeginend"&&this.foldingStopMarker&&this.foldingStopMarker.test(d)?"end":""},this.getFoldWidgetRange=function(a,b,c){return null},this.indentationBlock=function(a,b,c){var e=/^\s*/,f=b,g=b,h=a.getLine(b),i=c||h.length,j=h.match(e)[0].length,k=a.getLength();while(++b<k){h=a.getLine(b);var l=h.match(e)[0].length;if(l==h.length)continue;if(l<=j)break;g=b}if(g>f){var m=a.getLine(g).length;return new d(f,i,g,m)}},this.openingBracketBlock=function(a,b,c,e){var f={row:c,column:e+1},g=a.$findClosingBracket(b,f);if(!g)return;var h=a.foldWidgets[g.row];return h==null&&(h=this.getFoldWidget(a,g.row)),h=="start"&&(g.row--,g.column=a.getLine(g.row).length),d.fromPoints(f,g)}}).call(e.prototype)}),define("ace/mode/scala_highlight_rules",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/mode/doc_comment_highlight_rules","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("../lib/lang"),f=a("./doc_comment_highlight_rules").DocCommentHighlightRules,g=a("./text_highlight_rules").TextHighlightRules,h=function(){var a=e.arrayToMap("case|default|do|else|for|if|match|while|throw|return|try|catch|finally|yield|abstract|class|def|extends|final|forSome|implicit|implicits|import|lazy|new|object|override|package|private|protected|sealed|super|this|trait|type|val|var|with".split("|")),b=e.arrayToMap("true|false".split("|")),c=e.arrayToMap("AbstractMethodError|AssertionError|ClassCircularityError|ClassFormatError|Deprecated|EnumConstantNotPresentException|ExceptionInInitializerError|IllegalAccessError|IllegalThreadStateException|InstantiationError|InternalError|NegativeArraySizeException|NoSuchFieldError|Override|Process|ProcessBuilder|SecurityManager|StringIndexOutOfBoundsException|SuppressWarnings|TypeNotPresentException|UnknownError|UnsatisfiedLinkError|UnsupportedClassVersionError|VerifyError|InstantiationException|IndexOutOfBoundsException|ArrayIndexOutOfBoundsException|CloneNotSupportedException|NoSuchFieldException|IllegalArgumentException|NumberFormatException|SecurityException|Void|InheritableThreadLocal|IllegalStateException|InterruptedException|NoSuchMethodException|IllegalAccessException|UnsupportedOperationException|Enum|StrictMath|Package|Compiler|Readable|Runtime|StringBuilder|Math|IncompatibleClassChangeError|NoSuchMethodError|ThreadLocal|RuntimePermission|ArithmeticException|NullPointerException|Long|Integer|Short|Byte|Double|Number|Float|Character|Boolean|StackTraceElement|Appendable|StringBuffer|Iterable|ThreadGroup|Runnable|Thread|IllegalMonitorStateException|StackOverflowError|OutOfMemoryError|VirtualMachineError|ArrayStoreException|ClassCastException|LinkageError|NoClassDefFoundError|ClassNotFoundException|RuntimeException|Exception|ThreadDeath|Error|Throwable|System|ClassLoader|Cloneable|Class|CharSequence|Comparable|String|Object|Unit|Any|AnyVal|AnyRef|Null|ScalaObject|Singleton|Seq|Iterable|List|Option|Array|Char|Byte|Short|Int|Long|Nothing".split("|")),d=e.arrayToMap("".split("|"));this.$rules={start:[{token:"comment",regex:"\\/\\/.*$"},(new f).getStartRule("doc-start"),{token:"comment",merge:!0,regex:"\\/\\*",next:"comment"},{token:"string.regexp",regex:"[/](?:(?:\\[(?:\\\\]|[^\\]])+\\])|(?:\\\\/|[^\\]/]))*[/]\\w*\\s*(?=[).,;]|$)"},{token:"string",regex:'["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'},{token:"string",regex:"['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"},{token:"constant.numeric",regex:"0[xX][0-9a-fA-F]+\\b"},{token:"constant.numeric",regex:"[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"},{token:"constant.language.boolean",regex:"(?:true|false)\\b"},{token:function(e){return e=="this"?"variable.language":a.hasOwnProperty(e)?"keyword":c.hasOwnProperty(e)?"support.function":d.hasOwnProperty(e)?"support.function":b.hasOwnProperty(e)?"constant.language":"identifier"},regex:"[a-zA-Z_$][a-zA-Z0-9_$]*\\b"},{token:"keyword.operator",regex:"!|\\$|%|&|\\*|\\-\\-|\\-|\\+\\+|\\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\\|\\||\\?\\:|\\*=|%=|\\+=|\\-=|&=|\\^=|\\b(?:in|instanceof|new|delete|typeof|void)"},{token:"paren.lparen",regex:"[[({]"},{token:"paren.rparen",regex:"[\\])}]"},{token:"text",regex:"\\s+"}],comment:[{token:"comment",regex:".*?\\*\\/",next:"start"},{token:"comment",merge:!0,regex:".+"}]},this.embedRules(f,"doc-",[(new f).getEndRule("start")])};d.inherits(h,g),b.ScalaHighlightRules=h})
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/mode-scss-uncompressed.js b/apps/files_texteditor/js/aceeditor/mode-scss-uncompressed.js
deleted file mode 100644
index fc6d611f26..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-scss-uncompressed.js
+++ /dev/null
@@ -1,678 +0,0 @@
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/scss', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text', 'ace/tokenizer', 'ace/mode/scss_highlight_rules', 'ace/mode/matching_brace_outdent', 'ace/mode/folding/cstyle'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
-var ScssHighlightRules = require("./scss_highlight_rules").ScssHighlightRules;
-var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
-var CStyleFoldMode = require("./folding/cstyle").FoldMode;
-
-var Mode = function() {
-    this.$tokenizer = new Tokenizer(new ScssHighlightRules().getRules(), "i");
-    this.$outdent = new MatchingBraceOutdent();
-    this.foldingRules = new CStyleFoldMode();
-};
-oop.inherits(Mode, TextMode);
-
-(function() {
-    
-    this.getNextLineIndent = function(state, line, tab) {
-        var indent = this.$getIndent(line);
-
-        // ignore braces in comments
-        var tokens = this.$tokenizer.getLineTokens(line, state).tokens;
-        if (tokens.length && tokens[tokens.length-1].type == "comment") {
-            return indent;
-        }
-
-        var match = line.match(/^.*\{\s*$/);
-        if (match) {
-            indent += tab;
-        }
-
-        return indent;
-    };
-
-    this.checkOutdent = function(state, line, input) {
-        return this.$outdent.checkOutdent(line, input);
-    };
-
-    this.autoOutdent = function(state, doc, row) {
-        this.$outdent.autoOutdent(doc, row);
-    };
-
-}).call(Mode.prototype);
-
-exports.Mode = Mode;
-
-});
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/scss_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/lang', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var lang = require("../lib/lang");
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-
-var ScssHighlightRules = function() {
-    
-    var properties = lang.arrayToMap( (function () {
-
-        var browserPrefix = ("-webkit-|-moz-|-o-|-ms-|-svg-|-pie-|-khtml-").split("|");
-        
-        var prefixProperties = ("appearance|background-clip|background-inline-policy|background-origin|" + 
-             "background-size|binding|border-bottom-colors|border-left-colors|" + 
-             "border-right-colors|border-top-colors|border-end|border-end-color|" + 
-             "border-end-style|border-end-width|border-image|border-start|" + 
-             "border-start-color|border-start-style|border-start-width|box-align|" + 
-             "box-direction|box-flex|box-flexgroup|box-ordinal-group|box-orient|" + 
-             "box-pack|box-sizing|column-count|column-gap|column-width|column-rule|" + 
-             "column-rule-width|column-rule-style|column-rule-color|float-edge|" + 
-             "font-feature-settings|font-language-override|force-broken-image-icon|" + 
-             "image-region|margin-end|margin-start|opacity|outline|outline-color|" + 
-             "outline-offset|outline-radius|outline-radius-bottomleft|" + 
-             "outline-radius-bottomright|outline-radius-topleft|outline-radius-topright|" + 
-             "outline-style|outline-width|padding-end|padding-start|stack-sizing|" + 
-             "tab-size|text-blink|text-decoration-color|text-decoration-line|" + 
-             "text-decoration-style|transform|transform-origin|transition|" + 
-             "transition-delay|transition-duration|transition-property|" + 
-             "transition-timing-function|user-focus|user-input|user-modify|user-select|" +
-             "window-shadow|border-radius").split("|");
-        
-        var properties = ("azimuth|background-attachment|background-color|background-image|" +
-            "background-position|background-repeat|background|border-bottom-color|" +
-            "border-bottom-style|border-bottom-width|border-bottom|border-collapse|" +
-            "border-color|border-left-color|border-left-style|border-left-width|" +
-            "border-left|border-right-color|border-right-style|border-right-width|" +
-            "border-right|border-spacing|border-style|border-top-color|" +
-            "border-top-style|border-top-width|border-top|border-width|border|" +
-            "bottom|box-sizing|caption-side|clear|clip|color|content|counter-increment|" +
-            "counter-reset|cue-after|cue-before|cue|cursor|direction|display|" +
-            "elevation|empty-cells|float|font-family|font-size-adjust|font-size|" +
-            "font-stretch|font-style|font-variant|font-weight|font|height|left|" +
-            "letter-spacing|line-height|list-style-image|list-style-position|" +
-            "list-style-type|list-style|margin-bottom|margin-left|margin-right|" +
-            "margin-top|marker-offset|margin|marks|max-height|max-width|min-height|" +
-            "min-width|opacity|orphans|outline-color|" +
-            "outline-style|outline-width|outline|overflow|overflow-x|overflow-y|padding-bottom|" +
-            "padding-left|padding-right|padding-top|padding|page-break-after|" +
-            "page-break-before|page-break-inside|page|pause-after|pause-before|" +
-            "pause|pitch-range|pitch|play-during|position|quotes|richness|right|" +
-            "size|speak-header|speak-numeral|speak-punctuation|speech-rate|speak|" +
-            "stress|table-layout|text-align|text-decoration|text-indent|" +
-            "text-shadow|text-transform|top|unicode-bidi|vertical-align|" +
-            "visibility|voice-family|volume|white-space|widows|width|word-spacing|" +
-            "z-index").split("|");
-          
-        //The return array     
-        var ret = [];
-        
-        //All prefixProperties will get the browserPrefix in
-        //the begning by join the prefixProperties array with the value of browserPrefix
-        for (var i=0, ln=browserPrefix.length; i<ln; i++) {
-            Array.prototype.push.apply(
-                ret,
-                (( browserPrefix[i] + prefixProperties.join("|" + browserPrefix[i]) ).split("|"))
-            );
-        }
-        
-        //Add also prefixProperties and properties without any browser prefix
-        Array.prototype.push.apply(ret, prefixProperties);
-        Array.prototype.push.apply(ret, properties);
-        
-        return ret;
-        
-    })() );
-    
-
-
-    var functions = lang.arrayToMap(
-        ("hsl|hsla|rgb|rgba|url|attr|counter|counters|abs|adjust_color|adjust_hue|" +
-         "alpha|join|blue|ceil|change_color|comparable|complement|darken|desaturate|" + 
-         "floor|grayscale|green|hue|if|invert|join|length|lighten|lightness|mix|" + 
-         "nth|opacify|opacity|percentage|quote|red|round|saturate|saturation|" +
-         "scale_color|transparentize|type_of|unit|unitless|unqoute").split("|")
-    );
-
-    var constants = lang.arrayToMap(
-        ("absolute|all-scroll|always|armenian|auto|baseline|below|bidi-override|" +
-        "block|bold|bolder|border-box|both|bottom|break-all|break-word|capitalize|center|" +
-        "char|circle|cjk-ideographic|col-resize|collapse|content-box|crosshair|dashed|" +
-        "decimal-leading-zero|decimal|default|disabled|disc|" +
-        "distribute-all-lines|distribute-letter|distribute-space|" +
-        "distribute|dotted|double|e-resize|ellipsis|fixed|georgian|groove|" +
-        "hand|hebrew|help|hidden|hiragana-iroha|hiragana|horizontal|" +
-        "ideograph-alpha|ideograph-numeric|ideograph-parenthesis|" +
-        "ideograph-space|inactive|inherit|inline-block|inline|inset|inside|" +
-        "inter-ideograph|inter-word|italic|justify|katakana-iroha|katakana|" +
-        "keep-all|left|lighter|line-edge|line-through|line|list-item|loose|" +
-        "lower-alpha|lower-greek|lower-latin|lower-roman|lowercase|lr-tb|ltr|" +
-        "medium|middle|move|n-resize|ne-resize|newspaper|no-drop|no-repeat|" +
-        "nw-resize|none|normal|not-allowed|nowrap|oblique|outset|outside|" +
-        "overline|pointer|progress|relative|repeat-x|repeat-y|repeat|right|" +
-        "ridge|row-resize|rtl|s-resize|scroll|se-resize|separate|small-caps|" +
-        "solid|square|static|strict|super|sw-resize|table-footer-group|" +
-        "table-header-group|tb-rl|text-bottom|text-top|text|thick|thin|top|" +
-        "transparent|underline|upper-alpha|upper-latin|upper-roman|uppercase|" +
-        "vertical-ideographic|vertical-text|visible|w-resize|wait|whitespace|" +
-        "zero").split("|")
-    );
-
-    var colors = lang.arrayToMap(
-        ("aqua|black|blue|fuchsia|gray|green|lime|maroon|navy|olive|orange|" +
-        "purple|red|silver|teal|white|yellow").split("|")
-    );
-    
-    var keywords = lang.arrayToMap(
-        ("@mixin|@extend|@include|@import|@media|@debug|@warn|@if|@for|@each|@while|@else|@font-face|@-webkit-keyframes|if|and|!default|module|def|end|declare").split("|")
-    )
-    
-    var tags = lang.arrayToMap(
-        ("a|abbr|acronym|address|applet|area|article|aside|audio|b|base|basefont|bdo|" + 
-         "big|blockquote|body|br|button|canvas|caption|center|cite|code|col|colgroup|" + 
-         "command|datalist|dd|del|details|dfn|dir|div|dl|dt|em|embed|fieldset|" + 
-         "figcaption|figure|font|footer|form|frame|frameset|h1|h2|h3|h4|h5|h6|head|" + 
-         "header|hgroup|hr|html|i|iframe|img|input|ins|keygen|kbd|label|legend|li|" + 
-         "link|map|mark|menu|meta|meter|nav|noframes|noscript|object|ol|optgroup|" + 
-         "option|output|p|param|pre|progress|q|rp|rt|ruby|s|samp|script|section|select|" + 
-         "small|source|span|strike|strong|style|sub|summary|sup|table|tbody|td|" + 
-         "textarea|tfoot|th|thead|time|title|tr|tt|u|ul|var|video|wbr|xmp").split("|")
-    );
-
-    // regexp must not have capturing parentheses. Use (?:) instead.
-    // regexps are ordered -> the first match is used
-
-    var numRe = "\\-?(?:(?:[0-9]+)|(?:[0-9]*\\.[0-9]+))";
-
-    // regexp must not have capturing parentheses. Use (?:) instead.
-    // regexps are ordered -> the first match is used
-
-    this.$rules = {
-        "start" : [
-            {
-                token : "comment",
-                regex : "\\/\\/.*$"
-            },
-            {
-                token : "comment", // multi line comment
-                merge : true,
-                regex : "\\/\\*",
-                next : "comment"
-            }, {
-                token : "string", // single line
-                regex : '["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'
-            }, {
-                token : "string", // multi line string start
-                merge : true,
-                regex : '["].*\\\\$',
-                next : "qqstring"
-            }, {
-                token : "string", // single line
-                regex : "['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"
-            }, {
-                token : "string", // multi line string start
-                merge : true,
-                regex : "['].*\\\\$",
-                next : "qstring"
-            }, {
-                token : "constant.numeric",
-                regex : numRe + "(?:em|ex|px|cm|mm|in|pt|pc|deg|rad|grad|ms|s|hz|khz|%)"
-            }, {
-                token : "constant.numeric", // hex6 color
-                regex : "#[a-f0-9]{6}"
-            }, {
-                token : "constant.numeric", // hex3 color
-                regex : "#[a-f0-9]{3}"
-            }, {
-                token : "constant.numeric",
-                regex : numRe
-            }, {
-                token : function(value) {
-                    if (properties.hasOwnProperty(value.toLowerCase()))
-                        return "support.type";
-                    if (keywords.hasOwnProperty(value))
-                        return "keyword";
-                    else if (constants.hasOwnProperty(value))
-                        return "constant.language";
-                    else if (functions.hasOwnProperty(value))
-                        return "support.function";
-                    else if (colors.hasOwnProperty(value.toLowerCase()))
-                        return "support.constant.color";
-                    else if (tags.hasOwnProperty(value.toLowerCase()))
-                        return "variable.language";
-                    else
-                        return "text";
-                },
-                regex : "\\-?[@a-z_][@a-z0-9_\\-]*"
-            }, {
-                token : "variable",
-                regex : "[a-z_\\-$][a-z0-9_\\-$]*\\b"
-            }, {
-                token: "variable.language",
-                regex: "#[a-z0-9-_]+"
-            }, {
-                token: "variable.language",
-                regex: "\\.[a-z0-9-_]+"
-            }, {
-                token: "variable.language",
-                regex: ":[a-z0-9-_]+"
-            }, {
-                token: "constant",
-                regex: "[a-z0-9-_]+"
-            }, {
-                token : "keyword.operator",
-                regex : "<|>|<=|>=|==|!=|-|%|#|\\+|\\$|\\+|\\*"
-            }, {
-                token : "paren.lparen",
-                regex : "[[({]"
-            }, {
-                token : "paren.rparen",
-                regex : "[\\])}]"
-            }, {
-                token : "text",
-                regex : "\\s+"
-            }
-        ],
-        "comment" : [
-            {
-                token : "comment", // closing comment
-                regex : ".*?\\*\\/",
-                next : "start"
-            }, {
-                token : "comment", // comment spanning whole line
-                merge : true,
-                regex : ".+"
-            }
-        ],
-        "qqstring" : [
-            {
-                token : "string",
-                regex : '(?:(?:\\\\.)|(?:[^"\\\\]))*?"',
-                next : "start"
-            }, {
-                token : "string",
-                merge : true,
-                regex : '.+'
-            }
-        ],
-        "qstring" : [
-            {
-                token : "string",
-                regex : "(?:(?:\\\\.)|(?:[^'\\\\]))*?'",
-                next : "start"
-            }, {
-                token : "string",
-                merge : true,
-                regex : '.+'
-            }
-        ]
-    };
-};
-
-oop.inherits(ScssHighlightRules, TextHighlightRules);
-
-exports.ScssHighlightRules = ScssHighlightRules;
-
-});
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/matching_brace_outdent', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
-"use strict";
-
-var Range = require("../range").Range;
-
-var MatchingBraceOutdent = function() {};
-
-(function() {
-
-    this.checkOutdent = function(line, input) {
-        if (! /^\s+$/.test(line))
-            return false;
-
-        return /^\s*\}/.test(input);
-    };
-
-    this.autoOutdent = function(doc, row) {
-        var line = doc.getLine(row);
-        var match = line.match(/^(\s*\})/);
-
-        if (!match) return 0;
-
-        var column = match[1].length;
-        var openBracePos = doc.findMatchingBracket({row: row, column: column});
-
-        if (!openBracePos || openBracePos.row == row) return 0;
-
-        var indent = this.$getIndent(doc.getLine(openBracePos.row));
-        doc.replace(new Range(row, 0, row, column-1), indent);
-    };
-
-    this.$getIndent = function(line) {
-        var match = line.match(/^(\s+)/);
-        if (match) {
-            return match[1];
-        }
-
-        return "";
-    };
-
-}).call(MatchingBraceOutdent.prototype);
-
-exports.MatchingBraceOutdent = MatchingBraceOutdent;
-});
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/folding/cstyle', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/range', 'ace/mode/folding/fold_mode'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../../lib/oop");
-var Range = require("../../range").Range;
-var BaseFoldMode = require("./fold_mode").FoldMode;
-
-var FoldMode = exports.FoldMode = function() {};
-oop.inherits(FoldMode, BaseFoldMode);
-
-(function() {
-
-    this.foldingStartMarker = /(\{|\[)[^\}\]]*$|^\s*(\/\*)/;
-    this.foldingStopMarker = /^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/;
-    
-    this.getFoldWidgetRange = function(session, foldStyle, row) {
-        var line = session.getLine(row);
-        var match = line.match(this.foldingStartMarker);
-        if (match) {
-            var i = match.index;
-
-            if (match[1])
-                return this.openingBracketBlock(session, match[1], row, i);
-
-            var range = session.getCommentFoldRange(row, i + match[0].length);
-            range.end.column -= 2;
-            return range;
-        }
-
-        if (foldStyle !== "markbeginend")
-            return;
-            
-        var match = line.match(this.foldingStopMarker);
-        if (match) {
-            var i = match.index + match[0].length;
-
-            if (match[2]) {
-                var range = session.getCommentFoldRange(row, i);
-                range.end.column -= 2;
-                return range;
-            }
-
-            var end = {row: row, column: i};
-            var start = session.$findOpeningBracket(match[1], end);
-            
-            if (!start)
-                return;
-
-            start.column++;
-            end.column--;
-
-            return  Range.fromPoints(start, end);
-        }
-    };
-    
-}).call(FoldMode.prototype);
-
-});/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/folding/fold_mode', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
-"use strict";
-
-var Range = require("../../range").Range;
-
-var FoldMode = exports.FoldMode = function() {};
-
-(function() {
-
-    this.foldingStartMarker = null;
-    this.foldingStopMarker = null;
-
-    // must return "" if there's no fold, to enable caching
-    this.getFoldWidget = function(session, foldStyle, row) {
-        var line = session.getLine(row);
-        if (this.foldingStartMarker.test(line))
-            return "start";
-        if (foldStyle == "markbeginend"
-                && this.foldingStopMarker
-                && this.foldingStopMarker.test(line))
-            return "end";
-        return "";
-    };
-    
-    this.getFoldWidgetRange = function(session, foldStyle, row) {
-        return null;
-    };
-
-    this.indentationBlock = function(session, row, column) {
-        var re = /^\s*/;
-        var startRow = row;
-        var endRow = row;
-        var line = session.getLine(row);
-        var startColumn = column || line.length;
-        var startLevel = line.match(re)[0].length;
-        var maxRow = session.getLength()
-        
-        while (++row < maxRow) {
-            line = session.getLine(row);
-            var level = line.match(re)[0].length;
-
-            if (level == line.length)
-                continue;
-
-            if (level <= startLevel)
-                break;
-
-            endRow = row;
-        }
-
-        if (endRow > startRow) {
-            var endColumn = session.getLine(endRow).length;
-            return new Range(startRow, startColumn, endRow, endColumn);
-        }
-    };
-
-    this.openingBracketBlock = function(session, bracket, row, column) {
-        var start = {row: row, column: column + 1};
-        var end = session.$findClosingBracket(bracket, start);
-        if (!end)
-            return;
-
-        var fw = session.foldWidgets[end.row];
-        if (fw == null)
-            fw = this.getFoldWidget(session, end.row);
-
-        if (fw == "start") {
-            end.row --;
-            end.column = session.getLine(end.row).length;
-        }
-        return Range.fromPoints(start, end);
-    };
-
-}).call(FoldMode.prototype);
-
-});
diff --git a/apps/files_texteditor/js/aceeditor/mode-scss.js b/apps/files_texteditor/js/aceeditor/mode-scss.js
deleted file mode 100644
index 214bfe3485..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-scss.js
+++ /dev/null
@@ -1 +0,0 @@
-define("ace/mode/scss",["require","exports","module","ace/lib/oop","ace/mode/text","ace/tokenizer","ace/mode/scss_highlight_rules","ace/mode/matching_brace_outdent","ace/mode/folding/cstyle"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text").Mode,f=a("../tokenizer").Tokenizer,g=a("./scss_highlight_rules").ScssHighlightRules,h=a("./matching_brace_outdent").MatchingBraceOutdent,i=a("./folding/cstyle").FoldMode,j=function(){this.$tokenizer=new f((new g).getRules(),"i"),this.$outdent=new h,this.foldingRules=new i};d.inherits(j,e),function(){this.getNextLineIndent=function(a,b,c){var d=this.$getIndent(b),e=this.$tokenizer.getLineTokens(b,a).tokens;if(e.length&&e[e.length-1].type=="comment")return d;var f=b.match(/^.*\{\s*$/);return f&&(d+=c),d},this.checkOutdent=function(a,b,c){return this.$outdent.checkOutdent(b,c)},this.autoOutdent=function(a,b,c){this.$outdent.autoOutdent(b,c)}}.call(j.prototype),b.Mode=j}),define("ace/mode/scss_highlight_rules",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("../lib/lang"),f=a("./text_highlight_rules").TextHighlightRules,g=function(){var a=e.arrayToMap(function(){var a="-webkit-|-moz-|-o-|-ms-|-svg-|-pie-|-khtml-".split("|"),b="appearance|background-clip|background-inline-policy|background-origin|background-size|binding|border-bottom-colors|border-left-colors|border-right-colors|border-top-colors|border-end|border-end-color|border-end-style|border-end-width|border-image|border-start|border-start-color|border-start-style|border-start-width|box-align|box-direction|box-flex|box-flexgroup|box-ordinal-group|box-orient|box-pack|box-sizing|column-count|column-gap|column-width|column-rule|column-rule-width|column-rule-style|column-rule-color|float-edge|font-feature-settings|font-language-override|force-broken-image-icon|image-region|margin-end|margin-start|opacity|outline|outline-color|outline-offset|outline-radius|outline-radius-bottomleft|outline-radius-bottomright|outline-radius-topleft|outline-radius-topright|outline-style|outline-width|padding-end|padding-start|stack-sizing|tab-size|text-blink|text-decoration-color|text-decoration-line|text-decoration-style|transform|transform-origin|transition|transition-delay|transition-duration|transition-property|transition-timing-function|user-focus|user-input|user-modify|user-select|window-shadow|border-radius".split("|"),c="azimuth|background-attachment|background-color|background-image|background-position|background-repeat|background|border-bottom-color|border-bottom-style|border-bottom-width|border-bottom|border-collapse|border-color|border-left-color|border-left-style|border-left-width|border-left|border-right-color|border-right-style|border-right-width|border-right|border-spacing|border-style|border-top-color|border-top-style|border-top-width|border-top|border-width|border|bottom|box-sizing|caption-side|clear|clip|color|content|counter-increment|counter-reset|cue-after|cue-before|cue|cursor|direction|display|elevation|empty-cells|float|font-family|font-size-adjust|font-size|font-stretch|font-style|font-variant|font-weight|font|height|left|letter-spacing|line-height|list-style-image|list-style-position|list-style-type|list-style|margin-bottom|margin-left|margin-right|margin-top|marker-offset|margin|marks|max-height|max-width|min-height|min-width|opacity|orphans|outline-color|outline-style|outline-width|outline|overflow|overflow-x|overflow-y|padding-bottom|padding-left|padding-right|padding-top|padding|page-break-after|page-break-before|page-break-inside|page|pause-after|pause-before|pause|pitch-range|pitch|play-during|position|quotes|richness|right|size|speak-header|speak-numeral|speak-punctuation|speech-rate|speak|stress|table-layout|text-align|text-decoration|text-indent|text-shadow|text-transform|top|unicode-bidi|vertical-align|visibility|voice-family|volume|white-space|widows|width|word-spacing|z-index".split("|"),d=[];for(var e=0,f=a.length;e<f;e++)Array.prototype.push.apply(d,(a[e]+b.join("|"+a[e])).split("|"));return Array.prototype.push.apply(d,b),Array.prototype.push.apply(d,c),d}()),b=e.arrayToMap("hsl|hsla|rgb|rgba|url|attr|counter|counters|abs|adjust_color|adjust_hue|alpha|join|blue|ceil|change_color|comparable|complement|darken|desaturate|floor|grayscale|green|hue|if|invert|join|length|lighten|lightness|mix|nth|opacify|opacity|percentage|quote|red|round|saturate|saturation|scale_color|transparentize|type_of|unit|unitless|unqoute".split("|")),c=e.arrayToMap("absolute|all-scroll|always|armenian|auto|baseline|below|bidi-override|block|bold|bolder|border-box|both|bottom|break-all|break-word|capitalize|center|char|circle|cjk-ideographic|col-resize|collapse|content-box|crosshair|dashed|decimal-leading-zero|decimal|default|disabled|disc|distribute-all-lines|distribute-letter|distribute-space|distribute|dotted|double|e-resize|ellipsis|fixed|georgian|groove|hand|hebrew|help|hidden|hiragana-iroha|hiragana|horizontal|ideograph-alpha|ideograph-numeric|ideograph-parenthesis|ideograph-space|inactive|inherit|inline-block|inline|inset|inside|inter-ideograph|inter-word|italic|justify|katakana-iroha|katakana|keep-all|left|lighter|line-edge|line-through|line|list-item|loose|lower-alpha|lower-greek|lower-latin|lower-roman|lowercase|lr-tb|ltr|medium|middle|move|n-resize|ne-resize|newspaper|no-drop|no-repeat|nw-resize|none|normal|not-allowed|nowrap|oblique|outset|outside|overline|pointer|progress|relative|repeat-x|repeat-y|repeat|right|ridge|row-resize|rtl|s-resize|scroll|se-resize|separate|small-caps|solid|square|static|strict|super|sw-resize|table-footer-group|table-header-group|tb-rl|text-bottom|text-top|text|thick|thin|top|transparent|underline|upper-alpha|upper-latin|upper-roman|uppercase|vertical-ideographic|vertical-text|visible|w-resize|wait|whitespace|zero".split("|")),d=e.arrayToMap("aqua|black|blue|fuchsia|gray|green|lime|maroon|navy|olive|orange|purple|red|silver|teal|white|yellow".split("|")),f=e.arrayToMap("@mixin|@extend|@include|@import|@media|@debug|@warn|@if|@for|@each|@while|@else|@font-face|@-webkit-keyframes|if|and|!default|module|def|end|declare".split("|")),g=e.arrayToMap("a|abbr|acronym|address|applet|area|article|aside|audio|b|base|basefont|bdo|big|blockquote|body|br|button|canvas|caption|center|cite|code|col|colgroup|command|datalist|dd|del|details|dfn|dir|div|dl|dt|em|embed|fieldset|figcaption|figure|font|footer|form|frame|frameset|h1|h2|h3|h4|h5|h6|head|header|hgroup|hr|html|i|iframe|img|input|ins|keygen|kbd|label|legend|li|link|map|mark|menu|meta|meter|nav|noframes|noscript|object|ol|optgroup|option|output|p|param|pre|progress|q|rp|rt|ruby|s|samp|script|section|select|small|source|span|strike|strong|style|sub|summary|sup|table|tbody|td|textarea|tfoot|th|thead|time|title|tr|tt|u|ul|var|video|wbr|xmp".split("|")),h="\\-?(?:(?:[0-9]+)|(?:[0-9]*\\.[0-9]+))";this.$rules={start:[{token:"comment",regex:"\\/\\/.*$"},{token:"comment",merge:!0,regex:"\\/\\*",next:"comment"},{token:"string",regex:'["](?:(?:\\\\.)|(?:[^"\\\\]))*?["]'},{token:"string",merge:!0,regex:'["].*\\\\$',next:"qqstring"},{token:"string",regex:"['](?:(?:\\\\.)|(?:[^'\\\\]))*?[']"},{token:"string",merge:!0,regex:"['].*\\\\$",next:"qstring"},{token:"constant.numeric",regex:h+"(?:em|ex|px|cm|mm|in|pt|pc|deg|rad|grad|ms|s|hz|khz|%)"},{token:"constant.numeric",regex:"#[a-f0-9]{6}"},{token:"constant.numeric",regex:"#[a-f0-9]{3}"},{token:"constant.numeric",regex:h},{token:function(e){return a.hasOwnProperty(e.toLowerCase())?"support.type":f.hasOwnProperty(e)?"keyword":c.hasOwnProperty(e)?"constant.language":b.hasOwnProperty(e)?"support.function":d.hasOwnProperty(e.toLowerCase())?"support.constant.color":g.hasOwnProperty(e.toLowerCase())?"variable.language":"text"},regex:"\\-?[@a-z_][@a-z0-9_\\-]*"},{token:"variable",regex:"[a-z_\\-$][a-z0-9_\\-$]*\\b"},{token:"variable.language",regex:"#[a-z0-9-_]+"},{token:"variable.language",regex:"\\.[a-z0-9-_]+"},{token:"variable.language",regex:":[a-z0-9-_]+"},{token:"constant",regex:"[a-z0-9-_]+"},{token:"keyword.operator",regex:"<|>|<=|>=|==|!=|-|%|#|\\+|\\$|\\+|\\*"},{token:"paren.lparen",regex:"[[({]"},{token:"paren.rparen",regex:"[\\])}]"},{token:"text",regex:"\\s+"}],comment:[{token:"comment",regex:".*?\\*\\/",next:"start"},{token:"comment",merge:!0,regex:".+"}],qqstring:[{token:"string",regex:'(?:(?:\\\\.)|(?:[^"\\\\]))*?"',next:"start"},{token:"string",merge:!0,regex:".+"}],qstring:[{token:"string",regex:"(?:(?:\\\\.)|(?:[^'\\\\]))*?'",next:"start"},{token:"string",merge:!0,regex:".+"}]}};d.inherits(g,f),b.ScssHighlightRules=g}),define("ace/mode/matching_brace_outdent",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../range").Range,e=function(){};(function(){this.checkOutdent=function(a,b){return/^\s+$/.test(a)?/^\s*\}/.test(b):!1},this.autoOutdent=function(a,b){var c=a.getLine(b),e=c.match(/^(\s*\})/);if(!e)return 0;var f=e[1].length,g=a.findMatchingBracket({row:b,column:f});if(!g||g.row==b)return 0;var h=this.$getIndent(a.getLine(g.row));a.replace(new d(b,0,b,f-1),h)},this.$getIndent=function(a){var b=a.match(/^(\s+)/);return b?b[1]:""}}).call(e.prototype),b.MatchingBraceOutdent=e}),define("ace/mode/folding/cstyle",["require","exports","module","ace/lib/oop","ace/range","ace/mode/folding/fold_mode"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../../range").Range,f=a("./fold_mode").FoldMode,g=b.FoldMode=function(){};d.inherits(g,f),function(){this.foldingStartMarker=/(\{|\[)[^\}\]]*$|^\s*(\/\*)/,this.foldingStopMarker=/^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/,this.getFoldWidgetRange=function(a,b,c){var d=a.getLine(c),f=d.match(this.foldingStartMarker);if(f){var g=f.index;if(f[1])return this.openingBracketBlock(a,f[1],c,g);var h=a.getCommentFoldRange(c,g+f[0].length);return h.end.column-=2,h}if(b!=="markbeginend")return;var f=d.match(this.foldingStopMarker);if(f){var g=f.index+f[0].length;if(f[2]){var h=a.getCommentFoldRange(c,g);return h.end.column-=2,h}var i={row:c,column:g},j=a.$findOpeningBracket(f[1],i);if(!j)return;return j.column++,i.column--,e.fromPoints(j,i)}}}.call(g.prototype)}),define("ace/mode/folding/fold_mode",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../../range").Range,e=b.FoldMode=function(){};(function(){this.foldingStartMarker=null,this.foldingStopMarker=null,this.getFoldWidget=function(a,b,c){var d=a.getLine(c);return this.foldingStartMarker.test(d)?"start":b=="markbeginend"&&this.foldingStopMarker&&this.foldingStopMarker.test(d)?"end":""},this.getFoldWidgetRange=function(a,b,c){return null},this.indentationBlock=function(a,b,c){var e=/^\s*/,f=b,g=b,h=a.getLine(b),i=c||h.length,j=h.match(e)[0].length,k=a.getLength();while(++b<k){h=a.getLine(b);var l=h.match(e)[0].length;if(l==h.length)continue;if(l<=j)break;g=b}if(g>f){var m=a.getLine(g).length;return new d(f,i,g,m)}},this.openingBracketBlock=function(a,b,c,e){var f={row:c,column:e+1},g=a.$findClosingBracket(b,f);if(!g)return;var h=a.foldWidgets[g.row];return h==null&&(h=this.getFoldWidget(a,g.row)),h=="start"&&(g.row--,g.column=a.getLine(g.row).length),d.fromPoints(f,g)}}).call(e.prototype)})
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/mode-sh-uncompressed.js b/apps/files_texteditor/js/aceeditor/mode-sh-uncompressed.js
deleted file mode 100644
index c341067efb..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-sh-uncompressed.js
+++ /dev/null
@@ -1,281 +0,0 @@
-/* ***** 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 Ajax.org Code Editor (ACE).
-*
-* The Initial Developer of the Original Code is
-* Ajax.org B.V.
-* Portions created by the Initial Developer are Copyright (C) 2010
-* the Initial Developer. All Rights Reserved.
-*
-* Contributor(s):
-*      Rich Healey <richo AT psych0tik DOT net>
-*
-* 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 ***** */
-
-define('ace/mode/sh', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text', 'ace/tokenizer', 'ace/mode/sh_highlight_rules', 'ace/range'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
-var ShHighlightRules = require("./sh_highlight_rules").ShHighlightRules;
-var Range = require("../range").Range;
-
-var Mode = function() {
-    this.$tokenizer = new Tokenizer(new ShHighlightRules().getRules());
-};
-oop.inherits(Mode, TextMode);
-
-(function() {
-
-    this.toggleCommentLines = function(state, doc, startRow, endRow) {
-        var outdent = true;
-        var re = /^(\s*)#/;
-
-        for (var i=startRow; i<= endRow; i++) {
-            if (!re.test(doc.getLine(i))) {
-                outdent = false;
-                break;
-            }
-        }
-
-        if (outdent) {
-            var deleteRange = new Range(0, 0, 0, 0);
-            for (var i=startRow; i<= endRow; i++)
-            {
-                var line = doc.getLine(i);
-                var m = line.match(re);
-                deleteRange.start.row = i;
-                deleteRange.end.row = i;
-                deleteRange.end.column = m[0].length;
-                doc.replace(deleteRange, m[1]);
-            }
-        }
-        else {
-            doc.indentRows(startRow, endRow, "#");
-        }
-    };
-
-    this.getNextLineIndent = function(state, line, tab) {
-        var indent = this.$getIndent(line);
-
-        var tokenizedLine = this.$tokenizer.getLineTokens(line, state);
-        var tokens = tokenizedLine.tokens;
-
-        if (tokens.length && tokens[tokens.length-1].type == "comment") {
-            return indent;
-        }
-
-        if (state == "start") {
-            var match = line.match(/^.*[\{\(\[\:]\s*$/);
-            if (match) {
-                indent += tab;
-            }
-        }
-
-        return indent;
-    };
-
-    var outdents = {
-        "pass": 1,
-        "return": 1,
-        "raise": 1,
-        "break": 1,
-        "continue": 1
-    };
-
-    this.checkOutdent = function(state, line, input) {
-        if (input !== "\r\n" && input !== "\r" && input !== "\n")
-            return false;
-
-        var tokens = this.$tokenizer.getLineTokens(line.trim(), state).tokens;
-
-        if (!tokens)
-            return false;
-
-        // ignore trailing comments
-        do {
-            var last = tokens.pop();
-        } while (last && (last.type == "comment" || (last.type == "text" && last.value.match(/^\s+$/))));
-
-        if (!last)
-            return false;
-
-        return (last.type == "keyword" && outdents[last.value]);
-    };
-
-    this.autoOutdent = function(state, doc, row) {
-        // outdenting in sh is slightly different because it always applies
-        // to the next line and only of a new line is inserted
-
-        row += 1;
-        var indent = this.$getIndent(doc.getLine(row));
-        var tab = doc.getTabString();
-        if (indent.slice(-tab.length) == tab)
-            doc.remove(new Range(row, indent.length-tab.length, row, indent.length));
-    };
-
-}).call(Mode.prototype);
-
-exports.Mode = Mode;
-});
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Rich Healey <richo AT psych0tik DOT net>
- *
- * 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 *****
- */
-define('ace/mode/sh_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/lang', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var lang = require("../lib/lang");
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-
-var ShHighlightRules = function() {
-
-    var reservedKeywords = lang.arrayToMap(
-        ('!|{|}|case|do|done|elif|else|'+
-        'esac|fi|for|if|in|then|until|while|'+
-        '&|;'
-        ).split('|')
-    );
-
-    var languageConstructs = lang.arrayToMap(
-            // TODO
-        ('echo|exit|eval|source|[|]|test|'+
-         'true|false|read'
-         ).split('|')
-    );
-
-    var integer = "(?:(?:[1-9]\\d*)|(?:0))";
-    // var integer = "(?:" + decimalInteger + ")";
-
-    var fraction = "(?:\\.\\d+)";
-    var intPart = "(?:\\d+)";
-    var pointFloat = "(?:(?:" + intPart + "?" + fraction + ")|(?:" + intPart + "\\.))";
-    var exponentFloat = "(?:(?:" + pointFloat + "|" +  intPart + ")" + ")";
-    var floatNumber = "(?:" + exponentFloat + "|" + pointFloat + ")";
-    var fileDescriptor = "(?:&" + intPart + ")";
-
-    var variableName = "[a-zA-Z][a-zA-Z0-9_]*";
-    var variable = "(?:(?:\\$" + variableName + ")|(?:" + variableName + "=))";
-
-    var builtinVariable = "(?:\\$(?:SHLVL|\\$|\\!|\\?))";
-
-    var func = "(?:" + variableName + "\\s*\\(\\))";
-
-    this.$rules = {
-        "start" : [ {
-            token : "comment",
-            regex : "#.*$"
-        }, {
-            token : "string",           // " string
-            regex : '"(?:[^\\\\]|\\\\.)*?"'
-        }, {
-            token : "variable.language",
-            regex : builtinVariable
-        }, {
-            token : "variable",
-            regex : variable
-        }, {
-            token : "support.function",
-            regex : func,
-        }, {
-            token : "support.function",
-            regex : fileDescriptor
-        }, {
-            token : "string",           // ' string
-            regex : "'(?:[^\\\\]|\\\\.)*?'"
-        }, {
-            token : "constant.numeric", // float
-            regex : floatNumber
-        }, {
-            token : "constant.numeric", // integer
-            regex : integer + "\\b"
-        }, {
-            token : function(value) {
-                if (reservedKeywords.hasOwnProperty(value))
-                    return "keyword";
-                else if (languageConstructs.hasOwnProperty(value))
-                    return "constant.language";
-                else if (value == "debugger")
-                    return "invalid.deprecated";
-                else
-                    return "identifier";
-            },
-            regex : "[a-zA-Z_$][a-zA-Z0-9_$]*\\b"
-        }, {
-            token : "keyword.operator",
-            regex : "\\+|\\-|\\*|\\*\\*|\\/|\\/\\/|~|<|>|<=|=>|=|!="
-        }, {
-            token : "lparen.paren",
-            regex : "[\\[\\(\\{]"
-        }, {
-            token : "paren.rparen",
-            regex : "[\\]\\)\\}]"
-        }, {
-            token : "text",
-            regex : "\\s+"
-        } ]
-    };
-};
-
-oop.inherits(ShHighlightRules, TextHighlightRules);
-
-exports.ShHighlightRules = ShHighlightRules;
-});
diff --git a/apps/files_texteditor/js/aceeditor/mode-sh.js b/apps/files_texteditor/js/aceeditor/mode-sh.js
deleted file mode 100644
index 272aaccc85..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-sh.js
+++ /dev/null
@@ -1 +0,0 @@
-define("ace/mode/sh",["require","exports","module","ace/lib/oop","ace/mode/text","ace/tokenizer","ace/mode/sh_highlight_rules","ace/range"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text").Mode,f=a("../tokenizer").Tokenizer,g=a("./sh_highlight_rules").ShHighlightRules,h=a("../range").Range,i=function(){this.$tokenizer=new f((new g).getRules())};d.inherits(i,e),function(){this.toggleCommentLines=function(a,b,c,d){var e=!0,f=/^(\s*)#/;for(var g=c;g<=d;g++)if(!f.test(b.getLine(g))){e=!1;break}if(e){var i=new h(0,0,0,0);for(var g=c;g<=d;g++){var j=b.getLine(g),k=j.match(f);i.start.row=g,i.end.row=g,i.end.column=k[0].length,b.replace(i,k[1])}}else b.indentRows(c,d,"#")},this.getNextLineIndent=function(a,b,c){var d=this.$getIndent(b),e=this.$tokenizer.getLineTokens(b,a),f=e.tokens;if(f.length&&f[f.length-1].type=="comment")return d;if(a=="start"){var g=b.match(/^.*[\{\(\[\:]\s*$/);g&&(d+=c)}return d};var a={pass:1,"return":1,raise:1,"break":1,"continue":1};this.checkOutdent=function(b,c,d){if(d!=="\r\n"&&d!=="\r"&&d!=="\n")return!1;var e=this.$tokenizer.getLineTokens(c.trim(),b).tokens;if(!e)return!1;do var f=e.pop();while(f&&(f.type=="comment"||f.type=="text"&&f.value.match(/^\s+$/)));return f?f.type=="keyword"&&a[f.value]:!1},this.autoOutdent=function(a,b,c){c+=1;var d=this.$getIndent(b.getLine(c)),e=b.getTabString();d.slice(-e.length)==e&&b.remove(new h(c,d.length-e.length,c,d.length))}}.call(i.prototype),b.Mode=i}),define("ace/mode/sh_highlight_rules",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("../lib/lang"),f=a("./text_highlight_rules").TextHighlightRules,g=function(){var a=e.arrayToMap("!|{|}|case|do|done|elif|else|esac|fi|for|if|in|then|until|while|&|;".split("|")),b=e.arrayToMap("echo|exit|eval|source|[|]|test|true|false|read".split("|")),c="(?:(?:[1-9]\\d*)|(?:0))",d="(?:\\.\\d+)",f="(?:\\d+)",g="(?:(?:"+f+"?"+d+")|(?:"+f+"\\.))",h="(?:(?:"+g+"|"+f+")"+")",i="(?:"+h+"|"+g+")",j="(?:&"+f+")",k="[a-zA-Z][a-zA-Z0-9_]*",l="(?:(?:\\$"+k+")|(?:"+k+"=))",m="(?:\\$(?:SHLVL|\\$|\\!|\\?))",n="(?:"+k+"\\s*\\(\\))";this.$rules={start:[{token:"comment",regex:"#.*$"},{token:"string",regex:'"(?:[^\\\\]|\\\\.)*?"'},{token:"variable.language",regex:m},{token:"variable",regex:l},{token:"support.function",regex:n},{token:"support.function",regex:j},{token:"string",regex:"'(?:[^\\\\]|\\\\.)*?'"},{token:"constant.numeric",regex:i},{token:"constant.numeric",regex:c+"\\b"},{token:function(c){return a.hasOwnProperty(c)?"keyword":b.hasOwnProperty(c)?"constant.language":c=="debugger"?"invalid.deprecated":"identifier"},regex:"[a-zA-Z_$][a-zA-Z0-9_$]*\\b"},{token:"keyword.operator",regex:"\\+|\\-|\\*|\\*\\*|\\/|\\/\\/|~|<|>|<=|=>|=|!="},{token:"lparen.paren",regex:"[\\[\\(\\{]"},{token:"paren.rparen",regex:"[\\]\\)\\}]"},{token:"text",regex:"\\s+"}]}};d.inherits(g,f),b.ShHighlightRules=g})
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/mode-sql-uncompressed.js b/apps/files_texteditor/js/aceeditor/mode-sql-uncompressed.js
deleted file mode 100644
index e56ac4cb11..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-sql-uncompressed.js
+++ /dev/null
@@ -1,159 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
-* The Original Code is Ajax.org Code Editor (ACE).
-*
-* Contributor(s):
-*      Jonathan Camile <jonathan.camile AT gmail DOT com>
-*
-* 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 ***** */
-
-define('ace/mode/sql', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text', 'ace/tokenizer', 'ace/mode/sql_highlight_rules', 'ace/range'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
-var SqlHighlightRules = require("./sql_highlight_rules").SqlHighlightRules;
-var Range = require("../range").Range;
-
-var Mode = function() {
-    this.$tokenizer = new Tokenizer(new SqlHighlightRules().getRules());
-};
-oop.inherits(Mode, TextMode);
-
-(function() {
-
-    this.toggleCommentLines = function(state, doc, startRow, endRow) {
-        var outdent = true;
-        var outentedRows = [];
-        var re = /^(\s*)--/;
-
-        for (var i=startRow; i<= endRow; i++) {
-            if (!re.test(doc.getLine(i))) {
-                outdent = false;
-                break;
-            }
-        }
-
-        if (outdent) {
-            var deleteRange = new Range(0, 0, 0, 0);
-            for (var i=startRow; i<= endRow; i++)
-            {
-                var line = doc.getLine(i);
-                var m = line.match(re);
-                deleteRange.start.row = i;
-                deleteRange.end.row = i;
-                deleteRange.end.column = m[0].length;
-                doc.replace(deleteRange, m[1]);
-            }
-        }
-        else {
-            doc.indentRows(startRow, endRow, "--");
-        }
-    };
-
-}).call(Mode.prototype);
-
-exports.Mode = Mode;
-
-});
-/* ***** BEGIN LICENSE BLOCK *****
- * The Original Code is Ajax.org Code Editor (ACE).
- *
- * Contributor(s):
- *      Jonathan Camile <jonathan.camile AT gmail DOT com>
- *
- * 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 ***** */
-
-define('ace/mode/sql_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/lang', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var lang = require("../lib/lang");
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-
-var SqlHighlightRules = function() {
-
-    var keywords = lang.arrayToMap(
-        ("select|from|where|and|or|group|by|order|limit|offset|having|as|case|" +
-        "when|else|end|type|left|right|join|on|outer|desc|asc").split("|")
-    );
-
-    var builtinConstants = lang.arrayToMap(
-        ("true|false|null").split("|")
-    );
-
-    var builtinFunctions = lang.arrayToMap(
-        ("count|min|max|avg|sum|rank|now|coalesce").split("|")
-    );
-
-    this.$rules = {
-        "start" : [ {
-            token : "comment",
-            regex : "--.*$"
-        }, {
-            token : "string",           // " string
-            regex : '".*"'
-        }, {
-            token : "string",           // ' string
-            regex : "'.*'"
-        }, {
-            token : "constant.numeric", // float
-            regex : "[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"
-        }, {
-            token : function(value) {
-                value = value.toLowerCase();
-                if (keywords.hasOwnProperty(value))
-                    return "keyword";
-                else if (builtinConstants.hasOwnProperty(value))
-                    return "constant.language";
-                else if (builtinFunctions.hasOwnProperty(value))
-                    return "support.function";
-                else
-                    return "identifier";
-            },
-            regex : "[a-zA-Z_$][a-zA-Z0-9_$]*\\b"
-        }, {
-            token : "keyword.operator",
-            regex : "\\+|\\-|\\/|\\/\\/|%|<@>|@>|<@|&|\\^|~|<|>|<=|=>|==|!=|<>|="
-        }, {
-            token : "lparen.paren",
-            regex : "[\\(]"
-        }, {
-            token : "paren.rparen",
-            regex : "[\\)]"
-        }, {
-            token : "text",
-            regex : "\\s+"
-        } ]
-    };
-};
-
-oop.inherits(SqlHighlightRules, TextHighlightRules);
-
-exports.SqlHighlightRules = SqlHighlightRules;
-});
-
diff --git a/apps/files_texteditor/js/aceeditor/mode-sql.js b/apps/files_texteditor/js/aceeditor/mode-sql.js
deleted file mode 100644
index e81fadfb36..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-sql.js
+++ /dev/null
@@ -1 +0,0 @@
-define("ace/mode/sql",["require","exports","module","ace/lib/oop","ace/mode/text","ace/tokenizer","ace/mode/sql_highlight_rules","ace/range"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text").Mode,f=a("../tokenizer").Tokenizer,g=a("./sql_highlight_rules").SqlHighlightRules,h=a("../range").Range,i=function(){this.$tokenizer=new f((new g).getRules())};d.inherits(i,e),function(){this.toggleCommentLines=function(a,b,c,d){var e=!0,f=[],g=/^(\s*)--/;for(var i=c;i<=d;i++)if(!g.test(b.getLine(i))){e=!1;break}if(e){var j=new h(0,0,0,0);for(var i=c;i<=d;i++){var k=b.getLine(i),l=k.match(g);j.start.row=i,j.end.row=i,j.end.column=l[0].length,b.replace(j,l[1])}}else b.indentRows(c,d,"--")}}.call(i.prototype),b.Mode=i}),define("ace/mode/sql_highlight_rules",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("../lib/lang"),f=a("./text_highlight_rules").TextHighlightRules,g=function(){var a=e.arrayToMap("select|from|where|and|or|group|by|order|limit|offset|having|as|case|when|else|end|type|left|right|join|on|outer|desc|asc".split("|")),b=e.arrayToMap("true|false|null".split("|")),c=e.arrayToMap("count|min|max|avg|sum|rank|now|coalesce".split("|"));this.$rules={start:[{token:"comment",regex:"--.*$"},{token:"string",regex:'".*"'},{token:"string",regex:"'.*'"},{token:"constant.numeric",regex:"[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"},{token:function(d){return d=d.toLowerCase(),a.hasOwnProperty(d)?"keyword":b.hasOwnProperty(d)?"constant.language":c.hasOwnProperty(d)?"support.function":"identifier"},regex:"[a-zA-Z_$][a-zA-Z0-9_$]*\\b"},{token:"keyword.operator",regex:"\\+|\\-|\\/|\\/\\/|%|<@>|@>|<@|&|\\^|~|<|>|<=|=>|==|!=|<>|="},{token:"lparen.paren",regex:"[\\(]"},{token:"paren.rparen",regex:"[\\)]"},{token:"text",regex:"\\s+"}]}};d.inherits(g,f),b.SqlHighlightRules=g})
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/mode-svg-uncompressed.js b/apps/files_texteditor/js/aceeditor/mode-svg-uncompressed.js
deleted file mode 100644
index 1025d99bd3..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-svg-uncompressed.js
+++ /dev/null
@@ -1,2112 +0,0 @@
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/svg', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/xml', 'ace/mode/javascript', 'ace/tokenizer', 'ace/mode/svg_highlight_rules', 'ace/mode/folding/mixed', 'ace/mode/folding/xml', 'ace/mode/folding/cstyle'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var XmlMode = require("./xml").Mode;
-var JavaScriptMode = require("./javascript").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
-var SvgHighlightRules = require("./svg_highlight_rules").SvgHighlightRules;
-var MixedFoldMode = require("./folding/mixed").FoldMode;
-var XmlFoldMode = require("./folding/xml").FoldMode;
-var CStyleFoldMode = require("./folding/cstyle").FoldMode;
-
-var Mode = function() {
-    XmlMode.call(this);
-    
-    this.highlighter = new SvgHighlightRules();
-    this.$tokenizer = new Tokenizer(this.highlighter.getRules());
-    
-    this.$embeds = this.highlighter.getEmbeds();
-    this.createModeDelegates({
-        "js-": JavaScriptMode
-    });
-    
-    this.foldingRules = new MixedFoldMode(new XmlFoldMode({}), {
-        "js-": new CStyleFoldMode()
-    });
-};
-
-oop.inherits(Mode, XmlMode);
-
-(function() {
-
-    this.getNextLineIndent = function(state, line, tab) {
-        return this.$getIndent(line);
-    };
-    
-
-}).call(Mode.prototype);
-
-exports.Mode = Mode;
-});
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/xml', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text', 'ace/tokenizer', 'ace/mode/xml_highlight_rules', 'ace/mode/behaviour/xml', 'ace/mode/folding/xml'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
-var XmlHighlightRules = require("./xml_highlight_rules").XmlHighlightRules;
-var XmlBehaviour = require("./behaviour/xml").XmlBehaviour;
-var XmlFoldMode = require("./folding/xml").FoldMode;
-
-var Mode = function() {
-    this.$tokenizer = new Tokenizer(new XmlHighlightRules().getRules());
-    this.$behaviour = new XmlBehaviour();
-    this.foldingRules = new XmlFoldMode();
-};
-
-oop.inherits(Mode, TextMode);
-
-(function() {
-    
-    this.getNextLineIndent = function(state, line, tab) {
-        return this.$getIndent(line);
-    };
-
-}).call(Mode.prototype);
-
-exports.Mode = Mode;
-});
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/xml_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/xml_util', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var xmlUtil = require("./xml_util");
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-
-var XmlHighlightRules = function() {
-
-    // regexp must not have capturing parentheses
-    // regexps are ordered -> the first match is used
-    this.$rules = {
-        start : [{
-            token : "text",
-            regex : "<\\!\\[CDATA\\[",
-            next : "cdata"
-        }, {
-            token : "xml_pe",
-            regex : "<\\?.*?\\?>"
-        }, {
-            token : "comment",
-            merge : true,
-            regex : "<\\!--",
-            next : "comment"
-        }, {
-            token : "xml_pe",
-            regex : "<\\!.*?>"
-        }, {
-            token : "meta.tag", // opening tag
-            regex : "<\\/?",
-            next : "tag"
-        }, {
-            token : "text",
-            regex : "\\s+"
-        }, {
-            token : "constant.character.entity",
-            regex : "(?:&#[0-9]+;)|(?:&#x[0-9a-fA-F]+;)|(?:&[a-zA-Z0-9_:\\.-]+;)"
-        }, {
-            token : "text",
-            regex : "[^<]+"
-        }],
-        
-        cdata : [{
-            token : "text",
-            regex : "\\]\\]>",
-            next : "start"
-        }, {
-            token : "text",
-            regex : "\\s+"
-        }, {
-            token : "text",
-            regex : "(?:[^\\]]|\\](?!\\]>))+"
-        }],
-
-        comment : [{
-            token : "comment",
-            regex : ".*?-->",
-            next : "start"
-        }, {
-            token : "comment",
-            merge : true,
-            regex : ".+"
-        }]
-    };
-    
-    xmlUtil.tag(this.$rules, "tag", "start");
-};
-
-oop.inherits(XmlHighlightRules, TextHighlightRules);
-
-exports.XmlHighlightRules = XmlHighlightRules;
-});
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/xml_util', ['require', 'exports', 'module' , 'ace/lib/lang'], function(require, exports, module) {
-"use strict";
-
-var lang = require("../lib/lang");
-
-var formTags = lang.arrayToMap(
-    ("button|form|input|label|select|textarea").split("|")
-);
-
-var tableTags = lang.arrayToMap(
-    ("table|tbody|td|tfoot|th|tr").split("|")
-);
-
-function string(state) {
-    return [{
-        token : "string",
-        regex : '".*?"'
-    }, {
-        token : "string", // multi line string start
-        merge : true,
-        regex : '["].*',
-        next : state + "_qqstring"
-    }, {
-        token : "string",
-        regex : "'.*?'"
-    }, {
-        token : "string", // multi line string start
-        merge : true,
-        regex : "['].*",
-        next : state + "_qstring"
-    }];
-}
-
-function multiLineString(quote, state) {
-    return [{
-        token : "string",
-        merge : true,
-        regex : ".*?" + quote,
-        next : state
-    }, {
-        token : "string",
-        merge : true,
-        regex : '.+'
-    }];
-}
-
-exports.tag = function(states, name, nextState) {
-    states[name] = [{
-        token : "text",
-        regex : "\\s+"
-    }, {
-        //token : "meta.tag",
-        
-    token : function(value) {
-            if ( value==='a' ) {
-                return "meta.tag.anchor";
-            }
-            else if ( value==='img' ) {
-                return "meta.tag.image";
-            }
-            else if ( value==='script' ) {
-                return "meta.tag.script";
-            }
-            else if ( value==='style' ) {
-                return "meta.tag.style";
-            }
-            else if (formTags.hasOwnProperty(value.toLowerCase())) {
-                return "meta.tag.form";
-            }
-            else if (tableTags.hasOwnProperty(value.toLowerCase())) {
-                return "meta.tag.table";
-            }
-            else {
-                return "meta.tag";
-            }
-        },        
-        merge : true,
-        regex : "[-_a-zA-Z0-9:]+",
-        next : name + "_embed_attribute_list" 
-    }, {
-        token: "empty",
-        regex: "",
-        next : name + "_embed_attribute_list"
-    }];
-
-    states[name + "_qstring"] = multiLineString("'", name + "_embed_attribute_list");
-    states[name + "_qqstring"] = multiLineString("\"", name + "_embed_attribute_list");
-    
-    states[name + "_embed_attribute_list"] = [{
-        token : "meta.tag",
-        merge : true,
-        regex : "\/?>",
-        next : nextState
-    }, {
-        token : "keyword.operator",
-        regex : "="
-    }, {
-        token : "entity.other.attribute-name",
-        regex : "[-_a-zA-Z0-9:]+"
-    }, {
-        token : "constant.numeric", // float
-        regex : "[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"
-    }, {
-        token : "text",
-        regex : "\\s+"
-    }].concat(string(name));
-};
-
-});
-/* vim:ts=4:sts=4:sw=4:
- * ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Chris Spencer <chris.ag.spencer AT googlemail DOT com>
- *
- * 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 ***** */
-
-define('ace/mode/behaviour/xml', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/behaviour', 'ace/mode/behaviour/cstyle'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../../lib/oop");
-var Behaviour = require("../behaviour").Behaviour;
-var CstyleBehaviour = require("./cstyle").CstyleBehaviour;
-
-var XmlBehaviour = function () {
-    
-    this.inherit(CstyleBehaviour, ["string_dquotes"]); // Get string behaviour
-    
-    this.add("brackets", "insertion", function (state, action, editor, session, text) {
-        if (text == '<') {
-            var selection = editor.getSelectionRange();
-            var selected = session.doc.getTextRange(selection);
-            if (selected !== "") {
-                return false;
-            } else {
-                return {
-                    text: '<>',
-                    selection: [1, 1]
-                }
-            }
-        } else if (text == '>') {
-            var cursor = editor.getCursorPosition();
-            var line = session.doc.getLine(cursor.row);
-            var rightChar = line.substring(cursor.column, cursor.column + 1);
-            if (rightChar == '>') { // need some kind of matching check here
-                return {
-                    text: '',
-                    selection: [1, 1]
-                }
-            }
-        } else if (text == "\n") {
-            var cursor = editor.getCursorPosition();
-            var line = session.doc.getLine(cursor.row);
-            var rightChars = line.substring(cursor.column, cursor.column + 2);
-            if (rightChars == '</') {
-                var indent = this.$getIndent(session.doc.getLine(cursor.row)) + session.getTabString();
-                var next_indent = this.$getIndent(session.doc.getLine(cursor.row));
-
-                return {
-                    text: '\n' + indent + '\n' + next_indent,
-                    selection: [1, indent.length, 1, indent.length]
-                }
-            }
-        }
-    });
-    
-}
-oop.inherits(XmlBehaviour, Behaviour);
-
-exports.XmlBehaviour = XmlBehaviour;
-});/* vim:ts=4:sts=4:sw=4:
- * ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Chris Spencer <chris.ag.spencer AT googlemail DOT com>
- *
- * 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 ***** */
-
-define('ace/mode/behaviour/cstyle', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/behaviour'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../../lib/oop");
-var Behaviour = require('../behaviour').Behaviour;
-
-var CstyleBehaviour = function () {
-
-    this.add("braces", "insertion", function (state, action, editor, session, text) {
-        if (text == '{') {
-            var selection = editor.getSelectionRange();
-            var selected = session.doc.getTextRange(selection);
-            if (selected !== "") {
-                return {
-                    text: '{' + selected + '}',
-                    selection: false
-                };
-            } else {
-                return {
-                    text: '{}',
-                    selection: [1, 1]
-                };
-            }
-        } else if (text == '}') {
-            var cursor = editor.getCursorPosition();
-            var line = session.doc.getLine(cursor.row);
-            var rightChar = line.substring(cursor.column, cursor.column + 1);
-            if (rightChar == '}') {
-                var matching = session.$findOpeningBracket('}', {column: cursor.column + 1, row: cursor.row});
-                if (matching !== null) {
-                    return {
-                        text: '',
-                        selection: [1, 1]
-                    };
-                }
-            }
-        } else if (text == "\n") {
-            var cursor = editor.getCursorPosition();
-            var line = session.doc.getLine(cursor.row);
-            var rightChar = line.substring(cursor.column, cursor.column + 1);
-            if (rightChar == '}') {
-                var openBracePos = session.findMatchingBracket({row: cursor.row, column: cursor.column + 1});
-                if (!openBracePos)
-                     return null;
-
-                var indent = this.getNextLineIndent(state, line.substring(0, line.length - 1), session.getTabString());
-                var next_indent = this.$getIndent(session.doc.getLine(openBracePos.row));
-
-                return {
-                    text: '\n' + indent + '\n' + next_indent,
-                    selection: [1, indent.length, 1, indent.length]
-                };
-            }
-        }
-    });
-
-    this.add("braces", "deletion", function (state, action, editor, session, range) {
-        var selected = session.doc.getTextRange(range);
-        if (!range.isMultiLine() && selected == '{') {
-            var line = session.doc.getLine(range.start.row);
-            var rightChar = line.substring(range.end.column, range.end.column + 1);
-            if (rightChar == '}') {
-                range.end.column++;
-                return range;
-            }
-        }
-    });
-
-    this.add("parens", "insertion", function (state, action, editor, session, text) {
-        if (text == '(') {
-            var selection = editor.getSelectionRange();
-            var selected = session.doc.getTextRange(selection);
-            if (selected !== "") {
-                return {
-                    text: '(' + selected + ')',
-                    selection: false
-                };
-            } else {
-                return {
-                    text: '()',
-                    selection: [1, 1]
-                };
-            }
-        } else if (text == ')') {
-            var cursor = editor.getCursorPosition();
-            var line = session.doc.getLine(cursor.row);
-            var rightChar = line.substring(cursor.column, cursor.column + 1);
-            if (rightChar == ')') {
-                var matching = session.$findOpeningBracket(')', {column: cursor.column + 1, row: cursor.row});
-                if (matching !== null) {
-                    return {
-                        text: '',
-                        selection: [1, 1]
-                    };
-                }
-            }
-        }
-    });
-
-    this.add("parens", "deletion", function (state, action, editor, session, range) {
-        var selected = session.doc.getTextRange(range);
-        if (!range.isMultiLine() && selected == '(') {
-            var line = session.doc.getLine(range.start.row);
-            var rightChar = line.substring(range.start.column + 1, range.start.column + 2);
-            if (rightChar == ')') {
-                range.end.column++;
-                return range;
-            }
-        }
-    });
-
-    this.add("string_dquotes", "insertion", function (state, action, editor, session, text) {
-        if (text == '"' || text == "'") {
-            var quote = text;
-            var selection = editor.getSelectionRange();
-            var selected = session.doc.getTextRange(selection);
-            if (selected !== "") {
-                return {
-                    text: quote + selected + quote,
-                    selection: false
-                };
-            } else {
-                var cursor = editor.getCursorPosition();
-                var line = session.doc.getLine(cursor.row);
-                var leftChar = line.substring(cursor.column-1, cursor.column);
-
-                // We're escaped.
-                if (leftChar == '\\') {
-                    return null;
-                }
-
-                // Find what token we're inside.
-                var tokens = session.getTokens(selection.start.row, selection.start.row)[0].tokens;
-                var col = 0, token;
-                var quotepos = -1; // Track whether we're inside an open quote.
-
-                for (var x = 0; x < tokens.length; x++) {
-                    token = tokens[x];
-                    if (token.type == "string") {
-                      quotepos = -1;
-                    } else if (quotepos < 0) {
-                      quotepos = token.value.indexOf(quote);
-                    }
-                    if ((token.value.length + col) > selection.start.column) {
-                        break;
-                    }
-                    col += tokens[x].value.length;
-                }
-
-                // Try and be smart about when we auto insert.
-                if (!token || (quotepos < 0 && token.type !== "comment" && (token.type !== "string" || ((selection.start.column !== token.value.length+col-1) && token.value.lastIndexOf(quote) === token.value.length-1)))) {
-                    return {
-                        text: quote + quote,
-                        selection: [1,1]
-                    };
-                } else if (token && token.type === "string") {
-                    // Ignore input and move right one if we're typing over the closing quote.
-                    var rightChar = line.substring(cursor.column, cursor.column + 1);
-                    if (rightChar == quote) {
-                        return {
-                            text: '',
-                            selection: [1, 1]
-                        };
-                    }
-                }
-            }
-        }
-    });
-
-    this.add("string_dquotes", "deletion", function (state, action, editor, session, range) {
-        var selected = session.doc.getTextRange(range);
-        if (!range.isMultiLine() && (selected == '"' || selected == "'")) {
-            var line = session.doc.getLine(range.start.row);
-            var rightChar = line.substring(range.start.column + 1, range.start.column + 2);
-            if (rightChar == '"') {
-                range.end.column++;
-                return range;
-            }
-        }
-    });
-
-};
-
-oop.inherits(CstyleBehaviour, Behaviour);
-
-exports.CstyleBehaviour = CstyleBehaviour;
-});/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/folding/xml', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/lang', 'ace/range', 'ace/mode/folding/fold_mode', 'ace/token_iterator'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../../lib/oop");
-var lang = require("../../lib/lang");
-var Range = require("../../range").Range;
-var BaseFoldMode = require("./fold_mode").FoldMode;
-var TokenIterator = require("../../token_iterator").TokenIterator;
-
-var FoldMode = exports.FoldMode = function(voidElements) {
-    BaseFoldMode.call(this);
-    this.voidElements = voidElements || {};
-};
-oop.inherits(FoldMode, BaseFoldMode);
-
-(function() {
-
-    this.getFoldWidget = function(session, foldStyle, row) {
-        var tag = this._getFirstTagInLine(session, row);
-
-        if (tag.closing)
-            return foldStyle == "markbeginend" ? "end" : "";
-
-        if (!tag.tagName || this.voidElements[tag.tagName.toLowerCase()])
-            return "";
-
-        if (tag.selfClosing)
-            return "";
-
-        if (tag.value.indexOf("/" + tag.tagName) !== -1)
-            return "";
-
-        return "start";
-    };
-    
-    this._getFirstTagInLine = function(session, row) {
-        var tokens = session.getTokens(row, row)[0].tokens;
-        var value = "";
-        for (var i = 0; i < tokens.length; i++) {
-            var token = tokens[i];
-            if (token.type.indexOf("meta.tag") === 0)
-                value += token.value;
-            else
-                value += lang.stringRepeat(" ", token.value.length);
-        }
-        
-        return this._parseTag(value);
-    };
-
-    this.tagRe = /^(\s*)(<?(\/?)([-_a-zA-Z0-9:!]*)\s*(\/?)>?)/;
-    this._parseTag = function(tag) {
-        
-        var match = this.tagRe.exec(tag);
-        var column = this.tagRe.lastIndex || 0;
-        this.tagRe.lastIndex = 0;
-
-        return {
-            value: tag,
-            match: match ? match[2] : "",
-            closing: match ? !!match[3] : false,
-            selfClosing: match ? !!match[5] || match[2] == "/>" : false,
-            tagName: match ? match[4] : "",
-            column: match[1] ? column + match[1].length : column
-        };
-    };
-    
-    /**
-     * reads a full tag and places the iterator after the tag
-     */
-    this._readTagForward = function(iterator) {
-        var token = iterator.getCurrentToken();
-        if (!token)
-            return null;
-            
-        var value = "";
-        var start;
-        
-        do {
-            if (token.type.indexOf("meta.tag") === 0) {
-                if (!start) {
-                    var start = {
-                        row: iterator.getCurrentTokenRow(),
-                        column: iterator.getCurrentTokenColumn()
-                    };
-                }
-                value += token.value;
-                if (value.indexOf(">") !== -1) {
-                    var tag = this._parseTag(value);
-                    tag.start = start;
-                    tag.end = {
-                        row: iterator.getCurrentTokenRow(),
-                        column: iterator.getCurrentTokenColumn() + token.value.length
-                    };
-                    iterator.stepForward();
-                    return tag;
-                }
-            }
-        } while(token = iterator.stepForward());
-        
-        return null;
-    };
-    
-    this._readTagBackward = function(iterator) {
-        var token = iterator.getCurrentToken();
-        if (!token)
-            return null;
-            
-        var value = "";
-        var end;
-
-        do {
-            if (token.type.indexOf("meta.tag") === 0) {
-                if (!end) {
-                    end = {
-                        row: iterator.getCurrentTokenRow(),
-                        column: iterator.getCurrentTokenColumn() + token.value.length
-                    };
-                }
-                value = token.value + value;
-                if (value.indexOf("<") !== -1) {
-                    var tag = this._parseTag(value);
-                    tag.end = end;
-                    tag.start = {
-                        row: iterator.getCurrentTokenRow(),
-                        column: iterator.getCurrentTokenColumn()
-                    };
-                    iterator.stepBackward();
-                    return tag;
-                }
-            }
-        } while(token = iterator.stepBackward());
-        
-        return null;
-    };
-    
-    this._pop = function(stack, tag) {
-        while (stack.length) {
-            
-            var top = stack[stack.length-1];
-            if (!tag || top.tagName == tag.tagName) {
-                return stack.pop();
-            }
-            else if (this.voidElements[tag.tagName]) {
-                return;
-            }
-            else if (this.voidElements[top.tagName]) {
-                stack.pop();
-                continue;
-            } else {
-                return null;
-            }
-        }
-    };
-    
-    this.getFoldWidgetRange = function(session, foldStyle, row) {
-        var firstTag = this._getFirstTagInLine(session, row);
-        
-        if (!firstTag.match)
-            return null;
-        
-        var isBackward = firstTag.closing || firstTag.selfClosing;
-        var stack = [];
-        var tag;
-        
-        if (!isBackward) {
-            var iterator = new TokenIterator(session, row, firstTag.column);
-            var start = {
-                row: row,
-                column: firstTag.column + firstTag.tagName.length + 2
-            };
-            while (tag = this._readTagForward(iterator)) {
-                if (tag.selfClosing) {
-                    if (!stack.length) {
-                        tag.start.column += tag.tagName.length + 2;
-                        tag.end.column -= 2;
-                        return Range.fromPoints(tag.start, tag.end);
-                    } else
-                        continue;
-                }
-                
-                if (tag.closing) {
-                    this._pop(stack, tag);
-                    if (stack.length == 0)
-                        return Range.fromPoints(start, tag.start);
-                }
-                else {
-                    stack.push(tag)
-                }
-            }
-        }
-        else {
-            var iterator = new TokenIterator(session, row, firstTag.column + firstTag.match.length);
-            var end = {
-                row: row,
-                column: firstTag.column
-            };
-            
-            while (tag = this._readTagBackward(iterator)) {
-                if (tag.selfClosing) {
-                    if (!stack.length) {
-                        tag.start.column += tag.tagName.length + 2;
-                        tag.end.column -= 2;
-                        return Range.fromPoints(tag.start, tag.end);
-                    } else
-                        continue;
-                }
-                
-                if (!tag.closing) {
-                    this._pop(stack, tag);
-                    if (stack.length == 0) {
-                        tag.start.column += tag.tagName.length + 2;
-                        return Range.fromPoints(tag.start, end);
-                    }
-                }
-                else {
-                    stack.push(tag)
-                }
-            }
-        }
-        
-    };
-
-}).call(FoldMode.prototype);
-
-});/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/folding/fold_mode', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
-"use strict";
-
-var Range = require("../../range").Range;
-
-var FoldMode = exports.FoldMode = function() {};
-
-(function() {
-
-    this.foldingStartMarker = null;
-    this.foldingStopMarker = null;
-
-    // must return "" if there's no fold, to enable caching
-    this.getFoldWidget = function(session, foldStyle, row) {
-        var line = session.getLine(row);
-        if (this.foldingStartMarker.test(line))
-            return "start";
-        if (foldStyle == "markbeginend"
-                && this.foldingStopMarker
-                && this.foldingStopMarker.test(line))
-            return "end";
-        return "";
-    };
-    
-    this.getFoldWidgetRange = function(session, foldStyle, row) {
-        return null;
-    };
-
-    this.indentationBlock = function(session, row, column) {
-        var re = /^\s*/;
-        var startRow = row;
-        var endRow = row;
-        var line = session.getLine(row);
-        var startColumn = column || line.length;
-        var startLevel = line.match(re)[0].length;
-        var maxRow = session.getLength()
-        
-        while (++row < maxRow) {
-            line = session.getLine(row);
-            var level = line.match(re)[0].length;
-
-            if (level == line.length)
-                continue;
-
-            if (level <= startLevel)
-                break;
-
-            endRow = row;
-        }
-
-        if (endRow > startRow) {
-            var endColumn = session.getLine(endRow).length;
-            return new Range(startRow, startColumn, endRow, endColumn);
-        }
-    };
-
-    this.openingBracketBlock = function(session, bracket, row, column) {
-        var start = {row: row, column: column + 1};
-        var end = session.$findClosingBracket(bracket, start);
-        if (!end)
-            return;
-
-        var fw = session.foldWidgets[end.row];
-        if (fw == null)
-            fw = this.getFoldWidget(session, end.row);
-
-        if (fw == "start") {
-            end.row --;
-            end.column = session.getLine(end.row).length;
-        }
-        return Range.fromPoints(start, end);
-    };
-
-}).call(FoldMode.prototype);
-
-});
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/javascript', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text', 'ace/tokenizer', 'ace/mode/javascript_highlight_rules', 'ace/mode/matching_brace_outdent', 'ace/range', 'ace/worker/worker_client', 'ace/mode/behaviour/cstyle', 'ace/mode/folding/cstyle'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
-var JavaScriptHighlightRules = require("./javascript_highlight_rules").JavaScriptHighlightRules;
-var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
-var Range = require("../range").Range;
-var WorkerClient = require("../worker/worker_client").WorkerClient;
-var CstyleBehaviour = require("./behaviour/cstyle").CstyleBehaviour;
-var CStyleFoldMode = require("./folding/cstyle").FoldMode;
-
-var Mode = function() {
-    this.$tokenizer = new Tokenizer(new JavaScriptHighlightRules().getRules());
-    this.$outdent = new MatchingBraceOutdent();
-    this.$behaviour = new CstyleBehaviour();
-    this.foldingRules = new CStyleFoldMode();
-};
-oop.inherits(Mode, TextMode);
-
-(function() {
-
-
-    this.toggleCommentLines = function(state, doc, startRow, endRow) {
-        var outdent = true;
-        var re = /^(\s*)\/\//;
-
-        for (var i=startRow; i<= endRow; i++) {
-            if (!re.test(doc.getLine(i))) {
-                outdent = false;
-                break;
-            }
-        }
-
-        if (outdent) {
-            var deleteRange = new Range(0, 0, 0, 0);
-            for (var i=startRow; i<= endRow; i++)
-            {
-                var line = doc.getLine(i);
-                var m = line.match(re);
-                deleteRange.start.row = i;
-                deleteRange.end.row = i;
-                deleteRange.end.column = m[0].length;
-                doc.replace(deleteRange, m[1]);
-            }
-        }
-        else {
-            doc.indentRows(startRow, endRow, "//");
-        }
-    };
-
-    this.getNextLineIndent = function(state, line, tab) {
-        var indent = this.$getIndent(line);
-
-        var tokenizedLine = this.$tokenizer.getLineTokens(line, state);
-        var tokens = tokenizedLine.tokens;
-        var endState = tokenizedLine.state;
-
-        if (tokens.length && tokens[tokens.length-1].type == "comment") {
-            return indent;
-        }
-        
-        if (state == "start" || state == "regex_allowed") {
-            var match = line.match(/^.*(?:\bcase\b.*\:|[\{\(\[])\s*$/);
-            if (match) {
-                indent += tab;
-            }
-        } else if (state == "doc-start") {
-            if (endState == "start" || state == "regex_allowed") {
-                return "";
-            }
-            var match = line.match(/^\s*(\/?)\*/);
-            if (match) {
-                if (match[1]) {
-                    indent += " ";
-                }
-                indent += "* ";
-            }
-        }
-
-        return indent;
-    };
-
-    this.checkOutdent = function(state, line, input) {
-        return this.$outdent.checkOutdent(line, input);
-    };
-
-    this.autoOutdent = function(state, doc, row) {
-        this.$outdent.autoOutdent(doc, row);
-    };
-    
-    this.createWorker = function(session) {
-        var worker = new WorkerClient(["ace"], "worker-javascript.js", "ace/mode/javascript_worker", "JavaScriptWorker");
-        worker.attachToDocument(session.getDocument());
-            
-        worker.on("jslint", function(results) {
-            var errors = [];
-            for (var i=0; i<results.data.length; i++) {
-                var error = results.data[i];
-                if (error)
-                    errors.push({
-                        row: error.line-1,
-                        column: error.character-1,
-                        text: error.reason,
-                        type: "warning",
-                        lint: error
-                    });
-            }
-            session.setAnnotations(errors);
-        });
-        
-        worker.on("narcissus", function(e) {
-            session.setAnnotations([e.data]);
-        });
-        
-        worker.on("terminate", function() {
-            session.clearAnnotations();
-        });
-        
-        return worker;
-    };
-
-}).call(Mode.prototype);
-
-exports.Mode = Mode;
-});
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *      Mihai Sucan <mihai DOT sucan AT gmail DOT com>
- *
- * 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 ***** */
-
-define('ace/mode/javascript_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/lang', 'ace/unicode', 'ace/mode/doc_comment_highlight_rules', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var lang = require("../lib/lang");
-var unicode = require("../unicode");
-var DocCommentHighlightRules = require("./doc_comment_highlight_rules").DocCommentHighlightRules;
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-
-var JavaScriptHighlightRules = function() {
-
-    // see: https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects
-    var globals = lang.arrayToMap(
-      // Constructors
-        ("Array|Boolean|Date|Function|Iterator|Number|Object|RegExp|String|Proxy|" +
-      // E4X
-         "Namespace|QName|XML|XMLList|" +
-         "ArrayBuffer|Float32Array|Float64Array|Int16Array|Int32Array|Int8Array|" +
-         "Uint16Array|Uint32Array|Uint8Array|Uint8ClampedArray|" +
-      // Errors
-        "Error|EvalError|InternalError|RangeError|ReferenceError|StopIteration|" +
-        "SyntaxError|TypeError|URIError|" +
-      //  Non-constructor functions
-        "decodeURI|decodeURIComponent|encodeURI|encodeURIComponent|eval|isFinite|" +
-        "isNaN|parseFloat|parseInt|" +
-      // Other
-        "JSON|Math|" +
-      // Pseudo
-        "this|arguments|prototype|window|document"
-      ).split("|")
-    );
-
-    var keywords = lang.arrayToMap(
-        ("break|case|catch|continue|default|delete|do|else|finally|for|function|" +
-        "if|in|instanceof|new|return|switch|throw|try|typeof|let|var|while|with|" +
-        "const|yield|import|get|set").split("|")
-    );
-
-    // keywords which can be followed by regular expressions
-    var kwBeforeRe = "case|do|else|finally|in|instanceof|return|throw|try|typeof|yield";
-
-    var deprecated = lang.arrayToMap(
-        ("__parent__|__count__|escape|unescape|with|__proto__").split("|")
-    );
-
-    var definitions = lang.arrayToMap(("const|let|var|function").split("|"));
-
-    var buildinConstants = lang.arrayToMap(
-        ("null|Infinity|NaN|undefined").split("|")
-    );
-
-    var futureReserved = lang.arrayToMap(
-        ("class|enum|extends|super|export|implements|private|" +
-        "public|interface|package|protected|static").split("|")
-    );
-
-    // TODO: Unicode escape sequences
-    var identifierRe = "[" + unicode.packages.L + "\\$_]["
-        + unicode.packages.L
-        + unicode.packages.Mn + unicode.packages.Mc
-        + unicode.packages.Nd
-        + unicode.packages.Pc + "\\$_]*\\b";
-
-    var escapedRe = "\\\\(?:x[0-9a-fA-F]{2}|" + // hex
-        "u[0-9a-fA-F]{4}|" + // unicode
-        "[0-2][0-7]{0,2}|" + // oct
-        "3[0-6][0-7]?|" + // oct
-        "37[0-7]?|" + // oct
-        "[4-7][0-7]?|" + //oct
-        ".)";
-
-    // regexp must not have capturing parentheses. Use (?:) instead.
-    // regexps are ordered -> the first match is used
-
-    this.$rules = {
-        "start" : [
-            {
-                token : "comment",
-                regex : /\/\/.*$/
-            },
-            new DocCommentHighlightRules().getStartRule("doc-start"),
-            {
-                token : "comment", // multi line comment
-                merge : true,
-                regex : /\/\*/,
-                next : "comment"
-            }, {
-                token : "string",
-                regex : "'",
-                next  : "qstring"
-            }, {
-                token : "string",
-                regex : '"',
-                next  : "qqstring"
-            }, {
-                token : "constant.numeric", // hex
-                regex : /0[xX][0-9a-fA-F]+\b/
-            }, {
-                token : "constant.numeric", // float
-                regex : /[+-]?\d+(?:(?:\.\d*)?(?:[eE][+-]?\d+)?)?\b/
-            }, { // match stuff like: Sound.prototype.play = function() { }
-                token : [
-                    "storage.type",
-                    "punctuation.operator",
-                    "support.function",
-                    "punctuation.operator",
-                    "entity.name.function",
-                    "text",
-                    "keyword.operator",
-                    "text",
-                    "storage.type",
-                    "text",
-                    "paren.lparen",
-                    "variable.parameter",
-                    "paren.rparen"
-                ],
-                regex : "(" + identifierRe + ")(\\.)(prototype)(\\.)(" + identifierRe +")(\\s*)(=)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"
-            }, { // match stuff like: Sound.prototype.play = myfunc
-                token : [
-                    "storage.type",
-                    "punctuation.operator",
-                    "support.function",
-                    "punctuation.operator",
-                    "entity.name.function",
-                    "text",
-                    "keyword.operator",
-                    "text"
-                ],
-                regex : "(" + identifierRe + ")(\\.)(prototype)(\\.)(" + identifierRe +")(\\s*)(=)(\\s*)"
-            }, { // match stuff like: Sound.play = function() {  }
-                token : [
-                    "storage.type",
-                    "punctuation.operator",
-                    "entity.name.function",
-                    "text",
-                    "keyword.operator",
-                    "text",
-                    "storage.type",
-                    "text",
-                    "paren.lparen",
-                    "variable.parameter",
-                    "paren.rparen"
-                ],
-                regex : "(" + identifierRe + ")(\\.)(" + identifierRe +")(\\s*)(=)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"
-            }, { // match stuff like: play = function() {  }
-                token : [
-                    "entity.name.function",
-                    "text",
-                    "keyword.operator",
-                    "text",
-                    "storage.type",
-                    "text",
-                    "paren.lparen",
-                    "variable.parameter",
-                    "paren.rparen"
-                ],
-                regex : "(" + identifierRe +")(\\s*)(=)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"
-            }, { // match regular function like: function myFunc(arg) { }
-                token : [
-                    "storage.type",
-                    "text",
-                    "entity.name.function",
-                    "text",
-                    "paren.lparen",
-                    "variable.parameter",
-                    "paren.rparen"
-                ],
-                regex : "(function)(\\s+)(" + identifierRe + ")(\\s*)(\\()(.*?)(\\))"
-            }, { // match stuff like: foobar: function() { }
-                token : [
-                    "entity.name.function",
-                    "text",
-                    "punctuation.operator",
-                    "text",
-                    "storage.type",
-                    "text",
-                    "paren.lparen",
-                    "variable.parameter",
-                    "paren.rparen"
-                ],
-                regex : "(" + identifierRe + ")(\\s*)(:)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"
-            }, { // Attempt to match : function() { } (this is for issues with 'foo': function() { })
-                token : [
-                    "text",
-                    "text",
-                    "storage.type",
-                    "text",
-                    "paren.lparen",
-                    "variable.parameter",
-                    "paren.rparen"
-                ],
-                regex : "(:)(\\s*)(function)?(\\s*)(\\()([^)]*)(\\))"
-            }, {
-                token : "constant.language.boolean",
-                regex : /(?:true|false)\b/
-            }, {
-                token : "keyword",
-                regex : "(?:" + kwBeforeRe + ")\\b",
-                next : "regex_allowed"
-            }, {
-                token : ["punctuation.operator", "support.function"],
-                regex : /(\.)(s(?:h(?:ift|ow(?:Mod(?:elessDialog|alDialog)|Help))|croll(?:X|By(?:Pages|Lines)?|Y|To)?|t(?:opzzzz|rike)|i(?:n|zeToContent|debar|gnText)|ort|u(?:p|b(?:str(?:ing)?)?)|pli(?:ce|t)|e(?:nd|t(?:Re(?:sizable|questHeader)|M(?:i(?:nutes|lliseconds)|onth)|Seconds|Ho(?:tKeys|urs)|Year|Cursor|Time(?:out)?|Interval|ZOptions|Date|UTC(?:M(?:i(?:nutes|lliseconds)|onth)|Seconds|Hours|Date|FullYear)|FullYear|Active)|arch)|qrt|lice|avePreferences|mall)|h(?:ome|andleEvent)|navigate|c(?:har(?:CodeAt|At)|o(?:s|n(?:cat|textual|firm)|mpile)|eil|lear(?:Timeout|Interval)?|a(?:ptureEvents|ll)|reate(?:StyleSheet|Popup|EventObject))|t(?:o(?:GMTString|S(?:tring|ource)|U(?:TCString|pperCase)|Lo(?:caleString|werCase))|est|a(?:n|int(?:Enabled)?))|i(?:s(?:NaN|Finite)|ndexOf|talics)|d(?:isableExternalCapture|ump|etachEvent)|u(?:n(?:shift|taint|escape|watch)|pdateCommands)|j(?:oin|avaEnabled)|p(?:o(?:p|w)|ush|lugins.refresh|a(?:ddings|rse(?:Int|Float)?)|r(?:int|ompt|eference))|e(?:scape|nableExternalCapture|val|lementFromPoint|x(?:p|ec(?:Script|Command)?))|valueOf|UTC|queryCommand(?:State|Indeterm|Enabled|Value)|f(?:i(?:nd|le(?:ModifiedDate|Size|CreatedDate|UpdatedDate)|xed)|o(?:nt(?:size|color)|rward)|loor|romCharCode)|watch|l(?:ink|o(?:ad|g)|astIndexOf)|a(?:sin|nchor|cos|t(?:tachEvent|ob|an(?:2)?)|pply|lert|b(?:s|ort))|r(?:ou(?:nd|teEvents)|e(?:size(?:By|To)|calc|turnValue|place|verse|l(?:oad|ease(?:Capture|Events)))|andom)|g(?:o|et(?:ResponseHeader|M(?:i(?:nutes|lliseconds)|onth)|Se(?:conds|lection)|Hours|Year|Time(?:zoneOffset)?|Da(?:y|te)|UTC(?:M(?:i(?:nutes|lliseconds)|onth)|Seconds|Hours|Da(?:y|te)|FullYear)|FullYear|A(?:ttention|llResponseHeaders)))|m(?:in|ove(?:B(?:y|elow)|To(?:Absolute)?|Above)|ergeAttributes|a(?:tch|rgins|x))|b(?:toa|ig|o(?:ld|rderWidths)|link|ack))\b(?=\()/
-            }, {
-                token : ["punctuation.operator", "support.function.dom"],
-                regex : /(\.)(s(?:ub(?:stringData|mit)|plitText|e(?:t(?:NamedItem|Attribute(?:Node)?)|lect))|has(?:ChildNodes|Feature)|namedItem|c(?:l(?:ick|o(?:se|neNode))|reate(?:C(?:omment|DATASection|aption)|T(?:Head|extNode|Foot)|DocumentFragment|ProcessingInstruction|E(?:ntityReference|lement)|Attribute))|tabIndex|i(?:nsert(?:Row|Before|Cell|Data)|tem)|open|delete(?:Row|C(?:ell|aption)|T(?:Head|Foot)|Data)|focus|write(?:ln)?|a(?:dd|ppend(?:Child|Data))|re(?:set|place(?:Child|Data)|move(?:NamedItem|Child|Attribute(?:Node)?)?)|get(?:NamedItem|Element(?:sBy(?:Name|TagName)|ById)|Attribute(?:Node)?)|blur)\b(?=\()/
-            }, {
-                token : ["punctuation.operator", "support.constant"],
-                regex : /(\.)(s(?:ystemLanguage|cr(?:ipts|ollbars|een(?:X|Y|Top|Left))|t(?:yle(?:Sheets)?|atus(?:Text|bar)?)|ibling(?:Below|Above)|ource|uffixes|e(?:curity(?:Policy)?|l(?:ection|f)))|h(?:istory|ost(?:name)?|as(?:h|Focus))|y|X(?:MLDocument|SLDocument)|n(?:ext|ame(?:space(?:s|URI)|Prop))|M(?:IN_VALUE|AX_VALUE)|c(?:haracterSet|o(?:n(?:structor|trollers)|okieEnabled|lorDepth|mp(?:onents|lete))|urrent|puClass|l(?:i(?:p(?:boardData)?|entInformation)|osed|asses)|alle(?:e|r)|rypto)|t(?:o(?:olbar|p)|ext(?:Transform|Indent|Decoration|Align)|ags)|SQRT(?:1_2|2)|i(?:n(?:ner(?:Height|Width)|put)|ds|gnoreCase)|zIndex|o(?:scpu|n(?:readystatechange|Line)|uter(?:Height|Width)|p(?:sProfile|ener)|ffscreenBuffering)|NEGATIVE_INFINITY|d(?:i(?:splay|alog(?:Height|Top|Width|Left|Arguments)|rectories)|e(?:scription|fault(?:Status|Ch(?:ecked|arset)|View)))|u(?:ser(?:Profile|Language|Agent)|n(?:iqueID|defined)|pdateInterval)|_content|p(?:ixelDepth|ort|ersonalbar|kcs11|l(?:ugins|atform)|a(?:thname|dding(?:Right|Bottom|Top|Left)|rent(?:Window|Layer)?|ge(?:X(?:Offset)?|Y(?:Offset)?))|r(?:o(?:to(?:col|type)|duct(?:Sub)?|mpter)|e(?:vious|fix)))|e(?:n(?:coding|abledPlugin)|x(?:ternal|pando)|mbeds)|v(?:isibility|endor(?:Sub)?|Linkcolor)|URLUnencoded|P(?:I|OSITIVE_INFINITY)|f(?:ilename|o(?:nt(?:Size|Family|Weight)|rmName)|rame(?:s|Element)|gColor)|E|whiteSpace|l(?:i(?:stStyleType|n(?:eHeight|kColor))|o(?:ca(?:tion(?:bar)?|lName)|wsrc)|e(?:ngth|ft(?:Context)?)|a(?:st(?:M(?:odified|atch)|Index|Paren)|yer(?:s|X)|nguage))|a(?:pp(?:MinorVersion|Name|Co(?:deName|re)|Version)|vail(?:Height|Top|Width|Left)|ll|r(?:ity|guments)|Linkcolor|bove)|r(?:ight(?:Context)?|e(?:sponse(?:XML|Text)|adyState))|global|x|m(?:imeTypes|ultiline|enubar|argin(?:Right|Bottom|Top|Left))|L(?:N(?:10|2)|OG(?:10E|2E))|b(?:o(?:ttom|rder(?:Width|RightWidth|BottomWidth|Style|Color|TopWidth|LeftWidth))|ufferDepth|elow|ackground(?:Color|Image)))\b/
-            }, {
-                token : ["storage.type", "punctuation.operator", "support.function.firebug"],
-                regex : /(console)(\.)(warn|info|log|error|time|timeEnd|assert)\b/
-            }, {
-                token : function(value) {
-                    if (globals.hasOwnProperty(value))
-                        return "variable.language";
-                    else if (deprecated.hasOwnProperty(value))
-                        return "invalid.deprecated";
-                    else if (definitions.hasOwnProperty(value))
-                        return "storage.type";
-                    else if (keywords.hasOwnProperty(value))
-                        return "keyword";
-                    else if (buildinConstants.hasOwnProperty(value))
-                        return "constant.language";
-                    else if (futureReserved.hasOwnProperty(value))
-                        return "invalid.illegal";
-                    else if (value == "debugger")
-                        return "invalid.deprecated";
-                    else
-                        return "identifier";
-                },
-                regex : identifierRe
-            }, {
-                token : "keyword.operator",
-                regex : /!|\$|%|&|\*|\-\-|\-|\+\+|\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\|\||\?\:|\*=|%=|\+=|\-=|&=|\^=|\b(?:in|instanceof|new|delete|typeof|void)/,
-                next  : "regex_allowed"
-            }, {
-                token : "punctuation.operator",
-                regex : /\?|\:|\,|\;|\./,
-                next  : "regex_allowed"
-            }, {
-                token : "paren.lparen",
-                regex : /[\[({]/,
-                next  : "regex_allowed"
-            }, {
-                token : "paren.rparen",
-                regex : /[\])}]/
-            }, {
-                token : "keyword.operator",
-                regex : /\/=?/,
-                next  : "regex_allowed"
-            }, {
-                token: "comment",
-                regex: /^#!.*$/
-            }, {
-                token : "text",
-                regex : /\s+/
-            }
-        ],
-        // regular expressions are only allowed after certain tokens. This
-        // makes sure we don't mix up regexps with the divison operator
-        "regex_allowed": [
-            {
-                token : "comment", // multi line comment
-                merge : true,
-                regex : "\\/\\*",
-                next : "comment_regex_allowed"
-            }, {
-                token : "comment",
-                regex : "\\/\\/.*$"
-            }, {
-                token: "string.regexp",
-                regex: "\\/",
-                next: "regex",
-                merge: true
-            }, {
-                token : "text",
-                regex : "\\s+"
-            }, {
-                // immediately return to the start mode without matching
-                // anything
-                token: "empty",
-                regex: "",
-                next: "start"
-            }
-        ],
-        "regex": [
-            {
-                token: "regexp.keyword.operator",
-                regex: "\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)",
-                next: "regex"
-            }, {
-				// flag
-                token: "string.regexp",
-                regex: "/\\w*",
-                next: "start",
-                merge: true
-            }, {
-                token: "string.regexp",
-                regex: "[^\\\\/\\[]+",
-                next: "regex",
-                merge: true
-            }, {
-                token: "string.regexp.charachterclass",
-                regex: "\\[",
-                next: "regex_character_class",
-                merge: true
-            }, {
-                token: "empty",
-                regex: "",
-                next: "start"
-            }
-        ],
-        "regex_character_class": [
-            {
-                token: "regexp.keyword.operator",
-                regex: "\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)",
-                next: "regex_character_class"
-            }, {
-                token: "string.regexp.charachterclass",
-                regex: "]",
-                next: "regex",
-                merge: true
-            }, {
-                token: "string.regexp.charachterclass",
-                regex: "[^\\\\\\]]+",
-                next: "regex_character_class",
-                merge: true
-            }, {
-                token: "empty",
-                regex: "",
-                next: "start"
-            }
-        ],
-        "comment_regex_allowed" : [
-            {
-                token : "comment", // closing comment
-                regex : ".*?\\*\\/",
-                merge : true,
-                next : "regex_allowed"
-            }, {
-                token : "comment", // comment spanning whole line
-                merge : true,
-                regex : ".+"
-            }
-        ],
-        "comment" : [
-            {
-                token : "comment", // closing comment
-                regex : ".*?\\*\\/",
-                merge : true,
-                next : "start"
-            }, {
-                token : "comment", // comment spanning whole line
-                merge : true,
-                regex : ".+"
-            }
-        ],
-        "qqstring" : [
-            {
-                token : "constant.language.escape",
-                regex : escapedRe
-            }, {
-                token : "string",
-                regex : '[^"\\\\]+'
-            }, {
-                token : "string",
-                regex : '"',
-                next  : "start"
-            }
-        ],
-        "qstring" : [
-            {
-                token : "constant.language.escape",
-                regex : escapedRe
-            }, {
-                token : "string",
-                regex : "[^'\\\\]+"
-            }, {
-                token : "string",
-                regex : "'",
-                next  : "start"
-            }
-        ]
-    };
-
-    this.embedRules(DocCommentHighlightRules, "doc-",
-        [ new DocCommentHighlightRules().getEndRule("start") ]);
-};
-
-oop.inherits(JavaScriptHighlightRules, TextHighlightRules);
-
-exports.JavaScriptHighlightRules = JavaScriptHighlightRules;
-});
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/doc_comment_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-
-var DocCommentHighlightRules = function() {
-
-    this.$rules = {
-        "start" : [ {
-            token : "comment.doc.tag",
-            regex : "@[\\w\\d_]+" // TODO: fix email addresses
-        }, {
-            token : "comment.doc",
-            merge : true,
-            regex : "\\s+"
-        }, {
-            token : "comment.doc",
-            merge : true,
-            regex : "TODO"
-        }, {
-            token : "comment.doc",
-            merge : true,
-            regex : "[^@\\*]+"
-        }, {
-            token : "comment.doc",
-            merge : true,
-            regex : "."
-        }]
-    };
-};
-
-oop.inherits(DocCommentHighlightRules, TextHighlightRules);
-
-(function() {
-
-    this.getStartRule = function(start) {
-        return {
-            token : "comment.doc", // doc comment
-            merge : true,
-            regex : "\\/\\*(?=\\*)",
-            next  : start
-        };
-    };
-    
-    this.getEndRule = function (start) {
-        return {
-            token : "comment.doc", // closing comment
-            merge : true,
-            regex : "\\*\\/",
-            next  : start
-        };
-    };
-
-}).call(DocCommentHighlightRules.prototype);
-
-exports.DocCommentHighlightRules = DocCommentHighlightRules;
-
-});
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/matching_brace_outdent', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
-"use strict";
-
-var Range = require("../range").Range;
-
-var MatchingBraceOutdent = function() {};
-
-(function() {
-
-    this.checkOutdent = function(line, input) {
-        if (! /^\s+$/.test(line))
-            return false;
-
-        return /^\s*\}/.test(input);
-    };
-
-    this.autoOutdent = function(doc, row) {
-        var line = doc.getLine(row);
-        var match = line.match(/^(\s*\})/);
-
-        if (!match) return 0;
-
-        var column = match[1].length;
-        var openBracePos = doc.findMatchingBracket({row: row, column: column});
-
-        if (!openBracePos || openBracePos.row == row) return 0;
-
-        var indent = this.$getIndent(doc.getLine(openBracePos.row));
-        doc.replace(new Range(row, 0, row, column-1), indent);
-    };
-
-    this.$getIndent = function(line) {
-        var match = line.match(/^(\s+)/);
-        if (match) {
-            return match[1];
-        }
-
-        return "";
-    };
-
-}).call(MatchingBraceOutdent.prototype);
-
-exports.MatchingBraceOutdent = MatchingBraceOutdent;
-});
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/folding/cstyle', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/range', 'ace/mode/folding/fold_mode'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../../lib/oop");
-var Range = require("../../range").Range;
-var BaseFoldMode = require("./fold_mode").FoldMode;
-
-var FoldMode = exports.FoldMode = function() {};
-oop.inherits(FoldMode, BaseFoldMode);
-
-(function() {
-
-    this.foldingStartMarker = /(\{|\[)[^\}\]]*$|^\s*(\/\*)/;
-    this.foldingStopMarker = /^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/;
-    
-    this.getFoldWidgetRange = function(session, foldStyle, row) {
-        var line = session.getLine(row);
-        var match = line.match(this.foldingStartMarker);
-        if (match) {
-            var i = match.index;
-
-            if (match[1])
-                return this.openingBracketBlock(session, match[1], row, i);
-
-            var range = session.getCommentFoldRange(row, i + match[0].length);
-            range.end.column -= 2;
-            return range;
-        }
-
-        if (foldStyle !== "markbeginend")
-            return;
-            
-        var match = line.match(this.foldingStopMarker);
-        if (match) {
-            var i = match.index + match[0].length;
-
-            if (match[2]) {
-                var range = session.getCommentFoldRange(row, i);
-                range.end.column -= 2;
-                return range;
-            }
-
-            var end = {row: row, column: i};
-            var start = session.$findOpeningBracket(match[1], end);
-            
-            if (!start)
-                return;
-
-            start.column++;
-            end.column--;
-
-            return  Range.fromPoints(start, end);
-        }
-    };
-    
-}).call(FoldMode.prototype);
-
-});/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/svg_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/javascript_highlight_rules', 'ace/mode/xml_highlight_rules', 'ace/mode/xml_util'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var JavaScriptHighlightRules = require("./javascript_highlight_rules").JavaScriptHighlightRules;
-var XmlHighlightRules = require("./xml_highlight_rules").XmlHighlightRules;
-var xmlUtil = require("./xml_util");
-
-var SvgHighlightRules = function() {
-    XmlHighlightRules.call(this);
-
-    this.$rules.start.splice(3, 0, {
-        token : "meta.tag",
-        regex : "<(?=\s*script)",
-        next : "script"
-    });
-    
-    xmlUtil.tag(this.$rules, "script", "js-start");
-    
-    this.embedRules(JavaScriptHighlightRules, "js-", [{
-        token: "comment",
-        regex: "\\/\\/.*(?=<\\/script>)",
-        next: "tag"
-    }, {
-        token: "meta.tag",
-        regex: "<\\/(?=script)",
-        next: "tag"
-    }]);
-};
-
-oop.inherits(SvgHighlightRules, XmlHighlightRules);
-
-exports.SvgHighlightRules = SvgHighlightRules;
-});
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/folding/mixed', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/folding/fold_mode'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../../lib/oop");
-var BaseFoldMode = require("./fold_mode").FoldMode;
-
-var FoldMode = exports.FoldMode = function(defaultMode, subModes) {
-    this.defaultMode = defaultMode;
-    this.subModes = subModes;
-};
-oop.inherits(FoldMode, BaseFoldMode);
-
-(function() {
-
-
-    this.$getMode = function(state) {
-        for (var key in this.subModes) {
-            if (state.indexOf(key) === 0)
-                return this.subModes[key];
-        }
-        return null;
-    };
-    
-    this.$tryMode = function(state, session, foldStyle, row) {
-        var mode = this.$getMode(state);
-        return (mode ? mode.getFoldWidget(session, foldStyle, row) : "");
-    };
-
-    this.getFoldWidget = function(session, foldStyle, row) {
-        return (
-            this.$tryMode(session.getState(row-1), session, foldStyle, row) ||
-            this.$tryMode(session.getState(row), session, foldStyle, row) ||
-            this.defaultMode.getFoldWidget(session, foldStyle, row)
-        );
-    };
-
-    this.getFoldWidgetRange = function(session, foldStyle, row) {
-        var mode = this.$getMode(session.getState(row-1));
-        
-        if (!mode || !mode.getFoldWidget(session, foldStyle, row))
-            mode = this.$getMode(session.getState(row));
-        
-        if (!mode || !mode.getFoldWidget(session, foldStyle, row))
-            mode = this.defaultMode;
-        
-        return mode.getFoldWidgetRange(session, foldStyle, row);
-    };
-
-}).call(FoldMode.prototype);
-
-});
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/mode-svg.js b/apps/files_texteditor/js/aceeditor/mode-svg.js
deleted file mode 100644
index e006aaaf36..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-svg.js
+++ /dev/null
@@ -1 +0,0 @@
-define("ace/mode/svg",["require","exports","module","ace/lib/oop","ace/mode/xml","ace/mode/javascript","ace/tokenizer","ace/mode/svg_highlight_rules","ace/mode/folding/mixed","ace/mode/folding/xml","ace/mode/folding/cstyle"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./xml").Mode,f=a("./javascript").Mode,g=a("../tokenizer").Tokenizer,h=a("./svg_highlight_rules").SvgHighlightRules,i=a("./folding/mixed").FoldMode,j=a("./folding/xml").FoldMode,k=a("./folding/cstyle").FoldMode,l=function(){e.call(this),this.highlighter=new h,this.$tokenizer=new g(this.highlighter.getRules()),this.$embeds=this.highlighter.getEmbeds(),this.createModeDelegates({"js-":f}),this.foldingRules=new i(new j({}),{"js-":new k})};d.inherits(l,e),function(){this.getNextLineIndent=function(a,b,c){return this.$getIndent(b)}}.call(l.prototype),b.Mode=l}),define("ace/mode/xml",["require","exports","module","ace/lib/oop","ace/mode/text","ace/tokenizer","ace/mode/xml_highlight_rules","ace/mode/behaviour/xml","ace/mode/folding/xml"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text").Mode,f=a("../tokenizer").Tokenizer,g=a("./xml_highlight_rules").XmlHighlightRules,h=a("./behaviour/xml").XmlBehaviour,i=a("./folding/xml").FoldMode,j=function(){this.$tokenizer=new f((new g).getRules()),this.$behaviour=new h,this.foldingRules=new i};d.inherits(j,e),function(){this.getNextLineIndent=function(a,b,c){return this.$getIndent(b)}}.call(j.prototype),b.Mode=j}),define("ace/mode/xml_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/xml_util","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./xml_util"),f=a("./text_highlight_rules").TextHighlightRules,g=function(){this.$rules={start:[{token:"text",regex:"<\\!\\[CDATA\\[",next:"cdata"},{token:"xml_pe",regex:"<\\?.*?\\?>"},{token:"comment",merge:!0,regex:"<\\!--",next:"comment"},{token:"xml_pe",regex:"<\\!.*?>"},{token:"meta.tag",regex:"<\\/?",next:"tag"},{token:"text",regex:"\\s+"},{token:"constant.character.entity",regex:"(?:&#[0-9]+;)|(?:&#x[0-9a-fA-F]+;)|(?:&[a-zA-Z0-9_:\\.-]+;)"},{token:"text",regex:"[^<]+"}],cdata:[{token:"text",regex:"\\]\\]>",next:"start"},{token:"text",regex:"\\s+"},{token:"text",regex:"(?:[^\\]]|\\](?!\\]>))+"}],comment:[{token:"comment",regex:".*?-->",next:"start"},{token:"comment",merge:!0,regex:".+"}]},e.tag(this.$rules,"tag","start")};d.inherits(g,f),b.XmlHighlightRules=g}),define("ace/mode/xml_util",["require","exports","module","ace/lib/lang"],function(a,b,c){function g(a){return[{token:"string",regex:'".*?"'},{token:"string",merge:!0,regex:'["].*',next:a+"_qqstring"},{token:"string",regex:"'.*?'"},{token:"string",merge:!0,regex:"['].*",next:a+"_qstring"}]}function h(a,b){return[{token:"string",merge:!0,regex:".*?"+a,next:b},{token:"string",merge:!0,regex:".+"}]}"use strict";var d=a("../lib/lang"),e=d.arrayToMap("button|form|input|label|select|textarea".split("|")),f=d.arrayToMap("table|tbody|td|tfoot|th|tr".split("|"));b.tag=function(a,b,c){a[b]=[{token:"text",regex:"\\s+"},{token:function(a){return a==="a"?"meta.tag.anchor":a==="img"?"meta.tag.image":a==="script"?"meta.tag.script":a==="style"?"meta.tag.style":e.hasOwnProperty(a.toLowerCase())?"meta.tag.form":f.hasOwnProperty(a.toLowerCase())?"meta.tag.table":"meta.tag"},merge:!0,regex:"[-_a-zA-Z0-9:]+",next:b+"_embed_attribute_list"},{token:"empty",regex:"",next:b+"_embed_attribute_list"}],a[b+"_qstring"]=h("'",b+"_embed_attribute_list"),a[b+"_qqstring"]=h('"',b+"_embed_attribute_list"),a[b+"_embed_attribute_list"]=[{token:"meta.tag",merge:!0,regex:"/?>",next:c},{token:"keyword.operator",regex:"="},{token:"entity.other.attribute-name",regex:"[-_a-zA-Z0-9:]+"},{token:"constant.numeric",regex:"[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"},{token:"text",regex:"\\s+"}].concat(g(b))}}),define("ace/mode/behaviour/xml",["require","exports","module","ace/lib/oop","ace/mode/behaviour","ace/mode/behaviour/cstyle"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../behaviour").Behaviour,f=a("./cstyle").CstyleBehaviour,g=function(){this.inherit(f,["string_dquotes"]),this.add("brackets","insertion",function(a,b,c,d,e){if(e=="<"){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?!1:{text:"<>",selection:[1,1]}}if(e==">"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j==">")return{text:"",selection:[1,1]}}else if(e=="\n"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),k=i.substring(h.column,h.column+2);if(k=="</"){var l=this.$getIndent(d.doc.getLine(h.row))+d.getTabString(),m=this.$getIndent(d.doc.getLine(h.row));return{text:"\n"+l+"\n"+m,selection:[1,l.length,1,l.length]}}}})};d.inherits(g,e),b.XmlBehaviour=g}),define("ace/mode/behaviour/cstyle",["require","exports","module","ace/lib/oop","ace/mode/behaviour"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../behaviour").Behaviour,f=function(){this.add("braces","insertion",function(a,b,c,d,e){if(e=="{"){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"{"+g+"}",selection:!1}:{text:"{}",selection:[1,1]}}if(e=="}"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var k=d.$findOpeningBracket("}",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}else if(e=="\n"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var l=d.findMatchingBracket({row:h.row,column:h.column+1});if(!l)return null;var m=this.getNextLineIndent(a,i.substring(0,i.length-1),d.getTabString()),n=this.$getIndent(d.doc.getLine(l.row));return{text:"\n"+m+"\n"+n,selection:[1,m.length,1,m.length]}}}}),this.add("braces","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="{"){var g=d.doc.getLine(e.start.row),h=g.substring(e.end.column,e.end.column+1);if(h=="}")return e.end.column++,e}}),this.add("parens","insertion",function(a,b,c,d,e){if(e=="("){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"("+g+")",selection:!1}:{text:"()",selection:[1,1]}}if(e==")"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j==")"){var k=d.$findOpeningBracket(")",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}}),this.add("parens","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="("){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h==")")return e.end.column++,e}}),this.add("string_dquotes","insertion",function(a,b,c,d,e){if(e=='"'||e=="'"){var f=e,g=c.getSelectionRange(),h=d.doc.getTextRange(g);if(h!=="")return{text:f+h+f,selection:!1};var i=c.getCursorPosition(),j=d.doc.getLine(i.row),k=j.substring(i.column-1,i.column);if(k=="\\")return null;var l=d.getTokens(g.start.row,g.start.row)[0].tokens,m=0,n,o=-1;for(var p=0;p<l.length;p++){n=l[p],n.type=="string"?o=-1:o<0&&(o=n.value.indexOf(f));if(n.value.length+m>g.start.column)break;m+=l[p].value.length}if(!n||o<0&&n.type!=="comment"&&(n.type!=="string"||g.start.column!==n.value.length+m-1&&n.value.lastIndexOf(f)===n.value.length-1))return{text:f+f,selection:[1,1]};if(n&&n.type==="string"){var q=j.substring(i.column,i.column+1);if(q==f)return{text:"",selection:[1,1]}}}}),this.add("string_dquotes","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&(f=='"'||f=="'")){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h=='"')return e.end.column++,e}})};d.inherits(f,e),b.CstyleBehaviour=f}),define("ace/mode/folding/xml",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/range","ace/mode/folding/fold_mode","ace/token_iterator"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../../lib/lang"),f=a("../../range").Range,g=a("./fold_mode").FoldMode,h=a("../../token_iterator").TokenIterator,i=b.FoldMode=function(a){g.call(this),this.voidElements=a||{}};d.inherits(i,g),function(){this.getFoldWidget=function(a,b,c){var d=this._getFirstTagInLine(a,c);return d.closing?b=="markbeginend"?"end":"":!d.tagName||this.voidElements[d.tagName.toLowerCase()]?"":d.selfClosing?"":d.value.indexOf("/"+d.tagName)!==-1?"":"start"},this._getFirstTagInLine=function(a,b){var c=a.getTokens(b,b)[0].tokens,d="";for(var f=0;f<c.length;f++){var g=c[f];g.type.indexOf("meta.tag")===0?d+=g.value:d+=e.stringRepeat(" ",g.value.length)}return this._parseTag(d)},this.tagRe=/^(\s*)(<?(\/?)([-_a-zA-Z0-9:!]*)\s*(\/?)>?)/,this._parseTag=function(a){var b=this.tagRe.exec(a),c=this.tagRe.lastIndex||0;return this.tagRe.lastIndex=0,{value:a,match:b?b[2]:"",closing:b?!!b[3]:!1,selfClosing:b?!!b[5]||b[2]=="/>":!1,tagName:b?b[4]:"",column:b[1]?c+b[1].length:c}},this._readTagForward=function(a){var b=a.getCurrentToken();if(!b)return null;var c="",d;do if(b.type.indexOf("meta.tag")===0){if(!d)var d={row:a.getCurrentTokenRow(),column:a.getCurrentTokenColumn()};c+=b.value;if(c.indexOf(">")!==-1){var e=this._parseTag(c);return e.start=d,e.end={row:a.getCurrentTokenRow(),column:a.getCurrentTokenColumn()+b.value.length},a.stepForward(),e}}while(b=a.stepForward());return null},this._readTagBackward=function(a){var b=a.getCurrentToken();if(!b)return null;var c="",d;do if(b.type.indexOf("meta.tag")===0){d||(d={row:a.getCurrentTokenRow(),column:a.getCurrentTokenColumn()+b.value.length}),c=b.value+c;if(c.indexOf("<")!==-1){var e=this._parseTag(c);return e.end=d,e.start={row:a.getCurrentTokenRow(),column:a.getCurrentTokenColumn()},a.stepBackward(),e}}while(b=a.stepBackward());return null},this._pop=function(a,b){while(a.length){var c=a[a.length-1];if(!b||c.tagName==b.tagName)return a.pop();if(this.voidElements[b.tagName])return;if(this.voidElements[c.tagName]){a.pop();continue}return null}},this.getFoldWidgetRange=function(a,b,c){var d=this._getFirstTagInLine(a,c);if(!d.match)return null;var e=d.closing||d.selfClosing,g=[],i;if(!e){var j=new h(a,c,d.column),k={row:c,column:d.column+d.tagName.length+2};while(i=this._readTagForward(j)){if(i.selfClosing){if(!g.length)return i.start.column+=i.tagName.length+2,i.end.column-=2,f.fromPoints(i.start,i.end);continue}if(i.closing){this._pop(g,i);if(g.length==0)return f.fromPoints(k,i.start)}else g.push(i)}}else{var j=new h(a,c,d.column+d.match.length),l={row:c,column:d.column};while(i=this._readTagBackward(j)){if(i.selfClosing){if(!g.length)return i.start.column+=i.tagName.length+2,i.end.column-=2,f.fromPoints(i.start,i.end);continue}if(!i.closing){this._pop(g,i);if(g.length==0)return i.start.column+=i.tagName.length+2,f.fromPoints(i.start,l)}else g.push(i)}}}}.call(i.prototype)}),define("ace/mode/folding/fold_mode",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../../range").Range,e=b.FoldMode=function(){};(function(){this.foldingStartMarker=null,this.foldingStopMarker=null,this.getFoldWidget=function(a,b,c){var d=a.getLine(c);return this.foldingStartMarker.test(d)?"start":b=="markbeginend"&&this.foldingStopMarker&&this.foldingStopMarker.test(d)?"end":""},this.getFoldWidgetRange=function(a,b,c){return null},this.indentationBlock=function(a,b,c){var e=/^\s*/,f=b,g=b,h=a.getLine(b),i=c||h.length,j=h.match(e)[0].length,k=a.getLength();while(++b<k){h=a.getLine(b);var l=h.match(e)[0].length;if(l==h.length)continue;if(l<=j)break;g=b}if(g>f){var m=a.getLine(g).length;return new d(f,i,g,m)}},this.openingBracketBlock=function(a,b,c,e){var f={row:c,column:e+1},g=a.$findClosingBracket(b,f);if(!g)return;var h=a.foldWidgets[g.row];return h==null&&(h=this.getFoldWidget(a,g.row)),h=="start"&&(g.row--,g.column=a.getLine(g.row).length),d.fromPoints(f,g)}}).call(e.prototype)}),define("ace/mode/javascript",["require","exports","module","ace/lib/oop","ace/mode/text","ace/tokenizer","ace/mode/javascript_highlight_rules","ace/mode/matching_brace_outdent","ace/range","ace/worker/worker_client","ace/mode/behaviour/cstyle","ace/mode/folding/cstyle"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text").Mode,f=a("../tokenizer").Tokenizer,g=a("./javascript_highlight_rules").JavaScriptHighlightRules,h=a("./matching_brace_outdent").MatchingBraceOutdent,i=a("../range").Range,j=a("../worker/worker_client").WorkerClient,k=a("./behaviour/cstyle").CstyleBehaviour,l=a("./folding/cstyle").FoldMode,m=function(){this.$tokenizer=new f((new g).getRules()),this.$outdent=new h,this.$behaviour=new k,this.foldingRules=new l};d.inherits(m,e),function(){this.toggleCommentLines=function(a,b,c,d){var e=!0,f=/^(\s*)\/\//;for(var g=c;g<=d;g++)if(!f.test(b.getLine(g))){e=!1;break}if(e){var h=new i(0,0,0,0);for(var g=c;g<=d;g++){var j=b.getLine(g),k=j.match(f);h.start.row=g,h.end.row=g,h.end.column=k[0].length,b.replace(h,k[1])}}else b.indentRows(c,d,"//")},this.getNextLineIndent=function(a,b,c){var d=this.$getIndent(b),e=this.$tokenizer.getLineTokens(b,a),f=e.tokens,g=e.state;if(f.length&&f[f.length-1].type=="comment")return d;if(a=="start"||a=="regex_allowed"){var h=b.match(/^.*(?:\bcase\b.*\:|[\{\(\[])\s*$/);h&&(d+=c)}else if(a=="doc-start"){if(g=="start"||a=="regex_allowed")return"";var h=b.match(/^\s*(\/?)\*/);h&&(h[1]&&(d+=" "),d+="* ")}return d},this.checkOutdent=function(a,b,c){return this.$outdent.checkOutdent(b,c)},this.autoOutdent=function(a,b,c){this.$outdent.autoOutdent(b,c)},this.createWorker=function(a){var b=new j(["ace"],"worker-javascript.js","ace/mode/javascript_worker","JavaScriptWorker");return b.attachToDocument(a.getDocument()),b.on("jslint",function(b){var c=[];for(var d=0;d<b.data.length;d++){var e=b.data[d];e&&c.push({row:e.line-1,column:e.character-1,text:e.reason,type:"warning",lint:e})}a.setAnnotations(c)}),b.on("narcissus",function(b){a.setAnnotations([b.data])}),b.on("terminate",function(){a.clearAnnotations()}),b}}.call(m.prototype),b.Mode=m}),define("ace/mode/javascript_highlight_rules",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/unicode","ace/mode/doc_comment_highlight_rules","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("../lib/lang"),f=a("../unicode"),g=a("./doc_comment_highlight_rules").DocCommentHighlightRules,h=a("./text_highlight_rules").TextHighlightRules,i=function(){var a=e.arrayToMap("Array|Boolean|Date|Function|Iterator|Number|Object|RegExp|String|Proxy|Namespace|QName|XML|XMLList|ArrayBuffer|Float32Array|Float64Array|Int16Array|Int32Array|Int8Array|Uint16Array|Uint32Array|Uint8Array|Uint8ClampedArray|Error|EvalError|InternalError|RangeError|ReferenceError|StopIteration|SyntaxError|TypeError|URIError|decodeURI|decodeURIComponent|encodeURI|encodeURIComponent|eval|isFinite|isNaN|parseFloat|parseInt|JSON|Math|this|arguments|prototype|window|document".split("|")),b=e.arrayToMap("break|case|catch|continue|default|delete|do|else|finally|for|function|if|in|instanceof|new|return|switch|throw|try|typeof|let|var|while|with|const|yield|import|get|set".split("|")),c="case|do|else|finally|in|instanceof|return|throw|try|typeof|yield",d=e.arrayToMap("__parent__|__count__|escape|unescape|with|__proto__".split("|")),h=e.arrayToMap("const|let|var|function".split("|")),i=e.arrayToMap("null|Infinity|NaN|undefined".split("|")),j=e.arrayToMap("class|enum|extends|super|export|implements|private|public|interface|package|protected|static".split("|")),k="["+f.packages.L+"\\$_]["+f.packages.L+f.packages.Mn+f.packages.Mc+f.packages.Nd+f.packages.Pc+"\\$_]*\\b",l="\\\\(?:x[0-9a-fA-F]{2}|u[0-9a-fA-F]{4}|[0-2][0-7]{0,2}|3[0-6][0-7]?|37[0-7]?|[4-7][0-7]?|.)";this.$rules={start:[{token:"comment",regex:/\/\/.*$/},(new g).getStartRule("doc-start"),{token:"comment",merge:!0,regex:/\/\*/,next:"comment"},{token:"string",regex:"'",next:"qstring"},{token:"string",regex:'"',next:"qqstring"},{token:"constant.numeric",regex:/0[xX][0-9a-fA-F]+\b/},{token:"constant.numeric",regex:/[+-]?\d+(?:(?:\.\d*)?(?:[eE][+-]?\d+)?)?\b/},{token:["storage.type","punctuation.operator","support.function","punctuation.operator","entity.name.function","text","keyword.operator","text","storage.type","text","paren.lparen","variable.parameter","paren.rparen"],regex:"("+k+")(\\.)(prototype)(\\.)("+k+")(\\s*)(=)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"},{token:["storage.type","punctuation.operator","support.function","punctuation.operator","entity.name.function","text","keyword.operator","text"],regex:"("+k+")(\\.)(prototype)(\\.)("+k+")(\\s*)(=)(\\s*)"},{token:["storage.type","punctuation.operator","entity.name.function","text","keyword.operator","text","storage.type","text","paren.lparen","variable.parameter","paren.rparen"],regex:"("+k+")(\\.)("+k+")(\\s*)(=)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"},{token:["entity.name.function","text","keyword.operator","text","storage.type","text","paren.lparen","variable.parameter","paren.rparen"],regex:"("+k+")(\\s*)(=)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"},{token:["storage.type","text","entity.name.function","text","paren.lparen","variable.parameter","paren.rparen"],regex:"(function)(\\s+)("+k+")(\\s*)(\\()(.*?)(\\))"},{token:["entity.name.function","text","punctuation.operator","text","storage.type","text","paren.lparen","variable.parameter","paren.rparen"],regex:"("+k+")(\\s*)(:)(\\s*)(function)(\\s*)(\\()(.*?)(\\))"},{token:["text","text","storage.type","text","paren.lparen","variable.parameter","paren.rparen"],regex:"(:)(\\s*)(function)?(\\s*)(\\()([^)]*)(\\))"},{token:"constant.language.boolean",regex:/(?:true|false)\b/},{token:"keyword",regex:"(?:"+c+")\\b",next:"regex_allowed"},{token:["punctuation.operator","support.function"],regex:/(\.)(s(?:h(?:ift|ow(?:Mod(?:elessDialog|alDialog)|Help))|croll(?:X|By(?:Pages|Lines)?|Y|To)?|t(?:opzzzz|rike)|i(?:n|zeToContent|debar|gnText)|ort|u(?:p|b(?:str(?:ing)?)?)|pli(?:ce|t)|e(?:nd|t(?:Re(?:sizable|questHeader)|M(?:i(?:nutes|lliseconds)|onth)|Seconds|Ho(?:tKeys|urs)|Year|Cursor|Time(?:out)?|Interval|ZOptions|Date|UTC(?:M(?:i(?:nutes|lliseconds)|onth)|Seconds|Hours|Date|FullYear)|FullYear|Active)|arch)|qrt|lice|avePreferences|mall)|h(?:ome|andleEvent)|navigate|c(?:har(?:CodeAt|At)|o(?:s|n(?:cat|textual|firm)|mpile)|eil|lear(?:Timeout|Interval)?|a(?:ptureEvents|ll)|reate(?:StyleSheet|Popup|EventObject))|t(?:o(?:GMTString|S(?:tring|ource)|U(?:TCString|pperCase)|Lo(?:caleString|werCase))|est|a(?:n|int(?:Enabled)?))|i(?:s(?:NaN|Finite)|ndexOf|talics)|d(?:isableExternalCapture|ump|etachEvent)|u(?:n(?:shift|taint|escape|watch)|pdateCommands)|j(?:oin|avaEnabled)|p(?:o(?:p|w)|ush|lugins.refresh|a(?:ddings|rse(?:Int|Float)?)|r(?:int|ompt|eference))|e(?:scape|nableExternalCapture|val|lementFromPoint|x(?:p|ec(?:Script|Command)?))|valueOf|UTC|queryCommand(?:State|Indeterm|Enabled|Value)|f(?:i(?:nd|le(?:ModifiedDate|Size|CreatedDate|UpdatedDate)|xed)|o(?:nt(?:size|color)|rward)|loor|romCharCode)|watch|l(?:ink|o(?:ad|g)|astIndexOf)|a(?:sin|nchor|cos|t(?:tachEvent|ob|an(?:2)?)|pply|lert|b(?:s|ort))|r(?:ou(?:nd|teEvents)|e(?:size(?:By|To)|calc|turnValue|place|verse|l(?:oad|ease(?:Capture|Events)))|andom)|g(?:o|et(?:ResponseHeader|M(?:i(?:nutes|lliseconds)|onth)|Se(?:conds|lection)|Hours|Year|Time(?:zoneOffset)?|Da(?:y|te)|UTC(?:M(?:i(?:nutes|lliseconds)|onth)|Seconds|Hours|Da(?:y|te)|FullYear)|FullYear|A(?:ttention|llResponseHeaders)))|m(?:in|ove(?:B(?:y|elow)|To(?:Absolute)?|Above)|ergeAttributes|a(?:tch|rgins|x))|b(?:toa|ig|o(?:ld|rderWidths)|link|ack))\b(?=\()/},{token:["punctuation.operator","support.function.dom"],regex:/(\.)(s(?:ub(?:stringData|mit)|plitText|e(?:t(?:NamedItem|Attribute(?:Node)?)|lect))|has(?:ChildNodes|Feature)|namedItem|c(?:l(?:ick|o(?:se|neNode))|reate(?:C(?:omment|DATASection|aption)|T(?:Head|extNode|Foot)|DocumentFragment|ProcessingInstruction|E(?:ntityReference|lement)|Attribute))|tabIndex|i(?:nsert(?:Row|Before|Cell|Data)|tem)|open|delete(?:Row|C(?:ell|aption)|T(?:Head|Foot)|Data)|focus|write(?:ln)?|a(?:dd|ppend(?:Child|Data))|re(?:set|place(?:Child|Data)|move(?:NamedItem|Child|Attribute(?:Node)?)?)|get(?:NamedItem|Element(?:sBy(?:Name|TagName)|ById)|Attribute(?:Node)?)|blur)\b(?=\()/},{token:["punctuation.operator","support.constant"],regex:/(\.)(s(?:ystemLanguage|cr(?:ipts|ollbars|een(?:X|Y|Top|Left))|t(?:yle(?:Sheets)?|atus(?:Text|bar)?)|ibling(?:Below|Above)|ource|uffixes|e(?:curity(?:Policy)?|l(?:ection|f)))|h(?:istory|ost(?:name)?|as(?:h|Focus))|y|X(?:MLDocument|SLDocument)|n(?:ext|ame(?:space(?:s|URI)|Prop))|M(?:IN_VALUE|AX_VALUE)|c(?:haracterSet|o(?:n(?:structor|trollers)|okieEnabled|lorDepth|mp(?:onents|lete))|urrent|puClass|l(?:i(?:p(?:boardData)?|entInformation)|osed|asses)|alle(?:e|r)|rypto)|t(?:o(?:olbar|p)|ext(?:Transform|Indent|Decoration|Align)|ags)|SQRT(?:1_2|2)|i(?:n(?:ner(?:Height|Width)|put)|ds|gnoreCase)|zIndex|o(?:scpu|n(?:readystatechange|Line)|uter(?:Height|Width)|p(?:sProfile|ener)|ffscreenBuffering)|NEGATIVE_INFINITY|d(?:i(?:splay|alog(?:Height|Top|Width|Left|Arguments)|rectories)|e(?:scription|fault(?:Status|Ch(?:ecked|arset)|View)))|u(?:ser(?:Profile|Language|Agent)|n(?:iqueID|defined)|pdateInterval)|_content|p(?:ixelDepth|ort|ersonalbar|kcs11|l(?:ugins|atform)|a(?:thname|dding(?:Right|Bottom|Top|Left)|rent(?:Window|Layer)?|ge(?:X(?:Offset)?|Y(?:Offset)?))|r(?:o(?:to(?:col|type)|duct(?:Sub)?|mpter)|e(?:vious|fix)))|e(?:n(?:coding|abledPlugin)|x(?:ternal|pando)|mbeds)|v(?:isibility|endor(?:Sub)?|Linkcolor)|URLUnencoded|P(?:I|OSITIVE_INFINITY)|f(?:ilename|o(?:nt(?:Size|Family|Weight)|rmName)|rame(?:s|Element)|gColor)|E|whiteSpace|l(?:i(?:stStyleType|n(?:eHeight|kColor))|o(?:ca(?:tion(?:bar)?|lName)|wsrc)|e(?:ngth|ft(?:Context)?)|a(?:st(?:M(?:odified|atch)|Index|Paren)|yer(?:s|X)|nguage))|a(?:pp(?:MinorVersion|Name|Co(?:deName|re)|Version)|vail(?:Height|Top|Width|Left)|ll|r(?:ity|guments)|Linkcolor|bove)|r(?:ight(?:Context)?|e(?:sponse(?:XML|Text)|adyState))|global|x|m(?:imeTypes|ultiline|enubar|argin(?:Right|Bottom|Top|Left))|L(?:N(?:10|2)|OG(?:10E|2E))|b(?:o(?:ttom|rder(?:Width|RightWidth|BottomWidth|Style|Color|TopWidth|LeftWidth))|ufferDepth|elow|ackground(?:Color|Image)))\b/},{token:["storage.type","punctuation.operator","support.function.firebug"],regex:/(console)(\.)(warn|info|log|error|time|timeEnd|assert)\b/},{token:function(c){return a.hasOwnProperty(c)?"variable.language":d.hasOwnProperty(c)?"invalid.deprecated":h.hasOwnProperty(c)?"storage.type":b.hasOwnProperty(c)?"keyword":i.hasOwnProperty(c)?"constant.language":j.hasOwnProperty(c)?"invalid.illegal":c=="debugger"?"invalid.deprecated":"identifier"},regex:k},{token:"keyword.operator",regex:/!|\$|%|&|\*|\-\-|\-|\+\+|\+|~|===|==|=|!=|!==|<=|>=|<<=|>>=|>>>=|<>|<|>|!|&&|\|\||\?\:|\*=|%=|\+=|\-=|&=|\^=|\b(?:in|instanceof|new|delete|typeof|void)/,next:"regex_allowed"},{token:"punctuation.operator",regex:/\?|\:|\,|\;|\./,next:"regex_allowed"},{token:"paren.lparen",regex:/[\[({]/,next:"regex_allowed"},{token:"paren.rparen",regex:/[\])}]/},{token:"keyword.operator",regex:/\/=?/,next:"regex_allowed"},{token:"comment",regex:/^#!.*$/},{token:"text",regex:/\s+/}],regex_allowed:[{token:"comment",merge:!0,regex:"\\/\\*",next:"comment_regex_allowed"},{token:"comment",regex:"\\/\\/.*$"},{token:"string.regexp",regex:"\\/",next:"regex",merge:!0},{token:"text",regex:"\\s+"},{token:"empty",regex:"",next:"start"}],regex:[{token:"regexp.keyword.operator",regex:"\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)",next:"regex"},{token:"string.regexp",regex:"/\\w*",next:"start",merge:!0},{token:"string.regexp",regex:"[^\\\\/\\[]+",next:"regex",merge:!0},{token:"string.regexp.charachterclass",regex:"\\[",next:"regex_character_class",merge:!0},{token:"empty",regex:"",next:"start"}],regex_character_class:[{token:"regexp.keyword.operator",regex:"\\\\(?:u[\\da-fA-F]{4}|x[\\da-fA-F]{2}|.)",next:"regex_character_class"},{token:"string.regexp.charachterclass",regex:"]",next:"regex",merge:!0},{token:"string.regexp.charachterclass",regex:"[^\\\\\\]]+",next:"regex_character_class",merge:!0},{token:"empty",regex:"",next:"start"}],comment_regex_allowed:[{token:"comment",regex:".*?\\*\\/",merge:!0,next:"regex_allowed"},{token:"comment",merge:!0,regex:".+"}],comment:[{token:"comment",regex:".*?\\*\\/",merge:!0,next:"start"},{token:"comment",merge:!0,regex:".+"}],qqstring:[{token:"constant.language.escape",regex:l},{token:"string",regex:'[^"\\\\]+'},{token:"string",regex:'"',next:"start"}],qstring:[{token:"constant.language.escape",regex:l},{token:"string",regex:"[^'\\\\]+"},{token:"string",regex:"'",next:"start"}]},this.embedRules(g,"doc-",[(new g).getEndRule("start")])};d.inherits(i,h),b.JavaScriptHighlightRules=i}),define("ace/mode/doc_comment_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text_highlight_rules").TextHighlightRules,f=function(){this.$rules={start:[{token:"comment.doc.tag",regex:"@[\\w\\d_]+"},{token:"comment.doc",merge:!0,regex:"\\s+"},{token:"comment.doc",merge:!0,regex:"TODO"},{token:"comment.doc",merge:!0,regex:"[^@\\*]+"},{token:"comment.doc",merge:!0,regex:"."}]}};d.inherits(f,e),function(){this.getStartRule=function(a){return{token:"comment.doc",merge:!0,regex:"\\/\\*(?=\\*)",next:a}},this.getEndRule=function(a){return{token:"comment.doc",merge:!0,regex:"\\*\\/",next:a}}}.call(f.prototype),b.DocCommentHighlightRules=f}),define("ace/mode/matching_brace_outdent",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../range").Range,e=function(){};(function(){this.checkOutdent=function(a,b){return/^\s+$/.test(a)?/^\s*\}/.test(b):!1},this.autoOutdent=function(a,b){var c=a.getLine(b),e=c.match(/^(\s*\})/);if(!e)return 0;var f=e[1].length,g=a.findMatchingBracket({row:b,column:f});if(!g||g.row==b)return 0;var h=this.$getIndent(a.getLine(g.row));a.replace(new d(b,0,b,f-1),h)},this.$getIndent=function(a){var b=a.match(/^(\s+)/);return b?b[1]:""}}).call(e.prototype),b.MatchingBraceOutdent=e}),define("ace/mode/folding/cstyle",["require","exports","module","ace/lib/oop","ace/range","ace/mode/folding/fold_mode"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../../range").Range,f=a("./fold_mode").FoldMode,g=b.FoldMode=function(){};d.inherits(g,f),function(){this.foldingStartMarker=/(\{|\[)[^\}\]]*$|^\s*(\/\*)/,this.foldingStopMarker=/^[^\[\{]*(\}|\])|^[\s\*]*(\*\/)/,this.getFoldWidgetRange=function(a,b,c){var d=a.getLine(c),f=d.match(this.foldingStartMarker);if(f){var g=f.index;if(f[1])return this.openingBracketBlock(a,f[1],c,g);var h=a.getCommentFoldRange(c,g+f[0].length);return h.end.column-=2,h}if(b!=="markbeginend")return;var f=d.match(this.foldingStopMarker);if(f){var g=f.index+f[0].length;if(f[2]){var h=a.getCommentFoldRange(c,g);return h.end.column-=2,h}var i={row:c,column:g},j=a.$findOpeningBracket(f[1],i);if(!j)return;return j.column++,i.column--,e.fromPoints(j,i)}}}.call(g.prototype)}),define("ace/mode/svg_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/javascript_highlight_rules","ace/mode/xml_highlight_rules","ace/mode/xml_util"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./javascript_highlight_rules").JavaScriptHighlightRules,f=a("./xml_highlight_rules").XmlHighlightRules,g=a("./xml_util"),h=function(){f.call(this),this.$rules.start.splice(3,0,{token:"meta.tag",regex:"<(?=s*script)",next:"script"}),g.tag(this.$rules,"script","js-start"),this.embedRules(e,"js-",[{token:"comment",regex:"\\/\\/.*(?=<\\/script>)",next:"tag"},{token:"meta.tag",regex:"<\\/(?=script)",next:"tag"}])};d.inherits(h,f),b.SvgHighlightRules=h}),define("ace/mode/folding/mixed",["require","exports","module","ace/lib/oop","ace/mode/folding/fold_mode"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("./fold_mode").FoldMode,f=b.FoldMode=function(a,b){this.defaultMode=a,this.subModes=b};d.inherits(f,e),function(){this.$getMode=function(a){for(var b in this.subModes)if(a.indexOf(b)===0)return this.subModes[b];return null},this.$tryMode=function(a,b,c,d){var e=this.$getMode(a);return e?e.getFoldWidget(b,c,d):""},this.getFoldWidget=function(a,b,c){return this.$tryMode(a.getState(c-1),a,b,c)||this.$tryMode(a.getState(c),a,b,c)||this.defaultMode.getFoldWidget(a,b,c)},this.getFoldWidgetRange=function(a,b,c){var d=this.$getMode(a.getState(c-1));if(!d||!d.getFoldWidget(a,b,c))d=this.$getMode(a.getState(c));if(!d||!d.getFoldWidget(a,b,c))d=this.defaultMode;return d.getFoldWidgetRange(a,b,c)}}.call(f.prototype)})
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/mode-text-uncompressed.js b/apps/files_texteditor/js/aceeditor/mode-text-uncompressed.js
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/apps/files_texteditor/js/aceeditor/mode-text.js b/apps/files_texteditor/js/aceeditor/mode-text.js
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/apps/files_texteditor/js/aceeditor/mode-textile-uncompressed.js b/apps/files_texteditor/js/aceeditor/mode-textile-uncompressed.js
deleted file mode 100644
index 37a85c316e..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-textile-uncompressed.js
+++ /dev/null
@@ -1,254 +0,0 @@
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Kelley van Evert <kelley.vanevert@gmail.com>
- *
- * 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 ***** */
-
-define('ace/mode/textile', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text', 'ace/tokenizer', 'ace/mode/textile_highlight_rules', 'ace/mode/matching_brace_outdent'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
-var TextileHighlightRules = require("./textile_highlight_rules").TextileHighlightRules;
-var MatchingBraceOutdent = require("./matching_brace_outdent").MatchingBraceOutdent;
-
-var Mode = function() {
-    this.$tokenizer = new Tokenizer(new TextileHighlightRules().getRules());
-    this.$outdent = new MatchingBraceOutdent();
-};
-oop.inherits(Mode, TextMode);
-
-(function() {
-    this.getNextLineIndent = function(state, line, tab) {
-        if (state == "intag")
-            return tab;
-        
-        return "";
-    };
-
-    this.checkOutdent = function(state, line, input) {
-        return this.$outdent.checkOutdent(line, input);
-    };
-
-    this.autoOutdent = function(state, doc, row) {
-        this.$outdent.autoOutdent(doc, row);
-    };
-    
-}).call(Mode.prototype);
-
-exports.Mode = Mode;
-
-});
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Kelley van Evert <kelley.vanevert@gmail.com>
- *
- * 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 ***** */
-
-define('ace/mode/textile_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-
-var TextileHighlightRules = function() {
-    this.$rules = {
-        "start" : [
-            {
-                token : function(value) {
-                    if (value.match(/^h\d$/))
-                        return "markup.heading." + value.charAt(1);
-                    else
-                        return "markup.heading";
-                },
-                regex : "h1|h2|h3|h4|h5|h6|bq|p|bc|pre",
-                next  : "blocktag"
-            },
-            {
-                token : "keyword",
-                regex : "[\\*]+|[#]+"
-            },
-            {
-                token : "text",
-                regex : ".+"
-            }
-        ],
-        "blocktag" : [
-            {
-                token : "keyword",
-                regex : "\\. ",
-                next  : "start"
-            },
-            {
-                token : "keyword",
-                regex : "\\(",
-                next  : "blocktagproperties"
-            }
-        ],
-        "blocktagproperties" : [
-            {
-                token : "keyword",
-                regex : "\\)",
-                next  : "blocktag"
-            },
-            {
-                token : "string",
-                regex : "[a-zA-Z0-9\\-_]+"
-            },
-            {
-                token : "keyword",
-                regex : "#"
-            }
-        ]
-    };
-};
-
-oop.inherits(TextileHighlightRules, TextHighlightRules);
-
-exports.TextileHighlightRules = TextileHighlightRules;
-
-});
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/matching_brace_outdent', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
-"use strict";
-
-var Range = require("../range").Range;
-
-var MatchingBraceOutdent = function() {};
-
-(function() {
-
-    this.checkOutdent = function(line, input) {
-        if (! /^\s+$/.test(line))
-            return false;
-
-        return /^\s*\}/.test(input);
-    };
-
-    this.autoOutdent = function(doc, row) {
-        var line = doc.getLine(row);
-        var match = line.match(/^(\s*\})/);
-
-        if (!match) return 0;
-
-        var column = match[1].length;
-        var openBracePos = doc.findMatchingBracket({row: row, column: column});
-
-        if (!openBracePos || openBracePos.row == row) return 0;
-
-        var indent = this.$getIndent(doc.getLine(openBracePos.row));
-        doc.replace(new Range(row, 0, row, column-1), indent);
-    };
-
-    this.$getIndent = function(line) {
-        var match = line.match(/^(\s+)/);
-        if (match) {
-            return match[1];
-        }
-
-        return "";
-    };
-
-}).call(MatchingBraceOutdent.prototype);
-
-exports.MatchingBraceOutdent = MatchingBraceOutdent;
-});
diff --git a/apps/files_texteditor/js/aceeditor/mode-textile.js b/apps/files_texteditor/js/aceeditor/mode-textile.js
deleted file mode 100644
index 3b36437c49..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-textile.js
+++ /dev/null
@@ -1 +0,0 @@
-define("ace/mode/textile",["require","exports","module","ace/lib/oop","ace/mode/text","ace/tokenizer","ace/mode/textile_highlight_rules","ace/mode/matching_brace_outdent"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text").Mode,f=a("../tokenizer").Tokenizer,g=a("./textile_highlight_rules").TextileHighlightRules,h=a("./matching_brace_outdent").MatchingBraceOutdent,i=function(){this.$tokenizer=new f((new g).getRules()),this.$outdent=new h};d.inherits(i,e),function(){this.getNextLineIndent=function(a,b,c){return a=="intag"?c:""},this.checkOutdent=function(a,b,c){return this.$outdent.checkOutdent(b,c)},this.autoOutdent=function(a,b,c){this.$outdent.autoOutdent(b,c)}}.call(i.prototype),b.Mode=i}),define("ace/mode/textile_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text_highlight_rules").TextHighlightRules,f=function(){this.$rules={start:[{token:function(a){return a.match(/^h\d$/)?"markup.heading."+a.charAt(1):"markup.heading"},regex:"h1|h2|h3|h4|h5|h6|bq|p|bc|pre",next:"blocktag"},{token:"keyword",regex:"[\\*]+|[#]+"},{token:"text",regex:".+"}],blocktag:[{token:"keyword",regex:"\\. ",next:"start"},{token:"keyword",regex:"\\(",next:"blocktagproperties"}],blocktagproperties:[{token:"keyword",regex:"\\)",next:"blocktag"},{token:"string",regex:"[a-zA-Z0-9\\-_]+"},{token:"keyword",regex:"#"}]}};d.inherits(f,e),b.TextileHighlightRules=f}),define("ace/mode/matching_brace_outdent",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../range").Range,e=function(){};(function(){this.checkOutdent=function(a,b){return/^\s+$/.test(a)?/^\s*\}/.test(b):!1},this.autoOutdent=function(a,b){var c=a.getLine(b),e=c.match(/^(\s*\})/);if(!e)return 0;var f=e[1].length,g=a.findMatchingBracket({row:b,column:f});if(!g||g.row==b)return 0;var h=this.$getIndent(a.getLine(g.row));a.replace(new d(b,0,b,f-1),h)},this.$getIndent=function(a){var b=a.match(/^(\s+)/);return b?b[1]:""}}).call(e.prototype),b.MatchingBraceOutdent=e})
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/mode-xml-uncompressed.js b/apps/files_texteditor/js/aceeditor/mode-xml-uncompressed.js
deleted file mode 100644
index e1af69123b..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-xml-uncompressed.js
+++ /dev/null
@@ -1,1009 +0,0 @@
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/xml', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text', 'ace/tokenizer', 'ace/mode/xml_highlight_rules', 'ace/mode/behaviour/xml', 'ace/mode/folding/xml'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
-var XmlHighlightRules = require("./xml_highlight_rules").XmlHighlightRules;
-var XmlBehaviour = require("./behaviour/xml").XmlBehaviour;
-var XmlFoldMode = require("./folding/xml").FoldMode;
-
-var Mode = function() {
-    this.$tokenizer = new Tokenizer(new XmlHighlightRules().getRules());
-    this.$behaviour = new XmlBehaviour();
-    this.foldingRules = new XmlFoldMode();
-};
-
-oop.inherits(Mode, TextMode);
-
-(function() {
-    
-    this.getNextLineIndent = function(state, line, tab) {
-        return this.$getIndent(line);
-    };
-
-}).call(Mode.prototype);
-
-exports.Mode = Mode;
-});
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/xml_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/xml_util', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var xmlUtil = require("./xml_util");
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-
-var XmlHighlightRules = function() {
-
-    // regexp must not have capturing parentheses
-    // regexps are ordered -> the first match is used
-    this.$rules = {
-        start : [{
-            token : "text",
-            regex : "<\\!\\[CDATA\\[",
-            next : "cdata"
-        }, {
-            token : "xml_pe",
-            regex : "<\\?.*?\\?>"
-        }, {
-            token : "comment",
-            merge : true,
-            regex : "<\\!--",
-            next : "comment"
-        }, {
-            token : "xml_pe",
-            regex : "<\\!.*?>"
-        }, {
-            token : "meta.tag", // opening tag
-            regex : "<\\/?",
-            next : "tag"
-        }, {
-            token : "text",
-            regex : "\\s+"
-        }, {
-            token : "constant.character.entity",
-            regex : "(?:&#[0-9]+;)|(?:&#x[0-9a-fA-F]+;)|(?:&[a-zA-Z0-9_:\\.-]+;)"
-        }, {
-            token : "text",
-            regex : "[^<]+"
-        }],
-        
-        cdata : [{
-            token : "text",
-            regex : "\\]\\]>",
-            next : "start"
-        }, {
-            token : "text",
-            regex : "\\s+"
-        }, {
-            token : "text",
-            regex : "(?:[^\\]]|\\](?!\\]>))+"
-        }],
-
-        comment : [{
-            token : "comment",
-            regex : ".*?-->",
-            next : "start"
-        }, {
-            token : "comment",
-            merge : true,
-            regex : ".+"
-        }]
-    };
-    
-    xmlUtil.tag(this.$rules, "tag", "start");
-};
-
-oop.inherits(XmlHighlightRules, TextHighlightRules);
-
-exports.XmlHighlightRules = XmlHighlightRules;
-});
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/xml_util', ['require', 'exports', 'module' , 'ace/lib/lang'], function(require, exports, module) {
-"use strict";
-
-var lang = require("../lib/lang");
-
-var formTags = lang.arrayToMap(
-    ("button|form|input|label|select|textarea").split("|")
-);
-
-var tableTags = lang.arrayToMap(
-    ("table|tbody|td|tfoot|th|tr").split("|")
-);
-
-function string(state) {
-    return [{
-        token : "string",
-        regex : '".*?"'
-    }, {
-        token : "string", // multi line string start
-        merge : true,
-        regex : '["].*',
-        next : state + "_qqstring"
-    }, {
-        token : "string",
-        regex : "'.*?'"
-    }, {
-        token : "string", // multi line string start
-        merge : true,
-        regex : "['].*",
-        next : state + "_qstring"
-    }];
-}
-
-function multiLineString(quote, state) {
-    return [{
-        token : "string",
-        merge : true,
-        regex : ".*?" + quote,
-        next : state
-    }, {
-        token : "string",
-        merge : true,
-        regex : '.+'
-    }];
-}
-
-exports.tag = function(states, name, nextState) {
-    states[name] = [{
-        token : "text",
-        regex : "\\s+"
-    }, {
-        //token : "meta.tag",
-        
-    token : function(value) {
-            if ( value==='a' ) {
-                return "meta.tag.anchor";
-            }
-            else if ( value==='img' ) {
-                return "meta.tag.image";
-            }
-            else if ( value==='script' ) {
-                return "meta.tag.script";
-            }
-            else if ( value==='style' ) {
-                return "meta.tag.style";
-            }
-            else if (formTags.hasOwnProperty(value.toLowerCase())) {
-                return "meta.tag.form";
-            }
-            else if (tableTags.hasOwnProperty(value.toLowerCase())) {
-                return "meta.tag.table";
-            }
-            else {
-                return "meta.tag";
-            }
-        },        
-        merge : true,
-        regex : "[-_a-zA-Z0-9:]+",
-        next : name + "_embed_attribute_list" 
-    }, {
-        token: "empty",
-        regex: "",
-        next : name + "_embed_attribute_list"
-    }];
-
-    states[name + "_qstring"] = multiLineString("'", name + "_embed_attribute_list");
-    states[name + "_qqstring"] = multiLineString("\"", name + "_embed_attribute_list");
-    
-    states[name + "_embed_attribute_list"] = [{
-        token : "meta.tag",
-        merge : true,
-        regex : "\/?>",
-        next : nextState
-    }, {
-        token : "keyword.operator",
-        regex : "="
-    }, {
-        token : "entity.other.attribute-name",
-        regex : "[-_a-zA-Z0-9:]+"
-    }, {
-        token : "constant.numeric", // float
-        regex : "[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"
-    }, {
-        token : "text",
-        regex : "\\s+"
-    }].concat(string(name));
-};
-
-});
-/* vim:ts=4:sts=4:sw=4:
- * ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Chris Spencer <chris.ag.spencer AT googlemail DOT com>
- *
- * 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 ***** */
-
-define('ace/mode/behaviour/xml', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/behaviour', 'ace/mode/behaviour/cstyle'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../../lib/oop");
-var Behaviour = require("../behaviour").Behaviour;
-var CstyleBehaviour = require("./cstyle").CstyleBehaviour;
-
-var XmlBehaviour = function () {
-    
-    this.inherit(CstyleBehaviour, ["string_dquotes"]); // Get string behaviour
-    
-    this.add("brackets", "insertion", function (state, action, editor, session, text) {
-        if (text == '<') {
-            var selection = editor.getSelectionRange();
-            var selected = session.doc.getTextRange(selection);
-            if (selected !== "") {
-                return false;
-            } else {
-                return {
-                    text: '<>',
-                    selection: [1, 1]
-                }
-            }
-        } else if (text == '>') {
-            var cursor = editor.getCursorPosition();
-            var line = session.doc.getLine(cursor.row);
-            var rightChar = line.substring(cursor.column, cursor.column + 1);
-            if (rightChar == '>') { // need some kind of matching check here
-                return {
-                    text: '',
-                    selection: [1, 1]
-                }
-            }
-        } else if (text == "\n") {
-            var cursor = editor.getCursorPosition();
-            var line = session.doc.getLine(cursor.row);
-            var rightChars = line.substring(cursor.column, cursor.column + 2);
-            if (rightChars == '</') {
-                var indent = this.$getIndent(session.doc.getLine(cursor.row)) + session.getTabString();
-                var next_indent = this.$getIndent(session.doc.getLine(cursor.row));
-
-                return {
-                    text: '\n' + indent + '\n' + next_indent,
-                    selection: [1, indent.length, 1, indent.length]
-                }
-            }
-        }
-    });
-    
-}
-oop.inherits(XmlBehaviour, Behaviour);
-
-exports.XmlBehaviour = XmlBehaviour;
-});/* vim:ts=4:sts=4:sw=4:
- * ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Chris Spencer <chris.ag.spencer AT googlemail DOT com>
- *
- * 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 ***** */
-
-define('ace/mode/behaviour/cstyle', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/behaviour'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../../lib/oop");
-var Behaviour = require('../behaviour').Behaviour;
-
-var CstyleBehaviour = function () {
-
-    this.add("braces", "insertion", function (state, action, editor, session, text) {
-        if (text == '{') {
-            var selection = editor.getSelectionRange();
-            var selected = session.doc.getTextRange(selection);
-            if (selected !== "") {
-                return {
-                    text: '{' + selected + '}',
-                    selection: false
-                };
-            } else {
-                return {
-                    text: '{}',
-                    selection: [1, 1]
-                };
-            }
-        } else if (text == '}') {
-            var cursor = editor.getCursorPosition();
-            var line = session.doc.getLine(cursor.row);
-            var rightChar = line.substring(cursor.column, cursor.column + 1);
-            if (rightChar == '}') {
-                var matching = session.$findOpeningBracket('}', {column: cursor.column + 1, row: cursor.row});
-                if (matching !== null) {
-                    return {
-                        text: '',
-                        selection: [1, 1]
-                    };
-                }
-            }
-        } else if (text == "\n") {
-            var cursor = editor.getCursorPosition();
-            var line = session.doc.getLine(cursor.row);
-            var rightChar = line.substring(cursor.column, cursor.column + 1);
-            if (rightChar == '}') {
-                var openBracePos = session.findMatchingBracket({row: cursor.row, column: cursor.column + 1});
-                if (!openBracePos)
-                     return null;
-
-                var indent = this.getNextLineIndent(state, line.substring(0, line.length - 1), session.getTabString());
-                var next_indent = this.$getIndent(session.doc.getLine(openBracePos.row));
-
-                return {
-                    text: '\n' + indent + '\n' + next_indent,
-                    selection: [1, indent.length, 1, indent.length]
-                };
-            }
-        }
-    });
-
-    this.add("braces", "deletion", function (state, action, editor, session, range) {
-        var selected = session.doc.getTextRange(range);
-        if (!range.isMultiLine() && selected == '{') {
-            var line = session.doc.getLine(range.start.row);
-            var rightChar = line.substring(range.end.column, range.end.column + 1);
-            if (rightChar == '}') {
-                range.end.column++;
-                return range;
-            }
-        }
-    });
-
-    this.add("parens", "insertion", function (state, action, editor, session, text) {
-        if (text == '(') {
-            var selection = editor.getSelectionRange();
-            var selected = session.doc.getTextRange(selection);
-            if (selected !== "") {
-                return {
-                    text: '(' + selected + ')',
-                    selection: false
-                };
-            } else {
-                return {
-                    text: '()',
-                    selection: [1, 1]
-                };
-            }
-        } else if (text == ')') {
-            var cursor = editor.getCursorPosition();
-            var line = session.doc.getLine(cursor.row);
-            var rightChar = line.substring(cursor.column, cursor.column + 1);
-            if (rightChar == ')') {
-                var matching = session.$findOpeningBracket(')', {column: cursor.column + 1, row: cursor.row});
-                if (matching !== null) {
-                    return {
-                        text: '',
-                        selection: [1, 1]
-                    };
-                }
-            }
-        }
-    });
-
-    this.add("parens", "deletion", function (state, action, editor, session, range) {
-        var selected = session.doc.getTextRange(range);
-        if (!range.isMultiLine() && selected == '(') {
-            var line = session.doc.getLine(range.start.row);
-            var rightChar = line.substring(range.start.column + 1, range.start.column + 2);
-            if (rightChar == ')') {
-                range.end.column++;
-                return range;
-            }
-        }
-    });
-
-    this.add("string_dquotes", "insertion", function (state, action, editor, session, text) {
-        if (text == '"' || text == "'") {
-            var quote = text;
-            var selection = editor.getSelectionRange();
-            var selected = session.doc.getTextRange(selection);
-            if (selected !== "") {
-                return {
-                    text: quote + selected + quote,
-                    selection: false
-                };
-            } else {
-                var cursor = editor.getCursorPosition();
-                var line = session.doc.getLine(cursor.row);
-                var leftChar = line.substring(cursor.column-1, cursor.column);
-
-                // We're escaped.
-                if (leftChar == '\\') {
-                    return null;
-                }
-
-                // Find what token we're inside.
-                var tokens = session.getTokens(selection.start.row, selection.start.row)[0].tokens;
-                var col = 0, token;
-                var quotepos = -1; // Track whether we're inside an open quote.
-
-                for (var x = 0; x < tokens.length; x++) {
-                    token = tokens[x];
-                    if (token.type == "string") {
-                      quotepos = -1;
-                    } else if (quotepos < 0) {
-                      quotepos = token.value.indexOf(quote);
-                    }
-                    if ((token.value.length + col) > selection.start.column) {
-                        break;
-                    }
-                    col += tokens[x].value.length;
-                }
-
-                // Try and be smart about when we auto insert.
-                if (!token || (quotepos < 0 && token.type !== "comment" && (token.type !== "string" || ((selection.start.column !== token.value.length+col-1) && token.value.lastIndexOf(quote) === token.value.length-1)))) {
-                    return {
-                        text: quote + quote,
-                        selection: [1,1]
-                    };
-                } else if (token && token.type === "string") {
-                    // Ignore input and move right one if we're typing over the closing quote.
-                    var rightChar = line.substring(cursor.column, cursor.column + 1);
-                    if (rightChar == quote) {
-                        return {
-                            text: '',
-                            selection: [1, 1]
-                        };
-                    }
-                }
-            }
-        }
-    });
-
-    this.add("string_dquotes", "deletion", function (state, action, editor, session, range) {
-        var selected = session.doc.getTextRange(range);
-        if (!range.isMultiLine() && (selected == '"' || selected == "'")) {
-            var line = session.doc.getLine(range.start.row);
-            var rightChar = line.substring(range.start.column + 1, range.start.column + 2);
-            if (rightChar == '"') {
-                range.end.column++;
-                return range;
-            }
-        }
-    });
-
-};
-
-oop.inherits(CstyleBehaviour, Behaviour);
-
-exports.CstyleBehaviour = CstyleBehaviour;
-});/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/folding/xml', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/lang', 'ace/range', 'ace/mode/folding/fold_mode', 'ace/token_iterator'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../../lib/oop");
-var lang = require("../../lib/lang");
-var Range = require("../../range").Range;
-var BaseFoldMode = require("./fold_mode").FoldMode;
-var TokenIterator = require("../../token_iterator").TokenIterator;
-
-var FoldMode = exports.FoldMode = function(voidElements) {
-    BaseFoldMode.call(this);
-    this.voidElements = voidElements || {};
-};
-oop.inherits(FoldMode, BaseFoldMode);
-
-(function() {
-
-    this.getFoldWidget = function(session, foldStyle, row) {
-        var tag = this._getFirstTagInLine(session, row);
-
-        if (tag.closing)
-            return foldStyle == "markbeginend" ? "end" : "";
-
-        if (!tag.tagName || this.voidElements[tag.tagName.toLowerCase()])
-            return "";
-
-        if (tag.selfClosing)
-            return "";
-
-        if (tag.value.indexOf("/" + tag.tagName) !== -1)
-            return "";
-
-        return "start";
-    };
-    
-    this._getFirstTagInLine = function(session, row) {
-        var tokens = session.getTokens(row, row)[0].tokens;
-        var value = "";
-        for (var i = 0; i < tokens.length; i++) {
-            var token = tokens[i];
-            if (token.type.indexOf("meta.tag") === 0)
-                value += token.value;
-            else
-                value += lang.stringRepeat(" ", token.value.length);
-        }
-        
-        return this._parseTag(value);
-    };
-
-    this.tagRe = /^(\s*)(<?(\/?)([-_a-zA-Z0-9:!]*)\s*(\/?)>?)/;
-    this._parseTag = function(tag) {
-        
-        var match = this.tagRe.exec(tag);
-        var column = this.tagRe.lastIndex || 0;
-        this.tagRe.lastIndex = 0;
-
-        return {
-            value: tag,
-            match: match ? match[2] : "",
-            closing: match ? !!match[3] : false,
-            selfClosing: match ? !!match[5] || match[2] == "/>" : false,
-            tagName: match ? match[4] : "",
-            column: match[1] ? column + match[1].length : column
-        };
-    };
-    
-    /**
-     * reads a full tag and places the iterator after the tag
-     */
-    this._readTagForward = function(iterator) {
-        var token = iterator.getCurrentToken();
-        if (!token)
-            return null;
-            
-        var value = "";
-        var start;
-        
-        do {
-            if (token.type.indexOf("meta.tag") === 0) {
-                if (!start) {
-                    var start = {
-                        row: iterator.getCurrentTokenRow(),
-                        column: iterator.getCurrentTokenColumn()
-                    };
-                }
-                value += token.value;
-                if (value.indexOf(">") !== -1) {
-                    var tag = this._parseTag(value);
-                    tag.start = start;
-                    tag.end = {
-                        row: iterator.getCurrentTokenRow(),
-                        column: iterator.getCurrentTokenColumn() + token.value.length
-                    };
-                    iterator.stepForward();
-                    return tag;
-                }
-            }
-        } while(token = iterator.stepForward());
-        
-        return null;
-    };
-    
-    this._readTagBackward = function(iterator) {
-        var token = iterator.getCurrentToken();
-        if (!token)
-            return null;
-            
-        var value = "";
-        var end;
-
-        do {
-            if (token.type.indexOf("meta.tag") === 0) {
-                if (!end) {
-                    end = {
-                        row: iterator.getCurrentTokenRow(),
-                        column: iterator.getCurrentTokenColumn() + token.value.length
-                    };
-                }
-                value = token.value + value;
-                if (value.indexOf("<") !== -1) {
-                    var tag = this._parseTag(value);
-                    tag.end = end;
-                    tag.start = {
-                        row: iterator.getCurrentTokenRow(),
-                        column: iterator.getCurrentTokenColumn()
-                    };
-                    iterator.stepBackward();
-                    return tag;
-                }
-            }
-        } while(token = iterator.stepBackward());
-        
-        return null;
-    };
-    
-    this._pop = function(stack, tag) {
-        while (stack.length) {
-            
-            var top = stack[stack.length-1];
-            if (!tag || top.tagName == tag.tagName) {
-                return stack.pop();
-            }
-            else if (this.voidElements[tag.tagName]) {
-                return;
-            }
-            else if (this.voidElements[top.tagName]) {
-                stack.pop();
-                continue;
-            } else {
-                return null;
-            }
-        }
-    };
-    
-    this.getFoldWidgetRange = function(session, foldStyle, row) {
-        var firstTag = this._getFirstTagInLine(session, row);
-        
-        if (!firstTag.match)
-            return null;
-        
-        var isBackward = firstTag.closing || firstTag.selfClosing;
-        var stack = [];
-        var tag;
-        
-        if (!isBackward) {
-            var iterator = new TokenIterator(session, row, firstTag.column);
-            var start = {
-                row: row,
-                column: firstTag.column + firstTag.tagName.length + 2
-            };
-            while (tag = this._readTagForward(iterator)) {
-                if (tag.selfClosing) {
-                    if (!stack.length) {
-                        tag.start.column += tag.tagName.length + 2;
-                        tag.end.column -= 2;
-                        return Range.fromPoints(tag.start, tag.end);
-                    } else
-                        continue;
-                }
-                
-                if (tag.closing) {
-                    this._pop(stack, tag);
-                    if (stack.length == 0)
-                        return Range.fromPoints(start, tag.start);
-                }
-                else {
-                    stack.push(tag)
-                }
-            }
-        }
-        else {
-            var iterator = new TokenIterator(session, row, firstTag.column + firstTag.match.length);
-            var end = {
-                row: row,
-                column: firstTag.column
-            };
-            
-            while (tag = this._readTagBackward(iterator)) {
-                if (tag.selfClosing) {
-                    if (!stack.length) {
-                        tag.start.column += tag.tagName.length + 2;
-                        tag.end.column -= 2;
-                        return Range.fromPoints(tag.start, tag.end);
-                    } else
-                        continue;
-                }
-                
-                if (!tag.closing) {
-                    this._pop(stack, tag);
-                    if (stack.length == 0) {
-                        tag.start.column += tag.tagName.length + 2;
-                        return Range.fromPoints(tag.start, end);
-                    }
-                }
-                else {
-                    stack.push(tag)
-                }
-            }
-        }
-        
-    };
-
-}).call(FoldMode.prototype);
-
-});/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/folding/fold_mode', ['require', 'exports', 'module' , 'ace/range'], function(require, exports, module) {
-"use strict";
-
-var Range = require("../../range").Range;
-
-var FoldMode = exports.FoldMode = function() {};
-
-(function() {
-
-    this.foldingStartMarker = null;
-    this.foldingStopMarker = null;
-
-    // must return "" if there's no fold, to enable caching
-    this.getFoldWidget = function(session, foldStyle, row) {
-        var line = session.getLine(row);
-        if (this.foldingStartMarker.test(line))
-            return "start";
-        if (foldStyle == "markbeginend"
-                && this.foldingStopMarker
-                && this.foldingStopMarker.test(line))
-            return "end";
-        return "";
-    };
-    
-    this.getFoldWidgetRange = function(session, foldStyle, row) {
-        return null;
-    };
-
-    this.indentationBlock = function(session, row, column) {
-        var re = /^\s*/;
-        var startRow = row;
-        var endRow = row;
-        var line = session.getLine(row);
-        var startColumn = column || line.length;
-        var startLevel = line.match(re)[0].length;
-        var maxRow = session.getLength()
-        
-        while (++row < maxRow) {
-            line = session.getLine(row);
-            var level = line.match(re)[0].length;
-
-            if (level == line.length)
-                continue;
-
-            if (level <= startLevel)
-                break;
-
-            endRow = row;
-        }
-
-        if (endRow > startRow) {
-            var endColumn = session.getLine(endRow).length;
-            return new Range(startRow, startColumn, endRow, endColumn);
-        }
-    };
-
-    this.openingBracketBlock = function(session, bracket, row, column) {
-        var start = {row: row, column: column + 1};
-        var end = session.$findClosingBracket(bracket, start);
-        if (!end)
-            return;
-
-        var fw = session.foldWidgets[end.row];
-        if (fw == null)
-            fw = this.getFoldWidget(session, end.row);
-
-        if (fw == "start") {
-            end.row --;
-            end.column = session.getLine(end.row).length;
-        }
-        return Range.fromPoints(start, end);
-    };
-
-}).call(FoldMode.prototype);
-
-});
diff --git a/apps/files_texteditor/js/aceeditor/mode-xml.js b/apps/files_texteditor/js/aceeditor/mode-xml.js
deleted file mode 100644
index 27c038a13b..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-xml.js
+++ /dev/null
@@ -1 +0,0 @@
-define("ace/mode/xml",["require","exports","module","ace/lib/oop","ace/mode/text","ace/tokenizer","ace/mode/xml_highlight_rules","ace/mode/behaviour/xml","ace/mode/folding/xml"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text").Mode,f=a("../tokenizer").Tokenizer,g=a("./xml_highlight_rules").XmlHighlightRules,h=a("./behaviour/xml").XmlBehaviour,i=a("./folding/xml").FoldMode,j=function(){this.$tokenizer=new f((new g).getRules()),this.$behaviour=new h,this.foldingRules=new i};d.inherits(j,e),function(){this.getNextLineIndent=function(a,b,c){return this.$getIndent(b)}}.call(j.prototype),b.Mode=j}),define("ace/mode/xml_highlight_rules",["require","exports","module","ace/lib/oop","ace/mode/xml_util","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./xml_util"),f=a("./text_highlight_rules").TextHighlightRules,g=function(){this.$rules={start:[{token:"text",regex:"<\\!\\[CDATA\\[",next:"cdata"},{token:"xml_pe",regex:"<\\?.*?\\?>"},{token:"comment",merge:!0,regex:"<\\!--",next:"comment"},{token:"xml_pe",regex:"<\\!.*?>"},{token:"meta.tag",regex:"<\\/?",next:"tag"},{token:"text",regex:"\\s+"},{token:"constant.character.entity",regex:"(?:&#[0-9]+;)|(?:&#x[0-9a-fA-F]+;)|(?:&[a-zA-Z0-9_:\\.-]+;)"},{token:"text",regex:"[^<]+"}],cdata:[{token:"text",regex:"\\]\\]>",next:"start"},{token:"text",regex:"\\s+"},{token:"text",regex:"(?:[^\\]]|\\](?!\\]>))+"}],comment:[{token:"comment",regex:".*?-->",next:"start"},{token:"comment",merge:!0,regex:".+"}]},e.tag(this.$rules,"tag","start")};d.inherits(g,f),b.XmlHighlightRules=g}),define("ace/mode/xml_util",["require","exports","module","ace/lib/lang"],function(a,b,c){function g(a){return[{token:"string",regex:'".*?"'},{token:"string",merge:!0,regex:'["].*',next:a+"_qqstring"},{token:"string",regex:"'.*?'"},{token:"string",merge:!0,regex:"['].*",next:a+"_qstring"}]}function h(a,b){return[{token:"string",merge:!0,regex:".*?"+a,next:b},{token:"string",merge:!0,regex:".+"}]}"use strict";var d=a("../lib/lang"),e=d.arrayToMap("button|form|input|label|select|textarea".split("|")),f=d.arrayToMap("table|tbody|td|tfoot|th|tr".split("|"));b.tag=function(a,b,c){a[b]=[{token:"text",regex:"\\s+"},{token:function(a){return a==="a"?"meta.tag.anchor":a==="img"?"meta.tag.image":a==="script"?"meta.tag.script":a==="style"?"meta.tag.style":e.hasOwnProperty(a.toLowerCase())?"meta.tag.form":f.hasOwnProperty(a.toLowerCase())?"meta.tag.table":"meta.tag"},merge:!0,regex:"[-_a-zA-Z0-9:]+",next:b+"_embed_attribute_list"},{token:"empty",regex:"",next:b+"_embed_attribute_list"}],a[b+"_qstring"]=h("'",b+"_embed_attribute_list"),a[b+"_qqstring"]=h('"',b+"_embed_attribute_list"),a[b+"_embed_attribute_list"]=[{token:"meta.tag",merge:!0,regex:"/?>",next:c},{token:"keyword.operator",regex:"="},{token:"entity.other.attribute-name",regex:"[-_a-zA-Z0-9:]+"},{token:"constant.numeric",regex:"[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"},{token:"text",regex:"\\s+"}].concat(g(b))}}),define("ace/mode/behaviour/xml",["require","exports","module","ace/lib/oop","ace/mode/behaviour","ace/mode/behaviour/cstyle"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../behaviour").Behaviour,f=a("./cstyle").CstyleBehaviour,g=function(){this.inherit(f,["string_dquotes"]),this.add("brackets","insertion",function(a,b,c,d,e){if(e=="<"){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?!1:{text:"<>",selection:[1,1]}}if(e==">"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j==">")return{text:"",selection:[1,1]}}else if(e=="\n"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),k=i.substring(h.column,h.column+2);if(k=="</"){var l=this.$getIndent(d.doc.getLine(h.row))+d.getTabString(),m=this.$getIndent(d.doc.getLine(h.row));return{text:"\n"+l+"\n"+m,selection:[1,l.length,1,l.length]}}}})};d.inherits(g,e),b.XmlBehaviour=g}),define("ace/mode/behaviour/cstyle",["require","exports","module","ace/lib/oop","ace/mode/behaviour"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../behaviour").Behaviour,f=function(){this.add("braces","insertion",function(a,b,c,d,e){if(e=="{"){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"{"+g+"}",selection:!1}:{text:"{}",selection:[1,1]}}if(e=="}"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var k=d.$findOpeningBracket("}",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}else if(e=="\n"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var l=d.findMatchingBracket({row:h.row,column:h.column+1});if(!l)return null;var m=this.getNextLineIndent(a,i.substring(0,i.length-1),d.getTabString()),n=this.$getIndent(d.doc.getLine(l.row));return{text:"\n"+m+"\n"+n,selection:[1,m.length,1,m.length]}}}}),this.add("braces","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="{"){var g=d.doc.getLine(e.start.row),h=g.substring(e.end.column,e.end.column+1);if(h=="}")return e.end.column++,e}}),this.add("parens","insertion",function(a,b,c,d,e){if(e=="("){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"("+g+")",selection:!1}:{text:"()",selection:[1,1]}}if(e==")"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j==")"){var k=d.$findOpeningBracket(")",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}}),this.add("parens","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="("){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h==")")return e.end.column++,e}}),this.add("string_dquotes","insertion",function(a,b,c,d,e){if(e=='"'||e=="'"){var f=e,g=c.getSelectionRange(),h=d.doc.getTextRange(g);if(h!=="")return{text:f+h+f,selection:!1};var i=c.getCursorPosition(),j=d.doc.getLine(i.row),k=j.substring(i.column-1,i.column);if(k=="\\")return null;var l=d.getTokens(g.start.row,g.start.row)[0].tokens,m=0,n,o=-1;for(var p=0;p<l.length;p++){n=l[p],n.type=="string"?o=-1:o<0&&(o=n.value.indexOf(f));if(n.value.length+m>g.start.column)break;m+=l[p].value.length}if(!n||o<0&&n.type!=="comment"&&(n.type!=="string"||g.start.column!==n.value.length+m-1&&n.value.lastIndexOf(f)===n.value.length-1))return{text:f+f,selection:[1,1]};if(n&&n.type==="string"){var q=j.substring(i.column,i.column+1);if(q==f)return{text:"",selection:[1,1]}}}}),this.add("string_dquotes","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&(f=='"'||f=="'")){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h=='"')return e.end.column++,e}})};d.inherits(f,e),b.CstyleBehaviour=f}),define("ace/mode/folding/xml",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/range","ace/mode/folding/fold_mode","ace/token_iterator"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../../lib/lang"),f=a("../../range").Range,g=a("./fold_mode").FoldMode,h=a("../../token_iterator").TokenIterator,i=b.FoldMode=function(a){g.call(this),this.voidElements=a||{}};d.inherits(i,g),function(){this.getFoldWidget=function(a,b,c){var d=this._getFirstTagInLine(a,c);return d.closing?b=="markbeginend"?"end":"":!d.tagName||this.voidElements[d.tagName.toLowerCase()]?"":d.selfClosing?"":d.value.indexOf("/"+d.tagName)!==-1?"":"start"},this._getFirstTagInLine=function(a,b){var c=a.getTokens(b,b)[0].tokens,d="";for(var f=0;f<c.length;f++){var g=c[f];g.type.indexOf("meta.tag")===0?d+=g.value:d+=e.stringRepeat(" ",g.value.length)}return this._parseTag(d)},this.tagRe=/^(\s*)(<?(\/?)([-_a-zA-Z0-9:!]*)\s*(\/?)>?)/,this._parseTag=function(a){var b=this.tagRe.exec(a),c=this.tagRe.lastIndex||0;return this.tagRe.lastIndex=0,{value:a,match:b?b[2]:"",closing:b?!!b[3]:!1,selfClosing:b?!!b[5]||b[2]=="/>":!1,tagName:b?b[4]:"",column:b[1]?c+b[1].length:c}},this._readTagForward=function(a){var b=a.getCurrentToken();if(!b)return null;var c="",d;do if(b.type.indexOf("meta.tag")===0){if(!d)var d={row:a.getCurrentTokenRow(),column:a.getCurrentTokenColumn()};c+=b.value;if(c.indexOf(">")!==-1){var e=this._parseTag(c);return e.start=d,e.end={row:a.getCurrentTokenRow(),column:a.getCurrentTokenColumn()+b.value.length},a.stepForward(),e}}while(b=a.stepForward());return null},this._readTagBackward=function(a){var b=a.getCurrentToken();if(!b)return null;var c="",d;do if(b.type.indexOf("meta.tag")===0){d||(d={row:a.getCurrentTokenRow(),column:a.getCurrentTokenColumn()+b.value.length}),c=b.value+c;if(c.indexOf("<")!==-1){var e=this._parseTag(c);return e.end=d,e.start={row:a.getCurrentTokenRow(),column:a.getCurrentTokenColumn()},a.stepBackward(),e}}while(b=a.stepBackward());return null},this._pop=function(a,b){while(a.length){var c=a[a.length-1];if(!b||c.tagName==b.tagName)return a.pop();if(this.voidElements[b.tagName])return;if(this.voidElements[c.tagName]){a.pop();continue}return null}},this.getFoldWidgetRange=function(a,b,c){var d=this._getFirstTagInLine(a,c);if(!d.match)return null;var e=d.closing||d.selfClosing,g=[],i;if(!e){var j=new h(a,c,d.column),k={row:c,column:d.column+d.tagName.length+2};while(i=this._readTagForward(j)){if(i.selfClosing){if(!g.length)return i.start.column+=i.tagName.length+2,i.end.column-=2,f.fromPoints(i.start,i.end);continue}if(i.closing){this._pop(g,i);if(g.length==0)return f.fromPoints(k,i.start)}else g.push(i)}}else{var j=new h(a,c,d.column+d.match.length),l={row:c,column:d.column};while(i=this._readTagBackward(j)){if(i.selfClosing){if(!g.length)return i.start.column+=i.tagName.length+2,i.end.column-=2,f.fromPoints(i.start,i.end);continue}if(!i.closing){this._pop(g,i);if(g.length==0)return i.start.column+=i.tagName.length+2,f.fromPoints(i.start,l)}else g.push(i)}}}}.call(i.prototype)}),define("ace/mode/folding/fold_mode",["require","exports","module","ace/range"],function(a,b,c){"use strict";var d=a("../../range").Range,e=b.FoldMode=function(){};(function(){this.foldingStartMarker=null,this.foldingStopMarker=null,this.getFoldWidget=function(a,b,c){var d=a.getLine(c);return this.foldingStartMarker.test(d)?"start":b=="markbeginend"&&this.foldingStopMarker&&this.foldingStopMarker.test(d)?"end":""},this.getFoldWidgetRange=function(a,b,c){return null},this.indentationBlock=function(a,b,c){var e=/^\s*/,f=b,g=b,h=a.getLine(b),i=c||h.length,j=h.match(e)[0].length,k=a.getLength();while(++b<k){h=a.getLine(b);var l=h.match(e)[0].length;if(l==h.length)continue;if(l<=j)break;g=b}if(g>f){var m=a.getLine(g).length;return new d(f,i,g,m)}},this.openingBracketBlock=function(a,b,c,e){var f={row:c,column:e+1},g=a.$findClosingBracket(b,f);if(!g)return;var h=a.foldWidgets[g.row];return h==null&&(h=this.getFoldWidget(a,g.row)),h=="start"&&(g.row--,g.column=a.getLine(g.row).length),d.fromPoints(f,g)}}).call(e.prototype)})
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/mode-xquery-uncompressed.js b/apps/files_texteditor/js/aceeditor/mode-xquery-uncompressed.js
deleted file mode 100644
index 69effad6e2..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-xquery-uncompressed.js
+++ /dev/null
@@ -1,540 +0,0 @@
-/*
- *  eXide - web-based XQuery IDE
- *  
- *  Copyright (C) 2011 Wolfgang Meier
- *
- *  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 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 General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-define('ace/mode/xquery', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/text', 'ace/tokenizer', 'ace/mode/xquery_highlight_rules', 'ace/mode/behaviour/xquery', 'ace/range'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var TextMode = require("./text").Mode;
-var Tokenizer = require("../tokenizer").Tokenizer;
-var XQueryHighlightRules = require("./xquery_highlight_rules").XQueryHighlightRules;
-var XQueryBehaviour = require("./behaviour/xquery").XQueryBehaviour;
-var Range = require("../range").Range;
-
-var Mode = function(parent) {
-    this.$tokenizer = new Tokenizer(new XQueryHighlightRules().getRules());
-    this.$behaviour = new XQueryBehaviour(parent);
-};
-
-oop.inherits(Mode, TextMode);
-
-(function() {
-
-    this.getNextLineIndent = function(state, line, tab) {
-      var indent = this.$getIndent(line);
-      var match = line.match(/\s*(?:then|else|return|[{\(]|<\w+>)\s*$/);
-      if (match)
-        indent += tab;
-        return indent;
-    };
-    
-    this.checkOutdent = function(state, line, input) {
-      if (! /^\s+$/.test(line))
-            return false;
-
-        return /^\s*[\}\)]/.test(input);
-    };
-    
-    this.autoOutdent = function(state, doc, row) {
-      var line = doc.getLine(row);
-        var match = line.match(/^(\s*[\}\)])/);
-
-        if (!match) return 0;
-
-        var column = match[1].length;
-        var openBracePos = doc.findMatchingBracket({row: row, column: column});
-
-        if (!openBracePos || openBracePos.row == row) return 0;
-
-        var indent = this.$getIndent(doc.getLine(openBracePos.row));
-        doc.replace(new Range(row, 0, row, column-1), indent);
-    };
-
-    this.$getIndent = function(line) {
-        var match = line.match(/^(\s+)/);
-        if (match) {
-            return match[1];
-        }
-
-        return "";
-    };
-    
-    this.toggleCommentLines = function(state, doc, startRow, endRow) {
-        var i, line;
-        var outdent = true;
-        var re = /^\s*\(:(.*):\)/;
-
-        for (i=startRow; i<= endRow; i++) {
-            if (!re.test(doc.getLine(i))) {
-                outdent = false;
-                break;
-            }
-        }
-
-        var range = new Range(0, 0, 0, 0);
-        for (i=startRow; i<= endRow; i++) {
-            line = doc.getLine(i);
-            range.start.row  = i;
-            range.end.row    = i;
-            range.end.column = line.length;
-
-            doc.replace(range, outdent ? line.match(re)[1] : "(:" + line + ":)");
-        }
-    };
-}).call(Mode.prototype);
-
-exports.Mode = Mode;
-});
-/*
- *  eXide - web-based XQuery IDE
- *  
- *  Copyright (C) 2011 Wolfgang Meier
- *
- *  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 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 General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-define('ace/mode/xquery_highlight_rules', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/lang', 'ace/mode/text_highlight_rules'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var lang = require("../lib/lang");
-var TextHighlightRules = require("./text_highlight_rules").TextHighlightRules;
-
-var XQueryHighlightRules = function() {
-
-  var keywords = lang.arrayToMap(
-    ("return|for|let|where|order|by|declare|function|variable|xquery|version|option|namespace|import|module|when|encoding|" +
-     "switch|default|try|catch|group|tumbling|sliding|window|start|end|at|only|" +
-     "using|stemming|" +
-     "while|" + 
-     "external|" +
-     "if|then|else|as|and|or|typeswitch|case|ascending|descending|empty|in|count|updating|insert|delete|replace|value|node|attribute|text|element|into|of|with|contains").split("|")
-    );
-
-    // regexp must not have capturing parentheses
-    // regexps are ordered -> the first match is used
-
-    this.$rules = {
-        start : [ {
-            token : "text",
-            regex : "<\\!\\[CDATA\\[",
-            next : "cdata"
-        }, {
-            token : "xml_pe",
-            regex : "<\\?.*?\\?>"
-        }, {
-            token : "comment",
-            regex : "<\\!--",
-            next : "comment"
-    }, {
-      token : "comment",
-      regex : "\\(:",
-      next : "comment"
-        }, {
-            token : "text", // opening tag
-            regex : "<\\/?",
-            next : "tag"
-        }, {
-            token : "constant", // number
-            regex : "[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"
-    }, {
-            token : "variable", // variable
-            regex : "\\$[a-zA-Z_][a-zA-Z0-9_\\-:]*\\b"
-    }, {
-      token: "string",
-      regex : '".*?"'
-    }, {
-      token: "string",
-      regex : "'.*?'"
-        }, {
-            token : "text",
-            regex : "\\s+"
-        }, {
-            token: "support.function",
-            regex: "\\w[\\w+_\\-:]+(?=\\()"
-        }, {
-      token : function(value) {
-            if (keywords[value])
-                return "keyword";
-            else
-                return "identifier";
-      },
-      regex : "[a-zA-Z_$][a-zA-Z0-9_$]*\\b"
-    }, {
-            token: "keyword.operator",
-            regex: "\\*|=|<|>|\\-|\\+|and|or|eq|ne|lt|gt"
-        }, {
-            token: "lparen",
-            regex: "[[({]"
-        }, {
-            token: "rparen",
-            regex: "[\\])}]"
-        } ],
-
-        tag : [ {
-            token : "text",
-            regex : ">",
-            next : "start"
-        }, {
-            token : "meta.tag",
-            regex : "[-_a-zA-Z0-9:]+"
-        }, {
-            token : "text",
-            regex : "\\s+"
-        }, {
-            token : "string",
-            regex : '".*?"'
-        }, {
-            token : "string",
-            regex : "'.*?'"
-        } ],
-
-        cdata : [ {
-            token : "text",
-            regex : "\\]\\]>",
-            next : "start"
-        }, {
-            token : "text",
-            regex : "\\s+"
-        }, {
-            token : "text",
-            regex : "(?:[^\\]]|\\](?!\\]>))+"
-        } ],
-
-        comment : [ {
-            token : "comment",
-            regex : ".*?-->",
-            next : "start"
-        }, {
-      token: "comment",
-      regex : ".*:\\)",
-      next : "start"
-        }, {
-            token : "comment",
-            regex : ".+"
-    } ]
-    };
-};
-
-oop.inherits(XQueryHighlightRules, TextHighlightRules);
-
-exports.XQueryHighlightRules = XQueryHighlightRules;
-});
-/*
-*  eXide - web-based XQuery IDE
-*  
-*  Copyright (C) 2011 Wolfgang Meier
-*
-*  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 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 General Public License for more details.
-*
-*  You should have received a copy of the GNU General Public License
-*  along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-define('ace/mode/behaviour/xquery', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/behaviour', 'ace/mode/behaviour/cstyle'], function(require, exports, module) {
-"use strict";
-
-  var oop = require("../../lib/oop");
-  var Behaviour = require('../behaviour').Behaviour;
-  var CstyleBehaviour = require('./cstyle').CstyleBehaviour;
-
-  var XQueryBehaviour = function (parent) {
-      
-      this.inherit(CstyleBehaviour, ["braces", "parens", "string_dquotes"]); // Get string behaviour
-      this.parent = parent;
-      
-      this.add("brackets", "insertion", function (state, action, editor, session, text) {
-          if (text == "\n") {
-              var cursor = editor.getCursorPosition();
-              var line = session.doc.getLine(cursor.row);
-              var rightChars = line.substring(cursor.column, cursor.column + 2);
-              if (rightChars == '</') {
-                  var indent = this.$getIndent(session.doc.getLine(cursor.row)) + session.getTabString();
-                  var next_indent = this.$getIndent(session.doc.getLine(cursor.row));
-
-                  return {
-                      text: '\n' + indent + '\n' + next_indent,
-                      selection: [1, indent.length, 1, indent.length]
-                  }
-              }
-          }
-          return false;
-      });
-
-      // Check for open tag if user enters / and auto-close it.
-      this.add("slash", "insertion", function (state, action, editor, session, text) {
-        if (text == "/") {
-          var cursor = editor.getCursorPosition();
-        var line = session.doc.getLine(cursor.row);
-        if (cursor.column > 0 && line.charAt(cursor.column - 1) == "<") {
-          line = line.substring(0, cursor.column) + "/" + line.substring(cursor.column);
-          var lines = session.doc.getAllLines();
-          lines[cursor.row] = line;
-          // call mode helper to close the tag if possible
-          parent.exec("closeTag", lines.join(session.doc.getNewLineCharacter()), cursor.row);
-        }
-        }
-      return false;
-      });
-  }
-  oop.inherits(XQueryBehaviour, Behaviour);
-
-  exports.XQueryBehaviour = XQueryBehaviour;
-});
-/* vim:ts=4:sts=4:sw=4:
- * ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Chris Spencer <chris.ag.spencer AT googlemail DOT com>
- *
- * 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 ***** */
-
-define('ace/mode/behaviour/cstyle', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/mode/behaviour'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../../lib/oop");
-var Behaviour = require('../behaviour').Behaviour;
-
-var CstyleBehaviour = function () {
-
-    this.add("braces", "insertion", function (state, action, editor, session, text) {
-        if (text == '{') {
-            var selection = editor.getSelectionRange();
-            var selected = session.doc.getTextRange(selection);
-            if (selected !== "") {
-                return {
-                    text: '{' + selected + '}',
-                    selection: false
-                };
-            } else {
-                return {
-                    text: '{}',
-                    selection: [1, 1]
-                };
-            }
-        } else if (text == '}') {
-            var cursor = editor.getCursorPosition();
-            var line = session.doc.getLine(cursor.row);
-            var rightChar = line.substring(cursor.column, cursor.column + 1);
-            if (rightChar == '}') {
-                var matching = session.$findOpeningBracket('}', {column: cursor.column + 1, row: cursor.row});
-                if (matching !== null) {
-                    return {
-                        text: '',
-                        selection: [1, 1]
-                    };
-                }
-            }
-        } else if (text == "\n") {
-            var cursor = editor.getCursorPosition();
-            var line = session.doc.getLine(cursor.row);
-            var rightChar = line.substring(cursor.column, cursor.column + 1);
-            if (rightChar == '}') {
-                var openBracePos = session.findMatchingBracket({row: cursor.row, column: cursor.column + 1});
-                if (!openBracePos)
-                     return null;
-
-                var indent = this.getNextLineIndent(state, line.substring(0, line.length - 1), session.getTabString());
-                var next_indent = this.$getIndent(session.doc.getLine(openBracePos.row));
-
-                return {
-                    text: '\n' + indent + '\n' + next_indent,
-                    selection: [1, indent.length, 1, indent.length]
-                };
-            }
-        }
-    });
-
-    this.add("braces", "deletion", function (state, action, editor, session, range) {
-        var selected = session.doc.getTextRange(range);
-        if (!range.isMultiLine() && selected == '{') {
-            var line = session.doc.getLine(range.start.row);
-            var rightChar = line.substring(range.end.column, range.end.column + 1);
-            if (rightChar == '}') {
-                range.end.column++;
-                return range;
-            }
-        }
-    });
-
-    this.add("parens", "insertion", function (state, action, editor, session, text) {
-        if (text == '(') {
-            var selection = editor.getSelectionRange();
-            var selected = session.doc.getTextRange(selection);
-            if (selected !== "") {
-                return {
-                    text: '(' + selected + ')',
-                    selection: false
-                };
-            } else {
-                return {
-                    text: '()',
-                    selection: [1, 1]
-                };
-            }
-        } else if (text == ')') {
-            var cursor = editor.getCursorPosition();
-            var line = session.doc.getLine(cursor.row);
-            var rightChar = line.substring(cursor.column, cursor.column + 1);
-            if (rightChar == ')') {
-                var matching = session.$findOpeningBracket(')', {column: cursor.column + 1, row: cursor.row});
-                if (matching !== null) {
-                    return {
-                        text: '',
-                        selection: [1, 1]
-                    };
-                }
-            }
-        }
-    });
-
-    this.add("parens", "deletion", function (state, action, editor, session, range) {
-        var selected = session.doc.getTextRange(range);
-        if (!range.isMultiLine() && selected == '(') {
-            var line = session.doc.getLine(range.start.row);
-            var rightChar = line.substring(range.start.column + 1, range.start.column + 2);
-            if (rightChar == ')') {
-                range.end.column++;
-                return range;
-            }
-        }
-    });
-
-    this.add("string_dquotes", "insertion", function (state, action, editor, session, text) {
-        if (text == '"' || text == "'") {
-            var quote = text;
-            var selection = editor.getSelectionRange();
-            var selected = session.doc.getTextRange(selection);
-            if (selected !== "") {
-                return {
-                    text: quote + selected + quote,
-                    selection: false
-                };
-            } else {
-                var cursor = editor.getCursorPosition();
-                var line = session.doc.getLine(cursor.row);
-                var leftChar = line.substring(cursor.column-1, cursor.column);
-
-                // We're escaped.
-                if (leftChar == '\\') {
-                    return null;
-                }
-
-                // Find what token we're inside.
-                var tokens = session.getTokens(selection.start.row, selection.start.row)[0].tokens;
-                var col = 0, token;
-                var quotepos = -1; // Track whether we're inside an open quote.
-
-                for (var x = 0; x < tokens.length; x++) {
-                    token = tokens[x];
-                    if (token.type == "string") {
-                      quotepos = -1;
-                    } else if (quotepos < 0) {
-                      quotepos = token.value.indexOf(quote);
-                    }
-                    if ((token.value.length + col) > selection.start.column) {
-                        break;
-                    }
-                    col += tokens[x].value.length;
-                }
-
-                // Try and be smart about when we auto insert.
-                if (!token || (quotepos < 0 && token.type !== "comment" && (token.type !== "string" || ((selection.start.column !== token.value.length+col-1) && token.value.lastIndexOf(quote) === token.value.length-1)))) {
-                    return {
-                        text: quote + quote,
-                        selection: [1,1]
-                    };
-                } else if (token && token.type === "string") {
-                    // Ignore input and move right one if we're typing over the closing quote.
-                    var rightChar = line.substring(cursor.column, cursor.column + 1);
-                    if (rightChar == quote) {
-                        return {
-                            text: '',
-                            selection: [1, 1]
-                        };
-                    }
-                }
-            }
-        }
-    });
-
-    this.add("string_dquotes", "deletion", function (state, action, editor, session, range) {
-        var selected = session.doc.getTextRange(range);
-        if (!range.isMultiLine() && (selected == '"' || selected == "'")) {
-            var line = session.doc.getLine(range.start.row);
-            var rightChar = line.substring(range.start.column + 1, range.start.column + 2);
-            if (rightChar == '"') {
-                range.end.column++;
-                return range;
-            }
-        }
-    });
-
-};
-
-oop.inherits(CstyleBehaviour, Behaviour);
-
-exports.CstyleBehaviour = CstyleBehaviour;
-});
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/mode-xquery.js b/apps/files_texteditor/js/aceeditor/mode-xquery.js
deleted file mode 100644
index cb6fb87cc6..0000000000
--- a/apps/files_texteditor/js/aceeditor/mode-xquery.js
+++ /dev/null
@@ -1 +0,0 @@
-define("ace/mode/xquery",["require","exports","module","ace/lib/oop","ace/mode/text","ace/tokenizer","ace/mode/xquery_highlight_rules","ace/mode/behaviour/xquery","ace/range"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("./text").Mode,f=a("../tokenizer").Tokenizer,g=a("./xquery_highlight_rules").XQueryHighlightRules,h=a("./behaviour/xquery").XQueryBehaviour,i=a("../range").Range,j=function(a){this.$tokenizer=new f((new g).getRules()),this.$behaviour=new h(a)};d.inherits(j,e),function(){this.getNextLineIndent=function(a,b,c){var d=this.$getIndent(b),e=b.match(/\s*(?:then|else|return|[{\(]|<\w+>)\s*$/);return e&&(d+=c),d},this.checkOutdent=function(a,b,c){return/^\s+$/.test(b)?/^\s*[\}\)]/.test(c):!1},this.autoOutdent=function(a,b,c){var d=b.getLine(c),e=d.match(/^(\s*[\}\)])/);if(!e)return 0;var f=e[1].length,g=b.findMatchingBracket({row:c,column:f});if(!g||g.row==c)return 0;var h=this.$getIndent(b.getLine(g.row));b.replace(new i(c,0,c,f-1),h)},this.$getIndent=function(a){var b=a.match(/^(\s+)/);return b?b[1]:""},this.toggleCommentLines=function(a,b,c,d){var e,f,g=!0,h=/^\s*\(:(.*):\)/;for(e=c;e<=d;e++)if(!h.test(b.getLine(e))){g=!1;break}var j=new i(0,0,0,0);for(e=c;e<=d;e++)f=b.getLine(e),j.start.row=e,j.end.row=e,j.end.column=f.length,b.replace(j,g?f.match(h)[1]:"(:"+f+":)")}}.call(j.prototype),b.Mode=j}),define("ace/mode/xquery_highlight_rules",["require","exports","module","ace/lib/oop","ace/lib/lang","ace/mode/text_highlight_rules"],function(a,b,c){"use strict";var d=a("../lib/oop"),e=a("../lib/lang"),f=a("./text_highlight_rules").TextHighlightRules,g=function(){var a=e.arrayToMap("return|for|let|where|order|by|declare|function|variable|xquery|version|option|namespace|import|module|when|encoding|switch|default|try|catch|group|tumbling|sliding|window|start|end|at|only|using|stemming|while|external|if|then|else|as|and|or|typeswitch|case|ascending|descending|empty|in|count|updating|insert|delete|replace|value|node|attribute|text|element|into|of|with|contains".split("|"));this.$rules={start:[{token:"text",regex:"<\\!\\[CDATA\\[",next:"cdata"},{token:"xml_pe",regex:"<\\?.*?\\?>"},{token:"comment",regex:"<\\!--",next:"comment"},{token:"comment",regex:"\\(:",next:"comment"},{token:"text",regex:"<\\/?",next:"tag"},{token:"constant",regex:"[+-]?\\d+(?:(?:\\.\\d*)?(?:[eE][+-]?\\d+)?)?\\b"},{token:"variable",regex:"\\$[a-zA-Z_][a-zA-Z0-9_\\-:]*\\b"},{token:"string",regex:'".*?"'},{token:"string",regex:"'.*?'"},{token:"text",regex:"\\s+"},{token:"support.function",regex:"\\w[\\w+_\\-:]+(?=\\()"},{token:function(b){return a[b]?"keyword":"identifier"},regex:"[a-zA-Z_$][a-zA-Z0-9_$]*\\b"},{token:"keyword.operator",regex:"\\*|=|<|>|\\-|\\+|and|or|eq|ne|lt|gt"},{token:"lparen",regex:"[[({]"},{token:"rparen",regex:"[\\])}]"}],tag:[{token:"text",regex:">",next:"start"},{token:"meta.tag",regex:"[-_a-zA-Z0-9:]+"},{token:"text",regex:"\\s+"},{token:"string",regex:'".*?"'},{token:"string",regex:"'.*?'"}],cdata:[{token:"text",regex:"\\]\\]>",next:"start"},{token:"text",regex:"\\s+"},{token:"text",regex:"(?:[^\\]]|\\](?!\\]>))+"}],comment:[{token:"comment",regex:".*?-->",next:"start"},{token:"comment",regex:".*:\\)",next:"start"},{token:"comment",regex:".+"}]}};d.inherits(g,f),b.XQueryHighlightRules=g}),define("ace/mode/behaviour/xquery",["require","exports","module","ace/lib/oop","ace/mode/behaviour","ace/mode/behaviour/cstyle"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../behaviour").Behaviour,f=a("./cstyle").CstyleBehaviour,g=function(a){this.inherit(f,["braces","parens","string_dquotes"]),this.parent=a,this.add("brackets","insertion",function(a,b,c,d,e){if(e=="\n"){var f=c.getCursorPosition(),g=d.doc.getLine(f.row),h=g.substring(f.column,f.column+2);if(h=="</"){var i=this.$getIndent(d.doc.getLine(f.row))+d.getTabString(),j=this.$getIndent(d.doc.getLine(f.row));return{text:"\n"+i+"\n"+j,selection:[1,i.length,1,i.length]}}}return!1}),this.add("slash","insertion",function(b,c,d,e,f){if(f=="/"){var g=d.getCursorPosition(),h=e.doc.getLine(g.row);if(g.column>0&&h.charAt(g.column-1)=="<"){h=h.substring(0,g.column)+"/"+h.substring(g.column);var i=e.doc.getAllLines();i[g.row]=h,a.exec("closeTag",i.join(e.doc.getNewLineCharacter()),g.row)}}return!1})};d.inherits(g,e),b.XQueryBehaviour=g}),define("ace/mode/behaviour/cstyle",["require","exports","module","ace/lib/oop","ace/mode/behaviour"],function(a,b,c){"use strict";var d=a("../../lib/oop"),e=a("../behaviour").Behaviour,f=function(){this.add("braces","insertion",function(a,b,c,d,e){if(e=="{"){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"{"+g+"}",selection:!1}:{text:"{}",selection:[1,1]}}if(e=="}"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var k=d.$findOpeningBracket("}",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}else if(e=="\n"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j=="}"){var l=d.findMatchingBracket({row:h.row,column:h.column+1});if(!l)return null;var m=this.getNextLineIndent(a,i.substring(0,i.length-1),d.getTabString()),n=this.$getIndent(d.doc.getLine(l.row));return{text:"\n"+m+"\n"+n,selection:[1,m.length,1,m.length]}}}}),this.add("braces","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="{"){var g=d.doc.getLine(e.start.row),h=g.substring(e.end.column,e.end.column+1);if(h=="}")return e.end.column++,e}}),this.add("parens","insertion",function(a,b,c,d,e){if(e=="("){var f=c.getSelectionRange(),g=d.doc.getTextRange(f);return g!==""?{text:"("+g+")",selection:!1}:{text:"()",selection:[1,1]}}if(e==")"){var h=c.getCursorPosition(),i=d.doc.getLine(h.row),j=i.substring(h.column,h.column+1);if(j==")"){var k=d.$findOpeningBracket(")",{column:h.column+1,row:h.row});if(k!==null)return{text:"",selection:[1,1]}}}}),this.add("parens","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&f=="("){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h==")")return e.end.column++,e}}),this.add("string_dquotes","insertion",function(a,b,c,d,e){if(e=='"'||e=="'"){var f=e,g=c.getSelectionRange(),h=d.doc.getTextRange(g);if(h!=="")return{text:f+h+f,selection:!1};var i=c.getCursorPosition(),j=d.doc.getLine(i.row),k=j.substring(i.column-1,i.column);if(k=="\\")return null;var l=d.getTokens(g.start.row,g.start.row)[0].tokens,m=0,n,o=-1;for(var p=0;p<l.length;p++){n=l[p],n.type=="string"?o=-1:o<0&&(o=n.value.indexOf(f));if(n.value.length+m>g.start.column)break;m+=l[p].value.length}if(!n||o<0&&n.type!=="comment"&&(n.type!=="string"||g.start.column!==n.value.length+m-1&&n.value.lastIndexOf(f)===n.value.length-1))return{text:f+f,selection:[1,1]};if(n&&n.type==="string"){var q=j.substring(i.column,i.column+1);if(q==f)return{text:"",selection:[1,1]}}}}),this.add("string_dquotes","deletion",function(a,b,c,d,e){var f=d.doc.getTextRange(e);if(!e.isMultiLine()&&(f=='"'||f=="'")){var g=d.doc.getLine(e.start.row),h=g.substring(e.start.column+1,e.start.column+2);if(h=='"')return e.end.column++,e}})};d.inherits(f,e),b.CstyleBehaviour=f})
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/theme-clouds-uncompressed.js b/apps/files_texteditor/js/aceeditor/theme-clouds-uncompressed.js
deleted file mode 100644
index 03048077b7..0000000000
--- a/apps/files_texteditor/js/aceeditor/theme-clouds-uncompressed.js
+++ /dev/null
@@ -1,155 +0,0 @@
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/theme/clouds', ['require', 'exports', 'module' , 'ace/lib/dom'], function(require, exports, module) {
-
-exports.isDark = false;
-exports.cssClass = "ace-clouds";
-exports.cssText = "\
-.ace-clouds .ace_editor {\
-  border: 2px solid rgb(159, 159, 159);\
-}\
-\
-.ace-clouds .ace_editor.ace_focus {\
-  border: 2px solid #327fbd;\
-}\
-\
-.ace-clouds .ace_gutter {\
-  background: #e8e8e8;\
-  color: #333;\
-}\
-\
-.ace-clouds .ace_print_margin {\
-  width: 1px;\
-  background: #e8e8e8;\
-}\
-\
-.ace-clouds .ace_scroller {\
-  background-color: #FFFFFF;\
-}\
-\
-.ace-clouds .ace_text-layer {\
-  cursor: text;\
-  color: #000000;\
-}\
-\
-.ace-clouds .ace_cursor {\
-  border-left: 1px solid #000000;\
-}\
-\
-.ace-clouds .ace_cursor.ace_overwrite {\
-  border-left: 0px;\
-  border-bottom: 1px solid #000000;\
-}\
-\
-.ace-clouds .ace_marker-layer .ace_selection {\
-  background: #BDD5FC;\
-}\
-\
-.ace-clouds .ace_marker-layer .ace_step {\
-  background: rgb(198, 219, 174);\
-}\
-\
-.ace-clouds .ace_marker-layer .ace_bracket {\
-  margin: -1px 0 0 -1px;\
-  border: 1px solid #BFBFBF;\
-}\
-\
-.ace-clouds .ace_marker-layer .ace_active_line {\
-  background: #FFFBD1;\
-}\
-\
-.ace-clouds .ace_marker-layer .ace_selected_word {\
-  border: 1px solid #BDD5FC;\
-}\
-\
-.ace-clouds .ace_invisible {\
-  color: #BFBFBF;\
-}\
-\
-.ace-clouds .ace_keyword, .ace-clouds .ace_meta {\
-  color:#AF956F;\
-}\
-\
-.ace-clouds .ace_keyword.ace_operator {\
-  color:#484848;\
-}\
-\
-.ace-clouds .ace_constant.ace_language {\
-  color:#39946A;\
-}\
-\
-.ace-clouds .ace_constant.ace_numeric {\
-  color:#46A609;\
-}\
-\
-.ace-clouds .ace_invalid {\
-  background-color:#FF002A;\
-}\
-\
-.ace-clouds .ace_fold {\
-    background-color: #AF956F;\
-    border-color: #000000;\
-}\
-\
-.ace-clouds .ace_support.ace_function {\
-  color:#C52727;\
-}\
-\
-.ace-clouds .ace_storage {\
-  color:#C52727;\
-}\
-\
-.ace-clouds .ace_string {\
-  color:#5D90CD;\
-}\
-\
-.ace-clouds .ace_comment {\
-  color:#BCC8BA;\
-}\
-\
-.ace-clouds .ace_entity.ace_other.ace_attribute-name {\
-  color:#606060;\
-}\
-\
-.ace-clouds .ace_markup.ace_underline {\
-    text-decoration:underline;\
-}";
-
-    var dom = require("../lib/dom");
-    dom.importCssString(exports.cssText, exports.cssClass);
-});
diff --git a/apps/files_texteditor/js/aceeditor/theme-clouds.js b/apps/files_texteditor/js/aceeditor/theme-clouds.js
deleted file mode 100644
index de651e6c59..0000000000
--- a/apps/files_texteditor/js/aceeditor/theme-clouds.js
+++ /dev/null
@@ -1 +0,0 @@
-define("ace/theme/clouds",["require","exports","module","ace/lib/dom"],function(a,b,c){b.isDark=!1,b.cssClass="ace-clouds",b.cssText=".ace-clouds .ace_editor {  border: 2px solid rgb(159, 159, 159);}.ace-clouds .ace_editor.ace_focus {  border: 2px solid #327fbd;}.ace-clouds .ace_gutter {  background: #e8e8e8;  color: #333;}.ace-clouds .ace_print_margin {  width: 1px;  background: #e8e8e8;}.ace-clouds .ace_scroller {  background-color: #FFFFFF;}.ace-clouds .ace_text-layer {  cursor: text;  color: #000000;}.ace-clouds .ace_cursor {  border-left: 1px solid #000000;}.ace-clouds .ace_cursor.ace_overwrite {  border-left: 0px;  border-bottom: 1px solid #000000;}.ace-clouds .ace_marker-layer .ace_selection {  background: #BDD5FC;}.ace-clouds .ace_marker-layer .ace_step {  background: rgb(198, 219, 174);}.ace-clouds .ace_marker-layer .ace_bracket {  margin: -1px 0 0 -1px;  border: 1px solid #BFBFBF;}.ace-clouds .ace_marker-layer .ace_active_line {  background: #FFFBD1;}.ace-clouds .ace_marker-layer .ace_selected_word {  border: 1px solid #BDD5FC;}.ace-clouds .ace_invisible {  color: #BFBFBF;}.ace-clouds .ace_keyword, .ace-clouds .ace_meta {  color:#AF956F;}.ace-clouds .ace_keyword.ace_operator {  color:#484848;}.ace-clouds .ace_constant.ace_language {  color:#39946A;}.ace-clouds .ace_constant.ace_numeric {  color:#46A609;}.ace-clouds .ace_invalid {  background-color:#FF002A;}.ace-clouds .ace_fold {    background-color: #AF956F;    border-color: #000000;}.ace-clouds .ace_support.ace_function {  color:#C52727;}.ace-clouds .ace_storage {  color:#C52727;}.ace-clouds .ace_string {  color:#5D90CD;}.ace-clouds .ace_comment {  color:#BCC8BA;}.ace-clouds .ace_entity.ace_other.ace_attribute-name {  color:#606060;}.ace-clouds .ace_markup.ace_underline {    text-decoration:underline;}";var d=a("../lib/dom");d.importCssString(b.cssText,b.cssClass)})
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/worker-coffee.js b/apps/files_texteditor/js/aceeditor/worker-coffee.js
deleted file mode 100644
index 704ee4f322..0000000000
--- a/apps/files_texteditor/js/aceeditor/worker-coffee.js
+++ /dev/null
@@ -1,7477 +0,0 @@
-"no use strict";
-
-var console = {
-    log: function(msg) {
-        postMessage({type: "log", data: msg});
-    }
-};
-var window = {
-    console: console
-};
-
-var normalizeModule = function(parentId, moduleName) {
-    // normalize plugin requires
-    if (moduleName.indexOf("!") !== -1) {
-        var chunks = moduleName.split("!");
-        return normalizeModule(parentId, chunks[0]) + "!" + normalizeModule(parentId, chunks[1]);
-    }
-    // normalize relative requires
-    if (moduleName.charAt(0) == ".") {
-        var base = parentId.split("/").slice(0, -1).join("/");
-        var moduleName = base + "/" + moduleName;
-        
-        while(moduleName.indexOf(".") !== -1 && previous != moduleName) {
-            var previous = moduleName;
-            var moduleName = moduleName.replace(/\/\.\//, "/").replace(/[^\/]+\/\.\.\//, "");
-        }
-    }
-    
-    return moduleName;
-};
-
-var require = function(parentId, id) {
-    var id = normalizeModule(parentId, id);
-    
-    var module = require.modules[id];
-    if (module) {
-        if (!module.initialized) {
-            module.exports = module.factory().exports;
-            module.initialized = true;
-        }
-        return module.exports;
-    }
-    
-    var chunks = id.split("/");
-    chunks[0] = require.tlns[chunks[0]] || chunks[0];
-    var path = chunks.join("/") + ".js";
-    
-    require.id = id;
-    importScripts(path);
-    return require(parentId, id);    
-};
-
-require.modules = {};
-require.tlns = {};
-
-var define = function(id, deps, factory) {
-    if (arguments.length == 2) {
-        factory = deps;
-    } else if (arguments.length == 1) {
-        factory = id;
-        id = require.id;
-    }
-
-    if (id.indexOf("text!") === 0) 
-        return;
-    
-    var req = function(deps, factory) {
-        return require(id, deps, factory);
-    };
-
-    require.modules[id] = {
-        factory: function() {
-            var module = {
-                exports: {}
-            };
-            var returnExports = factory(req, module.exports, module);
-            if (returnExports)
-                module.exports = returnExports;
-            return module;
-        }
-    };
-};
-
-function initBaseUrls(topLevelNamespaces) {
-    require.tlns = topLevelNamespaces;
-}
-
-function initSender() {
-
-    var EventEmitter = require(null, "ace/lib/event_emitter").EventEmitter;
-    var oop = require(null, "ace/lib/oop");
-    
-    var Sender = function() {};
-    
-    (function() {
-        
-        oop.implement(this, EventEmitter);
-                
-        this.callback = function(data, callbackId) {
-            postMessage({
-                type: "call",
-                id: callbackId,
-                data: data
-            });
-        };
-    
-        this.emit = function(name, data) {
-            postMessage({
-                type: "event",
-                name: name,
-                data: data
-            });
-        };
-        
-    }).call(Sender.prototype);
-    
-    return new Sender();
-}
-
-var main;
-var sender;
-
-onmessage = function(e) {
-    var msg = e.data;
-    if (msg.command) {
-        main[msg.command].apply(main, msg.args);
-    }
-    else if (msg.init) {        
-        initBaseUrls(msg.tlns);
-        require(null, "ace/lib/fixoldbrowsers");
-        sender = initSender();
-        var clazz = require(null, msg.module)[msg.classname];
-        main = new clazz(sender);
-    } 
-    else if (msg.event && sender) {
-        sender._emit(msg.event, msg.data);
-    }
-};
-// vim:set ts=4 sts=4 sw=4 st:
-// -- kriskowal Kris Kowal Copyright (C) 2009-2010 MIT License
-// -- tlrobinson Tom Robinson Copyright (C) 2009-2010 MIT License (Narwhal Project)
-// -- dantman Daniel Friesen Copyright(C) 2010 XXX No License Specified
-// -- fschaefer Florian Schäfer Copyright (C) 2010 MIT License
-// -- Irakli Gozalishvili Copyright (C) 2010 MIT License
-
-/*!
-    Copyright (c) 2009, 280 North Inc. http://280north.com/
-    MIT License. http://github.com/280north/narwhal/blob/master/README.md
-*/
-
-define('ace/lib/fixoldbrowsers', ['require', 'exports', 'module' , 'ace/lib/regexp', 'ace/lib/es5-shim'], function(require, exports, module) {
-"use strict";
-
-require("./regexp");
-require("./es5-shim");
-
-});/**
- *  Based on code from:
- *
- * XRegExp 1.5.0
- * (c) 2007-2010 Steven Levithan
- * MIT License
- * <http://xregexp.com>
- * Provides an augmented, extensible, cross-browser implementation of regular expressions,
- * including support for additional syntax, flags, and methods
- */
- 
-define('ace/lib/regexp', ['require', 'exports', 'module' ], function(require, exports, module) {
-"use strict";
-
-    //---------------------------------
-    //  Private variables
-    //---------------------------------
-
-    var real = {
-            exec: RegExp.prototype.exec,
-            test: RegExp.prototype.test,
-            match: String.prototype.match,
-            replace: String.prototype.replace,
-            split: String.prototype.split
-        },
-        compliantExecNpcg = real.exec.call(/()??/, "")[1] === undefined, // check `exec` handling of nonparticipating capturing groups
-        compliantLastIndexIncrement = function () {
-            var x = /^/g;
-            real.test.call(x, "");
-            return !x.lastIndex;
-        }();
-
-    //---------------------------------
-    //  Overriden native methods
-    //---------------------------------
-
-    // Adds named capture support (with backreferences returned as `result.name`), and fixes two
-    // cross-browser issues per ES3:
-    // - Captured values for nonparticipating capturing groups should be returned as `undefined`,
-    //   rather than the empty string.
-    // - `lastIndex` should not be incremented after zero-length matches.
-    RegExp.prototype.exec = function (str) {
-        var match = real.exec.apply(this, arguments),
-            name, r2;
-        if ( typeof(str) == 'string' && match) {
-            // Fix browsers whose `exec` methods don't consistently return `undefined` for
-            // nonparticipating capturing groups
-            if (!compliantExecNpcg && match.length > 1 && indexOf(match, "") > -1) {
-                r2 = RegExp(this.source, real.replace.call(getNativeFlags(this), "g", ""));
-                // Using `str.slice(match.index)` rather than `match[0]` in case lookahead allowed
-                // matching due to characters outside the match
-                real.replace.call(str.slice(match.index), r2, function () {
-                    for (var i = 1; i < arguments.length - 2; i++) {
-                        if (arguments[i] === undefined)
-                            match[i] = undefined;
-                    }
-                });
-            }
-            // Attach named capture properties
-            if (this._xregexp && this._xregexp.captureNames) {
-                for (var i = 1; i < match.length; i++) {
-                    name = this._xregexp.captureNames[i - 1];
-                    if (name)
-                       match[name] = match[i];
-                }
-            }
-            // Fix browsers that increment `lastIndex` after zero-length matches
-            if (!compliantLastIndexIncrement && this.global && !match[0].length && (this.lastIndex > match.index))
-                this.lastIndex--;
-        }
-        return match;
-    };
-
-    // Don't override `test` if it won't change anything
-    if (!compliantLastIndexIncrement) {
-        // Fix browser bug in native method
-        RegExp.prototype.test = function (str) {
-            // Use the native `exec` to skip some processing overhead, even though the overriden
-            // `exec` would take care of the `lastIndex` fix
-            var match = real.exec.call(this, str);
-            // Fix browsers that increment `lastIndex` after zero-length matches
-            if (match && this.global && !match[0].length && (this.lastIndex > match.index))
-                this.lastIndex--;
-            return !!match;
-        };
-    }
-
-    //---------------------------------
-    //  Private helper functions
-    //---------------------------------
-
-    function getNativeFlags (regex) {
-        return (regex.global     ? "g" : "") +
-               (regex.ignoreCase ? "i" : "") +
-               (regex.multiline  ? "m" : "") +
-               (regex.extended   ? "x" : "") + // Proposed for ES4; included in AS3
-               (regex.sticky     ? "y" : "");
-    };
-
-    function indexOf (array, item, from) {
-        if (Array.prototype.indexOf) // Use the native array method if available
-            return array.indexOf(item, from);
-        for (var i = from || 0; i < array.length; i++) {
-            if (array[i] === item)
-                return i;
-        }
-        return -1;
-    };
-
-});
-// vim: ts=4 sts=4 sw=4 expandtab
-// -- kriskowal Kris Kowal Copyright (C) 2009-2011 MIT License
-// -- tlrobinson Tom Robinson Copyright (C) 2009-2010 MIT License (Narwhal Project)
-// -- dantman Daniel Friesen Copyright (C) 2010 XXX TODO License or CLA
-// -- fschaefer Florian Schäfer Copyright (C) 2010 MIT License
-// -- Gozala Irakli Gozalishvili Copyright (C) 2010 MIT License
-// -- kitcambridge Kit Cambridge Copyright (C) 2011 MIT License
-// -- kossnocorp Sasha Koss XXX TODO License or CLA
-// -- bryanforbes Bryan Forbes XXX TODO License or CLA
-// -- killdream Quildreen Motta Copyright (C) 2011 MIT Licence
-// -- michaelficarra Michael Ficarra Copyright (C) 2011 3-clause BSD License
-// -- sharkbrainguy Gerard Paapu Copyright (C) 2011 MIT License
-// -- bbqsrc Brendan Molloy (C) 2011 Creative Commons Zero (public domain)
-// -- iwyg XXX TODO License or CLA
-// -- DomenicDenicola Domenic Denicola Copyright (C) 2011 MIT License
-// -- xavierm02 Montillet Xavier XXX TODO License or CLA
-// -- Raynos Raynos XXX TODO License or CLA
-// -- samsonjs Sami Samhuri Copyright (C) 2010 MIT License
-// -- rwldrn Rick Waldron Copyright (C) 2011 MIT License
-// -- lexer Alexey Zakharov XXX TODO License or CLA
-
-/*!
-    Copyright (c) 2009, 280 North Inc. http://280north.com/
-    MIT License. http://github.com/280north/narwhal/blob/master/README.md
-*/
-
-define('ace/lib/es5-shim', ['require', 'exports', 'module' ], function(require, exports, module) {
-
-/**
- * Brings an environment as close to ECMAScript 5 compliance
- * as is possible with the facilities of erstwhile engines.
- *
- * Annotated ES5: http://es5.github.com/ (specific links below)
- * ES5 Spec: http://www.ecma-international.org/publications/files/ECMA-ST/Ecma-262.pdf
- *
- * @module
- */
-
-/*whatsupdoc*/
-
-//
-// Function
-// ========
-//
-
-// ES-5 15.3.4.5
-// http://es5.github.com/#x15.3.4.5
-
-if (!Function.prototype.bind) {
-    Function.prototype.bind = function bind(that) { // .length is 1
-        // 1. Let Target be the this value.
-        var target = this;
-        // 2. If IsCallable(Target) is false, throw a TypeError exception.
-        if (typeof target != "function")
-            throw new TypeError(); // TODO message
-        // 3. Let A be a new (possibly empty) internal list of all of the
-        //   argument values provided after thisArg (arg1, arg2 etc), in order.
-        // XXX slicedArgs will stand in for "A" if used
-        var args = slice.call(arguments, 1); // for normal call
-        // 4. Let F be a new native ECMAScript object.
-        // 11. Set the [[Prototype]] internal property of F to the standard
-        //   built-in Function prototype object as specified in 15.3.3.1.
-        // 12. Set the [[Call]] internal property of F as described in
-        //   15.3.4.5.1.
-        // 13. Set the [[Construct]] internal property of F as described in
-        //   15.3.4.5.2.
-        // 14. Set the [[HasInstance]] internal property of F as described in
-        //   15.3.4.5.3.
-        var bound = function () {
-
-            if (this instanceof bound) {
-                // 15.3.4.5.2 [[Construct]]
-                // When the [[Construct]] internal method of a function object,
-                // F that was created using the bind function is called with a
-                // list of arguments ExtraArgs, the following steps are taken:
-                // 1. Let target be the value of F's [[TargetFunction]]
-                //   internal property.
-                // 2. If target has no [[Construct]] internal method, a
-                //   TypeError exception is thrown.
-                // 3. Let boundArgs be the value of F's [[BoundArgs]] internal
-                //   property.
-                // 4. Let args be a new list containing the same values as the
-                //   list boundArgs in the same order followed by the same
-                //   values as the list ExtraArgs in the same order.
-                // 5. Return the result of calling the [[Construct]] internal 
-                //   method of target providing args as the arguments.
-
-                var F = function(){};
-                F.prototype = target.prototype;
-                var self = new F;
-
-                var result = target.apply(
-                    self,
-                    args.concat(slice.call(arguments))
-                );
-                if (result !== null && Object(result) === result)
-                    return result;
-                return self;
-
-            } else {
-                // 15.3.4.5.1 [[Call]]
-                // When the [[Call]] internal method of a function object, F,
-                // which was created using the bind function is called with a
-                // this value and a list of arguments ExtraArgs, the following
-                // steps are taken:
-                // 1. Let boundArgs be the value of F's [[BoundArgs]] internal
-                //   property.
-                // 2. Let boundThis be the value of F's [[BoundThis]] internal
-                //   property.
-                // 3. Let target be the value of F's [[TargetFunction]] internal
-                //   property.
-                // 4. Let args be a new list containing the same values as the 
-                //   list boundArgs in the same order followed by the same 
-                //   values as the list ExtraArgs in the same order.
-                // 5. Return the result of calling the [[Call]] internal method 
-                //   of target providing boundThis as the this value and 
-                //   providing args as the arguments.
-
-                // equiv: target.call(this, ...boundArgs, ...args)
-                return target.apply(
-                    that,
-                    args.concat(slice.call(arguments))
-                );
-
-            }
-
-        };
-        // XXX bound.length is never writable, so don't even try
-        //
-        // 15. If the [[Class]] internal property of Target is "Function", then
-        //     a. Let L be the length property of Target minus the length of A.
-        //     b. Set the length own property of F to either 0 or L, whichever is 
-        //       larger.
-        // 16. Else set the length own property of F to 0.
-        // 17. Set the attributes of the length own property of F to the values
-        //   specified in 15.3.5.1.
-
-        // TODO
-        // 18. Set the [[Extensible]] internal property of F to true.
-        
-        // TODO
-        // 19. Let thrower be the [[ThrowTypeError]] function Object (13.2.3).
-        // 20. Call the [[DefineOwnProperty]] internal method of F with 
-        //   arguments "caller", PropertyDescriptor {[[Get]]: thrower, [[Set]]:
-        //   thrower, [[Enumerable]]: false, [[Configurable]]: false}, and 
-        //   false.
-        // 21. Call the [[DefineOwnProperty]] internal method of F with 
-        //   arguments "arguments", PropertyDescriptor {[[Get]]: thrower, 
-        //   [[Set]]: thrower, [[Enumerable]]: false, [[Configurable]]: false},
-        //   and false.
-
-        // TODO
-        // NOTE Function objects created using Function.prototype.bind do not 
-        // have a prototype property or the [[Code]], [[FormalParameters]], and
-        // [[Scope]] internal properties.
-        // XXX can't delete prototype in pure-js.
-
-        // 22. Return F.
-        return bound;
-    };
-}
-
-// Shortcut to an often accessed properties, in order to avoid multiple
-// dereference that costs universally.
-// _Please note: Shortcuts are defined after `Function.prototype.bind` as we
-// us it in defining shortcuts.
-var call = Function.prototype.call;
-var prototypeOfArray = Array.prototype;
-var prototypeOfObject = Object.prototype;
-var slice = prototypeOfArray.slice;
-var toString = call.bind(prototypeOfObject.toString);
-var owns = call.bind(prototypeOfObject.hasOwnProperty);
-
-// If JS engine supports accessors creating shortcuts.
-var defineGetter;
-var defineSetter;
-var lookupGetter;
-var lookupSetter;
-var supportsAccessors;
-if ((supportsAccessors = owns(prototypeOfObject, "__defineGetter__"))) {
-    defineGetter = call.bind(prototypeOfObject.__defineGetter__);
-    defineSetter = call.bind(prototypeOfObject.__defineSetter__);
-    lookupGetter = call.bind(prototypeOfObject.__lookupGetter__);
-    lookupSetter = call.bind(prototypeOfObject.__lookupSetter__);
-}
-
-//
-// Array
-// =====
-//
-
-// ES5 15.4.3.2
-// http://es5.github.com/#x15.4.3.2
-// https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/isArray
-if (!Array.isArray) {
-    Array.isArray = function isArray(obj) {
-        return toString(obj) == "[object Array]";
-    };
-}
-
-// The IsCallable() check in the Array functions
-// has been replaced with a strict check on the
-// internal class of the object to trap cases where
-// the provided function was actually a regular
-// expression literal, which in V8 and
-// JavaScriptCore is a typeof "function".  Only in
-// V8 are regular expression literals permitted as
-// reduce parameters, so it is desirable in the
-// general case for the shim to match the more
-// strict and common behavior of rejecting regular
-// expressions.
-
-// ES5 15.4.4.18
-// http://es5.github.com/#x15.4.4.18
-// https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/array/forEach
-if (!Array.prototype.forEach) {
-    Array.prototype.forEach = function forEach(fun /*, thisp*/) {
-        var self = toObject(this),
-            thisp = arguments[1],
-            i = 0,
-            length = self.length >>> 0;
-
-        // If no callback function or if callback is not a callable function
-        if (toString(fun) != "[object Function]") {
-            throw new TypeError(); // TODO message
-        }
-
-        while (i < length) {
-            if (i in self) {
-                // Invoke the callback function with call, passing arguments:
-                // context, property value, property key, thisArg object context
-                fun.call(thisp, self[i], i, self);
-            }
-            i++;
-        }
-    };
-}
-
-// ES5 15.4.4.19
-// http://es5.github.com/#x15.4.4.19
-// https://developer.mozilla.org/en/Core_JavaScript_1.5_Reference/Objects/Array/map
-if (!Array.prototype.map) {
-    Array.prototype.map = function map(fun /*, thisp*/) {
-        var self = toObject(this),
-            length = self.length >>> 0,
-            result = Array(length),
-            thisp = arguments[1];
-
-        // If no callback function or if callback is not a callable function
-        if (toString(fun) != "[object Function]") {
-            throw new TypeError(); // TODO message
-        }
-
-        for (var i = 0; i < length; i++) {
-            if (i in self)
-                result[i] = fun.call(thisp, self[i], i, self);
-        }
-        return result;
-    };
-}
-
-// ES5 15.4.4.20
-// http://es5.github.com/#x15.4.4.20
-// https://developer.mozilla.org/en/Core_JavaScript_1.5_Reference/Objects/Array/filter
-if (!Array.prototype.filter) {
-    Array.prototype.filter = function filter(fun /*, thisp */) {
-        var self = toObject(this),
-            length = self.length >>> 0,
-            result = [],
-            thisp = arguments[1];
-
-        // If no callback function or if callback is not a callable function
-        if (toString(fun) != "[object Function]") {
-            throw new TypeError(); // TODO message
-        }
-
-        for (var i = 0; i < length; i++) {
-            if (i in self && fun.call(thisp, self[i], i, self))
-                result.push(self[i]);
-        }
-        return result;
-    };
-}
-
-// ES5 15.4.4.16
-// http://es5.github.com/#x15.4.4.16
-// https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/every
-if (!Array.prototype.every) {
-    Array.prototype.every = function every(fun /*, thisp */) {
-        var self = toObject(this),
-            length = self.length >>> 0,
-            thisp = arguments[1];
-
-        // If no callback function or if callback is not a callable function
-        if (toString(fun) != "[object Function]") {
-            throw new TypeError(); // TODO message
-        }
-
-        for (var i = 0; i < length; i++) {
-            if (i in self && !fun.call(thisp, self[i], i, self))
-                return false;
-        }
-        return true;
-    };
-}
-
-// ES5 15.4.4.17
-// http://es5.github.com/#x15.4.4.17
-// https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/some
-if (!Array.prototype.some) {
-    Array.prototype.some = function some(fun /*, thisp */) {
-        var self = toObject(this),
-            length = self.length >>> 0,
-            thisp = arguments[1];
-
-        // If no callback function or if callback is not a callable function
-        if (toString(fun) != "[object Function]") {
-            throw new TypeError(); // TODO message
-        }
-
-        for (var i = 0; i < length; i++) {
-            if (i in self && fun.call(thisp, self[i], i, self))
-                return true;
-        }
-        return false;
-    };
-}
-
-// ES5 15.4.4.21
-// http://es5.github.com/#x15.4.4.21
-// https://developer.mozilla.org/en/Core_JavaScript_1.5_Reference/Objects/Array/reduce
-if (!Array.prototype.reduce) {
-    Array.prototype.reduce = function reduce(fun /*, initial*/) {
-        var self = toObject(this),
-            length = self.length >>> 0;
-
-        // If no callback function or if callback is not a callable function
-        if (toString(fun) != "[object Function]") {
-            throw new TypeError(); // TODO message
-        }
-
-        // no value to return if no initial value and an empty array
-        if (!length && arguments.length == 1)
-            throw new TypeError(); // TODO message
-
-        var i = 0;
-        var result;
-        if (arguments.length >= 2) {
-            result = arguments[1];
-        } else {
-            do {
-                if (i in self) {
-                    result = self[i++];
-                    break;
-                }
-
-                // if array contains no values, no initial value to return
-                if (++i >= length)
-                    throw new TypeError(); // TODO message
-            } while (true);
-        }
-
-        for (; i < length; i++) {
-            if (i in self)
-                result = fun.call(void 0, result, self[i], i, self);
-        }
-
-        return result;
-    };
-}
-
-// ES5 15.4.4.22
-// http://es5.github.com/#x15.4.4.22
-// https://developer.mozilla.org/en/Core_JavaScript_1.5_Reference/Objects/Array/reduceRight
-if (!Array.prototype.reduceRight) {
-    Array.prototype.reduceRight = function reduceRight(fun /*, initial*/) {
-        var self = toObject(this),
-            length = self.length >>> 0;
-
-        // If no callback function or if callback is not a callable function
-        if (toString(fun) != "[object Function]") {
-            throw new TypeError(); // TODO message
-        }
-
-        // no value to return if no initial value, empty array
-        if (!length && arguments.length == 1)
-            throw new TypeError(); // TODO message
-
-        var result, i = length - 1;
-        if (arguments.length >= 2) {
-            result = arguments[1];
-        } else {
-            do {
-                if (i in self) {
-                    result = self[i--];
-                    break;
-                }
-
-                // if array contains no values, no initial value to return
-                if (--i < 0)
-                    throw new TypeError(); // TODO message
-            } while (true);
-        }
-
-        do {
-            if (i in this)
-                result = fun.call(void 0, result, self[i], i, self);
-        } while (i--);
-
-        return result;
-    };
-}
-
-// ES5 15.4.4.14
-// http://es5.github.com/#x15.4.4.14
-// https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/indexOf
-if (!Array.prototype.indexOf) {
-    Array.prototype.indexOf = function indexOf(sought /*, fromIndex */ ) {
-        var self = toObject(this),
-            length = self.length >>> 0;
-
-        if (!length)
-            return -1;
-
-        var i = 0;
-        if (arguments.length > 1)
-            i = toInteger(arguments[1]);
-
-        // handle negative indices
-        i = i >= 0 ? i : Math.max(0, length + i);
-        for (; i < length; i++) {
-            if (i in self && self[i] === sought) {
-                return i;
-            }
-        }
-        return -1;
-    };
-}
-
-// ES5 15.4.4.15
-// http://es5.github.com/#x15.4.4.15
-// https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/lastIndexOf
-if (!Array.prototype.lastIndexOf) {
-    Array.prototype.lastIndexOf = function lastIndexOf(sought /*, fromIndex */) {
-        var self = toObject(this),
-            length = self.length >>> 0;
-
-        if (!length)
-            return -1;
-        var i = length - 1;
-        if (arguments.length > 1)
-            i = Math.min(i, toInteger(arguments[1]));
-        // handle negative indices
-        i = i >= 0 ? i : length - Math.abs(i);
-        for (; i >= 0; i--) {
-            if (i in self && sought === self[i])
-                return i;
-        }
-        return -1;
-    };
-}
-
-//
-// Object
-// ======
-//
-
-// ES5 15.2.3.2
-// http://es5.github.com/#x15.2.3.2
-if (!Object.getPrototypeOf) {
-    // https://github.com/kriskowal/es5-shim/issues#issue/2
-    // http://ejohn.org/blog/objectgetprototypeof/
-    // recommended by fschaefer on github
-    Object.getPrototypeOf = function getPrototypeOf(object) {
-        return object.__proto__ || (
-            object.constructor ?
-            object.constructor.prototype :
-            prototypeOfObject
-        );
-    };
-}
-
-// ES5 15.2.3.3
-// http://es5.github.com/#x15.2.3.3
-if (!Object.getOwnPropertyDescriptor) {
-    var ERR_NON_OBJECT = "Object.getOwnPropertyDescriptor called on a " +
-                         "non-object: ";
-    Object.getOwnPropertyDescriptor = function getOwnPropertyDescriptor(object, property) {
-        if ((typeof object != "object" && typeof object != "function") || object === null)
-            throw new TypeError(ERR_NON_OBJECT + object);
-        // If object does not owns property return undefined immediately.
-        if (!owns(object, property))
-            return;
-
-        var descriptor, getter, setter;
-
-        // If object has a property then it's for sure both `enumerable` and
-        // `configurable`.
-        descriptor =  { enumerable: true, configurable: true };
-
-        // If JS engine supports accessor properties then property may be a
-        // getter or setter.
-        if (supportsAccessors) {
-            // Unfortunately `__lookupGetter__` will return a getter even
-            // if object has own non getter property along with a same named
-            // inherited getter. To avoid misbehavior we temporary remove
-            // `__proto__` so that `__lookupGetter__` will return getter only
-            // if it's owned by an object.
-            var prototype = object.__proto__;
-            object.__proto__ = prototypeOfObject;
-
-            var getter = lookupGetter(object, property);
-            var setter = lookupSetter(object, property);
-
-            // Once we have getter and setter we can put values back.
-            object.__proto__ = prototype;
-
-            if (getter || setter) {
-                if (getter) descriptor.get = getter;
-                if (setter) descriptor.set = setter;
-
-                // If it was accessor property we're done and return here
-                // in order to avoid adding `value` to the descriptor.
-                return descriptor;
-            }
-        }
-
-        // If we got this far we know that object has an own property that is
-        // not an accessor so we set it as a value and return descriptor.
-        descriptor.value = object[property];
-        return descriptor;
-    };
-}
-
-// ES5 15.2.3.4
-// http://es5.github.com/#x15.2.3.4
-if (!Object.getOwnPropertyNames) {
-    Object.getOwnPropertyNames = function getOwnPropertyNames(object) {
-        return Object.keys(object);
-    };
-}
-
-// ES5 15.2.3.5
-// http://es5.github.com/#x15.2.3.5
-if (!Object.create) {
-    Object.create = function create(prototype, properties) {
-        var object;
-        if (prototype === null) {
-            object = { "__proto__": null };
-        } else {
-            if (typeof prototype != "object")
-                throw new TypeError("typeof prototype["+(typeof prototype)+"] != 'object'");
-            var Type = function () {};
-            Type.prototype = prototype;
-            object = new Type();
-            // IE has no built-in implementation of `Object.getPrototypeOf`
-            // neither `__proto__`, but this manually setting `__proto__` will
-            // guarantee that `Object.getPrototypeOf` will work as expected with
-            // objects created using `Object.create`
-            object.__proto__ = prototype;
-        }
-        if (properties !== void 0)
-            Object.defineProperties(object, properties);
-        return object;
-    };
-}
-
-// ES5 15.2.3.6
-// http://es5.github.com/#x15.2.3.6
-
-// Patch for WebKit and IE8 standard mode
-// Designed by hax <hax.github.com>
-// related issue: https://github.com/kriskowal/es5-shim/issues#issue/5
-// IE8 Reference:
-//     http://msdn.microsoft.com/en-us/library/dd282900.aspx
-//     http://msdn.microsoft.com/en-us/library/dd229916.aspx
-// WebKit Bugs:
-//     https://bugs.webkit.org/show_bug.cgi?id=36423
-
-function doesDefinePropertyWork(object) {
-    try {
-        Object.defineProperty(object, "sentinel", {});
-        return "sentinel" in object;
-    } catch (exception) {
-        // returns falsy
-    }
-}
-
-// check whether defineProperty works if it's given. Otherwise,
-// shim partially.
-if (Object.defineProperty) {
-    var definePropertyWorksOnObject = doesDefinePropertyWork({});
-    var definePropertyWorksOnDom = typeof document == "undefined" ||
-        doesDefinePropertyWork(document.createElement("div"));
-    if (!definePropertyWorksOnObject || !definePropertyWorksOnDom) {
-        var definePropertyFallback = Object.defineProperty;
-    }
-}
-
-if (!Object.defineProperty || definePropertyFallback) {
-    var ERR_NON_OBJECT_DESCRIPTOR = "Property description must be an object: ";
-    var ERR_NON_OBJECT_TARGET = "Object.defineProperty called on non-object: "
-    var ERR_ACCESSORS_NOT_SUPPORTED = "getters & setters can not be defined " +
-                                      "on this javascript engine";
-
-    Object.defineProperty = function defineProperty(object, property, descriptor) {
-        if ((typeof object != "object" && typeof object != "function") || object === null)
-            throw new TypeError(ERR_NON_OBJECT_TARGET + object);
-        if ((typeof descriptor != "object" && typeof descriptor != "function") || descriptor === null)
-            throw new TypeError(ERR_NON_OBJECT_DESCRIPTOR + descriptor);
-
-        // make a valiant attempt to use the real defineProperty
-        // for I8's DOM elements.
-        if (definePropertyFallback) {
-            try {
-                return definePropertyFallback.call(Object, object, property, descriptor);
-            } catch (exception) {
-                // try the shim if the real one doesn't work
-            }
-        }
-
-        // If it's a data property.
-        if (owns(descriptor, "value")) {
-            // fail silently if "writable", "enumerable", or "configurable"
-            // are requested but not supported
-            /*
-            // alternate approach:
-            if ( // can't implement these features; allow false but not true
-                !(owns(descriptor, "writable") ? descriptor.writable : true) ||
-                !(owns(descriptor, "enumerable") ? descriptor.enumerable : true) ||
-                !(owns(descriptor, "configurable") ? descriptor.configurable : true)
-            )
-                throw new RangeError(
-                    "This implementation of Object.defineProperty does not " +
-                    "support configurable, enumerable, or writable."
-                );
-            */
-
-            if (supportsAccessors && (lookupGetter(object, property) ||
-                                      lookupSetter(object, property)))
-            {
-                // As accessors are supported only on engines implementing
-                // `__proto__` we can safely override `__proto__` while defining
-                // a property to make sure that we don't hit an inherited
-                // accessor.
-                var prototype = object.__proto__;
-                object.__proto__ = prototypeOfObject;
-                // Deleting a property anyway since getter / setter may be
-                // defined on object itself.
-                delete object[property];
-                object[property] = descriptor.value;
-                // Setting original `__proto__` back now.
-                object.__proto__ = prototype;
-            } else {
-                object[property] = descriptor.value;
-            }
-        } else {
-            if (!supportsAccessors)
-                throw new TypeError(ERR_ACCESSORS_NOT_SUPPORTED);
-            // If we got that far then getters and setters can be defined !!
-            if (owns(descriptor, "get"))
-                defineGetter(object, property, descriptor.get);
-            if (owns(descriptor, "set"))
-                defineSetter(object, property, descriptor.set);
-        }
-
-        return object;
-    };
-}
-
-// ES5 15.2.3.7
-// http://es5.github.com/#x15.2.3.7
-if (!Object.defineProperties) {
-    Object.defineProperties = function defineProperties(object, properties) {
-        for (var property in properties) {
-            if (owns(properties, property))
-                Object.defineProperty(object, property, properties[property]);
-        }
-        return object;
-    };
-}
-
-// ES5 15.2.3.8
-// http://es5.github.com/#x15.2.3.8
-if (!Object.seal) {
-    Object.seal = function seal(object) {
-        // this is misleading and breaks feature-detection, but
-        // allows "securable" code to "gracefully" degrade to working
-        // but insecure code.
-        return object;
-    };
-}
-
-// ES5 15.2.3.9
-// http://es5.github.com/#x15.2.3.9
-if (!Object.freeze) {
-    Object.freeze = function freeze(object) {
-        // this is misleading and breaks feature-detection, but
-        // allows "securable" code to "gracefully" degrade to working
-        // but insecure code.
-        return object;
-    };
-}
-
-// detect a Rhino bug and patch it
-try {
-    Object.freeze(function () {});
-} catch (exception) {
-    Object.freeze = (function freeze(freezeObject) {
-        return function freeze(object) {
-            if (typeof object == "function") {
-                return object;
-            } else {
-                return freezeObject(object);
-            }
-        };
-    })(Object.freeze);
-}
-
-// ES5 15.2.3.10
-// http://es5.github.com/#x15.2.3.10
-if (!Object.preventExtensions) {
-    Object.preventExtensions = function preventExtensions(object) {
-        // this is misleading and breaks feature-detection, but
-        // allows "securable" code to "gracefully" degrade to working
-        // but insecure code.
-        return object;
-    };
-}
-
-// ES5 15.2.3.11
-// http://es5.github.com/#x15.2.3.11
-if (!Object.isSealed) {
-    Object.isSealed = function isSealed(object) {
-        return false;
-    };
-}
-
-// ES5 15.2.3.12
-// http://es5.github.com/#x15.2.3.12
-if (!Object.isFrozen) {
-    Object.isFrozen = function isFrozen(object) {
-        return false;
-    };
-}
-
-// ES5 15.2.3.13
-// http://es5.github.com/#x15.2.3.13
-if (!Object.isExtensible) {
-    Object.isExtensible = function isExtensible(object) {
-        // 1. If Type(O) is not Object throw a TypeError exception.
-        if (Object(object) === object) {
-            throw new TypeError(); // TODO message
-        }
-        // 2. Return the Boolean value of the [[Extensible]] internal property of O.
-        var name = '';
-        while (owns(object, name)) {
-            name += '?';
-        }
-        object[name] = true;
-        var returnValue = owns(object, name);
-        delete object[name];
-        return returnValue;
-    };
-}
-
-// ES5 15.2.3.14
-// http://es5.github.com/#x15.2.3.14
-if (!Object.keys) {
-    // http://whattheheadsaid.com/2010/10/a-safer-object-keys-compatibility-implementation
-    var hasDontEnumBug = true,
-        dontEnums = [
-            "toString",
-            "toLocaleString",
-            "valueOf",
-            "hasOwnProperty",
-            "isPrototypeOf",
-            "propertyIsEnumerable",
-            "constructor"
-        ],
-        dontEnumsLength = dontEnums.length;
-
-    for (var key in {"toString": null})
-        hasDontEnumBug = false;
-
-    Object.keys = function keys(object) {
-
-        if ((typeof object != "object" && typeof object != "function") || object === null)
-            throw new TypeError("Object.keys called on a non-object");
-
-        var keys = [];
-        for (var name in object) {
-            if (owns(object, name)) {
-                keys.push(name);
-            }
-        }
-
-        if (hasDontEnumBug) {
-            for (var i = 0, ii = dontEnumsLength; i < ii; i++) {
-                var dontEnum = dontEnums[i];
-                if (owns(object, dontEnum)) {
-                    keys.push(dontEnum);
-                }
-            }
-        }
-
-        return keys;
-    };
-
-}
-
-//
-// Date
-// ====
-//
-
-// ES5 15.9.5.43
-// http://es5.github.com/#x15.9.5.43
-// This function returns a String value represent the instance in time 
-// represented by this Date object. The format of the String is the Date Time 
-// string format defined in 15.9.1.15. All fields are present in the String. 
-// The time zone is always UTC, denoted by the suffix Z. If the time value of 
-// this object is not a finite Number a RangeError exception is thrown.
-if (!Date.prototype.toISOString || (new Date(-62198755200000).toISOString().indexOf('-000001') === -1)) {
-    Date.prototype.toISOString = function toISOString() {
-        var result, length, value, year;
-        if (!isFinite(this))
-            throw new RangeError;
-
-        // the date time string format is specified in 15.9.1.15.
-        result = [this.getUTCMonth() + 1, this.getUTCDate(),
-            this.getUTCHours(), this.getUTCMinutes(), this.getUTCSeconds()];
-        year = this.getUTCFullYear();
-        year = (year < 0 ? '-' : (year > 9999 ? '+' : '')) + ('00000' + Math.abs(year)).slice(0 <= year && year <= 9999 ? -4 : -6);
-
-        length = result.length;
-        while (length--) {
-            value = result[length];
-            // pad months, days, hours, minutes, and seconds to have two digits.
-            if (value < 10)
-                result[length] = "0" + value;
-        }
-        // pad milliseconds to have three digits.
-        return year + "-" + result.slice(0, 2).join("-") + "T" + result.slice(2).join(":") + "." +
-            ("000" + this.getUTCMilliseconds()).slice(-3) + "Z";
-    }
-}
-
-// ES5 15.9.4.4
-// http://es5.github.com/#x15.9.4.4
-if (!Date.now) {
-    Date.now = function now() {
-        return new Date().getTime();
-    };
-}
-
-// ES5 15.9.5.44
-// http://es5.github.com/#x15.9.5.44
-// This function provides a String representation of a Date object for use by 
-// JSON.stringify (15.12.3).
-if (!Date.prototype.toJSON) {
-    Date.prototype.toJSON = function toJSON(key) {
-        // When the toJSON method is called with argument key, the following 
-        // steps are taken:
-
-        // 1.  Let O be the result of calling ToObject, giving it the this
-        // value as its argument.
-        // 2. Let tv be ToPrimitive(O, hint Number).
-        // 3. If tv is a Number and is not finite, return null.
-        // XXX
-        // 4. Let toISO be the result of calling the [[Get]] internal method of
-        // O with argument "toISOString".
-        // 5. If IsCallable(toISO) is false, throw a TypeError exception.
-        if (typeof this.toISOString != "function")
-            throw new TypeError(); // TODO message
-        // 6. Return the result of calling the [[Call]] internal method of
-        //  toISO with O as the this value and an empty argument list.
-        return this.toISOString();
-
-        // NOTE 1 The argument is ignored.
-
-        // NOTE 2 The toJSON function is intentionally generic; it does not
-        // require that its this value be a Date object. Therefore, it can be
-        // transferred to other kinds of objects for use as a method. However,
-        // it does require that any such object have a toISOString method. An
-        // object is free to use the argument key to filter its
-        // stringification.
-    };
-}
-
-// ES5 15.9.4.2
-// http://es5.github.com/#x15.9.4.2
-// based on work shared by Daniel Friesen (dantman)
-// http://gist.github.com/303249
-if (Date.parse("+275760-09-13T00:00:00.000Z") !== 8.64e15) {
-    // XXX global assignment won't work in embeddings that use
-    // an alternate object for the context.
-    Date = (function(NativeDate) {
-
-        // Date.length === 7
-        var Date = function Date(Y, M, D, h, m, s, ms) {
-            var length = arguments.length;
-            if (this instanceof NativeDate) {
-                var date = length == 1 && String(Y) === Y ? // isString(Y)
-                    // We explicitly pass it through parse:
-                    new NativeDate(Date.parse(Y)) :
-                    // We have to manually make calls depending on argument
-                    // length here
-                    length >= 7 ? new NativeDate(Y, M, D, h, m, s, ms) :
-                    length >= 6 ? new NativeDate(Y, M, D, h, m, s) :
-                    length >= 5 ? new NativeDate(Y, M, D, h, m) :
-                    length >= 4 ? new NativeDate(Y, M, D, h) :
-                    length >= 3 ? new NativeDate(Y, M, D) :
-                    length >= 2 ? new NativeDate(Y, M) :
-                    length >= 1 ? new NativeDate(Y) :
-                                  new NativeDate();
-                // Prevent mixups with unfixed Date object
-                date.constructor = Date;
-                return date;
-            }
-            return NativeDate.apply(this, arguments);
-        };
-
-        // 15.9.1.15 Date Time String Format.
-        var isoDateExpression = new RegExp("^" +
-            "(\\d{4}|[\+\-]\\d{6})" + // four-digit year capture or sign + 6-digit extended year
-            "(?:-(\\d{2})" + // optional month capture
-            "(?:-(\\d{2})" + // optional day capture
-            "(?:" + // capture hours:minutes:seconds.milliseconds
-                "T(\\d{2})" + // hours capture
-                ":(\\d{2})" + // minutes capture
-                "(?:" + // optional :seconds.milliseconds
-                    ":(\\d{2})" + // seconds capture
-                    "(?:\\.(\\d{3}))?" + // milliseconds capture
-                ")?" +
-            "(?:" + // capture UTC offset component
-                "Z|" + // UTC capture
-                "(?:" + // offset specifier +/-hours:minutes
-                    "([-+])" + // sign capture
-                    "(\\d{2})" + // hours offset capture
-                    ":(\\d{2})" + // minutes offset capture
-                ")" +
-            ")?)?)?)?" +
-        "$");
-
-        // Copy any custom methods a 3rd party library may have added
-        for (var key in NativeDate)
-            Date[key] = NativeDate[key];
-
-        // Copy "native" methods explicitly; they may be non-enumerable
-        Date.now = NativeDate.now;
-        Date.UTC = NativeDate.UTC;
-        Date.prototype = NativeDate.prototype;
-        Date.prototype.constructor = Date;
-
-        // Upgrade Date.parse to handle simplified ISO 8601 strings
-        Date.parse = function parse(string) {
-            var match = isoDateExpression.exec(string);
-            if (match) {
-                match.shift(); // kill match[0], the full match
-                // parse months, days, hours, minutes, seconds, and milliseconds
-                for (var i = 1; i < 7; i++) {
-                    // provide default values if necessary
-                    match[i] = +(match[i] || (i < 3 ? 1 : 0));
-                    // match[1] is the month. Months are 0-11 in JavaScript
-                    // `Date` objects, but 1-12 in ISO notation, so we
-                    // decrement.
-                    if (i == 1)
-                        match[i]--;
-                }
-
-                // parse the UTC offset component
-                var minuteOffset = +match.pop(), hourOffset = +match.pop(), sign = match.pop();
-
-                // compute the explicit time zone offset if specified
-                var offset = 0;
-                if (sign) {
-                    // detect invalid offsets and return early
-                    if (hourOffset > 23 || minuteOffset > 59)
-                        return NaN;
-
-                    // express the provided time zone offset in minutes. The offset is
-                    // negative for time zones west of UTC; positive otherwise.
-                    offset = (hourOffset * 60 + minuteOffset) * 6e4 * (sign == "+" ? -1 : 1);
-                }
-
-                // Date.UTC for years between 0 and 99 converts year to 1900 + year
-                // The Gregorian calendar has a 400-year cycle, so 
-                // to Date.UTC(year + 400, .... ) - 12622780800000 == Date.UTC(year, ...),
-                // where 12622780800000 - number of milliseconds in Gregorian calendar 400 years
-                var year = +match[0];
-                if (0 <= year && year <= 99) {
-                    match[0] = year + 400;
-                    return NativeDate.UTC.apply(this, match) + offset - 12622780800000;
-                }
-
-                // compute a new UTC date value, accounting for the optional offset
-                return NativeDate.UTC.apply(this, match) + offset;
-            }
-            return NativeDate.parse.apply(this, arguments);
-        };
-
-        return Date;
-    })(Date);
-}
-
-//
-// String
-// ======
-//
-
-// ES5 15.5.4.20
-// http://es5.github.com/#x15.5.4.20
-var ws = "\x09\x0A\x0B\x0C\x0D\x20\xA0\u1680\u180E\u2000\u2001\u2002\u2003" +
-    "\u2004\u2005\u2006\u2007\u2008\u2009\u200A\u202F\u205F\u3000\u2028" +
-    "\u2029\uFEFF";
-if (!String.prototype.trim || ws.trim()) {
-    // http://blog.stevenlevithan.com/archives/faster-trim-javascript
-    // http://perfectionkills.com/whitespace-deviations/
-    ws = "[" + ws + "]";
-    var trimBeginRegexp = new RegExp("^" + ws + ws + "*"),
-        trimEndRegexp = new RegExp(ws + ws + "*$");
-    String.prototype.trim = function trim() {
-        return String(this).replace(trimBeginRegexp, "").replace(trimEndRegexp, "");
-    };
-}
-
-//
-// Util
-// ======
-//
-
-// ES5 9.4
-// http://es5.github.com/#x9.4
-// http://jsperf.com/to-integer
-var toInteger = function (n) {
-    n = +n;
-    if (n !== n) // isNaN
-        n = 0;
-    else if (n !== 0 && n !== (1/0) && n !== -(1/0))
-        n = (n > 0 || -1) * Math.floor(Math.abs(n));
-    return n;
-};
-
-var prepareString = "a"[0] != "a",
-    // ES5 9.9
-    // http://es5.github.com/#x9.9
-    toObject = function (o) {
-        if (o == null) { // this matches both null and undefined
-            throw new TypeError(); // TODO message
-        }
-        // If the implementation doesn't support by-index access of
-        // string characters (ex. IE < 7), split the string
-        if (prepareString && typeof o == "string" && o) {
-            return o.split("");
-        }
-        return Object(o);
-    };
-});/* vim:ts=4:sts=4:sw=4:
- * ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *      Irakli Gozalishvili <rfobic@gmail.com> (http://jeditoolkit.com)
- *      Mike de Boer <mike AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/lib/event_emitter', ['require', 'exports', 'module' ], function(require, exports, module) {
-"use strict";
-
-var EventEmitter = {};
-
-EventEmitter._emit =
-EventEmitter._dispatchEvent = function(eventName, e) {
-    this._eventRegistry = this._eventRegistry || {};
-    this._defaultHandlers = this._defaultHandlers || {};
-
-    var listeners = this._eventRegistry[eventName] || [];
-    var defaultHandler = this._defaultHandlers[eventName];
-    if (!listeners.length && !defaultHandler)
-        return;
-
-    e = e || {};
-    e.type = eventName;
-    
-    if (!e.stopPropagation) {
-        e.stopPropagation = function() {
-            this.propagationStopped = true;
-        };
-    }
-    
-    if (!e.preventDefault) {
-        e.preventDefault = function() {
-            this.defaultPrevented = true;
-        };
-    }
-
-    for (var i=0; i<listeners.length; i++) {
-        listeners[i](e);
-        if (e.propagationStopped)
-            break;
-    }
-    
-    if (defaultHandler && !e.defaultPrevented)
-        defaultHandler(e);
-};
-
-EventEmitter.setDefaultHandler = function(eventName, callback) {
-    this._defaultHandlers = this._defaultHandlers || {};
-    
-    if (this._defaultHandlers[eventName])
-        throw new Error("The default handler for '" + eventName + "' is already set");
-        
-    this._defaultHandlers[eventName] = callback;
-};
-
-EventEmitter.on =
-EventEmitter.addEventListener = function(eventName, callback) {
-    this._eventRegistry = this._eventRegistry || {};
-
-    var listeners = this._eventRegistry[eventName];
-    if (!listeners)
-        var listeners = this._eventRegistry[eventName] = [];
-
-    if (listeners.indexOf(callback) == -1)
-        listeners.push(callback);
-};
-
-EventEmitter.removeListener =
-EventEmitter.removeEventListener = function(eventName, callback) {
-    this._eventRegistry = this._eventRegistry || {};
-
-    var listeners = this._eventRegistry[eventName];
-    if (!listeners)
-        return;
-
-    var index = listeners.indexOf(callback);
-    if (index !== -1)
-        listeners.splice(index, 1);
-};
-
-EventEmitter.removeAllListeners = function(eventName) {
-    if (this._eventRegistry) this._eventRegistry[eventName] = [];
-};
-
-exports.EventEmitter = EventEmitter;
-
-});/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/lib/oop', ['require', 'exports', 'module' ], function(require, exports, module) {
-"use strict";
-
-exports.inherits = (function() {
-    var tempCtor = function() {};
-    return function(ctor, superCtor) {
-        tempCtor.prototype = superCtor.prototype;
-        ctor.super_ = superCtor.prototype;
-        ctor.prototype = new tempCtor();
-        ctor.prototype.constructor = ctor;
-    };
-}());
-
-exports.mixin = function(obj, mixin) {
-    for (var key in mixin) {
-        obj[key] = mixin[key];
-    }
-};
-
-exports.implement = function(proto, mixin) {
-    exports.mixin(proto, mixin);
-};
-
-});
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/coffee_worker', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/worker/mirror', 'ace/mode/coffee/coffee-script'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var Mirror = require("../worker/mirror").Mirror;
-var coffee = require("../mode/coffee/coffee-script");
-
-window.addEventListener = function() {};
-
-
-var Worker = exports.Worker = function(sender) {
-    Mirror.call(this, sender);
-    this.setTimeout(200);
-};
-
-oop.inherits(Worker, Mirror);
-
-(function() {
-
-    this.onUpdate = function() {
-        var value = this.doc.getValue();
-
-        try {
-            coffee.parse(value);
-        } catch(e) {
-            var m = e.message.match(/Parse error on line (\d+): (.*)/);
-            if (m) {
-                this.sender.emit("error", {
-                    row: parseInt(m[1], 10) - 1,
-                    column: null,
-                    text: m[2],
-                    type: "error"
-                });
-                return;
-            }
-
-            if (e instanceof SyntaxError) {
-                var m = e.message.match(/ on line (\d+)/);
-                if (m) {
-                    this.sender.emit("error", {
-                        row: parseInt(m[1], 10) - 1,
-                        column: null,
-                        text: e.message.replace(m[0], ""),
-                        type: "error"
-                    });
-                }
-            }
-            return;
-        }
-        this.sender.emit("ok");
-    };
-
-}).call(Worker.prototype);
-
-});define('ace/worker/mirror', ['require', 'exports', 'module' , 'ace/document', 'ace/lib/lang'], function(require, exports, module) {
-"use strict";
-
-var Document = require("../document").Document;
-var lang = require("../lib/lang");
-    
-var Mirror = exports.Mirror = function(sender) {
-    this.sender = sender;
-    var doc = this.doc = new Document("");
-    
-    var deferredUpdate = this.deferredUpdate = lang.deferredCall(this.onUpdate.bind(this));
-    
-    var _self = this;
-    sender.on("change", function(e) {
-        doc.applyDeltas([e.data]);        
-        deferredUpdate.schedule(_self.$timeout);
-    });
-};
-
-(function() {
-    
-    this.$timeout = 500;
-    
-    this.setTimeout = function(timeout) {
-        this.$timeout = timeout;
-    };
-    
-    this.setValue = function(value) {
-        this.doc.setValue(value);
-        this.deferredUpdate.schedule(this.$timeout);
-    };
-    
-    this.getValue = function(callbackId) {
-        this.sender.callback(this.doc.getValue(), callbackId);
-    };
-    
-    this.onUpdate = function() {
-        // abstract method
-    };
-    
-}).call(Mirror.prototype);
-
-});/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/document', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/event_emitter', 'ace/range', 'ace/anchor'], function(require, exports, module) {
-"use strict";
-
-var oop = require("./lib/oop");
-var EventEmitter = require("./lib/event_emitter").EventEmitter;
-var Range = require("./range").Range;
-var Anchor = require("./anchor").Anchor;
-
-var Document = function(text) {
-    this.$lines = [];
-
-    if (Array.isArray(text)) {
-        this.insertLines(0, text);
-    }
-    // There has to be one line at least in the document. If you pass an empty
-    // string to the insert function, nothing will happen. Workaround.
-    else if (text.length == 0) {
-        this.$lines = [""];
-    } else {
-        this.insert({row: 0, column:0}, text);
-    }
-};
-
-(function() {
-
-    oop.implement(this, EventEmitter);
-
-    this.setValue = function(text) {
-        var len = this.getLength();
-        this.remove(new Range(0, 0, len, this.getLine(len-1).length));
-        this.insert({row: 0, column:0}, text);
-    };
-
-    this.getValue = function() {
-        return this.getAllLines().join(this.getNewLineCharacter());
-    };
-
-    this.createAnchor = function(row, column) {
-        return new Anchor(this, row, column);
-    };
-
-    // check for IE split bug
-    if ("aaa".split(/a/).length == 0)
-        this.$split = function(text) {
-            return text.replace(/\r\n|\r/g, "\n").split("\n");
-        }
-    else
-        this.$split = function(text) {
-            return text.split(/\r\n|\r|\n/);
-        };
-
-
-    this.$detectNewLine = function(text) {
-        var match = text.match(/^.*?(\r\n|\r|\n)/m);
-        if (match) {
-            this.$autoNewLine = match[1];
-        } else {
-            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(newLineMode) {
-        if (this.$newLineMode === newLineMode)
-            return;
-
-        this.$newLineMode = newLineMode;
-    };
-
-    this.getNewLineMode = function() {
-        return this.$newLineMode;
-    };
-
-    this.isNewLine = function(text) {
-        return (text == "\r\n" || text == "\r" || text == "\n");
-    };
-
-    /**
-     * Get a verbatim copy of the given line as it is in the document
-     */
-    this.getLine = function(row) {
-        return this.$lines[row] || "";
-    };
-
-    this.getLines = function(firstRow, lastRow) {
-        return this.$lines.slice(firstRow, lastRow + 1);
-    };
-
-    /**
-     * Returns all lines in the document as string array. Warning: The caller
-     * should not modify this array!
-     */
-    this.getAllLines = function() {
-        return this.getLines(0, this.getLength());
-    };
-
-    this.getLength = function() {
-        return this.$lines.length;
-    };
-
-    this.getTextRange = function(range) {
-        if (range.start.row == range.end.row) {
-            return this.$lines[range.start.row].substring(range.start.column,
-                                                         range.end.column);
-        }
-        else {
-            var lines = [];
-            lines.push(this.$lines[range.start.row].substring(range.start.column));
-            lines.push.apply(lines, this.getLines(range.start.row+1, range.end.row-1));
-            lines.push(this.$lines[range.end.row].substring(0, range.end.column));
-            return lines.join(this.getNewLineCharacter());
-        }
-    };
-
-    this.$clipPosition = function(position) {
-        var length = this.getLength();
-        if (position.row >= length) {
-            position.row = Math.max(0, length - 1);
-            position.column = this.getLine(length-1).length;
-        }
-        return position;
-    };
-
-    this.insert = function(position, text) {
-        if (!text || text.length === 0)
-            return position;
-
-        position = this.$clipPosition(position);
-
-        // only detect new lines if the document has no line break yet
-        if (this.getLength() <= 1)
-            this.$detectNewLine(text);
-
-        var lines = this.$split(text);
-        var firstLine = lines.splice(0, 1)[0];
-        var lastLine = lines.length == 0 ? null : lines.splice(lines.length - 1, 1)[0];
-
-        position = this.insertInLine(position, firstLine);
-        if (lastLine !== null) {
-            position = this.insertNewLine(position); // terminate first line
-            position = this.insertLines(position.row, lines);
-            position = this.insertInLine(position, lastLine || "");
-        }
-        return position;
-    };
-
-    this.insertLines = function(row, lines) {
-        if (lines.length == 0)
-            return {row: row, column: 0};
-
-        var args = [row, 0];
-        args.push.apply(args, lines);
-        this.$lines.splice.apply(this.$lines, args);
-
-        var range = new Range(row, 0, row + lines.length, 0);
-        var delta = {
-            action: "insertLines",
-            range: range,
-            lines: lines
-        };
-        this._emit("change", { data: delta });
-        return range.end;
-    };
-
-    this.insertNewLine = function(position) {
-        position = this.$clipPosition(position);
-        var line = this.$lines[position.row] || "";
-
-        this.$lines[position.row] = line.substring(0, position.column);
-        this.$lines.splice(position.row + 1, 0, line.substring(position.column, line.length));
-
-        var end = {
-            row : position.row + 1,
-            column : 0
-        };
-
-        var delta = {
-            action: "insertText",
-            range: Range.fromPoints(position, end),
-            text: this.getNewLineCharacter()
-        };
-        this._emit("change", { data: delta });
-
-        return end;
-    };
-
-    this.insertInLine = function(position, text) {
-        if (text.length == 0)
-            return position;
-
-        var line = this.$lines[position.row] || "";
-
-        this.$lines[position.row] = line.substring(0, position.column) + text
-                + line.substring(position.column);
-
-        var end = {
-            row : position.row,
-            column : position.column + text.length
-        };
-
-        var delta = {
-            action: "insertText",
-            range: Range.fromPoints(position, end),
-            text: text
-        };
-        this._emit("change", { data: delta });
-
-        return end;
-    };
-
-    this.remove = function(range) {
-        // clip to document
-        range.start = this.$clipPosition(range.start);
-        range.end = this.$clipPosition(range.end);
-
-        if (range.isEmpty())
-            return range.start;
-
-        var firstRow = range.start.row;
-        var lastRow = range.end.row;
-
-        if (range.isMultiLine()) {
-            var firstFullRow = range.start.column == 0 ? firstRow : firstRow + 1;
-            var lastFullRow = lastRow - 1;
-
-            if (range.end.column > 0)
-                this.removeInLine(lastRow, 0, range.end.column);
-
-            if (lastFullRow >= firstFullRow)
-                this.removeLines(firstFullRow, lastFullRow);
-
-            if (firstFullRow != firstRow) {
-                this.removeInLine(firstRow, range.start.column, this.getLine(firstRow).length);
-                this.removeNewLine(range.start.row);
-            }
-        }
-        else {
-            this.removeInLine(firstRow, range.start.column, range.end.column);
-        }
-        return range.start;
-    };
-
-    this.removeInLine = function(row, startColumn, endColumn) {
-        if (startColumn == endColumn)
-            return;
-
-        var range = new Range(row, startColumn, row, endColumn);
-        var line = this.getLine(row);
-        var removed = line.substring(startColumn, endColumn);
-        var newLine = line.substring(0, startColumn) + line.substring(endColumn, line.length);
-        this.$lines.splice(row, 1, newLine);
-
-        var delta = {
-            action: "removeText",
-            range: range,
-            text: removed
-        };
-        this._emit("change", { data: delta });
-        return range.start;
-    };
-
-    /**
-     * Removes a range of full lines
-     *
-     * @param firstRow {Integer} The first row to be removed
-     * @param lastRow {Integer} The last row to be removed
-     * @return {String[]} The removed lines
-     */
-    this.removeLines = function(firstRow, lastRow) {
-        var range = new Range(firstRow, 0, lastRow + 1, 0);
-        var removed = this.$lines.splice(firstRow, lastRow - firstRow + 1);
-
-        var delta = {
-            action: "removeLines",
-            range: range,
-            nl: this.getNewLineCharacter(),
-            lines: removed
-        };
-        this._emit("change", { data: delta });
-        return removed;
-    };
-
-    this.removeNewLine = function(row) {
-        var firstLine = this.getLine(row);
-        var secondLine = this.getLine(row+1);
-
-        var range = new Range(row, firstLine.length, row+1, 0);
-        var line = firstLine + secondLine;
-
-        this.$lines.splice(row, 2, line);
-
-        var delta = {
-            action: "removeText",
-            range: range,
-            text: this.getNewLineCharacter()
-        };
-        this._emit("change", { data: delta });
-    };
-
-    this.replace = function(range, text) {
-        if (text.length == 0 && range.isEmpty())
-            return range.start;
-
-        // Shortcut: If the text we want to insert is the same as it is already
-        // in the document, we don't have to replace anything.
-        if (text == this.getTextRange(range))
-            return range.end;
-
-        this.remove(range);
-        if (text) {
-            var end = this.insert(range.start, text);
-        }
-        else {
-            end = range.start;
-        }
-
-        return end;
-    };
-
-    this.applyDeltas = function(deltas) {
-        for (var i=0; i<deltas.length; i++) {
-            var delta = deltas[i];
-            var range = Range.fromPoints(delta.range.start, delta.range.end);
-
-            if (delta.action == "insertLines")
-                this.insertLines(range.start.row, delta.lines);
-            else if (delta.action == "insertText")
-                this.insert(range.start, delta.text);
-            else if (delta.action == "removeLines")
-                this.removeLines(range.start.row, range.end.row - 1);
-            else if (delta.action == "removeText")
-                this.remove(range);
-        }
-    };
-
-    this.revertDeltas = function(deltas) {
-        for (var i=deltas.length-1; i>=0; i--) {
-            var delta = deltas[i];
-
-            var range = Range.fromPoints(delta.range.start, delta.range.end);
-
-            if (delta.action == "insertLines")
-                this.removeLines(range.start.row, range.end.row - 1);
-            else if (delta.action == "insertText")
-                this.remove(range);
-            else if (delta.action == "removeLines")
-                this.insertLines(range.start.row, delta.lines);
-            else if (delta.action == "removeText")
-                this.insert(range.start, delta.text);
-        }
-    };
-
-}).call(Document.prototype);
-
-exports.Document = Document;
-});
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/range', ['require', 'exports', 'module' ], function(require, exports, module) {
-"use strict";
-
-var Range = function(startRow, startColumn, endRow, endColumn) {
-    this.start = {
-        row: startRow,
-        column: startColumn
-    };
-
-    this.end = {
-        row: endRow,
-        column: endColumn
-    };
-};
-
-(function() {
-    this.isEqual = function(range) {
-        return this.start.row == range.start.row &&
-            this.end.row == range.end.row &&
-            this.start.column == range.start.column &&
-            this.end.column == range.end.column
-    };
-
-    this.toString = function() {
-        return ("Range: [" + this.start.row + "/" + this.start.column +
-            "] -> [" + this.end.row + "/" + this.end.column + "]");
-    };
-
-    this.contains = function(row, column) {
-        return this.compare(row, column) == 0;
-    };
-
-    /**
-     * Compares this range (A) with another range (B), where B is the passed in
-     * range.
-     *
-     * Return values:
-     *  -2: (B) is infront of (A) and doesn't intersect with (A)
-     *  -1: (B) begins before (A) but ends inside of (A)
-     *   0: (B) is completly inside of (A) OR (A) is complety inside of (B)
-     *  +1: (B) begins inside of (A) but ends outside of (A)
-     *  +2: (B) is after (A) and doesn't intersect with (A)
-     *
-     *  42: FTW state: (B) ends in (A) but starts outside of (A)
-     */
-    this.compareRange = function(range) {
-        var cmp,
-            end = range.end,
-            start = range.start;
-
-        cmp = this.compare(end.row, end.column);
-        if (cmp == 1) {
-            cmp = this.compare(start.row, start.column);
-            if (cmp == 1) {
-                return 2;
-            } else if (cmp == 0) {
-                return 1;
-            } else {
-                return 0;
-            }
-        } else if (cmp == -1) {
-            return -2;
-        } else {
-            cmp = this.compare(start.row, start.column);
-            if (cmp == -1) {
-                return -1;
-            } else if (cmp == 1) {
-                return 42;
-            } else {
-                return 0;
-            }
-        }
-    }
-
-    this.comparePoint = function(p) {
-        return this.compare(p.row, p.column);
-    }
-
-    this.containsRange = function(range) {
-        return this.comparePoint(range.start) == 0 && this.comparePoint(range.end) == 0;
-    }
-
-    this.intersectsRange = function(range) {
-        var cmp = this.compareRange(range);
-        return (cmp == -1 || cmp == 0 || cmp == 1);
-    }
-
-    this.isEnd = function(row, column) {
-        return this.end.row == row && this.end.column == column;
-    }
-
-    this.isStart = function(row, column) {
-        return this.start.row == row && this.start.column == column;
-    }
-
-    this.setStart = function(row, column) {
-        if (typeof row == "object") {
-            this.start.column = row.column;
-            this.start.row = row.row;
-        } else {
-            this.start.row = row;
-            this.start.column = column;
-        }
-    }
-
-    this.setEnd = function(row, column) {
-        if (typeof row == "object") {
-            this.end.column = row.column;
-            this.end.row = row.row;
-        } else {
-            this.end.row = row;
-            this.end.column = column;
-        }
-    }
-
-    this.inside = function(row, column) {
-        if (this.compare(row, column) == 0) {
-            if (this.isEnd(row, column) || this.isStart(row, column)) {
-                return false;
-            } else {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    this.insideStart = function(row, column) {
-        if (this.compare(row, column) == 0) {
-            if (this.isEnd(row, column)) {
-                return false;
-            } else {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    this.insideEnd = function(row, column) {
-        if (this.compare(row, column) == 0) {
-            if (this.isStart(row, column)) {
-                return false;
-            } else {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    this.compare = function(row, column) {
-        if (!this.isMultiLine()) {
-            if (row === this.start.row) {
-                return column < this.start.column ? -1 : (column > this.end.column ? 1 : 0);
-            };
-        }
-
-        if (row < this.start.row)
-            return -1;
-
-        if (row > this.end.row)
-            return 1;
-
-        if (this.start.row === row)
-            return column >= this.start.column ? 0 : -1;
-
-        if (this.end.row === row)
-            return column <= this.end.column ? 0 : 1;
-
-        return 0;
-    };
-
-    /**
-     * Like .compare(), but if isStart is true, return -1;
-     */
-    this.compareStart = function(row, column) {
-        if (this.start.row == row && this.start.column == column) {
-            return -1;
-        } else {
-            return this.compare(row, column);
-        }
-    }
-
-    /**
-     * Like .compare(), but if isEnd is true, return 1;
-     */
-    this.compareEnd = function(row, column) {
-        if (this.end.row == row && this.end.column == column) {
-            return 1;
-        } else {
-            return this.compare(row, column);
-        }
-    }
-
-    this.compareInside = function(row, column) {
-        if (this.end.row == row && this.end.column == column) {
-            return 1;
-        } else if (this.start.row == row && this.start.column == column) {
-            return -1;
-        } else {
-            return this.compare(row, column);
-        }
-    }
-
-    this.clipRows = function(firstRow, lastRow) {
-        if (this.end.row > lastRow) {
-            var end = {
-                row: lastRow+1,
-                column: 0
-            };
-        }
-
-        if (this.start.row > lastRow) {
-            var start = {
-                row: lastRow+1,
-                column: 0
-            };
-        }
-
-        if (this.start.row < firstRow) {
-            var start = {
-                row: firstRow,
-                column: 0
-            };
-        }
-
-        if (this.end.row < firstRow) {
-            var end = {
-                row: firstRow,
-                column: 0
-            };
-        }
-        return Range.fromPoints(start || this.start, end || this.end);
-    };
-
-    this.extend = function(row, column) {
-        var cmp = this.compare(row, column);
-
-        if (cmp == 0)
-            return this;
-        else if (cmp == -1)
-            var start = {row: row, column: column};
-        else
-            var end = {row: row, column: column};
-
-        return Range.fromPoints(start || this.start, end || 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 false;
-        }
-        
-        var temp = this.start;
-        this.end = this.start;
-        this.start = temp;
-        return true;
-    };
-
-
-    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 Range.fromPoints(this.start, this.end);
-    };
-
-    this.collapseRows = function() {
-        if (this.end.column == 0)
-            return new Range(this.start.row, 0, Math.max(this.start.row, this.end.row-1), 0)
-        else
-            return new Range(this.start.row, 0, this.end.row, 0)
-    };
-
-    this.toScreenRange = function(session) {
-        var screenPosStart =
-            session.documentToScreenPosition(this.start);
-        var screenPosEnd =
-            session.documentToScreenPosition(this.end);
-
-        return new Range(
-            screenPosStart.row, screenPosStart.column,
-            screenPosEnd.row, screenPosEnd.column
-        );
-    };
-
-}).call(Range.prototype);
-
-
-Range.fromPoints = function(start, end) {
-    return new Range(start.row, start.column, end.row, end.column);
-};
-
-exports.Range = Range;
-});
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/anchor', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/event_emitter'], function(require, exports, module) {
-"use strict";
-
-var oop = require("./lib/oop");
-var EventEmitter = require("./lib/event_emitter").EventEmitter;
-
-/**
- * An Anchor is a floating pointer in the document. Whenever text is inserted or
- * deleted before the cursor, the position of the cursor is updated
- */
-var Anchor = exports.Anchor = function(doc, row, column) {
-    this.document = doc;
-    
-    if (typeof column == "undefined")
-        this.setPosition(row.row, row.column);
-    else
-        this.setPosition(row, column);
-
-    this.$onChange = this.onChange.bind(this);
-    doc.on("change", this.$onChange);
-};
-
-(function() {
-
-    oop.implement(this, EventEmitter);
-    
-    this.getPosition = function() {
-        return this.$clipPositionToDocument(this.row, this.column);
-    };
-    
-    this.getDocument = function() {
-        return this.document;
-    };
-    
-    this.onChange = function(e) {
-        var delta = e.data;
-        var range = delta.range;
-            
-        if (range.start.row == range.end.row && range.start.row != this.row)
-            return;
-            
-        if (range.start.row > this.row)
-            return;
-            
-        if (range.start.row == this.row && range.start.column > this.column)
-            return;
-    
-        var row = this.row;
-        var column = this.column;
-        
-        if (delta.action === "insertText") {
-            if (range.start.row === row && range.start.column <= column) {
-                if (range.start.row === range.end.row) {
-                    column += range.end.column - range.start.column;
-                }
-                else {
-                    column -= range.start.column;
-                    row += range.end.row - range.start.row;
-                }
-            }
-            else if (range.start.row !== range.end.row && range.start.row < row) {
-                row += range.end.row - range.start.row;
-            }
-        } else if (delta.action === "insertLines") {
-            if (range.start.row <= row) {
-                row += range.end.row - range.start.row;
-            }
-        }
-        else if (delta.action == "removeText") {
-            if (range.start.row == row && range.start.column < column) {
-                if (range.end.column >= column)
-                    column = range.start.column;
-                else
-                    column = Math.max(0, column - (range.end.column - range.start.column));
-                
-            } else if (range.start.row !== range.end.row && range.start.row < row) {
-                if (range.end.row == row) {
-                    column = Math.max(0, column - range.end.column) + range.start.column;
-                }
-                row -= (range.end.row - range.start.row);
-            }
-            else if (range.end.row == row) {
-                row -= range.end.row - range.start.row;
-                column = Math.max(0, column - range.end.column) + range.start.column;
-            }
-        } else if (delta.action == "removeLines") {
-            if (range.start.row <= row) {
-                if (range.end.row <= row)
-                    row -= range.end.row - range.start.row;
-                else {
-                    row = range.start.row;
-                    column = 0;
-                }
-            }
-        }
-
-        this.setPosition(row, column, true);
-    };
-
-    this.setPosition = function(row, column, noClip) {
-        var pos;
-        if (noClip) {
-            pos = {
-                row: row,
-                column: column
-            };
-        }
-        else {
-            pos = this.$clipPositionToDocument(row, column);
-        }
-        
-        if (this.row == pos.row && this.column == pos.column)
-            return;
-            
-        var old = {
-            row: this.row,
-            column: this.column
-        };
-        
-        this.row = pos.row;
-        this.column = pos.column;
-        this._emit("change", {
-            old: old,
-            value: pos
-        });
-    };
-    
-    this.detach = function() {
-        this.document.removeEventListener("change", this.$onChange);
-    };
-    
-    this.$clipPositionToDocument = function(row, column) {
-        var pos = {};
-    
-        if (row >= this.document.getLength()) {
-            pos.row = Math.max(0, this.document.getLength() - 1);
-            pos.column = this.document.getLine(pos.row).length;
-        }
-        else if (row < 0) {
-            pos.row = 0;
-            pos.column = 0;
-        }
-        else {
-            pos.row = row;
-            pos.column = Math.min(this.document.getLine(pos.row).length, Math.max(0, column));
-        }
-        
-        if (column < 0)
-            pos.column = 0;
-            
-        return pos;
-    };
-    
-}).call(Anchor.prototype);
-
-});
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/lib/lang', ['require', 'exports', 'module' ], function(require, exports, module) {
-"use strict";
-
-exports.stringReverse = function(string) {
-    return string.split("").reverse().join("");
-};
-
-exports.stringRepeat = function (string, count) {
-     return new Array(count + 1).join(string);
-};
-
-var trimBeginRegexp = /^\s\s*/;
-var trimEndRegexp = /\s\s*$/;
-
-exports.stringTrimLeft = function (string) {
-    return string.replace(trimBeginRegexp, '');
-};
-
-exports.stringTrimRight = function (string) {
-    return string.replace(trimEndRegexp, '');
-};
-
-exports.copyObject = function(obj) {
-    var copy = {};
-    for (var key in obj) {
-        copy[key] = obj[key];
-    }
-    return copy;
-};
-
-exports.copyArray = function(array){
-    var copy = [];
-    for (var i=0, l=array.length; i<l; i++) {
-        if (array[i] && typeof array[i] == "object")
-            copy[i] = this.copyObject( array[i] );
-        else 
-            copy[i] = array[i];
-    }
-    return copy;
-};
-
-exports.deepCopy = function (obj) {
-    if (typeof obj != "object") {
-        return obj;
-    }
-    
-    var copy = obj.constructor();
-    for (var key in obj) {
-        if (typeof obj[key] == "object") {
-            copy[key] = this.deepCopy(obj[key]);
-        } else {
-            copy[key] = obj[key];
-        }
-    }
-    return copy;
-};
-
-exports.arrayToMap = function(arr) {
-    var map = {};
-    for (var i=0; i<arr.length; i++) {
-        map[arr[i]] = 1;
-    }
-    return map;
-
-};
-
-/**
- * splice out of 'array' anything that === 'value'
- */
-exports.arrayRemove = function(array, value) {
-  for (var i = 0; i <= array.length; i++) {
-    if (value === array[i]) {
-      array.splice(i, 1);
-    }
-  }
-};
-
-exports.escapeRegExp = function(str) {
-    return str.replace(/([.*+?^${}()|[\]\/\\])/g, '\\$1');
-};
-
-exports.deferredCall = function(fcn) {
-
-    var timer = null;
-    var callback = function() {
-        timer = null;
-        fcn();
-    };
-
-    var deferred = function(timeout) {
-        deferred.cancel();
-        timer = setTimeout(callback, timeout || 0);
-        return deferred;
-    };
-
-    deferred.schedule = deferred;
-
-    deferred.call = function() {
-        this.cancel();
-        fcn();
-        return deferred;
-    };
-
-    deferred.cancel = function() {
-        clearTimeout(timer);
-        timer = null;
-        return deferred;
-    };
-
-    return deferred;
-};
-
-});
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
- 
-define('ace/mode/coffee/coffee-script', ['require', 'exports', 'module' , 'ace/mode/coffee/lexer', 'ace/mode/coffee/parser', 'ace/mode/coffee/nodes'], function(require, exports, module) {
-    
-    var Lexer = require("./lexer").Lexer;
-    var parser = require("./parser");
-
-    var lexer = new Lexer();
-    parser.lexer = {
-        lex: function() {
-            var tag, _ref2;
-            _ref2 = this.tokens[this.pos++] || [''], tag = _ref2[0], this.yytext = _ref2[1], this.yylineno = _ref2[2];
-            return tag;
-        },
-        setInput: function(tokens) {
-            this.tokens = tokens;
-            return this.pos = 0;
-        },
-        upcomingInput: function() {
-            return "";
-        }
-    };
-    parser.yy = require('./nodes');
-    
-    exports.parse = function(code) {
-        return parser.parse(lexer.tokenize(code));
-    };
-});/**
- * Copyright (c) 2011 Jeremy Ashkenas
- * 
- * 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.
- */
-
-define('ace/mode/coffee/lexer', ['require', 'exports', 'module' , 'ace/mode/coffee/rewriter', 'ace/mode/coffee/helpers'], function(require, exports, module) {
-// Generated by CoffeeScript 1.2.1-pre
-
-  var BOOL, CALLABLE, CODE, COFFEE_ALIASES, COFFEE_ALIAS_MAP, COFFEE_KEYWORDS, COMMENT, COMPARE, COMPOUND_ASSIGN, HEREDOC, HEREDOC_ILLEGAL, HEREDOC_INDENT, HEREGEX, HEREGEX_OMIT, IDENTIFIER, INDEXABLE, INVERSES, JSTOKEN, JS_FORBIDDEN, JS_KEYWORDS, LINE_BREAK, LINE_CONTINUER, LOGIC, Lexer, MATH, MULTILINER, MULTI_DENT, NOT_REGEX, NOT_SPACED_REGEX, NUMBER, OPERATOR, REGEX, RELATION, RESERVED, Rewriter, SHIFT, SIMPLESTR, STRICT_PROSCRIBED, TRAILING_SPACES, UNARY, WHITESPACE, compact, count, key, last, starts, _ref, _ref1,
-    __indexOf = [].indexOf || function(item) { for (var i = 0, l = this.length; i < l; i++) { if (i in this && this[i] === item) return i; } return -1; };
-
-  _ref = require('./rewriter'), Rewriter = _ref.Rewriter, INVERSES = _ref.INVERSES;
-
-  _ref1 = require('./helpers'), count = _ref1.count, starts = _ref1.starts, compact = _ref1.compact, last = _ref1.last;
-
-  exports.Lexer = Lexer = (function() {
-
-    Lexer.name = 'Lexer';
-
-    function Lexer() {}
-
-    Lexer.prototype.tokenize = function(code, opts) {
-      var i, tag;
-      if (opts == null) opts = {};
-      if (WHITESPACE.test(code)) code = "\n" + code;
-      code = code.replace(/\r/g, '').replace(TRAILING_SPACES, '');
-      this.code = code;
-      this.line = opts.line || 0;
-      this.indent = 0;
-      this.indebt = 0;
-      this.outdebt = 0;
-      this.indents = [];
-      this.ends = [];
-      this.tokens = [];
-      i = 0;
-      while (this.chunk = code.slice(i)) {
-        i += this.identifierToken() || this.commentToken() || this.whitespaceToken() || this.lineToken() || this.heredocToken() || this.stringToken() || this.numberToken() || this.regexToken() || this.jsToken() || this.literalToken();
-      }
-      this.closeIndentation();
-      if (tag = this.ends.pop()) this.error("missing " + tag);
-      if (opts.rewrite === false) return this.tokens;
-      return (new Rewriter).rewrite(this.tokens);
-    };
-
-    Lexer.prototype.identifierToken = function() {
-      var colon, forcedIdentifier, id, input, match, prev, tag, _ref2, _ref3;
-      if (!(match = IDENTIFIER.exec(this.chunk))) return 0;
-      input = match[0], id = match[1], colon = match[2];
-      if (id === 'own' && this.tag() === 'FOR') {
-        this.token('OWN', id);
-        return id.length;
-      }
-      forcedIdentifier = colon || (prev = last(this.tokens)) && (((_ref2 = prev[0]) === '.' || _ref2 === '?.' || _ref2 === '::') || !prev.spaced && prev[0] === '@');
-      tag = 'IDENTIFIER';
-      if (!forcedIdentifier && (__indexOf.call(JS_KEYWORDS, id) >= 0 || __indexOf.call(COFFEE_KEYWORDS, id) >= 0)) {
-        tag = id.toUpperCase();
-        if (tag === 'WHEN' && (_ref3 = this.tag(), __indexOf.call(LINE_BREAK, _ref3) >= 0)) {
-          tag = 'LEADING_WHEN';
-        } else if (tag === 'FOR') {
-          this.seenFor = true;
-        } else if (tag === 'UNLESS') {
-          tag = 'IF';
-        } else if (__indexOf.call(UNARY, tag) >= 0) {
-          tag = 'UNARY';
-        } else if (__indexOf.call(RELATION, tag) >= 0) {
-          if (tag !== 'INSTANCEOF' && this.seenFor) {
-            tag = 'FOR' + tag;
-            this.seenFor = false;
-          } else {
-            tag = 'RELATION';
-            if (this.value() === '!') {
-              this.tokens.pop();
-              id = '!' + id;
-            }
-          }
-        }
-      }
-      if (__indexOf.call(JS_FORBIDDEN, id) >= 0) {
-        if (forcedIdentifier) {
-          tag = 'IDENTIFIER';
-          id = new String(id);
-          id.reserved = true;
-        } else if (__indexOf.call(RESERVED, id) >= 0) {
-          this.error("reserved word \"" + id + "\"");
-        }
-      }
-      if (!forcedIdentifier) {
-        if (__indexOf.call(COFFEE_ALIASES, id) >= 0) id = COFFEE_ALIAS_MAP[id];
-        tag = (function() {
-          switch (id) {
-            case '!':
-              return 'UNARY';
-            case '==':
-            case '!=':
-              return 'COMPARE';
-            case '&&':
-            case '||':
-              return 'LOGIC';
-            case 'true':
-            case 'false':
-            case 'null':
-            case 'undefined':
-              return 'BOOL';
-            case 'break':
-            case 'continue':
-              return 'STATEMENT';
-            default:
-              return tag;
-          }
-        })();
-      }
-      this.token(tag, id);
-      if (colon) this.token(':', ':');
-      return input.length;
-    };
-
-    Lexer.prototype.numberToken = function() {
-      var binaryLiteral, lexedLength, match, number, octalLiteral;
-      if (!(match = NUMBER.exec(this.chunk))) return 0;
-      number = match[0];
-      if (/E/.test(number)) {
-        this.error("exponential notation '" + number + "' must be indicated with a lowercase 'e'");
-      } else if (/[BOX]/.test(number)) {
-        this.error("radix prefix '" + number + "' must be lowercase");
-      } else if (/^0[89]/.test(number)) {
-        this.error("decimal literal '" + number + "' must not be prefixed with '0'");
-      } else if (/^0[0-7]/.test(number)) {
-        this.error("octal literal '" + number + "' must be prefixed with '0o'");
-      }
-      lexedLength = number.length;
-      if (octalLiteral = /0o([0-7]+)/.exec(number)) {
-        number = (parseInt(octalLiteral[1], 8)).toString();
-      }
-      if (binaryLiteral = /0b([01]+)/.exec(number)) {
-        number = (parseInt(binaryLiteral[1], 2)).toString();
-      }
-      this.token('NUMBER', number);
-      return lexedLength;
-    };
-
-    Lexer.prototype.stringToken = function() {
-      var match, octalEsc, string;
-      switch (this.chunk.charAt(0)) {
-        case "'":
-          if (!(match = SIMPLESTR.exec(this.chunk))) return 0;
-          this.token('STRING', (string = match[0]).replace(MULTILINER, '\\\n'));
-          break;
-        case '"':
-          if (!(string = this.balancedString(this.chunk, '"'))) return 0;
-          if (0 < string.indexOf('#{', 1)) {
-            this.interpolateString(string.slice(1, -1));
-          } else {
-            this.token('STRING', this.escapeLines(string));
-          }
-          break;
-        default:
-          return 0;
-      }
-      if (octalEsc = /^(?:\\.|[^\\])*\\[0-7]/.test(string)) {
-        this.error("octal escape sequences " + string + " are not allowed");
-      }
-      this.line += count(string, '\n');
-      return string.length;
-    };
-
-    Lexer.prototype.heredocToken = function() {
-      var doc, heredoc, match, quote;
-      if (!(match = HEREDOC.exec(this.chunk))) return 0;
-      heredoc = match[0];
-      quote = heredoc.charAt(0);
-      doc = this.sanitizeHeredoc(match[2], {
-        quote: quote,
-        indent: null
-      });
-      if (quote === '"' && 0 <= doc.indexOf('#{')) {
-        this.interpolateString(doc, {
-          heredoc: true
-        });
-      } else {
-        this.token('STRING', this.makeString(doc, quote, true));
-      }
-      this.line += count(heredoc, '\n');
-      return heredoc.length;
-    };
-
-    Lexer.prototype.commentToken = function() {
-      var comment, here, match;
-      if (!(match = this.chunk.match(COMMENT))) return 0;
-      comment = match[0], here = match[1];
-      if (here) {
-        this.token('HERECOMMENT', this.sanitizeHeredoc(here, {
-          herecomment: true,
-          indent: Array(this.indent + 1).join(' ')
-        }));
-      }
-      this.line += count(comment, '\n');
-      return comment.length;
-    };
-
-    Lexer.prototype.jsToken = function() {
-      var match, script;
-      if (!(this.chunk.charAt(0) === '`' && (match = JSTOKEN.exec(this.chunk)))) {
-        return 0;
-      }
-      this.token('JS', (script = match[0]).slice(1, -1));
-      return script.length;
-    };
-
-    Lexer.prototype.regexToken = function() {
-      var flags, length, match, prev, regex, _ref2, _ref3;
-      if (this.chunk.charAt(0) !== '/') return 0;
-      if (match = HEREGEX.exec(this.chunk)) {
-        length = this.heregexToken(match);
-        this.line += count(match[0], '\n');
-        return length;
-      }
-      prev = last(this.tokens);
-      if (prev && (_ref2 = prev[0], __indexOf.call((prev.spaced ? NOT_REGEX : NOT_SPACED_REGEX), _ref2) >= 0)) {
-        return 0;
-      }
-      if (!(match = REGEX.exec(this.chunk))) return 0;
-      _ref3 = match, match = _ref3[0], regex = _ref3[1], flags = _ref3[2];
-      if (regex.slice(0, 2) === '/*') {
-        this.error('regular expressions cannot begin with `*`');
-      }
-      if (regex === '//') regex = '/(?:)/';
-      this.token('REGEX', "" + regex + flags);
-      return match.length;
-    };
-
-    Lexer.prototype.heregexToken = function(match) {
-      var body, flags, heregex, re, tag, tokens, value, _i, _len, _ref2, _ref3, _ref4, _ref5;
-      heregex = match[0], body = match[1], flags = match[2];
-      if (0 > body.indexOf('#{')) {
-        re = body.replace(HEREGEX_OMIT, '').replace(/\//g, '\\/');
-        if (re.match(/^\*/)) {
-          this.error('regular expressions cannot begin with `*`');
-        }
-        this.token('REGEX', "/" + (re || '(?:)') + "/" + flags);
-        return heregex.length;
-      }
-      this.token('IDENTIFIER', 'RegExp');
-      this.tokens.push(['CALL_START', '(']);
-      tokens = [];
-      _ref2 = this.interpolateString(body, {
-        regex: true
-      });
-      for (_i = 0, _len = _ref2.length; _i < _len; _i++) {
-        _ref3 = _ref2[_i], tag = _ref3[0], value = _ref3[1];
-        if (tag === 'TOKENS') {
-          tokens.push.apply(tokens, value);
-        } else {
-          if (!(value = value.replace(HEREGEX_OMIT, ''))) continue;
-          value = value.replace(/\\/g, '\\\\');
-          tokens.push(['STRING', this.makeString(value, '"', true)]);
-        }
-        tokens.push(['+', '+']);
-      }
-      tokens.pop();
-      if (((_ref4 = tokens[0]) != null ? _ref4[0] : void 0) !== 'STRING') {
-        this.tokens.push(['STRING', '""'], ['+', '+']);
-      }
-      (_ref5 = this.tokens).push.apply(_ref5, tokens);
-      if (flags) this.tokens.push([',', ','], ['STRING', '"' + flags + '"']);
-      this.token(')', ')');
-      return heregex.length;
-    };
-
-    Lexer.prototype.lineToken = function() {
-      var diff, indent, match, noNewlines, prev, size;
-      if (!(match = MULTI_DENT.exec(this.chunk))) return 0;
-      indent = match[0];
-      this.line += count(indent, '\n');
-      this.seenFor = false;
-      prev = last(this.tokens, 1);
-      size = indent.length - 1 - indent.lastIndexOf('\n');
-      noNewlines = this.unfinished();
-      if (size - this.indebt === this.indent) {
-        if (noNewlines) {
-          this.suppressNewlines();
-        } else {
-          this.newlineToken();
-        }
-        return indent.length;
-      }
-      if (size > this.indent) {
-        if (noNewlines) {
-          this.indebt = size - this.indent;
-          this.suppressNewlines();
-          return indent.length;
-        }
-        diff = size - this.indent + this.outdebt;
-        this.token('INDENT', diff);
-        this.indents.push(diff);
-        this.ends.push('OUTDENT');
-        this.outdebt = this.indebt = 0;
-      } else {
-        this.indebt = 0;
-        this.outdentToken(this.indent - size, noNewlines);
-      }
-      this.indent = size;
-      return indent.length;
-    };
-
-    Lexer.prototype.outdentToken = function(moveOut, noNewlines) {
-      var dent, len;
-      while (moveOut > 0) {
-        len = this.indents.length - 1;
-        if (this.indents[len] === void 0) {
-          moveOut = 0;
-        } else if (this.indents[len] === this.outdebt) {
-          moveOut -= this.outdebt;
-          this.outdebt = 0;
-        } else if (this.indents[len] < this.outdebt) {
-          this.outdebt -= this.indents[len];
-          moveOut -= this.indents[len];
-        } else {
-          dent = this.indents.pop() - this.outdebt;
-          moveOut -= dent;
-          this.outdebt = 0;
-          this.pair('OUTDENT');
-          this.token('OUTDENT', dent);
-        }
-      }
-      if (dent) this.outdebt -= moveOut;
-      while (this.value() === ';') {
-        this.tokens.pop();
-      }
-      if (!(this.tag() === 'TERMINATOR' || noNewlines)) {
-        this.token('TERMINATOR', '\n');
-      }
-      return this;
-    };
-
-    Lexer.prototype.whitespaceToken = function() {
-      var match, nline, prev;
-      if (!((match = WHITESPACE.exec(this.chunk)) || (nline = this.chunk.charAt(0) === '\n'))) {
-        return 0;
-      }
-      prev = last(this.tokens);
-      if (prev) prev[match ? 'spaced' : 'newLine'] = true;
-      if (match) {
-        return match[0].length;
-      } else {
-        return 0;
-      }
-    };
-
-    Lexer.prototype.newlineToken = function() {
-      while (this.value() === ';') {
-        this.tokens.pop();
-      }
-      if (this.tag() !== 'TERMINATOR') this.token('TERMINATOR', '\n');
-      return this;
-    };
-
-    Lexer.prototype.suppressNewlines = function() {
-      if (this.value() === '\\') this.tokens.pop();
-      return this;
-    };
-
-    Lexer.prototype.literalToken = function() {
-      var match, prev, tag, value, _ref2, _ref3, _ref4, _ref5;
-      if (match = OPERATOR.exec(this.chunk)) {
-        value = match[0];
-        if (CODE.test(value)) this.tagParameters();
-      } else {
-        value = this.chunk.charAt(0);
-      }
-      tag = value;
-      prev = last(this.tokens);
-      if (value === '=' && prev) {
-        if (!prev[1].reserved && (_ref2 = prev[1], __indexOf.call(JS_FORBIDDEN, _ref2) >= 0)) {
-          this.error("reserved word \"" + (this.value()) + "\" can't be assigned");
-        }
-        if ((_ref3 = prev[1]) === '||' || _ref3 === '&&') {
-          prev[0] = 'COMPOUND_ASSIGN';
-          prev[1] += '=';
-          return value.length;
-        }
-      }
-      if (value === ';') {
-        this.seenFor = false;
-        tag = 'TERMINATOR';
-      } else if (__indexOf.call(MATH, value) >= 0) {
-        tag = 'MATH';
-      } else if (__indexOf.call(COMPARE, value) >= 0) {
-        tag = 'COMPARE';
-      } else if (__indexOf.call(COMPOUND_ASSIGN, value) >= 0) {
-        tag = 'COMPOUND_ASSIGN';
-      } else if (__indexOf.call(UNARY, value) >= 0) {
-        tag = 'UNARY';
-      } else if (__indexOf.call(SHIFT, value) >= 0) {
-        tag = 'SHIFT';
-      } else if (__indexOf.call(LOGIC, value) >= 0 || value === '?' && (prev != null ? prev.spaced : void 0)) {
-        tag = 'LOGIC';
-      } else if (prev && !prev.spaced) {
-        if (value === '(' && (_ref4 = prev[0], __indexOf.call(CALLABLE, _ref4) >= 0)) {
-          if (prev[0] === '?') prev[0] = 'FUNC_EXIST';
-          tag = 'CALL_START';
-        } else if (value === '[' && (_ref5 = prev[0], __indexOf.call(INDEXABLE, _ref5) >= 0)) {
-          tag = 'INDEX_START';
-          switch (prev[0]) {
-            case '?':
-              prev[0] = 'INDEX_SOAK';
-          }
-        }
-      }
-      switch (value) {
-        case '(':
-        case '{':
-        case '[':
-          this.ends.push(INVERSES[value]);
-          break;
-        case ')':
-        case '}':
-        case ']':
-          this.pair(value);
-      }
-      this.token(tag, value);
-      return value.length;
-    };
-
-    Lexer.prototype.sanitizeHeredoc = function(doc, options) {
-      var attempt, herecomment, indent, match, _ref2;
-      indent = options.indent, herecomment = options.herecomment;
-      if (herecomment) {
-        if (HEREDOC_ILLEGAL.test(doc)) {
-          this.error("block comment cannot contain \"*/\", starting");
-        }
-        if (doc.indexOf('\n') <= 0) return doc;
-      } else {
-        while (match = HEREDOC_INDENT.exec(doc)) {
-          attempt = match[1];
-          if (indent === null || (0 < (_ref2 = attempt.length) && _ref2 < indent.length)) {
-            indent = attempt;
-          }
-        }
-      }
-      if (indent) doc = doc.replace(RegExp("\\n" + indent, "g"), '\n');
-      if (!herecomment) doc = doc.replace(/^\n/, '');
-      return doc;
-    };
-
-    Lexer.prototype.tagParameters = function() {
-      var i, stack, tok, tokens;
-      if (this.tag() !== ')') return this;
-      stack = [];
-      tokens = this.tokens;
-      i = tokens.length;
-      tokens[--i][0] = 'PARAM_END';
-      while (tok = tokens[--i]) {
-        switch (tok[0]) {
-          case ')':
-            stack.push(tok);
-            break;
-          case '(':
-          case 'CALL_START':
-            if (stack.length) {
-              stack.pop();
-            } else if (tok[0] === '(') {
-              tok[0] = 'PARAM_START';
-              return this;
-            } else {
-              return this;
-            }
-        }
-      }
-      return this;
-    };
-
-    Lexer.prototype.closeIndentation = function() {
-      return this.outdentToken(this.indent);
-    };
-
-    Lexer.prototype.balancedString = function(str, end) {
-      var continueCount, i, letter, match, prev, stack, _i, _ref2;
-      continueCount = 0;
-      stack = [end];
-      for (i = _i = 1, _ref2 = str.length; 1 <= _ref2 ? _i < _ref2 : _i > _ref2; i = 1 <= _ref2 ? ++_i : --_i) {
-        if (continueCount) {
-          --continueCount;
-          continue;
-        }
-        switch (letter = str.charAt(i)) {
-          case '\\':
-            ++continueCount;
-            continue;
-          case end:
-            stack.pop();
-            if (!stack.length) return str.slice(0, i + 1 || 9e9);
-            end = stack[stack.length - 1];
-            continue;
-        }
-        if (end === '}' && (letter === '"' || letter === "'")) {
-          stack.push(end = letter);
-        } else if (end === '}' && letter === '/' && (match = HEREGEX.exec(str.slice(i)) || REGEX.exec(str.slice(i)))) {
-          continueCount += match[0].length - 1;
-        } else if (end === '}' && letter === '{') {
-          stack.push(end = '}');
-        } else if (end === '"' && prev === '#' && letter === '{') {
-          stack.push(end = '}');
-        }
-        prev = letter;
-      }
-      return this.error("missing " + (stack.pop()) + ", starting");
-    };
-
-    Lexer.prototype.interpolateString = function(str, options) {
-      var expr, heredoc, i, inner, interpolated, len, letter, nested, pi, regex, tag, tokens, value, _i, _len, _ref2, _ref3, _ref4;
-      if (options == null) options = {};
-      heredoc = options.heredoc, regex = options.regex;
-      tokens = [];
-      pi = 0;
-      i = -1;
-      while (letter = str.charAt(i += 1)) {
-        if (letter === '\\') {
-          i += 1;
-          continue;
-        }
-        if (!(letter === '#' && str.charAt(i + 1) === '{' && (expr = this.balancedString(str.slice(i + 1), '}')))) {
-          continue;
-        }
-        if (pi < i) tokens.push(['NEOSTRING', str.slice(pi, i)]);
-        inner = expr.slice(1, -1);
-        if (inner.length) {
-          nested = new Lexer().tokenize(inner, {
-            line: this.line,
-            rewrite: false
-          });
-          nested.pop();
-          if (((_ref2 = nested[0]) != null ? _ref2[0] : void 0) === 'TERMINATOR') {
-            nested.shift();
-          }
-          if (len = nested.length) {
-            if (len > 1) {
-              nested.unshift(['(', '(', this.line]);
-              nested.push([')', ')', this.line]);
-            }
-            tokens.push(['TOKENS', nested]);
-          }
-        }
-        i += expr.length;
-        pi = i + 1;
-      }
-      if ((i > pi && pi < str.length)) tokens.push(['NEOSTRING', str.slice(pi)]);
-      if (regex) return tokens;
-      if (!tokens.length) return this.token('STRING', '""');
-      if (tokens[0][0] !== 'NEOSTRING') tokens.unshift(['', '']);
-      if (interpolated = tokens.length > 1) this.token('(', '(');
-      for (i = _i = 0, _len = tokens.length; _i < _len; i = ++_i) {
-        _ref3 = tokens[i], tag = _ref3[0], value = _ref3[1];
-        if (i) this.token('+', '+');
-        if (tag === 'TOKENS') {
-          (_ref4 = this.tokens).push.apply(_ref4, value);
-        } else {
-          this.token('STRING', this.makeString(value, '"', heredoc));
-        }
-      }
-      if (interpolated) this.token(')', ')');
-      return tokens;
-    };
-
-    Lexer.prototype.pair = function(tag) {
-      var size, wanted;
-      if (tag !== (wanted = last(this.ends))) {
-        if ('OUTDENT' !== wanted) this.error("unmatched " + tag);
-        this.indent -= size = last(this.indents);
-        this.outdentToken(size, true);
-        return this.pair(tag);
-      }
-      return this.ends.pop();
-    };
-
-    Lexer.prototype.token = function(tag, value) {
-      return this.tokens.push([tag, value, this.line]);
-    };
-
-    Lexer.prototype.tag = function(index, tag) {
-      var tok;
-      return (tok = last(this.tokens, index)) && (tag ? tok[0] = tag : tok[0]);
-    };
-
-    Lexer.prototype.value = function(index, val) {
-      var tok;
-      return (tok = last(this.tokens, index)) && (val ? tok[1] = val : tok[1]);
-    };
-
-    Lexer.prototype.unfinished = function() {
-      var _ref2;
-      return LINE_CONTINUER.test(this.chunk) || ((_ref2 = this.tag()) === '\\' || _ref2 === '.' || _ref2 === '?.' || _ref2 === 'UNARY' || _ref2 === 'MATH' || _ref2 === '+' || _ref2 === '-' || _ref2 === 'SHIFT' || _ref2 === 'RELATION' || _ref2 === 'COMPARE' || _ref2 === 'LOGIC' || _ref2 === 'THROW' || _ref2 === 'EXTENDS');
-    };
-
-    Lexer.prototype.escapeLines = function(str, heredoc) {
-      return str.replace(MULTILINER, heredoc ? '\\n' : '');
-    };
-
-    Lexer.prototype.makeString = function(body, quote, heredoc) {
-      if (!body) return quote + quote;
-      body = body.replace(/\\([\s\S])/g, function(match, contents) {
-        if (contents === '\n' || contents === quote) {
-          return contents;
-        } else {
-          return match;
-        }
-      });
-      body = body.replace(RegExp("" + quote, "g"), '\\$&');
-      return quote + this.escapeLines(body, heredoc) + quote;
-    };
-
-    Lexer.prototype.error = function(message) {
-      throw SyntaxError("" + message + " on line " + (this.line + 1));
-    };
-
-    return Lexer;
-
-  })();
-
-  JS_KEYWORDS = ['true', 'false', 'null', 'this', 'new', 'delete', 'typeof', 'in', 'instanceof', 'return', 'throw', 'break', 'continue', 'debugger', 'if', 'else', 'switch', 'for', 'while', 'do', 'try', 'catch', 'finally', 'class', 'extends', 'super'];
-
-  COFFEE_KEYWORDS = ['undefined', 'then', 'unless', 'until', 'loop', 'of', 'by', 'when'];
-
-  COFFEE_ALIAS_MAP = {
-    and: '&&',
-    or: '||',
-    is: '==',
-    isnt: '!=',
-    not: '!',
-    yes: 'true',
-    no: 'false',
-    on: 'true',
-    off: 'false'
-  };
-
-  COFFEE_ALIASES = (function() {
-    var _results;
-    _results = [];
-    for (key in COFFEE_ALIAS_MAP) {
-      _results.push(key);
-    }
-    return _results;
-  })();
-
-  COFFEE_KEYWORDS = COFFEE_KEYWORDS.concat(COFFEE_ALIASES);
-
-  RESERVED = ['case', 'default', 'function', 'var', 'void', 'with', 'const', 'let', 'enum', 'export', 'import', 'native', '__hasProp', '__extends', '__slice', '__bind', '__indexOf', 'implements', 'interface', 'let', 'package', 'private', 'protected', 'public', 'static', 'yield'];
-
-  STRICT_PROSCRIBED = ['arguments', 'eval'];
-
-  JS_FORBIDDEN = JS_KEYWORDS.concat(RESERVED).concat(STRICT_PROSCRIBED);
-
-  exports.RESERVED = RESERVED.concat(JS_KEYWORDS).concat(COFFEE_KEYWORDS).concat(STRICT_PROSCRIBED);
-
-  exports.STRICT_PROSCRIBED = STRICT_PROSCRIBED;
-
-  IDENTIFIER = /^([$A-Za-z_\x7f-\uffff][$\w\x7f-\uffff]*)([^\n\S]*:(?!:))?/;
-
-  NUMBER = /^0b[01]+|^0o[0-7]+|^0x[\da-f]+|^\d*\.?\d+(?:e[+-]?\d+)?/i;
-
-  HEREDOC = /^("""|''')([\s\S]*?)(?:\n[^\n\S]*)?\1/;
-
-  OPERATOR = /^(?:[-=]>|[-+*\/%<>&|^!?=]=|>>>=?|([-+:])\1|([&|<>])\2=?|\?\.|\.{2,3})/;
-
-  WHITESPACE = /^[^\n\S]+/;
-
-  COMMENT = /^###([^#][\s\S]*?)(?:###[^\n\S]*|(?:###)?$)|^(?:\s*#(?!##[^#]).*)+/;
-
-  CODE = /^[-=]>/;
-
-  MULTI_DENT = /^(?:\n[^\n\S]*)+/;
-
-  SIMPLESTR = /^'[^\\']*(?:\\.[^\\']*)*'/;
-
-  JSTOKEN = /^`[^\\`]*(?:\\.[^\\`]*)*`/;
-
-  REGEX = /^(\/(?![\s=])[^[\/\n\\]*(?:(?:\\[\s\S]|\[[^\]\n\\]*(?:\\[\s\S][^\]\n\\]*)*])[^[\/\n\\]*)*\/)([imgy]{0,4})(?!\w)/;
-
-  HEREGEX = /^\/{3}([\s\S]+?)\/{3}([imgy]{0,4})(?!\w)/;
-
-  HEREGEX_OMIT = /\s+(?:#.*)?/g;
-
-  MULTILINER = /\n/g;
-
-  HEREDOC_INDENT = /\n+([^\n\S]*)/g;
-
-  HEREDOC_ILLEGAL = /\*\//;
-
-  LINE_CONTINUER = /^\s*(?:,|\??\.(?![.\d])|::)/;
-
-  TRAILING_SPACES = /\s+$/;
-
-  COMPOUND_ASSIGN = ['-=', '+=', '/=', '*=', '%=', '||=', '&&=', '?=', '<<=', '>>=', '>>>=', '&=', '^=', '|='];
-
-  UNARY = ['!', '~', 'NEW', 'TYPEOF', 'DELETE', 'DO'];
-
-  LOGIC = ['&&', '||', '&', '|', '^'];
-
-  SHIFT = ['<<', '>>', '>>>'];
-
-  COMPARE = ['==', '!=', '<', '>', '<=', '>='];
-
-  MATH = ['*', '/', '%'];
-
-  RELATION = ['IN', 'OF', 'INSTANCEOF'];
-
-  BOOL = ['TRUE', 'FALSE', 'NULL', 'UNDEFINED'];
-
-  NOT_REGEX = ['NUMBER', 'REGEX', 'BOOL', '++', '--', ']'];
-
-  NOT_SPACED_REGEX = NOT_REGEX.concat(')', '}', 'THIS', 'IDENTIFIER', 'STRING');
-
-  CALLABLE = ['IDENTIFIER', 'STRING', 'REGEX', ')', ']', '}', '?', '::', '@', 'THIS', 'SUPER'];
-
-  INDEXABLE = CALLABLE.concat('NUMBER', 'BOOL');
-
-  LINE_BREAK = ['INDENT', 'OUTDENT', 'TERMINATOR'];
-
-
-});/**
- * Copyright (c) 2011 Jeremy Ashkenas
- * 
- * 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.
- */
-
-define('ace/mode/coffee/rewriter', ['require', 'exports', 'module' ], function(require, exports, module) {
-// Generated by CoffeeScript 1.2.1-pre
-
-  var BALANCED_PAIRS, EXPRESSION_CLOSE, EXPRESSION_END, EXPRESSION_START, IMPLICIT_BLOCK, IMPLICIT_CALL, IMPLICIT_END, IMPLICIT_FUNC, IMPLICIT_UNSPACED_CALL, INVERSES, LINEBREAKS, SINGLE_CLOSERS, SINGLE_LINERS, left, rite, _i, _len, _ref,
-    __indexOf = [].indexOf || function(item) { for (var i = 0, l = this.length; i < l; i++) { if (i in this && this[i] === item) return i; } return -1; },
-    __slice = [].slice;
-
-  exports.Rewriter = (function() {
-
-    Rewriter.name = 'Rewriter';
-
-    function Rewriter() {}
-
-    Rewriter.prototype.rewrite = function(tokens) {
-      this.tokens = tokens;
-      this.removeLeadingNewlines();
-      this.removeMidExpressionNewlines();
-      this.closeOpenCalls();
-      this.closeOpenIndexes();
-      this.addImplicitIndentation();
-      this.tagPostfixConditionals();
-      this.addImplicitBraces();
-      this.addImplicitParentheses();
-      return this.tokens;
-    };
-
-    Rewriter.prototype.scanTokens = function(block) {
-      var i, token, tokens;
-      tokens = this.tokens;
-      i = 0;
-      while (token = tokens[i]) {
-        i += block.call(this, token, i, tokens);
-      }
-      return true;
-    };
-
-    Rewriter.prototype.detectEnd = function(i, condition, action) {
-      var levels, token, tokens, _ref, _ref1;
-      tokens = this.tokens;
-      levels = 0;
-      while (token = tokens[i]) {
-        if (levels === 0 && condition.call(this, token, i)) {
-          return action.call(this, token, i);
-        }
-        if (!token || levels < 0) return action.call(this, token, i - 1);
-        if (_ref = token[0], __indexOf.call(EXPRESSION_START, _ref) >= 0) {
-          levels += 1;
-        } else if (_ref1 = token[0], __indexOf.call(EXPRESSION_END, _ref1) >= 0) {
-          levels -= 1;
-        }
-        i += 1;
-      }
-      return i - 1;
-    };
-
-    Rewriter.prototype.removeLeadingNewlines = function() {
-      var i, tag, _i, _len, _ref;
-      _ref = this.tokens;
-      for (i = _i = 0, _len = _ref.length; _i < _len; i = ++_i) {
-        tag = _ref[i][0];
-        if (tag !== 'TERMINATOR') break;
-      }
-      if (i) return this.tokens.splice(0, i);
-    };
-
-    Rewriter.prototype.removeMidExpressionNewlines = function() {
-      return this.scanTokens(function(token, i, tokens) {
-        var _ref;
-        if (!(token[0] === 'TERMINATOR' && (_ref = this.tag(i + 1), __indexOf.call(EXPRESSION_CLOSE, _ref) >= 0))) {
-          return 1;
-        }
-        tokens.splice(i, 1);
-        return 0;
-      });
-    };
-
-    Rewriter.prototype.closeOpenCalls = function() {
-      var action, condition;
-      condition = function(token, i) {
-        var _ref;
-        return ((_ref = token[0]) === ')' || _ref === 'CALL_END') || token[0] === 'OUTDENT' && this.tag(i - 1) === ')';
-      };
-      action = function(token, i) {
-        return this.tokens[token[0] === 'OUTDENT' ? i - 1 : i][0] = 'CALL_END';
-      };
-      return this.scanTokens(function(token, i) {
-        if (token[0] === 'CALL_START') this.detectEnd(i + 1, condition, action);
-        return 1;
-      });
-    };
-
-    Rewriter.prototype.closeOpenIndexes = function() {
-      var action, condition;
-      condition = function(token, i) {
-        var _ref;
-        return (_ref = token[0]) === ']' || _ref === 'INDEX_END';
-      };
-      action = function(token, i) {
-        return token[0] = 'INDEX_END';
-      };
-      return this.scanTokens(function(token, i) {
-        if (token[0] === 'INDEX_START') this.detectEnd(i + 1, condition, action);
-        return 1;
-      });
-    };
-
-    Rewriter.prototype.addImplicitBraces = function() {
-      var action, condition, sameLine, stack, start, startIndent, startsLine;
-      stack = [];
-      start = null;
-      startsLine = null;
-      sameLine = true;
-      startIndent = 0;
-      condition = function(token, i) {
-        var one, tag, three, two, _ref, _ref1;
-        _ref = this.tokens.slice(i + 1, (i + 3) + 1 || 9e9), one = _ref[0], two = _ref[1], three = _ref[2];
-        if ('HERECOMMENT' === (one != null ? one[0] : void 0)) return false;
-        tag = token[0];
-        if (__indexOf.call(LINEBREAKS, tag) >= 0) sameLine = false;
-        return (((tag === 'TERMINATOR' || tag === 'OUTDENT') || (__indexOf.call(IMPLICIT_END, tag) >= 0 && sameLine)) && ((!startsLine && this.tag(i - 1) !== ',') || !((two != null ? two[0] : void 0) === ':' || (one != null ? one[0] : void 0) === '@' && (three != null ? three[0] : void 0) === ':'))) || (tag === ',' && one && ((_ref1 = one[0]) !== 'IDENTIFIER' && _ref1 !== 'NUMBER' && _ref1 !== 'STRING' && _ref1 !== '@' && _ref1 !== 'TERMINATOR' && _ref1 !== 'OUTDENT'));
-      };
-      action = function(token, i) {
-        var tok;
-        tok = this.generate('}', '}', token[2]);
-        return this.tokens.splice(i, 0, tok);
-      };
-      return this.scanTokens(function(token, i, tokens) {
-        var ago, idx, prevTag, tag, tok, value, _ref, _ref1;
-        if (_ref = (tag = token[0]), __indexOf.call(EXPRESSION_START, _ref) >= 0) {
-          stack.push([(tag === 'INDENT' && this.tag(i - 1) === '{' ? '{' : tag), i]);
-          return 1;
-        }
-        if (__indexOf.call(EXPRESSION_END, tag) >= 0) {
-          start = stack.pop();
-          return 1;
-        }
-        if (!(tag === ':' && ((ago = this.tag(i - 2)) === ':' || ((_ref1 = stack[stack.length - 1]) != null ? _ref1[0] : void 0) !== '{'))) {
-          return 1;
-        }
-        sameLine = true;
-        stack.push(['{']);
-        idx = ago === '@' ? i - 2 : i - 1;
-        while (this.tag(idx - 2) === 'HERECOMMENT') {
-          idx -= 2;
-        }
-        prevTag = this.tag(idx - 1);
-        startsLine = !prevTag || (__indexOf.call(LINEBREAKS, prevTag) >= 0);
-        value = new String('{');
-        value.generated = true;
-        tok = this.generate('{', value, token[2]);
-        tokens.splice(idx, 0, tok);
-        this.detectEnd(i + 2, condition, action);
-        return 2;
-      });
-    };
-
-    Rewriter.prototype.addImplicitParentheses = function() {
-      var action, condition, noCall, seenControl, seenSingle;
-      noCall = seenSingle = seenControl = false;
-      condition = function(token, i) {
-        var post, tag, _ref, _ref1;
-        tag = token[0];
-        if (!seenSingle && token.fromThen) return true;
-        if (tag === 'IF' || tag === 'ELSE' || tag === 'CATCH' || tag === '->' || tag === '=>' || tag === 'CLASS') {
-          seenSingle = true;
-        }
-        if (tag === 'IF' || tag === 'ELSE' || tag === 'SWITCH' || tag === 'TRY' || tag === '=') {
-          seenControl = true;
-        }
-        if ((tag === '.' || tag === '?.' || tag === '::') && this.tag(i - 1) === 'OUTDENT') {
-          return true;
-        }
-        return !token.generated && this.tag(i - 1) !== ',' && (__indexOf.call(IMPLICIT_END, tag) >= 0 || (tag === 'INDENT' && !seenControl)) && (tag !== 'INDENT' || (((_ref = this.tag(i - 2)) !== 'CLASS' && _ref !== 'EXTENDS') && (_ref1 = this.tag(i - 1), __indexOf.call(IMPLICIT_BLOCK, _ref1) < 0) && !((post = this.tokens[i + 1]) && post.generated && post[0] === '{')));
-      };
-      action = function(token, i) {
-        return this.tokens.splice(i, 0, this.generate('CALL_END', ')', token[2]));
-      };
-      return this.scanTokens(function(token, i, tokens) {
-        var callObject, current, next, prev, tag, _ref, _ref1, _ref2;
-        tag = token[0];
-        if (tag === 'CLASS' || tag === 'IF' || tag === 'FOR' || tag === 'WHILE') {
-          noCall = true;
-        }
-        _ref = tokens.slice(i - 1, (i + 1) + 1 || 9e9), prev = _ref[0], current = _ref[1], next = _ref[2];
-        callObject = !noCall && tag === 'INDENT' && next && next.generated && next[0] === '{' && prev && (_ref1 = prev[0], __indexOf.call(IMPLICIT_FUNC, _ref1) >= 0);
-        seenSingle = false;
-        seenControl = false;
-        if (__indexOf.call(LINEBREAKS, tag) >= 0) noCall = false;
-        if (prev && !prev.spaced && tag === '?') token.call = true;
-        if (token.fromThen) return 1;
-        if (!(callObject || (prev != null ? prev.spaced : void 0) && (prev.call || (_ref2 = prev[0], __indexOf.call(IMPLICIT_FUNC, _ref2) >= 0)) && (__indexOf.call(IMPLICIT_CALL, tag) >= 0 || !(token.spaced || token.newLine) && __indexOf.call(IMPLICIT_UNSPACED_CALL, tag) >= 0))) {
-          return 1;
-        }
-        tokens.splice(i, 0, this.generate('CALL_START', '(', token[2]));
-        this.detectEnd(i + 1, condition, action);
-        if (prev[0] === '?') prev[0] = 'FUNC_EXIST';
-        return 2;
-      });
-    };
-
-    Rewriter.prototype.addImplicitIndentation = function() {
-      var action, condition, indent, outdent, starter;
-      starter = indent = outdent = null;
-      condition = function(token, i) {
-        var _ref;
-        return token[1] !== ';' && (_ref = token[0], __indexOf.call(SINGLE_CLOSERS, _ref) >= 0) && !(token[0] === 'ELSE' && (starter !== 'IF' && starter !== 'THEN'));
-      };
-      action = function(token, i) {
-        return this.tokens.splice((this.tag(i - 1) === ',' ? i - 1 : i), 0, outdent);
-      };
-      return this.scanTokens(function(token, i, tokens) {
-        var tag, _ref, _ref1;
-        tag = token[0];
-        if (tag === 'TERMINATOR' && this.tag(i + 1) === 'THEN') {
-          tokens.splice(i, 1);
-          return 0;
-        }
-        if (tag === 'ELSE' && this.tag(i - 1) !== 'OUTDENT') {
-          tokens.splice.apply(tokens, [i, 0].concat(__slice.call(this.indentation(token))));
-          return 2;
-        }
-        if (tag === 'CATCH' && ((_ref = this.tag(i + 2)) === 'OUTDENT' || _ref === 'TERMINATOR' || _ref === 'FINALLY')) {
-          tokens.splice.apply(tokens, [i + 2, 0].concat(__slice.call(this.indentation(token))));
-          return 4;
-        }
-        if (__indexOf.call(SINGLE_LINERS, tag) >= 0 && this.tag(i + 1) !== 'INDENT' && !(tag === 'ELSE' && this.tag(i + 1) === 'IF')) {
-          starter = tag;
-          _ref1 = this.indentation(token, true), indent = _ref1[0], outdent = _ref1[1];
-          if (starter === 'THEN') indent.fromThen = true;
-          tokens.splice(i + 1, 0, indent);
-          this.detectEnd(i + 2, condition, action);
-          if (tag === 'THEN') tokens.splice(i, 1);
-          return 1;
-        }
-        return 1;
-      });
-    };
-
-    Rewriter.prototype.tagPostfixConditionals = function() {
-      var action, condition, original;
-      original = null;
-      condition = function(token, i) {
-        var _ref;
-        return (_ref = token[0]) === 'TERMINATOR' || _ref === 'INDENT';
-      };
-      action = function(token, i) {
-        if (token[0] !== 'INDENT' || (token.generated && !token.fromThen)) {
-          return original[0] = 'POST_' + original[0];
-        }
-      };
-      return this.scanTokens(function(token, i) {
-        if (token[0] !== 'IF') return 1;
-        original = token;
-        this.detectEnd(i + 1, condition, action);
-        return 1;
-      });
-    };
-
-    Rewriter.prototype.indentation = function(token, implicit) {
-      var indent, outdent;
-      if (implicit == null) implicit = false;
-      indent = ['INDENT', 2, token[2]];
-      outdent = ['OUTDENT', 2, token[2]];
-      if (implicit) indent.generated = outdent.generated = true;
-      return [indent, outdent];
-    };
-
-    Rewriter.prototype.generate = function(tag, value, line) {
-      var tok;
-      tok = [tag, value, line];
-      tok.generated = true;
-      return tok;
-    };
-
-    Rewriter.prototype.tag = function(i) {
-      var _ref;
-      return (_ref = this.tokens[i]) != null ? _ref[0] : void 0;
-    };
-
-    return Rewriter;
-
-  })();
-
-  BALANCED_PAIRS = [['(', ')'], ['[', ']'], ['{', '}'], ['INDENT', 'OUTDENT'], ['CALL_START', 'CALL_END'], ['PARAM_START', 'PARAM_END'], ['INDEX_START', 'INDEX_END']];
-
-  exports.INVERSES = INVERSES = {};
-
-  EXPRESSION_START = [];
-
-  EXPRESSION_END = [];
-
-  for (_i = 0, _len = BALANCED_PAIRS.length; _i < _len; _i++) {
-    _ref = BALANCED_PAIRS[_i], left = _ref[0], rite = _ref[1];
-    EXPRESSION_START.push(INVERSES[rite] = left);
-    EXPRESSION_END.push(INVERSES[left] = rite);
-  }
-
-  EXPRESSION_CLOSE = ['CATCH', 'WHEN', 'ELSE', 'FINALLY'].concat(EXPRESSION_END);
-
-  IMPLICIT_FUNC = ['IDENTIFIER', 'SUPER', ')', 'CALL_END', ']', 'INDEX_END', '@', 'THIS'];
-
-  IMPLICIT_CALL = ['IDENTIFIER', 'NUMBER', 'STRING', 'JS', 'REGEX', 'NEW', 'PARAM_START', 'CLASS', 'IF', 'TRY', 'SWITCH', 'THIS', 'BOOL', 'UNARY', 'SUPER', '@', '->', '=>', '[', '(', '{', '--', '++'];
-
-  IMPLICIT_UNSPACED_CALL = ['+', '-'];
-
-  IMPLICIT_BLOCK = ['->', '=>', '{', '[', ','];
-
-  IMPLICIT_END = ['POST_IF', 'FOR', 'WHILE', 'UNTIL', 'WHEN', 'BY', 'LOOP', 'TERMINATOR'];
-
-  SINGLE_LINERS = ['ELSE', '->', '=>', 'TRY', 'FINALLY', 'THEN'];
-
-  SINGLE_CLOSERS = ['TERMINATOR', 'CATCH', 'FINALLY', 'ELSE', 'OUTDENT', 'LEADING_WHEN'];
-
-  LINEBREAKS = ['TERMINATOR', 'INDENT', 'OUTDENT'];
-
-
-});/**
- * Copyright (c) 2011 Jeremy Ashkenas
- * 
- * 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.
- */
-
-define('ace/mode/coffee/helpers', ['require', 'exports', 'module' ], function(require, exports, module) {
-// Generated by CoffeeScript 1.2.1-pre
-
-  var extend, flatten;
-
-  exports.starts = function(string, literal, start) {
-    return literal === string.substr(start, literal.length);
-  };
-
-  exports.ends = function(string, literal, back) {
-    var len;
-    len = literal.length;
-    return literal === string.substr(string.length - len - (back || 0), len);
-  };
-
-  exports.compact = function(array) {
-    var item, _i, _len, _results;
-    _results = [];
-    for (_i = 0, _len = array.length; _i < _len; _i++) {
-      item = array[_i];
-      if (item) _results.push(item);
-    }
-    return _results;
-  };
-
-  exports.count = function(string, substr) {
-    var num, pos;
-    num = pos = 0;
-    if (!substr.length) return 1 / 0;
-    while (pos = 1 + string.indexOf(substr, pos)) {
-      num++;
-    }
-    return num;
-  };
-
-  exports.merge = function(options, overrides) {
-    return extend(extend({}, options), overrides);
-  };
-
-  extend = exports.extend = function(object, properties) {
-    var key, val;
-    for (key in properties) {
-      val = properties[key];
-      object[key] = val;
-    }
-    return object;
-  };
-
-  exports.flatten = flatten = function(array) {
-    var element, flattened, _i, _len;
-    flattened = [];
-    for (_i = 0, _len = array.length; _i < _len; _i++) {
-      element = array[_i];
-      if (element instanceof Array) {
-        flattened = flattened.concat(flatten(element));
-      } else {
-        flattened.push(element);
-      }
-    }
-    return flattened;
-  };
-
-  exports.del = function(obj, key) {
-    var val;
-    val = obj[key];
-    delete obj[key];
-    return val;
-  };
-
-  exports.last = function(array, back) {
-    return array[array.length - (back || 0) - 1];
-  };
-
-
-});/**
- * Copyright (c) 2011 Jeremy Ashkenas
- * 
- * 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.
- */
-
-define('ace/mode/coffee/parser', ['require', 'exports', 'module' ], function(require, exports, module) {
-/* Jison generated parser */
-
-undefined
-var parser = {trace: function trace() { },
-yy: {},
-symbols_: {"error":2,"Root":3,"Body":4,"Block":5,"TERMINATOR":6,"Line":7,"Expression":8,"Statement":9,"Return":10,"Comment":11,"STATEMENT":12,"Value":13,"Invocation":14,"Code":15,"Operation":16,"Assign":17,"If":18,"Try":19,"While":20,"For":21,"Switch":22,"Class":23,"Throw":24,"INDENT":25,"OUTDENT":26,"Identifier":27,"IDENTIFIER":28,"AlphaNumeric":29,"NUMBER":30,"STRING":31,"Literal":32,"JS":33,"REGEX":34,"DEBUGGER":35,"BOOL":36,"Assignable":37,"=":38,"AssignObj":39,"ObjAssignable":40,":":41,"ThisProperty":42,"RETURN":43,"HERECOMMENT":44,"PARAM_START":45,"ParamList":46,"PARAM_END":47,"FuncGlyph":48,"->":49,"=>":50,"OptComma":51,",":52,"Param":53,"ParamVar":54,"...":55,"Array":56,"Object":57,"Splat":58,"SimpleAssignable":59,"Accessor":60,"Parenthetical":61,"Range":62,"This":63,".":64,"?.":65,"::":66,"Index":67,"INDEX_START":68,"IndexValue":69,"INDEX_END":70,"INDEX_SOAK":71,"Slice":72,"{":73,"AssignList":74,"}":75,"CLASS":76,"EXTENDS":77,"OptFuncExist":78,"Arguments":79,"SUPER":80,"FUNC_EXIST":81,"CALL_START":82,"CALL_END":83,"ArgList":84,"THIS":85,"@":86,"[":87,"]":88,"RangeDots":89,"..":90,"Arg":91,"SimpleArgs":92,"TRY":93,"Catch":94,"FINALLY":95,"CATCH":96,"THROW":97,"(":98,")":99,"WhileSource":100,"WHILE":101,"WHEN":102,"UNTIL":103,"Loop":104,"LOOP":105,"ForBody":106,"FOR":107,"ForStart":108,"ForSource":109,"ForVariables":110,"OWN":111,"ForValue":112,"FORIN":113,"FOROF":114,"BY":115,"SWITCH":116,"Whens":117,"ELSE":118,"When":119,"LEADING_WHEN":120,"IfBlock":121,"IF":122,"POST_IF":123,"UNARY":124,"-":125,"+":126,"--":127,"++":128,"?":129,"MATH":130,"SHIFT":131,"COMPARE":132,"LOGIC":133,"RELATION":134,"COMPOUND_ASSIGN":135,"$accept":0,"$end":1},
-terminals_: {2:"error",6:"TERMINATOR",12:"STATEMENT",25:"INDENT",26:"OUTDENT",28:"IDENTIFIER",30:"NUMBER",31:"STRING",33:"JS",34:"REGEX",35:"DEBUGGER",36:"BOOL",38:"=",41:":",43:"RETURN",44:"HERECOMMENT",45:"PARAM_START",47:"PARAM_END",49:"->",50:"=>",52:",",55:"...",64:".",65:"?.",66:"::",68:"INDEX_START",70:"INDEX_END",71:"INDEX_SOAK",73:"{",75:"}",76:"CLASS",77:"EXTENDS",80:"SUPER",81:"FUNC_EXIST",82:"CALL_START",83:"CALL_END",85:"THIS",86:"@",87:"[",88:"]",90:"..",93:"TRY",95:"FINALLY",96:"CATCH",97:"THROW",98:"(",99:")",101:"WHILE",102:"WHEN",103:"UNTIL",105:"LOOP",107:"FOR",111:"OWN",113:"FORIN",114:"FOROF",115:"BY",116:"SWITCH",118:"ELSE",120:"LEADING_WHEN",122:"IF",123:"POST_IF",124:"UNARY",125:"-",126:"+",127:"--",128:"++",129:"?",130:"MATH",131:"SHIFT",132:"COMPARE",133:"LOGIC",134:"RELATION",135:"COMPOUND_ASSIGN"},
-productions_: [0,[3,0],[3,1],[3,2],[4,1],[4,3],[4,2],[7,1],[7,1],[9,1],[9,1],[9,1],[8,1],[8,1],[8,1],[8,1],[8,1],[8,1],[8,1],[8,1],[8,1],[8,1],[8,1],[8,1],[5,2],[5,3],[27,1],[29,1],[29,1],[32,1],[32,1],[32,1],[32,1],[32,1],[17,3],[17,4],[17,5],[39,1],[39,3],[39,5],[39,1],[40,1],[40,1],[40,1],[10,2],[10,1],[11,1],[15,5],[15,2],[48,1],[48,1],[51,0],[51,1],[46,0],[46,1],[46,3],[53,1],[53,2],[53,3],[54,1],[54,1],[54,1],[54,1],[58,2],[59,1],[59,2],[59,2],[59,1],[37,1],[37,1],[37,1],[13,1],[13,1],[13,1],[13,1],[13,1],[60,2],[60,2],[60,2],[60,1],[60,1],[67,3],[67,2],[69,1],[69,1],[57,4],[74,0],[74,1],[74,3],[74,4],[74,6],[23,1],[23,2],[23,3],[23,4],[23,2],[23,3],[23,4],[23,5],[14,3],[14,3],[14,1],[14,2],[78,0],[78,1],[79,2],[79,4],[63,1],[63,1],[42,2],[56,2],[56,4],[89,1],[89,1],[62,5],[72,3],[72,2],[72,2],[72,1],[84,1],[84,3],[84,4],[84,4],[84,6],[91,1],[91,1],[92,1],[92,3],[19,2],[19,3],[19,4],[19,5],[94,3],[24,2],[61,3],[61,5],[100,2],[100,4],[100,2],[100,4],[20,2],[20,2],[20,2],[20,1],[104,2],[104,2],[21,2],[21,2],[21,2],[106,2],[106,2],[108,2],[108,3],[112,1],[112,1],[112,1],[110,1],[110,3],[109,2],[109,2],[109,4],[109,4],[109,4],[109,6],[109,6],[22,5],[22,7],[22,4],[22,6],[117,1],[117,2],[119,3],[119,4],[121,3],[121,5],[18,1],[18,3],[18,3],[18,3],[16,2],[16,2],[16,2],[16,2],[16,2],[16,2],[16,2],[16,2],[16,3],[16,3],[16,3],[16,3],[16,3],[16,3],[16,3],[16,3],[16,5],[16,3]],
-performAction: function anonymous(yytext,yyleng,yylineno,yy,yystate,$$,_$) {
-
-var $0 = $$.length - 1;
-switch (yystate) {
-case 1:return this.$ = new yy.Block;
-break;
-case 2:return this.$ = $$[$0];
-break;
-case 3:return this.$ = $$[$0-1];
-break;
-case 4:this.$ = yy.Block.wrap([$$[$0]]);
-break;
-case 5:this.$ = $$[$0-2].push($$[$0]);
-break;
-case 6:this.$ = $$[$0-1];
-break;
-case 7:this.$ = $$[$0];
-break;
-case 8:this.$ = $$[$0];
-break;
-case 9:this.$ = $$[$0];
-break;
-case 10:this.$ = $$[$0];
-break;
-case 11:this.$ = new yy.Literal($$[$0]);
-break;
-case 12:this.$ = $$[$0];
-break;
-case 13:this.$ = $$[$0];
-break;
-case 14:this.$ = $$[$0];
-break;
-case 15:this.$ = $$[$0];
-break;
-case 16:this.$ = $$[$0];
-break;
-case 17:this.$ = $$[$0];
-break;
-case 18:this.$ = $$[$0];
-break;
-case 19:this.$ = $$[$0];
-break;
-case 20:this.$ = $$[$0];
-break;
-case 21:this.$ = $$[$0];
-break;
-case 22:this.$ = $$[$0];
-break;
-case 23:this.$ = $$[$0];
-break;
-case 24:this.$ = new yy.Block;
-break;
-case 25:this.$ = $$[$0-1];
-break;
-case 26:this.$ = new yy.Literal($$[$0]);
-break;
-case 27:this.$ = new yy.Literal($$[$0]);
-break;
-case 28:this.$ = new yy.Literal($$[$0]);
-break;
-case 29:this.$ = $$[$0];
-break;
-case 30:this.$ = new yy.Literal($$[$0]);
-break;
-case 31:this.$ = new yy.Literal($$[$0]);
-break;
-case 32:this.$ = new yy.Literal($$[$0]);
-break;
-case 33:this.$ = (function () {
-        var val;
-        val = new yy.Literal($$[$0]);
-        if ($$[$0] === 'undefined') val.isUndefined = true;
-        return val;
-      }());
-break;
-case 34:this.$ = new yy.Assign($$[$0-2], $$[$0]);
-break;
-case 35:this.$ = new yy.Assign($$[$0-3], $$[$0]);
-break;
-case 36:this.$ = new yy.Assign($$[$0-4], $$[$0-1]);
-break;
-case 37:this.$ = new yy.Value($$[$0]);
-break;
-case 38:this.$ = new yy.Assign(new yy.Value($$[$0-2]), $$[$0], 'object');
-break;
-case 39:this.$ = new yy.Assign(new yy.Value($$[$0-4]), $$[$0-1], 'object');
-break;
-case 40:this.$ = $$[$0];
-break;
-case 41:this.$ = $$[$0];
-break;
-case 42:this.$ = $$[$0];
-break;
-case 43:this.$ = $$[$0];
-break;
-case 44:this.$ = new yy.Return($$[$0]);
-break;
-case 45:this.$ = new yy.Return;
-break;
-case 46:this.$ = new yy.Comment($$[$0]);
-break;
-case 47:this.$ = new yy.Code($$[$0-3], $$[$0], $$[$0-1]);
-break;
-case 48:this.$ = new yy.Code([], $$[$0], $$[$0-1]);
-break;
-case 49:this.$ = 'func';
-break;
-case 50:this.$ = 'boundfunc';
-break;
-case 51:this.$ = $$[$0];
-break;
-case 52:this.$ = $$[$0];
-break;
-case 53:this.$ = [];
-break;
-case 54:this.$ = [$$[$0]];
-break;
-case 55:this.$ = $$[$0-2].concat($$[$0]);
-break;
-case 56:this.$ = new yy.Param($$[$0]);
-break;
-case 57:this.$ = new yy.Param($$[$0-1], null, true);
-break;
-case 58:this.$ = new yy.Param($$[$0-2], $$[$0]);
-break;
-case 59:this.$ = $$[$0];
-break;
-case 60:this.$ = $$[$0];
-break;
-case 61:this.$ = $$[$0];
-break;
-case 62:this.$ = $$[$0];
-break;
-case 63:this.$ = new yy.Splat($$[$0-1]);
-break;
-case 64:this.$ = new yy.Value($$[$0]);
-break;
-case 65:this.$ = $$[$0-1].add($$[$0]);
-break;
-case 66:this.$ = new yy.Value($$[$0-1], [].concat($$[$0]));
-break;
-case 67:this.$ = $$[$0];
-break;
-case 68:this.$ = $$[$0];
-break;
-case 69:this.$ = new yy.Value($$[$0]);
-break;
-case 70:this.$ = new yy.Value($$[$0]);
-break;
-case 71:this.$ = $$[$0];
-break;
-case 72:this.$ = new yy.Value($$[$0]);
-break;
-case 73:this.$ = new yy.Value($$[$0]);
-break;
-case 74:this.$ = new yy.Value($$[$0]);
-break;
-case 75:this.$ = $$[$0];
-break;
-case 76:this.$ = new yy.Access($$[$0]);
-break;
-case 77:this.$ = new yy.Access($$[$0], 'soak');
-break;
-case 78:this.$ = [new yy.Access(new yy.Literal('prototype')), new yy.Access($$[$0])];
-break;
-case 79:this.$ = new yy.Access(new yy.Literal('prototype'));
-break;
-case 80:this.$ = $$[$0];
-break;
-case 81:this.$ = $$[$0-1];
-break;
-case 82:this.$ = yy.extend($$[$0], {
-          soak: true
-        });
-break;
-case 83:this.$ = new yy.Index($$[$0]);
-break;
-case 84:this.$ = new yy.Slice($$[$0]);
-break;
-case 85:this.$ = new yy.Obj($$[$0-2], $$[$0-3].generated);
-break;
-case 86:this.$ = [];
-break;
-case 87:this.$ = [$$[$0]];
-break;
-case 88:this.$ = $$[$0-2].concat($$[$0]);
-break;
-case 89:this.$ = $$[$0-3].concat($$[$0]);
-break;
-case 90:this.$ = $$[$0-5].concat($$[$0-2]);
-break;
-case 91:this.$ = new yy.Class;
-break;
-case 92:this.$ = new yy.Class(null, null, $$[$0]);
-break;
-case 93:this.$ = new yy.Class(null, $$[$0]);
-break;
-case 94:this.$ = new yy.Class(null, $$[$0-1], $$[$0]);
-break;
-case 95:this.$ = new yy.Class($$[$0]);
-break;
-case 96:this.$ = new yy.Class($$[$0-1], null, $$[$0]);
-break;
-case 97:this.$ = new yy.Class($$[$0-2], $$[$0]);
-break;
-case 98:this.$ = new yy.Class($$[$0-3], $$[$0-1], $$[$0]);
-break;
-case 99:this.$ = new yy.Call($$[$0-2], $$[$0], $$[$0-1]);
-break;
-case 100:this.$ = new yy.Call($$[$0-2], $$[$0], $$[$0-1]);
-break;
-case 101:this.$ = new yy.Call('super', [new yy.Splat(new yy.Literal('arguments'))]);
-break;
-case 102:this.$ = new yy.Call('super', $$[$0]);
-break;
-case 103:this.$ = false;
-break;
-case 104:this.$ = true;
-break;
-case 105:this.$ = [];
-break;
-case 106:this.$ = $$[$0-2];
-break;
-case 107:this.$ = new yy.Value(new yy.Literal('this'));
-break;
-case 108:this.$ = new yy.Value(new yy.Literal('this'));
-break;
-case 109:this.$ = new yy.Value(new yy.Literal('this'), [new yy.Access($$[$0])], 'this');
-break;
-case 110:this.$ = new yy.Arr([]);
-break;
-case 111:this.$ = new yy.Arr($$[$0-2]);
-break;
-case 112:this.$ = 'inclusive';
-break;
-case 113:this.$ = 'exclusive';
-break;
-case 114:this.$ = new yy.Range($$[$0-3], $$[$0-1], $$[$0-2]);
-break;
-case 115:this.$ = new yy.Range($$[$0-2], $$[$0], $$[$0-1]);
-break;
-case 116:this.$ = new yy.Range($$[$0-1], null, $$[$0]);
-break;
-case 117:this.$ = new yy.Range(null, $$[$0], $$[$0-1]);
-break;
-case 118:this.$ = new yy.Range(null, null, $$[$0]);
-break;
-case 119:this.$ = [$$[$0]];
-break;
-case 120:this.$ = $$[$0-2].concat($$[$0]);
-break;
-case 121:this.$ = $$[$0-3].concat($$[$0]);
-break;
-case 122:this.$ = $$[$0-2];
-break;
-case 123:this.$ = $$[$0-5].concat($$[$0-2]);
-break;
-case 124:this.$ = $$[$0];
-break;
-case 125:this.$ = $$[$0];
-break;
-case 126:this.$ = $$[$0];
-break;
-case 127:this.$ = [].concat($$[$0-2], $$[$0]);
-break;
-case 128:this.$ = new yy.Try($$[$0]);
-break;
-case 129:this.$ = new yy.Try($$[$0-1], $$[$0][0], $$[$0][1]);
-break;
-case 130:this.$ = new yy.Try($$[$0-2], null, null, $$[$0]);
-break;
-case 131:this.$ = new yy.Try($$[$0-3], $$[$0-2][0], $$[$0-2][1], $$[$0]);
-break;
-case 132:this.$ = [$$[$0-1], $$[$0]];
-break;
-case 133:this.$ = new yy.Throw($$[$0]);
-break;
-case 134:this.$ = new yy.Parens($$[$0-1]);
-break;
-case 135:this.$ = new yy.Parens($$[$0-2]);
-break;
-case 136:this.$ = new yy.While($$[$0]);
-break;
-case 137:this.$ = new yy.While($$[$0-2], {
-          guard: $$[$0]
-        });
-break;
-case 138:this.$ = new yy.While($$[$0], {
-          invert: true
-        });
-break;
-case 139:this.$ = new yy.While($$[$0-2], {
-          invert: true,
-          guard: $$[$0]
-        });
-break;
-case 140:this.$ = $$[$0-1].addBody($$[$0]);
-break;
-case 141:this.$ = $$[$0].addBody(yy.Block.wrap([$$[$0-1]]));
-break;
-case 142:this.$ = $$[$0].addBody(yy.Block.wrap([$$[$0-1]]));
-break;
-case 143:this.$ = $$[$0];
-break;
-case 144:this.$ = new yy.While(new yy.Literal('true')).addBody($$[$0]);
-break;
-case 145:this.$ = new yy.While(new yy.Literal('true')).addBody(yy.Block.wrap([$$[$0]]));
-break;
-case 146:this.$ = new yy.For($$[$0-1], $$[$0]);
-break;
-case 147:this.$ = new yy.For($$[$0-1], $$[$0]);
-break;
-case 148:this.$ = new yy.For($$[$0], $$[$0-1]);
-break;
-case 149:this.$ = {
-          source: new yy.Value($$[$0])
-        };
-break;
-case 150:this.$ = (function () {
-        $$[$0].own = $$[$0-1].own;
-        $$[$0].name = $$[$0-1][0];
-        $$[$0].index = $$[$0-1][1];
-        return $$[$0];
-      }());
-break;
-case 151:this.$ = $$[$0];
-break;
-case 152:this.$ = (function () {
-        $$[$0].own = true;
-        return $$[$0];
-      }());
-break;
-case 153:this.$ = $$[$0];
-break;
-case 154:this.$ = new yy.Value($$[$0]);
-break;
-case 155:this.$ = new yy.Value($$[$0]);
-break;
-case 156:this.$ = [$$[$0]];
-break;
-case 157:this.$ = [$$[$0-2], $$[$0]];
-break;
-case 158:this.$ = {
-          source: $$[$0]
-        };
-break;
-case 159:this.$ = {
-          source: $$[$0],
-          object: true
-        };
-break;
-case 160:this.$ = {
-          source: $$[$0-2],
-          guard: $$[$0]
-        };
-break;
-case 161:this.$ = {
-          source: $$[$0-2],
-          guard: $$[$0],
-          object: true
-        };
-break;
-case 162:this.$ = {
-          source: $$[$0-2],
-          step: $$[$0]
-        };
-break;
-case 163:this.$ = {
-          source: $$[$0-4],
-          guard: $$[$0-2],
-          step: $$[$0]
-        };
-break;
-case 164:this.$ = {
-          source: $$[$0-4],
-          step: $$[$0-2],
-          guard: $$[$0]
-        };
-break;
-case 165:this.$ = new yy.Switch($$[$0-3], $$[$0-1]);
-break;
-case 166:this.$ = new yy.Switch($$[$0-5], $$[$0-3], $$[$0-1]);
-break;
-case 167:this.$ = new yy.Switch(null, $$[$0-1]);
-break;
-case 168:this.$ = new yy.Switch(null, $$[$0-3], $$[$0-1]);
-break;
-case 169:this.$ = $$[$0];
-break;
-case 170:this.$ = $$[$0-1].concat($$[$0]);
-break;
-case 171:this.$ = [[$$[$0-1], $$[$0]]];
-break;
-case 172:this.$ = [[$$[$0-2], $$[$0-1]]];
-break;
-case 173:this.$ = new yy.If($$[$0-1], $$[$0], {
-          type: $$[$0-2]
-        });
-break;
-case 174:this.$ = $$[$0-4].addElse(new yy.If($$[$0-1], $$[$0], {
-          type: $$[$0-2]
-        }));
-break;
-case 175:this.$ = $$[$0];
-break;
-case 176:this.$ = $$[$0-2].addElse($$[$0]);
-break;
-case 177:this.$ = new yy.If($$[$0], yy.Block.wrap([$$[$0-2]]), {
-          type: $$[$0-1],
-          statement: true
-        });
-break;
-case 178:this.$ = new yy.If($$[$0], yy.Block.wrap([$$[$0-2]]), {
-          type: $$[$0-1],
-          statement: true
-        });
-break;
-case 179:this.$ = new yy.Op($$[$0-1], $$[$0]);
-break;
-case 180:this.$ = new yy.Op('-', $$[$0]);
-break;
-case 181:this.$ = new yy.Op('+', $$[$0]);
-break;
-case 182:this.$ = new yy.Op('--', $$[$0]);
-break;
-case 183:this.$ = new yy.Op('++', $$[$0]);
-break;
-case 184:this.$ = new yy.Op('--', $$[$0-1], null, true);
-break;
-case 185:this.$ = new yy.Op('++', $$[$0-1], null, true);
-break;
-case 186:this.$ = new yy.Existence($$[$0-1]);
-break;
-case 187:this.$ = new yy.Op('+', $$[$0-2], $$[$0]);
-break;
-case 188:this.$ = new yy.Op('-', $$[$0-2], $$[$0]);
-break;
-case 189:this.$ = new yy.Op($$[$0-1], $$[$0-2], $$[$0]);
-break;
-case 190:this.$ = new yy.Op($$[$0-1], $$[$0-2], $$[$0]);
-break;
-case 191:this.$ = new yy.Op($$[$0-1], $$[$0-2], $$[$0]);
-break;
-case 192:this.$ = new yy.Op($$[$0-1], $$[$0-2], $$[$0]);
-break;
-case 193:this.$ = (function () {
-        if ($$[$0-1].charAt(0) === '!') {
-          return new yy.Op($$[$0-1].slice(1), $$[$0-2], $$[$0]).invert();
-        } else {
-          return new yy.Op($$[$0-1], $$[$0-2], $$[$0]);
-        }
-      }());
-break;
-case 194:this.$ = new yy.Assign($$[$0-2], $$[$0], $$[$0-1]);
-break;
-case 195:this.$ = new yy.Assign($$[$0-4], $$[$0-1], $$[$0-3]);
-break;
-case 196:this.$ = new yy.Extends($$[$0-2], $$[$0]);
-break;
-}
-},
-table: [{1:[2,1],3:1,4:2,5:3,7:4,8:6,9:7,10:20,11:21,12:[1,22],13:8,14:9,15:10,16:11,17:12,18:13,19:14,20:15,21:16,22:17,23:18,24:19,25:[1,5],27:60,28:[1,71],29:49,30:[1,69],31:[1,70],32:24,33:[1,50],34:[1,51],35:[1,52],36:[1,53],37:23,42:61,43:[1,45],44:[1,46],45:[1,29],48:30,49:[1,58],50:[1,59],56:47,57:48,59:36,61:25,62:26,63:27,73:[1,68],76:[1,43],80:[1,28],85:[1,56],86:[1,57],87:[1,55],93:[1,38],97:[1,44],98:[1,54],100:39,101:[1,63],103:[1,64],104:40,105:[1,65],106:41,107:[1,66],108:67,116:[1,42],121:37,122:[1,62],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{1:[3]},{1:[2,2],6:[1,72]},{6:[1,73]},{1:[2,4],6:[2,4],26:[2,4],99:[2,4]},{4:75,7:4,8:6,9:7,10:20,11:21,12:[1,22],13:8,14:9,15:10,16:11,17:12,18:13,19:14,20:15,21:16,22:17,23:18,24:19,26:[1,74],27:60,28:[1,71],29:49,30:[1,69],31:[1,70],32:24,33:[1,50],34:[1,51],35:[1,52],36:[1,53],37:23,42:61,43:[1,45],44:[1,46],45:[1,29],48:30,49:[1,58],50:[1,59],56:47,57:48,59:36,61:25,62:26,63:27,73:[1,68],76:[1,43],80:[1,28],85:[1,56],86:[1,57],87:[1,55],93:[1,38],97:[1,44],98:[1,54],100:39,101:[1,63],103:[1,64],104:40,105:[1,65],106:41,107:[1,66],108:67,116:[1,42],121:37,122:[1,62],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{1:[2,7],6:[2,7],26:[2,7],99:[2,7],100:85,101:[1,63],103:[1,64],106:86,107:[1,66],108:67,123:[1,84],125:[1,78],126:[1,77],129:[1,76],130:[1,79],131:[1,80],132:[1,81],133:[1,82],134:[1,83]},{1:[2,8],6:[2,8],26:[2,8],99:[2,8],100:88,101:[1,63],103:[1,64],106:89,107:[1,66],108:67,123:[1,87]},{1:[2,12],6:[2,12],25:[2,12],26:[2,12],47:[2,12],52:[2,12],55:[2,12],60:91,64:[1,93],65:[1,94],66:[1,95],67:96,68:[1,97],70:[2,12],71:[1,98],75:[2,12],78:90,81:[1,92],82:[2,103],83:[2,12],88:[2,12],90:[2,12],99:[2,12],101:[2,12],102:[2,12],103:[2,12],107:[2,12],115:[2,12],123:[2,12],125:[2,12],126:[2,12],129:[2,12],130:[2,12],131:[2,12],132:[2,12],133:[2,12],134:[2,12]},{1:[2,13],6:[2,13],25:[2,13],26:[2,13],47:[2,13],52:[2,13],55:[2,13],60:100,64:[1,93],65:[1,94],66:[1,95],67:96,68:[1,97],70:[2,13],71:[1,98],75:[2,13],78:99,81:[1,92],82:[2,103],83:[2,13],88:[2,13],90:[2,13],99:[2,13],101:[2,13],102:[2,13],103:[2,13],107:[2,13],115:[2,13],123:[2,13],125:[2,13],126:[2,13],129:[2,13],130:[2,13],131:[2,13],132:[2,13],133:[2,13],134:[2,13]},{1:[2,14],6:[2,14],25:[2,14],26:[2,14],47:[2,14],52:[2,14],55:[2,14],70:[2,14],75:[2,14],83:[2,14],88:[2,14],90:[2,14],99:[2,14],101:[2,14],102:[2,14],103:[2,14],107:[2,14],115:[2,14],123:[2,14],125:[2,14],126:[2,14],129:[2,14],130:[2,14],131:[2,14],132:[2,14],133:[2,14],134:[2,14]},{1:[2,15],6:[2,15],25:[2,15],26:[2,15],47:[2,15],52:[2,15],55:[2,15],70:[2,15],75:[2,15],83:[2,15],88:[2,15],90:[2,15],99:[2,15],101:[2,15],102:[2,15],103:[2,15],107:[2,15],115:[2,15],123:[2,15],125:[2,15],126:[2,15],129:[2,15],130:[2,15],131:[2,15],132:[2,15],133:[2,15],134:[2,15]},{1:[2,16],6:[2,16],25:[2,16],26:[2,16],47:[2,16],52:[2,16],55:[2,16],70:[2,16],75:[2,16],83:[2,16],88:[2,16],90:[2,16],99:[2,16],101:[2,16],102:[2,16],103:[2,16],107:[2,16],115:[2,16],123:[2,16],125:[2,16],126:[2,16],129:[2,16],130:[2,16],131:[2,16],132:[2,16],133:[2,16],134:[2,16]},{1:[2,17],6:[2,17],25:[2,17],26:[2,17],47:[2,17],52:[2,17],55:[2,17],70:[2,17],75:[2,17],83:[2,17],88:[2,17],90:[2,17],99:[2,17],101:[2,17],102:[2,17],103:[2,17],107:[2,17],115:[2,17],123:[2,17],125:[2,17],126:[2,17],129:[2,17],130:[2,17],131:[2,17],132:[2,17],133:[2,17],134:[2,17]},{1:[2,18],6:[2,18],25:[2,18],26:[2,18],47:[2,18],52:[2,18],55:[2,18],70:[2,18],75:[2,18],83:[2,18],88:[2,18],90:[2,18],99:[2,18],101:[2,18],102:[2,18],103:[2,18],107:[2,18],115:[2,18],123:[2,18],125:[2,18],126:[2,18],129:[2,18],130:[2,18],131:[2,18],132:[2,18],133:[2,18],134:[2,18]},{1:[2,19],6:[2,19],25:[2,19],26:[2,19],47:[2,19],52:[2,19],55:[2,19],70:[2,19],75:[2,19],83:[2,19],88:[2,19],90:[2,19],99:[2,19],101:[2,19],102:[2,19],103:[2,19],107:[2,19],115:[2,19],123:[2,19],125:[2,19],126:[2,19],129:[2,19],130:[2,19],131:[2,19],132:[2,19],133:[2,19],134:[2,19]},{1:[2,20],6:[2,20],25:[2,20],26:[2,20],47:[2,20],52:[2,20],55:[2,20],70:[2,20],75:[2,20],83:[2,20],88:[2,20],90:[2,20],99:[2,20],101:[2,20],102:[2,20],103:[2,20],107:[2,20],115:[2,20],123:[2,20],125:[2,20],126:[2,20],129:[2,20],130:[2,20],131:[2,20],132:[2,20],133:[2,20],134:[2,20]},{1:[2,21],6:[2,21],25:[2,21],26:[2,21],47:[2,21],52:[2,21],55:[2,21],70:[2,21],75:[2,21],83:[2,21],88:[2,21],90:[2,21],99:[2,21],101:[2,21],102:[2,21],103:[2,21],107:[2,21],115:[2,21],123:[2,21],125:[2,21],126:[2,21],129:[2,21],130:[2,21],131:[2,21],132:[2,21],133:[2,21],134:[2,21]},{1:[2,22],6:[2,22],25:[2,22],26:[2,22],47:[2,22],52:[2,22],55:[2,22],70:[2,22],75:[2,22],83:[2,22],88:[2,22],90:[2,22],99:[2,22],101:[2,22],102:[2,22],103:[2,22],107:[2,22],115:[2,22],123:[2,22],125:[2,22],126:[2,22],129:[2,22],130:[2,22],131:[2,22],132:[2,22],133:[2,22],134:[2,22]},{1:[2,23],6:[2,23],25:[2,23],26:[2,23],47:[2,23],52:[2,23],55:[2,23],70:[2,23],75:[2,23],83:[2,23],88:[2,23],90:[2,23],99:[2,23],101:[2,23],102:[2,23],103:[2,23],107:[2,23],115:[2,23],123:[2,23],125:[2,23],126:[2,23],129:[2,23],130:[2,23],131:[2,23],132:[2,23],133:[2,23],134:[2,23]},{1:[2,9],6:[2,9],26:[2,9],99:[2,9],101:[2,9],103:[2,9],107:[2,9],123:[2,9]},{1:[2,10],6:[2,10],26:[2,10],99:[2,10],101:[2,10],103:[2,10],107:[2,10],123:[2,10]},{1:[2,11],6:[2,11],26:[2,11],99:[2,11],101:[2,11],103:[2,11],107:[2,11],123:[2,11]},{1:[2,71],6:[2,71],25:[2,71],26:[2,71],38:[1,101],47:[2,71],52:[2,71],55:[2,71],64:[2,71],65:[2,71],66:[2,71],68:[2,71],70:[2,71],71:[2,71],75:[2,71],81:[2,71],82:[2,71],83:[2,71],88:[2,71],90:[2,71],99:[2,71],101:[2,71],102:[2,71],103:[2,71],107:[2,71],115:[2,71],123:[2,71],125:[2,71],126:[2,71],129:[2,71],130:[2,71],131:[2,71],132:[2,71],133:[2,71],134:[2,71]},{1:[2,72],6:[2,72],25:[2,72],26:[2,72],47:[2,72],52:[2,72],55:[2,72],64:[2,72],65:[2,72],66:[2,72],68:[2,72],70:[2,72],71:[2,72],75:[2,72],81:[2,72],82:[2,72],83:[2,72],88:[2,72],90:[2,72],99:[2,72],101:[2,72],102:[2,72],103:[2,72],107:[2,72],115:[2,72],123:[2,72],125:[2,72],126:[2,72],129:[2,72],130:[2,72],131:[2,72],132:[2,72],133:[2,72],134:[2,72]},{1:[2,73],6:[2,73],25:[2,73],26:[2,73],47:[2,73],52:[2,73],55:[2,73],64:[2,73],65:[2,73],66:[2,73],68:[2,73],70:[2,73],71:[2,73],75:[2,73],81:[2,73],82:[2,73],83:[2,73],88:[2,73],90:[2,73],99:[2,73],101:[2,73],102:[2,73],103:[2,73],107:[2,73],115:[2,73],123:[2,73],125:[2,73],126:[2,73],129:[2,73],130:[2,73],131:[2,73],132:[2,73],133:[2,73],134:[2,73]},{1:[2,74],6:[2,74],25:[2,74],26:[2,74],47:[2,74],52:[2,74],55:[2,74],64:[2,74],65:[2,74],66:[2,74],68:[2,74],70:[2,74],71:[2,74],75:[2,74],81:[2,74],82:[2,74],83:[2,74],88:[2,74],90:[2,74],99:[2,74],101:[2,74],102:[2,74],103:[2,74],107:[2,74],115:[2,74],123:[2,74],125:[2,74],126:[2,74],129:[2,74],130:[2,74],131:[2,74],132:[2,74],133:[2,74],134:[2,74]},{1:[2,75],6:[2,75],25:[2,75],26:[2,75],47:[2,75],52:[2,75],55:[2,75],64:[2,75],65:[2,75],66:[2,75],68:[2,75],70:[2,75],71:[2,75],75:[2,75],81:[2,75],82:[2,75],83:[2,75],88:[2,75],90:[2,75],99:[2,75],101:[2,75],102:[2,75],103:[2,75],107:[2,75],115:[2,75],123:[2,75],125:[2,75],126:[2,75],129:[2,75],130:[2,75],131:[2,75],132:[2,75],133:[2,75],134:[2,75]},{1:[2,101],6:[2,101],25:[2,101],26:[2,101],47:[2,101],52:[2,101],55:[2,101],64:[2,101],65:[2,101],66:[2,101],68:[2,101],70:[2,101],71:[2,101],75:[2,101],79:102,81:[2,101],82:[1,103],83:[2,101],88:[2,101],90:[2,101],99:[2,101],101:[2,101],102:[2,101],103:[2,101],107:[2,101],115:[2,101],123:[2,101],125:[2,101],126:[2,101],129:[2,101],130:[2,101],131:[2,101],132:[2,101],133:[2,101],134:[2,101]},{27:107,28:[1,71],42:108,46:104,47:[2,53],52:[2,53],53:105,54:106,56:109,57:110,73:[1,68],86:[1,111],87:[1,112]},{5:113,25:[1,5]},{8:114,9:115,10:20,11:21,12:[1,22],13:8,14:9,15:10,16:11,17:12,18:13,19:14,20:15,21:16,22:17,23:18,24:19,27:60,28:[1,71],29:49,30:[1,69],31:[1,70],32:24,33:[1,50],34:[1,51],35:[1,52],36:[1,53],37:23,42:61,43:[1,45],44:[1,46],45:[1,29],48:30,49:[1,58],50:[1,59],56:47,57:48,59:36,61:25,62:26,63:27,73:[1,68],76:[1,43],80:[1,28],85:[1,56],86:[1,57],87:[1,55],93:[1,38],97:[1,44],98:[1,54],100:39,101:[1,63],103:[1,64],104:40,105:[1,65],106:41,107:[1,66],108:67,116:[1,42],121:37,122:[1,62],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{8:116,9:115,10:20,11:21,12:[1,22],13:8,14:9,15:10,16:11,17:12,18:13,19:14,20:15,21:16,22:17,23:18,24:19,27:60,28:[1,71],29:49,30:[1,69],31:[1,70],32:24,33:[1,50],34:[1,51],35:[1,52],36:[1,53],37:23,42:61,43:[1,45],44:[1,46],45:[1,29],48:30,49:[1,58],50:[1,59],56:47,57:48,59:36,61:25,62:26,63:27,73:[1,68],76:[1,43],80:[1,28],85:[1,56],86:[1,57],87:[1,55],93:[1,38],97:[1,44],98:[1,54],100:39,101:[1,63],103:[1,64],104:40,105:[1,65],106:41,107:[1,66],108:67,116:[1,42],121:37,122:[1,62],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{8:117,9:115,10:20,11:21,12:[1,22],13:8,14:9,15:10,16:11,17:12,18:13,19:14,20:15,21:16,22:17,23:18,24:19,27:60,28:[1,71],29:49,30:[1,69],31:[1,70],32:24,33:[1,50],34:[1,51],35:[1,52],36:[1,53],37:23,42:61,43:[1,45],44:[1,46],45:[1,29],48:30,49:[1,58],50:[1,59],56:47,57:48,59:36,61:25,62:26,63:27,73:[1,68],76:[1,43],80:[1,28],85:[1,56],86:[1,57],87:[1,55],93:[1,38],97:[1,44],98:[1,54],100:39,101:[1,63],103:[1,64],104:40,105:[1,65],106:41,107:[1,66],108:67,116:[1,42],121:37,122:[1,62],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{13:119,14:120,27:60,28:[1,71],29:49,30:[1,69],31:[1,70],32:24,33:[1,50],34:[1,51],35:[1,52],36:[1,53],37:121,42:61,56:47,57:48,59:118,61:25,62:26,63:27,73:[1,68],80:[1,28],85:[1,56],86:[1,57],87:[1,55],98:[1,54]},{13:119,14:120,27:60,28:[1,71],29:49,30:[1,69],31:[1,70],32:24,33:[1,50],34:[1,51],35:[1,52],36:[1,53],37:121,42:61,56:47,57:48,59:122,61:25,62:26,63:27,73:[1,68],80:[1,28],85:[1,56],86:[1,57],87:[1,55],98:[1,54]},{1:[2,68],6:[2,68],25:[2,68],26:[2,68],38:[2,68],47:[2,68],52:[2,68],55:[2,68],64:[2,68],65:[2,68],66:[2,68],68:[2,68],70:[2,68],71:[2,68],75:[2,68],77:[1,126],81:[2,68],82:[2,68],83:[2,68],88:[2,68],90:[2,68],99:[2,68],101:[2,68],102:[2,68],103:[2,68],107:[2,68],115:[2,68],123:[2,68],125:[2,68],126:[2,68],127:[1,123],128:[1,124],129:[2,68],130:[2,68],131:[2,68],132:[2,68],133:[2,68],134:[2,68],135:[1,125]},{1:[2,175],6:[2,175],25:[2,175],26:[2,175],47:[2,175],52:[2,175],55:[2,175],70:[2,175],75:[2,175],83:[2,175],88:[2,175],90:[2,175],99:[2,175],101:[2,175],102:[2,175],103:[2,175],107:[2,175],115:[2,175],118:[1,127],123:[2,175],125:[2,175],126:[2,175],129:[2,175],130:[2,175],131:[2,175],132:[2,175],133:[2,175],134:[2,175]},{5:128,25:[1,5]},{5:129,25:[1,5]},{1:[2,143],6:[2,143],25:[2,143],26:[2,143],47:[2,143],52:[2,143],55:[2,143],70:[2,143],75:[2,143],83:[2,143],88:[2,143],90:[2,143],99:[2,143],101:[2,143],102:[2,143],103:[2,143],107:[2,143],115:[2,143],123:[2,143],125:[2,143],126:[2,143],129:[2,143],130:[2,143],131:[2,143],132:[2,143],133:[2,143],134:[2,143]},{5:130,25:[1,5]},{8:131,9:115,10:20,11:21,12:[1,22],13:8,14:9,15:10,16:11,17:12,18:13,19:14,20:15,21:16,22:17,23:18,24:19,25:[1,132],27:60,28:[1,71],29:49,30:[1,69],31:[1,70],32:24,33:[1,50],34:[1,51],35:[1,52],36:[1,53],37:23,42:61,43:[1,45],44:[1,46],45:[1,29],48:30,49:[1,58],50:[1,59],56:47,57:48,59:36,61:25,62:26,63:27,73:[1,68],76:[1,43],80:[1,28],85:[1,56],86:[1,57],87:[1,55],93:[1,38],97:[1,44],98:[1,54],100:39,101:[1,63],103:[1,64],104:40,105:[1,65],106:41,107:[1,66],108:67,116:[1,42],121:37,122:[1,62],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{1:[2,91],5:133,6:[2,91],13:119,14:120,25:[1,5],26:[2,91],27:60,28:[1,71],29:49,30:[1,69],31:[1,70],32:24,33:[1,50],34:[1,51],35:[1,52],36:[1,53],37:121,42:61,47:[2,91],52:[2,91],55:[2,91],56:47,57:48,59:135,61:25,62:26,63:27,70:[2,91],73:[1,68],75:[2,91],77:[1,134],80:[1,28],83:[2,91],85:[1,56],86:[1,57],87:[1,55],88:[2,91],90:[2,91],98:[1,54],99:[2,91],101:[2,91],102:[2,91],103:[2,91],107:[2,91],115:[2,91],123:[2,91],125:[2,91],126:[2,91],129:[2,91],130:[2,91],131:[2,91],132:[2,91],133:[2,91],134:[2,91]},{8:136,9:115,10:20,11:21,12:[1,22],13:8,14:9,15:10,16:11,17:12,18:13,19:14,20:15,21:16,22:17,23:18,24:19,27:60,28:[1,71],29:49,30:[1,69],31:[1,70],32:24,33:[1,50],34:[1,51],35:[1,52],36:[1,53],37:23,42:61,43:[1,45],44:[1,46],45:[1,29],48:30,49:[1,58],50:[1,59],56:47,57:48,59:36,61:25,62:26,63:27,73:[1,68],76:[1,43],80:[1,28],85:[1,56],86:[1,57],87:[1,55],93:[1,38],97:[1,44],98:[1,54],100:39,101:[1,63],103:[1,64],104:40,105:[1,65],106:41,107:[1,66],108:67,116:[1,42],121:37,122:[1,62],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{1:[2,45],6:[2,45],8:137,9:115,10:20,11:21,12:[1,22],13:8,14:9,15:10,16:11,17:12,18:13,19:14,20:15,21:16,22:17,23:18,24:19,26:[2,45],27:60,28:[1,71],29:49,30:[1,69],31:[1,70],32:24,33:[1,50],34:[1,51],35:[1,52],36:[1,53],37:23,42:61,43:[1,45],44:[1,46],45:[1,29],48:30,49:[1,58],50:[1,59],56:47,57:48,59:36,61:25,62:26,63:27,73:[1,68],76:[1,43],80:[1,28],85:[1,56],86:[1,57],87:[1,55],93:[1,38],97:[1,44],98:[1,54],99:[2,45],100:39,101:[2,45],103:[2,45],104:40,105:[1,65],106:41,107:[2,45],108:67,116:[1,42],121:37,122:[1,62],123:[2,45],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{1:[2,46],6:[2,46],25:[2,46],26:[2,46],52:[2,46],75:[2,46],99:[2,46],101:[2,46],103:[2,46],107:[2,46],123:[2,46]},{1:[2,69],6:[2,69],25:[2,69],26:[2,69],38:[2,69],47:[2,69],52:[2,69],55:[2,69],64:[2,69],65:[2,69],66:[2,69],68:[2,69],70:[2,69],71:[2,69],75:[2,69],81:[2,69],82:[2,69],83:[2,69],88:[2,69],90:[2,69],99:[2,69],101:[2,69],102:[2,69],103:[2,69],107:[2,69],115:[2,69],123:[2,69],125:[2,69],126:[2,69],129:[2,69],130:[2,69],131:[2,69],132:[2,69],133:[2,69],134:[2,69]},{1:[2,70],6:[2,70],25:[2,70],26:[2,70],38:[2,70],47:[2,70],52:[2,70],55:[2,70],64:[2,70],65:[2,70],66:[2,70],68:[2,70],70:[2,70],71:[2,70],75:[2,70],81:[2,70],82:[2,70],83:[2,70],88:[2,70],90:[2,70],99:[2,70],101:[2,70],102:[2,70],103:[2,70],107:[2,70],115:[2,70],123:[2,70],125:[2,70],126:[2,70],129:[2,70],130:[2,70],131:[2,70],132:[2,70],133:[2,70],134:[2,70]},{1:[2,29],6:[2,29],25:[2,29],26:[2,29],47:[2,29],52:[2,29],55:[2,29],64:[2,29],65:[2,29],66:[2,29],68:[2,29],70:[2,29],71:[2,29],75:[2,29],81:[2,29],82:[2,29],83:[2,29],88:[2,29],90:[2,29],99:[2,29],101:[2,29],102:[2,29],103:[2,29],107:[2,29],115:[2,29],123:[2,29],125:[2,29],126:[2,29],129:[2,29],130:[2,29],131:[2,29],132:[2,29],133:[2,29],134:[2,29]},{1:[2,30],6:[2,30],25:[2,30],26:[2,30],47:[2,30],52:[2,30],55:[2,30],64:[2,30],65:[2,30],66:[2,30],68:[2,30],70:[2,30],71:[2,30],75:[2,30],81:[2,30],82:[2,30],83:[2,30],88:[2,30],90:[2,30],99:[2,30],101:[2,30],102:[2,30],103:[2,30],107:[2,30],115:[2,30],123:[2,30],125:[2,30],126:[2,30],129:[2,30],130:[2,30],131:[2,30],132:[2,30],133:[2,30],134:[2,30]},{1:[2,31],6:[2,31],25:[2,31],26:[2,31],47:[2,31],52:[2,31],55:[2,31],64:[2,31],65:[2,31],66:[2,31],68:[2,31],70:[2,31],71:[2,31],75:[2,31],81:[2,31],82:[2,31],83:[2,31],88:[2,31],90:[2,31],99:[2,31],101:[2,31],102:[2,31],103:[2,31],107:[2,31],115:[2,31],123:[2,31],125:[2,31],126:[2,31],129:[2,31],130:[2,31],131:[2,31],132:[2,31],133:[2,31],134:[2,31]},{1:[2,32],6:[2,32],25:[2,32],26:[2,32],47:[2,32],52:[2,32],55:[2,32],64:[2,32],65:[2,32],66:[2,32],68:[2,32],70:[2,32],71:[2,32],75:[2,32],81:[2,32],82:[2,32],83:[2,32],88:[2,32],90:[2,32],99:[2,32],101:[2,32],102:[2,32],103:[2,32],107:[2,32],115:[2,32],123:[2,32],125:[2,32],126:[2,32],129:[2,32],130:[2,32],131:[2,32],132:[2,32],133:[2,32],134:[2,32]},{1:[2,33],6:[2,33],25:[2,33],26:[2,33],47:[2,33],52:[2,33],55:[2,33],64:[2,33],65:[2,33],66:[2,33],68:[2,33],70:[2,33],71:[2,33],75:[2,33],81:[2,33],82:[2,33],83:[2,33],88:[2,33],90:[2,33],99:[2,33],101:[2,33],102:[2,33],103:[2,33],107:[2,33],115:[2,33],123:[2,33],125:[2,33],126:[2,33],129:[2,33],130:[2,33],131:[2,33],132:[2,33],133:[2,33],134:[2,33]},{4:138,7:4,8:6,9:7,10:20,11:21,12:[1,22],13:8,14:9,15:10,16:11,17:12,18:13,19:14,20:15,21:16,22:17,23:18,24:19,25:[1,139],27:60,28:[1,71],29:49,30:[1,69],31:[1,70],32:24,33:[1,50],34:[1,51],35:[1,52],36:[1,53],37:23,42:61,43:[1,45],44:[1,46],45:[1,29],48:30,49:[1,58],50:[1,59],56:47,57:48,59:36,61:25,62:26,63:27,73:[1,68],76:[1,43],80:[1,28],85:[1,56],86:[1,57],87:[1,55],93:[1,38],97:[1,44],98:[1,54],100:39,101:[1,63],103:[1,64],104:40,105:[1,65],106:41,107:[1,66],108:67,116:[1,42],121:37,122:[1,62],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{8:140,9:115,10:20,11:21,12:[1,22],13:8,14:9,15:10,16:11,17:12,18:13,19:14,20:15,21:16,22:17,23:18,24:19,25:[1,144],27:60,28:[1,71],29:49,30:[1,69],31:[1,70],32:24,33:[1,50],34:[1,51],35:[1,52],36:[1,53],37:23,42:61,43:[1,45],44:[1,46],45:[1,29],48:30,49:[1,58],50:[1,59],56:47,57:48,58:145,59:36,61:25,62:26,63:27,73:[1,68],76:[1,43],80:[1,28],84:142,85:[1,56],86:[1,57],87:[1,55],88:[1,141],91:143,93:[1,38],97:[1,44],98:[1,54],100:39,101:[1,63],103:[1,64],104:40,105:[1,65],106:41,107:[1,66],108:67,116:[1,42],121:37,122:[1,62],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{1:[2,107],6:[2,107],25:[2,107],26:[2,107],47:[2,107],52:[2,107],55:[2,107],64:[2,107],65:[2,107],66:[2,107],68:[2,107],70:[2,107],71:[2,107],75:[2,107],81:[2,107],82:[2,107],83:[2,107],88:[2,107],90:[2,107],99:[2,107],101:[2,107],102:[2,107],103:[2,107],107:[2,107],115:[2,107],123:[2,107],125:[2,107],126:[2,107],129:[2,107],130:[2,107],131:[2,107],132:[2,107],133:[2,107],134:[2,107]},{1:[2,108],6:[2,108],25:[2,108],26:[2,108],27:146,28:[1,71],47:[2,108],52:[2,108],55:[2,108],64:[2,108],65:[2,108],66:[2,108],68:[2,108],70:[2,108],71:[2,108],75:[2,108],81:[2,108],82:[2,108],83:[2,108],88:[2,108],90:[2,108],99:[2,108],101:[2,108],102:[2,108],103:[2,108],107:[2,108],115:[2,108],123:[2,108],125:[2,108],126:[2,108],129:[2,108],130:[2,108],131:[2,108],132:[2,108],133:[2,108],134:[2,108]},{25:[2,49]},{25:[2,50]},{1:[2,64],6:[2,64],25:[2,64],26:[2,64],38:[2,64],47:[2,64],52:[2,64],55:[2,64],64:[2,64],65:[2,64],66:[2,64],68:[2,64],70:[2,64],71:[2,64],75:[2,64],77:[2,64],81:[2,64],82:[2,64],83:[2,64],88:[2,64],90:[2,64],99:[2,64],101:[2,64],102:[2,64],103:[2,64],107:[2,64],115:[2,64],123:[2,64],125:[2,64],126:[2,64],127:[2,64],128:[2,64],129:[2,64],130:[2,64],131:[2,64],132:[2,64],133:[2,64],134:[2,64],135:[2,64]},{1:[2,67],6:[2,67],25:[2,67],26:[2,67],38:[2,67],47:[2,67],52:[2,67],55:[2,67],64:[2,67],65:[2,67],66:[2,67],68:[2,67],70:[2,67],71:[2,67],75:[2,67],77:[2,67],81:[2,67],82:[2,67],83:[2,67],88:[2,67],90:[2,67],99:[2,67],101:[2,67],102:[2,67],103:[2,67],107:[2,67],115:[2,67],123:[2,67],125:[2,67],126:[2,67],127:[2,67],128:[2,67],129:[2,67],130:[2,67],131:[2,67],132:[2,67],133:[2,67],134:[2,67],135:[2,67]},{8:147,9:115,10:20,11:21,12:[1,22],13:8,14:9,15:10,16:11,17:12,18:13,19:14,20:15,21:16,22:17,23:18,24:19,27:60,28:[1,71],29:49,30:[1,69],31:[1,70],32:24,33:[1,50],34:[1,51],35:[1,52],36:[1,53],37:23,42:61,43:[1,45],44:[1,46],45:[1,29],48:30,49:[1,58],50:[1,59],56:47,57:48,59:36,61:25,62:26,63:27,73:[1,68],76:[1,43],80:[1,28],85:[1,56],86:[1,57],87:[1,55],93:[1,38],97:[1,44],98:[1,54],100:39,101:[1,63],103:[1,64],104:40,105:[1,65],106:41,107:[1,66],108:67,116:[1,42],121:37,122:[1,62],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{8:148,9:115,10:20,11:21,12:[1,22],13:8,14:9,15:10,16:11,17:12,18:13,19:14,20:15,21:16,22:17,23:18,24:19,27:60,28:[1,71],29:49,30:[1,69],31:[1,70],32:24,33:[1,50],34:[1,51],35:[1,52],36:[1,53],37:23,42:61,43:[1,45],44:[1,46],45:[1,29],48:30,49:[1,58],50:[1,59],56:47,57:48,59:36,61:25,62:26,63:27,73:[1,68],76:[1,43],80:[1,28],85:[1,56],86:[1,57],87:[1,55],93:[1,38],97:[1,44],98:[1,54],100:39,101:[1,63],103:[1,64],104:40,105:[1,65],106:41,107:[1,66],108:67,116:[1,42],121:37,122:[1,62],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{8:149,9:115,10:20,11:21,12:[1,22],13:8,14:9,15:10,16:11,17:12,18:13,19:14,20:15,21:16,22:17,23:18,24:19,27:60,28:[1,71],29:49,30:[1,69],31:[1,70],32:24,33:[1,50],34:[1,51],35:[1,52],36:[1,53],37:23,42:61,43:[1,45],44:[1,46],45:[1,29],48:30,49:[1,58],50:[1,59],56:47,57:48,59:36,61:25,62:26,63:27,73:[1,68],76:[1,43],80:[1,28],85:[1,56],86:[1,57],87:[1,55],93:[1,38],97:[1,44],98:[1,54],100:39,101:[1,63],103:[1,64],104:40,105:[1,65],106:41,107:[1,66],108:67,116:[1,42],121:37,122:[1,62],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{5:150,8:151,9:115,10:20,11:21,12:[1,22],13:8,14:9,15:10,16:11,17:12,18:13,19:14,20:15,21:16,22:17,23:18,24:19,25:[1,5],27:60,28:[1,71],29:49,30:[1,69],31:[1,70],32:24,33:[1,50],34:[1,51],35:[1,52],36:[1,53],37:23,42:61,43:[1,45],44:[1,46],45:[1,29],48:30,49:[1,58],50:[1,59],56:47,57:48,59:36,61:25,62:26,63:27,73:[1,68],76:[1,43],80:[1,28],85:[1,56],86:[1,57],87:[1,55],93:[1,38],97:[1,44],98:[1,54],100:39,101:[1,63],103:[1,64],104:40,105:[1,65],106:41,107:[1,66],108:67,116:[1,42],121:37,122:[1,62],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{27:156,28:[1,71],56:157,57:158,62:152,73:[1,68],87:[1,55],110:153,111:[1,154],112:155},{109:159,113:[1,160],114:[1,161]},{6:[2,86],11:165,25:[2,86],27:166,28:[1,71],29:167,30:[1,69],31:[1,70],39:163,40:164,42:168,44:[1,46],52:[2,86],74:162,75:[2,86],86:[1,111]},{1:[2,27],6:[2,27],25:[2,27],26:[2,27],41:[2,27],47:[2,27],52:[2,27],55:[2,27],64:[2,27],65:[2,27],66:[2,27],68:[2,27],70:[2,27],71:[2,27],75:[2,27],81:[2,27],82:[2,27],83:[2,27],88:[2,27],90:[2,27],99:[2,27],101:[2,27],102:[2,27],103:[2,27],107:[2,27],115:[2,27],123:[2,27],125:[2,27],126:[2,27],129:[2,27],130:[2,27],131:[2,27],132:[2,27],133:[2,27],134:[2,27]},{1:[2,28],6:[2,28],25:[2,28],26:[2,28],41:[2,28],47:[2,28],52:[2,28],55:[2,28],64:[2,28],65:[2,28],66:[2,28],68:[2,28],70:[2,28],71:[2,28],75:[2,28],81:[2,28],82:[2,28],83:[2,28],88:[2,28],90:[2,28],99:[2,28],101:[2,28],102:[2,28],103:[2,28],107:[2,28],115:[2,28],123:[2,28],125:[2,28],126:[2,28],129:[2,28],130:[2,28],131:[2,28],132:[2,28],133:[2,28],134:[2,28]},{1:[2,26],6:[2,26],25:[2,26],26:[2,26],38:[2,26],41:[2,26],47:[2,26],52:[2,26],55:[2,26],64:[2,26],65:[2,26],66:[2,26],68:[2,26],70:[2,26],71:[2,26],75:[2,26],77:[2,26],81:[2,26],82:[2,26],83:[2,26],88:[2,26],90:[2,26],99:[2,26],101:[2,26],102:[2,26],103:[2,26],107:[2,26],113:[2,26],114:[2,26],115:[2,26],123:[2,26],125:[2,26],126:[2,26],127:[2,26],128:[2,26],129:[2,26],130:[2,26],131:[2,26],132:[2,26],133:[2,26],134:[2,26],135:[2,26]},{1:[2,6],6:[2,6],7:169,8:6,9:7,10:20,11:21,12:[1,22],13:8,14:9,15:10,16:11,17:12,18:13,19:14,20:15,21:16,22:17,23:18,24:19,26:[2,6],27:60,28:[1,71],29:49,30:[1,69],31:[1,70],32:24,33:[1,50],34:[1,51],35:[1,52],36:[1,53],37:23,42:61,43:[1,45],44:[1,46],45:[1,29],48:30,49:[1,58],50:[1,59],56:47,57:48,59:36,61:25,62:26,63:27,73:[1,68],76:[1,43],80:[1,28],85:[1,56],86:[1,57],87:[1,55],93:[1,38],97:[1,44],98:[1,54],99:[2,6],100:39,101:[1,63],103:[1,64],104:40,105:[1,65],106:41,107:[1,66],108:67,116:[1,42],121:37,122:[1,62],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{1:[2,3]},{1:[2,24],6:[2,24],25:[2,24],26:[2,24],47:[2,24],52:[2,24],55:[2,24],70:[2,24],75:[2,24],83:[2,24],88:[2,24],90:[2,24],95:[2,24],96:[2,24],99:[2,24],101:[2,24],102:[2,24],103:[2,24],107:[2,24],115:[2,24],118:[2,24],120:[2,24],123:[2,24],125:[2,24],126:[2,24],129:[2,24],130:[2,24],131:[2,24],132:[2,24],133:[2,24],134:[2,24]},{6:[1,72],26:[1,170]},{1:[2,186],6:[2,186],25:[2,186],26:[2,186],47:[2,186],52:[2,186],55:[2,186],70:[2,186],75:[2,186],83:[2,186],88:[2,186],90:[2,186],99:[2,186],101:[2,186],102:[2,186],103:[2,186],107:[2,186],115:[2,186],123:[2,186],125:[2,186],126:[2,186],129:[2,186],130:[2,186],131:[2,186],132:[2,186],133:[2,186],134:[2,186]},{8:171,9:115,10:20,11:21,12:[1,22],13:8,14:9,15:10,16:11,17:12,18:13,19:14,20:15,21:16,22:17,23:18,24:19,27:60,28:[1,71],29:49,30:[1,69],31:[1,70],32:24,33:[1,50],34:[1,51],35:[1,52],36:[1,53],37:23,42:61,43:[1,45],44:[1,46],45:[1,29],48:30,49:[1,58],50:[1,59],56:47,57:48,59:36,61:25,62:26,63:27,73:[1,68],76:[1,43],80:[1,28],85:[1,56],86:[1,57],87:[1,55],93:[1,38],97:[1,44],98:[1,54],100:39,101:[1,63],103:[1,64],104:40,105:[1,65],106:41,107:[1,66],108:67,116:[1,42],121:37,122:[1,62],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{8:172,9:115,10:20,11:21,12:[1,22],13:8,14:9,15:10,16:11,17:12,18:13,19:14,20:15,21:16,22:17,23:18,24:19,27:60,28:[1,71],29:49,30:[1,69],31:[1,70],32:24,33:[1,50],34:[1,51],35:[1,52],36:[1,53],37:23,42:61,43:[1,45],44:[1,46],45:[1,29],48:30,49:[1,58],50:[1,59],56:47,57:48,59:36,61:25,62:26,63:27,73:[1,68],76:[1,43],80:[1,28],85:[1,56],86:[1,57],87:[1,55],93:[1,38],97:[1,44],98:[1,54],100:39,101:[1,63],103:[1,64],104:40,105:[1,65],106:41,107:[1,66],108:67,116:[1,42],121:37,122:[1,62],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{8:173,9:115,10:20,11:21,12:[1,22],13:8,14:9,15:10,16:11,17:12,18:13,19:14,20:15,21:16,22:17,23:18,24:19,27:60,28:[1,71],29:49,30:[1,69],31:[1,70],32:24,33:[1,50],34:[1,51],35:[1,52],36:[1,53],37:23,42:61,43:[1,45],44:[1,46],45:[1,29],48:30,49:[1,58],50:[1,59],56:47,57:48,59:36,61:25,62:26,63:27,73:[1,68],76:[1,43],80:[1,28],85:[1,56],86:[1,57],87:[1,55],93:[1,38],97:[1,44],98:[1,54],100:39,101:[1,63],103:[1,64],104:40,105:[1,65],106:41,107:[1,66],108:67,116:[1,42],121:37,122:[1,62],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{8:174,9:115,10:20,11:21,12:[1,22],13:8,14:9,15:10,16:11,17:12,18:13,19:14,20:15,21:16,22:17,23:18,24:19,27:60,28:[1,71],29:49,30:[1,69],31:[1,70],32:24,33:[1,50],34:[1,51],35:[1,52],36:[1,53],37:23,42:61,43:[1,45],44:[1,46],45:[1,29],48:30,49:[1,58],50:[1,59],56:47,57:48,59:36,61:25,62:26,63:27,73:[1,68],76:[1,43],80:[1,28],85:[1,56],86:[1,57],87:[1,55],93:[1,38],97:[1,44],98:[1,54],100:39,101:[1,63],103:[1,64],104:40,105:[1,65],106:41,107:[1,66],108:67,116:[1,42],121:37,122:[1,62],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{8:175,9:115,10:20,11:21,12:[1,22],13:8,14:9,15:10,16:11,17:12,18:13,19:14,20:15,21:16,22:17,23:18,24:19,27:60,28:[1,71],29:49,30:[1,69],31:[1,70],32:24,33:[1,50],34:[1,51],35:[1,52],36:[1,53],37:23,42:61,43:[1,45],44:[1,46],45:[1,29],48:30,49:[1,58],50:[1,59],56:47,57:48,59:36,61:25,62:26,63:27,73:[1,68],76:[1,43],80:[1,28],85:[1,56],86:[1,57],87:[1,55],93:[1,38],97:[1,44],98:[1,54],100:39,101:[1,63],103:[1,64],104:40,105:[1,65],106:41,107:[1,66],108:67,116:[1,42],121:37,122:[1,62],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{8:176,9:115,10:20,11:21,12:[1,22],13:8,14:9,15:10,16:11,17:12,18:13,19:14,20:15,21:16,22:17,23:18,24:19,27:60,28:[1,71],29:49,30:[1,69],31:[1,70],32:24,33:[1,50],34:[1,51],35:[1,52],36:[1,53],37:23,42:61,43:[1,45],44:[1,46],45:[1,29],48:30,49:[1,58],50:[1,59],56:47,57:48,59:36,61:25,62:26,63:27,73:[1,68],76:[1,43],80:[1,28],85:[1,56],86:[1,57],87:[1,55],93:[1,38],97:[1,44],98:[1,54],100:39,101:[1,63],103:[1,64],104:40,105:[1,65],106:41,107:[1,66],108:67,116:[1,42],121:37,122:[1,62],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{8:177,9:115,10:20,11:21,12:[1,22],13:8,14:9,15:10,16:11,17:12,18:13,19:14,20:15,21:16,22:17,23:18,24:19,27:60,28:[1,71],29:49,30:[1,69],31:[1,70],32:24,33:[1,50],34:[1,51],35:[1,52],36:[1,53],37:23,42:61,43:[1,45],44:[1,46],45:[1,29],48:30,49:[1,58],50:[1,59],56:47,57:48,59:36,61:25,62:26,63:27,73:[1,68],76:[1,43],80:[1,28],85:[1,56],86:[1,57],87:[1,55],93:[1,38],97:[1,44],98:[1,54],100:39,101:[1,63],103:[1,64],104:40,105:[1,65],106:41,107:[1,66],108:67,116:[1,42],121:37,122:[1,62],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{8:178,9:115,10:20,11:21,12:[1,22],13:8,14:9,15:10,16:11,17:12,18:13,19:14,20:15,21:16,22:17,23:18,24:19,27:60,28:[1,71],29:49,30:[1,69],31:[1,70],32:24,33:[1,50],34:[1,51],35:[1,52],36:[1,53],37:23,42:61,43:[1,45],44:[1,46],45:[1,29],48:30,49:[1,58],50:[1,59],56:47,57:48,59:36,61:25,62:26,63:27,73:[1,68],76:[1,43],80:[1,28],85:[1,56],86:[1,57],87:[1,55],93:[1,38],97:[1,44],98:[1,54],100:39,101:[1,63],103:[1,64],104:40,105:[1,65],106:41,107:[1,66],108:67,116:[1,42],121:37,122:[1,62],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{1:[2,142],6:[2,142],25:[2,142],26:[2,142],47:[2,142],52:[2,142],55:[2,142],70:[2,142],75:[2,142],83:[2,142],88:[2,142],90:[2,142],99:[2,142],101:[2,142],102:[2,142],103:[2,142],107:[2,142],115:[2,142],123:[2,142],125:[2,142],126:[2,142],129:[2,142],130:[2,142],131:[2,142],132:[2,142],133:[2,142],134:[2,142]},{1:[2,147],6:[2,147],25:[2,147],26:[2,147],47:[2,147],52:[2,147],55:[2,147],70:[2,147],75:[2,147],83:[2,147],88:[2,147],90:[2,147],99:[2,147],101:[2,147],102:[2,147],103:[2,147],107:[2,147],115:[2,147],123:[2,147],125:[2,147],126:[2,147],129:[2,147],130:[2,147],131:[2,147],132:[2,147],133:[2,147],134:[2,147]},{8:179,9:115,10:20,11:21,12:[1,22],13:8,14:9,15:10,16:11,17:12,18:13,19:14,20:15,21:16,22:17,23:18,24:19,27:60,28:[1,71],29:49,30:[1,69],31:[1,70],32:24,33:[1,50],34:[1,51],35:[1,52],36:[1,53],37:23,42:61,43:[1,45],44:[1,46],45:[1,29],48:30,49:[1,58],50:[1,59],56:47,57:48,59:36,61:25,62:26,63:27,73:[1,68],76:[1,43],80:[1,28],85:[1,56],86:[1,57],87:[1,55],93:[1,38],97:[1,44],98:[1,54],100:39,101:[1,63],103:[1,64],104:40,105:[1,65],106:41,107:[1,66],108:67,116:[1,42],121:37,122:[1,62],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{1:[2,141],6:[2,141],25:[2,141],26:[2,141],47:[2,141],52:[2,141],55:[2,141],70:[2,141],75:[2,141],83:[2,141],88:[2,141],90:[2,141],99:[2,141],101:[2,141],102:[2,141],103:[2,141],107:[2,141],115:[2,141],123:[2,141],125:[2,141],126:[2,141],129:[2,141],130:[2,141],131:[2,141],132:[2,141],133:[2,141],134:[2,141]},{1:[2,146],6:[2,146],25:[2,146],26:[2,146],47:[2,146],52:[2,146],55:[2,146],70:[2,146],75:[2,146],83:[2,146],88:[2,146],90:[2,146],99:[2,146],101:[2,146],102:[2,146],103:[2,146],107:[2,146],115:[2,146],123:[2,146],125:[2,146],126:[2,146],129:[2,146],130:[2,146],131:[2,146],132:[2,146],133:[2,146],134:[2,146]},{79:180,82:[1,103]},{1:[2,65],6:[2,65],25:[2,65],26:[2,65],38:[2,65],47:[2,65],52:[2,65],55:[2,65],64:[2,65],65:[2,65],66:[2,65],68:[2,65],70:[2,65],71:[2,65],75:[2,65],77:[2,65],81:[2,65],82:[2,65],83:[2,65],88:[2,65],90:[2,65],99:[2,65],101:[2,65],102:[2,65],103:[2,65],107:[2,65],115:[2,65],123:[2,65],125:[2,65],126:[2,65],127:[2,65],128:[2,65],129:[2,65],130:[2,65],131:[2,65],132:[2,65],133:[2,65],134:[2,65],135:[2,65]},{82:[2,104]},{27:181,28:[1,71]},{27:182,28:[1,71]},{1:[2,79],6:[2,79],25:[2,79],26:[2,79],27:183,28:[1,71],38:[2,79],47:[2,79],52:[2,79],55:[2,79],64:[2,79],65:[2,79],66:[2,79],68:[2,79],70:[2,79],71:[2,79],75:[2,79],77:[2,79],81:[2,79],82:[2,79],83:[2,79],88:[2,79],90:[2,79],99:[2,79],101:[2,79],102:[2,79],103:[2,79],107:[2,79],115:[2,79],123:[2,79],125:[2,79],126:[2,79],127:[2,79],128:[2,79],129:[2,79],130:[2,79],131:[2,79],132:[2,79],133:[2,79],134:[2,79],135:[2,79]},{1:[2,80],6:[2,80],25:[2,80],26:[2,80],38:[2,80],47:[2,80],52:[2,80],55:[2,80],64:[2,80],65:[2,80],66:[2,80],68:[2,80],70:[2,80],71:[2,80],75:[2,80],77:[2,80],81:[2,80],82:[2,80],83:[2,80],88:[2,80],90:[2,80],99:[2,80],101:[2,80],102:[2,80],103:[2,80],107:[2,80],115:[2,80],123:[2,80],125:[2,80],126:[2,80],127:[2,80],128:[2,80],129:[2,80],130:[2,80],131:[2,80],132:[2,80],133:[2,80],134:[2,80],135:[2,80]},{8:185,9:115,10:20,11:21,12:[1,22],13:8,14:9,15:10,16:11,17:12,18:13,19:14,20:15,21:16,22:17,23:18,24:19,27:60,28:[1,71],29:49,30:[1,69],31:[1,70],32:24,33:[1,50],34:[1,51],35:[1,52],36:[1,53],37:23,42:61,43:[1,45],44:[1,46],45:[1,29],48:30,49:[1,58],50:[1,59],55:[1,189],56:47,57:48,59:36,61:25,62:26,63:27,69:184,72:186,73:[1,68],76:[1,43],80:[1,28],85:[1,56],86:[1,57],87:[1,55],89:187,90:[1,188],93:[1,38],97:[1,44],98:[1,54],100:39,101:[1,63],103:[1,64],104:40,105:[1,65],106:41,107:[1,66],108:67,116:[1,42],121:37,122:[1,62],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{67:190,68:[1,97],71:[1,98]},{79:191,82:[1,103]},{1:[2,66],6:[2,66],25:[2,66],26:[2,66],38:[2,66],47:[2,66],52:[2,66],55:[2,66],64:[2,66],65:[2,66],66:[2,66],68:[2,66],70:[2,66],71:[2,66],75:[2,66],77:[2,66],81:[2,66],82:[2,66],83:[2,66],88:[2,66],90:[2,66],99:[2,66],101:[2,66],102:[2,66],103:[2,66],107:[2,66],115:[2,66],123:[2,66],125:[2,66],126:[2,66],127:[2,66],128:[2,66],129:[2,66],130:[2,66],131:[2,66],132:[2,66],133:[2,66],134:[2,66],135:[2,66]},{6:[1,193],8:192,9:115,10:20,11:21,12:[1,22],13:8,14:9,15:10,16:11,17:12,18:13,19:14,20:15,21:16,22:17,23:18,24:19,25:[1,194],27:60,28:[1,71],29:49,30:[1,69],31:[1,70],32:24,33:[1,50],34:[1,51],35:[1,52],36:[1,53],37:23,42:61,43:[1,45],44:[1,46],45:[1,29],48:30,49:[1,58],50:[1,59],56:47,57:48,59:36,61:25,62:26,63:27,73:[1,68],76:[1,43],80:[1,28],85:[1,56],86:[1,57],87:[1,55],93:[1,38],97:[1,44],98:[1,54],100:39,101:[1,63],103:[1,64],104:40,105:[1,65],106:41,107:[1,66],108:67,116:[1,42],121:37,122:[1,62],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{1:[2,102],6:[2,102],25:[2,102],26:[2,102],47:[2,102],52:[2,102],55:[2,102],64:[2,102],65:[2,102],66:[2,102],68:[2,102],70:[2,102],71:[2,102],75:[2,102],81:[2,102],82:[2,102],83:[2,102],88:[2,102],90:[2,102],99:[2,102],101:[2,102],102:[2,102],103:[2,102],107:[2,102],115:[2,102],123:[2,102],125:[2,102],126:[2,102],129:[2,102],130:[2,102],131:[2,102],132:[2,102],133:[2,102],134:[2,102]},{8:197,9:115,10:20,11:21,12:[1,22],13:8,14:9,15:10,16:11,17:12,18:13,19:14,20:15,21:16,22:17,23:18,24:19,25:[1,144],27:60,28:[1,71],29:49,30:[1,69],31:[1,70],32:24,33:[1,50],34:[1,51],35:[1,52],36:[1,53],37:23,42:61,43:[1,45],44:[1,46],45:[1,29],48:30,49:[1,58],50:[1,59],56:47,57:48,58:145,59:36,61:25,62:26,63:27,73:[1,68],76:[1,43],80:[1,28],83:[1,195],84:196,85:[1,56],86:[1,57],87:[1,55],91:143,93:[1,38],97:[1,44],98:[1,54],100:39,101:[1,63],103:[1,64],104:40,105:[1,65],106:41,107:[1,66],108:67,116:[1,42],121:37,122:[1,62],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{47:[1,198],52:[1,199]},{47:[2,54],52:[2,54]},{38:[1,201],47:[2,56],52:[2,56],55:[1,200]},{38:[2,59],47:[2,59],52:[2,59],55:[2,59]},{38:[2,60],47:[2,60],52:[2,60],55:[2,60]},{38:[2,61],47:[2,61],52:[2,61],55:[2,61]},{38:[2,62],47:[2,62],52:[2,62],55:[2,62]},{27:146,28:[1,71]},{8:197,9:115,10:20,11:21,12:[1,22],13:8,14:9,15:10,16:11,17:12,18:13,19:14,20:15,21:16,22:17,23:18,24:19,25:[1,144],27:60,28:[1,71],29:49,30:[1,69],31:[1,70],32:24,33:[1,50],34:[1,51],35:[1,52],36:[1,53],37:23,42:61,43:[1,45],44:[1,46],45:[1,29],48:30,49:[1,58],50:[1,59],56:47,57:48,58:145,59:36,61:25,62:26,63:27,73:[1,68],76:[1,43],80:[1,28],84:142,85:[1,56],86:[1,57],87:[1,55],88:[1,141],91:143,93:[1,38],97:[1,44],98:[1,54],100:39,101:[1,63],103:[1,64],104:40,105:[1,65],106:41,107:[1,66],108:67,116:[1,42],121:37,122:[1,62],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{1:[2,48],6:[2,48],25:[2,48],26:[2,48],47:[2,48],52:[2,48],55:[2,48],70:[2,48],75:[2,48],83:[2,48],88:[2,48],90:[2,48],99:[2,48],101:[2,48],102:[2,48],103:[2,48],107:[2,48],115:[2,48],123:[2,48],125:[2,48],126:[2,48],129:[2,48],130:[2,48],131:[2,48],132:[2,48],133:[2,48],134:[2,48]},{1:[2,179],6:[2,179],25:[2,179],26:[2,179],47:[2,179],52:[2,179],55:[2,179],70:[2,179],75:[2,179],83:[2,179],88:[2,179],90:[2,179],99:[2,179],100:85,101:[2,179],102:[2,179],103:[2,179],106:86,107:[2,179],108:67,115:[2,179],123:[2,179],125:[2,179],126:[2,179],129:[1,76],130:[2,179],131:[2,179],132:[2,179],133:[2,179],134:[2,179]},{100:88,101:[1,63],103:[1,64],106:89,107:[1,66],108:67,123:[1,87]},{1:[2,180],6:[2,180],25:[2,180],26:[2,180],47:[2,180],52:[2,180],55:[2,180],70:[2,180],75:[2,180],83:[2,180],88:[2,180],90:[2,180],99:[2,180],100:85,101:[2,180],102:[2,180],103:[2,180],106:86,107:[2,180],108:67,115:[2,180],123:[2,180],125:[2,180],126:[2,180],129:[1,76],130:[2,180],131:[2,180],132:[2,180],133:[2,180],134:[2,180]},{1:[2,181],6:[2,181],25:[2,181],26:[2,181],47:[2,181],52:[2,181],55:[2,181],70:[2,181],75:[2,181],83:[2,181],88:[2,181],90:[2,181],99:[2,181],100:85,101:[2,181],102:[2,181],103:[2,181],106:86,107:[2,181],108:67,115:[2,181],123:[2,181],125:[2,181],126:[2,181],129:[1,76],130:[2,181],131:[2,181],132:[2,181],133:[2,181],134:[2,181]},{1:[2,182],6:[2,182],25:[2,182],26:[2,182],47:[2,182],52:[2,182],55:[2,182],64:[2,68],65:[2,68],66:[2,68],68:[2,68],70:[2,182],71:[2,68],75:[2,182],81:[2,68],82:[2,68],83:[2,182],88:[2,182],90:[2,182],99:[2,182],101:[2,182],102:[2,182],103:[2,182],107:[2,182],115:[2,182],123:[2,182],125:[2,182],126:[2,182],129:[2,182],130:[2,182],131:[2,182],132:[2,182],133:[2,182],134:[2,182]},{60:91,64:[1,93],65:[1,94],66:[1,95],67:96,68:[1,97],71:[1,98],78:90,81:[1,92],82:[2,103]},{60:100,64:[1,93],65:[1,94],66:[1,95],67:96,68:[1,97],71:[1,98],78:99,81:[1,92],82:[2,103]},{64:[2,71],65:[2,71],66:[2,71],68:[2,71],71:[2,71],81:[2,71],82:[2,71]},{1:[2,183],6:[2,183],25:[2,183],26:[2,183],47:[2,183],52:[2,183],55:[2,183],64:[2,68],65:[2,68],66:[2,68],68:[2,68],70:[2,183],71:[2,68],75:[2,183],81:[2,68],82:[2,68],83:[2,183],88:[2,183],90:[2,183],99:[2,183],101:[2,183],102:[2,183],103:[2,183],107:[2,183],115:[2,183],123:[2,183],125:[2,183],126:[2,183],129:[2,183],130:[2,183],131:[2,183],132:[2,183],133:[2,183],134:[2,183]},{1:[2,184],6:[2,184],25:[2,184],26:[2,184],47:[2,184],52:[2,184],55:[2,184],70:[2,184],75:[2,184],83:[2,184],88:[2,184],90:[2,184],99:[2,184],101:[2,184],102:[2,184],103:[2,184],107:[2,184],115:[2,184],123:[2,184],125:[2,184],126:[2,184],129:[2,184],130:[2,184],131:[2,184],132:[2,184],133:[2,184],134:[2,184]},{1:[2,185],6:[2,185],25:[2,185],26:[2,185],47:[2,185],52:[2,185],55:[2,185],70:[2,185],75:[2,185],83:[2,185],88:[2,185],90:[2,185],99:[2,185],101:[2,185],102:[2,185],103:[2,185],107:[2,185],115:[2,185],123:[2,185],125:[2,185],126:[2,185],129:[2,185],130:[2,185],131:[2,185],132:[2,185],133:[2,185],134:[2,185]},{8:202,9:115,10:20,11:21,12:[1,22],13:8,14:9,15:10,16:11,17:12,18:13,19:14,20:15,21:16,22:17,23:18,24:19,25:[1,203],27:60,28:[1,71],29:49,30:[1,69],31:[1,70],32:24,33:[1,50],34:[1,51],35:[1,52],36:[1,53],37:23,42:61,43:[1,45],44:[1,46],45:[1,29],48:30,49:[1,58],50:[1,59],56:47,57:48,59:36,61:25,62:26,63:27,73:[1,68],76:[1,43],80:[1,28],85:[1,56],86:[1,57],87:[1,55],93:[1,38],97:[1,44],98:[1,54],100:39,101:[1,63],103:[1,64],104:40,105:[1,65],106:41,107:[1,66],108:67,116:[1,42],121:37,122:[1,62],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{8:204,9:115,10:20,11:21,12:[1,22],13:8,14:9,15:10,16:11,17:12,18:13,19:14,20:15,21:16,22:17,23:18,24:19,27:60,28:[1,71],29:49,30:[1,69],31:[1,70],32:24,33:[1,50],34:[1,51],35:[1,52],36:[1,53],37:23,42:61,43:[1,45],44:[1,46],45:[1,29],48:30,49:[1,58],50:[1,59],56:47,57:48,59:36,61:25,62:26,63:27,73:[1,68],76:[1,43],80:[1,28],85:[1,56],86:[1,57],87:[1,55],93:[1,38],97:[1,44],98:[1,54],100:39,101:[1,63],103:[1,64],104:40,105:[1,65],106:41,107:[1,66],108:67,116:[1,42],121:37,122:[1,62],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{5:205,25:[1,5],122:[1,206]},{1:[2,128],6:[2,128],25:[2,128],26:[2,128],47:[2,128],52:[2,128],55:[2,128],70:[2,128],75:[2,128],83:[2,128],88:[2,128],90:[2,128],94:207,95:[1,208],96:[1,209],99:[2,128],101:[2,128],102:[2,128],103:[2,128],107:[2,128],115:[2,128],123:[2,128],125:[2,128],126:[2,128],129:[2,128],130:[2,128],131:[2,128],132:[2,128],133:[2,128],134:[2,128]},{1:[2,140],6:[2,140],25:[2,140],26:[2,140],47:[2,140],52:[2,140],55:[2,140],70:[2,140],75:[2,140],83:[2,140],88:[2,140],90:[2,140],99:[2,140],101:[2,140],102:[2,140],103:[2,140],107:[2,140],115:[2,140],123:[2,140],125:[2,140],126:[2,140],129:[2,140],130:[2,140],131:[2,140],132:[2,140],133:[2,140],134:[2,140]},{1:[2,148],6:[2,148],25:[2,148],26:[2,148],47:[2,148],52:[2,148],55:[2,148],70:[2,148],75:[2,148],83:[2,148],88:[2,148],90:[2,148],99:[2,148],101:[2,148],102:[2,148],103:[2,148],107:[2,148],115:[2,148],123:[2,148],125:[2,148],126:[2,148],129:[2,148],130:[2,148],131:[2,148],132:[2,148],133:[2,148],134:[2,148]},{25:[1,210],100:85,101:[1,63],103:[1,64],106:86,107:[1,66],108:67,123:[1,84],125:[1,78],126:[1,77],129:[1,76],130:[1,79],131:[1,80],132:[1,81],133:[1,82],134:[1,83]},{117:211,119:212,120:[1,213]},{1:[2,92],6:[2,92],25:[2,92],26:[2,92],47:[2,92],52:[2,92],55:[2,92],70:[2,92],75:[2,92],83:[2,92],88:[2,92],90:[2,92],99:[2,92],101:[2,92],102:[2,92],103:[2,92],107:[2,92],115:[2,92],123:[2,92],125:[2,92],126:[2,92],129:[2,92],130:[2,92],131:[2,92],132:[2,92],133:[2,92],134:[2,92]},{8:214,9:115,10:20,11:21,12:[1,22],13:8,14:9,15:10,16:11,17:12,18:13,19:14,20:15,21:16,22:17,23:18,24:19,27:60,28:[1,71],29:49,30:[1,69],31:[1,70],32:24,33:[1,50],34:[1,51],35:[1,52],36:[1,53],37:23,42:61,43:[1,45],44:[1,46],45:[1,29],48:30,49:[1,58],50:[1,59],56:47,57:48,59:36,61:25,62:26,63:27,73:[1,68],76:[1,43],80:[1,28],85:[1,56],86:[1,57],87:[1,55],93:[1,38],97:[1,44],98:[1,54],100:39,101:[1,63],103:[1,64],104:40,105:[1,65],106:41,107:[1,66],108:67,116:[1,42],121:37,122:[1,62],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{1:[2,95],5:215,6:[2,95],25:[1,5],26:[2,95],47:[2,95],52:[2,95],55:[2,95],64:[2,68],65:[2,68],66:[2,68],68:[2,68],70:[2,95],71:[2,68],75:[2,95],77:[1,216],81:[2,68],82:[2,68],83:[2,95],88:[2,95],90:[2,95],99:[2,95],101:[2,95],102:[2,95],103:[2,95],107:[2,95],115:[2,95],123:[2,95],125:[2,95],126:[2,95],129:[2,95],130:[2,95],131:[2,95],132:[2,95],133:[2,95],134:[2,95]},{1:[2,133],6:[2,133],25:[2,133],26:[2,133],47:[2,133],52:[2,133],55:[2,133],70:[2,133],75:[2,133],83:[2,133],88:[2,133],90:[2,133],99:[2,133],100:85,101:[2,133],102:[2,133],103:[2,133],106:86,107:[2,133],108:67,115:[2,133],123:[2,133],125:[1,78],126:[1,77],129:[1,76],130:[1,79],131:[1,80],132:[1,81],133:[1,82],134:[1,83]},{1:[2,44],6:[2,44],26:[2,44],99:[2,44],100:85,101:[2,44],103:[2,44],106:86,107:[2,44],108:67,123:[2,44],125:[1,78],126:[1,77],129:[1,76],130:[1,79],131:[1,80],132:[1,81],133:[1,82],134:[1,83]},{6:[1,72],99:[1,217]},{4:218,7:4,8:6,9:7,10:20,11:21,12:[1,22],13:8,14:9,15:10,16:11,17:12,18:13,19:14,20:15,21:16,22:17,23:18,24:19,27:60,28:[1,71],29:49,30:[1,69],31:[1,70],32:24,33:[1,50],34:[1,51],35:[1,52],36:[1,53],37:23,42:61,43:[1,45],44:[1,46],45:[1,29],48:30,49:[1,58],50:[1,59],56:47,57:48,59:36,61:25,62:26,63:27,73:[1,68],76:[1,43],80:[1,28],85:[1,56],86:[1,57],87:[1,55],93:[1,38],97:[1,44],98:[1,54],100:39,101:[1,63],103:[1,64],104:40,105:[1,65],106:41,107:[1,66],108:67,116:[1,42],121:37,122:[1,62],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{6:[2,124],25:[2,124],52:[2,124],55:[1,220],88:[2,124],89:219,90:[1,188],100:85,101:[1,63],103:[1,64],106:86,107:[1,66],108:67,123:[1,84],125:[1,78],126:[1,77],129:[1,76],130:[1,79],131:[1,80],132:[1,81],133:[1,82],134:[1,83]},{1:[2,110],6:[2,110],25:[2,110],26:[2,110],38:[2,110],47:[2,110],52:[2,110],55:[2,110],64:[2,110],65:[2,110],66:[2,110],68:[2,110],70:[2,110],71:[2,110],75:[2,110],81:[2,110],82:[2,110],83:[2,110],88:[2,110],90:[2,110],99:[2,110],101:[2,110],102:[2,110],103:[2,110],107:[2,110],113:[2,110],114:[2,110],115:[2,110],123:[2,110],125:[2,110],126:[2,110],129:[2,110],130:[2,110],131:[2,110],132:[2,110],133:[2,110],134:[2,110]},{6:[2,51],25:[2,51],51:221,52:[1,222],88:[2,51]},{6:[2,119],25:[2,119],26:[2,119],52:[2,119],83:[2,119],88:[2,119]},{8:197,9:115,10:20,11:21,12:[1,22],13:8,14:9,15:10,16:11,17:12,18:13,19:14,20:15,21:16,22:17,23:18,24:19,25:[1,144],27:60,28:[1,71],29:49,30:[1,69],31:[1,70],32:24,33:[1,50],34:[1,51],35:[1,52],36:[1,53],37:23,42:61,43:[1,45],44:[1,46],45:[1,29],48:30,49:[1,58],50:[1,59],56:47,57:48,58:145,59:36,61:25,62:26,63:27,73:[1,68],76:[1,43],80:[1,28],84:223,85:[1,56],86:[1,57],87:[1,55],91:143,93:[1,38],97:[1,44],98:[1,54],100:39,101:[1,63],103:[1,64],104:40,105:[1,65],106:41,107:[1,66],108:67,116:[1,42],121:37,122:[1,62],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{6:[2,125],25:[2,125],26:[2,125],52:[2,125],83:[2,125],88:[2,125]},{1:[2,109],6:[2,109],25:[2,109],26:[2,109],38:[2,109],41:[2,109],47:[2,109],52:[2,109],55:[2,109],64:[2,109],65:[2,109],66:[2,109],68:[2,109],70:[2,109],71:[2,109],75:[2,109],77:[2,109],81:[2,109],82:[2,109],83:[2,109],88:[2,109],90:[2,109],99:[2,109],101:[2,109],102:[2,109],103:[2,109],107:[2,109],115:[2,109],123:[2,109],125:[2,109],126:[2,109],127:[2,109],128:[2,109],129:[2,109],130:[2,109],131:[2,109],132:[2,109],133:[2,109],134:[2,109],135:[2,109]},{5:224,25:[1,5],100:85,101:[1,63],103:[1,64],106:86,107:[1,66],108:67,123:[1,84],125:[1,78],126:[1,77],129:[1,76],130:[1,79],131:[1,80],132:[1,81],133:[1,82],134:[1,83]},{1:[2,136],6:[2,136],25:[2,136],26:[2,136],47:[2,136],52:[2,136],55:[2,136],70:[2,136],75:[2,136],83:[2,136],88:[2,136],90:[2,136],99:[2,136],100:85,101:[1,63],102:[1,225],103:[1,64],106:86,107:[1,66],108:67,115:[2,136],123:[2,136],125:[1,78],126:[1,77],129:[1,76],130:[1,79],131:[1,80],132:[1,81],133:[1,82],134:[1,83]},{1:[2,138],6:[2,138],25:[2,138],26:[2,138],47:[2,138],52:[2,138],55:[2,138],70:[2,138],75:[2,138],83:[2,138],88:[2,138],90:[2,138],99:[2,138],100:85,101:[1,63],102:[1,226],103:[1,64],106:86,107:[1,66],108:67,115:[2,138],123:[2,138],125:[1,78],126:[1,77],129:[1,76],130:[1,79],131:[1,80],132:[1,81],133:[1,82],134:[1,83]},{1:[2,144],6:[2,144],25:[2,144],26:[2,144],47:[2,144],52:[2,144],55:[2,144],70:[2,144],75:[2,144],83:[2,144],88:[2,144],90:[2,144],99:[2,144],101:[2,144],102:[2,144],103:[2,144],107:[2,144],115:[2,144],123:[2,144],125:[2,144],126:[2,144],129:[2,144],130:[2,144],131:[2,144],132:[2,144],133:[2,144],134:[2,144]},{1:[2,145],6:[2,145],25:[2,145],26:[2,145],47:[2,145],52:[2,145],55:[2,145],70:[2,145],75:[2,145],83:[2,145],88:[2,145],90:[2,145],99:[2,145],100:85,101:[1,63],102:[2,145],103:[1,64],106:86,107:[1,66],108:67,115:[2,145],123:[2,145],125:[1,78],126:[1,77],129:[1,76],130:[1,79],131:[1,80],132:[1,81],133:[1,82],134:[1,83]},{1:[2,149],6:[2,149],25:[2,149],26:[2,149],47:[2,149],52:[2,149],55:[2,149],70:[2,149],75:[2,149],83:[2,149],88:[2,149],90:[2,149],99:[2,149],101:[2,149],102:[2,149],103:[2,149],107:[2,149],115:[2,149],123:[2,149],125:[2,149],126:[2,149],129:[2,149],130:[2,149],131:[2,149],132:[2,149],133:[2,149],134:[2,149]},{113:[2,151],114:[2,151]},{27:156,28:[1,71],56:157,57:158,73:[1,68],87:[1,112],110:227,112:155},{52:[1,228],113:[2,156],114:[2,156]},{52:[2,153],113:[2,153],114:[2,153]},{52:[2,154],113:[2,154],114:[2,154]},{52:[2,155],113:[2,155],114:[2,155]},{1:[2,150],6:[2,150],25:[2,150],26:[2,150],47:[2,150],52:[2,150],55:[2,150],70:[2,150],75:[2,150],83:[2,150],88:[2,150],90:[2,150],99:[2,150],101:[2,150],102:[2,150],103:[2,150],107:[2,150],115:[2,150],123:[2,150],125:[2,150],126:[2,150],129:[2,150],130:[2,150],131:[2,150],132:[2,150],133:[2,150],134:[2,150]},{8:229,9:115,10:20,11:21,12:[1,22],13:8,14:9,15:10,16:11,17:12,18:13,19:14,20:15,21:16,22:17,23:18,24:19,27:60,28:[1,71],29:49,30:[1,69],31:[1,70],32:24,33:[1,50],34:[1,51],35:[1,52],36:[1,53],37:23,42:61,43:[1,45],44:[1,46],45:[1,29],48:30,49:[1,58],50:[1,59],56:47,57:48,59:36,61:25,62:26,63:27,73:[1,68],76:[1,43],80:[1,28],85:[1,56],86:[1,57],87:[1,55],93:[1,38],97:[1,44],98:[1,54],100:39,101:[1,63],103:[1,64],104:40,105:[1,65],106:41,107:[1,66],108:67,116:[1,42],121:37,122:[1,62],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{8:230,9:115,10:20,11:21,12:[1,22],13:8,14:9,15:10,16:11,17:12,18:13,19:14,20:15,21:16,22:17,23:18,24:19,27:60,28:[1,71],29:49,30:[1,69],31:[1,70],32:24,33:[1,50],34:[1,51],35:[1,52],36:[1,53],37:23,42:61,43:[1,45],44:[1,46],45:[1,29],48:30,49:[1,58],50:[1,59],56:47,57:48,59:36,61:25,62:26,63:27,73:[1,68],76:[1,43],80:[1,28],85:[1,56],86:[1,57],87:[1,55],93:[1,38],97:[1,44],98:[1,54],100:39,101:[1,63],103:[1,64],104:40,105:[1,65],106:41,107:[1,66],108:67,116:[1,42],121:37,122:[1,62],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{6:[2,51],25:[2,51],51:231,52:[1,232],75:[2,51]},{6:[2,87],25:[2,87],26:[2,87],52:[2,87],75:[2,87]},{6:[2,37],25:[2,37],26:[2,37],41:[1,233],52:[2,37],75:[2,37]},{6:[2,40],25:[2,40],26:[2,40],52:[2,40],75:[2,40]},{6:[2,41],25:[2,41],26:[2,41],41:[2,41],52:[2,41],75:[2,41]},{6:[2,42],25:[2,42],26:[2,42],41:[2,42],52:[2,42],75:[2,42]},{6:[2,43],25:[2,43],26:[2,43],41:[2,43],52:[2,43],75:[2,43]},{1:[2,5],6:[2,5],26:[2,5],99:[2,5]},{1:[2,25],6:[2,25],25:[2,25],26:[2,25],47:[2,25],52:[2,25],55:[2,25],70:[2,25],75:[2,25],83:[2,25],88:[2,25],90:[2,25],95:[2,25],96:[2,25],99:[2,25],101:[2,25],102:[2,25],103:[2,25],107:[2,25],115:[2,25],118:[2,25],120:[2,25],123:[2,25],125:[2,25],126:[2,25],129:[2,25],130:[2,25],131:[2,25],132:[2,25],133:[2,25],134:[2,25]},{1:[2,187],6:[2,187],25:[2,187],26:[2,187],47:[2,187],52:[2,187],55:[2,187],70:[2,187],75:[2,187],83:[2,187],88:[2,187],90:[2,187],99:[2,187],100:85,101:[2,187],102:[2,187],103:[2,187],106:86,107:[2,187],108:67,115:[2,187],123:[2,187],125:[2,187],126:[2,187],129:[1,76],130:[1,79],131:[2,187],132:[2,187],133:[2,187],134:[2,187]},{1:[2,188],6:[2,188],25:[2,188],26:[2,188],47:[2,188],52:[2,188],55:[2,188],70:[2,188],75:[2,188],83:[2,188],88:[2,188],90:[2,188],99:[2,188],100:85,101:[2,188],102:[2,188],103:[2,188],106:86,107:[2,188],108:67,115:[2,188],123:[2,188],125:[2,188],126:[2,188],129:[1,76],130:[1,79],131:[2,188],132:[2,188],133:[2,188],134:[2,188]},{1:[2,189],6:[2,189],25:[2,189],26:[2,189],47:[2,189],52:[2,189],55:[2,189],70:[2,189],75:[2,189],83:[2,189],88:[2,189],90:[2,189],99:[2,189],100:85,101:[2,189],102:[2,189],103:[2,189],106:86,107:[2,189],108:67,115:[2,189],123:[2,189],125:[2,189],126:[2,189],129:[1,76],130:[2,189],131:[2,189],132:[2,189],133:[2,189],134:[2,189]},{1:[2,190],6:[2,190],25:[2,190],26:[2,190],47:[2,190],52:[2,190],55:[2,190],70:[2,190],75:[2,190],83:[2,190],88:[2,190],90:[2,190],99:[2,190],100:85,101:[2,190],102:[2,190],103:[2,190],106:86,107:[2,190],108:67,115:[2,190],123:[2,190],125:[1,78],126:[1,77],129:[1,76],130:[1,79],131:[2,190],132:[2,190],133:[2,190],134:[2,190]},{1:[2,191],6:[2,191],25:[2,191],26:[2,191],47:[2,191],52:[2,191],55:[2,191],70:[2,191],75:[2,191],83:[2,191],88:[2,191],90:[2,191],99:[2,191],100:85,101:[2,191],102:[2,191],103:[2,191],106:86,107:[2,191],108:67,115:[2,191],123:[2,191],125:[1,78],126:[1,77],129:[1,76],130:[1,79],131:[1,80],132:[2,191],133:[2,191],134:[1,83]},{1:[2,192],6:[2,192],25:[2,192],26:[2,192],47:[2,192],52:[2,192],55:[2,192],70:[2,192],75:[2,192],83:[2,192],88:[2,192],90:[2,192],99:[2,192],100:85,101:[2,192],102:[2,192],103:[2,192],106:86,107:[2,192],108:67,115:[2,192],123:[2,192],125:[1,78],126:[1,77],129:[1,76],130:[1,79],131:[1,80],132:[1,81],133:[2,192],134:[1,83]},{1:[2,193],6:[2,193],25:[2,193],26:[2,193],47:[2,193],52:[2,193],55:[2,193],70:[2,193],75:[2,193],83:[2,193],88:[2,193],90:[2,193],99:[2,193],100:85,101:[2,193],102:[2,193],103:[2,193],106:86,107:[2,193],108:67,115:[2,193],123:[2,193],125:[1,78],126:[1,77],129:[1,76],130:[1,79],131:[1,80],132:[2,193],133:[2,193],134:[2,193]},{1:[2,178],6:[2,178],25:[2,178],26:[2,178],47:[2,178],52:[2,178],55:[2,178],70:[2,178],75:[2,178],83:[2,178],88:[2,178],90:[2,178],99:[2,178],100:85,101:[1,63],102:[2,178],103:[1,64],106:86,107:[1,66],108:67,115:[2,178],123:[1,84],125:[1,78],126:[1,77],129:[1,76],130:[1,79],131:[1,80],132:[1,81],133:[1,82],134:[1,83]},{1:[2,177],6:[2,177],25:[2,177],26:[2,177],47:[2,177],52:[2,177],55:[2,177],70:[2,177],75:[2,177],83:[2,177],88:[2,177],90:[2,177],99:[2,177],100:85,101:[1,63],102:[2,177],103:[1,64],106:86,107:[1,66],108:67,115:[2,177],123:[1,84],125:[1,78],126:[1,77],129:[1,76],130:[1,79],131:[1,80],132:[1,81],133:[1,82],134:[1,83]},{1:[2,99],6:[2,99],25:[2,99],26:[2,99],47:[2,99],52:[2,99],55:[2,99],64:[2,99],65:[2,99],66:[2,99],68:[2,99],70:[2,99],71:[2,99],75:[2,99],81:[2,99],82:[2,99],83:[2,99],88:[2,99],90:[2,99],99:[2,99],101:[2,99],102:[2,99],103:[2,99],107:[2,99],115:[2,99],123:[2,99],125:[2,99],126:[2,99],129:[2,99],130:[2,99],131:[2,99],132:[2,99],133:[2,99],134:[2,99]},{1:[2,76],6:[2,76],25:[2,76],26:[2,76],38:[2,76],47:[2,76],52:[2,76],55:[2,76],64:[2,76],65:[2,76],66:[2,76],68:[2,76],70:[2,76],71:[2,76],75:[2,76],77:[2,76],81:[2,76],82:[2,76],83:[2,76],88:[2,76],90:[2,76],99:[2,76],101:[2,76],102:[2,76],103:[2,76],107:[2,76],115:[2,76],123:[2,76],125:[2,76],126:[2,76],127:[2,76],128:[2,76],129:[2,76],130:[2,76],131:[2,76],132:[2,76],133:[2,76],134:[2,76],135:[2,76]},{1:[2,77],6:[2,77],25:[2,77],26:[2,77],38:[2,77],47:[2,77],52:[2,77],55:[2,77],64:[2,77],65:[2,77],66:[2,77],68:[2,77],70:[2,77],71:[2,77],75:[2,77],77:[2,77],81:[2,77],82:[2,77],83:[2,77],88:[2,77],90:[2,77],99:[2,77],101:[2,77],102:[2,77],103:[2,77],107:[2,77],115:[2,77],123:[2,77],125:[2,77],126:[2,77],127:[2,77],128:[2,77],129:[2,77],130:[2,77],131:[2,77],132:[2,77],133:[2,77],134:[2,77],135:[2,77]},{1:[2,78],6:[2,78],25:[2,78],26:[2,78],38:[2,78],47:[2,78],52:[2,78],55:[2,78],64:[2,78],65:[2,78],66:[2,78],68:[2,78],70:[2,78],71:[2,78],75:[2,78],77:[2,78],81:[2,78],82:[2,78],83:[2,78],88:[2,78],90:[2,78],99:[2,78],101:[2,78],102:[2,78],103:[2,78],107:[2,78],115:[2,78],123:[2,78],125:[2,78],126:[2,78],127:[2,78],128:[2,78],129:[2,78],130:[2,78],131:[2,78],132:[2,78],133:[2,78],134:[2,78],135:[2,78]},{70:[1,234]},{55:[1,189],70:[2,83],89:235,90:[1,188],100:85,101:[1,63],103:[1,64],106:86,107:[1,66],108:67,123:[1,84],125:[1,78],126:[1,77],129:[1,76],130:[1,79],131:[1,80],132:[1,81],133:[1,82],134:[1,83]},{70:[2,84]},{8:236,9:115,10:20,11:21,12:[1,22],13:8,14:9,15:10,16:11,17:12,18:13,19:14,20:15,21:16,22:17,23:18,24:19,27:60,28:[1,71],29:49,30:[1,69],31:[1,70],32:24,33:[1,50],34:[1,51],35:[1,52],36:[1,53],37:23,42:61,43:[1,45],44:[1,46],45:[1,29],48:30,49:[1,58],50:[1,59],56:47,57:48,59:36,61:25,62:26,63:27,70:[2,118],73:[1,68],76:[1,43],80:[1,28],85:[1,56],86:[1,57],87:[1,55],93:[1,38],97:[1,44],98:[1,54],100:39,101:[1,63],103:[1,64],104:40,105:[1,65],106:41,107:[1,66],108:67,116:[1,42],121:37,122:[1,62],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{12:[2,112],28:[2,112],30:[2,112],31:[2,112],33:[2,112],34:[2,112],35:[2,112],36:[2,112],43:[2,112],44:[2,112],45:[2,112],49:[2,112],50:[2,112],70:[2,112],73:[2,112],76:[2,112],80:[2,112],85:[2,112],86:[2,112],87:[2,112],93:[2,112],97:[2,112],98:[2,112],101:[2,112],103:[2,112],105:[2,112],107:[2,112],116:[2,112],122:[2,112],124:[2,112],125:[2,112],126:[2,112],127:[2,112],128:[2,112]},{12:[2,113],28:[2,113],30:[2,113],31:[2,113],33:[2,113],34:[2,113],35:[2,113],36:[2,113],43:[2,113],44:[2,113],45:[2,113],49:[2,113],50:[2,113],70:[2,113],73:[2,113],76:[2,113],80:[2,113],85:[2,113],86:[2,113],87:[2,113],93:[2,113],97:[2,113],98:[2,113],101:[2,113],103:[2,113],105:[2,113],107:[2,113],116:[2,113],122:[2,113],124:[2,113],125:[2,113],126:[2,113],127:[2,113],128:[2,113]},{1:[2,82],6:[2,82],25:[2,82],26:[2,82],38:[2,82],47:[2,82],52:[2,82],55:[2,82],64:[2,82],65:[2,82],66:[2,82],68:[2,82],70:[2,82],71:[2,82],75:[2,82],77:[2,82],81:[2,82],82:[2,82],83:[2,82],88:[2,82],90:[2,82],99:[2,82],101:[2,82],102:[2,82],103:[2,82],107:[2,82],115:[2,82],123:[2,82],125:[2,82],126:[2,82],127:[2,82],128:[2,82],129:[2,82],130:[2,82],131:[2,82],132:[2,82],133:[2,82],134:[2,82],135:[2,82]},{1:[2,100],6:[2,100],25:[2,100],26:[2,100],47:[2,100],52:[2,100],55:[2,100],64:[2,100],65:[2,100],66:[2,100],68:[2,100],70:[2,100],71:[2,100],75:[2,100],81:[2,100],82:[2,100],83:[2,100],88:[2,100],90:[2,100],99:[2,100],101:[2,100],102:[2,100],103:[2,100],107:[2,100],115:[2,100],123:[2,100],125:[2,100],126:[2,100],129:[2,100],130:[2,100],131:[2,100],132:[2,100],133:[2,100],134:[2,100]},{1:[2,34],6:[2,34],25:[2,34],26:[2,34],47:[2,34],52:[2,34],55:[2,34],70:[2,34],75:[2,34],83:[2,34],88:[2,34],90:[2,34],99:[2,34],100:85,101:[2,34],102:[2,34],103:[2,34],106:86,107:[2,34],108:67,115:[2,34],123:[2,34],125:[1,78],126:[1,77],129:[1,76],130:[1,79],131:[1,80],132:[1,81],133:[1,82],134:[1,83]},{8:237,9:115,10:20,11:21,12:[1,22],13:8,14:9,15:10,16:11,17:12,18:13,19:14,20:15,21:16,22:17,23:18,24:19,27:60,28:[1,71],29:49,30:[1,69],31:[1,70],32:24,33:[1,50],34:[1,51],35:[1,52],36:[1,53],37:23,42:61,43:[1,45],44:[1,46],45:[1,29],48:30,49:[1,58],50:[1,59],56:47,57:48,59:36,61:25,62:26,63:27,73:[1,68],76:[1,43],80:[1,28],85:[1,56],86:[1,57],87:[1,55],93:[1,38],97:[1,44],98:[1,54],100:39,101:[1,63],103:[1,64],104:40,105:[1,65],106:41,107:[1,66],108:67,116:[1,42],121:37,122:[1,62],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{8:238,9:115,10:20,11:21,12:[1,22],13:8,14:9,15:10,16:11,17:12,18:13,19:14,20:15,21:16,22:17,23:18,24:19,27:60,28:[1,71],29:49,30:[1,69],31:[1,70],32:24,33:[1,50],34:[1,51],35:[1,52],36:[1,53],37:23,42:61,43:[1,45],44:[1,46],45:[1,29],48:30,49:[1,58],50:[1,59],56:47,57:48,59:36,61:25,62:26,63:27,73:[1,68],76:[1,43],80:[1,28],85:[1,56],86:[1,57],87:[1,55],93:[1,38],97:[1,44],98:[1,54],100:39,101:[1,63],103:[1,64],104:40,105:[1,65],106:41,107:[1,66],108:67,116:[1,42],121:37,122:[1,62],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{1:[2,105],6:[2,105],25:[2,105],26:[2,105],47:[2,105],52:[2,105],55:[2,105],64:[2,105],65:[2,105],66:[2,105],68:[2,105],70:[2,105],71:[2,105],75:[2,105],81:[2,105],82:[2,105],83:[2,105],88:[2,105],90:[2,105],99:[2,105],101:[2,105],102:[2,105],103:[2,105],107:[2,105],115:[2,105],123:[2,105],125:[2,105],126:[2,105],129:[2,105],130:[2,105],131:[2,105],132:[2,105],133:[2,105],134:[2,105]},{6:[2,51],25:[2,51],51:239,52:[1,222],83:[2,51]},{6:[2,124],25:[2,124],26:[2,124],52:[2,124],55:[1,240],83:[2,124],88:[2,124],100:85,101:[1,63],103:[1,64],106:86,107:[1,66],108:67,123:[1,84],125:[1,78],126:[1,77],129:[1,76],130:[1,79],131:[1,80],132:[1,81],133:[1,82],134:[1,83]},{48:241,49:[1,58],50:[1,59]},{27:107,28:[1,71],42:108,53:242,54:106,56:109,57:110,73:[1,68],86:[1,111],87:[1,112]},{47:[2,57],52:[2,57]},{8:243,9:115,10:20,11:21,12:[1,22],13:8,14:9,15:10,16:11,17:12,18:13,19:14,20:15,21:16,22:17,23:18,24:19,27:60,28:[1,71],29:49,30:[1,69],31:[1,70],32:24,33:[1,50],34:[1,51],35:[1,52],36:[1,53],37:23,42:61,43:[1,45],44:[1,46],45:[1,29],48:30,49:[1,58],50:[1,59],56:47,57:48,59:36,61:25,62:26,63:27,73:[1,68],76:[1,43],80:[1,28],85:[1,56],86:[1,57],87:[1,55],93:[1,38],97:[1,44],98:[1,54],100:39,101:[1,63],103:[1,64],104:40,105:[1,65],106:41,107:[1,66],108:67,116:[1,42],121:37,122:[1,62],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{1:[2,194],6:[2,194],25:[2,194],26:[2,194],47:[2,194],52:[2,194],55:[2,194],70:[2,194],75:[2,194],83:[2,194],88:[2,194],90:[2,194],99:[2,194],100:85,101:[2,194],102:[2,194],103:[2,194],106:86,107:[2,194],108:67,115:[2,194],123:[2,194],125:[1,78],126:[1,77],129:[1,76],130:[1,79],131:[1,80],132:[1,81],133:[1,82],134:[1,83]},{8:244,9:115,10:20,11:21,12:[1,22],13:8,14:9,15:10,16:11,17:12,18:13,19:14,20:15,21:16,22:17,23:18,24:19,27:60,28:[1,71],29:49,30:[1,69],31:[1,70],32:24,33:[1,50],34:[1,51],35:[1,52],36:[1,53],37:23,42:61,43:[1,45],44:[1,46],45:[1,29],48:30,49:[1,58],50:[1,59],56:47,57:48,59:36,61:25,62:26,63:27,73:[1,68],76:[1,43],80:[1,28],85:[1,56],86:[1,57],87:[1,55],93:[1,38],97:[1,44],98:[1,54],100:39,101:[1,63],103:[1,64],104:40,105:[1,65],106:41,107:[1,66],108:67,116:[1,42],121:37,122:[1,62],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{1:[2,196],6:[2,196],25:[2,196],26:[2,196],47:[2,196],52:[2,196],55:[2,196],70:[2,196],75:[2,196],83:[2,196],88:[2,196],90:[2,196],99:[2,196],100:85,101:[2,196],102:[2,196],103:[2,196],106:86,107:[2,196],108:67,115:[2,196],123:[2,196],125:[1,78],126:[1,77],129:[1,76],130:[1,79],131:[1,80],132:[1,81],133:[1,82],134:[1,83]},{1:[2,176],6:[2,176],25:[2,176],26:[2,176],47:[2,176],52:[2,176],55:[2,176],70:[2,176],75:[2,176],83:[2,176],88:[2,176],90:[2,176],99:[2,176],101:[2,176],102:[2,176],103:[2,176],107:[2,176],115:[2,176],123:[2,176],125:[2,176],126:[2,176],129:[2,176],130:[2,176],131:[2,176],132:[2,176],133:[2,176],134:[2,176]},{8:245,9:115,10:20,11:21,12:[1,22],13:8,14:9,15:10,16:11,17:12,18:13,19:14,20:15,21:16,22:17,23:18,24:19,27:60,28:[1,71],29:49,30:[1,69],31:[1,70],32:24,33:[1,50],34:[1,51],35:[1,52],36:[1,53],37:23,42:61,43:[1,45],44:[1,46],45:[1,29],48:30,49:[1,58],50:[1,59],56:47,57:48,59:36,61:25,62:26,63:27,73:[1,68],76:[1,43],80:[1,28],85:[1,56],86:[1,57],87:[1,55],93:[1,38],97:[1,44],98:[1,54],100:39,101:[1,63],103:[1,64],104:40,105:[1,65],106:41,107:[1,66],108:67,116:[1,42],121:37,122:[1,62],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{1:[2,129],6:[2,129],25:[2,129],26:[2,129],47:[2,129],52:[2,129],55:[2,129],70:[2,129],75:[2,129],83:[2,129],88:[2,129],90:[2,129],95:[1,246],99:[2,129],101:[2,129],102:[2,129],103:[2,129],107:[2,129],115:[2,129],123:[2,129],125:[2,129],126:[2,129],129:[2,129],130:[2,129],131:[2,129],132:[2,129],133:[2,129],134:[2,129]},{5:247,25:[1,5]},{27:248,28:[1,71]},{117:249,119:212,120:[1,213]},{26:[1,250],118:[1,251],119:252,120:[1,213]},{26:[2,169],118:[2,169],120:[2,169]},{8:254,9:115,10:20,11:21,12:[1,22],13:8,14:9,15:10,16:11,17:12,18:13,19:14,20:15,21:16,22:17,23:18,24:19,27:60,28:[1,71],29:49,30:[1,69],31:[1,70],32:24,33:[1,50],34:[1,51],35:[1,52],36:[1,53],37:23,42:61,43:[1,45],44:[1,46],45:[1,29],48:30,49:[1,58],50:[1,59],56:47,57:48,59:36,61:25,62:26,63:27,73:[1,68],76:[1,43],80:[1,28],85:[1,56],86:[1,57],87:[1,55],92:253,93:[1,38],97:[1,44],98:[1,54],100:39,101:[1,63],103:[1,64],104:40,105:[1,65],106:41,107:[1,66],108:67,116:[1,42],121:37,122:[1,62],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{1:[2,93],5:255,6:[2,93],25:[1,5],26:[2,93],47:[2,93],52:[2,93],55:[2,93],70:[2,93],75:[2,93],83:[2,93],88:[2,93],90:[2,93],99:[2,93],100:85,101:[1,63],102:[2,93],103:[1,64],106:86,107:[1,66],108:67,115:[2,93],123:[2,93],125:[1,78],126:[1,77],129:[1,76],130:[1,79],131:[1,80],132:[1,81],133:[1,82],134:[1,83]},{1:[2,96],6:[2,96],25:[2,96],26:[2,96],47:[2,96],52:[2,96],55:[2,96],70:[2,96],75:[2,96],83:[2,96],88:[2,96],90:[2,96],99:[2,96],101:[2,96],102:[2,96],103:[2,96],107:[2,96],115:[2,96],123:[2,96],125:[2,96],126:[2,96],129:[2,96],130:[2,96],131:[2,96],132:[2,96],133:[2,96],134:[2,96]},{8:256,9:115,10:20,11:21,12:[1,22],13:8,14:9,15:10,16:11,17:12,18:13,19:14,20:15,21:16,22:17,23:18,24:19,27:60,28:[1,71],29:49,30:[1,69],31:[1,70],32:24,33:[1,50],34:[1,51],35:[1,52],36:[1,53],37:23,42:61,43:[1,45],44:[1,46],45:[1,29],48:30,49:[1,58],50:[1,59],56:47,57:48,59:36,61:25,62:26,63:27,73:[1,68],76:[1,43],80:[1,28],85:[1,56],86:[1,57],87:[1,55],93:[1,38],97:[1,44],98:[1,54],100:39,101:[1,63],103:[1,64],104:40,105:[1,65],106:41,107:[1,66],108:67,116:[1,42],121:37,122:[1,62],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{1:[2,134],6:[2,134],25:[2,134],26:[2,134],47:[2,134],52:[2,134],55:[2,134],64:[2,134],65:[2,134],66:[2,134],68:[2,134],70:[2,134],71:[2,134],75:[2,134],81:[2,134],82:[2,134],83:[2,134],88:[2,134],90:[2,134],99:[2,134],101:[2,134],102:[2,134],103:[2,134],107:[2,134],115:[2,134],123:[2,134],125:[2,134],126:[2,134],129:[2,134],130:[2,134],131:[2,134],132:[2,134],133:[2,134],134:[2,134]},{6:[1,72],26:[1,257]},{8:258,9:115,10:20,11:21,12:[1,22],13:8,14:9,15:10,16:11,17:12,18:13,19:14,20:15,21:16,22:17,23:18,24:19,27:60,28:[1,71],29:49,30:[1,69],31:[1,70],32:24,33:[1,50],34:[1,51],35:[1,52],36:[1,53],37:23,42:61,43:[1,45],44:[1,46],45:[1,29],48:30,49:[1,58],50:[1,59],56:47,57:48,59:36,61:25,62:26,63:27,73:[1,68],76:[1,43],80:[1,28],85:[1,56],86:[1,57],87:[1,55],93:[1,38],97:[1,44],98:[1,54],100:39,101:[1,63],103:[1,64],104:40,105:[1,65],106:41,107:[1,66],108:67,116:[1,42],121:37,122:[1,62],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{6:[2,63],12:[2,113],25:[2,63],28:[2,113],30:[2,113],31:[2,113],33:[2,113],34:[2,113],35:[2,113],36:[2,113],43:[2,113],44:[2,113],45:[2,113],49:[2,113],50:[2,113],52:[2,63],73:[2,113],76:[2,113],80:[2,113],85:[2,113],86:[2,113],87:[2,113],88:[2,63],93:[2,113],97:[2,113],98:[2,113],101:[2,113],103:[2,113],105:[2,113],107:[2,113],116:[2,113],122:[2,113],124:[2,113],125:[2,113],126:[2,113],127:[2,113],128:[2,113]},{6:[1,260],25:[1,261],88:[1,259]},{6:[2,52],8:197,9:115,10:20,11:21,12:[1,22],13:8,14:9,15:10,16:11,17:12,18:13,19:14,20:15,21:16,22:17,23:18,24:19,25:[2,52],26:[2,52],27:60,28:[1,71],29:49,30:[1,69],31:[1,70],32:24,33:[1,50],34:[1,51],35:[1,52],36:[1,53],37:23,42:61,43:[1,45],44:[1,46],45:[1,29],48:30,49:[1,58],50:[1,59],56:47,57:48,58:145,59:36,61:25,62:26,63:27,73:[1,68],76:[1,43],80:[1,28],83:[2,52],85:[1,56],86:[1,57],87:[1,55],88:[2,52],91:262,93:[1,38],97:[1,44],98:[1,54],100:39,101:[1,63],103:[1,64],104:40,105:[1,65],106:41,107:[1,66],108:67,116:[1,42],121:37,122:[1,62],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{6:[2,51],25:[2,51],26:[2,51],51:263,52:[1,222]},{1:[2,173],6:[2,173],25:[2,173],26:[2,173],47:[2,173],52:[2,173],55:[2,173],70:[2,173],75:[2,173],83:[2,173],88:[2,173],90:[2,173],99:[2,173],101:[2,173],102:[2,173],103:[2,173],107:[2,173],115:[2,173],118:[2,173],123:[2,173],125:[2,173],126:[2,173],129:[2,173],130:[2,173],131:[2,173],132:[2,173],133:[2,173],134:[2,173]},{8:264,9:115,10:20,11:21,12:[1,22],13:8,14:9,15:10,16:11,17:12,18:13,19:14,20:15,21:16,22:17,23:18,24:19,27:60,28:[1,71],29:49,30:[1,69],31:[1,70],32:24,33:[1,50],34:[1,51],35:[1,52],36:[1,53],37:23,42:61,43:[1,45],44:[1,46],45:[1,29],48:30,49:[1,58],50:[1,59],56:47,57:48,59:36,61:25,62:26,63:27,73:[1,68],76:[1,43],80:[1,28],85:[1,56],86:[1,57],87:[1,55],93:[1,38],97:[1,44],98:[1,54],100:39,101:[1,63],103:[1,64],104:40,105:[1,65],106:41,107:[1,66],108:67,116:[1,42],121:37,122:[1,62],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{8:265,9:115,10:20,11:21,12:[1,22],13:8,14:9,15:10,16:11,17:12,18:13,19:14,20:15,21:16,22:17,23:18,24:19,27:60,28:[1,71],29:49,30:[1,69],31:[1,70],32:24,33:[1,50],34:[1,51],35:[1,52],36:[1,53],37:23,42:61,43:[1,45],44:[1,46],45:[1,29],48:30,49:[1,58],50:[1,59],56:47,57:48,59:36,61:25,62:26,63:27,73:[1,68],76:[1,43],80:[1,28],85:[1,56],86:[1,57],87:[1,55],93:[1,38],97:[1,44],98:[1,54],100:39,101:[1,63],103:[1,64],104:40,105:[1,65],106:41,107:[1,66],108:67,116:[1,42],121:37,122:[1,62],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{113:[2,152],114:[2,152]},{27:156,28:[1,71],56:157,57:158,73:[1,68],87:[1,112],112:266},{1:[2,158],6:[2,158],25:[2,158],26:[2,158],47:[2,158],52:[2,158],55:[2,158],70:[2,158],75:[2,158],83:[2,158],88:[2,158],90:[2,158],99:[2,158],100:85,101:[2,158],102:[1,267],103:[2,158],106:86,107:[2,158],108:67,115:[1,268],123:[2,158],125:[1,78],126:[1,77],129:[1,76],130:[1,79],131:[1,80],132:[1,81],133:[1,82],134:[1,83]},{1:[2,159],6:[2,159],25:[2,159],26:[2,159],47:[2,159],52:[2,159],55:[2,159],70:[2,159],75:[2,159],83:[2,159],88:[2,159],90:[2,159],99:[2,159],100:85,101:[2,159],102:[1,269],103:[2,159],106:86,107:[2,159],108:67,115:[2,159],123:[2,159],125:[1,78],126:[1,77],129:[1,76],130:[1,79],131:[1,80],132:[1,81],133:[1,82],134:[1,83]},{6:[1,271],25:[1,272],75:[1,270]},{6:[2,52],11:165,25:[2,52],26:[2,52],27:166,28:[1,71],29:167,30:[1,69],31:[1,70],39:273,40:164,42:168,44:[1,46],75:[2,52],86:[1,111]},{8:274,9:115,10:20,11:21,12:[1,22],13:8,14:9,15:10,16:11,17:12,18:13,19:14,20:15,21:16,22:17,23:18,24:19,25:[1,275],27:60,28:[1,71],29:49,30:[1,69],31:[1,70],32:24,33:[1,50],34:[1,51],35:[1,52],36:[1,53],37:23,42:61,43:[1,45],44:[1,46],45:[1,29],48:30,49:[1,58],50:[1,59],56:47,57:48,59:36,61:25,62:26,63:27,73:[1,68],76:[1,43],80:[1,28],85:[1,56],86:[1,57],87:[1,55],93:[1,38],97:[1,44],98:[1,54],100:39,101:[1,63],103:[1,64],104:40,105:[1,65],106:41,107:[1,66],108:67,116:[1,42],121:37,122:[1,62],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{1:[2,81],6:[2,81],25:[2,81],26:[2,81],38:[2,81],47:[2,81],52:[2,81],55:[2,81],64:[2,81],65:[2,81],66:[2,81],68:[2,81],70:[2,81],71:[2,81],75:[2,81],77:[2,81],81:[2,81],82:[2,81],83:[2,81],88:[2,81],90:[2,81],99:[2,81],101:[2,81],102:[2,81],103:[2,81],107:[2,81],115:[2,81],123:[2,81],125:[2,81],126:[2,81],127:[2,81],128:[2,81],129:[2,81],130:[2,81],131:[2,81],132:[2,81],133:[2,81],134:[2,81],135:[2,81]},{8:276,9:115,10:20,11:21,12:[1,22],13:8,14:9,15:10,16:11,17:12,18:13,19:14,20:15,21:16,22:17,23:18,24:19,27:60,28:[1,71],29:49,30:[1,69],31:[1,70],32:24,33:[1,50],34:[1,51],35:[1,52],36:[1,53],37:23,42:61,43:[1,45],44:[1,46],45:[1,29],48:30,49:[1,58],50:[1,59],56:47,57:48,59:36,61:25,62:26,63:27,70:[2,116],73:[1,68],76:[1,43],80:[1,28],85:[1,56],86:[1,57],87:[1,55],93:[1,38],97:[1,44],98:[1,54],100:39,101:[1,63],103:[1,64],104:40,105:[1,65],106:41,107:[1,66],108:67,116:[1,42],121:37,122:[1,62],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{70:[2,117],100:85,101:[1,63],103:[1,64],106:86,107:[1,66],108:67,123:[1,84],125:[1,78],126:[1,77],129:[1,76],130:[1,79],131:[1,80],132:[1,81],133:[1,82],134:[1,83]},{1:[2,35],6:[2,35],25:[2,35],26:[2,35],47:[2,35],52:[2,35],55:[2,35],70:[2,35],75:[2,35],83:[2,35],88:[2,35],90:[2,35],99:[2,35],100:85,101:[2,35],102:[2,35],103:[2,35],106:86,107:[2,35],108:67,115:[2,35],123:[2,35],125:[1,78],126:[1,77],129:[1,76],130:[1,79],131:[1,80],132:[1,81],133:[1,82],134:[1,83]},{26:[1,277],100:85,101:[1,63],103:[1,64],106:86,107:[1,66],108:67,123:[1,84],125:[1,78],126:[1,77],129:[1,76],130:[1,79],131:[1,80],132:[1,81],133:[1,82],134:[1,83]},{6:[1,260],25:[1,261],83:[1,278]},{6:[2,63],25:[2,63],26:[2,63],52:[2,63],83:[2,63],88:[2,63]},{5:279,25:[1,5]},{47:[2,55],52:[2,55]},{47:[2,58],52:[2,58],100:85,101:[1,63],103:[1,64],106:86,107:[1,66],108:67,123:[1,84],125:[1,78],126:[1,77],129:[1,76],130:[1,79],131:[1,80],132:[1,81],133:[1,82],134:[1,83]},{26:[1,280],100:85,101:[1,63],103:[1,64],106:86,107:[1,66],108:67,123:[1,84],125:[1,78],126:[1,77],129:[1,76],130:[1,79],131:[1,80],132:[1,81],133:[1,82],134:[1,83]},{5:281,25:[1,5],100:85,101:[1,63],103:[1,64],106:86,107:[1,66],108:67,123:[1,84],125:[1,78],126:[1,77],129:[1,76],130:[1,79],131:[1,80],132:[1,81],133:[1,82],134:[1,83]},{5:282,25:[1,5]},{1:[2,130],6:[2,130],25:[2,130],26:[2,130],47:[2,130],52:[2,130],55:[2,130],70:[2,130],75:[2,130],83:[2,130],88:[2,130],90:[2,130],99:[2,130],101:[2,130],102:[2,130],103:[2,130],107:[2,130],115:[2,130],123:[2,130],125:[2,130],126:[2,130],129:[2,130],130:[2,130],131:[2,130],132:[2,130],133:[2,130],134:[2,130]},{5:283,25:[1,5]},{26:[1,284],118:[1,285],119:252,120:[1,213]},{1:[2,167],6:[2,167],25:[2,167],26:[2,167],47:[2,167],52:[2,167],55:[2,167],70:[2,167],75:[2,167],83:[2,167],88:[2,167],90:[2,167],99:[2,167],101:[2,167],102:[2,167],103:[2,167],107:[2,167],115:[2,167],123:[2,167],125:[2,167],126:[2,167],129:[2,167],130:[2,167],131:[2,167],132:[2,167],133:[2,167],134:[2,167]},{5:286,25:[1,5]},{26:[2,170],118:[2,170],120:[2,170]},{5:287,25:[1,5],52:[1,288]},{25:[2,126],52:[2,126],100:85,101:[1,63],103:[1,64],106:86,107:[1,66],108:67,123:[1,84],125:[1,78],126:[1,77],129:[1,76],130:[1,79],131:[1,80],132:[1,81],133:[1,82],134:[1,83]},{1:[2,94],6:[2,94],25:[2,94],26:[2,94],47:[2,94],52:[2,94],55:[2,94],70:[2,94],75:[2,94],83:[2,94],88:[2,94],90:[2,94],99:[2,94],101:[2,94],102:[2,94],103:[2,94],107:[2,94],115:[2,94],123:[2,94],125:[2,94],126:[2,94],129:[2,94],130:[2,94],131:[2,94],132:[2,94],133:[2,94],134:[2,94]},{1:[2,97],5:289,6:[2,97],25:[1,5],26:[2,97],47:[2,97],52:[2,97],55:[2,97],70:[2,97],75:[2,97],83:[2,97],88:[2,97],90:[2,97],99:[2,97],100:85,101:[1,63],102:[2,97],103:[1,64],106:86,107:[1,66],108:67,115:[2,97],123:[2,97],125:[1,78],126:[1,77],129:[1,76],130:[1,79],131:[1,80],132:[1,81],133:[1,82],134:[1,83]},{99:[1,290]},{88:[1,291],100:85,101:[1,63],103:[1,64],106:86,107:[1,66],108:67,123:[1,84],125:[1,78],126:[1,77],129:[1,76],130:[1,79],131:[1,80],132:[1,81],133:[1,82],134:[1,83]},{1:[2,111],6:[2,111],25:[2,111],26:[2,111],38:[2,111],47:[2,111],52:[2,111],55:[2,111],64:[2,111],65:[2,111],66:[2,111],68:[2,111],70:[2,111],71:[2,111],75:[2,111],81:[2,111],82:[2,111],83:[2,111],88:[2,111],90:[2,111],99:[2,111],101:[2,111],102:[2,111],103:[2,111],107:[2,111],113:[2,111],114:[2,111],115:[2,111],123:[2,111],125:[2,111],126:[2,111],129:[2,111],130:[2,111],131:[2,111],132:[2,111],133:[2,111],134:[2,111]},{8:197,9:115,10:20,11:21,12:[1,22],13:8,14:9,15:10,16:11,17:12,18:13,19:14,20:15,21:16,22:17,23:18,24:19,27:60,28:[1,71],29:49,30:[1,69],31:[1,70],32:24,33:[1,50],34:[1,51],35:[1,52],36:[1,53],37:23,42:61,43:[1,45],44:[1,46],45:[1,29],48:30,49:[1,58],50:[1,59],56:47,57:48,58:145,59:36,61:25,62:26,63:27,73:[1,68],76:[1,43],80:[1,28],85:[1,56],86:[1,57],87:[1,55],91:292,93:[1,38],97:[1,44],98:[1,54],100:39,101:[1,63],103:[1,64],104:40,105:[1,65],106:41,107:[1,66],108:67,116:[1,42],121:37,122:[1,62],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{8:197,9:115,10:20,11:21,12:[1,22],13:8,14:9,15:10,16:11,17:12,18:13,19:14,20:15,21:16,22:17,23:18,24:19,25:[1,144],27:60,28:[1,71],29:49,30:[1,69],31:[1,70],32:24,33:[1,50],34:[1,51],35:[1,52],36:[1,53],37:23,42:61,43:[1,45],44:[1,46],45:[1,29],48:30,49:[1,58],50:[1,59],56:47,57:48,58:145,59:36,61:25,62:26,63:27,73:[1,68],76:[1,43],80:[1,28],84:293,85:[1,56],86:[1,57],87:[1,55],91:143,93:[1,38],97:[1,44],98:[1,54],100:39,101:[1,63],103:[1,64],104:40,105:[1,65],106:41,107:[1,66],108:67,116:[1,42],121:37,122:[1,62],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{6:[2,120],25:[2,120],26:[2,120],52:[2,120],83:[2,120],88:[2,120]},{6:[1,260],25:[1,261],26:[1,294]},{1:[2,137],6:[2,137],25:[2,137],26:[2,137],47:[2,137],52:[2,137],55:[2,137],70:[2,137],75:[2,137],83:[2,137],88:[2,137],90:[2,137],99:[2,137],100:85,101:[1,63],102:[2,137],103:[1,64],106:86,107:[1,66],108:67,115:[2,137],123:[2,137],125:[1,78],126:[1,77],129:[1,76],130:[1,79],131:[1,80],132:[1,81],133:[1,82],134:[1,83]},{1:[2,139],6:[2,139],25:[2,139],26:[2,139],47:[2,139],52:[2,139],55:[2,139],70:[2,139],75:[2,139],83:[2,139],88:[2,139],90:[2,139],99:[2,139],100:85,101:[1,63],102:[2,139],103:[1,64],106:86,107:[1,66],108:67,115:[2,139],123:[2,139],125:[1,78],126:[1,77],129:[1,76],130:[1,79],131:[1,80],132:[1,81],133:[1,82],134:[1,83]},{113:[2,157],114:[2,157]},{8:295,9:115,10:20,11:21,12:[1,22],13:8,14:9,15:10,16:11,17:12,18:13,19:14,20:15,21:16,22:17,23:18,24:19,27:60,28:[1,71],29:49,30:[1,69],31:[1,70],32:24,33:[1,50],34:[1,51],35:[1,52],36:[1,53],37:23,42:61,43:[1,45],44:[1,46],45:[1,29],48:30,49:[1,58],50:[1,59],56:47,57:48,59:36,61:25,62:26,63:27,73:[1,68],76:[1,43],80:[1,28],85:[1,56],86:[1,57],87:[1,55],93:[1,38],97:[1,44],98:[1,54],100:39,101:[1,63],103:[1,64],104:40,105:[1,65],106:41,107:[1,66],108:67,116:[1,42],121:37,122:[1,62],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{8:296,9:115,10:20,11:21,12:[1,22],13:8,14:9,15:10,16:11,17:12,18:13,19:14,20:15,21:16,22:17,23:18,24:19,27:60,28:[1,71],29:49,30:[1,69],31:[1,70],32:24,33:[1,50],34:[1,51],35:[1,52],36:[1,53],37:23,42:61,43:[1,45],44:[1,46],45:[1,29],48:30,49:[1,58],50:[1,59],56:47,57:48,59:36,61:25,62:26,63:27,73:[1,68],76:[1,43],80:[1,28],85:[1,56],86:[1,57],87:[1,55],93:[1,38],97:[1,44],98:[1,54],100:39,101:[1,63],103:[1,64],104:40,105:[1,65],106:41,107:[1,66],108:67,116:[1,42],121:37,122:[1,62],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{8:297,9:115,10:20,11:21,12:[1,22],13:8,14:9,15:10,16:11,17:12,18:13,19:14,20:15,21:16,22:17,23:18,24:19,27:60,28:[1,71],29:49,30:[1,69],31:[1,70],32:24,33:[1,50],34:[1,51],35:[1,52],36:[1,53],37:23,42:61,43:[1,45],44:[1,46],45:[1,29],48:30,49:[1,58],50:[1,59],56:47,57:48,59:36,61:25,62:26,63:27,73:[1,68],76:[1,43],80:[1,28],85:[1,56],86:[1,57],87:[1,55],93:[1,38],97:[1,44],98:[1,54],100:39,101:[1,63],103:[1,64],104:40,105:[1,65],106:41,107:[1,66],108:67,116:[1,42],121:37,122:[1,62],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{1:[2,85],6:[2,85],25:[2,85],26:[2,85],38:[2,85],47:[2,85],52:[2,85],55:[2,85],64:[2,85],65:[2,85],66:[2,85],68:[2,85],70:[2,85],71:[2,85],75:[2,85],81:[2,85],82:[2,85],83:[2,85],88:[2,85],90:[2,85],99:[2,85],101:[2,85],102:[2,85],103:[2,85],107:[2,85],113:[2,85],114:[2,85],115:[2,85],123:[2,85],125:[2,85],126:[2,85],129:[2,85],130:[2,85],131:[2,85],132:[2,85],133:[2,85],134:[2,85]},{11:165,27:166,28:[1,71],29:167,30:[1,69],31:[1,70],39:298,40:164,42:168,44:[1,46],86:[1,111]},{6:[2,86],11:165,25:[2,86],26:[2,86],27:166,28:[1,71],29:167,30:[1,69],31:[1,70],39:163,40:164,42:168,44:[1,46],52:[2,86],74:299,86:[1,111]},{6:[2,88],25:[2,88],26:[2,88],52:[2,88],75:[2,88]},{6:[2,38],25:[2,38],26:[2,38],52:[2,38],75:[2,38],100:85,101:[1,63],103:[1,64],106:86,107:[1,66],108:67,123:[1,84],125:[1,78],126:[1,77],129:[1,76],130:[1,79],131:[1,80],132:[1,81],133:[1,82],134:[1,83]},{8:300,9:115,10:20,11:21,12:[1,22],13:8,14:9,15:10,16:11,17:12,18:13,19:14,20:15,21:16,22:17,23:18,24:19,27:60,28:[1,71],29:49,30:[1,69],31:[1,70],32:24,33:[1,50],34:[1,51],35:[1,52],36:[1,53],37:23,42:61,43:[1,45],44:[1,46],45:[1,29],48:30,49:[1,58],50:[1,59],56:47,57:48,59:36,61:25,62:26,63:27,73:[1,68],76:[1,43],80:[1,28],85:[1,56],86:[1,57],87:[1,55],93:[1,38],97:[1,44],98:[1,54],100:39,101:[1,63],103:[1,64],104:40,105:[1,65],106:41,107:[1,66],108:67,116:[1,42],121:37,122:[1,62],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{70:[2,115],100:85,101:[1,63],103:[1,64],106:86,107:[1,66],108:67,123:[1,84],125:[1,78],126:[1,77],129:[1,76],130:[1,79],131:[1,80],132:[1,81],133:[1,82],134:[1,83]},{1:[2,36],6:[2,36],25:[2,36],26:[2,36],47:[2,36],52:[2,36],55:[2,36],70:[2,36],75:[2,36],83:[2,36],88:[2,36],90:[2,36],99:[2,36],101:[2,36],102:[2,36],103:[2,36],107:[2,36],115:[2,36],123:[2,36],125:[2,36],126:[2,36],129:[2,36],130:[2,36],131:[2,36],132:[2,36],133:[2,36],134:[2,36]},{1:[2,106],6:[2,106],25:[2,106],26:[2,106],47:[2,106],52:[2,106],55:[2,106],64:[2,106],65:[2,106],66:[2,106],68:[2,106],70:[2,106],71:[2,106],75:[2,106],81:[2,106],82:[2,106],83:[2,106],88:[2,106],90:[2,106],99:[2,106],101:[2,106],102:[2,106],103:[2,106],107:[2,106],115:[2,106],123:[2,106],125:[2,106],126:[2,106],129:[2,106],130:[2,106],131:[2,106],132:[2,106],133:[2,106],134:[2,106]},{1:[2,47],6:[2,47],25:[2,47],26:[2,47],47:[2,47],52:[2,47],55:[2,47],70:[2,47],75:[2,47],83:[2,47],88:[2,47],90:[2,47],99:[2,47],101:[2,47],102:[2,47],103:[2,47],107:[2,47],115:[2,47],123:[2,47],125:[2,47],126:[2,47],129:[2,47],130:[2,47],131:[2,47],132:[2,47],133:[2,47],134:[2,47]},{1:[2,195],6:[2,195],25:[2,195],26:[2,195],47:[2,195],52:[2,195],55:[2,195],70:[2,195],75:[2,195],83:[2,195],88:[2,195],90:[2,195],99:[2,195],101:[2,195],102:[2,195],103:[2,195],107:[2,195],115:[2,195],123:[2,195],125:[2,195],126:[2,195],129:[2,195],130:[2,195],131:[2,195],132:[2,195],133:[2,195],134:[2,195]},{1:[2,174],6:[2,174],25:[2,174],26:[2,174],47:[2,174],52:[2,174],55:[2,174],70:[2,174],75:[2,174],83:[2,174],88:[2,174],90:[2,174],99:[2,174],101:[2,174],102:[2,174],103:[2,174],107:[2,174],115:[2,174],118:[2,174],123:[2,174],125:[2,174],126:[2,174],129:[2,174],130:[2,174],131:[2,174],132:[2,174],133:[2,174],134:[2,174]},{1:[2,131],6:[2,131],25:[2,131],26:[2,131],47:[2,131],52:[2,131],55:[2,131],70:[2,131],75:[2,131],83:[2,131],88:[2,131],90:[2,131],99:[2,131],101:[2,131],102:[2,131],103:[2,131],107:[2,131],115:[2,131],123:[2,131],125:[2,131],126:[2,131],129:[2,131],130:[2,131],131:[2,131],132:[2,131],133:[2,131],134:[2,131]},{1:[2,132],6:[2,132],25:[2,132],26:[2,132],47:[2,132],52:[2,132],55:[2,132],70:[2,132],75:[2,132],83:[2,132],88:[2,132],90:[2,132],95:[2,132],99:[2,132],101:[2,132],102:[2,132],103:[2,132],107:[2,132],115:[2,132],123:[2,132],125:[2,132],126:[2,132],129:[2,132],130:[2,132],131:[2,132],132:[2,132],133:[2,132],134:[2,132]},{1:[2,165],6:[2,165],25:[2,165],26:[2,165],47:[2,165],52:[2,165],55:[2,165],70:[2,165],75:[2,165],83:[2,165],88:[2,165],90:[2,165],99:[2,165],101:[2,165],102:[2,165],103:[2,165],107:[2,165],115:[2,165],123:[2,165],125:[2,165],126:[2,165],129:[2,165],130:[2,165],131:[2,165],132:[2,165],133:[2,165],134:[2,165]},{5:301,25:[1,5]},{26:[1,302]},{6:[1,303],26:[2,171],118:[2,171],120:[2,171]},{8:304,9:115,10:20,11:21,12:[1,22],13:8,14:9,15:10,16:11,17:12,18:13,19:14,20:15,21:16,22:17,23:18,24:19,27:60,28:[1,71],29:49,30:[1,69],31:[1,70],32:24,33:[1,50],34:[1,51],35:[1,52],36:[1,53],37:23,42:61,43:[1,45],44:[1,46],45:[1,29],48:30,49:[1,58],50:[1,59],56:47,57:48,59:36,61:25,62:26,63:27,73:[1,68],76:[1,43],80:[1,28],85:[1,56],86:[1,57],87:[1,55],93:[1,38],97:[1,44],98:[1,54],100:39,101:[1,63],103:[1,64],104:40,105:[1,65],106:41,107:[1,66],108:67,116:[1,42],121:37,122:[1,62],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{1:[2,98],6:[2,98],25:[2,98],26:[2,98],47:[2,98],52:[2,98],55:[2,98],70:[2,98],75:[2,98],83:[2,98],88:[2,98],90:[2,98],99:[2,98],101:[2,98],102:[2,98],103:[2,98],107:[2,98],115:[2,98],123:[2,98],125:[2,98],126:[2,98],129:[2,98],130:[2,98],131:[2,98],132:[2,98],133:[2,98],134:[2,98]},{1:[2,135],6:[2,135],25:[2,135],26:[2,135],47:[2,135],52:[2,135],55:[2,135],64:[2,135],65:[2,135],66:[2,135],68:[2,135],70:[2,135],71:[2,135],75:[2,135],81:[2,135],82:[2,135],83:[2,135],88:[2,135],90:[2,135],99:[2,135],101:[2,135],102:[2,135],103:[2,135],107:[2,135],115:[2,135],123:[2,135],125:[2,135],126:[2,135],129:[2,135],130:[2,135],131:[2,135],132:[2,135],133:[2,135],134:[2,135]},{1:[2,114],6:[2,114],25:[2,114],26:[2,114],47:[2,114],52:[2,114],55:[2,114],64:[2,114],65:[2,114],66:[2,114],68:[2,114],70:[2,114],71:[2,114],75:[2,114],81:[2,114],82:[2,114],83:[2,114],88:[2,114],90:[2,114],99:[2,114],101:[2,114],102:[2,114],103:[2,114],107:[2,114],115:[2,114],123:[2,114],125:[2,114],126:[2,114],129:[2,114],130:[2,114],131:[2,114],132:[2,114],133:[2,114],134:[2,114]},{6:[2,121],25:[2,121],26:[2,121],52:[2,121],83:[2,121],88:[2,121]},{6:[2,51],25:[2,51],26:[2,51],51:305,52:[1,222]},{6:[2,122],25:[2,122],26:[2,122],52:[2,122],83:[2,122],88:[2,122]},{1:[2,160],6:[2,160],25:[2,160],26:[2,160],47:[2,160],52:[2,160],55:[2,160],70:[2,160],75:[2,160],83:[2,160],88:[2,160],90:[2,160],99:[2,160],100:85,101:[2,160],102:[2,160],103:[2,160],106:86,107:[2,160],108:67,115:[1,306],123:[2,160],125:[1,78],126:[1,77],129:[1,76],130:[1,79],131:[1,80],132:[1,81],133:[1,82],134:[1,83]},{1:[2,162],6:[2,162],25:[2,162],26:[2,162],47:[2,162],52:[2,162],55:[2,162],70:[2,162],75:[2,162],83:[2,162],88:[2,162],90:[2,162],99:[2,162],100:85,101:[2,162],102:[1,307],103:[2,162],106:86,107:[2,162],108:67,115:[2,162],123:[2,162],125:[1,78],126:[1,77],129:[1,76],130:[1,79],131:[1,80],132:[1,81],133:[1,82],134:[1,83]},{1:[2,161],6:[2,161],25:[2,161],26:[2,161],47:[2,161],52:[2,161],55:[2,161],70:[2,161],75:[2,161],83:[2,161],88:[2,161],90:[2,161],99:[2,161],100:85,101:[2,161],102:[2,161],103:[2,161],106:86,107:[2,161],108:67,115:[2,161],123:[2,161],125:[1,78],126:[1,77],129:[1,76],130:[1,79],131:[1,80],132:[1,81],133:[1,82],134:[1,83]},{6:[2,89],25:[2,89],26:[2,89],52:[2,89],75:[2,89]},{6:[2,51],25:[2,51],26:[2,51],51:308,52:[1,232]},{26:[1,309],100:85,101:[1,63],103:[1,64],106:86,107:[1,66],108:67,123:[1,84],125:[1,78],126:[1,77],129:[1,76],130:[1,79],131:[1,80],132:[1,81],133:[1,82],134:[1,83]},{26:[1,310]},{1:[2,168],6:[2,168],25:[2,168],26:[2,168],47:[2,168],52:[2,168],55:[2,168],70:[2,168],75:[2,168],83:[2,168],88:[2,168],90:[2,168],99:[2,168],101:[2,168],102:[2,168],103:[2,168],107:[2,168],115:[2,168],123:[2,168],125:[2,168],126:[2,168],129:[2,168],130:[2,168],131:[2,168],132:[2,168],133:[2,168],134:[2,168]},{26:[2,172],118:[2,172],120:[2,172]},{25:[2,127],52:[2,127],100:85,101:[1,63],103:[1,64],106:86,107:[1,66],108:67,123:[1,84],125:[1,78],126:[1,77],129:[1,76],130:[1,79],131:[1,80],132:[1,81],133:[1,82],134:[1,83]},{6:[1,260],25:[1,261],26:[1,311]},{8:312,9:115,10:20,11:21,12:[1,22],13:8,14:9,15:10,16:11,17:12,18:13,19:14,20:15,21:16,22:17,23:18,24:19,27:60,28:[1,71],29:49,30:[1,69],31:[1,70],32:24,33:[1,50],34:[1,51],35:[1,52],36:[1,53],37:23,42:61,43:[1,45],44:[1,46],45:[1,29],48:30,49:[1,58],50:[1,59],56:47,57:48,59:36,61:25,62:26,63:27,73:[1,68],76:[1,43],80:[1,28],85:[1,56],86:[1,57],87:[1,55],93:[1,38],97:[1,44],98:[1,54],100:39,101:[1,63],103:[1,64],104:40,105:[1,65],106:41,107:[1,66],108:67,116:[1,42],121:37,122:[1,62],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{8:313,9:115,10:20,11:21,12:[1,22],13:8,14:9,15:10,16:11,17:12,18:13,19:14,20:15,21:16,22:17,23:18,24:19,27:60,28:[1,71],29:49,30:[1,69],31:[1,70],32:24,33:[1,50],34:[1,51],35:[1,52],36:[1,53],37:23,42:61,43:[1,45],44:[1,46],45:[1,29],48:30,49:[1,58],50:[1,59],56:47,57:48,59:36,61:25,62:26,63:27,73:[1,68],76:[1,43],80:[1,28],85:[1,56],86:[1,57],87:[1,55],93:[1,38],97:[1,44],98:[1,54],100:39,101:[1,63],103:[1,64],104:40,105:[1,65],106:41,107:[1,66],108:67,116:[1,42],121:37,122:[1,62],124:[1,31],125:[1,32],126:[1,33],127:[1,34],128:[1,35]},{6:[1,271],25:[1,272],26:[1,314]},{6:[2,39],25:[2,39],26:[2,39],52:[2,39],75:[2,39]},{1:[2,166],6:[2,166],25:[2,166],26:[2,166],47:[2,166],52:[2,166],55:[2,166],70:[2,166],75:[2,166],83:[2,166],88:[2,166],90:[2,166],99:[2,166],101:[2,166],102:[2,166],103:[2,166],107:[2,166],115:[2,166],123:[2,166],125:[2,166],126:[2,166],129:[2,166],130:[2,166],131:[2,166],132:[2,166],133:[2,166],134:[2,166]},{6:[2,123],25:[2,123],26:[2,123],52:[2,123],83:[2,123],88:[2,123]},{1:[2,163],6:[2,163],25:[2,163],26:[2,163],47:[2,163],52:[2,163],55:[2,163],70:[2,163],75:[2,163],83:[2,163],88:[2,163],90:[2,163],99:[2,163],100:85,101:[2,163],102:[2,163],103:[2,163],106:86,107:[2,163],108:67,115:[2,163],123:[2,163],125:[1,78],126:[1,77],129:[1,76],130:[1,79],131:[1,80],132:[1,81],133:[1,82],134:[1,83]},{1:[2,164],6:[2,164],25:[2,164],26:[2,164],47:[2,164],52:[2,164],55:[2,164],70:[2,164],75:[2,164],83:[2,164],88:[2,164],90:[2,164],99:[2,164],100:85,101:[2,164],102:[2,164],103:[2,164],106:86,107:[2,164],108:67,115:[2,164],123:[2,164],125:[1,78],126:[1,77],129:[1,76],130:[1,79],131:[1,80],132:[1,81],133:[1,82],134:[1,83]},{6:[2,90],25:[2,90],26:[2,90],52:[2,90],75:[2,90]}],
-defaultActions: {58:[2,49],59:[2,50],73:[2,3],92:[2,104],186:[2,84]},
-parseError: function parseError(str, hash) {
-    throw new Error(str);
-},
-parse: function parse(input) {
-    var self = this, stack = [0], vstack = [null], lstack = [], table = this.table, yytext = "", yylineno = 0, yyleng = 0, recovering = 0, TERROR = 2, EOF = 1;
-    this.lexer.setInput(input);
-    this.lexer.yy = this.yy;
-    this.yy.lexer = this.lexer;
-    if (typeof this.lexer.yylloc == "undefined")
-        this.lexer.yylloc = {};
-    var yyloc = this.lexer.yylloc;
-    lstack.push(yyloc);
-    if (typeof this.yy.parseError === "function")
-        this.parseError = this.yy.parseError;
-    function popStack(n) {
-        stack.length = stack.length - 2 * n;
-        vstack.length = vstack.length - n;
-        lstack.length = lstack.length - n;
-    }
-    function lex() {
-        var token;
-        token = self.lexer.lex() || 1;
-        if (typeof token !== "number") {
-            token = self.symbols_[token] || token;
-        }
-        return token;
-    }
-    var symbol, preErrorSymbol, state, action, a, r, yyval = {}, p, len, newState, expected;
-    while (true) {
-        state = stack[stack.length - 1];
-        if (this.defaultActions[state]) {
-            action = this.defaultActions[state];
-        } else {
-            if (symbol == null)
-                symbol = lex();
-            action = table[state] && table[state][symbol];
-        }
-        if (typeof action === "undefined" || !action.length || !action[0]) {
-            if (!recovering) {
-                expected = [];
-                for (p in table[state])
-                    if (this.terminals_[p] && p > 2) {
-                        expected.push("'" + this.terminals_[p] + "'");
-                    }
-                var errStr = "";
-                if (this.lexer.showPosition) {
-                    errStr = "Parse error on line " + (yylineno + 1) + ":\n" + this.lexer.showPosition() + "\nExpecting " + expected.join(", ") + ", got '" + this.terminals_[symbol] + "'";
-                } else {
-                    errStr = "Parse error on line " + (yylineno + 1) + ": Unexpected " + (symbol == 1?"end of input":"'" + (this.terminals_[symbol] || symbol) + "'");
-                }
-                this.parseError(errStr, {text: this.lexer.match, token: this.terminals_[symbol] || symbol, line: this.lexer.yylineno, loc: yyloc, expected: expected});
-            }
-        }
-        if (action[0] instanceof Array && action.length > 1) {
-            throw new Error("Parse Error: multiple actions possible at state: " + state + ", token: " + symbol);
-        }
-        switch (action[0]) {
-        case 1:
-            stack.push(symbol);
-            vstack.push(this.lexer.yytext);
-            lstack.push(this.lexer.yylloc);
-            stack.push(action[1]);
-            symbol = null;
-            if (!preErrorSymbol) {
-                yyleng = this.lexer.yyleng;
-                yytext = this.lexer.yytext;
-                yylineno = this.lexer.yylineno;
-                yyloc = this.lexer.yylloc;
-                if (recovering > 0)
-                    recovering--;
-            } else {
-                symbol = preErrorSymbol;
-                preErrorSymbol = null;
-            }
-            break;
-        case 2:
-            len = this.productions_[action[1]][1];
-            yyval.$ = vstack[vstack.length - len];
-            yyval._$ = {first_line: lstack[lstack.length - (len || 1)].first_line, last_line: lstack[lstack.length - 1].last_line, first_column: lstack[lstack.length - (len || 1)].first_column, last_column: lstack[lstack.length - 1].last_column};
-            r = this.performAction.call(yyval, yytext, yyleng, yylineno, this.yy, action[1], vstack, lstack);
-            if (typeof r !== "undefined") {
-                return r;
-            }
-            if (len) {
-                stack = stack.slice(0, -1 * len * 2);
-                vstack = vstack.slice(0, -1 * len);
-                lstack = lstack.slice(0, -1 * len);
-            }
-            stack.push(this.productions_[action[1]][0]);
-            vstack.push(yyval.$);
-            lstack.push(yyval._$);
-            newState = table[stack[stack.length - 2]][stack[stack.length - 1]];
-            stack.push(newState);
-            break;
-        case 3:
-            return true;
-        }
-    }
-    return true;
-}
-};
-
-module.exports = parser;
-
-
-});/**
- * Copyright (c) 2011 Jeremy Ashkenas
- * 
- * 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.
- */
-
-define('ace/mode/coffee/nodes', ['require', 'exports', 'module' , 'ace/mode/coffee/scope', 'ace/mode/coffee/lexer', 'ace/mode/coffee/helpers'], function(require, exports, module) {
-// Generated by CoffeeScript 1.2.1-pre
-
-  var Access, Arr, Assign, Base, Block, Call, Class, Closure, Code, Comment, Existence, Extends, For, IDENTIFIER, IDENTIFIER_STR, IS_STRING, If, In, Index, LEVEL_ACCESS, LEVEL_COND, LEVEL_LIST, LEVEL_OP, LEVEL_PAREN, LEVEL_TOP, Literal, METHOD_DEF, NEGATE, NO, Obj, Op, Param, Parens, RESERVED, Range, Return, SIMPLENUM, STRICT_PROSCRIBED, Scope, Slice, Splat, Switch, TAB, THIS, Throw, Try, UTILITIES, Value, While, YES, compact, del, ends, extend, flatten, last, merge, multident, starts, unfoldSoak, utility, _ref, _ref1,
-    __hasProp = {}.hasOwnProperty,
-    __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor; child.__super__ = parent.prototype; return child; },
-    __indexOf = [].indexOf || function(item) { for (var i = 0, l = this.length; i < l; i++) { if (i in this && this[i] === item) return i; } return -1; };
-
-  Scope = require('./scope').Scope;
-
-  _ref = require('./lexer'), RESERVED = _ref.RESERVED, STRICT_PROSCRIBED = _ref.STRICT_PROSCRIBED;
-
-  _ref1 = require('./helpers'), compact = _ref1.compact, flatten = _ref1.flatten, extend = _ref1.extend, merge = _ref1.merge, del = _ref1.del, starts = _ref1.starts, ends = _ref1.ends, last = _ref1.last;
-
-  exports.extend = extend;
-
-  YES = function() {
-    return true;
-  };
-
-  NO = function() {
-    return false;
-  };
-
-  THIS = function() {
-    return this;
-  };
-
-  NEGATE = function() {
-    this.negated = !this.negated;
-    return this;
-  };
-
-  exports.Base = Base = (function() {
-
-    Base.name = 'Base';
-
-    function Base() {}
-
-    Base.prototype.compile = function(o, lvl) {
-      var node;
-      o = extend({}, o);
-      if (lvl) o.level = lvl;
-      node = this.unfoldSoak(o) || this;
-      node.tab = o.indent;
-      if (o.level === LEVEL_TOP || !node.isStatement(o)) {
-        return node.compileNode(o);
-      } else {
-        return node.compileClosure(o);
-      }
-    };
-
-    Base.prototype.compileClosure = function(o) {
-      if (this.jumps()) {
-        throw SyntaxError('cannot use a pure statement in an expression.');
-      }
-      o.sharedScope = true;
-      return Closure.wrap(this).compileNode(o);
-    };
-
-    Base.prototype.cache = function(o, level, reused) {
-      var ref, sub;
-      if (!this.isComplex()) {
-        ref = level ? this.compile(o, level) : this;
-        return [ref, ref];
-      } else {
-        ref = new Literal(reused || o.scope.freeVariable('ref'));
-        sub = new Assign(ref, this);
-        if (level) {
-          return [sub.compile(o, level), ref.value];
-        } else {
-          return [sub, ref];
-        }
-      }
-    };
-
-    Base.prototype.compileLoopReference = function(o, name) {
-      var src, tmp;
-      src = tmp = this.compile(o, LEVEL_LIST);
-      if (!((-Infinity < +src && +src < Infinity) || IDENTIFIER.test(src) && o.scope.check(src, true))) {
-        src = "" + (tmp = o.scope.freeVariable(name)) + " = " + src;
-      }
-      return [src, tmp];
-    };
-
-    Base.prototype.makeReturn = function(res) {
-      var me;
-      me = this.unwrapAll();
-      if (res) {
-        return new Call(new Literal("" + res + ".push"), [me]);
-      } else {
-        return new Return(me);
-      }
-    };
-
-    Base.prototype.contains = function(pred) {
-      var contains;
-      contains = false;
-      this.traverseChildren(false, function(node) {
-        if (pred(node)) {
-          contains = true;
-          return false;
-        }
-      });
-      return contains;
-    };
-
-    Base.prototype.containsType = function(type) {
-      return this instanceof type || this.contains(function(node) {
-        return node instanceof type;
-      });
-    };
-
-    Base.prototype.lastNonComment = function(list) {
-      var i;
-      i = list.length;
-      while (i--) {
-        if (!(list[i] instanceof Comment)) return list[i];
-      }
-      return null;
-    };
-
-    Base.prototype.toString = function(idt, name) {
-      var tree;
-      if (idt == null) idt = '';
-      if (name == null) name = this.constructor.name;
-      tree = '\n' + idt + name;
-      if (this.soak) tree += '?';
-      this.eachChild(function(node) {
-        return tree += node.toString(idt + TAB);
-      });
-      return tree;
-    };
-
-    Base.prototype.eachChild = function(func) {
-      var attr, child, _i, _j, _len, _len1, _ref2, _ref3;
-      if (!this.children) return this;
-      _ref2 = this.children;
-      for (_i = 0, _len = _ref2.length; _i < _len; _i++) {
-        attr = _ref2[_i];
-        if (this[attr]) {
-          _ref3 = flatten([this[attr]]);
-          for (_j = 0, _len1 = _ref3.length; _j < _len1; _j++) {
-            child = _ref3[_j];
-            if (func(child) === false) return this;
-          }
-        }
-      }
-      return this;
-    };
-
-    Base.prototype.traverseChildren = function(crossScope, func) {
-      return this.eachChild(function(child) {
-        if (func(child) === false) return false;
-        return child.traverseChildren(crossScope, func);
-      });
-    };
-
-    Base.prototype.invert = function() {
-      return new Op('!', this);
-    };
-
-    Base.prototype.unwrapAll = function() {
-      var node;
-      node = this;
-      while (node !== (node = node.unwrap())) {
-        continue;
-      }
-      return node;
-    };
-
-    Base.prototype.children = [];
-
-    Base.prototype.isStatement = NO;
-
-    Base.prototype.jumps = NO;
-
-    Base.prototype.isComplex = YES;
-
-    Base.prototype.isChainable = NO;
-
-    Base.prototype.isAssignable = NO;
-
-    Base.prototype.unwrap = THIS;
-
-    Base.prototype.unfoldSoak = NO;
-
-    Base.prototype.assigns = NO;
-
-    return Base;
-
-  })();
-
-  exports.Block = Block = (function(_super) {
-
-    __extends(Block, _super);
-
-    Block.name = 'Block';
-
-    function Block(nodes) {
-      this.expressions = compact(flatten(nodes || []));
-    }
-
-    Block.prototype.children = ['expressions'];
-
-    Block.prototype.push = function(node) {
-      this.expressions.push(node);
-      return this;
-    };
-
-    Block.prototype.pop = function() {
-      return this.expressions.pop();
-    };
-
-    Block.prototype.unshift = function(node) {
-      this.expressions.unshift(node);
-      return this;
-    };
-
-    Block.prototype.unwrap = function() {
-      if (this.expressions.length === 1) {
-        return this.expressions[0];
-      } else {
-        return this;
-      }
-    };
-
-    Block.prototype.isEmpty = function() {
-      return !this.expressions.length;
-    };
-
-    Block.prototype.isStatement = function(o) {
-      var exp, _i, _len, _ref2;
-      _ref2 = this.expressions;
-      for (_i = 0, _len = _ref2.length; _i < _len; _i++) {
-        exp = _ref2[_i];
-        if (exp.isStatement(o)) return true;
-      }
-      return false;
-    };
-
-    Block.prototype.jumps = function(o) {
-      var exp, _i, _len, _ref2;
-      _ref2 = this.expressions;
-      for (_i = 0, _len = _ref2.length; _i < _len; _i++) {
-        exp = _ref2[_i];
-        if (exp.jumps(o)) return exp;
-      }
-    };
-
-    Block.prototype.makeReturn = function(res) {
-      var expr, len;
-      len = this.expressions.length;
-      while (len--) {
-        expr = this.expressions[len];
-        if (!(expr instanceof Comment)) {
-          this.expressions[len] = expr.makeReturn(res);
-          if (expr instanceof Return && !expr.expression) {
-            this.expressions.splice(len, 1);
-          }
-          break;
-        }
-      }
-      return this;
-    };
-
-    Block.prototype.compile = function(o, level) {
-      if (o == null) o = {};
-      if (o.scope) {
-        return Block.__super__.compile.call(this, o, level);
-      } else {
-        return this.compileRoot(o);
-      }
-    };
-
-    Block.prototype.compileNode = function(o) {
-      var code, codes, node, top, _i, _len, _ref2;
-      this.tab = o.indent;
-      top = o.level === LEVEL_TOP;
-      codes = [];
-      _ref2 = this.expressions;
-      for (_i = 0, _len = _ref2.length; _i < _len; _i++) {
-        node = _ref2[_i];
-        node = node.unwrapAll();
-        node = node.unfoldSoak(o) || node;
-        if (node instanceof Block) {
-          codes.push(node.compileNode(o));
-        } else if (top) {
-          node.front = true;
-          code = node.compile(o);
-          if (!node.isStatement(o)) {
-            code = "" + this.tab + code + ";";
-            if (node instanceof Literal) code = "" + code + "\n";
-          }
-          codes.push(code);
-        } else {
-          codes.push(node.compile(o, LEVEL_LIST));
-        }
-      }
-      if (top) {
-        if (this.spaced) {
-          return "\n" + (codes.join('\n\n')) + "\n";
-        } else {
-          return codes.join('\n');
-        }
-      }
-      code = codes.join(', ') || 'void 0';
-      if (codes.length > 1 && o.level >= LEVEL_LIST) {
-        return "(" + code + ")";
-      } else {
-        return code;
-      }
-    };
-
-    Block.prototype.compileRoot = function(o) {
-      var code, exp, i, prelude, preludeExps, rest;
-      o.indent = o.bare ? '' : TAB;
-      o.scope = new Scope(null, this, null);
-      o.level = LEVEL_TOP;
-      this.spaced = true;
-      prelude = "";
-      if (!o.bare) {
-        preludeExps = (function() {
-          var _i, _len, _ref2, _results;
-          _ref2 = this.expressions;
-          _results = [];
-          for (i = _i = 0, _len = _ref2.length; _i < _len; i = ++_i) {
-            exp = _ref2[i];
-            if (!(exp.unwrap() instanceof Comment)) break;
-            _results.push(exp);
-          }
-          return _results;
-        }).call(this);
-        rest = this.expressions.slice(preludeExps.length);
-        this.expressions = preludeExps;
-        if (preludeExps.length) {
-          prelude = "" + (this.compileNode(merge(o, {
-            indent: ''
-          }))) + "\n";
-        }
-        this.expressions = rest;
-      }
-      code = this.compileWithDeclarations(o);
-      if (o.bare) return code;
-      return "" + prelude + "(function() {\n" + code + "\n}).call(this);\n";
-    };
-
-    Block.prototype.compileWithDeclarations = function(o) {
-      var assigns, code, declars, exp, i, post, rest, scope, spaced, _i, _len, _ref2, _ref3, _ref4;
-      code = post = '';
-      _ref2 = this.expressions;
-      for (i = _i = 0, _len = _ref2.length; _i < _len; i = ++_i) {
-        exp = _ref2[i];
-        exp = exp.unwrap();
-        if (!(exp instanceof Comment || exp instanceof Literal)) break;
-      }
-      o = merge(o, {
-        level: LEVEL_TOP
-      });
-      if (i) {
-        rest = this.expressions.splice(i, 9e9);
-        _ref3 = [this.spaced, false], spaced = _ref3[0], this.spaced = _ref3[1];
-        _ref4 = [this.compileNode(o), spaced], code = _ref4[0], this.spaced = _ref4[1];
-        this.expressions = rest;
-      }
-      post = this.compileNode(o);
-      scope = o.scope;
-      if (scope.expressions === this) {
-        declars = o.scope.hasDeclarations();
-        assigns = scope.hasAssignments;
-        if (declars || assigns) {
-          if (i) code += '\n';
-          code += "" + this.tab + "var ";
-          if (declars) code += scope.declaredVariables().join(', ');
-          if (assigns) {
-            if (declars) code += ",\n" + (this.tab + TAB);
-            code += scope.assignedVariables().join(",\n" + (this.tab + TAB));
-          }
-          code += ';\n';
-        }
-      }
-      return code + post;
-    };
-
-    Block.wrap = function(nodes) {
-      if (nodes.length === 1 && nodes[0] instanceof Block) return nodes[0];
-      return new Block(nodes);
-    };
-
-    return Block;
-
-  })(Base);
-
-  exports.Literal = Literal = (function(_super) {
-
-    __extends(Literal, _super);
-
-    Literal.name = 'Literal';
-
-    function Literal(value) {
-      this.value = value;
-    }
-
-    Literal.prototype.makeReturn = function() {
-      if (this.isStatement()) {
-        return this;
-      } else {
-        return Literal.__super__.makeReturn.apply(this, arguments);
-      }
-    };
-
-    Literal.prototype.isAssignable = function() {
-      return IDENTIFIER.test(this.value);
-    };
-
-    Literal.prototype.isStatement = function() {
-      var _ref2;
-      return (_ref2 = this.value) === 'break' || _ref2 === 'continue' || _ref2 === 'debugger';
-    };
-
-    Literal.prototype.isComplex = NO;
-
-    Literal.prototype.assigns = function(name) {
-      return name === this.value;
-    };
-
-    Literal.prototype.jumps = function(o) {
-      if (this.value === 'break' && !((o != null ? o.loop : void 0) || (o != null ? o.block : void 0))) {
-        return this;
-      }
-      if (this.value === 'continue' && !(o != null ? o.loop : void 0)) return this;
-    };
-
-    Literal.prototype.compileNode = function(o) {
-      var code, _ref2;
-      code = this.isUndefined ? o.level >= LEVEL_ACCESS ? '(void 0)' : 'void 0' : this.value === 'this' ? ((_ref2 = o.scope.method) != null ? _ref2.bound : void 0) ? o.scope.method.context : this.value : this.value.reserved ? "\"" + this.value + "\"" : this.value;
-      if (this.isStatement()) {
-        return "" + this.tab + code + ";";
-      } else {
-        return code;
-      }
-    };
-
-    Literal.prototype.toString = function() {
-      return ' "' + this.value + '"';
-    };
-
-    return Literal;
-
-  })(Base);
-
-  exports.Return = Return = (function(_super) {
-
-    __extends(Return, _super);
-
-    Return.name = 'Return';
-
-    function Return(expr) {
-      if (expr && !expr.unwrap().isUndefined) this.expression = expr;
-    }
-
-    Return.prototype.children = ['expression'];
-
-    Return.prototype.isStatement = YES;
-
-    Return.prototype.makeReturn = THIS;
-
-    Return.prototype.jumps = THIS;
-
-    Return.prototype.compile = function(o, level) {
-      var expr, _ref2;
-      expr = (_ref2 = this.expression) != null ? _ref2.makeReturn() : void 0;
-      if (expr && !(expr instanceof Return)) {
-        return expr.compile(o, level);
-      } else {
-        return Return.__super__.compile.call(this, o, level);
-      }
-    };
-
-    Return.prototype.compileNode = function(o) {
-      return this.tab + ("return" + [this.expression ? " " + (this.expression.compile(o, LEVEL_PAREN)) : void 0] + ";");
-    };
-
-    return Return;
-
-  })(Base);
-
-  exports.Value = Value = (function(_super) {
-
-    __extends(Value, _super);
-
-    Value.name = 'Value';
-
-    function Value(base, props, tag) {
-      if (!props && base instanceof Value) return base;
-      this.base = base;
-      this.properties = props || [];
-      if (tag) this[tag] = true;
-      return this;
-    }
-
-    Value.prototype.children = ['base', 'properties'];
-
-    Value.prototype.add = function(props) {
-      this.properties = this.properties.concat(props);
-      return this;
-    };
-
-    Value.prototype.hasProperties = function() {
-      return !!this.properties.length;
-    };
-
-    Value.prototype.isArray = function() {
-      return !this.properties.length && this.base instanceof Arr;
-    };
-
-    Value.prototype.isComplex = function() {
-      return this.hasProperties() || this.base.isComplex();
-    };
-
-    Value.prototype.isAssignable = function() {
-      return this.hasProperties() || this.base.isAssignable();
-    };
-
-    Value.prototype.isSimpleNumber = function() {
-      return this.base instanceof Literal && SIMPLENUM.test(this.base.value);
-    };
-
-    Value.prototype.isString = function() {
-      return this.base instanceof Literal && IS_STRING.test(this.base.value);
-    };
-
-    Value.prototype.isAtomic = function() {
-      var node, _i, _len, _ref2;
-      _ref2 = this.properties.concat(this.base);
-      for (_i = 0, _len = _ref2.length; _i < _len; _i++) {
-        node = _ref2[_i];
-        if (node.soak || node instanceof Call) return false;
-      }
-      return true;
-    };
-
-    Value.prototype.isStatement = function(o) {
-      return !this.properties.length && this.base.isStatement(o);
-    };
-
-    Value.prototype.assigns = function(name) {
-      return !this.properties.length && this.base.assigns(name);
-    };
-
-    Value.prototype.jumps = function(o) {
-      return !this.properties.length && this.base.jumps(o);
-    };
-
-    Value.prototype.isObject = function(onlyGenerated) {
-      if (this.properties.length) return false;
-      return (this.base instanceof Obj) && (!onlyGenerated || this.base.generated);
-    };
-
-    Value.prototype.isSplice = function() {
-      return last(this.properties) instanceof Slice;
-    };
-
-    Value.prototype.unwrap = function() {
-      if (this.properties.length) {
-        return this;
-      } else {
-        return this.base;
-      }
-    };
-
-    Value.prototype.cacheReference = function(o) {
-      var base, bref, name, nref;
-      name = last(this.properties);
-      if (this.properties.length < 2 && !this.base.isComplex() && !(name != null ? name.isComplex() : void 0)) {
-        return [this, this];
-      }
-      base = new Value(this.base, this.properties.slice(0, -1));
-      if (base.isComplex()) {
-        bref = new Literal(o.scope.freeVariable('base'));
-        base = new Value(new Parens(new Assign(bref, base)));
-      }
-      if (!name) return [base, bref];
-      if (name.isComplex()) {
-        nref = new Literal(o.scope.freeVariable('name'));
-        name = new Index(new Assign(nref, name.index));
-        nref = new Index(nref);
-      }
-      return [base.add(name), new Value(bref || base.base, [nref || name])];
-    };
-
-    Value.prototype.compileNode = function(o) {
-      var code, prop, props, _i, _len;
-      this.base.front = this.front;
-      props = this.properties;
-      code = this.base.compile(o, props.length ? LEVEL_ACCESS : null);
-      if ((this.base instanceof Parens || props.length) && SIMPLENUM.test(code)) {
-        code = "" + code + ".";
-      }
-      for (_i = 0, _len = props.length; _i < _len; _i++) {
-        prop = props[_i];
-        code += prop.compile(o);
-      }
-      return code;
-    };
-
-    Value.prototype.unfoldSoak = function(o) {
-      var result,
-        _this = this;
-      if (this.unfoldedSoak != null) return this.unfoldedSoak;
-      result = (function() {
-        var fst, i, ifn, prop, ref, snd, _i, _len, _ref2;
-        if (ifn = _this.base.unfoldSoak(o)) {
-          Array.prototype.push.apply(ifn.body.properties, _this.properties);
-          return ifn;
-        }
-        _ref2 = _this.properties;
-        for (i = _i = 0, _len = _ref2.length; _i < _len; i = ++_i) {
-          prop = _ref2[i];
-          if (!prop.soak) continue;
-          prop.soak = false;
-          fst = new Value(_this.base, _this.properties.slice(0, i));
-          snd = new Value(_this.base, _this.properties.slice(i));
-          if (fst.isComplex()) {
-            ref = new Literal(o.scope.freeVariable('ref'));
-            fst = new Parens(new Assign(ref, fst));
-            snd.base = ref;
-          }
-          return new If(new Existence(fst), snd, {
-            soak: true
-          });
-        }
-        return null;
-      })();
-      return this.unfoldedSoak = result || false;
-    };
-
-    return Value;
-
-  })(Base);
-
-  exports.Comment = Comment = (function(_super) {
-
-    __extends(Comment, _super);
-
-    Comment.name = 'Comment';
-
-    function Comment(comment) {
-      this.comment = comment;
-    }
-
-    Comment.prototype.isStatement = YES;
-
-    Comment.prototype.makeReturn = THIS;
-
-    Comment.prototype.compileNode = function(o, level) {
-      var code;
-      code = '/*' + multident(this.comment, this.tab) + ("\n" + this.tab + "*/\n");
-      if ((level || o.level) === LEVEL_TOP) code = o.indent + code;
-      return code;
-    };
-
-    return Comment;
-
-  })(Base);
-
-  exports.Call = Call = (function(_super) {
-
-    __extends(Call, _super);
-
-    Call.name = 'Call';
-
-    function Call(variable, args, soak) {
-      this.args = args != null ? args : [];
-      this.soak = soak;
-      this.isNew = false;
-      this.isSuper = variable === 'super';
-      this.variable = this.isSuper ? null : variable;
-    }
-
-    Call.prototype.children = ['variable', 'args'];
-
-    Call.prototype.newInstance = function() {
-      var base, _ref2;
-      base = ((_ref2 = this.variable) != null ? _ref2.base : void 0) || this.variable;
-      if (base instanceof Call && !base.isNew) {
-        base.newInstance();
-      } else {
-        this.isNew = true;
-      }
-      return this;
-    };
-
-    Call.prototype.superReference = function(o) {
-      var accesses, method, name;
-      method = o.scope.method;
-      if (!method) throw SyntaxError('cannot call super outside of a function.');
-      name = method.name;
-      if (name == null) {
-        throw SyntaxError('cannot call super on an anonymous function.');
-      }
-      if (method.klass) {
-        accesses = [new Access(new Literal('__super__'))];
-        if (method["static"]) {
-          accesses.push(new Access(new Literal('constructor')));
-        }
-        accesses.push(new Access(new Literal(name)));
-        return (new Value(new Literal(method.klass), accesses)).compile(o);
-      } else {
-        return "" + name + ".__super__.constructor";
-      }
-    };
-
-    Call.prototype.unfoldSoak = function(o) {
-      var call, ifn, left, list, rite, _i, _len, _ref2, _ref3;
-      if (this.soak) {
-        if (this.variable) {
-          if (ifn = unfoldSoak(o, this, 'variable')) return ifn;
-          _ref2 = new Value(this.variable).cacheReference(o), left = _ref2[0], rite = _ref2[1];
-        } else {
-          left = new Literal(this.superReference(o));
-          rite = new Value(left);
-        }
-        rite = new Call(rite, this.args);
-        rite.isNew = this.isNew;
-        left = new Literal("typeof " + (left.compile(o)) + " === \"function\"");
-        return new If(left, new Value(rite), {
-          soak: true
-        });
-      }
-      call = this;
-      list = [];
-      while (true) {
-        if (call.variable instanceof Call) {
-          list.push(call);
-          call = call.variable;
-          continue;
-        }
-        if (!(call.variable instanceof Value)) break;
-        list.push(call);
-        if (!((call = call.variable.base) instanceof Call)) break;
-      }
-      _ref3 = list.reverse();
-      for (_i = 0, _len = _ref3.length; _i < _len; _i++) {
-        call = _ref3[_i];
-        if (ifn) {
-          if (call.variable instanceof Call) {
-            call.variable = ifn;
-          } else {
-            call.variable.base = ifn;
-          }
-        }
-        ifn = unfoldSoak(o, call, 'variable');
-      }
-      return ifn;
-    };
-
-    Call.prototype.filterImplicitObjects = function(list) {
-      var node, nodes, obj, prop, properties, _i, _j, _len, _len1, _ref2;
-      nodes = [];
-      for (_i = 0, _len = list.length; _i < _len; _i++) {
-        node = list[_i];
-        if (!((typeof node.isObject === "function" ? node.isObject() : void 0) && node.base.generated)) {
-          nodes.push(node);
-          continue;
-        }
-        obj = null;
-        _ref2 = node.base.properties;
-        for (_j = 0, _len1 = _ref2.length; _j < _len1; _j++) {
-          prop = _ref2[_j];
-          if (prop instanceof Assign || prop instanceof Comment) {
-            if (!obj) nodes.push(obj = new Obj(properties = [], true));
-            properties.push(prop);
-          } else {
-            nodes.push(prop);
-            obj = null;
-          }
-        }
-      }
-      return nodes;
-    };
-
-    Call.prototype.compileNode = function(o) {
-      var arg, args, code, _ref2;
-      if ((_ref2 = this.variable) != null) _ref2.front = this.front;
-      if (code = Splat.compileSplattedArray(o, this.args, true)) {
-        return this.compileSplat(o, code);
-      }
-      args = this.filterImplicitObjects(this.args);
-      args = ((function() {
-        var _i, _len, _results;
-        _results = [];
-        for (_i = 0, _len = args.length; _i < _len; _i++) {
-          arg = args[_i];
-          _results.push(arg.compile(o, LEVEL_LIST));
-        }
-        return _results;
-      })()).join(', ');
-      if (this.isSuper) {
-        return this.superReference(o) + (".call(this" + (args && ', ' + args) + ")");
-      } else {
-        return (this.isNew ? 'new ' : '') + this.variable.compile(o, LEVEL_ACCESS) + ("(" + args + ")");
-      }
-    };
-
-    Call.prototype.compileSuper = function(args, o) {
-      return "" + (this.superReference(o)) + ".call(this" + (args.length ? ', ' : '') + args + ")";
-    };
-
-    Call.prototype.compileSplat = function(o, splatArgs) {
-      var base, fun, idt, name, ref;
-      if (this.isSuper) {
-        return "" + (this.superReference(o)) + ".apply(this, " + splatArgs + ")";
-      }
-      if (this.isNew) {
-        idt = this.tab + TAB;
-        return "(function(func, args, ctor) {\n" + idt + "ctor.prototype = func.prototype;\n" + idt + "var child = new ctor, result = func.apply(child, args), t = typeof result;\n" + idt + "return t == \"object\" || t == \"function\" ? result || child : child;\n" + this.tab + "})(" + (this.variable.compile(o, LEVEL_LIST)) + ", " + splatArgs + ", function(){})";
-      }
-      base = new Value(this.variable);
-      if ((name = base.properties.pop()) && base.isComplex()) {
-        ref = o.scope.freeVariable('ref');
-        fun = "(" + ref + " = " + (base.compile(o, LEVEL_LIST)) + ")" + (name.compile(o));
-      } else {
-        fun = base.compile(o, LEVEL_ACCESS);
-        if (SIMPLENUM.test(fun)) fun = "(" + fun + ")";
-        if (name) {
-          ref = fun;
-          fun += name.compile(o);
-        } else {
-          ref = 'null';
-        }
-      }
-      return "" + fun + ".apply(" + ref + ", " + splatArgs + ")";
-    };
-
-    return Call;
-
-  })(Base);
-
-  exports.Extends = Extends = (function(_super) {
-
-    __extends(Extends, _super);
-
-    Extends.name = 'Extends';
-
-    function Extends(child, parent) {
-      this.child = child;
-      this.parent = parent;
-    }
-
-    Extends.prototype.children = ['child', 'parent'];
-
-    Extends.prototype.compile = function(o) {
-      return new Call(new Value(new Literal(utility('extends'))), [this.child, this.parent]).compile(o);
-    };
-
-    return Extends;
-
-  })(Base);
-
-  exports.Access = Access = (function(_super) {
-
-    __extends(Access, _super);
-
-    Access.name = 'Access';
-
-    function Access(name, tag) {
-      this.name = name;
-      this.name.asKey = true;
-      this.soak = tag === 'soak';
-    }
-
-    Access.prototype.children = ['name'];
-
-    Access.prototype.compile = function(o) {
-      var name;
-      name = this.name.compile(o);
-      if (IDENTIFIER.test(name)) {
-        return "." + name;
-      } else {
-        return "[" + name + "]";
-      }
-    };
-
-    Access.prototype.isComplex = NO;
-
-    return Access;
-
-  })(Base);
-
-  exports.Index = Index = (function(_super) {
-
-    __extends(Index, _super);
-
-    Index.name = 'Index';
-
-    function Index(index) {
-      this.index = index;
-    }
-
-    Index.prototype.children = ['index'];
-
-    Index.prototype.compile = function(o) {
-      return "[" + (this.index.compile(o, LEVEL_PAREN)) + "]";
-    };
-
-    Index.prototype.isComplex = function() {
-      return this.index.isComplex();
-    };
-
-    return Index;
-
-  })(Base);
-
-  exports.Range = Range = (function(_super) {
-
-    __extends(Range, _super);
-
-    Range.name = 'Range';
-
-    Range.prototype.children = ['from', 'to'];
-
-    function Range(from, to, tag) {
-      this.from = from;
-      this.to = to;
-      this.exclusive = tag === 'exclusive';
-      this.equals = this.exclusive ? '' : '=';
-    }
-
-    Range.prototype.compileVariables = function(o) {
-      var step, _ref2, _ref3, _ref4, _ref5;
-      o = merge(o, {
-        top: true
-      });
-      _ref2 = this.from.cache(o, LEVEL_LIST), this.fromC = _ref2[0], this.fromVar = _ref2[1];
-      _ref3 = this.to.cache(o, LEVEL_LIST), this.toC = _ref3[0], this.toVar = _ref3[1];
-      if (step = del(o, 'step')) {
-        _ref4 = step.cache(o, LEVEL_LIST), this.step = _ref4[0], this.stepVar = _ref4[1];
-      }
-      _ref5 = [this.fromVar.match(SIMPLENUM), this.toVar.match(SIMPLENUM)], this.fromNum = _ref5[0], this.toNum = _ref5[1];
-      if (this.stepVar) return this.stepNum = this.stepVar.match(SIMPLENUM);
-    };
-
-    Range.prototype.compileNode = function(o) {
-      var cond, condPart, from, gt, idx, idxName, known, lt, namedIndex, stepPart, to, varPart, _ref2, _ref3;
-      if (!this.fromVar) this.compileVariables(o);
-      if (!o.index) return this.compileArray(o);
-      known = this.fromNum && this.toNum;
-      idx = del(o, 'index');
-      idxName = del(o, 'name');
-      namedIndex = idxName && idxName !== idx;
-      varPart = "" + idx + " = " + this.fromC;
-      if (this.toC !== this.toVar) varPart += ", " + this.toC;
-      if (this.step !== this.stepVar) varPart += ", " + this.step;
-      _ref2 = ["" + idx + " <" + this.equals, "" + idx + " >" + this.equals], lt = _ref2[0], gt = _ref2[1];
-      condPart = this.stepNum ? +this.stepNum > 0 ? "" + lt + " " + this.toVar : "" + gt + " " + this.toVar : known ? ((_ref3 = [+this.fromNum, +this.toNum], from = _ref3[0], to = _ref3[1], _ref3), from <= to ? "" + lt + " " + to : "" + gt + " " + to) : (cond = "" + this.fromVar + " <= " + this.toVar, "" + cond + " ? " + lt + " " + this.toVar + " : " + gt + " " + this.toVar);
-      stepPart = this.stepVar ? "" + idx + " += " + this.stepVar : known ? namedIndex ? from <= to ? "++" + idx : "--" + idx : from <= to ? "" + idx + "++" : "" + idx + "--" : namedIndex ? "" + cond + " ? ++" + idx + " : --" + idx : "" + cond + " ? " + idx + "++ : " + idx + "--";
-      if (namedIndex) varPart = "" + idxName + " = " + varPart;
-      if (namedIndex) stepPart = "" + idxName + " = " + stepPart;
-      return "" + varPart + "; " + condPart + "; " + stepPart;
-    };
-
-    Range.prototype.compileArray = function(o) {
-      var args, body, cond, hasArgs, i, idt, post, pre, range, result, vars, _i, _ref2, _ref3, _results;
-      if (this.fromNum && this.toNum && Math.abs(this.fromNum - this.toNum) <= 20) {
-        range = (function() {
-          _results = [];
-          for (var _i = _ref2 = +this.fromNum, _ref3 = +this.toNum; _ref2 <= _ref3 ? _i <= _ref3 : _i >= _ref3; _ref2 <= _ref3 ? _i++ : _i--){ _results.push(_i); }
-          return _results;
-        }).apply(this);
-        if (this.exclusive) range.pop();
-        return "[" + (range.join(', ')) + "]";
-      }
-      idt = this.tab + TAB;
-      i = o.scope.freeVariable('i');
-      result = o.scope.freeVariable('results');
-      pre = "\n" + idt + result + " = [];";
-      if (this.fromNum && this.toNum) {
-        o.index = i;
-        body = this.compileNode(o);
-      } else {
-        vars = ("" + i + " = " + this.fromC) + (this.toC !== this.toVar ? ", " + this.toC : '');
-        cond = "" + this.fromVar + " <= " + this.toVar;
-        body = "var " + vars + "; " + cond + " ? " + i + " <" + this.equals + " " + this.toVar + " : " + i + " >" + this.equals + " " + this.toVar + "; " + cond + " ? " + i + "++ : " + i + "--";
-      }
-      post = "{ " + result + ".push(" + i + "); }\n" + idt + "return " + result + ";\n" + o.indent;
-      hasArgs = function(node) {
-        return node != null ? node.contains(function(n) {
-          return n instanceof Literal && n.value === 'arguments' && !n.asKey;
-        }) : void 0;
-      };
-      if (hasArgs(this.from) || hasArgs(this.to)) args = ', arguments';
-      return "(function() {" + pre + "\n" + idt + "for (" + body + ")" + post + "}).apply(this" + (args != null ? args : '') + ")";
-    };
-
-    return Range;
-
-  })(Base);
-
-  exports.Slice = Slice = (function(_super) {
-
-    __extends(Slice, _super);
-
-    Slice.name = 'Slice';
-
-    Slice.prototype.children = ['range'];
-
-    function Slice(range) {
-      this.range = range;
-      Slice.__super__.constructor.call(this);
-    }
-
-    Slice.prototype.compileNode = function(o) {
-      var compiled, from, fromStr, to, toStr, _ref2;
-      _ref2 = this.range, to = _ref2.to, from = _ref2.from;
-      fromStr = from && from.compile(o, LEVEL_PAREN) || '0';
-      compiled = to && to.compile(o, LEVEL_PAREN);
-      if (to && !(!this.range.exclusive && +compiled === -1)) {
-        toStr = ', ' + (this.range.exclusive ? compiled : SIMPLENUM.test(compiled) ? "" + (+compiled + 1) : (compiled = to.compile(o, LEVEL_ACCESS), "" + compiled + " + 1 || 9e9"));
-      }
-      return ".slice(" + fromStr + (toStr || '') + ")";
-    };
-
-    return Slice;
-
-  })(Base);
-
-  exports.Obj = Obj = (function(_super) {
-
-    __extends(Obj, _super);
-
-    Obj.name = 'Obj';
-
-    function Obj(props, generated) {
-      this.generated = generated != null ? generated : false;
-      this.objects = this.properties = props || [];
-    }
-
-    Obj.prototype.children = ['properties'];
-
-    Obj.prototype.compileNode = function(o) {
-      var i, idt, indent, join, lastNoncom, node, obj, prop, propName, propNames, props, _i, _j, _len, _len1, _ref2;
-      props = this.properties;
-      propNames = [];
-      _ref2 = this.properties;
-      for (_i = 0, _len = _ref2.length; _i < _len; _i++) {
-        prop = _ref2[_i];
-        if (prop.isComplex()) prop = prop.variable;
-        if (prop != null) {
-          propName = prop.unwrapAll().value.toString();
-          if (__indexOf.call(propNames, propName) >= 0) {
-            throw SyntaxError("multiple object literal properties named \"" + propName + "\"");
-          }
-          propNames.push(propName);
-        }
-      }
-      if (!props.length) return (this.front ? '({})' : '{}');
-      if (this.generated) {
-        for (_j = 0, _len1 = props.length; _j < _len1; _j++) {
-          node = props[_j];
-          if (node instanceof Value) {
-            throw new Error('cannot have an implicit value in an implicit object');
-          }
-        }
-      }
-      idt = o.indent += TAB;
-      lastNoncom = this.lastNonComment(this.properties);
-      props = (function() {
-        var _k, _len2, _results;
-        _results = [];
-        for (i = _k = 0, _len2 = props.length; _k < _len2; i = ++_k) {
-          prop = props[i];
-          join = i === props.length - 1 ? '' : prop === lastNoncom || prop instanceof Comment ? '\n' : ',\n';
-          indent = prop instanceof Comment ? '' : idt;
-          if (prop instanceof Value && prop["this"]) {
-            prop = new Assign(prop.properties[0].name, prop, 'object');
-          }
-          if (!(prop instanceof Comment)) {
-            if (!(prop instanceof Assign)) prop = new Assign(prop, prop, 'object');
-            (prop.variable.base || prop.variable).asKey = true;
-          }
-          _results.push(indent + prop.compile(o, LEVEL_TOP) + join);
-        }
-        return _results;
-      })();
-      props = props.join('');
-      obj = "{" + (props && '\n' + props + '\n' + this.tab) + "}";
-      if (this.front) {
-        return "(" + obj + ")";
-      } else {
-        return obj;
-      }
-    };
-
-    Obj.prototype.assigns = function(name) {
-      var prop, _i, _len, _ref2;
-      _ref2 = this.properties;
-      for (_i = 0, _len = _ref2.length; _i < _len; _i++) {
-        prop = _ref2[_i];
-        if (prop.assigns(name)) return true;
-      }
-      return false;
-    };
-
-    return Obj;
-
-  })(Base);
-
-  exports.Arr = Arr = (function(_super) {
-
-    __extends(Arr, _super);
-
-    Arr.name = 'Arr';
-
-    function Arr(objs) {
-      this.objects = objs || [];
-    }
-
-    Arr.prototype.children = ['objects'];
-
-    Arr.prototype.filterImplicitObjects = Call.prototype.filterImplicitObjects;
-
-    Arr.prototype.compileNode = function(o) {
-      var code, obj, objs;
-      if (!this.objects.length) return '[]';
-      o.indent += TAB;
-      objs = this.filterImplicitObjects(this.objects);
-      if (code = Splat.compileSplattedArray(o, objs)) return code;
-      code = ((function() {
-        var _i, _len, _results;
-        _results = [];
-        for (_i = 0, _len = objs.length; _i < _len; _i++) {
-          obj = objs[_i];
-          _results.push(obj.compile(o, LEVEL_LIST));
-        }
-        return _results;
-      })()).join(', ');
-      if (code.indexOf('\n') >= 0) {
-        return "[\n" + o.indent + code + "\n" + this.tab + "]";
-      } else {
-        return "[" + code + "]";
-      }
-    };
-
-    Arr.prototype.assigns = function(name) {
-      var obj, _i, _len, _ref2;
-      _ref2 = this.objects;
-      for (_i = 0, _len = _ref2.length; _i < _len; _i++) {
-        obj = _ref2[_i];
-        if (obj.assigns(name)) return true;
-      }
-      return false;
-    };
-
-    return Arr;
-
-  })(Base);
-
-  exports.Class = Class = (function(_super) {
-
-    __extends(Class, _super);
-
-    Class.name = 'Class';
-
-    function Class(variable, parent, body) {
-      this.variable = variable;
-      this.parent = parent;
-      this.body = body != null ? body : new Block;
-      this.boundFuncs = [];
-      this.body.classBody = true;
-    }
-
-    Class.prototype.children = ['variable', 'parent', 'body'];
-
-    Class.prototype.determineName = function() {
-      var decl, tail;
-      if (!this.variable) return null;
-      decl = (tail = last(this.variable.properties)) ? tail instanceof Access && tail.name.value : this.variable.base.value;
-      if (__indexOf.call(STRICT_PROSCRIBED, decl) >= 0) {
-        throw SyntaxError("variable name may not be " + decl);
-      }
-      return decl && (decl = IDENTIFIER.test(decl) && decl);
-    };
-
-    Class.prototype.setContext = function(name) {
-      return this.body.traverseChildren(false, function(node) {
-        if (node.classBody) return false;
-        if (node instanceof Literal && node.value === 'this') {
-          return node.value = name;
-        } else if (node instanceof Code) {
-          node.klass = name;
-          if (node.bound) return node.context = name;
-        }
-      });
-    };
-
-    Class.prototype.addBoundFunctions = function(o) {
-      var bvar, lhs, _i, _len, _ref2, _results;
-      if (this.boundFuncs.length) {
-        _ref2 = this.boundFuncs;
-        _results = [];
-        for (_i = 0, _len = _ref2.length; _i < _len; _i++) {
-          bvar = _ref2[_i];
-          lhs = (new Value(new Literal("this"), [new Access(bvar)])).compile(o);
-          _results.push(this.ctor.body.unshift(new Literal("" + lhs + " = " + (utility('bind')) + "(" + lhs + ", this)")));
-        }
-        return _results;
-      }
-    };
-
-    Class.prototype.addProperties = function(node, name, o) {
-      var assign, base, exprs, func, props;
-      props = node.base.properties.slice(0);
-      exprs = (function() {
-        var _results;
-        _results = [];
-        while (assign = props.shift()) {
-          if (assign instanceof Assign) {
-            base = assign.variable.base;
-            delete assign.context;
-            func = assign.value;
-            if (base.value === 'constructor') {
-              if (this.ctor) {
-                throw new Error('cannot define more than one constructor in a class');
-              }
-              if (func.bound) {
-                throw new Error('cannot define a constructor as a bound function');
-              }
-              if (func instanceof Code) {
-                assign = this.ctor = func;
-              } else {
-                this.externalCtor = o.scope.freeVariable('class');
-                assign = new Assign(new Literal(this.externalCtor), func);
-              }
-            } else {
-              if (assign.variable["this"]) {
-                func["static"] = true;
-                if (func.bound) func.context = name;
-              } else {
-                assign.variable = new Value(new Literal(name), [new Access(new Literal('prototype')), new Access(base)]);
-                if (func instanceof Code && func.bound) {
-                  this.boundFuncs.push(base);
-                  func.bound = false;
-                }
-              }
-            }
-          }
-          _results.push(assign);
-        }
-        return _results;
-      }).call(this);
-      return compact(exprs);
-    };
-
-    Class.prototype.walkBody = function(name, o) {
-      var _this = this;
-      return this.traverseChildren(false, function(child) {
-        var exps, i, node, _i, _len, _ref2;
-        if (child instanceof Class) return false;
-        if (child instanceof Block) {
-          _ref2 = exps = child.expressions;
-          for (i = _i = 0, _len = _ref2.length; _i < _len; i = ++_i) {
-            node = _ref2[i];
-            if (node instanceof Value && node.isObject(true)) {
-              exps[i] = _this.addProperties(node, name, o);
-            }
-          }
-          return child.expressions = exps = flatten(exps);
-        }
-      });
-    };
-
-    Class.prototype.hoistDirectivePrologue = function() {
-      var expressions, index, node;
-      index = 0;
-      expressions = this.body.expressions;
-      while ((node = expressions[index]) && node instanceof Comment || node instanceof Value && node.isString()) {
-        ++index;
-      }
-      return this.directives = expressions.splice(0, index);
-    };
-
-    Class.prototype.ensureConstructor = function(name) {
-      if (!this.ctor) {
-        this.ctor = new Code;
-        if (this.parent) {
-          this.ctor.body.push(new Literal("" + name + ".__super__.constructor.apply(this, arguments)"));
-        }
-        if (this.externalCtor) {
-          this.ctor.body.push(new Literal("" + this.externalCtor + ".apply(this, arguments)"));
-        }
-        this.ctor.body.makeReturn();
-        this.body.expressions.unshift(this.ctor);
-      }
-      this.ctor.ctor = this.ctor.name = name;
-      this.ctor.klass = null;
-      return this.ctor.noReturn = true;
-    };
-
-    Class.prototype.compileNode = function(o) {
-      var call, decl, klass, lname, name, params, _ref2;
-      decl = this.determineName();
-      name = decl || '_Class';
-      if (name.reserved) name = "_" + name;
-      lname = new Literal(name);
-      this.hoistDirectivePrologue();
-      this.setContext(name);
-      this.walkBody(name, o);
-      this.ensureConstructor(name);
-      this.body.spaced = true;
-      if (!(this.ctor instanceof Code)) this.body.expressions.unshift(this.ctor);
-      if (decl) {
-        this.body.expressions.unshift(new Assign(new Value(new Literal(name), [new Access(new Literal('name'))]), new Literal("'" + name + "'")));
-      }
-      this.body.expressions.push(lname);
-      (_ref2 = this.body.expressions).unshift.apply(_ref2, this.directives);
-      this.addBoundFunctions(o);
-      call = Closure.wrap(this.body);
-      if (this.parent) {
-        this.superClass = new Literal(o.scope.freeVariable('super', false));
-        this.body.expressions.unshift(new Extends(lname, this.superClass));
-        call.args.push(this.parent);
-        params = call.variable.params || call.variable.base.params;
-        params.push(new Param(this.superClass));
-      }
-      klass = new Parens(call, true);
-      if (this.variable) klass = new Assign(this.variable, klass);
-      return klass.compile(o);
-    };
-
-    return Class;
-
-  })(Base);
-
-  exports.Assign = Assign = (function(_super) {
-
-    __extends(Assign, _super);
-
-    Assign.name = 'Assign';
-
-    function Assign(variable, value, context, options) {
-      var forbidden, name, _ref2;
-      this.variable = variable;
-      this.value = value;
-      this.context = context;
-      this.param = options && options.param;
-      this.subpattern = options && options.subpattern;
-      forbidden = (_ref2 = (name = this.variable.unwrapAll().value), __indexOf.call(STRICT_PROSCRIBED, _ref2) >= 0);
-      if (forbidden && this.context !== 'object') {
-        throw SyntaxError("variable name may not be \"" + name + "\"");
-      }
-    }
-
-    Assign.prototype.children = ['variable', 'value'];
-
-    Assign.prototype.isStatement = function(o) {
-      return (o != null ? o.level : void 0) === LEVEL_TOP && (this.context != null) && __indexOf.call(this.context, "?") >= 0;
-    };
-
-    Assign.prototype.assigns = function(name) {
-      return this[this.context === 'object' ? 'value' : 'variable'].assigns(name);
-    };
-
-    Assign.prototype.unfoldSoak = function(o) {
-      return unfoldSoak(o, this, 'variable');
-    };
-
-    Assign.prototype.compileNode = function(o) {
-      var isValue, match, name, val, varBase, _ref2, _ref3, _ref4, _ref5;
-      if (isValue = this.variable instanceof Value) {
-        if (this.variable.isArray() || this.variable.isObject()) {
-          return this.compilePatternMatch(o);
-        }
-        if (this.variable.isSplice()) return this.compileSplice(o);
-        if ((_ref2 = this.context) === '||=' || _ref2 === '&&=' || _ref2 === '?=') {
-          return this.compileConditional(o);
-        }
-      }
-      name = this.variable.compile(o, LEVEL_LIST);
-      if (!this.context) {
-        if (!(varBase = this.variable.unwrapAll()).isAssignable()) {
-          throw SyntaxError("\"" + (this.variable.compile(o)) + "\" cannot be assigned.");
-        }
-        if (!(typeof varBase.hasProperties === "function" ? varBase.hasProperties() : void 0)) {
-          if (this.param) {
-            o.scope.add(name, 'var');
-          } else {
-            o.scope.find(name);
-          }
-        }
-      }
-      if (this.value instanceof Code && (match = METHOD_DEF.exec(name))) {
-        if (match[1]) this.value.klass = match[1];
-        this.value.name = (_ref3 = (_ref4 = (_ref5 = match[2]) != null ? _ref5 : match[3]) != null ? _ref4 : match[4]) != null ? _ref3 : match[5];
-      }
-      val = this.value.compile(o, LEVEL_LIST);
-      if (this.context === 'object') return "" + name + ": " + val;
-      val = name + (" " + (this.context || '=') + " ") + val;
-      if (o.level <= LEVEL_LIST) {
-        return val;
-      } else {
-        return "(" + val + ")";
-      }
-    };
-
-    Assign.prototype.compilePatternMatch = function(o) {
-      var acc, assigns, code, i, idx, isObject, ivar, name, obj, objects, olen, ref, rest, splat, top, val, value, vvar, _i, _len, _ref2, _ref3, _ref4, _ref5, _ref6, _ref7, _ref8;
-      top = o.level === LEVEL_TOP;
-      value = this.value;
-      objects = this.variable.base.objects;
-      if (!(olen = objects.length)) {
-        code = value.compile(o);
-        if (o.level >= LEVEL_OP) {
-          return "(" + code + ")";
-        } else {
-          return code;
-        }
-      }
-      isObject = this.variable.isObject();
-      if (top && olen === 1 && !((obj = objects[0]) instanceof Splat)) {
-        if (obj instanceof Assign) {
-          _ref2 = obj, (_ref3 = _ref2.variable, idx = _ref3.base), obj = _ref2.value;
-        } else {
-          if (obj.base instanceof Parens) {
-            _ref4 = new Value(obj.unwrapAll()).cacheReference(o), obj = _ref4[0], idx = _ref4[1];
-          } else {
-            idx = isObject ? obj["this"] ? obj.properties[0].name : obj : new Literal(0);
-          }
-        }
-        acc = IDENTIFIER.test(idx.unwrap().value || 0);
-        value = new Value(value);
-        value.properties.push(new (acc ? Access : Index)(idx));
-        if (_ref5 = obj.unwrap().value, __indexOf.call(RESERVED, _ref5) >= 0) {
-          throw new SyntaxError("assignment to a reserved word: " + (obj.compile(o)) + " = " + (value.compile(o)));
-        }
-        return new Assign(obj, value, null, {
-          param: this.param
-        }).compile(o, LEVEL_TOP);
-      }
-      vvar = value.compile(o, LEVEL_LIST);
-      assigns = [];
-      splat = false;
-      if (!IDENTIFIER.test(vvar) || this.variable.assigns(vvar)) {
-        assigns.push("" + (ref = o.scope.freeVariable('ref')) + " = " + vvar);
-        vvar = ref;
-      }
-      for (i = _i = 0, _len = objects.length; _i < _len; i = ++_i) {
-        obj = objects[i];
-        idx = i;
-        if (isObject) {
-          if (obj instanceof Assign) {
-            _ref6 = obj, (_ref7 = _ref6.variable, idx = _ref7.base), obj = _ref6.value;
-          } else {
-            if (obj.base instanceof Parens) {
-              _ref8 = new Value(obj.unwrapAll()).cacheReference(o), obj = _ref8[0], idx = _ref8[1];
-            } else {
-              idx = obj["this"] ? obj.properties[0].name : obj;
-            }
-          }
-        }
-        if (!splat && obj instanceof Splat) {
-          name = obj.name.unwrap().value;
-          obj = obj.unwrap();
-          val = "" + olen + " <= " + vvar + ".length ? " + (utility('slice')) + ".call(" + vvar + ", " + i;
-          if (rest = olen - i - 1) {
-            ivar = o.scope.freeVariable('i');
-            val += ", " + ivar + " = " + vvar + ".length - " + rest + ") : (" + ivar + " = " + i + ", [])";
-          } else {
-            val += ") : []";
-          }
-          val = new Literal(val);
-          splat = "" + ivar + "++";
-        } else {
-          name = obj.unwrap().value;
-          if (obj instanceof Splat) {
-            obj = obj.name.compile(o);
-            throw new SyntaxError("multiple splats are disallowed in an assignment: " + obj + "...");
-          }
-          if (typeof idx === 'number') {
-            idx = new Literal(splat || idx);
-            acc = false;
-          } else {
-            acc = isObject && IDENTIFIER.test(idx.unwrap().value || 0);
-          }
-          val = new Value(new Literal(vvar), [new (acc ? Access : Index)(idx)]);
-        }
-        if ((name != null) && __indexOf.call(RESERVED, name) >= 0) {
-          throw new SyntaxError("assignment to a reserved word: " + (obj.compile(o)) + " = " + (val.compile(o)));
-        }
-        assigns.push(new Assign(obj, val, null, {
-          param: this.param,
-          subpattern: true
-        }).compile(o, LEVEL_LIST));
-      }
-      if (!(top || this.subpattern)) assigns.push(vvar);
-      code = assigns.join(', ');
-      if (o.level < LEVEL_LIST) {
-        return code;
-      } else {
-        return "(" + code + ")";
-      }
-    };
-
-    Assign.prototype.compileConditional = function(o) {
-      var left, right, _ref2;
-      _ref2 = this.variable.cacheReference(o), left = _ref2[0], right = _ref2[1];
-      if (left.base instanceof Literal && left.base.value !== "this" && !o.scope.check(left.base.value)) {
-        throw new Error("the variable \"" + left.base.value + "\" can't be assigned with " + this.context + " because it has not been defined.");
-      }
-      if (__indexOf.call(this.context, "?") >= 0) o.isExistentialEquals = true;
-      return new Op(this.context.slice(0, -1), left, new Assign(right, this.value, '=')).compile(o);
-    };
-
-    Assign.prototype.compileSplice = function(o) {
-      var code, exclusive, from, fromDecl, fromRef, name, to, valDef, valRef, _ref2, _ref3, _ref4;
-      _ref2 = this.variable.properties.pop().range, from = _ref2.from, to = _ref2.to, exclusive = _ref2.exclusive;
-      name = this.variable.compile(o);
-      _ref3 = (from != null ? from.cache(o, LEVEL_OP) : void 0) || ['0', '0'], fromDecl = _ref3[0], fromRef = _ref3[1];
-      if (to) {
-        if ((from != null ? from.isSimpleNumber() : void 0) && to.isSimpleNumber()) {
-          to = +to.compile(o) - +fromRef;
-          if (!exclusive) to += 1;
-        } else {
-          to = to.compile(o, LEVEL_ACCESS) + ' - ' + fromRef;
-          if (!exclusive) to += ' + 1';
-        }
-      } else {
-        to = "9e9";
-      }
-      _ref4 = this.value.cache(o, LEVEL_LIST), valDef = _ref4[0], valRef = _ref4[1];
-      code = "[].splice.apply(" + name + ", [" + fromDecl + ", " + to + "].concat(" + valDef + ")), " + valRef;
-      if (o.level > LEVEL_TOP) {
-        return "(" + code + ")";
-      } else {
-        return code;
-      }
-    };
-
-    return Assign;
-
-  })(Base);
-
-  exports.Code = Code = (function(_super) {
-
-    __extends(Code, _super);
-
-    Code.name = 'Code';
-
-    function Code(params, body, tag) {
-      this.params = params || [];
-      this.body = body || new Block;
-      this.bound = tag === 'boundfunc';
-      if (this.bound) this.context = '_this';
-    }
-
-    Code.prototype.children = ['params', 'body'];
-
-    Code.prototype.isStatement = function() {
-      return !!this.ctor;
-    };
-
-    Code.prototype.jumps = NO;
-
-    Code.prototype.compileNode = function(o) {
-      var code, exprs, i, idt, lit, name, p, param, params, ref, splats, uniqs, val, wasEmpty, _i, _j, _k, _l, _len, _len1, _len2, _len3, _len4, _len5, _m, _n, _ref2, _ref3, _ref4, _ref5, _ref6, _ref7, _ref8;
-      o.scope = new Scope(o.scope, this.body, this);
-      o.scope.shared = del(o, 'sharedScope');
-      o.indent += TAB;
-      delete o.bare;
-      delete o.isExistentialEquals;
-      params = [];
-      exprs = [];
-      _ref2 = this.paramNames();
-      for (_i = 0, _len = _ref2.length; _i < _len; _i++) {
-        name = _ref2[_i];
-        if (!o.scope.check(name)) o.scope.parameter(name);
-      }
-      _ref3 = this.params;
-      for (_j = 0, _len1 = _ref3.length; _j < _len1; _j++) {
-        param = _ref3[_j];
-        if (!param.splat) continue;
-        _ref4 = this.params;
-        for (_k = 0, _len2 = _ref4.length; _k < _len2; _k++) {
-          p = _ref4[_k];
-          if (p.name.value) o.scope.add(p.name.value, 'var', true);
-        }
-        splats = new Assign(new Value(new Arr((function() {
-          var _l, _len3, _ref5, _results;
-          _ref5 = this.params;
-          _results = [];
-          for (_l = 0, _len3 = _ref5.length; _l < _len3; _l++) {
-            p = _ref5[_l];
-            _results.push(p.asReference(o));
-          }
-          return _results;
-        }).call(this))), new Value(new Literal('arguments')));
-        break;
-      }
-      _ref5 = this.params;
-      for (_l = 0, _len3 = _ref5.length; _l < _len3; _l++) {
-        param = _ref5[_l];
-        if (param.isComplex()) {
-          val = ref = param.asReference(o);
-          if (param.value) val = new Op('?', ref, param.value);
-          exprs.push(new Assign(new Value(param.name), val, '=', {
-            param: true
-          }));
-        } else {
-          ref = param;
-          if (param.value) {
-            lit = new Literal(ref.name.value + ' == null');
-            val = new Assign(new Value(param.name), param.value, '=');
-            exprs.push(new If(lit, val));
-          }
-        }
-        if (!splats) params.push(ref);
-      }
-      wasEmpty = this.body.isEmpty();
-      if (splats) exprs.unshift(splats);
-      if (exprs.length) {
-        (_ref6 = this.body.expressions).unshift.apply(_ref6, exprs);
-      }
-      for (i = _m = 0, _len4 = params.length; _m < _len4; i = ++_m) {
-        p = params[i];
-        o.scope.parameter(params[i] = p.compile(o));
-      }
-      uniqs = [];
-      _ref7 = this.paramNames();
-      for (_n = 0, _len5 = _ref7.length; _n < _len5; _n++) {
-        name = _ref7[_n];
-        if (__indexOf.call(uniqs, name) >= 0) {
-          throw SyntaxError("multiple parameters named '" + name + "'");
-        }
-        uniqs.push(name);
-      }
-      if (!(wasEmpty || this.noReturn)) this.body.makeReturn();
-      if (this.bound) {
-        if ((_ref8 = o.scope.parent.method) != null ? _ref8.bound : void 0) {
-          this.bound = this.context = o.scope.parent.method.context;
-        } else if (!this["static"]) {
-          o.scope.parent.assign('_this', 'this');
-        }
-      }
-      idt = o.indent;
-      code = 'function';
-      if (this.ctor) code += ' ' + this.name;
-      code += '(' + params.join(', ') + ') {';
-      if (!this.body.isEmpty()) {
-        code += "\n" + (this.body.compileWithDeclarations(o)) + "\n" + this.tab;
-      }
-      code += '}';
-      if (this.ctor) return this.tab + code;
-      if (this.front || (o.level >= LEVEL_ACCESS)) {
-        return "(" + code + ")";
-      } else {
-        return code;
-      }
-    };
-
-    Code.prototype.paramNames = function() {
-      var names, param, _i, _len, _ref2;
-      names = [];
-      _ref2 = this.params;
-      for (_i = 0, _len = _ref2.length; _i < _len; _i++) {
-        param = _ref2[_i];
-        names.push.apply(names, param.names());
-      }
-      return names;
-    };
-
-    Code.prototype.traverseChildren = function(crossScope, func) {
-      if (crossScope) {
-        return Code.__super__.traverseChildren.call(this, crossScope, func);
-      }
-    };
-
-    return Code;
-
-  })(Base);
-
-  exports.Param = Param = (function(_super) {
-
-    __extends(Param, _super);
-
-    Param.name = 'Param';
-
-    function Param(name, value, splat) {
-      var _ref2;
-      this.name = name;
-      this.value = value;
-      this.splat = splat;
-      if (_ref2 = (name = this.name.unwrapAll().value), __indexOf.call(STRICT_PROSCRIBED, _ref2) >= 0) {
-        throw SyntaxError("parameter name \"" + name + "\" is not allowed");
-      }
-    }
-
-    Param.prototype.children = ['name', 'value'];
-
-    Param.prototype.compile = function(o) {
-      return this.name.compile(o, LEVEL_LIST);
-    };
-
-    Param.prototype.asReference = function(o) {
-      var node;
-      if (this.reference) return this.reference;
-      node = this.name;
-      if (node["this"]) {
-        node = node.properties[0].name;
-        if (node.value.reserved) {
-          node = new Literal(o.scope.freeVariable(node.value));
-        }
-      } else if (node.isComplex()) {
-        node = new Literal(o.scope.freeVariable('arg'));
-      }
-      node = new Value(node);
-      if (this.splat) node = new Splat(node);
-      return this.reference = node;
-    };
-
-    Param.prototype.isComplex = function() {
-      return this.name.isComplex();
-    };
-
-    Param.prototype.names = function(name) {
-      var atParam, names, obj, _i, _len, _ref2;
-      if (name == null) name = this.name;
-      atParam = function(obj) {
-        var value;
-        value = obj.properties[0].name.value;
-        if (value.reserved) {
-          return [];
-        } else {
-          return [value];
-        }
-      };
-      if (name instanceof Literal) return [name.value];
-      if (name instanceof Value) return atParam(name);
-      names = [];
-      _ref2 = name.objects;
-      for (_i = 0, _len = _ref2.length; _i < _len; _i++) {
-        obj = _ref2[_i];
-        if (obj instanceof Assign) {
-          names.push(obj.variable.base.value);
-        } else if (obj.isArray() || obj.isObject()) {
-          names.push.apply(names, this.names(obj.base));
-        } else if (obj["this"]) {
-          names.push.apply(names, atParam(obj));
-        } else {
-          names.push(obj.base.value);
-        }
-      }
-      return names;
-    };
-
-    return Param;
-
-  })(Base);
-
-  exports.Splat = Splat = (function(_super) {
-
-    __extends(Splat, _super);
-
-    Splat.name = 'Splat';
-
-    Splat.prototype.children = ['name'];
-
-    Splat.prototype.isAssignable = YES;
-
-    function Splat(name) {
-      this.name = name.compile ? name : new Literal(name);
-    }
-
-    Splat.prototype.assigns = function(name) {
-      return this.name.assigns(name);
-    };
-
-    Splat.prototype.compile = function(o) {
-      if (this.index != null) {
-        return this.compileParam(o);
-      } else {
-        return this.name.compile(o);
-      }
-    };
-
-    Splat.prototype.unwrap = function() {
-      return this.name;
-    };
-
-    Splat.compileSplattedArray = function(o, list, apply) {
-      var args, base, code, i, index, node, _i, _len;
-      index = -1;
-      while ((node = list[++index]) && !(node instanceof Splat)) {
-        continue;
-      }
-      if (index >= list.length) return '';
-      if (list.length === 1) {
-        code = list[0].compile(o, LEVEL_LIST);
-        if (apply) return code;
-        return "" + (utility('slice')) + ".call(" + code + ")";
-      }
-      args = list.slice(index);
-      for (i = _i = 0, _len = args.length; _i < _len; i = ++_i) {
-        node = args[i];
-        code = node.compile(o, LEVEL_LIST);
-        args[i] = node instanceof Splat ? "" + (utility('slice')) + ".call(" + code + ")" : "[" + code + "]";
-      }
-      if (index === 0) {
-        return args[0] + (".concat(" + (args.slice(1).join(', ')) + ")");
-      }
-      base = (function() {
-        var _j, _len1, _ref2, _results;
-        _ref2 = list.slice(0, index);
-        _results = [];
-        for (_j = 0, _len1 = _ref2.length; _j < _len1; _j++) {
-          node = _ref2[_j];
-          _results.push(node.compile(o, LEVEL_LIST));
-        }
-        return _results;
-      })();
-      return "[" + (base.join(', ')) + "].concat(" + (args.join(', ')) + ")";
-    };
-
-    return Splat;
-
-  })(Base);
-
-  exports.While = While = (function(_super) {
-
-    __extends(While, _super);
-
-    While.name = 'While';
-
-    function While(condition, options) {
-      this.condition = (options != null ? options.invert : void 0) ? condition.invert() : condition;
-      this.guard = options != null ? options.guard : void 0;
-    }
-
-    While.prototype.children = ['condition', 'guard', 'body'];
-
-    While.prototype.isStatement = YES;
-
-    While.prototype.makeReturn = function(res) {
-      if (res) {
-        return While.__super__.makeReturn.apply(this, arguments);
-      } else {
-        this.returns = !this.jumps({
-          loop: true
-        });
-        return this;
-      }
-    };
-
-    While.prototype.addBody = function(body) {
-      this.body = body;
-      return this;
-    };
-
-    While.prototype.jumps = function() {
-      var expressions, node, _i, _len;
-      expressions = this.body.expressions;
-      if (!expressions.length) return false;
-      for (_i = 0, _len = expressions.length; _i < _len; _i++) {
-        node = expressions[_i];
-        if (node.jumps({
-          loop: true
-        })) return node;
-      }
-      return false;
-    };
-
-    While.prototype.compileNode = function(o) {
-      var body, code, rvar, set;
-      o.indent += TAB;
-      set = '';
-      body = this.body;
-      if (body.isEmpty()) {
-        body = '';
-      } else {
-        if (this.returns) {
-          body.makeReturn(rvar = o.scope.freeVariable('results'));
-          set = "" + this.tab + rvar + " = [];\n";
-        }
-        if (this.guard) {
-          if (body.expressions.length > 1) {
-            body.expressions.unshift(new If((new Parens(this.guard)).invert(), new Literal("continue")));
-          } else {
-            if (this.guard) body = Block.wrap([new If(this.guard, body)]);
-          }
-        }
-        body = "\n" + (body.compile(o, LEVEL_TOP)) + "\n" + this.tab;
-      }
-      code = set + this.tab + ("while (" + (this.condition.compile(o, LEVEL_PAREN)) + ") {" + body + "}");
-      if (this.returns) code += "\n" + this.tab + "return " + rvar + ";";
-      return code;
-    };
-
-    return While;
-
-  })(Base);
-
-  exports.Op = Op = (function(_super) {
-    var CONVERSIONS, INVERSIONS;
-
-    __extends(Op, _super);
-
-    Op.name = 'Op';
-
-    function Op(op, first, second, flip) {
-      if (op === 'in') return new In(first, second);
-      if (op === 'do') return this.generateDo(first);
-      if (op === 'new') {
-        if (first instanceof Call && !first["do"] && !first.isNew) {
-          return first.newInstance();
-        }
-        if (first instanceof Code && first.bound || first["do"]) {
-          first = new Parens(first);
-        }
-      }
-      this.operator = CONVERSIONS[op] || op;
-      this.first = first;
-      this.second = second;
-      this.flip = !!flip;
-      return this;
-    }
-
-    CONVERSIONS = {
-      '==': '===',
-      '!=': '!==',
-      'of': 'in'
-    };
-
-    INVERSIONS = {
-      '!==': '===',
-      '===': '!=='
-    };
-
-    Op.prototype.children = ['first', 'second'];
-
-    Op.prototype.isSimpleNumber = NO;
-
-    Op.prototype.isUnary = function() {
-      return !this.second;
-    };
-
-    Op.prototype.isComplex = function() {
-      var _ref2;
-      return !(this.isUnary() && ((_ref2 = this.operator) === '+' || _ref2 === '-')) || this.first.isComplex();
-    };
-
-    Op.prototype.isChainable = function() {
-      var _ref2;
-      return (_ref2 = this.operator) === '<' || _ref2 === '>' || _ref2 === '>=' || _ref2 === '<=' || _ref2 === '===' || _ref2 === '!==';
-    };
-
-    Op.prototype.invert = function() {
-      var allInvertable, curr, fst, op, _ref2;
-      if (this.isChainable() && this.first.isChainable()) {
-        allInvertable = true;
-        curr = this;
-        while (curr && curr.operator) {
-          allInvertable && (allInvertable = curr.operator in INVERSIONS);
-          curr = curr.first;
-        }
-        if (!allInvertable) return new Parens(this).invert();
-        curr = this;
-        while (curr && curr.operator) {
-          curr.invert = !curr.invert;
-          curr.operator = INVERSIONS[curr.operator];
-          curr = curr.first;
-        }
-        return this;
-      } else if (op = INVERSIONS[this.operator]) {
-        this.operator = op;
-        if (this.first.unwrap() instanceof Op) this.first.invert();
-        return this;
-      } else if (this.second) {
-        return new Parens(this).invert();
-      } else if (this.operator === '!' && (fst = this.first.unwrap()) instanceof Op && ((_ref2 = fst.operator) === '!' || _ref2 === 'in' || _ref2 === 'instanceof')) {
-        return fst;
-      } else {
-        return new Op('!', this);
-      }
-    };
-
-    Op.prototype.unfoldSoak = function(o) {
-      var _ref2;
-      return ((_ref2 = this.operator) === '++' || _ref2 === '--' || _ref2 === 'delete') && unfoldSoak(o, this, 'first');
-    };
-
-    Op.prototype.generateDo = function(exp) {
-      var call, func, param, passedParams, ref, _i, _len, _ref2;
-      passedParams = [];
-      func = exp instanceof Assign && (ref = exp.value.unwrap()) instanceof Code ? ref : exp;
-      _ref2 = func.params || [];
-      for (_i = 0, _len = _ref2.length; _i < _len; _i++) {
-        param = _ref2[_i];
-        if (param.value) {
-          passedParams.push(param.value);
-          delete param.value;
-        } else {
-          passedParams.push(param);
-        }
-      }
-      call = new Call(exp, passedParams);
-      call["do"] = true;
-      return call;
-    };
-
-    Op.prototype.compileNode = function(o) {
-      var code, isChain, _ref2, _ref3;
-      isChain = this.isChainable() && this.first.isChainable();
-      if (!isChain) this.first.front = this.front;
-      if (this.operator === 'delete' && o.scope.check(this.first.unwrapAll().value)) {
-        throw SyntaxError('delete operand may not be argument or var');
-      }
-      if (((_ref2 = this.operator) === '--' || _ref2 === '++') && (_ref3 = this.first.unwrapAll().value, __indexOf.call(STRICT_PROSCRIBED, _ref3) >= 0)) {
-        throw SyntaxError('prefix increment/decrement may not have eval or arguments operand');
-      }
-      if (this.isUnary()) return this.compileUnary(o);
-      if (isChain) return this.compileChain(o);
-      if (this.operator === '?') return this.compileExistence(o);
-      code = this.first.compile(o, LEVEL_OP) + ' ' + this.operator + ' ' + this.second.compile(o, LEVEL_OP);
-      if (o.level <= LEVEL_OP) {
-        return code;
-      } else {
-        return "(" + code + ")";
-      }
-    };
-
-    Op.prototype.compileChain = function(o) {
-      var code, fst, shared, _ref2;
-      _ref2 = this.first.second.cache(o), this.first.second = _ref2[0], shared = _ref2[1];
-      fst = this.first.compile(o, LEVEL_OP);
-      code = "" + fst + " " + (this.invert ? '&&' : '||') + " " + (shared.compile(o)) + " " + this.operator + " " + (this.second.compile(o, LEVEL_OP));
-      return "(" + code + ")";
-    };
-
-    Op.prototype.compileExistence = function(o) {
-      var fst, ref;
-      if (this.first.isComplex() && o.level > LEVEL_TOP) {
-        ref = new Literal(o.scope.freeVariable('ref'));
-        fst = new Parens(new Assign(ref, this.first));
-      } else {
-        fst = this.first;
-        ref = fst;
-      }
-      return new If(new Existence(fst), ref, {
-        type: 'if'
-      }).addElse(this.second).compile(o);
-    };
-
-    Op.prototype.compileUnary = function(o) {
-      var op, parts, plusMinus;
-      if (o.level >= LEVEL_ACCESS) return (new Parens(this)).compile(o);
-      parts = [op = this.operator];
-      plusMinus = op === '+' || op === '-';
-      if ((op === 'new' || op === 'typeof' || op === 'delete') || plusMinus && this.first instanceof Op && this.first.operator === op) {
-        parts.push(' ');
-      }
-      if ((plusMinus && this.first instanceof Op) || (op === 'new' && this.first.isStatement(o))) {
-        this.first = new Parens(this.first);
-      }
-      parts.push(this.first.compile(o, LEVEL_OP));
-      if (this.flip) parts.reverse();
-      return parts.join('');
-    };
-
-    Op.prototype.toString = function(idt) {
-      return Op.__super__.toString.call(this, idt, this.constructor.name + ' ' + this.operator);
-    };
-
-    return Op;
-
-  })(Base);
-
-  exports.In = In = (function(_super) {
-
-    __extends(In, _super);
-
-    In.name = 'In';
-
-    function In(object, array) {
-      this.object = object;
-      this.array = array;
-    }
-
-    In.prototype.children = ['object', 'array'];
-
-    In.prototype.invert = NEGATE;
-
-    In.prototype.compileNode = function(o) {
-      var hasSplat, obj, _i, _len, _ref2;
-      if (this.array instanceof Value && this.array.isArray()) {
-        _ref2 = this.array.base.objects;
-        for (_i = 0, _len = _ref2.length; _i < _len; _i++) {
-          obj = _ref2[_i];
-          if (!(obj instanceof Splat)) continue;
-          hasSplat = true;
-          break;
-        }
-        if (!hasSplat) return this.compileOrTest(o);
-      }
-      return this.compileLoopTest(o);
-    };
-
-    In.prototype.compileOrTest = function(o) {
-      var cmp, cnj, i, item, ref, sub, tests, _ref2, _ref3;
-      if (this.array.base.objects.length === 0) return "" + (!!this.negated);
-      _ref2 = this.object.cache(o, LEVEL_OP), sub = _ref2[0], ref = _ref2[1];
-      _ref3 = this.negated ? [' !== ', ' && '] : [' === ', ' || '], cmp = _ref3[0], cnj = _ref3[1];
-      tests = (function() {
-        var _i, _len, _ref4, _results;
-        _ref4 = this.array.base.objects;
-        _results = [];
-        for (i = _i = 0, _len = _ref4.length; _i < _len; i = ++_i) {
-          item = _ref4[i];
-          _results.push((i ? ref : sub) + cmp + item.compile(o, LEVEL_ACCESS));
-        }
-        return _results;
-      }).call(this);
-      tests = tests.join(cnj);
-      if (o.level < LEVEL_OP) {
-        return tests;
-      } else {
-        return "(" + tests + ")";
-      }
-    };
-
-    In.prototype.compileLoopTest = function(o) {
-      var code, ref, sub, _ref2;
-      _ref2 = this.object.cache(o, LEVEL_LIST), sub = _ref2[0], ref = _ref2[1];
-      code = utility('indexOf') + (".call(" + (this.array.compile(o, LEVEL_LIST)) + ", " + ref + ") ") + (this.negated ? '< 0' : '>= 0');
-      if (sub === ref) return code;
-      code = sub + ', ' + code;
-      if (o.level < LEVEL_LIST) {
-        return code;
-      } else {
-        return "(" + code + ")";
-      }
-    };
-
-    In.prototype.toString = function(idt) {
-      return In.__super__.toString.call(this, idt, this.constructor.name + (this.negated ? '!' : ''));
-    };
-
-    return In;
-
-  })(Base);
-
-  exports.Try = Try = (function(_super) {
-
-    __extends(Try, _super);
-
-    Try.name = 'Try';
-
-    function Try(attempt, error, recovery, ensure) {
-      this.attempt = attempt;
-      this.error = error;
-      this.recovery = recovery;
-      this.ensure = ensure;
-    }
-
-    Try.prototype.children = ['attempt', 'recovery', 'ensure'];
-
-    Try.prototype.isStatement = YES;
-
-    Try.prototype.jumps = function(o) {
-      var _ref2;
-      return this.attempt.jumps(o) || ((_ref2 = this.recovery) != null ? _ref2.jumps(o) : void 0);
-    };
-
-    Try.prototype.makeReturn = function(res) {
-      if (this.attempt) this.attempt = this.attempt.makeReturn(res);
-      if (this.recovery) this.recovery = this.recovery.makeReturn(res);
-      return this;
-    };
-
-    Try.prototype.compileNode = function(o) {
-      var catchPart, ensurePart, errorPart, tryPart;
-      o.indent += TAB;
-      errorPart = this.error ? " (" + (this.error.compile(o)) + ") " : ' ';
-      tryPart = this.attempt.compile(o, LEVEL_TOP);
-      catchPart = (function() {
-        var _ref2;
-        if (this.recovery) {
-          if (_ref2 = this.error.value, __indexOf.call(STRICT_PROSCRIBED, _ref2) >= 0) {
-            throw SyntaxError("catch variable may not be \"" + this.error.value + "\"");
-          }
-          if (!o.scope.check(this.error.value)) {
-            o.scope.add(this.error.value, 'param');
-          }
-          return " catch" + errorPart + "{\n" + (this.recovery.compile(o, LEVEL_TOP)) + "\n" + this.tab + "}";
-        } else if (!(this.ensure || this.recovery)) {
-          return ' catch (_error) {}';
-        }
-      }).call(this);
-      ensurePart = this.ensure ? " finally {\n" + (this.ensure.compile(o, LEVEL_TOP)) + "\n" + this.tab + "}" : '';
-      return "" + this.tab + "try {\n" + tryPart + "\n" + this.tab + "}" + (catchPart || '') + ensurePart;
-    };
-
-    return Try;
-
-  })(Base);
-
-  exports.Throw = Throw = (function(_super) {
-
-    __extends(Throw, _super);
-
-    Throw.name = 'Throw';
-
-    function Throw(expression) {
-      this.expression = expression;
-    }
-
-    Throw.prototype.children = ['expression'];
-
-    Throw.prototype.isStatement = YES;
-
-    Throw.prototype.jumps = NO;
-
-    Throw.prototype.makeReturn = THIS;
-
-    Throw.prototype.compileNode = function(o) {
-      return this.tab + ("throw " + (this.expression.compile(o)) + ";");
-    };
-
-    return Throw;
-
-  })(Base);
-
-  exports.Existence = Existence = (function(_super) {
-
-    __extends(Existence, _super);
-
-    Existence.name = 'Existence';
-
-    function Existence(expression) {
-      this.expression = expression;
-    }
-
-    Existence.prototype.children = ['expression'];
-
-    Existence.prototype.invert = NEGATE;
-
-    Existence.prototype.compileNode = function(o) {
-      var cmp, cnj, code, _ref2;
-      this.expression.front = this.front;
-      code = this.expression.compile(o, LEVEL_OP);
-      if (IDENTIFIER.test(code) && !o.scope.check(code)) {
-        _ref2 = this.negated ? ['===', '||'] : ['!==', '&&'], cmp = _ref2[0], cnj = _ref2[1];
-        code = "typeof " + code + " " + cmp + " \"undefined\" " + cnj + " " + code + " " + cmp + " null";
-      } else {
-        code = "" + code + " " + (this.negated ? '==' : '!=') + " null";
-      }
-      if (o.level <= LEVEL_COND) {
-        return code;
-      } else {
-        return "(" + code + ")";
-      }
-    };
-
-    return Existence;
-
-  })(Base);
-
-  exports.Parens = Parens = (function(_super) {
-
-    __extends(Parens, _super);
-
-    Parens.name = 'Parens';
-
-    function Parens(body) {
-      this.body = body;
-    }
-
-    Parens.prototype.children = ['body'];
-
-    Parens.prototype.unwrap = function() {
-      return this.body;
-    };
-
-    Parens.prototype.isComplex = function() {
-      return this.body.isComplex();
-    };
-
-    Parens.prototype.compileNode = function(o) {
-      var bare, code, expr;
-      expr = this.body.unwrap();
-      if (expr instanceof Value && expr.isAtomic()) {
-        expr.front = this.front;
-        return expr.compile(o);
-      }
-      code = expr.compile(o, LEVEL_PAREN);
-      bare = o.level < LEVEL_OP && (expr instanceof Op || expr instanceof Call || (expr instanceof For && expr.returns));
-      if (bare) {
-        return code;
-      } else {
-        return "(" + code + ")";
-      }
-    };
-
-    return Parens;
-
-  })(Base);
-
-  exports.For = For = (function(_super) {
-
-    __extends(For, _super);
-
-    For.name = 'For';
-
-    function For(body, source) {
-      var _ref2;
-      this.source = source.source, this.guard = source.guard, this.step = source.step, this.name = source.name, this.index = source.index;
-      this.body = Block.wrap([body]);
-      this.own = !!source.own;
-      this.object = !!source.object;
-      if (this.object) {
-        _ref2 = [this.index, this.name], this.name = _ref2[0], this.index = _ref2[1];
-      }
-      if (this.index instanceof Value) {
-        throw SyntaxError('index cannot be a pattern matching expression');
-      }
-      this.range = this.source instanceof Value && this.source.base instanceof Range && !this.source.properties.length;
-      this.pattern = this.name instanceof Value;
-      if (this.range && this.index) {
-        throw SyntaxError('indexes do not apply to range loops');
-      }
-      if (this.range && this.pattern) {
-        throw SyntaxError('cannot pattern match over range loops');
-      }
-      this.returns = false;
-    }
-
-    For.prototype.children = ['body', 'source', 'guard', 'step'];
-
-    For.prototype.compileNode = function(o) {
-      var body, defPart, forPart, forVarPart, guardPart, idt1, index, ivar, kvar, kvarAssign, lastJumps, lvar, name, namePart, ref, resultPart, returnResult, rvar, scope, source, stepPart, stepvar, svar, varPart, _ref2;
-      body = Block.wrap([this.body]);
-      lastJumps = (_ref2 = last(body.expressions)) != null ? _ref2.jumps() : void 0;
-      if (lastJumps && lastJumps instanceof Return) this.returns = false;
-      source = this.range ? this.source.base : this.source;
-      scope = o.scope;
-      name = this.name && this.name.compile(o, LEVEL_LIST);
-      index = this.index && this.index.compile(o, LEVEL_LIST);
-      if (name && !this.pattern) {
-        scope.find(name, {
-          immediate: true
-        });
-      }
-      if (index) {
-        scope.find(index, {
-          immediate: true
-        });
-      }
-      if (this.returns) rvar = scope.freeVariable('results');
-      ivar = (this.object && index) || scope.freeVariable('i');
-      kvar = (this.range && name) || index || ivar;
-      kvarAssign = kvar !== ivar ? "" + kvar + " = " : "";
-      if (this.step && !this.range) stepvar = scope.freeVariable("step");
-      if (this.pattern) name = ivar;
-      varPart = '';
-      guardPart = '';
-      defPart = '';
-      idt1 = this.tab + TAB;
-      if (this.range) {
-        forPart = source.compile(merge(o, {
-          index: ivar,
-          name: name,
-          step: this.step
-        }));
-      } else {
-        svar = this.source.compile(o, LEVEL_LIST);
-        if ((name || this.own) && !IDENTIFIER.test(svar)) {
-          defPart = "" + this.tab + (ref = scope.freeVariable('ref')) + " = " + svar + ";\n";
-          svar = ref;
-        }
-        if (name && !this.pattern) {
-          namePart = "" + name + " = " + svar + "[" + kvar + "]";
-        }
-        if (!this.object) {
-          lvar = scope.freeVariable('len');
-          forVarPart = "" + kvarAssign + ivar + " = 0, " + lvar + " = " + svar + ".length";
-          if (this.step) {
-            forVarPart += ", " + stepvar + " = " + (this.step.compile(o, LEVEL_OP));
-          }
-          stepPart = "" + kvarAssign + (this.step ? "" + ivar + " += " + stepvar : (kvar !== ivar ? "++" + ivar : "" + ivar + "++"));
-          forPart = "" + forVarPart + "; " + ivar + " < " + lvar + "; " + stepPart;
-        }
-      }
-      if (this.returns) {
-        resultPart = "" + this.tab + rvar + " = [];\n";
-        returnResult = "\n" + this.tab + "return " + rvar + ";";
-        body.makeReturn(rvar);
-      }
-      if (this.guard) {
-        if (body.expressions.length > 1) {
-          body.expressions.unshift(new If((new Parens(this.guard)).invert(), new Literal("continue")));
-        } else {
-          if (this.guard) body = Block.wrap([new If(this.guard, body)]);
-        }
-      }
-      if (this.pattern) {
-        body.expressions.unshift(new Assign(this.name, new Literal("" + svar + "[" + kvar + "]")));
-      }
-      defPart += this.pluckDirectCall(o, body);
-      if (namePart) varPart = "\n" + idt1 + namePart + ";";
-      if (this.object) {
-        forPart = "" + kvar + " in " + svar;
-        if (this.own) {
-          guardPart = "\n" + idt1 + "if (!" + (utility('hasProp')) + ".call(" + svar + ", " + kvar + ")) continue;";
-        }
-      }
-      body = body.compile(merge(o, {
-        indent: idt1
-      }), LEVEL_TOP);
-      if (body) body = '\n' + body + '\n';
-      return "" + defPart + (resultPart || '') + this.tab + "for (" + forPart + ") {" + guardPart + varPart + body + this.tab + "}" + (returnResult || '');
-    };
-
-    For.prototype.pluckDirectCall = function(o, body) {
-      var base, defs, expr, fn, idx, ref, val, _i, _len, _ref2, _ref3, _ref4, _ref5, _ref6, _ref7;
-      defs = '';
-      _ref2 = body.expressions;
-      for (idx = _i = 0, _len = _ref2.length; _i < _len; idx = ++_i) {
-        expr = _ref2[idx];
-        expr = expr.unwrapAll();
-        if (!(expr instanceof Call)) continue;
-        val = expr.variable.unwrapAll();
-        if (!((val instanceof Code) || (val instanceof Value && ((_ref3 = val.base) != null ? _ref3.unwrapAll() : void 0) instanceof Code && val.properties.length === 1 && ((_ref4 = (_ref5 = val.properties[0].name) != null ? _ref5.value : void 0) === 'call' || _ref4 === 'apply')))) {
-          continue;
-        }
-        fn = ((_ref6 = val.base) != null ? _ref6.unwrapAll() : void 0) || val;
-        ref = new Literal(o.scope.freeVariable('fn'));
-        base = new Value(ref);
-        if (val.base) _ref7 = [base, val], val.base = _ref7[0], base = _ref7[1];
-        body.expressions[idx] = new Call(base, expr.args);
-        defs += this.tab + new Assign(ref, fn).compile(o, LEVEL_TOP) + ';\n';
-      }
-      return defs;
-    };
-
-    return For;
-
-  })(While);
-
-  exports.Switch = Switch = (function(_super) {
-
-    __extends(Switch, _super);
-
-    Switch.name = 'Switch';
-
-    function Switch(subject, cases, otherwise) {
-      this.subject = subject;
-      this.cases = cases;
-      this.otherwise = otherwise;
-    }
-
-    Switch.prototype.children = ['subject', 'cases', 'otherwise'];
-
-    Switch.prototype.isStatement = YES;
-
-    Switch.prototype.jumps = function(o) {
-      var block, conds, _i, _len, _ref2, _ref3, _ref4;
-      if (o == null) {
-        o = {
-          block: true
-        };
-      }
-      _ref2 = this.cases;
-      for (_i = 0, _len = _ref2.length; _i < _len; _i++) {
-        _ref3 = _ref2[_i], conds = _ref3[0], block = _ref3[1];
-        if (block.jumps(o)) return block;
-      }
-      return (_ref4 = this.otherwise) != null ? _ref4.jumps(o) : void 0;
-    };
-
-    Switch.prototype.makeReturn = function(res) {
-      var pair, _i, _len, _ref2, _ref3;
-      _ref2 = this.cases;
-      for (_i = 0, _len = _ref2.length; _i < _len; _i++) {
-        pair = _ref2[_i];
-        pair[1].makeReturn(res);
-      }
-      if (res) {
-        this.otherwise || (this.otherwise = new Block([new Literal('void 0')]));
-      }
-      if ((_ref3 = this.otherwise) != null) _ref3.makeReturn(res);
-      return this;
-    };
-
-    Switch.prototype.compileNode = function(o) {
-      var block, body, code, cond, conditions, expr, i, idt1, idt2, _i, _j, _len, _len1, _ref2, _ref3, _ref4, _ref5;
-      idt1 = o.indent + TAB;
-      idt2 = o.indent = idt1 + TAB;
-      code = this.tab + ("switch (" + (((_ref2 = this.subject) != null ? _ref2.compile(o, LEVEL_PAREN) : void 0) || false) + ") {\n");
-      _ref3 = this.cases;
-      for (i = _i = 0, _len = _ref3.length; _i < _len; i = ++_i) {
-        _ref4 = _ref3[i], conditions = _ref4[0], block = _ref4[1];
-        _ref5 = flatten([conditions]);
-        for (_j = 0, _len1 = _ref5.length; _j < _len1; _j++) {
-          cond = _ref5[_j];
-          if (!this.subject) cond = cond.invert();
-          code += idt1 + ("case " + (cond.compile(o, LEVEL_PAREN)) + ":\n");
-        }
-        if (body = block.compile(o, LEVEL_TOP)) code += body + '\n';
-        if (i === this.cases.length - 1 && !this.otherwise) break;
-        expr = this.lastNonComment(block.expressions);
-        if (expr instanceof Return || (expr instanceof Literal && expr.jumps() && expr.value !== 'debugger')) {
-          continue;
-        }
-        code += idt2 + 'break;\n';
-      }
-      if (this.otherwise && this.otherwise.expressions.length) {
-        code += idt1 + ("default:\n" + (this.otherwise.compile(o, LEVEL_TOP)) + "\n");
-      }
-      return code + this.tab + '}';
-    };
-
-    return Switch;
-
-  })(Base);
-
-  exports.If = If = (function(_super) {
-
-    __extends(If, _super);
-
-    If.name = 'If';
-
-    function If(condition, body, options) {
-      this.body = body;
-      if (options == null) options = {};
-      this.condition = options.type === 'unless' ? condition.invert() : condition;
-      this.elseBody = null;
-      this.isChain = false;
-      this.soak = options.soak;
-    }
-
-    If.prototype.children = ['condition', 'body', 'elseBody'];
-
-    If.prototype.bodyNode = function() {
-      var _ref2;
-      return (_ref2 = this.body) != null ? _ref2.unwrap() : void 0;
-    };
-
-    If.prototype.elseBodyNode = function() {
-      var _ref2;
-      return (_ref2 = this.elseBody) != null ? _ref2.unwrap() : void 0;
-    };
-
-    If.prototype.addElse = function(elseBody) {
-      if (this.isChain) {
-        this.elseBodyNode().addElse(elseBody);
-      } else {
-        this.isChain = elseBody instanceof If;
-        this.elseBody = this.ensureBlock(elseBody);
-      }
-      return this;
-    };
-
-    If.prototype.isStatement = function(o) {
-      var _ref2;
-      return (o != null ? o.level : void 0) === LEVEL_TOP || this.bodyNode().isStatement(o) || ((_ref2 = this.elseBodyNode()) != null ? _ref2.isStatement(o) : void 0);
-    };
-
-    If.prototype.jumps = function(o) {
-      var _ref2;
-      return this.body.jumps(o) || ((_ref2 = this.elseBody) != null ? _ref2.jumps(o) : void 0);
-    };
-
-    If.prototype.compileNode = function(o) {
-      if (this.isStatement(o)) {
-        return this.compileStatement(o);
-      } else {
-        return this.compileExpression(o);
-      }
-    };
-
-    If.prototype.makeReturn = function(res) {
-      if (res) {
-        this.elseBody || (this.elseBody = new Block([new Literal('void 0')]));
-      }
-      this.body && (this.body = new Block([this.body.makeReturn(res)]));
-      this.elseBody && (this.elseBody = new Block([this.elseBody.makeReturn(res)]));
-      return this;
-    };
-
-    If.prototype.ensureBlock = function(node) {
-      if (node instanceof Block) {
-        return node;
-      } else {
-        return new Block([node]);
-      }
-    };
-
-    If.prototype.compileStatement = function(o) {
-      var body, bodyc, child, cond, exeq, ifPart, _ref2;
-      child = del(o, 'chainChild');
-      exeq = del(o, 'isExistentialEquals');
-      if (exeq) {
-        return new If(this.condition.invert(), this.elseBodyNode(), {
-          type: 'if'
-        }).compile(o);
-      }
-      cond = this.condition.compile(o, LEVEL_PAREN);
-      o.indent += TAB;
-      body = this.ensureBlock(this.body);
-      bodyc = body.compile(o);
-      if (1 === ((_ref2 = body.expressions) != null ? _ref2.length : void 0) && !this.elseBody && !child && bodyc && cond && -1 === (bodyc.indexOf('\n')) && 80 > cond.length + bodyc.length) {
-        return "" + this.tab + "if (" + cond + ") " + (bodyc.replace(/^\s+/, ''));
-      }
-      if (bodyc) bodyc = "\n" + bodyc + "\n" + this.tab;
-      ifPart = "if (" + cond + ") {" + bodyc + "}";
-      if (!child) ifPart = this.tab + ifPart;
-      if (!this.elseBody) return ifPart;
-      return ifPart + ' else ' + (this.isChain ? (o.indent = this.tab, o.chainChild = true, this.elseBody.unwrap().compile(o, LEVEL_TOP)) : "{\n" + (this.elseBody.compile(o, LEVEL_TOP)) + "\n" + this.tab + "}");
-    };
-
-    If.prototype.compileExpression = function(o) {
-      var alt, body, code, cond;
-      cond = this.condition.compile(o, LEVEL_COND);
-      body = this.bodyNode().compile(o, LEVEL_LIST);
-      alt = this.elseBodyNode() ? this.elseBodyNode().compile(o, LEVEL_LIST) : 'void 0';
-      code = "" + cond + " ? " + body + " : " + alt;
-      if (o.level >= LEVEL_COND) {
-        return "(" + code + ")";
-      } else {
-        return code;
-      }
-    };
-
-    If.prototype.unfoldSoak = function() {
-      return this.soak && this;
-    };
-
-    return If;
-
-  })(Base);
-
-  Closure = {
-    wrap: function(expressions, statement, noReturn) {
-      var args, call, func, mentionsArgs, meth;
-      if (expressions.jumps()) return expressions;
-      func = new Code([], Block.wrap([expressions]));
-      args = [];
-      if ((mentionsArgs = expressions.contains(this.literalArgs)) || expressions.contains(this.literalThis)) {
-        meth = new Literal(mentionsArgs ? 'apply' : 'call');
-        args = [new Literal('this')];
-        if (mentionsArgs) args.push(new Literal('arguments'));
-        func = new Value(func, [new Access(meth)]);
-      }
-      func.noReturn = noReturn;
-      call = new Call(func, args);
-      if (statement) {
-        return Block.wrap([call]);
-      } else {
-        return call;
-      }
-    },
-    literalArgs: function(node) {
-      return node instanceof Literal && node.value === 'arguments' && !node.asKey;
-    },
-    literalThis: function(node) {
-      return (node instanceof Literal && node.value === 'this' && !node.asKey) || (node instanceof Code && node.bound);
-    }
-  };
-
-  unfoldSoak = function(o, parent, name) {
-    var ifn;
-    if (!(ifn = parent[name].unfoldSoak(o))) return;
-    parent[name] = ifn.body;
-    ifn.body = new Value(parent);
-    return ifn;
-  };
-
-  UTILITIES = {
-    "extends": function() {
-      return "function(child, parent) { for (var key in parent) { if (" + (utility('hasProp')) + ".call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor; child.__super__ = parent.prototype; return child; }";
-    },
-    bind: function() {
-      return 'function(fn, me){ return function(){ return fn.apply(me, arguments); }; }';
-    },
-    indexOf: function() {
-      return "[].indexOf || function(item) { for (var i = 0, l = this.length; i < l; i++) { if (i in this && this[i] === item) return i; } return -1; }";
-    },
-    hasProp: function() {
-      return '{}.hasOwnProperty';
-    },
-    slice: function() {
-      return '[].slice';
-    }
-  };
-
-  LEVEL_TOP = 1;
-
-  LEVEL_PAREN = 2;
-
-  LEVEL_LIST = 3;
-
-  LEVEL_COND = 4;
-
-  LEVEL_OP = 5;
-
-  LEVEL_ACCESS = 6;
-
-  TAB = '  ';
-
-  IDENTIFIER_STR = "[$A-Za-z_\\x7f-\\uffff][$\\w\\x7f-\\uffff]*";
-
-  IDENTIFIER = RegExp("^" + IDENTIFIER_STR + "$");
-
-  SIMPLENUM = /^[+-]?\d+$/;
-
-  METHOD_DEF = RegExp("^(?:(" + IDENTIFIER_STR + ")\\.prototype(?:\\.(" + IDENTIFIER_STR + ")|\\[(\"(?:[^\\\\\"\\r\\n]|\\\\.)*\"|'(?:[^\\\\'\\r\\n]|\\\\.)*')\\]|\\[(0x[\\da-fA-F]+|\\d*\\.?\\d+(?:[eE][+-]?\\d+)?)\\]))|(" + IDENTIFIER_STR + ")$");
-
-  IS_STRING = /^['"]/;
-
-  utility = function(name) {
-    var ref;
-    ref = "__" + name;
-    Scope.root.assign(ref, UTILITIES[name]());
-    return ref;
-  };
-
-  multident = function(code, tab) {
-    code = code.replace(/\n/g, '$&' + tab);
-    return code.replace(/\s+$/, '');
-  };
-
-
-});/**
- * Copyright (c) 2011 Jeremy Ashkenas
- * 
- * 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.
- */
-
-define('ace/mode/coffee/scope', ['require', 'exports', 'module' , 'ace/mode/coffee/helpers'], function(require, exports, module) {
-// Generated by CoffeeScript 1.2.1-pre
-
-  var Scope, extend, last, _ref;
-
-  _ref = require('./helpers'), extend = _ref.extend, last = _ref.last;
-
-  exports.Scope = Scope = (function() {
-
-    Scope.name = 'Scope';
-
-    Scope.root = null;
-
-    function Scope(parent, expressions, method) {
-      this.parent = parent;
-      this.expressions = expressions;
-      this.method = method;
-      this.variables = [
-        {
-          name: 'arguments',
-          type: 'arguments'
-        }
-      ];
-      this.positions = {};
-      if (!this.parent) Scope.root = this;
-    }
-
-    Scope.prototype.add = function(name, type, immediate) {
-      if (this.shared && !immediate) return this.parent.add(name, type, immediate);
-      if (Object.prototype.hasOwnProperty.call(this.positions, name)) {
-        return this.variables[this.positions[name]].type = type;
-      } else {
-        return this.positions[name] = this.variables.push({
-          name: name,
-          type: type
-        }) - 1;
-      }
-    };
-
-    Scope.prototype.find = function(name, options) {
-      if (this.check(name, options)) return true;
-      this.add(name, 'var');
-      return false;
-    };
-
-    Scope.prototype.parameter = function(name) {
-      if (this.shared && this.parent.check(name, true)) return;
-      return this.add(name, 'param');
-    };
-
-    Scope.prototype.check = function(name, immediate) {
-      var found, _ref1;
-      found = !!this.type(name);
-      if (found || immediate) return found;
-      return !!((_ref1 = this.parent) != null ? _ref1.check(name) : void 0);
-    };
-
-    Scope.prototype.temporary = function(name, index) {
-      if (name.length > 1) {
-        return '_' + name + (index > 1 ? index - 1 : '');
-      } else {
-        return '_' + (index + parseInt(name, 36)).toString(36).replace(/\d/g, 'a');
-      }
-    };
-
-    Scope.prototype.type = function(name) {
-      var v, _i, _len, _ref1;
-      _ref1 = this.variables;
-      for (_i = 0, _len = _ref1.length; _i < _len; _i++) {
-        v = _ref1[_i];
-        if (v.name === name) return v.type;
-      }
-      return null;
-    };
-
-    Scope.prototype.freeVariable = function(name, reserve) {
-      var index, temp;
-      if (reserve == null) reserve = true;
-      index = 0;
-      while (this.check((temp = this.temporary(name, index)))) {
-        index++;
-      }
-      if (reserve) this.add(temp, 'var', true);
-      return temp;
-    };
-
-    Scope.prototype.assign = function(name, value) {
-      this.add(name, {
-        value: value,
-        assigned: true
-      }, true);
-      return this.hasAssignments = true;
-    };
-
-    Scope.prototype.hasDeclarations = function() {
-      return !!this.declaredVariables().length;
-    };
-
-    Scope.prototype.declaredVariables = function() {
-      var realVars, tempVars, v, _i, _len, _ref1;
-      realVars = [];
-      tempVars = [];
-      _ref1 = this.variables;
-      for (_i = 0, _len = _ref1.length; _i < _len; _i++) {
-        v = _ref1[_i];
-        if (v.type === 'var') {
-          (v.name.charAt(0) === '_' ? tempVars : realVars).push(v.name);
-        }
-      }
-      return realVars.sort().concat(tempVars.sort());
-    };
-
-    Scope.prototype.assignedVariables = function() {
-      var v, _i, _len, _ref1, _results;
-      _ref1 = this.variables;
-      _results = [];
-      for (_i = 0, _len = _ref1.length; _i < _len; _i++) {
-        v = _ref1[_i];
-        if (v.type.assigned) _results.push("" + v.name + " = " + v.type.value);
-      }
-      return _results;
-    };
-
-    return Scope;
-
-  })();
-
-
-});
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/worker-css.js b/apps/files_texteditor/js/aceeditor/worker-css.js
deleted file mode 100644
index 7037c9b6aa..0000000000
--- a/apps/files_texteditor/js/aceeditor/worker-css.js
+++ /dev/null
@@ -1,11714 +0,0 @@
-"no use strict";
-
-var console = {
-    log: function(msg) {
-        postMessage({type: "log", data: msg});
-    }
-};
-var window = {
-    console: console
-};
-
-var normalizeModule = function(parentId, moduleName) {
-    // normalize plugin requires
-    if (moduleName.indexOf("!") !== -1) {
-        var chunks = moduleName.split("!");
-        return normalizeModule(parentId, chunks[0]) + "!" + normalizeModule(parentId, chunks[1]);
-    }
-    // normalize relative requires
-    if (moduleName.charAt(0) == ".") {
-        var base = parentId.split("/").slice(0, -1).join("/");
-        var moduleName = base + "/" + moduleName;
-        
-        while(moduleName.indexOf(".") !== -1 && previous != moduleName) {
-            var previous = moduleName;
-            var moduleName = moduleName.replace(/\/\.\//, "/").replace(/[^\/]+\/\.\.\//, "");
-        }
-    }
-    
-    return moduleName;
-};
-
-var require = function(parentId, id) {
-    var id = normalizeModule(parentId, id);
-    
-    var module = require.modules[id];
-    if (module) {
-        if (!module.initialized) {
-            module.exports = module.factory().exports;
-            module.initialized = true;
-        }
-        return module.exports;
-    }
-    
-    var chunks = id.split("/");
-    chunks[0] = require.tlns[chunks[0]] || chunks[0];
-    var path = chunks.join("/") + ".js";
-    
-    require.id = id;
-    importScripts(path);
-    return require(parentId, id);    
-};
-
-require.modules = {};
-require.tlns = {};
-
-var define = function(id, deps, factory) {
-    if (arguments.length == 2) {
-        factory = deps;
-    } else if (arguments.length == 1) {
-        factory = id;
-        id = require.id;
-    }
-
-    if (id.indexOf("text!") === 0) 
-        return;
-    
-    var req = function(deps, factory) {
-        return require(id, deps, factory);
-    };
-
-    require.modules[id] = {
-        factory: function() {
-            var module = {
-                exports: {}
-            };
-            var returnExports = factory(req, module.exports, module);
-            if (returnExports)
-                module.exports = returnExports;
-            return module;
-        }
-    };
-};
-
-function initBaseUrls(topLevelNamespaces) {
-    require.tlns = topLevelNamespaces;
-}
-
-function initSender() {
-
-    var EventEmitter = require(null, "ace/lib/event_emitter").EventEmitter;
-    var oop = require(null, "ace/lib/oop");
-    
-    var Sender = function() {};
-    
-    (function() {
-        
-        oop.implement(this, EventEmitter);
-                
-        this.callback = function(data, callbackId) {
-            postMessage({
-                type: "call",
-                id: callbackId,
-                data: data
-            });
-        };
-    
-        this.emit = function(name, data) {
-            postMessage({
-                type: "event",
-                name: name,
-                data: data
-            });
-        };
-        
-    }).call(Sender.prototype);
-    
-    return new Sender();
-}
-
-var main;
-var sender;
-
-onmessage = function(e) {
-    var msg = e.data;
-    if (msg.command) {
-        main[msg.command].apply(main, msg.args);
-    }
-    else if (msg.init) {        
-        initBaseUrls(msg.tlns);
-        require(null, "ace/lib/fixoldbrowsers");
-        sender = initSender();
-        var clazz = require(null, msg.module)[msg.classname];
-        main = new clazz(sender);
-    } 
-    else if (msg.event && sender) {
-        sender._emit(msg.event, msg.data);
-    }
-};
-// vim:set ts=4 sts=4 sw=4 st:
-// -- kriskowal Kris Kowal Copyright (C) 2009-2010 MIT License
-// -- tlrobinson Tom Robinson Copyright (C) 2009-2010 MIT License (Narwhal Project)
-// -- dantman Daniel Friesen Copyright(C) 2010 XXX No License Specified
-// -- fschaefer Florian Schäfer Copyright (C) 2010 MIT License
-// -- Irakli Gozalishvili Copyright (C) 2010 MIT License
-
-/*!
-    Copyright (c) 2009, 280 North Inc. http://280north.com/
-    MIT License. http://github.com/280north/narwhal/blob/master/README.md
-*/
-
-define('ace/lib/fixoldbrowsers', ['require', 'exports', 'module' , 'ace/lib/regexp', 'ace/lib/es5-shim'], function(require, exports, module) {
-"use strict";
-
-require("./regexp");
-require("./es5-shim");
-
-});/**
- *  Based on code from:
- *
- * XRegExp 1.5.0
- * (c) 2007-2010 Steven Levithan
- * MIT License
- * <http://xregexp.com>
- * Provides an augmented, extensible, cross-browser implementation of regular expressions,
- * including support for additional syntax, flags, and methods
- */
- 
-define('ace/lib/regexp', ['require', 'exports', 'module' ], function(require, exports, module) {
-"use strict";
-
-    //---------------------------------
-    //  Private variables
-    //---------------------------------
-
-    var real = {
-            exec: RegExp.prototype.exec,
-            test: RegExp.prototype.test,
-            match: String.prototype.match,
-            replace: String.prototype.replace,
-            split: String.prototype.split
-        },
-        compliantExecNpcg = real.exec.call(/()??/, "")[1] === undefined, // check `exec` handling of nonparticipating capturing groups
-        compliantLastIndexIncrement = function () {
-            var x = /^/g;
-            real.test.call(x, "");
-            return !x.lastIndex;
-        }();
-
-    //---------------------------------
-    //  Overriden native methods
-    //---------------------------------
-
-    // Adds named capture support (with backreferences returned as `result.name`), and fixes two
-    // cross-browser issues per ES3:
-    // - Captured values for nonparticipating capturing groups should be returned as `undefined`,
-    //   rather than the empty string.
-    // - `lastIndex` should not be incremented after zero-length matches.
-    RegExp.prototype.exec = function (str) {
-        var match = real.exec.apply(this, arguments),
-            name, r2;
-        if ( typeof(str) == 'string' && match) {
-            // Fix browsers whose `exec` methods don't consistently return `undefined` for
-            // nonparticipating capturing groups
-            if (!compliantExecNpcg && match.length > 1 && indexOf(match, "") > -1) {
-                r2 = RegExp(this.source, real.replace.call(getNativeFlags(this), "g", ""));
-                // Using `str.slice(match.index)` rather than `match[0]` in case lookahead allowed
-                // matching due to characters outside the match
-                real.replace.call(str.slice(match.index), r2, function () {
-                    for (var i = 1; i < arguments.length - 2; i++) {
-                        if (arguments[i] === undefined)
-                            match[i] = undefined;
-                    }
-                });
-            }
-            // Attach named capture properties
-            if (this._xregexp && this._xregexp.captureNames) {
-                for (var i = 1; i < match.length; i++) {
-                    name = this._xregexp.captureNames[i - 1];
-                    if (name)
-                       match[name] = match[i];
-                }
-            }
-            // Fix browsers that increment `lastIndex` after zero-length matches
-            if (!compliantLastIndexIncrement && this.global && !match[0].length && (this.lastIndex > match.index))
-                this.lastIndex--;
-        }
-        return match;
-    };
-
-    // Don't override `test` if it won't change anything
-    if (!compliantLastIndexIncrement) {
-        // Fix browser bug in native method
-        RegExp.prototype.test = function (str) {
-            // Use the native `exec` to skip some processing overhead, even though the overriden
-            // `exec` would take care of the `lastIndex` fix
-            var match = real.exec.call(this, str);
-            // Fix browsers that increment `lastIndex` after zero-length matches
-            if (match && this.global && !match[0].length && (this.lastIndex > match.index))
-                this.lastIndex--;
-            return !!match;
-        };
-    }
-
-    //---------------------------------
-    //  Private helper functions
-    //---------------------------------
-
-    function getNativeFlags (regex) {
-        return (regex.global     ? "g" : "") +
-               (regex.ignoreCase ? "i" : "") +
-               (regex.multiline  ? "m" : "") +
-               (regex.extended   ? "x" : "") + // Proposed for ES4; included in AS3
-               (regex.sticky     ? "y" : "");
-    };
-
-    function indexOf (array, item, from) {
-        if (Array.prototype.indexOf) // Use the native array method if available
-            return array.indexOf(item, from);
-        for (var i = from || 0; i < array.length; i++) {
-            if (array[i] === item)
-                return i;
-        }
-        return -1;
-    };
-
-});
-// vim: ts=4 sts=4 sw=4 expandtab
-// -- kriskowal Kris Kowal Copyright (C) 2009-2011 MIT License
-// -- tlrobinson Tom Robinson Copyright (C) 2009-2010 MIT License (Narwhal Project)
-// -- dantman Daniel Friesen Copyright (C) 2010 XXX TODO License or CLA
-// -- fschaefer Florian Schäfer Copyright (C) 2010 MIT License
-// -- Gozala Irakli Gozalishvili Copyright (C) 2010 MIT License
-// -- kitcambridge Kit Cambridge Copyright (C) 2011 MIT License
-// -- kossnocorp Sasha Koss XXX TODO License or CLA
-// -- bryanforbes Bryan Forbes XXX TODO License or CLA
-// -- killdream Quildreen Motta Copyright (C) 2011 MIT Licence
-// -- michaelficarra Michael Ficarra Copyright (C) 2011 3-clause BSD License
-// -- sharkbrainguy Gerard Paapu Copyright (C) 2011 MIT License
-// -- bbqsrc Brendan Molloy (C) 2011 Creative Commons Zero (public domain)
-// -- iwyg XXX TODO License or CLA
-// -- DomenicDenicola Domenic Denicola Copyright (C) 2011 MIT License
-// -- xavierm02 Montillet Xavier XXX TODO License or CLA
-// -- Raynos Raynos XXX TODO License or CLA
-// -- samsonjs Sami Samhuri Copyright (C) 2010 MIT License
-// -- rwldrn Rick Waldron Copyright (C) 2011 MIT License
-// -- lexer Alexey Zakharov XXX TODO License or CLA
-
-/*!
-    Copyright (c) 2009, 280 North Inc. http://280north.com/
-    MIT License. http://github.com/280north/narwhal/blob/master/README.md
-*/
-
-define('ace/lib/es5-shim', ['require', 'exports', 'module' ], function(require, exports, module) {
-
-/**
- * Brings an environment as close to ECMAScript 5 compliance
- * as is possible with the facilities of erstwhile engines.
- *
- * Annotated ES5: http://es5.github.com/ (specific links below)
- * ES5 Spec: http://www.ecma-international.org/publications/files/ECMA-ST/Ecma-262.pdf
- *
- * @module
- */
-
-/*whatsupdoc*/
-
-//
-// Function
-// ========
-//
-
-// ES-5 15.3.4.5
-// http://es5.github.com/#x15.3.4.5
-
-if (!Function.prototype.bind) {
-    Function.prototype.bind = function bind(that) { // .length is 1
-        // 1. Let Target be the this value.
-        var target = this;
-        // 2. If IsCallable(Target) is false, throw a TypeError exception.
-        if (typeof target != "function")
-            throw new TypeError(); // TODO message
-        // 3. Let A be a new (possibly empty) internal list of all of the
-        //   argument values provided after thisArg (arg1, arg2 etc), in order.
-        // XXX slicedArgs will stand in for "A" if used
-        var args = slice.call(arguments, 1); // for normal call
-        // 4. Let F be a new native ECMAScript object.
-        // 11. Set the [[Prototype]] internal property of F to the standard
-        //   built-in Function prototype object as specified in 15.3.3.1.
-        // 12. Set the [[Call]] internal property of F as described in
-        //   15.3.4.5.1.
-        // 13. Set the [[Construct]] internal property of F as described in
-        //   15.3.4.5.2.
-        // 14. Set the [[HasInstance]] internal property of F as described in
-        //   15.3.4.5.3.
-        var bound = function () {
-
-            if (this instanceof bound) {
-                // 15.3.4.5.2 [[Construct]]
-                // When the [[Construct]] internal method of a function object,
-                // F that was created using the bind function is called with a
-                // list of arguments ExtraArgs, the following steps are taken:
-                // 1. Let target be the value of F's [[TargetFunction]]
-                //   internal property.
-                // 2. If target has no [[Construct]] internal method, a
-                //   TypeError exception is thrown.
-                // 3. Let boundArgs be the value of F's [[BoundArgs]] internal
-                //   property.
-                // 4. Let args be a new list containing the same values as the
-                //   list boundArgs in the same order followed by the same
-                //   values as the list ExtraArgs in the same order.
-                // 5. Return the result of calling the [[Construct]] internal 
-                //   method of target providing args as the arguments.
-
-                var F = function(){};
-                F.prototype = target.prototype;
-                var self = new F;
-
-                var result = target.apply(
-                    self,
-                    args.concat(slice.call(arguments))
-                );
-                if (result !== null && Object(result) === result)
-                    return result;
-                return self;
-
-            } else {
-                // 15.3.4.5.1 [[Call]]
-                // When the [[Call]] internal method of a function object, F,
-                // which was created using the bind function is called with a
-                // this value and a list of arguments ExtraArgs, the following
-                // steps are taken:
-                // 1. Let boundArgs be the value of F's [[BoundArgs]] internal
-                //   property.
-                // 2. Let boundThis be the value of F's [[BoundThis]] internal
-                //   property.
-                // 3. Let target be the value of F's [[TargetFunction]] internal
-                //   property.
-                // 4. Let args be a new list containing the same values as the 
-                //   list boundArgs in the same order followed by the same 
-                //   values as the list ExtraArgs in the same order.
-                // 5. Return the result of calling the [[Call]] internal method 
-                //   of target providing boundThis as the this value and 
-                //   providing args as the arguments.
-
-                // equiv: target.call(this, ...boundArgs, ...args)
-                return target.apply(
-                    that,
-                    args.concat(slice.call(arguments))
-                );
-
-            }
-
-        };
-        // XXX bound.length is never writable, so don't even try
-        //
-        // 15. If the [[Class]] internal property of Target is "Function", then
-        //     a. Let L be the length property of Target minus the length of A.
-        //     b. Set the length own property of F to either 0 or L, whichever is 
-        //       larger.
-        // 16. Else set the length own property of F to 0.
-        // 17. Set the attributes of the length own property of F to the values
-        //   specified in 15.3.5.1.
-
-        // TODO
-        // 18. Set the [[Extensible]] internal property of F to true.
-        
-        // TODO
-        // 19. Let thrower be the [[ThrowTypeError]] function Object (13.2.3).
-        // 20. Call the [[DefineOwnProperty]] internal method of F with 
-        //   arguments "caller", PropertyDescriptor {[[Get]]: thrower, [[Set]]:
-        //   thrower, [[Enumerable]]: false, [[Configurable]]: false}, and 
-        //   false.
-        // 21. Call the [[DefineOwnProperty]] internal method of F with 
-        //   arguments "arguments", PropertyDescriptor {[[Get]]: thrower, 
-        //   [[Set]]: thrower, [[Enumerable]]: false, [[Configurable]]: false},
-        //   and false.
-
-        // TODO
-        // NOTE Function objects created using Function.prototype.bind do not 
-        // have a prototype property or the [[Code]], [[FormalParameters]], and
-        // [[Scope]] internal properties.
-        // XXX can't delete prototype in pure-js.
-
-        // 22. Return F.
-        return bound;
-    };
-}
-
-// Shortcut to an often accessed properties, in order to avoid multiple
-// dereference that costs universally.
-// _Please note: Shortcuts are defined after `Function.prototype.bind` as we
-// us it in defining shortcuts.
-var call = Function.prototype.call;
-var prototypeOfArray = Array.prototype;
-var prototypeOfObject = Object.prototype;
-var slice = prototypeOfArray.slice;
-var toString = call.bind(prototypeOfObject.toString);
-var owns = call.bind(prototypeOfObject.hasOwnProperty);
-
-// If JS engine supports accessors creating shortcuts.
-var defineGetter;
-var defineSetter;
-var lookupGetter;
-var lookupSetter;
-var supportsAccessors;
-if ((supportsAccessors = owns(prototypeOfObject, "__defineGetter__"))) {
-    defineGetter = call.bind(prototypeOfObject.__defineGetter__);
-    defineSetter = call.bind(prototypeOfObject.__defineSetter__);
-    lookupGetter = call.bind(prototypeOfObject.__lookupGetter__);
-    lookupSetter = call.bind(prototypeOfObject.__lookupSetter__);
-}
-
-//
-// Array
-// =====
-//
-
-// ES5 15.4.3.2
-// http://es5.github.com/#x15.4.3.2
-// https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/isArray
-if (!Array.isArray) {
-    Array.isArray = function isArray(obj) {
-        return toString(obj) == "[object Array]";
-    };
-}
-
-// The IsCallable() check in the Array functions
-// has been replaced with a strict check on the
-// internal class of the object to trap cases where
-// the provided function was actually a regular
-// expression literal, which in V8 and
-// JavaScriptCore is a typeof "function".  Only in
-// V8 are regular expression literals permitted as
-// reduce parameters, so it is desirable in the
-// general case for the shim to match the more
-// strict and common behavior of rejecting regular
-// expressions.
-
-// ES5 15.4.4.18
-// http://es5.github.com/#x15.4.4.18
-// https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/array/forEach
-if (!Array.prototype.forEach) {
-    Array.prototype.forEach = function forEach(fun /*, thisp*/) {
-        var self = toObject(this),
-            thisp = arguments[1],
-            i = 0,
-            length = self.length >>> 0;
-
-        // If no callback function or if callback is not a callable function
-        if (toString(fun) != "[object Function]") {
-            throw new TypeError(); // TODO message
-        }
-
-        while (i < length) {
-            if (i in self) {
-                // Invoke the callback function with call, passing arguments:
-                // context, property value, property key, thisArg object context
-                fun.call(thisp, self[i], i, self);
-            }
-            i++;
-        }
-    };
-}
-
-// ES5 15.4.4.19
-// http://es5.github.com/#x15.4.4.19
-// https://developer.mozilla.org/en/Core_JavaScript_1.5_Reference/Objects/Array/map
-if (!Array.prototype.map) {
-    Array.prototype.map = function map(fun /*, thisp*/) {
-        var self = toObject(this),
-            length = self.length >>> 0,
-            result = Array(length),
-            thisp = arguments[1];
-
-        // If no callback function or if callback is not a callable function
-        if (toString(fun) != "[object Function]") {
-            throw new TypeError(); // TODO message
-        }
-
-        for (var i = 0; i < length; i++) {
-            if (i in self)
-                result[i] = fun.call(thisp, self[i], i, self);
-        }
-        return result;
-    };
-}
-
-// ES5 15.4.4.20
-// http://es5.github.com/#x15.4.4.20
-// https://developer.mozilla.org/en/Core_JavaScript_1.5_Reference/Objects/Array/filter
-if (!Array.prototype.filter) {
-    Array.prototype.filter = function filter(fun /*, thisp */) {
-        var self = toObject(this),
-            length = self.length >>> 0,
-            result = [],
-            thisp = arguments[1];
-
-        // If no callback function or if callback is not a callable function
-        if (toString(fun) != "[object Function]") {
-            throw new TypeError(); // TODO message
-        }
-
-        for (var i = 0; i < length; i++) {
-            if (i in self && fun.call(thisp, self[i], i, self))
-                result.push(self[i]);
-        }
-        return result;
-    };
-}
-
-// ES5 15.4.4.16
-// http://es5.github.com/#x15.4.4.16
-// https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/every
-if (!Array.prototype.every) {
-    Array.prototype.every = function every(fun /*, thisp */) {
-        var self = toObject(this),
-            length = self.length >>> 0,
-            thisp = arguments[1];
-
-        // If no callback function or if callback is not a callable function
-        if (toString(fun) != "[object Function]") {
-            throw new TypeError(); // TODO message
-        }
-
-        for (var i = 0; i < length; i++) {
-            if (i in self && !fun.call(thisp, self[i], i, self))
-                return false;
-        }
-        return true;
-    };
-}
-
-// ES5 15.4.4.17
-// http://es5.github.com/#x15.4.4.17
-// https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/some
-if (!Array.prototype.some) {
-    Array.prototype.some = function some(fun /*, thisp */) {
-        var self = toObject(this),
-            length = self.length >>> 0,
-            thisp = arguments[1];
-
-        // If no callback function or if callback is not a callable function
-        if (toString(fun) != "[object Function]") {
-            throw new TypeError(); // TODO message
-        }
-
-        for (var i = 0; i < length; i++) {
-            if (i in self && fun.call(thisp, self[i], i, self))
-                return true;
-        }
-        return false;
-    };
-}
-
-// ES5 15.4.4.21
-// http://es5.github.com/#x15.4.4.21
-// https://developer.mozilla.org/en/Core_JavaScript_1.5_Reference/Objects/Array/reduce
-if (!Array.prototype.reduce) {
-    Array.prototype.reduce = function reduce(fun /*, initial*/) {
-        var self = toObject(this),
-            length = self.length >>> 0;
-
-        // If no callback function or if callback is not a callable function
-        if (toString(fun) != "[object Function]") {
-            throw new TypeError(); // TODO message
-        }
-
-        // no value to return if no initial value and an empty array
-        if (!length && arguments.length == 1)
-            throw new TypeError(); // TODO message
-
-        var i = 0;
-        var result;
-        if (arguments.length >= 2) {
-            result = arguments[1];
-        } else {
-            do {
-                if (i in self) {
-                    result = self[i++];
-                    break;
-                }
-
-                // if array contains no values, no initial value to return
-                if (++i >= length)
-                    throw new TypeError(); // TODO message
-            } while (true);
-        }
-
-        for (; i < length; i++) {
-            if (i in self)
-                result = fun.call(void 0, result, self[i], i, self);
-        }
-
-        return result;
-    };
-}
-
-// ES5 15.4.4.22
-// http://es5.github.com/#x15.4.4.22
-// https://developer.mozilla.org/en/Core_JavaScript_1.5_Reference/Objects/Array/reduceRight
-if (!Array.prototype.reduceRight) {
-    Array.prototype.reduceRight = function reduceRight(fun /*, initial*/) {
-        var self = toObject(this),
-            length = self.length >>> 0;
-
-        // If no callback function or if callback is not a callable function
-        if (toString(fun) != "[object Function]") {
-            throw new TypeError(); // TODO message
-        }
-
-        // no value to return if no initial value, empty array
-        if (!length && arguments.length == 1)
-            throw new TypeError(); // TODO message
-
-        var result, i = length - 1;
-        if (arguments.length >= 2) {
-            result = arguments[1];
-        } else {
-            do {
-                if (i in self) {
-                    result = self[i--];
-                    break;
-                }
-
-                // if array contains no values, no initial value to return
-                if (--i < 0)
-                    throw new TypeError(); // TODO message
-            } while (true);
-        }
-
-        do {
-            if (i in this)
-                result = fun.call(void 0, result, self[i], i, self);
-        } while (i--);
-
-        return result;
-    };
-}
-
-// ES5 15.4.4.14
-// http://es5.github.com/#x15.4.4.14
-// https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/indexOf
-if (!Array.prototype.indexOf) {
-    Array.prototype.indexOf = function indexOf(sought /*, fromIndex */ ) {
-        var self = toObject(this),
-            length = self.length >>> 0;
-
-        if (!length)
-            return -1;
-
-        var i = 0;
-        if (arguments.length > 1)
-            i = toInteger(arguments[1]);
-
-        // handle negative indices
-        i = i >= 0 ? i : Math.max(0, length + i);
-        for (; i < length; i++) {
-            if (i in self && self[i] === sought) {
-                return i;
-            }
-        }
-        return -1;
-    };
-}
-
-// ES5 15.4.4.15
-// http://es5.github.com/#x15.4.4.15
-// https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/lastIndexOf
-if (!Array.prototype.lastIndexOf) {
-    Array.prototype.lastIndexOf = function lastIndexOf(sought /*, fromIndex */) {
-        var self = toObject(this),
-            length = self.length >>> 0;
-
-        if (!length)
-            return -1;
-        var i = length - 1;
-        if (arguments.length > 1)
-            i = Math.min(i, toInteger(arguments[1]));
-        // handle negative indices
-        i = i >= 0 ? i : length - Math.abs(i);
-        for (; i >= 0; i--) {
-            if (i in self && sought === self[i])
-                return i;
-        }
-        return -1;
-    };
-}
-
-//
-// Object
-// ======
-//
-
-// ES5 15.2.3.2
-// http://es5.github.com/#x15.2.3.2
-if (!Object.getPrototypeOf) {
-    // https://github.com/kriskowal/es5-shim/issues#issue/2
-    // http://ejohn.org/blog/objectgetprototypeof/
-    // recommended by fschaefer on github
-    Object.getPrototypeOf = function getPrototypeOf(object) {
-        return object.__proto__ || (
-            object.constructor ?
-            object.constructor.prototype :
-            prototypeOfObject
-        );
-    };
-}
-
-// ES5 15.2.3.3
-// http://es5.github.com/#x15.2.3.3
-if (!Object.getOwnPropertyDescriptor) {
-    var ERR_NON_OBJECT = "Object.getOwnPropertyDescriptor called on a " +
-                         "non-object: ";
-    Object.getOwnPropertyDescriptor = function getOwnPropertyDescriptor(object, property) {
-        if ((typeof object != "object" && typeof object != "function") || object === null)
-            throw new TypeError(ERR_NON_OBJECT + object);
-        // If object does not owns property return undefined immediately.
-        if (!owns(object, property))
-            return;
-
-        var descriptor, getter, setter;
-
-        // If object has a property then it's for sure both `enumerable` and
-        // `configurable`.
-        descriptor =  { enumerable: true, configurable: true };
-
-        // If JS engine supports accessor properties then property may be a
-        // getter or setter.
-        if (supportsAccessors) {
-            // Unfortunately `__lookupGetter__` will return a getter even
-            // if object has own non getter property along with a same named
-            // inherited getter. To avoid misbehavior we temporary remove
-            // `__proto__` so that `__lookupGetter__` will return getter only
-            // if it's owned by an object.
-            var prototype = object.__proto__;
-            object.__proto__ = prototypeOfObject;
-
-            var getter = lookupGetter(object, property);
-            var setter = lookupSetter(object, property);
-
-            // Once we have getter and setter we can put values back.
-            object.__proto__ = prototype;
-
-            if (getter || setter) {
-                if (getter) descriptor.get = getter;
-                if (setter) descriptor.set = setter;
-
-                // If it was accessor property we're done and return here
-                // in order to avoid adding `value` to the descriptor.
-                return descriptor;
-            }
-        }
-
-        // If we got this far we know that object has an own property that is
-        // not an accessor so we set it as a value and return descriptor.
-        descriptor.value = object[property];
-        return descriptor;
-    };
-}
-
-// ES5 15.2.3.4
-// http://es5.github.com/#x15.2.3.4
-if (!Object.getOwnPropertyNames) {
-    Object.getOwnPropertyNames = function getOwnPropertyNames(object) {
-        return Object.keys(object);
-    };
-}
-
-// ES5 15.2.3.5
-// http://es5.github.com/#x15.2.3.5
-if (!Object.create) {
-    Object.create = function create(prototype, properties) {
-        var object;
-        if (prototype === null) {
-            object = { "__proto__": null };
-        } else {
-            if (typeof prototype != "object")
-                throw new TypeError("typeof prototype["+(typeof prototype)+"] != 'object'");
-            var Type = function () {};
-            Type.prototype = prototype;
-            object = new Type();
-            // IE has no built-in implementation of `Object.getPrototypeOf`
-            // neither `__proto__`, but this manually setting `__proto__` will
-            // guarantee that `Object.getPrototypeOf` will work as expected with
-            // objects created using `Object.create`
-            object.__proto__ = prototype;
-        }
-        if (properties !== void 0)
-            Object.defineProperties(object, properties);
-        return object;
-    };
-}
-
-// ES5 15.2.3.6
-// http://es5.github.com/#x15.2.3.6
-
-// Patch for WebKit and IE8 standard mode
-// Designed by hax <hax.github.com>
-// related issue: https://github.com/kriskowal/es5-shim/issues#issue/5
-// IE8 Reference:
-//     http://msdn.microsoft.com/en-us/library/dd282900.aspx
-//     http://msdn.microsoft.com/en-us/library/dd229916.aspx
-// WebKit Bugs:
-//     https://bugs.webkit.org/show_bug.cgi?id=36423
-
-function doesDefinePropertyWork(object) {
-    try {
-        Object.defineProperty(object, "sentinel", {});
-        return "sentinel" in object;
-    } catch (exception) {
-        // returns falsy
-    }
-}
-
-// check whether defineProperty works if it's given. Otherwise,
-// shim partially.
-if (Object.defineProperty) {
-    var definePropertyWorksOnObject = doesDefinePropertyWork({});
-    var definePropertyWorksOnDom = typeof document == "undefined" ||
-        doesDefinePropertyWork(document.createElement("div"));
-    if (!definePropertyWorksOnObject || !definePropertyWorksOnDom) {
-        var definePropertyFallback = Object.defineProperty;
-    }
-}
-
-if (!Object.defineProperty || definePropertyFallback) {
-    var ERR_NON_OBJECT_DESCRIPTOR = "Property description must be an object: ";
-    var ERR_NON_OBJECT_TARGET = "Object.defineProperty called on non-object: "
-    var ERR_ACCESSORS_NOT_SUPPORTED = "getters & setters can not be defined " +
-                                      "on this javascript engine";
-
-    Object.defineProperty = function defineProperty(object, property, descriptor) {
-        if ((typeof object != "object" && typeof object != "function") || object === null)
-            throw new TypeError(ERR_NON_OBJECT_TARGET + object);
-        if ((typeof descriptor != "object" && typeof descriptor != "function") || descriptor === null)
-            throw new TypeError(ERR_NON_OBJECT_DESCRIPTOR + descriptor);
-
-        // make a valiant attempt to use the real defineProperty
-        // for I8's DOM elements.
-        if (definePropertyFallback) {
-            try {
-                return definePropertyFallback.call(Object, object, property, descriptor);
-            } catch (exception) {
-                // try the shim if the real one doesn't work
-            }
-        }
-
-        // If it's a data property.
-        if (owns(descriptor, "value")) {
-            // fail silently if "writable", "enumerable", or "configurable"
-            // are requested but not supported
-            /*
-            // alternate approach:
-            if ( // can't implement these features; allow false but not true
-                !(owns(descriptor, "writable") ? descriptor.writable : true) ||
-                !(owns(descriptor, "enumerable") ? descriptor.enumerable : true) ||
-                !(owns(descriptor, "configurable") ? descriptor.configurable : true)
-            )
-                throw new RangeError(
-                    "This implementation of Object.defineProperty does not " +
-                    "support configurable, enumerable, or writable."
-                );
-            */
-
-            if (supportsAccessors && (lookupGetter(object, property) ||
-                                      lookupSetter(object, property)))
-            {
-                // As accessors are supported only on engines implementing
-                // `__proto__` we can safely override `__proto__` while defining
-                // a property to make sure that we don't hit an inherited
-                // accessor.
-                var prototype = object.__proto__;
-                object.__proto__ = prototypeOfObject;
-                // Deleting a property anyway since getter / setter may be
-                // defined on object itself.
-                delete object[property];
-                object[property] = descriptor.value;
-                // Setting original `__proto__` back now.
-                object.__proto__ = prototype;
-            } else {
-                object[property] = descriptor.value;
-            }
-        } else {
-            if (!supportsAccessors)
-                throw new TypeError(ERR_ACCESSORS_NOT_SUPPORTED);
-            // If we got that far then getters and setters can be defined !!
-            if (owns(descriptor, "get"))
-                defineGetter(object, property, descriptor.get);
-            if (owns(descriptor, "set"))
-                defineSetter(object, property, descriptor.set);
-        }
-
-        return object;
-    };
-}
-
-// ES5 15.2.3.7
-// http://es5.github.com/#x15.2.3.7
-if (!Object.defineProperties) {
-    Object.defineProperties = function defineProperties(object, properties) {
-        for (var property in properties) {
-            if (owns(properties, property))
-                Object.defineProperty(object, property, properties[property]);
-        }
-        return object;
-    };
-}
-
-// ES5 15.2.3.8
-// http://es5.github.com/#x15.2.3.8
-if (!Object.seal) {
-    Object.seal = function seal(object) {
-        // this is misleading and breaks feature-detection, but
-        // allows "securable" code to "gracefully" degrade to working
-        // but insecure code.
-        return object;
-    };
-}
-
-// ES5 15.2.3.9
-// http://es5.github.com/#x15.2.3.9
-if (!Object.freeze) {
-    Object.freeze = function freeze(object) {
-        // this is misleading and breaks feature-detection, but
-        // allows "securable" code to "gracefully" degrade to working
-        // but insecure code.
-        return object;
-    };
-}
-
-// detect a Rhino bug and patch it
-try {
-    Object.freeze(function () {});
-} catch (exception) {
-    Object.freeze = (function freeze(freezeObject) {
-        return function freeze(object) {
-            if (typeof object == "function") {
-                return object;
-            } else {
-                return freezeObject(object);
-            }
-        };
-    })(Object.freeze);
-}
-
-// ES5 15.2.3.10
-// http://es5.github.com/#x15.2.3.10
-if (!Object.preventExtensions) {
-    Object.preventExtensions = function preventExtensions(object) {
-        // this is misleading and breaks feature-detection, but
-        // allows "securable" code to "gracefully" degrade to working
-        // but insecure code.
-        return object;
-    };
-}
-
-// ES5 15.2.3.11
-// http://es5.github.com/#x15.2.3.11
-if (!Object.isSealed) {
-    Object.isSealed = function isSealed(object) {
-        return false;
-    };
-}
-
-// ES5 15.2.3.12
-// http://es5.github.com/#x15.2.3.12
-if (!Object.isFrozen) {
-    Object.isFrozen = function isFrozen(object) {
-        return false;
-    };
-}
-
-// ES5 15.2.3.13
-// http://es5.github.com/#x15.2.3.13
-if (!Object.isExtensible) {
-    Object.isExtensible = function isExtensible(object) {
-        // 1. If Type(O) is not Object throw a TypeError exception.
-        if (Object(object) === object) {
-            throw new TypeError(); // TODO message
-        }
-        // 2. Return the Boolean value of the [[Extensible]] internal property of O.
-        var name = '';
-        while (owns(object, name)) {
-            name += '?';
-        }
-        object[name] = true;
-        var returnValue = owns(object, name);
-        delete object[name];
-        return returnValue;
-    };
-}
-
-// ES5 15.2.3.14
-// http://es5.github.com/#x15.2.3.14
-if (!Object.keys) {
-    // http://whattheheadsaid.com/2010/10/a-safer-object-keys-compatibility-implementation
-    var hasDontEnumBug = true,
-        dontEnums = [
-            "toString",
-            "toLocaleString",
-            "valueOf",
-            "hasOwnProperty",
-            "isPrototypeOf",
-            "propertyIsEnumerable",
-            "constructor"
-        ],
-        dontEnumsLength = dontEnums.length;
-
-    for (var key in {"toString": null})
-        hasDontEnumBug = false;
-
-    Object.keys = function keys(object) {
-
-        if ((typeof object != "object" && typeof object != "function") || object === null)
-            throw new TypeError("Object.keys called on a non-object");
-
-        var keys = [];
-        for (var name in object) {
-            if (owns(object, name)) {
-                keys.push(name);
-            }
-        }
-
-        if (hasDontEnumBug) {
-            for (var i = 0, ii = dontEnumsLength; i < ii; i++) {
-                var dontEnum = dontEnums[i];
-                if (owns(object, dontEnum)) {
-                    keys.push(dontEnum);
-                }
-            }
-        }
-
-        return keys;
-    };
-
-}
-
-//
-// Date
-// ====
-//
-
-// ES5 15.9.5.43
-// http://es5.github.com/#x15.9.5.43
-// This function returns a String value represent the instance in time 
-// represented by this Date object. The format of the String is the Date Time 
-// string format defined in 15.9.1.15. All fields are present in the String. 
-// The time zone is always UTC, denoted by the suffix Z. If the time value of 
-// this object is not a finite Number a RangeError exception is thrown.
-if (!Date.prototype.toISOString || (new Date(-62198755200000).toISOString().indexOf('-000001') === -1)) {
-    Date.prototype.toISOString = function toISOString() {
-        var result, length, value, year;
-        if (!isFinite(this))
-            throw new RangeError;
-
-        // the date time string format is specified in 15.9.1.15.
-        result = [this.getUTCMonth() + 1, this.getUTCDate(),
-            this.getUTCHours(), this.getUTCMinutes(), this.getUTCSeconds()];
-        year = this.getUTCFullYear();
-        year = (year < 0 ? '-' : (year > 9999 ? '+' : '')) + ('00000' + Math.abs(year)).slice(0 <= year && year <= 9999 ? -4 : -6);
-
-        length = result.length;
-        while (length--) {
-            value = result[length];
-            // pad months, days, hours, minutes, and seconds to have two digits.
-            if (value < 10)
-                result[length] = "0" + value;
-        }
-        // pad milliseconds to have three digits.
-        return year + "-" + result.slice(0, 2).join("-") + "T" + result.slice(2).join(":") + "." +
-            ("000" + this.getUTCMilliseconds()).slice(-3) + "Z";
-    }
-}
-
-// ES5 15.9.4.4
-// http://es5.github.com/#x15.9.4.4
-if (!Date.now) {
-    Date.now = function now() {
-        return new Date().getTime();
-    };
-}
-
-// ES5 15.9.5.44
-// http://es5.github.com/#x15.9.5.44
-// This function provides a String representation of a Date object for use by 
-// JSON.stringify (15.12.3).
-if (!Date.prototype.toJSON) {
-    Date.prototype.toJSON = function toJSON(key) {
-        // When the toJSON method is called with argument key, the following 
-        // steps are taken:
-
-        // 1.  Let O be the result of calling ToObject, giving it the this
-        // value as its argument.
-        // 2. Let tv be ToPrimitive(O, hint Number).
-        // 3. If tv is a Number and is not finite, return null.
-        // XXX
-        // 4. Let toISO be the result of calling the [[Get]] internal method of
-        // O with argument "toISOString".
-        // 5. If IsCallable(toISO) is false, throw a TypeError exception.
-        if (typeof this.toISOString != "function")
-            throw new TypeError(); // TODO message
-        // 6. Return the result of calling the [[Call]] internal method of
-        //  toISO with O as the this value and an empty argument list.
-        return this.toISOString();
-
-        // NOTE 1 The argument is ignored.
-
-        // NOTE 2 The toJSON function is intentionally generic; it does not
-        // require that its this value be a Date object. Therefore, it can be
-        // transferred to other kinds of objects for use as a method. However,
-        // it does require that any such object have a toISOString method. An
-        // object is free to use the argument key to filter its
-        // stringification.
-    };
-}
-
-// ES5 15.9.4.2
-// http://es5.github.com/#x15.9.4.2
-// based on work shared by Daniel Friesen (dantman)
-// http://gist.github.com/303249
-if (Date.parse("+275760-09-13T00:00:00.000Z") !== 8.64e15) {
-    // XXX global assignment won't work in embeddings that use
-    // an alternate object for the context.
-    Date = (function(NativeDate) {
-
-        // Date.length === 7
-        var Date = function Date(Y, M, D, h, m, s, ms) {
-            var length = arguments.length;
-            if (this instanceof NativeDate) {
-                var date = length == 1 && String(Y) === Y ? // isString(Y)
-                    // We explicitly pass it through parse:
-                    new NativeDate(Date.parse(Y)) :
-                    // We have to manually make calls depending on argument
-                    // length here
-                    length >= 7 ? new NativeDate(Y, M, D, h, m, s, ms) :
-                    length >= 6 ? new NativeDate(Y, M, D, h, m, s) :
-                    length >= 5 ? new NativeDate(Y, M, D, h, m) :
-                    length >= 4 ? new NativeDate(Y, M, D, h) :
-                    length >= 3 ? new NativeDate(Y, M, D) :
-                    length >= 2 ? new NativeDate(Y, M) :
-                    length >= 1 ? new NativeDate(Y) :
-                                  new NativeDate();
-                // Prevent mixups with unfixed Date object
-                date.constructor = Date;
-                return date;
-            }
-            return NativeDate.apply(this, arguments);
-        };
-
-        // 15.9.1.15 Date Time String Format.
-        var isoDateExpression = new RegExp("^" +
-            "(\\d{4}|[\+\-]\\d{6})" + // four-digit year capture or sign + 6-digit extended year
-            "(?:-(\\d{2})" + // optional month capture
-            "(?:-(\\d{2})" + // optional day capture
-            "(?:" + // capture hours:minutes:seconds.milliseconds
-                "T(\\d{2})" + // hours capture
-                ":(\\d{2})" + // minutes capture
-                "(?:" + // optional :seconds.milliseconds
-                    ":(\\d{2})" + // seconds capture
-                    "(?:\\.(\\d{3}))?" + // milliseconds capture
-                ")?" +
-            "(?:" + // capture UTC offset component
-                "Z|" + // UTC capture
-                "(?:" + // offset specifier +/-hours:minutes
-                    "([-+])" + // sign capture
-                    "(\\d{2})" + // hours offset capture
-                    ":(\\d{2})" + // minutes offset capture
-                ")" +
-            ")?)?)?)?" +
-        "$");
-
-        // Copy any custom methods a 3rd party library may have added
-        for (var key in NativeDate)
-            Date[key] = NativeDate[key];
-
-        // Copy "native" methods explicitly; they may be non-enumerable
-        Date.now = NativeDate.now;
-        Date.UTC = NativeDate.UTC;
-        Date.prototype = NativeDate.prototype;
-        Date.prototype.constructor = Date;
-
-        // Upgrade Date.parse to handle simplified ISO 8601 strings
-        Date.parse = function parse(string) {
-            var match = isoDateExpression.exec(string);
-            if (match) {
-                match.shift(); // kill match[0], the full match
-                // parse months, days, hours, minutes, seconds, and milliseconds
-                for (var i = 1; i < 7; i++) {
-                    // provide default values if necessary
-                    match[i] = +(match[i] || (i < 3 ? 1 : 0));
-                    // match[1] is the month. Months are 0-11 in JavaScript
-                    // `Date` objects, but 1-12 in ISO notation, so we
-                    // decrement.
-                    if (i == 1)
-                        match[i]--;
-                }
-
-                // parse the UTC offset component
-                var minuteOffset = +match.pop(), hourOffset = +match.pop(), sign = match.pop();
-
-                // compute the explicit time zone offset if specified
-                var offset = 0;
-                if (sign) {
-                    // detect invalid offsets and return early
-                    if (hourOffset > 23 || minuteOffset > 59)
-                        return NaN;
-
-                    // express the provided time zone offset in minutes. The offset is
-                    // negative for time zones west of UTC; positive otherwise.
-                    offset = (hourOffset * 60 + minuteOffset) * 6e4 * (sign == "+" ? -1 : 1);
-                }
-
-                // Date.UTC for years between 0 and 99 converts year to 1900 + year
-                // The Gregorian calendar has a 400-year cycle, so 
-                // to Date.UTC(year + 400, .... ) - 12622780800000 == Date.UTC(year, ...),
-                // where 12622780800000 - number of milliseconds in Gregorian calendar 400 years
-                var year = +match[0];
-                if (0 <= year && year <= 99) {
-                    match[0] = year + 400;
-                    return NativeDate.UTC.apply(this, match) + offset - 12622780800000;
-                }
-
-                // compute a new UTC date value, accounting for the optional offset
-                return NativeDate.UTC.apply(this, match) + offset;
-            }
-            return NativeDate.parse.apply(this, arguments);
-        };
-
-        return Date;
-    })(Date);
-}
-
-//
-// String
-// ======
-//
-
-// ES5 15.5.4.20
-// http://es5.github.com/#x15.5.4.20
-var ws = "\x09\x0A\x0B\x0C\x0D\x20\xA0\u1680\u180E\u2000\u2001\u2002\u2003" +
-    "\u2004\u2005\u2006\u2007\u2008\u2009\u200A\u202F\u205F\u3000\u2028" +
-    "\u2029\uFEFF";
-if (!String.prototype.trim || ws.trim()) {
-    // http://blog.stevenlevithan.com/archives/faster-trim-javascript
-    // http://perfectionkills.com/whitespace-deviations/
-    ws = "[" + ws + "]";
-    var trimBeginRegexp = new RegExp("^" + ws + ws + "*"),
-        trimEndRegexp = new RegExp(ws + ws + "*$");
-    String.prototype.trim = function trim() {
-        return String(this).replace(trimBeginRegexp, "").replace(trimEndRegexp, "");
-    };
-}
-
-//
-// Util
-// ======
-//
-
-// ES5 9.4
-// http://es5.github.com/#x9.4
-// http://jsperf.com/to-integer
-var toInteger = function (n) {
-    n = +n;
-    if (n !== n) // isNaN
-        n = 0;
-    else if (n !== 0 && n !== (1/0) && n !== -(1/0))
-        n = (n > 0 || -1) * Math.floor(Math.abs(n));
-    return n;
-};
-
-var prepareString = "a"[0] != "a",
-    // ES5 9.9
-    // http://es5.github.com/#x9.9
-    toObject = function (o) {
-        if (o == null) { // this matches both null and undefined
-            throw new TypeError(); // TODO message
-        }
-        // If the implementation doesn't support by-index access of
-        // string characters (ex. IE < 7), split the string
-        if (prepareString && typeof o == "string" && o) {
-            return o.split("");
-        }
-        return Object(o);
-    };
-});/* vim:ts=4:sts=4:sw=4:
- * ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *      Irakli Gozalishvili <rfobic@gmail.com> (http://jeditoolkit.com)
- *      Mike de Boer <mike AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/lib/event_emitter', ['require', 'exports', 'module' ], function(require, exports, module) {
-"use strict";
-
-var EventEmitter = {};
-
-EventEmitter._emit =
-EventEmitter._dispatchEvent = function(eventName, e) {
-    this._eventRegistry = this._eventRegistry || {};
-    this._defaultHandlers = this._defaultHandlers || {};
-
-    var listeners = this._eventRegistry[eventName] || [];
-    var defaultHandler = this._defaultHandlers[eventName];
-    if (!listeners.length && !defaultHandler)
-        return;
-
-    e = e || {};
-    e.type = eventName;
-    
-    if (!e.stopPropagation) {
-        e.stopPropagation = function() {
-            this.propagationStopped = true;
-        };
-    }
-    
-    if (!e.preventDefault) {
-        e.preventDefault = function() {
-            this.defaultPrevented = true;
-        };
-    }
-
-    for (var i=0; i<listeners.length; i++) {
-        listeners[i](e);
-        if (e.propagationStopped)
-            break;
-    }
-    
-    if (defaultHandler && !e.defaultPrevented)
-        defaultHandler(e);
-};
-
-EventEmitter.setDefaultHandler = function(eventName, callback) {
-    this._defaultHandlers = this._defaultHandlers || {};
-    
-    if (this._defaultHandlers[eventName])
-        throw new Error("The default handler for '" + eventName + "' is already set");
-        
-    this._defaultHandlers[eventName] = callback;
-};
-
-EventEmitter.on =
-EventEmitter.addEventListener = function(eventName, callback) {
-    this._eventRegistry = this._eventRegistry || {};
-
-    var listeners = this._eventRegistry[eventName];
-    if (!listeners)
-        var listeners = this._eventRegistry[eventName] = [];
-
-    if (listeners.indexOf(callback) == -1)
-        listeners.push(callback);
-};
-
-EventEmitter.removeListener =
-EventEmitter.removeEventListener = function(eventName, callback) {
-    this._eventRegistry = this._eventRegistry || {};
-
-    var listeners = this._eventRegistry[eventName];
-    if (!listeners)
-        return;
-
-    var index = listeners.indexOf(callback);
-    if (index !== -1)
-        listeners.splice(index, 1);
-};
-
-EventEmitter.removeAllListeners = function(eventName) {
-    if (this._eventRegistry) this._eventRegistry[eventName] = [];
-};
-
-exports.EventEmitter = EventEmitter;
-
-});/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/lib/oop', ['require', 'exports', 'module' ], function(require, exports, module) {
-"use strict";
-
-exports.inherits = (function() {
-    var tempCtor = function() {};
-    return function(ctor, superCtor) {
-        tempCtor.prototype = superCtor.prototype;
-        ctor.super_ = superCtor.prototype;
-        ctor.prototype = new tempCtor();
-        ctor.prototype.constructor = ctor;
-    };
-}());
-
-exports.mixin = function(obj, mixin) {
-    for (var key in mixin) {
-        obj[key] = mixin[key];
-    }
-};
-
-exports.implement = function(proto, mixin) {
-    exports.mixin(proto, mixin);
-};
-
-});
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
- 
-define('ace/mode/css_worker', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/worker/mirror', 'ace/mode/css/csslint'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var Mirror = require("../worker/mirror").Mirror;
-var CSSLint = require("./css/csslint").CSSLint;
-
-var Worker = exports.Worker = function(sender) {
-    Mirror.call(this, sender);
-    this.setTimeout(200);
-};
-
-oop.inherits(Worker, Mirror);
-
-(function() {
-    
-    this.onUpdate = function() {
-        var value = this.doc.getValue();
-        
-        var result = CSSLint.verify(value);
-        this.sender.emit("csslint", result.messages.map(function(msg) {
-            delete msg.rule;
-            return msg;
-        }));
-    };
-    
-}).call(Worker.prototype);
-
-});define('ace/worker/mirror', ['require', 'exports', 'module' , 'ace/document', 'ace/lib/lang'], function(require, exports, module) {
-"use strict";
-
-var Document = require("../document").Document;
-var lang = require("../lib/lang");
-    
-var Mirror = exports.Mirror = function(sender) {
-    this.sender = sender;
-    var doc = this.doc = new Document("");
-    
-    var deferredUpdate = this.deferredUpdate = lang.deferredCall(this.onUpdate.bind(this));
-    
-    var _self = this;
-    sender.on("change", function(e) {
-        doc.applyDeltas([e.data]);        
-        deferredUpdate.schedule(_self.$timeout);
-    });
-};
-
-(function() {
-    
-    this.$timeout = 500;
-    
-    this.setTimeout = function(timeout) {
-        this.$timeout = timeout;
-    };
-    
-    this.setValue = function(value) {
-        this.doc.setValue(value);
-        this.deferredUpdate.schedule(this.$timeout);
-    };
-    
-    this.getValue = function(callbackId) {
-        this.sender.callback(this.doc.getValue(), callbackId);
-    };
-    
-    this.onUpdate = function() {
-        // abstract method
-    };
-    
-}).call(Mirror.prototype);
-
-});/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/document', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/event_emitter', 'ace/range', 'ace/anchor'], function(require, exports, module) {
-"use strict";
-
-var oop = require("./lib/oop");
-var EventEmitter = require("./lib/event_emitter").EventEmitter;
-var Range = require("./range").Range;
-var Anchor = require("./anchor").Anchor;
-
-var Document = function(text) {
-    this.$lines = [];
-
-    if (Array.isArray(text)) {
-        this.insertLines(0, text);
-    }
-    // There has to be one line at least in the document. If you pass an empty
-    // string to the insert function, nothing will happen. Workaround.
-    else if (text.length == 0) {
-        this.$lines = [""];
-    } else {
-        this.insert({row: 0, column:0}, text);
-    }
-};
-
-(function() {
-
-    oop.implement(this, EventEmitter);
-
-    this.setValue = function(text) {
-        var len = this.getLength();
-        this.remove(new Range(0, 0, len, this.getLine(len-1).length));
-        this.insert({row: 0, column:0}, text);
-    };
-
-    this.getValue = function() {
-        return this.getAllLines().join(this.getNewLineCharacter());
-    };
-
-    this.createAnchor = function(row, column) {
-        return new Anchor(this, row, column);
-    };
-
-    // check for IE split bug
-    if ("aaa".split(/a/).length == 0)
-        this.$split = function(text) {
-            return text.replace(/\r\n|\r/g, "\n").split("\n");
-        }
-    else
-        this.$split = function(text) {
-            return text.split(/\r\n|\r|\n/);
-        };
-
-
-    this.$detectNewLine = function(text) {
-        var match = text.match(/^.*?(\r\n|\r|\n)/m);
-        if (match) {
-            this.$autoNewLine = match[1];
-        } else {
-            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(newLineMode) {
-        if (this.$newLineMode === newLineMode)
-            return;
-
-        this.$newLineMode = newLineMode;
-    };
-
-    this.getNewLineMode = function() {
-        return this.$newLineMode;
-    };
-
-    this.isNewLine = function(text) {
-        return (text == "\r\n" || text == "\r" || text == "\n");
-    };
-
-    /**
-     * Get a verbatim copy of the given line as it is in the document
-     */
-    this.getLine = function(row) {
-        return this.$lines[row] || "";
-    };
-
-    this.getLines = function(firstRow, lastRow) {
-        return this.$lines.slice(firstRow, lastRow + 1);
-    };
-
-    /**
-     * Returns all lines in the document as string array. Warning: The caller
-     * should not modify this array!
-     */
-    this.getAllLines = function() {
-        return this.getLines(0, this.getLength());
-    };
-
-    this.getLength = function() {
-        return this.$lines.length;
-    };
-
-    this.getTextRange = function(range) {
-        if (range.start.row == range.end.row) {
-            return this.$lines[range.start.row].substring(range.start.column,
-                                                         range.end.column);
-        }
-        else {
-            var lines = [];
-            lines.push(this.$lines[range.start.row].substring(range.start.column));
-            lines.push.apply(lines, this.getLines(range.start.row+1, range.end.row-1));
-            lines.push(this.$lines[range.end.row].substring(0, range.end.column));
-            return lines.join(this.getNewLineCharacter());
-        }
-    };
-
-    this.$clipPosition = function(position) {
-        var length = this.getLength();
-        if (position.row >= length) {
-            position.row = Math.max(0, length - 1);
-            position.column = this.getLine(length-1).length;
-        }
-        return position;
-    };
-
-    this.insert = function(position, text) {
-        if (!text || text.length === 0)
-            return position;
-
-        position = this.$clipPosition(position);
-
-        // only detect new lines if the document has no line break yet
-        if (this.getLength() <= 1)
-            this.$detectNewLine(text);
-
-        var lines = this.$split(text);
-        var firstLine = lines.splice(0, 1)[0];
-        var lastLine = lines.length == 0 ? null : lines.splice(lines.length - 1, 1)[0];
-
-        position = this.insertInLine(position, firstLine);
-        if (lastLine !== null) {
-            position = this.insertNewLine(position); // terminate first line
-            position = this.insertLines(position.row, lines);
-            position = this.insertInLine(position, lastLine || "");
-        }
-        return position;
-    };
-
-    this.insertLines = function(row, lines) {
-        if (lines.length == 0)
-            return {row: row, column: 0};
-
-        var args = [row, 0];
-        args.push.apply(args, lines);
-        this.$lines.splice.apply(this.$lines, args);
-
-        var range = new Range(row, 0, row + lines.length, 0);
-        var delta = {
-            action: "insertLines",
-            range: range,
-            lines: lines
-        };
-        this._emit("change", { data: delta });
-        return range.end;
-    };
-
-    this.insertNewLine = function(position) {
-        position = this.$clipPosition(position);
-        var line = this.$lines[position.row] || "";
-
-        this.$lines[position.row] = line.substring(0, position.column);
-        this.$lines.splice(position.row + 1, 0, line.substring(position.column, line.length));
-
-        var end = {
-            row : position.row + 1,
-            column : 0
-        };
-
-        var delta = {
-            action: "insertText",
-            range: Range.fromPoints(position, end),
-            text: this.getNewLineCharacter()
-        };
-        this._emit("change", { data: delta });
-
-        return end;
-    };
-
-    this.insertInLine = function(position, text) {
-        if (text.length == 0)
-            return position;
-
-        var line = this.$lines[position.row] || "";
-
-        this.$lines[position.row] = line.substring(0, position.column) + text
-                + line.substring(position.column);
-
-        var end = {
-            row : position.row,
-            column : position.column + text.length
-        };
-
-        var delta = {
-            action: "insertText",
-            range: Range.fromPoints(position, end),
-            text: text
-        };
-        this._emit("change", { data: delta });
-
-        return end;
-    };
-
-    this.remove = function(range) {
-        // clip to document
-        range.start = this.$clipPosition(range.start);
-        range.end = this.$clipPosition(range.end);
-
-        if (range.isEmpty())
-            return range.start;
-
-        var firstRow = range.start.row;
-        var lastRow = range.end.row;
-
-        if (range.isMultiLine()) {
-            var firstFullRow = range.start.column == 0 ? firstRow : firstRow + 1;
-            var lastFullRow = lastRow - 1;
-
-            if (range.end.column > 0)
-                this.removeInLine(lastRow, 0, range.end.column);
-
-            if (lastFullRow >= firstFullRow)
-                this.removeLines(firstFullRow, lastFullRow);
-
-            if (firstFullRow != firstRow) {
-                this.removeInLine(firstRow, range.start.column, this.getLine(firstRow).length);
-                this.removeNewLine(range.start.row);
-            }
-        }
-        else {
-            this.removeInLine(firstRow, range.start.column, range.end.column);
-        }
-        return range.start;
-    };
-
-    this.removeInLine = function(row, startColumn, endColumn) {
-        if (startColumn == endColumn)
-            return;
-
-        var range = new Range(row, startColumn, row, endColumn);
-        var line = this.getLine(row);
-        var removed = line.substring(startColumn, endColumn);
-        var newLine = line.substring(0, startColumn) + line.substring(endColumn, line.length);
-        this.$lines.splice(row, 1, newLine);
-
-        var delta = {
-            action: "removeText",
-            range: range,
-            text: removed
-        };
-        this._emit("change", { data: delta });
-        return range.start;
-    };
-
-    /**
-     * Removes a range of full lines
-     *
-     * @param firstRow {Integer} The first row to be removed
-     * @param lastRow {Integer} The last row to be removed
-     * @return {String[]} The removed lines
-     */
-    this.removeLines = function(firstRow, lastRow) {
-        var range = new Range(firstRow, 0, lastRow + 1, 0);
-        var removed = this.$lines.splice(firstRow, lastRow - firstRow + 1);
-
-        var delta = {
-            action: "removeLines",
-            range: range,
-            nl: this.getNewLineCharacter(),
-            lines: removed
-        };
-        this._emit("change", { data: delta });
-        return removed;
-    };
-
-    this.removeNewLine = function(row) {
-        var firstLine = this.getLine(row);
-        var secondLine = this.getLine(row+1);
-
-        var range = new Range(row, firstLine.length, row+1, 0);
-        var line = firstLine + secondLine;
-
-        this.$lines.splice(row, 2, line);
-
-        var delta = {
-            action: "removeText",
-            range: range,
-            text: this.getNewLineCharacter()
-        };
-        this._emit("change", { data: delta });
-    };
-
-    this.replace = function(range, text) {
-        if (text.length == 0 && range.isEmpty())
-            return range.start;
-
-        // Shortcut: If the text we want to insert is the same as it is already
-        // in the document, we don't have to replace anything.
-        if (text == this.getTextRange(range))
-            return range.end;
-
-        this.remove(range);
-        if (text) {
-            var end = this.insert(range.start, text);
-        }
-        else {
-            end = range.start;
-        }
-
-        return end;
-    };
-
-    this.applyDeltas = function(deltas) {
-        for (var i=0; i<deltas.length; i++) {
-            var delta = deltas[i];
-            var range = Range.fromPoints(delta.range.start, delta.range.end);
-
-            if (delta.action == "insertLines")
-                this.insertLines(range.start.row, delta.lines);
-            else if (delta.action == "insertText")
-                this.insert(range.start, delta.text);
-            else if (delta.action == "removeLines")
-                this.removeLines(range.start.row, range.end.row - 1);
-            else if (delta.action == "removeText")
-                this.remove(range);
-        }
-    };
-
-    this.revertDeltas = function(deltas) {
-        for (var i=deltas.length-1; i>=0; i--) {
-            var delta = deltas[i];
-
-            var range = Range.fromPoints(delta.range.start, delta.range.end);
-
-            if (delta.action == "insertLines")
-                this.removeLines(range.start.row, range.end.row - 1);
-            else if (delta.action == "insertText")
-                this.remove(range);
-            else if (delta.action == "removeLines")
-                this.insertLines(range.start.row, delta.lines);
-            else if (delta.action == "removeText")
-                this.insert(range.start, delta.text);
-        }
-    };
-
-}).call(Document.prototype);
-
-exports.Document = Document;
-});
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/range', ['require', 'exports', 'module' ], function(require, exports, module) {
-"use strict";
-
-var Range = function(startRow, startColumn, endRow, endColumn) {
-    this.start = {
-        row: startRow,
-        column: startColumn
-    };
-
-    this.end = {
-        row: endRow,
-        column: endColumn
-    };
-};
-
-(function() {
-    this.isEqual = function(range) {
-        return this.start.row == range.start.row &&
-            this.end.row == range.end.row &&
-            this.start.column == range.start.column &&
-            this.end.column == range.end.column
-    };
-
-    this.toString = function() {
-        return ("Range: [" + this.start.row + "/" + this.start.column +
-            "] -> [" + this.end.row + "/" + this.end.column + "]");
-    };
-
-    this.contains = function(row, column) {
-        return this.compare(row, column) == 0;
-    };
-
-    /**
-     * Compares this range (A) with another range (B), where B is the passed in
-     * range.
-     *
-     * Return values:
-     *  -2: (B) is infront of (A) and doesn't intersect with (A)
-     *  -1: (B) begins before (A) but ends inside of (A)
-     *   0: (B) is completly inside of (A) OR (A) is complety inside of (B)
-     *  +1: (B) begins inside of (A) but ends outside of (A)
-     *  +2: (B) is after (A) and doesn't intersect with (A)
-     *
-     *  42: FTW state: (B) ends in (A) but starts outside of (A)
-     */
-    this.compareRange = function(range) {
-        var cmp,
-            end = range.end,
-            start = range.start;
-
-        cmp = this.compare(end.row, end.column);
-        if (cmp == 1) {
-            cmp = this.compare(start.row, start.column);
-            if (cmp == 1) {
-                return 2;
-            } else if (cmp == 0) {
-                return 1;
-            } else {
-                return 0;
-            }
-        } else if (cmp == -1) {
-            return -2;
-        } else {
-            cmp = this.compare(start.row, start.column);
-            if (cmp == -1) {
-                return -1;
-            } else if (cmp == 1) {
-                return 42;
-            } else {
-                return 0;
-            }
-        }
-    }
-
-    this.comparePoint = function(p) {
-        return this.compare(p.row, p.column);
-    }
-
-    this.containsRange = function(range) {
-        return this.comparePoint(range.start) == 0 && this.comparePoint(range.end) == 0;
-    }
-
-    this.intersectsRange = function(range) {
-        var cmp = this.compareRange(range);
-        return (cmp == -1 || cmp == 0 || cmp == 1);
-    }
-
-    this.isEnd = function(row, column) {
-        return this.end.row == row && this.end.column == column;
-    }
-
-    this.isStart = function(row, column) {
-        return this.start.row == row && this.start.column == column;
-    }
-
-    this.setStart = function(row, column) {
-        if (typeof row == "object") {
-            this.start.column = row.column;
-            this.start.row = row.row;
-        } else {
-            this.start.row = row;
-            this.start.column = column;
-        }
-    }
-
-    this.setEnd = function(row, column) {
-        if (typeof row == "object") {
-            this.end.column = row.column;
-            this.end.row = row.row;
-        } else {
-            this.end.row = row;
-            this.end.column = column;
-        }
-    }
-
-    this.inside = function(row, column) {
-        if (this.compare(row, column) == 0) {
-            if (this.isEnd(row, column) || this.isStart(row, column)) {
-                return false;
-            } else {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    this.insideStart = function(row, column) {
-        if (this.compare(row, column) == 0) {
-            if (this.isEnd(row, column)) {
-                return false;
-            } else {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    this.insideEnd = function(row, column) {
-        if (this.compare(row, column) == 0) {
-            if (this.isStart(row, column)) {
-                return false;
-            } else {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    this.compare = function(row, column) {
-        if (!this.isMultiLine()) {
-            if (row === this.start.row) {
-                return column < this.start.column ? -1 : (column > this.end.column ? 1 : 0);
-            };
-        }
-
-        if (row < this.start.row)
-            return -1;
-
-        if (row > this.end.row)
-            return 1;
-
-        if (this.start.row === row)
-            return column >= this.start.column ? 0 : -1;
-
-        if (this.end.row === row)
-            return column <= this.end.column ? 0 : 1;
-
-        return 0;
-    };
-
-    /**
-     * Like .compare(), but if isStart is true, return -1;
-     */
-    this.compareStart = function(row, column) {
-        if (this.start.row == row && this.start.column == column) {
-            return -1;
-        } else {
-            return this.compare(row, column);
-        }
-    }
-
-    /**
-     * Like .compare(), but if isEnd is true, return 1;
-     */
-    this.compareEnd = function(row, column) {
-        if (this.end.row == row && this.end.column == column) {
-            return 1;
-        } else {
-            return this.compare(row, column);
-        }
-    }
-
-    this.compareInside = function(row, column) {
-        if (this.end.row == row && this.end.column == column) {
-            return 1;
-        } else if (this.start.row == row && this.start.column == column) {
-            return -1;
-        } else {
-            return this.compare(row, column);
-        }
-    }
-
-    this.clipRows = function(firstRow, lastRow) {
-        if (this.end.row > lastRow) {
-            var end = {
-                row: lastRow+1,
-                column: 0
-            };
-        }
-
-        if (this.start.row > lastRow) {
-            var start = {
-                row: lastRow+1,
-                column: 0
-            };
-        }
-
-        if (this.start.row < firstRow) {
-            var start = {
-                row: firstRow,
-                column: 0
-            };
-        }
-
-        if (this.end.row < firstRow) {
-            var end = {
-                row: firstRow,
-                column: 0
-            };
-        }
-        return Range.fromPoints(start || this.start, end || this.end);
-    };
-
-    this.extend = function(row, column) {
-        var cmp = this.compare(row, column);
-
-        if (cmp == 0)
-            return this;
-        else if (cmp == -1)
-            var start = {row: row, column: column};
-        else
-            var end = {row: row, column: column};
-
-        return Range.fromPoints(start || this.start, end || 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 false;
-        }
-        
-        var temp = this.start;
-        this.end = this.start;
-        this.start = temp;
-        return true;
-    };
-
-
-    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 Range.fromPoints(this.start, this.end);
-    };
-
-    this.collapseRows = function() {
-        if (this.end.column == 0)
-            return new Range(this.start.row, 0, Math.max(this.start.row, this.end.row-1), 0)
-        else
-            return new Range(this.start.row, 0, this.end.row, 0)
-    };
-
-    this.toScreenRange = function(session) {
-        var screenPosStart =
-            session.documentToScreenPosition(this.start);
-        var screenPosEnd =
-            session.documentToScreenPosition(this.end);
-
-        return new Range(
-            screenPosStart.row, screenPosStart.column,
-            screenPosEnd.row, screenPosEnd.column
-        );
-    };
-
-}).call(Range.prototype);
-
-
-Range.fromPoints = function(start, end) {
-    return new Range(start.row, start.column, end.row, end.column);
-};
-
-exports.Range = Range;
-});
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/anchor', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/event_emitter'], function(require, exports, module) {
-"use strict";
-
-var oop = require("./lib/oop");
-var EventEmitter = require("./lib/event_emitter").EventEmitter;
-
-/**
- * An Anchor is a floating pointer in the document. Whenever text is inserted or
- * deleted before the cursor, the position of the cursor is updated
- */
-var Anchor = exports.Anchor = function(doc, row, column) {
-    this.document = doc;
-    
-    if (typeof column == "undefined")
-        this.setPosition(row.row, row.column);
-    else
-        this.setPosition(row, column);
-
-    this.$onChange = this.onChange.bind(this);
-    doc.on("change", this.$onChange);
-};
-
-(function() {
-
-    oop.implement(this, EventEmitter);
-    
-    this.getPosition = function() {
-        return this.$clipPositionToDocument(this.row, this.column);
-    };
-    
-    this.getDocument = function() {
-        return this.document;
-    };
-    
-    this.onChange = function(e) {
-        var delta = e.data;
-        var range = delta.range;
-            
-        if (range.start.row == range.end.row && range.start.row != this.row)
-            return;
-            
-        if (range.start.row > this.row)
-            return;
-            
-        if (range.start.row == this.row && range.start.column > this.column)
-            return;
-    
-        var row = this.row;
-        var column = this.column;
-        
-        if (delta.action === "insertText") {
-            if (range.start.row === row && range.start.column <= column) {
-                if (range.start.row === range.end.row) {
-                    column += range.end.column - range.start.column;
-                }
-                else {
-                    column -= range.start.column;
-                    row += range.end.row - range.start.row;
-                }
-            }
-            else if (range.start.row !== range.end.row && range.start.row < row) {
-                row += range.end.row - range.start.row;
-            }
-        } else if (delta.action === "insertLines") {
-            if (range.start.row <= row) {
-                row += range.end.row - range.start.row;
-            }
-        }
-        else if (delta.action == "removeText") {
-            if (range.start.row == row && range.start.column < column) {
-                if (range.end.column >= column)
-                    column = range.start.column;
-                else
-                    column = Math.max(0, column - (range.end.column - range.start.column));
-                
-            } else if (range.start.row !== range.end.row && range.start.row < row) {
-                if (range.end.row == row) {
-                    column = Math.max(0, column - range.end.column) + range.start.column;
-                }
-                row -= (range.end.row - range.start.row);
-            }
-            else if (range.end.row == row) {
-                row -= range.end.row - range.start.row;
-                column = Math.max(0, column - range.end.column) + range.start.column;
-            }
-        } else if (delta.action == "removeLines") {
-            if (range.start.row <= row) {
-                if (range.end.row <= row)
-                    row -= range.end.row - range.start.row;
-                else {
-                    row = range.start.row;
-                    column = 0;
-                }
-            }
-        }
-
-        this.setPosition(row, column, true);
-    };
-
-    this.setPosition = function(row, column, noClip) {
-        var pos;
-        if (noClip) {
-            pos = {
-                row: row,
-                column: column
-            };
-        }
-        else {
-            pos = this.$clipPositionToDocument(row, column);
-        }
-        
-        if (this.row == pos.row && this.column == pos.column)
-            return;
-            
-        var old = {
-            row: this.row,
-            column: this.column
-        };
-        
-        this.row = pos.row;
-        this.column = pos.column;
-        this._emit("change", {
-            old: old,
-            value: pos
-        });
-    };
-    
-    this.detach = function() {
-        this.document.removeEventListener("change", this.$onChange);
-    };
-    
-    this.$clipPositionToDocument = function(row, column) {
-        var pos = {};
-    
-        if (row >= this.document.getLength()) {
-            pos.row = Math.max(0, this.document.getLength() - 1);
-            pos.column = this.document.getLine(pos.row).length;
-        }
-        else if (row < 0) {
-            pos.row = 0;
-            pos.column = 0;
-        }
-        else {
-            pos.row = row;
-            pos.column = Math.min(this.document.getLine(pos.row).length, Math.max(0, column));
-        }
-        
-        if (column < 0)
-            pos.column = 0;
-            
-        return pos;
-    };
-    
-}).call(Anchor.prototype);
-
-});
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/lib/lang', ['require', 'exports', 'module' ], function(require, exports, module) {
-"use strict";
-
-exports.stringReverse = function(string) {
-    return string.split("").reverse().join("");
-};
-
-exports.stringRepeat = function (string, count) {
-     return new Array(count + 1).join(string);
-};
-
-var trimBeginRegexp = /^\s\s*/;
-var trimEndRegexp = /\s\s*$/;
-
-exports.stringTrimLeft = function (string) {
-    return string.replace(trimBeginRegexp, '');
-};
-
-exports.stringTrimRight = function (string) {
-    return string.replace(trimEndRegexp, '');
-};
-
-exports.copyObject = function(obj) {
-    var copy = {};
-    for (var key in obj) {
-        copy[key] = obj[key];
-    }
-    return copy;
-};
-
-exports.copyArray = function(array){
-    var copy = [];
-    for (var i=0, l=array.length; i<l; i++) {
-        if (array[i] && typeof array[i] == "object")
-            copy[i] = this.copyObject( array[i] );
-        else 
-            copy[i] = array[i];
-    }
-    return copy;
-};
-
-exports.deepCopy = function (obj) {
-    if (typeof obj != "object") {
-        return obj;
-    }
-    
-    var copy = obj.constructor();
-    for (var key in obj) {
-        if (typeof obj[key] == "object") {
-            copy[key] = this.deepCopy(obj[key]);
-        } else {
-            copy[key] = obj[key];
-        }
-    }
-    return copy;
-};
-
-exports.arrayToMap = function(arr) {
-    var map = {};
-    for (var i=0; i<arr.length; i++) {
-        map[arr[i]] = 1;
-    }
-    return map;
-
-};
-
-/**
- * splice out of 'array' anything that === 'value'
- */
-exports.arrayRemove = function(array, value) {
-  for (var i = 0; i <= array.length; i++) {
-    if (value === array[i]) {
-      array.splice(i, 1);
-    }
-  }
-};
-
-exports.escapeRegExp = function(str) {
-    return str.replace(/([.*+?^${}()|[\]\/\\])/g, '\\$1');
-};
-
-exports.deferredCall = function(fcn) {
-
-    var timer = null;
-    var callback = function() {
-        timer = null;
-        fcn();
-    };
-
-    var deferred = function(timeout) {
-        deferred.cancel();
-        timer = setTimeout(callback, timeout || 0);
-        return deferred;
-    };
-
-    deferred.schedule = deferred;
-
-    deferred.call = function() {
-        this.cancel();
-        fcn();
-        return deferred;
-    };
-
-    deferred.cancel = function() {
-        clearTimeout(timer);
-        timer = null;
-        return deferred;
-    };
-
-    return deferred;
-};
-
-});
-define('ace/mode/css/csslint', ['require', 'exports', 'module' ], function(require, exports, module) {
-/*!
-CSSLint
-Copyright (c) 2011 Nicole Sullivan and Nicholas C. Zakas. 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.
-
-*/
-/* Build time: 2-March-2012 02:47:11 */
-
-/*!
-Parser-Lib
-Copyright (c) 2009-2011 Nicholas C. Zakas. 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.
-
-*/
-/* Version v0.1.6, Build time: 2-March-2012 02:44:32 */
-var parserlib = {};
-(function(){
-
-
-/**
- * A generic base to inherit from for any object
- * that needs event handling.
- * @class EventTarget
- * @constructor
- */
-function EventTarget(){
-
-    /**
-     * The array of listeners for various events.
-     * @type Object
-     * @property _listeners
-     * @private
-     */
-    this._listeners = {};    
-}
-
-EventTarget.prototype = {
-
-    //restore constructor
-    constructor: EventTarget,
-
-    /**
-     * Adds a listener for a given event type.
-     * @param {String} type The type of event to add a listener for.
-     * @param {Function} listener The function to call when the event occurs.
-     * @return {void}
-     * @method addListener
-     */
-    addListener: function(type, listener){
-        if (!this._listeners[type]){
-            this._listeners[type] = [];
-        }
-
-        this._listeners[type].push(listener);
-    },
-    
-    /**
-     * Fires an event based on the passed-in object.
-     * @param {Object|String} event An object with at least a 'type' attribute
-     *      or a string indicating the event name.
-     * @return {void}
-     * @method fire
-     */    
-    fire: function(event){
-        if (typeof event == "string"){
-            event = { type: event };
-        }
-        if (typeof event.target != "undefined"){
-            event.target = this;
-        }
-        
-        if (typeof event.type == "undefined"){
-            throw new Error("Event object missing 'type' property.");
-        }
-        
-        if (this._listeners[event.type]){
-        
-            //create a copy of the array and use that so listeners can't chane
-            var listeners = this._listeners[event.type].concat();
-            for (var i=0, len=listeners.length; i < len; i++){
-                listeners[i].call(this, event);
-            }
-        }            
-    },
-
-    /**
-     * Removes a listener for a given event type.
-     * @param {String} type The type of event to remove a listener from.
-     * @param {Function} listener The function to remove from the event.
-     * @return {void}
-     * @method removeListener
-     */
-    removeListener: function(type, listener){
-        if (this._listeners[type]){
-            var listeners = this._listeners[type];
-            for (var i=0, len=listeners.length; i < len; i++){
-                if (listeners[i] === listener){
-                    listeners.splice(i, 1);
-                    break;
-                }
-            }
-            
-            
-        }            
-    }
-};
-/**
- * Convenient way to read through strings.
- * @namespace parserlib.util
- * @class StringReader
- * @constructor
- * @param {String} text The text to read.
- */
-function StringReader(text){
-
-    /**
-     * The input text with line endings normalized.
-     * @property _input
-     * @type String
-     * @private
-     */
-    this._input = text.replace(/\n\r?/g, "\n");
-
-
-    /**
-     * The row for the character to be read next.
-     * @property _line
-     * @type int
-     * @private
-     */
-    this._line = 1;
-
-
-    /**
-     * The column for the character to be read next.
-     * @property _col
-     * @type int
-     * @private
-     */
-    this._col = 1;
-
-    /**
-     * The index of the character in the input to be read next.
-     * @property _cursor
-     * @type int
-     * @private
-     */
-    this._cursor = 0;
-}
-
-StringReader.prototype = {
-
-    //restore constructor
-    constructor: StringReader,
-
-    //-------------------------------------------------------------------------
-    // Position info
-    //-------------------------------------------------------------------------
-
-    /**
-     * Returns the column of the character to be read next.
-     * @return {int} The column of the character to be read next.
-     * @method getCol
-     */
-    getCol: function(){
-        return this._col;
-    },
-
-    /**
-     * Returns the row of the character to be read next.
-     * @return {int} The row of the character to be read next.
-     * @method getLine
-     */
-    getLine: function(){
-        return this._line ;
-    },
-
-    /**
-     * Determines if you're at the end of the input.
-     * @return {Boolean} True if there's no more input, false otherwise.
-     * @method eof
-     */
-    eof: function(){
-        return (this._cursor == this._input.length);
-    },
-
-    //-------------------------------------------------------------------------
-    // Basic reading
-    //-------------------------------------------------------------------------
-
-    /**
-     * Reads the next character without advancing the cursor.
-     * @param {int} count How many characters to look ahead (default is 1).
-     * @return {String} The next character or null if there is no next character.
-     * @method peek
-     */
-    peek: function(count){
-        var c = null;
-        count = (typeof count == "undefined" ? 1 : count);
-
-        //if we're not at the end of the input...
-        if (this._cursor < this._input.length){
-
-            //get character and increment cursor and column
-            c = this._input.charAt(this._cursor + count - 1);
-        }
-
-        return c;
-    },
-
-    /**
-     * Reads the next character from the input and adjusts the row and column
-     * accordingly.
-     * @return {String} The next character or null if there is no next character.
-     * @method read
-     */
-    read: function(){
-        var c = null;
-
-        //if we're not at the end of the input...
-        if (this._cursor < this._input.length){
-
-            //if the last character was a newline, increment row count
-            //and reset column count
-            if (this._input.charAt(this._cursor) == "\n"){
-                this._line++;
-                this._col=1;
-            } else {
-                this._col++;
-            }
-
-            //get character and increment cursor and column
-            c = this._input.charAt(this._cursor++);
-        }
-
-        return c;
-    },
-
-    //-------------------------------------------------------------------------
-    // Misc
-    //-------------------------------------------------------------------------
-
-    /**
-     * Saves the current location so it can be returned to later.
-     * @method mark
-     * @return {void}
-     */
-    mark: function(){
-        this._bookmark = {
-            cursor: this._cursor,
-            line:   this._line,
-            col:    this._col
-        };
-    },
-
-    reset: function(){
-        if (this._bookmark){
-            this._cursor = this._bookmark.cursor;
-            this._line = this._bookmark.line;
-            this._col = this._bookmark.col;
-            delete this._bookmark;
-        }
-    },
-
-    //-------------------------------------------------------------------------
-    // Advanced reading
-    //-------------------------------------------------------------------------
-
-    /**
-     * Reads up to and including the given string. Throws an error if that
-     * string is not found.
-     * @param {String} pattern The string to read.
-     * @return {String} The string when it is found.
-     * @throws Error when the string pattern is not found.
-     * @method readTo
-     */
-    readTo: function(pattern){
-
-        var buffer = "",
-            c;
-
-        /*
-         * First, buffer must be the same length as the pattern.
-         * Then, buffer must end with the pattern or else reach the
-         * end of the input.
-         */
-        while (buffer.length < pattern.length || buffer.lastIndexOf(pattern) != buffer.length - pattern.length){
-            c = this.read();
-            if (c){
-                buffer += c;
-            } else {
-                throw new Error("Expected \"" + pattern + "\" at line " + this._line  + ", col " + this._col + ".");
-            }
-        }
-
-        return buffer;
-
-    },
-
-    /**
-     * Reads characters while each character causes the given
-     * filter function to return true. The function is passed
-     * in each character and either returns true to continue
-     * reading or false to stop.
-     * @param {Function} filter The function to read on each character.
-     * @return {String} The string made up of all characters that passed the
-     *      filter check.
-     * @method readWhile
-     */
-    readWhile: function(filter){
-
-        var buffer = "",
-            c = this.read();
-
-        while(c !== null && filter(c)){
-            buffer += c;
-            c = this.read();
-        }
-
-        return buffer;
-
-    },
-
-    /**
-     * Reads characters that match either text or a regular expression and
-     * returns those characters. If a match is found, the row and column
-     * are adjusted; if no match is found, the reader's state is unchanged.
-     * reading or false to stop.
-     * @param {String|RegExp} matchter If a string, then the literal string
-     *      value is searched for. If a regular expression, then any string
-     *      matching the pattern is search for.
-     * @return {String} The string made up of all characters that matched or
-     *      null if there was no match.
-     * @method readMatch
-     */
-    readMatch: function(matcher){
-
-        var source = this._input.substring(this._cursor),
-            value = null;
-
-        //if it's a string, just do a straight match
-        if (typeof matcher == "string"){
-            if (source.indexOf(matcher) === 0){
-                value = this.readCount(matcher.length);
-            }
-        } else if (matcher instanceof RegExp){
-            if (matcher.test(source)){
-                value = this.readCount(RegExp.lastMatch.length);
-            }
-        }
-
-        return value;
-    },
-
-
-    /**
-     * Reads a given number of characters. If the end of the input is reached,
-     * it reads only the remaining characters and does not throw an error.
-     * @param {int} count The number of characters to read.
-     * @return {String} The string made up the read characters.
-     * @method readCount
-     */
-    readCount: function(count){
-        var buffer = "";
-
-        while(count--){
-            buffer += this.read();
-        }
-
-        return buffer;
-    }
-
-};
-/**
- * Type to use when a syntax error occurs.
- * @class SyntaxError
- * @namespace parserlib.util
- * @constructor
- * @param {String} message The error message.
- * @param {int} line The line at which the error occurred.
- * @param {int} col The column at which the error occurred.
- */
-function SyntaxError(message, line, col){
-
-    /**
-     * The column at which the error occurred.
-     * @type int
-     * @property col
-     */
-    this.col = col;
-
-    /**
-     * The line at which the error occurred.
-     * @type int
-     * @property line
-     */
-    this.line = line;
-
-    /**
-     * The text representation of the unit.
-     * @type String
-     * @property text
-     */
-    this.message = message;
-
-}
-
-//inherit from Error
-SyntaxError.prototype = new Error();
-/**
- * Base type to represent a single syntactic unit.
- * @class SyntaxUnit
- * @namespace parserlib.util
- * @constructor
- * @param {String} text The text of the unit.
- * @param {int} line The line of text on which the unit resides.
- * @param {int} col The column of text on which the unit resides.
- */
-function SyntaxUnit(text, line, col, type){
-
-
-    /**
-     * The column of text on which the unit resides.
-     * @type int
-     * @property col
-     */
-    this.col = col;
-
-    /**
-     * The line of text on which the unit resides.
-     * @type int
-     * @property line
-     */
-    this.line = line;
-
-    /**
-     * The text representation of the unit.
-     * @type String
-     * @property text
-     */
-    this.text = text;
-
-    /**
-     * The type of syntax unit.
-     * @type int
-     * @property type
-     */
-    this.type = type;
-}
-
-/**
- * Create a new syntax unit based solely on the given token.
- * Convenience method for creating a new syntax unit when
- * it represents a single token instead of multiple.
- * @param {Object} token The token object to represent.
- * @return {parserlib.util.SyntaxUnit} The object representing the token.
- * @static
- * @method fromToken
- */
-SyntaxUnit.fromToken = function(token){
-    return new SyntaxUnit(token.value, token.startLine, token.startCol);
-};
-
-SyntaxUnit.prototype = {
-
-    //restore constructor
-    constructor: SyntaxUnit,
-    
-    /**
-     * Returns the text representation of the unit.
-     * @return {String} The text representation of the unit.
-     * @method valueOf
-     */
-    valueOf: function(){
-        return this.toString();
-    },
-    
-    /**
-     * Returns the text representation of the unit.
-     * @return {String} The text representation of the unit.
-     * @method toString
-     */
-    toString: function(){
-        return this.text;
-    }
-
-};
-/*global StringReader, SyntaxError*/
-
-/**
- * Generic TokenStream providing base functionality.
- * @class TokenStreamBase
- * @namespace parserlib.util
- * @constructor
- * @param {String|StringReader} input The text to tokenize or a reader from 
- *      which to read the input.
- */
-function TokenStreamBase(input, tokenData){
-
-    /**
-     * The string reader for easy access to the text.
-     * @type StringReader
-     * @property _reader
-     * @private
-     */
-    this._reader = input ? new StringReader(input.toString()) : null;
-    
-    /**
-     * Token object for the last consumed token.
-     * @type Token
-     * @property _token
-     * @private
-     */
-    this._token = null;    
-    
-    /**
-     * The array of token information.
-     * @type Array
-     * @property _tokenData
-     * @private
-     */
-    this._tokenData = tokenData;
-    
-    /**
-     * Lookahead token buffer.
-     * @type Array
-     * @property _lt
-     * @private
-     */
-    this._lt = [];
-    
-    /**
-     * Lookahead token buffer index.
-     * @type int
-     * @property _ltIndex
-     * @private
-     */
-    this._ltIndex = 0;
-    
-    this._ltIndexCache = [];
-}
-
-/**
- * Accepts an array of token information and outputs
- * an array of token data containing key-value mappings
- * and matching functions that the TokenStream needs.
- * @param {Array} tokens An array of token descriptors.
- * @return {Array} An array of processed token data.
- * @method createTokenData
- * @static
- */
-TokenStreamBase.createTokenData = function(tokens){
-
-    var nameMap     = [],
-        typeMap     = {},
-        tokenData     = tokens.concat([]),
-        i            = 0,
-        len            = tokenData.length+1;
-    
-    tokenData.UNKNOWN = -1;
-    tokenData.unshift({name:"EOF"});
-
-    for (; i < len; i++){
-        nameMap.push(tokenData[i].name);
-        tokenData[tokenData[i].name] = i;
-        if (tokenData[i].text){
-            typeMap[tokenData[i].text] = i;
-        }
-    }
-    
-    tokenData.name = function(tt){
-        return nameMap[tt];
-    };
-    
-    tokenData.type = function(c){
-        return typeMap[c];
-    };
-    
-    return tokenData;
-};
-
-TokenStreamBase.prototype = {
-
-    //restore constructor
-    constructor: TokenStreamBase,    
-    
-    //-------------------------------------------------------------------------
-    // Matching methods
-    //-------------------------------------------------------------------------
-    
-    /**
-     * Determines if the next token matches the given token type.
-     * If so, that token is consumed; if not, the token is placed
-     * back onto the token stream. You can pass in any number of
-     * token types and this will return true if any of the token
-     * types is found.
-     * @param {int|int[]} tokenTypes Either a single token type or an array of
-     *      token types that the next token might be. If an array is passed,
-     *      it's assumed that the token can be any of these.
-     * @param {variant} channel (Optional) The channel to read from. If not
-     *      provided, reads from the default (unnamed) channel.
-     * @return {Boolean} True if the token type matches, false if not.
-     * @method match
-     */
-    match: function(tokenTypes, channel){
-    
-        //always convert to an array, makes things easier
-        if (!(tokenTypes instanceof Array)){
-            tokenTypes = [tokenTypes];
-        }
-                
-        var tt  = this.get(channel),
-            i   = 0,
-            len = tokenTypes.length;
-            
-        while(i < len){
-            if (tt == tokenTypes[i++]){
-                return true;
-            }
-        }
-        
-        //no match found, put the token back
-        this.unget();
-        return false;
-    },    
-    
-    /**
-     * Determines if the next token matches the given token type.
-     * If so, that token is consumed; if not, an error is thrown.
-     * @param {int|int[]} tokenTypes Either a single token type or an array of
-     *      token types that the next token should be. If an array is passed,
-     *      it's assumed that the token must be one of these.
-     * @param {variant} channel (Optional) The channel to read from. If not
-     *      provided, reads from the default (unnamed) channel.
-     * @return {void}
-     * @method mustMatch
-     */    
-    mustMatch: function(tokenTypes, channel){
-
-        var token;
-
-        //always convert to an array, makes things easier
-        if (!(tokenTypes instanceof Array)){
-            tokenTypes = [tokenTypes];
-        }
-
-        if (!this.match.apply(this, arguments)){    
-            token = this.LT(1);
-            throw new SyntaxError("Expected " + this._tokenData[tokenTypes[0]].name + 
-                " at line " + token.startLine + ", col " + token.startCol + ".", token.startLine, token.startCol);
-        }
-    },
-    
-    //-------------------------------------------------------------------------
-    // Consuming methods
-    //-------------------------------------------------------------------------
-    
-    /**
-     * Keeps reading from the token stream until either one of the specified
-     * token types is found or until the end of the input is reached.
-     * @param {int|int[]} tokenTypes Either a single token type or an array of
-     *      token types that the next token should be. If an array is passed,
-     *      it's assumed that the token must be one of these.
-     * @param {variant} channel (Optional) The channel to read from. If not
-     *      provided, reads from the default (unnamed) channel.
-     * @return {void}
-     * @method advance
-     */
-    advance: function(tokenTypes, channel){
-        
-        while(this.LA(0) !== 0 && !this.match(tokenTypes, channel)){
-            this.get();
-        }
-
-        return this.LA(0);    
-    },
-    
-    /**
-     * Consumes the next token from the token stream. 
-     * @return {int} The token type of the token that was just consumed.
-     * @method get
-     */      
-    get: function(channel){
-    
-        var tokenInfo   = this._tokenData,
-            reader      = this._reader,
-            value,
-            i           =0,
-            len         = tokenInfo.length,
-            found       = false,
-            token,
-            info;
-            
-        //check the lookahead buffer first
-        if (this._lt.length && this._ltIndex >= 0 && this._ltIndex < this._lt.length){  
-                           
-            i++;
-            this._token = this._lt[this._ltIndex++];
-            info = tokenInfo[this._token.type];
-            
-            //obey channels logic
-            while((info.channel !== undefined && channel !== info.channel) &&
-                    this._ltIndex < this._lt.length){
-                this._token = this._lt[this._ltIndex++];
-                info = tokenInfo[this._token.type];
-                i++;
-            }
-            
-            //here be dragons
-            if ((info.channel === undefined || channel === info.channel) &&
-                    this._ltIndex <= this._lt.length){
-                this._ltIndexCache.push(i);
-                return this._token.type;
-            }
-        }
-        
-        //call token retriever method
-        token = this._getToken();
-
-        //if it should be hidden, don't save a token
-        if (token.type > -1 && !tokenInfo[token.type].hide){
-                     
-            //apply token channel
-            token.channel = tokenInfo[token.type].channel;
-         
-            //save for later
-            this._token = token;
-            this._lt.push(token);
-
-            //save space that will be moved (must be done before array is truncated)
-            this._ltIndexCache.push(this._lt.length - this._ltIndex + i);  
-        
-            //keep the buffer under 5 items
-            if (this._lt.length > 5){
-                this._lt.shift();                
-            }
-            
-            //also keep the shift buffer under 5 items
-            if (this._ltIndexCache.length > 5){
-                this._ltIndexCache.shift();
-            }
-                
-            //update lookahead index
-            this._ltIndex = this._lt.length;
-        }
-            
-        /*
-         * Skip to the next token if:
-         * 1. The token type is marked as hidden.
-         * 2. The token type has a channel specified and it isn't the current channel.
-         */
-        info = tokenInfo[token.type];
-        if (info && 
-                (info.hide || 
-                (info.channel !== undefined && channel !== info.channel))){
-            return this.get(channel);
-        } else {
-            //return just the type
-            return token.type;
-        }
-    },
-    
-    /**
-     * Looks ahead a certain number of tokens and returns the token type at
-     * that position. This will throw an error if you lookahead past the
-     * end of input, past the size of the lookahead buffer, or back past
-     * the first token in the lookahead buffer.
-     * @param {int} The index of the token type to retrieve. 0 for the
-     *      current token, 1 for the next, -1 for the previous, etc.
-     * @return {int} The token type of the token in the given position.
-     * @method LA
-     */
-    LA: function(index){
-        var total = index,
-            tt;
-        if (index > 0){
-            //TODO: Store 5 somewhere
-            if (index > 5){
-                throw new Error("Too much lookahead.");
-            }
-        
-            //get all those tokens
-            while(total){
-                tt = this.get();   
-                total--;                            
-            }
-            
-            //unget all those tokens
-            while(total < index){
-                this.unget();
-                total++;
-            }
-        } else if (index < 0){
-        
-            if(this._lt[this._ltIndex+index]){
-                tt = this._lt[this._ltIndex+index].type;
-            } else {
-                throw new Error("Too much lookbehind.");
-            }
-        
-        } else {
-            tt = this._token.type;
-        }
-        
-        return tt;
-    
-    },
-    
-    /**
-     * Looks ahead a certain number of tokens and returns the token at
-     * that position. This will throw an error if you lookahead past the
-     * end of input, past the size of the lookahead buffer, or back past
-     * the first token in the lookahead buffer.
-     * @param {int} The index of the token type to retrieve. 0 for the
-     *      current token, 1 for the next, -1 for the previous, etc.
-     * @return {Object} The token of the token in the given position.
-     * @method LA
-     */    
-    LT: function(index){
-    
-        //lookahead first to prime the token buffer
-        this.LA(index);
-        
-        //now find the token, subtract one because _ltIndex is already at the next index
-        return this._lt[this._ltIndex+index-1];    
-    },
-    
-    /**
-     * Returns the token type for the next token in the stream without 
-     * consuming it.
-     * @return {int} The token type of the next token in the stream.
-     * @method peek
-     */
-    peek: function(){
-        return this.LA(1);
-    },
-    
-    /**
-     * Returns the actual token object for the last consumed token.
-     * @return {Token} The token object for the last consumed token.
-     * @method token
-     */
-    token: function(){
-        return this._token;
-    },
-    
-    /**
-     * Returns the name of the token for the given token type.
-     * @param {int} tokenType The type of token to get the name of.
-     * @return {String} The name of the token or "UNKNOWN_TOKEN" for any
-     *      invalid token type.
-     * @method tokenName
-     */
-    tokenName: function(tokenType){
-        if (tokenType < 0 || tokenType > this._tokenData.length){
-            return "UNKNOWN_TOKEN";
-        } else {
-            return this._tokenData[tokenType].name;
-        }
-    },
-    
-    /**
-     * Returns the token type value for the given token name.
-     * @param {String} tokenName The name of the token whose value should be returned.
-     * @return {int} The token type value for the given token name or -1
-     *      for an unknown token.
-     * @method tokenName
-     */    
-    tokenType: function(tokenName){
-        return this._tokenData[tokenName] || -1;
-    },
-    
-    /**
-     * Returns the last consumed token to the token stream.
-     * @method unget
-     */      
-    unget: function(){
-        //if (this._ltIndex > -1){
-        if (this._ltIndexCache.length){
-            this._ltIndex -= this._ltIndexCache.pop();//--;
-            this._token = this._lt[this._ltIndex - 1];
-        } else {
-            throw new Error("Too much lookahead.");
-        }
-    }
-
-};
-
-
-
-
-parserlib.util = {
-StringReader: StringReader,
-SyntaxError : SyntaxError,
-SyntaxUnit  : SyntaxUnit,
-EventTarget : EventTarget,
-TokenStreamBase : TokenStreamBase
-};
-})();
-
-
-/* 
-Parser-Lib
-Copyright (c) 2009-2011 Nicholas C. Zakas. 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.
-
-*/
-/* Version v0.1.6, Build time: 2-March-2012 02:44:32 */
-(function(){
-var EventTarget = parserlib.util.EventTarget,
-TokenStreamBase = parserlib.util.TokenStreamBase,
-StringReader = parserlib.util.StringReader,
-SyntaxError = parserlib.util.SyntaxError,
-SyntaxUnit  = parserlib.util.SyntaxUnit;
-
-
-var Colors = {
-    aliceblue       :"#f0f8ff",
-    antiquewhite    :"#faebd7",
-    aqua            :"#00ffff",
-    aquamarine      :"#7fffd4",
-    azure           :"#f0ffff",
-    beige           :"#f5f5dc",
-    bisque          :"#ffe4c4",
-    black           :"#000000",
-    blanchedalmond  :"#ffebcd",
-    blue            :"#0000ff",
-    blueviolet      :"#8a2be2",
-    brown           :"#a52a2a",
-    burlywood       :"#deb887",
-    cadetblue       :"#5f9ea0",
-    chartreuse      :"#7fff00",
-    chocolate       :"#d2691e",
-    coral           :"#ff7f50",
-    cornflowerblue  :"#6495ed",
-    cornsilk        :"#fff8dc",
-    crimson         :"#dc143c",
-    cyan            :"#00ffff",
-    darkblue        :"#00008b",
-    darkcyan        :"#008b8b",
-    darkgoldenrod   :"#b8860b",
-    darkgray        :"#a9a9a9",
-    darkgreen       :"#006400",
-    darkkhaki       :"#bdb76b",
-    darkmagenta     :"#8b008b",
-    darkolivegreen  :"#556b2f",
-    darkorange      :"#ff8c00",
-    darkorchid      :"#9932cc",
-    darkred         :"#8b0000",
-    darksalmon      :"#e9967a",
-    darkseagreen    :"#8fbc8f",
-    darkslateblue   :"#483d8b",
-    darkslategray   :"#2f4f4f",
-    darkturquoise   :"#00ced1",
-    darkviolet      :"#9400d3",
-    deeppink        :"#ff1493",
-    deepskyblue     :"#00bfff",
-    dimgray         :"#696969",
-    dodgerblue      :"#1e90ff",
-    firebrick       :"#b22222",
-    floralwhite     :"#fffaf0",
-    forestgreen     :"#228b22",
-    fuchsia         :"#ff00ff",
-    gainsboro       :"#dcdcdc",
-    ghostwhite      :"#f8f8ff",
-    gold            :"#ffd700",
-    goldenrod       :"#daa520",
-    gray            :"#808080",
-    green           :"#008000",
-    greenyellow     :"#adff2f",
-    honeydew        :"#f0fff0",
-    hotpink         :"#ff69b4",
-    indianred       :"#cd5c5c",
-    indigo          :"#4b0082",
-    ivory           :"#fffff0",
-    khaki           :"#f0e68c",
-    lavender        :"#e6e6fa",
-    lavenderblush   :"#fff0f5",
-    lawngreen       :"#7cfc00",
-    lemonchiffon    :"#fffacd",
-    lightblue       :"#add8e6",
-    lightcoral      :"#f08080",
-    lightcyan       :"#e0ffff",
-    lightgoldenrodyellow  :"#fafad2",
-    lightgray       :"#d3d3d3",
-    lightgreen      :"#90ee90",
-    lightpink       :"#ffb6c1",
-    lightsalmon     :"#ffa07a",
-    lightseagreen   :"#20b2aa",
-    lightskyblue    :"#87cefa",
-    lightslategray  :"#778899",
-    lightsteelblue  :"#b0c4de",
-    lightyellow     :"#ffffe0",
-    lime            :"#00ff00",
-    limegreen       :"#32cd32",
-    linen           :"#faf0e6",
-    magenta         :"#ff00ff",
-    maroon          :"#800000",
-    mediumaquamarine:"#66cdaa",
-    mediumblue      :"#0000cd",
-    mediumorchid    :"#ba55d3",
-    mediumpurple    :"#9370d8",
-    mediumseagreen  :"#3cb371",
-    mediumslateblue :"#7b68ee",
-    mediumspringgreen   :"#00fa9a",
-    mediumturquoise :"#48d1cc",
-    mediumvioletred :"#c71585",
-    midnightblue    :"#191970",
-    mintcream       :"#f5fffa",
-    mistyrose       :"#ffe4e1",
-    moccasin        :"#ffe4b5",
-    navajowhite     :"#ffdead",
-    navy            :"#000080",
-    oldlace         :"#fdf5e6",
-    olive           :"#808000",
-    olivedrab       :"#6b8e23",
-    orange          :"#ffa500",
-    orangered       :"#ff4500",
-    orchid          :"#da70d6",
-    palegoldenrod   :"#eee8aa",
-    palegreen       :"#98fb98",
-    paleturquoise   :"#afeeee",
-    palevioletred   :"#d87093",
-    papayawhip      :"#ffefd5",
-    peachpuff       :"#ffdab9",
-    peru            :"#cd853f",
-    pink            :"#ffc0cb",
-    plum            :"#dda0dd",
-    powderblue      :"#b0e0e6",
-    purple          :"#800080",
-    red             :"#ff0000",
-    rosybrown       :"#bc8f8f",
-    royalblue       :"#4169e1",
-    saddlebrown     :"#8b4513",
-    salmon          :"#fa8072",
-    sandybrown      :"#f4a460",
-    seagreen        :"#2e8b57",
-    seashell        :"#fff5ee",
-    sienna          :"#a0522d",
-    silver          :"#c0c0c0",
-    skyblue         :"#87ceeb",
-    slateblue       :"#6a5acd",
-    slategray       :"#708090",
-    snow            :"#fffafa",
-    springgreen     :"#00ff7f",
-    steelblue       :"#4682b4",
-    tan             :"#d2b48c",
-    teal            :"#008080",
-    thistle         :"#d8bfd8",
-    tomato          :"#ff6347",
-    turquoise       :"#40e0d0",
-    violet          :"#ee82ee",
-    wheat           :"#f5deb3",
-    white           :"#ffffff",
-    whitesmoke      :"#f5f5f5",
-    yellow          :"#ffff00",
-    yellowgreen     :"#9acd32"
-};
-/*global SyntaxUnit, Parser*/
-/**
- * Represents a selector combinator (whitespace, +, >).
- * @namespace parserlib.css
- * @class Combinator
- * @extends parserlib.util.SyntaxUnit
- * @constructor
- * @param {String} text The text representation of the unit. 
- * @param {int} line The line of text on which the unit resides.
- * @param {int} col The column of text on which the unit resides.
- */
-function Combinator(text, line, col){
-    
-    SyntaxUnit.call(this, text, line, col, Parser.COMBINATOR_TYPE);
-
-    /**
-     * The type of modifier.
-     * @type String
-     * @property type
-     */
-    this.type = "unknown";
-    
-    //pretty simple
-    if (/^\s+$/.test(text)){
-        this.type = "descendant";
-    } else if (text == ">"){
-        this.type = "child";
-    } else if (text == "+"){
-        this.type = "adjacent-sibling";
-    } else if (text == "~"){
-        this.type = "sibling";
-    }
-
-}
-
-Combinator.prototype = new SyntaxUnit();
-Combinator.prototype.constructor = Combinator;
-
-
-/*global SyntaxUnit, Parser*/
-/**
- * Represents a media feature, such as max-width:500.
- * @namespace parserlib.css
- * @class MediaFeature
- * @extends parserlib.util.SyntaxUnit
- * @constructor
- * @param {SyntaxUnit} name The name of the feature.
- * @param {SyntaxUnit} value The value of the feature or null if none.
- */
-function MediaFeature(name, value){
-    
-    SyntaxUnit.call(this, "(" + name + (value !== null ? ":" + value : "") + ")", name.startLine, name.startCol, Parser.MEDIA_FEATURE_TYPE);
-
-    /**
-     * The name of the media feature
-     * @type String
-     * @property name
-     */
-    this.name = name;
-
-    /**
-     * The value for the feature or null if there is none.
-     * @type SyntaxUnit
-     * @property value
-     */
-    this.value = value;
-}
-
-MediaFeature.prototype = new SyntaxUnit();
-MediaFeature.prototype.constructor = MediaFeature;
-
-
-/*global SyntaxUnit, Parser*/
-/**
- * Represents an individual media query.
- * @namespace parserlib.css
- * @class MediaQuery
- * @extends parserlib.util.SyntaxUnit
- * @constructor
- * @param {String} modifier The modifier "not" or "only" (or null).
- * @param {String} mediaType The type of media (i.e., "print").
- * @param {Array} parts Array of selectors parts making up this selector.
- * @param {int} line The line of text on which the unit resides.
- * @param {int} col The column of text on which the unit resides.
- */
-function MediaQuery(modifier, mediaType, features, line, col){
-    
-    SyntaxUnit.call(this, (modifier ? modifier + " ": "") + (mediaType ? mediaType + " " : "") + features.join(" and "), line, col, Parser.MEDIA_QUERY_TYPE);
-
-    /**
-     * The media modifier ("not" or "only")
-     * @type String
-     * @property modifier
-     */
-    this.modifier = modifier;
-
-    /**
-     * The mediaType (i.e., "print")
-     * @type String
-     * @property mediaType
-     */
-    this.mediaType = mediaType;    
-    
-    /**
-     * The parts that make up the selector.
-     * @type Array
-     * @property features
-     */
-    this.features = features;
-
-}
-
-MediaQuery.prototype = new SyntaxUnit();
-MediaQuery.prototype.constructor = MediaQuery;
-
-
-/*global Tokens, TokenStream, SyntaxError, Properties, Validation, ValidationError, SyntaxUnit,
-    PropertyValue, PropertyValuePart, SelectorPart, SelectorSubPart, Selector,
-    PropertyName, Combinator, MediaFeature, MediaQuery, EventTarget */
-
-/**
- * A CSS3 parser.
- * @namespace parserlib.css
- * @class Parser
- * @constructor
- * @param {Object} options (Optional) Various options for the parser:
- *      starHack (true|false) to allow IE6 star hack as valid,
- *      underscoreHack (true|false) to interpret leading underscores
- *      as IE6-7 targeting for known properties, ieFilters (true|false)
- *      to indicate that IE < 8 filters should be accepted and not throw
- *      syntax errors.
- */
-function Parser(options){
-
-    //inherit event functionality
-    EventTarget.call(this);
-
-
-    this.options = options || {};
-
-    this._tokenStream = null;
-}
-
-//Static constants
-Parser.DEFAULT_TYPE = 0;
-Parser.COMBINATOR_TYPE = 1;
-Parser.MEDIA_FEATURE_TYPE = 2;
-Parser.MEDIA_QUERY_TYPE = 3;
-Parser.PROPERTY_NAME_TYPE = 4;
-Parser.PROPERTY_VALUE_TYPE = 5;
-Parser.PROPERTY_VALUE_PART_TYPE = 6;
-Parser.SELECTOR_TYPE = 7;
-Parser.SELECTOR_PART_TYPE = 8;
-Parser.SELECTOR_SUB_PART_TYPE = 9;
-
-Parser.prototype = function(){
-
-    var proto = new EventTarget(),  //new prototype
-        prop,
-        additions =  {
-        
-            //restore constructor
-            constructor: Parser,
-                        
-            //instance constants - yuck
-            DEFAULT_TYPE : 0,
-            COMBINATOR_TYPE : 1,
-            MEDIA_FEATURE_TYPE : 2,
-            MEDIA_QUERY_TYPE : 3,
-            PROPERTY_NAME_TYPE : 4,
-            PROPERTY_VALUE_TYPE : 5,
-            PROPERTY_VALUE_PART_TYPE : 6,
-            SELECTOR_TYPE : 7,
-            SELECTOR_PART_TYPE : 8,
-            SELECTOR_SUB_PART_TYPE : 9,            
-        
-            //-----------------------------------------------------------------
-            // Grammar
-            //-----------------------------------------------------------------
-        
-            _stylesheet: function(){
-            
-                /*
-                 * stylesheet
-                 *  : [ CHARSET_SYM S* STRING S* ';' ]?
-                 *    [S|CDO|CDC]* [ import [S|CDO|CDC]* ]*
-                 *    [ namespace [S|CDO|CDC]* ]*
-                 *    [ [ ruleset | media | page | font_face | keyframes ] [S|CDO|CDC]* ]*
-                 *  ;
-                 */ 
-               
-                var tokenStream = this._tokenStream,
-                    charset     = null,
-                    count,
-                    token,
-                    tt;
-                    
-                this.fire("startstylesheet");
-            
-                //try to read character set
-                this._charset();
-                
-                this._skipCruft();
-
-                //try to read imports - may be more than one
-                while (tokenStream.peek() == Tokens.IMPORT_SYM){
-                    this._import();
-                    this._skipCruft();
-                }
-                
-                //try to read namespaces - may be more than one
-                while (tokenStream.peek() == Tokens.NAMESPACE_SYM){
-                    this._namespace();
-                    this._skipCruft();
-                }
-                
-                //get the next token
-                tt = tokenStream.peek();
-                
-                //try to read the rest
-                while(tt > Tokens.EOF){
-                
-                    try {
-                
-                        switch(tt){
-                            case Tokens.MEDIA_SYM:
-                                this._media();
-                                this._skipCruft();
-                                break;
-                            case Tokens.PAGE_SYM:
-                                this._page(); 
-                                this._skipCruft();
-                                break;                   
-                            case Tokens.FONT_FACE_SYM:
-                                this._font_face(); 
-                                this._skipCruft();
-                                break;  
-                            case Tokens.KEYFRAMES_SYM:
-                                this._keyframes(); 
-                                this._skipCruft();
-                                break;                                
-                            case Tokens.UNKNOWN_SYM:  //unknown @ rule
-                                tokenStream.get();
-                                if (!this.options.strict){
-                                
-                                    //fire error event
-                                    this.fire({
-                                        type:       "error",
-                                        error:      null,
-                                        message:    "Unknown @ rule: " + tokenStream.LT(0).value + ".",
-                                        line:       tokenStream.LT(0).startLine,
-                                        col:        tokenStream.LT(0).startCol
-                                    });                          
-                                    
-                                    //skip braces
-                                    count=0;
-                                    while (tokenStream.advance([Tokens.LBRACE, Tokens.RBRACE]) == Tokens.LBRACE){
-                                        count++;    //keep track of nesting depth
-                                    }
-                                    
-                                    while(count){
-                                        tokenStream.advance([Tokens.RBRACE]);
-                                        count--;
-                                    }
-                                    
-                                } else {
-                                    //not a syntax error, rethrow it
-                                    throw new SyntaxError("Unknown @ rule.", tokenStream.LT(0).startLine, tokenStream.LT(0).startCol);
-                                }                                
-                                break;
-                            case Tokens.S:
-                                this._readWhitespace();
-                                break;
-                            default:                            
-                                if(!this._ruleset()){
-                                
-                                    //error handling for known issues
-                                    switch(tt){
-                                        case Tokens.CHARSET_SYM:
-                                            token = tokenStream.LT(1);
-                                            this._charset(false);
-                                            throw new SyntaxError("@charset not allowed here.", token.startLine, token.startCol);
-                                        case Tokens.IMPORT_SYM:
-                                            token = tokenStream.LT(1);
-                                            this._import(false);
-                                            throw new SyntaxError("@import not allowed here.", token.startLine, token.startCol);
-                                        case Tokens.NAMESPACE_SYM:
-                                            token = tokenStream.LT(1);
-                                            this._namespace(false);
-                                            throw new SyntaxError("@namespace not allowed here.", token.startLine, token.startCol);
-                                        default:
-                                            tokenStream.get();  //get the last token
-                                            this._unexpectedToken(tokenStream.token());
-                                    }
-                                
-                                }
-                        }
-                    } catch(ex) {
-                        if (ex instanceof SyntaxError && !this.options.strict){
-                            this.fire({
-                                type:       "error",
-                                error:      ex,
-                                message:    ex.message,
-                                line:       ex.line,
-                                col:        ex.col
-                            });                     
-                        } else {
-                            throw ex;
-                        }
-                    }
-                    
-                    tt = tokenStream.peek();
-                }
-                
-                if (tt != Tokens.EOF){
-                    this._unexpectedToken(tokenStream.token());
-                }
-            
-                this.fire("endstylesheet");
-            },
-            
-            _charset: function(emit){
-                var tokenStream = this._tokenStream,
-                    charset,
-                    token,
-                    line,
-                    col;
-                    
-                if (tokenStream.match(Tokens.CHARSET_SYM)){
-                    line = tokenStream.token().startLine;
-                    col = tokenStream.token().startCol;
-                
-                    this._readWhitespace();
-                    tokenStream.mustMatch(Tokens.STRING);
-                    
-                    token = tokenStream.token();
-                    charset = token.value;
-                    
-                    this._readWhitespace();
-                    tokenStream.mustMatch(Tokens.SEMICOLON);
-                    
-                    if (emit !== false){
-                        this.fire({ 
-                            type:   "charset",
-                            charset:charset,
-                            line:   line,
-                            col:    col
-                        });
-                    }
-                }            
-            },
-            
-            _import: function(emit){
-                /*
-                 * import
-                 *   : IMPORT_SYM S*
-                 *    [STRING|URI] S* media_query_list? ';' S*
-                 */    
-            
-                var tokenStream = this._tokenStream,
-                    tt,
-                    uri,
-                    importToken,
-                    mediaList   = [];
-                
-                //read import symbol
-                tokenStream.mustMatch(Tokens.IMPORT_SYM);
-                importToken = tokenStream.token();
-                this._readWhitespace();
-                
-                tokenStream.mustMatch([Tokens.STRING, Tokens.URI]);
-                
-                //grab the URI value
-                uri = tokenStream.token().value.replace(/(?:url\()?["']([^"']+)["']\)?/, "$1");                
-
-                this._readWhitespace();
-                
-                mediaList = this._media_query_list();
-                
-                //must end with a semicolon
-                tokenStream.mustMatch(Tokens.SEMICOLON);
-                this._readWhitespace();
-                
-                if (emit !== false){
-                    this.fire({
-                        type:   "import",
-                        uri:    uri,
-                        media:  mediaList,
-                        line:   importToken.startLine,
-                        col:    importToken.startCol
-                    });
-                }
-        
-            },
-            
-            _namespace: function(emit){
-                /*
-                 * namespace
-                 *   : NAMESPACE_SYM S* [namespace_prefix S*]? [STRING|URI] S* ';' S*
-                 */    
-            
-                var tokenStream = this._tokenStream,
-                    line,
-                    col,
-                    prefix,
-                    uri;
-                
-                //read import symbol
-                tokenStream.mustMatch(Tokens.NAMESPACE_SYM);
-                line = tokenStream.token().startLine;
-                col = tokenStream.token().startCol;
-                this._readWhitespace();
-                
-                //it's a namespace prefix - no _namespace_prefix() method because it's just an IDENT
-                if (tokenStream.match(Tokens.IDENT)){
-                    prefix = tokenStream.token().value;
-                    this._readWhitespace();
-                }
-                
-                tokenStream.mustMatch([Tokens.STRING, Tokens.URI]);
-                /*if (!tokenStream.match(Tokens.STRING)){
-                    tokenStream.mustMatch(Tokens.URI);
-                }*/
-                
-                //grab the URI value
-                uri = tokenStream.token().value.replace(/(?:url\()?["']([^"']+)["']\)?/, "$1");                
-
-                this._readWhitespace();
-
-                //must end with a semicolon
-                tokenStream.mustMatch(Tokens.SEMICOLON);
-                this._readWhitespace();
-                
-                if (emit !== false){
-                    this.fire({
-                        type:   "namespace",
-                        prefix: prefix,
-                        uri:    uri,
-                        line:   line,
-                        col:    col
-                    });
-                }
-        
-            },            
-                       
-            _media: function(){
-                /*
-                 * media
-                 *   : MEDIA_SYM S* media_query_list S* '{' S* ruleset* '}' S*
-                 *   ;
-                 */
-                var tokenStream     = this._tokenStream,
-                    line,
-                    col,
-                    mediaList;//       = [];
-                
-                //look for @media
-                tokenStream.mustMatch(Tokens.MEDIA_SYM);
-                line = tokenStream.token().startLine;
-                col = tokenStream.token().startCol;
-                
-                this._readWhitespace();               
-
-                mediaList = this._media_query_list();
-
-                tokenStream.mustMatch(Tokens.LBRACE);
-                this._readWhitespace();
-                
-                this.fire({
-                    type:   "startmedia",
-                    media:  mediaList,
-                    line:   line,
-                    col:    col
-                });
-                
-                while(true) {
-                    if (tokenStream.peek() == Tokens.PAGE_SYM){
-                        this._page();
-                    } else if (!this._ruleset()){
-                        break;
-                    }                
-                }
-                
-                tokenStream.mustMatch(Tokens.RBRACE);
-                this._readWhitespace();
-        
-                this.fire({
-                    type:   "endmedia",
-                    media:  mediaList,
-                    line:   line,
-                    col:    col
-                });
-            },                           
-        
-
-            //CSS3 Media Queries
-            _media_query_list: function(){
-                /*
-                 * media_query_list
-                 *   : S* [media_query [ ',' S* media_query ]* ]?
-                 *   ;
-                 */
-                var tokenStream = this._tokenStream,
-                    mediaList   = [];
-                
-                
-                this._readWhitespace();
-                
-                if (tokenStream.peek() == Tokens.IDENT || tokenStream.peek() == Tokens.LPAREN){
-                    mediaList.push(this._media_query());
-                }
-                
-                while(tokenStream.match(Tokens.COMMA)){
-                    this._readWhitespace();
-                    mediaList.push(this._media_query());
-                }
-                
-                return mediaList;
-            },
-            
-            /*
-             * Note: "expression" in the grammar maps to the _media_expression
-             * method.
-             
-             */
-            _media_query: function(){
-                /*
-                 * media_query
-                 *   : [ONLY | NOT]? S* media_type S* [ AND S* expression ]*
-                 *   | expression [ AND S* expression ]*
-                 *   ;
-                 */
-                var tokenStream = this._tokenStream,
-                    type        = null,
-                    ident       = null,
-                    token       = null,
-                    expressions = [];
-                    
-                if (tokenStream.match(Tokens.IDENT)){
-                    ident = tokenStream.token().value.toLowerCase();
-                    
-                    //since there's no custom tokens for these, need to manually check
-                    if (ident != "only" && ident != "not"){
-                        tokenStream.unget();
-                        ident = null;
-                    } else {
-                        token = tokenStream.token();
-                    }
-                }
-                                
-                this._readWhitespace();
-                
-                if (tokenStream.peek() == Tokens.IDENT){
-                    type = this._media_type();
-                    if (token === null){
-                        token = tokenStream.token();
-                    }
-                } else if (tokenStream.peek() == Tokens.LPAREN){
-                    if (token === null){
-                        token = tokenStream.LT(1);
-                    }
-                    expressions.push(this._media_expression());
-                }                               
-                
-                if (type === null && expressions.length === 0){
-                    return null;
-                } else {                
-                    this._readWhitespace();
-                    while (tokenStream.match(Tokens.IDENT)){
-                        if (tokenStream.token().value.toLowerCase() != "and"){
-                            this._unexpectedToken(tokenStream.token());
-                        }
-                        
-                        this._readWhitespace();
-                        expressions.push(this._media_expression());
-                    }
-                }
-
-                return new MediaQuery(ident, type, expressions, token.startLine, token.startCol);
-            },
-
-            //CSS3 Media Queries
-            _media_type: function(){
-                /*
-                 * media_type
-                 *   : IDENT
-                 *   ;
-                 */
-                return this._media_feature();           
-            },
-
-            /**
-             * Note: in CSS3 Media Queries, this is called "expression".
-             * Renamed here to avoid conflict with CSS3 Selectors
-             * definition of "expression". Also note that "expr" in the
-             * grammar now maps to "expression" from CSS3 selectors.
-             * @method _media_expression
-             * @private
-             */
-            _media_expression: function(){
-                /*
-                 * expression
-                 *  : '(' S* media_feature S* [ ':' S* expr ]? ')' S*
-                 *  ;
-                 */
-                var tokenStream = this._tokenStream,
-                    feature     = null,
-                    token,
-                    expression  = null;
-                
-                tokenStream.mustMatch(Tokens.LPAREN);
-                
-                feature = this._media_feature();
-                this._readWhitespace();
-                
-                if (tokenStream.match(Tokens.COLON)){
-                    this._readWhitespace();
-                    token = tokenStream.LT(1);
-                    expression = this._expression();
-                }
-                
-                tokenStream.mustMatch(Tokens.RPAREN);
-                this._readWhitespace();
-
-                return new MediaFeature(feature, (expression ? new SyntaxUnit(expression, token.startLine, token.startCol) : null));            
-            },
-
-            //CSS3 Media Queries
-            _media_feature: function(){
-                /*
-                 * media_feature
-                 *   : IDENT
-                 *   ;
-                 */
-                var tokenStream = this._tokenStream;
-                    
-                tokenStream.mustMatch(Tokens.IDENT);
-                
-                return SyntaxUnit.fromToken(tokenStream.token());            
-            },
-            
-            //CSS3 Paged Media
-            _page: function(){
-                /*
-                 * page:
-                 *    PAGE_SYM S* IDENT? pseudo_page? S* 
-                 *    '{' S* [ declaration | margin ]? [ ';' S* [ declaration | margin ]? ]* '}' S*
-                 *    ;
-                 */            
-                var tokenStream = this._tokenStream,
-                    line,
-                    col,
-                    identifier  = null,
-                    pseudoPage  = null;
-                
-                //look for @page
-                tokenStream.mustMatch(Tokens.PAGE_SYM);
-                line = tokenStream.token().startLine;
-                col = tokenStream.token().startCol;
-                
-                this._readWhitespace();
-                
-                if (tokenStream.match(Tokens.IDENT)){
-                    identifier = tokenStream.token().value;
-
-                    //The value 'auto' may not be used as a page name and MUST be treated as a syntax error.
-                    if (identifier.toLowerCase() === "auto"){
-                        this._unexpectedToken(tokenStream.token());
-                    }
-                }                
-                
-                //see if there's a colon upcoming
-                if (tokenStream.peek() == Tokens.COLON){
-                    pseudoPage = this._pseudo_page();
-                }
-            
-                this._readWhitespace();
-                
-                this.fire({
-                    type:   "startpage",
-                    id:     identifier,
-                    pseudo: pseudoPage,
-                    line:   line,
-                    col:    col
-                });                   
-
-                this._readDeclarations(true, true);                
-                
-                this.fire({
-                    type:   "endpage",
-                    id:     identifier,
-                    pseudo: pseudoPage,
-                    line:   line,
-                    col:    col
-                });             
-            
-            },
-            
-            //CSS3 Paged Media
-            _margin: function(){
-                /*
-                 * margin :
-                 *    margin_sym S* '{' declaration [ ';' S* declaration? ]* '}' S*
-                 *    ;
-                 */
-                var tokenStream = this._tokenStream,
-                    line,
-                    col,
-                    marginSym   = this._margin_sym();
-
-                if (marginSym){
-                    line = tokenStream.token().startLine;
-                    col = tokenStream.token().startCol;
-                
-                    this.fire({
-                        type: "startpagemargin",
-                        margin: marginSym,
-                        line:   line,
-                        col:    col
-                    });    
-                    
-                    this._readDeclarations(true);
-
-                    this.fire({
-                        type: "endpagemargin",
-                        margin: marginSym,
-                        line:   line,
-                        col:    col
-                    });    
-                    return true;
-                } else {
-                    return false;
-                }
-            },
-
-            //CSS3 Paged Media
-            _margin_sym: function(){
-            
-                /*
-                 * margin_sym :
-                 *    TOPLEFTCORNER_SYM | 
-                 *    TOPLEFT_SYM | 
-                 *    TOPCENTER_SYM | 
-                 *    TOPRIGHT_SYM | 
-                 *    TOPRIGHTCORNER_SYM |
-                 *    BOTTOMLEFTCORNER_SYM | 
-                 *    BOTTOMLEFT_SYM | 
-                 *    BOTTOMCENTER_SYM | 
-                 *    BOTTOMRIGHT_SYM |
-                 *    BOTTOMRIGHTCORNER_SYM |
-                 *    LEFTTOP_SYM |
-                 *    LEFTMIDDLE_SYM |
-                 *    LEFTBOTTOM_SYM |
-                 *    RIGHTTOP_SYM |
-                 *    RIGHTMIDDLE_SYM |
-                 *    RIGHTBOTTOM_SYM 
-                 *    ;
-                 */
-            
-                var tokenStream = this._tokenStream;
-            
-                if(tokenStream.match([Tokens.TOPLEFTCORNER_SYM, Tokens.TOPLEFT_SYM,
-                        Tokens.TOPCENTER_SYM, Tokens.TOPRIGHT_SYM, Tokens.TOPRIGHTCORNER_SYM,
-                        Tokens.BOTTOMLEFTCORNER_SYM, Tokens.BOTTOMLEFT_SYM, 
-                        Tokens.BOTTOMCENTER_SYM, Tokens.BOTTOMRIGHT_SYM,
-                        Tokens.BOTTOMRIGHTCORNER_SYM, Tokens.LEFTTOP_SYM, 
-                        Tokens.LEFTMIDDLE_SYM, Tokens.LEFTBOTTOM_SYM, Tokens.RIGHTTOP_SYM,
-                        Tokens.RIGHTMIDDLE_SYM, Tokens.RIGHTBOTTOM_SYM]))
-                {
-                    return SyntaxUnit.fromToken(tokenStream.token());                
-                } else {
-                    return null;
-                }
-            
-            },
-            
-            _pseudo_page: function(){
-                /*
-                 * pseudo_page
-                 *   : ':' IDENT
-                 *   ;    
-                 */
-        
-                var tokenStream = this._tokenStream;
-                
-                tokenStream.mustMatch(Tokens.COLON);
-                tokenStream.mustMatch(Tokens.IDENT);
-                
-                //TODO: CSS3 Paged Media says only "left", "center", and "right" are allowed
-                
-                return tokenStream.token().value;
-            },
-            
-            _font_face: function(){
-                /*
-                 * font_face
-                 *   : FONT_FACE_SYM S* 
-                 *     '{' S* declaration [ ';' S* declaration ]* '}' S*
-                 *   ;
-                 */     
-                var tokenStream = this._tokenStream,
-                    line,
-                    col;
-                
-                //look for @page
-                tokenStream.mustMatch(Tokens.FONT_FACE_SYM);
-                line = tokenStream.token().startLine;
-                col = tokenStream.token().startCol;
-                
-                this._readWhitespace();
-
-                this.fire({
-                    type:   "startfontface",
-                    line:   line,
-                    col:    col
-                });                    
-                
-                this._readDeclarations(true);
-                
-                this.fire({
-                    type:   "endfontface",
-                    line:   line,
-                    col:    col
-                });              
-            },
-
-            _operator: function(){
-            
-                /*
-                 * operator
-                 *  : '/' S* | ',' S* | /( empty )/
-                 *  ;
-                 */    
-                 
-                var tokenStream = this._tokenStream,
-                    token       = null;
-                
-                if (tokenStream.match([Tokens.SLASH, Tokens.COMMA])){
-                    token =  tokenStream.token();
-                    this._readWhitespace();
-                } 
-                return token ? PropertyValuePart.fromToken(token) : null;
-                
-            },
-            
-            _combinator: function(){
-            
-                /*
-                 * combinator
-                 *  : PLUS S* | GREATER S* | TILDE S* | S+
-                 *  ;
-                 */    
-                 
-                var tokenStream = this._tokenStream,
-                    value       = null,
-                    token;
-                
-                if(tokenStream.match([Tokens.PLUS, Tokens.GREATER, Tokens.TILDE])){                
-                    token = tokenStream.token();
-                    value = new Combinator(token.value, token.startLine, token.startCol);
-                    this._readWhitespace();
-                }
-                
-                return value;
-            },
-            
-            _unary_operator: function(){
-            
-                /*
-                 * unary_operator
-                 *  : '-' | '+'
-                 *  ;
-                 */
-                 
-                var tokenStream = this._tokenStream;
-                
-                if (tokenStream.match([Tokens.MINUS, Tokens.PLUS])){
-                    return tokenStream.token().value;
-                } else {
-                    return null;
-                }         
-            },
-            
-            _property: function(){
-            
-                /*
-                 * property
-                 *   : IDENT S*
-                 *   ;        
-                 */
-                 
-                var tokenStream = this._tokenStream,
-                    value       = null,
-                    hack        = null,
-                    tokenValue,
-                    token,
-                    line,
-                    col;
-                    
-                //check for star hack - throws error if not allowed
-                if (tokenStream.peek() == Tokens.STAR && this.options.starHack){
-                    tokenStream.get();
-                    token = tokenStream.token();
-                    hack = token.value;
-                    line = token.startLine;
-                    col = token.startCol;
-                }
-                
-                if(tokenStream.match(Tokens.IDENT)){
-                    token = tokenStream.token();
-                    tokenValue = token.value;
-                    
-                    //check for underscore hack - no error if not allowed because it's valid CSS syntax
-                    if (tokenValue.charAt(0) == "_" && this.options.underscoreHack){
-                        hack = "_";
-                        tokenValue = tokenValue.substring(1);
-                    }
-                    
-                    value = new PropertyName(tokenValue, hack, (line||token.startLine), (col||token.startCol));
-                    this._readWhitespace();
-                }
-                
-                return value;
-            },
-        
-            //Augmented with CSS3 Selectors
-            _ruleset: function(){
-                /*
-                 * ruleset
-                 *   : selectors_group
-                 *     '{' S* declaration? [ ';' S* declaration? ]* '}' S*
-                 *   ;    
-                 */    
-                 
-                var tokenStream = this._tokenStream,
-                    tt,
-                    selectors;
-
-
-                /*
-                 * Error Recovery: If even a single selector fails to parse,
-                 * then the entire ruleset should be thrown away.
-                 */
-                try {
-                    selectors = this._selectors_group();
-                } catch (ex){
-                    if (ex instanceof SyntaxError && !this.options.strict){
-                    
-                        //fire error event
-                        this.fire({
-                            type:       "error",
-                            error:      ex,
-                            message:    ex.message,
-                            line:       ex.line,
-                            col:        ex.col
-                        });                          
-                        
-                        //skip over everything until closing brace
-                        tt = tokenStream.advance([Tokens.RBRACE]);
-                        if (tt == Tokens.RBRACE){
-                            //if there's a right brace, the rule is finished so don't do anything
-                        } else {
-                            //otherwise, rethrow the error because it wasn't handled properly
-                            throw ex;
-                        }                        
-                        
-                    } else {
-                        //not a syntax error, rethrow it
-                        throw ex;
-                    }                
-                
-                    //trigger parser to continue
-                    return true;
-                }
-                
-                //if it got here, all selectors parsed
-                if (selectors){ 
-                                    
-                    this.fire({
-                        type:       "startrule",
-                        selectors:  selectors,
-                        line:       selectors[0].line,
-                        col:        selectors[0].col
-                    });                
-                    
-                    this._readDeclarations(true);                
-                    
-                    this.fire({
-                        type:       "endrule",
-                        selectors:  selectors,
-                        line:       selectors[0].line,
-                        col:        selectors[0].col
-                    });  
-                    
-                }
-                
-                return selectors;
-                
-            },
-
-            //CSS3 Selectors
-            _selectors_group: function(){
-            
-                /*            
-                 * selectors_group
-                 *   : selector [ COMMA S* selector ]*
-                 *   ;
-                 */           
-                var tokenStream = this._tokenStream,
-                    selectors   = [],
-                    selector;
-                    
-                selector = this._selector();
-                if (selector !== null){
-                
-                    selectors.push(selector);
-                    while(tokenStream.match(Tokens.COMMA)){
-                        this._readWhitespace();
-                        selector = this._selector();
-                        if (selector !== null){
-                            selectors.push(selector);
-                        } else {
-                            this._unexpectedToken(tokenStream.LT(1));
-                        }
-                    }
-                }
-
-                return selectors.length ? selectors : null;
-            },
-                
-            //CSS3 Selectors
-            _selector: function(){
-                /*
-                 * selector
-                 *   : simple_selector_sequence [ combinator simple_selector_sequence ]*
-                 *   ;    
-                 */
-                 
-                var tokenStream = this._tokenStream,
-                    selector    = [],
-                    nextSelector = null,
-                    combinator  = null,
-                    ws          = null;
-                
-                //if there's no simple selector, then there's no selector
-                nextSelector = this._simple_selector_sequence();
-                if (nextSelector === null){
-                    return null;
-                }
-                
-                selector.push(nextSelector);
-                
-                do {
-                    
-                    //look for a combinator
-                    combinator = this._combinator();
-                    
-                    if (combinator !== null){
-                        selector.push(combinator);
-                        nextSelector = this._simple_selector_sequence();
-                        
-                        //there must be a next selector
-                        if (nextSelector === null){
-                            this._unexpectedToken(this.LT(1));
-                        } else {
-                        
-                            //nextSelector is an instance of SelectorPart
-                            selector.push(nextSelector);
-                        }
-                    } else {
-                        
-                        //if there's not whitespace, we're done
-                        if (this._readWhitespace()){           
-        
-                            //add whitespace separator
-                            ws = new Combinator(tokenStream.token().value, tokenStream.token().startLine, tokenStream.token().startCol);
-                            
-                            //combinator is not required
-                            combinator = this._combinator();
-                            
-                            //selector is required if there's a combinator
-                            nextSelector = this._simple_selector_sequence();
-                            if (nextSelector === null){                        
-                                if (combinator !== null){
-                                    this._unexpectedToken(tokenStream.LT(1));
-                                }
-                            } else {
-                                
-                                if (combinator !== null){
-                                    selector.push(combinator);
-                                } else {
-                                    selector.push(ws);
-                                }
-                                
-                                selector.push(nextSelector);
-                            }     
-                        } else {
-                            break;
-                        }               
-                    
-                    }
-                } while(true);
-                
-                return new Selector(selector, selector[0].line, selector[0].col);
-            },
-            
-            //CSS3 Selectors
-            _simple_selector_sequence: function(){
-                /*
-                 * simple_selector_sequence
-                 *   : [ type_selector | universal ]
-                 *     [ HASH | class | attrib | pseudo | negation ]*
-                 *   | [ HASH | class | attrib | pseudo | negation ]+
-                 *   ;
-                 */
-                 
-                var tokenStream = this._tokenStream,
-                
-                    //parts of a simple selector
-                    elementName = null,
-                    modifiers   = [],
-                    
-                    //complete selector text
-                    selectorText= "",
-
-                    //the different parts after the element name to search for
-                    components  = [
-                        //HASH
-                        function(){
-                            return tokenStream.match(Tokens.HASH) ?
-                                    new SelectorSubPart(tokenStream.token().value, "id", tokenStream.token().startLine, tokenStream.token().startCol) :
-                                    null;
-                        },
-                        this._class,
-                        this._attrib,
-                        this._pseudo,
-                        this._negation
-                    ],
-                    i           = 0,
-                    len         = components.length,
-                    component   = null,
-                    found       = false,
-                    line,
-                    col;
-                    
-                    
-                //get starting line and column for the selector
-                line = tokenStream.LT(1).startLine;
-                col = tokenStream.LT(1).startCol;
-                                        
-                elementName = this._type_selector();
-                if (!elementName){
-                    elementName = this._universal();
-                }
-                
-                if (elementName !== null){
-                    selectorText += elementName;
-                }                
-                
-                while(true){
-
-                    //whitespace means we're done
-                    if (tokenStream.peek() === Tokens.S){
-                        break;
-                    }
-                
-                    //check for each component
-                    while(i < len && component === null){
-                        component = components[i++].call(this);
-                    }
-        
-                    if (component === null){
-                    
-                        //we don't have a selector
-                        if (selectorText === ""){
-                            return null;
-                        } else {
-                            break;
-                        }
-                    } else {
-                        i = 0;
-                        modifiers.push(component);
-                        selectorText += component.toString(); 
-                        component = null;
-                    }
-                }
-
-                 
-                return selectorText !== "" ?
-                        new SelectorPart(elementName, modifiers, selectorText, line, col) :
-                        null;
-            },            
-            
-            //CSS3 Selectors
-            _type_selector: function(){
-                /*
-                 * type_selector
-                 *   : [ namespace_prefix ]? element_name
-                 *   ;
-                 */
-                 
-                var tokenStream = this._tokenStream,
-                    ns          = this._namespace_prefix(),
-                    elementName = this._element_name();
-                    
-                if (!elementName){                    
-                    /*
-                     * Need to back out the namespace that was read due to both
-                     * type_selector and universal reading namespace_prefix
-                     * first. Kind of hacky, but only way I can figure out
-                     * right now how to not change the grammar.
-                     */
-                    if (ns){
-                        tokenStream.unget();
-                        if (ns.length > 1){
-                            tokenStream.unget();
-                        }
-                    }
-                
-                    return null;
-                } else {     
-                    if (ns){
-                        elementName.text = ns + elementName.text;
-                        elementName.col -= ns.length;
-                    }
-                    return elementName;
-                }
-            },
-            
-            //CSS3 Selectors
-            _class: function(){
-                /*
-                 * class
-                 *   : '.' IDENT
-                 *   ;
-                 */    
-                 
-                var tokenStream = this._tokenStream,
-                    token;
-                
-                if (tokenStream.match(Tokens.DOT)){
-                    tokenStream.mustMatch(Tokens.IDENT);    
-                    token = tokenStream.token();
-                    return new SelectorSubPart("." + token.value, "class", token.startLine, token.startCol - 1);        
-                } else {
-                    return null;
-                }
-        
-            },
-            
-            //CSS3 Selectors
-            _element_name: function(){
-                /*
-                 * element_name
-                 *   : IDENT
-                 *   ;
-                 */    
-                
-                var tokenStream = this._tokenStream,
-                    token;
-                
-                if (tokenStream.match(Tokens.IDENT)){
-                    token = tokenStream.token();
-                    return new SelectorSubPart(token.value, "elementName", token.startLine, token.startCol);        
-                
-                } else {
-                    return null;
-                }
-            },
-            
-            //CSS3 Selectors
-            _namespace_prefix: function(){
-                /*            
-                 * namespace_prefix
-                 *   : [ IDENT | '*' ]? '|'
-                 *   ;
-                 */
-                var tokenStream = this._tokenStream,
-                    value       = "";
-                    
-                //verify that this is a namespace prefix
-                if (tokenStream.LA(1) === Tokens.PIPE || tokenStream.LA(2) === Tokens.PIPE){
-                        
-                    if(tokenStream.match([Tokens.IDENT, Tokens.STAR])){
-                        value += tokenStream.token().value;
-                    }
-                    
-                    tokenStream.mustMatch(Tokens.PIPE);
-                    value += "|";
-                    
-                }
-                
-                return value.length ? value : null;                
-            },
-            
-            //CSS3 Selectors
-            _universal: function(){
-                /*
-                 * universal
-                 *   : [ namespace_prefix ]? '*'
-                 *   ;            
-                 */
-                var tokenStream = this._tokenStream,
-                    value       = "",
-                    ns;
-                    
-                ns = this._namespace_prefix();
-                if(ns){
-                    value += ns;
-                }
-                
-                if(tokenStream.match(Tokens.STAR)){
-                    value += "*";
-                }
-                
-                return value.length ? value : null;
-                
-           },
-            
-            //CSS3 Selectors
-            _attrib: function(){
-                /*
-                 * attrib
-                 *   : '[' S* [ namespace_prefix ]? IDENT S*
-                 *         [ [ PREFIXMATCH |
-                 *             SUFFIXMATCH |
-                 *             SUBSTRINGMATCH |
-                 *             '=' |
-                 *             INCLUDES |
-                 *             DASHMATCH ] S* [ IDENT | STRING ] S*
-                 *         ]? ']'
-                 *   ;    
-                 */
-                 
-                var tokenStream = this._tokenStream,
-                    value       = null,
-                    ns,
-                    token;
-                
-                if (tokenStream.match(Tokens.LBRACKET)){
-                    token = tokenStream.token();
-                    value = token.value;
-                    value += this._readWhitespace();
-                    
-                    ns = this._namespace_prefix();
-                    
-                    if (ns){
-                        value += ns;
-                    }
-                                        
-                    tokenStream.mustMatch(Tokens.IDENT);
-                    value += tokenStream.token().value;                    
-                    value += this._readWhitespace();
-                    
-                    if(tokenStream.match([Tokens.PREFIXMATCH, Tokens.SUFFIXMATCH, Tokens.SUBSTRINGMATCH,
-                            Tokens.EQUALS, Tokens.INCLUDES, Tokens.DASHMATCH])){
-                    
-                        value += tokenStream.token().value;                    
-                        value += this._readWhitespace();
-                        
-                        tokenStream.mustMatch([Tokens.IDENT, Tokens.STRING]);
-                        value += tokenStream.token().value;                    
-                        value += this._readWhitespace();
-                    }
-                    
-                    tokenStream.mustMatch(Tokens.RBRACKET);
-                                        
-                    return new SelectorSubPart(value + "]", "attribute", token.startLine, token.startCol);
-                } else {
-                    return null;
-                }
-            },
-            
-            //CSS3 Selectors
-            _pseudo: function(){
-            
-                /*
-                 * pseudo
-                 *   : ':' ':'? [ IDENT | functional_pseudo ]
-                 *   ;    
-                 */   
-            
-                var tokenStream = this._tokenStream,
-                    pseudo      = null,
-                    colons      = ":",
-                    line,
-                    col;
-                
-                if (tokenStream.match(Tokens.COLON)){
-                
-                    if (tokenStream.match(Tokens.COLON)){
-                        colons += ":";
-                    }
-                
-                    if (tokenStream.match(Tokens.IDENT)){
-                        pseudo = tokenStream.token().value;
-                        line = tokenStream.token().startLine;
-                        col = tokenStream.token().startCol - colons.length;
-                    } else if (tokenStream.peek() == Tokens.FUNCTION){
-                        line = tokenStream.LT(1).startLine;
-                        col = tokenStream.LT(1).startCol - colons.length;
-                        pseudo = this._functional_pseudo();
-                    }
-                    
-                    if (pseudo){
-                        pseudo = new SelectorSubPart(colons + pseudo, "pseudo", line, col);
-                    }
-                }
-        
-                return pseudo;
-            },
-            
-            //CSS3 Selectors
-            _functional_pseudo: function(){
-                /*
-                 * functional_pseudo
-                 *   : FUNCTION S* expression ')'
-                 *   ;
-                */            
-                
-                var tokenStream = this._tokenStream,
-                    value = null;
-                
-                if(tokenStream.match(Tokens.FUNCTION)){
-                    value = tokenStream.token().value;
-                    value += this._readWhitespace();
-                    value += this._expression();
-                    tokenStream.mustMatch(Tokens.RPAREN);
-                    value += ")";
-                }
-                
-                return value;
-            },
-            
-            //CSS3 Selectors
-            _expression: function(){
-                /*
-                 * expression
-                 *   : [ [ PLUS | '-' | DIMENSION | NUMBER | STRING | IDENT ] S* ]+
-                 *   ;
-                 */
-                 
-                var tokenStream = this._tokenStream,
-                    value       = "";
-                    
-                while(tokenStream.match([Tokens.PLUS, Tokens.MINUS, Tokens.DIMENSION,
-                        Tokens.NUMBER, Tokens.STRING, Tokens.IDENT, Tokens.LENGTH,
-                        Tokens.FREQ, Tokens.ANGLE, Tokens.TIME,
-                        Tokens.RESOLUTION])){
-                    
-                    value += tokenStream.token().value;
-                    value += this._readWhitespace();                        
-                }
-                
-                return value.length ? value : null;
-                
-            },
-
-            //CSS3 Selectors
-            _negation: function(){
-                /*            
-                 * negation
-                 *   : NOT S* negation_arg S* ')'
-                 *   ;
-                 */
-
-                var tokenStream = this._tokenStream,
-                    line,
-                    col,
-                    value       = "",
-                    arg,
-                    subpart     = null;
-                    
-                if (tokenStream.match(Tokens.NOT)){
-                    value = tokenStream.token().value;
-                    line = tokenStream.token().startLine;
-                    col = tokenStream.token().startCol;
-                    value += this._readWhitespace();
-                    arg = this._negation_arg();
-                    value += arg;
-                    value += this._readWhitespace();
-                    tokenStream.match(Tokens.RPAREN);
-                    value += tokenStream.token().value;
-                    
-                    subpart = new SelectorSubPart(value, "not", line, col);
-                    subpart.args.push(arg);
-                }
-                
-                return subpart;
-            },
-            
-            //CSS3 Selectors
-            _negation_arg: function(){            
-                /*
-                 * negation_arg
-                 *   : type_selector | universal | HASH | class | attrib | pseudo
-                 *   ;            
-                 */           
-                 
-                var tokenStream = this._tokenStream,
-                    args        = [
-                        this._type_selector,
-                        this._universal,
-                        function(){
-                            return tokenStream.match(Tokens.HASH) ?
-                                    new SelectorSubPart(tokenStream.token().value, "id", tokenStream.token().startLine, tokenStream.token().startCol) :
-                                    null;                        
-                        },
-                        this._class,
-                        this._attrib,
-                        this._pseudo                    
-                    ],
-                    arg         = null,
-                    i           = 0,
-                    len         = args.length,
-                    elementName,
-                    line,
-                    col,
-                    part;
-                    
-                line = tokenStream.LT(1).startLine;
-                col = tokenStream.LT(1).startCol;
-                
-                while(i < len && arg === null){
-                    
-                    arg = args[i].call(this);
-                    i++;
-                }
-                
-                //must be a negation arg
-                if (arg === null){
-                    this._unexpectedToken(tokenStream.LT(1));
-                }
- 
-                //it's an element name
-                if (arg.type == "elementName"){
-                    part = new SelectorPart(arg, [], arg.toString(), line, col);
-                } else {
-                    part = new SelectorPart(null, [arg], arg.toString(), line, col);
-                }
-                
-                return part;                
-            },
-            
-            _declaration: function(){
-            
-                /*
-                 * declaration
-                 *   : property ':' S* expr prio?
-                 *   | /( empty )/
-                 *   ;     
-                 */    
-            
-                var tokenStream = this._tokenStream,
-                    property    = null,
-                    expr        = null,
-                    prio        = null,
-                    error       = null,
-                    invalid     = null;
-                
-                property = this._property();
-                if (property !== null){
-
-                    tokenStream.mustMatch(Tokens.COLON);
-                    this._readWhitespace();
-                    
-                    expr = this._expr();
-                    
-                    //if there's no parts for the value, it's an error
-                    if (!expr || expr.length === 0){
-                        this._unexpectedToken(tokenStream.LT(1));
-                    }
-                    
-                    prio = this._prio();
-                    
-                    try {
-                        this._validateProperty(property, expr);
-                    } catch (ex) {
-                        invalid = ex;
-                    }
-                    
-                    this.fire({
-                        type:       "property",
-                        property:   property,
-                        value:      expr,
-                        important:  prio,
-                        line:       property.line,
-                        col:        property.col,
-                        invalid:    invalid
-                    });                      
-                    
-                    return true;
-                } else {
-                    return false;
-                }
-            },
-            
-            _prio: function(){
-                /*
-                 * prio
-                 *   : IMPORTANT_SYM S*
-                 *   ;    
-                 */
-                 
-                var tokenStream = this._tokenStream,
-                    result      = tokenStream.match(Tokens.IMPORTANT_SYM);
-                    
-                this._readWhitespace();
-                return result;
-            },
-            
-            _expr: function(){
-                /*
-                 * expr
-                 *   : term [ operator term ]*
-                 *   ;
-                 */
-        
-                var tokenStream = this._tokenStream,
-                    values      = [],
-					//valueParts	= [],
-                    value       = null,
-                    operator    = null;
-                    
-                value = this._term();
-                if (value !== null){
-                
-                    values.push(value);
-                    
-                    do {
-                        operator = this._operator();
-        
-                        //if there's an operator, keep building up the value parts
-                        if (operator){
-                            values.push(operator);
-                        } /*else {
-                            //if there's not an operator, you have a full value
-							values.push(new PropertyValue(valueParts, valueParts[0].line, valueParts[0].col));
-							valueParts = [];
-						}*/
-                        
-                        value = this._term();
-                        
-                        if (value === null){
-                            break;
-                        } else {
-                            values.push(value);
-                        }
-                    } while(true);
-                }
-				
-				//cleanup
-                /*if (valueParts.length){
-                    values.push(new PropertyValue(valueParts, valueParts[0].line, valueParts[0].col));
-                }*/
-        
-                return values.length > 0 ? new PropertyValue(values, values[0].line, values[0].col) : null;
-            },
-            
-            _term: function(){                       
-            
-                /*
-                 * term
-                 *   : unary_operator?
-                 *     [ NUMBER S* | PERCENTAGE S* | LENGTH S* | ANGLE S* |
-                 *       TIME S* | FREQ S* | function | ie_function ]
-                 *   | STRING S* | IDENT S* | URI S* | UNICODERANGE S* | hexcolor
-                 *   ;
-                 */    
-        
-                var tokenStream = this._tokenStream,
-                    unary       = null,
-                    value       = null,
-                    token,
-                    line,
-                    col;
-                    
-                //returns the operator or null
-                unary = this._unary_operator();
-                if (unary !== null){
-                    line = tokenStream.token().startLine;
-                    col = tokenStream.token().startCol;
-                }                
-               
-                //exception for IE filters
-                if (tokenStream.peek() == Tokens.IE_FUNCTION && this.options.ieFilters){
-                
-                    value = this._ie_function();
-                    if (unary === null){
-                        line = tokenStream.token().startLine;
-                        col = tokenStream.token().startCol;
-                    }
-                
-                //see if there's a simple match
-                } else if (tokenStream.match([Tokens.NUMBER, Tokens.PERCENTAGE, Tokens.LENGTH,
-                        Tokens.ANGLE, Tokens.TIME,
-                        Tokens.FREQ, Tokens.STRING, Tokens.IDENT, Tokens.URI, Tokens.UNICODE_RANGE])){
-                 
-                    value = tokenStream.token().value;
-                    if (unary === null){
-                        line = tokenStream.token().startLine;
-                        col = tokenStream.token().startCol;
-                    }
-                    this._readWhitespace();
-                } else {
-                
-                    //see if it's a color
-                    token = this._hexcolor();
-                    if (token === null){
-                    
-                        //if there's no unary, get the start of the next token for line/col info
-                        if (unary === null){
-                            line = tokenStream.LT(1).startLine;
-                            col = tokenStream.LT(1).startCol;
-                        }                    
-                    
-                        //has to be a function
-                        if (value === null){
-                            
-                            /*
-                             * This checks for alpha(opacity=0) style of IE
-                             * functions. IE_FUNCTION only presents progid: style.
-                             */
-                            if (tokenStream.LA(3) == Tokens.EQUALS && this.options.ieFilters){
-                                value = this._ie_function();
-                            } else {
-                                value = this._function();
-                            }
-                        }
-
-                        /*if (value === null){
-                            return null;
-                            //throw new Error("Expected identifier at line " + tokenStream.token().startLine + ", character " +  tokenStream.token().startCol + ".");
-                        }*/
-                    
-                    } else {
-                        value = token.value;
-                        if (unary === null){
-                            line = token.startLine;
-                            col = token.startCol;
-                        }                    
-                    }
-                
-                }                
-                
-                return value !== null ?
-                        new PropertyValuePart(unary !== null ? unary + value : value, line, col) :
-                        null;
-        
-            },
-            
-            _function: function(){
-            
-                /*
-                 * function
-                 *   : FUNCTION S* expr ')' S*
-                 *   ;
-                 */
-                 
-                var tokenStream = this._tokenStream,
-                    functionText = null,
-                    expr        = null,
-                    lt;
-                    
-                if (tokenStream.match(Tokens.FUNCTION)){
-                    functionText = tokenStream.token().value;
-                    this._readWhitespace();
-                    expr = this._expr();
-                    functionText += expr;
-                    
-                    //START: Horrible hack in case it's an IE filter
-                    if (this.options.ieFilters && tokenStream.peek() == Tokens.EQUALS){
-                        do {
-                        
-                            if (this._readWhitespace()){
-                                functionText += tokenStream.token().value;
-                            }
-                            
-                            //might be second time in the loop
-                            if (tokenStream.LA(0) == Tokens.COMMA){
-                                functionText += tokenStream.token().value;
-                            }
-                        
-                            tokenStream.match(Tokens.IDENT);
-                            functionText += tokenStream.token().value;
-                            
-                            tokenStream.match(Tokens.EQUALS);
-                            functionText += tokenStream.token().value;
-                            
-                            //functionText += this._term();
-                            lt = tokenStream.peek();
-                            while(lt != Tokens.COMMA && lt != Tokens.S && lt != Tokens.RPAREN){
-                                tokenStream.get();
-                                functionText += tokenStream.token().value;
-                                lt = tokenStream.peek();
-                            }
-                        } while(tokenStream.match([Tokens.COMMA, Tokens.S]));
-                    }
-
-                    //END: Horrible Hack
-                    
-                    tokenStream.match(Tokens.RPAREN);    
-                    functionText += ")";
-                    this._readWhitespace();
-                }                
-                
-                return functionText;
-            }, 
-            
-            _ie_function: function(){
-            
-                /* (My own extension)
-                 * ie_function
-                 *   : IE_FUNCTION S* IDENT '=' term [S* ','? IDENT '=' term]+ ')' S*
-                 *   ;
-                 */
-                 
-                var tokenStream = this._tokenStream,
-                    functionText = null,
-                    expr        = null,
-                    lt;
-                    
-                //IE function can begin like a regular function, too
-                if (tokenStream.match([Tokens.IE_FUNCTION, Tokens.FUNCTION])){
-                    functionText = tokenStream.token().value;
-                    
-                    do {
-                    
-                        if (this._readWhitespace()){
-                            functionText += tokenStream.token().value;
-                        }
-                        
-                        //might be second time in the loop
-                        if (tokenStream.LA(0) == Tokens.COMMA){
-                            functionText += tokenStream.token().value;
-                        }
-                    
-                        tokenStream.match(Tokens.IDENT);
-                        functionText += tokenStream.token().value;
-                        
-                        tokenStream.match(Tokens.EQUALS);
-                        functionText += tokenStream.token().value;
-                        
-                        //functionText += this._term();
-                        lt = tokenStream.peek();
-                        while(lt != Tokens.COMMA && lt != Tokens.S && lt != Tokens.RPAREN){
-                            tokenStream.get();
-                            functionText += tokenStream.token().value;
-                            lt = tokenStream.peek();
-                        }
-                    } while(tokenStream.match([Tokens.COMMA, Tokens.S]));                    
-                    
-                    tokenStream.match(Tokens.RPAREN);    
-                    functionText += ")";
-                    this._readWhitespace();
-                }                
-                
-                return functionText;
-            }, 
-            
-            _hexcolor: function(){
-                /*
-                 * There is a constraint on the color that it must
-                 * have either 3 or 6 hex-digits (i.e., [0-9a-fA-F])
-                 * after the "#"; e.g., "#000" is OK, but "#abcd" is not.
-                 *
-                 * hexcolor
-                 *   : HASH S*
-                 *   ;
-                 */
-                 
-                var tokenStream = this._tokenStream,
-                    token = null,
-                    color;
-                    
-                if(tokenStream.match(Tokens.HASH)){
-                
-                    //need to do some validation here
-                    
-                    token = tokenStream.token();
-                    color = token.value;
-                    if (!/#[a-f0-9]{3,6}/i.test(color)){
-                        throw new SyntaxError("Expected a hex color but found '" + color + "' at line " + token.startLine + ", col " + token.startCol + ".", token.startLine, token.startCol);
-                    }
-                    this._readWhitespace();
-                }
-                
-                return token;
-            },
-            
-            //-----------------------------------------------------------------
-            // Animations methods
-            //-----------------------------------------------------------------
-            
-            _keyframes: function(){
-            
-                /*
-                 * keyframes:
-                 *   : KEYFRAMES_SYM S* keyframe_name S* '{' S* keyframe_rule* '}' {
-                 *   ;
-                 */
-                var tokenStream = this._tokenStream,
-                    token,
-                    tt,
-                    name;            
-                    
-                tokenStream.mustMatch(Tokens.KEYFRAMES_SYM);
-                this._readWhitespace();
-                name = this._keyframe_name();
-                
-                this._readWhitespace();
-                tokenStream.mustMatch(Tokens.LBRACE);
-                    
-                this.fire({
-                    type:   "startkeyframes",
-                    name:   name,
-                    line:   name.line,
-                    col:    name.col
-                });                
-                
-                this._readWhitespace();
-                tt = tokenStream.peek();
-                
-                //check for key
-                while(tt == Tokens.IDENT || tt == Tokens.PERCENTAGE) {
-                    this._keyframe_rule();
-                    this._readWhitespace();
-                    tt = tokenStream.peek();
-                }           
-                
-                this.fire({
-                    type:   "endkeyframes",
-                    name:   name,
-                    line:   name.line,
-                    col:    name.col
-                });                      
-                    
-                this._readWhitespace();
-                tokenStream.mustMatch(Tokens.RBRACE);                    
-                
-            },
-            
-            _keyframe_name: function(){
-            
-                /*
-                 * keyframe_name:
-                 *   : IDENT
-                 *   | STRING
-                 *   ;
-                 */
-                var tokenStream = this._tokenStream,
-                    token;
-
-                tokenStream.mustMatch([Tokens.IDENT, Tokens.STRING]);
-                return SyntaxUnit.fromToken(tokenStream.token());            
-            },
-            
-            _keyframe_rule: function(){
-            
-                /*
-                 * keyframe_rule:
-                 *   : key_list S* 
-                 *     '{' S* declaration [ ';' S* declaration ]* '}' S*
-                 *   ;
-                 */
-                var tokenStream = this._tokenStream,
-                    token,
-                    keyList = this._key_list();
-                                    
-                this.fire({
-                    type:   "startkeyframerule",
-                    keys:   keyList,
-                    line:   keyList[0].line,
-                    col:    keyList[0].col
-                });                
-                
-                this._readDeclarations(true);                
-                
-                this.fire({
-                    type:   "endkeyframerule",
-                    keys:   keyList,
-                    line:   keyList[0].line,
-                    col:    keyList[0].col
-                });  
-                
-            },
-            
-            _key_list: function(){
-            
-                /*
-                 * key_list:
-                 *   : key [ S* ',' S* key]*
-                 *   ;
-                 */
-                var tokenStream = this._tokenStream,
-                    token,
-                    key,
-                    keyList = [];
-                    
-                //must be least one key
-                keyList.push(this._key());
-                    
-                this._readWhitespace();
-                    
-                while(tokenStream.match(Tokens.COMMA)){
-                    this._readWhitespace();
-                    keyList.push(this._key());
-                    this._readWhitespace();
-                }
-
-                return keyList;
-            },
-                        
-            _key: function(){
-                /*
-                 * There is a restriction that IDENT can be only "from" or "to".
-                 *
-                 * key
-                 *   : PERCENTAGE
-                 *   | IDENT
-                 *   ;
-                 */
-                 
-                var tokenStream = this._tokenStream,
-                    token;
-                    
-                if (tokenStream.match(Tokens.PERCENTAGE)){
-                    return SyntaxUnit.fromToken(tokenStream.token());
-                } else if (tokenStream.match(Tokens.IDENT)){
-                    token = tokenStream.token();                    
-                    
-                    if (/from|to/i.test(token.value)){
-                        return SyntaxUnit.fromToken(token);
-                    }
-                    
-                    tokenStream.unget();
-                }
-                
-                //if it gets here, there wasn't a valid token, so time to explode
-                this._unexpectedToken(tokenStream.LT(1));
-            },
-            
-            //-----------------------------------------------------------------
-            // Helper methods
-            //-----------------------------------------------------------------
-            
-            /**
-             * Not part of CSS grammar, but useful for skipping over
-             * combination of white space and HTML-style comments.
-             * @return {void}
-             * @method _skipCruft
-             * @private
-             */
-            _skipCruft: function(){
-                while(this._tokenStream.match([Tokens.S, Tokens.CDO, Tokens.CDC])){
-                    //noop
-                }
-            },
-
-            /**
-             * Not part of CSS grammar, but this pattern occurs frequently
-             * in the official CSS grammar. Split out here to eliminate
-             * duplicate code.
-             * @param {Boolean} checkStart Indicates if the rule should check
-             *      for the left brace at the beginning.
-             * @param {Boolean} readMargins Indicates if the rule should check
-             *      for margin patterns.
-             * @return {void}
-             * @method _readDeclarations
-             * @private
-             */
-            _readDeclarations: function(checkStart, readMargins){
-                /*
-                 * Reads the pattern
-                 * S* '{' S* declaration [ ';' S* declaration ]* '}' S*
-                 * or
-                 * S* '{' S* [ declaration | margin ]? [ ';' S* [ declaration | margin ]? ]* '}' S*
-                 * Note that this is how it is described in CSS3 Paged Media, but is actually incorrect.
-                 * A semicolon is only necessary following a delcaration is there's another declaration
-                 * or margin afterwards. 
-                 */
-                var tokenStream = this._tokenStream,
-                    tt;
-                       
-
-                this._readWhitespace();
-                
-                if (checkStart){
-                    tokenStream.mustMatch(Tokens.LBRACE);            
-                }
-                
-                this._readWhitespace();
-
-                try {
-                    
-                    while(true){
-                    
-                        if (tokenStream.match(Tokens.SEMICOLON) || (readMargins && this._margin())){
-                            //noop
-                        } else if (this._declaration()){
-                            if (!tokenStream.match(Tokens.SEMICOLON)){
-                                break;
-                            }
-                        } else {
-                            break;
-                        }
-                    
-                        //if ((!this._margin() && !this._declaration()) || !tokenStream.match(Tokens.SEMICOLON)){
-                        //    break;
-                        //}
-                        this._readWhitespace();
-                    }
-                    
-                    tokenStream.mustMatch(Tokens.RBRACE);
-                    this._readWhitespace();
-                    
-                } catch (ex) {
-                    if (ex instanceof SyntaxError && !this.options.strict){
-                    
-                        //fire error event
-                        this.fire({
-                            type:       "error",
-                            error:      ex,
-                            message:    ex.message,
-                            line:       ex.line,
-                            col:        ex.col
-                        });                          
-                        
-                        //see if there's another declaration
-                        tt = tokenStream.advance([Tokens.SEMICOLON, Tokens.RBRACE]);
-                        if (tt == Tokens.SEMICOLON){
-                            //if there's a semicolon, then there might be another declaration
-                            this._readDeclarations(false, readMargins);                            
-                        } else if (tt != Tokens.RBRACE){
-                            //if there's a right brace, the rule is finished so don't do anything
-                            //otherwise, rethrow the error because it wasn't handled properly
-                            throw ex;
-                        }                        
-                        
-                    } else {
-                        //not a syntax error, rethrow it
-                        throw ex;
-                    }
-                }    
-            
-            },      
-            
-            /**
-             * In some cases, you can end up with two white space tokens in a
-             * row. Instead of making a change in every function that looks for
-             * white space, this function is used to match as much white space
-             * as necessary.
-             * @method _readWhitespace
-             * @return {String} The white space if found, empty string if not.
-             * @private
-             */
-            _readWhitespace: function(){
-            
-                var tokenStream = this._tokenStream,
-                    ws = "";
-                    
-                while(tokenStream.match(Tokens.S)){
-                    ws += tokenStream.token().value;
-                }
-                
-                return ws;
-            },
-          
-
-            /**
-             * Throws an error when an unexpected token is found.
-             * @param {Object} token The token that was found.
-             * @method _unexpectedToken
-             * @return {void}
-             * @private
-             */
-            _unexpectedToken: function(token){
-                throw new SyntaxError("Unexpected token '" + token.value + "' at line " + token.startLine + ", col " + token.startCol + ".", token.startLine, token.startCol);
-            },
-            
-            /**
-             * Helper method used for parsing subparts of a style sheet.
-             * @return {void}
-             * @method _verifyEnd
-             * @private
-             */
-            _verifyEnd: function(){
-                if (this._tokenStream.LA(1) != Tokens.EOF){
-                    this._unexpectedToken(this._tokenStream.LT(1));
-                }            
-            },
-            
-            //-----------------------------------------------------------------
-            // Validation methods
-            //-----------------------------------------------------------------
-            _validateProperty: function(property, value){
-                Validation.validate(property, value);
-            },
-            
-            //-----------------------------------------------------------------
-            // Parsing methods
-            //-----------------------------------------------------------------
-            
-            parse: function(input){    
-                this._tokenStream = new TokenStream(input, Tokens);
-                this._stylesheet();
-            },
-            
-            parseStyleSheet: function(input){
-                //just passthrough
-                return this.parse(input);
-            },
-            
-            parseMediaQuery: function(input){
-                this._tokenStream = new TokenStream(input, Tokens);
-                var result = this._media_query();
-                
-                //if there's anything more, then it's an invalid selector
-                this._verifyEnd();
-                
-                //otherwise return result
-                return result;            
-            },
-            
-            /**
-             * Parses a property value (everything after the semicolon).
-             * @return {parserlib.css.PropertyValue} The property value.
-             * @throws parserlib.util.SyntaxError If an unexpected token is found.
-             * @method parserPropertyValue
-             */             
-            parsePropertyValue: function(input){
-            
-                this._tokenStream = new TokenStream(input, Tokens);
-                this._readWhitespace();
-                
-                var result = this._expr();
-                
-                //okay to have a trailing white space
-                this._readWhitespace();
-                
-                //if there's anything more, then it's an invalid selector
-                this._verifyEnd();
-                
-                //otherwise return result
-                return result;
-            },
-            
-            /**
-             * Parses a complete CSS rule, including selectors and
-             * properties.
-             * @param {String} input The text to parser.
-             * @return {Boolean} True if the parse completed successfully, false if not.
-             * @method parseRule
-             */
-            parseRule: function(input){
-                this._tokenStream = new TokenStream(input, Tokens);
-                
-                //skip any leading white space
-                this._readWhitespace();
-                
-                var result = this._ruleset();
-                
-                //skip any trailing white space
-                this._readWhitespace();
-
-                //if there's anything more, then it's an invalid selector
-                this._verifyEnd();
-                
-                //otherwise return result
-                return result;            
-            },
-            
-            /**
-             * Parses a single CSS selector (no comma)
-             * @param {String} input The text to parse as a CSS selector.
-             * @return {Selector} An object representing the selector.
-             * @throws parserlib.util.SyntaxError If an unexpected token is found.
-             * @method parseSelector
-             */
-            parseSelector: function(input){
-            
-                this._tokenStream = new TokenStream(input, Tokens);
-                
-                //skip any leading white space
-                this._readWhitespace();
-                
-                var result = this._selector();
-                
-                //skip any trailing white space
-                this._readWhitespace();
-
-                //if there's anything more, then it's an invalid selector
-                this._verifyEnd();
-                
-                //otherwise return result
-                return result;
-            },
-
-            /**
-             * Parses an HTML style attribute: a set of CSS declarations 
-             * separated by semicolons.
-             * @param {String} input The text to parse as a style attribute
-             * @return {void} 
-             * @method parseStyleAttribute
-             */
-            parseStyleAttribute: function(input){
-                input += "}"; // for error recovery in _readDeclarations()
-                this._tokenStream = new TokenStream(input, Tokens);
-                this._readDeclarations();
-            }
-        };
-        
-    //copy over onto prototype
-    for (prop in additions){
-        if (additions.hasOwnProperty(prop)){
-            proto[prop] = additions[prop];
-        }
-    }   
-    
-    return proto;
-}();
-
-
-/*
-nth
-  : S* [ ['-'|'+']? INTEGER? {N} [ S* ['-'|'+'] S* INTEGER ]? |
-         ['-'|'+']? INTEGER | {O}{D}{D} | {E}{V}{E}{N} ] S*
-  ;
-*/
-/*global Validation, ValidationTypes, ValidationError*/
-var Properties = {
-
-    //A
-    "alignment-adjust"              : "auto | baseline | before-edge | text-before-edge | middle | central | after-edge | text-after-edge | ideographic | alphabetic | hanging | mathematical | <percentage> | <length>",
-    "alignment-baseline"            : "baseline | use-script | before-edge | text-before-edge | after-edge | text-after-edge | central | middle | ideographic | alphabetic | hanging | mathematical",
-    "animation"                     : 1,
-    "animation-delay"               : { multi: "<time>", comma: true },
-    "animation-direction"           : { multi: "normal | alternate", comma: true },
-    "animation-duration"            : { multi: "<time>", comma: true },
-    "animation-iteration-count"     : { multi: "<number> | infinite", comma: true },
-    "animation-name"                : { multi: "none | <ident>", comma: true },
-    "animation-play-state"          : { multi: "running | paused", comma: true },
-    "animation-timing-function"     : 1,
-    
-    //vendor prefixed
-    "-moz-animation-delay"               : { multi: "<time>", comma: true },
-    "-moz-animation-direction"           : { multi: "normal | alternate", comma: true },
-    "-moz-animation-duration"            : { multi: "<time>", comma: true },
-    "-moz-animation-iteration-count"     : { multi: "<number> | infinite", comma: true },
-    "-moz-animation-name"                : { multi: "none | <ident>", comma: true },
-    "-moz-animation-play-state"          : { multi: "running | paused", comma: true },
-    
-    "-ms-animation-delay"               : { multi: "<time>", comma: true },
-    "-ms-animation-direction"           : { multi: "normal | alternate", comma: true },
-    "-ms-animation-duration"            : { multi: "<time>", comma: true },
-    "-ms-animation-iteration-count"     : { multi: "<number> | infinite", comma: true },
-    "-ms-animation-name"                : { multi: "none | <ident>", comma: true },
-    "-ms-animation-play-state"          : { multi: "running | paused", comma: true },
-    
-    "-webkit-animation-delay"               : { multi: "<time>", comma: true },
-    "-webkit-animation-direction"           : { multi: "normal | alternate", comma: true },
-    "-webkit-animation-duration"            : { multi: "<time>", comma: true },
-    "-webkit-animation-iteration-count"     : { multi: "<number> | infinite", comma: true },
-    "-webkit-animation-name"                : { multi: "none | <ident>", comma: true },
-    "-webkit-animation-play-state"          : { multi: "running | paused", comma: true },
-    
-    "-o-animation-delay"               : { multi: "<time>", comma: true },
-    "-o-animation-direction"           : { multi: "normal | alternate", comma: true },
-    "-o-animation-duration"            : { multi: "<time>", comma: true },
-    "-o-animation-iteration-count"     : { multi: "<number> | infinite", comma: true },
-    "-o-animation-name"                : { multi: "none | <ident>", comma: true },
-    "-o-animation-play-state"          : { multi: "running | paused", comma: true },        
-    
-    "appearance"                    : "icon | window | desktop | workspace | document | tooltip | dialog | button | push-button | hyperlink | radio-button | checkbox | menu-item | tab | menu | menubar | pull-down-menu | pop-up-menu | list-menu | radio-group | checkbox-group | outline-tree | range | field | combo-box | signature | password | normal | inherit",
-    "azimuth"                       : function (expression) {
-        var simple      = "<angle> | leftwards | rightwards | inherit",
-            direction   = "left-side | far-left | left | center-left | center | center-right | right | far-right | right-side",
-            behind      = false,
-            valid       = false,
-            part;
-        
-        if (!ValidationTypes.isAny(expression, simple)) {
-            if (ValidationTypes.isAny(expression, "behind")) {
-                behind = true;
-                valid = true;
-            }
-            
-            if (ValidationTypes.isAny(expression, direction)) {
-                valid = true;
-                if (!behind) {
-                    ValidationTypes.isAny(expression, "behind");
-                }
-            }
-        }
-        
-        if (expression.hasNext()) {
-            part = expression.next();
-            if (valid) {
-                throw new ValidationError("Expected end of value but found '" + part + "'.", part.line, part.col);
-            } else {
-                throw new ValidationError("Expected (<'azimuth'>) but found '" + part + "'.", part.line, part.col);
-            }
-        }        
-    },
-    
-    //B
-    "backface-visibility"           : "visible | hidden",
-    "background"                    : 1,
-    "background-attachment"         : { multi: "<attachment>", comma: true },
-    "background-clip"               : { multi: "<box>", comma: true },
-    "background-color"              : "<color> | inherit",
-    "background-image"              : { multi: "<bg-image>", comma: true },
-    "background-origin"             : { multi: "<box>", comma: true },
-    "background-position"           : { multi: "<bg-position>", comma: true },
-    "background-repeat"             : { multi: "<repeat-style>" },
-    "background-size"               : { multi: "<bg-size>", comma: true },
-    "baseline-shift"                : "baseline | sub | super | <percentage> | <length>",
-    "binding"                       : 1,
-    "bleed"                         : "<length>",
-    "bookmark-label"                : "<content> | <attr> | <string>",
-    "bookmark-level"                : "none | <integer>",
-    "bookmark-state"                : "open | closed",
-    "bookmark-target"               : "none | <uri> | <attr>",
-    "border"                        : "<border-width> || <border-style> || <color>",
-    "border-bottom"                 : "<border-width> || <border-style> || <color>",
-    "border-bottom-color"           : "<color>",
-    "border-bottom-left-radius"     :  "<x-one-radius>",
-    "border-bottom-right-radius"    :  "<x-one-radius>",
-    "border-bottom-style"           : "<border-style>",
-    "border-bottom-width"           : "<border-width>",
-    "border-collapse"               : "collapse | separate | inherit",
-    "border-color"                  : { multi: "<color> | inherit", max: 4 },
-    "border-image"                  : 1,
-    "border-image-outset"           : { multi: "<length> | <number>", max: 4 },
-    "border-image-repeat"           : { multi: "stretch | repeat | round", max: 2 },
-    "border-image-slice"            : function(expression) {
-        
-        var valid   = false,
-            numeric = "<number> | <percentage>",
-            fill    = false,
-            count   = 0,
-            max     = 4,
-            part;
-        
-        if (ValidationTypes.isAny(expression, "fill")) {
-            fill = true;
-            valid = true;
-        }
-        
-        while (expression.hasNext() && count < max) {
-            valid = ValidationTypes.isAny(expression, numeric);
-            if (!valid) {
-                break;
-            }
-            count++;
-        }
-        
-        
-        if (!fill) {
-            ValidationTypes.isAny(expression, "fill");
-        } else {
-            valid = true;
-        }
-        
-        if (expression.hasNext()) {
-            part = expression.next();
-            if (valid) {
-                throw new ValidationError("Expected end of value but found '" + part + "'.", part.line, part.col);
-            } else {
-                throw new ValidationError("Expected ([<number> | <percentage>]{1,4} && fill?) but found '" + part + "'.", part.line, part.col);
-            }
-        }         
-    },
-    "border-image-source"           : "<image> | none",
-    "border-image-width"            : { multi: "<length> | <percentage> | <number> | auto", max: 4 },
-    "border-left"                   : "<border-width> || <border-style> || <color>",
-    "border-left-color"             : "<color> | inherit",
-    "border-left-style"             : "<border-style>",
-    "border-left-width"             : "<border-width>",
-    "border-radius"                 : function(expression) {
-        
-        var valid   = false,
-            numeric = "<length> | <percentage>",
-            slash   = false,
-            fill    = false,
-            count   = 0,
-            max     = 8,
-            part;
-
-        while (expression.hasNext() && count < max) {
-            valid = ValidationTypes.isAny(expression, numeric);
-            if (!valid) {
-            
-                if (expression.peek() == "/" && count > 1 && !slash) {
-                    slash = true;
-                    max = count + 5;
-                    expression.next();
-                } else {
-                    break;
-                }
-            }
-            count++;
-        }
-        
-        if (expression.hasNext()) {
-            part = expression.next();
-            if (valid) {
-                throw new ValidationError("Expected end of value but found '" + part + "'.", part.line, part.col);
-            } else {
-                throw new ValidationError("Expected (<'border-radius'>) but found '" + part + "'.", part.line, part.col);
-            }
-        }         
-    },
-    "border-right"                  : "<border-width> || <border-style> || <color>",
-    "border-right-color"            : "<color> | inherit",
-    "border-right-style"            : "<border-style>",
-    "border-right-width"            : "<border-width>",
-    "border-spacing"                : { multi: "<length> | inherit", max: 2 },
-    "border-style"                  : { multi: "<border-style>", max: 4 },
-    "border-top"                    : "<border-width> || <border-style> || <color>",
-    "border-top-color"              : "<color> | inherit",
-    "border-top-left-radius"        : "<x-one-radius>",
-    "border-top-right-radius"       : "<x-one-radius>",
-    "border-top-style"              : "<border-style>",
-    "border-top-width"              : "<border-width>",
-    "border-width"                  : { multi: "<border-width>", max: 4 },
-    "bottom"                        : "<margin-width> | inherit", 
-    "box-align"                     : "start | end | center | baseline | stretch",        //http://www.w3.org/TR/2009/WD-css3-flexbox-20090723/
-    "box-decoration-break"          : "slice |clone",
-    "box-direction"                 : "normal | reverse | inherit",
-    "box-flex"                      : "<number>",
-    "box-flex-group"                : "<integer>",
-    "box-lines"                     : "single | multiple",
-    "box-ordinal-group"             : "<integer>",
-    "box-orient"                    : "horizontal | vertical | inline-axis | block-axis | inherit",
-    "box-pack"                      : "start | end | center | justify",
-    "box-shadow"                    : function (expression) {
-        var result      = false,
-            part;
-
-        if (!ValidationTypes.isAny(expression, "none")) {
-            Validation.multiProperty("<shadow>", expression, true, Infinity);                       
-        } else {
-            if (expression.hasNext()) {
-                part = expression.next();
-                throw new ValidationError("Expected end of value but found '" + part + "'.", part.line, part.col);
-            }   
-        }
-    },
-    "box-sizing"                    : "content-box | border-box | inherit",
-    "break-after"                   : "auto | always | avoid | left | right | page | column | avoid-page | avoid-column",
-    "break-before"                  : "auto | always | avoid | left | right | page | column | avoid-page | avoid-column",
-    "break-inside"                  : "auto | avoid | avoid-page | avoid-column",
-    
-    //C
-    "caption-side"                  : "top | bottom | inherit",
-    "clear"                         : "none | right | left | both | inherit",
-    "clip"                          : 1,
-    "color"                         : "<color> | inherit",
-    "color-profile"                 : 1,
-    "column-count"                  : "<integer> | auto",                      //http://www.w3.org/TR/css3-multicol/
-    "column-fill"                   : "auto | balance",
-    "column-gap"                    : "<length> | normal",
-    "column-rule"                   : "<border-width> || <border-style> || <color>",
-    "column-rule-color"             : "<color>",
-    "column-rule-style"             : "<border-style>",
-    "column-rule-width"             : "<border-width>",
-    "column-span"                   : "none | all",
-    "column-width"                  : "<length> | auto",
-    "columns"                       : 1,
-    "content"                       : 1,
-    "counter-increment"             : 1,
-    "counter-reset"                 : 1,
-    "crop"                          : "<shape> | auto",
-    "cue"                           : "cue-after | cue-before | inherit",
-    "cue-after"                     : 1,
-    "cue-before"                    : 1,
-    "cursor"                        : 1,
-    
-    //D
-    "direction"                     : "ltr | rtl | inherit",
-    "display"                       : "inline | block | list-item | inline-block | table | inline-table | table-row-group | table-header-group | table-footer-group | table-row | table-column-group | table-column | table-cell | table-caption | box | inline-box | grid | inline-grid | none | inherit",
-    "dominant-baseline"             : 1,
-    "drop-initial-after-adjust"     : "central | middle | after-edge | text-after-edge | ideographic | alphabetic | mathematical | <percentage> | <length>",
-    "drop-initial-after-align"      : "baseline | use-script | before-edge | text-before-edge | after-edge | text-after-edge | central | middle | ideographic | alphabetic | hanging | mathematical",
-    "drop-initial-before-adjust"    : "before-edge | text-before-edge | central | middle | hanging | mathematical | <percentage> | <length>",
-    "drop-initial-before-align"     : "caps-height | baseline | use-script | before-edge | text-before-edge | after-edge | text-after-edge | central | middle | ideographic | alphabetic | hanging | mathematical",
-    "drop-initial-size"             : "auto | line | <length> | <percentage>",
-    "drop-initial-value"            : "initial | <integer>",
-    
-    //E
-    "elevation"                     : "<angle> | below | level | above | higher | lower | inherit",
-    "empty-cells"                   : "show | hide | inherit",
-    
-    //F
-    "filter"                        : 1,
-    "fit"                           : "fill | hidden | meet | slice",
-    "fit-position"                  : 1,
-    "float"                         : "left | right | none | inherit",    
-    "float-offset"                  : 1,
-    "font"                          : 1,
-    "font-family"                   : 1,
-    "font-size"                     : "<absolute-size> | <relative-size> | <length> | <percentage> | inherit",
-    "font-size-adjust"              : "<number> | none | inherit",
-    "font-stretch"                  : "normal | ultra-condensed | extra-condensed | condensed | semi-condensed | semi-expanded | expanded | extra-expanded | ultra-expanded | inherit",
-    "font-style"                    : "normal | italic | oblique | inherit",
-    "font-variant"                  : "normal | small-caps | inherit",
-    "font-weight"                   : "normal | bold | bolder | lighter | 100 | 200 | 300 | 400 | 500 | 600 | 700 | 800 | 900 | inherit",
-    
-    //G
-    "grid-cell-stacking"            : "columns | rows | layer",
-    "grid-column"                   : 1,
-    "grid-columns"                  : 1,
-    "grid-column-align"             : "start | end | center | stretch",
-    "grid-column-sizing"            : 1,
-    "grid-column-span"              : "<integer>",
-    "grid-flow"                     : "none | rows | columns",
-    "grid-layer"                    : "<integer>",
-    "grid-row"                      : 1,
-    "grid-rows"                     : 1,
-    "grid-row-align"                : "start | end | center | stretch",
-    "grid-row-span"                 : "<integer>",
-    "grid-row-sizing"               : 1,
-    
-    //H
-    "hanging-punctuation"           : 1,
-    "height"                        : "<margin-width> | inherit",
-    "hyphenate-after"               : "<integer> | auto",
-    "hyphenate-before"              : "<integer> | auto",
-    "hyphenate-character"           : "<string> | auto",
-    "hyphenate-lines"               : "no-limit | <integer>",
-    "hyphenate-resource"            : 1,
-    "hyphens"                       : "none | manual | auto",
-    
-    //I
-    "icon"                          : 1,
-    "image-orientation"             : "angle | auto",
-    "image-rendering"               : 1,
-    "image-resolution"              : 1,
-    "inline-box-align"              : "initial | last | <integer>",
-    
-    //L
-    "left"                          : "<margin-width> | inherit",
-    "letter-spacing"                : "<length> | normal | inherit",
-    "line-height"                   : "<number> | <length> | <percentage> | normal | inherit",
-    "line-break"                    : "auto | loose | normal | strict",
-    "line-stacking"                 : 1,
-    "line-stacking-ruby"            : "exclude-ruby | include-ruby",
-    "line-stacking-shift"           : "consider-shifts | disregard-shifts",
-    "line-stacking-strategy"        : "inline-line-height | block-line-height | max-height | grid-height",
-    "list-style"                    : 1,
-    "list-style-image"              : "<uri> | none | inherit",
-    "list-style-position"           : "inside | outside | inherit",
-    "list-style-type"               : "disc | circle | square | decimal | decimal-leading-zero | lower-roman | upper-roman | lower-greek | lower-latin | upper-latin | armenian | georgian | lower-alpha | upper-alpha | none | inherit",
-    
-    //M
-    "margin"                        : { multi: "<margin-width> | inherit", max: 4 },
-    "margin-bottom"                 : "<margin-width> | inherit",
-    "margin-left"                   : "<margin-width> | inherit",
-    "margin-right"                  : "<margin-width> | inherit",
-    "margin-top"                    : "<margin-width> | inherit",
-    "mark"                          : 1,
-    "mark-after"                    : 1,
-    "mark-before"                   : 1,
-    "marks"                         : 1,
-    "marquee-direction"             : 1,
-    "marquee-play-count"            : 1,
-    "marquee-speed"                 : 1,
-    "marquee-style"                 : 1,
-    "max-height"                    : "<length> | <percentage> | none | inherit",
-    "max-width"                     : "<length> | <percentage> | none | inherit",
-    "min-height"                    : "<length> | <percentage> | inherit",
-    "min-width"                     : "<length> | <percentage> | inherit",
-    "move-to"                       : 1,
-    
-    //N
-    "nav-down"                      : 1,
-    "nav-index"                     : 1,
-    "nav-left"                      : 1,
-    "nav-right"                     : 1,
-    "nav-up"                        : 1,
-    
-    //O
-    "opacity"                       : "<number> | inherit",
-    "orphans"                       : "<integer> | inherit",
-    "outline"                       : 1,
-    "outline-color"                 : "<color> | invert | inherit",
-    "outline-offset"                : 1,
-    "outline-style"                 : "<border-style> | inherit",
-    "outline-width"                 : "<border-width> | inherit",
-    "overflow"                      : "visible | hidden | scroll | auto | inherit",
-    "overflow-style"                : 1,
-    "overflow-x"                    : 1,
-    "overflow-y"                    : 1,
-    
-    //P
-    "padding"                       : { multi: "<padding-width> | inherit", max: 4 },
-    "padding-bottom"                : "<padding-width> | inherit",
-    "padding-left"                  : "<padding-width> | inherit",
-    "padding-right"                 : "<padding-width> | inherit",
-    "padding-top"                   : "<padding-width> | inherit",
-    "page"                          : 1,
-    "page-break-after"              : "auto | always | avoid | left | right | inherit",
-    "page-break-before"             : "auto | always | avoid | left | right | inherit",
-    "page-break-inside"             : "auto | avoid | inherit",
-    "page-policy"                   : 1,
-    "pause"                         : 1,
-    "pause-after"                   : 1,
-    "pause-before"                  : 1,
-    "perspective"                   : 1,
-    "perspective-origin"            : 1,
-    "phonemes"                      : 1,
-    "pitch"                         : 1,
-    "pitch-range"                   : 1,
-    "play-during"                   : 1,
-    "position"                      : "static | relative | absolute | fixed | inherit",
-    "presentation-level"            : 1,
-    "punctuation-trim"              : 1,
-    
-    //Q
-    "quotes"                        : 1,
-    
-    //R
-    "rendering-intent"              : 1,
-    "resize"                        : 1,
-    "rest"                          : 1,
-    "rest-after"                    : 1,
-    "rest-before"                   : 1,
-    "richness"                      : 1,
-    "right"                         : "<margin-width> | inherit",
-    "rotation"                      : 1,
-    "rotation-point"                : 1,
-    "ruby-align"                    : 1,
-    "ruby-overhang"                 : 1,
-    "ruby-position"                 : 1,
-    "ruby-span"                     : 1,
-    
-    //S
-    "size"                          : 1,
-    "speak"                         : "normal | none | spell-out | inherit",
-    "speak-header"                  : "once | always | inherit",
-    "speak-numeral"                 : "digits | continuous | inherit",
-    "speak-punctuation"             : "code | none | inherit",
-    "speech-rate"                   : 1,
-    "src"                           : 1,
-    "stress"                        : 1,
-    "string-set"                    : 1,
-    
-    "table-layout"                  : "auto | fixed | inherit",
-    "tab-size"                      : "<integer> | <length>",
-    "target"                        : 1,
-    "target-name"                   : 1,
-    "target-new"                    : 1,
-    "target-position"               : 1,
-    "text-align"                    : "left | right | center | justify | inherit" ,
-    "text-align-last"               : 1,
-    "text-decoration"               : 1,
-    "text-emphasis"                 : 1,
-    "text-height"                   : 1,
-    "text-indent"                   : "<length> | <percentage> | inherit",
-    "text-justify"                  : "auto | none | inter-word | inter-ideograph | inter-cluster | distribute | kashida",
-    "text-outline"                  : 1,
-    "text-overflow"                 : 1,
-    "text-shadow"                   : 1,
-    "text-transform"                : "capitalize | uppercase | lowercase | none | inherit",
-    "text-wrap"                     : "normal | none | avoid",
-    "top"                           : "<margin-width> | inherit",
-    "transform"                     : 1,
-    "transform-origin"              : 1,
-    "transform-style"               : 1,
-    "transition"                    : 1,
-    "transition-delay"              : 1,
-    "transition-duration"           : 1,
-    "transition-property"           : 1,
-    "transition-timing-function"    : 1,
-    
-    //U
-    "unicode-bidi"                  : "normal | embed | bidi-override | inherit",
-    "user-modify"                   : "read-only | read-write | write-only | inherit",
-    "user-select"                   : "none | text | toggle | element | elements | all | inherit",
-    
-    //V
-    "vertical-align"                : "<percentage> | <length> | baseline | sub | super | top | text-top | middle | bottom | text-bottom | inherit",
-    "visibility"                    : "visible | hidden | collapse | inherit",
-    "voice-balance"                 : 1,
-    "voice-duration"                : 1,
-    "voice-family"                  : 1,
-    "voice-pitch"                   : 1,
-    "voice-pitch-range"             : 1,
-    "voice-rate"                    : 1,
-    "voice-stress"                  : 1,
-    "voice-volume"                  : 1,
-    "volume"                        : 1,
-    
-    //W
-    "white-space"                   : "normal | pre | nowrap | pre-wrap | pre-line | inherit",
-    "white-space-collapse"          : 1,
-    "widows"                        : "<integer> | inherit",
-    "width"                         : "<length> | <percentage> | auto | inherit" ,
-    "word-break"                    : "normal | keep-all | break-all",
-    "word-spacing"                  : "<length> | normal | inherit",
-    "word-wrap"                     : 1,
-    
-    //Z
-    "z-index"                       : "<integer> | auto | inherit",
-    "zoom"                          : "<number> | <percentage> | normal"
-};
-/*global SyntaxUnit, Parser*/
-/**
- * Represents a selector combinator (whitespace, +, >).
- * @namespace parserlib.css
- * @class PropertyName
- * @extends parserlib.util.SyntaxUnit
- * @constructor
- * @param {String} text The text representation of the unit. 
- * @param {String} hack The type of IE hack applied ("*", "_", or null).
- * @param {int} line The line of text on which the unit resides.
- * @param {int} col The column of text on which the unit resides.
- */
-function PropertyName(text, hack, line, col){
-    
-    SyntaxUnit.call(this, text, line, col, Parser.PROPERTY_NAME_TYPE);
-
-    /**
-     * The type of IE hack applied ("*", "_", or null).
-     * @type String
-     * @property hack
-     */
-    this.hack = hack;
-
-}
-
-PropertyName.prototype = new SyntaxUnit();
-PropertyName.prototype.constructor = PropertyName;
-PropertyName.prototype.toString = function(){
-    return (this.hack ? this.hack : "") + this.text;
-};
-
-/*global SyntaxUnit, Parser*/
-/**
- * Represents a single part of a CSS property value, meaning that it represents
- * just everything single part between ":" and ";". If there are multiple values
- * separated by commas, this type represents just one of the values.
- * @param {String[]} parts An array of value parts making up this value.
- * @param {int} line The line of text on which the unit resides.
- * @param {int} col The column of text on which the unit resides.
- * @namespace parserlib.css
- * @class PropertyValue
- * @extends parserlib.util.SyntaxUnit
- * @constructor
- */
-function PropertyValue(parts, line, col){
-
-    SyntaxUnit.call(this, parts.join(" "), line, col, Parser.PROPERTY_VALUE_TYPE);
-    
-    /**
-     * The parts that make up the selector.
-     * @type Array
-     * @property parts
-     */
-    this.parts = parts;
-    
-}
-
-PropertyValue.prototype = new SyntaxUnit();
-PropertyValue.prototype.constructor = PropertyValue;
-
-
-/*global SyntaxUnit, Parser*/
-/**
- * A utility class that allows for easy iteration over the various parts of a
- * property value.
- * @param {parserlib.css.PropertyValue} value The property value to iterate over.
- * @namespace parserlib.css
- * @class PropertyValueIterator
- * @constructor
- */
-function PropertyValueIterator(value){
-
-    /** 
-     * Iterator value
-     * @type int
-     * @property _i
-     * @private
-     */
-    this._i = 0;
-    
-    /**
-     * The parts that make up the value.
-     * @type Array
-     * @property _parts
-     * @private
-     */
-    this._parts = value.parts;
-    
-    /**
-     * Keeps track of bookmarks along the way.
-     * @type Array
-     * @property _marks
-     * @private
-     */
-    this._marks = [];
-    
-    /**
-     * Holds the original property value.
-     * @type parserlib.css.PropertyValue
-     * @property value
-     */
-    this.value = value;
-    
-}
-
-/**
- * Returns the total number of parts in the value.
- * @return {int} The total number of parts in the value.
- * @method count
- */
-PropertyValueIterator.prototype.count = function(){
-    return this._parts.length;
-};
-
-/**
- * Indicates if the iterator is positioned at the first item.
- * @return {Boolean} True if positioned at first item, false if not.
- * @method isFirst
- */
-PropertyValueIterator.prototype.isFirst = function(){
-    return this._i === 0;
-};
-
-/**
- * Indicates if there are more parts of the property value.
- * @return {Boolean} True if there are more parts, false if not.
- * @method hasNext
- */
-PropertyValueIterator.prototype.hasNext = function(){
-    return (this._i < this._parts.length);
-};
-
-/**
- * Marks the current spot in the iteration so it can be restored to
- * later on.
- * @return {void}
- * @method mark
- */
-PropertyValueIterator.prototype.mark = function(){
-    this._marks.push(this._i);
-};
-
-/**
- * Returns the next part of the property value or null if there is no next
- * part. Does not move the internal counter forward.
- * @return {parserlib.css.PropertyValuePart} The next part of the property value or null if there is no next
- * part.
- * @method peek
- */
-PropertyValueIterator.prototype.peek = function(count){
-    return this.hasNext() ? this._parts[this._i + (count || 0)] : null;
-};
-
-/**
- * Returns the next part of the property value or null if there is no next
- * part.
- * @return {parserlib.css.PropertyValuePart} The next part of the property value or null if there is no next
- * part.
- * @method next
- */
-PropertyValueIterator.prototype.next = function(){
-    return this.hasNext() ? this._parts[this._i++] : null;
-};
-
-/**
- * Returns the previous part of the property value or null if there is no
- * previous part.
- * @return {parserlib.css.PropertyValuePart} The previous part of the 
- * property value or null if there is no next part.
- * @method previous
- */
-PropertyValueIterator.prototype.previous = function(){
-    return this._i > 0 ? this._parts[--this._i] : null;
-};
-
-/**
- * Restores the last saved bookmark.
- * @return {void}
- * @method restore
- */
-PropertyValueIterator.prototype.restore = function(){
-    if (this._marks.length){
-        this._i = this._marks.pop();
-    }
-};
-
-
-/*global SyntaxUnit, Parser, Colors*/
-/**
- * Represents a single part of a CSS property value, meaning that it represents
- * just one part of the data between ":" and ";".
- * @param {String} text The text representation of the unit.
- * @param {int} line The line of text on which the unit resides.
- * @param {int} col The column of text on which the unit resides.
- * @namespace parserlib.css
- * @class PropertyValuePart
- * @extends parserlib.util.SyntaxUnit
- * @constructor
- */
-function PropertyValuePart(text, line, col){
-
-    SyntaxUnit.call(this, text, line, col, Parser.PROPERTY_VALUE_PART_TYPE);
-    
-    /**
-     * Indicates the type of value unit.
-     * @type String
-     * @property type
-     */
-    this.type = "unknown";
-
-    //figure out what type of data it is
-    
-    var temp;
-    
-    //it is a measurement?
-    if (/^([+\-]?[\d\.]+)([a-z]+)$/i.test(text)){  //dimension
-        this.type = "dimension";
-        this.value = +RegExp.$1;
-        this.units = RegExp.$2;
-        
-        //try to narrow down
-        switch(this.units.toLowerCase()){
-        
-            case "em":
-            case "rem":
-            case "ex":
-            case "px":
-            case "cm":
-            case "mm":
-            case "in":
-            case "pt":
-            case "pc":
-            case "ch":
-                this.type = "length";
-                break;
-                
-            case "deg":
-            case "rad":
-            case "grad":
-                this.type = "angle";
-                break;
-            
-            case "ms":
-            case "s":
-                this.type = "time";
-                break;
-            
-            case "hz":
-            case "khz":
-                this.type = "frequency";
-                break;
-            
-            case "dpi":
-            case "dpcm":
-                this.type = "resolution";
-                break;
-                
-            //default
-                
-        }
-        
-    } else if (/^([+\-]?[\d\.]+)%$/i.test(text)){  //percentage
-        this.type = "percentage";
-        this.value = +RegExp.$1;
-    } else if (/^([+\-]?[\d\.]+)%$/i.test(text)){  //percentage
-        this.type = "percentage";
-        this.value = +RegExp.$1;
-    } else if (/^([+\-]?\d+)$/i.test(text)){  //integer
-        this.type = "integer";
-        this.value = +RegExp.$1;
-    } else if (/^([+\-]?[\d\.]+)$/i.test(text)){  //number
-        this.type = "number";
-        this.value = +RegExp.$1;
-    
-    } else if (/^#([a-f0-9]{3,6})/i.test(text)){  //hexcolor
-        this.type = "color";
-        temp = RegExp.$1;
-        if (temp.length == 3){
-            this.red    = parseInt(temp.charAt(0)+temp.charAt(0),16);
-            this.green  = parseInt(temp.charAt(1)+temp.charAt(1),16);
-            this.blue   = parseInt(temp.charAt(2)+temp.charAt(2),16);            
-        } else {
-            this.red    = parseInt(temp.substring(0,2),16);
-            this.green  = parseInt(temp.substring(2,4),16);
-            this.blue   = parseInt(temp.substring(4,6),16);            
-        }
-    } else if (/^rgb\(\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d+)\s*\)/i.test(text)){ //rgb() color with absolute numbers
-        this.type   = "color";
-        this.red    = +RegExp.$1;
-        this.green  = +RegExp.$2;
-        this.blue   = +RegExp.$3;
-    } else if (/^rgb\(\s*(\d+)%\s*,\s*(\d+)%\s*,\s*(\d+)%\s*\)/i.test(text)){ //rgb() color with percentages
-        this.type   = "color";
-        this.red    = +RegExp.$1 * 255 / 100;
-        this.green  = +RegExp.$2 * 255 / 100;
-        this.blue   = +RegExp.$3 * 255 / 100;
-    } else if (/^rgba\(\s*(\d+)\s*,\s*(\d+)\s*,\s*(\d+)\s*,\s*([\d\.]+)\s*\)/i.test(text)){ //rgba() color with absolute numbers
-        this.type   = "color";
-        this.red    = +RegExp.$1;
-        this.green  = +RegExp.$2;
-        this.blue   = +RegExp.$3;
-        this.alpha  = +RegExp.$4;
-    } else if (/^rgba\(\s*(\d+)%\s*,\s*(\d+)%\s*,\s*(\d+)%\s*,\s*([\d\.]+)\s*\)/i.test(text)){ //rgba() color with percentages
-        this.type   = "color";
-        this.red    = +RegExp.$1 * 255 / 100;
-        this.green  = +RegExp.$2 * 255 / 100;
-        this.blue   = +RegExp.$3 * 255 / 100;
-        this.alpha  = +RegExp.$4;        
-    } else if (/^hsl\(\s*(\d+)\s*,\s*(\d+)%\s*,\s*(\d+)%\s*\)/i.test(text)){ //hsl()
-        this.type   = "color";
-        this.hue    = +RegExp.$1;
-        this.saturation = +RegExp.$2 / 100;
-        this.lightness  = +RegExp.$3 / 100;        
-    } else if (/^hsla\(\s*(\d+)\s*,\s*(\d+)%\s*,\s*(\d+)%\s*,\s*([\d\.]+)\s*\)/i.test(text)){ //hsla() color with percentages
-        this.type   = "color";
-        this.hue    = +RegExp.$1;
-        this.saturation = +RegExp.$2 / 100;
-        this.lightness  = +RegExp.$3 / 100;        
-        this.alpha  = +RegExp.$4;        
-    } else if (/^url\(["']?([^\)"']+)["']?\)/i.test(text)){ //URI
-        this.type   = "uri";
-        this.uri    = RegExp.$1;
-    } else if (/^([^\(]+)\(/i.test(text)){
-        this.type   = "function";
-        this.name   = RegExp.$1;
-        this.value  = text;
-    } else if (/^["'][^"']*["']/.test(text)){    //string
-        this.type   = "string";
-        this.value  = eval(text);
-    } else if (Colors[text.toLowerCase()]){  //named color
-        this.type   = "color";
-        temp        = Colors[text.toLowerCase()].substring(1);
-        this.red    = parseInt(temp.substring(0,2),16);
-        this.green  = parseInt(temp.substring(2,4),16);
-        this.blue   = parseInt(temp.substring(4,6),16);         
-    } else if (/^[\,\/]$/.test(text)){
-        this.type   = "operator";
-        this.value  = text;
-    } else if (/^[a-z\-\u0080-\uFFFF][a-z0-9\-\u0080-\uFFFF]*$/i.test(text)){
-        this.type   = "identifier";
-        this.value  = text;
-    }
-
-}
-
-PropertyValuePart.prototype = new SyntaxUnit();
-PropertyValuePart.prototype.constructor = PropertyValuePart;
-
-/**
- * Create a new syntax unit based solely on the given token.
- * Convenience method for creating a new syntax unit when
- * it represents a single token instead of multiple.
- * @param {Object} token The token object to represent.
- * @return {parserlib.css.PropertyValuePart} The object representing the token.
- * @static
- * @method fromToken
- */
-PropertyValuePart.fromToken = function(token){
-    return new PropertyValuePart(token.value, token.startLine, token.startCol);
-};
-var Pseudos = {
-    ":first-letter": 1,
-    ":first-line":   1,
-    ":before":       1,
-    ":after":        1
-};
-
-Pseudos.ELEMENT = 1;
-Pseudos.CLASS = 2;
-
-Pseudos.isElement = function(pseudo){
-    return pseudo.indexOf("::") === 0 || Pseudos[pseudo.toLowerCase()] == Pseudos.ELEMENT;
-};
-/*global SyntaxUnit, Parser, Specificity*/
-/**
- * Represents an entire single selector, including all parts but not
- * including multiple selectors (those separated by commas).
- * @namespace parserlib.css
- * @class Selector
- * @extends parserlib.util.SyntaxUnit
- * @constructor
- * @param {Array} parts Array of selectors parts making up this selector.
- * @param {int} line The line of text on which the unit resides.
- * @param {int} col The column of text on which the unit resides.
- */
-function Selector(parts, line, col){
-    
-    SyntaxUnit.call(this, parts.join(" "), line, col, Parser.SELECTOR_TYPE);
-    
-    /**
-     * The parts that make up the selector.
-     * @type Array
-     * @property parts
-     */
-    this.parts = parts;
-    
-    /**
-     * The specificity of the selector.
-     * @type parserlib.css.Specificity
-     * @property specificity
-     */
-    this.specificity = Specificity.calculate(this);
-
-}
-
-Selector.prototype = new SyntaxUnit();
-Selector.prototype.constructor = Selector;
-
-
-/*global SyntaxUnit, Parser*/
-/**
- * Represents a single part of a selector string, meaning a single set of
- * element name and modifiers. This does not include combinators such as
- * spaces, +, >, etc.
- * @namespace parserlib.css
- * @class SelectorPart
- * @extends parserlib.util.SyntaxUnit
- * @constructor
- * @param {String} elementName The element name in the selector or null
- *      if there is no element name.
- * @param {Array} modifiers Array of individual modifiers for the element.
- *      May be empty if there are none.
- * @param {String} text The text representation of the unit. 
- * @param {int} line The line of text on which the unit resides.
- * @param {int} col The column of text on which the unit resides.
- */
-function SelectorPart(elementName, modifiers, text, line, col){
-    
-    SyntaxUnit.call(this, text, line, col, Parser.SELECTOR_PART_TYPE);
-
-    /**
-     * The tag name of the element to which this part
-     * of the selector affects.
-     * @type String
-     * @property elementName
-     */
-    this.elementName = elementName;
-    
-    /**
-     * The parts that come after the element name, such as class names, IDs,
-     * pseudo classes/elements, etc.
-     * @type Array
-     * @property modifiers
-     */
-    this.modifiers = modifiers;
-
-}
-
-SelectorPart.prototype = new SyntaxUnit();
-SelectorPart.prototype.constructor = SelectorPart;
-
-
-/*global SyntaxUnit, Parser*/
-/**
- * Represents a selector modifier string, meaning a class name, element name,
- * element ID, pseudo rule, etc.
- * @namespace parserlib.css
- * @class SelectorSubPart
- * @extends parserlib.util.SyntaxUnit
- * @constructor
- * @param {String} text The text representation of the unit. 
- * @param {String} type The type of selector modifier.
- * @param {int} line The line of text on which the unit resides.
- * @param {int} col The column of text on which the unit resides.
- */
-function SelectorSubPart(text, type, line, col){
-    
-    SyntaxUnit.call(this, text, line, col, Parser.SELECTOR_SUB_PART_TYPE);
-
-    /**
-     * The type of modifier.
-     * @type String
-     * @property type
-     */
-    this.type = type;
-    
-    /**
-     * Some subparts have arguments, this represents them.
-     * @type Array
-     * @property args
-     */
-    this.args = [];
-
-}
-
-SelectorSubPart.prototype = new SyntaxUnit();
-SelectorSubPart.prototype.constructor = SelectorSubPart;
-
-
-/*global Pseudos, SelectorPart*/
-/**
- * Represents a selector's specificity.
- * @namespace parserlib.css
- * @class Specificity
- * @constructor
- * @param {int} a Should be 1 for inline styles, zero for stylesheet styles
- * @param {int} b Number of ID selectors
- * @param {int} c Number of classes and pseudo classes
- * @param {int} d Number of element names and pseudo elements
- */
-function Specificity(a, b, c, d){
-    this.a = a;
-    this.b = b;
-    this.c = c;
-    this.d = d;
-}
-
-Specificity.prototype = {
-    constructor: Specificity,
-    
-    /**
-     * Compare this specificity to another.
-     * @param {Specificity} other The other specificity to compare to.
-     * @return {int} -1 if the other specificity is larger, 1 if smaller, 0 if equal.
-     * @method compare
-     */
-    compare: function(other){
-        var comps = ["a", "b", "c", "d"],
-            i, len;
-            
-        for (i=0, len=comps.length; i < len; i++){
-            if (this[comps[i]] < other[comps[i]]){
-                return -1;
-            } else if (this[comps[i]] > other[comps[i]]){
-                return 1;
-            }
-        }
-        
-        return 0;
-    },
-    
-    /**
-     * Creates a numeric value for the specificity.
-     * @return {int} The numeric value for the specificity.
-     * @method valueOf
-     */
-    valueOf: function(){
-        return (this.a * 1000) + (this.b * 100) + (this.c * 10) + this.d;
-    },
-    
-    /**
-     * Returns a string representation for specificity.
-     * @return {String} The string representation of specificity.
-     * @method toString
-     */
-    toString: function(){
-        return this.a + "," + this.b + "," + this.c + "," + this.d;
-    }
-
-};
-
-/**
- * Calculates the specificity of the given selector.
- * @param {parserlib.css.Selector} The selector to calculate specificity for.
- * @return {parserlib.css.Specificity} The specificity of the selector.
- * @static
- * @method calculate
- */
-Specificity.calculate = function(selector){
-
-    var i, len,
-        part,
-        b=0, c=0, d=0;
-        
-    function updateValues(part){
-    
-        var i, j, len, num,
-            elementName = part.elementName ? part.elementName.text : "",
-            modifier;
-    
-        if (elementName && elementName.charAt(elementName.length-1) != "*") {
-            d++;
-        }    
-    
-        for (i=0, len=part.modifiers.length; i < len; i++){
-            modifier = part.modifiers[i];
-            switch(modifier.type){
-                case "class":
-                case "attribute":
-                    c++;
-                    break;
-                    
-                case "id":
-                    b++;
-                    break;
-                    
-                case "pseudo":
-                    if (Pseudos.isElement(modifier.text)){
-                        d++;
-                    } else {
-                        c++;
-                    }                    
-                    break;
-                    
-                case "not":
-                    for (j=0, num=modifier.args.length; j < num; j++){
-                        updateValues(modifier.args[j]);
-                    }
-            }    
-         }
-    }
-    
-    for (i=0, len=selector.parts.length; i < len; i++){
-        part = selector.parts[i];
-        
-        if (part instanceof SelectorPart){
-            updateValues(part);                
-        }
-    }
-    
-    return new Specificity(0, b, c, d);
-};
-
-/*global Tokens, TokenStreamBase*/
-
-var h = /^[0-9a-fA-F]$/,
-    nonascii = /^[\u0080-\uFFFF]$/,
-    nl = /\n|\r\n|\r|\f/;
-
-//-----------------------------------------------------------------------------
-// Helper functions
-//-----------------------------------------------------------------------------
-
-
-function isHexDigit(c){
-    return c !== null && h.test(c);
-}
-
-function isDigit(c){
-    return c !== null && /\d/.test(c);
-}
-
-function isWhitespace(c){
-    return c !== null && /\s/.test(c);
-}
-
-function isNewLine(c){
-    return c !== null && nl.test(c);
-}
-
-function isNameStart(c){
-    return c !== null && (/[a-z_\u0080-\uFFFF\\]/i.test(c));
-}
-
-function isNameChar(c){
-    return c !== null && (isNameStart(c) || /[0-9\-\\]/.test(c));
-}
-
-function isIdentStart(c){
-    return c !== null && (isNameStart(c) || /\-\\/.test(c));
-}
-
-function mix(receiver, supplier){
-	for (var prop in supplier){
-		if (supplier.hasOwnProperty(prop)){
-			receiver[prop] = supplier[prop];
-		}
-	}
-	return receiver;
-}
-
-//-----------------------------------------------------------------------------
-// CSS Token Stream
-//-----------------------------------------------------------------------------
-
-
-/**
- * A token stream that produces CSS tokens.
- * @param {String|Reader} input The source of text to tokenize.
- * @constructor
- * @class TokenStream
- * @namespace parserlib.css
- */
-function TokenStream(input){
-	TokenStreamBase.call(this, input, Tokens);
-}
-
-TokenStream.prototype = mix(new TokenStreamBase(), {
-
-    /**
-     * Overrides the TokenStreamBase method of the same name
-     * to produce CSS tokens.
-     * @param {variant} channel The name of the channel to use
-     *      for the next token.
-     * @return {Object} A token object representing the next token.
-     * @method _getToken
-     * @private
-     */
-    _getToken: function(channel){
-
-        var c,
-            reader = this._reader,
-            token   = null,
-            startLine   = reader.getLine(),
-            startCol    = reader.getCol();
-
-        c = reader.read();
-
-
-        while(c){
-            switch(c){
-
-                /*
-                 * Potential tokens:
-                 * - COMMENT
-                 * - SLASH
-                 * - CHAR
-                 */
-                case "/":
-
-                    if(reader.peek() == "*"){
-                        token = this.commentToken(c, startLine, startCol);
-                    } else {
-                        token = this.charToken(c, startLine, startCol);
-                    }
-                    break;
-
-                /*
-                 * Potential tokens:
-                 * - DASHMATCH
-                 * - INCLUDES
-                 * - PREFIXMATCH
-                 * - SUFFIXMATCH
-                 * - SUBSTRINGMATCH
-                 * - CHAR
-                 */
-                case "|":
-                case "~":
-                case "^":
-                case "$":
-                case "*":
-                    if(reader.peek() == "="){
-                        token = this.comparisonToken(c, startLine, startCol);
-                    } else {
-                        token = this.charToken(c, startLine, startCol);
-                    }
-                    break;
-
-                /*
-                 * Potential tokens:
-                 * - STRING
-                 * - INVALID
-                 */
-                case "\"":
-                case "'":
-                    token = this.stringToken(c, startLine, startCol);
-                    break;
-
-                /*
-                 * Potential tokens:
-                 * - HASH
-                 * - CHAR
-                 */
-                case "#":
-                    if (isNameChar(reader.peek())){
-                        token = this.hashToken(c, startLine, startCol);
-                    } else {
-                        token = this.charToken(c, startLine, startCol);
-                    }
-                    break;
-
-                /*
-                 * Potential tokens:
-                 * - DOT
-                 * - NUMBER
-                 * - DIMENSION
-                 * - PERCENTAGE
-                 */
-                case ".":
-                    if (isDigit(reader.peek())){
-                        token = this.numberToken(c, startLine, startCol);
-                    } else {
-                        token = this.charToken(c, startLine, startCol);
-                    }
-                    break;
-
-                /*
-                 * Potential tokens:
-                 * - CDC
-                 * - MINUS
-                 * - NUMBER
-                 * - DIMENSION
-                 * - PERCENTAGE
-                 */
-                case "-":
-                    if (reader.peek() == "-"){  //could be closing HTML-style comment
-                        token = this.htmlCommentEndToken(c, startLine, startCol);
-                    } else if (isNameStart(reader.peek())){
-                        token = this.identOrFunctionToken(c, startLine, startCol);
-                    } else {
-                        token = this.charToken(c, startLine, startCol);
-                    }
-                    break;
-
-                /*
-                 * Potential tokens:
-                 * - IMPORTANT_SYM
-                 * - CHAR
-                 */
-                case "!":
-                    token = this.importantToken(c, startLine, startCol);
-                    break;
-
-                /*
-                 * Any at-keyword or CHAR
-                 */
-                case "@":
-                    token = this.atRuleToken(c, startLine, startCol);
-                    break;
-
-                /*
-                 * Potential tokens:
-                 * - NOT
-                 * - CHAR
-                 */
-                case ":":
-                    token = this.notToken(c, startLine, startCol);
-                    break;
-
-                /*
-                 * Potential tokens:
-                 * - CDO
-                 * - CHAR
-                 */
-                case "<":
-                    token = this.htmlCommentStartToken(c, startLine, startCol);
-                    break;
-
-                /*
-                 * Potential tokens:
-                 * - UNICODE_RANGE
-                 * - URL
-                 * - CHAR
-                 */
-                case "U":
-                case "u":
-                    if (reader.peek() == "+"){
-                        token = this.unicodeRangeToken(c, startLine, startCol);
-                        break;
-                    }
-                    /* falls through */
-                default:
-
-                    /*
-                     * Potential tokens:
-                     * - NUMBER
-                     * - DIMENSION
-                     * - LENGTH
-                     * - FREQ
-                     * - TIME
-                     * - EMS
-                     * - EXS
-                     * - ANGLE
-                     */
-                    if (isDigit(c)){
-                        token = this.numberToken(c, startLine, startCol);
-                    } else
-
-                    /*
-                     * Potential tokens:
-                     * - S
-                     */
-                    if (isWhitespace(c)){
-                        token = this.whitespaceToken(c, startLine, startCol);
-                    } else
-
-                    /*
-                     * Potential tokens:
-                     * - IDENT
-                     */
-                    if (isIdentStart(c)){
-                        token = this.identOrFunctionToken(c, startLine, startCol);
-                    } else
-
-                    /*
-                     * Potential tokens:
-                     * - CHAR
-                     * - PLUS
-                     */
-                    {
-                        token = this.charToken(c, startLine, startCol);
-                    }
-
-
-
-
-
-
-            }
-
-            //make sure this token is wanted
-            //TODO: check channel
-            break;
-        }
-
-        if (!token && c === null){
-            token = this.createToken(Tokens.EOF,null,startLine,startCol);
-        }
-
-        return token;
-    },
-
-    //-------------------------------------------------------------------------
-    // Methods to create tokens
-    //-------------------------------------------------------------------------
-
-    /**
-     * Produces a token based on available data and the current
-     * reader position information. This method is called by other
-     * private methods to create tokens and is never called directly.
-     * @param {int} tt The token type.
-     * @param {String} value The text value of the token.
-     * @param {int} startLine The beginning line for the character.
-     * @param {int} startCol The beginning column for the character.
-     * @param {Object} options (Optional) Specifies a channel property
-     *      to indicate that a different channel should be scanned
-     *      and/or a hide property indicating that the token should
-     *      be hidden.
-     * @return {Object} A token object.
-     * @method createToken
-     */
-    createToken: function(tt, value, startLine, startCol, options){
-        var reader = this._reader;
-        options = options || {};
-
-        return {
-            value:      value,
-            type:       tt,
-            channel:    options.channel,
-            hide:       options.hide || false,
-            startLine:  startLine,
-            startCol:   startCol,
-            endLine:    reader.getLine(),
-            endCol:     reader.getCol()
-        };
-    },
-
-    //-------------------------------------------------------------------------
-    // Methods to create specific tokens
-    //-------------------------------------------------------------------------
-
-    /**
-     * Produces a token for any at-rule. If the at-rule is unknown, then
-     * the token is for a single "@" character.
-     * @param {String} first The first character for the token.
-     * @param {int} startLine The beginning line for the character.
-     * @param {int} startCol The beginning column for the character.
-     * @return {Object} A token object.
-     * @method atRuleToken
-     */
-    atRuleToken: function(first, startLine, startCol){
-        var rule    = first,
-            reader  = this._reader,
-            tt      = Tokens.CHAR,
-            valid   = false,
-            ident,
-            c;
-
-        /*
-         * First, mark where we are. There are only four @ rules,
-         * so anything else is really just an invalid token.
-         * Basically, if this doesn't match one of the known @
-         * rules, just return '@' as an unknown token and allow
-         * parsing to continue after that point.
-         */
-        reader.mark();
-
-        //try to find the at-keyword
-        ident = this.readName();
-        rule = first + ident;
-        tt = Tokens.type(rule.toLowerCase());
-
-        //if it's not valid, use the first character only and reset the reader
-        if (tt == Tokens.CHAR || tt == Tokens.UNKNOWN){
-            if (rule.length > 1){
-                tt = Tokens.UNKNOWN_SYM;                
-            } else {
-                tt = Tokens.CHAR;
-                rule = first;
-                reader.reset();
-            }
-        }
-
-        return this.createToken(tt, rule, startLine, startCol);
-    },
-
-    /**
-     * Produces a character token based on the given character
-     * and location in the stream. If there's a special (non-standard)
-     * token name, this is used; otherwise CHAR is used.
-     * @param {String} c The character for the token.
-     * @param {int} startLine The beginning line for the character.
-     * @param {int} startCol The beginning column for the character.
-     * @return {Object} A token object.
-     * @method charToken
-     */
-    charToken: function(c, startLine, startCol){
-        var tt = Tokens.type(c);
-
-        if (tt == -1){
-            tt = Tokens.CHAR;
-        }
-
-        return this.createToken(tt, c, startLine, startCol);
-    },
-
-    /**
-     * Produces a character token based on the given character
-     * and location in the stream. If there's a special (non-standard)
-     * token name, this is used; otherwise CHAR is used.
-     * @param {String} first The first character for the token.
-     * @param {int} startLine The beginning line for the character.
-     * @param {int} startCol The beginning column for the character.
-     * @return {Object} A token object.
-     * @method commentToken
-     */
-    commentToken: function(first, startLine, startCol){
-        var reader  = this._reader,
-            comment = this.readComment(first);
-
-        return this.createToken(Tokens.COMMENT, comment, startLine, startCol);
-    },
-
-    /**
-     * Produces a comparison token based on the given character
-     * and location in the stream. The next character must be
-     * read and is already known to be an equals sign.
-     * @param {String} c The character for the token.
-     * @param {int} startLine The beginning line for the character.
-     * @param {int} startCol The beginning column for the character.
-     * @return {Object} A token object.
-     * @method comparisonToken
-     */
-    comparisonToken: function(c, startLine, startCol){
-        var reader  = this._reader,
-            comparison  = c + reader.read(),
-            tt      = Tokens.type(comparison) || Tokens.CHAR;
-
-        return this.createToken(tt, comparison, startLine, startCol);
-    },
-
-    /**
-     * Produces a hash token based on the specified information. The
-     * first character provided is the pound sign (#) and then this
-     * method reads a name afterward.
-     * @param {String} first The first character (#) in the hash name.
-     * @param {int} startLine The beginning line for the character.
-     * @param {int} startCol The beginning column for the character.
-     * @return {Object} A token object.
-     * @method hashToken
-     */
-    hashToken: function(first, startLine, startCol){
-        var reader  = this._reader,
-            name    = this.readName(first);
-
-        return this.createToken(Tokens.HASH, name, startLine, startCol);
-    },
-
-    /**
-     * Produces a CDO or CHAR token based on the specified information. The
-     * first character is provided and the rest is read by the function to determine
-     * the correct token to create.
-     * @param {String} first The first character in the token.
-     * @param {int} startLine The beginning line for the character.
-     * @param {int} startCol The beginning column for the character.
-     * @return {Object} A token object.
-     * @method htmlCommentStartToken
-     */
-    htmlCommentStartToken: function(first, startLine, startCol){
-        var reader      = this._reader,
-            text        = first;
-
-        reader.mark();
-        text += reader.readCount(3);
-
-        if (text == "<!--"){
-            return this.createToken(Tokens.CDO, text, startLine, startCol);
-        } else {
-            reader.reset();
-            return this.charToken(first, startLine, startCol);
-        }
-    },
-
-    /**
-     * Produces a CDC or CHAR token based on the specified information. The
-     * first character is provided and the rest is read by the function to determine
-     * the correct token to create.
-     * @param {String} first The first character in the token.
-     * @param {int} startLine The beginning line for the character.
-     * @param {int} startCol The beginning column for the character.
-     * @return {Object} A token object.
-     * @method htmlCommentEndToken
-     */
-    htmlCommentEndToken: function(first, startLine, startCol){
-        var reader      = this._reader,
-            text        = first;
-
-        reader.mark();
-        text += reader.readCount(2);
-
-        if (text == "-->"){
-            return this.createToken(Tokens.CDC, text, startLine, startCol);
-        } else {
-            reader.reset();
-            return this.charToken(first, startLine, startCol);
-        }
-    },
-
-    /**
-     * Produces an IDENT or FUNCTION token based on the specified information. The
-     * first character is provided and the rest is read by the function to determine
-     * the correct token to create.
-     * @param {String} first The first character in the identifier.
-     * @param {int} startLine The beginning line for the character.
-     * @param {int} startCol The beginning column for the character.
-     * @return {Object} A token object.
-     * @method identOrFunctionToken
-     */
-    identOrFunctionToken: function(first, startLine, startCol){
-        var reader  = this._reader,
-            ident   = this.readName(first),
-            tt      = Tokens.IDENT;
-
-        //if there's a left paren immediately after, it's a URI or function
-        if (reader.peek() == "("){
-            ident += reader.read();
-            if (ident.toLowerCase() == "url("){
-                tt = Tokens.URI;
-                ident = this.readURI(ident);
-
-                //didn't find a valid URL or there's no closing paren
-                if (ident.toLowerCase() == "url("){
-                    tt = Tokens.FUNCTION;
-                }
-            } else {
-                tt = Tokens.FUNCTION;
-            }
-        } else if (reader.peek() == ":"){  //might be an IE function
-
-            //IE-specific functions always being with progid:
-            if (ident.toLowerCase() == "progid"){
-                ident += reader.readTo("(");
-                tt = Tokens.IE_FUNCTION;
-            }
-        }
-
-        return this.createToken(tt, ident, startLine, startCol);
-    },
-
-    /**
-     * Produces an IMPORTANT_SYM or CHAR token based on the specified information. The
-     * first character is provided and the rest is read by the function to determine
-     * the correct token to create.
-     * @param {String} first The first character in the token.
-     * @param {int} startLine The beginning line for the character.
-     * @param {int} startCol The beginning column for the character.
-     * @return {Object} A token object.
-     * @method importantToken
-     */
-    importantToken: function(first, startLine, startCol){
-        var reader      = this._reader,
-            important   = first,
-            tt          = Tokens.CHAR,
-            temp,
-            c;
-
-        reader.mark();
-        c = reader.read();
-
-        while(c){
-
-            //there can be a comment in here
-            if (c == "/"){
-
-                //if the next character isn't a star, then this isn't a valid !important token
-                if (reader.peek() != "*"){
-                    break;
-                } else {
-                    temp = this.readComment(c);
-                    if (temp === ""){    //broken!
-                        break;
-                    }
-                }
-            } else if (isWhitespace(c)){
-                important += c + this.readWhitespace();
-            } else if (/i/i.test(c)){
-                temp = reader.readCount(8);
-                if (/mportant/i.test(temp)){
-                    important += c + temp;
-                    tt = Tokens.IMPORTANT_SYM;
-
-                }
-                break;  //we're done
-            } else {
-                break;
-            }
-
-            c = reader.read();
-        }
-
-        if (tt == Tokens.CHAR){
-            reader.reset();
-            return this.charToken(first, startLine, startCol);
-        } else {
-            return this.createToken(tt, important, startLine, startCol);
-        }
-
-
-    },
-
-    /**
-     * Produces a NOT or CHAR token based on the specified information. The
-     * first character is provided and the rest is read by the function to determine
-     * the correct token to create.
-     * @param {String} first The first character in the token.
-     * @param {int} startLine The beginning line for the character.
-     * @param {int} startCol The beginning column for the character.
-     * @return {Object} A token object.
-     * @method notToken
-     */
-    notToken: function(first, startLine, startCol){
-        var reader      = this._reader,
-            text        = first;
-
-        reader.mark();
-        text += reader.readCount(4);
-
-        if (text.toLowerCase() == ":not("){
-            return this.createToken(Tokens.NOT, text, startLine, startCol);
-        } else {
-            reader.reset();
-            return this.charToken(first, startLine, startCol);
-        }
-    },
-
-    /**
-     * Produces a number token based on the given character
-     * and location in the stream. This may return a token of
-     * NUMBER, EMS, EXS, LENGTH, ANGLE, TIME, FREQ, DIMENSION,
-     * or PERCENTAGE.
-     * @param {String} first The first character for the token.
-     * @param {int} startLine The beginning line for the character.
-     * @param {int} startCol The beginning column for the character.
-     * @return {Object} A token object.
-     * @method numberToken
-     */
-    numberToken: function(first, startLine, startCol){
-        var reader  = this._reader,
-            value   = this.readNumber(first),
-            ident,
-            tt      = Tokens.NUMBER,
-            c       = reader.peek();
-
-        if (isIdentStart(c)){
-            ident = this.readName(reader.read());
-            value += ident;
-
-            if (/^em$|^ex$|^px$|^gd$|^rem$|^vw$|^vh$|^vm$|^ch$|^cm$|^mm$|^in$|^pt$|^pc$/i.test(ident)){
-                tt = Tokens.LENGTH;
-            } else if (/^deg|^rad$|^grad$/i.test(ident)){
-                tt = Tokens.ANGLE;
-            } else if (/^ms$|^s$/i.test(ident)){
-                tt = Tokens.TIME;
-            } else if (/^hz$|^khz$/i.test(ident)){
-                tt = Tokens.FREQ;
-            } else if (/^dpi$|^dpcm$/i.test(ident)){
-                tt = Tokens.RESOLUTION;
-            } else {
-                tt = Tokens.DIMENSION;
-            }
-
-        } else if (c == "%"){
-            value += reader.read();
-            tt = Tokens.PERCENTAGE;
-        }
-
-        return this.createToken(tt, value, startLine, startCol);
-    },
-
-    /**
-     * Produces a string token based on the given character
-     * and location in the stream. Since strings may be indicated
-     * by single or double quotes, a failure to match starting
-     * and ending quotes results in an INVALID token being generated.
-     * The first character in the string is passed in and then
-     * the rest are read up to and including the final quotation mark.
-     * @param {String} first The first character in the string.
-     * @param {int} startLine The beginning line for the character.
-     * @param {int} startCol The beginning column for the character.
-     * @return {Object} A token object.
-     * @method stringToken
-     */
-    stringToken: function(first, startLine, startCol){
-        var delim   = first,
-            string  = first,
-            reader  = this._reader,
-            prev    = first,
-            tt      = Tokens.STRING,
-            c       = reader.read();
-
-        while(c){
-            string += c;
-
-            //if the delimiter is found with an escapement, we're done.
-            if (c == delim && prev != "\\"){
-                break;
-            }
-
-            //if there's a newline without an escapement, it's an invalid string
-            if (isNewLine(reader.peek()) && c != "\\"){
-                tt = Tokens.INVALID;
-                break;
-            }
-
-            //save previous and get next
-            prev = c;
-            c = reader.read();
-        }
-
-        //if c is null, that means we're out of input and the string was never closed
-        if (c === null){
-            tt = Tokens.INVALID;
-        }
-
-        return this.createToken(tt, string, startLine, startCol);
-    },
-
-    unicodeRangeToken: function(first, startLine, startCol){
-        var reader  = this._reader,
-            value   = first,
-            temp,
-            tt      = Tokens.CHAR;
-
-        //then it should be a unicode range
-        if (reader.peek() == "+"){
-            reader.mark();
-            value += reader.read();
-            value += this.readUnicodeRangePart(true);
-
-            //ensure there's an actual unicode range here
-            if (value.length == 2){
-                reader.reset();
-            } else {
-
-                tt = Tokens.UNICODE_RANGE;
-
-                //if there's a ? in the first part, there can't be a second part
-                if (value.indexOf("?") == -1){
-
-                    if (reader.peek() == "-"){
-                        reader.mark();
-                        temp = reader.read();
-                        temp += this.readUnicodeRangePart(false);
-
-                        //if there's not another value, back up and just take the first
-                        if (temp.length == 1){
-                            reader.reset();
-                        } else {
-                            value += temp;
-                        }
-                    }
-
-                }
-            }
-        }
-
-        return this.createToken(tt, value, startLine, startCol);
-    },
-
-    /**
-     * Produces a S token based on the specified information. Since whitespace
-     * may have multiple characters, this consumes all whitespace characters
-     * into a single token.
-     * @param {String} first The first character in the token.
-     * @param {int} startLine The beginning line for the character.
-     * @param {int} startCol The beginning column for the character.
-     * @return {Object} A token object.
-     * @method whitespaceToken
-     */
-    whitespaceToken: function(first, startLine, startCol){
-        var reader  = this._reader,
-            value   = first + this.readWhitespace();
-        return this.createToken(Tokens.S, value, startLine, startCol);
-    },
-
-
-
-
-    //-------------------------------------------------------------------------
-    // Methods to read values from the string stream
-    //-------------------------------------------------------------------------
-
-    readUnicodeRangePart: function(allowQuestionMark){
-        var reader  = this._reader,
-            part = "",
-            c       = reader.peek();
-
-        //first read hex digits
-        while(isHexDigit(c) && part.length < 6){
-            reader.read();
-            part += c;
-            c = reader.peek();
-        }
-
-        //then read question marks if allowed
-        if (allowQuestionMark){
-            while(c == "?" && part.length < 6){
-                reader.read();
-                part += c;
-                c = reader.peek();
-            }
-        }
-
-        //there can't be any other characters after this point
-
-        return part;
-    },
-
-    readWhitespace: function(){
-        var reader  = this._reader,
-            whitespace = "",
-            c       = reader.peek();
-
-        while(isWhitespace(c)){
-            reader.read();
-            whitespace += c;
-            c = reader.peek();
-        }
-
-        return whitespace;
-    },
-    readNumber: function(first){
-        var reader  = this._reader,
-            number  = first,
-            hasDot  = (first == "."),
-            c       = reader.peek();
-
-
-        while(c){
-            if (isDigit(c)){
-                number += reader.read();
-            } else if (c == "."){
-                if (hasDot){
-                    break;
-                } else {
-                    hasDot = true;
-                    number += reader.read();
-                }
-            } else {
-                break;
-            }
-
-            c = reader.peek();
-        }
-
-        return number;
-    },
-    readString: function(){
-        var reader  = this._reader,
-            delim   = reader.read(),
-            string  = delim,
-            prev    = delim,
-            c       = reader.peek();
-
-        while(c){
-            c = reader.read();
-            string += c;
-
-            //if the delimiter is found with an escapement, we're done.
-            if (c == delim && prev != "\\"){
-                break;
-            }
-
-            //if there's a newline without an escapement, it's an invalid string
-            if (isNewLine(reader.peek()) && c != "\\"){
-                string = "";
-                break;
-            }
-
-            //save previous and get next
-            prev = c;
-            c = reader.peek();
-        }
-
-        //if c is null, that means we're out of input and the string was never closed
-        if (c === null){
-            string = "";
-        }
-
-        return string;
-    },
-    readURI: function(first){
-        var reader  = this._reader,
-            uri     = first,
-            inner   = "",
-            c       = reader.peek();
-
-        reader.mark();
-
-        //skip whitespace before
-        while(c && isWhitespace(c)){
-            reader.read();
-            c = reader.peek();
-        }
-
-        //it's a string
-        if (c == "'" || c == "\""){
-            inner = this.readString();
-        } else {
-            inner = this.readURL();
-        }
-
-        c = reader.peek();
-
-        //skip whitespace after
-        while(c && isWhitespace(c)){
-            reader.read();
-            c = reader.peek();
-        }
-
-        //if there was no inner value or the next character isn't closing paren, it's not a URI
-        if (inner === "" || c != ")"){
-            uri = first;
-            reader.reset();
-        } else {
-            uri += inner + reader.read();
-        }
-
-        return uri;
-    },
-    readURL: function(){
-        var reader  = this._reader,
-            url     = "",
-            c       = reader.peek();
-
-        //TODO: Check for escape and nonascii
-        while (/^[!#$%&\\*-~]$/.test(c)){
-            url += reader.read();
-            c = reader.peek();
-        }
-
-        return url;
-
-    },
-    readName: function(first){
-        var reader  = this._reader,
-            ident   = first || "",
-            c       = reader.peek();
-
-        while(true){
-            if (c == "\\"){
-                ident += this.readEscape(reader.read());
-                c = reader.peek();
-            } else if(c && isNameChar(c)){
-                ident += reader.read();
-                c = reader.peek();
-            } else {
-                break;
-            }
-        }
-
-        return ident;
-    },
-    
-    readEscape: function(first){
-        var reader  = this._reader,
-            cssEscape = first || "",
-            i       = 0,
-            c       = reader.peek();    
-    
-        if (isHexDigit(c)){
-            do {
-                cssEscape += reader.read();
-                c = reader.peek();
-            } while(c && isHexDigit(c) && ++i < 6);
-        }
-        
-        if (cssEscape.length == 3 && /\s/.test(c) ||
-            cssEscape.length == 7 || cssEscape.length == 1){
-                reader.read();
-        } else {
-            c = "";
-        }
-        
-        return cssEscape + c;
-    },
-    
-    readComment: function(first){
-        var reader  = this._reader,
-            comment = first || "",
-            c       = reader.read();
-
-        if (c == "*"){
-            while(c){
-                comment += c;
-
-                //look for end of comment
-                if (comment.length > 2 && c == "*" && reader.peek() == "/"){
-                    comment += reader.read();
-                    break;
-                }
-
-                c = reader.read();
-            }
-
-            return comment;
-        } else {
-            return "";
-        }
-
-    }
-});
-
-
-var Tokens  = [
-
-    /*
-     * The following token names are defined in CSS3 Grammar: http://www.w3.org/TR/css3-syntax/#lexical
-     */
-     
-    //HTML-style comments
-    { name: "CDO"},
-    { name: "CDC"},
-
-    //ignorables
-    { name: "S", whitespace: true/*, channel: "ws"*/},
-    { name: "COMMENT", comment: true, hide: true, channel: "comment" },
-        
-    //attribute equality
-    { name: "INCLUDES", text: "~="},
-    { name: "DASHMATCH", text: "|="},
-    { name: "PREFIXMATCH", text: "^="},
-    { name: "SUFFIXMATCH", text: "$="},
-    { name: "SUBSTRINGMATCH", text: "*="},
-        
-    //identifier types
-    { name: "STRING"},     
-    { name: "IDENT"},
-    { name: "HASH"},
-
-    //at-keywords
-    { name: "IMPORT_SYM", text: "@import"},
-    { name: "PAGE_SYM", text: "@page"},
-    { name: "MEDIA_SYM", text: "@media"},
-    { name: "FONT_FACE_SYM", text: "@font-face"},
-    { name: "CHARSET_SYM", text: "@charset"},
-    { name: "NAMESPACE_SYM", text: "@namespace"},
-    { name: "UNKNOWN_SYM" },
-    //{ name: "ATKEYWORD"},
-    
-    //CSS3 animations
-    { name: "KEYFRAMES_SYM", text: [ "@keyframes", "@-webkit-keyframes", "@-moz-keyframes", "@-ms-keyframes" ] },
-
-    //important symbol
-    { name: "IMPORTANT_SYM"},
-
-    //measurements
-    { name: "LENGTH"},
-    { name: "ANGLE"},
-    { name: "TIME"},
-    { name: "FREQ"},
-    { name: "DIMENSION"},
-    { name: "PERCENTAGE"},
-    { name: "NUMBER"},
-    
-    //functions
-    { name: "URI"},
-    { name: "FUNCTION"},
-    
-    //Unicode ranges
-    { name: "UNICODE_RANGE"},
-    
-    /*
-     * The following token names are defined in CSS3 Selectors: http://www.w3.org/TR/css3-selectors/#selector-syntax
-     */    
-    
-    //invalid string
-    { name: "INVALID"},
-    
-    //combinators
-    { name: "PLUS", text: "+" },
-    { name: "GREATER", text: ">"},
-    { name: "COMMA", text: ","},
-    { name: "TILDE", text: "~"},
-    
-    //modifier
-    { name: "NOT"},        
-    
-    /*
-     * Defined in CSS3 Paged Media
-     */
-    { name: "TOPLEFTCORNER_SYM", text: "@top-left-corner"},
-    { name: "TOPLEFT_SYM", text: "@top-left"},
-    { name: "TOPCENTER_SYM", text: "@top-center"},
-    { name: "TOPRIGHT_SYM", text: "@top-right"},
-    { name: "TOPRIGHTCORNER_SYM", text: "@top-right-corner"},
-    { name: "BOTTOMLEFTCORNER_SYM", text: "@bottom-left-corner"},
-    { name: "BOTTOMLEFT_SYM", text: "@bottom-left"},
-    { name: "BOTTOMCENTER_SYM", text: "@bottom-center"},
-    { name: "BOTTOMRIGHT_SYM", text: "@bottom-right"},
-    { name: "BOTTOMRIGHTCORNER_SYM", text: "@bottom-right-corner"},
-    { name: "LEFTTOP_SYM", text: "@left-top"},
-    { name: "LEFTMIDDLE_SYM", text: "@left-middle"},
-    { name: "LEFTBOTTOM_SYM", text: "@left-bottom"},
-    { name: "RIGHTTOP_SYM", text: "@right-top"},
-    { name: "RIGHTMIDDLE_SYM", text: "@right-middle"},
-    { name: "RIGHTBOTTOM_SYM", text: "@right-bottom"},
-
-    /*
-     * The following token names are defined in CSS3 Media Queries: http://www.w3.org/TR/css3-mediaqueries/#syntax
-     */
-    /*{ name: "MEDIA_ONLY", state: "media"},
-    { name: "MEDIA_NOT", state: "media"},
-    { name: "MEDIA_AND", state: "media"},*/
-    { name: "RESOLUTION", state: "media"},
-
-    /*
-     * The following token names are not defined in any CSS specification but are used by the lexer.
-     */
-    
-    //not a real token, but useful for stupid IE filters
-    { name: "IE_FUNCTION" },
-
-    //part of CSS3 grammar but not the Flex code
-    { name: "CHAR" },
-    
-    //TODO: Needed?
-    //Not defined as tokens, but might as well be
-    {
-        name: "PIPE",
-        text: "|"
-    },
-    {
-        name: "SLASH",
-        text: "/"
-    },
-    {
-        name: "MINUS",
-        text: "-"
-    },
-    {
-        name: "STAR",
-        text: "*"
-    },
-
-    {
-        name: "LBRACE",
-        text: "{"
-    },   
-    {
-        name: "RBRACE",
-        text: "}"
-    },      
-    {
-        name: "LBRACKET",
-        text: "["
-    },   
-    {
-        name: "RBRACKET",
-        text: "]"
-    },    
-    {
-        name: "EQUALS",
-        text: "="
-    },
-    {
-        name: "COLON",
-        text: ":"
-    },    
-    {
-        name: "SEMICOLON",
-        text: ";"
-    },    
- 
-    {
-        name: "LPAREN",
-        text: "("
-    },   
-    {
-        name: "RPAREN",
-        text: ")"
-    },     
-    {
-        name: "DOT",
-        text: "."
-    }
-];
-
-(function(){
-
-    var nameMap = [],
-        typeMap = {};
-    
-    Tokens.UNKNOWN = -1;
-    Tokens.unshift({name:"EOF"});
-    for (var i=0, len = Tokens.length; i < len; i++){
-        nameMap.push(Tokens[i].name);
-        Tokens[Tokens[i].name] = i;
-        if (Tokens[i].text){
-            if (Tokens[i].text instanceof Array){
-                for (var j=0; j < Tokens[i].text.length; j++){
-                    typeMap[Tokens[i].text[j]] = i;
-                }
-            } else {
-                typeMap[Tokens[i].text] = i;
-            }
-        }
-    }
-    
-    Tokens.name = function(tt){
-        return nameMap[tt];
-    };
-    
-    Tokens.type = function(c){
-        return typeMap[c] || -1;
-    };
-
-})();
-
-
-
-
-//This file will likely change a lot! Very experimental!
-/*global Properties, ValidationTypes, ValidationError, PropertyValueIterator */
-var Validation = {
-
-    validate: function(property, value){
-    
-        //normalize name
-        var name        = property.toString().toLowerCase(),
-            parts       = value.parts,
-            expression  = new PropertyValueIterator(value),
-            spec        = Properties[name],
-            part,
-            valid,            
-            j, count,
-            msg,
-            types,
-            last,
-            literals,
-            max, multi, group;
-            
-        if (!spec) {
-            if (name.indexOf("-") !== 0){    //vendor prefixed are ok
-                throw new ValidationError("Unknown property '" + property + "'.", property.line, property.col);
-            }
-        } else if (typeof spec != "number"){
-        
-            //initialization
-            if (typeof spec == "string"){
-                if (spec.indexOf("||") > -1) {
-                    this.groupProperty(spec, expression);
-                } else {
-                    this.singleProperty(spec, expression, 1);
-                }
-
-            } else if (spec.multi) {
-                this.multiProperty(spec.multi, expression, spec.comma, spec.max || Infinity);
-            } else if (typeof spec == "function") {
-                spec(expression);
-            }
-
-        }
-
-    },
-    
-    singleProperty: function(types, expression, max, partial) {
-
-        var result      = false,
-            value       = expression.value,
-            count       = 0,
-            part;
-         
-        while (expression.hasNext() && count < max) {
-            result = ValidationTypes.isAny(expression, types);
-            if (!result) {
-                break;
-            }
-            count++;
-        }
-        
-        if (!result) {
-            if (expression.hasNext() && !expression.isFirst()) {
-                part = expression.peek();
-                throw new ValidationError("Expected end of value but found '" + part + "'.", part.line, part.col);
-            } else {
-                 throw new ValidationError("Expected (" + types + ") but found '" + value + "'.", value.line, value.col);
-            }        
-        } else if (expression.hasNext()) {
-            part = expression.next();
-            throw new ValidationError("Expected end of value but found '" + part + "'.", part.line, part.col);
-        }          
-                 
-    },    
-    
-    multiProperty: function (types, expression, comma, max) {
-
-        var result      = false,
-            value       = expression.value,
-            count       = 0,
-            sep         = false,
-            part;
-            
-        while(expression.hasNext() && !result && count < max) {
-            if (ValidationTypes.isAny(expression, types)) {
-                count++;
-                if (!expression.hasNext()) {
-                    result = true;
-
-                } else if (comma) {
-                    if (expression.peek() == ",") {
-                        part = expression.next();
-                    } else {
-                        break;
-                    }
-                }
-            } else {
-                break;
-
-            }
-        }
-        
-        if (!result) {
-            if (expression.hasNext() && !expression.isFirst()) {
-                part = expression.peek();
-                throw new ValidationError("Expected end of value but found '" + part + "'.", part.line, part.col);
-            } else {
-                part = expression.previous();
-                if (comma && part == ",") {
-                    throw new ValidationError("Expected end of value but found '" + part + "'.", part.line, part.col); 
-                } else {
-                    throw new ValidationError("Expected (" + types + ") but found '" + value + "'.", value.line, value.col);
-                }
-            }
-        
-        } else if (expression.hasNext()) {
-            part = expression.next();
-            throw new ValidationError("Expected end of value but found '" + part + "'.", part.line, part.col);
-        }  
-
-    },
-    
-    groupProperty: function (types, expression, comma) {
-
-        var result      = false,
-            value       = expression.value,
-            typeCount   = types.split("||").length,
-            groups      = { count: 0 },
-            partial     = false,
-            name,
-            part;
-            
-        while(expression.hasNext() && !result) {
-            name = ValidationTypes.isAnyOfGroup(expression, types);
-            if (name) {
-            
-                //no dupes
-                if (groups[name]) {
-                    break;
-                } else {
-                    groups[name] = 1;
-                    groups.count++;
-                    partial = true;
-                    
-                    if (groups.count == typeCount || !expression.hasNext()) {
-                        result = true;
-                    }
-                }
-            } else {
-                break;
-            }
-        }
-        
-        if (!result) {        
-            if (partial && expression.hasNext()) {
-                    part = expression.peek();
-                    throw new ValidationError("Expected end of value but found '" + part + "'.", part.line, part.col);
-            } else {
-                throw new ValidationError("Expected (" + types + ") but found '" + value + "'.", value.line, value.col);
-            }
-        } else if (expression.hasNext()) {
-            part = expression.next();
-            throw new ValidationError("Expected end of value but found '" + part + "'.", part.line, part.col);
-        }           
-    }
-
-    
-
-};
-/**
- * Type to use when a validation error occurs.
- * @class ValidationError
- * @namespace parserlib.util
- * @constructor
- * @param {String} message The error message.
- * @param {int} line The line at which the error occurred.
- * @param {int} col The column at which the error occurred.
- */
-function ValidationError(message, line, col){
-
-    /**
-     * The column at which the error occurred.
-     * @type int
-     * @property col
-     */
-    this.col = col;
-
-    /**
-     * The line at which the error occurred.
-     * @type int
-     * @property line
-     */
-    this.line = line;
-
-    /**
-     * The text representation of the unit.
-     * @type String
-     * @property text
-     */
-    this.message = message;
-
-}
-
-//inherit from Error
-ValidationError.prototype = new Error();
-//This file will likely change a lot! Very experimental!
-/*global Properties, Validation, ValidationError, PropertyValueIterator, console*/
-var ValidationTypes = {
-
-    isLiteral: function (part, literals) {
-        var text = part.text.toString().toLowerCase(),
-            args = literals.split(" | "),
-            i, len, found = false;
-        
-        for (i=0,len=args.length; i < len && !found; i++){
-            if (text == args[i]){
-                found = true;
-            }
-        }
-        
-        return found;    
-    },
-    
-    isSimple: function(type) {
-        return !!this.simple[type];
-    },
-    
-    isComplex: function(type) {
-        return !!this.complex[type];
-    },
-    
-    /**
-     * Determines if the next part(s) of the given expression
-     * are any of the given types.
-     */
-    isAny: function (expression, types) {
-        var args = types.split(" | "),
-            i, len, found = false;
-        
-        for (i=0,len=args.length; i < len && !found && expression.hasNext(); i++){
-            found = this.isType(expression, args[i]);
-        }
-        
-        return found;    
-    },
-    
-    /**
-     * Determines if the next part(s) of the given expresion
-     * are one of a group.
-     */
-    isAnyOfGroup: function(expression, types) {
-        var args = types.split(" || "),
-            i, len, found = false;
-        
-        for (i=0,len=args.length; i < len && !found; i++){
-            found = this.isType(expression, args[i]);
-        }
-        
-        return found ? args[i-1] : false;
-    },
-    
-    /**
-     * Determines if the next part(s) of the given expression
-     * are of a given type.
-     */
-    isType: function (expression, type) {
-        var part = expression.peek(),
-            result = false;
-            
-        if (type.charAt(0) != "<") {
-            result = this.isLiteral(part, type);
-            if (result) {
-                expression.next();
-            }
-        } else if (this.simple[type]) {
-            result = this.simple[type](part);
-            if (result) {
-                expression.next();
-            }
-        } else {
-            result = this.complex[type](expression);
-        }
-        
-        return result;
-    },
-    
-    
-    
-    simple: {
-
-        "<absolute-size>": function(part){
-            return ValidationTypes.isLiteral(part, "xx-small | x-small | small | medium | large | x-large | xx-large");
-        },
-        
-        "<attachment>": function(part){
-            return ValidationTypes.isLiteral(part, "scroll | fixed | local");
-        },
-        
-        "<attr>": function(part){
-            return part.type == "function" && part.name == "attr";
-        },
-                
-        "<bg-image>": function(part){
-            return this["<image>"](part) || this["<gradient>"](part) ||  part == "none";
-        },        
-        
-        "<gradient>": function(part) {
-            return part.type == "function" && /^(?:\-(?:ms|moz|o|webkit)\-)?(?:repeating\-)?(?:radial|linear)\-gradient/i.test(part);
-        },
-        
-        "<box>": function(part){
-            return ValidationTypes.isLiteral(part, "padding-box | border-box | content-box");
-        },
-        
-        "<content>": function(part){
-            return part.type == "function" && part.name == "content";
-        },        
-        
-        "<relative-size>": function(part){
-            return ValidationTypes.isLiteral(part, "smaller | larger");
-        },
-        
-        //any identifier
-        "<ident>": function(part){
-            return part.type == "identifier";
-        },
-        
-        "<length>": function(part){
-            return part.type == "length" || part.type == "number" || part.type == "integer" || part == "0";
-        },
-        
-        "<color>": function(part){
-            return part.type == "color" || part == "transparent";
-        },
-        
-        "<number>": function(part){
-            return part.type == "number" || this["<integer>"](part);
-        },
-        
-        "<integer>": function(part){
-            return part.type == "integer";
-        },
-        
-        "<line>": function(part){
-            return part.type == "integer";
-        },
-        
-        "<angle>": function(part){
-            return part.type == "angle";
-        },        
-        
-        "<uri>": function(part){
-            return part.type == "uri";
-        },
-        
-        "<image>": function(part){
-            return this["<uri>"](part);
-        },
-        
-        "<percentage>": function(part){
-            return part.type == "percentage" || part == "0";
-        },
-
-        "<border-width>": function(part){
-            return this["<length>"](part) || ValidationTypes.isLiteral(part, "thin | medium | thick");
-        },
-        
-        "<border-style>": function(part){
-            return ValidationTypes.isLiteral(part, "none | hidden | dotted | dashed | solid | double | groove | ridge | inset | outset");
-        },
-        
-        "<margin-width>": function(part){
-            return this["<length>"](part) || this["<percentage>"](part) || ValidationTypes.isLiteral(part, "auto");
-        },
-        
-        "<padding-width>": function(part){
-            return this["<length>"](part) || this["<percentage>"](part);
-        },
-        
-        "<shape>": function(part){
-            return part.type == "function" && (part.name == "rect" || part.name == "inset-rect");
-        },
-        
-        "<time>": function(part) {
-            return part.type == "time";
-        }
-    },
-    
-    complex: {
-
-        "<bg-position>": function(expression){
-            var types   = this,
-                result  = false,
-                numeric = "<percentage> | <length>",
-                xDir    = "left | center | right",
-                yDir    = "top | center | bottom",
-                part,
-                i, len;
-            
-                
-            if (ValidationTypes.isAny(expression, "top | bottom")) {
-                result = true;
-            } else {
-                
-                //must be two-part
-                if (ValidationTypes.isAny(expression, numeric)){
-                    if (expression.hasNext()){
-                        result = ValidationTypes.isAny(expression, numeric + " | " + yDir);
-                    }
-                } else if (ValidationTypes.isAny(expression, xDir)){
-                    if (expression.hasNext()){
-                        
-                        //two- or three-part
-                        if (ValidationTypes.isAny(expression, yDir)){
-                            result = true;
-                      
-                            ValidationTypes.isAny(expression, numeric);
-                            
-                        } else if (ValidationTypes.isAny(expression, numeric)){
-                        
-                            //could also be two-part, so check the next part
-                            if (ValidationTypes.isAny(expression, yDir)){                                    
-                                ValidationTypes.isAny(expression, numeric);                               
-                            }
-                            
-                            result = true;
-                        }
-                    }
-                }                                 
-            }            
-
-            
-            return result;
-        },
-
-        "<bg-size>": function(expression){
-            //<bg-size> = [ <length> | <percentage> | auto ]{1,2} | cover | contain
-            var types   = this,
-                result  = false,
-                numeric = "<percentage> | <length> | auto",
-                part,
-                i, len;      
-      
-            if (ValidationTypes.isAny(expression, "cover | contain")) {
-                result = true;
-            } else if (ValidationTypes.isAny(expression, numeric)) {
-                result = true;                
-                ValidationTypes.isAny(expression, numeric);
-            }
-            
-            return result;
-        },
-        
-        "<repeat-style>": function(expression){
-            //repeat-x | repeat-y | [repeat | space | round | no-repeat]{1,2}
-            var result  = false,
-                values  = "repeat | space | round | no-repeat",
-                part;
-            
-            if (expression.hasNext()){
-                part = expression.next();
-                
-                if (ValidationTypes.isLiteral(part, "repeat-x | repeat-y")) {
-                    result = true;                    
-                } else if (ValidationTypes.isLiteral(part, values)) {
-                    result = true;
-
-                    if (expression.hasNext() && ValidationTypes.isLiteral(expression.peek(), values)) {
-                        expression.next();
-                    }
-                }
-            }
-            
-            return result;
-            
-        },
-        
-        "<shadow>": function(expression) {
-            //inset? && [ <length>{2,4} && <color>? ]
-            var result  = false,
-                count   = 0,
-                inset   = false,
-                color   = false,
-                part;
-                
-            if (expression.hasNext()) {            
-                
-                if (ValidationTypes.isAny(expression, "inset")){
-                    inset = true;
-                }
-                
-                if (ValidationTypes.isAny(expression, "<color>")) {
-                    color = true;
-                }                
-                
-                while (ValidationTypes.isAny(expression, "<length>") && count < 4) {
-                    count++;
-                }
-                
-                
-                if (expression.hasNext()) {
-                    if (!color) {
-                        ValidationTypes.isAny(expression, "<color>");
-                    }
-                    
-                    if (!inset) {
-                        ValidationTypes.isAny(expression, "inset");
-                    }
-
-                }
-                
-                result = (count >= 2 && count <= 4);
-            
-            }
-            
-            return result;
-        },
-        
-        "<x-one-radius>": function(expression) {
-            //[ <length> | <percentage> ] [ <length> | <percentage> ]?
-            var result  = false,
-                count   = 0,
-                numeric = "<length> | <percentage>",
-                part;
-                
-            if (ValidationTypes.isAny(expression, numeric)){
-                result = true;
-                
-                ValidationTypes.isAny(expression, numeric);
-            }                
-            
-            return result;
-        }
-    }
-};
-
-
-parserlib.css = {
-Colors              :Colors,    
-Combinator          :Combinator,                
-Parser              :Parser,
-PropertyName        :PropertyName,
-PropertyValue       :PropertyValue,
-PropertyValuePart   :PropertyValuePart,
-MediaFeature        :MediaFeature,
-MediaQuery          :MediaQuery,
-Selector            :Selector,
-SelectorPart        :SelectorPart,
-SelectorSubPart     :SelectorSubPart,
-Specificity         :Specificity,
-TokenStream         :TokenStream,
-Tokens              :Tokens,
-ValidationError     :ValidationError
-};
-})();
-
-
-
-/**
- * Main CSSLint object.
- * @class CSSLint
- * @static
- * @extends parserlib.util.EventTarget
- */
-/*global parserlib, Reporter*/
-var CSSLint = (function(){
-
-    var rules      = [],
-        formatters = [],
-        api        = new parserlib.util.EventTarget();
-        
-    api.version = "0.9.7";
-
-    //-------------------------------------------------------------------------
-    // Rule Management
-    //-------------------------------------------------------------------------
-
-    /**
-     * Adds a new rule to the engine.
-     * @param {Object} rule The rule to add.
-     * @method addRule
-     */
-    api.addRule = function(rule){
-        rules.push(rule);
-        rules[rule.id] = rule;
-    };
-
-    /**
-     * Clears all rule from the engine.
-     * @method clearRules
-     */
-    api.clearRules = function(){
-        rules = [];
-    };
-    
-    /**
-     * Returns the rule objects.
-     * @return An array of rule objects.
-     * @method getRules
-     */
-    api.getRules = function(){
-        return [].concat(rules).sort(function(a,b){ 
-            return a.id > b.id ? 1 : 0;
-        });
-    };
-
-    //-------------------------------------------------------------------------
-    // Formatters
-    //-------------------------------------------------------------------------
-
-    /**
-     * Adds a new formatter to the engine.
-     * @param {Object} formatter The formatter to add.
-     * @method addFormatter
-     */
-    api.addFormatter = function(formatter) {
-        // formatters.push(formatter);
-        formatters[formatter.id] = formatter;
-    };
-    
-    /**
-     * Retrieves a formatter for use.
-     * @param {String} formatId The name of the format to retrieve.
-     * @return {Object} The formatter or undefined.
-     * @method getFormatter
-     */
-    api.getFormatter = function(formatId){
-        return formatters[formatId];
-    };
-    
-    /**
-     * Formats the results in a particular format for a single file.
-     * @param {Object} result The results returned from CSSLint.verify().
-     * @param {String} filename The filename for which the results apply.
-     * @param {String} formatId The name of the formatter to use.
-     * @param {Object} options (Optional) for special output handling.
-     * @return {String} A formatted string for the results.
-     * @method format
-     */
-    api.format = function(results, filename, formatId, options) {
-        var formatter = this.getFormatter(formatId),
-            result = null;
-            
-        if (formatter){
-            result = formatter.startFormat();
-            result += formatter.formatResults(results, filename, options || {});
-            result += formatter.endFormat();
-        }
-        
-        return result;
-    };
-    
-    /**
-     * Indicates if the given format is supported.
-     * @param {String} formatId The ID of the format to check.
-     * @return {Boolean} True if the format exists, false if not.
-     * @method hasFormat
-     */
-    api.hasFormat = function(formatId){
-        return formatters.hasOwnProperty(formatId);
-    };
-
-    //-------------------------------------------------------------------------
-    // Verification
-    //-------------------------------------------------------------------------
-
-    /**
-     * Starts the verification process for the given CSS text.
-     * @param {String} text The CSS text to verify.
-     * @param {Object} ruleset (Optional) List of rules to apply. If null, then
-     *      all rules are used. If a rule has a value of 1 then it's a warning,
-     *      a value of 2 means it's an error.
-     * @return {Object} Results of the verification.
-     * @method verify
-     */
-    api.verify = function(text, ruleset){
-
-        var i       = 0,
-            len     = rules.length,
-            reporter,
-            lines,
-            report,
-            parser = new parserlib.css.Parser({ starHack: true, ieFilters: true,
-                                                underscoreHack: true, strict: false });
-
-        lines = text.replace(/\n\r?/g, "$split$").split('$split$');
-        
-        if (!ruleset){
-            ruleset = {};
-            while (i < len){
-                ruleset[rules[i++].id] = 1;    //by default, everything is a warning
-            }
-        }
-        
-        reporter = new Reporter(lines, ruleset);
-        
-        ruleset.errors = 2;       //always report parsing errors as errors
-        for (i in ruleset){
-            if(ruleset.hasOwnProperty(i)){
-                if (rules[i]){
-                    rules[i].init(parser, reporter);
-                }
-            }
-        }
-
-
-        //capture most horrible error type
-        try {
-            parser.parse(text);
-        } catch (ex) {
-            reporter.error("Fatal error, cannot continue: " + ex.message, ex.line, ex.col, {});
-        }
-
-        report = {
-            messages    : reporter.messages,
-            stats       : reporter.stats
-        };
-        
-        //sort by line numbers, rollups at the bottom
-        report.messages.sort(function (a, b){
-            if (a.rollup && !b.rollup){
-                return 1;
-            } else if (!a.rollup && b.rollup){
-                return -1;
-            } else {
-                return a.line - b.line;
-            }
-        });        
-        
-        return report;
-    };
-
-    //-------------------------------------------------------------------------
-    // Publish the API
-    //-------------------------------------------------------------------------
-
-    return api;
-
-})();
-
-/*global CSSLint*/
-/**
- * An instance of Report is used to report results of the
- * verification back to the main API.
- * @class Reporter
- * @constructor
- * @param {String[]} lines The text lines of the source.
- * @param {Object} ruleset The set of rules to work with, including if
- *      they are errors or warnings.
- */
-function Reporter(lines, ruleset){
-
-    /**
-     * List of messages being reported.
-     * @property messages
-     * @type String[]
-     */
-    this.messages = [];
-
-    /**
-     * List of statistics being reported.
-     * @property stats
-     * @type String[]
-     */
-    this.stats = [];
-
-    /**
-     * Lines of code being reported on. Used to provide contextual information
-     * for messages.
-     * @property lines
-     * @type String[]
-     */
-    this.lines = lines;
-    
-    /**
-     * Information about the rules. Used to determine whether an issue is an
-     * error or warning.
-     * @property ruleset
-     * @type Object
-     */
-    this.ruleset = ruleset;
-}
-
-Reporter.prototype = {
-
-    //restore constructor
-    constructor: Reporter,
-
-    /**
-     * Report an error.
-     * @param {String} message The message to store.
-     * @param {int} line The line number.
-     * @param {int} col The column number.
-     * @param {Object} rule The rule this message relates to.
-     * @method error
-     */
-    error: function(message, line, col, rule){
-        this.messages.push({
-            type    : "error",
-            line    : line,
-            col     : col,
-            message : message,
-            evidence: this.lines[line-1],
-            rule    : rule || {}
-        });
-    },
-
-    /**
-     * Report an warning.
-     * @param {String} message The message to store.
-     * @param {int} line The line number.
-     * @param {int} col The column number.
-     * @param {Object} rule The rule this message relates to.
-     * @method warn
-     * @deprecated Use report instead.
-     */
-    warn: function(message, line, col, rule){
-        this.report(message, line, col, rule);
-    },
-
-    /**
-     * Report an issue.
-     * @param {String} message The message to store.
-     * @param {int} line The line number.
-     * @param {int} col The column number.
-     * @param {Object} rule The rule this message relates to.
-     * @method report
-     */
-    report: function(message, line, col, rule){
-        this.messages.push({
-            type    : this.ruleset[rule.id] == 2 ? "error" : "warning",
-            line    : line,
-            col     : col,
-            message : message,
-            evidence: this.lines[line-1],
-            rule    : rule
-        });
-    },
-
-    /**
-     * Report some informational text.
-     * @param {String} message The message to store.
-     * @param {int} line The line number.
-     * @param {int} col The column number.
-     * @param {Object} rule The rule this message relates to.
-     * @method info
-     */
-    info: function(message, line, col, rule){
-        this.messages.push({
-            type    : "info",
-            line    : line,
-            col     : col,
-            message : message,
-            evidence: this.lines[line-1],
-            rule    : rule
-        });
-    },
-
-    /**
-     * Report some rollup error information.
-     * @param {String} message The message to store.
-     * @param {Object} rule The rule this message relates to.
-     * @method rollupError
-     */
-    rollupError: function(message, rule){
-        this.messages.push({
-            type    : "error",
-            rollup  : true,
-            message : message,
-            rule    : rule
-        });
-    },
-
-    /**
-     * Report some rollup warning information.
-     * @param {String} message The message to store.
-     * @param {Object} rule The rule this message relates to.
-     * @method rollupWarn
-     */
-    rollupWarn: function(message, rule){
-        this.messages.push({
-            type    : "warning",
-            rollup  : true,
-            message : message,
-            rule    : rule
-        });
-    },
-
-    /**
-     * Report a statistic.
-     * @param {String} name The name of the stat to store.
-     * @param {Variant} value The value of the stat.
-     * @method stat
-     */
-    stat: function(name, value){
-        this.stats[name] = value;
-    }
-};
-
-//expose for testing purposes
-CSSLint._Reporter = Reporter;
-
-/*global CSSLint*/
-
-/*
- * Utility functions that make life easier.
- */
-CSSLint.Util = {
-    /*
-     * Adds all properties from supplier onto receiver,
-     * overwriting if the same name already exists on
-     * reciever.
-     * @param {Object} The object to receive the properties.
-     * @param {Object} The object to provide the properties.
-     * @return {Object} The receiver
-     */
-    mix: function(receiver, supplier){
-        var prop;
-
-        for (prop in supplier){
-            if (supplier.hasOwnProperty(prop)){
-                receiver[prop] = supplier[prop];
-            }
-        }
-
-        return prop;
-    },
-
-    /*
-     * Polyfill for array indexOf() method.
-     * @param {Array} values The array to search.
-     * @param {Variant} value The value to search for.
-     * @return {int} The index of the value if found, -1 if not.
-     */
-    indexOf: function(values, value){
-        if (values.indexOf){
-            return values.indexOf(value);
-        } else {
-            for (var i=0, len=values.length; i < len; i++){
-                if (values[i] === value){
-                    return i;
-                }
-            }
-            return -1;
-        }
-    },
-
-    /*
-     * Polyfill for array forEach() method.
-     * @param {Array} values The array to operate on.
-     * @param {Function} func The function to call on each item.
-     * @return {void}
-     */
-    forEach: function(values, func) {
-        if (values.forEach){
-            return values.forEach(func);
-        } else {
-            for (var i=0, len=values.length; i < len; i++){
-                func(values[i], i, values);
-            }
-        }
-    }
-};
-/*global CSSLint*/
-/*
- * Rule: Don't use adjoining classes (.foo.bar).
- */
-CSSLint.addRule({
-
-    //rule information
-    id: "adjoining-classes",
-    name: "Disallow adjoining classes",
-    desc: "Don't use adjoining classes.",
-    browsers: "IE6",
-
-    //initialization
-    init: function(parser, reporter){
-        var rule = this;
-        parser.addListener("startrule", function(event){
-            var selectors = event.selectors,
-                selector,
-                part,
-                modifier,
-                classCount,
-                i, j, k;
-
-            for (i=0; i < selectors.length; i++){
-                selector = selectors[i];
-                for (j=0; j < selector.parts.length; j++){
-                    part = selector.parts[j];
-                    if (part.type == parser.SELECTOR_PART_TYPE){
-                        classCount = 0;
-                        for (k=0; k < part.modifiers.length; k++){
-                            modifier = part.modifiers[k];
-                            if (modifier.type == "class"){
-                                classCount++;
-                            }
-                            if (classCount > 1){
-                                reporter.report("Don't use adjoining classes.", part.line, part.col, rule);
-                            }
-                        }
-                    }
-                }
-            }
-        });
-    }
-
-});
-/*global CSSLint*/
-
-/*
- * Rule: Don't use width or height when using padding or border. 
- */
-CSSLint.addRule({
-
-    //rule information
-    id: "box-model",
-    name: "Beware of broken box size",
-    desc: "Don't use width or height when using padding or border.",
-    browsers: "All",
-
-    //initialization
-    init: function(parser, reporter){
-        var rule = this,
-            widthProperties = {
-                border: 1,
-                "border-left": 1,
-                "border-right": 1,
-                padding: 1,
-                "padding-left": 1,
-                "padding-right": 1
-            },
-            heightProperties = {
-                border: 1,
-                "border-bottom": 1,
-                "border-top": 1,
-                padding: 1,
-                "padding-bottom": 1,
-                "padding-top": 1
-            },
-            properties;
-
-        function startRule(){
-            properties = {};
-        }
-
-        function endRule(){
-            var prop;
-            if (properties.height){
-                for (prop in heightProperties){
-                    if (heightProperties.hasOwnProperty(prop) && properties[prop]){
-                    
-                        //special case for padding
-                        if (!(prop == "padding" && properties[prop].value.parts.length === 2 && properties[prop].value.parts[0].value === 0)){
-                            reporter.report("Using height with " + prop + " can sometimes make elements larger than you expect.", properties[prop].line, properties[prop].col, rule);
-                        }
-                    }
-                }
-            }
-
-            if (properties.width){
-                for (prop in widthProperties){
-                    if (widthProperties.hasOwnProperty(prop) && properties[prop]){
-
-                        if (!(prop == "padding" && properties[prop].value.parts.length === 2 && properties[prop].value.parts[1].value === 0)){
-                            reporter.report("Using width with " + prop + " can sometimes make elements larger than you expect.", properties[prop].line, properties[prop].col, rule);
-                        }
-                    }
-                }
-            }        
-        }
-
-        parser.addListener("startrule", startRule);
-        parser.addListener("startfontface", startRule);
-        parser.addListener("startpage", startRule);
-        parser.addListener("startpagemargin", startRule);
-        parser.addListener("startkeyframerule", startRule); 
-
-        parser.addListener("property", function(event){
-            var name = event.property.text.toLowerCase();
-            
-            if (heightProperties[name] || widthProperties[name]){
-                if (!/^0\S*$/.test(event.value) && !(name == "border" && event.value == "none")){
-                    properties[name] = { line: event.property.line, col: event.property.col, value: event.value };
-                }
-            } else {
-                if (name == "width" || name == "height"){
-                    properties[name] = 1;
-                }
-            }
-            
-        });
-
-        parser.addListener("endrule", endRule);
-        parser.addListener("endfontface", endRule);
-        parser.addListener("endpage", endRule);
-        parser.addListener("endpagemargin", endRule);
-        parser.addListener("endkeyframerule", endRule);         
-    }
-
-});
-/*global CSSLint*/
-
-/*
- * Rule: box-sizing doesn't work in IE6 and IE7.
- */
-CSSLint.addRule({
-
-    //rule information
-    id: "box-sizing",
-    name: "Disallow use of box-sizing",
-    desc: "The box-sizing properties isn't supported in IE6 and IE7.",
-    browsers: "IE6, IE7",
-    tags: ["Compatibility"],
-
-    //initialization
-    init: function(parser, reporter){
-        var rule = this;
-
-        parser.addListener("property", function(event){
-            var name = event.property.text.toLowerCase();
-   
-            if (name == "box-sizing"){
-                reporter.report("The box-sizing property isn't supported in IE6 and IE7.", event.line, event.col, rule);
-            }
-        });       
-    }
-
-});
-/*
- * Rule: Include all compatible vendor prefixes to reach a wider
- * range of users.
- */
-/*global CSSLint*/ 
-CSSLint.addRule({
-
-    //rule information
-    id: "compatible-vendor-prefixes",
-    name: "Require compatible vendor prefixes",
-    desc: "Include all compatible vendor prefixes to reach a wider range of users.",
-    browsers: "All",
-
-    //initialization
-    init: function (parser, reporter) {
-        var rule = this,
-            compatiblePrefixes,
-            properties,
-            prop,
-            variations,
-            prefixed,
-            i,
-            len,
-            arrayPush = Array.prototype.push,
-            applyTo = [];
-
-        // See http://peter.sh/experiments/vendor-prefixed-css-property-overview/ for details
-        compatiblePrefixes = {
-            "animation"                  : "webkit moz ms",
-            "animation-delay"            : "webkit moz ms",
-            "animation-direction"        : "webkit moz ms",
-            "animation-duration"         : "webkit moz ms",
-            "animation-fill-mode"        : "webkit moz ms",
-            "animation-iteration-count"  : "webkit moz ms",
-            "animation-name"             : "webkit moz ms",
-            "animation-play-state"       : "webkit moz ms",
-            "animation-timing-function"  : "webkit moz ms",
-            "appearance"                 : "webkit moz",
-            "border-end"                 : "webkit moz",
-            "border-end-color"           : "webkit moz",
-            "border-end-style"           : "webkit moz",
-            "border-end-width"           : "webkit moz",
-            "border-image"               : "webkit moz o",
-            "border-radius"              : "webkit moz",
-            "border-start"               : "webkit moz",
-            "border-start-color"         : "webkit moz",
-            "border-start-style"         : "webkit moz",
-            "border-start-width"         : "webkit moz",
-            "box-align"                  : "webkit moz ms",
-            "box-direction"              : "webkit moz ms",
-            "box-flex"                   : "webkit moz ms",
-            "box-lines"                  : "webkit ms",
-            "box-ordinal-group"          : "webkit moz ms",
-            "box-orient"                 : "webkit moz ms",
-            "box-pack"                   : "webkit moz ms",
-            "box-sizing"                 : "webkit moz",
-            "box-shadow"                 : "webkit moz",
-            "column-count"               : "webkit moz ms",
-            "column-gap"                 : "webkit moz ms",
-            "column-rule"                : "webkit moz ms",
-            "column-rule-color"          : "webkit moz ms",
-            "column-rule-style"          : "webkit moz ms",
-            "column-rule-width"          : "webkit moz ms",
-            "column-width"               : "webkit moz ms",
-            "hyphens"                    : "epub moz",
-            "line-break"                 : "webkit ms",
-            "margin-end"                 : "webkit moz",
-            "margin-start"               : "webkit moz",
-            "marquee-speed"              : "webkit wap",
-            "marquee-style"              : "webkit wap",
-            "padding-end"                : "webkit moz",
-            "padding-start"              : "webkit moz",
-            "tab-size"                   : "moz o",
-            "text-size-adjust"           : "webkit ms",
-            "transform"                  : "webkit moz ms o",
-            "transform-origin"           : "webkit moz ms o",
-            "transition"                 : "webkit moz o ms",
-            "transition-delay"           : "webkit moz o ms",
-            "transition-duration"        : "webkit moz o ms",
-            "transition-property"        : "webkit moz o ms",
-            "transition-timing-function" : "webkit moz o ms",
-            "user-modify"                : "webkit moz",
-            "user-select"                : "webkit moz ms",
-            "word-break"                 : "epub ms",
-            "writing-mode"               : "epub ms"
-        };
-
-
-        for (prop in compatiblePrefixes) {
-            if (compatiblePrefixes.hasOwnProperty(prop)) {
-                variations = [];
-                prefixed = compatiblePrefixes[prop].split(' ');
-                for (i = 0, len = prefixed.length; i < len; i++) {
-                    variations.push('-' + prefixed[i] + '-' + prop);
-                }
-                compatiblePrefixes[prop] = variations;
-                arrayPush.apply(applyTo, variations);
-            }
-        }
-        parser.addListener("startrule", function () {
-            properties = [];
-        });
-
-        parser.addListener("property", function (event) {
-            var name = event.property;
-            if (CSSLint.Util.indexOf(applyTo, name.text) > -1) {
-                properties.push(name);
-            }
-        });
-
-        parser.addListener("endrule", function (event) {
-            if (!properties.length) {
-                return;
-            }
-
-            var propertyGroups = {},
-                i,
-                len,
-                name,
-                prop,
-                variations,
-                value,
-                full,
-                actual,
-                item,
-                propertiesSpecified;
-
-            for (i = 0, len = properties.length; i < len; i++) {
-                name = properties[i];
-
-                for (prop in compatiblePrefixes) {
-                    if (compatiblePrefixes.hasOwnProperty(prop)) {
-                        variations = compatiblePrefixes[prop];
-                        if (CSSLint.Util.indexOf(variations, name.text) > -1) {
-                            if (!propertyGroups[prop]) {
-                                propertyGroups[prop] = {
-                                    full : variations.slice(0),
-                                    actual : [],
-                                    actualNodes: []
-                                };
-                            }
-                            if (CSSLint.Util.indexOf(propertyGroups[prop].actual, name.text) === -1) {
-                                propertyGroups[prop].actual.push(name.text);
-                                propertyGroups[prop].actualNodes.push(name);
-                            }
-                        }
-                    }
-                }
-            }
-
-            for (prop in propertyGroups) {
-                if (propertyGroups.hasOwnProperty(prop)) {
-                    value = propertyGroups[prop];
-                    full = value.full;
-                    actual = value.actual;
-
-                    if (full.length > actual.length) {
-                        for (i = 0, len = full.length; i < len; i++) {
-                            item = full[i];
-                            if (CSSLint.Util.indexOf(actual, item) === -1) {
-                                propertiesSpecified = (actual.length === 1) ? actual[0] : (actual.length == 2) ? actual.join(" and ") : actual.join(", ");
-                                reporter.report("The property " + item + " is compatible with " + propertiesSpecified + " and should be included as well.", value.actualNodes[0].line, value.actualNodes[0].col, rule); 
-                            }
-                        }
-
-                    }
-                }
-            }
-        });
-    }
-});
-/*
- * Rule: Certain properties don't play well with certain display values. 
- * - float should not be used with inline-block
- * - height, width, margin-top, margin-bottom, float should not be used with inline
- * - vertical-align should not be used with block
- * - margin, float should not be used with table-*
- */
-/*global CSSLint*/
-CSSLint.addRule({
-
-    //rule information
-    id: "display-property-grouping",
-    name: "Require properties appropriate for display",
-    desc: "Certain properties shouldn't be used with certain display property values.",
-    browsers: "All",
-
-    //initialization
-    init: function(parser, reporter){
-        var rule = this;
-
-        var propertiesToCheck = {
-                display: 1,
-                "float": "none",
-                height: 1,
-                width: 1,
-                margin: 1,
-                "margin-left": 1,
-                "margin-right": 1,
-                "margin-bottom": 1,
-                "margin-top": 1,
-                padding: 1,
-                "padding-left": 1,
-                "padding-right": 1,
-                "padding-bottom": 1,
-                "padding-top": 1,
-                "vertical-align": 1
-            },
-            properties;
-
-        function reportProperty(name, display, msg){
-            if (properties[name]){
-                if (typeof propertiesToCheck[name] != "string" || properties[name].value.toLowerCase() != propertiesToCheck[name]){
-                    reporter.report(msg || name + " can't be used with display: " + display + ".", properties[name].line, properties[name].col, rule);
-                }
-            }
-        }
-        
-        function startRule(){
-            properties = {};
-        }
-
-        function endRule(){
-
-            var display = properties.display ? properties.display.value : null;
-            if (display){
-                switch(display){
-
-                    case "inline":
-                        //height, width, margin-top, margin-bottom, float should not be used with inline
-                        reportProperty("height", display);
-                        reportProperty("width", display);
-                        reportProperty("margin", display);
-                        reportProperty("margin-top", display);
-                        reportProperty("margin-bottom", display);              
-                        reportProperty("float", display, "display:inline has no effect on floated elements (but may be used to fix the IE6 double-margin bug).");
-                        break;
-
-                    case "block":
-                        //vertical-align should not be used with block
-                        reportProperty("vertical-align", display);
-                        break;
-
-                    case "inline-block":
-                        //float should not be used with inline-block
-                        reportProperty("float", display);
-                        break;
-
-                    default:
-                        //margin, float should not be used with table
-                        if (display.indexOf("table-") === 0){
-                            reportProperty("margin", display);
-                            reportProperty("margin-left", display);
-                            reportProperty("margin-right", display);
-                            reportProperty("margin-top", display);
-                            reportProperty("margin-bottom", display);
-                            reportProperty("float", display);
-                        }
-
-                        //otherwise do nothing
-                }
-            }
-          
-        }
-
-        parser.addListener("startrule", startRule);
-        parser.addListener("startfontface", startRule);
-        parser.addListener("startkeyframerule", startRule);
-        parser.addListener("startpagemargin", startRule);
-        parser.addListener("startpage", startRule);
-
-        parser.addListener("property", function(event){
-            var name = event.property.text.toLowerCase();
-
-            if (propertiesToCheck[name]){
-                properties[name] = { value: event.value.text, line: event.property.line, col: event.property.col };                    
-            }
-        });
-
-        parser.addListener("endrule", endRule);
-        parser.addListener("endfontface", endRule);
-        parser.addListener("endkeyframerule", endRule);
-        parser.addListener("endpagemargin", endRule);
-        parser.addListener("endpage", endRule);
-
-    }
-
-});
-/*
- * Rule: Disallow duplicate background-images (using url).
- */
-/*global CSSLint*/
-CSSLint.addRule({
-
-    //rule information
-    id: "duplicate-background-images",
-    name: "Disallow duplicate background images",
-    desc: "Every background-image should be unique. Use a common class for e.g. sprites.",
-    browsers: "All",
-
-    //initialization
-    init: function(parser, reporter){
-        var rule = this,
-            stack = {};
-
-        parser.addListener("property", function(event){
-            var name = event.property.text,
-                value = event.value,
-                i, len;
-
-            if (name.match(/background/i)) {
-                for (i=0, len=value.parts.length; i < len; i++) {
-                    if (value.parts[i].type == 'uri') {
-                        if (typeof stack[value.parts[i].uri] === 'undefined') {
-                            stack[value.parts[i].uri] = event;
-                        }
-                        else {
-                            reporter.report("Background image '" + value.parts[i].uri + "' was used multiple times, first declared at line " + stack[value.parts[i].uri].line + ", col " + stack[value.parts[i].uri].col + ".", event.line, event.col, rule);
-                        }
-                    }
-                }
-            }
-        });
-    }
-});
-/*
- * Rule: Duplicate properties must appear one after the other. If an already-defined
- * property appears somewhere else in the rule, then it's likely an error.
- */
-/*global CSSLint*/
-CSSLint.addRule({
-
-    //rule information
-    id: "duplicate-properties",
-    name: "Disallow duplicate properties",
-    desc: "Duplicate properties must appear one after the other.",
-    browsers: "All",
-
-    //initialization
-    init: function(parser, reporter){
-        var rule = this,
-            properties,
-            lastProperty;            
-            
-        function startRule(event){
-            properties = {};        
-        }
-        
-        parser.addListener("startrule", startRule);
-        parser.addListener("startfontface", startRule);
-        parser.addListener("startpage", startRule);
-        parser.addListener("startpagemargin", startRule);
-        parser.addListener("startkeyframerule", startRule);        
-        
-        parser.addListener("property", function(event){
-            var property = event.property,
-                name = property.text.toLowerCase();
-            
-            if (properties[name] && (lastProperty != name || properties[name] == event.value.text)){
-                reporter.report("Duplicate property '" + event.property + "' found.", event.line, event.col, rule);
-            }
-            
-            properties[name] = event.value.text;
-            lastProperty = name;
-                        
-        });
-            
-        
-    }
-
-});
-/*
- * Rule: Style rules without any properties defined should be removed.
- */
-/*global CSSLint*/
-CSSLint.addRule({
-
-    //rule information
-    id: "empty-rules",
-    name: "Disallow empty rules",
-    desc: "Rules without any properties specified should be removed.",
-    browsers: "All",
-
-    //initialization
-    init: function(parser, reporter){
-        var rule = this,
-            count = 0;
-
-        parser.addListener("startrule", function(){
-            count=0;
-        });
-
-        parser.addListener("property", function(){
-            count++;
-        });
-
-        parser.addListener("endrule", function(event){
-            var selectors = event.selectors;
-            if (count === 0){
-                reporter.report("Rule is empty.", selectors[0].line, selectors[0].col, rule);
-            }
-        });
-    }
-
-});
-/*
- * Rule: There should be no syntax errors. (Duh.)
- */
-/*global CSSLint*/
-CSSLint.addRule({
-
-    //rule information
-    id: "errors",
-    name: "Parsing Errors",
-    desc: "This rule looks for recoverable syntax errors.",
-    browsers: "All",
-
-    //initialization
-    init: function(parser, reporter){
-        var rule = this;
-
-        parser.addListener("error", function(event){
-            reporter.error(event.message, event.line, event.col, rule);
-        });
-
-    }
-
-});
-
-/*global CSSLint*/
-CSSLint.addRule({
-
-    //rule information
-    id: "fallback-colors",
-    name: "Require fallback colors",
-    desc: "For older browsers that don't support RGBA, HSL, or HSLA, provide a fallback color.",
-    browsers: "IE6,IE7,IE8",
-
-    //initialization
-    init: function(parser, reporter){
-        var rule = this,
-            lastProperty,
-            propertiesToCheck = {
-                color: 1,
-                background: 1,
-                "background-color": 1                
-            },
-            properties;
-        
-        function startRule(event){
-            properties = {};    
-            lastProperty = null;    
-        }
-        
-        parser.addListener("startrule", startRule);
-        parser.addListener("startfontface", startRule);
-        parser.addListener("startpage", startRule);
-        parser.addListener("startpagemargin", startRule);
-        parser.addListener("startkeyframerule", startRule);        
-        
-        parser.addListener("property", function(event){
-            var property = event.property,
-                name = property.text.toLowerCase(),
-                parts = event.value.parts,
-                i = 0, 
-                colorType = "",
-                len = parts.length;                
-                        
-            if(propertiesToCheck[name]){
-                while(i < len){
-                    if (parts[i].type == "color"){
-                        if ("alpha" in parts[i] || "hue" in parts[i]){
-                            
-                            if (/([^\)]+)\(/.test(parts[i])){
-                                colorType = RegExp.$1.toUpperCase();
-                            }
-                            
-                            if (!lastProperty || (lastProperty.property.text.toLowerCase() != name || lastProperty.colorType != "compat")){
-                                reporter.report("Fallback " + name + " (hex or RGB) should precede " + colorType + " " + name + ".", event.line, event.col, rule);
-                            }
-                        } else {
-                            event.colorType = "compat";
-                        }
-                    }
-                    
-                    i++;
-                }
-            }
-
-            lastProperty = event;
-        });        
-         
-    }
-
-});
-/*
- * Rule: You shouldn't use more than 10 floats. If you do, there's probably
- * room for some abstraction.
- */
-/*global CSSLint*/
-CSSLint.addRule({
-
-    //rule information
-    id: "floats",
-    name: "Disallow too many floats",
-    desc: "This rule tests if the float property is used too many times",
-    browsers: "All",
-
-    //initialization
-    init: function(parser, reporter){
-        var rule = this;
-        var count = 0;
-
-        //count how many times "float" is used
-        parser.addListener("property", function(event){
-            if (event.property.text.toLowerCase() == "float" &&
-                    event.value.text.toLowerCase() != "none"){
-                count++;
-            }
-        });
-
-        //report the results
-        parser.addListener("endstylesheet", function(){
-            reporter.stat("floats", count);
-            if (count >= 10){
-                reporter.rollupWarn("Too many floats (" + count + "), you're probably using them for layout. Consider using a grid system instead.", rule);
-            }
-        });
-    }
-
-});
-/*
- * Rule: Avoid too many @font-face declarations in the same stylesheet.
- */
-/*global CSSLint*/
-CSSLint.addRule({
-
-    //rule information
-    id: "font-faces",
-    name: "Don't use too many web fonts",
-    desc: "Too many different web fonts in the same stylesheet.",
-    browsers: "All",
-
-    //initialization
-    init: function(parser, reporter){
-        var rule = this,
-            count = 0;
-
-
-        parser.addListener("startfontface", function(){
-            count++;
-        });
-
-        parser.addListener("endstylesheet", function(){
-            if (count > 5){
-                reporter.rollupWarn("Too many @font-face declarations (" + count + ").", rule);
-            }
-        });
-    }
-
-});
-/*
- * Rule: You shouldn't need more than 9 font-size declarations.
- */
-
-/*global CSSLint*/
-CSSLint.addRule({
-
-    //rule information
-    id: "font-sizes",
-    name: "Disallow too many font sizes",
-    desc: "Checks the number of font-size declarations.",
-    browsers: "All",
-
-    //initialization
-    init: function(parser, reporter){
-        var rule = this,
-            count = 0;
-
-        //check for use of "font-size"
-        parser.addListener("property", function(event){
-            if (event.property == "font-size"){
-                count++;
-            }
-        });
-
-        //report the results
-        parser.addListener("endstylesheet", function(){
-            reporter.stat("font-sizes", count);
-            if (count >= 10){
-                reporter.rollupWarn("Too many font-size declarations (" + count + "), abstraction needed.", rule);
-            }
-        });
-    }
-
-});
-/*
- * Rule: When using a vendor-prefixed gradient, make sure to use them all.
- */
-/*global CSSLint*/
-CSSLint.addRule({
-
-    //rule information
-    id: "gradients",
-    name: "Require all gradient definitions",
-    desc: "When using a vendor-prefixed gradient, make sure to use them all.",
-    browsers: "All",
-
-    //initialization
-    init: function(parser, reporter){
-        var rule = this,
-            gradients;
-
-        parser.addListener("startrule", function(){
-            gradients = {
-                moz: 0,
-                webkit: 0,
-                oldWebkit: 0,
-                ms: 0,
-                o: 0
-            };
-        });
-
-        parser.addListener("property", function(event){
-
-            if (/\-(moz|ms|o|webkit)(?:\-(?:linear|radial))\-gradient/i.test(event.value)){
-                gradients[RegExp.$1] = 1;
-            } else if (/\-webkit\-gradient/i.test(event.value)){
-                gradients.oldWebkit = 1;
-            }
-
-        });
-
-        parser.addListener("endrule", function(event){
-            var missing = [];
-
-            if (!gradients.moz){
-                missing.push("Firefox 3.6+");
-            }
-
-            if (!gradients.webkit){
-                missing.push("Webkit (Safari 5+, Chrome)");
-            }
-            
-            if (!gradients.oldWebkit){
-                missing.push("Old Webkit (Safari 4+, Chrome)");
-            }
-
-            if (!gradients.ms){
-                missing.push("Internet Explorer 10+");
-            }
-
-            if (!gradients.o){
-                missing.push("Opera 11.1+");
-            }
-
-            if (missing.length && missing.length < 5){            
-                reporter.report("Missing vendor-prefixed CSS gradients for " + missing.join(", ") + ".", event.selectors[0].line, event.selectors[0].col, rule); 
-            }
-
-        });
-
-    }
-
-});
-/*
- * Rule: Don't use IDs for selectors.
- */
-/*global CSSLint*/
-CSSLint.addRule({
-
-    //rule information
-    id: "ids",
-    name: "Disallow IDs in selectors",
-    desc: "Selectors should not contain IDs.",
-    browsers: "All",
-
-    //initialization
-    init: function(parser, reporter){
-        var rule = this;
-        parser.addListener("startrule", function(event){
-            var selectors = event.selectors,
-                selector,
-                part,
-                modifier,
-                idCount,
-                i, j, k;
-
-            for (i=0; i < selectors.length; i++){
-                selector = selectors[i];
-                idCount = 0;
-
-                for (j=0; j < selector.parts.length; j++){
-                    part = selector.parts[j];
-                    if (part.type == parser.SELECTOR_PART_TYPE){
-                        for (k=0; k < part.modifiers.length; k++){
-                            modifier = part.modifiers[k];
-                            if (modifier.type == "id"){
-                                idCount++;
-                            }
-                        }
-                    }
-                }
-
-                if (idCount == 1){
-                    reporter.report("Don't use IDs in selectors.", selector.line, selector.col, rule);
-                } else if (idCount > 1){
-                    reporter.report(idCount + " IDs in the selector, really?", selector.line, selector.col, rule);
-                }
-            }
-
-        });
-    }
-
-});
-/*
- * Rule: Don't use @import, use <link> instead.
- */
-/*global CSSLint*/
-CSSLint.addRule({
-
-    //rule information
-    id: "import",
-    name: "Disallow @import",
-    desc: "Don't use @import, use <link> instead.",
-    browsers: "All",
-
-    //initialization
-    init: function(parser, reporter){
-        var rule = this;
-        
-        parser.addListener("import", function(event){        
-            reporter.report("@import prevents parallel downloads, use <link> instead.", event.line, event.col, rule);
-        });
-
-    }
-
-});
-/*
- * Rule: Make sure !important is not overused, this could lead to specificity
- * war. Display a warning on !important declarations, an error if it's
- * used more at least 10 times.
- */
-/*global CSSLint*/
-CSSLint.addRule({
-
-    //rule information
-    id: "important",
-    name: "Disallow !important",
-    desc: "Be careful when using !important declaration",
-    browsers: "All",
-
-    //initialization
-    init: function(parser, reporter){
-        var rule = this,
-            count = 0;
-
-        //warn that important is used and increment the declaration counter
-        parser.addListener("property", function(event){
-            if (event.important === true){
-                count++;
-                reporter.report("Use of !important", event.line, event.col, rule);
-            }
-        });
-
-        //if there are more than 10, show an error
-        parser.addListener("endstylesheet", function(){
-            reporter.stat("important", count);
-            if (count >= 10){
-                reporter.rollupWarn("Too many !important declarations (" + count + "), try to use less than 10 to avoid specifity issues.", rule);
-            }
-        });
-    }
-
-});
-/*
- * Rule: Properties should be known (listed in CSS3 specification) or
- * be a vendor-prefixed property.
- */
-/*global CSSLint*/
-CSSLint.addRule({
-
-    //rule information
-    id: "known-properties",
-    name: "Require use of known properties",
-    desc: "Properties should be known (listed in CSS specification) or be a vendor-prefixed property.",
-    browsers: "All",
-
-    //initialization
-    init: function(parser, reporter){
-        var rule = this,
-            properties = {
-
-                "alignment-adjust": 1,
-                "alignment-baseline": 1,
-                "animation": 1,
-                "animation-delay": 1,
-                "animation-direction": 1,
-                "animation-duration": 1,
-                "animation-fill-mode": 1,
-                "animation-iteration-count": 1,
-                "animation-name": 1,
-                "animation-play-state": 1,
-                "animation-timing-function": 1,
-                "appearance": 1,
-                "azimuth": 1,
-                "backface-visibility": 1,
-                "background": 1,
-                "background-attachment": 1,
-                "background-break": 1,
-                "background-clip": 1,
-                "background-color": 1,
-                "background-image": 1,
-                "background-origin": 1,
-                "background-position": 1,
-                "background-repeat": 1,
-                "background-size": 1,
-                "baseline-shift": 1,
-                "binding": 1,
-                "bleed": 1,
-                "bookmark-label": 1,
-                "bookmark-level": 1,
-                "bookmark-state": 1,
-                "bookmark-target": 1,
-                "border": 1,
-                "border-bottom": 1,
-                "border-bottom-color": 1,
-                "border-bottom-left-radius": 1,
-                "border-bottom-right-radius": 1,
-                "border-bottom-style": 1,
-                "border-bottom-width": 1,
-                "border-collapse": 1,
-                "border-color": 1,
-                "border-image": 1,
-                "border-image-outset": 1,
-                "border-image-repeat": 1,
-                "border-image-slice": 1,
-                "border-image-source": 1,
-                "border-image-width": 1,
-                "border-left": 1,
-                "border-left-color": 1,
-                "border-left-style": 1,
-                "border-left-width": 1,
-                "border-radius": 1,
-                "border-right": 1,
-                "border-right-color": 1,
-                "border-right-style": 1,
-                "border-right-width": 1,
-                "border-spacing": 1,
-                "border-style": 1,
-                "border-top": 1,
-                "border-top-color": 1,
-                "border-top-left-radius": 1,
-                "border-top-right-radius": 1,
-                "border-top-style": 1,
-                "border-top-width": 1,
-                "border-width": 1,
-                "bottom": 1, 
-                "box-align": 1,
-                "box-decoration-break": 1,
-                "box-direction": 1,
-                "box-flex": 1,
-                "box-flex-group": 1,
-                "box-lines": 1,
-                "box-ordinal-group": 1,
-                "box-orient": 1,
-                "box-pack": 1,
-                "box-shadow": 1,
-                "box-sizing": 1,
-                "break-after": 1,
-                "break-before": 1,
-                "break-inside": 1,
-                "caption-side": 1,
-                "clear": 1,
-                "clip": 1,
-                "color": 1,
-                "color-profile": 1,
-                "column-count": 1,
-                "column-fill": 1,
-                "column-gap": 1,
-                "column-rule": 1,
-                "column-rule-color": 1,
-                "column-rule-style": 1,
-                "column-rule-width": 1,
-                "column-span": 1,
-                "column-width": 1,
-                "columns": 1,
-                "content": 1,
-                "counter-increment": 1,
-                "counter-reset": 1,
-                "crop": 1,
-                "cue": 1,
-                "cue-after": 1,
-                "cue-before": 1,
-                "cursor": 1,
-                "direction": 1,
-                "display": 1,
-                "dominant-baseline": 1,
-                "drop-initial-after-adjust": 1,
-                "drop-initial-after-align": 1,
-                "drop-initial-before-adjust": 1,
-                "drop-initial-before-align": 1,
-                "drop-initial-size": 1,
-                "drop-initial-value": 1,
-                "elevation": 1,
-                "empty-cells": 1,
-                "fit": 1,
-                "fit-position": 1,
-                "float": 1,                
-                "float-offset": 1,
-                "font": 1,
-                "font-family": 1,
-                "font-size": 1,
-                "font-size-adjust": 1,
-                "font-stretch": 1,
-                "font-style": 1,
-                "font-variant": 1,
-                "font-weight": 1,
-                "grid-columns": 1,
-                "grid-rows": 1,
-                "hanging-punctuation": 1,
-                "height": 1,
-                "hyphenate-after": 1,
-                "hyphenate-before": 1,
-                "hyphenate-character": 1,
-                "hyphenate-lines": 1,
-                "hyphenate-resource": 1,
-                "hyphens": 1,
-                "icon": 1,
-                "image-orientation": 1,
-                "image-rendering": 1,
-                "image-resolution": 1,
-                "inline-box-align": 1,
-                "left": 1,
-                "letter-spacing": 1,
-                "line-height": 1,
-                "line-stacking": 1,
-                "line-stacking-ruby": 1,
-                "line-stacking-shift": 1,
-                "line-stacking-strategy": 1,
-                "list-style": 1,
-                "list-style-image": 1,
-                "list-style-position": 1,
-                "list-style-type": 1,
-                "margin": 1,
-                "margin-bottom": 1,
-                "margin-left": 1,
-                "margin-right": 1,
-                "margin-top": 1,
-                "mark": 1,
-                "mark-after": 1,
-                "mark-before": 1,
-                "marks": 1,
-                "marquee-direction": 1,
-                "marquee-play-count": 1,
-                "marquee-speed": 1,
-                "marquee-style": 1,
-                "max-height": 1,
-                "max-width": 1,
-                "min-height": 1,
-                "min-width": 1,
-                "move-to": 1,
-                "nav-down": 1,
-                "nav-index": 1,
-                "nav-left": 1,
-                "nav-right": 1,
-                "nav-up": 1,
-                "opacity": 1,
-                "orphans": 1,
-                "outline": 1,
-                "outline-color": 1,
-                "outline-offset": 1,
-                "outline-style": 1,
-                "outline-width": 1,
-                "overflow": 1,
-                "overflow-style": 1,
-                "overflow-x": 1,
-                "overflow-y": 1,
-                "padding": 1,
-                "padding-bottom": 1,
-                "padding-left": 1,
-                "padding-right": 1,
-                "padding-top": 1,
-                "page": 1,
-                "page-break-after": 1,
-                "page-break-before": 1,
-                "page-break-inside": 1,
-                "page-policy": 1,
-                "pause": 1,
-                "pause-after": 1,
-                "pause-before": 1,
-                "perspective": 1,
-                "perspective-origin": 1,
-                "phonemes": 1,
-                "pitch": 1,
-                "pitch-range": 1,
-                "play-during": 1,
-                "position": 1,
-                "presentation-level": 1,
-                "punctuation-trim": 1,
-                "quotes": 1,
-                "rendering-intent": 1,
-                "resize": 1,
-                "rest": 1,
-                "rest-after": 1,
-                "rest-before": 1,
-                "richness": 1,
-                "right": 1,
-                "rotation": 1,
-                "rotation-point": 1,
-                "ruby-align": 1,
-                "ruby-overhang": 1,
-                "ruby-position": 1,
-                "ruby-span": 1,
-                "size": 1,
-                "speak": 1,
-                "speak-header": 1,
-                "speak-numeral": 1,
-                "speak-punctuation": 1,
-                "speech-rate": 1,
-                "stress": 1,
-                "string-set": 1,
-                "table-layout": 1,
-                "target": 1,
-                "target-name": 1,
-                "target-new": 1,
-                "target-position": 1,
-                "text-align": 1,
-                "text-align-last": 1,
-                "text-decoration": 1,
-                "text-emphasis": 1,
-                "text-height": 1,
-                "text-indent": 1,
-                "text-justify": 1,
-                "text-outline": 1,
-                "text-shadow": 1,
-                "text-transform": 1,
-                "text-wrap": 1,
-                "top": 1,
-                "transform": 1,
-                "transform-origin": 1,
-                "transform-style": 1,
-                "transition": 1,
-                "transition-delay": 1,
-                "transition-duration": 1,
-                "transition-property": 1,
-                "transition-timing-function": 1,
-                "unicode-bidi": 1,
-                "user-modify": 1,
-                "user-select": 1,
-                "vertical-align": 1,
-                "visibility": 1,
-                "voice-balance": 1,
-                "voice-duration": 1,
-                "voice-family": 1,
-                "voice-pitch": 1,
-                "voice-pitch-range": 1,
-                "voice-rate": 1,
-                "voice-stress": 1,
-                "voice-volume": 1,
-                "volume": 1,
-                "white-space": 1,
-                "white-space-collapse": 1,
-                "widows": 1,
-                "width": 1,
-                "word-break": 1,
-                "word-spacing": 1,
-                "word-wrap": 1,
-                "z-index": 1,
-                
-                //IE
-                "filter": 1,
-                "zoom": 1,
-                
-                //@font-face
-                "src": 1
-            };
-
-        parser.addListener("property", function(event){
-            var name = event.property.text.toLowerCase();
-
-            if (event.invalid) {
-                reporter.report(event.invalid.message, event.line, event.col, rule);
-            }
-            //if (!properties[name] && name.charAt(0) != "-"){
-            //    reporter.error("Unknown property '" + event.property + "'.", event.line, event.col, rule);
-            //}
-
-        });
-    }
-
-});
-/*
- * Rule: outline: none or outline: 0 should only be used in a :focus rule
- *       and only if there are other properties in the same rule.
- */
-/*global CSSLint*/
-CSSLint.addRule({
-
-    //rule information
-    id: "outline-none",
-    name: "Disallow outline: none",
-    desc: "Use of outline: none or outline: 0 should be limited to :focus rules.",
-    browsers: "All",
-    tags: ["Accessibility"],
-
-    //initialization
-    init: function(parser, reporter){
-        var rule = this,
-            lastRule;
-
-        function startRule(event){
-            if (event.selectors){
-                lastRule = {
-                    line: event.line,
-                    col: event.col,
-                    selectors: event.selectors,
-                    propCount: 0,
-                    outline: false
-                };
-            } else {
-                lastRule = null;
-            }
-        }
-        
-        function endRule(event){
-            if (lastRule){
-                if (lastRule.outline){
-                    if (lastRule.selectors.toString().toLowerCase().indexOf(":focus") == -1){
-                        reporter.report("Outlines should only be modified using :focus.", lastRule.line, lastRule.col, rule);
-                    } else if (lastRule.propCount == 1) {
-                        reporter.report("Outlines shouldn't be hidden unless other visual changes are made.", lastRule.line, lastRule.col, rule);                        
-                    }
-                }
-            }
-        }
-
-        parser.addListener("startrule", startRule);
-        parser.addListener("startfontface", startRule);
-        parser.addListener("startpage", startRule);
-        parser.addListener("startpagemargin", startRule);
-        parser.addListener("startkeyframerule", startRule); 
-
-        parser.addListener("property", function(event){
-            var name = event.property.text.toLowerCase(),
-                value = event.value;                
-                
-            if (lastRule){
-                lastRule.propCount++;
-                if (name == "outline" && (value == "none" || value == "0")){
-                    lastRule.outline = true;
-                }            
-            }
-            
-        });
-        
-        parser.addListener("endrule", endRule);
-        parser.addListener("endfontface", endRule);
-        parser.addListener("endpage", endRule);
-        parser.addListener("endpagemargin", endRule);
-        parser.addListener("endkeyframerule", endRule); 
-
-    }
-
-});
-/*
- * Rule: Don't use classes or IDs with elements (a.foo or a#foo).
- */
-/*global CSSLint*/
-CSSLint.addRule({
-
-    //rule information
-    id: "overqualified-elements",
-    name: "Disallow overqualified elements",
-    desc: "Don't use classes or IDs with elements (a.foo or a#foo).",
-    browsers: "All",
-
-    //initialization
-    init: function(parser, reporter){
-        var rule = this,
-            classes = {};
-            
-        parser.addListener("startrule", function(event){
-            var selectors = event.selectors,
-                selector,
-                part,
-                modifier,
-                i, j, k;
-
-            for (i=0; i < selectors.length; i++){
-                selector = selectors[i];
-
-                for (j=0; j < selector.parts.length; j++){
-                    part = selector.parts[j];
-                    if (part.type == parser.SELECTOR_PART_TYPE){
-                        for (k=0; k < part.modifiers.length; k++){
-                            modifier = part.modifiers[k];
-                            if (part.elementName && modifier.type == "id"){
-                                reporter.report("Element (" + part + ") is overqualified, just use " + modifier + " without element name.", part.line, part.col, rule);
-                            } else if (modifier.type == "class"){
-                                
-                                if (!classes[modifier]){
-                                    classes[modifier] = [];
-                                }
-                                classes[modifier].push({ modifier: modifier, part: part });
-                            }
-                        }
-                    }
-                }
-            }
-        });
-        
-        parser.addListener("endstylesheet", function(){
-        
-            var prop;
-            for (prop in classes){
-                if (classes.hasOwnProperty(prop)){
-                
-                    //one use means that this is overqualified
-                    if (classes[prop].length == 1 && classes[prop][0].part.elementName){
-                        reporter.report("Element (" + classes[prop][0].part + ") is overqualified, just use " + classes[prop][0].modifier + " without element name.", classes[prop][0].part.line, classes[prop][0].part.col, rule);
-                    }
-                }
-            }        
-        });
-    }
-
-});
-/*
- * Rule: Headings (h1-h6) should not be qualified (namespaced).
- */
-/*global CSSLint*/
-CSSLint.addRule({
-
-    //rule information
-    id: "qualified-headings",
-    name: "Disallow qualified headings",
-    desc: "Headings should not be qualified (namespaced).",
-    browsers: "All",
-
-    //initialization
-    init: function(parser, reporter){
-        var rule = this;
-
-        parser.addListener("startrule", function(event){
-            var selectors = event.selectors,
-                selector,
-                part,
-                i, j;
-
-            for (i=0; i < selectors.length; i++){
-                selector = selectors[i];
-
-                for (j=0; j < selector.parts.length; j++){
-                    part = selector.parts[j];
-                    if (part.type == parser.SELECTOR_PART_TYPE){
-                        if (part.elementName && /h[1-6]/.test(part.elementName.toString()) && j > 0){
-                            reporter.report("Heading (" + part.elementName + ") should not be qualified.", part.line, part.col, rule);
-                        }
-                    }
-                }
-            }
-        });
-    }
-
-});
-/*
- * Rule: Selectors that look like regular expressions are slow and should be avoided.
- */
-/*global CSSLint*/
-CSSLint.addRule({
-
-    //rule information
-    id: "regex-selectors",
-    name: "Disallow selectors that look like regexs",
-    desc: "Selectors that look like regular expressions are slow and should be avoided.",
-    browsers: "All",
-
-    //initialization
-    init: function(parser, reporter){
-        var rule = this;
-
-        parser.addListener("startrule", function(event){
-            var selectors = event.selectors,
-                selector,
-                part,
-                modifier,
-                i, j, k;
-
-            for (i=0; i < selectors.length; i++){
-                selector = selectors[i];
-                for (j=0; j < selector.parts.length; j++){
-                    part = selector.parts[j];
-                    if (part.type == parser.SELECTOR_PART_TYPE){
-                        for (k=0; k < part.modifiers.length; k++){
-                            modifier = part.modifiers[k];
-                            if (modifier.type == "attribute"){
-                                if (/([\~\|\^\$\*]=)/.test(modifier)){
-                                    reporter.report("Attribute selectors with " + RegExp.$1 + " are slow!", modifier.line, modifier.col, rule);
-                                }
-                            }
-
-                        }
-                    }
-                }
-            }
-        });
-    }
-
-});
-/*
- * Rule: Total number of rules should not exceed x.
- */
-/*global CSSLint*/
-CSSLint.addRule({
-
-    //rule information
-    id: "rules-count",
-    name: "Rules Count",
-    desc: "Track how many rules there are.",
-    browsers: "All",
-
-    //initialization
-    init: function(parser, reporter){
-        var rule = this,
-            count = 0;
-
-        //count each rule
-        parser.addListener("startrule", function(){
-            count++;
-        });
-
-        parser.addListener("endstylesheet", function(){
-            reporter.stat("rule-count", count);
-        });
-    }
-
-});
-/*
- * Rule: Use shorthand properties where possible.
- * 
- */
-/*global CSSLint*/
-CSSLint.addRule({
-
-    //rule information
-    id: "shorthand",
-    name: "Require shorthand properties",
-    desc: "Use shorthand properties where possible.",
-    browsers: "All",
-    
-    //initialization
-    init: function(parser, reporter){
-        var rule = this,
-            prop, i, len,
-            propertiesToCheck = {},
-            properties,
-            mapping = {
-                "margin": [
-                    "margin-top",
-                    "margin-bottom",
-                    "margin-left",
-                    "margin-right"
-                ],
-                "padding": [
-                    "padding-top",
-                    "padding-bottom",
-                    "padding-left",
-                    "padding-right"
-                ]              
-            };
-            
-        //initialize propertiesToCheck 
-        for (prop in mapping){
-            if (mapping.hasOwnProperty(prop)){
-                for (i=0, len=mapping[prop].length; i < len; i++){
-                    propertiesToCheck[mapping[prop][i]] = prop;
-                }
-            }
-        }
-            
-        function startRule(event){
-            properties = {};
-        }
-        
-        //event handler for end of rules
-        function endRule(event){
-            
-            var prop, i, len, total;
-            
-            //check which properties this rule has
-            for (prop in mapping){
-                if (mapping.hasOwnProperty(prop)){
-                    total=0;
-                    
-                    for (i=0, len=mapping[prop].length; i < len; i++){
-                        total += properties[mapping[prop][i]] ? 1 : 0;
-                    }
-                    
-                    if (total == mapping[prop].length){
-                        reporter.report("The properties " + mapping[prop].join(", ") + " can be replaced by " + prop + ".", event.line, event.col, rule);
-                    }
-                }
-            }
-        }        
-        
-        parser.addListener("startrule", startRule);
-        parser.addListener("startfontface", startRule);
-    
-        //check for use of "font-size"
-        parser.addListener("property", function(event){
-            var name = event.property.toString().toLowerCase(),
-                value = event.value.parts[0].value;
-
-            if (propertiesToCheck[name]){
-                properties[name] = 1;
-            }
-        });
-
-        parser.addListener("endrule", endRule);
-        parser.addListener("endfontface", endRule);     
-
-    }
-
-});
-/*
- * Rule: Don't use text-indent for image replacement if you need to support rtl. 
- * 
- */
-/*global CSSLint*/
-CSSLint.addRule({
-
-    //rule information
-    id: "text-indent",
-    name: "Disallow negative text-indent",
-    desc: "Checks for text indent less than -99px",
-    browsers: "All",
-    
-    //initialization
-    init: function(parser, reporter){
-        var rule = this,
-            textIndent = false;
-            
-            
-        function startRule(event){
-            textIndent = false;
-        }
-        
-        //event handler for end of rules
-        function endRule(event){
-            if (textIndent){
-                reporter.report("Negative text-indent doesn't work well with RTL. If you use text-indent for image replacement explicitly set direction for that item to ltr.", textIndent.line, textIndent.col, rule);
-            }
-        }        
-        
-        parser.addListener("startrule", startRule);
-        parser.addListener("startfontface", startRule);
-    
-        //check for use of "font-size"
-        parser.addListener("property", function(event){
-            var name = event.property.toString().toLowerCase(),
-                value = event.value;
-
-            if (name == "text-indent" && value.parts[0].value < -99){
-                textIndent = event.property;
-            } else if (name == "direction" && value == "ltr"){
-                textIndent = false;
-            }
-        });
-
-        parser.addListener("endrule", endRule);
-        parser.addListener("endfontface", endRule);     
-
-    }
-
-});
-/*
- * Rule: Headings (h1-h6) should be defined only once.
- */
-/*global CSSLint*/
-CSSLint.addRule({
-
-    //rule information
-    id: "unique-headings",
-    name: "Headings should only be defined once",
-    desc: "Headings should be defined only once.",
-    browsers: "All",
-
-    //initialization
-    init: function(parser, reporter){
-        var rule = this;
-
-        var headings =  {
-                h1: 0,
-                h2: 0,
-                h3: 0,
-                h4: 0,
-                h5: 0,
-                h6: 0
-            };
-
-        parser.addListener("startrule", function(event){
-            var selectors = event.selectors,
-                selector,
-                part,
-                pseudo,
-                i, j;
-
-            for (i=0; i < selectors.length; i++){
-                selector = selectors[i];
-                part = selector.parts[selector.parts.length-1];
-
-                if (part.elementName && /(h[1-6])/i.test(part.elementName.toString())){
-                    
-                    for (j=0; j < part.modifiers.length; j++){
-                        if (part.modifiers[j].type == "pseudo"){
-                            pseudo = true;
-                            break;
-                        }
-                    }
-                
-                    if (!pseudo){
-                        headings[RegExp.$1]++;
-                        if (headings[RegExp.$1] > 1) {
-                            reporter.report("Heading (" + part.elementName + ") has already been defined.", part.line, part.col, rule);
-                        }
-                    }
-                }
-            }
-        });
-        
-        parser.addListener("endstylesheet", function(event){
-            var prop,
-                messages = [];
-                
-            for (prop in headings){
-                if (headings.hasOwnProperty(prop)){
-                    if (headings[prop] > 1){
-                        messages.push(headings[prop] + " " + prop + "s");
-                    }
-                }
-            }
-            
-            if (messages.length){
-                reporter.rollupWarn("You have " + messages.join(", ") + " defined in this stylesheet.", rule);
-            }
-        });        
-    }
-
-});
-/*
- * Rule: Don't use universal selector because it's slow.
- */
-/*global CSSLint*/
-CSSLint.addRule({
-
-    //rule information
-    id: "universal-selector",
-    name: "Disallow universal selector",
-    desc: "The universal selector (*) is known to be slow.",
-    browsers: "All",
-
-    //initialization
-    init: function(parser, reporter){
-        var rule = this;
-
-        parser.addListener("startrule", function(event){
-            var selectors = event.selectors,
-                selector,
-                part,
-                modifier,
-                i, j, k;
-
-            for (i=0; i < selectors.length; i++){
-                selector = selectors[i];
-                
-                part = selector.parts[selector.parts.length-1];
-                if (part.elementName == "*"){
-                    reporter.report(rule.desc, part.line, part.col, rule);
-                }
-            }
-        });
-    }
-
-});
-/*
- * Rule: Don't use unqualified attribute selectors because they're just like universal selectors.
- */
-/*global CSSLint*/
-CSSLint.addRule({
-
-    //rule information
-    id: "unqualified-attributes",
-    name: "Disallow unqualified attribute selectors",
-    desc: "Unqualified attribute selectors are known to be slow.",
-    browsers: "All",
-
-    //initialization
-    init: function(parser, reporter){
-        var rule = this;
-
-        parser.addListener("startrule", function(event){
-            
-            var selectors = event.selectors,
-                selector,
-                part,
-                modifier,
-                i, j, k;
-
-            for (i=0; i < selectors.length; i++){
-                selector = selectors[i];
-                
-                part = selector.parts[selector.parts.length-1];
-                if (part.type == parser.SELECTOR_PART_TYPE){
-                    for (k=0; k < part.modifiers.length; k++){
-                        modifier = part.modifiers[k];
-                        if (modifier.type == "attribute" && (!part.elementName || part.elementName == "*")){
-                            reporter.report(rule.desc, part.line, part.col, rule);                               
-                        }
-                    }
-                }
-                
-            }            
-        });
-    }
-
-});
-/*
- * Rule: When using a vendor-prefixed property, make sure to
- * include the standard one.
- */
-/*global CSSLint*/
-CSSLint.addRule({
-
-    //rule information
-    id: "vendor-prefix",
-    name: "Require standard property with vendor prefix",
-    desc: "When using a vendor-prefixed property, make sure to include the standard one.",
-    browsers: "All",
-
-    //initialization
-    init: function(parser, reporter){
-        var rule = this,
-            properties,
-            num,
-            propertiesToCheck = {
-                "-webkit-border-radius": "border-radius",
-                "-webkit-border-top-left-radius": "border-top-left-radius",
-                "-webkit-border-top-right-radius": "border-top-right-radius",
-                "-webkit-border-bottom-left-radius": "border-bottom-left-radius",
-                "-webkit-border-bottom-right-radius": "border-bottom-right-radius",
-                
-                "-o-border-radius": "border-radius",
-                "-o-border-top-left-radius": "border-top-left-radius",
-                "-o-border-top-right-radius": "border-top-right-radius",
-                "-o-border-bottom-left-radius": "border-bottom-left-radius",
-                "-o-border-bottom-right-radius": "border-bottom-right-radius",
-                
-                "-moz-border-radius": "border-radius",
-                "-moz-border-radius-topleft": "border-top-left-radius",
-                "-moz-border-radius-topright": "border-top-right-radius",
-                "-moz-border-radius-bottomleft": "border-bottom-left-radius",
-                "-moz-border-radius-bottomright": "border-bottom-right-radius",                
-                
-                "-moz-column-count": "column-count",
-                "-webkit-column-count": "column-count",
-                
-                "-moz-column-gap": "column-gap",
-                "-webkit-column-gap": "column-gap",
-                
-                "-moz-column-rule": "column-rule",
-                "-webkit-column-rule": "column-rule",
-                
-                "-moz-column-rule-style": "column-rule-style",
-                "-webkit-column-rule-style": "column-rule-style",
-                
-                "-moz-column-rule-color": "column-rule-color",
-                "-webkit-column-rule-color": "column-rule-color",
-                
-                "-moz-column-rule-width": "column-rule-width",
-                "-webkit-column-rule-width": "column-rule-width",
-                
-                "-moz-column-width": "column-width",
-                "-webkit-column-width": "column-width",
-                
-                "-webkit-column-span": "column-span",
-                "-webkit-columns": "columns",
-                
-                "-moz-box-shadow": "box-shadow",
-                "-webkit-box-shadow": "box-shadow",
-                
-                "-moz-transform" : "transform",
-                "-webkit-transform" : "transform",
-                "-o-transform" : "transform",
-                "-ms-transform" : "transform",
-                
-                "-moz-transform-origin" : "transform-origin",
-                "-webkit-transform-origin" : "transform-origin",
-                "-o-transform-origin" : "transform-origin",
-                "-ms-transform-origin" : "transform-origin",
-                
-                "-moz-box-sizing" : "box-sizing",
-                "-webkit-box-sizing" : "box-sizing",
-                
-                "-moz-user-select" : "user-select",
-                "-khtml-user-select" : "user-select",
-                "-webkit-user-select" : "user-select"                
-            };
-
-        //event handler for beginning of rules
-        function startRule(){
-            properties = {};
-            num=1;        
-        }
-        
-        //event handler for end of rules
-        function endRule(event){
-            var prop,
-                i, len,
-                standard,
-                needed,
-                actual,
-                needsStandard = [];
-
-            for (prop in properties){
-                if (propertiesToCheck[prop]){
-                    needsStandard.push({ actual: prop, needed: propertiesToCheck[prop]});
-                }
-            }
-
-            for (i=0, len=needsStandard.length; i < len; i++){
-                needed = needsStandard[i].needed;
-                actual = needsStandard[i].actual;
-
-                if (!properties[needed]){               
-                    reporter.report("Missing standard property '" + needed + "' to go along with '" + actual + "'.", properties[actual][0].name.line, properties[actual][0].name.col, rule);
-                } else {
-                    //make sure standard property is last
-                    if (properties[needed][0].pos < properties[actual][0].pos){
-                        reporter.report("Standard property '" + needed + "' should come after vendor-prefixed property '" + actual + "'.", properties[actual][0].name.line, properties[actual][0].name.col, rule);
-                    }
-                }
-            }
-
-        }        
-        
-        parser.addListener("startrule", startRule);
-        parser.addListener("startfontface", startRule);
-        parser.addListener("startpage", startRule);
-        parser.addListener("startpagemargin", startRule);
-        parser.addListener("startkeyframerule", startRule);         
-
-        parser.addListener("property", function(event){
-            var name = event.property.text.toLowerCase();
-
-            if (!properties[name]){
-                properties[name] = [];
-            }
-
-            properties[name].push({ name: event.property, value : event.value, pos:num++ });
-        });
-
-        parser.addListener("endrule", endRule);
-        parser.addListener("endfontface", endRule);
-        parser.addListener("endpage", endRule);
-        parser.addListener("endpagemargin", endRule);
-        parser.addListener("endkeyframerule", endRule);         
-    }
-
-});
-/*
- * Rule: You don't need to specify units when a value is 0.
- */
-/*global CSSLint*/
-CSSLint.addRule({
-
-    //rule information
-    id: "zero-units",
-    name: "Disallow units for 0 values",
-    desc: "You don't need to specify units when a value is 0.",
-    browsers: "All",
-
-    //initialization
-    init: function(parser, reporter){
-        var rule = this;
-
-        //count how many times "float" is used
-        parser.addListener("property", function(event){
-            var parts = event.value.parts,
-                i = 0, 
-                len = parts.length;
-
-            while(i < len){
-                if ((parts[i].units || parts[i].type == "percentage") && parts[i].value === 0 && parts[i].type != "time"){
-                    reporter.report("Values of 0 shouldn't have units specified.", parts[i].line, parts[i].col, rule);
-                }
-                i++;
-            }
-
-        });
-
-    }
-
-});
-/*global CSSLint*/
-CSSLint.addFormatter({
-    //format information
-    id: "checkstyle-xml",
-    name: "Checkstyle XML format",
-
-    /**
-     * Return opening root XML tag.
-     * @return {String} to prepend before all results
-     */
-    startFormat: function(){
-        return "<?xml version=\"1.0\" encoding=\"utf-8\"?><checkstyle>";
-    },
-
-    /**
-     * Return closing root XML tag.
-     * @return {String} to append after all results
-     */
-    endFormat: function(){
-        return "</checkstyle>";
-    },
-
-    /**
-     * Given CSS Lint results for a file, return output for this format.
-     * @param results {Object} with error and warning messages
-     * @param filename {String} relative file path
-     * @param options {Object} (UNUSED for now) specifies special handling of output
-     * @return {String} output for results
-     */
-    formatResults: function(results, filename, options) {
-        var messages = results.messages,
-            output = [];
-
-        /**
-         * Generate a source string for a rule.
-         * Checkstyle source strings usually resemble Java class names e.g
-         * net.csslint.SomeRuleName
-         * @param {Object} rule
-         * @return rule source as {String}
-         */
-        var generateSource = function(rule) {
-            if (!rule || !('name' in rule)) {
-                return "";
-            }
-            return 'net.csslint.' + rule.name.replace(/\s/g,'');
-        };
-
-        /**
-         * Replace special characters before write to output.
-         *
-         * Rules:
-         *  - single quotes is the escape sequence for double-quotes
-         *  - &lt; is the escape sequence for <
-         *  - &gt; is the escape sequence for >
-         *
-         * @param {String} message to escape
-         * @return escaped message as {String}
-         */
-        var escapeSpecialCharacters = function(str) {
-            if (!str || str.constructor !== String) {
-                return "";
-            }
-            return str.replace(/\"/g, "'").replace(/</g, "&lt;").replace(/>/g, "&gt;");
-        };
-
-        if (messages.length > 0) {
-            output.push("<file name=\""+filename+"\">");
-            CSSLint.Util.forEach(messages, function (message, i) {
-                //ignore rollups for now
-                if (!message.rollup) {
-                  output.push("<error line=\"" + message.line + "\" column=\"" + message.col + "\" severity=\"" + message.type + "\"" +
-                      " message=\"" + escapeSpecialCharacters(message.message) + "\" source=\"" + generateSource(message.rule) +"\"/>");
-                }
-            });
-            output.push("</file>");
-        }
-
-        return output.join("");
-    }
-});
-/*global CSSLint*/
-CSSLint.addFormatter({
-    //format information
-    id: "compact",
-    name: "Compact, 'porcelain' format",
-
-    /**
-     * Return content to be printed before all file results.
-     * @return {String} to prepend before all results
-     */
-    startFormat: function() {
-        return "";
-    },
-
-    /**
-     * Return content to be printed after all file results.
-     * @return {String} to append after all results
-     */
-    endFormat: function() {
-        return "";
-    },
-
-    /**
-     * Given CSS Lint results for a file, return output for this format.
-     * @param results {Object} with error and warning messages
-     * @param filename {String} relative file path
-     * @param options {Object} (Optional) specifies special handling of output
-     * @return {String} output for results
-     */
-    formatResults: function(results, filename, options) {
-        var messages = results.messages,
-            output = "";
-        options = options || {};
-
-        /**
-         * Capitalize and return given string.
-         * @param str {String} to capitalize
-         * @return {String} capitalized
-         */
-        var capitalize = function(str) {
-            return str.charAt(0).toUpperCase() + str.slice(1);
-        };
-
-        if (messages.length === 0) {
-            return options.quiet ? "" : filename + ": Lint Free!";
-        }
-
-        CSSLint.Util.forEach(messages, function(message, i) {
-            if (message.rollup) {
-                output += filename + ": " + capitalize(message.type) + " - " + message.message + "\n";
-            } else {
-                output += filename + ": " + "line " + message.line + 
-                    ", col " + message.col + ", " + capitalize(message.type) + " - " + message.message + "\n";
-            }
-        });
-    
-        return output;
-    }
-});
-/*global CSSLint*/
-CSSLint.addFormatter({
-    //format information
-    id: "csslint-xml",
-    name: "CSSLint XML format",
-
-    /**
-     * Return opening root XML tag.
-     * @return {String} to prepend before all results
-     */
-    startFormat: function(){
-        return "<?xml version=\"1.0\" encoding=\"utf-8\"?><csslint>";
-    },
-
-    /**
-     * Return closing root XML tag.
-     * @return {String} to append after all results
-     */
-    endFormat: function(){
-        return "</csslint>";
-    },
-
-    /**
-     * Given CSS Lint results for a file, return output for this format.
-     * @param results {Object} with error and warning messages
-     * @param filename {String} relative file path
-     * @param options {Object} (UNUSED for now) specifies special handling of output
-     * @return {String} output for results
-     */
-    formatResults: function(results, filename, options) {
-        var messages = results.messages,
-            output = [];
-
-        /**
-         * Replace special characters before write to output.
-         *
-         * Rules:
-         *  - single quotes is the escape sequence for double-quotes
-         *  - &lt; is the escape sequence for <
-         *  - &gt; is the escape sequence for >
-         * 
-         * @param {String} message to escape
-         * @return escaped message as {String}
-         */
-        var escapeSpecialCharacters = function(str) {
-            if (!str || str.constructor !== String) {
-                return "";
-            }
-            return str.replace(/\"/g, "'").replace(/</g, "&lt;").replace(/>/g, "&gt;");
-        };
-
-        if (messages.length > 0) {
-            output.push("<file name=\""+filename+"\">");
-            CSSLint.Util.forEach(messages, function (message, i) {
-                if (message.rollup) {
-                    output.push("<issue severity=\"" + message.type + "\" reason=\"" + escapeSpecialCharacters(message.message) + "\" evidence=\"" + escapeSpecialCharacters(message.evidence) + "\"/>");
-                } else {
-                    output.push("<issue line=\"" + message.line + "\" char=\"" + message.col + "\" severity=\"" + message.type + "\"" +
-                        " reason=\"" + escapeSpecialCharacters(message.message) + "\" evidence=\"" + escapeSpecialCharacters(message.evidence) + "\"/>");
-                }
-            });
-            output.push("</file>");
-        }
-
-        return output.join("");
-    }
-});
-/*global CSSLint*/
-CSSLint.addFormatter({
-    //format information
-    id: "lint-xml",
-    name: "Lint XML format",
-
-    /**
-     * Return opening root XML tag.
-     * @return {String} to prepend before all results
-     */
-    startFormat: function(){
-        return "<?xml version=\"1.0\" encoding=\"utf-8\"?><lint>";
-    },
-
-    /**
-     * Return closing root XML tag.
-     * @return {String} to append after all results
-     */
-    endFormat: function(){
-        return "</lint>";
-    },
-
-    /**
-     * Given CSS Lint results for a file, return output for this format.
-     * @param results {Object} with error and warning messages
-     * @param filename {String} relative file path
-     * @param options {Object} (UNUSED for now) specifies special handling of output
-     * @return {String} output for results
-     */
-    formatResults: function(results, filename, options) {
-        var messages = results.messages,
-            output = [];
-
-        /**
-         * Replace special characters before write to output.
-         *
-         * Rules:
-         *  - single quotes is the escape sequence for double-quotes
-         *  - &lt; is the escape sequence for <
-         *  - &gt; is the escape sequence for >
-         * 
-         * @param {String} message to escape
-         * @return escaped message as {String}
-         */
-        var escapeSpecialCharacters = function(str) {
-            if (!str || str.constructor !== String) {
-                return "";
-            }
-            return str.replace(/\"/g, "'").replace(/</g, "&lt;").replace(/>/g, "&gt;");
-        };
-
-        if (messages.length > 0) {
-        
-            output.push("<file name=\""+filename+"\">");
-            CSSLint.Util.forEach(messages, function (message, i) {
-                if (message.rollup) {
-                    output.push("<issue severity=\"" + message.type + "\" reason=\"" + escapeSpecialCharacters(message.message) + "\" evidence=\"" + escapeSpecialCharacters(message.evidence) + "\"/>");
-                } else {
-                    output.push("<issue line=\"" + message.line + "\" char=\"" + message.col + "\" severity=\"" + message.type + "\"" +
-                        " reason=\"" + escapeSpecialCharacters(message.message) + "\" evidence=\"" + escapeSpecialCharacters(message.evidence) + "\"/>");
-                }
-            });
-            output.push("</file>");
-        }
-
-        return output.join("");
-    }
-});
-/*global CSSLint*/
-CSSLint.addFormatter({
-    //format information
-    id: "text",
-    name: "Plain Text",
-
-    /**
-     * Return content to be printed before all file results.
-     * @return {String} to prepend before all results
-     */
-    startFormat: function() {
-        return "";
-    },
-
-    /**
-     * Return content to be printed after all file results.
-     * @return {String} to append after all results
-     */
-    endFormat: function() {
-        return "";
-    },
-
-    /**
-     * Given CSS Lint results for a file, return output for this format.
-     * @param results {Object} with error and warning messages
-     * @param filename {String} relative file path
-     * @param options {Object} (Optional) specifies special handling of output
-     * @return {String} output for results
-     */
-    formatResults: function(results, filename, options) {
-        var messages = results.messages,
-            output = "";
-        options = options || {};
-
-        if (messages.length === 0) {
-            return options.quiet ? "" : "\n\ncsslint: No errors in " + filename + ".";
-        }
-
-        output = "\n\ncsslint: There are " + messages.length  +  " problems in " + filename + ".";
-        var pos = filename.lastIndexOf("/"),
-            shortFilename = filename;
-
-        if (pos === -1){
-            pos = filename.lastIndexOf("\\");       
-        }
-        if (pos > -1){
-            shortFilename = filename.substring(pos+1);
-        }
-
-        CSSLint.Util.forEach(messages, function (message, i) {
-            output = output + "\n\n" + shortFilename;
-            if (message.rollup) {
-                output += "\n" + (i+1) + ": " + message.type;
-                output += "\n" + message.message;
-            } else {
-                output += "\n" + (i+1) + ": " + message.type + " at line " + message.line + ", col " + message.col;
-                output += "\n" + message.message;
-                output += "\n" + message.evidence;
-            }
-        });
-    
-        return output;
-    }
-});
-
-
-exports.CSSLint = CSSLint;
-
-
-});
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/worker-javascript.js b/apps/files_texteditor/js/aceeditor/worker-javascript.js
deleted file mode 100644
index 179228493c..0000000000
--- a/apps/files_texteditor/js/aceeditor/worker-javascript.js
+++ /dev/null
@@ -1,10614 +0,0 @@
-"no use strict";
-
-var console = {
-    log: function(msg) {
-        postMessage({type: "log", data: msg});
-    }
-};
-var window = {
-    console: console
-};
-
-var normalizeModule = function(parentId, moduleName) {
-    // normalize plugin requires
-    if (moduleName.indexOf("!") !== -1) {
-        var chunks = moduleName.split("!");
-        return normalizeModule(parentId, chunks[0]) + "!" + normalizeModule(parentId, chunks[1]);
-    }
-    // normalize relative requires
-    if (moduleName.charAt(0) == ".") {
-        var base = parentId.split("/").slice(0, -1).join("/");
-        var moduleName = base + "/" + moduleName;
-        
-        while(moduleName.indexOf(".") !== -1 && previous != moduleName) {
-            var previous = moduleName;
-            var moduleName = moduleName.replace(/\/\.\//, "/").replace(/[^\/]+\/\.\.\//, "");
-        }
-    }
-    
-    return moduleName;
-};
-
-var require = function(parentId, id) {
-    var id = normalizeModule(parentId, id);
-    
-    var module = require.modules[id];
-    if (module) {
-        if (!module.initialized) {
-            module.exports = module.factory().exports;
-            module.initialized = true;
-        }
-        return module.exports;
-    }
-    
-    var chunks = id.split("/");
-    chunks[0] = require.tlns[chunks[0]] || chunks[0];
-    var path = chunks.join("/") + ".js";
-    
-    require.id = id;
-    importScripts(path);
-    return require(parentId, id);    
-};
-
-require.modules = {};
-require.tlns = {};
-
-var define = function(id, deps, factory) {
-    if (arguments.length == 2) {
-        factory = deps;
-    } else if (arguments.length == 1) {
-        factory = id;
-        id = require.id;
-    }
-
-    if (id.indexOf("text!") === 0) 
-        return;
-    
-    var req = function(deps, factory) {
-        return require(id, deps, factory);
-    };
-
-    require.modules[id] = {
-        factory: function() {
-            var module = {
-                exports: {}
-            };
-            var returnExports = factory(req, module.exports, module);
-            if (returnExports)
-                module.exports = returnExports;
-            return module;
-        }
-    };
-};
-
-function initBaseUrls(topLevelNamespaces) {
-    require.tlns = topLevelNamespaces;
-}
-
-function initSender() {
-
-    var EventEmitter = require(null, "ace/lib/event_emitter").EventEmitter;
-    var oop = require(null, "ace/lib/oop");
-    
-    var Sender = function() {};
-    
-    (function() {
-        
-        oop.implement(this, EventEmitter);
-                
-        this.callback = function(data, callbackId) {
-            postMessage({
-                type: "call",
-                id: callbackId,
-                data: data
-            });
-        };
-    
-        this.emit = function(name, data) {
-            postMessage({
-                type: "event",
-                name: name,
-                data: data
-            });
-        };
-        
-    }).call(Sender.prototype);
-    
-    return new Sender();
-}
-
-var main;
-var sender;
-
-onmessage = function(e) {
-    var msg = e.data;
-    if (msg.command) {
-        main[msg.command].apply(main, msg.args);
-    }
-    else if (msg.init) {        
-        initBaseUrls(msg.tlns);
-        require(null, "ace/lib/fixoldbrowsers");
-        sender = initSender();
-        var clazz = require(null, msg.module)[msg.classname];
-        main = new clazz(sender);
-    } 
-    else if (msg.event && sender) {
-        sender._emit(msg.event, msg.data);
-    }
-};
-// vim:set ts=4 sts=4 sw=4 st:
-// -- kriskowal Kris Kowal Copyright (C) 2009-2010 MIT License
-// -- tlrobinson Tom Robinson Copyright (C) 2009-2010 MIT License (Narwhal Project)
-// -- dantman Daniel Friesen Copyright(C) 2010 XXX No License Specified
-// -- fschaefer Florian Schäfer Copyright (C) 2010 MIT License
-// -- Irakli Gozalishvili Copyright (C) 2010 MIT License
-
-/*!
-    Copyright (c) 2009, 280 North Inc. http://280north.com/
-    MIT License. http://github.com/280north/narwhal/blob/master/README.md
-*/
-
-define('ace/lib/fixoldbrowsers', ['require', 'exports', 'module' , 'ace/lib/regexp', 'ace/lib/es5-shim'], function(require, exports, module) {
-"use strict";
-
-require("./regexp");
-require("./es5-shim");
-
-});/**
- *  Based on code from:
- *
- * XRegExp 1.5.0
- * (c) 2007-2010 Steven Levithan
- * MIT License
- * <http://xregexp.com>
- * Provides an augmented, extensible, cross-browser implementation of regular expressions,
- * including support for additional syntax, flags, and methods
- */
- 
-define('ace/lib/regexp', ['require', 'exports', 'module' ], function(require, exports, module) {
-"use strict";
-
-    //---------------------------------
-    //  Private variables
-    //---------------------------------
-
-    var real = {
-            exec: RegExp.prototype.exec,
-            test: RegExp.prototype.test,
-            match: String.prototype.match,
-            replace: String.prototype.replace,
-            split: String.prototype.split
-        },
-        compliantExecNpcg = real.exec.call(/()??/, "")[1] === undefined, // check `exec` handling of nonparticipating capturing groups
-        compliantLastIndexIncrement = function () {
-            var x = /^/g;
-            real.test.call(x, "");
-            return !x.lastIndex;
-        }();
-
-    //---------------------------------
-    //  Overriden native methods
-    //---------------------------------
-
-    // Adds named capture support (with backreferences returned as `result.name`), and fixes two
-    // cross-browser issues per ES3:
-    // - Captured values for nonparticipating capturing groups should be returned as `undefined`,
-    //   rather than the empty string.
-    // - `lastIndex` should not be incremented after zero-length matches.
-    RegExp.prototype.exec = function (str) {
-        var match = real.exec.apply(this, arguments),
-            name, r2;
-        if ( typeof(str) == 'string' && match) {
-            // Fix browsers whose `exec` methods don't consistently return `undefined` for
-            // nonparticipating capturing groups
-            if (!compliantExecNpcg && match.length > 1 && indexOf(match, "") > -1) {
-                r2 = RegExp(this.source, real.replace.call(getNativeFlags(this), "g", ""));
-                // Using `str.slice(match.index)` rather than `match[0]` in case lookahead allowed
-                // matching due to characters outside the match
-                real.replace.call(str.slice(match.index), r2, function () {
-                    for (var i = 1; i < arguments.length - 2; i++) {
-                        if (arguments[i] === undefined)
-                            match[i] = undefined;
-                    }
-                });
-            }
-            // Attach named capture properties
-            if (this._xregexp && this._xregexp.captureNames) {
-                for (var i = 1; i < match.length; i++) {
-                    name = this._xregexp.captureNames[i - 1];
-                    if (name)
-                       match[name] = match[i];
-                }
-            }
-            // Fix browsers that increment `lastIndex` after zero-length matches
-            if (!compliantLastIndexIncrement && this.global && !match[0].length && (this.lastIndex > match.index))
-                this.lastIndex--;
-        }
-        return match;
-    };
-
-    // Don't override `test` if it won't change anything
-    if (!compliantLastIndexIncrement) {
-        // Fix browser bug in native method
-        RegExp.prototype.test = function (str) {
-            // Use the native `exec` to skip some processing overhead, even though the overriden
-            // `exec` would take care of the `lastIndex` fix
-            var match = real.exec.call(this, str);
-            // Fix browsers that increment `lastIndex` after zero-length matches
-            if (match && this.global && !match[0].length && (this.lastIndex > match.index))
-                this.lastIndex--;
-            return !!match;
-        };
-    }
-
-    //---------------------------------
-    //  Private helper functions
-    //---------------------------------
-
-    function getNativeFlags (regex) {
-        return (regex.global     ? "g" : "") +
-               (regex.ignoreCase ? "i" : "") +
-               (regex.multiline  ? "m" : "") +
-               (regex.extended   ? "x" : "") + // Proposed for ES4; included in AS3
-               (regex.sticky     ? "y" : "");
-    };
-
-    function indexOf (array, item, from) {
-        if (Array.prototype.indexOf) // Use the native array method if available
-            return array.indexOf(item, from);
-        for (var i = from || 0; i < array.length; i++) {
-            if (array[i] === item)
-                return i;
-        }
-        return -1;
-    };
-
-});
-// vim: ts=4 sts=4 sw=4 expandtab
-// -- kriskowal Kris Kowal Copyright (C) 2009-2011 MIT License
-// -- tlrobinson Tom Robinson Copyright (C) 2009-2010 MIT License (Narwhal Project)
-// -- dantman Daniel Friesen Copyright (C) 2010 XXX TODO License or CLA
-// -- fschaefer Florian Schäfer Copyright (C) 2010 MIT License
-// -- Gozala Irakli Gozalishvili Copyright (C) 2010 MIT License
-// -- kitcambridge Kit Cambridge Copyright (C) 2011 MIT License
-// -- kossnocorp Sasha Koss XXX TODO License or CLA
-// -- bryanforbes Bryan Forbes XXX TODO License or CLA
-// -- killdream Quildreen Motta Copyright (C) 2011 MIT Licence
-// -- michaelficarra Michael Ficarra Copyright (C) 2011 3-clause BSD License
-// -- sharkbrainguy Gerard Paapu Copyright (C) 2011 MIT License
-// -- bbqsrc Brendan Molloy (C) 2011 Creative Commons Zero (public domain)
-// -- iwyg XXX TODO License or CLA
-// -- DomenicDenicola Domenic Denicola Copyright (C) 2011 MIT License
-// -- xavierm02 Montillet Xavier XXX TODO License or CLA
-// -- Raynos Raynos XXX TODO License or CLA
-// -- samsonjs Sami Samhuri Copyright (C) 2010 MIT License
-// -- rwldrn Rick Waldron Copyright (C) 2011 MIT License
-// -- lexer Alexey Zakharov XXX TODO License or CLA
-
-/*!
-    Copyright (c) 2009, 280 North Inc. http://280north.com/
-    MIT License. http://github.com/280north/narwhal/blob/master/README.md
-*/
-
-define('ace/lib/es5-shim', ['require', 'exports', 'module' ], function(require, exports, module) {
-
-/**
- * Brings an environment as close to ECMAScript 5 compliance
- * as is possible with the facilities of erstwhile engines.
- *
- * Annotated ES5: http://es5.github.com/ (specific links below)
- * ES5 Spec: http://www.ecma-international.org/publications/files/ECMA-ST/Ecma-262.pdf
- *
- * @module
- */
-
-/*whatsupdoc*/
-
-//
-// Function
-// ========
-//
-
-// ES-5 15.3.4.5
-// http://es5.github.com/#x15.3.4.5
-
-if (!Function.prototype.bind) {
-    Function.prototype.bind = function bind(that) { // .length is 1
-        // 1. Let Target be the this value.
-        var target = this;
-        // 2. If IsCallable(Target) is false, throw a TypeError exception.
-        if (typeof target != "function")
-            throw new TypeError(); // TODO message
-        // 3. Let A be a new (possibly empty) internal list of all of the
-        //   argument values provided after thisArg (arg1, arg2 etc), in order.
-        // XXX slicedArgs will stand in for "A" if used
-        var args = slice.call(arguments, 1); // for normal call
-        // 4. Let F be a new native ECMAScript object.
-        // 11. Set the [[Prototype]] internal property of F to the standard
-        //   built-in Function prototype object as specified in 15.3.3.1.
-        // 12. Set the [[Call]] internal property of F as described in
-        //   15.3.4.5.1.
-        // 13. Set the [[Construct]] internal property of F as described in
-        //   15.3.4.5.2.
-        // 14. Set the [[HasInstance]] internal property of F as described in
-        //   15.3.4.5.3.
-        var bound = function () {
-
-            if (this instanceof bound) {
-                // 15.3.4.5.2 [[Construct]]
-                // When the [[Construct]] internal method of a function object,
-                // F that was created using the bind function is called with a
-                // list of arguments ExtraArgs, the following steps are taken:
-                // 1. Let target be the value of F's [[TargetFunction]]
-                //   internal property.
-                // 2. If target has no [[Construct]] internal method, a
-                //   TypeError exception is thrown.
-                // 3. Let boundArgs be the value of F's [[BoundArgs]] internal
-                //   property.
-                // 4. Let args be a new list containing the same values as the
-                //   list boundArgs in the same order followed by the same
-                //   values as the list ExtraArgs in the same order.
-                // 5. Return the result of calling the [[Construct]] internal 
-                //   method of target providing args as the arguments.
-
-                var F = function(){};
-                F.prototype = target.prototype;
-                var self = new F;
-
-                var result = target.apply(
-                    self,
-                    args.concat(slice.call(arguments))
-                );
-                if (result !== null && Object(result) === result)
-                    return result;
-                return self;
-
-            } else {
-                // 15.3.4.5.1 [[Call]]
-                // When the [[Call]] internal method of a function object, F,
-                // which was created using the bind function is called with a
-                // this value and a list of arguments ExtraArgs, the following
-                // steps are taken:
-                // 1. Let boundArgs be the value of F's [[BoundArgs]] internal
-                //   property.
-                // 2. Let boundThis be the value of F's [[BoundThis]] internal
-                //   property.
-                // 3. Let target be the value of F's [[TargetFunction]] internal
-                //   property.
-                // 4. Let args be a new list containing the same values as the 
-                //   list boundArgs in the same order followed by the same 
-                //   values as the list ExtraArgs in the same order.
-                // 5. Return the result of calling the [[Call]] internal method 
-                //   of target providing boundThis as the this value and 
-                //   providing args as the arguments.
-
-                // equiv: target.call(this, ...boundArgs, ...args)
-                return target.apply(
-                    that,
-                    args.concat(slice.call(arguments))
-                );
-
-            }
-
-        };
-        // XXX bound.length is never writable, so don't even try
-        //
-        // 15. If the [[Class]] internal property of Target is "Function", then
-        //     a. Let L be the length property of Target minus the length of A.
-        //     b. Set the length own property of F to either 0 or L, whichever is 
-        //       larger.
-        // 16. Else set the length own property of F to 0.
-        // 17. Set the attributes of the length own property of F to the values
-        //   specified in 15.3.5.1.
-
-        // TODO
-        // 18. Set the [[Extensible]] internal property of F to true.
-        
-        // TODO
-        // 19. Let thrower be the [[ThrowTypeError]] function Object (13.2.3).
-        // 20. Call the [[DefineOwnProperty]] internal method of F with 
-        //   arguments "caller", PropertyDescriptor {[[Get]]: thrower, [[Set]]:
-        //   thrower, [[Enumerable]]: false, [[Configurable]]: false}, and 
-        //   false.
-        // 21. Call the [[DefineOwnProperty]] internal method of F with 
-        //   arguments "arguments", PropertyDescriptor {[[Get]]: thrower, 
-        //   [[Set]]: thrower, [[Enumerable]]: false, [[Configurable]]: false},
-        //   and false.
-
-        // TODO
-        // NOTE Function objects created using Function.prototype.bind do not 
-        // have a prototype property or the [[Code]], [[FormalParameters]], and
-        // [[Scope]] internal properties.
-        // XXX can't delete prototype in pure-js.
-
-        // 22. Return F.
-        return bound;
-    };
-}
-
-// Shortcut to an often accessed properties, in order to avoid multiple
-// dereference that costs universally.
-// _Please note: Shortcuts are defined after `Function.prototype.bind` as we
-// us it in defining shortcuts.
-var call = Function.prototype.call;
-var prototypeOfArray = Array.prototype;
-var prototypeOfObject = Object.prototype;
-var slice = prototypeOfArray.slice;
-var toString = call.bind(prototypeOfObject.toString);
-var owns = call.bind(prototypeOfObject.hasOwnProperty);
-
-// If JS engine supports accessors creating shortcuts.
-var defineGetter;
-var defineSetter;
-var lookupGetter;
-var lookupSetter;
-var supportsAccessors;
-if ((supportsAccessors = owns(prototypeOfObject, "__defineGetter__"))) {
-    defineGetter = call.bind(prototypeOfObject.__defineGetter__);
-    defineSetter = call.bind(prototypeOfObject.__defineSetter__);
-    lookupGetter = call.bind(prototypeOfObject.__lookupGetter__);
-    lookupSetter = call.bind(prototypeOfObject.__lookupSetter__);
-}
-
-//
-// Array
-// =====
-//
-
-// ES5 15.4.3.2
-// http://es5.github.com/#x15.4.3.2
-// https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/isArray
-if (!Array.isArray) {
-    Array.isArray = function isArray(obj) {
-        return toString(obj) == "[object Array]";
-    };
-}
-
-// The IsCallable() check in the Array functions
-// has been replaced with a strict check on the
-// internal class of the object to trap cases where
-// the provided function was actually a regular
-// expression literal, which in V8 and
-// JavaScriptCore is a typeof "function".  Only in
-// V8 are regular expression literals permitted as
-// reduce parameters, so it is desirable in the
-// general case for the shim to match the more
-// strict and common behavior of rejecting regular
-// expressions.
-
-// ES5 15.4.4.18
-// http://es5.github.com/#x15.4.4.18
-// https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/array/forEach
-if (!Array.prototype.forEach) {
-    Array.prototype.forEach = function forEach(fun /*, thisp*/) {
-        var self = toObject(this),
-            thisp = arguments[1],
-            i = 0,
-            length = self.length >>> 0;
-
-        // If no callback function or if callback is not a callable function
-        if (toString(fun) != "[object Function]") {
-            throw new TypeError(); // TODO message
-        }
-
-        while (i < length) {
-            if (i in self) {
-                // Invoke the callback function with call, passing arguments:
-                // context, property value, property key, thisArg object context
-                fun.call(thisp, self[i], i, self);
-            }
-            i++;
-        }
-    };
-}
-
-// ES5 15.4.4.19
-// http://es5.github.com/#x15.4.4.19
-// https://developer.mozilla.org/en/Core_JavaScript_1.5_Reference/Objects/Array/map
-if (!Array.prototype.map) {
-    Array.prototype.map = function map(fun /*, thisp*/) {
-        var self = toObject(this),
-            length = self.length >>> 0,
-            result = Array(length),
-            thisp = arguments[1];
-
-        // If no callback function or if callback is not a callable function
-        if (toString(fun) != "[object Function]") {
-            throw new TypeError(); // TODO message
-        }
-
-        for (var i = 0; i < length; i++) {
-            if (i in self)
-                result[i] = fun.call(thisp, self[i], i, self);
-        }
-        return result;
-    };
-}
-
-// ES5 15.4.4.20
-// http://es5.github.com/#x15.4.4.20
-// https://developer.mozilla.org/en/Core_JavaScript_1.5_Reference/Objects/Array/filter
-if (!Array.prototype.filter) {
-    Array.prototype.filter = function filter(fun /*, thisp */) {
-        var self = toObject(this),
-            length = self.length >>> 0,
-            result = [],
-            thisp = arguments[1];
-
-        // If no callback function or if callback is not a callable function
-        if (toString(fun) != "[object Function]") {
-            throw new TypeError(); // TODO message
-        }
-
-        for (var i = 0; i < length; i++) {
-            if (i in self && fun.call(thisp, self[i], i, self))
-                result.push(self[i]);
-        }
-        return result;
-    };
-}
-
-// ES5 15.4.4.16
-// http://es5.github.com/#x15.4.4.16
-// https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/every
-if (!Array.prototype.every) {
-    Array.prototype.every = function every(fun /*, thisp */) {
-        var self = toObject(this),
-            length = self.length >>> 0,
-            thisp = arguments[1];
-
-        // If no callback function or if callback is not a callable function
-        if (toString(fun) != "[object Function]") {
-            throw new TypeError(); // TODO message
-        }
-
-        for (var i = 0; i < length; i++) {
-            if (i in self && !fun.call(thisp, self[i], i, self))
-                return false;
-        }
-        return true;
-    };
-}
-
-// ES5 15.4.4.17
-// http://es5.github.com/#x15.4.4.17
-// https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/some
-if (!Array.prototype.some) {
-    Array.prototype.some = function some(fun /*, thisp */) {
-        var self = toObject(this),
-            length = self.length >>> 0,
-            thisp = arguments[1];
-
-        // If no callback function or if callback is not a callable function
-        if (toString(fun) != "[object Function]") {
-            throw new TypeError(); // TODO message
-        }
-
-        for (var i = 0; i < length; i++) {
-            if (i in self && fun.call(thisp, self[i], i, self))
-                return true;
-        }
-        return false;
-    };
-}
-
-// ES5 15.4.4.21
-// http://es5.github.com/#x15.4.4.21
-// https://developer.mozilla.org/en/Core_JavaScript_1.5_Reference/Objects/Array/reduce
-if (!Array.prototype.reduce) {
-    Array.prototype.reduce = function reduce(fun /*, initial*/) {
-        var self = toObject(this),
-            length = self.length >>> 0;
-
-        // If no callback function or if callback is not a callable function
-        if (toString(fun) != "[object Function]") {
-            throw new TypeError(); // TODO message
-        }
-
-        // no value to return if no initial value and an empty array
-        if (!length && arguments.length == 1)
-            throw new TypeError(); // TODO message
-
-        var i = 0;
-        var result;
-        if (arguments.length >= 2) {
-            result = arguments[1];
-        } else {
-            do {
-                if (i in self) {
-                    result = self[i++];
-                    break;
-                }
-
-                // if array contains no values, no initial value to return
-                if (++i >= length)
-                    throw new TypeError(); // TODO message
-            } while (true);
-        }
-
-        for (; i < length; i++) {
-            if (i in self)
-                result = fun.call(void 0, result, self[i], i, self);
-        }
-
-        return result;
-    };
-}
-
-// ES5 15.4.4.22
-// http://es5.github.com/#x15.4.4.22
-// https://developer.mozilla.org/en/Core_JavaScript_1.5_Reference/Objects/Array/reduceRight
-if (!Array.prototype.reduceRight) {
-    Array.prototype.reduceRight = function reduceRight(fun /*, initial*/) {
-        var self = toObject(this),
-            length = self.length >>> 0;
-
-        // If no callback function or if callback is not a callable function
-        if (toString(fun) != "[object Function]") {
-            throw new TypeError(); // TODO message
-        }
-
-        // no value to return if no initial value, empty array
-        if (!length && arguments.length == 1)
-            throw new TypeError(); // TODO message
-
-        var result, i = length - 1;
-        if (arguments.length >= 2) {
-            result = arguments[1];
-        } else {
-            do {
-                if (i in self) {
-                    result = self[i--];
-                    break;
-                }
-
-                // if array contains no values, no initial value to return
-                if (--i < 0)
-                    throw new TypeError(); // TODO message
-            } while (true);
-        }
-
-        do {
-            if (i in this)
-                result = fun.call(void 0, result, self[i], i, self);
-        } while (i--);
-
-        return result;
-    };
-}
-
-// ES5 15.4.4.14
-// http://es5.github.com/#x15.4.4.14
-// https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/indexOf
-if (!Array.prototype.indexOf) {
-    Array.prototype.indexOf = function indexOf(sought /*, fromIndex */ ) {
-        var self = toObject(this),
-            length = self.length >>> 0;
-
-        if (!length)
-            return -1;
-
-        var i = 0;
-        if (arguments.length > 1)
-            i = toInteger(arguments[1]);
-
-        // handle negative indices
-        i = i >= 0 ? i : Math.max(0, length + i);
-        for (; i < length; i++) {
-            if (i in self && self[i] === sought) {
-                return i;
-            }
-        }
-        return -1;
-    };
-}
-
-// ES5 15.4.4.15
-// http://es5.github.com/#x15.4.4.15
-// https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/lastIndexOf
-if (!Array.prototype.lastIndexOf) {
-    Array.prototype.lastIndexOf = function lastIndexOf(sought /*, fromIndex */) {
-        var self = toObject(this),
-            length = self.length >>> 0;
-
-        if (!length)
-            return -1;
-        var i = length - 1;
-        if (arguments.length > 1)
-            i = Math.min(i, toInteger(arguments[1]));
-        // handle negative indices
-        i = i >= 0 ? i : length - Math.abs(i);
-        for (; i >= 0; i--) {
-            if (i in self && sought === self[i])
-                return i;
-        }
-        return -1;
-    };
-}
-
-//
-// Object
-// ======
-//
-
-// ES5 15.2.3.2
-// http://es5.github.com/#x15.2.3.2
-if (!Object.getPrototypeOf) {
-    // https://github.com/kriskowal/es5-shim/issues#issue/2
-    // http://ejohn.org/blog/objectgetprototypeof/
-    // recommended by fschaefer on github
-    Object.getPrototypeOf = function getPrototypeOf(object) {
-        return object.__proto__ || (
-            object.constructor ?
-            object.constructor.prototype :
-            prototypeOfObject
-        );
-    };
-}
-
-// ES5 15.2.3.3
-// http://es5.github.com/#x15.2.3.3
-if (!Object.getOwnPropertyDescriptor) {
-    var ERR_NON_OBJECT = "Object.getOwnPropertyDescriptor called on a " +
-                         "non-object: ";
-    Object.getOwnPropertyDescriptor = function getOwnPropertyDescriptor(object, property) {
-        if ((typeof object != "object" && typeof object != "function") || object === null)
-            throw new TypeError(ERR_NON_OBJECT + object);
-        // If object does not owns property return undefined immediately.
-        if (!owns(object, property))
-            return;
-
-        var descriptor, getter, setter;
-
-        // If object has a property then it's for sure both `enumerable` and
-        // `configurable`.
-        descriptor =  { enumerable: true, configurable: true };
-
-        // If JS engine supports accessor properties then property may be a
-        // getter or setter.
-        if (supportsAccessors) {
-            // Unfortunately `__lookupGetter__` will return a getter even
-            // if object has own non getter property along with a same named
-            // inherited getter. To avoid misbehavior we temporary remove
-            // `__proto__` so that `__lookupGetter__` will return getter only
-            // if it's owned by an object.
-            var prototype = object.__proto__;
-            object.__proto__ = prototypeOfObject;
-
-            var getter = lookupGetter(object, property);
-            var setter = lookupSetter(object, property);
-
-            // Once we have getter and setter we can put values back.
-            object.__proto__ = prototype;
-
-            if (getter || setter) {
-                if (getter) descriptor.get = getter;
-                if (setter) descriptor.set = setter;
-
-                // If it was accessor property we're done and return here
-                // in order to avoid adding `value` to the descriptor.
-                return descriptor;
-            }
-        }
-
-        // If we got this far we know that object has an own property that is
-        // not an accessor so we set it as a value and return descriptor.
-        descriptor.value = object[property];
-        return descriptor;
-    };
-}
-
-// ES5 15.2.3.4
-// http://es5.github.com/#x15.2.3.4
-if (!Object.getOwnPropertyNames) {
-    Object.getOwnPropertyNames = function getOwnPropertyNames(object) {
-        return Object.keys(object);
-    };
-}
-
-// ES5 15.2.3.5
-// http://es5.github.com/#x15.2.3.5
-if (!Object.create) {
-    Object.create = function create(prototype, properties) {
-        var object;
-        if (prototype === null) {
-            object = { "__proto__": null };
-        } else {
-            if (typeof prototype != "object")
-                throw new TypeError("typeof prototype["+(typeof prototype)+"] != 'object'");
-            var Type = function () {};
-            Type.prototype = prototype;
-            object = new Type();
-            // IE has no built-in implementation of `Object.getPrototypeOf`
-            // neither `__proto__`, but this manually setting `__proto__` will
-            // guarantee that `Object.getPrototypeOf` will work as expected with
-            // objects created using `Object.create`
-            object.__proto__ = prototype;
-        }
-        if (properties !== void 0)
-            Object.defineProperties(object, properties);
-        return object;
-    };
-}
-
-// ES5 15.2.3.6
-// http://es5.github.com/#x15.2.3.6
-
-// Patch for WebKit and IE8 standard mode
-// Designed by hax <hax.github.com>
-// related issue: https://github.com/kriskowal/es5-shim/issues#issue/5
-// IE8 Reference:
-//     http://msdn.microsoft.com/en-us/library/dd282900.aspx
-//     http://msdn.microsoft.com/en-us/library/dd229916.aspx
-// WebKit Bugs:
-//     https://bugs.webkit.org/show_bug.cgi?id=36423
-
-function doesDefinePropertyWork(object) {
-    try {
-        Object.defineProperty(object, "sentinel", {});
-        return "sentinel" in object;
-    } catch (exception) {
-        // returns falsy
-    }
-}
-
-// check whether defineProperty works if it's given. Otherwise,
-// shim partially.
-if (Object.defineProperty) {
-    var definePropertyWorksOnObject = doesDefinePropertyWork({});
-    var definePropertyWorksOnDom = typeof document == "undefined" ||
-        doesDefinePropertyWork(document.createElement("div"));
-    if (!definePropertyWorksOnObject || !definePropertyWorksOnDom) {
-        var definePropertyFallback = Object.defineProperty;
-    }
-}
-
-if (!Object.defineProperty || definePropertyFallback) {
-    var ERR_NON_OBJECT_DESCRIPTOR = "Property description must be an object: ";
-    var ERR_NON_OBJECT_TARGET = "Object.defineProperty called on non-object: "
-    var ERR_ACCESSORS_NOT_SUPPORTED = "getters & setters can not be defined " +
-                                      "on this javascript engine";
-
-    Object.defineProperty = function defineProperty(object, property, descriptor) {
-        if ((typeof object != "object" && typeof object != "function") || object === null)
-            throw new TypeError(ERR_NON_OBJECT_TARGET + object);
-        if ((typeof descriptor != "object" && typeof descriptor != "function") || descriptor === null)
-            throw new TypeError(ERR_NON_OBJECT_DESCRIPTOR + descriptor);
-
-        // make a valiant attempt to use the real defineProperty
-        // for I8's DOM elements.
-        if (definePropertyFallback) {
-            try {
-                return definePropertyFallback.call(Object, object, property, descriptor);
-            } catch (exception) {
-                // try the shim if the real one doesn't work
-            }
-        }
-
-        // If it's a data property.
-        if (owns(descriptor, "value")) {
-            // fail silently if "writable", "enumerable", or "configurable"
-            // are requested but not supported
-            /*
-            // alternate approach:
-            if ( // can't implement these features; allow false but not true
-                !(owns(descriptor, "writable") ? descriptor.writable : true) ||
-                !(owns(descriptor, "enumerable") ? descriptor.enumerable : true) ||
-                !(owns(descriptor, "configurable") ? descriptor.configurable : true)
-            )
-                throw new RangeError(
-                    "This implementation of Object.defineProperty does not " +
-                    "support configurable, enumerable, or writable."
-                );
-            */
-
-            if (supportsAccessors && (lookupGetter(object, property) ||
-                                      lookupSetter(object, property)))
-            {
-                // As accessors are supported only on engines implementing
-                // `__proto__` we can safely override `__proto__` while defining
-                // a property to make sure that we don't hit an inherited
-                // accessor.
-                var prototype = object.__proto__;
-                object.__proto__ = prototypeOfObject;
-                // Deleting a property anyway since getter / setter may be
-                // defined on object itself.
-                delete object[property];
-                object[property] = descriptor.value;
-                // Setting original `__proto__` back now.
-                object.__proto__ = prototype;
-            } else {
-                object[property] = descriptor.value;
-            }
-        } else {
-            if (!supportsAccessors)
-                throw new TypeError(ERR_ACCESSORS_NOT_SUPPORTED);
-            // If we got that far then getters and setters can be defined !!
-            if (owns(descriptor, "get"))
-                defineGetter(object, property, descriptor.get);
-            if (owns(descriptor, "set"))
-                defineSetter(object, property, descriptor.set);
-        }
-
-        return object;
-    };
-}
-
-// ES5 15.2.3.7
-// http://es5.github.com/#x15.2.3.7
-if (!Object.defineProperties) {
-    Object.defineProperties = function defineProperties(object, properties) {
-        for (var property in properties) {
-            if (owns(properties, property))
-                Object.defineProperty(object, property, properties[property]);
-        }
-        return object;
-    };
-}
-
-// ES5 15.2.3.8
-// http://es5.github.com/#x15.2.3.8
-if (!Object.seal) {
-    Object.seal = function seal(object) {
-        // this is misleading and breaks feature-detection, but
-        // allows "securable" code to "gracefully" degrade to working
-        // but insecure code.
-        return object;
-    };
-}
-
-// ES5 15.2.3.9
-// http://es5.github.com/#x15.2.3.9
-if (!Object.freeze) {
-    Object.freeze = function freeze(object) {
-        // this is misleading and breaks feature-detection, but
-        // allows "securable" code to "gracefully" degrade to working
-        // but insecure code.
-        return object;
-    };
-}
-
-// detect a Rhino bug and patch it
-try {
-    Object.freeze(function () {});
-} catch (exception) {
-    Object.freeze = (function freeze(freezeObject) {
-        return function freeze(object) {
-            if (typeof object == "function") {
-                return object;
-            } else {
-                return freezeObject(object);
-            }
-        };
-    })(Object.freeze);
-}
-
-// ES5 15.2.3.10
-// http://es5.github.com/#x15.2.3.10
-if (!Object.preventExtensions) {
-    Object.preventExtensions = function preventExtensions(object) {
-        // this is misleading and breaks feature-detection, but
-        // allows "securable" code to "gracefully" degrade to working
-        // but insecure code.
-        return object;
-    };
-}
-
-// ES5 15.2.3.11
-// http://es5.github.com/#x15.2.3.11
-if (!Object.isSealed) {
-    Object.isSealed = function isSealed(object) {
-        return false;
-    };
-}
-
-// ES5 15.2.3.12
-// http://es5.github.com/#x15.2.3.12
-if (!Object.isFrozen) {
-    Object.isFrozen = function isFrozen(object) {
-        return false;
-    };
-}
-
-// ES5 15.2.3.13
-// http://es5.github.com/#x15.2.3.13
-if (!Object.isExtensible) {
-    Object.isExtensible = function isExtensible(object) {
-        // 1. If Type(O) is not Object throw a TypeError exception.
-        if (Object(object) === object) {
-            throw new TypeError(); // TODO message
-        }
-        // 2. Return the Boolean value of the [[Extensible]] internal property of O.
-        var name = '';
-        while (owns(object, name)) {
-            name += '?';
-        }
-        object[name] = true;
-        var returnValue = owns(object, name);
-        delete object[name];
-        return returnValue;
-    };
-}
-
-// ES5 15.2.3.14
-// http://es5.github.com/#x15.2.3.14
-if (!Object.keys) {
-    // http://whattheheadsaid.com/2010/10/a-safer-object-keys-compatibility-implementation
-    var hasDontEnumBug = true,
-        dontEnums = [
-            "toString",
-            "toLocaleString",
-            "valueOf",
-            "hasOwnProperty",
-            "isPrototypeOf",
-            "propertyIsEnumerable",
-            "constructor"
-        ],
-        dontEnumsLength = dontEnums.length;
-
-    for (var key in {"toString": null})
-        hasDontEnumBug = false;
-
-    Object.keys = function keys(object) {
-
-        if ((typeof object != "object" && typeof object != "function") || object === null)
-            throw new TypeError("Object.keys called on a non-object");
-
-        var keys = [];
-        for (var name in object) {
-            if (owns(object, name)) {
-                keys.push(name);
-            }
-        }
-
-        if (hasDontEnumBug) {
-            for (var i = 0, ii = dontEnumsLength; i < ii; i++) {
-                var dontEnum = dontEnums[i];
-                if (owns(object, dontEnum)) {
-                    keys.push(dontEnum);
-                }
-            }
-        }
-
-        return keys;
-    };
-
-}
-
-//
-// Date
-// ====
-//
-
-// ES5 15.9.5.43
-// http://es5.github.com/#x15.9.5.43
-// This function returns a String value represent the instance in time 
-// represented by this Date object. The format of the String is the Date Time 
-// string format defined in 15.9.1.15. All fields are present in the String. 
-// The time zone is always UTC, denoted by the suffix Z. If the time value of 
-// this object is not a finite Number a RangeError exception is thrown.
-if (!Date.prototype.toISOString || (new Date(-62198755200000).toISOString().indexOf('-000001') === -1)) {
-    Date.prototype.toISOString = function toISOString() {
-        var result, length, value, year;
-        if (!isFinite(this))
-            throw new RangeError;
-
-        // the date time string format is specified in 15.9.1.15.
-        result = [this.getUTCMonth() + 1, this.getUTCDate(),
-            this.getUTCHours(), this.getUTCMinutes(), this.getUTCSeconds()];
-        year = this.getUTCFullYear();
-        year = (year < 0 ? '-' : (year > 9999 ? '+' : '')) + ('00000' + Math.abs(year)).slice(0 <= year && year <= 9999 ? -4 : -6);
-
-        length = result.length;
-        while (length--) {
-            value = result[length];
-            // pad months, days, hours, minutes, and seconds to have two digits.
-            if (value < 10)
-                result[length] = "0" + value;
-        }
-        // pad milliseconds to have three digits.
-        return year + "-" + result.slice(0, 2).join("-") + "T" + result.slice(2).join(":") + "." +
-            ("000" + this.getUTCMilliseconds()).slice(-3) + "Z";
-    }
-}
-
-// ES5 15.9.4.4
-// http://es5.github.com/#x15.9.4.4
-if (!Date.now) {
-    Date.now = function now() {
-        return new Date().getTime();
-    };
-}
-
-// ES5 15.9.5.44
-// http://es5.github.com/#x15.9.5.44
-// This function provides a String representation of a Date object for use by 
-// JSON.stringify (15.12.3).
-if (!Date.prototype.toJSON) {
-    Date.prototype.toJSON = function toJSON(key) {
-        // When the toJSON method is called with argument key, the following 
-        // steps are taken:
-
-        // 1.  Let O be the result of calling ToObject, giving it the this
-        // value as its argument.
-        // 2. Let tv be ToPrimitive(O, hint Number).
-        // 3. If tv is a Number and is not finite, return null.
-        // XXX
-        // 4. Let toISO be the result of calling the [[Get]] internal method of
-        // O with argument "toISOString".
-        // 5. If IsCallable(toISO) is false, throw a TypeError exception.
-        if (typeof this.toISOString != "function")
-            throw new TypeError(); // TODO message
-        // 6. Return the result of calling the [[Call]] internal method of
-        //  toISO with O as the this value and an empty argument list.
-        return this.toISOString();
-
-        // NOTE 1 The argument is ignored.
-
-        // NOTE 2 The toJSON function is intentionally generic; it does not
-        // require that its this value be a Date object. Therefore, it can be
-        // transferred to other kinds of objects for use as a method. However,
-        // it does require that any such object have a toISOString method. An
-        // object is free to use the argument key to filter its
-        // stringification.
-    };
-}
-
-// ES5 15.9.4.2
-// http://es5.github.com/#x15.9.4.2
-// based on work shared by Daniel Friesen (dantman)
-// http://gist.github.com/303249
-if (Date.parse("+275760-09-13T00:00:00.000Z") !== 8.64e15) {
-    // XXX global assignment won't work in embeddings that use
-    // an alternate object for the context.
-    Date = (function(NativeDate) {
-
-        // Date.length === 7
-        var Date = function Date(Y, M, D, h, m, s, ms) {
-            var length = arguments.length;
-            if (this instanceof NativeDate) {
-                var date = length == 1 && String(Y) === Y ? // isString(Y)
-                    // We explicitly pass it through parse:
-                    new NativeDate(Date.parse(Y)) :
-                    // We have to manually make calls depending on argument
-                    // length here
-                    length >= 7 ? new NativeDate(Y, M, D, h, m, s, ms) :
-                    length >= 6 ? new NativeDate(Y, M, D, h, m, s) :
-                    length >= 5 ? new NativeDate(Y, M, D, h, m) :
-                    length >= 4 ? new NativeDate(Y, M, D, h) :
-                    length >= 3 ? new NativeDate(Y, M, D) :
-                    length >= 2 ? new NativeDate(Y, M) :
-                    length >= 1 ? new NativeDate(Y) :
-                                  new NativeDate();
-                // Prevent mixups with unfixed Date object
-                date.constructor = Date;
-                return date;
-            }
-            return NativeDate.apply(this, arguments);
-        };
-
-        // 15.9.1.15 Date Time String Format.
-        var isoDateExpression = new RegExp("^" +
-            "(\\d{4}|[\+\-]\\d{6})" + // four-digit year capture or sign + 6-digit extended year
-            "(?:-(\\d{2})" + // optional month capture
-            "(?:-(\\d{2})" + // optional day capture
-            "(?:" + // capture hours:minutes:seconds.milliseconds
-                "T(\\d{2})" + // hours capture
-                ":(\\d{2})" + // minutes capture
-                "(?:" + // optional :seconds.milliseconds
-                    ":(\\d{2})" + // seconds capture
-                    "(?:\\.(\\d{3}))?" + // milliseconds capture
-                ")?" +
-            "(?:" + // capture UTC offset component
-                "Z|" + // UTC capture
-                "(?:" + // offset specifier +/-hours:minutes
-                    "([-+])" + // sign capture
-                    "(\\d{2})" + // hours offset capture
-                    ":(\\d{2})" + // minutes offset capture
-                ")" +
-            ")?)?)?)?" +
-        "$");
-
-        // Copy any custom methods a 3rd party library may have added
-        for (var key in NativeDate)
-            Date[key] = NativeDate[key];
-
-        // Copy "native" methods explicitly; they may be non-enumerable
-        Date.now = NativeDate.now;
-        Date.UTC = NativeDate.UTC;
-        Date.prototype = NativeDate.prototype;
-        Date.prototype.constructor = Date;
-
-        // Upgrade Date.parse to handle simplified ISO 8601 strings
-        Date.parse = function parse(string) {
-            var match = isoDateExpression.exec(string);
-            if (match) {
-                match.shift(); // kill match[0], the full match
-                // parse months, days, hours, minutes, seconds, and milliseconds
-                for (var i = 1; i < 7; i++) {
-                    // provide default values if necessary
-                    match[i] = +(match[i] || (i < 3 ? 1 : 0));
-                    // match[1] is the month. Months are 0-11 in JavaScript
-                    // `Date` objects, but 1-12 in ISO notation, so we
-                    // decrement.
-                    if (i == 1)
-                        match[i]--;
-                }
-
-                // parse the UTC offset component
-                var minuteOffset = +match.pop(), hourOffset = +match.pop(), sign = match.pop();
-
-                // compute the explicit time zone offset if specified
-                var offset = 0;
-                if (sign) {
-                    // detect invalid offsets and return early
-                    if (hourOffset > 23 || minuteOffset > 59)
-                        return NaN;
-
-                    // express the provided time zone offset in minutes. The offset is
-                    // negative for time zones west of UTC; positive otherwise.
-                    offset = (hourOffset * 60 + minuteOffset) * 6e4 * (sign == "+" ? -1 : 1);
-                }
-
-                // Date.UTC for years between 0 and 99 converts year to 1900 + year
-                // The Gregorian calendar has a 400-year cycle, so 
-                // to Date.UTC(year + 400, .... ) - 12622780800000 == Date.UTC(year, ...),
-                // where 12622780800000 - number of milliseconds in Gregorian calendar 400 years
-                var year = +match[0];
-                if (0 <= year && year <= 99) {
-                    match[0] = year + 400;
-                    return NativeDate.UTC.apply(this, match) + offset - 12622780800000;
-                }
-
-                // compute a new UTC date value, accounting for the optional offset
-                return NativeDate.UTC.apply(this, match) + offset;
-            }
-            return NativeDate.parse.apply(this, arguments);
-        };
-
-        return Date;
-    })(Date);
-}
-
-//
-// String
-// ======
-//
-
-// ES5 15.5.4.20
-// http://es5.github.com/#x15.5.4.20
-var ws = "\x09\x0A\x0B\x0C\x0D\x20\xA0\u1680\u180E\u2000\u2001\u2002\u2003" +
-    "\u2004\u2005\u2006\u2007\u2008\u2009\u200A\u202F\u205F\u3000\u2028" +
-    "\u2029\uFEFF";
-if (!String.prototype.trim || ws.trim()) {
-    // http://blog.stevenlevithan.com/archives/faster-trim-javascript
-    // http://perfectionkills.com/whitespace-deviations/
-    ws = "[" + ws + "]";
-    var trimBeginRegexp = new RegExp("^" + ws + ws + "*"),
-        trimEndRegexp = new RegExp(ws + ws + "*$");
-    String.prototype.trim = function trim() {
-        return String(this).replace(trimBeginRegexp, "").replace(trimEndRegexp, "");
-    };
-}
-
-//
-// Util
-// ======
-//
-
-// ES5 9.4
-// http://es5.github.com/#x9.4
-// http://jsperf.com/to-integer
-var toInteger = function (n) {
-    n = +n;
-    if (n !== n) // isNaN
-        n = 0;
-    else if (n !== 0 && n !== (1/0) && n !== -(1/0))
-        n = (n > 0 || -1) * Math.floor(Math.abs(n));
-    return n;
-};
-
-var prepareString = "a"[0] != "a",
-    // ES5 9.9
-    // http://es5.github.com/#x9.9
-    toObject = function (o) {
-        if (o == null) { // this matches both null and undefined
-            throw new TypeError(); // TODO message
-        }
-        // If the implementation doesn't support by-index access of
-        // string characters (ex. IE < 7), split the string
-        if (prepareString && typeof o == "string" && o) {
-            return o.split("");
-        }
-        return Object(o);
-    };
-});/* vim:ts=4:sts=4:sw=4:
- * ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *      Irakli Gozalishvili <rfobic@gmail.com> (http://jeditoolkit.com)
- *      Mike de Boer <mike AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/lib/event_emitter', ['require', 'exports', 'module' ], function(require, exports, module) {
-"use strict";
-
-var EventEmitter = {};
-
-EventEmitter._emit =
-EventEmitter._dispatchEvent = function(eventName, e) {
-    this._eventRegistry = this._eventRegistry || {};
-    this._defaultHandlers = this._defaultHandlers || {};
-
-    var listeners = this._eventRegistry[eventName] || [];
-    var defaultHandler = this._defaultHandlers[eventName];
-    if (!listeners.length && !defaultHandler)
-        return;
-
-    e = e || {};
-    e.type = eventName;
-    
-    if (!e.stopPropagation) {
-        e.stopPropagation = function() {
-            this.propagationStopped = true;
-        };
-    }
-    
-    if (!e.preventDefault) {
-        e.preventDefault = function() {
-            this.defaultPrevented = true;
-        };
-    }
-
-    for (var i=0; i<listeners.length; i++) {
-        listeners[i](e);
-        if (e.propagationStopped)
-            break;
-    }
-    
-    if (defaultHandler && !e.defaultPrevented)
-        defaultHandler(e);
-};
-
-EventEmitter.setDefaultHandler = function(eventName, callback) {
-    this._defaultHandlers = this._defaultHandlers || {};
-    
-    if (this._defaultHandlers[eventName])
-        throw new Error("The default handler for '" + eventName + "' is already set");
-        
-    this._defaultHandlers[eventName] = callback;
-};
-
-EventEmitter.on =
-EventEmitter.addEventListener = function(eventName, callback) {
-    this._eventRegistry = this._eventRegistry || {};
-
-    var listeners = this._eventRegistry[eventName];
-    if (!listeners)
-        var listeners = this._eventRegistry[eventName] = [];
-
-    if (listeners.indexOf(callback) == -1)
-        listeners.push(callback);
-};
-
-EventEmitter.removeListener =
-EventEmitter.removeEventListener = function(eventName, callback) {
-    this._eventRegistry = this._eventRegistry || {};
-
-    var listeners = this._eventRegistry[eventName];
-    if (!listeners)
-        return;
-
-    var index = listeners.indexOf(callback);
-    if (index !== -1)
-        listeners.splice(index, 1);
-};
-
-EventEmitter.removeAllListeners = function(eventName) {
-    if (this._eventRegistry) this._eventRegistry[eventName] = [];
-};
-
-exports.EventEmitter = EventEmitter;
-
-});/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/lib/oop', ['require', 'exports', 'module' ], function(require, exports, module) {
-"use strict";
-
-exports.inherits = (function() {
-    var tempCtor = function() {};
-    return function(ctor, superCtor) {
-        tempCtor.prototype = superCtor.prototype;
-        ctor.super_ = superCtor.prototype;
-        ctor.prototype = new tempCtor();
-        ctor.prototype.constructor = ctor;
-    };
-}());
-
-exports.mixin = function(obj, mixin) {
-    for (var key in mixin) {
-        obj[key] = mixin[key];
-    }
-};
-
-exports.implement = function(proto, mixin) {
-    exports.mixin(proto, mixin);
-};
-
-});
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
- 
-define('ace/mode/javascript_worker', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/worker/mirror', 'ace/worker/jshint', 'ace/narcissus/parser'], function(require, exports, module) {
-"use strict";
-    
-var oop = require("../lib/oop");
-var Mirror = require("../worker/mirror").Mirror;
-var lint = require("../worker/jshint").JSHINT;
-var parser = require("../narcissus/parser");
-    
-var JavaScriptWorker = exports.JavaScriptWorker = function(sender) {
-    Mirror.call(this, sender);
-    this.setTimeout(500);
-};
-
-oop.inherits(JavaScriptWorker, Mirror);
-
-(function() {
-    
-    this.onUpdate = function() {
-        var value = this.doc.getValue();
-        value = value.replace(/^#!.*\n/, "\n");
-        
-//        var start = new Date();
-        try {
-            parser.parse(value);
-        } catch(e) {
-//            console.log("narcissus")
-//            console.log(e);
-            var chunks = e.message.split(":")
-            var message = chunks.pop().trim();
-            var lineNumber = parseInt(chunks.pop().trim()) - 1;
-            this.sender.emit("narcissus", {
-                row: lineNumber,
-                column: null, // TODO convert e.cursor
-                text: message,
-                type: "error"
-            });
-            return;
-        } finally {
-//            console.log("parse time: " + (new Date() - start));
-        }
-        
-//        var start = new Date();
-//        console.log("jslint")
-        lint(value, {undef: false, onevar: false, passfail: false});
-        this.sender.emit("jslint", lint.errors);        
-//        console.log("lint time: " + (new Date() - start));
-    }
-    
-}).call(JavaScriptWorker.prototype);
-
-});define('ace/worker/mirror', ['require', 'exports', 'module' , 'ace/document', 'ace/lib/lang'], function(require, exports, module) {
-"use strict";
-
-var Document = require("../document").Document;
-var lang = require("../lib/lang");
-    
-var Mirror = exports.Mirror = function(sender) {
-    this.sender = sender;
-    var doc = this.doc = new Document("");
-    
-    var deferredUpdate = this.deferredUpdate = lang.deferredCall(this.onUpdate.bind(this));
-    
-    var _self = this;
-    sender.on("change", function(e) {
-        doc.applyDeltas([e.data]);        
-        deferredUpdate.schedule(_self.$timeout);
-    });
-};
-
-(function() {
-    
-    this.$timeout = 500;
-    
-    this.setTimeout = function(timeout) {
-        this.$timeout = timeout;
-    };
-    
-    this.setValue = function(value) {
-        this.doc.setValue(value);
-        this.deferredUpdate.schedule(this.$timeout);
-    };
-    
-    this.getValue = function(callbackId) {
-        this.sender.callback(this.doc.getValue(), callbackId);
-    };
-    
-    this.onUpdate = function() {
-        // abstract method
-    };
-    
-}).call(Mirror.prototype);
-
-});/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/document', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/event_emitter', 'ace/range', 'ace/anchor'], function(require, exports, module) {
-"use strict";
-
-var oop = require("./lib/oop");
-var EventEmitter = require("./lib/event_emitter").EventEmitter;
-var Range = require("./range").Range;
-var Anchor = require("./anchor").Anchor;
-
-var Document = function(text) {
-    this.$lines = [];
-
-    if (Array.isArray(text)) {
-        this.insertLines(0, text);
-    }
-    // There has to be one line at least in the document. If you pass an empty
-    // string to the insert function, nothing will happen. Workaround.
-    else if (text.length == 0) {
-        this.$lines = [""];
-    } else {
-        this.insert({row: 0, column:0}, text);
-    }
-};
-
-(function() {
-
-    oop.implement(this, EventEmitter);
-
-    this.setValue = function(text) {
-        var len = this.getLength();
-        this.remove(new Range(0, 0, len, this.getLine(len-1).length));
-        this.insert({row: 0, column:0}, text);
-    };
-
-    this.getValue = function() {
-        return this.getAllLines().join(this.getNewLineCharacter());
-    };
-
-    this.createAnchor = function(row, column) {
-        return new Anchor(this, row, column);
-    };
-
-    // check for IE split bug
-    if ("aaa".split(/a/).length == 0)
-        this.$split = function(text) {
-            return text.replace(/\r\n|\r/g, "\n").split("\n");
-        }
-    else
-        this.$split = function(text) {
-            return text.split(/\r\n|\r|\n/);
-        };
-
-
-    this.$detectNewLine = function(text) {
-        var match = text.match(/^.*?(\r\n|\r|\n)/m);
-        if (match) {
-            this.$autoNewLine = match[1];
-        } else {
-            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(newLineMode) {
-        if (this.$newLineMode === newLineMode)
-            return;
-
-        this.$newLineMode = newLineMode;
-    };
-
-    this.getNewLineMode = function() {
-        return this.$newLineMode;
-    };
-
-    this.isNewLine = function(text) {
-        return (text == "\r\n" || text == "\r" || text == "\n");
-    };
-
-    /**
-     * Get a verbatim copy of the given line as it is in the document
-     */
-    this.getLine = function(row) {
-        return this.$lines[row] || "";
-    };
-
-    this.getLines = function(firstRow, lastRow) {
-        return this.$lines.slice(firstRow, lastRow + 1);
-    };
-
-    /**
-     * Returns all lines in the document as string array. Warning: The caller
-     * should not modify this array!
-     */
-    this.getAllLines = function() {
-        return this.getLines(0, this.getLength());
-    };
-
-    this.getLength = function() {
-        return this.$lines.length;
-    };
-
-    this.getTextRange = function(range) {
-        if (range.start.row == range.end.row) {
-            return this.$lines[range.start.row].substring(range.start.column,
-                                                         range.end.column);
-        }
-        else {
-            var lines = [];
-            lines.push(this.$lines[range.start.row].substring(range.start.column));
-            lines.push.apply(lines, this.getLines(range.start.row+1, range.end.row-1));
-            lines.push(this.$lines[range.end.row].substring(0, range.end.column));
-            return lines.join(this.getNewLineCharacter());
-        }
-    };
-
-    this.$clipPosition = function(position) {
-        var length = this.getLength();
-        if (position.row >= length) {
-            position.row = Math.max(0, length - 1);
-            position.column = this.getLine(length-1).length;
-        }
-        return position;
-    };
-
-    this.insert = function(position, text) {
-        if (!text || text.length === 0)
-            return position;
-
-        position = this.$clipPosition(position);
-
-        // only detect new lines if the document has no line break yet
-        if (this.getLength() <= 1)
-            this.$detectNewLine(text);
-
-        var lines = this.$split(text);
-        var firstLine = lines.splice(0, 1)[0];
-        var lastLine = lines.length == 0 ? null : lines.splice(lines.length - 1, 1)[0];
-
-        position = this.insertInLine(position, firstLine);
-        if (lastLine !== null) {
-            position = this.insertNewLine(position); // terminate first line
-            position = this.insertLines(position.row, lines);
-            position = this.insertInLine(position, lastLine || "");
-        }
-        return position;
-    };
-
-    this.insertLines = function(row, lines) {
-        if (lines.length == 0)
-            return {row: row, column: 0};
-
-        var args = [row, 0];
-        args.push.apply(args, lines);
-        this.$lines.splice.apply(this.$lines, args);
-
-        var range = new Range(row, 0, row + lines.length, 0);
-        var delta = {
-            action: "insertLines",
-            range: range,
-            lines: lines
-        };
-        this._emit("change", { data: delta });
-        return range.end;
-    };
-
-    this.insertNewLine = function(position) {
-        position = this.$clipPosition(position);
-        var line = this.$lines[position.row] || "";
-
-        this.$lines[position.row] = line.substring(0, position.column);
-        this.$lines.splice(position.row + 1, 0, line.substring(position.column, line.length));
-
-        var end = {
-            row : position.row + 1,
-            column : 0
-        };
-
-        var delta = {
-            action: "insertText",
-            range: Range.fromPoints(position, end),
-            text: this.getNewLineCharacter()
-        };
-        this._emit("change", { data: delta });
-
-        return end;
-    };
-
-    this.insertInLine = function(position, text) {
-        if (text.length == 0)
-            return position;
-
-        var line = this.$lines[position.row] || "";
-
-        this.$lines[position.row] = line.substring(0, position.column) + text
-                + line.substring(position.column);
-
-        var end = {
-            row : position.row,
-            column : position.column + text.length
-        };
-
-        var delta = {
-            action: "insertText",
-            range: Range.fromPoints(position, end),
-            text: text
-        };
-        this._emit("change", { data: delta });
-
-        return end;
-    };
-
-    this.remove = function(range) {
-        // clip to document
-        range.start = this.$clipPosition(range.start);
-        range.end = this.$clipPosition(range.end);
-
-        if (range.isEmpty())
-            return range.start;
-
-        var firstRow = range.start.row;
-        var lastRow = range.end.row;
-
-        if (range.isMultiLine()) {
-            var firstFullRow = range.start.column == 0 ? firstRow : firstRow + 1;
-            var lastFullRow = lastRow - 1;
-
-            if (range.end.column > 0)
-                this.removeInLine(lastRow, 0, range.end.column);
-
-            if (lastFullRow >= firstFullRow)
-                this.removeLines(firstFullRow, lastFullRow);
-
-            if (firstFullRow != firstRow) {
-                this.removeInLine(firstRow, range.start.column, this.getLine(firstRow).length);
-                this.removeNewLine(range.start.row);
-            }
-        }
-        else {
-            this.removeInLine(firstRow, range.start.column, range.end.column);
-        }
-        return range.start;
-    };
-
-    this.removeInLine = function(row, startColumn, endColumn) {
-        if (startColumn == endColumn)
-            return;
-
-        var range = new Range(row, startColumn, row, endColumn);
-        var line = this.getLine(row);
-        var removed = line.substring(startColumn, endColumn);
-        var newLine = line.substring(0, startColumn) + line.substring(endColumn, line.length);
-        this.$lines.splice(row, 1, newLine);
-
-        var delta = {
-            action: "removeText",
-            range: range,
-            text: removed
-        };
-        this._emit("change", { data: delta });
-        return range.start;
-    };
-
-    /**
-     * Removes a range of full lines
-     *
-     * @param firstRow {Integer} The first row to be removed
-     * @param lastRow {Integer} The last row to be removed
-     * @return {String[]} The removed lines
-     */
-    this.removeLines = function(firstRow, lastRow) {
-        var range = new Range(firstRow, 0, lastRow + 1, 0);
-        var removed = this.$lines.splice(firstRow, lastRow - firstRow + 1);
-
-        var delta = {
-            action: "removeLines",
-            range: range,
-            nl: this.getNewLineCharacter(),
-            lines: removed
-        };
-        this._emit("change", { data: delta });
-        return removed;
-    };
-
-    this.removeNewLine = function(row) {
-        var firstLine = this.getLine(row);
-        var secondLine = this.getLine(row+1);
-
-        var range = new Range(row, firstLine.length, row+1, 0);
-        var line = firstLine + secondLine;
-
-        this.$lines.splice(row, 2, line);
-
-        var delta = {
-            action: "removeText",
-            range: range,
-            text: this.getNewLineCharacter()
-        };
-        this._emit("change", { data: delta });
-    };
-
-    this.replace = function(range, text) {
-        if (text.length == 0 && range.isEmpty())
-            return range.start;
-
-        // Shortcut: If the text we want to insert is the same as it is already
-        // in the document, we don't have to replace anything.
-        if (text == this.getTextRange(range))
-            return range.end;
-
-        this.remove(range);
-        if (text) {
-            var end = this.insert(range.start, text);
-        }
-        else {
-            end = range.start;
-        }
-
-        return end;
-    };
-
-    this.applyDeltas = function(deltas) {
-        for (var i=0; i<deltas.length; i++) {
-            var delta = deltas[i];
-            var range = Range.fromPoints(delta.range.start, delta.range.end);
-
-            if (delta.action == "insertLines")
-                this.insertLines(range.start.row, delta.lines);
-            else if (delta.action == "insertText")
-                this.insert(range.start, delta.text);
-            else if (delta.action == "removeLines")
-                this.removeLines(range.start.row, range.end.row - 1);
-            else if (delta.action == "removeText")
-                this.remove(range);
-        }
-    };
-
-    this.revertDeltas = function(deltas) {
-        for (var i=deltas.length-1; i>=0; i--) {
-            var delta = deltas[i];
-
-            var range = Range.fromPoints(delta.range.start, delta.range.end);
-
-            if (delta.action == "insertLines")
-                this.removeLines(range.start.row, range.end.row - 1);
-            else if (delta.action == "insertText")
-                this.remove(range);
-            else if (delta.action == "removeLines")
-                this.insertLines(range.start.row, delta.lines);
-            else if (delta.action == "removeText")
-                this.insert(range.start, delta.text);
-        }
-    };
-
-}).call(Document.prototype);
-
-exports.Document = Document;
-});
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/range', ['require', 'exports', 'module' ], function(require, exports, module) {
-"use strict";
-
-var Range = function(startRow, startColumn, endRow, endColumn) {
-    this.start = {
-        row: startRow,
-        column: startColumn
-    };
-
-    this.end = {
-        row: endRow,
-        column: endColumn
-    };
-};
-
-(function() {
-    this.isEqual = function(range) {
-        return this.start.row == range.start.row &&
-            this.end.row == range.end.row &&
-            this.start.column == range.start.column &&
-            this.end.column == range.end.column
-    };
-
-    this.toString = function() {
-        return ("Range: [" + this.start.row + "/" + this.start.column +
-            "] -> [" + this.end.row + "/" + this.end.column + "]");
-    };
-
-    this.contains = function(row, column) {
-        return this.compare(row, column) == 0;
-    };
-
-    /**
-     * Compares this range (A) with another range (B), where B is the passed in
-     * range.
-     *
-     * Return values:
-     *  -2: (B) is infront of (A) and doesn't intersect with (A)
-     *  -1: (B) begins before (A) but ends inside of (A)
-     *   0: (B) is completly inside of (A) OR (A) is complety inside of (B)
-     *  +1: (B) begins inside of (A) but ends outside of (A)
-     *  +2: (B) is after (A) and doesn't intersect with (A)
-     *
-     *  42: FTW state: (B) ends in (A) but starts outside of (A)
-     */
-    this.compareRange = function(range) {
-        var cmp,
-            end = range.end,
-            start = range.start;
-
-        cmp = this.compare(end.row, end.column);
-        if (cmp == 1) {
-            cmp = this.compare(start.row, start.column);
-            if (cmp == 1) {
-                return 2;
-            } else if (cmp == 0) {
-                return 1;
-            } else {
-                return 0;
-            }
-        } else if (cmp == -1) {
-            return -2;
-        } else {
-            cmp = this.compare(start.row, start.column);
-            if (cmp == -1) {
-                return -1;
-            } else if (cmp == 1) {
-                return 42;
-            } else {
-                return 0;
-            }
-        }
-    }
-
-    this.comparePoint = function(p) {
-        return this.compare(p.row, p.column);
-    }
-
-    this.containsRange = function(range) {
-        return this.comparePoint(range.start) == 0 && this.comparePoint(range.end) == 0;
-    }
-
-    this.intersectsRange = function(range) {
-        var cmp = this.compareRange(range);
-        return (cmp == -1 || cmp == 0 || cmp == 1);
-    }
-
-    this.isEnd = function(row, column) {
-        return this.end.row == row && this.end.column == column;
-    }
-
-    this.isStart = function(row, column) {
-        return this.start.row == row && this.start.column == column;
-    }
-
-    this.setStart = function(row, column) {
-        if (typeof row == "object") {
-            this.start.column = row.column;
-            this.start.row = row.row;
-        } else {
-            this.start.row = row;
-            this.start.column = column;
-        }
-    }
-
-    this.setEnd = function(row, column) {
-        if (typeof row == "object") {
-            this.end.column = row.column;
-            this.end.row = row.row;
-        } else {
-            this.end.row = row;
-            this.end.column = column;
-        }
-    }
-
-    this.inside = function(row, column) {
-        if (this.compare(row, column) == 0) {
-            if (this.isEnd(row, column) || this.isStart(row, column)) {
-                return false;
-            } else {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    this.insideStart = function(row, column) {
-        if (this.compare(row, column) == 0) {
-            if (this.isEnd(row, column)) {
-                return false;
-            } else {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    this.insideEnd = function(row, column) {
-        if (this.compare(row, column) == 0) {
-            if (this.isStart(row, column)) {
-                return false;
-            } else {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    this.compare = function(row, column) {
-        if (!this.isMultiLine()) {
-            if (row === this.start.row) {
-                return column < this.start.column ? -1 : (column > this.end.column ? 1 : 0);
-            };
-        }
-
-        if (row < this.start.row)
-            return -1;
-
-        if (row > this.end.row)
-            return 1;
-
-        if (this.start.row === row)
-            return column >= this.start.column ? 0 : -1;
-
-        if (this.end.row === row)
-            return column <= this.end.column ? 0 : 1;
-
-        return 0;
-    };
-
-    /**
-     * Like .compare(), but if isStart is true, return -1;
-     */
-    this.compareStart = function(row, column) {
-        if (this.start.row == row && this.start.column == column) {
-            return -1;
-        } else {
-            return this.compare(row, column);
-        }
-    }
-
-    /**
-     * Like .compare(), but if isEnd is true, return 1;
-     */
-    this.compareEnd = function(row, column) {
-        if (this.end.row == row && this.end.column == column) {
-            return 1;
-        } else {
-            return this.compare(row, column);
-        }
-    }
-
-    this.compareInside = function(row, column) {
-        if (this.end.row == row && this.end.column == column) {
-            return 1;
-        } else if (this.start.row == row && this.start.column == column) {
-            return -1;
-        } else {
-            return this.compare(row, column);
-        }
-    }
-
-    this.clipRows = function(firstRow, lastRow) {
-        if (this.end.row > lastRow) {
-            var end = {
-                row: lastRow+1,
-                column: 0
-            };
-        }
-
-        if (this.start.row > lastRow) {
-            var start = {
-                row: lastRow+1,
-                column: 0
-            };
-        }
-
-        if (this.start.row < firstRow) {
-            var start = {
-                row: firstRow,
-                column: 0
-            };
-        }
-
-        if (this.end.row < firstRow) {
-            var end = {
-                row: firstRow,
-                column: 0
-            };
-        }
-        return Range.fromPoints(start || this.start, end || this.end);
-    };
-
-    this.extend = function(row, column) {
-        var cmp = this.compare(row, column);
-
-        if (cmp == 0)
-            return this;
-        else if (cmp == -1)
-            var start = {row: row, column: column};
-        else
-            var end = {row: row, column: column};
-
-        return Range.fromPoints(start || this.start, end || 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 false;
-        }
-        
-        var temp = this.start;
-        this.end = this.start;
-        this.start = temp;
-        return true;
-    };
-
-
-    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 Range.fromPoints(this.start, this.end);
-    };
-
-    this.collapseRows = function() {
-        if (this.end.column == 0)
-            return new Range(this.start.row, 0, Math.max(this.start.row, this.end.row-1), 0)
-        else
-            return new Range(this.start.row, 0, this.end.row, 0)
-    };
-
-    this.toScreenRange = function(session) {
-        var screenPosStart =
-            session.documentToScreenPosition(this.start);
-        var screenPosEnd =
-            session.documentToScreenPosition(this.end);
-
-        return new Range(
-            screenPosStart.row, screenPosStart.column,
-            screenPosEnd.row, screenPosEnd.column
-        );
-    };
-
-}).call(Range.prototype);
-
-
-Range.fromPoints = function(start, end) {
-    return new Range(start.row, start.column, end.row, end.column);
-};
-
-exports.Range = Range;
-});
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/anchor', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/event_emitter'], function(require, exports, module) {
-"use strict";
-
-var oop = require("./lib/oop");
-var EventEmitter = require("./lib/event_emitter").EventEmitter;
-
-/**
- * An Anchor is a floating pointer in the document. Whenever text is inserted or
- * deleted before the cursor, the position of the cursor is updated
- */
-var Anchor = exports.Anchor = function(doc, row, column) {
-    this.document = doc;
-    
-    if (typeof column == "undefined")
-        this.setPosition(row.row, row.column);
-    else
-        this.setPosition(row, column);
-
-    this.$onChange = this.onChange.bind(this);
-    doc.on("change", this.$onChange);
-};
-
-(function() {
-
-    oop.implement(this, EventEmitter);
-    
-    this.getPosition = function() {
-        return this.$clipPositionToDocument(this.row, this.column);
-    };
-    
-    this.getDocument = function() {
-        return this.document;
-    };
-    
-    this.onChange = function(e) {
-        var delta = e.data;
-        var range = delta.range;
-            
-        if (range.start.row == range.end.row && range.start.row != this.row)
-            return;
-            
-        if (range.start.row > this.row)
-            return;
-            
-        if (range.start.row == this.row && range.start.column > this.column)
-            return;
-    
-        var row = this.row;
-        var column = this.column;
-        
-        if (delta.action === "insertText") {
-            if (range.start.row === row && range.start.column <= column) {
-                if (range.start.row === range.end.row) {
-                    column += range.end.column - range.start.column;
-                }
-                else {
-                    column -= range.start.column;
-                    row += range.end.row - range.start.row;
-                }
-            }
-            else if (range.start.row !== range.end.row && range.start.row < row) {
-                row += range.end.row - range.start.row;
-            }
-        } else if (delta.action === "insertLines") {
-            if (range.start.row <= row) {
-                row += range.end.row - range.start.row;
-            }
-        }
-        else if (delta.action == "removeText") {
-            if (range.start.row == row && range.start.column < column) {
-                if (range.end.column >= column)
-                    column = range.start.column;
-                else
-                    column = Math.max(0, column - (range.end.column - range.start.column));
-                
-            } else if (range.start.row !== range.end.row && range.start.row < row) {
-                if (range.end.row == row) {
-                    column = Math.max(0, column - range.end.column) + range.start.column;
-                }
-                row -= (range.end.row - range.start.row);
-            }
-            else if (range.end.row == row) {
-                row -= range.end.row - range.start.row;
-                column = Math.max(0, column - range.end.column) + range.start.column;
-            }
-        } else if (delta.action == "removeLines") {
-            if (range.start.row <= row) {
-                if (range.end.row <= row)
-                    row -= range.end.row - range.start.row;
-                else {
-                    row = range.start.row;
-                    column = 0;
-                }
-            }
-        }
-
-        this.setPosition(row, column, true);
-    };
-
-    this.setPosition = function(row, column, noClip) {
-        var pos;
-        if (noClip) {
-            pos = {
-                row: row,
-                column: column
-            };
-        }
-        else {
-            pos = this.$clipPositionToDocument(row, column);
-        }
-        
-        if (this.row == pos.row && this.column == pos.column)
-            return;
-            
-        var old = {
-            row: this.row,
-            column: this.column
-        };
-        
-        this.row = pos.row;
-        this.column = pos.column;
-        this._emit("change", {
-            old: old,
-            value: pos
-        });
-    };
-    
-    this.detach = function() {
-        this.document.removeEventListener("change", this.$onChange);
-    };
-    
-    this.$clipPositionToDocument = function(row, column) {
-        var pos = {};
-    
-        if (row >= this.document.getLength()) {
-            pos.row = Math.max(0, this.document.getLength() - 1);
-            pos.column = this.document.getLine(pos.row).length;
-        }
-        else if (row < 0) {
-            pos.row = 0;
-            pos.column = 0;
-        }
-        else {
-            pos.row = row;
-            pos.column = Math.min(this.document.getLine(pos.row).length, Math.max(0, column));
-        }
-        
-        if (column < 0)
-            pos.column = 0;
-            
-        return pos;
-    };
-    
-}).call(Anchor.prototype);
-
-});
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/lib/lang', ['require', 'exports', 'module' ], function(require, exports, module) {
-"use strict";
-
-exports.stringReverse = function(string) {
-    return string.split("").reverse().join("");
-};
-
-exports.stringRepeat = function (string, count) {
-     return new Array(count + 1).join(string);
-};
-
-var trimBeginRegexp = /^\s\s*/;
-var trimEndRegexp = /\s\s*$/;
-
-exports.stringTrimLeft = function (string) {
-    return string.replace(trimBeginRegexp, '');
-};
-
-exports.stringTrimRight = function (string) {
-    return string.replace(trimEndRegexp, '');
-};
-
-exports.copyObject = function(obj) {
-    var copy = {};
-    for (var key in obj) {
-        copy[key] = obj[key];
-    }
-    return copy;
-};
-
-exports.copyArray = function(array){
-    var copy = [];
-    for (var i=0, l=array.length; i<l; i++) {
-        if (array[i] && typeof array[i] == "object")
-            copy[i] = this.copyObject( array[i] );
-        else 
-            copy[i] = array[i];
-    }
-    return copy;
-};
-
-exports.deepCopy = function (obj) {
-    if (typeof obj != "object") {
-        return obj;
-    }
-    
-    var copy = obj.constructor();
-    for (var key in obj) {
-        if (typeof obj[key] == "object") {
-            copy[key] = this.deepCopy(obj[key]);
-        } else {
-            copy[key] = obj[key];
-        }
-    }
-    return copy;
-};
-
-exports.arrayToMap = function(arr) {
-    var map = {};
-    for (var i=0; i<arr.length; i++) {
-        map[arr[i]] = 1;
-    }
-    return map;
-
-};
-
-/**
- * splice out of 'array' anything that === 'value'
- */
-exports.arrayRemove = function(array, value) {
-  for (var i = 0; i <= array.length; i++) {
-    if (value === array[i]) {
-      array.splice(i, 1);
-    }
-  }
-};
-
-exports.escapeRegExp = function(str) {
-    return str.replace(/([.*+?^${}()|[\]\/\\])/g, '\\$1');
-};
-
-exports.deferredCall = function(fcn) {
-
-    var timer = null;
-    var callback = function() {
-        timer = null;
-        fcn();
-    };
-
-    var deferred = function(timeout) {
-        deferred.cancel();
-        timer = setTimeout(callback, timeout || 0);
-        return deferred;
-    };
-
-    deferred.schedule = deferred;
-
-    deferred.call = function() {
-        this.cancel();
-        fcn();
-        return deferred;
-    };
-
-    deferred.cancel = function() {
-        clearTimeout(timer);
-        timer = null;
-        return deferred;
-    };
-
-    return deferred;
-};
-
-});
-define('ace/worker/jshint', ['require', 'exports', 'module' ], function(require, exports, module) {
-/*!
- * JSHint, by JSHint Community.
- *
- * Licensed under the same slightly modified MIT license that JSLint is.
- * It stops evil-doers everywhere.
- *
- * JSHint is a derivative work of JSLint:
- *
- *   Copyright (c) 2002 Douglas Crockford  (www.JSLint.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 shall be used for Good, not Evil.
- *
- *   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.
- *
- * JSHint was forked from 2010-12-16 edition of JSLint.
- *
- */
-
-/*
- JSHINT is a global function. It takes two parameters.
-
-     var myResult = JSHINT(source, option);
-
- The first parameter is either a string or an array of strings. If it is a
- string, it will be split on '\n' or '\r'. If it is an array of strings, it
- is assumed that each string represents one line. The source can be a
- JavaScript text or a JSON text.
-
- The second parameter is an optional object of options which control the
- operation of JSHINT. Most of the options are booleans: They are all
- optional and have a default value of false. One of the options, predef,
- can be an array of names, which will be used to declare global variables,
- or an object whose keys are used as global names, with a boolean value
- that determines if they are assignable.
-
- If it checks out, JSHINT returns true. Otherwise, it returns false.
-
- If false, you can inspect JSHINT.errors to find out the problems.
- JSHINT.errors is an array of objects containing these members:
-
- {
-     line      : The line (relative to 0) at which the lint was found
-     character : The character (relative to 0) at which the lint was found
-     reason    : The problem
-     evidence  : The text line in which the problem occurred
-     raw       : The raw message before the details were inserted
-     a         : The first detail
-     b         : The second detail
-     c         : The third detail
-     d         : The fourth detail
- }
-
- If a fatal error was found, a null will be the last element of the
- JSHINT.errors array.
-
- You can request a Function Report, which shows all of the functions
- and the parameters and vars that they use. This can be used to find
- implied global variables and other problems. The report is in HTML and
- can be inserted in an HTML <body>.
-
-     var myReport = JSHINT.report(limited);
-
- If limited is true, then the report will be limited to only errors.
-
- You can request a data structure which contains JSHint's results.
-
-     var myData = JSHINT.data();
-
- It returns a structure with this form:
-
- {
-     errors: [
-         {
-             line: NUMBER,
-             character: NUMBER,
-             reason: STRING,
-             evidence: STRING
-         }
-     ],
-     functions: [
-         name: STRING,
-         line: NUMBER,
-         last: NUMBER,
-         param: [
-             STRING
-         ],
-         closure: [
-             STRING
-         ],
-         var: [
-             STRING
-         ],
-         exception: [
-             STRING
-         ],
-         outer: [
-             STRING
-         ],
-         unused: [
-             STRING
-         ],
-         global: [
-             STRING
-         ],
-         label: [
-             STRING
-         ]
-     ],
-     globals: [
-         STRING
-     ],
-     member: {
-         STRING: NUMBER
-     },
-     unused: [
-         {
-             name: STRING,
-             line: NUMBER
-         }
-     ],
-     implieds: [
-         {
-             name: STRING,
-             line: NUMBER
-         }
-     ],
-     urls: [
-         STRING
-     ],
-     json: BOOLEAN
- }
-
- Empty arrays will not be included.
-
-*/
-
-/*jshint
- evil: true, nomen: false, onevar: false, regexp: false, strict: true, boss: true,
- undef: true, maxlen: 100, indent:4
-*/
-
-/*members "\b", "\t", "\n", "\f", "\r", "!=", "!==", "\"", "%", "(begin)",
- "(breakage)", "(context)", "(error)", "(global)", "(identifier)", "(last)",
- "(line)", "(loopage)", "(name)", "(onevar)", "(params)", "(scope)",
- "(statement)", "(verb)", "*", "+", "++", "-", "--", "\/", "<", "<=", "==",
- "===", ">", ">=", $, $$, $A, $F, $H, $R, $break, $continue, $w, Abstract, Ajax,
- __filename, __dirname, ActiveXObject, Array, ArrayBuffer, ArrayBufferView, Audio,
- Autocompleter, Assets, Boolean, Builder, Buffer, Browser, COM, CScript, Canvas,
- CustomAnimation, Class, Control, Chain, Color, Cookie, Core, DataView, Date,
- Debug, Draggable, Draggables, Droppables, Document, DomReady, DOMReady, DOMParser, Drag,
- E, Enumerator, Enumerable, Element, Elements, Error, Effect, EvalError, Event,
- Events, FadeAnimation, Field, Flash, Float32Array, Float64Array, Form,
- FormField, Frame, FormData, Function, Fx, GetObject, Group, Hash, HotKey,
- HTMLElement, HTMLAnchorElement, HTMLBaseElement, HTMLBlockquoteElement,
- HTMLBodyElement, HTMLBRElement, HTMLButtonElement, HTMLCanvasElement, HTMLDirectoryElement,
- HTMLDivElement, HTMLDListElement, HTMLFieldSetElement,
- HTMLFontElement, HTMLFormElement, HTMLFrameElement, HTMLFrameSetElement,
- HTMLHeadElement, HTMLHeadingElement, HTMLHRElement, HTMLHtmlElement,
- HTMLIFrameElement, HTMLImageElement, HTMLInputElement, HTMLIsIndexElement,
- HTMLLabelElement, HTMLLayerElement, HTMLLegendElement, HTMLLIElement,
- HTMLLinkElement, HTMLMapElement, HTMLMenuElement, HTMLMetaElement,
- HTMLModElement, HTMLObjectElement, HTMLOListElement, HTMLOptGroupElement,
- HTMLOptionElement, HTMLParagraphElement, HTMLParamElement, HTMLPreElement,
- HTMLQuoteElement, HTMLScriptElement, HTMLSelectElement, HTMLStyleElement,
- HtmlTable, HTMLTableCaptionElement, HTMLTableCellElement, HTMLTableColElement,
- HTMLTableElement, HTMLTableRowElement, HTMLTableSectionElement,
- HTMLTextAreaElement, HTMLTitleElement, HTMLUListElement, HTMLVideoElement,
- Iframe, IframeShim, Image, Int16Array, Int32Array, Int8Array,
- Insertion, InputValidator, JSON, Keyboard, Locale, LN10, LN2, LOG10E, LOG2E,
- MAX_VALUE, MIN_VALUE, Mask, Math, MenuItem, MessageChannel, MessageEvent, MessagePort,
- MoveAnimation, MooTools, Native, NEGATIVE_INFINITY, Number, Object, ObjectRange, Option,
- Options, OverText, PI, POSITIVE_INFINITY, PeriodicalExecuter, Point, Position, Prototype,
- RangeError, Rectangle, ReferenceError, RegExp, ResizeAnimation, Request, RotateAnimation,
- SQRT1_2, SQRT2, ScrollBar, ScriptEngine, ScriptEngineBuildVersion,
- ScriptEngineMajorVersion, ScriptEngineMinorVersion, Scriptaculous, Scroller,
- Slick, Slider, Selector, SharedWorker, String, Style, SyntaxError, Sortable, Sortables,
- SortableObserver, Sound, Spinner, System, Swiff, Text, TextArea, Template,
- Timer, Tips, Type, TypeError, Toggle, Try, "use strict", unescape, URI, URIError, URL,
- VBArray, WSH, WScript, XDomainRequest, Web, Window, XMLDOM, XMLHttpRequest, XMLSerializer,
- XPathEvaluator, XPathException, XPathExpression, XPathNamespace, XPathNSResolver, XPathResult,
- "\\", a, addEventListener, address, alert, apply, applicationCache, arguments, arity, asi, atob,
- b, basic, basicToken, bitwise, block, blur, boolOptions, boss, browser, btoa, c, call, callee,
- caller, cases, charAt, charCodeAt, character, clearInterval, clearTimeout,
- close, closed, closure, comment, condition, confirm, console, constructor,
- content, couch, create, css, curly, d, data, datalist, dd, debug, decodeURI,
- decodeURIComponent, defaultStatus, defineClass, deserialize, devel, document,
- dojo, dijit, dojox, define, else, emit, encodeURI, encodeURIComponent,
- entityify, eqeqeq, eqnull, errors, es5, escape, esnext, eval, event, evidence, evil,
- ex, exception, exec, exps, expr, exports, FileReader, first, floor, focus,
- forin, fragment, frames, from, fromCharCode, fud, funcscope, funct, function, functions,
- g, gc, getComputedStyle, getRow, getter, getterToken, GLOBAL, global, globals, globalstrict,
- hasOwnProperty, help, history, i, id, identifier, immed, implieds, importPackage, include,
- indent, indexOf, init, ins, instanceOf, isAlpha, isApplicationRunning, isArray,
- isDigit, isFinite, isNaN, iterator, java, join, jshint,
- JSHINT, json, jquery, jQuery, keys, label, labelled, last, lastsemic, laxbreak, laxcomma,
- latedef, lbp, led, left, length, line, load, loadClass, localStorage, location,
- log, loopfunc, m, match, maxerr, maxlen, member,message, meta, module, moveBy,
- moveTo, mootools, multistr, name, navigator, new, newcap, noarg, node, noempty, nomen,
- nonew, nonstandard, nud, onbeforeunload, onblur, onerror, onevar, onecase, onfocus,
- onload, onresize, onunload, open, openDatabase, openURL, opener, opera, options, outer, param,
- parent, parseFloat, parseInt, passfail, plusplus, predef, print, process, prompt,
- proto, prototype, prototypejs, provides, push, quit, range, raw, reach, reason, regexp,
- readFile, readUrl, regexdash, removeEventListener, replace, report, require,
- reserved, resizeBy, resizeTo, resolvePath, resumeUpdates, respond, rhino, right,
- runCommand, scroll, screen, scripturl, scrollBy, scrollTo, scrollbar, search, seal,
- send, serialize, sessionStorage, setInterval, setTimeout, setter, setterToken, shift, slice,
- smarttabs, sort, spawn, split, stack, status, start, strict, sub, substr, supernew, shadow,
- supplant, sum, sync, test, toLowerCase, toString, toUpperCase, toint32, token, top, trailing,
- type, typeOf, Uint16Array, Uint32Array, Uint8Array, undef, undefs, unused, urls, validthis,
- value, valueOf, var, version, WebSocket, withstmt, white, window, Worker, wsh*/
-
-/*global exports: false */
-
-// We build the application inside a function so that we produce only a single
-// global variable. That function will be invoked immediately, and its return
-// value is the JSHINT function itself.
-
-var JSHINT = (function () {
-    "use strict";
-
-    var anonname,       // The guessed name for anonymous functions.
-
-// These are operators that should not be used with the ! operator.
-
-        bang = {
-            '<'  : true,
-            '<=' : true,
-            '==' : true,
-            '===': true,
-            '!==': true,
-            '!=' : true,
-            '>'  : true,
-            '>=' : true,
-            '+'  : true,
-            '-'  : true,
-            '*'  : true,
-            '/'  : true,
-            '%'  : true
-        },
-
-        // These are the JSHint boolean options.
-        boolOptions = {
-            asi         : true, // if automatic semicolon insertion should be tolerated
-            bitwise     : true, // if bitwise operators should not be allowed
-            boss        : true, // if advanced usage of assignments should be allowed
-            browser     : true, // if the standard browser globals should be predefined
-            couch       : true, // if CouchDB globals should be predefined
-            curly       : true, // if curly braces around all blocks should be required
-            debug       : true, // if debugger statements should be allowed
-            devel       : true, // if logging globals should be predefined (console,
-                                // alert, etc.)
-            dojo        : true, // if Dojo Toolkit globals should be predefined
-            eqeqeq      : true, // if === should be required
-            eqnull      : true, // if == null comparisons should be tolerated
-            es5         : true, // if ES5 syntax should be allowed
-            esnext      : true, // if es.next specific syntax should be allowed
-            evil        : true, // if eval should be allowed
-            expr        : true, // if ExpressionStatement should be allowed as Programs
-            forin       : true, // if for in statements must filter
-            funcscope   : true, // if only function scope should be used for scope tests
-            globalstrict: true, // if global "use strict"; should be allowed (also
-                                // enables 'strict')
-            immed       : true, // if immediate invocations must be wrapped in parens
-            iterator    : true, // if the `__iterator__` property should be allowed
-            jquery      : true, // if jQuery globals should be predefined
-            lastsemic   : true, // if semicolons may be ommitted for the trailing
-                                // statements inside of a one-line blocks.
-            latedef     : true, // if the use before definition should not be tolerated
-            laxbreak    : true, // if line breaks should not be checked
-            laxcomma    : true, // if line breaks should not be checked around commas
-            loopfunc    : true, // if functions should be allowed to be defined within
-                                // loops
-            mootools    : true, // if MooTools globals should be predefined
-            multistr    : true, // allow multiline strings
-            newcap      : true, // if constructor names must be capitalized
-            noarg       : true, // if arguments.caller and arguments.callee should be
-                                // disallowed
-            node        : true, // if the Node.js environment globals should be
-                                // predefined
-            noempty     : true, // if empty blocks should be disallowed
-            nonew       : true, // if using `new` for side-effects should be disallowed
-            nonstandard : true, // if non-standard (but widely adopted) globals should
-                                // be predefined
-            nomen       : true, // if names should be checked
-            onevar      : true, // if only one var statement per function should be
-                                // allowed
-            onecase     : true, // if one case switch statements should be allowed
-            passfail    : true, // if the scan should stop on first error
-            plusplus    : true, // if increment/decrement should not be allowed
-            proto       : true, // if the `__proto__` property should be allowed
-            prototypejs : true, // if Prototype and Scriptaculous globals should be
-                                // predefined
-            regexdash   : true, // if unescaped first/last dash (-) inside brackets
-                                // should be tolerated
-            regexp      : true, // if the . should not be allowed in regexp literals
-            rhino       : true, // if the Rhino environment globals should be predefined
-            undef       : true, // if variables should be declared before used
-            scripturl   : true, // if script-targeted URLs should be tolerated
-            shadow      : true, // if variable shadowing should be tolerated
-            smarttabs   : true, // if smarttabs should be tolerated
-                                // (http://www.emacswiki.org/emacs/SmartTabs)
-            strict      : true, // require the "use strict"; pragma
-            sub         : true, // if all forms of subscript notation are tolerated
-            supernew    : true, // if `new function () { ... };` and `new Object;`
-                                // should be tolerated
-            trailing    : true, // if trailing whitespace rules apply
-            validthis   : true, // if 'this' inside a non-constructor function is valid.
-                                // This is a function scoped option only.
-            withstmt    : true, // if with statements should be allowed
-            white       : true, // if strict whitespace rules apply
-            wsh         : true  // if the Windows Scripting Host environment globals
-                                // should be predefined
-        },
-
-        // These are the JSHint options that can take any value
-        // (we use this object to detect invalid options)
-        valOptions = {
-            maxlen: false,
-            indent: false,
-            maxerr: false,
-            predef: false
-        },
-
-
-        // browser contains a set of global names which are commonly provided by a
-        // web browser environment.
-        browser = {
-            ArrayBuffer              :  false,
-            ArrayBufferView          :  false,
-            Audio                    :  false,
-            addEventListener         :  false,
-            applicationCache         :  false,
-            atob                     :  false,
-            blur                     :  false,
-            btoa                     :  false,
-            clearInterval            :  false,
-            clearTimeout             :  false,
-            close                    :  false,
-            closed                   :  false,
-            DataView                 :  false,
-            DOMParser                :  false,
-            defaultStatus            :  false,
-            document                 :  false,
-            event                    :  false,
-            FileReader               :  false,
-            Float32Array             :  false,
-            Float64Array             :  false,
-            FormData                 :  false,
-            focus                    :  false,
-            frames                   :  false,
-            getComputedStyle         :  false,
-            HTMLElement              :  false,
-            HTMLAnchorElement        :  false,
-            HTMLBaseElement          :  false,
-            HTMLBlockquoteElement    :  false,
-            HTMLBodyElement          :  false,
-            HTMLBRElement            :  false,
-            HTMLButtonElement        :  false,
-            HTMLCanvasElement        :  false,
-            HTMLDirectoryElement     :  false,
-            HTMLDivElement           :  false,
-            HTMLDListElement         :  false,
-            HTMLFieldSetElement      :  false,
-            HTMLFontElement          :  false,
-            HTMLFormElement          :  false,
-            HTMLFrameElement         :  false,
-            HTMLFrameSetElement      :  false,
-            HTMLHeadElement          :  false,
-            HTMLHeadingElement       :  false,
-            HTMLHRElement            :  false,
-            HTMLHtmlElement          :  false,
-            HTMLIFrameElement        :  false,
-            HTMLImageElement         :  false,
-            HTMLInputElement         :  false,
-            HTMLIsIndexElement       :  false,
-            HTMLLabelElement         :  false,
-            HTMLLayerElement         :  false,
-            HTMLLegendElement        :  false,
-            HTMLLIElement            :  false,
-            HTMLLinkElement          :  false,
-            HTMLMapElement           :  false,
-            HTMLMenuElement          :  false,
-            HTMLMetaElement          :  false,
-            HTMLModElement           :  false,
-            HTMLObjectElement        :  false,
-            HTMLOListElement         :  false,
-            HTMLOptGroupElement      :  false,
-            HTMLOptionElement        :  false,
-            HTMLParagraphElement     :  false,
-            HTMLParamElement         :  false,
-            HTMLPreElement           :  false,
-            HTMLQuoteElement         :  false,
-            HTMLScriptElement        :  false,
-            HTMLSelectElement        :  false,
-            HTMLStyleElement         :  false,
-            HTMLTableCaptionElement  :  false,
-            HTMLTableCellElement     :  false,
-            HTMLTableColElement      :  false,
-            HTMLTableElement         :  false,
-            HTMLTableRowElement      :  false,
-            HTMLTableSectionElement  :  false,
-            HTMLTextAreaElement      :  false,
-            HTMLTitleElement         :  false,
-            HTMLUListElement         :  false,
-            HTMLVideoElement         :  false,
-            history                  :  false,
-            Int16Array               :  false,
-            Int32Array               :  false,
-            Int8Array                :  false,
-            Image                    :  false,
-            length                   :  false,
-            localStorage             :  false,
-            location                 :  false,
-            MessageChannel           :  false,
-            MessageEvent             :  false,
-            MessagePort              :  false,
-            moveBy                   :  false,
-            moveTo                   :  false,
-            name                     :  false,
-            navigator                :  false,
-            onbeforeunload           :  true,
-            onblur                   :  true,
-            onerror                  :  true,
-            onfocus                  :  true,
-            onload                   :  true,
-            onresize                 :  true,
-            onunload                 :  true,
-            open                     :  false,
-            openDatabase             :  false,
-            opener                   :  false,
-            Option                   :  false,
-            parent                   :  false,
-            print                    :  false,
-            removeEventListener      :  false,
-            resizeBy                 :  false,
-            resizeTo                 :  false,
-            screen                   :  false,
-            scroll                   :  false,
-            scrollBy                 :  false,
-            scrollTo                 :  false,
-            sessionStorage           :  false,
-            setInterval              :  false,
-            setTimeout               :  false,
-            SharedWorker             :  false,
-            status                   :  false,
-            top                      :  false,
-            Uint16Array              :  false,
-            Uint32Array              :  false,
-            Uint8Array               :  false,
-            WebSocket                :  false,
-            window                   :  false,
-            Worker                   :  false,
-            XMLHttpRequest           :  false,
-            XMLSerializer            :  false,
-            XPathEvaluator           :  false,
-            XPathException           :  false,
-            XPathExpression          :  false,
-            XPathNamespace           :  false,
-            XPathNSResolver          :  false,
-            XPathResult              :  false
-        },
-
-        couch = {
-            "require" : false,
-            respond   : false,
-            getRow    : false,
-            emit      : false,
-            send      : false,
-            start     : false,
-            sum       : false,
-            log       : false,
-            exports   : false,
-            module    : false,
-            provides  : false
-        },
-
-        devel = {
-            alert   : false,
-            confirm : false,
-            console : false,
-            Debug   : false,
-            opera   : false,
-            prompt  : false
-        },
-
-        dojo = {
-            dojo      : false,
-            dijit     : false,
-            dojox     : false,
-            define    : false,
-            "require" : false
-        },
-
-        escapes = {
-            '\b': '\\b',
-            '\t': '\\t',
-            '\n': '\\n',
-            '\f': '\\f',
-            '\r': '\\r',
-            '"' : '\\"',
-            '/' : '\\/',
-            '\\': '\\\\'
-        },
-
-        funct,          // The current function
-
-        functionicity = [
-            'closure', 'exception', 'global', 'label',
-            'outer', 'unused', 'var'
-        ],
-
-        functions,      // All of the functions
-
-        global,         // The global scope
-        implied,        // Implied globals
-        inblock,
-        indent,
-        jsonmode,
-
-        jquery = {
-            '$'    : false,
-            jQuery : false
-        },
-
-        lines,
-        lookahead,
-        member,
-        membersOnly,
-
-        mootools = {
-            '$'             : false,
-            '$$'            : false,
-            Assets          : false,
-            Browser         : false,
-            Chain           : false,
-            Class           : false,
-            Color           : false,
-            Cookie          : false,
-            Core            : false,
-            Document        : false,
-            DomReady        : false,
-            DOMReady        : false,
-            Drag            : false,
-            Element         : false,
-            Elements        : false,
-            Event           : false,
-            Events          : false,
-            Fx              : false,
-            Group           : false,
-            Hash            : false,
-            HtmlTable       : false,
-            Iframe          : false,
-            IframeShim      : false,
-            InputValidator  : false,
-            instanceOf      : false,
-            Keyboard        : false,
-            Locale          : false,
-            Mask            : false,
-            MooTools        : false,
-            Native          : false,
-            Options         : false,
-            OverText        : false,
-            Request         : false,
-            Scroller        : false,
-            Slick           : false,
-            Slider          : false,
-            Sortables       : false,
-            Spinner         : false,
-            Swiff           : false,
-            Tips            : false,
-            Type            : false,
-            typeOf          : false,
-            URI             : false,
-            Window          : false
-        },
-
-        nexttoken,
-
-        node = {
-            __filename    : false,
-            __dirname     : false,
-            Buffer        : false,
-            console       : false,
-            exports       : false,
-            GLOBAL        : false,
-            global        : false,
-            module        : false,
-            process       : false,
-            require       : false,
-            setTimeout    : false,
-            clearTimeout  : false,
-            setInterval   : false,
-            clearInterval : false
-        },
-
-        noreach,
-        option,
-        predefined,     // Global variables defined by option
-        prereg,
-        prevtoken,
-
-        prototypejs = {
-            '$'               : false,
-            '$$'              : false,
-            '$A'              : false,
-            '$F'              : false,
-            '$H'              : false,
-            '$R'              : false,
-            '$break'          : false,
-            '$continue'       : false,
-            '$w'              : false,
-            Abstract          : false,
-            Ajax              : false,
-            Class             : false,
-            Enumerable        : false,
-            Element           : false,
-            Event             : false,
-            Field             : false,
-            Form              : false,
-            Hash              : false,
-            Insertion         : false,
-            ObjectRange       : false,
-            PeriodicalExecuter: false,
-            Position          : false,
-            Prototype         : false,
-            Selector          : false,
-            Template          : false,
-            Toggle            : false,
-            Try               : false,
-            Autocompleter     : false,
-            Builder           : false,
-            Control           : false,
-            Draggable         : false,
-            Draggables        : false,
-            Droppables        : false,
-            Effect            : false,
-            Sortable          : false,
-            SortableObserver  : false,
-            Sound             : false,
-            Scriptaculous     : false
-        },
-
-        rhino = {
-            defineClass  : false,
-            deserialize  : false,
-            gc           : false,
-            help         : false,
-            importPackage: false,
-            "java"       : false,
-            load         : false,
-            loadClass    : false,
-            print        : false,
-            quit         : false,
-            readFile     : false,
-            readUrl      : false,
-            runCommand   : false,
-            seal         : false,
-            serialize    : false,
-            spawn        : false,
-            sync         : false,
-            toint32      : false,
-            version      : false
-        },
-
-        scope,      // The current scope
-        stack,
-
-        // standard contains the global names that are provided by the
-        // ECMAScript standard.
-        standard = {
-            Array               : false,
-            Boolean             : false,
-            Date                : false,
-            decodeURI           : false,
-            decodeURIComponent  : false,
-            encodeURI           : false,
-            encodeURIComponent  : false,
-            Error               : false,
-            'eval'              : false,
-            EvalError           : false,
-            Function            : false,
-            hasOwnProperty      : false,
-            isFinite            : false,
-            isNaN               : false,
-            JSON                : false,
-            Math                : false,
-            Number              : false,
-            Object              : false,
-            parseInt            : false,
-            parseFloat          : false,
-            RangeError          : false,
-            ReferenceError      : false,
-            RegExp              : false,
-            String              : false,
-            SyntaxError         : false,
-            TypeError           : false,
-            URIError            : false
-        },
-
-        // widely adopted global names that are not part of ECMAScript standard
-        nonstandard = {
-            escape              : false,
-            unescape            : false
-        },
-
-        standard_member = {
-            E                   : true,
-            LN2                 : true,
-            LN10                : true,
-            LOG2E               : true,
-            LOG10E              : true,
-            MAX_VALUE           : true,
-            MIN_VALUE           : true,
-            NEGATIVE_INFINITY   : true,
-            PI                  : true,
-            POSITIVE_INFINITY   : true,
-            SQRT1_2             : true,
-            SQRT2               : true
-        },
-
-        directive,
-        syntax = {},
-        tab,
-        token,
-        urls,
-        useESNextSyntax,
-        warnings,
-
-        wsh = {
-            ActiveXObject             : true,
-            Enumerator                : true,
-            GetObject                 : true,
-            ScriptEngine              : true,
-            ScriptEngineBuildVersion  : true,
-            ScriptEngineMajorVersion  : true,
-            ScriptEngineMinorVersion  : true,
-            VBArray                   : true,
-            WSH                       : true,
-            WScript                   : true,
-            XDomainRequest            : true
-        };
-
-    // Regular expressions. Some of these are stupidly long.
-    var ax, cx, tx, nx, nxg, lx, ix, jx, ft;
-    (function () {
-        /*jshint maxlen:300 */
-
-        // unsafe comment or string
-        ax = /@cc|<\/?|script|\]\s*\]|<\s*!|&lt/i;
-
-        // unsafe characters that are silently deleted by one or more browsers
-        cx = /[\u0000-\u001f\u007f-\u009f\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/;
-
-        // token
-        tx = /^\s*([(){}\[.,:;'"~\?\]#@]|==?=?|\/(\*(jshint|jslint|members?|global)?|=|\/)?|\*[\/=]?|\+(?:=|\++)?|-(?:=|-+)?|%=?|&[&=]?|\|[|=]?|>>?>?=?|<([\/=!]|\!(\[|--)?|<=?)?|\^=?|\!=?=?|[a-zA-Z_$][a-zA-Z0-9_$]*|[0-9]+([xX][0-9a-fA-F]+|\.[0-9]*)?([eE][+\-]?[0-9]+)?)/;
-
-        // characters in strings that need escapement
-        nx = /[\u0000-\u001f&<"\/\\\u007f-\u009f\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/;
-        nxg = /[\u0000-\u001f&<"\/\\\u007f-\u009f\u00ad\u0600-\u0604\u070f\u17b4\u17b5\u200c-\u200f\u2028-\u202f\u2060-\u206f\ufeff\ufff0-\uffff]/g;
-
-        // star slash
-        lx = /\*\/|\/\*/;
-
-        // identifier
-        ix = /^([a-zA-Z_$][a-zA-Z0-9_$]*)$/;
-
-        // javascript url
-        jx = /^(?:javascript|jscript|ecmascript|vbscript|mocha|livescript)\s*:/i;
-
-        // catches /* falls through */ comments
-        ft = /^\s*\/\*\s*falls\sthrough\s*\*\/\s*$/;
-    }());
-
-    function F() {}     // Used by Object.create
-
-    function is_own(object, name) {
-
-// The object.hasOwnProperty method fails when the property under consideration
-// is named 'hasOwnProperty'. So we have to use this more convoluted form.
-
-        return Object.prototype.hasOwnProperty.call(object, name);
-    }
-
-    function checkOption(name, t) {
-        if (valOptions[name] === undefined && boolOptions[name] === undefined) {
-            warning("Bad option: '" + name + "'.", t);
-        }
-    }
-
-// Provide critical ES5 functions to ES3.
-
-    if (typeof Array.isArray !== 'function') {
-        Array.isArray = function (o) {
-            return Object.prototype.toString.apply(o) === '[object Array]';
-        };
-    }
-
-    if (typeof Object.create !== 'function') {
-        Object.create = function (o) {
-            F.prototype = o;
-            return new F();
-        };
-    }
-
-    if (typeof Object.keys !== 'function') {
-        Object.keys = function (o) {
-            var a = [], k;
-            for (k in o) {
-                if (is_own(o, k)) {
-                    a.push(k);
-                }
-            }
-            return a;
-        };
-    }
-
-// Non standard methods
-
-    if (typeof String.prototype.entityify !== 'function') {
-        String.prototype.entityify = function () {
-            return this
-                .replace(/&/g, '&amp;')
-                .replace(/</g, '&lt;')
-                .replace(/>/g, '&gt;');
-        };
-    }
-
-    if (typeof String.prototype.isAlpha !== 'function') {
-        String.prototype.isAlpha = function () {
-            return (this >= 'a' && this <= 'z\uffff') ||
-                (this >= 'A' && this <= 'Z\uffff');
-        };
-    }
-
-    if (typeof String.prototype.isDigit !== 'function') {
-        String.prototype.isDigit = function () {
-            return (this >= '0' && this <= '9');
-        };
-    }
-
-    if (typeof String.prototype.supplant !== 'function') {
-        String.prototype.supplant = function (o) {
-            return this.replace(/\{([^{}]*)\}/g, function (a, b) {
-                var r = o[b];
-                return typeof r === 'string' || typeof r === 'number' ? r : a;
-            });
-        };
-    }
-
-    if (typeof String.prototype.name !== 'function') {
-        String.prototype.name = function () {
-
-// If the string looks like an identifier, then we can return it as is.
-// If the string contains no control characters, no quote characters, and no
-// backslash characters, then we can simply slap some quotes around it.
-// Otherwise we must also replace the offending characters with safe
-// sequences.
-
-            if (ix.test(this)) {
-                return this;
-            }
-            if (nx.test(this)) {
-                return '"' + this.replace(nxg, function (a) {
-                    var c = escapes[a];
-                    if (c) {
-                        return c;
-                    }
-                    return '\\u' + ('0000' + a.charCodeAt().toString(16)).slice(-4);
-                }) + '"';
-            }
-            return '"' + this + '"';
-        };
-    }
-
-
-    function combine(t, o) {
-        var n;
-        for (n in o) {
-            if (is_own(o, n)) {
-                t[n] = o[n];
-            }
-        }
-    }
-
-    function assume() {
-        if (option.couch) {
-            combine(predefined, couch);
-        }
-
-        if (option.rhino) {
-            combine(predefined, rhino);
-        }
-
-        if (option.prototypejs) {
-            combine(predefined, prototypejs);
-        }
-
-        if (option.node) {
-            combine(predefined, node);
-            option.globalstrict = true;
-        }
-
-        if (option.devel) {
-            combine(predefined, devel);
-        }
-
-        if (option.dojo) {
-            combine(predefined, dojo);
-        }
-
-        if (option.browser) {
-            combine(predefined, browser);
-        }
-
-        if (option.nonstandard) {
-            combine(predefined, nonstandard);
-        }
-
-        if (option.jquery) {
-            combine(predefined, jquery);
-        }
-
-        if (option.mootools) {
-            combine(predefined, mootools);
-        }
-
-        if (option.wsh) {
-            combine(predefined, wsh);
-        }
-
-        if (option.esnext) {
-            useESNextSyntax();
-        }
-
-        if (option.globalstrict && option.strict !== false) {
-            option.strict = true;
-        }
-    }
-
-
-    // Produce an error warning.
-    function quit(message, line, chr) {
-        var percentage = Math.floor((line / lines.length) * 100);
-
-        throw {
-            name: 'JSHintError',
-            line: line,
-            character: chr,
-            message: message + " (" + percentage + "% scanned).",
-            raw: message
-        };
-    }
-
-    function isundef(scope, m, t, a) {
-        return JSHINT.undefs.push([scope, m, t, a]);
-    }
-
-    function warning(m, t, a, b, c, d) {
-        var ch, l, w;
-        t = t || nexttoken;
-        if (t.id === '(end)') {  // `~
-            t = token;
-        }
-        l = t.line || 0;
-        ch = t.from || 0;
-        w = {
-            id: '(error)',
-            raw: m,
-            evidence: lines[l - 1] || '',
-            line: l,
-            character: ch,
-            a: a,
-            b: b,
-            c: c,
-            d: d
-        };
-        w.reason = m.supplant(w);
-        JSHINT.errors.push(w);
-        if (option.passfail) {
-            quit('Stopping. ', l, ch);
-        }
-        warnings += 1;
-        if (warnings >= option.maxerr) {
-            quit("Too many errors.", l, ch);
-        }
-        return w;
-    }
-
-    function warningAt(m, l, ch, a, b, c, d) {
-        return warning(m, {
-            line: l,
-            from: ch
-        }, a, b, c, d);
-    }
-
-    function error(m, t, a, b, c, d) {
-        var w = warning(m, t, a, b, c, d);
-    }
-
-    function errorAt(m, l, ch, a, b, c, d) {
-        return error(m, {
-            line: l,
-            from: ch
-        }, a, b, c, d);
-    }
-
-
-
-// lexical analysis and token construction
-
-    var lex = (function lex() {
-        var character, from, line, s;
-
-// Private lex methods
-
-        function nextLine() {
-            var at,
-                tw; // trailing whitespace check
-
-            if (line >= lines.length)
-                return false;
-
-            character = 1;
-            s = lines[line];
-            line += 1;
-
-            // If smarttabs option is used check for spaces followed by tabs only.
-            // Otherwise check for any occurence of mixed tabs and spaces.
-            if (option.smarttabs)
-                at = s.search(/ \t/);
-            else
-                at = s.search(/ \t|\t /);
-
-            if (at >= 0)
-                warningAt("Mixed spaces and tabs.", line, at + 1);
-
-            s = s.replace(/\t/g, tab);
-            at = s.search(cx);
-
-            if (at >= 0)
-                warningAt("Unsafe character.", line, at);
-
-            if (option.maxlen && option.maxlen < s.length)
-                warningAt("Line too long.", line, s.length);
-
-            // Check for trailing whitespaces
-            tw = option.trailing && s.match(/^(.*?)\s+$/);
-            if (tw && !/^\s+$/.test(s)) {
-                warningAt("Trailing whitespace.", line, tw[1].length + 1);
-            }
-            return true;
-        }
-
-// Produce a token object.  The token inherits from a syntax symbol.
-
-        function it(type, value) {
-            var i, t;
-            if (type === '(color)' || type === '(range)') {
-                t = {type: type};
-            } else if (type === '(punctuator)' ||
-                    (type === '(identifier)' && is_own(syntax, value))) {
-                t = syntax[value] || syntax['(error)'];
-            } else {
-                t = syntax[type];
-            }
-            t = Object.create(t);
-            if (type === '(string)' || type === '(range)') {
-                if (!option.scripturl && jx.test(value)) {
-                    warningAt("Script URL.", line, from);
-                }
-            }
-            if (type === '(identifier)') {
-                t.identifier = true;
-                if (value === '__proto__' && !option.proto) {
-                    warningAt("The '{a}' property is deprecated.",
-                        line, from, value);
-                } else if (value === '__iterator__' && !option.iterator) {
-                    warningAt("'{a}' is only available in JavaScript 1.7.",
-                        line, from, value);
-                } else if (option.nomen && (value.charAt(0) === '_' ||
-                         value.charAt(value.length - 1) === '_')) {
-                    if (!option.node || token.id === '.' ||
-                            (value !== '__dirname' && value !== '__filename')) {
-                        warningAt("Unexpected {a} in '{b}'.", line, from, "dangling '_'", value);
-                    }
-                }
-            }
-            t.value = value;
-            t.line = line;
-            t.character = character;
-            t.from = from;
-            i = t.id;
-            if (i !== '(endline)') {
-                prereg = i &&
-                    (('(,=:[!&|?{};'.indexOf(i.charAt(i.length - 1)) >= 0) ||
-                    i === 'return' ||
-                    i === 'case');
-            }
-            return t;
-        }
-
-        // Public lex methods
-        return {
-            init: function (source) {
-                if (typeof source === 'string') {
-                    lines = source
-                        .replace(/\r\n/g, '\n')
-                        .replace(/\r/g, '\n')
-                        .split('\n');
-                } else {
-                    lines = source;
-                }
-
-                // If the first line is a shebang (#!), make it a blank and move on.
-                // Shebangs are used by Node scripts.
-                if (lines[0] && lines[0].substr(0, 2) === '#!')
-                    lines[0] = '';
-
-                line = 0;
-                nextLine();
-                from = 1;
-            },
-
-            range: function (begin, end) {
-                var c, value = '';
-                from = character;
-                if (s.charAt(0) !== begin) {
-                    errorAt("Expected '{a}' and instead saw '{b}'.",
-                            line, character, begin, s.charAt(0));
-                }
-                for (;;) {
-                    s = s.slice(1);
-                    character += 1;
-                    c = s.charAt(0);
-                    switch (c) {
-                    case '':
-                        errorAt("Missing '{a}'.", line, character, c);
-                        break;
-                    case end:
-                        s = s.slice(1);
-                        character += 1;
-                        return it('(range)', value);
-                    case '\\':
-                        warningAt("Unexpected '{a}'.", line, character, c);
-                    }
-                    value += c;
-                }
-
-            },
-
-
-            // token -- this is called by advance to get the next token
-            token: function () {
-                var b, c, captures, d, depth, high, i, l, low, q, t, isLiteral, isInRange, n;
-
-                function match(x) {
-                    var r = x.exec(s), r1;
-                    if (r) {
-                        l = r[0].length;
-                        r1 = r[1];
-                        c = r1.charAt(0);
-                        s = s.substr(l);
-                        from = character + l - r1.length;
-                        character += l;
-                        return r1;
-                    }
-                }
-
-                function string(x) {
-                    var c, j, r = '', allowNewLine = false;
-
-                    if (jsonmode && x !== '"') {
-                        warningAt("Strings must use doublequote.",
-                                line, character);
-                    }
-
-                    function esc(n) {
-                        var i = parseInt(s.substr(j + 1, n), 16);
-                        j += n;
-                        if (i >= 32 && i <= 126 &&
-                                i !== 34 && i !== 92 && i !== 39) {
-                            warningAt("Unnecessary escapement.", line, character);
-                        }
-                        character += n;
-                        c = String.fromCharCode(i);
-                    }
-                    j = 0;
-unclosedString:     for (;;) {
-                        while (j >= s.length) {
-                            j = 0;
-
-                            var cl = line, cf = from;
-                            if (!nextLine()) {
-                                errorAt("Unclosed string.", cl, cf);
-                                break unclosedString;
-                            }
-
-                            if (allowNewLine) {
-                                allowNewLine = false;
-                            } else {
-                                warningAt("Unclosed string.", cl, cf);
-                            }
-                        }
-                        c = s.charAt(j);
-                        if (c === x) {
-                            character += 1;
-                            s = s.substr(j + 1);
-                            return it('(string)', r, x);
-                        }
-                        if (c < ' ') {
-                            if (c === '\n' || c === '\r') {
-                                break;
-                            }
-                            warningAt("Control character in string: {a}.",
-                                    line, character + j, s.slice(0, j));
-                        } else if (c === '\\') {
-                            j += 1;
-                            character += 1;
-                            c = s.charAt(j);
-                            n = s.charAt(j + 1);
-                            switch (c) {
-                            case '\\':
-                            case '"':
-                            case '/':
-                                break;
-                            case '\'':
-                                if (jsonmode) {
-                                    warningAt("Avoid \\'.", line, character);
-                                }
-                                break;
-                            case 'b':
-                                c = '\b';
-                                break;
-                            case 'f':
-                                c = '\f';
-                                break;
-                            case 'n':
-                                c = '\n';
-                                break;
-                            case 'r':
-                                c = '\r';
-                                break;
-                            case 't':
-                                c = '\t';
-                                break;
-                            case '0':
-                                c = '\0';
-                                // Octal literals fail in strict mode
-                                // check if the number is between 00 and 07
-                                // where 'n' is the token next to 'c'
-                                if (n >= 0 && n <= 7 && directive["use strict"]) {
-                                    warningAt(
-                                    "Octal literals are not allowed in strict mode.",
-                                    line, character);
-                                }
-                                break;
-                            case 'u':
-                                esc(4);
-                                break;
-                            case 'v':
-                                if (jsonmode) {
-                                    warningAt("Avoid \\v.", line, character);
-                                }
-                                c = '\v';
-                                break;
-                            case 'x':
-                                if (jsonmode) {
-                                    warningAt("Avoid \\x-.", line, character);
-                                }
-                                esc(2);
-                                break;
-                            case '':
-                                // last character is escape character
-                                // always allow new line if escaped, but show
-                                // warning if option is not set
-                                allowNewLine = true;
-                                if (option.multistr) {
-                                    if (jsonmode) {
-                                        warningAt("Avoid EOL escapement.", line, character);
-                                    }
-                                    c = '';
-                                    character -= 1;
-                                    break;
-                                }
-                                warningAt("Bad escapement of EOL. Use option multistr if needed.",
-                                    line, character);
-                                break;
-                            default:
-                                warningAt("Bad escapement.", line, character);
-                            }
-                        }
-                        r += c;
-                        character += 1;
-                        j += 1;
-                    }
-                }
-
-                for (;;) {
-                    if (!s) {
-                        return it(nextLine() ? '(endline)' : '(end)', '');
-                    }
-                    t = match(tx);
-                    if (!t) {
-                        t = '';
-                        c = '';
-                        while (s && s < '!') {
-                            s = s.substr(1);
-                        }
-                        if (s) {
-                            errorAt("Unexpected '{a}'.", line, character, s.substr(0, 1));
-                            s = '';
-                        }
-                    } else {
-
-    //      identifier
-
-                        if (c.isAlpha() || c === '_' || c === '$') {
-                            return it('(identifier)', t);
-                        }
-
-    //      number
-
-                        if (c.isDigit()) {
-                            if (!isFinite(Number(t))) {
-                                warningAt("Bad number '{a}'.",
-                                    line, character, t);
-                            }
-                            if (s.substr(0, 1).isAlpha()) {
-                                warningAt("Missing space after '{a}'.",
-                                        line, character, t);
-                            }
-                            if (c === '0') {
-                                d = t.substr(1, 1);
-                                if (d.isDigit()) {
-                                    if (token.id !== '.') {
-                                        warningAt("Don't use extra leading zeros '{a}'.",
-                                            line, character, t);
-                                    }
-                                } else if (jsonmode && (d === 'x' || d === 'X')) {
-                                    warningAt("Avoid 0x-. '{a}'.",
-                                            line, character, t);
-                                }
-                            }
-                            if (t.substr(t.length - 1) === '.') {
-                                warningAt(
-"A trailing decimal point can be confused with a dot '{a}'.", line, character, t);
-                            }
-                            return it('(number)', t);
-                        }
-                        switch (t) {
-
-    //      string
-
-                        case '"':
-                        case "'":
-                            return string(t);
-
-    //      // comment
-
-                        case '//':
-                            s = '';
-                            token.comment = true;
-                            break;
-
-    //      /* comment
-
-                        case '/*':
-                            for (;;) {
-                                i = s.search(lx);
-                                if (i >= 0) {
-                                    break;
-                                }
-                                if (!nextLine()) {
-                                    errorAt("Unclosed comment.", line, character);
-                                }
-                            }
-                            character += i + 2;
-                            if (s.substr(i, 1) === '/') {
-                                errorAt("Nested comment.", line, character);
-                            }
-                            s = s.substr(i + 2);
-                            token.comment = true;
-                            break;
-
-    //      /*members /*jshint /*global
-
-                        case '/*members':
-                        case '/*member':
-                        case '/*jshint':
-                        case '/*jslint':
-                        case '/*global':
-                        case '*/':
-                            return {
-                                value: t,
-                                type: 'special',
-                                line: line,
-                                character: character,
-                                from: from
-                            };
-
-                        case '':
-                            break;
-    //      /
-                        case '/':
-                            if (token.id === '/=') {
-                                errorAt("A regular expression literal can be confused with '/='.",
-                                    line, from);
-                            }
-                            if (prereg) {
-                                depth = 0;
-                                captures = 0;
-                                l = 0;
-                                for (;;) {
-                                    b = true;
-                                    c = s.charAt(l);
-                                    l += 1;
-                                    switch (c) {
-                                    case '':
-                                        errorAt("Unclosed regular expression.", line, from);
-                                        return quit('Stopping.', line, from);
-                                    case '/':
-                                        if (depth > 0) {
-                                            warningAt("{a} unterminated regular expression " +
-                                                "group(s).", line, from + l, depth);
-                                        }
-                                        c = s.substr(0, l - 1);
-                                        q = {
-                                            g: true,
-                                            i: true,
-                                            m: true
-                                        };
-                                        while (q[s.charAt(l)] === true) {
-                                            q[s.charAt(l)] = false;
-                                            l += 1;
-                                        }
-                                        character += l;
-                                        s = s.substr(l);
-                                        q = s.charAt(0);
-                                        if (q === '/' || q === '*') {
-                                            errorAt("Confusing regular expression.",
-                                                    line, from);
-                                        }
-                                        return it('(regexp)', c);
-                                    case '\\':
-                                        c = s.charAt(l);
-                                        if (c < ' ') {
-                                            warningAt(
-"Unexpected control character in regular expression.", line, from + l);
-                                        } else if (c === '<') {
-                                            warningAt(
-"Unexpected escaped character '{a}' in regular expression.", line, from + l, c);
-                                        }
-                                        l += 1;
-                                        break;
-                                    case '(':
-                                        depth += 1;
-                                        b = false;
-                                        if (s.charAt(l) === '?') {
-                                            l += 1;
-                                            switch (s.charAt(l)) {
-                                            case ':':
-                                            case '=':
-                                            case '!':
-                                                l += 1;
-                                                break;
-                                            default:
-                                                warningAt(
-"Expected '{a}' and instead saw '{b}'.", line, from + l, ':', s.charAt(l));
-                                            }
-                                        } else {
-                                            captures += 1;
-                                        }
-                                        break;
-                                    case '|':
-                                        b = false;
-                                        break;
-                                    case ')':
-                                        if (depth === 0) {
-                                            warningAt("Unescaped '{a}'.",
-                                                    line, from + l, ')');
-                                        } else {
-                                            depth -= 1;
-                                        }
-                                        break;
-                                    case ' ':
-                                        q = 1;
-                                        while (s.charAt(l) === ' ') {
-                                            l += 1;
-                                            q += 1;
-                                        }
-                                        if (q > 1) {
-                                            warningAt(
-"Spaces are hard to count. Use {{a}}.", line, from + l, q);
-                                        }
-                                        break;
-                                    case '[':
-                                        c = s.charAt(l);
-                                        if (c === '^') {
-                                            l += 1;
-                                            if (option.regexp) {
-                                                warningAt("Insecure '{a}'.",
-                                                        line, from + l, c);
-                                            } else if (s.charAt(l) === ']') {
-                                                errorAt("Unescaped '{a}'.",
-                                                    line, from + l, '^');
-                                            }
-                                        }
-                                        if (c === ']') {
-                                            warningAt("Empty class.", line,
-                                                    from + l - 1);
-                                        }
-                                        isLiteral = false;
-                                        isInRange = false;
-klass:                                  do {
-                                            c = s.charAt(l);
-                                            l += 1;
-                                            switch (c) {
-                                            case '[':
-                                            case '^':
-                                                warningAt("Unescaped '{a}'.",
-                                                        line, from + l, c);
-                                                if (isInRange) {
-                                                    isInRange = false;
-                                                } else {
-                                                    isLiteral = true;
-                                                }
-                                                break;
-                                            case '-':
-                                                if (isLiteral && !isInRange) {
-                                                    isLiteral = false;
-                                                    isInRange = true;
-                                                } else if (isInRange) {
-                                                    isInRange = false;
-                                                } else if (s.charAt(l) === ']') {
-                                                    isInRange = true;
-                                                } else {
-                                                    if (option.regexdash !== (l === 2 || (l === 3 &&
-                                                        s.charAt(1) === '^'))) {
-                                                        warningAt("Unescaped '{a}'.",
-                                                            line, from + l - 1, '-');
-                                                    }
-                                                    isLiteral = true;
-                                                }
-                                                break;
-                                            case ']':
-                                                if (isInRange && !option.regexdash) {
-                                                    warningAt("Unescaped '{a}'.",
-                                                            line, from + l - 1, '-');
-                                                }
-                                                break klass;
-                                            case '\\':
-                                                c = s.charAt(l);
-                                                if (c < ' ') {
-                                                    warningAt(
-"Unexpected control character in regular expression.", line, from + l);
-                                                } else if (c === '<') {
-                                                    warningAt(
-"Unexpected escaped character '{a}' in regular expression.", line, from + l, c);
-                                                }
-                                                l += 1;
-
-                                                // \w, \s and \d are never part of a character range
-                                                if (/[wsd]/i.test(c)) {
-                                                    if (isInRange) {
-                                                        warningAt("Unescaped '{a}'.",
-                                                            line, from + l, '-');
-                                                        isInRange = false;
-                                                    }
-                                                    isLiteral = false;
-                                                } else if (isInRange) {
-                                                    isInRange = false;
-                                                } else {
-                                                    isLiteral = true;
-                                                }
-                                                break;
-                                            case '/':
-                                                warningAt("Unescaped '{a}'.",
-                                                        line, from + l - 1, '/');
-
-                                                if (isInRange) {
-                                                    isInRange = false;
-                                                } else {
-                                                    isLiteral = true;
-                                                }
-                                                break;
-                                            case '<':
-                                                if (isInRange) {
-                                                    isInRange = false;
-                                                } else {
-                                                    isLiteral = true;
-                                                }
-                                                break;
-                                            default:
-                                                if (isInRange) {
-                                                    isInRange = false;
-                                                } else {
-                                                    isLiteral = true;
-                                                }
-                                            }
-                                        } while (c);
-                                        break;
-                                    case '.':
-                                        if (option.regexp) {
-                                            warningAt("Insecure '{a}'.", line,
-                                                    from + l, c);
-                                        }
-                                        break;
-                                    case ']':
-                                    case '?':
-                                    case '{':
-                                    case '}':
-                                    case '+':
-                                    case '*':
-                                        warningAt("Unescaped '{a}'.", line,
-                                                from + l, c);
-                                    }
-                                    if (b) {
-                                        switch (s.charAt(l)) {
-                                        case '?':
-                                        case '+':
-                                        case '*':
-                                            l += 1;
-                                            if (s.charAt(l) === '?') {
-                                                l += 1;
-                                            }
-                                            break;
-                                        case '{':
-                                            l += 1;
-                                            c = s.charAt(l);
-                                            if (c < '0' || c > '9') {
-                                                warningAt(
-"Expected a number and instead saw '{a}'.", line, from + l, c);
-                                            }
-                                            l += 1;
-                                            low = +c;
-                                            for (;;) {
-                                                c = s.charAt(l);
-                                                if (c < '0' || c > '9') {
-                                                    break;
-                                                }
-                                                l += 1;
-                                                low = +c + (low * 10);
-                                            }
-                                            high = low;
-                                            if (c === ',') {
-                                                l += 1;
-                                                high = Infinity;
-                                                c = s.charAt(l);
-                                                if (c >= '0' && c <= '9') {
-                                                    l += 1;
-                                                    high = +c;
-                                                    for (;;) {
-                                                        c = s.charAt(l);
-                                                        if (c < '0' || c > '9') {
-                                                            break;
-                                                        }
-                                                        l += 1;
-                                                        high = +c + (high * 10);
-                                                    }
-                                                }
-                                            }
-                                            if (s.charAt(l) !== '}') {
-                                                warningAt(
-"Expected '{a}' and instead saw '{b}'.", line, from + l, '}', c);
-                                            } else {
-                                                l += 1;
-                                            }
-                                            if (s.charAt(l) === '?') {
-                                                l += 1;
-                                            }
-                                            if (low > high) {
-                                                warningAt(
-"'{a}' should not be greater than '{b}'.", line, from + l, low, high);
-                                            }
-                                        }
-                                    }
-                                }
-                                c = s.substr(0, l - 1);
-                                character += l;
-                                s = s.substr(l);
-                                return it('(regexp)', c);
-                            }
-                            return it('(punctuator)', t);
-
-    //      punctuator
-
-                        case '#':
-                            return it('(punctuator)', t);
-                        default:
-                            return it('(punctuator)', t);
-                        }
-                    }
-                }
-            }
-        };
-    }());
-
-
-    function addlabel(t, type) {
-
-        if (t === 'hasOwnProperty') {
-            warning("'hasOwnProperty' is a really bad name.");
-        }
-
-// Define t in the current function in the current scope.
-        if (is_own(funct, t) && !funct['(global)']) {
-            if (funct[t] === true) {
-                if (option.latedef)
-                    warning("'{a}' was used before it was defined.", nexttoken, t);
-            } else {
-                if (!option.shadow && type !== "exception")
-                    warning("'{a}' is already defined.", nexttoken, t);
-            }
-        }
-
-        funct[t] = type;
-        if (funct['(global)']) {
-            global[t] = funct;
-            if (is_own(implied, t)) {
-                if (option.latedef)
-                    warning("'{a}' was used before it was defined.", nexttoken, t);
-                delete implied[t];
-            }
-        } else {
-            scope[t] = funct;
-        }
-    }
-
-
-    function doOption() {
-        var b, obj, filter, o = nexttoken.value, t, v;
-
-        switch (o) {
-        case '*/':
-            error("Unbegun comment.");
-            break;
-        case '/*members':
-        case '/*member':
-            o = '/*members';
-            if (!membersOnly) {
-                membersOnly = {};
-            }
-            obj = membersOnly;
-            break;
-        case '/*jshint':
-        case '/*jslint':
-            obj = option;
-            filter = boolOptions;
-            break;
-        case '/*global':
-            obj = predefined;
-            break;
-        default:
-            error("What?");
-        }
-
-        t = lex.token();
-loop:   for (;;) {
-            for (;;) {
-                if (t.type === 'special' && t.value === '*/') {
-                    break loop;
-                }
-                if (t.id !== '(endline)' && t.id !== ',') {
-                    break;
-                }
-                t = lex.token();
-            }
-            if (t.type !== '(string)' && t.type !== '(identifier)' &&
-                    o !== '/*members') {
-                error("Bad option.", t);
-            }
-
-            v = lex.token();
-            if (v.id === ':') {
-                v = lex.token();
-
-                if (obj === membersOnly) {
-                    error("Expected '{a}' and instead saw '{b}'.",
-                            t, '*/', ':');
-                }
-
-                if (o === '/*jshint') {
-                    checkOption(t.value, t);
-                }
-
-                if (t.value === 'indent' && (o === '/*jshint' || o === '/*jslint')) {
-                    b = +v.value;
-                    if (typeof b !== 'number' || !isFinite(b) || b <= 0 ||
-                            Math.floor(b) !== b) {
-                        error("Expected a small integer and instead saw '{a}'.",
-                                v, v.value);
-                    }
-                    obj.white = true;
-                    obj.indent = b;
-                } else if (t.value === 'maxerr' && (o === '/*jshint' || o === '/*jslint')) {
-                    b = +v.value;
-                    if (typeof b !== 'number' || !isFinite(b) || b <= 0 ||
-                            Math.floor(b) !== b) {
-                        error("Expected a small integer and instead saw '{a}'.",
-                                v, v.value);
-                    }
-                    obj.maxerr = b;
-                } else if (t.value === 'maxlen' && (o === '/*jshint' || o === '/*jslint')) {
-                    b = +v.value;
-                    if (typeof b !== 'number' || !isFinite(b) || b <= 0 ||
-                            Math.floor(b) !== b) {
-                        error("Expected a small integer and instead saw '{a}'.",
-                                v, v.value);
-                    }
-                    obj.maxlen = b;
-                } else if (t.value === 'validthis') {
-                    if (funct['(global)']) {
-                        error("Option 'validthis' can't be used in a global scope.");
-                    } else {
-                        if (v.value === 'true' || v.value === 'false')
-                            obj[t.value] = v.value === 'true';
-                        else
-                            error("Bad option value.", v);
-                    }
-                } else if (v.value === 'true') {
-                    obj[t.value] = true;
-                } else if (v.value === 'false') {
-                    obj[t.value] = false;
-                } else {
-                    error("Bad option value.", v);
-                }
-                t = lex.token();
-            } else {
-                if (o === '/*jshint' || o === '/*jslint') {
-                    error("Missing option value.", t);
-                }
-                obj[t.value] = false;
-                t = v;
-            }
-        }
-        if (filter) {
-            assume();
-        }
-    }
-
-
-// We need a peek function. If it has an argument, it peeks that much farther
-// ahead. It is used to distinguish
-//     for ( var i in ...
-// from
-//     for ( var i = ...
-
-    function peek(p) {
-        var i = p || 0, j = 0, t;
-
-        while (j <= i) {
-            t = lookahead[j];
-            if (!t) {
-                t = lookahead[j] = lex.token();
-            }
-            j += 1;
-        }
-        return t;
-    }
-
-
-
-// Produce the next token. It looks for programming errors.
-
-    function advance(id, t) {
-        switch (token.id) {
-        case '(number)':
-            if (nexttoken.id === '.') {
-                warning("A dot following a number can be confused with a decimal point.", token);
-            }
-            break;
-        case '-':
-            if (nexttoken.id === '-' || nexttoken.id === '--') {
-                warning("Confusing minusses.");
-            }
-            break;
-        case '+':
-            if (nexttoken.id === '+' || nexttoken.id === '++') {
-                warning("Confusing plusses.");
-            }
-            break;
-        }
-
-        if (token.type === '(string)' || token.identifier) {
-            anonname = token.value;
-        }
-
-        if (id && nexttoken.id !== id) {
-            if (t) {
-                if (nexttoken.id === '(end)') {
-                    warning("Unmatched '{a}'.", t, t.id);
-                } else {
-                    warning("Expected '{a}' to match '{b}' from line {c} and instead saw '{d}'.",
-                            nexttoken, id, t.id, t.line, nexttoken.value);
-                }
-            } else if (nexttoken.type !== '(identifier)' ||
-                            nexttoken.value !== id) {
-                warning("Expected '{a}' and instead saw '{b}'.",
-                        nexttoken, id, nexttoken.value);
-            }
-        }
-
-        prevtoken = token;
-        token = nexttoken;
-        for (;;) {
-            nexttoken = lookahead.shift() || lex.token();
-            if (nexttoken.id === '(end)' || nexttoken.id === '(error)') {
-                return;
-            }
-            if (nexttoken.type === 'special') {
-                doOption();
-            } else {
-                if (nexttoken.id !== '(endline)') {
-                    break;
-                }
-            }
-        }
-    }
-
-
-// This is the heart of JSHINT, the Pratt parser. In addition to parsing, it
-// is looking for ad hoc lint patterns. We add .fud to Pratt's model, which is
-// like .nud except that it is only used on the first token of a statement.
-// Having .fud makes it much easier to define statement-oriented languages like
-// JavaScript. I retained Pratt's nomenclature.
-
-// .nud     Null denotation
-// .fud     First null denotation
-// .led     Left denotation
-//  lbp     Left binding power
-//  rbp     Right binding power
-
-// They are elements of the parsing method called Top Down Operator Precedence.
-
-    function expression(rbp, initial) {
-        var left, isArray = false, isObject = false;
-
-        if (nexttoken.id === '(end)')
-            error("Unexpected early end of program.", token);
-
-        advance();
-        if (initial) {
-            anonname = 'anonymous';
-            funct['(verb)'] = token.value;
-        }
-        if (initial === true && token.fud) {
-            left = token.fud();
-        } else {
-            if (token.nud) {
-                left = token.nud();
-            } else {
-                if (nexttoken.type === '(number)' && token.id === '.') {
-                    warning("A leading decimal point can be confused with a dot: '.{a}'.",
-                            token, nexttoken.value);
-                    advance();
-                    return token;
-                } else {
-                    error("Expected an identifier and instead saw '{a}'.",
-                            token, token.id);
-                }
-            }
-            while (rbp < nexttoken.lbp) {
-                isArray = token.value === 'Array';
-                isObject = token.value === 'Object';
-                advance();
-                if (isArray && token.id === '(' && nexttoken.id === ')')
-                    warning("Use the array literal notation [].", token);
-                if (isObject && token.id === '(' && nexttoken.id === ')')
-                    warning("Use the object literal notation {}.", token);
-                if (token.led) {
-                    left = token.led(left);
-                } else {
-                    error("Expected an operator and instead saw '{a}'.",
-                        token, token.id);
-                }
-            }
-        }
-        return left;
-    }
-
-
-// Functions for conformance of style.
-
-    function adjacent(left, right) {
-        left = left || token;
-        right = right || nexttoken;
-        if (option.white) {
-            if (left.character !== right.from && left.line === right.line) {
-                left.from += (left.character - left.from);
-                warning("Unexpected space after '{a}'.", left, left.value);
-            }
-        }
-    }
-
-    function nobreak(left, right) {
-        left = left || token;
-        right = right || nexttoken;
-        if (option.white && (left.character !== right.from || left.line !== right.line)) {
-            warning("Unexpected space before '{a}'.", right, right.value);
-        }
-    }
-
-    function nospace(left, right) {
-        left = left || token;
-        right = right || nexttoken;
-        if (option.white && !left.comment) {
-            if (left.line === right.line) {
-                adjacent(left, right);
-            }
-        }
-    }
-
-    function nonadjacent(left, right) {
-        if (option.white) {
-            left = left || token;
-            right = right || nexttoken;
-            if (left.line === right.line && left.character === right.from) {
-                left.from += (left.character - left.from);
-                warning("Missing space after '{a}'.",
-                        left, left.value);
-            }
-        }
-    }
-
-    function nobreaknonadjacent(left, right) {
-        left = left || token;
-        right = right || nexttoken;
-        if (!option.laxbreak && left.line !== right.line) {
-            warning("Bad line breaking before '{a}'.", right, right.id);
-        } else if (option.white) {
-            left = left || token;
-            right = right || nexttoken;
-            if (left.character === right.from) {
-                left.from += (left.character - left.from);
-                warning("Missing space after '{a}'.",
-                        left, left.value);
-            }
-        }
-    }
-
-    function indentation(bias) {
-        var i;
-        if (option.white && nexttoken.id !== '(end)') {
-            i = indent + (bias || 0);
-            if (nexttoken.from !== i) {
-                warning(
-"Expected '{a}' to have an indentation at {b} instead at {c}.",
-                        nexttoken, nexttoken.value, i, nexttoken.from);
-            }
-        }
-    }
-
-    function nolinebreak(t) {
-        t = t || token;
-        if (t.line !== nexttoken.line) {
-            warning("Line breaking error '{a}'.", t, t.value);
-        }
-    }
-
-
-    function comma() {
-        if (token.line !== nexttoken.line) {
-            if (!option.laxcomma) {
-                if (comma.first) {
-                    warning("Comma warnings can be turned off with 'laxcomma'");
-                    comma.first = false;
-                }
-                warning("Bad line breaking before '{a}'.", token, nexttoken.id);
-            }
-        } else if (!token.comment && token.character !== nexttoken.from && option.white) {
-            token.from += (token.character - token.from);
-            warning("Unexpected space after '{a}'.", token, token.value);
-        }
-        advance(',');
-        nonadjacent(token, nexttoken);
-    }
-
-
-// Functional constructors for making the symbols that will be inherited by
-// tokens.
-
-    function symbol(s, p) {
-        var x = syntax[s];
-        if (!x || typeof x !== 'object') {
-            syntax[s] = x = {
-                id: s,
-                lbp: p,
-                value: s
-            };
-        }
-        return x;
-    }
-
-
-    function delim(s) {
-        return symbol(s, 0);
-    }
-
-
-    function stmt(s, f) {
-        var x = delim(s);
-        x.identifier = x.reserved = true;
-        x.fud = f;
-        return x;
-    }
-
-
-    function blockstmt(s, f) {
-        var x = stmt(s, f);
-        x.block = true;
-        return x;
-    }
-
-
-    function reserveName(x) {
-        var c = x.id.charAt(0);
-        if ((c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z')) {
-            x.identifier = x.reserved = true;
-        }
-        return x;
-    }
-
-
-    function prefix(s, f) {
-        var x = symbol(s, 150);
-        reserveName(x);
-        x.nud = (typeof f === 'function') ? f : function () {
-            this.right = expression(150);
-            this.arity = 'unary';
-            if (this.id === '++' || this.id === '--') {
-                if (option.plusplus) {
-                    warning("Unexpected use of '{a}'.", this, this.id);
-                } else if ((!this.right.identifier || this.right.reserved) &&
-                        this.right.id !== '.' && this.right.id !== '[') {
-                    warning("Bad operand.", this);
-                }
-            }
-            return this;
-        };
-        return x;
-    }
-
-
-    function type(s, f) {
-        var x = delim(s);
-        x.type = s;
-        x.nud = f;
-        return x;
-    }
-
-
-    function reserve(s, f) {
-        var x = type(s, f);
-        x.identifier = x.reserved = true;
-        return x;
-    }
-
-
-    function reservevar(s, v) {
-        return reserve(s, function () {
-            if (typeof v === 'function') {
-                v(this);
-            }
-            return this;
-        });
-    }
-
-
-    function infix(s, f, p, w) {
-        var x = symbol(s, p);
-        reserveName(x);
-        x.led = function (left) {
-            if (!w) {
-                nobreaknonadjacent(prevtoken, token);
-                nonadjacent(token, nexttoken);
-            }
-            if (s === "in" && left.id === "!") {
-                warning("Confusing use of '{a}'.", left, '!');
-            }
-            if (typeof f === 'function') {
-                return f(left, this);
-            } else {
-                this.left = left;
-                this.right = expression(p);
-                return this;
-            }
-        };
-        return x;
-    }
-
-
-    function relation(s, f) {
-        var x = symbol(s, 100);
-        x.led = function (left) {
-            nobreaknonadjacent(prevtoken, token);
-            nonadjacent(token, nexttoken);
-            var right = expression(100);
-            if ((left && left.id === 'NaN') || (right && right.id === 'NaN')) {
-                warning("Use the isNaN function to compare with NaN.", this);
-            } else if (f) {
-                f.apply(this, [left, right]);
-            }
-            if (left.id === '!') {
-                warning("Confusing use of '{a}'.", left, '!');
-            }
-            if (right.id === '!') {
-                warning("Confusing use of '{a}'.", right, '!');
-            }
-            this.left = left;
-            this.right = right;
-            return this;
-        };
-        return x;
-    }
-
-
-    function isPoorRelation(node) {
-        return node &&
-              ((node.type === '(number)' && +node.value === 0) ||
-               (node.type === '(string)' && node.value === '') ||
-               (node.type === 'null' && !option.eqnull) ||
-                node.type === 'true' ||
-                node.type === 'false' ||
-                node.type === 'undefined');
-    }
-
-
-    function assignop(s, f) {
-        symbol(s, 20).exps = true;
-        return infix(s, function (left, that) {
-            var l;
-            that.left = left;
-            if (predefined[left.value] === false &&
-                    scope[left.value]['(global)'] === true) {
-                warning("Read only.", left);
-            } else if (left['function']) {
-                warning("'{a}' is a function.", left, left.value);
-            }
-            if (left) {
-                if (option.esnext && funct[left.value] === 'const') {
-                    warning("Attempting to override '{a}' which is a constant", left, left.value);
-                }
-                if (left.id === '.' || left.id === '[') {
-                    if (!left.left || left.left.value === 'arguments') {
-                        warning('Bad assignment.', that);
-                    }
-                    that.right = expression(19);
-                    return that;
-                } else if (left.identifier && !left.reserved) {
-                    if (funct[left.value] === 'exception') {
-                        warning("Do not assign to the exception parameter.", left);
-                    }
-                    that.right = expression(19);
-                    return that;
-                }
-                if (left === syntax['function']) {
-                    warning(
-"Expected an identifier in an assignment and instead saw a function invocation.",
-                                token);
-                }
-            }
-            error("Bad assignment.", that);
-        }, 20);
-    }
-
-
-    function bitwise(s, f, p) {
-        var x = symbol(s, p);
-        reserveName(x);
-        x.led = (typeof f === 'function') ? f : function (left) {
-            if (option.bitwise) {
-                warning("Unexpected use of '{a}'.", this, this.id);
-            }
-            this.left = left;
-            this.right = expression(p);
-            return this;
-        };
-        return x;
-    }
-
-
-    function bitwiseassignop(s) {
-        symbol(s, 20).exps = true;
-        return infix(s, function (left, that) {
-            if (option.bitwise) {
-                warning("Unexpected use of '{a}'.", that, that.id);
-            }
-            nonadjacent(prevtoken, token);
-            nonadjacent(token, nexttoken);
-            if (left) {
-                if (left.id === '.' || left.id === '[' ||
-                        (left.identifier && !left.reserved)) {
-                    expression(19);
-                    return that;
-                }
-                if (left === syntax['function']) {
-                    warning(
-"Expected an identifier in an assignment, and instead saw a function invocation.",
-                                token);
-                }
-                return that;
-            }
-            error("Bad assignment.", that);
-        }, 20);
-    }
-
-
-    function suffix(s, f) {
-        var x = symbol(s, 150);
-        x.led = function (left) {
-            if (option.plusplus) {
-                warning("Unexpected use of '{a}'.", this, this.id);
-            } else if ((!left.identifier || left.reserved) &&
-                    left.id !== '.' && left.id !== '[') {
-                warning("Bad operand.", this);
-            }
-            this.left = left;
-            return this;
-        };
-        return x;
-    }
-
-
-    // fnparam means that this identifier is being defined as a function
-    // argument (see identifier())
-    function optionalidentifier(fnparam) {
-        if (nexttoken.identifier) {
-            advance();
-            if (token.reserved && !option.es5) {
-                // `undefined` as a function param is a common pattern to protect
-                // against the case when somebody does `undefined = true` and
-                // help with minification. More info: https://gist.github.com/315916
-                if (!fnparam || token.value !== 'undefined') {
-                    warning("Expected an identifier and instead saw '{a}' (a reserved word).",
-                            token, token.id);
-                }
-            }
-            return token.value;
-        }
-    }
-
-    // fnparam means that this identifier is being defined as a function
-    // argument
-    function identifier(fnparam) {
-        var i = optionalidentifier(fnparam);
-        if (i) {
-            return i;
-        }
-        if (token.id === 'function' && nexttoken.id === '(') {
-            warning("Missing name in function declaration.");
-        } else {
-            error("Expected an identifier and instead saw '{a}'.",
-                    nexttoken, nexttoken.value);
-        }
-    }
-
-
-    function reachable(s) {
-        var i = 0, t;
-        if (nexttoken.id !== ';' || noreach) {
-            return;
-        }
-        for (;;) {
-            t = peek(i);
-            if (t.reach) {
-                return;
-            }
-            if (t.id !== '(endline)') {
-                if (t.id === 'function') {
-                    if (!option.latedef) {
-                        break;
-                    }
-                    warning(
-"Inner functions should be listed at the top of the outer function.", t);
-                    break;
-                }
-                warning("Unreachable '{a}' after '{b}'.", t, t.value, s);
-                break;
-            }
-            i += 1;
-        }
-    }
-
-
-    function statement(noindent) {
-        var i = indent, r, s = scope, t = nexttoken;
-
-        if (t.id === ";") {
-            advance(";");
-            return;
-        }
-
-// Is this a labelled statement?
-
-        if (t.identifier && !t.reserved && peek().id === ':') {
-            advance();
-            advance(':');
-            scope = Object.create(s);
-            addlabel(t.value, 'label');
-            if (!nexttoken.labelled) {
-                warning("Label '{a}' on {b} statement.",
-                        nexttoken, t.value, nexttoken.value);
-            }
-            if (jx.test(t.value + ':')) {
-                warning("Label '{a}' looks like a javascript url.",
-                        t, t.value);
-            }
-            nexttoken.label = t.value;
-            t = nexttoken;
-        }
-
-// Parse the statement.
-
-        if (!noindent) {
-            indentation();
-        }
-        r = expression(0, true);
-
-        // Look for the final semicolon.
-        if (!t.block) {
-            if (!option.expr && (!r || !r.exps)) {
-                warning("Expected an assignment or function call and instead saw an expression.",
-                    token);
-            } else if (option.nonew && r.id === '(' && r.left.id === 'new') {
-                warning("Do not use 'new' for side effects.");
-            }
-
-            if (nexttoken.id === ',') {
-                return comma();
-            }
-
-            if (nexttoken.id !== ';') {
-                if (!option.asi) {
-                    // If this is the last statement in a block that ends on
-                    // the same line *and* option lastsemic is on, ignore the warning.
-                    // Otherwise, complain about missing semicolon.
-                    if (!option.lastsemic || nexttoken.id !== '}' ||
-                            nexttoken.line !== token.line) {
-                        warningAt("Missing semicolon.", token.line, token.character);
-                    }
-                }
-            } else {
-                adjacent(token, nexttoken);
-                advance(';');
-                nonadjacent(token, nexttoken);
-            }
-        }
-
-// Restore the indentation.
-
-        indent = i;
-        scope = s;
-        return r;
-    }
-
-
-    function statements(startLine) {
-        var a = [], f, p;
-
-        while (!nexttoken.reach && nexttoken.id !== '(end)') {
-            if (nexttoken.id === ';') {
-                p = peek();
-                if (!p || p.id !== "(") {
-                    warning("Unnecessary semicolon.");
-                }
-                advance(';');
-            } else {
-                a.push(statement(startLine === nexttoken.line));
-            }
-        }
-        return a;
-    }
-
-
-    /*
-     * read all directives
-     * recognizes a simple form of asi, but always
-     * warns, if it is used
-     */
-    function directives() {
-        var i, p, pn;
-
-        for (;;) {
-            if (nexttoken.id === "(string)") {
-                p = peek(0);
-                if (p.id === "(endline)") {
-                    i = 1;
-                    do {
-                        pn = peek(i);
-                        i = i + 1;
-                    } while (pn.id === "(endline)");
-
-                    if (pn.id !== ";") {
-                        if (pn.id !== "(string)" && pn.id !== "(number)" &&
-                            pn.id !== "(regexp)" && pn.identifier !== true &&
-                            pn.id !== "}") {
-                            break;
-                        }
-                        warning("Missing semicolon.", nexttoken);
-                    } else {
-                        p = pn;
-                    }
-                } else if (p.id === "}") {
-                    // directive with no other statements, warn about missing semicolon
-                    warning("Missing semicolon.", p);
-                } else if (p.id !== ";") {
-                    break;
-                }
-
-                indentation();
-                advance();
-                if (directive[token.value]) {
-                    warning("Unnecessary directive \"{a}\".", token, token.value);
-                }
-
-                if (token.value === "use strict") {
-                    option.newcap = true;
-                    option.undef = true;
-                }
-
-                // there's no directive negation, so always set to true
-                directive[token.value] = true;
-
-                if (p.id === ";") {
-                    advance(";");
-                }
-                continue;
-            }
-            break;
-        }
-    }
-
-
-    /*
-     * Parses a single block. A block is a sequence of statements wrapped in
-     * braces.
-     *
-     * ordinary - true for everything but function bodies and try blocks.
-     * stmt     - true if block can be a single statement (e.g. in if/for/while).
-     * isfunc   - true if block is a function body
-     */
-    function block(ordinary, stmt, isfunc) {
-        var a,
-            b = inblock,
-            old_indent = indent,
-            m,
-            s = scope,
-            t,
-            line,
-            d;
-
-        inblock = ordinary;
-        if (!ordinary || !option.funcscope) scope = Object.create(scope);
-        nonadjacent(token, nexttoken);
-        t = nexttoken;
-
-        if (nexttoken.id === '{') {
-            advance('{');
-            line = token.line;
-            if (nexttoken.id !== '}') {
-                indent += option.indent;
-                while (!ordinary && nexttoken.from > indent) {
-                    indent += option.indent;
-                }
-
-                if (isfunc) {
-                    m = {};
-                    for (d in directive) {
-                        if (is_own(directive, d)) {
-                            m[d] = directive[d];
-                        }
-                    }
-                    directives();
-
-                    if (option.strict && funct['(context)']['(global)']) {
-                        if (!m["use strict"] && !directive["use strict"]) {
-                            warning("Missing \"use strict\" statement.");
-                        }
-                    }
-                }
-
-                a = statements(line);
-
-                if (isfunc) {
-                    directive = m;
-                }
-
-                indent -= option.indent;
-                if (line !== nexttoken.line) {
-                    indentation();
-                }
-            } else if (line !== nexttoken.line) {
-                indentation();
-            }
-            advance('}', t);
-            indent = old_indent;
-        } else if (!ordinary) {
-            error("Expected '{a}' and instead saw '{b}'.",
-                  nexttoken, '{', nexttoken.value);
-        } else {
-            if (!stmt || option.curly)
-                warning("Expected '{a}' and instead saw '{b}'.",
-                        nexttoken, '{', nexttoken.value);
-
-            noreach = true;
-            indent += option.indent;
-            // test indentation only if statement is in new line
-            a = [statement(nexttoken.line === token.line)];
-            indent -= option.indent;
-            noreach = false;
-        }
-        funct['(verb)'] = null;
-        if (!ordinary || !option.funcscope) scope = s;
-        inblock = b;
-        if (ordinary && option.noempty && (!a || a.length === 0)) {
-            warning("Empty block.");
-        }
-        return a;
-    }
-
-
-    function countMember(m) {
-        if (membersOnly && typeof membersOnly[m] !== 'boolean') {
-            warning("Unexpected /*member '{a}'.", token, m);
-        }
-        if (typeof member[m] === 'number') {
-            member[m] += 1;
-        } else {
-            member[m] = 1;
-        }
-    }
-
-
-    function note_implied(token) {
-        var name = token.value, line = token.line, a = implied[name];
-        if (typeof a === 'function') {
-            a = false;
-        }
-
-        if (!a) {
-            a = [line];
-            implied[name] = a;
-        } else if (a[a.length - 1] !== line) {
-            a.push(line);
-        }
-    }
-
-
-    // Build the syntax table by declaring the syntactic elements of the language.
-
-    type('(number)', function () {
-        return this;
-    });
-
-    type('(string)', function () {
-        return this;
-    });
-
-    syntax['(identifier)'] = {
-        type: '(identifier)',
-        lbp: 0,
-        identifier: true,
-        nud: function () {
-            var v = this.value,
-                s = scope[v],
-                f;
-
-            if (typeof s === 'function') {
-                // Protection against accidental inheritance.
-                s = undefined;
-            } else if (typeof s === 'boolean') {
-                f = funct;
-                funct = functions[0];
-                addlabel(v, 'var');
-                s = funct;
-                funct = f;
-            }
-
-            // The name is in scope and defined in the current function.
-            if (funct === s) {
-                // Change 'unused' to 'var', and reject labels.
-                switch (funct[v]) {
-                case 'unused':
-                    funct[v] = 'var';
-                    break;
-                case 'unction':
-                    funct[v] = 'function';
-                    this['function'] = true;
-                    break;
-                case 'function':
-                    this['function'] = true;
-                    break;
-                case 'label':
-                    warning("'{a}' is a statement label.", token, v);
-                    break;
-                }
-            } else if (funct['(global)']) {
-                // The name is not defined in the function.  If we are in the global
-                // scope, then we have an undefined variable.
-                //
-                // Operators typeof and delete do not raise runtime errors even if
-                // the base object of a reference is null so no need to display warning
-                // if we're inside of typeof or delete.
-
-                if (option.undef && typeof predefined[v] !== 'boolean') {
-                    // Attempting to subscript a null reference will throw an
-                    // error, even within the typeof and delete operators
-                    if (!(anonname === 'typeof' || anonname === 'delete') ||
-                        (nexttoken && (nexttoken.value === '.' || nexttoken.value === '['))) {
-
-                        isundef(funct, "'{a}' is not defined.", token, v);
-                    }
-                }
-                note_implied(token);
-            } else {
-                // If the name is already defined in the current
-                // function, but not as outer, then there is a scope error.
-
-                switch (funct[v]) {
-                case 'closure':
-                case 'function':
-                case 'var':
-                case 'unused':
-                    warning("'{a}' used out of scope.", token, v);
-                    break;
-                case 'label':
-                    warning("'{a}' is a statement label.", token, v);
-                    break;
-                case 'outer':
-                case 'global':
-                    break;
-                default:
-                    // If the name is defined in an outer function, make an outer entry,
-                    // and if it was unused, make it var.
-                    if (s === true) {
-                        funct[v] = true;
-                    } else if (s === null) {
-                        warning("'{a}' is not allowed.", token, v);
-                        note_implied(token);
-                    } else if (typeof s !== 'object') {
-                        // Operators typeof and delete do not raise runtime errors even
-                        // if the base object of a reference is null so no need to
-                        // display warning if we're inside of typeof or delete.
-                        if (option.undef) {
-                            // Attempting to subscript a null reference will throw an
-                            // error, even within the typeof and delete operators
-                            if (!(anonname === 'typeof' || anonname === 'delete') ||
-                                (nexttoken &&
-                                    (nexttoken.value === '.' || nexttoken.value === '['))) {
-
-                                isundef(funct, "'{a}' is not defined.", token, v);
-                            }
-                        }
-                        funct[v] = true;
-                        note_implied(token);
-                    } else {
-                        switch (s[v]) {
-                        case 'function':
-                        case 'unction':
-                            this['function'] = true;
-                            s[v] = 'closure';
-                            funct[v] = s['(global)'] ? 'global' : 'outer';
-                            break;
-                        case 'var':
-                        case 'unused':
-                            s[v] = 'closure';
-                            funct[v] = s['(global)'] ? 'global' : 'outer';
-                            break;
-                        case 'closure':
-                        case 'parameter':
-                            funct[v] = s['(global)'] ? 'global' : 'outer';
-                            break;
-                        case 'label':
-                            warning("'{a}' is a statement label.", token, v);
-                        }
-                    }
-                }
-            }
-            return this;
-        },
-        led: function () {
-            error("Expected an operator and instead saw '{a}'.",
-                nexttoken, nexttoken.value);
-        }
-    };
-
-    type('(regexp)', function () {
-        return this;
-    });
-
-
-// ECMAScript parser
-
-    delim('(endline)');
-    delim('(begin)');
-    delim('(end)').reach = true;
-    delim('</').reach = true;
-    delim('<!');
-    delim('<!--');
-    delim('-->');
-    delim('(error)').reach = true;
-    delim('}').reach = true;
-    delim(')');
-    delim(']');
-    delim('"').reach = true;
-    delim("'").reach = true;
-    delim(';');
-    delim(':').reach = true;
-    delim(',');
-    delim('#');
-    delim('@');
-    reserve('else');
-    reserve('case').reach = true;
-    reserve('catch');
-    reserve('default').reach = true;
-    reserve('finally');
-    reservevar('arguments', function (x) {
-        if (directive['use strict'] && funct['(global)']) {
-            warning("Strict violation.", x);
-        }
-    });
-    reservevar('eval');
-    reservevar('false');
-    reservevar('Infinity');
-    reservevar('NaN');
-    reservevar('null');
-    reservevar('this', function (x) {
-        if (directive['use strict'] && !option.validthis && ((funct['(statement)'] &&
-                funct['(name)'].charAt(0) > 'Z') || funct['(global)'])) {
-            warning("Possible strict violation.", x);
-        }
-    });
-    reservevar('true');
-    reservevar('undefined');
-    assignop('=', 'assign', 20);
-    assignop('+=', 'assignadd', 20);
-    assignop('-=', 'assignsub', 20);
-    assignop('*=', 'assignmult', 20);
-    assignop('/=', 'assigndiv', 20).nud = function () {
-        error("A regular expression literal can be confused with '/='.");
-    };
-    assignop('%=', 'assignmod', 20);
-    bitwiseassignop('&=', 'assignbitand', 20);
-    bitwiseassignop('|=', 'assignbitor', 20);
-    bitwiseassignop('^=', 'assignbitxor', 20);
-    bitwiseassignop('<<=', 'assignshiftleft', 20);
-    bitwiseassignop('>>=', 'assignshiftright', 20);
-    bitwiseassignop('>>>=', 'assignshiftrightunsigned', 20);
-    infix('?', function (left, that) {
-        that.left = left;
-        that.right = expression(10);
-        advance(':');
-        that['else'] = expression(10);
-        return that;
-    }, 30);
-
-    infix('||', 'or', 40);
-    infix('&&', 'and', 50);
-    bitwise('|', 'bitor', 70);
-    bitwise('^', 'bitxor', 80);
-    bitwise('&', 'bitand', 90);
-    relation('==', function (left, right) {
-        var eqnull = option.eqnull && (left.value === 'null' || right.value === 'null');
-
-        if (!eqnull && option.eqeqeq)
-            warning("Expected '{a}' and instead saw '{b}'.", this, '===', '==');
-        else if (isPoorRelation(left))
-            warning("Use '{a}' to compare with '{b}'.", this, '===', left.value);
-        else if (isPoorRelation(right))
-            warning("Use '{a}' to compare with '{b}'.", this, '===', right.value);
-
-        return this;
-    });
-    relation('===');
-    relation('!=', function (left, right) {
-        var eqnull = option.eqnull &&
-                (left.value === 'null' || right.value === 'null');
-
-        if (!eqnull && option.eqeqeq) {
-            warning("Expected '{a}' and instead saw '{b}'.",
-                    this, '!==', '!=');
-        } else if (isPoorRelation(left)) {
-            warning("Use '{a}' to compare with '{b}'.",
-                    this, '!==', left.value);
-        } else if (isPoorRelation(right)) {
-            warning("Use '{a}' to compare with '{b}'.",
-                    this, '!==', right.value);
-        }
-        return this;
-    });
-    relation('!==');
-    relation('<');
-    relation('>');
-    relation('<=');
-    relation('>=');
-    bitwise('<<', 'shiftleft', 120);
-    bitwise('>>', 'shiftright', 120);
-    bitwise('>>>', 'shiftrightunsigned', 120);
-    infix('in', 'in', 120);
-    infix('instanceof', 'instanceof', 120);
-    infix('+', function (left, that) {
-        var right = expression(130);
-        if (left && right && left.id === '(string)' && right.id === '(string)') {
-            left.value += right.value;
-            left.character = right.character;
-            if (!option.scripturl && jx.test(left.value)) {
-                warning("JavaScript URL.", left);
-            }
-            return left;
-        }
-        that.left = left;
-        that.right = right;
-        return that;
-    }, 130);
-    prefix('+', 'num');
-    prefix('+++', function () {
-        warning("Confusing pluses.");
-        this.right = expression(150);
-        this.arity = 'unary';
-        return this;
-    });
-    infix('+++', function (left) {
-        warning("Confusing pluses.");
-        this.left = left;
-        this.right = expression(130);
-        return this;
-    }, 130);
-    infix('-', 'sub', 130);
-    prefix('-', 'neg');
-    prefix('---', function () {
-        warning("Confusing minuses.");
-        this.right = expression(150);
-        this.arity = 'unary';
-        return this;
-    });
-    infix('---', function (left) {
-        warning("Confusing minuses.");
-        this.left = left;
-        this.right = expression(130);
-        return this;
-    }, 130);
-    infix('*', 'mult', 140);
-    infix('/', 'div', 140);
-    infix('%', 'mod', 140);
-
-    suffix('++', 'postinc');
-    prefix('++', 'preinc');
-    syntax['++'].exps = true;
-
-    suffix('--', 'postdec');
-    prefix('--', 'predec');
-    syntax['--'].exps = true;
-    prefix('delete', function () {
-        var p = expression(0);
-        if (!p || (p.id !== '.' && p.id !== '[')) {
-            warning("Variables should not be deleted.");
-        }
-        this.first = p;
-        return this;
-    }).exps = true;
-
-    prefix('~', function () {
-        if (option.bitwise) {
-            warning("Unexpected '{a}'.", this, '~');
-        }
-        expression(150);
-        return this;
-    });
-
-    prefix('!', function () {
-        this.right = expression(150);
-        this.arity = 'unary';
-        if (bang[this.right.id] === true) {
-            warning("Confusing use of '{a}'.", this, '!');
-        }
-        return this;
-    });
-    prefix('typeof', 'typeof');
-    prefix('new', function () {
-        var c = expression(155), i;
-        if (c && c.id !== 'function') {
-            if (c.identifier) {
-                c['new'] = true;
-                switch (c.value) {
-                case 'Number':
-                case 'String':
-                case 'Boolean':
-                case 'Math':
-                case 'JSON':
-                    warning("Do not use {a} as a constructor.", token, c.value);
-                    break;
-                case 'Function':
-                    if (!option.evil) {
-                        warning("The Function constructor is eval.");
-                    }
-                    break;
-                case 'Date':
-                case 'RegExp':
-                    break;
-                default:
-                    if (c.id !== 'function') {
-                        i = c.value.substr(0, 1);
-                        if (option.newcap && (i < 'A' || i > 'Z')) {
-                            warning("A constructor name should start with an uppercase letter.",
-                                token);
-                        }
-                    }
-                }
-            } else {
-                if (c.id !== '.' && c.id !== '[' && c.id !== '(') {
-                    warning("Bad constructor.", token);
-                }
-            }
-        } else {
-            if (!option.supernew)
-                warning("Weird construction. Delete 'new'.", this);
-        }
-        adjacent(token, nexttoken);
-        if (nexttoken.id !== '(' && !option.supernew) {
-            warning("Missing '()' invoking a constructor.");
-        }
-        this.first = c;
-        return this;
-    });
-    syntax['new'].exps = true;
-
-    prefix('void').exps = true;
-
-    infix('.', function (left, that) {
-        adjacent(prevtoken, token);
-        nobreak();
-        var m = identifier();
-        if (typeof m === 'string') {
-            countMember(m);
-        }
-        that.left = left;
-        that.right = m;
-        if (left && left.value === 'arguments' && (m === 'callee' || m === 'caller')) {
-            if (option.noarg)
-                warning("Avoid arguments.{a}.", left, m);
-            else if (directive['use strict'])
-                error('Strict violation.');
-        } else if (!option.evil && left && left.value === 'document' &&
-                (m === 'write' || m === 'writeln')) {
-            warning("document.write can be a form of eval.", left);
-        }
-        if (!option.evil && (m === 'eval' || m === 'execScript')) {
-            warning('eval is evil.');
-        }
-        return that;
-    }, 160, true);
-
-    infix('(', function (left, that) {
-        if (prevtoken.id !== '}' && prevtoken.id !== ')') {
-            nobreak(prevtoken, token);
-        }
-        nospace();
-        if (option.immed && !left.immed && left.id === 'function') {
-            warning("Wrap an immediate function invocation in parentheses " +
-                "to assist the reader in understanding that the expression " +
-                "is the result of a function, and not the function itself.");
-        }
-        var n = 0,
-            p = [];
-        if (left) {
-            if (left.type === '(identifier)') {
-                if (left.value.match(/^[A-Z]([A-Z0-9_$]*[a-z][A-Za-z0-9_$]*)?$/)) {
-                    if (left.value !== 'Number' && left.value !== 'String' &&
-                            left.value !== 'Boolean' &&
-                            left.value !== 'Date') {
-                        if (left.value === 'Math') {
-                            warning("Math is not a function.", left);
-                        } else if (option.newcap) {
-                            warning(
-"Missing 'new' prefix when invoking a constructor.", left);
-                        }
-                    }
-                }
-            }
-        }
-        if (nexttoken.id !== ')') {
-            for (;;) {
-                p[p.length] = expression(10);
-                n += 1;
-                if (nexttoken.id !== ',') {
-                    break;
-                }
-                comma();
-            }
-        }
-        advance(')');
-        nospace(prevtoken, token);
-        if (typeof left === 'object') {
-            if (left.value === 'parseInt' && n === 1) {
-                warning("Missing radix parameter.", left);
-            }
-            if (!option.evil) {
-                if (left.value === 'eval' || left.value === 'Function' ||
-                        left.value === 'execScript') {
-                    warning("eval is evil.", left);
-                } else if (p[0] && p[0].id === '(string)' &&
-                       (left.value === 'setTimeout' ||
-                        left.value === 'setInterval')) {
-                    warning(
-    "Implied eval is evil. Pass a function instead of a string.", left);
-                }
-            }
-            if (!left.identifier && left.id !== '.' && left.id !== '[' &&
-                    left.id !== '(' && left.id !== '&&' && left.id !== '||' &&
-                    left.id !== '?') {
-                warning("Bad invocation.", left);
-            }
-        }
-        that.left = left;
-        return that;
-    }, 155, true).exps = true;
-
-    prefix('(', function () {
-        nospace();
-        if (nexttoken.id === 'function') {
-            nexttoken.immed = true;
-        }
-        var v = expression(0);
-        advance(')', this);
-        nospace(prevtoken, token);
-        if (option.immed && v.id === 'function') {
-            if (nexttoken.id === '(' ||
-              (nexttoken.id === '.' && (peek().value === 'call' || peek().value === 'apply'))) {
-                warning(
-"Move the invocation into the parens that contain the function.", nexttoken);
-            } else {
-                warning(
-"Do not wrap function literals in parens unless they are to be immediately invoked.",
-                        this);
-            }
-        }
-        return v;
-    });
-
-    infix('[', function (left, that) {
-        nobreak(prevtoken, token);
-        nospace();
-        var e = expression(0), s;
-        if (e && e.type === '(string)') {
-            if (!option.evil && (e.value === 'eval' || e.value === 'execScript')) {
-                warning("eval is evil.", that);
-            }
-            countMember(e.value);
-            if (!option.sub && ix.test(e.value)) {
-                s = syntax[e.value];
-                if (!s || !s.reserved) {
-                    warning("['{a}'] is better written in dot notation.",
-                            e, e.value);
-                }
-            }
-        }
-        advance(']', that);
-        nospace(prevtoken, token);
-        that.left = left;
-        that.right = e;
-        return that;
-    }, 160, true);
-
-    prefix('[', function () {
-        var b = token.line !== nexttoken.line;
-        this.first = [];
-        if (b) {
-            indent += option.indent;
-            if (nexttoken.from === indent + option.indent) {
-                indent += option.indent;
-            }
-        }
-        while (nexttoken.id !== '(end)') {
-            while (nexttoken.id === ',') {
-                warning("Extra comma.");
-                advance(',');
-            }
-            if (nexttoken.id === ']') {
-                break;
-            }
-            if (b && token.line !== nexttoken.line) {
-                indentation();
-            }
-            this.first.push(expression(10));
-            if (nexttoken.id === ',') {
-                comma();
-                if (nexttoken.id === ']' && !option.es5) {
-                    warning("Extra comma.", token);
-                    break;
-                }
-            } else {
-                break;
-            }
-        }
-        if (b) {
-            indent -= option.indent;
-            indentation();
-        }
-        advance(']', this);
-        return this;
-    }, 160);
-
-
-    function property_name() {
-        var id = optionalidentifier(true);
-        if (!id) {
-            if (nexttoken.id === '(string)') {
-                id = nexttoken.value;
-                advance();
-            } else if (nexttoken.id === '(number)') {
-                id = nexttoken.value.toString();
-                advance();
-            }
-        }
-        return id;
-    }
-
-
-    function functionparams() {
-        var i, t = nexttoken, p = [];
-        advance('(');
-        nospace();
-        if (nexttoken.id === ')') {
-            advance(')');
-            return;
-        }
-        for (;;) {
-            i = identifier(true);
-            p.push(i);
-            addlabel(i, 'parameter');
-            if (nexttoken.id === ',') {
-                comma();
-            } else {
-                advance(')', t);
-                nospace(prevtoken, token);
-                return p;
-            }
-        }
-    }
-
-
-    function doFunction(i, statement) {
-        var f,
-            oldOption = option,
-            oldScope  = scope;
-
-        option = Object.create(option);
-        scope = Object.create(scope);
-
-        funct = {
-            '(name)'     : i || '"' + anonname + '"',
-            '(line)'     : nexttoken.line,
-            '(context)'  : funct,
-            '(breakage)' : 0,
-            '(loopage)'  : 0,
-            '(scope)'    : scope,
-            '(statement)': statement
-        };
-        f = funct;
-        token.funct = funct;
-        functions.push(funct);
-        if (i) {
-            addlabel(i, 'function');
-        }
-        funct['(params)'] = functionparams();
-
-        block(false, false, true);
-        scope = oldScope;
-        option = oldOption;
-        funct['(last)'] = token.line;
-        funct = funct['(context)'];
-        return f;
-    }
-
-
-    (function (x) {
-        x.nud = function () {
-            var b, f, i, j, p, t;
-            var props = {}; // All properties, including accessors
-
-            function saveProperty(name, token) {
-                if (props[name] && is_own(props, name))
-                    warning("Duplicate member '{a}'.", nexttoken, i);
-                else
-                    props[name] = {};
-
-                props[name].basic = true;
-                props[name].basicToken = token;
-            }
-
-            function saveSetter(name, token) {
-                if (props[name] && is_own(props, name)) {
-                    if (props[name].basic || props[name].setter)
-                        warning("Duplicate member '{a}'.", nexttoken, i);
-                } else {
-                    props[name] = {};
-                }
-
-                props[name].setter = true;
-                props[name].setterToken = token;
-            }
-
-            function saveGetter(name) {
-                if (props[name] && is_own(props, name)) {
-                    if (props[name].basic || props[name].getter)
-                        warning("Duplicate member '{a}'.", nexttoken, i);
-                } else {
-                    props[name] = {};
-                }
-
-                props[name].getter = true;
-                props[name].getterToken = token;
-            }
-
-            b = token.line !== nexttoken.line;
-            if (b) {
-                indent += option.indent;
-                if (nexttoken.from === indent + option.indent) {
-                    indent += option.indent;
-                }
-            }
-            for (;;) {
-                if (nexttoken.id === '}') {
-                    break;
-                }
-                if (b) {
-                    indentation();
-                }
-                if (nexttoken.value === 'get' && peek().id !== ':') {
-                    advance('get');
-                    if (!option.es5) {
-                        error("get/set are ES5 features.");
-                    }
-                    i = property_name();
-                    if (!i) {
-                        error("Missing property name.");
-                    }
-                    saveGetter(i);
-                    t = nexttoken;
-                    adjacent(token, nexttoken);
-                    f = doFunction();
-                    p = f['(params)'];
-                    if (p) {
-                        warning("Unexpected parameter '{a}' in get {b} function.", t, p[0], i);
-                    }
-                    adjacent(token, nexttoken);
-                } else if (nexttoken.value === 'set' && peek().id !== ':') {
-                    advance('set');
-                    if (!option.es5) {
-                        error("get/set are ES5 features.");
-                    }
-                    i = property_name();
-                    if (!i) {
-                        error("Missing property name.");
-                    }
-                    saveSetter(i, nexttoken);
-                    t = nexttoken;
-                    adjacent(token, nexttoken);
-                    f = doFunction();
-                    p = f['(params)'];
-                    if (!p || p.length !== 1) {
-                        warning("Expected a single parameter in set {a} function.", t, i);
-                    }
-                } else {
-                    i = property_name();
-                    saveProperty(i, nexttoken);
-                    if (typeof i !== 'string') {
-                        break;
-                    }
-                    advance(':');
-                    nonadjacent(token, nexttoken);
-                    expression(10);
-                }
-
-                countMember(i);
-                if (nexttoken.id === ',') {
-                    comma();
-                    if (nexttoken.id === ',') {
-                        warning("Extra comma.", token);
-                    } else if (nexttoken.id === '}' && !option.es5) {
-                        warning("Extra comma.", token);
-                    }
-                } else {
-                    break;
-                }
-            }
-            if (b) {
-                indent -= option.indent;
-                indentation();
-            }
-            advance('}', this);
-
-            // Check for lonely setters if in the ES5 mode.
-            if (option.es5) {
-                for (var name in props) {
-                    if (is_own(props, name) && props[name].setter && !props[name].getter) {
-                        warning("Setter is defined without getter.", props[name].setterToken);
-                    }
-                }
-            }
-            return this;
-        };
-        x.fud = function () {
-            error("Expected to see a statement and instead saw a block.", token);
-        };
-    }(delim('{')));
-
-// This Function is called when esnext option is set to true
-// it adds the `const` statement to JSHINT
-
-    useESNextSyntax = function () {
-        var conststatement = stmt('const', function (prefix) {
-            var id, name, value;
-
-            this.first = [];
-            for (;;) {
-                nonadjacent(token, nexttoken);
-                id = identifier();
-                if (funct[id] === "const") {
-                    warning("const '" + id + "' has already been declared");
-                }
-                if (funct['(global)'] && predefined[id] === false) {
-                    warning("Redefinition of '{a}'.", token, id);
-                }
-                addlabel(id, 'const');
-                if (prefix) {
-                    break;
-                }
-                name = token;
-                this.first.push(token);
-
-                if (nexttoken.id !== "=") {
-                    warning("const " +
-                      "'{a}' is initialized to 'undefined'.", token, id);
-                }
-
-                if (nexttoken.id === '=') {
-                    nonadjacent(token, nexttoken);
-                    advance('=');
-                    nonadjacent(token, nexttoken);
-                    if (nexttoken.id === 'undefined') {
-                        warning("It is not necessary to initialize " +
-                          "'{a}' to 'undefined'.", token, id);
-                    }
-                    if (peek(0).id === '=' && nexttoken.identifier) {
-                        error("Constant {a} was not declared correctly.",
-                                nexttoken, nexttoken.value);
-                    }
-                    value = expression(0);
-                    name.first = value;
-                }
-
-                if (nexttoken.id !== ',') {
-                    break;
-                }
-                comma();
-            }
-            return this;
-        });
-        conststatement.exps = true;
-    };
-
-    var varstatement = stmt('var', function (prefix) {
-        // JavaScript does not have block scope. It only has function scope. So,
-        // declaring a variable in a block can have unexpected consequences.
-        var id, name, value;
-
-        if (funct['(onevar)'] && option.onevar) {
-            warning("Too many var statements.");
-        } else if (!funct['(global)']) {
-            funct['(onevar)'] = true;
-        }
-        this.first = [];
-        for (;;) {
-            nonadjacent(token, nexttoken);
-            id = identifier();
-            if (option.esnext && funct[id] === "const") {
-                warning("const '" + id + "' has already been declared");
-            }
-            if (funct['(global)'] && predefined[id] === false) {
-                warning("Redefinition of '{a}'.", token, id);
-            }
-            addlabel(id, 'unused');
-            if (prefix) {
-                break;
-            }
-            name = token;
-            this.first.push(token);
-            if (nexttoken.id === '=') {
-                nonadjacent(token, nexttoken);
-                advance('=');
-                nonadjacent(token, nexttoken);
-                if (nexttoken.id === 'undefined') {
-                    warning("It is not necessary to initialize '{a}' to 'undefined'.", token, id);
-                }
-                if (peek(0).id === '=' && nexttoken.identifier) {
-                    error("Variable {a} was not declared correctly.",
-                            nexttoken, nexttoken.value);
-                }
-                value = expression(0);
-                name.first = value;
-            }
-            if (nexttoken.id !== ',') {
-                break;
-            }
-            comma();
-        }
-        return this;
-    });
-    varstatement.exps = true;
-
-    blockstmt('function', function () {
-        if (inblock) {
-            warning("Function declarations should not be placed in blocks. " +
-                "Use a function expression or move the statement to the top of " +
-                "the outer function.", token);
-
-        }
-        var i = identifier();
-        if (option.esnext && funct[i] === "const") {
-            warning("const '" + i + "' has already been declared");
-        }
-        adjacent(token, nexttoken);
-        addlabel(i, 'unction');
-        doFunction(i, true);
-        if (nexttoken.id === '(' && nexttoken.line === token.line) {
-            error(
-"Function declarations are not invocable. Wrap the whole function invocation in parens.");
-        }
-        return this;
-    });
-
-    prefix('function', function () {
-        var i = optionalidentifier();
-        if (i) {
-            adjacent(token, nexttoken);
-        } else {
-            nonadjacent(token, nexttoken);
-        }
-        doFunction(i);
-        if (!option.loopfunc && funct['(loopage)']) {
-            warning("Don't make functions within a loop.");
-        }
-        return this;
-    });
-
-    blockstmt('if', function () {
-        var t = nexttoken;
-        advance('(');
-        nonadjacent(this, t);
-        nospace();
-        expression(20);
-        if (nexttoken.id === '=') {
-            if (!option.boss)
-                warning("Expected a conditional expression and instead saw an assignment.");
-            advance('=');
-            expression(20);
-        }
-        advance(')', t);
-        nospace(prevtoken, token);
-        block(true, true);
-        if (nexttoken.id === 'else') {
-            nonadjacent(token, nexttoken);
-            advance('else');
-            if (nexttoken.id === 'if' || nexttoken.id === 'switch') {
-                statement(true);
-            } else {
-                block(true, true);
-            }
-        }
-        return this;
-    });
-
-    blockstmt('try', function () {
-        var b, e, s;
-
-        block(false);
-        if (nexttoken.id === 'catch') {
-            advance('catch');
-            nonadjacent(token, nexttoken);
-            advance('(');
-            s = scope;
-            scope = Object.create(s);
-            e = nexttoken.value;
-            if (nexttoken.type !== '(identifier)') {
-                warning("Expected an identifier and instead saw '{a}'.",
-                    nexttoken, e);
-            } else {
-                addlabel(e, 'exception');
-            }
-            advance();
-            advance(')');
-            block(false);
-            b = true;
-            scope = s;
-        }
-        if (nexttoken.id === 'finally') {
-            advance('finally');
-            block(false);
-            return;
-        } else if (!b) {
-            error("Expected '{a}' and instead saw '{b}'.",
-                    nexttoken, 'catch', nexttoken.value);
-        }
-        return this;
-    });
-
-    blockstmt('while', function () {
-        var t = nexttoken;
-        funct['(breakage)'] += 1;
-        funct['(loopage)'] += 1;
-        advance('(');
-        nonadjacent(this, t);
-        nospace();
-        expression(20);
-        if (nexttoken.id === '=') {
-            if (!option.boss)
-                warning("Expected a conditional expression and instead saw an assignment.");
-            advance('=');
-            expression(20);
-        }
-        advance(')', t);
-        nospace(prevtoken, token);
-        block(true, true);
-        funct['(breakage)'] -= 1;
-        funct['(loopage)'] -= 1;
-        return this;
-    }).labelled = true;
-
-    blockstmt('with', function () {
-        var t = nexttoken;
-        if (directive['use strict']) {
-            error("'with' is not allowed in strict mode.", token);
-        } else if (!option.withstmt) {
-            warning("Don't use 'with'.", token);
-        }
-
-        advance('(');
-        nonadjacent(this, t);
-        nospace();
-        expression(0);
-        advance(')', t);
-        nospace(prevtoken, token);
-        block(true, true);
-
-        return this;
-    });
-
-    blockstmt('switch', function () {
-        var t = nexttoken,
-            g = false;
-        funct['(breakage)'] += 1;
-        advance('(');
-        nonadjacent(this, t);
-        nospace();
-        this.condition = expression(20);
-        advance(')', t);
-        nospace(prevtoken, token);
-        nonadjacent(token, nexttoken);
-        t = nexttoken;
-        advance('{');
-        nonadjacent(token, nexttoken);
-        indent += option.indent;
-        this.cases = [];
-        for (;;) {
-            switch (nexttoken.id) {
-            case 'case':
-                switch (funct['(verb)']) {
-                case 'break':
-                case 'case':
-                case 'continue':
-                case 'return':
-                case 'switch':
-                case 'throw':
-                    break;
-                default:
-                    // You can tell JSHint that you don't use break intentionally by
-                    // adding a comment /* falls through */ on a line just before
-                    // the next `case`.
-                    if (!ft.test(lines[nexttoken.line - 2])) {
-                        warning(
-                            "Expected a 'break' statement before 'case'.",
-                            token);
-                    }
-                }
-                indentation(-option.indent);
-                advance('case');
-                this.cases.push(expression(20));
-                g = true;
-                advance(':');
-                funct['(verb)'] = 'case';
-                break;
-            case 'default':
-                switch (funct['(verb)']) {
-                case 'break':
-                case 'continue':
-                case 'return':
-                case 'throw':
-                    break;
-                default:
-                    if (!ft.test(lines[nexttoken.line - 2])) {
-                        warning(
-                            "Expected a 'break' statement before 'default'.",
-                            token);
-                    }
-                }
-                indentation(-option.indent);
-                advance('default');
-                g = true;
-                advance(':');
-                break;
-            case '}':
-                indent -= option.indent;
-                indentation();
-                advance('}', t);
-                if (this.cases.length === 1 || this.condition.id === 'true' ||
-                        this.condition.id === 'false') {
-                    if (!option.onecase)
-                        warning("This 'switch' should be an 'if'.", this);
-                }
-                funct['(breakage)'] -= 1;
-                funct['(verb)'] = undefined;
-                return;
-            case '(end)':
-                error("Missing '{a}'.", nexttoken, '}');
-                return;
-            default:
-                if (g) {
-                    switch (token.id) {
-                    case ',':
-                        error("Each value should have its own case label.");
-                        return;
-                    case ':':
-                        g = false;
-                        statements();
-                        break;
-                    default:
-                        error("Missing ':' on a case clause.", token);
-                        return;
-                    }
-                } else {
-                    if (token.id === ':') {
-                        advance(':');
-                        error("Unexpected '{a}'.", token, ':');
-                        statements();
-                    } else {
-                        error("Expected '{a}' and instead saw '{b}'.",
-                            nexttoken, 'case', nexttoken.value);
-                        return;
-                    }
-                }
-            }
-        }
-    }).labelled = true;
-
-    stmt('debugger', function () {
-        if (!option.debug) {
-            warning("All 'debugger' statements should be removed.");
-        }
-        return this;
-    }).exps = true;
-
-    (function () {
-        var x = stmt('do', function () {
-            funct['(breakage)'] += 1;
-            funct['(loopage)'] += 1;
-            this.first = block(true);
-            advance('while');
-            var t = nexttoken;
-            nonadjacent(token, t);
-            advance('(');
-            nospace();
-            expression(20);
-            if (nexttoken.id === '=') {
-                if (!option.boss)
-                    warning("Expected a conditional expression and instead saw an assignment.");
-                advance('=');
-                expression(20);
-            }
-            advance(')', t);
-            nospace(prevtoken, token);
-            funct['(breakage)'] -= 1;
-            funct['(loopage)'] -= 1;
-            return this;
-        });
-        x.labelled = true;
-        x.exps = true;
-    }());
-
-    blockstmt('for', function () {
-        var s, t = nexttoken;
-        funct['(breakage)'] += 1;
-        funct['(loopage)'] += 1;
-        advance('(');
-        nonadjacent(this, t);
-        nospace();
-        if (peek(nexttoken.id === 'var' ? 1 : 0).id === 'in') {
-            if (nexttoken.id === 'var') {
-                advance('var');
-                varstatement.fud.call(varstatement, true);
-            } else {
-                switch (funct[nexttoken.value]) {
-                case 'unused':
-                    funct[nexttoken.value] = 'var';
-                    break;
-                case 'var':
-                    break;
-                default:
-                    warning("Bad for in variable '{a}'.",
-                            nexttoken, nexttoken.value);
-                }
-                advance();
-            }
-            advance('in');
-            expression(20);
-            advance(')', t);
-            s = block(true, true);
-            if (option.forin && s && (s.length > 1 || typeof s[0] !== 'object' ||
-                    s[0].value !== 'if')) {
-                warning("The body of a for in should be wrapped in an if statement to filter " +
-                        "unwanted properties from the prototype.", this);
-            }
-            funct['(breakage)'] -= 1;
-            funct['(loopage)'] -= 1;
-            return this;
-        } else {
-            if (nexttoken.id !== ';') {
-                if (nexttoken.id === 'var') {
-                    advance('var');
-                    varstatement.fud.call(varstatement);
-                } else {
-                    for (;;) {
-                        expression(0, 'for');
-                        if (nexttoken.id !== ',') {
-                            break;
-                        }
-                        comma();
-                    }
-                }
-            }
-            nolinebreak(token);
-            advance(';');
-            if (nexttoken.id !== ';') {
-                expression(20);
-                if (nexttoken.id === '=') {
-                    if (!option.boss)
-                        warning("Expected a conditional expression and instead saw an assignment.");
-                    advance('=');
-                    expression(20);
-                }
-            }
-            nolinebreak(token);
-            advance(';');
-            if (nexttoken.id === ';') {
-                error("Expected '{a}' and instead saw '{b}'.",
-                        nexttoken, ')', ';');
-            }
-            if (nexttoken.id !== ')') {
-                for (;;) {
-                    expression(0, 'for');
-                    if (nexttoken.id !== ',') {
-                        break;
-                    }
-                    comma();
-                }
-            }
-            advance(')', t);
-            nospace(prevtoken, token);
-            block(true, true);
-            funct['(breakage)'] -= 1;
-            funct['(loopage)'] -= 1;
-            return this;
-        }
-    }).labelled = true;
-
-
-    stmt('break', function () {
-        var v = nexttoken.value;
-
-        if (funct['(breakage)'] === 0)
-            warning("Unexpected '{a}'.", nexttoken, this.value);
-
-        if (!option.asi)
-            nolinebreak(this);
-
-        if (nexttoken.id !== ';') {
-            if (token.line === nexttoken.line) {
-                if (funct[v] !== 'label') {
-                    warning("'{a}' is not a statement label.", nexttoken, v);
-                } else if (scope[v] !== funct) {
-                    warning("'{a}' is out of scope.", nexttoken, v);
-                }
-                this.first = nexttoken;
-                advance();
-            }
-        }
-        reachable('break');
-        return this;
-    }).exps = true;
-
-
-    stmt('continue', function () {
-        var v = nexttoken.value;
-
-        if (funct['(breakage)'] === 0)
-            warning("Unexpected '{a}'.", nexttoken, this.value);
-
-        if (!option.asi)
-            nolinebreak(this);
-
-        if (nexttoken.id !== ';') {
-            if (token.line === nexttoken.line) {
-                if (funct[v] !== 'label') {
-                    warning("'{a}' is not a statement label.", nexttoken, v);
-                } else if (scope[v] !== funct) {
-                    warning("'{a}' is out of scope.", nexttoken, v);
-                }
-                this.first = nexttoken;
-                advance();
-            }
-        } else if (!funct['(loopage)']) {
-            warning("Unexpected '{a}'.", nexttoken, this.value);
-        }
-        reachable('continue');
-        return this;
-    }).exps = true;
-
-
-    stmt('return', function () {
-        if (this.line === nexttoken.line) {
-            if (nexttoken.id === '(regexp)')
-                warning("Wrap the /regexp/ literal in parens to disambiguate the slash operator.");
-
-            if (nexttoken.id !== ';' && !nexttoken.reach) {
-                nonadjacent(token, nexttoken);
-                if (peek().value === "=" && !option.boss) {
-                    warningAt("Did you mean to return a conditional instead of an assignment?",
-                              token.line, token.character + 1);
-                }
-                this.first = expression(0);
-            }
-        } else if (!option.asi) {
-            nolinebreak(this); // always warn (Line breaking error)
-        }
-        reachable('return');
-        return this;
-    }).exps = true;
-
-
-    stmt('throw', function () {
-        nolinebreak(this);
-        nonadjacent(token, nexttoken);
-        this.first = expression(20);
-        reachable('throw');
-        return this;
-    }).exps = true;
-
-//  Superfluous reserved words
-
-    reserve('class');
-    reserve('const');
-    reserve('enum');
-    reserve('export');
-    reserve('extends');
-    reserve('import');
-    reserve('super');
-
-    reserve('let');
-    reserve('yield');
-    reserve('implements');
-    reserve('interface');
-    reserve('package');
-    reserve('private');
-    reserve('protected');
-    reserve('public');
-    reserve('static');
-
-
-// Parse JSON
-
-    function jsonValue() {
-
-        function jsonObject() {
-            var o = {}, t = nexttoken;
-            advance('{');
-            if (nexttoken.id !== '}') {
-                for (;;) {
-                    if (nexttoken.id === '(end)') {
-                        error("Missing '}' to match '{' from line {a}.",
-                                nexttoken, t.line);
-                    } else if (nexttoken.id === '}') {
-                        warning("Unexpected comma.", token);
-                        break;
-                    } else if (nexttoken.id === ',') {
-                        error("Unexpected comma.", nexttoken);
-                    } else if (nexttoken.id !== '(string)') {
-                        warning("Expected a string and instead saw {a}.",
-                                nexttoken, nexttoken.value);
-                    }
-                    if (o[nexttoken.value] === true) {
-                        warning("Duplicate key '{a}'.",
-                                nexttoken, nexttoken.value);
-                    } else if ((nexttoken.value === '__proto__' &&
-                        !option.proto) || (nexttoken.value === '__iterator__' &&
-                        !option.iterator)) {
-                        warning("The '{a}' key may produce unexpected results.",
-                            nexttoken, nexttoken.value);
-                    } else {
-                        o[nexttoken.value] = true;
-                    }
-                    advance();
-                    advance(':');
-                    jsonValue();
-                    if (nexttoken.id !== ',') {
-                        break;
-                    }
-                    advance(',');
-                }
-            }
-            advance('}');
-        }
-
-        function jsonArray() {
-            var t = nexttoken;
-            advance('[');
-            if (nexttoken.id !== ']') {
-                for (;;) {
-                    if (nexttoken.id === '(end)') {
-                        error("Missing ']' to match '[' from line {a}.",
-                                nexttoken, t.line);
-                    } else if (nexttoken.id === ']') {
-                        warning("Unexpected comma.", token);
-                        break;
-                    } else if (nexttoken.id === ',') {
-                        error("Unexpected comma.", nexttoken);
-                    }
-                    jsonValue();
-                    if (nexttoken.id !== ',') {
-                        break;
-                    }
-                    advance(',');
-                }
-            }
-            advance(']');
-        }
-
-        switch (nexttoken.id) {
-        case '{':
-            jsonObject();
-            break;
-        case '[':
-            jsonArray();
-            break;
-        case 'true':
-        case 'false':
-        case 'null':
-        case '(number)':
-        case '(string)':
-            advance();
-            break;
-        case '-':
-            advance('-');
-            if (token.character !== nexttoken.from) {
-                warning("Unexpected space after '-'.", token);
-            }
-            adjacent(token, nexttoken);
-            advance('(number)');
-            break;
-        default:
-            error("Expected a JSON value.", nexttoken);
-        }
-    }
-
-
-// The actual JSHINT function itself.
-
-    var itself = function (s, o, g) {
-        var a, i, k;
-        JSHINT.errors = [];
-        JSHINT.undefs = [];
-        predefined = Object.create(standard);
-        combine(predefined, g || {});
-        if (o) {
-            a = o.predef;
-            if (a) {
-                if (Array.isArray(a)) {
-                    for (i = 0; i < a.length; i += 1) {
-                        predefined[a[i]] = true;
-                    }
-                } else if (typeof a === 'object') {
-                    k = Object.keys(a);
-                    for (i = 0; i < k.length; i += 1) {
-                        predefined[k[i]] = !!a[k[i]];
-                    }
-                }
-            }
-            option = o;
-        } else {
-            option = {};
-        }
-        option.indent = option.indent || 4;
-        option.maxerr = option.maxerr || 50;
-
-        tab = '';
-        for (i = 0; i < option.indent; i += 1) {
-            tab += ' ';
-        }
-        indent = 1;
-        global = Object.create(predefined);
-        scope = global;
-        funct = {
-            '(global)': true,
-            '(name)': '(global)',
-            '(scope)': scope,
-            '(breakage)': 0,
-            '(loopage)': 0
-        };
-        functions = [funct];
-        urls = [];
-        stack = null;
-        member = {};
-        membersOnly = null;
-        implied = {};
-        inblock = false;
-        lookahead = [];
-        jsonmode = false;
-        warnings = 0;
-        lex.init(s);
-        prereg = true;
-        directive = {};
-
-        prevtoken = token = nexttoken = syntax['(begin)'];
-
-        // Check options
-        for (var name in o) {
-            if (is_own(o, name)) {
-                checkOption(name, token);
-            }
-        }
-
-        assume();
-
-        // combine the passed globals after we've assumed all our options
-        combine(predefined, g || {});
-
-        //reset values
-        comma.first = true;
-
-        try {
-            advance();
-            switch (nexttoken.id) {
-            case '{':
-            case '[':
-                option.laxbreak = true;
-                jsonmode = true;
-                jsonValue();
-                break;
-            default:
-                directives();
-                if (directive["use strict"] && !option.globalstrict) {
-                    warning("Use the function form of \"use strict\".", prevtoken);
-                }
-
-                statements();
-            }
-            advance('(end)');
-
-            var markDefined = function (name, context) {
-                do {
-                    if (typeof context[name] === 'string') {
-                        // JSHINT marks unused variables as 'unused' and
-                        // unused function declaration as 'unction'. This
-                        // code changes such instances back 'var' and
-                        // 'closure' so that the code in JSHINT.data()
-                        // doesn't think they're unused.
-
-                        if (context[name] === 'unused')
-                            context[name] = 'var';
-                        else if (context[name] === 'unction')
-                            context[name] = 'closure';
-
-                        return true;
-                    }
-
-                    context = context['(context)'];
-                } while (context);
-
-                return false;
-            };
-
-            var clearImplied = function (name, line) {
-                if (!implied[name])
-                    return;
-
-                var newImplied = [];
-                for (var i = 0; i < implied[name].length; i += 1) {
-                    if (implied[name][i] !== line)
-                        newImplied.push(implied[name][i]);
-                }
-
-                if (newImplied.length === 0)
-                    delete implied[name];
-                else
-                    implied[name] = newImplied;
-            };
-
-            // Check queued 'x is not defined' instances to see if they're still undefined.
-            for (i = 0; i < JSHINT.undefs.length; i += 1) {
-                k = JSHINT.undefs[i].slice(0);
-
-                if (markDefined(k[2].value, k[0])) {
-                    clearImplied(k[2].value, k[2].line);
-                } else {
-                    warning.apply(warning, k.slice(1));
-                }
-            }
-        } catch (e) {
-            if (e) {
-                var nt = nexttoken || {};
-                JSHINT.errors.push({
-                    raw       : e.raw,
-                    reason    : e.message,
-                    line      : e.line || nt.line,
-                    character : e.character || nt.from
-                }, null);
-            }
-        }
-
-        return JSHINT.errors.length === 0;
-    };
-
-    // Data summary.
-    itself.data = function () {
-
-        var data = { functions: [], options: option }, fu, globals, implieds = [], f, i, j,
-            members = [], n, unused = [], v;
-        if (itself.errors.length) {
-            data.errors = itself.errors;
-        }
-
-        if (jsonmode) {
-            data.json = true;
-        }
-
-        for (n in implied) {
-            if (is_own(implied, n)) {
-                implieds.push({
-                    name: n,
-                    line: implied[n]
-                });
-            }
-        }
-        if (implieds.length > 0) {
-            data.implieds = implieds;
-        }
-
-        if (urls.length > 0) {
-            data.urls = urls;
-        }
-
-        globals = Object.keys(scope);
-        if (globals.length > 0) {
-            data.globals = globals;
-        }
-        for (i = 1; i < functions.length; i += 1) {
-            f = functions[i];
-            fu = {};
-            for (j = 0; j < functionicity.length; j += 1) {
-                fu[functionicity[j]] = [];
-            }
-            for (n in f) {
-                if (is_own(f, n) && n.charAt(0) !== '(') {
-                    v = f[n];
-                    if (v === 'unction') {
-                        v = 'unused';
-                    }
-                    if (Array.isArray(fu[v])) {
-                        fu[v].push(n);
-                        if (v === 'unused') {
-                            unused.push({
-                                name: n,
-                                line: f['(line)'],
-                                'function': f['(name)']
-                            });
-                        }
-                    }
-                }
-            }
-            for (j = 0; j < functionicity.length; j += 1) {
-                if (fu[functionicity[j]].length === 0) {
-                    delete fu[functionicity[j]];
-                }
-            }
-            fu.name = f['(name)'];
-            fu.param = f['(params)'];
-            fu.line = f['(line)'];
-            fu.last = f['(last)'];
-            data.functions.push(fu);
-        }
-
-        if (unused.length > 0) {
-            data.unused = unused;
-        }
-
-        members = [];
-        for (n in member) {
-            if (typeof member[n] === 'number') {
-                data.member = member;
-                break;
-            }
-        }
-
-        return data;
-    };
-
-    itself.report = function (option) {
-        var data = itself.data();
-
-        var a = [], c, e, err, f, i, k, l, m = '', n, o = [], s;
-
-        function detail(h, array) {
-            var b, i, singularity;
-            if (array) {
-                o.push('<div><i>' + h + '</i> ');
-                array = array.sort();
-                for (i = 0; i < array.length; i += 1) {
-                    if (array[i] !== singularity) {
-                        singularity = array[i];
-                        o.push((b ? ', ' : '') + singularity);
-                        b = true;
-                    }
-                }
-                o.push('</div>');
-            }
-        }
-
-
-        if (data.errors || data.implieds || data.unused) {
-            err = true;
-            o.push('<div id=errors><i>Error:</i>');
-            if (data.errors) {
-                for (i = 0; i < data.errors.length; i += 1) {
-                    c = data.errors[i];
-                    if (c) {
-                        e = c.evidence || '';
-                        o.push('<p>Problem' + (isFinite(c.line) ? ' at line ' +
-                                c.line + ' character ' + c.character : '') +
-                                ': ' + c.reason.entityify() +
-                                '</p><p class=evidence>' +
-                                (e && (e.length > 80 ? e.slice(0, 77) + '...' :
-                                e).entityify()) + '</p>');
-                    }
-                }
-            }
-
-            if (data.implieds) {
-                s = [];
-                for (i = 0; i < data.implieds.length; i += 1) {
-                    s[i] = '<code>' + data.implieds[i].name + '</code>&nbsp;<i>' +
-                        data.implieds[i].line + '</i>';
-                }
-                o.push('<p><i>Implied global:</i> ' + s.join(', ') + '</p>');
-            }
-
-            if (data.unused) {
-                s = [];
-                for (i = 0; i < data.unused.length; i += 1) {
-                    s[i] = '<code><u>' + data.unused[i].name + '</u></code>&nbsp;<i>' +
-                        data.unused[i].line + '</i> <code>' +
-                        data.unused[i]['function'] + '</code>';
-                }
-                o.push('<p><i>Unused variable:</i> ' + s.join(', ') + '</p>');
-            }
-            if (data.json) {
-                o.push('<p>JSON: bad.</p>');
-            }
-            o.push('</div>');
-        }
-
-        if (!option) {
-
-            o.push('<br><div id=functions>');
-
-            if (data.urls) {
-                detail("URLs<br>", data.urls, '<br>');
-            }
-
-            if (data.json && !err) {
-                o.push('<p>JSON: good.</p>');
-            } else if (data.globals) {
-                o.push('<div><i>Global</i> ' +
-                        data.globals.sort().join(', ') + '</div>');
-            } else {
-                o.push('<div><i>No new global variables introduced.</i></div>');
-            }
-
-            for (i = 0; i < data.functions.length; i += 1) {
-                f = data.functions[i];
-
-                o.push('<br><div class=function><i>' + f.line + '-' +
-                        f.last + '</i> ' + (f.name || '') + '(' +
-                        (f.param ? f.param.join(', ') : '') + ')</div>');
-                detail('<big><b>Unused</b></big>', f.unused);
-                detail('Closure', f.closure);
-                detail('Variable', f['var']);
-                detail('Exception', f.exception);
-                detail('Outer', f.outer);
-                detail('Global', f.global);
-                detail('Label', f.label);
-            }
-
-            if (data.member) {
-                a = Object.keys(data.member);
-                if (a.length) {
-                    a = a.sort();
-                    m = '<br><pre id=members>/*members ';
-                    l = 10;
-                    for (i = 0; i < a.length; i += 1) {
-                        k = a[i];
-                        n = k.name();
-                        if (l + n.length > 72) {
-                            o.push(m + '<br>');
-                            m = '    ';
-                            l = 1;
-                        }
-                        l += n.length + 2;
-                        if (data.member[k] === 1) {
-                            n = '<i>' + n + '</i>';
-                        }
-                        if (i < a.length - 1) {
-                            n += ', ';
-                        }
-                        m += n;
-                    }
-                    o.push(m + '<br>*/</pre>');
-                }
-                o.push('</div>');
-            }
-        }
-        return o.join('');
-    };
-
-    itself.jshint = itself;
-
-    return itself;
-}());
-
-// Make JSHINT a Node module, if possible.
-if (typeof exports === 'object' && exports)
-    exports.JSHINT = JSHINT;
-
-});/* -*- Mode: JS; tab-width: 4; indent-tabs-mode: nil; -*-
- * vim: set sw=4 ts=4 et tw=78:
- * ***** 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 Narcissus JavaScript engine.
- *
- * The Initial Developer of the Original Code is
- * Brendan Eich <brendan@mozilla.org>.
- * Portions created by the Initial Developer are Copyright (C) 2004
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Tom Austin <taustin@ucsc.edu>
- *   Brendan Eich <brendan@mozilla.org>
- *   Shu-Yu Guo <shu@rfrn.org>
- *   Dave Herman <dherman@mozilla.com>
- *   Dimitris Vardoulakis <dimvar@ccs.neu.edu>
- *   Patrick Walton <pcwalton@mozilla.com>
- *
- * 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 ***** */
-
-/*
- * Narcissus - JS implemented in JS.
- *
- * Parser.
- */
-
-define('ace/narcissus/parser', ['require', 'exports', 'module' , 'ace/narcissus/lexer', 'ace/narcissus/definitions', 'ace/narcissus/options'], function(require, exports, module) {
-
-var lexer = require('./lexer');
-var definitions = require('./definitions');
-var options = require('./options');
-var Tokenizer = lexer.Tokenizer;
-
-var Dict = definitions.Dict;
-var Stack = definitions.Stack;
-
-// Set constants in the local scope.
-eval(definitions.consts);
-
-/*
- * pushDestructuringVarDecls :: (node, hoisting node) -> void
- *
- * Recursively add all destructured declarations to varDecls.
- */
-function pushDestructuringVarDecls(n, s) {
-    for (var i in n) {
-        var sub = n[i];
-        if (sub.type === IDENTIFIER) {
-            s.varDecls.push(sub);
-        } else {
-            pushDestructuringVarDecls(sub, s);
-        }
-    }
-}
-
-function Parser(tokenizer) {
-    tokenizer.parser = this;
-    this.t = tokenizer;
-    this.x = null;
-    this.unexpectedEOF = false;
-    options.mozillaMode && (this.mozillaMode = true);
-    options.parenFreeMode && (this.parenFreeMode = true);
-}
-
-function StaticContext(parentScript, parentBlock, inModule, inFunction, strictMode) {
-    this.parentScript = parentScript;
-    this.parentBlock = parentBlock || parentScript;
-    this.inModule = inModule || false;
-    this.inFunction = inFunction || false;
-    this.inForLoopInit = false;
-    this.topLevel = true;
-    this.allLabels = new Stack();
-    this.currentLabels = new Stack();
-    this.labeledTargets = new Stack();
-    this.defaultLoopTarget = null;
-    this.defaultTarget = null;
-    this.strictMode = strictMode;
-}
-
-StaticContext.prototype = {
-    // non-destructive update via prototype extension
-    update: function(ext) {
-        var desc = {};
-        for (var key in ext) {
-            desc[key] = {
-                value: ext[key],
-                writable: true,
-                enumerable: true,
-                configurable: true
-            }
-        }
-        return Object.create(this, desc);
-    },
-    pushLabel: function(label) {
-        return this.update({ currentLabels: this.currentLabels.push(label),
-                             allLabels: this.allLabels.push(label) });
-    },
-    pushTarget: function(target) {
-        var isDefaultLoopTarget = target.isLoop;
-        var isDefaultTarget = isDefaultLoopTarget || target.type === SWITCH;
-
-        if (this.currentLabels.isEmpty()) {
-            if (isDefaultLoopTarget) this.update({ defaultLoopTarget: target });
-            if (isDefaultTarget) this.update({ defaultTarget: target });
-            return this;
-        }
-
-        target.labels = new Dict();
-        this.currentLabels.forEach(function(label) {
-            target.labels.set(label, true);
-        });
-        return this.update({ currentLabels: new Stack(),
-                             labeledTargets: this.labeledTargets.push(target),
-                             defaultLoopTarget: isDefaultLoopTarget
-                             ? target
-                             : this.defaultLoopTarget,
-                             defaultTarget: isDefaultTarget
-                             ? target
-                             : this.defaultTarget });
-    },
-    nest: function() {
-        return this.topLevel ? this.update({ topLevel: false }) : this;
-    },
-    canImport: function() {
-        return this.topLevel && !this.inFunction;
-    },
-    canExport: function() {
-        return this.inModule && this.topLevel && !this.inFunction;
-    },
-    banWith: function() {
-        return this.strictMode || this.inModule;
-    },
-    modulesAllowed: function() {
-        return this.topLevel && !this.inFunction;
-    }
-};
-
-var Pp = Parser.prototype;
-
-Pp.mozillaMode = false;
-
-Pp.parenFreeMode = false;
-
-Pp.withContext = function(x, f) {
-    var x0 = this.x;
-    this.x = x;
-    var result = f.call(this);
-    // NB: we don't bother with finally, since exceptions trash the parser
-    this.x = x0;
-    return result;
-};
-
-Pp.newNode = function newNode(opts) {
-    return new Node(this.t, opts);
-};
-
-Pp.fail = function fail(msg) {
-    throw this.t.newSyntaxError(msg);
-};
-
-Pp.match = function match(tt, scanOperand, keywordIsName) {
-    return this.t.match(tt, scanOperand, keywordIsName);
-};
-
-Pp.mustMatch = function mustMatch(tt, keywordIsName) {
-    return this.t.mustMatch(tt, keywordIsName);
-};
-
-Pp.peek = function peek(scanOperand) {
-    return this.t.peek(scanOperand);
-};
-
-Pp.peekOnSameLine = function peekOnSameLine(scanOperand) {
-    return this.t.peekOnSameLine(scanOperand);
-};
-
-Pp.done = function done() {
-    return this.t.done;
-};
-
-/*
- * Script :: (boolean, boolean, boolean) -> node
- *
- * Parses the toplevel and module/function bodies.
- */
-Pp.Script = function Script(inModule, inFunction, expectEnd) {
-    var node = this.newNode(scriptInit());
-    var x2 = new StaticContext(node, node, inModule, inFunction);
-    this.withContext(x2, function() {
-        this.Statements(node, true);
-    });
-    if (expectEnd && !this.done())
-        this.fail("expected end of input");
-    return node;
-};
-
-/*
- * Pragma :: (expression statement node) -> boolean
- *
- * Checks whether a node is a pragma and annotates it.
- */
-function Pragma(n) {
-    if (n.type === SEMICOLON) {
-        var e = n.expression;
-        if (e.type === STRING && e.value === "use strict") {
-            n.pragma = "strict";
-            return true;
-        }
-    }
-    return false;
-}
-
-/*
- * Node :: (tokenizer, optional init object) -> node
- */
-function Node(t, init) {
-    var token = t.token;
-    if (token) {
-        // If init.type exists it will override token.type.
-        this.type = token.type;
-        this.value = token.value;
-        this.lineno = token.lineno;
-
-        // Start and end are file positions for error handling.
-        this.start = token.start;
-        this.end = token.end;
-    } else {
-        this.lineno = t.lineno;
-    }
-
-    this.filename = t.filename;
-    this.children = [];
-
-    for (var prop in init)
-        this[prop] = init[prop];
-}
-
-/*
- * SyntheticNode :: (optional init object) -> node
- */
-function SyntheticNode(init) {
-    this.children = [];
-    for (var prop in init)
-        this[prop] = init[prop];
-    this.synthetic = true;
-}
-
-var Np = Node.prototype = SyntheticNode.prototype = {};
-Np.constructor = Node;
-
-var TO_SOURCE_SKIP = {
-    type: true,
-    value: true,
-    lineno: true,
-    start: true,
-    end: true,
-    tokenizer: true,
-    assignOp: true
-};
-function unevalableConst(code) {
-    var token = definitions.tokens[code];
-    var constName = definitions.opTypeNames.hasOwnProperty(token)
-        ? definitions.opTypeNames[token]
-        : token in definitions.keywords
-        ? token.toUpperCase()
-        : token;
-    return { toSource: function() { return constName } };
-}
-Np.toSource = function toSource() {
-    var mock = {};
-    var self = this;
-    mock.type = unevalableConst(this.type);
-    // avoid infinite recursion in case of back-links
-    if (this.generatingSource)
-        return mock.toSource();
-    this.generatingSource = true;
-    if ("value" in this)
-        mock.value = this.value;
-    if ("lineno" in this)
-        mock.lineno = this.lineno;
-    if ("start" in this)
-        mock.start = this.start;
-    if ("end" in this)
-        mock.end = this.end;
-    if (this.assignOp)
-        mock.assignOp = unevalableConst(this.assignOp);
-    for (var key in this) {
-        if (this.hasOwnProperty(key) && !(key in TO_SOURCE_SKIP))
-            mock[key] = this[key];
-    }
-    try {
-        return mock.toSource();
-    } finally {
-        delete this.generatingSource;
-    }
-};
-
-// Always use push to add operands to an expression, to update start and end.
-Np.push = function (kid) {
-    // kid can be null e.g. [1, , 2].
-    if (kid !== null) {
-        if (kid.start < this.start)
-            this.start = kid.start;
-        if (this.end < kid.end)
-            this.end = kid.end;
-    }
-    return this.children.push(kid);
-}
-
-Node.indentLevel = 0;
-
-function tokenString(tt) {
-    var t = definitions.tokens[tt];
-    return /^\W/.test(t) ? definitions.opTypeNames[t] : t.toUpperCase();
-}
-
-Np.toString = function () {
-    var a = [];
-    for (var i in this) {
-        if (this.hasOwnProperty(i) && i !== 'type' && i !== 'target')
-            a.push({id: i, value: this[i]});
-    }
-    a.sort(function (a,b) { return (a.id < b.id) ? -1 : 1; });
-    var INDENTATION = "    ";
-    var n = ++Node.indentLevel;
-    var s = "{\n" + INDENTATION.repeat(n) + "type: " + tokenString(this.type);
-    for (i = 0; i < a.length; i++)
-        s += ",\n" + INDENTATION.repeat(n) + a[i].id + ": " + a[i].value;
-    n = --Node.indentLevel;
-    s += "\n" + INDENTATION.repeat(n) + "}";
-    return s;
-}
-
-Np.synth = function(init) {
-    var node = new SyntheticNode(init);
-    node.filename = this.filename;
-    node.lineno = this.lineno;
-    node.start = this.start;
-    node.end = this.end;
-    return node;
-};
-
-/*
- * Helper init objects for common nodes.
- */
-
-var LOOP_INIT = { isLoop: true };
-
-function blockInit() {
-    return { type: BLOCK, varDecls: [] };
-}
-
-function scriptInit() {
-    return { type: SCRIPT,
-             funDecls: [],
-             varDecls: [],
-             modDefns: new Dict(),
-             modAssns: new Dict(),
-             modDecls: new Dict(),
-             modLoads: new Dict(),
-             impDecls: [],
-             expDecls: [],
-             exports: new Dict(),
-             hasEmptyReturn: false,
-             hasReturnWithValue: false,
-             hasYield: false };
-}
-
-definitions.defineGetter(Np, "length",
-                         function() {
-                             throw new Error("Node.prototype.length is gone; " +
-                                             "use n.children.length instead");
-                         });
-
-definitions.defineProperty(String.prototype, "repeat",
-                           function(n) {
-                               var s = "", t = this + s;
-                               while (--n >= 0)
-                                   s += t;
-                               return s;
-                           }, false, false, true);
-
-Pp.MaybeLeftParen = function MaybeLeftParen() {
-    if (this.parenFreeMode)
-        return this.match(LEFT_PAREN) ? LEFT_PAREN : END;
-    return this.mustMatch(LEFT_PAREN).type;
-};
-
-Pp.MaybeRightParen = function MaybeRightParen(p) {
-    if (p === LEFT_PAREN)
-        this.mustMatch(RIGHT_PAREN);
-}
-
-/*
- * Statements :: (node[, boolean]) -> void
- *
- * Parses a sequence of Statements.
- */
-Pp.Statements = function Statements(n, topLevel) {
-    var prologue = !!topLevel;
-    try {
-        while (!this.done() && this.peek(true) !== RIGHT_CURLY) {
-            var n2 = this.Statement();
-            n.push(n2);
-            if (prologue && Pragma(n2)) {
-                this.x.strictMode = true;
-                n.strict = true;
-            } else {
-                prologue = false;
-            }
-        }
-    } catch (e) {
-        try {
-            if (this.done())
-                this.unexpectedEOF = true;
-        } catch(e) {}
-        throw e;
-    }
-}
-
-Pp.Block = function Block() {
-    this.mustMatch(LEFT_CURLY);
-    var n = this.newNode(blockInit());
-    var x2 = this.x.update({ parentBlock: n }).pushTarget(n);
-    this.withContext(x2, function() {
-        this.Statements(n);
-    });
-    this.mustMatch(RIGHT_CURLY);
-    return n;
-}
-
-var DECLARED_FORM = 0, EXPRESSED_FORM = 1, STATEMENT_FORM = 2;
-
-/*
- * Export :: (binding node, boolean) -> Export
- *
- * Static semantic representation of a module export.
- */
-function Export(node, isDefinition) {
-    this.node = node;                 // the AST node declaring this individual export
-    this.isDefinition = isDefinition; // is the node an 'export'-annotated definition?
-    this.resolved = null;             // resolved pointer to the target of this export
-}
-
-/*
- * registerExport :: (Dict, EXPORT node) -> void
- */
-function registerExport(exports, decl) {
-    function register(name, exp) {
-        if (exports.has(name))
-            throw new SyntaxError("multiple exports of " + name);
-        exports.set(name, exp);
-    }
-
-    switch (decl.type) {
-      case MODULE:
-      case FUNCTION:
-        register(decl.name, new Export(decl, true));
-        break;
-
-      case VAR:
-        for (var i = 0; i < decl.children.length; i++)
-            register(decl.children[i].name, new Export(decl.children[i], true));
-        break;
-
-      case LET:
-      case CONST:
-        throw new Error("NYI: " + definitions.tokens[decl.type]);
-
-      case EXPORT:
-        for (var i = 0; i < decl.pathList.length; i++) {
-            var path = decl.pathList[i];
-            switch (path.type) {
-              case OBJECT_INIT:
-                for (var j = 0; j < path.children.length; j++) {
-                    // init :: IDENTIFIER | PROPERTY_INIT
-                    var init = path.children[j];
-                    if (init.type === IDENTIFIER)
-                        register(init.value, new Export(init, false));
-                    else
-                        register(init.children[0].value, new Export(init.children[1], false));
-                }
-                break;
-
-              case DOT:
-                register(path.children[1].value, new Export(path, false));
-                break;
-
-              case IDENTIFIER:
-                register(path.value, new Export(path, false));
-                break;
-
-              default:
-                throw new Error("unexpected export path: " + definitions.tokens[path.type]);
-            }
-        }
-        break;
-
-      default:
-        throw new Error("unexpected export decl: " + definitions.tokens[exp.type]);
-    }
-}
-
-/*
- * Module :: (node) -> Module
- *
- * Static semantic representation of a module.
- */
-function Module(node) {
-    var exports = node.body.exports;
-    var modDefns = node.body.modDefns;
-
-    var exportedModules = new Dict();
-
-    exports.forEach(function(name, exp) {
-        var node = exp.node;
-        if (node.type === MODULE) {
-            exportedModules.set(name, node);
-        } else if (!exp.isDefinition && node.type === IDENTIFIER && modDefns.has(node.value)) {
-            var mod = modDefns.get(node.value);
-            exportedModules.set(name, mod);
-        }
-    });
-
-    this.node = node;
-    this.exports = exports;
-    this.exportedModules = exportedModules;
-}
-
-/*
- * Statement :: () -> node
- *
- * Parses a Statement.
- */
-Pp.Statement = function Statement() {
-    var i, label, n, n2, p, c, ss, tt = this.t.get(true), tt2, x0, x2, x3;
-
-    var comments = this.t.blockComments;
-
-    // Cases for statements ending in a right curly return early, avoiding the
-    // common semicolon insertion magic after this switch.
-    switch (tt) {
-      case IMPORT:
-        if (!this.x.canImport())
-            this.fail("illegal context for import statement");
-        n = this.newNode();
-        n.pathList = this.ImportPathList();
-        this.x.parentScript.impDecls.push(n);
-        break;
-
-      case EXPORT:
-        if (!this.x.canExport())
-            this.fail("export statement not in module top level");
-        switch (this.peek()) {
-          case MODULE:
-          case FUNCTION:
-          case LET:
-          case VAR:
-          case CONST:
-            n = this.Statement();
-            n.blockComments = comments;
-            n.exported = true;
-            this.x.parentScript.expDecls.push(n);
-            registerExport(this.x.parentScript.exports, n);
-            return n;
-        }
-        n = this.newNode();
-        n.pathList = this.ExportPathList();
-        this.x.parentScript.expDecls.push(n);
-        registerExport(this.x.parentScript.exports, n);
-        break;
-
-      case FUNCTION:
-        // DECLARED_FORM extends funDecls of x, STATEMENT_FORM doesn't.
-        return this.FunctionDefinition(true, this.x.topLevel ? DECLARED_FORM : STATEMENT_FORM, comments);
-
-      case LEFT_CURLY:
-        n = this.newNode(blockInit());
-        x2 = this.x.update({ parentBlock: n }).pushTarget(n).nest();
-        this.withContext(x2, function() {
-            this.Statements(n);
-        });
-        this.mustMatch(RIGHT_CURLY);
-        return n;
-
-      case IF:
-        n = this.newNode();
-        n.condition = this.HeadExpression();
-        x2 = this.x.pushTarget(n).nest();
-        this.withContext(x2, function() {
-            n.thenPart = this.Statement();
-            n.elsePart = this.match(ELSE, true) ? this.Statement() : null;
-        });
-        return n;
-
-      case SWITCH:
-        // This allows CASEs after a DEFAULT, which is in the standard.
-        n = this.newNode({ cases: [], defaultIndex: -1 });
-        n.discriminant = this.HeadExpression();
-        x2 = this.x.pushTarget(n).nest();
-        this.withContext(x2, function() {
-            this.mustMatch(LEFT_CURLY);
-            while ((tt = this.t.get()) !== RIGHT_CURLY) {
-                switch (tt) {
-                  case DEFAULT:
-                    if (n.defaultIndex >= 0)
-                        this.fail("More than one switch default");
-                    // FALL THROUGH
-                  case CASE:
-                    n2 = this.newNode();
-                    if (tt === DEFAULT)
-                        n.defaultIndex = n.cases.length;
-                    else
-                        n2.caseLabel = this.Expression(COLON);
-                    break;
-
-                  default:
-                    this.fail("Invalid switch case");
-                }
-                this.mustMatch(COLON);
-                n2.statements = this.newNode(blockInit());
-                while ((tt=this.peek(true)) !== CASE && tt !== DEFAULT &&
-                       tt !== RIGHT_CURLY)
-                    n2.statements.push(this.Statement());
-                n.cases.push(n2);
-            }
-        });
-        return n;
-
-      case FOR:
-        n = this.newNode(LOOP_INIT);
-        n.blockComments = comments;
-        if (this.match(IDENTIFIER)) {
-            if (this.t.token.value === "each")
-                n.isEach = true;
-            else
-                this.t.unget();
-        }
-        if (!this.parenFreeMode)
-            this.mustMatch(LEFT_PAREN);
-        x2 = this.x.pushTarget(n).nest();
-        x3 = this.x.update({ inForLoopInit: true });
-        n2 = null;
-        if ((tt = this.peek(true)) !== SEMICOLON) {
-            this.withContext(x3, function() {
-                if (tt === VAR || tt === CONST) {
-                    this.t.get();
-                    n2 = this.Variables();
-                } else if (tt === LET) {
-                    this.t.get();
-                    if (this.peek() === LEFT_PAREN) {
-                        n2 = this.LetBlock(false);
-                    } else {
-                        // Let in for head, we need to add an implicit block
-                        // around the rest of the for.
-                        this.x.parentBlock = n;
-                        n.varDecls = [];
-                        n2 = this.Variables();
-                    }
-                } else {
-                    n2 = this.Expression();
-                }
-            });
-        }
-        if (n2 && this.match(IN)) {
-            n.type = FOR_IN;
-            this.withContext(x3, function() {
-                n.object = this.Expression();
-                if (n2.type === VAR || n2.type === LET) {
-                    c = n2.children;
-
-                    // Destructuring turns one decl into multiples, so either
-                    // there must be only one destructuring or only one
-                    // decl.
-                    if (c.length !== 1 && n2.destructurings.length !== 1) {
-                        // FIXME: this.fail ?
-                        throw new SyntaxError("Invalid for..in left-hand side",
-                                              this.filename, n2.lineno);
-                    }
-                    if (n2.destructurings.length > 0) {
-                        n.iterator = n2.destructurings[0];
-                    } else {
-                        n.iterator = c[0];
-                    }
-                    n.varDecl = n2;
-                } else {
-                    if (n2.type === ARRAY_INIT || n2.type === OBJECT_INIT) {
-                        n2.destructuredNames = this.checkDestructuring(n2);
-                    }
-                    n.iterator = n2;
-                }
-            });
-        } else {
-            x3.inForLoopInit = false;
-            n.setup = n2;
-            this.mustMatch(SEMICOLON);
-            if (n.isEach)
-                this.fail("Invalid for each..in loop");
-            this.withContext(x3, function() {
-                n.condition = (this.peek(true) === SEMICOLON)
-                    ? null
-                    : this.Expression();
-                this.mustMatch(SEMICOLON);
-                tt2 = this.peek(true);
-                n.update = (this.parenFreeMode
-                            ? tt2 === LEFT_CURLY || definitions.isStatementStartCode[tt2]
-                            : tt2 === RIGHT_PAREN)
-                    ? null
-                    : this.Expression();
-            });
-        }
-        if (!this.parenFreeMode)
-            this.mustMatch(RIGHT_PAREN);
-        this.withContext(x2, function() {
-            n.body = this.Statement();
-        });
-        return n;
-
-      case WHILE:
-        n = this.newNode({ isLoop: true });
-        n.blockComments = comments;
-        n.condition = this.HeadExpression();
-        x2 = this.x.pushTarget(n).nest();
-        this.withContext(x2, function() {
-            n.body = this.Statement();
-        });
-        return n;
-
-      case DO:
-        n = this.newNode({ isLoop: true });
-        n.blockComments = comments;
-        x2 = this.x.pushTarget(n).next();
-        this.withContext(x2, function() {
-            n.body = this.Statement();
-        });
-        this.mustMatch(WHILE);
-        n.condition = this.HeadExpression();
-        // <script language="JavaScript"> (without version hints) may need
-        // automatic semicolon insertion without a newline after do-while.
-        // See http://bugzilla.mozilla.org/show_bug.cgi?id=238945.
-        this.match(SEMICOLON);
-        return n;
-
-      case BREAK:
-      case CONTINUE:
-        n = this.newNode();
-        n.blockComments = comments;
-
-        // handle the |foo: break foo;| corner case
-        x2 = this.x.pushTarget(n);
-
-        if (this.peekOnSameLine() === IDENTIFIER) {
-            this.t.get();
-            n.label = this.t.token.value;
-        }
-
-        if (n.label) {
-            n.target = x2.labeledTargets.find(function(target) {
-                return target.labels.has(n.label)
-            });
-        } else if (tt === CONTINUE) {
-            n.target = x2.defaultLoopTarget;
-        } else {
-            n.target = x2.defaultTarget;
-        }
-
-        if (!n.target)
-            this.fail("Invalid " + ((tt === BREAK) ? "break" : "continue"));
-        if (!n.target.isLoop && tt === CONTINUE)
-            this.fail("Invalid continue");
-
-        break;
-
-      case TRY:
-        n = this.newNode({ catchClauses: [] });
-        n.blockComments = comments;
-        n.tryBlock = this.Block();
-        while (this.match(CATCH)) {
-            n2 = this.newNode();
-            p = this.MaybeLeftParen();
-            switch (this.t.get()) {
-              case LEFT_BRACKET:
-              case LEFT_CURLY:
-                // Destructured catch identifiers.
-                this.t.unget();
-                n2.varName = this.DestructuringExpression(true);
-                break;
-              case IDENTIFIER:
-                n2.varName = this.t.token.value;
-                break;
-              default:
-                this.fail("missing identifier in catch");
-                break;
-            }
-            if (this.match(IF)) {
-                if (!this.mozillaMode)
-                    this.fail("Illegal catch guard");
-                if (n.catchClauses.length && !n.catchClauses.top().guard)
-                    this.fail("Guarded catch after unguarded");
-                n2.guard = this.Expression();
-            }
-            this.MaybeRightParen(p);
-            n2.block = this.Block();
-            n.catchClauses.push(n2);
-        }
-        if (this.match(FINALLY))
-            n.finallyBlock = this.Block();
-        if (!n.catchClauses.length && !n.finallyBlock)
-            this.fail("Invalid try statement");
-        return n;
-
-      case CATCH:
-      case FINALLY:
-        this.fail(definitions.tokens[tt] + " without preceding try");
-
-      case THROW:
-        n = this.newNode();
-        n.exception = this.Expression();
-        break;
-
-      case RETURN:
-        n = this.ReturnOrYield();
-        break;
-
-      case WITH:
-        if (this.x.banWith())
-            this.fail("with statements not allowed in strict code or modules");
-        n = this.newNode();
-        n.blockComments = comments;
-        n.object = this.HeadExpression();
-        x2 = this.x.pushTarget(n).next();
-        this.withContext(x2, function() {
-            n.body = this.Statement();
-        });
-        return n;
-
-      case VAR:
-      case CONST:
-        n = this.Variables();
-        break;
-
-      case LET:
-        if (this.peek() === LEFT_PAREN) {
-            n = this.LetBlock(true);
-            return n;
-        }
-        n = this.Variables();
-        break;
-
-      case DEBUGGER:
-        n = this.newNode();
-        break;
-
-      case NEWLINE:
-      case SEMICOLON:
-        n = this.newNode({ type: SEMICOLON });
-        n.blockComments = comments;
-        n.expression = null;
-        return n;
-
-      case IDENTIFIER:
-      case USE:
-      case MODULE:
-        switch (this.t.token.value) {
-          case "use":
-            if (!isPragmaToken(this.peekOnSameLine())) {
-                this.t.unget();
-                break;
-            }
-            return this.newNode({ type: USE, params: this.Pragmas() });
-
-          case "module":
-            if (!this.x.modulesAllowed())
-                this.fail("module declaration not at top level");
-            this.x.parentScript.hasModules = true;
-            tt = this.peekOnSameLine();
-            if (tt !== IDENTIFIER && tt !== LEFT_CURLY) {
-                this.t.unget();
-                break;
-            }
-            n = this.newNode({ type: MODULE });
-            n.blockComments = comments;
-            this.mustMatch(IDENTIFIER);
-            label = this.t.token.value;
-
-            if (this.match(LEFT_CURLY)) {
-                n.name = label;
-                n.body = this.Script(true, false);
-                n.module = new Module(n);
-                this.mustMatch(RIGHT_CURLY);
-                this.x.parentScript.modDefns.set(n.name, n);
-                return n;
-            }
-
-            this.t.unget();
-            this.ModuleVariables(n);
-            return n;
-
-          default:
-            tt = this.peek();
-            // Labeled statement.
-            if (tt === COLON) {
-                label = this.t.token.value;
-                if (this.x.allLabels.has(label))
-                    this.fail("Duplicate label: " + label);
-                this.t.get();
-                n = this.newNode({ type: LABEL, label: label });
-                n.blockComments = comments;
-                x2 = this.x.pushLabel(label).nest();
-                this.withContext(x2, function() {
-                    n.statement = this.Statement();
-                });
-                n.target = (n.statement.type === LABEL) ? n.statement.target : n.statement;
-                return n;
-            }
-            // FALL THROUGH
-        }
-        // FALL THROUGH
-
-      default:
-        // Expression statement.
-        // We unget the current token to parse the expression as a whole.
-        n = this.newNode({ type: SEMICOLON });
-        this.t.unget();
-        n.blockComments = comments;
-        n.expression = this.Expression();
-        n.end = n.expression.end;
-        break;
-    }
-
-    n.blockComments = comments;
-    this.MagicalSemicolon();
-    return n;
-}
-
-/*
- * isPragmaToken :: (number) -> boolean
- */
-function isPragmaToken(tt) {
-    switch (tt) {
-      case IDENTIFIER:
-      case STRING:
-      case NUMBER:
-      case NULL:
-      case TRUE:
-      case FALSE:
-        return true;
-    }
-    return false;
-}
-
-/*
- * Pragmas :: () -> Array[Array[token]]
- */
-Pp.Pragmas = function Pragmas() {
-    var pragmas = [];
-    do {
-        pragmas.push(this.Pragma());
-    } while (this.match(COMMA));
-    this.MagicalSemicolon();
-    return pragmas;
-}
-
-/*
- * Pragmas :: () -> Array[token]
- */
-Pp.Pragma = function Pragma() {
-    var items = [];
-    var tt;
-    do {
-        tt = this.t.get(true);
-        items.push(this.t.token);
-    } while (isPragmaToken(this.peek()));
-    return items;
-}
-
-/*
- * MagicalSemicolon :: () -> void
- */
-Pp.MagicalSemicolon = function MagicalSemicolon() {
-    var tt;
-    if (this.t.lineno === this.t.token.lineno) {
-        tt = this.peekOnSameLine();
-        if (tt !== END && tt !== NEWLINE && tt !== SEMICOLON && tt !== RIGHT_CURLY)
-            this.fail("missing ; before statement");
-    }
-    this.match(SEMICOLON);
-}
-
-/*
- * ReturnOrYield :: () -> (RETURN | YIELD) node
- */
-Pp.ReturnOrYield = function ReturnOrYield() {
-    var n, b, tt = this.t.token.type, tt2;
-
-    var parentScript = this.x.parentScript;
-
-    if (tt === RETURN) {
-        if (!this.x.inFunction)
-            this.fail("Return not in function");
-    } else /* if (tt === YIELD) */ {
-        if (!this.x.inFunction)
-            this.fail("Yield not in function");
-        parentScript.hasYield = true;
-    }
-    n = this.newNode({ value: undefined });
-
-    tt2 = (tt === RETURN) ? this.peekOnSameLine(true) : this.peek(true);
-    if (tt2 !== END && tt2 !== NEWLINE &&
-        tt2 !== SEMICOLON && tt2 !== RIGHT_CURLY
-        && (tt !== YIELD ||
-            (tt2 !== tt && tt2 !== RIGHT_BRACKET && tt2 !== RIGHT_PAREN &&
-             tt2 !== COLON && tt2 !== COMMA))) {
-        if (tt === RETURN) {
-            n.value = this.Expression();
-            parentScript.hasReturnWithValue = true;
-        } else {
-            n.value = this.AssignExpression();
-        }
-    } else if (tt === RETURN) {
-        parentScript.hasEmptyReturn = true;
-    }
-
-    return n;
-}
-
-/*
- * ModuleExpression :: () -> (STRING | IDENTIFIER | DOT) node
- */
-Pp.ModuleExpression = function ModuleExpression() {
-    return this.match(STRING) ? this.newNode() : this.QualifiedPath();
-}
-
-/*
- * ImportPathList :: () -> Array[DOT node]
- */
-Pp.ImportPathList = function ImportPathList() {
-    var a = [];
-    do {
-        a.push(this.ImportPath());
-    } while (this.match(COMMA));
-    return a;
-}
-
-/*
- * ImportPath :: () -> DOT node
- */
-Pp.ImportPath = function ImportPath() {
-    var n = this.QualifiedPath();
-    if (!this.match(DOT)) {
-        if (n.type === IDENTIFIER)
-            this.fail("cannot import local variable");
-        return n;
-    }
-
-    var n2 = this.newNode();
-    n2.push(n);
-    n2.push(this.ImportSpecifierSet());
-    return n2;
-}
-
-/*
- * ExplicitSpecifierSet :: (() -> node) -> OBJECT_INIT node
- */
-Pp.ExplicitSpecifierSet = function ExplicitSpecifierSet(SpecifierRHS) {
-    var n, n2, id, tt;
-
-    n = this.newNode({ type: OBJECT_INIT });
-    this.mustMatch(LEFT_CURLY);
-
-    if (!this.match(RIGHT_CURLY)) {
-        do {
-            id = this.Identifier();
-            if (this.match(COLON)) {
-                n2 = this.newNode({ type: PROPERTY_INIT });
-                n2.push(id);
-                n2.push(SpecifierRHS());
-                n.push(n2);
-            } else {
-                n.push(id);
-            }
-        } while (!this.match(RIGHT_CURLY) && this.mustMatch(COMMA));
-    }
-
-    return n;
-}
-
-/*
- * ImportSpecifierSet :: () -> (IDENTIFIER | OBJECT_INIT) node
- */
-Pp.ImportSpecifierSet = function ImportSpecifierSet() {
-    var self = this;
-    return this.match(MUL)
-        ? this.newNode({ type: IDENTIFIER, name: "*" })
-    : ExplicitSpecifierSet(function() { return self.Identifier() });
-}
-
-/*
- * Identifier :: () -> IDENTIFIER node
- */
-Pp.Identifier = function Identifier() {
-    this.mustMatch(IDENTIFIER);
-    return this.newNode({ type: IDENTIFIER });
-}
-
-/*
- * IdentifierName :: () -> IDENTIFIER node
- */
-Pp.IdentifierName = function IdentifierName() {
-    this.mustMatch(IDENTIFIER, true);
-    return this.newNode({ type: IDENTIFIER });
-}
-
-/*
- * QualifiedPath :: () -> (IDENTIFIER | DOT) node
- */
-Pp.QualifiedPath = function QualifiedPath() {
-    var n, n2;
-
-    n = this.Identifier();
-
-    while (this.match(DOT)) {
-        if (this.peek() !== IDENTIFIER) {
-            // Unget the '.' token, which isn't part of the QualifiedPath.
-            this.t.unget();
-            break;
-        }
-        n2 = this.newNode();
-        n2.push(n);
-        n2.push(this.Identifier());
-        n = n2;
-    }
-
-    return n;
-}
-
-/*
- * ExportPath :: () -> (IDENTIFIER | DOT | OBJECT_INIT) node
- */
-Pp.ExportPath = function ExportPath() {
-    var self = this;
-    if (this.peek() === LEFT_CURLY)
-        return this.ExplicitSpecifierSet(function() { return self.QualifiedPath() });
-    return this.QualifiedPath();
-}
-
-/*
- * ExportPathList :: () -> Array[(IDENTIFIER | DOT | OBJECT_INIT) node]
- */
-Pp.ExportPathList = function ExportPathList() {
-    var a = [];
-    do {
-        a.push(this.ExportPath());
-    } while (this.match(COMMA));
-    return a;
-}
-
-/*
- * FunctionDefinition :: (boolean,
- *                        DECLARED_FORM or EXPRESSED_FORM or STATEMENT_FORM,
- *                        [string] or null or undefined)
- *                    -> node
- */
-Pp.FunctionDefinition = function FunctionDefinition(requireName, functionForm, comments) {
-    var tt;
-    var f = this.newNode({ params: [], paramComments: [] });
-    if (typeof comments === "undefined")
-        comments = null;
-    f.blockComments = comments;
-    if (f.type !== FUNCTION)
-        f.type = (f.value === "get") ? GETTER : SETTER;
-    if (this.match(MUL))
-        f.isExplicitGenerator = true;
-    if (this.match(IDENTIFIER, false, true))
-        f.name = this.t.token.value;
-    else if (requireName)
-        this.fail("missing function identifier");
-
-    var inModule = this.x.inModule;
-    x2 = new StaticContext(null, null, inModule, true, this.x.strictMode);
-    this.withContext(x2, function() {
-        this.mustMatch(LEFT_PAREN);
-        if (!this.match(RIGHT_PAREN)) {
-            do {
-                tt = this.t.get();
-                f.paramComments.push(this.t.lastBlockComment());
-                switch (tt) {
-                  case LEFT_BRACKET:
-                  case LEFT_CURLY:
-                    // Destructured formal parameters.
-                    this.t.unget();
-                    f.params.push(this.DestructuringExpression());
-                    break;
-                  case IDENTIFIER:
-                    f.params.push(this.t.token.value);
-                    break;
-                  default:
-                    this.fail("missing formal parameter");
-                }
-            } while (this.match(COMMA));
-            this.mustMatch(RIGHT_PAREN);
-        }
-
-        // Do we have an expression closure or a normal body?
-        tt = this.t.get(true);
-        if (tt !== LEFT_CURLY)
-            this.t.unget();
-
-        if (tt !== LEFT_CURLY) {
-            f.body = this.AssignExpression();
-        } else {
-            f.body = this.Script(inModule, true);
-        }
-    });
-
-    if (tt === LEFT_CURLY)
-        this.mustMatch(RIGHT_CURLY);
-
-    f.end = this.t.token.end;
-    f.functionForm = functionForm;
-    if (functionForm === DECLARED_FORM)
-        this.x.parentScript.funDecls.push(f);
-
-    if (this.x.inModule && !f.isExplicitGenerator && f.body.hasYield)
-        this.fail("yield in non-generator function");
-
-    if (f.isExplicitGenerator || f.body.hasYield)
-        f.body = this.newNode({ type: GENERATOR, body: f.body });
-
-    return f;
-}
-
-/*
- * ModuleVariables :: (MODULE node) -> void
- *
- * Parses a comma-separated list of module declarations (and maybe
- * initializations).
- */
-Pp.ModuleVariables = function ModuleVariables(n) {
-    var n1, n2;
-    do {
-        n1 = this.Identifier();
-        if (this.match(ASSIGN)) {
-            n2 = this.ModuleExpression();
-            n1.initializer = n2;
-            if (n2.type === STRING)
-                this.x.parentScript.modLoads.set(n1.value, n2.value);
-            else
-                this.x.parentScript.modAssns.set(n1.value, n1);
-        }
-        n.push(n1);
-    } while (this.match(COMMA));
-}
-
-/*
- * Variables :: () -> node
- *
- * Parses a comma-separated list of var declarations (and maybe
- * initializations).
- */
-Pp.Variables = function Variables(letBlock) {
-    var n, n2, ss, i, s, tt;
-
-    tt = this.t.token.type;
-    switch (tt) {
-      case VAR:
-      case CONST:
-        s = this.x.parentScript;
-        break;
-      case LET:
-        s = this.x.parentBlock;
-        break;
-      case LEFT_PAREN:
-        tt = LET;
-        s = letBlock;
-        break;
-    }
-
-    n = this.newNode({ type: tt, destructurings: [] });
-
-    do {
-        tt = this.t.get();
-        if (tt === LEFT_BRACKET || tt === LEFT_CURLY) {
-            // Need to unget to parse the full destructured expression.
-            this.t.unget();
-
-            var dexp = this.DestructuringExpression(true);
-
-            n2 = this.newNode({ type: IDENTIFIER,
-                                name: dexp,
-                                readOnly: n.type === CONST });
-            n.push(n2);
-            pushDestructuringVarDecls(n2.name.destructuredNames, s);
-            n.destructurings.push({ exp: dexp, decl: n2 });
-
-            if (this.x.inForLoopInit && this.peek() === IN) {
-                continue;
-            }
-
-            this.mustMatch(ASSIGN);
-            if (this.t.token.assignOp)
-                this.fail("Invalid variable initialization");
-
-            n2.blockComment = this.t.lastBlockComment();
-            n2.initializer = this.AssignExpression();
-
-            continue;
-        }
-
-        if (tt !== IDENTIFIER)
-            this.fail("missing variable name");
-
-        n2 = this.newNode({ type: IDENTIFIER,
-                            name: this.t.token.value,
-                            readOnly: n.type === CONST });
-        n.push(n2);
-        s.varDecls.push(n2);
-
-        if (this.match(ASSIGN)) {
-            var comment = this.t.lastBlockComment();
-            if (this.t.token.assignOp)
-                this.fail("Invalid variable initialization");
-
-            n2.initializer = this.AssignExpression();
-        } else {
-            var comment = this.t.lastBlockComment();
-        }
-        n2.blockComment = comment;
-    } while (this.match(COMMA));
-
-    return n;
-}
-
-/*
- * LetBlock :: (boolean) -> node
- *
- * Does not handle let inside of for loop init.
- */
-Pp.LetBlock = function LetBlock(isStatement) {
-    var n, n2;
-
-    // t.token.type must be LET
-    n = this.newNode({ type: LET_BLOCK, varDecls: [] });
-    this.mustMatch(LEFT_PAREN);
-    n.variables = this.Variables(n);
-    this.mustMatch(RIGHT_PAREN);
-
-    if (isStatement && this.peek() !== LEFT_CURLY) {
-        /*
-         * If this is really an expression in let statement guise, then we
-         * need to wrap the LET_BLOCK node in a SEMICOLON node so that we pop
-         * the return value of the expression.
-         */
-        n2 = this.newNode({ type: SEMICOLON, expression: n });
-        isStatement = false;
-    }
-
-    if (isStatement)
-        n.block = this.Block();
-    else
-        n.expression = this.AssignExpression();
-
-    return n;
-}
-
-Pp.checkDestructuring = function checkDestructuring(n, simpleNamesOnly) {
-    if (n.type === ARRAY_COMP)
-        this.fail("Invalid array comprehension left-hand side");
-    if (n.type !== ARRAY_INIT && n.type !== OBJECT_INIT)
-        return;
-
-    var lhss = {};
-    var nn, n2, idx, sub, cc, c = n.children;
-    for (var i = 0, j = c.length; i < j; i++) {
-        if (!(nn = c[i]))
-            continue;
-        if (nn.type === PROPERTY_INIT) {
-            cc = nn.children;
-            sub = cc[1];
-            idx = cc[0].value;
-        } else if (n.type === OBJECT_INIT) {
-            // Do we have destructuring shorthand {foo, bar}?
-            sub = nn;
-            idx = nn.value;
-        } else {
-            sub = nn;
-            idx = i;
-        }
-
-        if (sub.type === ARRAY_INIT || sub.type === OBJECT_INIT) {
-            lhss[idx] = this.checkDestructuring(sub, simpleNamesOnly);
-        } else {
-            if (simpleNamesOnly && sub.type !== IDENTIFIER) {
-                // In declarations, lhs must be simple names
-                this.fail("missing name in pattern");
-            }
-
-            lhss[idx] = sub;
-        }
-    }
-
-    return lhss;
-}
-
-Pp.DestructuringExpression = function DestructuringExpression(simpleNamesOnly) {
-    var n = this.PrimaryExpression();
-    // Keep the list of lefthand sides for varDecls
-    n.destructuredNames = this.checkDestructuring(n, simpleNamesOnly);
-    return n;
-}
-
-Pp.GeneratorExpression = function GeneratorExpression(e) {
-    return this.newNode({ type: GENERATOR,
-                          expression: e,
-                          tail: this.ComprehensionTail() });
-}
-
-Pp.ComprehensionTail = function ComprehensionTail() {
-    var body, n, n2, n3, p;
-
-    // t.token.type must be FOR
-    body = this.newNode({ type: COMP_TAIL });
-
-    do {
-        // Comprehension tails are always for..in loops.
-        n = this.newNode({ type: FOR_IN, isLoop: true });
-        if (this.match(IDENTIFIER)) {
-            // But sometimes they're for each..in.
-            if (this.mozillaMode && this.t.token.value === "each")
-                n.isEach = true;
-            else
-                this.t.unget();
-        }
-        p = this.MaybeLeftParen();
-        switch(this.t.get()) {
-          case LEFT_BRACKET:
-          case LEFT_CURLY:
-            this.t.unget();
-            // Destructured left side of for in comprehension tails.
-            n.iterator = this.DestructuringExpression();
-            break;
-
-          case IDENTIFIER:
-            n.iterator = n3 = this.newNode({ type: IDENTIFIER });
-            n3.name = n3.value;
-            n.varDecl = n2 = this.newNode({ type: VAR });
-            n2.push(n3);
-            this.x.parentScript.varDecls.push(n3);
-            // Don't add to varDecls since the semantics of comprehensions is
-            // such that the variables are in their own function when
-            // desugared.
-            break;
-
-          default:
-            this.fail("missing identifier");
-        }
-        this.mustMatch(IN);
-        n.object = this.Expression();
-        this.MaybeRightParen(p);
-        body.push(n);
-    } while (this.match(FOR));
-
-    // Optional guard.
-    if (this.match(IF))
-        body.guard = this.HeadExpression();
-
-    return body;
-}
-
-Pp.HeadExpression = function HeadExpression() {
-    var p = this.MaybeLeftParen();
-    var n = this.ParenExpression();
-    this.MaybeRightParen(p);
-    if (p === END && !n.parenthesized) {
-        var tt = this.peek();
-        if (tt !== LEFT_CURLY && !definitions.isStatementStartCode[tt])
-            this.fail("Unparenthesized head followed by unbraced body");
-    }
-    return n;
-}
-
-Pp.ParenExpression = function ParenExpression() {
-    // Always accept the 'in' operator in a parenthesized expression,
-    // where it's unambiguous, even if we might be parsing the init of a
-    // for statement.
-    var x2 = this.x.update({
-        inForLoopInit: this.x.inForLoopInit && (this.t.token.type === LEFT_PAREN)
-    });
-    var n = this.withContext(x2, function() {
-        return this.Expression();
-    });
-    if (this.match(FOR)) {
-        if (n.type === YIELD && !n.parenthesized)
-            this.fail("Yield expression must be parenthesized");
-        if (n.type === COMMA && !n.parenthesized)
-            this.fail("Generator expression must be parenthesized");
-        n = this.GeneratorExpression(n);
-    }
-
-    return n;
-}
-
-/*
- * Expression :: () -> node
- *
- * Top-down expression parser matched against SpiderMonkey.
- */
-Pp.Expression = function Expression() {
-    var n, n2;
-
-    n = this.AssignExpression();
-    if (this.match(COMMA)) {
-        n2 = this.newNode({ type: COMMA });
-        n2.push(n);
-        n = n2;
-        do {
-            n2 = n.children[n.children.length-1];
-            if (n2.type === YIELD && !n2.parenthesized)
-                this.fail("Yield expression must be parenthesized");
-            n.push(this.AssignExpression());
-        } while (this.match(COMMA));
-    }
-
-    return n;
-}
-
-Pp.AssignExpression = function AssignExpression() {
-    var n, lhs;
-
-    // Have to treat yield like an operand because it could be the leftmost
-    // operand of the expression.
-    if (this.match(YIELD, true))
-        return this.ReturnOrYield();
-
-    n = this.newNode({ type: ASSIGN });
-    lhs = this.ConditionalExpression();
-
-    if (!this.match(ASSIGN)) {
-        return lhs;
-    }
-
-    n.blockComment = this.t.lastBlockComment();
-
-    switch (lhs.type) {
-      case OBJECT_INIT:
-      case ARRAY_INIT:
-        lhs.destructuredNames = this.checkDestructuring(lhs);
-        // FALL THROUGH
-      case IDENTIFIER: case DOT: case INDEX: case CALL:
-        break;
-      default:
-        this.fail("Bad left-hand side of assignment");
-        break;
-    }
-
-    n.assignOp = lhs.assignOp = this.t.token.assignOp;
-    n.push(lhs);
-    n.push(this.AssignExpression());
-
-    return n;
-}
-
-Pp.ConditionalExpression = function ConditionalExpression() {
-    var n, n2;
-
-    n = this.OrExpression();
-    if (this.match(HOOK)) {
-        n2 = n;
-        n = this.newNode({ type: HOOK });
-        n.push(n2);
-        /*
-         * Always accept the 'in' operator in the middle clause of a ternary,
-         * where it's unambiguous, even if we might be parsing the init of a
-         * for statement.
-         */
-        var x2 = this.x.update({ inForLoopInit: false });
-        this.withContext(x2, function() {
-            n.push(this.AssignExpression());
-        });
-        if (!this.match(COLON))
-            this.fail("missing : after ?");
-        n.push(this.AssignExpression());
-    }
-
-    return n;
-}
-
-Pp.OrExpression = function OrExpression() {
-    var n, n2;
-
-    n = this.AndExpression();
-    while (this.match(OR)) {
-        n2 = this.newNode();
-        n2.push(n);
-        n2.push(this.AndExpression());
-        n = n2;
-    }
-
-    return n;
-}
-
-Pp.AndExpression = function AndExpression() {
-    var n, n2;
-
-    n = this.BitwiseOrExpression();
-    while (this.match(AND)) {
-        n2 = this.newNode();
-        n2.push(n);
-        n2.push(this.BitwiseOrExpression());
-        n = n2;
-    }
-
-    return n;
-}
-
-Pp.BitwiseOrExpression = function BitwiseOrExpression() {
-    var n, n2;
-
-    n = this.BitwiseXorExpression();
-    while (this.match(BITWISE_OR)) {
-        n2 = this.newNode();
-        n2.push(n);
-        n2.push(this.BitwiseXorExpression());
-        n = n2;
-    }
-
-    return n;
-}
-
-Pp.BitwiseXorExpression = function BitwiseXorExpression() {
-    var n, n2;
-
-    n = this.BitwiseAndExpression();
-    while (this.match(BITWISE_XOR)) {
-        n2 = this.newNode();
-        n2.push(n);
-        n2.push(this.BitwiseAndExpression());
-        n = n2;
-    }
-
-    return n;
-}
-
-Pp.BitwiseAndExpression = function BitwiseAndExpression() {
-    var n, n2;
-
-    n = this.EqualityExpression();
-    while (this.match(BITWISE_AND)) {
-        n2 = this.newNode();
-        n2.push(n);
-        n2.push(this.EqualityExpression());
-        n = n2;
-    }
-
-    return n;
-}
-
-Pp.EqualityExpression = function EqualityExpression() {
-    var n, n2;
-
-    n = this.RelationalExpression();
-    while (this.match(EQ) || this.match(NE) ||
-           this.match(STRICT_EQ) || this.match(STRICT_NE)) {
-        n2 = this.newNode();
-        n2.push(n);
-        n2.push(this.RelationalExpression());
-        n = n2;
-    }
-
-    return n;
-}
-
-Pp.RelationalExpression = function RelationalExpression() {
-    var n, n2;
-
-    /*
-     * Uses of the in operator in shiftExprs are always unambiguous,
-     * so unset the flag that prohibits recognizing it.
-     */
-    var x2 = this.x.update({ inForLoopInit: false });
-    this.withContext(x2, function() {
-        n = this.ShiftExpression();
-        while ((this.match(LT) || this.match(LE) || this.match(GE) || this.match(GT) ||
-                (!this.x.inForLoopInit && this.match(IN)) ||
-                this.match(INSTANCEOF))) {
-            n2 = this.newNode();
-            n2.push(n);
-            n2.push(this.ShiftExpression());
-            n = n2;
-        }
-    });
-
-    return n;
-}
-
-Pp.ShiftExpression = function ShiftExpression() {
-    var n, n2;
-
-    n = this.AddExpression();
-    while (this.match(LSH) || this.match(RSH) || this.match(URSH)) {
-        n2 = this.newNode();
-        n2.push(n);
-        n2.push(this.AddExpression());
-        n = n2;
-    }
-
-    return n;
-}
-
-Pp.AddExpression = function AddExpression() {
-    var n, n2;
-
-    n = this.MultiplyExpression();
-    while (this.match(PLUS) || this.match(MINUS)) {
-        n2 = this.newNode();
-        n2.push(n);
-        n2.push(this.MultiplyExpression());
-        n = n2;
-    }
-
-    return n;
-}
-
-Pp.MultiplyExpression = function MultiplyExpression() {
-    var n, n2;
-
-    n = this.UnaryExpression();
-    while (this.match(MUL) || this.match(DIV) || this.match(MOD)) {
-        n2 = this.newNode();
-        n2.push(n);
-        n2.push(this.UnaryExpression());
-        n = n2;
-    }
-
-    return n;
-}
-
-Pp.UnaryExpression = function UnaryExpression() {
-    var n, n2, tt;
-
-    switch (tt = this.t.get(true)) {
-      case DELETE: case VOID: case TYPEOF:
-      case NOT: case BITWISE_NOT: case PLUS: case MINUS:
-        if (tt === PLUS)
-            n = this.newNode({ type: UNARY_PLUS });
-        else if (tt === MINUS)
-            n = this.newNode({ type: UNARY_MINUS });
-        else
-            n = this.newNode();
-        n.push(this.UnaryExpression());
-        break;
-
-      case INCREMENT:
-      case DECREMENT:
-        // Prefix increment/decrement.
-        n = this.newNode();
-        n.push(this.MemberExpression(true));
-        break;
-
-      default:
-        this.t.unget();
-        n = this.MemberExpression(true);
-
-        // Don't look across a newline boundary for a postfix {in,de}crement.
-        if (this.t.tokens[(this.t.tokenIndex + this.t.lookahead - 1) & 3].lineno ===
-            this.t.lineno) {
-            if (this.match(INCREMENT) || this.match(DECREMENT)) {
-                n2 = this.newNode({ postfix: true });
-                n2.push(n);
-                n = n2;
-            }
-        }
-        break;
-    }
-
-    return n;
-}
-
-Pp.MemberExpression = function MemberExpression(allowCallSyntax) {
-    var n, n2, name, tt;
-
-    if (this.match(NEW)) {
-        n = this.newNode();
-        n.push(this.MemberExpression(false));
-        if (this.match(LEFT_PAREN)) {
-            n.type = NEW_WITH_ARGS;
-            n.push(this.ArgumentList());
-        }
-    } else {
-        n = this.PrimaryExpression();
-    }
-
-    while ((tt = this.t.get()) !== END) {
-        switch (tt) {
-          case DOT:
-            n2 = this.newNode();
-            n2.push(n);
-            n2.push(this.IdentifierName());
-            break;
-
-          case LEFT_BRACKET:
-            n2 = this.newNode({ type: INDEX });
-            n2.push(n);
-            n2.push(this.Expression());
-            this.mustMatch(RIGHT_BRACKET);
-            break;
-
-          case LEFT_PAREN:
-            if (allowCallSyntax) {
-                n2 = this.newNode({ type: CALL });
-                n2.push(n);
-                n2.push(this.ArgumentList());
-                break;
-            }
-
-            // FALL THROUGH
-          default:
-            this.t.unget();
-            return n;
-        }
-
-        n = n2;
-    }
-
-    return n;
-}
-
-Pp.ArgumentList = function ArgumentList() {
-    var n, n2;
-
-    n = this.newNode({ type: LIST });
-    if (this.match(RIGHT_PAREN, true))
-        return n;
-    do {
-        n2 = this.AssignExpression();
-        if (n2.type === YIELD && !n2.parenthesized && this.peek() === COMMA)
-            this.fail("Yield expression must be parenthesized");
-        if (this.match(FOR)) {
-            n2 = this.GeneratorExpression(n2);
-            if (n.children.length > 1 || this.peek(true) === COMMA)
-                this.fail("Generator expression must be parenthesized");
-        }
-        n.push(n2);
-    } while (this.match(COMMA));
-    this.mustMatch(RIGHT_PAREN);
-
-    return n;
-}
-
-Pp.PrimaryExpression = function PrimaryExpression() {
-    var n, n2, tt = this.t.get(true);
-
-    switch (tt) {
-      case FUNCTION:
-        n = this.FunctionDefinition(false, EXPRESSED_FORM);
-        break;
-
-      case LEFT_BRACKET:
-        n = this.newNode({ type: ARRAY_INIT });
-        while ((tt = this.peek(true)) !== RIGHT_BRACKET) {
-            if (tt === COMMA) {
-                this.t.get();
-                n.push(null);
-                continue;
-            }
-            n.push(this.AssignExpression());
-            if (tt !== COMMA && !this.match(COMMA))
-                break;
-        }
-
-        // If we matched exactly one element and got a FOR, we have an
-        // array comprehension.
-        if (n.children.length === 1 && this.match(FOR)) {
-            n2 = this.newNode({ type: ARRAY_COMP,
-                                expression: n.children[0],
-                                tail: this.ComprehensionTail() });
-            n = n2;
-        }
-        this.mustMatch(RIGHT_BRACKET);
-        break;
-
-      case LEFT_CURLY:
-        var id, fd;
-        n = this.newNode({ type: OBJECT_INIT });
-
-        object_init:
-        if (!this.match(RIGHT_CURLY)) {
-            do {
-                tt = this.t.get();
-                if ((this.t.token.value === "get" || this.t.token.value === "set") &&
-                    this.peek() === IDENTIFIER) {
-                    n.push(this.FunctionDefinition(true, EXPRESSED_FORM));
-                } else {
-                    var comments = this.t.blockComments;
-                    switch (tt) {
-                      case IDENTIFIER: case NUMBER: case STRING:
-                        id = this.newNode({ type: IDENTIFIER });
-                        break;
-                      case RIGHT_CURLY:
-                        break object_init;
-                      default:
-                        if (this.t.token.value in definitions.keywords) {
-                            id = this.newNode({ type: IDENTIFIER });
-                            break;
-                        }
-                        this.fail("Invalid property name");
-                    }
-                    if (this.match(COLON)) {
-                        n2 = this.newNode({ type: PROPERTY_INIT });
-                        n2.push(id);
-                        n2.push(this.AssignExpression());
-                        n2.blockComments = comments;
-                        n.push(n2);
-                    } else {
-                        // Support, e.g., |var {x, y} = o| as destructuring shorthand
-                        // for |var {x: x, y: y} = o|, per proposed JS2/ES4 for JS1.8.
-                        if (this.peek() !== COMMA && this.peek() !== RIGHT_CURLY)
-                            this.fail("missing : after property");
-                        n.push(id);
-                    }
-                }
-            } while (this.match(COMMA));
-            this.mustMatch(RIGHT_CURLY);
-        }
-        break;
-
-      case LEFT_PAREN:
-        n = this.ParenExpression();
-        this.mustMatch(RIGHT_PAREN);
-        n.parenthesized = true;
-        break;
-
-      case LET:
-        n = this.LetBlock(false);
-        break;
-
-      case NULL: case THIS: case TRUE: case FALSE:
-      case IDENTIFIER: case NUMBER: case STRING: case REGEXP:
-        n = this.newNode();
-        break;
-
-      default:
-        this.fail("missing operand; found " + definitions.tokens[tt]);
-        break;
-    }
-
-    return n;
-}
-
-/*
- * parse :: (source, filename, line number) -> node
- */
-function parse(s, f, l) {
-    var t = new Tokenizer(s, f, l, options.allowHTMLComments);
-    var p = new Parser(t);
-    return p.Script(false, false, true);
-}
-
-/*
- * parseFunction :: (source, boolean,
- *                   DECLARED_FORM or EXPRESSED_FORM or STATEMENT_FORM,
- *                   filename, line number)
- *               -> node
- */
-function parseFunction(s, requireName, form, f, l) {
-    var t = new Tokenizer(s, f, l);
-    var p = new Parser(t);
-    p.x = new StaticContext(null, null, false, false, false);
-    return p.FunctionDefinition(requireName, form);
-}
-
-/*
- * parseStdin :: (source, {line number}, string, (string) -> boolean) -> program node
- */
-function parseStdin(s, ln, prefix, isCommand) {
-    // the special .begin command is only recognized at the beginning
-    if (s.match(/^[\s]*\.begin[\s]*$/)) {
-        ++ln.value;
-        return parseMultiline(ln, prefix);
-    }
-
-    // commands at the beginning are treated as the entire input
-    if (isCommand(s.trim()))
-        s = "";
-
-    for (;;) {
-        try {
-            var t = new Tokenizer(s, "stdin", ln.value, false);
-            var p = new Parser(t);
-            var n = p.Script(false, false);
-            ln.value = t.lineno;
-            return n;
-        } catch (e) {
-            if (!p.unexpectedEOF)
-                throw e;
-
-            // commands in the middle are not treated as part of the input
-            var more;
-            do {
-                if (prefix)
-                    putstr(prefix);
-                more = readline();
-                if (!more)
-                    throw e;
-            } while (isCommand(more.trim()));
-
-            s += "\n" + more;
-        }
-    }
-}
-
-/*
- * parseMultiline :: ({line number}, string | null) -> program node
- */
-function parseMultiline(ln, prefix) {
-    var s = "";
-    for (;;) {
-        if (prefix)
-            putstr(prefix);
-        var more = readline();
-        if (more === null)
-            return null;
-        // the only command recognized in multiline mode is .end
-        if (more.match(/^[\s]*\.end[\s]*$/))
-            break;
-        s += "\n" + more;
-    }
-    var t = new Tokenizer(s, "stdin", ln.value, false);
-    var p = new Parser(t);
-    var n = p.Script(false, false);
-    ln.value = t.lineno;
-    return n;
-}
-
-exports.parse = parse;
-exports.parseStdin = parseStdin;
-exports.parseFunction = parseFunction;
-exports.Node = Node;
-exports.DECLARED_FORM = DECLARED_FORM;
-exports.EXPRESSED_FORM = EXPRESSED_FORM;
-exports.STATEMENT_FORM = STATEMENT_FORM;
-exports.Tokenizer = Tokenizer;
-exports.Parser = Parser;
-exports.Module = Module;
-exports.Export = Export;
-
-});/* vim: set sw=4 ts=4 et tw=78: */
-/* ***** 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 Narcissus JavaScript engine.
- *
- * The Initial Developer of the Original Code is
- * Brendan Eich <brendan@mozilla.org>.
- * Portions created by the Initial Developer are Copyright (C) 2004
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Tom Austin <taustin@ucsc.edu>
- *   Brendan Eich <brendan@mozilla.org>
- *   Shu-Yu Guo <shu@rfrn.org>
- *   Stephan Herhut <stephan.a.herhut@intel.com>
- *   Dave Herman <dherman@mozilla.com>
- *   Dimitris Vardoulakis <dimvar@ccs.neu.edu>
- *   Patrick Walton <pcwalton@mozilla.com>
- *
- * 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 ***** */
-
-/*
- * Narcissus - JS implemented in JS.
- *
- * Lexical scanner.
- */
-
- define('ace/narcissus/lexer', ['require', 'exports', 'module' , 'ace/narcissus/definitions'], function(require, exports, module) {
-
-var definitions = require('./definitions');
-
-// Set constants in the local scope.
-eval(definitions.consts);
-
-// Build up a trie of operator tokens.
-var opTokens = {};
-for (var op in definitions.opTypeNames) {
-    if (op === '\n' || op === '.')
-        continue;
-
-    var node = opTokens;
-    for (var i = 0; i < op.length; i++) {
-        var ch = op[i];
-        if (!(ch in node))
-            node[ch] = {};
-        node = node[ch];
-        node.op = op;
-    }
-}
-
-/*
- * Since JavaScript provides no convenient way to determine if a
- * character is in a particular Unicode category, we use
- * metacircularity to accomplish this (oh yeaaaah!)
- */
-function isValidIdentifierChar(ch, first) {
-    // check directly for ASCII
-    if (ch <= "\u007F") {
-        if ((ch >= 'a' && ch <= 'z') || (ch >= 'A' && ch <= 'Z') || ch === '$' || ch === '_' ||
-            (!first && (ch >= '0' && ch <= '9'))) {
-            return true;
-        }
-        return false;
-    }
-
-    // create an object to test this in
-    var x = {};
-    x["x"+ch] = true;
-    x[ch] = true;
-
-    // then use eval to determine if it's a valid character
-    var valid = false;
-    try {
-        valid = (Function("x", "return (x." + (first?"":"x") + ch + ");")(x) === true);
-    } catch (ex) {}
-
-    return valid;
-}
-
-function isIdentifier(str) {
-    if (typeof str !== "string")
-        return false;
-
-    if (str.length === 0)
-        return false;
-
-    if (!isValidIdentifierChar(str[0], true))
-        return false;
-
-    for (var i = 1; i < str.length; i++) {
-        if (!isValidIdentifierChar(str[i], false))
-            return false;
-    }
-
-    return true;
-}
-
-/*
- * Tokenizer :: (source, filename, line number, boolean) -> Tokenizer
- */
-function Tokenizer(s, f, l, allowHTMLComments) {
-    this.cursor = 0;
-    this.source = String(s);
-    this.tokens = [];
-    this.tokenIndex = 0;
-    this.lookahead = 0;
-    this.scanNewlines = false;
-    this.filename = f || "";
-    this.lineno = l || 1;
-    this.allowHTMLComments = allowHTMLComments;
-    this.blockComments = null;
-}
-
-Tokenizer.prototype = {
-    get done() {
-        // We need to set scanOperand to true here because the first thing
-        // might be a regexp.
-        return this.peek(true) === END;
-    },
-
-    get token() {
-        return this.tokens[this.tokenIndex];
-    },
-
-    match: function (tt, scanOperand, keywordIsName) {
-        return this.get(scanOperand, keywordIsName) === tt || this.unget();
-    },
-
-    mustMatch: function (tt, keywordIsName) {
-        if (!this.match(tt, false, keywordIsName)) {
-            throw this.newSyntaxError("Missing " +
-                                      definitions.tokens[tt].toLowerCase());
-        }
-        return this.token;
-    },
-
-    peek: function (scanOperand) {
-        var tt, next;
-        if (this.lookahead) {
-            next = this.tokens[(this.tokenIndex + this.lookahead) & 3];
-            tt = (this.scanNewlines && next.lineno !== this.lineno)
-                ? NEWLINE
-                : next.type;
-        } else {
-            tt = this.get(scanOperand);
-            this.unget();
-        }
-        return tt;
-    },
-
-    peekOnSameLine: function (scanOperand) {
-        this.scanNewlines = true;
-        var tt = this.peek(scanOperand);
-        this.scanNewlines = false;
-        return tt;
-    },
-
-    lastBlockComment: function() {
-        var length = this.blockComments.length;
-        return length ? this.blockComments[length - 1] : null;
-    },
-
-    // Eat comments and whitespace.
-    skip: function () {
-        var input = this.source;
-        this.blockComments = [];
-        for (;;) {
-            var ch = input[this.cursor++];
-            var next = input[this.cursor];
-            // handle \r, \r\n and (always preferable) \n
-            if (ch === '\r') {
-                // if the next character is \n, we don't care about this at all
-                if (next === '\n') continue;
-
-                // otherwise, we want to consider this as a newline
-                ch = '\n';
-            }
-
-            if (ch === '\n' && !this.scanNewlines) {
-                this.lineno++;
-            } else if (ch === '/' && next === '*') {
-                var commentStart = ++this.cursor;
-                for (;;) {
-                    ch = input[this.cursor++];
-                    if (ch === undefined)
-                        throw this.newSyntaxError("Unterminated comment");
-
-                    if (ch === '*') {
-                        next = input[this.cursor];
-                        if (next === '/') {
-                            var commentEnd = this.cursor - 1;
-                            this.cursor++;
-                            break;
-                        }
-                    } else if (ch === '\n') {
-                        this.lineno++;
-                    }
-                }
-                this.blockComments.push(input.substring(commentStart, commentEnd));
-            } else if ((ch === '/' && next === '/') ||
-                       (this.allowHTMLComments && ch === '<' && next === '!' &&
-                        input[this.cursor + 1] === '-' && input[this.cursor + 2] === '-' &&
-                        (this.cursor += 2))) {
-                this.cursor++;
-                for (;;) {
-                    ch = input[this.cursor++];
-                    next = input[this.cursor];
-                    if (ch === undefined)
-                        return;
-
-                    if (ch === '\r') {
-                        // check for \r\n
-                        if (next !== '\n') ch = '\n';
-                    }
-
-                    if (ch === '\n') {
-                        if (this.scanNewlines) {
-                            this.cursor--;
-                        } else {
-                            this.lineno++;
-                        }
-                        break;
-                    }
-                }
-            } else if (!(ch in definitions.whitespace)) {
-                this.cursor--;
-                return;
-            }
-        }
-    },
-
-    // Lex the exponential part of a number, if present. Return true iff an
-    // exponential part was found.
-    lexExponent: function() {
-        var input = this.source;
-        var next = input[this.cursor];
-        if (next === 'e' || next === 'E') {
-            this.cursor++;
-            ch = input[this.cursor++];
-            if (ch === '+' || ch === '-')
-                ch = input[this.cursor++];
-
-            if (ch < '0' || ch > '9')
-                throw this.newSyntaxError("Missing exponent");
-
-            do {
-                ch = input[this.cursor++];
-            } while (ch >= '0' && ch <= '9');
-            this.cursor--;
-
-            return true;
-        }
-
-        return false;
-    },
-
-    lexZeroNumber: function (ch) {
-        var token = this.token, input = this.source;
-        token.type = NUMBER;
-
-        ch = input[this.cursor++];
-        if (ch === '.') {
-            do {
-                ch = input[this.cursor++];
-            } while (ch >= '0' && ch <= '9');
-            this.cursor--;
-
-            this.lexExponent();
-            token.value = parseFloat(
-                input.substring(token.start, this.cursor));
-        } else if (ch === 'x' || ch === 'X') {
-            do {
-                ch = input[this.cursor++];
-            } while ((ch >= '0' && ch <= '9') || (ch >= 'a' && ch <= 'f') ||
-                     (ch >= 'A' && ch <= 'F'));
-            this.cursor--;
-
-            token.value = parseInt(input.substring(token.start, this.cursor));
-        } else if (ch >= '0' && ch <= '7') {
-            do {
-                ch = input[this.cursor++];
-            } while (ch >= '0' && ch <= '7');
-            this.cursor--;
-
-            token.value = parseInt(input.substring(token.start, this.cursor));
-        } else {
-            this.cursor--;
-            this.lexExponent();     // 0E1, &c.
-            token.value = 0;
-        }
-    },
-
-    lexNumber: function (ch) {
-        var token = this.token, input = this.source;
-        token.type = NUMBER;
-
-        var floating = false;
-        do {
-            ch = input[this.cursor++];
-            if (ch === '.' && !floating) {
-                floating = true;
-                ch = input[this.cursor++];
-            }
-        } while (ch >= '0' && ch <= '9');
-
-        this.cursor--;
-
-        var exponent = this.lexExponent();
-        floating = floating || exponent;
-
-        var str = input.substring(token.start, this.cursor);
-        token.value = floating ? parseFloat(str) : parseInt(str);
-    },
-
-    lexDot: function (ch) {
-        var token = this.token, input = this.source;
-        var next = input[this.cursor];
-        if (next >= '0' && next <= '9') {
-            do {
-                ch = input[this.cursor++];
-            } while (ch >= '0' && ch <= '9');
-            this.cursor--;
-
-            this.lexExponent();
-
-            token.type = NUMBER;
-            token.value = parseFloat(
-                input.substring(token.start, this.cursor));
-        } else {
-            token.type = DOT;
-            token.assignOp = null;
-            token.value = '.';
-        }
-    },
-
-    lexString: function (ch) {
-        var token = this.token, input = this.source;
-        token.type = STRING;
-
-        var hasEscapes = false;
-        var delim = ch;
-        if (input.length <= this.cursor)
-            throw this.newSyntaxError("Unterminated string literal");
-        while ((ch = input[this.cursor++]) !== delim) {
-            if (ch == '\n' || ch == '\r')
-                throw this.newSyntaxError("Unterminated string literal");
-            if (this.cursor == input.length)
-                throw this.newSyntaxError("Unterminated string literal");
-            if (ch === '\\') {
-                hasEscapes = true;
-                if (++this.cursor == input.length)
-                    throw this.newSyntaxError("Unterminated string literal");
-            }
-        }
-
-        token.value = hasEscapes
-            ? eval(input.substring(token.start, this.cursor))
-            : input.substring(token.start + 1, this.cursor - 1);
-    },
-
-    lexRegExp: function (ch) {
-        var token = this.token, input = this.source;
-        token.type = REGEXP;
-
-        do {
-            ch = input[this.cursor++];
-            if (ch === '\\') {
-                this.cursor++;
-            } else if (ch === '[') {
-                do {
-                    if (ch === undefined)
-                        throw this.newSyntaxError("Unterminated character class");
-
-                    if (ch === '\\')
-                        this.cursor++;
-
-                    ch = input[this.cursor++];
-                } while (ch !== ']');
-            } else if (ch === undefined) {
-                throw this.newSyntaxError("Unterminated regex");
-            }
-        } while (ch !== '/');
-
-        do {
-            ch = input[this.cursor++];
-        } while (ch >= 'a' && ch <= 'z');
-
-        this.cursor--;
-
-        token.value = eval(input.substring(token.start, this.cursor));
-    },
-
-    lexOp: function (ch) {
-        var token = this.token, input = this.source;
-
-        // A bit ugly, but it seems wasteful to write a trie lookup routine
-        // for only 3 characters...
-        var node = opTokens[ch];
-        var next = input[this.cursor];
-        if (next in node) {
-            node = node[next];
-            this.cursor++;
-            next = input[this.cursor];
-            if (next in node) {
-                node = node[next];
-                this.cursor++;
-                next = input[this.cursor];
-            }
-        }
-
-        var op = node.op;
-        if (definitions.assignOps[op] && input[this.cursor] === '=') {
-            this.cursor++;
-            token.type = ASSIGN;
-            token.assignOp = definitions.tokenIds[definitions.opTypeNames[op]];
-            op += '=';
-        } else {
-            token.type = definitions.tokenIds[definitions.opTypeNames[op]];
-            token.assignOp = null;
-        }
-
-        token.value = op;
-    },
-
-    // FIXME: Unicode escape sequences
-    lexIdent: function (ch, keywordIsName) {
-        var token = this.token;
-        var id = ch;
-
-        while ((ch = this.getValidIdentifierChar(false)) !== null) {
-            id += ch;
-        }
-
-        token.type = IDENTIFIER;
-        token.value = id;
-
-        if (keywordIsName)
-            return;
-
-        var kw;
-
-        if (this.parser.mozillaMode) {
-            kw = definitions.mozillaKeywords[id];
-            if (kw) {
-                token.type = kw;
-                return;
-            }
-        }
-
-        if (this.parser.x.strictMode) {
-            kw = definitions.strictKeywords[id];
-            if (kw) {
-                token.type = kw;
-                return;
-            }
-        }
-
-        kw = definitions.keywords[id];
-        if (kw)
-            token.type = kw;
-    },
-
-    /*
-     * Tokenizer.get :: ([boolean[, boolean]]) -> token type
-     *
-     * Consume input *only* if there is no lookahead.
-     * Dispatch to the appropriate lexing function depending on the input.
-     */
-    get: function (scanOperand, keywordIsName) {
-        var token;
-        while (this.lookahead) {
-            --this.lookahead;
-            this.tokenIndex = (this.tokenIndex + 1) & 3;
-            token = this.tokens[this.tokenIndex];
-            if (token.type !== NEWLINE || this.scanNewlines)
-                return token.type;
-        }
-
-        this.skip();
-
-        this.tokenIndex = (this.tokenIndex + 1) & 3;
-        token = this.tokens[this.tokenIndex];
-        if (!token)
-            this.tokens[this.tokenIndex] = token = {};
-
-        var input = this.source;
-        if (this.cursor >= input.length)
-            return token.type = END;
-
-        token.start = this.cursor;
-        token.lineno = this.lineno;
-
-        var ich = this.getValidIdentifierChar(true);
-        var ch = (ich === null) ? input[this.cursor++] : null;
-        if (ich !== null) {
-            this.lexIdent(ich, keywordIsName);
-        } else if (scanOperand && ch === '/') {
-            this.lexRegExp(ch);
-        } else if (ch in opTokens) {
-            this.lexOp(ch);
-        } else if (ch === '.') {
-            this.lexDot(ch);
-        } else if (ch >= '1' && ch <= '9') {
-            this.lexNumber(ch);
-        } else if (ch === '0') {
-            this.lexZeroNumber(ch);
-        } else if (ch === '"' || ch === "'") {
-            this.lexString(ch);
-        } else if (this.scanNewlines && (ch === '\n' || ch === '\r')) {
-            // if this was a \r, look for \r\n
-            if (ch === '\r' && input[this.cursor] === '\n') this.cursor++;
-            token.type = NEWLINE;
-            token.value = '\n';
-            this.lineno++;
-        } else {
-            throw this.newSyntaxError("Illegal token");
-        }
-
-        token.end = this.cursor;
-        return token.type;
-    },
-
-    /*
-     * Tokenizer.unget :: void -> undefined
-     *
-     * Match depends on unget returning undefined.
-     */
-    unget: function () {
-        if (++this.lookahead === 4) throw "PANIC: too much lookahead!";
-        this.tokenIndex = (this.tokenIndex - 1) & 3;
-    },
-
-    newSyntaxError: function (m) {
-        m = (this.filename ? this.filename + ":" : "") + this.lineno + ": " + m;
-        var e = new SyntaxError(m, this.filename, this.lineno);
-        e.source = this.source;
-        e.cursor = this.lookahead
-            ? this.tokens[(this.tokenIndex + this.lookahead) & 3].start
-            : this.cursor;
-        return e;
-    },
-
-
-    /* Gets a single valid identifier char from the input stream, or null
-     * if there is none.
-     */
-    getValidIdentifierChar: function(first) {
-        var input = this.source;
-        if (this.cursor >= input.length) return null;
-        var ch = input[this.cursor];
-
-        // first check for \u escapes
-        if (ch === '\\' && input[this.cursor+1] === 'u') {
-            // get the character value
-            try {
-                ch = String.fromCharCode(parseInt(
-                    input.substring(this.cursor + 2, this.cursor + 6),
-                    16));
-            } catch (ex) {
-                return null;
-            }
-            this.cursor += 5;
-        }
-
-        var valid = isValidIdentifierChar(ch, first);
-        if (valid) this.cursor++;
-        return (valid ? ch : null);
-    },
-};
-
-
-exports.isIdentifier = isIdentifier;
-exports.Tokenizer = Tokenizer;
-
-});/* vim: set sw=4 ts=4 et tw=78: */
-/* ***** 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 Narcissus JavaScript engine.
- *
- * The Initial Developer of the Original Code is
- * Brendan Eich <brendan@mozilla.org>.
- * Portions created by the Initial Developer are Copyright (C) 2004
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Tom Austin <taustin@ucsc.edu>
- *   Brendan Eich <brendan@mozilla.org>
- *   Shu-Yu Guo <shu@rfrn.org>
- *   Dave Herman <dherman@mozilla.com>
- *   Dimitris Vardoulakis <dimvar@ccs.neu.edu>
- *   Patrick Walton <pcwalton@mozilla.com>
- *
- * 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 ***** */
-
-/*
- * Narcissus - JS implemented in JS.
- *
- * Well-known constants and lookup tables.  Many consts are generated from the
- * tokens table via eval to minimize redundancy, so consumers must be compiled
- * separately to take advantage of the simple switch-case constant propagation
- * done by SpiderMonkey.
- */
-
-define('ace/narcissus/definitions', ['require', 'exports', 'module' ], function(require, exports, module) {
-
-var tokens = [
-    // End of source.
-    "END",
-
-    // Operators and punctuators.  Some pair-wise order matters, e.g. (+, -)
-    // and (UNARY_PLUS, UNARY_MINUS).
-    "\n", ";",
-    ",",
-    "=",
-    "?", ":", "CONDITIONAL",
-    "||",
-    "&&",
-    "|",
-    "^",
-    "&",
-    "==", "!=", "===", "!==",
-    "<", "<=", ">=", ">",
-    "<<", ">>", ">>>",
-    "+", "-",
-    "*", "/", "%",
-    "!", "~", "UNARY_PLUS", "UNARY_MINUS",
-    "++", "--",
-    ".",
-    "[", "]",
-    "{", "}",
-    "(", ")",
-
-    // Nonterminal tree node type codes.
-    "SCRIPT", "BLOCK", "LABEL", "FOR_IN", "CALL", "NEW_WITH_ARGS", "INDEX",
-    "ARRAY_INIT", "OBJECT_INIT", "PROPERTY_INIT", "GETTER", "SETTER",
-    "GROUP", "LIST", "LET_BLOCK", "ARRAY_COMP", "GENERATOR", "COMP_TAIL",
-
-    // Contextual keywords.
-    "IMPLEMENTS", "INTERFACE", "LET", "MODULE", "PACKAGE", "PRIVATE",
-    "PROTECTED", "PUBLIC", "STATIC", "USE", "YIELD",
-
-    // Terminals.
-    "IDENTIFIER", "NUMBER", "STRING", "REGEXP",
-
-    // Keywords.
-    "break",
-    "case", "catch", "const", "continue",
-    "debugger", "default", "delete", "do",
-    "else", "export",
-    "false", "finally", "for", "function",
-    "if", "import", "in", "instanceof",
-    "new", "null",
-    "return",
-    "switch",
-    "this", "throw", "true", "try", "typeof",
-    "var", "void",
-    "while", "with",
-];
-
-var strictKeywords = {
-    __proto__: null,
-    "implements": true,
-    "interface": true,
-    "let": true,
-    //"module": true,
-    "package": true,
-    "private": true,
-    "protected": true,
-    "public": true,
-    "static": true,
-    "use": true,
-    "yield": true
-};
-
-var statementStartTokens = [
-    "break",
-    "const", "continue",
-    "debugger", "do",
-    "for",
-    "if",
-    "let",
-    "return",
-    "switch",
-    "throw", "try",
-    "var",
-    "yield",
-    "while", "with",
-];
-
-// Whitespace characters (see ECMA-262 7.2)
-var whitespaceChars = [
-    // normal whitespace:
-    "\u0009", "\u000B", "\u000C", "\u0020", "\u00A0", "\uFEFF",
-
-    // high-Unicode whitespace:
-    "\u1680", "\u180E",
-    "\u2000", "\u2001", "\u2002", "\u2003", "\u2004", "\u2005", "\u2006",
-    "\u2007", "\u2008", "\u2009", "\u200A",
-    "\u202F", "\u205F", "\u3000"
-];
-
-var whitespace = {};
-for (var i = 0; i < whitespaceChars.length; i++) {
-    whitespace[whitespaceChars[i]] = true;
-}
-
-// Operator and punctuator mapping from token to tree node type name.
-// NB: because the lexer doesn't backtrack, all token prefixes must themselves
-// be valid tokens (e.g. !== is acceptable because its prefixes are the valid
-// tokens != and !).
-var opTypeNames = {
-    '\n':   "NEWLINE",
-    ';':    "SEMICOLON",
-    ',':    "COMMA",
-    '?':    "HOOK",
-    ':':    "COLON",
-    '||':   "OR",
-    '&&':   "AND",
-    '|':    "BITWISE_OR",
-    '^':    "BITWISE_XOR",
-    '&':    "BITWISE_AND",
-    '===':  "STRICT_EQ",
-    '==':   "EQ",
-    '=':    "ASSIGN",
-    '!==':  "STRICT_NE",
-    '!=':   "NE",
-    '<<':   "LSH",
-    '<=':   "LE",
-    '<':    "LT",
-    '>>>':  "URSH",
-    '>>':   "RSH",
-    '>=':   "GE",
-    '>':    "GT",
-    '++':   "INCREMENT",
-    '--':   "DECREMENT",
-    '+':    "PLUS",
-    '-':    "MINUS",
-    '*':    "MUL",
-    '/':    "DIV",
-    '%':    "MOD",
-    '!':    "NOT",
-    '~':    "BITWISE_NOT",
-    '.':    "DOT",
-    '[':    "LEFT_BRACKET",
-    ']':    "RIGHT_BRACKET",
-    '{':    "LEFT_CURLY",
-    '}':    "RIGHT_CURLY",
-    '(':    "LEFT_PAREN",
-    ')':    "RIGHT_PAREN"
-};
-
-// Hash of keyword identifier to tokens index.  NB: we must null __proto__ to
-// avoid toString, etc. namespace pollution.
-var keywords = {__proto__: null};
-var mozillaKeywords = {__proto__: null};
-
-// Define const END, etc., based on the token names.  Also map name to index.
-var tokenIds = {};
-
-var hostSupportsEvalConst = (function() {
-    try {
-        return eval("(function(s) { eval(s); return x })('const x = true;')");
-    } catch (e) {
-        return false;
-    }
-})();
-
-// Building up a string to be eval'd in different contexts.
-var consts = hostSupportsEvalConst ? "const " : "var ";
-for (var i = 0, j = tokens.length; i < j; i++) {
-    if (i > 0)
-        consts += ", ";
-    var t = tokens[i];
-    var name;
-    if (/^[a-z]/.test(t)) {
-        name = t.toUpperCase();
-        if (name === "LET" || name === "YIELD")
-            mozillaKeywords[name] = i;
-        if (strictKeywords[name])
-            strictKeywords[name] = i;
-        keywords[t] = i;
-    } else {
-        name = (/^\W/.test(t) ? opTypeNames[t] : t);
-    }
-    consts += name + " = " + i;
-    tokenIds[name] = i;
-    tokens[t] = i;
-}
-consts += ";";
-
-var isStatementStartCode = {__proto__: null};
-for (i = 0, j = statementStartTokens.length; i < j; i++)
-    isStatementStartCode[keywords[statementStartTokens[i]]] = true;
-
-// Map assignment operators to their indexes in the tokens array.
-var assignOps = ['|', '^', '&', '<<', '>>', '>>>', '+', '-', '*', '/', '%'];
-
-for (i = 0, j = assignOps.length; i < j; i++) {
-    t = assignOps[i];
-    assignOps[t] = tokens[t];
-}
-
-function defineGetter(obj, prop, fn, dontDelete, dontEnum) {
-    Object.defineProperty(obj, prop,
-                          { get: fn, configurable: !dontDelete, enumerable: !dontEnum });
-}
-
-function defineGetterSetter(obj, prop, getter, setter, dontDelete, dontEnum) {
-    Object.defineProperty(obj, prop, {
-        get: getter,
-        set: setter,
-        configurable: !dontDelete,
-        enumerable: !dontEnum
-    });
-}
-
-function defineMemoGetter(obj, prop, fn, dontDelete, dontEnum) {
-    Object.defineProperty(obj, prop, {
-        get: function() {
-            var val = fn();
-            defineProperty(obj, prop, val, dontDelete, true, dontEnum);
-            return val;
-        },
-        configurable: true,
-        enumerable: !dontEnum
-    });
-}
-
-function defineProperty(obj, prop, val, dontDelete, readOnly, dontEnum) {
-    Object.defineProperty(obj, prop,
-                          { value: val, writable: !readOnly, configurable: !dontDelete,
-                            enumerable: !dontEnum });
-}
-
-// Returns true if fn is a native function.  (Note: SpiderMonkey specific.)
-function isNativeCode(fn) {
-    // Relies on the toString method to identify native code.
-    return ((typeof fn) === "function") && fn.toString().match(/\[native code\]/);
-}
-
-var Fpapply = Function.prototype.apply;
-
-function apply(f, o, a) {
-    return Fpapply.call(f, [o].concat(a));
-}
-
-var applyNew;
-
-// ES5's bind is a simpler way to implement applyNew
-if (Function.prototype.bind) {
-    applyNew = function applyNew(f, a) {
-        return new (f.bind.apply(f, [,].concat(Array.prototype.slice.call(a))))();
-    };
-} else {
-    applyNew = function applyNew(f, a) {
-        switch (a.length) {
-          case 0:
-            return new f();
-          case 1:
-            return new f(a[0]);
-          case 2:
-            return new f(a[0], a[1]);
-          case 3:
-            return new f(a[0], a[1], a[2]);
-          default:
-            var argStr = "a[0]";
-            for (var i = 1, n = a.length; i < n; i++)
-                argStr += ",a[" + i + "]";
-            return eval("new f(" + argStr + ")");
-        }
-    };
-}
-
-function getPropertyDescriptor(obj, name) {
-    while (obj) {
-        if (({}).hasOwnProperty.call(obj, name))
-            return Object.getOwnPropertyDescriptor(obj, name);
-        obj = Object.getPrototypeOf(obj);
-    }
-}
-
-function getPropertyNames(obj) {
-    var table = Object.create(null, {});
-    while (obj) {
-        var names = Object.getOwnPropertyNames(obj);
-        for (var i = 0, n = names.length; i < n; i++)
-            table[names[i]] = true;
-        obj = Object.getPrototypeOf(obj);
-    }
-    return Object.keys(table);
-}
-
-function getOwnProperties(obj) {
-    var map = {};
-    for (var name in Object.getOwnPropertyNames(obj))
-        map[name] = Object.getOwnPropertyDescriptor(obj, name);
-    return map;
-}
-
-function blacklistHandler(target, blacklist) {
-    var mask = Object.create(null, {});
-    var redirect = Dict.create(blacklist).mapObject(function(name) { return mask; });
-    return mixinHandler(redirect, target);
-}
-
-function whitelistHandler(target, whitelist) {
-    var catchall = Object.create(null, {});
-    var redirect = Dict.create(whitelist).mapObject(function(name) { return target; });
-    return mixinHandler(redirect, catchall);
-}
-
-/*
- * Mixin proxies break the single-inheritance model of prototypes, so
- * the handler treats all properties as own-properties:
- *
- *                  X
- *                  |
- *     +------------+------------+
- *     |                 O       |
- *     |                 |       |
- *     |  O         O    O       |
- *     |  |         |    |       |
- *     |  O    O    O    O       |
- *     |  |    |    |    |       |
- *     |  O    O    O    O    O  |
- *     |  |    |    |    |    |  |
- *     +-(*)--(w)--(x)--(y)--(z)-+
- */
-
-function mixinHandler(redirect, catchall) {
-    function targetFor(name) {
-        return hasOwn(redirect, name) ? redirect[name] : catchall;
-    }
-
-    function getMuxPropertyDescriptor(name) {
-        var desc = getPropertyDescriptor(targetFor(name), name);
-        if (desc)
-            desc.configurable = true;
-        return desc;
-    }
-
-    function getMuxPropertyNames() {
-        var names1 = Object.getOwnPropertyNames(redirect).filter(function(name) {
-            return name in redirect[name];
-        });
-        var names2 = getPropertyNames(catchall).filter(function(name) {
-            return !hasOwn(redirect, name);
-        });
-        return names1.concat(names2);
-    }
-
-    function enumerateMux() {
-        var result = Object.getOwnPropertyNames(redirect).filter(function(name) {
-            return name in redirect[name];
-        });
-        for (name in catchall) {
-            if (!hasOwn(redirect, name))
-                result.push(name);
-        };
-        return result;
-    }
-
-    function hasMux(name) {
-        return name in targetFor(name);
-    }
-
-    return {
-        getOwnPropertyDescriptor: getMuxPropertyDescriptor,
-        getPropertyDescriptor: getMuxPropertyDescriptor,
-        getOwnPropertyNames: getMuxPropertyNames,
-        defineProperty: function(name, desc) {
-            Object.defineProperty(targetFor(name), name, desc);
-        },
-        "delete": function(name) {
-            var target = targetFor(name);
-            return delete target[name];
-        },
-        // FIXME: ha ha ha
-        fix: function() { },
-        has: hasMux,
-        hasOwn: hasMux,
-        get: function(receiver, name) {
-            var target = targetFor(name);
-            return target[name];
-        },
-        set: function(receiver, name, val) {
-            var target = targetFor(name);
-            target[name] = val;
-            return true;
-        },
-        enumerate: enumerateMux,
-        keys: enumerateMux
-    };
-}
-
-function makePassthruHandler(obj) {
-    // Handler copied from
-    // http://wiki.ecmascript.org/doku.php?id=harmony:proxies&s=proxy%20object#examplea_no-op_forwarding_proxy
-    return {
-        getOwnPropertyDescriptor: function(name) {
-            var desc = Object.getOwnPropertyDescriptor(obj, name);
-
-            // a trapping proxy's properties must always be configurable
-            desc.configurable = true;
-            return desc;
-        },
-        getPropertyDescriptor: function(name) {
-            var desc = getPropertyDescriptor(obj, name);
-
-            // a trapping proxy's properties must always be configurable
-            desc.configurable = true;
-            return desc;
-        },
-        getOwnPropertyNames: function() {
-            return Object.getOwnPropertyNames(obj);
-        },
-        defineProperty: function(name, desc) {
-            Object.defineProperty(obj, name, desc);
-        },
-        "delete": function(name) { return delete obj[name]; },
-        fix: function() {
-            if (Object.isFrozen(obj)) {
-                return getOwnProperties(obj);
-            }
-
-            // As long as obj is not frozen, the proxy won't allow itself to be fixed.
-            return undefined; // will cause a TypeError to be thrown
-        },
-
-        has: function(name) { return name in obj; },
-        hasOwn: function(name) { return ({}).hasOwnProperty.call(obj, name); },
-        get: function(receiver, name) { return obj[name]; },
-
-        // bad behavior when set fails in non-strict mode
-        set: function(receiver, name, val) { obj[name] = val; return true; },
-        enumerate: function() {
-            var result = [];
-            for (name in obj) { result.push(name); };
-            return result;
-        },
-        keys: function() { return Object.keys(obj); }
-    };
-}
-
-var hasOwnProperty = ({}).hasOwnProperty;
-
-function hasOwn(obj, name) {
-    return hasOwnProperty.call(obj, name);
-}
-
-function Dict(table, size) {
-    this.table = table || Object.create(null, {});
-    this.size = size || 0;
-}
-
-Dict.create = function(table) {
-    var init = Object.create(null, {});
-    var size = 0;
-    var names = Object.getOwnPropertyNames(table);
-    for (var i = 0, n = names.length; i < n; i++) {
-        var name = names[i];
-        init[name] = table[name];
-        size++;
-    }
-    return new Dict(init, size);
-};
-
-Dict.prototype = {
-    has: function(x) { return hasOwnProperty.call(this.table, x); },
-    set: function(x, v) {
-        if (!hasOwnProperty.call(this.table, x))
-            this.size++;
-        this.table[x] = v;
-    },
-    get: function(x) { return this.table[x]; },
-    getDef: function(x, thunk) {
-        if (!hasOwnProperty.call(this.table, x)) {
-            this.size++;
-            this.table[x] = thunk();
-        }
-        return this.table[x];
-    },
-    forEach: function(f) {
-        var table = this.table;
-        for (var key in table)
-            f.call(this, key, table[key]);
-    },
-    map: function(f) {
-        var table1 = this.table;
-        var table2 = Object.create(null, {});
-        this.forEach(function(key, val) {
-            table2[key] = f.call(this, val, key);
-        });
-        return new Dict(table2, this.size);
-    },
-    mapObject: function(f) {
-        var table1 = this.table;
-        var table2 = Object.create(null, {});
-        this.forEach(function(key, val) {
-            table2[key] = f.call(this, val, key);
-        });
-        return table2;
-    },
-    toObject: function() {
-        return this.mapObject(function(val) { return val; });
-    },
-    choose: function() {
-        return Object.getOwnPropertyNames(this.table)[0];
-    },
-    remove: function(x) {
-        if (hasOwnProperty.call(this.table, x)) {
-            this.size--;
-            delete this.table[x];
-        }
-    },
-    copy: function() {
-        var table = Object.create(null, {});
-        for (var key in this.table)
-            table[key] = this.table[key];
-        return new Dict(table, this.size);
-    },
-    keys: function() {
-        return Object.keys(this.table);
-    },
-    toString: function() { return "[object Dict]" }
-};
-
-var _WeakMap = typeof WeakMap === "function" ? WeakMap : (function() {
-    // shim for ES6 WeakMap with poor asymptotics
-    function WeakMap(array) {
-        this.array = array || [];
-    }
-
-    function searchMap(map, key, found, notFound) {
-        var a = map.array;
-        for (var i = 0, n = a.length; i < n; i++) {
-            var pair = a[i];
-            if (pair.key === key)
-                return found(pair, i);
-        }
-        return notFound();
-    }
-
-    WeakMap.prototype = {
-        has: function(x) {
-            return searchMap(this, x, function() { return true }, function() { return false });
-        },
-        set: function(x, v) {
-            var a = this.array;
-            searchMap(this, x,
-                      function(pair) { pair.value = v },
-                      function() { a.push({ key: x, value: v }) });
-        },
-        get: function(x) {
-            return searchMap(this, x,
-                             function(pair) { return pair.value },
-                             function() { return null });
-        },
-        "delete": function(x) {
-            var a = this.array;
-            searchMap(this, x,
-                      function(pair, i) { a.splice(i, 1) },
-                      function() { });
-        },
-        toString: function() { return "[object WeakMap]" }
-    };
-
-    return WeakMap;
-})();
-
-// non-destructive stack
-function Stack(elts) {
-    this.elts = elts || null;
-}
-
-Stack.prototype = {
-    push: function(x) {
-        return new Stack({ top: x, rest: this.elts });
-    },
-    top: function() {
-        if (!this.elts)
-            throw new Error("empty stack");
-        return this.elts.top;
-    },
-    isEmpty: function() {
-        return this.top === null;
-    },
-    find: function(test) {
-        for (var elts = this.elts; elts; elts = elts.rest) {
-            if (test(elts.top))
-                return elts.top;
-        }
-        return null;
-    },
-    has: function(x) {
-        return Boolean(this.find(function(elt) { return elt === x }));
-    },
-    forEach: function(f) {
-        for (var elts = this.elts; elts; elts = elts.rest) {
-            f(elts.top);
-        }
-    }
-};
-
-if (!Array.prototype.copy) {
-    defineProperty(Array.prototype, "copy",
-                   function() {
-                       var result = [];
-                       for (var i = 0, n = this.length; i < n; i++)
-                           result[i] = this[i];
-                       return result;
-                   }, false, false, true);
-}
-
-if (!Array.prototype.top) {
-    defineProperty(Array.prototype, "top",
-                   function() {
-                       return this.length && this[this.length-1];
-                   }, false, false, true);
-}
-
-exports.tokens = tokens;
-exports.whitespace = whitespace;
-exports.opTypeNames = opTypeNames;
-exports.keywords = keywords;
-exports.mozillaKeywords = mozillaKeywords;
-exports.strictKeywords = strictKeywords;
-exports.isStatementStartCode = isStatementStartCode;
-exports.tokenIds = tokenIds;
-exports.consts = consts;
-exports.assignOps = assignOps;
-exports.defineGetter = defineGetter;
-exports.defineGetterSetter = defineGetterSetter;
-exports.defineMemoGetter = defineMemoGetter;
-exports.defineProperty = defineProperty;
-exports.isNativeCode = isNativeCode;
-exports.apply = apply;
-exports.applyNew = applyNew;
-exports.mixinHandler = mixinHandler;
-exports.whitelistHandler = whitelistHandler;
-exports.blacklistHandler = blacklistHandler;
-exports.makePassthruHandler = makePassthruHandler;
-exports.Dict = Dict;
-exports.WeakMap = _WeakMap;
-exports.Stack = Stack;
-
-});/* vim: set sw=4 ts=4 et tw=78: */
-/* ***** 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 Narcissus JavaScript engine.
- *
- * The Initial Developer of the Original Code is
- * Brendan Eich <brendan@mozilla.org>.
- * Portions created by the Initial Developer are Copyright (C) 2004
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Tom Austin <taustin@ucsc.edu>
- *   Brendan Eich <brendan@mozilla.org>
- *   Shu-Yu Guo <shu@rfrn.org>
- *   Dave Herman <dherman@mozilla.com>
- *   Dimitris Vardoulakis <dimvar@ccs.neu.edu>
- *   Patrick Walton <pcwalton@mozilla.com>
- *
- * 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 ***** */
-
-define('ace/narcissus/options', ['require', 'exports', 'module' ], function(require, exports, module) {
-
-// Global variables to hide from the interpreter
-exports.hiddenHostGlobals = { Narcissus: true };
-
-// Desugar SpiderMonkey language extensions?
-exports.desugarExtensions = false;
-
-// Allow HTML comments?
-exports.allowHTMLComments = false;
-
-// Allow non-standard Mozilla extensions?
-exports.mozillaMode = true;
-
-// Allow experimental paren-free mode?
-exports.parenFreeMode = false;
-
-});
\ No newline at end of file
diff --git a/apps/files_texteditor/js/aceeditor/worker-json.js b/apps/files_texteditor/js/aceeditor/worker-json.js
deleted file mode 100644
index 80757ef64b..0000000000
--- a/apps/files_texteditor/js/aceeditor/worker-json.js
+++ /dev/null
@@ -1,3083 +0,0 @@
-"no use strict";
-
-var console = {
-    log: function(msg) {
-        postMessage({type: "log", data: msg});
-    }
-};
-var window = {
-    console: console
-};
-
-var normalizeModule = function(parentId, moduleName) {
-    // normalize plugin requires
-    if (moduleName.indexOf("!") !== -1) {
-        var chunks = moduleName.split("!");
-        return normalizeModule(parentId, chunks[0]) + "!" + normalizeModule(parentId, chunks[1]);
-    }
-    // normalize relative requires
-    if (moduleName.charAt(0) == ".") {
-        var base = parentId.split("/").slice(0, -1).join("/");
-        var moduleName = base + "/" + moduleName;
-        
-        while(moduleName.indexOf(".") !== -1 && previous != moduleName) {
-            var previous = moduleName;
-            var moduleName = moduleName.replace(/\/\.\//, "/").replace(/[^\/]+\/\.\.\//, "");
-        }
-    }
-    
-    return moduleName;
-};
-
-var require = function(parentId, id) {
-    var id = normalizeModule(parentId, id);
-    
-    var module = require.modules[id];
-    if (module) {
-        if (!module.initialized) {
-            module.exports = module.factory().exports;
-            module.initialized = true;
-        }
-        return module.exports;
-    }
-    
-    var chunks = id.split("/");
-    chunks[0] = require.tlns[chunks[0]] || chunks[0];
-    var path = chunks.join("/") + ".js";
-    
-    require.id = id;
-    importScripts(path);
-    return require(parentId, id);    
-};
-
-require.modules = {};
-require.tlns = {};
-
-var define = function(id, deps, factory) {
-    if (arguments.length == 2) {
-        factory = deps;
-    } else if (arguments.length == 1) {
-        factory = id;
-        id = require.id;
-    }
-
-    if (id.indexOf("text!") === 0) 
-        return;
-    
-    var req = function(deps, factory) {
-        return require(id, deps, factory);
-    };
-
-    require.modules[id] = {
-        factory: function() {
-            var module = {
-                exports: {}
-            };
-            var returnExports = factory(req, module.exports, module);
-            if (returnExports)
-                module.exports = returnExports;
-            return module;
-        }
-    };
-};
-
-function initBaseUrls(topLevelNamespaces) {
-    require.tlns = topLevelNamespaces;
-}
-
-function initSender() {
-
-    var EventEmitter = require(null, "ace/lib/event_emitter").EventEmitter;
-    var oop = require(null, "ace/lib/oop");
-    
-    var Sender = function() {};
-    
-    (function() {
-        
-        oop.implement(this, EventEmitter);
-                
-        this.callback = function(data, callbackId) {
-            postMessage({
-                type: "call",
-                id: callbackId,
-                data: data
-            });
-        };
-    
-        this.emit = function(name, data) {
-            postMessage({
-                type: "event",
-                name: name,
-                data: data
-            });
-        };
-        
-    }).call(Sender.prototype);
-    
-    return new Sender();
-}
-
-var main;
-var sender;
-
-onmessage = function(e) {
-    var msg = e.data;
-    if (msg.command) {
-        main[msg.command].apply(main, msg.args);
-    }
-    else if (msg.init) {        
-        initBaseUrls(msg.tlns);
-        require(null, "ace/lib/fixoldbrowsers");
-        sender = initSender();
-        var clazz = require(null, msg.module)[msg.classname];
-        main = new clazz(sender);
-    } 
-    else if (msg.event && sender) {
-        sender._emit(msg.event, msg.data);
-    }
-};
-// vim:set ts=4 sts=4 sw=4 st:
-// -- kriskowal Kris Kowal Copyright (C) 2009-2010 MIT License
-// -- tlrobinson Tom Robinson Copyright (C) 2009-2010 MIT License (Narwhal Project)
-// -- dantman Daniel Friesen Copyright(C) 2010 XXX No License Specified
-// -- fschaefer Florian Schäfer Copyright (C) 2010 MIT License
-// -- Irakli Gozalishvili Copyright (C) 2010 MIT License
-
-/*!
-    Copyright (c) 2009, 280 North Inc. http://280north.com/
-    MIT License. http://github.com/280north/narwhal/blob/master/README.md
-*/
-
-define('ace/lib/fixoldbrowsers', ['require', 'exports', 'module' , 'ace/lib/regexp', 'ace/lib/es5-shim'], function(require, exports, module) {
-"use strict";
-
-require("./regexp");
-require("./es5-shim");
-
-});/**
- *  Based on code from:
- *
- * XRegExp 1.5.0
- * (c) 2007-2010 Steven Levithan
- * MIT License
- * <http://xregexp.com>
- * Provides an augmented, extensible, cross-browser implementation of regular expressions,
- * including support for additional syntax, flags, and methods
- */
- 
-define('ace/lib/regexp', ['require', 'exports', 'module' ], function(require, exports, module) {
-"use strict";
-
-    //---------------------------------
-    //  Private variables
-    //---------------------------------
-
-    var real = {
-            exec: RegExp.prototype.exec,
-            test: RegExp.prototype.test,
-            match: String.prototype.match,
-            replace: String.prototype.replace,
-            split: String.prototype.split
-        },
-        compliantExecNpcg = real.exec.call(/()??/, "")[1] === undefined, // check `exec` handling of nonparticipating capturing groups
-        compliantLastIndexIncrement = function () {
-            var x = /^/g;
-            real.test.call(x, "");
-            return !x.lastIndex;
-        }();
-
-    //---------------------------------
-    //  Overriden native methods
-    //---------------------------------
-
-    // Adds named capture support (with backreferences returned as `result.name`), and fixes two
-    // cross-browser issues per ES3:
-    // - Captured values for nonparticipating capturing groups should be returned as `undefined`,
-    //   rather than the empty string.
-    // - `lastIndex` should not be incremented after zero-length matches.
-    RegExp.prototype.exec = function (str) {
-        var match = real.exec.apply(this, arguments),
-            name, r2;
-        if ( typeof(str) == 'string' && match) {
-            // Fix browsers whose `exec` methods don't consistently return `undefined` for
-            // nonparticipating capturing groups
-            if (!compliantExecNpcg && match.length > 1 && indexOf(match, "") > -1) {
-                r2 = RegExp(this.source, real.replace.call(getNativeFlags(this), "g", ""));
-                // Using `str.slice(match.index)` rather than `match[0]` in case lookahead allowed
-                // matching due to characters outside the match
-                real.replace.call(str.slice(match.index), r2, function () {
-                    for (var i = 1; i < arguments.length - 2; i++) {
-                        if (arguments[i] === undefined)
-                            match[i] = undefined;
-                    }
-                });
-            }
-            // Attach named capture properties
-            if (this._xregexp && this._xregexp.captureNames) {
-                for (var i = 1; i < match.length; i++) {
-                    name = this._xregexp.captureNames[i - 1];
-                    if (name)
-                       match[name] = match[i];
-                }
-            }
-            // Fix browsers that increment `lastIndex` after zero-length matches
-            if (!compliantLastIndexIncrement && this.global && !match[0].length && (this.lastIndex > match.index))
-                this.lastIndex--;
-        }
-        return match;
-    };
-
-    // Don't override `test` if it won't change anything
-    if (!compliantLastIndexIncrement) {
-        // Fix browser bug in native method
-        RegExp.prototype.test = function (str) {
-            // Use the native `exec` to skip some processing overhead, even though the overriden
-            // `exec` would take care of the `lastIndex` fix
-            var match = real.exec.call(this, str);
-            // Fix browsers that increment `lastIndex` after zero-length matches
-            if (match && this.global && !match[0].length && (this.lastIndex > match.index))
-                this.lastIndex--;
-            return !!match;
-        };
-    }
-
-    //---------------------------------
-    //  Private helper functions
-    //---------------------------------
-
-    function getNativeFlags (regex) {
-        return (regex.global     ? "g" : "") +
-               (regex.ignoreCase ? "i" : "") +
-               (regex.multiline  ? "m" : "") +
-               (regex.extended   ? "x" : "") + // Proposed for ES4; included in AS3
-               (regex.sticky     ? "y" : "");
-    };
-
-    function indexOf (array, item, from) {
-        if (Array.prototype.indexOf) // Use the native array method if available
-            return array.indexOf(item, from);
-        for (var i = from || 0; i < array.length; i++) {
-            if (array[i] === item)
-                return i;
-        }
-        return -1;
-    };
-
-});
-// vim: ts=4 sts=4 sw=4 expandtab
-// -- kriskowal Kris Kowal Copyright (C) 2009-2011 MIT License
-// -- tlrobinson Tom Robinson Copyright (C) 2009-2010 MIT License (Narwhal Project)
-// -- dantman Daniel Friesen Copyright (C) 2010 XXX TODO License or CLA
-// -- fschaefer Florian Schäfer Copyright (C) 2010 MIT License
-// -- Gozala Irakli Gozalishvili Copyright (C) 2010 MIT License
-// -- kitcambridge Kit Cambridge Copyright (C) 2011 MIT License
-// -- kossnocorp Sasha Koss XXX TODO License or CLA
-// -- bryanforbes Bryan Forbes XXX TODO License or CLA
-// -- killdream Quildreen Motta Copyright (C) 2011 MIT Licence
-// -- michaelficarra Michael Ficarra Copyright (C) 2011 3-clause BSD License
-// -- sharkbrainguy Gerard Paapu Copyright (C) 2011 MIT License
-// -- bbqsrc Brendan Molloy (C) 2011 Creative Commons Zero (public domain)
-// -- iwyg XXX TODO License or CLA
-// -- DomenicDenicola Domenic Denicola Copyright (C) 2011 MIT License
-// -- xavierm02 Montillet Xavier XXX TODO License or CLA
-// -- Raynos Raynos XXX TODO License or CLA
-// -- samsonjs Sami Samhuri Copyright (C) 2010 MIT License
-// -- rwldrn Rick Waldron Copyright (C) 2011 MIT License
-// -- lexer Alexey Zakharov XXX TODO License or CLA
-
-/*!
-    Copyright (c) 2009, 280 North Inc. http://280north.com/
-    MIT License. http://github.com/280north/narwhal/blob/master/README.md
-*/
-
-define('ace/lib/es5-shim', ['require', 'exports', 'module' ], function(require, exports, module) {
-
-/**
- * Brings an environment as close to ECMAScript 5 compliance
- * as is possible with the facilities of erstwhile engines.
- *
- * Annotated ES5: http://es5.github.com/ (specific links below)
- * ES5 Spec: http://www.ecma-international.org/publications/files/ECMA-ST/Ecma-262.pdf
- *
- * @module
- */
-
-/*whatsupdoc*/
-
-//
-// Function
-// ========
-//
-
-// ES-5 15.3.4.5
-// http://es5.github.com/#x15.3.4.5
-
-if (!Function.prototype.bind) {
-    Function.prototype.bind = function bind(that) { // .length is 1
-        // 1. Let Target be the this value.
-        var target = this;
-        // 2. If IsCallable(Target) is false, throw a TypeError exception.
-        if (typeof target != "function")
-            throw new TypeError(); // TODO message
-        // 3. Let A be a new (possibly empty) internal list of all of the
-        //   argument values provided after thisArg (arg1, arg2 etc), in order.
-        // XXX slicedArgs will stand in for "A" if used
-        var args = slice.call(arguments, 1); // for normal call
-        // 4. Let F be a new native ECMAScript object.
-        // 11. Set the [[Prototype]] internal property of F to the standard
-        //   built-in Function prototype object as specified in 15.3.3.1.
-        // 12. Set the [[Call]] internal property of F as described in
-        //   15.3.4.5.1.
-        // 13. Set the [[Construct]] internal property of F as described in
-        //   15.3.4.5.2.
-        // 14. Set the [[HasInstance]] internal property of F as described in
-        //   15.3.4.5.3.
-        var bound = function () {
-
-            if (this instanceof bound) {
-                // 15.3.4.5.2 [[Construct]]
-                // When the [[Construct]] internal method of a function object,
-                // F that was created using the bind function is called with a
-                // list of arguments ExtraArgs, the following steps are taken:
-                // 1. Let target be the value of F's [[TargetFunction]]
-                //   internal property.
-                // 2. If target has no [[Construct]] internal method, a
-                //   TypeError exception is thrown.
-                // 3. Let boundArgs be the value of F's [[BoundArgs]] internal
-                //   property.
-                // 4. Let args be a new list containing the same values as the
-                //   list boundArgs in the same order followed by the same
-                //   values as the list ExtraArgs in the same order.
-                // 5. Return the result of calling the [[Construct]] internal 
-                //   method of target providing args as the arguments.
-
-                var F = function(){};
-                F.prototype = target.prototype;
-                var self = new F;
-
-                var result = target.apply(
-                    self,
-                    args.concat(slice.call(arguments))
-                );
-                if (result !== null && Object(result) === result)
-                    return result;
-                return self;
-
-            } else {
-                // 15.3.4.5.1 [[Call]]
-                // When the [[Call]] internal method of a function object, F,
-                // which was created using the bind function is called with a
-                // this value and a list of arguments ExtraArgs, the following
-                // steps are taken:
-                // 1. Let boundArgs be the value of F's [[BoundArgs]] internal
-                //   property.
-                // 2. Let boundThis be the value of F's [[BoundThis]] internal
-                //   property.
-                // 3. Let target be the value of F's [[TargetFunction]] internal
-                //   property.
-                // 4. Let args be a new list containing the same values as the 
-                //   list boundArgs in the same order followed by the same 
-                //   values as the list ExtraArgs in the same order.
-                // 5. Return the result of calling the [[Call]] internal method 
-                //   of target providing boundThis as the this value and 
-                //   providing args as the arguments.
-
-                // equiv: target.call(this, ...boundArgs, ...args)
-                return target.apply(
-                    that,
-                    args.concat(slice.call(arguments))
-                );
-
-            }
-
-        };
-        // XXX bound.length is never writable, so don't even try
-        //
-        // 15. If the [[Class]] internal property of Target is "Function", then
-        //     a. Let L be the length property of Target minus the length of A.
-        //     b. Set the length own property of F to either 0 or L, whichever is 
-        //       larger.
-        // 16. Else set the length own property of F to 0.
-        // 17. Set the attributes of the length own property of F to the values
-        //   specified in 15.3.5.1.
-
-        // TODO
-        // 18. Set the [[Extensible]] internal property of F to true.
-        
-        // TODO
-        // 19. Let thrower be the [[ThrowTypeError]] function Object (13.2.3).
-        // 20. Call the [[DefineOwnProperty]] internal method of F with 
-        //   arguments "caller", PropertyDescriptor {[[Get]]: thrower, [[Set]]:
-        //   thrower, [[Enumerable]]: false, [[Configurable]]: false}, and 
-        //   false.
-        // 21. Call the [[DefineOwnProperty]] internal method of F with 
-        //   arguments "arguments", PropertyDescriptor {[[Get]]: thrower, 
-        //   [[Set]]: thrower, [[Enumerable]]: false, [[Configurable]]: false},
-        //   and false.
-
-        // TODO
-        // NOTE Function objects created using Function.prototype.bind do not 
-        // have a prototype property or the [[Code]], [[FormalParameters]], and
-        // [[Scope]] internal properties.
-        // XXX can't delete prototype in pure-js.
-
-        // 22. Return F.
-        return bound;
-    };
-}
-
-// Shortcut to an often accessed properties, in order to avoid multiple
-// dereference that costs universally.
-// _Please note: Shortcuts are defined after `Function.prototype.bind` as we
-// us it in defining shortcuts.
-var call = Function.prototype.call;
-var prototypeOfArray = Array.prototype;
-var prototypeOfObject = Object.prototype;
-var slice = prototypeOfArray.slice;
-var toString = call.bind(prototypeOfObject.toString);
-var owns = call.bind(prototypeOfObject.hasOwnProperty);
-
-// If JS engine supports accessors creating shortcuts.
-var defineGetter;
-var defineSetter;
-var lookupGetter;
-var lookupSetter;
-var supportsAccessors;
-if ((supportsAccessors = owns(prototypeOfObject, "__defineGetter__"))) {
-    defineGetter = call.bind(prototypeOfObject.__defineGetter__);
-    defineSetter = call.bind(prototypeOfObject.__defineSetter__);
-    lookupGetter = call.bind(prototypeOfObject.__lookupGetter__);
-    lookupSetter = call.bind(prototypeOfObject.__lookupSetter__);
-}
-
-//
-// Array
-// =====
-//
-
-// ES5 15.4.3.2
-// http://es5.github.com/#x15.4.3.2
-// https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/isArray
-if (!Array.isArray) {
-    Array.isArray = function isArray(obj) {
-        return toString(obj) == "[object Array]";
-    };
-}
-
-// The IsCallable() check in the Array functions
-// has been replaced with a strict check on the
-// internal class of the object to trap cases where
-// the provided function was actually a regular
-// expression literal, which in V8 and
-// JavaScriptCore is a typeof "function".  Only in
-// V8 are regular expression literals permitted as
-// reduce parameters, so it is desirable in the
-// general case for the shim to match the more
-// strict and common behavior of rejecting regular
-// expressions.
-
-// ES5 15.4.4.18
-// http://es5.github.com/#x15.4.4.18
-// https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/array/forEach
-if (!Array.prototype.forEach) {
-    Array.prototype.forEach = function forEach(fun /*, thisp*/) {
-        var self = toObject(this),
-            thisp = arguments[1],
-            i = 0,
-            length = self.length >>> 0;
-
-        // If no callback function or if callback is not a callable function
-        if (toString(fun) != "[object Function]") {
-            throw new TypeError(); // TODO message
-        }
-
-        while (i < length) {
-            if (i in self) {
-                // Invoke the callback function with call, passing arguments:
-                // context, property value, property key, thisArg object context
-                fun.call(thisp, self[i], i, self);
-            }
-            i++;
-        }
-    };
-}
-
-// ES5 15.4.4.19
-// http://es5.github.com/#x15.4.4.19
-// https://developer.mozilla.org/en/Core_JavaScript_1.5_Reference/Objects/Array/map
-if (!Array.prototype.map) {
-    Array.prototype.map = function map(fun /*, thisp*/) {
-        var self = toObject(this),
-            length = self.length >>> 0,
-            result = Array(length),
-            thisp = arguments[1];
-
-        // If no callback function or if callback is not a callable function
-        if (toString(fun) != "[object Function]") {
-            throw new TypeError(); // TODO message
-        }
-
-        for (var i = 0; i < length; i++) {
-            if (i in self)
-                result[i] = fun.call(thisp, self[i], i, self);
-        }
-        return result;
-    };
-}
-
-// ES5 15.4.4.20
-// http://es5.github.com/#x15.4.4.20
-// https://developer.mozilla.org/en/Core_JavaScript_1.5_Reference/Objects/Array/filter
-if (!Array.prototype.filter) {
-    Array.prototype.filter = function filter(fun /*, thisp */) {
-        var self = toObject(this),
-            length = self.length >>> 0,
-            result = [],
-            thisp = arguments[1];
-
-        // If no callback function or if callback is not a callable function
-        if (toString(fun) != "[object Function]") {
-            throw new TypeError(); // TODO message
-        }
-
-        for (var i = 0; i < length; i++) {
-            if (i in self && fun.call(thisp, self[i], i, self))
-                result.push(self[i]);
-        }
-        return result;
-    };
-}
-
-// ES5 15.4.4.16
-// http://es5.github.com/#x15.4.4.16
-// https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/every
-if (!Array.prototype.every) {
-    Array.prototype.every = function every(fun /*, thisp */) {
-        var self = toObject(this),
-            length = self.length >>> 0,
-            thisp = arguments[1];
-
-        // If no callback function or if callback is not a callable function
-        if (toString(fun) != "[object Function]") {
-            throw new TypeError(); // TODO message
-        }
-
-        for (var i = 0; i < length; i++) {
-            if (i in self && !fun.call(thisp, self[i], i, self))
-                return false;
-        }
-        return true;
-    };
-}
-
-// ES5 15.4.4.17
-// http://es5.github.com/#x15.4.4.17
-// https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/some
-if (!Array.prototype.some) {
-    Array.prototype.some = function some(fun /*, thisp */) {
-        var self = toObject(this),
-            length = self.length >>> 0,
-            thisp = arguments[1];
-
-        // If no callback function or if callback is not a callable function
-        if (toString(fun) != "[object Function]") {
-            throw new TypeError(); // TODO message
-        }
-
-        for (var i = 0; i < length; i++) {
-            if (i in self && fun.call(thisp, self[i], i, self))
-                return true;
-        }
-        return false;
-    };
-}
-
-// ES5 15.4.4.21
-// http://es5.github.com/#x15.4.4.21
-// https://developer.mozilla.org/en/Core_JavaScript_1.5_Reference/Objects/Array/reduce
-if (!Array.prototype.reduce) {
-    Array.prototype.reduce = function reduce(fun /*, initial*/) {
-        var self = toObject(this),
-            length = self.length >>> 0;
-
-        // If no callback function or if callback is not a callable function
-        if (toString(fun) != "[object Function]") {
-            throw new TypeError(); // TODO message
-        }
-
-        // no value to return if no initial value and an empty array
-        if (!length && arguments.length == 1)
-            throw new TypeError(); // TODO message
-
-        var i = 0;
-        var result;
-        if (arguments.length >= 2) {
-            result = arguments[1];
-        } else {
-            do {
-                if (i in self) {
-                    result = self[i++];
-                    break;
-                }
-
-                // if array contains no values, no initial value to return
-                if (++i >= length)
-                    throw new TypeError(); // TODO message
-            } while (true);
-        }
-
-        for (; i < length; i++) {
-            if (i in self)
-                result = fun.call(void 0, result, self[i], i, self);
-        }
-
-        return result;
-    };
-}
-
-// ES5 15.4.4.22
-// http://es5.github.com/#x15.4.4.22
-// https://developer.mozilla.org/en/Core_JavaScript_1.5_Reference/Objects/Array/reduceRight
-if (!Array.prototype.reduceRight) {
-    Array.prototype.reduceRight = function reduceRight(fun /*, initial*/) {
-        var self = toObject(this),
-            length = self.length >>> 0;
-
-        // If no callback function or if callback is not a callable function
-        if (toString(fun) != "[object Function]") {
-            throw new TypeError(); // TODO message
-        }
-
-        // no value to return if no initial value, empty array
-        if (!length && arguments.length == 1)
-            throw new TypeError(); // TODO message
-
-        var result, i = length - 1;
-        if (arguments.length >= 2) {
-            result = arguments[1];
-        } else {
-            do {
-                if (i in self) {
-                    result = self[i--];
-                    break;
-                }
-
-                // if array contains no values, no initial value to return
-                if (--i < 0)
-                    throw new TypeError(); // TODO message
-            } while (true);
-        }
-
-        do {
-            if (i in this)
-                result = fun.call(void 0, result, self[i], i, self);
-        } while (i--);
-
-        return result;
-    };
-}
-
-// ES5 15.4.4.14
-// http://es5.github.com/#x15.4.4.14
-// https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/indexOf
-if (!Array.prototype.indexOf) {
-    Array.prototype.indexOf = function indexOf(sought /*, fromIndex */ ) {
-        var self = toObject(this),
-            length = self.length >>> 0;
-
-        if (!length)
-            return -1;
-
-        var i = 0;
-        if (arguments.length > 1)
-            i = toInteger(arguments[1]);
-
-        // handle negative indices
-        i = i >= 0 ? i : Math.max(0, length + i);
-        for (; i < length; i++) {
-            if (i in self && self[i] === sought) {
-                return i;
-            }
-        }
-        return -1;
-    };
-}
-
-// ES5 15.4.4.15
-// http://es5.github.com/#x15.4.4.15
-// https://developer.mozilla.org/en/JavaScript/Reference/Global_Objects/Array/lastIndexOf
-if (!Array.prototype.lastIndexOf) {
-    Array.prototype.lastIndexOf = function lastIndexOf(sought /*, fromIndex */) {
-        var self = toObject(this),
-            length = self.length >>> 0;
-
-        if (!length)
-            return -1;
-        var i = length - 1;
-        if (arguments.length > 1)
-            i = Math.min(i, toInteger(arguments[1]));
-        // handle negative indices
-        i = i >= 0 ? i : length - Math.abs(i);
-        for (; i >= 0; i--) {
-            if (i in self && sought === self[i])
-                return i;
-        }
-        return -1;
-    };
-}
-
-//
-// Object
-// ======
-//
-
-// ES5 15.2.3.2
-// http://es5.github.com/#x15.2.3.2
-if (!Object.getPrototypeOf) {
-    // https://github.com/kriskowal/es5-shim/issues#issue/2
-    // http://ejohn.org/blog/objectgetprototypeof/
-    // recommended by fschaefer on github
-    Object.getPrototypeOf = function getPrototypeOf(object) {
-        return object.__proto__ || (
-            object.constructor ?
-            object.constructor.prototype :
-            prototypeOfObject
-        );
-    };
-}
-
-// ES5 15.2.3.3
-// http://es5.github.com/#x15.2.3.3
-if (!Object.getOwnPropertyDescriptor) {
-    var ERR_NON_OBJECT = "Object.getOwnPropertyDescriptor called on a " +
-                         "non-object: ";
-    Object.getOwnPropertyDescriptor = function getOwnPropertyDescriptor(object, property) {
-        if ((typeof object != "object" && typeof object != "function") || object === null)
-            throw new TypeError(ERR_NON_OBJECT + object);
-        // If object does not owns property return undefined immediately.
-        if (!owns(object, property))
-            return;
-
-        var descriptor, getter, setter;
-
-        // If object has a property then it's for sure both `enumerable` and
-        // `configurable`.
-        descriptor =  { enumerable: true, configurable: true };
-
-        // If JS engine supports accessor properties then property may be a
-        // getter or setter.
-        if (supportsAccessors) {
-            // Unfortunately `__lookupGetter__` will return a getter even
-            // if object has own non getter property along with a same named
-            // inherited getter. To avoid misbehavior we temporary remove
-            // `__proto__` so that `__lookupGetter__` will return getter only
-            // if it's owned by an object.
-            var prototype = object.__proto__;
-            object.__proto__ = prototypeOfObject;
-
-            var getter = lookupGetter(object, property);
-            var setter = lookupSetter(object, property);
-
-            // Once we have getter and setter we can put values back.
-            object.__proto__ = prototype;
-
-            if (getter || setter) {
-                if (getter) descriptor.get = getter;
-                if (setter) descriptor.set = setter;
-
-                // If it was accessor property we're done and return here
-                // in order to avoid adding `value` to the descriptor.
-                return descriptor;
-            }
-        }
-
-        // If we got this far we know that object has an own property that is
-        // not an accessor so we set it as a value and return descriptor.
-        descriptor.value = object[property];
-        return descriptor;
-    };
-}
-
-// ES5 15.2.3.4
-// http://es5.github.com/#x15.2.3.4
-if (!Object.getOwnPropertyNames) {
-    Object.getOwnPropertyNames = function getOwnPropertyNames(object) {
-        return Object.keys(object);
-    };
-}
-
-// ES5 15.2.3.5
-// http://es5.github.com/#x15.2.3.5
-if (!Object.create) {
-    Object.create = function create(prototype, properties) {
-        var object;
-        if (prototype === null) {
-            object = { "__proto__": null };
-        } else {
-            if (typeof prototype != "object")
-                throw new TypeError("typeof prototype["+(typeof prototype)+"] != 'object'");
-            var Type = function () {};
-            Type.prototype = prototype;
-            object = new Type();
-            // IE has no built-in implementation of `Object.getPrototypeOf`
-            // neither `__proto__`, but this manually setting `__proto__` will
-            // guarantee that `Object.getPrototypeOf` will work as expected with
-            // objects created using `Object.create`
-            object.__proto__ = prototype;
-        }
-        if (properties !== void 0)
-            Object.defineProperties(object, properties);
-        return object;
-    };
-}
-
-// ES5 15.2.3.6
-// http://es5.github.com/#x15.2.3.6
-
-// Patch for WebKit and IE8 standard mode
-// Designed by hax <hax.github.com>
-// related issue: https://github.com/kriskowal/es5-shim/issues#issue/5
-// IE8 Reference:
-//     http://msdn.microsoft.com/en-us/library/dd282900.aspx
-//     http://msdn.microsoft.com/en-us/library/dd229916.aspx
-// WebKit Bugs:
-//     https://bugs.webkit.org/show_bug.cgi?id=36423
-
-function doesDefinePropertyWork(object) {
-    try {
-        Object.defineProperty(object, "sentinel", {});
-        return "sentinel" in object;
-    } catch (exception) {
-        // returns falsy
-    }
-}
-
-// check whether defineProperty works if it's given. Otherwise,
-// shim partially.
-if (Object.defineProperty) {
-    var definePropertyWorksOnObject = doesDefinePropertyWork({});
-    var definePropertyWorksOnDom = typeof document == "undefined" ||
-        doesDefinePropertyWork(document.createElement("div"));
-    if (!definePropertyWorksOnObject || !definePropertyWorksOnDom) {
-        var definePropertyFallback = Object.defineProperty;
-    }
-}
-
-if (!Object.defineProperty || definePropertyFallback) {
-    var ERR_NON_OBJECT_DESCRIPTOR = "Property description must be an object: ";
-    var ERR_NON_OBJECT_TARGET = "Object.defineProperty called on non-object: "
-    var ERR_ACCESSORS_NOT_SUPPORTED = "getters & setters can not be defined " +
-                                      "on this javascript engine";
-
-    Object.defineProperty = function defineProperty(object, property, descriptor) {
-        if ((typeof object != "object" && typeof object != "function") || object === null)
-            throw new TypeError(ERR_NON_OBJECT_TARGET + object);
-        if ((typeof descriptor != "object" && typeof descriptor != "function") || descriptor === null)
-            throw new TypeError(ERR_NON_OBJECT_DESCRIPTOR + descriptor);
-
-        // make a valiant attempt to use the real defineProperty
-        // for I8's DOM elements.
-        if (definePropertyFallback) {
-            try {
-                return definePropertyFallback.call(Object, object, property, descriptor);
-            } catch (exception) {
-                // try the shim if the real one doesn't work
-            }
-        }
-
-        // If it's a data property.
-        if (owns(descriptor, "value")) {
-            // fail silently if "writable", "enumerable", or "configurable"
-            // are requested but not supported
-            /*
-            // alternate approach:
-            if ( // can't implement these features; allow false but not true
-                !(owns(descriptor, "writable") ? descriptor.writable : true) ||
-                !(owns(descriptor, "enumerable") ? descriptor.enumerable : true) ||
-                !(owns(descriptor, "configurable") ? descriptor.configurable : true)
-            )
-                throw new RangeError(
-                    "This implementation of Object.defineProperty does not " +
-                    "support configurable, enumerable, or writable."
-                );
-            */
-
-            if (supportsAccessors && (lookupGetter(object, property) ||
-                                      lookupSetter(object, property)))
-            {
-                // As accessors are supported only on engines implementing
-                // `__proto__` we can safely override `__proto__` while defining
-                // a property to make sure that we don't hit an inherited
-                // accessor.
-                var prototype = object.__proto__;
-                object.__proto__ = prototypeOfObject;
-                // Deleting a property anyway since getter / setter may be
-                // defined on object itself.
-                delete object[property];
-                object[property] = descriptor.value;
-                // Setting original `__proto__` back now.
-                object.__proto__ = prototype;
-            } else {
-                object[property] = descriptor.value;
-            }
-        } else {
-            if (!supportsAccessors)
-                throw new TypeError(ERR_ACCESSORS_NOT_SUPPORTED);
-            // If we got that far then getters and setters can be defined !!
-            if (owns(descriptor, "get"))
-                defineGetter(object, property, descriptor.get);
-            if (owns(descriptor, "set"))
-                defineSetter(object, property, descriptor.set);
-        }
-
-        return object;
-    };
-}
-
-// ES5 15.2.3.7
-// http://es5.github.com/#x15.2.3.7
-if (!Object.defineProperties) {
-    Object.defineProperties = function defineProperties(object, properties) {
-        for (var property in properties) {
-            if (owns(properties, property))
-                Object.defineProperty(object, property, properties[property]);
-        }
-        return object;
-    };
-}
-
-// ES5 15.2.3.8
-// http://es5.github.com/#x15.2.3.8
-if (!Object.seal) {
-    Object.seal = function seal(object) {
-        // this is misleading and breaks feature-detection, but
-        // allows "securable" code to "gracefully" degrade to working
-        // but insecure code.
-        return object;
-    };
-}
-
-// ES5 15.2.3.9
-// http://es5.github.com/#x15.2.3.9
-if (!Object.freeze) {
-    Object.freeze = function freeze(object) {
-        // this is misleading and breaks feature-detection, but
-        // allows "securable" code to "gracefully" degrade to working
-        // but insecure code.
-        return object;
-    };
-}
-
-// detect a Rhino bug and patch it
-try {
-    Object.freeze(function () {});
-} catch (exception) {
-    Object.freeze = (function freeze(freezeObject) {
-        return function freeze(object) {
-            if (typeof object == "function") {
-                return object;
-            } else {
-                return freezeObject(object);
-            }
-        };
-    })(Object.freeze);
-}
-
-// ES5 15.2.3.10
-// http://es5.github.com/#x15.2.3.10
-if (!Object.preventExtensions) {
-    Object.preventExtensions = function preventExtensions(object) {
-        // this is misleading and breaks feature-detection, but
-        // allows "securable" code to "gracefully" degrade to working
-        // but insecure code.
-        return object;
-    };
-}
-
-// ES5 15.2.3.11
-// http://es5.github.com/#x15.2.3.11
-if (!Object.isSealed) {
-    Object.isSealed = function isSealed(object) {
-        return false;
-    };
-}
-
-// ES5 15.2.3.12
-// http://es5.github.com/#x15.2.3.12
-if (!Object.isFrozen) {
-    Object.isFrozen = function isFrozen(object) {
-        return false;
-    };
-}
-
-// ES5 15.2.3.13
-// http://es5.github.com/#x15.2.3.13
-if (!Object.isExtensible) {
-    Object.isExtensible = function isExtensible(object) {
-        // 1. If Type(O) is not Object throw a TypeError exception.
-        if (Object(object) === object) {
-            throw new TypeError(); // TODO message
-        }
-        // 2. Return the Boolean value of the [[Extensible]] internal property of O.
-        var name = '';
-        while (owns(object, name)) {
-            name += '?';
-        }
-        object[name] = true;
-        var returnValue = owns(object, name);
-        delete object[name];
-        return returnValue;
-    };
-}
-
-// ES5 15.2.3.14
-// http://es5.github.com/#x15.2.3.14
-if (!Object.keys) {
-    // http://whattheheadsaid.com/2010/10/a-safer-object-keys-compatibility-implementation
-    var hasDontEnumBug = true,
-        dontEnums = [
-            "toString",
-            "toLocaleString",
-            "valueOf",
-            "hasOwnProperty",
-            "isPrototypeOf",
-            "propertyIsEnumerable",
-            "constructor"
-        ],
-        dontEnumsLength = dontEnums.length;
-
-    for (var key in {"toString": null})
-        hasDontEnumBug = false;
-
-    Object.keys = function keys(object) {
-
-        if ((typeof object != "object" && typeof object != "function") || object === null)
-            throw new TypeError("Object.keys called on a non-object");
-
-        var keys = [];
-        for (var name in object) {
-            if (owns(object, name)) {
-                keys.push(name);
-            }
-        }
-
-        if (hasDontEnumBug) {
-            for (var i = 0, ii = dontEnumsLength; i < ii; i++) {
-                var dontEnum = dontEnums[i];
-                if (owns(object, dontEnum)) {
-                    keys.push(dontEnum);
-                }
-            }
-        }
-
-        return keys;
-    };
-
-}
-
-//
-// Date
-// ====
-//
-
-// ES5 15.9.5.43
-// http://es5.github.com/#x15.9.5.43
-// This function returns a String value represent the instance in time 
-// represented by this Date object. The format of the String is the Date Time 
-// string format defined in 15.9.1.15. All fields are present in the String. 
-// The time zone is always UTC, denoted by the suffix Z. If the time value of 
-// this object is not a finite Number a RangeError exception is thrown.
-if (!Date.prototype.toISOString || (new Date(-62198755200000).toISOString().indexOf('-000001') === -1)) {
-    Date.prototype.toISOString = function toISOString() {
-        var result, length, value, year;
-        if (!isFinite(this))
-            throw new RangeError;
-
-        // the date time string format is specified in 15.9.1.15.
-        result = [this.getUTCMonth() + 1, this.getUTCDate(),
-            this.getUTCHours(), this.getUTCMinutes(), this.getUTCSeconds()];
-        year = this.getUTCFullYear();
-        year = (year < 0 ? '-' : (year > 9999 ? '+' : '')) + ('00000' + Math.abs(year)).slice(0 <= year && year <= 9999 ? -4 : -6);
-
-        length = result.length;
-        while (length--) {
-            value = result[length];
-            // pad months, days, hours, minutes, and seconds to have two digits.
-            if (value < 10)
-                result[length] = "0" + value;
-        }
-        // pad milliseconds to have three digits.
-        return year + "-" + result.slice(0, 2).join("-") + "T" + result.slice(2).join(":") + "." +
-            ("000" + this.getUTCMilliseconds()).slice(-3) + "Z";
-    }
-}
-
-// ES5 15.9.4.4
-// http://es5.github.com/#x15.9.4.4
-if (!Date.now) {
-    Date.now = function now() {
-        return new Date().getTime();
-    };
-}
-
-// ES5 15.9.5.44
-// http://es5.github.com/#x15.9.5.44
-// This function provides a String representation of a Date object for use by 
-// JSON.stringify (15.12.3).
-if (!Date.prototype.toJSON) {
-    Date.prototype.toJSON = function toJSON(key) {
-        // When the toJSON method is called with argument key, the following 
-        // steps are taken:
-
-        // 1.  Let O be the result of calling ToObject, giving it the this
-        // value as its argument.
-        // 2. Let tv be ToPrimitive(O, hint Number).
-        // 3. If tv is a Number and is not finite, return null.
-        // XXX
-        // 4. Let toISO be the result of calling the [[Get]] internal method of
-        // O with argument "toISOString".
-        // 5. If IsCallable(toISO) is false, throw a TypeError exception.
-        if (typeof this.toISOString != "function")
-            throw new TypeError(); // TODO message
-        // 6. Return the result of calling the [[Call]] internal method of
-        //  toISO with O as the this value and an empty argument list.
-        return this.toISOString();
-
-        // NOTE 1 The argument is ignored.
-
-        // NOTE 2 The toJSON function is intentionally generic; it does not
-        // require that its this value be a Date object. Therefore, it can be
-        // transferred to other kinds of objects for use as a method. However,
-        // it does require that any such object have a toISOString method. An
-        // object is free to use the argument key to filter its
-        // stringification.
-    };
-}
-
-// ES5 15.9.4.2
-// http://es5.github.com/#x15.9.4.2
-// based on work shared by Daniel Friesen (dantman)
-// http://gist.github.com/303249
-if (Date.parse("+275760-09-13T00:00:00.000Z") !== 8.64e15) {
-    // XXX global assignment won't work in embeddings that use
-    // an alternate object for the context.
-    Date = (function(NativeDate) {
-
-        // Date.length === 7
-        var Date = function Date(Y, M, D, h, m, s, ms) {
-            var length = arguments.length;
-            if (this instanceof NativeDate) {
-                var date = length == 1 && String(Y) === Y ? // isString(Y)
-                    // We explicitly pass it through parse:
-                    new NativeDate(Date.parse(Y)) :
-                    // We have to manually make calls depending on argument
-                    // length here
-                    length >= 7 ? new NativeDate(Y, M, D, h, m, s, ms) :
-                    length >= 6 ? new NativeDate(Y, M, D, h, m, s) :
-                    length >= 5 ? new NativeDate(Y, M, D, h, m) :
-                    length >= 4 ? new NativeDate(Y, M, D, h) :
-                    length >= 3 ? new NativeDate(Y, M, D) :
-                    length >= 2 ? new NativeDate(Y, M) :
-                    length >= 1 ? new NativeDate(Y) :
-                                  new NativeDate();
-                // Prevent mixups with unfixed Date object
-                date.constructor = Date;
-                return date;
-            }
-            return NativeDate.apply(this, arguments);
-        };
-
-        // 15.9.1.15 Date Time String Format.
-        var isoDateExpression = new RegExp("^" +
-            "(\\d{4}|[\+\-]\\d{6})" + // four-digit year capture or sign + 6-digit extended year
-            "(?:-(\\d{2})" + // optional month capture
-            "(?:-(\\d{2})" + // optional day capture
-            "(?:" + // capture hours:minutes:seconds.milliseconds
-                "T(\\d{2})" + // hours capture
-                ":(\\d{2})" + // minutes capture
-                "(?:" + // optional :seconds.milliseconds
-                    ":(\\d{2})" + // seconds capture
-                    "(?:\\.(\\d{3}))?" + // milliseconds capture
-                ")?" +
-            "(?:" + // capture UTC offset component
-                "Z|" + // UTC capture
-                "(?:" + // offset specifier +/-hours:minutes
-                    "([-+])" + // sign capture
-                    "(\\d{2})" + // hours offset capture
-                    ":(\\d{2})" + // minutes offset capture
-                ")" +
-            ")?)?)?)?" +
-        "$");
-
-        // Copy any custom methods a 3rd party library may have added
-        for (var key in NativeDate)
-            Date[key] = NativeDate[key];
-
-        // Copy "native" methods explicitly; they may be non-enumerable
-        Date.now = NativeDate.now;
-        Date.UTC = NativeDate.UTC;
-        Date.prototype = NativeDate.prototype;
-        Date.prototype.constructor = Date;
-
-        // Upgrade Date.parse to handle simplified ISO 8601 strings
-        Date.parse = function parse(string) {
-            var match = isoDateExpression.exec(string);
-            if (match) {
-                match.shift(); // kill match[0], the full match
-                // parse months, days, hours, minutes, seconds, and milliseconds
-                for (var i = 1; i < 7; i++) {
-                    // provide default values if necessary
-                    match[i] = +(match[i] || (i < 3 ? 1 : 0));
-                    // match[1] is the month. Months are 0-11 in JavaScript
-                    // `Date` objects, but 1-12 in ISO notation, so we
-                    // decrement.
-                    if (i == 1)
-                        match[i]--;
-                }
-
-                // parse the UTC offset component
-                var minuteOffset = +match.pop(), hourOffset = +match.pop(), sign = match.pop();
-
-                // compute the explicit time zone offset if specified
-                var offset = 0;
-                if (sign) {
-                    // detect invalid offsets and return early
-                    if (hourOffset > 23 || minuteOffset > 59)
-                        return NaN;
-
-                    // express the provided time zone offset in minutes. The offset is
-                    // negative for time zones west of UTC; positive otherwise.
-                    offset = (hourOffset * 60 + minuteOffset) * 6e4 * (sign == "+" ? -1 : 1);
-                }
-
-                // Date.UTC for years between 0 and 99 converts year to 1900 + year
-                // The Gregorian calendar has a 400-year cycle, so 
-                // to Date.UTC(year + 400, .... ) - 12622780800000 == Date.UTC(year, ...),
-                // where 12622780800000 - number of milliseconds in Gregorian calendar 400 years
-                var year = +match[0];
-                if (0 <= year && year <= 99) {
-                    match[0] = year + 400;
-                    return NativeDate.UTC.apply(this, match) + offset - 12622780800000;
-                }
-
-                // compute a new UTC date value, accounting for the optional offset
-                return NativeDate.UTC.apply(this, match) + offset;
-            }
-            return NativeDate.parse.apply(this, arguments);
-        };
-
-        return Date;
-    })(Date);
-}
-
-//
-// String
-// ======
-//
-
-// ES5 15.5.4.20
-// http://es5.github.com/#x15.5.4.20
-var ws = "\x09\x0A\x0B\x0C\x0D\x20\xA0\u1680\u180E\u2000\u2001\u2002\u2003" +
-    "\u2004\u2005\u2006\u2007\u2008\u2009\u200A\u202F\u205F\u3000\u2028" +
-    "\u2029\uFEFF";
-if (!String.prototype.trim || ws.trim()) {
-    // http://blog.stevenlevithan.com/archives/faster-trim-javascript
-    // http://perfectionkills.com/whitespace-deviations/
-    ws = "[" + ws + "]";
-    var trimBeginRegexp = new RegExp("^" + ws + ws + "*"),
-        trimEndRegexp = new RegExp(ws + ws + "*$");
-    String.prototype.trim = function trim() {
-        return String(this).replace(trimBeginRegexp, "").replace(trimEndRegexp, "");
-    };
-}
-
-//
-// Util
-// ======
-//
-
-// ES5 9.4
-// http://es5.github.com/#x9.4
-// http://jsperf.com/to-integer
-var toInteger = function (n) {
-    n = +n;
-    if (n !== n) // isNaN
-        n = 0;
-    else if (n !== 0 && n !== (1/0) && n !== -(1/0))
-        n = (n > 0 || -1) * Math.floor(Math.abs(n));
-    return n;
-};
-
-var prepareString = "a"[0] != "a",
-    // ES5 9.9
-    // http://es5.github.com/#x9.9
-    toObject = function (o) {
-        if (o == null) { // this matches both null and undefined
-            throw new TypeError(); // TODO message
-        }
-        // If the implementation doesn't support by-index access of
-        // string characters (ex. IE < 7), split the string
-        if (prepareString && typeof o == "string" && o) {
-            return o.split("");
-        }
-        return Object(o);
-    };
-});/* vim:ts=4:sts=4:sw=4:
- * ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *      Irakli Gozalishvili <rfobic@gmail.com> (http://jeditoolkit.com)
- *      Mike de Boer <mike AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/lib/event_emitter', ['require', 'exports', 'module' ], function(require, exports, module) {
-"use strict";
-
-var EventEmitter = {};
-
-EventEmitter._emit =
-EventEmitter._dispatchEvent = function(eventName, e) {
-    this._eventRegistry = this._eventRegistry || {};
-    this._defaultHandlers = this._defaultHandlers || {};
-
-    var listeners = this._eventRegistry[eventName] || [];
-    var defaultHandler = this._defaultHandlers[eventName];
-    if (!listeners.length && !defaultHandler)
-        return;
-
-    e = e || {};
-    e.type = eventName;
-    
-    if (!e.stopPropagation) {
-        e.stopPropagation = function() {
-            this.propagationStopped = true;
-        };
-    }
-    
-    if (!e.preventDefault) {
-        e.preventDefault = function() {
-            this.defaultPrevented = true;
-        };
-    }
-
-    for (var i=0; i<listeners.length; i++) {
-        listeners[i](e);
-        if (e.propagationStopped)
-            break;
-    }
-    
-    if (defaultHandler && !e.defaultPrevented)
-        defaultHandler(e);
-};
-
-EventEmitter.setDefaultHandler = function(eventName, callback) {
-    this._defaultHandlers = this._defaultHandlers || {};
-    
-    if (this._defaultHandlers[eventName])
-        throw new Error("The default handler for '" + eventName + "' is already set");
-        
-    this._defaultHandlers[eventName] = callback;
-};
-
-EventEmitter.on =
-EventEmitter.addEventListener = function(eventName, callback) {
-    this._eventRegistry = this._eventRegistry || {};
-
-    var listeners = this._eventRegistry[eventName];
-    if (!listeners)
-        var listeners = this._eventRegistry[eventName] = [];
-
-    if (listeners.indexOf(callback) == -1)
-        listeners.push(callback);
-};
-
-EventEmitter.removeListener =
-EventEmitter.removeEventListener = function(eventName, callback) {
-    this._eventRegistry = this._eventRegistry || {};
-
-    var listeners = this._eventRegistry[eventName];
-    if (!listeners)
-        return;
-
-    var index = listeners.indexOf(callback);
-    if (index !== -1)
-        listeners.splice(index, 1);
-};
-
-EventEmitter.removeAllListeners = function(eventName) {
-    if (this._eventRegistry) this._eventRegistry[eventName] = [];
-};
-
-exports.EventEmitter = EventEmitter;
-
-});/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/lib/oop', ['require', 'exports', 'module' ], function(require, exports, module) {
-"use strict";
-
-exports.inherits = (function() {
-    var tempCtor = function() {};
-    return function(ctor, superCtor) {
-        tempCtor.prototype = superCtor.prototype;
-        ctor.super_ = superCtor.prototype;
-        ctor.prototype = new tempCtor();
-        ctor.prototype.constructor = ctor;
-    };
-}());
-
-exports.mixin = function(obj, mixin) {
-    for (var key in mixin) {
-        obj[key] = mixin[key];
-    }
-};
-
-exports.implement = function(proto, mixin) {
-    exports.mixin(proto, mixin);
-};
-
-});
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/mode/json_worker', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/worker/mirror', 'ace/mode/json/json_parse'], function(require, exports, module) {
-"use strict";
-
-var oop = require("../lib/oop");
-var Mirror = require("../worker/mirror").Mirror;
-var parse = require("./json/json_parse");
-
-var JsonWorker = exports.JsonWorker = function(sender) {
-    Mirror.call(this, sender);
-    this.setTimeout(200);
-};
-
-oop.inherits(JsonWorker, Mirror);
-
-(function() {
-
-    this.onUpdate = function() {
-        var value = this.doc.getValue();
-
-        try {
-            var result = parse(value);
-        } catch (e) {
-            var pos = this.charToDocumentPosition(e.at-1);
-            this.sender.emit("error", {
-                row: pos.row,
-                column: pos.column,
-                text: e.message,
-                type: "error"
-            });
-            return;
-        }
-        this.sender.emit("ok");
-    };
-
-    this.charToDocumentPosition = function(charPos) {
-        var i = 0;
-        var len = this.doc.getLength();
-        var nl = this.doc.getNewLineCharacter().length;
-
-        if (!len) {
-            return { row: 0, column: 0};
-        }
-
-        var lineStart = 0;
-        while (i < len) {
-            var line = this.doc.getLine(i);
-            var lineLength = line.length + nl;
-            if (lineStart + lineLength > charPos)
-                return {
-                    row: i,
-                    column: charPos - lineStart
-                };
-
-            lineStart += lineLength;
-            i += 1;
-        }
-
-        return {
-            row: i-1,
-            column: line.length
-        };
-    };
-
-}).call(JsonWorker.prototype);
-
-});define('ace/worker/mirror', ['require', 'exports', 'module' , 'ace/document', 'ace/lib/lang'], function(require, exports, module) {
-"use strict";
-
-var Document = require("../document").Document;
-var lang = require("../lib/lang");
-    
-var Mirror = exports.Mirror = function(sender) {
-    this.sender = sender;
-    var doc = this.doc = new Document("");
-    
-    var deferredUpdate = this.deferredUpdate = lang.deferredCall(this.onUpdate.bind(this));
-    
-    var _self = this;
-    sender.on("change", function(e) {
-        doc.applyDeltas([e.data]);        
-        deferredUpdate.schedule(_self.$timeout);
-    });
-};
-
-(function() {
-    
-    this.$timeout = 500;
-    
-    this.setTimeout = function(timeout) {
-        this.$timeout = timeout;
-    };
-    
-    this.setValue = function(value) {
-        this.doc.setValue(value);
-        this.deferredUpdate.schedule(this.$timeout);
-    };
-    
-    this.getValue = function(callbackId) {
-        this.sender.callback(this.doc.getValue(), callbackId);
-    };
-    
-    this.onUpdate = function() {
-        // abstract method
-    };
-    
-}).call(Mirror.prototype);
-
-});/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/document', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/event_emitter', 'ace/range', 'ace/anchor'], function(require, exports, module) {
-"use strict";
-
-var oop = require("./lib/oop");
-var EventEmitter = require("./lib/event_emitter").EventEmitter;
-var Range = require("./range").Range;
-var Anchor = require("./anchor").Anchor;
-
-var Document = function(text) {
-    this.$lines = [];
-
-    if (Array.isArray(text)) {
-        this.insertLines(0, text);
-    }
-    // There has to be one line at least in the document. If you pass an empty
-    // string to the insert function, nothing will happen. Workaround.
-    else if (text.length == 0) {
-        this.$lines = [""];
-    } else {
-        this.insert({row: 0, column:0}, text);
-    }
-};
-
-(function() {
-
-    oop.implement(this, EventEmitter);
-
-    this.setValue = function(text) {
-        var len = this.getLength();
-        this.remove(new Range(0, 0, len, this.getLine(len-1).length));
-        this.insert({row: 0, column:0}, text);
-    };
-
-    this.getValue = function() {
-        return this.getAllLines().join(this.getNewLineCharacter());
-    };
-
-    this.createAnchor = function(row, column) {
-        return new Anchor(this, row, column);
-    };
-
-    // check for IE split bug
-    if ("aaa".split(/a/).length == 0)
-        this.$split = function(text) {
-            return text.replace(/\r\n|\r/g, "\n").split("\n");
-        }
-    else
-        this.$split = function(text) {
-            return text.split(/\r\n|\r|\n/);
-        };
-
-
-    this.$detectNewLine = function(text) {
-        var match = text.match(/^.*?(\r\n|\r|\n)/m);
-        if (match) {
-            this.$autoNewLine = match[1];
-        } else {
-            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(newLineMode) {
-        if (this.$newLineMode === newLineMode)
-            return;
-
-        this.$newLineMode = newLineMode;
-    };
-
-    this.getNewLineMode = function() {
-        return this.$newLineMode;
-    };
-
-    this.isNewLine = function(text) {
-        return (text == "\r\n" || text == "\r" || text == "\n");
-    };
-
-    /**
-     * Get a verbatim copy of the given line as it is in the document
-     */
-    this.getLine = function(row) {
-        return this.$lines[row] || "";
-    };
-
-    this.getLines = function(firstRow, lastRow) {
-        return this.$lines.slice(firstRow, lastRow + 1);
-    };
-
-    /**
-     * Returns all lines in the document as string array. Warning: The caller
-     * should not modify this array!
-     */
-    this.getAllLines = function() {
-        return this.getLines(0, this.getLength());
-    };
-
-    this.getLength = function() {
-        return this.$lines.length;
-    };
-
-    this.getTextRange = function(range) {
-        if (range.start.row == range.end.row) {
-            return this.$lines[range.start.row].substring(range.start.column,
-                                                         range.end.column);
-        }
-        else {
-            var lines = [];
-            lines.push(this.$lines[range.start.row].substring(range.start.column));
-            lines.push.apply(lines, this.getLines(range.start.row+1, range.end.row-1));
-            lines.push(this.$lines[range.end.row].substring(0, range.end.column));
-            return lines.join(this.getNewLineCharacter());
-        }
-    };
-
-    this.$clipPosition = function(position) {
-        var length = this.getLength();
-        if (position.row >= length) {
-            position.row = Math.max(0, length - 1);
-            position.column = this.getLine(length-1).length;
-        }
-        return position;
-    };
-
-    this.insert = function(position, text) {
-        if (!text || text.length === 0)
-            return position;
-
-        position = this.$clipPosition(position);
-
-        // only detect new lines if the document has no line break yet
-        if (this.getLength() <= 1)
-            this.$detectNewLine(text);
-
-        var lines = this.$split(text);
-        var firstLine = lines.splice(0, 1)[0];
-        var lastLine = lines.length == 0 ? null : lines.splice(lines.length - 1, 1)[0];
-
-        position = this.insertInLine(position, firstLine);
-        if (lastLine !== null) {
-            position = this.insertNewLine(position); // terminate first line
-            position = this.insertLines(position.row, lines);
-            position = this.insertInLine(position, lastLine || "");
-        }
-        return position;
-    };
-
-    this.insertLines = function(row, lines) {
-        if (lines.length == 0)
-            return {row: row, column: 0};
-
-        var args = [row, 0];
-        args.push.apply(args, lines);
-        this.$lines.splice.apply(this.$lines, args);
-
-        var range = new Range(row, 0, row + lines.length, 0);
-        var delta = {
-            action: "insertLines",
-            range: range,
-            lines: lines
-        };
-        this._emit("change", { data: delta });
-        return range.end;
-    };
-
-    this.insertNewLine = function(position) {
-        position = this.$clipPosition(position);
-        var line = this.$lines[position.row] || "";
-
-        this.$lines[position.row] = line.substring(0, position.column);
-        this.$lines.splice(position.row + 1, 0, line.substring(position.column, line.length));
-
-        var end = {
-            row : position.row + 1,
-            column : 0
-        };
-
-        var delta = {
-            action: "insertText",
-            range: Range.fromPoints(position, end),
-            text: this.getNewLineCharacter()
-        };
-        this._emit("change", { data: delta });
-
-        return end;
-    };
-
-    this.insertInLine = function(position, text) {
-        if (text.length == 0)
-            return position;
-
-        var line = this.$lines[position.row] || "";
-
-        this.$lines[position.row] = line.substring(0, position.column) + text
-                + line.substring(position.column);
-
-        var end = {
-            row : position.row,
-            column : position.column + text.length
-        };
-
-        var delta = {
-            action: "insertText",
-            range: Range.fromPoints(position, end),
-            text: text
-        };
-        this._emit("change", { data: delta });
-
-        return end;
-    };
-
-    this.remove = function(range) {
-        // clip to document
-        range.start = this.$clipPosition(range.start);
-        range.end = this.$clipPosition(range.end);
-
-        if (range.isEmpty())
-            return range.start;
-
-        var firstRow = range.start.row;
-        var lastRow = range.end.row;
-
-        if (range.isMultiLine()) {
-            var firstFullRow = range.start.column == 0 ? firstRow : firstRow + 1;
-            var lastFullRow = lastRow - 1;
-
-            if (range.end.column > 0)
-                this.removeInLine(lastRow, 0, range.end.column);
-
-            if (lastFullRow >= firstFullRow)
-                this.removeLines(firstFullRow, lastFullRow);
-
-            if (firstFullRow != firstRow) {
-                this.removeInLine(firstRow, range.start.column, this.getLine(firstRow).length);
-                this.removeNewLine(range.start.row);
-            }
-        }
-        else {
-            this.removeInLine(firstRow, range.start.column, range.end.column);
-        }
-        return range.start;
-    };
-
-    this.removeInLine = function(row, startColumn, endColumn) {
-        if (startColumn == endColumn)
-            return;
-
-        var range = new Range(row, startColumn, row, endColumn);
-        var line = this.getLine(row);
-        var removed = line.substring(startColumn, endColumn);
-        var newLine = line.substring(0, startColumn) + line.substring(endColumn, line.length);
-        this.$lines.splice(row, 1, newLine);
-
-        var delta = {
-            action: "removeText",
-            range: range,
-            text: removed
-        };
-        this._emit("change", { data: delta });
-        return range.start;
-    };
-
-    /**
-     * Removes a range of full lines
-     *
-     * @param firstRow {Integer} The first row to be removed
-     * @param lastRow {Integer} The last row to be removed
-     * @return {String[]} The removed lines
-     */
-    this.removeLines = function(firstRow, lastRow) {
-        var range = new Range(firstRow, 0, lastRow + 1, 0);
-        var removed = this.$lines.splice(firstRow, lastRow - firstRow + 1);
-
-        var delta = {
-            action: "removeLines",
-            range: range,
-            nl: this.getNewLineCharacter(),
-            lines: removed
-        };
-        this._emit("change", { data: delta });
-        return removed;
-    };
-
-    this.removeNewLine = function(row) {
-        var firstLine = this.getLine(row);
-        var secondLine = this.getLine(row+1);
-
-        var range = new Range(row, firstLine.length, row+1, 0);
-        var line = firstLine + secondLine;
-
-        this.$lines.splice(row, 2, line);
-
-        var delta = {
-            action: "removeText",
-            range: range,
-            text: this.getNewLineCharacter()
-        };
-        this._emit("change", { data: delta });
-    };
-
-    this.replace = function(range, text) {
-        if (text.length == 0 && range.isEmpty())
-            return range.start;
-
-        // Shortcut: If the text we want to insert is the same as it is already
-        // in the document, we don't have to replace anything.
-        if (text == this.getTextRange(range))
-            return range.end;
-
-        this.remove(range);
-        if (text) {
-            var end = this.insert(range.start, text);
-        }
-        else {
-            end = range.start;
-        }
-
-        return end;
-    };
-
-    this.applyDeltas = function(deltas) {
-        for (var i=0; i<deltas.length; i++) {
-            var delta = deltas[i];
-            var range = Range.fromPoints(delta.range.start, delta.range.end);
-
-            if (delta.action == "insertLines")
-                this.insertLines(range.start.row, delta.lines);
-            else if (delta.action == "insertText")
-                this.insert(range.start, delta.text);
-            else if (delta.action == "removeLines")
-                this.removeLines(range.start.row, range.end.row - 1);
-            else if (delta.action == "removeText")
-                this.remove(range);
-        }
-    };
-
-    this.revertDeltas = function(deltas) {
-        for (var i=deltas.length-1; i>=0; i--) {
-            var delta = deltas[i];
-
-            var range = Range.fromPoints(delta.range.start, delta.range.end);
-
-            if (delta.action == "insertLines")
-                this.removeLines(range.start.row, range.end.row - 1);
-            else if (delta.action == "insertText")
-                this.remove(range);
-            else if (delta.action == "removeLines")
-                this.insertLines(range.start.row, delta.lines);
-            else if (delta.action == "removeText")
-                this.insert(range.start, delta.text);
-        }
-    };
-
-}).call(Document.prototype);
-
-exports.Document = Document;
-});
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/range', ['require', 'exports', 'module' ], function(require, exports, module) {
-"use strict";
-
-var Range = function(startRow, startColumn, endRow, endColumn) {
-    this.start = {
-        row: startRow,
-        column: startColumn
-    };
-
-    this.end = {
-        row: endRow,
-        column: endColumn
-    };
-};
-
-(function() {
-    this.isEqual = function(range) {
-        return this.start.row == range.start.row &&
-            this.end.row == range.end.row &&
-            this.start.column == range.start.column &&
-            this.end.column == range.end.column
-    };
-
-    this.toString = function() {
-        return ("Range: [" + this.start.row + "/" + this.start.column +
-            "] -> [" + this.end.row + "/" + this.end.column + "]");
-    };
-
-    this.contains = function(row, column) {
-        return this.compare(row, column) == 0;
-    };
-
-    /**
-     * Compares this range (A) with another range (B), where B is the passed in
-     * range.
-     *
-     * Return values:
-     *  -2: (B) is infront of (A) and doesn't intersect with (A)
-     *  -1: (B) begins before (A) but ends inside of (A)
-     *   0: (B) is completly inside of (A) OR (A) is complety inside of (B)
-     *  +1: (B) begins inside of (A) but ends outside of (A)
-     *  +2: (B) is after (A) and doesn't intersect with (A)
-     *
-     *  42: FTW state: (B) ends in (A) but starts outside of (A)
-     */
-    this.compareRange = function(range) {
-        var cmp,
-            end = range.end,
-            start = range.start;
-
-        cmp = this.compare(end.row, end.column);
-        if (cmp == 1) {
-            cmp = this.compare(start.row, start.column);
-            if (cmp == 1) {
-                return 2;
-            } else if (cmp == 0) {
-                return 1;
-            } else {
-                return 0;
-            }
-        } else if (cmp == -1) {
-            return -2;
-        } else {
-            cmp = this.compare(start.row, start.column);
-            if (cmp == -1) {
-                return -1;
-            } else if (cmp == 1) {
-                return 42;
-            } else {
-                return 0;
-            }
-        }
-    }
-
-    this.comparePoint = function(p) {
-        return this.compare(p.row, p.column);
-    }
-
-    this.containsRange = function(range) {
-        return this.comparePoint(range.start) == 0 && this.comparePoint(range.end) == 0;
-    }
-
-    this.intersectsRange = function(range) {
-        var cmp = this.compareRange(range);
-        return (cmp == -1 || cmp == 0 || cmp == 1);
-    }
-
-    this.isEnd = function(row, column) {
-        return this.end.row == row && this.end.column == column;
-    }
-
-    this.isStart = function(row, column) {
-        return this.start.row == row && this.start.column == column;
-    }
-
-    this.setStart = function(row, column) {
-        if (typeof row == "object") {
-            this.start.column = row.column;
-            this.start.row = row.row;
-        } else {
-            this.start.row = row;
-            this.start.column = column;
-        }
-    }
-
-    this.setEnd = function(row, column) {
-        if (typeof row == "object") {
-            this.end.column = row.column;
-            this.end.row = row.row;
-        } else {
-            this.end.row = row;
-            this.end.column = column;
-        }
-    }
-
-    this.inside = function(row, column) {
-        if (this.compare(row, column) == 0) {
-            if (this.isEnd(row, column) || this.isStart(row, column)) {
-                return false;
-            } else {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    this.insideStart = function(row, column) {
-        if (this.compare(row, column) == 0) {
-            if (this.isEnd(row, column)) {
-                return false;
-            } else {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    this.insideEnd = function(row, column) {
-        if (this.compare(row, column) == 0) {
-            if (this.isStart(row, column)) {
-                return false;
-            } else {
-                return true;
-            }
-        }
-        return false;
-    }
-
-    this.compare = function(row, column) {
-        if (!this.isMultiLine()) {
-            if (row === this.start.row) {
-                return column < this.start.column ? -1 : (column > this.end.column ? 1 : 0);
-            };
-        }
-
-        if (row < this.start.row)
-            return -1;
-
-        if (row > this.end.row)
-            return 1;
-
-        if (this.start.row === row)
-            return column >= this.start.column ? 0 : -1;
-
-        if (this.end.row === row)
-            return column <= this.end.column ? 0 : 1;
-
-        return 0;
-    };
-
-    /**
-     * Like .compare(), but if isStart is true, return -1;
-     */
-    this.compareStart = function(row, column) {
-        if (this.start.row == row && this.start.column == column) {
-            return -1;
-        } else {
-            return this.compare(row, column);
-        }
-    }
-
-    /**
-     * Like .compare(), but if isEnd is true, return 1;
-     */
-    this.compareEnd = function(row, column) {
-        if (this.end.row == row && this.end.column == column) {
-            return 1;
-        } else {
-            return this.compare(row, column);
-        }
-    }
-
-    this.compareInside = function(row, column) {
-        if (this.end.row == row && this.end.column == column) {
-            return 1;
-        } else if (this.start.row == row && this.start.column == column) {
-            return -1;
-        } else {
-            return this.compare(row, column);
-        }
-    }
-
-    this.clipRows = function(firstRow, lastRow) {
-        if (this.end.row > lastRow) {
-            var end = {
-                row: lastRow+1,
-                column: 0
-            };
-        }
-
-        if (this.start.row > lastRow) {
-            var start = {
-                row: lastRow+1,
-                column: 0
-            };
-        }
-
-        if (this.start.row < firstRow) {
-            var start = {
-                row: firstRow,
-                column: 0
-            };
-        }
-
-        if (this.end.row < firstRow) {
-            var end = {
-                row: firstRow,
-                column: 0
-            };
-        }
-        return Range.fromPoints(start || this.start, end || this.end);
-    };
-
-    this.extend = function(row, column) {
-        var cmp = this.compare(row, column);
-
-        if (cmp == 0)
-            return this;
-        else if (cmp == -1)
-            var start = {row: row, column: column};
-        else
-            var end = {row: row, column: column};
-
-        return Range.fromPoints(start || this.start, end || 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 false;
-        }
-        
-        var temp = this.start;
-        this.end = this.start;
-        this.start = temp;
-        return true;
-    };
-
-
-    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 Range.fromPoints(this.start, this.end);
-    };
-
-    this.collapseRows = function() {
-        if (this.end.column == 0)
-            return new Range(this.start.row, 0, Math.max(this.start.row, this.end.row-1), 0)
-        else
-            return new Range(this.start.row, 0, this.end.row, 0)
-    };
-
-    this.toScreenRange = function(session) {
-        var screenPosStart =
-            session.documentToScreenPosition(this.start);
-        var screenPosEnd =
-            session.documentToScreenPosition(this.end);
-
-        return new Range(
-            screenPosStart.row, screenPosStart.column,
-            screenPosEnd.row, screenPosEnd.column
-        );
-    };
-
-}).call(Range.prototype);
-
-
-Range.fromPoints = function(start, end) {
-    return new Range(start.row, start.column, end.row, end.column);
-};
-
-exports.Range = Range;
-});
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/anchor', ['require', 'exports', 'module' , 'ace/lib/oop', 'ace/lib/event_emitter'], function(require, exports, module) {
-"use strict";
-
-var oop = require("./lib/oop");
-var EventEmitter = require("./lib/event_emitter").EventEmitter;
-
-/**
- * An Anchor is a floating pointer in the document. Whenever text is inserted or
- * deleted before the cursor, the position of the cursor is updated
- */
-var Anchor = exports.Anchor = function(doc, row, column) {
-    this.document = doc;
-    
-    if (typeof column == "undefined")
-        this.setPosition(row.row, row.column);
-    else
-        this.setPosition(row, column);
-
-    this.$onChange = this.onChange.bind(this);
-    doc.on("change", this.$onChange);
-};
-
-(function() {
-
-    oop.implement(this, EventEmitter);
-    
-    this.getPosition = function() {
-        return this.$clipPositionToDocument(this.row, this.column);
-    };
-    
-    this.getDocument = function() {
-        return this.document;
-    };
-    
-    this.onChange = function(e) {
-        var delta = e.data;
-        var range = delta.range;
-            
-        if (range.start.row == range.end.row && range.start.row != this.row)
-            return;
-            
-        if (range.start.row > this.row)
-            return;
-            
-        if (range.start.row == this.row && range.start.column > this.column)
-            return;
-    
-        var row = this.row;
-        var column = this.column;
-        
-        if (delta.action === "insertText") {
-            if (range.start.row === row && range.start.column <= column) {
-                if (range.start.row === range.end.row) {
-                    column += range.end.column - range.start.column;
-                }
-                else {
-                    column -= range.start.column;
-                    row += range.end.row - range.start.row;
-                }
-            }
-            else if (range.start.row !== range.end.row && range.start.row < row) {
-                row += range.end.row - range.start.row;
-            }
-        } else if (delta.action === "insertLines") {
-            if (range.start.row <= row) {
-                row += range.end.row - range.start.row;
-            }
-        }
-        else if (delta.action == "removeText") {
-            if (range.start.row == row && range.start.column < column) {
-                if (range.end.column >= column)
-                    column = range.start.column;
-                else
-                    column = Math.max(0, column - (range.end.column - range.start.column));
-                
-            } else if (range.start.row !== range.end.row && range.start.row < row) {
-                if (range.end.row == row) {
-                    column = Math.max(0, column - range.end.column) + range.start.column;
-                }
-                row -= (range.end.row - range.start.row);
-            }
-            else if (range.end.row == row) {
-                row -= range.end.row - range.start.row;
-                column = Math.max(0, column - range.end.column) + range.start.column;
-            }
-        } else if (delta.action == "removeLines") {
-            if (range.start.row <= row) {
-                if (range.end.row <= row)
-                    row -= range.end.row - range.start.row;
-                else {
-                    row = range.start.row;
-                    column = 0;
-                }
-            }
-        }
-
-        this.setPosition(row, column, true);
-    };
-
-    this.setPosition = function(row, column, noClip) {
-        var pos;
-        if (noClip) {
-            pos = {
-                row: row,
-                column: column
-            };
-        }
-        else {
-            pos = this.$clipPositionToDocument(row, column);
-        }
-        
-        if (this.row == pos.row && this.column == pos.column)
-            return;
-            
-        var old = {
-            row: this.row,
-            column: this.column
-        };
-        
-        this.row = pos.row;
-        this.column = pos.column;
-        this._emit("change", {
-            old: old,
-            value: pos
-        });
-    };
-    
-    this.detach = function() {
-        this.document.removeEventListener("change", this.$onChange);
-    };
-    
-    this.$clipPositionToDocument = function(row, column) {
-        var pos = {};
-    
-        if (row >= this.document.getLength()) {
-            pos.row = Math.max(0, this.document.getLength() - 1);
-            pos.column = this.document.getLine(pos.row).length;
-        }
-        else if (row < 0) {
-            pos.row = 0;
-            pos.column = 0;
-        }
-        else {
-            pos.row = row;
-            pos.column = Math.min(this.document.getLine(pos.row).length, Math.max(0, column));
-        }
-        
-        if (column < 0)
-            pos.column = 0;
-            
-        return pos;
-    };
-    
-}).call(Anchor.prototype);
-
-});
-/* ***** 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 Ajax.org Code Editor (ACE).
- *
- * The Initial Developer of the Original Code is
- * Ajax.org B.V.
- * Portions created by the Initial Developer are Copyright (C) 2010
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *      Fabian Jakobs <fabian AT ajax DOT org>
- *
- * 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 ***** */
-
-define('ace/lib/lang', ['require', 'exports', 'module' ], function(require, exports, module) {
-"use strict";
-
-exports.stringReverse = function(string) {
-    return string.split("").reverse().join("");
-};
-
-exports.stringRepeat = function (string, count) {
-     return new Array(count + 1).join(string);
-};
-
-var trimBeginRegexp = /^\s\s*/;
-var trimEndRegexp = /\s\s*$/;
-
-exports.stringTrimLeft = function (string) {
-    return string.replace(trimBeginRegexp, '');
-};
-
-exports.stringTrimRight = function (string) {
-    return string.replace(trimEndRegexp, '');
-};
-
-exports.copyObject = function(obj) {
-    var copy = {};
-    for (var key in obj) {
-        copy[key] = obj[key];
-    }
-    return copy;
-};
-
-exports.copyArray = function(array){
-    var copy = [];
-    for (var i=0, l=array.length; i<l; i++) {
-        if (array[i] && typeof array[i] == "object")
-            copy[i] = this.copyObject( array[i] );
-        else 
-            copy[i] = array[i];
-    }
-    return copy;
-};
-
-exports.deepCopy = function (obj) {
-    if (typeof obj != "object") {
-        return obj;
-    }
-    
-    var copy = obj.constructor();
-    for (var key in obj) {
-        if (typeof obj[key] == "object") {
-            copy[key] = this.deepCopy(obj[key]);
-        } else {
-            copy[key] = obj[key];
-        }
-    }
-    return copy;
-};
-
-exports.arrayToMap = function(arr) {
-    var map = {};
-    for (var i=0; i<arr.length; i++) {
-        map[arr[i]] = 1;
-    }
-    return map;
-
-};
-
-/**
- * splice out of 'array' anything that === 'value'
- */
-exports.arrayRemove = function(array, value) {
-  for (var i = 0; i <= array.length; i++) {
-    if (value === array[i]) {
-      array.splice(i, 1);
-    }
-  }
-};
-
-exports.escapeRegExp = function(str) {
-    return str.replace(/([.*+?^${}()|[\]\/\\])/g, '\\$1');
-};
-
-exports.deferredCall = function(fcn) {
-
-    var timer = null;
-    var callback = function() {
-        timer = null;
-        fcn();
-    };
-
-    var deferred = function(timeout) {
-        deferred.cancel();
-        timer = setTimeout(callback, timeout || 0);
-        return deferred;
-    };
-
-    deferred.schedule = deferred;
-
-    deferred.call = function() {
-        this.cancel();
-        fcn();
-        return deferred;
-    };
-
-    deferred.cancel = function() {
-        clearTimeout(timer);
-        timer = null;
-        return deferred;
-    };
-
-    return deferred;
-};
-
-});
-/*
-    http://www.JSON.org/json_parse.js
-    2008-09-18
-
-    Public Domain.
-
-    NO WARRANTY EXPRESSED OR IMPLIED. USE AT YOUR OWN RISK.
-
-    This file creates a json_parse function.
-
-        json_parse(text, reviver)
-            This method parses a JSON text to produce an object or array.
-            It can throw a SyntaxError exception.
-
-            The optional reviver parameter is a function that can filter and
-            transform the results. It receives each of the keys and values,
-            and its return value is used instead of the original value.
-            If it returns what it received, then the structure is not modified.
-            If it returns undefined then the member is deleted.
-
-            Example:
-
-            // Parse the text. Values that look like ISO date strings will
-            // be converted to Date objects.
-
-            myData = json_parse(text, function (key, value) {
-                var a;
-                if (typeof value === 'string') {
-                    a =
-/^(\d{4})-(\d{2})-(\d{2})T(\d{2}):(\d{2}):(\d{2}(?:\.\d*)?)Z$/.exec(value);
-                    if (a) {
-                        return new Date(Date.UTC(+a[1], +a[2] - 1, +a[3], +a[4],
-                            +a[5], +a[6]));
-                    }
-                }
-                return value;
-            });
-
-    This is a reference implementation. You are free to copy, modify, or
-    redistribute.
-
-    This code should be minified before deployment.
-    See http://javascript.crockford.com/jsmin.html
-
-    USE YOUR OWN COPY. IT IS EXTREMELY UNWISE TO LOAD CODE FROM SERVERS YOU DO
-    NOT CONTROL.
-*/
-
-/*members "", "\"", "\/", "\\", at, b, call, charAt, f, fromCharCode,
-    hasOwnProperty, message, n, name, push, r, t, text
-*/
-
-define('ace/mode/json/json_parse', ['require', 'exports', 'module' ], function(require, exports, module) {
-"use strict";
-
-// This is a function that can parse a JSON text, producing a JavaScript
-// data structure. It is a simple, recursive descent parser. It does not use
-// eval or regular expressions, so it can be used as a model for implementing
-// a JSON parser in other languages.
-
-// We are defining the function inside of another function to avoid creating
-// global variables.
-
-    var at,     // The index of the current character
-        ch,     // The current character
-        escapee = {
-            '"':  '"',
-            '\\': '\\',
-            '/':  '/',
-            b:    '\b',
-            f:    '\f',
-            n:    '\n',
-            r:    '\r',
-            t:    '\t'
-        },
-        text,
-
-        error = function (m) {
-
-// Call error when something is wrong.
-
-            throw {
-                name:    'SyntaxError',
-                message: m,
-                at:      at,
-                text:    text
-            };
-        },
-
-        next = function (c) {
-
-// If a c parameter is provided, verify that it matches the current character.
-
-            if (c && c !== ch) {
-                error("Expected '" + c + "' instead of '" + ch + "'");
-            }
-
-// Get the next character. When there are no more characters,
-// return the empty string.
-
-            ch = text.charAt(at);
-            at += 1;
-            return ch;
-        },
-
-        number = function () {
-
-// Parse a number value.
-
-            var number,
-                string = '';
-
-            if (ch === '-') {
-                string = '-';
-                next('-');
-            }
-            while (ch >= '0' && ch <= '9') {
-                string += ch;
-                next();
-            }
-            if (ch === '.') {
-                string += '.';
-                while (next() && ch >= '0' && ch <= '9') {
-                    string += ch;
-                }
-            }
-            if (ch === 'e' || ch === 'E') {
-                string += ch;
-                next();
-                if (ch === '-' || ch === '+') {
-                    string += ch;
-                    next();
-                }
-                while (ch >= '0' && ch <= '9') {
-                    string += ch;
-                    next();
-                }
-            }
-            number = +string;
-            if (isNaN(number)) {
-                error("Bad number");
-            } else {
-                return number;
-            }
-        },
-
-        string = function () {
-
-// Parse a string value.
-
-            var hex,
-                i,
-                string = '',
-                uffff;
-
-// When parsing for string values, we must look for " and \ characters.
-
-            if (ch === '"') {
-                while (next()) {
-                    if (ch === '"') {
-                        next();
-                        return string;
-                    } else if (ch === '\\') {
-                        next();
-                        if (ch === 'u') {
-                            uffff = 0;
-                            for (i = 0; i < 4; i += 1) {
-                                hex = parseInt(next(), 16);
-                                if (!isFinite(hex)) {
-                                    break;
-                                }
-                                uffff = uffff * 16 + hex;
-                            }
-                            string += String.fromCharCode(uffff);
-                        } else if (typeof escapee[ch] === 'string') {
-                            string += escapee[ch];
-                        } else {
-                            break;
-                        }
-                    } else {
-                        string += ch;
-                    }
-                }
-            }
-            error("Bad string");
-        },
-
-        white = function () {
-
-// Skip whitespace.
-
-            while (ch && ch <= ' ') {
-                next();
-            }
-        },
-
-        word = function () {
-
-// true, false, or null.
-
-            switch (ch) {
-            case 't':
-                next('t');
-                next('r');
-                next('u');
-                next('e');
-                return true;
-            case 'f':
-                next('f');
-                next('a');
-                next('l');
-                next('s');
-                next('e');
-                return false;
-            case 'n':
-                next('n');
-                next('u');
-                next('l');
-                next('l');
-                return null;
-            }
-            error("Unexpected '" + ch + "'");
-        },
-
-        value,  // Place holder for the value function.
-
-        array = function () {
-
-// Parse an array value.
-
-            var array = [];
-
-            if (ch === '[') {
-                next('[');
-                white();
-                if (ch === ']') {
-                    next(']');
-                    return array;   // empty array
-                }
-                while (ch) {
-                    array.push(value());
-                    white();
-                    if (ch === ']') {
-                        next(']');
-                        return array;
-                    }
-                    next(',');
-                    white();
-                }
-            }
-            error("Bad array");
-        },
-
-        object = function () {
-
-// Parse an object value.
-
-            var key,
-                object = {};
-
-            if (ch === '{') {
-                next('{');
-                white();
-                if (ch === '}') {
-                    next('}');
-                    return object;   // empty object
-                }
-                while (ch) {
-                    key = string();
-                    white();
-                    next(':');
-                    if (Object.hasOwnProperty.call(object, key)) {
-                        error('Duplicate key "' + key + '"');
-                    }
-                    object[key] = value();
-                    white();
-                    if (ch === '}') {
-                        next('}');
-                        return object;
-                    }
-                    next(',');
-                    white();
-                }
-            }
-            error("Bad object");
-        };
-
-    value = function () {
-
-// Parse a JSON value. It could be an object, an array, a string, a number,
-// or a word.
-
-        white();
-        switch (ch) {
-        case '{':
-            return object();
-        case '[':
-            return array();
-        case '"':
-            return string();
-        case '-':
-            return number();
-        default:
-            return ch >= '0' && ch <= '9' ? number() : word();
-        }
-    };
-
-// Return the json_parse function. It will have access to all of the above
-// functions and variables.
-
-    return function (source, reviver) {
-        var result;
-
-        text = source;
-        at = 0;
-        ch = ' ';
-        result = value();
-        white();
-        if (ch) {
-            error("Syntax error");
-        }
-
-// If there is a reviver function, we recursively walk the new structure,
-// passing each name/value pair to the reviver function for possible
-// transformation, starting with a temporary root object that holds the result
-// in an empty key. If there is not a reviver function, we simply return the
-// result.
-
-        return typeof reviver === 'function' ? function walk(holder, key) {
-            var k, v, value = holder[key];
-            if (value && typeof value === 'object') {
-                for (k in value) {
-                    if (Object.hasOwnProperty.call(value, k)) {
-                        v = walk(value, k);
-                        if (v !== undefined) {
-                            value[k] = v;
-                        } else {
-                            delete value[k];
-                        }
-                    }
-                }
-            }
-            return reviver.call(holder, key, value);
-        }({'': result}, '') : result;
-    };
-});
\ No newline at end of file
diff --git a/apps/files_texteditor/js/editor.js b/apps/files_texteditor/js/editor.js
deleted file mode 100644
index 3784ea1032..0000000000
--- a/apps/files_texteditor/js/editor.js
+++ /dev/null
@@ -1,339 +0,0 @@
-function setEditorSize(){
-	// Sets the size of the text editor window.
-	fillWindow($('#editor'));
-}
-
-function getFileExtension(file){
-	var parts=file.split('.');
-	return parts[parts.length-1];
-}
-
-function setSyntaxMode(ext){
-	// Loads the syntax mode files and tells the editor
-	var filetype = new Array();
-	// add file extensions like this: filetype["extension"] = "filetype":
-	filetype["h"] = "c_cpp";
-	filetype["c"] = "c_cpp";
-	filetype["clj"] = "clojure";
-	filetype["coffee"] = "coffee"; // coffescript can be compiled to javascript
-	filetype["coldfusion"] = "cfc";
-	filetype["cpp"] = "c_cpp";
-	filetype["cs"] = "csharp";
-	filetype["css"] = "css";
-	filetype["groovy"] = "groovy";
-	filetype["haxe"] = "hx";
-	filetype["htm"] = "html";
-	filetype["html"] = "html";
-	filetype["java"] = "java";
-	filetype["js"] = "javascript";
-	filetype["jsm"] = "javascript";
-	filetype["json"] = "json";
-	filetype["latex"] = "latex";
-        filetype["less"] = "less";
-	filetype["ly"] = "latex";
-	filetype["ily"] = "latex";
-	filetype["lua"] = "lua";
-	filetype["markdown"] = "markdown";
-	filetype["md"] = "markdown";
-	filetype["mdown"] = "markdown";
-	filetype["mdwn"] = "markdown";
-	filetype["mkd"] = "markdown";
-	filetype["ml"] = "ocaml";
-	filetype["mli"] = "ocaml";
-	filetype["pl"] = "perl";
-	filetype["php"] = "php";
-	filetype["powershell"] = "ps1";
-	filetype["py"] = "python";
-	filetype["rb"] = "ruby";
-	filetype["scad"] = "scad"; // seems to be something like 3d model files printed with e.g. reprap
-	filetype["scala"] = "scala";
-	filetype["scss"] = "scss"; // "sassy css"
-        filetype["sh"] = "sh";
-	filetype["sql"] = "sql";
-	filetype["svg"] = "svg";
-	filetype["textile"] = "textile"; // related to markdown
-	filetype["xml"] = "xml";
-
-	if(filetype[ext]!=null){
-		// Then it must be in the array, so load the custom syntax mode
-		// Set the syntax mode
-		OC.addScript('files_texteditor','aceeditor/mode-'+filetype[ext], function(){
-			var SyntaxMode = require("ace/mode/"+filetype[ext]).Mode;
-			window.aceEditor.getSession().setMode(new SyntaxMode());
-		});
-	}
-}
-
-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>';
-	if(writeperms=="true"){
-		editorbarhtml += '<button id="editor_save">'+t('files_texteditor','Save')+'</button><div class="separator"></div>';
-	}
-	editorbarhtml += '<label for="editorseachval">Search:</label><input type="text" name="editorsearchval" id="editorsearchval"><div class="separator"></div><button id="editor_close">'+t('files_texteditor','Close')+'</button></div>';
-	// Change breadcrumb classes
-	$('#controls .last').removeClass('last');
-	$('#controls').append(editorbarhtml);
-	$('#editorcontrols').fadeIn('slow');
-}
-
-function bindControlEvents(){
-	$("#editor_save").die('click',doFileSave).live('click',doFileSave);
-	$('#editor_close').die('click',hideFileEditor).live('click',hideFileEditor);
-	$('#editorsearchval').die('keyup', doSearch).live('keyup', doSearch);
-	$('#clearsearchbtn').die('click', resetSearch).live('click', resetSearch);
-	$('#nextsearchbtn').die('click', nextSearchResult).live('click', nextSearchResult);
-}
-
-// returns true or false if the editor is in view or not
-function editorIsShown(){
-	// Not working as intended. Always returns true.
-	return is_editor_shown;
-}
-
-//resets the search
-function resetSearch(){
-	$('#editorsearchval').val('');
-	$('#nextsearchbtn').remove();
-	$('#clearsearchbtn').remove();
-	window.aceEditor.gotoLine(0);
-}
-
-// moves the cursor to the next search resukt
-function nextSearchResult(){
-	window.aceEditor.findNext();
-}
-// Performs the initial search
-function doSearch(){
-	// check if search box empty?
-	if($('#editorsearchval').val()==''){
-		// Hide clear button
-		window.aceEditor.gotoLine(0);
-		$('#nextsearchbtn').remove();
-		$('#clearsearchbtn').remove();
-	} else {
-		// New search
-		// Reset cursor
-		window.aceEditor.gotoLine(0);
-		// Do search
-		window.aceEditor.find($('#editorsearchval').val(),{
-			backwards: false,
-			wrap: false,
-			caseSensitive: false,
-			wholeWord: false,
-			regExp: false
-		});
-		// Show next and clear buttons
-		// check if already there
-		if($('#nextsearchbtn').length==0){
-			var nextbtnhtml = '<button id="nextsearchbtn">Next</button>';
-			var clearbtnhtml = '<button id="clearsearchbtn">Clear</button>';
-			$('#editorsearchval').after(nextbtnhtml).after(clearbtnhtml);
-		}
-	}
-}
-
-// Tries to save the file.
-function doFileSave(){
-	if(editorIsShown()){
-		// Changed contents?
-		if($('#editor').attr('data-edited')=='true'){
-			// Get file path
-			var path = $('#editor').attr('data-dir')+'/'+$('#editor').attr('data-filename');
-			// Get original mtime
-			var mtime = $('#editor').attr('data-mtime');
-			// Show saving spinner
-			$("#editor_save").die('click',doFileSave);
-			$('#save_result').remove();
-			$('#editor_save').text(t('files_texteditor','Saving...'));
-			// Get the data
-			var filecontents = window.aceEditor.getSession().getValue();
-			// Send the data
-			$.post(OC.filePath('files_texteditor','ajax','savefile.php'), { filecontents: filecontents, path: path, mtime: mtime },function(jsondata){
-				if(jsondata.status!='success'){
-					// Save failed
-					$('#editor_save').text(t('files_texteditor','Save'));
-					$('#editor_save').after('<p id="save_result" style="float: left">Failed to save file</p>');
-					$("#editor_save").live('click',doFileSave);
-				} else {
-					// Save OK
-					// Update mtime
-					$('#editor').attr('data-mtime',jsondata.data.mtime);
-					$('#editor_save').text(t('files_texteditor','Save'));
-					$("#editor_save").live('click',doFileSave);
-					// Update titles
-					$('#editor').attr('data-edited', 'false');
-					$('#breadcrumb_file').text($('#editor').attr('data-filename'));
-					document.title = $('#editor').attr('data-filename')+' - ownCloud';
-				}
-			},'json');
-		}
-	}
-	giveEditorFocus();
-};
-
-// Gives the editor focus
-function giveEditorFocus(){
-	window.aceEditor.focus();
-};
-
-// Loads the file editor. Accepts two parameters, dir and filename.
-function showFileEditor(dir,filename){
-	// Delete any old editors
-	$('#editor').remove();
-	if(!editorIsShown()){
-		// Loads the file editor and display it.
-		$('#content').append('<div id="editor"></div>');
-		var data = $.getJSON(
-			OC.filePath('files_texteditor','ajax','loadfile.php'),
-			{file:filename,dir:dir},
-			function(result){
-				if(result.status == 'success'){
-					// Save mtime
-					$('#editor').attr('data-mtime', result.data.mtime);
-					// Initialise the editor
-					$('.actions,#file_action_panel').fadeOut('slow');
-					$('table').fadeOut('slow', function() {
-						// Show the control bar
-						showControls(filename,result.data.write);
-						// Update document title
-						document.title = filename+' - ownCloud';
-						$('#editor').text(result.data.filecontents);
-						$('#editor').attr('data-dir', dir);
-						$('#editor').attr('data-filename', filename);
-						$('#editor').attr('data-edited', 'false');
-						window.aceEditor = ace.edit("editor");
-						aceEditor.setShowPrintMargin(false);
-						aceEditor.getSession().setUseWrapMode(true);
-						if(result.data.write=='false'){
-							aceEditor.setReadOnly(true);
-						}
-						setEditorSize();
-						setSyntaxMode(getFileExtension(filename));
-						OC.addScript('files_texteditor','aceeditor/theme-clouds', function(){
-							window.aceEditor.setTheme("ace/theme/clouds");
-						});
-						window.aceEditor.getSession().on('change', function(){
-							if($('#editor').attr('data-edited')!='true'){
-								$('#editor').attr('data-edited', 'true');
-								$('#breadcrumb_file').text($('#breadcrumb_file').text()+' *');
-								document.title = $('#editor').attr('data-filename')+' * - ownCloud';
-							}
-						});
-						// Add the ctrl+s event
-						window.aceEditor.commands.addCommand({
-							name: "save",
-							bindKey: {
-							win: "Ctrl-S",
-							mac: "Command-S",
-							sender: "editor"
-							},
-							exec: function(){
-								doFileSave();	
-							}
-						});
-					});
-				} else {
-					// Failed to get the file.
-					OC.dialogs.alert(result.data.message, t('files_texteditor','An error occurred!'));
-				}
-			// End success
-			}
-		// End ajax
-		);
-		is_editor_shown = true;
-	}
-}
-
-// Fades out the editor.
-function hideFileEditor(){
-	if($('#editor').attr('data-edited') == 'true'){
-		// Hide, not remove
-		$('#editorcontrols').fadeOut('slow',function(){
-			// Check if there is a folder in the breadcrumb
-			if($('.crumb.ui-droppable').length){
-				$('.crumb.ui-droppable:last').addClass('last');
-			}
-		});
-		// Fade out editor
-		$('#editor').fadeOut('slow', function(){
-			// Reset document title
-			document.title = "ownCloud";
-			$('.actions,#file_access_panel').fadeIn('slow');
-			$('table').fadeIn('slow');
-		});
-		$('#notification').text(t('files_texteditor','There were unsaved changes, click here to go back'));
-		$('#notification').data('reopeneditor',true);
-		$('#notification').fadeIn();
-		is_editor_shown = false;
-	} else {
-		// Remove editor
-		$('#editorcontrols').fadeOut('slow',function(){
-			$(this).remove();
-			$(".crumb:last").addClass('last');
-		});
-		// Fade out editor
-		$('#editor').fadeOut('slow', function(){
-			$(this).remove();
-			// Reset document title
-			document.title = "ownCloud";
-			$('.actions,#file_access_panel').fadeIn('slow');
-			$('table').fadeIn('slow');
-		});
-		is_editor_shown = false;
-	}
-}
-
-// Reopens the last document
-function reopenEditor(){
-	$('.actions,#file_action_panel').fadeOut('slow');
-	$('table').fadeOut('slow', function(){
-		$('#controls .last').not('#breadcrumb_file').removeClass('last');
-		$('#editor').fadeIn('fast');
-		$('#editorcontrols').fadeIn('fast', function(){
-
-		});
-	});
-	is_editor_shown  = true;
-}
-
-// resizes the editor window
-$(window).resize(function() {
-	setEditorSize();
-});
-var is_editor_shown = false;
-$(document).ready(function(){
-	if(typeof FileActions!=='undefined'){
-		FileActions.register('text','Edit', FileActions.PERMISSION_READ, '',function(filename){
-			showFileEditor($('#dir').val(),filename);
-		});
-		FileActions.setDefault('text','Edit');
-		FileActions.register('application/xml','Edit', FileActions.PERMISSION_READ, '',function(filename){
-			showFileEditor($('#dir').val(),filename);
-		});
-		FileActions.setDefault('application/xml','Edit');
-	}
-	OC.search.customResults.Text=function(row,item){
-		var text=item.link.substr(item.link.indexOf('?file=')+6);
-		var a=row.find('a');
-		a.data('file',text);
-		a.attr('href','#');
-		a.click(function(){
-			var pos=text.lastIndexOf('/')
-			var file=text.substr(pos + 1);
-			var dir=text.substr(0,pos);
-			showFileEditor(dir,file);
-		});
-	};
-	// Binds the file save and close editor events, and gotoline button
-	bindControlEvents();
-	$('#editor').remove();
-	$('#notification').click(function(){
-		if($('#notification').data('reopeneditor'))
-		{
-			reopenEditor();
-		}
-		$('#notification').fadeOut();
-	});
-});
diff --git a/apps/files_texteditor/l10n/.gitkeep b/apps/files_texteditor/l10n/.gitkeep
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/apps/files_texteditor/l10n/de.php b/apps/files_texteditor/l10n/de.php
deleted file mode 100644
index b74f67d822..0000000000
--- a/apps/files_texteditor/l10n/de.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php $TRANSLATIONS = array(
-"regex" => "Regulärer Ausdruck",
-"Save" => "Speichern",
-"Close" => "Schliessen",
-"Saving..." => "Speichern...",
-"An error occurred!" => "Ein Fehler ist aufgetreten",
-"There were unsaved changes, click here to go back" => "Einige Änderungen wurde noch nicht gespeichert; klicken Sie hier um zurückzukehren."
-);
diff --git a/apps/gallery/ajax/createAlbum.php b/apps/gallery/ajax/createAlbum.php
deleted file mode 100644
index 71e7fd1aa5..0000000000
--- a/apps/gallery/ajax/createAlbum.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?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/>.
-* 
-*/
-
- 
-OCP\JSON::checkLoggedIn();
-OCP\JSON::checkAppEnabled('gallery');
-OCP\JSON::callCheck();
-
-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
deleted file mode 100644
index ab8c64e28a..0000000000
--- a/apps/gallery/ajax/galleryOp.php
+++ /dev/null
@@ -1,188 +0,0 @@
-<?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/>.
-* 
-*/
-
-header('Content-type: text/html; charset=UTF-8') ;
- 
-
-OCP\JSON::checkLoggedIn();
-OCP\JSON::checkAppEnabled('gallery');
-
-function handleRename($oldname, $newname) {
-  OC_Gallery_Album::rename($oldname, $newname, OCP\USER::getUser());
-  OC_Gallery_Album::changeThumbnailPath($oldname, $newname);
-}
-
-function handleRemove($name) {
-  $album_id = OC_Gallery_Album::find(OCP\USER::getUser(), $name);
-  $album_id = $album_id->fetchRow();
-  $album_id = $album_id['album_id'];
-  OC_Gallery_Album::remove(OCP\USER::getUser(), $name);
-  OC_Gallery_Photo::removeByAlbumId($album_id);
-}
-
-function handleGetThumbnails($albumname) {
-  OCP\Response::enableCaching(3600 * 24); // 24 hour
-  $view = OCP\Files::getStorage('gallery');
-  $thumbnail = $view->fopen(urldecode($albumname).'.png', 'r');
-  header('Content-Type: '.OC_Image::getMimeTypeForFile($thumbnail));
-  OCP\Response::sendFile($thumbnail);
-}
-
-function handleGalleryScanning() {
-  OCP\DB::beginTransaction();
-  set_time_limit(0);
-  OC_Gallery_Album::cleanup();
-  $eventSource = new OC_EventSource();
-  OC_Gallery_Scanner::scan($eventSource);
-  $eventSource->close();
-  OCP\DB::commit();
-}
-
-function handleFilescan($cleanup) {
-  if ($cleanup) OC_Gallery_Album::cleanup();
-  $pathlist = OC_Gallery_Scanner::find_paths();
-  sort($pathlist);
-  OCP\JSON::success(array('paths' => $pathlist));
-}
-
-function handleStoreSettings($root, $order) {
-  if (!OC_Filesystem::file_exists($root)) {
-    OCP\JSON::error(array('cause' => 'No such file or directory'));
-    return;
-  }
-  if (!OC_Filesystem::is_dir($root)) {
-    OCP\JSON::error(array('cause' => $root . ' is not a directory'));
-    return;
-  }
-
-  $current_root = OCP\Config::getUserValue(OCP\USER::getUser(),'gallery', 'root', '/');
-  $root = trim($root);
-  $root = rtrim($root, '/').'/';
-  $rescan = $current_root==$root?'no':'yes';
-  OCP\Config::setUserValue(OCP\USER::getUser(), 'gallery', 'root', $root);
-  OCP\Config::setUserValue(OCP\USER::getUser(), 'gallery', 'order', $order);
-  OCP\JSON::success(array('rescan' => $rescan));
-}
-
-function handleGetGallery($path) {
-  $a = array();
-  $root = OCP\Config::getUserValue(OCP\USER::getUser(),'gallery', 'root', '/');
-  $path = utf8_decode(rtrim($root.$path,'/'));
-  if($path == '') $path = '/';
-  $pathLen = strlen($path);
-  $result = OC_Gallery_Album::find(OCP\USER::getUser(), null, $path);
-  $album_details = $result->fetchRow();
-
-  $result = OC_Gallery_Album::find(OCP\USER::getUser(), null, null, $path);
-
-  while ($r = $result->fetchRow()) {
-    $album_name = $r['album_name'];
-    $size=OC_Gallery_Album::getAlbumSize($r['album_id']);
-    // this is a fallback mechanism and seems expensive
-    if ($size == 0) $size = OC_Gallery_Album::getIntermediateGallerySize($r['album_path']);
-
-    $a[] = array('name' => utf8_encode($album_name), 'numOfItems' => min($size, 10),'path'=>substr($r['album_path'], $pathLen));
-  }
-  
-  $result = OC_Gallery_Photo::find($album_details['album_id']);
-
-  $p = array();
-
-  while ($r = $result->fetchRow()) {
-    $p[] = utf8_encode($r['file_path']);
-  }
-
-  $r = OC_Gallery_Sharing::getEntryByAlbumId($album_details['album_id']);
-  $shared = false;
-  $recursive = false;
-  $token = '';
-  if ($row = $r->fetchRow()) {
-    $shared = true;
-    $recursive = ($row['recursive'] == 1)? true : false;
-    $token = $row['token'];
-  }
-
-  OCP\JSON::success(array('albums'=>$a, 'photos'=>$p, 'shared' => $shared, 'recursive' => $recursive, 'token' => $token));
-}
-
-function handleShare($path, $share, $recursive) {
-  $recursive = $recursive == 'true' ? 1 : 0;
-  $owner = OCP\USER::getUser();
-  $root = OCP\Config::getUserValue(OCP\USER::getUser(),'gallery', 'root', '/');
-  $path = utf8_decode(rtrim($root.$path,'/'));
-  if($path == '') $path = '/';
-  $r = OC_Gallery_Album::find($owner, null, $path);
-  if ($row = $r->fetchRow()) {
-    $albumId = $row['album_id'];
-  } else {
-    OCP\JSON::error(array('cause' => 'Couldn\'t find requested gallery'));
-    exit;
-  }
-    
-  if ($share == false) {
-      OC_Gallery_Sharing::remove($albumId);
-      OCP\JSON::success(array('sharing' => false));
-  } else { // share, yeah \o/
-    $r = OC_Gallery_Sharing::getEntryByAlbumId($albumId);
-    if (($row = $r->fetchRow())) { // update entry
-      OC_Gallery_Sharing::updateSharingByToken($row['token'], $recursive);
-      OCP\JSON::success(array('sharing' => true, 'token' => $row['token'], 'recursive' => $recursive == 1 ? true : false ));
-    } else { // and new sharing entry
-      $date = new DateTime();
-      $token = md5($owner . $date->getTimestamp());
-      OC_Gallery_Sharing::addShared($token, intval($albumId), $recursive);
-      OCP\JSON::success(array('sharing' => true, 'token' => $token, 'recursive' => $recursive == 1 ? true : false ));
-    }
-  }
-}
-
-
-if ($_GET['operation']) {
-  switch($_GET['operation']) {
-  case 'rename':
-	  handleRename($_GET['oldname'], $_GET['newname']);
-	  OCP\JSON::success(array('newname' => $_GET['newname']));
-	break;
-  case 'remove':
-	  handleRemove($_GET['name']);
-	  OCP\JSON::success();
-    break;
-  case 'get_covers':
-    handleGetThumbnails(urldecode($_GET['albumname']));
-    break;
-  case 'scan':
-    handleGalleryScanning();
-    break;
-  case 'store_settings':
-    handleStoreSettings($_GET['root'], $_GET['order']);
-    break;
-  case 'get_gallery':
-    handleGetGallery($_GET['path']);
-    break;
-  case 'share':
-    handleShare($_GET['path'], $_GET['share'] == 'true' ? true : false, $_GET['recursive']);
-    break;
-  default:
-    OCP\JSON::error(array('cause' => 'Unknown operation'));
-  }
-}
diff --git a/apps/gallery/ajax/sharing.php b/apps/gallery/ajax/sharing.php
deleted file mode 100644
index bf8169ef1e..0000000000
--- a/apps/gallery/ajax/sharing.php
+++ /dev/null
@@ -1,118 +0,0 @@
-<?php
-
-/**
-* ownCloud - gallery application
-*
-* @author Bartek Przybylski
-* @copyright 2012 Bartek Przybylski bartek@alefzero.eu
-* 
-* 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::callCheck();
-
-if (!isset($_GET['token']) || !isset($_GET['operation'])) {
-  OCP\JSON::error(array('cause' => 'Not enought arguments'));
-  exit;
-}
-
-$operation = $_GET['operation'];
-$token = $_GET['token'];
-
-if (!OC_Gallery_Sharing::isTokenValid($token)) {
-  OCP\JSON::error(array('cause' => 'Given token is not valid'));
-  exit;
-}
-
-function handleGetGallery($token, $path) {
-  $owner = OC_Gallery_Sharing::getTokenOwner($token);
-  $apath = OC_Gallery_Sharing::getPath($token);
-
-  if ($path == false)
-    $root = $apath;
-  else
-    $root =  rtrim($apath,'/').$path;
-
-  $r = OC_Gallery_Album::find($owner, null, $root);
-  $albums = array();
-  $photos = array();
-  $albumId = -1;
-  if ($row = $r->fetchRow()) {
-    $albumId = $row['album_id'];
-  }
-  if ($albumId != -1) {
-
-    if (OC_Gallery_Sharing::isRecursive($token)) {
-      $r = OC_Gallery_Album::find($owner, null, null, $root);
-      while ($row = $r->fetchRow())
-        $albums[] = $row['album_name'];
-    }
-
-    $r = OC_Gallery_Photo::find($albumId);
-    while ($row = $r->fetchRow())
-      $photos[] = $row['file_path'];
-  }
-
-  OCP\JSON::success(array('albums' => $albums, 'photos' => $photos));
-}
-
-function handleGetThumbnail($token, $imgpath) {
-  $owner = OC_Gallery_Sharing::getTokenOwner($token);
-  $image = OC_Gallery_Photo::getThumbnail($imgpath, $owner);
-  if ($image) {
-    OCP\Response::enableCaching(3600 * 24); // 24 hour
-    $image->show();
-  }
-}
-
-function handleGetAlbumThumbnail($token, $albumname)
-{
-  $owner = OC_Gallery_Sharing::getTokenOwner($token);
-  $view = OCP\Files::getStorage('gallery');
-  $file = $view->fopen($albumname.'.png', 'r');
-  $image = new OC_Image($file);
-  if ($image->valid()) {
-    $image->centerCrop();
-    $image->resize(200);
-    $image->fixOrientation();
-    OCP\Response::enableCaching(3600 * 24); // 24 hour
-    $image->show();
-  }
-}
-
-function handleGetPhoto($token, $photo) {
-  $owner = OC_Gallery_Sharing::getTokenOwner($token);
-  $view = OCP\Files::getStorage('files');
-  $file = $view->fopen(urldecode($photo), 'r');
-  header('Content-Type: '.OC_Image::getMimeTypeForFile($file));
-  OCP\Response::sendFile($file);
-}
-
-switch ($operation) {
-  case 'get_gallery':
-    handleGetGallery($token, isset($_GET['path'])? $_GET['path'] : false);
-    break;
-  case 'get_thumbnail':
-    handleGetThumbnail($token, urldecode($_GET['img']));
-    break;
-  case 'get_album_thumbnail':
-    handleGetAlbumThumbnail($token, urldecode($_GET['albumname']));
-    break;
-  case 'get_photo':
-    handleGetPhoto($token, urldecode($_GET['photo']));
-    break;
-}
-
diff --git a/apps/gallery/ajax/thumbnail.php b/apps/gallery/ajax/thumbnail.php
deleted file mode 100644
index 5bf1d420dc..0000000000
--- a/apps/gallery/ajax/thumbnail.php
+++ /dev/null
@@ -1,36 +0,0 @@
-<?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/>.
-* 
-*/
- 
-OCP\JSON::checkLoggedIn();
-OCP\JSON::checkAppEnabled('gallery');
-session_write_close();
-require_once('apps/gallery/lib/managers.php');
-
-
-$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/ajax/viewImage.php b/apps/gallery/ajax/viewImage.php
deleted file mode 100644
index daf0ab741f..0000000000
--- a/apps/gallery/ajax/viewImage.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?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/appinfo/app.php b/apps/gallery/appinfo/app.php
deleted file mode 100644
index f26f23466b..0000000000
--- a/apps/gallery/appinfo/app.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?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/>.
-* 
-*/
-
-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';
-OC::$CLASSPATH['OC_Share_Backend_Photo'] = 'gallery/lib/share.php';
-
-// OCP\Share::registerBackend('photo', new OC_Share_Backend_Photo());
-
-$l = OC_L10N::get('gallery');
-
-OCP\App::addNavigationEntry( array(
- 'id' => 'gallery_index',
- 'order' => 20,
- 'href' => OCP\Util::linkTo('gallery', 'index.php'),
- 'icon' => OCP\Util::imagePath('core', 'places/picture.svg'),
- 'name' => $l->t('Pictures')));
-
-class OC_GallerySearchProvider extends OC_Search_Provider{
-	function search($query){
-		$stmt = OCP\DB::prepare('SELECT * FROM `*PREFIX*gallery_albums` WHERE `uid_owner` = ? AND `album_name` LIKE ?');
-		$result = $stmt->execute(array(OCP\USER::getUser(),'%'.$query.'%'));
-		$results=array();
-		while($row=$result->fetchRow()){
-			$results[]=new OC_Search_Result($row['album_name'],'',OCP\Util::linkTo('gallery', 'index.php').'?view='.$row['album_name'],'Galleries');
-		}
-		return $results;
-	}
-}
-
-//OC_Search::registerProvider('OC_GallerySearchProvider');
-
-require_once('gallery/lib/hooks_handlers.php');
diff --git a/apps/gallery/appinfo/database.xml b/apps/gallery/appinfo/database.xml
deleted file mode 100644
index 1683e0ca2c..0000000000
--- a/apps/gallery/appinfo/database.xml
+++ /dev/null
@@ -1,60 +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*pictures_images_cache</name>
-		<declaration>
-			<field>
-				<name>uid_owner</name>
-				<type>text</type>
-				<notnull>true</notnull>
-				<length>64</length>
-			</field>
-			<field>
-				<name>path</name>
-				<type>text</type>
-				<notnull>true</notnull>
-				<length>256</length>
-			</field>
-			<field>
-				<name>width</name>
-				<type>integer</type>
-				<notnull>true</notnull>
-				<length>4</length>
-			</field>
-			<field>
-				<name>height</name>
-				<type>integer</type>
-				<notnull>true</notnull>
-				<length>4</length>
-			</field>
-		</declaration>
-	</table>
-  <table>
-    <name>*dbprefix*gallery_sharing</name>
-    <declaration>
-      <field>
-        <name>token</name>
-        <type>text</type>
-        <notnull>true</notnull>
-        <length>64</length>
-      </field>
-      <field>
-        <name>gallery_id</name>
-        <type>integer</type>
-        <default>0</default>
-        <notnull>true</notnull>
-        <length>4</length>
-      </field>
-      <field>
-        <name>recursive</name>
-        <type>integer</type>
-        <notnull>true</notnull>
-        <length>1</length>
-      </field>
-    </declaration>
-  </table>
-</database>
diff --git a/apps/gallery/appinfo/info.xml b/apps/gallery/appinfo/info.xml
deleted file mode 100644
index 84f6e96099..0000000000
--- a/apps/gallery/appinfo/info.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0"?> 
-<info>
-	<id>gallery</id>
-	<name>Pictures</name>
-	<licence>AGPL</licence>
-	<author>Bartek Przybylski</author>
-	<require>4</require>
-	<shipped>true</shipped>
-	<description>Dedicated pictures application</description>
-	<standalone/>
-	<default_enable/>
-	<public>
-		<gallery>sharing.php</gallery>
-	</public>
-</info>
diff --git a/apps/gallery/appinfo/update.php b/apps/gallery/appinfo/update.php
deleted file mode 100644
index 65e7734c47..0000000000
--- a/apps/gallery/appinfo/update.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-$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_App::getAppPath($appid).'/appinfo/database.xml');
-}
diff --git a/apps/gallery/appinfo/version b/apps/gallery/appinfo/version
deleted file mode 100644
index 4b9fcbec10..0000000000
--- a/apps/gallery/appinfo/version
+++ /dev/null
@@ -1 +0,0 @@
-0.5.1
diff --git a/apps/gallery/css/sharing.css b/apps/gallery/css/sharing.css
deleted file mode 100644
index 4712369cc8..0000000000
--- a/apps/gallery/css/sharing.css
+++ /dev/null
@@ -1,8 +0,0 @@
-body { background-color: #eee; margin: 0; padding: 0;}
-#gallery_list { height: 100%; width: 80%; background-color: white; margin: 0 auto; box-shadow: 0 0 8px #888; }
-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; cursor: pointer; -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.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%/gallery/img/breadcrumb.png'); padding-left: 20px; background-position: left; background-repeat: no-repeat;}
diff --git a/apps/gallery/css/styles.css b/apps/gallery/css/styles.css
deleted file mode 100644
index 63f645662d..0000000000
--- a/apps/gallery/css/styles.css
+++ /dev/null
@@ -1,14 +0,0 @@
-#gallerycontent { margin-top: 2.8em; overflow: visible; }
-#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;}
-.ui-dialog input {width: 90%;}
-
-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;}
-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/css/supersized.css b/apps/gallery/css/supersized.css
deleted file mode 100644
index 57ee7e23a5..0000000000
--- a/apps/gallery/css/supersized.css
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
-
-	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-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-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-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
deleted file mode 100644
index 428c254c3b..0000000000
--- a/apps/gallery/css/supersized.shutter.css
+++ /dev/null
@@ -1,74 +0,0 @@
-/*
-
-	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-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; }*/
-#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; }
-
-#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; }
-
-#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; }
-
-#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
-----------------------------*/					
-#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
-----------------------------*/	
-#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
-----------------------------*/			
-#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; }
-
-#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); }
-
-
-#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/img/breadcrumb.png b/apps/gallery/img/breadcrumb.png
deleted file mode 100644
index adbef1e576d75dae458de9e24e5aba3822d2c358..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 201
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#$mfQsBaT^vI!
zPAC8P|KFZjbw*<r8^b|Hg|Y=l8vY0POme)zqi|B8hD{(<z>w{MX@>~&1}T?t<`dtT
nZZ>+9nM|5HLBsnL^E7G3SU1o6mHZJPM>BZ3`njxgN@xNAWnw#D

diff --git a/apps/gallery/img/delete.png b/apps/gallery/img/delete.png
deleted file mode 100644
index fa8e18183ed3d126ab5706d093f7e64d944c835a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 240
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#$mfQoWGT^vI!
zPAC8P|KFZjbw*-=Bm)bt!ybl?odzOIM;j{aJb3Mx9cDT9taez_s<Mt%l(|ssfpG)3
z=fiM?KK4f}8q#S7;`a<1Zn0f%=-IEdn=4<zDc99pq47n;f)fl~dmIWCf|R8+y*-?b
bjTsqk33*>{KI)kXw3xxu)z4*}Q$iB}AZ$o3

diff --git a/apps/gallery/img/loading.gif b/apps/gallery/img/loading.gif
deleted file mode 100644
index 5b33f7e54f4e55b6b8774d86d96895db9af044b4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1849
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
EAHN$8j{pDw

diff --git a/apps/gallery/img/rename.png b/apps/gallery/img/rename.png
deleted file mode 100644
index 3af6840071b4597458475c9098a79d533b66c2c4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 267
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#$mfQmXiT^vI!
zPAC8P|KFZjb%x1N9v(G^JKRU+J(0S=a75vly}~!OTMR3Xv6(ol38pekYWttjW+80C
z;A`Ba$a0vWJ?#;XLYQ$Fv&Y4rM23~K0(lsik`?TnyV6RSPc_b9j@}|@!oX3{aD(yG
zvxZ$u8ei;TV95-aExSO^P)*aA@u1HNMH`c|y*CUPy4yTCOxJZt0^P*m>FVdQ&MBb@
E0Czo95&!@I

diff --git a/apps/gallery/img/share.png b/apps/gallery/img/share.png
deleted file mode 100644
index 099e4d6ab350b775ecf46669a7c47950fd0810aa..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 338
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#$mfQrt0x;Tbd
zoKF7n|Gz!6>Wqq39-d_mdn7yFGZm@|7*EVP;HvPizh!TS83RYm1(W6vAx&%yjcNkx
z86MR~@D#WhGH|3cTJUx}ZHy4@5NG}vzv9txhZw#iryGB02&gY&Q4%=9@KJunqk4}w
z=?-(akG!c!X5=`x(DJ>yfH<R}df-J4mg5(BesCR0bU5R&hOy4!kL0SK`jZ@|H(E%{
zcRbN}g8c}igAUh`Z4P_*PcGngn8S6Xdjp%&yo?ftN6it71dOFPB}Cl9oEAj|E%Qn{
b)XMluj5oGN<-=v5*BCrq{an^LB{Ts5)(Leu

diff --git a/apps/gallery/img/supersized/back.png b/apps/gallery/img/supersized/back.png
deleted file mode 100644
index f0e809ece0934f4ba55bcbb3b289bade51d6ce08..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2319
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
X!(Gw$G^fM#zbHXWHlt=EZ_j@Kuk_6;

diff --git a/apps/gallery/img/supersized/bg-black.png b/apps/gallery/img/supersized/bg-black.png
deleted file mode 100644
index e7ce54412b8087d78c3c32663af3bf23431cb868..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1065
zcmaJ=zi-n(6gDcLs8XabFu-)V4lKkzJ3ky-H6@9YHd0+hX(YmiYhN3ywa>LL#O;Dq
zb$|^CF(M(cu)sgip#u{mjEtxf6JlgS;x3Jy4g^bncklFl-}`azUi7xs^UHUa1wqJn
zH_Sd;UH<28G8=w>Jz&cn+8)wvvP&m+goTDnb};Dr_8#tI+dVq`j8_F=33`Je9a@{Z
zLwwQZ7%}lf#ukLtwIsBieN4d)-tz(j{yIB{z;g}wsA?fAY~hi&aU9|8<E?>nyzgi(
zTzddk6P*e8nA#xm4}w@v3^>)**`6Ou5KJL--+-4%4Xqw%kqCpTh)NEsAyAV=xm;0I
z^*&ILj3lH;vQm;&y{za6f!POHw8-7n`(|eri+KhdQ5x!!G?`4qNm(S(o+N9U#x)eB
z#1N(UD4=#y3gVSi!Njo>c_H;k0Jx&PL&nsAEYr&p{4kRZ;#r$m!=%IxC0Rtgq!egb
z|A+d1hK^|;&-4AKa6C8)vDC*g8AlGgxZM>VD%4vMwke4QgdC(@?2QN|@rZ<=wOs|4
z?RWwAr+CZKyFpCtz`<S9fJ{O3JXbfX9kr#_wTfEq$Z{KLW?gMmYPF71QBfO}Q?5yz
zv5y0qa@{$%v5?D0!4Fwv6Gz@t>~<pJgK5dSw>TGdq27$^F3zRCkSnodB!011E;>D8
z)5Evf*fJ*@d>pW8kJwn(|GfObp2VB3*%&0>etx-@7lho>+w*7D*5gmw`-iVK>+hPU
zz|74|?$$}6n3>aD<9XrI%pu@<u~~pKlR=AfXs(f}aZ(0t7OqMc)2J6`H`ed<Zh!sp
Q`+`5-ZhOo8*nD#G7a-(3=>Px#

diff --git a/apps/gallery/img/supersized/bg-hover.png b/apps/gallery/img/supersized/bg-hover.png
deleted file mode 100644
index 1ca2022e106454b787657cecabc88aa30eb744fb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

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<=

diff --git a/apps/gallery/img/supersized/button-tray-down.png b/apps/gallery/img/supersized/button-tray-down.png
deleted file mode 100644
index 15645ae34efd3a83ec0bb915b43946061d8f8152..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1464
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@+2p;uw-~@9hoG4B<eT;~(GqcmxQ$uhc&F>fqBCTvw-bsynh|3c4KhTFcC~P^(XE
z5l5-D#zc)3>fA?LlL`;B3I+<q9B}TI+S@g6(hP4AlY|Y%adAtJbOi>)Kl$%xZ1A6b
z{>=Nczt1;hxc|Mj`G1ZClkkiKENTXgoIVLmzn>c%{!#q>$oJYt&Nt=>Yyu3&7~a0x
zGwmUx-3O71Wqn(lSQ|es3|MjF+O~(&pG!)-P@jEPFUVqT!r}(c11n2@MPwgWTmH<_
zYpGD-?wLs&C0L7g9du(3T%an$m;UZ<{edkRTb5Z)+8whlW?zYn$I6T>R&K`N2G#?4
z*89%bUB3JI@~`9la+7Ynv0)5jk}r)(R!d;q+-ULOoqfTM!cgzm{Mo0U8oj=@W?8@q
zYX|*+i(gCSS=5+5H+-Fzx^@2Ef{ATyoXXecomjH7@NX3V23ZaM`lww8dA43##_W6G
zTtsor!+q<V?_b?p^|Q%#rR@2}rw6JN0>1O!VmZcG9HKHgFYEo4rG~$6vrhGDopRe#
zasF+tl5qEc=jW6;e8MKak;snB?qA|B)aSzR;<fGZyVl#!G0#1){1wM59_g+pJPDi+
z%#ObKDLq$rPwnSfXD&8Z%)8F<#Jy|5yS+&cu0?tqBnsvp*%rAyKkjL);&c{2=J~I;
za`LUrOHtc!$mFcv`OiWQ@n7eK=5JW&;TBT-hEe{?u3tg#=j$%(N_9BM)?WJMlPxfk
kPQEt>M-(v5{{8yFr5T#N=jMjQx1h4r)78&qol`;+07I@J&j0`b

diff --git a/apps/gallery/img/supersized/button-tray-up.png b/apps/gallery/img/supersized/button-tray-up.png
deleted file mode 100644
index 0ee91d25ba0f984cd2c08cb381d8a45ed9af3a7f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1451
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)%R6d%8G=WZZi@
z!!cXfQRI02?wd<8g^~_Lt(@nhQz5W4%i+Q`7MqY&Y@S`V9Lus+F1g^uI&~Ub@hkC<
zPaHo~ujshYT_NE3@yW@#IU7!XHkulB&}B3CZ43T?XJX23+&}Z*_E|4$M@Ixt#0{Pd
z2?OS|13WVrjT6{(S{{Dc-H^&!E-frroWyqK`GzgW*g4NIJ~~ikHoKPH=GuhD_70B!
ztK`h|cts|kT(YO;Yt*TyT@17LiuKq1)7CKHmS8J7(EV$2Tg{Ijp7-|Lo#dmY>|p4z
zL1C=~BOk-+^mFre+gV$;2l*y#R5W|V+YmKj+7{**b4DMR#TRegs*+uQ^-w5RxaKl0
z*JXO5S_h8RF>P*;FksR-e?Kze$pwvdtLrX)I>mhHWeM|%_u?Bm^d!7*-ud`)^-`nz
zcb?^UsRxC;*JDfbv~Kv?)+pTfc#Yn*u#BpE{@m}bww`2K?&lxU=$^>7xnae&2Zyzd
zRo(de7lwT9-xV60pdojk#ji~?=XlfiV|_AnciPnQUj4F5Yo=H5u0r92lm6bnc&Ba5
ztzK(XKKt!kvw7EFdH(z?ZaGbQKfh1gvfP`@(>h#~Z0f&#S#KZa#aQ#rSpQemqkC8T
zk2W^{S~QzIDAvr6f&T|r4dXrLXouVVb!Yqy+{2Gdky~v0#3%aj&Zzs1em4%3MG045
z-}AaOpkG$^<Lc&b#>ZV&CtJNRuz&U?SsWA_4U*uPx>3*ejrqZ~bvhwmny-P1Pfu4r
Jmvv4FO#re`7K8u*

diff --git a/apps/gallery/img/supersized/forward.png b/apps/gallery/img/supersized/forward.png
deleted file mode 100644
index a6408f751188738daf0603744901c906ef3264f9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2316
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
UG<#P*(fyxLd;>_o_^?y|3wKf4uK)l5

diff --git a/apps/gallery/img/supersized/nav-bg.png b/apps/gallery/img/supersized/nav-bg.png
deleted file mode 100644
index c1a9fc170f4df909b5e0080598d7b00c3daacfff..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 993
zcmaJ=O>5LZ7>*Q5Degf}RzZhU&_g$wWX*0jG?s0WZ5K>g_k-@GVwz05ahpt<%(`jC
z52}ZHsE7Un4?T%^@gS(s3KbDO2`b_rupoN%rjzaN)`M$cGV>14^SqyPzc@Rc7(O}7
zFifH_qm}4>gs!onLHgf5_ravw2+?b#j2B7E3=osE@d5$`*IYs+WZJ7MZ_xz946sh6
zMry_-*}^Vo#uzSgeadE-iOI+}tp*}s0WCS6!v1`*!ve=v*g467hOeT!GqV<;^4e_0
zT5DKYo1MG}CL);%xQLh_a+keOjuf`7E7Nm)&9k5lAq|B+2&!fjfr<kJBn~Dmn1&!N
za6;-rCX*QhA`~DGMP3k-LPk!BGK8S>vD8~&FUln?-|<B)g{>3f%RJv|wYXM_!@&|S
zWV6{=Lllz~kqlQoVn#_X9PKJ-D6|5{Cl2;NtY|LaCQ(=#=|Kvv-;?#iPMK)I_{j8m
zfrD{MU7%t7AL_b2bVy3*Fy4O(hm}<y@g)@EW?<3AEsn;nd|3^UNpMiXc)44}VjUA4
z*0B%NvIGp%a=h4X;|)VDcp))83l%hlr3#$m*m8bK7j!8-bwNw3f}q3k{J1tQK}nZX
zn1ZQXm#bl`=^~GGx%MGf?aPfv!S$(U4F%41Wak6yf_BQX(?6DMU%d|3?jK98FPEpm
z@Nr}RYIOICPEUO7jV(2LgO5Bq?ExL@qIvo|eG=7zma7bXZf?Fx?82de&5u=a`uXp{
zk@aJ{H}9RVKDzbz?o$SydU<2#+mDB5Ve0k!y`zl&ZhdQS<JU&@)AmO6b^glbxd&&q
iu07j7aa(UB?tF=uH|6<ge<gW5esl$WR(mpab^Q-4!aJS-

diff --git a/apps/gallery/img/supersized/nav-dot.png b/apps/gallery/img/supersized/nav-dot.png
deleted file mode 100644
index 4319ed04213c053dd53b9eaa2fca911fbc0dcbb8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1640
zcmeAS@N?(olHy`uVBq!ia0vp^JV30%!3HGvcHQ0sq$EpRBT9nv(@M${i&7aJQ}UBi
z6+Ckj(^G>|6H_V+Po~;1Ffc1+hD4M^`1)8S=jZArg4F0$<Q4#RGcefLR}>^BXQ!4Z
zB&DWj=GiK}-@RW+Av48RDcsc8z_-9TH6zobswg$M$}c3jDm&RSMakYy!KT6rXh3di
zNuokUZcbjYRfVk**jy_h8zii+qySb@l5ML5aa4qFfP!;=QL2Keo`G(%fti7VnW3Jc
zv5C34xsHO7fuVuEfswwUk*=Y+m9dePfq?=PC;@FNN=dT{a&d#&1?1T(Wt5Z@Sn2DR
zmzV368|&p4rRy77T3Uk4Ff!5ws?aU2%qvN((9J7WhMC}!TAW;zSx}OhpQivaF)=B>
zw8T~k=u(Imatq+b<`qMO2^e7d6^RA<hI$4dFToW0`r=obn+sQ6ToROua4%Mai$f|4
zQuTvUi}Op1l7SJIrVO&Gz{<HOHL)bWC?r2W2NsF}8Tlpo#Toep3eLf%3ciWSnRy^S
zSiP^Wm1kaYNn&1ds;7&s63_&_%*+%kXA^TrOBXXs6E`D6Lqk^s3o}DkS3?66H#ZA6
z3nwE-m|mCs<kH;Kyb_q+6og(!oO(e?A-4c%vrB4GW?5>ATTy<l0@%w|nYi6zj?+A-
z-W1$!vB0TUALtl;P{bldG)xGXdO%EgvITPB2|qOtnA(eg$y)R5J{blEraPW4jv*GO
zOQ(AK2M3C@T9>`MvM}|6Ng~JA-j_!@MVqetV`)=Sk?=ZFl2qUnbU1=zLDQk!x6TI>
z7OL9xxP5G8J>@LLwDkgqQ}^2D*HIPk&aRa4`=n}}{eEuo`Fq@17fbIZHC*O$JGic)
zFgvtYV-L$Cv)Q`WFJCsE?6=(X&<v^KH4~+Ubai#RpL)68zIU?r{*5zYoXJ^d7OH7x
z>E@R0uH7DD)wv}6`f2aelCf=38%u=Nu3dZAG1pr9So6VztkT@%*N2y{-_<pBYi~||
ze*UDbIToj$7AbS*i)$C>-+Qe!;diixNLysKna}w%;c@=wUui81`W(vpcu!v0!&tLl
zMM2>Q=lt<}TXW%Fo#HB2wNw6Ecj!6yTK>Ff<JtG_!H4N)b~A5D$#qZTNX|MIp?k?P
zR_6HW&QznBhKFX%+Gx@JXiKBO32rAR>+g3MWD^1|C~h%+uC#;uKF>k>?+=yj6McFu
z1C!@fSKMfx&))t|eEl*xzTTE&K*P=~Ty|R{@5o`c&(*Eg{qtQ9G5c?s!LwEV=U=^^
zQiiR*IUEU6cW<Q0Ka&fd=yC3Aa^W7u18sp3kImNcC$BaX{n&Y=IAU?^AIHDh4bu;O
z@bzKMTc5@8Vb^(Y?Y{+SKCH!`)J;D+x*tEfu0MWX>%;#ucub!?asOOWT(bXk>i=ig
z%I<%9waZN+_;>x9XOAr6{CMm>2_L%>(rsMMWOY#4aruRFw$mMLGX$=1zdf^)Va^9%
z=0A_y`ej-SO`o~+R<3)Lc>RGiyI6&+U6xwUO2c-k?SVN*4@*5*s{Nr?{NKlu0nO9r
zNNDHA9cB|>_VAdQ?T21});&)SKB{Q$<~2|3wTgM)nqQ;!U}^LQH`(m7Y!xTD@BavS
z@NE^F`1<B}8<1+C2d;i_{Ln4D@8cnRJISmwGyBE<AG#|eTl2V~-sVG~aiY&ziPe98
z7wod=n=af8c3N^_TJx95sjPet=er3;Kb^IIla$f5J1h~bpt9f7)z4*}Q$iB}m=b;K

diff --git a/apps/gallery/img/supersized/pause.png b/apps/gallery/img/supersized/pause.png
deleted file mode 100644
index 1e81d1856b6f55f64070acd6207deb6a9bf7fd66..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1124
zcmaJ=ZAcVB7(P^@EDZ{zB5PYqqPpAJJMU}piu3j^FIv;{$cw04cjvrK_ru+>yAuM7
zeiUl-C(58d648&oi27BaWl4q<1)YK!6_R~f5JV9K&6=nE=vtVad57nD-e=x<=R|GI
z_M*a7g%*pYC|u1(@a)24)4~P#|D*1b4^JymFox>YI7;$5wD?7}2@+wMZ-x=bi|Mvu
zSZT53lTtK>V%$zfP-Po$Vr(f{!)%MCa$8E{g%*g2CfF<~KJv@$ev*(xAKBpK0H+0D
zLaOf2VSPtUROo0Cydt@6D^ZzZuz(B^Po(5l#b8oCaz>ZIYjc|-i5UoL@sWQ_#kg7`
zpz4rt+JIF6E<m_w8||oYyWLv|JD>pt>=bRc(r(6KX8<5(KN4rt#W)jTL$kSX<RcRZ
zX$(arlSy0BVN>;HiuQWFriR^a#R#jBRuG@EDn?mWfrW;kOB#|?g)kNQCbb>;NbK~_
z5oB#nRxxJFgbPNcc#WcMz&uhG$Z`LN%JLlAKoL0a_n*Q>G_64@0u8lY7x2Z!%gj_7
z6VM@#R6VMyt=THpCRC&v2~{Hk^-hB01xYdE89c`^VZ}haBET@~Be8-_l0>E|;Gx}K
zr^n5DLNpx&9-5}BoGyny2w1;8;L37YRcM!?g0ft3p6kuYHCsW}aAp?j(jh2@bX6v1
zj?758y|{Af&2q)uUfemk6gESd7yH*mXSZ<on9I4g#lc+TLj`xcj@$Y}0Vm@pF&1Y1
z(ZtK?-ls+Pz!LV!ahb`x9xurYJp>$Cy7<)4+L9fQ_Iz#lJh&@)<8r3@O)HGwd39j}
zII?JGW8U(!1CNX2@!^rN_mj_$jVw!VR>p^>KK}YP-PXTus&x%_|4OO{b+11tPq?p@
z_Z_{fftv>$>sHhqEM;8J7JfR@c&qzv=$yCI=sexG@$qD=&9gg`KVDk*Vzi4aZhAYK
zNGB#*HXj<$K*hVv$jacp?_KhP%+Sf63Vx7vb{2G=ui4KHtgiSK`Z;wiYWgWC$JVx7
Z+`4z^&;sf3>t6HShl4fj)vCs$zX24ydz}CP

diff --git a/apps/gallery/img/supersized/play.png b/apps/gallery/img/supersized/play.png
deleted file mode 100644
index df94a03498677505890c1c7dbb2449ec15323265..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1549
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_&le2}PxuvOzxr>FHp`ojRg`uILlc|}pqpN|7
zqmi>2Os`9Ra%paAUI|QZ3PP_bPQ9R{kXrz>*(J3ovn(~mttdZN0qkX~Oe}6Oc5!q9
zTI>Wg59kVPZh`1c!QvLEUT2(o^?{Dj2SqGWM8kxDsRzV_CtDx~p72xifT_I*l&mk8
zr86)vHF~-@hGg7(d(+on*iquZ$Nv&SPFYo-S`<I7QhRaI|DpMZ2abCVu-aCcsHw?W
z%-~@0j#}KbXPX$4M~{a`$Pp6`jiou7`l3gsH3=+uJFSo1{8$Fhjk%Lr&rJ5&baU=Z
zoBcDNZ`iE8WQxpo0jCqfGM6tH@Lq<X4Uc(*ou+UoX0-_DDY9tIT00>~E3@H!ROnP4
zZSBbiWDn$)Z_Ih36nf}MR95Ucm$cN<(%zDtF+w}I=U9E(uzq!CysnM##I0M+m)w3k
z?SSoqM+S*bS2wzHC{BN*U4Qrfty@Q)f4y|&%86sgj@3S36tL7-b0KERp+y^y*4y2`
zd2`v;rLD)>s)AN-Wm~{F!$xSsOOKNKbuUY1tvgpX%a%VfGOmv23iEpz-q|y_<agBD
z?RWP#@YuY(^XJcq-Jy$=8%ku}IA?5Hu#x$1?T<ZjJjrGmZy!AHpYEKH@8-PinM9rK
z5#{ym1r@)94AR)c7JV{Rn|=0{RQ<O*m0J2SDpIERW-p8660unr6rq+aW}-LK=fbsL
zQ^f!7O);8j^<bOql%j}hf9!8e{~^@)jxUanZ^G%P^B77Ucy4T)-Tf%YMj|Isv2Fk6
z-iZ$vvRq&{VJ=LNy}|gYuW9D*1J9oE{E5x&>D?F0SjEV{fvaY_gQe&SXYHdOzNk0-
z<6EX?f2{F&1OJb2>>e-GUoJYdOzqf9&JrP0CAJ6b^CB1cCTy2j@My}Snal|`CT{il
z4M$sVq%Yup!6qc85$h9R$Tw@DcKG_!pDv3ENwDWJPIa&>xD@45D6w;;-L^X{dd!Ru
zL?^IpYv9=seuB^P>C{&}r8|F1YveC~GKWcft3Y*`V_%b{=9hkZXd<wF^^tjb&h_&<
S?zo763TRJPKbLh*2~7ZsTtN!}

diff --git a/apps/gallery/img/supersized/progress-back.png b/apps/gallery/img/supersized/progress-back.png
deleted file mode 100644
index 95992f1410cf67fc83d8688fcd66d1c84fdfc23e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 924
zcmaJ=&u-H&91fa<s!5Y}*o9rNvfD%xCtcbmYM8ntWs#PuYAdbBxry6GUE<)lH0=#;
zJOBq?fFm!!fg|FM#0zle6|lRe<3Nez*gxz0zTaQJ?{!}t9iARal62%>yM4Yt;j2=4
z%Ky#N4{g3ZW8R1j$b>Bs#Zo&WV+{NRO>rNiX!ZI#Zb{OC91llq6x>)LNfab7N|9uo
zElI7*B17REGcd-}IJM>9U%tv9j%@kX2w;#ocotu;DITo5!*D$h%}Bm{30j541rp2<
zD3bd$w+dU{=vw?Nu2mUqAZ%{S4?&HB9&iZ7z))Z{gmnn&nxfS%8jZ#aphFF+P**j*
zsx_>dZb1mPpUl0{Xkzu<&ej*VY<b35W~u6Oxm1=lh0v+0nWiZ;biK+E)qIsQR8-Ua
ztW<Du9@02tF-d_?L}RjGw#*}aNFm8~vT4386EB!rpiI>iC{ikcLGXWQlI+kq>*L3G
z|0$dgR~c6OI427l^2SZhgsaSQC`OFXAtCo=6?-$nNIoMOa0UhlP#CAe-r$44^3$B5
zG{nAZ%UnT;<H*v@wprI3?u83Gn&!b~r|C8gXn2MLYp~WXxh@G82~JtbjUKt)UalC0
zB;%f4Oyf5=>QIt^P0CihKbEV#dRuO^KNe>%SLMN|qOpH9y1e4kBaXYV<;HICamuHi
t^0EH)>6>^`$G+PhR(^)ZCnxL<+(?r5<KW}@^V_%Lz4%_&{d{%z?hkrT7XknP

diff --git a/apps/gallery/img/supersized/progress-bar.png b/apps/gallery/img/supersized/progress-bar.png
deleted file mode 100644
index 9758d1788316a8d8c472781e7cc9df893f35bf4b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 924
zcmaJ=&u-H&91c`M)uaio+sX1ylW5|kOWRltQ)yZjL8_{)ph6t*61NRq;^4S6?U5S~
zz$<X%1vu=?6Yvb2xN;j#*K`~xksSMHec$){>regOv%`bq14U5|-3w<R_j_`c%Mawg
zas0U@w<FORiy@ncCE-+Q1?-XnHzHFypd?tm|4y5VQi9=VEXLjo?6XKEIY!N*M6wm7
zd7dT2pHl%Y=`@UO`0Lv>1YuyqSEh%&q)lhx#hTOMx;OIIbKeT!`4iC0uoQ@>ARvpb
z;uL2#+~{I?&aX8HHV`ql;cZZ3uMgUcQ(&s7;-eY@HC@%KXZ3phF))yhG-PPHQPJzT
zYG8!G_Jh(J4<>lvbho~wWy6^e3D&gba;Yw>D&td4w=65yFpP>sRMJ%}NLGo{lS09v
zsn5eige(TRBDrJ>VM7_|Z3<Dcla14DnPkDVj3k<_qCBMn=z0H#M$rzPiUGZg_n*S)
zXq8ZHKvTBhzHHp&BzKkIHm5`|K4R>usA7M{1WRWu0qvm)JmQCOZg23Ohut_8B=)K6
z*ib5{VHjY;YFRa-p`SUZtLq)q=r){&iOi1KMpaa86<mk;i-^Xe;0AYGV=p%!g(#7p
z9m>NGH0W{`flbOd+#5^1yH{_^4fe-^_Hs2DjFva{uSOSFa(eRPZfvEo8+;neY3FjR
t-+X!ZTt10MuG1QofB3&|Zmvrua$kA)`sio$@-%;LireWqU!T7H_y=j!7+nAW

diff --git a/apps/gallery/img/supersized/progress.gif b/apps/gallery/img/supersized/progress.gif
deleted file mode 100644
index f3e45e0569c02ae3fe7114691e5b5aba892e9ef4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2608
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
To9S~^+y+<0ZCHLEy;%PN2K9)%

diff --git a/apps/gallery/img/supersized/supersized-logo.png b/apps/gallery/img/supersized/supersized-logo.png
deleted file mode 100644
index cc106293292110dfb41f47fbbd06b3ab25a3d22b..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3488
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
B9eDr%

diff --git a/apps/gallery/img/supersized/thumb-back.png b/apps/gallery/img/supersized/thumb-back.png
deleted file mode 100644
index b86a9110ee47652d6f41ce95a9bed1cd538012ef..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2010
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

diff --git a/apps/gallery/img/supersized/thumb-forward.png b/apps/gallery/img/supersized/thumb-forward.png
deleted file mode 100644
index bff5ec1108a9bb815174bdf7ab9aac49b17bfbd7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2007
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
aZ+5}2!r11X@9GQezgj*wno|=l&H4k%G&{5a

diff --git a/apps/gallery/index.php b/apps/gallery/index.php
deleted file mode 100644
index ce79f8f878..0000000000
--- a/apps/gallery/index.php
+++ /dev/null
@@ -1,105 +0,0 @@
-<?php
-
-/**
-* ownCloud - gallery application
-*
-* @author Bartek Przybylski
-* @copyright 2012 Bartek Przybylski bartek@alefzero.eu
-* 
-* 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('gallery');
-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';
-
-$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, false);
-$tmpl->assign('tl', $tl, false);
-$tmpl->printPage();
diff --git a/apps/gallery/js/albums.js b/apps/gallery/js/albums.js
deleted file mode 100644
index 62d3f783ec..0000000000
--- a/apps/gallery/js/albums.js
+++ /dev/null
@@ -1,101 +0,0 @@
-Albums={
-	// album item in this array should look as follow
-	// {name: string,
-	//  numOfCovers: int}
-	//
-	// previews array should be an array of base64 decoded images
-	// to display to user as preview picture when scrolling throught
-	// the album cover
-	albums:new Array(),
-	photos:new Array(),
-  shared: false,
-  recursive: false,
-  token: '',
-	// add simply adds new album to internal structure
-	// however albums names must be unique so other
-	// album with the same name wont be insered,
-	// and false will be returned
-	// true on success
-	add: function(album_name, num, path) {
-		if (Albums.albums[album_name] != undefined) return false;
-		Albums.albums[album_name] = {name: album_name, numOfCovers: num, path:path};
-		return true;
-	},
-	// remove element with given name
-	// returns remove element or undefined if no such element was present
-	remove: function(name) {
-		var i = -1, tmp = 0;
-		for (var a in Albums.albums) {
-		if (a.name == name) {
-			i = tmp;
-			break;
-		}
-		tmp++;
-		}
-		if (i != -1) {
-		return Albums.albums.splice(i,1);
-		}
-		return undefined;
-	},
-	// return element which match given name
-	// of undefined if such element do not exist
-	find: function(name) {
-		return Albums.albums[name];
-	},
-	// displays gallery in linear representation
-	// on given element, and apply default styles for gallery
-	display: function(element) {
-		var displayTemplate = '<div class="gallery_box album"><div class="dummy"></div><a class="view"><div class="gallery_album_cover"></div></a><h1></h1></div>';
-		for (var i in Albums.albums) {
-			var a = Albums.albums[i];
-			var local=$(displayTemplate);
-			local.attr('title', a.name);
-			local.attr('data-path', a.path);
-			local.attr('data-album',a.name);
-			$(".gallery_album_decoration a.rename", local).bind('click', {name: a.name},function(name,event){
-				event.preventDefault();
-				event.stopPropagation();
-				galleryRename(name);
-			}.bind(null,a.name));
-			$(".gallery_album_decoration a.remove", local).bind('click', {name: a.name},function(name,event){
-				event.preventDefault();
-				event.stopPropagation();
-				galleryRemove(name);
-			}.bind(null,a.name));
-			$('h1',local).text(decodeURIComponent(escape(a.name)));
-			$(".gallery_album_cover", local).attr('title',decodeURIComponent(escape(a.name)));
-			$(".gallery_album_cover", local).css('background-repeat', 'no-repeat');
-			$(".gallery_album_cover", local).css('background-position', '0');
-			$(".gallery_album_cover", local).css('background-image','url("'+OC.filePath('gallery','ajax','galleryOp.php')+'&operation=get_covers&albumname='+escape(a.name)+'")');
-			$(".gallery_album_cover", local).mousemove(function(event) {
-				var albumMetadata = Albums.find(this.title);
-				if (albumMetadata == undefined) {
-					return;
-				}
-				var x = Math.floor(event.offsetX/(this.offsetWidth/albumMetadata.numOfCovers));
-				x *= this.offsetWidth;
-        if (x < 0 ||  isNaN(x)) x=0;
-				$(this).css('background-position', -x+'px 0');
-			});
-			element.append(local);
-		}
-        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])));
-		}
-		$("a[rel=images]").fancybox({
-			'titlePosition': 'inside'
-		});
-	},
-	rename: function(element, new_name) {
-		if (new_name) {
-			$(element).attr("data-album", new_name);
-			$("a.view", element).attr("href", "?view="+new_name);
-			$("h1", element).text(new_name);
-		}
-	},
-	clear: function(element) {
-		Albums.albums = new Array();
-		element.innerHTML = '';
-	}
-}
diff --git a/apps/gallery/js/jquery.easing.min.js b/apps/gallery/js/jquery.easing.min.js
deleted file mode 100644
index bbf8410391..0000000000
--- a/apps/gallery/js/jquery.easing.min.js
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * 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/pictures.js b/apps/gallery/js/pictures.js
deleted file mode 100644
index 47f727e0de..0000000000
--- a/apps/gallery/js/pictures.js
+++ /dev/null
@@ -1,68 +0,0 @@
-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'));
-      }
-    });
-  });
-}
-
-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 + decodeURIComponent(album_name) + "/";
-	var url = window.location.protocol+"//"+window.location.hostname+OC.linkTo('gallery', 'index.php');
-	url = url + "?root="+encodeURIComponent(root);
-
-	window.location = url;
-}
diff --git a/apps/gallery/js/scanner.js b/apps/gallery/js/scanner.js
deleted file mode 100644
index 804ee9d229..0000000000
--- a/apps/gallery/js/scanner.js
+++ /dev/null
@@ -1,34 +0,0 @@
-Scanner={
-  albumsFound:0,
-  eventSource:null,
-  albumsScanned:0,
-  scanAlbums:function(callback){
-    $('#scanprogressbar').progressbar({value:0});
-    $('#scanprogressbar').fadeIn();
-    $('#scan input.start').hide();
-    $('#scan input.stop').show();
-    Scanner.albumsScanned=0;
-    Scanner.eventSource=new OC.EventSource(OC.linkTo('gallery', 'ajax/galleryOp.php'),{operation:'scan'});
-    Scanner.eventSource.listen('count', function(total){Scanner.albumsFound=total;});
-    Scanner.eventSource.listen('scanned', function(data) {
-      Scanner.albumsScanned++;
-      var progress=(Scanner.albumsScanned/Scanner.albumsFound)*100;
-      $('#scanprogressbar').progressbar('value',progress);
-    });
-    Scanner.eventSource.listen('done', function(count){
-			$('#scan input.start').show();
-			$('#scan input.stop').hide();
-      $('#scanprogressbar').fadeOut();
-      returnToElement(0);
-    });
-    if (callback)
-      callback();
-  },
-  stop:function() {
-    Scanner.eventSource.close();
-			$('#scan input.start').show();
-			$('#scan input.stop').hide();
-    $('#scanprogressbar').fadeOut();
-  }
-}
-
diff --git a/apps/gallery/js/sharing.js b/apps/gallery/js/sharing.js
deleted file mode 100644
index 679e39578a..0000000000
--- a/apps/gallery/js/sharing.js
+++ /dev/null
@@ -1,57 +0,0 @@
-$(document).ready(function() {
-  $.getJSON(OC.filePath('gallery', 'ajax', 'sharing.php'), {operation: 'get_gallery', token: TOKEN}, albumClickHandler);
-});
-
-var paths = [];
-var counter = 0;
-
-function returnTo(num) {
-  while (num != counter) {
-    paths.pop();
-    $('.breadcrumbelement:last').remove();
-    counter--;
-  }
-  path = '';
-  for (var e in paths) path += '/' + paths[e];
-  $.getJSON(OC.filePath('gallery', 'ajax', 'sharing.php'), {operation: 'get_gallery', token: TOKEN, path: path}, function(r) {
-    albumClickHandler(r);
-  });
-}
-
-function albumClickHandler(r) {
-  var element = $('div#gallery_list');
-  element.html('');
-  var album_template = '<div class="gallery_box"><div><a rel="images"><img src="' + OC.filePath('gallery', 'ajax', 'sharing.php') + '?token='+TOKEN+'&operation=get_album_thumbnail&albumname=IMGPATH"></a></div><h1></h1></div>';
-
-  for (var i in r.albums) {
-    var a = r.albums[i];
-    var local = $(album_template.replace('IMGPATH', encodeURIComponent(a)));
-    local.attr('title', a);
-    $('h1', local).html(a);
-    element.append(local);
-  }
-
-  $('div.gallery_box').each(function(i, element) {
-    $(element).click(function() {
-      paths.push($(this).attr('title'));
-      path = '';
-      for (var e in paths) path += '/' + paths[e];
-      $.getJSON(OC.filePath('gallery', 'ajax', 'sharing.php'), {operation: 'get_gallery', token: TOKEN, path: path}, function(r) {
-        var name = paths[paths.length-1];
-        counter++;
-        var d = '<span class="breadcrumbelement" onclick="javascript:returnTo('+counter+');return false;">'+name+'</span>';
-        d = $(d).addClass('inside');
-        $('#breadcrumb').append(d);
-        albumClickHandler(r);
-      });
-    });
-  });
-
-  var pat = '';
-  for (var a in paths) pat += '/'+paths[a];
-  var photo_template = '<div class="gallery_box"><div><a rel="images" href="*HREF*" target="_blank"><img src="' + OC.filePath('gallery', 'ajax', 'sharing.php') + '?token='+TOKEN+'&operation=get_thumbnail&img=IMGPATH"></a></div></div>';
-  for (var a in r.photos) {
-    var local = photo_template.replace('IMGPATH', encodeURIComponent(r.photos[a])).replace('*HREF*', OC.filePath('gallery', 'ajax', 'sharing.php') + '?token='+TOKEN+'&operation=get_photo&photo='+encodeURIComponent(r.photos[a]));
-    element.append(local);
-  }
-}
diff --git a/apps/gallery/js/slideshow.js b/apps/gallery/js/slideshow.js
deleted file mode 100644
index cc5dfc44a2..0000000000
--- a/apps/gallery/js/slideshow.js
+++ /dev/null
@@ -1,58 +0,0 @@
-$(document).ready(function(){
-        
-	$.endSlideshow = function () {
-		if($.supersized.vars.slideshow_interval){
-			clearInterval($.supersized.vars.slideshow_interval);
-		};
-
-		$('#supersized-holder').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.replace(/</, '&lt;').replace(/>/, '&gt;'), thumb : a.children[0].src, url : 'javascript:$.endSlideshow()'});
-		});
-
-		if (images.length <= 0) {
-			return;
-		}
-
-		$('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();
-
-
-		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
deleted file mode 100644
index f5a1c0bbc2..0000000000
--- a/apps/gallery/js/supersized.3.2.7.js
+++ /dev/null
@@ -1,930 +0,0 @@
-/*
-
-	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
deleted file mode 100644
index b9cea9cee1..0000000000
--- a/apps/gallery/js/supersized.3.2.7.min.js
+++ /dev/null
@@ -1,13 +0,0 @@
-/*
-
-	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
deleted file mode 100644
index cc3025a94a..0000000000
--- a/apps/gallery/js/supersized.shutter.js
+++ /dev/null
@@ -1,337 +0,0 @@
-/*
-
-	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
deleted file mode 100644
index 52ea4a3384..0000000000
--- a/apps/gallery/js/supersized.shutter.min.js
+++ /dev/null
@@ -1,14 +0,0 @@
-/*
-
-	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/l10n/ar.php b/apps/gallery/l10n/ar.php
deleted file mode 100644
index 7ed0e1f57c..0000000000
--- a/apps/gallery/l10n/ar.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Rescan" => "اعادة البحث",
-"Back" => "رجوع"
-);
diff --git a/apps/gallery/l10n/ca.php b/apps/gallery/l10n/ca.php
deleted file mode 100644
index 1c5848cee2..0000000000
--- a/apps/gallery/l10n/ca.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Pictures" => "Fotos",
-"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",
-"Change album name" => "Canvia el nom de l'àlbum",
-"New album name" => "Nom nou de l'àlbum"
-);
diff --git a/apps/gallery/l10n/cs_CZ.php b/apps/gallery/l10n/cs_CZ.php
deleted file mode 100644
index 02d1c02d6e..0000000000
--- a/apps/gallery/l10n/cs_CZ.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Pictures" => "Obrázky",
-"Share gallery" => "Sdílet galerii",
-"Error: " => "Chyba: ",
-"Internal error" => "Vnitřní chyba",
-"Slideshow" => "Přehrávání"
-);
diff --git a/apps/gallery/l10n/da.php b/apps/gallery/l10n/da.php
deleted file mode 100644
index 172f3c95e8..0000000000
--- a/apps/gallery/l10n/da.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Pictures" => "Billeder",
-"Settings" => "Indstillinger",
-"Rescan" => "Genindlæs",
-"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
deleted file mode 100644
index cd580cf303..0000000000
--- a/apps/gallery/l10n/de.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Pictures" => "Bilder",
-"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",
-"Change album name" => "Albumname ändern",
-"New album name" => "Neuer Albumname"
-);
diff --git a/apps/gallery/l10n/el.php b/apps/gallery/l10n/el.php
deleted file mode 100644
index 47bc3af2bb..0000000000
--- a/apps/gallery/l10n/el.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Pictures" => "Εικόνες",
-"Share gallery" => "Κοινοποίηση συλλογής",
-"Error: " => "Σφάλμα: ",
-"Internal error" => "Εσωτερικό σφάλμα",
-"Slideshow" => "Προβολή Διαφανειών",
-"Back" => "Επιστροφή",
-"Remove confirmation" => "Αφαίρεση επιβεβαίωσης",
-"Do you want to remove album" => "Θέλετε να αφαιρέσετε το άλμπουμ",
-"Change album name" => "Αλλάξτε το όνομα του άλμπουμ",
-"New album name" => "Νέο όνομα άλμπουμ"
-);
diff --git a/apps/gallery/l10n/eo.php b/apps/gallery/l10n/eo.php
deleted file mode 100644
index 254010b788..0000000000
--- a/apps/gallery/l10n/eo.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Pictures" => "Bildoj",
-"Settings" => "Agordo",
-"Rescan" => "Reskani",
-"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
deleted file mode 100644
index aa425a0bd0..0000000000
--- a/apps/gallery/l10n/es.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Pictures" => "Imágenes",
-"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",
-"Change album name" => "Cambiar nombre al álbum",
-"New album name" => "Nuevo nombre de álbum"
-);
diff --git a/apps/gallery/l10n/et_EE.php b/apps/gallery/l10n/et_EE.php
deleted file mode 100644
index 06bd3a5b8f..0000000000
--- a/apps/gallery/l10n/et_EE.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Pictures" => "Pildid",
-"Settings" => "Seaded",
-"Rescan" => "Skänni uuesti",
-"Stop" => "Peata",
-"Share" => "Jaga",
-"Back" => "Tagasi",
-"Remove confirmation" => "Eemaldamise kinnitus",
-"Do you want to remove album" => "Kas sa soovid albumit eemaldada",
-"Change album name" => "Muuda albumi nime",
-"New album name" => "Uue albumi nimi"
-);
diff --git a/apps/gallery/l10n/eu.php b/apps/gallery/l10n/eu.php
deleted file mode 100644
index f406730a8e..0000000000
--- a/apps/gallery/l10n/eu.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Pictures" => "Argazkiak",
-"Settings" => "Ezarpenak",
-"Rescan" => "Bireskaneatu",
-"Stop" => "Gelditu",
-"Share" => "Elkarbanatu",
-"Back" => "Atzera",
-"Remove confirmation" => "Ezabatu konfirmazioa",
-"Do you want to remove album" => "Albuma ezabatu nahi al duzu",
-"Change album name" => "Aldatu albumaren izena",
-"New album name" => "Album berriaren izena"
-);
diff --git a/apps/gallery/l10n/fa.php b/apps/gallery/l10n/fa.php
deleted file mode 100644
index 97d47047eb..0000000000
--- a/apps/gallery/l10n/fa.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Pictures" => "تصاویر",
-"Settings" => "تنظیمات",
-"Rescan" => "بازرسی دوباره",
-"Stop" => "توقف",
-"Share" => "به اشتراک گذاری",
-"Back" => "بازگشت",
-"Remove confirmation" => "پاک کردن تصدیق",
-"Do you want to remove album" => "آیا مایل به پاک کردن آلبوم هستید؟",
-"Change album name" => "تغییر نام آلبوم",
-"New album name" => "نام آلبوم جدید"
-);
diff --git a/apps/gallery/l10n/fi_FI.php b/apps/gallery/l10n/fi_FI.php
deleted file mode 100644
index 659289ae41..0000000000
--- a/apps/gallery/l10n/fi_FI.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Pictures" => "Kuvat",
-"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",
-"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
deleted file mode 100644
index 04421236e1..0000000000
--- a/apps/gallery/l10n/fr.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Pictures" => "Images",
-"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",
-"Change album name" => "Modifier le nom de l'album",
-"New album name" => "Nouveau nom de l'album"
-);
diff --git a/apps/gallery/l10n/gl.php b/apps/gallery/l10n/gl.php
deleted file mode 100644
index b7993ff5c8..0000000000
--- a/apps/gallery/l10n/gl.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Pictures" => "Fotografías",
-"Settings" => "Configuración",
-"Rescan" => "Analizar de novo",
-"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
deleted file mode 100644
index edc11ebd9d..0000000000
--- a/apps/gallery/l10n/hr.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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
deleted file mode 100644
index 34adf7719c..0000000000
--- a/apps/gallery/l10n/hu_HU.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Pictures" => "Képek",
-"Settings" => "Beállítások",
-"Rescan" => "Újravizsgálás",
-"Stop" => "Állj",
-"Share" => "Megosztás",
-"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?",
-"Change album name" => "Albumnév megváltoztatása",
-"New album name" => "Új albumnév"
-);
diff --git a/apps/gallery/l10n/ia.php b/apps/gallery/l10n/ia.php
deleted file mode 100644
index 7ab06c3b43..0000000000
--- a/apps/gallery/l10n/ia.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Rescan" => "Rescannar",
-"Back" => "Retro"
-);
diff --git a/apps/gallery/l10n/id.php b/apps/gallery/l10n/id.php
deleted file mode 100644
index 7a977b3c9a..0000000000
--- a/apps/gallery/l10n/id.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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
deleted file mode 100644
index ef8d596e7e..0000000000
--- a/apps/gallery/l10n/it.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Pictures" => "Immagini",
-"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",
-"Change album name" => "Cambia il nome dell'album",
-"New album name" => "Nuovo nome dell'album"
-);
diff --git a/apps/gallery/l10n/ja_JP.php b/apps/gallery/l10n/ja_JP.php
deleted file mode 100644
index 4ef4510bab..0000000000
--- a/apps/gallery/l10n/ja_JP.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Pictures" => "写真",
-"Settings" => "設定",
-"Rescan" => "再スキャン",
-"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
deleted file mode 100644
index 1900049f87..0000000000
--- a/apps/gallery/l10n/ko.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Pictures" => "사진",
-"Settings" => "세팅",
-"Rescan" => "재검색",
-"Stop" => "정지",
-"Share" => "공유",
-"Back" => "뒤로",
-"Remove confirmation" => "삭제 승인",
-"Do you want to remove album" => "앨범을 삭제하시겠습니까",
-"Change album name" => "앨범 이름 변경",
-"New album name" => "새로운 앨범 이름"
-);
diff --git a/apps/gallery/l10n/lb.php b/apps/gallery/l10n/lb.php
deleted file mode 100644
index 136acedc65..0000000000
--- a/apps/gallery/l10n/lb.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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
deleted file mode 100644
index 89c1a92d0c..0000000000
--- a/apps/gallery/l10n/lt_LT.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Pictures" => "Nuotraukos",
-"Settings" => "Nustatymai",
-"Rescan" => "Atnaujinti",
-"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
deleted file mode 100644
index 97f85de7ab..0000000000
--- a/apps/gallery/l10n/mk.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Pictures" => "Слики",
-"Settings" => "Параметри",
-"Rescan" => "Рескенирај",
-"Stop" => "Стоп",
-"Share" => "Сподели",
-"Back" => "Назад",
-"Remove confirmation" => "Тргни потврда",
-"Do you want to remove album" => "Дали сакате да го отстраните албумот",
-"Change album name" => "Измени име на албумот",
-"New album name" => "Ново има на албумот"
-);
diff --git a/apps/gallery/l10n/ms_MY.php b/apps/gallery/l10n/ms_MY.php
deleted file mode 100644
index a865a20a2d..0000000000
--- a/apps/gallery/l10n/ms_MY.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Rescan" => "Imbas semula",
-"Back" => "Kembali"
-);
diff --git a/apps/gallery/l10n/nb_NO.php b/apps/gallery/l10n/nb_NO.php
deleted file mode 100644
index 532062937f..0000000000
--- a/apps/gallery/l10n/nb_NO.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Pictures" => "Bilder",
-"Share gallery" => "Del galleri",
-"Error: " => "Feil:",
-"Internal error" => "Intern feil",
-"Slideshow" => "Lysbildefremvisning"
-);
diff --git a/apps/gallery/l10n/nl.php b/apps/gallery/l10n/nl.php
deleted file mode 100644
index df8fcaf72d..0000000000
--- a/apps/gallery/l10n/nl.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Pictures" => "Plaatjes",
-"Share gallery" => "Deel gallerie",
-"Error: " => "Fout:",
-"Internal error" => "Interne fout",
-"Slideshow" => "Diashow"
-);
diff --git a/apps/gallery/l10n/nn_NO.php b/apps/gallery/l10n/nn_NO.php
deleted file mode 100644
index 9caeff3306..0000000000
--- a/apps/gallery/l10n/nn_NO.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Rescan" => "Søk på nytt",
-"Back" => "Tilbake"
-);
diff --git a/apps/gallery/l10n/pl.php b/apps/gallery/l10n/pl.php
deleted file mode 100644
index 8c0bd0cb98..0000000000
--- a/apps/gallery/l10n/pl.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Pictures" => "Zdjęcia",
-"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",
-"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
deleted file mode 100644
index 7b45df444e..0000000000
--- a/apps/gallery/l10n/pt_BR.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Pictures" => "Fotos",
-"Settings" => "Configuração",
-"Rescan" => "Atualizar",
-"Stop" => "Parar",
-"Share" => "Compartilhar",
-"Back" => "Voltar",
-"Remove confirmation" => "Confirmar apagar",
-"Do you want to remove album" => "Voçe dezeja remover o album",
-"Change album name" => "Mudar nome do album",
-"New album name" => "Nome do novo album"
-);
diff --git a/apps/gallery/l10n/pt_PT.php b/apps/gallery/l10n/pt_PT.php
deleted file mode 100644
index 8b7aa2a23b..0000000000
--- a/apps/gallery/l10n/pt_PT.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Pictures" => "Imagens",
-"Share gallery" => "Partilhar a galeria",
-"Error: " => "Erro: ",
-"Internal error" => "Erro interno",
-"Slideshow" => "Slideshow"
-);
diff --git a/apps/gallery/l10n/ro.php b/apps/gallery/l10n/ro.php
deleted file mode 100644
index 3537c68b17..0000000000
--- a/apps/gallery/l10n/ro.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Pictures" => "Imagini",
-"Settings" => "Setări",
-"Rescan" => "Re-scanează",
-"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
deleted file mode 100644
index d6e33e4b01..0000000000
--- a/apps/gallery/l10n/ru.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Pictures" => "Рисунки",
-"Share gallery" => "Опубликовать",
-"Error: " => "Ошибка",
-"Internal error" => "Внутренняя ошибка",
-"Slideshow" => "Слайдшоу"
-);
diff --git a/apps/gallery/l10n/sk_SK.php b/apps/gallery/l10n/sk_SK.php
deleted file mode 100644
index e3e3be7881..0000000000
--- a/apps/gallery/l10n/sk_SK.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Pictures" => "Obrázky",
-"Settings" => "nastavenia",
-"Rescan" => "Znovu oskenovať",
-"Stop" => "Zastaviť",
-"Share" => "Zdielať",
-"Back" => "Späť",
-"Remove confirmation" => "Potvrdenie odstránenia",
-"Do you want to remove album" => "Chcete odstrániť album?",
-"Change album name" => "Zmeniť meno albumu",
-"New album name" => "Nové meno albumu"
-);
diff --git a/apps/gallery/l10n/sl.php b/apps/gallery/l10n/sl.php
deleted file mode 100644
index 8d3bb9f588..0000000000
--- a/apps/gallery/l10n/sl.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Pictures" => "Slike",
-"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",
-"Change album name" => "Spremeni ime albuma",
-"New album name" => "Novo ime albuma"
-);
diff --git a/apps/gallery/l10n/sr.php b/apps/gallery/l10n/sr.php
deleted file mode 100644
index e3b82defa9..0000000000
--- a/apps/gallery/l10n/sr.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Rescan" => "Претражи поново",
-"Back" => "Назад"
-);
diff --git a/apps/gallery/l10n/sv.php b/apps/gallery/l10n/sv.php
deleted file mode 100644
index b63a89d90f..0000000000
--- a/apps/gallery/l10n/sv.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Pictures" => "Bilder",
-"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",
-"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
deleted file mode 100644
index 9bb699e264..0000000000
--- a/apps/gallery/l10n/th_TH.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Pictures" => "รูปภาพ",
-"Share gallery" => "แชร์ข้อมูลแกลอรี่",
-"Error: " => "พบข้อผิดพลาด: ",
-"Internal error" => "เกิดข้อผิดพลาดภายในระบบ",
-"Slideshow" => "ภาพสไลด์โชว์"
-);
diff --git a/apps/gallery/l10n/tr.php b/apps/gallery/l10n/tr.php
deleted file mode 100644
index 7d007fa66e..0000000000
--- a/apps/gallery/l10n/tr.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Pictures" => "Resimler",
-"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",
-"Change album name" => "Albüm adını değiştir",
-"New album name" => "Yeni albüm adı"
-);
diff --git a/apps/gallery/l10n/uk.php b/apps/gallery/l10n/uk.php
deleted file mode 100644
index 2544158d45..0000000000
--- a/apps/gallery/l10n/uk.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Rescan" => "Оновити",
-"Back" => "Назад"
-);
diff --git a/apps/gallery/l10n/vi.php b/apps/gallery/l10n/vi.php
deleted file mode 100644
index d1d7fc64fc..0000000000
--- a/apps/gallery/l10n/vi.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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/gallery/l10n/zh_CN.php b/apps/gallery/l10n/zh_CN.php
deleted file mode 100644
index 6aa4fc7f35..0000000000
--- a/apps/gallery/l10n/zh_CN.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Pictures" => "图片",
-"Share gallery" => "分享图库",
-"Error: " => "错误：",
-"Internal error" => "内部错误",
-"Slideshow" => "幻灯片"
-);
diff --git a/apps/gallery/l10n/zh_TW.php b/apps/gallery/l10n/zh_TW.php
deleted file mode 100644
index eb4577affc..0000000000
--- a/apps/gallery/l10n/zh_TW.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Pictures" => "圖片",
-"Settings" => "設定",
-"Rescan" => "重新掃描",
-"Stop" => "停止",
-"Share" => "分享",
-"Back" => "返回",
-"Remove confirmation" => "移除確認",
-"Do you want to remove album" => "你確定要移除相簿嗎",
-"Change album name" => "變更相簿名稱",
-"New album name" => "新相簿名稱"
-);
diff --git a/apps/gallery/lib/album.php b/apps/gallery/lib/album.php
deleted file mode 100644
index d1b29a5992..0000000000
--- a/apps/gallery/lib/album.php
+++ /dev/null
@@ -1,111 +0,0 @@
-<?php
-
-/**
-* ownCloud - gallery application
-*
-* @author Bartek Przybylski
-* @copyright 2012 Bartek Przybylski <bartek@alefzero.eu>
-*
-* 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_Album {
-	public static function create($owner, $name, $path){
-		$stmt = OCP\DB::prepare('INSERT INTO `*PREFIX*gallery_albums` (`uid_owner`, `album_name`, `album_path`, `parent_path`) ALUES (?, ?, ?, ?)');
-		$stmt->execute(array($owner, $name, $path, self::getParentPath($path)));
-	}
-
-	public static function cleanup() {
-		$albums = self::find(OCP\USER::getUser());
-		while ($r = $albums->fetchRow()) {
-			OC_Gallery_Photo::removeByAlbumId($r['album_id']);
-			self::remove(OCP\USER::getUser(), $r['album_name']);
-		}
-	}
-
-	public static function getParentPath($path) {
-		return $path === '/' ? '' : dirname($path);
-	}
-
-	public static function remove($owner, $name=null, $path=null, $parent=null) {
-		$sql = 'DELETE FROM `*PREFIX*gallery_albums` WHERE `uid_owner` LIKE ?';
-		$args = array($owner);
-		if (!is_null($name)){
-			$sql .= ' AND `album_name` LIKE ?';
-			$args[] = $name;
-		}
-		if (!is_null($path)){
-			$sql .= ' AND `album_path` LIKE ?';
-			$args[] = $path;
-		}
-		if (!is_null($parent)){
-			$sql .= ' AND `parent_path` LIKE ?';
-			$args[] = $parent;
-		}
-		$stmt = OCP\DB::prepare($sql);
-		return $stmt->execute($args);
-	}
-
-	public static function removeByName($owner, $name) { self::remove($ownmer, $name); }
-	public static function removeByPath($owner, $path) { self::remove($owner, null, $path); }
-	public static function removeByParentPath($owner, $parent) { self::remove($owner, null, null, $parent); }
-	
-	public static function find($owner, $name=null, $path=null, $parent=null){
-		$sql = 'SELECT * FROM `*PREFIX*gallery_albums` WHERE `uid_owner` = ?';
-		$args = array($owner);
-		if (!is_null($name)){
-			$sql .= ' AND `album_name` = ?';
-			$args[] = $name;
-		}
-		if (!is_null($path)){
-			$sql .= ' AND `album_path` = ?';
-			$args[] = $path;
-		}
-		if (!is_null($parent)){
-			$sql .= ' AND `parent_path` = ?';
-			$args[] = $parent;
-		}
-		$order = OCP\Config::getUserValue($owner, 'gallery', 'order', 'ASC');
-		$sql .= ' ORDER BY `album_name` ' . $order;
-
-		$stmt = OCP\DB::prepare($sql);
-		return $stmt->execute($args);
-	}
-
-	public static function changePath($oldname, $newname, $owner) {
-		$stmt = OCP\DB::prepare('UPDATE `*PREFIX*gallery_albums` SET `album_path`=? WHERE `uid_owner`=? AND `album_path`=?');
-		$stmt->execute(array($newname, $owner, $oldname));
-	}
-
-	public static function changeThumbnailPath($oldname, $newname) {
-		$view = OCP\Files::getStorage('gallery');
-		$view->rename($oldname.'.png', $newname.'.png');
-	}
-
-	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'];
-	}
-
-	public static function getIntermediateGallerySize($path) {
-		$path .= '%';
-		$sql = 'SELECT COUNT(*) AS `size` FROM `*PREFIX*gallery_photos` AS `photos`, `*PREFIX*gallery_albums` AS `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/apps/gallery/lib/hooks_handlers.php b/apps/gallery/lib/hooks_handlers.php
deleted file mode 100644
index 3bafdb5cf4..0000000000
--- a/apps/gallery/lib/hooks_handlers.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?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/>.
-* 
-*/
-
-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']);
-
-class OC_Gallery_Hooks_Handlers {
-
-	public static function removePhoto($params) {
-		\OC\Pictures\ThumbnailsManager::getInstance()->delete($params[OC_Filesystem::signal_param_path]);
-	}
-
-	public static function renamePhoto($params) {
-		$oldpath = $params[OC_Filesystem::signal_param_oldpath];
-		$newpath = $params[OC_Filesystem::signal_param_newpath];
-		//TODO: implement this
-	}
-}
diff --git a/apps/gallery/lib/images_utils.php b/apps/gallery/lib/images_utils.php
deleted file mode 100644
index f5e37cf1de..0000000000
--- a/apps/gallery/lib/images_utils.php
+++ /dev/null
@@ -1,62 +0,0 @@
-<?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/>.
-* 
-*/
-
-OCP\JSON::checkLoggedIn();
-OCP\JSON::checkAppEnabled('gallery');
-
-function CroppedThumbnail($imgSrc,$thumbnail_width,$thumbnail_height, $tgtImg, $shift) { 
-    //getting the image dimensions
-    list($width_orig, $height_orig) = getimagesize($imgSrc); 
-    switch (strtolower(substr($imgSrc, strrpos($imgSrc, '.')+1))) {
-      case "jpeg":
-      case "jpg":
-      case "tiff":
-        $myImage = imagecreatefromjpeg($imgSrc);
-        break;
-      case "png":
-        $myImage = imagecreatefrompng($imgSrc);
-        break;
-      default:
-        exit();
-    }
-    $ratio_orig = $width_orig/$height_orig;
-    
-    if ($thumbnail_width/$thumbnail_height > $ratio_orig) {
-       $new_height = $thumbnail_width/$ratio_orig;
-       $new_width = $thumbnail_width;
-    } else {
-       $new_width = $thumbnail_height*$ratio_orig;
-       $new_height = $thumbnail_height;
-    }
-    
-    $x_mid = $new_width/2;  //horizontal middle
-    $y_mid = $new_height/2; //vertical middle
-    
-    $process = imagecreatetruecolor(round($new_width), round($new_height)); 
-
-    imagecopyresampled($process, $myImage, 0, 0, 0, 0, $new_width, $new_height, $width_orig, $height_orig);
-    imagecopyresampled($tgtImg, $process, $shift, 0, ($x_mid-($thumbnail_width/2)), ($y_mid-($thumbnail_height/2)), $thumbnail_width, $thumbnail_height, $thumbnail_width, $thumbnail_height);
-
-    imagedestroy($process);
-    imagedestroy($myImage);
-}
diff --git a/apps/gallery/lib/managers.php b/apps/gallery/lib/managers.php
deleted file mode 100644
index 666c6d6893..0000000000
--- a/apps/gallery/lib/managers.php
+++ /dev/null
@@ -1,133 +0,0 @@
-<?php
-
-namespace OC\Pictures;
-
-class DatabaseManager {        
-	private static $instance = null;
-	protected $cache = array();
-	const TAG = 'DatabaseManager';
-	
-	public static function getInstance() {
-		if (self::$instance === null)
-			self::$instance = new 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 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);
-		$dir = dirname($path);
-		$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;
-		$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)) {
-			return false;
-		}
-		$ret = $this->setFileData($path, $image->width(), $image->height());
-		unset($image);
-		$this->cache[$dir][$path] = $ret;
-		return $ret;
-	}
-	
-	private function __construct() {}
-}
-
-class ThumbnailsManager {
-	
-	private static $instance = null;
-	const TAG = 'ThumbnailManager';
-        const THUMBNAIL_HEIGHT = 150;
-	
-	public static function getInstance() {
-		if (self::$instance === null)
-			self::$instance = new ThumbnailsManager();
-		return self::$instance;
-	}
-
-	public function getThumbnail($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);
-			return false;
-		}
-		$image = new \OC_Image();
-		$image->loadFromFile(\OC_Filesystem::getLocalFile($path));
-		if (!$image->valid()) return false;
-                            
-		$image->fixOrientation();
-                
-		$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;
-		}
-		$l = $gallery_storage->getLocalFile($path);
-                
-		$image->save($l);
-		return $image;
-	}
-
-	public function getThumbnailWidth($image) {
-		return floor((self::THUMBNAIL_HEIGHT*$image->widthTopLeft())/$image->heightTopLeft());
-	}
-
-	public function getThumbnailInfo($path) {
-		$arr = DatabaseManager::getInstance()->getFileData($path);
-		if (!$arr) {
-			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), self::THUMBNAIL_HEIGHT);
-		}
-		$ret = array('filepath' => $arr['path'],
-					 'width' => $arr['width'],
-					 'height' => $arr['height']);
-		return $ret;
-	}
-	
-	public function delete($path) {
-		$thumbnail_storage = \OCP\Files::getStorage('gallery');
-		if ($thumbnail_storage->file_exists($path)) {
-			$thumbnail_storage->unlink($path);
-		}
-	}
-	
-	private function __construct() {}
-
-}
diff --git a/apps/gallery/lib/photo.php b/apps/gallery/lib/photo.php
deleted file mode 100644
index 1d304ce435..0000000000
--- a/apps/gallery/lib/photo.php
+++ /dev/null
@@ -1,136 +0,0 @@
-<?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/>.
- * 
- */
-class OC_Gallery_Photo {
-	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){
-		$sql = 'SELECT * FROM `*PREFIX*gallery_photos` WHERE `album_id` = ?';
-		$args = array($albumId);
-		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) {
-		$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`');
-		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` = ?');
-		$stmt->execute(array($path, $album_id));
-	}
-
-	public static function removeById($id) {
-		$stmt = OCP\DB::prepare('DELETE FROM `*PREFIX*gallery_photos` WHERE `photo_id` = ?');
-		$stmt->execute(array($id));
-	}
-
-	public static function removeByAlbumId($albumid) {
-		$stmt = OCP\DB::prepare('DELETE FROM `*PREFIX*gallery_photos` WHERE `album_id` = ?');
-		$stmt->execute(array($albumid));
-	}
-
-	public static function changePath($oldAlbumId, $newAlbumId, $oldpath, $newpath) {
-		$stmt = OCP\DB::prepare('UPDATE `*PREFIX*gallery_photos` SET `file_path` = ?, `album_id` = ? WHERE `album_id` = ? AND `file_path` = ?');
-		$stmt->execute(array($newpath, $newAlbumId, $oldAlbumId, $oldpath));
-	}
-
-	public static function getThumbnail($image_name, $owner = null) {
-		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);
-		$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)) {
-				return null;
-			}
-			$image = new OC_Image($image_path);
-			if ($image->valid()) {
-				$image->centerCrop(200);
-				$image->fixOrientation();
-				$image->save($view->getLocalFile($thumb_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/scanner.php b/apps/gallery/lib/scanner.php
deleted file mode 100644
index 79b8ad4923..0000000000
--- a/apps/gallery/lib/scanner.php
+++ /dev/null
@@ -1,150 +0,0 @@
-<?php
-
-/**
-* ownCloud - gallery application
-*
-* @author Bartek Przybylski
-* @copyright 2012 Bartek Przybylski <bartek@alefzero.eu>
-* 
-* 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_Scanner {
-
-	public static function getGalleryRoot() {
-		return OCP\Config::getUserValue(OCP\USER::getUser(), 'gallery', 'root', '/');
-	}
-	public static function getScanningRoot() {
-		return OC_Filesystem::getRoot().self::getGalleryRoot();
-	}
-
-	public static function cleanUp() {
-		OC_Gallery_Album::cleanup();
-	}
-
-	public static function createName($name) {
-		$name = basename($name);
-		return $name == '.' ? '' : $name;
-	}
-
-	// Scan single dir relative to gallery root
-	public static function scan($eventSource) {
-		$paths = self::findPaths();
-		$eventSource->send('count', count($paths)+1);
-		$owner = OCP\USER::getUser();
-		foreach ($paths as $path) {
-			$name = self::createName($path);
-			$images = self::findFiles($path);
-
-			$result = OC_Gallery_Album::find($owner, null, $path);
-			// don't duplicate galleries with same path
-			if (!($albumId = $result->fetchRow())) {
-				OC_Gallery_Album::create($owner, $name, $path);
-				$result = OC_Gallery_Album::find($owner, $name, $path);
-				$albumId = $result->fetchRow();
-			}
-			$albumId = $albumId['album_id'];
-			foreach ($images as $img) {
-				$result = OC_Gallery_Photo::find($albumId, $img);
-				if (!$result->fetchRow())
-					OC_Gallery_Photo::create($albumId, $img);
-			}
-			if (count($images))
-				self::createThumbnails($name, $images);
-			$eventSource->send('scanned', '');
-		}
-		self::createIntermediateAlbums();
-		$eventSource->send('scanned', '');
-		$eventSource->send('done', 1);
-	}
-
-	public static function createThumbnails($albumName, $files) {
-		// create gallery thumbnail
-		$file_count = min(count($files), 10);
-		$thumbnail = imagecreatetruecolor($file_count*200, 200);
-		for ($i = 0; $i < $file_count; $i++) {
-			$image = OC_Gallery_Photo::getThumbnail($files[$i]);
-			if ($image && $image->valid()) {
-				imagecopyresampled($thumbnail, $image->resource(), $i*200, 0, 0, 0, 200, 200, 200, 200);
-				$image->destroy();
-			}
-		}
-		$view = OCP\Files::getStorage('gallery');
-		imagepng($thumbnail, $view->getLocalFile($albumName.'.png'));
-		imagedestroy($thumbnail);
-	}
-
-	public static function createIntermediateAlbums() {
-		$paths = self::findPaths();
-		for ($i = 1; $i < count($paths); $i++) {
-			$prevLen = strlen($paths[$i-1]);
-			if (strncmp($paths[$i-1], $paths[$i], $prevLen)==0) {
-				$s = substr($paths[$i], $prevLen);
-				if (strrpos($s, '/') != 0) {
-					$a = explode('/', trim($s, '/'));
-					$p = $paths[$i-1];
-					foreach ($a as $e) {
-						$p .= ($p == '/'?'':'/').$e;
-						OC_Gallery_Album::create(OCP\USER::getUser(), $e, $p);
-						$arr = OC_FileCache::searchByMime('image','', OC_Filesystem::getRoot().$p);
-						$step = floor(count($arr)/10);
-						if ($step == 0) $step = 1;
-						$na = array();
-						for ($j = 0; $j < count($arr); $j+=$step) {
-							$na[] = $p.$arr[$j];
-						}
-						if (count($na))
-							self::createThumbnails($e, $na);
-					}
-				}
-			} 
-		}
-	}
-
-	public static function isPhoto($filename) {
-		$ext = strtolower(substr($filename, strrpos($filename, '.')+1));
-		return $ext=='png' || $ext=='jpeg' || $ext=='jpg' || $ext=='gif';
-	}
-
-	public static function findFiles($path) {
-		$images = OC_FileCache::searchByMime('image','', OC_Filesystem::getRoot().$path);
-		$new = array();
-		foreach ($images as $i)
-			if (strpos($i, '/',1) === FALSE)
-				$new[] = $path.$i;
-		return $new;
-	}
-
-	public static function findPaths() {
-		$images=OC_FileCache::searchByMime('image','', self::getScanningRoot());
-		$paths=array();
-		foreach($images as $image){
-			$path=dirname($image);
-			$path = self::getGalleryRoot().($path=='.'?'':$path);
-			if ($path !== '/') $path=rtrim($path,'/');
-			if(array_search($path,$paths)===false){
-				$paths[]=$path;
-			}
-			// add sub path also if they don't contain images
-			while ( ($path = dirname($path)) != '/') {
-				if(array_search($path,$paths)===false){
-					$paths[]=$path;
-				}
-			}
-		}
-		sort($paths);
-		return $paths;
-	}
-}
diff --git a/apps/gallery/lib/share.php b/apps/gallery/lib/share.php
deleted file mode 100644
index d6c5f40d49..0000000000
--- a/apps/gallery/lib/share.php
+++ /dev/null
@@ -1,42 +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/>.
-*/
-
-abstract class OC_Share_Photo_Backend implements OCP\Share_Backend {
-
-	public $dependsOn = 'file';
-	public $supportedFileExtensions = array('jpg', 'png', 'gif');
-	
-	public function getSource($item, $uid) {
-		return array('item' => 'blah.jpg', 'file' => $item);
-	}
-
-	public function generateTarget($item, $uid, $exclude = null) {
-		// TODO Make sure target path doesn't exist already
-		return $item;
-	}
-	
-	public function formatItems($items, $format, $parameters = null) {
-
-	}
-
-}
-
-?>
\ No newline at end of file
diff --git a/apps/gallery/lib/sharing.php b/apps/gallery/lib/sharing.php
deleted file mode 100644
index e79692392a..0000000000
--- a/apps/gallery/lib/sharing.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-
-/**
-* ownCloud - gallery application
-*
-* @author Bartek Przybylski
-* @copyright 2012 Bartek Przybylski bartek@alefzero.eu
-* 
-* 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_Sharing {
-  private static function getEntries($token) {
-    $sql = 'SELECT * FROM `*PREFIX*gallery_sharing` WHERE `token` = ?';
-    $stmt = OCP\DB::prepare($sql);
-    return $stmt->execute(array($token));
-  }
-
-  public static function isTokenValid($token) {
-    $r = self::getEntries($token);
-    $row = $r->fetchRow();
-    return $row != null;
-  }
-
-  public static function isRecursive($token) {
-    $r = self::getEntries($token);
-    if ($row = $r->fetchRow()) return $row['recursive'] == 1;
-    return false;
-  }
-
-  public static function getTokenOwner($token) {
-    $r = self::getEntries($token);
-    if ($row = $r->fetchRow()) {
-      $galleryId = $row['gallery_id'];
-      $sql = 'SELECT * FROM `*PREFIX*gallery_albums` WHERE `album_id` = ?';
-      $stmt = OCP\DB::prepare($sql);
-      $r = $stmt->execute(array($galleryId));
-      if ($row = $r->fetchRow())
-       return $row['uid_owner'];
-     }
-    return false;
-  }
-
-  public static function getPath($token) {
-    $r = self::getEntries($token);
-    if ($row = $r->fetchRow()) {
-      $galleryId = $row['gallery_id'];
-      $sql = 'SELECT * FROM `*PREFIX*gallery_albums` WHERE `album_id` = ?';
-      $stmt = OCP\DB::prepare($sql);
-      $r = $stmt->execute(array($galleryId));
-      if ($row = $r->fetchRow())
-        return $row['album_path'];
-    }
-  }
-
-  public static function updateSharingByToken($token, $recursive) {
-    $stmt = OCP\DB::prepare('UPDATE `*PREFIX*gallery_sharing` SET `recursive` = ? WHERE `token` = ?');
-    $stmt->execute(array($recursive, $token));
-  }
-
-  public static function getEntryByAlbumId($album_id) {
-    $stmt = OCP\DB::prepare('SELECT * FROM `*PREFIX*gallery_sharing` WHERE `gallery_id` = ?');
-    return $stmt->execute(array($album_id));
-  }
-
-  public static function addShared($token, $albumId, $recursive) {
-    $sql = 'INSERT INTO `*PREFIX*gallery_sharing` (`token`, `gallery_id`, `recursive`) VALUES (?, ?, ?)';
-    $stmt = OCP\DB::prepare($sql);
-    $stmt->execute(array($token, $albumId, $recursive));
-  }
-
-  public static function remove($albumId) {
-    $stmt = OCP\DB::prepare('DELETE FROM `*PREFIX*gallery_sharing` WHERE `gallery_id` = ?');
-    $stmt->execute(array($albumId));
-  }
-}
-
diff --git a/apps/gallery/lib/tiles.php b/apps/gallery/lib/tiles.php
deleted file mode 100644
index e36d26d319..0000000000
--- a/apps/gallery/lib/tiles.php
+++ /dev/null
@@ -1,176 +0,0 @@
-<?php
-
-namespace OC\Pictures;
-
-require_once('lib/base.php');
-require_once('managers.php');
-
-const TAG = 'Pictures';
-const IMAGE_WIDTH = 150;
-
-class TileBase {
-	public function getWidth() { return false; }
-
-	public function getHeight() { return IMAGE_WIDTH; }
-
-	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) {
-		$this->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 != 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().'" style="background-color:#ddd">'.$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 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('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() {
-		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.'\');';
-	}
-
-	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(IMAGE_WIDTH, $max);
-	}
-
-	public function get() {
-		$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);
-			$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:explode(this);return false;';
-	}
-	
-	public function getOnOutAction() {
-		return 'javascript:deplode(this);return false;';
-	}
-
-	public function getCount() {
-		return count($this->tiles_array);
-	}
-	
-	public function getOnClickAction() {
-		return 'javascript:openNewGal(\''.rawurlencode($this->stack_name).'\');';
-	}
-
-	private $tiles_array;
-	private $stack_name;
-}
diff --git a/apps/gallery/lib/tiles_test.php b/apps/gallery/lib/tiles_test.php
deleted file mode 100644
index 02d567c628..0000000000
--- a/apps/gallery/lib/tiles_test.php
+++ /dev/null
@@ -1,85 +0,0 @@
-<?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/sharing.php b/apps/gallery/sharing.php
deleted file mode 100644
index af3e553e45..0000000000
--- a/apps/gallery/sharing.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-
-/**
-* ownCloud - gallery application
-*
-* @author Bartek Przybylski
-* @copyright 2012 Bartek Przybylski bartek@alefzero.eu
-* 
-* 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/>.
-* 
-*/
-
-if (!isset($_GET['token']) || empty($_GET['token'])) {
-  exit;
-}
-
-
-
-OCP\App::checkAppEnabled('gallery');
-
-?>
-<!doctype html>
-<html>
-  <head>
-    <link rel="stylesheet" href="css/sharing.css" type="text/css"/>
-    <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 htmlentities($_GET['token']); ?>';
-    </script>
-  </head>
-  <body>
-    <div id="breadcrumb"><span class="breadcrumbelement" onclick="javascript:returnTo(0);return false;">Shared gallery</span></div>
-    <div id="gallery_list"></div>
-  </body>
-</html>
diff --git a/apps/gallery/templates/index.php b/apps/gallery/templates/index.php
deleted file mode 100644
index b2efd5342f..0000000000
--- a/apps/gallery/templates/index.php
+++ /dev/null
@@ -1,84 +0,0 @@
-<script type="text/javascript">
-
-var root = "<?php echo $_['root']; ?>";
-
-$(document).ready(function() {
-		$("a[rel=images]").fancybox({
-			'titlePosition': 'inside'
-		});
-});
-
-</script>
-
-<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.'">'.OCP\Util::sanitizeHTML($paths[$i]).'</a></div>';
-		}
-	}
-		
-?>
-	<div id="slideshow">
-		<input type="button" class="start" value="<?php echo $l->t('Slideshow')?>" />
-	</div>
-</div>
-<div id="gallerycontent">
-<?php
-session_write_close();
-
-echo $_['tl']->get();
-
-?>
-</div>
-
-<!-- start supersized block -->
-<div id="slideshow-content" 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 -->
diff --git a/apps/impress/appinfo/app.php b/apps/impress/appinfo/app.php
deleted file mode 100644
index 82f098a030..0000000000
--- a/apps/impress/appinfo/app.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?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
deleted file mode 100644
index 0be9c170f6..0000000000
--- a/apps/impress/appinfo/info.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?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
deleted file mode 100644
index 9f8e9b69a3..0000000000
--- a/apps/impress/appinfo/version
+++ /dev/null
@@ -1 +0,0 @@
-1.0
\ No newline at end of file
diff --git a/apps/impress/css/player.css b/apps/impress/css/player.css
deleted file mode 100644
index 0ed7130fd0..0000000000
--- a/apps/impress/css/player.css
+++ /dev/null
@@ -1,703 +0,0 @@
-/*
-    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
deleted file mode 100755
index 4c7f60ef84..0000000000
--- a/apps/impress/css/style.css
+++ /dev/null
@@ -1,14 +0,0 @@
-#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
deleted file mode 100755
index 1047262a67..0000000000
--- a/apps/impress/documentation.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?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\JSON::checkAppEnabled('impress');
-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
deleted file mode 100644
index 23e14fc623ddd0f8d30cd8d07e980faab6eb84f0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

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}+

diff --git a/apps/impress/img/impress.svg b/apps/impress/img/impress.svg
deleted file mode 100755
index af1cf89d42..0000000000
--- a/apps/impress/img/impress.svg
+++ /dev/null
@@ -1,1718 +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://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
deleted file mode 100644
index 3c8d1632b351eb7bb43d6260cf569b1b324e1066..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

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

diff --git a/apps/impress/img/impressbig.svg b/apps/impress/img/impressbig.svg
deleted file mode 100755
index a4140e4ae1..0000000000
--- a/apps/impress/img/impressbig.svg
+++ /dev/null
@@ -1,1730 +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://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
deleted file mode 100755
index 8648cb27e7..0000000000
--- a/apps/impress/index.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?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\JSON::checkAppEnabled('impress');
-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
deleted file mode 100644
index 224a5e2e7e..0000000000
--- a/apps/impress/js/impress.js
+++ /dev/null
@@ -1,800 +0,0 @@
-/**
- * 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/l10n/.gitkeep b/apps/impress/l10n/.gitkeep
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/apps/impress/l10n/de.php b/apps/impress/l10n/de.php
deleted file mode 100644
index 5d0fa34631..0000000000
--- a/apps/impress/l10n/de.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Documentation" => "Dokumentation"
-);
diff --git a/apps/impress/lib/impress.php b/apps/impress/lib/impress.php
deleted file mode 100755
index ca33dbb232..0000000000
--- a/apps/impress/lib/impress.php
+++ /dev/null
@@ -1,118 +0,0 @@
-<?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
deleted file mode 100755
index 1f2423d856..0000000000
--- a/apps/impress/player.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?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();
-OCP\JSON::checkAppEnabled('impress');
-
-$filename = OCP\Util::sanitizeHTML($_GET['file']);
-$title = OCP\Util::sanitizeHTML($_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
deleted file mode 100755
index 1995bece25..0000000000
--- a/apps/impress/templates/documentation.php
+++ /dev/null
@@ -1,223 +0,0 @@
-
-
-<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
deleted file mode 100755
index 532d3660df..0000000000
--- a/apps/impress/templates/presentations.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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>');
-}
\ No newline at end of file
diff --git a/apps/media/ajax/api.php b/apps/media/ajax/api.php
deleted file mode 100644
index 7f5cdb22c1..0000000000
--- a/apps/media/ajax/api.php
+++ /dev/null
@@ -1,133 +0,0 @@
-<?php
-
-/**
-* ownCloud - media plugin
-*
-* @author Robin Appelman
-* @copyright 2010 Robin Appelman icewind1991@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/>.
-* 
-*/
-
-header('Content-type: text/html; charset=UTF-8') ;
-
-OCP\JSON::checkAppEnabled('media');
-
-error_reporting(E_ALL); //no script error reporting because of getID3
-
-$arguments=$_POST;
-
-if(!isset($_POST['action']) and isset($_GET['action'])){
-	$arguments=$_GET;
-}
-
-foreach($arguments as &$argument){
-	$argument=stripslashes($argument);
-}
-@ob_clean();
-if(!isset($arguments['artist'])){
-	$arguments['artist']=0;
-}
-if(!isset($arguments['album'])){
-	$arguments['album']=0;
-}
-if(!isset($arguments['search'])){
-	$arguments['search']='';
-}
-
-session_write_close();
-
-OC_MEDIA_COLLECTION::$uid=OCP\USER::getUser();
-if($arguments['action']){
-	switch($arguments['action']){
-		case 'delete':
-			$path=$arguments['path'];
-			OC_MEDIA_COLLECTION::deleteSongByPath($path);
-			$paths=explode(PATH_SEPARATOR,OCP\Config::getUserValue(OCP\USER::getUser(),'media','paths',''));
-			if(array_search($path,$paths)!==false){
-				unset($paths[array_search($path,$paths)]);
-				OCP\Config::setUserValue(OCP\USER::getUser(),'media','paths',implode(PATH_SEPARATOR,$paths));
-			}
-		case 'get_collection':
-			$data=array();
-			$data['artists']=OC_MEDIA_COLLECTION::getArtists();
-			$data['albums']=OC_MEDIA_COLLECTION::getAlbums();
-			$data['songs']=OC_MEDIA_COLLECTION::getSongs();
-			OCP\JSON::encodedPrint($data);
-			break;
-		case 'scan':
-			OCP\DB::beginTransaction();
-			set_time_limit(0); //recursive scan can take a while
-			$eventSource=new OC_EventSource();
-			OC_MEDIA_SCANNER::scanCollection($eventSource);
-			$eventSource->close();
-			OCP\DB::commit();
-			break;
-		case 'scanFile':
-			echo (OC_MEDIA_SCANNER::scanFile($arguments['path']))?'true':'false';
-			break;
-		case 'get_artists':
-			OCP\JSON::encodedPrint(OC_MEDIA_COLLECTION::getArtists($arguments['search']));
-			break;
-		case 'get_albums':
-			OCP\JSON::encodedPrint(OC_MEDIA_COLLECTION::getAlbums($arguments['artist'],$arguments['search']));
-			break;
-		case 'get_songs':
-			OCP\JSON::encodedPrint(OC_MEDIA_COLLECTION::getSongs($arguments['artist'],$arguments['album'],$arguments['search']));
-			break;
-		case 'get_path_info':
-			if(OC_Filesystem::file_exists($arguments['path'])){
-				$songId=OC_MEDIA_COLLECTION::getSongByPath($arguments['path']);
-				if($songId==0){
-					unset($_SESSION['collection']);
-					$songId= OC_MEDIA_SCANNER::scanFile($arguments['path']);
-				}
-				if($songId>0){
-					$song=OC_MEDIA_COLLECTION::getSong($songId);
-					$song['artist']=OC_MEDIA_COLLECTION::getArtistName($song['song_artist']);
-					$song['album']=OC_MEDIA_COLLECTION::getAlbumName($song['song_album']);
-					OCP\JSON::encodedPrint($song);
-				}
-			}
-			break;
-		case 'play':
-			@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);
-			
-			header('Content-Type:'.$ftype);
-			OCP\Response::enableCaching(3600 * 24); // 24 hour
-			header('Accept-Ranges: bytes');
-			header('Content-Length: '.OC_Filesystem::filesize($arguments['path']));
-			$mtime = OC_Filesystem::filemtime($arguments['path']);
-			OCP\Response::setLastModifiedHeader($mtime);
-			
-			OC_Filesystem::readfile($arguments['path']);
-			exit;
-		case 'find_music':
-			$music=OC_FileCache::searchByMime('audio');
-			$ogg=OC_FileCache::searchByMime('application','ogg');
-			$music=array_merge($music,$ogg);
-			OCP\JSON::encodedPrint($music);
-			exit;
-	}
-}
diff --git a/apps/media/ajax/autoupdate.php b/apps/media/ajax/autoupdate.php
deleted file mode 100644
index a5801f1a0e..0000000000
--- a/apps/media/ajax/autoupdate.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-/**
-* ownCloud - media plugin
-*
-* @author Robin Appelman
-* @copyright 2010 Robin Appelman icewind1991@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/>.
-* 
-*/
-
-header('Content-type: text/html; charset=UTF-8') ;
-
-OCP\JSON::checkAppEnabled('media');
-
-$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/appinfo/app.php b/apps/media/appinfo/app.php
deleted file mode 100644
index 75015d627b..0000000000
--- a/apps/media/appinfo/app.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-/**
- * ownCloud - media plugin
- *
- * @author Robin Appelman
- * @copyright 2010 Robin Appelman icewind1991@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/
- *
- */
-
-$l=OC_L10N::get('media');
-
-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');
-
-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/media/appinfo/database.xml b/apps/media/appinfo/database.xml
deleted file mode 100644
index 067f7bc059..0000000000
--- a/apps/media/appinfo/database.xml
+++ /dev/null
@@ -1,298 +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*media_albums</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>album_name</name>
-    <type>text</type>
-    <default></default>
-    <notnull>true</notnull>
-    <length>200</length>
-   </field>
-
-   <field>
-    <name>album_artist</name>
-    <type>integer</type>
-    <default>0</default>
-    <notnull>true</notnull>
-    <length>4</length>
-   </field>
-
-   <field>
-    <name>album_art</name>
-    <type>text</type>
-    <default></default>
-    <notnull>true</notnull>
-    <length>200</length>
-   </field>
-   
-   <index>
-	   <name>album_name_index</name>
-	   <field>
-		   <name>album_name</name>
-		   <sorting>ascending</sorting>
-	   </field>
-   </index>
-   
-   <index>
-	   <name>album_artist_index</name>
-	   <field>
-		   <name>album_artist</name>
-		   <sorting>ascending</sorting>
-	   </field>
-   </index>
-
-  </declaration>
-
- </table>
-
- <table>
-
-  <name>*dbprefix*media_artists</name>
-
-  <declaration>
-
-   <field>
-    <name>artist_id</name>
-    <type>integer</type>
-    <default>0</default>
-    <notnull>true</notnull>
-    <autoincrement>1</autoincrement>
-    <length>4</length>
-   </field>
-
-   <field>
-    <name>artist_name</name>
-    <type>text</type>
-    <default></default>
-    <notnull>true</notnull>
-    <length>200</length>
-   </field>
-
-   <index>
-    <name>artist_name</name>
-    <unique>true</unique>
-    <field>
-     <name>artist_name</name>
-     <sorting>ascending</sorting>
-    </field>
-   </index>
-   
-  </declaration>
-
- </table>
-
- <table>
-
-  <name>*dbprefix*media_sessions</name>
-
-  <declaration>
-
-   <field>
-    <name>session_id</name>
-    <type>integer</type>
-    <default>0</default>
-    <notnull>true</notnull>
-    <autoincrement>1</autoincrement>
-    <length>4</length>
-   </field>
-
-   <field>
-    <name>token</name>
-    <type>text</type>
-    <default></default>
-    <notnull>true</notnull>
-    <length>64</length>
-   </field>
-
-   <field>
-    <name>user_id</name>
-    <type>text</type>
-    <default></default>
-    <notnull>true</notnull>
-	<length>64</length>
-   </field>
-
-   <field>
-    <name>start</name>
-    <type>timestamp</type>
-    <notnull>true</notnull>
-   </field>
-
-  </declaration>
-
- </table>
-
- <table>
-
-  <name>*dbprefix*media_songs</name>
-
-  <declaration>
-
-   <field>
-    <name>song_id</name>
-    <type>integer</type>
-    <default>0</default>
-    <notnull>true</notnull>
-    <autoincrement>1</autoincrement>
-    <length>4</length>
-   </field>
-
-   <field>
-    <name>song_name</name>
-    <type>text</type>
-    <default></default>
-    <notnull>true</notnull>
-    <length>200</length>
-   </field>
-
-   <field>
-    <name>song_artist</name>
-    <type>integer</type>
-    <default>0</default>
-    <notnull>true</notnull>
-    <length>4</length>
-   </field>
-
-   <field>
-    <name>song_album</name>
-    <type>integer</type>
-    <default>0</default>
-    <notnull>true</notnull>
-    <length>4</length>
-   </field>
-
-   <field>
-    <name>song_path</name>
-    <type>text</type>
-    <default></default>
-    <notnull>true</notnull>
-    <length>200</length>
-   </field>
-
-   <field>
-    <name>song_user</name>
-    <type>text</type>
-    <default>0</default>
-    <notnull>true</notnull>
-    <length>64</length>
-   </field>
-
-   <field>
-    <name>song_length</name>
-    <type>integer</type>
-    <default></default>
-    <notnull>true</notnull>
-    <length>4</length>
-   </field>
-
-   <field>
-    <name>song_track</name>
-    <type>integer</type>
-    <default></default>
-    <notnull>true</notnull>
-    <length>4</length>
-   </field>
-
-   <field>
-    <name>song_size</name>
-    <type>integer</type>
-    <default></default>
-    <notnull>true</notnull>
-    <length>4</length>
-   </field>
-
-   <field>
-	   <name>song_playcount</name>
-	   <type>integer</type>
-	   <default>
-	   </default>
-	   <notnull>true</notnull>
-	   <length>4</length>
-   </field>
-
-   <field>
-	   <name>song_lastplayed</name>
-	   <type>integer</type>
-	   <default>
-	   </default>
-	   <notnull>true</notnull>
-	   <length>4</length>
-   </field>
-   
-   <index>
-	   <name>song_album_index</name>
-	   <field>
-		   <name>song_album</name>
-		   <sorting>ascending</sorting>
-	   </field>
-   </index>
-   <index>
-	   <name>song_artist_index</name>
-	   <field>
-		   <name>song_artist</name>
-		   <sorting>ascending</sorting>
-	   </field>
-   </index>
-   <index>
-	   <name>song_name_index</name>
-	   <field>
-		   <name>song_name</name>
-		   <sorting>ascending</sorting>
-	   </field>
-   </index>
-   
-
-  </declaration>
-
- </table>
-
- <table>
-
-  <name>*dbprefix*media_users</name>
-
-  <declaration>
-
-   <field>
-    <name>user_id</name>
-    <type>text</type>
-    <default>0</default>
-    <notnull>true</notnull>
-    <autoincrement>1</autoincrement>
-    <length>64</length>
-   </field>
-
-   <field>
-    <name>user_password_sha256</name>
-    <type>text</type>
-    <default></default>
-    <notnull>true</notnull>
-    <length>64</length>
-   </field>
-
-  </declaration>
-
- </table>
-
-
-</database>
diff --git a/apps/media/appinfo/info.xml b/apps/media/appinfo/info.xml
deleted file mode 100644
index e2d9746708..0000000000
--- a/apps/media/appinfo/info.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0"?>
-<info>
-	<id>media</id>
-	<name>Media</name>
-	<description>Media player and server for ownCloud</description>
-	<licence>AGPL</licence>
-	<author>Robin Appelman</author>
-	<require>4</require>
-	<shipped>true</shipped>
-	<standalone/>
-	<default_enable/>
-	<remote>
-		<ampache>remote.php</ampache>
-	</remote>
-</info>
diff --git a/apps/media/appinfo/version b/apps/media/appinfo/version
deleted file mode 100644
index 44bb5d1f74..0000000000
--- a/apps/media/appinfo/version
+++ /dev/null
@@ -1 +0,0 @@
-0.4.1
\ No newline at end of file
diff --git a/apps/media/css/music.css b/apps/media/css/music.css
deleted file mode 100644
index c782e8afee..0000000000
--- a/apps/media/css/music.css
+++ /dev/null
@@ -1,48 +0,0 @@
-/* Copyright (c) 2011, Jan-Christoph Borchardt, http://jancborchardt.net
- This file is licensed under the Affero General Public License version 3 or later.
- See the COPYING-README file. */
-
-#controls ul.jp-controls { padding:0; }
-#controls ul.jp-controls li { display:inline; }
-#controls ul.jp-controls li a { position:absolute; padding:.8em 1em .8em 0; }
-a.jp-play, a.jp-pause { left:2.5em; }
-a.jp-pause { display:none; }
-a.jp-next { left:5em; }
-
-div.jp-progress { position:absolute; overflow:hidden; top:.5em; left:8em; width:15em; height:1.2em; padding:0; }
-div.jp-seek-bar { background:#eee; width:0; height:100%; cursor:pointer; }
-div.jp-play-bar { background:#ccc; width:0; height:100%; }
-div.jp-current-time,div.jp-duration { position:absolute; font-size:.64em; font-style:oblique; top:0.9em; left:13.5em; }
-div.jp-duration { display: none }
-div.jp-current-song { left: 33em; position: absolute; top: 0.9em; }
-div.jp-duration { text-align:right; }
-
-a.jp-mute,a.jp-unmute { left:24em; }
-div.jp-volume-bar { position:absolute; overflow:hidden; background:#eee; width:4em; height:0.4em; cursor:pointer; top:1.3em; left:27em; }
-div.jp-volume-bar-value { background:#ccc; width:0; height:0.4em; }
-
-#collection { position:relative; width:100%; float:left; table-layout:fixed; }
-#collection td { overflow:hidden; text-overflow:ellipsis; white-space:nowrap; }
-#leftcontent img.remove { display:none; float:right; cursor:pointer; opacity: 0; }
-#leftcontent li:hover img.remove { display:inline; opacity: .3; }
-#leftcontent li div.label { float: left; width: 200px; overflow: hidden; text-overflow: ellipsis; }
-#rightcontent { overflow: auto; }
-#playlist li { list-style-type:none; }
-.template { display:none; }
-.collection_playing { background:#eee; font-weight: bold; }
-
-#searchresults input.play, #searchresults input.add { float:left; height:1em; width:1em; }
-#collection tr.collapsed td.album, #collection tr.collapsed td.title { color:#ddd; }
-#collection td.artist-expander, #collection td.album-expander { width:2em; text-align:center; }
-td.artist a.expander, td.album a.expander { float:right; padding:0 1em; }
-tr.active td { background-color:#eee; font-weight:bold; }
-tr td { border-bottom:1px solid #eee; height:2.2em; }
-tr .artist img { vertical-align:middle; }
-tr.album td.artist { padding-left:1em; }
-tr.song td.artist { padding-left:2em; }
-.add {margin: 0 0.5em 0 0; }
-
-#scan { position:absolute; right:13.5em; top:0em; }
-#scan .start { position:relative; display:inline; float:right; }
-#scan .stop { position:relative; display:inline; float:right; }
-#scan #scanprogressbar { position:relative; display:inline-block; width:10em; height:1.5em; top:.4em; }
diff --git a/apps/media/css/player.css b/apps/media/css/player.css
deleted file mode 100644
index 0f29748f35..0000000000
--- a/apps/media/css/player.css
+++ /dev/null
@@ -1,23 +0,0 @@
-#playercontrols{
-	display:inline;
-	margin-left:1em;
-	width:4em;
-	height:1em;
-	position:fixed;
-	top:auto;
-	left:auto;
-	background:transparent;
-	box-shadow:none;
-	-webkit-box-shadow:none;
-}
-#playercontrols li{
-	float:left;
-}
-#playercontrols a, #playercontrols li{
-	margin:0px;
-	padding:0;
-	left:0;
-	background:transparent !important;
-	border:none !important;
-	text-shadow:none;
-}
\ No newline at end of file
diff --git a/apps/media/index.php b/apps/media/index.php
deleted file mode 100644
index ae85abc8aa..0000000000
--- a/apps/media/index.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-/**
-* ownCloud - media plugin
-*
-* @author Robin Appelman
-* @copyright 2010 Robin Appelman icewind1991@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/>.
-* 
-*/
-
-
-
-
-// Check if we are a user
-OCP\User::checkLoggedIn();
-OCP\App::checkAppEnabled('media');
-
-OCP\Util::addscript('media','player');
-OCP\Util::addscript('media','music');
-OCP\Util::addscript('media','playlist');
-OCP\Util::addscript('media','collection');
-OCP\Util::addscript('media','scanner');
-OCP\Util::addscript('media','jquery.jplayer.min');
-OCP\Util::addStyle('media','music');
-
-OCP\App::setActiveNavigationEntry( 'media_index' );
-
-$tmpl = new OCP\Template( 'media', 'music', 'user' );
-$tmpl->printPage();
diff --git a/apps/media/js/Jplayer.swf b/apps/media/js/Jplayer.swf
deleted file mode 100644
index c213fd578e52c04c9d53e32fb8038b75c4d49802..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 7679
zcmV<b9RT7(S5pcTI{*N9oV8mCcw5z#zUOJVPqJ*wvg0_;rVz(Y9O0NGKyXNiW67}{
z$1+|533z$7-m?U<<Vv!$lorAkAZ%p`5SDB#g#hVBDWxslXep(wWJ;JBPp6$}XQtD3
z*3Qz-OviK1eeY>;oY}`;&U@$Hd+s^so_p^({}b(gW*cIx^aNv7!2D%0W2{A*ot=Ga
zK@qaRdPmim>b-=qw<^BXL>>6&W(~|D&Hm_3&MZv){pM!<{gbOckeGEU9trX7@px2K
zV)outA`%-b3o8>72lmAi;|(`-N0kF=qPSy1yn9nhYBK54qDnH{piZf=RMHlpm$NT2
zt|kO)@0uJRQ4=m>iryC-xj`LG73&j2ktB`TdnXc+lv=z~Junhi5+Nb!Y7YhyiMT$k
zq)ScdCPmZJtBy|Mlmj`5<>$HDRN$&3lI)BtAzYN4OpJ<oMM+h?v0F`ylG`L3jP+uV
z!IHEbnoKCENIWL%v(=D2s=ub<(aCYOcw9{>ekG;!s7mMnnxOe;q7uDJpjJb9^GFiK
zQz{COYba1;2vD$OQwfji4%$@m&PA;r^&^v!1lmKNd)1UJp(fRo1sm>UN=c+p*dN~)
zBgr`?d(<d8KBaolr#X_gadahAJfTb`)$VvQLhD<0!RU$LTE>%O))2ZVr{em_u#HCJ
zF_jxaCFs@UL}w(K!ef_6mWI@k$+2C@u{I?ZimC}&iw+5MrO2RY^JFLz9~$4N6pbHf
zk3~cj5=Huvm`p{YNt@_#ptK%mP72VHHG<NHlHHMzN=l||!djW(cPnWTPFET|yNvJ}
z&RC-Hu`+dkDxr)TM~VguJ)78IOYQHBk2!UpQYh}|!$)gGjfPx?GecqA^wJxRGizwa
z744eXpc{4?(ZLSUy>V{$#;PRxso#=T@&|Xq9~q0JlGe#cEM<!%X=+r2wJ%=CZ^SD!
zG>Uf>*B6Q?JdzXvp-9pG7UM~Y98?XjTzV@IOW~byjmF2v<1u~h_8YFAR1*hi8l8<L
z7d!`Oy&@T(jD=d_;}cOeWvX_JAD~03CQ}YQSTQx_?C<F`I!jZyll>ETc2uz`9E02%
ziK-<@{iYaNO2*VwOYTbW@dLeN%QzF`v_hNcv6447ahO~<hc0Cg-B6jl4^F7DBJA}W
zw^m$mRZk}}O>Dy*a~YOJZ}CJTK8C?biUa4#c_EbIy>-w@6KAm06xCOg#4YVhD6yo5
z!735HWt%Q>fpY<BiO1*&d4!b6BMGA`tJDy-(lQ)kTPaH1@YORZZ0cLKTZv+1v!07}
z<b`?Om0&t3%ZcQ97FJ?0HR=+cnGM6Jek*gck}~d!p7zO0^Bnv~M`mM1GCxrpc8f>j
zXoqfJLRH3vR$?3?#}nsNV<BVP+%Yrp8<Wf8u{jsoB?3$eam$NQNv?(GNZbmWc)Bqt
zl%Q#0A}V}$pr^Mz*kxPa(AaQ=yQ90ac~78csJkb)qbJbY>o(RiWQN*fN^}OB{Q<wf
zxv$w{%II~0a%8C~)f))xZ137pYKj<fEz8%^+t=LFSC+3tB=+L0FU|eEf#R$qB8g`8
z_ceER2K+hwDJ2?JLs>8T+II!|yV1)))=Sz={VZiI1iEl3SqmcaISc*0-8i1JFqy<F
zmb1`<x?9?syLRL(;LTG<@gR-mS?K8r_T((kNvJf(TAI6v>uc)?_U~vjQ})oP5~DMe
z3Mb-|W8ti{zaK5)hUqr5(q@&`?Pk5drn$W@KmPla2-QJ{Kd`-j$I!0c9S%`BhOoF*
z7Vhk>KwmTMZe`)_QlX|Dt}vx{2Rr+B84;*3W%ZIZ$Ctpa?!NZCy;8>~QV})e%I-71
zT-j~LS4sXU3iwO%4^iF@8SyKf6S(YbJjd;O1KHVn9VpI?Hv9J!=LQkPl;(SsAH4}3
zxn$=yZx8nLW#=j*@kGj+IxwN~k;##fsG4-5E2D@)kT0R6sHFM~?BEo5u{*3_4%ZWW
z@&J~#aoI$5P+x>6Ilj*yA6FtVrwD$cJ*LH-6G}qCT|kVnBAiN1G_6~wgyJJ=1D3RP
z&Al7et#53+Y~9FYB#IkdQGhX<bc|V3*y-2bIw+-_jP}&T@<O3@Ox2<~PpP`#;{QO&
zl6*+qByt#yE2+^iVvp5zE2T)tS+~Z_l@>fL)>L9rwc+g@Q%id3**mI4)m`zBDt85k
zdRv-11CFHG<rEUl(a2a#?hAGgbp~4dYzj5)`d+)0ke)hCI3{C9OE?k@!G1Vk+ZPF?
z!uGHl84IWExM>(!=ZG?T<5+@9KxvL`iAUpDA|^4EQ4ES~IPA4j-QrV`WCVBCzB90A
zsK47rsiwy!QkONEicgdnQP_`>iz(5vfWe4RYRahUP^OfKI2=Xf9&R^Tw&E(I<q35>
zKBX3{p==I3Yw|8QuO~Jcjh4*;m~-W*Cr>VmA+vIMJtS9@Ls$(qI)@F#V#~dhNWELU
zB_bndn?+e%*yM#(vYrW=ymmrlXu=Gkz^Goaz$UMR;}|!rO?(Q^HKsAUP#UT{52QAE
zlM`EP-qDGKcq&`0-qF++i#N1o;rv*)X-NSL#QAi1uAw7<-a2!wGVe|LSerN)w3NIi
zIG4_WxlLZR0lQl8K%y)+*ady@u`#SbUWC|Q^LBXoXetrKPdhmoj%X=lTrCt-U96#W
z&J`&xxJ_l}-Mz~BudKtsl}+B_kfBQ`rtg%bDz^vqDr5~}J(F94ySh6AeF5|Hl`2w_
z8{eB2Y&uLd*;Jelb(%^FKvxq2^e&~VBv}CdN_vC+UH&1{hCE?>VmU_+AcpFTW05Wr
ztocEy#>P@%XIG$)3VL6EZ%J>UrN5`WZ;$Ts(m4>Z$(!#|`CNR|<gLT6BrR?o#SMYF
zO<7RYKqsW37cXa%HxDDPUgN#kTZq1~Ym3*qOG$+-%1Cl)0itR!*oNN8(NT1&;ynGB
z0?OwxTAk}74A#&do5HLWB6~~E6DPhao@%AQE|?EOHk1@#$OdN)71~Fm5kkaDDy58u
zv#M?4CUaw&mCC3cql)*_N|(3%JXqP}wcw?2pa-gkCoHsf9*O3tsF_}RdRKP^y@A%&
zKuh166_rqFtK^l%RpnI;RU2%q@`}pVs_XDQSgBSW24ud6kA)z=57is0e+bndK=nDO
z{t&8v52{_2{{)q1q=hyct3C`?kV<3;JmnR9LFK}#Mb(Q-+#oGqR#EEJoA*l`@SlZ)
zl}mPRk-5de!O5i}4lZsj;g(WvadS%<w|F>Ia9F^hlEXp{RU8&^sOGSk!x9clIV|I_
zoP(Fc3Jw=>SjnM=!zvE79O^i%=CFoCJ%_a%d>k(3u#Q6`hf6rD=dgjx8@YTbmoMY;
z<y_vx9Zg)`%;hV&yoJkKxqKCuw{f|d%iFo!!eu{~1KhcT%WYh4=W+*^c5=CsOS`z-
z#UaS$ZZ2QV<sL5ga=DMo{aoJ7<!d-x%jG>>-pgIrbJqYb9^$TH4hnaTa2VyT5HHa<
zjByBah;Y{p9B$;UD2H+Gig8z*!vu$qa94u6lDs6vU6b53#Y^^a*M1HMI2`1zk8;;d
z-1RZ;`Z$N1x$73-u0y~}ZpHU)NVfxrJMeucaQ6sz--WLzcMo&--N@Yoy!Z&d??sAn
z_kH+EaCe-$lN|2H#(wU807V`|_9pKB7<Yf1yFbd^XahchHXg!$wBaTj4<kK-bQI}v
zq+>`=Aw7e10_haevq;Y)eG=&<q?eIiMfw!dXOKRJ^m(K&Abk<(OGsZq`YO`bk-mxa
zEpXWJ^$yZ^klsc5E;x#Smwg}EG*Sj>8XS8h#~*;?_(LQg9=JaOZv8Qi`~>Nbk^d8X
z{}kzGNPmj-XGnjJ^mC-YK>7vJFOhzQ^p{9~h4j}*e~a{YNWVt<d!&Cr`bXePeuMAd
zBK<Sczaaf9(tVPnQgYNwj^&bLh2&U-Zajwc1kzJT&mbL_xaFk8t*4MqBRz|K&m+Bn
z^hu-_kzSJc(wFi5io}=Uq5d?opF#R8(&vy~L;5_@>yl$91rOObkiH~2zAWK2`zrEZ
zlN{e6{$1q1i}W7S_mIAi^aG?cI%jeG0xXVS(#?Eda_j<?nSWrAl*dDMl-ZcYYLO%+
zTL7H+haJrP%{Hq7>^L7#3fb&KvgAKZ8<-xLj1%(TIDu!U%J^_tO%5{?vta_kKWedT
ze^H)!CdMqN9*A)n^YR~(;iWEd;nsidrjX$CP@y;f9fJVHCR1WE|D}*!&=(=#Ft^a^
zaM&1Bmy$L&J<3SJLtHsMDyX@DxJvYXA+{uY6*U*pqnbt+6Ssu8rHnb)GGO-Qz${*1
z))h2#5in^b9gG@awpAooOWk$&a5`60Tedmu%xPVNLICxQS=rhZ%;j6biY|6KI4kuw
z04rMutfmoI^(DX-tY>Tk+X!sQrN9<l2F!gqu*ywB;T6D^H39Q(2Db7_V9U1vtJuoe
zRcsru#m&H0ZD*{7`56naR>pRKrA<t02j=MjR=yM1!cNh%3)s>wU@L;aF6t(quBJ8g
z0IO<oI*QopnqFWHeT?<9-M}_p18mK;z%JVZta&eE*Rkt?H4OmUJP7QnAz;2?VA~X6
zn?`_LISTCZ5G_Fk)}jI1G6rm2n6U`E0od9b8H=)UV2v?gSHywUPXN30Bfz#MfL)TL
zX(?daCxLC4Vr(DVPdx{Ktv^UkeiYcn0jHyswXV7eSl7pZ^?n>!_szgMZ^1j#cL<Ng
zt-#RTe)Mk7ZP?dyJ3fNw-yr&YExM%KfgM+)U)SA<%#OoA7VZM_553=eH+GKRgO4_J
z@ETm-06Mw*2#((i>^|(j{(gM4KOm+(i0rOU;A7`Q*nSvI0vkgAhaVBckK#y&aQrB8
zBMctHGi<?L$D+r<ZnHcF@C4Y4El&W}6}!jsB*2qkw_2VCtTFZ?%W;6G!S1k}1gtmq
z3d?DL<6vK4c@D7l*zJ}V08WCv(()o;9kN?2X8=xvz0C3oU`?_ww44Qa4(uhCPXpE`
z`y$I{0bT&R%kmmvt+H2HUI%y)?6Tzzz`A93THXXW1NL&umjP>--EDab;1#e-mahTU
zGxYo$0B6BoYIz&5wjs#*HeK5~JZm-?teClqLAEleg^Lj``Ju(iEFlP3nN`IcX|cM}
zjf0PY?@<Up20Q4Qg4O0sH>TTJI(QMo9!bKUUhMHfcxAdS>_%FFv>0g-QaO?bsTQde
zX+gS%g;&#~j2=tqv5Fqm^r%3Is&qdKFGbau$gQ>tRIRPN;{!66&Y+3fup7s$WOfye
zt(dC!VA5QZ)@qNMTxphDa1<|-jf6{4xHjho>ad&L<XvsHo9B0vbgk${BncLGx^dvs
zFzjd?c3jJrhOOA|An~68#_3h?eFMU;!r&|5`x=B_fx%PYI|JcUF!&_+o`&#~F!(t5
z9)s}XFn9udFF^PN41NlH--hs~VDLroy#e7DVeo12orLhyF!&Pq-h}W=F!&Vsjzjn<
z7<>VIuR-_)7<>YJPeAwy7<>+VpN8;rFnAVxZ$tPj489D$w;=p744wwxD-b>ngU7)4
zB!rK_;2H3J8Nz2^@EP!(hVU~mcpQAsLHIZfo&?{E5IzZm&w}qPgr9}MPlE4t2!9d=
zp9kM(A^be;ztd{B*~>9DnGx%Vt=*EI4%esO53j+YB0JdZ3o$<O@Mj>c)u**J!=HuW
z&q0T5!#!}xIJ^XhUjtu}?;Y@c2Yl~>?>+D}`qs6+1{`IIF~nBf@PW^Z5ZmzIwXk$)
zSVr|FSV<k0bR)8*R>|SK4f*tdwZqE7-RXf1HK7{Tu|W#2$CEkyI{1D7!7l)$hu;A0
zi=e#;zTbxvM&nCx!Z!ma!dIuY?g4Ieei>R32`|JhqvI>!`w^T`>W1Hf;je=BHBi0|
z#D4>{Z-Vl+;BDHsaHU<rZ-ayrwS|)((5udax2lF=W1uC|(E{P^1Mi^N_TW3{&_E#5
z5rD8?booVBT5CIs6l_2xn>-IQmL9mO<0=;3n%1_~*p%;p{(hI<tDdqd-xbWA7Uex+
zYL)NlukX|AVoCXd-b~ZW_ct(X)gFTrN`{(s$~2kVD$HuQfFkXEWSaE_Y#)}j=drm?
zZ~6<H>xb>y53zZf(F}e7bp73S+>2*{F5>#&IZUD-g7$mhd5{t3^QW~f!QTgo_{-DU
zB_@wcyWHe^)7nmx-<#HYO#aHWcB#o<mev|gzAde7Gx^PFZKKKer?p)MpVqGSZA158
zrPX$~UJ1cJ0J^GWlEvYyO*dwy%Mlk$dl0^)YlH2Ot_ya6+lj3@YSm&3r9Bp0+A#^m
zJx6dz#OD<1z9JW{#|xX!6gH0+HeV`iK2_L!vaorquzAL8x(^q+GE?ZvOra|?g|5sL
zx-wJf%1ogvGlj0q6uN><3{g3S=nEo5$H*^#VTk;NA@Uc7$X^&De_@FHg(316hR9zS
zB7c5}^yUlLY!VSWTIktKp=UFNp3M|`HdE-?Ord8pg`Uk6dNxz&*-W8ldH^dZfLCDr
zyyXZx)4tz9=0tF_$O*NS5NgA1Sb{n!Rm5rEGr?=1wk_@ZH$bU6OqmPjD45MDs3Qe+
zrh@H4f!|bci)1LMoTK27biRVxc@*4gDp)9i!&ylH;5O>Y3gQzNSVg1DX!Le{w9UiC
z32u!syvcrgF}8@Ds3)mA4D%@G5^|YUKj)`fuLly&@{CnyXWTjejDfrv12khX&8Vdr
zhjE7QF3FrF>$6%%^cnPKYzaxPA?dqK{oNT+AGEr%5`9Kc0}&97vc*!G&`cBV$(vA@
z@l*)m8m3E&x4TmGiJGBzn=C3?X4f|)?K>i6w9jC%x>q`p(f$xfsgYh6iu5Yd9Eqee
zT753dEw98ZcMGOu-~E!v{=U^2ZKdx4)VBDjuQsEt@Kt8CGGBd0Tjg7x(W-qbGTIUh
z)M?+Mj8-9-CBh+}Ppr4U=+<*---FV$_9OJ>6Vi!k?T?Uoh?pNE^Dr?#LFN%+{#ZCV
zjWP7nO19EU9+l=SU=>w4n<$_iHVAgXg_pC!E<2oWV~$xpYF|Cd)4rn;)?V#T(B9+H
z31WXLG-Jg*hx8%RsFfZzU95(kt@mJVU!#kPX0gDAe(fR9zI$HJd(`8(4?`^G>(fq8
zj@q*`vVz#lN9-fqwbqnI+d4DCanMFi=?X?{Cu^kBlOMY4bW!Z#rwr+zLe|?6s}K__
z!8_=mexHC=Fla+;FqK;eE~}z&SrunJ%ji^XHHMuhb)aAjWAi;aT^C7qhjS5?Km-<<
z_YqYfl0(VNh)ow*N#}S8)$>grk5HKL9g|MrTgwO>fig7`%FtIpMq7iC$DUOdJadl{
z4DdaPd;K%9BZSi(IFaT~!%+eszNaO<CB{c^Jfr<7;KJ;<l8p9eFy(OwqrMXo+H!A0
z3HN5kNaeX2|8%vTpp_fH^lLix2Dn{>LdYq%L{C{-{QcQk>E7AdmuF{@LnmqxSITwi
zMwJn){Bvj={yEZLApHW#iT|#ZmWsdd#VB5vgPN-eYCcHo8n~|GIu_oW9@y8hkA<hw
z1JPAqSXkE)mBKfs2O=F277nKe`aAH`r7sVTCiD1E9>3p!t_SHuN=q8pYEmy>A)`62
zH}@OOYemyYH*4%xXXzX0*fsU%8db=QBeawa#CFj4oTNe&PISnY;4ca49n=<k$|$Z=
zgwYV?j1lHJfFpZ@zXIlV<5=T#<6c((VSVG;aabx_(q3Auv1o1YuuJ<(6u&`tX)oT~
zzryBFuKCy4{HSOS^po+9e!xg*2kEm-J4ijsN@Qx473tt^wgawe?f4t`TY$d<1{PLN
zWujDkMPhwHxjJP9u5vAfe=!}#gTduYUm;cTgB`L&D?<^V4Mj$1gL2D%Rm!bAxQy&;
z<sL7sAN7{&l27KTNe8cIA}7x?GC&Y<j4WMDmg)*Eoz1sYX+$=dpvu=kzONO&*Dz(Z
zu)SE1ItD;ja=dUY>j0-z6PhX_XG4Us-CSqS3Ao)z5*(H4HZHMY*cu95`c&4X;71HI
zj~AL*UuY(oGm|vTY{;6~P0fu~5J@Aa@tH!6mx3OejHgOOSzA;_s)M80*q>9s-%x)U
z<&QlgG}`KP>o6;(%?T<LzX@?%J(Su+$UI_m*63;%V5TS%ncA3m)>F!iSu`E1>j3$4
zIXS#s7^qbi<=j42==P?ZSY5u@nL@EEEGTx75Nq`^y`Ucq*5DIw2A=U7gE6VLjj&LY
z71QABlD@LVQ|AVL4Vl(o101a<)Fa$pG38mJFJ>_n9rH@+r$alK5hq2f)lmt0Uyfi)
zw_9ZPq;>3cP%E9PFEjO0XiR?bQP0^625hYu5l7NIjMF01i={u6w{&+%S0W~slp5we
zcpoOf-DWfwr$rc03V|8sMGgOjmA^+dQ<xS00pGnME7YQ`>9VYym-6h?wo&G$_-&^6
z{SJ&BDK`#)9!ouBH7pw|BXCpNKVrcy(W9d`mDTeH-Y#S?#1~kw9(nX78*>!PpmG~Z
zQ_#^<BPNBR_q1Lx+(p@NyFK~gw25!e3CM0jE(%xDXX<9WO(b}#CWLT6k3r64c^>c4
z7d9<G^0W?ix6lo%5^)r$H7uUS*5HxeN=Nz%JvoKat%K~8Qbyrx-NTe6MrR5;R~fvD
ze6<i5W=aJrxQY_?CjFq#J%&!f@74ZE04V{M_iDcZz3X&a4I%z*G+#KlSNkpPAJ@fx
z3;K97nB%nTVvu%L9Q)NczMbY1K1YYL2#?&Sj#owYFdBxz7MkFq2`MHPjD3E>1*_AI
z1OE&c1O^rZ7_{J`136&OO4<GM0vJ3D9S;KwKLiF2xC^qyJy-A_fV{@x{Kg|d7+~OD
z=(rcP9KkRhf#G89Uy!*2^!kb&CECAY$HzoFjo?%N3FiSYu)!w`$-`#HJx0ePX2(r>
zn~uW{`i~4c%FF2AOou@vY1!cQEZs)+?n+~eMcTly)j-7x^XlmJ=8NZ*z&ok-+%I&r
zQ-NA{!2)$3%wM583f+4k&%Fms_jYD$)XmiFq+DK2&8*TnMQRsKxSW($n?;H)Veod!
zB9G`M78oP+6J9#_aeY9y*F{%KqXTplL@0{aiPG~R7!|8LTd~9;4PFm!!m@f}00{UK
zUxhcsmCX_OK;-VqYBDQWke1`kRj}-$=9IARoLpUj+?*PAHOHLtIjL|b-bASWJJ9|O
zKc&7RnP}1d1flleEf@_62)_#mbv`nxrG0k)n1u6Gz9rF}qq}#~R5&~f*}m3WBv^G6
zTq5wdp^4+d7;%p>-Pn9M&%K|%1CsO|ApAY&`?_R)3-}QOenT=p1}?+aH;tC$UX87{
zjh4lY+wS|8(XwVg8*JjU!G@m=$7g44MYFRDW@k6e&hDR`y>)i>xcGkPq04@WS=B$#
zHwicFQ98pnvrMj<%mH-0HX{w^Md;h+@yGE#8lNg0f5#jjaCA7>EshT|Y3*)M4oQf}
z4`JfCRb+^cTLGx49h#dg4nan_RiYe0eDF32#1YhgXgDO!>PkGDXuV%DzR$7STP|)F
zPWTmF2TU-xOXgkH7ivQJOb*A3i?@4z=zfiq#a2{E%W|OU2zY~cNT4I8YpLQ-|Mw6R
zIyvxvkC@)Q@b%o1Z&e5Lhp=V^@09XR!G%CnloF?rGD;TafhdtUgjNDm=EBR$bYsFk
z{T3sv=tzsC4@-m_(B^*%ruI;1-;pi=rf|#8<OR8EN-whJDlyiTIjD7z2DG~*`ZewU
z6I>me7hD~>@Xjn^^K1#`ZTFVEh+dMv15SavF!pYv3RHRKjd*rna{=8;xNMt=%LIt{
zAAz&$=-$=jz}a0OUUUhIOjqs#9jIOZzXfUobPqSr57cz1iaV<#HMeeDKsC{6K&L^%
zVzREH0^38Ra;b^UT*fT@bYubAa2B8q<^wcU?1BN%^oC(Yk&KT_f#^!kM{pyOQQ>ug
zqC7N>5){}``oZxh`sagIRrXdPP|0AmyIVTpo2H*r??LA0fXopo?`M))rAlndQhK7W
zIPVoCJ$$dEZ_YzNP5Q+Qrxx@ck;H$Iqu&~8v%fWvhv;l^76>3J5ZD4gYV*;7?&u5o
tiDN;b`#;R98zB?8-X~oUxLOV18X&Y@?lS)8H^%?Lh;2ju-vJ;`Db+$c%-jF~

diff --git a/apps/media/js/collection.js b/apps/media/js/collection.js
deleted file mode 100644
index 161fc0c681..0000000000
--- a/apps/media/js/collection.js
+++ /dev/null
@@ -1,368 +0,0 @@
-var initScanned = false;
-
-Collection={
-	artists:[],
-	albums:[],
-	songs:[],
-	artistsById:{},
-	albumsById:{},
-	loaded:false,
-	loading:false,
-	loadedListeners:[],
-	load:function(ready){
-		if(ready){
-			Collection.loadedListeners.push(ready);
-		}
-		if(!Collection.loading){
-			Collection.loading=true;
-			Collection.artists=[];
-			Collection.albums=[];
-			Collection.songs=[];
-			Collection.artistsById={};
-			Collection.albumsById={};
-			$.ajax({
-				url: OC.linkTo('media','ajax/api.php')+'?action=get_collection',
-				dataType: 'json',
-				success: function(data){
-					//normalize the data
-					for(var i=0;i<data.artists.length;i++){
-						var artist=data.artists[i];
-						var artistData={name:artist.artist_name,songs:[],albums:[]};
-						Collection.artistsById[artist.artist_id]=artistData;
-						Collection.artists.push(artistData);
-					}
-					for(var i=0;i<data.albums.length;i++){
-						var album=data.albums[i];
-						if(Collection.artistsById[album.album_artist]){
-							var artistName=Collection.artistsById[album.album_artist].name;
-						}else{
-							var artistName='unknown';
-						}
-						var albumData={name:album.album_name,artist:artistName,songs:[]};
-						Collection.albumsById[album.album_id]=albumData;
-						Collection.albums.push(albumData);
-						if(Collection.artistsById[album.album_artist]){
-							Collection.artistsById[album.album_artist].albums.push(albumData);
-						}
-					}
-					for(var i=0;i<data.songs.length;i++){
-						var song=data.songs[i];
-						if(Collection.artistsById[song.song_artist] && Collection.albumsById[song.song_album]){
-							var songData={
-								name:song.song_name,
-								artist:Collection.artistsById[song.song_artist].name,
-								album:Collection.albumsById[song.song_album].name,
-								lastPlayed:song.song_lastplayed,
-								length:song.song_length,
-								path:song.song_path,
-								playCount:song.song_playcount,
-							};
-							Collection.songs.push(songData);
-							Collection.artistsById[song.song_artist].songs.push(songData);
-							Collection.albumsById[song.song_album].songs.push(songData);
-						}
-					}
-					
-					Collection.artists.sort(function(a,b){
-						if(!a.name){
-							return -1;
-						}
-						return a.name.localeCompare(b.name);
-					});
-					
-					Collection.loaded=true;
-					Collection.loading=false;
-					for(var i=0;i<Collection.loadedListeners.length;i++){
-						Collection.loadedListeners[i]();
-					}
-					if(data.songs.length==0 && initScanned == false){
-						$('#scan input.start').click();
-						initScanned = true;
-					}
-				}
-			});
-		}
-	},
-	display:function(){
-		if(Collection.parent){
-			Collection.parent.show();
-		}
-		if(!Collection.loaded){
-			Collection.load(Collection.display);
-		}else{
-			if(Collection.parent){
-				Collection.parent.find('tr:not(.template)').remove();
-				var template=Collection.parent.find('tr.template');
-				$.each(Collection.artists,function(i,artist){
-					if(artist.name && artist.songs.length>0){
-						var tr=template.clone().removeClass('template');
-						if(artist.songs.length>1){
-							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').html(artist.songs[0].name);
-							tr.find('td.album a').html(artist.albums[0].name);
-						}
-						tr.find('td.artist a').html(artist.name);
-						tr.data('artistData',artist);
-						tr.find('td.artist a').click(function(event){
-							event.preventDefault();
-							PlayList.add(artist);
-							PlayList.play(0);
-							Collection.parent.find('tr').removeClass('active');
-							$('tr[data-artist="'+artist.name+'"]').addClass('active');
-						});
-						var expander='';
-						if(artist.songs.length>1){
-							expander=$('<a class="expander">&gt;</a>');
-							expander.data('expanded',false);
-							expander.click(function(event){
-								var tr=$(this).parent().parent();
-								if(expander.data('expanded')){
-									Collection.hideArtist(tr.data('artist'));
-								}else{
-									Collection.showArtist(tr.data('artist'));
-								}
-							});
-						}
-						tr.find('td.artist').addClass('buttons');
-						Collection.addButtons(tr,artist);
-						tr.children('td.artist-expander').append(expander);
-						tr.attr('data-artist',artist.name);
-						Collection.parent.find('tbody').append(tr);
-					}
-				});
-			}
-		}
-	},
-	showArtist:function(artist){
-		var tr=Collection.parent.find('tr[data-artist="'+artist+'"]');
-		var lastRow=tr;
-		var artist=tr.data('artistData');
-		var first=true;
-		$.each(artist.albums,function(j,album){
-			$.each(album.songs,function(i,song){
-				var newRow;
-				if(first){
-					newRow=tr;
-				}else{
-					newRow=tr.clone();
-					newRow.find('td.artist').text('');
-					newRow.find('.expander').remove();
-				}
-				newRow.find('td.album-expander .expander').remove();
-				if(i==0){
-					newRow.find('td.album a').text(album.name);
-					newRow.find('td.album a').click(function(event){
-						event.preventDefault();
-						PlayList.add(album);
-						PlayList.play(0);
-						Collection.parent.find('tr').removeClass('active');
-						$('tr[data-album="'+album.name+'"]').addClass('active');
-					});
-					if(album.songs.length>1){
-						var expander=$('<a class="expander">v </a>');
-						expander.data('expanded',true);
-						expander.click(function(event){
-							var tr=$(this).parent().parent();
-							if(expander.data('expanded')) {
-								Collection.hideAlbum(tr.data('artist'),tr.data('album'));
-							} else {
-								Collection.showAlbum(tr.data('artist'),tr.data('album'));
-							}
-						});
-						newRow.children('td.album-expander').append(expander);
-					}
-					Collection.addButtons(newRow,album);
-				} else {
-					newRow.find('td.album a').text('');
-					Collection.addButtons(newRow,song);
-				}
-				newRow.find('td.title a').text(song.name);
-				newRow.find('td.title a').click(function(event){
-					event.preventDefault();
-					PlayList.add(song);
-					PlayList.play(0);
-					Collection.parent.find('tr').removeClass('active');
-					$('tr[data-title="'+song.name+'"]').addClass('active');
-				});
-				newRow.attr('data-album',album.name);
-				newRow.attr('data-title',song.name);
-				newRow.attr('data-artist',artist.name);
-				newRow.data('albumData',album);
-				if(!first){
-					lastRow.after(newRow);
-				}
-				first=false;
-				lastRow=newRow;
-			});
-		});
-		tr.removeClass('collapsed');
-		tr.find('td.artist-expander a.expander').data('expanded',true);
-		tr.find('td.artist-expander a.expander').addClass('expanded');
-		tr.find('td.artist-expander a.expander').text('v');
-	},
-	hideArtist:function(artist){
-		var tr=Collection.parent.find('tr[data-artist="'+artist+'"]');
-		var artist=tr.first().data('artistData');
-		tr.first().find('td.album a').first().text(artist.albums.length+' '+t('media','albums'));
-		tr.first().find('td.album-expander a.expander').remove();
-		tr.first().find('td.title a').text(artist.songs.length+' '+t('media','songs'));
-		tr.first().find('td.album a').unbind('click');
-		tr.first().find('td.title a').unbind('click');
-		tr.each(function(i,row){
-			if(i>0){
-				$(row).remove();
-			}
-		});
-		tr.find('td.artist-expander a.expander').data('expanded',false);
-		tr.find('td.artist-expander a.expander').removeClass('expanded');
-		tr.find('td.artist-expander a.expander').text('>');
-		Collection.addButtons(tr,artist);
-	},
-	showAlbum:function(artist,album){
-		var tr = Collection.parent.find('tr[data-artist="'+artist+'"][data-album="'+album+'"]');
-		var lastRow=tr;
-		var albumData=tr.data('albumData');
-		tr.find('td.album-expander a.expander').data('expanded',true);
-		tr.find('td.album-expander a.expander').addClass('expanded');
-		tr.find('td.album-expander a.expander').text('v');
-		$.each(albumData.songs,function(i,song){
-			var newRow;
-			if(i>0){
-				newRow=tr.clone();
-				newRow.find('a.expander').remove();
-				newRow.find('td.album a').text('');
-				newRow.find('td.artist a').text('');
-			}else{
-				newRow=tr;
-			}
-			newRow.find('td.title a').text(song.name);
-			newRow.find('td.title a').click(function(event){
-				event.preventDefault();
-				PlayList.add(song);
-				PlayList.play(0);
-				Collection.parent.find('tr').removeClass('active');
-				$('tr[data-title="'+song.name+'"]').addClass('active');
-			});
-			if(i>0){
-				lastRow.after(newRow);
-			}
-			lastRow=newRow;
-		});
-	},
-	hideAlbum:function(artist,album){
-		var tr = Collection.parent.find('tr[data-artist="'+artist+'"][data-album="'+album+'"]');
-		var albumData=tr.data('albumData');
-		tr.first().find('td.title a').text(albumData.songs.length+' '+t('media','songs'));
-		tr.find('td.album-expander a.expander').data('expanded',false);
-		tr.find('td.album-expander a.expander').removeClass('expanded');
-		tr.find('td.album-expander a.expander').text('> ');
-		tr.each(function(i,row){
-			if(i>0){
-				$(row).remove();
-			}
-		});
-	},
-	parent:null,
-	hide:function(){
-		if(Collection.parent){
-			Collection.parent.hide();
-		}
-	},
-	registerPlay:function(item){
-		if(item){
-			var song=Collection.findSong(item.artist,item.album,item.name);
-			song.song_playcount++;
-		}
-	},
-	addButtons:function(parent,data){
-		buttons = parent.find('.buttons');
-		if(buttons.find('.add').length<=0) {
-			buttons.prepend('<img class="add action" src="'+OC.imagePath('core','actions/play-add')+'" title="Add to playlist" />');
-		}
-		buttons.find('.add').unbind('click');
-		buttons.find('.add').click(function(event){
-			event.preventDefault();
-			PlayList.add(data,true);
-			PlayList.render();
-		});
-	},
-	find:function(artistName,albumName,songName){
-		if(songName){
-			return Collection.findSong(artistName,albumName,songName);
-		}else if(albumName){
-			return Collection.findAlbum(artistName,albumName);
-		}else{
-			return Collection.findArtist(artistName);
-		}
-	},
-	findArtist:function(name){
-		for(var i=0;i<Collection.artists.length;i++){
-			if(Collection.artists[i].name==name){
-				return Collection.artists[i];
-			}
-		}
-	},
-	findAlbum:function(artistName,albumName){
-		var artist=Collection.findArtist(artistName);
-		if(artist){
-			for(var i=0;i<artist.albums.length;i++){
-				if(artist.albums[i].name==albumName){
-					return artist.albums[i];
-				}
-			}
-		}
-	},
-	findSong:function(artistName,albumName,songName){
-		var album=Collection.findAlbum(artistName,albumName);
-		if(album){
-			for(var i=0;i<album.songs.length;i++){
-				if(album.songs[i].name==songName){
-					return album.songs[i];
-				}
-			}
-		}
-	},
-	addSong:function(song){
-		var artist=Collection.findArtist(song.artist);
-		if(!artist){
-			artist={name:song.artist,albums:[],songs:[]};
-			Collection.artists.push(artist);
-			Collection.artistsById[song.song_artist]=artist;
-		}
-		var album=Collection.findAlbum(song.artist,song.album);
-		if(!album){
-			album={name:song.album,artist:song.song_artist,songs:[]};
-			artist.albums.push(album);
-			Collection.albums.push(album);
-			Collection.albumsById[song.song_album]=album;
-		}
-		var songData={
-			name:song.song_name,
-			artist:Collection.artistsById[song.song_artist].name,
-			album:Collection.albumsById[song.song_album].name,
-			lastPlayed:song.song_lastplayed,
-			length:song.song_length,
-			path:song.song_path,
-			playCount:song.song_playcount,
-		};
-		album.songs.push(songData);
-		artist.songs.push(songData);
-		Collection.songs.push(songData);
-	}
-};
-
-$(document).ready(function(){
-	Collection.parent=$('#collection');
-	Collection.load();
-	Collection.parent.hide();
-	$('#scan input.start').click(function(){
-		$('#scan input.start').hide();
-		$('#scan input.stop').show();
-		$('#scan input.stop').click(function(){
-			Scanner.toggle();
-		});
-		Scanner.scanCollection();
-	});
-});
diff --git a/apps/media/js/jQuery.jPlayer.2.1.0.source/Jplayer.as b/apps/media/js/jQuery.jPlayer.2.1.0.source/Jplayer.as
deleted file mode 100644
index 1178dacc34..0000000000
--- a/apps/media/js/jQuery.jPlayer.2.1.0.source/Jplayer.as
+++ /dev/null
@@ -1,415 +0,0 @@
-/*
- * jPlayer Plugin for jQuery JavaScript Library
- * http://www.happyworm.com/jquery/jplayer
- *
- * Copyright (c) 2009 - 2011 Happyworm Ltd
- * Dual licensed under the MIT and GPL licenses.
- *  - http://www.opensource.org/licenses/mit-license.php
- *  - http://www.gnu.org/copyleft/gpl.html
- *
- * Author: Mark J Panaghiston
- * Version: 2.1.0
- * Date: 1st September 2011
- *
- * FlashVars expected: (AS3 property of: loaderInfo.parameters)
- *	id: 	(URL Encoded: String) Id of jPlayer instance
- *	vol:	(Number) Sets the initial volume
- *	muted:	(Boolean in a String) Sets the initial muted state
- *	jQuery:	(URL Encoded: String) Sets the jQuery var name. Used with: someVar = jQuery.noConflict(true);
- *
- * Compiled using: Adobe Flex Compiler (mxmlc) Version 4.5.1 build 21328
- */
-
-package {
-	import flash.system.Security;
-	import flash.external.ExternalInterface;
-
-	import flash.utils.Timer;
-	import flash.events.TimerEvent;
-	
-	import flash.text.TextField;
-	import flash.text.TextFormat;
-
-	import flash.events.KeyboardEvent;
-
-	import flash.display.Sprite;
-	import happyworm.jPlayer.*;
-
-	import flash.display.StageAlign;
-	import flash.display.StageScaleMode;
-	import flash.events.Event;
-	import flash.events.MouseEvent;
-
-	import flash.ui.ContextMenu;
-	import flash.ui.ContextMenuItem;
-	import flash.events.ContextMenuEvent;
-	import flash.net.URLRequest;
-	import flash.net.navigateToURL;
-
-	public class Jplayer extends Sprite {
-		private var jQuery:String;
-		private var sentNumberFractionDigits:uint = 2;
-
-		public var commonStatus:JplayerStatus = new JplayerStatus(); // Used for inital ready event so volume is correct.
-
-		private var myInitTimer:Timer = new Timer(100, 0);
-
-		private var myMp3Player:JplayerMp3;
-		private var myMp4Player:JplayerMp4;
-
-		private var isMp3:Boolean = false;
-		private var isVideo:Boolean = false;
-
-		private var txLog:TextField;
-		private var debug:Boolean = false; // Set debug to false for release compile!
-
-		public function Jplayer() {
-			flash.system.Security.allowDomain("*");
-
-			jQuery = loaderInfo.parameters.jQuery + "('#" + loaderInfo.parameters.id + "').jPlayer";
-			commonStatus.volume = Number(loaderInfo.parameters.vol);
-			commonStatus.muted = loaderInfo.parameters.muted == "true";
-
-			stage.scaleMode = StageScaleMode.NO_SCALE;
-			stage.align = StageAlign.TOP_LEFT;
-			stage.addEventListener(Event.RESIZE, resizeHandler);
-			stage.addEventListener(MouseEvent.CLICK, clickHandler);
-
-			var initialVolume:Number = commonStatus.volume;
-			if(commonStatus.muted) {
-				initialVolume = 0;
-			}
-			myMp3Player = new JplayerMp3(initialVolume);
-			addChild(myMp3Player);
-
-			myMp4Player = new JplayerMp4(initialVolume);
-			addChild(myMp4Player);
-
-			setupListeners(!isMp3, isMp3); // Set up the listeners to the default isMp3 state.
-
-			// The ContextMenu only partially works. The menu select events never occur.
-			// Investigated and it is something to do with the way jPlayer inserts the Flash on the page.
-			// A simple test inserting the Jplayer.swf on a page using: 1) SWFObject 2.2 works. 2) AC_FL_RunContent() works.
-			// jPlayer Flash insertion is based on SWFObject 2.2 and the resaon behind this failure is not clear. The Flash insertion HTML on the page looks similar.
-			var myContextMenu:ContextMenu = new ContextMenu();
-			myContextMenu.hideBuiltInItems();
-			var menuItem_jPlayer:ContextMenuItem = new ContextMenuItem("jPlayer " + JplayerStatus.VERSION);
-			var menuItem_happyworm:ContextMenuItem = new ContextMenuItem("© 2009-2011 Happyworm Ltd", true);
-			menuItem_jPlayer.addEventListener(ContextMenuEvent.MENU_ITEM_SELECT, menuSelectHandler_jPlayer);
-			menuItem_happyworm.addEventListener(ContextMenuEvent.MENU_ITEM_SELECT, menuSelectHandler_happyworm);
-			myContextMenu.customItems.push(menuItem_jPlayer, menuItem_happyworm);
-			contextMenu = myContextMenu;
-
-			// Log console for dev compile option: debug
-			if(debug) {
-				txLog = new TextField();
-				txLog.x = 5;
-				txLog.y = 5;
-				txLog.width = 540;
-				txLog.height = 390;
-				txLog.border = true;
-				txLog.background = true;
-				txLog.backgroundColor = 0xEEEEFF;
-				txLog.multiline = true;
-				txLog.text = "jPlayer " + JplayerStatus.VERSION;
-				txLog.visible = false;
-				this.addChild(txLog);
-				this.stage.addEventListener(KeyboardEvent.KEY_UP, keyboardHandler);
-
-				myMp3Player.addEventListener(JplayerEvent.DEBUG_MSG, debugMsgHandler);
-				myMp4Player.addEventListener(JplayerEvent.DEBUG_MSG, debugMsgHandler);
-			}
-
-			// Delay init() because Firefox 3.5.7+ developed a bug with local testing in Firebug.
-			myInitTimer.addEventListener(TimerEvent.TIMER, init);
-			myInitTimer.start();
-		}
-		
-		private function init(e:TimerEvent):void {
-			myInitTimer.stop();
-			if(ExternalInterface.available) {
-				ExternalInterface.addCallback("fl_setAudio_mp3", fl_setAudio_mp3);
-				ExternalInterface.addCallback("fl_setAudio_m4a", fl_setAudio_m4a);
-				ExternalInterface.addCallback("fl_setVideo_m4v", fl_setVideo_m4v);
-				ExternalInterface.addCallback("fl_clearMedia", fl_clearMedia);
-				ExternalInterface.addCallback("fl_load", fl_load);
-				ExternalInterface.addCallback("fl_play", fl_play);
-				ExternalInterface.addCallback("fl_pause", fl_pause);
-				ExternalInterface.addCallback("fl_play_head", fl_play_head);
-				ExternalInterface.addCallback("fl_volume", fl_volume);
-				ExternalInterface.addCallback("fl_mute", fl_mute);
-
-				ExternalInterface.call(jQuery, "jPlayerFlashEvent", JplayerEvent.JPLAYER_READY, extractStatusData(commonStatus)); // See JplayerStatus() class for version number.
-			}
-		}
-		private function setupListeners(oldMP3:Boolean, newMP3:Boolean):void {
-			if(oldMP3 != newMP3) {
-				if(newMP3) {
-					listenToMp3(true);
-					listenToMp4(false);
-				} else {
-					listenToMp3(false);
-					listenToMp4(true);
-				}
-			}
-		}
-		private function listenToMp3(active:Boolean):void {
-			if(active) {
-				myMp3Player.addEventListener(JplayerEvent.JPLAYER_ERROR, jPlayerFlashEvent);
-				myMp3Player.addEventListener(JplayerEvent.JPLAYER_PROGRESS, jPlayerFlashEvent);
-				myMp3Player.addEventListener(JplayerEvent.JPLAYER_TIMEUPDATE, jPlayerFlashEvent);
-				myMp3Player.addEventListener(JplayerEvent.JPLAYER_ENDED, jPlayerFlashEvent);
-				
-				myMp3Player.addEventListener(JplayerEvent.JPLAYER_PLAY, jPlayerFlashEvent);
-				myMp3Player.addEventListener(JplayerEvent.JPLAYER_PAUSE, jPlayerFlashEvent);
-				myMp3Player.addEventListener(JplayerEvent.JPLAYER_LOADSTART, jPlayerFlashEvent);
-
-				myMp3Player.addEventListener(JplayerEvent.JPLAYER_SEEKING, jPlayerFlashEvent);
-				myMp3Player.addEventListener(JplayerEvent.JPLAYER_SEEKED, jPlayerFlashEvent);
-			} else {
-				myMp3Player.removeEventListener(JplayerEvent.JPLAYER_ERROR, jPlayerFlashEvent);
-				myMp3Player.removeEventListener(JplayerEvent.JPLAYER_PROGRESS, jPlayerFlashEvent);
-				myMp3Player.removeEventListener(JplayerEvent.JPLAYER_TIMEUPDATE, jPlayerFlashEvent);
-				myMp3Player.removeEventListener(JplayerEvent.JPLAYER_ENDED, jPlayerFlashEvent);
-				
-				myMp3Player.removeEventListener(JplayerEvent.JPLAYER_PLAY, jPlayerFlashEvent);
-				myMp3Player.removeEventListener(JplayerEvent.JPLAYER_PAUSE, jPlayerFlashEvent);
-				myMp3Player.removeEventListener(JplayerEvent.JPLAYER_LOADSTART, jPlayerFlashEvent);
-
-				myMp3Player.removeEventListener(JplayerEvent.JPLAYER_SEEKING, jPlayerFlashEvent);
-				myMp3Player.removeEventListener(JplayerEvent.JPLAYER_SEEKED, jPlayerFlashEvent);
-			}
-		}
-		private function listenToMp4(active:Boolean):void {
-			if(active) {
-				myMp4Player.addEventListener(JplayerEvent.JPLAYER_ERROR, jPlayerFlashEvent);
-				myMp4Player.addEventListener(JplayerEvent.JPLAYER_PROGRESS, jPlayerFlashEvent);
-				myMp4Player.addEventListener(JplayerEvent.JPLAYER_TIMEUPDATE, jPlayerFlashEvent);
-				myMp4Player.addEventListener(JplayerEvent.JPLAYER_ENDED, jPlayerFlashEvent);
-
-				myMp4Player.addEventListener(JplayerEvent.JPLAYER_PLAY, jPlayerFlashEvent);
-				myMp4Player.addEventListener(JplayerEvent.JPLAYER_PAUSE, jPlayerFlashEvent);
-				myMp4Player.addEventListener(JplayerEvent.JPLAYER_LOADSTART, jPlayerFlashEvent);
-
-				myMp4Player.addEventListener(JplayerEvent.JPLAYER_SEEKING, jPlayerFlashEvent);
-				myMp4Player.addEventListener(JplayerEvent.JPLAYER_SEEKED, jPlayerFlashEvent);
-
-				myMp4Player.addEventListener(JplayerEvent.JPLAYER_LOADEDMETADATA, jPlayerMetaDataHandler); // Note the unique handler
-			} else {
-				myMp4Player.removeEventListener(JplayerEvent.JPLAYER_ERROR, jPlayerFlashEvent);
-				myMp4Player.removeEventListener(JplayerEvent.JPLAYER_PROGRESS, jPlayerFlashEvent);
-				myMp4Player.removeEventListener(JplayerEvent.JPLAYER_TIMEUPDATE, jPlayerFlashEvent);
-				myMp4Player.removeEventListener(JplayerEvent.JPLAYER_ENDED, jPlayerFlashEvent);
-
-				myMp4Player.removeEventListener(JplayerEvent.JPLAYER_PLAY, jPlayerFlashEvent);
-				myMp4Player.removeEventListener(JplayerEvent.JPLAYER_PAUSE, jPlayerFlashEvent);
-				myMp4Player.removeEventListener(JplayerEvent.JPLAYER_LOADSTART, jPlayerFlashEvent);
-
-				myMp4Player.removeEventListener(JplayerEvent.JPLAYER_SEEKING, jPlayerFlashEvent);
-				myMp4Player.removeEventListener(JplayerEvent.JPLAYER_SEEKED, jPlayerFlashEvent);
-
-				myMp4Player.removeEventListener(JplayerEvent.JPLAYER_LOADEDMETADATA, jPlayerMetaDataHandler); // Note the unique handler
-			}
-		}
-		private function fl_setAudio_mp3(src:String):Boolean {
-			if (src != null) {
-				log("fl_setAudio_mp3: "+src);
-				setupListeners(isMp3, true);
-				isMp3 = true;
-				isVideo = false;
-				myMp4Player.clearFile();
-				myMp3Player.setFile(src);
-				return true;
-			} else {
-				log("fl_setAudio_mp3: null");
-				return false;
-			}
-		}
-		private function fl_setAudio_m4a(src:String):Boolean {
-			if (src != null) {
-				log("fl_setAudio_m4a: "+src);
-				setupListeners(isMp3, false);
-				isMp3 = false;
-				isVideo = false;
-				myMp3Player.clearFile();
-				myMp4Player.setFile(src);
-				return true;
-			} else {
-				log("fl_setAudio_m4a: null");
-				return false;
-			}
-		}
-		private function fl_setVideo_m4v(src:String):Boolean {
-			if (src != null) {
-				log("fl_setVideo_m4v: "+src);
-				setupListeners(isMp3, false);
-				isMp3 = false;
-				isVideo = true;
-				myMp3Player.clearFile();
-				myMp4Player.setFile(src);
-				return true;
-			} else {
-				log("fl_setVideo_m4v: null");
-				return false;
-			}
-		}
-		private function fl_clearMedia():void {
-			log("clearMedia.");
-			myMp3Player.clearFile();
-			myMp4Player.clearFile();
-		}
-		private function fl_load():Boolean {
-			log("load.");
-			if(isMp3) {
-				return myMp3Player.load();
-			} else {
-				return myMp4Player.load();
-			}
-		}
-		private function fl_play(time:Number = NaN):Boolean {
-			log("play: time = " + time);
-			if(isMp3) {
-				return myMp3Player.play(time * 1000); // Flash uses milliseconds
-			} else {
-				return myMp4Player.play(time * 1000); // Flash uses milliseconds
-			}
-		}
-		private function fl_pause(time:Number = NaN):Boolean {
-			log("pause: time = " + time);
-			if(isMp3) {
-				return myMp3Player.pause(time * 1000); // Flash uses milliseconds
-			} else {
-				return myMp4Player.pause(time * 1000); // Flash uses milliseconds
-			}
-		}
-		private function fl_play_head(percent:Number):Boolean {
-			log("play_head: "+percent+"%");
-			if(isMp3) {
-				return myMp3Player.playHead(percent);
-			} else {
-				return myMp4Player.playHead(percent);
-			}
-		}
-		private function fl_volume(v:Number):void {
-			log("volume: "+v);
-			commonStatus.volume = v;
-			if(!commonStatus.muted) {
-				myMp3Player.setVolume(v);
-				myMp4Player.setVolume(v);
-			}
-		}
-		private function fl_mute(mute:Boolean):void {
-			log("mute: "+mute);
-			commonStatus.muted = mute;
-			if(mute) {
-				myMp3Player.setVolume(0);
-				myMp4Player.setVolume(0);
-			} else {
-				myMp3Player.setVolume(commonStatus.volume);
-				myMp4Player.setVolume(commonStatus.volume);
-			}
-		}
-		private function jPlayerFlashEvent(e:JplayerEvent):void {
-			log("jPlayer Flash Event: " + e.type + ": " + e.target);
-			if(ExternalInterface.available) {
-				ExternalInterface.call(jQuery, "jPlayerFlashEvent", e.type, extractStatusData(e.data));
-			}
-		}
-		private function extractStatusData(data:JplayerStatus):Object {
-			var myStatus:Object = {
-				version: JplayerStatus.VERSION,
-				src: data.src,
-				paused: !data.isPlaying, // Changing this name requires inverting all assignments and conditional statements.
-				srcSet: data.srcSet,
-				seekPercent: data.seekPercent,
-				currentPercentRelative: data.currentPercentRelative,
-				currentPercentAbsolute: data.currentPercentAbsolute,
-				currentTime: data.currentTime / 1000, // JavaScript uses seconds
-				duration: data.duration / 1000, // JavaScript uses seconds
-				volume: commonStatus.volume,
-				muted: commonStatus.muted
-			};
-			log("extractStatusData: sp="+myStatus.seekPercent+" cpr="+myStatus.currentPercentRelative+" cpa="+myStatus.currentPercentAbsolute+" ct="+myStatus.currentTime+" d="+myStatus.duration);
-			return myStatus;
-		}
-		private function jPlayerMetaDataHandler(e:JplayerEvent):void {
-			log("jPlayerMetaDataHandler:" + e.target);
-			if(ExternalInterface.available) {
-				resizeHandler(new Event(Event.RESIZE));
-				ExternalInterface.call(jQuery, "jPlayerFlashEvent", e.type, extractStatusData(e.data));
-			}
-		}
-		private function resizeHandler(e:Event):void {
-			log("resizeHandler: stageWidth = " + stage.stageWidth + " | stageHeight = " + stage.stageHeight);
-
-			var mediaX:Number = 0;
-			var mediaY:Number = 0;
-			var mediaWidth:Number = 0;
-			var mediaHeight:Number = 0;
-
-			if(stage.stageWidth > 0 && stage.stageHeight > 0 && myMp4Player.myVideo.width > 0 && myMp4Player.myVideo.height > 0) {
-				var aspectRatioStage:Number = stage.stageWidth / stage.stageHeight;
-				var aspectRatioVideo:Number = myMp4Player.myVideo.width / myMp4Player.myVideo.height;
-				if(aspectRatioStage < aspectRatioVideo) {
-					mediaWidth = stage.stageWidth;
-					mediaHeight = stage.stageWidth / aspectRatioVideo;
-					mediaX = 0;
-					mediaY = (stage.stageHeight - mediaHeight) / 2;
-				} else {
-					mediaWidth = stage.stageHeight * aspectRatioVideo;
-					mediaHeight = stage.stageHeight;
-					mediaX = (stage.stageWidth - mediaWidth) / 2;
-					mediaY = 0;
-				}
-				resizeEntity(myMp4Player, mediaX, mediaY, mediaWidth, mediaHeight);
-			}
-			if(debug && stage.stageWidth > 20 && stage.stageHeight > 20) {
-				txLog.width = stage.stageWidth - 10;
-				txLog.height = stage.stageHeight - 10;
-			}
-		}
-		private function resizeEntity(entity:Sprite, mediaX:Number, mediaY:Number, mediaWidth:Number, mediaHeight:Number):void {
-			entity.x = mediaX;
-			entity.y = mediaY;
-			entity.width = mediaWidth;
-			entity.height = mediaHeight;
-		}
-		private function clickHandler(e:MouseEvent):void {
-			if(isMp3) {
-				jPlayerFlashEvent(new JplayerEvent(JplayerEvent.JPLAYER_CLICK, myMp3Player.myStatus, "click"))
-			} else {
-				jPlayerFlashEvent(new JplayerEvent(JplayerEvent.JPLAYER_CLICK, myMp4Player.myStatus, "click"))
-			}
-		}
-		// This event is never called. See comments in class constructor.
-		private function menuSelectHandler_jPlayer(e:ContextMenuEvent):void {
-			navigateToURL(new URLRequest("http://jplayer.org/"), "_blank");
-		}
-		// This event is never called. See comments in class constructor.
-		private function menuSelectHandler_happyworm(e:ContextMenuEvent):void {
-			navigateToURL(new URLRequest("http://happyworm.com/"), "_blank");
-		}
-		private function log(t:String):void {
-			if(debug) {
-				txLog.text = t + "\n" + txLog.text;
-			}
-		}
-		private function debugMsgHandler(e:JplayerEvent):void {
-			log(e.msg);
-		}
-		private function keyboardHandler(e:KeyboardEvent):void {
-			log("keyboardHandler: e.keyCode = " + e.keyCode);
-			switch(e.keyCode) {
-				case 68 : // d
-					txLog.visible = !txLog.visible;
-					log("Toggled log display: " + txLog.visible);
-					break;
-				case 76 : // l
-					if(e.ctrlKey && e.shiftKey) {
-						txLog.text = "Cleared log.";
-					}
-					break;
-			}
-		}
-	}
-}
diff --git a/apps/media/js/jQuery.jPlayer.2.1.0.source/Jplayer.fla b/apps/media/js/jQuery.jPlayer.2.1.0.source/Jplayer.fla
deleted file mode 100644
index 61ae40d3ac2811ebcfd63b1ff3bb590f67984445..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 61952
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
Lr)S@~#Q*$1&)N_z

diff --git a/apps/media/js/jQuery.jPlayer.2.1.0.source/add-on/jplayer.playlist.js b/apps/media/js/jQuery.jPlayer.2.1.0.source/add-on/jplayer.playlist.js
deleted file mode 100644
index 0eaa0ddf3d..0000000000
--- a/apps/media/js/jQuery.jPlayer.2.1.0.source/add-on/jplayer.playlist.js
+++ /dev/null
@@ -1,452 +0,0 @@
-/*
- * Playlist Object for the jPlayer Plugin
- * http://www.jplayer.org
- *
- * Copyright (c) 2009 - 2011 Happyworm Ltd
- * Dual licensed under the MIT and GPL licenses.
- *  - http://www.opensource.org/licenses/mit-license.php
- *  - http://www.gnu.org/copyleft/gpl.html
- *
- * Author: Mark J Panaghiston
- * Version: 2.1.0 (jPlayer 2.1.0)
- * Date: 1st September 2011
- */
-
-/* Code verified using http://www.jshint.com/ */
-/*jshint asi:false, bitwise:false, boss:false, browser:true, curly:true, debug:false, eqeqeq:true, eqnull:false, evil:false, forin:false, immed:false, jquery:true, laxbreak:false, newcap:true, noarg:true, noempty:true, nonew:true, nomem:false, onevar:false, passfail:false, plusplus:false, regexp:false, undef:true, sub:false, strict:false, white:false */
-/*global  jPlayerPlaylist: true, jQuery:false, alert:false */
-
-(function($, undefined) {
-
-	jPlayerPlaylist = function(cssSelector, playlist, options) {
-		var self = this;
-
-		this.current = 0;
-		this.loop = false; // Flag used with the jPlayer repeat event
-		this.shuffled = false;
-		this.removing = false; // Flag is true during remove animation, disabling the remove() method until complete.
-
-		this.cssSelector = $.extend({}, this._cssSelector, cssSelector); // Object: Containing the css selectors for jPlayer and its cssSelectorAncestor
-		this.options = $.extend(true, {}, this._options, options); // Object: The jPlayer constructor options for this playlist and the playlist options
-
-		this.playlist = []; // Array of Objects: The current playlist displayed (Un-shuffled or Shuffled)
-		this.original = []; // Array of Objects: The original playlist
-
-		this._initPlaylist(playlist); // Copies playlist to this.original. Then mirrors this.original to this.playlist. Creating two arrays, where the element pointers match. (Enables pointer comparison.)
-
-		// Setup the css selectors for the extra interface items used by the playlist.
-		this.cssSelector.title = this.cssSelector.cssSelectorAncestor + " .jp-title"; // Note that the text is written to the decendant li node.
-		this.cssSelector.playlist = this.cssSelector.cssSelectorAncestor + " .jp-playlist";
-		this.cssSelector.next = this.cssSelector.cssSelectorAncestor + " .jp-next";
-		this.cssSelector.previous = this.cssSelector.cssSelectorAncestor + " .jp-previous";
-		this.cssSelector.shuffle = this.cssSelector.cssSelectorAncestor + " .jp-shuffle";
-		this.cssSelector.shuffleOff = this.cssSelector.cssSelectorAncestor + " .jp-shuffle-off";
-
-		// Override the cssSelectorAncestor given in options
-		this.options.cssSelectorAncestor = this.cssSelector.cssSelectorAncestor;
-
-		// Override the default repeat event handler
-		this.options.repeat = function(event) {
-			self.loop = event.jPlayer.options.loop;
-		};
-
-		// Create a ready event handler to initialize the playlist
-		$(this.cssSelector.jPlayer).bind($.jPlayer.event.ready, function(event) {
-			self._init();
-		});
-
-		// Create an ended event handler to move to the next item
-		$(this.cssSelector.jPlayer).bind($.jPlayer.event.ended, function(event) {
-			self.next();
-		});
-
-		// Create a play event handler to pause other instances
-		$(this.cssSelector.jPlayer).bind($.jPlayer.event.play, function(event) {
-			$(this).jPlayer("pauseOthers");
-		});
-
-		// Create a resize event handler to show the title in full screen mode.
-		$(this.cssSelector.jPlayer).bind($.jPlayer.event.resize, function(event) {
-			if(event.jPlayer.options.fullScreen) {
-				$(self.cssSelector.title).show();
-			} else {
-				$(self.cssSelector.title).hide();
-			}
-		});
-
-		// Create click handlers for the extra buttons that do playlist functions.
-		$(this.cssSelector.previous).click(function() {
-			self.previous();
-			$(this).blur();
-			return false;
-		});
-
-		$(this.cssSelector.next).click(function() {
-			self.next();
-			$(this).blur();
-			return false;
-		});
-
-		$(this.cssSelector.shuffle).click(function() {
-			self.shuffle(true);
-			return false;
-		});
-		$(this.cssSelector.shuffleOff).click(function() {
-			self.shuffle(false);
-			return false;
-		}).hide();
-
-		// Put the title in its initial display state
-		if(!this.options.fullScreen) {
-			$(this.cssSelector.title).hide();
-		}
-
-		// Remove the empty <li> from the page HTML. Allows page to be valid HTML, while not interfereing with display animations
-		$(this.cssSelector.playlist + " ul").empty();
-
-		// Create .live() handlers for the playlist items along with the free media and remove controls.
-		this._createItemHandlers();
-
-		// Instance jPlayer
-		$(this.cssSelector.jPlayer).jPlayer(this.options);
-	};
-
-	jPlayerPlaylist.prototype = {
-		_cssSelector: { // static object, instanced in constructor
-			jPlayer: "#jquery_jplayer_1",
-			cssSelectorAncestor: "#jp_container_1"
-		},
-		_options: { // static object, instanced in constructor
-			playlistOptions: {
-				autoPlay: false,
-				loopOnPrevious: false,
-				shuffleOnLoop: true,
-				enableRemoveControls: false,
-				displayTime: 'slow',
-				addTime: 'fast',
-				removeTime: 'fast',
-				shuffleTime: 'slow',
-				itemClass: "jp-playlist-item",
-				freeGroupClass: "jp-free-media",
-				freeItemClass: "jp-playlist-item-free",
-				removeItemClass: "jp-playlist-item-remove"
-			}
-		},
-		option: function(option, value) { // For changing playlist options only
-			if(value === undefined) {
-				return this.options.playlistOptions[option];
-			}
-
-			this.options.playlistOptions[option] = value;
-
-			switch(option) {
-				case "enableRemoveControls":
-					this._updateControls();
-					break;
-				case "itemClass":
-				case "freeGroupClass":
-				case "freeItemClass":
-				case "removeItemClass":
-					this._refresh(true); // Instant
-					this._createItemHandlers();
-					break;
-			}
-			return this;
-		},
-		_init: function() {
-			var self = this;
-			this._refresh(function() {
-				if(self.options.playlistOptions.autoPlay) {
-					self.play(self.current);
-				} else {
-					self.select(self.current);
-				}
-			});
-		},
-		_initPlaylist: function(playlist) {
-			this.current = 0;
-			this.shuffled = false;
-			this.removing = false;
-			this.original = $.extend(true, [], playlist); // Copy the Array of Objects
-			this._originalPlaylist();
-		},
-		_originalPlaylist: function() {
-			var self = this;
-			this.playlist = [];
-			// Make both arrays point to the same object elements. Gives us 2 different arrays, each pointing to the same actual object. ie., Not copies of the object.
-			$.each(this.original, function(i,v) {
-				self.playlist[i] = self.original[i];
-			});
-		},
-		_refresh: function(instant) {
-			/* instant: Can be undefined, true or a function.
-			 *	undefined -> use animation timings
-			 *	true -> no animation
-			 *	function -> use animation timings and excute function at half way point.
-			 */
-			var self = this;
-
-			if(instant && !$.isFunction(instant)) {
-				$(this.cssSelector.playlist + " ul").empty();
-				$.each(this.playlist, function(i,v) {
-					$(self.cssSelector.playlist + " ul").append(self._createListItem(self.playlist[i]));
-				});
-				this._updateControls();
-			} else {
-				var displayTime = $(this.cssSelector.playlist + " ul").children().length ? this.options.playlistOptions.displayTime : 0;
-
-				$(this.cssSelector.playlist + " ul").slideUp(displayTime, function() {
-					var $this = $(this);
-					$(this).empty();
-					
-					$.each(self.playlist, function(i,v) {
-						$this.append(self._createListItem(self.playlist[i]));
-					});
-					self._updateControls();
-					if($.isFunction(instant)) {
-						instant();
-					}
-					if(self.playlist.length) {
-						$(this).slideDown(self.options.playlistOptions.displayTime);
-					} else {
-						$(this).show();
-					}
-				});
-			}
-		},
-		_createListItem: function(media) {
-			var self = this;
-
-			// Wrap the <li> contents in a <div>
-			var listItem = "<li><div>";
-
-			// Create remove control
-			listItem += "<a href='javascript:;' class='" + this.options.playlistOptions.removeItemClass + "'>&times;</a>";
-
-			// Create links to free media
-			if(media.free) {
-				var first = true;
-				listItem += "<span class='" + this.options.playlistOptions.freeGroupClass + "'>(";
-				$.each(media, function(property,value) {
-					if($.jPlayer.prototype.format[property]) { // Check property is a media format.
-						if(first) {
-							first = false;
-						} else {
-							listItem += " | ";
-						}
-						listItem += "<a class='" + self.options.playlistOptions.freeItemClass + "' href='" + value + "' tabindex='1'>" + property + "</a>";
-					}
-				});
-				listItem += ")</span>";
-			}
-
-			// The title is given next in the HTML otherwise the float:right on the free media corrupts in IE6/7
-			listItem += "<a href='javascript:;' class='" + this.options.playlistOptions.itemClass + "' tabindex='1'>" + media.title + (media.artist ? " <span class='jp-artist'>by " + media.artist + "</span>" : "") + "</a>";
-			listItem += "</div></li>";
-
-			return listItem;
-		},
-		_createItemHandlers: function() {
-			var self = this;
-			// Create .live() handlers for the playlist items
-			$(this.cssSelector.playlist + " a." + this.options.playlistOptions.itemClass).die("click").live("click", function() {
-				var index = $(this).parent().parent().index();
-				if(self.current !== index) {
-					self.play(index);
-				} else {
-					$(self.cssSelector.jPlayer).jPlayer("play");
-				}
-				$(this).blur();
-				return false;
-			});
-
-			// Create .live() handlers that disable free media links to force access via right click
-			$(self.cssSelector.playlist + " a." + this.options.playlistOptions.freeItemClass).die("click").live("click", function() {
-				$(this).parent().parent().find("." + self.options.playlistOptions.itemClass).click();
-				$(this).blur();
-				return false;
-			});
-
-			// Create .live() handlers for the remove controls
-			$(self.cssSelector.playlist + " a." + this.options.playlistOptions.removeItemClass).die("click").live("click", function() {
-				var index = $(this).parent().parent().index();
-				self.remove(index);
-				$(this).blur();
-				return false;
-			});
-		},
-		_updateControls: function() {
-			if(this.options.playlistOptions.enableRemoveControls) {
-				$(this.cssSelector.playlist + " ." + this.options.playlistOptions.removeItemClass).show();
-			} else {
-				$(this.cssSelector.playlist + " ." + this.options.playlistOptions.removeItemClass).hide();
-			}
-			if(this.shuffled) {
-				$(this.cssSelector.shuffleOff).show();
-				$(this.cssSelector.shuffle).hide();
-			} else {
-				$(this.cssSelector.shuffleOff).hide();
-				$(this.cssSelector.shuffle).show();
-			}
-		},
-		_highlight: function(index) {
-			if(this.playlist.length && index !== undefined) {
-				$(this.cssSelector.playlist + " .jp-playlist-current").removeClass("jp-playlist-current");
-				$(this.cssSelector.playlist + " li:nth-child(" + (index + 1) + ")").addClass("jp-playlist-current").find(".jp-playlist-item").addClass("jp-playlist-current");
-				$(this.cssSelector.title + " li").html(this.playlist[index].title + (this.playlist[index].artist ? " <span class='jp-artist'>by " + this.playlist[index].artist + "</span>" : ""));
-			}
-		},
-		setPlaylist: function(playlist) {
-			this._initPlaylist(playlist);
-			this._init();
-		},
-		add: function(media, playNow) {
-			$(this.cssSelector.playlist + " ul").append(this._createListItem(media)).find("li:last-child").hide().slideDown(this.options.playlistOptions.addTime);
-			this._updateControls();
-			this.original.push(media);
-			this.playlist.push(media); // Both array elements share the same object pointer. Comforms with _initPlaylist(p) system.
-
-			if(playNow) {
-				this.play(this.playlist.length - 1);
-			} else {
-				if(this.original.length === 1) {
-					this.select(0);
-				}
-			}
-		},
-		remove: function(index) {
-			var self = this;
-
-			if(index === undefined) {
-				this._initPlaylist([]);
-				this._refresh(function() {
-					$(self.cssSelector.jPlayer).jPlayer("clearMedia");
-				});
-				return true;
-			} else {
-
-				if(this.removing) {
-					return false;
-				} else {
-					index = (index < 0) ? self.original.length + index : index; // Negative index relates to end of array.
-					if(0 <= index && index < this.playlist.length) {
-						this.removing = true;
-
-						$(this.cssSelector.playlist + " li:nth-child(" + (index + 1) + ")").slideUp(this.options.playlistOptions.removeTime, function() {
-							$(this).remove();
-
-							if(self.shuffled) {
-								var item = self.playlist[index];
-								$.each(self.original, function(i,v) {
-									if(self.original[i] === item) {
-										self.original.splice(i, 1);
-										return false; // Exit $.each
-									}
-								});
-								self.playlist.splice(index, 1);
-							} else {
-								self.original.splice(index, 1);
-								self.playlist.splice(index, 1);
-							}
-
-							if(self.original.length) {
-								if(index === self.current) {
-									self.current = (index < self.original.length) ? self.current : self.original.length - 1; // To cope when last element being selected when it was removed
-									self.select(self.current);
-								} else if(index < self.current) {
-									self.current--;
-								}
-							} else {
-								$(self.cssSelector.jPlayer).jPlayer("clearMedia");
-								self.current = 0;
-								self.shuffled = false;
-								self._updateControls();
-							}
-
-							self.removing = false;
-						});
-					}
-					return true;
-				}
-			}
-		},
-		select: function(index) {
-			index = (index < 0) ? this.original.length + index : index; // Negative index relates to end of array.
-			if(0 <= index && index < this.playlist.length) {
-				this.current = index;
-				this._highlight(index);
-				$(this.cssSelector.jPlayer).jPlayer("setMedia", this.playlist[this.current]);
-			} else {
-				this.current = 0;
-			}
-		},
-		play: function(index) {
-			index = (index < 0) ? this.original.length + index : index; // Negative index relates to end of array.
-			if(0 <= index && index < this.playlist.length) {
-				if(this.playlist.length) {
-					this.select(index);
-					$(this.cssSelector.jPlayer).jPlayer("play");
-				}
-			} else if(index === undefined) {
-				$(this.cssSelector.jPlayer).jPlayer("play");
-			}
-		},
-		pause: function() {
-			$(this.cssSelector.jPlayer).jPlayer("pause");
-		},
-		next: function() {
-			var index = (this.current + 1 < this.playlist.length) ? this.current + 1 : 0;
-
-			if(this.loop) {
-				// See if we need to shuffle before looping to start, and only shuffle if more than 1 item.
-				if(index === 0 && this.shuffled && this.options.playlistOptions.shuffleOnLoop && this.playlist.length > 1) {
-					this.shuffle(true, true); // playNow
-				} else {
-					this.play(index);
-				}
-			} else {
-				// The index will be zero if it just looped round
-				if(index > 0) {
-					this.play(index);
-				}
-			}
-		},
-		previous: function() {
-			var index = (this.current - 1 >= 0) ? this.current - 1 : this.playlist.length - 1;
-
-			if(this.loop && this.options.playlistOptions.loopOnPrevious || index < this.playlist.length - 1) {
-				this.play(index);
-			}
-		},
-		shuffle: function(shuffled, playNow) {
-			var self = this;
-
-			if(shuffled === undefined) {
-				shuffled = !this.shuffled;
-			}
-
-			if(shuffled || shuffled !== this.shuffled) {
-
-				$(this.cssSelector.playlist + " ul").slideUp(this.options.playlistOptions.shuffleTime, function() {
-					self.shuffled = shuffled;
-					if(shuffled) {
-						self.playlist.sort(function() {
-							return 0.5 - Math.random();
-						});
-					} else {
-						self._originalPlaylist();
-					}
-					self._refresh(true); // Instant
-
-					if(playNow || !$(self.cssSelector.jPlayer).data("jPlayer").status.paused) {
-						self.play(0);
-					} else {
-						self.select(0);
-					}
-
-					$(this).slideDown(self.options.playlistOptions.shuffleTime);
-				});
-			}
-		}
-	};
-})(jQuery);
diff --git a/apps/media/js/jQuery.jPlayer.2.1.0.source/add-on/jquery.jplayer.inspector.js b/apps/media/js/jQuery.jPlayer.2.1.0.source/add-on/jquery.jplayer.inspector.js
deleted file mode 100644
index 46c090a1b0..0000000000
--- a/apps/media/js/jQuery.jPlayer.2.1.0.source/add-on/jquery.jplayer.inspector.js
+++ /dev/null
@@ -1,331 +0,0 @@
-/*
- * jPlayerInspector Plugin for jPlayer (2.0.0+) Plugin for jQuery JavaScript Library
- * http://www.happyworm.com/jquery/jplayer
- *
- * Copyright (c) 2009 - 2011 Happyworm Ltd
- * Dual licensed under the MIT and GPL licenses.
- *  - http://www.opensource.org/licenses/mit-license.php
- *  - http://www.gnu.org/copyleft/gpl.html
- *
- * Author: Mark J Panaghiston
- * Version: 1.0.3
- * Date: 7th August 2011
- *
- * For use with jPlayer Version: 2.0.29
- *
- * Note: Declare inspector instances after jPlayer instances. ie., Otherwise the jPlayer instance is nonsense.
- */
-
-(function($, undefined) {
-	$.jPlayerInspector = {};
-	$.jPlayerInspector.i = 0;
-	$.jPlayerInspector.defaults = {
-		jPlayer: undefined, // The jQuery selector of the jPlayer instance to inspect.
-		idPrefix: "jplayer_inspector_",
-		visible: false
-	};
-	
-	var methods = {
-		init: function(options) {
-			var self = this;
-			var $this = $(this);
-			
-			var config = $.extend({}, $.jPlayerInspector.defaults, options);
-			$(this).data("jPlayerInspector", config);
-
-			config.id = $(this).attr("id");
-			config.jPlayerId = config.jPlayer.attr("id");
-
-			config.windowId = config.idPrefix + "window_" + $.jPlayerInspector.i;
-			config.statusId = config.idPrefix + "status_" + $.jPlayerInspector.i;
-			config.configId = config.idPrefix + "config_" + $.jPlayerInspector.i;
-			config.toggleId = config.idPrefix + "toggle_" + $.jPlayerInspector.i;
-			config.eventResetId = config.idPrefix + "event_reset_" + $.jPlayerInspector.i;
-			config.updateId = config.idPrefix + "update_" + $.jPlayerInspector.i;
-			config.eventWindowId = config.idPrefix + "event_window_" + $.jPlayerInspector.i;
-			
-			config.eventId = {};
-			config.eventJq = {};
-			config.eventTimeout = {};
-			config.eventOccurrence = {};
-			
-			$.each($.jPlayer.event, function(eventName,eventType) {
-				config.eventId[eventType] = config.idPrefix + "event_" + eventName + "_" + $.jPlayerInspector.i;
-				config.eventOccurrence[eventType] = 0;
-			});
-			
-			var structure = 
-				'<p><a href="#" id="' + config.toggleId + '">' + (config.visible ? "Hide" : "Show") + '</a> jPlayer Inspector</p>' 
-				+ '<div id="' + config.windowId + '">'
-					+ '<div id="' + config.statusId + '"></div>'
-					+ '<div id="' + config.eventWindowId + '" style="padding:5px 5px 0 5px;background-color:#eee;border:1px dotted #000;">'
-						+ '<p style="margin:0 0 10px 0;"><strong>jPlayer events that have occurred over the past 1 second:</strong>'
-						+ '<br />(Backgrounds: <span style="padding:0 5px;background-color:#eee;border:1px dotted #000;">Never occurred</span> <span style="padding:0 5px;background-color:#fff;border:1px dotted #000;">Occurred before</span> <span style="padding:0 5px;background-color:#9f9;border:1px dotted #000;">Occurred</span> <span style="padding:0 5px;background-color:#ff9;border:1px dotted #000;">Multiple occurrences</span> <a href="#" id="' + config.eventResetId + '">reset</a>)</p>';
-			
-			// MJP: Would use the next 3 lines for ease, but the events are just slapped on the page.
-			// $.each($.jPlayer.event, function(eventName,eventType) {
-			// 	structure += '<div id="' + config.eventId[eventType] + '" style="float:left;">' + eventName + '</div>';
-			// });
-			
-			var eventStyle = "float:left;margin:0 5px 5px 0;padding:0 5px;border:1px dotted #000;";
-			// MJP: Doing it longhand so order and layout easier to control.
-			structure +=
-						'<div id="' + config.eventId[$.jPlayer.event.ready] + '" style="' + eventStyle + '"></div>'
-						+ '<div id="' + config.eventId[$.jPlayer.event.flashreset] + '" style="' + eventStyle + '"></div>'
-						+ '<div id="' + config.eventId[$.jPlayer.event.resize] + '" style="' + eventStyle + '"></div>'
-						+ '<div id="' + config.eventId[$.jPlayer.event.repeat] + '" style="' + eventStyle + '"></div>'
-						+ '<div id="' + config.eventId[$.jPlayer.event.click] + '" style="' + eventStyle + '"></div>'
-						+ '<div id="' + config.eventId[$.jPlayer.event.error] + '" style="' + eventStyle + '"></div>'
-						+ '<div id="' + config.eventId[$.jPlayer.event.warning] + '" style="' + eventStyle + '"></div>'
-
-						+ '<div id="' + config.eventId[$.jPlayer.event.loadstart] + '" style="clear:left;' + eventStyle + '"></div>'
-						+ '<div id="' + config.eventId[$.jPlayer.event.progress] + '" style="' + eventStyle + '"></div>'
-						+ '<div id="' + config.eventId[$.jPlayer.event.timeupdate] + '" style="' + eventStyle + '"></div>'
-						+ '<div id="' + config.eventId[$.jPlayer.event.volumechange] + '" style="' + eventStyle + '"></div>'
-
-						+ '<div id="' + config.eventId[$.jPlayer.event.play] + '" style="clear:left;' + eventStyle + '"></div>'
-						+ '<div id="' + config.eventId[$.jPlayer.event.pause] + '" style="' + eventStyle + '"></div>'
-						+ '<div id="' + config.eventId[$.jPlayer.event.waiting] + '" style="' + eventStyle + '"></div>'
-						+ '<div id="' + config.eventId[$.jPlayer.event.playing] + '" style="' + eventStyle + '"></div>'
-						+ '<div id="' + config.eventId[$.jPlayer.event.seeking] + '" style="' + eventStyle + '"></div>'
-						+ '<div id="' + config.eventId[$.jPlayer.event.seeked] + '" style="' + eventStyle + '"></div>'
-						+ '<div id="' + config.eventId[$.jPlayer.event.ended] + '" style="' + eventStyle + '"></div>'
-
-						+ '<div id="' + config.eventId[$.jPlayer.event.loadeddata] + '" style="clear:left;' + eventStyle + '"></div>'
-						+ '<div id="' + config.eventId[$.jPlayer.event.loadedmetadata] + '" style="' + eventStyle + '"></div>'
-						+ '<div id="' + config.eventId[$.jPlayer.event.canplay] + '" style="' + eventStyle + '"></div>'
-						+ '<div id="' + config.eventId[$.jPlayer.event.canplaythrough] + '" style="' + eventStyle + '"></div>'
-
-						+ '<div id="' + config.eventId[$.jPlayer.event.suspend] + '" style="clear:left;' + eventStyle + '"></div>'
-						+ '<div id="' + config.eventId[$.jPlayer.event.abort] + '" style="' + eventStyle + '"></div>'
-						+ '<div id="' + config.eventId[$.jPlayer.event.emptied] + '" style="' + eventStyle + '"></div>'
-						+ '<div id="' + config.eventId[$.jPlayer.event.stalled] + '" style="' + eventStyle + '"></div>'
-						+ '<div id="' + config.eventId[$.jPlayer.event.ratechange] + '" style="' + eventStyle + '"></div>'
-						+ '<div id="' + config.eventId[$.jPlayer.event.durationchange] + '" style="' + eventStyle + '"></div>'
-
-						+ '<div style="clear:both"></div>';
-
-			// MJP: Would like a check here in case we missed an event.
-
-			// MJP: Check fails, since it is not on the page yet.
-/*			$.each($.jPlayer.event, function(eventName,eventType) {
-				if($("#" + config.eventId[eventType])[0] === undefined) {
-					structure += '<div id="' + config.eventId[eventType] + '" style="clear:left;' + eventStyle + '">' + eventName + '</div>';
-				}
-			});
-*/
-			structure +=
-					'</div>'
-					+ '<p><a href="#" id="' + config.updateId + '">Update</a> jPlayer Inspector</p>'
-					+ '<div id="' + config.configId + '"></div>'
-				+ '</div>';
-			$(this).html(structure);
-			
-			config.windowJq = $("#" + config.windowId);
-			config.statusJq = $("#" + config.statusId);
-			config.configJq = $("#" + config.configId);
-			config.toggleJq = $("#" + config.toggleId);
-			config.eventResetJq = $("#" + config.eventResetId);
-			config.updateJq = $("#" + config.updateId);
-
-			$.each($.jPlayer.event, function(eventName,eventType) {
-				config.eventJq[eventType] = $("#" + config.eventId[eventType]);
-				config.eventJq[eventType].text(eventName + " (" + config.eventOccurrence[eventType] + ")"); // Sets the text to the event name and (0);
-				
-				config.jPlayer.bind(eventType + ".jPlayerInspector", function(e) {
-					config.eventOccurrence[e.type]++;
-					if(config.eventOccurrence[e.type] > 1) {
-						config.eventJq[e.type].css("background-color","#ff9");
-					} else {
-						config.eventJq[e.type].css("background-color","#9f9");
-					}
-					config.eventJq[e.type].text(eventName + " (" + config.eventOccurrence[e.type] + ")");
-					// The timer to handle the color
-					clearTimeout(config.eventTimeout[e.type]);
-					config.eventTimeout[e.type] = setTimeout(function() {
-						config.eventJq[e.type].css("background-color","#fff");
-					}, 1000);
-					// The timer to handle the occurences.
-					setTimeout(function() {
-						config.eventOccurrence[e.type]--;
-						config.eventJq[e.type].text(eventName + " (" + config.eventOccurrence[e.type] + ")");
-					}, 1000);
-					if(config.visible) { // Update the status, if inspector open.
-						$this.jPlayerInspector("updateStatus");
-					}
-				});
-			});
-
-			config.jPlayer.bind($.jPlayer.event.ready + ".jPlayerInspector", function(e) {
-				$this.jPlayerInspector("updateConfig");
-			});
-
-			config.toggleJq.click(function() {
-				if(config.visible) {
-					$(this).text("Show");
-					config.windowJq.hide();
-					config.statusJq.empty();
-					config.configJq.empty();
-				} else {
-					$(this).text("Hide");
-					config.windowJq.show();
-					config.updateJq.click();
-				}
-				config.visible = !config.visible;
-				$(this).blur();
-				return false;
-			});
-
-			config.eventResetJq.click(function() {
-				$.each($.jPlayer.event, function(eventName,eventType) {
-					config.eventJq[eventType].css("background-color","#eee");
-				});
-				$(this).blur();
-				return false;
-			});
-
-			config.updateJq.click(function() {
-				$this.jPlayerInspector("updateStatus");
-				$this.jPlayerInspector("updateConfig");
-				return false;
-			});
-
-			if(!config.visible) {
-				config.windowJq.hide();
-			} else {
-				// config.updateJq.click();
-			}
-			
-			$.jPlayerInspector.i++;
-
-			return this;
-		},
-		destroy: function() {
-			$(this).data("jPlayerInspector") && $(this).data("jPlayerInspector").jPlayer.unbind(".jPlayerInspector");
-			$(this).empty();
-		},
-		updateConfig: function() { // This displays information about jPlayer's configuration in inspector
-		
-			var jPlayerInfo = "<p>This jPlayer instance is running in your browser where:<br />"
-
-			for(i = 0; i < $(this).data("jPlayerInspector").jPlayer.data("jPlayer").solutions.length; i++) {
-				var solution = $(this).data("jPlayerInspector").jPlayer.data("jPlayer").solutions[i];
-				jPlayerInfo += "&nbsp;jPlayer's <strong>" + solution + "</strong> solution is";				
-				if($(this).data("jPlayerInspector").jPlayer.data("jPlayer")[solution].used) {
-					jPlayerInfo += " being <strong>used</strong> and will support:<strong>";
-					for(format in $(this).data("jPlayerInspector").jPlayer.data("jPlayer")[solution].support) {
-						if($(this).data("jPlayerInspector").jPlayer.data("jPlayer")[solution].support[format]) {
-							jPlayerInfo += " " + format;
-						}
-					}
-					jPlayerInfo += "</strong><br />";
-				} else {
-					jPlayerInfo += " <strong>not required</strong><br />";
-				}
-			}
-			jPlayerInfo += "</p>";
-
-			if($(this).data("jPlayerInspector").jPlayer.data("jPlayer").html.active) {
-				if($(this).data("jPlayerInspector").jPlayer.data("jPlayer").flash.active) {
-					jPlayerInfo += "<strong>Problem with jPlayer since both HTML5 and Flash are active.</strong>";
-				} else {
-					jPlayerInfo += "The <strong>HTML5 is active</strong>.";
-				}
-			} else {
-				if($(this).data("jPlayerInspector").jPlayer.data("jPlayer").flash.active) {
-					jPlayerInfo += "The <strong>Flash is active</strong>.";
-				} else {
-					jPlayerInfo += "No solution is currently active. jPlayer needs a setMedia().";
-				}
-			}
-			jPlayerInfo += "</p>";
-
-			var formatType = $(this).data("jPlayerInspector").jPlayer.data("jPlayer").status.formatType;
-			jPlayerInfo += "<p><code>status.formatType = '" + formatType + "'</code><br />";
-			if(formatType) {
-				jPlayerInfo += "<code>Browser canPlay('" + $.jPlayer.prototype.format[formatType].codec + "')</code>";
-			} else {
-				jPlayerInfo += "</p>";
-			}
-			
-			jPlayerInfo += "<p><code>status.src = '" + $(this).data("jPlayerInspector").jPlayer.data("jPlayer").status.src + "'</code></p>";
-
-			jPlayerInfo += "<p><code>status.media = {<br />";
-			for(prop in $(this).data("jPlayerInspector").jPlayer.data("jPlayer").status.media) {
-				jPlayerInfo += "&nbsp;" + prop + ": " + $(this).data("jPlayerInspector").jPlayer.data("jPlayer").status.media[prop] + "<br />"; // Some are strings
-			}
-			jPlayerInfo += "};</code></p>"
-
-			+ "<p>Raw browser test for HTML5 support. Should equal a function if HTML5 is available.<br />";
-			if($(this).data("jPlayerInspector").jPlayer.data("jPlayer").html.audio.available) {
-				jPlayerInfo += "<code>htmlElement.audio.canPlayType = " + (typeof $(this).data("jPlayerInspector").jPlayer.data("jPlayer").htmlElement.audio.canPlayType) +"</code><br />"
-			}
-			if($(this).data("jPlayerInspector").jPlayer.data("jPlayer").html.video.available) {
-				jPlayerInfo += "<code>htmlElement.video.canPlayType = " + (typeof $(this).data("jPlayerInspector").jPlayer.data("jPlayer").htmlElement.video.canPlayType) +"</code>";
-			}
-			jPlayerInfo += "</p>";
-
-			jPlayerInfo += "<p>This instance is using the constructor options:<br />"
-			+ "<code>$('#" + $(this).data("jPlayerInspector").jPlayer.data("jPlayer").internal.self.id + "').jPlayer({<br />"
-
-			+ "&nbsp;swfPath: '" + $(this).data("jPlayerInspector").jPlayer.jPlayer("option", "swfPath") + "',<br />"
-
-			+ "&nbsp;solution: '" + $(this).data("jPlayerInspector").jPlayer.jPlayer("option", "solution") + "',<br />"
-
-			+ "&nbsp;supplied: '" + $(this).data("jPlayerInspector").jPlayer.jPlayer("option", "supplied") + "',<br />"
-
-			+ "&nbsp;preload: '" + $(this).data("jPlayerInspector").jPlayer.jPlayer("option", "preload") + "',<br />"
-			
-			+ "&nbsp;volume: " + $(this).data("jPlayerInspector").jPlayer.jPlayer("option", "volume") + ",<br />"
-			
-			+ "&nbsp;muted: " + $(this).data("jPlayerInspector").jPlayer.jPlayer("option", "muted") + ",<br />"
-
-			+ "&nbsp;backgroundColor: '" + $(this).data("jPlayerInspector").jPlayer.jPlayer("option", "backgroundColor") + "',<br />"
-
-			+ "&nbsp;cssSelectorAncestor: '" + $(this).data("jPlayerInspector").jPlayer.jPlayer("option", "cssSelectorAncestor") + "',<br />"
-
-			+ "&nbsp;cssSelector: {";
-
-			var cssSelector = $(this).data("jPlayerInspector").jPlayer.jPlayer("option", "cssSelector");
-			for(prop in cssSelector) {
-				
-				// jPlayerInfo += "<br />&nbsp;&nbsp;" + prop + ": '" + cssSelector[prop] + "'," // This works too of course, but want to use option method for deep keys.
-				jPlayerInfo += "<br />&nbsp;&nbsp;" + prop + ": '" + $(this).data("jPlayerInspector").jPlayer.jPlayer("option", "cssSelector." + prop) + "',"
-			}
-
-			jPlayerInfo = jPlayerInfo.slice(0, -1); // Because the sloppy comma was bugging me.
-
-			jPlayerInfo += "<br />&nbsp;},<br />"
-
-			+ "&nbsp;errorAlerts: " + $(this).data("jPlayerInspector").jPlayer.jPlayer("option", "errorAlerts") + ",<br />"
-			
-			+ "&nbsp;warningAlerts: " + $(this).data("jPlayerInspector").jPlayer.jPlayer("option", "warningAlerts") + "<br />"
-
-			+ "});</code></p>";
-			$(this).data("jPlayerInspector").configJq.html(jPlayerInfo);
-			return this;
-		},
-		updateStatus: function() { // This displays information about jPlayer's status in the inspector
-			$(this).data("jPlayerInspector").statusJq.html(
-				"<p>jPlayer is " +
-				($(this).data("jPlayerInspector").jPlayer.data("jPlayer").status.paused ? "paused" : "playing") +
-				" at time: " + Math.floor($(this).data("jPlayerInspector").jPlayer.data("jPlayer").status.currentTime*10)/10 + "s." +
-				" (d: " + Math.floor($(this).data("jPlayerInspector").jPlayer.data("jPlayer").status.duration*10)/10 + "s" +
-				", sp: " + Math.floor($(this).data("jPlayerInspector").jPlayer.data("jPlayer").status.seekPercent) + "%" +
-				", cpr: " + Math.floor($(this).data("jPlayerInspector").jPlayer.data("jPlayer").status.currentPercentRelative) + "%" +
-				", cpa: " + Math.floor($(this).data("jPlayerInspector").jPlayer.data("jPlayer").status.currentPercentAbsolute) + "%)</p>"
-			);
-			return this;
-		}
-	};
-	$.fn.jPlayerInspector = function( method ) {
-		// Method calling logic
-		if ( methods[method] ) {
-			return methods[ method ].apply( this, Array.prototype.slice.call( arguments, 1 ));
-		} else if ( typeof method === 'object' || ! method ) {
-			return methods.init.apply( this, arguments );
-		} else {
-			$.error( 'Method ' +  method + ' does not exist on jQuery.jPlayerInspector' );
-		}    
-	};
-})(jQuery);
diff --git a/apps/media/js/jQuery.jPlayer.2.1.0.source/happyworm/jPlayer/JplayerEvent.as b/apps/media/js/jQuery.jPlayer.2.1.0.source/happyworm/jPlayer/JplayerEvent.as
deleted file mode 100644
index addb97a7ae..0000000000
--- a/apps/media/js/jQuery.jPlayer.2.1.0.source/happyworm/jPlayer/JplayerEvent.as
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * jPlayer Plugin for jQuery JavaScript Library
- * http://www.happyworm.com/jquery/jplayer
- *
- * Copyright (c) 2009 - 2011 Happyworm Ltd
- * Dual licensed under the MIT and GPL licenses.
- *  - http://www.opensource.org/licenses/mit-license.php
- *  - http://www.gnu.org/copyleft/gpl.html
- *
- * Author: Mark J Panaghiston
- * Date: 8th August 2011
- */
-
-package happyworm.jPlayer {
-	import flash.events.Event;
-	
-	public class JplayerEvent extends Event {
-		
-		// The event strings must match those in the JavaScript's $.jPlayer.event object
-
-		public static const JPLAYER_READY:String = "jPlayer_ready";
-		public static const JPLAYER_FLASHRESET:String = "jPlayer_flashreset"; // Handled in JavaScript
-		public static const JPLAYER_RESIZE:String = "jPlayer_resize"; // Handled in JavaScript
-		public static const JPLAYER_REPEAT:String = "jPlayer_repeat"; // Handled in JavaScript
-		public static const JPLAYER_CLICK:String = "jPlayer_click";
-		public static const JPLAYER_ERROR:String = "jPlayer_error";
-		public static const JPLAYER_WARNING:String = "jPlayer_warning"; // Currently not used by the flash solution
-
-		public static const JPLAYER_LOADSTART:String = "jPlayer_loadstart";
-		public static const JPLAYER_PROGRESS:String = "jPlayer_progress";
-		public static const JPLAYER_SUSPEND:String = "jPlayer_suspend"; // Not implemented
-		public static const JPLAYER_ABORT:String = "jPlayer_abort"; // Not implemented
-		public static const JPLAYER_EMPTIED:String = "jPlayer_emptied"; // Not implemented
-		public static const JPLAYER_STALLED:String = "jPlayer_stalled"; // Not implemented
-		public static const JPLAYER_PLAY:String = "jPlayer_play";
-		public static const JPLAYER_PAUSE:String = "jPlayer_pause";
-		public static const JPLAYER_LOADEDMETADATA:String = "jPlayer_loadedmetadata"; // MP3 has no equivilent
-		public static const JPLAYER_LOADEDDATA:String = "jPlayer_loadeddata"; // Not implemented
-		public static const JPLAYER_WAITING:String = "jPlayer_waiting"; // Not implemented
-		public static const JPLAYER_PLAYING:String = "jPlayer_playing"; // Not implemented
-		public static const JPLAYER_CANPLAY:String = "jPlayer_canplay"; // Not implemented
-		public static const JPLAYER_CANPLAYTHROUGH:String = "jPlayer_canplaythrough"; // Not implemented
-		public static const JPLAYER_SEEKING:String = "jPlayer_seeking";
-		public static const JPLAYER_SEEKED:String = "jPlayer_seeked";
-		public static const JPLAYER_TIMEUPDATE:String = "jPlayer_timeupdate";
-		public static const JPLAYER_ENDED:String = "jPlayer_ended";
-		public static const JPLAYER_RATECHANGE:String = "jPlayer_ratechange"; // Not implemented
-		public static const JPLAYER_DURATIONCHANGE:String = "jPlayer_durationchange"; // Not implemented
-		public static const JPLAYER_VOLUMECHANGE:String = "jPlayer_volumechange"; // See JavaScript
-
-		// Events used internal to jPlayer's Flash.
-		public static const DEBUG_MSG:String = "debug_msg";
-
-		public var data:JplayerStatus;
-		public var msg:String = ""
-
-		public function JplayerEvent(type:String, data:JplayerStatus, msg:String = "", bubbles:Boolean = false, cancelable:Boolean = false) {
-			super(type, bubbles, cancelable);
-			this.data = data;
-			this.msg = msg;
-		}
-		public override function clone():Event {
-			return new JplayerEvent(type, data, msg, bubbles, cancelable);
-		}
-		public override function toString():String {
-			return formatToString("JplayerEvent", "type", "bubbles", "cancelable", "eventPhase", "data", "msg");
-		}
-	}
-}
\ No newline at end of file
diff --git a/apps/media/js/jQuery.jPlayer.2.1.0.source/happyworm/jPlayer/JplayerMp3.as b/apps/media/js/jQuery.jPlayer.2.1.0.source/happyworm/jPlayer/JplayerMp3.as
deleted file mode 100644
index 8c51d5b763..0000000000
--- a/apps/media/js/jQuery.jPlayer.2.1.0.source/happyworm/jPlayer/JplayerMp3.as
+++ /dev/null
@@ -1,328 +0,0 @@
-/*
- * jPlayer Plugin for jQuery JavaScript Library
- * http://www.happyworm.com/jquery/jplayer
- *
- * Copyright (c) 2009 - 2011 Happyworm Ltd
- * Dual licensed under the MIT and GPL licenses.
- *  - http://www.opensource.org/licenses/mit-license.php
- *  - http://www.gnu.org/copyleft/gpl.html
- *
- * Author: Mark J Panaghiston
- * Date: 1st September 2011
- */
-
-package happyworm.jPlayer {
-	import flash.display.Sprite;
-
-	import flash.media.Sound;
-	import flash.media.SoundChannel;
-	import flash.media.SoundLoaderContext;
-	import flash.media.SoundTransform;
-	import flash.net.URLRequest;
-	import flash.utils.Timer;
-	import flash.errors.IOError;
-	import flash.events.*;
-
-	public class JplayerMp3 extends Sprite {
-		private var mySound:Sound = new Sound();
-		private var myChannel:SoundChannel = new SoundChannel();
-		private var myContext:SoundLoaderContext = new SoundLoaderContext(3000, false);
-		private var myTransform:SoundTransform = new SoundTransform();
-		private var myRequest:URLRequest = new URLRequest();
-
-		private var timeUpdateTimer:Timer = new Timer(250, 0); // Matched to HTML event freq
-		private var progressTimer:Timer = new Timer(250, 0); // Matched to HTML event freq
-		private var seekingTimer:Timer = new Timer(100, 0); // Internal: How often seeking is checked to see if it is over.
-		
-		public var myStatus:JplayerStatus = new JplayerStatus();
-
-		public function JplayerMp3(volume:Number) {
-			timeUpdateTimer.addEventListener(TimerEvent.TIMER, timeUpdateHandler);
-			progressTimer.addEventListener(TimerEvent.TIMER, progressHandler);
-			seekingTimer.addEventListener(TimerEvent.TIMER, seekingHandler);
-			setVolume(volume);
-		}
-		public function setFile(src:String):void {
-			this.dispatchEvent(new JplayerEvent(JplayerEvent.DEBUG_MSG, myStatus, "setFile: " + src));
-			if(myStatus.isPlaying) {
-				myChannel.stop();
-				progressUpdates(false);
-				timeUpdates(false);
-			}
-			try {
-				mySound.close();
-			} catch (err:IOError) {
-				// Occurs if the file is either yet to be opened or has finished downloading.
-			}
-			mySound = null;
-			mySound = new Sound();
-			mySound.addEventListener(IOErrorEvent.IO_ERROR, errorHandler);
-			mySound.addEventListener(Event.OPEN, loadOpen);
-			mySound.addEventListener(Event.COMPLETE, loadComplete);
-			myRequest = new URLRequest(src);
-			myStatus.reset();
-			myStatus.src = src;
-			myStatus.srcSet = true;
-			timeUpdateEvent();
-		}
-		public function clearFile():void {
-			setFile("");
-			myStatus.srcSet = false;
-		}
-		private function errorHandler(err:IOErrorEvent):void {
-			// MP3 player needs to stop progress and timeupdate events as they are started before the error occurs.
-			// NB: The MP4 player works differently and the error occurs before they are started.
-			progressUpdates(false);
-			timeUpdates(false);
-			myStatus.error(); // Resets status except the src, and it sets srcError property.
-			this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_ERROR, myStatus));
-		}
-		private function loadOpen(e:Event):void {
-			this.dispatchEvent(new JplayerEvent(JplayerEvent.DEBUG_MSG, myStatus, "loadOpen:"));
-			myStatus.loading();
-			if(myStatus.playOnLoad) {
-				myStatus.playOnLoad = false; // Capture the flag
-				this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_LOADSTART, myStatus)); // So loadstart event happens before play event occurs.
-				play();
-			} else {
-				this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_LOADSTART, myStatus));
-				pause();
-			}
-			progressUpdates(true);
-		}
-		private function loadComplete(e:Event):void {
-			this.dispatchEvent(new JplayerEvent(JplayerEvent.DEBUG_MSG, myStatus, "loadComplete:"));
-			myStatus.loaded();
-			progressUpdates(false);
-			progressEvent();
-		}
-		private function soundCompleteHandler(e:Event):void {
-			myStatus.pausePosition = 0;
-			myStatus.isPlaying = false;
-			timeUpdates(false);
-			timeUpdateEvent();
-			this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_ENDED, myStatus));
-		}
-		private function progressUpdates(active:Boolean):void {
-			// Using a timer rather than Flash's load progress event, because that event gave data at about 200Hz. The 10Hz timer is closer to HTML5 norm.
-			if(active) {
-				progressTimer.start();
-			} else {
-				progressTimer.stop();
-			}
-		}
-		private function progressHandler(e:TimerEvent):void {
-			progressEvent();
-		}
-		private function progressEvent():void {
-			this.dispatchEvent(new JplayerEvent(JplayerEvent.DEBUG_MSG, myStatus, "progressEvent:"));
-			updateStatusValues();
-			this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_PROGRESS, myStatus));
-		}
-		private function timeUpdates(active:Boolean):void {
-			if(active) {
-				timeUpdateTimer.start();
-			} else {
-				timeUpdateTimer.stop();
-			}
-		}
-		private function timeUpdateHandler(e:TimerEvent):void {
-			timeUpdateEvent();
-		}
-		private function timeUpdateEvent():void {
-			updateStatusValues();
-			this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_TIMEUPDATE, myStatus));
-		}
-		private function seeking(active:Boolean):void {
-			if(active) {
-				if(!myStatus.isSeeking) {
-					seekingEvent();
-					seekingTimer.start();
-				}
-			} else {
-				seekingTimer.stop();
-			}
-		}
-		private function seekingHandler(e:TimerEvent):void {
-			if(myStatus.pausePosition <= getDuration()) {
-				seekedEvent();
-				seeking(false);
-				if(myStatus.playOnSeek) {
-					myStatus.playOnSeek = false; // Capture the flag.
-					play();
-				}
-			} else if(myStatus.isLoaded && (myStatus.pausePosition > getDuration())) {
-				// Illegal seek time
-				seeking(false);
-				seekedEvent();
-				pause(0);
-			}
-		}
-		private function seekingEvent():void {
-			myStatus.isSeeking = true;
-			updateStatusValues();
-			this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_SEEKING, myStatus));
-		}
-		private function seekedEvent():void {
-			myStatus.isSeeking = false;
-			updateStatusValues();
-			this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_SEEKED, myStatus));
-		}
-		public function load():Boolean {
-			if(myStatus.loadRequired()) {
-				myStatus.startingDownload();
-				mySound.load(myRequest, myContext);
-				return true;
-			} else {
-				return false;
-			}
-		}
-		public function play(time:Number = NaN):Boolean {
-			var wasPlaying:Boolean = myStatus.isPlaying;
-
-			if(!isNaN(time) && myStatus.srcSet) {
-				if(myStatus.isPlaying) {
-					myChannel.stop();
-					myStatus.isPlaying = false;
-				}
-				myStatus.pausePosition = time;
-			}
-
-			if(myStatus.isStartingDownload) {
-				myStatus.playOnLoad = true; // Raise flag, captured in loadOpen()
-				return true;
-			} else if(myStatus.loadRequired()) {
-				myStatus.playOnLoad = true; // Raise flag, captured in loadOpen()
-				return load();
-			} else if((myStatus.isLoading || myStatus.isLoaded) && !myStatus.isPlaying) {
-				if(myStatus.isLoaded && myStatus.pausePosition > getDuration()) { // The time is invalid, ie., past the end.
-					myStatus.pausePosition = 0;
-					timeUpdates(false);
-					timeUpdateEvent();
-					if(wasPlaying) { // For when playing and then get a play(huge)
-						this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_PAUSE, myStatus));
-					}
-				} else if(myStatus.pausePosition > getDuration()) {
-					myStatus.playOnSeek = true;
-					seeking(true);
-				} else {
-					myStatus.isPlaying = true; // Set immediately before playing. Could affects events.
-					myChannel = mySound.play(myStatus.pausePosition);
-					myChannel.soundTransform = myTransform;
-					myChannel.addEventListener(Event.SOUND_COMPLETE, soundCompleteHandler);
-					timeUpdates(true);
-					if(!wasPlaying) {
-						this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_PLAY, myStatus));
-					}
-				}
-				return true;
-			} else {
-				return false;
-			}
-		}
-		public function pause(time:Number = NaN):Boolean {
-			myStatus.playOnLoad = false; // Reset flag in case load/play issued immediately before this command, ie., before loadOpen() event.
-			myStatus.playOnSeek = false; // Reset flag in case play(time) issued before the command and is still seeking to time set.
-
-			var wasPlaying:Boolean = myStatus.isPlaying;
-
-			// To avoid possible loops with timeupdate and pause(time). A pause() does not have the problem.
-			var alreadyPausedAtTime:Boolean = false;
-			if(!isNaN(time) && myStatus.pausePosition == time) {
-				alreadyPausedAtTime = true;
-			}
-
-			if(myStatus.isPlaying) {
-				myStatus.isPlaying = false;
-				myChannel.stop();
-				if(myChannel.position > 0) { // Required otherwise a fast play then pause causes myChannel.position to equal zero and not the correct value. ie., When it happens leave pausePosition alone.
-					myStatus.pausePosition = myChannel.position;
-				}
-			}
-
-			if(!isNaN(time) && myStatus.srcSet) {
-				myStatus.pausePosition = time;
-			}
-
-			if(wasPlaying) {
-				this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_PAUSE, myStatus));
-			}
-			
-			if(myStatus.isStartingDownload) {
-				return true;
-			} else if(myStatus.loadRequired()) {
-				if(time > 0) { // We do not want the stop() command, which does pause(0), causing a load operation.
-					return load();
-				} else {
-					return true; // Technically the pause(0) succeeded. ie., It did nothing, since nothing was required.
-				}
-			} else if(myStatus.isLoading || myStatus.isLoaded) {
-				if(myStatus.isLoaded && myStatus.pausePosition > getDuration()) { // The time is invalid, ie., past the end.
-					myStatus.pausePosition = 0;
-				} else if(myStatus.pausePosition > getDuration()) {
-					seeking(true);
-				}
-				timeUpdates(false);
-				// Need to be careful with timeupdate event, otherwise a pause in a timeupdate event can cause a loop.
-				// Neither pause() nor pause(time) will cause a timeupdate loop.
-				if(wasPlaying || !isNaN(time) && !alreadyPausedAtTime) {
-					timeUpdateEvent();
-				}
-				return true;
-			} else {
-				return false;
-			}
-		}
-		public function playHead(percent:Number):Boolean {
-			var time:Number = percent * getDuration() / 100;
-			if(myStatus.isPlaying || myStatus.playOnLoad || myStatus.playOnSeek) {
-				return play(time);
-			} else {
-				return pause(time);
-			}
-		}
-		public function setVolume(v:Number):void {
-			myStatus.volume = v;
-			myTransform.volume = v;
-			myChannel.soundTransform = myTransform;
-		}
-		private function updateStatusValues():void {
-			myStatus.seekPercent = 100 * getLoadRatio();
-			myStatus.currentTime = getCurrentTime();
-			myStatus.currentPercentRelative = 100 * getCurrentRatioRel();
-			myStatus.currentPercentAbsolute = 100 * getCurrentRatioAbs();
-			myStatus.duration = getDuration();
-		}
-		public function getLoadRatio():Number {
-			if((myStatus.isLoading || myStatus.isLoaded) && mySound.bytesTotal > 0) {
-				return mySound.bytesLoaded / mySound.bytesTotal;
-			} else {
-				return 0;
-			}
-		}
-		public function getDuration():Number {
-			if(mySound.length > 0) {
-				return mySound.length;
-			} else {
-				return 0;
-			}
-		}
-		public function getCurrentTime():Number {
-			if(myStatus.isPlaying) {
-				return myChannel.position;
-			} else {
-				return myStatus.pausePosition;
-			}
-		}
-		public function getCurrentRatioRel():Number {
-			if((getDuration() > 0) && (getCurrentTime() <= getDuration())) {
-				return getCurrentTime() / getDuration();
-			} else {
-				return 0;
-			}
-		}
-		public function getCurrentRatioAbs():Number {
-			return getCurrentRatioRel() * getLoadRatio();
-		}
-	}
-}
diff --git a/apps/media/js/jQuery.jPlayer.2.1.0.source/happyworm/jPlayer/JplayerMp4.as b/apps/media/js/jQuery.jPlayer.2.1.0.source/happyworm/jPlayer/JplayerMp4.as
deleted file mode 100644
index dcdc0655d0..0000000000
--- a/apps/media/js/jQuery.jPlayer.2.1.0.source/happyworm/jPlayer/JplayerMp4.as
+++ /dev/null
@@ -1,413 +0,0 @@
-/*
- * jPlayer Plugin for jQuery JavaScript Library
- * http://www.happyworm.com/jquery/jplayer
- *
- * Copyright (c) 2009 - 2011 Happyworm Ltd
- * Dual licensed under the MIT and GPL licenses.
- *  - http://www.opensource.org/licenses/mit-license.php
- *  - http://www.gnu.org/copyleft/gpl.html
- *
- * Author: Mark J Panaghiston
- * Date: 7th August 2011
- */
-
-package happyworm.jPlayer {
-	import flash.display.Sprite;
-
-	import flash.media.Video;
-	import flash.media.SoundTransform;
-
-	import flash.net.NetConnection;
-	import flash.net.NetStream;
-
-	import flash.utils.Timer;
-
-	import flash.events.NetStatusEvent;
-	import flash.events.SecurityErrorEvent;
-	import flash.events.TimerEvent;
-
-	public class JplayerMp4 extends Sprite {
-		
-		public var myVideo:Video = new Video();
-		private var myConnection:NetConnection;
-		private var myStream:NetStream;
-		
-		private var myTransform:SoundTransform = new SoundTransform();
-
-		public var myStatus:JplayerStatus = new JplayerStatus();
-		
-		private var timeUpdateTimer:Timer = new Timer(250, 0); // Matched to HTML event freq
-		private var progressTimer:Timer = new Timer(250, 0); // Matched to HTML event freq
-		private var seekingTimer:Timer = new Timer(100, 0); // Internal: How often seeking is checked to see if it is over.
-
-		public function JplayerMp4(volume:Number) {
-			myConnection = new NetConnection();
-			myConnection.addEventListener(NetStatusEvent.NET_STATUS, netStatusHandler);
-			myConnection.addEventListener(SecurityErrorEvent.SECURITY_ERROR, securityErrorHandler);
-			myVideo.smoothing = true;
-			this.addChild(myVideo);
-			
-			timeUpdateTimer.addEventListener(TimerEvent.TIMER, timeUpdateHandler);
-			progressTimer.addEventListener(TimerEvent.TIMER, progressHandler);
-			seekingTimer.addEventListener(TimerEvent.TIMER, seekingHandler);
-
-			myStatus.volume = volume;
-		}
-		private function progressUpdates(active:Boolean):void {
-			if(active) {
-				progressTimer.start();
-			} else {
-				progressTimer.stop();
-			}
-		}
-		private function progressHandler(e:TimerEvent):void {
-			if(myStatus.isLoading) {
-				if(getLoadRatio() == 1) { // Close as can get to a loadComplete event since client.onPlayStatus only works with FMS
-					this.dispatchEvent(new JplayerEvent(JplayerEvent.DEBUG_MSG, myStatus, "progressHandler: loadComplete"));
-					myStatus.loaded();
-					progressUpdates(false);
-				}
-			}
-			progressEvent();
-		}
-		private function progressEvent():void {
-			this.dispatchEvent(new JplayerEvent(JplayerEvent.DEBUG_MSG, myStatus, "progressEvent:"));
-			updateStatusValues();
-			this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_PROGRESS, myStatus));
-		}
-		private function timeUpdates(active:Boolean):void {
-			if(active) {
-				timeUpdateTimer.start();
-			} else {
-				timeUpdateTimer.stop();
-			}
-		}
-		private function timeUpdateHandler(e:TimerEvent):void {
-			timeUpdateEvent();
-		}
-		private function timeUpdateEvent():void {
-			updateStatusValues();
-			this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_TIMEUPDATE, myStatus));
-		}
-		private function seeking(active:Boolean):void {
-			if(active) {
-				if(!myStatus.isSeeking) {
-					seekingEvent();
-				}
-				seekingTimer.start();
-			} else {
-				if(myStatus.isSeeking) {
-					seekedEvent();
-				}
-				seekingTimer.stop();
-			}
-		}
-		private function seekingHandler(e:TimerEvent):void {
-			if(getSeekTimeRatio() <= getLoadRatio()) {
-				seeking(false);
-				if(myStatus.playOnSeek) {
-					myStatus.playOnSeek = false; // Capture the flag.
-					play(myStatus.pausePosition); // Must pass time or the seek time is never set.
-				} else {
-					pause(myStatus.pausePosition); // Must pass time or the stream.time is read.
-				}
-			} else if(myStatus.metaDataReady && myStatus.pausePosition > myStatus.duration) {
-				// Illegal seek time
-				seeking(false);
-				pause(0);
-			}
-		}
-		private function seekingEvent():void {
-			myStatus.isSeeking = true;
-			updateStatusValues();
-			this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_SEEKING, myStatus));
-		}
-		private function seekedEvent():void {
-			myStatus.isSeeking = false;
-			updateStatusValues();
-			this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_SEEKED, myStatus));
-		}
-		private function netStatusHandler(e:NetStatusEvent):void {
-			this.dispatchEvent(new JplayerEvent(JplayerEvent.DEBUG_MSG, myStatus, "netStatusHandler: '" + e.info.code + "'"));
-			switch(e.info.code) {
-				case "NetConnection.Connect.Success":
-					connectStream();
-					break;
-				case "NetStream.Play.Start":
-					// This event code occurs once, when the media is opened. Equiv to loadOpen() in mp3 player.
-					myStatus.loading();
-					this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_LOADSTART, myStatus));
-					progressUpdates(true);
-					// See onMetaDataHandler() for other condition, since duration is vital.
-					break;
-				case "NetStream.Play.Stop":
-					this.dispatchEvent(new JplayerEvent(JplayerEvent.DEBUG_MSG, myStatus, "NetStream.Play.Stop: getDuration() - getCurrentTime() = " + (getDuration() - getCurrentTime())));
-
-					// Check if media is at the end (or close) otherwise this was due to download bandwidth stopping playback. ie., Download is not fast enough.
-					if(Math.abs(getDuration() - getCurrentTime()) < 150) { // Testing found 150ms worked best for M4A files, where playHead(99.9) caused a stuck state due to firing with ~116ms left to play.
-						endedEvent();
-					}
-					break;
-				case "NetStream.Seek.InvalidTime":
-					// Used for capturing invalid set times and clicks on the end of the progress bar.
-					endedEvent();
-					break;
-				case "NetStream.Play.StreamNotFound":
-					myStatus.error(); // Resets status except the src, and it sets srcError property.
-					this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_ERROR, myStatus));
-					break;
-			}
-			// "NetStream.Seek.Notify" event code is not very useful. It occurs after every seek(t) command issued and does not appear to wait for the media to be ready.
-		}
-		private function endedEvent():void {
-			var wasPlaying:Boolean = myStatus.isPlaying;
-			pause(0);
-			timeUpdates(false);
-			timeUpdateEvent();
-			if(wasPlaying) {
-				this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_ENDED, myStatus));
-			}
-		}
-		private function securityErrorHandler(event:SecurityErrorEvent):void {
-			this.dispatchEvent(new JplayerEvent(JplayerEvent.DEBUG_MSG, myStatus, "securityErrorHandler."));
-		}
-		private function connectStream():void {
-			this.dispatchEvent(new JplayerEvent(JplayerEvent.DEBUG_MSG, myStatus, "connectStream."));
-			var customClient:Object = new Object();
-			customClient.onMetaData = onMetaDataHandler;
-			// customClient.onPlayStatus = onPlayStatusHandler; // According to the forums and my tests, onPlayStatus only works with FMS (Flash Media Server).
-			myStream = null;
-			myStream = new NetStream(myConnection);
-			myStream.addEventListener(NetStatusEvent.NET_STATUS, netStatusHandler);
-			myStream.client = customClient;
-			myVideo.attachNetStream(myStream);
-			setVolume(myStatus.volume);
-			myStream.play(myStatus.src);
-		}
-		public function setFile(src:String):void {
-			if(myStream != null) {
-				myStream.close();
-			}
-			myVideo.clear();
-			progressUpdates(false);
-			timeUpdates(false);
-
-			myStatus.reset();
-			myStatus.src = src;
-			myStatus.srcSet = true;
-			timeUpdateEvent();
-		}
-		public function clearFile():void {
-			setFile("");
-			myStatus.srcSet = false;
-		}
-		public function load():Boolean {
-			if(myStatus.loadRequired()) {
-				myStatus.startingDownload();
-				myConnection.connect(null);
-				return true;
-			} else {
-				return false;
-			}
-		}
-		public function play(time:Number = NaN):Boolean {
-			var wasPlaying:Boolean = myStatus.isPlaying;
-
-			if(!isNaN(time) && myStatus.srcSet) {
-				if(myStatus.isPlaying) {
-					myStream.pause();
-					myStatus.isPlaying = false;
-				}
-				myStatus.pausePosition = time;
-			}
-
-			if(myStatus.isStartingDownload) {
-				myStatus.playOnLoad = true; // Raise flag, captured in onMetaDataHandler()
-				return true;
-			} else if(myStatus.loadRequired()) {
-				myStatus.playOnLoad = true; // Raise flag, captured in onMetaDataHandler()
-				return load();
-			} else if((myStatus.isLoading || myStatus.isLoaded) && !myStatus.isPlaying) {
-				if(myStatus.metaDataReady && myStatus.pausePosition > myStatus.duration) { // The time is invalid, ie., past the end.
-					myStream.pause(); // Since it is playing by default at this point.
-					myStatus.pausePosition = 0;
-					myStream.seek(0);
-					timeUpdates(false);
-					timeUpdateEvent();
-					if(wasPlaying) { // For when playing and then get a play(huge)
-						this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_PAUSE, myStatus));
-					}
-				} else if(getSeekTimeRatio() > getLoadRatio()) { // Use an estimate based on the downloaded amount
-					myStatus.playOnSeek = true;
-					seeking(true);
-					myStream.pause(); // Since it is playing by default at this point.
-				} else {
-					if(!isNaN(time)) { // Avoid using seek() when it is already correct.
-						myStream.seek(myStatus.pausePosition/1000); // Since time is in ms and seek() takes seconds
-					}
-					myStatus.isPlaying = true; // Set immediately before playing. Could affects events.
-					myStream.resume();
-					timeUpdates(true);
-					if(!wasPlaying) {
-						this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_PLAY, myStatus));
-					}
-				}
-				return true;
-			} else {
-				return false;
-			}
-		}
-		public function pause(time:Number = NaN):Boolean {
-			myStatus.playOnLoad = false; // Reset flag in case load/play issued immediately before this command, ie., before onMetadata() event.
-			myStatus.playOnSeek = false; // Reset flag in case play(time) issued before the command and is still seeking to time set.
-
-			var wasPlaying:Boolean = myStatus.isPlaying;
-
-			// To avoid possible loops with timeupdate and pause(time). A pause() does not have the problem.
-			var alreadyPausedAtTime:Boolean = false;
-			if(!isNaN(time) && myStatus.pausePosition == time) {
-				alreadyPausedAtTime = true;
-			}
-
-			// Need to wait for metadata to load before ever issuing a pause. The metadata handler will call this function if needed, when ready.
-			if(myStream != null && myStatus.metaDataReady) { // myStream is a null until the 1st media is loaded. ie., The 1st ever setMedia being followed by a pause() or pause(t).
-				myStream.pause();
-			}
-			if(myStatus.isPlaying) {
-				myStatus.isPlaying = false;
-				myStatus.pausePosition = myStream.time * 1000;
-			}
-			
-			if(!isNaN(time) && myStatus.srcSet) {
-				myStatus.pausePosition = time;
-			}
-
-			if(wasPlaying) {
-				this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_PAUSE, myStatus));
-			}
-
-			if(myStatus.isStartingDownload) {
-				return true;
-			} else if(myStatus.loadRequired()) {
-				if(time > 0) { // We do not want the stop() command, which does pause(0), causing a load operation.
-					return load();
-				} else {
-					return true; // Technically the pause(0) succeeded. ie., It did nothing, since nothing was required.
-				}
-			} else if(myStatus.isLoading || myStatus.isLoaded) {
-				if(myStatus.metaDataReady && myStatus.pausePosition > myStatus.duration) { // The time is invalid, ie., past the end.
-					myStatus.pausePosition = 0;
-					myStream.seek(0);
-					seekedEvent(); // Deals with seeking effect when using setMedia() then pause(huge). NB: There is no preceeding seeking event.
-				} else if(!isNaN(time)) {
-					if(getSeekTimeRatio() > getLoadRatio()) { // Use an estimate based on the downloaded amount
-						seeking(true);
-					} else {
-						if(myStatus.metaDataReady) { // Otherwise seek(0) will stop the metadata loading.
-							myStream.seek(myStatus.pausePosition/1000);
-						}
-					}
-				}
-				timeUpdates(false);
-				// Need to be careful with timeupdate event, otherwise a pause in a timeupdate event can cause a loop.
-				// Neither pause() nor pause(time) will cause a timeupdate loop.
-				if(wasPlaying || !isNaN(time) && !alreadyPausedAtTime) {
-					timeUpdateEvent();
-				}
-				return true;
-			} else {
-				return false;
-			}
-		}
-		public function playHead(percent:Number):Boolean {
-			var time:Number = percent * getDuration() * getLoadRatio() / 100;
-			if(myStatus.isPlaying || myStatus.playOnLoad || myStatus.playOnSeek) {
-				return play(time);
-			} else {
-				return pause(time);
-			}
-		}
-		public function setVolume(v:Number):void {
-			myStatus.volume = v;
-			myTransform.volume = v;
-			if(myStream != null) {
-				myStream.soundTransform = myTransform;
-			}
-		}
-		private function updateStatusValues():void {
-			myStatus.seekPercent = 100 * getLoadRatio();
-			myStatus.currentTime = getCurrentTime();
-			myStatus.currentPercentRelative = 100 * getCurrentRatioRel();
-			myStatus.currentPercentAbsolute = 100 * getCurrentRatioAbs();
-			myStatus.duration = getDuration();
-		}
-		public function getLoadRatio():Number {
-			if((myStatus.isLoading || myStatus.isLoaded) && myStream.bytesTotal > 0) {
-				return myStream.bytesLoaded / myStream.bytesTotal;
-			} else {
-				return 0;
-			}
-		}
-		public function getDuration():Number {
-			return myStatus.duration; // Set from meta data.
-		}
-		public function getCurrentTime():Number {
-			if(myStatus.isPlaying) {
-				return myStream.time * 1000;
-			} else {
-				return myStatus.pausePosition;
-			}
-		}
-		public function getCurrentRatioRel():Number {
-			if((getLoadRatio() > 0) && (getCurrentRatioAbs() <= getLoadRatio())) {
-				return getCurrentRatioAbs() / getLoadRatio();
-			} else {
-				return 0;
-			}
-		}
-		public function getCurrentRatioAbs():Number {
-			if(getDuration() > 0) {
-				return getCurrentTime() / getDuration();
-			} else {
-				return 0;
-			}
-		}
-		public function getSeekTimeRatio():Number {
-			if(getDuration() > 0) {
-				return myStatus.pausePosition / getDuration();
-			} else {
-				return 1;
-			}
-		}
-		public function onMetaDataHandler(info:Object):void { // Used in connectStream() in myStream.client object.
-			// This event occurs when jumping to the start of static files! ie., seek(0) will cause this event to occur.
-			if(!myStatus.metaDataReady) {
-				this.dispatchEvent(new JplayerEvent(JplayerEvent.DEBUG_MSG, myStatus, "onMetaDataHandler: " + info.duration + " | " + info.width + "x" + info.height));
-
-				myStatus.metaDataReady = true; // Set flag so that this event only effects jPlayer the 1st time.
-				myStatus.metaData = info;
-				myStatus.duration = info.duration * 1000; // Only available via Meta Data.
-				if(info.width != undefined) {
-					myVideo.width = info.width;
-				}
-				if(info.height != undefined) {
-					myVideo.height = info.height;
-				}
-
-				if(myStatus.playOnLoad) {
-					myStatus.playOnLoad = false; // Capture the flag
-					if(myStatus.pausePosition > 0 ) { // Important for setMedia followed by play(time).
-						play(myStatus.pausePosition);
-					} else {
-						play(); // Not always sending pausePosition avoids the extra seek(0) for a normal play() command.
-					}
-				} else {
-					pause(myStatus.pausePosition); // Always send the pausePosition. Important for setMedia() followed by pause(time). Deals with not reading stream.time with setMedia() and play() immediately followed by stop() or pause(0)
-				}
-				this.dispatchEvent(new JplayerEvent(JplayerEvent.JPLAYER_LOADEDMETADATA, myStatus));
-			} else {
-				this.dispatchEvent(new JplayerEvent(JplayerEvent.DEBUG_MSG, myStatus, "onMetaDataHandler: Already read (NO EFFECT)"));
-			}
-		}
-	}
-}
diff --git a/apps/media/js/jQuery.jPlayer.2.1.0.source/happyworm/jPlayer/JplayerStatus.as b/apps/media/js/jQuery.jPlayer.2.1.0.source/happyworm/jPlayer/JplayerStatus.as
deleted file mode 100644
index 5cc1e1ff4b..0000000000
--- a/apps/media/js/jQuery.jPlayer.2.1.0.source/happyworm/jPlayer/JplayerStatus.as
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * jPlayer Plugin for jQuery JavaScript Library
- * http://www.happyworm.com/jquery/jplayer
- *
- * Copyright (c) 2009 - 2011 Happyworm Ltd
- * Dual licensed under the MIT and GPL licenses.
- *  - http://www.opensource.org/licenses/mit-license.php
- *  - http://www.gnu.org/copyleft/gpl.html
- *
- * Author: Mark J Panaghiston
- * Date: 1st September 2011
- */
-
-package happyworm.jPlayer {
-	public class JplayerStatus {
-
-		public static const VERSION:String = "2.1.0"; // The version of the Flash jPlayer entity.
-
-		public var volume:Number = 0.5; // Not affected by reset()
-		public var muted:Boolean = false; // Not affected by reset()
-
-		public var src:String;
-		public var srcError:Boolean;
-
-		public var srcSet:Boolean;
-		public var isPlaying:Boolean;
-		public var isSeeking:Boolean;
-
-		public var playOnLoad:Boolean;
-		public var playOnSeek:Boolean;
-
-		public var isStartingDownload:Boolean;
-		public var isLoading:Boolean;
-		public var isLoaded:Boolean;
-
-		public var pausePosition:Number;
-
-		public var seekPercent:Number;
-		public var currentTime:Number;
-		public var currentPercentRelative:Number;
-		public var currentPercentAbsolute:Number;
-		public var duration:Number;
-		
-		public var metaDataReady:Boolean;
-		public var metaData:Object;
-
-		public function JplayerStatus() {
-			reset();
-		}
-		public function reset():void {
-			src = "";
-			srcError = false;
-
-			srcSet = false;
-			isPlaying = false;
-			isSeeking = false;
-
-			playOnLoad = false;
-			playOnSeek = false;
-
-			isStartingDownload = false;
-			isLoading = false;
-			isLoaded = false;
-
-			pausePosition = 0;
-
-			seekPercent = 0;
-			currentTime = 0;
-			currentPercentRelative = 0;
-			currentPercentAbsolute = 0;
-			duration = 0;
-			
-			metaDataReady = false;
-			metaData = {};
-		}
-		public function error():void {
-			var srcSaved:String = src;
-			reset();
-			src = srcSaved;
-			srcError = true;
-		}
-		public function loadRequired():Boolean {
-			return (srcSet && !isStartingDownload && !isLoading && !isLoaded);
-		}
-		public function startingDownload():void {
-			isStartingDownload = true;
-			isLoading = false;
-			isLoaded = false;
-		}
-		public function loading():void {
-			isStartingDownload = false;
-			isLoading = true;
-			isLoaded = false;
-		}
-		public function loaded():void {
-			isStartingDownload = false;
-			isLoading = false;
-			isLoaded = true;
-		}
-	}
-}
diff --git a/apps/media/js/jQuery.jPlayer.2.1.0.source/jquery.jplayer.js b/apps/media/js/jQuery.jPlayer.2.1.0.source/jquery.jplayer.js
deleted file mode 100644
index 9d41a12ee6..0000000000
--- a/apps/media/js/jQuery.jPlayer.2.1.0.source/jquery.jplayer.js
+++ /dev/null
@@ -1,2349 +0,0 @@
-/*
- * jPlayer Plugin for jQuery JavaScript Library
- * http://www.jplayer.org
- *
- * Copyright (c) 2009 - 2011 Happyworm Ltd
- * Dual licensed under the MIT and GPL licenses.
- *  - http://www.opensource.org/licenses/mit-license.php
- *  - http://www.gnu.org/copyleft/gpl.html
- *
- * Author: Mark J Panaghiston
- * Version: 2.1.0
- * Date: 1st September 2011
- */
-
-/* Code verified using http://www.jshint.com/ */
-/*jshint asi:false, bitwise:false, boss:false, browser:true, curly:true, debug:false, eqeqeq:true, eqnull:false, evil:false, forin:false, immed:false, jquery:true, laxbreak:false, newcap:true, noarg:true, noempty:true, nonew:true, nomem:false, onevar:false, passfail:false, plusplus:false, regexp:false, undef:true, sub:false, strict:false, white:false */
-/*global jQuery:false, ActiveXObject:false, alert:false */
-
-(function($, undefined) {
-
-	// Adapted from jquery.ui.widget.js (1.8.7): $.widget.bridge
-	$.fn.jPlayer = function( options ) {
-		var name = "jPlayer";
-		var isMethodCall = typeof options === "string",
-			args = Array.prototype.slice.call( arguments, 1 ),
-			returnValue = this;
-
-		// allow multiple hashes to be passed on init
-		options = !isMethodCall && args.length ?
-			$.extend.apply( null, [ true, options ].concat(args) ) :
-			options;
-
-		// prevent calls to internal methods
-		if ( isMethodCall && options.charAt( 0 ) === "_" ) {
-			return returnValue;
-		}
-
-		if ( isMethodCall ) {
-			this.each(function() {
-				var instance = $.data( this, name ),
-					methodValue = instance && $.isFunction( instance[options] ) ?
-						instance[ options ].apply( instance, args ) :
-						instance;
-				if ( methodValue !== instance && methodValue !== undefined ) {
-					returnValue = methodValue;
-					return false;
-				}
-			});
-		} else {
-			this.each(function() {
-				var instance = $.data( this, name );
-				if ( instance ) {
-					// instance.option( options || {} )._init(); // Orig jquery.ui.widget.js code: Not recommend for jPlayer. ie., Applying new options to an existing instance (via the jPlayer constructor) and performing the _init(). The _init() is what concerns me. It would leave a lot of event handlers acting on jPlayer instance and the interface.
-					instance.option( options || {} ); // The new constructor only changes the options. Changing options only has basic support atm.
-				} else {
-					$.data( this, name, new $.jPlayer( options, this ) );
-				}
-			});
-		}
-
-		return returnValue;
-	};
-
-	$.jPlayer = function( options, element ) {
-		// allow instantiation without initializing for simple inheritance
-		if ( arguments.length ) {
-			this.element = $(element);
-			this.options = $.extend(true, {},
-				this.options,
-				options
-			);
-			var self = this;
-			this.element.bind( "remove.jPlayer", function() {
-				self.destroy();
-			});
-			this._init();
-		}
-	};
-	// End of: (Adapted from jquery.ui.widget.js (1.8.7))
-
-	// Emulated HTML5 methods and properties
-	$.jPlayer.emulateMethods = "load play pause";
-	$.jPlayer.emulateStatus = "src readyState networkState currentTime duration paused ended playbackRate";
-	$.jPlayer.emulateOptions = "muted volume";
-
-	// Reserved event names generated by jPlayer that are not part of the HTML5 Media element spec
-	$.jPlayer.reservedEvent = "ready flashreset resize repeat error warning";
-
-	// Events generated by jPlayer
-	$.jPlayer.event = {
-		ready: "jPlayer_ready",
-		flashreset: "jPlayer_flashreset", // Similar to the ready event if the Flash solution is set to display:none and then shown again or if it's reloaded for another reason by the browser. For example, using CSS position:fixed on Firefox for the full screen feature.
-		resize: "jPlayer_resize", // Occurs when the size changes through a full/restore screen operation or if the size/sizeFull options are changed.
-		repeat: "jPlayer_repeat", // Occurs when the repeat status changes. Usually through clicks on the repeat button of the interface.
-		click: "jPlayer_click", // Occurs when the user clicks on one of the following: poster image, html video, flash video.
-		error: "jPlayer_error", // Event error code in event.jPlayer.error.type. See $.jPlayer.error
-		warning: "jPlayer_warning", // Event warning code in event.jPlayer.warning.type. See $.jPlayer.warning
-
-		// Other events match HTML5 spec.
-		loadstart: "jPlayer_loadstart",
-		progress: "jPlayer_progress",
-		suspend: "jPlayer_suspend",
-		abort: "jPlayer_abort",
-		emptied: "jPlayer_emptied",
-		stalled: "jPlayer_stalled",
-		play: "jPlayer_play",
-		pause: "jPlayer_pause",
-		loadedmetadata: "jPlayer_loadedmetadata",
-		loadeddata: "jPlayer_loadeddata",
-		waiting: "jPlayer_waiting",
-		playing: "jPlayer_playing",
-		canplay: "jPlayer_canplay",
-		canplaythrough: "jPlayer_canplaythrough",
-		seeking: "jPlayer_seeking",
-		seeked: "jPlayer_seeked",
-		timeupdate: "jPlayer_timeupdate",
-		ended: "jPlayer_ended",
-		ratechange: "jPlayer_ratechange",
-		durationchange: "jPlayer_durationchange",
-		volumechange: "jPlayer_volumechange"
-	};
-
-	$.jPlayer.htmlEvent = [ // These HTML events are bubbled through to the jPlayer event, without any internal action.
-		"loadstart",
-		// "progress", // jPlayer uses internally before bubbling.
-		// "suspend", // jPlayer uses internally before bubbling.
-		"abort",
-		// "error", // jPlayer uses internally before bubbling.
-		"emptied",
-		"stalled",
-		// "play", // jPlayer uses internally before bubbling.
-		// "pause", // jPlayer uses internally before bubbling.
-		"loadedmetadata",
-		"loadeddata",
-		// "waiting", // jPlayer uses internally before bubbling.
-		// "playing", // jPlayer uses internally before bubbling.
-		"canplay",
-		"canplaythrough",
-		// "seeking", // jPlayer uses internally before bubbling.
-		// "seeked", // jPlayer uses internally before bubbling.
-		// "timeupdate", // jPlayer uses internally before bubbling.
-		// "ended", // jPlayer uses internally before bubbling.
-		"ratechange"
-		// "durationchange" // jPlayer uses internally before bubbling.
-		// "volumechange" // jPlayer uses internally before bubbling.
-	];
-
-	$.jPlayer.pause = function() {
-		$.each($.jPlayer.prototype.instances, function(i, element) {
-			if(element.data("jPlayer").status.srcSet) { // Check that media is set otherwise would cause error event.
-				element.jPlayer("pause");
-			}
-		});
-	};
-	
-	$.jPlayer.timeFormat = {
-		showHour: false,
-		showMin: true,
-		showSec: true,
-		padHour: false,
-		padMin: true,
-		padSec: true,
-		sepHour: ":",
-		sepMin: ":",
-		sepSec: ""
-	};
-
-	$.jPlayer.convertTime = function(s) {
-		var myTime = new Date(s * 1000);
-		var hour = myTime.getUTCHours();
-		var min = myTime.getUTCMinutes();
-		var sec = myTime.getUTCSeconds();
-		var strHour = ($.jPlayer.timeFormat.padHour && hour < 10) ? "0" + hour : hour;
-		var strMin = ($.jPlayer.timeFormat.padMin && min < 10) ? "0" + min : min;
-		var strSec = ($.jPlayer.timeFormat.padSec && sec < 10) ? "0" + sec : sec;
-		return (($.jPlayer.timeFormat.showHour) ? strHour + $.jPlayer.timeFormat.sepHour : "") + (($.jPlayer.timeFormat.showMin) ? strMin + $.jPlayer.timeFormat.sepMin : "") + (($.jPlayer.timeFormat.showSec) ? strSec + $.jPlayer.timeFormat.sepSec : "");
-	};
-
-	// Adapting jQuery 1.4.4 code for jQuery.browser. Required since jQuery 1.3.2 does not detect Chrome as webkit.
-	$.jPlayer.uaBrowser = function( userAgent ) {
-		var ua = userAgent.toLowerCase();
-
-		// Useragent RegExp
-		var rwebkit = /(webkit)[ \/]([\w.]+)/;
-		var ropera = /(opera)(?:.*version)?[ \/]([\w.]+)/;
-		var rmsie = /(msie) ([\w.]+)/;
-		var rmozilla = /(mozilla)(?:.*? rv:([\w.]+))?/;
-
-		var match = rwebkit.exec( ua ) ||
-			ropera.exec( ua ) ||
-			rmsie.exec( ua ) ||
-			ua.indexOf("compatible") < 0 && rmozilla.exec( ua ) ||
-			[];
-
-		return { browser: match[1] || "", version: match[2] || "0" };
-	};
-
-	// Platform sniffer for detecting mobile devices
-	$.jPlayer.uaPlatform = function( userAgent ) {
-		var ua = userAgent.toLowerCase();
-
-		// Useragent RegExp
-		var rplatform = /(ipad|iphone|ipod|android|blackberry|playbook|windows ce|webos)/;
-		var rtablet = /(ipad|playbook)/;
-		var randroid = /(android)/;
-		var rmobile = /(mobile)/;
-
-		var platform = rplatform.exec( ua ) || [];
-		var tablet = rtablet.exec( ua ) ||
-			!rmobile.exec( ua ) && randroid.exec( ua ) ||
-			[];
-
-		if(platform[1]) {
-			platform[1] = platform[1].replace(/\s/g, "_"); // Change whitespace to underscore. Enables dot notation.
-		}
-
-		return { platform: platform[1] || "", tablet: tablet[1] || "" };
-	};
-
-	$.jPlayer.browser = {
-	};
-	$.jPlayer.platform = {
-	};
-
-	var browserMatch = $.jPlayer.uaBrowser(navigator.userAgent);
-	if ( browserMatch.browser ) {
-		$.jPlayer.browser[ browserMatch.browser ] = true;
-		$.jPlayer.browser.version = browserMatch.version;
-	}
-	var platformMatch = $.jPlayer.uaPlatform(navigator.userAgent);
-	if ( platformMatch.platform ) {
-		$.jPlayer.platform[ platformMatch.platform ] = true;
-		$.jPlayer.platform.mobile = !platformMatch.tablet;
-		$.jPlayer.platform.tablet = !!platformMatch.tablet;
-	}
-
-	$.jPlayer.prototype = {
-		count: 0, // Static Variable: Change it via prototype.
-		version: { // Static Object
-			script: "2.1.0",
-			needFlash: "2.1.0",
-			flash: "unknown"
-		},
-		options: { // Instanced in $.jPlayer() constructor
-			swfPath: "js", // Path to Jplayer.swf. Can be relative, absolute or server root relative.
-			solution: "html, flash", // Valid solutions: html, flash. Order defines priority. 1st is highest,
-			supplied: "mp3", // Defines which formats jPlayer will try and support and the priority by the order. 1st is highest,
-			preload: 'metadata',  // HTML5 Spec values: none, metadata, auto.
-			volume: 0.8, // The volume. Number 0 to 1.
-			muted: false,
-			wmode: "opaque", // Valid wmode: window, transparent, opaque, direct, gpu. 
-			backgroundColor: "#000000", // To define the jPlayer div and Flash background color.
-			cssSelectorAncestor: "#jp_container_1",
-			cssSelector: { // * denotes properties that should only be required when video media type required. _cssSelector() would require changes to enable splitting these into Audio and Video defaults.
-				videoPlay: ".jp-video-play", // *
-				play: ".jp-play",
-				pause: ".jp-pause",
-				stop: ".jp-stop",
-				seekBar: ".jp-seek-bar",
-				playBar: ".jp-play-bar",
-				mute: ".jp-mute",
-				unmute: ".jp-unmute",
-				volumeBar: ".jp-volume-bar",
-				volumeBarValue: ".jp-volume-bar-value",
-				volumeMax: ".jp-volume-max",
-				currentTime: ".jp-current-time",
-				duration: ".jp-duration",
-				fullScreen: ".jp-full-screen", // *
-				restoreScreen: ".jp-restore-screen", // *
-				repeat: ".jp-repeat",
-				repeatOff: ".jp-repeat-off",
-				gui: ".jp-gui", // The interface used with autohide feature.
-				noSolution: ".jp-no-solution" // For error feedback when jPlayer cannot find a solution.
-			},
-			fullScreen: false,
-			autohide: {
-				restored: false, // Controls the interface autohide feature.
-				full: true, // Controls the interface autohide feature.
-				fadeIn: 200, // Milliseconds. The period of the fadeIn anim.
-				fadeOut: 600, // Milliseconds. The period of the fadeOut anim.
-				hold: 1000 // Milliseconds. The period of the pause before autohide beings.
-			},
-			loop: false,
-			repeat: function(event) { // The default jPlayer repeat event handler
-				if(event.jPlayer.options.loop) {
-					$(this).unbind(".jPlayerRepeat").bind($.jPlayer.event.ended + ".jPlayer.jPlayerRepeat", function() {
-						$(this).jPlayer("play");
-					});
-				} else {
-					$(this).unbind(".jPlayerRepeat");
-				}
-			},
-			nativeVideoControls: {
-				// Works well on standard browsers.
-				// Phone and tablet browsers can have problems with the controls disappearing.
-			},
-			noFullScreen: {
-				msie: /msie [0-6]/,
-				ipad: /ipad.*?os [0-4]/,
-				iphone: /iphone/,
-				ipod: /ipod/,
-				android_pad: /android [0-3](?!.*?mobile)/,
-				android_phone: /android.*?mobile/,
-				blackberry: /blackberry/,
-				windows_ce: /windows ce/,
-				webos: /webos/
-			},
-			noVolume: {
-				ipad: /ipad/,
-				iphone: /iphone/,
-				ipod: /ipod/,
-				android_pad: /android(?!.*?mobile)/,
-				android_phone: /android.*?mobile/,
-				blackberry: /blackberry/,
-				windows_ce: /windows ce/,
-				webos: /webos/,
-				playbook: /playbook/
-			},
-			verticalVolume: false, // Calculate volume from the bottom of the volume bar. Default is from the left. Also volume affects either width or height.
-			// globalVolume: false, // Not implemented: Set to make volume changes affect all jPlayer instances
-			// globalMute: false, // Not implemented: Set to make mute changes affect all jPlayer instances
-			idPrefix: "jp", // Prefix for the ids of html elements created by jPlayer. For flash, this must not include characters: . - + * / \
-			noConflict: "jQuery",
-			emulateHtml: false, // Emulates the HTML5 Media element on the jPlayer element.
-			errorAlerts: false,
-			warningAlerts: false
-		},
-		optionsAudio: {
-			size: {
-				width: "0px",
-				height: "0px",
-				cssClass: ""
-			},
-			sizeFull: {
-				width: "0px",
-				height: "0px",
-				cssClass: ""
-			}
-		},
-		optionsVideo: {
-			size: {
-				width: "480px",
-				height: "270px",
-				cssClass: "jp-video-270p"
-			},
-			sizeFull: {
-				width: "100%",
-				height: "100%",
-				cssClass: "jp-video-full"
-			}
-		},
-		instances: {}, // Static Object
-		status: { // Instanced in _init()
-			src: "",
-			media: {},
-			paused: true,
-			format: {},
-			formatType: "",
-			waitForPlay: true, // Same as waitForLoad except in case where preloading.
-			waitForLoad: true,
-			srcSet: false,
-			video: false, // True if playing a video
-			seekPercent: 0,
-			currentPercentRelative: 0,
-			currentPercentAbsolute: 0,
-			currentTime: 0,
-			duration: 0,
-			readyState: 0,
-			networkState: 0,
-			playbackRate: 1,
-			ended: 0
-
-/*		Persistant status properties created dynamically at _init():
-			width
-			height
-			cssClass
-			nativeVideoControls
-			noFullScreen
-			noVolume
-*/
-		},
-
-		internal: { // Instanced in _init()
-			ready: false
-			// instance: undefined
-			// domNode: undefined
-			// htmlDlyCmdId: undefined
-			// autohideId: undefined
-		},
-		solution: { // Static Object: Defines the solutions built in jPlayer.
-			html: true,
-			flash: true
-		},
-		// 'MPEG-4 support' : canPlayType('video/mp4; codecs="mp4v.20.8"')
-		format: { // Static Object
-			mp3: {
-				codec: 'audio/mpeg; codecs="mp3"',
-				flashCanPlay: true,
-				media: 'audio'
-			},
-			m4a: { // AAC / MP4
-				codec: 'audio/mp4; codecs="mp4a.40.2"',
-				flashCanPlay: true,
-				media: 'audio'
-			},
-			oga: { // OGG
-				codec: 'audio/ogg; codecs="vorbis"',
-				flashCanPlay: false,
-				media: 'audio'
-			},
-			wav: { // PCM
-				codec: 'audio/wav; codecs="1"',
-				flashCanPlay: false,
-				media: 'audio'
-			},
-			webma: { // WEBM
-				codec: 'audio/webm; codecs="vorbis"',
-				flashCanPlay: false,
-				media: 'audio'
-			},
-			fla: { // FLV / F4A
-				codec: 'audio/x-flv',
-				flashCanPlay: true,
-				media: 'audio'
-			},
-			m4v: { // H.264 / MP4
-				codec: 'video/mp4; codecs="avc1.42E01E, mp4a.40.2"',
-				flashCanPlay: true,
-				media: 'video'
-			},
-			ogv: { // OGG
-				codec: 'video/ogg; codecs="theora, vorbis"',
-				flashCanPlay: false,
-				media: 'video'
-			},
-			webmv: { // WEBM
-				codec: 'video/webm; codecs="vorbis, vp8"',
-				flashCanPlay: false,
-				media: 'video'
-			},
-			flv: { // FLV / F4V
-				codec: 'video/x-flv',
-				flashCanPlay: true,
-				media: 'video'
-			}
-		},
-		_init: function() {
-			var self = this;
-			
-			this.element.empty();
-			
-			this.status = $.extend({}, this.status); // Copy static to unique instance.
-			this.internal = $.extend({}, this.internal); // Copy static to unique instance.
-
-			this.internal.domNode = this.element.get(0);
-
-			this.formats = []; // Array based on supplied string option. Order defines priority.
-			this.solutions = []; // Array based on solution string option. Order defines priority.
-			this.require = {}; // Which media types are required: video, audio.
-			
-			this.htmlElement = {}; // DOM elements created by jPlayer
-			this.html = {}; // In _init()'s this.desired code and setmedia(): Accessed via this[solution], where solution from this.solutions array.
-			this.html.audio = {};
-			this.html.video = {};
-			this.flash = {}; // In _init()'s this.desired code and setmedia(): Accessed via this[solution], where solution from this.solutions array.
-			
-			this.css = {};
-			this.css.cs = {}; // Holds the css selector strings
-			this.css.jq = {}; // Holds jQuery selectors. ie., $(css.cs.method)
-
-			this.ancestorJq = []; // Holds jQuery selector of cssSelectorAncestor. Init would use $() instead of [], but it is only 1.4+
-
-			this.options.volume = this._limitValue(this.options.volume, 0, 1); // Limit volume value's bounds.
-
-			// Create the formats array, with prority based on the order of the supplied formats string
-			$.each(this.options.supplied.toLowerCase().split(","), function(index1, value1) {
-				var format = value1.replace(/^\s+|\s+$/g, ""); //trim
-				if(self.format[format]) { // Check format is valid.
-					var dupFound = false;
-					$.each(self.formats, function(index2, value2) { // Check for duplicates
-						if(format === value2) {
-							dupFound = true;
-							return false;
-						}
-					});
-					if(!dupFound) {
-						self.formats.push(format);
-					}
-				}
-			});
-
-			// Create the solutions array, with prority based on the order of the solution string
-			$.each(this.options.solution.toLowerCase().split(","), function(index1, value1) {
-				var solution = value1.replace(/^\s+|\s+$/g, ""); //trim
-				if(self.solution[solution]) { // Check solution is valid.
-					var dupFound = false;
-					$.each(self.solutions, function(index2, value2) { // Check for duplicates
-						if(solution === value2) {
-							dupFound = true;
-							return false;
-						}
-					});
-					if(!dupFound) {
-						self.solutions.push(solution);
-					}
-				}
-			});
-
-			this.internal.instance = "jp_" + this.count;
-			this.instances[this.internal.instance] = this.element;
-
-			// Check the jPlayer div has an id and create one if required. Important for Flash to know the unique id for comms.
-			if(!this.element.attr("id")) {
-				this.element.attr("id", this.options.idPrefix + "_jplayer_" + this.count);
-			}
-
-			this.internal.self = $.extend({}, {
-				id: this.element.attr("id"),
-				jq: this.element
-			});
-			this.internal.audio = $.extend({}, {
-				id: this.options.idPrefix + "_audio_" + this.count,
-				jq: undefined
-			});
-			this.internal.video = $.extend({}, {
-				id: this.options.idPrefix + "_video_" + this.count,
-				jq: undefined
-			});
-			this.internal.flash = $.extend({}, {
-				id: this.options.idPrefix + "_flash_" + this.count,
-				jq: undefined,
-				swf: this.options.swfPath + (this.options.swfPath.toLowerCase().slice(-4) !== ".swf" ? (this.options.swfPath && this.options.swfPath.slice(-1) !== "/" ? "/" : "") + "Jplayer.swf" : "")
-			});
-			this.internal.poster = $.extend({}, {
-				id: this.options.idPrefix + "_poster_" + this.count,
-				jq: undefined
-			});
-
-			// Register listeners defined in the constructor
-			$.each($.jPlayer.event, function(eventName,eventType) {
-				if(self.options[eventName] !== undefined) {
-					self.element.bind(eventType + ".jPlayer", self.options[eventName]); // With .jPlayer namespace.
-					self.options[eventName] = undefined; // Destroy the handler pointer copy on the options. Reason, events can be added/removed in other ways so this could be obsolete and misleading.
-				}
-			});
-
-			// Determine if we require solutions for audio, video or both media types.
-			this.require.audio = false;
-			this.require.video = false;
-			$.each(this.formats, function(priority, format) {
-				self.require[self.format[format].media] = true;
-			});
-
-			// Now required types are known, finish the options default settings.
-			if(this.require.video) {
-				this.options = $.extend(true, {},
-					this.optionsVideo,
-					this.options
-				);
-			} else {
-				this.options = $.extend(true, {},
-					this.optionsAudio,
-					this.options
-				);
-			}
-			this._setSize(); // update status and jPlayer element size
-
-			// Determine the status for Blocklisted options.
-			this.status.nativeVideoControls = this._uaBlocklist(this.options.nativeVideoControls);
-			this.status.noFullScreen = this._uaBlocklist(this.options.noFullScreen);
-			this.status.noVolume = this._uaBlocklist(this.options.noVolume);
-
-			// The native controls are only for video and are disabled when audio is also used.
-			this._restrictNativeVideoControls();
-
-			// Create the poster image.
-			this.htmlElement.poster = document.createElement('img');
-			this.htmlElement.poster.id = this.internal.poster.id;
-			this.htmlElement.poster.onload = function() { // Note that this did not work on Firefox 3.6: poster.addEventListener("onload", function() {}, false); Did not investigate x-browser.
-				if(!self.status.video || self.status.waitForPlay) {
-					self.internal.poster.jq.show();
-				}
-			};
-			this.element.append(this.htmlElement.poster);
-			this.internal.poster.jq = $("#" + this.internal.poster.id);
-			this.internal.poster.jq.css({'width': this.status.width, 'height': this.status.height});
-			this.internal.poster.jq.hide();
-			this.internal.poster.jq.bind("click.jPlayer", function() {
-				self._trigger($.jPlayer.event.click);
-			});
-			
-			// Generate the required media elements
-			this.html.audio.available = false;
-			if(this.require.audio) { // If a supplied format is audio
-				this.htmlElement.audio = document.createElement('audio');
-				this.htmlElement.audio.id = this.internal.audio.id;
-				this.html.audio.available = !!this.htmlElement.audio.canPlayType && this._testCanPlayType(this.htmlElement.audio); // Test is for IE9 on Win Server 2008.
-			}
-			this.html.video.available = false;
-			if(this.require.video) { // If a supplied format is video
-				this.htmlElement.video = document.createElement('video');
-				this.htmlElement.video.id = this.internal.video.id;
-				this.html.video.available = !!this.htmlElement.video.canPlayType && this._testCanPlayType(this.htmlElement.video); // Test is for IE9 on Win Server 2008.
-			}
-
-			this.flash.available = this._checkForFlash(10);
-
-			this.html.canPlay = {};
-			this.flash.canPlay = {};
-			$.each(this.formats, function(priority, format) {
-				self.html.canPlay[format] = self.html[self.format[format].media].available && "" !== self.htmlElement[self.format[format].media].canPlayType(self.format[format].codec);
-				self.flash.canPlay[format] = self.format[format].flashCanPlay && self.flash.available;
-			});
-			this.html.desired = false;
-			this.flash.desired = false;
-			$.each(this.solutions, function(solutionPriority, solution) {
-				if(solutionPriority === 0) {
-					self[solution].desired = true;
-				} else {
-					var audioCanPlay = false;
-					var videoCanPlay = false;
-					$.each(self.formats, function(formatPriority, format) {
-						if(self[self.solutions[0]].canPlay[format]) { // The other solution can play
-							if(self.format[format].media === 'video') {
-								videoCanPlay = true;
-							} else {
-								audioCanPlay = true;
-							}
-						}
-					});
-					self[solution].desired = (self.require.audio && !audioCanPlay) || (self.require.video && !videoCanPlay);
-				}
-			});
-			// This is what jPlayer will support, based on solution and supplied.
-			this.html.support = {};
-			this.flash.support = {};
-			$.each(this.formats, function(priority, format) {
-				self.html.support[format] = self.html.canPlay[format] && self.html.desired;
-				self.flash.support[format] = self.flash.canPlay[format] && self.flash.desired;
-			});
-			// If jPlayer is supporting any format in a solution, then the solution is used.
-			this.html.used = false;
-			this.flash.used = false;
-			$.each(this.solutions, function(solutionPriority, solution) {
-				$.each(self.formats, function(formatPriority, format) {
-					if(self[solution].support[format]) {
-						self[solution].used = true;
-						return false;
-					}
-				});
-			});
-
-			// Init solution active state and the event gates to false.
-			this._resetActive();
-			this._resetGate();
-
-			// Set up the css selectors for the control and feedback entities.
-			this._cssSelectorAncestor(this.options.cssSelectorAncestor);
-			
-			// If neither html nor flash are being used by this browser, then media playback is not possible. Trigger an error event.
-			if(!(this.html.used || this.flash.used)) {
-				this._error( {
-					type: $.jPlayer.error.NO_SOLUTION, 
-					context: "{solution:'" + this.options.solution + "', supplied:'" + this.options.supplied + "'}",
-					message: $.jPlayer.errorMsg.NO_SOLUTION,
-					hint: $.jPlayer.errorHint.NO_SOLUTION
-				});
-				if(this.css.jq.noSolution.length) {
-					this.css.jq.noSolution.show();
-				}
-			} else {
-				if(this.css.jq.noSolution.length) {
-					this.css.jq.noSolution.hide();
-				}
-			}
-
-			// Add the flash solution if it is being used.
-			if(this.flash.used) {
-				var htmlObj,
-				flashVars = 'jQuery=' + encodeURI(this.options.noConflict) + '&id=' + encodeURI(this.internal.self.id) + '&vol=' + this.options.volume + '&muted=' + this.options.muted;
-
-				// Code influenced by SWFObject 2.2: http://code.google.com/p/swfobject/
-				// Non IE browsers have an initial Flash size of 1 by 1 otherwise the wmode affected the Flash ready event. 
-
-				if($.browser.msie && Number($.browser.version) <= 8) {
-					var objStr = '<object id="' + this.internal.flash.id + '" classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" width="0" height="0"></object>';
-
-					var paramStr = [
-						'<param name="movie" value="' + this.internal.flash.swf + '" />',
-						'<param name="FlashVars" value="' + flashVars + '" />',
-						'<param name="allowScriptAccess" value="always" />',
-						'<param name="bgcolor" value="' + this.options.backgroundColor + '" />',
-						'<param name="wmode" value="' + this.options.wmode + '" />'
-					];
-
-					htmlObj = document.createElement(objStr);
-					for(var i=0; i < paramStr.length; i++) {
-						htmlObj.appendChild(document.createElement(paramStr[i]));
-					}
-				} else {
-					var createParam = function(el, n, v) {
-						var p = document.createElement("param");
-						p.setAttribute("name", n);	
-						p.setAttribute("value", v);
-						el.appendChild(p);
-					};
-
-					htmlObj = document.createElement("object");
-					htmlObj.setAttribute("id", this.internal.flash.id);
-					htmlObj.setAttribute("data", this.internal.flash.swf);
-					htmlObj.setAttribute("type", "application/x-shockwave-flash");
-					htmlObj.setAttribute("width", "1"); // Non-zero
-					htmlObj.setAttribute("height", "1"); // Non-zero
-					createParam(htmlObj, "flashvars", flashVars);
-					createParam(htmlObj, "allowscriptaccess", "always");
-					createParam(htmlObj, "bgcolor", this.options.backgroundColor);
-					createParam(htmlObj, "wmode", this.options.wmode);
-				}
-
-				this.element.append(htmlObj);
-				this.internal.flash.jq = $(htmlObj);
-			}
-			
-			// Add the HTML solution if being used.
-			if(this.html.used) {
-
-				// The HTML Audio handlers
-				if(this.html.audio.available) {
-					this._addHtmlEventListeners(this.htmlElement.audio, this.html.audio);
-					this.element.append(this.htmlElement.audio);
-					this.internal.audio.jq = $("#" + this.internal.audio.id);
-				}
-
-				// The HTML Video handlers
-				if(this.html.video.available) {
-					this._addHtmlEventListeners(this.htmlElement.video, this.html.video);
-					this.element.append(this.htmlElement.video);
-					this.internal.video.jq = $("#" + this.internal.video.id);
-					if(this.status.nativeVideoControls) {
-						this.internal.video.jq.css({'width': this.status.width, 'height': this.status.height});
-					} else {
-						this.internal.video.jq.css({'width':'0px', 'height':'0px'}); // Using size 0x0 since a .hide() causes issues in iOS
-					}
-					this.internal.video.jq.bind("click.jPlayer", function() {
-						self._trigger($.jPlayer.event.click);
-					});
-				}
-			}
-
-			// Create the bridge that emulates the HTML Media element on the jPlayer DIV
-			if( this.options.emulateHtml ) {
-				this._emulateHtmlBridge();
-			}
-
-			if(this.html.used && !this.flash.used) { // If only HTML, then emulate flash ready() call after 100ms.
-				setTimeout( function() {
-					self.internal.ready = true;
-					self.version.flash = "n/a";
-					self._trigger($.jPlayer.event.repeat); // Trigger the repeat event so its handler can initialize itself with the loop option.
-					self._trigger($.jPlayer.event.ready);
-				}, 100);
-			}
-
-			// Initialize the interface components with the options.
-			this._updateNativeVideoControls(); // Must do this first, otherwise there is a bizarre bug in iOS 4.3.2, where the native controls are not shown. Fails in iOS if called after _updateButtons() below. Works if called later in setMedia too, so it odd.
-			this._updateInterface();
-			this._updateButtons(false);
-			this._updateAutohide();
-			this._updateVolume(this.options.volume);
-			this._updateMute(this.options.muted);
-			if(this.css.jq.videoPlay.length) {
-				this.css.jq.videoPlay.hide();
-			}
-
-			$.jPlayer.prototype.count++; // Change static variable via prototype.
-		},
-		destroy: function() {
-			// MJP: The background change remains. Would need to store the original to restore it correctly.
-			// MJP: The jPlayer element's size change remains.
-
-			// Clear the media to reset the GUI and stop any downloads. Streams on some browsers had persited. (Chrome)
-			this.clearMedia();
-			// Remove the size/sizeFull cssClass from the cssSelectorAncestor
-			this._removeUiClass();
-			// Remove the times from the GUI
-			if(this.css.jq.currentTime.length) {
-				this.css.jq.currentTime.text("");
-			}
-			if(this.css.jq.duration.length) {
-				this.css.jq.duration.text("");
-			}
-			// Remove any bindings from the interface controls.
-			$.each(this.css.jq, function(fn, jq) {
-				// Check selector is valid before trying to execute method.
-				if(jq.length) {
-					jq.unbind(".jPlayer");
-				}
-			});
-			// Remove the click handlers for $.jPlayer.event.click
-			this.internal.poster.jq.unbind(".jPlayer");
-			if(this.internal.video.jq) {
-				this.internal.video.jq.unbind(".jPlayer");
-			}
-			// Destroy the HTML bridge.
-			if(this.options.emulateHtml) {
-				this._destroyHtmlBridge();
-			}
-			this.element.removeData("jPlayer"); // Remove jPlayer data
-			this.element.unbind(".jPlayer"); // Remove all event handlers created by the jPlayer constructor
-			this.element.empty(); // Remove the inserted child elements
-			
-			delete this.instances[this.internal.instance]; // Clear the instance on the static instance object
-		},
-		enable: function() { // Plan to implement
-			// options.disabled = false
-		},
-		disable: function () { // Plan to implement
-			// options.disabled = true
-		},
-		_testCanPlayType: function(elem) {
-			// IE9 on Win Server 2008 did not implement canPlayType(), but it has the property.
-			try {
-				elem.canPlayType(this.format.mp3.codec); // The type is irrelevant.
-				return true;
-			} catch(err) {
-				return false;
-			}
-		},
-		_uaBlocklist: function(list) {
-			// list : object with properties that are all regular expressions. Property names are irrelevant.
-			// Returns true if the user agent is matched in list.
-			var	ua = navigator.userAgent.toLowerCase(),
-				block = false;
-
-			$.each(list, function(p, re) {
-				if(re && re.test(ua)) {
-					block = true;
-					return false; // exit $.each.
-				}
-			});
-			return block;
-		},
-		_restrictNativeVideoControls: function() {
-			// Fallback to noFullScreen when nativeVideoControls is true and audio media is being used. Affects when both media types are used.
-			if(this.require.audio) {
-				if(this.status.nativeVideoControls) {
-					this.status.nativeVideoControls = false;
-					this.status.noFullScreen = true;
-				}
-			}
-		},
-		_updateNativeVideoControls: function() {
-			if(this.html.video.available && this.html.used) {
-				// Turn the HTML Video controls on/off
-				this.htmlElement.video.controls = this.status.nativeVideoControls;
-				// Show/hide the jPlayer GUI.
-				this._updateAutohide();
-				// For when option changed. The poster image is not updated, as it is dealt with in setMedia(). Acceptable degradation since seriously doubt these options will change on the fly. Can again review later.
-				if(this.status.nativeVideoControls && this.require.video) {
-					this.internal.poster.jq.hide();
-					this.internal.video.jq.css({'width': this.status.width, 'height': this.status.height});
-				} else if(this.status.waitForPlay && this.status.video) {
-					this.internal.poster.jq.show();
-					this.internal.video.jq.css({'width': '0px', 'height': '0px'});
-				}
-			}
-		},
-		_addHtmlEventListeners: function(mediaElement, entity) {
-			var self = this;
-			mediaElement.preload = this.options.preload;
-			mediaElement.muted = this.options.muted;
-			mediaElement.volume = this.options.volume;
-
-			// Create the event listeners
-			// Only want the active entity to affect jPlayer and bubble events.
-			// Using entity.gate so that object is referenced and gate property always current
-			
-			mediaElement.addEventListener("progress", function() {
-				if(entity.gate) {
-					self._getHtmlStatus(mediaElement);
-					self._updateInterface();
-					self._trigger($.jPlayer.event.progress);
-				}
-			}, false);
-			mediaElement.addEventListener("timeupdate", function() {
-				if(entity.gate) {
-					self._getHtmlStatus(mediaElement);
-					self._updateInterface();
-					self._trigger($.jPlayer.event.timeupdate);
-				}
-			}, false);
-			mediaElement.addEventListener("durationchange", function() {
-				if(entity.gate) {
-					self.status.duration = this.duration;
-					self._getHtmlStatus(mediaElement);
-					self._updateInterface();
-					self._trigger($.jPlayer.event.durationchange);
-				}
-			}, false);
-			mediaElement.addEventListener("play", function() {
-				if(entity.gate) {
-					self._updateButtons(true);
-					self._html_checkWaitForPlay(); // So the native controls update this variable and puts the hidden interface in the correct state. Affects toggling native controls.
-					self._trigger($.jPlayer.event.play);
-				}
-			}, false);
-			mediaElement.addEventListener("playing", function() {
-				if(entity.gate) {
-					self._updateButtons(true);
-					self._seeked();
-					self._trigger($.jPlayer.event.playing);
-				}
-			}, false);
-			mediaElement.addEventListener("pause", function() {
-				if(entity.gate) {
-					self._updateButtons(false);
-					self._trigger($.jPlayer.event.pause);
-				}
-			}, false);
-			mediaElement.addEventListener("waiting", function() {
-				if(entity.gate) {
-					self._seeking();
-					self._trigger($.jPlayer.event.waiting);
-				}
-			}, false);
-			mediaElement.addEventListener("seeking", function() {
-				if(entity.gate) {
-					self._seeking();
-					self._trigger($.jPlayer.event.seeking);
-				}
-			}, false);
-			mediaElement.addEventListener("seeked", function() {
-				if(entity.gate) {
-					self._seeked();
-					self._trigger($.jPlayer.event.seeked);
-				}
-			}, false);
-			mediaElement.addEventListener("volumechange", function() {
-				if(entity.gate) {
-					// Read the values back from the element as the Blackberry PlayBook shares the volume with the physical buttons master volume control.
-					// However, when tested 6th July 2011, those buttons do not generate an event. The physical play/pause button does though.
-					self.options.volume = mediaElement.volume;
-					self.options.muted = mediaElement.muted;
-					self._updateMute();
-					self._updateVolume();
-					self._trigger($.jPlayer.event.volumechange);
-				}
-			}, false);
-			mediaElement.addEventListener("suspend", function() { // Seems to be the only way of capturing that the iOS4 browser did not actually play the media from the page code. ie., It needs a user gesture.
-				if(entity.gate) {
-					self._seeked();
-					self._trigger($.jPlayer.event.suspend);
-				}
-			}, false);
-			mediaElement.addEventListener("ended", function() {
-				if(entity.gate) {
-					// Order of the next few commands are important. Change the time and then pause.
-					// Solves a bug in Firefox, where issuing pause 1st causes the media to play from the start. ie., The pause is ignored.
-					if(!$.jPlayer.browser.webkit) { // Chrome crashes if you do this in conjunction with a setMedia command in an ended event handler. ie., The playlist demo.
-						self.htmlElement.media.currentTime = 0; // Safari does not care about this command. ie., It works with or without this line. (Both Safari and Chrome are Webkit.)
-					}
-					self.htmlElement.media.pause(); // Pause otherwise a click on the progress bar will play from that point, when it shouldn't, since it stopped playback.
-					self._updateButtons(false);
-					self._getHtmlStatus(mediaElement, true); // With override true. Otherwise Chrome leaves progress at full.
-					self._updateInterface();
-					self._trigger($.jPlayer.event.ended);
-				}
-			}, false);
-			mediaElement.addEventListener("error", function() {
-				if(entity.gate) {
-					self._updateButtons(false);
-					self._seeked();
-					if(self.status.srcSet) { // Deals with case of clearMedia() causing an error event.
-						clearTimeout(self.internal.htmlDlyCmdId); // Clears any delayed commands used in the HTML solution.
-						self.status.waitForLoad = true; // Allows the load operation to try again.
-						self.status.waitForPlay = true; // Reset since a play was captured.
-						if(self.status.video && !self.status.nativeVideoControls) {
-							self.internal.video.jq.css({'width':'0px', 'height':'0px'});
-						}
-						if(self._validString(self.status.media.poster) && !self.status.nativeVideoControls) {
-							self.internal.poster.jq.show();
-						}
-						if(self.css.jq.videoPlay.length) {
-							self.css.jq.videoPlay.show();
-						}
-						self._error( {
-							type: $.jPlayer.error.URL,
-							context: self.status.src, // this.src shows absolute urls. Want context to show the url given.
-							message: $.jPlayer.errorMsg.URL,
-							hint: $.jPlayer.errorHint.URL
-						});
-					}
-				}
-			}, false);
-			// Create all the other event listeners that bubble up to a jPlayer event from html, without being used by jPlayer.
-			$.each($.jPlayer.htmlEvent, function(i, eventType) {
-				mediaElement.addEventListener(this, function() {
-					if(entity.gate) {
-						self._trigger($.jPlayer.event[eventType]);
-					}
-				}, false);
-			});
-		},
-		_getHtmlStatus: function(media, override) {
-			var ct = 0, d = 0, cpa = 0, sp = 0, cpr = 0;
-
-			if(media.duration) { // Fixes the duration bug in iOS, where the durationchange event occurs when media.duration is not always correct.
-				this.status.duration = media.duration;
-			}
-			ct = media.currentTime;
-			cpa = (this.status.duration > 0) ? 100 * ct / this.status.duration : 0;
-			if((typeof media.seekable === "object") && (media.seekable.length > 0)) {
-				sp = (this.status.duration > 0) ? 100 * media.seekable.end(media.seekable.length-1) / this.status.duration : 100;
-				cpr = 100 * media.currentTime / media.seekable.end(media.seekable.length-1);
-			} else {
-				sp = 100;
-				cpr = cpa;
-			}
-			
-			if(override) {
-				ct = 0;
-				cpr = 0;
-				cpa = 0;
-			}
-
-			this.status.seekPercent = sp;
-			this.status.currentPercentRelative = cpr;
-			this.status.currentPercentAbsolute = cpa;
-			this.status.currentTime = ct;
-
-			this.status.readyState = media.readyState;
-			this.status.networkState = media.networkState;
-			this.status.playbackRate = media.playbackRate;
-			this.status.ended = media.ended;
-		},
-		_resetStatus: function() {
-			this.status = $.extend({}, this.status, $.jPlayer.prototype.status); // Maintains the status properties that persist through a reset.
-		},
-		_trigger: function(eventType, error, warning) { // eventType always valid as called using $.jPlayer.event.eventType
-			var event = $.Event(eventType);
-			event.jPlayer = {};
-			event.jPlayer.version = $.extend({}, this.version);
-			event.jPlayer.options = $.extend(true, {}, this.options); // Deep copy
-			event.jPlayer.status = $.extend(true, {}, this.status); // Deep copy
-			event.jPlayer.html = $.extend(true, {}, this.html); // Deep copy
-			event.jPlayer.flash = $.extend(true, {}, this.flash); // Deep copy
-			if(error) {
-				event.jPlayer.error = $.extend({}, error);
-			}
-			if(warning) {
-				event.jPlayer.warning = $.extend({}, warning);
-			}
-			this.element.trigger(event);
-		},
-		jPlayerFlashEvent: function(eventType, status) { // Called from Flash
-			if(eventType === $.jPlayer.event.ready) {
-				if(!this.internal.ready) {
-					this.internal.ready = true;
-					this.internal.flash.jq.css({'width':'0px', 'height':'0px'}); // Once Flash generates the ready event, minimise to zero as it is not affected by wmode anymore.
-
-					this.version.flash = status.version;
-					if(this.version.needFlash !== this.version.flash) {
-						this._error( {
-							type: $.jPlayer.error.VERSION,
-							context: this.version.flash,
-							message: $.jPlayer.errorMsg.VERSION + this.version.flash,
-							hint: $.jPlayer.errorHint.VERSION
-						});
-					}
-					this._trigger($.jPlayer.event.repeat); // Trigger the repeat event so its handler can initialize itself with the loop option.
-					this._trigger(eventType);
-				} else {
-					// This condition occurs if the Flash is hidden and then shown again.
-					// Firefox also reloads the Flash if the CSS position changes. position:fixed is used for full screen.
-
-					// Only do this if the Flash is the solution being used at the moment. Affects Media players where both solution may be being used.
-					if(this.flash.gate) {
-
-						// Send the current status to the Flash now that it is ready (available) again.
-						if(this.status.srcSet) {
-
-							// Need to read original status before issuing the setMedia command.
-							var	currentTime = this.status.currentTime,
-								paused = this.status.paused; 
-
-							this.setMedia(this.status.media);
-							if(currentTime > 0) {
-								if(paused) {
-									this.pause(currentTime);
-								} else {
-									this.play(currentTime);
-								}
-							}
-						}
-						this._trigger($.jPlayer.event.flashreset);
-					}
-				}
-			}
-			if(this.flash.gate) {
-				switch(eventType) {
-					case $.jPlayer.event.progress:
-						this._getFlashStatus(status);
-						this._updateInterface();
-						this._trigger(eventType);
-						break;
-					case $.jPlayer.event.timeupdate:
-						this._getFlashStatus(status);
-						this._updateInterface();
-						this._trigger(eventType);
-						break;
-					case $.jPlayer.event.play:
-						this._seeked();
-						this._updateButtons(true);
-						this._trigger(eventType);
-						break;
-					case $.jPlayer.event.pause:
-						this._updateButtons(false);
-						this._trigger(eventType);
-						break;
-					case $.jPlayer.event.ended:
-						this._updateButtons(false);
-						this._trigger(eventType);
-						break;
-					case $.jPlayer.event.click:
-						this._trigger(eventType); // This could be dealt with by the default
-						break;
-					case $.jPlayer.event.error:
-						this.status.waitForLoad = true; // Allows the load operation to try again.
-						this.status.waitForPlay = true; // Reset since a play was captured.
-						if(this.status.video) {
-							this.internal.flash.jq.css({'width':'0px', 'height':'0px'});
-						}
-						if(this._validString(this.status.media.poster)) {
-							this.internal.poster.jq.show();
-						}
-						if(this.css.jq.videoPlay.length && this.status.video) {
-							this.css.jq.videoPlay.show();
-						}
-						if(this.status.video) { // Set up for another try. Execute before error event.
-							this._flash_setVideo(this.status.media);
-						} else {
-							this._flash_setAudio(this.status.media);
-						}
-						this._updateButtons(false);
-						this._error( {
-							type: $.jPlayer.error.URL,
-							context:status.src,
-							message: $.jPlayer.errorMsg.URL,
-							hint: $.jPlayer.errorHint.URL
-						});
-						break;
-					case $.jPlayer.event.seeking:
-						this._seeking();
-						this._trigger(eventType);
-						break;
-					case $.jPlayer.event.seeked:
-						this._seeked();
-						this._trigger(eventType);
-						break;
-					case $.jPlayer.event.ready:
-						// The ready event is handled outside the switch statement.
-						// Captured here otherwise 2 ready events would be generated if the ready event handler used setMedia.
-						break;
-					default:
-						this._trigger(eventType);
-				}
-			}
-			return false;
-		},
-		_getFlashStatus: function(status) {
-			this.status.seekPercent = status.seekPercent;
-			this.status.currentPercentRelative = status.currentPercentRelative;
-			this.status.currentPercentAbsolute = status.currentPercentAbsolute;
-			this.status.currentTime = status.currentTime;
-			this.status.duration = status.duration;
-
-			// The Flash does not generate this information in this release
-			this.status.readyState = 4; // status.readyState;
-			this.status.networkState = 0; // status.networkState;
-			this.status.playbackRate = 1; // status.playbackRate;
-			this.status.ended = false; // status.ended;
-		},
-		_updateButtons: function(playing) {
-			if(playing !== undefined) {
-				this.status.paused = !playing;
-				if(this.css.jq.play.length && this.css.jq.pause.length) {
-					if(playing) {
-						this.css.jq.play.hide();
-						this.css.jq.pause.show();
-					} else {
-						this.css.jq.play.show();
-						this.css.jq.pause.hide();
-					}
-				}
-			}
-			if(this.css.jq.restoreScreen.length && this.css.jq.fullScreen.length) {
-				if(this.status.noFullScreen) {
-					this.css.jq.fullScreen.hide();
-					this.css.jq.restoreScreen.hide();
-				} else if(this.options.fullScreen) {
-					this.css.jq.fullScreen.hide();
-					this.css.jq.restoreScreen.show();
-				} else {
-					this.css.jq.fullScreen.show();
-					this.css.jq.restoreScreen.hide();
-				}
-			}
-			if(this.css.jq.repeat.length && this.css.jq.repeatOff.length) {
-				if(this.options.loop) {
-					this.css.jq.repeat.hide();
-					this.css.jq.repeatOff.show();
-				} else {
-					this.css.jq.repeat.show();
-					this.css.jq.repeatOff.hide();
-				}
-			}
-		},
-		_updateInterface: function() {
-			if(this.css.jq.seekBar.length) {
-				this.css.jq.seekBar.width(this.status.seekPercent+"%");
-			}
-			if(this.css.jq.playBar.length) {
-				this.css.jq.playBar.width(this.status.currentPercentRelative+"%");
-			}
-			if(this.css.jq.currentTime.length) {
-				this.css.jq.currentTime.text($.jPlayer.convertTime(this.status.currentTime));
-			}
-			if(this.css.jq.duration.length) {
-				this.css.jq.duration.text($.jPlayer.convertTime(this.status.duration));
-			}
-		},
-		_seeking: function() {
-			if(this.css.jq.seekBar.length) {
-				this.css.jq.seekBar.addClass("jp-seeking-bg");
-			}
-		},
-		_seeked: function() {
-			if(this.css.jq.seekBar.length) {
-				this.css.jq.seekBar.removeClass("jp-seeking-bg");
-			}
-		},
-		_resetGate: function() {
-			this.html.audio.gate = false;
-			this.html.video.gate = false;
-			this.flash.gate = false;
-		},
-		_resetActive: function() {
-			this.html.active = false;
-			this.flash.active = false;
-		},
-		setMedia: function(media) {
-		
-			/*	media[format] = String: URL of format. Must contain all of the supplied option's video or audio formats.
-			 *	media.poster = String: Video poster URL.
-			 *	media.subtitles = String: * NOT IMPLEMENTED * URL of subtitles SRT file
-			 *	media.chapters = String: * NOT IMPLEMENTED * URL of chapters SRT file
-			 *	media.stream = Boolean: * NOT IMPLEMENTED * Designating actual media streams. ie., "false/undefined" for files. Plan to refresh the flash every so often.
-			 */
-
-			var	self = this,
-				supported = false,
-				posterChanged = this.status.media.poster !== media.poster; // Compare before reset. Important for OSX Safari as this.htmlElement.poster.src is absolute, even if original poster URL was relative.
-
-			this._resetMedia();
-			this._resetGate();
-			this._resetActive();
-
-			$.each(this.formats, function(formatPriority, format) {
-				var isVideo = self.format[format].media === 'video';
-				$.each(self.solutions, function(solutionPriority, solution) {
-					if(self[solution].support[format] && self._validString(media[format])) { // Format supported in solution and url given for format.
-						var isHtml = solution === 'html';
-
-						if(isVideo) {
-							if(isHtml) {
-								self.html.video.gate = true;
-								self._html_setVideo(media);
-								self.html.active = true;
-							} else {
-								self.flash.gate = true;
-								self._flash_setVideo(media);
-								self.flash.active = true;
-							}
-							if(self.css.jq.videoPlay.length) {
-								self.css.jq.videoPlay.show();
-							}
-							self.status.video = true;
-						} else {
-							if(isHtml) {
-								self.html.audio.gate = true;
-								self._html_setAudio(media);
-								self.html.active = true;
-							} else {
-								self.flash.gate = true;
-								self._flash_setAudio(media);
-								self.flash.active = true;
-							}
-							if(self.css.jq.videoPlay.length) {
-								self.css.jq.videoPlay.hide();
-							}
-							self.status.video = false;
-						}
-						
-						supported = true;
-						return false; // Exit $.each
-					}
-				});
-				if(supported) {
-					return false; // Exit $.each
-				}
-			});
-
-			if(supported) {
-				if(!(this.status.nativeVideoControls && this.html.video.gate)) {
-					// Set poster IMG if native video controls are not being used
-					// Note: With IE the IMG onload event occurs immediately when cached.
-					// Note: Poster hidden by default in _resetMedia()
-					if(this._validString(media.poster)) {
-						if(posterChanged) { // Since some browsers do not generate img onload event.
-							this.htmlElement.poster.src = media.poster;
-						} else {
-							this.internal.poster.jq.show();
-						}
-					}
-				}
-				this.status.srcSet = true;
-				this.status.media = $.extend({}, media);
-				this._updateButtons(false);
-				this._updateInterface();
-			} else { // jPlayer cannot support any formats provided in this browser
-				// Send an error event
-				this._error( {
-					type: $.jPlayer.error.NO_SUPPORT,
-					context: "{supplied:'" + this.options.supplied + "'}",
-					message: $.jPlayer.errorMsg.NO_SUPPORT,
-					hint: $.jPlayer.errorHint.NO_SUPPORT
-				});
-			}
-		},
-		_resetMedia: function() {
-			this._resetStatus();
-			this._updateButtons(false);
-			this._updateInterface();
-			this._seeked();
-			this.internal.poster.jq.hide();
-
-			clearTimeout(this.internal.htmlDlyCmdId);
-
-			if(this.html.active) {
-				this._html_resetMedia();
-			} else if(this.flash.active) {
-				this._flash_resetMedia();
-			}
-		},
-		clearMedia: function() {
-			this._resetMedia();
-
-			if(this.html.active) {
-				this._html_clearMedia();
-			} else if(this.flash.active) {
-				this._flash_clearMedia();
-			}
-
-			this._resetGate();
-			this._resetActive();
-		},
-		load: function() {
-			if(this.status.srcSet) {
-				if(this.html.active) {
-					this._html_load();
-				} else if(this.flash.active) {
-					this._flash_load();
-				}
-			} else {
-				this._urlNotSetError("load");
-			}
-		},
-		play: function(time) {
-			time = (typeof time === "number") ? time : NaN; // Remove jQuery event from click handler
-			if(this.status.srcSet) {
-				if(this.html.active) {
-					this._html_play(time);
-				} else if(this.flash.active) {
-					this._flash_play(time);
-				}
-			} else {
-				this._urlNotSetError("play");
-			}
-		},
-		videoPlay: function(e) { // Handles clicks on the play button over the video poster
-			this.play();
-		},
-		pause: function(time) {
-			time = (typeof time === "number") ? time : NaN; // Remove jQuery event from click handler
-			if(this.status.srcSet) {
-				if(this.html.active) {
-					this._html_pause(time);
-				} else if(this.flash.active) {
-					this._flash_pause(time);
-				}
-			} else {
-				this._urlNotSetError("pause");
-			}
-		},
-		pauseOthers: function() {
-			var self = this;
-			$.each(this.instances, function(i, element) {
-				if(self.element !== element) { // Do not this instance.
-					if(element.data("jPlayer").status.srcSet) { // Check that media is set otherwise would cause error event.
-						element.jPlayer("pause");
-					}
-				}
-			});
-		},
-		stop: function() {
-			if(this.status.srcSet) {
-				if(this.html.active) {
-					this._html_pause(0);
-				} else if(this.flash.active) {
-					this._flash_pause(0);
-				}
-			} else {
-				this._urlNotSetError("stop");
-			}
-		},
-		playHead: function(p) {
-			p = this._limitValue(p, 0, 100);
-			if(this.status.srcSet) {
-				if(this.html.active) {
-					this._html_playHead(p);
-				} else if(this.flash.active) {
-					this._flash_playHead(p);
-				}
-			} else {
-				this._urlNotSetError("playHead");
-			}
-		},
-		_muted: function(muted) {
-			this.options.muted = muted;
-			if(this.html.used) {
-				this._html_mute(muted);
-			}
-			if(this.flash.used) {
-				this._flash_mute(muted);
-			}
-
-			// The HTML solution generates this event from the media element itself.
-			if(!this.html.video.gate && !this.html.audio.gate) {
-				this._updateMute(muted);
-				this._updateVolume(this.options.volume);
-				this._trigger($.jPlayer.event.volumechange);
-			}
-		},
-		mute: function(mute) { // mute is either: undefined (true), an event object (true) or a boolean (muted).
-			mute = mute === undefined ? true : !!mute;
-			this._muted(mute);
-		},
-		unmute: function(unmute) { // unmute is either: undefined (true), an event object (true) or a boolean (!muted).
-			unmute = unmute === undefined ? true : !!unmute;
-			this._muted(!unmute);
-		},
-		_updateMute: function(mute) {
-			if(mute === undefined) {
-				mute = this.options.muted;
-			}
-			if(this.css.jq.mute.length && this.css.jq.unmute.length) {
-				if(this.status.noVolume) {
-					this.css.jq.mute.hide();
-					this.css.jq.unmute.hide();
-				} else if(mute) {
-					this.css.jq.mute.hide();
-					this.css.jq.unmute.show();
-				} else {
-					this.css.jq.mute.show();
-					this.css.jq.unmute.hide();
-				}
-			}
-		},
-		volume: function(v) {
-			v = this._limitValue(v, 0, 1);
-			this.options.volume = v;
-
-			if(this.html.used) {
-				this._html_volume(v);
-			}
-			if(this.flash.used) {
-				this._flash_volume(v);
-			}
-
-			// The HTML solution generates this event from the media element itself.
-			if(!this.html.video.gate && !this.html.audio.gate) {
-				this._updateVolume(v);
-				this._trigger($.jPlayer.event.volumechange);
-			}
-		},
-		volumeBar: function(e) { // Handles clicks on the volumeBar
-			if(this.css.jq.volumeBar.length) {
-				var	offset = this.css.jq.volumeBar.offset(),
-					x = e.pageX - offset.left,
-					w = this.css.jq.volumeBar.width(),
-					y = this.css.jq.volumeBar.height() - e.pageY + offset.top,
-					h = this.css.jq.volumeBar.height();
-
-				if(this.options.verticalVolume) {
-					this.volume(y/h);
-				} else {
-					this.volume(x/w);
-				}
-			}
-			if(this.options.muted) {
-				this._muted(false);
-			}
-		},
-		volumeBarValue: function(e) { // Handles clicks on the volumeBarValue
-			this.volumeBar(e);
-		},
-		_updateVolume: function(v) {
-			if(v === undefined) {
-				v = this.options.volume;
-			}
-			v = this.options.muted ? 0 : v;
-
-			if(this.status.noVolume) {
-				if(this.css.jq.volumeBar.length) {
-					this.css.jq.volumeBar.hide();
-				}
-				if(this.css.jq.volumeBarValue.length) {
-					this.css.jq.volumeBarValue.hide();
-				}
-				if(this.css.jq.volumeMax.length) {
-					this.css.jq.volumeMax.hide();
-				}
-			} else {
-				if(this.css.jq.volumeBar.length) {
-					this.css.jq.volumeBar.show();
-				}
-				if(this.css.jq.volumeBarValue.length) {
-					this.css.jq.volumeBarValue.show();
-					this.css.jq.volumeBarValue[this.options.verticalVolume ? "height" : "width"]((v*100)+"%");
-				}
-				if(this.css.jq.volumeMax.length) {
-					this.css.jq.volumeMax.show();
-				}
-			}
-		},
-		volumeMax: function() { // Handles clicks on the volume max
-			this.volume(1);
-			if(this.options.muted) {
-				this._muted(false);
-			}
-		},
-		_cssSelectorAncestor: function(ancestor) {
-			var self = this;
-			this.options.cssSelectorAncestor = ancestor;
-			this._removeUiClass();
-			this.ancestorJq = ancestor ? $(ancestor) : []; // Would use $() instead of [], but it is only 1.4+
-			if(ancestor && this.ancestorJq.length !== 1) { // So empty strings do not generate the warning.
-				this._warning( {
-					type: $.jPlayer.warning.CSS_SELECTOR_COUNT,
-					context: ancestor,
-					message: $.jPlayer.warningMsg.CSS_SELECTOR_COUNT + this.ancestorJq.length + " found for cssSelectorAncestor.",
-					hint: $.jPlayer.warningHint.CSS_SELECTOR_COUNT
-				});
-			}
-			this._addUiClass();
-			$.each(this.options.cssSelector, function(fn, cssSel) {
-				self._cssSelector(fn, cssSel);
-			});
-		},
-		_cssSelector: function(fn, cssSel) {
-			var self = this;
-			if(typeof cssSel === 'string') {
-				if($.jPlayer.prototype.options.cssSelector[fn]) {
-					if(this.css.jq[fn] && this.css.jq[fn].length) {
-						this.css.jq[fn].unbind(".jPlayer");
-					}
-					this.options.cssSelector[fn] = cssSel;
-					this.css.cs[fn] = this.options.cssSelectorAncestor + " " + cssSel;
-
-					if(cssSel) { // Checks for empty string
-						this.css.jq[fn] = $(this.css.cs[fn]);
-					} else {
-						this.css.jq[fn] = []; // To comply with the css.jq[fn].length check before its use. As of jQuery 1.4 could have used $() for an empty set. 
-					}
-
-					if(this.css.jq[fn].length) {
-						var handler = function(e) {
-							self[fn](e);
-							$(this).blur();
-							return false;
-						};
-						this.css.jq[fn].bind("click.jPlayer", handler); // Using jPlayer namespace
-					}
-
-					if(cssSel && this.css.jq[fn].length !== 1) { // So empty strings do not generate the warning. ie., they just remove the old one.
-						this._warning( {
-							type: $.jPlayer.warning.CSS_SELECTOR_COUNT,
-							context: this.css.cs[fn],
-							message: $.jPlayer.warningMsg.CSS_SELECTOR_COUNT + this.css.jq[fn].length + " found for " + fn + " method.",
-							hint: $.jPlayer.warningHint.CSS_SELECTOR_COUNT
-						});
-					}
-				} else {
-					this._warning( {
-						type: $.jPlayer.warning.CSS_SELECTOR_METHOD,
-						context: fn,
-						message: $.jPlayer.warningMsg.CSS_SELECTOR_METHOD,
-						hint: $.jPlayer.warningHint.CSS_SELECTOR_METHOD
-					});
-				}
-			} else {
-				this._warning( {
-					type: $.jPlayer.warning.CSS_SELECTOR_STRING,
-					context: cssSel,
-					message: $.jPlayer.warningMsg.CSS_SELECTOR_STRING,
-					hint: $.jPlayer.warningHint.CSS_SELECTOR_STRING
-				});
-			}
-		},
-		seekBar: function(e) { // Handles clicks on the seekBar
-			if(this.css.jq.seekBar) {
-				var offset = this.css.jq.seekBar.offset();
-				var x = e.pageX - offset.left;
-				var w = this.css.jq.seekBar.width();
-				var p = 100*x/w;
-				this.playHead(p);
-			}
-		},
-		playBar: function(e) { // Handles clicks on the playBar
-			this.seekBar(e);
-		},
-		repeat: function() { // Handle clicks on the repeat button
-			this._loop(true);
-		},
-		repeatOff: function() { // Handle clicks on the repeatOff button
-			this._loop(false);
-		},
-		_loop: function(loop) {
-			if(this.options.loop !== loop) {
-				this.options.loop = loop;
-				this._updateButtons();
-				this._trigger($.jPlayer.event.repeat);
-			}
-		},
-
-		// Plan to review the cssSelector method to cope with missing associated functions accordingly.
-
-		currentTime: function(e) { // Handles clicks on the text
-			// Added to avoid errors using cssSelector system for the text
-		},
-		duration: function(e) { // Handles clicks on the text
-			// Added to avoid errors using cssSelector system for the text
-		},
-		gui: function(e) { // Handles clicks on the gui
-			// Added to avoid errors using cssSelector system for the gui
-		},
-		noSolution: function(e) { // Handles clicks on the error message
-			// Added to avoid errors using cssSelector system for no-solution
-		},
-
-		// Options code adapted from ui.widget.js (1.8.7).  Made changes so the key can use dot notation. To match previous getData solution in jPlayer 1.
-		option: function(key, value) {
-			var options = key;
-
-			 // Enables use: options().  Returns a copy of options object
-			if ( arguments.length === 0 ) {
-				return $.extend( true, {}, this.options );
-			}
-
-			if(typeof key === "string") {
-				var keys = key.split(".");
-
-				 // Enables use: options("someOption")  Returns a copy of the option. Supports dot notation.
-				if(value === undefined) {
-
-					var opt = $.extend(true, {}, this.options);
-					for(var i = 0; i < keys.length; i++) {
-						if(opt[keys[i]] !== undefined) {
-							opt = opt[keys[i]];
-						} else {
-							this._warning( {
-								type: $.jPlayer.warning.OPTION_KEY,
-								context: key,
-								message: $.jPlayer.warningMsg.OPTION_KEY,
-								hint: $.jPlayer.warningHint.OPTION_KEY
-							});
-							return undefined;
-						}
-					}
-					return opt;
-				}
-
-				 // Enables use: options("someOptionObject", someObject}).  Creates: {someOptionObject:someObject}
-				 // Enables use: options("someOption", someValue).  Creates: {someOption:someValue}
-				 // Enables use: options("someOptionObject.someOption", someValue).  Creates: {someOptionObject:{someOption:someValue}}
-
-				options = {};
-				var opts = options;
-
-				for(var j = 0; j < keys.length; j++) {
-					if(j < keys.length - 1) {
-						opts[keys[j]] = {};
-						opts = opts[keys[j]];
-					} else {
-						opts[keys[j]] = value;
-					}
-				}
-			}
-
-			 // Otherwise enables use: options(optionObject).  Uses original object (the key)
-
-			this._setOptions(options);
-
-			return this;
-		},
-		_setOptions: function(options) {
-			var self = this;
-			$.each(options, function(key, value) { // This supports the 2 level depth that the options of jPlayer has. Would review if we ever need more depth.
-				self._setOption(key, value);
-			});
-
-			return this;
-		},
-		_setOption: function(key, value) {
-			var self = this;
-
-			// The ability to set options is limited at this time.
-
-			switch(key) {
-				case "volume" :
-					this.volume(value);
-					break;
-				case "muted" :
-					this._muted(value);
-					break;
-				case "cssSelectorAncestor" :
-					this._cssSelectorAncestor(value); // Set and refresh all associations for the new ancestor.
-					break;
-				case "cssSelector" :
-					$.each(value, function(fn, cssSel) {
-						self._cssSelector(fn, cssSel); // NB: The option is set inside this function, after further validity checks.
-					});
-					break;
-				case "fullScreen" :
-					if(this.options[key] !== value) { // if changed
-						this._removeUiClass();
-						this.options[key] = value;
-						this._refreshSize();
-					}
-					break;
-				case "size" :
-					if(!this.options.fullScreen && this.options[key].cssClass !== value.cssClass) {
-						this._removeUiClass();
-					}
-					this.options[key] = $.extend({}, this.options[key], value); // store a merged copy of it, incase not all properties changed.
-					this._refreshSize();
-					break;
-				case "sizeFull" :
-					if(this.options.fullScreen && this.options[key].cssClass !== value.cssClass) {
-						this._removeUiClass();
-					}
-					this.options[key] = $.extend({}, this.options[key], value); // store a merged copy of it, incase not all properties changed.
-					this._refreshSize();
-					break;
-				case "autohide" :
-					this.options[key] = $.extend({}, this.options[key], value); // store a merged copy of it, incase not all properties changed.
-					this._updateAutohide();
-					break;
-				case "loop" :
-					this._loop(value);
-					break;
-				case "nativeVideoControls" :
-					this.options[key] = $.extend({}, this.options[key], value); // store a merged copy of it, incase not all properties changed.
-					this.status.nativeVideoControls = this._uaBlocklist(this.options.nativeVideoControls);
-					this._restrictNativeVideoControls();
-					this._updateNativeVideoControls();
-					break;
-				case "noFullScreen" :
-					this.options[key] = $.extend({}, this.options[key], value); // store a merged copy of it, incase not all properties changed.
-					this.status.nativeVideoControls = this._uaBlocklist(this.options.nativeVideoControls); // Need to check again as noFullScreen can depend on this flag and the restrict() can override it.
-					this.status.noFullScreen = this._uaBlocklist(this.options.noFullScreen);
-					this._restrictNativeVideoControls();
-					this._updateButtons();
-					break;
-				case "noVolume" :
-					this.options[key] = $.extend({}, this.options[key], value); // store a merged copy of it, incase not all properties changed.
-					this.status.noVolume = this._uaBlocklist(this.options.noVolume);
-					this._updateVolume();
-					this._updateMute();
-					break;
-				case "emulateHtml" :
-					if(this.options[key] !== value) { // To avoid multiple event handlers being created, if true already.
-						this.options[key] = value;
-						if(value) {
-							this._emulateHtmlBridge();
-						} else {
-							this._destroyHtmlBridge();
-						}
-					}
-					break;
-			}
-
-			return this;
-		},
-		// End of: (Options code adapted from ui.widget.js)
-
-		_refreshSize: function() {
-			this._setSize(); // update status and jPlayer element size
-			this._addUiClass(); // update the ui class
-			this._updateSize(); // update internal sizes
-			this._updateButtons();
-			this._updateAutohide();
-			this._trigger($.jPlayer.event.resize);
-		},
-		_setSize: function() {
-			// Determine the current size from the options
-			if(this.options.fullScreen) {
-				this.status.width = this.options.sizeFull.width;
-				this.status.height = this.options.sizeFull.height;
-				this.status.cssClass = this.options.sizeFull.cssClass;
-			} else {
-				this.status.width = this.options.size.width;
-				this.status.height = this.options.size.height;
-				this.status.cssClass = this.options.size.cssClass;
-			}
-
-			// Set the size of the jPlayer area.
-			this.element.css({'width': this.status.width, 'height': this.status.height});
-		},
-		_addUiClass: function() {
-			if(this.ancestorJq.length) {
-				this.ancestorJq.addClass(this.status.cssClass);
-			}
-		},
-		_removeUiClass: function() {
-			if(this.ancestorJq.length) {
-				this.ancestorJq.removeClass(this.status.cssClass);
-			}
-		},
-		_updateSize: function() {
-			// The poster uses show/hide so can simply resize it.
-			this.internal.poster.jq.css({'width': this.status.width, 'height': this.status.height});
-
-			// Video html or flash resized if necessary at this time, or if native video controls being used.
-			if(!this.status.waitForPlay && this.html.active && this.status.video || this.html.video.available && this.html.used && this.status.nativeVideoControls) {
-				this.internal.video.jq.css({'width': this.status.width, 'height': this.status.height});
-			}
-			else if(!this.status.waitForPlay && this.flash.active && this.status.video) {
-				this.internal.flash.jq.css({'width': this.status.width, 'height': this.status.height});
-			}
-		},
-		_updateAutohide: function() {
-			var	self = this,
-				event = "mousemove.jPlayer",
-				namespace = ".jPlayerAutohide",
-				eventType = event + namespace,
-				handler = function() {
-					self.css.jq.gui.fadeIn(self.options.autohide.fadeIn, function() {
-						clearTimeout(self.internal.autohideId);
-						self.internal.autohideId = setTimeout( function() {
-							self.css.jq.gui.fadeOut(self.options.autohide.fadeOut);
-						}, self.options.autohide.hold);
-					});
-				};
-
-			if(this.css.jq.gui.length) {
-
-				// End animations first so that its callback is executed now.
-				// Otherwise an in progress fadeIn animation still has the callback to fadeOut again.
-				this.css.jq.gui.stop(true, true);
-
-				// Removes the fadeOut operation from the fadeIn callback.
-				clearTimeout(this.internal.autohideId);
-
-				this.element.unbind(namespace);
-				this.css.jq.gui.unbind(namespace);
-
-				if(!this.status.nativeVideoControls) {
-					if(this.options.fullScreen && this.options.autohide.full || !this.options.fullScreen && this.options.autohide.restored) {
-						this.element.bind(eventType, handler);
-						this.css.jq.gui.bind(eventType, handler);
-						this.css.jq.gui.hide();
-					} else {
-						this.css.jq.gui.show();
-					}
-				} else {
-					this.css.jq.gui.hide();
-				}
-			}
-		},
-		fullScreen: function() {
-			this._setOption("fullScreen", true);
-		},
-		restoreScreen: function() {
-			this._setOption("fullScreen", false);
-		},
-		_html_initMedia: function() {
-			this.htmlElement.media.src = this.status.src;
-
-			if(this.options.preload !== 'none') {
-				this._html_load(); // See function for comments
-			}
-			this._trigger($.jPlayer.event.timeupdate); // The flash generates this event for its solution.
-		},
-		_html_setAudio: function(media) {
-			var self = this;
-			// Always finds a format due to checks in setMedia()
-			$.each(this.formats, function(priority, format) {
-				if(self.html.support[format] && media[format]) {
-					self.status.src = media[format];
-					self.status.format[format] = true;
-					self.status.formatType = format;
-					return false;
-				}
-			});
-			this.htmlElement.media = this.htmlElement.audio;
-			this._html_initMedia();
-		},
-		_html_setVideo: function(media) {
-			var self = this;
-			// Always finds a format due to checks in setMedia()
-			$.each(this.formats, function(priority, format) {
-				if(self.html.support[format] && media[format]) {
-					self.status.src = media[format];
-					self.status.format[format] = true;
-					self.status.formatType = format;
-					return false;
-				}
-			});
-			if(this.status.nativeVideoControls) {
-				this.htmlElement.video.poster = this._validString(media.poster) ? media.poster : "";
-			}
-			this.htmlElement.media = this.htmlElement.video;
-			this._html_initMedia();
-		},
-		_html_resetMedia: function() {
-			if(this.htmlElement.media) {
-				if(this.htmlElement.media.id === this.internal.video.id && !this.status.nativeVideoControls) {
-					this.internal.video.jq.css({'width':'0px', 'height':'0px'});
-				}
-				this.htmlElement.media.pause();
-			}
-		},
-		_html_clearMedia: function() {
-			if(this.htmlElement.media) {
-				this.htmlElement.media.src = "";
-				this.htmlElement.media.load(); // Stops an old, "in progress" download from continuing the download. Triggers the loadstart, error and emptied events, due to the empty src. Also an abort event if a download was in progress.
-			}
-		},
-		_html_load: function() {
-			// This function remains to allow the early HTML5 browsers to work, such as Firefox 3.6
-			// A change in the W3C spec for the media.load() command means that this is no longer necessary.
-			// This command should be removed and actually causes minor undesirable effects on some browsers. Such as loading the whole file and not only the metadata.
-			if(this.status.waitForLoad) {
-				this.status.waitForLoad = false;
-				this.htmlElement.media.load();
-			}
-			clearTimeout(this.internal.htmlDlyCmdId);
-		},
-		_html_play: function(time) {
-			var self = this;
-			this._html_load(); // Loads if required and clears any delayed commands.
-
-			this.htmlElement.media.play(); // Before currentTime attempt otherwise Firefox 4 Beta never loads.
-
-			if(!isNaN(time)) {
-				try {
-					this.htmlElement.media.currentTime = time;
-				} catch(err) {
-					this.internal.htmlDlyCmdId = setTimeout(function() {
-						self.play(time);
-					}, 100);
-					return; // Cancel execution and wait for the delayed command.
-				}
-			}
-			this._html_checkWaitForPlay();
-		},
-		_html_pause: function(time) {
-			var self = this;
-			
-			if(time > 0) { // We do not want the stop() command, which does pause(0), causing a load operation.
-				this._html_load(); // Loads if required and clears any delayed commands.
-			} else {
-				clearTimeout(this.internal.htmlDlyCmdId);
-			}
-
-			// Order of these commands is important for Safari (Win) and IE9. Pause then change currentTime.
-			this.htmlElement.media.pause();
-
-			if(!isNaN(time)) {
-				try {
-					this.htmlElement.media.currentTime = time;
-				} catch(err) {
-					this.internal.htmlDlyCmdId = setTimeout(function() {
-						self.pause(time);
-					}, 100);
-					return; // Cancel execution and wait for the delayed command.
-				}
-			}
-			if(time > 0) { // Avoids a setMedia() followed by stop() or pause(0) hiding the video play button.
-				this._html_checkWaitForPlay();
-			}
-		},
-		_html_playHead: function(percent) {
-			var self = this;
-			this._html_load(); // Loads if required and clears any delayed commands.
-			try {
-				if((typeof this.htmlElement.media.seekable === "object") && (this.htmlElement.media.seekable.length > 0)) {
-					this.htmlElement.media.currentTime = percent * this.htmlElement.media.seekable.end(this.htmlElement.media.seekable.length-1) / 100;
-				} else if(this.htmlElement.media.duration > 0 && !isNaN(this.htmlElement.media.duration)) {
-					this.htmlElement.media.currentTime = percent * this.htmlElement.media.duration / 100;
-				} else {
-					throw "e";
-				}
-			} catch(err) {
-				this.internal.htmlDlyCmdId = setTimeout(function() {
-					self.playHead(percent);
-				}, 100);
-				return; // Cancel execution and wait for the delayed command.
-			}
-			if(!this.status.waitForLoad) {
-				this._html_checkWaitForPlay();
-			}
-		},
-		_html_checkWaitForPlay: function() {
-			if(this.status.waitForPlay) {
-				this.status.waitForPlay = false;
-				if(this.css.jq.videoPlay.length) {
-					this.css.jq.videoPlay.hide();
-				}
-				if(this.status.video) {
-					this.internal.poster.jq.hide();
-					this.internal.video.jq.css({'width': this.status.width, 'height': this.status.height});
-				}
-			}
-		},
-		_html_volume: function(v) {
-			if(this.html.audio.available) {
-				this.htmlElement.audio.volume = v;
-			}
-			if(this.html.video.available) {
-				this.htmlElement.video.volume = v;
-			}
-		},
-		_html_mute: function(m) {
-			if(this.html.audio.available) {
-				this.htmlElement.audio.muted = m;
-			}
-			if(this.html.video.available) {
-				this.htmlElement.video.muted = m;
-			}
-		},
-		_flash_setAudio: function(media) {
-			var self = this;
-			try {
-				// Always finds a format due to checks in setMedia()
-				$.each(this.formats, function(priority, format) {
-					if(self.flash.support[format] && media[format]) {
-						switch (format) {
-							case "m4a" :
-							case "fla" :
-								self._getMovie().fl_setAudio_m4a(media[format]);
-								break;
-							case "mp3" :
-								self._getMovie().fl_setAudio_mp3(media[format]);
-								break;
-						}
-						self.status.src = media[format];
-						self.status.format[format] = true;
-						self.status.formatType = format;
-						return false;
-					}
-				});
-
-				if(this.options.preload === 'auto') {
-					this._flash_load();
-					this.status.waitForLoad = false;
-				}
-			} catch(err) { this._flashError(err); }
-		},
-		_flash_setVideo: function(media) {
-			var self = this;
-			try {
-				// Always finds a format due to checks in setMedia()
-				$.each(this.formats, function(priority, format) {
-					if(self.flash.support[format] && media[format]) {
-						switch (format) {
-							case "m4v" :
-							case "flv" :
-								self._getMovie().fl_setVideo_m4v(media[format]);
-								break;
-						}
-						self.status.src = media[format];
-						self.status.format[format] = true;
-						self.status.formatType = format;
-						return false;
-					}
-				});
-
-				if(this.options.preload === 'auto') {
-					this._flash_load();
-					this.status.waitForLoad = false;
-				}
-			} catch(err) { this._flashError(err); }
-		},
-		_flash_resetMedia: function() {
-			this.internal.flash.jq.css({'width':'0px', 'height':'0px'}); // Must do via CSS as setting attr() to zero causes a jQuery error in IE.
-			this._flash_pause(NaN);
-		},
-		_flash_clearMedia: function() {
-			try {
-				this._getMovie().fl_clearMedia();
-			} catch(err) { this._flashError(err); }
-		},
-		_flash_load: function() {
-			try {
-				this._getMovie().fl_load();
-			} catch(err) { this._flashError(err); }
-			this.status.waitForLoad = false;
-		},
-		_flash_play: function(time) {
-			try {
-				this._getMovie().fl_play(time);
-			} catch(err) { this._flashError(err); }
-			this.status.waitForLoad = false;
-			this._flash_checkWaitForPlay();
-		},
-		_flash_pause: function(time) {
-			try {
-				this._getMovie().fl_pause(time);
-			} catch(err) { this._flashError(err); }
-			if(time > 0) { // Avoids a setMedia() followed by stop() or pause(0) hiding the video play button.
-				this.status.waitForLoad = false;
-				this._flash_checkWaitForPlay();
-			}
-		},
-		_flash_playHead: function(p) {
-			try {
-				this._getMovie().fl_play_head(p);
-			} catch(err) { this._flashError(err); }
-			if(!this.status.waitForLoad) {
-				this._flash_checkWaitForPlay();
-			}
-		},
-		_flash_checkWaitForPlay: function() {
-			if(this.status.waitForPlay) {
-				this.status.waitForPlay = false;
-				if(this.css.jq.videoPlay.length) {
-					this.css.jq.videoPlay.hide();
-				}
-				if(this.status.video) {
-					this.internal.poster.jq.hide();
-					this.internal.flash.jq.css({'width': this.status.width, 'height': this.status.height});
-				}
-			}
-		},
-		_flash_volume: function(v) {
-			try {
-				this._getMovie().fl_volume(v);
-			} catch(err) { this._flashError(err); }
-		},
-		_flash_mute: function(m) {
-			try {
-				this._getMovie().fl_mute(m);
-			} catch(err) { this._flashError(err); }
-		},
-		_getMovie: function() {
-			return document[this.internal.flash.id];
-		},
-		_checkForFlash: function (version) {
-			// Function checkForFlash adapted from FlashReplace by Robert Nyman
-			// http://code.google.com/p/flashreplace/
-			var flashIsInstalled = false;
-			var flash;
-			if(window.ActiveXObject){
-				try{
-					flash = new ActiveXObject(("ShockwaveFlash.ShockwaveFlash." + version));
-					flashIsInstalled = true;
-				}
-				catch(e){
-					// Throws an error if the version isn't available			
-				}
-			}
-			else if(navigator.plugins && navigator.mimeTypes.length > 0){
-				flash = navigator.plugins["Shockwave Flash"];
-				if(flash){
-					var flashVersion = navigator.plugins["Shockwave Flash"].description.replace(/.*\s(\d+\.\d+).*/, "$1");
-					if(flashVersion >= version){
-						flashIsInstalled = true;
-					}
-				}
-			}
-			return flashIsInstalled;
-		},
-		_validString: function(url) {
-			return (url && typeof url === "string"); // Empty strings return false
-		},
-		_limitValue: function(value, min, max) {
-			return (value < min) ? min : ((value > max) ? max : value);
-		},
-		_urlNotSetError: function(context) {
-			this._error( {
-				type: $.jPlayer.error.URL_NOT_SET,
-				context: context,
-				message: $.jPlayer.errorMsg.URL_NOT_SET,
-				hint: $.jPlayer.errorHint.URL_NOT_SET
-			});
-		},
-		_flashError: function(error) {
-			var errorType;
-			if(!this.internal.ready) {
-				errorType = "FLASH";
-			} else {
-				errorType = "FLASH_DISABLED";
-			}
-			this._error( {
-				type: $.jPlayer.error[errorType],
-				context: this.internal.flash.swf,
-				message: $.jPlayer.errorMsg[errorType] + error.message,
-				hint: $.jPlayer.errorHint[errorType]
-			});
-			// Allow the audio player to recover if display:none and then shown again, or with position:fixed on Firefox.
-			// This really only affects audio in a media player, as an audio player could easily move the jPlayer element away from such issues.
-			this.internal.flash.jq.css({'width':'1px', 'height':'1px'});
-		},
-		_error: function(error) {
-			this._trigger($.jPlayer.event.error, error);
-			if(this.options.errorAlerts) {
-				this._alert("Error!" + (error.message ? "\n\n" + error.message : "") + (error.hint ? "\n\n" + error.hint : "") + "\n\nContext: " + error.context);
-			}
-		},
-		_warning: function(warning) {
-			this._trigger($.jPlayer.event.warning, undefined, warning);
-			if(this.options.warningAlerts) {
-				this._alert("Warning!" + (warning.message ? "\n\n" + warning.message : "") + (warning.hint ? "\n\n" + warning.hint : "") + "\n\nContext: " + warning.context);
-			}
-		},
-		_alert: function(message) {
-			alert("jPlayer " + this.version.script + " : id='" + this.internal.self.id +"' : " + message);
-		},
-		_emulateHtmlBridge: function() {
-			var self = this,
-			methods = $.jPlayer.emulateMethods;
-
-			// Emulate methods on jPlayer's DOM element.
-			$.each( $.jPlayer.emulateMethods.split(/\s+/g), function(i, name) {
-				self.internal.domNode[name] = function(arg) {
-					self[name](arg);
-				};
-
-			});
-
-			// Bubble jPlayer events to its DOM element.
-			$.each($.jPlayer.event, function(eventName,eventType) {
-				var nativeEvent = true;
-				$.each( $.jPlayer.reservedEvent.split(/\s+/g), function(i, name) {
-					if(name === eventName) {
-						nativeEvent = false;
-						return false;
-					}
-				});
-				if(nativeEvent) {
-					self.element.bind(eventType + ".jPlayer.jPlayerHtml", function() { // With .jPlayer & .jPlayerHtml namespaces.
-						self._emulateHtmlUpdate();
-						var domEvent = document.createEvent("Event");
-						domEvent.initEvent(eventName, false, true);
-						self.internal.domNode.dispatchEvent(domEvent);
-					});
-				}
-				// The error event would require a special case
-			});
-
-			// IE9 has a readyState property on all elements. The document should have it, but all (except media) elements inherit it in IE9. This conflicts with Popcorn, which polls the readyState.
-		},
-		_emulateHtmlUpdate: function() {
-			var self = this;
-
-			$.each( $.jPlayer.emulateStatus.split(/\s+/g), function(i, name) {
-				self.internal.domNode[name] = self.status[name];
-			});
-			$.each( $.jPlayer.emulateOptions.split(/\s+/g), function(i, name) {
-				self.internal.domNode[name] = self.options[name];
-			});
-		},
-		_destroyHtmlBridge: function() {
-			var self = this;
-
-			// Bridge event handlers are also removed by destroy() through .jPlayer namespace.
-			this.element.unbind(".jPlayerHtml"); // Remove all event handlers created by the jPlayer bridge. So you can change the emulateHtml option.
-
-			// Remove the methods and properties
-			var emulated = $.jPlayer.emulateMethods + " " + $.jPlayer.emulateStatus + " " + $.jPlayer.emulateOptions;
-			$.each( emulated.split(/\s+/g), function(i, name) {
-				delete self.internal.domNode[name];
-			});
-		}
-	};
-
-	$.jPlayer.error = {
-		FLASH: "e_flash",
-		FLASH_DISABLED: "e_flash_disabled",
-		NO_SOLUTION: "e_no_solution",
-		NO_SUPPORT: "e_no_support",
-		URL: "e_url",
-		URL_NOT_SET: "e_url_not_set",
-		VERSION: "e_version"
-	};
-
-	$.jPlayer.errorMsg = {
-		FLASH: "jPlayer's Flash fallback is not configured correctly, or a command was issued before the jPlayer Ready event. Details: ", // Used in: _flashError()
-		FLASH_DISABLED: "jPlayer's Flash fallback has been disabled by the browser due to the CSS rules you have used. Details: ", // Used in: _flashError()
-		NO_SOLUTION: "No solution can be found by jPlayer in this browser. Neither HTML nor Flash can be used.", // Used in: _init()
-		NO_SUPPORT: "It is not possible to play any media format provided in setMedia() on this browser using your current options.", // Used in: setMedia()
-		URL: "Media URL could not be loaded.", // Used in: jPlayerFlashEvent() and _addHtmlEventListeners()
-		URL_NOT_SET: "Attempt to issue media playback commands, while no media url is set.", // Used in: load(), play(), pause(), stop() and playHead()
-		VERSION: "jPlayer " + $.jPlayer.prototype.version.script + " needs Jplayer.swf version " + $.jPlayer.prototype.version.needFlash + " but found " // Used in: jPlayerReady()
-	};
-
-	$.jPlayer.errorHint = {
-		FLASH: "Check your swfPath option and that Jplayer.swf is there.",
-		FLASH_DISABLED: "Check that you have not display:none; the jPlayer entity or any ancestor.",
-		NO_SOLUTION: "Review the jPlayer options: support and supplied.",
-		NO_SUPPORT: "Video or audio formats defined in the supplied option are missing.",
-		URL: "Check media URL is valid.",
-		URL_NOT_SET: "Use setMedia() to set the media URL.",
-		VERSION: "Update jPlayer files."
-	};
-
-	$.jPlayer.warning = {
-		CSS_SELECTOR_COUNT: "e_css_selector_count",
-		CSS_SELECTOR_METHOD: "e_css_selector_method",
-		CSS_SELECTOR_STRING: "e_css_selector_string",
-		OPTION_KEY: "e_option_key"
-	};
-
-	$.jPlayer.warningMsg = {
-		CSS_SELECTOR_COUNT: "The number of css selectors found did not equal one: ",
-		CSS_SELECTOR_METHOD: "The methodName given in jPlayer('cssSelector') is not a valid jPlayer method.",
-		CSS_SELECTOR_STRING: "The methodCssSelector given in jPlayer('cssSelector') is not a String or is empty.",
-		OPTION_KEY: "The option requested in jPlayer('option') is undefined."
-	};
-
-	$.jPlayer.warningHint = {
-		CSS_SELECTOR_COUNT: "Check your css selector and the ancestor.",
-		CSS_SELECTOR_METHOD: "Check your method name.",
-		CSS_SELECTOR_STRING: "Check your css selector is a string.",
-		OPTION_KEY: "Check your option name."
-	};
-})(jQuery);
diff --git a/apps/media/js/jquery.jplayer.min.js b/apps/media/js/jquery.jplayer.min.js
deleted file mode 100644
index 9ba8b0c45c..0000000000
--- a/apps/media/js/jquery.jplayer.min.js
+++ /dev/null
@@ -1,2 +0,0 @@
-
-(function($,undefined){$.fn.jPlayer=function(options){var name="jPlayer",isMethodCall=typeof options==="string",args=Array.prototype.slice.call(arguments,1),returnValue=this;options=!isMethodCall&&args.length?$.extend.apply(null,[true,options].concat(args)):options;if(isMethodCall&&options.charAt(0)==="_")return returnValue;if(isMethodCall){this.each(function(){var instance=$.data(this,name),methodValue=instance&&$.isFunction(instance[options])?instance[options].apply(instance,args):instance;if(methodValue!==instance&&methodValue!==undefined){returnValue=methodValue;return false}})}else this.each(function(){var instance=$.data(this,name);if(instance){instance.option(options||{})}else $.data(this,name,new $.jPlayer(options,this))});return returnValue};$.jPlayer=function(options,element){if(arguments.length){this.element=$(element);this.options=$.extend(true,{},this.options,options);var self=this;this.element.bind("remove.jPlayer",function(){self.destroy()});this._init()}};$.jPlayer.emulateMethods="load play pause";$.jPlayer.emulateStatus="src readyState networkState currentTime duration paused ended playbackRate";$.jPlayer.emulateOptions="muted volume";$.jPlayer.reservedEvent="ready flashreset resize repeat error warning";$.jPlayer.event={ready:"jPlayer_ready",flashreset:"jPlayer_flashreset",resize:"jPlayer_resize",repeat:"jPlayer_repeat",error:"jPlayer_error",warning:"jPlayer_warning",loadstart:"jPlayer_loadstart",progress:"jPlayer_progress",suspend:"jPlayer_suspend",abort:"jPlayer_abort",emptied:"jPlayer_emptied",stalled:"jPlayer_stalled",play:"jPlayer_play",pause:"jPlayer_pause",loadedmetadata:"jPlayer_loadedmetadata",loadeddata:"jPlayer_loadeddata",waiting:"jPlayer_waiting",playing:"jPlayer_playing",canplay:"jPlayer_canplay",canplaythrough:"jPlayer_canplaythrough",seeking:"jPlayer_seeking",seeked:"jPlayer_seeked",timeupdate:"jPlayer_timeupdate",ended:"jPlayer_ended",ratechange:"jPlayer_ratechange",durationchange:"jPlayer_durationchange",volumechange:"jPlayer_volumechange"};$.jPlayer.htmlEvent=["loadstart","abort","emptied","stalled","loadedmetadata","loadeddata","canplay","canplaythrough","ratechange"];$.jPlayer.pause=function(){$.each($.jPlayer.prototype.instances,function(i,element){if(element.data("jPlayer").status.srcSet)element.jPlayer("pause")})};$.jPlayer.timeFormat={showHour:false,showMin:true,showSec:true,padHour:false,padMin:true,padSec:true,sepHour:":",sepMin:":",sepSec:""};$.jPlayer.convertTime=function(s){var myTime=new Date(s*1e3),hour=myTime.getUTCHours(),min=myTime.getUTCMinutes(),sec=myTime.getUTCSeconds(),strHour=($.jPlayer.timeFormat.padHour&&hour<10)?"0"+hour:hour,strMin=($.jPlayer.timeFormat.padMin&&min<10)?"0"+min:min,strSec=($.jPlayer.timeFormat.padSec&&sec<10)?"0"+sec:sec;return(($.jPlayer.timeFormat.showHour)?strHour+$.jPlayer.timeFormat.sepHour:"")+(($.jPlayer.timeFormat.showMin)?strMin+$.jPlayer.timeFormat.sepMin:"")+(($.jPlayer.timeFormat.showSec)?strSec+$.jPlayer.timeFormat.sepSec:"")};$.jPlayer.uaBrowser=function(userAgent){var ua=userAgent.toLowerCase(),rwebkit=/(webkit)[ \/]([\w.]+)/,ropera=/(opera)(?:.*version)?[ \/]([\w.]+)/,rmsie=/(msie) ([\w.]+)/,rmozilla=/(mozilla)(?:.*? rv:([\w.]+))?/,match=rwebkit.exec(ua)||ropera.exec(ua)||rmsie.exec(ua)||ua.indexOf("compatible")<0&&rmozilla.exec(ua)||[];return{browser:match[1]||"",version:match[2]||"0"}};$.jPlayer.uaPlatform=function(userAgent){var ua=userAgent.toLowerCase(),rplatform=/(ipad|iphone|ipod|android|blackberry|playbook|windows ce|webos)/,rtablet=/(ipad|playbook)/,randroid=/(android)/,rmobile=/(mobile)/,platform=rplatform.exec(ua)||[],tablet=rtablet.exec(ua)||!rmobile.exec(ua)&&randroid.exec(ua)||[];return{platform:platform[1]||"",tablet:tablet[1]||""}};$.jPlayer.browser={};$.jPlayer.platform={};var browserMatch=$.jPlayer.uaBrowser(navigator.userAgent);if(browserMatch.browser){$.jPlayer.browser[browserMatch.browser]=true;$.jPlayer.browser.version=browserMatch.version};var platformMatch=$.jPlayer.uaPlatform(navigator.userAgent);if(platformMatch.platform){$.jPlayer.platform[platformMatch.platform]=true;$.jPlayer.platform.mobile=!platformMatch.tablet;$.jPlayer.platform.tablet=!!platformMatch.tablet};$.jPlayer.prototype={count:0,version:{script:"2.0.23",needFlash:"2.0.9",flash:"unknown"},options:{swfPath:"js",solution:"html, flash",supplied:"mp3",preload:'metadata',volume:0.8,muted:false,wmode:"opaque",backgroundColor:"#000000",cssSelectorAncestor:"#jp_container_1",cssSelector:{videoPlay:".jp-video-play",play:".jp-play",pause:".jp-pause",stop:".jp-stop",seekBar:".jp-seek-bar",playBar:".jp-play-bar",mute:".jp-mute",unmute:".jp-unmute",volumeBar:".jp-volume-bar",volumeBarValue:".jp-volume-bar-value",volumeMax:".jp-volume-max",currentTime:".jp-current-time",duration:".jp-duration",fullScreen:".jp-full-screen",restoreScreen:".jp-restore-screen",repeat:".jp-repeat",repeatOff:".jp-repeat-off",gui:".jp-gui"},fullScreen:false,autohide:{restored:false,full:true,fadeIn:200,fadeOut:600,hold:1e3},loop:false,repeat:function(event){if(event.jPlayer.options.loop){$(this).unbind(".jPlayerRepeat").bind($.jPlayer.event.ended+".jPlayer.jPlayerRepeat",function(){$(this).jPlayer("play")})}else $(this).unbind(".jPlayerRepeat")},idPrefix:"jp",noConflict:"jQuery",emulateHtml:false,errorAlerts:false,warningAlerts:false},optionsAudio:{size:{width:"0px",height:"0px",cssClass:""},sizeFull:{width:"0px",height:"0px",cssClass:""}},optionsVideo:{size:{width:"480px",height:"270px",cssClass:"jp-video-270p"},sizeFull:{width:"100%",height:"100%",cssClass:"jp-video-full"}},instances:{},status:{src:"",media:{},paused:true,format:{},formatType:"",waitForPlay:true,waitForLoad:true,srcSet:false,video:false,seekPercent:0,currentPercentRelative:0,currentPercentAbsolute:0,currentTime:0,duration:0,readyState:0,networkState:0,playbackRate:1,ended:0},internal:{ready:false},solution:{html:true,flash:true},format:{mp3:{codec:'audio/mpeg; codecs="mp3"',flashCanPlay:true,media:'audio'},m4a:{codec:'audio/mp4; codecs="mp4a.40.2"',flashCanPlay:true,media:'audio'},oga:{codec:'audio/ogg; codecs="vorbis"',flashCanPlay:false,media:'audio'},wav:{codec:'audio/wav; codecs="1"',flashCanPlay:false,media:'audio'},webma:{codec:'audio/webm; codecs="vorbis"',flashCanPlay:false,media:'audio'},fla:{codec:'audio/x-flv',flashCanPlay:true,media:'audio'},m4v:{codec:'video/mp4; codecs="avc1.42E01E, mp4a.40.2"',flashCanPlay:true,media:'video'},ogv:{codec:'video/ogg; codecs="theora, vorbis"',flashCanPlay:false,media:'video'},webmv:{codec:'video/webm; codecs="vorbis, vp8"',flashCanPlay:false,media:'video'},flv:{codec:'video/x-flv',flashCanPlay:true,media:'video'}},_init:function(){var self=this;this.element.empty();this.status=$.extend({},this.status);this.internal=$.extend({},this.internal);this.internal.domNode=this.element.get(0);this.formats=[];this.solutions=[];this.require={};this.htmlElement={};this.html={};this.html.audio={};this.html.video={};this.flash={};this.css={};this.css.cs={};this.css.jq={};this.ancestorJq=[];this.options.volume=this._limitValue(this.options.volume,0,1);$.each(this.options.supplied.toLowerCase().split(","),function(index1,value1){var format=value1.replace(/^\s+|\s+$/g,"");if(self.format[format]){var dupFound=false;$.each(self.formats,function(index2,value2){if(format===value2){dupFound=true;return false}});if(!dupFound)self.formats.push(format)}});$.each(this.options.solution.toLowerCase().split(","),function(index1,value1){var solution=value1.replace(/^\s+|\s+$/g,"");if(self.solution[solution]){var dupFound=false;$.each(self.solutions,function(index2,value2){if(solution===value2){dupFound=true;return false}});if(!dupFound)self.solutions.push(solution)}});this.internal.instance="jp_"+this.count;this.instances[this.internal.instance]=this.element;if(!this.element.attr("id"))this.element.attr("id",this.options.idPrefix+"_jplayer_"+this.count);this.internal.self=$.extend({},{id:this.element.attr("id"),jq:this.element});this.internal.audio=$.extend({},{id:this.options.idPrefix+"_audio_"+this.count,jq:undefined});this.internal.video=$.extend({},{id:this.options.idPrefix+"_video_"+this.count,jq:undefined});this.internal.flash=$.extend({},{id:this.options.idPrefix+"_flash_"+this.count,jq:undefined,swf:this.options.swfPath+((this.options.swfPath!==""&&this.options.swfPath.slice(-1)!=="/")?"/":"")+"Jplayer.swf"});this.internal.poster=$.extend({},{id:this.options.idPrefix+"_poster_"+this.count,jq:undefined});$.each($.jPlayer.event,function(eventName,eventType){if(self.options[eventName]!==undefined){self.element.bind(eventType+".jPlayer",self.options[eventName]);self.options[eventName]=undefined}});this.require.audio=false;this.require.video=false;$.each(this.formats,function(priority,format){self.require[self.format[format].media]=true});if(this.require.video){this.options=$.extend(true,{},this.optionsVideo,this.options)}else this.options=$.extend(true,{},this.optionsAudio,this.options);this._setSize();this.htmlElement.poster=document.createElement('img');this.htmlElement.poster.id=this.internal.poster.id;this.htmlElement.poster.onload=function(){if(!self.status.video||self.status.waitForPlay)self.internal.poster.jq.show()};this.element.append(this.htmlElement.poster);this.internal.poster.jq=$("#"+this.internal.poster.id);this.internal.poster.jq.css({width:this.status.width,height:this.status.height});this.internal.poster.jq.hide();this.html.audio.available=false;if(this.require.audio){this.htmlElement.audio=document.createElement('audio');this.htmlElement.audio.id=this.internal.audio.id;this.html.audio.available=!!this.htmlElement.audio.canPlayType};this.html.video.available=false;if(this.require.video){this.htmlElement.video=document.createElement('video');this.htmlElement.video.id=this.internal.video.id;this.html.video.available=!!this.htmlElement.video.canPlayType};this.flash.available=this._checkForFlash(10);this.html.canPlay={};this.flash.canPlay={};$.each(this.formats,function(priority,format){self.html.canPlay[format]=self.html[self.format[format].media].available&&""!==self.htmlElement[self.format[format].media].canPlayType(self.format[format].codec);self.flash.canPlay[format]=self.format[format].flashCanPlay&&self.flash.available});this.html.desired=false;this.flash.desired=false;$.each(this.solutions,function(solutionPriority,solution){if(solutionPriority===0){self[solution].desired=true}else{var audioCanPlay=false,videoCanPlay=false;$.each(self.formats,function(formatPriority,format){if(self[self.solutions[0]].canPlay[format])if(self.format[format].media==='video'){videoCanPlay=true}else audioCanPlay=true});self[solution].desired=(self.require.audio&&!audioCanPlay)||(self.require.video&&!videoCanPlay)}});this.html.support={};this.flash.support={};$.each(this.formats,function(priority,format){self.html.support[format]=self.html.canPlay[format]&&self.html.desired;self.flash.support[format]=self.flash.canPlay[format]&&self.flash.desired});this.html.used=false;this.flash.used=false;$.each(this.solutions,function(solutionPriority,solution){$.each(self.formats,function(formatPriority,format){if(self[solution].support[format]){self[solution].used=true;return false}})});this.html.active=false;this.html.audio.gate=false;this.html.video.gate=false;this.flash.active=false;this.flash.gate=false;this._cssSelectorAncestor(this.options.cssSelectorAncestor);if(!(this.html.used||this.flash.used))this._error({type:$.jPlayer.error.NO_SOLUTION,context:"{solution:'"+this.options.solution+"', supplied:'"+this.options.supplied+"'}",message:$.jPlayer.errorMsg.NO_SOLUTION,hint:$.jPlayer.errorHint.NO_SOLUTION});if(this.flash.used){var htmlObj,flashVars='jQuery='+encodeURI(this.options.noConflict)+'&id='+encodeURI(this.internal.self.id)+'&vol='+this.options.volume+'&muted='+this.options.muted;if($.browser.msie&&Number($.browser.version)<=8){var objStr='<object id="'+this.internal.flash.id+'" classid="clsid:d27cdb6e-ae6d-11cf-96b8-444553540000" width="0" height="0"></object>',paramStr=['<param name="movie" value="'+this.internal.flash.swf+'" />','<param name="FlashVars" value="'+flashVars+'" />','<param name="allowScriptAccess" value="always" />','<param name="bgcolor" value="'+this.options.backgroundColor+'" />','<param name="wmode" value="'+this.options.wmode+'" />'];htmlObj=document.createElement(objStr);for(var i=0;i<paramStr.length;i++)htmlObj.appendChild(document.createElement(paramStr[i]))}else{var createParam=function(el,n,v){var p=document.createElement("param");p.setAttribute("name",n);p.setAttribute("value",v);el.appendChild(p)};htmlObj=document.createElement("object");htmlObj.setAttribute("id",this.internal.flash.id);htmlObj.setAttribute("data",this.internal.flash.swf);htmlObj.setAttribute("type","application/x-shockwave-flash");htmlObj.setAttribute("width","1");htmlObj.setAttribute("height","1");createParam(htmlObj,"flashvars",flashVars);createParam(htmlObj,"allowscriptaccess","always");createParam(htmlObj,"bgcolor",this.options.backgroundColor);createParam(htmlObj,"wmode",this.options.wmode)};this.element.append(htmlObj);this.internal.flash.jq=$(htmlObj)};if(this.html.used){if(this.html.audio.available){this._addHtmlEventListeners(this.htmlElement.audio,this.html.audio);this.element.append(this.htmlElement.audio);this.internal.audio.jq=$("#"+this.internal.audio.id)};if(this.html.video.available){this._addHtmlEventListeners(this.htmlElement.video,this.html.video);this.element.append(this.htmlElement.video);this.internal.video.jq=$("#"+this.internal.video.id);this.internal.video.jq.css({width:'0px',height:'0px'})}};if(this.options.emulateHtml)this._emulateHtmlBridge();if(this.html.used&&!this.flash.used)setTimeout(function(){self.internal.ready=true;self.version.flash="n/a";self._trigger($.jPlayer.event.repeat);self._trigger($.jPlayer.event.ready)},100);this._updateInterface();this._updateButtons(false);this._updateAutohide();this._updateVolume(this.options.volume);this._updateMute(this.options.muted);if(this.css.jq.videoPlay.length)this.css.jq.videoPlay.hide();$.jPlayer.prototype.count++},destroy:function(){this._resetStatus();this._updateInterface();this._seeked();if(this.css.jq.currentTime.length)this.css.jq.currentTime.text("");if(this.css.jq.duration.length)this.css.jq.duration.text("");if(this.status.srcSet)this.pause();$.each(this.css.jq,function(fn,jq){if(jq.length)jq.unbind(".jPlayer")});if(this.options.emulateHtml)this._destroyHtmlBridge();this.element.removeData("jPlayer");this.element.unbind(".jPlayer");this.element.empty();delete this.instances[this.internal.instance]},enable:function(){},disable:function(){},_addHtmlEventListeners:function(mediaElement,entity){var self=this;mediaElement.preload=this.options.preload;mediaElement.muted=this.options.muted;mediaElement.volume=this.options.volume;mediaElement.addEventListener("progress",function(){if(entity.gate&&!self.status.waitForLoad){self._getHtmlStatus(mediaElement);self._updateInterface();self._trigger($.jPlayer.event.progress)}},false);mediaElement.addEventListener("timeupdate",function(){if(entity.gate&&!self.status.waitForLoad){self._getHtmlStatus(mediaElement);self._updateInterface();self._trigger($.jPlayer.event.timeupdate)}},false);mediaElement.addEventListener("durationchange",function(){if(entity.gate&&!self.status.waitForLoad){self.status.duration=this.duration;self._getHtmlStatus(mediaElement);self._updateInterface();self._trigger($.jPlayer.event.durationchange)}},false);mediaElement.addEventListener("play",function(){if(entity.gate&&!self.status.waitForLoad){self._updateButtons(true);self._trigger($.jPlayer.event.play)}},false);mediaElement.addEventListener("playing",function(){if(entity.gate&&!self.status.waitForLoad){self._updateButtons(true);self._seeked();self._trigger($.jPlayer.event.playing)}},false);mediaElement.addEventListener("pause",function(){if(entity.gate&&!self.status.waitForLoad){self._updateButtons(false);self._trigger($.jPlayer.event.pause)}},false);mediaElement.addEventListener("waiting",function(){if(entity.gate&&!self.status.waitForLoad){self._seeking();self._trigger($.jPlayer.event.waiting)}},false);mediaElement.addEventListener("seeking",function(){if(entity.gate&&!self.status.waitForLoad){self._seeking();self._trigger($.jPlayer.event.seeking)}},false);mediaElement.addEventListener("seeked",function(){if(entity.gate&&!self.status.waitForLoad){self._seeked();self._trigger($.jPlayer.event.seeked)}},false);mediaElement.addEventListener("volumechange",function(){if(entity.gate&&!self.status.waitForLoad){self.options.volume=mediaElement.volume;self.options.muted=mediaElement.muted;self._updateMute();self._updateVolume();self._trigger($.jPlayer.event.volumechange)}},false);mediaElement.addEventListener("suspend",function(){if(entity.gate&&!self.status.waitForLoad){self._seeked();self._trigger($.jPlayer.event.suspend)}},false);mediaElement.addEventListener("ended",function(){if(entity.gate&&!self.status.waitForLoad){if(!$.jPlayer.browser.webkit)self.htmlElement.media.currentTime=0;self.htmlElement.media.pause();self._updateButtons(false);self._getHtmlStatus(mediaElement,true);self._updateInterface();self._trigger($.jPlayer.event.ended)}},false);mediaElement.addEventListener("error",function(){if(entity.gate&&!self.status.waitForLoad){self._updateButtons(false);self._seeked();if(self.status.srcSet){clearTimeout(self.internal.htmlDlyCmdId);self.status.waitForLoad=true;self.status.waitForPlay=true;if(self.status.video)self.internal.video.jq.css({width:'0px',height:'0px'});if(self._validString(self.status.media.poster))self.internal.poster.jq.show();if(self.css.jq.videoPlay.length)self.css.jq.videoPlay.show();self._error({type:$.jPlayer.error.URL,context:self.status.src,message:$.jPlayer.errorMsg.URL,hint:$.jPlayer.errorHint.URL})}}},false);$.each($.jPlayer.htmlEvent,function(i,eventType){mediaElement.addEventListener(this,function(){if(entity.gate&&!self.status.waitForLoad)self._trigger($.jPlayer.event[eventType])},false)})},_getHtmlStatus:function(media,override){var ct=0,d=0,cpa=0,sp=0,cpr=0;if(media.duration)this.status.duration=media.duration;ct=media.currentTime;cpa=(this.status.duration>0)?100*ct/this.status.duration:0;if((typeof media.seekable==="object")&&(media.seekable.length>0)){sp=(this.status.duration>0)?100*media.seekable.end(media.seekable.length-1)/this.status.duration:100;cpr=100*media.currentTime/media.seekable.end(media.seekable.length-1)}else{sp=100;cpr=cpa};if(override){ct=0;cpr=0;cpa=0};this.status.seekPercent=sp;this.status.currentPercentRelative=cpr;this.status.currentPercentAbsolute=cpa;this.status.currentTime=ct;this.status.readyState=media.readyState;this.status.networkState=media.networkState;this.status.playbackRate=media.playbackRate;this.status.ended=media.ended},_resetStatus:function(){this.status=$.extend({},this.status,$.jPlayer.prototype.status)},_trigger:function(eventType,error,warning){var event=$.Event(eventType);event.jPlayer={};event.jPlayer.version=$.extend({},this.version);event.jPlayer.options=$.extend(true,{},this.options);event.jPlayer.status=$.extend(true,{},this.status);event.jPlayer.html=$.extend(true,{},this.html);event.jPlayer.flash=$.extend(true,{},this.flash);if(error)event.jPlayer.error=$.extend({},error);if(warning)event.jPlayer.warning=$.extend({},warning);this.element.trigger(event)},jPlayerFlashEvent:function(eventType,status){if(eventType===$.jPlayer.event.ready)if(!this.internal.ready){this.internal.ready=true;this.internal.flash.jq.css({width:'0px',height:'0px'});this.version.flash=status.version;if(this.version.needFlash!==this.version.flash)this._error({type:$.jPlayer.error.VERSION,context:this.version.flash,message:$.jPlayer.errorMsg.VERSION+this.version.flash,hint:$.jPlayer.errorHint.VERSION});this._trigger($.jPlayer.event.repeat);this._trigger(eventType)}else if(this.flash.gate){if(this.status.srcSet){var currentTime=this.status.currentTime,paused=this.status.paused;this.setMedia(this.status.media);if(currentTime>0)if(paused){this.pause(currentTime)}else this.play(currentTime)};this._trigger($.jPlayer.event.flashreset)};if(this.flash.gate)switch(eventType){case $.jPlayer.event.progress:this._getFlashStatus(status);this._updateInterface();this._trigger(eventType);break;case $.jPlayer.event.timeupdate:this._getFlashStatus(status);this._updateInterface();this._trigger(eventType);break;case $.jPlayer.event.play:this._seeked();this._updateButtons(true);this._trigger(eventType);break;case $.jPlayer.event.pause:this._updateButtons(false);this._trigger(eventType);break;case $.jPlayer.event.ended:this._updateButtons(false);this._trigger(eventType);break;case $.jPlayer.event.error:this.status.waitForLoad=true;this.status.waitForPlay=true;if(this.status.video)this.internal.flash.jq.css({width:'0px',height:'0px'});if(this._validString(this.status.media.poster))this.internal.poster.jq.show();if(this.css.jq.videoPlay.length)this.css.jq.videoPlay.show();if(this.status.video){this._flash_setVideo(this.status.media)}else this._flash_setAudio(this.status.media);this._error({type:$.jPlayer.error.URL,context:status.src,message:$.jPlayer.errorMsg.URL,hint:$.jPlayer.errorHint.URL});break;case $.jPlayer.event.seeking:this._seeking();this._trigger(eventType);break;case $.jPlayer.event.seeked:this._seeked();this._trigger(eventType);break;case $.jPlayer.event.ready:break;default:this._trigger(eventType)};return false},_getFlashStatus:function(status){this.status.seekPercent=status.seekPercent;this.status.currentPercentRelative=status.currentPercentRelative;this.status.currentPercentAbsolute=status.currentPercentAbsolute;this.status.currentTime=status.currentTime;this.status.duration=status.duration;this.status.readyState=4;this.status.networkState=0;this.status.playbackRate=1;this.status.ended=false},_updateButtons:function(playing){if(playing!==undefined){this.status.paused=!playing;if(this.css.jq.play.length&&this.css.jq.pause.length)if(playing){this.css.jq.play.hide();this.css.jq.pause.show()}else{this.css.jq.play.show();this.css.jq.pause.hide()}};if(this.css.jq.restoreScreen.length&&this.css.jq.fullScreen.length)if(this.options.fullScreen){this.css.jq.fullScreen.hide();this.css.jq.restoreScreen.show()}else{this.css.jq.fullScreen.show();this.css.jq.restoreScreen.hide()};if(this.css.jq.repeat.length&&this.css.jq.repeatOff.length)if(this.options.loop){this.css.jq.repeat.hide();this.css.jq.repeatOff.show()}else{this.css.jq.repeat.show();this.css.jq.repeatOff.hide()}},_updateInterface:function(){if(this.css.jq.seekBar.length)this.css.jq.seekBar.width(this.status.seekPercent+"%");if(this.css.jq.playBar.length)this.css.jq.playBar.width(this.status.currentPercentRelative+"%");if(this.css.jq.currentTime.length)this.css.jq.currentTime.text($.jPlayer.convertTime(this.status.currentTime));if(this.css.jq.duration.length)this.css.jq.duration.text($.jPlayer.convertTime(this.status.duration))},_seeking:function(){if(this.css.jq.seekBar.length)this.css.jq.seekBar.addClass("jp-seeking-bg")},_seeked:function(){if(this.css.jq.seekBar.length)this.css.jq.seekBar.removeClass("jp-seeking-bg")},setMedia:function(media){var self=this;this._seeked();clearTimeout(this.internal.htmlDlyCmdId);var audioGate=this.html.audio.gate,videoGate=this.html.video.gate,supported=false;$.each(this.formats,function(formatPriority,format){var isVideo=self.format[format].media==='video';$.each(self.solutions,function(solutionPriority,solution){if(self[solution].support[format]&&self._validString(media[format])){var isHtml=solution==='html';if(isVideo){if(isHtml){self.html.audio.gate=false;self.html.video.gate=true;self.flash.gate=false}else{self.html.audio.gate=false;self.html.video.gate=false;self.flash.gate=true}}else if(isHtml){self.html.audio.gate=true;self.html.video.gate=false;self.flash.gate=false}else{self.html.audio.gate=false;self.html.video.gate=false;self.flash.gate=true};if(self.flash.active||(self.html.active&&self.flash.gate)||(audioGate===self.html.audio.gate&&videoGate===self.html.video.gate)){self.clearMedia()}else if(audioGate!==self.html.audio.gate&&videoGate!==self.html.video.gate){self._html_pause();if(self.status.video)self.internal.video.jq.css({width:'0px',height:'0px'});self._resetStatus()};if(isVideo){if(isHtml){self._html_setVideo(media);self.html.active=true;self.flash.active=false}else{self._flash_setVideo(media);self.html.active=false;self.flash.active=true};if(self.css.jq.videoPlay.length)self.css.jq.videoPlay.show();self.status.video=true}else{if(isHtml){self._html_setAudio(media);self.html.active=true;self.flash.active=false}else{self._flash_setAudio(media);self.html.active=false;self.flash.active=true};if(self.css.jq.videoPlay.length)self.css.jq.videoPlay.hide();self.status.video=false};supported=true;return false}});if(supported)return false});if(supported){if(this._validString(media.poster)){if(this.htmlElement.poster.src!==media.poster){this.htmlElement.poster.src=media.poster}else this.internal.poster.jq.show()}else this.internal.poster.jq.hide();this.status.srcSet=true;this.status.media=$.extend({},media);this._updateButtons(false);this._updateInterface()}else{if(this.status.srcSet&&!this.status.waitForPlay)this.pause();this.html.audio.gate=false;this.html.video.gate=false;this.flash.gate=false;this.html.active=false;this.flash.active=false;this._resetStatus();this._updateInterface();this._updateButtons(false);this.internal.poster.jq.hide();if(this.html.used&&this.require.video)this.internal.video.jq.css({width:'0px',height:'0px'});if(this.flash.used)this.internal.flash.jq.css({width:'0px',height:'0px'});this._error({type:$.jPlayer.error.NO_SUPPORT,context:"{supplied:'"+this.options.supplied+"'}",message:$.jPlayer.errorMsg.NO_SUPPORT,hint:$.jPlayer.errorHint.NO_SUPPORT})}},clearMedia:function(){this._resetStatus();this._updateButtons(false);this.internal.poster.jq.hide();clearTimeout(this.internal.htmlDlyCmdId);if(this.html.active){this._html_clearMedia()}else if(this.flash.active)this._flash_clearMedia()},load:function(){if(this.status.srcSet){if(this.html.active){this._html_load()}else if(this.flash.active)this._flash_load()}else this._urlNotSetError("load")},play:function(time){time=(typeof time==="number")?time:NaN;if(this.status.srcSet){if(this.html.active){this._html_play(time)}else if(this.flash.active)this._flash_play(time)}else this._urlNotSetError("play")},videoPlay:function(e){this.play()},pause:function(time){time=(typeof time==="number")?time:NaN;if(this.status.srcSet){if(this.html.active){this._html_pause(time)}else if(this.flash.active)this._flash_pause(time)}else this._urlNotSetError("pause")},pauseOthers:function(){var self=this;$.each(this.instances,function(i,element){if(self.element!==element)if(element.data("jPlayer").status.srcSet)element.jPlayer("pause")})},stop:function(){if(this.status.srcSet){if(this.html.active){this._html_pause(0)}else if(this.flash.active)this._flash_pause(0)}else this._urlNotSetError("stop")},playHead:function(p){p=this._limitValue(p,0,100);if(this.status.srcSet){if(this.html.active){this._html_playHead(p)}else if(this.flash.active)this._flash_playHead(p)}else this._urlNotSetError("playHead")},_muted:function(muted){this.options.muted=muted;if(this.html.used)this._html_mute(muted);if(this.flash.used)this._flash_mute(muted);if(this.flash.gate){this._updateMute(muted);this._updateVolume(this.options.volume);this._trigger($.jPlayer.event.volumechange)}},mute:function(mute){mute=mute===undefined?true:!!mute;this._muted(mute)},unmute:function(unmute){unmute=unmute===undefined?true:!!unmute;this._muted(!unmute)},_updateMute:function(mute){if(mute===undefined)mute=this.options.muted;if(this.css.jq.mute.length&&this.css.jq.unmute.length)if(mute){this.css.jq.mute.hide();this.css.jq.unmute.show()}else{this.css.jq.mute.show();this.css.jq.unmute.hide()}},volume:function(v){v=this._limitValue(v,0,1);this.options.volume=v;if(this.html.used)this._html_volume(v);if(this.flash.used)this._flash_volume(v);if(this.flash.gate){this._updateVolume(v);this._trigger($.jPlayer.event.volumechange)}},volumeBar:function(e){if(this.css.jq.volumeBar.length){var offset=this.css.jq.volumeBar.offset(),x=e.pageX-offset.left,w=this.css.jq.volumeBar.width(),v=x/w;this.volume(v)};if(this.options.muted)this._muted(false)},volumeBarValue:function(e){this.volumeBar(e)},_updateVolume:function(v){if(v===undefined)v=this.options.volume;v=this.options.muted?0:v;if(this.css.jq.volumeBarValue.length)this.css.jq.volumeBarValue.width((v*100)+"%")},volumeMax:function(){this.volume(1);if(this.options.muted)this._muted(false)},_cssSelectorAncestor:function(ancestor){var self=this;this.options.cssSelectorAncestor=ancestor;this._removeUiClass();this.ancestorJq=ancestor?$(ancestor):[];if(ancestor&&this.ancestorJq.length!==1)this._warning({type:$.jPlayer.warning.CSS_SELECTOR_COUNT,context:ancestor,message:$.jPlayer.warningMsg.CSS_SELECTOR_COUNT+this.ancestorJq.length+" found for cssSelectorAncestor.",hint:$.jPlayer.warningHint.CSS_SELECTOR_COUNT});this._addUiClass();$.each(this.options.cssSelector,function(fn,cssSel){self._cssSelector(fn,cssSel)})},_cssSelector:function(fn,cssSel){var self=this;if(typeof cssSel==='string'){if($.jPlayer.prototype.options.cssSelector[fn]){if(this.css.jq[fn]&&this.css.jq[fn].length)this.css.jq[fn].unbind(".jPlayer");this.options.cssSelector[fn]=cssSel;this.css.cs[fn]=this.options.cssSelectorAncestor+" "+cssSel;if(cssSel){this.css.jq[fn]=$(this.css.cs[fn])}else this.css.jq[fn]=[];if(this.css.jq[fn].length){var handler=function(e){self[fn](e);$(this).blur();return false};this.css.jq[fn].bind("click.jPlayer",handler)};if(cssSel&&this.css.jq[fn].length!==1)this._warning({type:$.jPlayer.warning.CSS_SELECTOR_COUNT,context:this.css.cs[fn],message:$.jPlayer.warningMsg.CSS_SELECTOR_COUNT+this.css.jq[fn].length+" found for "+fn+" method.",hint:$.jPlayer.warningHint.CSS_SELECTOR_COUNT})}else this._warning({type:$.jPlayer.warning.CSS_SELECTOR_METHOD,context:fn,message:$.jPlayer.warningMsg.CSS_SELECTOR_METHOD,hint:$.jPlayer.warningHint.CSS_SELECTOR_METHOD})}else this._warning({type:$.jPlayer.warning.CSS_SELECTOR_STRING,context:cssSel,message:$.jPlayer.warningMsg.CSS_SELECTOR_STRING,hint:$.jPlayer.warningHint.CSS_SELECTOR_STRING})},seekBar:function(e){if(this.css.jq.seekBar){var offset=this.css.jq.seekBar.offset(),x=e.pageX-offset.left,w=this.css.jq.seekBar.width(),p=100*x/w;this.playHead(p)}},playBar:function(e){this.seekBar(e)},repeat:function(){this._loop(true)},repeatOff:function(){this._loop(false)},_loop:function(loop){if(this.options.loop!==loop){this.options.loop=loop;this._updateButtons();this._trigger($.jPlayer.event.repeat)}},currentTime:function(e){},duration:function(e){},gui:function(e){},option:function(key,value){var options=key;if(arguments.length===0)return $.extend(true,{},this.options);if(typeof key==="string"){var keys=key.split(".");if(value===undefined){var opt=$.extend(true,{},this.options);for(var i=0;i<keys.length;i++)if(opt[keys[i]]!==undefined){opt=opt[keys[i]]}else{this._warning({type:$.jPlayer.warning.OPTION_KEY,context:key,message:$.jPlayer.warningMsg.OPTION_KEY,hint:$.jPlayer.warningHint.OPTION_KEY});return undefined};return opt};options={};var opts=options;for(var j=0;j<keys.length;j++)if(j<keys.length-1){opts[keys[j]]={};opts=opts[keys[j]]}else opts[keys[j]]=value};this._setOptions(options);return this},_setOptions:function(options){var self=this;$.each(options,function(key,value){self._setOption(key,value)});return this},_setOption:function(key,value){var self=this;switch(key){case"volume":this.volume(value);break;case"muted":this._muted(value);break;case"cssSelectorAncestor":this._cssSelectorAncestor(value);break;case"cssSelector":$.each(value,function(fn,cssSel){self._cssSelector(fn,cssSel)});break;case"fullScreen":if(this.options[key]!==value){this._removeUiClass();this.options[key]=value;this._refreshSize()};break;case"size":if(!this.options.fullScreen&&this.options[key].cssClass!==value.cssClass)this._removeUiClass();this.options[key]=$.extend({},this.options[key],value);this._refreshSize();break;case"sizeFull":if(this.options.fullScreen&&this.options[key].cssClass!==value.cssClass)this._removeUiClass();this.options[key]=$.extend({},this.options[key],value);this._refreshSize();break;case"autohide":this.options[key]=$.extend({},this.options[key],value);this._updateAutohide();break;case"loop":this._loop(value);break;case"emulateHtml":if(this.options[key]!==value){this.options[key]=value;if(value){this._emulateHtmlBridge()}else this._destroyHtmlBridge()};break};return this},_refreshSize:function(){this._setSize();this._addUiClass();this._updateSize();this._updateButtons();this._updateAutohide();this._trigger($.jPlayer.event.resize)},_setSize:function(){if(this.options.fullScreen){this.status.width=this.options.sizeFull.width;this.status.height=this.options.sizeFull.height;this.status.cssClass=this.options.sizeFull.cssClass}else{this.status.width=this.options.size.width;this.status.height=this.options.size.height;this.status.cssClass=this.options.size.cssClass};this.element.css({width:this.status.width,height:this.status.height})},_addUiClass:function(){if(this.ancestorJq.length)this.ancestorJq.addClass(this.status.cssClass)},_removeUiClass:function(){if(this.ancestorJq.length)this.ancestorJq.removeClass(this.status.cssClass)},_updateSize:function(){this.internal.poster.jq.css({width:this.status.width,height:this.status.height});if(!this.status.waitForPlay)if(this.html.active&&this.status.video){this.internal.video.jq.css({width:this.status.width,height:this.status.height})}else if(this.flash.active)this.internal.flash.jq.css({width:this.status.width,height:this.status.height})},_updateAutohide:function(){var self=this,event="mousemove.jPlayer",namespace=".jPlayerAutohide",eventType=event+namespace,handler=function(){self.css.jq.gui.fadeIn(self.options.autohide.fadeIn,function(){clearTimeout(self.internal.autohideId);self.internal.autohideId=setTimeout(function(){self.css.jq.gui.fadeOut(self.options.autohide.fadeOut)},self.options.autohide.hold)})};clearTimeout(this.internal.autohideId);this.element.unbind(namespace);if(this.css.jq.gui.length){this.css.jq.gui.unbind(namespace);if(this.options.fullScreen&&this.options.autohide.full||!this.options.fullScreen&&this.options.autohide.restored){this.element.bind(eventType,handler);this.css.jq.gui.bind(eventType,handler);this.css.jq.gui.hide()}else this.css.jq.gui.stop(true,true).show()}},fullScreen:function(){this._setOption("fullScreen",true)},restoreScreen:function(){this._setOption("fullScreen",false)},_html_initMedia:function(){if(this.status.srcSet&&!this.status.waitForPlay)this.htmlElement.media.pause();if(this.options.preload!=='none')this._html_load();this._trigger($.jPlayer.event.timeupdate)},_html_setAudio:function(media){var self=this;$.each(this.formats,function(priority,format){if(self.html.support[format]&&media[format]){self.status.src=media[format];self.status.format[format]=true;self.status.formatType=format;return false}});this.htmlElement.media=this.htmlElement.audio;this._html_initMedia()},_html_setVideo:function(media){var self=this;$.each(this.formats,function(priority,format){if(self.html.support[format]&&media[format]){self.status.src=media[format];self.status.format[format]=true;self.status.formatType=format;return false}});this.htmlElement.media=this.htmlElement.video;this._html_initMedia()},_html_clearMedia:function(){if(this.htmlElement.media){if(this.htmlElement.media.id===this.internal.video.id)this.internal.video.jq.css({width:'0px',height:'0px'});this.htmlElement.media.pause();this.htmlElement.media.src="";this.htmlElement.media.load()}},_html_load:function(){if(this.status.waitForLoad){this.status.waitForLoad=false;this.htmlElement.media.src=this.status.src;this.htmlElement.media.load()};clearTimeout(this.internal.htmlDlyCmdId)},_html_play:function(time){var self=this;this._html_load();this.htmlElement.media.play();if(!isNaN(time))try{this.htmlElement.media.currentTime=time}catch(err){this.internal.htmlDlyCmdId=setTimeout(function(){self.play(time)},100);return};this._html_checkWaitForPlay()},_html_pause:function(time){var self=this;if(time>0){this._html_load()}else clearTimeout(this.internal.htmlDlyCmdId);this.htmlElement.media.pause();if(!isNaN(time))try{this.htmlElement.media.currentTime=time}catch(err){this.internal.htmlDlyCmdId=setTimeout(function(){self.pause(time)},100);return};if(time>0)this._html_checkWaitForPlay()},_html_playHead:function(percent){var self=this;this._html_load();try{if((typeof this.htmlElement.media.seekable==="object")&&(this.htmlElement.media.seekable.length>0)){this.htmlElement.media.currentTime=percent*this.htmlElement.media.seekable.end(this.htmlElement.media.seekable.length-1)/100}else if(this.htmlElement.media.duration>0&&!isNaN(this.htmlElement.media.duration)){this.htmlElement.media.currentTime=percent*this.htmlElement.media.duration/100}else throw"e"}catch(err){this.internal.htmlDlyCmdId=setTimeout(function(){self.playHead(percent)},100);return};if(!this.status.waitForLoad)this._html_checkWaitForPlay()},_html_checkWaitForPlay:function(){if(this.status.waitForPlay){this.status.waitForPlay=false;if(this.css.jq.videoPlay.length)this.css.jq.videoPlay.hide();if(this.status.video){this.internal.poster.jq.hide();this.internal.video.jq.css({width:this.status.width,height:this.status.height})}}},_html_volume:function(v){if(this.html.audio.available)this.htmlElement.audio.volume=v;if(this.html.video.available)this.htmlElement.video.volume=v},_html_mute:function(m){if(this.html.audio.available)this.htmlElement.audio.muted=m;if(this.html.video.available)this.htmlElement.video.muted=m},_flash_setAudio:function(media){var self=this;try{$.each(this.formats,function(priority,format){if(self.flash.support[format]&&media[format]){switch(format){case"m4a":case"fla":self._getMovie().fl_setAudio_m4a(media[format]);break;case"mp3":self._getMovie().fl_setAudio_mp3(media[format]);break};self.status.src=media[format];self.status.format[format]=true;self.status.formatType=format;return false}});if(this.options.preload==='auto'){this._flash_load();this.status.waitForLoad=false}}catch(err){this._flashError(err)}},_flash_setVideo:function(media){var self=this;try{$.each(this.formats,function(priority,format){if(self.flash.support[format]&&media[format]){switch(format){case"m4v":case"flv":self._getMovie().fl_setVideo_m4v(media[format]);break};self.status.src=media[format];self.status.format[format]=true;self.status.formatType=format;return false}});if(this.options.preload==='auto'){this._flash_load();this.status.waitForLoad=false}}catch(err){this._flashError(err)}},_flash_clearMedia:function(){this.internal.flash.jq.css({width:'0px',height:'0px'});try{this._getMovie().fl_clearMedia()}catch(err){this._flashError(err)}},_flash_load:function(){try{this._getMovie().fl_load()}catch(err){this._flashError(err)};this.status.waitForLoad=false},_flash_play:function(time){try{this._getMovie().fl_play(time)}catch(err){this._flashError(err)};this.status.waitForLoad=false;this._flash_checkWaitForPlay()},_flash_pause:function(time){try{this._getMovie().fl_pause(time)}catch(err){this._flashError(err)};if(time>0){this.status.waitForLoad=false;this._flash_checkWaitForPlay()}},_flash_playHead:function(p){try{this._getMovie().fl_play_head(p)}catch(err){this._flashError(err)};if(!this.status.waitForLoad)this._flash_checkWaitForPlay()},_flash_checkWaitForPlay:function(){if(this.status.waitForPlay){this.status.waitForPlay=false;if(this.css.jq.videoPlay.length)this.css.jq.videoPlay.hide();if(this.status.video){this.internal.poster.jq.hide();this.internal.flash.jq.css({width:this.status.width,height:this.status.height})}}},_flash_volume:function(v){try{this._getMovie().fl_volume(v)}catch(err){this._flashError(err)}},_flash_mute:function(m){try{this._getMovie().fl_mute(m)}catch(err){this._flashError(err)}},_getMovie:function(){return document[this.internal.flash.id]},_checkForFlash:function(version){var flashIsInstalled=false,flash;if(window.ActiveXObject){try{flash=new ActiveXObject(("ShockwaveFlash.ShockwaveFlash."+version));flashIsInstalled=true}catch(e){}}else if(navigator.plugins&&navigator.mimeTypes.length>0){flash=navigator.plugins["Shockwave Flash"];if(flash){var flashVersion=navigator.plugins["Shockwave Flash"].description.replace(/.*\s(\d+\.\d+).*/,"$1");if(flashVersion>=version)flashIsInstalled=true}};return flashIsInstalled},_validString:function(url){return(url&&typeof url==="string")},_limitValue:function(value,min,max){return(value<min)?min:((value>max)?max:value)},_urlNotSetError:function(context){this._error({type:$.jPlayer.error.URL_NOT_SET,context:context,message:$.jPlayer.errorMsg.URL_NOT_SET,hint:$.jPlayer.errorHint.URL_NOT_SET})},_flashError:function(error){var errorType;if(!this.internal.ready){errorType="FLASH"}else errorType="FLASH_DISABLED";this._error({type:$.jPlayer.error[errorType],context:this.internal.flash.swf,message:$.jPlayer.errorMsg[errorType]+error.message,hint:$.jPlayer.errorHint[errorType]})},_error:function(error){this._trigger($.jPlayer.event.error,error);if(this.options.errorAlerts)this._alert("Error!"+(error.message?"\n\n"+error.message:"")+(error.hint?"\n\n"+error.hint:"")+"\n\nContext: "+error.context)},_warning:function(warning){this._trigger($.jPlayer.event.warning,undefined,warning);if(this.options.warningAlerts)this._alert("Warning!"+(warning.message?"\n\n"+warning.message:"")+(warning.hint?"\n\n"+warning.hint:"")+"\n\nContext: "+warning.context)},_alert:function(message){alert("jPlayer "+this.version.script+" : id='"+this.internal.self.id+"' : "+message)},_emulateHtmlBridge:function(){var self=this,methods=$.jPlayer.emulateMethods;$.each($.jPlayer.emulateMethods.split(/\s+/g),function(i,name){self.internal.domNode[name]=function(arg){self[name](arg)}});$.each($.jPlayer.event,function(eventName,eventType){var nativeEvent=true;$.each($.jPlayer.reservedEvent.split(/\s+/g),function(i,name){if(name===eventName){nativeEvent=false;return false}});if(nativeEvent)self.element.bind(eventType+".jPlayer.jPlayerHtml",function(){self._emulateHtmlUpdate();var domEvent=document.createEvent("Event");domEvent.initEvent(eventName,false,true);self.internal.domNode.dispatchEvent(domEvent)})})},_emulateHtmlUpdate:function(){var self=this;$.each($.jPlayer.emulateStatus.split(/\s+/g),function(i,name){self.internal.domNode[name]=self.status[name]});$.each($.jPlayer.emulateOptions.split(/\s+/g),function(i,name){self.internal.domNode[name]=self.options[name]})},_destroyHtmlBridge:function(){var self=this;this.element.unbind(".jPlayerHtml");var emulated=$.jPlayer.emulateMethods+" "+$.jPlayer.emulateStatus+" "+$.jPlayer.emulateOptions;$.each(emulated.split(/\s+/g),function(i,name){delete self.internal.domNode[name]})}};$.jPlayer.error={FLASH:"e_flash",FLASH_DISABLED:"e_flash_disabled",NO_SOLUTION:"e_no_solution",NO_SUPPORT:"e_no_support",URL:"e_url",URL_NOT_SET:"e_url_not_set",VERSION:"e_version"};$.jPlayer.errorMsg={FLASH:"jPlayer's Flash fallback is not configured correctly, or a command was issued before the jPlayer Ready event. Details: ",FLASH_DISABLED:"jPlayer's Flash fallback has been disabled by the browser due to the CSS rules you have used. Details: ",NO_SOLUTION:"No solution can be found by jPlayer in this browser. Neither HTML nor Flash can be used.",NO_SUPPORT:"It is not possible to play any media format provided in setMedia() on this browser using your current options.",URL:"Media URL could not be loaded.",URL_NOT_SET:"Attempt to issue media playback commands, while no media url is set.",VERSION:"jPlayer "+$.jPlayer.prototype.version.script+" needs Jplayer.swf version "+$.jPlayer.prototype.version.needFlash+" but found "};$.jPlayer.errorHint={FLASH:"Check your swfPath option and that Jplayer.swf is there.",FLASH_DISABLED:"Check that you have not display:none; the jPlayer entity or any ancestor.",NO_SOLUTION:"Review the jPlayer options: support and supplied.",NO_SUPPORT:"Video or audio formats defined in the supplied option are missing.",URL:"Check media URL is valid.",URL_NOT_SET:"Use setMedia() to set the media URL.",VERSION:"Update jPlayer files."};$.jPlayer.warning={CSS_SELECTOR_COUNT:"e_css_selector_count",CSS_SELECTOR_METHOD:"e_css_selector_method",CSS_SELECTOR_STRING:"e_css_selector_string",OPTION_KEY:"e_option_key"};$.jPlayer.warningMsg={CSS_SELECTOR_COUNT:"The number of css selectors found did not equal one: ",CSS_SELECTOR_METHOD:"The methodName given in jPlayer('cssSelector') is not a valid jPlayer method.",CSS_SELECTOR_STRING:"The methodCssSelector given in jPlayer('cssSelector') is not a String or is empty.",OPTION_KEY:"The option requested in jPlayer('option') is undefined."};$.jPlayer.warningHint={CSS_SELECTOR_COUNT:"Check your css selector and the ancestor.",CSS_SELECTOR_METHOD:"Check your method name.",CSS_SELECTOR_STRING:"Check your css selector is a string.",OPTION_KEY:"Check your option name."}})(jQuery)
diff --git a/apps/media/js/loader.js b/apps/media/js/loader.js
deleted file mode 100644
index ffe9c1cdd6..0000000000
--- a/apps/media/js/loader.js
+++ /dev/null
@@ -1,59 +0,0 @@
-function musicTypeFromFile(file){
-	var extension=file.substr(file.indexOf('.')+1).toLowerCase();
-	if(extension=='ogg'){
-		return 'oga';
-	}
-	//TODO check for more specific cases
-	return extension;
-}
-
-function playAudio(filename){
-	loadPlayer(musicTypeFromFile(filename),function(){
-		PlayList.add($('#dir').val()+'/'+filename);
-		PlayList.play(PlayList.items.length-1);
-	});
-}
-
-function addAudio(filename){
-	loadPlayer(musicTypeFromFile(filename),function(){
-		PlayList.add($('#dir').val()+'/'+filename);
-	});
-}
-
-function loadPlayer(type,ready){
-	if(!loadPlayer.done){
-		loadPlayer.done=true;
-		OC.addStyle('media','player');
-		OC.addScript('media','jquery.jplayer.min',function(){
-			OC.addScript('media','player',function(){
-				var navItem=$('#apps a[href="'+OC.linkTo('media','index.php')+'"]');
-				navItem.height(navItem.height());
-				navItem.load(OC.filePath('media','templates','player.php'),function(){
-					PlayList.init(type,ready);
-				});
-			});
-		});
-	}else{
-		ready();
-	}
-}
-
-$(document).ready(function() {
-	loadPlayer.done=false;
-
-// 	FileActions.register('audio','Add to playlist','',addAudio);
-// 	FileActions.register('application/ogg','Add to playlist','',addAudio);
-
-	if(typeof FileActions!=='undefined'){
-		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');
-	}
-	var oc_current_user=OC.currentUser;
-	if(typeof PlayList==='undefined'){
-		if(OC.localStorage.getItem('playlist_items') && OC.localStorage.getItem('playlist_items').length && OC.localStorage.getItem('playlist_active')!=true){
-			loadPlayer();
-		}
-	}
-});
diff --git a/apps/media/js/music.js b/apps/media/js/music.js
deleted file mode 100644
index db12922762..0000000000
--- a/apps/media/js/music.js
+++ /dev/null
@@ -1,57 +0,0 @@
-$(document).ready(function(){
-	OC.search.customResults.Music=function(row,item){
-		var parts=item.link.substr(item.link.indexOf('#')+1).split('&');
-		var data={};
-		for(var i=0;i<parts.length;i++){
-			var itemParts=parts[i].split('=');
-			data[itemParts[0]]=itemParts[1].replace(/\+/g,' ');
-		}
-		var media=Collection.find(data.artist,data.album,data.song);
-		var a=row.find('a');
-		a.attr('href','#');
-		a.click(function(){
-			var oldSize=PlayList.items.length;
-			PlayList.add(media);
-			PlayList.play(oldSize);
-			PlayList.render();
-		});
-		var button=$('<input type="button" title="'+t('media','Add album to playlist')+'" class="add"></input>');
-		button.css('background-image','url('+OC.imagePath('core','actions/play-add')+')');
-		button.click(function(event){
-			event.stopPropagation();
-			PlayList.add(media);
-			PlayList.render();
-		});
-		row.find('div.name').append(button);
-		button.tipsy({gravity:'n', fade:true, delayIn: 400, live:true});
-	};
-	Collection.display();
-
-	Collection.load(function(){
-		var urlVars=getUrlVars();
-		if(urlVars.artist){
-			var song=Collection.find(urlVars.artist,urlVars.album,urlVars.song);
-			PlayList.add(song);
-			PlayList.play(0);
-		}
-	});
-});
-
-function getUrlVars(){
-	var vars = {}, hash;
-	var hashes = window.location.hash.substr(1).split('&');
-	for(var i = 0; i < hashes.length; i++){
-		hash = hashes[i].split('=');
-		vars[hash[0]] = decodeURIComponent(hash[1]).replace(/\+/g,' ');
-	}
-	return vars;
-}
-
-function musicTypeFromFile(file){
-	var extension=file.split('.').pop().toLowerCase();
-	if(extension=='ogg'){
-		return 'oga';
-	}
-	//TODO check for more specific cases
-	return extension;
-}
diff --git a/apps/media/js/player.js b/apps/media/js/player.js
deleted file mode 100644
index 867ea80236..0000000000
--- a/apps/media/js/player.js
+++ /dev/null
@@ -1,214 +0,0 @@
-var PlayList={
-	urlBase:OC.linkTo('media','ajax/api.php')+'?action=play&path=',
-	current:-1,
-	items:[],
-	player:null,
-	volume:0.8,
-	active:false,
-	next:function(){
-		var items=PlayList.items;
-		var next=PlayList.current+1;
-		if(next>=items.length){
-			next=0;
-		}
-		PlayList.play(next);
-		PlayList.render();
-	},
-	previous:function(){
-		var items=PlayList.items;
-		var next=PlayList.current-1;
-		if(next<0){
-			next=items.length-1;
-		}
-		PlayList.play(next);
-		PlayList.render();
-	},
-	play:function(index,time,ready){
-		var items=PlayList.items;
-		if(index==null){
-			index=PlayList.current;
-		}
-		PlayList.save();
-		if(index>-1 && index<items.length){
-			PlayList.current=index;
-			if(PlayList.player){
-				if(PlayList.player.data('jPlayer').options.supplied!=items[index].type){//the the audio type changes we need to reinitialize jplayer
-					PlayList.player.jPlayer("play",time);
-					OC.localStorage.setItem('playlist_time',time);
-					PlayList.player.jPlayer("destroy");
-// 					PlayList.save(); // so that the init don't lose the playlist
-					PlayList.init(items[index].type,null); // init calls load that calls play
-				}else{
-					PlayList.player.jPlayer("setMedia", items[PlayList.current]);
-					$(".jp-current-song").html(items[PlayList.current].name);
-					items[index].playcount++;
-					PlayList.player.jPlayer("play",time);
-					if(index>0){
-						var previous=index-1;
-					}else{
-						var previous=items.length-1;
-					}
-					if(index+1<items.length){
-						var next=index+1;
-					}else{
-						var next=0;
-					}
-					$('.jp-next').attr('title',items[next].name);
-					$('.jp-previous').attr('title',items[previous].name);
-					if (typeof Collection !== 'undefined') {
-						Collection.registerPlay();
-					}
-					PlayList.render();
-					if(ready){
-						ready();
-					}
-				}
-			}else{
-				OC.localStorage.setItem('playlist_time',time);
-				OC.localStorage.setItem('playlist_playing',true);
-				PlayList.init(items[index].type,null); // init calls load that calls play
-			}
-		}
-		$(".song").removeClass("collection_playing");
-		$(".jp-playlist-" + index).addClass("collection_playing");
-	},
-	init:function(type,ready){
-		if(!PlayList.player){
-			$(".jp-previous").click(function() {
-				PlayList.previous();
-				$(this).blur();
-				PlayList.render();
-				return false;
-			});
-			$(".jp-next").click(function() {
-				PlayList.next();
-				$(this).blur();
-				PlayList.render();
-				return false;
-			});
-			PlayList.player=$('#jp-player');
-		}
-		$(PlayList.player).jPlayer({
-			ended:PlayList.next,
-			pause:function(){
-				OC.localStorage.setItem('playlist_playing',false);
-				document.title = "ownCloud";
-			},
-			play:function(event){
-				OC.localStorage.setItem('playlist_playing',true);
-				document.title = "\u25b8 " + event.jPlayer.status.media.name + " - " + event.jPlayer.status.media.artist + " - ownCloud";
-			},
-			supplied:type,
-			ready:function(){
-				PlayList.load();
-				if(ready){
-					ready();
-				}
-			},
-			volume:PlayList.volume,
-			cssSelectorAncestor:'.player-controls',
-			swfPath:OC.linkTo('media','js'),
-		});
-	},
-	add:function(song,dontReset){
-		if(!dontReset){
-			PlayList.items=[];//clear the playlist
-		}
-		if(!song){
-			return;
-		}
-		if(song.substr){//we are passed a string, asume it's a url to a song
-			PlayList.addFile(song,true);
-		}
-		if(song.albums){//a artist object was passed, add all albums inside it
-			$.each(song.albums,function(index,album){
-				PlayList.add(album,true);
-			});
-		} else if(song.songs){//a album object was passed, add all songs inside it
-			$.each(song.songs,function(index,song){
-				PlayList.add(song,true);
-			});
-		}
-		if(song.path){
-			var type=musicTypeFromFile(song.path);
-			var item={name:song.name,type:type,artist:song.artist,album:song.album,length:song.length,playcount:song.playCount};
-			item[type]=PlayList.urlBase+encodeURIComponent(song.path);
-			PlayList.items.push(item);
-		}
-	},
-	addFile:function(path){
-		var type=musicTypeFromFile(path);
-		var item={name:'unknown',artist:'unknown',album:'unknwon',type:type};
-		$.getJSON(OC.filePath('media','ajax','api.php')+'?action=get_path_info&path='+encodeURIComponent(path),function(song){
-			item.name=song.song_name;
-			item.artist=song.artist;
-			item.album=song.album;
-		});
-		item[type]=PlayList.urlBase+encodeURIComponent(path);
-		PlayList.items.push(item);
-	},
-	remove:function(index){
-		PlayList.items.splice(index,1);
-		PlayList.render();
-	},
-	render:function(){},
-	playing:function(){
-		if(!PlayList.player){
-			return false;
-		}else{
-			return !PlayList.player.data("jPlayer").status.paused;
-		}
-	},
-	save:function(){
-		OC.localStorage.setItem('playlist_items',PlayList.items);
-		OC.localStorage.setItem('playlist_current',PlayList.current);
-		if(PlayList.player) {
-			if(PlayList.player.data('jPlayer')) {
-				var time=Math.round(PlayList.player.data('jPlayer').status.currentTime);
-				OC.localStorage.setItem('playlist_time',time);
-				var volume=PlayList.player.data('jPlayer').options.volume*100;
-				OC.localStorage.setItem('playlist_volume',volume);
-			}
-		}
-		OC.localStorage.setItem('playlist_active',true);
-	},
-	load:function(){
-		PlayList.active=true;
-		OC.localStorage.setItem('playlist_active',true);
-		if(OC.localStorage.hasItem('playlist_items')){
-			PlayList.items=OC.localStorage.getItem('playlist_items');
-			if(PlayList.items && PlayList.items.length>0){
-				PlayList.current=OC.localStorage.getItem('playlist_current');
-				var time=OC.localStorage.getItem('playlist_time');
-				if(OC.localStorage.hasItem('playlist_volume')){
-					var volume=OC.localStorage.getItem('playlist_volume');
-					PlayList.volume=volume/100;
-					$('.jp-volume-bar-value').css('width',volume+'%');
-					if(PlayList.player.data('jPlayer')){
-						PlayList.player.jPlayer("option",'volume',volume/100);
-					}
-				}
-				if(OC.localStorage.getItem('playlist_playing')){
-					PlayList.play(null,time);
-				}else{
-					PlayList.play(null,time,function(){
-						PlayList.player.jPlayer("pause");
-					});
-				}
-				PlayList.render();
-			}
-		}
-	}
-}
-
-$(document).ready(function(){
-	$(window).bind('beforeunload', function (){
-		PlayList.save();
-		if(PlayList.active){
-			OC.localStorage.setItem('playlist_active',false);
-		}
-	});
-
-	$('jp-previous').tipsy({gravity:'n', fade:true, live:true});
-	$('jp-next').tipsy({gravity:'n', fade:true, live:true});
-})
diff --git a/apps/media/js/playlist.js b/apps/media/js/playlist.js
deleted file mode 100644
index 8e9e2a9153..0000000000
--- a/apps/media/js/playlist.js
+++ /dev/null
@@ -1,57 +0,0 @@
-PlayList.render=function(){
-	$('#playlist').show();
-
-	/*
-	 * We should not empty() PlayList.parent() but thorougly manage its
-	 * elements instead because some code might be attached to those.
-	 * JQuery tipsies are one of them. The following line make sure they
-	 * are all removed before we delete the associated <li/>.
-	 */
-	$(".tipsy").remove();
-
-	PlayList.parent.empty();
-	for(var i=0;i<PlayList.items.length;i++){
-		var item=PlayList.items[i];
-		var li=$('<li/>');
-		li.attr('class', 'jp-playlist-' + i);
-		li.attr('title', item.artist + ' - ' + item.name + '<br/>(' + item.album + ')');
-		var div = $('<div class="label">' + item.name + '</div>');
-		li.append(div);
-		$('.jp-playlist-' + i).tipsy({gravity:'w', fade:true, live:true, html:true});
-		var img=$('<img class="remove svg action" src="'+OC.imagePath('core','actions/delete')+'"/>');
-		img.click(function(event){
-			event.stopPropagation();
-			PlayList.remove($(this).parent().data('index'));
-		});
-		li.click(function(event){
-			PlayList.play($(this).data('index'));
-		});
-		li.append(img);
-		li.data('index',i);
-		li.addClass('song');
-		PlayList.parent.append(li);
-	}
-        $(".jp-playlist-" + PlayList.current).addClass("collection_playing");
-};
-PlayList.getSelected=function(){
-	return $('tbody td.name input:checkbox:checked').parent().parent();
-};
-PlayList.hide=function(){
-	$('#playlist').hide();
-};
-
-$(document).ready(function(){
-	PlayList.parent=$('#leftcontent');
-	PlayList.init();
-	$('#selectAll').click(function(){
-		if($(this).attr('checked')){
-			// Check all
-			$('#leftcontent li.song input:checkbox').attr('checked', true);
-			$('#leftcontent li.song input:checkbox').parent().addClass('selected');
-		}else{
-			// Uncheck all
-			$('#leftcontent li.song input:checkbox').attr('checked', false);
-			$('#leftcontent li.song input:checkbox').parent().removeClass('selected');
-		}
-	});
-});
diff --git a/apps/media/js/scanner.js b/apps/media/js/scanner.js
deleted file mode 100644
index a9321f9996..0000000000
--- a/apps/media/js/scanner.js
+++ /dev/null
@@ -1,44 +0,0 @@
-Scanner={
-	songsFound:0,
-	eventSource:null,
-	songsScanned:0,
-	findSongs:function(ready){
-		$.getJSON(OC.linkTo('media','ajax/api.php')+'?action=find_music',function(songs){
-			Scanner.songsFound=songs.length;
-			if(ready){
-				ready(songs);
-			}
-		});
-	},
-	scanCollection:function(ready){
-		$('#scanprogressbar').progressbar({
-			value:0,
-		});
-		$('#scanprogressbar').show();
-		Scanner.songsScanned=0;
-		Scanner.eventSource=new OC.EventSource(OC.linkTo('media','ajax/api.php'),{action:'scan'});
-		Scanner.eventSource.listen('count',function(total){
-			Scanner.songsFound=total;
-		});
-		Scanner.eventSource.listen('scanned',function(data){
-			Scanner.songsScanned=data.count;
-			$('#scan span.songCount').text(Scanner.songsScanned);
-			var progress=(Scanner.songsScanned/Scanner.songsFound)*100;
-			$('#scanprogressbar').progressbar('value',progress);
-		});
-		Scanner.eventSource.listen('done',function(count){
-			$('#scan input.start').show();
-			$('#scan input.stop').hide();
-			$('#scanprogressbar').hide();
-			Collection.load(Collection.display);
-			if(ready){
-				ready();
-			}
-		});
-		$('#scancount').show();
-	},
-	stop:function(){
-		Scanner.eventSource.close();
-	},
-
-};
diff --git a/apps/media/l10n/ar.php b/apps/media/l10n/ar.php
deleted file mode 100644
index 655589df8a..0000000000
--- a/apps/media/l10n/ar.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Music" => "الموسيقى",
-"Add album to playlist" => "أضف الالبوم الى القائمه",
-"Play" => "إلعب",
-"Pause" => "تجميد",
-"Previous" => "السابق",
-"Next" => "التالي",
-"Mute" => "إلغاء الصوت",
-"Unmute" => "تشغيل الصوت",
-"Rescan Collection" => "إعادة البحث عن ملفات الموسيقى",
-"Artist" => "الفنان",
-"Album" => "الألبوم",
-"Title" => "العنوان"
-);
diff --git a/apps/media/l10n/bg_BG.php b/apps/media/l10n/bg_BG.php
deleted file mode 100644
index e6c3c02d17..0000000000
--- a/apps/media/l10n/bg_BG.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Music" => "Музика",
-"Add album to playlist" => "Добавяне на албума към списъка за изпълнение",
-"Play" => "Пусни",
-"Pause" => "Пауза",
-"Previous" => "Предишна",
-"Next" => "Следваща",
-"Mute" => "Отнеми",
-"Unmute" => "Върни",
-"Rescan Collection" => "Повторно сканиране",
-"Artist" => "Артист",
-"Album" => "Албум",
-"Title" => "Заглавие"
-);
diff --git a/apps/media/l10n/ca.php b/apps/media/l10n/ca.php
deleted file mode 100644
index 6c0a1855f3..0000000000
--- a/apps/media/l10n/ca.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Music" => "Música",
-"Play" => "Reprodueix",
-"Pause" => "Pausa",
-"Previous" => "Anterior",
-"Next" => "Següent",
-"Mute" => "Mut",
-"Unmute" => "Activa el so",
-"Rescan Collection" => "Explora de nou la col·lecció",
-"Artist" => "Artista",
-"Album" => "Àlbum",
-"Title" => "Títol"
-);
diff --git a/apps/media/l10n/cs_CZ.php b/apps/media/l10n/cs_CZ.php
deleted file mode 100644
index badec7b62f..0000000000
--- a/apps/media/l10n/cs_CZ.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Music" => "Hudba",
-"Play" => "Přehrát",
-"Pause" => "Pauza",
-"Previous" => "Předchozí",
-"Next" => "Další",
-"Mute" => "Vypnout zvuk",
-"Unmute" => "Zapnout zvuk",
-"Rescan Collection" => "Znovu prohledat ",
-"Artist" => "Umělec",
-"Album" => "Album",
-"Title" => "Název"
-);
diff --git a/apps/media/l10n/da.php b/apps/media/l10n/da.php
deleted file mode 100644
index 776081842c..0000000000
--- a/apps/media/l10n/da.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Music" => "Musik",
-"Play" => "Afspil",
-"Pause" => "Pause",
-"Previous" => "Forrige",
-"Next" => "Næste",
-"Mute" => "Lydløs",
-"Unmute" => "Lyd til",
-"Rescan Collection" => "Genskan Samling",
-"Artist" => "Kunstner",
-"Album" => "Album",
-"Title" => "Titel"
-);
diff --git a/apps/media/l10n/de.php b/apps/media/l10n/de.php
deleted file mode 100644
index d3d288dc6f..0000000000
--- a/apps/media/l10n/de.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Music" => "Musik",
-"Play" => "Abspielen",
-"Pause" => "Pause",
-"Previous" => "Vorheriges",
-"Next" => "Nächstes",
-"Mute" => "Ton aus",
-"Unmute" => "Ton an",
-"Rescan Collection" => "Sammlung erneut scannen",
-"Artist" => "Künstler",
-"Album" => "Album",
-"Title" => "Titel"
-);
diff --git a/apps/media/l10n/el.php b/apps/media/l10n/el.php
deleted file mode 100644
index 9996180c03..0000000000
--- a/apps/media/l10n/el.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Music" => "Μουσική",
-"Play" => "Αναπαραγωγή",
-"Pause" => "Παύση",
-"Previous" => "Προηγούμενο",
-"Next" => "Επόμενο",
-"Mute" => "Σίγαση",
-"Unmute" => "Επαναφορά ήχου",
-"Rescan Collection" => "Επανασάρωση συλλογής",
-"Artist" => "Καλλιτέχνης",
-"Album" => "Άλμπουμ",
-"Title" => "Τίτλος"
-);
diff --git a/apps/media/l10n/eo.php b/apps/media/l10n/eo.php
deleted file mode 100644
index 084dbaa480..0000000000
--- a/apps/media/l10n/eo.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Music" => "Muziko",
-"Add album to playlist" => "Aldoni albumon al ludlisto",
-"Play" => "Ludi",
-"Pause" => "Paŭzigi",
-"Previous" => "Maljena",
-"Next" => "Jena",
-"Mute" => "Silentigi",
-"Unmute" => "Malsilentigi",
-"Rescan Collection" => "Reskani la aron",
-"Artist" => "Artisto",
-"Album" => "Albumo",
-"Title" => "Titolo"
-);
diff --git a/apps/media/l10n/es.php b/apps/media/l10n/es.php
deleted file mode 100644
index 100ab6a7a7..0000000000
--- a/apps/media/l10n/es.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Music" => "Música",
-"Play" => "Reproducir",
-"Pause" => "Pausa",
-"Previous" => "Anterior",
-"Next" => "Siguiente",
-"Mute" => "Silenciar",
-"Unmute" => "Quitar silencio",
-"Rescan Collection" => "Buscar canciones nuevas",
-"Artist" => "Artista",
-"Album" => "Álbum",
-"Title" => "Título"
-);
diff --git a/apps/media/l10n/et_EE.php b/apps/media/l10n/et_EE.php
deleted file mode 100644
index 4133cb84a9..0000000000
--- a/apps/media/l10n/et_EE.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Music" => "Muusika",
-"Play" => "Esita",
-"Pause" => "Paus",
-"Previous" => "Eelmine",
-"Next" => "Järgmine",
-"Mute" => "Vaikseks",
-"Unmute" => "Hääl tagasi",
-"Rescan Collection" => "Skänni kollekttsiooni uuesti",
-"Artist" => "Esitaja",
-"Album" => "Album",
-"Title" => "Pealkiri"
-);
diff --git a/apps/media/l10n/eu.php b/apps/media/l10n/eu.php
deleted file mode 100644
index d30e351916..0000000000
--- a/apps/media/l10n/eu.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Music" => "Musika",
-"Play" => "Erreproduzitu",
-"Pause" => "Pausarazi",
-"Previous" => "Aurrekoa",
-"Next" => "Hurrengoa",
-"Mute" => "Mututu",
-"Unmute" => "Ez Mututu",
-"Rescan Collection" => "Bireskaneatu Bilduma",
-"Artist" => "Artista",
-"Album" => "Albuma",
-"Title" => "Izenburua"
-);
diff --git a/apps/media/l10n/fa.php b/apps/media/l10n/fa.php
deleted file mode 100644
index 3bccdb0c50..0000000000
--- a/apps/media/l10n/fa.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Music" => "موسیقی",
-"Play" => "پخش کردن",
-"Pause" => "توقف کوتاه",
-"Previous" => "قبلی",
-"Next" => "بعدی",
-"Mute" => "خفه کردن",
-"Unmute" => "باز گشایی صدا",
-"Rescan Collection" => "دوباره بازرسی مجموعه ها",
-"Artist" => "هنرمند",
-"Album" => "آلبوم",
-"Title" => "عنوان"
-);
diff --git a/apps/media/l10n/fi_FI.php b/apps/media/l10n/fi_FI.php
deleted file mode 100644
index 2426f6a220..0000000000
--- a/apps/media/l10n/fi_FI.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?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/fr.php b/apps/media/l10n/fr.php
deleted file mode 100644
index 313a918d02..0000000000
--- a/apps/media/l10n/fr.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Music" => "Musique",
-"Add album to playlist" => "Ajouter l'album à la playlist",
-"Play" => "Lire",
-"Pause" => "Pause",
-"Previous" => "Précédent",
-"Next" => "Suivant",
-"Mute" => "Muet",
-"Unmute" => "Audible",
-"Rescan Collection" => "Réanalyser la Collection",
-"Artist" => "Artiste",
-"Album" => "Album",
-"Title" => "Titre"
-);
diff --git a/apps/media/l10n/gl.php b/apps/media/l10n/gl.php
deleted file mode 100644
index 69037b7d1f..0000000000
--- a/apps/media/l10n/gl.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Music" => "Música",
-"Play" => "Reproducir",
-"Pause" => "Pausar",
-"Previous" => "Anterior",
-"Next" => "Seguinte",
-"Mute" => "Silenciar",
-"Unmute" => "Restaurar volume",
-"Rescan Collection" => "Analizar a colección de novo",
-"Artist" => "Artista",
-"Album" => "Álbun",
-"Title" => "Título"
-);
diff --git a/apps/media/l10n/he.php b/apps/media/l10n/he.php
deleted file mode 100644
index 772bfb9028..0000000000
--- a/apps/media/l10n/he.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Music" => "מוזיקה",
-"Play" => "נגן",
-"Pause" => "השהה",
-"Previous" => "קודם",
-"Next" => "הבא",
-"Mute" => "השתק",
-"Unmute" => "בטל השתקה",
-"Rescan Collection" => "סריקת אוסף מחדש",
-"Artist" => "מבצע",
-"Album" => "אלבום",
-"Title" => "כותרת"
-);
diff --git a/apps/media/l10n/hr.php b/apps/media/l10n/hr.php
deleted file mode 100644
index bab149743c..0000000000
--- a/apps/media/l10n/hr.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Music" => "Glazba",
-"Play" => "Reprodukcija",
-"Pause" => "Pauza",
-"Previous" => "Prethodna",
-"Next" => "Sljedeća",
-"Mute" => "Utišaj zvuk",
-"Unmute" => "Uključi zvuk",
-"Rescan Collection" => "Ponovi skeniranje kolekcije",
-"Artist" => "Izvođač",
-"Album" => "Album",
-"Title" => "Naslov"
-);
diff --git a/apps/media/l10n/hu_HU.php b/apps/media/l10n/hu_HU.php
deleted file mode 100644
index 299e0af028..0000000000
--- a/apps/media/l10n/hu_HU.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Music" => "Zene",
-"Play" => "Lejátszás",
-"Pause" => "Szünet",
-"Previous" => "Előző",
-"Next" => "Következő",
-"Mute" => "Némítás",
-"Unmute" => "Némítás megszüntetése",
-"Rescan Collection" => "Gyűjtemény újraolvasása",
-"Artist" => "Előadó",
-"Album" => "Album",
-"Title" => "Cím"
-);
diff --git a/apps/media/l10n/ia.php b/apps/media/l10n/ia.php
deleted file mode 100644
index 597b36e10f..0000000000
--- a/apps/media/l10n/ia.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Music" => "Musica",
-"Play" => "Reproducer",
-"Pause" => "Pausa",
-"Previous" => "Previe",
-"Next" => "Proxime",
-"Mute" => "Mute",
-"Unmute" => "Con sono",
-"Rescan Collection" => "Rescannar collection",
-"Artist" => "Artista",
-"Album" => "Album",
-"Title" => "Titulo"
-);
diff --git a/apps/media/l10n/id.php b/apps/media/l10n/id.php
deleted file mode 100644
index 52b0bae0ee..0000000000
--- a/apps/media/l10n/id.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Music" => "Musik",
-"Play" => "Mainkan",
-"Pause" => "Jeda",
-"Previous" => "Sebelumnya",
-"Next" => "Selanjutnya",
-"Mute" => "Nonaktifkan suara",
-"Unmute" => "Aktifkan suara",
-"Rescan Collection" => "Pindai ulang Koleksi",
-"Artist" => "Artis",
-"Album" => "Album",
-"Title" => "Judul"
-);
diff --git a/apps/media/l10n/it.php b/apps/media/l10n/it.php
deleted file mode 100644
index 757392bcbd..0000000000
--- a/apps/media/l10n/it.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Music" => "Musica",
-"Play" => "Riproduci",
-"Pause" => "Pausa",
-"Previous" => "Precedente",
-"Next" => "Successivo",
-"Mute" => "Disattiva audio",
-"Unmute" => "Riattiva audio",
-"Rescan Collection" => "Nuova scansione collezione",
-"Artist" => "Artista",
-"Album" => "Album",
-"Title" => "Titolo"
-);
diff --git a/apps/media/l10n/ja_JP.php b/apps/media/l10n/ja_JP.php
deleted file mode 100644
index 7faa098250..0000000000
--- a/apps/media/l10n/ja_JP.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Music" => "ミュージック",
-"Play" => "再生",
-"Pause" => "一時停止",
-"Previous" => "前",
-"Next" => "次",
-"Mute" => "ミュート",
-"Unmute" => "ミュート解除",
-"Rescan Collection" => "コレクションの再スキャン",
-"Artist" => "アーティスト",
-"Album" => "アルバム",
-"Title" => "曲名"
-);
diff --git a/apps/media/l10n/ko.php b/apps/media/l10n/ko.php
deleted file mode 100644
index 844d9c3e08..0000000000
--- a/apps/media/l10n/ko.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Music" => "음악",
-"Play" => "재생",
-"Pause" => "일시 정지",
-"Previous" => "이전",
-"Next" => "다음",
-"Mute" => "음소거",
-"Unmute" => "음소거 해제",
-"Rescan Collection" => "모음집 재검색",
-"Artist" => "음악가",
-"Album" => "앨범",
-"Title" => "제목"
-);
diff --git a/apps/media/l10n/lb.php b/apps/media/l10n/lb.php
deleted file mode 100644
index 4a2727fcb1..0000000000
--- a/apps/media/l10n/lb.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Music" => "Musek",
-"Play" => "Ofspillen",
-"Pause" => "Paus",
-"Previous" => "Zeréck",
-"Next" => "Weider",
-"Mute" => "Toun ausmaachen",
-"Unmute" => "Toun umaachen",
-"Rescan Collection" => "Kollektioun nei scannen",
-"Artist" => "Artist",
-"Album" => "Album",
-"Title" => "Titel"
-);
diff --git a/apps/media/l10n/lt_LT.php b/apps/media/l10n/lt_LT.php
deleted file mode 100644
index 1761ffdc3b..0000000000
--- a/apps/media/l10n/lt_LT.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Music" => "Muzika",
-"Play" => "Groti",
-"Pause" => "Pristabdyti",
-"Previous" => "Atgal",
-"Next" => "Kitas",
-"Mute" => "Nutildyti",
-"Unmute" => "Įjungti garsą",
-"Rescan Collection" => "Atnaujinti kolekciją",
-"Artist" => "Atlikėjas",
-"Album" => "Albumas",
-"Title" => "Pavadinimas"
-);
diff --git a/apps/media/l10n/mk.php b/apps/media/l10n/mk.php
deleted file mode 100644
index 17816be751..0000000000
--- a/apps/media/l10n/mk.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Music" => "Музика",
-"Play" => "Пушти",
-"Pause" => "Пауза",
-"Previous" => "Претходно",
-"Next" => "Следно",
-"Mute" => "Занеми",
-"Unmute" => "Пушти глас",
-"Rescan Collection" => "Рескенирај ја колекцијата",
-"Artist" => "Изведувач",
-"Album" => "Албум",
-"Title" => "Наслов"
-);
diff --git a/apps/media/l10n/ms_MY.php b/apps/media/l10n/ms_MY.php
deleted file mode 100644
index aaa1c3edfb..0000000000
--- a/apps/media/l10n/ms_MY.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Music" => "Muzik",
-"Play" => "Main",
-"Pause" => "Jeda",
-"Previous" => "Sebelum",
-"Next" => "Seterus",
-"Mute" => "Bisu",
-"Unmute" => "Nyahbisu",
-"Rescan Collection" => "Imbas semula koleksi",
-"Artist" => "Artis",
-"Album" => "Album",
-"Title" => "Judul"
-);
diff --git a/apps/media/l10n/nb_NO.php b/apps/media/l10n/nb_NO.php
deleted file mode 100644
index dbed1526b7..0000000000
--- a/apps/media/l10n/nb_NO.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Music" => "Musikk",
-"Play" => "Spill",
-"Pause" => "Pause",
-"Previous" => "Forrige",
-"Next" => "Neste",
-"Mute" => "Demp",
-"Unmute" => "Skru på lyd",
-"Rescan Collection" => "Skan samling på nytt",
-"Artist" => "Artist",
-"Album" => "Album",
-"Title" => "Tittel"
-);
diff --git a/apps/media/l10n/nl.php b/apps/media/l10n/nl.php
deleted file mode 100644
index 705bf2a613..0000000000
--- a/apps/media/l10n/nl.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Music" => "Muziek",
-"Play" => "Afspelen",
-"Pause" => "Pauzeer",
-"Previous" => "Vorige",
-"Next" => "Volgende",
-"Mute" => "Dempen",
-"Unmute" => "Dempen uit",
-"Rescan Collection" => "Collectie opnieuw scannen",
-"Artist" => "Artiest",
-"Album" => "Album",
-"Title" => "Titel"
-);
diff --git a/apps/media/l10n/nn_NO.php b/apps/media/l10n/nn_NO.php
deleted file mode 100644
index 2579c7b6ba..0000000000
--- a/apps/media/l10n/nn_NO.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Music" => "Musikk",
-"Play" => "Spel",
-"Pause" => "Pause",
-"Previous" => "Førre",
-"Next" => "Neste",
-"Mute" => "Demp",
-"Unmute" => "Skru på lyd",
-"Rescan Collection" => "Skann samlinga på nytt",
-"Artist" => "Artist",
-"Album" => "Album",
-"Title" => "Tittel"
-);
diff --git a/apps/media/l10n/pl.php b/apps/media/l10n/pl.php
deleted file mode 100644
index 15a1ceca6d..0000000000
--- a/apps/media/l10n/pl.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Music" => "Muzyka",
-"Play" => "Odtwarzaj",
-"Pause" => "Wstrzymaj",
-"Previous" => "Poprzedni",
-"Next" => "Następny",
-"Mute" => "Wycisz",
-"Unmute" => "Wyłącz wyciszenie",
-"Rescan Collection" => "Przeszukaj kolekcję",
-"Artist" => "Wykonawca",
-"Album" => "Album",
-"Title" => "Tytuł"
-);
diff --git a/apps/media/l10n/pt_BR.php b/apps/media/l10n/pt_BR.php
deleted file mode 100644
index 6a1289cfa8..0000000000
--- a/apps/media/l10n/pt_BR.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Music" => "Música",
-"Play" => "Tocar",
-"Pause" => "Pausa",
-"Previous" => "Anterior",
-"Next" => "Próximo",
-"Mute" => "Mudo",
-"Unmute" => "Não Mudo",
-"Rescan Collection" => "Atualizar a Coleção",
-"Artist" => "Artista",
-"Album" => "Álbum",
-"Title" => "Título"
-);
diff --git a/apps/media/l10n/pt_PT.php b/apps/media/l10n/pt_PT.php
deleted file mode 100644
index e143c74d45..0000000000
--- a/apps/media/l10n/pt_PT.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Music" => "Musica",
-"Play" => "Reproduzir",
-"Pause" => "Pausa",
-"Previous" => "Anterior",
-"Next" => "Próximo",
-"Mute" => "Mudo",
-"Unmute" => "Som",
-"Rescan Collection" => "Reverificar coleção",
-"Artist" => "Artista",
-"Album" => "Álbum",
-"Title" => "Título"
-);
diff --git a/apps/media/l10n/ro.php b/apps/media/l10n/ro.php
deleted file mode 100644
index e356b376ba..0000000000
--- a/apps/media/l10n/ro.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Music" => "Muzică",
-"Play" => "Redă",
-"Pause" => "Pauză",
-"Previous" => "Precedent",
-"Next" => "Următor",
-"Mute" => "Fără sonor",
-"Unmute" => "Cu sonor",
-"Rescan Collection" => "Rescanează colecția",
-"Artist" => "Artist",
-"Album" => "Album",
-"Title" => "Titlu"
-);
diff --git a/apps/media/l10n/ru.php b/apps/media/l10n/ru.php
deleted file mode 100644
index 5426332a1b..0000000000
--- a/apps/media/l10n/ru.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Music" => "Музыка",
-"Play" => "Проиграть",
-"Pause" => "Пауза",
-"Previous" => "Предыдущий",
-"Next" => "Следующий",
-"Mute" => "Отключить звук",
-"Unmute" => "Включить звук",
-"Rescan Collection" => "Пересканировать коллекцию",
-"Artist" => "Исполнитель",
-"Album" => "Альбом",
-"Title" => "Название"
-);
diff --git a/apps/media/l10n/sk_SK.php b/apps/media/l10n/sk_SK.php
deleted file mode 100644
index cf0b5319e9..0000000000
--- a/apps/media/l10n/sk_SK.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Music" => "Hudba",
-"Play" => "Prehrať",
-"Pause" => "Pauza",
-"Previous" => "Predchádzajúce",
-"Next" => "Ďalšie",
-"Mute" => "Stlmiť",
-"Unmute" => "Nahlas",
-"Rescan Collection" => "Znovu skenovať zbierku",
-"Artist" => "Umelec",
-"Album" => "Album",
-"Title" => "Názov"
-);
diff --git a/apps/media/l10n/sl.php b/apps/media/l10n/sl.php
deleted file mode 100644
index 38fc1f2a1e..0000000000
--- a/apps/media/l10n/sl.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Music" => "Glasba",
-"Play" => "Predvajaj",
-"Pause" => "Premor",
-"Previous" => "Prejšnja",
-"Next" => "Naslednja",
-"Mute" => "Utišaj",
-"Unmute" => "Povrni glasnost",
-"Rescan Collection" => "Ponovno preišči zbirko",
-"Artist" => "Izvajalec",
-"Album" => "Album",
-"Title" => "Naslov"
-);
diff --git a/apps/media/l10n/sr.php b/apps/media/l10n/sr.php
deleted file mode 100644
index dff0daf435..0000000000
--- a/apps/media/l10n/sr.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Music" => "Музика",
-"Play" => "Пусти",
-"Pause" => "Паузирај",
-"Previous" => "Претходна",
-"Next" => "Следећа",
-"Mute" => "Искључи звук",
-"Unmute" => "Укључи звук",
-"Rescan Collection" => "Поново претражи збирку",
-"Artist" => "Извођач",
-"Album" => "Албум",
-"Title" => "Наслов"
-);
diff --git a/apps/media/l10n/sr@latin.php b/apps/media/l10n/sr@latin.php
deleted file mode 100644
index 6476898387..0000000000
--- a/apps/media/l10n/sr@latin.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Music" => "Muzika",
-"Play" => "Pusti",
-"Pause" => "Pauziraj",
-"Previous" => "Prethodna",
-"Next" => "Sledeća",
-"Mute" => "Isključi zvuk",
-"Unmute" => "Uključi zvuk",
-"Rescan Collection" => "Ponovo pretraži zbirku",
-"Artist" => "Izvođač",
-"Album" => "Album",
-"Title" => "Naslov"
-);
diff --git a/apps/media/l10n/sv.php b/apps/media/l10n/sv.php
deleted file mode 100644
index 1cf5497e7e..0000000000
--- a/apps/media/l10n/sv.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Music" => "Musik",
-"Add album to playlist" => "Lägg till album till spellistan",
-"Play" => "Spela",
-"Pause" => "Paus",
-"Previous" => "Föregående",
-"Next" => "Nästa",
-"Mute" => "Ljudlös",
-"Unmute" => "Ljud på",
-"Rescan Collection" => "Sök igenom samlingen",
-"Artist" => "Artist",
-"Album" => "Album",
-"Title" => "Titel"
-);
diff --git a/apps/media/l10n/th_TH.php b/apps/media/l10n/th_TH.php
deleted file mode 100644
index dc448b3268..0000000000
--- a/apps/media/l10n/th_TH.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Music" => "เพลง",
-"Play" => "เล่น",
-"Pause" => "หยุดชั่วคราว",
-"Previous" => "ก่อนหน้า",
-"Next" => "ถัดไป",
-"Mute" => "ปิดเสียง",
-"Unmute" => "เปิดเสียง",
-"Rescan Collection" => "ตรวจสอบไฟล์ที่เก็บไว้อีกครั้ง",
-"Artist" => "ศิลปิน",
-"Album" => "อัลบั้ม",
-"Title" => "ชื่อ"
-);
diff --git a/apps/media/l10n/tr.php b/apps/media/l10n/tr.php
deleted file mode 100644
index 1eaf98145a..0000000000
--- a/apps/media/l10n/tr.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Music" => "Müzik",
-"Play" => "Oynat",
-"Pause" => "Beklet",
-"Previous" => "Önceki",
-"Next" => "Sonraki",
-"Mute" => "Sesi kapat",
-"Unmute" => "Sesi aç",
-"Rescan Collection" => "Koleksiyonu Tara",
-"Artist" => "Sanatç",
-"Album" => "Albüm",
-"Title" => "Başlık"
-);
diff --git a/apps/media/l10n/uk.php b/apps/media/l10n/uk.php
deleted file mode 100644
index 4ac7abbf2b..0000000000
--- a/apps/media/l10n/uk.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Music" => "Музика",
-"Add album to playlist" => "Додати альбом до плейлиста",
-"Play" => "Грати",
-"Pause" => "Пауза",
-"Previous" => "Попередній",
-"Next" => "Наступний",
-"Mute" => "Звук вкл.",
-"Unmute" => "Звук викл.",
-"Rescan Collection" => "Повторне сканування колекції",
-"Artist" => "Виконавець",
-"Album" => "Альбом",
-"Title" => "Заголовок"
-);
diff --git a/apps/media/l10n/vi.php b/apps/media/l10n/vi.php
deleted file mode 100644
index 01942ba173..0000000000
--- a/apps/media/l10n/vi.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?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/apps/media/l10n/xgettextfiles b/apps/media/l10n/xgettextfiles
deleted file mode 100644
index 39a310a453..0000000000
--- a/apps/media/l10n/xgettextfiles
+++ /dev/null
@@ -1,6 +0,0 @@
-../appinfo/app.php
-../templates/music.php
-../js/scanner.js
-../js/collection.js
-../js/music.js
-../js/playlist.js
diff --git a/apps/media/l10n/zh_CN.GB2312.php b/apps/media/l10n/zh_CN.GB2312.php
deleted file mode 100644
index de7e98acd9..0000000000
--- a/apps/media/l10n/zh_CN.GB2312.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Music" => "音乐",
-"Add album to playlist" => "添加专辑到播放列表",
-"Play" => "播放",
-"Pause" => "暂停",
-"Previous" => "前面的",
-"Next" => "下一个",
-"Mute" => "静音",
-"Unmute" => "取消静音",
-"Rescan Collection" => "重新扫描收藏",
-"Artist" => "艺术家",
-"Album" => "专辑",
-"Title" => "标题"
-);
diff --git a/apps/media/l10n/zh_CN.php b/apps/media/l10n/zh_CN.php
deleted file mode 100644
index 0b24cf3fe0..0000000000
--- a/apps/media/l10n/zh_CN.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Music" => "音乐",
-"Play" => "播放",
-"Pause" => "暂停",
-"Previous" => "前一首",
-"Next" => "后一首",
-"Mute" => "静音",
-"Unmute" => "取消静音",
-"Rescan Collection" => "重新扫描收藏",
-"Artist" => "艺术家",
-"Album" => "专辑",
-"Title" => "标题"
-);
diff --git a/apps/media/l10n/zh_TW.php b/apps/media/l10n/zh_TW.php
deleted file mode 100644
index cd90300bb4..0000000000
--- a/apps/media/l10n/zh_TW.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Music" => "音樂",
-"Play" => "播放",
-"Pause" => "暫停",
-"Previous" => "上一首",
-"Next" => "下一首",
-"Mute" => "靜音",
-"Unmute" => "取消靜音",
-"Rescan Collection" => "重新掃描收藏",
-"Artist" => "藝人",
-"Album" => "專輯",
-"Title" => "標題"
-);
diff --git a/apps/media/lib/share/album.php b/apps/media/lib/share/album.php
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/apps/media/lib/share/artist.php b/apps/media/lib/share/artist.php
deleted file mode 100644
index d08a53da2a..0000000000
--- a/apps/media/lib/share/artist.php
+++ /dev/null
@@ -1,65 +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_Artist extends OCP\Share_Backend {
-
-	public function getSource($item, $uid) {
-		$query = OCP\DB::prepare('SELECT `artist_id` FROM `*PREFIX*media_artists` WHERE `artist_id` = ? AND `song_user` = ?');
-		$result = $query->execute(array($item, $uid))->fetchRow();
-		if (is_array($result)) {
-			return array('item' => $item, 'file' => $result['song_path']);
-		}
-		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) {
-		$ids = array();
-		foreach ($items as $id => $info) {
-			$ids[] = $id;
-		}
-		$ids = "'".implode("','", $ids)."'";
-		switch ($format) {
-			case self::FORMAT_SOURCE_PATH:
-				$query = OCP\DB::prepare('SELECT `path` FROM `*PREFIX*fscache` WHERE `id` IN ('.$ids.')');
-				return $query->execute()->fetchAll();
-			case 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'] = $items[$file['id']]['item_target'];
-					$file['name'] = basename($file['path']);
-					// TODO Set permissions: $file['writable']
-					$files[] = $file;
-				}
-				return $files;
-		}
-	}
-
-}
-
-?>
\ No newline at end of file
diff --git a/apps/media/lib/share/song.php b/apps/media/lib/share/song.php
deleted file mode 100644
index 6594858173..0000000000
--- a/apps/media/lib/share/song.php
+++ /dev/null
@@ -1,65 +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_Song extends OCP\Share_Backend {
-
-	public function getSource($item, $uid) {
-		$query = OCP\DB::prepare('SELECT `song_path` FROM `*PREFIX*media_songs` WHERE `song_id` = ? AND `song_user` = ?');
-		$result = $query->execute(array($item, $uid))->fetchRow();
-		if (is_array($result)) {
-			return array('item' => $item, 'file' => $result['song_path']);
-		}
-		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) {
-		$ids = array();
-		foreach ($items as $id => $info) {
-			$ids[] = $id;
-		}
-		$ids = "'".implode("','", $ids)."'";
-		switch ($format) {
-			case self::FORMAT_SOURCE_PATH:
-				$query = OCP\DB::prepare('SELECT `path` FROM `*PREFIX*fscache` WHERE `id` IN ('.$ids.')');
-				return $query->execute()->fetchAll();
-			case 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'] = $items[$file['id']]['item_target'];
-					$file['name'] = basename($file['path']);
-					// TODO Set permissions: $file['writable']
-					$files[] = $file;
-				}
-				return $files;
-		}
-	}
-
-}
-
-?>
\ No newline at end of file
diff --git a/apps/media/lib_ampache.php b/apps/media/lib_ampache.php
deleted file mode 100644
index 807d94bcde..0000000000
--- a/apps/media/lib_ampache.php
+++ /dev/null
@@ -1,421 +0,0 @@
-<?php
-
-/**
-* ownCloud - media plugin
-*
-* @author Robin Appelman
-* @copyright 2010 Robin Appelman icewind1991@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/>.
-* 
-*/
-
-//implementation of ampache's xml api
-class OC_MEDIA_AMPACHE{
-	
-	/**
-	* fix the string to be XML compatible
-	* @param string name
-	* @return string
-	*/
-	
-	/* this is an ugly hack(tm), this should be: */
-	/* htmlentities($name, ENT_XML1, 'UTF-8');   */
-	/* with PHP 5.4 and later		     */
-	public static function fixXmlString($name){
-	       $result=str_replace("&", "&amp;", $name);
-	       $result=str_replace("'", "&apos;", $result);
-	       $result=str_replace("<", "&lt;", $result);
-	       $result=str_replace(">", "&gt;", $result);
-	       $result=str_replace("\"", "&quot;", $result);
-       	       $result=str_replace("Ä", "&#196;", $result);
-       	       $result=str_replace("Ö", "&#214;", $result);
-       	       $result=str_replace("Ü", "&#220;", $result);
-       	       $result=str_replace("ä", "&#228;", $result);
-       	       $result=str_replace("ö", "&#246;", $result);
-       	       $result=str_replace("ü", "&#252;", $result);
-       	       $result=str_replace("ß", "&#223;", $result);
-	       return $result;
-	}
-	
-	/**
-	* do the initial handshake
-	* @param array params
-	*/
-	public static function handshake($params){
-		$auth=(isset($params['auth']))?$params['auth']:false;
-		$user=(isset($params['user']))?$params['user']:false;
-		$time=(isset($params['timestamp']))?$params['timestamp']:false;
-		$now=time();
-		if($now-$time>(10*60)){
-			echo('<?xml version="1.0" encoding="UTF-8"?>');
-			echo("<root>
-	<error code='400'>timestamp is more then 10 minutes old</error>
-</root>");
-		}
-		if($auth and $user and $time){
-			$query=OCP\DB::prepare("SELECT `user_id`, `user_password_sha256` FROM `*PREFIX*media_users` WHERE `user_id`=?");
-			$users=$query->execute(array($user))->fetchAll();
-			if(count($users)>0){
-				$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
-					$songs=OC_MEDIA_COLLECTION::getSongCount();
-					$artists=OC_MEDIA_COLLECTION::getArtistCount();
-					$albums=OC_MEDIA_COLLECTION::getAlbumCount();
-					$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"?>');
-					echo("<root>
-	<auth>$token</auth>
-	<version>350001</version>
-	<update>$date</update>
-	<add>$date</add>
-	<clean>$date</clean>
-	<songs>$songs</songs>
-	<artists>$artists</artists>
-	<albums>$albums</albums>\
-	<session_length>600</session_length>
-	<session_expire>$expire</session_expire>
-	<tags>0</tags>
-	<videos>0</videos>
-</root>");
-					return;
-				}
-			}
-			echo('<?xml version="1.0" encoding="UTF-8"?>');
-			echo("<root>
-	<error code='400'>Invalid login</error>
-</root>");
-		}else{
-			echo('<?xml version="1.0" encoding="UTF-8"?>');
-			echo("<root>
-	<error code='400'>Missing arguments</error>
-</root>");
-		}
-	}
-	
-	public static function ping($params){
-		if(isset($params['auth'])){
-			if(self::checkAuth($params['auth'])){
-				self::updateAuth($params['auth']);
-			}else{
-				echo('<?xml version="1.0" encoding="UTF-8"?>');
-				echo("<root>
-	<error code='400'>Invalid login</error>
-</root>");
-				return;
-			}
-		}
-		echo('<?xml version="1.0" encoding="UTF-8"?>');
-		echo('<root>');
-		echo('<version>350001</version>');
-		echo('</root>');
-	}
-	
-	public static function checkAuth($auth){
-		if(is_array($auth)){
-			if(isset($auth['auth'])){
-				$auth=$auth['auth'];
-			}else{
-				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() - ".$interval.")");
-		$query->execute();
-		
-		$query=OCP\DB::prepare("SELECT `user_id` FROM `*PREFIX*media_sessions` WHERE `token`=?");
-		$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;
-		}
-	}
-	
-	public static function updateAuth($auth){
-		$query=OCP\DB::prepare("UPDATE `*PREFIX*media_sessions` SET `start`=CURRENT_TIMESTAMP WHERE `token`=?");
-		$query->execute(array($auth));
-	}
-	
-	private static function printArtist($artist){
-		$albums=count(OC_MEDIA_COLLECTION::getAlbums($artist['artist_id']));
-		$songs=count(OC_MEDIA_COLLECTION::getSongs($artist['artist_id']));
-		$id=$artist['artist_id'];
-		$name=self::fixXmlString($artist['artist_name']);
-		echo("\t<artist id='$id'>\n");
-		echo("\t\t<name>$name</name>\n");
-		echo("\t\t<albums>$albums</albums>\n");
-		echo("\t\t<songs>$songs</songs>\n");
-		echo("\t\t<rating>0</rating>\n");
-		echo("\t\t<preciserating>0</preciserating>\n");
-		echo("\t</artist>\n");
-	}
-	
-	private static function printAlbum($album,$artistName=false){
-		if(!$artistName){
-			$artistName=OC_MEDIA_COLLECTION::getArtistName($album['album_artist']);
-		}
-		$artistName=self::fixXmlString($artistName);
-		$songs=count(OC_MEDIA_COLLECTION::getSongs($album['album_artist'],$album['album_id']));
-		$id=$album['album_id'];
-		$name=self::fixXmlString($album['album_name']);
-		$artist=$album['album_artist'];
-		echo("\t<album id='$id'>\n");
-		echo("\t\t<name>$name</name>\n");
-		echo("\t\t<artist id='$artist'>$artistName</artist>\n");
-		echo("\t\t<tracks>$songs</tracks>\n");
-		echo("\t\t<rating>0</rating>\n");
-		echo("\t\t<year>0</year>\n"); /* make Viridian happy */
-		echo("\t\t<disk>1</disk>\n"); /* make Viridian happy */
-		echo("\t\t<art> </art>\n"); /* single space to make quickplay happy enough */
-		echo("\t\t<preciserating>0</preciserating>\n");
-		echo("\t</album>\n");
-	}
-	
-	private static function printSong($song,$artistName=false,$albumName=false){
-		if(!$artistName){
-			$artistName=OC_MEDIA_COLLECTION::getArtistName($song['song_artist']);
-		}
-		if(!$albumName){
-			$albumName=OC_MEDIA_COLLECTION::getAlbumName($song['song_album']);
-		}
-		$artistName=self::fixXmlString($artistName);
-		$albumName=self::fixXmlString($albumName);
-		$id=$song['song_id'];
-		$name=self::fixXmlString($song['song_name']);
-		$artist=$song['song_artist'];
-		$album=$song['song_album'];
-		echo("\t<song id='$id'>\n");
-		echo("\t\t<title>$name</title>\n");
-		echo("\t\t<artist id='$artist'>$artistName</artist>\n");
-		echo("\t\t<album id='$album'>$albumName</album>\n");
-		$url=OCP\Util::linkToRemote('ampache')."server/xml.server.php/?action=play&song=$id&auth={$_GET['auth']}";
-		$url=self::fixXmlString($url);
-		echo("\t\t<url>$url</url>\n");
-		echo("\t\t<time>{$song['song_length']}</time>\n");
-		echo("\t\t<track>{$song['song_track']}</track>\n");
-		echo("\t\t<size>{$song['song_size']}</size>\n");
-		echo("\t\t<art> </art>\n"); /* single space to make Viridian happy enough */
-		echo("\t\t<rating>0</rating>\n");
-		echo("\t\t<preciserating>0</preciserating>\n");
-		echo("\t</song>\n");
-	}
-	
-	public static function artists($params){
-		if(!self::checkAuth($params)){
-			echo('<?xml version="1.0" encoding="UTF-8"?>');
-			echo("<root>
-	<error code='400'>Invalid login</error>
-</root>");
-			return;
-		}
-		$filter=isset($params['filter'])?$params['filter']:'';
-		$exact=isset($params['exact'])?($params['exact']=='true'):false;
-		$artists=OC_MEDIA_COLLECTION::getArtists($filter,$exact);
-		echo('<?xml version="1.0" encoding="UTF-8"?>');
-		echo('<root>');
-		foreach($artists as $artist){
-			self::printArtist($artist);
-		}
-		echo('</root>');
-	}
-	
-	public static function artist_songs($params){
-		if(!self::checkAuth($params)){
-			echo('<?xml version="1.0" encoding="UTF-8"?>');
-			echo("<root>
-	<error code='400'>Invalid login</error>
-</root>");
-			return;
-		}
-		$filter=isset($params['filter'])?$params['filter']:'';
-		$songs=OC_MEDIA_COLLECTION::getSongs($filter);
-		$artist=OC_MEDIA_COLLECTION::getArtistName($filter);
-		echo('<?xml version="1.0" encoding="UTF-8"?>');
-		echo('<root>');
-		foreach($songs as $song){
-			self::printSong($song,$artist);
-		}
-		echo('</root>');
-	}
-	
-	public static function artist_albums($params){
-		if(!self::checkAuth($params)){
-			echo('<?xml version="1.0" encoding="UTF-8"?>');
-			echo("<root>
-	<error code='400'>Invalid login</error>
-</root>");
-			return;
-		}
-		$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"?>');
-		echo('<root>');
-		foreach($albums as $album){
-			self::printAlbum($album,$artist);
-		}
-		echo('</root>');
-	}
-	
-	public static function albums($params){
-		if(!self::checkAuth($params)){
-			echo('<?xml version="1.0" encoding="UTF-8"?>');
-			echo("<root>
-	<error code='400'>Invalid login</error>
-</root>");
-			return;
-		}
-		$filter=isset($params['filter'])?$params['filter']:'';
-		$exact=isset($params['exact'])?($params['exact']=='true'):false;
-		$albums=OC_MEDIA_COLLECTION::getAlbums(0,$filter,$exact);
-		echo('<?xml version="1.0" encoding="UTF-8"?>');	
-		echo('<root>');
-		foreach($albums as $album){
-			self::printAlbum($album,false);
-		}
-		echo('</root>');
-	}
-	
-	public static function album_songs($params){
-		if(!self::checkAuth($params)){
-			echo('<?xml version="1.0" encoding="UTF-8"?>');
-			echo("<root>
-	<error code='400'>Invalid login</error>
-</root>");
-			return;
-		}
-		$songs=OC_MEDIA_COLLECTION::getSongs(0,$params['filter']);
-		if(count($songs)>0){
-			$artist=OC_MEDIA_COLLECTION::getArtistName($songs[0]['song_artist']);
-		}
-		echo('<?xml version="1.0" encoding="UTF-8"?>');
-		echo('<root>');
-		foreach($songs as $song){
-			self::printSong($song,$artist);
-		}
-		echo('</root>');
-	}
-	
-	public static function songs($params){
-		if(!self::checkAuth($params)){
-			echo('<?xml version="1.0" encoding="UTF-8"?>');
-			echo("<root>
-	<error code='400'>Invalid login</error>
-</root>");
-			return;
-		}
-		$filter=isset($params['filter'])?$params['filter']:'';
-		$exact=isset($params['exact'])?($params['exact']=='true'):false;
-		$songs=OC_MEDIA_COLLECTION::getSongs(0,0,$filter,$exact);
-		echo('<?xml version="1.0" encoding="UTF-8"?>');
-		echo('<root>');
-		foreach($songs as $song){
-			self::printSong($song);
-		}
-		echo('</root>');
-	}
-	
-	public static function song($params){
-		if(!self::checkAuth($params)){
-			echo('<?xml version="1.0" encoding="UTF-8"?>');
-			echo("<root>
-	<error code='400'>Invalid login</error>
-</root>");
-			return;
-		}
-		if($song=OC_MEDIA_COLLECTION::getSong($params['filter'])){
-			echo('<?xml version="1.0" encoding="UTF-8"?>');
-			echo('<root>');
-			self::printSong($song);
-			echo('</root>');
-		}
-	}
-	
-	public static function play($params){
-		$username=!self::checkAuth($params);
-		if($username){
-			echo('<?xml version="1.0" encoding="UTF-8"?>');
-			echo("<root>
-	<error code='400'>Invalid login</error>
-</root>");
-			return;
-		}
-		if($song=OC_MEDIA_COLLECTION::getSong($params['song'])){
-			OC_Util::setupFS($song["song_user"]);
-
-			header('Content-type: '.OC_Filesystem::getMimeType($song['song_path']));
-			header('Content-Length: '.$song['song_size']);
-			OC_Filesystem::readfile($song['song_path']);
-		}
-	}
-	
-	public static function url_to_song($params){
-		if(!self::checkAuth($params)){
-			echo('<?xml version="1.0" encoding="UTF-8"?>');
-			echo("<root>
-	<error code='400'>Invalid login</error>
-</root>");
-			return;
-		}
-		$url=$params['url'];
-		$songId=substr($url,strrpos($url,'song=')+5);
-		if($song=OC_MEDIA_COLLECTION::getSong($songId)){
-			echo('<?xml version="1.0" encoding="UTF-8"?>');
-			echo('<root>');
-			self::printSong($song);
-			echo('</root>');
-		}
-	}
-	
-	public static function search_songs($params){
-		if(!self::checkAuth($params)){
-			echo('<?xml version="1.0" encoding="UTF-8"?>');
-			echo("<root>
-	<error code='400'>Invalid login</error>
-</root>");
-			return;
-		}
-		$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);
-		foreach($artists as $artist){
-			$songs=array_merge($songs,OC_MEDIA_COLLECTION::getSongs($artist['artist_id']));
-		}
-		foreach($albums as $album){
-			$songs=array_merge($songs,OC_MEDIA_COLLECTION::getSongs($album['album_artist'],$album['album_id']));
-		}
-		echo('<?xml version="1.0" encoding="UTF-8"?>');
-		echo('<root>');
-		foreach($songs as $song){
-			self::printSong($song);
-		}
-		echo('</root>');
-	}
-}
diff --git a/apps/media/lib_collection.php b/apps/media/lib_collection.php
deleted file mode 100644
index c7265caaec..0000000000
--- a/apps/media/lib_collection.php
+++ /dev/null
@@ -1,388 +0,0 @@
-<?php
-
-/**
-* ownCloud - media plugin
-*
-* @author Robin Appelman
-* @copyright 2010 Robin Appelman icewind1991@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 for managing a music collection
-class OC_MEDIA_COLLECTION{
-	public static $uid;
-	private static $artistIdCache=array();
-	private static $albumIdCache=array();
-	private static $queries=array();
-	
-	/**
-	* get the id of an artist (case-insensitive)
-	* @param string name
-	* @return int
-	*/
-	public static function getArtistId($name){
-		if(empty($name)){
-			return 0;
-		}
-		$name=strtolower($name);
-		if(isset(self::$artistIdCache[$name])){
-			return self::$artistIdCache[$name];
-		}else{
-			$query=OCP\DB::prepare("SELECT `artist_id` FROM `*PREFIX*media_artists` WHERE lower(`artist_name`) LIKE ?");
-			$artists=$query->execute(array($name))->fetchAll();
-			if(is_array($artists) and isset($artists[0])){
-				self::$artistIdCache[$name]=$artists[0]['artist_id'];
-				return $artists[0]['artist_id'];
-			}else{
-				return 0;
-			}
-		}
-	}
-
-	/**
-	* get the id of an album (case-insensitive)
-	* @param string name
-	* @param int artistId
-	* @return int
-	*/
-	public static function getAlbumId($name,$artistId){
-		if(empty($name)){
-			return 0;
-		}
-		$name=strtolower($name);
-		if(!isset(self::$albumIdCache[$artistId])){
-			self::$albumIdCache[$artistId]=array();
-		}
-		if(isset(self::$albumIdCache[$artistId][$name])){
-			return self::$albumIdCache[$artistId][$name];
-		}else{
-			$query=OCP\DB::prepare("SELECT `album_id` FROM `*PREFIX*media_albums` WHERE lower(`album_name`) LIKE ? AND `album_artist`=?");
-			$albums=$query->execute(array($name,$artistId))->fetchAll();
-			if(is_array($albums) and isset($albums[0])){
-				self::$albumIdCache[$artistId][$name]=$albums[0]['album_id'];
-				return $albums[0]['album_id'];
-			}else{
-				return 0;
-			}
-		}
-	}
-
-	/**
-	* get the id of an song (case-insensitive)
-	* @param string name
-	* @param int artistId
-	* @param int albumId
-	* @return int
-	*/
-	public static function getSongId($name,$artistId,$albumId){
-		if(empty($name)){
-			return 0;
-		}
-		$name=strtolower($name);
-		if(!isset(self::$albumIdCache[$artistId])){
-			self::$albumIdCache[$artistId]=array();
-		}
-		if(!isset(self::$albumIdCache[$artistId][$albumId])){
-			self::$albumIdCache[$artistId][$albumId]=array();
-		}
-		if(isset(self::$albumIdCache[$artistId][$albumId][$name])){
-			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 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'];
-				return $songs[0]['song_id'];
-			}else{
-				return 0;
-			}
-		}
-	}
-	
-	/**
-	* Get the list of artists that (optionally) match a search string
-	* @param string search optional
-	* @return array the list of artists found
-	*/
-	static public function getArtists($search='%',$exact=false){
-		$uid=self::$uid;
-		if(empty($uid)){
-			$uid=self::$uid=$_SESSION['user_id'];
-		}
-		if(!$exact and $search!='%'){
-			$search="%$search%";
-		}elseif($search==''){
-			$search='%';
-		}
-		$query=OCP\DB::prepare("SELECT DISTINCT `artist_name`, `artist_id` FROM `*PREFIX*media_artists`
-			INNER JOIN `*PREFIX*media_songs` ON `artist_id`=`song_artist` WHERE `artist_name` LIKE ? AND `song_user`=? ORDER BY `artist_name`");
-		$result=$query->execute(array($search,self::$uid));
-		return $result->fetchAll();
-	}
-	
-	/**
-	* Add an artists to the database
-	* @param string name
-	* @return integer the artist_id of the added artist
-	*/
-	static public function addArtist($name){
-		$name=trim($name);
-		if($name==''){
-			return 0;
-		}
-		//check if the artist is already in the database
-		$artistId=self::getArtistId($name);
-		if($artistId!=0){
-			return $artistId;
-		}else{
-			$query=OCP\DB::prepare("INSERT INTO `*PREFIX*media_artists` (`artist_name`) VALUES (?)");
-			$query->execute(array($name));
-			return self::getArtistId($name);;
-		}
-	}
-	
-	/**
-	* Get the list of albums that (optionally) match an artist and/or search string
-	* @param integer artist optional
-	* @param string search optional
-	* @return array the list of albums found
-	*/
-	static public function getAlbums($artist=0,$search='%',$exact=false){
-		$uid=self::$uid;
-		if(empty($uid)){
-			$uid=self::$uid=$_SESSION['user_id'];
-		}
-		$cmd="SELECT DISTINCT `album_name`, `album_artist`, `album_id`
-			FROM `*PREFIX*media_albums` INNER JOIN `*PREFIX*media_songs` ON `album_id`=`song_album` WHERE `song_user`=? ";
-		$params=array(self::$uid);
-		if($artist!=0){
-			$cmd.="AND `album_artist` = ? ";
-			array_push($params,$artist);
-		}
-		if($search!='%'){
-			$cmd.="AND `album_name` LIKE ? ";
-			if(!$exact){
-				$search="%$search%";
-			}
-			array_push($params,$search);
-		}
-		$cmd.=' ORDER BY `album_name`';
-		$query=OCP\DB::prepare($cmd);
-		return $query->execute($params)->fetchAll();
-	}
-	
-	/**
-	* Add an album to the database
-	* @param string name
-	* @param integer artist
-	* @return integer the album_id of the added artist
-	*/
-	static public function addAlbum($name,$artist){
-		$name=trim($name);
-		if($name==''){
-			return 0;
-		}
-		//check if the album is already in the database
-		$albumId=self::getAlbumId($name,$artist);
-		if($albumId!=0){
-			return $albumId;
-		}else{
-			$query=OCP\DB::prepare("INSERT INTO  `*PREFIX*media_albums` (`album_name` ,`album_artist`) VALUES ( ?, ?)");
-			$query->execute(array($name,$artist));
-			return self::getAlbumId($name,$artist);
-		}
-	}
-	
-	/**
-	* Get the list of songs that (optionally) match an artist and/or album and/or search string
-	* @param integer artist optional
-	* @param integer album optional
-	* @param string search optional
-	* @return array the list of songs found
-	*/
-	static public function getSongs($artist=0,$album=0,$search='',$exact=false){
-		$uid=self::$uid;
-		if(empty($uid)){
-			$uid=self::$uid=$_SESSION['user_id'];
-		}
-		$params=array($uid);
-		if($artist!=0){
-			$artistString="AND `song_artist` = ?";
-			array_push($params,$artist);
-		}else{
-			$artistString='';
-		}
-		if($album!=0){
-			$albumString="AND `song_album` = ?";
-			array_push($params,$album);
-		}else{
-			$albumString='';
-		}
-		if($search){
-			if(!$exact){
-				$search="%$search%";
-			}
-			$searchString ="AND `song_name` LIKE ?";
-			array_push($params,$search);
-		}else{
-			$searchString='';
-		}
-		$query=OCP\DB::prepare("SELECT * FROM `*PREFIX*media_songs` WHERE `song_user`=? $artistString $albumString $searchString ORDER BY `song_track`, `song_name`, `song_path`");
-		return $query->execute($params)->fetchAll();
-	}
-	
-	/**
-	* Add an song to the database
-	* @param string name
-	* @param string path
-	* @param integer artist
-	* @param integer album
-	* @return integer the song_id of the added artist
-	*/
-	static public function addSong($name,$path,$artist,$album,$length,$track,$size){
-		$name=trim($name);
-		$path=trim($path);
-		if($name=='' or $path==''){
-			return 0;
-		}
-		$uid=OCP\USER::getUser();
-		//check if the song is already in the database
-		$songId=self::getSongId($name,$artist,$album);
-		if($songId!=0){
-			$songInfo=self::getSong($songId);
-			self::moveSong($songInfo['song_path'],$path);
-			return $songId;
-		}else{
-			if(!isset(self::$queries['addsong'])){
-				$query=OCP\DB::prepare("INSERT INTO  `*PREFIX*media_songs` (`song_name` ,`song_artist` ,`song_album` ,`song_path` ,`song_user`,`song_length`,`song_track`,`song_size`,`song_playcount`,`song_lastplayed`)
-				VALUES (?, ?, ?, ?,?,?,?,?,0,0)");
-				self::$queries['addsong']=$query;
-			}else{
-				$query=self::$queries['addsong'];
-			}
-			$query->execute(array($name,$artist,$album,$path,$uid,$length,$track,$size));
-			$songId=OCP\DB::insertid('*PREFIX*media_songs_song');
-// 			self::setLastUpdated();
-			return self::getSongId($name,$artist,$album);
-		}
-	}
-	
-	public static function getSongCount(){
-		$query=OCP\DB::prepare("SELECT COUNT(`song_id`) AS `count` FROM `*PREFIX*media_songs`");
-		$result=$query->execute()->fetchAll();
-		return $result[0]['count'];
-	}
-	
-	public static function getArtistCount(){
-		$query=OCP\DB::prepare("SELECT COUNT(`artist_id`) AS `count` FROM `*PREFIX*media_artists`");
-		$result=$query->execute()->fetchAll();
-		return $result[0]['count'];
-	}
-	
-	public static function getAlbumCount(){
-		$query=OCP\DB::prepare("SELECT COUNT(`album_id`) AS `count` FROM `*PREFIX*media_albums`");
-		$result=$query->execute()->fetchAll();
-		return $result[0]['count'];
-	}
-	
-	public static function getArtistName($artistId){
-		$query=OCP\DB::prepare("SELECT `artist_name` FROM `*PREFIX*media_artists` WHERE `artist_id`=?");
-		$artist=$query->execute(array($artistId))->fetchAll();
-		if(count($artist)>0){
-			return $artist[0]['artist_name'];
-		}else{
-			return '';
-		}
-	}
-	
-	public static function getAlbumName($albumId){
-		$query=OCP\DB::prepare("SELECT `album_name` FROM `*PREFIX*media_albums` WHERE `album_id`=?");
-		$album=$query->execute(array($albumId))->fetchAll();
-		if(count($album)>0){
-			return $album[0]['album_name'];
-		}else{
-			return '';
-		}
-	}
-	
-	public static function getSong($id){
-		$query=OCP\DB::prepare("SELECT * FROM `*PREFIX*media_songs` WHERE `song_id`=?");
-		$song=$query->execute(array($id))->fetchAll();
-		if(count($song)>0){
-			return $song[0];
-		}else{
-			return '';
-		}
-	}
-	
-	/**
-	 * get the number of songs in a directory
-	 * @param string $path
-	 */
-	public static function getSongCountByPath($path){
-		$query=OCP\DB::prepare("SELECT COUNT(`song_id`) AS `count` FROM `*PREFIX*media_songs` WHERE `song_path` LIKE ?");
-		$result=$query->execute(array("$path%"))->fetchAll();
-		return $result[0]['count'];
-	}
-
-	/**
-	 * remove a song from the database by path
-	 * @param string $path the path of the song
-	 *
-	 * if a path of a folder is passed, all songs stored in the folder will be removed from the database
-	 */
-	public static function deleteSongByPath($path){
-		$query=OCP\DB::prepare("DELETE FROM `*PREFIX*media_songs` WHERE `song_path` LIKE ?");
-		$query->execute(array("$path%"));
-	}
-
-	/**
-	 * increase the play count of a song
-	 * @param int songId
-	 */
-	public static function registerPlay($songId){
-		$now=time();
-		$query=OCP\DB::prepare('UPDATE `*PREFIX*media_songs` SET `song_playcount`=`song_playcount`+1, `song_lastplayed`=? WHERE `song_id`=? AND `song_lastplayed`<?');
-		$query->execute(array($now,$songId,$now-60));
-	}
-
-	/**
-	 * get the id of the song by path
-	 * @param string $path
-	 * @return int
-	 */
-	public static function getSongByPath($path){
-		$query=OCP\DB::prepare("SELECT `song_id` FROM `*PREFIX*media_songs` WHERE `song_path` = ?");
-		$result=$query->execute(array($path));
-		if($row=$result->fetchRow()){
-			return $row['song_id'];
-		}else{
-			return 0;
-		}
-	}
-	
-	/**
-	 * set the path of a song
-	 * @param string $oldPath
-	 * @param string $newPath
-	 */
-	public static function moveSong($oldPath,$newPath){
-		$query=OCP\DB::prepare("UPDATE `*PREFIX*media_songs` SET `song_path` = ? WHERE `song_path` = ?");
-		$query->execute(array($newPath,$oldPath));
-	}
-}
diff --git a/apps/media/lib_media.php b/apps/media/lib_media.php
deleted file mode 100644
index ff58e4e735..0000000000
--- a/apps/media/lib_media.php
+++ /dev/null
@@ -1,97 +0,0 @@
-<?php
-
-/**
-* ownCloud - media plugin
-*
-* @author Robin Appelman
-* @copyright 2010 Robin Appelman icewind1991@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 diconnectstributed 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_MEDIA{
-	/**
-	 * get the sha256 hash of the password needed for ampache
-	 * @param array $params, parameters passed from OC_Hook
-	 */
-	public static function loginListener($params){
-		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']);
-				$query=OCP\DB::prepare("INSERT INTO `*PREFIX*media_users` (`user_id`, `user_password_sha256`) VALUES (?, ?);");
-				$query->execute(array($name,$password));
-			}
-		}
-	}
-	
-	/**
-	 *
-	 */
-	public static function updateFile($params){
-		$path=$params['path'];
-		if(!$path) return;
-		require_once 'lib_scanner.php';
-		require_once 'lib_collection.php';
-		//fix a bug where there were multiply '/' in front of the path, it should only be one
-		while($path[0]=='/'){
-			$path=substr($path,1);
-		}
-		$path='/'.$path;
-		OC_MEDIA_SCANNER::scanFile($path);
-	}
-
-	/**
-	 *
-	 */
-	public static function deleteFile($params){
-		$path=$params['path'];
-		require_once 'lib_collection.php';
-		OC_MEDIA_COLLECTION::deleteSongByPath($path);
-	}
-
-	public static function moveFile($params){
-		require_once 'lib_collection.php';
-		OC_MEDIA_COLLECTION::moveSong($params['oldpath'],$params['newpath']);
-	}
-}
-
-class OC_MediaSearchProvider extends OC_Search_Provider{
-	function search($query){
-		require_once('lib_collection.php');
-		$artists=OC_MEDIA_COLLECTION::getArtists($query);
-		$albums=OC_MEDIA_COLLECTION::getAlbums(0,$query);
-		$songs=OC_MEDIA_COLLECTION::getSongs(0,0,$query);
-		$results=array();
-		foreach($artists as $artist){
-			$results[]=new OC_Search_Result($artist['artist_name'],'',OCP\Util::linkTo( 'media', 'index.php').'#artist='.urlencode($artist['artist_name']),'Music');
-		}
-		foreach($albums as $album){
-			$artist=OC_MEDIA_COLLECTION::getArtistName($album['album_artist']);
-			$results[]=new OC_Search_Result($album['album_name'],'by '.$artist,OCP\Util::linkTo( 'media', 'index.php').'#artist='.urlencode($artist).'&album='.urlencode($album['album_name']),'Music');
-		}
-		foreach($songs as $song){
-			$minutes=floor($song['song_length']/60);
-			$secconds=$song['song_length']%60;
-			$artist=OC_MEDIA_COLLECTION::getArtistName($song['song_artist']);
-			$album=OC_MEDIA_COLLECTION::getalbumName($song['song_album']);
-			$results[]=new OC_Search_Result($song['song_name'],"by $artist, in $album $minutes:$secconds",OCP\Util::linkTo( 'media', 'index.php').'#artist='.urlencode($artist).'&album='.urlencode($album).'&song='.urlencode($song['song_name']),'Music');
-		}
-		return $results;
-	}
-}
-
diff --git a/apps/media/lib_scanner.php b/apps/media/lib_scanner.php
deleted file mode 100644
index 3c32879eee..0000000000
--- a/apps/media/lib_scanner.php
+++ /dev/null
@@ -1,138 +0,0 @@
-<?php
-
-/**
-* ownCloud - media plugin
-*
-* @author Robin Appelman
-* @copyright 2010 Robin Appelman icewind1991@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/>.
-* 
-*/
-
-require_once('getid3/getid3.php');
-
-//class for scanning directories for music
-class OC_MEDIA_SCANNER{
-	static private $getID3=false;
-	
-	//these are used to store which artists and albums we found, it can save a lot of addArtist/addAlbum calls
-	static private $artists=array();
-	static private $albums=array();//stored as "$artist/$album" to allow albums with the same name from different artists
-	
-	/**
-	 * scan a folder for music
-	 * @param OC_EventSource eventSource (optional)
-	 * @return int the number of songs found
-	 */
-	public static function scanCollection($eventSource=null){
-		$music=OC_FileCache::searchByMime('audio');
-		$ogg=OC_FileCache::searchByMime('application','ogg');
-		$music=array_merge($music,$ogg);
-		$eventSource->send('count',count($music));
-		$songs=0;
-		foreach($music as $file){
-			self::scanFile($file);
-			$songs++;
-			if($eventSource){
-				$eventSource->send('scanned',array('file'=>$file,'count'=>$songs));
-			}
-		}
-		if($eventSource){
-			$eventSource->send('done',$songs);
-		}
-		return $songs;
-	}
-
-	/**
-	 * scan a file for music
-	 * @param string $path
-	 * @return boolean
-	 */
-	public static function scanFile($path){
-		if(!self::isMusic($path)){
-			return;
-		}
-		if(!self::$getID3){
-			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'])){
-			OCP\Util::writeLog('media',"error reading id3 tags in '$file'",OCP\Util::WARN);
-			return;
-		}
-		if(!isset($data['comments']['artist'])){
-			OCP\Util::writeLog('media',"error reading artist tag in '$file'",OCP\Util::WARN);
-			$artist='unknown';
-		}else{
-			$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=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=OCP\Util::sanitizeHTML(stripslashes($data['comments']['title'][0]));
-		}
-		$size=$data['filesize'];
-		if (isset($data['comments']['track']))
-		{
-			$track = $data['comments']['track'][0];
-		}
-		else if (isset($data['comments']['track_number']))
-		{
-			$track = $data['comments']['track_number'][0];
-			$track = explode('/',$track);
-			$track = $track[0];
-		}
-		else
-		{
-			$track = 0;
-		}
-		$length=isset($data['playtime_seconds'])?round($data['playtime_seconds']):0;
-
-		if(!isset(self::$artists[$artist])){
-			$artistId=OC_MEDIA_COLLECTION::addArtist($artist);
-			self::$artists[$artist]=$artistId;
-		}else{
-			$artistId=self::$artists[$artist];
-		}
-		if(!isset(self::$albums[$artist.'/'.$album])){
-			$albumId=OC_MEDIA_COLLECTION::addAlbum($album,$artistId);
-			self::$albums[$artist.'/'.$album]=$albumId;
-		}else{
-			$albumId=self::$albums[$artist.'/'.$album];
-		}
-		$songId=OC_MEDIA_COLLECTION::addSong($title,$path,$artistId,$albumId,$length,$track,$size);
-		return (!($title=='unkown' && $artist=='unkown' && $album=='unkown'))?$songId:0;
-	}
-
-	/**
-	 * quick check if a song is a music file by checking the extension, not as good as a proper mimetype check but way faster
-	 * @param string $filename
-	 * @return bool
-	 */
-	public static function isMusic($filename){
-		$ext=strtolower(substr($filename,strrpos($filename,'.')+1));
-		return $ext=='mp3' || $ext=='flac' || $ext=='m4a' || $ext=='ogg' || $ext=='oga';
-	}
-}
diff --git a/apps/media/remote.php b/apps/media/remote.php
deleted file mode 100644
index 0535077cef..0000000000
--- a/apps/media/remote.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-// only need filesystem apps
-$RUNTIME_APPTYPES=array('filesystem','authentication');
-OC_App::loadApps($RUNTIME_APPTYPES);
-
-if($path_info == '/ampache' || $path_info == '/ampache/'){
-	require_once(OC_App::getAppPath('media').'/index.php');
-}else{
-	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
deleted file mode 100644
index 796da130a4..0000000000
--- a/apps/media/server/xml.server.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php
-
-/**
-* ownCloud - media plugin
-*
-* @author Robin Appelman
-* @copyright 2010 Robin Appelman icewind1991@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/>.
-* 
-*/
-
-OCP\App::checkAppEnabled('media');
- 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'])){
-	$arguments=$_GET;
-}
-
-foreach($arguments as &$argument){
-	$argument=stripslashes($argument);
-}
-@ob_clean();
-if(isset($arguments['action'])){
-	OCP\Util::writeLog('media','ampache '.$arguments['action'].' request', OCP\Util::DEBUG);
-	switch($arguments['action']){
-		case 'songs':
-			OC_MEDIA_AMPACHE::songs($arguments);
-			break;
-		case 'url_to_song':
-			OC_MEDIA_AMPACHE::url_to_song($arguments);
-			break;
-		case 'play':
-			OC_MEDIA_AMPACHE::play($arguments);
-			break;
-		case 'handshake':
-			OC_MEDIA_AMPACHE::handshake($arguments);
-			break;
-		case 'ping':
-			OC_MEDIA_AMPACHE::ping($arguments);
-			break;
-		case 'artists':
-			OC_MEDIA_AMPACHE::artists($arguments);
-			break;
-		case 'artist_songs':
-			OC_MEDIA_AMPACHE::artist_songs($arguments);
-			break;
-		case 'artist_albums':
-			OC_MEDIA_AMPACHE::artist_albums($arguments);
-			break;
-		case 'albums':
-			OC_MEDIA_AMPACHE::albums($arguments);
-			break;
-		case 'album_songs':
-			OC_MEDIA_AMPACHE::album_songs($arguments);
-			break;
-		case 'search_songs':
-			OC_MEDIA_AMPACHE::search_songs($arguments);
-			break;
-		case 'song':
-			OC_MEDIA_AMPACHE::song($arguments);
-			break;
-	}
-}
-
-?> 
diff --git a/apps/media/settings.php b/apps/media/settings.php
deleted file mode 100644
index 53738f02f9..0000000000
--- a/apps/media/settings.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php
-
-$tmpl = new OCP\Template( 'media', 'settings');
-
-return $tmpl->fetchPage();
diff --git a/apps/media/templates/music.php b/apps/media/templates/music.php
deleted file mode 100644
index 589d6b5247..0000000000
--- a/apps/media/templates/music.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<div class='player-controls' id="controls">
-	<ul class="jp-controls">
-		<li><a href="#" class="jp-play action"><img class="svg" alt="<?php echo $l->t('Play');?>" src="<?php echo OCP\image_path('core', 'actions/play-big.svg'); ?>" /></a></li>
-		<li><a href="#" class="jp-pause action"><img class="svg" alt="<?php echo $l->t('Pause');?>" src="<?php echo OCP\image_path('core', 'actions/pause-big.svg'); ?>" /></a></li>
-		<li><a href="#" class="jp-previous action"><img class="svg" alt="<?php echo $l->t('Previous');?>" src="<?php echo OCP\image_path('core', 'actions/play-previous.svg'); ?>" /></a></li>
-		<li><a href="#" class="jp-next action"><img class="svg" alt="<?php echo $l->t('Next');?>" src="<?php echo OCP\image_path('core', 'actions/play-next.svg'); ?>" /></a></li>
-		<li><a href="#" class="jp-mute action"><img class="svg" alt="<?php echo $l->t('Mute');?>" src="<?php echo OCP\image_path('core', 'actions/sound.svg'); ?>" /></a></li>
-		<li><a href="#" class="jp-unmute action"><img class="svg" alt="<?php echo $l->t('Unmute');?>" src="<?php echo OCP\image_path('core', 'actions/sound-off.svg'); ?>" /></a></li>
-	</ul>
-	<div class="jp-progress">
-		<div class="jp-seek-bar">
-			<div class="jp-play-bar"></div>
-		</div>
-	</div>
-	<div class="jp-current-time"></div>
-	<div class="jp-duration"></div>
-	<div class="jp-volume-bar">
-		<div class="jp-volume-bar-value"></div>
-	</div>
-        <div class="jp-current-song"></div>
-
-	<div class="player" id="jp-player"></div>
-
-	<div id="scan">
-		<input type="button" class="start" value="<?php echo $l->t('Rescan Collection')?>" />
-		<input type="button" class="stop" style="display:none" value="<?php echo $l->t('Pause')?>" />
-		<div id="scanprogressbar"></div>
-	</div>
-</div>
-
-<ul id="leftcontent"></ul>
-
-<div id="rightcontent">
-<table id="collection">
-	<thead>
-		<tr>
-			<th><?php echo $l->t('Artist')?></th>
-			<th><?php echo $l->t('Album')?></th>
-			<th><?php echo $l->t('Title')?></th>
-		</tr>
-	</thead>
-	<tbody>
-		<tr class="template">
-			<td class="artist"><a></a></td>
-			<td class="artist-expander"><a></a></td>
-			<td class="album"><a></a></td>
-			<td class="album-expander"><a></a></td>
-			<td class="title"><a></a></td>
-		</tr>
-	</tbody>
-</table>
-</div>
diff --git a/apps/media/templates/player.php b/apps/media/templates/player.php
deleted file mode 100644
index 6c14006f83..0000000000
--- a/apps/media/templates/player.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-if(!isset($_)){//allow the template to be loaded standalone
-	$tmpl = new OCP\Template( 'media', 'player');
-	$tmpl->printPage();
-	exit;
-}
-?>
-<?php echo $l->t('Music');?>
-<div class='player-controls' id="playercontrols">
-	<div class="player" id="jp-player"></div>
-	<ul class="jp-controls">
-		<li><a href="#" class="jp-play action"><img class="svg" alt="<?php echo $l->t('Play');?>" src="<?php echo OCP\image_path('core', 'actions/play.svg'); ?>" /></a></li>
-		<li><a href="#" class="jp-pause action"><img class="svg" alt="<?php echo $l->t('Pause');?>" src="<?php echo OCP\image_path('core', 'actions/pause.svg'); ?>" /></a></li>
-		<li><a href="#" class="jp-next action"><img class="svg" alt="<?php echo $l->t('Next');?>" src="<?php echo OCP\image_path('core', 'actions/play-next.svg'); ?>" /></a></li>
-	</ul>
-</div>
\ No newline at end of file
diff --git a/apps/media/templates/settings.php b/apps/media/templates/settings.php
deleted file mode 100644
index a7dc0775c4..0000000000
--- a/apps/media/templates/settings.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<form id="mediaform">
-	<fieldset class="personalblock">
-		<strong>Media</strong><br />
-		Ampache address: 
-		<code><?php echo OCP\Util::linkToRemote('ampache'); ?></code><br />
-	</fieldset>
-</form>
diff --git a/apps/remoteStorage/BearerAuth.php b/apps/remoteStorage/BearerAuth.php
deleted file mode 100644
index ebcf189dfb..0000000000
--- a/apps/remoteStorage/BearerAuth.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-
-/**
- * HTTP Bearer Authentication handler
- *
- * Use this class for easy http authentication setup
- * 
- * @package Sabre
- * @subpackage HTTP 
- * @copyright Copyright (C) 2007-2011 Rooftop Solutions. 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_BearerAuth 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');
-
-        if (!$auth) return false;
-
-        if (strpos(strtolower($auth),'bearer')!==0) return false; 
-
-        return explode(':', base64_decode(substr($auth, 7)));
-
-    }
-
-    /**
-     * 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/apps/remoteStorage/ajax/revokeToken.php b/apps/remoteStorage/ajax/revokeToken.php
deleted file mode 100644
index e6a6818994..0000000000
--- a/apps/remoteStorage/ajax/revokeToken.php
+++ /dev/null
@@ -1,35 +0,0 @@
-<?php
-
-/**
-* ownCloud
-*
-* Original:
-* @author Frank Karlitschek
-* @copyright 2012 Frank Karlitschek frank@owncloud.org
-* 
-* Adapted:
-* @author Michiel de Jong, 2012
-*
-* 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\App::checkAppEnabled('remoteStorage');
-require_once('remoteStorage/lib_remoteStorage.php');
-
-ini_set('default_charset', 'UTF-8');
-#ini_set('error_reporting', '');
-@ob_clean();
-
-echo OC_remoteStorage::deleteToken(file_get_contents("php://input"));
diff --git a/apps/remoteStorage/appinfo/app.php b/apps/remoteStorage/appinfo/app.php
deleted file mode 100644
index c278fd7305..0000000000
--- a/apps/remoteStorage/appinfo/app.php
+++ /dev/null
@@ -1,2 +0,0 @@
-<?php
-OCP\App::registerPersonal('remoteStorage','settings');
diff --git a/apps/remoteStorage/appinfo/database.xml b/apps/remoteStorage/appinfo/database.xml
deleted file mode 100644
index d48f9f747b..0000000000
--- a/apps/remoteStorage/appinfo/database.xml
+++ /dev/null
@@ -1,52 +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*authtoken</name>
-		<declaration>
-			<field>
-				<name>token</name>
-				<type>text</type>
-				<default></default>
-				<notnull>true</notnull>
-				<length>40</length>
-			</field>
-			<field>
-				<name>appUrl</name>
-				<type>text</type>
-				<default></default>
-				<notnull>true</notnull>
-				<length>128</length>
-			</field>
-			<field>
-				<name>user</name>
-				<type>text</type>
-				<default></default>
-				<notnull>true</notnull>
-				<length>64</length>
-			 </field>
-			<field>
-				<name>category</name>
-				<type>text</type>
-				<default></default>
-				<notnull>true</notnull>
-				<length>64</length>
-			 </field>
-			<index>
-				<name>a_app_remotestorage_user</name>
-				<unique>true</unique>
-				<field>
-					<name>user</name>
-					<sorting>ascending</sorting>
-				</field>
-				<field>
-					<name>token</name>
-					<sorting>ascending</sorting>
-				</field>
-			</index>
-		</declaration>
-	</table>
-</database>
diff --git a/apps/remoteStorage/appinfo/info.xml b/apps/remoteStorage/appinfo/info.xml
deleted file mode 100644
index 1388ad9c31..0000000000
--- a/apps/remoteStorage/appinfo/info.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0"?>
-<info>
-	<id>remoteStorage</id>
-	<name>remoteStorage compatibility</name>
-	<description>Enables you to use ownCloud as their remote storage for unhosted applications. This app requires the Webfinger app to be installed and enabled correctly. More info on <a href="http://unhosted.org">the website of the unhosted movement</a>.</description>
-	<licence>AGPL or MIT</licence>
-	<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
deleted file mode 100644
index 0e2c93950b..0000000000
--- a/apps/remoteStorage/appinfo/version
+++ /dev/null
@@ -1 +0,0 @@
-0.7
\ No newline at end of file
diff --git a/apps/remoteStorage/appinfo/webfinger.php b/apps/remoteStorage/appinfo/webfinger.php
deleted file mode 100644
index e8b237628c..0000000000
--- a/apps/remoteStorage/appinfo/webfinger.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php if(OC_User::userExists(WF_USER)): ?>
-    {
-        "rel":"remoteStorage",
-        "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 endif ?>
diff --git a/apps/remoteStorage/auth.php b/apps/remoteStorage/auth.php
deleted file mode 100644
index 91ca43ea07..0000000000
--- a/apps/remoteStorage/auth.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php
-
-/**
-* ownCloud
-*
-* Original:
-* @author Frank Karlitschek
-* @copyright 2012 Frank Karlitschek frank@owncloud.org
-* 
-* Adapted:
-* @author Michiel de Jong, 2012
-*
-* 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/>.
-*
-*/
-
-header("X-Frame-Options: Sameorigin");
-
-OCP\App::checkAppEnabled('remoteStorage');
-require_once('Sabre/autoload.php');
-require_once('lib_remoteStorage.php');
-require_once('oauth_ro_auth.php');
-
-ini_set('default_charset', 'UTF-8');
-#ini_set('error_reporting', '');
-@ob_clean();
-
-foreach($_GET as $k => $v) {
-  if($k=='userid'){
-    $userId=$v;
-  } else if($k=='redirect_uri'){
-    $appUrlParts=explode('/', $v);
-    $appUrl = htmlentities($appUrlParts[2]);//TODO: check if this is equal to client_id
-  } else if($k=='scope'){
-    $categories=htmlentities($v);
-  }
-}
-$currUser = OCP\USER::getUser();
-if($userId && $appUrl && $categories) {
-  if($currUser == $userId) {
-    if(isset($_POST['allow'])) {
-      //TODO: check if this can be faked by editing the cookie in firebug!
-      $token=OC_remoteStorage::createCategories($appUrl, $categories);
-      header('Location: '.$_GET['redirect_uri'].'#access_token='.$token.'&token_type=bearer');
-    } else if($existingToken = OC_remoteStorage::getTokenFor($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:
-	$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));
-		} else {
-			// this will display the login page for us
-			OCP\Util::checkLoggedIn();
-		}
-	}
-} else {//params not ok
-	die('please use e.g. '.OCP\Util::linkTo('remoteStorage', 'auth.php').'?userid=admin&redirect_uri=http://host/path&scope=...');
-}
diff --git a/apps/remoteStorage/img/remoteStorage.png b/apps/remoteStorage/img/remoteStorage.png
deleted file mode 100644
index 10c2be243c2e30899ae54ae9d44b6f1141c0ec2e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1024
zcmV+b1poVqP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800004b3#c}2nYxW
zd<bNS00009a7bBm000fw000fw0YWI7cmMzZ8FWQhbW?9;ba!ELWdL_~cP?peYja~^
zaAhuUa%Y?FJQ@H11AR$EK~z}7y;n<XQ&AAUm>U%l#9tt|(I4Q}or@-+8=;`0py*EA
z6kJ<3E_7K?+*k#1B_iTNs9-1-sY1m>`iPaPiG7+hiG3LRxPCM9-Sk3p+q~-HBPVla
zzWL5;?m3R<c}`R4*mul}yDt>dZjz_*pi|BvFXrAs;w7L=EU8WUc1=K!v&V}^uOL|t
zSOJ!Sd19Hiocf4wTLmQClOP{rqDB1w&5>t`GHr|W8Pb@R1;m{r7}1kzVoO>C7Jvef
zAqun==|dqB3yy{bbUFt>&;yi|$VOLUl04S?7pFc&%+r>qPl++hjO$U(x&*`{=b-#M
zf+~UJMUGOE&H^*QH1L6#rfrr!1&!GhQ87+%hYE;CPrz{y*Z}@=Q!O&NjBJicrnnJh
z?cWkv+NS6;$Cx5HR>-+wIgo3s0CyN2-|)Kz{NXVxaWs}Z=Ki!~I+{t0@U=qPHfve>
z_#z7ASR&^da}3uKFve-`2L?EO3!G9WkN&V^k*~l6>@N+{R@<cdY>Jpy4&xdicSUoB
z2w11XCj{LD(HpMoR3P~Tcm5dqpD8RhLm?)@mSa{qgiAP$dwn|rHvRtS6OmpJUO+o(
zQ>V$tfl>H;wqpip8#e6|AD!l;#wtg37Pt)I0#><e%Yn5|f#fvMWu%%Yts{y>A1Z8g
zY4#=6S7Pjl`g@^F?$s~>qui<f+0AqMa~%BxFR}k9h|hCrhP_zizCznF)#wu+@wHjV
zkt1KNDVAe2OhBc&`>n9d7>Vro$QQIfg7~7><s9@9(aZRMOCfEsNuT(ruj~aCFhef?
zG*rR_j06M}0|K%n%g`sK>)yHdxPEj5(zcSFqECh~*?@pzK)^_g0^Ii)^))Zy95$dW
zwiX4{vjp&o^Z{p)^s(0wIirxa*tAbhNOMcD!zOg!0o@?J$6YU#^O8Z@V$;5E^KE<+
zh8;tc*T`Kx&j}T|c?{#xtA@ZaOy~^sYK$#G-N$fiA+lo9X9cEKA#$%PY8Rq$#wHsn
zM1CpGv2KrTTZ-fE4I;c0TVFpp>nX+ju+;Z4x^1ZEV^oa^oq;ruO8uW>S!Z4AMn1=y
zBi*J8N%WDS9T$@3u4GS%HeAV?xs)c{SBkb?N*lYD4-##@me>C<@vr5(^f1}+X{JYV
ua`&HR;g3`QZTKG^r?sEw&lN2^&;J34;f2QWUoeOO0000<MNUMnLSTaTT-Fi*

diff --git a/apps/remoteStorage/lib_remoteStorage.php b/apps/remoteStorage/lib_remoteStorage.php
deleted file mode 100644
index b9e2368003..0000000000
--- a/apps/remoteStorage/lib_remoteStorage.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-
-class OC_remoteStorage {
-	public static function getValidTokens($ownCloudUser, $category) {
-		$stmt=OCP\DB::prepare("SELECT `token`,`appUrl`,`category` FROM `*PREFIX*authtoken` WHERE `user`=?",100);
-		$result=$stmt->execute(array($ownCloudUser));
-		$ret = array();
-		while($row=$result->fetchRow()){
-			if(in_array($category, explode(',', $row['category']))) {
-				$ret[$row['token']]=true;
-			}
-		}
-		return $ret;
-	}
-
-  public static function getTokenFor($appUrl, $categories) {
-		$user=OCP\USER::getUser();
-		$stmt=OCP\DB::prepare("SELECT `token` FROM `*PREFIX*authtoken` WHERE `user`=? AND `appUrl`=? AND `category`=?",1);
-		$result=$stmt->execute(array($user, $appUrl, $categories));
-		if($row=$result->fetchRow()) {
-			return base64_encode('remoteStorage:'.$row['token']);
-		} else {
-			return false;
-		}
-	}
-
-	public static function getAllTokens() {
-		$user=OCP\USER::getUser();
-		$stmt=OCP\DB::prepare("SELECT `token`,`appUrl`,`category` FROM `*PREFIX*authtoken` WHERE `user`=?",100);
-		$result=$stmt->execute(array($user));
-		$ret = array();
-		while($row=$result->fetchRow()){
-			$ret[$row['token']] = array(
-				'appUrl' => $row['appUrl'],
-				'categories' => $row['category'],
-			);
-		}
-		return $ret;
-	}
-
-	public static function deleteToken($token) {
-		$user=OCP\USER::getUser();
-		$stmt=OCP\DB::prepare("DELETE FROM `*PREFIX*authtoken` WHERE `token`=? AND `user`=?");
-		$stmt->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();
-		$stmt=OCP\DB::prepare("INSERT INTO `*PREFIX*authtoken` (`token`,`appUrl`,`user`,`category`) VALUES(?,?,?,?)");
-		$stmt->execute(array($token,$appUrl,$user,$categories));
-	}
-	public static function createCategories($appUrl, $categories) {
-		$token=uniqid();
-		OC_Util::setupFS(OCP\USER::getUser());
-		self::addToken($token, $appUrl, $categories);
-		foreach(explode(',', $categories) as $category) {
-			//TODO: input checking on $category
-			$scopePathParts = array('remoteStorage', $category);
-			for($i=0;$i<=count($scopePathParts);$i++){
-				$thisPath = '/'.implode('/', array_slice($scopePathParts, 0, $i));
-				if(!OC_Filesystem::file_exists($thisPath)) {
-					OC_Filesystem::mkdir($thisPath);
-				}
-			}
-		}
-		return base64_encode('remoteStorage:'.$token);
-	}
-}
diff --git a/apps/remoteStorage/oauth_ro_auth.php b/apps/remoteStorage/oauth_ro_auth.php
deleted file mode 100644
index bed3093c3b..0000000000
--- a/apps/remoteStorage/oauth_ro_auth.php
+++ /dev/null
@@ -1,70 +0,0 @@
-<?php
-/**
- * Copyright (c) 2011, 2012 Michiel de Jong <michiel@unhosted.org>
- * This file is licensed under the Affero General Public License version 3 or
- * later.
- * See the COPYING-README file.
- */
-
-
-class OC_Connector_Sabre_Auth_ro_oauth extends Sabre_DAV_Auth_Backend_AbstractBasic {
-	private $validTokens;
-	private $category;
-	public function __construct($validTokensArg, $categoryArg) {
-		$this->validTokens = $validTokensArg;
-		$this->category = $categoryArg;
-	}
-
-	/**
-	 * Validates a username and password
-	 *
-	 * This method should return true or false depending on if login
-	 * succeeded.
-	 *
-	 * @return bool
-	 */
-	protected function validateUserPass($username, $password){
-		//always give read-only:
-		if(($_SERVER['REQUEST_METHOD'] == 'OPTIONS')
-		    || (isset($this->validTokens[$password]))
-			|| (($_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.'"!');
-			return false;	
-		}
-	}
-
-	//overwriting this to make it not automatically fail if no auth header is found:
-	public function authenticate(Sabre_DAV_Server $server,$realm) {
-		$auth = new Sabre_HTTP_BearerAuth();
-		$auth->setHTTPRequest($server->httpRequest);
-		$auth->setHTTPResponse($server->httpResponse);
-		$auth->setRealm($realm);
-		$userpass = $auth->getUserPass();
-		if (!$userpass) {
-			if(($_SERVER['REQUEST_METHOD'] == 'OPTIONS')
-				||(($_SERVER['REQUEST_METHOD'] == 'GET') && ($this->category == 'public'))
-			) {
-				$userpass = array('', '');
-			} else {
-				$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/apps/remoteStorage/settings.php b/apps/remoteStorage/settings.php
deleted file mode 100644
index 3be8b0984d..0000000000
--- a/apps/remoteStorage/settings.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-
-require_once('lib_remoteStorage.php');
-$tmpl = new OCP\Template( 'remoteStorage', 'settings');
-
-return $tmpl->fetchPage();
diff --git a/apps/remoteStorage/templates/auth.php b/apps/remoteStorage/templates/auth.php
deleted file mode 100644
index 6a7054eabb..0000000000
--- a/apps/remoteStorage/templates/auth.php
+++ /dev/null
@@ -1,28 +0,0 @@
-		<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>
diff --git a/apps/remoteStorage/templates/settings.php b/apps/remoteStorage/templates/settings.php
deleted file mode 100644
index 1d2a188f52..0000000000
--- a/apps/remoteStorage/templates/settings.php
+++ /dev/null
@@ -1,22 +0,0 @@
-	<fieldset class="personalblock">
-		<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) {
-				var xhr = new XMLHttpRequest();
-				xhr.open('POST', '/apps/remoteStorage/ajax/revokeToken.php', true);
-				xhr.send(token);
-			}
-		</script>
-		<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>
diff --git a/apps/remoteStorage/webdav.php b/apps/remoteStorage/webdav.php
deleted file mode 100644
index 8d8ec6a45a..0000000000
--- a/apps/remoteStorage/webdav.php
+++ /dev/null
@@ -1,87 +0,0 @@
-<?php
-
-/**
-* ownCloud
-*
-* Original:
-* @author Frank Karlitschek
-* @copyright 2012 Frank Karlitschek frank@owncloud.org
-* 
-* Adapted:
-* @author Michiel de Jong, 2011
-*
-* 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_App::loadApps(array('filesystem','authentication'));
-
-OCP\App::checkAppEnabled('remoteStorage');
-require_once('lib_remoteStorage.php');
-require_once('BearerAuth.php');
-require_once('oauth_ro_auth.php');
-
-ini_set('default_charset', 'UTF-8');
-#ini_set('error_reporting', '');
-@ob_clean();
-
-//allow use as remote storage for other websites
-if(isset($_SERVER['HTTP_ORIGIN'])) {
-	header('Access-Control-Allow-Origin: ' . $_SERVER['HTTP_ORIGIN']);
-	header('Access-Control-Max-Age: 3600');
-	header('Access-Control-Allow-Methods: OPTIONS, GET, PUT, DELETE, PROPFIND');
-  	header('Access-Control-Allow-Headers: Authorization, Content-Type');
-} else {
-	header('Access-Control-Allow-Origin: *');
-}
-
-$path = substr($_SERVER["REQUEST_URI"], strlen($baseuri));
-
-$pathParts =  explode('/', $path);
-// for webdav:
-//      0       /   1    /   2...
-//  $ownCloudUser/remoteStorage/$category/
-
-if(count($pathParts) >= 2) {
-	list($ownCloudUser, $dummy2, $category) = $pathParts;
-
-	OC_Util::setupFS($ownCloudUser);
-
-	// Create ownCloud Dir
-	$publicDir = new OC_Connector_Sabre_Directory('');
-	$server = new Sabre_DAV_Server($publicDir);
-
-	// Path to our script
-	$server->setBaseUri($baseuri.$ownCloudUser);
-
-	// Auth backend
-	$authBackend = new OC_Connector_Sabre_Auth_ro_oauth(
-		OC_remoteStorage::getValidTokens($ownCloudUser, $category),
-		$category
-	);
-
-	$authPlugin = new Sabre_DAV_Auth_Plugin($authBackend,'ownCloud');//should use $validTokens here
-	$server->addPlugin($authPlugin);
-
-	// Also make sure there is a 'data' directory, writable by the server. This directory is used to store information about locks
-	$lockBackend = new OC_Connector_Sabre_Locks();
-	$lockPlugin = new Sabre_DAV_Locks_Plugin($lockBackend);
-	$server->addPlugin($lockPlugin);
-
-	// And off we go!
-	$server->exec();
-} else {
-	//die('not the right address format '.var_export($pathParts, true));
-	die('not the right address format');
-}
diff --git a/apps/tasks/ajax/addtask.php b/apps/tasks/ajax/addtask.php
deleted file mode 100644
index d98fdbf388..0000000000
--- a/apps/tasks/ajax/addtask.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-// 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);
-$cid = $first_calendar['id'];
-
-$input = $_POST['text'];
-$request = array();
-$request['summary'] = $input;
-$request["categories"] = null;
-$request['priority'] = null;
-$request['percent_complete'] = null;
-$request['completed'] = null;
-$request['location'] = null;
-$request['due'] = null;
-$request['description'] = null;
-$vcalendar = OC_Task_App::createVCalendarFromRequest($request);
-$id = OC_Calendar_Object::add($cid, $vcalendar->serialize());
-
-$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/delete.php b/apps/tasks/ajax/delete.php
deleted file mode 100644
index cc22c3e387..0000000000
--- a/apps/tasks/ajax/delete.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/**
- * ownCloud - Addressbook
- *
- * @author Jakob Sack
- * @copyright 2011 Jakob Sack mail@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/>.
- *
- */
-
-// Init owncloud
-OCP\JSON::checkLoggedIn();
-OCP\JSON::checkAppEnabled('tasks');
-OCP\JSON::callCheck();
-
-$id = $_POST['id'];
-$task = OC_Calendar_App::getEventObject( $id );
-
-OC_Calendar_Object::delete($id);
-OCP\JSON::success(array('data' => array( 'id' => $id )));
diff --git a/apps/tasks/ajax/gettasks.php b/apps/tasks/ajax/gettasks.php
deleted file mode 100644
index b6183d9cb6..0000000000
--- a/apps/tasks/ajax/gettasks.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('tasks');
-
-$calendars = OC_Calendar_Calendar::allCalendars(OCP\User::getUser(), true);
-$user_timezone = OC_Calendar_App::getTimezone();
-
-$tasks = array();
-foreach( $calendars as $calendar ){
-        $calendar_tasks = OC_Calendar_Object::all($calendar['id']);
-        foreach( $calendar_tasks as $task ){
-                if($task['objecttype']!='VTODO'){
-                        continue;
-                }
-                if(is_null($task['summary'])){
-                        continue;
-                }
-		$object = OC_VObject::parse($task['calendardata']);
-		$vtodo = $object->VTODO;
-		try {
-			$tasks[] = OC_Task_App::arrayForJSON($task['id'], $vtodo, $user_timezone);
-		} catch(Exception $e) {
-                        OCP\Util::writeLog('tasks', $e->getMessage(), OCP\Util::ERROR);
-                }
-        }
-}
-
-OCP\JSON::encodedPrint($tasks);
diff --git a/apps/tasks/ajax/update_property.php b/apps/tasks/ajax/update_property.php
deleted file mode 100644
index 679cfdefe4..0000000000
--- a/apps/tasks/ajax/update_property.php
+++ /dev/null
@@ -1,69 +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.
- */
-
-// Init owncloud
-OCP\JSON::checkLoggedIn();
-OCP\JSON::checkAppEnabled('tasks');
-OCP\JSON::callCheck();
-
-$id = $_POST['id'];
-$property = $_POST['type'];
-$vcalendar = OC_Calendar_App::getVCalendar( $id );
-
-$vtodo = $vcalendar->VTODO;
-switch($property) {
-	case 'summary':
-		$summary = $_POST['summary'];
-		$vtodo->setString('SUMMARY', $summary);
-		break;
-	case 'description':
-		$description = $_POST['description'];
-		$vtodo->setString('DESCRIPTION', $description);
-		break;
-	case 'location':
-		$location = $_POST['location'];
-		$vtodo->setString('LOCATION', $location);
-		break;
-	case 'categories':
-		$categories = $_POST['categories'];
-		$vtodo->setString('CATEGORIES', $categories);
-		break;
-	case 'due':
-		$due = $_POST['due'];
-		$due_date_only = $_POST['date'];
-		$type = null;
-		if ($due != 'false') {
-			try {
-				$timezone = OC_Calendar_App::getTimezone();
-				$timezone = new DateTimeZone($timezone);
-				$due = new DateTime('@'.$due);
-				$due->setTimezone($timezone);
-				$type = Sabre_VObject_Element_DateTime::LOCALTZ;
-				if ($due_date_only) {
-					$type = Sabre_VObject_Element_DateTime::DATE;
-				}
-			} catch (Exception $e) {
-				OCP\JSON::error(array('data'=>array('message'=>OC_Task_App::$l10n->t('Invalid date/time'))));
-				exit();
-			}
-		}
-		$vtodo->setDateTime('DUE', $due, $type);
-		break;
-	case 'complete':
-		$checked = $_POST['checked'];
-		OC_Task_App::setComplete($vtodo, $checked ? '100' : '0', null);
-		break;
-	default:
-		OCP\JSON::error(array('data'=>array('message'=>'Unknown type')));
-		exit();
-}
-OC_Calendar_Object::edit($id, $vcalendar->serialize());
-
-$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/appinfo/app.php b/apps/tasks/appinfo/app.php
deleted file mode 100644
index e7c82d6f24..0000000000
--- a/apps/tasks/appinfo/app.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-$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::addNavigationEntry( array(
-  'id' => 'tasks_index',
-  'order' => 11,
-  'href' => OCP\Util::linkTo( 'tasks', 'index.php' ),
-  'icon' => OCP\Util::imagePath( 'tasks', 'icon.png' ),
-  'name' => $l->t('Tasks')));
diff --git a/apps/tasks/appinfo/info.xml b/apps/tasks/appinfo/info.xml
deleted file mode 100644
index 736fc23244..0000000000
--- a/apps/tasks/appinfo/info.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0"?>
-<info>
-	<id>tasks</id>
-	<name>Tasks</name>
-	<version>0.1</version>
-	<licence>AGPL</licence>
-	<author>Bart Visscher</author>
-	<require>4</require>
-	<shipped>true</shipped>
-	<description>Tasks view from calendar</description>
-</info>
diff --git a/apps/tasks/css/style.css b/apps/tasks/css/style.css
deleted file mode 100644
index 80b6e777b5..0000000000
--- a/apps/tasks/css/style.css
+++ /dev/null
@@ -1,62 +0,0 @@
-#tasks_list p.loading{margin:15px;}
-#tasks_lists .done{color:#C7C7C7;}
-#task_details{position:absolute;left:63em;top:6.4em;}
-#task_details th{padding:2px;text-align:right;vertical-align:top; }
-#task_details td{padding:2px;text-align:left;vertical-align:top; }
-.error_msg{color:red;}
-.error{border-color:red;border-width:2px;}
-#tasks_lists div{position:relative;padding:0.5em 1em;}
-#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.4em 1em;}
-.task:nth-child(odd){background-color:#F4F4F4;}
-.task:hover {background-color:#DDDDDD;}
-
-.task_actions{display:none;position:absolute;left:30em;top:0.2em;}
-.task:hover .task_actions {display:block}
-.task_actions img{vertical-align:middle;}
-.task_actions span{cursor:pointer;}
-
-.task .priority{background-color:black;color:white;position:absolute;top:0.5em}
-.task .priority-n{height:2.66ex;width:0.6em;}
-.task .priority-1{background:rgb(255,0,0);}
-.task .priority-2{background:rgb(200,0,0);}
-.task .priority-3{background:rgb(150,0,0);}
-.task .priority-4{background:rgb(100,0,0);}
-.task .priority-5{background:rgb(255,255,0);color:black;}
-.task .priority-6{background:rgb(192,255,0);color:black;}
-.task .priority-7{background:rgb(128,255,0);color:black;}
-.task .priority-8{background:rgb(64,255,0);color:black;}
-.task .priority-9{background:rgb(0,255,0);color:black;}
-
-.task .completed {position:absolute;left:3em;top:0.3em;}
-
-.task .summary{padding-left:4em;height:2em;}
-.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;}
-.task .tag.active{border-color:black;opacity:0.6;}
-.task .tag.active:hover{opacity:1;}
-.task:hover .tag{opacity:0.5}
-.task:hover .tag:hover{opacity:0.8;}
-
-.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.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;}
-
-.task_delete{position:absolute;bottom:2px;right:5px}
diff --git a/apps/tasks/img/icon.png b/apps/tasks/img/icon.png
deleted file mode 100644
index e2802ae938786cfde949700069ecebf7bde4777c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 372
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#$mfQmkPx;Tbd
zoKF7n|Gz!6>Ws!!Y+JT$@h~?r=@7iMCF`nI+8Q<nQ+vio{l31wyKb2H%`)kf)ws`o
zWWThu^kYLF4j!IA{8RqKM@0OXKYhBm#%YG*OiWDwjg5^DescK3-7(jICm}JB(NnHj
z%Zf!fKR0(O%cu7ZM>cQX>{#R$v6o>JrwE(FAD*lZZh>xwkD(g>S)`?J*UxD@!SJl<
z@FI>?iS`2TTQ})%*}k3o(3J<K3l=YKmS6EuKSY_sp0UbVCXzRfdBM6JOjrL1OK3m4
zaYevr0dER}!LFdfm5M10+ybW)me?fm9++9eDe1toEH+JvoteQ>WYVgc)fvx#o@elM
L^>bP0l+XkKbdZ9@

diff --git a/apps/tasks/img/icon.svg b/apps/tasks/img/icon.svg
deleted file mode 100644
index d46ebab865..0000000000
--- a/apps/tasks/img/icon.svg
+++ /dev/null
@@ -1,101 +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://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="16"
-   height="16"
-   id="svg2"
-   version="1.1"
-   inkscape:version="0.48.2 r9819"
-   sodipodi:docname="New document 1">
-  <defs
-     id="defs4">
-    <marker
-       style="overflow:visible"
-       inkscape:stockid="InfiniteLineStart"
-       id="InfiniteLineStart"
-       refX="0"
-       refY="0"
-       orient="auto">
-      <g
-         id="g4011"
-         transform="translate(-13,0)">
-        <circle
-           d="M 3.8,0 C 3.8,0.44182781 3.4418278,0.80000001 3,0.80000001 2.5581722,0.80000001 2.2,0.44182781 2.2,0 c 0,-0.44182781 0.3581722,-0.80000001 0.8,-0.80000001 0.4418278,0 0.8,0.3581722 0.8,0.80000001 z"
-           id="circle4013"
-           r="0.8"
-           cy="0"
-           cx="3" />
-        <circle
-           d="M 7.3,0 C 7.3,0.44182781 6.9418278,0.80000001 6.5,0.80000001 6.0581722,0.80000001 5.7,0.44182781 5.7,0 c 0,-0.44182781 0.3581722,-0.80000001 0.8,-0.80000001 0.4418278,0 0.8,0.3581722 0.8,0.80000001 z"
-           id="circle4015"
-           r="0.8"
-           cy="0"
-           cx="6.5" />
-        <circle
-           d="M 10.8,0 C 10.8,0.44182781 10.441828,0.80000001 10,0.80000001 9.5581722,0.80000001 9.2,0.44182781 9.2,0 c 0,-0.44182781 0.3581722,-0.80000001 0.8,-0.80000001 0.441828,0 0.8,0.3581722 0.8,0.80000001 z"
-           id="circle4017"
-           r="0.8"
-           cy="0"
-           cx="10" />
-      </g>
-    </marker>
-  </defs>
-  <sodipodi:namedview
-     id="base"
-     pagecolor="#ffffff"
-     bordercolor="#666666"
-     borderopacity="1.0"
-     inkscape:pageopacity="0.0"
-     inkscape:pageshadow="2"
-     inkscape:zoom="1"
-     inkscape:cx="21.051806"
-     inkscape:cy="18.371489"
-     inkscape:document-units="px"
-     inkscape:current-layer="layer1"
-     showgrid="false"
-     showborder="false"
-     inkscape:showpageshadow="true"
-     inkscape:window-width="1280"
-     inkscape:window-height="1004"
-     inkscape:window-x="1278"
-     inkscape:window-y="-3"
-     inkscape:window-maximized="1" />
-  <metadata
-     id="metadata7">
-    <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>
-  <g
-     inkscape:label="Layer 1"
-     inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(0,-1036.3622)">
-    <rect
-       style="fill:none;stroke:#000000;stroke-width:1.00000012;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
-       id="rect4398"
-       width="9"
-       height="9"
-       x="3.4999998"
-       y="1040.8619" />
-    <path
-       style="fill:none;stroke:#808080;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;marker-start:none"
-       d="m 3.971,1040.0481 c 3.3062306,2.8933 3.3751101,6.5431 3.3751101,6.5431 0,0 3.8228259,-5.3027 6.2336249,-6.3371"
-       inkscape:connector-curvature="0"
-       sodipodi:nodetypes="ccc" />
-  </g>
-</svg>
diff --git a/apps/tasks/index.php b/apps/tasks/index.php
deleted file mode 100644
index f1c4d1e765..0000000000
--- a/apps/tasks/index.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-/*************************************************
- * ownCloud - Tasks Plugin                        *
- *                                                *
- * (c) Copyright 2011 Bart Visscher               *
- * 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('tasks');
-
-$calendars = OC_Calendar_Calendar::allCalendars(OCP\User::getUser(), true);
-if( count($calendars) == 0 ) {
-	header('Location: ' . OCP\Util::linkTo('calendar', 'index.php'));
-	exit;
-}
-
-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\App::setActiveNavigationEntry('tasks_index');
-
-$categories = OC_Calendar_App::getCategoryOptions();
-$priority_options = OC_Task_App::getPriorityOptions();
-$output = new OCP\Template('tasks', 'tasks', 'user');
-$output->assign('priority_options', $priority_options);
-$output->assign('categories', $categories);
-$output -> printPage();
diff --git a/apps/tasks/js/tasks.js b/apps/tasks/js/tasks.js
deleted file mode 100644
index de62792750..0000000000
--- a/apps/tasks/js/tasks.js
+++ /dev/null
@@ -1,473 +0,0 @@
-OC.Tasks = {
-	bool_string_cmp:function(a, b) {
-		if (a === b) {
-			return 0;
-		}
-		if (a === false) {
-			return -1;
-		}
-		if (b === false) {
-			return 1;
-		}
-		return a.localeCompare(b);
-	},
-	create_task_div:function(task) {
-		var actions = $('#task_actions_template');
-		var summary_container = $('<p class="summary">')
-				.attr('title', task.description)
-				;
-		OC.Tasks.setSummary(summary_container, task);
-		var task_container = $('<div>')
-			.addClass('task')
-			.data('task', task)
-			.data('show_count', 0)
-			.attr('data-id', task.id)
-			.append(summary_container)
-			.append(actions.clone().removeAttr('id'))
-			;
-		task_container.find('.summary a').click(OC.Tasks.summaryClickHandler);
-		var checkbox = $('<input type="checkbox">')
-			.click(OC.Tasks.complete_task);
-		if (task.completed) {
-			checkbox.attr('checked', 'checked');
-			task_container.addClass('done');
-		}
-		$('<div>')
-			.addClass('completed')
-			.append(checkbox)
-			.prependTo(task_container);
-		var priority = task.priority;
-		$('<div>')
-			.addClass('tag')
-			.addClass('priority')
-			.addClass('priority-'+(priority?priority:'n'))
-			.text(priority)
-			.prependTo(task_container);
-		if (task.location) {
-			$('<div>')
-				.addClass('tag')
-				.addClass('location')
-				.text(task.location)
-				.appendTo(task_container);
-		}
-		var $categories = $('<div>')
-				.addClass('categories')
-				.appendTo(task_container);
-		$(task.categories).each(function(i, category){
-				$categories.append($('<a>')
-					.addClass('tag')
-					.text(category)
-				);
-		});
-		task_container.find('.task_more').click(OC.Tasks.moreClickHandler);
-		task_container.find('.task_less').click(OC.Tasks.lessClickHandler);
-		var description = $('<textarea>')
-			.addClass('description')
-			.blur(function(){
-				var task = $(this).closest('.task').data('task');
-				var description = $(this).val();
-				$.post(OC.filePath('tasks', 'ajax', 'update_property.php'), {id:task.id, type:'description', description:description}, function(jsondata){
-					if(jsondata.status == 'success') {
-						task.description = description;
-					}
-				});
-			})
-			.text(task.description);
-		var due = $('<span>')
-			.addClass('due')
-			.append(t('tasks', 'Due'));
-		due
-			.append($('<input type="date">')
-					.addClass('date')
-					.datepicker({
-						dateFormat: 'dd-mm-yy',
-						onClose: OC.Tasks.dueUpdateHandler
-					}),
-				$('<input type="time">')
-					.addClass('time')
-					.timepicker({
-						showPeriodLabels:false,
-						onClose: OC.Tasks.dueUpdateHandler
-					})
-			);
-		if (task.due){
-			var date = new Date(parseInt(task.due)*1000);
-			due.find('.date').datepicker('setDate', date);
-			if (!task.due_date_only) {
-				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);
-		$('<input placeholder="'+t('tasks', 'List')+'">')
-			.addClass('categories')
-			.multiple_autocomplete({source: categories})
-			.val(task.categories)
-			.blur(function(){
-				var task = $(this).closest('.task').data('task');
-				var categories = $(this).val();
-				$.post(OC.filePath('tasks', 'ajax', 'update_property.php'), {id:task.id, type:'categories', categories:categories}, function(jsondata){
-					if(jsondata.status == 'success') {
-						task.categories = categories.split(',');
-						$categories.empty();
-						$(task.categories).each(function(i, category){
-							$categories.append($('<a>')
-								.addClass('tag')
-								.text(category)
-								);
-							});
-					}
-				});
-			})
-			.appendTo(task_container);
-		$('<input placeholder="'+t('tasks', 'Location')+'">')
-			.addClass('location')
-			.val(task.location)
-			.blur(function(){
-				var task = $(this).closest('.task').data('task');
-				var location = $(this).val();
-				$.post(OC.filePath('tasks', 'ajax', 'update_property.php'), {id:task.id, type:'location', location:location}, function(jsondata){
-					if(jsondata.status == 'success') {
-						task.location = location;
-						task_container.find('.location').text(location);
-					}
-				});
-			})
-			.appendTo(task_container);
-		return task_container;
-	},
-	filter:function(tag, find_filter) {
-		var tag_text = $(tag).text();
-		var filter = !$(tag).hasClass('active');
-		OC.Tasks.filterUpdate(filter, function(task_container){
-			var found = 0;
-			task_container.find(find_filter).each(function(){
-				if ($(this).text() == tag_text) {
-					$(this).toggleClass('active');
-					found = 1;
-				}
-			});
-			return found;
-		});
-	},
-	filterUpdate:function(filter, find_filter) {
-		var show_count = $('#tasks_list').data('show_count');
-		show_count += filter ? +1 : -1;
-		$('#tasks_list').data('show_count', show_count);
-		$('#tasks_lists .task, #tasks_list .task').each(function(i, task_container){
-			task_container = $(task_container);
-			var task = task_container.data('task');
-			var found = find_filter(task_container);
-			var hide_count = task_container.data('show_count');
-			if (!filter) {
-				hide_count-=found;
-			}
-			else {
-				hide_count+=found;
-			}
-			if (hide_count == show_count) {
-				task_container.show();
-			}
-			else {
-				task_container.hide();
-			}
-			task_container.data('show_count', hide_count);
-		});
-	},
-	order:function(sort, get_property, empty_label) {
-		var tasks = $('#tasks_list .task').not('.clone');
-		tasks.sort(sort);
-		var current = null;
-		tasks.detach();
-		var $tasks = $('#tasks_list').empty();
-		var container = $tasks;
-		tasks.each(function(){
-			if (get_property) {
-				var label = get_property($(this).data('task'));
-				if(label != current) {
-					current = label;
-					container = $('<div>').appendTo($tasks);
-					if (label == '' && empty_label) {
-						label = empty_label;
-					}
-					$('<h1>').text(label).appendTo(container);
-				}
-			}
-			container.append(this);
-		});
-	},
-	setSummary:function(summary_container, task){
-		var summary = $('<a href="index.php?id='+task.id+'">')
-			.text(task.summary)
-			.click(OC.Tasks.summaryClickHandler);
-		summary_container.html(summary);
-	},
-	summaryClickHandler:function(event){
-		event.preventDefault();
-		//event.stopPropagation();
-		var task = $(this).closest('.task').data('task');
-		var summary_container = $(this).parent();
-		var input = $('<input>').val($(this).text()).blur(function(){
-			var old_summary = task.summary;
-			task.summary = $(this).val();
-			OC.Tasks.setSummary(summary_container, task);
-			$.post(OC.filePath('tasks', 'ajax', 'update_property.php'), {id:task.id, type:'summary', summary:task.summary}, function(jsondata){
-				if(jsondata.status != 'success') {
-					task.summary = old_summary;
-					OC.Tasks.setSummary(summary_container, task);
-				}
-			});
-		});
-		summary_container.empty().append(input);
-		input.focus();
-		return false;
-	},
-	dueUpdateHandler:function(){
-		var task = $(this).closest('.task').data('task');
-		var old_due = task.due;
-		var $date = $(this).parent().children('.date');
-		var $time = $(this).parent().children('.time');
-		var date = $date.datepicker('getDate');
-		var time = $time.val().split(':');
-		var due, date_only = false;
-		if (!date){
-			due = false;
-		} else {
-			if (time.length==2){
-				date.setHours(time[0]);
-				date.setMinutes(time[1]);
-			}
-			else {
-				date_only = true;
-			}
-			due = date.getTime()/1000;
-		}
-		$.post(OC.filePath('tasks', 'ajax', 'update_property.php'), {id:task.id, type:'due', due:due, date:date_only?1:0}, function(jsondata){
-			if(jsondata.status != 'success') {
-				task.due = old_due;
-			}
-		});
-	},
-	moreClickHandler:function(event){
-		var $task = $(this).closest('.task'),
-			task = $task.data('task');
-		$task.find('.more').show();
-		$task.find('.task_more').hide();
-		$task.find('.task_less').show();
-		$task.find('div.categories').hide();
-		$task.find('input.categories').show();
-		$task.find('div.location').hide();
-		$task.find('input.location').show();
-	},
-	lessClickHandler:function(event){
-		var $task = $(this).closest('.task'),
-			task = $task.data('task');
-		$task.find('.more').hide();
-		$task.find('.task_more').show();
-		$task.find('.task_less').hide();
-		$task.find('div.categories').show();
-		$task.find('input.categories').hide();
-		$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'),
-			checked = $(this).is(':checked');
-		$.post(OC.filePath('tasks', 'ajax', 'update_property.php'), {id:task.id, type:'complete', checked:checked?1:0}, function(jsondata){
-			if(jsondata.status == 'success') {
-				task = jsondata.data;
-				$task.data('task', task)
-				if (task.completed) {
-					$task.addClass('done');
-				}
-				else {
-					$task.removeClass('done');
-				}
-			}
-			else{
-				alert(jsondata.data.message);
-			}
-		}, 'json');
-	},
-	categoriesChanged:function(newcategories){
-		categories = $.map(newcategories, function(v) {return v;});
-		console.log('Task categories changed to: ' + categories);
-		$('input.categories').multiple_autocomplete('option', 'source', categories);
-	},
-	List: {
-		create_list_div:function(category){
-			return $('<div>').text(category)
-				.click(function(){
-					OC.Tasks.filter(this, 'div.categories .tag');
-					$(this).toggleClass('active');
-				});
-		}
-	}
-};
-
-$(document).ready(function(){
-	$(window).resize(function () {
-		fillHeight($('#tasks_lists'));
-		fillWindow($('#tasks_list'));
-	});
-	$(window).trigger('resize');
-
-	/*-------------------------------------------------------------------------
-	 * Actions for startup
-	 *-----------------------------------------------------------------------*/
-	$.getJSON(OC.filePath('tasks', 'ajax', 'gettasks.php'), function(jsondata) {
-		var tasks = $('#tasks_list').empty().data('show_count', 0);
-		$(jsondata).each(function(i, task) {
-			tasks.append(OC.Tasks.create_task_div(task));
-		});
-		if( $('#tasks_list div').length > 0 ){
-			$('#tasks_list div').first().addClass('active');
-		}
-		$(categories).each(function(i, category) {
-			$('#tasks_lists .all').after(OC.Tasks.List.create_list_div(category));
-		});
-		$('#tasks_lists .all').click(function(){
-			$('#tasks_lists .active').click();
-		});
-		$('#tasks_lists .done').click(function(){
-			var filter = !$(this).hasClass('active');
-			OC.Tasks.filterUpdate(filter, function(task_container){
-				return task_container.hasClass('done');
-			});
-			$(this).toggleClass('active');
-		});
-		OCCategories.changed = OC.Tasks.categoriesChanged;
-		OCCategories.app = 'calendar';
-	});
-
-	/*-------------------------------------------------------------------------
-	 * Event handlers
-	 *-----------------------------------------------------------------------*/
-	$('#tasks_list div.categories .tag').live('click',function(){
-		OC.Tasks.filter(this, 'div.categories .tag');
-		var tag_text = $(this).text();
-		$('#tasks_lists div:not(".all"):not(".done")').each(function(){
-			if ($(this).text() == tag_text) {
-				$(this).toggleClass('active');
-			}
-		});
-	});
-
-	$('#tasks_list .priority.tag').live('click',function(){
-		OC.Tasks.filter(this, '.priority.tag');
-	});
-
-	$('#tasks_list .location.tag').live('click',function(){
-		OC.Tasks.filter(this, '.location.tag');
-	});
-
-	$('#tasks_order_category').click(function(){
-		var tasks = $('#tasks_list .task').not('.clone');
-		var collection = {};
-		tasks.each(function(i, task) {
-			var categories = $(task).data('task').categories;
-			$(categories).each(function() {
-				if (!collection.hasOwnProperty(this)) {
-					collection[this] = [];
-				}
-				collection[this].push(task);
-				if (categories.length > 1) {
-					task = $(task).clone(true).addClass('clone').get(0);
-				}
-			});
-			if (categories.length == 0) {
-				if (!collection.hasOwnProperty('')) {
-					collection[''] = [];
-				}
-				collection[''].push(task);
-			}
-		});
-		var labels = [];
-		for (var label in collection) {
-			labels.push(label);
-		}
-		labels.sort();
-		tasks.detach();
-		var $tasks = $('#tasks_list').empty();
-		for (var index in labels) {
-			var label = labels[index];
-			var container = $('<div>').appendTo($tasks);
-			if (label == '') {
-				label = t('tasks', 'No category');
-			}
-			$('<h1>').text(label).appendTo(container);
-			container.append(collection[labels[index]]);
-		}
-	});
-
-	$('#tasks_order_due').click(function(){
-		OC.Tasks.order(function(a, b){
-			a = $(a).data('task').due;
-			b = $(b).data('task').due;
-			return OC.Tasks.bool_string_cmp(a, b);
-		});
-	});
-
-	$('#tasks_order_complete').click(function(){
-		OC.Tasks.order(function(a, b){
-			return ($(a).data('task').complete - $(b).data('task').complete) ||
-				OC.Tasks.bool_string_cmp($(a).data('task').completed, $(b).data('task').completed);
-		});
-	});
-
-	$('#tasks_order_location').click(function(){
-		OC.Tasks.order(function(a, b){
-			a = $(a).data('task').location;
-			b = $(b).data('task').location;
-			return OC.Tasks.bool_string_cmp(a, b);
-		});
-	});
-
-	$('#tasks_order_prio').click(function(){
-		OC.Tasks.order(function(a, b){
-			return $(a).data('task').priority
-			     - $(b).data('task').priority;
-		});
-	});
-
-	$('#tasks_order_label').click(function(){
-		OC.Tasks.order(function(a, b){
-			return $(a).data('task').summary.localeCompare(
-			       $(b).data('task').summary);
-		});
-	});
-
-	$('#tasks_addtask').click(function(){
-		var input = $('#tasks_newtask').val();
-		$.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));
-			}
-			else{
-				alert(jsondata.data.message);
-			}
-		});
-		return false;
-	});
-
-	OCCategories.app = 'calendar';
-});
diff --git a/apps/tasks/l10n/.gitkeep b/apps/tasks/l10n/.gitkeep
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/apps/tasks/l10n/ca.php b/apps/tasks/l10n/ca.php
deleted file mode 100644
index 2608d8b9b1..0000000000
--- a/apps/tasks/l10n/ca.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/cs_CZ.php b/apps/tasks/l10n/cs_CZ.php
deleted file mode 100644
index 9da5f7ab60..0000000000
--- a/apps/tasks/l10n/cs_CZ.php
+++ /dev/null
@@ -1,15 +0,0 @@
-<?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/da.php b/apps/tasks/l10n/da.php
deleted file mode 100644
index a413f22d17..0000000000
--- a/apps/tasks/l10n/da.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?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/de.php b/apps/tasks/l10n/de.php
deleted file mode 100644
index 29b9bf41ec..0000000000
--- a/apps/tasks/l10n/de.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/el.php b/apps/tasks/l10n/el.php
deleted file mode 100644
index cdf2f609e5..0000000000
--- a/apps/tasks/l10n/el.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?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/eo.php b/apps/tasks/l10n/eo.php
deleted file mode 100644
index 9919a6ea63..0000000000
--- a/apps/tasks/l10n/eo.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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",
-"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",
-"Less" => "Malpli",
-"Delete" => "Forigi"
-);
diff --git a/apps/tasks/l10n/es.php b/apps/tasks/l10n/es.php
deleted file mode 100644
index e5f0981de5..0000000000
--- a/apps/tasks/l10n/es.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/et_EE.php b/apps/tasks/l10n/et_EE.php
deleted file mode 100644
index 56db6ee032..0000000000
--- a/apps/tasks/l10n/et_EE.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/fa.php b/apps/tasks/l10n/fa.php
deleted file mode 100644
index 40b5b610f4..0000000000
--- a/apps/tasks/l10n/fa.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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
deleted file mode 100644
index 7948e712e9..0000000000
--- a/apps/tasks/l10n/fi_FI.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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/fr.php b/apps/tasks/l10n/fr.php
deleted file mode 100644
index 5b0a0321a8..0000000000
--- a/apps/tasks/l10n/fr.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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",
-"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",
-"Less" => "Moins",
-"Delete" => "Supprimer"
-);
diff --git a/apps/tasks/l10n/it.php b/apps/tasks/l10n/it.php
deleted file mode 100644
index 1aac8aac88..0000000000
--- a/apps/tasks/l10n/it.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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",
-"Empty Summary" => "Riepilogo vuoto",
-"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ù",
-"Less" => "Meno",
-"Delete" => "Elimina"
-);
diff --git a/apps/tasks/l10n/ja_JP.php b/apps/tasks/l10n/ja_JP.php
deleted file mode 100644
index b5b526c595..0000000000
--- a/apps/tasks/l10n/ja_JP.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/lt_LT.php b/apps/tasks/l10n/lt_LT.php
deleted file mode 100644
index 7c17fc2224..0000000000
--- a/apps/tasks/l10n/lt_LT.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?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/tasks/l10n/nb_NO.php b/apps/tasks/l10n/nb_NO.php
deleted file mode 100644
index a6b398857b..0000000000
--- a/apps/tasks/l10n/nb_NO.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?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/tasks/l10n/pl.php b/apps/tasks/l10n/pl.php
deleted file mode 100644
index 4879628486..0000000000
--- a/apps/tasks/l10n/pl.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/tasks/l10n/ro.php b/apps/tasks/l10n/ro.php
deleted file mode 100644
index 54958582f5..0000000000
--- a/apps/tasks/l10n/ro.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/ru.php b/apps/tasks/l10n/ru.php
deleted file mode 100644
index ce208cb071..0000000000
--- a/apps/tasks/l10n/ru.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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 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
deleted file mode 100644
index c235ff0bc4..0000000000
--- a/apps/tasks/l10n/sl.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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 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č",
-"Less" => "Manj",
-"Delete" => "Izbriši"
-);
diff --git a/apps/tasks/l10n/sv.php b/apps/tasks/l10n/sv.php
deleted file mode 100644
index 33bab14448..0000000000
--- a/apps/tasks/l10n/sv.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/tasks/l10n/th_TH.php b/apps/tasks/l10n/th_TH.php
deleted file mode 100644
index e4212bf291..0000000000
--- a/apps/tasks/l10n/th_TH.php
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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/lib/app.php b/apps/tasks/lib/app.php
deleted file mode 100644
index a97c6b95d1..0000000000
--- a/apps/tasks/lib/app.php
+++ /dev/null
@@ -1,188 +0,0 @@
-<?php
-/**
- * ownCloud - Calendar
- *
- * @author Bart Visscher
- * @copyright 2011 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
- * 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 tasks
- */
-OC_Task_App::$l10n = new OC_L10N('tasks');
-class OC_Task_App {
-	public static $l10n;
-
-	public static function getPriorityOptions()
-	{
-		return array(
-			''  => self::$l10n->t('Unspecified'),
-			'1' => self::$l10n->t('1=highest'),
-			'2' => '2',
-			'3' => '3',
-			'4' => '4',
-			'5' => self::$l10n->t('5=medium'),
-			'6' => '6',
-			'7' => '7',
-			'8' => '8',
-			'9' => self::$l10n->t('9=lowest'),
-		);
-	}
-
-	public static function arrayForJSON($id, $vtodo, $user_timezone)
-	{
-                $task = array( 'id' => $id );
-		$task['summary'] = $vtodo->getAsString('SUMMARY');
-		$task['description'] = $vtodo->getAsString('DESCRIPTION');
-		$task['location'] = $vtodo->getAsString('LOCATION');
-		$task['categories'] = $vtodo->getAsArray('CATEGORIES');
-		$due = $vtodo->DUE;
-		if ($due) {
-			$task['due_date_only'] = $due->getDateType() == Sabre_VObject_Element_DateTime::DATE;
-			$due = $due->getDateTime();
-			$due->setTimezone(new DateTimeZone($user_timezone));
-			$task['due'] = $due->format('U');
-		}
-		else {
-			$task['due'] = false;
-		}
-		$task['priority'] = $vtodo->getAsString('PRIORITY');
-		$completed = $vtodo->COMPLETED;
-		if ($completed) {
-			$completed = $completed->getDateTime();
-			$completed->setTimezone(new DateTimeZone($user_timezone));
-			$task['completed'] = $completed->format('Y-m-d H:i:s');
-		}
-		else {
-			$task['completed'] = false;
-		}
-		$task['complete'] = $vtodo->getAsString('PERCENT-COMPLETE');
-		return $task;
-	}
-
-	public static function validateRequest($request)
-	{
-		$errors = array();
-		if($request['summary'] == '') {
-			$errors['summary'] = self::$l10n->t('Empty Summary');
-		}
-
-		try {
-			$timezone = OC_Calendar_App::getTimezone();
-			$timezone = new DateTimeZone($timezone);
-			new DateTime($request['due'], $timezone);
-		} catch (Exception $e) {
-			$errors['due'] = self::$l10n->t('Invalid date/time');
-		}
-
-		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'])) {
-			try {
-				$timezone = OC_Calendar_App::getTimezone();
-				$timezone = new DateTimeZone($timezone);
-				new DateTime($request['completed'], $timezone);
-			} catch (Exception $e) {
-				$errors['completed'] = self::$l10n->t('Invalid date/time');
-			}
-		}
-
-		$priority_options = self::getPriorityOptions();
-		if (!in_array($request['priority'], array_keys($priority_options))) {
-			$errors['priority'] = self::$l10n->t('Invalid priority');
-		}
-		return $errors;
-	}
-
-	public static function createVCalendarFromRequest($request)
-	{
-		$vcalendar = new OC_VObject('VCALENDAR');
-		$vcalendar->add('PRODID', 'ownCloud Calendar');
-		$vcalendar->add('VERSION', '2.0');
-
-		$vtodo = new OC_VObject('VTODO');
-		$vcalendar->add($vtodo);
-
-		$vtodo->setDateTime('CREATED', 'now', Sabre_VObject_Element_DateTime::UTC);
-
-		$vtodo->setUID();
-		return self::updateVCalendarFromRequest($request, $vcalendar);
-	}
-
-	public static function updateVCalendarFromRequest($request, $vcalendar)
-	{
-		$summary = $request['summary'];
-		$categories = $request["categories"];
-		$priority = $request['priority'];
-		$percent_complete = $request['percent_complete'];
-		$completed = $request['completed'];
-		$location = $request['location'];
-		$due = $request['due'];
-		$description = $request['description'];
-
-		$vtodo = $vcalendar->VTODO;
-
-		$vtodo->setDateTime('LAST-MODIFIED', 'now', Sabre_VObject_Element_DateTime::UTC);
-		$vtodo->setDateTime('DTSTAMP', 'now', Sabre_VObject_Element_DateTime::UTC);
-		$vtodo->setString('SUMMARY', $summary);
-
-		$vtodo->setString('LOCATION', $location);
-		$vtodo->setString('DESCRIPTION', $description);
-		$vtodo->setString('CATEGORIES', $categories);
-		$vtodo->setString('PRIORITY', $priority);
-
-		if ($due) {
-			$timezone = OC_Calendar_App::getTimezone();
-			$timezone = new DateTimeZone($timezone);
-			$due = new DateTime($due, $timezone);
-			$vtodo->setDateTime('DUE', $due);
-		} else {
-			unset($vtodo->DUE);
-		}
-
-		self::setComplete($vtodo, $percent_complete, $completed);
-
-		return $vcalendar;
-	}
-
-	public static function setComplete($vtodo, $percent_complete, $completed)
-	{
-		if (!empty($percent_complete)) {
-			$vtodo->setString('PERCENT-COMPLETE', $percent_complete);
-		}else{
-			$vtodo->__unset('PERCENT-COMPLETE');
-		}
-
-		if ($percent_complete == 100) {
-			if (!$completed) {
-				$completed = 'now';
-			}
-		} else {
-			$completed = null;
-		}
-		if ($completed) {
-			$timezone = OC_Calendar_App::getTimezone();
-			$timezone = new DateTimeZone($timezone);
-			$completed = new DateTime($completed, $timezone);
-			$vtodo->setDateTime('COMPLETED', $completed);
-			OCP\Util::emitHook('OC_Task', 'taskCompleted', $vtodo);
-		} else {
-			unset($vtodo->COMPLETED);
-		}
-	}
-}
diff --git a/apps/tasks/lib/vtodo.php b/apps/tasks/lib/vtodo.php
deleted file mode 100644
index dc2bfaf964..0000000000
--- a/apps/tasks/lib/vtodo.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-/**
- * ownCloud - Calendar
- *
- * @author Bart Visscher
- * @copyright 2011 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
- * 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 tasks
- */
-class OC_Task_VTodo extends OC_Calendar_Object{
-}
diff --git a/apps/tasks/templates/tasks.php b/apps/tasks/templates/tasks.php
deleted file mode 100644
index 8c0c89e497..0000000000
--- a/apps/tasks/templates/tasks.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<div id="controls">
-	<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 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'); ?>">
-	<input type="button" id="tasks_order_label" value="<?php echo $l->t('Order Label'); ?>">
-</div>
-<div id="tasks_lists" class="leftcontent">
-	<div class="all">All</div>
-	<div class="done">Done</div>
-</div>
-<div id="tasks_list" class="rightcontent">
-<p class="loading"><?php echo $l->t('Loading tasks...') ?></p>
-</div>
-<p id="task_actions_template" class="task_actions">
-	<!-- span class="task_star">
-		<img title="<?php echo $l->t('Important') ?>" src="<?php echo OCP\image_path('core', 'actions/add.svg') ?>" class="svg"><?php echo $l->t('Important') ?>
-	</span -->
-	<span class="task_more">
-		<img title="<?php echo $l->t('More') ?>" src="<?php echo OCP\image_path('core', 'actions/triangle-s.svg') ?>" class="svg"><?php echo $l->t('More') ?>
-	</span>
-	<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']); ?>;
-</script>
diff --git a/apps/user_external/appinfo/app.php b/apps/user_external/appinfo/app.php
deleted file mode 100644
index c7408ec30d..0000000000
--- a/apps/user_external/appinfo/app.php
+++ /dev/null
@@ -1,4 +0,0 @@
-<?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/appinfo/info.xml b/apps/user_external/appinfo/info.xml
deleted file mode 100644
index 1d1dcee540..0000000000
--- a/apps/user_external/appinfo/info.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?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
deleted file mode 100644
index ceab6e11ec..0000000000
--- a/apps/user_external/appinfo/version
+++ /dev/null
@@ -1 +0,0 @@
-0.1
\ No newline at end of file
diff --git a/apps/user_external/lib/ftp.php b/apps/user_external/lib/ftp.php
deleted file mode 100644
index e03e17d2b6..0000000000
--- a/apps/user_external/lib/ftp.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?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/lib/imap.php b/apps/user_external/lib/imap.php
deleted file mode 100644
index 584e9804b1..0000000000
--- a/apps/user_external/lib/imap.php
+++ /dev/null
@@ -1,40 +0,0 @@
-<?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/lib/smb.php b/apps/user_external/lib/smb.php
deleted file mode 100644
index 44d2b7903d..0000000000
--- a/apps/user_external/lib/smb.php
+++ /dev/null
@@ -1,43 +0,0 @@
-<?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
deleted file mode 100644
index 64ee141d32..0000000000
--- a/apps/user_external/tests/config.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?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',
-	),
-	'smb'=>array(
-		'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
deleted file mode 100644
index 0cf7565f9c..0000000000
--- a/apps/user_external/tests/ftp.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?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'));
-	}
-}
diff --git a/apps/user_external/tests/imap.php b/apps/user_external/tests/imap.php
deleted file mode 100644
index c703b32107..0000000000
--- a/apps/user_external/tests/imap.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?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'));
-	}
-}
diff --git a/apps/user_external/tests/smb.php b/apps/user_external/tests/smb.php
deleted file mode 100644
index 1ed7eb934b..0000000000
--- a/apps/user_external/tests/smb.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?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'));
-	}
-}
diff --git a/apps/user_migrate/ajax/export.php b/apps/user_migrate/ajax/export.php
deleted file mode 100644
index 07c35c7347..0000000000
--- a/apps/user_migrate/ajax/export.php
+++ /dev/null
@@ -1,62 +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/>.
- *
- */
-// Init owncloud
- 
-
-// Check if we are a user
-OCP\JSON::checkLoggedIn();
-OCP\App::checkAppEnabled('user_migrate');
-// Which operation
-if( $_GET['operation']=='create' ){
-	$uid = !empty( $_POST['uid'] ) ? $_POST['uid'] :  OCP\USER::getUser();
-	if( $uid != OCP\USER::getUser() ){
-	    // Needs to be admin to export someone elses account
-		OCP\JSON::error();	
-		die();
-	}
-	// Create the export zip
-	$response = json_decode( OC_Migrate::export( $uid ) );
-	if( !$response->success ){
-		// Error
-		OCP\JSON::error();
-		die();
-	} else {
-		// Save path in session
-		$_SESSION['ocuserexportpath'] = $response->data;
-	}
-	OCP\JSON::success();
-	die();
-} else if( $_GET['operation']=='download' ){
-	// Download the export
-	$path = isset( $_SESSION['ocuserexportpath'] ) ? $_SESSION['ocuserexportpath'] : false;
-	if( !$path ){
-		OCP\JSON::error();	
-	}
-	header("Content-Type: application/zip");
-	header("Content-Disposition: attachment; filename=" . basename($path));
-	header("Content-Length: " . filesize($path));
-	@ob_end_clean();
-	readfile($path);
-	unlink( $path );
-	$_SESSION['ocuserexportpath'] = '';	
-}
diff --git a/apps/user_migrate/appinfo/app.php b/apps/user_migrate/appinfo/app.php
deleted file mode 100644
index 366c400493..0000000000
--- a/apps/user_migrate/appinfo/app.php
+++ /dev/null
@@ -1,33 +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\App::registerPersonal( 'user_migrate', 'settings' );
-OCP\Util::addscript( 'user_migrate', 'export');
-
-// add settings page to navigation
-$entry = array(
-	'id' => "user_migrate_settings",
-	'order'=>1,
-	'href' => OCP\Util::linkTo( "user_migrate", "admin.php" ),
-	'name' => 'Import'
-);
diff --git a/apps/user_migrate/appinfo/info.xml b/apps/user_migrate/appinfo/info.xml
deleted file mode 100644
index a128742480..0000000000
--- a/apps/user_migrate/appinfo/info.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0"?>
-<info>
-	<id>user_migrate</id>
-	<name>User Account Migration</name>
-	<description>Migrate your user accounts</description>
-	<licence>AGPL</licence>
-	<author>Tom Needham</author>
-	<require>4</require>
-	<shipped>true</shipped>
-	<default_enable/>
-</info>
diff --git a/apps/user_migrate/appinfo/version b/apps/user_migrate/appinfo/version
deleted file mode 100644
index ceab6e11ec..0000000000
--- a/apps/user_migrate/appinfo/version
+++ /dev/null
@@ -1 +0,0 @@
-0.1
\ No newline at end of file
diff --git a/apps/user_migrate/js/export.js b/apps/user_migrate/js/export.js
deleted file mode 100644
index aef45c45a7..0000000000
--- a/apps/user_migrate/js/export.js
+++ /dev/null
@@ -1,27 +0,0 @@
-$(document).ready(function(){
-    // Do the export
-	$('#exportbtn').click(function(){
-		// Show loader
-		$('.loading').show();
-		$.getJSON(
-			OC.filePath('user_migrate','ajax','export.php'),
-			{operation:'create'},
-			function(result){
-				if(result.status == 'success'){
-					// Download the file
-					window.location = OC.linkTo('user_migrate','ajax/export.php') + '?operation=download';
-					$('.loading').hide();
-					$('#exportbtn').val(t('user_migrate', 'Export'));
-				} else {
-					// Cancel loading
-					$('#exportbtn').html('Failed');
-					// Show Dialog	
-					OC.dialogs.alert(t('user_migrate', 'Something went wrong while the export file was being generated'), t('user_migrate', 'An error has occurred'), function(){ 
-						$('#exportbtn').html(t('user_migrate', 'Export')+'<img style="display: none;" class="loading" src="'+OC.filePath('core','img','loading.gif')+'" />'); 
-					});
-				}
-			}
-		// End ajax
-		);
-	});
-});
\ No newline at end of file
diff --git a/apps/user_migrate/l10n/.gitkeep b/apps/user_migrate/l10n/.gitkeep
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/apps/user_migrate/l10n/ca.php b/apps/user_migrate/l10n/ca.php
deleted file mode 100644
index 6e423c01b0..0000000000
--- a/apps/user_migrate/l10n/ca.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?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" => "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" => "Importar el compte d'usuari",
-"ownCloud User Zip" => "zip d'usuari ownCloud",
-"Import" => "Importa"
-);
diff --git a/apps/user_migrate/l10n/cs_CZ.php b/apps/user_migrate/l10n/cs_CZ.php
deleted file mode 100644
index 81a5a45d97..0000000000
--- a/apps/user_migrate/l10n/cs_CZ.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?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/de.php b/apps/user_migrate/l10n/de.php
deleted file mode 100644
index 928a211dd4..0000000000
--- a/apps/user_migrate/l10n/de.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Export" => "Export",
-"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 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
deleted file mode 100644
index 5b57e69a63..0000000000
--- a/apps/user_migrate/l10n/el.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?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/eo.php b/apps/user_migrate/l10n/eo.php
deleted file mode 100644
index ca91806169..0000000000
--- a/apps/user_migrate/l10n/eo.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?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/es.php b/apps/user_migrate/l10n/es.php
deleted file mode 100644
index 6a0551fe23..0000000000
--- a/apps/user_migrate/l10n/es.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Export" => "Exportar",
-"ownCloud User Zip" => "Zip de usuario de ownCloud",
-"Import" => "Importar"
-);
diff --git a/apps/user_migrate/l10n/fi_FI.php b/apps/user_migrate/l10n/fi_FI.php
deleted file mode 100644
index 2616bee6f2..0000000000
--- a/apps/user_migrate/l10n/fi_FI.php
+++ /dev/null
@@ -1,9 +0,0 @@
-<?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/fr.php b/apps/user_migrate/l10n/fr.php
deleted file mode 100644
index 70ab2f8f22..0000000000
--- a/apps/user_migrate/l10n/fr.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Export" => "Exporter",
-"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.",
-"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
deleted file mode 100644
index f3eeb15dab..0000000000
--- a/apps/user_migrate/l10n/it.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?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/ja_JP.php b/apps/user_migrate/l10n/ja_JP.php
deleted file mode 100644
index 86c66e6319..0000000000
--- a/apps/user_migrate/l10n/ja_JP.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?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_migrate/l10n/lt_LT.php b/apps/user_migrate/l10n/lt_LT.php
deleted file mode 100644
index 20add8037b..0000000000
--- a/apps/user_migrate/l10n/lt_LT.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?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_migrate/l10n/pl.php b/apps/user_migrate/l10n/pl.php
deleted file mode 100644
index c3a6332578..0000000000
--- a/apps/user_migrate/l10n/pl.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?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_migrate/l10n/ru.php b/apps/user_migrate/l10n/ru.php
deleted file mode 100644
index c8889ad021..0000000000
--- a/apps/user_migrate/l10n/ru.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?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",
-"Import" => "Импорт"
-);
diff --git a/apps/user_migrate/l10n/sl.php b/apps/user_migrate/l10n/sl.php
deleted file mode 100644
index c14bca0f70..0000000000
--- a/apps/user_migrate/l10n/sl.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?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/sv.php b/apps/user_migrate/l10n/sv.php
deleted file mode 100644
index 98e649632b..0000000000
--- a/apps/user_migrate/l10n/sv.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?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_migrate/l10n/th_TH.php b/apps/user_migrate/l10n/th_TH.php
deleted file mode 100644
index d2c36bb4ed..0000000000
--- a/apps/user_migrate/l10n/th_TH.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?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_migrate/settings.php b/apps/user_migrate/settings.php
deleted file mode 100644
index 098927fa17..0000000000
--- a/apps/user_migrate/settings.php
+++ /dev/null
@@ -1,89 +0,0 @@
-<?php
-
-/**
- * ownCloud - user_migrate
- *
- * @author Thomas Schmidt
- * @copyright 2011 Thomas Schmidt tom@opensuse.org
- * @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\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 ) ){
-
-		$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/settings.php b/apps/user_migrate/templates/settings.php
deleted file mode 100644
index d6f3e2f8f6..0000000000
--- a/apps/user_migrate/templates/settings.php
+++ /dev/null
@@ -1,19 +0,0 @@
-<fieldset class="personalblock">
-	<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::imagePath('core', '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: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>
-</form>
diff --git a/apps/user_openid/appinfo/app.php b/apps/user_openid/appinfo/app.php
deleted file mode 100644
index fe57b189fa..0000000000
--- a/apps/user_openid/appinfo/app.php
+++ /dev/null
@@ -1,52 +0,0 @@
-<?php
-
-//check if curl extension installed
-if (!in_array ('curl', get_loaded_extensions())){
-	return;
-}
-
-$userName='';
-if(strpos($_SERVER["REQUEST_URI"],'?') and !strpos($_SERVER["REQUEST_URI"],'=')){
-	if(strpos($_SERVER["REQUEST_URI"],'/?')){
-		$userName=substr($_SERVER["REQUEST_URI"],strpos($_SERVER["REQUEST_URI"],'/?')+2);
-	}elseif(strpos($_SERVER["REQUEST_URI"],'.php?')){
-		$userName=substr($_SERVER["REQUEST_URI"],strpos($_SERVER["REQUEST_URI"],'.php?')+5);
-	}
-}
-
-OCP\Util::addHeader('link',array('rel'=>'openid.server', 'href'=>OCP\Util::linkToAbsolute( "user_openid", "user.php" ).'/'.$userName));
-OCP\Util::addHeader('link',array('rel'=>'openid.delegate', 'href'=>OCP\Util::linkToAbsolute( "user_openid", "user.php" ).'/'.$userName));
-
-OCP\App::registerPersonal('user_openid','settings');
-
-require_once 'apps/user_openid/user_openid.php';
-
-//active the openid backend
-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->SetIdentity($_GET['openid_identity']);
-	$openid_validation_result = $openid->ValidateWithServer();
-	if ($openid_validation_result == true){         // OK HERE KEY IS VALID
-		OCP\Util::writeLog('user_openid','auth sucessfull',OCP\Util::DEBUG);
-		$identity=$openid->GetIdentity();
-		OCP\Util::writeLog('user_openid','auth as '.$identity,OCP\Util::DEBUG);
-		$user=OC_USER_OPENID::findUserForIdentity($identity);
-		if($user){
-			$_SESSION['user_id']=$user;
-			header("Location: ".OC::$WEBROOT);
-		}
-	}else if($openid->IsError() == true){            // ON THE WAY, WE GOT SOME ERROR
-		$error = $openid->GetError();
-		OCP\Util::writeLog('user_openid','ERROR CODE: '. $error['code'],OCP\Util::ERROR);
-		OCP\Util::writeLog('user_openid','ERROR DESCRIPTION: '. $error['description'],OCP\Util::ERROR);
-	}else{                                            // Signature Verification Failed
-		OCP\Util::writeLog('user_openid','INVALID AUTHORIZATION',OCP\Util::ERROR);
-	}
-}else if (isset($_GET['openid_mode']) and $_GET['openid_mode'] == 'cancel'){ // User Canceled your Request
-	OCP\Util::writeLog('user_openid','USER CANCELED REQUEST',OCP\Util::DEBUG);
-	return false;
-}
diff --git a/apps/user_openid/appinfo/info.xml b/apps/user_openid/appinfo/info.xml
deleted file mode 100644
index 7aae4271fa..0000000000
--- a/apps/user_openid/appinfo/info.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<info>
-	<id>user_openid</id>
-	<name>OpenID user backend</name>
-	<description>Allow login through OpenID</description>
-	<licence>AGPL</licence>
-	<author>Robin Appelman</author>
-	<require>4</require>
-	<shipped>true</shipped>
-	<types>
-		<prelogin/>
-		<authentication/>
-	</types>
-</info>
diff --git a/apps/user_openid/appinfo/version b/apps/user_openid/appinfo/version
deleted file mode 100644
index d917d3e26a..0000000000
--- a/apps/user_openid/appinfo/version
+++ /dev/null
@@ -1 +0,0 @@
-0.1.2
diff --git a/apps/user_openid/js/settings.js b/apps/user_openid/js/settings.js
deleted file mode 100644
index 83170e6b84..0000000000
--- a/apps/user_openid/js/settings.js
+++ /dev/null
@@ -1,10 +0,0 @@
-$(document).ready(function(){
-	$('#openidform #identity').blur(function(event){
-		event.preventDefault();
-		OC.msg.startSaving('#openidform .msg');
-		var post = $( "#openidform" ).serialize();
-		$.post( 'ajax/openid.php', post, function(data){
-			OC.msg.finishedSaving('#openidform .msg', data);
-		});
-	});
-});
diff --git a/apps/user_openid/l10n/.gitkeep b/apps/user_openid/l10n/.gitkeep
deleted file mode 100644
index e69de29bb2..0000000000
diff --git a/apps/user_openid/l10n/ca.php b/apps/user_openid/l10n/ca.php
deleted file mode 100644
index d203bfb4d9..0000000000
--- a/apps/user_openid/l10n/ca.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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/cs_CZ.php b/apps/user_openid/l10n/cs_CZ.php
deleted file mode 100644
index 9c041a89a6..0000000000
--- a/apps/user_openid/l10n/cs_CZ.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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/de.php b/apps/user_openid/l10n/de.php
deleted file mode 100644
index 7bfe678574..0000000000
--- a/apps/user_openid/l10n/de.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php $TRANSLATIONS = array(
-"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 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
deleted file mode 100644
index a80f5bdb24..0000000000
--- a/apps/user_openid/l10n/el.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?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/eo.php b/apps/user_openid/l10n/eo.php
deleted file mode 100644
index 665d199094..0000000000
--- a/apps/user_openid/l10n/eo.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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/es.php b/apps/user_openid/l10n/es.php
deleted file mode 100644
index 048336d3db..0000000000
--- a/apps/user_openid/l10n/es.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?php $TRANSLATIONS = array(
-"Identity: <b>" => "Identidad: <b>",
-"User: <b>" => "Usuario: <b>",
-"Login" => "Iniciar sesión"
-);
diff --git a/apps/user_openid/l10n/et_EE.php b/apps/user_openid/l10n/et_EE.php
deleted file mode 100644
index f04bcafb24..0000000000
--- a/apps/user_openid/l10n/et_EE.php
+++ /dev/null
@@ -1,5 +0,0 @@
-<?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/apps/user_openid/l10n/fi_FI.php b/apps/user_openid/l10n/fi_FI.php
deleted file mode 100644
index 1cde4ae660..0000000000
--- a/apps/user_openid/l10n/fi_FI.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?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/apps/user_openid/l10n/fr.php b/apps/user_openid/l10n/fr.php
deleted file mode 100644
index ec3d00853d..0000000000
--- a/apps/user_openid/l10n/fr.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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
deleted file mode 100644
index 0a9dd951b5..0000000000
--- a/apps/user_openid/l10n/it.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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/ja_JP.php b/apps/user_openid/l10n/ja_JP.php
deleted file mode 100644
index 12a2692cb6..0000000000
--- a/apps/user_openid/l10n/ja_JP.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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/nl.php b/apps/user_openid/l10n/nl.php
deleted file mode 100644
index 5b07c6108a..0000000000
--- a/apps/user_openid/l10n/nl.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php $TRANSLATIONS = array(
-"This is an OpenID server endpoint. For more information, see " => "Dit is een OpenID server.  Voor meer informatie, zie",
-"Identity: <b>" => "Identiteit: <b>",
-"Realm: <b>" => "Realm: <b>",
-"User: <b>" => "Gebruiker: <b>",
-"Login" => "Login",
-"Error: <b>No user Selected" => "Fout: <b>Geen gebruiker geselecteerd",
-"you can authenticate to other sites with this address" => "u kan met dit adres bij andere sites authenticeren",
-"Authorized OpenID provider" => "Geautoriseerde OpenID provider",
-"Your address at Wordpress, Identi.ca, &hellip;" => "Uw adres bij Wordpress, Identi.ca, &hellip;"
-);
diff --git a/apps/user_openid/l10n/pl.php b/apps/user_openid/l10n/pl.php
deleted file mode 100644
index c9572851e3..0000000000
--- a/apps/user_openid/l10n/pl.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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/apps/user_openid/l10n/ru.php b/apps/user_openid/l10n/ru.php
deleted file mode 100644
index 09855c35b7..0000000000
--- a/apps/user_openid/l10n/ru.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php $TRANSLATIONS = array(
-"This is an OpenID server endpoint. For more information, see " => "Это точка подключения сервера OpenID. Для информации смотрите",
-"Identity: <b>" => "Личность: <b>",
-"Realm: <b>" => "Realm: <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
deleted file mode 100644
index 0464214a42..0000000000
--- a/apps/user_openid/l10n/sl.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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>" => "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 ponudnik OpenID",
-"Your address at Wordpress, Identi.ca, &hellip;" => "Vaš naslov pri Wordpress, Identi.ca, &hellip;"
-);
diff --git a/apps/user_openid/l10n/sv.php b/apps/user_openid/l10n/sv.php
deleted file mode 100644
index fb2c4e2ff7..0000000000
--- a/apps/user_openid/l10n/sv.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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/apps/user_openid/l10n/th_TH.php b/apps/user_openid/l10n/th_TH.php
deleted file mode 100644
index fbf0bbc60a..0000000000
--- a/apps/user_openid/l10n/th_TH.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?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/settings.php b/apps/user_openid/settings.php
deleted file mode 100644
index 062322f6fe..0000000000
--- a/apps/user_openid/settings.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-$tmpl = new OCP\Template( 'user_openid', 'settings');
-$identity=OCP\Config::getUserValue(OCP\USER::getUser(),'user_openid','identity','');
-$tmpl->assign('identity',htmlentities($identity));
-
-OCP\Util::addscript('user_openid','settings');
-
-return $tmpl->fetchPage();
-?>
\ No newline at end of file
diff --git a/apps/user_openid/templates/nomode.php b/apps/user_openid/templates/nomode.php
deleted file mode 100644
index 8952b542f0..0000000000
--- a/apps/user_openid/templates/nomode.php
+++ /dev/null
@@ -1,28 +0,0 @@
-<?php
-
-global $profile;
-
-?>
-
-<div id="login">
-	<img src="<?php echo OCP\image_path("", "logo.png"); ?>" alt="ownCloud" />
-	<ul>
-		<li class='error'>
-			<div id="setup_form">
-				<p><?php echo($l->t('This is an OpenID server endpoint. For more information, see '));?><a href='http://openid.net/' title='openid.net'>http://openid.net/</a></p>
-				<?php if($_['user']):?>
-					<p><?php echo($l->t('Identity: <b>').$profile['idp_url']); ?></b></p>
-					<p><?php echo($l->t('Realm: <b>').$profile['php_realm']); ?></b></p>
-					<p><?php echo($l->t('User: <b>').$_['user']); ?></b>
-					<p><a href="<?php echo($profile['idp_url']); ?>?openid.mode=login"><?php echo($l->t('Login')); ?></a>
-					<?php if($profile['allow_test'] === true): ?>
-						<a href="<?php echo($profile['idp_url']); ?>?openid.mode=test">Test</a>
-					<?php endif; ?>
-				<?php else: ?>
-					<p><?php echo($l->t('Error: <b>No user Selected')); ?></p>
-				<?php endif; ?>
-			</div>
-		</li>
-	</ul>
-</div>
-
diff --git a/apps/user_openid/templates/settings.php b/apps/user_openid/templates/settings.php
deleted file mode 100644
index b2bbe5a46a..0000000000
--- a/apps/user_openid/templates/settings.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<form id="openidform">
-	<fieldset class="personalblock">
-		<strong>OpenID</strong>
-		<?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>
-</form>
diff --git a/apps/user_openid/user.php b/apps/user_openid/user.php
deleted file mode 100644
index 88571ba618..0000000000
--- a/apps/user_openid/user.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-
-/**
-* ownCloud
-*
-* @author Robin Appelman
-* @copyright 2011 Robin Appelman icewind1991@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/>.
-*
-*/
-
-$USERNAME=substr($_SERVER["REQUEST_URI"],strpos($_SERVER["REQUEST_URI"],'.php/')+5);
-if(strpos($USERNAME,'?')!==false){
-	$USERNAME=substr($USERNAME,0,strpos($USERNAME,'?'));
-}
-if(substr($USERNAME,-1,1)=='/'){//openid sometimes add slashes to the username
-	$USERNAME=substr($USERNAME,0,-1);
-}
-
-
-if($USERNAME=='' and isset($_SERVER['PHP_AUTH_USER'])){
-	$USERNAME=$_SERVER['PHP_AUTH_USER'];
-}
-
-$RUNTIME_NOAPPS=true;
-$RUNTIME_NOAPPS=false;
-OCP\App::checkAppEnabled('user_openid');
-
-if(!OCP\User::userExists($USERNAME)){
-	OCP\Util::writeLog('user_openid',$USERNAME.' doesn\'t exist',OCP\Util::WARN);
-	$USERNAME='';
-}
-$IDENTITY=OCP\Util::linkToAbsolute( "user_openid", "user.php" ).'/'.$USERNAME;
-
-require_once 'openid/phpmyid.php';
diff --git a/apps/user_openid/user_openid.php b/apps/user_openid/user_openid.php
deleted file mode 100644
index 9654001cbc..0000000000
--- a/apps/user_openid/user_openid.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-
-/**
- * ownCloud
- *
- * @author Robin Appelman
- * @copyright 2011 Robin Appelman icewind1991gmailc.om
- *
- * 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('openid/class.openid.v3.php');
-
-/**
- * Class for user OpenId backend
- */
-class OC_USER_OPENID extends OC_User_Backend {
-	/**
-	 * @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 ){
-		// Get identity from user and redirect browser to OpenID Server
-		$openid = new SimpleOpenID();
-		$openid->SetIdentity($uid);
-		$openid->SetTrustRoot('http://' . OCP\Util::getServerHost());
-		if ($openid->GetOpenIDServer()){
-			$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{
-			return false;
-		}
-		exit;
-	}
-	
-	/**
-	 * find the user that can be authenticated with an openid identity
-	 */
-	public static function findUserForIdentity($identity){
-		$query=OCP\DB::prepare('SELECT `userid` FROM `*PREFIX*preferences` WHERE `appid`=? AND `configkey`=? AND `configvalue`=?');
-		$result=$query->execute(array('user_openid','identity',$identity))->fetchAll();
-		if(count($result)>0){
-			return $result[0]['userid'];
-		}else{
-			return false;
-		}
-	}
-}
diff --git a/apps/user_webfinger/.htaccess b/apps/user_webfinger/.htaccess
deleted file mode 100644
index 1b13cf788f..0000000000
--- a/apps/user_webfinger/.htaccess
+++ /dev/null
@@ -1,5 +0,0 @@
-<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/appinfo/app.php b/apps/user_webfinger/appinfo/app.php
deleted file mode 100644
index b3d9bbc7f3..0000000000
--- a/apps/user_webfinger/appinfo/app.php
+++ /dev/null
@@ -1 +0,0 @@
-<?php
diff --git a/apps/user_webfinger/appinfo/info.xml b/apps/user_webfinger/appinfo/info.xml
deleted file mode 100644
index f74e5d3f93..0000000000
--- a/apps/user_webfinger/appinfo/info.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<info>
-	<id>user_webfinger</id>
-	<name>Webfinger</name>
-	<description>Provide WebFinger for all users so they get a user address like user@owncloudinstance which can be used for external applications. Other apps can provide information for webfinger requests, such as remoteStorage compatibility.</description>
-	<licence>AGPL or MIT</licence>
-	<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
deleted file mode 100644
index a2268e2de4..0000000000
--- a/apps/user_webfinger/appinfo/version
+++ /dev/null
@@ -1 +0,0 @@
-0.3.1
\ No newline at end of file
diff --git a/apps/user_webfinger/host-meta.php b/apps/user_webfinger/host-meta.php
deleted file mode 100644
index 6f6ac46eb9..0000000000
--- a/apps/user_webfinger/host-meta.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-if (!OCP\App::isEnabled("user_webfinger")) {
-	return;
-}
-
-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.$WEBROOT.'/public.php?service=webfinger&q={uri}"}]}';
-foreach($hostMetaHeader as $header => $value) {
-	header($header . ": " . $value);
-}
-echo $hostMetaContents;
diff --git a/apps/user_webfinger/webfinger.php b/apps/user_webfinger/webfinger.php
deleted file mode 100644
index b725937948..0000000000
--- a/apps/user_webfinger/webfinger.php
+++ /dev/null
@@ -1,64 +0,0 @@
-<?php
-if (!OCP\App::isEnabled("user_webfinger")) {
-	return;
-}
-
-header("Access-Control-Allow-Origin: *");
-header("Content-Type: application/xrd+json");
-
-/**
- * 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:
- * 
- * {
- * 	"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
- **/
-
-$userName = '';
-$hostName = '';
-$request = strip_tags(urldecode($_GET['q']));
-if($_GET['q']) {
-	$reqParts = explode('@', $request);
-	if(count($reqParts)==2) {
-		$userName = $reqParts[0];
-		$hostName = $reqParts[1];
-	}
-}
-if(substr($userName, 0, 5) == 'acct:') {
-	$userName = substr($userName, 5);
-}
-if($userName == "") {
-	$id = "";
-} else {
-	$id = $userName . '@' . $hostName;
-}
-if(isset($_SERVER['HTTPS'])) {
-	$baseAddress = 'https://';
-} else {
-	$baseAddress = 'http://';
-}
-$baseAddress .= $_SERVER['SERVER_NAME'].OC::$WEBROOT;
-if(empty($id)) {
-	header("HTTP/1.0 400 Bad Request");
-}
-define('WF_USER', $userName);
-define('WF_ID', $id);
-define('WF_BASEURL', $baseAddress);
-echo "{\"links\":[";
-$apps = OC_Appconfig::getApps();
-foreach($apps as $app) {
-	if(OCP\App::isEnabled($app)) {
-		if(is_file(OC_App::getAppPath($app). '/appinfo/webfinger.php')) {
-			require($app . '/appinfo/webfinger.php');
-		}
-	}
-}
-echo "]}";

From 184438224cfece0f9797f54340a1353cc67e0b28 Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <frank@owncloud.org>
Date: Sun, 26 Aug 2012 17:51:01 +0200
Subject: [PATCH 0922/1224] restore the webdavauth app

---
 apps/user_webdavauth/appinfo/app.php        | 38 +++++++++
 apps/user_webdavauth/appinfo/info.xml       | 10 +++
 apps/user_webdavauth/settings.php           | 40 ++++++++++
 apps/user_webdavauth/templates/settings.php |  7 ++
 apps/user_webdavauth/user_webdavauth.php    | 85 +++++++++++++++++++++
 5 files changed, 180 insertions(+)
 create mode 100755 apps/user_webdavauth/appinfo/app.php
 create mode 100755 apps/user_webdavauth/appinfo/info.xml
 create mode 100755 apps/user_webdavauth/settings.php
 create mode 100755 apps/user_webdavauth/templates/settings.php
 create mode 100755 apps/user_webdavauth/user_webdavauth.php

diff --git a/apps/user_webdavauth/appinfo/app.php b/apps/user_webdavauth/appinfo/app.php
new file mode 100755
index 0000000000..db1087449a
--- /dev/null
+++ b/apps/user_webdavauth/appinfo/app.php
@@ -0,0 +1,38 @@
+<?php
+
+/**
+* ownCloud - user_webdavauth
+*
+* @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/>.
+*
+*/
+
+require_once('apps/user_webdavauth/user_webdavauth.php');
+
+OC_APP::registerAdmin('user_webdavauth','settings');
+
+OC_User::registerBackend("WEBDAVAUTH");
+OC_User::useBackend( "WEBDAVAUTH" );
+
+// add settings page to navigation
+$entry = array(
+	'id' => "user_webdavauth_settings",
+	'order'=>1,
+	'href' => OC_Helper::linkTo( "user_webdavauth", "settings.php" ),
+	'name' => 'WEBDAVAUTH'
+);
+?>
diff --git a/apps/user_webdavauth/appinfo/info.xml b/apps/user_webdavauth/appinfo/info.xml
new file mode 100755
index 0000000000..77fe3b892c
--- /dev/null
+++ b/apps/user_webdavauth/appinfo/info.xml
@@ -0,0 +1,10 @@
+<?xml version="1.0"?>
+<info>
+	<id>user_webdavauth</id>
+	<name>WebDAV user backend</name>
+	<description>Authenticate Users by a WebDAV call</description>
+	<version>1.0</version>
+	<licence>AGPL</licence>
+	<author>Frank Karlitschek</author>
+	<require>3</require>
+</info>
diff --git a/apps/user_webdavauth/settings.php b/apps/user_webdavauth/settings.php
new file mode 100755
index 0000000000..5bd1af53c9
--- /dev/null
+++ b/apps/user_webdavauth/settings.php
@@ -0,0 +1,40 @@
+<?php
+
+/**
+ * ownCloud - user_webdavauth
+ *
+ * @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/>.
+ *
+ */
+
+print_r($_POST);
+if($_POST){
+
+		if(isset($_POST['webdav_url'])){
+			OC_CONFIG::setValue('user_webdavauth_url', strip_tags($_POST['webdav_url']));
+		}
+}
+
+// fill template
+$tmpl = new OC_Template( 'user_webdavauth', 'settings');
+$tmpl->assign( 'webdav_url', OC_Config::getValue( "user_webdavauth_url" ));
+
+return $tmpl->fetchPage();
+
+
+
+?>
diff --git a/apps/user_webdavauth/templates/settings.php b/apps/user_webdavauth/templates/settings.php
new file mode 100755
index 0000000000..c00c199632
--- /dev/null
+++ b/apps/user_webdavauth/templates/settings.php
@@ -0,0 +1,7 @@
+<form id="webdavauth" action="#" method="post">
+	<fieldset class="personalblock">
+		<legend><strong>WebDAV Authentication</strong></legend>
+		<p><label for="webdav_url"><?php echo $l->t('webdav_url');?><input type="text" id="webdav_url" name="webdav_url" value="<?php echo $_['webdav_url']; ?>"></label>
+		<input type="submit" value="Save" />
+	</fieldset>
+</form>
diff --git a/apps/user_webdavauth/user_webdavauth.php b/apps/user_webdavauth/user_webdavauth.php
new file mode 100755
index 0000000000..71c503f940
--- /dev/null
+++ b/apps/user_webdavauth/user_webdavauth.php
@@ -0,0 +1,85 @@
+<?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/>.
+ *
+ */
+
+class OC_USER_WEBDAVAUTH extends OC_User_Backend {
+	protected $webdavauth_url;
+	
+	public function __construct() {
+		$this->webdavauth_url = OC_Config::getValue( "user_webdavauth_url" );
+	}
+	
+	public function createUser() {
+		// Can't create user
+		OC_Log::write('OC_USER_WEBDAVAUTH', 'Not possible to create users from web frontend using WebDAV user backend',3);
+		return false;
+	}
+
+	public function deleteUser() {
+		// Can't delete user
+		OC_Log::write('OC_USER_WEBDAVAUTH', 'Not possible to delete users from web frontend using WebDAV user backend',3);
+		return false;
+	}
+
+	public function setPassword ( $uid, $password ) {
+		// We can't change user password
+		OC_Log::write('OC_USER_WEBDAVAUTH', 'Not possible to change password for users from web frontend using WebDAV user backend',3);
+		return false;
+	}
+	
+	public function checkPassword( $uid, $password ) {
+
+		$url= 'http://'.urlencode($uid).':'.urlencode($password).'@'.$this->webdavauth_url;
+		$headers = get_headers($url);
+		if($headers==false){
+			OC_Log::write('OC_USER_WEBDAVAUTH', 'Not possible to connect to WebDAV Url: "'.$this->webdavauth_url.'" ' ,3);
+			return false;	
+
+		}
+		$returncode= substr($headers[0], 9, 3);
+
+		if($returncode=='401') {
+			return false;
+		}else{
+			return true;
+		}
+
+	}
+	
+	/*
+	* we don´t know if a user exists without the password. so we have to return false all the time
+	*/
+	public function userExists( $uid ){
+		return false;
+	}
+
+	/*
+	* we don´t know the users so all we can do it return an empty array here
+	*/
+	public function getUsers(){
+		$returnArray = array();
+		
+		return $returnArray;
+	}
+}
+
+?>

From 352128645b2e1f43a4e4924d9a160468afdb00f9 Mon Sep 17 00:00:00 2001
From: Thomas Mueller <thomas.mueller@tmit.eu>
Date: Sun, 26 Aug 2012 19:43:58 +0200
Subject: [PATCH 0923/1224] changing l10n to reflect latest repo splitt

---
 l10n/.tx/config                           |  80 --
 l10n/templates/admin_dependencies_chk.pot |  71 --
 l10n/templates/admin_migrate.pot          |  33 -
 l10n/templates/bookmarks.pot              |  60 --
 l10n/templates/calendar.pot               | 813 ------------------
 l10n/templates/contacts.pot               | 952 ----------------------
 l10n/templates/files_odfviewer.pot        |  22 -
 l10n/templates/files_pdfviewer.pot        |  42 -
 l10n/templates/gallery.pot                |  38 -
 l10n/templates/impress.pot                |  22 -
 l10n/templates/media.pot                  |  66 --
 l10n/templates/tasks.pot                  | 106 ---
 l10n/templates/user_migrate.pot           |  50 --
 l10n/templates/user_openid.pot            |  54 --
 14 files changed, 2409 deletions(-)
 delete mode 100644 l10n/templates/admin_dependencies_chk.pot
 delete mode 100644 l10n/templates/admin_migrate.pot
 delete mode 100644 l10n/templates/bookmarks.pot
 delete mode 100644 l10n/templates/calendar.pot
 delete mode 100644 l10n/templates/contacts.pot
 delete mode 100644 l10n/templates/files_odfviewer.pot
 delete mode 100644 l10n/templates/files_pdfviewer.pot
 delete mode 100644 l10n/templates/gallery.pot
 delete mode 100644 l10n/templates/impress.pot
 delete mode 100644 l10n/templates/media.pot
 delete mode 100644 l10n/templates/tasks.pot
 delete mode 100644 l10n/templates/user_migrate.pot
 delete mode 100644 l10n/templates/user_openid.pot

diff --git a/l10n/.tx/config b/l10n/.tx/config
index 79a2a733f8..cd29b6ae77 100644
--- a/l10n/.tx/config
+++ b/l10n/.tx/config
@@ -6,60 +6,22 @@ file_filter = <lang>/core.po
 source_file = templates/core.pot
 source_lang = en
 
-[owncloud.calendar]
-file_filter = <lang>/calendar.po
-source_file = templates/calendar.pot
-source_lang = en
-
-[owncloud.contacts]
-file_filter = <lang>/contacts.po
-source_file = templates/contacts.pot
-source_lang = en
-
 [owncloud.files]
 file_filter = <lang>/files.po
 source_file = templates/files.pot
 source_lang = en
 
-[owncloud.media]
-file_filter = <lang>/media.po
-source_file = templates/media.pot
-source_lang = en
-
 [owncloud.settings]
 file_filter = <lang>/settings.po
 source_file = templates/settings.pot
 source_lang = en
 
-[owncloud.gallery]
-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
 
-[owncloud.admin_dependencies_chk]
-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
@@ -84,51 +46,9 @@ 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
-
-[owncloud.files_texteditor]
-file_filter = <lang>/files_texteditor.po
-source_file = templates/files_texteditor.pot
-source_lang = en
-type = PO
-
-[owncloud.impress]
-file_filter = <lang>/impress.po
-source_file = templates/impress.pot
-source_lang = en
-type = PO
-
-[owncloud.files_odfviewer]
-file_filter = <lang>/files_odfviewer.po
-source_file = templates/files_odfviewer.pot
-source_lang = en
-type = PO
-
-[owncloud.files_pdfviewer]
-file_filter = <lang>/files_pdfviewer.po
-source_file = templates/files_pdfviewer.pot
-source_lang = en
-type = PO
-
diff --git a/l10n/templates/admin_dependencies_chk.pot b/l10n/templates/admin_dependencies_chk.pot
deleted file mode 100644
index 92c994186e..0000000000
--- a/l10n/templates/admin_dependencies_chk.pot
+++ /dev/null
@@ -1,71 +0,0 @@
-# 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-26 02:18+0200\n"
-"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
deleted file mode 100644
index 1fa0cf44ea..0000000000
--- a/l10n/templates/admin_migrate.pot
+++ /dev/null
@@ -1,33 +0,0 @@
-# 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-26 02:18+0200\n"
-"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
deleted file mode 100644
index 5e82726479..0000000000
--- a/l10n/templates/bookmarks.pot
+++ /dev/null
@@ -1,60 +0,0 @@
-# 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-26 02:18+0200\n"
-"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"
-
-#: 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/templates/calendar.pot b/l10n/templates/calendar.pot
deleted file mode 100644
index 278c81d390..0000000000
--- a/l10n/templates/calendar.pot
+++ /dev/null
@@ -1,813 +0,0 @@
-# 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-26 02:18+0200\n"
-"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/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:41 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/templates/contacts.pot b/l10n/templates/contacts.pot
deleted file mode 100644
index 1172f960c2..0000000000
--- a/l10n/templates/contacts.pot
+++ /dev/null
@@ -1,952 +0,0 @@
-# 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-26 02:18+0200\n"
-"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/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:32
-#: 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: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/deleteproperty.php:37
-msgid "Information about vCard is incorrect. Please reload the page."
-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/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:25
-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: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: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:789
-msgid "Couldn't serialize elements."
-msgstr ""
-
-#: js/contacts.js:921 js/contacts.js:939
-msgid ""
-"'deleteProperty' called without type argument. Please report at bugs."
-"owncloud.org"
-msgstr ""
-
-#: js/contacts.js:958
-msgid "Edit name"
-msgstr ""
-
-#: js/contacts.js:1250
-msgid "No files selected for upload."
-msgstr ""
-
-#: 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:1322
-msgid "Error loading profile picture."
-msgstr ""
-
-#: js/contacts.js:1457 js/contacts.js:1498 js/contacts.js:1517
-#: js/contacts.js:1560
-msgid "Select type"
-msgstr ""
-
-#: 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:1649
-msgid "Do you want to merge these address books?"
-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:68
-msgid "Displayname cannot be empty."
-msgstr ""
-
-#: lib/app.php:36
-msgid "Addressbook not found: "
-msgstr ""
-
-#: lib/app.php:52
-msgid "This is not your addressbook."
-msgstr ""
-
-#: lib/app.php:71
-msgid "Contact could not be found."
-msgstr ""
-
-#: lib/app.php:116
-msgid "Jabber"
-msgstr ""
-
-#: 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 "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:195 lib/app.php:200 lib/app.php:214
-msgid "Home"
-msgstr ""
-
-#: lib/app.php:196 lib/app.php:209 lib/app.php:262 lib/vcard.php:586
-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 ""
-
-#: lib/hooks.php:102
-msgid "{name}'s Birthday"
-msgstr ""
-
-#: lib/search.php:15
-msgid "Contact"
-msgstr ""
-
-#: lib/vcard.php:401
-msgid "You do not have the permissions to edit this contact."
-msgstr ""
-
-#: lib/vcard.php:476
-msgid "You do not have the permissions to delete this 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: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:41 templates/part.contact.php:127
-msgid "Nickname"
-msgstr ""
-
-#: templates/part.contact.php:42
-msgid "Enter nickname"
-msgstr ""
-
-#: templates/part.contact.php:43 templates/part.contact.php:134
-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:135
-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:59 templates/part.contact.php:73
-#: templates/part.contact.php:98
-msgid "Preferred"
-msgstr ""
-
-#: templates/part.contact.php:60
-msgid "Please specify a valid email address."
-msgstr ""
-
-#: templates/part.contact.php:60
-msgid "Enter email address"
-msgstr ""
-
-#: templates/part.contact.php:64
-msgid "Mail to address"
-msgstr ""
-
-#: templates/part.contact.php:65
-msgid "Delete email address"
-msgstr ""
-
-#: templates/part.contact.php:75
-msgid "Enter phone number"
-msgstr ""
-
-#: templates/part.contact.php:79
-msgid "Delete phone number"
-msgstr ""
-
-#: 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:110
-msgid "Edit address details"
-msgstr ""
-
-#: templates/part.contact.php:116
-msgid "Add notes here."
-msgstr ""
-
-#: templates/part.contact.php:124
-msgid "Add field"
-msgstr ""
-
-#: templates/part.contact.php:129
-msgid "Phone"
-msgstr ""
-
-#: 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:138
-msgid "Download contact"
-msgstr ""
-
-#: templates/part.contact.php:139
-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.selectaddressbook.php:1
-msgid "Select Address Books"
-msgstr ""
-
-#: templates/part.selectaddressbook.php:27
-msgid "Enter name"
-msgstr ""
-
-#: templates/part.selectaddressbook.php:29
-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 "Share"
-msgstr ""
-
-#: templates/settings.php:29
-msgid "Download"
-msgstr ""
-
-#: templates/settings.php:33
-msgid "Edit"
-msgstr ""
-
-#: templates/settings.php:43
-msgid "New Address Book"
-msgstr ""
-
-#: templates/settings.php:44
-msgid "Name"
-msgstr ""
-
-#: templates/settings.php:45
-msgid "Description"
-msgstr ""
-
-#: templates/settings.php:46
-msgid "Save"
-msgstr ""
-
-#: templates/settings.php:47
-msgid "Cancel"
-msgstr ""
-
-#: templates/settings.php:52
-msgid "More..."
-msgstr ""
diff --git a/l10n/templates/files_odfviewer.pot b/l10n/templates/files_odfviewer.pot
deleted file mode 100644
index 2552f49e78..0000000000
--- a/l10n/templates/files_odfviewer.pot
+++ /dev/null
@@ -1,22 +0,0 @@
-# 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-26 02:18+0200\n"
-"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/viewer.js:9
-msgid "Close"
-msgstr ""
diff --git a/l10n/templates/files_pdfviewer.pot b/l10n/templates/files_pdfviewer.pot
deleted file mode 100644
index 9eab4ed5f5..0000000000
--- a/l10n/templates/files_pdfviewer.pot
+++ /dev/null
@@ -1,42 +0,0 @@
-# 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-26 02:18+0200\n"
-"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/viewer.js:22
-msgid "Previous"
-msgstr ""
-
-#: js/viewer.js:23
-msgid "Next"
-msgstr ""
-
-#: js/viewer.js:29
-msgid "Page Width"
-msgstr ""
-
-#: js/viewer.js:29
-msgid "Page Fit"
-msgstr ""
-
-#: js/viewer.js:30
-msgid "Print"
-msgstr ""
-
-#: js/viewer.js:32
-msgid "Download"
-msgstr ""
diff --git a/l10n/templates/gallery.pot b/l10n/templates/gallery.pot
deleted file mode 100644
index caecc6defc..0000000000
--- a/l10n/templates/gallery.pot
+++ /dev/null
@@ -1,38 +0,0 @@
-# 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-26 02:18+0200\n"
-"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"
-
-#: appinfo/app.php:42
-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 ""
diff --git a/l10n/templates/impress.pot b/l10n/templates/impress.pot
deleted file mode 100644
index 0830dabf4e..0000000000
--- a/l10n/templates/impress.pot
+++ /dev/null
@@ -1,22 +0,0 @@
-# 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-26 02:18+0200\n"
-"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/presentations.php:7
-msgid "Documentation"
-msgstr ""
diff --git a/l10n/templates/media.pot b/l10n/templates/media.pot
deleted file mode 100644
index f2b64570f3..0000000000
--- a/l10n/templates/media.pot
+++ /dev/null
@@ -1,66 +0,0 @@
-# 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-26 02:18+0200\n"
-"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"
-
-#: 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/templates/tasks.pot b/l10n/templates/tasks.pot
deleted file mode 100644
index 4568a33138..0000000000
--- a/l10n/templates/tasks.pot
+++ /dev/null
@@ -1,106 +0,0 @@
-# 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-26 02:18+0200\n"
-"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_migrate.pot b/l10n/templates/user_migrate.pot
deleted file mode 100644
index d6d566d3ab..0000000000
--- a/l10n/templates/user_migrate.pot
+++ /dev/null
@@ -1,50 +0,0 @@
-# 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-26 02:18+0200\n"
-"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
deleted file mode 100644
index 3ca434abcd..0000000000
--- a/l10n/templates/user_openid.pot
+++ /dev/null
@@ -1,54 +0,0 @@
-# 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-26 02:18+0200\n"
-"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 faf702b9e6f1928cb5a9f9d71a411d35d1e5d34b Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <thomas.mueller@tmit.eu>
Date: Sun, 26 Aug 2012 19:47:33 +0200
Subject: [PATCH 0924/1224] [tx-robot] updated from transifex

---
 apps/files/l10n/et_EE.php            |  7 ++++
 apps/files_encryption/l10n/hu_HU.php |  6 +++
 apps/files_sharing/l10n/hu_HU.php    |  6 +++
 core/l10n/de.php                     |  2 +-
 core/l10n/et_EE.php                  |  1 +
 core/l10n/nb_NO.php                  |  1 -
 l10n/af/core.po                      | 62 ++++++++++++++-------------
 l10n/ar/core.po                      | 62 ++++++++++++++-------------
 l10n/ar_SA/core.po                   | 62 ++++++++++++++-------------
 l10n/bg_BG/core.po                   | 62 ++++++++++++++-------------
 l10n/ca/core.po                      | 62 ++++++++++++++-------------
 l10n/cs_CZ/core.po                   | 62 ++++++++++++++-------------
 l10n/da/core.po                      | 62 ++++++++++++++-------------
 l10n/de/core.po                      |  8 ++--
 l10n/el/core.po                      | 62 ++++++++++++++-------------
 l10n/eo/core.po                      | 36 +++++++++-------
 l10n/es/core.po                      | 37 +++++++++-------
 l10n/et_EE/core.po                   | 62 ++++++++++++++-------------
 l10n/et_EE/files.po                  | 22 +++++-----
 l10n/et_EE/settings.po               | 24 +++++------
 l10n/eu/core.po                      | 62 ++++++++++++++-------------
 l10n/eu_ES/core.po                   | 62 ++++++++++++++-------------
 l10n/fa/core.po                      | 62 ++++++++++++++-------------
 l10n/fi/core.po                      | 62 ++++++++++++++-------------
 l10n/fi_FI/core.po                   | 62 ++++++++++++++-------------
 l10n/fr/core.po                      | 62 ++++++++++++++-------------
 l10n/gl/core.po                      | 62 ++++++++++++++-------------
 l10n/he/core.po                      | 62 ++++++++++++++-------------
 l10n/hr/core.po                      | 62 ++++++++++++++-------------
 l10n/hu_HU/core.po                   | 62 ++++++++++++++-------------
 l10n/hu_HU/files_encryption.po       | 15 +++----
 l10n/hu_HU/files_sharing.po          | 15 +++----
 l10n/hy/core.po                      | 62 ++++++++++++++-------------
 l10n/ia/core.po                      | 62 ++++++++++++++-------------
 l10n/id/core.po                      | 62 ++++++++++++++-------------
 l10n/id_ID/core.po                   | 62 ++++++++++++++-------------
 l10n/it/core.po                      | 62 ++++++++++++++-------------
 l10n/ja_JP/core.po                   | 63 +++++++++++++++-------------
 l10n/ko/core.po                      | 62 ++++++++++++++-------------
 l10n/lb/core.po                      | 62 ++++++++++++++-------------
 l10n/lt_LT/core.po                   | 62 ++++++++++++++-------------
 l10n/lv/core.po                      | 62 ++++++++++++++-------------
 l10n/mk/core.po                      | 62 ++++++++++++++-------------
 l10n/ms_MY/core.po                   | 62 ++++++++++++++-------------
 l10n/nb_NO/core.po                   |  8 ++--
 l10n/nl/core.po                      | 62 ++++++++++++++-------------
 l10n/nn_NO/core.po                   | 62 ++++++++++++++-------------
 l10n/pl/core.po                      | 62 ++++++++++++++-------------
 l10n/pt_BR/core.po                   | 62 ++++++++++++++-------------
 l10n/pt_PT/core.po                   | 62 ++++++++++++++-------------
 l10n/ro/core.po                      | 62 ++++++++++++++-------------
 l10n/ru/core.po                      | 62 ++++++++++++++-------------
 l10n/sk_SK/core.po                   | 62 ++++++++++++++-------------
 l10n/sl/core.po                      | 62 ++++++++++++++-------------
 l10n/so/core.po                      | 62 ++++++++++++++-------------
 l10n/sr/core.po                      | 62 ++++++++++++++-------------
 l10n/sr@latin/core.po                | 62 ++++++++++++++-------------
 l10n/sv/core.po                      | 36 +++++++++-------
 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_texteditor.pot  | 44 -------------------
 l10n/templates/files_versions.pot    |  2 +-
 l10n/templates/lib.pot               |  2 +-
 l10n/templates/settings.pot          |  2 +-
 l10n/templates/user_ldap.pot         |  2 +-
 l10n/th_TH/core.po                   | 62 ++++++++++++++-------------
 l10n/tr/core.po                      | 62 ++++++++++++++-------------
 l10n/uk/core.po                      | 62 ++++++++++++++-------------
 l10n/vi/core.po                      | 62 ++++++++++++++-------------
 l10n/zh_CN.GB2312/core.po            | 62 ++++++++++++++-------------
 l10n/zh_CN/core.po                   | 62 ++++++++++++++-------------
 l10n/zh_CN/settings.po               |  9 ++--
 l10n/zh_TW/core.po                   | 62 ++++++++++++++-------------
 settings/l10n/et_EE.php              |  9 ++++
 settings/l10n/zh_CN.php              |  1 +
 78 files changed, 1804 insertions(+), 1602 deletions(-)
 create mode 100644 apps/files_encryption/l10n/hu_HU.php
 create mode 100644 apps/files_sharing/l10n/hu_HU.php
 delete mode 100644 l10n/templates/files_texteditor.pot

diff --git a/apps/files/l10n/et_EE.php b/apps/files/l10n/et_EE.php
index a5dd345f8e..956c5cc911 100644
--- a/apps/files/l10n/et_EE.php
+++ b/apps/files/l10n/et_EE.php
@@ -8,6 +8,13 @@
 "Failed to write to disk" => "Kettale kirjutamine ebaõnnestus",
 "Files" => "Failid",
 "Delete" => "Kustuta",
+"already exists" => "on juba olemas",
+"replace" => "asenda",
+"cancel" => "loobu",
+"replaced" => "asendatud",
+"with" => "millega",
+"undo" => "tagasi",
+"deleted" => "kustutatud",
 "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",
diff --git a/apps/files_encryption/l10n/hu_HU.php b/apps/files_encryption/l10n/hu_HU.php
new file mode 100644
index 0000000000..4352d8b771
--- /dev/null
+++ b/apps/files_encryption/l10n/hu_HU.php
@@ -0,0 +1,6 @@
+<?php $TRANSLATIONS = array(
+"Encryption" => "Titkosítás",
+"Exclude the following file types from encryption" => "A következő fájl típusok kizárása a titkosításból",
+"None" => "Egyik sem",
+"Enable Encryption" => "Titkosítás engedélyezése"
+);
diff --git a/apps/files_sharing/l10n/hu_HU.php b/apps/files_sharing/l10n/hu_HU.php
new file mode 100644
index 0000000000..881b5afd81
--- /dev/null
+++ b/apps/files_sharing/l10n/hu_HU.php
@@ -0,0 +1,6 @@
+<?php $TRANSLATIONS = array(
+"Size" => "Méret",
+"Modified" => "Módosítva",
+"Delete all" => "Összes törlése",
+"Delete" => "Törlés"
+);
diff --git a/core/l10n/de.php b/core/l10n/de.php
index 74ad8cc8f6..863916bbc6 100644
--- a/core/l10n/de.php
+++ b/core/l10n/de.php
@@ -51,7 +51,7 @@
 "Database user" => "Datenbank-Benutzer",
 "Database password" => "Datenbank-Passwort",
 "Database name" => "Datenbank-Name",
-"Database tablespace" => "Tablespace der Datenbank",
+"Database tablespace" => "Datenbank-Tablespace",
 "Database host" => "Datenbank-Host",
 "Finish setup" => "Installation abschließen",
 "web services under your control" => "Web-Services unter Ihrer Kontrolle",
diff --git a/core/l10n/et_EE.php b/core/l10n/et_EE.php
index 734021605c..5809229a58 100644
--- a/core/l10n/et_EE.php
+++ b/core/l10n/et_EE.php
@@ -51,6 +51,7 @@
 "Database user" => "Andmebaasi kasutaja",
 "Database password" => "Andmebaasi parool",
 "Database name" => "Andmebasi nimi",
+"Database tablespace" => "Andmebaasi tabeliruum",
 "Database host" => "Andmebaasi host",
 "Finish setup" => "Lõpeta seadistamine",
 "web services under your control" => "veebiteenused sinu kontrolli all",
diff --git a/core/l10n/nb_NO.php b/core/l10n/nb_NO.php
index 892ad2b791..d30823b59f 100644
--- a/core/l10n/nb_NO.php
+++ b/core/l10n/nb_NO.php
@@ -51,7 +51,6 @@
 "Database user" => "Databasebruker",
 "Database password" => "Databasepassord",
 "Database name" => "Databasenavn",
-"Database tablespace" => "Database tabellområde",
 "Database host" => "Databasevert",
 "Finish setup" => "Fullfør oppsetting",
 "web services under your control" => "nettjenester under din kontroll",
diff --git a/l10n/af/core.po b/l10n/af/core.po
index 88fb86a58a..aec45fb5b7 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-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-26 19:46+0200\n"
+"PO-Revision-Date: 2012-08-26 17:34+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"
@@ -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:573
+#: js/js.js:575
 msgid "January"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "February"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "March"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "April"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "May"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "June"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "July"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "August"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "September"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "October"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "November"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "December"
 msgstr ""
 
@@ -129,7 +129,7 @@ msgstr ""
 msgid "Login failed!"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:26
 #: templates/login.php:9
 msgid "Username"
 msgstr ""
@@ -190,48 +190,52 @@ msgstr ""
 msgid "Add"
 msgstr ""
 
-#: templates/installation.php:23
+#: templates/installation.php:24
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
-#: templates/installation.php:29 templates/login.php:13
+#: templates/installation.php:30 templates/login.php:13
 msgid "Password"
 msgstr ""
 
-#: templates/installation.php:35
+#: templates/installation.php:36
 msgid "Advanced"
 msgstr ""
 
-#: templates/installation.php:37
+#: templates/installation.php:38
 msgid "Data folder"
 msgstr ""
 
-#: templates/installation.php:44
+#: templates/installation.php:45
 msgid "Configure the database"
 msgstr ""
 
-#: templates/installation.php:49 templates/installation.php:60
-#: templates/installation.php:70
+#: templates/installation.php:50 templates/installation.php:61
+#: templates/installation.php:71 templates/installation.php:81
 msgid "will be used"
 msgstr ""
 
-#: templates/installation.php:82
+#: templates/installation.php:93
 msgid "Database user"
 msgstr ""
 
-#: templates/installation.php:86
+#: templates/installation.php:97
 msgid "Database password"
 msgstr ""
 
-#: templates/installation.php:90
+#: templates/installation.php:101
 msgid "Database name"
 msgstr ""
 
-#: templates/installation.php:96
+#: templates/installation.php:109
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:115
 msgid "Database host"
 msgstr ""
 
-#: templates/installation.php:101
+#: templates/installation.php:120
 msgid "Finish setup"
 msgstr ""
 
diff --git a/l10n/ar/core.po b/l10n/ar/core.po
index a4cc8c065a..30745b59b9 100644
--- a/l10n/ar/core.po
+++ b/l10n/ar/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-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-26 19:46+0200\n"
+"PO-Revision-Date: 2012-08-26 17:34+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"
@@ -34,55 +34,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:573
+#: js/js.js:575
 msgid "January"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "February"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "March"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "April"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "May"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "June"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "July"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "August"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "September"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "October"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "November"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "December"
 msgstr ""
 
@@ -130,7 +130,7 @@ msgstr "تم طلب"
 msgid "Login failed!"
 msgstr "محاولة دخول فاشلة!"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:26
 #: templates/login.php:9
 msgid "Username"
 msgstr "إسم المستخدم"
@@ -191,48 +191,52 @@ msgstr ""
 msgid "Add"
 msgstr ""
 
-#: templates/installation.php:23
+#: templates/installation.php:24
 msgid "Create an <strong>admin account</strong>"
 msgstr "أضف </strong>مستخدم رئيسي <strong>"
 
-#: templates/installation.php:29 templates/login.php:13
+#: templates/installation.php:30 templates/login.php:13
 msgid "Password"
 msgstr "كلمة السر"
 
-#: templates/installation.php:35
+#: templates/installation.php:36
 msgid "Advanced"
 msgstr "خيارات متقدمة"
 
-#: templates/installation.php:37
+#: templates/installation.php:38
 msgid "Data folder"
 msgstr "مجلد المعلومات"
 
-#: templates/installation.php:44
+#: templates/installation.php:45
 msgid "Configure the database"
 msgstr "أسس قاعدة البيانات"
 
-#: templates/installation.php:49 templates/installation.php:60
-#: templates/installation.php:70
+#: templates/installation.php:50 templates/installation.php:61
+#: templates/installation.php:71 templates/installation.php:81
 msgid "will be used"
 msgstr "سيتم استخدمه"
 
-#: templates/installation.php:82
+#: templates/installation.php:93
 msgid "Database user"
 msgstr "مستخدم قاعدة البيانات"
 
-#: templates/installation.php:86
+#: templates/installation.php:97
 msgid "Database password"
 msgstr "كلمة سر مستخدم قاعدة البيانات"
 
-#: templates/installation.php:90
+#: templates/installation.php:101
 msgid "Database name"
 msgstr "إسم قاعدة البيانات"
 
-#: templates/installation.php:96
+#: templates/installation.php:109
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:115
 msgid "Database host"
 msgstr "خادم قاعدة البيانات"
 
-#: templates/installation.php:101
+#: templates/installation.php:120
 msgid "Finish setup"
 msgstr "انهاء التعديلات"
 
diff --git a/l10n/ar_SA/core.po b/l10n/ar_SA/core.po
index 7f31f831b3..344208e032 100644
--- a/l10n/ar_SA/core.po
+++ b/l10n/ar_SA/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-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-26 19:46+0200\n"
+"PO-Revision-Date: 2012-08-26 17:34+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"
@@ -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:573
+#: js/js.js:575
 msgid "January"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "February"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "March"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "April"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "May"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "June"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "July"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "August"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "September"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "October"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "November"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "December"
 msgstr ""
 
@@ -129,7 +129,7 @@ msgstr ""
 msgid "Login failed!"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:26
 #: templates/login.php:9
 msgid "Username"
 msgstr ""
@@ -190,48 +190,52 @@ msgstr ""
 msgid "Add"
 msgstr ""
 
-#: templates/installation.php:23
+#: templates/installation.php:24
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
-#: templates/installation.php:29 templates/login.php:13
+#: templates/installation.php:30 templates/login.php:13
 msgid "Password"
 msgstr ""
 
-#: templates/installation.php:35
+#: templates/installation.php:36
 msgid "Advanced"
 msgstr ""
 
-#: templates/installation.php:37
+#: templates/installation.php:38
 msgid "Data folder"
 msgstr ""
 
-#: templates/installation.php:44
+#: templates/installation.php:45
 msgid "Configure the database"
 msgstr ""
 
-#: templates/installation.php:49 templates/installation.php:60
-#: templates/installation.php:70
+#: templates/installation.php:50 templates/installation.php:61
+#: templates/installation.php:71 templates/installation.php:81
 msgid "will be used"
 msgstr ""
 
-#: templates/installation.php:82
+#: templates/installation.php:93
 msgid "Database user"
 msgstr ""
 
-#: templates/installation.php:86
+#: templates/installation.php:97
 msgid "Database password"
 msgstr ""
 
-#: templates/installation.php:90
+#: templates/installation.php:101
 msgid "Database name"
 msgstr ""
 
-#: templates/installation.php:96
+#: templates/installation.php:109
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:115
 msgid "Database host"
 msgstr ""
 
-#: templates/installation.php:101
+#: templates/installation.php:120
 msgid "Finish setup"
 msgstr ""
 
diff --git a/l10n/bg_BG/core.po b/l10n/bg_BG/core.po
index 5cb2d7ef8a..062286a147 100644
--- a/l10n/bg_BG/core.po
+++ b/l10n/bg_BG/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-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-26 19:46+0200\n"
+"PO-Revision-Date: 2012-08-26 17:34+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"
@@ -37,55 +37,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:573
+#: js/js.js:575
 msgid "January"
 msgstr "Януари"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "February"
 msgstr "Февруари"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "March"
 msgstr "Март"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "April"
 msgstr "Април"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "May"
 msgstr "Май"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "June"
 msgstr "Юни"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "July"
 msgstr "Юли"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "August"
 msgstr "Август"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "September"
 msgstr "Септември"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "October"
 msgstr "Октомври"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "November"
 msgstr "Ноември"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "December"
 msgstr "Декември"
 
@@ -133,7 +133,7 @@ msgstr "Заявено"
 msgid "Login failed!"
 msgstr "Входа пропадна!"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:26
 #: templates/login.php:9
 msgid "Username"
 msgstr "Потребител"
@@ -194,48 +194,52 @@ msgstr "Редактиране на категориите"
 msgid "Add"
 msgstr "Добавяне"
 
-#: templates/installation.php:23
+#: templates/installation.php:24
 msgid "Create an <strong>admin account</strong>"
 msgstr "Създаване на <strong>админ профил</strong>"
 
-#: templates/installation.php:29 templates/login.php:13
+#: templates/installation.php:30 templates/login.php:13
 msgid "Password"
 msgstr "Парола"
 
-#: templates/installation.php:35
+#: templates/installation.php:36
 msgid "Advanced"
 msgstr "Разширено"
 
-#: templates/installation.php:37
+#: templates/installation.php:38
 msgid "Data folder"
 msgstr "Директория за данни"
 
-#: templates/installation.php:44
+#: templates/installation.php:45
 msgid "Configure the database"
 msgstr "Конфигуриране на базата"
 
-#: templates/installation.php:49 templates/installation.php:60
-#: templates/installation.php:70
+#: templates/installation.php:50 templates/installation.php:61
+#: templates/installation.php:71 templates/installation.php:81
 msgid "will be used"
 msgstr "ще се ползва"
 
-#: templates/installation.php:82
+#: templates/installation.php:93
 msgid "Database user"
 msgstr "Потребител за базата"
 
-#: templates/installation.php:86
+#: templates/installation.php:97
 msgid "Database password"
 msgstr "Парола за базата"
 
-#: templates/installation.php:90
+#: templates/installation.php:101
 msgid "Database name"
 msgstr "Име на базата"
 
-#: templates/installation.php:96
+#: templates/installation.php:109
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:115
 msgid "Database host"
 msgstr "Хост за базата"
 
-#: templates/installation.php:101
+#: templates/installation.php:120
 msgid "Finish setup"
 msgstr "Завършване на настройките"
 
diff --git a/l10n/ca/core.po b/l10n/ca/core.po
index 4d26bb008c..65aacdcea9 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-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-26 19:46+0200\n"
+"PO-Revision-Date: 2012-08-26 17:34+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"
@@ -35,55 +35,55 @@ msgstr "Aquesta categoria ja existeix:"
 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 "Arranjament"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "January"
 msgstr "Gener"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "February"
 msgstr "Febrer"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "March"
 msgstr "Març"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "April"
 msgstr "Abril"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "May"
 msgstr "Maig"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "June"
 msgstr "Juny"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "July"
 msgstr "Juliol"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "August"
 msgstr "Agost"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "September"
 msgstr "Setembre"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "October"
 msgstr "Octubre"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "November"
 msgstr "Novembre"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "December"
 msgstr "Desembre"
 
@@ -131,7 +131,7 @@ msgstr "Sol·licitat"
 msgid "Login failed!"
 msgstr "No s'ha pogut iniciar la sessió"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:26
 #: templates/login.php:9
 msgid "Username"
 msgstr "Nom d'usuari"
@@ -192,48 +192,52 @@ msgstr "Edita les categories"
 msgid "Add"
 msgstr "Afegeix"
 
-#: templates/installation.php:23
+#: templates/installation.php:24
 msgid "Create an <strong>admin account</strong>"
 msgstr "Crea un <strong>compte d'administrador</strong>"
 
-#: templates/installation.php:29 templates/login.php:13
+#: templates/installation.php:30 templates/login.php:13
 msgid "Password"
 msgstr "Contrasenya"
 
-#: templates/installation.php:35
+#: templates/installation.php:36
 msgid "Advanced"
 msgstr "Avançat"
 
-#: templates/installation.php:37
+#: templates/installation.php:38
 msgid "Data folder"
 msgstr "Carpeta de dades"
 
-#: templates/installation.php:44
+#: templates/installation.php:45
 msgid "Configure the database"
 msgstr "Configura la base de dades"
 
-#: templates/installation.php:49 templates/installation.php:60
-#: templates/installation.php:70
+#: templates/installation.php:50 templates/installation.php:61
+#: templates/installation.php:71 templates/installation.php:81
 msgid "will be used"
 msgstr "s'usarà"
 
-#: templates/installation.php:82
+#: templates/installation.php:93
 msgid "Database user"
 msgstr "Usuari de la base de dades"
 
-#: templates/installation.php:86
+#: templates/installation.php:97
 msgid "Database password"
 msgstr "Contrasenya de la base de dades"
 
-#: templates/installation.php:90
+#: templates/installation.php:101
 msgid "Database name"
 msgstr "Nom de la base de dades"
 
-#: templates/installation.php:96
+#: templates/installation.php:109
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:115
 msgid "Database host"
 msgstr "Ordinador central de la base de dades"
 
-#: templates/installation.php:101
+#: templates/installation.php:120
 msgid "Finish setup"
 msgstr "Acaba la configuració"
 
diff --git a/l10n/cs_CZ/core.po b/l10n/cs_CZ/core.po
index ebca07a442..a9eefd2789 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-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-26 19:46+0200\n"
+"PO-Revision-Date: 2012-08-26 17:34+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"
@@ -36,55 +36,55 @@ msgstr "Tato kategorie již existuje:"
 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 "Nastavení"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "January"
 msgstr "Leden"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "February"
 msgstr "Únor"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "March"
 msgstr "Březen"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "April"
 msgstr "Duben"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "May"
 msgstr "Květen"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "June"
 msgstr "Červen"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "July"
 msgstr "Červenec"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "August"
 msgstr "Srpen"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "September"
 msgstr "Září"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "October"
 msgstr "Říjen"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "November"
 msgstr "Listopad"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "December"
 msgstr "Prosinec"
 
@@ -132,7 +132,7 @@ msgstr "Požadováno"
 msgid "Login failed!"
 msgstr "Přihlášení selhalo"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:26
 #: templates/login.php:9
 msgid "Username"
 msgstr "Uživatelské jméno"
@@ -193,48 +193,52 @@ msgstr "Upravit kategorie"
 msgid "Add"
 msgstr "Přidat"
 
-#: templates/installation.php:23
+#: templates/installation.php:24
 msgid "Create an <strong>admin account</strong>"
 msgstr "Vytvořit <strong>účet správce</strong>"
 
-#: templates/installation.php:29 templates/login.php:13
+#: templates/installation.php:30 templates/login.php:13
 msgid "Password"
 msgstr "Heslo"
 
-#: templates/installation.php:35
+#: templates/installation.php:36
 msgid "Advanced"
 msgstr "Rozšířené volby"
 
-#: templates/installation.php:37
+#: templates/installation.php:38
 msgid "Data folder"
 msgstr "Datový adresář"
 
-#: templates/installation.php:44
+#: templates/installation.php:45
 msgid "Configure the database"
 msgstr "Konfigurace databáze"
 
-#: templates/installation.php:49 templates/installation.php:60
-#: templates/installation.php:70
+#: templates/installation.php:50 templates/installation.php:61
+#: templates/installation.php:71 templates/installation.php:81
 msgid "will be used"
 msgstr "bude použito"
 
-#: templates/installation.php:82
+#: templates/installation.php:93
 msgid "Database user"
 msgstr "Uživatel databáze"
 
-#: templates/installation.php:86
+#: templates/installation.php:97
 msgid "Database password"
 msgstr "Heslo k databázi"
 
-#: templates/installation.php:90
+#: templates/installation.php:101
 msgid "Database name"
 msgstr "Název databáze"
 
-#: templates/installation.php:96
+#: templates/installation.php:109
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:115
 msgid "Database host"
 msgstr "Hostitel databáze"
 
-#: templates/installation.php:101
+#: templates/installation.php:120
 msgid "Finish setup"
 msgstr "Dokončit instalaci"
 
diff --git a/l10n/da/core.po b/l10n/da/core.po
index c2a6184506..2ea6375c6b 100644
--- a/l10n/da/core.po
+++ b/l10n/da/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-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-26 19:46+0200\n"
+"PO-Revision-Date: 2012-08-26 17:34+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"
@@ -38,55 +38,55 @@ msgstr "Denne kategori eksisterer allerede: "
 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 "Indstillinger"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "January"
 msgstr "Januar"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "February"
 msgstr "Februar"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "March"
 msgstr "Marts"
 
-#: 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 "August"
 
-#: 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"
 
@@ -134,7 +134,7 @@ msgstr "Forespugt"
 msgid "Login failed!"
 msgstr "Login fejlede!"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:26
 #: templates/login.php:9
 msgid "Username"
 msgstr "Brugernavn"
@@ -195,48 +195,52 @@ msgstr "Rediger kategorier"
 msgid "Add"
 msgstr "Tilføj"
 
-#: templates/installation.php:23
+#: templates/installation.php:24
 msgid "Create an <strong>admin account</strong>"
 msgstr "Opret en <strong>administratorkonto</strong>"
 
-#: templates/installation.php:29 templates/login.php:13
+#: templates/installation.php:30 templates/login.php:13
 msgid "Password"
 msgstr "Kodeord"
 
-#: templates/installation.php:35
+#: templates/installation.php:36
 msgid "Advanced"
 msgstr "Avanceret"
 
-#: templates/installation.php:37
+#: templates/installation.php:38
 msgid "Data folder"
 msgstr "Datamappe"
 
-#: templates/installation.php:44
+#: templates/installation.php:45
 msgid "Configure the database"
 msgstr "Konfigurer databasen"
 
-#: templates/installation.php:49 templates/installation.php:60
-#: templates/installation.php:70
+#: templates/installation.php:50 templates/installation.php:61
+#: templates/installation.php:71 templates/installation.php:81
 msgid "will be used"
 msgstr "vil blive brugt"
 
-#: templates/installation.php:82
+#: templates/installation.php:93
 msgid "Database user"
 msgstr "Databasebruger"
 
-#: templates/installation.php:86
+#: templates/installation.php:97
 msgid "Database password"
 msgstr "Databasekodeord"
 
-#: templates/installation.php:90
+#: templates/installation.php:101
 msgid "Database name"
 msgstr "Navn på database"
 
-#: templates/installation.php:96
+#: templates/installation.php:109
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:115
 msgid "Database host"
 msgstr "Databasehost"
 
-#: templates/installation.php:101
+#: templates/installation.php:120
 msgid "Finish setup"
 msgstr "Afslut opsætning"
 
diff --git a/l10n/de/core.po b/l10n/de/core.po
index 7883db2446..d8bab06948 100644
--- a/l10n/de/core.po
+++ b/l10n/de/core.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-26 02:01+0200\n"
-"PO-Revision-Date: 2012-08-25 23:28+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-26 19:46+0200\n"
+"PO-Revision-Date: 2012-08-26 17:45+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"
@@ -240,7 +240,7 @@ msgstr "Datenbank-Name"
 
 #: templates/installation.php:109
 msgid "Database tablespace"
-msgstr "Tablespace der Datenbank"
+msgstr "Datenbank-Tablespace"
 
 #: templates/installation.php:115
 msgid "Database host"
diff --git a/l10n/el/core.po b/l10n/el/core.po
index 5f3262deb6..8797a38701 100644
--- a/l10n/el/core.po
+++ b/l10n/el/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-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-26 19:46+0200\n"
+"PO-Revision-Date: 2012-08-26 17:34+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"
@@ -37,55 +37,55 @@ msgstr "Αυτή η κατηγορία υπάρχει ήδη"
 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 "Ρυθμίσεις"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "January"
 msgstr "Ιανουάριος"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "February"
 msgstr "Φεβρουάριος"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "March"
 msgstr "Μάρτιος"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "April"
 msgstr "Απρίλιος"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "May"
 msgstr "Μάϊος"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "June"
 msgstr "Ιούνιος"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "July"
 msgstr "Ιούλιος"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "August"
 msgstr "Αύγουστος"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "September"
 msgstr "Σεπτέμβριος"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "October"
 msgstr "Οκτώβριος"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "November"
 msgstr "Νοέμβριος"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "December"
 msgstr "Δεκέμβριος"
 
@@ -133,7 +133,7 @@ msgstr "Ζητήθησαν"
 msgid "Login failed!"
 msgstr "Η σύνδεση απέτυχε!"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:26
 #: templates/login.php:9
 msgid "Username"
 msgstr "Όνομα Χρήστη"
@@ -194,48 +194,52 @@ msgstr "Επεξεργασία κατηγορίας"
 msgid "Add"
 msgstr "Προσθήκη"
 
-#: templates/installation.php:23
+#: templates/installation.php:24
 msgid "Create an <strong>admin account</strong>"
 msgstr "Δημιουργήστε έναν <strong>λογαριασμό διαχειριστή</strong>"
 
-#: templates/installation.php:29 templates/login.php:13
+#: templates/installation.php:30 templates/login.php:13
 msgid "Password"
 msgstr "Κωδικός"
 
-#: templates/installation.php:35
+#: templates/installation.php:36
 msgid "Advanced"
 msgstr "Για προχωρημένους"
 
-#: templates/installation.php:37
+#: templates/installation.php:38
 msgid "Data folder"
 msgstr "Φάκελος δεδομένων"
 
-#: templates/installation.php:44
+#: templates/installation.php:45
 msgid "Configure the database"
 msgstr "Διαμόρφωση της βάσης δεδομένων"
 
-#: templates/installation.php:49 templates/installation.php:60
-#: templates/installation.php:70
+#: templates/installation.php:50 templates/installation.php:61
+#: templates/installation.php:71 templates/installation.php:81
 msgid "will be used"
 msgstr "θα χρησιμοποιηθούν"
 
-#: templates/installation.php:82
+#: templates/installation.php:93
 msgid "Database user"
 msgstr "Χρήστης της βάσης δεδομένων"
 
-#: templates/installation.php:86
+#: templates/installation.php:97
 msgid "Database password"
 msgstr "Κωδικός πρόσβασης βάσης δεδομένων"
 
-#: templates/installation.php:90
+#: templates/installation.php:101
 msgid "Database name"
 msgstr "Όνομα βάσης δεδομένων"
 
-#: templates/installation.php:96
+#: templates/installation.php:109
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:115
 msgid "Database host"
 msgstr "Διακομιστής βάσης δεδομένων"
 
-#: templates/installation.php:101
+#: templates/installation.php:120
 msgid "Finish setup"
 msgstr "Ολοκλήρωση εγκατάστασης"
 
diff --git a/l10n/eo/core.po b/l10n/eo/core.po
index fbea58f5dd..50049497e1 100644
--- a/l10n/eo/core.po
+++ b/l10n/eo/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-08-19 02:02+0200\n"
-"PO-Revision-Date: 2012-08-18 16:36+0000\n"
-"Last-Translator: Mariano <mstreet@kde.org.ar>\n"
+"POT-Creation-Date: 2012-08-26 19:46+0200\n"
+"PO-Revision-Date: 2012-08-26 17:34+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"
@@ -132,7 +132,7 @@ msgstr "Petita"
 msgid "Login failed!"
 msgstr "Ensaluto malsukcesis!"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:26
 #: templates/login.php:9
 msgid "Username"
 msgstr "Uzantonomo"
@@ -193,48 +193,52 @@ msgstr "Redakti kategoriojn"
 msgid "Add"
 msgstr "Aldoni"
 
-#: templates/installation.php:23
+#: templates/installation.php:24
 msgid "Create an <strong>admin account</strong>"
 msgstr "Krei <strong>administran konton</strong>"
 
-#: templates/installation.php:29 templates/login.php:13
+#: templates/installation.php:30 templates/login.php:13
 msgid "Password"
 msgstr "Pasvorto"
 
-#: templates/installation.php:35
+#: templates/installation.php:36
 msgid "Advanced"
 msgstr "Progresinta"
 
-#: templates/installation.php:37
+#: templates/installation.php:38
 msgid "Data folder"
 msgstr "Datuma dosierujo"
 
-#: templates/installation.php:44
+#: templates/installation.php:45
 msgid "Configure the database"
 msgstr "Agordi la datumbazon"
 
-#: templates/installation.php:49 templates/installation.php:60
-#: templates/installation.php:70
+#: templates/installation.php:50 templates/installation.php:61
+#: templates/installation.php:71 templates/installation.php:81
 msgid "will be used"
 msgstr "estos uzata"
 
-#: templates/installation.php:82
+#: templates/installation.php:93
 msgid "Database user"
 msgstr "Datumbaza uzanto"
 
-#: templates/installation.php:86
+#: templates/installation.php:97
 msgid "Database password"
 msgstr "Datumbaza pasvorto"
 
-#: templates/installation.php:90
+#: templates/installation.php:101
 msgid "Database name"
 msgstr "Datumbaza nomo"
 
-#: templates/installation.php:96
+#: templates/installation.php:109
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:115
 msgid "Database host"
 msgstr "Datumbaza gastigo"
 
-#: templates/installation.php:101
+#: templates/installation.php:120
 msgid "Finish setup"
 msgstr "Fini la instalon"
 
diff --git a/l10n/es/core.po b/l10n/es/core.po
index 5139dfe014..1c14dc7b57 100644
--- a/l10n/es/core.po
+++ b/l10n/es/core.po
@@ -6,6 +6,7 @@
 # Javier Llorente <javier@opensuse.org>, 2012.
 #   <juanma@kde.org.ar>, 2011, 2012.
 # oSiNaReF  <>, 2012.
+# Raul Fernandez Garcia <raulfg3@gmail.com>, 2012.
 #   <rodrigo.calvo@gmail.com>, 2012.
 #   <rom1dep@gmail.com>, 2011.
 #   <sergioballesterossolanas@gmail.com>, 2011, 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-24 02:02+0200\n"
-"PO-Revision-Date: 2012-08-23 09:17+0000\n"
-"Last-Translator: Javier Llorente <javier@opensuse.org>\n"
+"POT-Creation-Date: 2012-08-26 19:46+0200\n"
+"PO-Revision-Date: 2012-08-26 17:34+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"
@@ -135,7 +136,7 @@ msgstr "Pedido"
 msgid "Login failed!"
 msgstr "¡Fallo al iniciar sesión!"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:26
 #: templates/login.php:9
 msgid "Username"
 msgstr "Nombre de usuario"
@@ -196,48 +197,52 @@ msgstr "Editar categorías"
 msgid "Add"
 msgstr "Añadir"
 
-#: templates/installation.php:23
+#: templates/installation.php:24
 msgid "Create an <strong>admin account</strong>"
 msgstr "Crea una <strong>cuenta de administrador</strong>"
 
-#: templates/installation.php:29 templates/login.php:13
+#: templates/installation.php:30 templates/login.php:13
 msgid "Password"
 msgstr "Contraseña"
 
-#: templates/installation.php:35
+#: templates/installation.php:36
 msgid "Advanced"
 msgstr "Avanzado"
 
-#: templates/installation.php:37
+#: templates/installation.php:38
 msgid "Data folder"
 msgstr "Directorio de almacenamiento"
 
-#: templates/installation.php:44
+#: templates/installation.php:45
 msgid "Configure the database"
 msgstr "Configurar la base de datos"
 
-#: templates/installation.php:49 templates/installation.php:60
-#: templates/installation.php:70
+#: templates/installation.php:50 templates/installation.php:61
+#: templates/installation.php:71 templates/installation.php:81
 msgid "will be used"
 msgstr "se utilizarán"
 
-#: templates/installation.php:82
+#: templates/installation.php:93
 msgid "Database user"
 msgstr "Usuario de la base de datos"
 
-#: templates/installation.php:86
+#: templates/installation.php:97
 msgid "Database password"
 msgstr "Contraseña de la base de datos"
 
-#: templates/installation.php:90
+#: templates/installation.php:101
 msgid "Database name"
 msgstr "Nombre de la base de datos"
 
-#: templates/installation.php:96
+#: templates/installation.php:109
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:115
 msgid "Database host"
 msgstr "Host de la base de datos"
 
-#: templates/installation.php:101
+#: templates/installation.php:120
 msgid "Finish setup"
 msgstr "Completar la instalación"
 
diff --git a/l10n/et_EE/core.po b/l10n/et_EE/core.po
index 8e0bb95d9f..317bacff86 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-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-26 19:46+0200\n"
+"PO-Revision-Date: 2012-08-26 17: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"
@@ -34,55 +34,55 @@ msgstr "See kategooria on juba olemas: "
 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 "Seaded"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "January"
 msgstr "Jaanuar"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "February"
 msgstr "Veebruar"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "March"
 msgstr "Märts"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "April"
 msgstr "Aprill"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "May"
 msgstr "Mai"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "June"
 msgstr "Juuni"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "July"
 msgstr "Juuli"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "August"
 msgstr "August"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "September"
 msgstr "September"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "October"
 msgstr "Oktoober"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "November"
 msgstr "November"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "December"
 msgstr "Detsember"
 
@@ -130,7 +130,7 @@ msgstr "Kohustuslik"
 msgid "Login failed!"
 msgstr "Sisselogimine ebaõnnestus!"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:26
 #: templates/login.php:9
 msgid "Username"
 msgstr "Kasutajanimi"
@@ -191,48 +191,52 @@ msgstr "Muuda kategooriaid"
 msgid "Add"
 msgstr "Lisa"
 
-#: templates/installation.php:23
+#: templates/installation.php:24
 msgid "Create an <strong>admin account</strong>"
 msgstr "Loo <strong>admini konto</strong>"
 
-#: templates/installation.php:29 templates/login.php:13
+#: templates/installation.php:30 templates/login.php:13
 msgid "Password"
 msgstr "Parool"
 
-#: templates/installation.php:35
+#: templates/installation.php:36
 msgid "Advanced"
 msgstr "Lisavalikud"
 
-#: templates/installation.php:37
+#: templates/installation.php:38
 msgid "Data folder"
 msgstr "Andmete kaust"
 
-#: templates/installation.php:44
+#: templates/installation.php:45
 msgid "Configure the database"
 msgstr "Seadista andmebaasi"
 
-#: templates/installation.php:49 templates/installation.php:60
-#: templates/installation.php:70
+#: templates/installation.php:50 templates/installation.php:61
+#: templates/installation.php:71 templates/installation.php:81
 msgid "will be used"
 msgstr "kasutatakse"
 
-#: templates/installation.php:82
+#: templates/installation.php:93
 msgid "Database user"
 msgstr "Andmebaasi kasutaja"
 
-#: templates/installation.php:86
+#: templates/installation.php:97
 msgid "Database password"
 msgstr "Andmebaasi parool"
 
-#: templates/installation.php:90
+#: templates/installation.php:101
 msgid "Database name"
 msgstr "Andmebasi nimi"
 
-#: templates/installation.php:96
+#: templates/installation.php:109
+msgid "Database tablespace"
+msgstr "Andmebaasi tabeliruum"
+
+#: templates/installation.php:115
 msgid "Database host"
 msgstr "Andmebaasi host"
 
-#: templates/installation.php:101
+#: templates/installation.php:120
 msgid "Finish setup"
 msgstr "Lõpeta seadistamine"
 
diff --git a/l10n/et_EE/files.po b/l10n/et_EE/files.po
index 5585c7eb69..d0fad31b01 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-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-26 19:46+0200\n"
+"PO-Revision-Date: 2012-08-26 17:20+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"
@@ -52,37 +52,37 @@ msgstr "Kettale kirjutamine ebaõnnestus"
 msgid "Files"
 msgstr "Failid"
 
-#: js/fileactions.js:107 templates/index.php:56
+#: js/fileactions.js:111 templates/index.php:56
 msgid "Delete"
 msgstr "Kustuta"
 
 #: js/filelist.js:141
 msgid "already exists"
-msgstr ""
+msgstr "on juba olemas"
 
 #: js/filelist.js:141
 msgid "replace"
-msgstr ""
+msgstr "asenda"
 
 #: js/filelist.js:141
 msgid "cancel"
-msgstr ""
+msgstr "loobu"
 
 #: js/filelist.js:195
 msgid "replaced"
-msgstr ""
+msgstr "asendatud"
 
 #: js/filelist.js:195
 msgid "with"
-msgstr ""
+msgstr "millega"
 
 #: js/filelist.js:195 js/filelist.js:246
 msgid "undo"
-msgstr ""
+msgstr "tagasi"
 
 #: js/filelist.js:246
 msgid "deleted"
-msgstr ""
+msgstr "kustutatud"
 
 #: js/files.js:171
 msgid "generating ZIP-file, it may take some time."
diff --git a/l10n/et_EE/settings.po b/l10n/et_EE/settings.po
index c41361db04..089670c04c 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-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-26 19:46+0200\n"
+"PO-Revision-Date: 2012-08-26 17:19+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,7 +21,7 @@ msgstr ""
 
 #: ajax/apps/ocs.php:23
 msgid "Unable to load list from App Store"
-msgstr ""
+msgstr "App Sotre'i nimekirja laadimine ebaõnnestus"
 
 #: ajax/lostpassword.php:14
 msgid "Email saved"
@@ -41,7 +41,7 @@ msgstr "Vigane päring"
 
 #: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
 msgid "Authentication error"
-msgstr ""
+msgstr "Autentimise viga"
 
 #: ajax/setlanguage.php:18
 msgid "Language changed"
@@ -49,7 +49,7 @@ msgstr "Keel on muudetud"
 
 #: js/apps.js:18
 msgid "Error"
-msgstr ""
+msgstr "Viga"
 
 #: js/apps.js:39 js/apps.js:73
 msgid "Disable"
@@ -69,23 +69,23 @@ msgstr "Eesti"
 
 #: templates/admin.php:14
 msgid "Security Warning"
-msgstr ""
+msgstr "Turvahoiatus"
 
 #: templates/admin.php:29
 msgid "Cron"
-msgstr ""
+msgstr "Ajastatud töö"
 
 #: templates/admin.php:31
 msgid "execute one task with each page loaded"
-msgstr ""
+msgstr "käivita iga laetud lehe juures üks ülesanne"
 
 #: templates/admin.php:33
 msgid "cron.php is registered at a webcron service"
-msgstr ""
+msgstr "cron.php on webcron teenuses registreeritud"
 
 #: templates/admin.php:35
 msgid "use systems cron service"
-msgstr ""
+msgstr "kasuta süsteemide cron teenuseid"
 
 #: templates/admin.php:39
 msgid "Log"
@@ -229,7 +229,7 @@ msgstr "Muu"
 
 #: templates/users.php:80 templates/users.php:112
 msgid "Group Admin"
-msgstr ""
+msgstr "Grupi admin"
 
 #: templates/users.php:82
 msgid "Quota"
diff --git a/l10n/eu/core.po b/l10n/eu/core.po
index f758d66577..d59282c027 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-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-26 19:46+0200\n"
+"PO-Revision-Date: 2012-08-26 17:34+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"
@@ -35,55 +35,55 @@ msgstr "Kategoria hau dagoeneko existitzen da:"
 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 "Ezarpenak"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "January"
 msgstr "Urtarrila"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "February"
 msgstr "Otsaila"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "March"
 msgstr "Martxoa"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "April"
 msgstr "Apirila"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "May"
 msgstr "Maiatza"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "June"
 msgstr "Ekaina"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "July"
 msgstr "Uztaila"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "August"
 msgstr "Abuztua"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "September"
 msgstr "Iraila"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "October"
 msgstr "Urria"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "November"
 msgstr "Azaroa"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "December"
 msgstr "Abendua"
 
@@ -131,7 +131,7 @@ msgstr "Eskatuta"
 msgid "Login failed!"
 msgstr "Saio hasierak huts egin du!"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:26
 #: templates/login.php:9
 msgid "Username"
 msgstr "Erabiltzaile izena"
@@ -192,48 +192,52 @@ msgstr "Editatu kategoriak"
 msgid "Add"
 msgstr "Gehitu"
 
-#: templates/installation.php:23
+#: templates/installation.php:24
 msgid "Create an <strong>admin account</strong>"
 msgstr "Sortu <strong>kudeatzaile kontu<strong> bat"
 
-#: templates/installation.php:29 templates/login.php:13
+#: templates/installation.php:30 templates/login.php:13
 msgid "Password"
 msgstr "Pasahitza"
 
-#: templates/installation.php:35
+#: templates/installation.php:36
 msgid "Advanced"
 msgstr "Aurreratua"
 
-#: templates/installation.php:37
+#: templates/installation.php:38
 msgid "Data folder"
 msgstr "Datuen karpeta"
 
-#: templates/installation.php:44
+#: templates/installation.php:45
 msgid "Configure the database"
 msgstr "Konfiguratu datu basea"
 
-#: templates/installation.php:49 templates/installation.php:60
-#: templates/installation.php:70
+#: templates/installation.php:50 templates/installation.php:61
+#: templates/installation.php:71 templates/installation.php:81
 msgid "will be used"
 msgstr "erabiliko da"
 
-#: templates/installation.php:82
+#: templates/installation.php:93
 msgid "Database user"
 msgstr "Datubasearen erabiltzailea"
 
-#: templates/installation.php:86
+#: templates/installation.php:97
 msgid "Database password"
 msgstr "Datubasearen pasahitza"
 
-#: templates/installation.php:90
+#: templates/installation.php:101
 msgid "Database name"
 msgstr "Datubasearen izena"
 
-#: templates/installation.php:96
+#: templates/installation.php:109
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:115
 msgid "Database host"
 msgstr "Datubasearen hostalaria"
 
-#: templates/installation.php:101
+#: templates/installation.php:120
 msgid "Finish setup"
 msgstr "Bukatu konfigurazioa"
 
diff --git a/l10n/eu_ES/core.po b/l10n/eu_ES/core.po
index 0a342ad7e0..61d9181303 100644
--- a/l10n/eu_ES/core.po
+++ b/l10n/eu_ES/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-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-26 19:46+0200\n"
+"PO-Revision-Date: 2012-08-26 17:34+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"
@@ -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:573
+#: js/js.js:575
 msgid "January"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "February"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "March"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "April"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "May"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "June"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "July"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "August"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "September"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "October"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "November"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "December"
 msgstr ""
 
@@ -129,7 +129,7 @@ msgstr ""
 msgid "Login failed!"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:26
 #: templates/login.php:9
 msgid "Username"
 msgstr ""
@@ -190,48 +190,52 @@ msgstr ""
 msgid "Add"
 msgstr ""
 
-#: templates/installation.php:23
+#: templates/installation.php:24
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
-#: templates/installation.php:29 templates/login.php:13
+#: templates/installation.php:30 templates/login.php:13
 msgid "Password"
 msgstr ""
 
-#: templates/installation.php:35
+#: templates/installation.php:36
 msgid "Advanced"
 msgstr ""
 
-#: templates/installation.php:37
+#: templates/installation.php:38
 msgid "Data folder"
 msgstr ""
 
-#: templates/installation.php:44
+#: templates/installation.php:45
 msgid "Configure the database"
 msgstr ""
 
-#: templates/installation.php:49 templates/installation.php:60
-#: templates/installation.php:70
+#: templates/installation.php:50 templates/installation.php:61
+#: templates/installation.php:71 templates/installation.php:81
 msgid "will be used"
 msgstr ""
 
-#: templates/installation.php:82
+#: templates/installation.php:93
 msgid "Database user"
 msgstr ""
 
-#: templates/installation.php:86
+#: templates/installation.php:97
 msgid "Database password"
 msgstr ""
 
-#: templates/installation.php:90
+#: templates/installation.php:101
 msgid "Database name"
 msgstr ""
 
-#: templates/installation.php:96
+#: templates/installation.php:109
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:115
 msgid "Database host"
 msgstr ""
 
-#: templates/installation.php:101
+#: templates/installation.php:120
 msgid "Finish setup"
 msgstr ""
 
diff --git a/l10n/fa/core.po b/l10n/fa/core.po
index 05c5ea57eb..a5a80d5aaa 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-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-26 19:46+0200\n"
+"PO-Revision-Date: 2012-08-26 17:34+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"
@@ -34,55 +34,55 @@ msgstr "این گروه از قبل اضافه شده"
 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 "تنظیمات"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "January"
 msgstr "ژانویه"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "February"
 msgstr "فبریه"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "March"
 msgstr "مارس"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "April"
 msgstr "آوریل"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "May"
 msgstr "می"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "June"
 msgstr "ژوئن"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "July"
 msgstr "جولای"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "August"
 msgstr "آگوست"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "September"
 msgstr "سپتامبر"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "October"
 msgstr "اکتبر"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "November"
 msgstr "نوامبر"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "December"
 msgstr "دسامبر"
 
@@ -130,7 +130,7 @@ msgstr "درخواست"
 msgid "Login failed!"
 msgstr "ورود ناموفق بود"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:26
 #: templates/login.php:9
 msgid "Username"
 msgstr "شناسه"
@@ -191,48 +191,52 @@ msgstr "ویرایش گروه ها"
 msgid "Add"
 msgstr "افزودن"
 
-#: templates/installation.php:23
+#: templates/installation.php:24
 msgid "Create an <strong>admin account</strong>"
 msgstr "لطفا یک <strong> شناسه برای مدیر</strong> بسازید"
 
-#: templates/installation.php:29 templates/login.php:13
+#: templates/installation.php:30 templates/login.php:13
 msgid "Password"
 msgstr "گذرواژه"
 
-#: templates/installation.php:35
+#: templates/installation.php:36
 msgid "Advanced"
 msgstr "حرفه ای"
 
-#: templates/installation.php:37
+#: templates/installation.php:38
 msgid "Data folder"
 msgstr "پوشه اطلاعاتی"
 
-#: templates/installation.php:44
+#: templates/installation.php:45
 msgid "Configure the database"
 msgstr "پایگاه داده برنامه ریزی شدند"
 
-#: templates/installation.php:49 templates/installation.php:60
-#: templates/installation.php:70
+#: templates/installation.php:50 templates/installation.php:61
+#: templates/installation.php:71 templates/installation.php:81
 msgid "will be used"
 msgstr "استفاده خواهد شد"
 
-#: templates/installation.php:82
+#: templates/installation.php:93
 msgid "Database user"
 msgstr "شناسه پایگاه داده"
 
-#: templates/installation.php:86
+#: templates/installation.php:97
 msgid "Database password"
 msgstr "پسورد پایگاه داده"
 
-#: templates/installation.php:90
+#: templates/installation.php:101
 msgid "Database name"
 msgstr "نام پایگاه داده"
 
-#: templates/installation.php:96
+#: templates/installation.php:109
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:115
 msgid "Database host"
 msgstr "هاست پایگاه داده"
 
-#: templates/installation.php:101
+#: templates/installation.php:120
 msgid "Finish setup"
 msgstr "اتمام نصب"
 
diff --git a/l10n/fi/core.po b/l10n/fi/core.po
index 53b71a432f..3de62e935a 100644
--- a/l10n/fi/core.po
+++ b/l10n/fi/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-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-26 19:46+0200\n"
+"PO-Revision-Date: 2012-08-26 17:34+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"
@@ -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:575
 msgid "January"
 msgstr ""
 
-#: js/js.js:572
+#: js/js.js:575
 msgid "February"
 msgstr ""
 
-#: js/js.js:572
+#: js/js.js:575
 msgid "March"
 msgstr ""
 
-#: js/js.js:572
+#: js/js.js:575
 msgid "April"
 msgstr ""
 
-#: js/js.js:572
+#: js/js.js:575
 msgid "May"
 msgstr ""
 
-#: js/js.js:572
+#: js/js.js:575
 msgid "June"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:576
 msgid "July"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:576
 msgid "August"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:576
 msgid "September"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:576
 msgid "October"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:576
 msgid "November"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:576
 msgid "December"
 msgstr ""
 
@@ -129,7 +129,7 @@ msgstr ""
 msgid "Login failed!"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:26
 #: templates/login.php:9
 msgid "Username"
 msgstr ""
@@ -190,48 +190,52 @@ msgstr ""
 msgid "Add"
 msgstr ""
 
-#: templates/installation.php:23
+#: templates/installation.php:24
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
-#: templates/installation.php:29 templates/login.php:13
+#: templates/installation.php:30 templates/login.php:13
 msgid "Password"
 msgstr ""
 
-#: templates/installation.php:35
+#: templates/installation.php:36
 msgid "Advanced"
 msgstr ""
 
-#: templates/installation.php:37
+#: templates/installation.php:38
 msgid "Data folder"
 msgstr ""
 
-#: templates/installation.php:44
+#: templates/installation.php:45
 msgid "Configure the database"
 msgstr ""
 
-#: templates/installation.php:49 templates/installation.php:60
-#: templates/installation.php:70
+#: templates/installation.php:50 templates/installation.php:61
+#: templates/installation.php:71 templates/installation.php:81
 msgid "will be used"
 msgstr ""
 
-#: templates/installation.php:82
+#: templates/installation.php:93
 msgid "Database user"
 msgstr ""
 
-#: templates/installation.php:86
+#: templates/installation.php:97
 msgid "Database password"
 msgstr ""
 
-#: templates/installation.php:90
+#: templates/installation.php:101
 msgid "Database name"
 msgstr ""
 
-#: templates/installation.php:96
+#: templates/installation.php:109
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:115
 msgid "Database host"
 msgstr ""
 
-#: templates/installation.php:101
+#: templates/installation.php:120
 msgid "Finish setup"
 msgstr ""
 
diff --git a/l10n/fi_FI/core.po b/l10n/fi_FI/core.po
index 072f0ad9ca..99c2333e18 100644
--- a/l10n/fi_FI/core.po
+++ b/l10n/fi_FI/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-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-26 19:46+0200\n"
+"PO-Revision-Date: 2012-08-26 17:34+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"
@@ -38,55 +38,55 @@ msgstr "Tämä luokka on jo olemassa: "
 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 "Asetukset"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "January"
 msgstr "Tammikuu"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "February"
 msgstr "Helmikuu"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "March"
 msgstr "Maaliskuu"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "April"
 msgstr "Huhtikuu"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "May"
 msgstr "Toukokuu"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "June"
 msgstr "Kesäkuu"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "July"
 msgstr "Heinäkuu"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "August"
 msgstr "Elokuu"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "September"
 msgstr "Syyskuu"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "October"
 msgstr "Lokakuu"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "November"
 msgstr "Marraskuu"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "December"
 msgstr "Joulukuu"
 
@@ -134,7 +134,7 @@ msgstr "Tilattu"
 msgid "Login failed!"
 msgstr "Kirjautuminen epäonnistui!"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:26
 #: templates/login.php:9
 msgid "Username"
 msgstr "Käyttäjätunnus"
@@ -195,48 +195,52 @@ msgstr "Muokkaa luokkia"
 msgid "Add"
 msgstr "Lisää"
 
-#: templates/installation.php:23
+#: templates/installation.php:24
 msgid "Create an <strong>admin account</strong>"
 msgstr "Luo <strong>ylläpitäjän tunnus</strong>"
 
-#: templates/installation.php:29 templates/login.php:13
+#: templates/installation.php:30 templates/login.php:13
 msgid "Password"
 msgstr "Salasana"
 
-#: templates/installation.php:35
+#: templates/installation.php:36
 msgid "Advanced"
 msgstr "Lisäasetukset"
 
-#: templates/installation.php:37
+#: templates/installation.php:38
 msgid "Data folder"
 msgstr "Datakansio"
 
-#: templates/installation.php:44
+#: templates/installation.php:45
 msgid "Configure the database"
 msgstr "Muokkaa tietokantaa"
 
-#: templates/installation.php:49 templates/installation.php:60
-#: templates/installation.php:70
+#: templates/installation.php:50 templates/installation.php:61
+#: templates/installation.php:71 templates/installation.php:81
 msgid "will be used"
 msgstr "käytetään"
 
-#: templates/installation.php:82
+#: templates/installation.php:93
 msgid "Database user"
 msgstr "Tietokannan käyttäjä"
 
-#: templates/installation.php:86
+#: templates/installation.php:97
 msgid "Database password"
 msgstr "Tietokannan salasana"
 
-#: templates/installation.php:90
+#: templates/installation.php:101
 msgid "Database name"
 msgstr "Tietokannan nimi"
 
-#: templates/installation.php:96
+#: templates/installation.php:109
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:115
 msgid "Database host"
 msgstr "Tietokantapalvelin"
 
-#: templates/installation.php:101
+#: templates/installation.php:120
 msgid "Finish setup"
 msgstr "Viimeistele asennus"
 
diff --git a/l10n/fr/core.po b/l10n/fr/core.po
index dfb7e40edf..81ba7077c2 100644
--- a/l10n/fr/core.po
+++ b/l10n/fr/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-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-26 19:46+0200\n"
+"PO-Revision-Date: 2012-08-26 17:34+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"
@@ -37,55 +37,55 @@ msgstr "Cette catégorie existe déjà : "
 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 "Paramètres"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "January"
 msgstr "Janvier"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "February"
 msgstr "Février"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "March"
 msgstr "Mars"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "April"
 msgstr "Avril"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "May"
 msgstr "Mai"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "June"
 msgstr "Juin"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "July"
 msgstr "Juillet"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "August"
 msgstr "Août"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "September"
 msgstr "Septembre"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "October"
 msgstr "Octobre"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "November"
 msgstr "Novembre"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "December"
 msgstr "Décembre"
 
@@ -133,7 +133,7 @@ msgstr "Demande envoyée"
 msgid "Login failed!"
 msgstr "Nom d'utilisateur ou e-mail invalide"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:26
 #: templates/login.php:9
 msgid "Username"
 msgstr "Nom d'utilisateur"
@@ -194,48 +194,52 @@ msgstr "Modifier les catégories"
 msgid "Add"
 msgstr "Ajouter"
 
-#: templates/installation.php:23
+#: templates/installation.php:24
 msgid "Create an <strong>admin account</strong>"
 msgstr "Créer un <strong>compte administrateur</strong>"
 
-#: templates/installation.php:29 templates/login.php:13
+#: templates/installation.php:30 templates/login.php:13
 msgid "Password"
 msgstr "Mot de passe"
 
-#: templates/installation.php:35
+#: templates/installation.php:36
 msgid "Advanced"
 msgstr "Avancé"
 
-#: templates/installation.php:37
+#: templates/installation.php:38
 msgid "Data folder"
 msgstr "Répertoire des données"
 
-#: templates/installation.php:44
+#: templates/installation.php:45
 msgid "Configure the database"
 msgstr "Configurer la base de données"
 
-#: templates/installation.php:49 templates/installation.php:60
-#: templates/installation.php:70
+#: templates/installation.php:50 templates/installation.php:61
+#: templates/installation.php:71 templates/installation.php:81
 msgid "will be used"
 msgstr "sera utilisé"
 
-#: templates/installation.php:82
+#: templates/installation.php:93
 msgid "Database user"
 msgstr "Utilisateur pour la base de données"
 
-#: templates/installation.php:86
+#: templates/installation.php:97
 msgid "Database password"
 msgstr "Mot de passe de la base de données"
 
-#: templates/installation.php:90
+#: templates/installation.php:101
 msgid "Database name"
 msgstr "Nom de la base de données"
 
-#: templates/installation.php:96
+#: templates/installation.php:109
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:115
 msgid "Database host"
 msgstr "Serveur de la base de données"
 
-#: templates/installation.php:101
+#: templates/installation.php:120
 msgid "Finish setup"
 msgstr "Terminer l'installation"
 
diff --git a/l10n/gl/core.po b/l10n/gl/core.po
index 892b9c977f..a9c669970c 100644
--- a/l10n/gl/core.po
+++ b/l10n/gl/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-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-26 19:46+0200\n"
+"PO-Revision-Date: 2012-08-26 17:34+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"
@@ -35,55 +35,55 @@ msgstr "Esta categoría xa 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 "Preferencias"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "January"
 msgstr "Xaneiro"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "February"
 msgstr "Febreiro"
 
-#: 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 "Maio"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "June"
 msgstr "Xuño"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "July"
 msgstr "Xullo"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "August"
 msgstr "Agosto"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "September"
 msgstr "Setembro"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "October"
 msgstr "Outubro"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "November"
 msgstr "Novembro"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "December"
 msgstr "Nadal"
 
@@ -131,7 +131,7 @@ msgstr "Solicitado"
 msgid "Login failed!"
 msgstr "Fallou a conexión."
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:26
 #: templates/login.php:9
 msgid "Username"
 msgstr "Nome de usuario"
@@ -192,48 +192,52 @@ msgstr "Editar categorias"
 msgid "Add"
 msgstr "Engadir"
 
-#: templates/installation.php:23
+#: templates/installation.php:24
 msgid "Create an <strong>admin account</strong>"
 msgstr "Crear unha <strong>contra de administrador</strong>"
 
-#: templates/installation.php:29 templates/login.php:13
+#: templates/installation.php:30 templates/login.php:13
 msgid "Password"
 msgstr "Contrasinal"
 
-#: templates/installation.php:35
+#: templates/installation.php:36
 msgid "Advanced"
 msgstr "Avanzado"
 
-#: templates/installation.php:37
+#: templates/installation.php:38
 msgid "Data folder"
 msgstr "Cartafol de datos"
 
-#: templates/installation.php:44
+#: templates/installation.php:45
 msgid "Configure the database"
 msgstr "Configurar a base de datos"
 
-#: templates/installation.php:49 templates/installation.php:60
-#: templates/installation.php:70
+#: templates/installation.php:50 templates/installation.php:61
+#: templates/installation.php:71 templates/installation.php:81
 msgid "will be used"
 msgstr "será utilizado"
 
-#: templates/installation.php:82
+#: templates/installation.php:93
 msgid "Database user"
 msgstr "Usuario da base de datos"
 
-#: templates/installation.php:86
+#: templates/installation.php:97
 msgid "Database password"
 msgstr "Contrasinal da base de datos"
 
-#: templates/installation.php:90
+#: templates/installation.php:101
 msgid "Database name"
 msgstr "Nome da base de datos"
 
-#: templates/installation.php:96
+#: templates/installation.php:109
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:115
 msgid "Database host"
 msgstr "Servidor da base de datos"
 
-#: templates/installation.php:101
+#: templates/installation.php:120
 msgid "Finish setup"
 msgstr "Rematar configuración"
 
diff --git a/l10n/he/core.po b/l10n/he/core.po
index 9f69d80ad1..ef368e2e31 100644
--- a/l10n/he/core.po
+++ b/l10n/he/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-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-26 19:46+0200\n"
+"PO-Revision-Date: 2012-08-26 17:34+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"
@@ -36,55 +36,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:573
+#: js/js.js:575
 msgid "January"
 msgstr "ינואר"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "February"
 msgstr "פברואר"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "March"
 msgstr "מרץ"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "April"
 msgstr "אפריל"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "May"
 msgstr "מאי"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "June"
 msgstr "יוני"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "July"
 msgstr "יולי"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "August"
 msgstr "אוגוסט"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "September"
 msgstr "ספטמבר"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "October"
 msgstr "אוקטובר"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "November"
 msgstr "נובמבר"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "December"
 msgstr "דצמבר"
 
@@ -132,7 +132,7 @@ msgstr "נדרש"
 msgid "Login failed!"
 msgstr "הכניסה נכשלה!"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:26
 #: templates/login.php:9
 msgid "Username"
 msgstr "שם משתמש"
@@ -193,48 +193,52 @@ msgstr "עריכת הקטגוריות"
 msgid "Add"
 msgstr "הוספה"
 
-#: templates/installation.php:23
+#: templates/installation.php:24
 msgid "Create an <strong>admin account</strong>"
 msgstr "יצירת <strong>חשבון מנהל</strong>"
 
-#: templates/installation.php:29 templates/login.php:13
+#: templates/installation.php:30 templates/login.php:13
 msgid "Password"
 msgstr "ססמה"
 
-#: templates/installation.php:35
+#: templates/installation.php:36
 msgid "Advanced"
 msgstr "מתקדם"
 
-#: templates/installation.php:37
+#: templates/installation.php:38
 msgid "Data folder"
 msgstr "תיקיית נתונים"
 
-#: templates/installation.php:44
+#: templates/installation.php:45
 msgid "Configure the database"
 msgstr "הגדרת מסד הנתונים"
 
-#: templates/installation.php:49 templates/installation.php:60
-#: templates/installation.php:70
+#: templates/installation.php:50 templates/installation.php:61
+#: templates/installation.php:71 templates/installation.php:81
 msgid "will be used"
 msgstr "ינוצלו"
 
-#: templates/installation.php:82
+#: templates/installation.php:93
 msgid "Database user"
 msgstr "שם משתמש במסד הנתונים"
 
-#: templates/installation.php:86
+#: templates/installation.php:97
 msgid "Database password"
 msgstr "ססמת מסד הנתונים"
 
-#: templates/installation.php:90
+#: templates/installation.php:101
 msgid "Database name"
 msgstr "שם מסד הנתונים"
 
-#: templates/installation.php:96
+#: templates/installation.php:109
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:115
 msgid "Database host"
 msgstr "שרת בסיס נתונים"
 
-#: templates/installation.php:101
+#: templates/installation.php:120
 msgid "Finish setup"
 msgstr "סיום התקנה"
 
diff --git a/l10n/hr/core.po b/l10n/hr/core.po
index bfd1c9f19b..753af254f3 100644
--- a/l10n/hr/core.po
+++ b/l10n/hr/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-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-26 19:46+0200\n"
+"PO-Revision-Date: 2012-08-26 17:34+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"
@@ -36,55 +36,55 @@ msgstr "Ova kategorija već postoji: "
 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 "Postavke"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "January"
 msgstr "Siječanj"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "February"
 msgstr "Veljača"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "March"
 msgstr "Ožujak"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "April"
 msgstr "Travanj"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "May"
 msgstr "Svibanj"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "June"
 msgstr "Lipanj"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "July"
 msgstr "Srpanj"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "August"
 msgstr "Kolovoz"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "September"
 msgstr "Rujan"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "October"
 msgstr "Listopad"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "November"
 msgstr "Studeni"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "December"
 msgstr "Prosinac"
 
@@ -132,7 +132,7 @@ msgstr "Zahtijevano"
 msgid "Login failed!"
 msgstr "Prijava nije uspjela!"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:26
 #: templates/login.php:9
 msgid "Username"
 msgstr "Korisničko ime"
@@ -193,48 +193,52 @@ msgstr "Uredi kategorije"
 msgid "Add"
 msgstr "Dodaj"
 
-#: templates/installation.php:23
+#: templates/installation.php:24
 msgid "Create an <strong>admin account</strong>"
 msgstr "Stvori <strong>administratorski račun</strong>"
 
-#: templates/installation.php:29 templates/login.php:13
+#: templates/installation.php:30 templates/login.php:13
 msgid "Password"
 msgstr "Lozinka"
 
-#: templates/installation.php:35
+#: templates/installation.php:36
 msgid "Advanced"
 msgstr "Dodatno"
 
-#: templates/installation.php:37
+#: templates/installation.php:38
 msgid "Data folder"
 msgstr "Mapa baze podataka"
 
-#: templates/installation.php:44
+#: templates/installation.php:45
 msgid "Configure the database"
 msgstr "Konfiguriraj bazu podataka"
 
-#: templates/installation.php:49 templates/installation.php:60
-#: templates/installation.php:70
+#: templates/installation.php:50 templates/installation.php:61
+#: templates/installation.php:71 templates/installation.php:81
 msgid "will be used"
 msgstr "će se koristiti"
 
-#: templates/installation.php:82
+#: templates/installation.php:93
 msgid "Database user"
 msgstr "Korisnik baze podataka"
 
-#: templates/installation.php:86
+#: templates/installation.php:97
 msgid "Database password"
 msgstr "Lozinka baze podataka"
 
-#: templates/installation.php:90
+#: templates/installation.php:101
 msgid "Database name"
 msgstr "Ime baze podataka"
 
-#: templates/installation.php:96
+#: templates/installation.php:109
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:115
 msgid "Database host"
 msgstr "Poslužitelj baze podataka"
 
-#: templates/installation.php:101
+#: templates/installation.php:120
 msgid "Finish setup"
 msgstr "Završi postavljanje"
 
diff --git a/l10n/hu_HU/core.po b/l10n/hu_HU/core.po
index 928cb01897..0f20839d23 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-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-26 19:46+0200\n"
+"PO-Revision-Date: 2012-08-26 17:34+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"
@@ -36,55 +36,55 @@ msgstr "Ez a kategória már létezik"
 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 "Beállítások"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "January"
 msgstr "Január"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "February"
 msgstr "Február"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "March"
 msgstr "Március"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "April"
 msgstr "Április"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "May"
 msgstr "Május"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "June"
 msgstr "Június"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "July"
 msgstr "Július"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "August"
 msgstr "Augusztus"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "September"
 msgstr "Szeptember"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "October"
 msgstr "Október"
 
-#: 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 +132,7 @@ msgstr "Kérés elküldve"
 msgid "Login failed!"
 msgstr "Belépés sikertelen!"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:26
 #: templates/login.php:9
 msgid "Username"
 msgstr "Felhasználónév"
@@ -193,48 +193,52 @@ msgstr "Kategóriák szerkesztése"
 msgid "Add"
 msgstr "Hozzáadás"
 
-#: templates/installation.php:23
+#: templates/installation.php:24
 msgid "Create an <strong>admin account</strong>"
 msgstr "<strong>Rendszergazdafiók</strong> létrehozása"
 
-#: templates/installation.php:29 templates/login.php:13
+#: templates/installation.php:30 templates/login.php:13
 msgid "Password"
 msgstr "Jelszó"
 
-#: templates/installation.php:35
+#: templates/installation.php:36
 msgid "Advanced"
 msgstr "Haladó"
 
-#: templates/installation.php:37
+#: templates/installation.php:38
 msgid "Data folder"
 msgstr "Adatkönyvtár"
 
-#: templates/installation.php:44
+#: templates/installation.php:45
 msgid "Configure the database"
 msgstr "Adatbázis konfigurálása"
 
-#: templates/installation.php:49 templates/installation.php:60
-#: templates/installation.php:70
+#: templates/installation.php:50 templates/installation.php:61
+#: templates/installation.php:71 templates/installation.php:81
 msgid "will be used"
 msgstr "használva lesz"
 
-#: templates/installation.php:82
+#: templates/installation.php:93
 msgid "Database user"
 msgstr "Adatbázis felhasználónév"
 
-#: templates/installation.php:86
+#: templates/installation.php:97
 msgid "Database password"
 msgstr "Adatbázis jelszó"
 
-#: templates/installation.php:90
+#: templates/installation.php:101
 msgid "Database name"
 msgstr "Adatbázis név"
 
-#: templates/installation.php:96
+#: templates/installation.php:109
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:115
 msgid "Database host"
 msgstr "Adatbázis szerver"
 
-#: templates/installation.php:101
+#: templates/installation.php:120
 msgid "Finish setup"
 msgstr "Beállítás befejezése"
 
diff --git a/l10n/hu_HU/files_encryption.po b/l10n/hu_HU/files_encryption.po
index 6b70a6b368..8fa556e471 100644
--- a/l10n/hu_HU/files_encryption.po
+++ b/l10n/hu_HU/files_encryption.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Csaba Orban <vicsabi@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-26 19:46+0200\n"
+"PO-Revision-Date: 2012-08-26 09:01+0000\n"
+"Last-Translator: Csaba Orban <vicsabi@gmail.com>\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"
@@ -19,16 +20,16 @@ msgstr ""
 
 #: templates/settings.php:3
 msgid "Encryption"
-msgstr ""
+msgstr "Titkosítás"
 
 #: templates/settings.php:4
 msgid "Exclude the following file types from encryption"
-msgstr ""
+msgstr "A következő fájl típusok kizárása a titkosításból"
 
 #: templates/settings.php:5
 msgid "None"
-msgstr ""
+msgstr "Egyik sem"
 
 #: templates/settings.php:10
 msgid "Enable Encryption"
-msgstr ""
+msgstr "Titkosítás engedélyezése"
diff --git a/l10n/hu_HU/files_sharing.po b/l10n/hu_HU/files_sharing.po
index 3b03c6a943..6d274d3823 100644
--- a/l10n/hu_HU/files_sharing.po
+++ b/l10n/hu_HU/files_sharing.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Csaba Orban <vicsabi@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-26 19:46+0200\n"
+"PO-Revision-Date: 2012-08-26 09:23+0000\n"
+"Last-Translator: Csaba Orban <vicsabi@gmail.com>\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"
@@ -19,16 +20,16 @@ msgstr ""
 
 #: templates/get.php:4
 msgid "Size"
-msgstr ""
+msgstr "Méret"
 
 #: templates/get.php:5
 msgid "Modified"
-msgstr ""
+msgstr "Módosítva"
 
 #: templates/get.php:5
 msgid "Delete all"
-msgstr ""
+msgstr "Összes törlése"
 
 #: templates/get.php:5
 msgid "Delete"
-msgstr ""
+msgstr "Törlés"
diff --git a/l10n/hy/core.po b/l10n/hy/core.po
index bcf3a0d20c..b7fc27bce4 100644
--- a/l10n/hy/core.po
+++ b/l10n/hy/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-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-26 19:46+0200\n"
+"PO-Revision-Date: 2012-08-26 17:34+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"
@@ -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:573
+#: js/js.js:575
 msgid "January"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "February"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "March"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "April"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "May"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "June"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "July"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "August"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "September"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "October"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "November"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "December"
 msgstr ""
 
@@ -129,7 +129,7 @@ msgstr ""
 msgid "Login failed!"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:26
 #: templates/login.php:9
 msgid "Username"
 msgstr ""
@@ -190,48 +190,52 @@ msgstr ""
 msgid "Add"
 msgstr ""
 
-#: templates/installation.php:23
+#: templates/installation.php:24
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
-#: templates/installation.php:29 templates/login.php:13
+#: templates/installation.php:30 templates/login.php:13
 msgid "Password"
 msgstr ""
 
-#: templates/installation.php:35
+#: templates/installation.php:36
 msgid "Advanced"
 msgstr ""
 
-#: templates/installation.php:37
+#: templates/installation.php:38
 msgid "Data folder"
 msgstr ""
 
-#: templates/installation.php:44
+#: templates/installation.php:45
 msgid "Configure the database"
 msgstr ""
 
-#: templates/installation.php:49 templates/installation.php:60
-#: templates/installation.php:70
+#: templates/installation.php:50 templates/installation.php:61
+#: templates/installation.php:71 templates/installation.php:81
 msgid "will be used"
 msgstr ""
 
-#: templates/installation.php:82
+#: templates/installation.php:93
 msgid "Database user"
 msgstr ""
 
-#: templates/installation.php:86
+#: templates/installation.php:97
 msgid "Database password"
 msgstr ""
 
-#: templates/installation.php:90
+#: templates/installation.php:101
 msgid "Database name"
 msgstr ""
 
-#: templates/installation.php:96
+#: templates/installation.php:109
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:115
 msgid "Database host"
 msgstr ""
 
-#: templates/installation.php:101
+#: templates/installation.php:120
 msgid "Finish setup"
 msgstr ""
 
diff --git a/l10n/ia/core.po b/l10n/ia/core.po
index bd15bf5a90..2be759b5fc 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-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-26 19:46+0200\n"
+"PO-Revision-Date: 2012-08-26 17:34+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"
@@ -34,55 +34,55 @@ msgstr "Iste categoria jam existe:"
 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 "Configurationes"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "January"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "February"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "March"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "April"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "May"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "June"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "July"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "August"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "September"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "October"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "November"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "December"
 msgstr ""
 
@@ -130,7 +130,7 @@ msgstr "Requestate"
 msgid "Login failed!"
 msgstr "Initio de session fallite!"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:26
 #: templates/login.php:9
 msgid "Username"
 msgstr "Nomine de usator"
@@ -191,48 +191,52 @@ msgstr "Modificar categorias"
 msgid "Add"
 msgstr "Adder"
 
-#: templates/installation.php:23
+#: templates/installation.php:24
 msgid "Create an <strong>admin account</strong>"
 msgstr "Crear un <strong>conto de administration</strong>"
 
-#: templates/installation.php:29 templates/login.php:13
+#: templates/installation.php:30 templates/login.php:13
 msgid "Password"
 msgstr "Contrasigno"
 
-#: templates/installation.php:35
+#: templates/installation.php:36
 msgid "Advanced"
 msgstr "Avantiate"
 
-#: templates/installation.php:37
+#: templates/installation.php:38
 msgid "Data folder"
 msgstr "Dossier de datos"
 
-#: templates/installation.php:44
+#: templates/installation.php:45
 msgid "Configure the database"
 msgstr "Configurar le base de datos"
 
-#: templates/installation.php:49 templates/installation.php:60
-#: templates/installation.php:70
+#: templates/installation.php:50 templates/installation.php:61
+#: templates/installation.php:71 templates/installation.php:81
 msgid "will be used"
 msgstr "essera usate"
 
-#: templates/installation.php:82
+#: templates/installation.php:93
 msgid "Database user"
 msgstr "Usator de base de datos"
 
-#: templates/installation.php:86
+#: templates/installation.php:97
 msgid "Database password"
 msgstr "Contrasigno de base de datos"
 
-#: templates/installation.php:90
+#: templates/installation.php:101
 msgid "Database name"
 msgstr "Nomine de base de datos"
 
-#: templates/installation.php:96
+#: templates/installation.php:109
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:115
 msgid "Database host"
 msgstr "Hospite de base de datos"
 
-#: templates/installation.php:101
+#: templates/installation.php:120
 msgid "Finish setup"
 msgstr ""
 
diff --git a/l10n/id/core.po b/l10n/id/core.po
index 6245505a80..871d7a335b 100644
--- a/l10n/id/core.po
+++ b/l10n/id/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-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-26 19:46+0200\n"
+"PO-Revision-Date: 2012-08-26 17:34+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"
@@ -35,55 +35,55 @@ msgstr "Kategori ini sudah ada:"
 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 "Setelan"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "January"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "February"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "March"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "April"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "May"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "June"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "July"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "August"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "September"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "October"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "November"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "December"
 msgstr ""
 
@@ -131,7 +131,7 @@ msgstr "Telah diminta"
 msgid "Login failed!"
 msgstr "Login gagal!"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:26
 #: templates/login.php:9
 msgid "Username"
 msgstr "Username"
@@ -192,48 +192,52 @@ msgstr "Edit kategori"
 msgid "Add"
 msgstr "Tambahkan"
 
-#: templates/installation.php:23
+#: templates/installation.php:24
 msgid "Create an <strong>admin account</strong>"
 msgstr "Buat sebuah <strong>akun admin</strong>"
 
-#: templates/installation.php:29 templates/login.php:13
+#: templates/installation.php:30 templates/login.php:13
 msgid "Password"
 msgstr "Password"
 
-#: templates/installation.php:35
+#: templates/installation.php:36
 msgid "Advanced"
 msgstr "Tingkat Lanjut"
 
-#: templates/installation.php:37
+#: templates/installation.php:38
 msgid "Data folder"
 msgstr "Folder data"
 
-#: templates/installation.php:44
+#: templates/installation.php:45
 msgid "Configure the database"
 msgstr "Konfigurasi database"
 
-#: templates/installation.php:49 templates/installation.php:60
-#: templates/installation.php:70
+#: templates/installation.php:50 templates/installation.php:61
+#: templates/installation.php:71 templates/installation.php:81
 msgid "will be used"
 msgstr "akan digunakan"
 
-#: templates/installation.php:82
+#: templates/installation.php:93
 msgid "Database user"
 msgstr "Pengguna database"
 
-#: templates/installation.php:86
+#: templates/installation.php:97
 msgid "Database password"
 msgstr "Password database"
 
-#: templates/installation.php:90
+#: templates/installation.php:101
 msgid "Database name"
 msgstr "Nama database"
 
-#: templates/installation.php:96
+#: templates/installation.php:109
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:115
 msgid "Database host"
 msgstr "Host database"
 
-#: templates/installation.php:101
+#: templates/installation.php:120
 msgid "Finish setup"
 msgstr "Selesaikan instalasi"
 
diff --git a/l10n/id_ID/core.po b/l10n/id_ID/core.po
index 0d43d3618c..39f5328c9a 100644
--- a/l10n/id_ID/core.po
+++ b/l10n/id_ID/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-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-26 19:46+0200\n"
+"PO-Revision-Date: 2012-08-26 17:34+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"
@@ -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:573
+#: js/js.js:575
 msgid "January"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "February"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "March"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "April"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "May"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "June"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "July"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "August"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "September"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "October"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "November"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "December"
 msgstr ""
 
@@ -129,7 +129,7 @@ msgstr ""
 msgid "Login failed!"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:26
 #: templates/login.php:9
 msgid "Username"
 msgstr ""
@@ -190,48 +190,52 @@ msgstr ""
 msgid "Add"
 msgstr ""
 
-#: templates/installation.php:23
+#: templates/installation.php:24
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
-#: templates/installation.php:29 templates/login.php:13
+#: templates/installation.php:30 templates/login.php:13
 msgid "Password"
 msgstr ""
 
-#: templates/installation.php:35
+#: templates/installation.php:36
 msgid "Advanced"
 msgstr ""
 
-#: templates/installation.php:37
+#: templates/installation.php:38
 msgid "Data folder"
 msgstr ""
 
-#: templates/installation.php:44
+#: templates/installation.php:45
 msgid "Configure the database"
 msgstr ""
 
-#: templates/installation.php:49 templates/installation.php:60
-#: templates/installation.php:70
+#: templates/installation.php:50 templates/installation.php:61
+#: templates/installation.php:71 templates/installation.php:81
 msgid "will be used"
 msgstr ""
 
-#: templates/installation.php:82
+#: templates/installation.php:93
 msgid "Database user"
 msgstr ""
 
-#: templates/installation.php:86
+#: templates/installation.php:97
 msgid "Database password"
 msgstr ""
 
-#: templates/installation.php:90
+#: templates/installation.php:101
 msgid "Database name"
 msgstr ""
 
-#: templates/installation.php:96
+#: templates/installation.php:109
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:115
 msgid "Database host"
 msgstr ""
 
-#: templates/installation.php:101
+#: templates/installation.php:120
 msgid "Finish setup"
 msgstr ""
 
diff --git a/l10n/it/core.po b/l10n/it/core.po
index 95cfeb14f4..16ef1b0d11 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-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-26 19:46+0200\n"
+"PO-Revision-Date: 2012-08-26 17:34+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"
@@ -38,55 +38,55 @@ msgstr "Questa categoria esiste già: "
 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 "Impostazioni"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "January"
 msgstr "Gennaio"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "February"
 msgstr "Febbraio"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "March"
 msgstr "Marzo"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "April"
 msgstr "Aprile"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "May"
 msgstr "Maggio"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "June"
 msgstr "Giugno"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "July"
 msgstr "Luglio"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "August"
 msgstr "Agosto"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "September"
 msgstr "Settembre"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "October"
 msgstr "Ottobre"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "November"
 msgstr "Novembre"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "December"
 msgstr "Dicembre"
 
@@ -134,7 +134,7 @@ msgstr "Richiesto"
 msgid "Login failed!"
 msgstr "Accesso non riuscito!"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:26
 #: templates/login.php:9
 msgid "Username"
 msgstr "Nome utente"
@@ -195,48 +195,52 @@ msgstr "Modifica le categorie"
 msgid "Add"
 msgstr "Aggiungi"
 
-#: templates/installation.php:23
+#: templates/installation.php:24
 msgid "Create an <strong>admin account</strong>"
 msgstr "Crea un <strong>account amministratore</strong>"
 
-#: templates/installation.php:29 templates/login.php:13
+#: templates/installation.php:30 templates/login.php:13
 msgid "Password"
 msgstr "Password"
 
-#: templates/installation.php:35
+#: templates/installation.php:36
 msgid "Advanced"
 msgstr "Avanzate"
 
-#: templates/installation.php:37
+#: templates/installation.php:38
 msgid "Data folder"
 msgstr "Cartella dati"
 
-#: templates/installation.php:44
+#: templates/installation.php:45
 msgid "Configure the database"
 msgstr "Configura il database"
 
-#: templates/installation.php:49 templates/installation.php:60
-#: templates/installation.php:70
+#: templates/installation.php:50 templates/installation.php:61
+#: templates/installation.php:71 templates/installation.php:81
 msgid "will be used"
 msgstr "sarà usato"
 
-#: templates/installation.php:82
+#: templates/installation.php:93
 msgid "Database user"
 msgstr "Utente del database"
 
-#: templates/installation.php:86
+#: templates/installation.php:97
 msgid "Database password"
 msgstr "Password del database"
 
-#: templates/installation.php:90
+#: templates/installation.php:101
 msgid "Database name"
 msgstr "Nome del database"
 
-#: templates/installation.php:96
+#: templates/installation.php:109
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:115
 msgid "Database host"
 msgstr "Host del database"
 
-#: templates/installation.php:101
+#: templates/installation.php:120
 msgid "Finish setup"
 msgstr "Termina la configurazione"
 
diff --git a/l10n/ja_JP/core.po b/l10n/ja_JP/core.po
index 18c7f43a64..bfe21085ed 100644
--- a/l10n/ja_JP/core.po
+++ b/l10n/ja_JP/core.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-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-26 19:46+0200\n"
+"PO-Revision-Date: 2012-08-26 17:34+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"
@@ -34,55 +35,55 @@ msgstr "このカテゴリはすでに存在します: "
 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 "設定"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "January"
 msgstr "1月"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "February"
 msgstr "2月"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "March"
 msgstr "3月"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "April"
 msgstr "4月"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "May"
 msgstr "5月"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "June"
 msgstr "6月"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "July"
 msgstr "7月"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "August"
 msgstr "8月"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "September"
 msgstr "9月"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "October"
 msgstr "10月"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "November"
 msgstr "11月"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "December"
 msgstr "12月"
 
@@ -130,7 +131,7 @@ msgstr "送信されました"
 msgid "Login failed!"
 msgstr "ログインに失敗しました！"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:26
 #: templates/login.php:9
 msgid "Username"
 msgstr "ユーザ名"
@@ -191,48 +192,52 @@ msgstr "カテゴリを編集"
 msgid "Add"
 msgstr "追加"
 
-#: templates/installation.php:23
+#: templates/installation.php:24
 msgid "Create an <strong>admin account</strong>"
 msgstr "<strong>管理者アカウント</strong>を作成してください"
 
-#: templates/installation.php:29 templates/login.php:13
+#: templates/installation.php:30 templates/login.php:13
 msgid "Password"
 msgstr "パスワード"
 
-#: templates/installation.php:35
+#: templates/installation.php:36
 msgid "Advanced"
 msgstr "詳細設定"
 
-#: templates/installation.php:37
+#: templates/installation.php:38
 msgid "Data folder"
 msgstr "データフォルダ"
 
-#: templates/installation.php:44
+#: templates/installation.php:45
 msgid "Configure the database"
 msgstr "データベースを設定してください"
 
-#: templates/installation.php:49 templates/installation.php:60
-#: templates/installation.php:70
+#: templates/installation.php:50 templates/installation.php:61
+#: templates/installation.php:71 templates/installation.php:81
 msgid "will be used"
 msgstr "が使用されます"
 
-#: templates/installation.php:82
+#: templates/installation.php:93
 msgid "Database user"
 msgstr "データベースのユーザ名"
 
-#: templates/installation.php:86
+#: templates/installation.php:97
 msgid "Database password"
 msgstr "データベースのパスワード"
 
-#: templates/installation.php:90
+#: templates/installation.php:101
 msgid "Database name"
 msgstr "データベース名"
 
-#: templates/installation.php:96
+#: templates/installation.php:109
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:115
 msgid "Database host"
 msgstr "データベースのホスト名"
 
-#: templates/installation.php:101
+#: templates/installation.php:120
 msgid "Finish setup"
 msgstr "セットアップを完了します"
 
diff --git a/l10n/ko/core.po b/l10n/ko/core.po
index aaed23a766..21aa0f60cd 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-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-26 19:46+0200\n"
+"PO-Revision-Date: 2012-08-26 17:34+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"
@@ -35,55 +35,55 @@ msgstr "이 카테고리는 이미 존재합니다:"
 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 "설정"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "January"
 msgstr "1월"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "February"
 msgstr "2월"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "March"
 msgstr "3월"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "April"
 msgstr "4월"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "May"
 msgstr "5월"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "June"
 msgstr "6월"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "July"
 msgstr "7월"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "August"
 msgstr "8월"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "September"
 msgstr "9월"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "October"
 msgstr "10월"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "November"
 msgstr "11월"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "December"
 msgstr "12월"
 
@@ -131,7 +131,7 @@ msgstr "요청함"
 msgid "Login failed!"
 msgstr "로그인 실패!"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:26
 #: templates/login.php:9
 msgid "Username"
 msgstr "사용자 이름"
@@ -192,48 +192,52 @@ msgstr "카테고리 편집"
 msgid "Add"
 msgstr "추가"
 
-#: templates/installation.php:23
+#: templates/installation.php:24
 msgid "Create an <strong>admin account</strong>"
 msgstr "<strong>관리자 계정</strong>을 만드십시오"
 
-#: templates/installation.php:29 templates/login.php:13
+#: templates/installation.php:30 templates/login.php:13
 msgid "Password"
 msgstr "암호"
 
-#: templates/installation.php:35
+#: templates/installation.php:36
 msgid "Advanced"
 msgstr "고급"
 
-#: templates/installation.php:37
+#: templates/installation.php:38
 msgid "Data folder"
 msgstr "자료 폴더"
 
-#: templates/installation.php:44
+#: templates/installation.php:45
 msgid "Configure the database"
 msgstr "데이터베이스 구성"
 
-#: templates/installation.php:49 templates/installation.php:60
-#: templates/installation.php:70
+#: templates/installation.php:50 templates/installation.php:61
+#: templates/installation.php:71 templates/installation.php:81
 msgid "will be used"
 msgstr "사용 될 것임"
 
-#: templates/installation.php:82
+#: templates/installation.php:93
 msgid "Database user"
 msgstr "데이터베이스 사용자"
 
-#: templates/installation.php:86
+#: templates/installation.php:97
 msgid "Database password"
 msgstr "데이터베이스 암호"
 
-#: templates/installation.php:90
+#: templates/installation.php:101
 msgid "Database name"
 msgstr "데이터베이스 이름"
 
-#: templates/installation.php:96
+#: templates/installation.php:109
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:115
 msgid "Database host"
 msgstr "데이터베이스 호스트"
 
-#: templates/installation.php:101
+#: templates/installation.php:120
 msgid "Finish setup"
 msgstr "설치 완료"
 
diff --git a/l10n/lb/core.po b/l10n/lb/core.po
index 992723898f..1726f295b0 100644
--- a/l10n/lb/core.po
+++ b/l10n/lb/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-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-26 19:46+0200\n"
+"PO-Revision-Date: 2012-08-26 17:34+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"
@@ -34,55 +34,55 @@ msgstr "Des Kategorie existéiert schonn:"
 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 "Astellungen"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "January"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "February"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "March"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "April"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "May"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "June"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "July"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "August"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "September"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "October"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "November"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "December"
 msgstr ""
 
@@ -130,7 +130,7 @@ msgstr "Gefrot"
 msgid "Login failed!"
 msgstr "Falschen Login!"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:26
 #: templates/login.php:9
 msgid "Username"
 msgstr "Benotzernumm"
@@ -191,48 +191,52 @@ msgstr "Kategorien editéieren"
 msgid "Add"
 msgstr "Bäisetzen"
 
-#: templates/installation.php:23
+#: templates/installation.php:24
 msgid "Create an <strong>admin account</strong>"
 msgstr "En <strong>Admin Account</strong> uleeën"
 
-#: templates/installation.php:29 templates/login.php:13
+#: templates/installation.php:30 templates/login.php:13
 msgid "Password"
 msgstr "Passwuert"
 
-#: templates/installation.php:35
+#: templates/installation.php:36
 msgid "Advanced"
 msgstr "Erweidert"
 
-#: templates/installation.php:37
+#: templates/installation.php:38
 msgid "Data folder"
 msgstr "Daten Dossier"
 
-#: templates/installation.php:44
+#: templates/installation.php:45
 msgid "Configure the database"
 msgstr "Datebank konfiguréieren"
 
-#: templates/installation.php:49 templates/installation.php:60
-#: templates/installation.php:70
+#: templates/installation.php:50 templates/installation.php:61
+#: templates/installation.php:71 templates/installation.php:81
 msgid "will be used"
 msgstr "wärt benotzt ginn"
 
-#: templates/installation.php:82
+#: templates/installation.php:93
 msgid "Database user"
 msgstr "Datebank Benotzer"
 
-#: templates/installation.php:86
+#: templates/installation.php:97
 msgid "Database password"
 msgstr "Datebank Passwuert"
 
-#: templates/installation.php:90
+#: templates/installation.php:101
 msgid "Database name"
 msgstr "Datebank Numm"
 
-#: templates/installation.php:96
+#: templates/installation.php:109
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:115
 msgid "Database host"
 msgstr "Datebank Server"
 
-#: templates/installation.php:101
+#: templates/installation.php:120
 msgid "Finish setup"
 msgstr "Installatioun ofschléissen"
 
diff --git a/l10n/lt_LT/core.po b/l10n/lt_LT/core.po
index 60b338d51c..1400ed1ee7 100644
--- a/l10n/lt_LT/core.po
+++ b/l10n/lt_LT/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-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-26 19:46+0200\n"
+"PO-Revision-Date: 2012-08-26 17:34+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"
@@ -34,55 +34,55 @@ msgstr "Tokia kategorija jau yra:"
 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 "Nustatymai"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "January"
 msgstr "Sausis"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "February"
 msgstr "Vasaris"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "March"
 msgstr "Kovas"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "April"
 msgstr "Balandis"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "May"
 msgstr "Gegužė"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "June"
 msgstr "Birželis"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "July"
 msgstr "Liepa"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "August"
 msgstr "Rugpjūtis"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "September"
 msgstr "Rugsėjis"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "October"
 msgstr "Spalis"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "November"
 msgstr "Lapkritis"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "December"
 msgstr "Gruodis"
 
@@ -130,7 +130,7 @@ msgstr "Užklausta"
 msgid "Login failed!"
 msgstr "Prisijungti nepavyko!"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:26
 #: templates/login.php:9
 msgid "Username"
 msgstr "Prisijungimo vardas"
@@ -191,48 +191,52 @@ msgstr "Redaguoti kategorijas"
 msgid "Add"
 msgstr "Pridėti"
 
-#: templates/installation.php:23
+#: templates/installation.php:24
 msgid "Create an <strong>admin account</strong>"
 msgstr "Sukurti <strong>administratoriaus paskyrą</strong>"
 
-#: templates/installation.php:29 templates/login.php:13
+#: templates/installation.php:30 templates/login.php:13
 msgid "Password"
 msgstr "Slaptažodis"
 
-#: templates/installation.php:35
+#: templates/installation.php:36
 msgid "Advanced"
 msgstr "Išplėstiniai"
 
-#: templates/installation.php:37
+#: templates/installation.php:38
 msgid "Data folder"
 msgstr "Duomenų katalogas"
 
-#: templates/installation.php:44
+#: templates/installation.php:45
 msgid "Configure the database"
 msgstr "Nustatyti duomenų bazę"
 
-#: templates/installation.php:49 templates/installation.php:60
-#: templates/installation.php:70
+#: templates/installation.php:50 templates/installation.php:61
+#: templates/installation.php:71 templates/installation.php:81
 msgid "will be used"
 msgstr "bus naudojama"
 
-#: templates/installation.php:82
+#: templates/installation.php:93
 msgid "Database user"
 msgstr "Duomenų bazės vartotojas"
 
-#: templates/installation.php:86
+#: templates/installation.php:97
 msgid "Database password"
 msgstr "Duomenų bazės slaptažodis"
 
-#: templates/installation.php:90
+#: templates/installation.php:101
 msgid "Database name"
 msgstr "Duomenų bazės pavadinimas"
 
-#: templates/installation.php:96
+#: templates/installation.php:109
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:115
 msgid "Database host"
 msgstr "Duomenų bazės serveris"
 
-#: templates/installation.php:101
+#: templates/installation.php:120
 msgid "Finish setup"
 msgstr "Baigti diegimą"
 
diff --git a/l10n/lv/core.po b/l10n/lv/core.po
index a9c0fffbec..965b46e64b 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-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-26 19:46+0200\n"
+"PO-Revision-Date: 2012-08-26 17:34+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"
@@ -34,55 +34,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 "Iestatījumi"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "January"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "February"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "March"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "April"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "May"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "June"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "July"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "August"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "September"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "October"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "November"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "December"
 msgstr ""
 
@@ -130,7 +130,7 @@ msgstr "Obligāts"
 msgid "Login failed!"
 msgstr "Neizdevās ielogoties."
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:26
 #: templates/login.php:9
 msgid "Username"
 msgstr "Lietotājvārds"
@@ -191,48 +191,52 @@ msgstr ""
 msgid "Add"
 msgstr ""
 
-#: templates/installation.php:23
+#: templates/installation.php:24
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
-#: templates/installation.php:29 templates/login.php:13
+#: templates/installation.php:30 templates/login.php:13
 msgid "Password"
 msgstr "Parole"
 
-#: templates/installation.php:35
+#: templates/installation.php:36
 msgid "Advanced"
 msgstr ""
 
-#: templates/installation.php:37
+#: templates/installation.php:38
 msgid "Data folder"
 msgstr "Datu mape"
 
-#: templates/installation.php:44
+#: templates/installation.php:45
 msgid "Configure the database"
 msgstr "Nokonfigurēt datubāzi"
 
-#: templates/installation.php:49 templates/installation.php:60
-#: templates/installation.php:70
+#: templates/installation.php:50 templates/installation.php:61
+#: templates/installation.php:71 templates/installation.php:81
 msgid "will be used"
 msgstr "tiks izmantots"
 
-#: templates/installation.php:82
+#: templates/installation.php:93
 msgid "Database user"
 msgstr "Datubāzes lietotājs"
 
-#: templates/installation.php:86
+#: templates/installation.php:97
 msgid "Database password"
 msgstr "Datubāzes parole"
 
-#: templates/installation.php:90
+#: templates/installation.php:101
 msgid "Database name"
 msgstr "Datubāzes nosaukums"
 
-#: templates/installation.php:96
+#: templates/installation.php:109
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:115
 msgid "Database host"
 msgstr "Datubāzes mājvieta"
 
-#: templates/installation.php:101
+#: templates/installation.php:120
 msgid "Finish setup"
 msgstr "Pabeigt uzstādījumus"
 
diff --git a/l10n/mk/core.po b/l10n/mk/core.po
index 845e2aa68c..9dd6c68881 100644
--- a/l10n/mk/core.po
+++ b/l10n/mk/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-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-26 19:46+0200\n"
+"PO-Revision-Date: 2012-08-26 17:34+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"
@@ -36,55 +36,55 @@ msgstr "Оваа категорија веќе постои:"
 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 "Поставки"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "January"
 msgstr "Јануари"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "February"
 msgstr "Февруари"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "March"
 msgstr "Март"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "April"
 msgstr "Април"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "May"
 msgstr "Мај"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "June"
 msgstr "Јуни"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "July"
 msgstr "Јули"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "August"
 msgstr "Август"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "September"
 msgstr "Септември"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "October"
 msgstr "Октомври"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "November"
 msgstr "Ноември"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "December"
 msgstr "Декември"
 
@@ -132,7 +132,7 @@ msgstr "Побарано"
 msgid "Login failed!"
 msgstr "Најавата не успеа!"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:26
 #: templates/login.php:9
 msgid "Username"
 msgstr "Корисничко име"
@@ -193,48 +193,52 @@ msgstr "Уреди категории"
 msgid "Add"
 msgstr "Додади"
 
-#: templates/installation.php:23
+#: templates/installation.php:24
 msgid "Create an <strong>admin account</strong>"
 msgstr "Направете <strong>администраторска сметка</strong>"
 
-#: templates/installation.php:29 templates/login.php:13
+#: templates/installation.php:30 templates/login.php:13
 msgid "Password"
 msgstr "Лозинка"
 
-#: templates/installation.php:35
+#: templates/installation.php:36
 msgid "Advanced"
 msgstr "Напредно"
 
-#: templates/installation.php:37
+#: templates/installation.php:38
 msgid "Data folder"
 msgstr "Фолдер со податоци"
 
-#: templates/installation.php:44
+#: templates/installation.php:45
 msgid "Configure the database"
 msgstr "Конфигурирај ја базата"
 
-#: templates/installation.php:49 templates/installation.php:60
-#: templates/installation.php:70
+#: templates/installation.php:50 templates/installation.php:61
+#: templates/installation.php:71 templates/installation.php:81
 msgid "will be used"
 msgstr "ќе биде користено"
 
-#: templates/installation.php:82
+#: templates/installation.php:93
 msgid "Database user"
 msgstr "Корисник на база"
 
-#: templates/installation.php:86
+#: templates/installation.php:97
 msgid "Database password"
 msgstr "Лозинка на база"
 
-#: templates/installation.php:90
+#: templates/installation.php:101
 msgid "Database name"
 msgstr "Име на база"
 
-#: templates/installation.php:96
+#: templates/installation.php:109
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:115
 msgid "Database host"
 msgstr "Сервер со база"
 
-#: templates/installation.php:101
+#: templates/installation.php:120
 msgid "Finish setup"
 msgstr "Заврши го подесувањето"
 
diff --git a/l10n/ms_MY/core.po b/l10n/ms_MY/core.po
index 468102d63d..203061937a 100644
--- a/l10n/ms_MY/core.po
+++ b/l10n/ms_MY/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-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-26 19:46+0200\n"
+"PO-Revision-Date: 2012-08-26 17:34+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"
@@ -36,55 +36,55 @@ msgstr "Kategori ini telah wujud"
 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 "Tetapan"
 
-#: 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 "Mac"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "April"
 msgstr "April"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "May"
 msgstr "Mei"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "June"
 msgstr "Jun"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "July"
 msgstr "Julai"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "August"
 msgstr "Ogos"
 
-#: 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 "Disember"
 
@@ -132,7 +132,7 @@ msgstr "Meminta"
 msgid "Login failed!"
 msgstr "Log masuk gagal!"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:26
 #: templates/login.php:9
 msgid "Username"
 msgstr "Nama pengguna"
@@ -193,48 +193,52 @@ msgstr "Edit kategori"
 msgid "Add"
 msgstr "Tambah"
 
-#: templates/installation.php:23
+#: templates/installation.php:24
 msgid "Create an <strong>admin account</strong>"
 msgstr "buat <strong>akaun admin</strong>"
 
-#: templates/installation.php:29 templates/login.php:13
+#: templates/installation.php:30 templates/login.php:13
 msgid "Password"
 msgstr "Kata laluan"
 
-#: templates/installation.php:35
+#: templates/installation.php:36
 msgid "Advanced"
 msgstr "Maju"
 
-#: templates/installation.php:37
+#: templates/installation.php:38
 msgid "Data folder"
 msgstr "Fail data"
 
-#: templates/installation.php:44
+#: templates/installation.php:45
 msgid "Configure the database"
 msgstr "Konfigurasi pangkalan data"
 
-#: templates/installation.php:49 templates/installation.php:60
-#: templates/installation.php:70
+#: templates/installation.php:50 templates/installation.php:61
+#: templates/installation.php:71 templates/installation.php:81
 msgid "will be used"
 msgstr "akan digunakan"
 
-#: templates/installation.php:82
+#: templates/installation.php:93
 msgid "Database user"
 msgstr "Nama pengguna pangkalan data"
 
-#: templates/installation.php:86
+#: templates/installation.php:97
 msgid "Database password"
 msgstr "Kata laluan pangkalan data"
 
-#: templates/installation.php:90
+#: templates/installation.php:101
 msgid "Database name"
 msgstr "Nama pangkalan data"
 
-#: templates/installation.php:96
+#: templates/installation.php:109
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:115
 msgid "Database host"
 msgstr "Hos pangkalan data"
 
-#: templates/installation.php:101
+#: templates/installation.php:120
 msgid "Finish setup"
 msgstr "Setup selesai"
 
diff --git a/l10n/nb_NO/core.po b/l10n/nb_NO/core.po
index 315e85c543..bfcd049f1f 100644
--- a/l10n/nb_NO/core.po
+++ b/l10n/nb_NO/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-26 01:17+0200\n"
-"PO-Revision-Date: 2012-08-25 22:56+0000\n"
-"Last-Translator: runesudden <runesudden@gmail.com>\n"
+"POT-Creation-Date: 2012-08-26 19:46+0200\n"
+"PO-Revision-Date: 2012-08-26 17:34+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"
@@ -234,7 +234,7 @@ msgstr "Databasenavn"
 
 #: templates/installation.php:109
 msgid "Database tablespace"
-msgstr "Database tabellområde"
+msgstr ""
 
 #: templates/installation.php:115
 msgid "Database host"
diff --git a/l10n/nl/core.po b/l10n/nl/core.po
index cdbdada846..947c5fa6b2 100644
--- a/l10n/nl/core.po
+++ b/l10n/nl/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-26 19:46+0200\n"
+"PO-Revision-Date: 2012-08-26 17:34+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"
@@ -39,55 +39,55 @@ msgstr "De categorie bestaat al."
 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 "Instellingen"
 
-#: 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 "Maart"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "April"
 msgstr "April"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "May"
 msgstr "Mei"
 
-#: 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 "Augustus"
 
-#: 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"
 
@@ -135,7 +135,7 @@ msgstr "Gevraagd"
 msgid "Login failed!"
 msgstr "Login mislukt!"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:26
 #: templates/login.php:9
 msgid "Username"
 msgstr "Gebruikersnaam"
@@ -196,48 +196,52 @@ msgstr "Wijzigen categorieën"
 msgid "Add"
 msgstr "Toevoegen"
 
-#: templates/installation.php:23
+#: templates/installation.php:24
 msgid "Create an <strong>admin account</strong>"
 msgstr "Maak een <strong>beheerdersaccount</strong> aan"
 
-#: templates/installation.php:29 templates/login.php:13
+#: templates/installation.php:30 templates/login.php:13
 msgid "Password"
 msgstr "Wachtwoord"
 
-#: templates/installation.php:35
+#: templates/installation.php:36
 msgid "Advanced"
 msgstr "Geavanceerd"
 
-#: templates/installation.php:37
+#: templates/installation.php:38
 msgid "Data folder"
 msgstr "Gegevensmap"
 
-#: templates/installation.php:44
+#: templates/installation.php:45
 msgid "Configure the database"
 msgstr "Configureer de databank"
 
-#: templates/installation.php:49 templates/installation.php:60
-#: templates/installation.php:70
+#: templates/installation.php:50 templates/installation.php:61
+#: templates/installation.php:71 templates/installation.php:81
 msgid "will be used"
 msgstr "zal gebruikt worden"
 
-#: templates/installation.php:82
+#: templates/installation.php:93
 msgid "Database user"
 msgstr "Gebruiker databank"
 
-#: templates/installation.php:86
+#: templates/installation.php:97
 msgid "Database password"
 msgstr "Wachtwoord databank"
 
-#: templates/installation.php:90
+#: templates/installation.php:101
 msgid "Database name"
 msgstr "Naam databank"
 
-#: templates/installation.php:96
+#: templates/installation.php:109
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:115
 msgid "Database host"
 msgstr "Database server"
 
-#: templates/installation.php:101
+#: templates/installation.php:120
 msgid "Finish setup"
 msgstr "Installatie afronden"
 
diff --git a/l10n/nn_NO/core.po b/l10n/nn_NO/core.po
index 707892db95..d239bb9c7d 100644
--- a/l10n/nn_NO/core.po
+++ b/l10n/nn_NO/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-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-26 19:46+0200\n"
+"PO-Revision-Date: 2012-08-26 17:34+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"
@@ -35,55 +35,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 "Innstillingar"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "January"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "February"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "March"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "April"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "May"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "June"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "July"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "August"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "September"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "October"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "November"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "December"
 msgstr ""
 
@@ -131,7 +131,7 @@ msgstr "Førespurt"
 msgid "Login failed!"
 msgstr "Feil ved innlogging!"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:26
 #: templates/login.php:9
 msgid "Username"
 msgstr "Brukarnamn"
@@ -192,48 +192,52 @@ msgstr ""
 msgid "Add"
 msgstr ""
 
-#: templates/installation.php:23
+#: templates/installation.php:24
 msgid "Create an <strong>admin account</strong>"
 msgstr "Lag ein <strong>admin-konto</strong>"
 
-#: templates/installation.php:29 templates/login.php:13
+#: templates/installation.php:30 templates/login.php:13
 msgid "Password"
 msgstr "Passord"
 
-#: templates/installation.php:35
+#: templates/installation.php:36
 msgid "Advanced"
 msgstr "Avansert"
 
-#: templates/installation.php:37
+#: templates/installation.php:38
 msgid "Data folder"
 msgstr "Datamappe"
 
-#: templates/installation.php:44
+#: templates/installation.php:45
 msgid "Configure the database"
 msgstr "Konfigurer databasen"
 
-#: templates/installation.php:49 templates/installation.php:60
-#: templates/installation.php:70
+#: templates/installation.php:50 templates/installation.php:61
+#: templates/installation.php:71 templates/installation.php:81
 msgid "will be used"
 msgstr "vil bli nytta"
 
-#: templates/installation.php:82
+#: templates/installation.php:93
 msgid "Database user"
 msgstr "Databasebrukar"
 
-#: templates/installation.php:86
+#: templates/installation.php:97
 msgid "Database password"
 msgstr "Databasepassord"
 
-#: templates/installation.php:90
+#: templates/installation.php:101
 msgid "Database name"
 msgstr "Databasenamn"
 
-#: templates/installation.php:96
+#: templates/installation.php:109
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:115
 msgid "Database host"
 msgstr "Databasetenar"
 
-#: templates/installation.php:101
+#: templates/installation.php:120
 msgid "Finish setup"
 msgstr "Fullfør oppsettet"
 
diff --git a/l10n/pl/core.po b/l10n/pl/core.po
index ea413953c7..35a5dfd637 100644
--- a/l10n/pl/core.po
+++ b/l10n/pl/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-26 19:46+0200\n"
+"PO-Revision-Date: 2012-08-26 17:34+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"
@@ -39,55 +39,55 @@ msgstr "Ta kategoria już istnieje"
 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 "Ustawienia"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "January"
 msgstr "Styczeń"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "February"
 msgstr "Luty"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "March"
 msgstr "Marzec"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "April"
 msgstr "Kwiecień"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "May"
 msgstr "Maj"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "June"
 msgstr "Czerwiec"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "July"
 msgstr "Lipiec"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "August"
 msgstr "Sierpień"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "September"
 msgstr "Wrzesień"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "October"
 msgstr "Październik"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "November"
 msgstr "Listopad"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "December"
 msgstr "Grudzień"
 
@@ -135,7 +135,7 @@ msgstr "Żądane"
 msgid "Login failed!"
 msgstr "Nie udało się zalogować!"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:26
 #: templates/login.php:9
 msgid "Username"
 msgstr "Nazwa użytkownika"
@@ -196,48 +196,52 @@ msgstr "Edytuj kategorię"
 msgid "Add"
 msgstr "Dodaj"
 
-#: templates/installation.php:23
+#: templates/installation.php:24
 msgid "Create an <strong>admin account</strong>"
 msgstr "Tworzenie <strong>konta administratora</strong>"
 
-#: templates/installation.php:29 templates/login.php:13
+#: templates/installation.php:30 templates/login.php:13
 msgid "Password"
 msgstr "Hasło"
 
-#: templates/installation.php:35
+#: templates/installation.php:36
 msgid "Advanced"
 msgstr "Zaawansowane"
 
-#: templates/installation.php:37
+#: templates/installation.php:38
 msgid "Data folder"
 msgstr "Katalog danych"
 
-#: templates/installation.php:44
+#: templates/installation.php:45
 msgid "Configure the database"
 msgstr "Konfiguracja bazy danych"
 
-#: templates/installation.php:49 templates/installation.php:60
-#: templates/installation.php:70
+#: templates/installation.php:50 templates/installation.php:61
+#: templates/installation.php:71 templates/installation.php:81
 msgid "will be used"
 msgstr "zostanie użyte"
 
-#: templates/installation.php:82
+#: templates/installation.php:93
 msgid "Database user"
 msgstr "Użytkownik bazy danych"
 
-#: templates/installation.php:86
+#: templates/installation.php:97
 msgid "Database password"
 msgstr "Hasło do bazy danych"
 
-#: templates/installation.php:90
+#: templates/installation.php:101
 msgid "Database name"
 msgstr "Nazwa bazy danych"
 
-#: templates/installation.php:96
+#: templates/installation.php:109
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:115
 msgid "Database host"
 msgstr "Komputer bazy danych"
 
-#: templates/installation.php:101
+#: templates/installation.php:120
 msgid "Finish setup"
 msgstr "Zakończ konfigurowanie"
 
diff --git a/l10n/pt_BR/core.po b/l10n/pt_BR/core.po
index bdf2c828c3..02716966c1 100644
--- a/l10n/pt_BR/core.po
+++ b/l10n/pt_BR/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-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-26 19:46+0200\n"
+"PO-Revision-Date: 2012-08-26 17:34+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"
@@ -38,55 +38,55 @@ msgstr "Essa categoria já 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 "Configurações"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "January"
 msgstr "Janeiro"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "February"
 msgstr "Fevereiro"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "March"
 msgstr "Março"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "April"
 msgstr "Abril"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "May"
 msgstr "Maio"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "June"
 msgstr "Junho"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "July"
 msgstr "Julho"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "August"
 msgstr "Agosto"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "September"
 msgstr "Setembro"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "October"
 msgstr "Outubro"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "November"
 msgstr "Novembro"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "December"
 msgstr "Dezembro"
 
@@ -134,7 +134,7 @@ msgstr "Solicitado"
 msgid "Login failed!"
 msgstr "Falha ao fazer o login!"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:26
 #: templates/login.php:9
 msgid "Username"
 msgstr "Nome de Usuário"
@@ -195,48 +195,52 @@ msgstr "Editar categorias"
 msgid "Add"
 msgstr "Adicionar"
 
-#: templates/installation.php:23
+#: templates/installation.php:24
 msgid "Create an <strong>admin account</strong>"
 msgstr "Criar uma <strong>conta</strong> de <strong>administrador</strong>"
 
-#: templates/installation.php:29 templates/login.php:13
+#: templates/installation.php:30 templates/login.php:13
 msgid "Password"
 msgstr "Senha"
 
-#: templates/installation.php:35
+#: templates/installation.php:36
 msgid "Advanced"
 msgstr "Avançado"
 
-#: templates/installation.php:37
+#: templates/installation.php:38
 msgid "Data folder"
 msgstr "Pasta de dados"
 
-#: templates/installation.php:44
+#: templates/installation.php:45
 msgid "Configure the database"
 msgstr "Configurar o banco de dados"
 
-#: templates/installation.php:49 templates/installation.php:60
-#: templates/installation.php:70
+#: templates/installation.php:50 templates/installation.php:61
+#: templates/installation.php:71 templates/installation.php:81
 msgid "will be used"
 msgstr "será usado"
 
-#: templates/installation.php:82
+#: templates/installation.php:93
 msgid "Database user"
 msgstr "Usuário de banco de dados"
 
-#: templates/installation.php:86
+#: templates/installation.php:97
 msgid "Database password"
 msgstr "Senha do banco de dados"
 
-#: templates/installation.php:90
+#: templates/installation.php:101
 msgid "Database name"
 msgstr "Nome do banco de dados"
 
-#: templates/installation.php:96
+#: templates/installation.php:109
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:115
 msgid "Database host"
 msgstr "Banco de dados do host"
 
-#: templates/installation.php:101
+#: templates/installation.php:120
 msgid "Finish setup"
 msgstr "Concluir configuração"
 
diff --git a/l10n/pt_PT/core.po b/l10n/pt_PT/core.po
index 18fae557ab..9c12940bfb 100644
--- a/l10n/pt_PT/core.po
+++ b/l10n/pt_PT/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-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-26 19:46+0200\n"
+"PO-Revision-Date: 2012-08-26 17:34+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"
@@ -36,55 +36,55 @@ msgstr "Esta categoria já 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 "Definições"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "January"
 msgstr "Janeiro"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "February"
 msgstr "Fevereiro"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "March"
 msgstr "Março"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "April"
 msgstr "Abril"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "May"
 msgstr "Maio"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "June"
 msgstr "Junho"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "July"
 msgstr "Julho"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "August"
 msgstr "Agosto"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "September"
 msgstr "Setembro"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "October"
 msgstr "Outubro"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "November"
 msgstr "Novembro"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "December"
 msgstr "Dezembro"
 
@@ -132,7 +132,7 @@ msgstr "Pedido"
 msgid "Login failed!"
 msgstr "Conexão falhado!"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:26
 #: templates/login.php:9
 msgid "Username"
 msgstr "Utilizador"
@@ -193,48 +193,52 @@ msgstr "Editar categorias"
 msgid "Add"
 msgstr "Adicionar"
 
-#: templates/installation.php:23
+#: templates/installation.php:24
 msgid "Create an <strong>admin account</strong>"
 msgstr "Criar uma <strong>conta administrativa</strong>"
 
-#: templates/installation.php:29 templates/login.php:13
+#: templates/installation.php:30 templates/login.php:13
 msgid "Password"
 msgstr "Palavra chave"
 
-#: templates/installation.php:35
+#: templates/installation.php:36
 msgid "Advanced"
 msgstr "Avançado"
 
-#: templates/installation.php:37
+#: templates/installation.php:38
 msgid "Data folder"
 msgstr "Pasta de dados"
 
-#: templates/installation.php:44
+#: templates/installation.php:45
 msgid "Configure the database"
 msgstr "Configure a base de dados"
 
-#: templates/installation.php:49 templates/installation.php:60
-#: templates/installation.php:70
+#: templates/installation.php:50 templates/installation.php:61
+#: templates/installation.php:71 templates/installation.php:81
 msgid "will be used"
 msgstr "vai ser usada"
 
-#: templates/installation.php:82
+#: templates/installation.php:93
 msgid "Database user"
 msgstr "Utilizador da base de dados"
 
-#: templates/installation.php:86
+#: templates/installation.php:97
 msgid "Database password"
 msgstr "Password da base de dados"
 
-#: templates/installation.php:90
+#: templates/installation.php:101
 msgid "Database name"
 msgstr "Nome da base de dados"
 
-#: templates/installation.php:96
+#: templates/installation.php:109
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:115
 msgid "Database host"
 msgstr "Host da base de dados"
 
-#: templates/installation.php:101
+#: templates/installation.php:120
 msgid "Finish setup"
 msgstr "Acabar instalação"
 
diff --git a/l10n/ro/core.po b/l10n/ro/core.po
index 5a733b5eb1..d9c537033c 100644
--- a/l10n/ro/core.po
+++ b/l10n/ro/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-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-26 19:46+0200\n"
+"PO-Revision-Date: 2012-08-26 17:34+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"
@@ -36,55 +36,55 @@ msgstr "Această categorie deja există:"
 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 "Configurări"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "January"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "February"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "March"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "April"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "May"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "June"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "July"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "August"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "September"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "October"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "November"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "December"
 msgstr ""
 
@@ -132,7 +132,7 @@ msgstr "Solicitat"
 msgid "Login failed!"
 msgstr "Autentificare eșuată"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:26
 #: templates/login.php:9
 msgid "Username"
 msgstr "Utilizator"
@@ -193,48 +193,52 @@ msgstr "Editează categoriile"
 msgid "Add"
 msgstr "Adaugă"
 
-#: templates/installation.php:23
+#: templates/installation.php:24
 msgid "Create an <strong>admin account</strong>"
 msgstr "Crează un <strong>cont de administrator</strong>"
 
-#: templates/installation.php:29 templates/login.php:13
+#: templates/installation.php:30 templates/login.php:13
 msgid "Password"
 msgstr "Parola"
 
-#: templates/installation.php:35
+#: templates/installation.php:36
 msgid "Advanced"
 msgstr "Avansat"
 
-#: templates/installation.php:37
+#: templates/installation.php:38
 msgid "Data folder"
 msgstr "Director date"
 
-#: templates/installation.php:44
+#: templates/installation.php:45
 msgid "Configure the database"
 msgstr "Configurează baza de date"
 
-#: templates/installation.php:49 templates/installation.php:60
-#: templates/installation.php:70
+#: templates/installation.php:50 templates/installation.php:61
+#: templates/installation.php:71 templates/installation.php:81
 msgid "will be used"
 msgstr "vor fi folosite"
 
-#: templates/installation.php:82
+#: templates/installation.php:93
 msgid "Database user"
 msgstr "Utilizatorul bazei de date"
 
-#: templates/installation.php:86
+#: templates/installation.php:97
 msgid "Database password"
 msgstr "Parola bazei de date"
 
-#: templates/installation.php:90
+#: templates/installation.php:101
 msgid "Database name"
 msgstr "Numele bazei de date"
 
-#: templates/installation.php:96
+#: templates/installation.php:109
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:115
 msgid "Database host"
 msgstr "Bază date"
 
-#: templates/installation.php:101
+#: templates/installation.php:120
 msgid "Finish setup"
 msgstr "Finalizează instalarea"
 
diff --git a/l10n/ru/core.po b/l10n/ru/core.po
index eb287d6988..9b0a792abe 100644
--- a/l10n/ru/core.po
+++ b/l10n/ru/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-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-26 19:46+0200\n"
+"PO-Revision-Date: 2012-08-26 17:34+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"
@@ -37,55 +37,55 @@ msgstr "Эта категория уже существует: "
 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 "Настройки"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "January"
 msgstr "Январь"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "February"
 msgstr "Февраль"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "March"
 msgstr "Март"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "April"
 msgstr "Апрель"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "May"
 msgstr "Май"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "June"
 msgstr "Июнь"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "July"
 msgstr "Июль"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "August"
 msgstr "Август"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "September"
 msgstr "Сентябрь"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "October"
 msgstr "Октябрь"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "November"
 msgstr "Ноябрь"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "December"
 msgstr "Декабрь"
 
@@ -133,7 +133,7 @@ msgstr "Запрошено"
 msgid "Login failed!"
 msgstr "Не удалось войти!"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:26
 #: templates/login.php:9
 msgid "Username"
 msgstr "Имя пользователя"
@@ -194,48 +194,52 @@ msgstr "Редактировать категории"
 msgid "Add"
 msgstr "Добавить"
 
-#: templates/installation.php:23
+#: templates/installation.php:24
 msgid "Create an <strong>admin account</strong>"
 msgstr "Создать <strong>учётную запись администратора</strong>"
 
-#: templates/installation.php:29 templates/login.php:13
+#: templates/installation.php:30 templates/login.php:13
 msgid "Password"
 msgstr "Пароль"
 
-#: templates/installation.php:35
+#: templates/installation.php:36
 msgid "Advanced"
 msgstr "Дополнительно"
 
-#: templates/installation.php:37
+#: templates/installation.php:38
 msgid "Data folder"
 msgstr "Директория с данными"
 
-#: templates/installation.php:44
+#: templates/installation.php:45
 msgid "Configure the database"
 msgstr "Настройка базы данных"
 
-#: templates/installation.php:49 templates/installation.php:60
-#: templates/installation.php:70
+#: templates/installation.php:50 templates/installation.php:61
+#: templates/installation.php:71 templates/installation.php:81
 msgid "will be used"
 msgstr "будет использовано"
 
-#: templates/installation.php:82
+#: templates/installation.php:93
 msgid "Database user"
 msgstr "Имя пользователя для базы данных"
 
-#: templates/installation.php:86
+#: templates/installation.php:97
 msgid "Database password"
 msgstr "Пароль для базы данных"
 
-#: templates/installation.php:90
+#: templates/installation.php:101
 msgid "Database name"
 msgstr "Название базы данных"
 
-#: templates/installation.php:96
+#: templates/installation.php:109
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:115
 msgid "Database host"
 msgstr "Хост базы данных"
 
-#: templates/installation.php:101
+#: templates/installation.php:120
 msgid "Finish setup"
 msgstr "Завершить установку"
 
diff --git a/l10n/sk_SK/core.po b/l10n/sk_SK/core.po
index 42eb519975..80b985b04c 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-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-26 19:46+0200\n"
+"PO-Revision-Date: 2012-08-26 17:34+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"
@@ -35,55 +35,55 @@ msgstr "Táto kategória už existuje:"
 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 "Nastavenia"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "January"
 msgstr "Január"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "February"
 msgstr "Február"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "March"
 msgstr "Marec"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "April"
 msgstr "Apríl"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "May"
 msgstr "Máj"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "June"
 msgstr "Jún"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "July"
 msgstr "Júl"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "August"
 msgstr "August"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "September"
 msgstr "September"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "October"
 msgstr "Október"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "November"
 msgstr "November"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "December"
 msgstr "December"
 
@@ -131,7 +131,7 @@ msgstr "Požiadané"
 msgid "Login failed!"
 msgstr "Prihlásenie zlyhalo!"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:26
 #: templates/login.php:9
 msgid "Username"
 msgstr "Prihlasovacie meno"
@@ -192,48 +192,52 @@ msgstr "Úprava kategórií"
 msgid "Add"
 msgstr "Pridať"
 
-#: templates/installation.php:23
+#: templates/installation.php:24
 msgid "Create an <strong>admin account</strong>"
 msgstr "Vytvoriť <strong>administrátorský účet</strong>"
 
-#: templates/installation.php:29 templates/login.php:13
+#: templates/installation.php:30 templates/login.php:13
 msgid "Password"
 msgstr "Heslo"
 
-#: templates/installation.php:35
+#: templates/installation.php:36
 msgid "Advanced"
 msgstr "Pokročilé"
 
-#: templates/installation.php:37
+#: templates/installation.php:38
 msgid "Data folder"
 msgstr "Priečinok dát"
 
-#: templates/installation.php:44
+#: templates/installation.php:45
 msgid "Configure the database"
 msgstr "Nastaviť databázu"
 
-#: templates/installation.php:49 templates/installation.php:60
-#: templates/installation.php:70
+#: templates/installation.php:50 templates/installation.php:61
+#: templates/installation.php:71 templates/installation.php:81
 msgid "will be used"
 msgstr "bude použité"
 
-#: templates/installation.php:82
+#: templates/installation.php:93
 msgid "Database user"
 msgstr "Hostiteľ databázy"
 
-#: templates/installation.php:86
+#: templates/installation.php:97
 msgid "Database password"
 msgstr "Heslo databázy"
 
-#: templates/installation.php:90
+#: templates/installation.php:101
 msgid "Database name"
 msgstr "Meno databázy"
 
-#: templates/installation.php:96
+#: templates/installation.php:109
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:115
 msgid "Database host"
 msgstr "Server databázy"
 
-#: templates/installation.php:101
+#: templates/installation.php:120
 msgid "Finish setup"
 msgstr "Dokončiť inštaláciu"
 
diff --git a/l10n/sl/core.po b/l10n/sl/core.po
index c3f2d15c36..494b4e3751 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-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-26 19:46+0200\n"
+"PO-Revision-Date: 2012-08-26 17:34+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"
@@ -36,55 +36,55 @@ msgstr "Ta kategorija že obstaja:"
 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 "Nastavitve"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "January"
 msgstr "januar"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "February"
 msgstr "februar"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "March"
 msgstr "marec"
 
-#: 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 "junij"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "July"
 msgstr "julij"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "August"
 msgstr "avgust"
 
-#: 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 +132,7 @@ msgstr "Zahtevano"
 msgid "Login failed!"
 msgstr "Prijava je spodletela!"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:26
 #: templates/login.php:9
 msgid "Username"
 msgstr "Uporabniško Ime"
@@ -193,48 +193,52 @@ msgstr "Uredi kategorije"
 msgid "Add"
 msgstr "Dodaj"
 
-#: templates/installation.php:23
+#: templates/installation.php:24
 msgid "Create an <strong>admin account</strong>"
 msgstr "Ustvari <strong>skrbniški račun</strong>"
 
-#: templates/installation.php:29 templates/login.php:13
+#: templates/installation.php:30 templates/login.php:13
 msgid "Password"
 msgstr "Geslo"
 
-#: templates/installation.php:35
+#: templates/installation.php:36
 msgid "Advanced"
 msgstr "Napredne možnosti"
 
-#: templates/installation.php:37
+#: templates/installation.php:38
 msgid "Data folder"
 msgstr "Mapa s podatki"
 
-#: templates/installation.php:44
+#: templates/installation.php:45
 msgid "Configure the database"
 msgstr "Nastavi podatkovno zbirko"
 
-#: templates/installation.php:49 templates/installation.php:60
-#: templates/installation.php:70
+#: templates/installation.php:50 templates/installation.php:61
+#: templates/installation.php:71 templates/installation.php:81
 msgid "will be used"
 msgstr "bo uporabljen"
 
-#: templates/installation.php:82
+#: templates/installation.php:93
 msgid "Database user"
 msgstr "Uporabnik zbirke"
 
-#: templates/installation.php:86
+#: templates/installation.php:97
 msgid "Database password"
 msgstr "Geslo podatkovne zbirke"
 
-#: templates/installation.php:90
+#: templates/installation.php:101
 msgid "Database name"
 msgstr "Ime podatkovne zbirke"
 
-#: templates/installation.php:96
+#: templates/installation.php:109
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:115
 msgid "Database host"
 msgstr "Gostitelj podatkovne zbirke"
 
-#: templates/installation.php:101
+#: templates/installation.php:120
 msgid "Finish setup"
 msgstr "Dokončaj namestitev"
 
diff --git a/l10n/so/core.po b/l10n/so/core.po
index 81021ac3e6..2f16229b5d 100644
--- a/l10n/so/core.po
+++ b/l10n/so/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-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-26 19:46+0200\n"
+"PO-Revision-Date: 2012-08-26 17:34+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"
@@ -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:573
+#: js/js.js:575
 msgid "January"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "February"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "March"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "April"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "May"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "June"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "July"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "August"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "September"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "October"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "November"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "December"
 msgstr ""
 
@@ -129,7 +129,7 @@ msgstr ""
 msgid "Login failed!"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:26
 #: templates/login.php:9
 msgid "Username"
 msgstr ""
@@ -190,48 +190,52 @@ msgstr ""
 msgid "Add"
 msgstr ""
 
-#: templates/installation.php:23
+#: templates/installation.php:24
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
-#: templates/installation.php:29 templates/login.php:13
+#: templates/installation.php:30 templates/login.php:13
 msgid "Password"
 msgstr ""
 
-#: templates/installation.php:35
+#: templates/installation.php:36
 msgid "Advanced"
 msgstr ""
 
-#: templates/installation.php:37
+#: templates/installation.php:38
 msgid "Data folder"
 msgstr ""
 
-#: templates/installation.php:44
+#: templates/installation.php:45
 msgid "Configure the database"
 msgstr ""
 
-#: templates/installation.php:49 templates/installation.php:60
-#: templates/installation.php:70
+#: templates/installation.php:50 templates/installation.php:61
+#: templates/installation.php:71 templates/installation.php:81
 msgid "will be used"
 msgstr ""
 
-#: templates/installation.php:82
+#: templates/installation.php:93
 msgid "Database user"
 msgstr ""
 
-#: templates/installation.php:86
+#: templates/installation.php:97
 msgid "Database password"
 msgstr ""
 
-#: templates/installation.php:90
+#: templates/installation.php:101
 msgid "Database name"
 msgstr ""
 
-#: templates/installation.php:96
+#: templates/installation.php:109
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:115
 msgid "Database host"
 msgstr ""
 
-#: templates/installation.php:101
+#: templates/installation.php:120
 msgid "Finish setup"
 msgstr ""
 
diff --git a/l10n/sr/core.po b/l10n/sr/core.po
index 58a7f8706a..fc0e29791f 100644
--- a/l10n/sr/core.po
+++ b/l10n/sr/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-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-26 19:46+0200\n"
+"PO-Revision-Date: 2012-08-26 17:34+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"
@@ -34,55 +34,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:573
+#: js/js.js:575
 msgid "January"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "February"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "March"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "April"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "May"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "June"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "July"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "August"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "September"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "October"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "November"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "December"
 msgstr ""
 
@@ -130,7 +130,7 @@ msgstr "Захтевано"
 msgid "Login failed!"
 msgstr "Несупела пријава!"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:26
 #: templates/login.php:9
 msgid "Username"
 msgstr "Корисничко име"
@@ -191,48 +191,52 @@ msgstr ""
 msgid "Add"
 msgstr ""
 
-#: templates/installation.php:23
+#: templates/installation.php:24
 msgid "Create an <strong>admin account</strong>"
 msgstr "Направи <strong>административни налог</strong>"
 
-#: templates/installation.php:29 templates/login.php:13
+#: templates/installation.php:30 templates/login.php:13
 msgid "Password"
 msgstr "Лозинка"
 
-#: templates/installation.php:35
+#: templates/installation.php:36
 msgid "Advanced"
 msgstr "Напредно"
 
-#: templates/installation.php:37
+#: templates/installation.php:38
 msgid "Data folder"
 msgstr "Фацикла података"
 
-#: templates/installation.php:44
+#: templates/installation.php:45
 msgid "Configure the database"
 msgstr "Подешавање базе"
 
-#: templates/installation.php:49 templates/installation.php:60
-#: templates/installation.php:70
+#: templates/installation.php:50 templates/installation.php:61
+#: templates/installation.php:71 templates/installation.php:81
 msgid "will be used"
 msgstr "ће бити коришћен"
 
-#: templates/installation.php:82
+#: templates/installation.php:93
 msgid "Database user"
 msgstr "Корисник базе"
 
-#: templates/installation.php:86
+#: templates/installation.php:97
 msgid "Database password"
 msgstr "Лозинка базе"
 
-#: templates/installation.php:90
+#: templates/installation.php:101
 msgid "Database name"
 msgstr "Име базе"
 
-#: templates/installation.php:96
+#: templates/installation.php:109
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:115
 msgid "Database host"
 msgstr "Домаћин базе"
 
-#: templates/installation.php:101
+#: templates/installation.php:120
 msgid "Finish setup"
 msgstr "Заврши подешавање"
 
diff --git a/l10n/sr@latin/core.po b/l10n/sr@latin/core.po
index 4577fbf12d..96ce2de0a2 100644
--- a/l10n/sr@latin/core.po
+++ b/l10n/sr@latin/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-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-26 19:46+0200\n"
+"PO-Revision-Date: 2012-08-26 17:34+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"
@@ -34,55 +34,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 "Podešavanja"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "January"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "February"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "March"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "April"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "May"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "June"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "July"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "August"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "September"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "October"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "November"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "December"
 msgstr ""
 
@@ -130,7 +130,7 @@ msgstr "Zahtevano"
 msgid "Login failed!"
 msgstr "Nesupela prijava!"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:26
 #: templates/login.php:9
 msgid "Username"
 msgstr "Korisničko ime"
@@ -191,48 +191,52 @@ msgstr ""
 msgid "Add"
 msgstr ""
 
-#: templates/installation.php:23
+#: templates/installation.php:24
 msgid "Create an <strong>admin account</strong>"
 msgstr "Napravi <strong>administrativni nalog</strong>"
 
-#: templates/installation.php:29 templates/login.php:13
+#: templates/installation.php:30 templates/login.php:13
 msgid "Password"
 msgstr "Lozinka"
 
-#: templates/installation.php:35
+#: templates/installation.php:36
 msgid "Advanced"
 msgstr "Napredno"
 
-#: templates/installation.php:37
+#: templates/installation.php:38
 msgid "Data folder"
 msgstr "Facikla podataka"
 
-#: templates/installation.php:44
+#: templates/installation.php:45
 msgid "Configure the database"
 msgstr "Podešavanje baze"
 
-#: templates/installation.php:49 templates/installation.php:60
-#: templates/installation.php:70
+#: templates/installation.php:50 templates/installation.php:61
+#: templates/installation.php:71 templates/installation.php:81
 msgid "will be used"
 msgstr "će biti korišćen"
 
-#: templates/installation.php:82
+#: templates/installation.php:93
 msgid "Database user"
 msgstr "Korisnik baze"
 
-#: templates/installation.php:86
+#: templates/installation.php:97
 msgid "Database password"
 msgstr "Lozinka baze"
 
-#: templates/installation.php:90
+#: templates/installation.php:101
 msgid "Database name"
 msgstr "Ime baze"
 
-#: templates/installation.php:96
+#: templates/installation.php:109
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:115
 msgid "Database host"
 msgstr "Domaćin baze"
 
-#: templates/installation.php:101
+#: templates/installation.php:120
 msgid "Finish setup"
 msgstr "Završi podešavanje"
 
diff --git a/l10n/sv/core.po b/l10n/sv/core.po
index 92631fa760..35f6b90231 100644
--- a/l10n/sv/core.po
+++ b/l10n/sv/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-22 02:04+0200\n"
-"PO-Revision-Date: 2012-08-21 08:33+0000\n"
-"Last-Translator: Magnus Höglund <magnus@linux.com>\n"
+"POT-Creation-Date: 2012-08-26 19:46+0200\n"
+"PO-Revision-Date: 2012-08-26 17:34+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"
@@ -135,7 +135,7 @@ msgstr "Begärd"
 msgid "Login failed!"
 msgstr "Misslyckad inloggning!"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:26
 #: templates/login.php:9
 msgid "Username"
 msgstr "Användarnamn"
@@ -196,48 +196,52 @@ msgstr "Redigera kategorier"
 msgid "Add"
 msgstr "Lägg till"
 
-#: templates/installation.php:23
+#: templates/installation.php:24
 msgid "Create an <strong>admin account</strong>"
 msgstr "Skapa ett <strong>administratörskonto</strong>"
 
-#: templates/installation.php:29 templates/login.php:13
+#: templates/installation.php:30 templates/login.php:13
 msgid "Password"
 msgstr "Lösenord"
 
-#: templates/installation.php:35
+#: templates/installation.php:36
 msgid "Advanced"
 msgstr "Avancerat"
 
-#: templates/installation.php:37
+#: templates/installation.php:38
 msgid "Data folder"
 msgstr "Datamapp"
 
-#: templates/installation.php:44
+#: templates/installation.php:45
 msgid "Configure the database"
 msgstr "Konfigurera databasen"
 
-#: templates/installation.php:49 templates/installation.php:60
-#: templates/installation.php:70
+#: templates/installation.php:50 templates/installation.php:61
+#: templates/installation.php:71 templates/installation.php:81
 msgid "will be used"
 msgstr "kommer att användas"
 
-#: templates/installation.php:82
+#: templates/installation.php:93
 msgid "Database user"
 msgstr "Databasanvändare"
 
-#: templates/installation.php:86
+#: templates/installation.php:97
 msgid "Database password"
 msgstr "Lösenord till databasen"
 
-#: templates/installation.php:90
+#: templates/installation.php:101
 msgid "Database name"
 msgstr "Databasnamn"
 
-#: templates/installation.php:96
+#: templates/installation.php:109
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:115
 msgid "Database host"
 msgstr "Databasserver"
 
-#: templates/installation.php:101
+#: templates/installation.php:120
 msgid "Finish setup"
 msgstr "Avsluta installation"
 
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index 67016dbb6f..167efeaacc 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-26 02:18+0200\n"
+"POT-Creation-Date: 2012-08-26 19:46+0200\n"
 "PO-Revision-Date: YEAR-MO-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 af4b2cbc6a..98bb4431dd 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-26 02:18+0200\n"
+"POT-Creation-Date: 2012-08-26 19:46+0200\n"
 "PO-Revision-Date: YEAR-MO-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 bbbe0f1303..458070d51b 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-26 02:18+0200\n"
+"POT-Creation-Date: 2012-08-26 19:46+0200\n"
 "PO-Revision-Date: YEAR-MO-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 11a62be5ff..b243a439bf 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-26 02:18+0200\n"
+"POT-Creation-Date: 2012-08-26 19:46+0200\n"
 "PO-Revision-Date: YEAR-MO-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 7116f39d69..727e809308 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-26 02:18+0200\n"
+"POT-Creation-Date: 2012-08-26 19:46+0200\n"
 "PO-Revision-Date: YEAR-MO-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_texteditor.pot b/l10n/templates/files_texteditor.pot
deleted file mode 100644
index c2f6c82b6d..0000000000
--- a/l10n/templates/files_texteditor.pot
+++ /dev/null
@@ -1,44 +0,0 @@
-# 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-26 02:18+0200\n"
-"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/aceeditor/mode-coldfusion-uncompressed.js:1568
-#: js/aceeditor/mode-liquid-uncompressed.js:902
-#: js/aceeditor/mode-svg-uncompressed.js:1575
-msgid "regex"
-msgstr ""
-
-#: js/editor.js:72 js/editor.js:156 js/editor.js:163
-msgid "Save"
-msgstr ""
-
-#: js/editor.js:74
-msgid "Close"
-msgstr ""
-
-#: js/editor.js:149
-msgid "Saving..."
-msgstr ""
-
-#: js/editor.js:239
-msgid "An error occurred!"
-msgstr ""
-
-#: js/editor.js:266
-msgid "There were unsaved changes, click here to go back"
-msgstr ""
diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot
index 5f3e376707..03f3305e8a 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-26 02:18+0200\n"
+"POT-Creation-Date: 2012-08-26 19:46+0200\n"
 "PO-Revision-Date: YEAR-MO-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 2f9a28cc2b..a8ec127784 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-26 02:18+0200\n"
+"POT-Creation-Date: 2012-08-26 19:46+0200\n"
 "PO-Revision-Date: YEAR-MO-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 5b2d1fb3a7..5734e6e22e 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-26 02:18+0200\n"
+"POT-Creation-Date: 2012-08-26 19:46+0200\n"
 "PO-Revision-Date: YEAR-MO-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 07c0d399e6..4dfbfc672a 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-26 02:18+0200\n"
+"POT-Creation-Date: 2012-08-26 19:46+0200\n"
 "PO-Revision-Date: YEAR-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/core.po b/l10n/th_TH/core.po
index 4a078f8330..0d0212cdd6 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-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-26 19:46+0200\n"
+"PO-Revision-Date: 2012-08-26 17:34+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"
@@ -35,55 +35,55 @@ msgstr "หมวดหมู่นี้มีอยู่แล้ว: "
 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 "ตั้งค่า"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "January"
 msgstr "มกราคม"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "February"
 msgstr "กุมภาพันธ์"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "March"
 msgstr "มีนาคม"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "April"
 msgstr "เมษายน"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "May"
 msgstr "พฤษภาคม"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "June"
 msgstr "มิถุนายน"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "July"
 msgstr "กรกฏาคม"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "August"
 msgstr "สิงหาคม"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "September"
 msgstr "กันยายน"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "October"
 msgstr "ตุลาคม"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "November"
 msgstr "พฤศจิกายน"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "December"
 msgstr "ธันวาคม"
 
@@ -131,7 +131,7 @@ msgstr "ส่งคำร้องเรียบร้อยแล้ว"
 msgid "Login failed!"
 msgstr "ไม่สามารถเข้าสู่ระบบได้!"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:26
 #: templates/login.php:9
 msgid "Username"
 msgstr "ชื่อผู้ใช้งาน"
@@ -192,48 +192,52 @@ msgstr "แก้ไขหมวดหมู่"
 msgid "Add"
 msgstr "เพิ่ม"
 
-#: templates/installation.php:23
+#: templates/installation.php:24
 msgid "Create an <strong>admin account</strong>"
 msgstr "สร้าง <strong>บัญชีผู้ดูแลระบบ</strong>"
 
-#: templates/installation.php:29 templates/login.php:13
+#: templates/installation.php:30 templates/login.php:13
 msgid "Password"
 msgstr "รหัสผ่าน"
 
-#: templates/installation.php:35
+#: templates/installation.php:36
 msgid "Advanced"
 msgstr "ขั้นสูง"
 
-#: templates/installation.php:37
+#: templates/installation.php:38
 msgid "Data folder"
 msgstr "โฟลเดอร์เก็บข้อมูล"
 
-#: templates/installation.php:44
+#: templates/installation.php:45
 msgid "Configure the database"
 msgstr "กำหนดค่าฐานข้อมูล"
 
-#: templates/installation.php:49 templates/installation.php:60
-#: templates/installation.php:70
+#: templates/installation.php:50 templates/installation.php:61
+#: templates/installation.php:71 templates/installation.php:81
 msgid "will be used"
 msgstr "จะถูกใช้"
 
-#: templates/installation.php:82
+#: templates/installation.php:93
 msgid "Database user"
 msgstr "ชื่อผู้ใช้งานฐานข้อมูล"
 
-#: templates/installation.php:86
+#: templates/installation.php:97
 msgid "Database password"
 msgstr "รหัสผ่านฐานข้อมูล"
 
-#: templates/installation.php:90
+#: templates/installation.php:101
 msgid "Database name"
 msgstr "ชื่อฐานข้อมูล"
 
-#: templates/installation.php:96
+#: templates/installation.php:109
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:115
 msgid "Database host"
 msgstr "Database host"
 
-#: templates/installation.php:101
+#: templates/installation.php:120
 msgid "Finish setup"
 msgstr "ติดตั้งเรียบร้อยแล้ว"
 
diff --git a/l10n/tr/core.po b/l10n/tr/core.po
index 06136c97ff..43db29c91c 100644
--- a/l10n/tr/core.po
+++ b/l10n/tr/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-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-26 19:46+0200\n"
+"PO-Revision-Date: 2012-08-26 17:34+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"
@@ -35,55 +35,55 @@ msgstr "Bu kategori zaten mevcut: "
 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 "Ayarlar"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "January"
 msgstr "Ocak"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "February"
 msgstr "Şubat"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "March"
 msgstr "Mart"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "April"
 msgstr "Nisan"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "May"
 msgstr "Mayıs"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "June"
 msgstr "Haziran"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "July"
 msgstr "Temmuz"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "August"
 msgstr "Ağustos"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "September"
 msgstr "Eylül"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "October"
 msgstr "Ekim"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "November"
 msgstr "Kasım"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "December"
 msgstr "Aralık"
 
@@ -131,7 +131,7 @@ msgstr "İstendi"
 msgid "Login failed!"
 msgstr "Giriş başarısız!"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:26
 #: templates/login.php:9
 msgid "Username"
 msgstr "Kullanıcı adı"
@@ -192,48 +192,52 @@ msgstr "Kategorileri düzenle"
 msgid "Add"
 msgstr "Ekle"
 
-#: templates/installation.php:23
+#: templates/installation.php:24
 msgid "Create an <strong>admin account</strong>"
 msgstr "Bir <strong>yönetici hesabı</strong> oluşturun"
 
-#: templates/installation.php:29 templates/login.php:13
+#: templates/installation.php:30 templates/login.php:13
 msgid "Password"
 msgstr "Parola"
 
-#: templates/installation.php:35
+#: templates/installation.php:36
 msgid "Advanced"
 msgstr "Gelişmiş"
 
-#: templates/installation.php:37
+#: templates/installation.php:38
 msgid "Data folder"
 msgstr "Veri klasörü"
 
-#: templates/installation.php:44
+#: templates/installation.php:45
 msgid "Configure the database"
 msgstr "Veritabanını ayarla"
 
-#: templates/installation.php:49 templates/installation.php:60
-#: templates/installation.php:70
+#: templates/installation.php:50 templates/installation.php:61
+#: templates/installation.php:71 templates/installation.php:81
 msgid "will be used"
 msgstr "kullanılacak"
 
-#: templates/installation.php:82
+#: templates/installation.php:93
 msgid "Database user"
 msgstr "Veritabanı kullanıcı adı"
 
-#: templates/installation.php:86
+#: templates/installation.php:97
 msgid "Database password"
 msgstr "Veritabanı parolası"
 
-#: templates/installation.php:90
+#: templates/installation.php:101
 msgid "Database name"
 msgstr "Veritabanı adı"
 
-#: templates/installation.php:96
+#: templates/installation.php:109
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:115
 msgid "Database host"
 msgstr "Veritabanı sunucusu"
 
-#: templates/installation.php:101
+#: templates/installation.php:120
 msgid "Finish setup"
 msgstr "Kurulumu tamamla"
 
diff --git a/l10n/uk/core.po b/l10n/uk/core.po
index 731e7d912e..7dcbe249b2 100644
--- a/l10n/uk/core.po
+++ b/l10n/uk/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-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-26 19:46+0200\n"
+"PO-Revision-Date: 2012-08-26 17:34+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"
@@ -35,55 +35,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:573
+#: js/js.js:575
 msgid "January"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "February"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "March"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "April"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "May"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "June"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "July"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "August"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "September"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "October"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "November"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "December"
 msgstr ""
 
@@ -131,7 +131,7 @@ msgstr ""
 msgid "Login failed!"
 msgstr ""
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:26
 #: templates/login.php:9
 msgid "Username"
 msgstr "Ім'я користувача"
@@ -192,48 +192,52 @@ msgstr ""
 msgid "Add"
 msgstr ""
 
-#: templates/installation.php:23
+#: templates/installation.php:24
 msgid "Create an <strong>admin account</strong>"
 msgstr ""
 
-#: templates/installation.php:29 templates/login.php:13
+#: templates/installation.php:30 templates/login.php:13
 msgid "Password"
 msgstr "Пароль"
 
-#: templates/installation.php:35
+#: templates/installation.php:36
 msgid "Advanced"
 msgstr ""
 
-#: templates/installation.php:37
+#: templates/installation.php:38
 msgid "Data folder"
 msgstr ""
 
-#: templates/installation.php:44
+#: templates/installation.php:45
 msgid "Configure the database"
 msgstr "Налаштування бази даних"
 
-#: templates/installation.php:49 templates/installation.php:60
-#: templates/installation.php:70
+#: templates/installation.php:50 templates/installation.php:61
+#: templates/installation.php:71 templates/installation.php:81
 msgid "will be used"
 msgstr "буде використано"
 
-#: templates/installation.php:82
+#: templates/installation.php:93
 msgid "Database user"
 msgstr "Користувач бази даних"
 
-#: templates/installation.php:86
+#: templates/installation.php:97
 msgid "Database password"
 msgstr "Пароль для бази даних"
 
-#: templates/installation.php:90
+#: templates/installation.php:101
 msgid "Database name"
 msgstr "Назва бази даних"
 
-#: templates/installation.php:96
+#: templates/installation.php:109
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:115
 msgid "Database host"
 msgstr ""
 
-#: templates/installation.php:101
+#: templates/installation.php:120
 msgid "Finish setup"
 msgstr "Завершити налаштування"
 
diff --git a/l10n/vi/core.po b/l10n/vi/core.po
index 29ceebc712..582a4db6ed 100644
--- a/l10n/vi/core.po
+++ b/l10n/vi/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-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-26 19:46+0200\n"
+"PO-Revision-Date: 2012-08-26 17:34+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"
@@ -34,55 +34,55 @@ 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: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 "Cài đặt"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "January"
 msgstr "Tháng 1"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "February"
 msgstr "Tháng 2"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "March"
 msgstr "Tháng 3"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "April"
 msgstr "Tháng 4"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "May"
 msgstr "Tháng 5"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "June"
 msgstr "Tháng 6"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "July"
 msgstr "Tháng 7"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "August"
 msgstr "Tháng 8"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "September"
 msgstr "Tháng 9"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "October"
 msgstr "Tháng 10"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "November"
 msgstr "Tháng 11"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "December"
 msgstr "Tháng 12"
 
@@ -130,7 +130,7 @@ msgstr "Yêu cầu"
 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
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:26
 #: templates/login.php:9
 msgid "Username"
 msgstr "Tên người dùng"
@@ -191,48 +191,52 @@ msgstr "Sửa thể loại"
 msgid "Add"
 msgstr "Thêm"
 
-#: templates/installation.php:23
+#: templates/installation.php:24
 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
+#: templates/installation.php:30 templates/login.php:13
 msgid "Password"
 msgstr "Mật khẩu"
 
-#: templates/installation.php:35
+#: templates/installation.php:36
 msgid "Advanced"
 msgstr "Nâng cao"
 
-#: templates/installation.php:37
+#: templates/installation.php:38
 msgid "Data folder"
 msgstr "Thư mục dữ liệu"
 
-#: templates/installation.php:44
+#: templates/installation.php:45
 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
+#: templates/installation.php:50 templates/installation.php:61
+#: templates/installation.php:71 templates/installation.php:81
 msgid "will be used"
 msgstr "được sử dụng"
 
-#: templates/installation.php:82
+#: templates/installation.php:93
 msgid "Database user"
 msgstr "Người dùng cơ sở dữ liệu"
 
-#: templates/installation.php:86
+#: templates/installation.php:97
 msgid "Database password"
 msgstr "Mật khẩu cơ sở dữ liệu"
 
-#: templates/installation.php:90
+#: templates/installation.php:101
 msgid "Database name"
 msgstr "Tên cơ sở dữ liệu"
 
-#: templates/installation.php:96
+#: templates/installation.php:109
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:115
 msgid "Database host"
 msgstr "Database host"
 
-#: templates/installation.php:101
+#: templates/installation.php:120
 msgid "Finish setup"
 msgstr "Cài đặt hoàn tất"
 
diff --git a/l10n/zh_CN.GB2312/core.po b/l10n/zh_CN.GB2312/core.po
index ea582cd1c1..39ae538066 100644
--- a/l10n/zh_CN.GB2312/core.po
+++ b/l10n/zh_CN.GB2312/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-08-12 02:02+0200\n"
-"PO-Revision-Date: 2012-08-11 13:54+0000\n"
-"Last-Translator: bluehattree <bluehattree@126.com>\n"
+"POT-Creation-Date: 2012-08-26 19:46+0200\n"
+"PO-Revision-Date: 2012-08-26 17:34+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"
@@ -34,55 +34,55 @@ msgstr "这个分类已经存在了:"
 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 "设置"
 
-#: js/js.js:572
+#: js/js.js:575
 msgid "January"
 msgstr "一月"
 
-#: js/js.js:572
+#: js/js.js:575
 msgid "February"
 msgstr "二月"
 
-#: js/js.js:572
+#: js/js.js:575
 msgid "March"
 msgstr "三月"
 
-#: js/js.js:572
+#: js/js.js:575
 msgid "April"
 msgstr "四月"
 
-#: js/js.js:572
+#: js/js.js:575
 msgid "May"
 msgstr "五月"
 
-#: js/js.js:572
+#: js/js.js:575
 msgid "June"
 msgstr "六月"
 
-#: js/js.js:573
+#: js/js.js:576
 msgid "July"
 msgstr "七月"
 
-#: js/js.js:573
+#: js/js.js:576
 msgid "August"
 msgstr "八月"
 
-#: js/js.js:573
+#: js/js.js:576
 msgid "September"
 msgstr "九月"
 
-#: js/js.js:573
+#: js/js.js:576
 msgid "October"
 msgstr "十月"
 
-#: js/js.js:573
+#: js/js.js:576
 msgid "November"
 msgstr "十一月"
 
-#: js/js.js:573
+#: js/js.js:576
 msgid "December"
 msgstr "十二月"
 
@@ -130,7 +130,7 @@ msgstr "请求"
 msgid "Login failed!"
 msgstr "登陆失败!"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:26
 #: templates/login.php:9
 msgid "Username"
 msgstr "用户名"
@@ -191,48 +191,52 @@ msgstr "编辑分类"
 msgid "Add"
 msgstr "添加"
 
-#: templates/installation.php:23
+#: templates/installation.php:24
 msgid "Create an <strong>admin account</strong>"
 msgstr "建立一个 <strong>管理帐户</strong>"
 
-#: templates/installation.php:29 templates/login.php:13
+#: templates/installation.php:30 templates/login.php:13
 msgid "Password"
 msgstr "密码"
 
-#: templates/installation.php:35
+#: templates/installation.php:36
 msgid "Advanced"
 msgstr "进阶"
 
-#: templates/installation.php:37
+#: templates/installation.php:38
 msgid "Data folder"
 msgstr "数据存放文件夹"
 
-#: templates/installation.php:44
+#: templates/installation.php:45
 msgid "Configure the database"
 msgstr "配置数据库"
 
-#: templates/installation.php:49 templates/installation.php:60
-#: templates/installation.php:70
+#: templates/installation.php:50 templates/installation.php:61
+#: templates/installation.php:71 templates/installation.php:81
 msgid "will be used"
 msgstr "将会使用"
 
-#: templates/installation.php:82
+#: templates/installation.php:93
 msgid "Database user"
 msgstr "数据库用户"
 
-#: templates/installation.php:86
+#: templates/installation.php:97
 msgid "Database password"
 msgstr "数据库密码"
 
-#: templates/installation.php:90
+#: templates/installation.php:101
 msgid "Database name"
 msgstr "数据库用户名"
 
-#: templates/installation.php:96
+#: templates/installation.php:109
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:115
 msgid "Database host"
 msgstr "数据库主机"
 
-#: templates/installation.php:101
+#: templates/installation.php:120
 msgid "Finish setup"
 msgstr "完成安装"
 
diff --git a/l10n/zh_CN/core.po b/l10n/zh_CN/core.po
index bc2b280087..23b0c26730 100644
--- a/l10n/zh_CN/core.po
+++ b/l10n/zh_CN/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-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-26 19:46+0200\n"
+"PO-Revision-Date: 2012-08-26 17:34+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"
@@ -35,55 +35,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:573
+#: js/js.js:575
 msgid "January"
 msgstr "一月"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "February"
 msgstr "二月"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "March"
 msgstr "三月"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "April"
 msgstr "四月"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "May"
 msgstr "五月"
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "June"
 msgstr "六月"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "July"
 msgstr "七月"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "August"
 msgstr "八月"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "September"
 msgstr "九月"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "October"
 msgstr "十月"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "November"
 msgstr "十一月"
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "December"
 msgstr "十二月"
 
@@ -131,7 +131,7 @@ msgstr "已请求"
 msgid "Login failed!"
 msgstr "登录失败！"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:26
 #: templates/login.php:9
 msgid "Username"
 msgstr "用户名"
@@ -192,48 +192,52 @@ msgstr "编辑分类"
 msgid "Add"
 msgstr "添加"
 
-#: templates/installation.php:23
+#: templates/installation.php:24
 msgid "Create an <strong>admin account</strong>"
 msgstr "创建<strong>管理员账号</strong>"
 
-#: templates/installation.php:29 templates/login.php:13
+#: templates/installation.php:30 templates/login.php:13
 msgid "Password"
 msgstr "密码"
 
-#: templates/installation.php:35
+#: templates/installation.php:36
 msgid "Advanced"
 msgstr "高级"
 
-#: templates/installation.php:37
+#: templates/installation.php:38
 msgid "Data folder"
 msgstr "数据目录"
 
-#: templates/installation.php:44
+#: templates/installation.php:45
 msgid "Configure the database"
 msgstr "配置数据库"
 
-#: templates/installation.php:49 templates/installation.php:60
-#: templates/installation.php:70
+#: templates/installation.php:50 templates/installation.php:61
+#: templates/installation.php:71 templates/installation.php:81
 msgid "will be used"
 msgstr "将被使用"
 
-#: templates/installation.php:82
+#: templates/installation.php:93
 msgid "Database user"
 msgstr "数据库用户"
 
-#: templates/installation.php:86
+#: templates/installation.php:97
 msgid "Database password"
 msgstr "数据库密码"
 
-#: templates/installation.php:90
+#: templates/installation.php:101
 msgid "Database name"
 msgstr "数据库名"
 
-#: templates/installation.php:96
+#: templates/installation.php:109
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:115
 msgid "Database host"
 msgstr "数据库主机"
 
-#: templates/installation.php:101
+#: templates/installation.php:120
 msgid "Finish setup"
 msgstr "安装完成"
 
diff --git a/l10n/zh_CN/settings.po b/l10n/zh_CN/settings.po
index 7dffc01ef6..f9f1faf7b3 100644
--- a/l10n/zh_CN/settings.po
+++ b/l10n/zh_CN/settings.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <appweb.cn@gmail.com>, 2012.
 # Phoenix Nemo <>, 2012.
 #   <rainofchaos@gmail.com>, 2012.
 #   <wengxt@gmail.com>, 2011, 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-19 02:02+0200\n"
-"PO-Revision-Date: 2012-08-18 05:49+0000\n"
-"Last-Translator: leonfeng <rainofchaos@gmail.com>\n"
+"POT-Creation-Date: 2012-08-26 19:46+0200\n"
+"PO-Revision-Date: 2012-08-26 05:33+0000\n"
+"Last-Translator: hanfeng <appweb.cn@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"
@@ -82,7 +83,7 @@ msgstr "为每个装入的页面执行任务"
 
 #: templates/admin.php:33
 msgid "cron.php is registered at a webcron service"
-msgstr ""
+msgstr "crop.php 已"
 
 #: templates/admin.php:35
 msgid "use systems cron service"
diff --git a/l10n/zh_TW/core.po b/l10n/zh_TW/core.po
index 932959583c..7b019b1d5b 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-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-26 19:46+0200\n"
+"PO-Revision-Date: 2012-08-26 17:34+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"
@@ -34,55 +34,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:573
+#: js/js.js:575
 msgid "January"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "February"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "March"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "April"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "May"
 msgstr ""
 
-#: js/js.js:573
+#: js/js.js:575
 msgid "June"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "July"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "August"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "September"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "October"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "November"
 msgstr ""
 
-#: js/js.js:574
+#: js/js.js:576
 msgid "December"
 msgstr ""
 
@@ -130,7 +130,7 @@ msgstr "已要求"
 msgid "Login failed!"
 msgstr "登入失敗!"
 
-#: lostpassword/templates/lostpassword.php:11 templates/installation.php:25
+#: lostpassword/templates/lostpassword.php:11 templates/installation.php:26
 #: templates/login.php:9
 msgid "Username"
 msgstr "使用者名稱"
@@ -191,48 +191,52 @@ msgstr "編輯分類"
 msgid "Add"
 msgstr "添加"
 
-#: templates/installation.php:23
+#: templates/installation.php:24
 msgid "Create an <strong>admin account</strong>"
 msgstr "建立一個<strong>管理者帳號</strong>"
 
-#: templates/installation.php:29 templates/login.php:13
+#: templates/installation.php:30 templates/login.php:13
 msgid "Password"
 msgstr "密碼"
 
-#: templates/installation.php:35
+#: templates/installation.php:36
 msgid "Advanced"
 msgstr "進階"
 
-#: templates/installation.php:37
+#: templates/installation.php:38
 msgid "Data folder"
 msgstr "資料夾"
 
-#: templates/installation.php:44
+#: templates/installation.php:45
 msgid "Configure the database"
 msgstr "設定資料庫"
 
-#: templates/installation.php:49 templates/installation.php:60
-#: templates/installation.php:70
+#: templates/installation.php:50 templates/installation.php:61
+#: templates/installation.php:71 templates/installation.php:81
 msgid "will be used"
 msgstr "將會使用"
 
-#: templates/installation.php:82
+#: templates/installation.php:93
 msgid "Database user"
 msgstr "資料庫使用者"
 
-#: templates/installation.php:86
+#: templates/installation.php:97
 msgid "Database password"
 msgstr "資料庫密碼"
 
-#: templates/installation.php:90
+#: templates/installation.php:101
 msgid "Database name"
 msgstr "資料庫名稱"
 
-#: templates/installation.php:96
+#: templates/installation.php:109
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:115
 msgid "Database host"
 msgstr "資料庫主機"
 
-#: templates/installation.php:101
+#: templates/installation.php:120
 msgid "Finish setup"
 msgstr "完成設定"
 
diff --git a/settings/l10n/et_EE.php b/settings/l10n/et_EE.php
index 4ab799a7f0..b2efd4d469 100644
--- a/settings/l10n/et_EE.php
+++ b/settings/l10n/et_EE.php
@@ -1,13 +1,21 @@
 <?php $TRANSLATIONS = array(
+"Unable to load list from App Store" => "App Sotre'i nimekirja laadimine ebaõnnestus",
 "Email saved" => "Kiri on salvestatud",
 "Invalid email" => "Vigane e-post",
 "OpenID Changed" => "OpenID on muudetud",
 "Invalid request" => "Vigane päring",
+"Authentication error" => "Autentimise viga",
 "Language changed" => "Keel on muudetud",
+"Error" => "Viga",
 "Disable" => "Lülita välja",
 "Enable" => "Lülita sisse",
 "Saving..." => "Salvestamine...",
 "__language_name__" => "Eesti",
+"Security Warning" => "Turvahoiatus",
+"Cron" => "Ajastatud töö",
+"execute one task with each page loaded" => "käivita iga laetud lehe juures üks ülesanne",
+"cron.php is registered at a webcron service" => "cron.php on webcron teenuses registreeritud",
+"use systems cron service" => "kasuta süsteemide cron teenuseid",
 "Log" => "Logi",
 "More" => "Veel",
 "Add your App" => "Lisa oma rakendus",
@@ -43,6 +51,7 @@
 "Create" => "Lisa",
 "Default Quota" => "Vaikimisi kvoot",
 "Other" => "Muu",
+"Group Admin" => "Grupi admin",
 "Quota" => "Mahupiir",
 "Delete" => "Kustuta"
 );
diff --git a/settings/l10n/zh_CN.php b/settings/l10n/zh_CN.php
index 410772e080..b008955a4b 100644
--- a/settings/l10n/zh_CN.php
+++ b/settings/l10n/zh_CN.php
@@ -14,6 +14,7 @@
 "Security Warning" => "安全警告",
 "Cron" => "计划任务",
 "execute one task with each page loaded" => "为每个装入的页面执行任务",
+"cron.php is registered at a webcron service" => "crop.php 已",
 "use systems cron service" => "实现系统 cron 服务",
 "Log" => "日志",
 "More" => "更多",

From 55860549616e5527fdd8d0f30e40fa04ceef232a Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Sun, 26 Aug 2012 21:57:05 +0200
Subject: [PATCH 0925/1224] fix c&p fail from earlier commit today

---
 lib/user.php          | 2 +-
 lib/user/database.php | 2 +-
 lib/user/http.php     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/user.php b/lib/user.php
index 97ec0c1050..c14ef2d6ca 100644
--- a/lib/user.php
+++ b/lib/user.php
@@ -350,7 +350,7 @@ class OC_User {
 				}
 			}
 		}
-		return OC_Config::getValue( "datadirectory", OC::$SERVERROOT."/data" ) . '/' . $user;
+		return OC_Config::getValue( "datadirectory", OC::$SERVERROOT."/data" ) . '/' . $uid;
 	}
 
 	/**
diff --git a/lib/user/database.php b/lib/user/database.php
index 12cd804641..a4cffe5d0c 100644
--- a/lib/user/database.php
+++ b/lib/user/database.php
@@ -183,7 +183,7 @@ class OC_User_Database extends OC_User_Backend {
 	*/
 	public function getHome($uid){
 		if($this->userExists($uid)){
-			return OC_Config::getValue( "datadirectory", OC::$SERVERROOT."/data" ) . '/' . $user;
+			return OC_Config::getValue( "datadirectory", OC::$SERVERROOT."/data" ) . '/' . $uid;
 		}else{
 			return false;
 		}
diff --git a/lib/user/http.php b/lib/user/http.php
index 87f3347a23..547c0201b6 100644
--- a/lib/user/http.php
+++ b/lib/user/http.php
@@ -98,7 +98,7 @@ class OC_User_HTTP extends OC_User_Backend {
 	*/
 	public function getHome($uid){
 		if($this->userExists($uid)){
-			return OC_Config::getValue( "datadirectory", OC::$SERVERROOT."/data" ) . '/' . $user;
+			return OC_Config::getValue( "datadirectory", OC::$SERVERROOT."/data" ) . '/' . $uid;
 		}else{
 			return false;
 		}

From 045c94ec3e3fe0bd3cbb05a46b3c797e13050ac3 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Sun, 26 Aug 2012 22:03:02 +0200
Subject: [PATCH 0926/1224] enable user backends to define their own place
 where to store the data

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

diff --git a/lib/util.php b/lib/util.php
index e63eb5b24c..a1bf214690 100755
--- a/lib/util.php
+++ b/lib/util.php
@@ -33,19 +33,21 @@ class OC_Util {
 
 		if( $user != "" ){ //if we aren't logged in, there is no use to set up the filesystem
 			$user_dir = '/'.$user.'/files';
-			$userdirectory = $CONFIG_DATADIRECTORY.$user_dir;
+			$user_root = OC_User::getHome($user);
+			$userdirectory = $user_root . '/files';
 			if( !is_dir( $userdirectory )){
 				mkdir( $userdirectory, 0755, true );
 			}
 
 			//jail the user into his "home" directory
+			OC_Filesystem::mount('OC_Filestorage_Local',array('datadir'=>$user_root), $user);
 			OC_Filesystem::init($user_dir);
 			$quotaProxy=new OC_FileProxy_Quota();
 			OC_FileProxy::register($quotaProxy);
 			self::$fsSetup=true;
 			// Load personal mount config
-			if (is_file($CONFIG_DATADIRECTORY.'/'.$user.'/mount.php')) {
-				$mountConfig = include($CONFIG_DATADIRECTORY.'/'.$user.'/mount.php');
+			if (is_file($user_root.'/mount.php')) {
+				$mountConfig = include($user_root.'/mount.php');
 				if (isset($mountConfig['user'][$user])) {
 					foreach ($mountConfig['user'][$user] as $mountPoint => $options) {
 						OC_Filesystem::mount($options['class'], $options['options'], $mountPoint);

From cd5c217c0d006ec82cdbd8c952b753ecb0132ac7 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Sun, 26 Aug 2012 22:24:08 +0200
Subject: [PATCH 0927/1224] use OC_User::getHome in lib/filesystem.php

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

diff --git a/lib/filesystem.php b/lib/filesystem.php
index 82fbf11afd..fbb0290045 100644
--- a/lib/filesystem.php
+++ b/lib/filesystem.php
@@ -350,7 +350,7 @@ class OC_Filesystem{
 	* @return string
 	*/
 	static public function getLocalPath($path) {
-		$datadir = \OCP\Config::getSystemValue('datadirectory').'/'.\OC_User::getUser().'/files';
+		$datadir = OC_User::getHome($user).'/files';
 		$newpath = $path;
 		if (strncmp($newpath, $datadir, strlen($datadir)) == 0) {
 			$newpath = substr($path, strlen($datadir));

From d6bb04a74e7359fe00357d8e4613823ff570519e Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Sun, 26 Aug 2012 17:55:51 -0400
Subject: [PATCH 0928/1224] Move jquery.inview from contacts app to core

---
 core/js/jquery.inview.js | 134 +++++++++++++++++++++++++++++++++++++++
 settings/users.php       |   3 +-
 2 files changed, 135 insertions(+), 2 deletions(-)
 create mode 100644 core/js/jquery.inview.js

diff --git a/core/js/jquery.inview.js b/core/js/jquery.inview.js
new file mode 100644
index 0000000000..9687cd8336
--- /dev/null
+++ b/core/js/jquery.inview.js
@@ -0,0 +1,134 @@
+/**
+ * author Christopher Blum
+ *    - based on the idea of Remy Sharp, http://remysharp.com/2009/01/26/element-in-view-event-plugin/
+ *    - forked from http://github.com/zuk/jquery.inview/
+ */
+(function ($) {
+  var inviewObjects = {}, viewportSize, viewportOffset,
+      d = document, w = window, documentElement = d.documentElement, expando = $.expando, isFiring = false, $elements = {};
+
+  $.event.special.inview = {
+    add: function(data) {
+      var inviewObject = { data: data, $element: $(this) }
+      inviewObjects[data.guid + "-" + this[expando]] = inviewObject;
+      var selector  = inviewObject.data.selector,
+      $element  = inviewObject.$element;
+      var hash = parseInt(getHash( data.guid + this[expando]));
+      $elements[hash] =  selector ? $element.find(selector) : $element;
+    },
+
+    remove: function(data) {
+      try { delete inviewObjects[data.guid + "-" + this[expando]]; } catch(e) {}
+      try {
+        var hash = parseInt(getHash(data.guid + this[expando])); 
+	delete($elements[hash]);
+      } catch (e){}
+    }
+  };
+
+  
+  function getHash(str){
+    str = str+'';
+    var hash = 0;
+    if (str.length == 0) return hash;
+    for (i = 0; i < str.length; i++) {
+        char = str.charCodeAt(i);
+        hash = ((hash<<5)-hash)+char;
+        hash = hash & hash; // Convert to 32bit integer
+    }
+    return Math.abs(hash);
+  }
+  
+  function getViewportSize() {
+    var mode, domObject, size = { height: w.innerHeight, width: w.innerWidth };
+
+    // if this is correct then return it. iPad has compat Mode, so will
+    // go into check clientHeight/clientWidth (which has the wrong value).
+    if (!size.height) {
+      mode = d.compatMode;
+      if (mode || !$.support.boxModel) { // IE, Gecko
+        domObject = mode === 'CSS1Compat' ?
+          documentElement : // Standards
+          d.body; // Quirks
+        size = {
+          height: domObject.clientHeight,
+          width:  domObject.clientWidth
+        };
+      }
+    }
+
+    return size;
+  }
+
+  function getViewportOffset() {
+    return {
+      top:  w.pageYOffset || documentElement.scrollTop   || (d.body?d.body.scrollTop:0),
+      left: w.pageXOffset || documentElement.scrollLeft  || (d.body?d.body.scrollLeft:0)
+    };
+  }
+
+  function checkInView() {
+    if (isFiring){
+      return;
+    }
+    isFiring = true;
+      viewportSize   = viewportSize   || getViewportSize();
+      viewportOffset = viewportOffset || getViewportOffset();
+      
+      for (var i in $elements) {
+        if (isNaN(parseInt(i))) {
+          continue;
+        }
+
+        var $element      = $($elements[i]),
+            elementSize   = { height: $element.height(), width: $element.width() },
+            elementOffset = $element.offset(),
+            inView        = $element.data('inview'),
+            visiblePartX,
+            visiblePartY,
+            visiblePartsMerged;
+
+        // Don't ask me why because I haven't figured out yet:
+        // viewportOffset and viewportSize are sometimes suddenly null in Firefox 5.
+        // Even though it sounds weird:
+        // It seems that the execution of this function is interferred by the onresize/onscroll event
+        // where viewportOffset and viewportSize are unset
+        if (!viewportOffset || !viewportSize) {
+	  isFiring = false;
+          return;
+        }
+        
+        if (elementOffset.top + elementSize.height > viewportOffset.top &&
+            elementOffset.top < viewportOffset.top + viewportSize.height &&
+            elementOffset.left + elementSize.width > viewportOffset.left &&
+            elementOffset.left < viewportOffset.left + viewportSize.width) {
+          visiblePartX = (viewportOffset.left > elementOffset.left ?
+            'right' : (viewportOffset.left + viewportSize.width) < (elementOffset.left + elementSize.width) ?
+            'left' : 'both');
+          visiblePartY = (viewportOffset.top > elementOffset.top ?
+            'bottom' : (viewportOffset.top + viewportSize.height) < (elementOffset.top + elementSize.height) ?
+            'top' : 'both');
+          visiblePartsMerged = visiblePartX + "-" + visiblePartY;
+          if (!inView || inView !== visiblePartsMerged) {
+            $element.data('inview', visiblePartsMerged).trigger('inview', [true, visiblePartX, visiblePartY]);
+          }
+        } else if (inView) {
+          $element.data('inview', false).trigger('inview', [false]);
+        }
+      }
+      isFiring = false;
+  }
+
+  $(w).bind("scroll resize", function() {
+    viewportSize = viewportOffset = null;
+  });
+
+  // Use setInterval in order to also make sure this captures elements within
+  // "overflow:scroll" elements or elements that appeared in the dom tree due to
+  // dom manipulation and reflow
+  // old: $(window).scroll(checkInView);
+  //
+  // By the way, iOS (iPad, iPhone, ...) seems to not execute, or at least delays
+  // intervals while the user scrolls. Therefore the inview event might fire a bit late there
+  setInterval(checkInView, 250);
+})(jQuery);
\ No newline at end of file
diff --git a/settings/users.php b/settings/users.php
index 6f39059757..58018f00ec 100644
--- a/settings/users.php
+++ b/settings/users.php
@@ -11,8 +11,7 @@ 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::addScript('core', 'jquery.inview');
 OC_Util::addStyle( 'settings', 'settings' );
 OC_App::setActiveNavigationEntry( 'core_users' );
 

From 545812f5894707336022dc768915e6073578e419 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Sun, 26 Aug 2012 18:50:20 -0400
Subject: [PATCH 0929/1224] Move additional jquery.inview files

---
 core/js/LICENSE.jquery.inview | 41 +++++++++++++++++++++++++++++++++++
 core/js/jquery.inview.txt     | 15 +++++++++++++
 2 files changed, 56 insertions(+)
 create mode 100644 core/js/LICENSE.jquery.inview
 create mode 100644 core/js/jquery.inview.txt

diff --git a/core/js/LICENSE.jquery.inview b/core/js/LICENSE.jquery.inview
new file mode 100644
index 0000000000..1ed340edbe
--- /dev/null
+++ b/core/js/LICENSE.jquery.inview
@@ -0,0 +1,41 @@
+Attribution-Non-Commercial-Share Alike 2.0 UK: England & Wales
+
+http://creativecommons.org/licenses/by-nc-sa/2.0/uk/
+
+You are free:
+
+    * to copy, distribute, display, and perform the work
+    * to make derivative works
+
+
+Under the following conditions:
+
+    * Attribution — You must give the original author credit.
+      Attribute this work:
+      Information
+      What does "Attribute this work" mean?
+      The page you came from contained embedded licensing metadata, 
+      including how the creator wishes to be attributed for re-use. 
+      You can use the HTML here to cite the work. Doing so will 
+      also include metadata on your page so that others can find the 
+      original work as well.
+
+    * Non-Commercial — You may not use this work for commercial 
+      purposes.
+    * Share Alike — If you alter, transform, or build upon this 
+      work, you may distribute the resulting work only under a 
+      licence identical to this one.
+
+With the understanding that:
+
+    * Waiver — Any of the above conditions can be waived if you get 
+      permission from the copyright holder.
+    * Other Rights — In no way are any of the following rights 
+      affected by the license:
+          o Your fair dealing or fair use rights;
+          o The author's moral rights;
+          o Rights other persons may have either in the work itself 
+            or in how the work is used, such as publicity or privacy rights.
+    * Notice — For any reuse or distribution, you must make clear to 
+      others the licence terms of this work.
+
diff --git a/core/js/jquery.inview.txt b/core/js/jquery.inview.txt
new file mode 100644
index 0000000000..c53dbd1d97
--- /dev/null
+++ b/core/js/jquery.inview.txt
@@ -0,0 +1,15 @@
+jQuery.inview is licensed Attribution-Non-Commercial-Share Alike 2.0 but the
+conditions has been waived by the author in the following tweet:
+
+https://twitter.com/#!/ChristopherBlum/status/148382899887013888 
+
+Saying:
+
+Thomas Tanghus @tanghus 18 Dec. 2011
+
+@ChristopherBlum Hi. Is it OK if I use https://github.com/protonet/jquery.inview in ownCloud? Preferably under an AGPL license ;-) owncloud.org
+
+
+Christopher Blum Christopher Blum @ChristopherBlum 18 Dec. 2011
+
+@tanghus Feel free to! :)

From c33a2ca01db0bf10b4604c2997bb3c1a904a32ac Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <thomas.mueller@tmit.eu>
Date: Mon, 27 Aug 2012 02:02:37 +0200
Subject: [PATCH 0930/1224] [tx-robot] updated from transifex

---
 apps/files_external/l10n/el.php     | 1 +
 core/l10n/el.php                    | 1 +
 core/l10n/it.php                    | 1 +
 core/l10n/sl.php                    | 1 +
 core/l10n/sv.php                    | 1 +
 core/l10n/th_TH.php                 | 1 +
 l10n/el/core.po                     | 8 ++++----
 l10n/el/files_external.po           | 9 +++++----
 l10n/it/core.po                     | 8 ++++----
 l10n/sl/core.po                     | 8 ++++----
 l10n/sv/core.po                     | 8 ++++----
 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/lib.pot              | 2 +-
 l10n/templates/settings.pot         | 2 +-
 l10n/templates/user_ldap.pot        | 2 +-
 l10n/th_TH/core.po                  | 8 ++++----
 21 files changed, 40 insertions(+), 33 deletions(-)

diff --git a/apps/files_external/l10n/el.php b/apps/files_external/l10n/el.php
index a4a910ce63..7dcf13b397 100644
--- a/apps/files_external/l10n/el.php
+++ b/apps/files_external/l10n/el.php
@@ -1,5 +1,6 @@
 <?php $TRANSLATIONS = array(
 "External Storage" => "Εξωτερική αποθήκευση",
+"Mount point" => "Σημείο προσάρτησης",
 "Configuration" => "Ρυθμίσεις",
 "Options" => "Επιλογές",
 "All Users" => "Όλοι οι χρήστες",
diff --git a/core/l10n/el.php b/core/l10n/el.php
index d8f32fb51e..38d3d091cb 100644
--- a/core/l10n/el.php
+++ b/core/l10n/el.php
@@ -51,6 +51,7 @@
 "Database user" => "Χρήστης της βάσης δεδομένων",
 "Database password" => "Κωδικός πρόσβασης βάσης δεδομένων",
 "Database name" => "Όνομα βάσης δεδομένων",
+"Database tablespace" => "Πίνακες της βάσης δεδομένων",
 "Database host" => "Διακομιστής βάσης δεδομένων",
 "Finish setup" => "Ολοκλήρωση εγκατάστασης",
 "web services under your control" => "Υπηρεσίες web υπό τον έλεγχό σας",
diff --git a/core/l10n/it.php b/core/l10n/it.php
index 1c0bf94ca7..5329f8fe2e 100644
--- a/core/l10n/it.php
+++ b/core/l10n/it.php
@@ -51,6 +51,7 @@
 "Database user" => "Utente del database",
 "Database password" => "Password del database",
 "Database name" => "Nome del database",
+"Database tablespace" => "Spazio delle tabelle del database",
 "Database host" => "Host del database",
 "Finish setup" => "Termina la configurazione",
 "web services under your control" => "servizi web nelle tue mani",
diff --git a/core/l10n/sl.php b/core/l10n/sl.php
index 2f998c9549..ad41231431 100644
--- a/core/l10n/sl.php
+++ b/core/l10n/sl.php
@@ -51,6 +51,7 @@
 "Database user" => "Uporabnik zbirke",
 "Database password" => "Geslo podatkovne zbirke",
 "Database name" => "Ime podatkovne zbirke",
+"Database tablespace" => "Razpredelnica podatkovne zbirke",
 "Database host" => "Gostitelj podatkovne zbirke",
 "Finish setup" => "Dokončaj namestitev",
 "web services under your control" => "spletne storitve pod vašim nadzorom",
diff --git a/core/l10n/sv.php b/core/l10n/sv.php
index 25ba95558e..41d8d70f2a 100644
--- a/core/l10n/sv.php
+++ b/core/l10n/sv.php
@@ -51,6 +51,7 @@
 "Database user" => "Databasanvändare",
 "Database password" => "Lösenord till databasen",
 "Database name" => "Databasnamn",
+"Database tablespace" => "Tabellutrymme för databas",
 "Database host" => "Databasserver",
 "Finish setup" => "Avsluta installation",
 "web services under your control" => "webbtjänster under din kontroll",
diff --git a/core/l10n/th_TH.php b/core/l10n/th_TH.php
index 8bd4d36524..4bfdb524fe 100644
--- a/core/l10n/th_TH.php
+++ b/core/l10n/th_TH.php
@@ -51,6 +51,7 @@
 "Database user" => "ชื่อผู้ใช้งานฐานข้อมูล",
 "Database password" => "รหัสผ่านฐานข้อมูล",
 "Database name" => "ชื่อฐานข้อมูล",
+"Database tablespace" => "พื้นที่ตารางในฐานข้อมูล",
 "Database host" => "Database host",
 "Finish setup" => "ติดตั้งเรียบร้อยแล้ว",
 "web services under your control" => "web services under your control",
diff --git a/l10n/el/core.po b/l10n/el/core.po
index 8797a38701..8471fb6059 100644
--- a/l10n/el/core.po
+++ b/l10n/el/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-08-26 19:46+0200\n"
-"PO-Revision-Date: 2012-08-26 17:34+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-27 02:01+0200\n"
+"PO-Revision-Date: 2012-08-26 21:39+0000\n"
+"Last-Translator: Petros Kyladitis <petros.kyladitis@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"
@@ -233,7 +233,7 @@ msgstr "Όνομα βάσης δεδομένων"
 
 #: templates/installation.php:109
 msgid "Database tablespace"
-msgstr ""
+msgstr "Πίνακες της βάσης δεδομένων"
 
 #: templates/installation.php:115
 msgid "Database host"
diff --git a/l10n/el/files_external.po b/l10n/el/files_external.po
index d33fba1ab4..d11daf7f32 100644
--- a/l10n/el/files_external.po
+++ b/l10n/el/files_external.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # Nisok Kosin <nikos.efthimiou@gmail.com>, 2012.
+# Petros Kyladitis <petros.kyladitis@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\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"
+"POT-Creation-Date: 2012-08-27 02:01+0200\n"
+"PO-Revision-Date: 2012-08-26 21:45+0000\n"
+"Last-Translator: Petros Kyladitis <petros.kyladitis@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"
@@ -24,7 +25,7 @@ msgstr "Εξωτερική αποθήκευση"
 
 #: templates/settings.php:7 templates/settings.php:19
 msgid "Mount point"
-msgstr ""
+msgstr "Σημείο προσάρτησης"
 
 #: templates/settings.php:8
 msgid "Backend"
diff --git a/l10n/it/core.po b/l10n/it/core.po
index 16ef1b0d11..b938d770ee 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-26 19:46+0200\n"
-"PO-Revision-Date: 2012-08-26 17:34+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-27 02:01+0200\n"
+"PO-Revision-Date: 2012-08-26 18: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"
@@ -234,7 +234,7 @@ msgstr "Nome del database"
 
 #: templates/installation.php:109
 msgid "Database tablespace"
-msgstr ""
+msgstr "Spazio delle tabelle del database"
 
 #: templates/installation.php:115
 msgid "Database host"
diff --git a/l10n/sl/core.po b/l10n/sl/core.po
index 494b4e3751..22b9afbe97 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-08-26 19:46+0200\n"
-"PO-Revision-Date: 2012-08-26 17:34+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-27 02:01+0200\n"
+"PO-Revision-Date: 2012-08-26 20:35+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"
@@ -232,7 +232,7 @@ msgstr "Ime podatkovne zbirke"
 
 #: templates/installation.php:109
 msgid "Database tablespace"
-msgstr ""
+msgstr "Razpredelnica podatkovne zbirke"
 
 #: templates/installation.php:115
 msgid "Database host"
diff --git a/l10n/sv/core.po b/l10n/sv/core.po
index 35f6b90231..5471f229f4 100644
--- a/l10n/sv/core.po
+++ b/l10n/sv/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-26 19:46+0200\n"
-"PO-Revision-Date: 2012-08-26 17:34+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-27 02:01+0200\n"
+"PO-Revision-Date: 2012-08-26 23:35+0000\n"
+"Last-Translator: Daniel Sandman <revoltism@gmail.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"
@@ -235,7 +235,7 @@ msgstr "Databasnamn"
 
 #: templates/installation.php:109
 msgid "Database tablespace"
-msgstr ""
+msgstr "Tabellutrymme för databas"
 
 #: templates/installation.php:115
 msgid "Database host"
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index 167efeaacc..398351960c 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-26 19:46+0200\n"
+"POT-Creation-Date: 2012-08-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/files.pot b/l10n/templates/files.pot
index 98bb4431dd..7f39a2c963 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-26 19:46+0200\n"
+"POT-Creation-Date: 2012-08-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/files_encryption.pot b/l10n/templates/files_encryption.pot
index 458070d51b..ff2376ac52 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-26 19:46+0200\n"
+"POT-Creation-Date: 2012-08-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/files_external.pot b/l10n/templates/files_external.pot
index b243a439bf..4e8b9e3000 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-26 19:46+0200\n"
+"POT-Creation-Date: 2012-08-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/files_sharing.pot b/l10n/templates/files_sharing.pot
index 727e809308..7964276a75 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-26 19:46+0200\n"
+"POT-Creation-Date: 2012-08-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/files_versions.pot b/l10n/templates/files_versions.pot
index 03f3305e8a..5f023c7a3d 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-26 19:46+0200\n"
+"POT-Creation-Date: 2012-08-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/lib.pot b/l10n/templates/lib.pot
index a8ec127784..c689698732 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-26 19:46+0200\n"
+"POT-Creation-Date: 2012-08-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/settings.pot b/l10n/templates/settings.pot
index 5734e6e22e..4601cf95d0 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-26 19:46+0200\n"
+"POT-Creation-Date: 2012-08-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/user_ldap.pot b/l10n/templates/user_ldap.pot
index 4dfbfc672a..0ba0404974 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-26 19:46+0200\n"
+"POT-Creation-Date: 2012-08-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/th_TH/core.po b/l10n/th_TH/core.po
index 0d0212cdd6..73a0fb3343 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-08-26 19:46+0200\n"
-"PO-Revision-Date: 2012-08-26 17:34+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-27 02:01+0200\n"
+"PO-Revision-Date: 2012-08-26 21: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"
@@ -231,7 +231,7 @@ msgstr "ชื่อฐานข้อมูล"
 
 #: templates/installation.php:109
 msgid "Database tablespace"
-msgstr ""
+msgstr "พื้นที่ตารางในฐานข้อมูล"
 
 #: templates/installation.php:115
 msgid "Database host"

From 18517f6adb92752a70be5a80ebf92ddf1d03babc Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Sun, 26 Aug 2012 21:34:22 -0400
Subject: [PATCH 0931/1224] Fix share getItems() limit

---
 lib/public/share.php | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/lib/public/share.php b/lib/public/share.php
index 070d69d05a..9ee7ef0516 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -516,6 +516,14 @@ class Share {
 				// If the limit is not 1, the filtering can be done later
 				$where .= ' ORDER BY `*PREFIX*share`.`id` DESC';
 			}
+			// The limit must be at least 3, because filtering needs to be done
+			if ($limit < 3) {
+				$queryLimit = 3;
+			} else {
+				$queryLimit = $limit;
+			}
+		} else {
+			$queryLimit = null;
 		}
 		// TODO Optimize selects
 		if ($format == self::FORMAT_STATUSES) {
@@ -544,8 +552,7 @@ class Share {
 			}
 		}
 		$root = strlen($root);
-                // The limit must be at least 3, because filtering needs to be done
-		$query = \OC_DB::prepare('SELECT '.$select.' FROM `*PREFIX*share` '.$where, ($limit < 3 ? 3 : $limit));
+		$query = \OC_DB::prepare('SELECT '.$select.' FROM `*PREFIX*share` '.$where, $queryLimit);
 		$result = $query->execute($queryArgs);
 		$items = array();
 		$targets = array();

From 617449b230fd3c7628e6a9aa3bc3425492b6328e Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Sun, 26 Aug 2012 21:38:53 -0400
Subject: [PATCH 0932/1224] Change URL from gitorious to github

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

diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index 9ccab25516..1306d90f40 100755
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -72,6 +72,6 @@ if(!$_['htaccessworking']) {
 
 <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>.
+	Developed by the <a href="http://ownCloud.org/contact" target="_blank">ownCloud community</a>, the <a href="https://github.com/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>
 

From 59cf1d19e593efd9d376c3426a6214c438ca7b3d Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Sun, 26 Aug 2012 22:05:34 -0400
Subject: [PATCH 0933/1224] setbackgroundjobsmode.php got lost somewhere -
 switched call to use the perferred OC.AppConfig.setValue() instead

---
 settings/js/admin.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/settings/js/admin.js b/settings/js/admin.js
index 409594a4b9..57a67b5499 100644
--- a/settings/js/admin.js
+++ b/settings/js/admin.js
@@ -7,7 +7,10 @@ $(document).ready(function(){
 
 	$('#backgroundjobs input').change(function(){
 		if($(this).attr('checked')){
-			$.post(OC.filePath('settings','ajax','setbackgroundjobsmode.php'), { mode: $(this).val() });
+			var mode = $(this).val();
+			if (mode == 'ajax' || mode == 'webcron' || mode == 'cron') {
+				OC.AppConfig.setValue('core', 'backgroundjobs_mode', mode);
+			}
 		}
 	});
 });
\ No newline at end of file

From 16aff1045d5937cc6537e5da714a7ee4bd2edd95 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Mon, 27 Aug 2012 13:21:26 +0200
Subject: [PATCH 0934/1224] make use of OC_User::getHome in lib/migrate.php

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

diff --git a/lib/migrate.php b/lib/migrate.php
index 917d77eaca..e998cf1f4a 100644
--- a/lib/migrate.php
+++ b/lib/migrate.php
@@ -141,7 +141,7 @@ class OC_Migrate{
 	 			// Export the app info
 			    $exportdata = self::exportAppData();
 				// Add the data dir to the zip
-				self::$content->addDir( $datadir . '/' . self::$uid, true, '/' );
+				self::$content->addDir(OC_User::getHome(self::$uid), true, '/' );
 	 		break;
 	 		case 'instance':
 	 			self::$content = new OC_Migration_Content( self::$zip );
@@ -159,14 +159,14 @@ class OC_Migrate{
 				self::$content->addFromString( $dbexport, "dbexport.xml" );
 				// Add user data
 				foreach(OC_User::getUsers() as $user){
-					self::$content->addDir( $datadir . '/' . $user . '/', true, "/userdata/" );
+					self::$content->addDir(OC_User::getHome($user), true, "/userdata/" );
 				}
 			break;
 			case 'userfiles':
 				self::$content = new OC_Migration_Content( self::$zip );
 				// Creates a zip with all of the users files
 				foreach(OC_User::getUsers() as $user){
-					self::$content->addDir( $datadir . '/' . $user . '/', true, "/" );
+					self::$content->addDir(OC_User::getHome($user), true, "/" );
 				}
 			break;
 			case 'system':

From 15cdde74d3ee291db1f8b2977dbf0dd498337b74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= <jfd@butonic.de>
Date: Mon, 27 Aug 2012 13:33:24 +0200
Subject: [PATCH 0935/1224] return standard SQL values (sqlite3 understands
 CURRENT_...)

---
 lib/MDB2/Driver/Function/sqlite3.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/MDB2/Driver/Function/sqlite3.php b/lib/MDB2/Driver/Function/sqlite3.php
index 1af262fd7a..790bd0e747 100644
--- a/lib/MDB2/Driver/Function/sqlite3.php
+++ b/lib/MDB2/Driver/Function/sqlite3.php
@@ -55,12 +55,12 @@ class MDB2_Driver_Function_sqlite3 extends MDB2_Driver_Function_Common
     {
         switch ($type) {
         case 'time':
-            return 'time(\'now\')';
+            return 'CURRENT_TIME';
         case 'date':
-            return 'date(\'now\')';
+            return 'CURRENT_DATE';
         case 'timestamp':
         default:
-            return 'datetime(\'now\')';
+            return 'CURRENT_TIMESTAMP';
         }
     }
 

From f105e9b454abe8dedc241b90b62797851f767257 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= <jfd@butonic.de>
Date: Mon, 27 Aug 2012 13:35:04 +0200
Subject: [PATCH 0936/1224] remove oc_log, as it is unused add length to text
 columns or newer mysql will produce columns too wide

---
 db_structure.xml | 63 ++++--------------------------------------------
 1 file changed, 5 insertions(+), 58 deletions(-)

diff --git a/db_structure.xml b/db_structure.xml
index 7e4c0bd203..8c96fa7c39 100644
--- a/db_structure.xml
+++ b/db_structure.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
+<?xml version="1.0" encoding="utf-8" ?>
 <database>
 
  <name>*dbname*</name>
@@ -33,6 +33,7 @@
     <name>configvalue</name>
     <type>text</type>
     <notnull>true</notnull>
+    <length>255</length>
    </field>
 
 
@@ -369,63 +370,6 @@
 
  </table>
 
- <table>
-
-  <name>*dbprefix*log</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>moment</name>
-    <type>timestamp</type>
-    <default>CURRENT_TIMESTAMP</default>
-    <notnull>true</notnull>
-   </field>
-
-   <field>
-    <name>appid</name>
-    <type>text</type>
-    <default></default>
-    <notnull>true</notnull>
-    <length>255</length>
-   </field>
-
-   <field>
-    <name>user</name>
-    <type>text</type>
-    <default></default>
-    <notnull>true</notnull>
-    <length>255</length>
-   </field>
-
-   <field>
-    <name>action</name>
-    <type>text</type>
-    <default></default>
-    <notnull>true</notnull>
-    <length>255</length>
-   </field>
-
-   <field>
-    <name>info</name>
-    <type>text</type>
-    <notnull>true</notnull>
-   </field>
-
-  </declaration>
-
- </table>
-
  <table>
 
   <name>*dbprefix*preferences</name>
@@ -460,6 +404,7 @@
     <name>configvalue</name>
     <type>text</type>
     <notnull>true</notnull>
+    <length>255</length>
    </field>
 
   </declaration>
@@ -500,6 +445,7 @@
     <name>propertyvalue</name>
     <type>text</type>
     <notnull>true</notnull>
+    <length>255</length>
    </field>
 
   </declaration>
@@ -665,6 +611,7 @@
     <name>parameters</name>
     <type>text</type>
     <notnull>true</notnull>
+    <length>255</length>
    </field>
 
 

From d91bd37bd7c576fcabab446d7c746727faaff5e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= <jfd@butonic.de>
Date: Mon, 27 Aug 2012 13:59:59 +0200
Subject: [PATCH 0937/1224] fix two bugs in MDB2, patches committed upstream
 https://pear.php.net/bugs/bug.php?id=19582

---
 3rdparty/MDB2/Driver/Datatype/Common.php | 2 +-
 3rdparty/MDB2/Driver/mysql.php           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/3rdparty/MDB2/Driver/Datatype/Common.php b/3rdparty/MDB2/Driver/Datatype/Common.php
index 3b02c86acd..dd7f1c7e0a 100644
--- a/3rdparty/MDB2/Driver/Datatype/Common.php
+++ b/3rdparty/MDB2/Driver/Datatype/Common.php
@@ -1412,7 +1412,7 @@ class MDB2_Driver_Datatype_Common extends MDB2_Module_Common
             if (PEAR::isError($db)) {
                 return $db;
             }
-            if (isset($db->function) && is_object($this->function) && is_a($db->function, 'MDB2_Driver_Function_Common')) {
+            if (isset($db->function) && is_object($db->function) && is_a($db->function, 'MDB2_Driver_Function_Common')) {
                 return $db->function->now('timestamp');
             }
             return 'CURRENT_TIMESTAMP';
diff --git a/3rdparty/MDB2/Driver/mysql.php b/3rdparty/MDB2/Driver/mysql.php
index 3008bd04f0..1d22e61f46 100644
--- a/3rdparty/MDB2/Driver/mysql.php
+++ b/3rdparty/MDB2/Driver/mysql.php
@@ -80,7 +80,7 @@ class MDB2_Driver_mysql extends MDB2_Driver_Common
 
     protected $start_transaction = false;
 
-    protected $varchar_max_length = 255;
+    public $varchar_max_length = 255;
 
     // }}}
     // {{{ constructor

From 0f379fd28afe3d922f3d856f097366c0a3d52a8d Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Mon, 27 Aug 2012 14:07:09 +0200
Subject: [PATCH 0938/1224] OC_User: getHome is an optional method, taking it
 out of the Interface

---
 lib/user/interface.php | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/lib/user/interface.php b/lib/user/interface.php
index 5e5efe0010..a4903898fb 100644
--- a/lib/user/interface.php
+++ b/lib/user/interface.php
@@ -57,11 +57,4 @@ interface OC_User_Interface {
 	*/
 	public function userExists($uid);
 
-	/**
-	* @brief get the user's home directory
-	* @param string $uid the username
-	* @return boolean
-	*/
-	public function getHome($uid);
-
 }
\ No newline at end of file

From b56a46bdea38eb7b767e4d6e7b0788789c3f6ad1 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Mon, 27 Aug 2012 15:55:22 +0200
Subject: [PATCH 0939/1224] fix filesharing for multiple data directories

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

diff --git a/lib/util.php b/lib/util.php
index a1bf214690..f34831c12c 100755
--- a/lib/util.php
+++ b/lib/util.php
@@ -35,12 +35,16 @@ class OC_Util {
 			$user_dir = '/'.$user.'/files';
 			$user_root = OC_User::getHome($user);
 			$userdirectory = $user_root . '/files';
+			OC_Filesystem::mount('OC_Filestorage_Local',array('datadir'=>$user_root), $user);
 			if( !is_dir( $userdirectory )){
 				mkdir( $userdirectory, 0755, true );
 			}
-
-			//jail the user into his "home" directory
 			OC_Filesystem::mount('OC_Filestorage_Local',array('datadir'=>$user_root), $user);
+			
+			//jail the user into his "home" directory
+			foreach(OC_User::getUsers() as $singleuser){
+				OC_Filesystem::mount('OC_Filestorage_Local',array('datadir'=>OC_User::getHome($singleuser)), $singleuser);
+			}
 			OC_Filesystem::init($user_dir);
 			$quotaProxy=new OC_FileProxy_Quota();
 			OC_FileProxy::register($quotaProxy);

From ead7de6bff8daa4f501a2d63dea63b9966f2bd57 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Mon, 27 Aug 2012 16:10:37 +0200
Subject: [PATCH 0940/1224] only mount every single homefolder when using
 sharing app

---
 apps/files_sharing/lib/sharedstorage.php | 1 +
 lib/util.php                             | 9 ++++++---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/apps/files_sharing/lib/sharedstorage.php b/apps/files_sharing/lib/sharedstorage.php
index 527cec0afe..a3a8750d27 100644
--- a/apps/files_sharing/lib/sharedstorage.php
+++ b/apps/files_sharing/lib/sharedstorage.php
@@ -30,6 +30,7 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
 	
 	public function __construct($arguments) {
 		$this->sharedFolder = $arguments['sharedFolder'];
+		OC_Util::setupFS4all();
 	}
 
 	/**
diff --git a/lib/util.php b/lib/util.php
index f34831c12c..3b2f476ada 100755
--- a/lib/util.php
+++ b/lib/util.php
@@ -42,9 +42,6 @@ class OC_Util {
 			OC_Filesystem::mount('OC_Filestorage_Local',array('datadir'=>$user_root), $user);
 			
 			//jail the user into his "home" directory
-			foreach(OC_User::getUsers() as $singleuser){
-				OC_Filesystem::mount('OC_Filestorage_Local',array('datadir'=>OC_User::getHome($singleuser)), $singleuser);
-			}
 			OC_Filesystem::init($user_dir);
 			$quotaProxy=new OC_FileProxy_Quota();
 			OC_FileProxy::register($quotaProxy);
@@ -62,6 +59,12 @@ class OC_Util {
 		}
 	}
 
+	public static function setupFS4all(){
+		foreach(OC_User::getUsers() as $user){
+			OC_Filesystem::mount('OC_Filestorage_Local',array('datadir'=>OC_User::getHome($singleuser)), $user);
+		}	
+	}
+	
 	public static function tearDownFS(){
 		OC_Filesystem::tearDown();
 		self::$fsSetup=false;

From 3b83c7fa74eb90e02317528dd672fa2afe457b77 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= <jfd@butonic.de>
Date: Mon, 27 Aug 2012 18:37:16 +0200
Subject: [PATCH 0941/1224] update now(), current_timestamp and backtick
 replacement

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

diff --git a/lib/db.php b/lib/db.php
index 5ef67202a1..4214451c85 100644
--- a/lib/db.php
+++ b/lib/db.php
@@ -534,10 +534,9 @@ class OC_DB {
 			$query = str_replace( '`', '"', $query );
 			$query = str_replace( 'NOW()', 'datetime(\'now\')', $query );
 			$query = str_replace( 'now()', 'datetime(\'now\')', $query );
-		}elseif( $type == 'mysql' ){
-			$query = str_replace( 'NOW()', 'CURRENT_TIMESTAMP', $query );
-			$query = str_replace( 'now()', 'CURRENT_TIMESTAMP', $query );
-		}elseif( $type == 'pgsql' || $type == 'oci'  ){
+		}elseif( $type == 'pgsql' ){
+			$query = str_replace( '`', '"', $query );
+		}elseif( $type == 'oci'  ){
 			$query = str_replace( '`', '"', $query );
 			$query = str_replace( 'NOW()', 'CURRENT_TIMESTAMP', $query );
 			$query = str_replace( 'now()', 'CURRENT_TIMESTAMP', $query );

From 84a5faff36c9afb550db05091341bc08bcb9b57d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= <jfd@butonic.de>
Date: Mon, 27 Aug 2012 20:35:05 +0200
Subject: [PATCH 0942/1224] remove files_imageviewer and files_texteditor from
 blacklist so they can be activated in a multi apps environment

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

diff --git a/settings/apps.php b/settings/apps.php
index 6feede7741..27bbcc9ada 100644
--- a/settings/apps.php
+++ b/settings/apps.php
@@ -32,7 +32,8 @@ OC_App::setActiveNavigationEntry( "core_apps" );
 $registeredApps=OC_App::getAllApps();
 $apps=array();
 
-$blacklist=array('files','files_imageviewer','files_textviewer');//we dont want to show configuration for these
+//TODO which apps do we want to blacklist and how do we integrate blacklisting with the multi apps folder feature
+$blacklist=array('files');//we dont want to show configuration for these
 
 foreach($registeredApps as $app){
 	if(array_search($app,$blacklist)===false){

From 5985d00c6f451ef67cc998be538ecff8ff840192 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Mon, 27 Aug 2012 21:32:32 +0200
Subject: [PATCH 0943/1224] LDAP: transliterate other latin characters to ASCII
 when creating owncloud names. Already created usernames are not being
 affected.

---
 apps/user_ldap/lib/access.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php
index ec3b526491..68df4c4cb9 100644
--- a/apps/user_ldap/lib/access.php
+++ b/apps/user_ldap/lib/access.php
@@ -564,6 +564,10 @@ abstract class Access {
 			return $name;
 		}
 
+		// Translitaration
+		//latin characters to ASCII
+		$name = iconv('UTF-8', 'ASCII//TRANSLIT', $name);
+
 		//REPLACEMENTS
 		$name = \OCP\Util::mb_str_replace(' ', '_', $name, 'UTF-8');
 

From c2290a542eddb52b89d5bb685b9e57d7bddfe3ce Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <frank@owncloud.org>
Date: Mon, 27 Aug 2012 22:58:50 +0200
Subject: [PATCH 0944/1224] add deprecated 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 8e64b0cafd..419bdb1b12 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. Encryption is not yet compatible with LDAP.</description>
+	<description>Server side encryption of files. DEPRECATED. This app is no longer supported and will be replaced with an improved version in ownCloud 5. Only enable this features if you want to read old encrypted data. 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 6b5f1ffdb4c327c4bbda6b721b78bf594139d336 Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Mon, 27 Aug 2012 13:45:54 -0700
Subject: [PATCH 0945/1224] upload button improvement, better separation, fix
 wrap issue

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

diff --git a/apps/files/css/files.css b/apps/files/css/files.css
index 7298a7ef6e..bdd35285e7 100644
--- a/apps/files/css/files.css
+++ b/apps/files/css/files.css
@@ -3,7 +3,7 @@
  See the COPYING-README file. */
 
 /* FILE MENU */
-.actions { padding:.3em; float:left; height:2em; }
+.actions { padding:.3em; float:left; height:2em; width:10em; }
 .actions input, .actions button, .actions .button { margin:0; }
 #file_menu { right:0; position:absolute; top:0; }
 #file_menu a { display:block; float:left; background-image:none; text-decoration:none; }
@@ -19,7 +19,8 @@
 #new>ul>li { margin:.3em; padding-left:2em; background-repeat:no-repeat; cursor:pointer; padding-bottom:0.1em }
 #new>ul>li>p { cursor:pointer; }
 #new>ul>li>input { padding:0.3em; margin:-0.3em; }
-#new, .file_upload_filename { background:#5bb75b; border:1px solid; border-color:#51a351 #51a351 #387038; -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; }
+#new, .file_upload_filename { background:#5bb75b; border:1px solid; border-color:#51a351 #419341 #387038; -moz-box-shadow:0 1px 1px #f8f8f8, 1px 1px 1px #ada inset; -webkit-box-shadow:0 1px 1px #f8f8f8, 1px 1px 1px #ada inset; box-shadow:0 1px 1px #f8f8f8, 1px 1px 1px #ada inset; }
+#new .popup { border-top-left-radius:0; }
 
 #file_newfolder_name { background-image:url('%webroot%/core/img/places/folder.svg'); font-weight:normal; width:7em; }
 .file_upload_start, .file_upload_filename { font-size:1em; }
@@ -88,4 +89,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; }
\ No newline at end of file
+#scanning-message{ top:40%; left:40%; position:absolute; display:none; }

From 4910717c0927eecb5fac55c83f7f6b6e74c0679c Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Mon, 27 Aug 2012 13:49:34 -0700
Subject: [PATCH 0946/1224] remove background fade from navigation, fix
 flickering icon issue and make it feel faster

---
 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 dd6f9d4675..488ac48e4b 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -95,7 +95,7 @@ label.infield { cursor: text !important; }
 
 /* NAVIGATION ------------------------------------------------------------- */
 #navigation { position:fixed; top:3.5em; float:left; width:12.5em; padding:0; z-index:75; height:100%; background:#eee; border-right: 1px #ccc solid; -moz-box-shadow: -3px 0 7px #000; -webkit-box-shadow: -3px 0 7px #000; box-shadow: -3px 0 7px #000; overflow:hidden;}
-#navigation a { display:block; padding:.6em .5em .4em 2.5em; background:#eee 1em center no-repeat; border-bottom:1px solid #ddd; border-top:1px solid #fff; text-decoration:none; font-size:1.2em; color:#666; text-shadow:#f8f8f8 0 1px 0; -webkit-transition:background 300ms; -moz-transition:background 300ms; -o-transition:background 300ms; transition:background 300ms; }
+#navigation a { display:block; padding:.6em .5em .4em 2.5em; background:#eee 1em center no-repeat; border-bottom:1px solid #ddd; border-top:1px solid #fff; text-decoration:none; font-size:1.2em; color:#666; text-shadow:#f8f8f8 0 1px 0; }
 #navigation a.active, #navigation a:hover, #navigation a:focus { background-color:#dbdbdb; border-top:1px solid #d4d4d4; border-bottom:1px solid #ccc; color:#333; }
 #navigation a.active { background-color:#ddd; }
 #navigation #settings { position:absolute; bottom:3.5em; width:100%; }

From 09300e5f6ea80dd96fbd3edaa8cea01022c02507 Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Mon, 27 Aug 2012 14:05:04 -0700
Subject: [PATCH 0947/1224] fix cronjobs radio button width

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

diff --git a/settings/css/settings.css b/settings/css/settings.css
index 373b15bff6..5a0f5bbde9 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -64,3 +64,4 @@ span.version { margin-left:3em; margin-right:3em; color:#555; }
 span.securitywarning {color:#C33; font-weight:bold; }
 h3.settingsNotice { font-size: 1.2em; }
 .settingsNotice { font-weight:bold; padding: 0.5em 0; }
+#backgroundjobs input[type=radio] { width:1em; }

From 2abb63de702b74617cb5d1bff54d1066a788bddf Mon Sep 17 00:00:00 2001
From: Thomas Mueller <thomas.mueller@tmit.eu>
Date: Tue, 28 Aug 2012 00:12:01 +0200
Subject: [PATCH 0948/1224] assert array length and individual content instead
 of assertEqual on arrays

---
 tests/lib/share/share.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/tests/lib/share/share.php b/tests/lib/share/share.php
index 303790b486..8f621b9e1c 100644
--- a/tests/lib/share/share.php
+++ b/tests/lib/share/share.php
@@ -241,8 +241,13 @@ 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->user3);
 		$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'));
+		$to_test = OCP\Share::getItemsSharedWith('test', Test_Share_Backend::FORMAT_TARGET);
+		$this->assertEqual(count($to_test), 2);
+		$this->assertTrue(in_array('test.txt', $to_test));
+		$this->assertTrue(in_array('test1.txt', $to_test));
+		//$this->assertEqual($to_test, array('test.txt', 'test1.txt'));
 
 		// Remove user
 		OC_User::deleteUser($this->user1);

From 07df52c9980286aaa78fca0f3aed6372f6c1ae51 Mon Sep 17 00:00:00 2001
From: Thomas Mueller <thomas.mueller@tmit.eu>
Date: Tue, 28 Aug 2012 00:35:10 +0200
Subject: [PATCH 0949/1224] assert array length and individual content instead
 of assertEqual on arrays

---
 tests/lib/share/share.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/tests/lib/share/share.php b/tests/lib/share/share.php
index 8f621b9e1c..22de569103 100644
--- a/tests/lib/share/share.php
+++ b/tests/lib/share/share.php
@@ -247,7 +247,6 @@ class Test_Share extends UnitTestCase {
 		$this->assertEqual(count($to_test), 2);
 		$this->assertTrue(in_array('test.txt', $to_test));
 		$this->assertTrue(in_array('test1.txt', $to_test));
-		//$this->assertEqual($to_test, array('test.txt', 'test1.txt'));
 
 		// Remove user
 		OC_User::deleteUser($this->user1);
@@ -363,7 +362,12 @@ class Test_Share extends UnitTestCase {
 		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'));
+		$to_test = OCP\Share::getItemsSharedWith('test', Test_Share_Backend::FORMAT_TARGET);
+		$this->assertEqual(count($to_test), 2);
+		$this->assertTrue(in_array('test.txt', $to_test));
+		$this->assertTrue(in_array('test1.txt', $to_test));
+		$this->dump($to_test, "array of shared items in test");
+		//$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', 'test.txt', OCP\Share::SHARE_TYPE_USER, $this->user4, OCP\Share::PERMISSION_READ | OCP\Share::PERMISSION_SHARE));

From 8374a49cc19cf43489a415388fd782ba1574ee82 Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <thomas.mueller@tmit.eu>
Date: Tue, 28 Aug 2012 02:03:56 +0200
Subject: [PATCH 0950/1224] [tx-robot] updated from transifex

---
 apps/files/l10n/hr.php              |  7 +++
 apps/files_encryption/l10n/es.php   |  5 +-
 apps/files_encryption/l10n/eu.php   |  6 +++
 apps/files_external/l10n/eu.php     | 16 ++++++
 apps/files_external/l10n/nb_NO.php  |  8 +++
 apps/files_external/l10n/nl.php     | 18 +++++++
 apps/files_sharing/l10n/eu.php      |  6 +++
 apps/files_sharing/l10n/sl.php      |  2 +-
 apps/files_versions/l10n/es.php     |  1 +
 apps/files_versions/l10n/eu.php     |  4 ++
 apps/user_ldap/l10n/eu.php          | 36 ++++++++++++++
 core/l10n/de.php                    |  1 -
 core/l10n/el.php                    |  1 -
 core/l10n/et_EE.php                 |  1 -
 core/l10n/it.php                    |  1 -
 core/l10n/sl.php                    |  1 -
 core/l10n/sv.php                    |  1 -
 core/l10n/th_TH.php                 |  1 -
 l10n/af/core.po                     |  4 +-
 l10n/ar/core.po                     |  4 +-
 l10n/ar_SA/core.po                  |  4 +-
 l10n/bg_BG/core.po                  |  4 +-
 l10n/ca/core.po                     |  4 +-
 l10n/cs_CZ/core.po                  |  4 +-
 l10n/da/core.po                     |  4 +-
 l10n/de/core.po                     |  8 +--
 l10n/el/core.po                     |  8 +--
 l10n/eo/core.po                     |  4 +-
 l10n/es/core.po                     |  4 +-
 l10n/es/files_encryption.po         | 10 ++--
 l10n/es/files_versions.po           |  9 ++--
 l10n/et_EE/core.po                  |  8 +--
 l10n/eu/core.po                     |  4 +-
 l10n/eu/files_encryption.po         | 15 +++---
 l10n/eu/files_external.po           | 35 +++++++-------
 l10n/eu/files_sharing.po            | 15 +++---
 l10n/eu/files_versions.po           | 11 +++--
 l10n/eu/settings.po                 | 20 ++++----
 l10n/eu/user_ldap.po                | 75 +++++++++++++++--------------
 l10n/eu_ES/core.po                  |  4 +-
 l10n/fa/core.po                     |  4 +-
 l10n/fi/core.po                     |  4 +-
 l10n/fi_FI/core.po                  |  4 +-
 l10n/fr/core.po                     |  4 +-
 l10n/gl/core.po                     |  4 +-
 l10n/he/core.po                     |  4 +-
 l10n/hr/core.po                     |  4 +-
 l10n/hr/files.po                    | 23 ++++-----
 l10n/hr/settings.po                 | 21 ++++----
 l10n/hu_HU/core.po                  |  4 +-
 l10n/hy/core.po                     |  4 +-
 l10n/ia/core.po                     |  4 +-
 l10n/id/core.po                     |  4 +-
 l10n/id_ID/core.po                  |  4 +-
 l10n/it/core.po                     |  8 +--
 l10n/ja_JP/core.po                  |  4 +-
 l10n/ko/core.po                     |  4 +-
 l10n/lb/core.po                     |  4 +-
 l10n/lt_LT/core.po                  |  4 +-
 l10n/lv/core.po                     |  4 +-
 l10n/mk/core.po                     |  4 +-
 l10n/ms_MY/core.po                  |  4 +-
 l10n/nb_NO/core.po                  |  4 +-
 l10n/nb_NO/files_external.po        | 19 ++++----
 l10n/nl/core.po                     |  4 +-
 l10n/nl/files_external.po           | 39 +++++++--------
 l10n/nn_NO/core.po                  |  4 +-
 l10n/pl/core.po                     |  4 +-
 l10n/pt_BR/core.po                  |  4 +-
 l10n/pt_PT/core.po                  |  4 +-
 l10n/ro/core.po                     |  4 +-
 l10n/ru/core.po                     |  4 +-
 l10n/sk_SK/core.po                  |  4 +-
 l10n/sl/core.po                     |  8 +--
 l10n/sl/files_sharing.po            |  8 +--
 l10n/so/core.po                     |  4 +-
 l10n/sr/core.po                     |  4 +-
 l10n/sr@latin/core.po               |  4 +-
 l10n/sv/core.po                     |  8 +--
 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/lib.pot              |  2 +-
 l10n/templates/settings.pot         |  2 +-
 l10n/templates/user_ldap.pot        |  2 +-
 l10n/th_TH/core.po                  |  8 +--
 l10n/tr/core.po                     |  4 +-
 l10n/uk/core.po                     |  4 +-
 l10n/vi/core.po                     |  4 +-
 l10n/zh_CN.GB2312/core.po           |  4 +-
 l10n/zh_CN/core.po                  |  4 +-
 l10n/zh_TW/core.po                  |  4 +-
 settings/l10n/eu.php                |  7 +++
 settings/l10n/hr.php                |  7 +++
 97 files changed, 409 insertions(+), 287 deletions(-)
 create mode 100644 apps/files_encryption/l10n/eu.php
 create mode 100644 apps/files_external/l10n/eu.php
 create mode 100644 apps/files_external/l10n/nb_NO.php
 create mode 100644 apps/files_external/l10n/nl.php
 create mode 100644 apps/files_sharing/l10n/eu.php
 create mode 100644 apps/files_versions/l10n/eu.php
 create mode 100644 apps/user_ldap/l10n/eu.php

diff --git a/apps/files/l10n/hr.php b/apps/files/l10n/hr.php
index 7d5e61b354..cb8eb4033c 100644
--- a/apps/files/l10n/hr.php
+++ b/apps/files/l10n/hr.php
@@ -8,6 +8,13 @@
 "Failed to write to disk" => "Neuspjelo pisanje na disk",
 "Files" => "Datoteke",
 "Delete" => "Briši",
+"already exists" => "već postoji",
+"replace" => "zamjeni",
+"cancel" => "odustani",
+"replaced" => "zamjenjeno",
+"with" => "sa",
+"undo" => "vrati",
+"deleted" => "izbrisano",
 "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",
diff --git a/apps/files_encryption/l10n/es.php b/apps/files_encryption/l10n/es.php
index 26ace24e33..b7e7601b35 100644
--- a/apps/files_encryption/l10n/es.php
+++ b/apps/files_encryption/l10n/es.php
@@ -1,3 +1,6 @@
 <?php $TRANSLATIONS = array(
-"Encryption" => "Cifrado"
+"Encryption" => "Cifrado",
+"Exclude the following file types from encryption" => "Excluir del cifrado los siguientes tipos de archivo",
+"None" => "Ninguno",
+"Enable Encryption" => "Habilitar cifrado"
 );
diff --git a/apps/files_encryption/l10n/eu.php b/apps/files_encryption/l10n/eu.php
new file mode 100644
index 0000000000..57b6a4927b
--- /dev/null
+++ b/apps/files_encryption/l10n/eu.php
@@ -0,0 +1,6 @@
+<?php $TRANSLATIONS = array(
+"Encryption" => "Enkriptazioa",
+"Exclude the following file types from encryption" => "Ez enkriptatu hurrengo fitxategi motak",
+"None" => "Bat ere ez",
+"Enable Encryption" => "Gaitu enkriptazioa"
+);
diff --git a/apps/files_external/l10n/eu.php b/apps/files_external/l10n/eu.php
new file mode 100644
index 0000000000..a594cdff1f
--- /dev/null
+++ b/apps/files_external/l10n/eu.php
@@ -0,0 +1,16 @@
+<?php $TRANSLATIONS = array(
+"External Storage" => "Kanpoko Biltegiratzea",
+"Mount point" => "Montatze puntua",
+"Configuration" => "Konfigurazioa",
+"Options" => "Aukerak",
+"Add mount point" => "Gehitu muntatze puntua",
+"None set" => "Ezarri gabe",
+"All Users" => "Erabiltzaile guztiak",
+"Groups" => "Taldeak",
+"Users" => "Erabiltzaileak",
+"Delete" => "Ezabatu",
+"SSL root certificates" => "SSL erro ziurtagiriak",
+"Import Root Certificate" => "Inportatu Erro Ziurtagiria",
+"Enable User External Storage" => "Gaitu erabiltzaileentzako Kanpo Biltegiratzea",
+"Allow users to mount their own external storage" => "Baimendu erabiltzaileak bere kanpo biltegiratzeak muntatzen"
+);
diff --git a/apps/files_external/l10n/nb_NO.php b/apps/files_external/l10n/nb_NO.php
new file mode 100644
index 0000000000..273b40cf8e
--- /dev/null
+++ b/apps/files_external/l10n/nb_NO.php
@@ -0,0 +1,8 @@
+<?php $TRANSLATIONS = array(
+"Configuration" => "Konfigurasjon",
+"Options" => "Innstillinger",
+"All Users" => "Alle brukere",
+"Groups" => "Grupper",
+"Users" => "Brukere",
+"Delete" => "Slett"
+);
diff --git a/apps/files_external/l10n/nl.php b/apps/files_external/l10n/nl.php
new file mode 100644
index 0000000000..f3f38260a8
--- /dev/null
+++ b/apps/files_external/l10n/nl.php
@@ -0,0 +1,18 @@
+<?php $TRANSLATIONS = array(
+"External Storage" => "Externe opslag",
+"Mount point" => "Aankoppelpunt",
+"Backend" => "Backend",
+"Configuration" => "Configuratie",
+"Options" => "Opties",
+"Applicable" => "Van toepassing",
+"Add mount point" => "Voeg aankoppelpunt toe",
+"None set" => "Niets ingesteld",
+"All Users" => "Alle gebruikers",
+"Groups" => "Groepen",
+"Users" => "Gebruikers",
+"Delete" => "Verwijder",
+"SSL root certificates" => "SSL root certificaten",
+"Import Root Certificate" => "Importeer root certificaat",
+"Enable User External Storage" => "Zet gebruiker's externe opslag aan",
+"Allow users to mount their own external storage" => "Sta gebruikers toe om hun eigen externe opslag aan te koppelen"
+);
diff --git a/apps/files_sharing/l10n/eu.php b/apps/files_sharing/l10n/eu.php
new file mode 100644
index 0000000000..916c3151dc
--- /dev/null
+++ b/apps/files_sharing/l10n/eu.php
@@ -0,0 +1,6 @@
+<?php $TRANSLATIONS = array(
+"Size" => "Tamaina",
+"Modified" => "Aldatuta",
+"Delete all" => "Ezabatu dena",
+"Delete" => "Ezabatu"
+);
diff --git a/apps/files_sharing/l10n/sl.php b/apps/files_sharing/l10n/sl.php
index 485ab7a85a..a241c6e504 100644
--- a/apps/files_sharing/l10n/sl.php
+++ b/apps/files_sharing/l10n/sl.php
@@ -2,5 +2,5 @@
 "Size" => "Velikost",
 "Modified" => "Spremenjeno",
 "Delete all" => "Izbriši vse",
-"Delete" => "Izbris"
+"Delete" => "Izbriši"
 );
diff --git a/apps/files_versions/l10n/es.php b/apps/files_versions/l10n/es.php
index d5be72b174..be416f5bfb 100644
--- a/apps/files_versions/l10n/es.php
+++ b/apps/files_versions/l10n/es.php
@@ -1,3 +1,4 @@
 <?php $TRANSLATIONS = array(
+"Expire all versions" => "Expirar todas las versiones",
 "Enable Files Versioning" => "Habilitar versionamiento de archivos"
 );
diff --git a/apps/files_versions/l10n/eu.php b/apps/files_versions/l10n/eu.php
new file mode 100644
index 0000000000..eacbdd0993
--- /dev/null
+++ b/apps/files_versions/l10n/eu.php
@@ -0,0 +1,4 @@
+<?php $TRANSLATIONS = array(
+"Expire all versions" => "Iraungi bertsio guztiak",
+"Enable Files Versioning" => "Gaitu fitxategien bertsioak"
+);
diff --git a/apps/user_ldap/l10n/eu.php b/apps/user_ldap/l10n/eu.php
new file mode 100644
index 0000000000..cc042b1389
--- /dev/null
+++ b/apps/user_ldap/l10n/eu.php
@@ -0,0 +1,36 @@
+<?php $TRANSLATIONS = array(
+"Host" => "Hostalaria",
+"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Protokoloa ez da beharrezkoa, SSL behar baldin ez baduzu. Honela bada hasi ldaps://",
+"Base DN" => "Oinarrizko DN",
+"You can specify Base DN for users and groups in the Advanced tab" => "Erabiltzaile eta taldeentzako Oinarrizko DN zehaztu dezakezu Aurreratu fitxan",
+"User DN" => "Erabiltzaile 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." => "Lotura egingo den bezero erabiltzailearen DNa, adb. uid=agent,dc=example,dc=com. Sarrera anonimoak gaitzeko utzi DN eta Pasahitza hutsik.",
+"Password" => "Pasahitza",
+"For anonymous access, leave DN and Password empty." => "Sarrera anonimoak gaitzeko utzi DN eta Pasahitza hutsik.",
+"User Login Filter" => "Erabiltzaileen saioa hasteko iragazkia",
+"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Saioa hastean erabiliko den iragazkia zehazten du. %%uid-ek erabiltzaile izena ordezkatzen du saioa hasterakoan.",
+"use %%uid placeholder, e.g. \"uid=%%uid\"" => "erabili %%uid txantiloia, adb. \"uid=%%uid\"",
+"User List Filter" => "Erabiltzaile zerrendaren Iragazkia",
+"Defines the filter to apply, when retrieving users." => "Erabiltzaileak jasotzen direnean ezarriko den iragazkia zehazten du.",
+"without any placeholder, e.g. \"objectClass=person\"." => "txantiloirik gabe, adb. \"objectClass=person\".",
+"Group Filter" => "Taldeen iragazkia",
+"Defines the filter to apply, when retrieving groups." => "Taldeak jasotzen direnean ezarriko den iragazkia zehazten du.",
+"without any placeholder, e.g. \"objectClass=posixGroup\"." => "txantiloirik gabe, adb. \"objectClass=posixGroup\".",
+"Port" => "Portua",
+"Base User Tree" => "Oinarrizko Erabiltzaile Zuhaitza",
+"Base Group Tree" => "Oinarrizko Talde Zuhaitza",
+"Group-Member association" => "Talde-Kide elkarketak",
+"Use TLS" => "Erabili TLS",
+"Do not use it for SSL connections, it will fail." => "Ez erabili SSL konexioetan, huts egingo du.",
+"Case insensitve LDAP server (Windows)" => "Maiuskulak eta minuskulak ezberditzen ez dituen LDAP zerbitzaria (windows)",
+"Turn off SSL certificate validation." => "Ezgaitu SSL ziurtagirien egiaztapena.",
+"If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Konexioa aukera hau ezinbestekoa badu, inportatu LDAP zerbitzariaren SSL ziurtagiria zure ownCloud zerbitzarian.",
+"Not recommended, use for testing only." => "Ez da aholkatzen, erabili bakarrik frogak egiteko.",
+"User Display Name Field" => "Erabiltzaileen bistaratzeko izena duen eremua",
+"The LDAP attribute to use to generate the user`s ownCloud name." => "ownCloud erabiltzailearen izena sortzeko erabiliko den LDAP atributua",
+"Group Display Name Field" => "Taldeen bistaratzeko izena duen eremua",
+"The LDAP attribute to use to generate the groups`s ownCloud name." => "ownCloud taldearen izena sortzeko erabiliko den LDAP atributua",
+"in bytes" => "bytetan",
+"in seconds. A change empties the cache." => "segundutan. Aldaketak katxea husten du.",
+"Help" => "Laguntza"
+);
diff --git a/core/l10n/de.php b/core/l10n/de.php
index 863916bbc6..9ed2d61782 100644
--- a/core/l10n/de.php
+++ b/core/l10n/de.php
@@ -51,7 +51,6 @@
 "Database user" => "Datenbank-Benutzer",
 "Database password" => "Datenbank-Passwort",
 "Database name" => "Datenbank-Name",
-"Database tablespace" => "Datenbank-Tablespace",
 "Database host" => "Datenbank-Host",
 "Finish setup" => "Installation abschließen",
 "web services under your control" => "Web-Services unter Ihrer Kontrolle",
diff --git a/core/l10n/el.php b/core/l10n/el.php
index 38d3d091cb..d8f32fb51e 100644
--- a/core/l10n/el.php
+++ b/core/l10n/el.php
@@ -51,7 +51,6 @@
 "Database user" => "Χρήστης της βάσης δεδομένων",
 "Database password" => "Κωδικός πρόσβασης βάσης δεδομένων",
 "Database name" => "Όνομα βάσης δεδομένων",
-"Database tablespace" => "Πίνακες της βάσης δεδομένων",
 "Database host" => "Διακομιστής βάσης δεδομένων",
 "Finish setup" => "Ολοκλήρωση εγκατάστασης",
 "web services under your control" => "Υπηρεσίες web υπό τον έλεγχό σας",
diff --git a/core/l10n/et_EE.php b/core/l10n/et_EE.php
index 5809229a58..734021605c 100644
--- a/core/l10n/et_EE.php
+++ b/core/l10n/et_EE.php
@@ -51,7 +51,6 @@
 "Database user" => "Andmebaasi kasutaja",
 "Database password" => "Andmebaasi parool",
 "Database name" => "Andmebasi nimi",
-"Database tablespace" => "Andmebaasi tabeliruum",
 "Database host" => "Andmebaasi host",
 "Finish setup" => "Lõpeta seadistamine",
 "web services under your control" => "veebiteenused sinu kontrolli all",
diff --git a/core/l10n/it.php b/core/l10n/it.php
index 5329f8fe2e..1c0bf94ca7 100644
--- a/core/l10n/it.php
+++ b/core/l10n/it.php
@@ -51,7 +51,6 @@
 "Database user" => "Utente del database",
 "Database password" => "Password del database",
 "Database name" => "Nome del database",
-"Database tablespace" => "Spazio delle tabelle del database",
 "Database host" => "Host del database",
 "Finish setup" => "Termina la configurazione",
 "web services under your control" => "servizi web nelle tue mani",
diff --git a/core/l10n/sl.php b/core/l10n/sl.php
index ad41231431..2f998c9549 100644
--- a/core/l10n/sl.php
+++ b/core/l10n/sl.php
@@ -51,7 +51,6 @@
 "Database user" => "Uporabnik zbirke",
 "Database password" => "Geslo podatkovne zbirke",
 "Database name" => "Ime podatkovne zbirke",
-"Database tablespace" => "Razpredelnica podatkovne zbirke",
 "Database host" => "Gostitelj podatkovne zbirke",
 "Finish setup" => "Dokončaj namestitev",
 "web services under your control" => "spletne storitve pod vašim nadzorom",
diff --git a/core/l10n/sv.php b/core/l10n/sv.php
index 41d8d70f2a..25ba95558e 100644
--- a/core/l10n/sv.php
+++ b/core/l10n/sv.php
@@ -51,7 +51,6 @@
 "Database user" => "Databasanvändare",
 "Database password" => "Lösenord till databasen",
 "Database name" => "Databasnamn",
-"Database tablespace" => "Tabellutrymme för databas",
 "Database host" => "Databasserver",
 "Finish setup" => "Avsluta installation",
 "web services under your control" => "webbtjänster under din kontroll",
diff --git a/core/l10n/th_TH.php b/core/l10n/th_TH.php
index 4bfdb524fe..8bd4d36524 100644
--- a/core/l10n/th_TH.php
+++ b/core/l10n/th_TH.php
@@ -51,7 +51,6 @@
 "Database user" => "ชื่อผู้ใช้งานฐานข้อมูล",
 "Database password" => "รหัสผ่านฐานข้อมูล",
 "Database name" => "ชื่อฐานข้อมูล",
-"Database tablespace" => "พื้นที่ตารางในฐานข้อมูล",
 "Database host" => "Database host",
 "Finish setup" => "ติดตั้งเรียบร้อยแล้ว",
 "web services under your control" => "web services under your control",
diff --git a/l10n/af/core.po b/l10n/af/core.po
index aec45fb5b7..001cac78bc 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-08-26 19:46+0200\n"
-"PO-Revision-Date: 2012-08-26 17:34+0000\n"
+"POT-Creation-Date: 2012-08-28 02:01+0200\n"
+"PO-Revision-Date: 2012-08-28 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"
diff --git a/l10n/ar/core.po b/l10n/ar/core.po
index 30745b59b9..0ec803f64e 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-08-26 19:46+0200\n"
-"PO-Revision-Date: 2012-08-26 17:34+0000\n"
+"POT-Creation-Date: 2012-08-28 02:01+0200\n"
+"PO-Revision-Date: 2012-08-28 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"
diff --git a/l10n/ar_SA/core.po b/l10n/ar_SA/core.po
index 344208e032..5878f90792 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-08-26 19:46+0200\n"
-"PO-Revision-Date: 2012-08-26 17:34+0000\n"
+"POT-Creation-Date: 2012-08-28 02:01+0200\n"
+"PO-Revision-Date: 2012-08-28 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"
diff --git a/l10n/bg_BG/core.po b/l10n/bg_BG/core.po
index 062286a147..02fa44cb78 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-08-26 19:46+0200\n"
-"PO-Revision-Date: 2012-08-26 17:34+0000\n"
+"POT-Creation-Date: 2012-08-28 02:01+0200\n"
+"PO-Revision-Date: 2012-08-28 00:01+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"
diff --git a/l10n/ca/core.po b/l10n/ca/core.po
index 65aacdcea9..e8b808d6af 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-08-26 19:46+0200\n"
-"PO-Revision-Date: 2012-08-26 17:34+0000\n"
+"POT-Creation-Date: 2012-08-28 02:01+0200\n"
+"PO-Revision-Date: 2012-08-28 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"
diff --git a/l10n/cs_CZ/core.po b/l10n/cs_CZ/core.po
index a9eefd2789..84cea7fb08 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-08-26 19:46+0200\n"
-"PO-Revision-Date: 2012-08-26 17:34+0000\n"
+"POT-Creation-Date: 2012-08-28 02:01+0200\n"
+"PO-Revision-Date: 2012-08-28 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"
diff --git a/l10n/da/core.po b/l10n/da/core.po
index 2ea6375c6b..d5210b045c 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-08-26 19:46+0200\n"
-"PO-Revision-Date: 2012-08-26 17:34+0000\n"
+"POT-Creation-Date: 2012-08-28 02:01+0200\n"
+"PO-Revision-Date: 2012-08-28 00:01+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"
diff --git a/l10n/de/core.po b/l10n/de/core.po
index d8bab06948..b7300133f0 100644
--- a/l10n/de/core.po
+++ b/l10n/de/core.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-26 19:46+0200\n"
-"PO-Revision-Date: 2012-08-26 17:45+0000\n"
-"Last-Translator: traductor <transifex.3.mensaje@spamgourmet.com>\n"
+"POT-Creation-Date: 2012-08-28 02:01+0200\n"
+"PO-Revision-Date: 2012-08-28 00:01+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"
@@ -240,7 +240,7 @@ msgstr "Datenbank-Name"
 
 #: templates/installation.php:109
 msgid "Database tablespace"
-msgstr "Datenbank-Tablespace"
+msgstr ""
 
 #: templates/installation.php:115
 msgid "Database host"
diff --git a/l10n/el/core.po b/l10n/el/core.po
index 8471fb6059..ffd90d39f2 100644
--- a/l10n/el/core.po
+++ b/l10n/el/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-08-27 02:01+0200\n"
-"PO-Revision-Date: 2012-08-26 21:39+0000\n"
-"Last-Translator: Petros Kyladitis <petros.kyladitis@gmail.com>\n"
+"POT-Creation-Date: 2012-08-28 02:01+0200\n"
+"PO-Revision-Date: 2012-08-28 00:01+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"
@@ -233,7 +233,7 @@ msgstr "Όνομα βάσης δεδομένων"
 
 #: templates/installation.php:109
 msgid "Database tablespace"
-msgstr "Πίνακες της βάσης δεδομένων"
+msgstr ""
 
 #: templates/installation.php:115
 msgid "Database host"
diff --git a/l10n/eo/core.po b/l10n/eo/core.po
index 50049497e1..d870802209 100644
--- a/l10n/eo/core.po
+++ b/l10n/eo/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-08-26 19:46+0200\n"
-"PO-Revision-Date: 2012-08-26 17:34+0000\n"
+"POT-Creation-Date: 2012-08-28 02:01+0200\n"
+"PO-Revision-Date: 2012-08-28 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"
diff --git a/l10n/es/core.po b/l10n/es/core.po
index 1c14dc7b57..339d3e2d62 100644
--- a/l10n/es/core.po
+++ b/l10n/es/core.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-26 19:46+0200\n"
-"PO-Revision-Date: 2012-08-26 17:34+0000\n"
+"POT-Creation-Date: 2012-08-28 02:01+0200\n"
+"PO-Revision-Date: 2012-08-28 00:01+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"
diff --git a/l10n/es/files_encryption.po b/l10n/es/files_encryption.po
index 4c88d29c38..9b75acf31d 100644
--- a/l10n/es/files_encryption.po
+++ b/l10n/es/files_encryption.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-22 21:47+0000\n"
+"POT-Creation-Date: 2012-08-28 02:01+0200\n"
+"PO-Revision-Date: 2012-08-27 05:27+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"
@@ -24,12 +24,12 @@ msgstr "Cifrado"
 
 #: templates/settings.php:4
 msgid "Exclude the following file types from encryption"
-msgstr ""
+msgstr "Excluir del cifrado los siguientes tipos de archivo"
 
 #: templates/settings.php:5
 msgid "None"
-msgstr ""
+msgstr "Ninguno"
 
 #: templates/settings.php:10
 msgid "Enable Encryption"
-msgstr ""
+msgstr "Habilitar cifrado"
diff --git a/l10n/es/files_versions.po b/l10n/es/files_versions.po
index 0b5cfbe22c..544b3a53b0 100644
--- a/l10n/es/files_versions.po
+++ b/l10n/es/files_versions.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # Javier Llorente <javier@opensuse.org>, 2012.
+#   <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-24 02:02+0200\n"
-"PO-Revision-Date: 2012-08-23 09:28+0000\n"
-"Last-Translator: Javier Llorente <javier@opensuse.org>\n"
+"POT-Creation-Date: 2012-08-28 02:01+0200\n"
+"PO-Revision-Date: 2012-08-27 05:54+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"
@@ -20,7 +21,7 @@ msgstr ""
 
 #: js/settings-personal.js:31
 msgid "Expire all versions"
-msgstr ""
+msgstr "Expirar todas las versiones"
 
 #: templates/settings.php:3
 msgid "Enable Files Versioning"
diff --git a/l10n/et_EE/core.po b/l10n/et_EE/core.po
index 317bacff86..b02a246201 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-08-26 19:46+0200\n"
-"PO-Revision-Date: 2012-08-26 17:41+0000\n"
-"Last-Translator: Rivo Zängov <eraser@eraser.ee>\n"
+"POT-Creation-Date: 2012-08-28 02:01+0200\n"
+"PO-Revision-Date: 2012-08-28 00:01+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"
@@ -230,7 +230,7 @@ msgstr "Andmebasi nimi"
 
 #: templates/installation.php:109
 msgid "Database tablespace"
-msgstr "Andmebaasi tabeliruum"
+msgstr ""
 
 #: templates/installation.php:115
 msgid "Database host"
diff --git a/l10n/eu/core.po b/l10n/eu/core.po
index d59282c027..109068c645 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-08-26 19:46+0200\n"
-"PO-Revision-Date: 2012-08-26 17:34+0000\n"
+"POT-Creation-Date: 2012-08-28 02:01+0200\n"
+"PO-Revision-Date: 2012-08-28 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"
diff --git a/l10n/eu/files_encryption.po b/l10n/eu/files_encryption.po
index 7b883fb9a8..cd97e58a49 100644
--- a/l10n/eu/files_encryption.po
+++ b/l10n/eu/files_encryption.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <asieriko@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-28 02:01+0200\n"
+"PO-Revision-Date: 2012-08-27 09:08+0000\n"
+"Last-Translator: asieriko <asieriko@gmail.com>\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"
@@ -19,16 +20,16 @@ msgstr ""
 
 #: templates/settings.php:3
 msgid "Encryption"
-msgstr ""
+msgstr "Enkriptazioa"
 
 #: templates/settings.php:4
 msgid "Exclude the following file types from encryption"
-msgstr ""
+msgstr "Ez enkriptatu hurrengo fitxategi motak"
 
 #: templates/settings.php:5
 msgid "None"
-msgstr ""
+msgstr "Bat ere ez"
 
 #: templates/settings.php:10
 msgid "Enable Encryption"
-msgstr ""
+msgstr "Gaitu enkriptazioa"
diff --git a/l10n/eu/files_external.po b/l10n/eu/files_external.po
index 488f582918..eae7996496 100644
--- a/l10n/eu/files_external.po
+++ b/l10n/eu/files_external.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <asieriko@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-28 02:01+0200\n"
+"PO-Revision-Date: 2012-08-27 09:04+0000\n"
+"Last-Translator: asieriko <asieriko@gmail.com>\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"
@@ -19,11 +20,11 @@ msgstr ""
 
 #: templates/settings.php:3
 msgid "External Storage"
-msgstr ""
+msgstr "Kanpoko Biltegiratzea"
 
 #: templates/settings.php:7 templates/settings.php:19
 msgid "Mount point"
-msgstr ""
+msgstr "Montatze puntua"
 
 #: templates/settings.php:8
 msgid "Backend"
@@ -31,11 +32,11 @@ msgstr ""
 
 #: templates/settings.php:9
 msgid "Configuration"
-msgstr ""
+msgstr "Konfigurazioa"
 
 #: templates/settings.php:10
 msgid "Options"
-msgstr ""
+msgstr "Aukerak"
 
 #: templates/settings.php:11
 msgid "Applicable"
@@ -43,40 +44,40 @@ msgstr ""
 
 #: templates/settings.php:23
 msgid "Add mount point"
-msgstr ""
+msgstr "Gehitu muntatze puntua"
 
 #: templates/settings.php:54 templates/settings.php:62
 msgid "None set"
-msgstr ""
+msgstr "Ezarri gabe"
 
 #: templates/settings.php:63
 msgid "All Users"
-msgstr ""
+msgstr "Erabiltzaile guztiak"
 
 #: templates/settings.php:64
 msgid "Groups"
-msgstr ""
+msgstr "Taldeak"
 
 #: templates/settings.php:69
 msgid "Users"
-msgstr ""
+msgstr "Erabiltzaileak"
 
 #: templates/settings.php:77 templates/settings.php:96
 msgid "Delete"
-msgstr ""
+msgstr "Ezabatu"
 
 #: templates/settings.php:88
 msgid "SSL root certificates"
-msgstr ""
+msgstr "SSL erro ziurtagiriak"
 
 #: templates/settings.php:102
 msgid "Import Root Certificate"
-msgstr ""
+msgstr "Inportatu Erro Ziurtagiria"
 
 #: templates/settings.php:108
 msgid "Enable User External Storage"
-msgstr ""
+msgstr "Gaitu erabiltzaileentzako Kanpo Biltegiratzea"
 
 #: templates/settings.php:109
 msgid "Allow users to mount their own external storage"
-msgstr ""
+msgstr "Baimendu erabiltzaileak bere kanpo biltegiratzeak muntatzen"
diff --git a/l10n/eu/files_sharing.po b/l10n/eu/files_sharing.po
index d316bfa649..a7eb7ffe2a 100644
--- a/l10n/eu/files_sharing.po
+++ b/l10n/eu/files_sharing.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <asieriko@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-28 02:01+0200\n"
+"PO-Revision-Date: 2012-08-27 08:54+0000\n"
+"Last-Translator: asieriko <asieriko@gmail.com>\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"
@@ -19,16 +20,16 @@ msgstr ""
 
 #: templates/get.php:4
 msgid "Size"
-msgstr ""
+msgstr "Tamaina"
 
 #: templates/get.php:5
 msgid "Modified"
-msgstr ""
+msgstr "Aldatuta"
 
 #: templates/get.php:5
 msgid "Delete all"
-msgstr ""
+msgstr "Ezabatu dena"
 
 #: templates/get.php:5
 msgid "Delete"
-msgstr ""
+msgstr "Ezabatu"
diff --git a/l10n/eu/files_versions.po b/l10n/eu/files_versions.po
index d2da93b8df..3279db24a3 100644
--- a/l10n/eu/files_versions.po
+++ b/l10n/eu/files_versions.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <asieriko@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-28 02:01+0200\n"
+"PO-Revision-Date: 2012-08-27 08:55+0000\n"
+"Last-Translator: asieriko <asieriko@gmail.com>\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"
@@ -19,8 +20,8 @@ msgstr ""
 
 #: js/settings-personal.js:31
 msgid "Expire all versions"
-msgstr ""
+msgstr "Iraungi bertsio guztiak"
 
 #: templates/settings.php:3
 msgid "Enable Files Versioning"
-msgstr ""
+msgstr "Gaitu fitxategien bertsioak"
diff --git a/l10n/eu/settings.po b/l10n/eu/settings.po
index d7ebcc2b28..b6a2050a81 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-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-28 02:01+0200\n"
+"PO-Revision-Date: 2012-08-27 11:17+0000\n"
+"Last-Translator: asieriko <asieriko@gmail.com>\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"
@@ -22,7 +22,7 @@ msgstr ""
 
 #: ajax/apps/ocs.php:23
 msgid "Unable to load list from App Store"
-msgstr ""
+msgstr "Ezin izan da App Dendatik zerrenda kargatu"
 
 #: ajax/lostpassword.php:14
 msgid "Email saved"
@@ -50,7 +50,7 @@ msgstr "Hizkuntza aldatuta"
 
 #: js/apps.js:18
 msgid "Error"
-msgstr ""
+msgstr "Errorea"
 
 #: js/apps.js:39 js/apps.js:73
 msgid "Disable"
@@ -74,19 +74,19 @@ msgstr "Segurtasun abisua"
 
 #: templates/admin.php:29
 msgid "Cron"
-msgstr ""
+msgstr "Cron"
 
 #: templates/admin.php:31
 msgid "execute one task with each page loaded"
-msgstr ""
+msgstr "exekutatu zeregina orri karga bakoitzean"
 
 #: templates/admin.php:33
 msgid "cron.php is registered at a webcron service"
-msgstr ""
+msgstr "cron.php webcron zerbitzu batean erregistratuta dago"
 
 #: templates/admin.php:35
 msgid "use systems cron service"
-msgstr ""
+msgstr "erabili sistemaren cron zerbitzua"
 
 #: templates/admin.php:39
 msgid "Log"
@@ -230,7 +230,7 @@ msgstr "Besteak"
 
 #: templates/users.php:80 templates/users.php:112
 msgid "Group Admin"
-msgstr ""
+msgstr "Talde administradorea"
 
 #: templates/users.php:82
 msgid "Quota"
diff --git a/l10n/eu/user_ldap.po b/l10n/eu/user_ldap.po
index a948e44d5c..95f361427d 100644
--- a/l10n/eu/user_ldap.po
+++ b/l10n/eu/user_ldap.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <asieriko@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-28 02:01+0200\n"
+"PO-Revision-Date: 2012-08-27 10:45+0000\n"
+"Last-Translator: asieriko <asieriko@gmail.com>\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"
@@ -19,146 +20,146 @@ msgstr ""
 
 #: templates/settings.php:8
 msgid "Host"
-msgstr ""
+msgstr "Hostalaria"
 
 #: templates/settings.php:8
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
-msgstr ""
+msgstr "Protokoloa ez da beharrezkoa, SSL behar baldin ez baduzu. Honela bada hasi ldaps://"
 
 #: templates/settings.php:9
 msgid "Base DN"
-msgstr ""
+msgstr "Oinarrizko DN"
 
 #: templates/settings.php:9
 msgid "You can specify Base DN for users and groups in the Advanced tab"
-msgstr ""
+msgstr "Erabiltzaile eta taldeentzako Oinarrizko DN zehaztu dezakezu Aurreratu fitxan"
 
 #: templates/settings.php:10
 msgid "User DN"
-msgstr ""
+msgstr "Erabiltzaile 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 "Lotura egingo den bezero erabiltzailearen DNa, adb. uid=agent,dc=example,dc=com. Sarrera anonimoak gaitzeko utzi DN eta Pasahitza hutsik."
 
 #: templates/settings.php:11
 msgid "Password"
-msgstr ""
+msgstr "Pasahitza"
 
 #: templates/settings.php:11
 msgid "For anonymous access, leave DN and Password empty."
-msgstr ""
+msgstr "Sarrera anonimoak gaitzeko utzi DN eta Pasahitza hutsik."
 
 #: templates/settings.php:12
 msgid "User Login Filter"
-msgstr ""
+msgstr "Erabiltzaileen saioa hasteko iragazkia"
 
 #: 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 "Saioa hastean erabiliko den iragazkia zehazten du. %%uid-ek erabiltzaile izena ordezkatzen du saioa hasterakoan."
 
 #: templates/settings.php:12
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr ""
+msgstr "erabili %%uid txantiloia, adb. \"uid=%%uid\""
 
 #: templates/settings.php:13
 msgid "User List Filter"
-msgstr ""
+msgstr "Erabiltzaile zerrendaren Iragazkia"
 
 #: templates/settings.php:13
 msgid "Defines the filter to apply, when retrieving users."
-msgstr ""
+msgstr "Erabiltzaileak jasotzen direnean ezarriko den iragazkia zehazten du."
 
 #: templates/settings.php:13
 msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr ""
+msgstr "txantiloirik gabe, adb. \"objectClass=person\"."
 
 #: templates/settings.php:14
 msgid "Group Filter"
-msgstr ""
+msgstr "Taldeen iragazkia"
 
 #: templates/settings.php:14
 msgid "Defines the filter to apply, when retrieving groups."
-msgstr ""
+msgstr "Taldeak jasotzen direnean ezarriko den iragazkia zehazten du."
 
 #: templates/settings.php:14
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr ""
+msgstr "txantiloirik gabe, adb. \"objectClass=posixGroup\"."
 
 #: templates/settings.php:17
 msgid "Port"
-msgstr ""
+msgstr "Portua"
 
 #: templates/settings.php:18
 msgid "Base User Tree"
-msgstr ""
+msgstr "Oinarrizko Erabiltzaile Zuhaitza"
 
 #: templates/settings.php:19
 msgid "Base Group Tree"
-msgstr ""
+msgstr "Oinarrizko Talde Zuhaitza"
 
 #: templates/settings.php:20
 msgid "Group-Member association"
-msgstr ""
+msgstr "Talde-Kide elkarketak"
 
 #: templates/settings.php:21
 msgid "Use TLS"
-msgstr ""
+msgstr "Erabili TLS"
 
 #: templates/settings.php:21
 msgid "Do not use it for SSL connections, it will fail."
-msgstr ""
+msgstr "Ez erabili SSL konexioetan, huts egingo du."
 
 #: templates/settings.php:22
 msgid "Case insensitve LDAP server (Windows)"
-msgstr ""
+msgstr "Maiuskulak eta minuskulak ezberditzen ez dituen LDAP zerbitzaria (windows)"
 
 #: templates/settings.php:23
 msgid "Turn off SSL certificate validation."
-msgstr ""
+msgstr "Ezgaitu SSL ziurtagirien egiaztapena."
 
 #: 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 "Konexioa aukera hau ezinbestekoa badu, inportatu LDAP zerbitzariaren SSL ziurtagiria zure ownCloud zerbitzarian."
 
 #: templates/settings.php:23
 msgid "Not recommended, use for testing only."
-msgstr ""
+msgstr "Ez da aholkatzen, erabili bakarrik frogak egiteko."
 
 #: templates/settings.php:24
 msgid "User Display Name Field"
-msgstr ""
+msgstr "Erabiltzaileen bistaratzeko izena duen eremua"
 
 #: templates/settings.php:24
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
-msgstr ""
+msgstr "ownCloud erabiltzailearen izena sortzeko erabiliko den LDAP atributua"
 
 #: templates/settings.php:25
 msgid "Group Display Name Field"
-msgstr ""
+msgstr "Taldeen bistaratzeko izena duen eremua"
 
 #: templates/settings.php:25
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
-msgstr ""
+msgstr "ownCloud taldearen izena sortzeko erabiliko den LDAP atributua"
 
 #: templates/settings.php:27
 msgid "in bytes"
-msgstr ""
+msgstr "bytetan"
 
 #: templates/settings.php:29
 msgid "in seconds. A change empties the cache."
-msgstr ""
+msgstr "segundutan. Aldaketak katxea husten du."
 
 #: templates/settings.php:31
 msgid "Help"
-msgstr ""
+msgstr "Laguntza"
diff --git a/l10n/eu_ES/core.po b/l10n/eu_ES/core.po
index 61d9181303..5c54a269c0 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-08-26 19:46+0200\n"
-"PO-Revision-Date: 2012-08-26 17:34+0000\n"
+"POT-Creation-Date: 2012-08-28 02:01+0200\n"
+"PO-Revision-Date: 2012-08-28 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"
diff --git a/l10n/fa/core.po b/l10n/fa/core.po
index a5a80d5aaa..3a6f8b7c70 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-08-26 19:46+0200\n"
-"PO-Revision-Date: 2012-08-26 17:34+0000\n"
+"POT-Creation-Date: 2012-08-28 02:01+0200\n"
+"PO-Revision-Date: 2012-08-28 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"
diff --git a/l10n/fi/core.po b/l10n/fi/core.po
index 3de62e935a..992a3d3065 100644
--- a/l10n/fi/core.po
+++ b/l10n/fi/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-08-26 19:46+0200\n"
-"PO-Revision-Date: 2012-08-26 17:34+0000\n"
+"POT-Creation-Date: 2012-08-28 02:01+0200\n"
+"PO-Revision-Date: 2012-08-28 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"
diff --git a/l10n/fi_FI/core.po b/l10n/fi_FI/core.po
index 99c2333e18..e78e8f7504 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-08-26 19:46+0200\n"
-"PO-Revision-Date: 2012-08-26 17:34+0000\n"
+"POT-Creation-Date: 2012-08-28 02:01+0200\n"
+"PO-Revision-Date: 2012-08-28 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"
diff --git a/l10n/fr/core.po b/l10n/fr/core.po
index 81ba7077c2..e7c3296956 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-08-26 19:46+0200\n"
-"PO-Revision-Date: 2012-08-26 17:34+0000\n"
+"POT-Creation-Date: 2012-08-28 02:01+0200\n"
+"PO-Revision-Date: 2012-08-28 00:01+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"
diff --git a/l10n/gl/core.po b/l10n/gl/core.po
index a9c669970c..fa591dfb3c 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-08-26 19:46+0200\n"
-"PO-Revision-Date: 2012-08-26 17:34+0000\n"
+"POT-Creation-Date: 2012-08-28 02:01+0200\n"
+"PO-Revision-Date: 2012-08-28 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"
diff --git a/l10n/he/core.po b/l10n/he/core.po
index ef368e2e31..db54c7bcbb 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-08-26 19:46+0200\n"
-"PO-Revision-Date: 2012-08-26 17:34+0000\n"
+"POT-Creation-Date: 2012-08-28 02:01+0200\n"
+"PO-Revision-Date: 2012-08-28 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"
diff --git a/l10n/hr/core.po b/l10n/hr/core.po
index 753af254f3..f4c681a5e1 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-08-26 19:46+0200\n"
-"PO-Revision-Date: 2012-08-26 17:34+0000\n"
+"POT-Creation-Date: 2012-08-28 02:01+0200\n"
+"PO-Revision-Date: 2012-08-28 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"
diff --git a/l10n/hr/files.po b/l10n/hr/files.po
index b14a71388e..b68ac016d9 100644
--- a/l10n/hr/files.po
+++ b/l10n/hr/files.po
@@ -4,14 +4,15 @@
 # 
 # Translators:
 # Davor Kustec <dkustec@gmail.com>, 2011, 2012.
+#   <franz@franz-net.info>, 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-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-28 02:01+0200\n"
+"PO-Revision-Date: 2012-08-27 13:17+0000\n"
+"Last-Translator: fposavec <franz@franz-net.info>\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,37 +54,37 @@ msgstr "Neuspjelo pisanje na disk"
 msgid "Files"
 msgstr "Datoteke"
 
-#: js/fileactions.js:107 templates/index.php:56
+#: js/fileactions.js:111 templates/index.php:56
 msgid "Delete"
 msgstr "Briši"
 
 #: js/filelist.js:141
 msgid "already exists"
-msgstr ""
+msgstr "već postoji"
 
 #: js/filelist.js:141
 msgid "replace"
-msgstr ""
+msgstr "zamjeni"
 
 #: js/filelist.js:141
 msgid "cancel"
-msgstr ""
+msgstr "odustani"
 
 #: js/filelist.js:195
 msgid "replaced"
-msgstr ""
+msgstr "zamjenjeno"
 
 #: js/filelist.js:195
 msgid "with"
-msgstr ""
+msgstr "sa"
 
 #: js/filelist.js:195 js/filelist.js:246
 msgid "undo"
-msgstr ""
+msgstr "vrati"
 
 #: js/filelist.js:246
 msgid "deleted"
-msgstr ""
+msgstr "izbrisano"
 
 #: js/files.js:171
 msgid "generating ZIP-file, it may take some time."
diff --git a/l10n/hr/settings.po b/l10n/hr/settings.po
index 1d03b6f4e4..38e378b862 100644
--- a/l10n/hr/settings.po
+++ b/l10n/hr/settings.po
@@ -4,14 +4,15 @@
 # 
 # Translators:
 # Davor Kustec <dkustec@gmail.com>, 2011, 2012.
+#   <franz@franz-net.info>, 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-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-28 02:01+0200\n"
+"PO-Revision-Date: 2012-08-27 13:20+0000\n"
+"Last-Translator: fposavec <franz@franz-net.info>\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"
@@ -21,7 +22,7 @@ msgstr ""
 
 #: ajax/apps/ocs.php:23
 msgid "Unable to load list from App Store"
-msgstr ""
+msgstr "Nemogićnost učitavanja liste sa Apps Stora"
 
 #: ajax/lostpassword.php:14
 msgid "Email saved"
@@ -41,7 +42,7 @@ msgstr "Neispravan zahtjev"
 
 #: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
 msgid "Authentication error"
-msgstr ""
+msgstr "Greška kod autorizacije"
 
 #: ajax/setlanguage.php:18
 msgid "Language changed"
@@ -49,7 +50,7 @@ msgstr "Jezik promijenjen"
 
 #: js/apps.js:18
 msgid "Error"
-msgstr ""
+msgstr "Greška"
 
 #: js/apps.js:39 js/apps.js:73
 msgid "Disable"
@@ -73,7 +74,7 @@ msgstr ""
 
 #: templates/admin.php:29
 msgid "Cron"
-msgstr ""
+msgstr "Cron"
 
 #: templates/admin.php:31
 msgid "execute one task with each page loaded"
@@ -81,11 +82,11 @@ msgstr ""
 
 #: templates/admin.php:33
 msgid "cron.php is registered at a webcron service"
-msgstr ""
+msgstr "cron.php je registriran kod webcron servisa"
 
 #: templates/admin.php:35
 msgid "use systems cron service"
-msgstr ""
+msgstr "koristi sistemski cron servis"
 
 #: templates/admin.php:39
 msgid "Log"
@@ -229,7 +230,7 @@ msgstr "ostali"
 
 #: 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/hu_HU/core.po b/l10n/hu_HU/core.po
index 0f20839d23..965d3bd8a2 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-08-26 19:46+0200\n"
-"PO-Revision-Date: 2012-08-26 17:34+0000\n"
+"POT-Creation-Date: 2012-08-28 02:01+0200\n"
+"PO-Revision-Date: 2012-08-28 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"
diff --git a/l10n/hy/core.po b/l10n/hy/core.po
index b7fc27bce4..5f319f687d 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-08-26 19:46+0200\n"
-"PO-Revision-Date: 2012-08-26 17:34+0000\n"
+"POT-Creation-Date: 2012-08-28 02:01+0200\n"
+"PO-Revision-Date: 2012-08-28 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"
diff --git a/l10n/ia/core.po b/l10n/ia/core.po
index 2be759b5fc..2aa2484da6 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-08-26 19:46+0200\n"
-"PO-Revision-Date: 2012-08-26 17:34+0000\n"
+"POT-Creation-Date: 2012-08-28 02:01+0200\n"
+"PO-Revision-Date: 2012-08-28 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"
diff --git a/l10n/id/core.po b/l10n/id/core.po
index 871d7a335b..0e9358c26a 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-08-26 19:46+0200\n"
-"PO-Revision-Date: 2012-08-26 17:34+0000\n"
+"POT-Creation-Date: 2012-08-28 02:01+0200\n"
+"PO-Revision-Date: 2012-08-28 00:01+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"
diff --git a/l10n/id_ID/core.po b/l10n/id_ID/core.po
index 39f5328c9a..cd8e40cd22 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-08-26 19:46+0200\n"
-"PO-Revision-Date: 2012-08-26 17:34+0000\n"
+"POT-Creation-Date: 2012-08-28 02:01+0200\n"
+"PO-Revision-Date: 2012-08-28 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"
diff --git a/l10n/it/core.po b/l10n/it/core.po
index b938d770ee..fb8cb13147 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-27 02:01+0200\n"
-"PO-Revision-Date: 2012-08-26 18:36+0000\n"
-"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
+"POT-Creation-Date: 2012-08-28 02:01+0200\n"
+"PO-Revision-Date: 2012-08-28 00:01+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"
@@ -234,7 +234,7 @@ msgstr "Nome del database"
 
 #: templates/installation.php:109
 msgid "Database tablespace"
-msgstr "Spazio delle tabelle del database"
+msgstr ""
 
 #: templates/installation.php:115
 msgid "Database host"
diff --git a/l10n/ja_JP/core.po b/l10n/ja_JP/core.po
index bfe21085ed..f1f2e5da9f 100644
--- a/l10n/ja_JP/core.po
+++ b/l10n/ja_JP/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-08-26 19:46+0200\n"
-"PO-Revision-Date: 2012-08-26 17:34+0000\n"
+"POT-Creation-Date: 2012-08-28 02:01+0200\n"
+"PO-Revision-Date: 2012-08-28 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"
diff --git a/l10n/ko/core.po b/l10n/ko/core.po
index 21aa0f60cd..3e82381d03 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-08-26 19:46+0200\n"
-"PO-Revision-Date: 2012-08-26 17:34+0000\n"
+"POT-Creation-Date: 2012-08-28 02:01+0200\n"
+"PO-Revision-Date: 2012-08-28 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"
diff --git a/l10n/lb/core.po b/l10n/lb/core.po
index 1726f295b0..318ccf02e6 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-08-26 19:46+0200\n"
-"PO-Revision-Date: 2012-08-26 17:34+0000\n"
+"POT-Creation-Date: 2012-08-28 02:01+0200\n"
+"PO-Revision-Date: 2012-08-28 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"
diff --git a/l10n/lt_LT/core.po b/l10n/lt_LT/core.po
index 1400ed1ee7..6b69aa1d16 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-08-26 19:46+0200\n"
-"PO-Revision-Date: 2012-08-26 17:34+0000\n"
+"POT-Creation-Date: 2012-08-28 02:01+0200\n"
+"PO-Revision-Date: 2012-08-28 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"
diff --git a/l10n/lv/core.po b/l10n/lv/core.po
index 965b46e64b..29eb9169d2 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-08-26 19:46+0200\n"
-"PO-Revision-Date: 2012-08-26 17:34+0000\n"
+"POT-Creation-Date: 2012-08-28 02:01+0200\n"
+"PO-Revision-Date: 2012-08-28 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"
diff --git a/l10n/mk/core.po b/l10n/mk/core.po
index 9dd6c68881..2dd6a28281 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-08-26 19:46+0200\n"
-"PO-Revision-Date: 2012-08-26 17:34+0000\n"
+"POT-Creation-Date: 2012-08-28 02:01+0200\n"
+"PO-Revision-Date: 2012-08-28 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"
diff --git a/l10n/ms_MY/core.po b/l10n/ms_MY/core.po
index 203061937a..f147f532dd 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-08-26 19:46+0200\n"
-"PO-Revision-Date: 2012-08-26 17:34+0000\n"
+"POT-Creation-Date: 2012-08-28 02:01+0200\n"
+"PO-Revision-Date: 2012-08-28 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"
diff --git a/l10n/nb_NO/core.po b/l10n/nb_NO/core.po
index bfcd049f1f..208c2cf2ae 100644
--- a/l10n/nb_NO/core.po
+++ b/l10n/nb_NO/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-08-26 19:46+0200\n"
-"PO-Revision-Date: 2012-08-26 17:34+0000\n"
+"POT-Creation-Date: 2012-08-28 02:01+0200\n"
+"PO-Revision-Date: 2012-08-28 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"
diff --git a/l10n/nb_NO/files_external.po b/l10n/nb_NO/files_external.po
index 757e0be549..629e0c4d28 100644
--- a/l10n/nb_NO/files_external.po
+++ b/l10n/nb_NO/files_external.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <ajarmund@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-28 02:01+0200\n"
+"PO-Revision-Date: 2012-08-27 15:43+0000\n"
+"Last-Translator: anjar <ajarmund@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"
@@ -31,11 +32,11 @@ msgstr ""
 
 #: templates/settings.php:9
 msgid "Configuration"
-msgstr ""
+msgstr "Konfigurasjon"
 
 #: templates/settings.php:10
 msgid "Options"
-msgstr ""
+msgstr "Innstillinger"
 
 #: templates/settings.php:11
 msgid "Applicable"
@@ -51,19 +52,19 @@ msgstr ""
 
 #: templates/settings.php:63
 msgid "All Users"
-msgstr ""
+msgstr "Alle brukere"
 
 #: templates/settings.php:64
 msgid "Groups"
-msgstr ""
+msgstr "Grupper"
 
 #: templates/settings.php:69
 msgid "Users"
-msgstr ""
+msgstr "Brukere"
 
 #: templates/settings.php:77 templates/settings.php:96
 msgid "Delete"
-msgstr ""
+msgstr "Slett"
 
 #: templates/settings.php:88
 msgid "SSL root certificates"
diff --git a/l10n/nl/core.po b/l10n/nl/core.po
index 947c5fa6b2..c7047b576b 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-08-26 19:46+0200\n"
-"PO-Revision-Date: 2012-08-26 17:34+0000\n"
+"POT-Creation-Date: 2012-08-28 02:01+0200\n"
+"PO-Revision-Date: 2012-08-28 00:01+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"
diff --git a/l10n/nl/files_external.po b/l10n/nl/files_external.po
index c9d3312541..2256b17cd6 100644
--- a/l10n/nl/files_external.po
+++ b/l10n/nl/files_external.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Richard Bos <radoeka@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-28 02:01+0200\n"
+"PO-Revision-Date: 2012-08-27 18:45+0000\n"
+"Last-Translator: Richard Bos <radoeka@gmail.com>\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"
@@ -19,64 +20,64 @@ msgstr ""
 
 #: templates/settings.php:3
 msgid "External Storage"
-msgstr ""
+msgstr "Externe opslag"
 
 #: templates/settings.php:7 templates/settings.php:19
 msgid "Mount point"
-msgstr ""
+msgstr "Aankoppelpunt"
 
 #: templates/settings.php:8
 msgid "Backend"
-msgstr ""
+msgstr "Backend"
 
 #: templates/settings.php:9
 msgid "Configuration"
-msgstr ""
+msgstr "Configuratie"
 
 #: templates/settings.php:10
 msgid "Options"
-msgstr ""
+msgstr "Opties"
 
 #: templates/settings.php:11
 msgid "Applicable"
-msgstr ""
+msgstr "Van toepassing"
 
 #: templates/settings.php:23
 msgid "Add mount point"
-msgstr ""
+msgstr "Voeg aankoppelpunt toe"
 
 #: templates/settings.php:54 templates/settings.php:62
 msgid "None set"
-msgstr ""
+msgstr "Niets ingesteld"
 
 #: templates/settings.php:63
 msgid "All Users"
-msgstr ""
+msgstr "Alle gebruikers"
 
 #: templates/settings.php:64
 msgid "Groups"
-msgstr ""
+msgstr "Groepen"
 
 #: templates/settings.php:69
 msgid "Users"
-msgstr ""
+msgstr "Gebruikers"
 
 #: templates/settings.php:77 templates/settings.php:96
 msgid "Delete"
-msgstr ""
+msgstr "Verwijder"
 
 #: templates/settings.php:88
 msgid "SSL root certificates"
-msgstr ""
+msgstr "SSL root certificaten"
 
 #: templates/settings.php:102
 msgid "Import Root Certificate"
-msgstr ""
+msgstr "Importeer root certificaat"
 
 #: templates/settings.php:108
 msgid "Enable User External Storage"
-msgstr ""
+msgstr "Zet gebruiker's externe opslag aan"
 
 #: templates/settings.php:109
 msgid "Allow users to mount their own external storage"
-msgstr ""
+msgstr "Sta gebruikers toe om hun eigen externe opslag aan te koppelen"
diff --git a/l10n/nn_NO/core.po b/l10n/nn_NO/core.po
index d239bb9c7d..313cdeba60 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-08-26 19:46+0200\n"
-"PO-Revision-Date: 2012-08-26 17:34+0000\n"
+"POT-Creation-Date: 2012-08-28 02:01+0200\n"
+"PO-Revision-Date: 2012-08-28 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"
diff --git a/l10n/pl/core.po b/l10n/pl/core.po
index 35a5dfd637..edae4615e9 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-08-26 19:46+0200\n"
-"PO-Revision-Date: 2012-08-26 17:34+0000\n"
+"POT-Creation-Date: 2012-08-28 02:01+0200\n"
+"PO-Revision-Date: 2012-08-28 00:01+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"
diff --git a/l10n/pt_BR/core.po b/l10n/pt_BR/core.po
index 02716966c1..7ebfea7a29 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-08-26 19:46+0200\n"
-"PO-Revision-Date: 2012-08-26 17:34+0000\n"
+"POT-Creation-Date: 2012-08-28 02:01+0200\n"
+"PO-Revision-Date: 2012-08-28 00:01+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"
diff --git a/l10n/pt_PT/core.po b/l10n/pt_PT/core.po
index 9c12940bfb..0f25236625 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-08-26 19:46+0200\n"
-"PO-Revision-Date: 2012-08-26 17:34+0000\n"
+"POT-Creation-Date: 2012-08-28 02:01+0200\n"
+"PO-Revision-Date: 2012-08-28 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"
diff --git a/l10n/ro/core.po b/l10n/ro/core.po
index d9c537033c..8b73147348 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-08-26 19:46+0200\n"
-"PO-Revision-Date: 2012-08-26 17:34+0000\n"
+"POT-Creation-Date: 2012-08-28 02:01+0200\n"
+"PO-Revision-Date: 2012-08-28 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"
diff --git a/l10n/ru/core.po b/l10n/ru/core.po
index 9b0a792abe..ddc0440b88 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-08-26 19:46+0200\n"
-"PO-Revision-Date: 2012-08-26 17:34+0000\n"
+"POT-Creation-Date: 2012-08-28 02:01+0200\n"
+"PO-Revision-Date: 2012-08-28 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"
diff --git a/l10n/sk_SK/core.po b/l10n/sk_SK/core.po
index 80b985b04c..7243bc6094 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-08-26 19:46+0200\n"
-"PO-Revision-Date: 2012-08-26 17:34+0000\n"
+"POT-Creation-Date: 2012-08-28 02:01+0200\n"
+"PO-Revision-Date: 2012-08-28 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"
diff --git a/l10n/sl/core.po b/l10n/sl/core.po
index 22b9afbe97..78f92f94b4 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-08-27 02:01+0200\n"
-"PO-Revision-Date: 2012-08-26 20:35+0000\n"
-"Last-Translator: Peter Peroša <peter.perosa@gmail.com>\n"
+"POT-Creation-Date: 2012-08-28 02:01+0200\n"
+"PO-Revision-Date: 2012-08-28 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"
@@ -232,7 +232,7 @@ msgstr "Ime podatkovne zbirke"
 
 #: templates/installation.php:109
 msgid "Database tablespace"
-msgstr "Razpredelnica podatkovne zbirke"
+msgstr ""
 
 #: templates/installation.php:115
 msgid "Database host"
diff --git a/l10n/sl/files_sharing.po b/l10n/sl/files_sharing.po
index 56ed4e9046..c16a622861 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-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-28 02:01+0200\n"
+"PO-Revision-Date: 2012-08-27 12:28+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"
@@ -32,4 +32,4 @@ msgstr "Izbriši vse"
 
 #: templates/get.php:5
 msgid "Delete"
-msgstr "Izbris"
+msgstr "Izbriši"
diff --git a/l10n/so/core.po b/l10n/so/core.po
index 2f16229b5d..0dd2a3f54e 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-08-26 19:46+0200\n"
-"PO-Revision-Date: 2012-08-26 17:34+0000\n"
+"POT-Creation-Date: 2012-08-28 02:01+0200\n"
+"PO-Revision-Date: 2012-08-28 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"
diff --git a/l10n/sr/core.po b/l10n/sr/core.po
index fc0e29791f..21174c99ad 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-08-26 19:46+0200\n"
-"PO-Revision-Date: 2012-08-26 17:34+0000\n"
+"POT-Creation-Date: 2012-08-28 02:01+0200\n"
+"PO-Revision-Date: 2012-08-28 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"
diff --git a/l10n/sr@latin/core.po b/l10n/sr@latin/core.po
index 96ce2de0a2..49a960b4b6 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-08-26 19:46+0200\n"
-"PO-Revision-Date: 2012-08-26 17:34+0000\n"
+"POT-Creation-Date: 2012-08-28 02:01+0200\n"
+"PO-Revision-Date: 2012-08-28 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"
diff --git a/l10n/sv/core.po b/l10n/sv/core.po
index 5471f229f4..c02cb098c2 100644
--- a/l10n/sv/core.po
+++ b/l10n/sv/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-27 02:01+0200\n"
-"PO-Revision-Date: 2012-08-26 23:35+0000\n"
-"Last-Translator: Daniel Sandman <revoltism@gmail.com>\n"
+"POT-Creation-Date: 2012-08-28 02:01+0200\n"
+"PO-Revision-Date: 2012-08-28 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"
@@ -235,7 +235,7 @@ msgstr "Databasnamn"
 
 #: templates/installation.php:109
 msgid "Database tablespace"
-msgstr "Tabellutrymme för databas"
+msgstr ""
 
 #: templates/installation.php:115
 msgid "Database host"
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index 398351960c..e1734c27a3 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-27 02:01+0200\n"
+"POT-Creation-Date: 2012-08-28 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 7f39a2c963..752e31fd7c 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-27 02:01+0200\n"
+"POT-Creation-Date: 2012-08-28 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 ff2376ac52..27c7446cb4 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-27 02:01+0200\n"
+"POT-Creation-Date: 2012-08-28 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 4e8b9e3000..e4e7f18c21 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-27 02:01+0200\n"
+"POT-Creation-Date: 2012-08-28 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 7964276a75..9cfb951daf 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-27 02:01+0200\n"
+"POT-Creation-Date: 2012-08-28 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 5f023c7a3d..d50826056b 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-27 02:01+0200\n"
+"POT-Creation-Date: 2012-08-28 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 c689698732..ac7b81d36f 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-27 02:01+0200\n"
+"POT-Creation-Date: 2012-08-28 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 4601cf95d0..4e40d1bc96 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-27 02:01+0200\n"
+"POT-Creation-Date: 2012-08-28 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 0ba0404974..f84f2d1141 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-27 02:01+0200\n"
+"POT-Creation-Date: 2012-08-28 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/core.po b/l10n/th_TH/core.po
index 73a0fb3343..0a1fad25bd 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-08-27 02:01+0200\n"
-"PO-Revision-Date: 2012-08-26 21:39+0000\n"
-"Last-Translator: AriesAnywhere Anywhere <ariesanywhere@gmail.com>\n"
+"POT-Creation-Date: 2012-08-28 02:01+0200\n"
+"PO-Revision-Date: 2012-08-28 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"
@@ -231,7 +231,7 @@ msgstr "ชื่อฐานข้อมูล"
 
 #: templates/installation.php:109
 msgid "Database tablespace"
-msgstr "พื้นที่ตารางในฐานข้อมูล"
+msgstr ""
 
 #: templates/installation.php:115
 msgid "Database host"
diff --git a/l10n/tr/core.po b/l10n/tr/core.po
index 43db29c91c..1047bf9dc7 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-08-26 19:46+0200\n"
-"PO-Revision-Date: 2012-08-26 17:34+0000\n"
+"POT-Creation-Date: 2012-08-28 02:01+0200\n"
+"PO-Revision-Date: 2012-08-28 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"
diff --git a/l10n/uk/core.po b/l10n/uk/core.po
index 7dcbe249b2..709e241138 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-08-26 19:46+0200\n"
-"PO-Revision-Date: 2012-08-26 17:34+0000\n"
+"POT-Creation-Date: 2012-08-28 02:01+0200\n"
+"PO-Revision-Date: 2012-08-28 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"
diff --git a/l10n/vi/core.po b/l10n/vi/core.po
index 582a4db6ed..ec28c892d0 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-08-26 19:46+0200\n"
-"PO-Revision-Date: 2012-08-26 17:34+0000\n"
+"POT-Creation-Date: 2012-08-28 02:01+0200\n"
+"PO-Revision-Date: 2012-08-28 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"
diff --git a/l10n/zh_CN.GB2312/core.po b/l10n/zh_CN.GB2312/core.po
index 39ae538066..e0a74fb07f 100644
--- a/l10n/zh_CN.GB2312/core.po
+++ b/l10n/zh_CN.GB2312/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-08-26 19:46+0200\n"
-"PO-Revision-Date: 2012-08-26 17:34+0000\n"
+"POT-Creation-Date: 2012-08-28 02:01+0200\n"
+"PO-Revision-Date: 2012-08-28 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"
diff --git a/l10n/zh_CN/core.po b/l10n/zh_CN/core.po
index 23b0c26730..eace2d9fe6 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-08-26 19:46+0200\n"
-"PO-Revision-Date: 2012-08-26 17:34+0000\n"
+"POT-Creation-Date: 2012-08-28 02:01+0200\n"
+"PO-Revision-Date: 2012-08-28 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"
diff --git a/l10n/zh_TW/core.po b/l10n/zh_TW/core.po
index 7b019b1d5b..1bc6215fcd 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-08-26 19:46+0200\n"
-"PO-Revision-Date: 2012-08-26 17:34+0000\n"
+"POT-Creation-Date: 2012-08-28 02:01+0200\n"
+"PO-Revision-Date: 2012-08-28 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"
diff --git a/settings/l10n/eu.php b/settings/l10n/eu.php
index 1ead8b14b6..d5dcf396ad 100644
--- a/settings/l10n/eu.php
+++ b/settings/l10n/eu.php
@@ -1,15 +1,21 @@
 <?php $TRANSLATIONS = array(
+"Unable to load list from App Store" => "Ezin izan da App Dendatik zerrenda kargatu",
 "Email saved" => "Eposta gorde da",
 "Invalid email" => "Baliogabeko eposta",
 "OpenID Changed" => "OpenID aldatuta",
 "Invalid request" => "Baliogabeko eskaria",
 "Authentication error" => "Autentifikazio errorea",
 "Language changed" => "Hizkuntza aldatuta",
+"Error" => "Errorea",
 "Disable" => "Ez-gaitu",
 "Enable" => "Gaitu",
 "Saving..." => "Gordetzen...",
 "__language_name__" => "Euskera",
 "Security Warning" => "Segurtasun abisua",
+"Cron" => "Cron",
+"execute one task with each page loaded" => "exekutatu zeregina orri karga bakoitzean",
+"cron.php is registered at a webcron service" => "cron.php webcron zerbitzu batean erregistratuta dago",
+"use systems cron service" => "erabili sistemaren cron zerbitzua",
 "Log" => "Egunkaria",
 "More" => "Gehiago",
 "Add your App" => "Gehitu zure aplikazioa",
@@ -45,6 +51,7 @@
 "Create" => "Sortu",
 "Default Quota" => "Kuota lehentsia",
 "Other" => "Besteak",
+"Group Admin" => "Talde administradorea",
 "Quota" => "Kuota",
 "Delete" => "Ezabatu"
 );
diff --git a/settings/l10n/hr.php b/settings/l10n/hr.php
index 6fb29ce79c..a0a8e2e100 100644
--- a/settings/l10n/hr.php
+++ b/settings/l10n/hr.php
@@ -1,13 +1,19 @@
 <?php $TRANSLATIONS = array(
+"Unable to load list from App Store" => "Nemogićnost učitavanja liste sa Apps Stora",
 "Email saved" => "Email spremljen",
 "Invalid email" => "Neispravan email",
 "OpenID Changed" => "OpenID promijenjen",
 "Invalid request" => "Neispravan zahtjev",
+"Authentication error" => "Greška kod autorizacije",
 "Language changed" => "Jezik promijenjen",
+"Error" => "Greška",
 "Disable" => "Isključi",
 "Enable" => "Uključi",
 "Saving..." => "Spremanje...",
 "__language_name__" => "__ime_jezika__",
+"Cron" => "Cron",
+"cron.php is registered at a webcron service" => "cron.php je registriran kod webcron servisa",
+"use systems cron service" => "koristi sistemski cron servis",
 "Log" => "dnevnik",
 "More" => "više",
 "Add your App" => "Dodajte vašu aplikaciju",
@@ -43,6 +49,7 @@
 "Create" => "Izradi",
 "Default Quota" => "standardni kvota",
 "Other" => "ostali",
+"Group Admin" => "Grupa Admin",
 "Quota" => "kvota",
 "Delete" => "Obriši"
 );

From 0a9d1ed3a645efda56ae757f45aa7efb5a35ce4f Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Mon, 27 Aug 2012 15:46:05 -0400
Subject: [PATCH 0951/1224] Initial previewer for public links

---
 apps/files_sharing/css/public.css             |  2 +
 apps/files_sharing/get.php                    | 88 -------------------
 apps/files_sharing/js/public.js               | 18 ++++
 apps/files_sharing/public.php                 | 69 +++++++++++++++
 apps/files_sharing/templates/authenticate.php |  9 ++
 apps/files_sharing/templates/get.php          | 11 ---
 apps/files_sharing/templates/public.php       | 13 +++
 core/js/js.js                                 | 10 +++
 lib/helper.php                                | 11 +++
 lib/public/share.php                          | 51 +++++++----
 lib/public/util.php                           | 11 +++
 11 files changed, 178 insertions(+), 115 deletions(-)
 create mode 100644 apps/files_sharing/css/public.css
 delete mode 100644 apps/files_sharing/get.php
 create mode 100644 apps/files_sharing/js/public.js
 create mode 100644 apps/files_sharing/public.php
 create mode 100644 apps/files_sharing/templates/authenticate.php
 delete mode 100755 apps/files_sharing/templates/get.php
 create mode 100755 apps/files_sharing/templates/public.php

diff --git a/apps/files_sharing/css/public.css b/apps/files_sharing/css/public.css
new file mode 100644
index 0000000000..aa76c06175
--- /dev/null
+++ b/apps/files_sharing/css/public.css
@@ -0,0 +1,2 @@
+#content { position:relative; }
+#preview p { text-align: center; }
\ No newline at end of file
diff --git a/apps/files_sharing/get.php b/apps/files_sharing/get.php
deleted file mode 100644
index bcbe5985fb..0000000000
--- a/apps/files_sharing/get.php
+++ /dev/null
@@ -1,88 +0,0 @@
-<?php
-// only need authentication apps
-$RUNTIME_APPTYPES=array('authentication');
-OC_App::loadApps($RUNTIME_APPTYPES);
-
-OCP\JSON::checkAppEnabled('files_sharing');
-//FIXME lib_share / OC_Share no longer exists
-require_once 'lib_share.php';
-
-//get the path of the shared file
-if (isset($_GET['token']) && $source = OC_Share::getSource($_GET['token'])) {
-	$token = $_GET['token'];
-	// TODO Manipulating the string may not be the best choice. Is there an alternative?
-	$user = substr($source, 1, strpos($source, "/", 1) - 1);
-	OC_Util::setupFS($user);
-	$source = substr($source, strlen("/".$user."/files"));
-	$subPath = isset( $_GET['path'] ) ? $_GET['path'] : '';
-	$root = $source;
-	$source .= $subPath;
-	if (!OC_Filesystem::file_exists($source)) {
-		header("HTTP/1.0 404 Not Found");
-		$tmpl = new OCP\Template("", "404", "guest");
-		$tmpl->assign("file", $subPath);
-		$tmpl->printPage();
-		exit;
-	}
-	if (OC_Filesystem::is_dir($source)) {
-		$files = array();
-		$rootLength = strlen($root);
-		foreach (OC_Files::getdirectorycontent($source) as $i) {
-			$i['date'] = OCP\Util::formatDate($i['mtime'] );
-			if ($i['type'] == 'file') {
-				$fileinfo = pathinfo($i['name']);
-				$i['basename'] = $fileinfo['filename'];
-				$i['extension'] = isset($fileinfo['extension']) ? ('.'.$fileinfo['extension']) : '';
-			}
-			$i['directory'] = substr($i['directory'], $rootLength);
-			if ($i['directory'] == "/") {
-				$i['directory'] = "";
-			}
-			$files[] = $i;
-		}
-		// Make breadcrumb
-		$breadcrumb = array();
-		$pathtohere = "";
-		foreach (explode("/", $subPath) as $i) {
-			if ($i != "") {
-				$pathtohere .= "/$i";
-				$breadcrumb[] = array("dir" => $pathtohere, "name" => $i);
-			}
-		}
-		// Load the files we need
-		OCP\Util::addStyle("files", "files");
-		$breadcrumbNav = new OCP\Template("files", "part.breadcrumb", "");
-		$breadcrumbNav->assign("breadcrumb", $breadcrumb);
-		$breadcrumbNav->assign("baseURL", OCP\Util::linkTo("", "public.php")."?service=files&token=".$token."&path=");
-		$list = new OCP\Template("files", "part.list", "");
-		$list->assign("files", $files);
-		$list->assign("baseURL", OCP\Util::linkTo("", "public.php")."?service=files&token=".$token."&path=");
-		$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(), false);
-		$tmpl->assign("breadcrumb", $breadcrumbNav->fetchPage());
-		$tmpl->assign("readonly", true);
-		$tmpl->assign("allowZipDownload", false);
-		$tmpl->assign("dir", 'shared dir');
-		$tmpl->printPage();
-	} else {
-		//get time mimetype and set the headers
-		$mimetype = OC_Filesystem::getMimeType($source);
-		header("Content-Transfer-Encoding: binary");
-		OCP\Response::disableCaching();
-		header('Content-Disposition: attachment; filename="'.basename($source).'"');
-		header("Content-Type: " . $mimetype);
-		header("Content-Length: " . OC_Filesystem::filesize($source));
-		//download the file
-		@ob_clean();
-		//FIXME OC_Share no longer exists
-		OCP\Util::emitHook('OC_Share', 'public-download', array('source'=>$source, 'token'=>$token));
-		OC_Filesystem::readfile($source);
-	}
-} else {
-	header("HTTP/1.0 404 Not Found");
-	$tmpl = new OCP\Template("", "404", "guest");
-	$tmpl->printPage();
-	die();
-}
diff --git a/apps/files_sharing/js/public.js b/apps/files_sharing/js/public.js
new file mode 100644
index 0000000000..755382e073
--- /dev/null
+++ b/apps/files_sharing/js/public.js
@@ -0,0 +1,18 @@
+// Override download path to files_sharing/public.php
+function fileDownloadPath(dir, file) {
+	return $('#downloadURL').val();
+}
+
+$(document).ready(function() {
+
+	if (typeof FileActions !== 'undefined') {
+		var mimetype = $('#mimetype').val();
+		// Show file preview if previewer is available, images are already handled by the template
+		if (mimetype.substr(0, mimetype.indexOf('/')) != 'image') {
+			// Trigger default action if not download TODO
+			var action = FileActions.getDefault(mimetype, 'file', FileActions.PERMISSION_READ);
+			action($('#filename').val());
+		}
+	}
+
+});
\ No newline at end of file
diff --git a/apps/files_sharing/public.php b/apps/files_sharing/public.php
new file mode 100644
index 0000000000..15dac576d9
--- /dev/null
+++ b/apps/files_sharing/public.php
@@ -0,0 +1,69 @@
+<?php
+// Load other apps for file previews
+OC_App::loadApps();
+if (isset($_GET['file'])) {
+	$pos = strpos($_GET['file'], '/', 1);
+	$uidOwner = substr($_GET['file'], 1, $pos - 1);
+	if (OCP\User::userExists($uidOwner)) {
+		OC_Util::setupFS($uidOwner);
+		$file = substr($_GET['file'], $pos);
+		$fileSource = OC_Filecache::getId($_GET['file'], '');
+		if ($linkItem = OCP\Share::getItemSharedWithByLink('file', $fileSource, $uidOwner)) {
+			if (isset($linkItem['share_with'])) {
+				// Check password
+				if (isset($_POST['password'])) {
+					$password = $_POST['password'];
+					$storedHash = $linkItem['share_with'];
+					$forcePortable = (CRYPT_BLOWFISH != 1);
+					$hasher = new PasswordHash(8, $forcePortable);
+					if (!($hasher->CheckPassword($password.OC_Config::getValue('passwordsalt', ''), $storedHash))) {
+						$tmpl = new OCP\Template('files_sharing', 'authenticate', 'guest');
+						$tmpl->assign('error', true);
+						$tmpl->printPage();
+						exit();
+					}
+					// Continue on if password is valid
+				} else {
+					// Prompt for password
+					$tmpl = new OCP\Template('files_sharing', 'authenticate', 'guest');
+					$tmpl->printPage();
+					exit();
+				}
+			}
+			$path = $linkItem['path'];
+			// Download the file
+			if (isset($_GET['download'])) {
+				$mimetype = OC_Filesystem::getMimeType($path);
+				header('Content-Transfer-Encoding: binary');
+				header('Content-Disposition: attachment; filename="'.basename($path).'"');
+				header('Content-Type: '.$mimetype);
+				header('Content-Length: '.OC_Filesystem::filesize($path));
+				OCP\Response::disableCaching();
+				@ob_clean();
+				OC_Filesystem::readfile($path);
+			} else {
+				OCP\Util::addStyle('files_sharing', 'public');
+				OCP\Util::addScript('files_sharing', 'public');
+				OCP\Util::addScript('files', 'fileactions');
+				$tmpl = new OCP\Template('files_sharing', 'public', 'guest');
+				$tmpl->assign('owner', $uidOwner);
+				$tmpl->assign('name', basename($path));
+				// Show file list
+				if (OC_Filesystem::is_dir($path)) {
+					// TODO
+				} else {
+					// Show file preview if viewer is available
+					$tmpl->assign('dir', dirname($path));
+					$tmpl->assign('filename', basename($path));
+					$tmpl->assign('mimetype', OC_Filesystem::getMimeType($path));
+					$tmpl->assign('downloadURL', OCP\Util::linkToPublic('files').'&file='.$_GET['file'].'&download');
+				}
+				$tmpl->printPage();
+			}
+			exit();
+		}
+	}
+}
+header('HTTP/1.0 404 Not Found');
+$tmpl = new OCP\Template('', '404', 'guest');
+$tmpl->printPage();
\ No newline at end of file
diff --git a/apps/files_sharing/templates/authenticate.php b/apps/files_sharing/templates/authenticate.php
new file mode 100644
index 0000000000..41064d5146
--- /dev/null
+++ b/apps/files_sharing/templates/authenticate.php
@@ -0,0 +1,9 @@
+<form action="index.php" method="post">
+	<fieldset>
+		<p>
+			<label for="password" class="infield"><?php echo $l->t('Password'); ?></label>
+			<input type="password" name="password" id="password" value="" />
+			<input type="submit" value="<?php echo $l->t('Submit'); ?>" />
+		</p>
+	</fieldset>
+</form>
\ No newline at end of file
diff --git a/apps/files_sharing/templates/get.php b/apps/files_sharing/templates/get.php
deleted file mode 100755
index 57275f07a3..0000000000
--- a/apps/files_sharing/templates/get.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<table>
-	<thead>
-		<tr>
-			<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>
-		</tr>
-	</thead>
-	<tbody id="fileList" data-readonly="<?php echo $_['readonly'];?>">
-		<?php echo($_['fileList']); ?>
-	</tbody>
-</table>
\ No newline at end of file
diff --git a/apps/files_sharing/templates/public.php b/apps/files_sharing/templates/public.php
new file mode 100755
index 0000000000..065818c220
--- /dev/null
+++ b/apps/files_sharing/templates/public.php
@@ -0,0 +1,13 @@
+<input type="hidden" name="dir" value="<?php echo $_['dir'] ?>" id="dir">
+<input type="hidden" name="downloadURL" value="<?php echo $_['downloadURL'] ?>" id="downloadURL">
+<input type="hidden" name="filename" value="<?php echo $_['filename'] ?>" id="filename">
+<input type="hidden" name="mimetype" value="<?php echo $_['mimetype'] ?>" id="mimetype">
+<div id="preview">
+	<p><?php echo $_['owner']; ?> shared the file <?php echo $_['name'] ?> with you</p>
+</div>
+<div id="content">
+	<?php if (substr($_['mimetype'], 0 , strpos($_['mimetype'], '/')) == 'image'): ?>
+		<img src="<?php echo $_['downloadURL']; ?>" />
+	<?php endif; ?>
+</div>
+<a href="<?php echo $_['downloadURL']; ?>">Download</a>
\ No newline at end of file
diff --git a/core/js/js.js b/core/js/js.js
index 86e802cd34..0c842f0559 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -29,6 +29,16 @@ function t(app,text){
 }
 t.cache={};
 
+/**
+* Get the path to download a file
+* @param file The filename
+* @param dir The directory the file is in - e.g. $('#dir').val()
+* @return string
+*/
+function fileDownloadPath(dir, file) {
+	return OC.filePath('files', 'ajax', 'download.php')+encodeURIComponent('?files='+encodeURIComponent(file)+'&dir='+encodeURIComponent(dir));
+}
+
 OC={
 	webroot:oc_webroot,
 	appswebroots:oc_appswebroots,
diff --git a/lib/helper.php b/lib/helper.php
index 8c362747a2..3cf464dfa7 100644
--- a/lib/helper.php
+++ b/lib/helper.php
@@ -100,6 +100,17 @@ class OC_Helper {
 		return self::linkToAbsolute( '', 'remote.php') . '/' . $service . (($add_slash && $service[strlen($service)-1]!='/')?'/':'');
 	}
 
+	/**
+	 * @brief Creates an absolute url for public use
+	 * @param $service id
+	 * @returns the url
+	 *
+	 * Returns a absolute url to the given service.
+	 */
+	public static function linkToPublic($service, $add_slash = false) {
+		return self::linkToAbsolute( '', 'public.php') . '?service=' . $service . (($add_slash && $service[strlen($service)-1]!='/')?'/':'');
+	}
+
 	/**
 	 * @brief Creates path to an image
 	 * @param $app app
diff --git a/lib/public/share.php b/lib/public/share.php
index 9ee7ef0516..15fb73d8d8 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -32,7 +32,7 @@ class Share {
 
 	const SHARE_TYPE_USER = 0;
 	const SHARE_TYPE_GROUP = 1;
-	const SHARE_TYPE_PRIVATE_LINK = 3;
+	const SHARE_TYPE_LINK = 3;
 	const SHARE_TYPE_EMAIL = 4;
 	const SHARE_TYPE_CONTACT = 5;
 	const SHARE_TYPE_REMOTE = 6;
@@ -112,6 +112,17 @@ class Share {
 		return self::getItems($itemType, $itemSource, self::$shareTypeUserAndGroups, \OC_User::getUser(), null, $format, $parameters, 1, $includeCollections, true);
 	}
 
+	/**
+	* @brief Get the item of item type shared by a link
+	* @param string Item type
+	* @param string Item source
+	* @param string Owner of link
+	* @return Item
+	*/
+	public static function getItemSharedWithByLink($itemType, $itemSource, $uidOwner) {
+		return self::getItems($itemType, $itemSource, self::SHARE_TYPE_LINK, null, $uidOwner, self::FORMAT_NONE, null, 1);
+	}
+
 	/**
 	* @brief Get the shared items of item type owned by the current user
 	* @param string Item type
@@ -138,7 +149,7 @@ class Share {
 	* @brief Share an item with a user, group, or via private link
 	* @param string Item type
 	* @param string Item source
-	* @param int SHARE_TYPE_USER, SHARE_TYPE_GROUP, or SHARE_TYPE_PRIVATE_LINK
+	* @param int SHARE_TYPE_USER, SHARE_TYPE_GROUP, or SHARE_TYPE_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
@@ -198,9 +209,14 @@ class Share {
 			$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);
+		} else if ($shareType === self::SHARE_TYPE_LINK) {
+			// Generate hash of password - same method as user passwords
+			if (isset($shareWith)) {
+				$forcePortable = (CRYPT_BLOWFISH != 1);
+				$hasher = new \PasswordHash(8, $forcePortable);
+				$shareWith = $hasher->HashPassword($shareWith.\OC_Config::getValue('passwordsalt', ''));
+			}
+			return self::put($itemType, $itemSource, $shareType, $shareWith, $uidOwner, $permissions);
 		} else if ($shareType === self::SHARE_TYPE_CONTACT) {
 			if (!\OC_App::isEnabled('contacts')) {
 				$message = 'Sharing '.$itemSource.' failed, because the contacts app is not enabled';
@@ -262,7 +278,7 @@ class Share {
 	* @brief Unshare an item from a user, group, or delete a private link
 	* @param string Item type
 	* @param string Item source
-	* @param int SHARE_TYPE_USER, SHARE_TYPE_GROUP, or SHARE_TYPE_PRIVATE_LINK
+	* @param int SHARE_TYPE_USER, SHARE_TYPE_GROUP, or SHARE_TYPE_LINK
 	* @param string User or group the item is being shared with
 	* @return Returns true on success or false on failure
 	*/
@@ -298,7 +314,7 @@ class Share {
 	* @brief Set the permissions of an item for a specific user or group
 	* @param string Item type
 	* @param string Item source
-	* @param int SHARE_TYPE_USER, SHARE_TYPE_GROUP, or SHARE_TYPE_PRIVATE_LINK
+	* @param int SHARE_TYPE_USER, SHARE_TYPE_GROUP, or SHARE_TYPE_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
@@ -407,7 +423,7 @@ class Share {
 	* @brief Get shared items from the database
 	* @param string Item type
 	* @param string Item source or target (optional)
-	* @param int SHARE_TYPE_USER, SHARE_TYPE_GROUP, SHARE_TYPE_PRIVATE_LINK, $shareTypeUserAndGroups, or $shareTypeGroupUserUnique
+	* @param int SHARE_TYPE_USER, SHARE_TYPE_GROUP, SHARE_TYPE_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()
@@ -444,9 +460,9 @@ class Share {
 				$queryArgs = array($itemType);
 			}
 		}
-		if (isset($shareType) && isset($shareWith)) {
+		if (isset($shareType)) {
 			// Include all user and group items
-			if ($shareType == self::$shareTypeUserAndGroups) {
+			if ($shareType == self::$shareTypeUserAndGroups && isset($shareWith)) {
 				$where .= ' AND `share_type` IN (?,?,?)';
 				$queryArgs[] = self::SHARE_TYPE_USER;
 				$queryArgs[] = self::SHARE_TYPE_GROUP;
@@ -459,9 +475,12 @@ class Share {
 				$where .= ' AND `uid_owner` != ?';
 				$queryArgs[] = $shareWith;
 			} else {
-				$where .= ' AND `share_type` = ? AND `share_with` = ?';
+				$where .= ' AND `share_type` = ?';
 				$queryArgs[] = $shareType;
-				$queryArgs[] = $shareWith;
+				if (isset($shareWith)) {
+					$where .= ' AND `share_with` = ?';
+					$queryArgs[] = $shareWith;
+				}
 			}
 		}
 		if (isset($uidOwner)) {
@@ -650,7 +669,7 @@ class Share {
 					$column = 'path';
 				}
 				foreach ($items as $item) {
-					if ($item['share_type'] == self::SHARE_TYPE_PRIVATE_LINK) {
+					if ($item['share_type'] == self::SHARE_TYPE_LINK) {
 						$statuses[$item[$column]] = true;
 					} else if (!isset($statuses[$item[$column]])) {
 						$statuses[$item[$column]] = false;
@@ -670,7 +689,7 @@ class Share {
 	* @brief Put shared item into the database
 	* @param string Item type
 	* @param string Item source
-	* @param int SHARE_TYPE_USER, SHARE_TYPE_GROUP, or SHARE_TYPE_PRIVATE_LINK
+	* @param int SHARE_TYPE_USER, SHARE_TYPE_GROUP, or SHARE_TYPE_LINK
 	* @param string User or group the item is being shared with
 	* @param int CRUDS permissions
 	* @param bool|array Parent folder target (optional)
@@ -827,7 +846,7 @@ class Share {
 	* @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 int SHARE_TYPE_USER, SHARE_TYPE_GROUP, or SHARE_TYPE_LINK
 	* @param string User or group the item is being shared with
 	* @return string Item target
 	*
@@ -836,7 +855,7 @@ class Share {
 	*/
 	private static function generateTarget($itemType, $itemSource, $shareType, $shareWith, $uidOwner) {
 		$backend = self::getBackend($itemType);
-		if ($shareType == self::SHARE_TYPE_PRIVATE_LINK) {
+		if ($shareType == self::SHARE_TYPE_LINK) {
 			return $backend->generateTarget($itemSource, false);
 		} else {
 			if ($itemType == 'file' || $itemType == 'folder') {
diff --git a/lib/public/util.php b/lib/public/util.php
index 9f6f6f32e1..8d7303bf7a 100644
--- a/lib/public/util.php
+++ b/lib/public/util.php
@@ -144,6 +144,17 @@ class Util {
 		return(\OC_Helper::linkToRemote( $service ));
 	}
 
+	/**
+	 * @brief Creates an absolute url for public use
+	 * @param $service id
+	 * @returns the url
+	 *
+	 * Returns a absolute url to the given app and file.
+	 */
+	public static function linkToPublic($service) {
+		return \OC_Helper::linkToPublic($service);
+	}
+
 
 	/**
 	* @brief Creates an url

From 0ad16e84c5f208d94f1f41447db3a23949942d45 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Mon, 27 Aug 2012 15:50:13 -0400
Subject: [PATCH 0952/1224] Fix share collection query

---
 lib/public/share.php | 62 ++++++++++++++++++++++++--------------------
 1 file changed, 34 insertions(+), 28 deletions(-)

diff --git a/lib/public/share.php b/lib/public/share.php
index 15fb73d8d8..964394d75d 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -504,29 +504,33 @@ class Share {
 			}
 		}
 		if (isset($item)) {
+			if ($includeCollections && $collectionTypes = self::getCollectionItemTypes($itemType)) {
+				$where .= ' AND (';
+			} else {
+				$where .= ' AND';
+			}
 			// If looking for own shared items, check item_source else check item_target
 			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 `file_source` = ?';
+					$where .= ' `file_source` = ?';
 					$column = 'file_source';
 				} else {
-					$where .= ' AND `item_source` = ?';
+					$where .= ' `item_source` = ?';
 					$column = 'item_source';
 				}
 			} else {
 				if ($itemType == 'file' || $itemType == 'folder') {
-					$where .= ' AND `file_target` = ?';
+					$where .= ' `file_target` = ?';
 				} else {
-					$where .= ' AND `item_target` = ?';
+					$where .= ' `item_target` = ?';
 				}
 			}
 			$queryArgs[] = $item;
 			if ($includeCollections && $collectionTypes = self::getCollectionItemTypes($itemType)) {
-				// 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);
+				$placeholders = join(',', array_fill(0, count($collectionTypes), '?'));
+				$where .= ' OR item_type IN ('.$placeholders.'))';
+				$queryArgs = array_merge($queryArgs, $collectionTypes);
 			}
 		}
 		if ($limit != -1 && !$includeCollections) {
@@ -629,28 +633,30 @@ class Share {
 					}
 				}
 				// 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) {
-						$childItem = $row;
-						$childItem['item_source'] = $child;
-// 						$childItem['item_target'] = $child['target']; TODO
-						if (isset($item)) {
-							if ($childItem[$column] == $item) {
-								// Return only the item instead of a 2-dimensional array
-								if ($limit == 1 && $format == self::FORMAT_NONE) {
-									return $childItem;
-								} else {
-									// Unset the items array and break out of both loops
-									$items = array();
-									$items[] = $childItem;
-									break 2;
+				if ($includeCollections && $row['item_type'] != $itemType) {
+					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]);
+						foreach ($children as $child) {
+							$childItem = $row;
+							$childItem['item_source'] = $child;
+	// 						$childItem['item_target'] = $child['target']; TODO
+							if (isset($item)) {
+								if ($childItem[$column] == $item) {
+									// Return only the item instead of a 2-dimensional array
+									if ($limit == 1 && $format == self::FORMAT_NONE) {
+										return $childItem;
+									} else {
+										// Unset the items array and break out of both loops
+										$items = array();
+										$items[] = $childItem;
+										break 2;
+									}
 								}
+							} else {
+								$collectionItems[] = $childItem;
 							}
-						} else {
-							$collectionItems[] = $childItem;
 						}
 					}
 					// Remove collection item

From 2aac6f02a0dd3da73db09e1b23aa14cb84d4d88e Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Mon, 27 Aug 2012 20:05:51 -0400
Subject: [PATCH 0953/1224] Reimplement links support for sharing and add
 password protection option

---
 core/ajax/share.php |  15 ++++--
 core/css/share.css  |   2 +-
 core/js/share.js    | 109 +++++++++++++++++++++-----------------------
 3 files changed, 66 insertions(+), 60 deletions(-)

diff --git a/core/ajax/share.php b/core/ajax/share.php
index 806ca9fb98..debdf612c0 100644
--- a/core/ajax/share.php
+++ b/core/ajax/share.php
@@ -26,8 +26,12 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo
 		case 'share':
 			if (isset($_POST['shareType']) && isset($_POST['shareWith']) && isset($_POST['permissions'])) {
 				try {
-					OCP\Share::shareItem($_POST['itemType'], $_POST['itemSource'], (int)$_POST['shareType'], $_POST['shareWith'], $_POST['permissions']);
-					// TODO May need to return private link
+					if ((int)$_POST['shareType'] === OCP\Share::SHARE_TYPE_LINK && $_POST['shareWith'] == '') {
+						$shareWith = null;
+					} else {
+						$shareWith = $_POST['shareWith'];
+					}
+					OCP\Share::shareItem($_POST['itemType'], $_POST['itemSource'], (int)$_POST['shareType'], $shareWith, $_POST['permissions']);
 					OC_JSON::success();
 				} catch (Exception $exception) {
 					OC_JSON::error(array('data' => array('message' => $exception->getMessage())));
@@ -36,7 +40,12 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo
 			break;
 		case 'unshare':
 			if (isset($_POST['shareType']) && isset($_POST['shareWith'])) {
-				$return = OCP\Share::unshare($_POST['itemType'], $_POST['itemSource'], $_POST['shareType'], $_POST['shareWith']);
+				if ((int)$_POST['shareType'] === OCP\Share::SHARE_TYPE_LINK && $_POST['shareWith'] == '') {
+					$shareWith = null;
+				} else {
+					$shareWith = $_POST['shareWith'];
+				}
+				$return = OCP\Share::unshare($_POST['itemType'], $_POST['itemSource'], $_POST['shareType'], $shareWith);
 				($return) ? OC_JSON::success() : OC_JSON::error();
 			}
 			break;
diff --git a/core/css/share.css b/core/css/share.css
index e4b4870dd1..a8ffc8df42 100644
--- a/core/css/share.css
+++ b/core/css/share.css
@@ -15,4 +15,4 @@ a.showCruds { display:inline; opacity:.5; }
 a.showCruds:hover { opacity:1; }
 a.unshare { float:right; display:inline; padding:.3em 0 0 .3em !important; opacity:.5; }
 a.unshare:hover { opacity:1; }
-#privateLink { border-top:1px solid #ddd; padding-top:0.5em; }
\ No newline at end of file
+#link { 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 3db69dc690..4c164f65b2 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -1,7 +1,7 @@
 OC.Share={
 	SHARE_TYPE_USER:0,
 	SHARE_TYPE_GROUP:1,
-	SHARE_TYPE_PRIVATE_LINK:3,
+	SHARE_TYPE_LINK:3,
 	SHARE_TYPE_EMAIL:4,
 	PERMISSION_CREATE:4,
 	PERMISSION_READ:1,
@@ -118,7 +118,7 @@ OC.Share={
 			}
 		});
 	},
-	showDropDown:function(itemType, itemSource, appendTo, privateLink, possiblePermissions) {
+	showDropDown:function(itemType, itemSource, appendTo, link, 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) {
@@ -133,11 +133,14 @@ OC.Share={
 			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>';
+			if (link) {
+				html += '<div id="link">';
+				html += '<input type="checkbox" name="linkCheckbox" id="linkCheckbox" value="1" /><label for="linkCheckbox">Share with link</label>';
+				// TODO Change to lock/unlock icon?
+				html += '<a href="#" id="showPassword" style="display:none;"><img class="svg" alt="Password protect" src="'+OC.imagePath('core', 'actions/triangle-n')+'"/></a>';
 				html += '<br />';
-				html += '<input id="privateLinkText" style="display:none; width:90%;" readonly="readonly" />';
+				html += '<input id="linkText" style="display:none; width:90%;" readonly="readonly" />';
+				html += '<input id="linkPassText" type="password" placeholder="Password" style="display:none; width:90%;" />';
 				html += '</div>';
 			}
 			html += '</div>';
@@ -146,8 +149,8 @@ OC.Share={
 			OC.Share.itemShares = [];
 			if (data.shares) {
 				$.each(data.shares, function(index, share) {
-					if (share.share_type == OC.Share.SHARE_TYPE_PRIVATE_LINK) {
-						OC.Share.showPrivateLink(item, share.share_with);
+					if (share.share_type == OC.Share.SHARE_TYPE_LINK) {
+						OC.Share.showLink(itemSource, share.share_with);
 					} else {
 						OC.Share.addShareWith(share.share_type, share.share_with, share.permissions, possiblePermissions);
 					}
@@ -264,36 +267,22 @@ OC.Share={
 		$(html).appendTo('#shareWithList');
 
 	},
-	showPrivateLink:function(item, token) {
-		$('#privateLinkCheckbox').attr('checked', true);
-		var link = parent.location.protocol+'//'+location.host+OC.linkTo('', 'public.php')+'?service=files&token='+token;
-		if (token.indexOf('&path=') == -1) {
-			link += '&file=' + encodeURIComponent(item).replace(/%2F/g, '/');
+	showLink:function(itemSource, password) {
+		$('#linkCheckbox').attr('checked', true);
+		var filename = $('tr').filterAttr('data-id', String(itemSource)).data('file');
+		if ($('#dir').val() == '/') {
+			var file = $('#dir').val() + filename;
 		} else {
-			// Disable checkbox if inside a shared parent folder
-			$('#privateLinkCheckbox').attr('disabled', 'true');
+			var file = $('#dir').val() + '/' + filename;
 		}
-		$('#privateLinkText').val(link);
-		$('#privateLinkText').show('blind', function() {
-			$('#privateLinkText').after('<br id="emailBreak" />');
-			$('#email').show();
-			$('#emailButton').show();
-		});
+		file = '/'+OC.currentUser+'/files'+file;
+		var link = parent.location.protocol+'//'+location.host+OC.linkTo('', 'public.php')+'?service=files&file='+file;
+		$('#linkText').val(link);
+		$('#linkText').show('blind');
+		$('#showPassword').show();
 	},
-	hidePrivateLink:function() {
-		$('#privateLinkText').hide('blind');
-		$('#emailBreak').remove();
-		$('#email').hide();
-		$('#emailButton').hide();
-	},
-	emailPrivateLink:function() {
-		var link = $('#privateLinkText').val();
-		var file = link.substr(link.lastIndexOf('/') + 1).replace(/%20/g, ' ');
-		$.post(OC.filePath('files_sharing', 'ajax', 'email.php'), { toaddress: $('#email').val(), link: link, file: file } );
-		$('#email').css('font-weight', 'bold');
-		$('#email').animate({ fontWeight: 'normal' }, 2000, function() {
-			$(this).val('');
-		}).val('Email sent');
+	hideLink:function() {
+		$('#linkText').hide('blind');
 	},
 	dirname:function(path) {
 		return path.replace(/\\/g,'/').replace(/\/[^\/]*$/, '');
@@ -308,21 +297,21 @@ $(document).ready(function() {
 			var itemType = $(this).data('item-type');
 			var itemSource = $(this).data('item');
 			var appendTo = $(this).parent().parent();
-			var privateLink = false;
+			var link = false;
 			var possiblePermissions = $(this).data('possible-permissions');
-			if ($(this).data('private-link') !== undefined && $(this).data('private-link') == true) {
-				privateLink = true;
+			if ($(this).data('link') !== undefined && $(this).data('link') == true) {
+				link = true;
 			}
 			if (OC.Share.droppedDown) {
 				if (itemSource != $('#dropdown').data('item')) {
 					OC.Share.hideDropDown(function () {
-						OC.Share.showDropDown(itemType, itemSource, appendTo, privateLink, possiblePermissions);
+						OC.Share.showDropDown(itemType, itemSource, appendTo, link, possiblePermissions);
 					});
 				} else {
 					OC.Share.hideDropDown();
 				}
 			} else {
-				OC.Share.showDropDown(itemType, itemSource, appendTo, privateLink, possiblePermissions);
+				OC.Share.showDropDown(itemType, itemSource, appendTo, link, possiblePermissions);
 			}
 		}
 	});
@@ -396,35 +385,43 @@ $(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() {
+	$('#linkCheckbox').live('change', function() {
 		var itemType = $('#dropdown').data('item-type');
-		var item = $('#dropdown').data('item');
+		var itemSource = $('#dropdown').data('item-source');
 		if (this.checked) {
-			// Create a private link
-			OC.Share.share(itemType, item, OC.Share.SHARE_TYPE_PRIVATE_LINK, 0, 0, function(token) {
-				OC.Share.showPrivateLink(item, 'foo');
-				// Change icon
-				OC.Share.icons[item] = OC.imagePath('core', 'actions/public');
+			// Create a link
+			OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, '', OC.Share.PERMISSION_READ, function() {
+				OC.Share.showLink(itemSource);
+				// TODO Change icon
 			});
 		} 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');
-				}
+			OC.Share.unshare(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, '', function() {
+				OC.Share.hideLink();
 			});
 		}
 	});
 
-	$('#privateLinkText').live('click', function() {
+	$('#linkText').live('click', function() {
 		$(this).focus();
 		$(this).select();
 	});
 
+	$('#showPassword').live('click', function() {
+		$('#linkText').after('<br />');
+		$('#linkPassText').toggle('blind');
+	});
+
+	$('#linkPassText').live('keyup', function(event) {
+		if (event.keyCode == 13) {
+			var itemType = $('#dropdown').data('item-type');
+			var itemSource = $('#dropdown').data('item-source');
+			// TODO Do this internally
+			OC.Share.unshare(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, '');
+			OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, $(this).val(), OC.Share.PERMISSION_READ);
+		}
+	});
+
 	$('#emailPrivateLink').live('submit', function() {
 		OC.Share.emailPrivateLink();
 	});

From 9cd55508c3181ff59080f84a341bd5ecf3e88eab Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Mon, 27 Aug 2012 20:36:34 -0400
Subject: [PATCH 0954/1224] Add Share API settings to admin page

---
 apps/files_sharing/js/share.js |  2 +-
 lib/public/share.php           | 65 +++++++++++++++++++++++++---------
 settings/admin.php             |  4 +++
 settings/css/settings.css      |  3 +-
 settings/js/admin.js           | 14 ++++++++
 settings/templates/admin.php   | 28 +++++++++++++++
 6 files changed, 97 insertions(+), 19 deletions(-)

diff --git a/apps/files_sharing/js/share.js b/apps/files_sharing/js/share.js
index 8754b16b06..79ab4adeba 100644
--- a/apps/files_sharing/js/share.js
+++ b/apps/files_sharing/js/share.js
@@ -1,6 +1,6 @@
 $(document).ready(function() {
 
-	if (typeof FileActions !== 'undefined') {
+	if (typeof OC.Share !== 'undefined' && typeof FileActions !== 'undefined') {
 		OC.Share.loadIcons('file');
 		FileActions.register('all', 'Share', FileActions.PERMISSION_READ, function(filename) {
 			// Return the correct sharing icon
diff --git a/lib/public/share.php b/lib/public/share.php
index 964394d75d..165e3df452 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -67,15 +67,31 @@ class Share {
 	* @return Returns true if backend is registered or false if error
 	*/
 	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);
-			if(count(self::$backendTypes) === 1) {
-				\OC_Util::addScript('core', 'share');
-				\OC_Util::addStyle('core', 'share');
+		if (self::isEnabled()) {
+			if (!isset(self::$backendTypes[$itemType])) {
+				self::$backendTypes[$itemType] = array('class' => $class, 'collectionOf' => $collectionOf, 'supportedFileExtensions' => $supportedFileExtensions);
+				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);
+		}
+		return false;
+	}
+
+	/**
+	* @brief Check if the Share API is enabled
+	* @return Returns true if enabled or false
+	*
+	* The Share API is enabled by default if not configured
+	*
+	*/
+	public static function isEnabled() {
+		if (\OC_Appconfig::getValue('core', 'shareapi_enabled', 'yes') == 'yes') {
 			return true;
 		}
-		\OC_Log::write('OCP\Share', 'Sharing backend '.$class.' not registered, '.self::$backendTypes[$itemType]['class'].' is already registered for '.$itemType, \OC_Log::WARN);
 		return false;
 	}
 
@@ -168,11 +184,13 @@ class Share {
 				\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
 				throw new \Exception($message);
 			}
-			$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_Appconfig::getValue('core', 'shareapi_share_policy', 'global') == 'groups_only') {
+				$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)) {
@@ -210,13 +228,19 @@ class Share {
 			$shareWith['group'] = $group;
 			$shareWith['users'] = array_diff(\OC_Group::usersInGroup($group), array($uidOwner));
 		} else if ($shareType === self::SHARE_TYPE_LINK) {
-			// Generate hash of password - same method as user passwords
-			if (isset($shareWith)) {
-				$forcePortable = (CRYPT_BLOWFISH != 1);
-				$hasher = new \PasswordHash(8, $forcePortable);
-				$shareWith = $hasher->HashPassword($shareWith.\OC_Config::getValue('passwordsalt', ''));
+			if (\OC_Appconfig::getValue('core', 'shareapi_allow_links', 'yes') == 'yes') {
+				// Generate hash of password - same method as user passwords
+				if (isset($shareWith)) {
+					$forcePortable = (CRYPT_BLOWFISH != 1);
+					$hasher = new \PasswordHash(8, $forcePortable);
+					$shareWith = $hasher->HashPassword($shareWith.\OC_Config::getValue('passwordsalt', ''));
+				}
+				return self::put($itemType, $itemSource, $shareType, $shareWith, $uidOwner, $permissions);
 			}
-			return self::put($itemType, $itemSource, $shareType, $shareWith, $uidOwner, $permissions);
+			$message = 'Sharing '.$itemSource.' failed, because sharing with links is not allowed';
+			\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
+			throw new \Exception($message);
+			return false;
 		} else if ($shareType === self::SHARE_TYPE_CONTACT) {
 			if (!\OC_App::isEnabled('contacts')) {
 				$message = 'Sharing '.$itemSource.' failed, because the contacts app is not enabled';
@@ -436,6 +460,13 @@ 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) {
+		if (!self::isEnabled()) {
+			if ($limit == 1 || (isset($uidOwner) && isset($item))) {
+				return false;
+			} else {
+				return array();
+			}
+		}
 		$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 ($itemType == 'file' || $itemType == 'folder') {
diff --git a/settings/admin.php b/settings/admin.php
index 6909e02d14..8788de940b 100755
--- a/settings/admin.php
+++ b/settings/admin.php
@@ -30,6 +30,10 @@ $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('shareAPIEnabled', OC_Appconfig::getValue('core', 'shareapi_enabled', 'yes'));
+$tmpl->assign('allowLinks', OC_Appconfig::getValue('core', 'shareapi_allow_links', 'yes'));
+$tmpl->assign('allowResharing', OC_Appconfig::getValue('core', 'shareapi_allow_resharing', 'yes'));
+$tmpl->assign('sharePolicy', OC_Appconfig::getValue('core', 'shareapi_share_policy', 'global'));
 $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 5a0f5bbde9..49274103ca 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -64,4 +64,5 @@ span.version { margin-left:3em; margin-right:3em; color:#555; }
 span.securitywarning {color:#C33; font-weight:bold; }
 h3.settingsNotice { font-size: 1.2em; }
 .settingsNotice { font-weight:bold; padding: 0.5em 0; }
-#backgroundjobs input[type=radio] { width:1em; }
+input[type=radio] { width:1em; }
+table.shareAPI td { padding-right: 2em; }
\ No newline at end of file
diff --git a/settings/js/admin.js b/settings/js/admin.js
index 57a67b5499..8b1494881a 100644
--- a/settings/js/admin.js
+++ b/settings/js/admin.js
@@ -13,4 +13,18 @@ $(document).ready(function(){
 			}
 		}
 	});
+
+	$('#shareAPIEnabled').change(function() {
+		$('.shareAPI td:not(#enable)').toggle();
+	});
+
+	$('#shareAPI input').change(function() {
+		if ($(this).attr('type') == 'radio') {
+			console.log('radio');
+		} 
+		if ($(this).attr('type') == 'checkbox') {
+			console.log('checked');
+		}
+		OC.AppConfig.setValue('core', 'shareapi_', $(this).val());
+	});
 });
\ No newline at end of file
diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index 1306d90f40..b701b0e839 100755
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -35,6 +35,34 @@ if(!$_['htaccessworking']) {
 	<label for="backgroundjobs_cron" title="<?php echo $l->t("use systems cron service"); ?>">Cron</label><br />
 </fieldset>
 
+<fieldset class="personalblock" id="shareAPI">
+	<legend><strong><?php echo $l->t('Share API');?></strong></legend>
+	<table class="shareAPI nostyle">
+		<tr>
+			<td id="enable">
+				<input type="checkbox" name="shareapi_enabled" id="shareAPIEnabled" value="1" <?php if ($_['shareAPIEnabled'] == 'yes') echo 'checked="checked"'; ?> />
+				<label for="shareAPIEnabled"><?php echo $l->t('Enable Share API');?></label><br />
+				<em><?php echo $l->t('Allow apps to use the Share API'); ?></em>
+			</td>
+			<td <?php if ($_['shareAPIEnabled'] == 'no') echo 'style="display:none"';?>>
+				<input type="checkbox" name="shareapi_allow_links" id="allowLinks" value="1" <?php if ($_['allowLinks'] == 'yes') echo 'checked="checked"'; ?> />
+				<label for="allowLinks"><?php echo $l->t('Allow links');?></label><br />
+				<em><?php echo $l->t('Allow users to share items to the public with links'); ?></em>
+			</td>
+			<td <?php if ($_['shareAPIEnabled'] == 'no') echo 'style="display:none"';?>>
+				<input type="checkbox" name="shareapi_allow_resharing" id="allowResharing" value="1" <?php if ($_['allowResharing'] == 'yes') echo 'checked="checked"'; ?> />
+				<label for="allowResharing"><?php echo $l->t('Allow resharing');?></label><br />
+				<em><?php echo $l->t('Allow users to share items shared with them again'); ?></em>
+			<td <?php if ($_['shareAPIEnabled'] == 'no') echo 'style="display:none"';?>>
+				<input type="radio" name="shareapi_share_policy" id="sharePolicyGlobal" value="global" <?php if ($_['sharePolicy'] == 'global') echo 'checked="checked"'; ?> />
+				<label for="sharePolicyGlobal"><?php echo $l->t('Allow users to share with anyone'); ?></label><br />
+				<input type="radio" name="shareapi_share_policy" id="sharePolicyGroupsOnly" value="groups_only" <?php if ($_['sharePolicy'] == 'groups_only') echo 'checked="checked"'; ?> />
+				<label for="sharePolicyGroupsOnly"><?php echo $l->t('Allow users to only share with users in their groups');?></label><br />
+			</td>
+		</tr>
+	</table>
+</fieldset>
+
 <fieldset class="personalblock">
 	<legend><strong><?php echo $l->t('Log');?></strong></legend>
 	Log level: <select name='loglevel' id='loglevel'>

From 42a291286b4627191a18e8848dffee0bf5574c93 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Mon, 27 Aug 2012 20:45:36 -0400
Subject: [PATCH 0955/1224] Fix incorrect Javascript for changing Share API
 settings

---
 settings/js/admin.js | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/settings/js/admin.js b/settings/js/admin.js
index 8b1494881a..23f445b708 100644
--- a/settings/js/admin.js
+++ b/settings/js/admin.js
@@ -19,12 +19,15 @@ $(document).ready(function(){
 	});
 
 	$('#shareAPI input').change(function() {
-		if ($(this).attr('type') == 'radio') {
-			console.log('radio');
-		} 
 		if ($(this).attr('type') == 'checkbox') {
-			console.log('checked');
+			if (this.checked) {
+				var value = 'yes';
+			} else {
+				var value = 'no';
+			}
+		} else {
+			var value = $(this).val()
 		}
-		OC.AppConfig.setValue('core', 'shareapi_', $(this).val());
+		OC.AppConfig.setValue('core', $(this).attr('name'), value);
 	});
 });
\ No newline at end of file

From aad7dc8390b67ee7d04d83765b1295b9507767f5 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Mon, 27 Aug 2012 20:55:11 -0400
Subject: [PATCH 0956/1224] Remove sharing notice in users settings - The
 default is now share with anyone, groups only sharing is now a setting in the
 admin page

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

diff --git a/settings/css/settings.css b/settings/css/settings.css
index 49274103ca..74a3a1acc8 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -62,7 +62,5 @@ span.version { margin-left:3em; margin-right:3em; color:#555; }
 
 /* ADMIN */
 span.securitywarning {color:#C33; font-weight:bold; }
-h3.settingsNotice { font-size: 1.2em; }
-.settingsNotice { font-weight:bold; padding: 0.5em 0; }
 input[type=radio] { width:1em; }
 table.shareAPI td { padding-right: 2em; }
\ No newline at end of file
diff --git a/settings/templates/users.php b/settings/templates/users.php
index 5298237f67..295b7761cf 100644
--- a/settings/templates/users.php
+++ b/settings/templates/users.php
@@ -151,9 +151,4 @@ var isadmin = <?php echo $_['isadmin']?'true':'false'; ?>;
 		</tr>
 		<?php endforeach; ?>
 	</tbody>
-</table>
-
-<!-- use a standard notification class / system for this message -->
-<?php if( $_["share_notice"] ):?>
-<h3 class="settingsNotice center"><?php echo $_["share_notice"]; ?></h3>
-<?php endif;?>	
\ No newline at end of file
+</table>
\ No newline at end of file
diff --git a/settings/users.php b/settings/users.php
index 58018f00ec..b04f0c99e8 100644
--- a/settings/users.php
+++ b/settings/users.php
@@ -45,14 +45,6 @@ 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 );
@@ -61,5 +53,4 @@ $tmpl->assign( 'subadmins', $subadmins);
 $tmpl->assign( 'numofgroups', count($accessiblegroups));
 $tmpl->assign( 'quota_preset', $quotaPreset);
 $tmpl->assign( 'default_quota', $defaultQuota);
-$tmpl->assign( 'share_notice', $shareNotice);
-$tmpl->printPage();
+$tmpl->printPage();
\ No newline at end of file

From 70b71338cd01b9c5018c63b713ad74c8f302dfa7 Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <frank@owncloud.org>
Date: Tue, 28 Aug 2012 07:22:31 +0200
Subject: [PATCH 0957/1224] beta 1

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

diff --git a/lib/util.php b/lib/util.php
index 3b2f476ada..0abdddcbf9 100755
--- a/lib/util.php
+++ b/lib/util.php
@@ -75,7 +75,8 @@ class OC_Util {
 	 * @return array
 	 */
 	public static function getVersion(){
-		return array(4,82,4);
+		// hint: We only can count up. So the internal version number of ownCloud 4.5 will be 4,9,0. This is not visible to the user
+		return array(4,83,4);
 	}
 
 	/**
@@ -83,7 +84,7 @@ class OC_Util {
 	 * @return string
 	 */
 	public static function getVersionString(){
-		return '5 pre alpha 1';
+		return '4.5 beta 1';
 	}
 
 	/**

From 549f69cbc1aafa13be6f011554ee82d26d814e52 Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <frank@owncloud.org>
Date: Tue, 28 Aug 2012 07:35:31 +0200
Subject: [PATCH 0958/1224] marked as shipped app

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

diff --git a/apps/user_webdavauth/appinfo/info.xml b/apps/user_webdavauth/appinfo/info.xml
index 77fe3b892c..dc555739f4 100755
--- a/apps/user_webdavauth/appinfo/info.xml
+++ b/apps/user_webdavauth/appinfo/info.xml
@@ -7,4 +7,5 @@
 	<licence>AGPL</licence>
 	<author>Frank Karlitschek</author>
 	<require>3</require>
+	<shipped>true</shipped>
 </info>

From 42a996930481783af1a5a3fbbae18dc1201fbb0b Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Tue, 28 Aug 2012 14:24:31 +0200
Subject: [PATCH 0959/1224] LDAP: implement getHome() function, use either
 username (default) or specify an LDAP attribute value to use

---
 apps/user_ldap/lib/connection.php     |  4 ++-
 apps/user_ldap/settings.php           |  8 +++++-
 apps/user_ldap/templates/settings.php |  1 +
 apps/user_ldap/user_ldap.php          | 40 ++++++++++++++++++++++++++-
 4 files changed, 50 insertions(+), 3 deletions(-)

diff --git a/apps/user_ldap/lib/connection.php b/apps/user_ldap/lib/connection.php
index dc160a1642..1922e7ff1f 100644
--- a/apps/user_ldap/lib/connection.php
+++ b/apps/user_ldap/lib/connection.php
@@ -55,6 +55,7 @@ class Connection {
 		'ldapCacheTTL' => null,
 		'ldapUuidAttribute' => null,
 		'ldapOverrideUuidAttribute' => null,
+		'homeFolderNamingRule' => null,
 	);
 
 	public function __construct($configID = 'user_ldap') {
@@ -200,6 +201,7 @@ class Connection {
 			$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->config['homeFolderNamingRule']  = \OCP\Config::getAppValue($this->configID, 'home_folder_naming_rule', 'opt:username');
 
 			$this->configured = $this->validateConfiguration();
 		}
@@ -218,7 +220,7 @@ class Connection {
 
 		$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');
+		'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', 'home_folder_naming_rule' => 'homeFolderNamingRule');
 
 		foreach($config as $parameter => $value) {
 		    if(isset($this->config[$parameter])) {
diff --git a/apps/user_ldap/settings.php b/apps/user_ldap/settings.php
index 39aa329626..23018890ea 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_turn_off_cert_check', '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', 'home_folder_naming_rule');
 
 OCP\Util::addscript('user_ldap', 'settings');
 OCP\Util::addstyle('user_ldap', 'settings');
@@ -36,6 +36,9 @@ if ($_POST) {
 					$ldap->clearCache();
 					OCP\Config::setAppValue('user_ldap', $param, $_POST[$param]);
 				}
+			} elseif('home_folder_naming_rule' == $param) {
+				$value = empty($_POST[$param]) ? 'opt:username' : 'attr:'.$_POST[$param];
+				OCP\Config::setAppValue('user_ldap', $param, $value);
 			} else {
 				OCP\Config::setAppValue('user_ldap', $param, $_POST[$param]);
 			}
@@ -67,5 +70,8 @@ $tmpl->assign( 'ldap_group_display_name', OCP\Config::getAppValue('user_ldap', '
 $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'));
+$hfnr = OCP\Config::getAppValue('user_ldap', 'home_folder_naming_rule', 'opt:username');
+$hfnr = ($hfnr == 'opt:username') ? '' : substr($hfnr, strlen('attr:'));
+$tmpl->assign( 'home_folder_naming_rule', $hfnr, '');
 
 return $tmpl->fetchPage();
diff --git a/apps/user_ldap/templates/settings.php b/apps/user_ldap/templates/settings.php
index 861c9ba605..d1aaeedbdf 100644
--- a/apps/user_ldap/templates/settings.php
+++ b/apps/user_ldap/templates/settings.php
@@ -27,6 +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']; ?>" 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>
+		<p><label for="home_folder_naming_rule">User Home Folder Naming Rule</label><input type="text" id="home_folder_naming_rule" name="home_folder_naming_rule" value="<?php echo $_['home_folder_naming_rule']; ?>" title="<?php echo $l->t('Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute.');?>" /></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>
diff --git a/apps/user_ldap/user_ldap.php b/apps/user_ldap/user_ldap.php
index a97df7b4fd..d297374600 100644
--- a/apps/user_ldap/user_ldap.php
+++ b/apps/user_ldap/user_ldap.php
@@ -161,6 +161,44 @@ class USER_LDAP extends lib\Access implements \OCP\UserInterface {
 	}
 
 	/**
+	* @brief determine the user's home directory
+	* @param string $uid the owncloud username
+	* @return boolean
+	*/
+	private function determineHomeDir($uid) {
+		if(strpos($this->connection->homeFolderNamingRule, 'attr:') === 0) {
+			$attr = substr($this->connection->homeFolderNamingRule, strlen('attr:'));
+			$homedir = $this->readAttribute($this->username2dn($uid), $attr);
+			if($homedir) {
+				$homedir = \OCP\Config::getSystemValue( "datadirectory", \OC::$SERVERROOT."/data" ) . '/' . $homedir[0];
+				\OCP\Config::setUserValue($uid, 'user_ldap', 'homedir', $homedir);
+				return $homedir;
+			}
+		}
+
+		//fallback and default: username
+		$homedir = \OCP\Config::getSystemValue( "datadirectory", \OC::$SERVERROOT."/data" ) . '/' . $uid;
+		\OCP\Config::setUserValue($uid, 'user_ldap', 'homedir', $homedir);
+		return $homedir;
+	}
+
+	/**
+	* @brief get the user's home directory
+	* @param string $uid the username
+	* @return boolean
+	*/
+	public function getHome($uid){
+		if($this->userExists($uid)) {
+			$homedir = \OCP\Config::getUserValue($uid, 'user_ldap', 'homedir', false);
+			if(!$homedir) {
+				$homedir = $this->determineHomeDir($uid);
+			}
+			return $homedir;
+		}
+		return false;
+	}
+
+		/**
 	* @brief Check if backend implements actions
 	* @param $actions bitwise-or'ed actions
 	* @returns boolean
@@ -169,7 +207,7 @@ class USER_LDAP extends lib\Access implements \OCP\UserInterface {
 	* compared with OC_USER_BACKEND_CREATE_USER etc.
 	*/
 	public function implementsActions($actions) {
-		return (bool)(OC_USER_BACKEND_CHECK_PASSWORD & $actions);
+		return (bool)((OC_USER_BACKEND_CHECK_PASSWORD | OC_USER_BACKEND_GET_HOME) & $actions);
 	}
 
 }
\ No newline at end of file

From fd2ca21fc24b6b73a6d75af2e7a7a226e5b186e9 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Tue, 28 Aug 2012 09:51:00 -0400
Subject: [PATCH 0960/1224] Allow share_with column to be null for links

---
 db_structure.xml | 2 +-
 lib/util.php     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/db_structure.xml b/db_structure.xml
index 8c96fa7c39..e42dc894e8 100644
--- a/db_structure.xml
+++ b/db_structure.xml
@@ -479,7 +479,7 @@
     <name>share_with</name>
     <type>text</type>
     <default></default>
-    <notnull>true</notnull>
+    <notnull>false</notnull>
     <length>255</length>
    </field>
    
diff --git a/lib/util.php b/lib/util.php
index 0abdddcbf9..720f2cdeef 100755
--- a/lib/util.php
+++ b/lib/util.php
@@ -76,7 +76,7 @@ class OC_Util {
 	 */
 	public static function getVersion(){
 		// hint: We only can count up. So the internal version number of ownCloud 4.5 will be 4,9,0. This is not visible to the user
-		return array(4,83,4);
+		return array(4,83,5);
 	}
 
 	/**

From 0a1f24142a71e82b59eebcf6c7886a5cbc3fe54e Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Tue, 28 Aug 2012 09:53:31 -0400
Subject: [PATCH 0961/1224] Change public file from get.php to public.php

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

diff --git a/apps/files_sharing/appinfo/info.xml b/apps/files_sharing/appinfo/info.xml
index e31d3299f5..3e34d59abd 100644
--- a/apps/files_sharing/appinfo/info.xml
+++ b/apps/files_sharing/appinfo/info.xml
@@ -12,7 +12,7 @@
 		<filesystem/>
 	</types>
 	<public>
-		<files>get.php</files>
-		<webdav>get.php</webdav>
+		<files>pulblic.php</files>
+		<webdav>public.php</webdav>
 	</public>
 </info>

From 1e2ba8398d9f7df8dc38a425b31a37a2f3fe7f0a Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Tue, 28 Aug 2012 09:55:24 -0400
Subject: [PATCH 0962/1224] Remove old database xml file for files_sharing,
 bump version number

---
 apps/files_sharing/appinfo/database.xml | 42 -------------------------
 apps/files_sharing/appinfo/version      |  2 +-
 2 files changed, 1 insertion(+), 43 deletions(-)
 delete mode 100644 apps/files_sharing/appinfo/database.xml

diff --git a/apps/files_sharing/appinfo/database.xml b/apps/files_sharing/appinfo/database.xml
deleted file mode 100644
index c5cb632d4f..0000000000
--- a/apps/files_sharing/appinfo/database.xml
+++ /dev/null
@@ -1,42 +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*sharing</name>
-		<declaration>
-			<field>
-				<name>uid_owner</name>
-				<type>text</type>
-				<notnull>true</notnull>
-				<length>64</length>
-			</field>
-			<field>
-				<name>uid_shared_with</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>target</name>
-				<type>text</type>
-				<notnull>true</notnull>
-				<length>128</length>
-			</field>
-			<field>
-				<name>permissions</name>
-				<type>integer</type>
-				<notnull>true</notnull>
-				<length>1</length>
-			 </field>
-		</declaration>
-	</table>
-</database>
diff --git a/apps/files_sharing/appinfo/version b/apps/files_sharing/appinfo/version
index f4778493c5..1d71ef9744 100644
--- a/apps/files_sharing/appinfo/version
+++ b/apps/files_sharing/appinfo/version
@@ -1 +1 @@
-0.2.2
\ No newline at end of file
+0.3
\ No newline at end of file

From c53310e49b2da37bb6d4193e2aa540596fe95658 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Tue, 28 Aug 2012 09:57:09 -0400
Subject: [PATCH 0963/1224] Remove unnecessary ajax file from files_sharing

---
 apps/files_sharing/ajax/togglesharewitheveryone.php | 11 -----------
 1 file changed, 11 deletions(-)
 delete mode 100644 apps/files_sharing/ajax/togglesharewitheveryone.php

diff --git a/apps/files_sharing/ajax/togglesharewitheveryone.php b/apps/files_sharing/ajax/togglesharewitheveryone.php
deleted file mode 100644
index 96c43711cb..0000000000
--- a/apps/files_sharing/ajax/togglesharewitheveryone.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-OCP\JSON::callCheck();
-
-OCP\JSON::checkAppEnabled('files_sharing');
-OCP\JSON::checkAdminUser();
-if ($_POST['allowSharingWithEveryone'] == true) {
-	OCP\Config::setAppValue('files_sharing', 'allowSharingWithEveryone', 'yes');
-} else {
-	OCP\Config::setAppValue('files_sharing', 'allowSharingWithEveryone', 'no');
-}
\ No newline at end of file

From 4ac7c414c4c676be779524ef6175f5e77522bca9 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Tue, 28 Aug 2012 11:08:24 -0400
Subject: [PATCH 0964/1224] Check if path info is empty for remote.php, prevent
 error

---
 remote.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/remote.php b/remote.php
index 41d2a7ab34..809a4a9bf5 100644
--- a/remote.php
+++ b/remote.php
@@ -2,7 +2,7 @@
 $RUNTIME_NOAPPS = TRUE;
 require_once('lib/base.php');
 $path_info = OC_Request::getPathInfo();
-if ($path_info === false) {
+if ($path_info === false || $path_info === '') {
 	OC_Response::setStatus(OC_Response::STATUS_NOT_FOUND);
 	exit;
 }

From da44e5405a8667afb476d76948554e01a637e89c Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Tue, 28 Aug 2012 11:12:18 -0400
Subject: [PATCH 0965/1224] Fix typo

---
 apps/files_sharing/appinfo/info.xml | 2 +-
 apps/files_sharing/appinfo/version  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/files_sharing/appinfo/info.xml b/apps/files_sharing/appinfo/info.xml
index 3e34d59abd..6a8fc89ada 100644
--- a/apps/files_sharing/appinfo/info.xml
+++ b/apps/files_sharing/appinfo/info.xml
@@ -12,7 +12,7 @@
 		<filesystem/>
 	</types>
 	<public>
-		<files>pulblic.php</files>
+		<files>public.php</files>
 		<webdav>public.php</webdav>
 	</public>
 </info>
diff --git a/apps/files_sharing/appinfo/version b/apps/files_sharing/appinfo/version
index 1d71ef9744..a2268e2de4 100644
--- a/apps/files_sharing/appinfo/version
+++ b/apps/files_sharing/appinfo/version
@@ -1 +1 @@
-0.3
\ No newline at end of file
+0.3.1
\ No newline at end of file

From e05db00468d3707e617a431fb00d8c7c447644e6 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Tue, 28 Aug 2012 11:13:02 -0400
Subject: [PATCH 0966/1224] 404 if service is not set for public.php

---
 public.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/public.php b/public.php
index 0581631f41..e46559595f 100644
--- a/public.php
+++ b/public.php
@@ -1,6 +1,10 @@
 <?php
 $RUNTIME_NOAPPS = TRUE;
 require_once('lib/base.php');
+if (!isset($_GET['service'])) {
+	header('HTTP/1.0 404 Not Found');
+	exit;
+}
 $file = OCP\CONFIG::getAppValue('core', 'public_' . strip_tags($_GET['service']));
 if(is_null($file)){
 	header('HTTP/1.0 404 Not Found');

From ff076caeee3ca29b1e4fb8c741e7525f30d921bf Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Tue, 28 Aug 2012 11:28:38 -0400
Subject: [PATCH 0967/1224] Check usernames in the database as case
 insensitive, they are still stored case sensitive. Bug fix for oc-422 and
 oc-1514

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

diff --git a/lib/user/database.php b/lib/user/database.php
index a4cffe5d0c..dc11614cc5 100644
--- a/lib/user/database.php
+++ b/lib/user/database.php
@@ -121,7 +121,7 @@ class OC_User_Database extends OC_User_Backend {
 	 * returns the user id or false
 	 */
 	public function checkPassword( $uid, $password ){
-		$query = OC_DB::prepare( 'SELECT `uid`, `password` FROM `*PREFIX*users` WHERE `uid` = ?' );
+		$query = OC_DB::prepare( 'SELECT `uid`, `password` FROM `*PREFIX*users` WHERE LOWER(`uid`) = LOWER(?)' );
 		$result = $query->execute( array( $uid));
 
 		$row=$result->fetchRow();
@@ -170,7 +170,7 @@ class OC_User_Database extends OC_User_Backend {
 	 * @return boolean
 	 */
 	public function userExists($uid){
-		$query = OC_DB::prepare( 'SELECT * FROM `*PREFIX*users` WHERE `uid` = ?' );
+		$query = OC_DB::prepare( 'SELECT * FROM `*PREFIX*users` WHERE LOWER(`uid`) = LOWER(?)' );
 		$result = $query->execute( array( $uid ));
 		
 		return $result->numRows() > 0;

From 9ca62903176a92ec2d1f2e43c036bf848b0a40a7 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Tue, 28 Aug 2012 13:46:16 -0400
Subject: [PATCH 0968/1224] Remove unused settings log file

---
 settings/log.php | 44 --------------------------------------------
 1 file changed, 44 deletions(-)
 delete mode 100644 settings/log.php

diff --git a/settings/log.php b/settings/log.php
deleted file mode 100644
index ddbf72c443..0000000000
--- a/settings/log.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-/**
- * ownCloud
- *
- * @author Robin Appelman
- * @copyright 2012 Robin Appelman icewind1991@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/base.php');
-OC_Util::checkAdminUser();
-
-// Load the files we need
-OC_Util::addStyle( "settings", "settings" );
-OC_Util::addScript( "settings", "apps" );
-OC_App::setActiveNavigationEntry( "core_log" );
-
-$entries=OC_Log_Owncloud::getEntries();
-
-OC_Util::addScript('settings','log');
-OC_Util::addStyle('settings','settings');
-
-function compareEntries($a,$b){
-	return $b->time - $a->time;
-}
-usort($entries, 'compareEntries');
-
-$tmpl = new OC_Template( "settings", "log", "user" );
-$tmpl->assign('entries',$entries);
-
-$tmpl->printPage();

From 95cd48dea8f33641adeaf110bf37e088a6d116fa Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Tue, 28 Aug 2012 14:00:46 -0400
Subject: [PATCH 0969/1224] Fix sharing test case

---
 tests/lib/share/share.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tests/lib/share/share.php b/tests/lib/share/share.php
index 22de569103..18ca5031ca 100644
--- a/tests/lib/share/share.php
+++ b/tests/lib/share/share.php
@@ -360,13 +360,12 @@ class Test_Share extends UnitTestCase {
 		
 		// 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', 'share.txt', OCP\Share::SHARE_TYPE_GROUP, $this->group1, OCP\Share::PERMISSION_READ | OCP\Share::PERMISSION_SHARE));
 		OC_User::setUserId($this->user2);
 		$to_test = OCP\Share::getItemsSharedWith('test', Test_Share_Backend::FORMAT_TARGET);
 		$this->assertEqual(count($to_test), 2);
 		$this->assertTrue(in_array('test.txt', $to_test));
 		$this->assertTrue(in_array('test1.txt', $to_test));
-		$this->dump($to_test, "array of shared items in test");
 		//$this->assertEqual(OCP\Share::getItemsSharedWith('test', Test_Share_Backend::FORMAT_TARGET), array('test.txt', 'test1.txt'));
 		
 // 		// Valid reshare TODO Broken

From 8a02a8852fc912398b5348b8e3263cd4048d5b1b Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Tue, 28 Aug 2012 22:39:05 +0200
Subject: [PATCH 0970/1224] Add background job for global file cache cleanup

---
 lib/base.php             |  3 +++
 lib/cache/fileglobal.php | 34 ++++++++++++++++++++++++++++------
 2 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/lib/base.php b/lib/base.php
index b4f3e66713..af860027c1 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -346,6 +346,9 @@ class OC{
 			}
 		}
 
+		// register cache cleanup
+		OC_BackgroundJob_RegularTask::register('OC_Cache_FileGlobal', 'gc');
+
 		// Check for blacklisted files
 		OC_Hook::connect('OC_Filesystem','write','OC_Filesystem','isBlacklisted');
 		OC_Hook::connect('OC_Filesystem', 'rename', 'OC_Filesystem', 'isBlacklisted');
diff --git a/lib/cache/fileglobal.php b/lib/cache/fileglobal.php
index 1c2c9bdc82..d4336553c3 100644
--- a/lib/cache/fileglobal.php
+++ b/lib/cache/fileglobal.php
@@ -8,7 +8,7 @@
 
 
 class OC_Cache_FileGlobal{
-	protected function getCacheDir() {
+	static protected function getCacheDir() {
 		$cache_dir = get_temp_dir().'/owncloud-'.OC_Util::getInstanceId().'/';
 		if (!is_dir($cache_dir)) {
 			mkdir($cache_dir);
@@ -23,7 +23,7 @@ class OC_Cache_FileGlobal{
 	public function get($key) {
 		$key = $this->fixKey($key);
 		if ($this->hasKey($key)) {
-			$cache_dir = $this->getCacheDir();
+			$cache_dir = self::getCacheDir();
 			return file_get_contents($cache_dir.$key);
 		}
 		return null;
@@ -31,7 +31,7 @@ class OC_Cache_FileGlobal{
 
 	public function set($key, $value, $ttl=0) {
 		$key = $this->fixKey($key);
-		$cache_dir = $this->getCacheDir();
+		$cache_dir = self::getCacheDir();
 		if ($cache_dir and file_put_contents($cache_dir.$key, $value)) {
 			if ($ttl === 0) {
 				$ttl = 86400; // 60*60*24
@@ -43,7 +43,7 @@ class OC_Cache_FileGlobal{
 
 	public function hasKey($key) {
 		$key = $this->fixKey($key);
-		$cache_dir = $this->getCacheDir();
+		$cache_dir = self::getCacheDir();
 		if ($cache_dir && is_file($cache_dir.$key)) {
 			$mtime = filemtime($cache_dir.$key);
 			if ($mtime < time()) {
@@ -56,7 +56,7 @@ class OC_Cache_FileGlobal{
 	}
 
 	public function remove($key) {
-		$cache_dir = $this->getCacheDir();
+		$cache_dir = self::getCacheDir();
 		if(!$cache_dir){
 			return false;
 		}
@@ -65,7 +65,7 @@ class OC_Cache_FileGlobal{
 	}
 
 	public function clear(){
-		$cache_dir = $this->getCacheDir();
+		$cache_dir = self::getCacheDir();
 		if($cache_dir and is_dir($cache_dir)){
 			$dh=opendir($cache_dir);
 			while($file=readdir($dh)){
@@ -75,4 +75,26 @@ class OC_Cache_FileGlobal{
 			}
 		}
 	}
+
+	static public function gc() {
+		$last_run = OC_AppConfig::getValue('core', 'global_cache_gc_lastrun', 0);
+		$now = time();
+		if (($now - $last_run) < 300) {
+			// only do cleanup every 5 minutes
+			return;
+		}
+		OC_AppConfig::setValue('core', 'global_cache_gc_lastrun', $now);
+		$cache_dir = self::getCacheDir();
+		if($cache_dir and is_dir($cache_dir)) {
+			$dh=opendir($cache_dir);
+			while($file=readdir($dh)) {
+				if($file!='.' and $file!='..') {
+					$mtime = filemtime($cache_dir.$file);
+					if ($mtime < $now) {
+						unlink($cache_dir.$file);
+					}
+				}
+			}
+		}
+	}
 }

From 53e51fe46b3a78b117bd43de922c0fea67d49670 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Tue, 28 Aug 2012 23:07:09 +0200
Subject: [PATCH 0971/1224] Clean user cache on login

---
 lib/base.php       |  3 ++-
 lib/cache/file.php | 21 +++++++++++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/lib/base.php b/lib/base.php
index af860027c1..d3f3c5ba1c 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -346,8 +346,9 @@ class OC{
 			}
 		}
 
-		// register cache cleanup
+		// register cache cleanup jobs
 		OC_BackgroundJob_RegularTask::register('OC_Cache_FileGlobal', 'gc');
+		OC_Hook::connect('OC_User', 'post_login', 'OC_Cache_File', 'loginListener');
 
 		// Check for blacklisted files
 		OC_Hook::connect('OC_Filesystem','write','OC_Filesystem','isBlacklisted');
diff --git a/lib/cache/file.php b/lib/cache/file.php
index 562c3d1716..7298ba9074 100644
--- a/lib/cache/file.php
+++ b/lib/cache/file.php
@@ -74,4 +74,25 @@ class OC_Cache_File{
 		}
 		return true;
 	}
+
+	public function gc() {
+		$storage = $this->getStorage();
+		if($storage and $storage->is_dir('/')) {
+			$now = time();
+			$dh=$storage->opendir('/');
+			while($file=readdir($dh)) {
+				if($file!='.' and $file!='..') {
+					$mtime = $storage->filemtime('/'.$file);
+					if ($mtime < $now) {
+						$storage->unlink('/'.$file);
+					}
+				}
+			}
+		}
+	}
+
+	public static function loginListener() {
+		$c = new self();
+		$c->gc();
+	}
 }

From 32721e7b075f9bf0c625cb6f0a6e12d913abe6fc Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Tue, 28 Aug 2012 23:10:32 +0200
Subject: [PATCH 0972/1224] Remember storage view in OC_Cache_File

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

diff --git a/lib/cache/file.php b/lib/cache/file.php
index 7298ba9074..fa62dd3b16 100644
--- a/lib/cache/file.php
+++ b/lib/cache/file.php
@@ -8,14 +8,19 @@
 
 
 class OC_Cache_File{
+	protected $storage;
 	protected function getStorage() {
+		if (isset(self::$storage)) {
+			return self::$storage;
+		}
 		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);
+			self::$storage = new OC_FilesystemView('/'.OC_User::getUser().'/'.$subdir);
+			return self::$storage;
 		}else{
 			OC_Log::write('core','Can\'t get cache storage, user not logged in', OC_Log::ERROR);
 			return false;

From 6d0737de224f3e0a38e296fd8e08893694cf0f25 Mon Sep 17 00:00:00 2001
From: Thomas Mueller <thomas.mueller@tmit.eu>
Date: Tue, 28 Aug 2012 23:23:48 +0200
Subject: [PATCH 0973/1224] removing obsolete .tx

---
 .tx/config | 182 -----------------------------------------------------
 1 file changed, 182 deletions(-)
 delete mode 100644 .tx/config

diff --git a/.tx/config b/.tx/config
deleted file mode 100644
index b51860f8b2..0000000000
--- a/.tx/config
+++ /dev/null
@@ -1,182 +0,0 @@
-[main]
-host = https://www.transifex.net
-
-[owncloud.core]
-file_filter = l10n/<lang>/core.po
-host = http://www.transifex.net
-source_file = l10n/templates/core.pot
-source_lang = en
-trans.bg_BG = l10n/bg_BG/core.po
-trans.ca = l10n/ca/core.po
-trans.cs_CZ = l10n/cs_CZ/core.po
-trans.da = l10n/da/core.po
-trans.de = l10n/de/core.po
-trans.el = l10n/el/core.po
-trans.es = l10n/es/core.po
-trans.et_EE = l10n/et_EE/core.po
-trans.fr = l10n/fr/core.po
-trans.id = l10n/id/core.po
-trans.it = l10n/it/core.po
-trans.lb = l10n/lb/core.po
-trans.ms_MY = l10n/ms_MY/core.po
-trans.nb_NO = l10n/nb_NO/core.po
-trans.nl = l10n/nl/core.po
-trans.pl = l10n/pl/core.po
-trans.pt_BR = l10n/pt_BR/core.po
-trans.pt_PT = l10n/pt_PT/core.po
-trans.ro = l10n/ro/core.po
-trans.ru = l10n/ru/core.po
-trans.sr = l10n/sr/core.po
-trans.sr@latin = l10n/sr@latin/core.po
-trans.sv = l10n/sv/core.po
-trans.zh_CN = l10n/zh_CN/core.po
-
-[owncloud.settings]
-file_filter = l10n/<lang>/settings.po
-host = http://www.transifex.net
-source_file = l10n/templates/settings.pot
-source_lang = en
-trans.bg_BG = l10n/bg_BG/settings.po
-trans.ca = l10n/ca/settings.po
-trans.cs_CZ = l10n/cs_CZ/settings.po
-trans.da = l10n/da/settings.po
-trans.de = l10n/de/settings.po
-trans.el = l10n/el/settings.po
-trans.es = l10n/es/settings.po
-trans.et_EE = l10n/et_EE/settings.po
-trans.fr = l10n/fr/settings.po
-trans.id = l10n/id/settings.po
-trans.it = l10n/it/settings.po
-trans.lb = l10n/lb/settings.po
-trans.ms_MY = l10n/ms_MY/settings.po
-trans.nb_NO = l10n/nb_NO/settings.po
-trans.nl = l10n/nl/settings.po
-trans.pl = l10n/pl/settings.po
-trans.pt_BR = l10n/pt_BR/settings.po
-trans.pt_PT = l10n/pt_PT/settings.po
-trans.ro = l10n/ro/settings.po
-trans.ru = l10n/ru/settings.po
-trans.sr = l10n/sr/settings.po
-trans.sr@latin = l10n/sr@latin/settings.po
-trans.sv = l10n/sv/settings.po
-trans.zh_CN = l10n/zh_CN/settings.po
-
-[owncloud.files]
-file_filter = translations/owncloud.files/<lang>.po
-host = http://www.transifex.net
-source_file = l10n/templates/files.pot
-source_lang = en
-trans.bg_BG = l10n/bg_BG/files.po
-trans.ca = l10n/ca/files.po
-trans.cs_CZ = l10n/cs_CZ/files.po
-trans.da = l10n/da/files.po
-trans.de = l10n/de/files.po
-trans.el = l10n/el/files.po
-trans.es = l10n/es/files.po
-trans.et_EE = l10n/et_EE/files.po
-trans.fr = l10n/fr/files.po
-trans.id = l10n/id/files.po
-trans.it = l10n/it/files.po
-trans.lb = l10n/lb/files.po
-trans.ms_MY = l10n/ms_MY/files.po
-trans.nb_NO = l10n/nb_NO/files.po
-trans.nl = l10n/nl/files.po
-trans.pl = l10n/pl/files.po
-trans.pt_BR = l10n/pt_BR/files.po
-trans.pt_PT = l10n/pt_PT/files.po
-trans.ro = l10n/ro/files.po
-trans.ru = l10n/ru/files.po
-trans.sr = l10n/sr/files.po
-trans.sr@latin = l10n/sr@latin/files.po
-trans.sv = l10n/sv/files.po
-trans.zh_CN = l10n/zh_CN/files.po
-
-[owncloud.media]
-file_filter = translations/owncloud.media/<lang>.po
-host = http://www.transifex.net
-source_file = l10n/templates/media.pot
-source_lang = en
-trans.bg_BG = l10n/bg_BG/media.po
-trans.ca = l10n/ca/media.po
-trans.cs_CZ = l10n/cs_CZ/media.po
-trans.da = l10n/da/media.po
-trans.de = l10n/de/media.po
-trans.el = l10n/el/media.po
-trans.es = l10n/es/media.po
-trans.et_EE = l10n/et_EE/media.po
-trans.fr = l10n/fr/media.po
-trans.id = l10n/id/media.po
-trans.it = l10n/it/media.po
-trans.lb = l10n/lb/media.po
-trans.ms_MY = l10n/ms_MY/media.po
-trans.nb_NO = l10n/nb_NO/media.po
-trans.nl = l10n/nl/media.po
-trans.pl = l10n/pl/media.po
-trans.pt_BR = l10n/pt_BR/media.po
-trans.pt_PT = l10n/pt_PT/media.po
-trans.ro = l10n/ro/media.po
-trans.ru = l10n/ru/media.po
-trans.sr = l10n/sr/media.po
-trans.sr@latin = l10n/sr@latin/media.po
-trans.sv = l10n/sv/media.po
-trans.zh_CN = l10n/zh_CN/media.po
-
-[owncloud.calendar]
-file_filter = l10n/<lang>/calendar.po
-host = http://www.transifex.net
-source_file = l10n/templates/calendar.pot
-source_lang = en
-trans.bg_BG = l10n/bg_BG/calendar.po
-trans.ca = l10n/ca/calendar.po
-trans.cs_CZ = l10n/cs_CZ/calendar.po
-trans.da = l10n/da/calendar.po
-trans.de = l10n/de/calendar.po
-trans.el = l10n/el/calendar.po
-trans.es = l10n/es/calendar.po
-trans.et_EE = l10n/et_EE/calendar.po
-trans.fr = l10n/fr/calendar.po
-trans.id = l10n/id/calendar.po
-trans.it = l10n/it/calendar.po
-trans.lb = l10n/lb/calendar.po
-trans.ms_MY = l10n/ms_MY/calendar.po
-trans.nb_NO = l10n/nb_NO/calendar.po
-trans.nl = l10n/nl/calendar.po
-trans.pl = l10n/pl/calendar.po
-trans.pt_BR = l10n/pt_BR/calendar.po
-trans.pt_PT = l10n/pt_PT/calendar.po
-trans.ro = l10n/ro/calendar.po
-trans.ru = l10n/ru/calendar.po
-trans.sr = l10n/sr/calendar.po
-trans.sr@latin = l10n/sr@latin/calendar.po
-trans.sv = l10n/sv/calendar.po
-trans.zh_CN = l10n/zh_CN/calendar.po
-
-[owncloud.contacts]
-file_filter = translations/owncloud.contacts/<lang>.po
-host = http://www.transifex.net
-source_file = l10n/templates/contacts.pot
-source_lang = en
-trans.bg_BG = l10n/bg_BG/contacts.po
-trans.ca = l10n/ca/contacts.po
-trans.cs_CZ = l10n/cs_CZ/contacts.po
-trans.da = l10n/da/contacts.po
-trans.de = l10n/de/contacts.po
-trans.el = l10n/el/contacts.po
-trans.es = l10n/es/contacts.po
-trans.et_EE = l10n/et_EE/contacts.po
-trans.fr = l10n/fr/contacts.po
-trans.id = l10n/id/contacts.po
-trans.it = l10n/it/contacts.po
-trans.lb = l10n/lb/contacts.po
-trans.ms_MY = l10n/ms_MY/contacts.po
-trans.nb_NO = l10n/nb_NO/contacts.po
-trans.nl = l10n/nl/contacts.po
-trans.pl = l10n/pl/contacts.po
-trans.pt_BR = l10n/pt_BR/contacts.po
-trans.pt_PT = l10n/pt_PT/contacts.po
-trans.ro = l10n/ro/contacts.po
-trans.ru = l10n/ru/contacts.po
-trans.sr = l10n/sr/contacts.po
-trans.sr@latin = l10n/sr@latin/contacts.po
-trans.sv = l10n/sv/contacts.po
-trans.zh_CN = l10n/zh_CN/contacts.po

From f301bfd8c9f6b9beda907888708b0d465dc87a83 Mon Sep 17 00:00:00 2001
From: Thomas Mueller <thomas.mueller@tmit.eu>
Date: Wed, 29 Aug 2012 00:36:27 +0200
Subject: [PATCH 0974/1224] apply coding style

---
 apps/files/ajax/autocomplete.php | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/apps/files/ajax/autocomplete.php b/apps/files/ajax/autocomplete.php
index e504bb24bf..fae38368a8 100644
--- a/apps/files/ajax/autocomplete.php
+++ b/apps/files/ajax/autocomplete.php
@@ -11,20 +11,20 @@ OCP\JSON::checkLoggedIn();
 $query = $_GET['term'];
 $dirOnly=(isset($_GET['dironly']))?($_GET['dironly']=='true'):false;
 
-if($query[0]!='/'){
+if($query[0]!='/') {
 	$query='/'.$query;
 }
 
-if(substr($query,-1,1)=='/'){
+if(substr($query, -1, 1)=='/') {
 	$base=$query;
-}else{
+} else {
 	$base=dirname($query);
 }
 
-$query=substr($query,strlen($base));
+$query=substr($query, strlen($base));
 
-if($base!='/'){
-	$query=substr($query,1);
+if($base!='/') {
+	$query=substr($query, 1);
 }
 $queryLen=strlen($query);
 $query=strtolower($query);
@@ -33,17 +33,17 @@ $query=strtolower($query);
 
 $files=array();
 
-if(OC_Filesystem::file_exists($base) and OC_Filesystem::is_dir($base)){
+if(OC_Filesystem::file_exists($base) and OC_Filesystem::is_dir($base)) {
 	$dh = OC_Filesystem::opendir($base);
-	if($dh){
-		if(substr($base,-1,1)!='/'){
+	if($dh) {
+		if(substr($base, -1, 1)!='/') {
 			$base=$base.'/';
 		}
 		while (($file = readdir($dh)) !== false) {
-			if ($file != "." && $file != ".."){
-				if(substr(strtolower($file),0,$queryLen)==$query){
+			if ($file != "." && $file != "..") {
+				if(substr(strtolower($file), 0, $queryLen)==$query) {
 					$item=$base.$file;
-					if((!$dirOnly or OC_Filesystem::is_dir($item))){
+					if((!$dirOnly or OC_Filesystem::is_dir($item))) {
 						$files[]=(object)array('id'=>$item,'label'=>$item,'name'=>$item);
 					}
 				}

From fe49cbafc77f8a197dfe5c947360d9e52396d081 Mon Sep 17 00:00:00 2001
From: Thomas Mueller <thomas.mueller@tmit.eu>
Date: Wed, 29 Aug 2012 00:50:12 +0200
Subject: [PATCH 0975/1224] apply coding style

---
 apps/files/ajax/delete.php    |  2 +-
 apps/files/ajax/list.php      |  4 ++--
 apps/files/ajax/move.php      |  4 ++--
 apps/files/ajax/newfile.php   | 36 +++++++++++++++++------------------
 apps/files/ajax/newfolder.php |  2 +-
 apps/files/ajax/rawlist.php   |  6 +++---
 apps/files/ajax/scan.php      | 27 +++++++++++++-------------
 apps/files/ajax/upload.php    |  8 ++++----
 8 files changed, 45 insertions(+), 44 deletions(-)

diff --git a/apps/files/ajax/delete.php b/apps/files/ajax/delete.php
index 695f803884..e9bcea1893 100644
--- a/apps/files/ajax/delete.php
+++ b/apps/files/ajax/delete.php
@@ -15,7 +15,7 @@ $filesWithError = '';
 $success = true;
 //Now delete
 foreach($files as $file) {
-    if( !OC_Files::delete( $dir, $file )){
+    if( !OC_Files::delete( $dir, $file )) {
 		$filesWithError .= $file . "\n";
 		$success = false;
 	}
diff --git a/apps/files/ajax/list.php b/apps/files/ajax/list.php
index dae0c1a828..94ddf0364b 100644
--- a/apps/files/ajax/list.php
+++ b/apps/files/ajax/list.php
@@ -14,11 +14,11 @@ $doBreadcrumb = isset( $_GET['breadcrumb'] ) ? true : false;
 $data = array();
 
 // Make breadcrumb
-if($doBreadcrumb){
+if($doBreadcrumb) {
 	$breadcrumb = array();
 	$pathtohere = "/";
 	foreach( explode( "/", $dir ) as $i ){
-		if( $i != "" ){
+		if( $i != "" ) {
 			$pathtohere .= "$i/";
 			$breadcrumb[] = array( "dir" => $pathtohere, "name" => $i );
 		}
diff --git a/apps/files/ajax/move.php b/apps/files/ajax/move.php
index 3d4003a8ed..8b3149ef14 100644
--- a/apps/files/ajax/move.php
+++ b/apps/files/ajax/move.php
@@ -12,8 +12,8 @@ $file = stripslashes($_GET["file"]);
 $target = stripslashes($_GET["target"]);
 
 
-if(OC_Files::move($dir,$file,$target,$file)){
+if(OC_Files::move($dir, $file, $target, $file)) {
 	OCP\JSON::success(array("data" => array( "dir" => $dir, "files" => $file )));
-}else{
+} else {
 	OCP\JSON::error(array("data" => array( "message" => "Could not move $file" )));
 }
diff --git a/apps/files/ajax/newfile.php b/apps/files/ajax/newfile.php
index cc9208ad08..b572a766da 100644
--- a/apps/files/ajax/newfile.php
+++ b/apps/files/ajax/newfile.php
@@ -3,7 +3,7 @@
 // Init owncloud
 global $eventSource;
 
-if(!OC_User::isLoggedIn()){
+if(!OC_User::isLoggedIn()) {
 	exit;
 }
 
@@ -15,9 +15,9 @@ $filename = isset( $_REQUEST['filename'] ) ? stripslashes($_REQUEST['filename'])
 $content = isset( $_REQUEST['content'] ) ? $_REQUEST['content'] : '';
 $source = isset( $_REQUEST['source'] ) ? stripslashes($_REQUEST['source']) : '';
 
-if($source){
+if($source) {
 	$eventSource=new OC_EventSource();
-}else{
+} else {
 	OC_JSON::callCheck();
 }
 
@@ -25,12 +25,12 @@ if($filename == '') {
 	OCP\JSON::error(array("data" => array( "message" => "Empty Filename" )));
 	exit();
 }
-if(strpos($filename,'/')!==false){
+if(strpos($filename,'/')!==false) {
 	OCP\JSON::error(array("data" => array( "message" => "Invalid Filename" )));
 	exit();
 }
 
-function progress($notification_code, $severity, $message, $message_code, $bytes_transferred, $bytes_max){
+function progress($notification_code, $severity, $message, $message_code, $bytes_transferred, $bytes_max) {
 	static $filesize = 0;
 	static $lastsize = 0;
 	global $eventSource;
@@ -45,8 +45,8 @@ function progress($notification_code, $severity, $message, $message_code, $bytes
 				if (!isset($filesize)) {
 				} else {
 					$progress = (int)(($bytes_transferred/$filesize)*100);
-					if($progress>$lastsize){//limit the number or messages send
-						$eventSource->send('progress',$progress);
+					if($progress>$lastsize) {//limit the number or messages send
+						$eventSource->send('progress', $progress);
 					}
 					$lastsize=$progress;
 				}
@@ -56,30 +56,30 @@ function progress($notification_code, $severity, $message, $message_code, $bytes
 }
 
 if($source){
-	if(substr($source,0,8)!='https://' and substr($source,0,7)!='http://'){
+	if(substr($source, 0, 8)!='https://' and substr($source, 0, 7)!='http://') {
 		OCP\JSON::error(array("data" => array( "message" => "Not a valid source" )));
 		exit();
 	}
 
 	$ctx = stream_context_create(null, array('notification' =>'progress'));
-	$sourceStream=fopen($source,'rb', false, $ctx);
+	$sourceStream=fopen($source, 'rb', false, $ctx);
 	$target=$dir.'/'.$filename;
-	$result=OC_Filesystem::file_put_contents($target,$sourceStream);
-	if($result){
+	$result=OC_Filesystem::file_put_contents($target, $sourceStream);
+	if($result) {
 		$mime=OC_Filesystem::getMimetype($target);
-		$eventSource->send('success',$mime);
-	}else{
-		$eventSource->send('error',"Error while downloading ".$source. ' to '.$target);
+		$eventSource->send('success', $mime);
+	} else {
+		$eventSource->send('error', "Error while downloading ".$source. ' to '.$target);
 	}
 	$eventSource->close();
 	exit();
-}else{
-	if($content){
-		if(OC_Filesystem::file_put_contents($dir.'/'.$filename,$content)){
+} else {
+	if($content) {
+		if(OC_Filesystem::file_put_contents($dir.'/'.$filename, $content)) {
 			OCP\JSON::success(array("data" => array('content'=>$content)));
 			exit();
 		}
-	}elseif(OC_Files::newFile($dir, $filename, 'file')){
+	}elseif(OC_Files::newFile($dir, $filename, 'file')) {
 		OCP\JSON::success(array("data" => array('content'=>$content)));
 		exit();
 	}
diff --git a/apps/files/ajax/newfolder.php b/apps/files/ajax/newfolder.php
index ae92bcf09b..34c2d0ca14 100644
--- a/apps/files/ajax/newfolder.php
+++ b/apps/files/ajax/newfolder.php
@@ -14,7 +14,7 @@ if(trim($foldername) == '') {
 	OCP\JSON::error(array("data" => array( "message" => "Empty Foldername" )));
 	exit();
 }
-if(strpos($foldername,'/')!==false){
+if(strpos($foldername, '/')!==false) {
 	OCP\JSON::error(array("data" => array( "message" => "Invalid Foldername" )));
 	exit();
 }
diff --git a/apps/files/ajax/rawlist.php b/apps/files/ajax/rawlist.php
index d159f6e152..20094563b1 100644
--- a/apps/files/ajax/rawlist.php
+++ b/apps/files/ajax/rawlist.php
@@ -5,7 +5,7 @@ $RUNTIME_APPTYPES=array('filesystem');
 
 // Init owncloud
 
-require_once('lib/template.php');
+require_once 'lib/template.php';
 
 OCP\JSON::checkLoggedIn();
 
@@ -15,9 +15,9 @@ $mimetype = isset($_GET['mimetype']) ? $_GET['mimetype'] : '';
 
 // make filelist
 $files = array();
-foreach( OC_Files::getdirectorycontent( $dir, $mimetype ) as $i ){
+foreach( OC_Files::getdirectorycontent( $dir, $mimetype ) as $i ) {
 	$i["date"] = OCP\Util::formatDate($i["mtime"] );
-  $i['mimetype_icon'] = $i['type'] == 'dir' ? \mimetype_icon('dir'): \mimetype_icon($i['mimetype']);
+	$i['mimetype_icon'] = $i['type'] == 'dir' ? \mimetype_icon('dir'): \mimetype_icon($i['mimetype']);
 	$files[] = $i;
 }
 
diff --git a/apps/files/ajax/scan.php b/apps/files/ajax/scan.php
index eef3885851..e38484b97d 100644
--- a/apps/files/ajax/scan.php
+++ b/apps/files/ajax/scan.php
@@ -6,38 +6,39 @@ $force=isset($_GET['force']) and $_GET['force']=='true';
 $dir=isset($_GET['dir'])?$_GET['dir']:'';
 $checkOnly=isset($_GET['checkonly']) and $_GET['checkonly']=='true';
 
-if(!$checkOnly){
+if(!$checkOnly) {
 	$eventSource=new OC_EventSource();
 }
 
 session_write_close();
 
 //create the file cache if necesary
-if($force or !OC_FileCache::inCache('')){
-	if(!$checkOnly){
+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
+		if(OC_Cache::isFast()) {
+			//make sure the old fileid's don't mess things up
+			OC_Cache::clear('fileid/');
 		}
 		
-		OC_FileCache::scan($dir,$eventSource);
+		OC_FileCache::scan($dir, $eventSource);
 		OC_FileCache::clean();
 		OCP\DB::commit();
-		$eventSource->send('success',true);
-	}else{
+		$eventSource->send('success', true);
+	} else {
 		OCP\JSON::success(array('data'=>array('done'=>true)));
 		exit;
 	}
-}else{
-	if($checkOnly){
+} else {
+	if($checkOnly) {
 		OCP\JSON::success(array('data'=>array('done'=>false)));
 		exit;
 	}
-	if(isset($eventSource)){
+	if(isset($eventSource)) {
 		$eventSource->send('success',false);
-	}else{
+	} else {
 		exit;
 	}
 }
-$eventSource->close();
\ No newline at end of file
+$eventSource->close();
diff --git a/apps/files/ajax/upload.php b/apps/files/ajax/upload.php
index 74e6eb560d..813a6c67b5 100644
--- a/apps/files/ajax/upload.php
+++ b/apps/files/ajax/upload.php
@@ -38,24 +38,24 @@ $totalSize=0;
 foreach($files['size'] as $size){
 	$totalSize+=$size;
 }
-if($totalSize>OC_Filesystem::free_space('/')){
+if($totalSize>OC_Filesystem::free_space('/')) {
 	OCP\JSON::error(array("data" => array( "message" => "Not enough space available" )));
 	exit();
 }
 
 $result=array();
-if(strpos($dir,'..') === false){
+if(strpos($dir, '..') === false) {
 	$fileCount=count($files['name']);
 	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)){
+		if(is_uploaded_file($files['tmp_name'][$i]) and OC_Filesystem::fromTmpFile($files['tmp_name'][$i], $target)) {
 			$meta=OC_FileCache_Cached::get($target);
 			$result[]=array( "status" => "success", 'mime'=>$meta['mimetype'],'size'=>$meta['size'],'name'=>basename($target));
 		}
 	}
 	OCP\JSON::encodedPrint($result);
 	exit();
-}else{
+} else {
 	$error='invalid dir';
 }
 

From 4c4aa92eef858a2a96bb5676304acbcaafaa56f2 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Wed, 29 Aug 2012 01:23:36 +0200
Subject: [PATCH 0976/1224] LDAP: check for existing username from other
 backends when creating one for an LDAP user or group. Led also to some code
 cleanup. Fixes oc-1551 in master.

---
 apps/user_ldap/lib/access.php | 44 ++++++++++++++---------------------
 1 file changed, 18 insertions(+), 26 deletions(-)

diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php
index 68df4c4cb9..a1206de828 100644
--- a/apps/user_ldap/lib/access.php
+++ b/apps/user_ldap/lib/access.php
@@ -145,8 +145,11 @@ abstract class Access {
 			));
 			$result = $this->searchUsers($filter, 'dn');
 			if(isset($result[0]['dn'])) {
-				$this->mapComponent($result[0], $name, true);
-				return $result[0];
+				//try mapping, if names equalize return DN
+				$uid = $this->dn2username($result[0]['dn']);
+				if($uid == $name) {
+					return $result[0]['dn'];
+				}
 			}
 		}
 
@@ -265,18 +268,24 @@ abstract class Access {
 		$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($this->mapComponent($dn, $ldapname, $isUser)) {
-			return $ldapname;
+		if(($isUser && !\OCP\User::userExists($ldapname)) || (!$isUser && !\OC_Group::groupExists($ldapname))) {
+			if($this->mapComponent($dn, $ldapname, $isUser)) {
+				\OCP\Util::writeLog('user_ldap', 'Username '.ldapname.' OK.', \OCP\Util::DEBUG);
+				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 = $this->alternateOwnCloudName($ldapname, $dn);
-		if($this->mapComponent($dn, $oc_name, $isUser)) {
-			return $oc_name;
+		if(($isUser && !\OCP\User::userExists($oc_name)) || (!$isUser && !\OC_Group::groupExists($oc_name))) {
+			if($this->mapComponent($dn, $oc_name, $isUser)) {
+				return $oc_name;
+			}
 		}
 
 		//if everything else did not help..
 		\OCP\Util::writeLog('user_ldap', 'Could not create unique ownCloud name for '.$dn.'.', \OCP\Util::INFO);
+		return false;
 	}
 
 	/**
@@ -320,28 +329,11 @@ 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)) {
+			$ocname = $this->dn2ocname($ldapObject['dn'], $ldapObject[$nameAttribute], $isUsers);
+			if($ocname) {
 				$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 = $this->alternateOwnCloudName($ocname, $ldapObject['dn']);
-			if($this->mapComponent($ldapObject['dn'], $ocname, $isUsers)) {
-				$ownCloudNames[] = $ocname;
-				continue;
-			}
-
-			//if everything else did not help..
-			\OCP\Util::writeLog('user_ldap', 'Could not create unique ownCloud name for '.$ldapObject['dn'].', skipping.', \OCP\Util::INFO);
+			continue;
 		}
 		return $ownCloudNames;
 	}

From b64229a89e638e761264a45ed79fe2bc6b2f9262 Mon Sep 17 00:00:00 2001
From: Thomas Mueller <thomas.mueller@tmit.eu>
Date: Wed, 29 Aug 2012 01:38:34 +0200
Subject: [PATCH 0977/1224] apply coding style

---
 apps/files/ajax/newfile.php | 4 ++--
 apps/files/ajax/scan.php    | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/apps/files/ajax/newfile.php b/apps/files/ajax/newfile.php
index b572a766da..6ae9c44542 100644
--- a/apps/files/ajax/newfile.php
+++ b/apps/files/ajax/newfile.php
@@ -25,7 +25,7 @@ if($filename == '') {
 	OCP\JSON::error(array("data" => array( "message" => "Empty Filename" )));
 	exit();
 }
-if(strpos($filename,'/')!==false) {
+if(strpos($filename, '/')!==false) {
 	OCP\JSON::error(array("data" => array( "message" => "Invalid Filename" )));
 	exit();
 }
@@ -55,7 +55,7 @@ function progress($notification_code, $severity, $message, $message_code, $bytes
 	}
 }
 
-if($source){
+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();
diff --git a/apps/files/ajax/scan.php b/apps/files/ajax/scan.php
index e38484b97d..23d7da44f8 100644
--- a/apps/files/ajax/scan.php
+++ b/apps/files/ajax/scan.php
@@ -36,7 +36,7 @@ if($force or !OC_FileCache::inCache('')) {
 		exit;
 	}
 	if(isset($eventSource)) {
-		$eventSource->send('success',false);
+		$eventSource->send('success', false);
 	} else {
 		exit;
 	}

From d786194ddc0c2f14cccc8bf80ecc2d397b684825 Mon Sep 17 00:00:00 2001
From: Thomas Mueller <thomas.mueller@tmit.eu>
Date: Wed, 29 Aug 2012 01:39:21 +0200
Subject: [PATCH 0978/1224] fixing: apps/files/ajax/scan.php

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

diff --git a/lib/cache/file.php b/lib/cache/file.php
index fa62dd3b16..a51f0d68f8 100644
--- a/lib/cache/file.php
+++ b/lib/cache/file.php
@@ -8,7 +8,7 @@
 
 
 class OC_Cache_File{
-	protected $storage;
+	protected static $storage;
 	protected function getStorage() {
 		if (isset(self::$storage)) {
 			return self::$storage;

From 92c782c1b049cbb4b9c8433edec2a08b739202a9 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Wed, 29 Aug 2012 01:57:35 +0200
Subject: [PATCH 0979/1224] return the jQuery deferred object when using
 OC.loadScript

---
 core/js/js.js | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/core/js/js.js b/core/js/js.js
index 0c842f0559..c38eebbff2 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -120,18 +120,19 @@ OC={
 	 */
 	addScript:function(app,script,ready){
 		var path=OC.filePath(app,'js',script+'.js');
-		if(OC.addScript.loaded.indexOf(path)==-1){
-			OC.addScript.loaded.push(path);
+		if(!OC.addScript.loaded[path]){
 			if(ready){
-				$.getScript(path,ready);
+				var deferred=$.getScript(path,ready);
 			}else{
-				$.getScript(path);
+				var deferred=$.getScript(path);
 			}
+			OC.addScript.loaded[path]=deferred;
 		}else{
 			if(ready){
 				ready();
 			}
 		}
+		return OC.addScript.loaded[path];
 	},
 	/**
 	 * load a css file and load it

From 9338d093f9bbcb8b25c088d8777f5803964570c3 Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <thomas.mueller@tmit.eu>
Date: Wed, 29 Aug 2012 02:06:48 +0200
Subject: [PATCH 0980/1224] [tx-robot] updated from transifex

---
 apps/files/l10n/id.php              |  19 ++
 apps/files_external/l10n/cs_CZ.php  |   5 +
 apps/files_versions/l10n/pt_BR.php  |   4 +
 apps/user_ldap/l10n/et_EE.php       |   9 +
 apps/user_ldap/l10n/fa.php          |   5 +
 apps/user_ldap/l10n/fr.php          |  24 ++-
 apps/user_ldap/l10n/ru.php          |  10 +
 core/l10n/hi.php                    |  14 ++
 core/l10n/id.php                    |  17 ++
 core/l10n/it.php                    |   4 +-
 l10n/af/core.po                     |  30 +--
 l10n/af/files_sharing.po            |  20 +-
 l10n/af/settings.po                 |  42 ++++-
 l10n/af/user_ldap.po                |  14 +-
 l10n/ar/core.po                     |  30 +--
 l10n/ar/files_sharing.po            |  20 +-
 l10n/ar/settings.po                 |  42 ++++-
 l10n/ar/user_ldap.po                |  14 +-
 l10n/ar_SA/core.po                  |  30 +--
 l10n/ar_SA/files_sharing.po         |  20 +-
 l10n/ar_SA/settings.po              |  42 ++++-
 l10n/ar_SA/user_ldap.po             |  14 +-
 l10n/bg_BG/core.po                  |  30 +--
 l10n/bg_BG/files_sharing.po         |  20 +-
 l10n/bg_BG/settings.po              |  42 ++++-
 l10n/bg_BG/user_ldap.po             |  14 +-
 l10n/ca/core.po                     |  30 +--
 l10n/ca/files_sharing.po            |  24 +--
 l10n/ca/settings.po                 |  44 ++++-
 l10n/ca/user_ldap.po                |  14 +-
 l10n/cs_CZ/core.po                  |  30 +--
 l10n/cs_CZ/files_external.po        |  17 +-
 l10n/cs_CZ/files_sharing.po         |  26 +--
 l10n/cs_CZ/settings.po              |  42 ++++-
 l10n/cs_CZ/user_ldap.po             |  14 +-
 l10n/da/core.po                     |  30 +--
 l10n/da/files_sharing.po            |  20 +-
 l10n/da/settings.po                 |  44 ++++-
 l10n/da/user_ldap.po                |  14 +-
 l10n/de/core.po                     |  30 +--
 l10n/de/files_sharing.po            |  24 +--
 l10n/de/settings.po                 |  44 ++++-
 l10n/de/user_ldap.po                |  14 +-
 l10n/el/core.po                     |  30 +--
 l10n/el/files_sharing.po            |  26 +--
 l10n/el/settings.po                 |  44 ++++-
 l10n/el/user_ldap.po                |  14 +-
 l10n/eo/core.po                     |  30 +--
 l10n/eo/files_sharing.po            |  20 +-
 l10n/eo/settings.po                 |  44 ++++-
 l10n/eo/user_ldap.po                |  14 +-
 l10n/es/core.po                     |  30 +--
 l10n/es/files_sharing.po            |  26 +--
 l10n/es/settings.po                 |  44 ++++-
 l10n/es/user_ldap.po                |  14 +-
 l10n/et_EE/core.po                  |  30 +--
 l10n/et_EE/files_sharing.po         |  20 +-
 l10n/et_EE/settings.po              |  44 ++++-
 l10n/et_EE/user_ldap.po             |  29 +--
 l10n/eu/core.po                     |  30 +--
 l10n/eu/files_sharing.po            |  26 +--
 l10n/eu/settings.po                 |  44 ++++-
 l10n/eu/user_ldap.po                |  14 +-
 l10n/eu_ES/core.po                  |  30 +--
 l10n/eu_ES/files_sharing.po         |  20 +-
 l10n/eu_ES/settings.po              |  42 ++++-
 l10n/eu_ES/user_ldap.po             |  14 +-
 l10n/fa/core.po                     |  30 +--
 l10n/fa/files_sharing.po            |  26 +--
 l10n/fa/settings.po                 |  42 ++++-
 l10n/fa/user_ldap.po                |  21 ++-
 l10n/fi/core.po                     |  30 +--
 l10n/fi/files_sharing.po            |  20 +-
 l10n/fi/settings.po                 |  42 ++++-
 l10n/fi/user_ldap.po                |  14 +-
 l10n/fi_FI/core.po                  |  30 +--
 l10n/fi_FI/files_sharing.po         |  26 +--
 l10n/fi_FI/settings.po              |  44 ++++-
 l10n/fi_FI/user_ldap.po             |  14 +-
 l10n/fr/core.po                     |  30 +--
 l10n/fr/files_sharing.po            |  24 +--
 l10n/fr/settings.po                 |  44 ++++-
 l10n/fr/user_ldap.po                |  44 +++--
 l10n/gl/core.po                     |  30 +--
 l10n/gl/files_sharing.po            |  20 +-
 l10n/gl/settings.po                 |  42 ++++-
 l10n/gl/user_ldap.po                |  14 +-
 l10n/he/core.po                     |  30 +--
 l10n/he/files_sharing.po            |  20 +-
 l10n/he/settings.po                 |  42 ++++-
 l10n/he/user_ldap.po                |  14 +-
 l10n/hi/core.po                     | 273 +++++++++++++++++++++++++++
 l10n/hi/files.po                    | 218 ++++++++++++++++++++++
 l10n/hi/files_encryption.po         |  34 ++++
 l10n/hi/files_external.po           |  82 +++++++++
 l10n/hi/files_sharing.po            |  26 +++
 l10n/hi/files_versions.po           |  26 +++
 l10n/hi/lib.po                      | 112 ++++++++++++
 l10n/hi/settings.po                 | 274 ++++++++++++++++++++++++++++
 l10n/hi/user_ldap.po                | 170 +++++++++++++++++
 l10n/hr/core.po                     |  30 +--
 l10n/hr/files_sharing.po            |  20 +-
 l10n/hr/settings.po                 |  44 ++++-
 l10n/hr/user_ldap.po                |  14 +-
 l10n/hu_HU/core.po                  |  30 +--
 l10n/hu_HU/files_sharing.po         |  26 +--
 l10n/hu_HU/settings.po              |  42 ++++-
 l10n/hu_HU/user_ldap.po             |  14 +-
 l10n/hy/core.po                     |  30 +--
 l10n/hy/files_sharing.po            |  20 +-
 l10n/hy/settings.po                 |  42 ++++-
 l10n/hy/user_ldap.po                |  14 +-
 l10n/ia/core.po                     |  30 +--
 l10n/ia/files_sharing.po            |  20 +-
 l10n/ia/settings.po                 |  42 ++++-
 l10n/ia/user_ldap.po                |  14 +-
 l10n/id/core.po                     |  65 +++----
 l10n/id/files.po                    |  47 ++---
 l10n/id/files_sharing.po            |  20 +-
 l10n/id/settings.po                 |  59 ++++--
 l10n/id/user_ldap.po                |  14 +-
 l10n/id_ID/core.po                  |  30 +--
 l10n/id_ID/files_sharing.po         |  20 +-
 l10n/id_ID/settings.po              |  42 ++++-
 l10n/id_ID/user_ldap.po             |  14 +-
 l10n/it/core.po                     |  34 ++--
 l10n/it/files_sharing.po            |  24 +--
 l10n/it/settings.po                 |  44 ++++-
 l10n/it/user_ldap.po                |  14 +-
 l10n/ja_JP/core.po                  |  30 +--
 l10n/ja_JP/files_sharing.po         |  24 +--
 l10n/ja_JP/settings.po              |  44 ++++-
 l10n/ja_JP/user_ldap.po             |  14 +-
 l10n/ko/core.po                     |  30 +--
 l10n/ko/files_sharing.po            |  20 +-
 l10n/ko/settings.po                 |  42 ++++-
 l10n/ko/user_ldap.po                |  14 +-
 l10n/lb/core.po                     |  30 +--
 l10n/lb/files_sharing.po            |  20 +-
 l10n/lb/settings.po                 |  42 ++++-
 l10n/lb/user_ldap.po                |  14 +-
 l10n/lt_LT/core.po                  |  30 +--
 l10n/lt_LT/files_sharing.po         |  24 +--
 l10n/lt_LT/settings.po              |  44 ++++-
 l10n/lt_LT/user_ldap.po             |  14 +-
 l10n/lv/core.po                     |  30 +--
 l10n/lv/files_sharing.po            |  20 +-
 l10n/lv/settings.po                 |  52 +++++-
 l10n/lv/user_ldap.po                |  14 +-
 l10n/mk/core.po                     |  30 +--
 l10n/mk/files_sharing.po            |  20 +-
 l10n/mk/settings.po                 |  42 ++++-
 l10n/mk/user_ldap.po                |  14 +-
 l10n/ms_MY/core.po                  |  30 +--
 l10n/ms_MY/files_sharing.po         |  20 +-
 l10n/ms_MY/settings.po              |  42 ++++-
 l10n/ms_MY/user_ldap.po             |  14 +-
 l10n/nb_NO/core.po                  |  30 +--
 l10n/nb_NO/files_sharing.po         |  26 +--
 l10n/nb_NO/settings.po              |  44 ++++-
 l10n/nb_NO/user_ldap.po             |  14 +-
 l10n/nl/core.po                     |  30 +--
 l10n/nl/files_sharing.po            |  26 +--
 l10n/nl/settings.po                 |  44 ++++-
 l10n/nl/user_ldap.po                |  14 +-
 l10n/nn_NO/core.po                  |  30 +--
 l10n/nn_NO/files_sharing.po         |  20 +-
 l10n/nn_NO/settings.po              |  44 ++++-
 l10n/nn_NO/user_ldap.po             |  14 +-
 l10n/pl/core.po                     |  30 +--
 l10n/pl/files_sharing.po            |  24 +--
 l10n/pl/settings.po                 |  44 ++++-
 l10n/pl/user_ldap.po                |  14 +-
 l10n/pt_BR/core.po                  |  30 +--
 l10n/pt_BR/files_sharing.po         |  20 +-
 l10n/pt_BR/files_versions.po        |  11 +-
 l10n/pt_BR/settings.po              |  44 ++++-
 l10n/pt_BR/user_ldap.po             |  14 +-
 l10n/pt_PT/core.po                  |  30 +--
 l10n/pt_PT/files_sharing.po         |  20 +-
 l10n/pt_PT/settings.po              |  44 ++++-
 l10n/pt_PT/user_ldap.po             |  14 +-
 l10n/ro/core.po                     |  30 +--
 l10n/ro/files_sharing.po            |  20 +-
 l10n/ro/settings.po                 |  42 ++++-
 l10n/ro/user_ldap.po                |  14 +-
 l10n/ru/core.po                     |  30 +--
 l10n/ru/files_sharing.po            |  26 +--
 l10n/ru/settings.po                 |  44 ++++-
 l10n/ru/user_ldap.po                |  34 ++--
 l10n/sk_SK/core.po                  |  30 +--
 l10n/sk_SK/files_sharing.po         |  20 +-
 l10n/sk_SK/settings.po              |  42 ++++-
 l10n/sk_SK/user_ldap.po             |  14 +-
 l10n/sl/core.po                     |  30 +--
 l10n/sl/files_sharing.po            |  26 +--
 l10n/sl/settings.po                 |  44 ++++-
 l10n/sl/user_ldap.po                |  14 +-
 l10n/so/core.po                     |  30 +--
 l10n/so/files_sharing.po            |  20 +-
 l10n/so/settings.po                 |  42 ++++-
 l10n/so/user_ldap.po                |  14 +-
 l10n/sr/core.po                     |  30 +--
 l10n/sr/files_sharing.po            |  20 +-
 l10n/sr/settings.po                 |  42 ++++-
 l10n/sr/user_ldap.po                |  14 +-
 l10n/sr@latin/core.po               |  30 +--
 l10n/sr@latin/files_sharing.po      |  20 +-
 l10n/sr@latin/settings.po           |  42 ++++-
 l10n/sr@latin/user_ldap.po          |  14 +-
 l10n/sv/core.po                     |  30 +--
 l10n/sv/files_sharing.po            |  24 +--
 l10n/sv/settings.po                 |  44 ++++-
 l10n/sv/user_ldap.po                |  14 +-
 l10n/templates/core.pot             |  28 +--
 l10n/templates/files.pot            |   2 +-
 l10n/templates/files_encryption.pot |   2 +-
 l10n/templates/files_external.pot   |   2 +-
 l10n/templates/files_sharing.pot    |  18 +-
 l10n/templates/files_versions.pot   |   2 +-
 l10n/templates/lib.pot              |   2 +-
 l10n/templates/settings.pot         |  40 +++-
 l10n/templates/user_ldap.pot        |   9 +-
 l10n/th_TH/core.po                  |  30 +--
 l10n/th_TH/files_sharing.po         |  24 +--
 l10n/th_TH/settings.po              |  44 ++++-
 l10n/th_TH/user_ldap.po             |  14 +-
 l10n/tr/core.po                     |  30 +--
 l10n/tr/files_sharing.po            |  20 +-
 l10n/tr/settings.po                 |  42 ++++-
 l10n/tr/user_ldap.po                |  14 +-
 l10n/uk/core.po                     |  30 +--
 l10n/uk/files_sharing.po            |  20 +-
 l10n/uk/settings.po                 |  42 ++++-
 l10n/uk/user_ldap.po                |  14 +-
 l10n/vi/core.po                     |  30 +--
 l10n/vi/files_sharing.po            |  20 +-
 l10n/vi/settings.po                 |  42 ++++-
 l10n/vi/user_ldap.po                |  14 +-
 l10n/zh_CN.GB2312/core.po           |  30 +--
 l10n/zh_CN.GB2312/files_sharing.po  |  20 +-
 l10n/zh_CN.GB2312/settings.po       |  42 ++++-
 l10n/zh_CN.GB2312/user_ldap.po      |  14 +-
 l10n/zh_CN/core.po                  |  30 +--
 l10n/zh_CN/files_sharing.po         |  20 +-
 l10n/zh_CN/settings.po              |  44 ++++-
 l10n/zh_CN/user_ldap.po             |  14 +-
 l10n/zh_TW/core.po                  |  30 +--
 l10n/zh_TW/files_sharing.po         |  20 +-
 l10n/zh_TW/settings.po              |  44 ++++-
 l10n/zh_TW/user_ldap.po             |  14 +-
 settings/l10n/id.php                |   8 +
 settings/l10n/lv.php                |   5 +
 253 files changed, 5434 insertions(+), 2207 deletions(-)
 create mode 100644 apps/files_versions/l10n/pt_BR.php
 create mode 100644 apps/user_ldap/l10n/et_EE.php
 create mode 100644 apps/user_ldap/l10n/fa.php
 create mode 100644 core/l10n/hi.php
 create mode 100644 l10n/hi/core.po
 create mode 100644 l10n/hi/files.po
 create mode 100644 l10n/hi/files_encryption.po
 create mode 100644 l10n/hi/files_external.po
 create mode 100644 l10n/hi/files_sharing.po
 create mode 100644 l10n/hi/files_versions.po
 create mode 100644 l10n/hi/lib.po
 create mode 100644 l10n/hi/settings.po
 create mode 100644 l10n/hi/user_ldap.po

diff --git a/apps/files/l10n/id.php b/apps/files/l10n/id.php
index 47ce6429c9..399056bf27 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 exceeds the upload_max_filesize directive in php.ini" => "File yang diunggah melampaui directive upload_max_filesize di php.ini",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "File yang diunggah melampaui directive MAX_FILE_SIZE yang disebutan dalam form HTML.",
 "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",
 "Delete" => "Hapus",
+"already exists" => "sudah ada",
+"replace" => "mengganti",
+"cancel" => "batalkan",
+"replaced" => "diganti",
+"with" => "dengan",
+"undo" => "batal dikerjakan",
+"deleted" => "dihapus",
+"generating ZIP-file, it may take some time." => "membuat berkas ZIP, ini mungkin memakan waktu.",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Gagal mengunggah berkas anda karena berupa direktori atau mempunyai ukuran 0 byte",
+"Upload Error" => "Terjadi Galat Pengunggahan",
+"Pending" => "Menunggu",
+"Upload cancelled." => "Pengunggahan dibatalkan.",
+"Invalid name, '/' is not allowed." => "Kesalahan nama, '/' tidak diijinkan.",
 "Size" => "Ukuran",
 "Modified" => "Dimodifikasi",
+"folder" => "folder",
+"folders" => "folder-folder",
+"file" => "berkas",
+"files" => "berkas-berkas",
 "File handling" => "Penanganan berkas",
 "Maximum upload size" => "Ukuran unggah maksimum",
 "max. possible: " => "Kemungkinan maks:",
diff --git a/apps/files_external/l10n/cs_CZ.php b/apps/files_external/l10n/cs_CZ.php
index 8f11d7da11..e8a38d8661 100644
--- a/apps/files_external/l10n/cs_CZ.php
+++ b/apps/files_external/l10n/cs_CZ.php
@@ -1,13 +1,18 @@
 <?php $TRANSLATIONS = array(
 "External Storage" => "Externí úložiště",
 "Mount point" => "Přípojný bod",
+"Backend" => "Končící",
 "Configuration" => "Konfigurace",
 "Options" => "Nastavení",
+"Applicable" => "Platný",
 "Add mount point" => "Přidat přípojný bod",
+"None set" => "Nenastaveno",
 "All Users" => "Všichni uživatelé",
 "Groups" => "Skupiny",
 "Users" => "Uživatelé",
 "Delete" => "Smazat",
+"SSL root certificates" => "Kořenové SSL certifikáty",
+"Import Root Certificate" => "Import kořenového certifikátu",
 "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_versions/l10n/pt_BR.php b/apps/files_versions/l10n/pt_BR.php
new file mode 100644
index 0000000000..a90b48fe3a
--- /dev/null
+++ b/apps/files_versions/l10n/pt_BR.php
@@ -0,0 +1,4 @@
+<?php $TRANSLATIONS = array(
+"Expire all versions" => "Expirar todas as versões",
+"Enable Files Versioning" => "Habilitar versionamento de arquivos"
+);
diff --git a/apps/user_ldap/l10n/et_EE.php b/apps/user_ldap/l10n/et_EE.php
new file mode 100644
index 0000000000..d62e1212dc
--- /dev/null
+++ b/apps/user_ldap/l10n/et_EE.php
@@ -0,0 +1,9 @@
+<?php $TRANSLATIONS = array(
+"Host" => "Host",
+"Password" => "Parool",
+"Group Filter" => "Grupi filter",
+"Port" => "Port",
+"Use TLS" => "Kasutaja TLS",
+"in bytes" => "baitides",
+"Help" => "Abiinfo"
+);
diff --git a/apps/user_ldap/l10n/fa.php b/apps/user_ldap/l10n/fa.php
new file mode 100644
index 0000000000..4432422116
--- /dev/null
+++ b/apps/user_ldap/l10n/fa.php
@@ -0,0 +1,5 @@
+<?php $TRANSLATIONS = array(
+"Host" => "میزبانی",
+"Password" => "رمز عبور",
+"Help" => "راه‌نما"
+);
diff --git a/apps/user_ldap/l10n/fr.php b/apps/user_ldap/l10n/fr.php
index 64edf3b468..0754aa01de 100644
--- a/apps/user_ldap/l10n/fr.php
+++ b/apps/user_ldap/l10n/fr.php
@@ -1,14 +1,14 @@
 <?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",
+"Base DN" => "DN Racine",
+"You can specify Base DN for users and groups in the Advanced tab" => "Vous pouvez détailler les DN Racines de vos utilisateurs et groupes dans l'onglet Avancé",
+"User DN" => "DN Utilisateur (Autorisé à consulter l'annuaire)",
 "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",
-"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.",
+"For anonymous access, leave DN and Password empty." => "Pour un accès anonyme, laisser le DN Utilisateur et le mot de passe vides.",
+"User Login Filter" => "Modèle d'authentification utilisateurs",
+"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Définit le motif à appliquer, lors d'une tentative de connexion. %%uid est remplacé par 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.",
@@ -17,15 +17,19 @@
 "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",
+"Base User Tree" => "DN racine de l'arbre utilisateurs",
+"Base Group Tree" => "DN racine de l'arbre groupes",
 "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",
+"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",
+"Not recommended, use for testing only." => "Non recommandé, utilisation pour tests uniquement.",
+"User Display Name Field" => "Champ \"nom d'affichage\" de l'utilisateur",
+"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.",
+"Group Display Name Field" => "Champ \"nom d'affichage\" du groupe",
+"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/ru.php b/apps/user_ldap/l10n/ru.php
index fc89d99806..65ef8f47f4 100644
--- a/apps/user_ldap/l10n/ru.php
+++ b/apps/user_ldap/l10n/ru.php
@@ -15,11 +15,21 @@
 "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." => "Если соединение работает только с этой опцией, импортируйте на ваш сервер ownCloud сертификат SSL сервера LDAP.",
 "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/core/l10n/hi.php b/core/l10n/hi.php
new file mode 100644
index 0000000000..cc9cbdb22f
--- /dev/null
+++ b/core/l10n/hi.php
@@ -0,0 +1,14 @@
+<?php $TRANSLATIONS = array(
+"Username" => "प्रयोक्ता का नाम",
+"Cloud not found" => "क्लौड नहीं मिला ",
+"Create an <strong>admin account</strong>" => "व्यवस्थापक खाता बनाएँ",
+"Password" => "पासवर्ड",
+"Advanced" => "उन्नत",
+"Configure the database" => "डेटाबेस कॉन्फ़िगर करें ",
+"Database user" => "डेटाबेस उपयोगकर्ता",
+"Database password" => "डेटाबेस पासवर्ड",
+"Finish setup" => "सेटअप समाप्त करे",
+"You are logged out." => "आप लोग आउट  कर दिए गए हैं.",
+"prev" => "पिछला",
+"next" => "अगला"
+);
diff --git a/core/l10n/id.php b/core/l10n/id.php
index 296e2d62a4..47758f8861 100644
--- a/core/l10n/id.php
+++ b/core/l10n/id.php
@@ -3,6 +3,23 @@
 "No category to add?" => "Tidak ada kategori yang akan ditambahkan?",
 "This category already exists: " => "Kategori ini sudah ada:",
 "Settings" => "Setelan",
+"January" => "Januari",
+"February" => "Februari",
+"March" => "Maret",
+"April" => "April",
+"May" => "Mei",
+"June" => "Juni",
+"July" => "Juli",
+"August" => "Agustus",
+"September" => "September",
+"October" => "Oktober",
+"November" => "Nopember",
+"December" => "Desember",
+"Cancel" => "Batalkan",
+"No" => "Tidak",
+"Yes" => "Ya",
+"Ok" => "Oke",
+"No categories selected for deletion." => "Tidak ada kategori terpilih untuk penghapusan.",
 "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.",
diff --git a/core/l10n/it.php b/core/l10n/it.php
index 1c0bf94ca7..ca80770a3c 100644
--- a/core/l10n/it.php
+++ b/core/l10n/it.php
@@ -39,7 +39,7 @@
 "Admin" => "Admin",
 "Help" => "Aiuto",
 "Access forbidden" => "Accesso negato",
-"Cloud not found" => "Cloud non trovata",
+"Cloud not found" => "Nuvola non trovata",
 "Edit categories" => "Modifica le categorie",
 "Add" => "Aggiungi",
 "Create an <strong>admin account</strong>" => "Crea un <strong>account amministratore</strong>",
@@ -47,7 +47,7 @@
 "Advanced" => "Avanzate",
 "Data folder" => "Cartella dati",
 "Configure the database" => "Configura il database",
-"will be used" => "sarà usato",
+"will be used" => "sarà utilizzato",
 "Database user" => "Utente del database",
 "Database password" => "Password del database",
 "Database name" => "Nome del database",
diff --git a/l10n/af/core.po b/l10n/af/core.po
index 001cac78bc..1a1940f9e9 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-08-28 02:01+0200\n"
-"PO-Revision-Date: 2012-08-28 00:02+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -33,55 +33,55 @@ msgstr ""
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr ""
 
-#: js/js.js:190 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "January"
 msgstr ""
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "February"
 msgstr ""
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "March"
 msgstr ""
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "April"
 msgstr ""
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "May"
 msgstr ""
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "June"
 msgstr ""
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "July"
 msgstr ""
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "August"
 msgstr ""
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "September"
 msgstr ""
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "October"
 msgstr ""
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "November"
 msgstr ""
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "December"
 msgstr ""
 
diff --git a/l10n/af/files_sharing.po b/l10n/af/files_sharing.po
index 7ca711a252..b45ee8f65a 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-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:04+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -17,18 +17,10 @@ msgstr ""
 "Language: af\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: templates/get.php:4
-msgid "Size"
+#: templates/authenticate.php:4
+msgid "Password"
 msgstr ""
 
-#: templates/get.php:5
-msgid "Modified"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete all"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete"
+#: templates/authenticate.php:6
+msgid "Submit"
 msgstr ""
diff --git a/l10n/af/settings.po b/l10n/af/settings.po
index 1d213427bc..da858b04af 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-18 02:01+0200\n"
-"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"POT-Creation-Date: 2012-08-29 02:02+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -86,10 +86,46 @@ msgid "use systems cron service"
 msgstr ""
 
 #: templates/admin.php:39
-msgid "Log"
+msgid "Share API"
+msgstr ""
+
+#: templates/admin.php:44
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:45
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:49
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:50
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:54
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:55
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:58
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:60
+msgid "Allow users to only share with users in their groups"
 msgstr ""
 
 #: templates/admin.php:67
+msgid "Log"
+msgstr ""
+
+#: templates/admin.php:95
 msgid "More"
 msgstr ""
 
diff --git a/l10n/af/user_ldap.po b/l10n/af/user_ldap.po
index 7abe79a5a8..37f2c1ae38 100644
--- a/l10n/af/user_ldap.po
+++ b/l10n/af/user_ldap.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:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -159,6 +159,12 @@ msgstr ""
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:30
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:32
 msgid "Help"
 msgstr ""
diff --git a/l10n/ar/core.po b/l10n/ar/core.po
index 0ec803f64e..4c37f9bfd9 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-08-28 02:01+0200\n"
-"PO-Revision-Date: 2012-08-28 00:02+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -34,55 +34,55 @@ msgstr ""
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr ""
 
-#: js/js.js:190 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
 msgid "Settings"
 msgstr "تعديلات"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "January"
 msgstr ""
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "February"
 msgstr ""
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "March"
 msgstr ""
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "April"
 msgstr ""
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "May"
 msgstr ""
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "June"
 msgstr ""
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "July"
 msgstr ""
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "August"
 msgstr ""
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "September"
 msgstr ""
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "October"
 msgstr ""
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "November"
 msgstr ""
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "December"
 msgstr ""
 
diff --git a/l10n/ar/files_sharing.po b/l10n/ar/files_sharing.po
index f3922ed92a..c4b91a2774 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-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:04+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -17,18 +17,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"
 
-#: templates/get.php:4
-msgid "Size"
+#: templates/authenticate.php:4
+msgid "Password"
 msgstr ""
 
-#: templates/get.php:5
-msgid "Modified"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete all"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete"
+#: templates/authenticate.php:6
+msgid "Submit"
 msgstr ""
diff --git a/l10n/ar/settings.po b/l10n/ar/settings.po
index 0f13d4ebb2..8c02341755 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-18 02:01+0200\n"
-"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"POT-Creation-Date: 2012-08-29 02:02+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -88,10 +88,46 @@ msgid "use systems cron service"
 msgstr ""
 
 #: templates/admin.php:39
-msgid "Log"
+msgid "Share API"
+msgstr ""
+
+#: templates/admin.php:44
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:45
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:49
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:50
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:54
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:55
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:58
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:60
+msgid "Allow users to only share with users in their groups"
 msgstr ""
 
 #: templates/admin.php:67
+msgid "Log"
+msgstr ""
+
+#: templates/admin.php:95
 msgid "More"
 msgstr ""
 
diff --git a/l10n/ar/user_ldap.po b/l10n/ar/user_ldap.po
index fc34568956..51ea5c8216 100644
--- a/l10n/ar/user_ldap.po
+++ b/l10n/ar/user_ldap.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:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -159,6 +159,12 @@ msgstr ""
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:30
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:32
 msgid "Help"
 msgstr ""
diff --git a/l10n/ar_SA/core.po b/l10n/ar_SA/core.po
index 5878f90792..af7cb8d90c 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-08-28 02:01+0200\n"
-"PO-Revision-Date: 2012-08-28 00:02+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -33,55 +33,55 @@ msgstr ""
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr ""
 
-#: js/js.js:190 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "January"
 msgstr ""
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "February"
 msgstr ""
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "March"
 msgstr ""
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "April"
 msgstr ""
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "May"
 msgstr ""
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "June"
 msgstr ""
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "July"
 msgstr ""
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "August"
 msgstr ""
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "September"
 msgstr ""
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "October"
 msgstr ""
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "November"
 msgstr ""
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "December"
 msgstr ""
 
diff --git a/l10n/ar_SA/files_sharing.po b/l10n/ar_SA/files_sharing.po
index c240873407..b459097ebc 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-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:04+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -17,18 +17,10 @@ msgstr ""
 "Language: ar_SA\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: templates/get.php:4
-msgid "Size"
+#: templates/authenticate.php:4
+msgid "Password"
 msgstr ""
 
-#: templates/get.php:5
-msgid "Modified"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete all"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete"
+#: templates/authenticate.php:6
+msgid "Submit"
 msgstr ""
diff --git a/l10n/ar_SA/settings.po b/l10n/ar_SA/settings.po
index 803e9d5953..065806d42b 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-18 02:01+0200\n"
-"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"POT-Creation-Date: 2012-08-29 02:02+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -86,10 +86,46 @@ msgid "use systems cron service"
 msgstr ""
 
 #: templates/admin.php:39
-msgid "Log"
+msgid "Share API"
+msgstr ""
+
+#: templates/admin.php:44
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:45
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:49
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:50
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:54
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:55
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:58
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:60
+msgid "Allow users to only share with users in their groups"
 msgstr ""
 
 #: templates/admin.php:67
+msgid "Log"
+msgstr ""
+
+#: templates/admin.php:95
 msgid "More"
 msgstr ""
 
diff --git a/l10n/ar_SA/user_ldap.po b/l10n/ar_SA/user_ldap.po
index 92a90a4f3b..2345855a17 100644
--- a/l10n/ar_SA/user_ldap.po
+++ b/l10n/ar_SA/user_ldap.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:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -159,6 +159,12 @@ msgstr ""
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:30
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:32
 msgid "Help"
 msgstr ""
diff --git a/l10n/bg_BG/core.po b/l10n/bg_BG/core.po
index 02fa44cb78..a4caad873f 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-08-28 02:01+0200\n"
-"PO-Revision-Date: 2012-08-28 00:01+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -37,55 +37,55 @@ msgstr "Категорията вече съществува:"
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr ""
 
-#: js/js.js:190 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
 msgid "Settings"
 msgstr "Настройки"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "January"
 msgstr "Януари"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "February"
 msgstr "Февруари"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "March"
 msgstr "Март"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "April"
 msgstr "Април"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "May"
 msgstr "Май"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "June"
 msgstr "Юни"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "July"
 msgstr "Юли"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "August"
 msgstr "Август"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "September"
 msgstr "Септември"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "October"
 msgstr "Октомври"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "November"
 msgstr "Ноември"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "December"
 msgstr "Декември"
 
diff --git a/l10n/bg_BG/files_sharing.po b/l10n/bg_BG/files_sharing.po
index f03989ba48..d1afae484c 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-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:04+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -17,18 +17,10 @@ msgstr ""
 "Language: bg_BG\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: templates/get.php:4
-msgid "Size"
+#: templates/authenticate.php:4
+msgid "Password"
 msgstr ""
 
-#: templates/get.php:5
-msgid "Modified"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete all"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete"
+#: templates/authenticate.php:6
+msgid "Submit"
 msgstr ""
diff --git a/l10n/bg_BG/settings.po b/l10n/bg_BG/settings.po
index e7697bb27e..c1d39344f7 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-18 02:01+0200\n"
-"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"POT-Creation-Date: 2012-08-29 02:02+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -89,10 +89,46 @@ msgid "use systems cron service"
 msgstr ""
 
 #: templates/admin.php:39
-msgid "Log"
+msgid "Share API"
+msgstr ""
+
+#: templates/admin.php:44
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:45
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:49
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:50
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:54
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:55
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:58
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:60
+msgid "Allow users to only share with users in their groups"
 msgstr ""
 
 #: templates/admin.php:67
+msgid "Log"
+msgstr ""
+
+#: templates/admin.php:95
 msgid "More"
 msgstr ""
 
diff --git a/l10n/bg_BG/user_ldap.po b/l10n/bg_BG/user_ldap.po
index 8b8f5723ce..23f9ad3829 100644
--- a/l10n/bg_BG/user_ldap.po
+++ b/l10n/bg_BG/user_ldap.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:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -159,6 +159,12 @@ msgstr ""
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:30
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:32
 msgid "Help"
 msgstr ""
diff --git a/l10n/ca/core.po b/l10n/ca/core.po
index e8b808d6af..ce3b9f19f2 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-08-28 02:01+0200\n"
-"PO-Revision-Date: 2012-08-28 00:02+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -35,55 +35,55 @@ msgstr "Aquesta categoria ja existeix:"
 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:190 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
 msgid "Settings"
 msgstr "Arranjament"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "January"
 msgstr "Gener"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "February"
 msgstr "Febrer"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "March"
 msgstr "Març"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "April"
 msgstr "Abril"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "May"
 msgstr "Maig"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "June"
 msgstr "Juny"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "July"
 msgstr "Juliol"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "August"
 msgstr "Agost"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "September"
 msgstr "Setembre"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "October"
 msgstr "Octubre"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "November"
 msgstr "Novembre"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "December"
 msgstr "Desembre"
 
diff --git a/l10n/ca/files_sharing.po b/l10n/ca/files_sharing.po
index bc5fa18cf2..9edec9f6b5 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-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:04+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -18,18 +18,10 @@ msgstr ""
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: templates/get.php:4
-msgid "Size"
-msgstr "Mida"
+#: templates/authenticate.php:4
+msgid "Password"
+msgstr ""
 
-#: templates/get.php:5
-msgid "Modified"
-msgstr "Modificat"
-
-#: templates/get.php:5
-msgid "Delete all"
-msgstr "Esborra-ho tot"
-
-#: templates/get.php:5
-msgid "Delete"
-msgstr "Elimina"
+#: templates/authenticate.php:6
+msgid "Submit"
+msgstr ""
diff --git a/l10n/ca/settings.po b/l10n/ca/settings.po
index dfacbada2c..3b453b4c42 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-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-20 07:27+0000\n"
-"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
+"POT-Creation-Date: 2012-08-29 02:02+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -88,10 +88,46 @@ msgid "use systems cron service"
 msgstr "usa el servei cron del sistema"
 
 #: templates/admin.php:39
+msgid "Share API"
+msgstr ""
+
+#: templates/admin.php:44
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:45
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:49
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:50
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:54
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:55
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:58
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:60
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:67
 msgid "Log"
 msgstr "Registre"
 
-#: templates/admin.php:67
+#: templates/admin.php:95
 msgid "More"
 msgstr "Més"
 
diff --git a/l10n/ca/user_ldap.po b/l10n/ca/user_ldap.po
index 9261cd06e5..82824c9ad3 100644
--- a/l10n/ca/user_ldap.po
+++ b/l10n/ca/user_ldap.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:54+0000\n"
-"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -160,6 +160,12 @@ msgstr "en bytes"
 msgid "in seconds. A change empties the cache."
 msgstr "en segons. Un canvi buidarà la memòria de cau."
 
-#: templates/settings.php:31
+#: templates/settings.php:30
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:32
 msgid "Help"
 msgstr "Ajuda"
diff --git a/l10n/cs_CZ/core.po b/l10n/cs_CZ/core.po
index 84cea7fb08..6b09c23711 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-08-28 02:01+0200\n"
-"PO-Revision-Date: 2012-08-28 00:02+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -36,55 +36,55 @@ msgstr "Tato kategorie již existuje:"
 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:190 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
 msgid "Settings"
 msgstr "Nastavení"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "January"
 msgstr "Leden"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "February"
 msgstr "Únor"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "March"
 msgstr "Březen"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "April"
 msgstr "Duben"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "May"
 msgstr "Květen"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "June"
 msgstr "Červen"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "July"
 msgstr "Červenec"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "August"
 msgstr "Srpen"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "September"
 msgstr "Září"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "October"
 msgstr "Říjen"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "November"
 msgstr "Listopad"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "December"
 msgstr "Prosinec"
 
diff --git a/l10n/cs_CZ/files_external.po b/l10n/cs_CZ/files_external.po
index 1c175fb4db..8c21e14483 100644
--- a/l10n/cs_CZ/files_external.po
+++ b/l10n/cs_CZ/files_external.po
@@ -4,14 +4,15 @@
 # 
 # Translators:
 # Jan Krejci <krejca85@gmail.com>, 2012.
+# 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-24 02:02+0200\n"
-"PO-Revision-Date: 2012-08-23 23:53+0000\n"
-"Last-Translator: Jan Krejci <krejca85@gmail.com>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-28 19:11+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"
@@ -29,7 +30,7 @@ msgstr "Přípojný bod"
 
 #: templates/settings.php:8
 msgid "Backend"
-msgstr ""
+msgstr "Končící"
 
 #: templates/settings.php:9
 msgid "Configuration"
@@ -41,7 +42,7 @@ msgstr "Nastavení"
 
 #: templates/settings.php:11
 msgid "Applicable"
-msgstr ""
+msgstr "Platný"
 
 #: templates/settings.php:23
 msgid "Add mount point"
@@ -49,7 +50,7 @@ msgstr "Přidat přípojný bod"
 
 #: templates/settings.php:54 templates/settings.php:62
 msgid "None set"
-msgstr ""
+msgstr "Nenastaveno"
 
 #: templates/settings.php:63
 msgid "All Users"
@@ -69,11 +70,11 @@ msgstr "Smazat"
 
 #: templates/settings.php:88
 msgid "SSL root certificates"
-msgstr ""
+msgstr "Kořenové SSL certifikáty"
 
 #: templates/settings.php:102
 msgid "Import Root Certificate"
-msgstr ""
+msgstr "Import kořenového certifikátu"
 
 #: templates/settings.php:108
 msgid "Enable User External Storage"
diff --git a/l10n/cs_CZ/files_sharing.po b/l10n/cs_CZ/files_sharing.po
index 232114a8e6..0d2d55dcc9 100644
--- a/l10n/cs_CZ/files_sharing.po
+++ b/l10n/cs_CZ/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-24 02:02+0200\n"
-"PO-Revision-Date: 2012-08-23 19:58+0000\n"
-"Last-Translator: Michal Hrušecký <Michal@hrusecky.net>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,18 +19,10 @@ 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 "Velikost"
+#: templates/authenticate.php:4
+msgid "Password"
+msgstr ""
 
-#: templates/get.php:5
-msgid "Modified"
-msgstr "Upraveno"
-
-#: templates/get.php:5
-msgid "Delete all"
-msgstr "Smazat vše"
-
-#: templates/get.php:5
-msgid "Delete"
-msgstr "Smazat"
+#: templates/authenticate.php:6
+msgid "Submit"
+msgstr ""
diff --git a/l10n/cs_CZ/settings.po b/l10n/cs_CZ/settings.po
index 64ed6cf955..56df4dcffe 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-18 02:01+0200\n"
-"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"POT-Creation-Date: 2012-08-29 02:02+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -91,10 +91,46 @@ msgid "use systems cron service"
 msgstr "použijte systémovou službu cron"
 
 #: templates/admin.php:39
+msgid "Share API"
+msgstr ""
+
+#: templates/admin.php:44
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:45
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:49
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:50
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:54
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:55
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:58
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:60
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:67
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:67
+#: templates/admin.php:95
 msgid "More"
 msgstr "Více"
 
diff --git a/l10n/cs_CZ/user_ldap.po b/l10n/cs_CZ/user_ldap.po
index 25f623c83b..9f1f90c4d4 100644
--- a/l10n/cs_CZ/user_ldap.po
+++ b/l10n/cs_CZ/user_ldap.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-17 16:01+0000\n"
-"Last-Translator: Martin <fireball@atlas.cz>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -160,6 +160,12 @@ msgstr "v bytech"
 msgid "in seconds. A change empties the cache."
 msgstr "ve vteřinách. Změna vyprázdní dočasnou paměť."
 
-#: templates/settings.php:31
+#: templates/settings.php:30
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:32
 msgid "Help"
 msgstr "Nápověda"
diff --git a/l10n/da/core.po b/l10n/da/core.po
index d5210b045c..782c53cf39 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-08-28 02:01+0200\n"
-"PO-Revision-Date: 2012-08-28 00:01+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -38,55 +38,55 @@ msgstr "Denne kategori eksisterer allerede: "
 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:190 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
 msgid "Settings"
 msgstr "Indstillinger"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "January"
 msgstr "Januar"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "February"
 msgstr "Februar"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "March"
 msgstr "Marts"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "April"
 msgstr "April"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "May"
 msgstr "Maj"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "June"
 msgstr "Juni"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "July"
 msgstr "Juli"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "August"
 msgstr "August"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "September"
 msgstr "September"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "October"
 msgstr "Oktober"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "November"
 msgstr "November"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "December"
 msgstr "December"
 
diff --git a/l10n/da/files_sharing.po b/l10n/da/files_sharing.po
index 7ed986fd02..7af7f3cce6 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-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:04+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -17,18 +17,10 @@ msgstr ""
 "Language: da\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: templates/get.php:4
-msgid "Size"
+#: templates/authenticate.php:4
+msgid "Password"
 msgstr ""
 
-#: templates/get.php:5
-msgid "Modified"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete all"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete"
+#: templates/authenticate.php:6
+msgid "Submit"
 msgstr ""
diff --git a/l10n/da/settings.po b/l10n/da/settings.po
index 5254803303..132eb0965d 100644
--- a/l10n/da/settings.po
+++ b/l10n/da/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-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-20 14:35+0000\n"
-"Last-Translator: ressel <sr@ybnet.dk>\n"
+"POT-Creation-Date: 2012-08-29 02:02+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -93,10 +93,46 @@ msgid "use systems cron service"
 msgstr ""
 
 #: templates/admin.php:39
+msgid "Share API"
+msgstr ""
+
+#: templates/admin.php:44
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:45
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:49
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:50
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:54
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:55
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:58
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:60
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:67
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:67
+#: templates/admin.php:95
 msgid "More"
 msgstr "Mere"
 
diff --git a/l10n/da/user_ldap.po b/l10n/da/user_ldap.po
index 5103ecf98c..1d87e55405 100644
--- a/l10n/da/user_ldap.po
+++ b/l10n/da/user_ldap.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-20 14:58+0000\n"
-"Last-Translator: ressel <sr@ybnet.dk>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -160,6 +160,12 @@ msgstr ""
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:30
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:32
 msgid "Help"
 msgstr "Hjælp"
diff --git a/l10n/de/core.po b/l10n/de/core.po
index b7300133f0..7fd2379895 100644
--- a/l10n/de/core.po
+++ b/l10n/de/core.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-28 02:01+0200\n"
-"PO-Revision-Date: 2012-08-28 00:01+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -44,55 +44,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:190 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "January"
 msgstr "Januar"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "February"
 msgstr "Februar"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "March"
 msgstr "März"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "April"
 msgstr "April"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "May"
 msgstr "Mai"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "June"
 msgstr "Juni"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "July"
 msgstr "Juli"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "August"
 msgstr "August"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "September"
 msgstr "September"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "October"
 msgstr "Oktober"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "November"
 msgstr "November"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "December"
 msgstr "Dezember"
 
diff --git a/l10n/de/files_sharing.po b/l10n/de/files_sharing.po
index 8f7dfd3059..c9da23c62a 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-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:04+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -20,18 +20,10 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: templates/get.php:4
-msgid "Size"
-msgstr "Größe"
+#: templates/authenticate.php:4
+msgid "Password"
+msgstr ""
 
-#: templates/get.php:5
-msgid "Modified"
-msgstr "Geändert"
-
-#: templates/get.php:5
-msgid "Delete all"
-msgstr "Alle löschen"
-
-#: templates/get.php:5
-msgid "Delete"
-msgstr "Löschen"
+#: templates/authenticate.php:6
+msgid "Submit"
+msgstr ""
diff --git a/l10n/de/settings.po b/l10n/de/settings.po
index 29ec31c8a5..932008355a 100644
--- a/l10n/de/settings.po
+++ b/l10n/de/settings.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-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"
+"POT-Creation-Date: 2012-08-29 02:02+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -95,10 +95,46 @@ msgid "use systems cron service"
 msgstr "Nutze System-Cron-Service"
 
 #: templates/admin.php:39
+msgid "Share API"
+msgstr ""
+
+#: templates/admin.php:44
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:45
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:49
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:50
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:54
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:55
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:58
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:60
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:67
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:67
+#: templates/admin.php:95
 msgid "More"
 msgstr "Mehr"
 
diff --git a/l10n/de/user_ldap.po b/l10n/de/user_ldap.po
index 5cd6c4762f..6f9cced66a 100644
--- a/l10n/de/user_ldap.po
+++ b/l10n/de/user_ldap.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-24 02:02+0200\n"
-"PO-Revision-Date: 2012-08-23 10:14+0000\n"
-"Last-Translator: traductor <transifex.3.mensaje@spamgourmet.com>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -164,6 +164,12 @@ msgstr "in Bytes"
 msgid "in seconds. A change empties the cache."
 msgstr "in Sekunden. Eine Änderung leert den Cache."
 
-#: templates/settings.php:31
+#: templates/settings.php:30
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:32
 msgid "Help"
 msgstr "Hilfe"
diff --git a/l10n/el/core.po b/l10n/el/core.po
index ffd90d39f2..8de9d580dc 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-08-28 02:01+0200\n"
-"PO-Revision-Date: 2012-08-28 00:01+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -37,55 +37,55 @@ msgstr "Αυτή η κατηγορία υπάρχει ήδη"
 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:190 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
 msgid "Settings"
 msgstr "Ρυθμίσεις"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "January"
 msgstr "Ιανουάριος"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "February"
 msgstr "Φεβρουάριος"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "March"
 msgstr "Μάρτιος"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "April"
 msgstr "Απρίλιος"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "May"
 msgstr "Μάϊος"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "June"
 msgstr "Ιούνιος"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "July"
 msgstr "Ιούλιος"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "August"
 msgstr "Αύγουστος"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "September"
 msgstr "Σεπτέμβριος"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "October"
 msgstr "Οκτώβριος"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "November"
 msgstr "Νοέμβριος"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "December"
 msgstr "Δεκέμβριος"
 
diff --git a/l10n/el/files_sharing.po b/l10n/el/files_sharing.po
index 32f11e9f2c..3683b27656 100644
--- a/l10n/el/files_sharing.po
+++ b/l10n/el/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-24 02:02+0200\n"
-"PO-Revision-Date: 2012-08-23 08:57+0000\n"
-"Last-Translator: Nisok Kosin <nikos.efthimiou@gmail.com>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,18 +18,10 @@ msgstr ""
 "Language: el\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: templates/get.php:4
-msgid "Size"
-msgstr "Μέγεθος"
+#: templates/authenticate.php:4
+msgid "Password"
+msgstr ""
 
-#: templates/get.php:5
-msgid "Modified"
-msgstr "Τροποποιήθηκε"
-
-#: templates/get.php:5
-msgid "Delete all"
-msgstr "Διαγραφή όλων"
-
-#: templates/get.php:5
-msgid "Delete"
-msgstr "Διαγραφή"
+#: templates/authenticate.php:6
+msgid "Submit"
+msgstr ""
diff --git a/l10n/el/settings.po b/l10n/el/settings.po
index 6d7243e05b..0e099d8938 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-24 02:02+0200\n"
-"PO-Revision-Date: 2012-08-23 08:43+0000\n"
-"Last-Translator: Nisok Kosin <nikos.efthimiou@gmail.com>\n"
+"POT-Creation-Date: 2012-08-29 02:02+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -93,10 +93,46 @@ msgid "use systems cron service"
 msgstr "Χρήση της υπηρεσίας cron του συστήματος"
 
 #: templates/admin.php:39
+msgid "Share API"
+msgstr ""
+
+#: templates/admin.php:44
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:45
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:49
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:50
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:54
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:55
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:58
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:60
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:67
 msgid "Log"
 msgstr "Αρχείο καταγραφής"
 
-#: templates/admin.php:67
+#: templates/admin.php:95
 msgid "More"
 msgstr "Περισσότερο"
 
diff --git a/l10n/el/user_ldap.po b/l10n/el/user_ldap.po
index cfea140f22..3752a64b5d 100644
--- a/l10n/el/user_ldap.po
+++ b/l10n/el/user_ldap.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-24 02:02+0200\n"
-"PO-Revision-Date: 2012-08-23 13:38+0000\n"
-"Last-Translator: Efstathios Iosifidis <diamond_gr@freemail.gr>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -160,6 +160,12 @@ msgstr "σε bytes"
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:30
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:32
 msgid "Help"
 msgstr "Βοήθεια"
diff --git a/l10n/eo/core.po b/l10n/eo/core.po
index d870802209..d3bc69aa6b 100644
--- a/l10n/eo/core.po
+++ b/l10n/eo/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-08-28 02:01+0200\n"
-"PO-Revision-Date: 2012-08-28 00:02+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -36,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:190 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
 msgid "Settings"
 msgstr "Agordo"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "January"
 msgstr "Januaro"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "February"
 msgstr "Februaro"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "March"
 msgstr "Marto"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "April"
 msgstr "Aprilo"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "May"
 msgstr "Majo"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "June"
 msgstr "Junio"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "July"
 msgstr "Julio"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "August"
 msgstr "Aŭgusto"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "September"
 msgstr "Septembro"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "October"
 msgstr "Oktobro"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "November"
 msgstr "Novembro"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "December"
 msgstr "Decembro"
 
diff --git a/l10n/eo/files_sharing.po b/l10n/eo/files_sharing.po
index f1afe86872..fd8cae3168 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-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:04+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -18,18 +18,10 @@ msgstr ""
 "Language: eo\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: templates/get.php:4
-msgid "Size"
+#: templates/authenticate.php:4
+msgid "Password"
 msgstr ""
 
-#: templates/get.php:5
-msgid "Modified"
+#: templates/authenticate.php:6
+msgid "Submit"
 msgstr ""
-
-#: templates/get.php:5
-msgid "Delete all"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete"
-msgstr "Forigi"
diff --git a/l10n/eo/settings.po b/l10n/eo/settings.po
index 15e0d6d85a..1a916d2039 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-19 02:02+0200\n"
-"PO-Revision-Date: 2012-08-18 17:13+0000\n"
-"Last-Translator: Mariano <mstreet@kde.org.ar>\n"
+"POT-Creation-Date: 2012-08-29 02:02+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -88,10 +88,46 @@ msgid "use systems cron service"
 msgstr "uzi la cron-servon de la sistemo"
 
 #: templates/admin.php:39
+msgid "Share API"
+msgstr ""
+
+#: templates/admin.php:44
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:45
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:49
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:50
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:54
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:55
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:58
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:60
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:67
 msgid "Log"
 msgstr "Protokolo"
 
-#: templates/admin.php:67
+#: templates/admin.php:95
 msgid "More"
 msgstr "Pli"
 
diff --git a/l10n/eo/user_ldap.po b/l10n/eo/user_ldap.po
index d83f307fe2..9e4a9947c2 100644
--- a/l10n/eo/user_ldap.po
+++ b/l10n/eo/user_ldap.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 14:28+0000\n"
-"Last-Translator: Mariano <mstreet@kde.org.ar>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -160,6 +160,12 @@ msgstr "duumoke"
 msgid "in seconds. A change empties the cache."
 msgstr "sekunde. Ajna ŝanĝo malplenigas la kaŝmemoron."
 
-#: templates/settings.php:31
+#: templates/settings.php:30
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:32
 msgid "Help"
 msgstr "Helpo"
diff --git a/l10n/es/core.po b/l10n/es/core.po
index 339d3e2d62..34fc1ff54a 100644
--- a/l10n/es/core.po
+++ b/l10n/es/core.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-28 02:01+0200\n"
-"PO-Revision-Date: 2012-08-28 00:01+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -40,55 +40,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:190 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
 msgid "Settings"
 msgstr "Ajustes"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "January"
 msgstr "Enero"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "February"
 msgstr "Febrero"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "March"
 msgstr "Marzo"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "April"
 msgstr "Abril"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "May"
 msgstr "Mayo"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "June"
 msgstr "Junio"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "July"
 msgstr "Julio"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "August"
 msgstr "Agosto"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "September"
 msgstr "Septiembre"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "October"
 msgstr "Octubre"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "November"
 msgstr "Noviembre"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "December"
 msgstr "Diciembre"
 
diff --git a/l10n/es/files_sharing.po b/l10n/es/files_sharing.po
index e53147b10f..ccb836d0dc 100644
--- a/l10n/es/files_sharing.po
+++ b/l10n/es/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-24 02:02+0200\n"
-"PO-Revision-Date: 2012-08-23 09:11+0000\n"
-"Last-Translator: Javier Llorente <javier@opensuse.org>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,18 +18,10 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: templates/get.php:4
-msgid "Size"
-msgstr "Tamaño"
+#: templates/authenticate.php:4
+msgid "Password"
+msgstr ""
 
-#: templates/get.php:5
-msgid "Modified"
-msgstr "Modificado"
-
-#: templates/get.php:5
-msgid "Delete all"
-msgstr "Eliminar todo"
-
-#: templates/get.php:5
-msgid "Delete"
-msgstr "Eliminar"
+#: templates/authenticate.php:6
+msgid "Submit"
+msgstr ""
diff --git a/l10n/es/settings.po b/l10n/es/settings.po
index 4fadce58dc..e1085bc4ca 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-24 02:02+0200\n"
-"PO-Revision-Date: 2012-08-23 09:14+0000\n"
-"Last-Translator: Javier Llorente <javier@opensuse.org>\n"
+"POT-Creation-Date: 2012-08-29 02:02+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -94,10 +94,46 @@ msgid "use systems cron service"
 msgstr "usar servicio cron del sistema"
 
 #: templates/admin.php:39
+msgid "Share API"
+msgstr ""
+
+#: templates/admin.php:44
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:45
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:49
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:50
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:54
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:55
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:58
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:60
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:67
 msgid "Log"
 msgstr "Registro"
 
-#: templates/admin.php:67
+#: templates/admin.php:95
 msgid "More"
 msgstr "Más"
 
diff --git a/l10n/es/user_ldap.po b/l10n/es/user_ldap.po
index 11d0ce6c53..49025f4606 100644
--- a/l10n/es/user_ldap.po
+++ b/l10n/es/user_ldap.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-24 02:02+0200\n"
-"PO-Revision-Date: 2012-08-23 09:28+0000\n"
-"Last-Translator: Javier Llorente <javier@opensuse.org>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -160,6 +160,12 @@ msgstr "en bytes"
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:30
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:32
 msgid "Help"
 msgstr "Ayuda"
diff --git a/l10n/et_EE/core.po b/l10n/et_EE/core.po
index b02a246201..b5d1fc5cc4 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-08-28 02:01+0200\n"
-"PO-Revision-Date: 2012-08-28 00:01+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -34,55 +34,55 @@ msgstr "See kategooria on juba olemas: "
 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:190 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
 msgid "Settings"
 msgstr "Seaded"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "January"
 msgstr "Jaanuar"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "February"
 msgstr "Veebruar"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "March"
 msgstr "Märts"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "April"
 msgstr "Aprill"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "May"
 msgstr "Mai"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "June"
 msgstr "Juuni"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "July"
 msgstr "Juuli"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "August"
 msgstr "August"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "September"
 msgstr "September"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "October"
 msgstr "Oktoober"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "November"
 msgstr "November"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "December"
 msgstr "Detsember"
 
diff --git a/l10n/et_EE/files_sharing.po b/l10n/et_EE/files_sharing.po
index ebe1c5cb9b..685a455172 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-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:04+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -18,18 +18,10 @@ msgstr ""
 "Language: et_EE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: templates/get.php:4
-msgid "Size"
+#: templates/authenticate.php:4
+msgid "Password"
 msgstr ""
 
-#: templates/get.php:5
-msgid "Modified"
+#: templates/authenticate.php:6
+msgid "Submit"
 msgstr ""
-
-#: templates/get.php:5
-msgid "Delete all"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete"
-msgstr "Kustutamine"
diff --git a/l10n/et_EE/settings.po b/l10n/et_EE/settings.po
index 089670c04c..da5e7a6610 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-26 19:46+0200\n"
-"PO-Revision-Date: 2012-08-26 17:19+0000\n"
-"Last-Translator: Rivo Zängov <eraser@eraser.ee>\n"
+"POT-Creation-Date: 2012-08-29 02:02+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -88,10 +88,46 @@ msgid "use systems cron service"
 msgstr "kasuta süsteemide cron teenuseid"
 
 #: templates/admin.php:39
+msgid "Share API"
+msgstr ""
+
+#: templates/admin.php:44
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:45
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:49
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:50
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:54
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:55
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:58
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:60
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:67
 msgid "Log"
 msgstr "Logi"
 
-#: templates/admin.php:67
+#: templates/admin.php:95
 msgid "More"
 msgstr "Veel"
 
diff --git a/l10n/et_EE/user_ldap.po b/l10n/et_EE/user_ldap.po
index 38de7d5c10..80d9727ff0 100644
--- a/l10n/et_EE/user_ldap.po
+++ b/l10n/et_EE/user_ldap.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-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
 "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 "Parool"
 
 #: 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 "Grupi 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"
@@ -111,7 +112,7 @@ msgstr ""
 
 #: templates/settings.php:21
 msgid "Use TLS"
-msgstr ""
+msgstr "Kasutaja TLS"
 
 #: templates/settings.php:21
 msgid "Do not use it for SSL connections, it will fail."
@@ -153,12 +154,18 @@ msgstr ""
 
 #: templates/settings.php:27
 msgid "in bytes"
-msgstr ""
+msgstr "baitides"
 
 #: templates/settings.php:29
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:31
-msgid "Help"
+#: templates/settings.php:30
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
 msgstr ""
+
+#: templates/settings.php:32
+msgid "Help"
+msgstr "Abiinfo"
diff --git a/l10n/eu/core.po b/l10n/eu/core.po
index 109068c645..2e8170d6eb 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-08-28 02:01+0200\n"
-"PO-Revision-Date: 2012-08-28 00:02+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -35,55 +35,55 @@ msgstr "Kategoria hau dagoeneko existitzen da:"
 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:190 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
 msgid "Settings"
 msgstr "Ezarpenak"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "January"
 msgstr "Urtarrila"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "February"
 msgstr "Otsaila"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "March"
 msgstr "Martxoa"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "April"
 msgstr "Apirila"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "May"
 msgstr "Maiatza"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "June"
 msgstr "Ekaina"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "July"
 msgstr "Uztaila"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "August"
 msgstr "Abuztua"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "September"
 msgstr "Iraila"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "October"
 msgstr "Urria"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "November"
 msgstr "Azaroa"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "December"
 msgstr "Abendua"
 
diff --git a/l10n/eu/files_sharing.po b/l10n/eu/files_sharing.po
index a7eb7ffe2a..5dbf9d47d5 100644
--- a/l10n/eu/files_sharing.po
+++ b/l10n/eu/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-28 02:01+0200\n"
-"PO-Revision-Date: 2012-08-27 08:54+0000\n"
-"Last-Translator: asieriko <asieriko@gmail.com>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,18 +18,10 @@ msgstr ""
 "Language: eu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: templates/get.php:4
-msgid "Size"
-msgstr "Tamaina"
+#: templates/authenticate.php:4
+msgid "Password"
+msgstr ""
 
-#: templates/get.php:5
-msgid "Modified"
-msgstr "Aldatuta"
-
-#: templates/get.php:5
-msgid "Delete all"
-msgstr "Ezabatu dena"
-
-#: templates/get.php:5
-msgid "Delete"
-msgstr "Ezabatu"
+#: templates/authenticate.php:6
+msgid "Submit"
+msgstr ""
diff --git a/l10n/eu/settings.po b/l10n/eu/settings.po
index b6a2050a81..2084610e4f 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-28 02:01+0200\n"
-"PO-Revision-Date: 2012-08-27 11:17+0000\n"
-"Last-Translator: asieriko <asieriko@gmail.com>\n"
+"POT-Creation-Date: 2012-08-29 02:02+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -89,10 +89,46 @@ msgid "use systems cron service"
 msgstr "erabili sistemaren cron zerbitzua"
 
 #: templates/admin.php:39
+msgid "Share API"
+msgstr ""
+
+#: templates/admin.php:44
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:45
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:49
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:50
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:54
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:55
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:58
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:60
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:67
 msgid "Log"
 msgstr "Egunkaria"
 
-#: templates/admin.php:67
+#: templates/admin.php:95
 msgid "More"
 msgstr "Gehiago"
 
diff --git a/l10n/eu/user_ldap.po b/l10n/eu/user_ldap.po
index 95f361427d..8b6abda92f 100644
--- a/l10n/eu/user_ldap.po
+++ b/l10n/eu/user_ldap.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-28 02:01+0200\n"
-"PO-Revision-Date: 2012-08-27 10:45+0000\n"
-"Last-Translator: asieriko <asieriko@gmail.com>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -160,6 +160,12 @@ msgstr "bytetan"
 msgid "in seconds. A change empties the cache."
 msgstr "segundutan. Aldaketak katxea husten du."
 
-#: templates/settings.php:31
+#: templates/settings.php:30
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:32
 msgid "Help"
 msgstr "Laguntza"
diff --git a/l10n/eu_ES/core.po b/l10n/eu_ES/core.po
index 5c54a269c0..8b695d7d73 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-08-28 02:01+0200\n"
-"PO-Revision-Date: 2012-08-28 00:02+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -33,55 +33,55 @@ msgstr ""
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr ""
 
-#: js/js.js:190 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "January"
 msgstr ""
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "February"
 msgstr ""
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "March"
 msgstr ""
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "April"
 msgstr ""
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "May"
 msgstr ""
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "June"
 msgstr ""
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "July"
 msgstr ""
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "August"
 msgstr ""
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "September"
 msgstr ""
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "October"
 msgstr ""
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "November"
 msgstr ""
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "December"
 msgstr ""
 
diff --git a/l10n/eu_ES/files_sharing.po b/l10n/eu_ES/files_sharing.po
index 0ba46e6c77..61cc77d14a 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-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:04+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -17,18 +17,10 @@ msgstr ""
 "Language: eu_ES\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: templates/get.php:4
-msgid "Size"
+#: templates/authenticate.php:4
+msgid "Password"
 msgstr ""
 
-#: templates/get.php:5
-msgid "Modified"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete all"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete"
+#: templates/authenticate.php:6
+msgid "Submit"
 msgstr ""
diff --git a/l10n/eu_ES/settings.po b/l10n/eu_ES/settings.po
index 82cc89a620..f1a8e4aa08 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-18 02:01+0200\n"
-"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"POT-Creation-Date: 2012-08-29 02:02+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -86,10 +86,46 @@ msgid "use systems cron service"
 msgstr ""
 
 #: templates/admin.php:39
-msgid "Log"
+msgid "Share API"
+msgstr ""
+
+#: templates/admin.php:44
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:45
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:49
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:50
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:54
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:55
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:58
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:60
+msgid "Allow users to only share with users in their groups"
 msgstr ""
 
 #: templates/admin.php:67
+msgid "Log"
+msgstr ""
+
+#: templates/admin.php:95
 msgid "More"
 msgstr ""
 
diff --git a/l10n/eu_ES/user_ldap.po b/l10n/eu_ES/user_ldap.po
index 34f25c3435..2999d7de98 100644
--- a/l10n/eu_ES/user_ldap.po
+++ b/l10n/eu_ES/user_ldap.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:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -159,6 +159,12 @@ msgstr ""
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:30
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:32
 msgid "Help"
 msgstr ""
diff --git a/l10n/fa/core.po b/l10n/fa/core.po
index 3a6f8b7c70..6275a4af56 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-08-28 02:01+0200\n"
-"PO-Revision-Date: 2012-08-28 00:02+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -34,55 +34,55 @@ msgstr "این گروه از قبل اضافه شده"
 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:190 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
 msgid "Settings"
 msgstr "تنظیمات"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "January"
 msgstr "ژانویه"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "February"
 msgstr "فبریه"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "March"
 msgstr "مارس"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "April"
 msgstr "آوریل"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "May"
 msgstr "می"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "June"
 msgstr "ژوئن"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "July"
 msgstr "جولای"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "August"
 msgstr "آگوست"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "September"
 msgstr "سپتامبر"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "October"
 msgstr "اکتبر"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "November"
 msgstr "نوامبر"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "December"
 msgstr "دسامبر"
 
diff --git a/l10n/fa/files_sharing.po b/l10n/fa/files_sharing.po
index 9b11f7a5ec..9bdff0feec 100644
--- a/l10n/fa/files_sharing.po
+++ b/l10n/fa/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-24 02:02+0200\n"
-"PO-Revision-Date: 2012-08-23 20:07+0000\n"
-"Last-Translator: Mohammad Dashtizadeh <mohammad@dashtizadeh.net>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,18 +18,10 @@ msgstr ""
 "Language: fa\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: templates/get.php:4
-msgid "Size"
-msgstr "اندازه"
+#: templates/authenticate.php:4
+msgid "Password"
+msgstr ""
 
-#: templates/get.php:5
-msgid "Modified"
-msgstr "تاریخ"
-
-#: templates/get.php:5
-msgid "Delete all"
-msgstr "حذف همه"
-
-#: templates/get.php:5
-msgid "Delete"
-msgstr "حذف"
+#: templates/authenticate.php:6
+msgid "Submit"
+msgstr ""
diff --git a/l10n/fa/settings.po b/l10n/fa/settings.po
index 38f01f759c..9ba953c9e1 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-18 02:01+0200\n"
-"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"POT-Creation-Date: 2012-08-29 02:02+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -88,10 +88,46 @@ msgid "use systems cron service"
 msgstr ""
 
 #: templates/admin.php:39
+msgid "Share API"
+msgstr ""
+
+#: templates/admin.php:44
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:45
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:49
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:50
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:54
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:55
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:58
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:60
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:67
 msgid "Log"
 msgstr "کارنامه"
 
-#: templates/admin.php:67
+#: templates/admin.php:95
 msgid "More"
 msgstr "بیشتر"
 
diff --git a/l10n/fa/user_ldap.po b/l10n/fa/user_ldap.po
index eb2a0fd767..4a711bf201 100644
--- a/l10n/fa/user_ldap.po
+++ b/l10n/fa/user_ldap.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:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
 "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."
@@ -159,6 +160,12 @@ msgstr ""
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:31
-msgid "Help"
+#: templates/settings.php:30
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
 msgstr ""
+
+#: templates/settings.php:32
+msgid "Help"
+msgstr "راه‌نما"
diff --git a/l10n/fi/core.po b/l10n/fi/core.po
index 992a3d3065..50358c7b5a 100644
--- a/l10n/fi/core.po
+++ b/l10n/fi/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-08-28 02:01+0200\n"
-"PO-Revision-Date: 2012-08-28 00:02+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -33,55 +33,55 @@ msgstr ""
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr ""
 
-#: js/js.js:190 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "January"
 msgstr ""
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "February"
 msgstr ""
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "March"
 msgstr ""
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "April"
 msgstr ""
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "May"
 msgstr ""
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "June"
 msgstr ""
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "July"
 msgstr ""
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "August"
 msgstr ""
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "September"
 msgstr ""
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "October"
 msgstr ""
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "November"
 msgstr ""
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "December"
 msgstr ""
 
diff --git a/l10n/fi/files_sharing.po b/l10n/fi/files_sharing.po
index b8c06567b5..f4e463219f 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-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:04+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -17,18 +17,10 @@ msgstr ""
 "Language: fi\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: templates/get.php:4
-msgid "Size"
+#: templates/authenticate.php:4
+msgid "Password"
 msgstr ""
 
-#: templates/get.php:5
-msgid "Modified"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete all"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete"
+#: templates/authenticate.php:6
+msgid "Submit"
 msgstr ""
diff --git a/l10n/fi/settings.po b/l10n/fi/settings.po
index 823276532f..ff6f704321 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-18 02:01+0200\n"
-"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"POT-Creation-Date: 2012-08-29 02:02+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -86,10 +86,46 @@ msgid "use systems cron service"
 msgstr ""
 
 #: templates/admin.php:39
-msgid "Log"
+msgid "Share API"
+msgstr ""
+
+#: templates/admin.php:44
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:45
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:49
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:50
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:54
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:55
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:58
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:60
+msgid "Allow users to only share with users in their groups"
 msgstr ""
 
 #: templates/admin.php:67
+msgid "Log"
+msgstr ""
+
+#: templates/admin.php:95
 msgid "More"
 msgstr ""
 
diff --git a/l10n/fi/user_ldap.po b/l10n/fi/user_ldap.po
index 70707a1d17..5f8865fafa 100644
--- a/l10n/fi/user_ldap.po
+++ b/l10n/fi/user_ldap.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:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -159,6 +159,12 @@ msgstr ""
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:30
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:32
 msgid "Help"
 msgstr ""
diff --git a/l10n/fi_FI/core.po b/l10n/fi_FI/core.po
index e78e8f7504..5f70f5c6f9 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-08-28 02:01+0200\n"
-"PO-Revision-Date: 2012-08-28 00:02+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -38,55 +38,55 @@ msgstr "Tämä luokka on jo olemassa: "
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr ""
 
-#: js/js.js:190 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
 msgid "Settings"
 msgstr "Asetukset"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "January"
 msgstr "Tammikuu"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "February"
 msgstr "Helmikuu"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "March"
 msgstr "Maaliskuu"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "April"
 msgstr "Huhtikuu"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "May"
 msgstr "Toukokuu"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "June"
 msgstr "Kesäkuu"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "July"
 msgstr "Heinäkuu"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "August"
 msgstr "Elokuu"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "September"
 msgstr "Syyskuu"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "October"
 msgstr "Lokakuu"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "November"
 msgstr "Marraskuu"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "December"
 msgstr "Joulukuu"
 
diff --git a/l10n/fi_FI/files_sharing.po b/l10n/fi_FI/files_sharing.po
index dba2e1225d..8c162a1fe4 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-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"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -18,18 +18,10 @@ msgstr ""
 "Language: fi_FI\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: templates/get.php:4
-msgid "Size"
-msgstr "Koko"
+#: templates/authenticate.php:4
+msgid "Password"
+msgstr ""
 
-#: templates/get.php:5
-msgid "Modified"
-msgstr "Muokattu"
-
-#: templates/get.php:5
-msgid "Delete all"
-msgstr "Poista kaikki"
-
-#: templates/get.php:5
-msgid "Delete"
-msgstr "Poista"
+#: templates/authenticate.php:6
+msgid "Submit"
+msgstr ""
diff --git a/l10n/fi_FI/settings.po b/l10n/fi_FI/settings.po
index f3610fa859..4baba2f56c 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-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"
+"POT-Creation-Date: 2012-08-29 02:02+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -88,10 +88,46 @@ msgid "use systems cron service"
 msgstr "käytä järjestelmän cron-palvelua"
 
 #: templates/admin.php:39
+msgid "Share API"
+msgstr ""
+
+#: templates/admin.php:44
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:45
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:49
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:50
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:54
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:55
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:58
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:60
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:67
 msgid "Log"
 msgstr "Loki"
 
-#: templates/admin.php:67
+#: templates/admin.php:95
 msgid "More"
 msgstr "Lisää"
 
diff --git a/l10n/fi_FI/user_ldap.po b/l10n/fi_FI/user_ldap.po
index a8c8f4e5c8..8d3344a831 100644
--- a/l10n/fi_FI/user_ldap.po
+++ b/l10n/fi_FI/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-24 02:02+0200\n"
-"PO-Revision-Date: 2012-08-23 18:00+0000\n"
-"Last-Translator: kyyberi <jarkko.moilanen@want3d.fi>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -161,6 +161,12 @@ msgstr "tavuissa"
 msgid "in seconds. A change empties the cache."
 msgstr "sekunneissa. Muutos tyhjentää välimuistin."
 
-#: templates/settings.php:31
+#: templates/settings.php:30
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:32
 msgid "Help"
 msgstr "Ohje"
diff --git a/l10n/fr/core.po b/l10n/fr/core.po
index e7c3296956..0229ac1e53 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-08-28 02:01+0200\n"
-"PO-Revision-Date: 2012-08-28 00:01+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -37,55 +37,55 @@ msgstr "Cette catégorie existe déjà : "
 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:190 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
 msgid "Settings"
 msgstr "Paramètres"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "January"
 msgstr "Janvier"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "February"
 msgstr "Février"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "March"
 msgstr "Mars"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "April"
 msgstr "Avril"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "May"
 msgstr "Mai"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "June"
 msgstr "Juin"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "July"
 msgstr "Juillet"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "August"
 msgstr "Août"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "September"
 msgstr "Septembre"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "October"
 msgstr "Octobre"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "November"
 msgstr "Novembre"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "December"
 msgstr "Décembre"
 
diff --git a/l10n/fr/files_sharing.po b/l10n/fr/files_sharing.po
index 254df78bd1..4fcb57d414 100644
--- a/l10n/fr/files_sharing.po
+++ b/l10n/fr/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-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:04+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -19,18 +19,10 @@ msgstr ""
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
-#: templates/get.php:4
-msgid "Size"
-msgstr "Taille"
+#: templates/authenticate.php:4
+msgid "Password"
+msgstr ""
 
-#: templates/get.php:5
-msgid "Modified"
-msgstr "Modifié"
-
-#: templates/get.php:5
-msgid "Delete all"
-msgstr "Tout effacer"
-
-#: templates/get.php:5
-msgid "Delete"
-msgstr "Effacement"
+#: templates/authenticate.php:6
+msgid "Submit"
+msgstr ""
diff --git a/l10n/fr/settings.po b/l10n/fr/settings.po
index c1d17de2c4..e1a896e537 100644
--- a/l10n/fr/settings.po
+++ b/l10n/fr/settings.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-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-20 15:19+0000\n"
-"Last-Translator: gp4004 <gp4004@arghh.org>\n"
+"POT-Creation-Date: 2012-08-29 02:02+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -95,10 +95,46 @@ msgid "use systems cron service"
 msgstr "utiliser le service cron du système "
 
 #: templates/admin.php:39
+msgid "Share API"
+msgstr ""
+
+#: templates/admin.php:44
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:45
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:49
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:50
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:54
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:55
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:58
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:60
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:67
 msgid "Log"
 msgstr "Journaux"
 
-#: templates/admin.php:67
+#: templates/admin.php:95
 msgid "More"
 msgstr "Plus"
 
diff --git a/l10n/fr/user_ldap.po b/l10n/fr/user_ldap.po
index 1ca6075cb6..3e168eea21 100644
--- a/l10n/fr/user_ldap.po
+++ b/l10n/fr/user_ldap.po
@@ -3,15 +3,17 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Cyril Glapa <kyriog@gmail.com>, 2012.
+#   <mathieu.payrol@gmail.com>, 2012.
 # 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-24 02:02+0200\n"
-"PO-Revision-Date: 2012-08-23 17:01+0000\n"
-"Last-Translator: Romain DEP. <rom1dep@gmail.com>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -30,15 +32,15 @@ msgstr "Vous pouvez omettre le protocole, sauf si vous avez besoin de SSL. Dans
 
 #: templates/settings.php:9
 msgid "Base DN"
-msgstr "DN de base"
+msgstr "DN Racine"
 
 #: templates/settings.php:9
 msgid "You can specify Base DN for users and groups in the Advanced tab"
-msgstr "Vous pouvez spécifier le DN de base pour les utilisateurs et les groupes dans l'onglet Avancé"
+msgstr "Vous pouvez détailler les DN Racines de vos utilisateurs et groupes dans l'onglet Avancé"
 
 #: templates/settings.php:10
 msgid "User DN"
-msgstr "DN Utilisateur"
+msgstr "DN Utilisateur (Autorisé à consulter l'annuaire)"
 
 #: templates/settings.php:10
 msgid ""
@@ -53,18 +55,18 @@ msgstr "Mot de passe"
 
 #: templates/settings.php:11
 msgid "For anonymous access, leave DN and Password empty."
-msgstr "Pour l'accès anonyme, laisser le DN et le mot de passe vides."
+msgstr "Pour un accès anonyme, laisser le DN Utilisateur et le mot de passe vides."
 
 #: templates/settings.php:12
 msgid "User Login Filter"
-msgstr "Filtre d'identifiants utilisateur"
+msgstr "Modèle d'authentification utilisateurs"
 
 #: 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 "Définit le filtre à appliquer lors d'une tentative de connexion. %%uid remplace le nom d'utilisateur lors de la connexion."
+msgstr "Définit le motif à appliquer, lors d'une tentative de connexion. %%uid est remplacé par le nom d'utilisateur lors de la connexion."
 
 #: templates/settings.php:12
 #, php-format
@@ -101,11 +103,11 @@ msgstr "Port"
 
 #: templates/settings.php:18
 msgid "Base User Tree"
-msgstr ""
+msgstr "DN racine de l'arbre utilisateurs"
 
 #: templates/settings.php:19
 msgid "Base Group Tree"
-msgstr ""
+msgstr "DN racine de l'arbre groupes"
 
 #: templates/settings.php:20
 msgid "Group-Member association"
@@ -125,7 +127,7 @@ msgstr "Serveur LDAP insensible à la casse (Windows)"
 
 #: templates/settings.php:23
 msgid "Turn off SSL certificate validation."
-msgstr "Désactiver la validation du certificat SSL"
+msgstr "Désactiver la validation du certificat SSL."
 
 #: templates/settings.php:23
 msgid ""
@@ -135,23 +137,23 @@ msgstr "Si la connexion ne fonctionne qu'avec cette option, importez le certific
 
 #: templates/settings.php:23
 msgid "Not recommended, use for testing only."
-msgstr "Non recommendé, utilisation pour tests uniquement."
+msgstr "Non recommandé, utilisation pour tests uniquement."
 
 #: templates/settings.php:24
 msgid "User Display Name Field"
-msgstr ""
+msgstr "Champ \"nom d'affichage\" de l'utilisateur"
 
 #: templates/settings.php:24
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
-msgstr "L'attribut LDAP utilisé pour générer les noms d'utilisateurs d'ownCloud"
+msgstr "L'attribut LDAP utilisé pour générer les noms d'utilisateurs d'ownCloud."
 
 #: templates/settings.php:25
 msgid "Group Display Name Field"
-msgstr ""
+msgstr "Champ \"nom d'affichage\" du groupe"
 
 #: templates/settings.php:25
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
-msgstr "L'attribut LDAP utilisé pour générer les noms de groupes d'ownCloud"
+msgstr "L'attribut LDAP utilisé pour générer les noms de groupes d'ownCloud."
 
 #: templates/settings.php:27
 msgid "in bytes"
@@ -161,6 +163,12 @@ msgstr "en octets"
 msgid "in seconds. A change empties the cache."
 msgstr "en secondes. Tout changement vide le cache."
 
-#: templates/settings.php:31
+#: templates/settings.php:30
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:32
 msgid "Help"
 msgstr "Aide"
diff --git a/l10n/gl/core.po b/l10n/gl/core.po
index fa591dfb3c..738fbc0ac0 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-08-28 02:01+0200\n"
-"PO-Revision-Date: 2012-08-28 00:02+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -35,55 +35,55 @@ msgstr "Esta categoría xa 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:190 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
 msgid "Settings"
 msgstr "Preferencias"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "January"
 msgstr "Xaneiro"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "February"
 msgstr "Febreiro"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "March"
 msgstr "Marzo"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "April"
 msgstr "Abril"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "May"
 msgstr "Maio"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "June"
 msgstr "Xuño"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "July"
 msgstr "Xullo"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "August"
 msgstr "Agosto"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "September"
 msgstr "Setembro"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "October"
 msgstr "Outubro"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "November"
 msgstr "Novembro"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "December"
 msgstr "Nadal"
 
diff --git a/l10n/gl/files_sharing.po b/l10n/gl/files_sharing.po
index ef1d19e933..559f53be84 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-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:04+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -17,18 +17,10 @@ msgstr ""
 "Language: gl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: templates/get.php:4
-msgid "Size"
+#: templates/authenticate.php:4
+msgid "Password"
 msgstr ""
 
-#: templates/get.php:5
-msgid "Modified"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete all"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete"
+#: templates/authenticate.php:6
+msgid "Submit"
 msgstr ""
diff --git a/l10n/gl/settings.po b/l10n/gl/settings.po
index 8c45f0bd13..7f4da92483 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-18 02:01+0200\n"
-"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"POT-Creation-Date: 2012-08-29 02:02+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -88,10 +88,46 @@ msgid "use systems cron service"
 msgstr "utilice o servizo cron do sistema"
 
 #: templates/admin.php:39
+msgid "Share API"
+msgstr ""
+
+#: templates/admin.php:44
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:45
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:49
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:50
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:54
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:55
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:58
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:60
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:67
 msgid "Log"
 msgstr "Conectar"
 
-#: templates/admin.php:67
+#: templates/admin.php:95
 msgid "More"
 msgstr "Máis"
 
diff --git a/l10n/gl/user_ldap.po b/l10n/gl/user_ldap.po
index 08efd8bd99..84304f7f0a 100644
--- a/l10n/gl/user_ldap.po
+++ b/l10n/gl/user_ldap.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:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -159,6 +159,12 @@ msgstr ""
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:30
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:32
 msgid "Help"
 msgstr ""
diff --git a/l10n/he/core.po b/l10n/he/core.po
index db54c7bcbb..335773d0dc 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-08-28 02:01+0200\n"
-"PO-Revision-Date: 2012-08-28 00:02+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -36,55 +36,55 @@ msgstr "קטגוריה זאת כבר קיימת: "
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr ""
 
-#: js/js.js:190 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
 msgid "Settings"
 msgstr "הגדרות"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "January"
 msgstr "ינואר"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "February"
 msgstr "פברואר"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "March"
 msgstr "מרץ"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "April"
 msgstr "אפריל"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "May"
 msgstr "מאי"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "June"
 msgstr "יוני"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "July"
 msgstr "יולי"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "August"
 msgstr "אוגוסט"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "September"
 msgstr "ספטמבר"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "October"
 msgstr "אוקטובר"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "November"
 msgstr "נובמבר"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "December"
 msgstr "דצמבר"
 
diff --git a/l10n/he/files_sharing.po b/l10n/he/files_sharing.po
index 75c35f1462..c788cef35e 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-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:04+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -17,18 +17,10 @@ msgstr ""
 "Language: he\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: templates/get.php:4
-msgid "Size"
+#: templates/authenticate.php:4
+msgid "Password"
 msgstr ""
 
-#: templates/get.php:5
-msgid "Modified"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete all"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete"
+#: templates/authenticate.php:6
+msgid "Submit"
 msgstr ""
diff --git a/l10n/he/settings.po b/l10n/he/settings.po
index cd199ce76a..8d4e790e9d 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-18 02:01+0200\n"
-"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"POT-Creation-Date: 2012-08-29 02:02+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -89,10 +89,46 @@ msgid "use systems cron service"
 msgstr ""
 
 #: templates/admin.php:39
+msgid "Share API"
+msgstr ""
+
+#: templates/admin.php:44
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:45
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:49
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:50
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:54
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:55
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:58
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:60
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:67
 msgid "Log"
 msgstr "יומן"
 
-#: templates/admin.php:67
+#: templates/admin.php:95
 msgid "More"
 msgstr "עוד"
 
diff --git a/l10n/he/user_ldap.po b/l10n/he/user_ldap.po
index 4dfdbd692b..8837051313 100644
--- a/l10n/he/user_ldap.po
+++ b/l10n/he/user_ldap.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:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -159,6 +159,12 @@ msgstr ""
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:30
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:32
 msgid "Help"
 msgstr ""
diff --git a/l10n/hi/core.po b/l10n/hi/core.po
new file mode 100644
index 0000000000..74c3cc9450
--- /dev/null
+++ b/l10n/hi/core.po
@@ -0,0 +1,273 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+# Sanjay Rabidas <rabidassanjay@gmail.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hi\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:201 templates/layout.user.php:64 templates/layout.user.php:65
+msgid "Settings"
+msgstr ""
+
+#: js/js.js:586
+msgid "January"
+msgstr ""
+
+#: js/js.js:586
+msgid "February"
+msgstr ""
+
+#: js/js.js:586
+msgid "March"
+msgstr ""
+
+#: js/js.js:586
+msgid "April"
+msgstr ""
+
+#: js/js.js:586
+msgid "May"
+msgstr ""
+
+#: js/js.js:586
+msgid "June"
+msgstr ""
+
+#: js/js.js:587
+msgid "July"
+msgstr ""
+
+#: js/js.js:587
+msgid "August"
+msgstr ""
+
+#: js/js.js:587
+msgid "September"
+msgstr ""
+
+#: js/js.js:587
+msgid "October"
+msgstr ""
+
+#: js/js.js:587
+msgid "November"
+msgstr ""
+
+#: js/js.js:587
+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:26
+#: 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:24
+msgid "Create an <strong>admin account</strong>"
+msgstr "व्यवस्थापक खाता बनाएँ"
+
+#: templates/installation.php:30 templates/login.php:13
+msgid "Password"
+msgstr "पासवर्ड"
+
+#: templates/installation.php:36
+msgid "Advanced"
+msgstr "उन्नत"
+
+#: templates/installation.php:38
+msgid "Data folder"
+msgstr ""
+
+#: templates/installation.php:45
+msgid "Configure the database"
+msgstr "डेटाबेस कॉन्फ़िगर करें "
+
+#: templates/installation.php:50 templates/installation.php:61
+#: templates/installation.php:71 templates/installation.php:81
+msgid "will be used"
+msgstr ""
+
+#: templates/installation.php:93
+msgid "Database user"
+msgstr "डेटाबेस उपयोगकर्ता"
+
+#: templates/installation.php:97
+msgid "Database password"
+msgstr "डेटाबेस पासवर्ड"
+
+#: templates/installation.php:101
+msgid "Database name"
+msgstr ""
+
+#: templates/installation.php:109
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:115
+msgid "Database host"
+msgstr ""
+
+#: templates/installation.php:120
+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/hi/files.po b/l10n/hi/files.po
new file mode 100644
index 0000000000..cc9a7bb222
--- /dev/null
+++ b/l10n/hi/files.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-08-29 02:01+0200\n"
+"PO-Revision-Date: 2011-08-13 02:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hi\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:111 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:246
+msgid "undo"
+msgstr ""
+
+#: js/filelist.js:246
+msgid "deleted"
+msgstr ""
+
+#: js/files.js:171
+msgid "generating ZIP-file, it may take some time."
+msgstr ""
+
+#: js/files.js:200
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/files.js:200
+msgid "Upload Error"
+msgstr ""
+
+#: js/files.js:228 js/files.js:319 js/files.js:348
+msgid "Pending"
+msgstr ""
+
+#: js/files.js:333
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/files.js:457
+msgid "Invalid name, '/' is not allowed."
+msgstr ""
+
+#: js/files.js:703 templates/index.php:55
+msgid "Size"
+msgstr ""
+
+#: js/files.js:704 templates/index.php:56
+msgid "Modified"
+msgstr ""
+
+#: js/files.js:731
+msgid "folder"
+msgstr ""
+
+#: js/files.js:733
+msgid "folders"
+msgstr ""
+
+#: js/files.js:741
+msgid "file"
+msgstr ""
+
+#: js/files.js:743
+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/hi/files_encryption.po b/l10n/hi/files_encryption.po
new file mode 100644
index 0000000000..e6ff91a68b
--- /dev/null
+++ b/l10n/hi/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-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hi\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/hi/files_external.po b/l10n/hi/files_external.po
new file mode 100644
index 0000000000..e27f4710d0
--- /dev/null
+++ b/l10n/hi/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-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-12 22:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hi\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/hi/files_sharing.po b/l10n/hi/files_sharing.po
new file mode 100644
index 0000000000..1aa869a155
--- /dev/null
+++ b/l10n/hi/files_sharing.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-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hi\n"
+"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+
+#: templates/authenticate.php:4
+msgid "Password"
+msgstr ""
+
+#: templates/authenticate.php:6
+msgid "Submit"
+msgstr ""
diff --git a/l10n/hi/files_versions.po b/l10n/hi/files_versions.po
new file mode 100644
index 0000000000..f35accb51d
--- /dev/null
+++ b/l10n/hi/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-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-12 22:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hi\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/hi/lib.po b/l10n/hi/lib.po
new file mode 100644
index 0000000000..5dabd1411d
--- /dev/null
+++ b/l10n/hi/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-29 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 22:23+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hi\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:276
+msgid "ZIP download is turned off."
+msgstr ""
+
+#: files.php:277
+msgid "Files need to be downloaded one by one."
+msgstr ""
+
+#: files.php:277 files.php:302
+msgid "Back to Files"
+msgstr ""
+
+#: files.php:301
+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/hi/settings.po b/l10n/hi/settings.po
new file mode 100644
index 0000000000..4dce9bbefa
--- /dev/null
+++ b/l10n/hi/settings.po
@@ -0,0 +1,274 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-29 02:02+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hi\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:29
+msgid "Cron"
+msgstr ""
+
+#: 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 "Share API"
+msgstr ""
+
+#: templates/admin.php:44
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:45
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:49
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:50
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:54
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:55
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:58
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:60
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:67
+msgid "Log"
+msgstr ""
+
+#: templates/admin.php:95
+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 "Group Admin"
+msgstr ""
+
+#: templates/users.php:82
+msgid "Quota"
+msgstr ""
+
+#: templates/users.php:146
+msgid "Delete"
+msgstr ""
diff --git a/l10n/hi/user_ldap.po b/l10n/hi/user_ldap.po
new file mode 100644
index 0000000000..1ca5b6139b
--- /dev/null
+++ b/l10n/hi/user_ldap.po
@@ -0,0 +1,170 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: hi\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:30
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:32
+msgid "Help"
+msgstr ""
diff --git a/l10n/hr/core.po b/l10n/hr/core.po
index f4c681a5e1..f8abf1ae89 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-08-28 02:01+0200\n"
-"PO-Revision-Date: 2012-08-28 00:02+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -36,55 +36,55 @@ msgstr "Ova kategorija već postoji: "
 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:190 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
 msgid "Settings"
 msgstr "Postavke"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "January"
 msgstr "Siječanj"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "February"
 msgstr "Veljača"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "March"
 msgstr "Ožujak"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "April"
 msgstr "Travanj"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "May"
 msgstr "Svibanj"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "June"
 msgstr "Lipanj"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "July"
 msgstr "Srpanj"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "August"
 msgstr "Kolovoz"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "September"
 msgstr "Rujan"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "October"
 msgstr "Listopad"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "November"
 msgstr "Studeni"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "December"
 msgstr "Prosinac"
 
diff --git a/l10n/hr/files_sharing.po b/l10n/hr/files_sharing.po
index 902174e80e..f4796f125a 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-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:04+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -17,18 +17,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"
 
-#: templates/get.php:4
-msgid "Size"
+#: templates/authenticate.php:4
+msgid "Password"
 msgstr ""
 
-#: templates/get.php:5
-msgid "Modified"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete all"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete"
+#: templates/authenticate.php:6
+msgid "Submit"
 msgstr ""
diff --git a/l10n/hr/settings.po b/l10n/hr/settings.po
index 38e378b862..231bc8692a 100644
--- a/l10n/hr/settings.po
+++ b/l10n/hr/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-28 02:01+0200\n"
-"PO-Revision-Date: 2012-08-27 13:20+0000\n"
-"Last-Translator: fposavec <franz@franz-net.info>\n"
+"POT-Creation-Date: 2012-08-29 02:02+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -89,10 +89,46 @@ msgid "use systems cron service"
 msgstr "koristi sistemski cron servis"
 
 #: templates/admin.php:39
+msgid "Share API"
+msgstr ""
+
+#: templates/admin.php:44
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:45
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:49
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:50
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:54
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:55
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:58
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:60
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:67
 msgid "Log"
 msgstr "dnevnik"
 
-#: templates/admin.php:67
+#: templates/admin.php:95
 msgid "More"
 msgstr "više"
 
diff --git a/l10n/hr/user_ldap.po b/l10n/hr/user_ldap.po
index 14dcd91c01..a7e026ac79 100644
--- a/l10n/hr/user_ldap.po
+++ b/l10n/hr/user_ldap.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:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -159,6 +159,12 @@ msgstr ""
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:30
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:32
 msgid "Help"
 msgstr ""
diff --git a/l10n/hu_HU/core.po b/l10n/hu_HU/core.po
index 965d3bd8a2..1b75403809 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-08-28 02:01+0200\n"
-"PO-Revision-Date: 2012-08-28 00:02+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -36,55 +36,55 @@ msgstr "Ez a kategória már létezik"
 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:190 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
 msgid "Settings"
 msgstr "Beállítások"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "January"
 msgstr "Január"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "February"
 msgstr "Február"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "March"
 msgstr "Március"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "April"
 msgstr "Április"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "May"
 msgstr "Május"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "June"
 msgstr "Június"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "July"
 msgstr "Július"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "August"
 msgstr "Augusztus"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "September"
 msgstr "Szeptember"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "October"
 msgstr "Október"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "November"
 msgstr "November"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "December"
 msgstr "December"
 
diff --git a/l10n/hu_HU/files_sharing.po b/l10n/hu_HU/files_sharing.po
index 6d274d3823..5c57c9e3fe 100644
--- a/l10n/hu_HU/files_sharing.po
+++ b/l10n/hu_HU/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-26 19:46+0200\n"
-"PO-Revision-Date: 2012-08-26 09:23+0000\n"
-"Last-Translator: Csaba Orban <vicsabi@gmail.com>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,18 +18,10 @@ msgstr ""
 "Language: hu_HU\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: templates/get.php:4
-msgid "Size"
-msgstr "Méret"
+#: templates/authenticate.php:4
+msgid "Password"
+msgstr ""
 
-#: templates/get.php:5
-msgid "Modified"
-msgstr "Módosítva"
-
-#: templates/get.php:5
-msgid "Delete all"
-msgstr "Összes törlése"
-
-#: templates/get.php:5
-msgid "Delete"
-msgstr "Törlés"
+#: templates/authenticate.php:6
+msgid "Submit"
+msgstr ""
diff --git a/l10n/hu_HU/settings.po b/l10n/hu_HU/settings.po
index 0b5b94d6c6..dc78ebac65 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-18 02:01+0200\n"
-"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"POT-Creation-Date: 2012-08-29 02:02+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -88,10 +88,46 @@ msgid "use systems cron service"
 msgstr ""
 
 #: templates/admin.php:39
+msgid "Share API"
+msgstr ""
+
+#: templates/admin.php:44
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:45
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:49
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:50
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:54
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:55
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:58
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:60
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:67
 msgid "Log"
 msgstr "Napló"
 
-#: templates/admin.php:67
+#: templates/admin.php:95
 msgid "More"
 msgstr "Tovább"
 
diff --git a/l10n/hu_HU/user_ldap.po b/l10n/hu_HU/user_ldap.po
index 87c015d08c..cacb371b1b 100644
--- a/l10n/hu_HU/user_ldap.po
+++ b/l10n/hu_HU/user_ldap.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:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -159,6 +159,12 @@ msgstr ""
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:30
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:32
 msgid "Help"
 msgstr ""
diff --git a/l10n/hy/core.po b/l10n/hy/core.po
index 5f319f687d..41818fecde 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-08-28 02:01+0200\n"
-"PO-Revision-Date: 2012-08-28 00:02+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -33,55 +33,55 @@ msgstr ""
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr ""
 
-#: js/js.js:190 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "January"
 msgstr ""
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "February"
 msgstr ""
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "March"
 msgstr ""
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "April"
 msgstr ""
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "May"
 msgstr ""
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "June"
 msgstr ""
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "July"
 msgstr ""
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "August"
 msgstr ""
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "September"
 msgstr ""
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "October"
 msgstr ""
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "November"
 msgstr ""
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "December"
 msgstr ""
 
diff --git a/l10n/hy/files_sharing.po b/l10n/hy/files_sharing.po
index d7ecd0cfa1..7adce26af9 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-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:04+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -17,18 +17,10 @@ msgstr ""
 "Language: hy\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: templates/get.php:4
-msgid "Size"
+#: templates/authenticate.php:4
+msgid "Password"
 msgstr ""
 
-#: templates/get.php:5
-msgid "Modified"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete all"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete"
+#: templates/authenticate.php:6
+msgid "Submit"
 msgstr ""
diff --git a/l10n/hy/settings.po b/l10n/hy/settings.po
index 13b4e16635..ed0acf7276 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-18 02:01+0200\n"
-"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"POT-Creation-Date: 2012-08-29 02:02+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -86,10 +86,46 @@ msgid "use systems cron service"
 msgstr ""
 
 #: templates/admin.php:39
-msgid "Log"
+msgid "Share API"
+msgstr ""
+
+#: templates/admin.php:44
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:45
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:49
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:50
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:54
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:55
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:58
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:60
+msgid "Allow users to only share with users in their groups"
 msgstr ""
 
 #: templates/admin.php:67
+msgid "Log"
+msgstr ""
+
+#: templates/admin.php:95
 msgid "More"
 msgstr ""
 
diff --git a/l10n/hy/user_ldap.po b/l10n/hy/user_ldap.po
index 78202c352c..438a2108b7 100644
--- a/l10n/hy/user_ldap.po
+++ b/l10n/hy/user_ldap.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:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -159,6 +159,12 @@ msgstr ""
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:30
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:32
 msgid "Help"
 msgstr ""
diff --git a/l10n/ia/core.po b/l10n/ia/core.po
index 2aa2484da6..3a3a12b570 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-08-28 02:01+0200\n"
-"PO-Revision-Date: 2012-08-28 00:02+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -34,55 +34,55 @@ msgstr "Iste categoria jam existe:"
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr ""
 
-#: js/js.js:190 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
 msgid "Settings"
 msgstr "Configurationes"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "January"
 msgstr ""
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "February"
 msgstr ""
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "March"
 msgstr ""
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "April"
 msgstr ""
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "May"
 msgstr ""
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "June"
 msgstr ""
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "July"
 msgstr ""
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "August"
 msgstr ""
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "September"
 msgstr ""
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "October"
 msgstr ""
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "November"
 msgstr ""
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "December"
 msgstr ""
 
diff --git a/l10n/ia/files_sharing.po b/l10n/ia/files_sharing.po
index 55cfbbcf2e..133cd80127 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-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:04+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -17,18 +17,10 @@ msgstr ""
 "Language: ia\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: templates/get.php:4
-msgid "Size"
+#: templates/authenticate.php:4
+msgid "Password"
 msgstr ""
 
-#: templates/get.php:5
-msgid "Modified"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete all"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete"
+#: templates/authenticate.php:6
+msgid "Submit"
 msgstr ""
diff --git a/l10n/ia/settings.po b/l10n/ia/settings.po
index fe56aae5b9..c6db8d713a 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-18 02:01+0200\n"
-"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"POT-Creation-Date: 2012-08-29 02:02+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -88,10 +88,46 @@ msgid "use systems cron service"
 msgstr ""
 
 #: templates/admin.php:39
+msgid "Share API"
+msgstr ""
+
+#: templates/admin.php:44
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:45
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:49
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:50
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:54
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:55
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:58
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:60
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:67
 msgid "Log"
 msgstr "Registro"
 
-#: templates/admin.php:67
+#: templates/admin.php:95
 msgid "More"
 msgstr "Plus"
 
diff --git a/l10n/ia/user_ldap.po b/l10n/ia/user_ldap.po
index f5bb1888f4..73b531764a 100644
--- a/l10n/ia/user_ldap.po
+++ b/l10n/ia/user_ldap.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:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -159,6 +159,12 @@ msgstr ""
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:30
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:32
 msgid "Help"
 msgstr ""
diff --git a/l10n/id/core.po b/l10n/id/core.po
index 0e9358c26a..ab4b378672 100644
--- a/l10n/id/core.po
+++ b/l10n/id/core.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Muhammad Fauzan <yosanpro@gmail.com>, 2012.
 # 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://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-28 02:01+0200\n"
-"PO-Revision-Date: 2012-08-28 00:01+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -35,77 +36,77 @@ msgstr "Kategori ini sudah ada:"
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr ""
 
-#: js/js.js:190 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
 msgid "Settings"
 msgstr "Setelan"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "January"
-msgstr ""
+msgstr "Januari"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "February"
-msgstr ""
+msgstr "Februari"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "March"
-msgstr ""
+msgstr "Maret"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "April"
-msgstr ""
+msgstr "April"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "May"
-msgstr ""
+msgstr "Mei"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "June"
-msgstr ""
+msgstr "Juni"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "July"
-msgstr ""
+msgstr "Juli"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "August"
-msgstr ""
+msgstr "Agustus"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "September"
-msgstr ""
+msgstr "September"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "October"
-msgstr ""
+msgstr "Oktober"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "November"
-msgstr ""
+msgstr "Nopember"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "December"
-msgstr ""
+msgstr "Desember"
 
 #: js/oc-dialogs.js:143 js/oc-dialogs.js:163
 msgid "Cancel"
-msgstr ""
+msgstr "Batalkan"
 
 #: 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 "Oke"
 
 #: js/oc-vcategories.js:68
 msgid "No categories selected for deletion."
-msgstr ""
+msgstr "Tidak ada kategori terpilih untuk penghapusan."
 
 #: js/oc-vcategories.js:68
 msgid "Error"
diff --git a/l10n/id/files.po b/l10n/id/files.po
index 3a96e71072..4531640248 100644
--- a/l10n/id/files.po
+++ b/l10n/id/files.po
@@ -3,15 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Muhammad Fauzan <yosanpro@gmail.com>, 2012.
 # 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://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-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-28 12:13+0000\n"
+"Last-Translator: Muhammad Fauzan <yosanpro@gmail.com>\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"
@@ -25,13 +26,13 @@ msgstr "Tidak ada galat, berkas sukses diunggah"
 
 #: ajax/upload.php:21
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
-msgstr ""
+msgstr "File yang diunggah melampaui directive upload_max_filesize di php.ini"
 
 #: ajax/upload.php:22
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
-msgstr ""
+msgstr "File yang diunggah melampaui directive MAX_FILE_SIZE yang disebutan dalam form HTML."
 
 #: ajax/upload.php:23
 msgid "The uploaded file was only partially uploaded"
@@ -53,61 +54,61 @@ msgstr "Gagal menulis ke disk"
 msgid "Files"
 msgstr "Berkas"
 
-#: js/fileactions.js:107 templates/index.php:56
+#: js/fileactions.js:111 templates/index.php:56
 msgid "Delete"
 msgstr "Hapus"
 
 #: js/filelist.js:141
 msgid "already exists"
-msgstr ""
+msgstr "sudah ada"
 
 #: js/filelist.js:141
 msgid "replace"
-msgstr ""
+msgstr "mengganti"
 
 #: js/filelist.js:141
 msgid "cancel"
-msgstr ""
+msgstr "batalkan"
 
 #: 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:246
 msgid "undo"
-msgstr ""
+msgstr "batal dikerjakan"
 
 #: js/filelist.js:246
 msgid "deleted"
-msgstr ""
+msgstr "dihapus"
 
 #: js/files.js:171
 msgid "generating ZIP-file, it may take some time."
-msgstr ""
+msgstr "membuat berkas ZIP, ini mungkin memakan waktu."
 
 #: js/files.js:200
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr ""
+msgstr "Gagal mengunggah berkas anda karena berupa direktori atau mempunyai ukuran 0 byte"
 
 #: js/files.js:200
 msgid "Upload Error"
-msgstr ""
+msgstr "Terjadi Galat Pengunggahan"
 
 #: js/files.js:228 js/files.js:319 js/files.js:348
 msgid "Pending"
-msgstr ""
+msgstr "Menunggu"
 
 #: js/files.js:333
 msgid "Upload cancelled."
-msgstr ""
+msgstr "Pengunggahan dibatalkan."
 
 #: js/files.js:457
 msgid "Invalid name, '/' is not allowed."
-msgstr ""
+msgstr "Kesalahan nama, '/' tidak diijinkan."
 
 #: js/files.js:703 templates/index.php:55
 msgid "Size"
@@ -119,19 +120,19 @@ msgstr "Dimodifikasi"
 
 #: js/files.js:731
 msgid "folder"
-msgstr ""
+msgstr "folder"
 
 #: js/files.js:733
 msgid "folders"
-msgstr ""
+msgstr "folder-folder"
 
 #: js/files.js:741
 msgid "file"
-msgstr ""
+msgstr "berkas"
 
 #: js/files.js:743
 msgid "files"
-msgstr ""
+msgstr "berkas-berkas"
 
 #: templates/admin.php:5
 msgid "File handling"
diff --git a/l10n/id/files_sharing.po b/l10n/id/files_sharing.po
index 0a4a395144..93219e0d80 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-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:04+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -17,18 +17,10 @@ msgstr ""
 "Language: id\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: templates/get.php:4
-msgid "Size"
+#: templates/authenticate.php:4
+msgid "Password"
 msgstr ""
 
-#: templates/get.php:5
-msgid "Modified"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete all"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete"
+#: templates/authenticate.php:6
+msgid "Submit"
 msgstr ""
diff --git a/l10n/id/settings.po b/l10n/id/settings.po
index 8b4f28abc2..f1daf56e28 100644
--- a/l10n/id/settings.po
+++ b/l10n/id/settings.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Muhammad Fauzan <yosanpro@gmail.com>, 2012.
 # 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://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-18 02:01+0200\n"
-"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"POT-Creation-Date: 2012-08-29 02:02+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -25,11 +26,11 @@ msgstr ""
 
 #: ajax/lostpassword.php:14
 msgid "Email saved"
-msgstr ""
+msgstr "Email tersimpan"
 
 #: ajax/lostpassword.php:16
 msgid "Invalid email"
-msgstr ""
+msgstr "Email tidak sah"
 
 #: ajax/openid.php:16
 msgid "OpenID Changed"
@@ -53,15 +54,15 @@ msgstr ""
 
 #: js/apps.js:39 js/apps.js:73
 msgid "Disable"
-msgstr ""
+msgstr "NonAktifkan"
 
 #: js/apps.js:39 js/apps.js:62
 msgid "Enable"
-msgstr ""
+msgstr "Aktifkan"
 
 #: js/personal.js:69
 msgid "Saving..."
-msgstr ""
+msgstr "Menyimpan..."
 
 #: personal.php:46 personal.php:47
 msgid "__language_name__"
@@ -69,7 +70,7 @@ msgstr "__language_name__"
 
 #: templates/admin.php:14
 msgid "Security Warning"
-msgstr ""
+msgstr "Peringatan Keamanan"
 
 #: templates/admin.php:29
 msgid "Cron"
@@ -88,10 +89,46 @@ msgid "use systems cron service"
 msgstr ""
 
 #: templates/admin.php:39
+msgid "Share API"
+msgstr ""
+
+#: templates/admin.php:44
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:45
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:49
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:50
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:54
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:55
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:58
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:60
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:67
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:67
+#: templates/admin.php:95
 msgid "More"
 msgstr "Lebih"
 
@@ -105,7 +142,7 @@ msgstr "Pilih satu aplikasi"
 
 #: templates/apps.php:29
 msgid "See application page at apps.owncloud.com"
-msgstr ""
+msgstr "Lihat halaman aplikasi di apps.owncloud.com"
 
 #: templates/apps.php:30
 msgid "-licensed"
@@ -229,7 +266,7 @@ msgstr "Lain-lain"
 
 #: templates/users.php:80 templates/users.php:112
 msgid "Group Admin"
-msgstr ""
+msgstr "Admin Grup"
 
 #: templates/users.php:82
 msgid "Quota"
diff --git a/l10n/id/user_ldap.po b/l10n/id/user_ldap.po
index 528094a8b2..5d7f42dc6a 100644
--- a/l10n/id/user_ldap.po
+++ b/l10n/id/user_ldap.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:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -159,6 +159,12 @@ msgstr ""
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:30
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:32
 msgid "Help"
 msgstr ""
diff --git a/l10n/id_ID/core.po b/l10n/id_ID/core.po
index cd8e40cd22..faade1ace9 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-08-28 02:01+0200\n"
-"PO-Revision-Date: 2012-08-28 00:02+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -33,55 +33,55 @@ msgstr ""
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr ""
 
-#: js/js.js:190 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "January"
 msgstr ""
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "February"
 msgstr ""
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "March"
 msgstr ""
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "April"
 msgstr ""
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "May"
 msgstr ""
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "June"
 msgstr ""
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "July"
 msgstr ""
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "August"
 msgstr ""
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "September"
 msgstr ""
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "October"
 msgstr ""
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "November"
 msgstr ""
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "December"
 msgstr ""
 
diff --git a/l10n/id_ID/files_sharing.po b/l10n/id_ID/files_sharing.po
index fdba039609..b1ac99e2e6 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-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:04+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -17,18 +17,10 @@ msgstr ""
 "Language: id_ID\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: templates/get.php:4
-msgid "Size"
+#: templates/authenticate.php:4
+msgid "Password"
 msgstr ""
 
-#: templates/get.php:5
-msgid "Modified"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete all"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete"
+#: templates/authenticate.php:6
+msgid "Submit"
 msgstr ""
diff --git a/l10n/id_ID/settings.po b/l10n/id_ID/settings.po
index e6873fc49b..68045a2740 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-18 02:01+0200\n"
-"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"POT-Creation-Date: 2012-08-29 02:02+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -86,10 +86,46 @@ msgid "use systems cron service"
 msgstr ""
 
 #: templates/admin.php:39
-msgid "Log"
+msgid "Share API"
+msgstr ""
+
+#: templates/admin.php:44
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:45
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:49
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:50
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:54
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:55
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:58
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:60
+msgid "Allow users to only share with users in their groups"
 msgstr ""
 
 #: templates/admin.php:67
+msgid "Log"
+msgstr ""
+
+#: templates/admin.php:95
 msgid "More"
 msgstr ""
 
diff --git a/l10n/id_ID/user_ldap.po b/l10n/id_ID/user_ldap.po
index eb078008f5..52cb5aac1a 100644
--- a/l10n/id_ID/user_ldap.po
+++ b/l10n/id_ID/user_ldap.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:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -159,6 +159,12 @@ msgstr ""
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:30
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:32
 msgid "Help"
 msgstr ""
diff --git a/l10n/it/core.po b/l10n/it/core.po
index fb8cb13147..146f6faa71 100644
--- a/l10n/it/core.po
+++ b/l10n/it/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-08-28 02:01+0200\n"
-"PO-Revision-Date: 2012-08-28 00:01+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -38,55 +38,55 @@ msgstr "Questa categoria esiste già: "
 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:190 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
 msgid "Settings"
 msgstr "Impostazioni"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "January"
 msgstr "Gennaio"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "February"
 msgstr "Febbraio"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "March"
 msgstr "Marzo"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "April"
 msgstr "Aprile"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "May"
 msgstr "Maggio"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "June"
 msgstr "Giugno"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "July"
 msgstr "Luglio"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "August"
 msgstr "Agosto"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "September"
 msgstr "Settembre"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "October"
 msgstr "Ottobre"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "November"
 msgstr "Novembre"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "December"
 msgstr "Dicembre"
 
@@ -185,7 +185,7 @@ msgstr "Accesso negato"
 
 #: templates/404.php:12
 msgid "Cloud not found"
-msgstr "Cloud non trovata"
+msgstr "Nuvola non trovata"
 
 #: templates/edit_categories_dialog.php:4
 msgid "Edit categories"
@@ -218,7 +218,7 @@ msgstr "Configura il database"
 #: templates/installation.php:50 templates/installation.php:61
 #: templates/installation.php:71 templates/installation.php:81
 msgid "will be used"
-msgstr "sarà usato"
+msgstr "sarà utilizzato"
 
 #: templates/installation.php:93
 msgid "Database user"
diff --git a/l10n/it/files_sharing.po b/l10n/it/files_sharing.po
index 94313868ad..e4afbded98 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-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:04+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -18,18 +18,10 @@ msgstr ""
 "Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: templates/get.php:4
-msgid "Size"
-msgstr "Dimensione"
+#: templates/authenticate.php:4
+msgid "Password"
+msgstr ""
 
-#: templates/get.php:5
-msgid "Modified"
-msgstr "Modificato"
-
-#: templates/get.php:5
-msgid "Delete all"
-msgstr "Elimina tutto"
-
-#: templates/get.php:5
-msgid "Delete"
-msgstr "Eliminazione"
+#: templates/authenticate.php:6
+msgid "Submit"
+msgstr ""
diff --git a/l10n/it/settings.po b/l10n/it/settings.po
index b14c9fcd47..5e3956fdfd 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-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-22 20:01+0000\n"
-"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
+"POT-Creation-Date: 2012-08-29 02:02+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -93,10 +93,46 @@ msgid "use systems cron service"
 msgstr "usa il servizio cron di sistema"
 
 #: templates/admin.php:39
+msgid "Share API"
+msgstr ""
+
+#: templates/admin.php:44
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:45
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:49
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:50
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:54
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:55
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:58
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:60
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:67
 msgid "Log"
 msgstr "Registro"
 
-#: templates/admin.php:67
+#: templates/admin.php:95
 msgid "More"
 msgstr "Altro"
 
diff --git a/l10n/it/user_ldap.po b/l10n/it/user_ldap.po
index e99e56fc15..ea2ef09865 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-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-22 20:31+0000\n"
-"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -161,6 +161,12 @@ msgstr "in byte"
 msgid "in seconds. A change empties the cache."
 msgstr "in secondi. Il cambio svuota la cache."
 
-#: templates/settings.php:31
+#: templates/settings.php:30
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:32
 msgid "Help"
 msgstr "Aiuto"
diff --git a/l10n/ja_JP/core.po b/l10n/ja_JP/core.po
index f1f2e5da9f..85eff9b29f 100644
--- a/l10n/ja_JP/core.po
+++ b/l10n/ja_JP/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-08-28 02:01+0200\n"
-"PO-Revision-Date: 2012-08-28 00:02+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -35,55 +35,55 @@ msgstr "このカテゴリはすでに存在します: "
 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:190 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
 msgid "Settings"
 msgstr "設定"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "January"
 msgstr "1月"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "February"
 msgstr "2月"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "March"
 msgstr "3月"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "April"
 msgstr "4月"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "May"
 msgstr "5月"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "June"
 msgstr "6月"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "July"
 msgstr "7月"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "August"
 msgstr "8月"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "September"
 msgstr "9月"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "October"
 msgstr "10月"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "November"
 msgstr "11月"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "December"
 msgstr "12月"
 
diff --git a/l10n/ja_JP/files_sharing.po b/l10n/ja_JP/files_sharing.po
index b76508218b..04cd99c2f3 100644
--- a/l10n/ja_JP/files_sharing.po
+++ b/l10n/ja_JP/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-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:04+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -19,18 +19,10 @@ msgstr ""
 "Language: ja_JP\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: templates/get.php:4
-msgid "Size"
-msgstr "サイズ"
+#: templates/authenticate.php:4
+msgid "Password"
+msgstr ""
 
-#: templates/get.php:5
-msgid "Modified"
-msgstr "変更"
-
-#: templates/get.php:5
-msgid "Delete all"
-msgstr "すべて削除"
-
-#: templates/get.php:5
-msgid "Delete"
-msgstr "削除"
+#: templates/authenticate.php:6
+msgid "Submit"
+msgstr ""
diff --git a/l10n/ja_JP/settings.po b/l10n/ja_JP/settings.po
index d269151c24..18f0f4733d 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-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"
+"POT-Creation-Date: 2012-08-29 02:02+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -88,10 +88,46 @@ msgid "use systems cron service"
 msgstr "システムのcronサービスを使用"
 
 #: templates/admin.php:39
+msgid "Share API"
+msgstr ""
+
+#: templates/admin.php:44
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:45
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:49
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:50
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:54
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:55
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:58
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:60
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:67
 msgid "Log"
 msgstr "ログ"
 
-#: templates/admin.php:67
+#: templates/admin.php:95
 msgid "More"
 msgstr "もっと"
 
diff --git a/l10n/ja_JP/user_ldap.po b/l10n/ja_JP/user_ldap.po
index 5c22b913b4..9b43e88d47 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-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"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -161,6 +161,12 @@ msgstr "バイト"
 msgid "in seconds. A change empties the cache."
 msgstr "秒。変更後にキャッシュがクリアされます。"
 
-#: templates/settings.php:31
+#: templates/settings.php:30
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:32
 msgid "Help"
 msgstr "ヘルプ"
diff --git a/l10n/ko/core.po b/l10n/ko/core.po
index 3e82381d03..5ad977ca6b 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-08-28 02:01+0200\n"
-"PO-Revision-Date: 2012-08-28 00:02+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -35,55 +35,55 @@ msgstr "이 카테고리는 이미 존재합니다:"
 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:190 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
 msgid "Settings"
 msgstr "설정"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "January"
 msgstr "1월"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "February"
 msgstr "2월"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "March"
 msgstr "3월"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "April"
 msgstr "4월"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "May"
 msgstr "5월"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "June"
 msgstr "6월"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "July"
 msgstr "7월"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "August"
 msgstr "8월"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "September"
 msgstr "9월"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "October"
 msgstr "10월"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "November"
 msgstr "11월"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "December"
 msgstr "12월"
 
diff --git a/l10n/ko/files_sharing.po b/l10n/ko/files_sharing.po
index 970803e48a..b8e11e75ee 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-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:04+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -17,18 +17,10 @@ msgstr ""
 "Language: ko\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: templates/get.php:4
-msgid "Size"
+#: templates/authenticate.php:4
+msgid "Password"
 msgstr ""
 
-#: templates/get.php:5
-msgid "Modified"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete all"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete"
+#: templates/authenticate.php:6
+msgid "Submit"
 msgstr ""
diff --git a/l10n/ko/settings.po b/l10n/ko/settings.po
index a4bfa5daca..fd12d48d5e 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-18 02:01+0200\n"
-"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"POT-Creation-Date: 2012-08-29 02:02+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -88,10 +88,46 @@ msgid "use systems cron service"
 msgstr ""
 
 #: templates/admin.php:39
+msgid "Share API"
+msgstr ""
+
+#: templates/admin.php:44
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:45
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:49
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:50
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:54
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:55
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:58
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:60
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:67
 msgid "Log"
 msgstr "로그"
 
-#: templates/admin.php:67
+#: templates/admin.php:95
 msgid "More"
 msgstr "더"
 
diff --git a/l10n/ko/user_ldap.po b/l10n/ko/user_ldap.po
index 0cc01bfddf..cf6aa7842d 100644
--- a/l10n/ko/user_ldap.po
+++ b/l10n/ko/user_ldap.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:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -159,6 +159,12 @@ msgstr ""
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:30
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:32
 msgid "Help"
 msgstr ""
diff --git a/l10n/lb/core.po b/l10n/lb/core.po
index 318ccf02e6..5a89733611 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-08-28 02:01+0200\n"
-"PO-Revision-Date: 2012-08-28 00:02+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -34,55 +34,55 @@ msgstr "Des Kategorie existéiert schonn:"
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr ""
 
-#: js/js.js:190 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
 msgid "Settings"
 msgstr "Astellungen"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "January"
 msgstr ""
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "February"
 msgstr ""
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "March"
 msgstr ""
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "April"
 msgstr ""
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "May"
 msgstr ""
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "June"
 msgstr ""
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "July"
 msgstr ""
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "August"
 msgstr ""
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "September"
 msgstr ""
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "October"
 msgstr ""
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "November"
 msgstr ""
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "December"
 msgstr ""
 
diff --git a/l10n/lb/files_sharing.po b/l10n/lb/files_sharing.po
index ca81053d9a..955cca498b 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-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:04+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -17,18 +17,10 @@ msgstr ""
 "Language: lb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: templates/get.php:4
-msgid "Size"
+#: templates/authenticate.php:4
+msgid "Password"
 msgstr ""
 
-#: templates/get.php:5
-msgid "Modified"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete all"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete"
+#: templates/authenticate.php:6
+msgid "Submit"
 msgstr ""
diff --git a/l10n/lb/settings.po b/l10n/lb/settings.po
index 6b1e939e53..696998daa2 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-18 02:01+0200\n"
-"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"POT-Creation-Date: 2012-08-29 02:02+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -87,10 +87,46 @@ msgid "use systems cron service"
 msgstr ""
 
 #: templates/admin.php:39
+msgid "Share API"
+msgstr ""
+
+#: templates/admin.php:44
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:45
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:49
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:50
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:54
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:55
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:58
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:60
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:67
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:67
+#: templates/admin.php:95
 msgid "More"
 msgstr "Méi"
 
diff --git a/l10n/lb/user_ldap.po b/l10n/lb/user_ldap.po
index 75252b76c9..ea1a1452c6 100644
--- a/l10n/lb/user_ldap.po
+++ b/l10n/lb/user_ldap.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:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -159,6 +159,12 @@ msgstr ""
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:30
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:32
 msgid "Help"
 msgstr ""
diff --git a/l10n/lt_LT/core.po b/l10n/lt_LT/core.po
index 6b69aa1d16..36a98b4d70 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-08-28 02:01+0200\n"
-"PO-Revision-Date: 2012-08-28 00:02+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -34,55 +34,55 @@ msgstr "Tokia kategorija jau yra:"
 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:190 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
 msgid "Settings"
 msgstr "Nustatymai"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "January"
 msgstr "Sausis"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "February"
 msgstr "Vasaris"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "March"
 msgstr "Kovas"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "April"
 msgstr "Balandis"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "May"
 msgstr "Gegužė"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "June"
 msgstr "Birželis"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "July"
 msgstr "Liepa"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "August"
 msgstr "Rugpjūtis"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "September"
 msgstr "Rugsėjis"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "October"
 msgstr "Spalis"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "November"
 msgstr "Lapkritis"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "December"
 msgstr "Gruodis"
 
diff --git a/l10n/lt_LT/files_sharing.po b/l10n/lt_LT/files_sharing.po
index d1693bb806..342d109109 100644
--- a/l10n/lt_LT/files_sharing.po
+++ b/l10n/lt_LT/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-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:04+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -18,18 +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"
 
-#: templates/get.php:4
-msgid "Size"
-msgstr "Dydis"
+#: templates/authenticate.php:4
+msgid "Password"
+msgstr ""
 
-#: templates/get.php:5
-msgid "Modified"
-msgstr "Pakeista"
-
-#: templates/get.php:5
-msgid "Delete all"
-msgstr "Ištrinti viską"
-
-#: templates/get.php:5
-msgid "Delete"
-msgstr "Ištrinti"
+#: templates/authenticate.php:6
+msgid "Submit"
+msgstr ""
diff --git a/l10n/lt_LT/settings.po b/l10n/lt_LT/settings.po
index 8b8a184019..9ba5a73caf 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-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"
+"POT-Creation-Date: 2012-08-29 02:02+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -87,10 +87,46 @@ msgid "use systems cron service"
 msgstr "naudoti sistemos cron servisą"
 
 #: templates/admin.php:39
+msgid "Share API"
+msgstr ""
+
+#: templates/admin.php:44
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:45
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:49
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:50
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:54
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:55
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:58
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:60
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:67
 msgid "Log"
 msgstr "Žurnalas"
 
-#: templates/admin.php:67
+#: templates/admin.php:95
 msgid "More"
 msgstr "Daugiau"
 
diff --git a/l10n/lt_LT/user_ldap.po b/l10n/lt_LT/user_ldap.po
index d648d9ba0c..7e15e309ec 100644
--- a/l10n/lt_LT/user_ldap.po
+++ b/l10n/lt_LT/user_ldap.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-22 13:55+0000\n"
-"Last-Translator: Dr. ROX <to.dr.rox@gmail.com>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -160,6 +160,12 @@ msgstr ""
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:30
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:32
 msgid "Help"
 msgstr "Pagalba"
diff --git a/l10n/lv/core.po b/l10n/lv/core.po
index 29eb9169d2..09e8d451f5 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-08-28 02:01+0200\n"
-"PO-Revision-Date: 2012-08-28 00:02+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -34,55 +34,55 @@ msgstr ""
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr ""
 
-#: js/js.js:190 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
 msgid "Settings"
 msgstr "Iestatījumi"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "January"
 msgstr ""
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "February"
 msgstr ""
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "March"
 msgstr ""
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "April"
 msgstr ""
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "May"
 msgstr ""
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "June"
 msgstr ""
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "July"
 msgstr ""
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "August"
 msgstr ""
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "September"
 msgstr ""
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "October"
 msgstr ""
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "November"
 msgstr ""
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "December"
 msgstr ""
 
diff --git a/l10n/lv/files_sharing.po b/l10n/lv/files_sharing.po
index 4d7325ca83..4f8c4e36f3 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-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:04+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -17,18 +17,10 @@ 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"
+#: templates/authenticate.php:4
+msgid "Password"
 msgstr ""
 
-#: templates/get.php:5
-msgid "Modified"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete all"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete"
+#: templates/authenticate.php:6
+msgid "Submit"
 msgstr ""
diff --git a/l10n/lv/settings.po b/l10n/lv/settings.po
index 725d953126..369af99b7f 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-18 02:01+0200\n"
-"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"POT-Creation-Date: 2012-08-29 02:02+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -20,7 +20,7 @@ msgstr ""
 
 #: ajax/apps/ocs.php:23
 msgid "Unable to load list from App Store"
-msgstr ""
+msgstr "Nebija iespējams lejuplādēt sarakstu no aplikāciju veikala"
 
 #: ajax/lostpassword.php:14
 msgid "Email saved"
@@ -40,7 +40,7 @@ msgstr "Nepareizs vaicājums"
 
 #: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
 msgid "Authentication error"
-msgstr ""
+msgstr "Ielogošanās kļūme"
 
 #: ajax/setlanguage.php:18
 msgid "Language changed"
@@ -48,7 +48,7 @@ msgstr "Valoda tika nomainīta"
 
 #: js/apps.js:18
 msgid "Error"
-msgstr ""
+msgstr "Kļūme"
 
 #: js/apps.js:39 js/apps.js:73
 msgid "Disable"
@@ -72,7 +72,7 @@ msgstr "Brīdinājums par drošību"
 
 #: templates/admin.php:29
 msgid "Cron"
-msgstr ""
+msgstr "Cron"
 
 #: templates/admin.php:31
 msgid "execute one task with each page loaded"
@@ -87,10 +87,46 @@ msgid "use systems cron service"
 msgstr ""
 
 #: templates/admin.php:39
+msgid "Share API"
+msgstr ""
+
+#: templates/admin.php:44
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:45
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:49
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:50
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:54
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:55
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:58
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:60
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:67
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:67
+#: templates/admin.php:95
 msgid "More"
 msgstr "Vairāk"
 
@@ -228,7 +264,7 @@ msgstr "Cits"
 
 #: templates/users.php:80 templates/users.php:112
 msgid "Group Admin"
-msgstr ""
+msgstr "Grupas administrators"
 
 #: templates/users.php:82
 msgid "Quota"
diff --git a/l10n/lv/user_ldap.po b/l10n/lv/user_ldap.po
index 3596376f70..2ec176f928 100644
--- a/l10n/lv/user_ldap.po
+++ b/l10n/lv/user_ldap.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:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -159,6 +159,12 @@ msgstr ""
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:30
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:32
 msgid "Help"
 msgstr ""
diff --git a/l10n/mk/core.po b/l10n/mk/core.po
index 2dd6a28281..89a9f2435d 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-08-28 02:01+0200\n"
-"PO-Revision-Date: 2012-08-28 00:02+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -36,55 +36,55 @@ msgstr "Оваа категорија веќе постои:"
 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:190 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
 msgid "Settings"
 msgstr "Поставки"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "January"
 msgstr "Јануари"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "February"
 msgstr "Февруари"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "March"
 msgstr "Март"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "April"
 msgstr "Април"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "May"
 msgstr "Мај"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "June"
 msgstr "Јуни"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "July"
 msgstr "Јули"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "August"
 msgstr "Август"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "September"
 msgstr "Септември"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "October"
 msgstr "Октомври"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "November"
 msgstr "Ноември"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "December"
 msgstr "Декември"
 
diff --git a/l10n/mk/files_sharing.po b/l10n/mk/files_sharing.po
index eedc221287..f8507463dd 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-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:04+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -17,18 +17,10 @@ msgstr ""
 "Language: mk\n"
 "Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1\n"
 
-#: templates/get.php:4
-msgid "Size"
+#: templates/authenticate.php:4
+msgid "Password"
 msgstr ""
 
-#: templates/get.php:5
-msgid "Modified"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete all"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete"
+#: templates/authenticate.php:6
+msgid "Submit"
 msgstr ""
diff --git a/l10n/mk/settings.po b/l10n/mk/settings.po
index 6fd5df90dc..793020c8ed 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-18 02:01+0200\n"
-"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"POT-Creation-Date: 2012-08-29 02:02+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -88,10 +88,46 @@ msgid "use systems cron service"
 msgstr ""
 
 #: templates/admin.php:39
+msgid "Share API"
+msgstr ""
+
+#: templates/admin.php:44
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:45
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:49
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:50
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:54
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:55
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:58
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:60
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:67
 msgid "Log"
 msgstr "Записник"
 
-#: templates/admin.php:67
+#: templates/admin.php:95
 msgid "More"
 msgstr "Повеќе"
 
diff --git a/l10n/mk/user_ldap.po b/l10n/mk/user_ldap.po
index bcde61dcc6..126d33adf6 100644
--- a/l10n/mk/user_ldap.po
+++ b/l10n/mk/user_ldap.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:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -159,6 +159,12 @@ msgstr ""
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:30
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:32
 msgid "Help"
 msgstr ""
diff --git a/l10n/ms_MY/core.po b/l10n/ms_MY/core.po
index f147f532dd..19af1da5eb 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-08-28 02:01+0200\n"
-"PO-Revision-Date: 2012-08-28 00:02+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -36,55 +36,55 @@ msgstr "Kategori ini telah wujud"
 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:190 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
 msgid "Settings"
 msgstr "Tetapan"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "January"
 msgstr "Januari"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "February"
 msgstr "Februari"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "March"
 msgstr "Mac"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "April"
 msgstr "April"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "May"
 msgstr "Mei"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "June"
 msgstr "Jun"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "July"
 msgstr "Julai"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "August"
 msgstr "Ogos"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "September"
 msgstr "September"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "October"
 msgstr "Oktober"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "November"
 msgstr "November"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "December"
 msgstr "Disember"
 
diff --git a/l10n/ms_MY/files_sharing.po b/l10n/ms_MY/files_sharing.po
index ced7a00ab3..1105b791e4 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-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:04+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -17,18 +17,10 @@ msgstr ""
 "Language: ms_MY\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: templates/get.php:4
-msgid "Size"
+#: templates/authenticate.php:4
+msgid "Password"
 msgstr ""
 
-#: templates/get.php:5
-msgid "Modified"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete all"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete"
+#: templates/authenticate.php:6
+msgid "Submit"
 msgstr ""
diff --git a/l10n/ms_MY/settings.po b/l10n/ms_MY/settings.po
index 07857601be..c166dfab90 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-18 02:01+0200\n"
-"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"POT-Creation-Date: 2012-08-29 02:02+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -90,10 +90,46 @@ msgid "use systems cron service"
 msgstr ""
 
 #: templates/admin.php:39
+msgid "Share API"
+msgstr ""
+
+#: templates/admin.php:44
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:45
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:49
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:50
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:54
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:55
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:58
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:60
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:67
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:67
+#: templates/admin.php:95
 msgid "More"
 msgstr "Lanjutan"
 
diff --git a/l10n/ms_MY/user_ldap.po b/l10n/ms_MY/user_ldap.po
index 744d804e9c..e0ec285086 100644
--- a/l10n/ms_MY/user_ldap.po
+++ b/l10n/ms_MY/user_ldap.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:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -159,6 +159,12 @@ msgstr ""
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:30
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:32
 msgid "Help"
 msgstr ""
diff --git a/l10n/nb_NO/core.po b/l10n/nb_NO/core.po
index 208c2cf2ae..ffedfadca3 100644
--- a/l10n/nb_NO/core.po
+++ b/l10n/nb_NO/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-08-28 02:01+0200\n"
-"PO-Revision-Date: 2012-08-28 00:02+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -38,55 +38,55 @@ msgstr "Denne kategorien finnes allerede:"
 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:190 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
 msgid "Settings"
 msgstr "Innstillinger"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "January"
 msgstr "Januar"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "February"
 msgstr "Februar"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "March"
 msgstr "Mars"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "April"
 msgstr "April"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "May"
 msgstr "Mai"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "June"
 msgstr "Juni"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "July"
 msgstr "Juli"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "August"
 msgstr "August"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "September"
 msgstr "September"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "October"
 msgstr "Oktober"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "November"
 msgstr "November"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "December"
 msgstr "Desember"
 
diff --git a/l10n/nb_NO/files_sharing.po b/l10n/nb_NO/files_sharing.po
index f869bfc1fb..721253f761 100644
--- a/l10n/nb_NO/files_sharing.po
+++ b/l10n/nb_NO/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-24 02:02+0200\n"
-"PO-Revision-Date: 2012-08-23 17:27+0000\n"
-"Last-Translator: Arvid Nornes <arvid.nornes@gmail.com>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,18 +18,10 @@ msgstr ""
 "Language: nb_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: templates/get.php:4
-msgid "Size"
-msgstr "Størrelse"
+#: templates/authenticate.php:4
+msgid "Password"
+msgstr ""
 
-#: templates/get.php:5
-msgid "Modified"
-msgstr "Endret"
-
-#: templates/get.php:5
-msgid "Delete all"
-msgstr "Slett alle"
-
-#: templates/get.php:5
-msgid "Delete"
-msgstr "Slett"
+#: templates/authenticate.php:6
+msgid "Submit"
+msgstr ""
diff --git a/l10n/nb_NO/settings.po b/l10n/nb_NO/settings.po
index a1c8400443..5636a7ccc6 100644
--- a/l10n/nb_NO/settings.po
+++ b/l10n/nb_NO/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-26 01:17+0200\n"
-"PO-Revision-Date: 2012-08-25 23:00+0000\n"
-"Last-Translator: runesudden <runesudden@gmail.com>\n"
+"POT-Creation-Date: 2012-08-29 02:02+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -92,10 +92,46 @@ msgid "use systems cron service"
 msgstr "benytt systemets cron tjeneste"
 
 #: templates/admin.php:39
+msgid "Share API"
+msgstr ""
+
+#: templates/admin.php:44
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:45
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:49
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:50
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:54
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:55
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:58
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:60
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:67
 msgid "Log"
 msgstr "Logg"
 
-#: templates/admin.php:67
+#: templates/admin.php:95
 msgid "More"
 msgstr "Mer"
 
diff --git a/l10n/nb_NO/user_ldap.po b/l10n/nb_NO/user_ldap.po
index 3a14ed0b28..2208bdc9ac 100644
--- a/l10n/nb_NO/user_ldap.po
+++ b/l10n/nb_NO/user_ldap.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:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -159,6 +159,12 @@ msgstr ""
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:30
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:32
 msgid "Help"
 msgstr ""
diff --git a/l10n/nl/core.po b/l10n/nl/core.po
index c7047b576b..8e55361a92 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-08-28 02:01+0200\n"
-"PO-Revision-Date: 2012-08-28 00:01+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -39,55 +39,55 @@ msgstr "De categorie bestaat al."
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr ""
 
-#: js/js.js:190 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
 msgid "Settings"
 msgstr "Instellingen"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "January"
 msgstr "Januari"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "February"
 msgstr "Februari"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "March"
 msgstr "Maart"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "April"
 msgstr "April"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "May"
 msgstr "Mei"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "June"
 msgstr "Juni"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "July"
 msgstr "Juli"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "August"
 msgstr "Augustus"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "September"
 msgstr "September"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "October"
 msgstr "Oktober"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "November"
 msgstr "November"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "December"
 msgstr "December"
 
diff --git a/l10n/nl/files_sharing.po b/l10n/nl/files_sharing.po
index dc30969ea7..71500980d7 100644
--- a/l10n/nl/files_sharing.po
+++ b/l10n/nl/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-25 02:04+0200\n"
-"PO-Revision-Date: 2012-08-24 19:16+0000\n"
-"Last-Translator: Richard Bos <radoeka@gmail.com>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,18 +18,10 @@ msgstr ""
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: templates/get.php:4
-msgid "Size"
-msgstr "Grootte"
+#: templates/authenticate.php:4
+msgid "Password"
+msgstr ""
 
-#: templates/get.php:5
-msgid "Modified"
-msgstr "Aangepast"
-
-#: templates/get.php:5
-msgid "Delete all"
-msgstr "Verwijder alles"
-
-#: templates/get.php:5
-msgid "Delete"
-msgstr "Vewijder"
+#: templates/authenticate.php:6
+msgid "Submit"
+msgstr ""
diff --git a/l10n/nl/settings.po b/l10n/nl/settings.po
index 7f2741fcf9..06562d81b7 100644
--- a/l10n/nl/settings.po
+++ b/l10n/nl/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-25 02:04+0200\n"
-"PO-Revision-Date: 2012-08-24 08:40+0000\n"
-"Last-Translator: Richard Bos <radoeka@gmail.com>\n"
+"POT-Creation-Date: 2012-08-29 02:02+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -93,10 +93,46 @@ msgid "use systems cron service"
 msgstr "gebruik de systeem cron service"
 
 #: templates/admin.php:39
+msgid "Share API"
+msgstr ""
+
+#: templates/admin.php:44
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:45
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:49
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:50
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:54
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:55
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:58
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:60
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:67
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:67
+#: templates/admin.php:95
 msgid "More"
 msgstr "Meer"
 
diff --git a/l10n/nl/user_ldap.po b/l10n/nl/user_ldap.po
index 89b469b7ed..e40f9e685f 100644
--- a/l10n/nl/user_ldap.po
+++ b/l10n/nl/user_ldap.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:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -159,6 +159,12 @@ msgstr ""
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:30
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:32
 msgid "Help"
 msgstr ""
diff --git a/l10n/nn_NO/core.po b/l10n/nn_NO/core.po
index 313cdeba60..ea511e8207 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-08-28 02:01+0200\n"
-"PO-Revision-Date: 2012-08-28 00:02+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -35,55 +35,55 @@ msgstr ""
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr ""
 
-#: js/js.js:190 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
 msgid "Settings"
 msgstr "Innstillingar"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "January"
 msgstr ""
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "February"
 msgstr ""
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "March"
 msgstr ""
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "April"
 msgstr ""
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "May"
 msgstr ""
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "June"
 msgstr ""
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "July"
 msgstr ""
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "August"
 msgstr ""
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "September"
 msgstr ""
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "October"
 msgstr ""
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "November"
 msgstr ""
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "December"
 msgstr ""
 
diff --git a/l10n/nn_NO/files_sharing.po b/l10n/nn_NO/files_sharing.po
index 1ae9969855..fb65f919f9 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-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:04+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -17,18 +17,10 @@ msgstr ""
 "Language: nn_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: templates/get.php:4
-msgid "Size"
+#: templates/authenticate.php:4
+msgid "Password"
 msgstr ""
 
-#: templates/get.php:5
-msgid "Modified"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete all"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete"
+#: templates/authenticate.php:6
+msgid "Submit"
 msgstr ""
diff --git a/l10n/nn_NO/settings.po b/l10n/nn_NO/settings.po
index 465d4e3f60..031fc58572 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-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-20 06:17+0000\n"
-"Last-Translator: Alexander Stevenson <assteve@gmail.com>\n"
+"POT-Creation-Date: 2012-08-29 02:02+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -88,10 +88,46 @@ msgid "use systems cron service"
 msgstr ""
 
 #: templates/admin.php:39
-msgid "Log"
+msgid "Share API"
+msgstr ""
+
+#: templates/admin.php:44
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:45
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:49
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:50
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:54
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:55
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:58
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:60
+msgid "Allow users to only share with users in their groups"
 msgstr ""
 
 #: templates/admin.php:67
+msgid "Log"
+msgstr ""
+
+#: templates/admin.php:95
 msgid "More"
 msgstr ""
 
diff --git a/l10n/nn_NO/user_ldap.po b/l10n/nn_NO/user_ldap.po
index 86099dc606..2d5b008d92 100644
--- a/l10n/nn_NO/user_ldap.po
+++ b/l10n/nn_NO/user_ldap.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:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -159,6 +159,12 @@ msgstr ""
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:30
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:32
 msgid "Help"
 msgstr ""
diff --git a/l10n/pl/core.po b/l10n/pl/core.po
index edae4615e9..7a41ee9070 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-08-28 02:01+0200\n"
-"PO-Revision-Date: 2012-08-28 00:01+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -39,55 +39,55 @@ msgstr "Ta kategoria już istnieje"
 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:190 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
 msgid "Settings"
 msgstr "Ustawienia"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "January"
 msgstr "Styczeń"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "February"
 msgstr "Luty"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "March"
 msgstr "Marzec"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "April"
 msgstr "Kwiecień"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "May"
 msgstr "Maj"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "June"
 msgstr "Czerwiec"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "July"
 msgstr "Lipiec"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "August"
 msgstr "Sierpień"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "September"
 msgstr "Wrzesień"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "October"
 msgstr "Październik"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "November"
 msgstr "Listopad"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "December"
 msgstr "Grudzień"
 
diff --git a/l10n/pl/files_sharing.po b/l10n/pl/files_sharing.po
index 576158713d..22865b645f 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-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:04+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -18,18 +18,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"
 
-#: templates/get.php:4
-msgid "Size"
-msgstr "Rozmiar"
+#: templates/authenticate.php:4
+msgid "Password"
+msgstr ""
 
-#: templates/get.php:5
-msgid "Modified"
-msgstr "Zmodyfikowane"
-
-#: templates/get.php:5
-msgid "Delete all"
-msgstr "Usuń wszystko"
-
-#: templates/get.php:5
-msgid "Delete"
-msgstr "Usuń"
+#: templates/authenticate.php:6
+msgid "Submit"
+msgstr ""
diff --git a/l10n/pl/settings.po b/l10n/pl/settings.po
index b9273c4c45..f34e2e110f 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-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-20 07:48+0000\n"
-"Last-Translator: Cyryl Sochacki <>\n"
+"POT-Creation-Date: 2012-08-29 02:02+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -93,10 +93,46 @@ msgid "use systems cron service"
 msgstr "korzystaj z usługi systemowej cron"
 
 #: templates/admin.php:39
+msgid "Share API"
+msgstr ""
+
+#: templates/admin.php:44
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:45
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:49
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:50
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:54
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:55
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:58
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:60
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:67
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:67
+#: templates/admin.php:95
 msgid "More"
 msgstr "Więcej"
 
diff --git a/l10n/pl/user_ldap.po b/l10n/pl/user_ldap.po
index 8dce1f22d4..809f9c30ed 100644
--- a/l10n/pl/user_ldap.po
+++ b/l10n/pl/user_ldap.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-20 08:52+0000\n"
-"Last-Translator: Cyryl Sochacki <>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -160,6 +160,12 @@ msgstr "w bajtach"
 msgid "in seconds. A change empties the cache."
 msgstr "w sekundach. Zmiana opróżnia pamięć podręczną."
 
-#: templates/settings.php:31
+#: templates/settings.php:30
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:32
 msgid "Help"
 msgstr "Pomoc"
diff --git a/l10n/pt_BR/core.po b/l10n/pt_BR/core.po
index 7ebfea7a29..f0c05cafd0 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-08-28 02:01+0200\n"
-"PO-Revision-Date: 2012-08-28 00:01+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -38,55 +38,55 @@ msgstr "Essa categoria já 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:190 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
 msgid "Settings"
 msgstr "Configurações"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "January"
 msgstr "Janeiro"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "February"
 msgstr "Fevereiro"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "March"
 msgstr "Março"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "April"
 msgstr "Abril"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "May"
 msgstr "Maio"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "June"
 msgstr "Junho"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "July"
 msgstr "Julho"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "August"
 msgstr "Agosto"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "September"
 msgstr "Setembro"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "October"
 msgstr "Outubro"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "November"
 msgstr "Novembro"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "December"
 msgstr "Dezembro"
 
diff --git a/l10n/pt_BR/files_sharing.po b/l10n/pt_BR/files_sharing.po
index 3e73c6ab3c..f00ee26c73 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-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:04+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -17,18 +17,10 @@ msgstr ""
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
-#: templates/get.php:4
-msgid "Size"
+#: templates/authenticate.php:4
+msgid "Password"
 msgstr ""
 
-#: templates/get.php:5
-msgid "Modified"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete all"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete"
+#: templates/authenticate.php:6
+msgid "Submit"
 msgstr ""
diff --git a/l10n/pt_BR/files_versions.po b/l10n/pt_BR/files_versions.po
index 86c54e7105..5c59fa1633 100644
--- a/l10n/pt_BR/files_versions.po
+++ b/l10n/pt_BR/files_versions.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <tbsoares@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-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-28 14:35+0000\n"
+"Last-Translator: tbsoares <tbsoares@gmail.com>\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"
@@ -19,8 +20,8 @@ msgstr ""
 
 #: js/settings-personal.js:31
 msgid "Expire all versions"
-msgstr ""
+msgstr "Expirar todas as versões"
 
 #: templates/settings.php:3
 msgid "Enable Files Versioning"
-msgstr ""
+msgstr "Habilitar versionamento de arquivos"
diff --git a/l10n/pt_BR/settings.po b/l10n/pt_BR/settings.po
index 901713f7c8..da30f5b428 100644
--- a/l10n/pt_BR/settings.po
+++ b/l10n/pt_BR/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-25 02:04+0200\n"
-"PO-Revision-Date: 2012-08-24 22:19+0000\n"
-"Last-Translator: targinosilveira <targinosilveira@gmail.com>\n"
+"POT-Creation-Date: 2012-08-29 02:02+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -92,10 +92,46 @@ msgid "use systems cron service"
 msgstr ""
 
 #: templates/admin.php:39
+msgid "Share API"
+msgstr ""
+
+#: templates/admin.php:44
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:45
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:49
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:50
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:54
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:55
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:58
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:60
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:67
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:67
+#: templates/admin.php:95
 msgid "More"
 msgstr "Mais"
 
diff --git a/l10n/pt_BR/user_ldap.po b/l10n/pt_BR/user_ldap.po
index 206781082f..71b15d98cf 100644
--- a/l10n/pt_BR/user_ldap.po
+++ b/l10n/pt_BR/user_ldap.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:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -159,6 +159,12 @@ msgstr ""
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:30
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:32
 msgid "Help"
 msgstr ""
diff --git a/l10n/pt_PT/core.po b/l10n/pt_PT/core.po
index 0f25236625..241a29410d 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-08-28 02:01+0200\n"
-"PO-Revision-Date: 2012-08-28 00:02+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -36,55 +36,55 @@ msgstr "Esta categoria já 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:190 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
 msgid "Settings"
 msgstr "Definições"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "January"
 msgstr "Janeiro"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "February"
 msgstr "Fevereiro"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "March"
 msgstr "Março"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "April"
 msgstr "Abril"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "May"
 msgstr "Maio"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "June"
 msgstr "Junho"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "July"
 msgstr "Julho"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "August"
 msgstr "Agosto"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "September"
 msgstr "Setembro"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "October"
 msgstr "Outubro"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "November"
 msgstr "Novembro"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "December"
 msgstr "Dezembro"
 
diff --git a/l10n/pt_PT/files_sharing.po b/l10n/pt_PT/files_sharing.po
index 3a92189327..d2225f80f1 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-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:04+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -17,18 +17,10 @@ msgstr ""
 "Language: pt_PT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: templates/get.php:4
-msgid "Size"
+#: templates/authenticate.php:4
+msgid "Password"
 msgstr ""
 
-#: templates/get.php:5
-msgid "Modified"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete all"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete"
+#: templates/authenticate.php:6
+msgid "Submit"
 msgstr ""
diff --git a/l10n/pt_PT/settings.po b/l10n/pt_PT/settings.po
index 1cc82a6ea4..83da25e2c7 100644
--- a/l10n/pt_PT/settings.po
+++ b/l10n/pt_PT/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-24 02:02+0200\n"
-"PO-Revision-Date: 2012-08-23 19:46+0000\n"
-"Last-Translator: rlameiro <geral@ricardolameiro.pt>\n"
+"POT-Creation-Date: 2012-08-29 02:02+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -89,10 +89,46 @@ msgid "use systems cron service"
 msgstr "usar o serviço cron do sistema"
 
 #: templates/admin.php:39
+msgid "Share API"
+msgstr ""
+
+#: templates/admin.php:44
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:45
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:49
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:50
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:54
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:55
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:58
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:60
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:67
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:67
+#: templates/admin.php:95
 msgid "More"
 msgstr "Mais"
 
diff --git a/l10n/pt_PT/user_ldap.po b/l10n/pt_PT/user_ldap.po
index a4088cac2b..c3ee262c51 100644
--- a/l10n/pt_PT/user_ldap.po
+++ b/l10n/pt_PT/user_ldap.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:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -159,6 +159,12 @@ msgstr ""
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:30
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:32
 msgid "Help"
 msgstr ""
diff --git a/l10n/ro/core.po b/l10n/ro/core.po
index 8b73147348..53f8bf1379 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-08-28 02:01+0200\n"
-"PO-Revision-Date: 2012-08-28 00:02+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -36,55 +36,55 @@ msgstr "Această categorie deja există:"
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr ""
 
-#: js/js.js:190 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
 msgid "Settings"
 msgstr "Configurări"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "January"
 msgstr ""
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "February"
 msgstr ""
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "March"
 msgstr ""
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "April"
 msgstr ""
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "May"
 msgstr ""
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "June"
 msgstr ""
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "July"
 msgstr ""
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "August"
 msgstr ""
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "September"
 msgstr ""
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "October"
 msgstr ""
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "November"
 msgstr ""
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "December"
 msgstr ""
 
diff --git a/l10n/ro/files_sharing.po b/l10n/ro/files_sharing.po
index ab93603538..3d9840ba7c 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-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:04+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -17,18 +17,10 @@ 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"
+#: templates/authenticate.php:4
+msgid "Password"
 msgstr ""
 
-#: templates/get.php:5
-msgid "Modified"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete all"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete"
+#: templates/authenticate.php:6
+msgid "Submit"
 msgstr ""
diff --git a/l10n/ro/settings.po b/l10n/ro/settings.po
index 736ab30fa1..09d25fbdec 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-18 02:01+0200\n"
-"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"POT-Creation-Date: 2012-08-29 02:02+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -90,10 +90,46 @@ msgid "use systems cron service"
 msgstr ""
 
 #: templates/admin.php:39
+msgid "Share API"
+msgstr ""
+
+#: templates/admin.php:44
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:45
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:49
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:50
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:54
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:55
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:58
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:60
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:67
 msgid "Log"
 msgstr "Jurnal de activitate"
 
-#: templates/admin.php:67
+#: templates/admin.php:95
 msgid "More"
 msgstr "Mai mult"
 
diff --git a/l10n/ro/user_ldap.po b/l10n/ro/user_ldap.po
index 644c43d43d..633f14c432 100644
--- a/l10n/ro/user_ldap.po
+++ b/l10n/ro/user_ldap.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 20:24+0000\n"
-"Last-Translator: Dumitru Ursu <>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -160,6 +160,12 @@ msgstr "în octeți"
 msgid "in seconds. A change empties the cache."
 msgstr "în secunde. O schimbare curăță memoria tampon."
 
-#: templates/settings.php:31
+#: templates/settings.php:30
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:32
 msgid "Help"
 msgstr "Ajutor"
diff --git a/l10n/ru/core.po b/l10n/ru/core.po
index ddc0440b88..963a3edb69 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-08-28 02:01+0200\n"
-"PO-Revision-Date: 2012-08-28 00:02+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -37,55 +37,55 @@ msgstr "Эта категория уже существует: "
 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:190 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
 msgid "Settings"
 msgstr "Настройки"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "January"
 msgstr "Январь"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "February"
 msgstr "Февраль"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "March"
 msgstr "Март"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "April"
 msgstr "Апрель"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "May"
 msgstr "Май"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "June"
 msgstr "Июнь"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "July"
 msgstr "Июль"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "August"
 msgstr "Август"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "September"
 msgstr "Сентябрь"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "October"
 msgstr "Октябрь"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "November"
 msgstr "Ноябрь"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "December"
 msgstr "Декабрь"
 
diff --git a/l10n/ru/files_sharing.po b/l10n/ru/files_sharing.po
index 39aaa41151..6114ef96d4 100644
--- a/l10n/ru/files_sharing.po
+++ b/l10n/ru/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-25 02:04+0200\n"
-"PO-Revision-Date: 2012-08-24 07:48+0000\n"
-"Last-Translator: Denis <reg.transifex.net@demitel.ru>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,18 +18,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"
 
-#: templates/get.php:4
-msgid "Size"
-msgstr "Размер"
+#: templates/authenticate.php:4
+msgid "Password"
+msgstr ""
 
-#: templates/get.php:5
-msgid "Modified"
-msgstr "Изменён"
-
-#: templates/get.php:5
-msgid "Delete all"
-msgstr "Удалить все"
-
-#: templates/get.php:5
-msgid "Delete"
-msgstr "Удалить"
+#: templates/authenticate.php:6
+msgid "Submit"
+msgstr ""
diff --git a/l10n/ru/settings.po b/l10n/ru/settings.po
index 8dfb19bb77..c8cbb591ee 100644
--- a/l10n/ru/settings.po
+++ b/l10n/ru/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-19 02:02+0200\n"
-"PO-Revision-Date: 2012-08-18 11:59+0000\n"
-"Last-Translator: rasperepodvipodvert <rasperepodvipodvert@gmail.com>\n"
+"POT-Creation-Date: 2012-08-29 02:02+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -94,10 +94,46 @@ msgid "use systems cron service"
 msgstr "использовать системные задания"
 
 #: templates/admin.php:39
+msgid "Share API"
+msgstr ""
+
+#: templates/admin.php:44
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:45
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:49
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:50
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:54
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:55
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:58
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:60
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:67
 msgid "Log"
 msgstr "Журнал"
 
-#: templates/admin.php:67
+#: templates/admin.php:95
 msgid "More"
 msgstr "Ещё"
 
diff --git a/l10n/ru/user_ldap.po b/l10n/ru/user_ldap.po
index bb1f2d6239..3a9b203bdb 100644
--- a/l10n/ru/user_ldap.po
+++ b/l10n/ru/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-25 02:04+0200\n"
-"PO-Revision-Date: 2012-08-24 15:13+0000\n"
-"Last-Translator: wpns <4671992@gmail.com>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -93,7 +93,7 @@ msgstr "Определяет фильтр для применения при п
 
 #: templates/settings.php:14
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr ""
+msgstr "без заполнения, например \"objectClass=posixGroup\"."
 
 #: templates/settings.php:17
 msgid "Port"
@@ -101,15 +101,15 @@ 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"
@@ -121,7 +121,7 @@ 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."
@@ -131,7 +131,7 @@ msgstr "Отключить проверку сертификата SSL."
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
-msgstr ""
+msgstr "Если соединение работает только с этой опцией, импортируйте на ваш сервер ownCloud сертификат SSL сервера LDAP."
 
 #: templates/settings.php:23
 msgid "Not recommended, use for testing only."
@@ -139,19 +139,19 @@ 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 "Атрибут LDAP для генерации имени пользователя ownCloud."
 
 #: 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 "Атрибут LDAP для генерации имени группы ownCloud."
 
 #: templates/settings.php:27
 msgid "in bytes"
@@ -161,6 +161,12 @@ msgstr "в байтах"
 msgid "in seconds. A change empties the cache."
 msgstr "в секундах. Изменение очистит кэш."
 
-#: templates/settings.php:31
+#: templates/settings.php:30
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:32
 msgid "Help"
 msgstr "Помощь"
diff --git a/l10n/sk_SK/core.po b/l10n/sk_SK/core.po
index 7243bc6094..c31e43e6eb 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-08-28 02:01+0200\n"
-"PO-Revision-Date: 2012-08-28 00:02+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -35,55 +35,55 @@ msgstr "Táto kategória už existuje:"
 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:190 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
 msgid "Settings"
 msgstr "Nastavenia"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "January"
 msgstr "Január"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "February"
 msgstr "Február"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "March"
 msgstr "Marec"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "April"
 msgstr "Apríl"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "May"
 msgstr "Máj"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "June"
 msgstr "Jún"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "July"
 msgstr "Júl"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "August"
 msgstr "August"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "September"
 msgstr "September"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "October"
 msgstr "Október"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "November"
 msgstr "November"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "December"
 msgstr "December"
 
diff --git a/l10n/sk_SK/files_sharing.po b/l10n/sk_SK/files_sharing.po
index 3a4f00533b..9e19da94c8 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-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:04+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -17,18 +17,10 @@ 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"
+#: templates/authenticate.php:4
+msgid "Password"
 msgstr ""
 
-#: templates/get.php:5
-msgid "Modified"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete all"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete"
+#: templates/authenticate.php:6
+msgid "Submit"
 msgstr ""
diff --git a/l10n/sk_SK/settings.po b/l10n/sk_SK/settings.po
index 8184b87355..77244df714 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-18 02:01+0200\n"
-"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"POT-Creation-Date: 2012-08-29 02:02+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -89,10 +89,46 @@ msgid "use systems cron service"
 msgstr ""
 
 #: templates/admin.php:39
+msgid "Share API"
+msgstr ""
+
+#: templates/admin.php:44
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:45
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:49
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:50
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:54
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:55
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:58
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:60
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:67
 msgid "Log"
 msgstr "Záznam"
 
-#: templates/admin.php:67
+#: templates/admin.php:95
 msgid "More"
 msgstr "Viac"
 
diff --git a/l10n/sk_SK/user_ldap.po b/l10n/sk_SK/user_ldap.po
index 1fdd9af1e5..b0cc8b5a60 100644
--- a/l10n/sk_SK/user_ldap.po
+++ b/l10n/sk_SK/user_ldap.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:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -159,6 +159,12 @@ msgstr ""
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:30
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:32
 msgid "Help"
 msgstr ""
diff --git a/l10n/sl/core.po b/l10n/sl/core.po
index 78f92f94b4..9056484dc6 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-08-28 02:01+0200\n"
-"PO-Revision-Date: 2012-08-28 00:02+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -36,55 +36,55 @@ msgstr "Ta kategorija že obstaja:"
 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:190 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
 msgid "Settings"
 msgstr "Nastavitve"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "January"
 msgstr "januar"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "February"
 msgstr "februar"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "March"
 msgstr "marec"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "April"
 msgstr "april"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "May"
 msgstr "maj"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "June"
 msgstr "junij"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "July"
 msgstr "julij"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "August"
 msgstr "avgust"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "September"
 msgstr "september"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "October"
 msgstr "oktober"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "November"
 msgstr "november"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "December"
 msgstr "december"
 
diff --git a/l10n/sl/files_sharing.po b/l10n/sl/files_sharing.po
index c16a622861..9065df6a64 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-28 02:01+0200\n"
-"PO-Revision-Date: 2012-08-27 12:28+0000\n"
-"Last-Translator: Peter Peroša <peter.perosa@gmail.com>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -18,18 +18,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"
 
-#: templates/get.php:4
-msgid "Size"
-msgstr "Velikost"
+#: templates/authenticate.php:4
+msgid "Password"
+msgstr ""
 
-#: templates/get.php:5
-msgid "Modified"
-msgstr "Spremenjeno"
-
-#: templates/get.php:5
-msgid "Delete all"
-msgstr "Izbriši vse"
-
-#: templates/get.php:5
-msgid "Delete"
-msgstr "Izbriši"
+#: templates/authenticate.php:6
+msgid "Submit"
+msgstr ""
diff --git a/l10n/sl/settings.po b/l10n/sl/settings.po
index 32ff133a37..1ee9f30e5e 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-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"
+"POT-Creation-Date: 2012-08-29 02:02+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -89,10 +89,46 @@ msgid "use systems cron service"
 msgstr "uporabi sistemski servis za periodična opravila"
 
 #: templates/admin.php:39
+msgid "Share API"
+msgstr ""
+
+#: templates/admin.php:44
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:45
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:49
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:50
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:54
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:55
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:58
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:60
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:67
 msgid "Log"
 msgstr "Dnevnik"
 
-#: templates/admin.php:67
+#: templates/admin.php:95
 msgid "More"
 msgstr "Več"
 
diff --git a/l10n/sl/user_ldap.po b/l10n/sl/user_ldap.po
index c405fb64d9..4a23050ed5 100644
--- a/l10n/sl/user_ldap.po
+++ b/l10n/sl/user_ldap.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 11:45+0000\n"
-"Last-Translator: Peter Peroša <peter.perosa@gmail.com>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -160,6 +160,12 @@ msgstr "v bajtih"
 msgid "in seconds. A change empties the cache."
 msgstr "v sekundah. Sprememba izprazni predpomnilnik."
 
-#: templates/settings.php:31
+#: templates/settings.php:30
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:32
 msgid "Help"
 msgstr "Pomoč"
diff --git a/l10n/so/core.po b/l10n/so/core.po
index 0dd2a3f54e..f0bef059c9 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-08-28 02:01+0200\n"
-"PO-Revision-Date: 2012-08-28 00:02+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -33,55 +33,55 @@ msgstr ""
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr ""
 
-#: js/js.js:190 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "January"
 msgstr ""
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "February"
 msgstr ""
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "March"
 msgstr ""
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "April"
 msgstr ""
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "May"
 msgstr ""
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "June"
 msgstr ""
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "July"
 msgstr ""
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "August"
 msgstr ""
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "September"
 msgstr ""
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "October"
 msgstr ""
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "November"
 msgstr ""
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "December"
 msgstr ""
 
diff --git a/l10n/so/files_sharing.po b/l10n/so/files_sharing.po
index c05e0f049b..94223b1fd3 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-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:04+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -17,18 +17,10 @@ msgstr ""
 "Language: so\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: templates/get.php:4
-msgid "Size"
+#: templates/authenticate.php:4
+msgid "Password"
 msgstr ""
 
-#: templates/get.php:5
-msgid "Modified"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete all"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete"
+#: templates/authenticate.php:6
+msgid "Submit"
 msgstr ""
diff --git a/l10n/so/settings.po b/l10n/so/settings.po
index bc0ef8b76c..a677a1e3bc 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-18 02:01+0200\n"
-"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"POT-Creation-Date: 2012-08-29 02:02+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -86,10 +86,46 @@ msgid "use systems cron service"
 msgstr ""
 
 #: templates/admin.php:39
-msgid "Log"
+msgid "Share API"
+msgstr ""
+
+#: templates/admin.php:44
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:45
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:49
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:50
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:54
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:55
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:58
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:60
+msgid "Allow users to only share with users in their groups"
 msgstr ""
 
 #: templates/admin.php:67
+msgid "Log"
+msgstr ""
+
+#: templates/admin.php:95
 msgid "More"
 msgstr ""
 
diff --git a/l10n/so/user_ldap.po b/l10n/so/user_ldap.po
index bf35a13096..b4103a6c6d 100644
--- a/l10n/so/user_ldap.po
+++ b/l10n/so/user_ldap.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:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -159,6 +159,12 @@ msgstr ""
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:30
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:32
 msgid "Help"
 msgstr ""
diff --git a/l10n/sr/core.po b/l10n/sr/core.po
index 21174c99ad..814ff643d5 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-08-28 02:01+0200\n"
-"PO-Revision-Date: 2012-08-28 00:02+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -34,55 +34,55 @@ msgstr ""
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr ""
 
-#: js/js.js:190 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
 msgid "Settings"
 msgstr "Подешавања"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "January"
 msgstr ""
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "February"
 msgstr ""
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "March"
 msgstr ""
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "April"
 msgstr ""
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "May"
 msgstr ""
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "June"
 msgstr ""
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "July"
 msgstr ""
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "August"
 msgstr ""
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "September"
 msgstr ""
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "October"
 msgstr ""
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "November"
 msgstr ""
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "December"
 msgstr ""
 
diff --git a/l10n/sr/files_sharing.po b/l10n/sr/files_sharing.po
index b7dbb671d2..5979558f84 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-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:04+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -17,18 +17,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"
 
-#: templates/get.php:4
-msgid "Size"
+#: templates/authenticate.php:4
+msgid "Password"
 msgstr ""
 
-#: templates/get.php:5
-msgid "Modified"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete all"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete"
+#: templates/authenticate.php:6
+msgid "Submit"
 msgstr ""
diff --git a/l10n/sr/settings.po b/l10n/sr/settings.po
index 58e3af2ba4..df8d3be27c 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-18 02:01+0200\n"
-"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"POT-Creation-Date: 2012-08-29 02:02+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -87,10 +87,46 @@ msgid "use systems cron service"
 msgstr ""
 
 #: templates/admin.php:39
-msgid "Log"
+msgid "Share API"
+msgstr ""
+
+#: templates/admin.php:44
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:45
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:49
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:50
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:54
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:55
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:58
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:60
+msgid "Allow users to only share with users in their groups"
 msgstr ""
 
 #: templates/admin.php:67
+msgid "Log"
+msgstr ""
+
+#: templates/admin.php:95
 msgid "More"
 msgstr ""
 
diff --git a/l10n/sr/user_ldap.po b/l10n/sr/user_ldap.po
index 4e3f01a3b6..eaf9622b4f 100644
--- a/l10n/sr/user_ldap.po
+++ b/l10n/sr/user_ldap.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:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -159,6 +159,12 @@ msgstr ""
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:30
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:32
 msgid "Help"
 msgstr ""
diff --git a/l10n/sr@latin/core.po b/l10n/sr@latin/core.po
index 49a960b4b6..b6526ca53b 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-08-28 02:01+0200\n"
-"PO-Revision-Date: 2012-08-28 00:02+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -34,55 +34,55 @@ msgstr ""
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr ""
 
-#: js/js.js:190 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
 msgid "Settings"
 msgstr "Podešavanja"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "January"
 msgstr ""
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "February"
 msgstr ""
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "March"
 msgstr ""
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "April"
 msgstr ""
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "May"
 msgstr ""
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "June"
 msgstr ""
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "July"
 msgstr ""
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "August"
 msgstr ""
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "September"
 msgstr ""
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "October"
 msgstr ""
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "November"
 msgstr ""
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "December"
 msgstr ""
 
diff --git a/l10n/sr@latin/files_sharing.po b/l10n/sr@latin/files_sharing.po
index 4f3a03c203..918bd167e0 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-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:04+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -17,18 +17,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"
 
-#: templates/get.php:4
-msgid "Size"
+#: templates/authenticate.php:4
+msgid "Password"
 msgstr ""
 
-#: templates/get.php:5
-msgid "Modified"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete all"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete"
+#: templates/authenticate.php:6
+msgid "Submit"
 msgstr ""
diff --git a/l10n/sr@latin/settings.po b/l10n/sr@latin/settings.po
index 75b8006fa2..b5239835de 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-18 02:01+0200\n"
-"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"POT-Creation-Date: 2012-08-29 02:02+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -87,10 +87,46 @@ msgid "use systems cron service"
 msgstr ""
 
 #: templates/admin.php:39
-msgid "Log"
+msgid "Share API"
+msgstr ""
+
+#: templates/admin.php:44
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:45
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:49
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:50
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:54
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:55
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:58
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:60
+msgid "Allow users to only share with users in their groups"
 msgstr ""
 
 #: templates/admin.php:67
+msgid "Log"
+msgstr ""
+
+#: templates/admin.php:95
 msgid "More"
 msgstr ""
 
diff --git a/l10n/sr@latin/user_ldap.po b/l10n/sr@latin/user_ldap.po
index c37681c121..6f56c8e03d 100644
--- a/l10n/sr@latin/user_ldap.po
+++ b/l10n/sr@latin/user_ldap.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:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -159,6 +159,12 @@ msgstr ""
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:30
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:32
 msgid "Help"
 msgstr ""
diff --git a/l10n/sv/core.po b/l10n/sv/core.po
index c02cb098c2..325f61911a 100644
--- a/l10n/sv/core.po
+++ b/l10n/sv/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-08-28 02:01+0200\n"
-"PO-Revision-Date: 2012-08-28 00:02+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -39,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:190 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
 msgid "Settings"
 msgstr "Inställningar"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "January"
 msgstr "Januari"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "February"
 msgstr "Februari"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "March"
 msgstr "Mars"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "April"
 msgstr "April"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "May"
 msgstr "Maj"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "June"
 msgstr "Juni"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "July"
 msgstr "Juli"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "August"
 msgstr "Augusti"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "September"
 msgstr "September"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "October"
 msgstr "Oktober"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "November"
 msgstr "November"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "December"
 msgstr "December"
 
diff --git a/l10n/sv/files_sharing.po b/l10n/sv/files_sharing.po
index dada4f4e79..71f71e1dda 100644
--- a/l10n/sv/files_sharing.po
+++ b/l10n/sv/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-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:04+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -18,18 +18,10 @@ msgstr ""
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: templates/get.php:4
-msgid "Size"
-msgstr "Storlek"
+#: templates/authenticate.php:4
+msgid "Password"
+msgstr ""
 
-#: templates/get.php:5
-msgid "Modified"
-msgstr "Ändrad"
-
-#: templates/get.php:5
-msgid "Delete all"
-msgstr "Radera alla"
-
-#: templates/get.php:5
-msgid "Delete"
-msgstr "Radera"
+#: templates/authenticate.php:6
+msgid "Submit"
+msgstr ""
diff --git a/l10n/sv/settings.po b/l10n/sv/settings.po
index f764a35f03..205f6b1314 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-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-22 06:21+0000\n"
-"Last-Translator: Magnus Höglund <magnus@linux.com>\n"
+"POT-Creation-Date: 2012-08-29 02:02+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -93,10 +93,46 @@ msgid "use systems cron service"
 msgstr "använd systemets cron-tjänst"
 
 #: templates/admin.php:39
+msgid "Share API"
+msgstr ""
+
+#: templates/admin.php:44
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:45
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:49
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:50
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:54
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:55
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:58
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:60
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:67
 msgid "Log"
 msgstr "Logg"
 
-#: templates/admin.php:67
+#: templates/admin.php:95
 msgid "More"
 msgstr "Mera"
 
diff --git a/l10n/sv/user_ldap.po b/l10n/sv/user_ldap.po
index 55f7bbecf9..d5691270f2 100644
--- a/l10n/sv/user_ldap.po
+++ b/l10n/sv/user_ldap.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:33+0000\n"
-"Last-Translator: Magnus Höglund <magnus@linux.com>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -160,6 +160,12 @@ msgstr "i bytes"
 msgid "in seconds. A change empties the cache."
 msgstr "i sekunder. En förändring tömmer cache."
 
-#: templates/settings.php:31
+#: templates/settings.php:30
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:32
 msgid "Help"
 msgstr "Hjälp"
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index e1734c27a3..fb63cce50f 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-28 02:01+0200\n"
+"POT-Creation-Date: 2012-08-29 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"
@@ -33,55 +33,55 @@ msgstr ""
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr ""
 
-#: js/js.js:190 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "January"
 msgstr ""
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "February"
 msgstr ""
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "March"
 msgstr ""
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "April"
 msgstr ""
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "May"
 msgstr ""
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "June"
 msgstr ""
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "July"
 msgstr ""
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "August"
 msgstr ""
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "September"
 msgstr ""
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "October"
 msgstr ""
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "November"
 msgstr ""
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "December"
 msgstr ""
 
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index 752e31fd7c..ab39126f39 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-28 02:01+0200\n"
+"POT-Creation-Date: 2012-08-29 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 27c7446cb4..06954d4efa 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-28 02:01+0200\n"
+"POT-Creation-Date: 2012-08-29 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 e4e7f18c21..8a89c7d214 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-28 02:01+0200\n"
+"POT-Creation-Date: 2012-08-29 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 9cfb951daf..9bded512ff 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-28 02:01+0200\n"
+"POT-Creation-Date: 2012-08-29 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"
@@ -17,18 +17,10 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: templates/get.php:4
-msgid "Size"
+#: templates/authenticate.php:4
+msgid "Password"
 msgstr ""
 
-#: templates/get.php:5
-msgid "Modified"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete all"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete"
+#: templates/authenticate.php:6
+msgid "Submit"
 msgstr ""
diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot
index d50826056b..a04d4da157 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-28 02:01+0200\n"
+"POT-Creation-Date: 2012-08-29 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 ac7b81d36f..27de1e0d90 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-28 02:01+0200\n"
+"POT-Creation-Date: 2012-08-29 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 4e40d1bc96..a848774f20 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-28 02:01+0200\n"
+"POT-Creation-Date: 2012-08-29 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"
@@ -86,10 +86,46 @@ msgid "use systems cron service"
 msgstr ""
 
 #: templates/admin.php:39
-msgid "Log"
+msgid "Share API"
+msgstr ""
+
+#: templates/admin.php:44
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:45
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:49
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:50
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:54
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:55
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:58
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:60
+msgid "Allow users to only share with users in their groups"
 msgstr ""
 
 #: templates/admin.php:67
+msgid "Log"
+msgstr ""
+
+#: templates/admin.php:95
 msgid "More"
 msgstr ""
 
diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot
index f84f2d1141..afb446dd07 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-28 02:01+0200\n"
+"POT-Creation-Date: 2012-08-29 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"
@@ -158,6 +158,11 @@ msgstr ""
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:30
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute."
+msgstr ""
+
+#: templates/settings.php:32
 msgid "Help"
 msgstr ""
diff --git a/l10n/th_TH/core.po b/l10n/th_TH/core.po
index 0a1fad25bd..3868f2ff31 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-08-28 02:01+0200\n"
-"PO-Revision-Date: 2012-08-28 00:02+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -35,55 +35,55 @@ msgstr "หมวดหมู่นี้มีอยู่แล้ว: "
 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:190 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
 msgid "Settings"
 msgstr "ตั้งค่า"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "January"
 msgstr "มกราคม"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "February"
 msgstr "กุมภาพันธ์"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "March"
 msgstr "มีนาคม"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "April"
 msgstr "เมษายน"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "May"
 msgstr "พฤษภาคม"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "June"
 msgstr "มิถุนายน"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "July"
 msgstr "กรกฏาคม"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "August"
 msgstr "สิงหาคม"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "September"
 msgstr "กันยายน"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "October"
 msgstr "ตุลาคม"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "November"
 msgstr "พฤศจิกายน"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "December"
 msgstr "ธันวาคม"
 
diff --git a/l10n/th_TH/files_sharing.po b/l10n/th_TH/files_sharing.po
index 6e5fafa72c..21f2b67908 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-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:04+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -18,18 +18,10 @@ msgstr ""
 "Language: th_TH\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: templates/get.php:4
-msgid "Size"
-msgstr "ขนาด"
+#: templates/authenticate.php:4
+msgid "Password"
+msgstr ""
 
-#: templates/get.php:5
-msgid "Modified"
-msgstr "แก้ไขแล้ว"
-
-#: templates/get.php:5
-msgid "Delete all"
-msgstr "ลบทั้งหมด"
-
-#: templates/get.php:5
-msgid "Delete"
-msgstr "ลบ"
+#: templates/authenticate.php:6
+msgid "Submit"
+msgstr ""
diff --git a/l10n/th_TH/settings.po b/l10n/th_TH/settings.po
index f2de2ffdc5..99b1cb2ac3 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-20 02:01+0200\n"
-"PO-Revision-Date: 2012-08-19 15:11+0000\n"
-"Last-Translator: AriesAnywhere Anywhere <ariesanywhere@gmail.com>\n"
+"POT-Creation-Date: 2012-08-29 02:02+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -89,10 +89,46 @@ msgid "use systems cron service"
 msgstr "ใช้บริการ cron จากระบบ"
 
 #: templates/admin.php:39
+msgid "Share API"
+msgstr ""
+
+#: templates/admin.php:44
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:45
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:49
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:50
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:54
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:55
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:58
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:60
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:67
 msgid "Log"
 msgstr "บันทึกการเปลี่ยนแปลง"
 
-#: templates/admin.php:67
+#: templates/admin.php:95
 msgid "More"
 msgstr "เพิ่มเติม"
 
diff --git a/l10n/th_TH/user_ldap.po b/l10n/th_TH/user_ldap.po
index b87bd07fa5..791bc9000b 100644
--- a/l10n/th_TH/user_ldap.po
+++ b/l10n/th_TH/user_ldap.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-22 18:47+0000\n"
-"Last-Translator: AriesAnywhere Anywhere <ariesanywhere@gmail.com>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -160,6 +160,12 @@ msgstr "ในหน่วยไบต์"
 msgid "in seconds. A change empties the cache."
 msgstr "ในอีกไม่กี่วินาที ระบบจะเปลี่ยนแปลงข้อมูลในแคชให้ว่างเปล่า"
 
-#: templates/settings.php:31
+#: templates/settings.php:30
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:32
 msgid "Help"
 msgstr "ช่วยเหลือ"
diff --git a/l10n/tr/core.po b/l10n/tr/core.po
index 1047bf9dc7..c965064524 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-08-28 02:01+0200\n"
-"PO-Revision-Date: 2012-08-28 00:02+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -35,55 +35,55 @@ msgstr "Bu kategori zaten mevcut: "
 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:190 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
 msgid "Settings"
 msgstr "Ayarlar"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "January"
 msgstr "Ocak"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "February"
 msgstr "Şubat"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "March"
 msgstr "Mart"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "April"
 msgstr "Nisan"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "May"
 msgstr "Mayıs"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "June"
 msgstr "Haziran"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "July"
 msgstr "Temmuz"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "August"
 msgstr "Ağustos"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "September"
 msgstr "Eylül"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "October"
 msgstr "Ekim"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "November"
 msgstr "Kasım"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "December"
 msgstr "Aralık"
 
diff --git a/l10n/tr/files_sharing.po b/l10n/tr/files_sharing.po
index 3f6c26efdc..bc726f546f 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-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:04+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -17,18 +17,10 @@ msgstr ""
 "Language: tr\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: templates/get.php:4
-msgid "Size"
+#: templates/authenticate.php:4
+msgid "Password"
 msgstr ""
 
-#: templates/get.php:5
-msgid "Modified"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete all"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete"
+#: templates/authenticate.php:6
+msgid "Submit"
 msgstr ""
diff --git a/l10n/tr/settings.po b/l10n/tr/settings.po
index f2a34211a7..cfe4ddc892 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-18 02:01+0200\n"
-"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"POT-Creation-Date: 2012-08-29 02:02+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -89,10 +89,46 @@ msgid "use systems cron service"
 msgstr ""
 
 #: templates/admin.php:39
+msgid "Share API"
+msgstr ""
+
+#: templates/admin.php:44
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:45
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:49
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:50
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:54
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:55
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:58
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:60
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:67
 msgid "Log"
 msgstr "Günlük"
 
-#: templates/admin.php:67
+#: templates/admin.php:95
 msgid "More"
 msgstr "Devamı"
 
diff --git a/l10n/tr/user_ldap.po b/l10n/tr/user_ldap.po
index de0cb374c3..5429c2cff8 100644
--- a/l10n/tr/user_ldap.po
+++ b/l10n/tr/user_ldap.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:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -159,6 +159,12 @@ msgstr ""
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:30
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:32
 msgid "Help"
 msgstr ""
diff --git a/l10n/uk/core.po b/l10n/uk/core.po
index 709e241138..7493adea34 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-08-28 02:01+0200\n"
-"PO-Revision-Date: 2012-08-28 00:02+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -35,55 +35,55 @@ msgstr ""
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr ""
 
-#: js/js.js:190 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
 msgid "Settings"
 msgstr "Налаштування"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "January"
 msgstr ""
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "February"
 msgstr ""
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "March"
 msgstr ""
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "April"
 msgstr ""
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "May"
 msgstr ""
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "June"
 msgstr ""
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "July"
 msgstr ""
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "August"
 msgstr ""
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "September"
 msgstr ""
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "October"
 msgstr ""
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "November"
 msgstr ""
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "December"
 msgstr ""
 
diff --git a/l10n/uk/files_sharing.po b/l10n/uk/files_sharing.po
index 4786918c70..a90d76aca0 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-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:04+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -17,18 +17,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"
 
-#: templates/get.php:4
-msgid "Size"
+#: templates/authenticate.php:4
+msgid "Password"
 msgstr ""
 
-#: templates/get.php:5
-msgid "Modified"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete all"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete"
+#: templates/authenticate.php:6
+msgid "Submit"
 msgstr ""
diff --git a/l10n/uk/settings.po b/l10n/uk/settings.po
index f32d1abccf..03945e1bfb 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-18 02:01+0200\n"
-"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"POT-Creation-Date: 2012-08-29 02:02+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -87,10 +87,46 @@ msgid "use systems cron service"
 msgstr ""
 
 #: templates/admin.php:39
-msgid "Log"
+msgid "Share API"
+msgstr ""
+
+#: templates/admin.php:44
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:45
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:49
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:50
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:54
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:55
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:58
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:60
+msgid "Allow users to only share with users in their groups"
 msgstr ""
 
 #: templates/admin.php:67
+msgid "Log"
+msgstr ""
+
+#: templates/admin.php:95
 msgid "More"
 msgstr ""
 
diff --git a/l10n/uk/user_ldap.po b/l10n/uk/user_ldap.po
index 236f6c2034..d948126316 100644
--- a/l10n/uk/user_ldap.po
+++ b/l10n/uk/user_ldap.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:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -159,6 +159,12 @@ msgstr ""
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:30
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:32
 msgid "Help"
 msgstr ""
diff --git a/l10n/vi/core.po b/l10n/vi/core.po
index ec28c892d0..ddfe09758d 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-08-28 02:01+0200\n"
-"PO-Revision-Date: 2012-08-28 00:02+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -34,55 +34,55 @@ 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:190 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
 msgid "Settings"
 msgstr "Cài đặt"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "January"
 msgstr "Tháng 1"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "February"
 msgstr "Tháng 2"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "March"
 msgstr "Tháng 3"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "April"
 msgstr "Tháng 4"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "May"
 msgstr "Tháng 5"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "June"
 msgstr "Tháng 6"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "July"
 msgstr "Tháng 7"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "August"
 msgstr "Tháng 8"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "September"
 msgstr "Tháng 9"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "October"
 msgstr "Tháng 10"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "November"
 msgstr "Tháng 11"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "December"
 msgstr "Tháng 12"
 
diff --git a/l10n/vi/files_sharing.po b/l10n/vi/files_sharing.po
index 87e7cce9bd..fbfe460234 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-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:04+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -17,18 +17,10 @@ msgstr ""
 "Language: vi\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: templates/get.php:4
-msgid "Size"
+#: templates/authenticate.php:4
+msgid "Password"
 msgstr ""
 
-#: templates/get.php:5
-msgid "Modified"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete all"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete"
+#: templates/authenticate.php:6
+msgid "Submit"
 msgstr ""
diff --git a/l10n/vi/settings.po b/l10n/vi/settings.po
index 41c0adc6ef..fdbc7da0b1 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-18 02:01+0200\n"
-"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"POT-Creation-Date: 2012-08-29 02:02+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -88,10 +88,46 @@ msgid "use systems cron service"
 msgstr ""
 
 #: templates/admin.php:39
+msgid "Share API"
+msgstr ""
+
+#: templates/admin.php:44
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:45
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:49
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:50
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:54
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:55
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:58
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:60
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:67
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:67
+#: templates/admin.php:95
 msgid "More"
 msgstr "nhiều hơn"
 
diff --git a/l10n/vi/user_ldap.po b/l10n/vi/user_ldap.po
index 52c6146db3..6fd933c5b5 100644
--- a/l10n/vi/user_ldap.po
+++ b/l10n/vi/user_ldap.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:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -159,6 +159,12 @@ msgstr ""
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:30
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:32
 msgid "Help"
 msgstr ""
diff --git a/l10n/zh_CN.GB2312/core.po b/l10n/zh_CN.GB2312/core.po
index e0a74fb07f..5ae461a170 100644
--- a/l10n/zh_CN.GB2312/core.po
+++ b/l10n/zh_CN.GB2312/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-08-28 02:01+0200\n"
-"PO-Revision-Date: 2012-08-28 00:02+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -34,55 +34,55 @@ msgstr "这个分类已经存在了:"
 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:190 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
 msgid "Settings"
 msgstr "设置"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "January"
 msgstr "一月"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "February"
 msgstr "二月"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "March"
 msgstr "三月"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "April"
 msgstr "四月"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "May"
 msgstr "五月"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "June"
 msgstr "六月"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "July"
 msgstr "七月"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "August"
 msgstr "八月"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "September"
 msgstr "九月"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "October"
 msgstr "十月"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "November"
 msgstr "十一月"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "December"
 msgstr "十二月"
 
diff --git a/l10n/zh_CN.GB2312/files_sharing.po b/l10n/zh_CN.GB2312/files_sharing.po
index 0243a9ebaa..33a8efe467 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-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:04+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -17,18 +17,10 @@ msgstr ""
 "Language: zh_CN.GB2312\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: templates/get.php:4
-msgid "Size"
+#: templates/authenticate.php:4
+msgid "Password"
 msgstr ""
 
-#: templates/get.php:5
-msgid "Modified"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete all"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete"
+#: templates/authenticate.php:6
+msgid "Submit"
 msgstr ""
diff --git a/l10n/zh_CN.GB2312/settings.po b/l10n/zh_CN.GB2312/settings.po
index 70f3d9d228..5cefbd6785 100644
--- a/l10n/zh_CN.GB2312/settings.po
+++ b/l10n/zh_CN.GB2312/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-18 02:01+0200\n"
-"PO-Revision-Date: 2012-08-18 00:02+0000\n"
+"POT-Creation-Date: 2012-08-29 02:02+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -87,10 +87,46 @@ msgid "use systems cron service"
 msgstr ""
 
 #: templates/admin.php:39
+msgid "Share API"
+msgstr ""
+
+#: templates/admin.php:44
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:45
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:49
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:50
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:54
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:55
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:58
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:60
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:67
 msgid "Log"
 msgstr "日志"
 
-#: templates/admin.php:67
+#: templates/admin.php:95
 msgid "More"
 msgstr "更多"
 
diff --git a/l10n/zh_CN.GB2312/user_ldap.po b/l10n/zh_CN.GB2312/user_ldap.po
index 725d441e3c..67a667a8ee 100644
--- a/l10n/zh_CN.GB2312/user_ldap.po
+++ b/l10n/zh_CN.GB2312/user_ldap.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:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -159,6 +159,12 @@ msgstr ""
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:30
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:32
 msgid "Help"
 msgstr ""
diff --git a/l10n/zh_CN/core.po b/l10n/zh_CN/core.po
index eace2d9fe6..da40f7d393 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-08-28 02:01+0200\n"
-"PO-Revision-Date: 2012-08-28 00:02+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -35,55 +35,55 @@ msgstr "此分类已存在: "
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr ""
 
-#: js/js.js:190 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
 msgid "Settings"
 msgstr "设置"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "January"
 msgstr "一月"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "February"
 msgstr "二月"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "March"
 msgstr "三月"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "April"
 msgstr "四月"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "May"
 msgstr "五月"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "June"
 msgstr "六月"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "July"
 msgstr "七月"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "August"
 msgstr "八月"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "September"
 msgstr "九月"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "October"
 msgstr "十月"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "November"
 msgstr "十一月"
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "December"
 msgstr "十二月"
 
diff --git a/l10n/zh_CN/files_sharing.po b/l10n/zh_CN/files_sharing.po
index 6c3271e513..cb50b796bf 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-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:04+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -17,18 +17,10 @@ msgstr ""
 "Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: templates/get.php:4
-msgid "Size"
+#: templates/authenticate.php:4
+msgid "Password"
 msgstr ""
 
-#: templates/get.php:5
-msgid "Modified"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete all"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete"
+#: templates/authenticate.php:6
+msgid "Submit"
 msgstr ""
diff --git a/l10n/zh_CN/settings.po b/l10n/zh_CN/settings.po
index f9f1faf7b3..30ae97464e 100644
--- a/l10n/zh_CN/settings.po
+++ b/l10n/zh_CN/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-26 19:46+0200\n"
-"PO-Revision-Date: 2012-08-26 05:33+0000\n"
-"Last-Translator: hanfeng <appweb.cn@gmail.com>\n"
+"POT-Creation-Date: 2012-08-29 02:02+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -90,10 +90,46 @@ msgid "use systems cron service"
 msgstr "实现系统 cron 服务"
 
 #: templates/admin.php:39
+msgid "Share API"
+msgstr ""
+
+#: templates/admin.php:44
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:45
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:49
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:50
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:54
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:55
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:58
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:60
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:67
 msgid "Log"
 msgstr "日志"
 
-#: templates/admin.php:67
+#: templates/admin.php:95
 msgid "More"
 msgstr "更多"
 
diff --git a/l10n/zh_CN/user_ldap.po b/l10n/zh_CN/user_ldap.po
index 5e871541a0..a34796c9c3 100644
--- a/l10n/zh_CN/user_ldap.po
+++ b/l10n/zh_CN/user_ldap.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:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -159,6 +159,12 @@ msgstr ""
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:30
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:32
 msgid "Help"
 msgstr ""
diff --git a/l10n/zh_TW/core.po b/l10n/zh_TW/core.po
index 1bc6215fcd..8fe1a80fc5 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-08-28 02:01+0200\n"
-"PO-Revision-Date: 2012-08-28 00:02+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -34,55 +34,55 @@ msgstr "此分類已經存在:"
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr ""
 
-#: js/js.js:190 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
 msgid "Settings"
 msgstr "設定"
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "January"
 msgstr ""
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "February"
 msgstr ""
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "March"
 msgstr ""
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "April"
 msgstr ""
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "May"
 msgstr ""
 
-#: js/js.js:575
+#: js/js.js:586
 msgid "June"
 msgstr ""
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "July"
 msgstr ""
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "August"
 msgstr ""
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "September"
 msgstr ""
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "October"
 msgstr ""
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "November"
 msgstr ""
 
-#: js/js.js:576
+#: js/js.js:587
 msgid "December"
 msgstr ""
 
diff --git a/l10n/zh_TW/files_sharing.po b/l10n/zh_TW/files_sharing.po
index 4a2aa509e9..f8438d08d7 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-23 02:03+0200\n"
-"PO-Revision-Date: 2012-08-23 00:04+0000\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
@@ -17,18 +17,10 @@ msgstr ""
 "Language: zh_TW\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: templates/get.php:4
-msgid "Size"
+#: templates/authenticate.php:4
+msgid "Password"
 msgstr ""
 
-#: templates/get.php:5
-msgid "Modified"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete all"
-msgstr ""
-
-#: templates/get.php:5
-msgid "Delete"
+#: templates/authenticate.php:6
+msgid "Submit"
 msgstr ""
diff --git a/l10n/zh_TW/settings.po b/l10n/zh_TW/settings.po
index d333fc726b..aaea010810 100644
--- a/l10n/zh_TW/settings.po
+++ b/l10n/zh_TW/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-25 02:04+0200\n"
-"PO-Revision-Date: 2012-08-24 03:42+0000\n"
-"Last-Translator: weiyu <weiyu871@ms14.url.com.tw>\n"
+"POT-Creation-Date: 2012-08-29 02:02+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -88,10 +88,46 @@ msgid "use systems cron service"
 msgstr ""
 
 #: templates/admin.php:39
+msgid "Share API"
+msgstr ""
+
+#: templates/admin.php:44
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:45
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:49
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:50
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:54
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:55
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:58
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:60
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:67
 msgid "Log"
 msgstr "紀錄"
 
-#: templates/admin.php:67
+#: templates/admin.php:95
 msgid "More"
 msgstr "更多"
 
diff --git a/l10n/zh_TW/user_ldap.po b/l10n/zh_TW/user_ldap.po
index d84e081d11..f57f67dde9 100644
--- a/l10n/zh_TW/user_ldap.po
+++ b/l10n/zh_TW/user_ldap.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:45+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-29 02:01+0200\n"
+"PO-Revision-Date: 2012-08-29 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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -159,6 +159,12 @@ msgstr ""
 msgid "in seconds. A change empties the cache."
 msgstr ""
 
-#: templates/settings.php:31
+#: templates/settings.php:30
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:32
 msgid "Help"
 msgstr ""
diff --git a/settings/l10n/id.php b/settings/l10n/id.php
index bf35b79240..a69d9855ca 100644
--- a/settings/l10n/id.php
+++ b/settings/l10n/id.php
@@ -1,12 +1,19 @@
 <?php $TRANSLATIONS = array(
+"Email saved" => "Email tersimpan",
+"Invalid email" => "Email tidak sah",
 "OpenID Changed" => "OpenID telah dirubah",
 "Invalid request" => "Permintaan tidak valid",
 "Language changed" => "Bahasa telah diganti",
+"Disable" => "NonAktifkan",
+"Enable" => "Aktifkan",
+"Saving..." => "Menyimpan...",
 "__language_name__" => "__language_name__",
+"Security Warning" => "Peringatan Keamanan",
 "Log" => "Log",
 "More" => "Lebih",
 "Add your App" => "Tambahkan App anda",
 "Select an App" => "Pilih satu aplikasi",
+"See application page at apps.owncloud.com" => "Lihat halaman aplikasi di apps.owncloud.com",
 "-licensed" => "-terlisensi",
 "by" => "oleh",
 "Documentation" => "Dokumentasi",
@@ -37,6 +44,7 @@
 "Create" => "Buat",
 "Default Quota" => "Kuota default",
 "Other" => "Lain-lain",
+"Group Admin" => "Admin Grup",
 "Quota" => "Quota",
 "Delete" => "Hapus"
 );
diff --git a/settings/l10n/lv.php b/settings/l10n/lv.php
index 9fa1ccdcfe..eb87bed7f8 100644
--- a/settings/l10n/lv.php
+++ b/settings/l10n/lv.php
@@ -1,14 +1,18 @@
 <?php $TRANSLATIONS = array(
+"Unable to load list from App Store" => "Nebija iespējams lejuplādēt sarakstu no aplikāciju veikala",
 "Email saved" => "Epasts tika saglabāts",
 "Invalid email" => "Nepareizs epasts",
 "OpenID Changed" => "OpenID nomainīts",
 "Invalid request" => "Nepareizs vaicājums",
+"Authentication error" => "Ielogošanās kļūme",
 "Language changed" => "Valoda tika nomainīta",
+"Error" => "Kļūme",
 "Disable" => "Atvienot",
 "Enable" => "Pievienot",
 "Saving..." => "Saglabā...",
 "__language_name__" => "__valodas_nosaukums__",
 "Security Warning" => "Brīdinājums par drošību",
+"Cron" => "Cron",
 "Log" => "Log",
 "More" => "Vairāk",
 "Add your App" => "Pievieno savu aplikāciju",
@@ -44,6 +48,7 @@
 "Create" => "Izveidot",
 "Default Quota" => "Apjoms pēc noklusējuma",
 "Other" => "Cits",
+"Group Admin" => "Grupas administrators",
 "Quota" => "Apjoms",
 "Delete" => "Izdzēst"
 );

From 9fcb916057934b81a44952bf67bc0118f609c570 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Tue, 28 Aug 2012 15:10:06 -0400
Subject: [PATCH 0981/1224] Fix toggling of password protection in sharing
 dropdown

---
 core/css/share.css |  4 +++-
 core/js/share.js   | 11 ++++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/core/css/share.css b/core/css/share.css
index a8ffc8df42..abaeb07dd8 100644
--- a/core/css/share.css
+++ b/core/css/share.css
@@ -15,4 +15,6 @@ 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; }
-#link { border-top:1px solid #ddd; padding-top:0.5em; }
\ No newline at end of file
+#link { border-top:1px solid #ddd; padding-top:0.5em; }
+input[type="text"], input[type="password"] { width:90%; }
+#linkText, #linkPass { display:none; }
diff --git a/core/js/share.js b/core/js/share.js
index 4c164f65b2..cc862b1c5f 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -130,7 +130,7 @@ OC.Share={
 			html += '<br />';
 		}
 		if (possiblePermissions & OC.Share.PERMISSION_SHARE) {
-			html += '<input id="shareWith" type="text" placeholder="Share with" style="width:90%;"/>';
+			html += '<input id="shareWith" type="text" placeholder="Share with" />';
 			html += '<ul id="shareWithList">';
 			html += '</ul>';
 			if (link) {
@@ -139,8 +139,10 @@ OC.Share={
 				// TODO Change to lock/unlock icon?
 				html += '<a href="#" id="showPassword" style="display:none;"><img class="svg" alt="Password protect" src="'+OC.imagePath('core', 'actions/triangle-n')+'"/></a>';
 				html += '<br />';
-				html += '<input id="linkText" style="display:none; width:90%;" readonly="readonly" />';
-				html += '<input id="linkPassText" type="password" placeholder="Password" style="display:none; width:90%;" />';
+				html += '<input id="linkText" type="text" readonly="readonly" />';
+				html += '<div id="linkPass">';
+				html += '<input id="linkPassText" type="password" placeholder="Password" />';
+				html += '</div>'
 				html += '</div>';
 			}
 			html += '</div>';
@@ -408,8 +410,7 @@ $(document).ready(function() {
 	});
 
 	$('#showPassword').live('click', function() {
-		$('#linkText').after('<br />');
-		$('#linkPassText').toggle('blind');
+		$('#linkPass').toggle('blind');
 	});
 
 	$('#linkPassText').live('keyup', function(event) {

From e5cbc532c300142e50f9a6ffb14229595dd74c78 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Wed, 29 Aug 2012 11:54:31 -0400
Subject: [PATCH 0982/1224] Fix password authentication for links and fix
 template problems for links by creating a new base layout

---
 apps/files_sharing/css/public.css             |  9 ++++-
 apps/files_sharing/public.php                 | 13 +++++--
 apps/files_sharing/templates/authenticate.php |  2 +-
 apps/files_sharing/templates/public.php       | 12 ++++--
 core/templates/layout.base.php                | 37 +++++++++++++++++++
 lib/templatelayout.php                        | 10 +++--
 6 files changed, 69 insertions(+), 14 deletions(-)
 create mode 100644 core/templates/layout.base.php

diff --git a/apps/files_sharing/css/public.css b/apps/files_sharing/css/public.css
index aa76c06175..f38afae3dd 100644
--- a/apps/files_sharing/css/public.css
+++ b/apps/files_sharing/css/public.css
@@ -1,2 +1,7 @@
-#content { position:relative; }
-#preview p { text-align: center; }
\ No newline at end of file
+body { background:#ddd; }
+#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; }
+#details { color:#fff; }
+#download { margin-left:2em; font-weight:bold; color:#fff; }
+#preview { min-height:30em; margin:50px auto; border-bottom:1px solid #f8f8f8; background:#eee; text-align:center; }
+p.info { width:22em; text-align: center; margin:2em auto; color:#777; text-shadow:#fff 0 1px 0; }
+p.info a { font-weight:bold; color:#777; }
\ No newline at end of file
diff --git a/apps/files_sharing/public.php b/apps/files_sharing/public.php
index 15dac576d9..a4bf0230a3 100644
--- a/apps/files_sharing/public.php
+++ b/apps/files_sharing/public.php
@@ -5,6 +5,7 @@ if (isset($_GET['file'])) {
 	$pos = strpos($_GET['file'], '/', 1);
 	$uidOwner = substr($_GET['file'], 1, $pos - 1);
 	if (OCP\User::userExists($uidOwner)) {
+		OC_Util::tearDownFS();
 		OC_Util::setupFS($uidOwner);
 		$file = substr($_GET['file'], $pos);
 		$fileSource = OC_Filecache::getId($_GET['file'], '');
@@ -18,14 +19,19 @@ if (isset($_GET['file'])) {
 					$hasher = new PasswordHash(8, $forcePortable);
 					if (!($hasher->CheckPassword($password.OC_Config::getValue('passwordsalt', ''), $storedHash))) {
 						$tmpl = new OCP\Template('files_sharing', 'authenticate', 'guest');
+						$tmpl->assign('URL', OCP\Util::linkToPublic('files').'&file='.$_GET['file']);
 						$tmpl->assign('error', true);
 						$tmpl->printPage();
 						exit();
+					} else {
+						// Save item id in session for future requests
+						$_SESSION['public_link_authenticated'] = $linkItem['id'];
 					}
-					// Continue on if password is valid
-				} else {
+				// Check if item id is set in session
+				} else if (!isset($_SESSION['public_link_authenticated']) || $_SESSION['public_link_authenticated'] !== $linkItem['id']) {
 					// Prompt for password
 					$tmpl = new OCP\Template('files_sharing', 'authenticate', 'guest');
+					$tmpl->assign('URL', OCP\Util::linkToPublic('files').'&file='.$_GET['file']);
 					$tmpl->printPage();
 					exit();
 				}
@@ -45,7 +51,8 @@ if (isset($_GET['file'])) {
 				OCP\Util::addStyle('files_sharing', 'public');
 				OCP\Util::addScript('files_sharing', 'public');
 				OCP\Util::addScript('files', 'fileactions');
-				$tmpl = new OCP\Template('files_sharing', 'public', 'guest');
+				$tmpl = new OCP\Template('files_sharing', 'public', 'base');
+				$tmpl->assign('details', $uidOwner.' shared the file '.basename($path).' with you');
 				$tmpl->assign('owner', $uidOwner);
 				$tmpl->assign('name', basename($path));
 				// Show file list
diff --git a/apps/files_sharing/templates/authenticate.php b/apps/files_sharing/templates/authenticate.php
index 41064d5146..9695caebf1 100644
--- a/apps/files_sharing/templates/authenticate.php
+++ b/apps/files_sharing/templates/authenticate.php
@@ -1,4 +1,4 @@
-<form action="index.php" method="post">
+<form action="<?php echo $_['URL']; ?>" method="post">
 	<fieldset>
 		<p>
 			<label for="password" class="infield"><?php echo $l->t('Password'); ?></label>
diff --git a/apps/files_sharing/templates/public.php b/apps/files_sharing/templates/public.php
index 065818c220..36e159dafe 100755
--- a/apps/files_sharing/templates/public.php
+++ b/apps/files_sharing/templates/public.php
@@ -2,12 +2,16 @@
 <input type="hidden" name="downloadURL" value="<?php echo $_['downloadURL'] ?>" id="downloadURL">
 <input type="hidden" name="filename" value="<?php echo $_['filename'] ?>" id="filename">
 <input type="hidden" name="mimetype" value="<?php echo $_['mimetype'] ?>" id="mimetype">
+<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>
+	<div class="header-right">
+		<span id="details"><?php echo $_['details']; ?></span>
+		<a href="<?php echo $_['downloadURL']; ?>" id="download"><img class="svg" alt="Download" src="<?php echo OCP\image_path("core", "actions/download.svg"); ?>" /><?php echo $l->t('Download')?></a>
+	</div>
+</div></header>
 <div id="preview">
-	<p><?php echo $_['owner']; ?> shared the file <?php echo $_['name'] ?> with you</p>
-</div>
-<div id="content">
 	<?php if (substr($_['mimetype'], 0 , strpos($_['mimetype'], '/')) == 'image'): ?>
 		<img src="<?php echo $_['downloadURL']; ?>" />
 	<?php endif; ?>
 </div>
-<a href="<?php echo $_['downloadURL']; ?>">Download</a>
\ No newline at end of file
+<footer><p class="info"><a href="http://owncloud.org/">ownCloud</a> &ndash; <?php echo $l->t('web services under your control'); ?></p></footer>
\ No newline at end of file
diff --git a/core/templates/layout.base.php b/core/templates/layout.base.php
new file mode 100644
index 0000000000..bfd23a9ce9
--- /dev/null
+++ b/core/templates/layout.base.php
@@ -0,0 +1,37 @@
+<!DOCTYPE html>
+<html>
+	<head>
+		<title>ownCloud</title>
+		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+		<link rel="shortcut icon" href="<?php echo image_path('', 'favicon.png'); ?>" /><link rel="apple-touch-icon-precomposed" href="<?php echo image_path('', 'favicon-touch.png'); ?>" />
+		<?php if (!empty(OC_Util::$core_styles)): ?>
+			<link rel="stylesheet" href="<?php echo OC_Helper::linkToRemote('core.css', false) ?>" type="text/css" media="screen" />
+		<?php endif ?>
+		<?php foreach ($_['cssfiles'] as $cssfile): ?>
+			<link rel="stylesheet" href="<?php echo $cssfile; ?>" type="text/css" media="screen" />
+		<?php endforeach; ?>
+		<script type="text/javascript">
+			var oc_webroot = '<?php echo OC::$WEBROOT; ?>';
+			var oc_appswebroots = <?php echo $_['apps_paths'] ?>;
+		</script>
+		<?php if (!empty(OC_Util::$core_scripts)): ?>
+			<script type="text/javascript" src="<?php echo OC_Helper::linkToRemote('core.js', false) ?>"></script>
+		<?php endif ?>
+		<?php foreach ($_['jsfiles'] as $jsfile): ?>
+			<script type="text/javascript" src="<?php echo $jsfile; ?>"></script>
+		<?php endforeach; ?>
+		<?php foreach ($_['headers'] as $header): ?>
+			<?php
+				echo '<'.$header['tag'].' ';
+				foreach ($header['attributes'] as $name => $value) {
+					echo "$name='$value' ";
+				};
+				echo '/>';
+			?>
+		<?php endforeach; ?>
+	</head>
+
+	<body>
+		<?php echo $_['content']; ?>
+	</body>
+</html>
diff --git a/lib/templatelayout.php b/lib/templatelayout.php
index 588a784599..18fd23aac9 100644
--- a/lib/templatelayout.php
+++ b/lib/templatelayout.php
@@ -29,14 +29,16 @@ class OC_TemplateLayout extends OC_Template {
 					break;
 				}
 			}
-		}else{
-			parent::__construct( 'core', 'layout.guest' );
+		} else if ($renderas == 'guest') {
+			parent::__construct('core', 'layout.guest');
+		} else {
+			parent::__construct('core', 'layout.base');
 		}
 
 		$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
@@ -63,7 +65,7 @@ class OC_TemplateLayout extends OC_Template {
 			foreach(OC::$APPSROOTS as $app_root) {
 				if($root == $app_root['path']) {
 					$in_root = true;
-          break;
+					break;
 				}
 			}
 

From 8be8f6fff2d3456e2f2bd928d40f2e8347f7128b Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Wed, 29 Aug 2012 18:15:53 +0200
Subject: [PATCH 0983/1224] LDAP: Remove unnecessary debug output, fixes a
 Notice

---
 apps/user_ldap/lib/access.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php
index a1206de828..9abbd91c17 100644
--- a/apps/user_ldap/lib/access.php
+++ b/apps/user_ldap/lib/access.php
@@ -270,7 +270,6 @@ abstract class Access {
 		//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(($isUser && !\OCP\User::userExists($ldapname)) || (!$isUser && !\OC_Group::groupExists($ldapname))) {
 			if($this->mapComponent($dn, $ldapname, $isUser)) {
-				\OCP\Util::writeLog('user_ldap', 'Username '.ldapname.' OK.', \OCP\Util::DEBUG);
 				return $ldapname;
 			}
 		}

From 741a21292ed73a9b3b9e11633afb00e1725dcf74 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Wed, 29 Aug 2012 19:11:32 +0200
Subject: [PATCH 0984/1224] LDAP: fix potential infinite loop introduced with
 4c4aa92eef858a2a96bb5676304acbcaafaa56f2, as side effect optimize
 groupExists-method.

---
 apps/user_ldap/group_ldap.php | 21 ++++++++++++++++++++-
 apps/user_ldap/lib/access.php | 14 --------------
 2 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/apps/user_ldap/group_ldap.php b/apps/user_ldap/group_ldap.php
index b29ebe30c5..aac3ed7891 100644
--- a/apps/user_ldap/group_ldap.php
+++ b/apps/user_ldap/group_ldap.php
@@ -232,7 +232,26 @@ class GROUP_LDAP extends lib\Access implements \OCP\GroupInterface {
 	 * @return bool
 	 */
 	public function groupExists($gid){
-		return in_array($gid, $this->getGroups());
+		if($this->connection->isCached('groupExists'.$gid)) {
+			return $this->connection->getFromCache('groupExists'.$gid);
+		}
+
+		//getting dn, if false the group does not exist. If dn, it may be mapped only, requires more checking.
+		$dn = $this->username2dn($gid);
+		if(!$dn) {
+			$this->connection->writeToCache('groupExists'.$gid, false);
+			return false;
+		}
+
+		//if group really still exists, we will be able to read its objectclass
+		$objcs = $this->readAttribute($dn, 'objectclass');
+		if(!$objcs || empty($objcs)) {
+			$this->connection->writeToCache('groupExists'.$gid, false);
+			return false;
+		}
+
+		$this->connection->writeToCache('groupExists'.$gid, true);
+		return true;
 	}
 
 	/**
diff --git a/apps/user_ldap/lib/access.php b/apps/user_ldap/lib/access.php
index 9abbd91c17..089548a69b 100644
--- a/apps/user_ldap/lib/access.php
+++ b/apps/user_ldap/lib/access.php
@@ -137,20 +137,6 @@ abstract class Access {
 		$dn = $this->ocname2dn($name, true);
 		if($dn) {
 			return $dn;
-		} else {
-			//fallback: user is not mapped
-			$filter = $this->combineFilterWithAnd(array(
-				$this->connection->ldapUserFilter,
-				$this->connection->ldapUserDisplayName . '=' . $name,
-			));
-			$result = $this->searchUsers($filter, 'dn');
-			if(isset($result[0]['dn'])) {
-				//try mapping, if names equalize return DN
-				$uid = $this->dn2username($result[0]['dn']);
-				if($uid == $name) {
-					return $result[0]['dn'];
-				}
-			}
 		}
 
 		return false;

From 224e55e59091d10c6bb3b6f8bf7bf05c5ff6999d Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Wed, 29 Aug 2012 19:13:38 +0200
Subject: [PATCH 0985/1224] LDAP: fix debug message with undefined variable

---
 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 4224ee9d7e..aff519226c 100644
--- a/apps/user_ldap/lib/jobs.php
+++ b/apps/user_ldap/lib/jobs.php
@@ -113,7 +113,7 @@ class Jobs {
 			WHERE `owncloudname` = ?
 		');
 		foreach($removedGroups as $removedGroup) {
-			\OCP\Util::writeLog('user_ldap', 'bgJ "updateGroups" – group "'.$createdGroup.'" was removed.', \OCP\Util::INFO);
+			\OCP\Util::writeLog('user_ldap', 'bgJ "updateGroups" – group "'.$removedGroup.'" was removed.', \OCP\Util::INFO);
 		    $query->execute(array($removedGroup));
 		}
 		\OCP\Util::writeLog('user_ldap', 'bgJ "updateGroups" – FINISHED dealing with removed groups.', \OCP\Util::DEBUG);

From 26501a0bc8c7c4fa8343f5fa0c6e42bae1c7f298 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Wed, 29 Aug 2012 13:58:39 -0400
Subject: [PATCH 0986/1224] Delete old link if user sets a password

---
 core/js/share.js     |  2 --
 lib/public/share.php | 10 ++++++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/core/js/share.js b/core/js/share.js
index cc862b1c5f..59ff25ee76 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -417,8 +417,6 @@ $(document).ready(function() {
 		if (event.keyCode == 13) {
 			var itemType = $('#dropdown').data('item-type');
 			var itemSource = $('#dropdown').data('item-source');
-			// TODO Do this internally
-			OC.Share.unshare(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, '');
 			OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, $(this).val(), OC.Share.PERMISSION_READ);
 		}
 	});
diff --git a/lib/public/share.php b/lib/public/share.php
index 165e3df452..91b1bffc2d 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -229,6 +229,16 @@ class Share {
 			$shareWith['users'] = array_diff(\OC_Group::usersInGroup($group), array($uidOwner));
 		} else if ($shareType === self::SHARE_TYPE_LINK) {
 			if (\OC_Appconfig::getValue('core', 'shareapi_allow_links', 'yes') == 'yes') {
+				if ($checkExists = self::getItems($itemType, $itemSource, self::SHARE_TYPE_LINK, null, $uidOwner, self::FORMAT_NONE, null, 1)) {
+					// If password is set delete the old link
+					if (isset($shareWith)) {
+						self::delete($checkExists['id']);
+					} else {
+						$message = 'Sharing '.$itemSource.' failed, because this item is already shared with a link';
+						\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
+						throw new \Exception($message);
+					}
+				}
 				// Generate hash of password - same method as user passwords
 				if (isset($shareWith)) {
 					$forcePortable = (CRYPT_BLOWFISH != 1);

From 0788c6e968f98647fe8bb8961cc2d250531ce283 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Wed, 29 Aug 2012 14:01:09 -0400
Subject: [PATCH 0987/1224] Hide link password controls if link is removed

---
 core/js/share.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/core/js/share.js b/core/js/share.js
index 59ff25ee76..7d2daffb29 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -285,6 +285,8 @@ OC.Share={
 	},
 	hideLink:function() {
 		$('#linkText').hide('blind');
+		$('#showPassword').hide();
+		$('#linkPass').hide();
 	},
 	dirname:function(path) {
 		return path.replace(/\\/g,'/').replace(/\/[^\/]*$/, '');

From 76bc4753e9bd2698415b067108806d82ac56b663 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Wed, 29 Aug 2012 14:06:33 -0400
Subject: [PATCH 0988/1224] Fix displaying if a link is password protected

---
 core/js/share.js | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/core/js/share.js b/core/js/share.js
index 7d2daffb29..fa412c7acc 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -282,6 +282,10 @@ OC.Share={
 		$('#linkText').val(link);
 		$('#linkText').show('blind');
 		$('#showPassword').show();
+		if (password.length > 0) {
+			$('#linkPass').show('blind');
+			$('#linkPassText').attr('placeholder', 'Password protected');
+		}
 	},
 	hideLink:function() {
 		$('#linkText').hide('blind');
@@ -419,7 +423,10 @@ $(document).ready(function() {
 		if (event.keyCode == 13) {
 			var itemType = $('#dropdown').data('item-type');
 			var itemSource = $('#dropdown').data('item-source');
-			OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, $(this).val(), OC.Share.PERMISSION_READ);
+			OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, $(this).val(), OC.Share.PERMISSION_READ, function() {
+				$('#linkPassText').val('');
+				$('#linkPassText').attr('placeholder', 'Password protected');
+			});
 		}
 	});
 

From 52f2e7112ea985203eca16aa787bd75a7cf92194 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Wed, 29 Aug 2012 08:38:33 +0200
Subject: [PATCH 0989/1224] Whitespace fixes in lib

---
 lib/appconfig.php                 |  6 +--
 lib/archive.php                   |  2 +-
 lib/archive/tar.php               |  6 +--
 lib/archive/zip.php               |  2 +-
 lib/backgroundjob/worker.php      | 10 ++--
 lib/base.php                      |  4 +-
 lib/cache.php                     |  4 +-
 lib/connector/sabre/auth.php      |  2 +-
 lib/connector/sabre/directory.php |  1 -
 lib/connector/sabre/file.php      |  1 -
 lib/connector/sabre/locks.php     |  6 +--
 lib/connector/sabre/node.php      | 10 ++--
 lib/db.php                        | 63 ++++++++++++------------
 lib/eventsource.php               |  2 +-
 lib/filecache.php                 | 22 ++++-----
 lib/filecache/cached.php          |  2 +-
 lib/filecache/update.php          |  4 +-
 lib/fileproxy.php                 |  6 +--
 lib/fileproxy/quota.php           |  8 ++--
 lib/files.php                     |  4 +-
 lib/filestorage/common.php        | 62 ++++++++++++------------
 lib/filestorage/commontest.php    |  4 +-
 lib/filestorage/local.php         |  4 +-
 lib/filesystem.php                | 40 ++++++++--------
 lib/filesystemview.php            |  8 ++--
 lib/geo.php                       |  2 +-
 lib/group.php                     |  2 +-
 lib/hook.php                      |  1 -
 lib/image.php                     |  8 ++--
 lib/json.php                      |  4 +-
 lib/l10n.php                      | 20 ++++----
 lib/mail.php                      |  8 ++--
 lib/migrate.php                   | 10 ++--
 lib/migration/content.php         | 80 +++++++++++++++----------------
 lib/migration/provider.php        | 18 +++----
 lib/ocs.php                       | 12 ++---
 lib/ocsclient.php                 | 16 +++----
 lib/preferences.php               |  2 +-
 lib/public/app.php                |  6 +--
 lib/public/backgroundjob.php      |  4 +-
 lib/public/config.php             |  2 +-
 lib/public/db.php                 |  2 +-
 lib/public/files.php              |  2 +-
 lib/public/json.php               | 54 ++++++++++-----------
 lib/public/response.php           |  2 +-
 lib/public/template.php           | 10 ++--
 lib/public/user.php               |  2 +-
 lib/search.php                    |  8 ++--
 lib/search/provider.php           |  4 +-
 lib/setup.php                     | 20 ++++----
 lib/subadmin.php                  | 14 +++---
 lib/template.php                  | 10 ++--
 lib/user.php                      |  6 +--
 lib/user/database.php             |  6 +--
 lib/user/http.php                 | 10 ++--
 lib/util.php                      | 18 +++----
 lib/vcategories.php               |  2 +-
 57 files changed, 322 insertions(+), 326 deletions(-)

diff --git a/lib/appconfig.php b/lib/appconfig.php
index 372cded9a5..0e608b540b 100644
--- a/lib/appconfig.php
+++ b/lib/appconfig.php
@@ -100,7 +100,7 @@ class OC_Appconfig{
 			return $default;
 		}
 	}
-	
+
 	/**
 	 * @brief check if a key is set in the appconfig
 	 * @param string $app
@@ -111,7 +111,7 @@ class OC_Appconfig{
 		$exists = self::getKeys( $app );
 		return in_array( $key, $exists );
 	}
-	
+
 	/**
 	 * @brief sets a value in the appconfig
 	 * @param $app app
@@ -163,7 +163,7 @@ class OC_Appconfig{
 
 		return true;
 	}
-	
+
 	/**
 	 * get multiply values, either the app or key can be used as wildcard by setting it to false
 	 * @param app
diff --git a/lib/archive.php b/lib/archive.php
index fabd7cc7a5..5ac4edbfd1 100644
--- a/lib/archive.php
+++ b/lib/archive.php
@@ -28,7 +28,7 @@ abstract class OC_Archive{
 				return new OC_Archive_TAR($path);
 		}
 	}
-	
+
 	abstract function __construct($source);
 	/**
 	 * add an empty folder to the archive
diff --git a/lib/archive/tar.php b/lib/archive/tar.php
index f6efd6d0ec..095362d0cd 100644
--- a/lib/archive/tar.php
+++ b/lib/archive/tar.php
@@ -14,7 +14,7 @@ class OC_Archive_TAR extends OC_Archive{
 	const BZIP=2;
 
 	private $fileList;
-	
+
 	/**
 	 * @var Archive_Tar tar
 	 */
@@ -127,7 +127,7 @@ class OC_Archive_TAR extends OC_Archive{
 		}
 		return null;
 	}
-	
+
 	/**
 	 * get the uncompressed size of a file in the archive
 	 * @param string path
@@ -254,7 +254,7 @@ class OC_Archive_TAR extends OC_Archive{
 			return false;
 		}
 	}
-	
+
 	/**
 	 * remove a file or folder from the archive
 	 * @param string path
diff --git a/lib/archive/zip.php b/lib/archive/zip.php
index c1a5c35738..396b1f6c05 100644
--- a/lib/archive/zip.php
+++ b/lib/archive/zip.php
@@ -12,7 +12,7 @@ class OC_Archive_ZIP extends OC_Archive{
 	 */
 	private $zip=null;
 	private $path;
-	
+
 	function __construct($source){
 		$this->path=$source;
 		$this->zip=new ZipArchive();
diff --git a/lib/backgroundjob/worker.php b/lib/backgroundjob/worker.php
index b4f0429b31..8684e0df11 100644
--- a/lib/backgroundjob/worker.php
+++ b/lib/backgroundjob/worker.php
@@ -22,7 +22,7 @@
 
 /**
  * This class does the dirty work.
- * 
+ *
  * TODO: locking in doAllSteps
  */
 class OC_BackgroundJob_Worker{
@@ -56,7 +56,7 @@ class OC_BackgroundJob_Worker{
 			OC_BackgroundJob_QueuedTask::delete( $task['id'] );
 			call_user_func( array( $task['klass'], $task['method'] ), $task['parameters'] );
 		}
-		
+
 		return true;
 	}
 
@@ -70,7 +70,7 @@ class OC_BackgroundJob_Worker{
 	 */
 	public static function doNextStep(){
 		$laststep = OC_Appconfig::getValue( 'core', 'backgroundjobs_step', 'regular_tasks' );
-		
+
 		if( $laststep == 'regular_tasks' ){
 			// get last app
 			$lasttask = OC_Appconfig::getValue( 'core', 'backgroundjobs_task', '' );
@@ -79,7 +79,7 @@ class OC_BackgroundJob_Worker{
 			$regular_tasks = OC_BackgroundJob_RegularTask::all();
 			ksort( $regular_tasks );
 			$done = false;
-			
+
 			// search for next background job
 			foreach( $regular_tasks as $key => $value ){
 				if( strcmp( $key, $lasttask ) > 0 ){
@@ -112,7 +112,7 @@ class OC_BackgroundJob_Worker{
 				OC_Appconfig::setValue( 'core', 'backgroundjobs_task', '' );
 			}
 		}
-		
+
 		return true;
 	}
 }
diff --git a/lib/base.php b/lib/base.php
index d3f3c5ba1c..0c3ab8527a 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -239,7 +239,7 @@ class OC{
 				OC_Util::addScript( 'backgroundjobs' );
 			}
 		}
-		
+
 		OC_Util::addStyle( "styles" );
 		OC_Util::addStyle( "multiselect" );
 		OC_Util::addStyle( "jquery-ui-1.8.16.custom" );
@@ -473,7 +473,7 @@ class OC{
 		// 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;
diff --git a/lib/cache.php b/lib/cache.php
index 55f189a5da..fed990b5b3 100644
--- a/lib/cache.php
+++ b/lib/cache.php
@@ -38,7 +38,7 @@ class OC_Cache {
 			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 (self::$global_cache_fast) {
 				self::$global_cache = new OC_Cache_Broker(self::$global_cache_fast, self::$global_cache);
@@ -67,7 +67,7 @@ class OC_Cache {
 			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 (self::$user_cache_fast) {
 				self::$user_cache = new OC_Cache_Broker(self::$user_cache_fast, self::$user_cache);
diff --git a/lib/connector/sabre/auth.php b/lib/connector/sabre/auth.php
index 99f696e3a0..8197571e94 100644
--- a/lib/connector/sabre/auth.php
+++ b/lib/connector/sabre/auth.php
@@ -45,4 +45,4 @@ class OC_Connector_Sabre_Auth extends Sabre_DAV_Auth_Backend_AbstractBasic {
 			}
 		}
 	}
-} 
+}
diff --git a/lib/connector/sabre/directory.php b/lib/connector/sabre/directory.php
index cd3ed60292..a750244615 100644
--- a/lib/connector/sabre/directory.php
+++ b/lib/connector/sabre/directory.php
@@ -203,4 +203,3 @@ class OC_Connector_Sabre_Directory extends OC_Connector_Sabre_Node implements Sa
 		return $props;
 	}
 }
-
diff --git a/lib/connector/sabre/file.php b/lib/connector/sabre/file.php
index 9d571fceb0..5bd38240d4 100644
--- a/lib/connector/sabre/file.php
+++ b/lib/connector/sabre/file.php
@@ -126,4 +126,3 @@ class OC_Connector_Sabre_File extends OC_Connector_Sabre_Node implements Sabre_D
 
 	}
 }
-
diff --git a/lib/connector/sabre/locks.php b/lib/connector/sabre/locks.php
index 0ddc8b18d2..a01653d960 100644
--- a/lib/connector/sabre/locks.php
+++ b/lib/connector/sabre/locks.php
@@ -42,7 +42,7 @@ class OC_Connector_Sabre_Locks extends Sabre_DAV_Locks_Backend_Abstract {
 		// pure sql. MySQL's non-standard string concatination prevents us
 		// from doing this though.
 		// NOTE: SQLite requires time() to be inserted directly. That's ugly
-		// but otherwise reading locks from SQLite Databases will return 
+		// 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);
@@ -75,7 +75,7 @@ class OC_Connector_Sabre_Locks extends Sabre_DAV_Locks_Backend_Abstract {
 
 		$stmt = OC_DB::prepare( $query );
 		$result = $stmt->execute( $params );
-		
+
 		$lockList = array();
 		while( $row = $result->fetchRow()){
 
@@ -114,7 +114,7 @@ class OC_Connector_Sabre_Locks extends Sabre_DAV_Locks_Backend_Abstract {
 		foreach($locks as $lock) {
 			if ($lock->token == $lockInfo->token) $exists = true;
 		}
-	
+
 		if ($exists) {
 			$query = OC_DB::prepare( 'UPDATE `*PREFIX*locks` SET `owner` = ?, `timeout` = ?, `scope` = ?, `depth` = ?, `uri` = ?, `created` = ? WHERE `userid` = ? AND `token` = ?' );
 			$result = $query->execute( array($lockInfo->owner,$lockInfo->timeout,$lockInfo->scope,$lockInfo->depth,$uri,$lockInfo->created,OC_User::getUser(),$lockInfo->token));
diff --git a/lib/connector/sabre/node.php b/lib/connector/sabre/node.php
index b9bf474a04..afcabe7bef 100644
--- a/lib/connector/sabre/node.php
+++ b/lib/connector/sabre/node.php
@@ -80,9 +80,9 @@ abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IPr
 		$oldPath = $this->path;
 
 		OC_Filesystem::rename($this->path,$newPath);
-	
+
 		$this->path = $newPath;
-		
+
 		$query = OC_DB::prepare( 'UPDATE `*PREFIX*properties` SET `propertypath` = ? WHERE `userid` = ? AND `propertypath` = ?' );
 		$query->execute( array( $newPath,OC_User::getUser(), $oldPath ));
 
@@ -123,8 +123,8 @@ abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IPr
 
 	}
 
-	/** 
-	 *  sets the last modification time of the file (mtime) to the value given 
+	/**
+	 *  sets the last modification time of the file (mtime) to the value given
 	 *  in the second parameter or to now if the second param is empty.
 	 *  Even if the modification time is set to a custom value the access time is set to now.
 	 */
@@ -195,7 +195,7 @@ abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IPr
 		if(count($properties) == 0){
 			return $this->property_cache;
 		}
-		
+
 		$props = array();
 		foreach($properties as $property) {
 			if (isset($this->property_cache[$property])) $props[$property] = $this->property_cache[$property];
diff --git a/lib/db.php b/lib/db.php
index 4214451c85..ecaf9e37ee 100644
--- a/lib/db.php
+++ b/lib/db.php
@@ -27,7 +27,7 @@
 class OC_DB {
 	const BACKEND_PDO=0;
 	const BACKEND_MDB2=1;
-	
+
 	static private $connection; //the prefered connection to use, either PDO or MDB2
 	static private $backend=null;
 	static private $MDB2=false;
@@ -55,7 +55,7 @@ class OC_DB {
 		}
 		return self::BACKEND_MDB2;
 	}
-	
+
 	/**
 	 * @brief connects to the database
 	 * @returns true if connection can be established or nothing (die())
@@ -104,7 +104,7 @@ class OC_DB {
 		}
 		$opts = array();
 		$datadir=OC_Config::getValue( "datadirectory", OC::$SERVERROOT.'/data' );
-		
+
 		// do nothing if the connection already has been established
 		if(!self::$PDO){
 			// Add the dsn according to the database type
@@ -158,7 +158,7 @@ class OC_DB {
 		}
 		return true;
 	}
-	
+
 	/**
 	 * connect to the database using mdb2
 	 */
@@ -234,10 +234,10 @@ class OC_DB {
 					}
 					break;
 			}
-			
+
 			// Try to establish connection
 			self::$MDB2 = MDB2::factory( $dsn, $options );
-			
+
 			// Die if we could not connect
 			if( PEAR::isError( self::$MDB2 )){
 				echo( '<b>can not connect to database, using '.$type.'. ('.self::$MDB2->getUserInfo().')</center>');
@@ -245,11 +245,11 @@ class OC_DB {
 				OC_Log::write('core',self::$MDB2->getMessage(),OC_Log::FATAL);
 				die( $error );
 			}
-			
+
 			// We always, really always want associative arrays
 			self::$MDB2->setFetchMode(MDB2_FETCHMODE_ASSOC);
 		}
-		
+
 		// we are done. great!
 		return true;
 	}
@@ -262,7 +262,7 @@ class OC_DB {
 	 * SQL query via MDB2 prepare(), needs to be execute()'d!
 	 */
 	static public function prepare( $query , $limit=null, $offset=null ){
-		
+
 		if (!is_null($limit) && $limit != -1) {
 			if (self::$backend == self::BACKEND_MDB2) {
 				//MDB2 uses or emulates limits & offset internally
@@ -394,7 +394,7 @@ class OC_DB {
 
 		// read file
 		$content = file_get_contents( $file );
-		
+
 		// Make changes and save them to an in-memory file
 		$file2 = 'static://db_scheme';
 		$content = str_replace( '*dbname*', $CONFIG_DBNAME, $content );
@@ -414,7 +414,7 @@ class OC_DB {
 
 		// Try to create tables
 		$definition = self::$schema->parseDatabaseDefinitionFile( $file2 );
-		
+
 		//clean up memory
 		unlink( $file2 );
 
@@ -427,7 +427,7 @@ class OC_DB {
 			$oldname = $definition['name'];
 			$definition['name']=OC_Config::getValue( "dbuser", $oldname );
 		}
-		
+
 		$ret=self::$schema->createDatabase( $definition );
 
 		// Die in case something went wrong
@@ -438,7 +438,7 @@ class OC_DB {
 
 		return true;
 	}
-	
+
 	/**
 	 * @brief update the database scheme
 	 * @param $file file to read structure from
@@ -451,7 +451,7 @@ class OC_DB {
 
 		// read file
 		$content = file_get_contents( $file );
-		
+
 		$previousSchema = self::$schema->getDefinitionFromDatabase();
 		if (PEAR::isError($previousSchema)) {
 			$error = $previousSchema->getMessage();
@@ -475,10 +475,10 @@ class OC_DB {
 		 */
 		file_put_contents( $file2, $content );
 		$op = self::$schema->updateDatabase($file2, $previousSchema, array(), false);
-		
+
 		//clean up memory
 		unlink( $file2 );
-		
+
 		if (PEAR::isError($op)) {
 			$error = $op->getMessage();
 			$detail = $op->getDebugInfo();
@@ -528,7 +528,7 @@ class OC_DB {
 			self::$prefix=OC_Config::getValue( "dbtableprefix", "oc_" );
 		}
 		$prefix = self::$prefix;
-		
+
 		// differences in escaping of table names ('`' for mysql) and getting the current timestamp
 		if( $type == 'sqlite' || $type == 'sqlite3' ){
 			$query = str_replace( '`', '"', $query );
@@ -547,7 +547,7 @@ class OC_DB {
 
 		return $query;
 	}
-	
+
 	/**
 	 * @brief drop a table
 	 * @param string $tableNamme the table to drop
@@ -557,7 +557,7 @@ class OC_DB {
 		self::$MDB2->loadModule('Manager');
 		self::$MDB2->dropTable($tableName);
 	}
-	
+
 	/**
 	 * remove all tables defined in a database structure xml file
 	 * @param string $file the xml file describing the tables
@@ -578,7 +578,7 @@ class OC_DB {
 
 		// get the tables
 		$definition = self::$schema->parseDatabaseDefinitionFile( $file2 );
-		
+
 		// Delete our temporary file
 		unlink( $file2 );
 		$tables=array_keys($definition['tables']);
@@ -586,7 +586,7 @@ class OC_DB {
 			self::dropTable($table);
 		}
 	}
-	
+
 	/**
 	 * @brief replaces the owncloud tables with a new set
 	 * @param $file string path to the MDB2 xml db export file
@@ -596,20 +596,20 @@ class OC_DB {
 	 	self::beginTransaction();
 	 	// Delete the old tables
 	 	self::removeDBStructure( OC::$SERVERROOT . '/db_structure.xml' );
-	 	
+
 	 	foreach($apps as $app){
 	 		$path = OC_App::getAppPath($app).'/appinfo/database.xml';
 	 		if(file_exists($path)){
-	 			self::removeDBStructure( $path );	
+	 			self::removeDBStructure( $path );
 	 		}
 	 	}
-	 	
+
 	 	// Create new tables
 	 	self::createDBFromStructure( $file );
 	 	self::commit();
-	 	
+
 	 }
-	
+
 	/**
 	 * Start a transaction
 	 */
@@ -660,7 +660,7 @@ class PDOStatementWrapper{
 	public function __construct($statement){
 		$this->statement=$statement;
 	}
-	
+
 	/**
 	 * make execute return the result instead of a bool
 	 */
@@ -677,7 +677,7 @@ class PDOStatementWrapper{
 			return false;
 		}
 	}
-	
+
 	/**
 	 * provide numRows
 	 */
@@ -690,21 +690,21 @@ class PDOStatementWrapper{
 			return $this->statement->rowCount();
 		}
 	}
-	
+
 	/**
 	 * provide an alias for fetch
 	 */
 	public function fetchRow(){
 		return $this->statement->fetch();
 	}
-	
+
 	/**
 	 * pass all other function directly to the PDOStatement
 	 */
 	public function __call($name,$arguments){
 		return call_user_func_array(array($this->statement,$name),$arguments);
 	}
-	
+
 	/**
 	 * Provide a simple fetchOne.
 	 * fetch single column from the next row
@@ -714,4 +714,3 @@ class PDOStatementWrapper{
 		return $this->statement->fetchColumn($colnum);
 	}
 }
-
diff --git a/lib/eventsource.php b/lib/eventsource.php
index 95af2e471b..45a20806b6 100644
--- a/lib/eventsource.php
+++ b/lib/eventsource.php
@@ -30,7 +30,7 @@
 class OC_EventSource{
 	private $fallback;
 	private $fallBackId=0;
-	
+
 	public function __construct(){
 		@ob_end_clean();
 		header('Cache-Control: no-cache');
diff --git a/lib/filecache.php b/lib/filecache.php
index e85d6747f9..364b908bcf 100644
--- a/lib/filecache.php
+++ b/lib/filecache.php
@@ -76,14 +76,14 @@ class OC_FileCache{
 			self::update($id,$data);
 			return;
 		}
-		
+
 		// add parent directory to the file cache if it does not exist yet.
 		if ($parent == -1 && $fullpath != $root) {
 			$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
 			OC_FileCache_Cached::$savedData[$fullpath]=$data;
 			return;
@@ -136,7 +136,7 @@ class OC_FileCache{
 			$queryParts[]='`mimepart`=?';
 		}
 		$arguments[]=$id;
-		
+
 		$sql = 'UPDATE `*PREFIX*fscache` SET '.implode(' , ',$queryParts).' WHERE `id`=?';
 		$query=OC_DB::prepare($sql);
 		$result=$query->execute($arguments);
@@ -192,14 +192,14 @@ class OC_FileCache{
 		}
 		$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.'/%'));
 
 		OC_Cache::remove('fileid/'.$root.$path);
 	}
-	
+
 	/**
 	 * return array of filenames matching the querty
 	 * @param string $query
@@ -277,14 +277,14 @@ class OC_FileCache{
 		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($fullPath)));
 		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)){
 			$id=$result['id'];
@@ -294,10 +294,10 @@ class OC_FileCache{
 		if($cache=OC_Cache::getUserCache(true)){
 			$cache->set('fileid/'.$fullPath,$id);
 		}
-		
+
 		return $id;
 	}
-	
+
 	/**
 	 * get the file path from the id, relative to the home folder of the user
 	 * @param int id
@@ -331,7 +331,7 @@ class OC_FileCache{
 			return self::getId(dirname($path),'');
 		}
 	}
-	
+
 	/**
 	 * adjust the size of the parent folders
 	 * @param string $path
@@ -390,7 +390,7 @@ class OC_FileCache{
 				}
 			}
 		}
-		
+
 		OC_FileCache_Update::cleanFolder($path,$root);
 		self::increaseSize($path,$totalSize,$root);
 	}
diff --git a/lib/filecache/cached.php b/lib/filecache/cached.php
index 95cc0ac300..505f1a5e2a 100644
--- a/lib/filecache/cached.php
+++ b/lib/filecache/cached.php
@@ -12,7 +12,7 @@
  */
 class OC_FileCache_Cached{
 	public static $savedData=array();
-	
+
 	public static function get($path,$root=false){
 		if($root===false){
 			$root=OC_Filesystem::getRoot();
diff --git a/lib/filecache/update.php b/lib/filecache/update.php
index 0b5ff8e244..7b5f18fe5c 100644
--- a/lib/filecache/update.php
+++ b/lib/filecache/update.php
@@ -42,7 +42,7 @@ class OC_FileCache_Update{
 			return true;
 		}
 	}
-	
+
 	/**
 	 * delete non existing files from the cache
 	 */
@@ -148,7 +148,7 @@ class OC_FileCache_Update{
 		}
 
 		$mimetype=$view->getMimeType($path);
-		
+
 		$size=0;
 		$cached=OC_FileCache_Cached::get($path,$root);
 		$cachedSize=isset($cached['size'])?$cached['size']:0;
diff --git a/lib/fileproxy.php b/lib/fileproxy.php
index ec04faa9bc..a1c79874bf 100644
--- a/lib/fileproxy.php
+++ b/lib/fileproxy.php
@@ -43,7 +43,7 @@
 class OC_FileProxy{
 	private static $proxies=array();
 	public static $enabled=true;
-	
+
 	/**
 	 * fallback function when a proxy operation is not implemented
 	 * @param string $function the name of the proxy operation
@@ -58,7 +58,7 @@ class OC_FileProxy{
 			return $arguments[1];
 		}
 	}
-	
+
 	/**
 	 * register a proxy to be used
 	 * @param OC_FileProxy $proxy
@@ -66,7 +66,7 @@ class OC_FileProxy{
 	public static function register($proxy){
 		self::$proxies[]=$proxy;
 	}
-	
+
 	public static function getProxies($operation){
 		$proxies=array();
 		foreach(self::$proxies as $proxy){
diff --git a/lib/fileproxy/quota.php b/lib/fileproxy/quota.php
index 7316224cc6..4c6261fc51 100644
--- a/lib/fileproxy/quota.php
+++ b/lib/fileproxy/quota.php
@@ -27,7 +27,7 @@
 
 class OC_FileProxy_Quota extends OC_FileProxy{
 	private $userQuota=-1;
-	
+
 	/**
 	 * get the quota for the current user
 	 * @return int
@@ -46,9 +46,9 @@ class OC_FileProxy_Quota extends OC_FileProxy{
 			$this->userQuota=OC_Helper::computerFileSize($userQuota);
 		}
 		return $this->userQuota;
-		
+
 	}
-	
+
 	/**
 	 * get the free space in the users home folder
 	 * @return int
@@ -69,7 +69,7 @@ class OC_FileProxy_Quota extends OC_FileProxy{
 		}
 		return $totalSpace-$usedSpace;
 	}
-	
+
 	public function postFree_space($path,$space){
 		$free=$this->getFreeSpace();
 		if($free==0){
diff --git a/lib/files.php b/lib/files.php
index 1a1fffa0a5..0c71f6e5e4 100644
--- a/lib/files.php
+++ b/lib/files.php
@@ -406,9 +406,9 @@ class OC_Files {
 		//check for write permissions
 		if(is_writable(OC::$SERVERROOT.'/.htaccess')) {
 			file_put_contents(OC::$SERVERROOT.'/.htaccess', $htaccess);
-			return OC_Helper::computerFileSize($size);	
+			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;
 	}
 
diff --git a/lib/filestorage/common.php b/lib/filestorage/common.php
index c829be62f7..e2828e5617 100644
--- a/lib/filestorage/common.php
+++ b/lib/filestorage/common.php
@@ -21,11 +21,11 @@
 */
 
 /**
- * Storage backend class for providing common filesystem operation methods 
+ * 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 
+ * 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
@@ -115,71 +115,71 @@ abstract class OC_Filestorage_Common extends OC_Filestorage {
 	 * @param $empty Flag indicating whether directory will be emptied
 	 * @returns true/false
 	 *
-	 * @note By default the directory specified by $directory will be 
+	 * @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)){
diff --git a/lib/filestorage/commontest.php b/lib/filestorage/commontest.php
index b5126a407b..4d06e4fa32 100644
--- a/lib/filestorage/commontest.php
+++ b/lib/filestorage/commontest.php
@@ -31,11 +31,11 @@ class OC_Filestorage_CommonTest extends OC_Filestorage_Common{
 	 * @var OC_FileStorage_Local
 	 */
 	private $storage;
-	
+
 	public function __construct($params){
 		$this->storage=new OC_Filestorage_Local($params);
 	}
-	
+
 	public function mkdir($path){
 		return $this->storage->mkdir($path);
 	}
diff --git a/lib/filestorage/local.php b/lib/filestorage/local.php
index 22d17469df..b19205f45b 100644
--- a/lib/filestorage/local.php
+++ b/lib/filestorage/local.php
@@ -61,7 +61,7 @@ class OC_Filestorage_Local extends OC_Filestorage_Common{
 		return filemtime($this->datadir.$path);
 	}
 	public function touch($path, $mtime=null){
-		// sets the modification time of the file to the given value. 
+		// sets the modification time of the file to the given value.
 		// If mtime is nil the current time is set.
 		// note that the access time of the file always changes to the current time.
 		if(!is_null($mtime)){
@@ -72,7 +72,7 @@ class OC_Filestorage_Local extends OC_Filestorage_Common{
 		if( $result ) {
 			clearstatcache( true, $this->datadir.$path );
 		}
-		
+
 		return $result;
 	}
 	public function file_get_contents($path){
diff --git a/lib/filesystem.php b/lib/filesystem.php
index fbb0290045..327329f9d9 100644
--- a/lib/filesystem.php
+++ b/lib/filesystem.php
@@ -3,22 +3,22 @@
 /**
 * ownCloud
 *
-* @author Frank Karlitschek 
-* @copyright 2012 Frank Karlitschek frank@owncloud.org 
-* 
+* @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 
+* 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 
+*
+* 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/>.
-* 
+*
 */
 
 
@@ -193,7 +193,7 @@ class OC_Filesystem{
 			return OC_Filesystem::$storages[$mountpoint];
 		}
 	}
-	
+
 	static public function init($root){
 		if(self::$defaultInstance){
 			return false;
@@ -237,7 +237,7 @@ class OC_Filesystem{
 				}
 			}
 		}
-		
+
 		self::$loaded=true;
 	}
 
@@ -257,14 +257,14 @@ class OC_Filesystem{
 	static public function getView(){
 		return self::$defaultInstance;
 	}
-	
+
 	/**
 	 * tear down the filesystem, removing all storage providers
 	 */
 	static public function tearDown(){
 		self::$storages=array();
 	}
-	
+
 	/**
 	* create a new storage of a specific type
 	* @param  string  type
@@ -284,7 +284,7 @@ class OC_Filesystem{
 			return false;
 		}
 	}
-	
+
 	/**
 	* change the root to a fake root
 	* @param  string  fakeRoot
@@ -326,7 +326,7 @@ class OC_Filesystem{
 		}
 		self::$mounts[$mountpoint]=array('class'=>$class,'arguments'=>$arguments);
 	}
-	
+
 	/**
 	* return the path to a local version of the file
 	* we need this because we can't know if a file is stored local or not from outside the filestorage and for some purposes a local file is needed
@@ -343,7 +343,7 @@ class OC_Filesystem{
 	static public function getLocalFolder($path){
 		return self::$defaultInstance->getLocalFolder($path);
 	}
-	
+
 	/**
 	* return path to file which reflects one visible in browser
 	* @param string path
@@ -357,7 +357,7 @@ class OC_Filesystem{
 		}
 		return $newpath;
 	}
-	
+
 	/**
 	 * check if the requested path is valid
 	 * @param string path
@@ -372,7 +372,7 @@ class OC_Filesystem{
 		}
 		return true;
 	}
-	
+
 	/**
 	 * checks if a file is blacklsited for storage in the filesystem
 	 * Listens to write and rename hooks
@@ -392,7 +392,7 @@ class OC_Filesystem{
 			}
 		}
 	}
-	
+
 	/**
 	 * following functions are equivilent to their php buildin equivilents for arguments/return values.
 	 */
@@ -496,11 +496,11 @@ class OC_Filesystem{
 	static public function hash($type,$path, $raw = false){
 		return self::$defaultInstance->hash($type,$path, $raw);
 	}
-	
+
 	static public function free_space($path='/'){
 		return self::$defaultInstance->free_space($path);
 	}
-	
+
 	static public function search($query){
 		return OC_FileCache::search($query);
 	}
diff --git a/lib/filesystemview.php b/lib/filesystemview.php
index a888e5340e..461a026256 100644
--- a/lib/filesystemview.php
+++ b/lib/filesystemview.php
@@ -56,7 +56,7 @@ class OC_FilesystemView {
 		}
 		return $this->fakeRoot.$path;
 	}
-	
+
 	/**
 	* change the root to a fake toor
 	* @param  string  fakeRoot
@@ -325,7 +325,7 @@ class OC_FilesystemView {
 		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;
 			}
@@ -352,7 +352,7 @@ class OC_FilesystemView {
 					$storage1 = $this->getStorage($path1);
 					$storage1->unlink($this->getInternalPath($path1.$postFix1));
 					$result = $count>0;
-				} 
+				}
 				OC_Hook::emit(
 					OC_Filesystem::CLASSNAME,
 					OC_Filesystem::signal_post_rename,
@@ -373,7 +373,7 @@ class OC_FilesystemView {
 		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;
 			}
diff --git a/lib/geo.php b/lib/geo.php
index a967ab28a9..964605b1c1 100644
--- a/lib/geo.php
+++ b/lib/geo.php
@@ -12,7 +12,7 @@ class OC_Geo{
 	 * @param (string) $longitude - Longitude
 	 * @return (string) $timezone - closest timezone
 	 */
-	public static function timezone($latitude, $longitude){	
+	public static function timezone($latitude, $longitude){
 		$alltimezones = DateTimeZone::listIdentifiers();
 		$variances = array();
 		//calculate for all timezones the system know
diff --git a/lib/group.php b/lib/group.php
index 72cf5dc89a..dd70a94eb0 100644
--- a/lib/group.php
+++ b/lib/group.php
@@ -271,7 +271,7 @@ class OC_Group {
 		}
 		return $users;
 	}
-	
+
 	/**
 	 * @brief get a list of all users in several groups
 	 * @param array $gids
diff --git a/lib/hook.php b/lib/hook.php
index b53755310e..ee390d6cd5 100644
--- a/lib/hook.php
+++ b/lib/hook.php
@@ -83,4 +83,3 @@ class OC_Hook{
 		}
 	}
 }
- 
diff --git a/lib/image.php b/lib/image.php
index 90c64320a7..e87cf9e16d 100644
--- a/lib/image.php
+++ b/lib/image.php
@@ -383,7 +383,7 @@ class OC_Image {
 	/**
 	* @brief Loads an image from an open file handle.
 	* It is the responsibility of the caller to position the pointer at the correct place and to close the handle again.
-	* @param $handle 
+	* @param $handle
 	* @returns An image resource or false on error
 	*/
 	public function loadFromFileHandle($handle) {
@@ -468,7 +468,7 @@ class OC_Image {
 				break;
 			*/
 			default:
-			
+
 				// this is mostly file created from encrypted file
 				$this->resource = imagecreatefromstring(\OC_Filesystem::file_get_contents(\OC_Filesystem::getLocalPath($imagepath)));
 				$itype = IMAGETYPE_PNG;
@@ -534,7 +534,7 @@ class OC_Image {
 		$width_orig=imageSX($this->resource);
 		$height_orig=imageSY($this->resource);
 		$ratio_orig = $width_orig/$height_orig;
-		
+
 		if ($ratio_orig > 1) {
 			$new_height = round($maxsize/$ratio_orig);
 			$new_width = $maxsize;
@@ -564,7 +564,7 @@ class OC_Image {
 	public function preciseResize($width, $height) {
 		if (!$this->valid()) {
 			OC_Log::write('core',__METHOD__.'(): No image loaded', OC_Log::ERROR);
-			return false;			
+			return false;
 		}
 		$width_orig=imageSX($this->resource);
 		$height_orig=imageSY($this->resource);
diff --git a/lib/json.php b/lib/json.php
index 3d9d5c96fa..32ae734e4a 100644
--- a/lib/json.php
+++ b/lib/json.php
@@ -52,7 +52,7 @@ class OC_JSON{
 			exit();
 		}
 	}
-        
+
 	/**
 	* Check if the user is a admin, send json error msg if not
 	*/
@@ -64,7 +64,7 @@ class OC_JSON{
 			exit();
 		}
 	}
-        
+
 	/**
 	* Check if the user is a subadmin, send json error msg if not
 	*/
diff --git a/lib/l10n.php b/lib/l10n.php
index e7f5ffea0e..cfa0e26486 100644
--- a/lib/l10n.php
+++ b/lib/l10n.php
@@ -28,17 +28,17 @@ class OC_L10N{
 	 * cached instances
 	 */
 	protected static $instances=array();
-	
+
 	/**
 	 * cache
 	 */
 	protected static $cache = array();
-	
+
 	/**
 	 * The best language
 	 */
 	protected static $language = '';
-	
+
 	/**
 	 * App of this object
 	 */
@@ -53,7 +53,7 @@ class OC_L10N{
 	 * Translations
 	 */
 	private $translations = array();
-	
+
 	/**
 	 * Localization
 	 */
@@ -61,7 +61,7 @@ class OC_L10N{
 		'date' => 'd.m.Y',
 		'datetime' => 'd.m.Y H:i:s',
 		'time' => 'H:i:s');
-		
+
 	/**
 	 * get an L10N instance
 	 * @return OC_L10N
@@ -76,7 +76,7 @@ class OC_L10N{
 			return new OC_L10N($app,$lang);
 		}
 	}
-	
+
 	/**
 	 * @brief The constructor
 	 * @param $app the app requesting l10n
@@ -90,7 +90,7 @@ class OC_L10N{
 		$this->app = $app;
 		$this->lang = $lang;
 	}
-		
+
 	protected function init(){
 		if ($this->app === true) {
 			return;
@@ -119,7 +119,7 @@ class OC_L10N{
 				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
@@ -188,7 +188,7 @@ class OC_L10N{
 	 * @returns String or false
 	 *
 	 * Returns the localized data.
-	 * 
+	 *
 	 * Implemented types:
 	 *  - date
 	 *    - Creates a date
@@ -241,7 +241,7 @@ class OC_L10N{
 	 * @returns language
 	 *
 	 * If $app is an array, ownCloud assumes that these are the available
-	 * languages. Otherwise ownCloud tries to find the files in the l10n 
+	 * languages. Otherwise ownCloud tries to find the files in the l10n
 	 * folder.
 	 *
 	 * If nothing works it returns 'en'
diff --git a/lib/mail.php b/lib/mail.php
index 0ac9a97c1b..acdadeffd3 100644
--- a/lib/mail.php
+++ b/lib/mail.php
@@ -17,7 +17,7 @@ require_once('class.phpmailer.php');
 class OC_Mail {
 
 	/**
-	 * send an email 
+	 * send an email
 	 *
 	 * @param string $toaddress
 	 * @param string $toname
@@ -31,9 +31,9 @@ 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 ); 
-		$SMTPUSERNAME = OC_Config::getValue( 'mail_smtpname', '' ); 
-		$SMTPPASSWORD = OC_Config::getValue( 'mail_smtppassword', '' );  
+		$SMTPAUTH = OC_Config::getValue( 'mail_smtpauth', false );
+		$SMTPUSERNAME = OC_Config::getValue( 'mail_smtpname', '' );
+		$SMTPPASSWORD = OC_Config::getValue( 'mail_smtppassword', '' );
 
 
 		$mailo = new PHPMailer(true);
diff --git a/lib/migrate.php b/lib/migrate.php
index e998cf1f4a..7d7169c4e4 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 ){
-		
+
 		$datadir = OC_Config::getValue( 'datadirectory' );
 		// Extract the zip
 		if( !$extractpath = self::extractZip( $path ) ){
@@ -222,13 +222,13 @@ class OC_Migrate{
 		if( self::$exporttype == 'user' ){
 			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 ) ); 	
+				return json_encode( array( 'success' => false ) );
 			}
 		}
 
@@ -411,7 +411,7 @@ class OC_Migrate{
 						$success = false;
 					}
 				}
-	
+
 				// Run the export function?
 				if( $success ){
 					// Set the provider properties
@@ -421,7 +421,7 @@ class OC_Migrate{
 					$return['apps'][$provider->getID()]['success'] = false;
 					$return['apps'][$provider->getID()]['message'] = 'failed to create the app tables';
 				}
-	
+
 				// Now add some app info the the return array
 				$appinfo = OC_App::getAppInfo( $provider->getID() );
 				$return['apps'][$provider->getID()]['version'] = OC_App::getAppVersion($provider->getID());
diff --git a/lib/migration/content.php b/lib/migration/content.php
index 5c89e6bacd..e04ac224f7 100644
--- a/lib/migration/content.php
+++ b/lib/migration/content.php
@@ -25,13 +25,13 @@
  * provides methods to add and access data from the migration
  */
 class OC_Migration_Content{
-	
+
 	private $zip=false;
 	// Holds the MDB2 object
 	private $db=null;
 	// Holds an array of tmpfiles to delete after zip creation
 	private $tmpfiles=false;
-	
+
 	/**
 	* @brief sets up the
 	* @param $zip ZipArchive object
@@ -42,25 +42,25 @@ class OC_Migration_Content{
 
 		$this->zip = $zip;
 		$this->db = $db;
-		
+
 		if( !is_null( $db ) ){
 			// Get db path
 			$db = $this->db->getDatabase();
 			$this->tmpfiles[] = $db;
 		}
-		
+
 	}
-	
+
 	// @brief prepares the db
 	// @param $query the sql query to prepare
 	public function prepare( $query ){
-		
+
 		// Optimize the query
 		$query = $this->processQuery( $query );
-		
+
 		// Optimize the query
 		$query = $this->db->prepare( $query );
-		
+
 		// Die if we have an error (error means: bad query, not 0 results!)
 		if( PEAR::isError( $query ) ) {
 			$entry = 'DB Error: "'.$result->getMessage().'"<br />';
@@ -68,11 +68,11 @@ class OC_Migration_Content{
 			OC_Log::write( 'migration', $entry, OC_Log::FATAL );
 			return false;
 		} else {
-			return $query;	
+			return $query;
 		}
-		
+
 	}
-	
+
 	/**
 	* @brief processes the db query
 	* @param $query the query to process
@@ -86,7 +86,7 @@ class OC_Migration_Content{
 		$query = str_replace( '*PREFIX*', '', $query );
 		return $query;
 	}
-	
+
 	/**
 	* @brief copys rows to migration.db from the main database
 	* @param $options array of options.
@@ -94,19 +94,19 @@ class OC_Migration_Content{
 	*/
 	public function copyRows( $options ){
 		if( !array_key_exists( 'table', $options ) ){
-			return false;	
+			return false;
 		}
-		
+
 		$return = array();
-					
+
 		// Need to include 'where' in the query?
 		if( array_key_exists( 'matchval', $options ) && array_key_exists( 'matchcol', $options ) ){
-			
+
 			// If only one matchval, create an array
 			if(!is_array($options['matchval'])){
-				$options['matchval'] = array( $options['matchval'] );	
+				$options['matchval'] = array( $options['matchval'] );
 			}
-			
+
 			foreach( $options['matchval'] as $matchval ){
 				// Run the query for this match value (where x = y value)
 				$sql = 'SELECT * FROM `*PREFIX*' . $options['table'] . '` WHERE `' . $options['matchcol'] . '` LIKE ?';
@@ -122,13 +122,13 @@ class OC_Migration_Content{
 			$query = OC_DB::prepare( $sql );
 			$results = $query->execute();
 			$return = $this->insertData( $results, $options );
-	
+
 		}
-		
+
 		return $return;
-		
+
 	}
-	
+
 	/**
 	* @brief saves a sql data set into migration.db
 	* @param $data a sql data set returned from self::prepare()->query()
@@ -144,7 +144,7 @@ class OC_Migration_Content{
 				$fields[] = $field;
 				$values[] = $value;
 			}
-			
+
 			// Generate some sql
 			$sql = "INSERT INTO `" . $options['table'] . '` ( `';
 			$fieldssql = implode( '`, `', $fields );
@@ -154,7 +154,7 @@ class OC_Migration_Content{
 			// Make the query
 			$query = $this->prepare( $sql );
 			if( !$query ){
-				OC_Log::write( 'migration', 'Invalid sql produced: '.$sql, OC_Log::FATAL );	
+				OC_Log::write( 'migration', 'Invalid sql produced: '.$sql, OC_Log::FATAL );
 				return false;
 				exit();
 			} else {
@@ -162,10 +162,10 @@ class OC_Migration_Content{
 				// Do we need to return some values?
 				if( array_key_exists( 'idcol', $options ) ){
 					// Yes we do
-					$return[] = $row[$options['idcol']];	
+					$return[] = $row[$options['idcol']];
 				} else {
 					// Take a guess and return the first field :)
-					$return[] = reset($row);	
+					$return[] = reset($row);
 				}
 			}
 			$fields = '';
@@ -173,11 +173,11 @@ class OC_Migration_Content{
 		}
 		return $return;
 	}
-	
+
 	/**
 	* @brief adds a directory to the zip object
 	* @param $dir string path of the directory to add
-	* @param $recursive bool 
+	* @param $recursive bool
 	* @param $internaldir string path of folder to add dir to in zip
 	* @return bool
 	*/
@@ -186,13 +186,13 @@ class OC_Migration_Content{
 	    $this->zip->addEmptyDir($internaldir . $dirname);
 	    $internaldir.=$dirname.='/';
 		if( !file_exists( $dir ) ){
-			return false;	
+			return false;
 		}
 	    if ($dirhandle = opendir($dir)) {
 			while (false !== ( $file = readdir($dirhandle))) {
-	
+
 				if (( $file != '.' ) && ( $file != '..' )) {
-		
+
 					if (is_dir($dir . '/' . $file) && $recursive) {
 						$this->addDir($dir . '/' . $file, $recursive, $internaldir);
 					} elseif (is_file($dir . '/' . $file)) {
@@ -207,7 +207,7 @@ class OC_Migration_Content{
 	    }
 	    return true;
 	}
-	
+
 	/**
 	* @brief adds a file to the zip from a given string
 	* @param $data string of data to add
@@ -220,13 +220,13 @@ class OC_Migration_Content{
 		$this->tmpfiles[] = $file;
 		if( !file_put_contents( $file, $data ) ){
 			OC_Log::write( 'migation', 'Failed to save data to a temporary file', OC_Log::ERROR );
-			return false;	
+			return false;
 		}
 		// Add file to the zip
 		$this->zip->addFile( $file, $path );
 		return true;
 	}
-	
+
 	/**
 	* @brief closes the zip, removes temp files
 	* @return bool
@@ -234,19 +234,19 @@ class OC_Migration_Content{
 	public function finish(){
 		if( !$this->zip->close() ){
 			OC_Log::write( 'migration', 'Failed to write the zip file with error: '.$this->zip->getStatusString(), OC_Log::ERROR );
-			return false;	
+			return false;
 		}
 		$this->cleanup();
-		return true;	
-	}	
-	
+		return true;
+	}
+
 		/**
 	* @brief cleans up after the zip
 	*/
 	private function cleanup(){
 		// Delete tmp files
 		foreach($this->tmpfiles as $i){
-			unlink( $i );	
-		}	
+			unlink( $i );
+		}
 	}
 }
diff --git a/lib/migration/provider.php b/lib/migration/provider.php
index 91336f3019..259b1fe7ae 100644
--- a/lib/migration/provider.php
+++ b/lib/migration/provider.php
@@ -3,37 +3,37 @@
  * provides search functionalty
  */
 abstract class OC_Migration_Provider{
-	
+
 	protected $id=false;
-	protected $content=false; 
+	protected $content=false;
 	protected $uid=false;
 	protected $olduid=false;
 	protected $appinfo=false;
-	
+
 	public function __construct( $appid ){
 		// Set the id
 		$this->id = $appid;
 		OC_Migrate::registerProvider( $this );
 	}
-	
+
 	/**
 	 * @brief exports data for apps
 	 * @return array appdata to be exported
 	 */
 	abstract function export( );
-	
+
 	/**
 	 * @brief imports data for the app
 	 * @return void
 	 */
 	abstract function import( );
-	
+
 	/**
 	* @brief sets the OC_Migration_Content object to $this->content
 	* @param $content a OC_Migration_Content object
 	*/
 	public function setData( $uid, $content, $info=null ){
-		$this->content = $content;	
+		$this->content = $content;
 		$this->uid = $uid;
 		$id = $this->id;
 		if( !is_null( $info ) ){
@@ -41,12 +41,12 @@ abstract class OC_Migration_Provider{
 			$this->appinfo = $info->apps->$id;
 		}
 	}
-	 	
+
 	/**
 	* @brief returns the appid of the provider
 	* @return string
 	*/
 	public function getID(){
-		return $this->id;	
+		return $this->id;
 	}
 }
diff --git a/lib/ocs.php b/lib/ocs.php
index 3157aae99e..ad01e5c42f 100644
--- a/lib/ocs.php
+++ b/lib/ocs.php
@@ -153,27 +153,27 @@ class OC_OCS {
 			OC_OCS::privatedatadelete($format, $app, $key);
 
 		// CLOUD
-		// systemWebApps 
+		// 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 
+		// 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 
+		// 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);
 
-		// keygetpublic 
+		// 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 
+		// 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);
@@ -501,7 +501,7 @@ class OC_OCS {
 			echo(OC_OCS::generatexml($format,'ok',100,''));
 		}
 	}
-	
+
 	/**
 	* get private data
 	* @param string $user
diff --git a/lib/ocsclient.php b/lib/ocsclient.php
index ae35470cff..9d51004669 100644
--- a/lib/ocsclient.php
+++ b/lib/ocsclient.php
@@ -29,7 +29,7 @@
 class OC_OCSClient{
 
 	/**
-	 * @brief Get the url of the OCS AppStore server. 
+	 * @brief Get the url of the OCS AppStore server.
 	 * @returns string of the AppStore server
 	 *
 	 * 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
@@ -40,7 +40,7 @@ class OC_OCSClient{
 	}
 
         /**
-         * @brief Get the url of the OCS KB server. 
+         * @brief Get the url of the OCS KB server.
          * @returns string of the KB server
          * 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
          */
@@ -61,13 +61,13 @@ class OC_OCSClient{
 			return NULL;
 		}
 		$url=OC_OCSClient::getAppStoreURL().'/content/categories';
-	
+
 		$xml=@file_get_contents($url);
 		if($xml==FALSE){
 			return NULL;
 		}
 		$data=simplexml_load_string($xml);
-	
+
 		$tmp=$data->data;
 		$cats=array();
 
@@ -119,9 +119,9 @@ class OC_OCSClient{
 			$app['preview']=(string)$tmp[$i]->smallpreviewpic1;
 			$app['changed']=strtotime($tmp[$i]->changed);
 			$app['description']=(string)$tmp[$i]->description;
-	
+
 			$apps[]=$app;
-		} 
+		}
 		return $apps;
 	}
 
@@ -184,7 +184,7 @@ class OC_OCSClient{
 
 		$tmp=$data->data->content;
 		$app=array();
-		if(isset($tmp->downloadlink)) { 
+		if(isset($tmp->downloadlink)) {
 			$app['downloadlink']=$tmp->downloadlink;
 		}else{
 	 		$app['downloadlink']='';
@@ -199,7 +199,7 @@ class OC_OCSClient{
 	 *
 	 * This function returns a list of all the knowledgebase entries from the OCS server
 	 */
-	public static function getKnownledgebaseEntries($page,$pagesize,$search=''){	
+	public static function getKnownledgebaseEntries($page,$pagesize,$search=''){
 		if(OC_Config::getValue('knowledgebaseenabled', true)==false){
 			$kbe=array();
 			$kbe['totalitems']=0;
diff --git a/lib/preferences.php b/lib/preferences.php
index b6c4c3a163..de5747fccc 100644
--- a/lib/preferences.php
+++ b/lib/preferences.php
@@ -116,7 +116,7 @@ class OC_Preferences{
 		// Try to fetch the value, return default if not exists.
 		$query = OC_DB::prepare( 'SELECT `configvalue` FROM `*PREFIX*preferences` WHERE `userid` = ? AND `appid` = ? AND `configkey` = ?' );
 		$result = $query->execute( array( $user, $app, $key ));
-		
+
 		$row = $result->fetchRow();
 		if($row){
 			return $row["configvalue"];
diff --git a/lib/public/app.php b/lib/public/app.php
index e74f155074..be38bbff98 100644
--- a/lib/public/app.php
+++ b/lib/public/app.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;
 
@@ -130,7 +130,7 @@ class App {
 
 
         /**
-         * @brief Check if the app is enabled, redirects to home if not 
+         * @brief Check if the app is enabled, redirects to home if not
          * @param $app app
          * @returns true/false
         */
@@ -140,7 +140,7 @@ class App {
 
 
         /**
-         * @brief Get the last version of the app, either from appinfo/version or from appinfo/info.xml 
+         * @brief Get the last version of the app, either from appinfo/version or from appinfo/info.xml
          * @param $app app
          * @returns true/false
          */
diff --git a/lib/public/backgroundjob.php b/lib/public/backgroundjob.php
index 834bebb5c3..2962346dbc 100644
--- a/lib/public/backgroundjob.php
+++ b/lib/public/backgroundjob.php
@@ -24,7 +24,7 @@
  * Public interface of ownCloud forbackground jobs.
  */
 
-// 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;
 
@@ -42,7 +42,7 @@ namespace OCP;
  * 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 
+ * 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 {
diff --git a/lib/public/config.php b/lib/public/config.php
index ab01902ffe..f3120b9aaa 100644
--- a/lib/public/config.php
+++ b/lib/public/config.php
@@ -27,7 +27,7 @@
  */
 
 /**
- * @brief use OCP namespace for all classes that are considered public. 
+ * @brief use OCP namespace for all classes that are considered public.
  *
  * Classes that use this namespace are for use by apps, and not for use by internal
  * OC classes
diff --git a/lib/public/db.php b/lib/public/db.php
index 23c670cf44..e1da62e2d2 100644
--- a/lib/public/db.php
+++ b/lib/public/db.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;
 
diff --git a/lib/public/files.php b/lib/public/files.php
index 32b3f03674..be5952d362 100644
--- a/lib/public/files.php
+++ b/lib/public/files.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;
 
diff --git a/lib/public/json.php b/lib/public/json.php
index 99df79173e..2a74535f41 100644
--- a/lib/public/json.php
+++ b/lib/public/json.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;
 
@@ -47,17 +47,17 @@ class JSON {
 
 	/**
 	* 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(){
@@ -66,22 +66,22 @@ class JSON {
 
 	/**
 	* 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, 
+	*
+	* 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(){
@@ -90,10 +90,10 @@ class JSON {
 
 	/**
 	* 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.
 	*/
@@ -103,19 +103,19 @@ class JSON {
 
 	/**
 	* Send json error msg
-	* 
-	* Return a json error message with optional extra data for 
+	*
+	* 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 string json formatted error string.
 	*/
@@ -134,17 +134,17 @@ class JSON {
 
 	/**
 	* 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.
 	*/
@@ -154,17 +154,17 @@ class JSON {
 
 	/**
 	* 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(){
diff --git a/lib/public/response.php b/lib/public/response.php
index 8dff3bcd35..febb3f1436 100644
--- a/lib/public/response.php
+++ b/lib/public/response.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;
 
diff --git a/lib/public/template.php b/lib/public/template.php
index a0ed618cb2..11c740d13a 100644
--- a/lib/public/template.php
+++ b/lib/public/template.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;
 
@@ -88,13 +88,13 @@ function simple_file_size($bytes) {
 
 /**
  * @brief Generate html code for an options block.
- * @param $options the options 
- * @param $selected which one is selected? 
- * @param $params the parameters 
+ * @param $options the options
+ * @param $selected which one is selected?
+ * @param $params the parameters
  * @returns html options
  */
 function html_select_options($options, $selected, $params=array()) {
-	return(\html_select_options($options, $selected, $params)); 
+	return(\html_select_options($options, $selected, $params));
 }
 
 
diff --git a/lib/public/user.php b/lib/public/user.php
index 2fa599488a..6228268d75 100644
--- a/lib/public/user.php
+++ b/lib/public/user.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;
 
diff --git a/lib/search.php b/lib/search.php
index f8a4b8e96e..9dfd0cf69e 100644
--- a/lib/search.php
+++ b/lib/search.php
@@ -27,7 +27,7 @@
 class OC_Search{
 	static private $providers=array();
 	static private $registeredProviders=array();
-	
+
 	/**
 	 * remove all registered search providers
 	 */
@@ -35,7 +35,7 @@ class OC_Search{
 		self::$providers=array();
 		self::$registeredProviders=array();
 	}
-	
+
 	/**
 	 * register a new search provider to be used
 	 * @param string $provider class name of a OC_Search_Provider
@@ -43,7 +43,7 @@ class OC_Search{
 	public static function registerProvider($class,$options=array()){
 		self::$registeredProviders[]=array('class'=>$class,'options'=>$options);
 	}
-	
+
 	/**
 	 * search all provider for $query
 	 * @param string query
@@ -57,7 +57,7 @@ class OC_Search{
 		}
 		return $results;
 	}
-	
+
 	/**
 	 * create instances of all the registered search providers
 	 */
diff --git a/lib/search/provider.php b/lib/search/provider.php
index b3ee79b477..b83c5aa61b 100644
--- a/lib/search/provider.php
+++ b/lib/search/provider.php
@@ -4,11 +4,11 @@
  */
 abstract class OC_Search_Provider {
 	private $options;
-	
+
 	public function __construct($options){
 		$this->options=$options;
 	}
-	
+
 	/**
 	 * search for $query
 	 * @param string $query
diff --git a/lib/setup.php b/lib/setup.php
index f7e8c6950c..e60a461deb 100644
--- a/lib/setup.php
+++ b/lib/setup.php
@@ -18,7 +18,7 @@ if(isset($_POST['install']) AND $_POST['install']=='true') {
 	// We have to launch the installation process :
 	$e = OC_Setup::install($_POST);
 	$errors = array('errors' => $e);
-	
+
 	if(count($e) > 0) {
 		//OC_Template::printGuestPage("", "error", array("errors" => $errors));
 		$options = array_merge($_POST, $opts, $errors);
@@ -37,7 +37,7 @@ class OC_Setup {
 	public static function install($options) {
 		$error = array();
 		$dbtype = $options['dbtype'];
-		
+
 		if(empty($options['adminlogin'])) {
 			$error[] = 'Set an admin username.';
 		}
@@ -72,7 +72,7 @@ class OC_Setup {
 			$username = htmlspecialchars_decode($options['adminlogin']);
 			$password = htmlspecialchars_decode($options['adminpass']);
 			$datadir = htmlspecialchars_decode($options['directory']);
-			
+
 			//use sqlite3 when available, otherise sqlite2 will be used.
 			if($dbtype=='sqlite' and class_exists('SQLite3')){
 				$dbtype='sqlite3';
@@ -107,7 +107,7 @@ class OC_Setup {
 				}
 				else {
 					$oldUser=OC_Config::getValue('dbuser', 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)) {
 						//use the admin login data for the new database user
@@ -184,9 +184,9 @@ class OC_Setup {
 						$dbusername='oc_'.$username;
 						//create a new password so we don't need to store the admin config in the config file
 						$dbpassword=md5(time());
-						
+
 						self::pg_createDBUser($dbusername, $dbpassword, $connection);
-						
+
 						OC_CONFIG::setValue('dbuser', $dbusername);
 						OC_CONFIG::setValue('dbpassword', $dbpassword);
 
@@ -257,7 +257,7 @@ class OC_Setup {
                                         );
                                         return $error;
                                 } else {
-                                        //check for roles creation rights in oracle             
+                                        //check for roles creation rights in oracle
 
                                         $query="SELECT count(*) FROM user_role_privs, role_sys_privs WHERE user_role_privs.granted_role = role_sys_privs.role AND privilege = 'CREATE ROLE'";
                                         $stmt = oci_parse($connection, $query);
@@ -342,7 +342,7 @@ class OC_Setup {
                                                 }
                                         }
                                 }
-                        }                   
+                        }
 			else {
 				//delete the old sqlite database first, might cause infinte loops otherwise
 				if(file_exists("$datadir/owncloud.db")){
@@ -428,7 +428,7 @@ class OC_Setup {
 			}
 		}
 		$query = "REVOKE ALL PRIVILEGES ON DATABASE \"$e_name\" FROM PUBLIC";
-		$result = pg_query($connection, $query);		
+		$result = pg_query($connection, $query);
 	}
 
 	private static function pg_createDBUser($name,$password,$connection) {
@@ -463,7 +463,7 @@ class OC_Setup {
 		}
 	}
         /**
-         * 
+         *
          * @param String $name
          * @param String $password
          * @param String $tablespace
diff --git a/lib/subadmin.php b/lib/subadmin.php
index 718fe922ff..4752492df3 100644
--- a/lib/subadmin.php
+++ b/lib/subadmin.php
@@ -3,7 +3,7 @@
  * ownCloud
  *
  * @author Georg Ehrke
- * @copyright 2012 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
@@ -85,7 +85,7 @@ class OC_SubAdmin{
 		}
 		return $uids;
 	}
-	
+
 	/**
 	 * @brief get all SubAdmins
 	 * @return array
@@ -99,7 +99,7 @@ class OC_SubAdmin{
 		}
 		return $subadmins;
 	}
-	
+
 	/**
 	 * @brief checks if a user is a SubAdmin of a group
 	 * @param $uid uid of the subadmin
@@ -115,7 +115,7 @@ class OC_SubAdmin{
 		}
 		return false;
 	}
-	
+
 	/**
 	 * @brief checks if a user is a SubAdmin
 	 * @param $uid uid of the subadmin
@@ -130,7 +130,7 @@ class OC_SubAdmin{
 		}
 		return false;
 	}
-	
+
 	/**
 	 * @brief checks if a user is a accessible by a subadmin
 	 * @param $subadmin uid of the subadmin
@@ -152,7 +152,7 @@ class OC_SubAdmin{
 		}
 		return false;
 	}
-	
+
 	/*
 	 * @brief alias for self::isSubAdminofGroup()
 	 */
@@ -162,7 +162,7 @@ class OC_SubAdmin{
 
 	/**
 	 * @brief delete all SubAdmins by uid
-	 * @param $parameters 
+	 * @param $parameters
 	 * @return boolean
 	 */
 	public static function post_deleteUser($parameters){
diff --git a/lib/template.php b/lib/template.php
index a10ddcd5c3..609c8da976 100644
--- a/lib/template.php
+++ b/lib/template.php
@@ -161,7 +161,7 @@ class OC_Template{
                 header('X-Frame-Options: Sameorigin');
                 header('X-XSS-Protection: 1; mode=block');
                 header('X-Content-Type-Options: nosniff');
- 
+
 		$this->findTemplate($name);
 	}
 
@@ -208,13 +208,13 @@ class OC_Template{
 			$_SESSION['formfactor']=$_GET['formfactor'];
 		}
 		$formfactor=$_SESSION['formfactor'];
-		if($formfactor=='default') { 
+		if($formfactor=='default') {
 			$fext='';
-		}elseif($formfactor=='mobile') { 
+		}elseif($formfactor=='mobile') {
 			$fext='.mobile';
-		}elseif($formfactor=='tablet') { 
+		}elseif($formfactor=='tablet') {
 			$fext='.tablet';
-		}elseif($formfactor=='standalone') { 
+		}elseif($formfactor=='standalone') {
 			$fext='.standalone';
 		}else{
 			$fext='';
diff --git a/lib/user.php b/lib/user.php
index c14ef2d6ca..c432f6074a 100644
--- a/lib/user.php
+++ b/lib/user.php
@@ -385,7 +385,7 @@ class OC_User {
 		}
 		return false;
 	}
-	
+
 	/**
 	 * disables a user
 	 * @param string $userid the user to disable
@@ -395,7 +395,7 @@ class OC_User {
 		$query = OC_DB::prepare($query);
 		$query->execute(array($userid, 'core', 'enabled', 'false'));
 	}
-	
+
 	/**
 	 * enable a user
 	 * @param string $userid
@@ -405,7 +405,7 @@ class OC_User {
 		$query = OC_DB::prepare($query);
 		$query->execute(array($userid, 'core', 'enabled', 'false'));
 	}
-	
+
 	/**
 	 * checks if a user is enabled
 	 * @param string $userid
diff --git a/lib/user/database.php b/lib/user/database.php
index dc11614cc5..52f3b35fa5 100644
--- a/lib/user/database.php
+++ b/lib/user/database.php
@@ -43,7 +43,7 @@ class OC_User_Database extends OC_User_Backend {
 	 * @var PasswordHash
 	 */
 	static private $hasher=null;
-	
+
 	private function getHasher(){
 		if(!self::$hasher){
 			//we don't want to use DES based crypt(), since it doesn't return a has with a recognisable prefix
@@ -53,7 +53,7 @@ class OC_User_Database extends OC_User_Backend {
 		return self::$hasher;
 
 	}
-	
+
 	/**
 	 * @brief Create a new user
 	 * @param $uid The username of the user to create
@@ -172,7 +172,7 @@ class OC_User_Database extends OC_User_Backend {
 	public function userExists($uid){
 		$query = OC_DB::prepare( 'SELECT * FROM `*PREFIX*users` WHERE LOWER(`uid`) = LOWER(?)' );
 		$result = $query->execute( array( $uid ));
-		
+
 		return $result->numRows() > 0;
 	}
 
diff --git a/lib/user/http.php b/lib/user/http.php
index 547c0201b6..5149678e4e 100644
--- a/lib/user/http.php
+++ b/lib/user/http.php
@@ -41,9 +41,9 @@ class OC_User_HTTP extends OC_User_Backend {
 			$url.='?'.$parts['query'];
 		}
 		return array($parts['user'],$url);
-		
+
 	}
-	
+
 	/**
 	 * check if an url is a valid login
 	 * @param string url
@@ -52,7 +52,7 @@ class OC_User_HTTP extends OC_User_Backend {
 	private function matchUrl($url){
 		return ! is_null(parse_url($url,PHP_URL_USER));
 	}
-	
+
 	/**
 	 * @brief Check if the password is correct
 	 * @param $uid The username
@@ -67,7 +67,7 @@ class OC_User_HTTP extends OC_User_Backend {
 			return false;
 		}
 		list($user,$url)=$this->parseUrl($uid);
-		
+
 		$ch = curl_init();
 		curl_setopt($ch, CURLOPT_URL, $url);
 		curl_setopt($ch, CURLOPT_USERPWD, $user.':'.$password);
@@ -76,7 +76,7 @@ class OC_User_HTTP extends OC_User_Backend {
 		curl_exec($ch);
 
 		$status = curl_getinfo($ch, CURLINFO_HTTP_CODE);
-		
+
 		curl_close($ch);
 
 		return $status==200;
diff --git a/lib/util.php b/lib/util.php
index 720f2cdeef..f543f742ac 100755
--- a/lib/util.php
+++ b/lib/util.php
@@ -40,7 +40,7 @@ class OC_Util {
 				mkdir( $userdirectory, 0755, true );
 			}
 			OC_Filesystem::mount('OC_Filestorage_Local',array('datadir'=>$user_root), $user);
-			
+
 			//jail the user into his "home" directory
 			OC_Filesystem::init($user_dir);
 			$quotaProxy=new OC_FileProxy_Quota();
@@ -62,9 +62,9 @@ class OC_Util {
 	public static function setupFS4all(){
 		foreach(OC_User::getUsers() as $user){
 			OC_Filesystem::mount('OC_Filestorage_Local',array('datadir'=>OC_User::getHome($singleuser)), $user);
-		}	
+		}
 	}
-	
+
 	public static function tearDownFS(){
 		OC_Filesystem::tearDown();
 		self::$fsSetup=false;
@@ -211,7 +211,7 @@ 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 apps directory 
+				$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.");
 			}
 		}
@@ -410,15 +410,15 @@ class OC_Util {
 
 		// cleanup old tokens garbage collector
 		// only run every 20th time so we don't waste cpu cycles
-		if(rand(0,20)==0) {  
+		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]);						
+						unset($_SESSION[$key]);
 					}
-				}	
+				}
 			}
 		}
 		// return the token
@@ -465,13 +465,13 @@ 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 sanitized string, depends on the input parameter.
 	 */
diff --git a/lib/vcategories.php b/lib/vcategories.php
index 20d9e3b5d6..60cc034f78 100644
--- a/lib/vcategories.php
+++ b/lib/vcategories.php
@@ -219,7 +219,7 @@ class OC_VCategories {
 		if(!is_array($haystack)) {
 			return false;
 		}
-		return array_search(strtolower($needle),array_map('strtolower',$haystack)); 
+		return array_search(strtolower($needle),array_map('strtolower',$haystack));
 	}
 
 }

From 0e58800016419daf3b2d032136415a5fe9d6331f Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Wed, 29 Aug 2012 08:42:49 +0200
Subject: [PATCH 0990/1224] Whitespace fixes in apps

---
 apps/files/admin.php                          |  2 +-
 apps/files/ajax/list.php                      |  4 +-
 apps/files/ajax/newfile.php                   |  2 +-
 apps/files/ajax/rawlist.php                   |  2 +-
 apps/files/ajax/scan.php                      |  9 ++---
 apps/files/ajax/timezone.php                  |  1 -
 apps/files/appinfo/update.php                 |  2 -
 apps/files/download.php                       |  2 +-
 apps/files/js/files.js                        |  6 +--
 apps/files/settings.php                       |  2 +-
 apps/files/templates/admin.php                |  3 --
 apps/files_encryption/js/settings.js          |  2 +-
 apps/files_encryption/lib/crypt.php           |  4 +-
 apps/files_encryption/lib/cryptstream.php     | 12 +++---
 apps/files_encryption/lib/proxy.php           |  8 ++--
 apps/files_encryption/tests/encryption.php    |  4 +-
 apps/files_encryption/tests/proxy.php         | 12 +++---
 apps/files_encryption/tests/stream.php        |  2 +-
 .../ajax/addRootCertificate.php               |  2 +-
 apps/files_external/js/settings.js            |  4 +-
 apps/files_external/lib/amazons3.php          |  4 +-
 apps/files_external/lib/ftp.php               |  2 +-
 apps/files_external/lib/google.php            | 18 ++++-----
 apps/files_external/lib/swift.php             |  8 ++--
 apps/files_external/lib/webdav.php            |  7 ++--
 apps/files_external/templates/settings.php    | 10 ++---
 apps/files_external/tests/ftp.php             |  3 +-
 apps/files_external/tests/google.php          |  3 +-
 apps/files_external/tests/swift.php           |  5 +--
 apps/files_external/tests/webdav.php          |  1 -
 apps/files_sharing/appinfo/update.php         | 16 ++++----
 apps/files_sharing/lib/share/file.php         |  4 +-
 apps/files_sharing/lib/sharedstorage.php      | 30 +++++++-------
 apps/files_versions/ajax/expireAll.php        |  8 ++--
 apps/files_versions/ajax/getVersions.php      |  8 ++--
 apps/files_versions/appinfo/update.php        |  4 +-
 apps/files_versions/history.php               | 40 +++++++++----------
 apps/files_versions/js/settings-personal.js   | 28 ++++++-------
 apps/files_versions/js/versions.js            | 30 +++++++-------
 apps/files_versions/templates/history.php     |  4 +-
 apps/user_webdavauth/user_webdavauth.php      | 12 +++---
 41 files changed, 159 insertions(+), 171 deletions(-)

diff --git a/apps/files/admin.php b/apps/files/admin.php
index d05eb7267b..b49c0f61a0 100644
--- a/apps/files/admin.php
+++ b/apps/files/admin.php
@@ -23,7 +23,7 @@
 
 
 // Init owncloud
- 
+
 
 OCP\User::checkAdminUser();
 
diff --git a/apps/files/ajax/list.php b/apps/files/ajax/list.php
index 94ddf0364b..2254526231 100644
--- a/apps/files/ajax/list.php
+++ b/apps/files/ajax/list.php
@@ -23,10 +23,10 @@ if($doBreadcrumb) {
 			$breadcrumb[] = array( "dir" => $pathtohere, "name" => $i );
 		}
 	}
-	
+
 	$breadcrumbNav = new OCP\Template( "files", "part.breadcrumb", "" );
 	$breadcrumbNav->assign( "breadcrumb", $breadcrumb );
-	
+
 	$data['breadcrumb'] = $breadcrumbNav->fetchPage();
 }
 
diff --git a/apps/files/ajax/newfile.php b/apps/files/ajax/newfile.php
index 6ae9c44542..4619315ce0 100644
--- a/apps/files/ajax/newfile.php
+++ b/apps/files/ajax/newfile.php
@@ -39,7 +39,7 @@ function progress($notification_code, $severity, $message, $message_code, $bytes
 		case STREAM_NOTIFY_FILE_SIZE_IS:
 			$filesize = $bytes_max;
 			break;
-			
+
 		case STREAM_NOTIFY_PROGRESS:
 			if ($bytes_transferred > 0) {
 				if (!isset($filesize)) {
diff --git a/apps/files/ajax/rawlist.php b/apps/files/ajax/rawlist.php
index 20094563b1..e0aa0bdac5 100644
--- a/apps/files/ajax/rawlist.php
+++ b/apps/files/ajax/rawlist.php
@@ -11,7 +11,7 @@ OCP\JSON::checkLoggedIn();
 
 // Load the files
 $dir = isset( $_GET['dir'] ) ? $_GET['dir'] : '';
-$mimetype = isset($_GET['mimetype']) ? $_GET['mimetype'] : ''; 
+$mimetype = isset($_GET['mimetype']) ? $_GET['mimetype'] : '';
 
 // make filelist
 $files = array();
diff --git a/apps/files/ajax/scan.php b/apps/files/ajax/scan.php
index 23d7da44f8..d2ec1ab516 100644
--- a/apps/files/ajax/scan.php
+++ b/apps/files/ajax/scan.php
@@ -16,13 +16,12 @@ session_write_close();
 if($force or !OC_FileCache::inCache('')) {
 	if(!$checkOnly) {
 		OCP\DB::beginTransaction();
-		
+
 		if(OC_Cache::isFast()) {
-			//make sure the old fileid's don't mess things up
-			OC_Cache::clear('fileid/');
+			OC_Cache::clear('fileid/'); //make sure the old fileid's don't mess things up
 		}
-		
-		OC_FileCache::scan($dir, $eventSource);
+
+		OC_FileCache::scan($dir,$eventSource);
 		OC_FileCache::clean();
 		OCP\DB::commit();
 		$eventSource->send('success', true);
diff --git a/apps/files/ajax/timezone.php b/apps/files/ajax/timezone.php
index 0be441a36a..b71fa3940c 100644
--- a/apps/files/ajax/timezone.php
+++ b/apps/files/ajax/timezone.php
@@ -3,4 +3,3 @@
 	// see lib/base.php for an example
 	//session_start();
 	$_SESSION['timezone'] = $_GET['time'];
-        
\ No newline at end of file
diff --git a/apps/files/appinfo/update.php b/apps/files/appinfo/update.php
index b2480a58f5..32ac89f006 100644
--- a/apps/files/appinfo/update.php
+++ b/apps/files/appinfo/update.php
@@ -41,5 +41,3 @@ foreach($filesToRemove as $file) {
 		break;
     }
 }
-
-
diff --git a/apps/files/download.php b/apps/files/download.php
index 4e2478d1ad..44a328e25d 100644
--- a/apps/files/download.php
+++ b/apps/files/download.php
@@ -22,7 +22,7 @@
 */
 
 // Init owncloud
- 
+
 
 // Check if we are a user
 OCP\User::checkLoggedIn();
diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index 049afea4f6..b57e75c900 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -379,7 +379,7 @@ $(document).ready(function() {
 			stop: function(e, data) {
 				if(data.dataType != 'iframe ') {
 					$('#upload input.stop').hide();
-				}	
+				}
 				$('#uploadprogressbar').progressbar('value',100);
 				$('#uploadprogressbar').fadeOut();
 			}
@@ -542,7 +542,7 @@ $(document).ready(function() {
 			scanFiles();
 		}
 	}, "json");
-	
+
 	var lastWidth = 0;
 	var breadcrumbs = [];
 	var breadcrumbsWidth = $('#navigation').get(0).offsetWidth;
@@ -603,7 +603,7 @@ $(document).ready(function() {
 	$(window).resize(function() {
 		resizeBreadcrumbs(false);
 	});
-	
+
 	resizeBreadcrumbs(true);
 });
 
diff --git a/apps/files/settings.php b/apps/files/settings.php
index cd6dd8c161..b02c3738c6 100644
--- a/apps/files/settings.php
+++ b/apps/files/settings.php
@@ -23,7 +23,7 @@
 
 
 // Init owncloud
- 
+
 
 // Check if we are a user
 OCP\User::checkLoggedIn();
diff --git a/apps/files/templates/admin.php b/apps/files/templates/admin.php
index 23021ec664..3ad0629750 100644
--- a/apps/files/templates/admin.php
+++ b/apps/files/templates/admin.php
@@ -14,6 +14,3 @@
 		<input type="submit" name="submitFilesAdminSettings" id="submitFilesAdminSettings" value="Save"/>
 	</fieldset>
 </form>
-
-
-
diff --git a/apps/files_encryption/js/settings.js b/apps/files_encryption/js/settings.js
index 8cc433246c..a160b9e0e1 100644
--- a/apps/files_encryption/js/settings.js
+++ b/apps/files_encryption/js/settings.js
@@ -11,7 +11,7 @@ $(document).ready(function(){
 		onuncheck:blackListChange,
 		createText:'...',
 	});
-	
+
 	function blackListChange(){
 		var blackList=$('#encryption_blacklist').val().join(',');
 		OC.AppConfig.setValue('files_encryption','type_blacklist',blackList);
diff --git a/apps/files_encryption/lib/crypt.php b/apps/files_encryption/lib/crypt.php
index 849e88ee0b..0770bca018 100644
--- a/apps/files_encryption/lib/crypt.php
+++ b/apps/files_encryption/lib/crypt.php
@@ -188,7 +188,7 @@ class OC_Crypt {
 			fclose($handleread);
 		}
 	}
-	
+
 	/**
 	 * encrypt data in 8192b sized blocks
 	 */
@@ -200,7 +200,7 @@ class OC_Crypt {
 		}
 		return $result;
 	}
-	
+
 	/**
 	 * decrypt data in 8192b sized blocks
 	 */
diff --git a/apps/files_encryption/lib/cryptstream.php b/apps/files_encryption/lib/cryptstream.php
index 46471911d9..75ad62659d 100644
--- a/apps/files_encryption/lib/cryptstream.php
+++ b/apps/files_encryption/lib/cryptstream.php
@@ -64,16 +64,16 @@ class OC_CryptStream{
 		}
 		return is_resource($this->source);
 	}
-	
+
 	public function stream_seek($offset, $whence=SEEK_SET){
 		$this->flush();
 		fseek($this->source,$offset,$whence);
 	}
-	
+
 	public function stream_tell(){
 		return ftell($this->source);
 	}
-	
+
 	public function stream_read($count){
 		//$count will always be 8192 https://bugs.php.net/bug.php?id=21641
 		//This makes this function a lot simpler but will breake everything the moment it's fixed
@@ -95,7 +95,7 @@ class OC_CryptStream{
 		}
 		return $result;
 	}
-	
+
 	public function stream_write($data){
 		$length=strlen($data);
 		$currentPos=ftell($this->source);
@@ -143,11 +143,11 @@ class OC_CryptStream{
 	public function stream_stat(){
 		return fstat($this->source);
 	}
-	
+
 	public function stream_lock($mode){
 		flock($this->source,$mode);
 	}
-	
+
 	public function stream_flush(){
 		return fflush($this->source);
 	}
diff --git a/apps/files_encryption/lib/proxy.php b/apps/files_encryption/lib/proxy.php
index f25e4a662f..247924b2aa 100644
--- a/apps/files_encryption/lib/proxy.php
+++ b/apps/files_encryption/lib/proxy.php
@@ -28,7 +28,7 @@
 class OC_FileProxy_Encryption extends OC_FileProxy{
 	private static $blackList=null; //mimetypes blacklisted from encryption
 	private static $enableEncryption=null;
-	
+
 	/**
 	 * check if a file should be encrypted during write
 	 * @param string $path
@@ -62,7 +62,7 @@ class OC_FileProxy_Encryption extends OC_FileProxy{
 		$metadata=OC_FileCache_Cached::get($path,'');
 		return isset($metadata['encrypted']) and (bool)$metadata['encrypted'];
 	}
-	
+
 	public function preFile_put_contents($path,&$data){
 		if(self::shouldEncrypt($path)){
 			if (!is_resource($data)) {//stream put contents should have been converter to fopen
@@ -72,7 +72,7 @@ class OC_FileProxy_Encryption extends OC_FileProxy{
 			}
 		}
 	}
-	
+
 	public function postFile_get_contents($path,$data){
 		if(self::isEncrypted($path)){
 			$cached=OC_FileCache_Cached::get($path,'');
@@ -80,7 +80,7 @@ class OC_FileProxy_Encryption extends OC_FileProxy{
 		}
 		return $data;
 	}
-	
+
 	public function postFopen($path,&$result){
 		if(!$result){
 			return $result;
diff --git a/apps/files_encryption/tests/encryption.php b/apps/files_encryption/tests/encryption.php
index 286770a69f..f70411ed63 100644
--- a/apps/files_encryption/tests/encryption.php
+++ b/apps/files_encryption/tests/encryption.php
@@ -23,7 +23,7 @@ class Test_Encryption extends UnitTestCase {
 		$decrypted=OC_Crypt::decrypt($encrypted,$key);
 		$decrypted=rtrim($decrypted, "\0");
 		$this->assertEqual($decrypted,$chunk);
-		
+
 		$encrypted=OC_Crypt::blockEncrypt($source,$key);
 		$decrypted=OC_Crypt::blockDecrypt($encrypted,$key);
 		$this->assertNotEqual($encrypted,$source);
@@ -56,7 +56,7 @@ class Test_Encryption extends UnitTestCase {
 
 	function testBinary(){
 		$key=uniqid();
-	
+
 		$file=__DIR__.'/binary';
 		$source=file_get_contents($file); //binary file
 		$encrypted=OC_Crypt::encrypt($source,$key);
diff --git a/apps/files_encryption/tests/proxy.php b/apps/files_encryption/tests/proxy.php
index 5463836a20..c4952d13d3 100644
--- a/apps/files_encryption/tests/proxy.php
+++ b/apps/files_encryption/tests/proxy.php
@@ -9,18 +9,18 @@
 class Test_CryptProxy extends UnitTestCase {
 	private $oldConfig;
 	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;
-	
-		
+
+
 		//set testing key
 		$_SESSION['enckey']=md5(time());
-	
+
 		//clear all proxies and hooks so we can do clean testing
 		OC_FileProxy::clearProxies();
 		OC_Hook::clear('OC_Filesystem');
@@ -52,11 +52,11 @@ class Test_CryptProxy extends UnitTestCase {
 		$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 d95ea792f7..517d497344 100644
--- a/apps/files_encryption/tests/stream.php
+++ b/apps/files_encryption/tests/stream.php
@@ -8,7 +8,7 @@
 
 class Test_CryptStream extends UnitTestCase {
 	private $tmpFiles=array();
-	
+
 	function testStream(){
 		$stream=$this->getStream('test1','w',strlen('foobar'));
 		fwrite($stream,'foobar');
diff --git a/apps/files_external/ajax/addRootCertificate.php b/apps/files_external/ajax/addRootCertificate.php
index d28a7d24b2..1aa40bd8aa 100644
--- a/apps/files_external/ajax/addRootCertificate.php
+++ b/apps/files_external/ajax/addRootCertificate.php
@@ -14,7 +14,7 @@ $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 = chunk_split(base64_encode($data), 64, "\n");
 	$pem = "-----BEGIN CERTIFICATE-----\n".$pem."-----END CERTIFICATE-----\n";
 	$fh = fopen($to, 'w');
 	fwrite($fh, $pem);
diff --git a/apps/files_external/js/settings.js b/apps/files_external/js/settings.js
index 23f02bbefc..f346007090 100644
--- a/apps/files_external/js/settings.js
+++ b/apps/files_external/js/settings.js
@@ -70,7 +70,7 @@ OC.MountConfig={
 
 $(document).ready(function() {
 	$('.chzn-select').chosen();
-	
+
 	$('#selectBackend').live('change', function() {
 		var tr = $(this).parent().parent();
 		$('#externalStorage tbody').append($(tr).clone());
@@ -133,7 +133,7 @@ $(document).ready(function() {
 			}
 		}
 		return defaultMountPoint+append;
-	} 
+	}
 
 	$('#externalStorage td').live('change', function() {
 		OC.MountConfig.saveStorage($(this).parent());
diff --git a/apps/files_external/lib/amazons3.php b/apps/files_external/lib/amazons3.php
index 3c2e333017..34f8ba2557 100644
--- a/apps/files_external/lib/amazons3.php
+++ b/apps/files_external/lib/amazons3.php
@@ -29,7 +29,7 @@ class OC_Filestorage_AmazonS3 extends OC_Filestorage_Common {
 	private $objects = array();
 
 	private static $tempFiles = array();
-	
+
 	// TODO options: storage class, encryption server side, encrypt before upload?
 
 	public function __construct($params) {
@@ -216,7 +216,7 @@ class OC_Filestorage_AmazonS3 extends OC_Filestorage_Common {
 	}
 
 	public function free_space($path) {
-		// Infinite? 
+		// Infinite?
 		return false;
 	}
 
diff --git a/apps/files_external/lib/ftp.php b/apps/files_external/lib/ftp.php
index 63f14a2877..818273f6c2 100644
--- a/apps/files_external/lib/ftp.php
+++ b/apps/files_external/lib/ftp.php
@@ -14,7 +14,7 @@ class OC_FileStorage_FTP extends OC_FileStorage_StreamWrapper{
 	private $root;
 
 	private static $tempFiles=array();
-	
+
 	public function __construct($params){
 		$this->host=$params['host'];
 		$this->user=$params['user'];
diff --git a/apps/files_external/lib/google.php b/apps/files_external/lib/google.php
index 73317bbf71..9b83dcee53 100644
--- a/apps/files_external/lib/google.php
+++ b/apps/files_external/lib/google.php
@@ -119,7 +119,7 @@ class OC_Filestorage_Google extends OC_Filestorage_Common {
 				}
 			}
 		}
-		return false; 
+		return false;
 	}
 
 	private function getFeed($feedUri, $httpMethod, $postData = null) {
@@ -174,7 +174,7 @@ class OC_Filestorage_Google extends OC_Filestorage_Common {
 				return 'html';
 		}
 	}
-	
+
 
 	public function mkdir($path) {
 		$collection = dirname($path);
@@ -254,7 +254,7 @@ class OC_Filestorage_Google extends OC_Filestorage_Common {
 		} else if ($entry = $this->getResource($path)) {
 			// NOTE: Native resources don't have a file size
 			$stat['size'] = $entry->getElementsByTagNameNS('http://schemas.google.com/g/2005', 'quotaBytesUsed')->item(0)->nodeValue;
-// 			if (isset($atime = $entry->getElementsByTagNameNS('http://schemas.google.com/g/2005', 'lastViewed')->item(0)->nodeValue)) 
+// 			if (isset($atime = $entry->getElementsByTagNameNS('http://schemas.google.com/g/2005', 'lastViewed')->item(0)->nodeValue))
 // 			$stat['atime'] = strtotime($entry->getElementsByTagNameNS('http://schemas.google.com/g/2005', 'lastViewed')->item(0)->nodeValue);
 			$stat['mtime'] = strtotime($entry->getElementsByTagName('updated')->item(0)->nodeValue);
 			$stat['ctime'] = strtotime($entry->getElementsByTagName('published')->item(0)->nodeValue);
@@ -304,7 +304,7 @@ class OC_Filestorage_Google extends OC_Filestorage_Common {
 		}
 		return false;
 	}
-	
+
 	public function file_exists($path) {
 		if ($path == '' || $path == '/') {
 			return true;
@@ -313,7 +313,7 @@ class OC_Filestorage_Google extends OC_Filestorage_Common {
 		}
 		return false;
 	}
-	
+
 	public function unlink($path) {
 		// Get resource self link to trash resource
 		if ($entry = $this->getResource($path)) {
@@ -482,7 +482,7 @@ class OC_Filestorage_Google extends OC_Filestorage_Common {
 			// TODO Wait for resource entry
 		}
 	}
-	
+
 	public function getMimeType($path, $entry = null) {
 		// Entry can be passed, because extension is required for opendir and the entry can't be cached without the extension
 		if ($entry == null) {
@@ -522,7 +522,7 @@ class OC_Filestorage_Google extends OC_Filestorage_Common {
 		}
 		return false;
 	}
-	
+
 	public function free_space($path) {
 		if ($dom = $this->getFeed('https://docs.google.com/feeds/metadata/default', 'GET')) {
 			// NOTE: Native Google Docs resources don't count towards quota
@@ -532,9 +532,9 @@ class OC_Filestorage_Google extends OC_Filestorage_Common {
 		}
 		return false;
 	}
-  
+
 	public function touch($path, $mtime = null) {
-	  
+
 	}
 
 }
\ No newline at end of file
diff --git a/apps/files_external/lib/swift.php b/apps/files_external/lib/swift.php
index 94ccde1ff8..1868bc4ba7 100644
--- a/apps/files_external/lib/swift.php
+++ b/apps/files_external/lib/swift.php
@@ -274,7 +274,7 @@ class OC_FileStorage_SWIFT extends OC_Filestorage_Common{
 		}
 		$this->auth = new CF_Authentication($this->user, $this->token, null, $this->host);
 		$this->auth->authenticate();
-		
+
 		$this->conn = new CF_Connection($this->auth);
 
 		if(!$this->containerExists($this->root)){
@@ -303,7 +303,7 @@ class OC_FileStorage_SWIFT extends OC_Filestorage_Common{
 				$parentContainer=$this->getContainer(dirname($path));
 				$this->removeSubContainer($parentContainer,basename($path));
 			}
-			
+
 			$this->conn->delete_container($this->getContainerName($path));
 			unset($this->containers[$path]);
 			return true;
@@ -410,7 +410,7 @@ class OC_FileStorage_SWIFT extends OC_Filestorage_Common{
 			case 'rb':
 				$fp = fopen('php://temp', 'r+');
 				$obj->stream($fp);
-				
+
 				rewind($fp);
 				return $fp;
 			case 'w':
@@ -451,7 +451,7 @@ class OC_FileStorage_SWIFT extends OC_Filestorage_Common{
 		if(is_null($mtime)){
 			$mtime=time();
 		}
-		
+
 		//emulate setting mtime with metadata
 		$obj->metadata['Mtime']=$mtime;
 		$obj->sync_metadata();
diff --git a/apps/files_external/lib/webdav.php b/apps/files_external/lib/webdav.php
index e3f73c5c0a..1b9c3e3333 100644
--- a/apps/files_external/lib/webdav.php
+++ b/apps/files_external/lib/webdav.php
@@ -18,7 +18,7 @@ class OC_FileStorage_DAV extends OC_Filestorage_Common{
 	private $client;
 
 	private static $tempFiles=array();
-	
+
 	public function __construct($params){
 		$host = $params['host'];
 		//remove leading http[s], will be generated in createBaseUri()
@@ -35,7 +35,7 @@ class OC_FileStorage_DAV extends OC_Filestorage_Common{
 		if(substr($this->root,-1,1)!='/'){
 			$this->root.='/';
 		}
-		
+
 		$settings = array(
 			'baseUri' => $this->createBaseUri(),
 			'userName' => $this->user,
@@ -43,7 +43,7 @@ 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))  {
@@ -296,4 +296,3 @@ class OC_FileStorage_DAV extends OC_Filestorage_Common{
 		}
 	}
 }
-
diff --git a/apps/files_external/templates/settings.php b/apps/files_external/templates/settings.php
index 397f0d951b..7da9613572 100644
--- a/apps/files_external/templates/settings.php
+++ b/apps/files_external/templates/settings.php
@@ -80,7 +80,7 @@
 			</tbody>
 		</table>
 		<br />
-		
+
 		<?php if (!$_['isAdminPage']):  ?>
   		<table id="sslCertificate" data-admin='<?php echo json_encode($_['isAdminPage']); ?>'>
 			<thead>
@@ -91,17 +91,17 @@
 			</thead>
 			<tbody width="100%">
 			<?php foreach ($_['certs'] as $rootCert): ?>
-			<tr id="<?php echo $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>		
+		</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'); ?>" />		
+        <input type="submit" name="cert_import" value="<?php echo $l->t('Import Root Certificate'); ?>" />
 		<?php endif; ?>
-		
+
 		<?php if ($_['isAdminPage']): ?>
 			<br />
 			<input type="checkbox" name="allowUserMounting" id="allowUserMounting" value="1" <?php if ($_['allowUserMounting'] == 'yes') echo ' checked="checked"'; ?> />
diff --git a/apps/files_external/tests/ftp.php b/apps/files_external/tests/ftp.php
index 97796bca12..3548880e83 100644
--- a/apps/files_external/tests/ftp.php
+++ b/apps/files_external/tests/ftp.php
@@ -5,7 +5,7 @@
  * later.
  * See the COPYING-README file.
  */
- 
+
 $config=include('apps/files_external/tests/config.php');
 if(!is_array($config) or !isset($config['ftp']) or !$config['ftp']['run']){
 	abstract class Test_Filestorage_FTP extends Test_FileStorage{}
@@ -26,4 +26,3 @@ if(!is_array($config) or !isset($config['ftp']) or !$config['ftp']['run']){
 		}
 	}
 }
-
diff --git a/apps/files_external/tests/google.php b/apps/files_external/tests/google.php
index 806db5a6aa..b0bd9cbbea 100644
--- a/apps/files_external/tests/google.php
+++ b/apps/files_external/tests/google.php
@@ -26,7 +26,7 @@ if(!is_array($config) or !isset($config['google']) or !$config['google']['run'])
 	return;
 }else{
 	class Test_Filestorage_Google extends Test_FileStorage {
-		
+
 		private $config;
 
 		public function setUp(){
@@ -41,4 +41,3 @@ if(!is_array($config) or !isset($config['google']) or !$config['google']['run'])
 		}
 	}
 }
-
diff --git a/apps/files_external/tests/swift.php b/apps/files_external/tests/swift.php
index 1520c9473d..bfe7b77aac 100644
--- a/apps/files_external/tests/swift.php
+++ b/apps/files_external/tests/swift.php
@@ -21,11 +21,10 @@ if(!is_array($config) or !isset($config['swift']) or !$config['swift']['run']){
 			$this->instance=new OC_Filestorage_SWIFT($this->config['swift']);
 		}
 
-		
+
 		public function tearDown(){
 		    $this->instance->rmdir('');
 		}
-		
+
 	}
 }
-
diff --git a/apps/files_external/tests/webdav.php b/apps/files_external/tests/webdav.php
index 14abbef2cb..49c44124f3 100644
--- a/apps/files_external/tests/webdav.php
+++ b/apps/files_external/tests/webdav.php
@@ -26,4 +26,3 @@ if(!is_array($config) or !isset($config['webdav']) or !$config['webdav']['run'])
 		}
 	}
 }
-
diff --git a/apps/files_sharing/appinfo/update.php b/apps/files_sharing/appinfo/update.php
index b43269d69f..feafa5fb99 100644
--- a/apps/files_sharing/appinfo/update.php
+++ b/apps/files_sharing/appinfo/update.php
@@ -4,13 +4,13 @@
 $datadir = \OCP\Config::getSystemValue('datadirectory');
 $currentVersion=OC_Appconfig::getValue('files_sharing', 'installed_version');
 if (version_compare($currentVersion, '0.2.2', '<')) {
-	if ($handle = opendir($datadir)) {
-		while (false !== ($entry = readdir($handle))) {
-			$sharedFolder = $datadir.'/'.$entry.'/files/Shared';
-			if ($entry != "." && $entry != ".." && is_dir($sharedFolder)) {
-				touch($sharedFolder);
-			}
-		}
-		closedir($handle);
+	if ($handle = opendir($datadir)) {
+		while (false !== ($entry = readdir($handle))) {
+			$sharedFolder = $datadir.'/'.$entry.'/files/Shared';
+			if ($entry != "." && $entry != ".." && is_dir($sharedFolder)) {
+				touch($sharedFolder);
+			}
+		}
+		closedir($handle);
 	}
 }
\ No newline at end of file
diff --git a/apps/files_sharing/lib/share/file.php b/apps/files_sharing/lib/share/file.php
index 5005d9a39d..b1e3ca8b48 100644
--- a/apps/files_sharing/lib/share/file.php
+++ b/apps/files_sharing/lib/share/file.php
@@ -27,7 +27,7 @@ class OC_Share_Backend_File implements OCP\Share_Backend_File_Dependent {
 	const FORMAT_OPENDIR = 3;
 
 	private $path;
-	
+
 	public function isValidSource($itemSource, $uidOwner) {
 		$path = OC_FileCache::getPath($itemSource, $uidOwner);
 		if (OC_Filesystem::file_exists($path)) {
@@ -94,7 +94,7 @@ class OC_Share_Backend_File implements OCP\Share_Backend_File_Dependent {
 				$files[] = basename($item['file_target']);
 			}
 			return $files;
-		} 
+		}
 		return array();
 	}
 
diff --git a/apps/files_sharing/lib/sharedstorage.php b/apps/files_sharing/lib/sharedstorage.php
index a3a8750d27..df5d4d20ae 100644
--- a/apps/files_sharing/lib/sharedstorage.php
+++ b/apps/files_sharing/lib/sharedstorage.php
@@ -24,10 +24,10 @@
  * 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 $sharedFolder;
 	private $files = array();
-	
+
 	public function __construct($arguments) {
 		$this->sharedFolder = $arguments['sharedFolder'];
 		OC_Util::setupFS4all();
@@ -106,17 +106,17 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
 		$internalPath = substr($path, strlen($mountPoint));
 		return $internalPath;
 	}
-	
+
 	public function mkdir($path) {
 		if ($path == '' || $path == '/' || !$this->isCreatable(dirname($path))) {
-			return false; 
+			return false;
 		} else if ($source = $this->getSourcePath($path)) {
 			$storage = OC_Filesystem::getStorage($source);
 			return $storage->mkdir($this->getInternalPath($source));
 		}
 		return false;
 	}
-	
+
 	public function rmdir($path) {
 		if (($source = $this->getSourcePath($path)) && $this->isDeletable($path)) {
 			$storage = OC_Filesystem::getStorage($source);
@@ -124,7 +124,7 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
 		}
 		return false;
 	}
-	
+
 	public function opendir($path) {
 		if ($path == '' || $path == '/') {
 			$files = OCP\Share::getItemsSharedWith('file', OC_Share_Backend_Folder::FORMAT_OPENDIR);
@@ -229,10 +229,10 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
 		}
 		return false;
 	}
-	
+
 	public function filectime($path) {
 		if ($path == '' || $path == '/') {
-			$ctime = 0; 
+			$ctime = 0;
 			if ($dh = $this->opendir($path)) {
 				while (($filename = readdir($dh)) !== false) {
 					$tempctime = $this->filectime($filename);
@@ -250,10 +250,10 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
 			}
 		}
 	}
-	
+
 	public function filemtime($path) {
 		if ($path == '' || $path == '/') {
-			$mtime = 0; 
+			$mtime = 0;
 			if ($dh = $this->opendir($path)) {
 				while (($filename = readdir($dh)) !== false) {
 					$tempmtime = $this->filemtime($filename);
@@ -271,7 +271,7 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
 			}
 		}
 	}
-	
+
 	public function file_get_contents($path) {
 		$source = $this->getSourcePath($path);
 		if ($source) {
@@ -284,7 +284,7 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
 			return $storage->file_get_contents($this->getInternalPath($source));
 		}
 	}
-	
+
 	public function file_put_contents($path, $data) {
 		if ($source = $this->getSourcePath($path)) {
 			// Check if permission is granted
@@ -302,7 +302,7 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
 		}
 		return false;
 	}
-	
+
 	public function unlink($path) {
 		// Delete the file if DELETE permission is granted
 		if (($source = $this->getSourcePath($path)) && $this->isDeletable($path)) {
@@ -311,7 +311,7 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
 		}
 		return false;
 	}
-	
+
 	public function rename($path1, $path2) {
 		// Renaming/moving is only allowed within shared folders
 		$pos1 = strpos($path1, '/', 1);
@@ -344,7 +344,7 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
 		}
 		return false;
 	}
-	
+
 	public function copy($path1, $path2) {
 		// Copy the file if CREATE permission is granted
 		if ($this->isCreatable(dirname($path2))) {
diff --git a/apps/files_versions/ajax/expireAll.php b/apps/files_versions/ajax/expireAll.php
index 2a678c7f0a..f76da3da98 100644
--- a/apps/files_versions/ajax/expireAll.php
+++ b/apps/files_versions/ajax/expireAll.php
@@ -32,13 +32,13 @@ OCP\JSON::callCheck();
 $versions = new OCA_Versions\Storage();
 
 if( $versions->expireAll() ){
-	
+
 	OCP\JSON::success();
 	die();
-	
+
 } else {
-	
+
 	OCP\JSON::error();
 	die();
-	
+
 }
\ No newline at end of file
diff --git a/apps/files_versions/ajax/getVersions.php b/apps/files_versions/ajax/getVersions.php
index 1a0e21732c..8476e5e8a5 100644
--- a/apps/files_versions/ajax/getVersions.php
+++ b/apps/files_versions/ajax/getVersions.php
@@ -9,19 +9,19 @@ if( OCA_Versions\Storage::isversioned( $source ) ) {
 	$count=5; //show the newest revisions
 	$versions = OCA_Versions\Storage::getVersions( $source, $count);
 	$versionsFormatted = array();
-	
+
 	foreach ( $versions AS $version ) {
 		$versionsFormatted[] = OCP\Util::formatDate( $version['version'] );
 	}
 
 	$versionsSorted = array_reverse( $versions );
-	
+
 	if ( !empty( $versionsSorted ) ) {
 		OCP\JSON::encodedPrint($versionsSorted);
 	}
-	
+
 } else {
 
 	return;
-	
+
 }
diff --git a/apps/files_versions/appinfo/update.php b/apps/files_versions/appinfo/update.php
index 9569ca1048..e289b927b3 100644
--- a/apps/files_versions/appinfo/update.php
+++ b/apps/files_versions/appinfo/update.php
@@ -6,11 +6,11 @@ if (version_compare($installedVersion, '1.0.2', '<')) {
 	$users = \OCP\User::getUsers();
 	$datadir =  \OCP\Config::getSystemValue('datadirectory').'/';
     foreach ($users as $user) {
-    	$oldPath = $datadir.$user.'/versions';
+    	$oldPath = $datadir.$user.'/versions';
     	$newPath = $datadir.$user.'/files_versions';
     	if(is_dir($oldPath)) {
     		rename($oldPath, $newPath);
     	}
     }
-	
+
 }
diff --git a/apps/files_versions/history.php b/apps/files_versions/history.php
index 27dc8bfc38..ea36d6d9f8 100644
--- a/apps/files_versions/history.php
+++ b/apps/files_versions/history.php
@@ -5,20 +5,20 @@
  *
  * @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 
+ * 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/>.
- * 
+ *
  */
 
 OCP\User::checkLoggedIn( );
@@ -34,40 +34,40 @@ if ( isset( $_GET['path'] ) ) {
 
 	// roll back to old version if button clicked
         if( isset( $_GET['revert'] ) ) {
-        	
+
         	if( $versions->rollback( $path, $_GET['revert'] ) ) {
-			
+
 			$tmpl->assign( 'outcome_stat', 'success' );
-			
+
 			$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( doubleval($_GET['revert']) ) );
-			
+
 		}
-		
+
 	}
 
 	// 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);
 
 		$tmpl->assign( 'versions', array_reverse( $versions ) );
-		
+
 	}else{
-		
+
 		$tmpl->assign( 'message', 'No old versions available' );
-		
+
 	}
 }else{
-	
+
 	$tmpl->assign( 'message', 'No path specified' );
-	
+
 }
 
 $tmpl->printPage( );
diff --git a/apps/files_versions/js/settings-personal.js b/apps/files_versions/js/settings-personal.js
index 6ea8c1a950..1e6b036fda 100644
--- a/apps/files_versions/js/settings-personal.js
+++ b/apps/files_versions/js/settings-personal.js
@@ -2,16 +2,16 @@
 
 $( document ).ready(function(){
 	//
-	$( '#expireAllBtn' ).click( 
-		
+	$( '#expireAllBtn' ).click(
+
 		function( event ) {
-		
+
 			// Prevent page from reloading
 			event.preventDefault();
-			
+
 			// Show loading gif
 			$('.expireAllLoading').show();
-		
+
 			$.getJSON(
 				OC.filePath('files_versions','ajax','expireAll.php'),
 				function(result){
@@ -19,20 +19,20 @@ $( document ).ready(function(){
 						$('.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')+'" />'); 
-							}	
-						);		
+							'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')+'" />');
+							}
+						);
 					}
-				}	
+				}
 			);
 		}
 	);
diff --git a/apps/files_versions/js/versions.js b/apps/files_versions/js/versions.js
index c5c1553f1a..e34a6f50ca 100644
--- a/apps/files_versions/js/versions.js
+++ b/apps/files_versions/js/versions.js
@@ -14,7 +14,7 @@ $(document).ready(function(){
 		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
-			
+
 			var file = $('#dir').val()+'/'+filename;
 			// Check if drop down is already visible for a different file
 			if (($('#dropdown').length > 0)) {
@@ -35,7 +35,7 @@ $(document).ready(function(){
 function createVersionsDropdown(filename, files) {
 
 	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="Saved versions" id="found_versions" class="chzen-select" style="width:16em;">';
@@ -45,14 +45,14 @@ function createVersionsDropdown(filename, files) {
 	//html += '<input type="button" value="Revert file" onclick="revertFile()" />';
 	html += '<input type="button" value="All versions..." onclick="window.location=\''+historyUrl+'\'" name="makelink" id="makelink" />';
 	html += '<input id="link" style="display:none; width:90%;" />';
-	
+
 	if (filename) {
 		$('tr').filterAttr('data-file',filename).addClass('mouseOver');
 		$(html).appendTo($('tr').filterAttr('data-file',filename).find('td.filename'));
 	} else {
 		$(html).appendTo($('thead .share'));
 	}
-	
+
 	$.ajax({
 		type: 'GET',
 		url: OC.filePath('files_versions', 'ajax', 'getVersions.php'),
@@ -60,9 +60,9 @@ function createVersionsDropdown(filename, files) {
 		data: { source: files },
 		async: false,
 		success: function( versions ) {
-			
+
 			//alert("helo "+OC.linkTo('files_versions', 'ajax/getVersions.php'));
-			
+
 			if (versions) {
 				$.each( versions, function(index, row ) {
 					addVersion( row );
@@ -79,9 +79,9 @@ function createVersionsDropdown(filename, files) {
 			})
 		}
 	});
-	
+
 	function revertFile(file, revision) {
-		
+
 		$.ajax({
 			type: 'GET',
 			url: OC.linkTo('files_versions', 'ajax/rollbackVersion.php'),
@@ -99,16 +99,16 @@ function createVersionsDropdown(filename, files) {
 					});
 				}
 			}
-		});	
-	
+		});
+
 	}
-	
+
 	function addVersion(revision ) {
 		name=formatDate(revision.version*1000);
 		var version=$('<option/>');
 		version.attr('value',revision.version);
 		version.text(name);
-		
+
 // 		} else {
 // 			var checked = ((permissions > 0) ? 'checked="checked"' : 'style="display:none;"');
 // 			var style = ((permissions == 0) ? 'style="display:none;"' : '');
@@ -119,11 +119,11 @@ function createVersionsDropdown(filename, files) {
 // 			user += '<label for="'+uid_shared_with+'" '+style+'>can edit</label>';
 // 			user += '</li>';
 // 		}
-		
+
 		version.appendTo('#found_versions');
 	}
 
 	$('#dropdown').show('blind');
-	
-	
+
+
 }
diff --git a/apps/files_versions/templates/history.php b/apps/files_versions/templates/history.php
index 1b44255642..d4f875a36e 100644
--- a/apps/files_versions/templates/history.php
+++ b/apps/files_versions/templates/history.php
@@ -11,14 +11,14 @@ if( isset( $_['message'] ) ) {
 }else{
 
 	if( isset( $_['outcome_stat'] ) ) {
-		
+
 		echo( '<div id="feedback-messages" class="'.$_['outcome_stat'].'"><h3>'.$_['outcome_msg'] ).'</h3></div><br>';
 
 	}
 
 	echo( '<strong>Versions of '.$_['path'] ).'</strong><br>';
 	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( doubleval($v['version']) );
diff --git a/apps/user_webdavauth/user_webdavauth.php b/apps/user_webdavauth/user_webdavauth.php
index 71c503f940..4490b1e451 100755
--- a/apps/user_webdavauth/user_webdavauth.php
+++ b/apps/user_webdavauth/user_webdavauth.php
@@ -23,11 +23,11 @@
 
 class OC_USER_WEBDAVAUTH extends OC_User_Backend {
 	protected $webdavauth_url;
-	
+
 	public function __construct() {
 		$this->webdavauth_url = OC_Config::getValue( "user_webdavauth_url" );
 	}
-	
+
 	public function createUser() {
 		// Can't create user
 		OC_Log::write('OC_USER_WEBDAVAUTH', 'Not possible to create users from web frontend using WebDAV user backend',3);
@@ -45,14 +45,14 @@ class OC_USER_WEBDAVAUTH extends OC_User_Backend {
 		OC_Log::write('OC_USER_WEBDAVAUTH', 'Not possible to change password for users from web frontend using WebDAV user backend',3);
 		return false;
 	}
-	
+
 	public function checkPassword( $uid, $password ) {
 
 		$url= 'http://'.urlencode($uid).':'.urlencode($password).'@'.$this->webdavauth_url;
 		$headers = get_headers($url);
 		if($headers==false){
 			OC_Log::write('OC_USER_WEBDAVAUTH', 'Not possible to connect to WebDAV Url: "'.$this->webdavauth_url.'" ' ,3);
-			return false;	
+			return false;
 
 		}
 		$returncode= substr($headers[0], 9, 3);
@@ -64,7 +64,7 @@ class OC_USER_WEBDAVAUTH extends OC_User_Backend {
 		}
 
 	}
-	
+
 	/*
 	* we don´t know if a user exists without the password. so we have to return false all the time
 	*/
@@ -77,7 +77,7 @@ class OC_USER_WEBDAVAUTH extends OC_User_Backend {
 	*/
 	public function getUsers(){
 		$returnArray = array();
-		
+
 		return $returnArray;
 	}
 }

From 0365f8fd017bef03c832d4c18224c305cdc0b81f Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Wed, 29 Aug 2012 08:45:27 +0200
Subject: [PATCH 0991/1224] Remove php close at end of file

---
 apps/files_external/ajax/addRootCertificate.php    | 1 -
 apps/files_external/ajax/dropbox.php               | 2 --
 apps/files_external/ajax/google.php                | 2 --
 apps/files_external/ajax/removeRootCertificate.php | 1 -
 apps/files_external/lib/amazons3.php               | 2 --
 apps/files_external/lib/dropbox.php                | 2 --
 apps/files_external/personal.php                   | 2 --
 apps/files_external/settings.php                   | 2 --
 apps/files_external/tests/test.php                 | 1 -
 apps/files_versions/appinfo/api.php                | 2 --
 apps/files_versions/settings-personal.php          | 1 -
 apps/user_webdavauth/appinfo/app.php               | 1 -
 apps/user_webdavauth/settings.php                  | 4 ----
 apps/user_webdavauth/user_webdavauth.php           | 2 --
 lib/MDB2/Driver/Datatype/sqlite3.php               | 2 --
 lib/MDB2/Driver/Native/sqlite3.php                 | 1 -
 lib/MDB2/Driver/Reverse/sqlite3.php                | 2 --
 lib/public/share.php                               | 2 --
 18 files changed, 32 deletions(-)

diff --git a/apps/files_external/ajax/addRootCertificate.php b/apps/files_external/ajax/addRootCertificate.php
index 1aa40bd8aa..a8719fc7a3 100644
--- a/apps/files_external/ajax/addRootCertificate.php
+++ b/apps/files_external/ajax/addRootCertificate.php
@@ -25,4 +25,3 @@ OC_Mount_Config::createCertificateBundle();
 
 header("Location: settings/personal.php");
 exit;
-?>
\ No newline at end of file
diff --git a/apps/files_external/ajax/dropbox.php b/apps/files_external/ajax/dropbox.php
index 5f2ff17e62..f5923940dc 100644
--- a/apps/files_external/ajax/dropbox.php
+++ b/apps/files_external/ajax/dropbox.php
@@ -37,5 +37,3 @@ if (isset($_POST['app_key']) && isset($_POST['app_secret'])) {
 } 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/ajax/google.php b/apps/files_external/ajax/google.php
index 23ecfc3708..4cd01c06cc 100644
--- a/apps/files_external/ajax/google.php
+++ b/apps/files_external/ajax/google.php
@@ -47,5 +47,3 @@ if (isset($_POST['step'])) {
 			break;
 	}
 }
-
-?>
\ No newline at end of file
diff --git a/apps/files_external/ajax/removeRootCertificate.php b/apps/files_external/ajax/removeRootCertificate.php
index f78f85b8fe..9b78e180d9 100644
--- a/apps/files_external/ajax/removeRootCertificate.php
+++ b/apps/files_external/ajax/removeRootCertificate.php
@@ -9,4 +9,3 @@ $cert = $_POST['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/amazons3.php b/apps/files_external/lib/amazons3.php
index 34f8ba2557..41ec3c70b4 100644
--- a/apps/files_external/lib/amazons3.php
+++ b/apps/files_external/lib/amazons3.php
@@ -232,5 +232,3 @@ class OC_Filestorage_AmazonS3 extends OC_Filestorage_Common {
 	}
 
 }
-
-?>
\ No newline at end of file
diff --git a/apps/files_external/lib/dropbox.php b/apps/files_external/lib/dropbox.php
index b90563a506..bb86894e55 100755
--- a/apps/files_external/lib/dropbox.php
+++ b/apps/files_external/lib/dropbox.php
@@ -251,5 +251,3 @@ class OC_Filestorage_Dropbox extends OC_Filestorage_Common {
 	}
 
 }
-
-?>
\ No newline at end of file
diff --git a/apps/files_external/personal.php b/apps/files_external/personal.php
index dec501741b..f0d76460f5 100755
--- a/apps/files_external/personal.php
+++ b/apps/files_external/personal.php
@@ -31,5 +31,3 @@ $tmpl->assign('mounts', OC_Mount_Config::getPersonalMountPoints());
 $tmpl->assign('certs', OC_Mount_Config::getCertificates());
 $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 acc9036b29..b586ce1e8c 100644
--- a/apps/files_external/settings.php
+++ b/apps/files_external/settings.php
@@ -30,5 +30,3 @@ $tmpl->assign('groups', OC_Group::getGroups());
 $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/tests/test.php b/apps/files_external/tests/test.php
index bd24404f3b..5387279fb0 100644
--- a/apps/files_external/tests/test.php
+++ b/apps/files_external/tests/test.php
@@ -4,4 +4,3 @@ echo "<pre>";
 print_r(OC_Mount_Config::getSystemMountPoints());
 echo "</pre>";
 // OC_Mount_Config::addMountPoint('Photos', 'OC_Filestorage_SWIFT', array('host' => 'gapinthecloud.com', 'user' => 'Gap', 'token' => '23423afdasFJEW22', 'secure' => 'true', 'root' => ''), OC_Mount_Config::MOUNT_TYPE_GROUP, 'admin', false);
-?>
diff --git a/apps/files_versions/appinfo/api.php b/apps/files_versions/appinfo/api.php
index a7386bc2c9..3c45ff5245 100644
--- a/apps/files_versions/appinfo/api.php
+++ b/apps/files_versions/appinfo/api.php
@@ -32,5 +32,3 @@ return array(
 		)
 	)
 );
-
-?>
\ No newline at end of file
diff --git a/apps/files_versions/settings-personal.php b/apps/files_versions/settings-personal.php
index db80172979..4fb866bd99 100644
--- a/apps/files_versions/settings-personal.php
+++ b/apps/files_versions/settings-personal.php
@@ -5,4 +5,3 @@ $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/user_webdavauth/appinfo/app.php b/apps/user_webdavauth/appinfo/app.php
index db1087449a..ebadcf30b6 100755
--- a/apps/user_webdavauth/appinfo/app.php
+++ b/apps/user_webdavauth/appinfo/app.php
@@ -35,4 +35,3 @@ $entry = array(
 	'href' => OC_Helper::linkTo( "user_webdavauth", "settings.php" ),
 	'name' => 'WEBDAVAUTH'
 );
-?>
diff --git a/apps/user_webdavauth/settings.php b/apps/user_webdavauth/settings.php
index 5bd1af53c9..1b80b1bba3 100755
--- a/apps/user_webdavauth/settings.php
+++ b/apps/user_webdavauth/settings.php
@@ -34,7 +34,3 @@ $tmpl = new OC_Template( 'user_webdavauth', 'settings');
 $tmpl->assign( 'webdav_url', OC_Config::getValue( "user_webdavauth_url" ));
 
 return $tmpl->fetchPage();
-
-
-
-?>
diff --git a/apps/user_webdavauth/user_webdavauth.php b/apps/user_webdavauth/user_webdavauth.php
index 4490b1e451..571aca2f70 100755
--- a/apps/user_webdavauth/user_webdavauth.php
+++ b/apps/user_webdavauth/user_webdavauth.php
@@ -81,5 +81,3 @@ class OC_USER_WEBDAVAUTH extends OC_User_Backend {
 		return $returnArray;
 	}
 }
-
-?>
diff --git a/lib/MDB2/Driver/Datatype/sqlite3.php b/lib/MDB2/Driver/Datatype/sqlite3.php
index d74badbe4f..66c68b9377 100644
--- a/lib/MDB2/Driver/Datatype/sqlite3.php
+++ b/lib/MDB2/Driver/Datatype/sqlite3.php
@@ -383,5 +383,3 @@ class MDB2_Driver_Datatype_sqlite3 extends MDB2_Driver_Datatype_Common
 
     // }}}
 }
-
-?>
\ No newline at end of file
diff --git a/lib/MDB2/Driver/Native/sqlite3.php b/lib/MDB2/Driver/Native/sqlite3.php
index de65010723..344d523bdf 100644
--- a/lib/MDB2/Driver/Native/sqlite3.php
+++ b/lib/MDB2/Driver/Native/sqlite3.php
@@ -31,4 +31,3 @@ require_once 'MDB2/Driver/Native/Common.php';
 class MDB2_Driver_Native_sqlite extends MDB2_Driver_Native_Common
 {
 }
-?>
\ No newline at end of file
diff --git a/lib/MDB2/Driver/Reverse/sqlite3.php b/lib/MDB2/Driver/Reverse/sqlite3.php
index 33e5b59026..e5c758e350 100644
--- a/lib/MDB2/Driver/Reverse/sqlite3.php
+++ b/lib/MDB2/Driver/Reverse/sqlite3.php
@@ -584,5 +584,3 @@ class MDB2_Driver_Reverse_sqlite3 extends MDB2_Driver_Reverse_Common
            'This DBMS can not obtain tableInfo from result sets', __FUNCTION__);
     }
 }
-
-?>
\ No newline at end of file
diff --git a/lib/public/share.php b/lib/public/share.php
index 91b1bffc2d..9ad0f0f68f 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -1119,5 +1119,3 @@ interface Share_Backend_Collection extends Share_Backend {
 	public function getChildren($itemSource);
 
 }
-
-?>

From 9e32e0730644a4340b2f88b0d8750fd1f8e8903a Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Wed, 29 Aug 2012 17:25:37 +0200
Subject: [PATCH 0992/1224] Fix OC_Cache_File

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

diff --git a/lib/cache/file.php b/lib/cache/file.php
index a51f0d68f8..ed5212bc3d 100644
--- a/lib/cache/file.php
+++ b/lib/cache/file.php
@@ -10,8 +10,8 @@
 class OC_Cache_File{
 	protected static $storage;
 	protected function getStorage() {
-		if (isset(self::$storage)) {
-			return self::$storage;
+		if (isset($this->storage)) {
+			return $this->storage;
 		}
 		if(OC_User::isLoggedIn()){
 			$subdir = 'cache';
@@ -19,8 +19,8 @@ class OC_Cache_File{
 			if(!$view->file_exists($subdir)) {
 				$view->mkdir($subdir);
 			}
-			self::$storage = new OC_FilesystemView('/'.OC_User::getUser().'/'.$subdir);
-			return self::$storage;
+			$this->storage = new OC_FilesystemView('/'.OC_User::getUser().'/'.$subdir);
+			return $this->storage;
 		}else{
 			OC_Log::write('core','Can\'t get cache storage, user not logged in', OC_Log::ERROR);
 			return false;

From db18218a1bba86e364fd4fec08c2e1a0eb4e7b16 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Wed, 29 Aug 2012 20:34:44 +0200
Subject: [PATCH 0993/1224] Space before tab fixes

---
 apps/files/templates/part.breadcrumb.php   |  2 +-
 apps/files_external/templates/settings.php |  2 +-
 apps/files_versions/appinfo/update.php     | 15 ++++++-------
 apps/files_versions/history.php            |  2 +-
 apps/user_ldap/tests/group_ldap.php        |  2 +-
 lib/app.php                                |  4 ++--
 lib/base.php                               |  2 +-
 lib/db.php                                 | 26 +++++++++++-----------
 lib/ocsclient.php                          |  2 +-
 lib/public/json.php                        |  2 +-
 lib/public/util.php                        |  2 +-
 lib/setup.php                              |  6 ++---
 lib/template.php                           |  4 ++--
 lib/util.php                               |  2 +-
 lib/vcategories.php                        |  2 +-
 15 files changed, 37 insertions(+), 38 deletions(-)

diff --git a/apps/files/templates/part.breadcrumb.php b/apps/files/templates/part.breadcrumb.php
index 22d9bb4490..875fc747bb 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 OCP\Util::sanitizeHTML($crumb["name"]); ?></a>
+		<a href="<?php echo $_['baseURL'].$crumb["dir"]; ?>"><?php echo OCP\Util::sanitizeHTML($crumb["name"]); ?></a>
 		</div>
 	<?php endfor;?>
diff --git a/apps/files_external/templates/settings.php b/apps/files_external/templates/settings.php
index 7da9613572..c44b09b180 100644
--- a/apps/files_external/templates/settings.php
+++ b/apps/files_external/templates/settings.php
@@ -82,7 +82,7 @@
 		<br />
 
 		<?php if (!$_['isAdminPage']):  ?>
-  		<table id="sslCertificate" data-admin='<?php echo json_encode($_['isAdminPage']); ?>'>
+		<table id="sslCertificate" data-admin='<?php echo json_encode($_['isAdminPage']); ?>'>
 			<thead>
 				<tr>
 					<th><?php echo $l->t('SSL root certificates'); ?></th>
diff --git a/apps/files_versions/appinfo/update.php b/apps/files_versions/appinfo/update.php
index e289b927b3..52a4850758 100644
--- a/apps/files_versions/appinfo/update.php
+++ b/apps/files_versions/appinfo/update.php
@@ -5,12 +5,11 @@ $installedVersion=OCP\Config::getAppValue('files_versions', 'installed_version')
 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);
-    	}
-    }
-
+	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/history.php b/apps/files_versions/history.php
index ea36d6d9f8..0ebb34f45e 100644
--- a/apps/files_versions/history.php
+++ b/apps/files_versions/history.php
@@ -35,7 +35,7 @@ if ( isset( $_GET['path'] ) ) {
 	// roll back to old version if button clicked
         if( isset( $_GET['revert'] ) ) {
 
-        	if( $versions->rollback( $path, $_GET['revert'] ) ) {
+		if( $versions->rollback( $path, $_GET['revert'] ) ) {
 
 			$tmpl->assign( 'outcome_stat', 'success' );
 
diff --git a/apps/user_ldap/tests/group_ldap.php b/apps/user_ldap/tests/group_ldap.php
index 106459580f..ac66a608b7 100644
--- a/apps/user_ldap/tests/group_ldap.php
+++ b/apps/user_ldap/tests/group_ldap.php
@@ -29,7 +29,7 @@ class Test_Group_Ldap extends UnitTestCase {
 		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(OC_Group::getGroups(),gettype(array()));
 		$this->assertIsA($group_ldap->getGroups(),gettype(array()));
 
 		$this->assertFalse(OC_Group::inGroup('john','dosers'),gettype(false));
diff --git a/lib/app.php b/lib/app.php
index 7431590346..f6708ecb3d 100755
--- a/lib/app.php
+++ b/lib/app.php
@@ -286,7 +286,7 @@ class OC_App{
 		if(OC_Config::getValue('knowledgebaseenabled', true)==true){
 			$settings = array(
 				array( "id" => "help", "order" => 1000, "href" => OC_Helper::linkTo( "settings", "help.php" ), "name" => $l->t("Help"), "icon" => OC_Helper::imagePath( "settings", "help.svg" ))
- 			);
+			);
 		}
 
 		// if the user is logged-in
@@ -313,7 +313,7 @@ class OC_App{
 
 				$settings[]=array( "id" => "admin", "order" => 1000, "href" => OC_Helper::linkTo( "settings", "admin.php" ), "name" => $l->t("Admin"), "icon" => OC_Helper::imagePath( "settings", "admin.svg" ));
 			}
- 		}
+		}
 
 		$navigation = self::proceedNavigation($settings);
 		return $navigation;
diff --git a/lib/base.php b/lib/base.php
index 0c3ab8527a..1798bf09b9 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -533,7 +533,7 @@ class OC{
 	protected static function tryBasicAuthLogin() {
 		if (!isset($_SERVER["PHP_AUTH_USER"])
 		 || !isset($_SERVER["PHP_AUTH_PW"])){
-		 	return false;
+			return false;
 		}
 		OC_App::loadApps(array('authentication'));
 		if (OC_User::login($_SERVER["PHP_AUTH_USER"],$_SERVER["PHP_AUTH_PW"]))	{
diff --git a/lib/db.php b/lib/db.php
index ecaf9e37ee..de72dee255 100644
--- a/lib/db.php
+++ b/lib/db.php
@@ -592,21 +592,21 @@ class OC_DB {
 	 * @param $file string path to the MDB2 xml db export file
 	 */
 	public static function replaceDB( $file ){
-	 	$apps = OC_App::getAllApps();
-	 	self::beginTransaction();
-	 	// Delete the old tables
-	 	self::removeDBStructure( OC::$SERVERROOT . '/db_structure.xml' );
+		$apps = OC_App::getAllApps();
+		self::beginTransaction();
+		// Delete the old tables
+		self::removeDBStructure( OC::$SERVERROOT . '/db_structure.xml' );
 
-	 	foreach($apps as $app){
-	 		$path = OC_App::getAppPath($app).'/appinfo/database.xml';
-	 		if(file_exists($path)){
-	 			self::removeDBStructure( $path );
-	 		}
-	 	}
+		foreach($apps as $app){
+			$path = OC_App::getAppPath($app).'/appinfo/database.xml';
+			if(file_exists($path)){
+				self::removeDBStructure( $path );
+			}
+		}
 
-	 	// Create new tables
-	 	self::createDBFromStructure( $file );
-	 	self::commit();
+		// Create new tables
+		self::createDBFromStructure( $file );
+		self::commit();
 
 	 }
 
diff --git a/lib/ocsclient.php b/lib/ocsclient.php
index 9d51004669..f05a9af31c 100644
--- a/lib/ocsclient.php
+++ b/lib/ocsclient.php
@@ -187,7 +187,7 @@ class OC_OCSClient{
 		if(isset($tmp->downloadlink)) {
 			$app['downloadlink']=$tmp->downloadlink;
 		}else{
-	 		$app['downloadlink']='';
+			$app['downloadlink']='';
 		}
 		return $app;
 	}
diff --git a/lib/public/json.php b/lib/public/json.php
index 2a74535f41..c37b42c3f7 100644
--- a/lib/public/json.php
+++ b/lib/public/json.php
@@ -92,7 +92,7 @@ class JSON {
 	* Send json success msg
 	*
 	* Return a json success message with optional extra data.
-	* @see OCP\JSON::error() 		for the format to use.
+	* @see OCP\JSON::error()		for the format to use.
 	*
 	* @param array $data The data to use
 	* @return string json formatted string.
diff --git a/lib/public/util.php b/lib/public/util.php
index 8d7303bf7a..6ad578441e 100644
--- a/lib/public/util.php
+++ b/lib/public/util.php
@@ -260,7 +260,7 @@ class Util {
 
 
 	/**
- 	 * Register an get/post call. This is important to prevent CSRF attacks
+	 * Register an get/post call. This is important to prevent CSRF attacks
 	 * TODO: write example
 	 */
 	public static function callRegister(){
diff --git a/lib/setup.php b/lib/setup.php
index e60a461deb..271fe55fd7 100644
--- a/lib/setup.php
+++ b/lib/setup.php
@@ -84,8 +84,8 @@ class OC_Setup {
 
 			//write the config file
 			OC_Config::setValue('datadirectory', $datadir);
- 			OC_Config::setValue('dbtype', $dbtype);
- 			OC_Config::setValue('version',implode('.',OC_Util::getVersion()));
+			OC_Config::setValue('dbtype', $dbtype);
+			OC_Config::setValue('version',implode('.',OC_Util::getVersion()));
 			if($dbtype == 'mysql') {
 				$dbuser = $options['dbuser'];
 				$dbpass = $options['dbpass'];
@@ -552,7 +552,7 @@ class OC_Setup {
 		$content.= "</IfModule>\n";
 		$content.= "<IfModule mod_rewrite.c>\n";
 		$content.= "RewriteEngine on\n";
- 		$content.= "RewriteRule .* - [env=HTTP_AUTHORIZATION:%{HTTP:Authorization}]\n";
+		$content.= "RewriteRule .* - [env=HTTP_AUTHORIZATION:%{HTTP:Authorization}]\n";
 		$content.= "RewriteRule ^.well-known/host-meta /public.php?service=host-meta [QSA,L]\n";
 		$content.= "RewriteRule ^.well-known/carddav /remote.php/carddav/ [R]\n";
 		$content.= "RewriteRule ^.well-known/caldav /remote.php/caldav/ [R]\n";
diff --git a/lib/template.php b/lib/template.php
index 609c8da976..fe8a3c7994 100644
--- a/lib/template.php
+++ b/lib/template.php
@@ -171,8 +171,8 @@ class OC_Template{
 	 * 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.
+	 *	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
diff --git a/lib/util.php b/lib/util.php
index f543f742ac..24f80b9389 100755
--- a/lib/util.php
+++ b/lib/util.php
@@ -219,7 +219,7 @@ class OC_Util {
 		$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.";
+			$permissionsModHint="Please change the permissions to 0770 so that the directory cannot be listed by other users.";
 			$prems=substr(decoct(@fileperms($CONFIG_DATADIRECTORY)),-3);
 			if(substr($prems,-1)!='0'){
 				OC_Helper::chmodr($CONFIG_DATADIRECTORY,0770);
diff --git a/lib/vcategories.php b/lib/vcategories.php
index 60cc034f78..05dfe18db6 100644
--- a/lib/vcategories.php
+++ b/lib/vcategories.php
@@ -129,7 +129,7 @@ class OC_VCategories {
 	*			$objects[] = $row['carddata'];
 	*		}
 	*	}
-	* 	$categories->rescan($objects);
+	*	$categories->rescan($objects);
 	*/
 	public function rescan($objects, $sync=true, $reset=true) {
 		if($reset === true) {

From 3828d86191e7a0ecf8acbdddbb703352983178e1 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Wed, 29 Aug 2012 14:07:53 -0400
Subject: [PATCH 0994/1224] Remove old Javascript code

---
 core/js/share.js | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/core/js/share.js b/core/js/share.js
index fa412c7acc..8bfbdd36e1 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -429,8 +429,4 @@ $(document).ready(function() {
 			});
 		}
 	});
-
-	$('#emailPrivateLink').live('submit', function() {
-		OC.Share.emailPrivateLink();
-	});
 });

From 8d490b9880368a6fd5fcd65964e1f23e6ed350eb Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Wed, 29 Aug 2012 14:36:51 -0400
Subject: [PATCH 0995/1224] Fix shared storage working with user backend
 defined data directories

---
 apps/files_sharing/lib/sharedstorage.php |  3 ++-
 lib/util.php                             | 10 +---------
 2 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/apps/files_sharing/lib/sharedstorage.php b/apps/files_sharing/lib/sharedstorage.php
index df5d4d20ae..6a2905b52c 100644
--- a/apps/files_sharing/lib/sharedstorage.php
+++ b/apps/files_sharing/lib/sharedstorage.php
@@ -30,7 +30,6 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
 
 	public function __construct($arguments) {
 		$this->sharedFolder = $arguments['sharedFolder'];
-		OC_Util::setupFS4all();
 	}
 
 	/**
@@ -78,6 +77,8 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
 	private function getSourcePath($target) {
 		$file = $this->getFile($target);
 		if (isset($file['path'])) {
+			$uid = substr($file['path'], 1, strpos($file['path'], '/', 1) - 1);
+			OC_Filesystem::mount('OC_Filestorage_Local', array('datadir' => OC_User::getHome($uid)), $uid);
 			return $file['path'];
 		}
 		return false;
diff --git a/lib/util.php b/lib/util.php
index 24f80b9389..b77d6cb1b6 100755
--- a/lib/util.php
+++ b/lib/util.php
@@ -35,13 +35,11 @@ class OC_Util {
 			$user_dir = '/'.$user.'/files';
 			$user_root = OC_User::getHome($user);
 			$userdirectory = $user_root . '/files';
-			OC_Filesystem::mount('OC_Filestorage_Local',array('datadir'=>$user_root), $user);
 			if( !is_dir( $userdirectory )){
 				mkdir( $userdirectory, 0755, true );
 			}
-			OC_Filesystem::mount('OC_Filestorage_Local',array('datadir'=>$user_root), $user);
-
 			//jail the user into his "home" directory
+			OC_Filesystem::mount('OC_Filestorage_Local', array('datadir' => $user_root), $user);
 			OC_Filesystem::init($user_dir);
 			$quotaProxy=new OC_FileProxy_Quota();
 			OC_FileProxy::register($quotaProxy);
@@ -59,12 +57,6 @@ class OC_Util {
 		}
 	}
 
-	public static function setupFS4all(){
-		foreach(OC_User::getUsers() as $user){
-			OC_Filesystem::mount('OC_Filestorage_Local',array('datadir'=>OC_User::getHome($singleuser)), $user);
-		}
-	}
-
 	public static function tearDownFS(){
 		OC_Filesystem::tearDown();
 		self::$fsSetup=false;

From 301baf0215cfa3046389b3369f3d43422ff80043 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Wed, 29 Aug 2012 14:42:40 -0400
Subject: [PATCH 0996/1224] $storage shouldn't be static in OC_Cache_File

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

diff --git a/lib/cache/file.php b/lib/cache/file.php
index ed5212bc3d..b9073dee09 100644
--- a/lib/cache/file.php
+++ b/lib/cache/file.php
@@ -8,7 +8,7 @@
 
 
 class OC_Cache_File{
-	protected static $storage;
+	protected $storage;
 	protected function getStorage() {
 		if (isset($this->storage)) {
 			return $this->storage;

From c958d5ba808ce64083470f65f11d3f9e8b74f7a1 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Wed, 29 Aug 2012 21:35:55 +0200
Subject: [PATCH 0997/1224] Fix filesystem setup for shared public link with
 logged in user

---
 apps/files_sharing/public.php |  3 +--
 lib/util.php                  | 18 ++++++++++++------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/apps/files_sharing/public.php b/apps/files_sharing/public.php
index a4bf0230a3..7f72ef81bd 100644
--- a/apps/files_sharing/public.php
+++ b/apps/files_sharing/public.php
@@ -5,7 +5,6 @@ if (isset($_GET['file'])) {
 	$pos = strpos($_GET['file'], '/', 1);
 	$uidOwner = substr($_GET['file'], 1, $pos - 1);
 	if (OCP\User::userExists($uidOwner)) {
-		OC_Util::tearDownFS();
 		OC_Util::setupFS($uidOwner);
 		$file = substr($_GET['file'], $pos);
 		$fileSource = OC_Filecache::getId($_GET['file'], '');
@@ -73,4 +72,4 @@ if (isset($_GET['file'])) {
 }
 header('HTTP/1.0 404 Not Found');
 $tmpl = new OCP\Template('', '404', 'guest');
-$tmpl->printPage();
\ No newline at end of file
+$tmpl->printPage();
diff --git a/lib/util.php b/lib/util.php
index b77d6cb1b6..10b88b2443 100755
--- a/lib/util.php
+++ b/lib/util.php
@@ -19,6 +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();
+		}
+
+		// the filesystem will finish when $user is not empty,
+		// mark fs setup here to avoid doing the setup from loading
+		// OC_Filesystem
+		if ($user != '') {
+			self::$fsSetup=true;
+		}
+
 		$CONFIG_DATADIRECTORY = OC_Config::getValue( "datadirectory", OC::$SERVERROOT."/data" );
 		//first set up the local "root" storage
 		if(!self::$rootMounted){
@@ -26,11 +38,6 @@ class OC_Util {
 			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
 			$user_dir = '/'.$user.'/files';
 			$user_root = OC_User::getHome($user);
@@ -43,7 +50,6 @@ class OC_Util {
 			OC_Filesystem::init($user_dir);
 			$quotaProxy=new OC_FileProxy_Quota();
 			OC_FileProxy::register($quotaProxy);
-			self::$fsSetup=true;
 			// Load personal mount config
 			if (is_file($user_root.'/mount.php')) {
 				$mountConfig = include($user_root.'/mount.php');

From 598815b21e94219eb66684c64802e165a35180ad Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Wed, 29 Aug 2012 22:38:06 +0200
Subject: [PATCH 0998/1224] More info about not compatible apps (app id)

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

diff --git a/lib/app.php b/lib/app.php
index f6708ecb3d..5c0ec2f01e 100755
--- a/lib/app.php
+++ b/lib/app.php
@@ -571,7 +571,7 @@ class OC_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_Log::write('core','App "'.$info['name'].'" ('.$app.') can\'t be used because it is not compatible with this version of ownCloud',OC_Log::ERROR);
 				OC_App::disable( $app );
 			}
 		}

From 898ca364a2d59406b8a7f8c30b1aec899f80f531 Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <thomas.mueller@tmit.eu>
Date: Thu, 30 Aug 2012 02:06:45 +0200
Subject: [PATCH 0999/1224] [tx-robot] updated from transifex

---
 apps/files/l10n/ko.php              |   8 +
 apps/files_sharing/l10n/ca.php      |   6 +-
 apps/files_sharing/l10n/cs_CZ.php   |   6 +-
 apps/files_sharing/l10n/de.php      |   6 +-
 apps/files_sharing/l10n/el.php      |   6 +-
 apps/files_sharing/l10n/eo.php      |   3 +-
 apps/files_sharing/l10n/fr.php      |   6 +-
 apps/files_sharing/l10n/it.php      |   6 +-
 apps/files_sharing/l10n/ja_JP.php   |   6 +-
 apps/files_sharing/l10n/ru.php      |   6 +-
 apps/files_sharing/l10n/sl.php      |   6 +-
 apps/files_sharing/l10n/sv.php      |   6 +-
 apps/files_sharing/l10n/th_TH.php   |   6 +-
 apps/user_ldap/l10n/ca.php          |   1 +
 apps/user_ldap/l10n/cs_CZ.php       |   1 +
 apps/user_ldap/l10n/eo.php          |   2 +
 apps/user_ldap/l10n/fr.php          |   1 +
 apps/user_ldap/l10n/it.php          |   1 +
 apps/user_ldap/l10n/ja_JP.php       |   1 +
 apps/user_ldap/l10n/ru.php          |   1 +
 apps/user_ldap/l10n/sl.php          |   1 +
 apps/user_ldap/l10n/sv.php          |   1 +
 apps/user_ldap/l10n/th_TH.php       |   1 +
 l10n/af/core.po                     |   4 +-
 l10n/af/files_sharing.po            |  12 +-
 l10n/af/settings.po                 |   4 +-
 l10n/ar/core.po                     |   4 +-
 l10n/ar/files_sharing.po            |  12 +-
 l10n/ar/settings.po                 |   4 +-
 l10n/ar_SA/core.po                  |   4 +-
 l10n/ar_SA/files_sharing.po         |  12 +-
 l10n/ar_SA/settings.po              |   4 +-
 l10n/bg_BG/core.po                  |   4 +-
 l10n/bg_BG/files_sharing.po         |  12 +-
 l10n/bg_BG/settings.po              |   4 +-
 l10n/ca/core.po                     |   4 +-
 l10n/ca/files_sharing.po            |  14 +-
 l10n/ca/settings.po                 |   4 +-
 l10n/ca/user_ldap.po                |   8 +-
 l10n/cs_CZ/core.po                  |   4 +-
 l10n/cs_CZ/files_sharing.po         |  14 +-
 l10n/cs_CZ/settings.po              |   8 +-
 l10n/cs_CZ/user_ldap.po             |   8 +-
 l10n/da/core.po                     |   4 +-
 l10n/da/files_sharing.po            |  12 +-
 l10n/da/settings.po                 |   4 +-
 l10n/de/core.po                     |   4 +-
 l10n/de/files_sharing.po            |  15 +-
 l10n/de/settings.po                 |   4 +-
 l10n/el/core.po                     |   4 +-
 l10n/el/files_sharing.po            |  15 +-
 l10n/el/settings.po                 |   4 +-
 l10n/eo/core.po                     |   4 +-
 l10n/eo/files_sharing.po            |  14 +-
 l10n/eo/settings.po                 |   4 +-
 l10n/eo/user_ldap.po                |  10 +-
 l10n/es/core.po                     |   4 +-
 l10n/es/files_sharing.po            |  12 +-
 l10n/es/settings.po                 |   4 +-
 l10n/et_EE/core.po                  |   4 +-
 l10n/et_EE/files_sharing.po         |  12 +-
 l10n/et_EE/settings.po              |   4 +-
 l10n/eu/core.po                     |   4 +-
 l10n/eu/files_sharing.po            |  12 +-
 l10n/eu/settings.po                 |   4 +-
 l10n/eu_ES/core.po                  |   4 +-
 l10n/eu_ES/files_sharing.po         |  12 +-
 l10n/eu_ES/settings.po              |   4 +-
 l10n/fa/core.po                     |   4 +-
 l10n/fa/files_sharing.po            |  12 +-
 l10n/fa/settings.po                 |   4 +-
 l10n/fi/core.po                     |   4 +-
 l10n/fi/files_sharing.po            |  12 +-
 l10n/fi/settings.po                 |   4 +-
 l10n/fi_FI/core.po                  |   4 +-
 l10n/fi_FI/files_sharing.po         |  12 +-
 l10n/fi_FI/settings.po              |   4 +-
 l10n/fr/core.po                     |   4 +-
 l10n/fr/files_sharing.po            |  15 +-
 l10n/fr/settings.po                 |   4 +-
 l10n/fr/user_ldap.po                |   9 +-
 l10n/gl/core.po                     |   4 +-
 l10n/gl/files_sharing.po            |  12 +-
 l10n/gl/settings.po                 |   4 +-
 l10n/he/core.po                     |   4 +-
 l10n/he/files_sharing.po            |  12 +-
 l10n/he/settings.po                 |   4 +-
 l10n/hi/core.po                     |   4 +-
 l10n/hi/files_sharing.po            |  12 +-
 l10n/hi/settings.po                 |   4 +-
 l10n/hr/core.po                     |   4 +-
 l10n/hr/files_sharing.po            |  12 +-
 l10n/hr/settings.po                 |   4 +-
 l10n/hu_HU/core.po                  |   4 +-
 l10n/hu_HU/files_sharing.po         |  12 +-
 l10n/hu_HU/settings.po              |   4 +-
 l10n/hy/core.po                     |   4 +-
 l10n/hy/files_sharing.po            |  12 +-
 l10n/hy/settings.po                 |   4 +-
 l10n/ia/core.po                     |   4 +-
 l10n/ia/files_sharing.po            |  12 +-
 l10n/ia/settings.po                 |   4 +-
 l10n/id/core.po                     |   4 +-
 l10n/id/files_sharing.po            |  12 +-
 l10n/id/settings.po                 |   4 +-
 l10n/id_ID/core.po                  |   4 +-
 l10n/id_ID/files_sharing.po         |  12 +-
 l10n/id_ID/settings.po              |   4 +-
 l10n/it/core.po                     |   4 +-
 l10n/it/files_sharing.po            |  14 +-
 l10n/it/settings.po                 |   4 +-
 l10n/it/user_ldap.po                |   8 +-
 l10n/ja_JP/core.po                  |   4 +-
 l10n/ja_JP/files_sharing.po         |  14 +-
 l10n/ja_JP/settings.po              |   4 +-
 l10n/ja_JP/user_ldap.po             |   8 +-
 l10n/ko/core.po                     |   4 +-
 l10n/ko/files.po                    |  24 +--
 l10n/ko/files_sharing.po            |  12 +-
 l10n/ko/settings.po                 |  22 +--
 l10n/lb/core.po                     |   4 +-
 l10n/lb/files_sharing.po            |  12 +-
 l10n/lb/settings.po                 |   4 +-
 l10n/lt_LT/core.po                  |   4 +-
 l10n/lt_LT/files_sharing.po         |  12 +-
 l10n/lt_LT/settings.po              |   4 +-
 l10n/lv/core.po                     |   4 +-
 l10n/lv/files_sharing.po            |  12 +-
 l10n/lv/settings.po                 |   4 +-
 l10n/mk/core.po                     |   4 +-
 l10n/mk/files_sharing.po            |  12 +-
 l10n/mk/settings.po                 |   4 +-
 l10n/ms_MY/core.po                  |   4 +-
 l10n/ms_MY/files_sharing.po         |  12 +-
 l10n/ms_MY/settings.po              |   4 +-
 l10n/nb_NO/core.po                  |   4 +-
 l10n/nb_NO/files_sharing.po         |  12 +-
 l10n/nb_NO/settings.po              |   4 +-
 l10n/nl/core.po                     |   4 +-
 l10n/nl/files_sharing.po            |  12 +-
 l10n/nl/settings.po                 |   4 +-
 l10n/nn_NO/core.po                  |   4 +-
 l10n/nn_NO/files_sharing.po         |  12 +-
 l10n/nn_NO/settings.po              |   4 +-
 l10n/pl/core.po                     |   4 +-
 l10n/pl/files_sharing.po            |  12 +-
 l10n/pl/settings.po                 |   4 +-
 l10n/pt_BR/core.po                  |   4 +-
 l10n/pt_BR/files_sharing.po         |  12 +-
 l10n/pt_BR/settings.po              |   4 +-
 l10n/pt_PT/core.po                  |   4 +-
 l10n/pt_PT/files_sharing.po         |  12 +-
 l10n/pt_PT/settings.po              |   4 +-
 l10n/ro/core.po                     |   4 +-
 l10n/ro/files_sharing.po            |  12 +-
 l10n/ro/settings.po                 |   4 +-
 l10n/ru/core.po                     |   4 +-
 l10n/ru/files_sharing.po            |  14 +-
 l10n/ru/settings.po                 |   4 +-
 l10n/ru/user_ldap.po                |   8 +-
 l10n/ru_RU/core.po                  | 272 +++++++++++++++++++++++++++
 l10n/ru_RU/files.po                 | 218 ++++++++++++++++++++++
 l10n/ru_RU/files_encryption.po      |  34 ++++
 l10n/ru_RU/files_external.po        |  82 +++++++++
 l10n/ru_RU/files_sharing.po         |  34 ++++
 l10n/ru_RU/files_versions.po        |  26 +++
 l10n/ru_RU/lib.po                   | 112 ++++++++++++
 l10n/ru_RU/settings.po              | 274 ++++++++++++++++++++++++++++
 l10n/ru_RU/user_ldap.po             | 170 +++++++++++++++++
 l10n/sk_SK/core.po                  |   4 +-
 l10n/sk_SK/files_sharing.po         |  12 +-
 l10n/sk_SK/settings.po              |   4 +-
 l10n/sl/core.po                     |   4 +-
 l10n/sl/files_sharing.po            |  14 +-
 l10n/sl/settings.po                 |   4 +-
 l10n/sl/user_ldap.po                |   8 +-
 l10n/so/core.po                     |   4 +-
 l10n/so/files_sharing.po            |  12 +-
 l10n/so/settings.po                 |   4 +-
 l10n/sr/core.po                     |   4 +-
 l10n/sr/files_sharing.po            |  12 +-
 l10n/sr/settings.po                 |   4 +-
 l10n/sr@latin/core.po               |   4 +-
 l10n/sr@latin/files_sharing.po      |  12 +-
 l10n/sr@latin/settings.po           |   4 +-
 l10n/sv/core.po                     |   4 +-
 l10n/sv/files_sharing.po            |  14 +-
 l10n/sv/settings.po                 |   4 +-
 l10n/sv/user_ldap.po                |   8 +-
 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    |  10 +-
 l10n/templates/files_versions.pot   |   2 +-
 l10n/templates/lib.pot              |   2 +-
 l10n/templates/settings.pot         |   2 +-
 l10n/templates/user_ldap.pot        |   2 +-
 l10n/th_TH/core.po                  |   4 +-
 l10n/th_TH/files_sharing.po         |  14 +-
 l10n/th_TH/settings.po              |   4 +-
 l10n/th_TH/user_ldap.po             |   8 +-
 l10n/tr/core.po                     |   4 +-
 l10n/tr/files_sharing.po            |  12 +-
 l10n/tr/settings.po                 |   4 +-
 l10n/uk/core.po                     |   4 +-
 l10n/uk/files_sharing.po            |  12 +-
 l10n/uk/settings.po                 |   4 +-
 l10n/vi/core.po                     |   4 +-
 l10n/vi/files_sharing.po            |  12 +-
 l10n/vi/settings.po                 |   4 +-
 l10n/zh_CN.GB2312/core.po           |   4 +-
 l10n/zh_CN.GB2312/files_sharing.po  |  12 +-
 l10n/zh_CN.GB2312/settings.po       |   4 +-
 l10n/zh_CN/core.po                  |   4 +-
 l10n/zh_CN/files_sharing.po         |  12 +-
 l10n/zh_CN/settings.po              |   4 +-
 l10n/zh_TW/core.po                  |   4 +-
 l10n/zh_TW/files_sharing.po         |  12 +-
 l10n/zh_TW/settings.po              |   4 +-
 settings/l10n/cs_CZ.php             |   1 +
 settings/l10n/ko.php                |   9 +
 222 files changed, 2156 insertions(+), 466 deletions(-)
 create mode 100644 l10n/ru_RU/core.po
 create mode 100644 l10n/ru_RU/files.po
 create mode 100644 l10n/ru_RU/files_encryption.po
 create mode 100644 l10n/ru_RU/files_external.po
 create mode 100644 l10n/ru_RU/files_sharing.po
 create mode 100644 l10n/ru_RU/files_versions.po
 create mode 100644 l10n/ru_RU/lib.po
 create mode 100644 l10n/ru_RU/settings.po
 create mode 100644 l10n/ru_RU/user_ldap.po

diff --git a/apps/files/l10n/ko.php b/apps/files/l10n/ko.php
index 218dd0ea2d..dafd859702 100644
--- a/apps/files/l10n/ko.php
+++ b/apps/files/l10n/ko.php
@@ -8,7 +8,15 @@
 "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" => "업로드 에러",
 "Pending" => "보류 중",
 "Upload cancelled." => "업로드 취소.",
diff --git a/apps/files_sharing/l10n/ca.php b/apps/files_sharing/l10n/ca.php
index 6931389b9c..5409762d60 100644
--- a/apps/files_sharing/l10n/ca.php
+++ b/apps/files_sharing/l10n/ca.php
@@ -1,6 +1,4 @@
 <?php $TRANSLATIONS = array(
-"Size" => "Mida",
-"Modified" => "Modificat",
-"Delete all" => "Esborra-ho tot",
-"Delete" => "Elimina"
+"Password" => "Contrasenya",
+"Submit" => "Envia"
 );
diff --git a/apps/files_sharing/l10n/cs_CZ.php b/apps/files_sharing/l10n/cs_CZ.php
index 7c5828a613..4836f15109 100644
--- a/apps/files_sharing/l10n/cs_CZ.php
+++ b/apps/files_sharing/l10n/cs_CZ.php
@@ -1,6 +1,4 @@
 <?php $TRANSLATIONS = array(
-"Size" => "Velikost",
-"Modified" => "Upraveno",
-"Delete all" => "Smazat vše",
-"Delete" => "Smazat"
+"Password" => "Heslo",
+"Submit" => "Potvrdit"
 );
diff --git a/apps/files_sharing/l10n/de.php b/apps/files_sharing/l10n/de.php
index d42383b43b..0c38f957fc 100644
--- a/apps/files_sharing/l10n/de.php
+++ b/apps/files_sharing/l10n/de.php
@@ -1,6 +1,4 @@
 <?php $TRANSLATIONS = array(
-"Size" => "Größe",
-"Modified" => "Geändert",
-"Delete all" => "Alle löschen",
-"Delete" => "Löschen"
+"Password" => "Passwort",
+"Submit" => "Absenden"
 );
diff --git a/apps/files_sharing/l10n/el.php b/apps/files_sharing/l10n/el.php
index 63f4c61204..123a008e55 100644
--- a/apps/files_sharing/l10n/el.php
+++ b/apps/files_sharing/l10n/el.php
@@ -1,6 +1,4 @@
 <?php $TRANSLATIONS = array(
-"Size" => "Μέγεθος",
-"Modified" => "Τροποποιήθηκε",
-"Delete all" => "Διαγραφή όλων",
-"Delete" => "Διαγραφή"
+"Password" => "Συνθηματικό",
+"Submit" => "Καταχώρηση"
 );
diff --git a/apps/files_sharing/l10n/eo.php b/apps/files_sharing/l10n/eo.php
index 81a8dcb152..5ef330a53e 100644
--- a/apps/files_sharing/l10n/eo.php
+++ b/apps/files_sharing/l10n/eo.php
@@ -1,3 +1,4 @@
 <?php $TRANSLATIONS = array(
-"Delete" => "Forigi"
+"Password" => "Pasvorto",
+"Submit" => "Sendi"
 );
diff --git a/apps/files_sharing/l10n/fr.php b/apps/files_sharing/l10n/fr.php
index 5a90331e42..31256d54a4 100644
--- a/apps/files_sharing/l10n/fr.php
+++ b/apps/files_sharing/l10n/fr.php
@@ -1,6 +1,4 @@
 <?php $TRANSLATIONS = array(
-"Size" => "Taille",
-"Modified" => "Modifié",
-"Delete all" => "Tout effacer",
-"Delete" => "Effacement"
+"Password" => "Mot de passe",
+"Submit" => "Envoyer"
 );
diff --git a/apps/files_sharing/l10n/it.php b/apps/files_sharing/l10n/it.php
index 7f91b85678..476221846a 100644
--- a/apps/files_sharing/l10n/it.php
+++ b/apps/files_sharing/l10n/it.php
@@ -1,6 +1,4 @@
 <?php $TRANSLATIONS = array(
-"Size" => "Dimensione",
-"Modified" => "Modificato",
-"Delete all" => "Elimina tutto",
-"Delete" => "Eliminazione"
+"Password" => "Password",
+"Submit" => "Invia"
 );
diff --git a/apps/files_sharing/l10n/ja_JP.php b/apps/files_sharing/l10n/ja_JP.php
index 9fca88d0a3..3bbfd69285 100644
--- a/apps/files_sharing/l10n/ja_JP.php
+++ b/apps/files_sharing/l10n/ja_JP.php
@@ -1,6 +1,4 @@
 <?php $TRANSLATIONS = array(
-"Size" => "サイズ",
-"Modified" => "変更",
-"Delete all" => "すべて削除",
-"Delete" => "削除"
+"Password" => "パスワード",
+"Submit" => "送信"
 );
diff --git a/apps/files_sharing/l10n/ru.php b/apps/files_sharing/l10n/ru.php
index 796403ae99..05ca8c3e49 100644
--- a/apps/files_sharing/l10n/ru.php
+++ b/apps/files_sharing/l10n/ru.php
@@ -1,6 +1,4 @@
 <?php $TRANSLATIONS = array(
-"Size" => "Размер",
-"Modified" => "Изменён",
-"Delete all" => "Удалить все",
-"Delete" => "Удалить"
+"Password" => "Пароль",
+"Submit" => "Отправить"
 );
diff --git a/apps/files_sharing/l10n/sl.php b/apps/files_sharing/l10n/sl.php
index a241c6e504..ea8ffaa28d 100644
--- a/apps/files_sharing/l10n/sl.php
+++ b/apps/files_sharing/l10n/sl.php
@@ -1,6 +1,4 @@
 <?php $TRANSLATIONS = array(
-"Size" => "Velikost",
-"Modified" => "Spremenjeno",
-"Delete all" => "Izbriši vse",
-"Delete" => "Izbriši"
+"Password" => "Geslo",
+"Submit" => "Pošlji"
 );
diff --git a/apps/files_sharing/l10n/sv.php b/apps/files_sharing/l10n/sv.php
index 5a2cda4368..f8cd6b3a36 100644
--- a/apps/files_sharing/l10n/sv.php
+++ b/apps/files_sharing/l10n/sv.php
@@ -1,6 +1,4 @@
 <?php $TRANSLATIONS = array(
-"Size" => "Storlek",
-"Modified" => "Ändrad",
-"Delete all" => "Radera alla",
-"Delete" => "Radera"
+"Password" => "Lösenord",
+"Submit" => "Skicka"
 );
diff --git a/apps/files_sharing/l10n/th_TH.php b/apps/files_sharing/l10n/th_TH.php
index 3f8908a91a..d2567aea51 100644
--- a/apps/files_sharing/l10n/th_TH.php
+++ b/apps/files_sharing/l10n/th_TH.php
@@ -1,6 +1,4 @@
 <?php $TRANSLATIONS = array(
-"Size" => "ขนาด",
-"Modified" => "แก้ไขแล้ว",
-"Delete all" => "ลบทั้งหมด",
-"Delete" => "ลบ"
+"Password" => "รหัสผ่าน",
+"Submit" => "ส่ง"
 );
diff --git a/apps/user_ldap/l10n/ca.php b/apps/user_ldap/l10n/ca.php
index 04b0f8997d..be72912040 100644
--- a/apps/user_ldap/l10n/ca.php
+++ b/apps/user_ldap/l10n/ca.php
@@ -32,5 +32,6 @@
 "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.",
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Deixeu-ho buit pel nom d'usuari (per defecte). Altrament, especifiqueu un atribut LDAP/AD.",
 "Help" => "Ajuda"
 );
diff --git a/apps/user_ldap/l10n/cs_CZ.php b/apps/user_ldap/l10n/cs_CZ.php
index 6c0f227fa7..31d9d7f089 100644
--- a/apps/user_ldap/l10n/cs_CZ.php
+++ b/apps/user_ldap/l10n/cs_CZ.php
@@ -32,5 +32,6 @@
 "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ěť.",
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Ponechte prázdné pro uživateslké jméno (výchozí). Jinak uveďte LDAP/AD paramerty",
 "Help" => "Nápověda"
 );
diff --git a/apps/user_ldap/l10n/eo.php b/apps/user_ldap/l10n/eo.php
index 6f18506b09..683c60ef84 100644
--- a/apps/user_ldap/l10n/eo.php
+++ b/apps/user_ldap/l10n/eo.php
@@ -17,6 +17,7 @@
 "Port" => "Pordo",
 "Base User Tree" => "Baza uzantarbo",
 "Base Group Tree" => "Baza gruparbo",
+"Group-Member association" => "Asocio de grupo kaj membro",
 "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)",
@@ -28,5 +29,6 @@
 "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.",
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Lasu malplena por uzantonomo (defaŭlto). Alie, specifu LDAP/AD-atributon.",
 "Help" => "Helpo"
 );
diff --git a/apps/user_ldap/l10n/fr.php b/apps/user_ldap/l10n/fr.php
index 0754aa01de..a0b1c6b7d9 100644
--- a/apps/user_ldap/l10n/fr.php
+++ b/apps/user_ldap/l10n/fr.php
@@ -32,5 +32,6 @@
 "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.",
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Laisser vide ",
 "Help" => "Aide"
 );
diff --git a/apps/user_ldap/l10n/it.php b/apps/user_ldap/l10n/it.php
index c86b4ea2a5..f07f0aa5a4 100644
--- a/apps/user_ldap/l10n/it.php
+++ b/apps/user_ldap/l10n/it.php
@@ -32,5 +32,6 @@
 "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.",
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Lascia vuoto per il nome utente (predefinito). Altrimenti, specifica un attributo LDAP/AD.",
 "Help" => "Aiuto"
 );
diff --git a/apps/user_ldap/l10n/ja_JP.php b/apps/user_ldap/l10n/ja_JP.php
index 8d4473b4e2..c8599f5636 100644
--- a/apps/user_ldap/l10n/ja_JP.php
+++ b/apps/user_ldap/l10n/ja_JP.php
@@ -32,5 +32,6 @@
 "The LDAP attribute to use to generate the groups`s ownCloud name." => "グループのownCloud名の生成に利用するLDAP属性。",
 "in bytes" => "バイト",
 "in seconds. A change empties the cache." => "秒。変更後にキャッシュがクリアされます。",
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "ユーザ名を空のままにしてください（デフォルト）。そうでない場合は、LDAPもしくはADの属性を指定してください．",
 "Help" => "ヘルプ"
 );
diff --git a/apps/user_ldap/l10n/ru.php b/apps/user_ldap/l10n/ru.php
index 65ef8f47f4..92982d868b 100644
--- a/apps/user_ldap/l10n/ru.php
+++ b/apps/user_ldap/l10n/ru.php
@@ -32,5 +32,6 @@
 "The LDAP attribute to use to generate the groups`s ownCloud name." => "Атрибут LDAP для генерации имени группы ownCloud.",
 "in bytes" => "в байтах",
 "in seconds. A change empties the cache." => "в секундах. Изменение очистит кэш.",
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Оставьте имя пользователя пустым (по умолчанию). Иначе укажите атрибут LDAP/AD.",
 "Help" => "Помощь"
 );
diff --git a/apps/user_ldap/l10n/sl.php b/apps/user_ldap/l10n/sl.php
index 312346958b..fd28b64015 100644
--- a/apps/user_ldap/l10n/sl.php
+++ b/apps/user_ldap/l10n/sl.php
@@ -32,5 +32,6 @@
 "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.",
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Pustite prazno za uporabniško ime (privzeto). V nasprotnem primeru navedite LDAP/AD atribut.",
 "Help" => "Pomoč"
 );
diff --git a/apps/user_ldap/l10n/sv.php b/apps/user_ldap/l10n/sv.php
index a23cc094b4..2a0abb9296 100644
--- a/apps/user_ldap/l10n/sv.php
+++ b/apps/user_ldap/l10n/sv.php
@@ -32,5 +32,6 @@
 "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.",
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Lämnas tomt för användarnamn (standard). Ange annars ett LDAP/AD-attribut.",
 "Help" => "Hjälp"
 );
diff --git a/apps/user_ldap/l10n/th_TH.php b/apps/user_ldap/l10n/th_TH.php
index a1baa64813..acc7a4936b 100644
--- a/apps/user_ldap/l10n/th_TH.php
+++ b/apps/user_ldap/l10n/th_TH.php
@@ -32,5 +32,6 @@
 "The LDAP attribute to use to generate the groups`s ownCloud name." => "คุณลักษณะ LDAP ที่ต้องการใช้สร้างชื่อกลุ่มของ ownCloud",
 "in bytes" => "ในหน่วยไบต์",
 "in seconds. A change empties the cache." => "ในอีกไม่กี่วินาที ระบบจะเปลี่ยนแปลงข้อมูลในแคชให้ว่างเปล่า",
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "เว้นว่างไว้สำหรับ ชื่อผู้ใช้ (ค่าเริ่มต้น) หรือไม่กรุณาระบุคุณลักษณะของ LDAP/AD",
 "Help" => "ช่วยเหลือ"
 );
diff --git a/l10n/af/core.po b/l10n/af/core.po
index 1a1940f9e9..ccd5e08975 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-08-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:02+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
diff --git a/l10n/af/files_sharing.po b/l10n/af/files_sharing.po
index b45ee8f65a..d4cd168bfa 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-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
@@ -24,3 +24,11 @@ msgstr ""
 #: templates/authenticate.php:6
 msgid "Submit"
 msgstr ""
+
+#: templates/public.php:9
+msgid "Download"
+msgstr ""
+
+#: templates/public.php:17
+msgid "web services under your control"
+msgstr ""
diff --git a/l10n/af/settings.po b/l10n/af/settings.po
index da858b04af..6d0d9b557f 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-29 02:02+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
diff --git a/l10n/ar/core.po b/l10n/ar/core.po
index 4c37f9bfd9..49b9295673 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-08-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:02+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
diff --git a/l10n/ar/files_sharing.po b/l10n/ar/files_sharing.po
index c4b91a2774..26243d6704 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-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
@@ -24,3 +24,11 @@ msgstr ""
 #: templates/authenticate.php:6
 msgid "Submit"
 msgstr ""
+
+#: templates/public.php:9
+msgid "Download"
+msgstr ""
+
+#: templates/public.php:17
+msgid "web services under your control"
+msgstr ""
diff --git a/l10n/ar/settings.po b/l10n/ar/settings.po
index 8c02341755..2eb8acb179 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-29 02:02+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
diff --git a/l10n/ar_SA/core.po b/l10n/ar_SA/core.po
index af7cb8d90c..0c523d9c89 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-08-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:02+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
diff --git a/l10n/ar_SA/files_sharing.po b/l10n/ar_SA/files_sharing.po
index b459097ebc..da6efbbe01 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-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
@@ -24,3 +24,11 @@ msgstr ""
 #: templates/authenticate.php:6
 msgid "Submit"
 msgstr ""
+
+#: templates/public.php:9
+msgid "Download"
+msgstr ""
+
+#: templates/public.php:17
+msgid "web services under your control"
+msgstr ""
diff --git a/l10n/ar_SA/settings.po b/l10n/ar_SA/settings.po
index 065806d42b..4d65ee350a 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-29 02:02+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
diff --git a/l10n/bg_BG/core.po b/l10n/bg_BG/core.po
index a4caad873f..0616f0e42c 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-08-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:02+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
diff --git a/l10n/bg_BG/files_sharing.po b/l10n/bg_BG/files_sharing.po
index d1afae484c..7a922d60dd 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-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
@@ -24,3 +24,11 @@ msgstr ""
 #: templates/authenticate.php:6
 msgid "Submit"
 msgstr ""
+
+#: templates/public.php:9
+msgid "Download"
+msgstr ""
+
+#: templates/public.php:17
+msgid "web services under your control"
+msgstr ""
diff --git a/l10n/bg_BG/settings.po b/l10n/bg_BG/settings.po
index c1d39344f7..3a29d8dc14 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-29 02:02+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
diff --git a/l10n/ca/core.po b/l10n/ca/core.po
index ce3b9f19f2..8f332e15f5 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-08-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:02+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
diff --git a/l10n/ca/files_sharing.po b/l10n/ca/files_sharing.po
index 9edec9f6b5..fef4b1281e 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-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
@@ -20,8 +20,16 @@ msgstr ""
 
 #: templates/authenticate.php:4
 msgid "Password"
-msgstr ""
+msgstr "Contrasenya"
 
 #: templates/authenticate.php:6
 msgid "Submit"
+msgstr "Envia"
+
+#: templates/public.php:9
+msgid "Download"
+msgstr ""
+
+#: templates/public.php:17
+msgid "web services under your control"
 msgstr ""
diff --git a/l10n/ca/settings.po b/l10n/ca/settings.po
index 3b453b4c42..eb85441ce0 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-29 02:02+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
diff --git a/l10n/ca/user_ldap.po b/l10n/ca/user_ldap.po
index 82824c9ad3..78f5bcc2cc 100644
--- a/l10n/ca/user_ldap.po
+++ b/l10n/ca/user_ldap.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-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-29 13:55+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"
@@ -164,7 +164,7 @@ msgstr "en segons. Un canvi buidarà la memòria de cau."
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
-msgstr ""
+msgstr "Deixeu-ho buit pel nom d'usuari (per defecte). Altrament, especifiqueu un atribut LDAP/AD."
 
 #: templates/settings.php:32
 msgid "Help"
diff --git a/l10n/cs_CZ/core.po b/l10n/cs_CZ/core.po
index 6b09c23711..d147edfd66 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-08-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:02+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
diff --git a/l10n/cs_CZ/files_sharing.po b/l10n/cs_CZ/files_sharing.po
index 0d2d55dcc9..a171c9c25e 100644
--- a/l10n/cs_CZ/files_sharing.po
+++ b/l10n/cs_CZ/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-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
@@ -21,8 +21,16 @@ msgstr ""
 
 #: templates/authenticate.php:4
 msgid "Password"
-msgstr ""
+msgstr "Heslo"
 
 #: templates/authenticate.php:6
 msgid "Submit"
+msgstr "Potvrdit"
+
+#: templates/public.php:9
+msgid "Download"
+msgstr ""
+
+#: templates/public.php:17
+msgid "web services under your control"
 msgstr ""
diff --git a/l10n/cs_CZ/settings.po b/l10n/cs_CZ/settings.po
index 56df4dcffe..4bded3012f 100644
--- a/l10n/cs_CZ/settings.po
+++ b/l10n/cs_CZ/settings.po
@@ -5,15 +5,15 @@
 # Translators:
 #   <icewind1991@gmail.com>, 2012.
 # Jan Krejci <krejca85@gmail.com>, 2011, 2012.
-# Martin  <fireball@atlas.cz>, 2011, 2012.
+# Martin  <fireball@atlas.cz>, 2011-2012.
 # Michal Hrušecký <Michal@hrusecky.net>, 2012.
 #   <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-29 02:02+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
@@ -268,7 +268,7 @@ msgstr "Jiné"
 
 #: templates/users.php:80 templates/users.php:112
 msgid "Group Admin"
-msgstr ""
+msgstr "Administrace skupiny"
 
 #: templates/users.php:82
 msgid "Quota"
diff --git a/l10n/cs_CZ/user_ldap.po b/l10n/cs_CZ/user_ldap.po
index 9f1f90c4d4..57bcba3d70 100644
--- a/l10n/cs_CZ/user_ldap.po
+++ b/l10n/cs_CZ/user_ldap.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-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-29 13:53+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"
@@ -164,7 +164,7 @@ msgstr "ve vteřinách. Změna vyprázdní dočasnou paměť."
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
-msgstr ""
+msgstr "Ponechte prázdné pro uživateslké jméno (výchozí). Jinak uveďte LDAP/AD paramerty"
 
 #: templates/settings.php:32
 msgid "Help"
diff --git a/l10n/da/core.po b/l10n/da/core.po
index 782c53cf39..305bbc24a3 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-08-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:02+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
diff --git a/l10n/da/files_sharing.po b/l10n/da/files_sharing.po
index 7af7f3cce6..3da4460393 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-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
@@ -24,3 +24,11 @@ msgstr ""
 #: templates/authenticate.php:6
 msgid "Submit"
 msgstr ""
+
+#: templates/public.php:9
+msgid "Download"
+msgstr ""
+
+#: templates/public.php:17
+msgid "web services under your control"
+msgstr ""
diff --git a/l10n/da/settings.po b/l10n/da/settings.po
index 132eb0965d..57da990566 100644
--- a/l10n/da/settings.po
+++ b/l10n/da/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-29 02:02+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
diff --git a/l10n/de/core.po b/l10n/de/core.po
index 7fd2379895..3d6111bb19 100644
--- a/l10n/de/core.po
+++ b/l10n/de/core.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-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:02+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
diff --git a/l10n/de/files_sharing.po b/l10n/de/files_sharing.po
index c9da23c62a..e77ca7577b 100644
--- a/l10n/de/files_sharing.po
+++ b/l10n/de/files_sharing.po
@@ -6,12 +6,13 @@
 # I Robot <thomas.mueller@tmit.eu>, 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-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
@@ -22,8 +23,16 @@ msgstr ""
 
 #: templates/authenticate.php:4
 msgid "Password"
-msgstr ""
+msgstr "Passwort"
 
 #: templates/authenticate.php:6
 msgid "Submit"
+msgstr "Absenden"
+
+#: templates/public.php:9
+msgid "Download"
+msgstr ""
+
+#: templates/public.php:17
+msgid "web services under your control"
 msgstr ""
diff --git a/l10n/de/settings.po b/l10n/de/settings.po
index 932008355a..0a51e4476b 100644
--- a/l10n/de/settings.po
+++ b/l10n/de/settings.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-08-29 02:02+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
diff --git a/l10n/el/core.po b/l10n/el/core.po
index 8de9d580dc..c256cef3fb 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-08-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:02+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
diff --git a/l10n/el/files_sharing.po b/l10n/el/files_sharing.po
index 3683b27656..22f3137283 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:
+# Dimitris M. <monopatis@gmail.com>, 2012.
 # 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-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
@@ -20,8 +21,16 @@ msgstr ""
 
 #: templates/authenticate.php:4
 msgid "Password"
-msgstr ""
+msgstr "Συνθηματικό"
 
 #: templates/authenticate.php:6
 msgid "Submit"
+msgstr "Καταχώρηση"
+
+#: templates/public.php:9
+msgid "Download"
+msgstr ""
+
+#: templates/public.php:17
+msgid "web services under your control"
 msgstr ""
diff --git a/l10n/el/settings.po b/l10n/el/settings.po
index 0e099d8938..f15267edf6 100644
--- a/l10n/el/settings.po
+++ b/l10n/el/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-29 02:02+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
diff --git a/l10n/eo/core.po b/l10n/eo/core.po
index d3bc69aa6b..79b7ff3e24 100644
--- a/l10n/eo/core.po
+++ b/l10n/eo/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-08-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:02+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
diff --git a/l10n/eo/files_sharing.po b/l10n/eo/files_sharing.po
index fd8cae3168..0cb4c533a4 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-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
@@ -20,8 +20,16 @@ msgstr ""
 
 #: templates/authenticate.php:4
 msgid "Password"
-msgstr ""
+msgstr "Pasvorto"
 
 #: templates/authenticate.php:6
 msgid "Submit"
+msgstr "Sendi"
+
+#: templates/public.php:9
+msgid "Download"
+msgstr ""
+
+#: templates/public.php:17
+msgid "web services under your control"
 msgstr ""
diff --git a/l10n/eo/settings.po b/l10n/eo/settings.po
index 1a916d2039..75eea7b743 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-29 02:02+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
diff --git a/l10n/eo/user_ldap.po b/l10n/eo/user_ldap.po
index 9e4a9947c2..ff8480473e 100644
--- a/l10n/eo/user_ldap.po
+++ b/l10n/eo/user_ldap.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-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-29 20:31+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"
@@ -108,7 +108,7 @@ msgstr "Baza gruparbo"
 
 #: templates/settings.php:20
 msgid "Group-Member association"
-msgstr ""
+msgstr "Asocio de grupo kaj membro"
 
 #: templates/settings.php:21
 msgid "Use TLS"
@@ -164,7 +164,7 @@ msgstr "sekunde. Ajna ŝanĝo malplenigas la kaŝmemoron."
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
-msgstr ""
+msgstr "Lasu malplena por uzantonomo (defaŭlto). Alie, specifu LDAP/AD-atributon."
 
 #: templates/settings.php:32
 msgid "Help"
diff --git a/l10n/es/core.po b/l10n/es/core.po
index 34fc1ff54a..8c8a0c622a 100644
--- a/l10n/es/core.po
+++ b/l10n/es/core.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-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:02+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
diff --git a/l10n/es/files_sharing.po b/l10n/es/files_sharing.po
index ccb836d0dc..d514ee6fc4 100644
--- a/l10n/es/files_sharing.po
+++ b/l10n/es/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-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
@@ -25,3 +25,11 @@ msgstr ""
 #: templates/authenticate.php:6
 msgid "Submit"
 msgstr ""
+
+#: templates/public.php:9
+msgid "Download"
+msgstr ""
+
+#: templates/public.php:17
+msgid "web services under your control"
+msgstr ""
diff --git a/l10n/es/settings.po b/l10n/es/settings.po
index e1085bc4ca..4c222cc9d6 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-29 02:02+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
diff --git a/l10n/et_EE/core.po b/l10n/et_EE/core.po
index b5d1fc5cc4..b9b71d86ba 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-08-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:02+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
diff --git a/l10n/et_EE/files_sharing.po b/l10n/et_EE/files_sharing.po
index 685a455172..1d7b7f670a 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-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
@@ -25,3 +25,11 @@ msgstr ""
 #: templates/authenticate.php:6
 msgid "Submit"
 msgstr ""
+
+#: templates/public.php:9
+msgid "Download"
+msgstr ""
+
+#: templates/public.php:17
+msgid "web services under your control"
+msgstr ""
diff --git a/l10n/et_EE/settings.po b/l10n/et_EE/settings.po
index da5e7a6610..1031fe83cf 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-29 02:02+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
diff --git a/l10n/eu/core.po b/l10n/eu/core.po
index 2e8170d6eb..3e613136b3 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-08-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:02+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
diff --git a/l10n/eu/files_sharing.po b/l10n/eu/files_sharing.po
index 5dbf9d47d5..a968b59ddc 100644
--- a/l10n/eu/files_sharing.po
+++ b/l10n/eu/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-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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,3 +25,11 @@ msgstr ""
 #: templates/authenticate.php:6
 msgid "Submit"
 msgstr ""
+
+#: templates/public.php:9
+msgid "Download"
+msgstr ""
+
+#: templates/public.php:17
+msgid "web services under your control"
+msgstr ""
diff --git a/l10n/eu/settings.po b/l10n/eu/settings.po
index 2084610e4f..a234da4f08 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-29 02:02+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
diff --git a/l10n/eu_ES/core.po b/l10n/eu_ES/core.po
index 8b695d7d73..31a6a198e8 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-08-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:02+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
diff --git a/l10n/eu_ES/files_sharing.po b/l10n/eu_ES/files_sharing.po
index 61cc77d14a..d5d03fe6b7 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-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
@@ -24,3 +24,11 @@ msgstr ""
 #: templates/authenticate.php:6
 msgid "Submit"
 msgstr ""
+
+#: templates/public.php:9
+msgid "Download"
+msgstr ""
+
+#: templates/public.php:17
+msgid "web services under your control"
+msgstr ""
diff --git a/l10n/eu_ES/settings.po b/l10n/eu_ES/settings.po
index f1a8e4aa08..6a72266529 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-29 02:02+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
diff --git a/l10n/fa/core.po b/l10n/fa/core.po
index 6275a4af56..c122ee9da1 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-08-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:02+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
diff --git a/l10n/fa/files_sharing.po b/l10n/fa/files_sharing.po
index 9bdff0feec..4e3884cb87 100644
--- a/l10n/fa/files_sharing.po
+++ b/l10n/fa/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-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
@@ -25,3 +25,11 @@ msgstr ""
 #: templates/authenticate.php:6
 msgid "Submit"
 msgstr ""
+
+#: templates/public.php:9
+msgid "Download"
+msgstr ""
+
+#: templates/public.php:17
+msgid "web services under your control"
+msgstr ""
diff --git a/l10n/fa/settings.po b/l10n/fa/settings.po
index 9ba953c9e1..91b4998174 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-29 02:02+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
diff --git a/l10n/fi/core.po b/l10n/fi/core.po
index 50358c7b5a..80fab1564a 100644
--- a/l10n/fi/core.po
+++ b/l10n/fi/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-08-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:02+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
diff --git a/l10n/fi/files_sharing.po b/l10n/fi/files_sharing.po
index f4e463219f..7675786f94 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-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
@@ -24,3 +24,11 @@ msgstr ""
 #: templates/authenticate.php:6
 msgid "Submit"
 msgstr ""
+
+#: templates/public.php:9
+msgid "Download"
+msgstr ""
+
+#: templates/public.php:17
+msgid "web services under your control"
+msgstr ""
diff --git a/l10n/fi/settings.po b/l10n/fi/settings.po
index ff6f704321..58689bc1d0 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-29 02:02+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
diff --git a/l10n/fi_FI/core.po b/l10n/fi_FI/core.po
index 5f70f5c6f9..93613a36f7 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-08-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:02+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
diff --git a/l10n/fi_FI/files_sharing.po b/l10n/fi_FI/files_sharing.po
index 8c162a1fe4..833c5b7206 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-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
@@ -25,3 +25,11 @@ msgstr ""
 #: templates/authenticate.php:6
 msgid "Submit"
 msgstr ""
+
+#: templates/public.php:9
+msgid "Download"
+msgstr ""
+
+#: templates/public.php:17
+msgid "web services under your control"
+msgstr ""
diff --git a/l10n/fi_FI/settings.po b/l10n/fi_FI/settings.po
index 4baba2f56c..1066e0aad1 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-29 02:02+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
diff --git a/l10n/fr/core.po b/l10n/fr/core.po
index 0229ac1e53..957e66b736 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-08-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:02+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
diff --git a/l10n/fr/files_sharing.po b/l10n/fr/files_sharing.po
index 4fcb57d414..e32eca0609 100644
--- a/l10n/fr/files_sharing.po
+++ b/l10n/fr/files_sharing.po
@@ -5,12 +5,13 @@
 # Translators:
 #   <gp4004@arghh.org>, 2012.
 # Romain DEP. <rom1dep@gmail.com>, 2012.
+#   <windes@tructor.net>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
@@ -21,8 +22,16 @@ msgstr ""
 
 #: templates/authenticate.php:4
 msgid "Password"
-msgstr ""
+msgstr "Mot de passe"
 
 #: templates/authenticate.php:6
 msgid "Submit"
+msgstr "Envoyer"
+
+#: templates/public.php:9
+msgid "Download"
+msgstr ""
+
+#: templates/public.php:17
+msgid "web services under your control"
 msgstr ""
diff --git a/l10n/fr/settings.po b/l10n/fr/settings.po
index e1a896e537..b4f394d021 100644
--- a/l10n/fr/settings.po
+++ b/l10n/fr/settings.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-08-29 02:02+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
diff --git a/l10n/fr/user_ldap.po b/l10n/fr/user_ldap.po
index 3e168eea21..7fca3da0d5 100644
--- a/l10n/fr/user_ldap.po
+++ b/l10n/fr/user_ldap.po
@@ -6,14 +6,15 @@
 # Cyril Glapa <kyriog@gmail.com>, 2012.
 #   <mathieu.payrol@gmail.com>, 2012.
 # Romain DEP. <rom1dep@gmail.com>, 2012.
+#   <windes@tructor.net>, 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-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-29 08:51+0000\n"
+"Last-Translator: Windes <windes@tructor.net>\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"
@@ -167,7 +168,7 @@ msgstr "en secondes. Tout changement vide le cache."
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
-msgstr ""
+msgstr "Laisser vide "
 
 #: templates/settings.php:32
 msgid "Help"
diff --git a/l10n/gl/core.po b/l10n/gl/core.po
index 738fbc0ac0..631545f49a 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-08-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:02+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
diff --git a/l10n/gl/files_sharing.po b/l10n/gl/files_sharing.po
index 559f53be84..9199ce9fce 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-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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,3 +24,11 @@ msgstr ""
 #: templates/authenticate.php:6
 msgid "Submit"
 msgstr ""
+
+#: templates/public.php:9
+msgid "Download"
+msgstr ""
+
+#: templates/public.php:17
+msgid "web services under your control"
+msgstr ""
diff --git a/l10n/gl/settings.po b/l10n/gl/settings.po
index 7f4da92483..7293a34100 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-29 02:02+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
diff --git a/l10n/he/core.po b/l10n/he/core.po
index 335773d0dc..0105184ff9 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-08-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:02+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
diff --git a/l10n/he/files_sharing.po b/l10n/he/files_sharing.po
index c788cef35e..41a33dd718 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-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
@@ -24,3 +24,11 @@ msgstr ""
 #: templates/authenticate.php:6
 msgid "Submit"
 msgstr ""
+
+#: templates/public.php:9
+msgid "Download"
+msgstr ""
+
+#: templates/public.php:17
+msgid "web services under your control"
+msgstr ""
diff --git a/l10n/he/settings.po b/l10n/he/settings.po
index 8d4e790e9d..05c51e93cd 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-29 02:02+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
diff --git a/l10n/hi/core.po b/l10n/hi/core.po
index 74c3cc9450..29b8d2fc46 100644
--- a/l10n/hi/core.po
+++ b/l10n/hi/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-08-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:02+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 00:02+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/hi/files_sharing.po b/l10n/hi/files_sharing.po
index 1aa869a155..2f6374a64e 100644
--- a/l10n/hi/files_sharing.po
+++ b/l10n/hi/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-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
 "MIME-Version: 1.0\n"
@@ -24,3 +24,11 @@ msgstr ""
 #: templates/authenticate.php:6
 msgid "Submit"
 msgstr ""
+
+#: templates/public.php:9
+msgid "Download"
+msgstr ""
+
+#: templates/public.php:17
+msgid "web services under your control"
+msgstr ""
diff --git a/l10n/hi/settings.po b/l10n/hi/settings.po
index 4dce9bbefa..d1cc5c5331 100644
--- a/l10n/hi/settings.po
+++ b/l10n/hi/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-29 02:02+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/hr/core.po b/l10n/hr/core.po
index f8abf1ae89..a22b7bed24 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-08-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:02+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
diff --git a/l10n/hr/files_sharing.po b/l10n/hr/files_sharing.po
index f4796f125a..1099b2e318 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-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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,3 +24,11 @@ msgstr ""
 #: templates/authenticate.php:6
 msgid "Submit"
 msgstr ""
+
+#: templates/public.php:9
+msgid "Download"
+msgstr ""
+
+#: templates/public.php:17
+msgid "web services under your control"
+msgstr ""
diff --git a/l10n/hr/settings.po b/l10n/hr/settings.po
index 231bc8692a..eee022adbb 100644
--- a/l10n/hr/settings.po
+++ b/l10n/hr/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-29 02:02+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
diff --git a/l10n/hu_HU/core.po b/l10n/hu_HU/core.po
index 1b75403809..6733c3609c 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-08-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:02+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
diff --git a/l10n/hu_HU/files_sharing.po b/l10n/hu_HU/files_sharing.po
index 5c57c9e3fe..cd65a560fa 100644
--- a/l10n/hu_HU/files_sharing.po
+++ b/l10n/hu_HU/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-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
@@ -25,3 +25,11 @@ msgstr ""
 #: templates/authenticate.php:6
 msgid "Submit"
 msgstr ""
+
+#: templates/public.php:9
+msgid "Download"
+msgstr ""
+
+#: templates/public.php:17
+msgid "web services under your control"
+msgstr ""
diff --git a/l10n/hu_HU/settings.po b/l10n/hu_HU/settings.po
index dc78ebac65..5ad68e3b2a 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-29 02:02+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
diff --git a/l10n/hy/core.po b/l10n/hy/core.po
index 41818fecde..6390ad2db3 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-08-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:02+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
diff --git a/l10n/hy/files_sharing.po b/l10n/hy/files_sharing.po
index 7adce26af9..df1e7e7843 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-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
@@ -24,3 +24,11 @@ msgstr ""
 #: templates/authenticate.php:6
 msgid "Submit"
 msgstr ""
+
+#: templates/public.php:9
+msgid "Download"
+msgstr ""
+
+#: templates/public.php:17
+msgid "web services under your control"
+msgstr ""
diff --git a/l10n/hy/settings.po b/l10n/hy/settings.po
index ed0acf7276..8b3d317ad3 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-29 02:02+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
diff --git a/l10n/ia/core.po b/l10n/ia/core.po
index 3a3a12b570..74933c011b 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-08-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:02+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
diff --git a/l10n/ia/files_sharing.po b/l10n/ia/files_sharing.po
index 133cd80127..57ec736fa1 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-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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,3 +24,11 @@ msgstr ""
 #: templates/authenticate.php:6
 msgid "Submit"
 msgstr ""
+
+#: templates/public.php:9
+msgid "Download"
+msgstr ""
+
+#: templates/public.php:17
+msgid "web services under your control"
+msgstr ""
diff --git a/l10n/ia/settings.po b/l10n/ia/settings.po
index c6db8d713a..3141c71864 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-29 02:02+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
diff --git a/l10n/id/core.po b/l10n/id/core.po
index ab4b378672..9beb54523a 100644
--- a/l10n/id/core.po
+++ b/l10n/id/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-08-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:02+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
diff --git a/l10n/id/files_sharing.po b/l10n/id/files_sharing.po
index 93219e0d80..5b743101fc 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-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
@@ -24,3 +24,11 @@ msgstr ""
 #: templates/authenticate.php:6
 msgid "Submit"
 msgstr ""
+
+#: templates/public.php:9
+msgid "Download"
+msgstr ""
+
+#: templates/public.php:17
+msgid "web services under your control"
+msgstr ""
diff --git a/l10n/id/settings.po b/l10n/id/settings.po
index f1daf56e28..c14d28320d 100644
--- a/l10n/id/settings.po
+++ b/l10n/id/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-29 02:02+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
diff --git a/l10n/id_ID/core.po b/l10n/id_ID/core.po
index faade1ace9..db0c2d649f 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-08-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:02+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
diff --git a/l10n/id_ID/files_sharing.po b/l10n/id_ID/files_sharing.po
index b1ac99e2e6..ae54f19e79 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-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
@@ -24,3 +24,11 @@ msgstr ""
 #: templates/authenticate.php:6
 msgid "Submit"
 msgstr ""
+
+#: templates/public.php:9
+msgid "Download"
+msgstr ""
+
+#: templates/public.php:17
+msgid "web services under your control"
+msgstr ""
diff --git a/l10n/id_ID/settings.po b/l10n/id_ID/settings.po
index 68045a2740..8bc13f3666 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-29 02:02+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
diff --git a/l10n/it/core.po b/l10n/it/core.po
index 146f6faa71..2f84a26587 100644
--- a/l10n/it/core.po
+++ b/l10n/it/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-08-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:02+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
diff --git a/l10n/it/files_sharing.po b/l10n/it/files_sharing.po
index e4afbded98..e3ae1f3507 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-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
@@ -20,8 +20,16 @@ msgstr ""
 
 #: templates/authenticate.php:4
 msgid "Password"
-msgstr ""
+msgstr "Password"
 
 #: templates/authenticate.php:6
 msgid "Submit"
+msgstr "Invia"
+
+#: templates/public.php:9
+msgid "Download"
+msgstr ""
+
+#: templates/public.php:17
+msgid "web services under your control"
 msgstr ""
diff --git a/l10n/it/settings.po b/l10n/it/settings.po
index 5e3956fdfd..bce95fc742 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-29 02:02+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
diff --git a/l10n/it/user_ldap.po b/l10n/it/user_ldap.po
index ea2ef09865..9c8655920c 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-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-29 05:37+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"
@@ -165,7 +165,7 @@ msgstr "in secondi. Il cambio svuota la cache."
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
-msgstr ""
+msgstr "Lascia vuoto per il nome utente (predefinito). Altrimenti, specifica un attributo LDAP/AD."
 
 #: templates/settings.php:32
 msgid "Help"
diff --git a/l10n/ja_JP/core.po b/l10n/ja_JP/core.po
index 85eff9b29f..09cad91e12 100644
--- a/l10n/ja_JP/core.po
+++ b/l10n/ja_JP/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-08-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:02+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
diff --git a/l10n/ja_JP/files_sharing.po b/l10n/ja_JP/files_sharing.po
index 04cd99c2f3..ee86734e55 100644
--- a/l10n/ja_JP/files_sharing.po
+++ b/l10n/ja_JP/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-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
@@ -21,8 +21,16 @@ msgstr ""
 
 #: templates/authenticate.php:4
 msgid "Password"
-msgstr ""
+msgstr "パスワード"
 
 #: templates/authenticate.php:6
 msgid "Submit"
+msgstr "送信"
+
+#: templates/public.php:9
+msgid "Download"
+msgstr ""
+
+#: templates/public.php:17
+msgid "web services under your control"
 msgstr ""
diff --git a/l10n/ja_JP/settings.po b/l10n/ja_JP/settings.po
index 18f0f4733d..895b04d059 100644
--- a/l10n/ja_JP/settings.po
+++ b/l10n/ja_JP/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-29 02:02+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
diff --git a/l10n/ja_JP/user_ldap.po b/l10n/ja_JP/user_ldap.po
index 9b43e88d47..4c9265d368 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-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-29 01:55+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"
@@ -165,7 +165,7 @@ msgstr "秒。変更後にキャッシュがクリアされます。"
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
-msgstr ""
+msgstr "ユーザ名を空のままにしてください（デフォルト）。そうでない場合は、LDAPもしくはADの属性を指定してください．"
 
 #: templates/settings.php:32
 msgid "Help"
diff --git a/l10n/ko/core.po b/l10n/ko/core.po
index 5ad977ca6b..4a37e33347 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-08-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:02+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
diff --git a/l10n/ko/files.po b/l10n/ko/files.po
index 375947a292..c92eee7df0 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-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-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-29 18:40+0000\n"
+"Last-Translator: yunhye <limonade83@gmail.com>\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,37 +53,37 @@ msgstr "디스크에 쓰지 못했습니다"
 msgid "Files"
 msgstr "파일"
 
-#: js/fileactions.js:107 templates/index.php:56
+#: js/fileactions.js:111 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:246
 msgid "undo"
-msgstr ""
+msgstr "복구"
 
 #: js/filelist.js:246
 msgid "deleted"
-msgstr ""
+msgstr "삭제"
 
 #: js/files.js:171
 msgid "generating ZIP-file, it may take some time."
@@ -91,7 +91,7 @@ msgstr "ZIP파일 생성에 시간이 걸릴 수 있습니다."
 
 #: js/files.js:200
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr ""
+msgstr "이 파일은 디렉토리이거나 0 바이트이기 때문에 업로드 할 수 없습니다."
 
 #: js/files.js:200
 msgid "Upload Error"
diff --git a/l10n/ko/files_sharing.po b/l10n/ko/files_sharing.po
index b8e11e75ee..109d725ee3 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-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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,3 +24,11 @@ msgstr ""
 #: templates/authenticate.php:6
 msgid "Submit"
 msgstr ""
+
+#: templates/public.php:9
+msgid "Download"
+msgstr ""
+
+#: templates/public.php:17
+msgid "web services under your control"
+msgstr ""
diff --git a/l10n/ko/settings.po b/l10n/ko/settings.po
index fd12d48d5e..f6ceba7c7e 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-29 02:02+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
@@ -21,7 +21,7 @@ msgstr ""
 
 #: ajax/apps/ocs.php:23
 msgid "Unable to load list from App Store"
-msgstr ""
+msgstr "앱 스토어에서 목록을 가져올 수 없습니다"
 
 #: ajax/lostpassword.php:14
 msgid "Email saved"
@@ -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"
@@ -49,7 +49,7 @@ msgstr "언어가 변경되었습니다"
 
 #: js/apps.js:18
 msgid "Error"
-msgstr ""
+msgstr "에러"
 
 #: js/apps.js:39 js/apps.js:73
 msgid "Disable"
@@ -69,23 +69,23 @@ 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"
-msgstr ""
+msgstr "cron.php는 webcron 서비스에 등록이 되어 있습니다."
 
 #: templates/admin.php:35
 msgid "use systems cron service"
-msgstr ""
+msgstr "cron 시스템 서비스를 사용"
 
 #: templates/admin.php:39
 msgid "Share API"
@@ -265,7 +265,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/lb/core.po b/l10n/lb/core.po
index 5a89733611..9052d2aefb 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-08-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:02+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
diff --git a/l10n/lb/files_sharing.po b/l10n/lb/files_sharing.po
index 955cca498b..60d19fed6d 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-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
@@ -24,3 +24,11 @@ msgstr ""
 #: templates/authenticate.php:6
 msgid "Submit"
 msgstr ""
+
+#: templates/public.php:9
+msgid "Download"
+msgstr ""
+
+#: templates/public.php:17
+msgid "web services under your control"
+msgstr ""
diff --git a/l10n/lb/settings.po b/l10n/lb/settings.po
index 696998daa2..2b4de82927 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-29 02:02+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
diff --git a/l10n/lt_LT/core.po b/l10n/lt_LT/core.po
index 36a98b4d70..5435b4a5b9 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-08-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:02+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
diff --git a/l10n/lt_LT/files_sharing.po b/l10n/lt_LT/files_sharing.po
index 342d109109..e1965cc122 100644
--- a/l10n/lt_LT/files_sharing.po
+++ b/l10n/lt_LT/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-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
@@ -25,3 +25,11 @@ msgstr ""
 #: templates/authenticate.php:6
 msgid "Submit"
 msgstr ""
+
+#: templates/public.php:9
+msgid "Download"
+msgstr ""
+
+#: templates/public.php:17
+msgid "web services under your control"
+msgstr ""
diff --git a/l10n/lt_LT/settings.po b/l10n/lt_LT/settings.po
index 9ba5a73caf..ca2f80d2fb 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-29 02:02+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
diff --git a/l10n/lv/core.po b/l10n/lv/core.po
index 09e8d451f5..a37e3cf176 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-08-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:02+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
diff --git a/l10n/lv/files_sharing.po b/l10n/lv/files_sharing.po
index 4f8c4e36f3..541faf7298 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-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
@@ -24,3 +24,11 @@ msgstr ""
 #: templates/authenticate.php:6
 msgid "Submit"
 msgstr ""
+
+#: templates/public.php:9
+msgid "Download"
+msgstr ""
+
+#: templates/public.php:17
+msgid "web services under your control"
+msgstr ""
diff --git a/l10n/lv/settings.po b/l10n/lv/settings.po
index 369af99b7f..44626e524c 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-29 02:02+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
diff --git a/l10n/mk/core.po b/l10n/mk/core.po
index 89a9f2435d..819d83c00f 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-08-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:02+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
diff --git a/l10n/mk/files_sharing.po b/l10n/mk/files_sharing.po
index f8507463dd..ff3aea4b67 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-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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,3 +24,11 @@ msgstr ""
 #: templates/authenticate.php:6
 msgid "Submit"
 msgstr ""
+
+#: templates/public.php:9
+msgid "Download"
+msgstr ""
+
+#: templates/public.php:17
+msgid "web services under your control"
+msgstr ""
diff --git a/l10n/mk/settings.po b/l10n/mk/settings.po
index 793020c8ed..8f71e56a59 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-29 02:02+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
diff --git a/l10n/ms_MY/core.po b/l10n/ms_MY/core.po
index 19af1da5eb..32e0b5e087 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-08-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:02+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
diff --git a/l10n/ms_MY/files_sharing.po b/l10n/ms_MY/files_sharing.po
index 1105b791e4..e81150885a 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-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
@@ -24,3 +24,11 @@ msgstr ""
 #: templates/authenticate.php:6
 msgid "Submit"
 msgstr ""
+
+#: templates/public.php:9
+msgid "Download"
+msgstr ""
+
+#: templates/public.php:17
+msgid "web services under your control"
+msgstr ""
diff --git a/l10n/ms_MY/settings.po b/l10n/ms_MY/settings.po
index c166dfab90..a23283e4d3 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-29 02:02+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
diff --git a/l10n/nb_NO/core.po b/l10n/nb_NO/core.po
index ffedfadca3..06f26b6566 100644
--- a/l10n/nb_NO/core.po
+++ b/l10n/nb_NO/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-08-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:02+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
diff --git a/l10n/nb_NO/files_sharing.po b/l10n/nb_NO/files_sharing.po
index 721253f761..922723d810 100644
--- a/l10n/nb_NO/files_sharing.po
+++ b/l10n/nb_NO/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-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
@@ -25,3 +25,11 @@ msgstr ""
 #: templates/authenticate.php:6
 msgid "Submit"
 msgstr ""
+
+#: templates/public.php:9
+msgid "Download"
+msgstr ""
+
+#: templates/public.php:17
+msgid "web services under your control"
+msgstr ""
diff --git a/l10n/nb_NO/settings.po b/l10n/nb_NO/settings.po
index 5636a7ccc6..9921843b97 100644
--- a/l10n/nb_NO/settings.po
+++ b/l10n/nb_NO/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-29 02:02+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
diff --git a/l10n/nl/core.po b/l10n/nl/core.po
index 8e55361a92..d85fb88a3f 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-08-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:02+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
diff --git a/l10n/nl/files_sharing.po b/l10n/nl/files_sharing.po
index 71500980d7..6284ad7a6c 100644
--- a/l10n/nl/files_sharing.po
+++ b/l10n/nl/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-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
@@ -25,3 +25,11 @@ msgstr ""
 #: templates/authenticate.php:6
 msgid "Submit"
 msgstr ""
+
+#: templates/public.php:9
+msgid "Download"
+msgstr ""
+
+#: templates/public.php:17
+msgid "web services under your control"
+msgstr ""
diff --git a/l10n/nl/settings.po b/l10n/nl/settings.po
index 06562d81b7..2ffd48deed 100644
--- a/l10n/nl/settings.po
+++ b/l10n/nl/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-29 02:02+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
diff --git a/l10n/nn_NO/core.po b/l10n/nn_NO/core.po
index ea511e8207..cc43de36a9 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-08-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:02+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
diff --git a/l10n/nn_NO/files_sharing.po b/l10n/nn_NO/files_sharing.po
index fb65f919f9..85149a47a1 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-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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,3 +24,11 @@ msgstr ""
 #: templates/authenticate.php:6
 msgid "Submit"
 msgstr ""
+
+#: templates/public.php:9
+msgid "Download"
+msgstr ""
+
+#: templates/public.php:17
+msgid "web services under your control"
+msgstr ""
diff --git a/l10n/nn_NO/settings.po b/l10n/nn_NO/settings.po
index 031fc58572..8e907e16d5 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-29 02:02+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
diff --git a/l10n/pl/core.po b/l10n/pl/core.po
index 7a41ee9070..0ba8278f61 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-08-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:02+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
diff --git a/l10n/pl/files_sharing.po b/l10n/pl/files_sharing.po
index 22865b645f..cce21f84af 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-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
@@ -25,3 +25,11 @@ msgstr ""
 #: templates/authenticate.php:6
 msgid "Submit"
 msgstr ""
+
+#: templates/public.php:9
+msgid "Download"
+msgstr ""
+
+#: templates/public.php:17
+msgid "web services under your control"
+msgstr ""
diff --git a/l10n/pl/settings.po b/l10n/pl/settings.po
index f34e2e110f..5ee6ed4d44 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-29 02:02+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
diff --git a/l10n/pt_BR/core.po b/l10n/pt_BR/core.po
index f0c05cafd0..a1285428ee 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-08-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:02+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
diff --git a/l10n/pt_BR/files_sharing.po b/l10n/pt_BR/files_sharing.po
index f00ee26c73..43165b5531 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-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
@@ -24,3 +24,11 @@ msgstr ""
 #: templates/authenticate.php:6
 msgid "Submit"
 msgstr ""
+
+#: templates/public.php:9
+msgid "Download"
+msgstr ""
+
+#: templates/public.php:17
+msgid "web services under your control"
+msgstr ""
diff --git a/l10n/pt_BR/settings.po b/l10n/pt_BR/settings.po
index da30f5b428..45def0c0f3 100644
--- a/l10n/pt_BR/settings.po
+++ b/l10n/pt_BR/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-29 02:02+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
diff --git a/l10n/pt_PT/core.po b/l10n/pt_PT/core.po
index 241a29410d..486b0c900f 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-08-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:02+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
diff --git a/l10n/pt_PT/files_sharing.po b/l10n/pt_PT/files_sharing.po
index d2225f80f1..57dd10e52d 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-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
@@ -24,3 +24,11 @@ msgstr ""
 #: templates/authenticate.php:6
 msgid "Submit"
 msgstr ""
+
+#: templates/public.php:9
+msgid "Download"
+msgstr ""
+
+#: templates/public.php:17
+msgid "web services under your control"
+msgstr ""
diff --git a/l10n/pt_PT/settings.po b/l10n/pt_PT/settings.po
index 83da25e2c7..158f3715bf 100644
--- a/l10n/pt_PT/settings.po
+++ b/l10n/pt_PT/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-29 02:02+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
diff --git a/l10n/ro/core.po b/l10n/ro/core.po
index 53f8bf1379..f913e8ed60 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-08-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:02+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
diff --git a/l10n/ro/files_sharing.po b/l10n/ro/files_sharing.po
index 3d9840ba7c..87f54b6986 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-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
@@ -24,3 +24,11 @@ msgstr ""
 #: templates/authenticate.php:6
 msgid "Submit"
 msgstr ""
+
+#: templates/public.php:9
+msgid "Download"
+msgstr ""
+
+#: templates/public.php:17
+msgid "web services under your control"
+msgstr ""
diff --git a/l10n/ro/settings.po b/l10n/ro/settings.po
index 09d25fbdec..28d3509f8e 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-29 02:02+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
diff --git a/l10n/ru/core.po b/l10n/ru/core.po
index 963a3edb69..5c005cb940 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-08-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:02+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
diff --git a/l10n/ru/files_sharing.po b/l10n/ru/files_sharing.po
index 6114ef96d4..0ab8e00bbc 100644
--- a/l10n/ru/files_sharing.po
+++ b/l10n/ru/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-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
@@ -20,8 +20,16 @@ msgstr ""
 
 #: templates/authenticate.php:4
 msgid "Password"
-msgstr ""
+msgstr "Пароль"
 
 #: templates/authenticate.php:6
 msgid "Submit"
+msgstr "Отправить"
+
+#: templates/public.php:9
+msgid "Download"
+msgstr ""
+
+#: templates/public.php:17
+msgid "web services under your control"
 msgstr ""
diff --git a/l10n/ru/settings.po b/l10n/ru/settings.po
index c8cbb591ee..c570bddff6 100644
--- a/l10n/ru/settings.po
+++ b/l10n/ru/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-29 02:02+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
diff --git a/l10n/ru/user_ldap.po b/l10n/ru/user_ldap.po
index 3a9b203bdb..b3dbb4c446 100644
--- a/l10n/ru/user_ldap.po
+++ b/l10n/ru/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-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-29 05: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"
@@ -165,7 +165,7 @@ msgstr "в секундах. Изменение очистит кэш."
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
-msgstr ""
+msgstr "Оставьте имя пользователя пустым (по умолчанию). Иначе укажите атрибут LDAP/AD."
 
 #: templates/settings.php:32
 msgid "Help"
diff --git a/l10n/ru_RU/core.po b/l10n/ru_RU/core.po
new file mode 100644
index 0000000000..d9bbba6c7e
--- /dev/null
+++ b/l10n/ru_RU/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-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ru_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/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:201 templates/layout.user.php:64 templates/layout.user.php:65
+msgid "Settings"
+msgstr ""
+
+#: js/js.js:586
+msgid "January"
+msgstr ""
+
+#: js/js.js:586
+msgid "February"
+msgstr ""
+
+#: js/js.js:586
+msgid "March"
+msgstr ""
+
+#: js/js.js:586
+msgid "April"
+msgstr ""
+
+#: js/js.js:586
+msgid "May"
+msgstr ""
+
+#: js/js.js:586
+msgid "June"
+msgstr ""
+
+#: js/js.js:587
+msgid "July"
+msgstr ""
+
+#: js/js.js:587
+msgid "August"
+msgstr ""
+
+#: js/js.js:587
+msgid "September"
+msgstr ""
+
+#: js/js.js:587
+msgid "October"
+msgstr ""
+
+#: js/js.js:587
+msgid "November"
+msgstr ""
+
+#: js/js.js:587
+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:26
+#: 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:24
+msgid "Create an <strong>admin account</strong>"
+msgstr ""
+
+#: templates/installation.php:30 templates/login.php:13
+msgid "Password"
+msgstr ""
+
+#: templates/installation.php:36
+msgid "Advanced"
+msgstr ""
+
+#: templates/installation.php:38
+msgid "Data folder"
+msgstr ""
+
+#: templates/installation.php:45
+msgid "Configure the database"
+msgstr ""
+
+#: templates/installation.php:50 templates/installation.php:61
+#: templates/installation.php:71 templates/installation.php:81
+msgid "will be used"
+msgstr ""
+
+#: templates/installation.php:93
+msgid "Database user"
+msgstr ""
+
+#: templates/installation.php:97
+msgid "Database password"
+msgstr ""
+
+#: templates/installation.php:101
+msgid "Database name"
+msgstr ""
+
+#: templates/installation.php:109
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:115
+msgid "Database host"
+msgstr ""
+
+#: templates/installation.php:120
+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/ru_RU/files.po b/l10n/ru_RU/files.po
new file mode 100644
index 0000000000..3db3a2c484
--- /dev/null
+++ b/l10n/ru_RU/files.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-08-30 02:02+0200\n"
+"PO-Revision-Date: 2011-08-13 02:19+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ru_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: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:111 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:246
+msgid "undo"
+msgstr ""
+
+#: js/filelist.js:246
+msgid "deleted"
+msgstr ""
+
+#: js/files.js:171
+msgid "generating ZIP-file, it may take some time."
+msgstr ""
+
+#: js/files.js:200
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/files.js:200
+msgid "Upload Error"
+msgstr ""
+
+#: js/files.js:228 js/files.js:319 js/files.js:348
+msgid "Pending"
+msgstr ""
+
+#: js/files.js:333
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/files.js:457
+msgid "Invalid name, '/' is not allowed."
+msgstr ""
+
+#: js/files.js:703 templates/index.php:55
+msgid "Size"
+msgstr ""
+
+#: js/files.js:704 templates/index.php:56
+msgid "Modified"
+msgstr ""
+
+#: js/files.js:731
+msgid "folder"
+msgstr ""
+
+#: js/files.js:733
+msgid "folders"
+msgstr ""
+
+#: js/files.js:741
+msgid "file"
+msgstr ""
+
+#: js/files.js:743
+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/ru_RU/files_encryption.po b/l10n/ru_RU/files_encryption.po
new file mode 100644
index 0000000000..852ced02fd
--- /dev/null
+++ b/l10n/ru_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-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ru_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_RU/files_external.po b/l10n/ru_RU/files_external.po
new file mode 100644
index 0000000000..8d86942227
--- /dev/null
+++ b/l10n/ru_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-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-12 22:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ru_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_RU/files_sharing.po b/l10n/ru_RU/files_sharing.po
new file mode 100644
index 0000000000..a92e3899f4
--- /dev/null
+++ b/l10n/ru_RU/files_sharing.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-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 00:03+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ru_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/authenticate.php:4
+msgid "Password"
+msgstr ""
+
+#: templates/authenticate.php:6
+msgid "Submit"
+msgstr ""
+
+#: templates/public.php:9
+msgid "Download"
+msgstr ""
+
+#: templates/public.php:17
+msgid "web services under your control"
+msgstr ""
diff --git a/l10n/ru_RU/files_versions.po b/l10n/ru_RU/files_versions.po
new file mode 100644
index 0000000000..ca15399f31
--- /dev/null
+++ b/l10n/ru_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-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-12 22:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ru_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_RU/lib.po b/l10n/ru_RU/lib.po
new file mode 100644
index 0000000000..2c2884966b
--- /dev/null
+++ b/l10n/ru_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-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 22:23+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ru_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: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:276
+msgid "ZIP download is turned off."
+msgstr ""
+
+#: files.php:277
+msgid "Files need to be downloaded one by one."
+msgstr ""
+
+#: files.php:277 files.php:302
+msgid "Back to Files"
+msgstr ""
+
+#: files.php:301
+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_RU/settings.po b/l10n/ru_RU/settings.po
new file mode 100644
index 0000000000..41982d57d4
--- /dev/null
+++ b/l10n/ru_RU/settings.po
@@ -0,0 +1,274 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 00:03+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ru_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 ""
+
+#: 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: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 "Share API"
+msgstr ""
+
+#: templates/admin.php:44
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:45
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:49
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:50
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:54
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:55
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:58
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:60
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:67
+msgid "Log"
+msgstr ""
+
+#: templates/admin.php:95
+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 "Group Admin"
+msgstr ""
+
+#: templates/users.php:82
+msgid "Quota"
+msgstr ""
+
+#: templates/users.php:146
+msgid "Delete"
+msgstr ""
diff --git a/l10n/ru_RU/user_ldap.po b/l10n/ru_RU/user_ldap.po
new file mode 100644
index 0000000000..13c174b780
--- /dev/null
+++ b/l10n/ru_RU/user_ldap.po
@@ -0,0 +1,170 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: ru_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:30
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:32
+msgid "Help"
+msgstr ""
diff --git a/l10n/sk_SK/core.po b/l10n/sk_SK/core.po
index c31e43e6eb..95cae31afe 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-08-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:02+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
diff --git a/l10n/sk_SK/files_sharing.po b/l10n/sk_SK/files_sharing.po
index 9e19da94c8..225ce02eb7 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-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
@@ -24,3 +24,11 @@ msgstr ""
 #: templates/authenticate.php:6
 msgid "Submit"
 msgstr ""
+
+#: templates/public.php:9
+msgid "Download"
+msgstr ""
+
+#: templates/public.php:17
+msgid "web services under your control"
+msgstr ""
diff --git a/l10n/sk_SK/settings.po b/l10n/sk_SK/settings.po
index 77244df714..6d266311a2 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-29 02:02+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
diff --git a/l10n/sl/core.po b/l10n/sl/core.po
index 9056484dc6..75f51683d0 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-08-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:02+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
diff --git a/l10n/sl/files_sharing.po b/l10n/sl/files_sharing.po
index 9065df6a64..f553a60c3a 100644
--- a/l10n/sl/files_sharing.po
+++ b/l10n/sl/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-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
@@ -20,8 +20,16 @@ msgstr ""
 
 #: templates/authenticate.php:4
 msgid "Password"
-msgstr ""
+msgstr "Geslo"
 
 #: templates/authenticate.php:6
 msgid "Submit"
+msgstr "Pošlji"
+
+#: templates/public.php:9
+msgid "Download"
+msgstr ""
+
+#: templates/public.php:17
+msgid "web services under your control"
 msgstr ""
diff --git a/l10n/sl/settings.po b/l10n/sl/settings.po
index 1ee9f30e5e..f8e1963dbe 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-29 02:02+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
diff --git a/l10n/sl/user_ldap.po b/l10n/sl/user_ldap.po
index 4a23050ed5..f8ab6ff3ac 100644
--- a/l10n/sl/user_ldap.po
+++ b/l10n/sl/user_ldap.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-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-29 06:02+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"
@@ -164,7 +164,7 @@ msgstr "v sekundah. Sprememba izprazni predpomnilnik."
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
-msgstr ""
+msgstr "Pustite prazno za uporabniško ime (privzeto). V nasprotnem primeru navedite LDAP/AD atribut."
 
 #: templates/settings.php:32
 msgid "Help"
diff --git a/l10n/so/core.po b/l10n/so/core.po
index f0bef059c9..421cd8feec 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-08-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:02+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
diff --git a/l10n/so/files_sharing.po b/l10n/so/files_sharing.po
index 94223b1fd3..a4c02dcdc9 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-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
@@ -24,3 +24,11 @@ msgstr ""
 #: templates/authenticate.php:6
 msgid "Submit"
 msgstr ""
+
+#: templates/public.php:9
+msgid "Download"
+msgstr ""
+
+#: templates/public.php:17
+msgid "web services under your control"
+msgstr ""
diff --git a/l10n/so/settings.po b/l10n/so/settings.po
index a677a1e3bc..7212017b5e 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-29 02:02+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
diff --git a/l10n/sr/core.po b/l10n/sr/core.po
index 814ff643d5..b575b78776 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-08-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:02+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
diff --git a/l10n/sr/files_sharing.po b/l10n/sr/files_sharing.po
index 5979558f84..8026a97b6a 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-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
@@ -24,3 +24,11 @@ msgstr ""
 #: templates/authenticate.php:6
 msgid "Submit"
 msgstr ""
+
+#: templates/public.php:9
+msgid "Download"
+msgstr ""
+
+#: templates/public.php:17
+msgid "web services under your control"
+msgstr ""
diff --git a/l10n/sr/settings.po b/l10n/sr/settings.po
index df8d3be27c..6e36da2b90 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-29 02:02+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
diff --git a/l10n/sr@latin/core.po b/l10n/sr@latin/core.po
index b6526ca53b..7d743cabb8 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-08-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:02+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
diff --git a/l10n/sr@latin/files_sharing.po b/l10n/sr@latin/files_sharing.po
index 918bd167e0..1dadcaa0c7 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-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
@@ -24,3 +24,11 @@ msgstr ""
 #: templates/authenticate.php:6
 msgid "Submit"
 msgstr ""
+
+#: templates/public.php:9
+msgid "Download"
+msgstr ""
+
+#: templates/public.php:17
+msgid "web services under your control"
+msgstr ""
diff --git a/l10n/sr@latin/settings.po b/l10n/sr@latin/settings.po
index b5239835de..69ad747d51 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-29 02:02+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
diff --git a/l10n/sv/core.po b/l10n/sv/core.po
index 325f61911a..dca8b46a25 100644
--- a/l10n/sv/core.po
+++ b/l10n/sv/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-08-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:02+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
diff --git a/l10n/sv/files_sharing.po b/l10n/sv/files_sharing.po
index 71f71e1dda..24b8b4512a 100644
--- a/l10n/sv/files_sharing.po
+++ b/l10n/sv/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-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
@@ -20,8 +20,16 @@ msgstr ""
 
 #: templates/authenticate.php:4
 msgid "Password"
-msgstr ""
+msgstr "Lösenord"
 
 #: templates/authenticate.php:6
 msgid "Submit"
+msgstr "Skicka"
+
+#: templates/public.php:9
+msgid "Download"
+msgstr ""
+
+#: templates/public.php:17
+msgid "web services under your control"
 msgstr ""
diff --git a/l10n/sv/settings.po b/l10n/sv/settings.po
index 205f6b1314..809d52de8c 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-29 02:02+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
diff --git a/l10n/sv/user_ldap.po b/l10n/sv/user_ldap.po
index d5691270f2..5bab62c034 100644
--- a/l10n/sv/user_ldap.po
+++ b/l10n/sv/user_ldap.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-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-29 09:37+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"
@@ -164,7 +164,7 @@ msgstr "i sekunder. En förändring tömmer cache."
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
-msgstr ""
+msgstr "Lämnas tomt för användarnamn (standard). Ange annars ett LDAP/AD-attribut."
 
 #: templates/settings.php:32
 msgid "Help"
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index fb63cce50f..6739a9d17a 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-29 02:01+0200\n"
+"POT-Creation-Date: 2012-08-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 ab39126f39..35fb96910c 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-29 02:01+0200\n"
+"POT-Creation-Date: 2012-08-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_encryption.pot b/l10n/templates/files_encryption.pot
index 06954d4efa..45fa676de0 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-29 02:01+0200\n"
+"POT-Creation-Date: 2012-08-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_external.pot b/l10n/templates/files_external.pot
index 8a89c7d214..eab876421f 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-29 02:01+0200\n"
+"POT-Creation-Date: 2012-08-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_sharing.pot b/l10n/templates/files_sharing.pot
index 9bded512ff..ecdb5b3a51 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-29 02:01+0200\n"
+"POT-Creation-Date: 2012-08-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"
@@ -24,3 +24,11 @@ msgstr ""
 #: templates/authenticate.php:6
 msgid "Submit"
 msgstr ""
+
+#: templates/public.php:9
+msgid "Download"
+msgstr ""
+
+#: templates/public.php:17
+msgid "web services under your control"
+msgstr ""
diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot
index a04d4da157..a47259a971 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-29 02:01+0200\n"
+"POT-Creation-Date: 2012-08-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 27de1e0d90..95f3528e35 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-29 02:02+0200\n"
+"POT-Creation-Date: 2012-08-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 a848774f20..9d3d862be6 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-29 02:02+0200\n"
+"POT-Creation-Date: 2012-08-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/user_ldap.pot b/l10n/templates/user_ldap.pot
index afb446dd07..8813bf2773 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-29 02:01+0200\n"
+"POT-Creation-Date: 2012-08-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/th_TH/core.po b/l10n/th_TH/core.po
index 3868f2ff31..56e4b1d41f 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-08-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:02+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
diff --git a/l10n/th_TH/files_sharing.po b/l10n/th_TH/files_sharing.po
index 21f2b67908..d7cd4c2f06 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-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
@@ -20,8 +20,16 @@ msgstr ""
 
 #: templates/authenticate.php:4
 msgid "Password"
-msgstr ""
+msgstr "รหัสผ่าน"
 
 #: templates/authenticate.php:6
 msgid "Submit"
+msgstr "ส่ง"
+
+#: templates/public.php:9
+msgid "Download"
+msgstr ""
+
+#: templates/public.php:17
+msgid "web services under your control"
 msgstr ""
diff --git a/l10n/th_TH/settings.po b/l10n/th_TH/settings.po
index 99b1cb2ac3..aed3e24a8b 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-29 02:02+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
diff --git a/l10n/th_TH/user_ldap.po b/l10n/th_TH/user_ldap.po
index 791bc9000b..64ad07dbf6 100644
--- a/l10n/th_TH/user_ldap.po
+++ b/l10n/th_TH/user_ldap.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-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-29 18:29+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"
@@ -164,7 +164,7 @@ msgstr "ในอีกไม่กี่วินาที ระบบจะ
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
-msgstr ""
+msgstr "เว้นว่างไว้สำหรับ ชื่อผู้ใช้ (ค่าเริ่มต้น) หรือไม่กรุณาระบุคุณลักษณะของ LDAP/AD"
 
 #: templates/settings.php:32
 msgid "Help"
diff --git a/l10n/tr/core.po b/l10n/tr/core.po
index c965064524..9ebd27c72b 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-08-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:02+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
diff --git a/l10n/tr/files_sharing.po b/l10n/tr/files_sharing.po
index bc726f546f..5245890ac9 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-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
@@ -24,3 +24,11 @@ msgstr ""
 #: templates/authenticate.php:6
 msgid "Submit"
 msgstr ""
+
+#: templates/public.php:9
+msgid "Download"
+msgstr ""
+
+#: templates/public.php:17
+msgid "web services under your control"
+msgstr ""
diff --git a/l10n/tr/settings.po b/l10n/tr/settings.po
index cfe4ddc892..c8ec4df6d3 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-29 02:02+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
diff --git a/l10n/uk/core.po b/l10n/uk/core.po
index 7493adea34..5e62d05465 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-08-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:02+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
diff --git a/l10n/uk/files_sharing.po b/l10n/uk/files_sharing.po
index a90d76aca0..18f1b3239f 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-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
@@ -24,3 +24,11 @@ msgstr ""
 #: templates/authenticate.php:6
 msgid "Submit"
 msgstr ""
+
+#: templates/public.php:9
+msgid "Download"
+msgstr ""
+
+#: templates/public.php:17
+msgid "web services under your control"
+msgstr ""
diff --git a/l10n/uk/settings.po b/l10n/uk/settings.po
index 03945e1bfb..c1747c1f50 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-29 02:02+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
diff --git a/l10n/vi/core.po b/l10n/vi/core.po
index ddfe09758d..2f5e069a95 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-08-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:02+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
diff --git a/l10n/vi/files_sharing.po b/l10n/vi/files_sharing.po
index fbfe460234..d44805eae8 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-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
@@ -24,3 +24,11 @@ msgstr ""
 #: templates/authenticate.php:6
 msgid "Submit"
 msgstr ""
+
+#: templates/public.php:9
+msgid "Download"
+msgstr ""
+
+#: templates/public.php:17
+msgid "web services under your control"
+msgstr ""
diff --git a/l10n/vi/settings.po b/l10n/vi/settings.po
index fdbc7da0b1..89b1c2df28 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-29 02:02+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
diff --git a/l10n/zh_CN.GB2312/core.po b/l10n/zh_CN.GB2312/core.po
index 5ae461a170..f8c449f4c4 100644
--- a/l10n/zh_CN.GB2312/core.po
+++ b/l10n/zh_CN.GB2312/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-08-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:02+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
diff --git a/l10n/zh_CN.GB2312/files_sharing.po b/l10n/zh_CN.GB2312/files_sharing.po
index 33a8efe467..638e9fffe3 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-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
@@ -24,3 +24,11 @@ msgstr ""
 #: templates/authenticate.php:6
 msgid "Submit"
 msgstr ""
+
+#: templates/public.php:9
+msgid "Download"
+msgstr ""
+
+#: templates/public.php:17
+msgid "web services under your control"
+msgstr ""
diff --git a/l10n/zh_CN.GB2312/settings.po b/l10n/zh_CN.GB2312/settings.po
index 5cefbd6785..5390e67449 100644
--- a/l10n/zh_CN.GB2312/settings.po
+++ b/l10n/zh_CN.GB2312/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-29 02:02+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
diff --git a/l10n/zh_CN/core.po b/l10n/zh_CN/core.po
index da40f7d393..bad15c7b6e 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-08-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:02+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
diff --git a/l10n/zh_CN/files_sharing.po b/l10n/zh_CN/files_sharing.po
index cb50b796bf..70f1f248d9 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-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
@@ -24,3 +24,11 @@ msgstr ""
 #: templates/authenticate.php:6
 msgid "Submit"
 msgstr ""
+
+#: templates/public.php:9
+msgid "Download"
+msgstr ""
+
+#: templates/public.php:17
+msgid "web services under your control"
+msgstr ""
diff --git a/l10n/zh_CN/settings.po b/l10n/zh_CN/settings.po
index 30ae97464e..7aaa318528 100644
--- a/l10n/zh_CN/settings.po
+++ b/l10n/zh_CN/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-29 02:02+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
diff --git a/l10n/zh_TW/core.po b/l10n/zh_TW/core.po
index 8fe1a80fc5..03ef737717 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-08-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:02+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
diff --git a/l10n/zh_TW/files_sharing.po b/l10n/zh_TW/files_sharing.po
index f8438d08d7..744c965f70 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-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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,3 +24,11 @@ msgstr ""
 #: templates/authenticate.php:6
 msgid "Submit"
 msgstr ""
+
+#: templates/public.php:9
+msgid "Download"
+msgstr ""
+
+#: templates/public.php:17
+msgid "web services under your control"
+msgstr ""
diff --git a/l10n/zh_TW/settings.po b/l10n/zh_TW/settings.po
index aaea010810..ed8f34b1a3 100644
--- a/l10n/zh_TW/settings.po
+++ b/l10n/zh_TW/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-29 02:02+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
+"POT-Creation-Date: 2012-08-30 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 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"
diff --git a/settings/l10n/cs_CZ.php b/settings/l10n/cs_CZ.php
index ed7378b80c..39ac247aed 100644
--- a/settings/l10n/cs_CZ.php
+++ b/settings/l10n/cs_CZ.php
@@ -51,6 +51,7 @@
 "Create" => "Vytvořit",
 "Default Quota" => "Výchozí kvóta",
 "Other" => "Jiné",
+"Group Admin" => "Administrace skupiny",
 "Quota" => "Kvóta",
 "Delete" => "Vymazat"
 );
diff --git a/settings/l10n/ko.php b/settings/l10n/ko.php
index 828426dc1d..7bcf67cc2a 100644
--- a/settings/l10n/ko.php
+++ b/settings/l10n/ko.php
@@ -1,13 +1,21 @@
 <?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" => "각 페이지가 로드 된 하나의 작업을 실행",
+"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" => "다른",
+"Group Admin" => "그룹 관리자",
 "Quota" => "할당량",
 "Delete" => "삭제"
 );

From 8990855f88c8cf0803bcf7220699c54b46b0d546 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Wed, 29 Aug 2012 21:52:42 +0200
Subject: [PATCH 1000/1224] add OC.get and OC.set to get/set variables by name
 in javascript

---
 core/js/js.js | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/core/js/js.js b/core/js/js.js
index c38eebbff2..0a7c84f61d 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -587,3 +587,40 @@ function formatDate(date){
 	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()<10)?'0':'')+date.getMinutes();
 }
+
+/**
+ * get a variable by name
+ * @param string name
+ */
+OC.get=function(name) {
+	var namespaces = name.split(".");
+	var tail = namespaces.pop();
+	var context=window;
+	
+	for(var i = 0; i < namespaces.length; i++) {
+		context = context[namespaces[i]];
+		if(!context){
+			return false;
+		}
+	}
+	return context[tail];
+}
+
+/**
+ * set a variable by name
+ * @param string name
+ * @param mixed value
+ */
+OC.set=function(name, value) {
+	var namespaces = name.split(".");
+	var tail = namespaces.pop();
+	var context=window;
+	
+	for(var i = 0; i < namespaces.length; i++) {
+		if(!context[namespaces[i]]){
+			context[namespaces[i]]={};
+		}
+		context = context[namespaces[i]];
+	}
+	context[tail]=value;
+}

From 756b514fee05bdeb9c7fc06876e498837974bb6c Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Wed, 29 Aug 2012 20:40:12 -0400
Subject: [PATCH 1001/1224] Check if file source exists before searching for
 link

---
 apps/files_sharing/public.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/apps/files_sharing/public.php b/apps/files_sharing/public.php
index 7f72ef81bd..010f6b9de1 100644
--- a/apps/files_sharing/public.php
+++ b/apps/files_sharing/public.php
@@ -6,9 +6,8 @@ if (isset($_GET['file'])) {
 	$uidOwner = substr($_GET['file'], 1, $pos - 1);
 	if (OCP\User::userExists($uidOwner)) {
 		OC_Util::setupFS($uidOwner);
-		$file = substr($_GET['file'], $pos);
 		$fileSource = OC_Filecache::getId($_GET['file'], '');
-		if ($linkItem = OCP\Share::getItemSharedWithByLink('file', $fileSource, $uidOwner)) {
+		if ($fileSource != -1 && ($linkItem = OCP\Share::getItemSharedWithByLink('file', $fileSource, $uidOwner))) {
 			if (isset($linkItem['share_with'])) {
 				// Check password
 				if (isset($_POST['password'])) {

From f2534e7428be3b67273a45fc17dd628f0b3d4684 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Wed, 29 Aug 2012 21:12:10 -0400
Subject: [PATCH 1002/1224] Show notification that no preview is available if
 no previewer is found for a public link to a file

---
 apps/files_sharing/css/public.css       | 5 +++--
 apps/files_sharing/js/public.js         | 6 +++++-
 apps/files_sharing/templates/public.php | 6 ++++++
 3 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/apps/files_sharing/css/public.css b/apps/files_sharing/css/public.css
index f38afae3dd..a700cc2169 100644
--- a/apps/files_sharing/css/public.css
+++ b/apps/files_sharing/css/public.css
@@ -1,7 +1,8 @@
 body { background:#ddd; }
 #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; }
 #details { color:#fff; }
-#download { margin-left:2em; font-weight:bold; color:#fff; }
-#preview { min-height:30em; margin:50px auto; border-bottom:1px solid #f8f8f8; background:#eee; text-align:center; }
+#header #download { margin-left:2em; font-weight:bold; color:#fff; }
+#preview { min-height:30em; margin:50px auto; padding-top:2em; border-bottom:1px solid #f8f8f8; background:#eee; text-align:center; }
+#noPreview { display:none; padding-top:5em; }
 p.info { width:22em; text-align: center; margin:2em auto; color:#777; text-shadow:#fff 0 1px 0; }
 p.info a { font-weight:bold; color:#777; }
\ No newline at end of file
diff --git a/apps/files_sharing/js/public.js b/apps/files_sharing/js/public.js
index 755382e073..1ab61d476e 100644
--- a/apps/files_sharing/js/public.js
+++ b/apps/files_sharing/js/public.js
@@ -11,7 +11,11 @@ $(document).ready(function() {
 		if (mimetype.substr(0, mimetype.indexOf('/')) != 'image') {
 			// Trigger default action if not download TODO
 			var action = FileActions.getDefault(mimetype, 'file', FileActions.PERMISSION_READ);
-			action($('#filename').val());
+			if (typeof action === 'undefined') {
+				$('#noPreview').show();
+			} else {
+				action($('#filename').val());
+			}
 		}
 	}
 
diff --git a/apps/files_sharing/templates/public.php b/apps/files_sharing/templates/public.php
index 36e159dafe..1c08b5b26a 100755
--- a/apps/files_sharing/templates/public.php
+++ b/apps/files_sharing/templates/public.php
@@ -13,5 +13,11 @@
 	<?php if (substr($_['mimetype'], 0 , strpos($_['mimetype'], '/')) == 'image'): ?>
 		<img src="<?php echo $_['downloadURL']; ?>" />
 	<?php endif; ?>
+	<ul id="noPreview">
+		<li class="error">
+			<?php echo $l->t('No preview available for').' '.$_['filename']; ?><br />
+			<a href="<?php echo $_['downloadURL']; ?>" id="download"><img class="svg" alt="Download" src="<?php echo OCP\image_path("core", "actions/download.svg"); ?>" /><?php echo $l->t('Download')?></a>
+		</li>
+	</ul>
 </div>
 <footer><p class="info"><a href="http://owncloud.org/">ownCloud</a> &ndash; <?php echo $l->t('web services under your control'); ?></p></footer>
\ No newline at end of file

From 2440e500b854268beb320147f64c468b20eacbc4 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Thu, 30 Aug 2012 14:54:52 +0200
Subject: [PATCH 1003/1224] LDAP: on upgrade set homeDirs of users where it is
 not set. Avoids new folders (empty), depending on the configuration

---
 apps/user_ldap/appinfo/update.php | 4 +++-
 apps/user_ldap/appinfo/version    | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/apps/user_ldap/appinfo/update.php b/apps/user_ldap/appinfo/update.php
index f06655c1dc..a05293f228 100644
--- a/apps/user_ldap/appinfo/update.php
+++ b/apps/user_ldap/appinfo/update.php
@@ -34,7 +34,7 @@ $groupBE = new \OCA\user_ldap\GROUP_LDAP();
 $groupBE->setConnector($connector);
 
 foreach($objects as $object) {
-	$fetchDNSql = 'SELECT `ldap_dn` FROM `*PREFIX*ldap_'.$object.'_mapping`';
+	$fetchDNSql = 'SELECT `ldap_dn`, `owncloud_name` FROM `*PREFIX*ldap_'.$object.'_mapping`';
 	$updateSql = 'UPDATE `*PREFIX*ldap_'.$object.'_mapping` SET `ldap_DN` = ?, `directory_uuid` = ? WHERE `ldap_dn` = ?';
 
 	$query = OCP\DB::prepare($fetchDNSql);
@@ -45,6 +45,8 @@ foreach($objects as $object) {
 		$newDN = mb_strtolower($dn['ldap_dn'], 'UTF-8');
 		if($object == 'user') {
 			$uuid = $userBE->getUUID($newDN);
+			//fix home folder to avoid new ones depending on the configuration
+			$userBE->getHome($dn['owncloud_name']);
 		} else {
 			$uuid = $groupBE->getUUID($newDN);
 		}
diff --git a/apps/user_ldap/appinfo/version b/apps/user_ldap/appinfo/version
index e689e4949e..b810fec986 100644
--- a/apps/user_ldap/appinfo/version
+++ b/apps/user_ldap/appinfo/version
@@ -1 +1 @@
-0.2.0.26
\ No newline at end of file
+0.2.0.28
\ No newline at end of file

From 1a6f34865c7312e01fa20bf689ed70b9e723f7b3 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Thu, 30 Aug 2012 15:03:02 +0200
Subject: [PATCH 1004/1224] LDAP: on upgrade update user cols in database only
 when necessary

---
 apps/user_ldap/appinfo/update.php | 2 +-
 apps/user_ldap/appinfo/version    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/user_ldap/appinfo/update.php b/apps/user_ldap/appinfo/update.php
index a05293f228..da36211b66 100644
--- a/apps/user_ldap/appinfo/update.php
+++ b/apps/user_ldap/appinfo/update.php
@@ -34,7 +34,7 @@ $groupBE = new \OCA\user_ldap\GROUP_LDAP();
 $groupBE->setConnector($connector);
 
 foreach($objects as $object) {
-	$fetchDNSql = 'SELECT `ldap_dn`, `owncloud_name` FROM `*PREFIX*ldap_'.$object.'_mapping`';
+	$fetchDNSql = 'SELECT `ldap_dn`, `owncloud_name` FROM `*PREFIX*ldap_'.$object.'_mapping` WHERE `directory_uuid` = ""';
 	$updateSql = 'UPDATE `*PREFIX*ldap_'.$object.'_mapping` SET `ldap_DN` = ?, `directory_uuid` = ? WHERE `ldap_dn` = ?';
 
 	$query = OCP\DB::prepare($fetchDNSql);
diff --git a/apps/user_ldap/appinfo/version b/apps/user_ldap/appinfo/version
index b810fec986..444b3e8a75 100644
--- a/apps/user_ldap/appinfo/version
+++ b/apps/user_ldap/appinfo/version
@@ -1 +1 @@
-0.2.0.28
\ No newline at end of file
+0.2.0.30
\ No newline at end of file

From 7027742bd64b233370e3b063b6c3390815fd24d3 Mon Sep 17 00:00:00 2001
From: Arthur Schiwon <blizzz@owncloud.com>
Date: Thu, 30 Aug 2012 15:06:33 +0200
Subject: [PATCH 1005/1224] LDAP settings, add missing p tags

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

diff --git a/apps/user_ldap/templates/settings.php b/apps/user_ldap/templates/settings.php
index d1aaeedbdf..3a653ad720 100644
--- a/apps/user_ldap/templates/settings.php
+++ b/apps/user_ldap/templates/settings.php
@@ -23,8 +23,8 @@
 		<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_quota_attr">Quota Field</label><input type="text" id="ldap_quota_attr" name="ldap_quota_attr" value="<?php echo $_['ldap_quota_attr']; ?>" /></p>
+		<p><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>
 		<p><label for="home_folder_naming_rule">User Home Folder Naming Rule</label><input type="text" id="home_folder_naming_rule" name="home_folder_naming_rule" value="<?php echo $_['home_folder_naming_rule']; ?>" title="<?php echo $l->t('Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute.');?>" /></p>

From b5234a4f34def2087f6d39c50bf567359689bac0 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Thu, 30 Aug 2012 22:17:54 +0200
Subject: [PATCH 1006/1224] allow html inside app descriptions

---
 lib/app.php                 | 3 +++
 settings/js/apps.js         | 4 ++--
 settings/templates/apps.php | 6 +++---
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/lib/app.php b/lib/app.php
index 5c0ec2f01e..006599e7df 100755
--- a/lib/app.php
+++ b/lib/app.php
@@ -437,6 +437,9 @@ class OC_App{
 				foreach($child->children() as $type){
 					$data['types'][]=$type->getName();
 				}
+			}elseif($child->getName()=='description'){
+				$xml=(string)$child->asXML();
+				$data[$child->getName()]=substr($xml,13,-14);//script <description> tags
 			}else{
 				$data[$child->getName()]=(string)$child;
 			}
diff --git a/settings/js/apps.js b/settings/js/apps.js
index cfddf4a48a..f961248237 100644
--- a/settings/js/apps.js
+++ b/settings/js/apps.js
@@ -29,7 +29,7 @@ OC.Settings.Apps = OC.Settings.Apps || {
 		} else {
 			page.find('span.version').text('');
 		}
-		page.find('p.description').text(app.description);
+		page.find('p.description').html(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);
@@ -100,7 +100,7 @@ OC.Settings.Apps = OC.Settings.Apps || {
 
 $(document).ready(function(){
 	$('#leftcontent li').each(function(index,li){
-		var app = $.parseJSON($(this).children('span').text());
+		var app = OC.get('appData_'+$(li).data('id'));
 		$(li).data('app',app);
 		$(this).find('span.hidden').remove();
 	});
diff --git a/settings/templates/apps.php b/settings/templates/apps.php
index 83d63b6b41..8efbcf0a7e 100644
--- a/settings/templates/apps.php
+++ b/settings/templates/apps.php
@@ -14,9 +14,9 @@
 	<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>
+		<script type="application/javascript">
+			appData_<?php echo $app['id'] ?>=<?php OC_JSON::encodedPrint($app,false) ?>;
+		</script>
 		<?php  if(!$app['internal']) echo '<small class="externalapp list">3rd party</small>' ?>
 	</li>
 	<?php endforeach;?>

From 8380e6f658a87a9ab04db10389706c9d746cb466 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Thu, 30 Aug 2012 22:18:11 +0200
Subject: [PATCH 1007/1224] add backup files and kate-swp files to gitignore

---
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index ae63693170..4749dea19d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,10 +19,12 @@ _darcs/*
 CVS/*
 .svn/*
 RCS/*
+*.backup*
 
 # kdevelop
 .kdev
 *.kdev4
+*.kate-swp
 
 # Lokalize
 *lokalize*

From 6324daecc08e947e9290228a5bf6dca49ceeabaa Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Thu, 30 Aug 2012 23:10:24 +0200
Subject: [PATCH 1008/1224] Don't wait for document ready for setting
 requesttoken

---
 core/templates/layout.user.php | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index 2abe4da853..a2560b755f 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -31,14 +31,10 @@
 			?>
 		<?php endforeach; ?>
 		<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);
-					}
-				});
+			requesttoken = '<?php echo $_['requesttoken']; ?>';
+			OC.EventSource.requesttoken=requesttoken;
+			$(document).bind('ajaxSend', function(elm, xhr, s){
+				xhr.setRequestHeader('requesttoken', requesttoken);
 			});
 		</script>
 	</head>

From 58b1e841f11559f462ce803a500105f0b64f6e36 Mon Sep 17 00:00:00 2001
From: Thomas Mueller <thomas.mueller@tmit.eu>
Date: Thu, 30 Aug 2012 23:51:44 +0200
Subject: [PATCH 1009/1224] fix translations within subfolder /lib

---
 lib/app.php      |  2 +-
 lib/files.php    |  4 ++--
 lib/json.php     | 10 +++++-----
 lib/template.php |  2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/lib/app.php b/lib/app.php
index 006599e7df..261f079399 100755
--- a/lib/app.php
+++ b/lib/app.php
@@ -279,7 +279,7 @@ class OC_App{
 	 * entries are sorted by the key 'order' ascending.
 	 */
 	public static function getSettingsNavigation(){
-		$l=OC_L10N::get('core');
+		$l=OC_L10N::get('lib');
 
 		$settings = array();
 		// by default, settings only contain the help menu
diff --git a/lib/files.php b/lib/files.php
index 0c71f6e5e4..a303c07872 100644
--- a/lib/files.php
+++ b/lib/files.php
@@ -268,7 +268,7 @@ class OC_Files {
 	*/
 	static function validateZipDownload($dir, $files) {
 		if(!OC_Config::getValue('allowZipDownload', true)) {
-			$l = OC_L10N::get('files');
+			$l = OC_L10N::get('lib');
 			header("HTTP/1.0 409 Conflict");
 			$tmpl = new OC_Template( '', 'error', 'user' );
 			$errors = array(
@@ -293,7 +293,7 @@ class OC_Files {
 				$totalsize += OC_Filesystem::filesize($dir.'/'.$files);
 			}
 			if($totalsize > $zipLimit) {
-				$l = OC_L10N::get('files');
+				$l = OC_L10N::get('lib');
 				header("HTTP/1.0 409 Conflict");
 				$tmpl = new OC_Template( '', 'error', 'user' );
 				$errors = array(
diff --git a/lib/json.php b/lib/json.php
index 32ae734e4a..12442cc83d 100644
--- a/lib/json.php
+++ b/lib/json.php
@@ -24,7 +24,7 @@ class OC_JSON{
 	*/
 	public static function checkAppEnabled($app){
 		if( !OC_App::isEnabled($app)){
-			$l = OC_L10N::get('core');
+			$l = OC_L10N::get('lib');
 			self::error(array( 'data' => array( 'message' => $l->t('Application is not enabled') )));
 			exit();
 		}
@@ -35,7 +35,7 @@ class OC_JSON{
 	*/
 	public static function checkLoggedIn(){
 		if( !OC_User::isLoggedIn()){
-			$l = OC_L10N::get('core');
+			$l = OC_L10N::get('lib');
 			self::error(array( 'data' => array( 'message' => $l->t('Authentication error') )));
 			exit();
 		}
@@ -47,7 +47,7 @@ class OC_JSON{
 	 */
 	public static function callCheck(){
 		if( !OC_Util::isCallRegistered()){
-			$l = OC_L10N::get('core');
+			$l = OC_L10N::get('lib');
 			self::error(array( 'data' => array( 'message' => $l->t('Token expired. Please reload page.') )));
 			exit();
 		}
@@ -59,7 +59,7 @@ class OC_JSON{
 	public static function checkAdminUser(){
 		self::checkLoggedIn();
 		if( !OC_Group::inGroup( OC_User::getUser(), 'admin' )){
-			$l = OC_L10N::get('core');
+			$l = OC_L10N::get('lib');
 			self::error(array( 'data' => array( 'message' => $l->t('Authentication error') )));
 			exit();
 		}
@@ -71,7 +71,7 @@ class OC_JSON{
 	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');
+			$l = OC_L10N::get('lib');
 			self::error(array( 'data' => array( 'message' => $l->t('Authentication error') )));
 			exit();
 		}
diff --git a/lib/template.php b/lib/template.php
index fe8a3c7994..fa8d419261 100644
--- a/lib/template.php
+++ b/lib/template.php
@@ -76,7 +76,7 @@ function simple_file_size($bytes) {
 }
 
 function relative_modified_date($timestamp) {
-    $l=OC_L10N::get('template');
+    $l=OC_L10N::get('lib');
 	$timediff = time() - $timestamp;
 	$diffminutes = round($timediff/60);
 	$diffhours = round($diffminutes/60);

From 26ef01241887d74d7afc1854580eae659601da14 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= <jfd@butonic.de>
Date: Fri, 31 Aug 2012 00:13:02 +0200
Subject: [PATCH 1010/1224] use permissions to quickfix drag selections

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

diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index b57e75c900..5ecc5bc22c 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -40,8 +40,11 @@ $(document).ready(function() {
 	$('#file_action_panel').attr('activeAction', false);
 
 	//drag/drop of files
-	$('#fileList tr[data-write="true"] td.filename').draggable(dragOptions);
-	$('#fileList tr[data-type="dir"][data-write="true"] td.filename').droppable(folderDropOptions);
+	//TODO if we express permisions as "1 2 4 8 16" we can select create with [data-permissions~="4"]
+	$('#fileList tr[data-permissions="11"] td.filename').draggable(dragOptions);
+	$('#fileList tr[data-permissions="27"] td.filename').draggable(dragOptions);
+	$('#fileList tr[data-type="dir"][data-permissions="15"] td.filename').droppable(folderDropOptions);
+	$('#fileList tr[data-type="dir"][data-permissions="31"] td.filename').droppable(folderDropOptions);
 	$('div.crumb:not(.last)').droppable(crumbDropOptions);
 	$('ul#apps>li:first-child').data('dir','');
 	if($('div.crumb').length){

From bd809574dc06a68d5e1060fb8b9f0484e6a4f1f5 Mon Sep 17 00:00:00 2001
From: Thomas Mueller <thomas.mueller@tmit.eu>
Date: Fri, 31 Aug 2012 00:43:50 +0200
Subject: [PATCH 1011/1224] fix translations within subfolder /lib

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

diff --git a/lib/l10n.php b/lib/l10n.php
index cfa0e26486..4560cb7dbb 100644
--- a/lib/l10n.php
+++ b/lib/l10n.php
@@ -113,7 +113,10 @@ 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((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')) {
+			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.'/lib/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)){

From 077e98813606c07e35f73533f349a4f66f3c1e99 Mon Sep 17 00:00:00 2001
From: Thomas Mueller <thomas.mueller@tmit.eu>
Date: Fri, 31 Aug 2012 00:45:03 +0200
Subject: [PATCH 1012/1224] oc-1548: prevent user from leaving the page while a
 file upload is in progress

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

diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index 5ecc5bc22c..6165da2283 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -389,6 +389,21 @@ $(document).ready(function() {
 		})
 	});
 
+	$.assocArraySize = function(obj) {
+		// http://stackoverflow.com/a/6700/11236
+		var size = 0, key;
+		for (key in obj) {
+		    if (obj.hasOwnProperty(key)) size++;
+		}
+		return size;
+	};
+
+	// warn user not to leave the page while upload is in progress
+	$(window).bind('beforeunload', function(e) {
+		if ($.assocArraySize(uploadingFiles) > 0)
+			return t('files','File upload is in progress. Leaving the page now will cancel the upload.');
+	});
+
 	//add multiply file upload attribute to all browsers except konqueror (which crashes when it's used)
 	if(navigator.userAgent.search(/konqueror/i)==-1){
 		$('.file_upload_start').attr('multiple','multiple')

From 61a3e5f96b5019f89587e8cead63988f274d140e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= <jfd@butonic.de>
Date: Fri, 31 Aug 2012 00:59:10 +0200
Subject: [PATCH 1013/1224] unify permissions (1/3): add permission conastants
 to javascript OC

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

diff --git a/core/js/js.js b/core/js/js.js
index 0a7c84f61d..7ce349a214 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -40,6 +40,11 @@ function fileDownloadPath(dir, file) {
 }
 
 OC={
+	PERMISSION_CREATE:4,
+	PERMISSION_READ:1,
+	PERMISSION_UPDATE:2,
+	PERMISSION_DELETE:8,
+	PERMISSION_SHARE:16,
 	webroot:oc_webroot,
 	appswebroots:oc_appswebroots,
 	currentUser:(typeof oc_current_user!=='undefined')?oc_current_user:false,

From 3ba27e624f2c36044a982bc0cd69f07106e61e96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= <jfd@butonic.de>
Date: Fri, 31 Aug 2012 01:05:36 +0200
Subject: [PATCH 1014/1224] unify permissions (2/3): change apps to use
 OC::PERMISSION_X

---
 apps/files/js/fileactions.js       |  8 +++----
 apps/files_sharing/js/public.js    |  2 +-
 apps/files_sharing/js/share.js     |  2 +-
 apps/files_versions/js/versions.js |  2 +-
 core/js/share.js                   | 36 +++++++++++++++---------------
 5 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js
index 89e7bdd7ad..f587e99f96 100644
--- a/apps/files/js/fileactions.js
+++ b/apps/files/js/fileactions.js
@@ -156,12 +156,12 @@ $(document).ready(function(){
 	} else {
 		var downloadScope = 'file';
 	}
-	FileActions.register(downloadScope,'Download', FileActions.PERMISSION_READ, function(){return OC.imagePath('core','actions/download')},function(filename){
+	FileActions.register(downloadScope,'Download', OC.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', FileActions.PERMISSION_DELETE, function(){return OC.imagePath('core','actions/delete')},function(filename){
+FileActions.register('all','Delete', OC.PERMISSION_DELETE, function(){return OC.imagePath('core','actions/delete')},function(filename){
 	if(Files.cancelUpload(filename)) {
 		if(filename.substr){
 			filename=[filename];
@@ -179,11 +179,11 @@ FileActions.register('all','Delete', FileActions.PERMISSION_DELETE, function(){r
 	$('.tipsy').remove();
 });
 
-FileActions.register('all','Rename', FileActions.PERMISSION_UPDATE, function(){return OC.imagePath('core','actions/rename')},function(filename){
+FileActions.register('all','Rename', OC.PERMISSION_UPDATE, function(){return OC.imagePath('core','actions/rename')},function(filename){
 	FileList.rename(filename);
 });
 
-FileActions.register('dir','Open', FileActions.PERMISSION_READ, '', function(filename){
+FileActions.register('dir','Open', OC.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_sharing/js/public.js b/apps/files_sharing/js/public.js
index 1ab61d476e..92b626bba1 100644
--- a/apps/files_sharing/js/public.js
+++ b/apps/files_sharing/js/public.js
@@ -10,7 +10,7 @@ $(document).ready(function() {
 		// Show file preview if previewer is available, images are already handled by the template
 		if (mimetype.substr(0, mimetype.indexOf('/')) != 'image') {
 			// Trigger default action if not download TODO
-			var action = FileActions.getDefault(mimetype, 'file', FileActions.PERMISSION_READ);
+			var action = FileActions.getDefault(mimetype, 'file', OC.PERMISSION_READ);
 			if (typeof action === 'undefined') {
 				$('#noPreview').show();
 			} else {
diff --git a/apps/files_sharing/js/share.js b/apps/files_sharing/js/share.js
index 79ab4adeba..a171751589 100644
--- a/apps/files_sharing/js/share.js
+++ b/apps/files_sharing/js/share.js
@@ -2,7 +2,7 @@ $(document).ready(function() {
 
 	if (typeof OC.Share !== 'undefined' && typeof FileActions !== 'undefined') {
 		OC.Share.loadIcons('file');
-		FileActions.register('all', 'Share', FileActions.PERMISSION_READ, function(filename) {
+		FileActions.register('all', 'Share', OC.PERMISSION_READ, function(filename) {
 			// Return the correct sharing icon
 			if (scanFiles.scanning) { return; } // workaround to prevent additional http request block scanning feedback
 			if ($('#dir').val() == '/') {
diff --git a/apps/files_versions/js/versions.js b/apps/files_versions/js/versions.js
index e34a6f50ca..a9cf6171e4 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', FileActions.PERMISSION_UPDATE, function(){return OC.imagePath('core','actions/history')},function(filename){
+		FileActions.register('file','History', OC.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/core/js/share.js b/core/js/share.js
index 8bfbdd36e1..f8ff690732 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -129,7 +129,7 @@ OC.Share={
 			}
 			html += '<br />';
 		}
-		if (possiblePermissions & OC.Share.PERMISSION_SHARE) {
+		if (possiblePermissions & OC.PERMISSION_SHARE) {
 			html += '<input id="shareWith" type="text" placeholder="Share with" />';
 			html += '<ul id="shareWithList">';
 			html += '</ul>';
@@ -187,7 +187,7 @@ OC.Share={
 				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;
+				var permissions = OC.PERMISSION_READ | OC.PERMISSION_SHARE;
 				OC.Share.share(itemType, itemSource, shareType, shareWith, permissions, function() {
 					OC.Share.addShareWith(shareType, shareWith, permissions, possiblePermissions);
 					$('#shareWith').val('');
@@ -224,24 +224,24 @@ OC.Share={
 		}
 		OC.Share.itemShares[shareType].push(shareWith);
 		var editChecked = createChecked = updateChecked = deleteChecked = shareChecked = '';
-		if (permissions & OC.Share.PERMISSION_CREATE) {
+		if (permissions & OC.PERMISSION_CREATE) {
 			createChecked = 'checked="checked"';
 			editChecked = 'checked="checked"';
 		}
-		if (permissions & OC.Share.PERMISSION_UPDATE) {
+		if (permissions & OC.PERMISSION_UPDATE) {
 			updateChecked = 'checked="checked"';
 			editChecked = 'checked="checked"';
 		}
-		if (permissions & OC.Share.PERMISSION_DELETE) {
+		if (permissions & OC.PERMISSION_DELETE) {
 			deleteChecked = 'checked="checked"';
 			editChecked = 'checked="checked"';
 		}
-		if (permissions & OC.Share.PERMISSION_SHARE) {
+		if (permissions & OC.PERMISSION_SHARE) {
 			shareChecked = 'checked="checked"';
 		}
 		var html = '<li style="clear: both;" data-share-type="'+shareType+'" data-share-with="'+shareWith+'">';
 		html += shareWith;
-		if (possiblePermissions & OC.Share.PERMISSION_CREATE || possiblePermissions & OC.Share.PERMISSION_UPDATE || possiblePermissions & OC.Share.PERMISSION_DELETE) {
+		if (possiblePermissions & OC.PERMISSION_CREATE || possiblePermissions & OC.PERMISSION_UPDATE || possiblePermissions & OC.PERMISSION_DELETE) {
 			if (editChecked == '') {
 				html += '<label style="display:none;">';
 			} else {
@@ -252,17 +252,17 @@ OC.Share={
 		html += '<a href="#" class="showCruds" style="display:none;"><img class="svg" alt="Unshare" src="'+OC.imagePath('core', 'actions/triangle-s')+'"/></a>';
 		html += '<a href="#" class="unshare" style="display:none;"><img class="svg" alt="Unshare" src="'+OC.imagePath('core', 'actions/delete')+'"/></a>';
 		html += '<div class="cruds" style="display:none;">';
-			if (possiblePermissions & OC.Share.PERMISSION_CREATE) {
-				html += '<label><input type="checkbox" name="create" class="permissions" '+createChecked+' data-permissions="'+OC.Share.PERMISSION_CREATE+'" />create</label>';
+			if (possiblePermissions & OC.PERMISSION_CREATE) {
+				html += '<label><input type="checkbox" name="create" class="permissions" '+createChecked+' data-permissions="'+OC.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.PERMISSION_UPDATE) {
+				html += '<label><input type="checkbox" name="update" class="permissions" '+updateChecked+' data-permissions="'+OC.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.PERMISSION_DELETE) {
+				html += '<label><input type="checkbox" name="delete" class="permissions" '+deleteChecked+' data-permissions="'+OC.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>';
+			if (possiblePermissions & OC.PERMISSION_SHARE) {
+				html += '<label><input type="checkbox" name="share" class="permissions" '+shareChecked+' data-permissions="'+OC.PERMISSION_SHARE+'" />share</label>';
 			}
 		html += '</div>';
 		html += '</li>';
@@ -386,7 +386,7 @@ $(document).ready(function() {
 				$(checkboxes).filter('input[name="edit"]').attr('checked', true);
 			}
 		}
-		var permissions = OC.Share.PERMISSION_READ;
+		var permissions = OC.PERMISSION_READ;
 		$(checkboxes).filter(':not(input[name="edit"])').filter(':checked').each(function(index, checkbox) {
 			permissions |= $(checkbox).data('permissions');
 		});
@@ -398,7 +398,7 @@ $(document).ready(function() {
 		var itemSource = $('#dropdown').data('item-source');
 		if (this.checked) {
 			// Create a link
-			OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, '', OC.Share.PERMISSION_READ, function() {
+			OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, '', OC.PERMISSION_READ, function() {
 				OC.Share.showLink(itemSource);
 				// TODO Change icon
 			});
@@ -423,7 +423,7 @@ $(document).ready(function() {
 		if (event.keyCode == 13) {
 			var itemType = $('#dropdown').data('item-type');
 			var itemSource = $('#dropdown').data('item-source');
-			OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, $(this).val(), OC.Share.PERMISSION_READ, function() {
+			OC.Share.share(itemType, itemSource, OC.Share.SHARE_TYPE_LINK, $(this).val(), OC.PERMISSION_READ, function() {
 				$('#linkPassText').val('');
 				$('#linkPassText').attr('placeholder', 'Password protected');
 			});

From ca8120e9f429ba088a9ff6b525ae0762fd7d4f07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= <jfd@butonic.de>
Date: Fri, 31 Aug 2012 01:08:38 +0200
Subject: [PATCH 1015/1224] unify permissions (3/3): remove old PERMISSION_X
 from FileActions & OC.Share

---
 apps/files/js/fileactions.js | 5 -----
 core/js/share.js             | 5 -----
 2 files changed, 10 deletions(-)

diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js
index f587e99f96..ea3522cb10 100644
--- a/apps/files/js/fileactions.js
+++ b/apps/files/js/fileactions.js
@@ -1,9 +1,4 @@
 FileActions={
-	PERMISSION_CREATE:4,
-	PERMISSION_READ:1,
-	PERMISSION_UPDATE:2,
-	PERMISSION_DELETE:8,
-	PERMISSION_SHARE:16,
 	actions:{},
 	defaults:{},
 	icons:{},
diff --git a/core/js/share.js b/core/js/share.js
index f8ff690732..642c2e1fe4 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -3,11 +3,6 @@ OC.Share={
 	SHARE_TYPE_GROUP:1,
 	SHARE_TYPE_LINK:3,
 	SHARE_TYPE_EMAIL:4,
-	PERMISSION_CREATE:4,
-	PERMISSION_READ:1,
-	PERMISSION_UPDATE:2,
-	PERMISSION_DELETE:8,
-	PERMISSION_SHARE:16,
 	itemShares:[],
 	statuses:[],
 	droppedDown:false,

From 73d0a2b8f785da560b4bbefdbda40d809f2f7c36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= <jfd@butonic.de>
Date: Fri, 31 Aug 2012 01:09:18 +0200
Subject: [PATCH 1016/1224] use OC.PERMISSION_X to filter selected drag'n'drop
 elements

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

diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index 6165da2283..a729b5f2e6 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -40,11 +40,16 @@ $(document).ready(function() {
 	$('#file_action_panel').attr('activeAction', false);
 
 	//drag/drop of files
-	//TODO if we express permisions as "1 2 4 8 16" we can select create with [data-permissions~="4"]
-	$('#fileList tr[data-permissions="11"] td.filename').draggable(dragOptions);
-	$('#fileList tr[data-permissions="27"] td.filename').draggable(dragOptions);
-	$('#fileList tr[data-type="dir"][data-permissions="15"] td.filename').droppable(folderDropOptions);
-	$('#fileList tr[data-type="dir"][data-permissions="31"] td.filename').droppable(folderDropOptions);
+	$('#fileList tr td.filename').each(function(i,e){
+		if ($(e).parent().data('permissions') & OC.PERMISSION_DELETE) {
+			$(e).draggable(dragOptions);
+		}
+	});
+	$('#fileList tr[data-type="dir"] td.filename').each(function(i,e){
+		if ($(e).parent().data('permissions') & OC.PERMISSION_CREATE){
+			$(e).droppable(folderDropOptions);
+		}
+	});
 	$('div.crumb:not(.last)').droppable(crumbDropOptions);
 	$('ul#apps>li:first-child').data('dir','');
 	if($('div.crumb').length){

From 75cd7eacf8b7e130c94c258bf86502a06a5b2d17 Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <thomas.mueller@tmit.eu>
Date: Fri, 31 Aug 2012 02:07:19 +0200
Subject: [PATCH 1017/1224] [tx-robot] updated from transifex

---
 apps/files/l10n/de.php              |   8 +-
 apps/files/l10n/fr.php              |   8 +-
 apps/files/l10n/lv.php              |  24 ++-
 apps/files_external/l10n/es.php     |   7 +-
 apps/files_external/l10n/eu.php     |   1 +
 apps/files_sharing/l10n/ca.php      |   4 +-
 apps/files_sharing/l10n/de.php      |   4 +-
 apps/files_sharing/l10n/es.php      |   8 +-
 apps/files_sharing/l10n/eu.php      |   8 +-
 apps/files_sharing/l10n/fi_FI.php   |   8 +-
 apps/files_sharing/l10n/fr.php      |   4 +-
 apps/files_sharing/l10n/it.php      |   4 +-
 apps/files_sharing/l10n/ja_JP.php   |   4 +-
 apps/files_sharing/l10n/pl.php      |   8 +-
 apps/files_sharing/l10n/ru.php      |   4 +-
 apps/files_sharing/l10n/sl.php      |   4 +-
 apps/files_sharing/l10n/sv.php      |   4 +-
 apps/files_sharing/l10n/th_TH.php   |   4 +-
 apps/user_ldap/l10n/eu.php          |   1 +
 apps/user_ldap/l10n/pl.php          |   1 +
 apps/user_ldap/l10n/ro.php          |   1 +
 core/l10n/de.php                    |   2 +-
 core/l10n/fr.php                    |  28 +--
 l10n/af/core.po                     |  32 ++--
 l10n/af/files.po                    |  35 ++--
 l10n/af/files_sharing.po            |  12 +-
 l10n/af/settings.po                 |   4 +-
 l10n/ar/core.po                     |  32 ++--
 l10n/ar/files.po                    |  35 ++--
 l10n/ar/files_sharing.po            |  12 +-
 l10n/ar/settings.po                 |   4 +-
 l10n/ar_SA/core.po                  |  32 ++--
 l10n/ar_SA/files.po                 |  35 ++--
 l10n/ar_SA/files_sharing.po         |  12 +-
 l10n/ar_SA/settings.po              |   4 +-
 l10n/bg_BG/core.po                  |  32 ++--
 l10n/bg_BG/files.po                 |  35 ++--
 l10n/bg_BG/files_sharing.po         |  12 +-
 l10n/bg_BG/settings.po              |   4 +-
 l10n/ca/core.po                     |  34 ++--
 l10n/ca/files.po                    |  35 ++--
 l10n/ca/files_sharing.po            |  14 +-
 l10n/ca/settings.po                 |   6 +-
 l10n/cs_CZ/core.po                  |  32 ++--
 l10n/cs_CZ/files.po                 |  35 ++--
 l10n/cs_CZ/files_sharing.po         |  12 +-
 l10n/cs_CZ/settings.po              |   4 +-
 l10n/da/core.po                     |  32 ++--
 l10n/da/files.po                    |  35 ++--
 l10n/da/files_sharing.po            |  12 +-
 l10n/da/settings.po                 |   4 +-
 l10n/de/core.po                     |  34 ++--
 l10n/de/files.po                    |  47 ++---
 l10n/de/files_sharing.po            |  14 +-
 l10n/de/settings.po                 |  14 +-
 l10n/de/user_ldap.po                |   6 +-
 l10n/el/core.po                     |  32 ++--
 l10n/el/files.po                    |  35 ++--
 l10n/el/files_sharing.po            |  12 +-
 l10n/el/settings.po                 |   4 +-
 l10n/eo/core.po                     |  32 ++--
 l10n/eo/files.po                    |  35 ++--
 l10n/eo/files_sharing.po            |  12 +-
 l10n/eo/settings.po                 |   4 +-
 l10n/es/core.po                     |  32 ++--
 l10n/es/files.po                    |  35 ++--
 l10n/es/files_external.po           |  17 +-
 l10n/es/files_sharing.po            |  19 +-
 l10n/es/settings.po                 |   4 +-
 l10n/et_EE/core.po                  |  32 ++--
 l10n/et_EE/files.po                 |  37 ++--
 l10n/et_EE/files_sharing.po         |  12 +-
 l10n/et_EE/settings.po              |   4 +-
 l10n/eu/core.po                     |  32 ++--
 l10n/eu/files.po                    |  35 ++--
 l10n/eu/files_external.po           |   6 +-
 l10n/eu/files_sharing.po            |  18 +-
 l10n/eu/settings.po                 |   4 +-
 l10n/eu/user_ldap.po                |   8 +-
 l10n/eu_ES/core.po                  |  32 ++--
 l10n/eu_ES/files.po                 |  35 ++--
 l10n/eu_ES/files_sharing.po         |  12 +-
 l10n/eu_ES/settings.po              |   4 +-
 l10n/fa/core.po                     |  32 ++--
 l10n/fa/files.po                    |  37 ++--
 l10n/fa/files_sharing.po            |  12 +-
 l10n/fa/settings.po                 |   4 +-
 l10n/fi/core.po                     |  32 ++--
 l10n/fi/files.po                    |  35 ++--
 l10n/fi/files_sharing.po            |  12 +-
 l10n/fi/settings.po                 |   4 +-
 l10n/fi_FI/core.po                  |  32 ++--
 l10n/fi_FI/files.po                 |  37 ++--
 l10n/fi_FI/files_sharing.po         |  18 +-
 l10n/fi_FI/settings.po              |   4 +-
 l10n/fr/core.po                     |  61 ++++---
 l10n/fr/files.po                    |  44 +++--
 l10n/fr/files_sharing.po            |  15 +-
 l10n/fr/settings.po                 |   4 +-
 l10n/gl/core.po                     |  32 ++--
 l10n/gl/files.po                    |  35 ++--
 l10n/gl/files_sharing.po            |  12 +-
 l10n/gl/settings.po                 |   4 +-
 l10n/he/core.po                     |  32 ++--
 l10n/he/files.po                    |  35 ++--
 l10n/he/files_sharing.po            |  12 +-
 l10n/he/settings.po                 |   4 +-
 l10n/hi/core.po                     |  32 ++--
 l10n/hi/files.po                    |  37 ++--
 l10n/hi/files_sharing.po            |  12 +-
 l10n/hi/settings.po                 |   4 +-
 l10n/hr/core.po                     |  32 ++--
 l10n/hr/files.po                    |  37 ++--
 l10n/hr/files_sharing.po            |  12 +-
 l10n/hr/settings.po                 |   4 +-
 l10n/hu_HU/core.po                  |  32 ++--
 l10n/hu_HU/files.po                 |  35 ++--
 l10n/hu_HU/files_sharing.po         |  12 +-
 l10n/hu_HU/settings.po              |   4 +-
 l10n/hy/core.po                     |  32 ++--
 l10n/hy/files.po                    |  35 ++--
 l10n/hy/files_sharing.po            |  12 +-
 l10n/hy/settings.po                 |   4 +-
 l10n/ia/core.po                     |  32 ++--
 l10n/ia/files.po                    |  35 ++--
 l10n/ia/files_sharing.po            |  12 +-
 l10n/ia/settings.po                 |   4 +-
 l10n/id/core.po                     |  32 ++--
 l10n/id/files.po                    |  37 ++--
 l10n/id/files_sharing.po            |  12 +-
 l10n/id/settings.po                 |   4 +-
 l10n/id_ID/core.po                  |  32 ++--
 l10n/id_ID/files.po                 |  35 ++--
 l10n/id_ID/files_sharing.po         |  12 +-
 l10n/id_ID/settings.po              |   4 +-
 l10n/it/core.po                     |  32 ++--
 l10n/it/files.po                    |  35 ++--
 l10n/it/files_sharing.po            |  14 +-
 l10n/it/settings.po                 |   4 +-
 l10n/ja_JP/core.po                  |  32 ++--
 l10n/ja_JP/files.po                 |  35 ++--
 l10n/ja_JP/files_sharing.po         |  14 +-
 l10n/ja_JP/settings.po              |   4 +-
 l10n/ko/core.po                     |  32 ++--
 l10n/ko/files.po                    |  37 ++--
 l10n/ko/files_sharing.po            |  12 +-
 l10n/ko/settings.po                 |   4 +-
 l10n/lb/core.po                     |  32 ++--
 l10n/lb/files.po                    |  35 ++--
 l10n/lb/files_sharing.po            |  12 +-
 l10n/lb/settings.po                 |   4 +-
 l10n/lt_LT/core.po                  |  32 ++--
 l10n/lt_LT/files.po                 |  37 ++--
 l10n/lt_LT/files_sharing.po         |  12 +-
 l10n/lt_LT/settings.po              |   4 +-
 l10n/lv/core.po                     |  32 ++--
 l10n/lv/files.po                    |  79 ++++----
 l10n/lv/files_sharing.po            |  12 +-
 l10n/lv/settings.po                 |   4 +-
 l10n/mk/core.po                     |  32 ++--
 l10n/mk/files.po                    |  35 ++--
 l10n/mk/files_sharing.po            |  12 +-
 l10n/mk/settings.po                 |   4 +-
 l10n/ms_MY/core.po                  |  32 ++--
 l10n/ms_MY/files.po                 |  35 ++--
 l10n/ms_MY/files_sharing.po         |  12 +-
 l10n/ms_MY/settings.po              |   4 +-
 l10n/nb_NO/core.po                  |  32 ++--
 l10n/nb_NO/files.po                 |  37 ++--
 l10n/nb_NO/files_sharing.po         |  12 +-
 l10n/nb_NO/settings.po              |   4 +-
 l10n/nl/core.po                     |  32 ++--
 l10n/nl/files.po                    |  37 ++--
 l10n/nl/files_sharing.po            |  12 +-
 l10n/nl/settings.po                 |   4 +-
 l10n/nn_NO/core.po                  |  32 ++--
 l10n/nn_NO/files.po                 |  35 ++--
 l10n/nn_NO/files_sharing.po         |  12 +-
 l10n/nn_NO/settings.po              |   4 +-
 l10n/pl/core.po                     |  32 ++--
 l10n/pl/files.po                    |  35 ++--
 l10n/pl/files_sharing.po            |  19 +-
 l10n/pl/settings.po                 |   4 +-
 l10n/pl/user_ldap.po                |   9 +-
 l10n/pl_PL/core.po                  | 272 +++++++++++++++++++++++++++
 l10n/pl_PL/files.po                 | 223 ++++++++++++++++++++++
 l10n/pl_PL/files_encryption.po      |  34 ++++
 l10n/pl_PL/files_external.po        |  82 +++++++++
 l10n/pl_PL/files_sharing.po         |  38 ++++
 l10n/pl_PL/files_versions.po        |  26 +++
 l10n/pl_PL/lib.po                   | 112 ++++++++++++
 l10n/pl_PL/settings.po              | 274 ++++++++++++++++++++++++++++
 l10n/pl_PL/user_ldap.po             | 170 +++++++++++++++++
 l10n/pt_BR/core.po                  |  32 ++--
 l10n/pt_BR/files.po                 |  37 ++--
 l10n/pt_BR/files_sharing.po         |  12 +-
 l10n/pt_BR/settings.po              |   4 +-
 l10n/pt_PT/core.po                  |  32 ++--
 l10n/pt_PT/files.po                 |  37 ++--
 l10n/pt_PT/files_sharing.po         |  12 +-
 l10n/pt_PT/settings.po              |   4 +-
 l10n/ro/core.po                     |  32 ++--
 l10n/ro/files.po                    |  35 ++--
 l10n/ro/files_sharing.po            |  12 +-
 l10n/ro/settings.po                 |  35 ++--
 l10n/ro/user_ldap.po                |   9 +-
 l10n/ru/core.po                     |  32 ++--
 l10n/ru/files.po                    |  37 ++--
 l10n/ru/files_sharing.po            |  15 +-
 l10n/ru/settings.po                 |   4 +-
 l10n/ru_RU/core.po                  |  32 ++--
 l10n/ru_RU/files.po                 |  37 ++--
 l10n/ru_RU/files_sharing.po         |  12 +-
 l10n/ru_RU/settings.po              |   4 +-
 l10n/sk_SK/core.po                  |  32 ++--
 l10n/sk_SK/files.po                 |  35 ++--
 l10n/sk_SK/files_sharing.po         |  12 +-
 l10n/sk_SK/settings.po              |   4 +-
 l10n/sl/core.po                     |  32 ++--
 l10n/sl/files.po                    |  35 ++--
 l10n/sl/files_sharing.po            |  14 +-
 l10n/sl/settings.po                 |   4 +-
 l10n/so/core.po                     |  32 ++--
 l10n/so/files.po                    |  35 ++--
 l10n/so/files_sharing.po            |  12 +-
 l10n/so/settings.po                 |   4 +-
 l10n/sr/core.po                     |  32 ++--
 l10n/sr/files.po                    |  35 ++--
 l10n/sr/files_sharing.po            |  12 +-
 l10n/sr/settings.po                 |   4 +-
 l10n/sr@latin/core.po               |  32 ++--
 l10n/sr@latin/files.po              |  35 ++--
 l10n/sr@latin/files_sharing.po      |  12 +-
 l10n/sr@latin/settings.po           |   4 +-
 l10n/sv/core.po                     |  32 ++--
 l10n/sv/files.po                    |  37 ++--
 l10n/sv/files_sharing.po            |  14 +-
 l10n/sv/settings.po                 |   4 +-
 l10n/templates/core.pot             |  30 +--
 l10n/templates/files.pot            |  33 ++--
 l10n/templates/files_encryption.pot |   2 +-
 l10n/templates/files_external.pot   |   2 +-
 l10n/templates/files_sharing.pot    |  10 +-
 l10n/templates/files_versions.pot   |   2 +-
 l10n/templates/lib.pot              |   2 +-
 l10n/templates/settings.pot         |   2 +-
 l10n/templates/user_ldap.pot        |   2 +-
 l10n/th_TH/core.po                  |  32 ++--
 l10n/th_TH/files.po                 |  35 ++--
 l10n/th_TH/files_sharing.po         |  14 +-
 l10n/th_TH/settings.po              |   4 +-
 l10n/tr/core.po                     |  32 ++--
 l10n/tr/files.po                    |  35 ++--
 l10n/tr/files_sharing.po            |  12 +-
 l10n/tr/settings.po                 |   4 +-
 l10n/uk/core.po                     |  32 ++--
 l10n/uk/files.po                    |  35 ++--
 l10n/uk/files_sharing.po            |  12 +-
 l10n/uk/settings.po                 |   4 +-
 l10n/vi/core.po                     |  32 ++--
 l10n/vi/files.po                    |  35 ++--
 l10n/vi/files_sharing.po            |  12 +-
 l10n/vi/settings.po                 |   4 +-
 l10n/zh_CN.GB2312/core.po           |  32 ++--
 l10n/zh_CN.GB2312/files.po          |  35 ++--
 l10n/zh_CN.GB2312/files_sharing.po  |  12 +-
 l10n/zh_CN.GB2312/settings.po       |   4 +-
 l10n/zh_CN/core.po                  |  32 ++--
 l10n/zh_CN/files.po                 |  37 ++--
 l10n/zh_CN/files_sharing.po         |  12 +-
 l10n/zh_CN/settings.po              |   4 +-
 l10n/zh_TW/core.po                  |  32 ++--
 l10n/zh_TW/files.po                 |  35 ++--
 l10n/zh_TW/files_sharing.po         |  12 +-
 l10n/zh_TW/settings.po              |   4 +-
 settings/l10n/de.php                |  10 +-
 settings/l10n/ro.php                |  15 ++
 277 files changed, 4161 insertions(+), 2334 deletions(-)
 create mode 100644 l10n/pl_PL/core.po
 create mode 100644 l10n/pl_PL/files.po
 create mode 100644 l10n/pl_PL/files_encryption.po
 create mode 100644 l10n/pl_PL/files_external.po
 create mode 100644 l10n/pl_PL/files_sharing.po
 create mode 100644 l10n/pl_PL/files_versions.po
 create mode 100644 l10n/pl_PL/lib.po
 create mode 100644 l10n/pl_PL/settings.po
 create mode 100644 l10n/pl_PL/user_ldap.po

diff --git a/apps/files/l10n/de.php b/apps/files/l10n/de.php
index 5da3a99721..aad89a6d4d 100644
--- a/apps/files/l10n/de.php
+++ b/apps/files/l10n/de.php
@@ -1,7 +1,7 @@
 <?php $TRANSLATIONS = array(
 "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 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.",
@@ -20,7 +20,7 @@
 "Upload Error" => "Fehler beim Hochladen",
 "Pending" => "Ausstehend",
 "Upload cancelled." => "Hochladen abgebrochen.",
-"Invalid name, '/' is not allowed." => "Ungültiger Name, \"/\" ist nicht erlaubt.",
+"Invalid name, '/' is not allowed." => "Ungültiger Name: \"/\" ist nicht erlaubt.",
 "Size" => "Größe",
 "Modified" => "Bearbeitet",
 "folder" => "Ordner",
@@ -30,10 +30,10 @@
 "File handling" => "Dateibehandlung",
 "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:",
+"Needed for multi-file and folder downloads." => "Für Mehrfachdatei- 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",
+"Maximum input size for ZIP files" => "Maximale Größe für ZIP-Dateien",
 "New" => "Neu",
 "Text file" => "Textdatei",
 "Folder" => "Ordner",
diff --git a/apps/files/l10n/fr.php b/apps/files/l10n/fr.php
index 6eb4341bd6..6cedfe2f91 100644
--- a/apps/files/l10n/fr.php
+++ b/apps/files/l10n/fr.php
@@ -15,11 +15,11 @@
 "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",
+"generating ZIP-file, it may take some time." => "Fichier ZIP en cours d'assemblage ;  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é",
+"Upload cancelled." => "Chargement annulé.",
 "Invalid name, '/' is not allowed." => "Nom invalide, '/' n'est pas autorisé.",
 "Size" => "Taille",
 "Modified" => "Modifié",
@@ -39,13 +39,13 @@
 "Folder" => "Dossier",
 "From url" => "Depuis URL",
 "Upload" => "Envoyer",
-"Cancel upload" => "Annuler envoi",
+"Cancel upload" => "Annuler l'envoi",
 "Nothing in here. Upload something!" => "Il n'y a rien ici ! Envoyez donc quelque chose :)",
 "Name" => "Nom",
 "Share" => "Partager",
 "Download" => "Téléchargement",
 "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.",
+"Files are being scanned, please wait." => "Les fichiers sont en cours d'analyse, veuillez patienter.",
 "Current scanning" => "Analyse en cours"
 );
diff --git a/apps/files/l10n/lv.php b/apps/files/l10n/lv.php
index 54bd79f552..2ce800a065 100644
--- a/apps/files/l10n/lv.php
+++ b/apps/files/l10n/lv.php
@@ -1,6 +1,17 @@
 <?php $TRANSLATIONS = array(
+"No file was uploaded" => "Neviens fails netika augšuplādēts",
+"Failed to write to disk" => "Nav iespējams saglabāt",
 "Files" => "Faili",
 "Delete" => "Izdzēst",
+"already exists" => "tāds fails jau eksistē",
+"replace" => "aizvietot",
+"cancel" => "atcelt",
+"replaced" => "aizvietots",
+"with" => "ar",
+"undo" => "vienu soli atpakaļ",
+"deleted" => "izdzests",
+"generating ZIP-file, it may take some time." => "lai uzģenerētu ZIP failu, kāds brīdis ir jāpagaida",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Nav iespējams augšuplādēt jūsu failu, jo tāds jau eksistē vai arī failam nav izmēra (0 baiti)",
 "Upload Error" => "Augšuplādēšanas laikā radās kļūda",
 "Pending" => "Gaida savu kārtu",
 "Upload cancelled." => "Augšuplāde ir atcelta",
@@ -12,9 +23,20 @@
 "file" => "fails",
 "files" => "faili",
 "Maximum upload size" => "Maksimālais failu augšuplādes apjoms",
+"max. possible: " => "maksīmālais iespējamais:",
+"Enable ZIP-download" => "Iespējot ZIP lejuplādi",
+"0 is unlimited" => "0 ir neierobežots",
+"New" => "Jauns",
+"Text file" => "Teksta fails",
+"Folder" => "Mape",
+"From url" => "No URL saites",
 "Upload" => "Augšuplādet",
+"Cancel upload" => "Atcelt augšuplādi",
 "Nothing in here. Upload something!" => "Te vēl nekas nav. Rīkojies, sāc augšuplādēt",
 "Name" => "Nosaukums",
+"Share" => "Līdzdalīt",
 "Download" => "Lejuplādēt",
-"Upload too large" => "Fails ir par lielu lai to augšuplādetu"
+"Upload too large" => "Fails ir par lielu lai to augšuplādetu",
+"Files are being scanned, please wait." => "Faili šobrīd tiek caurskatīti, nedaudz jāpagaida.",
+"Current scanning" => "Šobrīd tiek pārbaudīti"
 );
diff --git a/apps/files_external/l10n/es.php b/apps/files_external/l10n/es.php
index c1c605735f..004c352c19 100644
--- a/apps/files_external/l10n/es.php
+++ b/apps/files_external/l10n/es.php
@@ -1,5 +1,6 @@
 <?php $TRANSLATIONS = array(
 "External Storage" => "Almacenamiento externo",
+"Mount point" => "Punto de montaje",
 "Backend" => "Motor",
 "Configuration" => "Configuración",
 "Options" => "Opciones",
@@ -9,5 +10,9 @@
 "All Users" => "Todos los usuarios",
 "Groups" => "Grupos",
 "Users" => "Usuarios",
-"Delete" => "Eliiminar"
+"Delete" => "Eliiminar",
+"SSL root certificates" => "Raíz de certificados SSL  ",
+"Import Root Certificate" => "Importar certificado raíz",
+"Enable User External Storage" => "Habilitar almacenamiento de usuario externo",
+"Allow users to mount their own external storage" => "Permitir a los usuarios montar su propio almacenamiento externo"
 );
diff --git a/apps/files_external/l10n/eu.php b/apps/files_external/l10n/eu.php
index a594cdff1f..d1028d2b9b 100644
--- a/apps/files_external/l10n/eu.php
+++ b/apps/files_external/l10n/eu.php
@@ -1,6 +1,7 @@
 <?php $TRANSLATIONS = array(
 "External Storage" => "Kanpoko Biltegiratzea",
 "Mount point" => "Montatze puntua",
+"Backend" => "Motorra",
 "Configuration" => "Konfigurazioa",
 "Options" => "Aukerak",
 "Add mount point" => "Gehitu muntatze puntua",
diff --git a/apps/files_sharing/l10n/ca.php b/apps/files_sharing/l10n/ca.php
index 5409762d60..b8a1110fe0 100644
--- a/apps/files_sharing/l10n/ca.php
+++ b/apps/files_sharing/l10n/ca.php
@@ -1,4 +1,6 @@
 <?php $TRANSLATIONS = array(
 "Password" => "Contrasenya",
-"Submit" => "Envia"
+"Submit" => "Envia",
+"Download" => "Baixa",
+"web services under your control" => "controleu els vostres serveis web"
 );
diff --git a/apps/files_sharing/l10n/de.php b/apps/files_sharing/l10n/de.php
index 0c38f957fc..bfb0d076a3 100644
--- a/apps/files_sharing/l10n/de.php
+++ b/apps/files_sharing/l10n/de.php
@@ -1,4 +1,6 @@
 <?php $TRANSLATIONS = array(
 "Password" => "Passwort",
-"Submit" => "Absenden"
+"Submit" => "Absenden",
+"Download" => "Download",
+"web services under your control" => "Web-Services unter Ihrer Kontrolle"
 );
diff --git a/apps/files_sharing/l10n/es.php b/apps/files_sharing/l10n/es.php
index 85f880927d..0bc085c4d3 100644
--- a/apps/files_sharing/l10n/es.php
+++ b/apps/files_sharing/l10n/es.php
@@ -1,6 +1,6 @@
 <?php $TRANSLATIONS = array(
-"Size" => "Tamaño",
-"Modified" => "Modificado",
-"Delete all" => "Eliminar todo",
-"Delete" => "Eliminar"
+"Password" => "Contraseña",
+"Submit" => "Enviar",
+"Download" => "Descargar",
+"web services under your control" => "Servicios web bajo su control"
 );
diff --git a/apps/files_sharing/l10n/eu.php b/apps/files_sharing/l10n/eu.php
index 916c3151dc..a1f810826c 100644
--- a/apps/files_sharing/l10n/eu.php
+++ b/apps/files_sharing/l10n/eu.php
@@ -1,6 +1,6 @@
 <?php $TRANSLATIONS = array(
-"Size" => "Tamaina",
-"Modified" => "Aldatuta",
-"Delete all" => "Ezabatu dena",
-"Delete" => "Ezabatu"
+"Password" => "Pasahitza",
+"Submit" => "Bidali",
+"Download" => "Deskargatu",
+"web services under your control" => "web zerbitzuak zure kontrolpean"
 );
diff --git a/apps/files_sharing/l10n/fi_FI.php b/apps/files_sharing/l10n/fi_FI.php
index ca7928aeec..ce2c5932d4 100644
--- a/apps/files_sharing/l10n/fi_FI.php
+++ b/apps/files_sharing/l10n/fi_FI.php
@@ -1,6 +1,6 @@
 <?php $TRANSLATIONS = array(
-"Size" => "Koko",
-"Modified" => "Muokattu",
-"Delete all" => "Poista kaikki",
-"Delete" => "Poista"
+"Password" => "Salasana",
+"Submit" => "Lähetä",
+"Download" => "Lataa",
+"web services under your control" => "verkkopalvelut hallinnassasi"
 );
diff --git a/apps/files_sharing/l10n/fr.php b/apps/files_sharing/l10n/fr.php
index 31256d54a4..91a6e3e92c 100644
--- a/apps/files_sharing/l10n/fr.php
+++ b/apps/files_sharing/l10n/fr.php
@@ -1,4 +1,6 @@
 <?php $TRANSLATIONS = array(
 "Password" => "Mot de passe",
-"Submit" => "Envoyer"
+"Submit" => "Envoyer",
+"Download" => "Télécharger",
+"web services under your control" => "services web sous votre contrôle"
 );
diff --git a/apps/files_sharing/l10n/it.php b/apps/files_sharing/l10n/it.php
index 476221846a..de06afc269 100644
--- a/apps/files_sharing/l10n/it.php
+++ b/apps/files_sharing/l10n/it.php
@@ -1,4 +1,6 @@
 <?php $TRANSLATIONS = array(
 "Password" => "Password",
-"Submit" => "Invia"
+"Submit" => "Invia",
+"Download" => "Scarica",
+"web services under your control" => "servizi web nelle tue mani"
 );
diff --git a/apps/files_sharing/l10n/ja_JP.php b/apps/files_sharing/l10n/ja_JP.php
index 3bbfd69285..2ac295bdd3 100644
--- a/apps/files_sharing/l10n/ja_JP.php
+++ b/apps/files_sharing/l10n/ja_JP.php
@@ -1,4 +1,6 @@
 <?php $TRANSLATIONS = array(
 "Password" => "パスワード",
-"Submit" => "送信"
+"Submit" => "送信",
+"Download" => "ダウンロード",
+"web services under your control" => "管理下のウェブサービス"
 );
diff --git a/apps/files_sharing/l10n/pl.php b/apps/files_sharing/l10n/pl.php
index 7f612126b9..5810cc6d79 100644
--- a/apps/files_sharing/l10n/pl.php
+++ b/apps/files_sharing/l10n/pl.php
@@ -1,6 +1,6 @@
 <?php $TRANSLATIONS = array(
-"Size" => "Rozmiar",
-"Modified" => "Zmodyfikowane",
-"Delete all" => "Usuń wszystko",
-"Delete" => "Usuń"
+"Password" => "Hasło",
+"Submit" => "Wyślij",
+"Download" => "Pobierz",
+"web services under your control" => "Kontrolowane serwisy"
 );
diff --git a/apps/files_sharing/l10n/ru.php b/apps/files_sharing/l10n/ru.php
index 05ca8c3e49..958ac1030d 100644
--- a/apps/files_sharing/l10n/ru.php
+++ b/apps/files_sharing/l10n/ru.php
@@ -1,4 +1,6 @@
 <?php $TRANSLATIONS = array(
 "Password" => "Пароль",
-"Submit" => "Отправить"
+"Submit" => "Отправить",
+"Download" => "Скачать",
+"web services under your control" => "веб-сервисы под вашим управлением"
 );
diff --git a/apps/files_sharing/l10n/sl.php b/apps/files_sharing/l10n/sl.php
index ea8ffaa28d..9ff8b079d7 100644
--- a/apps/files_sharing/l10n/sl.php
+++ b/apps/files_sharing/l10n/sl.php
@@ -1,4 +1,6 @@
 <?php $TRANSLATIONS = array(
 "Password" => "Geslo",
-"Submit" => "Pošlji"
+"Submit" => "Pošlji",
+"Download" => "Prenesi",
+"web services under your control" => "spletne storitve pod vašim nadzorom"
 );
diff --git a/apps/files_sharing/l10n/sv.php b/apps/files_sharing/l10n/sv.php
index f8cd6b3a36..7a580c36a5 100644
--- a/apps/files_sharing/l10n/sv.php
+++ b/apps/files_sharing/l10n/sv.php
@@ -1,4 +1,6 @@
 <?php $TRANSLATIONS = array(
 "Password" => "Lösenord",
-"Submit" => "Skicka"
+"Submit" => "Skicka",
+"Download" => "Ladda ner",
+"web services under your control" => "webbtjänster under din kontroll"
 );
diff --git a/apps/files_sharing/l10n/th_TH.php b/apps/files_sharing/l10n/th_TH.php
index d2567aea51..41fa4aeddb 100644
--- a/apps/files_sharing/l10n/th_TH.php
+++ b/apps/files_sharing/l10n/th_TH.php
@@ -1,4 +1,6 @@
 <?php $TRANSLATIONS = array(
 "Password" => "รหัสผ่าน",
-"Submit" => "ส่ง"
+"Submit" => "ส่ง",
+"Download" => "ดาวน์โหลด",
+"web services under your control" => "เว็บเซอร์วิสที่คุณควบคุมการใช้งานได้"
 );
diff --git a/apps/user_ldap/l10n/eu.php b/apps/user_ldap/l10n/eu.php
index cc042b1389..35dacef3f2 100644
--- a/apps/user_ldap/l10n/eu.php
+++ b/apps/user_ldap/l10n/eu.php
@@ -32,5 +32,6 @@
 "The LDAP attribute to use to generate the groups`s ownCloud name." => "ownCloud taldearen izena sortzeko erabiliko den LDAP atributua",
 "in bytes" => "bytetan",
 "in seconds. A change empties the cache." => "segundutan. Aldaketak katxea husten du.",
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Utzi hutsik erabiltzaile izenarako (lehentsia). Bestela zehaztu LDAP/AD atributua.",
 "Help" => "Laguntza"
 );
diff --git a/apps/user_ldap/l10n/pl.php b/apps/user_ldap/l10n/pl.php
index fa7618d68d..7ebebe1e07 100644
--- a/apps/user_ldap/l10n/pl.php
+++ b/apps/user_ldap/l10n/pl.php
@@ -32,5 +32,6 @@
 "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ą.",
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Pozostaw puste dla user name (domyślnie). W przeciwnym razie podaj atrybut LDAP/AD.",
 "Help" => "Pomoc"
 );
diff --git a/apps/user_ldap/l10n/ro.php b/apps/user_ldap/l10n/ro.php
index 326e47f96f..beeed85745 100644
--- a/apps/user_ldap/l10n/ro.php
+++ b/apps/user_ldap/l10n/ro.php
@@ -32,5 +32,6 @@
 "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.",
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Lăsați gol pentru numele de utilizator (implicit). În caz contrar, specificați un atribut LDAP / AD.",
 "Help" => "Ajutor"
 );
diff --git a/core/l10n/de.php b/core/l10n/de.php
index 9ed2d61782..81f4b0082c 100644
--- a/core/l10n/de.php
+++ b/core/l10n/de.php
@@ -20,7 +20,7 @@
 "No" => "Nein",
 "Yes" => "Ja",
 "Ok" => "OK",
-"No categories selected for deletion." => "Keine Kategorien zum Löschen angegeben.",
+"No categories selected for deletion." => "Es wurde keine Kategorien zum Löschen ausgewählt.",
 "Error" => "Fehler",
 "ownCloud password reset" => "ownCloud-Passwort zurücksetzen",
 "Use the following link to reset your password: {link}" => "Nutzen Sie den nachfolgenden Link, um Ihr Passwort zurückzusetzen: {link}",
diff --git a/core/l10n/fr.php b/core/l10n/fr.php
index 43917917ad..095a202473 100644
--- a/core/l10n/fr.php
+++ b/core/l10n/fr.php
@@ -4,19 +4,19 @@
 "This category already exists: " => "Cette catégorie existe déjà : ",
 "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é",
+"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" => "Annuler",
 "No" => "Non",
 "Yes" => "Oui",
 "Ok" => "Ok",
@@ -24,7 +24,7 @@
 "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",
+"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.",
 "Requested" => "Demande envoyée",
 "Login failed!" => "Nom d'utilisateur ou e-mail invalide",
 "Username" => "Nom d'utilisateur",
diff --git a/l10n/af/core.po b/l10n/af/core.po
index ccd5e08975..ea01e99a96 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-08-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:02+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -33,55 +33,55 @@ msgstr ""
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr ""
 
-#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:206 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "January"
 msgstr ""
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "February"
 msgstr ""
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "March"
 msgstr ""
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "April"
 msgstr ""
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "May"
 msgstr ""
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "June"
 msgstr ""
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "July"
 msgstr ""
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "August"
 msgstr ""
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "September"
 msgstr ""
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "October"
 msgstr ""
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "November"
 msgstr ""
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "December"
 msgstr ""
 
@@ -243,7 +243,7 @@ msgstr ""
 msgid "web services under your control"
 msgstr ""
 
-#: templates/layout.user.php:49
+#: templates/layout.user.php:45
 msgid "Log out"
 msgstr ""
 
diff --git a/l10n/af/files.po b/l10n/af/files.po
index b683bb7b55..8e51d3bfb6 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-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -51,7 +51,7 @@ msgstr ""
 msgid "Files"
 msgstr ""
 
-#: js/fileactions.js:107 templates/index.php:56
+#: js/fileactions.js:106 templates/index.php:56
 msgid "Delete"
 msgstr ""
 
@@ -83,51 +83,56 @@ msgstr ""
 msgid "deleted"
 msgstr ""
 
-#: js/files.js:171
+#: js/files.js:179
 msgid "generating ZIP-file, it may take some time."
 msgstr ""
 
-#: js/files.js:200
+#: js/files.js:208
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:200
+#: js/files.js:208
 msgid "Upload Error"
 msgstr ""
 
-#: js/files.js:228 js/files.js:319 js/files.js:348
+#: js/files.js:236 js/files.js:327 js/files.js:356
 msgid "Pending"
 msgstr ""
 
-#: js/files.js:333
+#: js/files.js:341
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:457
+#: js/files.js:409
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr ""
+
+#: js/files.js:480
 msgid "Invalid name, '/' is not allowed."
 msgstr ""
 
-#: js/files.js:703 templates/index.php:55
+#: js/files.js:726 templates/index.php:55
 msgid "Size"
 msgstr ""
 
-#: js/files.js:704 templates/index.php:56
+#: js/files.js:727 templates/index.php:56
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:731
+#: js/files.js:754
 msgid "folder"
 msgstr ""
 
-#: js/files.js:733
+#: js/files.js:756
 msgid "folders"
 msgstr ""
 
-#: js/files.js:741
+#: js/files.js:764
 msgid "file"
 msgstr ""
 
-#: js/files.js:743
+#: js/files.js:766
 msgid "files"
 msgstr ""
 
diff --git a/l10n/af/files_sharing.po b/l10n/af/files_sharing.po
index d4cd168bfa..4e3ab5ee47 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-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:03+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -25,10 +25,14 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
-#: templates/public.php:9
+#: templates/public.php:9 templates/public.php:19
 msgid "Download"
 msgstr ""
 
-#: templates/public.php:17
+#: templates/public.php:18
+msgid "No preview available for"
+msgstr ""
+
+#: templates/public.php:23
 msgid "web services under your control"
 msgstr ""
diff --git a/l10n/af/settings.po b/l10n/af/settings.po
index 6d0d9b557f..11af545b8c 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-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:03+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
diff --git a/l10n/ar/core.po b/l10n/ar/core.po
index 49b9295673..090905898d 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-08-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:02+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -34,55 +34,55 @@ msgstr ""
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr ""
 
-#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:206 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr "تعديلات"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "January"
 msgstr ""
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "February"
 msgstr ""
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "March"
 msgstr ""
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "April"
 msgstr ""
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "May"
 msgstr ""
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "June"
 msgstr ""
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "July"
 msgstr ""
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "August"
 msgstr ""
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "September"
 msgstr ""
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "October"
 msgstr ""
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "November"
 msgstr ""
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "December"
 msgstr ""
 
@@ -244,7 +244,7 @@ msgstr "انهاء التعديلات"
 msgid "web services under your control"
 msgstr "خدمات الوب تحت تصرفك"
 
-#: templates/layout.user.php:49
+#: templates/layout.user.php:45
 msgid "Log out"
 msgstr "الخروج"
 
diff --git a/l10n/ar/files.po b/l10n/ar/files.po
index 36056ab59e..5c481bb7b5 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-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -52,7 +52,7 @@ msgstr ""
 msgid "Files"
 msgstr "الملفات"
 
-#: js/fileactions.js:107 templates/index.php:56
+#: js/fileactions.js:106 templates/index.php:56
 msgid "Delete"
 msgstr "محذوف"
 
@@ -84,51 +84,56 @@ msgstr ""
 msgid "deleted"
 msgstr ""
 
-#: js/files.js:171
+#: js/files.js:179
 msgid "generating ZIP-file, it may take some time."
 msgstr ""
 
-#: js/files.js:200
+#: js/files.js:208
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:200
+#: js/files.js:208
 msgid "Upload Error"
 msgstr ""
 
-#: js/files.js:228 js/files.js:319 js/files.js:348
+#: js/files.js:236 js/files.js:327 js/files.js:356
 msgid "Pending"
 msgstr ""
 
-#: js/files.js:333
+#: js/files.js:341
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:457
+#: js/files.js:409
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr ""
+
+#: js/files.js:480
 msgid "Invalid name, '/' is not allowed."
 msgstr ""
 
-#: js/files.js:703 templates/index.php:55
+#: js/files.js:726 templates/index.php:55
 msgid "Size"
 msgstr "حجم"
 
-#: js/files.js:704 templates/index.php:56
+#: js/files.js:727 templates/index.php:56
 msgid "Modified"
 msgstr "معدل"
 
-#: js/files.js:731
+#: js/files.js:754
 msgid "folder"
 msgstr ""
 
-#: js/files.js:733
+#: js/files.js:756
 msgid "folders"
 msgstr ""
 
-#: js/files.js:741
+#: js/files.js:764
 msgid "file"
 msgstr ""
 
-#: js/files.js:743
+#: js/files.js:766
 msgid "files"
 msgstr ""
 
diff --git a/l10n/ar/files_sharing.po b/l10n/ar/files_sharing.po
index 26243d6704..6aeb9ddf0e 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-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:03+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -25,10 +25,14 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
-#: templates/public.php:9
+#: templates/public.php:9 templates/public.php:19
 msgid "Download"
 msgstr ""
 
-#: templates/public.php:17
+#: templates/public.php:18
+msgid "No preview available for"
+msgstr ""
+
+#: templates/public.php:23
 msgid "web services under your control"
 msgstr ""
diff --git a/l10n/ar/settings.po b/l10n/ar/settings.po
index 2eb8acb179..c1af2bbd91 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-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:03+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
diff --git a/l10n/ar_SA/core.po b/l10n/ar_SA/core.po
index 0c523d9c89..c5b0902e92 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-08-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:02+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -33,55 +33,55 @@ msgstr ""
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr ""
 
-#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:206 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "January"
 msgstr ""
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "February"
 msgstr ""
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "March"
 msgstr ""
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "April"
 msgstr ""
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "May"
 msgstr ""
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "June"
 msgstr ""
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "July"
 msgstr ""
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "August"
 msgstr ""
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "September"
 msgstr ""
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "October"
 msgstr ""
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "November"
 msgstr ""
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "December"
 msgstr ""
 
@@ -243,7 +243,7 @@ msgstr ""
 msgid "web services under your control"
 msgstr ""
 
-#: templates/layout.user.php:49
+#: templates/layout.user.php:45
 msgid "Log out"
 msgstr ""
 
diff --git a/l10n/ar_SA/files.po b/l10n/ar_SA/files.po
index 1e89550f0e..70a8de06f9 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-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -51,7 +51,7 @@ msgstr ""
 msgid "Files"
 msgstr ""
 
-#: js/fileactions.js:107 templates/index.php:56
+#: js/fileactions.js:106 templates/index.php:56
 msgid "Delete"
 msgstr ""
 
@@ -83,51 +83,56 @@ msgstr ""
 msgid "deleted"
 msgstr ""
 
-#: js/files.js:171
+#: js/files.js:179
 msgid "generating ZIP-file, it may take some time."
 msgstr ""
 
-#: js/files.js:200
+#: js/files.js:208
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:200
+#: js/files.js:208
 msgid "Upload Error"
 msgstr ""
 
-#: js/files.js:228 js/files.js:319 js/files.js:348
+#: js/files.js:236 js/files.js:327 js/files.js:356
 msgid "Pending"
 msgstr ""
 
-#: js/files.js:333
+#: js/files.js:341
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:457
+#: js/files.js:409
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr ""
+
+#: js/files.js:480
 msgid "Invalid name, '/' is not allowed."
 msgstr ""
 
-#: js/files.js:703 templates/index.php:55
+#: js/files.js:726 templates/index.php:55
 msgid "Size"
 msgstr ""
 
-#: js/files.js:704 templates/index.php:56
+#: js/files.js:727 templates/index.php:56
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:731
+#: js/files.js:754
 msgid "folder"
 msgstr ""
 
-#: js/files.js:733
+#: js/files.js:756
 msgid "folders"
 msgstr ""
 
-#: js/files.js:741
+#: js/files.js:764
 msgid "file"
 msgstr ""
 
-#: js/files.js:743
+#: js/files.js:766
 msgid "files"
 msgstr ""
 
diff --git a/l10n/ar_SA/files_sharing.po b/l10n/ar_SA/files_sharing.po
index da6efbbe01..b0c8fb706a 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-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:03+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -25,10 +25,14 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
-#: templates/public.php:9
+#: templates/public.php:9 templates/public.php:19
 msgid "Download"
 msgstr ""
 
-#: templates/public.php:17
+#: templates/public.php:18
+msgid "No preview available for"
+msgstr ""
+
+#: templates/public.php:23
 msgid "web services under your control"
 msgstr ""
diff --git a/l10n/ar_SA/settings.po b/l10n/ar_SA/settings.po
index 4d65ee350a..cfa336caae 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-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:03+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
diff --git a/l10n/bg_BG/core.po b/l10n/bg_BG/core.po
index 0616f0e42c..f4673d7f74 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-08-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:02+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -37,55 +37,55 @@ msgstr "Категорията вече съществува:"
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr ""
 
-#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:206 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr "Настройки"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "January"
 msgstr "Януари"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "February"
 msgstr "Февруари"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "March"
 msgstr "Март"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "April"
 msgstr "Април"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "May"
 msgstr "Май"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "June"
 msgstr "Юни"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "July"
 msgstr "Юли"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "August"
 msgstr "Август"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "September"
 msgstr "Септември"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "October"
 msgstr "Октомври"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "November"
 msgstr "Ноември"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "December"
 msgstr "Декември"
 
@@ -247,7 +247,7 @@ msgstr "Завършване на настройките"
 msgid "web services under your control"
 msgstr ""
 
-#: templates/layout.user.php:49
+#: templates/layout.user.php:45
 msgid "Log out"
 msgstr "Изход"
 
diff --git a/l10n/bg_BG/files.po b/l10n/bg_BG/files.po
index d016c1a31f..98e68910a2 100644
--- a/l10n/bg_BG/files.po
+++ b/l10n/bg_BG/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-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -53,7 +53,7 @@ msgstr "Грешка при запис на диска"
 msgid "Files"
 msgstr "Файлове"
 
-#: js/fileactions.js:107 templates/index.php:56
+#: js/fileactions.js:106 templates/index.php:56
 msgid "Delete"
 msgstr "Изтриване"
 
@@ -85,51 +85,56 @@ msgstr ""
 msgid "deleted"
 msgstr ""
 
-#: js/files.js:171
+#: js/files.js:179
 msgid "generating ZIP-file, it may take some time."
 msgstr ""
 
-#: js/files.js:200
+#: js/files.js:208
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:200
+#: js/files.js:208
 msgid "Upload Error"
 msgstr "Грешка при качване"
 
-#: js/files.js:228 js/files.js:319 js/files.js:348
+#: js/files.js:236 js/files.js:327 js/files.js:356
 msgid "Pending"
 msgstr ""
 
-#: js/files.js:333
+#: js/files.js:341
 msgid "Upload cancelled."
 msgstr "Качването е отменено."
 
-#: js/files.js:457
+#: js/files.js:409
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr ""
+
+#: js/files.js:480
 msgid "Invalid name, '/' is not allowed."
 msgstr "Неправилно име – \"/\" не е позволено."
 
-#: js/files.js:703 templates/index.php:55
+#: js/files.js:726 templates/index.php:55
 msgid "Size"
 msgstr "Размер"
 
-#: js/files.js:704 templates/index.php:56
+#: js/files.js:727 templates/index.php:56
 msgid "Modified"
 msgstr "Променено"
 
-#: js/files.js:731
+#: js/files.js:754
 msgid "folder"
 msgstr "папка"
 
-#: js/files.js:733
+#: js/files.js:756
 msgid "folders"
 msgstr "папки"
 
-#: js/files.js:741
+#: js/files.js:764
 msgid "file"
 msgstr "файл"
 
-#: js/files.js:743
+#: js/files.js:766
 msgid "files"
 msgstr ""
 
diff --git a/l10n/bg_BG/files_sharing.po b/l10n/bg_BG/files_sharing.po
index 7a922d60dd..fa2d7899a7 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-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:03+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -25,10 +25,14 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
-#: templates/public.php:9
+#: templates/public.php:9 templates/public.php:19
 msgid "Download"
 msgstr ""
 
-#: templates/public.php:17
+#: templates/public.php:18
+msgid "No preview available for"
+msgstr ""
+
+#: templates/public.php:23
 msgid "web services under your control"
 msgstr ""
diff --git a/l10n/bg_BG/settings.po b/l10n/bg_BG/settings.po
index 3a29d8dc14..123996f9b8 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-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:03+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
diff --git a/l10n/ca/core.po b/l10n/ca/core.po
index 8f332e15f5..e3c5dd92d5 100644
--- a/l10n/ca/core.po
+++ b/l10n/ca/core.po
@@ -4,13 +4,13 @@
 # 
 # Translators:
 #   <joan@montane.cat>, 2012.
-#   <rcalvoi@yahoo.com>, 2011, 2012.
+#   <rcalvoi@yahoo.com>, 2011-2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:02+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -35,55 +35,55 @@ msgstr "Aquesta categoria ja existeix:"
 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:201 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:206 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr "Arranjament"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "January"
 msgstr "Gener"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "February"
 msgstr "Febrer"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "March"
 msgstr "Març"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "April"
 msgstr "Abril"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "May"
 msgstr "Maig"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "June"
 msgstr "Juny"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "July"
 msgstr "Juliol"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "August"
 msgstr "Agost"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "September"
 msgstr "Setembre"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "October"
 msgstr "Octubre"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "November"
 msgstr "Novembre"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "December"
 msgstr "Desembre"
 
@@ -245,7 +245,7 @@ msgstr "Acaba la configuració"
 msgid "web services under your control"
 msgstr "controleu els vostres serveis web"
 
-#: templates/layout.user.php:49
+#: templates/layout.user.php:45
 msgid "Log out"
 msgstr "Surt"
 
diff --git a/l10n/ca/files.po b/l10n/ca/files.po
index aa8f41dca0..6ccc8e9492 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-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -53,7 +53,7 @@ msgstr "Ha fallat en escriure al disc"
 msgid "Files"
 msgstr "Fitxers"
 
-#: js/fileactions.js:107 templates/index.php:56
+#: js/fileactions.js:106 templates/index.php:56
 msgid "Delete"
 msgstr "Suprimeix"
 
@@ -85,51 +85,56 @@ msgstr "desfés"
 msgid "deleted"
 msgstr "esborrat"
 
-#: js/files.js:171
+#: js/files.js:179
 msgid "generating ZIP-file, it may take some time."
 msgstr "s'estan generant fitxers ZIP, pot trigar una estona."
 
-#: js/files.js:200
+#: js/files.js:208
 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:200
+#: js/files.js:208
 msgid "Upload Error"
 msgstr "Error en la pujada"
 
-#: js/files.js:228 js/files.js:319 js/files.js:348
+#: js/files.js:236 js/files.js:327 js/files.js:356
 msgid "Pending"
 msgstr "Pendents"
 
-#: js/files.js:333
+#: js/files.js:341
 msgid "Upload cancelled."
 msgstr "La pujada s'ha cancel·lat."
 
-#: js/files.js:457
+#: js/files.js:409
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr ""
+
+#: js/files.js:480
 msgid "Invalid name, '/' is not allowed."
 msgstr "El nom no és vàlid, no es permet '/'."
 
-#: js/files.js:703 templates/index.php:55
+#: js/files.js:726 templates/index.php:55
 msgid "Size"
 msgstr "Mida"
 
-#: js/files.js:704 templates/index.php:56
+#: js/files.js:727 templates/index.php:56
 msgid "Modified"
 msgstr "Modificat"
 
-#: js/files.js:731
+#: js/files.js:754
 msgid "folder"
 msgstr "carpeta"
 
-#: js/files.js:733
+#: js/files.js:756
 msgid "folders"
 msgstr "carpetes"
 
-#: js/files.js:741
+#: js/files.js:764
 msgid "file"
 msgstr "fitxer"
 
-#: js/files.js:743
+#: js/files.js:766
 msgid "files"
 msgstr "fitxers"
 
diff --git a/l10n/ca/files_sharing.po b/l10n/ca/files_sharing.po
index fef4b1281e..1aa4ee0ad4 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-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:03+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -26,10 +26,14 @@ msgstr "Contrasenya"
 msgid "Submit"
 msgstr "Envia"
 
-#: templates/public.php:9
+#: templates/public.php:9 templates/public.php:19
 msgid "Download"
+msgstr "Baixa"
+
+#: templates/public.php:18
+msgid "No preview available for"
 msgstr ""
 
-#: templates/public.php:17
+#: templates/public.php:23
 msgid "web services under your control"
-msgstr ""
+msgstr "controleu els vostres serveis web"
diff --git a/l10n/ca/settings.po b/l10n/ca/settings.po
index eb85441ce0..5c73f9a9ca 100644
--- a/l10n/ca/settings.po
+++ b/l10n/ca/settings.po
@@ -4,13 +4,13 @@
 # 
 # Translators:
 #   <joan@montane.cat>, 2012.
-#   <rcalvoi@yahoo.com>, 2011, 2012.
+#   <rcalvoi@yahoo.com>, 2011-2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:03+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
diff --git a/l10n/cs_CZ/core.po b/l10n/cs_CZ/core.po
index d147edfd66..3db3e84583 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-08-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:02+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -36,55 +36,55 @@ msgstr "Tato kategorie již existuje:"
 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:201 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:206 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr "Nastavení"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "January"
 msgstr "Leden"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "February"
 msgstr "Únor"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "March"
 msgstr "Březen"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "April"
 msgstr "Duben"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "May"
 msgstr "Květen"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "June"
 msgstr "Červen"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "July"
 msgstr "Červenec"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "August"
 msgstr "Srpen"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "September"
 msgstr "Září"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "October"
 msgstr "Říjen"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "November"
 msgstr "Listopad"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "December"
 msgstr "Prosinec"
 
@@ -246,7 +246,7 @@ msgstr "Dokončit instalaci"
 msgid "web services under your control"
 msgstr "webové služby pod Vaší kontrolou"
 
-#: templates/layout.user.php:49
+#: templates/layout.user.php:45
 msgid "Log out"
 msgstr "Odhlásit se"
 
diff --git a/l10n/cs_CZ/files.po b/l10n/cs_CZ/files.po
index 77f16b10d6..0fbfcb882d 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-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -53,7 +53,7 @@ msgstr "Zápis na disk se nezdařil"
 msgid "Files"
 msgstr "Soubory"
 
-#: js/fileactions.js:107 templates/index.php:56
+#: js/fileactions.js:106 templates/index.php:56
 msgid "Delete"
 msgstr "Vymazat"
 
@@ -85,51 +85,56 @@ msgstr "zpět"
 msgid "deleted"
 msgstr "smazáno"
 
-#: js/files.js:171
+#: js/files.js:179
 msgid "generating ZIP-file, it may take some time."
 msgstr "generuji ZIP soubor, může to chvíli trvat"
 
-#: js/files.js:200
+#: js/files.js:208
 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:200
+#: js/files.js:208
 msgid "Upload Error"
 msgstr "Chyba při nahrávání"
 
-#: js/files.js:228 js/files.js:319 js/files.js:348
+#: js/files.js:236 js/files.js:327 js/files.js:356
 msgid "Pending"
 msgstr "Očekává se"
 
-#: js/files.js:333
+#: js/files.js:341
 msgid "Upload cancelled."
 msgstr "Nahrávání zrušeno"
 
-#: js/files.js:457
+#: js/files.js:409
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr ""
+
+#: js/files.js:480
 msgid "Invalid name, '/' is not allowed."
 msgstr "Špatné jméno, znak '/' není povolen"
 
-#: js/files.js:703 templates/index.php:55
+#: js/files.js:726 templates/index.php:55
 msgid "Size"
 msgstr "Velikost"
 
-#: js/files.js:704 templates/index.php:56
+#: js/files.js:727 templates/index.php:56
 msgid "Modified"
 msgstr "Změněno"
 
-#: js/files.js:731
+#: js/files.js:754
 msgid "folder"
 msgstr "adresář"
 
-#: js/files.js:733
+#: js/files.js:756
 msgid "folders"
 msgstr "adresáře"
 
-#: js/files.js:741
+#: js/files.js:764
 msgid "file"
 msgstr "soubor"
 
-#: js/files.js:743
+#: js/files.js:766
 msgid "files"
 msgstr "soubory"
 
diff --git a/l10n/cs_CZ/files_sharing.po b/l10n/cs_CZ/files_sharing.po
index a171c9c25e..1927da6f11 100644
--- a/l10n/cs_CZ/files_sharing.po
+++ b/l10n/cs_CZ/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-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:03+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -27,10 +27,14 @@ msgstr "Heslo"
 msgid "Submit"
 msgstr "Potvrdit"
 
-#: templates/public.php:9
+#: templates/public.php:9 templates/public.php:19
 msgid "Download"
 msgstr ""
 
-#: templates/public.php:17
+#: templates/public.php:18
+msgid "No preview available for"
+msgstr ""
+
+#: templates/public.php:23
 msgid "web services under your control"
 msgstr ""
diff --git a/l10n/cs_CZ/settings.po b/l10n/cs_CZ/settings.po
index 4bded3012f..aa8bbf08b2 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-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:03+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
diff --git a/l10n/da/core.po b/l10n/da/core.po
index 305bbc24a3..383cb162d3 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-08-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:02+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -38,55 +38,55 @@ msgstr "Denne kategori eksisterer allerede: "
 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:201 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:206 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr "Indstillinger"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "January"
 msgstr "Januar"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "February"
 msgstr "Februar"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "March"
 msgstr "Marts"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "April"
 msgstr "April"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "May"
 msgstr "Maj"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "June"
 msgstr "Juni"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "July"
 msgstr "Juli"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "August"
 msgstr "August"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "September"
 msgstr "September"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "October"
 msgstr "Oktober"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "November"
 msgstr "November"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "December"
 msgstr "December"
 
@@ -248,7 +248,7 @@ msgstr "Afslut opsætning"
 msgid "web services under your control"
 msgstr "Webtjenester under din kontrol"
 
-#: templates/layout.user.php:49
+#: templates/layout.user.php:45
 msgid "Log out"
 msgstr "Log ud"
 
diff --git a/l10n/da/files.po b/l10n/da/files.po
index 3524d6c05a..777667d6f5 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-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -55,7 +55,7 @@ msgstr "Fejl ved skrivning til disk."
 msgid "Files"
 msgstr "Filer"
 
-#: js/fileactions.js:107 templates/index.php:56
+#: js/fileactions.js:106 templates/index.php:56
 msgid "Delete"
 msgstr "Slet"
 
@@ -87,51 +87,56 @@ msgstr "fortryd"
 msgid "deleted"
 msgstr "Slettet"
 
-#: js/files.js:171
+#: js/files.js:179
 msgid "generating ZIP-file, it may take some time."
 msgstr "genererer ZIP-fil, det kan tage lidt tid."
 
-#: js/files.js:200
+#: js/files.js:208
 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:200
+#: js/files.js:208
 msgid "Upload Error"
 msgstr "Fejl ved upload"
 
-#: js/files.js:228 js/files.js:319 js/files.js:348
+#: js/files.js:236 js/files.js:327 js/files.js:356
 msgid "Pending"
 msgstr "Afventer"
 
-#: js/files.js:333
+#: js/files.js:341
 msgid "Upload cancelled."
 msgstr "Upload afbrudt."
 
-#: js/files.js:457
+#: js/files.js:409
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr ""
+
+#: js/files.js:480
 msgid "Invalid name, '/' is not allowed."
 msgstr "Ugyldigt navn, '/' er ikke tilladt."
 
-#: js/files.js:703 templates/index.php:55
+#: js/files.js:726 templates/index.php:55
 msgid "Size"
 msgstr "Størrelse"
 
-#: js/files.js:704 templates/index.php:56
+#: js/files.js:727 templates/index.php:56
 msgid "Modified"
 msgstr "Ændret"
 
-#: js/files.js:731
+#: js/files.js:754
 msgid "folder"
 msgstr "mappe"
 
-#: js/files.js:733
+#: js/files.js:756
 msgid "folders"
 msgstr "mapper"
 
-#: js/files.js:741
+#: js/files.js:764
 msgid "file"
 msgstr "fil"
 
-#: js/files.js:743
+#: js/files.js:766
 msgid "files"
 msgstr "filer"
 
diff --git a/l10n/da/files_sharing.po b/l10n/da/files_sharing.po
index 3da4460393..cae9bfa4d9 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-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:03+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -25,10 +25,14 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
-#: templates/public.php:9
+#: templates/public.php:9 templates/public.php:19
 msgid "Download"
 msgstr ""
 
-#: templates/public.php:17
+#: templates/public.php:18
+msgid "No preview available for"
+msgstr ""
+
+#: templates/public.php:23
 msgid "web services under your control"
 msgstr ""
diff --git a/l10n/da/settings.po b/l10n/da/settings.po
index 57da990566..d2f0b1630e 100644
--- a/l10n/da/settings.po
+++ b/l10n/da/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-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:03+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
diff --git a/l10n/de/core.po b/l10n/de/core.po
index 3d6111bb19..c9a09ce63a 100644
--- a/l10n/de/core.po
+++ b/l10n/de/core.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-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:02+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -44,55 +44,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:201 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:206 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "January"
 msgstr "Januar"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "February"
 msgstr "Februar"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "March"
 msgstr "März"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "April"
 msgstr "April"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "May"
 msgstr "Mai"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "June"
 msgstr "Juni"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "July"
 msgstr "Juli"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "August"
 msgstr "August"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "September"
 msgstr "September"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "October"
 msgstr "Oktober"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "November"
 msgstr "November"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "December"
 msgstr "Dezember"
 
@@ -114,7 +114,7 @@ msgstr "OK"
 
 #: js/oc-vcategories.js:68
 msgid "No categories selected for deletion."
-msgstr "Keine Kategorien zum Löschen angegeben."
+msgstr "Es wurde keine Kategorien zum Löschen ausgewählt."
 
 #: js/oc-vcategories.js:68
 msgid "Error"
@@ -254,7 +254,7 @@ msgstr "Installation abschließen"
 msgid "web services under your control"
 msgstr "Web-Services unter Ihrer Kontrolle"
 
-#: templates/layout.user.php:49
+#: templates/layout.user.php:45
 msgid "Log out"
 msgstr "Abmelden"
 
diff --git a/l10n/de/files.po b/l10n/de/files.po
index b7f13aa702..eb9ea98a4c 100644
--- a/l10n/de/files.po
+++ b/l10n/de/files.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-24 02:02+0200\n"
-"PO-Revision-Date: 2012-08-23 09:11+0000\n"
-"Last-Translator: traductor <transifex.3.mensaje@spamgourmet.com>\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -39,7 +39,7 @@ msgstr "Die Größe der hochzuladenden Datei überschreitet die upload_max_files
 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"
+msgstr "Die Größe der hochzuladenden Datei überschreitet die MAX_FILE_SIZE-Richtlinie, die im HTML-Formular angegeben wurde"
 
 #: ajax/upload.php:23
 msgid "The uploaded file was only partially uploaded"
@@ -61,7 +61,7 @@ msgstr "Fehler beim Schreiben auf die Festplatte"
 msgid "Files"
 msgstr "Dateien"
 
-#: js/fileactions.js:107 templates/index.php:56
+#: js/fileactions.js:106 templates/index.php:56
 msgid "Delete"
 msgstr "Löschen"
 
@@ -93,51 +93,56 @@ msgstr "rückgängig machen"
 msgid "deleted"
 msgstr "gelöscht"
 
-#: js/files.js:171
+#: js/files.js:179
 msgid "generating ZIP-file, it may take some time."
 msgstr "Erstelle ZIP-Datei. Dies kann eine Weile dauern."
 
-#: js/files.js:200
+#: js/files.js:208
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "Ihre Datei kann nicht hochgeladen werden, da sie ein Verzeichnis ist oder 0 Bytes hat."
 
-#: js/files.js:200
+#: js/files.js:208
 msgid "Upload Error"
 msgstr "Fehler beim Hochladen"
 
-#: js/files.js:228 js/files.js:319 js/files.js:348
+#: js/files.js:236 js/files.js:327 js/files.js:356
 msgid "Pending"
 msgstr "Ausstehend"
 
-#: js/files.js:333
+#: js/files.js:341
 msgid "Upload cancelled."
 msgstr "Hochladen abgebrochen."
 
-#: js/files.js:457
-msgid "Invalid name, '/' is not allowed."
-msgstr "Ungültiger Name, \"/\" ist nicht erlaubt."
+#: js/files.js:409
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr ""
 
-#: js/files.js:703 templates/index.php:55
+#: js/files.js:480
+msgid "Invalid name, '/' is not allowed."
+msgstr "Ungültiger Name: \"/\" ist nicht erlaubt."
+
+#: js/files.js:726 templates/index.php:55
 msgid "Size"
 msgstr "Größe"
 
-#: js/files.js:704 templates/index.php:56
+#: js/files.js:727 templates/index.php:56
 msgid "Modified"
 msgstr "Bearbeitet"
 
-#: js/files.js:731
+#: js/files.js:754
 msgid "folder"
 msgstr "Ordner"
 
-#: js/files.js:733
+#: js/files.js:756
 msgid "folders"
 msgstr "Ordner"
 
-#: js/files.js:741
+#: js/files.js:764
 msgid "file"
 msgstr "Datei"
 
-#: js/files.js:743
+#: js/files.js:766
 msgid "files"
 msgstr "Dateien"
 
@@ -155,7 +160,7 @@ msgstr "maximal möglich:"
 
 #: templates/admin.php:9
 msgid "Needed for multi-file and folder downloads."
-msgstr "Für Mehrfachdateien- und Ordnerdownloads benötigt:"
+msgstr "Für Mehrfachdatei- und Ordnerdownloads benötigt:"
 
 #: templates/admin.php:9
 msgid "Enable ZIP-download"
@@ -167,7 +172,7 @@ msgstr "0 bedeutet unbegrenzt"
 
 #: templates/admin.php:12
 msgid "Maximum input size for ZIP files"
-msgstr "Maximale Größe für ZIP Dateien"
+msgstr "Maximale Größe für ZIP-Dateien"
 
 #: templates/index.php:7
 msgid "New"
diff --git a/l10n/de/files_sharing.po b/l10n/de/files_sharing.po
index e77ca7577b..f1fdd9e874 100644
--- a/l10n/de/files_sharing.po
+++ b/l10n/de/files_sharing.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-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:03+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -29,10 +29,14 @@ msgstr "Passwort"
 msgid "Submit"
 msgstr "Absenden"
 
-#: templates/public.php:9
+#: templates/public.php:9 templates/public.php:19
 msgid "Download"
+msgstr "Download"
+
+#: templates/public.php:18
+msgid "No preview available for"
 msgstr ""
 
-#: templates/public.php:17
+#: templates/public.php:23
 msgid "web services under your control"
-msgstr ""
+msgstr "Web-Services unter Ihrer Kontrolle"
diff --git a/l10n/de/settings.po b/l10n/de/settings.po
index 0a51e4476b..37cd269f54 100644
--- a/l10n/de/settings.po
+++ b/l10n/de/settings.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-08-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:03+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -28,7 +28,7 @@ msgstr ""
 
 #: ajax/apps/ocs.php:23
 msgid "Unable to load list from App Store"
-msgstr "Liste der Apps im Store konnte nicht geladen werden."
+msgstr "Die Liste der Apps im Store konnte nicht geladen werden."
 
 #: ajax/lostpassword.php:14
 msgid "Email saved"
@@ -144,11 +144,11 @@ msgstr "Fügen Sie Ihre App hinzu"
 
 #: templates/apps.php:26
 msgid "Select an App"
-msgstr "Wähle eine Anwendung aus"
+msgstr "Wählen Sie eine Anwendung aus"
 
 #: templates/apps.php:29
 msgid "See application page at apps.owncloud.com"
-msgstr "Weitere Anwendungen auf apps.owncloud.com"
+msgstr "Weitere Anwendungen finden Sie auf apps.owncloud.com"
 
 #: templates/apps.php:30
 msgid "-licensed"
@@ -168,7 +168,7 @@ msgstr "Große Dateien verwalten"
 
 #: templates/help.php:10
 msgid "Ask a question"
-msgstr "Stell eine Frage"
+msgstr "Stellen Sie eine Frage"
 
 #: templates/help.php:22
 msgid "Problems connecting to help database."
@@ -244,7 +244,7 @@ msgstr "Helfen Sie bei der Übersetzung"
 
 #: templates/personal.php:51
 msgid "use this address to connect to your ownCloud in your file manager"
-msgstr "Benutzen Sie diese Adresse, um Ihr ownCloud mit deinem Dateimanager zu verbinden."
+msgstr "Benutzen Sie diese Adresse, um Ihre ownCloud mit Ihrem Dateimanager zu verbinden."
 
 #: templates/users.php:21 templates/users.php:76
 msgid "Name"
diff --git a/l10n/de/user_ldap.po b/l10n/de/user_ldap.po
index 6f9cced66a..18c835e066 100644
--- a/l10n/de/user_ldap.po
+++ b/l10n/de/user_ldap.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-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 11:12+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"
diff --git a/l10n/el/core.po b/l10n/el/core.po
index c256cef3fb..57cba80d05 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-08-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:02+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -37,55 +37,55 @@ msgstr "Αυτή η κατηγορία υπάρχει ήδη"
 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:201 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:206 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr "Ρυθμίσεις"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "January"
 msgstr "Ιανουάριος"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "February"
 msgstr "Φεβρουάριος"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "March"
 msgstr "Μάρτιος"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "April"
 msgstr "Απρίλιος"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "May"
 msgstr "Μάϊος"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "June"
 msgstr "Ιούνιος"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "July"
 msgstr "Ιούλιος"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "August"
 msgstr "Αύγουστος"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "September"
 msgstr "Σεπτέμβριος"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "October"
 msgstr "Οκτώβριος"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "November"
 msgstr "Νοέμβριος"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "December"
 msgstr "Δεκέμβριος"
 
@@ -247,7 +247,7 @@ msgstr "Ολοκλήρωση εγκατάστασης"
 msgid "web services under your control"
 msgstr "Υπηρεσίες web υπό τον έλεγχό σας"
 
-#: templates/layout.user.php:49
+#: templates/layout.user.php:45
 msgid "Log out"
 msgstr "Αποσύνδεση"
 
diff --git a/l10n/el/files.po b/l10n/el/files.po
index de2b3f80a1..cb1f1d7a3d 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-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -54,7 +54,7 @@ msgstr "Η εγγραφή στο δίσκο απέτυχε"
 msgid "Files"
 msgstr "Αρχεία"
 
-#: js/fileactions.js:107 templates/index.php:56
+#: js/fileactions.js:106 templates/index.php:56
 msgid "Delete"
 msgstr "Διαγραφή"
 
@@ -86,51 +86,56 @@ msgstr "αναίρεση"
 msgid "deleted"
 msgstr "διαγράφηκε"
 
-#: js/files.js:171
+#: js/files.js:179
 msgid "generating ZIP-file, it may take some time."
 msgstr "παραγωγή αρχείου ZIP, ίσως διαρκέσει αρκετά."
 
-#: js/files.js:200
+#: js/files.js:208
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "Αδυναμία στην μεταφόρτωση του αρχείου σας αφού είναι φάκελος ή έχει 0 bytes"
 
-#: js/files.js:200
+#: js/files.js:208
 msgid "Upload Error"
 msgstr "Σφάλμα Μεταφόρτωσης"
 
-#: js/files.js:228 js/files.js:319 js/files.js:348
+#: js/files.js:236 js/files.js:327 js/files.js:356
 msgid "Pending"
 msgstr "Εν αναμονή"
 
-#: js/files.js:333
+#: js/files.js:341
 msgid "Upload cancelled."
 msgstr "Η μεταφόρτωση ακυρώθηκε."
 
-#: js/files.js:457
+#: js/files.js:409
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr ""
+
+#: js/files.js:480
 msgid "Invalid name, '/' is not allowed."
 msgstr "Μη έγκυρο όνομα, το '/' δεν επιτρέπεται."
 
-#: js/files.js:703 templates/index.php:55
+#: js/files.js:726 templates/index.php:55
 msgid "Size"
 msgstr "Μέγεθος"
 
-#: js/files.js:704 templates/index.php:56
+#: js/files.js:727 templates/index.php:56
 msgid "Modified"
 msgstr "Τροποποιήθηκε"
 
-#: js/files.js:731
+#: js/files.js:754
 msgid "folder"
 msgstr "φάκελος"
 
-#: js/files.js:733
+#: js/files.js:756
 msgid "folders"
 msgstr "φάκελοι"
 
-#: js/files.js:741
+#: js/files.js:764
 msgid "file"
 msgstr "αρχείο"
 
-#: js/files.js:743
+#: js/files.js:766
 msgid "files"
 msgstr "αρχεία"
 
diff --git a/l10n/el/files_sharing.po b/l10n/el/files_sharing.po
index 22f3137283..fafebf4944 100644
--- a/l10n/el/files_sharing.po
+++ b/l10n/el/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-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:03+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -27,10 +27,14 @@ msgstr "Συνθηματικό"
 msgid "Submit"
 msgstr "Καταχώρηση"
 
-#: templates/public.php:9
+#: templates/public.php:9 templates/public.php:19
 msgid "Download"
 msgstr ""
 
-#: templates/public.php:17
+#: templates/public.php:18
+msgid "No preview available for"
+msgstr ""
+
+#: templates/public.php:23
 msgid "web services under your control"
 msgstr ""
diff --git a/l10n/el/settings.po b/l10n/el/settings.po
index f15267edf6..9ecb275bd7 100644
--- a/l10n/el/settings.po
+++ b/l10n/el/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-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:03+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
diff --git a/l10n/eo/core.po b/l10n/eo/core.po
index 79b7ff3e24..ccfd988fd2 100644
--- a/l10n/eo/core.po
+++ b/l10n/eo/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-08-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:02+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -36,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:201 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:206 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr "Agordo"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "January"
 msgstr "Januaro"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "February"
 msgstr "Februaro"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "March"
 msgstr "Marto"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "April"
 msgstr "Aprilo"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "May"
 msgstr "Majo"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "June"
 msgstr "Junio"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "July"
 msgstr "Julio"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "August"
 msgstr "Aŭgusto"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "September"
 msgstr "Septembro"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "October"
 msgstr "Oktobro"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "November"
 msgstr "Novembro"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "December"
 msgstr "Decembro"
 
@@ -246,7 +246,7 @@ msgstr "Fini la instalon"
 msgid "web services under your control"
 msgstr "TTT-servoj sub via kontrolo"
 
-#: templates/layout.user.php:49
+#: templates/layout.user.php:45
 msgid "Log out"
 msgstr "Elsaluti"
 
diff --git a/l10n/eo/files.po b/l10n/eo/files.po
index cc7ffcd01a..d84ef73a64 100644
--- a/l10n/eo/files.po
+++ b/l10n/eo/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-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -53,7 +53,7 @@ msgstr "Malsukcesis skribo al disko"
 msgid "Files"
 msgstr "Dosieroj"
 
-#: js/fileactions.js:107 templates/index.php:56
+#: js/fileactions.js:106 templates/index.php:56
 msgid "Delete"
 msgstr "Forigi"
 
@@ -85,51 +85,56 @@ msgstr "malfari"
 msgid "deleted"
 msgstr "forigita"
 
-#: js/files.js:171
+#: js/files.js:179
 msgid "generating ZIP-file, it may take some time."
 msgstr "generanta ZIP-dosiero, ĝi povas daŭri iom da tempo"
 
-#: js/files.js:200
+#: js/files.js:208
 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:200
+#: js/files.js:208
 msgid "Upload Error"
 msgstr "Alŝuta eraro"
 
-#: js/files.js:228 js/files.js:319 js/files.js:348
+#: js/files.js:236 js/files.js:327 js/files.js:356
 msgid "Pending"
 msgstr "Traktotaj"
 
-#: js/files.js:333
+#: js/files.js:341
 msgid "Upload cancelled."
 msgstr "La alŝuto nuliĝis."
 
-#: js/files.js:457
+#: js/files.js:409
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr ""
+
+#: js/files.js:480
 msgid "Invalid name, '/' is not allowed."
 msgstr "Nevalida nomo, “/” ne estas permesata."
 
-#: js/files.js:703 templates/index.php:55
+#: js/files.js:726 templates/index.php:55
 msgid "Size"
 msgstr "Grando"
 
-#: js/files.js:704 templates/index.php:56
+#: js/files.js:727 templates/index.php:56
 msgid "Modified"
 msgstr "Modifita"
 
-#: js/files.js:731
+#: js/files.js:754
 msgid "folder"
 msgstr "dosierujo"
 
-#: js/files.js:733
+#: js/files.js:756
 msgid "folders"
 msgstr "dosierujoj"
 
-#: js/files.js:741
+#: js/files.js:764
 msgid "file"
 msgstr "dosiero"
 
-#: js/files.js:743
+#: js/files.js:766
 msgid "files"
 msgstr "dosieroj"
 
diff --git a/l10n/eo/files_sharing.po b/l10n/eo/files_sharing.po
index 0cb4c533a4..8ad6599fb0 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-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:03+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -26,10 +26,14 @@ msgstr "Pasvorto"
 msgid "Submit"
 msgstr "Sendi"
 
-#: templates/public.php:9
+#: templates/public.php:9 templates/public.php:19
 msgid "Download"
 msgstr ""
 
-#: templates/public.php:17
+#: templates/public.php:18
+msgid "No preview available for"
+msgstr ""
+
+#: templates/public.php:23
 msgid "web services under your control"
 msgstr ""
diff --git a/l10n/eo/settings.po b/l10n/eo/settings.po
index 75eea7b743..776ade3f9e 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-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:03+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
diff --git a/l10n/es/core.po b/l10n/es/core.po
index 8c8a0c622a..e6464ac375 100644
--- a/l10n/es/core.po
+++ b/l10n/es/core.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-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:02+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -40,55 +40,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:201 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:206 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr "Ajustes"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "January"
 msgstr "Enero"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "February"
 msgstr "Febrero"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "March"
 msgstr "Marzo"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "April"
 msgstr "Abril"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "May"
 msgstr "Mayo"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "June"
 msgstr "Junio"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "July"
 msgstr "Julio"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "August"
 msgstr "Agosto"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "September"
 msgstr "Septiembre"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "October"
 msgstr "Octubre"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "November"
 msgstr "Noviembre"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "December"
 msgstr "Diciembre"
 
@@ -250,7 +250,7 @@ msgstr "Completar la instalación"
 msgid "web services under your control"
 msgstr "servicios web bajo tu control"
 
-#: templates/layout.user.php:49
+#: templates/layout.user.php:45
 msgid "Log out"
 msgstr "Salir"
 
diff --git a/l10n/es/files.po b/l10n/es/files.po
index d7855d52e0..1e703f1a81 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-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -54,7 +54,7 @@ msgstr "La escritura en disco ha fallado"
 msgid "Files"
 msgstr "Archivos"
 
-#: js/fileactions.js:107 templates/index.php:56
+#: js/fileactions.js:106 templates/index.php:56
 msgid "Delete"
 msgstr "Eliminado"
 
@@ -86,51 +86,56 @@ msgstr "deshacer"
 msgid "deleted"
 msgstr "borrado"
 
-#: js/files.js:171
+#: js/files.js:179
 msgid "generating ZIP-file, it may take some time."
 msgstr "generando un fichero ZIP, puede llevar un tiempo."
 
-#: js/files.js:200
+#: js/files.js:208
 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:200
+#: js/files.js:208
 msgid "Upload Error"
 msgstr "Error al subir el archivo"
 
-#: js/files.js:228 js/files.js:319 js/files.js:348
+#: js/files.js:236 js/files.js:327 js/files.js:356
 msgid "Pending"
 msgstr "Pendiente"
 
-#: js/files.js:333
+#: js/files.js:341
 msgid "Upload cancelled."
 msgstr "Subida cancelada."
 
-#: js/files.js:457
+#: js/files.js:409
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr ""
+
+#: js/files.js:480
 msgid "Invalid name, '/' is not allowed."
 msgstr "Nombre no válido, '/' no está permitido."
 
-#: js/files.js:703 templates/index.php:55
+#: js/files.js:726 templates/index.php:55
 msgid "Size"
 msgstr "Tamaño"
 
-#: js/files.js:704 templates/index.php:56
+#: js/files.js:727 templates/index.php:56
 msgid "Modified"
 msgstr "Modificado"
 
-#: js/files.js:731
+#: js/files.js:754
 msgid "folder"
 msgstr "carpeta"
 
-#: js/files.js:733
+#: js/files.js:756
 msgid "folders"
 msgstr "carpetas"
 
-#: js/files.js:741
+#: js/files.js:764
 msgid "file"
 msgstr "archivo"
 
-#: js/files.js:743
+#: js/files.js:766
 msgid "files"
 msgstr "archivos"
 
diff --git a/l10n/es/files_external.po b/l10n/es/files_external.po
index 2a26b728a9..b8da8c7725 100644
--- a/l10n/es/files_external.po
+++ b/l10n/es/files_external.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # Javier Llorente <javier@opensuse.org>, 2012.
+#   <pedro.navia@etecsa.cu>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\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"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 20:26+0000\n"
+"Last-Translator: pedro.navia <pedro.navia@etecsa.cu>\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"
@@ -24,7 +25,7 @@ msgstr "Almacenamiento externo"
 
 #: templates/settings.php:7 templates/settings.php:19
 msgid "Mount point"
-msgstr ""
+msgstr "Punto de montaje"
 
 #: templates/settings.php:8
 msgid "Backend"
@@ -68,16 +69,16 @@ msgstr "Eliiminar"
 
 #: templates/settings.php:88
 msgid "SSL root certificates"
-msgstr ""
+msgstr "Raíz de certificados SSL  "
 
 #: templates/settings.php:102
 msgid "Import Root Certificate"
-msgstr ""
+msgstr "Importar certificado raíz"
 
 #: templates/settings.php:108
 msgid "Enable User External Storage"
-msgstr ""
+msgstr "Habilitar almacenamiento de usuario externo"
 
 #: templates/settings.php:109
 msgid "Allow users to mount their own external storage"
-msgstr ""
+msgstr "Permitir a los usuarios montar su propio almacenamiento externo"
diff --git a/l10n/es/files_sharing.po b/l10n/es/files_sharing.po
index d514ee6fc4..7d36e72c7d 100644
--- a/l10n/es/files_sharing.po
+++ b/l10n/es/files_sharing.po
@@ -4,12 +4,13 @@
 # 
 # Translators:
 # Javier Llorente <javier@opensuse.org>, 2012.
+#   <pedro.navia@etecsa.cu>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:03+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -20,16 +21,20 @@ msgstr ""
 
 #: templates/authenticate.php:4
 msgid "Password"
-msgstr ""
+msgstr "Contraseña"
 
 #: templates/authenticate.php:6
 msgid "Submit"
-msgstr ""
+msgstr "Enviar"
 
-#: templates/public.php:9
+#: templates/public.php:9 templates/public.php:19
 msgid "Download"
+msgstr "Descargar"
+
+#: templates/public.php:18
+msgid "No preview available for"
 msgstr ""
 
-#: templates/public.php:17
+#: templates/public.php:23
 msgid "web services under your control"
-msgstr ""
+msgstr "Servicios web bajo su control"
diff --git a/l10n/es/settings.po b/l10n/es/settings.po
index 4c222cc9d6..de248b3617 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-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:03+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
diff --git a/l10n/et_EE/core.po b/l10n/et_EE/core.po
index b9b71d86ba..0767a4e42f 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-08-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:02+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -34,55 +34,55 @@ msgstr "See kategooria on juba olemas: "
 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:201 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:206 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr "Seaded"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "January"
 msgstr "Jaanuar"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "February"
 msgstr "Veebruar"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "March"
 msgstr "Märts"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "April"
 msgstr "Aprill"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "May"
 msgstr "Mai"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "June"
 msgstr "Juuni"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "July"
 msgstr "Juuli"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "August"
 msgstr "August"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "September"
 msgstr "September"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "October"
 msgstr "Oktoober"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "November"
 msgstr "November"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "December"
 msgstr "Detsember"
 
@@ -244,7 +244,7 @@ msgstr "Lõpeta seadistamine"
 msgid "web services under your control"
 msgstr "veebiteenused sinu kontrolli all"
 
-#: templates/layout.user.php:49
+#: templates/layout.user.php:45
 msgid "Log out"
 msgstr "Logi välja"
 
diff --git a/l10n/et_EE/files.po b/l10n/et_EE/files.po
index d0fad31b01..89b36a8415 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-08-26 19:46+0200\n"
-"PO-Revision-Date: 2012-08-26 17:20+0000\n"
-"Last-Translator: Rivo Zängov <eraser@eraser.ee>\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -52,7 +52,7 @@ msgstr "Kettale kirjutamine ebaõnnestus"
 msgid "Files"
 msgstr "Failid"
 
-#: js/fileactions.js:111 templates/index.php:56
+#: js/fileactions.js:106 templates/index.php:56
 msgid "Delete"
 msgstr "Kustuta"
 
@@ -84,51 +84,56 @@ msgstr "tagasi"
 msgid "deleted"
 msgstr "kustutatud"
 
-#: js/files.js:171
+#: js/files.js:179
 msgid "generating ZIP-file, it may take some time."
 msgstr "ZIP-faili loomine, see võib veidi aega võtta."
 
-#: js/files.js:200
+#: js/files.js:208
 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:200
+#: js/files.js:208
 msgid "Upload Error"
 msgstr "Üleslaadimise viga"
 
-#: js/files.js:228 js/files.js:319 js/files.js:348
+#: js/files.js:236 js/files.js:327 js/files.js:356
 msgid "Pending"
 msgstr "Ootel"
 
-#: js/files.js:333
+#: js/files.js:341
 msgid "Upload cancelled."
 msgstr "Üleslaadimine tühistati."
 
-#: js/files.js:457
+#: js/files.js:409
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr ""
+
+#: js/files.js:480
 msgid "Invalid name, '/' is not allowed."
 msgstr "Vigane nimi, '/' pole lubatud."
 
-#: js/files.js:703 templates/index.php:55
+#: js/files.js:726 templates/index.php:55
 msgid "Size"
 msgstr "Suurus"
 
-#: js/files.js:704 templates/index.php:56
+#: js/files.js:727 templates/index.php:56
 msgid "Modified"
 msgstr "Muudetud"
 
-#: js/files.js:731
+#: js/files.js:754
 msgid "folder"
 msgstr "kaust"
 
-#: js/files.js:733
+#: js/files.js:756
 msgid "folders"
 msgstr "kausta"
 
-#: js/files.js:741
+#: js/files.js:764
 msgid "file"
 msgstr "fail"
 
-#: js/files.js:743
+#: js/files.js:766
 msgid "files"
 msgstr "faili"
 
diff --git a/l10n/et_EE/files_sharing.po b/l10n/et_EE/files_sharing.po
index 1d7b7f670a..7942c92767 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-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:03+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -26,10 +26,14 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
-#: templates/public.php:9
+#: templates/public.php:9 templates/public.php:19
 msgid "Download"
 msgstr ""
 
-#: templates/public.php:17
+#: templates/public.php:18
+msgid "No preview available for"
+msgstr ""
+
+#: templates/public.php:23
 msgid "web services under your control"
 msgstr ""
diff --git a/l10n/et_EE/settings.po b/l10n/et_EE/settings.po
index 1031fe83cf..e0a595aa1a 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-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:03+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
diff --git a/l10n/eu/core.po b/l10n/eu/core.po
index 3e613136b3..63b63ad545 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-08-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:02+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -35,55 +35,55 @@ msgstr "Kategoria hau dagoeneko existitzen da:"
 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:201 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:206 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr "Ezarpenak"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "January"
 msgstr "Urtarrila"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "February"
 msgstr "Otsaila"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "March"
 msgstr "Martxoa"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "April"
 msgstr "Apirila"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "May"
 msgstr "Maiatza"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "June"
 msgstr "Ekaina"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "July"
 msgstr "Uztaila"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "August"
 msgstr "Abuztua"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "September"
 msgstr "Iraila"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "October"
 msgstr "Urria"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "November"
 msgstr "Azaroa"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "December"
 msgstr "Abendua"
 
@@ -245,7 +245,7 @@ msgstr "Bukatu konfigurazioa"
 msgid "web services under your control"
 msgstr "web zerbitzuak zure kontrolpean"
 
-#: templates/layout.user.php:49
+#: templates/layout.user.php:45
 msgid "Log out"
 msgstr "Saioa bukatu"
 
diff --git a/l10n/eu/files.po b/l10n/eu/files.po
index d450fd0522..a0e689fba4 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-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -53,7 +53,7 @@ msgstr "Errore bat izan da diskoan idazterakoan"
 msgid "Files"
 msgstr "Fitxategiak"
 
-#: js/fileactions.js:107 templates/index.php:56
+#: js/fileactions.js:106 templates/index.php:56
 msgid "Delete"
 msgstr "Ezabatu"
 
@@ -85,51 +85,56 @@ msgstr "desegin"
 msgid "deleted"
 msgstr "ezabatuta"
 
-#: js/files.js:171
+#: js/files.js:179
 msgid "generating ZIP-file, it may take some time."
 msgstr "ZIP-fitxategia sortzen ari da, denbora har dezake"
 
-#: js/files.js:200
+#: js/files.js:208
 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:200
+#: js/files.js:208
 msgid "Upload Error"
 msgstr "Igotzean errore bat suertatu da"
 
-#: js/files.js:228 js/files.js:319 js/files.js:348
+#: js/files.js:236 js/files.js:327 js/files.js:356
 msgid "Pending"
 msgstr "Zain"
 
-#: js/files.js:333
+#: js/files.js:341
 msgid "Upload cancelled."
 msgstr "Igoera ezeztatuta"
 
-#: js/files.js:457
+#: js/files.js:409
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr ""
+
+#: js/files.js:480
 msgid "Invalid name, '/' is not allowed."
 msgstr "Baliogabeko izena, '/' ezin da erabili. "
 
-#: js/files.js:703 templates/index.php:55
+#: js/files.js:726 templates/index.php:55
 msgid "Size"
 msgstr "Tamaina"
 
-#: js/files.js:704 templates/index.php:56
+#: js/files.js:727 templates/index.php:56
 msgid "Modified"
 msgstr "Aldatuta"
 
-#: js/files.js:731
+#: js/files.js:754
 msgid "folder"
 msgstr "karpeta"
 
-#: js/files.js:733
+#: js/files.js:756
 msgid "folders"
 msgstr "Karpetak"
 
-#: js/files.js:741
+#: js/files.js:764
 msgid "file"
 msgstr "fitxategia"
 
-#: js/files.js:743
+#: js/files.js:766
 msgid "files"
 msgstr "fitxategiak"
 
diff --git a/l10n/eu/files_external.po b/l10n/eu/files_external.po
index eae7996496..f614dd9418 100644
--- a/l10n/eu/files_external.po
+++ b/l10n/eu/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-28 02:01+0200\n"
-"PO-Revision-Date: 2012-08-27 09:04+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 20:52+0000\n"
 "Last-Translator: asieriko <asieriko@gmail.com>\n"
 "Language-Team: Basque (http://www.transifex.com/projects/p/owncloud/language/eu/)\n"
 "MIME-Version: 1.0\n"
@@ -28,7 +28,7 @@ msgstr "Montatze puntua"
 
 #: templates/settings.php:8
 msgid "Backend"
-msgstr ""
+msgstr "Motorra"
 
 #: templates/settings.php:9
 msgid "Configuration"
diff --git a/l10n/eu/files_sharing.po b/l10n/eu/files_sharing.po
index a968b59ddc..a519a3b4f4 100644
--- a/l10n/eu/files_sharing.po
+++ b/l10n/eu/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-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:03+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -20,16 +20,20 @@ msgstr ""
 
 #: templates/authenticate.php:4
 msgid "Password"
-msgstr ""
+msgstr "Pasahitza"
 
 #: templates/authenticate.php:6
 msgid "Submit"
-msgstr ""
+msgstr "Bidali"
 
-#: templates/public.php:9
+#: templates/public.php:9 templates/public.php:19
 msgid "Download"
+msgstr "Deskargatu"
+
+#: templates/public.php:18
+msgid "No preview available for"
 msgstr ""
 
-#: templates/public.php:17
+#: templates/public.php:23
 msgid "web services under your control"
-msgstr ""
+msgstr "web zerbitzuak zure kontrolpean"
diff --git a/l10n/eu/settings.po b/l10n/eu/settings.po
index a234da4f08..bf2a28693e 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-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:03+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
diff --git a/l10n/eu/user_ldap.po b/l10n/eu/user_ldap.po
index 8b6abda92f..a8b8ab93ae 100644
--- a/l10n/eu/user_ldap.po
+++ b/l10n/eu/user_ldap.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-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 21:29+0000\n"
+"Last-Translator: asieriko <asieriko@gmail.com>\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"
@@ -164,7 +164,7 @@ msgstr "segundutan. Aldaketak katxea husten du."
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
-msgstr ""
+msgstr "Utzi hutsik erabiltzaile izenarako (lehentsia). Bestela zehaztu LDAP/AD atributua."
 
 #: templates/settings.php:32
 msgid "Help"
diff --git a/l10n/eu_ES/core.po b/l10n/eu_ES/core.po
index 31a6a198e8..a6da3a496e 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-08-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:02+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -33,55 +33,55 @@ msgstr ""
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr ""
 
-#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:206 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "January"
 msgstr ""
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "February"
 msgstr ""
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "March"
 msgstr ""
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "April"
 msgstr ""
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "May"
 msgstr ""
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "June"
 msgstr ""
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "July"
 msgstr ""
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "August"
 msgstr ""
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "September"
 msgstr ""
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "October"
 msgstr ""
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "November"
 msgstr ""
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "December"
 msgstr ""
 
@@ -243,7 +243,7 @@ msgstr ""
 msgid "web services under your control"
 msgstr ""
 
-#: templates/layout.user.php:49
+#: templates/layout.user.php:45
 msgid "Log out"
 msgstr ""
 
diff --git a/l10n/eu_ES/files.po b/l10n/eu_ES/files.po
index cf36b73d5b..1a86a78d4b 100644
--- a/l10n/eu_ES/files.po
+++ b/l10n/eu_ES/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-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -51,7 +51,7 @@ msgstr ""
 msgid "Files"
 msgstr ""
 
-#: js/fileactions.js:107 templates/index.php:56
+#: js/fileactions.js:106 templates/index.php:56
 msgid "Delete"
 msgstr ""
 
@@ -83,51 +83,56 @@ msgstr ""
 msgid "deleted"
 msgstr ""
 
-#: js/files.js:171
+#: js/files.js:179
 msgid "generating ZIP-file, it may take some time."
 msgstr ""
 
-#: js/files.js:200
+#: js/files.js:208
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:200
+#: js/files.js:208
 msgid "Upload Error"
 msgstr ""
 
-#: js/files.js:228 js/files.js:319 js/files.js:348
+#: js/files.js:236 js/files.js:327 js/files.js:356
 msgid "Pending"
 msgstr ""
 
-#: js/files.js:333
+#: js/files.js:341
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:457
+#: js/files.js:409
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr ""
+
+#: js/files.js:480
 msgid "Invalid name, '/' is not allowed."
 msgstr ""
 
-#: js/files.js:703 templates/index.php:55
+#: js/files.js:726 templates/index.php:55
 msgid "Size"
 msgstr ""
 
-#: js/files.js:704 templates/index.php:56
+#: js/files.js:727 templates/index.php:56
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:731
+#: js/files.js:754
 msgid "folder"
 msgstr ""
 
-#: js/files.js:733
+#: js/files.js:756
 msgid "folders"
 msgstr ""
 
-#: js/files.js:741
+#: js/files.js:764
 msgid "file"
 msgstr ""
 
-#: js/files.js:743
+#: js/files.js:766
 msgid "files"
 msgstr ""
 
diff --git a/l10n/eu_ES/files_sharing.po b/l10n/eu_ES/files_sharing.po
index d5d03fe6b7..da8e6d2366 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-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:03+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -25,10 +25,14 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
-#: templates/public.php:9
+#: templates/public.php:9 templates/public.php:19
 msgid "Download"
 msgstr ""
 
-#: templates/public.php:17
+#: templates/public.php:18
+msgid "No preview available for"
+msgstr ""
+
+#: templates/public.php:23
 msgid "web services under your control"
 msgstr ""
diff --git a/l10n/eu_ES/settings.po b/l10n/eu_ES/settings.po
index 6a72266529..1b7b2386fa 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-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:03+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
diff --git a/l10n/fa/core.po b/l10n/fa/core.po
index c122ee9da1..6099da454e 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-08-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:02+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -34,55 +34,55 @@ msgstr "این گروه از قبل اضافه شده"
 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:201 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:206 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr "تنظیمات"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "January"
 msgstr "ژانویه"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "February"
 msgstr "فبریه"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "March"
 msgstr "مارس"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "April"
 msgstr "آوریل"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "May"
 msgstr "می"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "June"
 msgstr "ژوئن"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "July"
 msgstr "جولای"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "August"
 msgstr "آگوست"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "September"
 msgstr "سپتامبر"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "October"
 msgstr "اکتبر"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "November"
 msgstr "نوامبر"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "December"
 msgstr "دسامبر"
 
@@ -244,7 +244,7 @@ msgstr "اتمام نصب"
 msgid "web services under your control"
 msgstr "سرویس وب تحت کنترل شما"
 
-#: templates/layout.user.php:49
+#: templates/layout.user.php:45
 msgid "Log out"
 msgstr "خروج"
 
diff --git a/l10n/fa/files.po b/l10n/fa/files.po
index 5dc2cb2c38..136043a67d 100644
--- a/l10n/fa/files.po
+++ b/l10n/fa/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-24 02:02+0200\n"
-"PO-Revision-Date: 2012-08-23 20:17+0000\n"
-"Last-Translator: Mohammad Dashtizadeh <mohammad@dashtizadeh.net>\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -54,7 +54,7 @@ msgstr "نوشتن بر روی دیسک سخت ناموفق بود"
 msgid "Files"
 msgstr "فایل ها"
 
-#: js/fileactions.js:107 templates/index.php:56
+#: js/fileactions.js:106 templates/index.php:56
 msgid "Delete"
 msgstr "پاک کردن"
 
@@ -86,51 +86,56 @@ msgstr "بازگشت"
 msgid "deleted"
 msgstr "حذف شده"
 
-#: js/files.js:171
+#: js/files.js:179
 msgid "generating ZIP-file, it may take some time."
 msgstr "در حال ساخت فایل فشرده ممکن است زمان زیادی به طول بیانجامد"
 
-#: js/files.js:200
+#: js/files.js:208
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "ناتوان در بارگذاری یا فایل یک پوشه است یا 0بایت دارد"
 
-#: js/files.js:200
+#: js/files.js:208
 msgid "Upload Error"
 msgstr "خطا در بار گذاری"
 
-#: js/files.js:228 js/files.js:319 js/files.js:348
+#: js/files.js:236 js/files.js:327 js/files.js:356
 msgid "Pending"
 msgstr "در انتظار"
 
-#: js/files.js:333
+#: js/files.js:341
 msgid "Upload cancelled."
 msgstr "بار گذاری لغو شد"
 
-#: js/files.js:457
+#: js/files.js:409
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr ""
+
+#: js/files.js:480
 msgid "Invalid name, '/' is not allowed."
 msgstr "نام نامناسب '/' غیرفعال است"
 
-#: js/files.js:703 templates/index.php:55
+#: js/files.js:726 templates/index.php:55
 msgid "Size"
 msgstr "اندازه"
 
-#: js/files.js:704 templates/index.php:56
+#: js/files.js:727 templates/index.php:56
 msgid "Modified"
 msgstr "تغییر یافته"
 
-#: js/files.js:731
+#: js/files.js:754
 msgid "folder"
 msgstr "پوشه"
 
-#: js/files.js:733
+#: js/files.js:756
 msgid "folders"
 msgstr "پوشه ها"
 
-#: js/files.js:741
+#: js/files.js:764
 msgid "file"
 msgstr "پرونده"
 
-#: js/files.js:743
+#: js/files.js:766
 msgid "files"
 msgstr "پرونده ها"
 
diff --git a/l10n/fa/files_sharing.po b/l10n/fa/files_sharing.po
index 4e3884cb87..84f1a537d3 100644
--- a/l10n/fa/files_sharing.po
+++ b/l10n/fa/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-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:03+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -26,10 +26,14 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
-#: templates/public.php:9
+#: templates/public.php:9 templates/public.php:19
 msgid "Download"
 msgstr ""
 
-#: templates/public.php:17
+#: templates/public.php:18
+msgid "No preview available for"
+msgstr ""
+
+#: templates/public.php:23
 msgid "web services under your control"
 msgstr ""
diff --git a/l10n/fa/settings.po b/l10n/fa/settings.po
index 91b4998174..639ac0d539 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-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:03+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
diff --git a/l10n/fi/core.po b/l10n/fi/core.po
index 80fab1564a..9471fc3066 100644
--- a/l10n/fi/core.po
+++ b/l10n/fi/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-08-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:02+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -33,55 +33,55 @@ msgstr ""
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr ""
 
-#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:206 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "January"
 msgstr ""
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "February"
 msgstr ""
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "March"
 msgstr ""
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "April"
 msgstr ""
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "May"
 msgstr ""
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "June"
 msgstr ""
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "July"
 msgstr ""
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "August"
 msgstr ""
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "September"
 msgstr ""
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "October"
 msgstr ""
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "November"
 msgstr ""
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "December"
 msgstr ""
 
@@ -243,7 +243,7 @@ msgstr ""
 msgid "web services under your control"
 msgstr ""
 
-#: templates/layout.user.php:49
+#: templates/layout.user.php:45
 msgid "Log out"
 msgstr ""
 
diff --git a/l10n/fi/files.po b/l10n/fi/files.po
index edf5daa8da..64ed983196 100644
--- a/l10n/fi/files.po
+++ b/l10n/fi/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-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -51,7 +51,7 @@ msgstr ""
 msgid "Files"
 msgstr ""
 
-#: js/fileactions.js:107 templates/index.php:56
+#: js/fileactions.js:106 templates/index.php:56
 msgid "Delete"
 msgstr ""
 
@@ -83,51 +83,56 @@ msgstr ""
 msgid "deleted"
 msgstr ""
 
-#: js/files.js:171
+#: js/files.js:179
 msgid "generating ZIP-file, it may take some time."
 msgstr ""
 
-#: js/files.js:200
+#: js/files.js:208
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:200
+#: js/files.js:208
 msgid "Upload Error"
 msgstr ""
 
-#: js/files.js:228 js/files.js:319 js/files.js:348
+#: js/files.js:236 js/files.js:327 js/files.js:356
 msgid "Pending"
 msgstr ""
 
-#: js/files.js:333
+#: js/files.js:341
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:457
+#: js/files.js:409
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr ""
+
+#: js/files.js:480
 msgid "Invalid name, '/' is not allowed."
 msgstr ""
 
-#: js/files.js:703 templates/index.php:55
+#: js/files.js:726 templates/index.php:55
 msgid "Size"
 msgstr ""
 
-#: js/files.js:704 templates/index.php:56
+#: js/files.js:727 templates/index.php:56
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:731
+#: js/files.js:754
 msgid "folder"
 msgstr ""
 
-#: js/files.js:733
+#: js/files.js:756
 msgid "folders"
 msgstr ""
 
-#: js/files.js:741
+#: js/files.js:764
 msgid "file"
 msgstr ""
 
-#: js/files.js:743
+#: js/files.js:766
 msgid "files"
 msgstr ""
 
diff --git a/l10n/fi/files_sharing.po b/l10n/fi/files_sharing.po
index 7675786f94..4cee2cd498 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-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:03+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -25,10 +25,14 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
-#: templates/public.php:9
+#: templates/public.php:9 templates/public.php:19
 msgid "Download"
 msgstr ""
 
-#: templates/public.php:17
+#: templates/public.php:18
+msgid "No preview available for"
+msgstr ""
+
+#: templates/public.php:23
 msgid "web services under your control"
 msgstr ""
diff --git a/l10n/fi/settings.po b/l10n/fi/settings.po
index 58689bc1d0..6b51b7912a 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-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:03+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
diff --git a/l10n/fi_FI/core.po b/l10n/fi_FI/core.po
index 93613a36f7..6ad322c5cc 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-08-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:02+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -38,55 +38,55 @@ msgstr "Tämä luokka on jo olemassa: "
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr ""
 
-#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:206 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr "Asetukset"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "January"
 msgstr "Tammikuu"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "February"
 msgstr "Helmikuu"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "March"
 msgstr "Maaliskuu"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "April"
 msgstr "Huhtikuu"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "May"
 msgstr "Toukokuu"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "June"
 msgstr "Kesäkuu"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "July"
 msgstr "Heinäkuu"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "August"
 msgstr "Elokuu"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "September"
 msgstr "Syyskuu"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "October"
 msgstr "Lokakuu"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "November"
 msgstr "Marraskuu"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "December"
 msgstr "Joulukuu"
 
@@ -248,7 +248,7 @@ msgstr "Viimeistele asennus"
 msgid "web services under your control"
 msgstr "verkkopalvelut hallinnassasi"
 
-#: templates/layout.user.php:49
+#: templates/layout.user.php:45
 msgid "Log out"
 msgstr "Kirjaudu ulos"
 
diff --git a/l10n/fi_FI/files.po b/l10n/fi_FI/files.po
index e4ee45867c..1faa1deb75 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-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"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -55,7 +55,7 @@ msgstr "Levylle kirjoitus epäonnistui"
 msgid "Files"
 msgstr "Tiedostot"
 
-#: js/fileactions.js:107 templates/index.php:56
+#: js/fileactions.js:106 templates/index.php:56
 msgid "Delete"
 msgstr "Poista"
 
@@ -87,51 +87,56 @@ msgstr "kumoa"
 msgid "deleted"
 msgstr "poistettu"
 
-#: js/files.js:171
+#: js/files.js:179
 msgid "generating ZIP-file, it may take some time."
 msgstr "luodaan ZIP-tiedostoa, tämä saattaa kestää hetken."
 
-#: js/files.js:200
+#: js/files.js:208
 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:200
+#: js/files.js:208
 msgid "Upload Error"
 msgstr "Lähetysvirhe."
 
-#: js/files.js:228 js/files.js:319 js/files.js:348
+#: js/files.js:236 js/files.js:327 js/files.js:356
 msgid "Pending"
 msgstr "Odottaa"
 
-#: js/files.js:333
+#: js/files.js:341
 msgid "Upload cancelled."
 msgstr "Lähetys peruttu."
 
-#: js/files.js:457
+#: js/files.js:409
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr ""
+
+#: js/files.js:480
 msgid "Invalid name, '/' is not allowed."
 msgstr "Virheellinen nimi, merkki '/' ei ole sallittu."
 
-#: js/files.js:703 templates/index.php:55
+#: js/files.js:726 templates/index.php:55
 msgid "Size"
 msgstr "Koko"
 
-#: js/files.js:704 templates/index.php:56
+#: js/files.js:727 templates/index.php:56
 msgid "Modified"
 msgstr "Muutettu"
 
-#: js/files.js:731
+#: js/files.js:754
 msgid "folder"
 msgstr "kansio"
 
-#: js/files.js:733
+#: js/files.js:756
 msgid "folders"
 msgstr "kansiota"
 
-#: js/files.js:741
+#: js/files.js:764
 msgid "file"
 msgstr "tiedosto"
 
-#: js/files.js:743
+#: js/files.js:766
 msgid "files"
 msgstr "tiedostoa"
 
diff --git a/l10n/fi_FI/files_sharing.po b/l10n/fi_FI/files_sharing.po
index 833c5b7206..252458e4cb 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-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:03+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -20,16 +20,20 @@ msgstr ""
 
 #: templates/authenticate.php:4
 msgid "Password"
-msgstr ""
+msgstr "Salasana"
 
 #: templates/authenticate.php:6
 msgid "Submit"
-msgstr ""
+msgstr "Lähetä"
 
-#: templates/public.php:9
+#: templates/public.php:9 templates/public.php:19
 msgid "Download"
+msgstr "Lataa"
+
+#: templates/public.php:18
+msgid "No preview available for"
 msgstr ""
 
-#: templates/public.php:17
+#: templates/public.php:23
 msgid "web services under your control"
-msgstr ""
+msgstr "verkkopalvelut hallinnassasi"
diff --git a/l10n/fi_FI/settings.po b/l10n/fi_FI/settings.po
index 1066e0aad1..5423bc6e94 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-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:03+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
diff --git a/l10n/fr/core.po b/l10n/fr/core.po
index 957e66b736..44ac2aa06c 100644
--- a/l10n/fr/core.po
+++ b/l10n/fr/core.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Guillaume Paumier <guillom.pom@gmail.com>, 2012.
 # Nahir Mohamed <nahirmoha@gmail.com>, 2012.
 #   <nathaplop@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-08-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:02+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -37,61 +38,61 @@ msgstr "Cette catégorie existe déjà : "
 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:201 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:206 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr "Paramètres"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "January"
-msgstr "Janvier"
+msgstr "janvier"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "February"
-msgstr "Février"
+msgstr "février"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "March"
-msgstr "Mars"
+msgstr "mars"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "April"
-msgstr "Avril"
+msgstr "avril"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "May"
-msgstr "Mai"
+msgstr "mai"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "June"
-msgstr "Juin"
+msgstr "juin"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "July"
-msgstr "Juillet"
+msgstr "juillet"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "August"
-msgstr "Août"
+msgstr "août"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "September"
-msgstr "Septembre"
+msgstr "septembre"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "October"
-msgstr "Octobre"
+msgstr "octobre"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "November"
-msgstr "Novembre"
+msgstr "novembre"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "December"
-msgstr "Décembre"
+msgstr "décembre"
 
 #: js/oc-dialogs.js:143 js/oc-dialogs.js:163
 msgid "Cancel"
-msgstr "Annulé"
+msgstr "Annuler"
 
 #: js/oc-dialogs.js:159
 msgid "No"
@@ -123,7 +124,7 @@ msgstr "Utilisez le lien suivant pour réinitialiser votre mot de passe : {link}
 
 #: lostpassword/templates/lostpassword.php:3
 msgid "You will receive a link to reset your password via Email."
-msgstr "Vous allez recevoir un e-mail contenant un lien pour réinitialiser votre mot de passe"
+msgstr "Vous allez recevoir un e-mail contenant un lien pour réinitialiser votre mot de passe."
 
 #: lostpassword/templates/lostpassword.php:5
 msgid "Requested"
@@ -247,7 +248,7 @@ msgstr "Terminer l'installation"
 msgid "web services under your control"
 msgstr "services web sous votre contrôle"
 
-#: templates/layout.user.php:49
+#: templates/layout.user.php:45
 msgid "Log out"
 msgstr "Se déconnecter"
 
diff --git a/l10n/fr/files.po b/l10n/fr/files.po
index 19cb780d18..6bc9f20b8b 100644
--- a/l10n/fr/files.po
+++ b/l10n/fr/files.po
@@ -6,6 +6,7 @@
 # Cyril Glapa <kyriog@gmail.com>, 2012.
 # Geoffrey Guerrier <geoffrey.guerrier@gmail.com>, 2012.
 #   <guiguidu31300@gmail.com>, 2012.
+# Guillaume Paumier <guillom.pom@gmail.com>, 2012.
 # Nahir Mohamed <nahirmoha@gmail.com>, 2012.
 #   <rom1dep@gmail.com>, 2011.
 # Romain DEP. <rom1dep@gmail.com>, 2012.
@@ -13,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-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -57,7 +58,7 @@ msgstr "Erreur d'écriture sur le disque"
 msgid "Files"
 msgstr "Fichiers"
 
-#: js/fileactions.js:107 templates/index.php:56
+#: js/fileactions.js:106 templates/index.php:56
 msgid "Delete"
 msgstr "Supprimer"
 
@@ -89,51 +90,56 @@ msgstr "annuler"
 msgid "deleted"
 msgstr "supprimé"
 
-#: js/files.js:171
+#: js/files.js:179
 msgid "generating ZIP-file, it may take some time."
-msgstr "Générer un fichier ZIP, cela peut prendre du temps"
+msgstr "Fichier ZIP en cours d'assemblage ;  cela peut prendre du temps."
 
-#: js/files.js:200
+#: js/files.js:208
 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:200
+#: js/files.js:208
 msgid "Upload Error"
 msgstr "Erreur de chargement"
 
-#: js/files.js:228 js/files.js:319 js/files.js:348
+#: js/files.js:236 js/files.js:327 js/files.js:356
 msgid "Pending"
 msgstr "En cours"
 
-#: js/files.js:333
+#: js/files.js:341
 msgid "Upload cancelled."
-msgstr "Chargement annulé"
+msgstr "Chargement annulé."
 
-#: js/files.js:457
+#: js/files.js:409
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr ""
+
+#: js/files.js:480
 msgid "Invalid name, '/' is not allowed."
 msgstr "Nom invalide, '/' n'est pas autorisé."
 
-#: js/files.js:703 templates/index.php:55
+#: js/files.js:726 templates/index.php:55
 msgid "Size"
 msgstr "Taille"
 
-#: js/files.js:704 templates/index.php:56
+#: js/files.js:727 templates/index.php:56
 msgid "Modified"
 msgstr "Modifié"
 
-#: js/files.js:731
+#: js/files.js:754
 msgid "folder"
 msgstr "dossier"
 
-#: js/files.js:733
+#: js/files.js:756
 msgid "folders"
 msgstr "dossiers"
 
-#: js/files.js:741
+#: js/files.js:764
 msgid "file"
 msgstr "fichier"
 
-#: js/files.js:743
+#: js/files.js:766
 msgid "files"
 msgstr "fichiers"
 
@@ -187,7 +193,7 @@ msgstr "Envoyer"
 
 #: templates/index.php:27
 msgid "Cancel upload"
-msgstr "Annuler envoi"
+msgstr "Annuler l'envoi"
 
 #: templates/index.php:39
 msgid "Nothing in here. Upload something!"
@@ -217,7 +223,7 @@ msgstr "Les fichiers que vous essayez d'envoyer dépassent la taille maximale pe
 
 #: templates/index.php:71
 msgid "Files are being scanned, please wait."
-msgstr "Les fichiers sont analysés, patientez svp."
+msgstr "Les fichiers sont en cours d'analyse, veuillez patienter."
 
 #: templates/index.php:74
 msgid "Current scanning"
diff --git a/l10n/fr/files_sharing.po b/l10n/fr/files_sharing.po
index e32eca0609..d107f29619 100644
--- a/l10n/fr/files_sharing.po
+++ b/l10n/fr/files_sharing.po
@@ -4,14 +4,15 @@
 # 
 # Translators:
 #   <gp4004@arghh.org>, 2012.
+# Guillaume Paumier <guillom.pom@gmail.com>, 2012.
 # Romain DEP. <rom1dep@gmail.com>, 2012.
 #   <windes@tructor.net>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:03+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -28,10 +29,14 @@ msgstr "Mot de passe"
 msgid "Submit"
 msgstr "Envoyer"
 
-#: templates/public.php:9
+#: templates/public.php:9 templates/public.php:19
 msgid "Download"
+msgstr "Télécharger"
+
+#: templates/public.php:18
+msgid "No preview available for"
 msgstr ""
 
-#: templates/public.php:17
+#: templates/public.php:23
 msgid "web services under your control"
-msgstr ""
+msgstr "services web sous votre contrôle"
diff --git a/l10n/fr/settings.po b/l10n/fr/settings.po
index b4f394d021..2fbf6fe41c 100644
--- a/l10n/fr/settings.po
+++ b/l10n/fr/settings.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-08-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:03+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
diff --git a/l10n/gl/core.po b/l10n/gl/core.po
index 631545f49a..4dd5e3d6f2 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-08-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:02+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -35,55 +35,55 @@ msgstr "Esta categoría xa 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:201 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:206 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr "Preferencias"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "January"
 msgstr "Xaneiro"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "February"
 msgstr "Febreiro"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "March"
 msgstr "Marzo"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "April"
 msgstr "Abril"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "May"
 msgstr "Maio"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "June"
 msgstr "Xuño"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "July"
 msgstr "Xullo"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "August"
 msgstr "Agosto"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "September"
 msgstr "Setembro"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "October"
 msgstr "Outubro"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "November"
 msgstr "Novembro"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "December"
 msgstr "Nadal"
 
@@ -245,7 +245,7 @@ msgstr "Rematar configuración"
 msgid "web services under your control"
 msgstr "servizos web baixo o seu control"
 
-#: templates/layout.user.php:49
+#: templates/layout.user.php:45
 msgid "Log out"
 msgstr "Desconectar"
 
diff --git a/l10n/gl/files.po b/l10n/gl/files.po
index 6725283e33..d42c63821b 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-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -53,7 +53,7 @@ msgstr "Erro ao escribir no disco"
 msgid "Files"
 msgstr "Ficheiros"
 
-#: js/fileactions.js:107 templates/index.php:56
+#: js/fileactions.js:106 templates/index.php:56
 msgid "Delete"
 msgstr "Eliminar"
 
@@ -85,51 +85,56 @@ msgstr "desfacer"
 msgid "deleted"
 msgstr "eliminado"
 
-#: js/files.js:171
+#: js/files.js:179
 msgid "generating ZIP-file, it may take some time."
 msgstr "xerando ficheiro ZIP, pode levar un anaco."
 
-#: js/files.js:200
+#: js/files.js:208
 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:200
+#: js/files.js:208
 msgid "Upload Error"
 msgstr "Erro na subida"
 
-#: js/files.js:228 js/files.js:319 js/files.js:348
+#: js/files.js:236 js/files.js:327 js/files.js:356
 msgid "Pending"
 msgstr "Pendentes"
 
-#: js/files.js:333
+#: js/files.js:341
 msgid "Upload cancelled."
 msgstr "Subida cancelada."
 
-#: js/files.js:457
+#: js/files.js:409
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr ""
+
+#: js/files.js:480
 msgid "Invalid name, '/' is not allowed."
 msgstr "Nome non válido, '/' non está permitido."
 
-#: js/files.js:703 templates/index.php:55
+#: js/files.js:726 templates/index.php:55
 msgid "Size"
 msgstr "Tamaño"
 
-#: js/files.js:704 templates/index.php:56
+#: js/files.js:727 templates/index.php:56
 msgid "Modified"
 msgstr "Modificado"
 
-#: js/files.js:731
+#: js/files.js:754
 msgid "folder"
 msgstr "cartafol"
 
-#: js/files.js:733
+#: js/files.js:756
 msgid "folders"
 msgstr "cartafoles"
 
-#: js/files.js:741
+#: js/files.js:764
 msgid "file"
 msgstr "ficheiro"
 
-#: js/files.js:743
+#: js/files.js:766
 msgid "files"
 msgstr "ficheiros"
 
diff --git a/l10n/gl/files_sharing.po b/l10n/gl/files_sharing.po
index 9199ce9fce..88ab158776 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-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:03+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -25,10 +25,14 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
-#: templates/public.php:9
+#: templates/public.php:9 templates/public.php:19
 msgid "Download"
 msgstr ""
 
-#: templates/public.php:17
+#: templates/public.php:18
+msgid "No preview available for"
+msgstr ""
+
+#: templates/public.php:23
 msgid "web services under your control"
 msgstr ""
diff --git a/l10n/gl/settings.po b/l10n/gl/settings.po
index 7293a34100..cd8e1f47a9 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-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:03+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
diff --git a/l10n/he/core.po b/l10n/he/core.po
index 0105184ff9..e061910f3c 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-08-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:02+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -36,55 +36,55 @@ msgstr "קטגוריה זאת כבר קיימת: "
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr ""
 
-#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:206 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr "הגדרות"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "January"
 msgstr "ינואר"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "February"
 msgstr "פברואר"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "March"
 msgstr "מרץ"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "April"
 msgstr "אפריל"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "May"
 msgstr "מאי"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "June"
 msgstr "יוני"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "July"
 msgstr "יולי"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "August"
 msgstr "אוגוסט"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "September"
 msgstr "ספטמבר"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "October"
 msgstr "אוקטובר"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "November"
 msgstr "נובמבר"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "December"
 msgstr "דצמבר"
 
@@ -246,7 +246,7 @@ msgstr "סיום התקנה"
 msgid "web services under your control"
 msgstr "שירותי רשת בשליטתך"
 
-#: templates/layout.user.php:49
+#: templates/layout.user.php:45
 msgid "Log out"
 msgstr "התנתקות"
 
diff --git a/l10n/he/files.po b/l10n/he/files.po
index ae9614b348..2d4d668d0c 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-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -54,7 +54,7 @@ msgstr "הכתיבה לכונן נכשלה"
 msgid "Files"
 msgstr "קבצים"
 
-#: js/fileactions.js:107 templates/index.php:56
+#: js/fileactions.js:106 templates/index.php:56
 msgid "Delete"
 msgstr "מחיקה"
 
@@ -86,51 +86,56 @@ msgstr ""
 msgid "deleted"
 msgstr ""
 
-#: js/files.js:171
+#: js/files.js:179
 msgid "generating ZIP-file, it may take some time."
 msgstr "יוצר קובץ ZIP, אנא המתן."
 
-#: js/files.js:200
+#: js/files.js:208
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "לא יכול להעלות את הקובץ מכיוון שזו תקיה או שמשקל הקובץ 0 בתים"
 
-#: js/files.js:200
+#: js/files.js:208
 msgid "Upload Error"
 msgstr "שגיאת העלאה"
 
-#: js/files.js:228 js/files.js:319 js/files.js:348
+#: js/files.js:236 js/files.js:327 js/files.js:356
 msgid "Pending"
 msgstr "ממתין"
 
-#: js/files.js:333
+#: js/files.js:341
 msgid "Upload cancelled."
 msgstr "ההעלאה בוטלה."
 
-#: js/files.js:457
+#: js/files.js:409
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr ""
+
+#: js/files.js:480
 msgid "Invalid name, '/' is not allowed."
 msgstr "שם לא חוקי, '/' אסור לשימוש."
 
-#: js/files.js:703 templates/index.php:55
+#: js/files.js:726 templates/index.php:55
 msgid "Size"
 msgstr "גודל"
 
-#: js/files.js:704 templates/index.php:56
+#: js/files.js:727 templates/index.php:56
 msgid "Modified"
 msgstr "זמן שינוי"
 
-#: js/files.js:731
+#: js/files.js:754
 msgid "folder"
 msgstr "תקיה"
 
-#: js/files.js:733
+#: js/files.js:756
 msgid "folders"
 msgstr "תקיות"
 
-#: js/files.js:741
+#: js/files.js:764
 msgid "file"
 msgstr "קובץ"
 
-#: js/files.js:743
+#: js/files.js:766
 msgid "files"
 msgstr "קבצים"
 
diff --git a/l10n/he/files_sharing.po b/l10n/he/files_sharing.po
index 41a33dd718..e9ce7816e2 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-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:03+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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,10 +25,14 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
-#: templates/public.php:9
+#: templates/public.php:9 templates/public.php:19
 msgid "Download"
 msgstr ""
 
-#: templates/public.php:17
+#: templates/public.php:18
+msgid "No preview available for"
+msgstr ""
+
+#: templates/public.php:23
 msgid "web services under your control"
 msgstr ""
diff --git a/l10n/he/settings.po b/l10n/he/settings.po
index 05c51e93cd..faaab3bd66 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-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:03+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
diff --git a/l10n/hi/core.po b/l10n/hi/core.po
index 29b8d2fc46..ab39ae0190 100644
--- a/l10n/hi/core.po
+++ b/l10n/hi/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-08-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:02+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
 "MIME-Version: 1.0\n"
@@ -34,55 +34,55 @@ msgstr ""
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr ""
 
-#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:206 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "January"
 msgstr ""
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "February"
 msgstr ""
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "March"
 msgstr ""
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "April"
 msgstr ""
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "May"
 msgstr ""
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "June"
 msgstr ""
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "July"
 msgstr ""
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "August"
 msgstr ""
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "September"
 msgstr ""
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "October"
 msgstr ""
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "November"
 msgstr ""
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "December"
 msgstr ""
 
@@ -244,7 +244,7 @@ msgstr "सेटअप समाप्त करे"
 msgid "web services under your control"
 msgstr ""
 
-#: templates/layout.user.php:49
+#: templates/layout.user.php:45
 msgid "Log out"
 msgstr ""
 
diff --git a/l10n/hi/files.po b/l10n/hi/files.po
index cc9a7bb222..8270c796eb 100644
--- a/l10n/hi/files.po
+++ b/l10n/hi/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-29 02:01+0200\n"
-"PO-Revision-Date: 2011-08-13 02:19+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -51,7 +51,7 @@ msgstr ""
 msgid "Files"
 msgstr ""
 
-#: js/fileactions.js:111 templates/index.php:56
+#: js/fileactions.js:106 templates/index.php:56
 msgid "Delete"
 msgstr ""
 
@@ -83,51 +83,56 @@ msgstr ""
 msgid "deleted"
 msgstr ""
 
-#: js/files.js:171
+#: js/files.js:179
 msgid "generating ZIP-file, it may take some time."
 msgstr ""
 
-#: js/files.js:200
+#: js/files.js:208
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:200
+#: js/files.js:208
 msgid "Upload Error"
 msgstr ""
 
-#: js/files.js:228 js/files.js:319 js/files.js:348
+#: js/files.js:236 js/files.js:327 js/files.js:356
 msgid "Pending"
 msgstr ""
 
-#: js/files.js:333
+#: js/files.js:341
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:457
+#: js/files.js:409
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr ""
+
+#: js/files.js:480
 msgid "Invalid name, '/' is not allowed."
 msgstr ""
 
-#: js/files.js:703 templates/index.php:55
+#: js/files.js:726 templates/index.php:55
 msgid "Size"
 msgstr ""
 
-#: js/files.js:704 templates/index.php:56
+#: js/files.js:727 templates/index.php:56
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:731
+#: js/files.js:754
 msgid "folder"
 msgstr ""
 
-#: js/files.js:733
+#: js/files.js:756
 msgid "folders"
 msgstr ""
 
-#: js/files.js:741
+#: js/files.js:764
 msgid "file"
 msgstr ""
 
-#: js/files.js:743
+#: js/files.js:766
 msgid "files"
 msgstr ""
 
diff --git a/l10n/hi/files_sharing.po b/l10n/hi/files_sharing.po
index 2f6374a64e..2c1a5c6945 100644
--- a/l10n/hi/files_sharing.po
+++ b/l10n/hi/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-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:03+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
 "MIME-Version: 1.0\n"
@@ -25,10 +25,14 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
-#: templates/public.php:9
+#: templates/public.php:9 templates/public.php:19
 msgid "Download"
 msgstr ""
 
-#: templates/public.php:17
+#: templates/public.php:18
+msgid "No preview available for"
+msgstr ""
+
+#: templates/public.php:23
 msgid "web services under your control"
 msgstr ""
diff --git a/l10n/hi/settings.po b/l10n/hi/settings.po
index d1cc5c5331..967800015d 100644
--- a/l10n/hi/settings.po
+++ b/l10n/hi/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-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:03+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/hr/core.po b/l10n/hr/core.po
index a22b7bed24..6e8a498243 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-08-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:02+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -36,55 +36,55 @@ msgstr "Ova kategorija već postoji: "
 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:201 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:206 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr "Postavke"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "January"
 msgstr "Siječanj"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "February"
 msgstr "Veljača"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "March"
 msgstr "Ožujak"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "April"
 msgstr "Travanj"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "May"
 msgstr "Svibanj"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "June"
 msgstr "Lipanj"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "July"
 msgstr "Srpanj"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "August"
 msgstr "Kolovoz"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "September"
 msgstr "Rujan"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "October"
 msgstr "Listopad"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "November"
 msgstr "Studeni"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "December"
 msgstr "Prosinac"
 
@@ -246,7 +246,7 @@ msgstr "Završi postavljanje"
 msgid "web services under your control"
 msgstr "web usluge pod vašom kontrolom"
 
-#: templates/layout.user.php:49
+#: templates/layout.user.php:45
 msgid "Log out"
 msgstr "Odjava"
 
diff --git a/l10n/hr/files.po b/l10n/hr/files.po
index b68ac016d9..f6640c03c3 100644
--- a/l10n/hr/files.po
+++ b/l10n/hr/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-28 02:01+0200\n"
-"PO-Revision-Date: 2012-08-27 13:17+0000\n"
-"Last-Translator: fposavec <franz@franz-net.info>\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -54,7 +54,7 @@ msgstr "Neuspjelo pisanje na disk"
 msgid "Files"
 msgstr "Datoteke"
 
-#: js/fileactions.js:111 templates/index.php:56
+#: js/fileactions.js:106 templates/index.php:56
 msgid "Delete"
 msgstr "Briši"
 
@@ -86,51 +86,56 @@ msgstr "vrati"
 msgid "deleted"
 msgstr "izbrisano"
 
-#: js/files.js:171
+#: js/files.js:179
 msgid "generating ZIP-file, it may take some time."
 msgstr "generiranje ZIP datoteke, ovo može potrajati."
 
-#: js/files.js:200
+#: js/files.js:208
 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:200
+#: js/files.js:208
 msgid "Upload Error"
 msgstr "Pogreška pri slanju"
 
-#: js/files.js:228 js/files.js:319 js/files.js:348
+#: js/files.js:236 js/files.js:327 js/files.js:356
 msgid "Pending"
 msgstr "U tijeku"
 
-#: js/files.js:333
+#: js/files.js:341
 msgid "Upload cancelled."
 msgstr "Slanje poništeno."
 
-#: js/files.js:457
+#: js/files.js:409
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr ""
+
+#: js/files.js:480
 msgid "Invalid name, '/' is not allowed."
 msgstr "Neispravan naziv, znak '/' nije dozvoljen."
 
-#: js/files.js:703 templates/index.php:55
+#: js/files.js:726 templates/index.php:55
 msgid "Size"
 msgstr "Veličina"
 
-#: js/files.js:704 templates/index.php:56
+#: js/files.js:727 templates/index.php:56
 msgid "Modified"
 msgstr "Zadnja promjena"
 
-#: js/files.js:731
+#: js/files.js:754
 msgid "folder"
 msgstr "mapa"
 
-#: js/files.js:733
+#: js/files.js:756
 msgid "folders"
 msgstr "mape"
 
-#: js/files.js:741
+#: js/files.js:764
 msgid "file"
 msgstr "datoteka"
 
-#: js/files.js:743
+#: js/files.js:766
 msgid "files"
 msgstr "datoteke"
 
diff --git a/l10n/hr/files_sharing.po b/l10n/hr/files_sharing.po
index 1099b2e318..d104bf184a 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-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:03+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -25,10 +25,14 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
-#: templates/public.php:9
+#: templates/public.php:9 templates/public.php:19
 msgid "Download"
 msgstr ""
 
-#: templates/public.php:17
+#: templates/public.php:18
+msgid "No preview available for"
+msgstr ""
+
+#: templates/public.php:23
 msgid "web services under your control"
 msgstr ""
diff --git a/l10n/hr/settings.po b/l10n/hr/settings.po
index eee022adbb..5a912d160e 100644
--- a/l10n/hr/settings.po
+++ b/l10n/hr/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-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:03+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
diff --git a/l10n/hu_HU/core.po b/l10n/hu_HU/core.po
index 6733c3609c..3e89b7e6af 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-08-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:02+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -36,55 +36,55 @@ msgstr "Ez a kategória már létezik"
 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:201 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:206 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr "Beállítások"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "January"
 msgstr "Január"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "February"
 msgstr "Február"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "March"
 msgstr "Március"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "April"
 msgstr "Április"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "May"
 msgstr "Május"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "June"
 msgstr "Június"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "July"
 msgstr "Július"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "August"
 msgstr "Augusztus"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "September"
 msgstr "Szeptember"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "October"
 msgstr "Október"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "November"
 msgstr "November"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "December"
 msgstr "December"
 
@@ -246,7 +246,7 @@ msgstr "Beállítás befejezése"
 msgid "web services under your control"
 msgstr "webszolgáltatások az irányításod alatt"
 
-#: templates/layout.user.php:49
+#: templates/layout.user.php:45
 msgid "Log out"
 msgstr "Kilépés"
 
diff --git a/l10n/hu_HU/files.po b/l10n/hu_HU/files.po
index 7ad223a345..4a97620ae7 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-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -54,7 +54,7 @@ msgstr "Nem írható lemezre"
 msgid "Files"
 msgstr "Fájlok"
 
-#: js/fileactions.js:107 templates/index.php:56
+#: js/fileactions.js:106 templates/index.php:56
 msgid "Delete"
 msgstr "Törlés"
 
@@ -86,51 +86,56 @@ msgstr "visszavon"
 msgid "deleted"
 msgstr "törölve"
 
-#: js/files.js:171
+#: js/files.js:179
 msgid "generating ZIP-file, it may take some time."
 msgstr "ZIP-fájl generálása, ez eltarthat egy ideig."
 
-#: js/files.js:200
+#: js/files.js:208
 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:200
+#: js/files.js:208
 msgid "Upload Error"
 msgstr "Feltöltési hiba"
 
-#: js/files.js:228 js/files.js:319 js/files.js:348
+#: js/files.js:236 js/files.js:327 js/files.js:356
 msgid "Pending"
 msgstr "Folyamatban"
 
-#: js/files.js:333
+#: js/files.js:341
 msgid "Upload cancelled."
 msgstr "Feltöltés megszakítva"
 
-#: js/files.js:457
+#: js/files.js:409
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr ""
+
+#: js/files.js:480
 msgid "Invalid name, '/' is not allowed."
 msgstr "Érvénytelen név, a '/' nem megengedett"
 
-#: js/files.js:703 templates/index.php:55
+#: js/files.js:726 templates/index.php:55
 msgid "Size"
 msgstr "Méret"
 
-#: js/files.js:704 templates/index.php:56
+#: js/files.js:727 templates/index.php:56
 msgid "Modified"
 msgstr "Módosítva"
 
-#: js/files.js:731
+#: js/files.js:754
 msgid "folder"
 msgstr "mappa"
 
-#: js/files.js:733
+#: js/files.js:756
 msgid "folders"
 msgstr "mappák"
 
-#: js/files.js:741
+#: js/files.js:764
 msgid "file"
 msgstr "fájl"
 
-#: js/files.js:743
+#: js/files.js:766
 msgid "files"
 msgstr "fájlok"
 
diff --git a/l10n/hu_HU/files_sharing.po b/l10n/hu_HU/files_sharing.po
index cd65a560fa..11d84d4a40 100644
--- a/l10n/hu_HU/files_sharing.po
+++ b/l10n/hu_HU/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-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:03+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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,10 +26,14 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
-#: templates/public.php:9
+#: templates/public.php:9 templates/public.php:19
 msgid "Download"
 msgstr ""
 
-#: templates/public.php:17
+#: templates/public.php:18
+msgid "No preview available for"
+msgstr ""
+
+#: templates/public.php:23
 msgid "web services under your control"
 msgstr ""
diff --git a/l10n/hu_HU/settings.po b/l10n/hu_HU/settings.po
index 5ad68e3b2a..3c7c74c977 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-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:03+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
diff --git a/l10n/hy/core.po b/l10n/hy/core.po
index 6390ad2db3..046e483ecc 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-08-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:02+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -33,55 +33,55 @@ msgstr ""
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr ""
 
-#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:206 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "January"
 msgstr ""
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "February"
 msgstr ""
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "March"
 msgstr ""
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "April"
 msgstr ""
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "May"
 msgstr ""
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "June"
 msgstr ""
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "July"
 msgstr ""
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "August"
 msgstr ""
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "September"
 msgstr ""
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "October"
 msgstr ""
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "November"
 msgstr ""
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "December"
 msgstr ""
 
@@ -243,7 +243,7 @@ msgstr ""
 msgid "web services under your control"
 msgstr ""
 
-#: templates/layout.user.php:49
+#: templates/layout.user.php:45
 msgid "Log out"
 msgstr ""
 
diff --git a/l10n/hy/files.po b/l10n/hy/files.po
index 7d158306ff..1e64d6f49e 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-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -51,7 +51,7 @@ msgstr ""
 msgid "Files"
 msgstr ""
 
-#: js/fileactions.js:107 templates/index.php:56
+#: js/fileactions.js:106 templates/index.php:56
 msgid "Delete"
 msgstr ""
 
@@ -83,51 +83,56 @@ msgstr ""
 msgid "deleted"
 msgstr ""
 
-#: js/files.js:171
+#: js/files.js:179
 msgid "generating ZIP-file, it may take some time."
 msgstr ""
 
-#: js/files.js:200
+#: js/files.js:208
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:200
+#: js/files.js:208
 msgid "Upload Error"
 msgstr ""
 
-#: js/files.js:228 js/files.js:319 js/files.js:348
+#: js/files.js:236 js/files.js:327 js/files.js:356
 msgid "Pending"
 msgstr ""
 
-#: js/files.js:333
+#: js/files.js:341
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:457
+#: js/files.js:409
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr ""
+
+#: js/files.js:480
 msgid "Invalid name, '/' is not allowed."
 msgstr ""
 
-#: js/files.js:703 templates/index.php:55
+#: js/files.js:726 templates/index.php:55
 msgid "Size"
 msgstr ""
 
-#: js/files.js:704 templates/index.php:56
+#: js/files.js:727 templates/index.php:56
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:731
+#: js/files.js:754
 msgid "folder"
 msgstr ""
 
-#: js/files.js:733
+#: js/files.js:756
 msgid "folders"
 msgstr ""
 
-#: js/files.js:741
+#: js/files.js:764
 msgid "file"
 msgstr ""
 
-#: js/files.js:743
+#: js/files.js:766
 msgid "files"
 msgstr ""
 
diff --git a/l10n/hy/files_sharing.po b/l10n/hy/files_sharing.po
index df1e7e7843..b21d68c683 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-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:03+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -25,10 +25,14 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
-#: templates/public.php:9
+#: templates/public.php:9 templates/public.php:19
 msgid "Download"
 msgstr ""
 
-#: templates/public.php:17
+#: templates/public.php:18
+msgid "No preview available for"
+msgstr ""
+
+#: templates/public.php:23
 msgid "web services under your control"
 msgstr ""
diff --git a/l10n/hy/settings.po b/l10n/hy/settings.po
index 8b3d317ad3..2ec80355b8 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-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:03+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
diff --git a/l10n/ia/core.po b/l10n/ia/core.po
index 74933c011b..cc9ee26ccc 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-08-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:02+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -34,55 +34,55 @@ msgstr "Iste categoria jam existe:"
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr ""
 
-#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:206 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr "Configurationes"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "January"
 msgstr ""
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "February"
 msgstr ""
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "March"
 msgstr ""
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "April"
 msgstr ""
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "May"
 msgstr ""
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "June"
 msgstr ""
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "July"
 msgstr ""
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "August"
 msgstr ""
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "September"
 msgstr ""
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "October"
 msgstr ""
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "November"
 msgstr ""
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "December"
 msgstr ""
 
@@ -244,7 +244,7 @@ msgstr ""
 msgid "web services under your control"
 msgstr "servicios web sub tu controlo"
 
-#: templates/layout.user.php:49
+#: templates/layout.user.php:45
 msgid "Log out"
 msgstr "Clauder le session"
 
diff --git a/l10n/ia/files.po b/l10n/ia/files.po
index 64f2fc617a..66430afef4 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-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -53,7 +53,7 @@ msgstr ""
 msgid "Files"
 msgstr "Files"
 
-#: js/fileactions.js:107 templates/index.php:56
+#: js/fileactions.js:106 templates/index.php:56
 msgid "Delete"
 msgstr "Deler"
 
@@ -85,51 +85,56 @@ msgstr ""
 msgid "deleted"
 msgstr ""
 
-#: js/files.js:171
+#: js/files.js:179
 msgid "generating ZIP-file, it may take some time."
 msgstr ""
 
-#: js/files.js:200
+#: js/files.js:208
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:200
+#: js/files.js:208
 msgid "Upload Error"
 msgstr ""
 
-#: js/files.js:228 js/files.js:319 js/files.js:348
+#: js/files.js:236 js/files.js:327 js/files.js:356
 msgid "Pending"
 msgstr ""
 
-#: js/files.js:333
+#: js/files.js:341
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:457
+#: js/files.js:409
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr ""
+
+#: js/files.js:480
 msgid "Invalid name, '/' is not allowed."
 msgstr ""
 
-#: js/files.js:703 templates/index.php:55
+#: js/files.js:726 templates/index.php:55
 msgid "Size"
 msgstr "Dimension"
 
-#: js/files.js:704 templates/index.php:56
+#: js/files.js:727 templates/index.php:56
 msgid "Modified"
 msgstr "Modificate"
 
-#: js/files.js:731
+#: js/files.js:754
 msgid "folder"
 msgstr ""
 
-#: js/files.js:733
+#: js/files.js:756
 msgid "folders"
 msgstr ""
 
-#: js/files.js:741
+#: js/files.js:764
 msgid "file"
 msgstr ""
 
-#: js/files.js:743
+#: js/files.js:766
 msgid "files"
 msgstr ""
 
diff --git a/l10n/ia/files_sharing.po b/l10n/ia/files_sharing.po
index 57ec736fa1..2c01e0d398 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-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:03+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -25,10 +25,14 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
-#: templates/public.php:9
+#: templates/public.php:9 templates/public.php:19
 msgid "Download"
 msgstr ""
 
-#: templates/public.php:17
+#: templates/public.php:18
+msgid "No preview available for"
+msgstr ""
+
+#: templates/public.php:23
 msgid "web services under your control"
 msgstr ""
diff --git a/l10n/ia/settings.po b/l10n/ia/settings.po
index 3141c71864..f280838090 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-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:03+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
diff --git a/l10n/id/core.po b/l10n/id/core.po
index 9beb54523a..1b1676d042 100644
--- a/l10n/id/core.po
+++ b/l10n/id/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-08-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:02+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -36,55 +36,55 @@ msgstr "Kategori ini sudah ada:"
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr ""
 
-#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:206 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr "Setelan"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "January"
 msgstr "Januari"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "February"
 msgstr "Februari"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "March"
 msgstr "Maret"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "April"
 msgstr "April"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "May"
 msgstr "Mei"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "June"
 msgstr "Juni"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "July"
 msgstr "Juli"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "August"
 msgstr "Agustus"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "September"
 msgstr "September"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "October"
 msgstr "Oktober"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "November"
 msgstr "Nopember"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "December"
 msgstr "Desember"
 
@@ -246,7 +246,7 @@ msgstr "Selesaikan instalasi"
 msgid "web services under your control"
 msgstr "web service dibawah kontrol anda"
 
-#: templates/layout.user.php:49
+#: templates/layout.user.php:45
 msgid "Log out"
 msgstr "Keluar"
 
diff --git a/l10n/id/files.po b/l10n/id/files.po
index 4531640248..53122c53b6 100644
--- a/l10n/id/files.po
+++ b/l10n/id/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-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-28 12:13+0000\n"
-"Last-Translator: Muhammad Fauzan <yosanpro@gmail.com>\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -54,7 +54,7 @@ msgstr "Gagal menulis ke disk"
 msgid "Files"
 msgstr "Berkas"
 
-#: js/fileactions.js:111 templates/index.php:56
+#: js/fileactions.js:106 templates/index.php:56
 msgid "Delete"
 msgstr "Hapus"
 
@@ -86,51 +86,56 @@ msgstr "batal dikerjakan"
 msgid "deleted"
 msgstr "dihapus"
 
-#: js/files.js:171
+#: js/files.js:179
 msgid "generating ZIP-file, it may take some time."
 msgstr "membuat berkas ZIP, ini mungkin memakan waktu."
 
-#: js/files.js:200
+#: js/files.js:208
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "Gagal mengunggah berkas anda karena berupa direktori atau mempunyai ukuran 0 byte"
 
-#: js/files.js:200
+#: js/files.js:208
 msgid "Upload Error"
 msgstr "Terjadi Galat Pengunggahan"
 
-#: js/files.js:228 js/files.js:319 js/files.js:348
+#: js/files.js:236 js/files.js:327 js/files.js:356
 msgid "Pending"
 msgstr "Menunggu"
 
-#: js/files.js:333
+#: js/files.js:341
 msgid "Upload cancelled."
 msgstr "Pengunggahan dibatalkan."
 
-#: js/files.js:457
+#: js/files.js:409
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr ""
+
+#: js/files.js:480
 msgid "Invalid name, '/' is not allowed."
 msgstr "Kesalahan nama, '/' tidak diijinkan."
 
-#: js/files.js:703 templates/index.php:55
+#: js/files.js:726 templates/index.php:55
 msgid "Size"
 msgstr "Ukuran"
 
-#: js/files.js:704 templates/index.php:56
+#: js/files.js:727 templates/index.php:56
 msgid "Modified"
 msgstr "Dimodifikasi"
 
-#: js/files.js:731
+#: js/files.js:754
 msgid "folder"
 msgstr "folder"
 
-#: js/files.js:733
+#: js/files.js:756
 msgid "folders"
 msgstr "folder-folder"
 
-#: js/files.js:741
+#: js/files.js:764
 msgid "file"
 msgstr "berkas"
 
-#: js/files.js:743
+#: js/files.js:766
 msgid "files"
 msgstr "berkas-berkas"
 
diff --git a/l10n/id/files_sharing.po b/l10n/id/files_sharing.po
index 5b743101fc..e2be0ffdea 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-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:03+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -25,10 +25,14 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
-#: templates/public.php:9
+#: templates/public.php:9 templates/public.php:19
 msgid "Download"
 msgstr ""
 
-#: templates/public.php:17
+#: templates/public.php:18
+msgid "No preview available for"
+msgstr ""
+
+#: templates/public.php:23
 msgid "web services under your control"
 msgstr ""
diff --git a/l10n/id/settings.po b/l10n/id/settings.po
index c14d28320d..0f56ddfbc0 100644
--- a/l10n/id/settings.po
+++ b/l10n/id/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-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:03+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
diff --git a/l10n/id_ID/core.po b/l10n/id_ID/core.po
index db0c2d649f..7227d27665 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-08-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:02+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -33,55 +33,55 @@ msgstr ""
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr ""
 
-#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:206 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "January"
 msgstr ""
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "February"
 msgstr ""
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "March"
 msgstr ""
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "April"
 msgstr ""
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "May"
 msgstr ""
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "June"
 msgstr ""
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "July"
 msgstr ""
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "August"
 msgstr ""
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "September"
 msgstr ""
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "October"
 msgstr ""
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "November"
 msgstr ""
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "December"
 msgstr ""
 
@@ -243,7 +243,7 @@ msgstr ""
 msgid "web services under your control"
 msgstr ""
 
-#: templates/layout.user.php:49
+#: templates/layout.user.php:45
 msgid "Log out"
 msgstr ""
 
diff --git a/l10n/id_ID/files.po b/l10n/id_ID/files.po
index 4e35fb7c4e..cbc59367cd 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-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -51,7 +51,7 @@ msgstr ""
 msgid "Files"
 msgstr ""
 
-#: js/fileactions.js:107 templates/index.php:56
+#: js/fileactions.js:106 templates/index.php:56
 msgid "Delete"
 msgstr ""
 
@@ -83,51 +83,56 @@ msgstr ""
 msgid "deleted"
 msgstr ""
 
-#: js/files.js:171
+#: js/files.js:179
 msgid "generating ZIP-file, it may take some time."
 msgstr ""
 
-#: js/files.js:200
+#: js/files.js:208
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:200
+#: js/files.js:208
 msgid "Upload Error"
 msgstr ""
 
-#: js/files.js:228 js/files.js:319 js/files.js:348
+#: js/files.js:236 js/files.js:327 js/files.js:356
 msgid "Pending"
 msgstr ""
 
-#: js/files.js:333
+#: js/files.js:341
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:457
+#: js/files.js:409
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr ""
+
+#: js/files.js:480
 msgid "Invalid name, '/' is not allowed."
 msgstr ""
 
-#: js/files.js:703 templates/index.php:55
+#: js/files.js:726 templates/index.php:55
 msgid "Size"
 msgstr ""
 
-#: js/files.js:704 templates/index.php:56
+#: js/files.js:727 templates/index.php:56
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:731
+#: js/files.js:754
 msgid "folder"
 msgstr ""
 
-#: js/files.js:733
+#: js/files.js:756
 msgid "folders"
 msgstr ""
 
-#: js/files.js:741
+#: js/files.js:764
 msgid "file"
 msgstr ""
 
-#: js/files.js:743
+#: js/files.js:766
 msgid "files"
 msgstr ""
 
diff --git a/l10n/id_ID/files_sharing.po b/l10n/id_ID/files_sharing.po
index ae54f19e79..c3989d2207 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-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:03+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -25,10 +25,14 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
-#: templates/public.php:9
+#: templates/public.php:9 templates/public.php:19
 msgid "Download"
 msgstr ""
 
-#: templates/public.php:17
+#: templates/public.php:18
+msgid "No preview available for"
+msgstr ""
+
+#: templates/public.php:23
 msgid "web services under your control"
 msgstr ""
diff --git a/l10n/id_ID/settings.po b/l10n/id_ID/settings.po
index 8bc13f3666..f396f6be32 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-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:03+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
diff --git a/l10n/it/core.po b/l10n/it/core.po
index 2f84a26587..da546df81f 100644
--- a/l10n/it/core.po
+++ b/l10n/it/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-08-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:02+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -38,55 +38,55 @@ msgstr "Questa categoria esiste già: "
 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:201 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:206 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr "Impostazioni"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "January"
 msgstr "Gennaio"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "February"
 msgstr "Febbraio"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "March"
 msgstr "Marzo"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "April"
 msgstr "Aprile"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "May"
 msgstr "Maggio"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "June"
 msgstr "Giugno"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "July"
 msgstr "Luglio"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "August"
 msgstr "Agosto"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "September"
 msgstr "Settembre"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "October"
 msgstr "Ottobre"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "November"
 msgstr "Novembre"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "December"
 msgstr "Dicembre"
 
@@ -248,7 +248,7 @@ msgstr "Termina la configurazione"
 msgid "web services under your control"
 msgstr "servizi web nelle tue mani"
 
-#: templates/layout.user.php:49
+#: templates/layout.user.php:45
 msgid "Log out"
 msgstr "Esci"
 
diff --git a/l10n/it/files.po b/l10n/it/files.po
index 664d569fd4..b4df0c65ff 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-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -55,7 +55,7 @@ msgstr "Scrittura su disco non riuscita"
 msgid "Files"
 msgstr "File"
 
-#: js/fileactions.js:107 templates/index.php:56
+#: js/fileactions.js:106 templates/index.php:56
 msgid "Delete"
 msgstr "Elimina"
 
@@ -87,51 +87,56 @@ msgstr "annulla"
 msgid "deleted"
 msgstr "eliminati"
 
-#: js/files.js:171
+#: js/files.js:179
 msgid "generating ZIP-file, it may take some time."
 msgstr "creazione file ZIP, potrebbe richiedere del tempo."
 
-#: js/files.js:200
+#: js/files.js:208
 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:200
+#: js/files.js:208
 msgid "Upload Error"
 msgstr "Errore di invio"
 
-#: js/files.js:228 js/files.js:319 js/files.js:348
+#: js/files.js:236 js/files.js:327 js/files.js:356
 msgid "Pending"
 msgstr "In corso"
 
-#: js/files.js:333
+#: js/files.js:341
 msgid "Upload cancelled."
 msgstr "Invio annullato"
 
-#: js/files.js:457
+#: js/files.js:409
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr ""
+
+#: js/files.js:480
 msgid "Invalid name, '/' is not allowed."
 msgstr "Nome non valido"
 
-#: js/files.js:703 templates/index.php:55
+#: js/files.js:726 templates/index.php:55
 msgid "Size"
 msgstr "Dimensione"
 
-#: js/files.js:704 templates/index.php:56
+#: js/files.js:727 templates/index.php:56
 msgid "Modified"
 msgstr "Modificato"
 
-#: js/files.js:731
+#: js/files.js:754
 msgid "folder"
 msgstr "cartella"
 
-#: js/files.js:733
+#: js/files.js:756
 msgid "folders"
 msgstr "cartelle"
 
-#: js/files.js:741
+#: js/files.js:764
 msgid "file"
 msgstr "file"
 
-#: js/files.js:743
+#: js/files.js:766
 msgid "files"
 msgstr "file"
 
diff --git a/l10n/it/files_sharing.po b/l10n/it/files_sharing.po
index e3ae1f3507..51aec56bcd 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-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:03+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -26,10 +26,14 @@ msgstr "Password"
 msgid "Submit"
 msgstr "Invia"
 
-#: templates/public.php:9
+#: templates/public.php:9 templates/public.php:19
 msgid "Download"
+msgstr "Scarica"
+
+#: templates/public.php:18
+msgid "No preview available for"
 msgstr ""
 
-#: templates/public.php:17
+#: templates/public.php:23
 msgid "web services under your control"
-msgstr ""
+msgstr "servizi web nelle tue mani"
diff --git a/l10n/it/settings.po b/l10n/it/settings.po
index bce95fc742..9d79ed9ad6 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-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:03+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
diff --git a/l10n/ja_JP/core.po b/l10n/ja_JP/core.po
index 09cad91e12..a15ecce195 100644
--- a/l10n/ja_JP/core.po
+++ b/l10n/ja_JP/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-08-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:02+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -35,55 +35,55 @@ msgstr "このカテゴリはすでに存在します: "
 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:201 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:206 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr "設定"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "January"
 msgstr "1月"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "February"
 msgstr "2月"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "March"
 msgstr "3月"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "April"
 msgstr "4月"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "May"
 msgstr "5月"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "June"
 msgstr "6月"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "July"
 msgstr "7月"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "August"
 msgstr "8月"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "September"
 msgstr "9月"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "October"
 msgstr "10月"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "November"
 msgstr "11月"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "December"
 msgstr "12月"
 
@@ -245,7 +245,7 @@ msgstr "セットアップを完了します"
 msgid "web services under your control"
 msgstr "管理下にあるウェブサービス"
 
-#: templates/layout.user.php:49
+#: templates/layout.user.php:45
 msgid "Log out"
 msgstr "ログアウト"
 
diff --git a/l10n/ja_JP/files.po b/l10n/ja_JP/files.po
index 97c519439b..a4c99fedcc 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-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -52,7 +52,7 @@ msgstr "ディスクへの書き込みに失敗しました"
 msgid "Files"
 msgstr "ファイル"
 
-#: js/fileactions.js:107 templates/index.php:56
+#: js/fileactions.js:106 templates/index.php:56
 msgid "Delete"
 msgstr "削除"
 
@@ -84,51 +84,56 @@ msgstr "元に戻す"
 msgid "deleted"
 msgstr "削除"
 
-#: js/files.js:171
+#: js/files.js:179
 msgid "generating ZIP-file, it may take some time."
 msgstr "ZIPファイルを生成中です、しばらくお待ちください。"
 
-#: js/files.js:200
+#: js/files.js:208
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "アップロード使用としているファイルがディレクトリ、もしくはサイズが0バイトのため、アップロードできません。"
 
-#: js/files.js:200
+#: js/files.js:208
 msgid "Upload Error"
 msgstr "アップロードエラー"
 
-#: js/files.js:228 js/files.js:319 js/files.js:348
+#: js/files.js:236 js/files.js:327 js/files.js:356
 msgid "Pending"
 msgstr "保留"
 
-#: js/files.js:333
+#: js/files.js:341
 msgid "Upload cancelled."
 msgstr "アップロードはキャンセルされました。"
 
-#: js/files.js:457
+#: js/files.js:409
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr ""
+
+#: js/files.js:480
 msgid "Invalid name, '/' is not allowed."
 msgstr "無効な名前、'/' は使用できません。"
 
-#: js/files.js:703 templates/index.php:55
+#: js/files.js:726 templates/index.php:55
 msgid "Size"
 msgstr "サイズ"
 
-#: js/files.js:704 templates/index.php:56
+#: js/files.js:727 templates/index.php:56
 msgid "Modified"
 msgstr "更新日時"
 
-#: js/files.js:731
+#: js/files.js:754
 msgid "folder"
 msgstr "フォルダ"
 
-#: js/files.js:733
+#: js/files.js:756
 msgid "folders"
 msgstr "フォルダ"
 
-#: js/files.js:741
+#: js/files.js:764
 msgid "file"
 msgstr "ファイル"
 
-#: js/files.js:743
+#: js/files.js:766
 msgid "files"
 msgstr "ファイル"
 
diff --git a/l10n/ja_JP/files_sharing.po b/l10n/ja_JP/files_sharing.po
index ee86734e55..c47c870dc7 100644
--- a/l10n/ja_JP/files_sharing.po
+++ b/l10n/ja_JP/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-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:03+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -27,10 +27,14 @@ msgstr "パスワード"
 msgid "Submit"
 msgstr "送信"
 
-#: templates/public.php:9
+#: templates/public.php:9 templates/public.php:19
 msgid "Download"
+msgstr "ダウンロード"
+
+#: templates/public.php:18
+msgid "No preview available for"
 msgstr ""
 
-#: templates/public.php:17
+#: templates/public.php:23
 msgid "web services under your control"
-msgstr ""
+msgstr "管理下のウェブサービス"
diff --git a/l10n/ja_JP/settings.po b/l10n/ja_JP/settings.po
index 895b04d059..e7b829db82 100644
--- a/l10n/ja_JP/settings.po
+++ b/l10n/ja_JP/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-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:03+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
diff --git a/l10n/ko/core.po b/l10n/ko/core.po
index 4a37e33347..d414be7753 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-08-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:02+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -35,55 +35,55 @@ msgstr "이 카테고리는 이미 존재합니다:"
 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:201 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:206 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr "설정"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "January"
 msgstr "1월"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "February"
 msgstr "2월"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "March"
 msgstr "3월"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "April"
 msgstr "4월"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "May"
 msgstr "5월"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "June"
 msgstr "6월"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "July"
 msgstr "7월"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "August"
 msgstr "8월"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "September"
 msgstr "9월"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "October"
 msgstr "10월"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "November"
 msgstr "11월"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "December"
 msgstr "12월"
 
@@ -245,7 +245,7 @@ msgstr "설치 완료"
 msgid "web services under your control"
 msgstr "내가 관리하는 웹 서비스"
 
-#: templates/layout.user.php:49
+#: templates/layout.user.php:45
 msgid "Log out"
 msgstr "로그아웃"
 
diff --git a/l10n/ko/files.po b/l10n/ko/files.po
index c92eee7df0..fa66c13988 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-08-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-29 18:40+0000\n"
-"Last-Translator: yunhye <limonade83@gmail.com>\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -53,7 +53,7 @@ msgstr "디스크에 쓰지 못했습니다"
 msgid "Files"
 msgstr "파일"
 
-#: js/fileactions.js:111 templates/index.php:56
+#: js/fileactions.js:106 templates/index.php:56
 msgid "Delete"
 msgstr "삭제"
 
@@ -85,51 +85,56 @@ msgstr "복구"
 msgid "deleted"
 msgstr "삭제"
 
-#: js/files.js:171
+#: js/files.js:179
 msgid "generating ZIP-file, it may take some time."
 msgstr "ZIP파일 생성에 시간이 걸릴 수 있습니다."
 
-#: js/files.js:200
+#: js/files.js:208
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "이 파일은 디렉토리이거나 0 바이트이기 때문에 업로드 할 수 없습니다."
 
-#: js/files.js:200
+#: js/files.js:208
 msgid "Upload Error"
 msgstr "업로드 에러"
 
-#: js/files.js:228 js/files.js:319 js/files.js:348
+#: js/files.js:236 js/files.js:327 js/files.js:356
 msgid "Pending"
 msgstr "보류 중"
 
-#: js/files.js:333
+#: js/files.js:341
 msgid "Upload cancelled."
 msgstr "업로드 취소."
 
-#: js/files.js:457
+#: js/files.js:409
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr ""
+
+#: js/files.js:480
 msgid "Invalid name, '/' is not allowed."
 msgstr "잘못된 이름, '/' 은 허용이 되지 않습니다."
 
-#: js/files.js:703 templates/index.php:55
+#: js/files.js:726 templates/index.php:55
 msgid "Size"
 msgstr "크기"
 
-#: js/files.js:704 templates/index.php:56
+#: js/files.js:727 templates/index.php:56
 msgid "Modified"
 msgstr "수정됨"
 
-#: js/files.js:731
+#: js/files.js:754
 msgid "folder"
 msgstr "폴더"
 
-#: js/files.js:733
+#: js/files.js:756
 msgid "folders"
 msgstr "폴더"
 
-#: js/files.js:741
+#: js/files.js:764
 msgid "file"
 msgstr "파일"
 
-#: js/files.js:743
+#: js/files.js:766
 msgid "files"
 msgstr "파일"
 
diff --git a/l10n/ko/files_sharing.po b/l10n/ko/files_sharing.po
index 109d725ee3..c02f8ffff5 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-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:03+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -25,10 +25,14 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
-#: templates/public.php:9
+#: templates/public.php:9 templates/public.php:19
 msgid "Download"
 msgstr ""
 
-#: templates/public.php:17
+#: templates/public.php:18
+msgid "No preview available for"
+msgstr ""
+
+#: templates/public.php:23
 msgid "web services under your control"
 msgstr ""
diff --git a/l10n/ko/settings.po b/l10n/ko/settings.po
index f6ceba7c7e..66e8cb31bf 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-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:03+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
diff --git a/l10n/lb/core.po b/l10n/lb/core.po
index 9052d2aefb..fbc1cddc1c 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-08-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:02+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -34,55 +34,55 @@ msgstr "Des Kategorie existéiert schonn:"
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr ""
 
-#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:206 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr "Astellungen"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "January"
 msgstr ""
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "February"
 msgstr ""
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "March"
 msgstr ""
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "April"
 msgstr ""
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "May"
 msgstr ""
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "June"
 msgstr ""
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "July"
 msgstr ""
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "August"
 msgstr ""
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "September"
 msgstr ""
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "October"
 msgstr ""
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "November"
 msgstr ""
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "December"
 msgstr ""
 
@@ -244,7 +244,7 @@ msgstr "Installatioun ofschléissen"
 msgid "web services under your control"
 msgstr "Web Servicer ënnert denger Kontroll"
 
-#: templates/layout.user.php:49
+#: templates/layout.user.php:45
 msgid "Log out"
 msgstr "Ausloggen"
 
diff --git a/l10n/lb/files.po b/l10n/lb/files.po
index c84f38bdc0..ae57349ec9 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-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -52,7 +52,7 @@ msgstr "Konnt net op den Disk schreiwen"
 msgid "Files"
 msgstr "Dateien"
 
-#: js/fileactions.js:107 templates/index.php:56
+#: js/fileactions.js:106 templates/index.php:56
 msgid "Delete"
 msgstr "Läschen"
 
@@ -84,51 +84,56 @@ msgstr ""
 msgid "deleted"
 msgstr ""
 
-#: js/files.js:171
+#: js/files.js:179
 msgid "generating ZIP-file, it may take some time."
 msgstr ""
 
-#: js/files.js:200
+#: js/files.js:208
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:200
+#: js/files.js:208
 msgid "Upload Error"
 msgstr ""
 
-#: js/files.js:228 js/files.js:319 js/files.js:348
+#: js/files.js:236 js/files.js:327 js/files.js:356
 msgid "Pending"
 msgstr ""
 
-#: js/files.js:333
+#: js/files.js:341
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:457
+#: js/files.js:409
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr ""
+
+#: js/files.js:480
 msgid "Invalid name, '/' is not allowed."
 msgstr ""
 
-#: js/files.js:703 templates/index.php:55
+#: js/files.js:726 templates/index.php:55
 msgid "Size"
 msgstr "Gréisst"
 
-#: js/files.js:704 templates/index.php:56
+#: js/files.js:727 templates/index.php:56
 msgid "Modified"
 msgstr "Geännert"
 
-#: js/files.js:731
+#: js/files.js:754
 msgid "folder"
 msgstr ""
 
-#: js/files.js:733
+#: js/files.js:756
 msgid "folders"
 msgstr ""
 
-#: js/files.js:741
+#: js/files.js:764
 msgid "file"
 msgstr ""
 
-#: js/files.js:743
+#: js/files.js:766
 msgid "files"
 msgstr ""
 
diff --git a/l10n/lb/files_sharing.po b/l10n/lb/files_sharing.po
index 60d19fed6d..83d2cf1bb5 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-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:03+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -25,10 +25,14 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
-#: templates/public.php:9
+#: templates/public.php:9 templates/public.php:19
 msgid "Download"
 msgstr ""
 
-#: templates/public.php:17
+#: templates/public.php:18
+msgid "No preview available for"
+msgstr ""
+
+#: templates/public.php:23
 msgid "web services under your control"
 msgstr ""
diff --git a/l10n/lb/settings.po b/l10n/lb/settings.po
index 2b4de82927..05eb7eea10 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-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:03+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
diff --git a/l10n/lt_LT/core.po b/l10n/lt_LT/core.po
index 5435b4a5b9..d2e08de437 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-08-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:02+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -34,55 +34,55 @@ msgstr "Tokia kategorija jau yra:"
 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:201 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:206 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr "Nustatymai"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "January"
 msgstr "Sausis"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "February"
 msgstr "Vasaris"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "March"
 msgstr "Kovas"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "April"
 msgstr "Balandis"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "May"
 msgstr "Gegužė"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "June"
 msgstr "Birželis"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "July"
 msgstr "Liepa"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "August"
 msgstr "Rugpjūtis"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "September"
 msgstr "Rugsėjis"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "October"
 msgstr "Spalis"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "November"
 msgstr "Lapkritis"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "December"
 msgstr "Gruodis"
 
@@ -244,7 +244,7 @@ msgstr "Baigti diegimą"
 msgid "web services under your control"
 msgstr "jūsų valdomos web paslaugos"
 
-#: templates/layout.user.php:49
+#: templates/layout.user.php:45
 msgid "Log out"
 msgstr "Atsijungti"
 
diff --git a/l10n/lt_LT/files.po b/l10n/lt_LT/files.po
index bae53dc5d6..940281d35e 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-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"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -53,7 +53,7 @@ msgstr "Nepavyko įrašyti į diską"
 msgid "Files"
 msgstr "Failai"
 
-#: js/fileactions.js:107 templates/index.php:56
+#: js/fileactions.js:106 templates/index.php:56
 msgid "Delete"
 msgstr "Ištrinti"
 
@@ -85,51 +85,56 @@ msgstr ""
 msgid "deleted"
 msgstr ""
 
-#: js/files.js:171
+#: js/files.js:179
 msgid "generating ZIP-file, it may take some time."
 msgstr "kuriamas ZIP archyvas, tai gali užtrukti šiek tiek laiko."
 
-#: js/files.js:200
+#: js/files.js:208
 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:200
+#: js/files.js:208
 msgid "Upload Error"
 msgstr "Įkėlimo klaida"
 
-#: js/files.js:228 js/files.js:319 js/files.js:348
+#: js/files.js:236 js/files.js:327 js/files.js:356
 msgid "Pending"
 msgstr "Laukiantis"
 
-#: js/files.js:333
+#: js/files.js:341
 msgid "Upload cancelled."
 msgstr "Įkėlimas atšauktas."
 
-#: js/files.js:457
+#: js/files.js:409
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr ""
+
+#: js/files.js:480
 msgid "Invalid name, '/' is not allowed."
 msgstr "Pavadinime negali būti naudojamas ženklas \"/\"."
 
-#: js/files.js:703 templates/index.php:55
+#: js/files.js:726 templates/index.php:55
 msgid "Size"
 msgstr "Dydis"
 
-#: js/files.js:704 templates/index.php:56
+#: js/files.js:727 templates/index.php:56
 msgid "Modified"
 msgstr "Pakeista"
 
-#: js/files.js:731
+#: js/files.js:754
 msgid "folder"
 msgstr "katalogas"
 
-#: js/files.js:733
+#: js/files.js:756
 msgid "folders"
 msgstr "katalogai"
 
-#: js/files.js:741
+#: js/files.js:764
 msgid "file"
 msgstr "failas"
 
-#: js/files.js:743
+#: js/files.js:766
 msgid "files"
 msgstr "failai"
 
diff --git a/l10n/lt_LT/files_sharing.po b/l10n/lt_LT/files_sharing.po
index e1965cc122..c51f93d5cf 100644
--- a/l10n/lt_LT/files_sharing.po
+++ b/l10n/lt_LT/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-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:03+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -26,10 +26,14 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
-#: templates/public.php:9
+#: templates/public.php:9 templates/public.php:19
 msgid "Download"
 msgstr ""
 
-#: templates/public.php:17
+#: templates/public.php:18
+msgid "No preview available for"
+msgstr ""
+
+#: templates/public.php:23
 msgid "web services under your control"
 msgstr ""
diff --git a/l10n/lt_LT/settings.po b/l10n/lt_LT/settings.po
index ca2f80d2fb..89933ccb88 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-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:03+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
diff --git a/l10n/lv/core.po b/l10n/lv/core.po
index a37e3cf176..35b9d2e808 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-08-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:02+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -34,55 +34,55 @@ msgstr ""
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr ""
 
-#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:206 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr "Iestatījumi"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "January"
 msgstr ""
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "February"
 msgstr ""
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "March"
 msgstr ""
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "April"
 msgstr ""
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "May"
 msgstr ""
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "June"
 msgstr ""
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "July"
 msgstr ""
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "August"
 msgstr ""
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "September"
 msgstr ""
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "October"
 msgstr ""
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "November"
 msgstr ""
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "December"
 msgstr ""
 
@@ -244,7 +244,7 @@ msgstr "Pabeigt uzstādījumus"
 msgid "web services under your control"
 msgstr ""
 
-#: templates/layout.user.php:49
+#: templates/layout.user.php:45
 msgid "Log out"
 msgstr "Izlogoties"
 
diff --git a/l10n/lv/files.po b/l10n/lv/files.po
index 3f19f36b91..f4af2d90e4 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-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -38,7 +38,7 @@ msgstr ""
 
 #: ajax/upload.php:24
 msgid "No file was uploaded"
-msgstr ""
+msgstr "Neviens fails netika augšuplādēts"
 
 #: ajax/upload.php:25
 msgid "Missing a temporary folder"
@@ -46,89 +46,94 @@ msgstr ""
 
 #: ajax/upload.php:26
 msgid "Failed to write to disk"
-msgstr ""
+msgstr "Nav iespējams saglabāt"
 
 #: appinfo/app.php:6
 msgid "Files"
 msgstr "Faili"
 
-#: js/fileactions.js:107 templates/index.php:56
+#: js/fileactions.js:106 templates/index.php:56
 msgid "Delete"
 msgstr "Izdzēst"
 
 #: js/filelist.js:141
 msgid "already exists"
-msgstr ""
+msgstr "tāds fails jau eksistē"
 
 #: js/filelist.js:141
 msgid "replace"
-msgstr ""
+msgstr "aizvietot"
 
 #: js/filelist.js:141
 msgid "cancel"
-msgstr ""
+msgstr "atcelt"
 
 #: js/filelist.js:195
 msgid "replaced"
-msgstr ""
+msgstr "aizvietots"
 
 #: js/filelist.js:195
 msgid "with"
-msgstr ""
+msgstr "ar"
 
 #: js/filelist.js:195 js/filelist.js:246
 msgid "undo"
-msgstr ""
+msgstr "vienu soli atpakaļ"
 
 #: js/filelist.js:246
 msgid "deleted"
-msgstr ""
+msgstr "izdzests"
 
-#: js/files.js:171
+#: js/files.js:179
 msgid "generating ZIP-file, it may take some time."
-msgstr ""
+msgstr "lai uzģenerētu ZIP failu, kāds brīdis ir jāpagaida"
 
-#: js/files.js:200
+#: js/files.js:208
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr ""
+msgstr "Nav iespējams augšuplādēt jūsu failu, jo tāds jau eksistē vai arī failam nav izmēra (0 baiti)"
 
-#: js/files.js:200
+#: js/files.js:208
 msgid "Upload Error"
 msgstr "Augšuplādēšanas laikā radās kļūda"
 
-#: js/files.js:228 js/files.js:319 js/files.js:348
+#: js/files.js:236 js/files.js:327 js/files.js:356
 msgid "Pending"
 msgstr "Gaida savu kārtu"
 
-#: js/files.js:333
+#: js/files.js:341
 msgid "Upload cancelled."
 msgstr "Augšuplāde ir atcelta"
 
-#: js/files.js:457
+#: js/files.js:409
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr ""
+
+#: js/files.js:480
 msgid "Invalid name, '/' is not allowed."
 msgstr "Šis simbols '/', nav atļauts."
 
-#: js/files.js:703 templates/index.php:55
+#: js/files.js:726 templates/index.php:55
 msgid "Size"
 msgstr "Izmērs"
 
-#: js/files.js:704 templates/index.php:56
+#: js/files.js:727 templates/index.php:56
 msgid "Modified"
 msgstr "Izmainīts"
 
-#: js/files.js:731
+#: js/files.js:754
 msgid "folder"
 msgstr "mape"
 
-#: js/files.js:733
+#: js/files.js:756
 msgid "folders"
 msgstr "mapes"
 
-#: js/files.js:741
+#: js/files.js:764
 msgid "file"
 msgstr "fails"
 
-#: js/files.js:743
+#: js/files.js:766
 msgid "files"
 msgstr "faili"
 
@@ -142,7 +147,7 @@ msgstr "Maksimālais failu augšuplādes apjoms"
 
 #: templates/admin.php:7
 msgid "max. possible: "
-msgstr ""
+msgstr "maksīmālais iespējamais:"
 
 #: templates/admin.php:9
 msgid "Needed for multi-file and folder downloads."
@@ -150,11 +155,11 @@ msgstr ""
 
 #: templates/admin.php:9
 msgid "Enable ZIP-download"
-msgstr ""
+msgstr "Iespējot ZIP lejuplādi"
 
 #: templates/admin.php:11
 msgid "0 is unlimited"
-msgstr ""
+msgstr "0 ir neierobežots"
 
 #: templates/admin.php:12
 msgid "Maximum input size for ZIP files"
@@ -162,19 +167,19 @@ msgstr ""
 
 #: templates/index.php:7
 msgid "New"
-msgstr ""
+msgstr "Jauns"
 
 #: templates/index.php:9
 msgid "Text file"
-msgstr ""
+msgstr "Teksta fails"
 
 #: templates/index.php:10
 msgid "Folder"
-msgstr ""
+msgstr "Mape"
 
 #: templates/index.php:11
 msgid "From url"
-msgstr ""
+msgstr "No URL saites"
 
 #: templates/index.php:21
 msgid "Upload"
@@ -182,7 +187,7 @@ msgstr "Augšuplādet"
 
 #: templates/index.php:27
 msgid "Cancel upload"
-msgstr ""
+msgstr "Atcelt augšuplādi"
 
 #: templates/index.php:39
 msgid "Nothing in here. Upload something!"
@@ -194,7 +199,7 @@ msgstr "Nosaukums"
 
 #: templates/index.php:49
 msgid "Share"
-msgstr ""
+msgstr "Līdzdalīt"
 
 #: templates/index.php:51
 msgid "Download"
@@ -212,8 +217,8 @@ msgstr ""
 
 #: templates/index.php:71
 msgid "Files are being scanned, please wait."
-msgstr ""
+msgstr "Faili šobrīd tiek caurskatīti, nedaudz jāpagaida."
 
 #: templates/index.php:74
 msgid "Current scanning"
-msgstr ""
+msgstr "Šobrīd tiek pārbaudīti"
diff --git a/l10n/lv/files_sharing.po b/l10n/lv/files_sharing.po
index 541faf7298..f102c0e8e3 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-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:03+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -25,10 +25,14 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
-#: templates/public.php:9
+#: templates/public.php:9 templates/public.php:19
 msgid "Download"
 msgstr ""
 
-#: templates/public.php:17
+#: templates/public.php:18
+msgid "No preview available for"
+msgstr ""
+
+#: templates/public.php:23
 msgid "web services under your control"
 msgstr ""
diff --git a/l10n/lv/settings.po b/l10n/lv/settings.po
index 44626e524c..b518362de9 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-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:03+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
diff --git a/l10n/mk/core.po b/l10n/mk/core.po
index 819d83c00f..b8fbb8b2a1 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-08-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:02+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -36,55 +36,55 @@ msgstr "Оваа категорија веќе постои:"
 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:201 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:206 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr "Поставки"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "January"
 msgstr "Јануари"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "February"
 msgstr "Февруари"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "March"
 msgstr "Март"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "April"
 msgstr "Април"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "May"
 msgstr "Мај"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "June"
 msgstr "Јуни"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "July"
 msgstr "Јули"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "August"
 msgstr "Август"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "September"
 msgstr "Септември"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "October"
 msgstr "Октомври"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "November"
 msgstr "Ноември"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "December"
 msgstr "Декември"
 
@@ -246,7 +246,7 @@ msgstr "Заврши го подесувањето"
 msgid "web services under your control"
 msgstr "веб сервиси под Ваша контрола"
 
-#: templates/layout.user.php:49
+#: templates/layout.user.php:45
 msgid "Log out"
 msgstr "Одјава"
 
diff --git a/l10n/mk/files.po b/l10n/mk/files.po
index 374cb87139..378ca4a4e1 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-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -54,7 +54,7 @@ msgstr "Неуспеав да запишам на диск"
 msgid "Files"
 msgstr "Датотеки"
 
-#: js/fileactions.js:107 templates/index.php:56
+#: js/fileactions.js:106 templates/index.php:56
 msgid "Delete"
 msgstr "Избриши"
 
@@ -86,51 +86,56 @@ msgstr ""
 msgid "deleted"
 msgstr ""
 
-#: js/files.js:171
+#: js/files.js:179
 msgid "generating ZIP-file, it may take some time."
 msgstr "Се генерира ZIP фајлот, ќе треба извесно време."
 
-#: js/files.js:200
+#: js/files.js:208
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "Не може да се преземе вашата датотека бидејќи фолдерот во кој се наоѓа фајлот има големина од 0 бајти"
 
-#: js/files.js:200
+#: js/files.js:208
 msgid "Upload Error"
 msgstr "Грешка при преземање"
 
-#: js/files.js:228 js/files.js:319 js/files.js:348
+#: js/files.js:236 js/files.js:327 js/files.js:356
 msgid "Pending"
 msgstr "Чека"
 
-#: js/files.js:333
+#: js/files.js:341
 msgid "Upload cancelled."
 msgstr "Преземањето е прекинато."
 
-#: js/files.js:457
+#: js/files.js:409
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr ""
+
+#: js/files.js:480
 msgid "Invalid name, '/' is not allowed."
 msgstr "неисправно име, '/' не е дозволено."
 
-#: js/files.js:703 templates/index.php:55
+#: js/files.js:726 templates/index.php:55
 msgid "Size"
 msgstr "Големина"
 
-#: js/files.js:704 templates/index.php:56
+#: js/files.js:727 templates/index.php:56
 msgid "Modified"
 msgstr "Променето"
 
-#: js/files.js:731
+#: js/files.js:754
 msgid "folder"
 msgstr "фолдер"
 
-#: js/files.js:733
+#: js/files.js:756
 msgid "folders"
 msgstr "фолдери"
 
-#: js/files.js:741
+#: js/files.js:764
 msgid "file"
 msgstr "датотека"
 
-#: js/files.js:743
+#: js/files.js:766
 msgid "files"
 msgstr "датотеки"
 
diff --git a/l10n/mk/files_sharing.po b/l10n/mk/files_sharing.po
index ff3aea4b67..53057883d0 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-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:03+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -25,10 +25,14 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
-#: templates/public.php:9
+#: templates/public.php:9 templates/public.php:19
 msgid "Download"
 msgstr ""
 
-#: templates/public.php:17
+#: templates/public.php:18
+msgid "No preview available for"
+msgstr ""
+
+#: templates/public.php:23
 msgid "web services under your control"
 msgstr ""
diff --git a/l10n/mk/settings.po b/l10n/mk/settings.po
index 8f71e56a59..8d491633f3 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-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:03+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
diff --git a/l10n/ms_MY/core.po b/l10n/ms_MY/core.po
index 32e0b5e087..76453523a6 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-08-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:02+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -36,55 +36,55 @@ msgstr "Kategori ini telah wujud"
 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:201 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:206 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr "Tetapan"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "January"
 msgstr "Januari"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "February"
 msgstr "Februari"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "March"
 msgstr "Mac"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "April"
 msgstr "April"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "May"
 msgstr "Mei"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "June"
 msgstr "Jun"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "July"
 msgstr "Julai"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "August"
 msgstr "Ogos"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "September"
 msgstr "September"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "October"
 msgstr "Oktober"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "November"
 msgstr "November"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "December"
 msgstr "Disember"
 
@@ -246,7 +246,7 @@ msgstr "Setup selesai"
 msgid "web services under your control"
 msgstr "Perkhidmatan web di bawah kawalan anda"
 
-#: templates/layout.user.php:49
+#: templates/layout.user.php:45
 msgid "Log out"
 msgstr "Log keluar"
 
diff --git a/l10n/ms_MY/files.po b/l10n/ms_MY/files.po
index d25d888cfc..ebf4d8af0f 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-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -55,7 +55,7 @@ msgstr "Gagal untuk disimpan"
 msgid "Files"
 msgstr "fail"
 
-#: js/fileactions.js:107 templates/index.php:56
+#: js/fileactions.js:106 templates/index.php:56
 msgid "Delete"
 msgstr "Padam"
 
@@ -87,51 +87,56 @@ msgstr ""
 msgid "deleted"
 msgstr "dihapus"
 
-#: js/files.js:171
+#: js/files.js:179
 msgid "generating ZIP-file, it may take some time."
 msgstr "sedang menghasilkan fail ZIP, mungkin mengambil sedikit masa."
 
-#: js/files.js:200
+#: js/files.js:208
 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:200
+#: js/files.js:208
 msgid "Upload Error"
 msgstr "Muat naik ralat"
 
-#: js/files.js:228 js/files.js:319 js/files.js:348
+#: js/files.js:236 js/files.js:327 js/files.js:356
 msgid "Pending"
 msgstr "Dalam proses"
 
-#: js/files.js:333
+#: js/files.js:341
 msgid "Upload cancelled."
 msgstr "Muatnaik dibatalkan."
 
-#: js/files.js:457
+#: js/files.js:409
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr ""
+
+#: js/files.js:480
 msgid "Invalid name, '/' is not allowed."
 msgstr "penggunaa nama tidak sah, '/' tidak dibenarkan."
 
-#: js/files.js:703 templates/index.php:55
+#: js/files.js:726 templates/index.php:55
 msgid "Size"
 msgstr "Saiz"
 
-#: js/files.js:704 templates/index.php:56
+#: js/files.js:727 templates/index.php:56
 msgid "Modified"
 msgstr "Dimodifikasi"
 
-#: js/files.js:731
+#: js/files.js:754
 msgid "folder"
 msgstr "direktori"
 
-#: js/files.js:733
+#: js/files.js:756
 msgid "folders"
 msgstr "direktori"
 
-#: js/files.js:741
+#: js/files.js:764
 msgid "file"
 msgstr "fail"
 
-#: js/files.js:743
+#: js/files.js:766
 msgid "files"
 msgstr "fail"
 
diff --git a/l10n/ms_MY/files_sharing.po b/l10n/ms_MY/files_sharing.po
index e81150885a..ed56ac1736 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-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:03+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -25,10 +25,14 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
-#: templates/public.php:9
+#: templates/public.php:9 templates/public.php:19
 msgid "Download"
 msgstr ""
 
-#: templates/public.php:17
+#: templates/public.php:18
+msgid "No preview available for"
+msgstr ""
+
+#: templates/public.php:23
 msgid "web services under your control"
 msgstr ""
diff --git a/l10n/ms_MY/settings.po b/l10n/ms_MY/settings.po
index a23283e4d3..f88b49ab73 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-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:03+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
diff --git a/l10n/nb_NO/core.po b/l10n/nb_NO/core.po
index 06f26b6566..7f1fc5fdb4 100644
--- a/l10n/nb_NO/core.po
+++ b/l10n/nb_NO/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-08-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:02+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -38,55 +38,55 @@ msgstr "Denne kategorien finnes allerede:"
 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:201 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:206 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr "Innstillinger"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "January"
 msgstr "Januar"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "February"
 msgstr "Februar"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "March"
 msgstr "Mars"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "April"
 msgstr "April"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "May"
 msgstr "Mai"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "June"
 msgstr "Juni"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "July"
 msgstr "Juli"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "August"
 msgstr "August"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "September"
 msgstr "September"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "October"
 msgstr "Oktober"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "November"
 msgstr "November"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "December"
 msgstr "Desember"
 
@@ -248,7 +248,7 @@ msgstr "Fullfør oppsetting"
 msgid "web services under your control"
 msgstr "nettjenester under din kontroll"
 
-#: templates/layout.user.php:49
+#: templates/layout.user.php:45
 msgid "Log out"
 msgstr "Logg ut"
 
diff --git a/l10n/nb_NO/files.po b/l10n/nb_NO/files.po
index 83cb1a6283..e909322805 100644
--- a/l10n/nb_NO/files.po
+++ b/l10n/nb_NO/files.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-26 01:17+0200\n"
-"PO-Revision-Date: 2012-08-25 23:02+0000\n"
-"Last-Translator: runesudden <runesudden@gmail.com>\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -56,7 +56,7 @@ msgstr "Klarte ikke å skrive til disk"
 msgid "Files"
 msgstr "Filer"
 
-#: js/fileactions.js:111 templates/index.php:56
+#: js/fileactions.js:106 templates/index.php:56
 msgid "Delete"
 msgstr "Slett"
 
@@ -88,51 +88,56 @@ msgstr "angre"
 msgid "deleted"
 msgstr "slettet"
 
-#: js/files.js:171
+#: js/files.js:179
 msgid "generating ZIP-file, it may take some time."
 msgstr "opprettet ZIP-fil, dette kan ta litt tid"
 
-#: js/files.js:200
+#: js/files.js:208
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "Kan ikke laste opp filen din siden det er en mappe eller den har 0 bytes"
 
-#: js/files.js:200
+#: js/files.js:208
 msgid "Upload Error"
 msgstr "Opplasting feilet"
 
-#: js/files.js:228 js/files.js:319 js/files.js:348
+#: js/files.js:236 js/files.js:327 js/files.js:356
 msgid "Pending"
 msgstr "Ventende"
 
-#: js/files.js:333
+#: js/files.js:341
 msgid "Upload cancelled."
 msgstr "Opplasting avbrutt."
 
-#: js/files.js:457
+#: js/files.js:409
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr ""
+
+#: js/files.js:480
 msgid "Invalid name, '/' is not allowed."
 msgstr "Ugyldig navn, '/' er ikke tillatt. "
 
-#: js/files.js:703 templates/index.php:55
+#: js/files.js:726 templates/index.php:55
 msgid "Size"
 msgstr "Størrelse"
 
-#: js/files.js:704 templates/index.php:56
+#: js/files.js:727 templates/index.php:56
 msgid "Modified"
 msgstr "Endret"
 
-#: js/files.js:731
+#: js/files.js:754
 msgid "folder"
 msgstr "mappe"
 
-#: js/files.js:733
+#: js/files.js:756
 msgid "folders"
 msgstr "mapper"
 
-#: js/files.js:741
+#: js/files.js:764
 msgid "file"
 msgstr "fil"
 
-#: js/files.js:743
+#: js/files.js:766
 msgid "files"
 msgstr "filer"
 
diff --git a/l10n/nb_NO/files_sharing.po b/l10n/nb_NO/files_sharing.po
index 922723d810..941f7443cf 100644
--- a/l10n/nb_NO/files_sharing.po
+++ b/l10n/nb_NO/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-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:03+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -26,10 +26,14 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
-#: templates/public.php:9
+#: templates/public.php:9 templates/public.php:19
 msgid "Download"
 msgstr ""
 
-#: templates/public.php:17
+#: templates/public.php:18
+msgid "No preview available for"
+msgstr ""
+
+#: templates/public.php:23
 msgid "web services under your control"
 msgstr ""
diff --git a/l10n/nb_NO/settings.po b/l10n/nb_NO/settings.po
index 9921843b97..74b34751ae 100644
--- a/l10n/nb_NO/settings.po
+++ b/l10n/nb_NO/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-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:03+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
diff --git a/l10n/nl/core.po b/l10n/nl/core.po
index d85fb88a3f..171120bab7 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-08-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:02+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -39,55 +39,55 @@ msgstr "De categorie bestaat al."
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr ""
 
-#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:206 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr "Instellingen"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "January"
 msgstr "Januari"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "February"
 msgstr "Februari"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "March"
 msgstr "Maart"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "April"
 msgstr "April"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "May"
 msgstr "Mei"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "June"
 msgstr "Juni"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "July"
 msgstr "Juli"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "August"
 msgstr "Augustus"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "September"
 msgstr "September"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "October"
 msgstr "Oktober"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "November"
 msgstr "November"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "December"
 msgstr "December"
 
@@ -249,7 +249,7 @@ msgstr "Installatie afronden"
 msgid "web services under your control"
 msgstr "webdiensten die je beheerst"
 
-#: templates/layout.user.php:49
+#: templates/layout.user.php:45
 msgid "Log out"
 msgstr "Afmelden"
 
diff --git a/l10n/nl/files.po b/l10n/nl/files.po
index ab52fb7028..f5d8cf3bfe 100644
--- a/l10n/nl/files.po
+++ b/l10n/nl/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-08-25 02:04+0200\n"
-"PO-Revision-Date: 2012-08-24 08:34+0000\n"
-"Last-Translator: Richard Bos <radoeka@gmail.com>\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -59,7 +59,7 @@ msgstr "Schrijven naar schijf mislukt"
 msgid "Files"
 msgstr "Bestanden"
 
-#: js/fileactions.js:111 templates/index.php:56
+#: js/fileactions.js:106 templates/index.php:56
 msgid "Delete"
 msgstr "Verwijder"
 
@@ -91,51 +91,56 @@ msgstr "ongedaan maken"
 msgid "deleted"
 msgstr "verwijderd"
 
-#: js/files.js:171
+#: js/files.js:179
 msgid "generating ZIP-file, it may take some time."
 msgstr "aanmaken ZIP-file, dit kan enige tijd duren."
 
-#: js/files.js:200
+#: js/files.js:208
 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:200
+#: js/files.js:208
 msgid "Upload Error"
 msgstr "Upload Fout"
 
-#: js/files.js:228 js/files.js:319 js/files.js:348
+#: js/files.js:236 js/files.js:327 js/files.js:356
 msgid "Pending"
 msgstr "Wachten"
 
-#: js/files.js:333
+#: js/files.js:341
 msgid "Upload cancelled."
 msgstr "Uploaden geannuleerd."
 
-#: js/files.js:457
+#: js/files.js:409
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr ""
+
+#: js/files.js:480
 msgid "Invalid name, '/' is not allowed."
 msgstr "Ongeldige naam, '/' is niet toegestaan."
 
-#: js/files.js:703 templates/index.php:55
+#: js/files.js:726 templates/index.php:55
 msgid "Size"
 msgstr "Bestandsgrootte"
 
-#: js/files.js:704 templates/index.php:56
+#: js/files.js:727 templates/index.php:56
 msgid "Modified"
 msgstr "Laatst aangepast"
 
-#: js/files.js:731
+#: js/files.js:754
 msgid "folder"
 msgstr "map"
 
-#: js/files.js:733
+#: js/files.js:756
 msgid "folders"
 msgstr "mappen"
 
-#: js/files.js:741
+#: js/files.js:764
 msgid "file"
 msgstr "bestand"
 
-#: js/files.js:743
+#: js/files.js:766
 msgid "files"
 msgstr "bestanden"
 
diff --git a/l10n/nl/files_sharing.po b/l10n/nl/files_sharing.po
index 6284ad7a6c..98f93a33de 100644
--- a/l10n/nl/files_sharing.po
+++ b/l10n/nl/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-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:03+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -26,10 +26,14 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
-#: templates/public.php:9
+#: templates/public.php:9 templates/public.php:19
 msgid "Download"
 msgstr ""
 
-#: templates/public.php:17
+#: templates/public.php:18
+msgid "No preview available for"
+msgstr ""
+
+#: templates/public.php:23
 msgid "web services under your control"
 msgstr ""
diff --git a/l10n/nl/settings.po b/l10n/nl/settings.po
index 2ffd48deed..7abf382c2c 100644
--- a/l10n/nl/settings.po
+++ b/l10n/nl/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-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:03+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
diff --git a/l10n/nn_NO/core.po b/l10n/nn_NO/core.po
index cc43de36a9..aa0a9a4c8b 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-08-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:02+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -35,55 +35,55 @@ msgstr ""
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr ""
 
-#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:206 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr "Innstillingar"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "January"
 msgstr ""
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "February"
 msgstr ""
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "March"
 msgstr ""
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "April"
 msgstr ""
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "May"
 msgstr ""
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "June"
 msgstr ""
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "July"
 msgstr ""
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "August"
 msgstr ""
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "September"
 msgstr ""
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "October"
 msgstr ""
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "November"
 msgstr ""
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "December"
 msgstr ""
 
@@ -245,7 +245,7 @@ msgstr "Fullfør oppsettet"
 msgid "web services under your control"
 msgstr "Vev tjenester under din kontroll"
 
-#: templates/layout.user.php:49
+#: templates/layout.user.php:45
 msgid "Log out"
 msgstr "Logg ut"
 
diff --git a/l10n/nn_NO/files.po b/l10n/nn_NO/files.po
index f0ce0b444a..1fecca7984 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-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -53,7 +53,7 @@ msgstr ""
 msgid "Files"
 msgstr "Filer"
 
-#: js/fileactions.js:107 templates/index.php:56
+#: js/fileactions.js:106 templates/index.php:56
 msgid "Delete"
 msgstr "Slett"
 
@@ -85,51 +85,56 @@ msgstr ""
 msgid "deleted"
 msgstr ""
 
-#: js/files.js:171
+#: js/files.js:179
 msgid "generating ZIP-file, it may take some time."
 msgstr ""
 
-#: js/files.js:200
+#: js/files.js:208
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:200
+#: js/files.js:208
 msgid "Upload Error"
 msgstr ""
 
-#: js/files.js:228 js/files.js:319 js/files.js:348
+#: js/files.js:236 js/files.js:327 js/files.js:356
 msgid "Pending"
 msgstr ""
 
-#: js/files.js:333
+#: js/files.js:341
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:457
+#: js/files.js:409
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr ""
+
+#: js/files.js:480
 msgid "Invalid name, '/' is not allowed."
 msgstr ""
 
-#: js/files.js:703 templates/index.php:55
+#: js/files.js:726 templates/index.php:55
 msgid "Size"
 msgstr "Storleik"
 
-#: js/files.js:704 templates/index.php:56
+#: js/files.js:727 templates/index.php:56
 msgid "Modified"
 msgstr "Endra"
 
-#: js/files.js:731
+#: js/files.js:754
 msgid "folder"
 msgstr ""
 
-#: js/files.js:733
+#: js/files.js:756
 msgid "folders"
 msgstr ""
 
-#: js/files.js:741
+#: js/files.js:764
 msgid "file"
 msgstr ""
 
-#: js/files.js:743
+#: js/files.js:766
 msgid "files"
 msgstr ""
 
diff --git a/l10n/nn_NO/files_sharing.po b/l10n/nn_NO/files_sharing.po
index 85149a47a1..e5055f0809 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-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:03+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -25,10 +25,14 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
-#: templates/public.php:9
+#: templates/public.php:9 templates/public.php:19
 msgid "Download"
 msgstr ""
 
-#: templates/public.php:17
+#: templates/public.php:18
+msgid "No preview available for"
+msgstr ""
+
+#: templates/public.php:23
 msgid "web services under your control"
 msgstr ""
diff --git a/l10n/nn_NO/settings.po b/l10n/nn_NO/settings.po
index 8e907e16d5..6eeb591969 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-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:03+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
diff --git a/l10n/pl/core.po b/l10n/pl/core.po
index 0ba8278f61..39c80a75e6 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-08-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:02+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -39,55 +39,55 @@ msgstr "Ta kategoria już istnieje"
 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:201 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:206 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr "Ustawienia"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "January"
 msgstr "Styczeń"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "February"
 msgstr "Luty"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "March"
 msgstr "Marzec"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "April"
 msgstr "Kwiecień"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "May"
 msgstr "Maj"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "June"
 msgstr "Czerwiec"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "July"
 msgstr "Lipiec"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "August"
 msgstr "Sierpień"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "September"
 msgstr "Wrzesień"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "October"
 msgstr "Październik"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "November"
 msgstr "Listopad"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "December"
 msgstr "Grudzień"
 
@@ -249,7 +249,7 @@ msgstr "Zakończ konfigurowanie"
 msgid "web services under your control"
 msgstr "usługi internetowe pod kontrolą"
 
-#: templates/layout.user.php:49
+#: templates/layout.user.php:45
 msgid "Log out"
 msgstr "Wylogowuje użytkownika"
 
diff --git a/l10n/pl/files.po b/l10n/pl/files.po
index 706d14931b..652fd35016 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-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -55,7 +55,7 @@ msgstr "Błąd zapisu na dysk"
 msgid "Files"
 msgstr "Pliki"
 
-#: js/fileactions.js:107 templates/index.php:56
+#: js/fileactions.js:106 templates/index.php:56
 msgid "Delete"
 msgstr "Usuwa element"
 
@@ -87,51 +87,56 @@ msgstr "wróć"
 msgid "deleted"
 msgstr "skasuj"
 
-#: js/files.js:171
+#: js/files.js:179
 msgid "generating ZIP-file, it may take some time."
 msgstr "Generowanie pliku ZIP, może potrwać pewien czas."
 
-#: js/files.js:200
+#: js/files.js:208
 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:200
+#: js/files.js:208
 msgid "Upload Error"
 msgstr "Błąd wczytywania"
 
-#: js/files.js:228 js/files.js:319 js/files.js:348
+#: js/files.js:236 js/files.js:327 js/files.js:356
 msgid "Pending"
 msgstr "Oczekujące"
 
-#: js/files.js:333
+#: js/files.js:341
 msgid "Upload cancelled."
 msgstr "Wczytywanie anulowane."
 
-#: js/files.js:457
+#: js/files.js:409
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr ""
+
+#: js/files.js:480
 msgid "Invalid name, '/' is not allowed."
 msgstr "Nieprawidłowa nazwa '/' jest niedozwolone."
 
-#: js/files.js:703 templates/index.php:55
+#: js/files.js:726 templates/index.php:55
 msgid "Size"
 msgstr "Rozmiar"
 
-#: js/files.js:704 templates/index.php:56
+#: js/files.js:727 templates/index.php:56
 msgid "Modified"
 msgstr "Czas modyfikacji"
 
-#: js/files.js:731
+#: js/files.js:754
 msgid "folder"
 msgstr "folder"
 
-#: js/files.js:733
+#: js/files.js:756
 msgid "folders"
 msgstr "foldery"
 
-#: js/files.js:741
+#: js/files.js:764
 msgid "file"
 msgstr "plik"
 
-#: js/files.js:743
+#: js/files.js:766
 msgid "files"
 msgstr "pliki"
 
diff --git a/l10n/pl/files_sharing.po b/l10n/pl/files_sharing.po
index cce21f84af..0cb14cf441 100644
--- a/l10n/pl/files_sharing.po
+++ b/l10n/pl/files_sharing.po
@@ -4,12 +4,13 @@
 # 
 # Translators:
 # Cyryl Sochacki <>, 2012.
+# Paweł Ciecierski <pciecierski@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:03+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -20,16 +21,20 @@ msgstr ""
 
 #: templates/authenticate.php:4
 msgid "Password"
-msgstr ""
+msgstr "Hasło"
 
 #: templates/authenticate.php:6
 msgid "Submit"
-msgstr ""
+msgstr "Wyślij"
 
-#: templates/public.php:9
+#: templates/public.php:9 templates/public.php:19
 msgid "Download"
+msgstr "Pobierz"
+
+#: templates/public.php:18
+msgid "No preview available for"
 msgstr ""
 
-#: templates/public.php:17
+#: templates/public.php:23
 msgid "web services under your control"
-msgstr ""
+msgstr "Kontrolowane serwisy"
diff --git a/l10n/pl/settings.po b/l10n/pl/settings.po
index 5ee6ed4d44..887143014b 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-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:03+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
diff --git a/l10n/pl/user_ldap.po b/l10n/pl/user_ldap.po
index 809f9c30ed..d351bc786e 100644
--- a/l10n/pl/user_ldap.po
+++ b/l10n/pl/user_ldap.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # Cyryl Sochacki <>, 2012.
+# Paweł Ciecierski <pciecierski@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 15:50+0000\n"
+"Last-Translator: Paweł Ciecierski <pciecierski@gmail.com>\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"
@@ -164,7 +165,7 @@ msgstr "w sekundach. Zmiana opróżnia pamięć podręczną."
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
-msgstr ""
+msgstr "Pozostaw puste dla user name (domyślnie). W przeciwnym razie podaj atrybut LDAP/AD."
 
 #: templates/settings.php:32
 msgid "Help"
diff --git a/l10n/pl_PL/core.po b/l10n/pl_PL/core.po
new file mode 100644
index 0000000000..f7b7d5a38d
--- /dev/null
+++ b/l10n/pl_PL/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-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/owncloud/language/pl_PL/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pl_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/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:206 templates/layout.user.php:60 templates/layout.user.php:61
+msgid "Settings"
+msgstr ""
+
+#: js/js.js:591
+msgid "January"
+msgstr ""
+
+#: js/js.js:591
+msgid "February"
+msgstr ""
+
+#: js/js.js:591
+msgid "March"
+msgstr ""
+
+#: js/js.js:591
+msgid "April"
+msgstr ""
+
+#: js/js.js:591
+msgid "May"
+msgstr ""
+
+#: js/js.js:591
+msgid "June"
+msgstr ""
+
+#: js/js.js:592
+msgid "July"
+msgstr ""
+
+#: js/js.js:592
+msgid "August"
+msgstr ""
+
+#: js/js.js:592
+msgid "September"
+msgstr ""
+
+#: js/js.js:592
+msgid "October"
+msgstr ""
+
+#: js/js.js:592
+msgid "November"
+msgstr ""
+
+#: js/js.js:592
+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:26
+#: 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:24
+msgid "Create an <strong>admin account</strong>"
+msgstr ""
+
+#: templates/installation.php:30 templates/login.php:13
+msgid "Password"
+msgstr ""
+
+#: templates/installation.php:36
+msgid "Advanced"
+msgstr ""
+
+#: templates/installation.php:38
+msgid "Data folder"
+msgstr ""
+
+#: templates/installation.php:45
+msgid "Configure the database"
+msgstr ""
+
+#: templates/installation.php:50 templates/installation.php:61
+#: templates/installation.php:71 templates/installation.php:81
+msgid "will be used"
+msgstr ""
+
+#: templates/installation.php:93
+msgid "Database user"
+msgstr ""
+
+#: templates/installation.php:97
+msgid "Database password"
+msgstr ""
+
+#: templates/installation.php:101
+msgid "Database name"
+msgstr ""
+
+#: templates/installation.php:109
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:115
+msgid "Database host"
+msgstr ""
+
+#: templates/installation.php:120
+msgid "Finish setup"
+msgstr ""
+
+#: templates/layout.guest.php:42
+msgid "web services under your control"
+msgstr ""
+
+#: templates/layout.user.php:45
+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/pl_PL/files.po b/l10n/pl_PL/files.po
new file mode 100644
index 0000000000..de6cf10414
--- /dev/null
+++ b/l10n/pl_PL/files.po
@@ -0,0 +1,223 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/owncloud/language/pl_PL/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pl_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: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:106 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:246
+msgid "undo"
+msgstr ""
+
+#: js/filelist.js:246
+msgid "deleted"
+msgstr ""
+
+#: js/files.js:179
+msgid "generating ZIP-file, it may take some time."
+msgstr ""
+
+#: js/files.js:208
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/files.js:208
+msgid "Upload Error"
+msgstr ""
+
+#: js/files.js:236 js/files.js:327 js/files.js:356
+msgid "Pending"
+msgstr ""
+
+#: js/files.js:341
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/files.js:409
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr ""
+
+#: js/files.js:480
+msgid "Invalid name, '/' is not allowed."
+msgstr ""
+
+#: js/files.js:726 templates/index.php:55
+msgid "Size"
+msgstr ""
+
+#: js/files.js:727 templates/index.php:56
+msgid "Modified"
+msgstr ""
+
+#: js/files.js:754
+msgid "folder"
+msgstr ""
+
+#: js/files.js:756
+msgid "folders"
+msgstr ""
+
+#: js/files.js:764
+msgid "file"
+msgstr ""
+
+#: js/files.js:766
+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/pl_PL/files_encryption.po b/l10n/pl_PL/files_encryption.po
new file mode 100644
index 0000000000..6512705ecb
--- /dev/null
+++ b/l10n/pl_PL/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-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/owncloud/language/pl_PL/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pl_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 ""
+
+#: 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/pl_PL/files_external.po b/l10n/pl_PL/files_external.po
new file mode 100644
index 0000000000..3006debaa4
--- /dev/null
+++ b/l10n/pl_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-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-12 22:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/owncloud/language/pl_PL/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pl_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_PL/files_sharing.po b/l10n/pl_PL/files_sharing.po
new file mode 100644
index 0000000000..f92619c2f7
--- /dev/null
+++ b/l10n/pl_PL/files_sharing.po
@@ -0,0 +1,38 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 00:04+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/owncloud/language/pl_PL/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pl_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/authenticate.php:4
+msgid "Password"
+msgstr ""
+
+#: templates/authenticate.php:6
+msgid "Submit"
+msgstr ""
+
+#: templates/public.php:9 templates/public.php:19
+msgid "Download"
+msgstr ""
+
+#: templates/public.php:18
+msgid "No preview available for"
+msgstr ""
+
+#: templates/public.php:23
+msgid "web services under your control"
+msgstr ""
diff --git a/l10n/pl_PL/files_versions.po b/l10n/pl_PL/files_versions.po
new file mode 100644
index 0000000000..1e25481245
--- /dev/null
+++ b/l10n/pl_PL/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-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-12 22:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/owncloud/language/pl_PL/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pl_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 ""
+
+#: templates/settings.php:3
+msgid "Enable Files Versioning"
+msgstr ""
diff --git a/l10n/pl_PL/lib.po b/l10n/pl_PL/lib.po
new file mode 100644
index 0000000000..27da662a78
--- /dev/null
+++ b/l10n/pl_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-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 22:23+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/owncloud/language/pl_PL/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pl_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: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:276
+msgid "ZIP download is turned off."
+msgstr ""
+
+#: files.php:277
+msgid "Files need to be downloaded one by one."
+msgstr ""
+
+#: files.php:277 files.php:302
+msgid "Back to Files"
+msgstr ""
+
+#: files.php:301
+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_PL/settings.po b/l10n/pl_PL/settings.po
new file mode 100644
index 0000000000..d87991490d
--- /dev/null
+++ b/l10n/pl_PL/settings.po
@@ -0,0 +1,274 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/owncloud/language/pl_PL/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pl_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 ""
+
+#: 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: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 "Share API"
+msgstr ""
+
+#: templates/admin.php:44
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:45
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:49
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:50
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:54
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:55
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:58
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:60
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:67
+msgid "Log"
+msgstr ""
+
+#: templates/admin.php:95
+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 "Group Admin"
+msgstr ""
+
+#: templates/users.php:82
+msgid "Quota"
+msgstr ""
+
+#: templates/users.php:146
+msgid "Delete"
+msgstr ""
diff --git a/l10n/pl_PL/user_ldap.po b/l10n/pl_PL/user_ldap.po
new file mode 100644
index 0000000000..554396a6fe
--- /dev/null
+++ b/l10n/pl_PL/user_ldap.po
@@ -0,0 +1,170 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/owncloud/language/pl_PL/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: pl_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:30
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:32
+msgid "Help"
+msgstr ""
diff --git a/l10n/pt_BR/core.po b/l10n/pt_BR/core.po
index a1285428ee..be5dc9aeb6 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-08-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:02+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -38,55 +38,55 @@ msgstr "Essa categoria já 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:201 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:206 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr "Configurações"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "January"
 msgstr "Janeiro"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "February"
 msgstr "Fevereiro"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "March"
 msgstr "Março"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "April"
 msgstr "Abril"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "May"
 msgstr "Maio"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "June"
 msgstr "Junho"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "July"
 msgstr "Julho"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "August"
 msgstr "Agosto"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "September"
 msgstr "Setembro"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "October"
 msgstr "Outubro"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "November"
 msgstr "Novembro"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "December"
 msgstr "Dezembro"
 
@@ -248,7 +248,7 @@ msgstr "Concluir configuração"
 msgid "web services under your control"
 msgstr "web services sob seu controle"
 
-#: templates/layout.user.php:49
+#: templates/layout.user.php:45
 msgid "Log out"
 msgstr "Sair"
 
diff --git a/l10n/pt_BR/files.po b/l10n/pt_BR/files.po
index ccac7b79d1..c7241bdb7d 100644
--- a/l10n/pt_BR/files.po
+++ b/l10n/pt_BR/files.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-25 02:04+0200\n"
-"PO-Revision-Date: 2012-08-24 22:17+0000\n"
-"Last-Translator: targinosilveira <targinosilveira@gmail.com>\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -56,7 +56,7 @@ msgstr "Falha ao escrever no disco"
 msgid "Files"
 msgstr "Arquivos"
 
-#: js/fileactions.js:111 templates/index.php:56
+#: js/fileactions.js:106 templates/index.php:56
 msgid "Delete"
 msgstr "Excluir"
 
@@ -88,51 +88,56 @@ msgstr "desfazer"
 msgid "deleted"
 msgstr "deletado"
 
-#: js/files.js:171
+#: js/files.js:179
 msgid "generating ZIP-file, it may take some time."
 msgstr "gerando arquivo ZIP, isso pode levar um tempo."
 
-#: js/files.js:200
+#: js/files.js:208
 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:200
+#: js/files.js:208
 msgid "Upload Error"
 msgstr "Erro de envio"
 
-#: js/files.js:228 js/files.js:319 js/files.js:348
+#: js/files.js:236 js/files.js:327 js/files.js:356
 msgid "Pending"
 msgstr "Pendente"
 
-#: js/files.js:333
+#: js/files.js:341
 msgid "Upload cancelled."
 msgstr "Envio cancelado."
 
-#: js/files.js:457
+#: js/files.js:409
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr ""
+
+#: js/files.js:480
 msgid "Invalid name, '/' is not allowed."
 msgstr "Nome inválido, '/' não é permitido."
 
-#: js/files.js:703 templates/index.php:55
+#: js/files.js:726 templates/index.php:55
 msgid "Size"
 msgstr "Tamanho"
 
-#: js/files.js:704 templates/index.php:56
+#: js/files.js:727 templates/index.php:56
 msgid "Modified"
 msgstr "Modificado"
 
-#: js/files.js:731
+#: js/files.js:754
 msgid "folder"
 msgstr "pasta"
 
-#: js/files.js:733
+#: js/files.js:756
 msgid "folders"
 msgstr "pastas"
 
-#: js/files.js:741
+#: js/files.js:764
 msgid "file"
 msgstr "arquivo"
 
-#: js/files.js:743
+#: js/files.js:766
 msgid "files"
 msgstr "arquivos"
 
diff --git a/l10n/pt_BR/files_sharing.po b/l10n/pt_BR/files_sharing.po
index 43165b5531..0e7ee14344 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-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:03+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -25,10 +25,14 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
-#: templates/public.php:9
+#: templates/public.php:9 templates/public.php:19
 msgid "Download"
 msgstr ""
 
-#: templates/public.php:17
+#: templates/public.php:18
+msgid "No preview available for"
+msgstr ""
+
+#: templates/public.php:23
 msgid "web services under your control"
 msgstr ""
diff --git a/l10n/pt_BR/settings.po b/l10n/pt_BR/settings.po
index 45def0c0f3..e3bbe54b78 100644
--- a/l10n/pt_BR/settings.po
+++ b/l10n/pt_BR/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-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:03+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
diff --git a/l10n/pt_PT/core.po b/l10n/pt_PT/core.po
index 486b0c900f..159432daa9 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-08-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:02+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -36,55 +36,55 @@ msgstr "Esta categoria já 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:201 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:206 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr "Definições"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "January"
 msgstr "Janeiro"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "February"
 msgstr "Fevereiro"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "March"
 msgstr "Março"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "April"
 msgstr "Abril"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "May"
 msgstr "Maio"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "June"
 msgstr "Junho"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "July"
 msgstr "Julho"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "August"
 msgstr "Agosto"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "September"
 msgstr "Setembro"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "October"
 msgstr "Outubro"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "November"
 msgstr "Novembro"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "December"
 msgstr "Dezembro"
 
@@ -246,7 +246,7 @@ msgstr "Acabar instalação"
 msgid "web services under your control"
 msgstr "serviços web sob o seu controlo"
 
-#: templates/layout.user.php:49
+#: templates/layout.user.php:45
 msgid "Log out"
 msgstr "Sair"
 
diff --git a/l10n/pt_PT/files.po b/l10n/pt_PT/files.po
index d816aedc33..57098cd5e0 100644
--- a/l10n/pt_PT/files.po
+++ b/l10n/pt_PT/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-24 02:02+0200\n"
-"PO-Revision-Date: 2012-08-23 19:39+0000\n"
-"Last-Translator: rlameiro <geral@ricardolameiro.pt>\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -54,7 +54,7 @@ msgstr "Falhou a escrita no disco"
 msgid "Files"
 msgstr "Ficheiros"
 
-#: js/fileactions.js:107 templates/index.php:56
+#: js/fileactions.js:106 templates/index.php:56
 msgid "Delete"
 msgstr "Apagar"
 
@@ -86,51 +86,56 @@ msgstr "desfazer"
 msgid "deleted"
 msgstr "apagado"
 
-#: js/files.js:171
+#: js/files.js:179
 msgid "generating ZIP-file, it may take some time."
 msgstr "a gerar o ficheiro ZIP, poderá demorar algum tempo."
 
-#: js/files.js:200
+#: js/files.js:208
 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:200
+#: js/files.js:208
 msgid "Upload Error"
 msgstr "Erro no upload"
 
-#: js/files.js:228 js/files.js:319 js/files.js:348
+#: js/files.js:236 js/files.js:327 js/files.js:356
 msgid "Pending"
 msgstr "Pendente"
 
-#: js/files.js:333
+#: js/files.js:341
 msgid "Upload cancelled."
 msgstr "O upload foi cancelado."
 
-#: js/files.js:457
+#: js/files.js:409
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr ""
+
+#: js/files.js:480
 msgid "Invalid name, '/' is not allowed."
 msgstr "nome inválido, '/' não permitido."
 
-#: js/files.js:703 templates/index.php:55
+#: js/files.js:726 templates/index.php:55
 msgid "Size"
 msgstr "Tamanho"
 
-#: js/files.js:704 templates/index.php:56
+#: js/files.js:727 templates/index.php:56
 msgid "Modified"
 msgstr "Modificado"
 
-#: js/files.js:731
+#: js/files.js:754
 msgid "folder"
 msgstr "pasta"
 
-#: js/files.js:733
+#: js/files.js:756
 msgid "folders"
 msgstr "pastas"
 
-#: js/files.js:741
+#: js/files.js:764
 msgid "file"
 msgstr "ficheiro"
 
-#: js/files.js:743
+#: js/files.js:766
 msgid "files"
 msgstr "ficheiros"
 
diff --git a/l10n/pt_PT/files_sharing.po b/l10n/pt_PT/files_sharing.po
index 57dd10e52d..99b0c7c215 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-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:03+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -25,10 +25,14 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
-#: templates/public.php:9
+#: templates/public.php:9 templates/public.php:19
 msgid "Download"
 msgstr ""
 
-#: templates/public.php:17
+#: templates/public.php:18
+msgid "No preview available for"
+msgstr ""
+
+#: templates/public.php:23
 msgid "web services under your control"
 msgstr ""
diff --git a/l10n/pt_PT/settings.po b/l10n/pt_PT/settings.po
index 158f3715bf..7077d64cc4 100644
--- a/l10n/pt_PT/settings.po
+++ b/l10n/pt_PT/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-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:03+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
diff --git a/l10n/ro/core.po b/l10n/ro/core.po
index f913e8ed60..40d7fc389f 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-08-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:02+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -36,55 +36,55 @@ msgstr "Această categorie deja există:"
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr ""
 
-#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:206 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr "Configurări"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "January"
 msgstr ""
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "February"
 msgstr ""
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "March"
 msgstr ""
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "April"
 msgstr ""
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "May"
 msgstr ""
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "June"
 msgstr ""
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "July"
 msgstr ""
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "August"
 msgstr ""
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "September"
 msgstr ""
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "October"
 msgstr ""
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "November"
 msgstr ""
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "December"
 msgstr ""
 
@@ -246,7 +246,7 @@ msgstr "Finalizează instalarea"
 msgid "web services under your control"
 msgstr "servicii web controlate de tine"
 
-#: templates/layout.user.php:49
+#: templates/layout.user.php:45
 msgid "Log out"
 msgstr "Ieșire"
 
diff --git a/l10n/ro/files.po b/l10n/ro/files.po
index e7d65b7a03..44b3e74b60 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-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -54,7 +54,7 @@ msgstr "Eroare la scriere pe disc"
 msgid "Files"
 msgstr "Fișiere"
 
-#: js/fileactions.js:107 templates/index.php:56
+#: js/fileactions.js:106 templates/index.php:56
 msgid "Delete"
 msgstr "Șterge"
 
@@ -86,51 +86,56 @@ msgstr ""
 msgid "deleted"
 msgstr ""
 
-#: js/files.js:171
+#: js/files.js:179
 msgid "generating ZIP-file, it may take some time."
 msgstr ""
 
-#: js/files.js:200
+#: js/files.js:208
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:200
+#: js/files.js:208
 msgid "Upload Error"
 msgstr ""
 
-#: js/files.js:228 js/files.js:319 js/files.js:348
+#: js/files.js:236 js/files.js:327 js/files.js:356
 msgid "Pending"
 msgstr ""
 
-#: js/files.js:333
+#: js/files.js:341
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:457
+#: js/files.js:409
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr ""
+
+#: js/files.js:480
 msgid "Invalid name, '/' is not allowed."
 msgstr ""
 
-#: js/files.js:703 templates/index.php:55
+#: js/files.js:726 templates/index.php:55
 msgid "Size"
 msgstr "Dimensiune"
 
-#: js/files.js:704 templates/index.php:56
+#: js/files.js:727 templates/index.php:56
 msgid "Modified"
 msgstr "Modificat"
 
-#: js/files.js:731
+#: js/files.js:754
 msgid "folder"
 msgstr ""
 
-#: js/files.js:733
+#: js/files.js:756
 msgid "folders"
 msgstr ""
 
-#: js/files.js:741
+#: js/files.js:764
 msgid "file"
 msgstr ""
 
-#: js/files.js:743
+#: js/files.js:766
 msgid "files"
 msgstr ""
 
diff --git a/l10n/ro/files_sharing.po b/l10n/ro/files_sharing.po
index 87f54b6986..6772dfc57a 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-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:03+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -25,10 +25,14 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
-#: templates/public.php:9
+#: templates/public.php:9 templates/public.php:19
 msgid "Download"
 msgstr ""
 
-#: templates/public.php:17
+#: templates/public.php:18
+msgid "No preview available for"
+msgstr ""
+
+#: templates/public.php:23
 msgid "web services under your control"
 msgstr ""
diff --git a/l10n/ro/settings.po b/l10n/ro/settings.po
index 28d3509f8e..e6e410f73d 100644
--- a/l10n/ro/settings.po
+++ b/l10n/ro/settings.po
@@ -7,12 +7,13 @@
 # Dimon Pockemon <>, 2012.
 # Eugen Mihalache <eugemjj@gmail.com>, 2012.
 #   <icewind1991@gmail.com>, 2012.
+#   <iuranemo@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:03+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -23,15 +24,15 @@ msgstr ""
 
 #: ajax/apps/ocs.php:23
 msgid "Unable to load list from App Store"
-msgstr ""
+msgstr "Imposibil de încărcat lista din App Store"
 
 #: ajax/lostpassword.php:14
 msgid "Email saved"
-msgstr ""
+msgstr "E-mail salvat"
 
 #: ajax/lostpassword.php:16
 msgid "Invalid email"
-msgstr ""
+msgstr "E-mail nevalid"
 
 #: ajax/openid.php:16
 msgid "OpenID Changed"
@@ -43,7 +44,7 @@ msgstr "Cerere eronată"
 
 #: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
 msgid "Authentication error"
-msgstr ""
+msgstr "Eroare de autentificare"
 
 #: ajax/setlanguage.php:18
 msgid "Language changed"
@@ -51,19 +52,19 @@ msgstr "Limba a fost schimbată"
 
 #: js/apps.js:18
 msgid "Error"
-msgstr ""
+msgstr "Erroare"
 
 #: js/apps.js:39 js/apps.js:73
 msgid "Disable"
-msgstr ""
+msgstr "Dezactivați"
 
 #: js/apps.js:39 js/apps.js:62
 msgid "Enable"
-msgstr ""
+msgstr "Activați"
 
 #: js/personal.js:69
 msgid "Saving..."
-msgstr ""
+msgstr "Salvez..."
 
 #: personal.php:46 personal.php:47
 msgid "__language_name__"
@@ -71,23 +72,23 @@ msgstr "_language_name_"
 
 #: templates/admin.php:14
 msgid "Security Warning"
-msgstr ""
+msgstr "Avertisment de securitate"
 
 #: templates/admin.php:29
 msgid "Cron"
-msgstr ""
+msgstr "Cron"
 
 #: templates/admin.php:31
 msgid "execute one task with each page loaded"
-msgstr ""
+msgstr "executâ o sarcină cu fiecare pagină încărcată"
 
 #: templates/admin.php:33
 msgid "cron.php is registered at a webcron service"
-msgstr ""
+msgstr "cron.php e înregistrat la un serviciu de webcron"
 
 #: templates/admin.php:35
 msgid "use systems cron service"
-msgstr ""
+msgstr "utilizează serviciul de cron al sistemului"
 
 #: templates/admin.php:39
 msgid "Share API"
@@ -143,7 +144,7 @@ msgstr "Selectează o aplicație"
 
 #: templates/apps.php:29
 msgid "See application page at apps.owncloud.com"
-msgstr ""
+msgstr "Vizualizează pagina applicației pe apps.owncloud.com"
 
 #: templates/apps.php:30
 msgid "-licensed"
@@ -267,7 +268,7 @@ msgstr "Altele"
 
 #: templates/users.php:80 templates/users.php:112
 msgid "Group Admin"
-msgstr ""
+msgstr "Grupul Admin "
 
 #: templates/users.php:82
 msgid "Quota"
diff --git a/l10n/ro/user_ldap.po b/l10n/ro/user_ldap.po
index 633f14c432..8b79d7561f 100644
--- a/l10n/ro/user_ldap.po
+++ b/l10n/ro/user_ldap.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # Dumitru Ursu <>, 2012.
+#   <iuranemo@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-30 17:51+0000\n"
+"Last-Translator: iuranemo <iuranemo@gmail.com>\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"
@@ -164,7 +165,7 @@ msgstr "în secunde. O schimbare curăță memoria tampon."
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
-msgstr ""
+msgstr "Lăsați gol pentru numele de utilizator (implicit). În caz contrar, specificați un atribut LDAP / AD."
 
 #: templates/settings.php:32
 msgid "Help"
diff --git a/l10n/ru/core.po b/l10n/ru/core.po
index 5c005cb940..cd7648d5b9 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-08-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:02+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -37,55 +37,55 @@ msgstr "Эта категория уже существует: "
 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:201 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:206 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr "Настройки"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "January"
 msgstr "Январь"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "February"
 msgstr "Февраль"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "March"
 msgstr "Март"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "April"
 msgstr "Апрель"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "May"
 msgstr "Май"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "June"
 msgstr "Июнь"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "July"
 msgstr "Июль"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "August"
 msgstr "Август"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "September"
 msgstr "Сентябрь"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "October"
 msgstr "Октябрь"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "November"
 msgstr "Ноябрь"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "December"
 msgstr "Декабрь"
 
@@ -247,7 +247,7 @@ msgstr "Завершить установку"
 msgid "web services under your control"
 msgstr "Сетевые службы под твоим контролем"
 
-#: templates/layout.user.php:49
+#: templates/layout.user.php:45
 msgid "Log out"
 msgstr "Выйти"
 
diff --git a/l10n/ru/files.po b/l10n/ru/files.po
index 624859e9c9..9ebfee3096 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-25 02:04+0200\n"
-"PO-Revision-Date: 2012-08-24 13:06+0000\n"
-"Last-Translator: Denis <reg.transifex.net@demitel.ru>\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -57,7 +57,7 @@ msgstr "Ошибка записи на диск"
 msgid "Files"
 msgstr "Файлы"
 
-#: js/fileactions.js:111 templates/index.php:56
+#: js/fileactions.js:106 templates/index.php:56
 msgid "Delete"
 msgstr "Удалить"
 
@@ -89,51 +89,56 @@ msgstr "отмена"
 msgid "deleted"
 msgstr "удален"
 
-#: js/files.js:171
+#: js/files.js:179
 msgid "generating ZIP-file, it may take some time."
 msgstr "создание ZIP-файла, это может занять некоторое время."
 
-#: js/files.js:200
+#: js/files.js:208
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "Не удается загрузить файл размером 0 байт в каталог"
 
-#: js/files.js:200
+#: js/files.js:208
 msgid "Upload Error"
 msgstr "Ошибка загрузки"
 
-#: js/files.js:228 js/files.js:319 js/files.js:348
+#: js/files.js:236 js/files.js:327 js/files.js:356
 msgid "Pending"
 msgstr "Ожидание"
 
-#: js/files.js:333
+#: js/files.js:341
 msgid "Upload cancelled."
 msgstr "Загрузка отменена."
 
-#: js/files.js:457
+#: js/files.js:409
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr ""
+
+#: js/files.js:480
 msgid "Invalid name, '/' is not allowed."
 msgstr "Неверное имя, '/' не допускается."
 
-#: js/files.js:703 templates/index.php:55
+#: js/files.js:726 templates/index.php:55
 msgid "Size"
 msgstr "Размер"
 
-#: js/files.js:704 templates/index.php:56
+#: js/files.js:727 templates/index.php:56
 msgid "Modified"
 msgstr "Изменён"
 
-#: js/files.js:731
+#: js/files.js:754
 msgid "folder"
 msgstr "папка"
 
-#: js/files.js:733
+#: js/files.js:756
 msgid "folders"
 msgstr "папки"
 
-#: js/files.js:741
+#: js/files.js:764
 msgid "file"
 msgstr "файл"
 
-#: js/files.js:743
+#: js/files.js:766
 msgid "files"
 msgstr "файлы"
 
diff --git a/l10n/ru/files_sharing.po b/l10n/ru/files_sharing.po
index 0ab8e00bbc..97fc33e4ef 100644
--- a/l10n/ru/files_sharing.po
+++ b/l10n/ru/files_sharing.po
@@ -4,12 +4,13 @@
 # 
 # Translators:
 # Denis  <reg.transifex.net@demitel.ru>, 2012.
+#   <iuranemo@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:03+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -26,10 +27,14 @@ msgstr "Пароль"
 msgid "Submit"
 msgstr "Отправить"
 
-#: templates/public.php:9
+#: templates/public.php:9 templates/public.php:19
 msgid "Download"
+msgstr "Скачать"
+
+#: templates/public.php:18
+msgid "No preview available for"
 msgstr ""
 
-#: templates/public.php:17
+#: templates/public.php:23
 msgid "web services under your control"
-msgstr ""
+msgstr "веб-сервисы под вашим управлением"
diff --git a/l10n/ru/settings.po b/l10n/ru/settings.po
index c570bddff6..42e7017adc 100644
--- a/l10n/ru/settings.po
+++ b/l10n/ru/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-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:03+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
diff --git a/l10n/ru_RU/core.po b/l10n/ru_RU/core.po
index d9bbba6c7e..61648a74b2 100644
--- a/l10n/ru_RU/core.po
+++ b/l10n/ru_RU/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-08-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:02+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n"
 "MIME-Version: 1.0\n"
@@ -33,55 +33,55 @@ msgstr ""
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr ""
 
-#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:206 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "January"
 msgstr ""
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "February"
 msgstr ""
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "March"
 msgstr ""
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "April"
 msgstr ""
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "May"
 msgstr ""
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "June"
 msgstr ""
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "July"
 msgstr ""
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "August"
 msgstr ""
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "September"
 msgstr ""
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "October"
 msgstr ""
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "November"
 msgstr ""
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "December"
 msgstr ""
 
@@ -243,7 +243,7 @@ msgstr ""
 msgid "web services under your control"
 msgstr ""
 
-#: templates/layout.user.php:49
+#: templates/layout.user.php:45
 msgid "Log out"
 msgstr ""
 
diff --git a/l10n/ru_RU/files.po b/l10n/ru_RU/files.po
index 3db3a2c484..f9bdd2abc9 100644
--- a/l10n/ru_RU/files.po
+++ b/l10n/ru_RU/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-30 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-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -51,7 +51,7 @@ msgstr ""
 msgid "Files"
 msgstr ""
 
-#: js/fileactions.js:111 templates/index.php:56
+#: js/fileactions.js:106 templates/index.php:56
 msgid "Delete"
 msgstr ""
 
@@ -83,51 +83,56 @@ msgstr ""
 msgid "deleted"
 msgstr ""
 
-#: js/files.js:171
+#: js/files.js:179
 msgid "generating ZIP-file, it may take some time."
 msgstr ""
 
-#: js/files.js:200
+#: js/files.js:208
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:200
+#: js/files.js:208
 msgid "Upload Error"
 msgstr ""
 
-#: js/files.js:228 js/files.js:319 js/files.js:348
+#: js/files.js:236 js/files.js:327 js/files.js:356
 msgid "Pending"
 msgstr ""
 
-#: js/files.js:333
+#: js/files.js:341
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:457
+#: js/files.js:409
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr ""
+
+#: js/files.js:480
 msgid "Invalid name, '/' is not allowed."
 msgstr ""
 
-#: js/files.js:703 templates/index.php:55
+#: js/files.js:726 templates/index.php:55
 msgid "Size"
 msgstr ""
 
-#: js/files.js:704 templates/index.php:56
+#: js/files.js:727 templates/index.php:56
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:731
+#: js/files.js:754
 msgid "folder"
 msgstr ""
 
-#: js/files.js:733
+#: js/files.js:756
 msgid "folders"
 msgstr ""
 
-#: js/files.js:741
+#: js/files.js:764
 msgid "file"
 msgstr ""
 
-#: js/files.js:743
+#: js/files.js:766
 msgid "files"
 msgstr ""
 
diff --git a/l10n/ru_RU/files_sharing.po b/l10n/ru_RU/files_sharing.po
index a92e3899f4..5a793d15d3 100644
--- a/l10n/ru_RU/files_sharing.po
+++ b/l10n/ru_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-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:03+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 00:04+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n"
 "MIME-Version: 1.0\n"
@@ -25,10 +25,14 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
-#: templates/public.php:9
+#: templates/public.php:9 templates/public.php:19
 msgid "Download"
 msgstr ""
 
-#: templates/public.php:17
+#: templates/public.php:18
+msgid "No preview available for"
+msgstr ""
+
+#: templates/public.php:23
 msgid "web services under your control"
 msgstr ""
diff --git a/l10n/ru_RU/settings.po b/l10n/ru_RU/settings.po
index 41982d57d4..5b3ed47251 100644
--- a/l10n/ru_RU/settings.po
+++ b/l10n/ru_RU/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-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:03+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n"
 "MIME-Version: 1.0\n"
diff --git a/l10n/sk_SK/core.po b/l10n/sk_SK/core.po
index 95cae31afe..e0a133b9ed 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-08-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:02+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -35,55 +35,55 @@ msgstr "Táto kategória už existuje:"
 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:201 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:206 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr "Nastavenia"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "January"
 msgstr "Január"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "February"
 msgstr "Február"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "March"
 msgstr "Marec"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "April"
 msgstr "Apríl"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "May"
 msgstr "Máj"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "June"
 msgstr "Jún"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "July"
 msgstr "Júl"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "August"
 msgstr "August"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "September"
 msgstr "September"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "October"
 msgstr "Október"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "November"
 msgstr "November"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "December"
 msgstr "December"
 
@@ -245,7 +245,7 @@ msgstr "Dokončiť inštaláciu"
 msgid "web services under your control"
 msgstr "webové služby pod vašou kontrolou"
 
-#: templates/layout.user.php:49
+#: templates/layout.user.php:45
 msgid "Log out"
 msgstr "Odhlásiť"
 
diff --git a/l10n/sk_SK/files.po b/l10n/sk_SK/files.po
index cadb54078e..49d1f0dcb6 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-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -53,7 +53,7 @@ msgstr "Zápis na disk sa nepodaril"
 msgid "Files"
 msgstr "Súbory"
 
-#: js/fileactions.js:107 templates/index.php:56
+#: js/fileactions.js:106 templates/index.php:56
 msgid "Delete"
 msgstr "Odstrániť"
 
@@ -85,51 +85,56 @@ msgstr ""
 msgid "deleted"
 msgstr ""
 
-#: js/files.js:171
+#: js/files.js:179
 msgid "generating ZIP-file, it may take some time."
 msgstr "generujem ZIP-súbor, môže to chvíľu trvať."
 
-#: js/files.js:200
+#: js/files.js:208
 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:200
+#: js/files.js:208
 msgid "Upload Error"
 msgstr "Chyba nahrávania"
 
-#: js/files.js:228 js/files.js:319 js/files.js:348
+#: js/files.js:236 js/files.js:327 js/files.js:356
 msgid "Pending"
 msgstr "Čaká sa"
 
-#: js/files.js:333
+#: js/files.js:341
 msgid "Upload cancelled."
 msgstr "Nahrávanie zrušené"
 
-#: js/files.js:457
+#: js/files.js:409
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr ""
+
+#: js/files.js:480
 msgid "Invalid name, '/' is not allowed."
 msgstr "Chybný názov, \"/\" nie je povolené"
 
-#: js/files.js:703 templates/index.php:55
+#: js/files.js:726 templates/index.php:55
 msgid "Size"
 msgstr "Veľkosť"
 
-#: js/files.js:704 templates/index.php:56
+#: js/files.js:727 templates/index.php:56
 msgid "Modified"
 msgstr "Upravené"
 
-#: js/files.js:731
+#: js/files.js:754
 msgid "folder"
 msgstr "priečinok"
 
-#: js/files.js:733
+#: js/files.js:756
 msgid "folders"
 msgstr "priečinky"
 
-#: js/files.js:741
+#: js/files.js:764
 msgid "file"
 msgstr "súbor"
 
-#: js/files.js:743
+#: js/files.js:766
 msgid "files"
 msgstr "súbory"
 
diff --git a/l10n/sk_SK/files_sharing.po b/l10n/sk_SK/files_sharing.po
index 225ce02eb7..bda598320e 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-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:03+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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,10 +25,14 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
-#: templates/public.php:9
+#: templates/public.php:9 templates/public.php:19
 msgid "Download"
 msgstr ""
 
-#: templates/public.php:17
+#: templates/public.php:18
+msgid "No preview available for"
+msgstr ""
+
+#: templates/public.php:23
 msgid "web services under your control"
 msgstr ""
diff --git a/l10n/sk_SK/settings.po b/l10n/sk_SK/settings.po
index 6d266311a2..cdc21b8fc6 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-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:03+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
diff --git a/l10n/sl/core.po b/l10n/sl/core.po
index 75f51683d0..3c5d038831 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-08-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:02+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -36,55 +36,55 @@ msgstr "Ta kategorija že obstaja:"
 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:201 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:206 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr "Nastavitve"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "January"
 msgstr "januar"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "February"
 msgstr "februar"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "March"
 msgstr "marec"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "April"
 msgstr "april"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "May"
 msgstr "maj"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "June"
 msgstr "junij"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "July"
 msgstr "julij"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "August"
 msgstr "avgust"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "September"
 msgstr "september"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "October"
 msgstr "oktober"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "November"
 msgstr "november"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "December"
 msgstr "december"
 
@@ -246,7 +246,7 @@ msgstr "Dokončaj namestitev"
 msgid "web services under your control"
 msgstr "spletne storitve pod vašim nadzorom"
 
-#: templates/layout.user.php:49
+#: templates/layout.user.php:45
 msgid "Log out"
 msgstr "Odjava"
 
diff --git a/l10n/sl/files.po b/l10n/sl/files.po
index 11c8ef1804..97c1b7d487 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-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -54,7 +54,7 @@ msgstr "Pisanje na disk je spodletelo"
 msgid "Files"
 msgstr "Datoteke"
 
-#: js/fileactions.js:107 templates/index.php:56
+#: js/fileactions.js:106 templates/index.php:56
 msgid "Delete"
 msgstr "Izbriši"
 
@@ -86,51 +86,56 @@ msgstr "razveljavi"
 msgid "deleted"
 msgstr "izbrisano"
 
-#: js/files.js:171
+#: js/files.js:179
 msgid "generating ZIP-file, it may take some time."
 msgstr "Ustvarjam ZIP datoteko. To lahko traja nekaj časa."
 
-#: js/files.js:200
+#: js/files.js:208
 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:200
+#: js/files.js:208
 msgid "Upload Error"
 msgstr "Napaka pri nalaganju"
 
-#: js/files.js:228 js/files.js:319 js/files.js:348
+#: js/files.js:236 js/files.js:327 js/files.js:356
 msgid "Pending"
 msgstr "Na čakanju"
 
-#: js/files.js:333
+#: js/files.js:341
 msgid "Upload cancelled."
 msgstr "Nalaganje je bilo preklicano."
 
-#: js/files.js:457
+#: js/files.js:409
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr ""
+
+#: js/files.js:480
 msgid "Invalid name, '/' is not allowed."
 msgstr "Neveljavno ime. Znak '/' ni dovoljen."
 
-#: js/files.js:703 templates/index.php:55
+#: js/files.js:726 templates/index.php:55
 msgid "Size"
 msgstr "Velikost"
 
-#: js/files.js:704 templates/index.php:56
+#: js/files.js:727 templates/index.php:56
 msgid "Modified"
 msgstr "Spremenjeno"
 
-#: js/files.js:731
+#: js/files.js:754
 msgid "folder"
 msgstr "mapa"
 
-#: js/files.js:733
+#: js/files.js:756
 msgid "folders"
 msgstr "mape"
 
-#: js/files.js:741
+#: js/files.js:764
 msgid "file"
 msgstr "datoteka"
 
-#: js/files.js:743
+#: js/files.js:766
 msgid "files"
 msgstr "datoteke"
 
diff --git a/l10n/sl/files_sharing.po b/l10n/sl/files_sharing.po
index f553a60c3a..c5c7a7f2b6 100644
--- a/l10n/sl/files_sharing.po
+++ b/l10n/sl/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-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:03+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -26,10 +26,14 @@ msgstr "Geslo"
 msgid "Submit"
 msgstr "Pošlji"
 
-#: templates/public.php:9
+#: templates/public.php:9 templates/public.php:19
 msgid "Download"
+msgstr "Prenesi"
+
+#: templates/public.php:18
+msgid "No preview available for"
 msgstr ""
 
-#: templates/public.php:17
+#: templates/public.php:23
 msgid "web services under your control"
-msgstr ""
+msgstr "spletne storitve pod vašim nadzorom"
diff --git a/l10n/sl/settings.po b/l10n/sl/settings.po
index f8e1963dbe..d2fe502e3f 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-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:03+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
diff --git a/l10n/so/core.po b/l10n/so/core.po
index 421cd8feec..4ace6abe5b 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-08-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:02+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -33,55 +33,55 @@ msgstr ""
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr ""
 
-#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:206 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "January"
 msgstr ""
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "February"
 msgstr ""
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "March"
 msgstr ""
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "April"
 msgstr ""
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "May"
 msgstr ""
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "June"
 msgstr ""
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "July"
 msgstr ""
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "August"
 msgstr ""
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "September"
 msgstr ""
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "October"
 msgstr ""
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "November"
 msgstr ""
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "December"
 msgstr ""
 
@@ -243,7 +243,7 @@ msgstr ""
 msgid "web services under your control"
 msgstr ""
 
-#: templates/layout.user.php:49
+#: templates/layout.user.php:45
 msgid "Log out"
 msgstr ""
 
diff --git a/l10n/so/files.po b/l10n/so/files.po
index 576444ca8e..346d96b8bd 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-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -51,7 +51,7 @@ msgstr ""
 msgid "Files"
 msgstr ""
 
-#: js/fileactions.js:107 templates/index.php:56
+#: js/fileactions.js:106 templates/index.php:56
 msgid "Delete"
 msgstr ""
 
@@ -83,51 +83,56 @@ msgstr ""
 msgid "deleted"
 msgstr ""
 
-#: js/files.js:171
+#: js/files.js:179
 msgid "generating ZIP-file, it may take some time."
 msgstr ""
 
-#: js/files.js:200
+#: js/files.js:208
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:200
+#: js/files.js:208
 msgid "Upload Error"
 msgstr ""
 
-#: js/files.js:228 js/files.js:319 js/files.js:348
+#: js/files.js:236 js/files.js:327 js/files.js:356
 msgid "Pending"
 msgstr ""
 
-#: js/files.js:333
+#: js/files.js:341
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:457
+#: js/files.js:409
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr ""
+
+#: js/files.js:480
 msgid "Invalid name, '/' is not allowed."
 msgstr ""
 
-#: js/files.js:703 templates/index.php:55
+#: js/files.js:726 templates/index.php:55
 msgid "Size"
 msgstr ""
 
-#: js/files.js:704 templates/index.php:56
+#: js/files.js:727 templates/index.php:56
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:731
+#: js/files.js:754
 msgid "folder"
 msgstr ""
 
-#: js/files.js:733
+#: js/files.js:756
 msgid "folders"
 msgstr ""
 
-#: js/files.js:741
+#: js/files.js:764
 msgid "file"
 msgstr ""
 
-#: js/files.js:743
+#: js/files.js:766
 msgid "files"
 msgstr ""
 
diff --git a/l10n/so/files_sharing.po b/l10n/so/files_sharing.po
index a4c02dcdc9..dbbd4da284 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-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:03+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -25,10 +25,14 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
-#: templates/public.php:9
+#: templates/public.php:9 templates/public.php:19
 msgid "Download"
 msgstr ""
 
-#: templates/public.php:17
+#: templates/public.php:18
+msgid "No preview available for"
+msgstr ""
+
+#: templates/public.php:23
 msgid "web services under your control"
 msgstr ""
diff --git a/l10n/so/settings.po b/l10n/so/settings.po
index 7212017b5e..a3488b9f01 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-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:03+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
diff --git a/l10n/sr/core.po b/l10n/sr/core.po
index b575b78776..a26d7b7529 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-08-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:02+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -34,55 +34,55 @@ msgstr ""
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr ""
 
-#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:206 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr "Подешавања"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "January"
 msgstr ""
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "February"
 msgstr ""
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "March"
 msgstr ""
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "April"
 msgstr ""
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "May"
 msgstr ""
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "June"
 msgstr ""
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "July"
 msgstr ""
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "August"
 msgstr ""
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "September"
 msgstr ""
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "October"
 msgstr ""
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "November"
 msgstr ""
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "December"
 msgstr ""
 
@@ -244,7 +244,7 @@ msgstr "Заврши подешавање"
 msgid "web services under your control"
 msgstr "веб сервиси под контролом"
 
-#: templates/layout.user.php:49
+#: templates/layout.user.php:45
 msgid "Log out"
 msgstr "Одјава"
 
diff --git a/l10n/sr/files.po b/l10n/sr/files.po
index f8aaefdd55..67e491506f 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-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -52,7 +52,7 @@ msgstr ""
 msgid "Files"
 msgstr "Фајлови"
 
-#: js/fileactions.js:107 templates/index.php:56
+#: js/fileactions.js:106 templates/index.php:56
 msgid "Delete"
 msgstr "Обриши"
 
@@ -84,51 +84,56 @@ msgstr ""
 msgid "deleted"
 msgstr ""
 
-#: js/files.js:171
+#: js/files.js:179
 msgid "generating ZIP-file, it may take some time."
 msgstr ""
 
-#: js/files.js:200
+#: js/files.js:208
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:200
+#: js/files.js:208
 msgid "Upload Error"
 msgstr ""
 
-#: js/files.js:228 js/files.js:319 js/files.js:348
+#: js/files.js:236 js/files.js:327 js/files.js:356
 msgid "Pending"
 msgstr ""
 
-#: js/files.js:333
+#: js/files.js:341
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:457
+#: js/files.js:409
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr ""
+
+#: js/files.js:480
 msgid "Invalid name, '/' is not allowed."
 msgstr ""
 
-#: js/files.js:703 templates/index.php:55
+#: js/files.js:726 templates/index.php:55
 msgid "Size"
 msgstr "Величина"
 
-#: js/files.js:704 templates/index.php:56
+#: js/files.js:727 templates/index.php:56
 msgid "Modified"
 msgstr "Задња измена"
 
-#: js/files.js:731
+#: js/files.js:754
 msgid "folder"
 msgstr ""
 
-#: js/files.js:733
+#: js/files.js:756
 msgid "folders"
 msgstr ""
 
-#: js/files.js:741
+#: js/files.js:764
 msgid "file"
 msgstr ""
 
-#: js/files.js:743
+#: js/files.js:766
 msgid "files"
 msgstr ""
 
diff --git a/l10n/sr/files_sharing.po b/l10n/sr/files_sharing.po
index 8026a97b6a..c1bbe16e93 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-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:03+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -25,10 +25,14 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
-#: templates/public.php:9
+#: templates/public.php:9 templates/public.php:19
 msgid "Download"
 msgstr ""
 
-#: templates/public.php:17
+#: templates/public.php:18
+msgid "No preview available for"
+msgstr ""
+
+#: templates/public.php:23
 msgid "web services under your control"
 msgstr ""
diff --git a/l10n/sr/settings.po b/l10n/sr/settings.po
index 6e36da2b90..f15d091582 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-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:03+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
diff --git a/l10n/sr@latin/core.po b/l10n/sr@latin/core.po
index 7d743cabb8..57abf6fe74 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-08-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:02+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -34,55 +34,55 @@ msgstr ""
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr ""
 
-#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:206 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr "Podešavanja"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "January"
 msgstr ""
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "February"
 msgstr ""
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "March"
 msgstr ""
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "April"
 msgstr ""
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "May"
 msgstr ""
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "June"
 msgstr ""
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "July"
 msgstr ""
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "August"
 msgstr ""
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "September"
 msgstr ""
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "October"
 msgstr ""
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "November"
 msgstr ""
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "December"
 msgstr ""
 
@@ -244,7 +244,7 @@ msgstr "Završi podešavanje"
 msgid "web services under your control"
 msgstr ""
 
-#: templates/layout.user.php:49
+#: templates/layout.user.php:45
 msgid "Log out"
 msgstr "Odjava"
 
diff --git a/l10n/sr@latin/files.po b/l10n/sr@latin/files.po
index b72a13bcbb..0c7f3b5aca 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-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -52,7 +52,7 @@ msgstr ""
 msgid "Files"
 msgstr "Fajlovi"
 
-#: js/fileactions.js:107 templates/index.php:56
+#: js/fileactions.js:106 templates/index.php:56
 msgid "Delete"
 msgstr "Obriši"
 
@@ -84,51 +84,56 @@ msgstr ""
 msgid "deleted"
 msgstr ""
 
-#: js/files.js:171
+#: js/files.js:179
 msgid "generating ZIP-file, it may take some time."
 msgstr ""
 
-#: js/files.js:200
+#: js/files.js:208
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:200
+#: js/files.js:208
 msgid "Upload Error"
 msgstr ""
 
-#: js/files.js:228 js/files.js:319 js/files.js:348
+#: js/files.js:236 js/files.js:327 js/files.js:356
 msgid "Pending"
 msgstr ""
 
-#: js/files.js:333
+#: js/files.js:341
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:457
+#: js/files.js:409
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr ""
+
+#: js/files.js:480
 msgid "Invalid name, '/' is not allowed."
 msgstr ""
 
-#: js/files.js:703 templates/index.php:55
+#: js/files.js:726 templates/index.php:55
 msgid "Size"
 msgstr "Veličina"
 
-#: js/files.js:704 templates/index.php:56
+#: js/files.js:727 templates/index.php:56
 msgid "Modified"
 msgstr "Zadnja izmena"
 
-#: js/files.js:731
+#: js/files.js:754
 msgid "folder"
 msgstr ""
 
-#: js/files.js:733
+#: js/files.js:756
 msgid "folders"
 msgstr ""
 
-#: js/files.js:741
+#: js/files.js:764
 msgid "file"
 msgstr ""
 
-#: js/files.js:743
+#: js/files.js:766
 msgid "files"
 msgstr ""
 
diff --git a/l10n/sr@latin/files_sharing.po b/l10n/sr@latin/files_sharing.po
index 1dadcaa0c7..7536a9cba8 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-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:03+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -25,10 +25,14 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
-#: templates/public.php:9
+#: templates/public.php:9 templates/public.php:19
 msgid "Download"
 msgstr ""
 
-#: templates/public.php:17
+#: templates/public.php:18
+msgid "No preview available for"
+msgstr ""
+
+#: templates/public.php:23
 msgid "web services under your control"
 msgstr ""
diff --git a/l10n/sr@latin/settings.po b/l10n/sr@latin/settings.po
index 69ad747d51..6c84ec656f 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-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:03+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
diff --git a/l10n/sv/core.po b/l10n/sv/core.po
index dca8b46a25..a42d5e9bda 100644
--- a/l10n/sv/core.po
+++ b/l10n/sv/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-08-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:02+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -39,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:201 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:206 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr "Inställningar"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "January"
 msgstr "Januari"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "February"
 msgstr "Februari"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "March"
 msgstr "Mars"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "April"
 msgstr "April"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "May"
 msgstr "Maj"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "June"
 msgstr "Juni"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "July"
 msgstr "Juli"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "August"
 msgstr "Augusti"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "September"
 msgstr "September"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "October"
 msgstr "Oktober"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "November"
 msgstr "November"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "December"
 msgstr "December"
 
@@ -249,7 +249,7 @@ msgstr "Avsluta installation"
 msgid "web services under your control"
 msgstr "webbtjänster under din kontroll"
 
-#: templates/layout.user.php:49
+#: templates/layout.user.php:45
 msgid "Log out"
 msgstr "Logga ut"
 
diff --git a/l10n/sv/files.po b/l10n/sv/files.po
index 14004c7fae..f5e6200788 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-22 02:04+0200\n"
-"PO-Revision-Date: 2012-08-21 08:24+0000\n"
-"Last-Translator: Magnus Höglund <magnus@linux.com>\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -57,7 +57,7 @@ msgstr "Misslyckades spara till disk"
 msgid "Files"
 msgstr "Filer"
 
-#: js/fileactions.js:107 templates/index.php:56
+#: js/fileactions.js:106 templates/index.php:56
 msgid "Delete"
 msgstr "Radera"
 
@@ -89,51 +89,56 @@ msgstr "ångra"
 msgid "deleted"
 msgstr "raderad"
 
-#: js/files.js:171
+#: js/files.js:179
 msgid "generating ZIP-file, it may take some time."
 msgstr "genererar ZIP-fil, det kan ta lite tid."
 
-#: js/files.js:200
+#: js/files.js:208
 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:200
+#: js/files.js:208
 msgid "Upload Error"
 msgstr "Uppladdningsfel"
 
-#: js/files.js:228 js/files.js:319 js/files.js:348
+#: js/files.js:236 js/files.js:327 js/files.js:356
 msgid "Pending"
 msgstr "Väntar"
 
-#: js/files.js:333
+#: js/files.js:341
 msgid "Upload cancelled."
 msgstr "Uppladdning avbruten."
 
-#: js/files.js:457
+#: js/files.js:409
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr ""
+
+#: js/files.js:480
 msgid "Invalid name, '/' is not allowed."
 msgstr "Ogiltigt namn, '/' är inte tillåten."
 
-#: js/files.js:703 templates/index.php:55
+#: js/files.js:726 templates/index.php:55
 msgid "Size"
 msgstr "Storlek"
 
-#: js/files.js:704 templates/index.php:56
+#: js/files.js:727 templates/index.php:56
 msgid "Modified"
 msgstr "Ändrad"
 
-#: js/files.js:731
+#: js/files.js:754
 msgid "folder"
 msgstr "mapp"
 
-#: js/files.js:733
+#: js/files.js:756
 msgid "folders"
 msgstr "mappar"
 
-#: js/files.js:741
+#: js/files.js:764
 msgid "file"
 msgstr "fil"
 
-#: js/files.js:743
+#: js/files.js:766
 msgid "files"
 msgstr "filer"
 
diff --git a/l10n/sv/files_sharing.po b/l10n/sv/files_sharing.po
index 24b8b4512a..8605c3d5d7 100644
--- a/l10n/sv/files_sharing.po
+++ b/l10n/sv/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-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:03+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -26,10 +26,14 @@ msgstr "Lösenord"
 msgid "Submit"
 msgstr "Skicka"
 
-#: templates/public.php:9
+#: templates/public.php:9 templates/public.php:19
 msgid "Download"
+msgstr "Ladda ner"
+
+#: templates/public.php:18
+msgid "No preview available for"
 msgstr ""
 
-#: templates/public.php:17
+#: templates/public.php:23
 msgid "web services under your control"
-msgstr ""
+msgstr "webbtjänster under din kontroll"
diff --git a/l10n/sv/settings.po b/l10n/sv/settings.po
index 809d52de8c..325053565a 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-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:03+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index 6739a9d17a..d43c24c59c 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-30 02:02+0200\n"
+"POT-Creation-Date: 2012-08-31 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,55 +33,55 @@ msgstr ""
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr ""
 
-#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:206 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "January"
 msgstr ""
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "February"
 msgstr ""
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "March"
 msgstr ""
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "April"
 msgstr ""
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "May"
 msgstr ""
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "June"
 msgstr ""
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "July"
 msgstr ""
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "August"
 msgstr ""
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "September"
 msgstr ""
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "October"
 msgstr ""
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "November"
 msgstr ""
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "December"
 msgstr ""
 
@@ -243,7 +243,7 @@ msgstr ""
 msgid "web services under your control"
 msgstr ""
 
-#: templates/layout.user.php:49
+#: templates/layout.user.php:45
 msgid "Log out"
 msgstr ""
 
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index 35fb96910c..1f2ea860e0 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-30 02:02+0200\n"
+"POT-Creation-Date: 2012-08-31 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"
@@ -51,7 +51,7 @@ msgstr ""
 msgid "Files"
 msgstr ""
 
-#: js/fileactions.js:111 templates/index.php:56
+#: js/fileactions.js:106 templates/index.php:56
 msgid "Delete"
 msgstr ""
 
@@ -83,51 +83,56 @@ msgstr ""
 msgid "deleted"
 msgstr ""
 
-#: js/files.js:171
+#: js/files.js:179
 msgid "generating ZIP-file, it may take some time."
 msgstr ""
 
-#: js/files.js:200
+#: js/files.js:208
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:200
+#: js/files.js:208
 msgid "Upload Error"
 msgstr ""
 
-#: js/files.js:228 js/files.js:319 js/files.js:348
+#: js/files.js:236 js/files.js:327 js/files.js:356
 msgid "Pending"
 msgstr ""
 
-#: js/files.js:333
+#: js/files.js:341
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:457
+#: js/files.js:409
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr ""
+
+#: js/files.js:480
 msgid "Invalid name, '/' is not allowed."
 msgstr ""
 
-#: js/files.js:703 templates/index.php:55
+#: js/files.js:726 templates/index.php:55
 msgid "Size"
 msgstr ""
 
-#: js/files.js:704 templates/index.php:56
+#: js/files.js:727 templates/index.php:56
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:731
+#: js/files.js:754
 msgid "folder"
 msgstr ""
 
-#: js/files.js:733
+#: js/files.js:756
 msgid "folders"
 msgstr ""
 
-#: js/files.js:741
+#: js/files.js:764
 msgid "file"
 msgstr ""
 
-#: js/files.js:743
+#: js/files.js:766
 msgid "files"
 msgstr ""
 
diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot
index 45fa676de0..9aaa78f17f 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-30 02:02+0200\n"
+"POT-Creation-Date: 2012-08-31 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 eab876421f..d1350464ed 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-30 02:02+0200\n"
+"POT-Creation-Date: 2012-08-31 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 ecdb5b3a51..19c56ef174 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-30 02:02+0200\n"
+"POT-Creation-Date: 2012-08-31 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"
@@ -25,10 +25,14 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
-#: templates/public.php:9
+#: templates/public.php:9 templates/public.php:19
 msgid "Download"
 msgstr ""
 
-#: templates/public.php:17
+#: templates/public.php:18
+msgid "No preview available for"
+msgstr ""
+
+#: templates/public.php:23
 msgid "web services under your control"
 msgstr ""
diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot
index a47259a971..934a3cccec 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-30 02:02+0200\n"
+"POT-Creation-Date: 2012-08-31 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 95f3528e35..f74684b23e 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-30 02:02+0200\n"
+"POT-Creation-Date: 2012-08-31 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 9d3d862be6..a326ab25b3 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-30 02:02+0200\n"
+"POT-Creation-Date: 2012-08-31 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 8813bf2773..bedad41808 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-30 02:02+0200\n"
+"POT-Creation-Date: 2012-08-31 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/core.po b/l10n/th_TH/core.po
index 56e4b1d41f..2c98916ec0 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-08-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:02+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -35,55 +35,55 @@ msgstr "หมวดหมู่นี้มีอยู่แล้ว: "
 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:201 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:206 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr "ตั้งค่า"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "January"
 msgstr "มกราคม"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "February"
 msgstr "กุมภาพันธ์"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "March"
 msgstr "มีนาคม"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "April"
 msgstr "เมษายน"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "May"
 msgstr "พฤษภาคม"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "June"
 msgstr "มิถุนายน"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "July"
 msgstr "กรกฏาคม"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "August"
 msgstr "สิงหาคม"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "September"
 msgstr "กันยายน"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "October"
 msgstr "ตุลาคม"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "November"
 msgstr "พฤศจิกายน"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "December"
 msgstr "ธันวาคม"
 
@@ -245,7 +245,7 @@ msgstr "ติดตั้งเรียบร้อยแล้ว"
 msgid "web services under your control"
 msgstr "web services under your control"
 
-#: templates/layout.user.php:49
+#: templates/layout.user.php:45
 msgid "Log out"
 msgstr "ออกจากระบบ"
 
diff --git a/l10n/th_TH/files.po b/l10n/th_TH/files.po
index 773e125153..4ff4ae0cd4 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-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -53,7 +53,7 @@ msgstr "เขียนข้อมูลลงแผ่นดิสก์ล้
 msgid "Files"
 msgstr "ไฟล์"
 
-#: js/fileactions.js:107 templates/index.php:56
+#: js/fileactions.js:106 templates/index.php:56
 msgid "Delete"
 msgstr "ลบ"
 
@@ -85,51 +85,56 @@ msgstr "เลิกทำ"
 msgid "deleted"
 msgstr "ลบแล้ว"
 
-#: js/files.js:171
+#: js/files.js:179
 msgid "generating ZIP-file, it may take some time."
 msgstr "กำลังสร้างไฟล์บีบอัด ZIP อาจใช้เวลาสักครู่"
 
-#: js/files.js:200
+#: js/files.js:208
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "ไม่สามารถอัพโหลดไฟล์ของคุณได้ เนื่องจากไฟล์ดังกล่าวเป็นไดเร็กทอรี่หรือมีขนาด 0 ไบต์"
 
-#: js/files.js:200
+#: js/files.js:208
 msgid "Upload Error"
 msgstr "เกิดข้อผิดพลาดในการอัพโหลด"
 
-#: js/files.js:228 js/files.js:319 js/files.js:348
+#: js/files.js:236 js/files.js:327 js/files.js:356
 msgid "Pending"
 msgstr "อยู่ระหว่างดำเนินการ"
 
-#: js/files.js:333
+#: js/files.js:341
 msgid "Upload cancelled."
 msgstr "การอัพโหลดถูกยกเลิก"
 
-#: js/files.js:457
+#: js/files.js:409
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr ""
+
+#: js/files.js:480
 msgid "Invalid name, '/' is not allowed."
 msgstr "ชื่อที่ใช้ไม่ถูกต้อง '/' ไม่อนุญาตให้ใช้งาน"
 
-#: js/files.js:703 templates/index.php:55
+#: js/files.js:726 templates/index.php:55
 msgid "Size"
 msgstr "ขนาด"
 
-#: js/files.js:704 templates/index.php:56
+#: js/files.js:727 templates/index.php:56
 msgid "Modified"
 msgstr "ปรับปรุงล่าสุด"
 
-#: js/files.js:731
+#: js/files.js:754
 msgid "folder"
 msgstr "โฟลเดอร์"
 
-#: js/files.js:733
+#: js/files.js:756
 msgid "folders"
 msgstr "โฟลเดอร์"
 
-#: js/files.js:741
+#: js/files.js:764
 msgid "file"
 msgstr "ไฟล์"
 
-#: js/files.js:743
+#: js/files.js:766
 msgid "files"
 msgstr "ไฟล์"
 
diff --git a/l10n/th_TH/files_sharing.po b/l10n/th_TH/files_sharing.po
index d7cd4c2f06..8f2587456f 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-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:03+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -26,10 +26,14 @@ msgstr "รหัสผ่าน"
 msgid "Submit"
 msgstr "ส่ง"
 
-#: templates/public.php:9
+#: templates/public.php:9 templates/public.php:19
 msgid "Download"
+msgstr "ดาวน์โหลด"
+
+#: templates/public.php:18
+msgid "No preview available for"
 msgstr ""
 
-#: templates/public.php:17
+#: templates/public.php:23
 msgid "web services under your control"
-msgstr ""
+msgstr "เว็บเซอร์วิสที่คุณควบคุมการใช้งานได้"
diff --git a/l10n/th_TH/settings.po b/l10n/th_TH/settings.po
index aed3e24a8b..2d94b32cab 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-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:03+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
diff --git a/l10n/tr/core.po b/l10n/tr/core.po
index 9ebd27c72b..40f3cba6d9 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-08-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:02+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -35,55 +35,55 @@ msgstr "Bu kategori zaten mevcut: "
 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:201 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:206 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr "Ayarlar"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "January"
 msgstr "Ocak"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "February"
 msgstr "Şubat"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "March"
 msgstr "Mart"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "April"
 msgstr "Nisan"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "May"
 msgstr "Mayıs"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "June"
 msgstr "Haziran"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "July"
 msgstr "Temmuz"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "August"
 msgstr "Ağustos"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "September"
 msgstr "Eylül"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "October"
 msgstr "Ekim"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "November"
 msgstr "Kasım"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "December"
 msgstr "Aralık"
 
@@ -245,7 +245,7 @@ msgstr "Kurulumu tamamla"
 msgid "web services under your control"
 msgstr "kontrolünüzdeki web servisleri"
 
-#: templates/layout.user.php:49
+#: templates/layout.user.php:45
 msgid "Log out"
 msgstr "Çıkış yap"
 
diff --git a/l10n/tr/files.po b/l10n/tr/files.po
index 3498950112..31e1b22ebf 100644
--- a/l10n/tr/files.po
+++ b/l10n/tr/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-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -54,7 +54,7 @@ msgstr "Diske yazılamadı"
 msgid "Files"
 msgstr "Dosyalar"
 
-#: js/fileactions.js:107 templates/index.php:56
+#: js/fileactions.js:106 templates/index.php:56
 msgid "Delete"
 msgstr "Sil"
 
@@ -86,51 +86,56 @@ msgstr "geri al"
 msgid "deleted"
 msgstr "silindi"
 
-#: js/files.js:171
+#: js/files.js:179
 msgid "generating ZIP-file, it may take some time."
 msgstr "ZIP dosyası oluşturuluyor, biraz sürebilir."
 
-#: js/files.js:200
+#: js/files.js:208
 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:200
+#: js/files.js:208
 msgid "Upload Error"
 msgstr "Yükleme hatası"
 
-#: js/files.js:228 js/files.js:319 js/files.js:348
+#: js/files.js:236 js/files.js:327 js/files.js:356
 msgid "Pending"
 msgstr "Bekliyor"
 
-#: js/files.js:333
+#: js/files.js:341
 msgid "Upload cancelled."
 msgstr "Yükleme iptal edildi."
 
-#: js/files.js:457
+#: js/files.js:409
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr ""
+
+#: js/files.js:480
 msgid "Invalid name, '/' is not allowed."
 msgstr "Geçersiz isim, '/' işaretine izin verilmiyor."
 
-#: js/files.js:703 templates/index.php:55
+#: js/files.js:726 templates/index.php:55
 msgid "Size"
 msgstr "Boyut"
 
-#: js/files.js:704 templates/index.php:56
+#: js/files.js:727 templates/index.php:56
 msgid "Modified"
 msgstr "Değiştirilme"
 
-#: js/files.js:731
+#: js/files.js:754
 msgid "folder"
 msgstr "dizin"
 
-#: js/files.js:733
+#: js/files.js:756
 msgid "folders"
 msgstr "dizinler"
 
-#: js/files.js:741
+#: js/files.js:764
 msgid "file"
 msgstr "dosya"
 
-#: js/files.js:743
+#: js/files.js:766
 msgid "files"
 msgstr "dosyalar"
 
diff --git a/l10n/tr/files_sharing.po b/l10n/tr/files_sharing.po
index 5245890ac9..7f22432893 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-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:03+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -25,10 +25,14 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
-#: templates/public.php:9
+#: templates/public.php:9 templates/public.php:19
 msgid "Download"
 msgstr ""
 
-#: templates/public.php:17
+#: templates/public.php:18
+msgid "No preview available for"
+msgstr ""
+
+#: templates/public.php:23
 msgid "web services under your control"
 msgstr ""
diff --git a/l10n/tr/settings.po b/l10n/tr/settings.po
index c8ec4df6d3..708860c4e4 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-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:03+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
diff --git a/l10n/uk/core.po b/l10n/uk/core.po
index 5e62d05465..f68db85912 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-08-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:02+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -35,55 +35,55 @@ msgstr ""
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr ""
 
-#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:206 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr "Налаштування"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "January"
 msgstr ""
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "February"
 msgstr ""
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "March"
 msgstr ""
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "April"
 msgstr ""
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "May"
 msgstr ""
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "June"
 msgstr ""
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "July"
 msgstr ""
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "August"
 msgstr ""
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "September"
 msgstr ""
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "October"
 msgstr ""
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "November"
 msgstr ""
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "December"
 msgstr ""
 
@@ -245,7 +245,7 @@ msgstr "Завершити налаштування"
 msgid "web services under your control"
 msgstr "веб-сервіс під вашим контролем"
 
-#: templates/layout.user.php:49
+#: templates/layout.user.php:45
 msgid "Log out"
 msgstr "Вихід"
 
diff --git a/l10n/uk/files.po b/l10n/uk/files.po
index 8fb3ea8778..7b0f0a27ec 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-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -53,7 +53,7 @@ msgstr ""
 msgid "Files"
 msgstr "Файли"
 
-#: js/fileactions.js:107 templates/index.php:56
+#: js/fileactions.js:106 templates/index.php:56
 msgid "Delete"
 msgstr "Видалити"
 
@@ -85,51 +85,56 @@ msgstr "відмінити"
 msgid "deleted"
 msgstr "видалені"
 
-#: js/files.js:171
+#: js/files.js:179
 msgid "generating ZIP-file, it may take some time."
 msgstr "Створення ZIP-файлу, це може зайняти певний час."
 
-#: js/files.js:200
+#: js/files.js:208
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "Неможливо завантажити ваш файл тому, що він тека або файл розміром 0 байт"
 
-#: js/files.js:200
+#: js/files.js:208
 msgid "Upload Error"
 msgstr "Помилка завантаження"
 
-#: js/files.js:228 js/files.js:319 js/files.js:348
+#: js/files.js:236 js/files.js:327 js/files.js:356
 msgid "Pending"
 msgstr "Очікування"
 
-#: js/files.js:333
+#: js/files.js:341
 msgid "Upload cancelled."
 msgstr "Завантаження перервано."
 
-#: js/files.js:457
+#: js/files.js:409
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr ""
+
+#: js/files.js:480
 msgid "Invalid name, '/' is not allowed."
 msgstr "Некоректне ім'я, '/' не дозволено."
 
-#: js/files.js:703 templates/index.php:55
+#: js/files.js:726 templates/index.php:55
 msgid "Size"
 msgstr "Розмір"
 
-#: js/files.js:704 templates/index.php:56
+#: js/files.js:727 templates/index.php:56
 msgid "Modified"
 msgstr "Змінено"
 
-#: js/files.js:731
+#: js/files.js:754
 msgid "folder"
 msgstr "тека"
 
-#: js/files.js:733
+#: js/files.js:756
 msgid "folders"
 msgstr "теки"
 
-#: js/files.js:741
+#: js/files.js:764
 msgid "file"
 msgstr "файл"
 
-#: js/files.js:743
+#: js/files.js:766
 msgid "files"
 msgstr "файли"
 
diff --git a/l10n/uk/files_sharing.po b/l10n/uk/files_sharing.po
index 18f1b3239f..cfebfcf491 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-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:03+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -25,10 +25,14 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
-#: templates/public.php:9
+#: templates/public.php:9 templates/public.php:19
 msgid "Download"
 msgstr ""
 
-#: templates/public.php:17
+#: templates/public.php:18
+msgid "No preview available for"
+msgstr ""
+
+#: templates/public.php:23
 msgid "web services under your control"
 msgstr ""
diff --git a/l10n/uk/settings.po b/l10n/uk/settings.po
index c1747c1f50..2520334ef9 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-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:03+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
diff --git a/l10n/vi/core.po b/l10n/vi/core.po
index 2f5e069a95..16e671b63c 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-08-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:02+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -34,55 +34,55 @@ 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:201 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:206 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr "Cài đặt"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "January"
 msgstr "Tháng 1"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "February"
 msgstr "Tháng 2"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "March"
 msgstr "Tháng 3"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "April"
 msgstr "Tháng 4"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "May"
 msgstr "Tháng 5"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "June"
 msgstr "Tháng 6"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "July"
 msgstr "Tháng 7"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "August"
 msgstr "Tháng 8"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "September"
 msgstr "Tháng 9"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "October"
 msgstr "Tháng 10"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "November"
 msgstr "Tháng 11"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "December"
 msgstr "Tháng 12"
 
@@ -244,7 +244,7 @@ msgstr "Cài đặt hoàn tất"
 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
+#: templates/layout.user.php:45
 msgid "Log out"
 msgstr "Đăng xuất"
 
diff --git a/l10n/vi/files.po b/l10n/vi/files.po
index 8ce76018a8..556eb3d9ac 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-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -52,7 +52,7 @@ msgstr ""
 msgid "Files"
 msgstr "Tập tin"
 
-#: js/fileactions.js:107 templates/index.php:56
+#: js/fileactions.js:106 templates/index.php:56
 msgid "Delete"
 msgstr "Xóa"
 
@@ -84,51 +84,56 @@ msgstr ""
 msgid "deleted"
 msgstr ""
 
-#: js/files.js:171
+#: js/files.js:179
 msgid "generating ZIP-file, it may take some time."
 msgstr ""
 
-#: js/files.js:200
+#: js/files.js:208
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:200
+#: js/files.js:208
 msgid "Upload Error"
 msgstr "Tải lên lỗi"
 
-#: js/files.js:228 js/files.js:319 js/files.js:348
+#: js/files.js:236 js/files.js:327 js/files.js:356
 msgid "Pending"
 msgstr "Chờ"
 
-#: js/files.js:333
+#: js/files.js:341
 msgid "Upload cancelled."
 msgstr "Hủy tải lên"
 
-#: js/files.js:457
+#: js/files.js:409
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr ""
+
+#: js/files.js:480
 msgid "Invalid name, '/' is not allowed."
 msgstr "Tên không hợp lệ ,không được phép dùng '/'"
 
-#: js/files.js:703 templates/index.php:55
+#: js/files.js:726 templates/index.php:55
 msgid "Size"
 msgstr "Kích cỡ"
 
-#: js/files.js:704 templates/index.php:56
+#: js/files.js:727 templates/index.php:56
 msgid "Modified"
 msgstr "Thay đổi"
 
-#: js/files.js:731
+#: js/files.js:754
 msgid "folder"
 msgstr "folder"
 
-#: js/files.js:733
+#: js/files.js:756
 msgid "folders"
 msgstr "folders"
 
-#: js/files.js:741
+#: js/files.js:764
 msgid "file"
 msgstr "file"
 
-#: js/files.js:743
+#: js/files.js:766
 msgid "files"
 msgstr "files"
 
diff --git a/l10n/vi/files_sharing.po b/l10n/vi/files_sharing.po
index d44805eae8..a3aaf62a3e 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-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:03+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -25,10 +25,14 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
-#: templates/public.php:9
+#: templates/public.php:9 templates/public.php:19
 msgid "Download"
 msgstr ""
 
-#: templates/public.php:17
+#: templates/public.php:18
+msgid "No preview available for"
+msgstr ""
+
+#: templates/public.php:23
 msgid "web services under your control"
 msgstr ""
diff --git a/l10n/vi/settings.po b/l10n/vi/settings.po
index 89b1c2df28..a83d1c1185 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-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:03+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
diff --git a/l10n/zh_CN.GB2312/core.po b/l10n/zh_CN.GB2312/core.po
index f8c449f4c4..428eaa941b 100644
--- a/l10n/zh_CN.GB2312/core.po
+++ b/l10n/zh_CN.GB2312/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-08-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:02+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -34,55 +34,55 @@ msgstr "这个分类已经存在了:"
 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:201 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:206 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr "设置"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "January"
 msgstr "一月"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "February"
 msgstr "二月"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "March"
 msgstr "三月"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "April"
 msgstr "四月"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "May"
 msgstr "五月"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "June"
 msgstr "六月"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "July"
 msgstr "七月"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "August"
 msgstr "八月"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "September"
 msgstr "九月"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "October"
 msgstr "十月"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "November"
 msgstr "十一月"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "December"
 msgstr "十二月"
 
@@ -244,7 +244,7 @@ msgstr "完成安装"
 msgid "web services under your control"
 msgstr "你控制下的网络服务"
 
-#: templates/layout.user.php:49
+#: templates/layout.user.php:45
 msgid "Log out"
 msgstr "注销"
 
diff --git a/l10n/zh_CN.GB2312/files.po b/l10n/zh_CN.GB2312/files.po
index 80307c381e..fb7416be4a 100644
--- a/l10n/zh_CN.GB2312/files.po
+++ b/l10n/zh_CN.GB2312/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-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -52,7 +52,7 @@ msgstr "写磁盘失败"
 msgid "Files"
 msgstr "文件"
 
-#: js/fileactions.js:107 templates/index.php:56
+#: js/fileactions.js:106 templates/index.php:56
 msgid "Delete"
 msgstr "删除"
 
@@ -84,51 +84,56 @@ msgstr "撤销"
 msgid "deleted"
 msgstr "删除"
 
-#: js/files.js:171
+#: js/files.js:179
 msgid "generating ZIP-file, it may take some time."
 msgstr "正在生成ZIP文件,这可能需要点时间"
 
-#: js/files.js:200
+#: js/files.js:208
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "不能上传你指定的文件,可能因为它是个文件夹或者大小为0"
 
-#: js/files.js:200
+#: js/files.js:208
 msgid "Upload Error"
 msgstr "上传错误"
 
-#: js/files.js:228 js/files.js:319 js/files.js:348
+#: js/files.js:236 js/files.js:327 js/files.js:356
 msgid "Pending"
 msgstr "Pending"
 
-#: js/files.js:333
+#: js/files.js:341
 msgid "Upload cancelled."
 msgstr "上传取消了"
 
-#: js/files.js:457
+#: js/files.js:409
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr ""
+
+#: js/files.js:480
 msgid "Invalid name, '/' is not allowed."
 msgstr "非法文件名,\"/\"是不被许可的"
 
-#: js/files.js:703 templates/index.php:55
+#: js/files.js:726 templates/index.php:55
 msgid "Size"
 msgstr "大小"
 
-#: js/files.js:704 templates/index.php:56
+#: js/files.js:727 templates/index.php:56
 msgid "Modified"
 msgstr "修改日期"
 
-#: js/files.js:731
+#: js/files.js:754
 msgid "folder"
 msgstr "文件夹"
 
-#: js/files.js:733
+#: js/files.js:756
 msgid "folders"
 msgstr "文件夹"
 
-#: js/files.js:741
+#: js/files.js:764
 msgid "file"
 msgstr "文件"
 
-#: js/files.js:743
+#: js/files.js:766
 msgid "files"
 msgstr "文件"
 
diff --git a/l10n/zh_CN.GB2312/files_sharing.po b/l10n/zh_CN.GB2312/files_sharing.po
index 638e9fffe3..4fdcb4f36f 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-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:03+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -25,10 +25,14 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
-#: templates/public.php:9
+#: templates/public.php:9 templates/public.php:19
 msgid "Download"
 msgstr ""
 
-#: templates/public.php:17
+#: templates/public.php:18
+msgid "No preview available for"
+msgstr ""
+
+#: templates/public.php:23
 msgid "web services under your control"
 msgstr ""
diff --git a/l10n/zh_CN.GB2312/settings.po b/l10n/zh_CN.GB2312/settings.po
index 5390e67449..d0cd8450fc 100644
--- a/l10n/zh_CN.GB2312/settings.po
+++ b/l10n/zh_CN.GB2312/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-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:03+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
diff --git a/l10n/zh_CN/core.po b/l10n/zh_CN/core.po
index bad15c7b6e..83cd931d85 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-08-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:02+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -35,55 +35,55 @@ msgstr "此分类已存在: "
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr ""
 
-#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:206 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr "设置"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "January"
 msgstr "一月"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "February"
 msgstr "二月"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "March"
 msgstr "三月"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "April"
 msgstr "四月"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "May"
 msgstr "五月"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "June"
 msgstr "六月"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "July"
 msgstr "七月"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "August"
 msgstr "八月"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "September"
 msgstr "九月"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "October"
 msgstr "十月"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "November"
 msgstr "十一月"
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "December"
 msgstr "十二月"
 
@@ -245,7 +245,7 @@ msgstr "安装完成"
 msgid "web services under your control"
 msgstr "由您掌控的网络服务"
 
-#: templates/layout.user.php:49
+#: templates/layout.user.php:45
 msgid "Log out"
 msgstr "注销"
 
diff --git a/l10n/zh_CN/files.po b/l10n/zh_CN/files.po
index 8698bb536d..315f265482 100644
--- a/l10n/zh_CN/files.po
+++ b/l10n/zh_CN/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-25 02:04+0200\n"
-"PO-Revision-Date: 2012-08-24 01:52+0000\n"
-"Last-Translator: hanfeng <appweb.cn@gmail.com>\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -54,7 +54,7 @@ msgstr "写入磁盘失败"
 msgid "Files"
 msgstr "文件"
 
-#: js/fileactions.js:111 templates/index.php:56
+#: js/fileactions.js:106 templates/index.php:56
 msgid "Delete"
 msgstr "删除"
 
@@ -86,51 +86,56 @@ msgstr "撤销"
 msgid "deleted"
 msgstr "已经删除"
 
-#: js/files.js:171
+#: js/files.js:179
 msgid "generating ZIP-file, it may take some time."
 msgstr "正在生成 ZIP 文件，可能需要一些时间"
 
-#: js/files.js:200
+#: js/files.js:208
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr "无法上传文件，因为它是一个目录或者大小为 0 字节"
 
-#: js/files.js:200
+#: js/files.js:208
 msgid "Upload Error"
 msgstr "上传错误"
 
-#: js/files.js:228 js/files.js:319 js/files.js:348
+#: js/files.js:236 js/files.js:327 js/files.js:356
 msgid "Pending"
 msgstr "操作等待中"
 
-#: js/files.js:333
+#: js/files.js:341
 msgid "Upload cancelled."
 msgstr "上传已取消"
 
-#: js/files.js:457
+#: js/files.js:409
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr ""
+
+#: js/files.js:480
 msgid "Invalid name, '/' is not allowed."
 msgstr "非法的名称，不允许使用‘/’。"
 
-#: js/files.js:703 templates/index.php:55
+#: js/files.js:726 templates/index.php:55
 msgid "Size"
 msgstr "大小"
 
-#: js/files.js:704 templates/index.php:56
+#: js/files.js:727 templates/index.php:56
 msgid "Modified"
 msgstr "修改日期"
 
-#: js/files.js:731
+#: js/files.js:754
 msgid "folder"
 msgstr "文件夹"
 
-#: js/files.js:733
+#: js/files.js:756
 msgid "folders"
 msgstr "文件夹"
 
-#: js/files.js:741
+#: js/files.js:764
 msgid "file"
 msgstr "文件"
 
-#: js/files.js:743
+#: js/files.js:766
 msgid "files"
 msgstr "文件"
 
diff --git a/l10n/zh_CN/files_sharing.po b/l10n/zh_CN/files_sharing.po
index 70f1f248d9..e6e603fc5a 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-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:03+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -25,10 +25,14 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
-#: templates/public.php:9
+#: templates/public.php:9 templates/public.php:19
 msgid "Download"
 msgstr ""
 
-#: templates/public.php:17
+#: templates/public.php:18
+msgid "No preview available for"
+msgstr ""
+
+#: templates/public.php:23
 msgid "web services under your control"
 msgstr ""
diff --git a/l10n/zh_CN/settings.po b/l10n/zh_CN/settings.po
index 7aaa318528..d65dee34ef 100644
--- a/l10n/zh_CN/settings.po
+++ b/l10n/zh_CN/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-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:03+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
diff --git a/l10n/zh_TW/core.po b/l10n/zh_TW/core.po
index 03ef737717..feb9070fb4 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-08-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:02+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -34,55 +34,55 @@ msgstr "此分類已經存在:"
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr ""
 
-#: js/js.js:201 templates/layout.user.php:64 templates/layout.user.php:65
+#: js/js.js:206 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr "設定"
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "January"
 msgstr ""
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "February"
 msgstr ""
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "March"
 msgstr ""
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "April"
 msgstr ""
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "May"
 msgstr ""
 
-#: js/js.js:586
+#: js/js.js:591
 msgid "June"
 msgstr ""
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "July"
 msgstr ""
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "August"
 msgstr ""
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "September"
 msgstr ""
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "October"
 msgstr ""
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "November"
 msgstr ""
 
-#: js/js.js:587
+#: js/js.js:592
 msgid "December"
 msgstr ""
 
@@ -244,7 +244,7 @@ msgstr "完成設定"
 msgid "web services under your control"
 msgstr "網路服務已在你控制"
 
-#: templates/layout.user.php:49
+#: templates/layout.user.php:45
 msgid "Log out"
 msgstr "登出"
 
diff --git a/l10n/zh_TW/files.po b/l10n/zh_TW/files.po
index 627c3aa115..dc56f8de0c 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-08-21 02:03+0200\n"
-"PO-Revision-Date: 2012-08-21 00:04+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -53,7 +53,7 @@ msgstr "寫入硬碟失敗"
 msgid "Files"
 msgstr "檔案"
 
-#: js/fileactions.js:107 templates/index.php:56
+#: js/fileactions.js:106 templates/index.php:56
 msgid "Delete"
 msgstr "刪除"
 
@@ -85,51 +85,56 @@ msgstr ""
 msgid "deleted"
 msgstr ""
 
-#: js/files.js:171
+#: js/files.js:179
 msgid "generating ZIP-file, it may take some time."
 msgstr ""
 
-#: js/files.js:200
+#: js/files.js:208
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
 msgstr ""
 
-#: js/files.js:200
+#: js/files.js:208
 msgid "Upload Error"
 msgstr ""
 
-#: js/files.js:228 js/files.js:319 js/files.js:348
+#: js/files.js:236 js/files.js:327 js/files.js:356
 msgid "Pending"
 msgstr ""
 
-#: js/files.js:333
+#: js/files.js:341
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:457
+#: js/files.js:409
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr ""
+
+#: js/files.js:480
 msgid "Invalid name, '/' is not allowed."
 msgstr ""
 
-#: js/files.js:703 templates/index.php:55
+#: js/files.js:726 templates/index.php:55
 msgid "Size"
 msgstr "大小"
 
-#: js/files.js:704 templates/index.php:56
+#: js/files.js:727 templates/index.php:56
 msgid "Modified"
 msgstr "修改"
 
-#: js/files.js:731
+#: js/files.js:754
 msgid "folder"
 msgstr ""
 
-#: js/files.js:733
+#: js/files.js:756
 msgid "folders"
 msgstr ""
 
-#: js/files.js:741
+#: js/files.js:764
 msgid "file"
 msgstr ""
 
-#: js/files.js:743
+#: js/files.js:766
 msgid "files"
 msgstr ""
 
diff --git a/l10n/zh_TW/files_sharing.po b/l10n/zh_TW/files_sharing.po
index 744c965f70..3699385698 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-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:03+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -25,10 +25,14 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
-#: templates/public.php:9
+#: templates/public.php:9 templates/public.php:19
 msgid "Download"
 msgstr ""
 
-#: templates/public.php:17
+#: templates/public.php:18
+msgid "No preview available for"
+msgstr ""
+
+#: templates/public.php:23
 msgid "web services under your control"
 msgstr ""
diff --git a/l10n/zh_TW/settings.po b/l10n/zh_TW/settings.po
index ed8f34b1a3..19686a64f5 100644
--- a/l10n/zh_TW/settings.po
+++ b/l10n/zh_TW/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-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 00:03+0000\n"
+"POT-Creation-Date: 2012-08-31 02:02+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
diff --git a/settings/l10n/de.php b/settings/l10n/de.php
index 791a75fd7c..8a9e4bd568 100644
--- a/settings/l10n/de.php
+++ b/settings/l10n/de.php
@@ -1,5 +1,5 @@
 <?php $TRANSLATIONS = array(
-"Unable to load list from App Store" => "Liste der Apps im Store konnte nicht geladen werden.",
+"Unable to load list from App Store" => "Die 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",
@@ -19,13 +19,13 @@
 "Log" => "Log",
 "More" => "Mehr",
 "Add your App" => "Fügen Sie Ihre App hinzu",
-"Select an App" => "Wähle eine Anwendung aus",
-"See application page at apps.owncloud.com" => "Weitere Anwendungen auf apps.owncloud.com",
+"Select an App" => "Wählen Sie eine Anwendung aus",
+"See application page at apps.owncloud.com" => "Weitere Anwendungen finden Sie auf apps.owncloud.com",
 "-licensed" => "-lizenziert",
 "by" => "von",
 "Documentation" => "Dokumentation",
 "Managing Big Files" => "Große Dateien verwalten",
-"Ask a question" => "Stell eine Frage",
+"Ask a question" => "Stellen Sie eine Frage",
 "Problems connecting to help database." => "Probleme bei der Verbindung zur Hilfe-Datenbank.",
 "Go there manually." => "Datenbank direkt besuchen.",
 "Answer" => "Antwort",
@@ -44,7 +44,7 @@
 "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" => "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.",
+"use this address to connect to your ownCloud in your file manager" => "Benutzen Sie diese Adresse, um Ihre ownCloud mit Ihrem Dateimanager zu verbinden.",
 "Name" => "Name",
 "Password" => "Passwort",
 "Groups" => "Gruppen",
diff --git a/settings/l10n/ro.php b/settings/l10n/ro.php
index 1b69b7a84f..b47e9c491a 100644
--- a/settings/l10n/ro.php
+++ b/settings/l10n/ro.php
@@ -1,12 +1,26 @@
 <?php $TRANSLATIONS = array(
+"Unable to load list from App Store" => "Imposibil de încărcat lista din App Store",
+"Email saved" => "E-mail salvat",
+"Invalid email" => "E-mail nevalid",
 "OpenID Changed" => "OpenID schimbat",
 "Invalid request" => "Cerere eronată",
+"Authentication error" => "Eroare de autentificare",
 "Language changed" => "Limba a fost schimbată",
+"Error" => "Erroare",
+"Disable" => "Dezactivați",
+"Enable" => "Activați",
+"Saving..." => "Salvez...",
 "__language_name__" => "_language_name_",
+"Security Warning" => "Avertisment de securitate",
+"Cron" => "Cron",
+"execute one task with each page loaded" => "executâ o sarcină cu fiecare pagină încărcată",
+"cron.php is registered at a webcron service" => "cron.php e înregistrat la un serviciu de webcron",
+"use systems cron service" => "utilizează serviciul de cron al sistemului",
 "Log" => "Jurnal de activitate",
 "More" => "Mai mult",
 "Add your App" => "Adaugă aplicația ta",
 "Select an App" => "Selectează o aplicație",
+"See application page at apps.owncloud.com" => "Vizualizează pagina applicației pe apps.owncloud.com",
 "-licensed" => "-autorizat",
 "by" => "de",
 "Documentation" => "Documetație",
@@ -37,6 +51,7 @@
 "Create" => "Crează",
 "Default Quota" => "Cotă implicită",
 "Other" => "Altele",
+"Group Admin" => "Grupul Admin ",
 "Quota" => "Cotă",
 "Delete" => "Șterge"
 );

From 6f8efcfe6162cd7fea68dd0677b7d4a6f1120c1f Mon Sep 17 00:00:00 2001
From: Thomas Mueller <thomas.mueller@tmit.eu>
Date: Fri, 31 Aug 2012 10:51:35 +0200
Subject: [PATCH 1018/1224] l18n support lib/updater.php

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

diff --git a/lib/updater.php b/lib/updater.php
index 967f64c0b3..1b1a4eab97 100644
--- a/lib/updater.php
+++ b/lib/updater.php
@@ -58,15 +58,17 @@ class OC_Updater{
 	}
 
 	public static function ShowUpdatingHint(){
+		$l = OC_L10N::get('lib');
+
 		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>';
+				$txt='<span style="color:#AA0000; font-weight:bold;">'.$l->t('%s is available. Get <a href="%s">more information</a>',array($data['versionstring'], $data['web'])).'</span>';
 			}else{
-				$txt='up to date';
+				$txt=$l->t('up to date');
 			}
 		}else{
-			$txt='updates check is disabled';
+			$txt=$l->t('updates check is disabled');
 		}
 		return($txt);
 	}

From 72e80bf6bd7c1dfe8e6b23787c2ba8d8add098c9 Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <frank@owncloud.org>
Date: Fri, 31 Aug 2012 20:22:03 +0200
Subject: [PATCH 1019/1224] send the current owncloud version to the ocs server
 so that we can filter for compatible apps

---
 lib/ocsclient.php          | 7 +++++--
 settings/ajax/apps/ocs.php | 3 ++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/lib/ocsclient.php b/lib/ocsclient.php
index f05a9af31c..dde2545858 100644
--- a/lib/ocsclient.php
+++ b/lib/ocsclient.php
@@ -88,7 +88,7 @@ class OC_OCSClient{
 	 *
 	 * This function returns a list of all the applications on the OCS server
 	 */
-	public static function getApplications($categories,$page){
+	public static function getApplications($categories,$page,$filter){
 		if(OC_Config::getValue('appstoreenabled', true)==false){
 			return(array());
 		}
@@ -98,7 +98,10 @@ class OC_OCSClient{
 		}else{
 			$categoriesstring=$categories;
 		}
-		$url=OC_OCSClient::getAppStoreURL().'/content/data?categories='.urlencode($categoriesstring).'&sortmode=new&page='.urlencode($page).'&pagesize=100';
+
+		$version='&version='.implode('x',\OC_Util::getVersion());
+		$filterurl='&filter='.urlencode($filter);
+		$url=OC_OCSClient::getAppStoreURL().'/content/data?categories='.urlencode($categoriesstring).'&sortmode=new&page='.urlencode($page).'&pagesize=100'.$filterurl.$version;
 		$apps=array();
 		$xml=@file_get_contents($url);
 		if($xml==FALSE){
diff --git a/settings/ajax/apps/ocs.php b/settings/ajax/apps/ocs.php
index 082f1cfb92..f68843fac3 100644
--- a/settings/ajax/apps/ocs.php
+++ b/settings/ajax/apps/ocs.php
@@ -30,7 +30,8 @@ $catagoryNames=OC_OCSClient::getCategories();
 if(is_array($catagoryNames)){
 	$categories=array_keys($catagoryNames);
 	$page=0;
-	$externalApps=OC_OCSClient::getApplications($categories,$page);
+	$filter='approved';
+	$externalApps=OC_OCSClient::getApplications($categories,$page,$filter);
 	foreach($externalApps as $app){
 		// show only external apps that aren't enabled yet
 		$local=false;

From c07eb4fec69ad8d691a1168f5a09db5e52f65589 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Fri, 31 Aug 2012 17:26:32 -0400
Subject: [PATCH 1020/1224] Make css selector more specific for the sharing
 dropdown

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

diff --git a/core/css/share.css b/core/css/share.css
index abaeb07dd8..cccc3585a4 100644
--- a/core/css/share.css
+++ b/core/css/share.css
@@ -16,5 +16,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; }
 #link { border-top:1px solid #ddd; padding-top:0.5em; }
-input[type="text"], input[type="password"] { width:90%; }
+#dropdown input[type="text"], #dropdown input[type="password"] { width:90%; }
 #linkText, #linkPass { display:none; }

From efa0478d2d6c78639d5839c9014f25dac1f11d98 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Fri, 31 Aug 2012 17:31:28 -0400
Subject: [PATCH 1021/1224] Remove share permission for encrypted files

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

diff --git a/lib/files.php b/lib/files.php
index a303c07872..b8af5e04b7 100644
--- a/lib/files.php
+++ b/lib/files.php
@@ -56,7 +56,11 @@ class OC_Files {
 			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;
+				$permissions = OCP\Share::PERMISSION_READ;
+				// NOTE: Remove check when new encryption is merged
+				if (!$file['encrypted']) {
+					$permissions |= OCP\Share::PERMISSION_SHARE;
+				}
 				if ($file['type'] == 'dir' && $file['writable']) {
 					$permissions |= OCP\Share::PERMISSION_CREATE;
 				}

From ab090d5277a836667d71e09d1ac5288de85a5434 Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <thomas.mueller@tmit.eu>
Date: Sat, 1 Sep 2012 02:04:00 +0200
Subject: [PATCH 1022/1224] [tx-robot] updated from transifex

---
 apps/files/l10n/ca.php              |  1 +
 apps/files/l10n/de.php              |  1 +
 apps/files/l10n/es.php              |  1 +
 apps/files/l10n/fr.php              |  1 +
 apps/files/l10n/it.php              |  1 +
 apps/files/l10n/ja_JP.php           |  1 +
 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/zh_TW.php           |  9 +++
 apps/files_sharing/l10n/ca.php      |  1 +
 apps/files_sharing/l10n/de.php      |  1 +
 apps/files_sharing/l10n/es.php      |  1 +
 apps/files_sharing/l10n/fr.php      |  1 +
 apps/files_sharing/l10n/it.php      |  1 +
 apps/files_sharing/l10n/ja_JP.php   |  1 +
 apps/files_sharing/l10n/sl.php      |  1 +
 apps/files_sharing/l10n/sv.php      |  1 +
 apps/files_sharing/l10n/th_TH.php   |  1 +
 apps/user_ldap/l10n/de.php          |  3 +-
 apps/user_ldap/l10n/es.php          | 25 +++++++++
 core/l10n/ca.php                    |  1 +
 core/l10n/de.php                    |  1 +
 core/l10n/es.php                    |  1 +
 core/l10n/fr.php                    |  1 +
 core/l10n/it.php                    |  1 +
 core/l10n/ja_JP.php                 |  1 +
 core/l10n/sl.php                    |  1 +
 core/l10n/sv.php                    |  1 +
 core/l10n/th_TH.php                 |  1 +
 core/l10n/tr.php                    |  1 +
 core/l10n/zh_TW.php                 | 20 +++++++
 l10n/af/lib.po                      | 39 ++++++++-----
 l10n/ar/lib.po                      | 39 ++++++++-----
 l10n/ar_SA/lib.po                   | 39 ++++++++-----
 l10n/bg_BG/lib.po                   | 39 ++++++++-----
 l10n/ca/core.po                     |  8 +--
 l10n/ca/files.po                    | 10 ++--
 l10n/ca/files_sharing.po            |  8 +--
 l10n/ca/lib.po                      | 39 ++++++++-----
 l10n/ca/settings.po                 | 24 ++++----
 l10n/cs_CZ/lib.po                   | 27 ++++++---
 l10n/da/lib.po                      | 84 ++++++++++++++++------------
 l10n/de/core.po                     |  8 +--
 l10n/de/files.po                    |  9 +--
 l10n/de/files_sharing.po            |  8 +--
 l10n/de/lib.po                      | 27 ++++++---
 l10n/de/settings.po                 | 24 ++++----
 l10n/de/user_ldap.po                |  8 +--
 l10n/el/lib.po                      | 39 ++++++++-----
 l10n/eo/lib.po                      | 41 +++++++++-----
 l10n/es/core.po                     |  9 +--
 l10n/es/files.po                    |  9 +--
 l10n/es/files_sharing.po            |  9 +--
 l10n/es/lib.po                      | 39 ++++++++-----
 l10n/es/settings.po                 | 25 +++++----
 l10n/es/user_ldap.po                | 58 ++++++++++----------
 l10n/et_EE/lib.po                   | 39 ++++++++-----
 l10n/eu/lib.po                      | 84 ++++++++++++++++------------
 l10n/eu_ES/lib.po                   | 39 ++++++++-----
 l10n/fa/lib.po                      | 27 ++++++---
 l10n/fi/lib.po                      | 27 ++++++---
 l10n/fi_FI/lib.po                   | 39 ++++++++-----
 l10n/fr/core.po                     |  9 +--
 l10n/fr/files.po                    |  9 +--
 l10n/fr/files_sharing.po            |  9 +--
 l10n/fr/lib.po                      | 39 ++++++++-----
 l10n/fr/settings.po                 | 25 +++++----
 l10n/gl/lib.po                      | 39 ++++++++-----
 l10n/he/lib.po                      | 39 ++++++++-----
 l10n/hi/lib.po                      | 27 ++++++---
 l10n/hr/lib.po                      | 39 ++++++++-----
 l10n/hu_HU/lib.po                   | 84 ++++++++++++++++------------
 l10n/hy/lib.po                      | 39 ++++++++-----
 l10n/ia/lib.po                      | 39 ++++++++-----
 l10n/id/lib.po                      | 39 ++++++++-----
 l10n/id_ID/lib.po                   | 39 ++++++++-----
 l10n/it/core.po                     |  8 +--
 l10n/it/files.po                    |  8 +--
 l10n/it/files_sharing.po            |  8 +--
 l10n/it/lib.po                      | 39 ++++++++-----
 l10n/it/settings.po                 | 24 ++++----
 l10n/ja_JP/core.po                  |  8 +--
 l10n/ja_JP/files.po                 |  9 +--
 l10n/ja_JP/files_sharing.po         |  8 +--
 l10n/ja_JP/lib.po                   | 84 ++++++++++++++++------------
 l10n/ja_JP/settings.po              | 24 ++++----
 l10n/ko/lib.po                      | 39 ++++++++-----
 l10n/lb/lib.po                      | 39 ++++++++-----
 l10n/lt_LT/lib.po                   | 27 ++++++---
 l10n/lv/lib.po                      | 39 ++++++++-----
 l10n/mk/lib.po                      | 39 ++++++++-----
 l10n/ms_MY/lib.po                   | 39 ++++++++-----
 l10n/nb_NO/lib.po                   | 27 ++++++---
 l10n/nl/lib.po                      | 27 ++++++---
 l10n/nn_NO/lib.po                   | 39 ++++++++-----
 l10n/pl/lib.po                      | 84 ++++++++++++++++------------
 l10n/pl_PL/lib.po                   | 27 ++++++---
 l10n/pt_BR/lib.po                   | 39 ++++++++-----
 l10n/pt_PT/lib.po                   | 39 ++++++++-----
 l10n/ro/lib.po                      | 39 ++++++++-----
 l10n/ru/files.po                    |  8 +--
 l10n/ru/lib.po                      | 27 ++++++---
 l10n/ru_RU/lib.po                   | 27 ++++++---
 l10n/sk_SK/lib.po                   | 39 ++++++++-----
 l10n/sl/core.po                     |  8 +--
 l10n/sl/files.po                    |  8 +--
 l10n/sl/files_sharing.po            |  8 +--
 l10n/sl/lib.po                      | 27 ++++++---
 l10n/sl/settings.po                 | 24 ++++----
 l10n/so/lib.po                      | 39 ++++++++-----
 l10n/sr/lib.po                      | 39 ++++++++-----
 l10n/sr@latin/lib.po                | 39 ++++++++-----
 l10n/sv/core.po                     |  8 +--
 l10n/sv/files.po                    |  8 +--
 l10n/sv/files_sharing.po            |  8 +--
 l10n/sv/lib.po                      | 27 ++++++---
 l10n/sv/settings.po                 | 24 ++++----
 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/lib.pot              | 23 ++++++--
 l10n/templates/settings.pot         |  2 +-
 l10n/templates/user_ldap.pot        |  2 +-
 l10n/th_TH/core.po                  |  8 +--
 l10n/th_TH/files.po                 |  8 +--
 l10n/th_TH/files_sharing.po         |  8 +--
 l10n/th_TH/lib.po                   | 27 ++++++---
 l10n/th_TH/settings.po              | 24 ++++----
 l10n/tr/core.po                     |  9 +--
 l10n/tr/lib.po                      | 39 ++++++++-----
 l10n/uk/lib.po                      | 39 ++++++++-----
 l10n/vi/lib.po                      | 39 ++++++++-----
 l10n/zh_CN.GB2312/lib.po            | 27 ++++++---
 l10n/zh_CN/lib.po                   | 27 ++++++---
 l10n/zh_TW/core.po                  | 47 ++++++++--------
 l10n/zh_TW/files.po                 | 25 +++++----
 l10n/zh_TW/lib.po                   | 85 +++++++++++++++++------------
 lib/l10n/da.php                     | 25 +++++++++
 lib/l10n/eo.php                     |  1 +
 lib/l10n/eu.php                     | 25 +++++++++
 lib/l10n/hu_HU.php                  | 25 +++++++++
 lib/l10n/ja_JP.php                  | 25 +++++++++
 lib/l10n/pl.php                     | 25 +++++++++
 lib/l10n/zh_TW.php                  | 25 +++++++++
 settings/l10n/ca.php                |  9 +++
 settings/l10n/de.php                |  9 +++
 settings/l10n/es.php                |  9 +++
 settings/l10n/fr.php                |  9 +++
 settings/l10n/it.php                |  9 +++
 settings/l10n/ja_JP.php             |  9 +++
 settings/l10n/sl.php                |  9 +++
 settings/l10n/sv.php                |  9 +++
 settings/l10n/th_TH.php             |  9 +++
 158 files changed, 2202 insertions(+), 1097 deletions(-)
 create mode 100644 lib/l10n/da.php
 create mode 100644 lib/l10n/eu.php
 create mode 100644 lib/l10n/hu_HU.php
 create mode 100644 lib/l10n/ja_JP.php
 create mode 100644 lib/l10n/pl.php
 create mode 100644 lib/l10n/zh_TW.php

diff --git a/apps/files/l10n/ca.php b/apps/files/l10n/ca.php
index 81bbfe03a0..d887c8a952 100644
--- a/apps/files/l10n/ca.php
+++ b/apps/files/l10n/ca.php
@@ -20,6 +20,7 @@
 "Upload Error" => "Error en la pujada",
 "Pending" => "Pendents",
 "Upload cancelled." => "La pujada s'ha cancel·lat.",
+"File upload is in progress. Leaving the page now will cancel the upload." => "Hi ha una pujada en curs. Si abandoneu la pàgina la pujada es cancel·larà.",
 "Invalid name, '/' is not allowed." => "El nom no és vàlid, no es permet '/'.",
 "Size" => "Mida",
 "Modified" => "Modificat",
diff --git a/apps/files/l10n/de.php b/apps/files/l10n/de.php
index aad89a6d4d..7a3e61f9be 100644
--- a/apps/files/l10n/de.php
+++ b/apps/files/l10n/de.php
@@ -20,6 +20,7 @@
 "Upload Error" => "Fehler beim Hochladen",
 "Pending" => "Ausstehend",
 "Upload cancelled." => "Hochladen abgebrochen.",
+"File upload is in progress. Leaving the page now will cancel the upload." => "Dateiupload läuft. Wenn Sie die Seite jetzt verlassen, wird der Upload abgebrochen.",
 "Invalid name, '/' is not allowed." => "Ungültiger Name: \"/\" ist nicht erlaubt.",
 "Size" => "Größe",
 "Modified" => "Bearbeitet",
diff --git a/apps/files/l10n/es.php b/apps/files/l10n/es.php
index 6cd51d60e2..8e17b7931b 100644
--- a/apps/files/l10n/es.php
+++ b/apps/files/l10n/es.php
@@ -20,6 +20,7 @@
 "Upload Error" => "Error al subir el archivo",
 "Pending" => "Pendiente",
 "Upload cancelled." => "Subida cancelada.",
+"File upload is in progress. Leaving the page now will cancel the upload." => "La subida del archivo está en proceso. Salir de la página ahora cancelará la subida.",
 "Invalid name, '/' is not allowed." => "Nombre no válido, '/' no está permitido.",
 "Size" => "Tamaño",
 "Modified" => "Modificado",
diff --git a/apps/files/l10n/fr.php b/apps/files/l10n/fr.php
index 6cedfe2f91..d0a4c020f3 100644
--- a/apps/files/l10n/fr.php
+++ b/apps/files/l10n/fr.php
@@ -20,6 +20,7 @@
 "Upload Error" => "Erreur de chargement",
 "Pending" => "En cours",
 "Upload cancelled." => "Chargement annulé.",
+"File upload is in progress. Leaving the page now will cancel the upload." => "L'envoi du fichier est en cours. Quitter cette page maintenant annulera l'envoi du fichier.",
 "Invalid name, '/' is not allowed." => "Nom invalide, '/' n'est pas autorisé.",
 "Size" => "Taille",
 "Modified" => "Modifié",
diff --git a/apps/files/l10n/it.php b/apps/files/l10n/it.php
index 6fda30a8f3..607969746c 100644
--- a/apps/files/l10n/it.php
+++ b/apps/files/l10n/it.php
@@ -20,6 +20,7 @@
 "Upload Error" => "Errore di invio",
 "Pending" => "In corso",
 "Upload cancelled." => "Invio annullato",
+"File upload is in progress. Leaving the page now will cancel the upload." => "Caricamento del file in corso. La chiusura della pagina annullerà il caricamento.",
 "Invalid name, '/' is not allowed." => "Nome non valido",
 "Size" => "Dimensione",
 "Modified" => "Modificato",
diff --git a/apps/files/l10n/ja_JP.php b/apps/files/l10n/ja_JP.php
index 8c19e45501..6dbdf8215d 100644
--- a/apps/files/l10n/ja_JP.php
+++ b/apps/files/l10n/ja_JP.php
@@ -20,6 +20,7 @@
 "Upload Error" => "アップロードエラー",
 "Pending" => "保留",
 "Upload cancelled." => "アップロードはキャンセルされました。",
+"File upload is in progress. Leaving the page now will cancel the upload." => "ファイル転送を実行中です。今このページから移動するとアップロードが中止されます。",
 "Invalid name, '/' is not allowed." => "無効な名前、'/' は使用できません。",
 "Size" => "サイズ",
 "Modified" => "更新日時",
diff --git a/apps/files/l10n/ru.php b/apps/files/l10n/ru.php
index 71b30d22df..3976baeae3 100644
--- a/apps/files/l10n/ru.php
+++ b/apps/files/l10n/ru.php
@@ -20,6 +20,7 @@
 "Upload Error" => "Ошибка загрузки",
 "Pending" => "Ожидание",
 "Upload cancelled." => "Загрузка отменена.",
+"File upload is in progress. Leaving the page now will cancel the upload." => "Файл в процессе загрузки. Покинув страницу вы прервёте загрузку.",
 "Invalid name, '/' is not allowed." => "Неверное имя, '/' не допускается.",
 "Size" => "Размер",
 "Modified" => "Изменён",
diff --git a/apps/files/l10n/sl.php b/apps/files/l10n/sl.php
index f6322b2507..fa506795d9 100644
--- a/apps/files/l10n/sl.php
+++ b/apps/files/l10n/sl.php
@@ -20,6 +20,7 @@
 "Upload Error" => "Napaka pri nalaganju",
 "Pending" => "Na čakanju",
 "Upload cancelled." => "Nalaganje je bilo preklicano.",
+"File upload is in progress. Leaving the page now will cancel the upload." => "Nalaganje datoteke je v teku. Če zapustite to stran zdaj, boste nalaganje preklicali.",
 "Invalid name, '/' is not allowed." => "Neveljavno ime. Znak '/' ni dovoljen.",
 "Size" => "Velikost",
 "Modified" => "Spremenjeno",
diff --git a/apps/files/l10n/sv.php b/apps/files/l10n/sv.php
index a62b752251..b76914b642 100644
--- a/apps/files/l10n/sv.php
+++ b/apps/files/l10n/sv.php
@@ -20,6 +20,7 @@
 "Upload Error" => "Uppladdningsfel",
 "Pending" => "Väntar",
 "Upload cancelled." => "Uppladdning avbruten.",
+"File upload is in progress. Leaving the page now will cancel the upload." => "Filuppladdning pågår. Lämnar du sidan så avbryts uppladdningen.",
 "Invalid name, '/' is not allowed." => "Ogiltigt namn, '/' är inte tillåten.",
 "Size" => "Storlek",
 "Modified" => "Ändrad",
diff --git a/apps/files/l10n/th_TH.php b/apps/files/l10n/th_TH.php
index eed9c36e13..d80ec2d877 100644
--- a/apps/files/l10n/th_TH.php
+++ b/apps/files/l10n/th_TH.php
@@ -20,6 +20,7 @@
 "Upload Error" => "เกิดข้อผิดพลาดในการอัพโหลด",
 "Pending" => "อยู่ระหว่างดำเนินการ",
 "Upload cancelled." => "การอัพโหลดถูกยกเลิก",
+"File upload is in progress. Leaving the page now will cancel the upload." => "การอัพโหลดไฟล์กำลังอยู่ในระหว่างดำเนินการ การออกจากหน้าเว็บนี้จะทำให้การอัพโหลดถูกยกเลิก",
 "Invalid name, '/' is not allowed." => "ชื่อที่ใช้ไม่ถูกต้อง '/' ไม่อนุญาตให้ใช้งาน",
 "Size" => "ขนาด",
 "Modified" => "ปรับปรุงล่าสุด",
diff --git a/apps/files/l10n/zh_TW.php b/apps/files/l10n/zh_TW.php
index bc8aa4ff89..9652fb5a07 100644
--- a/apps/files/l10n/zh_TW.php
+++ b/apps/files/l10n/zh_TW.php
@@ -8,6 +8,15 @@
 "Failed to write to disk" => "寫入硬碟失敗",
 "Files" => "檔案",
 "Delete" => "刪除",
+"already exists" => "已經存在",
+"replace" => "取代",
+"cancel" => "取消",
+"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" => "上傳發生錯誤",
+"Upload cancelled." => "上傳取消",
+"File upload is in progress. Leaving the page now will cancel the upload." => "檔案上傳中. 離開此頁面將會取消上傳.",
+"Invalid name, '/' is not allowed." => "無效的名稱, '/'是不被允許的",
 "Size" => "大小",
 "Modified" => "修改",
 "File handling" => "檔案處理",
diff --git a/apps/files_sharing/l10n/ca.php b/apps/files_sharing/l10n/ca.php
index b8a1110fe0..f00d0d7263 100644
--- a/apps/files_sharing/l10n/ca.php
+++ b/apps/files_sharing/l10n/ca.php
@@ -2,5 +2,6 @@
 "Password" => "Contrasenya",
 "Submit" => "Envia",
 "Download" => "Baixa",
+"No preview available for" => "No hi ha vista prèvia disponible per a",
 "web services under your control" => "controleu els vostres serveis web"
 );
diff --git a/apps/files_sharing/l10n/de.php b/apps/files_sharing/l10n/de.php
index bfb0d076a3..90dce8ec62 100644
--- a/apps/files_sharing/l10n/de.php
+++ b/apps/files_sharing/l10n/de.php
@@ -2,5 +2,6 @@
 "Password" => "Passwort",
 "Submit" => "Absenden",
 "Download" => "Download",
+"No preview available for" => "Es ist keine Vorschau verfügbar für",
 "web services under your control" => "Web-Services unter Ihrer Kontrolle"
 );
diff --git a/apps/files_sharing/l10n/es.php b/apps/files_sharing/l10n/es.php
index 0bc085c4d3..b1d44e5485 100644
--- a/apps/files_sharing/l10n/es.php
+++ b/apps/files_sharing/l10n/es.php
@@ -2,5 +2,6 @@
 "Password" => "Contraseña",
 "Submit" => "Enviar",
 "Download" => "Descargar",
+"No preview available for" => "No hay vista previa disponible para",
 "web services under your control" => "Servicios web bajo su control"
 );
diff --git a/apps/files_sharing/l10n/fr.php b/apps/files_sharing/l10n/fr.php
index 91a6e3e92c..54d9e9ec56 100644
--- a/apps/files_sharing/l10n/fr.php
+++ b/apps/files_sharing/l10n/fr.php
@@ -2,5 +2,6 @@
 "Password" => "Mot de passe",
 "Submit" => "Envoyer",
 "Download" => "Télécharger",
+"No preview available for" => "Pas d'aperçu disponible pour",
 "web services under your control" => "services web sous votre contrôle"
 );
diff --git a/apps/files_sharing/l10n/it.php b/apps/files_sharing/l10n/it.php
index de06afc269..5bedabde9b 100644
--- a/apps/files_sharing/l10n/it.php
+++ b/apps/files_sharing/l10n/it.php
@@ -2,5 +2,6 @@
 "Password" => "Password",
 "Submit" => "Invia",
 "Download" => "Scarica",
+"No preview available for" => "Nessuna anteprima disponibile per",
 "web services under your control" => "servizi web nelle tue mani"
 );
diff --git a/apps/files_sharing/l10n/ja_JP.php b/apps/files_sharing/l10n/ja_JP.php
index 2ac295bdd3..5d63f371d5 100644
--- a/apps/files_sharing/l10n/ja_JP.php
+++ b/apps/files_sharing/l10n/ja_JP.php
@@ -2,5 +2,6 @@
 "Password" => "パスワード",
 "Submit" => "送信",
 "Download" => "ダウンロード",
+"No preview available for" => "プレビューはありません",
 "web services under your control" => "管理下のウェブサービス"
 );
diff --git a/apps/files_sharing/l10n/sl.php b/apps/files_sharing/l10n/sl.php
index 9ff8b079d7..5e7d2d5004 100644
--- a/apps/files_sharing/l10n/sl.php
+++ b/apps/files_sharing/l10n/sl.php
@@ -2,5 +2,6 @@
 "Password" => "Geslo",
 "Submit" => "Pošlji",
 "Download" => "Prenesi",
+"No preview available for" => "Predogled ni na voljo za",
 "web services under your control" => "spletne storitve pod vašim nadzorom"
 );
diff --git a/apps/files_sharing/l10n/sv.php b/apps/files_sharing/l10n/sv.php
index 7a580c36a5..78b1983649 100644
--- a/apps/files_sharing/l10n/sv.php
+++ b/apps/files_sharing/l10n/sv.php
@@ -2,5 +2,6 @@
 "Password" => "Lösenord",
 "Submit" => "Skicka",
 "Download" => "Ladda ner",
+"No preview available for" => "Ingen förhandsgranskning tillgänglig för",
 "web services under your control" => "webbtjänster under din kontroll"
 );
diff --git a/apps/files_sharing/l10n/th_TH.php b/apps/files_sharing/l10n/th_TH.php
index 41fa4aeddb..8a3f1207db 100644
--- a/apps/files_sharing/l10n/th_TH.php
+++ b/apps/files_sharing/l10n/th_TH.php
@@ -2,5 +2,6 @@
 "Password" => "รหัสผ่าน",
 "Submit" => "ส่ง",
 "Download" => "ดาวน์โหลด",
+"No preview available for" => "ไม่สามารถดูตัวอย่างได้สำหรับ",
 "web services under your control" => "เว็บเซอร์วิสที่คุณควบคุมการใช้งานได้"
 );
diff --git a/apps/user_ldap/l10n/de.php b/apps/user_ldap/l10n/de.php
index 9f917f277c..2c178d0b4f 100644
--- a/apps/user_ldap/l10n/de.php
+++ b/apps/user_ldap/l10n/de.php
@@ -23,7 +23,7 @@
 "Use TLS" => "Nutze TLS",
 "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.",
+"Turn off SSL certificate validation." => "Schalte die SSL-Zertifikatsprüfung aus.",
 "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",
@@ -32,5 +32,6 @@
 "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.",
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Ohne Eingabe wird der Benutzername (Standard) verwendet. Anderenfalls geben Sie ein LDAP/AD-Attribut an.",
 "Help" => "Hilfe"
 );
diff --git a/apps/user_ldap/l10n/es.php b/apps/user_ldap/l10n/es.php
index 55abf7b88e..8d9c7f9ad3 100644
--- a/apps/user_ldap/l10n/es.php
+++ b/apps/user_ldap/l10n/es.php
@@ -1,7 +1,32 @@
 <?php $TRANSLATIONS = array(
+"Host" => "Servidor",
+"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Puede omitir el protocolo, excepto si requiere SSL. En ese caso, empiece con ldaps://",
+"Base DN" => "DN base",
+"You can specify Base DN for users and groups in the Advanced tab" => "Puede especificar el DN base para usuarios y grupos en la pestaña Avanzado",
+"User DN" => "DN usuario",
+"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." => "El DN del usuario cliente con el que se hará la asociación, p.ej. uid=agente,dc=ejemplo,dc=com. Para acceso anónimo, deje DN y contraseña vacíos.",
 "Password" => "Contraseña",
+"For anonymous access, leave DN and Password empty." => "Para acceso anónimo, deje DN y contraseña vacíos.",
+"User List Filter" => "Lista de filtros de usuario",
+"Defines the filter to apply, when retrieving users." => "Define el filtro a aplicar, cuando se obtienen usuarios.",
+"Group Filter" => "Filtro de grupo",
+"Defines the filter to apply, when retrieving groups." => "Define el filtro a aplicar, cuando se obtienen grupos.",
 "Port" => "Puerto",
+"Base User Tree" => "Árbol base de usuario",
+"Base Group Tree" => "Árbol base de grupo",
+"Group-Member association" => "Asociación Grupo-Miembro",
 "Use TLS" => "Usar TLS",
+"Do not use it for SSL connections, it will fail." => "No usarlo para SSL, habrá error.",
+"Case insensitve LDAP server (Windows)" => "Servidor de LDAP sensible a mayúsculas/minúsculas (Windows)",
+"Turn off SSL certificate validation." => "Apagar la validación por certificado SSL.",
+"If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Si la conexión sólo funciona con esta opción, importe el certificado SSL del servidor LDAP en su servidor ownCloud.",
+"Not recommended, use for testing only." => "No recomendado, sólo para pruebas.",
+"User Display Name Field" => "Campo de nombre de usuario a mostrar",
+"The LDAP attribute to use to generate the user`s ownCloud name." => "El atributo LDAP a usar para generar el nombre de usuario de ownCloud.",
+"Group Display Name Field" => "Campo de nombre de grupo a mostrar",
+"The LDAP attribute to use to generate the groups`s ownCloud name." => "El atributo LDAP a usar para generar el nombre de los grupos de ownCloud.",
 "in bytes" => "en bytes",
+"in seconds. A change empties the cache." => "en segundos. Un cambio vacía la cache.",
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Vacío para el nombre de usuario (por defecto). En otro caso, especifique un atributo LDAP/AD.",
 "Help" => "Ayuda"
 );
diff --git a/core/l10n/ca.php b/core/l10n/ca.php
index 9be2fe6adf..52b6d68e47 100644
--- a/core/l10n/ca.php
+++ b/core/l10n/ca.php
@@ -51,6 +51,7 @@
 "Database user" => "Usuari de la base de dades",
 "Database password" => "Contrasenya de la base de dades",
 "Database name" => "Nom de la base de dades",
+"Database tablespace" => "Espai de taula de la base de dades",
 "Database host" => "Ordinador central de la base de dades",
 "Finish setup" => "Acaba la configuració",
 "web services under your control" => "controleu els vostres serveis web",
diff --git a/core/l10n/de.php b/core/l10n/de.php
index 81f4b0082c..fdd940ea39 100644
--- a/core/l10n/de.php
+++ b/core/l10n/de.php
@@ -51,6 +51,7 @@
 "Database user" => "Datenbank-Benutzer",
 "Database password" => "Datenbank-Passwort",
 "Database name" => "Datenbank-Name",
+"Database tablespace" => "Datenbank-Tablespace",
 "Database host" => "Datenbank-Host",
 "Finish setup" => "Installation abschließen",
 "web services under your control" => "Web-Services unter Ihrer Kontrolle",
diff --git a/core/l10n/es.php b/core/l10n/es.php
index 8766228ba8..3a7da551b6 100644
--- a/core/l10n/es.php
+++ b/core/l10n/es.php
@@ -51,6 +51,7 @@
 "Database user" => "Usuario de la base de datos",
 "Database password" => "Contraseña de la base de datos",
 "Database name" => "Nombre de la base de datos",
+"Database tablespace" => "Espacio de tablas de la base de datos",
 "Database host" => "Host de la base de datos",
 "Finish setup" => "Completar la instalación",
 "web services under your control" => "servicios web bajo tu control",
diff --git a/core/l10n/fr.php b/core/l10n/fr.php
index 095a202473..a563218084 100644
--- a/core/l10n/fr.php
+++ b/core/l10n/fr.php
@@ -51,6 +51,7 @@
 "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 tablespace" => "Tablespaces 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",
diff --git a/core/l10n/it.php b/core/l10n/it.php
index ca80770a3c..b7f174e57a 100644
--- a/core/l10n/it.php
+++ b/core/l10n/it.php
@@ -51,6 +51,7 @@
 "Database user" => "Utente del database",
 "Database password" => "Password del database",
 "Database name" => "Nome del database",
+"Database tablespace" => "Spazio delle tabelle del database",
 "Database host" => "Host del database",
 "Finish setup" => "Termina la configurazione",
 "web services under your control" => "servizi web nelle tue mani",
diff --git a/core/l10n/ja_JP.php b/core/l10n/ja_JP.php
index 5f9b9da33a..bef84b09d6 100644
--- a/core/l10n/ja_JP.php
+++ b/core/l10n/ja_JP.php
@@ -51,6 +51,7 @@
 "Database user" => "データベースのユーザ名",
 "Database password" => "データベースのパスワード",
 "Database name" => "データベース名",
+"Database tablespace" => "データベースの表領域",
 "Database host" => "データベースのホスト名",
 "Finish setup" => "セットアップを完了します",
 "web services under your control" => "管理下にあるウェブサービス",
diff --git a/core/l10n/sl.php b/core/l10n/sl.php
index 2f998c9549..ad41231431 100644
--- a/core/l10n/sl.php
+++ b/core/l10n/sl.php
@@ -51,6 +51,7 @@
 "Database user" => "Uporabnik zbirke",
 "Database password" => "Geslo podatkovne zbirke",
 "Database name" => "Ime podatkovne zbirke",
+"Database tablespace" => "Razpredelnica podatkovne zbirke",
 "Database host" => "Gostitelj podatkovne zbirke",
 "Finish setup" => "Dokončaj namestitev",
 "web services under your control" => "spletne storitve pod vašim nadzorom",
diff --git a/core/l10n/sv.php b/core/l10n/sv.php
index 25ba95558e..f459272eba 100644
--- a/core/l10n/sv.php
+++ b/core/l10n/sv.php
@@ -51,6 +51,7 @@
 "Database user" => "Databasanvändare",
 "Database password" => "Lösenord till databasen",
 "Database name" => "Databasnamn",
+"Database tablespace" => "Databas tabellutrymme",
 "Database host" => "Databasserver",
 "Finish setup" => "Avsluta installation",
 "web services under your control" => "webbtjänster under din kontroll",
diff --git a/core/l10n/th_TH.php b/core/l10n/th_TH.php
index 8bd4d36524..4bfdb524fe 100644
--- a/core/l10n/th_TH.php
+++ b/core/l10n/th_TH.php
@@ -51,6 +51,7 @@
 "Database user" => "ชื่อผู้ใช้งานฐานข้อมูล",
 "Database password" => "รหัสผ่านฐานข้อมูล",
 "Database name" => "ชื่อฐานข้อมูล",
+"Database tablespace" => "พื้นที่ตารางในฐานข้อมูล",
 "Database host" => "Database host",
 "Finish setup" => "ติดตั้งเรียบร้อยแล้ว",
 "web services under your control" => "web services under your control",
diff --git a/core/l10n/tr.php b/core/l10n/tr.php
index e2d0d9b073..a34443e8dd 100644
--- a/core/l10n/tr.php
+++ b/core/l10n/tr.php
@@ -51,6 +51,7 @@
 "Database user" => "Veritabanı kullanıcı adı",
 "Database password" => "Veritabanı parolası",
 "Database name" => "Veritabanı adı",
+"Database tablespace" => "Veritabanı tablo alanı",
 "Database host" => "Veritabanı sunucusu",
 "Finish setup" => "Kurulumu tamamla",
 "web services under your control" => "kontrolünüzdeki web servisleri",
diff --git a/core/l10n/zh_TW.php b/core/l10n/zh_TW.php
index 37c0d8cc9d..753dde0a99 100644
--- a/core/l10n/zh_TW.php
+++ b/core/l10n/zh_TW.php
@@ -2,7 +2,26 @@
 "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" => "No",
+"Yes" => "Yes",
+"Ok" => "Ok",
+"No categories selected for deletion." => "沒選擇要刪除的分類",
+"Error" => "錯誤",
 "ownCloud password reset" => "ownCloud 密碼重設",
 "Use the following link to reset your password: {link}" => "請循以下聯結重設你的密碼: （聯結） ",
 "You will receive a link to reset your password via Email." => "重設密碼的連結將會寄到你的電子郵件信箱",
@@ -32,6 +51,7 @@
 "Database user" => "資料庫使用者",
 "Database password" => "資料庫密碼",
 "Database name" => "資料庫名稱",
+"Database tablespace" => "資料庫 tablespace",
 "Database host" => "資料庫主機",
 "Finish setup" => "完成設定",
 "web services under your control" => "網路服務已在你控制",
diff --git a/l10n/af/lib.po b/l10n/af/lib.po
index a5cbac2624..a38949f230 100644
--- a/l10n/af/lib.po
+++ b/l10n/af/lib.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-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-09-01 02:01+0200\n"
+"PO-Revision-Date: 2012-09-01 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"
@@ -17,43 +17,43 @@ msgstr ""
 "Language: af\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\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 ""
 
-#: files.php:245
+#: files.php:280
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:246
+#: files.php:281
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:246 files.php:271
+#: files.php:281 files.php:306
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:270
+#: files.php:305
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
@@ -110,3 +110,16 @@ msgstr ""
 #: template.php:97
 msgid "years ago"
 msgstr ""
+
+#: updater.php:66
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+msgstr ""
+
+#: updater.php:68
+msgid "up to date"
+msgstr ""
+
+#: updater.php:71
+msgid "updates check is disabled"
+msgstr ""
diff --git a/l10n/ar/lib.po b/l10n/ar/lib.po
index 36dea95d34..562af94ac6 100644
--- a/l10n/ar/lib.po
+++ b/l10n/ar/lib.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-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-09-01 02:01+0200\n"
+"PO-Revision-Date: 2012-09-01 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"
@@ -17,43 +17,43 @@ 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"
 
-#: 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 ""
 
-#: files.php:245
+#: files.php:280
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:246
+#: files.php:281
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:246 files.php:271
+#: files.php:281 files.php:306
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:270
+#: files.php:305
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
@@ -110,3 +110,16 @@ msgstr ""
 #: template.php:97
 msgid "years ago"
 msgstr ""
+
+#: updater.php:66
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+msgstr ""
+
+#: updater.php:68
+msgid "up to date"
+msgstr ""
+
+#: updater.php:71
+msgid "updates check is disabled"
+msgstr ""
diff --git a/l10n/ar_SA/lib.po b/l10n/ar_SA/lib.po
index 1d1cba42b7..9b889a6e71 100644
--- a/l10n/ar_SA/lib.po
+++ b/l10n/ar_SA/lib.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-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-09-01 02:01+0200\n"
+"PO-Revision-Date: 2012-09-01 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"
@@ -17,43 +17,43 @@ msgstr ""
 "Language: ar_SA\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\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 ""
 
-#: files.php:245
+#: files.php:280
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:246
+#: files.php:281
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:246 files.php:271
+#: files.php:281 files.php:306
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:270
+#: files.php:305
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
@@ -110,3 +110,16 @@ msgstr ""
 #: template.php:97
 msgid "years ago"
 msgstr ""
+
+#: updater.php:66
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+msgstr ""
+
+#: updater.php:68
+msgid "up to date"
+msgstr ""
+
+#: updater.php:71
+msgid "updates check is disabled"
+msgstr ""
diff --git a/l10n/bg_BG/lib.po b/l10n/bg_BG/lib.po
index 04f21db7de..f6ce9e2d63 100644
--- a/l10n/bg_BG/lib.po
+++ b/l10n/bg_BG/lib.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-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-09-01 02:01+0200\n"
+"PO-Revision-Date: 2012-09-01 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"
@@ -17,43 +17,43 @@ msgstr ""
 "Language: bg_BG\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\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 ""
 
-#: files.php:245
+#: files.php:280
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:246
+#: files.php:281
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:246 files.php:271
+#: files.php:281 files.php:306
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:270
+#: files.php:305
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
@@ -110,3 +110,16 @@ msgstr ""
 #: template.php:97
 msgid "years ago"
 msgstr ""
+
+#: updater.php:66
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+msgstr ""
+
+#: updater.php:68
+msgid "up to date"
+msgstr ""
+
+#: updater.php:71
+msgid "updates check is disabled"
+msgstr ""
diff --git a/l10n/ca/core.po b/l10n/ca/core.po
index e3c5dd92d5..821e89c924 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-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-01 02:01+0200\n"
+"PO-Revision-Date: 2012-08-31 11:29+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"
@@ -231,7 +231,7 @@ msgstr "Nom de la base de dades"
 
 #: templates/installation.php:109
 msgid "Database tablespace"
-msgstr ""
+msgstr "Espai de taula de la base de dades"
 
 #: templates/installation.php:115
 msgid "Database host"
diff --git a/l10n/ca/files.po b/l10n/ca/files.po
index 6ccc8e9492..0857b5ed92 100644
--- a/l10n/ca/files.po
+++ b/l10n/ca/files.po
@@ -4,14 +4,14 @@
 # 
 # Translators:
 #   <joan@montane.cat>, 2012.
-#   <rcalvoi@yahoo.com>, 2011, 2012.
+#   <rcalvoi@yahoo.com>, 2011-2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-01 02:01+0200\n"
+"PO-Revision-Date: 2012-08-31 11: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"
@@ -108,7 +108,7 @@ msgstr "La pujada s'ha cancel·lat."
 #: js/files.js:409
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
-msgstr ""
+msgstr "Hi ha una pujada en curs. Si abandoneu la pàgina la pujada es cancel·larà."
 
 #: js/files.js:480
 msgid "Invalid name, '/' is not allowed."
diff --git a/l10n/ca/files_sharing.po b/l10n/ca/files_sharing.po
index 1aa4ee0ad4..2424e26a3c 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-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:04+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-01 02:01+0200\n"
+"PO-Revision-Date: 2012-08-31 11:34+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"
@@ -32,7 +32,7 @@ msgstr "Baixa"
 
 #: templates/public.php:18
 msgid "No preview available for"
-msgstr ""
+msgstr "No hi ha vista prèvia disponible per a"
 
 #: templates/public.php:23
 msgid "web services under your control"
diff --git a/l10n/ca/lib.po b/l10n/ca/lib.po
index 397969d686..2b24de6352 100644
--- a/l10n/ca/lib.po
+++ b/l10n/ca/lib.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-29 02:04+0200\n"
-"PO-Revision-Date: 2012-07-28 13:42+0000\n"
-"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
+"POT-Creation-Date: 2012-09-01 02:01+0200\n"
+"PO-Revision-Date: 2012-09-01 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"
@@ -18,43 +18,43 @@ msgstr ""
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: app.php:287
+#: app.php:288
 msgid "Help"
 msgstr "Ajuda"
 
-#: app.php:294
+#: app.php:295
 msgid "Personal"
 msgstr "Personal"
 
-#: app.php:299
+#: app.php:300
 msgid "Settings"
 msgstr "Configuració"
 
-#: app.php:304
+#: app.php:305
 msgid "Users"
 msgstr "Usuaris"
 
-#: app.php:311
+#: app.php:312
 msgid "Apps"
 msgstr "Aplicacions"
 
-#: app.php:313
+#: app.php:314
 msgid "Admin"
 msgstr "Administració"
 
-#: files.php:245
+#: files.php:280
 msgid "ZIP download is turned off."
 msgstr "La baixada en ZIP està desactivada."
 
-#: files.php:246
+#: files.php:281
 msgid "Files need to be downloaded one by one."
 msgstr "Els fitxers s'han de baixar d'un en un."
 
-#: files.php:246 files.php:271
+#: files.php:281 files.php:306
 msgid "Back to Files"
 msgstr "Torna a Fitxers"
 
-#: files.php:270
+#: files.php:305
 msgid "Selected files too large to generate zip file."
 msgstr "Els fitxers seleccionats son massa grans per generar un fitxer zip."
 
@@ -111,3 +111,16 @@ msgstr "l'any passat"
 #: template.php:97
 msgid "years ago"
 msgstr "fa anys"
+
+#: updater.php:66
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+msgstr ""
+
+#: updater.php:68
+msgid "up to date"
+msgstr ""
+
+#: updater.php:71
+msgid "updates check is disabled"
+msgstr ""
diff --git a/l10n/ca/settings.po b/l10n/ca/settings.po
index 5c73f9a9ca..35cb1e5db2 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-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-01 02:01+0200\n"
+"PO-Revision-Date: 2012-08-31 11: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"
@@ -89,39 +89,39 @@ msgstr "usa el servei cron del sistema"
 
 #: templates/admin.php:39
 msgid "Share API"
-msgstr ""
+msgstr "API de compartir"
 
 #: templates/admin.php:44
 msgid "Enable Share API"
-msgstr ""
+msgstr "Activa l'API de compartir"
 
 #: templates/admin.php:45
 msgid "Allow apps to use the Share API"
-msgstr ""
+msgstr "Permet que les aplicacions usin l'API de compartir"
 
 #: templates/admin.php:49
 msgid "Allow links"
-msgstr ""
+msgstr "Permet enllaços"
 
 #: templates/admin.php:50
 msgid "Allow users to share items to the public with links"
-msgstr ""
+msgstr "Permet als usuaris compartir elements amb el públic amb enllaços"
 
 #: templates/admin.php:54
 msgid "Allow resharing"
-msgstr ""
+msgstr "Permet compartir de nou"
 
 #: templates/admin.php:55
 msgid "Allow users to share items shared with them again"
-msgstr ""
+msgstr "Permet als usuaris comparir elements ja compartits amb ells"
 
 #: templates/admin.php:58
 msgid "Allow users to share with anyone"
-msgstr ""
+msgstr "Permet als usuaris compartir amb qualsevol"
 
 #: templates/admin.php:60
 msgid "Allow users to only share with users in their groups"
-msgstr ""
+msgstr "Permet als usuaris compartir només amb usuaris del seu grup"
 
 #: templates/admin.php:67
 msgid "Log"
diff --git a/l10n/cs_CZ/lib.po b/l10n/cs_CZ/lib.po
index f6c62f8803..35f62dc63c 100644
--- a/l10n/cs_CZ/lib.po
+++ b/l10n/cs_CZ/lib.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 09:24+0000\n"
-"Last-Translator: Martin <fireball@atlas.cz>\n"
+"POT-Creation-Date: 2012-09-01 02:01+0200\n"
+"PO-Revision-Date: 2012-09-01 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"
@@ -42,19 +42,19 @@ msgstr "Aplikace"
 msgid "Admin"
 msgstr "Admin"
 
-#: files.php:245
+#: files.php:280
 msgid "ZIP download is turned off."
 msgstr "Stahování ZIPu je vypnuto."
 
-#: files.php:246
+#: files.php:281
 msgid "Files need to be downloaded one by one."
 msgstr "Soubory je nutno stahovat samostatně."
 
-#: files.php:246 files.php:271
+#: files.php:281 files.php:306
 msgid "Back to Files"
 msgstr "Zpět k souborům"
 
-#: files.php:270
+#: files.php:305
 msgid "Selected files too large to generate zip file."
 msgstr "Vybarné soubory jsou pro vytvoření zipu příliš velké."
 
@@ -111,3 +111,16 @@ msgstr "loni"
 #: template.php:97
 msgid "years ago"
 msgstr "před lety"
+
+#: updater.php:66
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+msgstr ""
+
+#: updater.php:68
+msgid "up to date"
+msgstr ""
+
+#: updater.php:71
+msgid "updates check is disabled"
+msgstr ""
diff --git a/l10n/da/lib.po b/l10n/da/lib.po
index 8d65f903fe..75cf36398b 100644
--- a/l10n/da/lib.po
+++ b/l10n/da/lib.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Morten Juhl-Johansen Zölde-Fejér <morten@writtenandread.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-09-01 02:01+0200\n"
+"PO-Revision-Date: 2012-09-01 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"
@@ -17,96 +18,109 @@ msgstr ""
 "Language: da\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: app.php:287
+#: app.php:288
 msgid "Help"
-msgstr ""
+msgstr "Hjælp"
 
-#: app.php:294
+#: app.php:295
 msgid "Personal"
-msgstr ""
+msgstr "Personlig"
 
-#: app.php:299
+#: app.php:300
 msgid "Settings"
-msgstr ""
+msgstr "Indstillinger"
 
-#: app.php:304
+#: app.php:305
 msgid "Users"
-msgstr ""
+msgstr "Brugere"
 
-#: app.php:311
+#: app.php:312
 msgid "Apps"
-msgstr ""
+msgstr "Apps"
 
-#: app.php:313
+#: app.php:314
 msgid "Admin"
-msgstr ""
+msgstr "Admin"
 
-#: files.php:245
+#: files.php:280
 msgid "ZIP download is turned off."
-msgstr ""
+msgstr "ZIP-download er slået fra."
 
-#: files.php:246
+#: files.php:281
 msgid "Files need to be downloaded one by one."
-msgstr ""
+msgstr "Filer skal downloades en for en."
 
-#: files.php:246 files.php:271
+#: files.php:281 files.php:306
 msgid "Back to Files"
-msgstr ""
+msgstr "Tilbage til Filer"
 
-#: files.php:270
+#: files.php:305
 msgid "Selected files too large to generate zip file."
-msgstr ""
+msgstr "De markerede filer er for store til at generere en ZIP-fil."
 
 #: json.php:28
 msgid "Application is not enabled"
-msgstr ""
+msgstr "Programmet er ikke aktiveret"
 
 #: json.php:39 json.php:63 json.php:75
 msgid "Authentication error"
-msgstr ""
+msgstr "Adgangsfejl"
 
 #: json.php:51
 msgid "Token expired. Please reload page."
-msgstr ""
+msgstr "Adgang er udløbet. Genindlæs siden."
 
 #: template.php:86
 msgid "seconds ago"
-msgstr ""
+msgstr "sekunder siden"
 
 #: template.php:87
 msgid "1 minute ago"
-msgstr ""
+msgstr "1 minut 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 dage siden"
 
 #: template.php:94
 msgid "last month"
-msgstr ""
+msgstr "Sidste måned"
 
 #: template.php:95
 msgid "months ago"
-msgstr ""
+msgstr "måneder siden"
 
 #: template.php:96
 msgid "last year"
-msgstr ""
+msgstr "Sidste år"
 
 #: template.php:97
 msgid "years ago"
+msgstr "år siden"
+
+#: updater.php:66
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+msgstr ""
+
+#: updater.php:68
+msgid "up to date"
+msgstr ""
+
+#: updater.php:71
+msgid "updates check is disabled"
 msgstr ""
diff --git a/l10n/de/core.po b/l10n/de/core.po
index c9a09ce63a..9f06a2c9f4 100644
--- a/l10n/de/core.po
+++ b/l10n/de/core.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-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:02+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-01 02:01+0200\n"
+"PO-Revision-Date: 2012-08-31 09:48+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"
@@ -240,7 +240,7 @@ msgstr "Datenbank-Name"
 
 #: templates/installation.php:109
 msgid "Database tablespace"
-msgstr ""
+msgstr "Datenbank-Tablespace"
 
 #: templates/installation.php:115
 msgid "Database host"
diff --git a/l10n/de/files.po b/l10n/de/files.po
index eb9ea98a4c..2f61acb8ec 100644
--- a/l10n/de/files.po
+++ b/l10n/de/files.po
@@ -9,6 +9,7 @@
 # Marcel Kühlhorn <susefan93@gmx.de>, 2012.
 # Michael Krell <m4dmike.mni@gmail.com>, 2012.
 #   <nelsonfritsch@gmail.com>, 2012.
+#   <niko@nik-o-mat.de>, 2012.
 # Phi Lieb <>, 2012.
 #   <thomas.mueller@tmit.eu>, 2012.
 # Thomas Müller <>, 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-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-01 02:01+0200\n"
+"PO-Revision-Date: 2012-08-31 07:32+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"
@@ -116,7 +117,7 @@ msgstr "Hochladen abgebrochen."
 #: js/files.js:409
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
-msgstr ""
+msgstr "Dateiupload läuft. Wenn Sie die Seite jetzt verlassen, wird der Upload abgebrochen."
 
 #: js/files.js:480
 msgid "Invalid name, '/' is not allowed."
diff --git a/l10n/de/files_sharing.po b/l10n/de/files_sharing.po
index f1fdd9e874..7d11d39369 100644
--- a/l10n/de/files_sharing.po
+++ b/l10n/de/files_sharing.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-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:04+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-01 02:01+0200\n"
+"PO-Revision-Date: 2012-08-31 09:46+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"
@@ -35,7 +35,7 @@ msgstr "Download"
 
 #: templates/public.php:18
 msgid "No preview available for"
-msgstr ""
+msgstr "Es ist keine Vorschau verfügbar für"
 
 #: templates/public.php:23
 msgid "web services under your control"
diff --git a/l10n/de/lib.po b/l10n/de/lib.po
index 0e1b5201dc..c2a625b076 100644
--- a/l10n/de/lib.po
+++ b/l10n/de/lib.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-24 02:02+0200\n"
-"PO-Revision-Date: 2012-08-23 09:41+0000\n"
-"Last-Translator: traductor <transifex.3.mensaje@spamgourmet.com>\n"
+"POT-Creation-Date: 2012-09-01 02:01+0200\n"
+"PO-Revision-Date: 2012-09-01 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"
@@ -44,19 +44,19 @@ msgstr "Apps"
 msgid "Admin"
 msgstr "Administrator"
 
-#: files.php:276
+#: files.php:280
 msgid "ZIP download is turned off."
 msgstr "Der ZIP-Download ist deaktiviert."
 
-#: files.php:277
+#: files.php:281
 msgid "Files need to be downloaded one by one."
 msgstr "Die Dateien müssen einzeln heruntergeladen werden."
 
-#: files.php:277 files.php:302
+#: files.php:281 files.php:306
 msgid "Back to Files"
 msgstr "Zurück zu \"Dateien\""
 
-#: files.php:301
+#: files.php:305
 msgid "Selected files too large to generate zip file."
 msgstr "Die gewählten Dateien sind zu groß, um eine ZIP-Datei zu erstellen."
 
@@ -113,3 +113,16 @@ msgstr "Letztes Jahr"
 #: template.php:97
 msgid "years ago"
 msgstr "Vor Jahren"
+
+#: updater.php:66
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+msgstr ""
+
+#: updater.php:68
+msgid "up to date"
+msgstr ""
+
+#: updater.php:71
+msgid "updates check is disabled"
+msgstr ""
diff --git a/l10n/de/settings.po b/l10n/de/settings.po
index 37cd269f54..df25c0b715 100644
--- a/l10n/de/settings.po
+++ b/l10n/de/settings.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-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-01 02:01+0200\n"
+"PO-Revision-Date: 2012-08-31 07:39+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"
@@ -96,39 +96,39 @@ msgstr "Nutze System-Cron-Service"
 
 #: templates/admin.php:39
 msgid "Share API"
-msgstr ""
+msgstr "Teilungs-API"
 
 #: templates/admin.php:44
 msgid "Enable Share API"
-msgstr ""
+msgstr "Teilungs-API aktivieren"
 
 #: templates/admin.php:45
 msgid "Allow apps to use the Share API"
-msgstr ""
+msgstr "Erlaubt Nutzern die Teilungs-API zu nutzen"
 
 #: templates/admin.php:49
 msgid "Allow links"
-msgstr ""
+msgstr "Links erlauben"
 
 #: templates/admin.php:50
 msgid "Allow users to share items to the public with links"
-msgstr ""
+msgstr "Erlaube Nutzern Dateien mithilfe von Links mit der Öffentlichkeit zu teilen"
 
 #: templates/admin.php:54
 msgid "Allow resharing"
-msgstr ""
+msgstr "Erneutes Teilen erlauben"
 
 #: templates/admin.php:55
 msgid "Allow users to share items shared with them again"
-msgstr ""
+msgstr "Erlaubt Nutzern, Dateien die mit ihnen geteilt wurden, erneut zu teilen"
 
 #: templates/admin.php:58
 msgid "Allow users to share with anyone"
-msgstr ""
+msgstr "Erlaube Nutzern mit jedem zu Teilen"
 
 #: templates/admin.php:60
 msgid "Allow users to only share with users in their groups"
-msgstr ""
+msgstr "Erlaube Nutzern nur das Teilen in ihrer Gruppe"
 
 #: templates/admin.php:67
 msgid "Log"
diff --git a/l10n/de/user_ldap.po b/l10n/de/user_ldap.po
index 18c835e066..c8b3a60d6a 100644
--- a/l10n/de/user_ldap.po
+++ b/l10n/de/user_ldap.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-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 11:12+0000\n"
+"POT-Creation-Date: 2012-09-01 02:01+0200\n"
+"PO-Revision-Date: 2012-08-31 15:48+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"
@@ -128,7 +128,7 @@ msgstr "LDAP-Server (Windows: Groß- und Kleinschreibung bleibt unbeachtet)"
 
 #: templates/settings.php:23
 msgid "Turn off SSL certificate validation."
-msgstr "Schalte die SSL Zertifikatsprüfung aus."
+msgstr "Schalte die SSL-Zertifikatsprüfung aus."
 
 #: templates/settings.php:23
 msgid ""
@@ -168,7 +168,7 @@ msgstr "in Sekunden. Eine Änderung leert den Cache."
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
-msgstr ""
+msgstr "Ohne Eingabe wird der Benutzername (Standard) verwendet. Anderenfalls geben Sie ein LDAP/AD-Attribut an."
 
 #: templates/settings.php:32
 msgid "Help"
diff --git a/l10n/el/lib.po b/l10n/el/lib.po
index da331c0cb8..2a3ab249c2 100644
--- a/l10n/el/lib.po
+++ b/l10n/el/lib.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-29 02:04+0200\n"
-"PO-Revision-Date: 2012-07-28 11:45+0000\n"
-"Last-Translator: Efstathios Iosifidis <diamond_gr@freemail.gr>\n"
+"POT-Creation-Date: 2012-09-01 02:01+0200\n"
+"PO-Revision-Date: 2012-09-01 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"
@@ -18,43 +18,43 @@ msgstr ""
 "Language: el\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\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 "Διαχειριστής"
 
-#: files.php:245
+#: files.php:280
 msgid "ZIP download is turned off."
 msgstr "Η λήψη ZIP απενεργοποιήθηκε."
 
-#: files.php:246
+#: files.php:281
 msgid "Files need to be downloaded one by one."
 msgstr "Τα αρχεία πρέπει να ληφθούν ένα-ένα."
 
-#: files.php:246 files.php:271
+#: files.php:281 files.php:306
 msgid "Back to Files"
 msgstr "Πίσω στα Αρχεία"
 
-#: files.php:270
+#: files.php:305
 msgid "Selected files too large to generate zip file."
 msgstr "Τα επιλεγμένα αρχεία είναι μεγάλα ώστε να δημιουργηθεί αρχείο zip."
 
@@ -111,3 +111,16 @@ msgstr "τον προηγούμενο χρόνο"
 #: template.php:97
 msgid "years ago"
 msgstr "χρόνια πριν"
+
+#: updater.php:66
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+msgstr ""
+
+#: updater.php:68
+msgid "up to date"
+msgstr ""
+
+#: updater.php:71
+msgid "updates check is disabled"
+msgstr ""
diff --git a/l10n/eo/lib.po b/l10n/eo/lib.po
index 83d78e5ea5..6b56eeafde 100644
--- a/l10n/eo/lib.po
+++ b/l10n/eo/lib.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-04 02:02+0200\n"
-"PO-Revision-Date: 2012-08-03 22:37+0000\n"
-"Last-Translator: Mariano <mstreet@kde.org.ar>\n"
+"POT-Creation-Date: 2012-09-01 02:01+0200\n"
+"PO-Revision-Date: 2012-09-01 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"
@@ -18,43 +18,43 @@ msgstr ""
 "Language: eo\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: app.php:287
+#: app.php:288
 msgid "Help"
 msgstr "Helpo"
 
-#: app.php:294
+#: app.php:295
 msgid "Personal"
 msgstr "Persona"
 
-#: app.php:299
+#: app.php:300
 msgid "Settings"
 msgstr "Agordo"
 
-#: app.php:304
+#: app.php:305
 msgid "Users"
 msgstr "Uzantoj"
 
-#: app.php:311
+#: app.php:312
 msgid "Apps"
 msgstr "Aplikaĵoj"
 
-#: app.php:313
+#: app.php:314
 msgid "Admin"
-msgstr ""
+msgstr "Administranto"
 
-#: files.php:245
+#: files.php:280
 msgid "ZIP download is turned off."
 msgstr "ZIP-elŝuto estas malkapabligita."
 
-#: files.php:246
+#: files.php:281
 msgid "Files need to be downloaded one by one."
 msgstr "Dosieroj devas elŝutiĝi unuope."
 
-#: files.php:246 files.php:271
+#: files.php:281 files.php:306
 msgid "Back to Files"
 msgstr "Reen al la dosieroj"
 
-#: files.php:270
+#: files.php:305
 msgid "Selected files too large to generate zip file."
 msgstr "La elektitaj dosieroj tro grandas por genero de ZIP-dosiero."
 
@@ -111,3 +111,16 @@ msgstr "lasta jaro"
 #: template.php:97
 msgid "years ago"
 msgstr "jarojn antaŭe"
+
+#: updater.php:66
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+msgstr ""
+
+#: updater.php:68
+msgid "up to date"
+msgstr ""
+
+#: updater.php:71
+msgid "updates check is disabled"
+msgstr ""
diff --git a/l10n/es/core.po b/l10n/es/core.po
index e6464ac375..fd0e4112ab 100644
--- a/l10n/es/core.po
+++ b/l10n/es/core.po
@@ -9,14 +9,15 @@
 # Raul Fernandez Garcia <raulfg3@gmail.com>, 2012.
 #   <rodrigo.calvo@gmail.com>, 2012.
 #   <rom1dep@gmail.com>, 2011.
+# Rubén Trujillo <rubentrf@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-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-01 02:01+0200\n"
+"PO-Revision-Date: 2012-08-31 22:41+0000\n"
+"Last-Translator: Rubén Trujillo <rubentrf@gmail.com>\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"
@@ -236,7 +237,7 @@ msgstr "Nombre de la base de datos"
 
 #: templates/installation.php:109
 msgid "Database tablespace"
-msgstr ""
+msgstr "Espacio de tablas de la base de datos"
 
 #: templates/installation.php:115
 msgid "Database host"
diff --git a/l10n/es/files.po b/l10n/es/files.po
index 1e703f1a81..b8ef1ea582 100644
--- a/l10n/es/files.po
+++ b/l10n/es/files.po
@@ -5,14 +5,15 @@
 # Translators:
 # Javier Llorente <javier@opensuse.org>, 2012.
 #   <juanma@kde.org.ar>, 2012.
+# Rubén Trujillo <rubentrf@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-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-01 02:01+0200\n"
+"PO-Revision-Date: 2012-08-31 22:38+0000\n"
+"Last-Translator: Rubén Trujillo <rubentrf@gmail.com>\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"
@@ -109,7 +110,7 @@ msgstr "Subida cancelada."
 #: js/files.js:409
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
-msgstr ""
+msgstr "La subida del archivo está en proceso. Salir de la página ahora cancelará la subida."
 
 #: js/files.js:480
 msgid "Invalid name, '/' is not allowed."
diff --git a/l10n/es/files_sharing.po b/l10n/es/files_sharing.po
index 7d36e72c7d..d6c7ffea13 100644
--- a/l10n/es/files_sharing.po
+++ b/l10n/es/files_sharing.po
@@ -5,13 +5,14 @@
 # Translators:
 # Javier Llorente <javier@opensuse.org>, 2012.
 #   <pedro.navia@etecsa.cu>, 2012.
+# Rubén Trujillo <rubentrf@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:04+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-01 02:01+0200\n"
+"PO-Revision-Date: 2012-08-31 22:41+0000\n"
+"Last-Translator: Rubén Trujillo <rubentrf@gmail.com>\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"
@@ -33,7 +34,7 @@ msgstr "Descargar"
 
 #: templates/public.php:18
 msgid "No preview available for"
-msgstr ""
+msgstr "No hay vista previa disponible para"
 
 #: templates/public.php:23
 msgid "web services under your control"
diff --git a/l10n/es/lib.po b/l10n/es/lib.po
index a8931cbabc..016a35e522 100644
--- a/l10n/es/lib.po
+++ b/l10n/es/lib.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 05:46+0000\n"
-"Last-Translator: juanman <juanma@kde.org.ar>\n"
+"POT-Creation-Date: 2012-09-01 02:01+0200\n"
+"PO-Revision-Date: 2012-09-01 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"
@@ -18,43 +18,43 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: app.php:287
+#: app.php:288
 msgid "Help"
 msgstr "Ayuda"
 
-#: app.php:294
+#: app.php:295
 msgid "Personal"
 msgstr "Personal"
 
-#: app.php:299
+#: app.php:300
 msgid "Settings"
 msgstr "Ajustes"
 
-#: app.php:304
+#: app.php:305
 msgid "Users"
 msgstr "Usuarios"
 
-#: app.php:311
+#: app.php:312
 msgid "Apps"
 msgstr "Aplicaciones"
 
-#: app.php:313
+#: app.php:314
 msgid "Admin"
 msgstr "Administración"
 
-#: files.php:245
+#: files.php:280
 msgid "ZIP download is turned off."
 msgstr "La descarga en ZIP está desactivada."
 
-#: files.php:246
+#: files.php:281
 msgid "Files need to be downloaded one by one."
 msgstr "Los archivos deben ser descargados uno por uno."
 
-#: files.php:246 files.php:271
+#: files.php:281 files.php:306
 msgid "Back to Files"
 msgstr "Volver a Archivos"
 
-#: files.php:270
+#: files.php:305
 msgid "Selected files too large to generate zip file."
 msgstr "Los archivos seleccionados son demasiado grandes para generar el archivo zip."
 
@@ -111,3 +111,16 @@ msgstr "este año"
 #: template.php:97
 msgid "years ago"
 msgstr "hace años"
+
+#: updater.php:66
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+msgstr ""
+
+#: updater.php:68
+msgid "up to date"
+msgstr ""
+
+#: updater.php:71
+msgid "updates check is disabled"
+msgstr ""
diff --git a/l10n/es/settings.po b/l10n/es/settings.po
index de248b3617..128b7d82b4 100644
--- a/l10n/es/settings.po
+++ b/l10n/es/settings.po
@@ -10,14 +10,15 @@
 # oSiNaReF  <>, 2012.
 #   <rodrigo.calvo@gmail.com>, 2012.
 #   <rom1dep@gmail.com>, 2011.
+# Rubén Trujillo <rubentrf@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-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-01 02:01+0200\n"
+"PO-Revision-Date: 2012-08-31 22:51+0000\n"
+"Last-Translator: Rubén Trujillo <rubentrf@gmail.com>\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"
@@ -95,39 +96,39 @@ msgstr "usar servicio cron del sistema"
 
 #: templates/admin.php:39
 msgid "Share API"
-msgstr ""
+msgstr "API de compartición"
 
 #: templates/admin.php:44
 msgid "Enable Share API"
-msgstr ""
+msgstr "Activar API de compartición"
 
 #: templates/admin.php:45
 msgid "Allow apps to use the Share API"
-msgstr ""
+msgstr "Permitir a las aplicaciones usar la API de compartición"
 
 #: templates/admin.php:49
 msgid "Allow links"
-msgstr ""
+msgstr "Permitir enlaces"
 
 #: templates/admin.php:50
 msgid "Allow users to share items to the public with links"
-msgstr ""
+msgstr "Permitir a los usuarios compartir elementos públicamente con enlaces"
 
 #: templates/admin.php:54
 msgid "Allow resharing"
-msgstr ""
+msgstr "Permitir re-compartir"
 
 #: templates/admin.php:55
 msgid "Allow users to share items shared with them again"
-msgstr ""
+msgstr "Permitir a los usuarios compartir elementos compartidos con ellos de nuevo"
 
 #: templates/admin.php:58
 msgid "Allow users to share with anyone"
-msgstr ""
+msgstr "Permitir a los usuarios compartir con cualquiera"
 
 #: templates/admin.php:60
 msgid "Allow users to only share with users in their groups"
-msgstr ""
+msgstr "Permitir a los usuarios compartir con usuarios en sus grupos"
 
 #: templates/admin.php:67
 msgid "Log"
diff --git a/l10n/es/user_ldap.po b/l10n/es/user_ldap.po
index 49025f4606..e87843eac9 100644
--- a/l10n/es/user_ldap.po
+++ b/l10n/es/user_ldap.po
@@ -4,13 +4,15 @@
 # 
 # Translators:
 # Javier Llorente <javier@opensuse.org>, 2012.
+# Rubén Trujillo <rubentrf@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-08-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-01 02:01+0200\n"
+"PO-Revision-Date: 2012-08-31 23:04+0000\n"
+"Last-Translator: Rubén Trujillo <rubentrf@gmail.com>\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"
@@ -20,31 +22,31 @@ msgstr ""
 
 #: templates/settings.php:8
 msgid "Host"
-msgstr ""
+msgstr "Servidor"
 
 #: templates/settings.php:8
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
-msgstr ""
+msgstr "Puede omitir el protocolo, excepto si requiere SSL. En ese caso, empiece 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 "Puede especificar el DN base para usuarios y grupos en la pestaña Avanzado"
 
 #: templates/settings.php:10
 msgid "User DN"
-msgstr ""
+msgstr "DN usuario"
 
 #: 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 "El DN del usuario cliente con el que se hará la asociación, p.ej. uid=agente,dc=ejemplo,dc=com. Para acceso anónimo, deje DN y contraseña vacíos."
 
 #: templates/settings.php:11
 msgid "Password"
@@ -52,7 +54,7 @@ msgstr "Contraseña"
 
 #: templates/settings.php:11
 msgid "For anonymous access, leave DN and Password empty."
-msgstr ""
+msgstr "Para acceso anónimo, deje DN y contraseña vacíos."
 
 #: templates/settings.php:12
 msgid "User Login Filter"
@@ -72,11 +74,11 @@ msgstr ""
 
 #: templates/settings.php:13
 msgid "User List Filter"
-msgstr ""
+msgstr "Lista de filtros de usuario"
 
 #: templates/settings.php:13
 msgid "Defines the filter to apply, when retrieving users."
-msgstr ""
+msgstr "Define el filtro a aplicar, cuando se obtienen usuarios."
 
 #: templates/settings.php:13
 msgid "without any placeholder, e.g. \"objectClass=person\"."
@@ -84,11 +86,11 @@ msgstr ""
 
 #: templates/settings.php:14
 msgid "Group Filter"
-msgstr ""
+msgstr "Filtro de grupo"
 
 #: templates/settings.php:14
 msgid "Defines the filter to apply, when retrieving groups."
-msgstr ""
+msgstr "Define el filtro a aplicar, cuando se obtienen grupos."
 
 #: templates/settings.php:14
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
@@ -100,15 +102,15 @@ msgstr "Puerto"
 
 #: templates/settings.php:18
 msgid "Base User Tree"
-msgstr ""
+msgstr "Árbol base de usuario"
 
 #: templates/settings.php:19
 msgid "Base Group Tree"
-msgstr ""
+msgstr "Árbol base de grupo"
 
 #: templates/settings.php:20
 msgid "Group-Member association"
-msgstr ""
+msgstr "Asociación Grupo-Miembro"
 
 #: templates/settings.php:21
 msgid "Use TLS"
@@ -116,41 +118,41 @@ msgstr "Usar TLS"
 
 #: templates/settings.php:21
 msgid "Do not use it for SSL connections, it will fail."
-msgstr ""
+msgstr "No usarlo para SSL, habrá error."
 
 #: templates/settings.php:22
 msgid "Case insensitve LDAP server (Windows)"
-msgstr ""
+msgstr "Servidor de LDAP sensible a mayúsculas/minúsculas (Windows)"
 
 #: templates/settings.php:23
 msgid "Turn off SSL certificate validation."
-msgstr ""
+msgstr "Apagar la validación por certificado 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 conexión sólo funciona con esta opción, importe el certificado SSL del servidor LDAP en su servidor ownCloud."
 
 #: templates/settings.php:23
 msgid "Not recommended, use for testing only."
-msgstr ""
+msgstr "No recomendado, sólo para pruebas."
 
 #: templates/settings.php:24
 msgid "User Display Name Field"
-msgstr ""
+msgstr "Campo de nombre de usuario a mostrar"
 
 #: templates/settings.php:24
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
-msgstr ""
+msgstr "El atributo LDAP a usar para generar el nombre de usuario de ownCloud."
 
 #: templates/settings.php:25
 msgid "Group Display Name Field"
-msgstr ""
+msgstr "Campo de nombre de grupo a mostrar"
 
 #: templates/settings.php:25
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
-msgstr ""
+msgstr "El atributo LDAP a usar para generar el nombre de los grupos de ownCloud."
 
 #: templates/settings.php:27
 msgid "in bytes"
@@ -158,13 +160,13 @@ msgstr "en bytes"
 
 #: templates/settings.php:29
 msgid "in seconds. A change empties the cache."
-msgstr ""
+msgstr "en segundos. Un cambio vacía la cache."
 
 #: templates/settings.php:30
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
-msgstr ""
+msgstr "Vacío para el nombre de usuario (por defecto). En otro caso, especifique un atributo LDAP/AD."
 
 #: templates/settings.php:32
 msgid "Help"
diff --git a/l10n/et_EE/lib.po b/l10n/et_EE/lib.po
index 323ca13114..789beb732b 100644
--- a/l10n/et_EE/lib.po
+++ b/l10n/et_EE/lib.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 10:25+0000\n"
-"Last-Translator: Rivo Zängov <eraser@eraser.ee>\n"
+"POT-Creation-Date: 2012-09-01 02:01+0200\n"
+"PO-Revision-Date: 2012-09-01 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"
@@ -18,43 +18,43 @@ msgstr ""
 "Language: et_EE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: app.php:287
+#: app.php:288
 msgid "Help"
 msgstr "Abiinfo"
 
-#: app.php:294
+#: app.php:295
 msgid "Personal"
 msgstr "Isiklik"
 
-#: app.php:299
+#: app.php:300
 msgid "Settings"
 msgstr "Seaded"
 
-#: app.php:304
+#: app.php:305
 msgid "Users"
 msgstr "Kasutajad"
 
-#: app.php:311
+#: app.php:312
 msgid "Apps"
 msgstr "Rakendused"
 
-#: app.php:313
+#: app.php:314
 msgid "Admin"
 msgstr "Admin"
 
-#: files.php:245
+#: files.php:280
 msgid "ZIP download is turned off."
 msgstr "ZIP-ina allalaadimine on välja lülitatud."
 
-#: files.php:246
+#: files.php:281
 msgid "Files need to be downloaded one by one."
 msgstr "Failid tuleb alla laadida ükshaaval."
 
-#: files.php:246 files.php:271
+#: files.php:281 files.php:306
 msgid "Back to Files"
 msgstr "Tagasi failide juurde"
 
-#: files.php:270
+#: files.php:305
 msgid "Selected files too large to generate zip file."
 msgstr "Valitud failid on ZIP-faili loomiseks liiga suured."
 
@@ -111,3 +111,16 @@ msgstr "eelmisel aastal"
 #: template.php:97
 msgid "years ago"
 msgstr "aastat tagasi"
+
+#: updater.php:66
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+msgstr ""
+
+#: updater.php:68
+msgid "up to date"
+msgstr ""
+
+#: updater.php:71
+msgid "updates check is disabled"
+msgstr ""
diff --git a/l10n/eu/lib.po b/l10n/eu/lib.po
index f8625e4759..c083e4f865 100644
--- a/l10n/eu/lib.po
+++ b/l10n/eu/lib.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <asieriko@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-09-01 02:01+0200\n"
+"PO-Revision-Date: 2012-09-01 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"
@@ -17,96 +18,109 @@ msgstr ""
 "Language: eu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: app.php:287
+#: app.php:288
 msgid "Help"
-msgstr ""
+msgstr "Laguntza"
 
-#: app.php:294
+#: app.php:295
 msgid "Personal"
-msgstr ""
+msgstr "Pertsonala"
 
-#: app.php:299
+#: app.php:300
 msgid "Settings"
-msgstr ""
+msgstr "Ezarpenak"
 
-#: app.php:304
+#: app.php:305
 msgid "Users"
-msgstr ""
+msgstr "Erabiltzaileak"
 
-#: app.php:311
+#: app.php:312
 msgid "Apps"
-msgstr ""
+msgstr "Aplikazioak"
 
-#: app.php:313
+#: app.php:314
 msgid "Admin"
-msgstr ""
+msgstr "Admin"
 
-#: files.php:245
+#: files.php:280
 msgid "ZIP download is turned off."
-msgstr ""
+msgstr "ZIP deskarga ez dago gaituta."
 
-#: files.php:246
+#: files.php:281
 msgid "Files need to be downloaded one by one."
-msgstr ""
+msgstr "Fitxategiak banan-banan deskargatu behar dira."
 
-#: files.php:246 files.php:271
+#: files.php:281 files.php:306
 msgid "Back to Files"
-msgstr ""
+msgstr "Itzuli fitxategietara"
 
-#: files.php:270
+#: files.php:305
 msgid "Selected files too large to generate zip file."
-msgstr ""
+msgstr "Hautatuko fitxategiak oso handiak dira zip fitxategia sortzeko."
 
 #: json.php:28
 msgid "Application is not enabled"
-msgstr ""
+msgstr "Aplikazioa ez dago gaituta"
 
 #: json.php:39 json.php:63 json.php:75
 msgid "Authentication error"
-msgstr ""
+msgstr "Autentikazio errorea"
 
 #: json.php:51
 msgid "Token expired. Please reload page."
-msgstr ""
+msgstr "Tokena iraungitu da. Mesedez birkargatu orria."
 
 #: template.php:86
 msgid "seconds ago"
-msgstr ""
+msgstr "orain dela segundu batzuk"
 
 #: template.php:87
 msgid "1 minute ago"
-msgstr ""
+msgstr "orain dela minutu 1"
 
 #: template.php:88
 #, php-format
 msgid "%d minutes ago"
-msgstr ""
+msgstr "orain dela %d minutu"
 
 #: template.php:91
 msgid "today"
-msgstr ""
+msgstr "gaur"
 
 #: template.php:92
 msgid "yesterday"
-msgstr ""
+msgstr "atzo"
 
 #: template.php:93
 #, php-format
 msgid "%d days ago"
-msgstr ""
+msgstr "orain dela %d egun"
 
 #: template.php:94
 msgid "last month"
-msgstr ""
+msgstr "joan den hilabetea"
 
 #: template.php:95
 msgid "months ago"
-msgstr ""
+msgstr "orain dela hilabete batzuk"
 
 #: template.php:96
 msgid "last year"
-msgstr ""
+msgstr "joan den urtea"
 
 #: template.php:97
 msgid "years ago"
+msgstr "orain dela urte batzuk"
+
+#: updater.php:66
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+msgstr ""
+
+#: updater.php:68
+msgid "up to date"
+msgstr ""
+
+#: updater.php:71
+msgid "updates check is disabled"
 msgstr ""
diff --git a/l10n/eu_ES/lib.po b/l10n/eu_ES/lib.po
index 366fbd9fb9..120167c892 100644
--- a/l10n/eu_ES/lib.po
+++ b/l10n/eu_ES/lib.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-27 22:23+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-09-01 02:01+0200\n"
+"PO-Revision-Date: 2012-09-01 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"
@@ -17,43 +17,43 @@ msgstr ""
 "Language: eu_ES\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\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 ""
 
-#: files.php:245
+#: files.php:280
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:246
+#: files.php:281
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:246 files.php:271
+#: files.php:281 files.php:306
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:270
+#: files.php:305
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
@@ -110,3 +110,16 @@ msgstr ""
 #: template.php:97
 msgid "years ago"
 msgstr ""
+
+#: updater.php:66
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+msgstr ""
+
+#: updater.php:68
+msgid "up to date"
+msgstr ""
+
+#: updater.php:71
+msgid "updates check is disabled"
+msgstr ""
diff --git a/l10n/fa/lib.po b/l10n/fa/lib.po
index 7e1c82ad5e..589e967a94 100644
--- a/l10n/fa/lib.po
+++ b/l10n/fa/lib.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-24 02:02+0200\n"
-"PO-Revision-Date: 2012-08-23 20:01+0000\n"
-"Last-Translator: Mohammad Dashtizadeh <mohammad@dashtizadeh.net>\n"
+"POT-Creation-Date: 2012-09-01 02:01+0200\n"
+"PO-Revision-Date: 2012-09-01 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"
@@ -42,19 +42,19 @@ msgstr ""
 msgid "Admin"
 msgstr "مدیر"
 
-#: files.php:276
+#: files.php:280
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:277
+#: files.php:281
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:277 files.php:302
+#: files.php:281 files.php:306
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:301
+#: files.php:305
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
@@ -111,3 +111,16 @@ msgstr "سال قبل"
 #: template.php:97
 msgid "years ago"
 msgstr "سال‌های قبل"
+
+#: updater.php:66
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+msgstr ""
+
+#: updater.php:68
+msgid "up to date"
+msgstr ""
+
+#: updater.php:71
+msgid "updates check is disabled"
+msgstr ""
diff --git a/l10n/fi/lib.po b/l10n/fi/lib.po
index eee9ac5f9e..6ed65abd5e 100644
--- a/l10n/fi/lib.po
+++ b/l10n/fi/lib.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: 2012-07-27 22:23+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-09-01 02:01+0200\n"
+"PO-Revision-Date: 2012-09-01 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"
@@ -41,19 +41,19 @@ msgstr ""
 msgid "Admin"
 msgstr ""
 
-#: files.php:245
+#: files.php:280
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:246
+#: files.php:281
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:246 files.php:271
+#: files.php:281 files.php:306
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:270
+#: files.php:305
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
@@ -110,3 +110,16 @@ msgstr ""
 #: template.php:97
 msgid "years ago"
 msgstr ""
+
+#: updater.php:66
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+msgstr ""
+
+#: updater.php:68
+msgid "up to date"
+msgstr ""
+
+#: updater.php:71
+msgid "updates check is disabled"
+msgstr ""
diff --git a/l10n/fi_FI/lib.po b/l10n/fi_FI/lib.po
index 50d80dd63b..4306f98338 100644
--- a/l10n/fi_FI/lib.po
+++ b/l10n/fi_FI/lib.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-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"
+"POT-Creation-Date: 2012-09-01 02:01+0200\n"
+"PO-Revision-Date: 2012-09-01 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"
@@ -18,43 +18,43 @@ msgstr ""
 "Language: fi_FI\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: app.php:287
+#: app.php:288
 msgid "Help"
 msgstr "Ohje"
 
-#: app.php:294
+#: app.php:295
 msgid "Personal"
 msgstr "Henkilökohtainen"
 
-#: app.php:299
+#: app.php:300
 msgid "Settings"
 msgstr "Asetukset"
 
-#: app.php:304
+#: app.php:305
 msgid "Users"
 msgstr "Käyttäjät"
 
-#: app.php:311
+#: app.php:312
 msgid "Apps"
 msgstr "Sovellukset"
 
-#: app.php:313
+#: app.php:314
 msgid "Admin"
 msgstr "Ylläpitäjä"
 
-#: files.php:245
+#: files.php:280
 msgid "ZIP download is turned off."
 msgstr "ZIP-lataus on poistettu käytöstä."
 
-#: files.php:246
+#: files.php:281
 msgid "Files need to be downloaded one by one."
 msgstr "Tiedostot on ladattava yksittäin."
 
-#: files.php:246 files.php:271
+#: files.php:281 files.php:306
 msgid "Back to Files"
 msgstr "Takaisin tiedostoihin"
 
-#: files.php:270
+#: files.php:305
 msgid "Selected files too large to generate zip file."
 msgstr "Valitut tiedostot ovat liian suurikokoisia mahtuakseen zip-tiedostoon."
 
@@ -111,3 +111,16 @@ msgstr "viime vuonna"
 #: template.php:97
 msgid "years ago"
 msgstr "vuotta sitten"
+
+#: updater.php:66
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+msgstr ""
+
+#: updater.php:68
+msgid "up to date"
+msgstr ""
+
+#: updater.php:71
+msgid "updates check is disabled"
+msgstr ""
diff --git a/l10n/fr/core.po b/l10n/fr/core.po
index 44ac2aa06c..9d16fe11ba 100644
--- a/l10n/fr/core.po
+++ b/l10n/fr/core.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <florentin.lemoal@gmail.com>, 2012.
 # Guillaume Paumier <guillom.pom@gmail.com>, 2012.
 # Nahir Mohamed <nahirmoha@gmail.com>, 2012.
 #   <nathaplop@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-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-01 02:01+0200\n"
+"PO-Revision-Date: 2012-08-31 19:09+0000\n"
+"Last-Translator: Florentin Le Moal <florentin.lemoal@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"
@@ -234,7 +235,7 @@ msgstr "Nom de la base de données"
 
 #: templates/installation.php:109
 msgid "Database tablespace"
-msgstr ""
+msgstr "Tablespaces de la base de données"
 
 #: templates/installation.php:115
 msgid "Database host"
diff --git a/l10n/fr/files.po b/l10n/fr/files.po
index 6bc9f20b8b..9131d0d350 100644
--- a/l10n/fr/files.po
+++ b/l10n/fr/files.po
@@ -5,6 +5,7 @@
 # Translators:
 # Cyril Glapa <kyriog@gmail.com>, 2012.
 # Geoffrey Guerrier <geoffrey.guerrier@gmail.com>, 2012.
+#   <gp4004@arghh.org>, 2012.
 #   <guiguidu31300@gmail.com>, 2012.
 # Guillaume Paumier <guillom.pom@gmail.com>, 2012.
 # Nahir Mohamed <nahirmoha@gmail.com>, 2012.
@@ -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-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-01 02:01+0200\n"
+"PO-Revision-Date: 2012-08-31 09:27+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"
@@ -113,7 +114,7 @@ msgstr "Chargement annulé."
 #: js/files.js:409
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
-msgstr ""
+msgstr "L'envoi du fichier est en cours. Quitter cette page maintenant annulera l'envoi du fichier."
 
 #: js/files.js:480
 msgid "Invalid name, '/' is not allowed."
diff --git a/l10n/fr/files_sharing.po b/l10n/fr/files_sharing.po
index d107f29619..13fe8b5a46 100644
--- a/l10n/fr/files_sharing.po
+++ b/l10n/fr/files_sharing.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <florentin.lemoal@gmail.com>, 2012.
 #   <gp4004@arghh.org>, 2012.
 # Guillaume Paumier <guillom.pom@gmail.com>, 2012.
 # Romain DEP. <rom1dep@gmail.com>, 2012.
@@ -11,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:04+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-01 02:01+0200\n"
+"PO-Revision-Date: 2012-08-31 19:11+0000\n"
+"Last-Translator: Florentin Le Moal <florentin.lemoal@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"
@@ -35,7 +36,7 @@ msgstr "Télécharger"
 
 #: templates/public.php:18
 msgid "No preview available for"
-msgstr ""
+msgstr "Pas d'aperçu disponible pour"
 
 #: templates/public.php:23
 msgid "web services under your control"
diff --git a/l10n/fr/lib.po b/l10n/fr/lib.po
index 42c784ce91..5b9ac2ed7f 100644
--- a/l10n/fr/lib.po
+++ b/l10n/fr/lib.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 00:22+0000\n"
-"Last-Translator: Romain DEP. <rom1dep@gmail.com>\n"
+"POT-Creation-Date: 2012-09-01 02:01+0200\n"
+"PO-Revision-Date: 2012-09-01 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"
@@ -19,43 +19,43 @@ msgstr ""
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
-#: app.php:287
+#: app.php:288
 msgid "Help"
 msgstr "Aide"
 
-#: app.php:294
+#: app.php:295
 msgid "Personal"
 msgstr "Personnel"
 
-#: app.php:299
+#: app.php:300
 msgid "Settings"
 msgstr "Paramètres"
 
-#: app.php:304
+#: app.php:305
 msgid "Users"
 msgstr "Utilisateurs"
 
-#: app.php:311
+#: app.php:312
 msgid "Apps"
 msgstr "Applications"
 
-#: app.php:313
+#: app.php:314
 msgid "Admin"
 msgstr "Administration"
 
-#: files.php:245
+#: files.php:280
 msgid "ZIP download is turned off."
 msgstr "Téléchargement ZIP désactivé."
 
-#: files.php:246
+#: files.php:281
 msgid "Files need to be downloaded one by one."
 msgstr "Les fichiers nécessitent d'être téléchargés un par un."
 
-#: files.php:246 files.php:271
+#: files.php:281 files.php:306
 msgid "Back to Files"
 msgstr "Retour aux Fichiers"
 
-#: files.php:270
+#: files.php:305
 msgid "Selected files too large to generate zip file."
 msgstr "Les fichiers sélectionnés sont trop volumineux pour être compressés."
 
@@ -112,3 +112,16 @@ msgstr "l'année dernière"
 #: template.php:97
 msgid "years ago"
 msgstr "il y a plusieurs années"
+
+#: updater.php:66
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+msgstr ""
+
+#: updater.php:68
+msgid "up to date"
+msgstr ""
+
+#: updater.php:71
+msgid "updates check is disabled"
+msgstr ""
diff --git a/l10n/fr/settings.po b/l10n/fr/settings.po
index 2fbf6fe41c..2cde4d6103 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.
+#   <florentin.lemoal@gmail.com>, 2012.
 #   <gp4004@arghh.org>, 2012.
 #   <guiguidu31300@gmail.com>, 2012.
 # Jan-Christoph Borchardt <JanCBorchardt@fsfe.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-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-01 02:01+0200\n"
+"PO-Revision-Date: 2012-08-31 18:08+0000\n"
+"Last-Translator: Florentin Le Moal <florentin.lemoal@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"
@@ -96,39 +97,39 @@ msgstr "utiliser le service cron du système "
 
 #: templates/admin.php:39
 msgid "Share API"
-msgstr ""
+msgstr "API de partage"
 
 #: templates/admin.php:44
 msgid "Enable Share API"
-msgstr ""
+msgstr "Activer l'API de partage"
 
 #: templates/admin.php:45
 msgid "Allow apps to use the Share API"
-msgstr ""
+msgstr "Autoriser les applications à utiliser l'API de partage"
 
 #: templates/admin.php:49
 msgid "Allow links"
-msgstr ""
+msgstr "Autoriser les liens"
 
 #: templates/admin.php:50
 msgid "Allow users to share items to the public with links"
-msgstr ""
+msgstr "Autoriser les utilisateurs à partager du contenu public avec des liens"
 
 #: templates/admin.php:54
 msgid "Allow resharing"
-msgstr ""
+msgstr "Autoriser le re-partage"
 
 #: templates/admin.php:55
 msgid "Allow users to share items shared with them again"
-msgstr ""
+msgstr "Autoriser les utilisateurs à partager des éléments déjà partagés entre eux"
 
 #: templates/admin.php:58
 msgid "Allow users to share with anyone"
-msgstr ""
+msgstr "Autoriser les utilisateurs à partager avec tout le monde"
 
 #: templates/admin.php:60
 msgid "Allow users to only share with users in their groups"
-msgstr ""
+msgstr "Autoriser les utilisateurs à ne partager qu'avec les utilisateurs dans leurs groupes"
 
 #: templates/admin.php:67
 msgid "Log"
diff --git a/l10n/gl/lib.po b/l10n/gl/lib.po
index 2e675b5678..a0531aaba0 100644
--- a/l10n/gl/lib.po
+++ b/l10n/gl/lib.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-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-09-01 02:01+0200\n"
+"PO-Revision-Date: 2012-09-01 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"
@@ -17,43 +17,43 @@ msgstr ""
 "Language: gl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\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 ""
 
-#: files.php:245
+#: files.php:280
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:246
+#: files.php:281
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:246 files.php:271
+#: files.php:281 files.php:306
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:270
+#: files.php:305
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
@@ -110,3 +110,16 @@ msgstr ""
 #: template.php:97
 msgid "years ago"
 msgstr ""
+
+#: updater.php:66
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+msgstr ""
+
+#: updater.php:68
+msgid "up to date"
+msgstr ""
+
+#: updater.php:71
+msgid "updates check is disabled"
+msgstr ""
diff --git a/l10n/he/lib.po b/l10n/he/lib.po
index 78686b991a..eed328e6ce 100644
--- a/l10n/he/lib.po
+++ b/l10n/he/lib.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-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-09-01 02:01+0200\n"
+"PO-Revision-Date: 2012-09-01 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"
@@ -17,43 +17,43 @@ msgstr ""
 "Language: he\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\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 ""
 
-#: files.php:245
+#: files.php:280
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:246
+#: files.php:281
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:246 files.php:271
+#: files.php:281 files.php:306
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:270
+#: files.php:305
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
@@ -110,3 +110,16 @@ msgstr ""
 #: template.php:97
 msgid "years ago"
 msgstr ""
+
+#: updater.php:66
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+msgstr ""
+
+#: updater.php:68
+msgid "up to date"
+msgstr ""
+
+#: updater.php:71
+msgid "updates check is disabled"
+msgstr ""
diff --git a/l10n/hi/lib.po b/l10n/hi/lib.po
index 5dabd1411d..c7209b64c4 100644
--- a/l10n/hi/lib.po
+++ b/l10n/hi/lib.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-29 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-09-01 02:01+0200\n"
+"PO-Revision-Date: 2012-09-01 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -41,19 +41,19 @@ msgstr ""
 msgid "Admin"
 msgstr ""
 
-#: files.php:276
+#: files.php:280
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:277
+#: files.php:281
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:277 files.php:302
+#: files.php:281 files.php:306
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:301
+#: files.php:305
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
@@ -110,3 +110,16 @@ msgstr ""
 #: template.php:97
 msgid "years ago"
 msgstr ""
+
+#: updater.php:66
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+msgstr ""
+
+#: updater.php:68
+msgid "up to date"
+msgstr ""
+
+#: updater.php:71
+msgid "updates check is disabled"
+msgstr ""
diff --git a/l10n/hr/lib.po b/l10n/hr/lib.po
index d38126e621..a9682726b8 100644
--- a/l10n/hr/lib.po
+++ b/l10n/hr/lib.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-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-09-01 02:01+0200\n"
+"PO-Revision-Date: 2012-09-01 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"
@@ -17,43 +17,43 @@ 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"
 
-#: 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 ""
 
-#: files.php:245
+#: files.php:280
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:246
+#: files.php:281
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:246 files.php:271
+#: files.php:281 files.php:306
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:270
+#: files.php:305
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
@@ -110,3 +110,16 @@ msgstr ""
 #: template.php:97
 msgid "years ago"
 msgstr ""
+
+#: updater.php:66
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+msgstr ""
+
+#: updater.php:68
+msgid "up to date"
+msgstr ""
+
+#: updater.php:71
+msgid "updates check is disabled"
+msgstr ""
diff --git a/l10n/hu_HU/lib.po b/l10n/hu_HU/lib.po
index cd149d946d..ddbcd4f2d0 100644
--- a/l10n/hu_HU/lib.po
+++ b/l10n/hu_HU/lib.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Adam Toth <adazlord@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-09-01 02:01+0200\n"
+"PO-Revision-Date: 2012-09-01 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"
@@ -17,96 +18,109 @@ msgstr ""
 "Language: hu_HU\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: app.php:287
+#: app.php:288
 msgid "Help"
-msgstr ""
+msgstr "Súgó"
 
-#: app.php:294
+#: app.php:295
 msgid "Personal"
-msgstr ""
+msgstr "Személyes"
 
-#: app.php:299
+#: app.php:300
 msgid "Settings"
-msgstr ""
+msgstr "Beállítások"
 
-#: app.php:304
+#: app.php:305
 msgid "Users"
-msgstr ""
+msgstr "Felhasználók"
 
-#: app.php:311
+#: app.php:312
 msgid "Apps"
-msgstr ""
+msgstr "Alkalmazások"
 
-#: app.php:313
+#: app.php:314
 msgid "Admin"
-msgstr ""
+msgstr "Admin"
 
-#: files.php:245
+#: files.php:280
 msgid "ZIP download is turned off."
-msgstr ""
+msgstr "ZIP-letöltés letiltva"
 
-#: files.php:246
+#: files.php:281
 msgid "Files need to be downloaded one by one."
-msgstr ""
+msgstr "A file-okat egyenként kell letölteni"
 
-#: files.php:246 files.php:271
+#: files.php:281 files.php:306
 msgid "Back to Files"
-msgstr ""
+msgstr "Vissza a File-okhoz"
 
-#: files.php:270
+#: files.php:305
 msgid "Selected files too large to generate zip file."
-msgstr ""
+msgstr "Túl nagy file-ok a zip-generáláshoz"
 
 #: json.php:28
 msgid "Application is not enabled"
-msgstr ""
+msgstr "Az alkalmazás nincs engedélyezve"
 
 #: json.php:39 json.php:63 json.php:75
 msgid "Authentication error"
-msgstr ""
+msgstr "Hitelesítési hiba"
 
 #: json.php:51
 msgid "Token expired. Please reload page."
-msgstr ""
+msgstr "A token lejárt. Frissítsd az oldalt."
 
 #: template.php:86
 msgid "seconds ago"
-msgstr ""
+msgstr "másodperccel ezelőtt"
 
 #: template.php:87
 msgid "1 minute ago"
-msgstr ""
+msgstr "1 perccel ezelőtt"
 
 #: template.php:88
 #, php-format
 msgid "%d minutes ago"
-msgstr ""
+msgstr "%d perccel ezelőtt"
 
 #: template.php:91
 msgid "today"
-msgstr ""
+msgstr "ma"
 
 #: template.php:92
 msgid "yesterday"
-msgstr ""
+msgstr "tegnap"
 
 #: template.php:93
 #, php-format
 msgid "%d days ago"
-msgstr ""
+msgstr "%d évvel ezelőtt"
 
 #: template.php:94
 msgid "last month"
-msgstr ""
+msgstr "múlt hónapban"
 
 #: template.php:95
 msgid "months ago"
-msgstr ""
+msgstr "hónappal ezelőtt"
 
 #: template.php:96
 msgid "last year"
-msgstr ""
+msgstr "tavaly"
 
 #: template.php:97
 msgid "years ago"
+msgstr "évvel ezelőtt"
+
+#: updater.php:66
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+msgstr ""
+
+#: updater.php:68
+msgid "up to date"
+msgstr ""
+
+#: updater.php:71
+msgid "updates check is disabled"
 msgstr ""
diff --git a/l10n/hy/lib.po b/l10n/hy/lib.po
index 1a8aea0ebb..a6359330b3 100644
--- a/l10n/hy/lib.po
+++ b/l10n/hy/lib.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-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-09-01 02:01+0200\n"
+"PO-Revision-Date: 2012-09-01 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"
@@ -17,43 +17,43 @@ msgstr ""
 "Language: hy\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\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 ""
 
-#: files.php:245
+#: files.php:280
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:246
+#: files.php:281
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:246 files.php:271
+#: files.php:281 files.php:306
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:270
+#: files.php:305
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
@@ -110,3 +110,16 @@ msgstr ""
 #: template.php:97
 msgid "years ago"
 msgstr ""
+
+#: updater.php:66
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+msgstr ""
+
+#: updater.php:68
+msgid "up to date"
+msgstr ""
+
+#: updater.php:71
+msgid "updates check is disabled"
+msgstr ""
diff --git a/l10n/ia/lib.po b/l10n/ia/lib.po
index 4950811110..ea036a2639 100644
--- a/l10n/ia/lib.po
+++ b/l10n/ia/lib.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-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-09-01 02:01+0200\n"
+"PO-Revision-Date: 2012-09-01 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"
@@ -17,43 +17,43 @@ msgstr ""
 "Language: ia\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\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 ""
 
-#: files.php:245
+#: files.php:280
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:246
+#: files.php:281
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:246 files.php:271
+#: files.php:281 files.php:306
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:270
+#: files.php:305
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
@@ -110,3 +110,16 @@ msgstr ""
 #: template.php:97
 msgid "years ago"
 msgstr ""
+
+#: updater.php:66
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+msgstr ""
+
+#: updater.php:68
+msgid "up to date"
+msgstr ""
+
+#: updater.php:71
+msgid "updates check is disabled"
+msgstr ""
diff --git a/l10n/id/lib.po b/l10n/id/lib.po
index 6c8b5a8c49..3193d5c4dd 100644
--- a/l10n/id/lib.po
+++ b/l10n/id/lib.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-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-09-01 02:01+0200\n"
+"PO-Revision-Date: 2012-09-01 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"
@@ -17,43 +17,43 @@ msgstr ""
 "Language: id\n"
 "Plural-Forms: nplurals=1; plural=0\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 ""
 
-#: files.php:245
+#: files.php:280
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:246
+#: files.php:281
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:246 files.php:271
+#: files.php:281 files.php:306
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:270
+#: files.php:305
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
@@ -110,3 +110,16 @@ msgstr ""
 #: template.php:97
 msgid "years ago"
 msgstr ""
+
+#: updater.php:66
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+msgstr ""
+
+#: updater.php:68
+msgid "up to date"
+msgstr ""
+
+#: updater.php:71
+msgid "updates check is disabled"
+msgstr ""
diff --git a/l10n/id_ID/lib.po b/l10n/id_ID/lib.po
index 62fef73ca0..5335009078 100644
--- a/l10n/id_ID/lib.po
+++ b/l10n/id_ID/lib.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-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-09-01 02:01+0200\n"
+"PO-Revision-Date: 2012-09-01 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"
@@ -17,43 +17,43 @@ msgstr ""
 "Language: id_ID\n"
 "Plural-Forms: nplurals=1; plural=0\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 ""
 
-#: files.php:245
+#: files.php:280
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:246
+#: files.php:281
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:246 files.php:271
+#: files.php:281 files.php:306
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:270
+#: files.php:305
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
@@ -110,3 +110,16 @@ msgstr ""
 #: template.php:97
 msgid "years ago"
 msgstr ""
+
+#: updater.php:66
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+msgstr ""
+
+#: updater.php:68
+msgid "up to date"
+msgstr ""
+
+#: updater.php:71
+msgid "updates check is disabled"
+msgstr ""
diff --git a/l10n/it/core.po b/l10n/it/core.po
index da546df81f..281cd036ad 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-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-01 02:01+0200\n"
+"PO-Revision-Date: 2012-08-31 05:26+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"
@@ -234,7 +234,7 @@ msgstr "Nome del database"
 
 #: templates/installation.php:109
 msgid "Database tablespace"
-msgstr ""
+msgstr "Spazio delle tabelle del database"
 
 #: templates/installation.php:115
 msgid "Database host"
diff --git a/l10n/it/files.po b/l10n/it/files.po
index b4df0c65ff..ccf33f1c45 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-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-01 02:01+0200\n"
+"PO-Revision-Date: 2012-08-31 05:43+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"
@@ -110,7 +110,7 @@ msgstr "Invio annullato"
 #: js/files.js:409
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
-msgstr ""
+msgstr "Caricamento del file in corso. La chiusura della pagina annullerà il caricamento."
 
 #: js/files.js:480
 msgid "Invalid name, '/' is not allowed."
diff --git a/l10n/it/files_sharing.po b/l10n/it/files_sharing.po
index 51aec56bcd..b2494f4211 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-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:04+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-01 02:01+0200\n"
+"PO-Revision-Date: 2012-08-31 05:29+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"
@@ -32,7 +32,7 @@ msgstr "Scarica"
 
 #: templates/public.php:18
 msgid "No preview available for"
-msgstr ""
+msgstr "Nessuna anteprima disponibile per"
 
 #: templates/public.php:23
 msgid "web services under your control"
diff --git a/l10n/it/lib.po b/l10n/it/lib.po
index e34db2db96..c4f2d4bd3b 100644
--- a/l10n/it/lib.po
+++ b/l10n/it/lib.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 10:25+0000\n"
-"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
+"POT-Creation-Date: 2012-09-01 02:01+0200\n"
+"PO-Revision-Date: 2012-09-01 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"
@@ -18,43 +18,43 @@ msgstr ""
 "Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: app.php:287
+#: app.php:288
 msgid "Help"
 msgstr "Aiuto"
 
-#: app.php:294
+#: app.php:295
 msgid "Personal"
 msgstr "Personale"
 
-#: app.php:299
+#: app.php:300
 msgid "Settings"
 msgstr "Impostazioni"
 
-#: app.php:304
+#: app.php:305
 msgid "Users"
 msgstr "Utenti"
 
-#: app.php:311
+#: app.php:312
 msgid "Apps"
 msgstr "Applicazioni"
 
-#: app.php:313
+#: app.php:314
 msgid "Admin"
 msgstr "Admin"
 
-#: files.php:245
+#: files.php:280
 msgid "ZIP download is turned off."
 msgstr "Lo scaricamento in formato ZIP è stato disabilitato."
 
-#: files.php:246
+#: files.php:281
 msgid "Files need to be downloaded one by one."
 msgstr "I file devono essere scaricati uno alla volta."
 
-#: files.php:246 files.php:271
+#: files.php:281 files.php:306
 msgid "Back to Files"
 msgstr "Torna ai file"
 
-#: files.php:270
+#: files.php:305
 msgid "Selected files too large to generate zip file."
 msgstr "I  file selezionati sono troppo grandi per generare un file zip."
 
@@ -111,3 +111,16 @@ msgstr "l'anno scorso"
 #: template.php:97
 msgid "years ago"
 msgstr "anni fa"
+
+#: updater.php:66
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+msgstr ""
+
+#: updater.php:68
+msgid "up to date"
+msgstr ""
+
+#: updater.php:71
+msgid "updates check is disabled"
+msgstr ""
diff --git a/l10n/it/settings.po b/l10n/it/settings.po
index 9d79ed9ad6..0847f13efb 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-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-01 02:01+0200\n"
+"PO-Revision-Date: 2012-08-31 10:32+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"
@@ -94,39 +94,39 @@ msgstr "usa il servizio cron di sistema"
 
 #: templates/admin.php:39
 msgid "Share API"
-msgstr ""
+msgstr "API di condivisione"
 
 #: templates/admin.php:44
 msgid "Enable Share API"
-msgstr ""
+msgstr "Abilita API di condivisione"
 
 #: templates/admin.php:45
 msgid "Allow apps to use the Share API"
-msgstr ""
+msgstr "Consenti alle applicazioni di utilizzare le API di condivisione"
 
 #: templates/admin.php:49
 msgid "Allow links"
-msgstr ""
+msgstr "Consenti collegamenti"
 
 #: templates/admin.php:50
 msgid "Allow users to share items to the public with links"
-msgstr ""
+msgstr "Consenti agli utenti di condividere elementi al pubblico con collegamenti"
 
 #: templates/admin.php:54
 msgid "Allow resharing"
-msgstr ""
+msgstr "Consenti la ri-condivisione"
 
 #: templates/admin.php:55
 msgid "Allow users to share items shared with them again"
-msgstr ""
+msgstr "Consenti agli utenti di condividere elementi già condivisi"
 
 #: templates/admin.php:58
 msgid "Allow users to share with anyone"
-msgstr ""
+msgstr "Consenti agli utenti di condividere con chiunque"
 
 #: templates/admin.php:60
 msgid "Allow users to only share with users in their groups"
-msgstr ""
+msgstr "Consenti agli utenti di condividere con gli utenti del proprio gruppo"
 
 #: templates/admin.php:67
 msgid "Log"
diff --git a/l10n/ja_JP/core.po b/l10n/ja_JP/core.po
index a15ecce195..d0d6924197 100644
--- a/l10n/ja_JP/core.po
+++ b/l10n/ja_JP/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-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-01 02:01+0200\n"
+"PO-Revision-Date: 2012-08-31 07:44+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"
@@ -231,7 +231,7 @@ msgstr "データベース名"
 
 #: templates/installation.php:109
 msgid "Database tablespace"
-msgstr ""
+msgstr "データベースの表領域"
 
 #: templates/installation.php:115
 msgid "Database host"
diff --git a/l10n/ja_JP/files.po b/l10n/ja_JP/files.po
index a4c99fedcc..3fbe7f60e9 100644
--- a/l10n/ja_JP/files.po
+++ b/l10n/ja_JP/files.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-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-01 02:01+0200\n"
+"PO-Revision-Date: 2012-08-31 07:52+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"
@@ -107,7 +108,7 @@ msgstr "アップロードはキャンセルされました。"
 #: js/files.js:409
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
-msgstr ""
+msgstr "ファイル転送を実行中です。今このページから移動するとアップロードが中止されます。"
 
 #: js/files.js:480
 msgid "Invalid name, '/' is not allowed."
diff --git a/l10n/ja_JP/files_sharing.po b/l10n/ja_JP/files_sharing.po
index c47c870dc7..648cb83f0f 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-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:04+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-01 02:01+0200\n"
+"PO-Revision-Date: 2012-08-31 07:43+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"
@@ -33,7 +33,7 @@ msgstr "ダウンロード"
 
 #: templates/public.php:18
 msgid "No preview available for"
-msgstr ""
+msgstr "プレビューはありません"
 
 #: templates/public.php:23
 msgid "web services under your control"
diff --git a/l10n/ja_JP/lib.po b/l10n/ja_JP/lib.po
index 30b5055623..a2197a2994 100644
--- a/l10n/ja_JP/lib.po
+++ b/l10n/ja_JP/lib.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-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-09-01 02:01+0200\n"
+"PO-Revision-Date: 2012-09-01 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"
@@ -17,96 +18,109 @@ msgstr ""
 "Language: ja_JP\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:280
 msgid "ZIP download is turned off."
-msgstr ""
+msgstr "ZIPダウンロードは無効です。"
 
-#: files.php:246
+#: files.php:281
 msgid "Files need to be downloaded one by one."
-msgstr ""
+msgstr "ファイルは1つずつダウンロードする必要があります。"
 
-#: files.php:246 files.php:271
+#: files.php:281 files.php:306
 msgid "Back to Files"
-msgstr ""
+msgstr "ファイルに戻る"
 
-#: files.php:270
+#: files.php:305
 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 "年前"
+
+#: updater.php:66
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+msgstr ""
+
+#: updater.php:68
+msgid "up to date"
+msgstr ""
+
+#: updater.php:71
+msgid "updates check is disabled"
 msgstr ""
diff --git a/l10n/ja_JP/settings.po b/l10n/ja_JP/settings.po
index e7b829db82..2964354ae9 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-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-01 02:01+0200\n"
+"PO-Revision-Date: 2012-08-31 08:06+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"
@@ -89,39 +89,39 @@ msgstr "システムのcronサービスを使用"
 
 #: templates/admin.php:39
 msgid "Share API"
-msgstr ""
+msgstr "Share API"
 
 #: templates/admin.php:44
 msgid "Enable Share API"
-msgstr ""
+msgstr "Share APIを有効"
 
 #: templates/admin.php:45
 msgid "Allow apps to use the Share API"
-msgstr ""
+msgstr "Share APIの使用をアプリケーションに許可"
 
 #: templates/admin.php:49
 msgid "Allow links"
-msgstr ""
+msgstr "リンクを許可"
 
 #: templates/admin.php:50
 msgid "Allow users to share items to the public with links"
-msgstr ""
+msgstr "ユーザーがリンクによる公開でアイテムを共有することが出来るようにする"
 
 #: templates/admin.php:54
 msgid "Allow resharing"
-msgstr ""
+msgstr "再共有を許可"
 
 #: templates/admin.php:55
 msgid "Allow users to share items shared with them again"
-msgstr ""
+msgstr "ユーザーが共有されているアイテムをさらに共有することが出来るようにする"
 
 #: templates/admin.php:58
 msgid "Allow users to share with anyone"
-msgstr ""
+msgstr "ユーザーが誰にでも共有出来るようにする"
 
 #: templates/admin.php:60
 msgid "Allow users to only share with users in their groups"
-msgstr ""
+msgstr "ユーザーがグループの人にしか共有出来ないようにする"
 
 #: templates/admin.php:67
 msgid "Log"
diff --git a/l10n/ko/lib.po b/l10n/ko/lib.po
index 2308a069de..bf494197c6 100644
--- a/l10n/ko/lib.po
+++ b/l10n/ko/lib.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-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-09-01 02:01+0200\n"
+"PO-Revision-Date: 2012-09-01 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"
@@ -17,43 +17,43 @@ msgstr ""
 "Language: ko\n"
 "Plural-Forms: nplurals=1; plural=0\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 ""
 
-#: files.php:245
+#: files.php:280
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:246
+#: files.php:281
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:246 files.php:271
+#: files.php:281 files.php:306
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:270
+#: files.php:305
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
@@ -110,3 +110,16 @@ msgstr ""
 #: template.php:97
 msgid "years ago"
 msgstr ""
+
+#: updater.php:66
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+msgstr ""
+
+#: updater.php:68
+msgid "up to date"
+msgstr ""
+
+#: updater.php:71
+msgid "updates check is disabled"
+msgstr ""
diff --git a/l10n/lb/lib.po b/l10n/lb/lib.po
index bb55ec5a6f..8aa81edb8f 100644
--- a/l10n/lb/lib.po
+++ b/l10n/lb/lib.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-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-09-01 02:01+0200\n"
+"PO-Revision-Date: 2012-09-01 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"
@@ -17,43 +17,43 @@ msgstr ""
 "Language: lb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\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 ""
 
-#: files.php:245
+#: files.php:280
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:246
+#: files.php:281
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:246 files.php:271
+#: files.php:281 files.php:306
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:270
+#: files.php:305
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
@@ -110,3 +110,16 @@ msgstr ""
 #: template.php:97
 msgid "years ago"
 msgstr ""
+
+#: updater.php:66
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+msgstr ""
+
+#: updater.php:68
+msgid "up to date"
+msgstr ""
+
+#: updater.php:71
+msgid "updates check is disabled"
+msgstr ""
diff --git a/l10n/lt_LT/lib.po b/l10n/lt_LT/lib.po
index cf1cc1edba..4240cfb1d2 100644
--- a/l10n/lt_LT/lib.po
+++ b/l10n/lt_LT/lib.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-22 12:43+0000\n"
-"Last-Translator: Dr. ROX <to.dr.rox@gmail.com>\n"
+"POT-Creation-Date: 2012-09-01 02:01+0200\n"
+"PO-Revision-Date: 2012-09-01 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"
@@ -42,19 +42,19 @@ msgstr "Programos"
 msgid "Admin"
 msgstr "Administravimas"
 
-#: files.php:276
+#: files.php:280
 msgid "ZIP download is turned off."
 msgstr "ZIP atsisiuntimo galimybė yra išjungta."
 
-#: files.php:277
+#: files.php:281
 msgid "Files need to be downloaded one by one."
 msgstr "Failai turi būti parsiunčiami vienas po kito."
 
-#: files.php:277 files.php:302
+#: files.php:281 files.php:306
 msgid "Back to Files"
 msgstr "Atgal į Failus"
 
-#: files.php:301
+#: files.php:305
 msgid "Selected files too large to generate zip file."
 msgstr "Pasirinkti failai per dideli archyvavimui į ZIP."
 
@@ -111,3 +111,16 @@ msgstr "pereitais metais"
 #: template.php:97
 msgid "years ago"
 msgstr ""
+
+#: updater.php:66
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+msgstr ""
+
+#: updater.php:68
+msgid "up to date"
+msgstr ""
+
+#: updater.php:71
+msgid "updates check is disabled"
+msgstr ""
diff --git a/l10n/lv/lib.po b/l10n/lv/lib.po
index 40959dcc42..b7c5c41780 100644
--- a/l10n/lv/lib.po
+++ b/l10n/lv/lib.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-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-09-01 02:01+0200\n"
+"PO-Revision-Date: 2012-09-01 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"
@@ -17,43 +17,43 @@ msgstr ""
 "Language: lv\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2)\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 ""
 
-#: files.php:245
+#: files.php:280
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:246
+#: files.php:281
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:246 files.php:271
+#: files.php:281 files.php:306
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:270
+#: files.php:305
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
@@ -110,3 +110,16 @@ msgstr ""
 #: template.php:97
 msgid "years ago"
 msgstr ""
+
+#: updater.php:66
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+msgstr ""
+
+#: updater.php:68
+msgid "up to date"
+msgstr ""
+
+#: updater.php:71
+msgid "updates check is disabled"
+msgstr ""
diff --git a/l10n/mk/lib.po b/l10n/mk/lib.po
index 713abb126d..626e9dc54f 100644
--- a/l10n/mk/lib.po
+++ b/l10n/mk/lib.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-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-09-01 02:01+0200\n"
+"PO-Revision-Date: 2012-09-01 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"
@@ -17,43 +17,43 @@ msgstr ""
 "Language: mk\n"
 "Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1\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 ""
 
-#: files.php:245
+#: files.php:280
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:246
+#: files.php:281
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:246 files.php:271
+#: files.php:281 files.php:306
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:270
+#: files.php:305
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
@@ -110,3 +110,16 @@ msgstr ""
 #: template.php:97
 msgid "years ago"
 msgstr ""
+
+#: updater.php:66
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+msgstr ""
+
+#: updater.php:68
+msgid "up to date"
+msgstr ""
+
+#: updater.php:71
+msgid "updates check is disabled"
+msgstr ""
diff --git a/l10n/ms_MY/lib.po b/l10n/ms_MY/lib.po
index cd3b8e2f80..35fe79aada 100644
--- a/l10n/ms_MY/lib.po
+++ b/l10n/ms_MY/lib.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-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-09-01 02:01+0200\n"
+"PO-Revision-Date: 2012-09-01 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"
@@ -17,43 +17,43 @@ msgstr ""
 "Language: ms_MY\n"
 "Plural-Forms: nplurals=1; plural=0\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 ""
 
-#: files.php:245
+#: files.php:280
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:246
+#: files.php:281
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:246 files.php:271
+#: files.php:281 files.php:306
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:270
+#: files.php:305
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
@@ -110,3 +110,16 @@ msgstr ""
 #: template.php:97
 msgid "years ago"
 msgstr ""
+
+#: updater.php:66
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+msgstr ""
+
+#: updater.php:68
+msgid "up to date"
+msgstr ""
+
+#: updater.php:71
+msgid "updates check is disabled"
+msgstr ""
diff --git a/l10n/nb_NO/lib.po b/l10n/nb_NO/lib.po
index 52b02f78ee..4a78161719 100644
--- a/l10n/nb_NO/lib.po
+++ b/l10n/nb_NO/lib.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-26 01:17+0200\n"
-"PO-Revision-Date: 2012-08-25 22:57+0000\n"
-"Last-Translator: runesudden <runesudden@gmail.com>\n"
+"POT-Creation-Date: 2012-09-01 02:01+0200\n"
+"PO-Revision-Date: 2012-09-01 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"
@@ -43,19 +43,19 @@ msgstr "Apper"
 msgid "Admin"
 msgstr "Admin"
 
-#: files.php:276
+#: files.php:280
 msgid "ZIP download is turned off."
 msgstr "ZIP-nedlasting av avslått"
 
-#: files.php:277
+#: files.php:281
 msgid "Files need to be downloaded one by one."
 msgstr "Filene må lastes ned en om gangen"
 
-#: files.php:277 files.php:302
+#: files.php:281 files.php:306
 msgid "Back to Files"
 msgstr "Tilbake til filer"
 
-#: files.php:301
+#: files.php:305
 msgid "Selected files too large to generate zip file."
 msgstr "De valgte filene er for store til å kunne generere ZIP-fil"
 
@@ -112,3 +112,16 @@ msgstr "i fjor"
 #: template.php:97
 msgid "years ago"
 msgstr "år siden"
+
+#: updater.php:66
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+msgstr ""
+
+#: updater.php:68
+msgid "up to date"
+msgstr ""
+
+#: updater.php:71
+msgid "updates check is disabled"
+msgstr ""
diff --git a/l10n/nl/lib.po b/l10n/nl/lib.po
index 2715403dba..d7e354e9f4 100644
--- a/l10n/nl/lib.po
+++ b/l10n/nl/lib.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-25 02:04+0200\n"
-"PO-Revision-Date: 2012-08-24 15:58+0000\n"
-"Last-Translator: Richard Bos <radoeka@gmail.com>\n"
+"POT-Creation-Date: 2012-09-01 02:01+0200\n"
+"PO-Revision-Date: 2012-09-01 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"
@@ -42,19 +42,19 @@ msgstr "Apps"
 msgid "Admin"
 msgstr "Administrator"
 
-#: files.php:276
+#: files.php:280
 msgid "ZIP download is turned off."
 msgstr "ZIP download is uitgeschakeld."
 
-#: files.php:277
+#: files.php:281
 msgid "Files need to be downloaded one by one."
 msgstr "Bestanden moeten één voor één worden gedownload."
 
-#: files.php:277 files.php:302
+#: files.php:281 files.php:306
 msgid "Back to Files"
 msgstr "Terug naar bestanden"
 
-#: files.php:301
+#: files.php:305
 msgid "Selected files too large to generate zip file."
 msgstr "De geselecteerde bestanden zijn te groot om een zip bestand te maken."
 
@@ -111,3 +111,16 @@ msgstr "vorig jaar"
 #: template.php:97
 msgid "years ago"
 msgstr "jaar geleden"
+
+#: updater.php:66
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+msgstr ""
+
+#: updater.php:68
+msgid "up to date"
+msgstr ""
+
+#: updater.php:71
+msgid "updates check is disabled"
+msgstr ""
diff --git a/l10n/nn_NO/lib.po b/l10n/nn_NO/lib.po
index 17b3f9e58d..aa993826b3 100644
--- a/l10n/nn_NO/lib.po
+++ b/l10n/nn_NO/lib.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-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-09-01 02:01+0200\n"
+"PO-Revision-Date: 2012-09-01 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"
@@ -17,43 +17,43 @@ msgstr ""
 "Language: nn_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\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 ""
 
-#: files.php:245
+#: files.php:280
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:246
+#: files.php:281
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:246 files.php:271
+#: files.php:281 files.php:306
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:270
+#: files.php:305
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
@@ -110,3 +110,16 @@ msgstr ""
 #: template.php:97
 msgid "years ago"
 msgstr ""
+
+#: updater.php:66
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+msgstr ""
+
+#: updater.php:68
+msgid "up to date"
+msgstr ""
+
+#: updater.php:71
+msgid "updates check is disabled"
+msgstr ""
diff --git a/l10n/pl/lib.po b/l10n/pl/lib.po
index 5b7d557a68..cea78bc05f 100644
--- a/l10n/pl/lib.po
+++ b/l10n/pl/lib.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-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-09-01 02:01+0200\n"
+"PO-Revision-Date: 2012-09-01 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"
@@ -17,96 +18,109 @@ 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"
 
-#: app.php:287
+#: app.php:288
 msgid "Help"
-msgstr ""
+msgstr "Pomoc"
 
-#: app.php:294
+#: app.php:295
 msgid "Personal"
-msgstr ""
+msgstr "Osobiste"
 
-#: app.php:299
+#: app.php:300
 msgid "Settings"
-msgstr ""
+msgstr "Ustawienia"
 
-#: app.php:304
+#: app.php:305
 msgid "Users"
-msgstr ""
+msgstr "Użytkownicy"
 
-#: app.php:311
+#: app.php:312
 msgid "Apps"
-msgstr ""
+msgstr "Aplikacje"
 
-#: app.php:313
+#: app.php:314
 msgid "Admin"
-msgstr ""
+msgstr "Administrator"
 
-#: files.php:245
+#: files.php:280
 msgid "ZIP download is turned off."
-msgstr ""
+msgstr "Pobieranie ZIP jest wyłączone."
 
-#: files.php:246
+#: files.php:281
 msgid "Files need to be downloaded one by one."
-msgstr ""
+msgstr "Pliki muszą zostać pobrane pojedynczo."
 
-#: files.php:246 files.php:271
+#: files.php:281 files.php:306
 msgid "Back to Files"
-msgstr ""
+msgstr "Wróć do plików"
 
-#: files.php:270
+#: files.php:305
 msgid "Selected files too large to generate zip file."
-msgstr ""
+msgstr "Wybrane pliki są zbyt duże, aby wygenerować plik zip."
 
 #: json.php:28
 msgid "Application is not enabled"
-msgstr ""
+msgstr "Aplikacja nie jest włączona"
 
 #: json.php:39 json.php:63 json.php:75
 msgid "Authentication error"
-msgstr ""
+msgstr "Błąd uwierzytelniania"
 
 #: json.php:51
 msgid "Token expired. Please reload page."
-msgstr ""
+msgstr "Token wygasł. Proszę ponownie załadować stronę."
 
 #: template.php:86
 msgid "seconds ago"
-msgstr ""
+msgstr "sekund temu"
 
 #: template.php:87
 msgid "1 minute ago"
-msgstr ""
+msgstr "1 minutę temu"
 
 #: template.php:88
 #, php-format
 msgid "%d minutes ago"
-msgstr ""
+msgstr "%d minut temu"
 
 #: template.php:91
 msgid "today"
-msgstr ""
+msgstr "dzisiaj"
 
 #: template.php:92
 msgid "yesterday"
-msgstr ""
+msgstr "wczoraj"
 
 #: template.php:93
 #, php-format
 msgid "%d days ago"
-msgstr ""
+msgstr "%d dni temu"
 
 #: template.php:94
 msgid "last month"
-msgstr ""
+msgstr "ostatni miesiąc"
 
 #: template.php:95
 msgid "months ago"
-msgstr ""
+msgstr "miesięcy temu"
 
 #: template.php:96
 msgid "last year"
-msgstr ""
+msgstr "ostatni rok"
 
 #: template.php:97
 msgid "years ago"
+msgstr "lat temu"
+
+#: updater.php:66
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+msgstr ""
+
+#: updater.php:68
+msgid "up to date"
+msgstr ""
+
+#: updater.php:71
+msgid "updates check is disabled"
 msgstr ""
diff --git a/l10n/pl_PL/lib.po b/l10n/pl_PL/lib.po
index 27da662a78..b39526b5c0 100644
--- a/l10n/pl_PL/lib.po
+++ b/l10n/pl_PL/lib.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-31 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-09-01 02:01+0200\n"
+"PO-Revision-Date: 2012-09-01 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/owncloud/language/pl_PL/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -41,19 +41,19 @@ msgstr ""
 msgid "Admin"
 msgstr ""
 
-#: files.php:276
+#: files.php:280
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:277
+#: files.php:281
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:277 files.php:302
+#: files.php:281 files.php:306
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:301
+#: files.php:305
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
@@ -110,3 +110,16 @@ msgstr ""
 #: template.php:97
 msgid "years ago"
 msgstr ""
+
+#: updater.php:66
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+msgstr ""
+
+#: updater.php:68
+msgid "up to date"
+msgstr ""
+
+#: updater.php:71
+msgid "updates check is disabled"
+msgstr ""
diff --git a/l10n/pt_BR/lib.po b/l10n/pt_BR/lib.po
index d9a3c6dbc4..3ff7a35f89 100644
--- a/l10n/pt_BR/lib.po
+++ b/l10n/pt_BR/lib.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-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-09-01 02:01+0200\n"
+"PO-Revision-Date: 2012-09-01 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"
@@ -17,43 +17,43 @@ msgstr ""
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\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 ""
 
-#: files.php:245
+#: files.php:280
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:246
+#: files.php:281
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:246 files.php:271
+#: files.php:281 files.php:306
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:270
+#: files.php:305
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
@@ -110,3 +110,16 @@ msgstr ""
 #: template.php:97
 msgid "years ago"
 msgstr ""
+
+#: updater.php:66
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+msgstr ""
+
+#: updater.php:68
+msgid "up to date"
+msgstr ""
+
+#: updater.php:71
+msgid "updates check is disabled"
+msgstr ""
diff --git a/l10n/pt_PT/lib.po b/l10n/pt_PT/lib.po
index 70d233eab3..c2f8bf858d 100644
--- a/l10n/pt_PT/lib.po
+++ b/l10n/pt_PT/lib.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-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-09-01 02:01+0200\n"
+"PO-Revision-Date: 2012-09-01 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"
@@ -17,43 +17,43 @@ msgstr ""
 "Language: pt_PT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\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 ""
 
-#: files.php:245
+#: files.php:280
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:246
+#: files.php:281
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:246 files.php:271
+#: files.php:281 files.php:306
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:270
+#: files.php:305
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
@@ -110,3 +110,16 @@ msgstr ""
 #: template.php:97
 msgid "years ago"
 msgstr ""
+
+#: updater.php:66
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+msgstr ""
+
+#: updater.php:68
+msgid "up to date"
+msgstr ""
+
+#: updater.php:71
+msgid "updates check is disabled"
+msgstr ""
diff --git a/l10n/ro/lib.po b/l10n/ro/lib.po
index b0fd2256d6..1c5698fa22 100644
--- a/l10n/ro/lib.po
+++ b/l10n/ro/lib.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-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-09-01 02:01+0200\n"
+"PO-Revision-Date: 2012-09-01 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"
@@ -17,43 +17,43 @@ msgstr ""
 "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
+#: 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 ""
 
-#: files.php:245
+#: files.php:280
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:246
+#: files.php:281
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:246 files.php:271
+#: files.php:281 files.php:306
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:270
+#: files.php:305
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
@@ -110,3 +110,16 @@ msgstr ""
 #: template.php:97
 msgid "years ago"
 msgstr ""
+
+#: updater.php:66
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+msgstr ""
+
+#: updater.php:68
+msgid "up to date"
+msgstr ""
+
+#: updater.php:71
+msgid "updates check is disabled"
+msgstr ""
diff --git a/l10n/ru/files.po b/l10n/ru/files.po
index 9ebfee3096..2203f972c1 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-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-01 02:01+0200\n"
+"PO-Revision-Date: 2012-08-31 02:57+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"
@@ -112,7 +112,7 @@ msgstr "Загрузка отменена."
 #: js/files.js:409
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
-msgstr ""
+msgstr "Файл в процессе загрузки. Покинув страницу вы прервёте загрузку."
 
 #: js/files.js:480
 msgid "Invalid name, '/' is not allowed."
diff --git a/l10n/ru/lib.po b/l10n/ru/lib.po
index 8c24f83b94..e345d2c974 100644
--- a/l10n/ru/lib.po
+++ b/l10n/ru/lib.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-25 02:04+0200\n"
-"PO-Revision-Date: 2012-08-24 09:37+0000\n"
-"Last-Translator: Denis <reg.transifex.net@demitel.ru>\n"
+"POT-Creation-Date: 2012-09-01 02:01+0200\n"
+"PO-Revision-Date: 2012-09-01 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"
@@ -42,19 +42,19 @@ msgstr "Приложения"
 msgid "Admin"
 msgstr "Admin"
 
-#: files.php:276
+#: files.php:280
 msgid "ZIP download is turned off."
 msgstr "ZIP-скачивание отключено."
 
-#: files.php:277
+#: files.php:281
 msgid "Files need to be downloaded one by one."
 msgstr "Файлы должны быть загружены по одному."
 
-#: files.php:277 files.php:302
+#: files.php:281 files.php:306
 msgid "Back to Files"
 msgstr "Назад к файлам"
 
-#: files.php:301
+#: files.php:305
 msgid "Selected files too large to generate zip file."
 msgstr "Выбранные файлы слишком велики, чтобы создать zip файл."
 
@@ -111,3 +111,16 @@ msgstr "в прошлом году"
 #: template.php:97
 msgid "years ago"
 msgstr "годы назад"
+
+#: updater.php:66
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+msgstr ""
+
+#: updater.php:68
+msgid "up to date"
+msgstr ""
+
+#: updater.php:71
+msgid "updates check is disabled"
+msgstr ""
diff --git a/l10n/ru_RU/lib.po b/l10n/ru_RU/lib.po
index 2c2884966b..9b7bced542 100644
--- a/l10n/ru_RU/lib.po
+++ b/l10n/ru_RU/lib.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-30 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-09-01 02:01+0200\n"
+"PO-Revision-Date: 2012-09-01 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -41,19 +41,19 @@ msgstr ""
 msgid "Admin"
 msgstr ""
 
-#: files.php:276
+#: files.php:280
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:277
+#: files.php:281
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:277 files.php:302
+#: files.php:281 files.php:306
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:301
+#: files.php:305
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
@@ -110,3 +110,16 @@ msgstr ""
 #: template.php:97
 msgid "years ago"
 msgstr ""
+
+#: updater.php:66
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+msgstr ""
+
+#: updater.php:68
+msgid "up to date"
+msgstr ""
+
+#: updater.php:71
+msgid "updates check is disabled"
+msgstr ""
diff --git a/l10n/sk_SK/lib.po b/l10n/sk_SK/lib.po
index 1e1e954af8..b4ffed6537 100644
--- a/l10n/sk_SK/lib.po
+++ b/l10n/sk_SK/lib.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-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-09-01 02:01+0200\n"
+"PO-Revision-Date: 2012-09-01 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"
@@ -17,43 +17,43 @@ msgstr ""
 "Language: sk_SK\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 ""
 
-#: 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 ""
 
-#: files.php:245
+#: files.php:280
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:246
+#: files.php:281
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:246 files.php:271
+#: files.php:281 files.php:306
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:270
+#: files.php:305
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
@@ -110,3 +110,16 @@ msgstr ""
 #: template.php:97
 msgid "years ago"
 msgstr ""
+
+#: updater.php:66
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+msgstr ""
+
+#: updater.php:68
+msgid "up to date"
+msgstr ""
+
+#: updater.php:71
+msgid "updates check is disabled"
+msgstr ""
diff --git a/l10n/sl/core.po b/l10n/sl/core.po
index 3c5d038831..5039ad2eac 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-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-01 02:01+0200\n"
+"PO-Revision-Date: 2012-08-31 14: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"
@@ -232,7 +232,7 @@ msgstr "Ime podatkovne zbirke"
 
 #: templates/installation.php:109
 msgid "Database tablespace"
-msgstr ""
+msgstr "Razpredelnica podatkovne zbirke"
 
 #: templates/installation.php:115
 msgid "Database host"
diff --git a/l10n/sl/files.po b/l10n/sl/files.po
index 97c1b7d487..10c581f987 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-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-01 02:01+0200\n"
+"PO-Revision-Date: 2012-08-31 14: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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -109,7 +109,7 @@ msgstr "Nalaganje je bilo preklicano."
 #: js/files.js:409
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
-msgstr ""
+msgstr "Nalaganje datoteke je v teku. Če zapustite to stran zdaj, boste nalaganje preklicali."
 
 #: js/files.js:480
 msgid "Invalid name, '/' is not allowed."
diff --git a/l10n/sl/files_sharing.po b/l10n/sl/files_sharing.po
index c5c7a7f2b6..54b84f8ba1 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-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-01 02:01+0200\n"
+"PO-Revision-Date: 2012-08-31 14:15+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"
@@ -32,7 +32,7 @@ msgstr "Prenesi"
 
 #: templates/public.php:18
 msgid "No preview available for"
-msgstr ""
+msgstr "Predogled ni na voljo za"
 
 #: templates/public.php:23
 msgid "web services under your control"
diff --git a/l10n/sl/lib.po b/l10n/sl/lib.po
index 58fda36869..8b9d7de0fa 100644
--- a/l10n/sl/lib.po
+++ b/l10n/sl/lib.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 13:10+0000\n"
-"Last-Translator: Peter Peroša <peter.perosa@gmail.com>\n"
+"POT-Creation-Date: 2012-09-01 02:01+0200\n"
+"PO-Revision-Date: 2012-09-01 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"
@@ -42,19 +42,19 @@ msgstr "Aplikacije"
 msgid "Admin"
 msgstr "Skrbnik"
 
-#: files.php:276
+#: files.php:280
 msgid "ZIP download is turned off."
 msgstr "ZIP prenos je onemogočen."
 
-#: files.php:277
+#: files.php:281
 msgid "Files need to be downloaded one by one."
 msgstr "Datoteke morajo biti prenešene posamezno."
 
-#: files.php:277 files.php:302
+#: files.php:281 files.php:306
 msgid "Back to Files"
 msgstr "Nazaj na datoteke"
 
-#: files.php:301
+#: files.php:305
 msgid "Selected files too large to generate zip file."
 msgstr "Izbrane datoteke so prevelike, da bi lahko ustvarili zip datoteko."
 
@@ -111,3 +111,16 @@ msgstr "lani"
 #: template.php:97
 msgid "years ago"
 msgstr "let nazaj"
+
+#: updater.php:66
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+msgstr ""
+
+#: updater.php:68
+msgid "up to date"
+msgstr ""
+
+#: updater.php:71
+msgid "updates check is disabled"
+msgstr ""
diff --git a/l10n/sl/settings.po b/l10n/sl/settings.po
index d2fe502e3f..6cb24d59f8 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-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-01 02:01+0200\n"
+"PO-Revision-Date: 2012-08-31 14:24+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"
@@ -90,39 +90,39 @@ msgstr "uporabi sistemski servis za periodična opravila"
 
 #: templates/admin.php:39
 msgid "Share API"
-msgstr ""
+msgstr "API souporabe"
 
 #: templates/admin.php:44
 msgid "Enable Share API"
-msgstr ""
+msgstr "Omogoči API souporabe"
 
 #: templates/admin.php:45
 msgid "Allow apps to use the Share API"
-msgstr ""
+msgstr "Dovoli aplikacijam uporabo API-ja souporabe"
 
 #: templates/admin.php:49
 msgid "Allow links"
-msgstr ""
+msgstr "Dovoli povezave"
 
 #: templates/admin.php:50
 msgid "Allow users to share items to the public with links"
-msgstr ""
+msgstr "Uporabnikom dovoli souporabo z javnimi povezavami"
 
 #: templates/admin.php:54
 msgid "Allow resharing"
-msgstr ""
+msgstr "Dovoli nadaljnjo souporabo"
 
 #: templates/admin.php:55
 msgid "Allow users to share items shared with them again"
-msgstr ""
+msgstr "Uporabnikom dovoli nadaljnjo souporabo"
 
 #: templates/admin.php:58
 msgid "Allow users to share with anyone"
-msgstr ""
+msgstr "Uporabnikom dovoli souporabo s komerkoli"
 
 #: templates/admin.php:60
 msgid "Allow users to only share with users in their groups"
-msgstr ""
+msgstr "Uporabnikom dovoli souporabo le znotraj njihove skupine"
 
 #: templates/admin.php:67
 msgid "Log"
diff --git a/l10n/so/lib.po b/l10n/so/lib.po
index a9d32f6949..0b922ce5c7 100644
--- a/l10n/so/lib.po
+++ b/l10n/so/lib.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-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-09-01 02:01+0200\n"
+"PO-Revision-Date: 2012-09-01 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"
@@ -17,43 +17,43 @@ msgstr ""
 "Language: so\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\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 ""
 
-#: files.php:245
+#: files.php:280
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:246
+#: files.php:281
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:246 files.php:271
+#: files.php:281 files.php:306
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:270
+#: files.php:305
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
@@ -110,3 +110,16 @@ msgstr ""
 #: template.php:97
 msgid "years ago"
 msgstr ""
+
+#: updater.php:66
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+msgstr ""
+
+#: updater.php:68
+msgid "up to date"
+msgstr ""
+
+#: updater.php:71
+msgid "updates check is disabled"
+msgstr ""
diff --git a/l10n/sr/lib.po b/l10n/sr/lib.po
index 2ee133933b..f8fa96c486 100644
--- a/l10n/sr/lib.po
+++ b/l10n/sr/lib.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-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-09-01 02:01+0200\n"
+"PO-Revision-Date: 2012-09-01 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"
@@ -17,43 +17,43 @@ 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"
 
-#: 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 ""
 
-#: files.php:245
+#: files.php:280
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:246
+#: files.php:281
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:246 files.php:271
+#: files.php:281 files.php:306
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:270
+#: files.php:305
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
@@ -110,3 +110,16 @@ msgstr ""
 #: template.php:97
 msgid "years ago"
 msgstr ""
+
+#: updater.php:66
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+msgstr ""
+
+#: updater.php:68
+msgid "up to date"
+msgstr ""
+
+#: updater.php:71
+msgid "updates check is disabled"
+msgstr ""
diff --git a/l10n/sr@latin/lib.po b/l10n/sr@latin/lib.po
index 7b9a1d577a..8c7d9b18bd 100644
--- a/l10n/sr@latin/lib.po
+++ b/l10n/sr@latin/lib.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-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-09-01 02:01+0200\n"
+"PO-Revision-Date: 2012-09-01 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"
@@ -17,43 +17,43 @@ 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"
 
-#: 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 ""
 
-#: files.php:245
+#: files.php:280
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:246
+#: files.php:281
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:246 files.php:271
+#: files.php:281 files.php:306
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:270
+#: files.php:305
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
@@ -110,3 +110,16 @@ msgstr ""
 #: template.php:97
 msgid "years ago"
 msgstr ""
+
+#: updater.php:66
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+msgstr ""
+
+#: updater.php:68
+msgid "up to date"
+msgstr ""
+
+#: updater.php:71
+msgid "updates check is disabled"
+msgstr ""
diff --git a/l10n/sv/core.po b/l10n/sv/core.po
index a42d5e9bda..870dffe8a9 100644
--- a/l10n/sv/core.po
+++ b/l10n/sv/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-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-01 02:01+0200\n"
+"PO-Revision-Date: 2012-08-31 08:10+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"
@@ -235,7 +235,7 @@ msgstr "Databasnamn"
 
 #: templates/installation.php:109
 msgid "Database tablespace"
-msgstr ""
+msgstr "Databas tabellutrymme"
 
 #: templates/installation.php:115
 msgid "Database host"
diff --git a/l10n/sv/files.po b/l10n/sv/files.po
index f5e6200788..719ccf3db6 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-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-01 02:01+0200\n"
+"PO-Revision-Date: 2012-08-31 08:09+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"
@@ -112,7 +112,7 @@ msgstr "Uppladdning avbruten."
 #: js/files.js:409
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
-msgstr ""
+msgstr "Filuppladdning pågår. Lämnar du sidan så avbryts uppladdningen."
 
 #: js/files.js:480
 msgid "Invalid name, '/' is not allowed."
diff --git a/l10n/sv/files_sharing.po b/l10n/sv/files_sharing.po
index 8605c3d5d7..1888512788 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-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-01 02:01+0200\n"
+"PO-Revision-Date: 2012-08-31 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"
@@ -32,7 +32,7 @@ msgstr "Ladda ner"
 
 #: templates/public.php:18
 msgid "No preview available for"
-msgstr ""
+msgstr "Ingen förhandsgranskning tillgänglig för"
 
 #: templates/public.php:23
 msgid "web services under your control"
diff --git a/l10n/sv/lib.po b/l10n/sv/lib.po
index b4e0a3e865..711935d56e 100644
--- a/l10n/sv/lib.po
+++ b/l10n/sv/lib.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 08:40+0000\n"
-"Last-Translator: Magnus Höglund <magnus@linux.com>\n"
+"POT-Creation-Date: 2012-09-01 02:01+0200\n"
+"PO-Revision-Date: 2012-09-01 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"
@@ -43,19 +43,19 @@ msgstr "Program"
 msgid "Admin"
 msgstr "Admin"
 
-#: files.php:276
+#: files.php:280
 msgid "ZIP download is turned off."
 msgstr "Nerladdning av ZIP är avstängd."
 
-#: files.php:277
+#: files.php:281
 msgid "Files need to be downloaded one by one."
 msgstr "Filer laddas ner en åt gången."
 
-#: files.php:277 files.php:302
+#: files.php:281 files.php:306
 msgid "Back to Files"
 msgstr "Tillbaka till Filer"
 
-#: files.php:301
+#: files.php:305
 msgid "Selected files too large to generate zip file."
 msgstr "Valda filer är för stora för att skapa zip-fil."
 
@@ -112,3 +112,16 @@ msgstr "förra året"
 #: template.php:97
 msgid "years ago"
 msgstr "år sedan"
+
+#: updater.php:66
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+msgstr ""
+
+#: updater.php:68
+msgid "up to date"
+msgstr ""
+
+#: updater.php:71
+msgid "updates check is disabled"
+msgstr ""
diff --git a/l10n/sv/settings.po b/l10n/sv/settings.po
index 325053565a..b2111ddb48 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-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-01 02:01+0200\n"
+"PO-Revision-Date: 2012-08-31 08:23+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"
@@ -94,39 +94,39 @@ msgstr "använd systemets cron-tjänst"
 
 #: templates/admin.php:39
 msgid "Share API"
-msgstr ""
+msgstr "Delat API"
 
 #: templates/admin.php:44
 msgid "Enable Share API"
-msgstr ""
+msgstr "Aktivera delat API"
 
 #: templates/admin.php:45
 msgid "Allow apps to use the Share API"
-msgstr ""
+msgstr "Tillåt applikationer att använda delat API"
 
 #: templates/admin.php:49
 msgid "Allow links"
-msgstr ""
+msgstr "Tillåt länkar"
 
 #: templates/admin.php:50
 msgid "Allow users to share items to the public with links"
-msgstr ""
+msgstr "Tillåt delning till allmänheten via publika länkar"
 
 #: templates/admin.php:54
 msgid "Allow resharing"
-msgstr ""
+msgstr "Tillåt dela vidare"
 
 #: templates/admin.php:55
 msgid "Allow users to share items shared with them again"
-msgstr ""
+msgstr "Tillåt användare att dela vidare filer som delats med dom"
 
 #: templates/admin.php:58
 msgid "Allow users to share with anyone"
-msgstr ""
+msgstr "Tillåt delning med alla"
 
 #: templates/admin.php:60
 msgid "Allow users to only share with users in their groups"
-msgstr ""
+msgstr "Tillåt bara delning med användare i egna grupper"
 
 #: templates/admin.php:67
 msgid "Log"
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index d43c24c59c..5ec454483f 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-31 02:02+0200\n"
+"POT-Creation-Date: 2012-09-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 1f2ea860e0..aba316e626 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-31 02:02+0200\n"
+"POT-Creation-Date: 2012-09-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_encryption.pot b/l10n/templates/files_encryption.pot
index 9aaa78f17f..80c2aea915 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-31 02:02+0200\n"
+"POT-Creation-Date: 2012-09-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_external.pot b/l10n/templates/files_external.pot
index d1350464ed..e9739cd6a0 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-31 02:02+0200\n"
+"POT-Creation-Date: 2012-09-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_sharing.pot b/l10n/templates/files_sharing.pot
index 19c56ef174..6cfc4adf2a 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-31 02:02+0200\n"
+"POT-Creation-Date: 2012-09-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_versions.pot b/l10n/templates/files_versions.pot
index 934a3cccec..8eb6946278 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-31 02:02+0200\n"
+"POT-Creation-Date: 2012-09-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 f74684b23e..1024b00ff3 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-31 02:02+0200\n"
+"POT-Creation-Date: 2012-09-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"
@@ -41,19 +41,19 @@ msgstr ""
 msgid "Admin"
 msgstr ""
 
-#: files.php:276
+#: files.php:280
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:277
+#: files.php:281
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:277 files.php:302
+#: files.php:281 files.php:306
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:301
+#: files.php:305
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
@@ -110,3 +110,16 @@ msgstr ""
 #: template.php:97
 msgid "years ago"
 msgstr ""
+
+#: updater.php:66
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+msgstr ""
+
+#: updater.php:68
+msgid "up to date"
+msgstr ""
+
+#: updater.php:71
+msgid "updates check is disabled"
+msgstr ""
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index a326ab25b3..110d19e434 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-31 02:02+0200\n"
+"POT-Creation-Date: 2012-09-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/user_ldap.pot b/l10n/templates/user_ldap.pot
index bedad41808..7b87fc39d3 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-31 02:02+0200\n"
+"POT-Creation-Date: 2012-09-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/th_TH/core.po b/l10n/th_TH/core.po
index 2c98916ec0..80fbd9a5ac 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-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-01 02:01+0200\n"
+"PO-Revision-Date: 2012-08-31 17:01+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"
@@ -231,7 +231,7 @@ msgstr "ชื่อฐานข้อมูล"
 
 #: templates/installation.php:109
 msgid "Database tablespace"
-msgstr ""
+msgstr "พื้นที่ตารางในฐานข้อมูล"
 
 #: templates/installation.php:115
 msgid "Database host"
diff --git a/l10n/th_TH/files.po b/l10n/th_TH/files.po
index 4ff4ae0cd4..5068c75cf7 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-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-01 02:01+0200\n"
+"PO-Revision-Date: 2012-08-31 17:03+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"
@@ -108,7 +108,7 @@ msgstr "การอัพโหลดถูกยกเลิก"
 #: js/files.js:409
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
-msgstr ""
+msgstr "การอัพโหลดไฟล์กำลังอยู่ในระหว่างดำเนินการ การออกจากหน้าเว็บนี้จะทำให้การอัพโหลดถูกยกเลิก"
 
 #: js/files.js:480
 msgid "Invalid name, '/' is not allowed."
diff --git a/l10n/th_TH/files_sharing.po b/l10n/th_TH/files_sharing.po
index 8f2587456f..27aa8b2872 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-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-01 02:01+0200\n"
+"PO-Revision-Date: 2012-08-31 17:05+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"
@@ -32,7 +32,7 @@ msgstr "ดาวน์โหลด"
 
 #: templates/public.php:18
 msgid "No preview available for"
-msgstr ""
+msgstr "ไม่สามารถดูตัวอย่างได้สำหรับ"
 
 #: templates/public.php:23
 msgid "web services under your control"
diff --git a/l10n/th_TH/lib.po b/l10n/th_TH/lib.po
index 57847a06f6..93925a0b0d 100644
--- a/l10n/th_TH/lib.po
+++ b/l10n/th_TH/lib.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:40+0000\n"
-"Last-Translator: AriesAnywhere Anywhere <ariesanywhere@gmail.com>\n"
+"POT-Creation-Date: 2012-09-01 02:01+0200\n"
+"PO-Revision-Date: 2012-09-01 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"
@@ -42,19 +42,19 @@ msgstr "แอปฯ"
 msgid "Admin"
 msgstr "ผู้ดูแล"
 
-#: files.php:245
+#: files.php:280
 msgid "ZIP download is turned off."
 msgstr "คุณสมบัติการดาวน์โหลด zip ถูกปิดการใช้งานไว้"
 
-#: files.php:246
+#: files.php:281
 msgid "Files need to be downloaded one by one."
 msgstr "ไฟล์สามารถดาวน์โหลดได้ทีละครั้งเท่านั้น"
 
-#: files.php:246 files.php:271
+#: files.php:281 files.php:306
 msgid "Back to Files"
 msgstr "กลับไปที่ไฟล์"
 
-#: files.php:270
+#: files.php:305
 msgid "Selected files too large to generate zip file."
 msgstr "ไฟล์ที่เลือกมีขนาดใหญ่เกินกว่าที่จะสร้างเป็นไฟล์ zip"
 
@@ -111,3 +111,16 @@ msgstr "ปีที่แล้ว"
 #: template.php:97
 msgid "years ago"
 msgstr "ปีที่ผ่านมา"
+
+#: updater.php:66
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+msgstr ""
+
+#: updater.php:68
+msgid "up to date"
+msgstr ""
+
+#: updater.php:71
+msgid "updates check is disabled"
+msgstr ""
diff --git a/l10n/th_TH/settings.po b/l10n/th_TH/settings.po
index 2d94b32cab..fa0161c36c 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-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-01 02:01+0200\n"
+"PO-Revision-Date: 2012-08-31 17:08+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"
@@ -90,39 +90,39 @@ msgstr "ใช้บริการ cron จากระบบ"
 
 #: templates/admin.php:39
 msgid "Share API"
-msgstr ""
+msgstr "API สำหรับคุณสมบัติแชร์ข้อมูล"
 
 #: templates/admin.php:44
 msgid "Enable Share API"
-msgstr ""
+msgstr "เปิดใช้งาน API สำหรับคุณสมบัติแชร์ข้อมูล"
 
 #: templates/admin.php:45
 msgid "Allow apps to use the Share API"
-msgstr ""
+msgstr "อนุญาตให้แอปฯสามารถใช้ API สำหรับแชร์ข้อมูลได้"
 
 #: templates/admin.php:49
 msgid "Allow links"
-msgstr ""
+msgstr "อนุญาตให้ใช้งานลิงก์ได้"
 
 #: templates/admin.php:50
 msgid "Allow users to share items to the public with links"
-msgstr ""
+msgstr "อนุญาตให้ผู้ใช้งานสามารถแชร์ข้อมูลรายการต่างๆไปให้สาธารณะชนเป็นลิงก์ได้"
 
 #: templates/admin.php:54
 msgid "Allow resharing"
-msgstr ""
+msgstr "อนุญาตให้แชร์ข้อมูลซ้ำใหม่ได้"
 
 #: templates/admin.php:55
 msgid "Allow users to share items shared with them again"
-msgstr ""
+msgstr "อนุญาตให้ผู้ใช้งานแชร์ข้อมูลรายการต่างๆที่ถูกแชร์มาให้ตัวผู้ใช้งานได้เท่านั้น"
 
 #: templates/admin.php:58
 msgid "Allow users to share with anyone"
-msgstr ""
+msgstr "อนุญาตให้ผู้ใช้งานแชร์ข้อมูลถึงใครก็ได้"
 
 #: templates/admin.php:60
 msgid "Allow users to only share with users in their groups"
-msgstr ""
+msgstr "อนุญาตให้ผู้ใช้งานแชร์ข้อมูลได้เฉพาะกับผู้ใช้งานที่อยู่ในกลุ่มเดียวกันเท่านั้น"
 
 #: templates/admin.php:67
 msgid "Log"
diff --git a/l10n/tr/core.po b/l10n/tr/core.po
index 40f3cba6d9..8644c4df37 100644
--- a/l10n/tr/core.po
+++ b/l10n/tr/core.po
@@ -4,14 +4,15 @@
 # 
 # Translators:
 # Aranel Surion <aranel@aranelsurion.org>, 2011, 2012.
+# Caner Başaran <basaran.caner@gmail.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-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-01 02:01+0200\n"
+"PO-Revision-Date: 2012-08-31 21:48+0000\n"
+"Last-Translator: Caner Başaran <basaran.caner@gmail.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"
@@ -231,7 +232,7 @@ msgstr "Veritabanı adı"
 
 #: templates/installation.php:109
 msgid "Database tablespace"
-msgstr ""
+msgstr "Veritabanı tablo alanı"
 
 #: templates/installation.php:115
 msgid "Database host"
diff --git a/l10n/tr/lib.po b/l10n/tr/lib.po
index a1b4a5a664..61fec9e31f 100644
--- a/l10n/tr/lib.po
+++ b/l10n/tr/lib.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-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-09-01 02:01+0200\n"
+"PO-Revision-Date: 2012-09-01 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"
@@ -17,43 +17,43 @@ msgstr ""
 "Language: tr\n"
 "Plural-Forms: nplurals=1; plural=0\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 ""
 
-#: files.php:245
+#: files.php:280
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:246
+#: files.php:281
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:246 files.php:271
+#: files.php:281 files.php:306
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:270
+#: files.php:305
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
@@ -110,3 +110,16 @@ msgstr ""
 #: template.php:97
 msgid "years ago"
 msgstr ""
+
+#: updater.php:66
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+msgstr ""
+
+#: updater.php:68
+msgid "up to date"
+msgstr ""
+
+#: updater.php:71
+msgid "updates check is disabled"
+msgstr ""
diff --git a/l10n/uk/lib.po b/l10n/uk/lib.po
index a818ac7d1f..d2a2e0eac4 100644
--- a/l10n/uk/lib.po
+++ b/l10n/uk/lib.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:26+0000\n"
-"Last-Translator: dzubchikd <dzubchikd@gmail.com>\n"
+"POT-Creation-Date: 2012-09-01 02:01+0200\n"
+"PO-Revision-Date: 2012-09-01 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"
@@ -18,43 +18,43 @@ 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"
 
-#: 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 "Адмін"
 
-#: files.php:245
+#: files.php:280
 msgid "ZIP download is turned off."
 msgstr "ZIP завантаження вимкнено."
 
-#: files.php:246
+#: files.php:281
 msgid "Files need to be downloaded one by one."
 msgstr "Файли повинні бути завантаженні послідовно."
 
-#: files.php:246 files.php:271
+#: files.php:281 files.php:306
 msgid "Back to Files"
 msgstr "Повернутися до файлів"
 
-#: files.php:270
+#: files.php:305
 msgid "Selected files too large to generate zip file."
 msgstr "Вибрані фали завеликі для генерування zip файлу."
 
@@ -111,3 +111,16 @@ msgstr "минулого року"
 #: template.php:97
 msgid "years ago"
 msgstr "роки тому"
+
+#: updater.php:66
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+msgstr ""
+
+#: updater.php:68
+msgid "up to date"
+msgstr ""
+
+#: updater.php:71
+msgid "updates check is disabled"
+msgstr ""
diff --git a/l10n/vi/lib.po b/l10n/vi/lib.po
index 40d92269ac..966ae22706 100644
--- a/l10n/vi/lib.po
+++ b/l10n/vi/lib.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-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-09-01 02:01+0200\n"
+"PO-Revision-Date: 2012-09-01 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"
@@ -17,43 +17,43 @@ msgstr ""
 "Language: vi\n"
 "Plural-Forms: nplurals=1; plural=0\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 ""
 
-#: files.php:245
+#: files.php:280
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:246
+#: files.php:281
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:246 files.php:271
+#: files.php:281 files.php:306
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:270
+#: files.php:305
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
@@ -110,3 +110,16 @@ msgstr ""
 #: template.php:97
 msgid "years ago"
 msgstr ""
+
+#: updater.php:66
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+msgstr ""
+
+#: updater.php:68
+msgid "up to date"
+msgstr ""
+
+#: updater.php:71
+msgid "updates check is disabled"
+msgstr ""
diff --git a/l10n/zh_CN.GB2312/lib.po b/l10n/zh_CN.GB2312/lib.po
index 49d72542b8..541a462fb8 100644
--- a/l10n/zh_CN.GB2312/lib.po
+++ b/l10n/zh_CN.GB2312/lib.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-07-27 22:23+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-09-01 02:01+0200\n"
+"PO-Revision-Date: 2012-09-01 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"
@@ -41,19 +41,19 @@ msgstr ""
 msgid "Admin"
 msgstr ""
 
-#: files.php:245
+#: files.php:280
 msgid "ZIP download is turned off."
 msgstr ""
 
-#: files.php:246
+#: files.php:281
 msgid "Files need to be downloaded one by one."
 msgstr ""
 
-#: files.php:246 files.php:271
+#: files.php:281 files.php:306
 msgid "Back to Files"
 msgstr ""
 
-#: files.php:270
+#: files.php:305
 msgid "Selected files too large to generate zip file."
 msgstr ""
 
@@ -110,3 +110,16 @@ msgstr ""
 #: template.php:97
 msgid "years ago"
 msgstr ""
+
+#: updater.php:66
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+msgstr ""
+
+#: updater.php:68
+msgid "up to date"
+msgstr ""
+
+#: updater.php:71
+msgid "updates check is disabled"
+msgstr ""
diff --git a/l10n/zh_CN/lib.po b/l10n/zh_CN/lib.po
index 4a52e2838c..7bb4a2e786 100644
--- a/l10n/zh_CN/lib.po
+++ b/l10n/zh_CN/lib.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-24 02:02+0200\n"
-"PO-Revision-Date: 2012-08-23 12:13+0000\n"
-"Last-Translator: leonfeng <rainofchaos@gmail.com>\n"
+"POT-Creation-Date: 2012-09-01 02:01+0200\n"
+"PO-Revision-Date: 2012-09-01 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"
@@ -42,19 +42,19 @@ msgstr "应用"
 msgid "Admin"
 msgstr "管理"
 
-#: files.php:276
+#: files.php:280
 msgid "ZIP download is turned off."
 msgstr "ZIP 下载已经关闭"
 
-#: files.php:277
+#: files.php:281
 msgid "Files need to be downloaded one by one."
 msgstr "需要逐一下载文件"
 
-#: files.php:277 files.php:302
+#: files.php:281 files.php:306
 msgid "Back to Files"
 msgstr "回到文件"
 
-#: files.php:301
+#: files.php:305
 msgid "Selected files too large to generate zip file."
 msgstr "选择的文件太大，无法生成 zip 文件。"
 
@@ -111,3 +111,16 @@ msgstr "上年"
 #: template.php:97
 msgid "years ago"
 msgstr "几年前"
+
+#: updater.php:66
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+msgstr ""
+
+#: updater.php:68
+msgid "up to date"
+msgstr ""
+
+#: updater.php:71
+msgid "updates check is disabled"
+msgstr ""
diff --git a/l10n/zh_TW/core.po b/l10n/zh_TW/core.po
index feb9070fb4..7af51044d5 100644
--- a/l10n/zh_TW/core.po
+++ b/l10n/zh_TW/core.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # Donahue Chuang <soshinwu@gmail.com>, 2012.
+# Ming Yi Wu <mingi.wu@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-01 02:01+0200\n"
+"PO-Revision-Date: 2012-08-31 07:35+0000\n"
+"Last-Translator: Ming Yi Wu <mingi.wu@gmail.com>\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"
@@ -32,7 +33,7 @@ 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:206 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
@@ -40,75 +41,75 @@ msgstr "設定"
 
 #: js/js.js:591
 msgid "January"
-msgstr ""
+msgstr "一月"
 
 #: js/js.js:591
 msgid "February"
-msgstr ""
+msgstr "二月"
 
 #: js/js.js:591
 msgid "March"
-msgstr ""
+msgstr "三月"
 
 #: js/js.js:591
 msgid "April"
-msgstr ""
+msgstr "四月"
 
 #: js/js.js:591
 msgid "May"
-msgstr ""
+msgstr "五月"
 
 #: js/js.js:591
 msgid "June"
-msgstr ""
+msgstr "六月"
 
 #: js/js.js:592
 msgid "July"
-msgstr ""
+msgstr "七月"
 
 #: js/js.js:592
 msgid "August"
-msgstr ""
+msgstr "八月"
 
 #: js/js.js:592
 msgid "September"
-msgstr ""
+msgstr "九月"
 
 #: js/js.js:592
 msgid "October"
-msgstr ""
+msgstr "十月"
 
 #: js/js.js:592
 msgid "November"
-msgstr ""
+msgstr "十一月"
 
 #: js/js.js:592
 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 "No"
 
 #: js/oc-dialogs.js:160
 msgid "Yes"
-msgstr ""
+msgstr "Yes"
 
 #: 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"
@@ -230,7 +231,7 @@ msgstr "資料庫名稱"
 
 #: templates/installation.php:109
 msgid "Database tablespace"
-msgstr ""
+msgstr "資料庫 tablespace"
 
 #: templates/installation.php:115
 msgid "Database host"
diff --git a/l10n/zh_TW/files.po b/l10n/zh_TW/files.po
index dc56f8de0c..2bbfc8d860 100644
--- a/l10n/zh_TW/files.po
+++ b/l10n/zh_TW/files.po
@@ -5,13 +5,14 @@
 # Translators:
 # Donahue Chuang <soshinwu@gmail.com>, 2012.
 # Eddy Chang <taiwanmambo@gmail.com>, 2012.
+# ywang  <ywang1007@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-01 02:01+0200\n"
+"PO-Revision-Date: 2012-08-31 20:40+0000\n"
+"Last-Translator: ywang <ywang1007@gmail.com>\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"
@@ -59,15 +60,15 @@ 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"
@@ -87,15 +88,15 @@ msgstr ""
 
 #: js/files.js:179
 msgid "generating ZIP-file, it may take some time."
-msgstr ""
+msgstr "產生壓縮檔, 它可能需要一段時間."
 
 #: js/files.js:208
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr ""
+msgstr "無法上傳您的檔案因為它可能是一個目錄或檔案大小為0"
 
 #: js/files.js:208
 msgid "Upload Error"
-msgstr ""
+msgstr "上傳發生錯誤"
 
 #: js/files.js:236 js/files.js:327 js/files.js:356
 msgid "Pending"
@@ -103,16 +104,16 @@ msgstr ""
 
 #: js/files.js:341
 msgid "Upload cancelled."
-msgstr ""
+msgstr "上傳取消"
 
 #: js/files.js:409
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
-msgstr ""
+msgstr "檔案上傳中. 離開此頁面將會取消上傳."
 
 #: js/files.js:480
 msgid "Invalid name, '/' is not allowed."
-msgstr ""
+msgstr "無效的名稱, '/'是不被允許的"
 
 #: js/files.js:726 templates/index.php:55
 msgid "Size"
diff --git a/l10n/zh_TW/lib.po b/l10n/zh_TW/lib.po
index 43e6429a60..45a52a790a 100644
--- a/l10n/zh_TW/lib.po
+++ b/l10n/zh_TW/lib.po
@@ -3,13 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <ywang1007+transifex@gmail.com>, 2012.
+# ywang  <ywang1007@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-09-01 02:01+0200\n"
+"PO-Revision-Date: 2012-09-01 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"
@@ -17,96 +19,109 @@ msgstr ""
 "Language: zh_TW\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:280
 msgid "ZIP download is turned off."
-msgstr ""
+msgstr "ZIP 下載已關閉"
 
-#: files.php:246
+#: files.php:281
 msgid "Files need to be downloaded one by one."
-msgstr ""
+msgstr "檔案需要逐一下載"
 
-#: files.php:246 files.php:271
+#: files.php:281 files.php:306
 msgid "Back to Files"
-msgstr ""
+msgstr "回到檔案列表"
 
-#: files.php:270
+#: files.php:305
 msgid "Selected files too large to generate zip file."
-msgstr ""
+msgstr "選擇的檔案太大以致於無法產生壓縮檔"
 
 #: 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 "幾年前"
+
+#: updater.php:66
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+msgstr ""
+
+#: updater.php:68
+msgid "up to date"
+msgstr ""
+
+#: updater.php:71
+msgid "updates check is disabled"
 msgstr ""
diff --git a/lib/l10n/da.php b/lib/l10n/da.php
new file mode 100644
index 0000000000..7a9ee26b47
--- /dev/null
+++ b/lib/l10n/da.php
@@ -0,0 +1,25 @@
+<?php $TRANSLATIONS = array(
+"Help" => "Hjælp",
+"Personal" => "Personlig",
+"Settings" => "Indstillinger",
+"Users" => "Brugere",
+"Apps" => "Apps",
+"Admin" => "Admin",
+"ZIP download is turned off." => "ZIP-download er slået fra.",
+"Files need to be downloaded one by one." => "Filer skal downloades en for en.",
+"Back to Files" => "Tilbage til Filer",
+"Selected files too large to generate zip file." => "De markerede filer er for store til at generere en ZIP-fil.",
+"Application is not enabled" => "Programmet er ikke aktiveret",
+"Authentication error" => "Adgangsfejl",
+"Token expired. Please reload page." => "Adgang er udløbet. Genindlæs siden.",
+"seconds ago" => "sekunder siden",
+"1 minute ago" => "1 minut siden",
+"%d minutes ago" => "%d minutter siden",
+"today" => "I dag",
+"yesterday" => "I går",
+"%d days ago" => "%d dage siden",
+"last month" => "Sidste måned",
+"months ago" => "måneder siden",
+"last year" => "Sidste år",
+"years ago" => "år siden"
+);
diff --git a/lib/l10n/eo.php b/lib/l10n/eo.php
index 96bcb06a8d..3f89e2eca7 100644
--- a/lib/l10n/eo.php
+++ b/lib/l10n/eo.php
@@ -4,6 +4,7 @@
 "Settings" => "Agordo",
 "Users" => "Uzantoj",
 "Apps" => "Aplikaĵoj",
+"Admin" => "Administranto",
 "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",
diff --git a/lib/l10n/eu.php b/lib/l10n/eu.php
new file mode 100644
index 0000000000..989b369413
--- /dev/null
+++ b/lib/l10n/eu.php
@@ -0,0 +1,25 @@
+<?php $TRANSLATIONS = array(
+"Help" => "Laguntza",
+"Personal" => "Pertsonala",
+"Settings" => "Ezarpenak",
+"Users" => "Erabiltzaileak",
+"Apps" => "Aplikazioak",
+"Admin" => "Admin",
+"ZIP download is turned off." => "ZIP deskarga ez dago gaituta.",
+"Files need to be downloaded one by one." => "Fitxategiak banan-banan deskargatu behar dira.",
+"Back to Files" => "Itzuli fitxategietara",
+"Selected files too large to generate zip file." => "Hautatuko fitxategiak oso handiak dira zip fitxategia sortzeko.",
+"Application is not enabled" => "Aplikazioa ez dago gaituta",
+"Authentication error" => "Autentikazio errorea",
+"Token expired. Please reload page." => "Tokena iraungitu da. Mesedez birkargatu orria.",
+"seconds ago" => "orain dela segundu batzuk",
+"1 minute ago" => "orain dela minutu 1",
+"%d minutes ago" => "orain dela %d minutu",
+"today" => "gaur",
+"yesterday" => "atzo",
+"%d days ago" => "orain dela %d egun",
+"last month" => "joan den hilabetea",
+"months ago" => "orain dela hilabete batzuk",
+"last year" => "joan den urtea",
+"years ago" => "orain dela urte batzuk"
+);
diff --git a/lib/l10n/hu_HU.php b/lib/l10n/hu_HU.php
new file mode 100644
index 0000000000..eb074b79c6
--- /dev/null
+++ b/lib/l10n/hu_HU.php
@@ -0,0 +1,25 @@
+<?php $TRANSLATIONS = array(
+"Help" => "Súgó",
+"Personal" => "Személyes",
+"Settings" => "Beállítások",
+"Users" => "Felhasználók",
+"Apps" => "Alkalmazások",
+"Admin" => "Admin",
+"ZIP download is turned off." => "ZIP-letöltés letiltva",
+"Files need to be downloaded one by one." => "A file-okat egyenként kell letölteni",
+"Back to Files" => "Vissza a File-okhoz",
+"Selected files too large to generate zip file." => "Túl nagy file-ok a zip-generáláshoz",
+"Application is not enabled" => "Az alkalmazás nincs engedélyezve",
+"Authentication error" => "Hitelesítési hiba",
+"Token expired. Please reload page." => "A token lejárt. Frissítsd az oldalt.",
+"seconds ago" => "másodperccel ezelőtt",
+"1 minute ago" => "1 perccel ezelőtt",
+"%d minutes ago" => "%d perccel ezelőtt",
+"today" => "ma",
+"yesterday" => "tegnap",
+"%d days ago" => "%d évvel ezelőtt",
+"last month" => "múlt hónapban",
+"months ago" => "hónappal ezelőtt",
+"last year" => "tavaly",
+"years ago" => "évvel ezelőtt"
+);
diff --git a/lib/l10n/ja_JP.php b/lib/l10n/ja_JP.php
new file mode 100644
index 0000000000..3552a525c9
--- /dev/null
+++ b/lib/l10n/ja_JP.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." => "ファイルは1つずつダウンロードする必要があります。",
+"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/pl.php b/lib/l10n/pl.php
new file mode 100644
index 0000000000..169462fabb
--- /dev/null
+++ b/lib/l10n/pl.php
@@ -0,0 +1,25 @@
+<?php $TRANSLATIONS = array(
+"Help" => "Pomoc",
+"Personal" => "Osobiste",
+"Settings" => "Ustawienia",
+"Users" => "Użytkownicy",
+"Apps" => "Aplikacje",
+"Admin" => "Administrator",
+"ZIP download is turned off." => "Pobieranie ZIP jest wyłączone.",
+"Files need to be downloaded one by one." => "Pliki muszą zostać pobrane pojedynczo.",
+"Back to Files" => "Wróć do plików",
+"Selected files too large to generate zip file." => "Wybrane pliki są zbyt duże, aby wygenerować plik zip.",
+"Application is not enabled" => "Aplikacja nie jest włączona",
+"Authentication error" => "Błąd uwierzytelniania",
+"Token expired. Please reload page." => "Token wygasł. Proszę ponownie załadować stronę.",
+"seconds ago" => "sekund temu",
+"1 minute ago" => "1 minutę temu",
+"%d minutes ago" => "%d minut temu",
+"today" => "dzisiaj",
+"yesterday" => "wczoraj",
+"%d days ago" => "%d dni temu",
+"last month" => "ostatni miesiąc",
+"months ago" => "miesięcy temu",
+"last year" => "ostatni rok",
+"years ago" => "lat temu"
+);
diff --git a/lib/l10n/zh_TW.php b/lib/l10n/zh_TW.php
new file mode 100644
index 0000000000..008c9483a0
--- /dev/null
+++ b/lib/l10n/zh_TW.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." => "選擇的檔案太大以致於無法產生壓縮檔",
+"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/ca.php b/settings/l10n/ca.php
index 7b95d6f9af..29cad92715 100644
--- a/settings/l10n/ca.php
+++ b/settings/l10n/ca.php
@@ -16,6 +16,15 @@
 "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",
+"Share API" => "API de compartir",
+"Enable Share API" => "Activa l'API de compartir",
+"Allow apps to use the Share API" => "Permet que les aplicacions usin l'API de compartir",
+"Allow links" => "Permet enllaços",
+"Allow users to share items to the public with links" => "Permet als usuaris compartir elements amb el públic amb enllaços",
+"Allow resharing" => "Permet compartir de nou",
+"Allow users to share items shared with them again" => "Permet als usuaris comparir elements ja compartits amb ells",
+"Allow users to share with anyone" => "Permet als usuaris compartir amb qualsevol",
+"Allow users to only share with users in their groups" => "Permet als usuaris compartir només amb usuaris del seu grup",
 "Log" => "Registre",
 "More" => "Més",
 "Add your App" => "Afegiu la vostra aplicació",
diff --git a/settings/l10n/de.php b/settings/l10n/de.php
index 8a9e4bd568..6d1d28fa2e 100644
--- a/settings/l10n/de.php
+++ b/settings/l10n/de.php
@@ -16,6 +16,15 @@
 "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",
+"Share API" => "Teilungs-API",
+"Enable Share API" => "Teilungs-API aktivieren",
+"Allow apps to use the Share API" => "Erlaubt Nutzern die Teilungs-API zu nutzen",
+"Allow links" => "Links erlauben",
+"Allow users to share items to the public with links" => "Erlaube Nutzern Dateien mithilfe von Links mit der Öffentlichkeit zu teilen",
+"Allow resharing" => "Erneutes Teilen erlauben",
+"Allow users to share items shared with them again" => "Erlaubt Nutzern, Dateien die mit ihnen geteilt wurden, erneut zu teilen",
+"Allow users to share with anyone" => "Erlaube Nutzern mit jedem zu Teilen",
+"Allow users to only share with users in their groups" => "Erlaube Nutzern nur das Teilen in ihrer Gruppe",
 "Log" => "Log",
 "More" => "Mehr",
 "Add your App" => "Fügen Sie Ihre App hinzu",
diff --git a/settings/l10n/es.php b/settings/l10n/es.php
index 8403b6d388..d86dc3663a 100644
--- a/settings/l10n/es.php
+++ b/settings/l10n/es.php
@@ -16,6 +16,15 @@
 "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",
+"Share API" => "API de compartición",
+"Enable Share API" => "Activar API de compartición",
+"Allow apps to use the Share API" => "Permitir a las aplicaciones usar la API de compartición",
+"Allow links" => "Permitir enlaces",
+"Allow users to share items to the public with links" => "Permitir a los usuarios compartir elementos públicamente con enlaces",
+"Allow resharing" => "Permitir re-compartir",
+"Allow users to share items shared with them again" => "Permitir a los usuarios compartir elementos compartidos con ellos de nuevo",
+"Allow users to share with anyone" => "Permitir a los usuarios compartir con cualquiera",
+"Allow users to only share with users in their groups" => "Permitir a los usuarios compartir con usuarios en sus grupos",
 "Log" => "Registro",
 "More" => "Más",
 "Add your App" => "Añade tu aplicación",
diff --git a/settings/l10n/fr.php b/settings/l10n/fr.php
index 89516b1c7f..81fb9f56a2 100644
--- a/settings/l10n/fr.php
+++ b/settings/l10n/fr.php
@@ -16,6 +16,15 @@
 "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 ",
+"Share API" => "API de partage",
+"Enable Share API" => "Activer l'API de partage",
+"Allow apps to use the Share API" => "Autoriser les applications à utiliser l'API de partage",
+"Allow links" => "Autoriser les liens",
+"Allow users to share items to the public with links" => "Autoriser les utilisateurs à partager du contenu public avec des liens",
+"Allow resharing" => "Autoriser le re-partage",
+"Allow users to share items shared with them again" => "Autoriser les utilisateurs à partager des éléments déjà partagés entre eux",
+"Allow users to share with anyone" => "Autoriser les utilisateurs à partager avec tout le monde",
+"Allow users to only share with users in their groups" => "Autoriser les utilisateurs à ne partager qu'avec les utilisateurs dans leurs groupes",
 "Log" => "Journaux",
 "More" => "Plus",
 "Add your App" => "Ajoutez votre application",
diff --git a/settings/l10n/it.php b/settings/l10n/it.php
index e33eddacb5..64df0cd9d4 100644
--- a/settings/l10n/it.php
+++ b/settings/l10n/it.php
@@ -16,6 +16,15 @@
 "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",
+"Share API" => "API di condivisione",
+"Enable Share API" => "Abilita API di condivisione",
+"Allow apps to use the Share API" => "Consenti alle applicazioni di utilizzare le API di condivisione",
+"Allow links" => "Consenti collegamenti",
+"Allow users to share items to the public with links" => "Consenti agli utenti di condividere elementi al pubblico con collegamenti",
+"Allow resharing" => "Consenti la ri-condivisione",
+"Allow users to share items shared with them again" => "Consenti agli utenti di condividere elementi già condivisi",
+"Allow users to share with anyone" => "Consenti agli utenti di condividere con chiunque",
+"Allow users to only share with users in their groups" => "Consenti agli utenti di condividere con gli utenti del proprio gruppo",
 "Log" => "Registro",
 "More" => "Altro",
 "Add your App" => "Aggiungi la tua applicazione",
diff --git a/settings/l10n/ja_JP.php b/settings/l10n/ja_JP.php
index 93201a9dfe..617020daa3 100644
--- a/settings/l10n/ja_JP.php
+++ b/settings/l10n/ja_JP.php
@@ -16,6 +16,15 @@
 "execute one task with each page loaded" => "ページを開く毎にタスクを1つ実行",
 "cron.php is registered at a webcron service" => "cron.phpをwebcronサービスに登録しました",
 "use systems cron service" => "システムのcronサービスを使用",
+"Share API" => "Share API",
+"Enable Share API" => "Share APIを有効",
+"Allow apps to use the Share API" => "Share APIの使用をアプリケーションに許可",
+"Allow links" => "リンクを許可",
+"Allow users to share items to the public with links" => "ユーザーがリンクによる公開でアイテムを共有することが出来るようにする",
+"Allow resharing" => "再共有を許可",
+"Allow users to share items shared with them again" => "ユーザーが共有されているアイテムをさらに共有することが出来るようにする",
+"Allow users to share with anyone" => "ユーザーが誰にでも共有出来るようにする",
+"Allow users to only share with users in their groups" => "ユーザーがグループの人にしか共有出来ないようにする",
 "Log" => "ログ",
 "More" => "もっと",
 "Add your App" => "アプリを追加",
diff --git a/settings/l10n/sl.php b/settings/l10n/sl.php
index a2404d212b..884acaf576 100644
--- a/settings/l10n/sl.php
+++ b/settings/l10n/sl.php
@@ -16,6 +16,15 @@
 "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",
+"Share API" => "API souporabe",
+"Enable Share API" => "Omogoči API souporabe",
+"Allow apps to use the Share API" => "Dovoli aplikacijam uporabo API-ja souporabe",
+"Allow links" => "Dovoli povezave",
+"Allow users to share items to the public with links" => "Uporabnikom dovoli souporabo z javnimi povezavami",
+"Allow resharing" => "Dovoli nadaljnjo souporabo",
+"Allow users to share items shared with them again" => "Uporabnikom dovoli nadaljnjo souporabo",
+"Allow users to share with anyone" => "Uporabnikom dovoli souporabo s komerkoli",
+"Allow users to only share with users in their groups" => "Uporabnikom dovoli souporabo le znotraj njihove skupine",
 "Log" => "Dnevnik",
 "More" => "Več",
 "Add your App" => "Dodajte vašo aplikacijo",
diff --git a/settings/l10n/sv.php b/settings/l10n/sv.php
index 7603b6b09f..4a1d1b2c47 100644
--- a/settings/l10n/sv.php
+++ b/settings/l10n/sv.php
@@ -16,6 +16,15 @@
 "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",
+"Share API" => "Delat API",
+"Enable Share API" => "Aktivera delat API",
+"Allow apps to use the Share API" => "Tillåt applikationer att använda delat API",
+"Allow links" => "Tillåt länkar",
+"Allow users to share items to the public with links" => "Tillåt delning till allmänheten via publika länkar",
+"Allow resharing" => "Tillåt dela vidare",
+"Allow users to share items shared with them again" => "Tillåt användare att dela vidare filer som delats med dom",
+"Allow users to share with anyone" => "Tillåt delning med alla",
+"Allow users to only share with users in their groups" => "Tillåt bara delning med användare i egna grupper",
 "Log" => "Logg",
 "More" => "Mera",
 "Add your App" => "Lägg till din applikation",
diff --git a/settings/l10n/th_TH.php b/settings/l10n/th_TH.php
index a062c374c6..6ab253362e 100644
--- a/settings/l10n/th_TH.php
+++ b/settings/l10n/th_TH.php
@@ -16,6 +16,15 @@
 "execute one task with each page loaded" => "ประมวลผลหนึ่งงานเมื่อโหลดหน้าเว็บแต่ละครั้ง",
 "cron.php is registered at a webcron service" => "cron.php ได้ถูกลงทะเบียนที่บริการ webcron",
 "use systems cron service" => "ใช้บริการ cron จากระบบ",
+"Share API" => "API สำหรับคุณสมบัติแชร์ข้อมูล",
+"Enable Share API" => "เปิดใช้งาน API สำหรับคุณสมบัติแชร์ข้อมูล",
+"Allow apps to use the Share API" => "อนุญาตให้แอปฯสามารถใช้ API สำหรับแชร์ข้อมูลได้",
+"Allow links" => "อนุญาตให้ใช้งานลิงก์ได้",
+"Allow users to share items to the public with links" => "อนุญาตให้ผู้ใช้งานสามารถแชร์ข้อมูลรายการต่างๆไปให้สาธารณะชนเป็นลิงก์ได้",
+"Allow resharing" => "อนุญาตให้แชร์ข้อมูลซ้ำใหม่ได้",
+"Allow users to share items shared with them again" => "อนุญาตให้ผู้ใช้งานแชร์ข้อมูลรายการต่างๆที่ถูกแชร์มาให้ตัวผู้ใช้งานได้เท่านั้น",
+"Allow users to share with anyone" => "อนุญาตให้ผู้ใช้งานแชร์ข้อมูลถึงใครก็ได้",
+"Allow users to only share with users in their groups" => "อนุญาตให้ผู้ใช้งานแชร์ข้อมูลได้เฉพาะกับผู้ใช้งานที่อยู่ในกลุ่มเดียวกันเท่านั้น",
 "Log" => "บันทึกการเปลี่ยนแปลง",
 "More" => "เพิ่มเติม",
 "Add your App" => "เพิ่มแอปของคุณ",

From ebd813ae95a52e291576fe24cc8c631126584492 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sat, 1 Sep 2012 01:46:31 +0200
Subject: [PATCH 1023/1224] don't throw errors in the autoloader when a class
 doesn't exist

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

diff --git a/lib/base.php b/lib/base.php
index 1798bf09b9..f9adefd8b6 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -78,20 +78,25 @@ class OC{
 			require_once $path;
 		}
 		elseif(strpos($className,'OC_')===0){
-			require_once strtolower(str_replace('_','/',substr($className,3)) . '.php');
+			$path = strtolower(str_replace('_','/',substr($className,3)) . '.php');
 		}
 		elseif(strpos($className,'OCP\\')===0){
-			require_once 'public/'.strtolower(str_replace('\\','/',substr($className,3)) . '.php');
+			$path = 'public/'.strtolower(str_replace('\\','/',substr($className,3)) . '.php');
 		}
 		elseif(strpos($className,'OCA\\')===0){
-			require_once 'apps/'.strtolower(str_replace('\\','/',substr($className,3)) . '.php');
+			$path = 'apps/'.strtolower(str_replace('\\','/',substr($className,3)) . '.php');
 		}
 		elseif(strpos($className,'Sabre_')===0) {
-			require_once str_replace('_','/',$className) . '.php';
+			$path =  str_replace('_','/',$className) . '.php';
 		}
 		elseif(strpos($className,'Test_')===0){
-			require_once 'tests/lib/'.strtolower(str_replace('_','/',substr($className,5)) . '.php');
+			$path =  'tests/lib/'.strtolower(str_replace('_','/',substr($className,5)) . '.php');
 		}
+		
+		if($fullPath = stream_resolve_include_path($path)){
+			require_once $path;
+		}
+		return false;
 	}
 
 	public static function initPaths(){

From f67aef608f7bbeb43be2c8d8c10dc91ea0cb5d4b Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sat, 1 Sep 2012 01:54:13 +0200
Subject: [PATCH 1024/1224] load authentication apps on login

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

diff --git a/lib/base.php b/lib/base.php
index f9adefd8b6..8d605e5280 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -469,7 +469,7 @@ class OC{
 	}
 
 	protected static function handleLogin() {
-		OC_App::loadApps(array('prelogin'));
+		OC_App::loadApps(array('prelogin','authentication'));
 		$error = false;
 		// remember was checked after last login
 		if (OC::tryRememberLogin()) {

From 3dacf149de2ac560328242666473533c81c4b418 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sat, 1 Sep 2012 02:48:54 +0200
Subject: [PATCH 1025/1224] allow configuring user backends in config.php

---
 lib/base.php | 11 ++++++++++-
 lib/user.php | 25 +++++++++++++++++++++++++
 2 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/lib/base.php b/lib/base.php
index 8d605e5280..fb83f6ea0a 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -351,6 +351,9 @@ class OC{
 			}
 		}
 
+		//setup extra user backends
+		OC_User::setupBackends();
+
 		// register cache cleanup jobs
 		OC_BackgroundJob_RegularTask::register('OC_Cache_FileGlobal', 'gc');
 		OC_Hook::connect('OC_User', 'post_login', 'OC_Cache_File', 'loginListener');
@@ -423,6 +426,7 @@ class OC{
 		// Someone is logged in :
 		if(OC_User::isLoggedIn()) {
 			OC_App::loadApps();
+			OC_User::setupBackends();
 			if(isset($_GET["logout"]) and ($_GET["logout"])) {
 				OC_User::logout();
 				header("Location: ".OC::$WEBROOT.'/');
@@ -469,7 +473,7 @@ class OC{
 	}
 
 	protected static function handleLogin() {
-		OC_App::loadApps(array('prelogin','authentication'));
+		OC_App::loadApps(array('prelogin'));
 		$error = false;
 		// remember was checked after last login
 		if (OC::tryRememberLogin()) {
@@ -517,7 +521,12 @@ class OC{
 		|| ($_SESSION['sectoken']!=$_POST['sectoken']) ) {
 			return false;
 		}
+
 		OC_App::loadApps();
+		
+		//setup extra user backends
+		OC_User::setupBackends();
+		
 		if(OC_User::login($_POST["user"], $_POST["password"])) {
 			if(!empty($_POST["remember_login"])){
 				if(defined("DEBUG") && DEBUG) {
diff --git a/lib/user.php b/lib/user.php
index c432f6074a..305fb8ed3a 100644
--- a/lib/user.php
+++ b/lib/user.php
@@ -39,6 +39,8 @@
 class OC_User {
 	// The backend used for user management
 	private static $_usedBackends = array();
+	
+	private static $_setupedBackends = array();
 
 	// Backends available (except database)
 	private static $_backends = array();
@@ -114,6 +116,28 @@ class OC_User {
 		self::$_usedBackends=array();
 	}
 
+	/**
+	 * setup the configured backends in config.php
+	 */
+	public static function setupBackends(){
+		$backends=OC_Config::getValue('user_backends',array());
+		foreach($backends as $i=>$config){
+			$class=$config['class'];
+			$arguments=$config['arguments'];
+			if(class_exists($class) and array_search($i,self::$_setupedBackends)===false){
+				// make a reflection object
+				$reflectionObj = new ReflectionClass($class);
+
+				// use Reflection to create a new instance, using the $args
+				$backend = $reflectionObj->newInstanceArgs($arguments);
+				self::useBackend($backend);
+				$_setupedBackends[]=$i;
+			}else{
+				OC_Log::write('core','User backend '.$class.' not found.',OC_Log::ERROR);
+			}
+		}
+	}
+
 	/**
 	 * @brief Create a new user
 	 * @param $uid The username of the user to create
@@ -253,6 +277,7 @@ class OC_User {
 	public static function isLoggedIn(){
 		if( isset($_SESSION['user_id']) AND $_SESSION['user_id']) {
 			OC_App::loadApps(array('authentication'));
+			self::setupBackends();
 			if (self::userExists($_SESSION['user_id']) ){
 				return true;
 			}

From 0d6b84dad330c386c5675cd5b039fcd41caca4f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Sat, 1 Sep 2012 13:23:11 +0300
Subject: [PATCH 1026/1224] Update l10n/zh_TW/lib.po

---
 l10n/zh_TW/lib.po | 1 -
 1 file changed, 1 deletion(-)

diff --git a/l10n/zh_TW/lib.po b/l10n/zh_TW/lib.po
index 45a52a790a..750304e5a1 100644
--- a/l10n/zh_TW/lib.po
+++ b/l10n/zh_TW/lib.po
@@ -3,7 +3,6 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <ywang1007+transifex@gmail.com>, 2012.
 # ywang  <ywang1007@gmail.com>, 2012.
 msgid ""
 msgstr ""

From 10bd64debdf15a181def233ef8685c15d528c5e1 Mon Sep 17 00:00:00 2001
From: Thomas Mueller <thomas.mueller@tmit.eu>
Date: Sat, 1 Sep 2012 13:23:37 +0200
Subject: [PATCH 1027/1224] translation support enhanced

---
 apps/files_versions/templates/settings-personal.php | 11 ++++++++---
 settings/js/users.js                                |  2 +-
 settings/templates/admin.php                        |  6 ++++--
 3 files changed, 13 insertions(+), 6 deletions(-)
 mode change 100755 => 100644 settings/templates/admin.php

diff --git a/apps/files_versions/templates/settings-personal.php b/apps/files_versions/templates/settings-personal.php
index fe9ba381e5..6d97cea46c 100644
--- a/apps/files_versions/templates/settings-personal.php
+++ b/apps/files_versions/templates/settings-personal.php
@@ -1,9 +1,14 @@
 <form id="versions">
 	<fieldset class="personalblock">
 		<legend>
-			<strong>Versions</strong><!-- translate using echo $l->t('foo'); -->
+			<strong><?php echo $l->t('Versions'); ?></strong>
 		</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::imagePath('core', 'loading.gif'); ?>" /></button>
+		<p>
+            <?php echo $l->t('This will delete all existing backup versions of your files'); ?>
+        </p>
+		<button id="expireAllBtn">
+            <?php echo $l->t('Expire all versions'); ?>
+            <img style="display: none;" class="expireAllLoading" src="<?php echo OCP\Util::imagePath('core', 'loading.gif'); ?>" />
+        </button>
 	</fieldset>
 </form>
diff --git a/settings/js/users.js b/settings/js/users.js
index 6026b22d1a..d0a3c1c21a 100644
--- a/settings/js/users.js
+++ b/settings/js/users.js
@@ -182,7 +182,7 @@ UserList={
 			};
 			var label;
 			if(isadmin){
-				label = t('files', 'add group');
+				label = t('core', 'add group');
 			}else{
 				label = null;
 			}
diff --git a/settings/templates/admin.php b/settings/templates/admin.php
old mode 100755
new mode 100644
index b701b0e839..a02d3f5cfe
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -13,7 +13,9 @@ 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>
+	<span class="securitywarning">
+        <?php echo $l->t('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	
@@ -100,6 +102,6 @@ if(!$_['htaccessworking']) {
 
 <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="https://github.com/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>.
+    <? echo $l->t('Developed by the <a href="http://ownCloud.org/contact" target="_blank">ownCloud community</a>, the <a href="https://github.com/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>
 

From c0c48cb3eeadc6cdb593ffb2a746c72b3f3b1430 Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <thomas.mueller@tmit.eu>
Date: Sat, 1 Sep 2012 13:37:28 +0200
Subject: [PATCH 1028/1224] [tx-robot] updated from transifex

---
 apps/files/l10n/fi_FI.php           |  1 +
 apps/files_sharing/l10n/nl.php      |  8 +--
 l10n/af/files_versions.po           | 16 ++++--
 l10n/af/settings.po                 | 53 +++++++++++++-------
 l10n/ar/files_versions.po           | 16 ++++--
 l10n/ar/settings.po                 | 53 +++++++++++++-------
 l10n/ar_SA/files_versions.po        | 16 ++++--
 l10n/ar_SA/settings.po              | 53 +++++++++++++-------
 l10n/bg_BG/files_versions.po        | 16 ++++--
 l10n/bg_BG/settings.po              | 53 +++++++++++++-------
 l10n/ca/files_versions.po           | 16 ++++--
 l10n/ca/settings.po                 | 55 ++++++++++++++-------
 l10n/cs_CZ/files_versions.po        | 16 ++++--
 l10n/cs_CZ/settings.po              | 53 +++++++++++++-------
 l10n/da/files_versions.po           | 16 ++++--
 l10n/da/settings.po                 | 53 +++++++++++++-------
 l10n/de/files_versions.po           | 14 ++++--
 l10n/de/lib.po                      | 12 ++---
 l10n/de/settings.po                 | 55 ++++++++++++++-------
 l10n/el/files_versions.po           | 16 ++++--
 l10n/el/settings.po                 | 53 +++++++++++++-------
 l10n/eo/files_versions.po           | 16 ++++--
 l10n/eo/settings.po                 | 53 +++++++++++++-------
 l10n/es/files_versions.po           | 16 ++++--
 l10n/es/settings.po                 | 55 ++++++++++++++-------
 l10n/et_EE/files_versions.po        | 16 ++++--
 l10n/et_EE/settings.po              | 53 +++++++++++++-------
 l10n/eu/files_versions.po           | 16 ++++--
 l10n/eu/settings.po                 | 53 +++++++++++++-------
 l10n/eu_ES/files_versions.po        | 16 ++++--
 l10n/eu_ES/settings.po              | 53 +++++++++++++-------
 l10n/fa/files_versions.po           | 16 ++++--
 l10n/fa/settings.po                 | 53 +++++++++++++-------
 l10n/fi/files_versions.po           | 16 ++++--
 l10n/fi/settings.po                 | 53 +++++++++++++-------
 l10n/fi_FI/files.po                 |  8 +--
 l10n/fi_FI/files_versions.po        | 16 ++++--
 l10n/fi_FI/lib.po                   | 12 ++---
 l10n/fi_FI/settings.po              | 53 +++++++++++++-------
 l10n/fr/files_versions.po           | 16 ++++--
 l10n/fr/settings.po                 | 55 ++++++++++++++-------
 l10n/gl/files_versions.po           | 16 ++++--
 l10n/gl/settings.po                 | 53 +++++++++++++-------
 l10n/he/files_versions.po           | 16 ++++--
 l10n/he/settings.po                 | 53 +++++++++++++-------
 l10n/hi/files_versions.po           | 16 ++++--
 l10n/hi/settings.po                 | 53 +++++++++++++-------
 l10n/hr/files_versions.po           | 16 ++++--
 l10n/hr/settings.po                 | 53 +++++++++++++-------
 l10n/hu_HU/files_versions.po        | 16 ++++--
 l10n/hu_HU/settings.po              | 53 +++++++++++++-------
 l10n/hy/files_versions.po           | 16 ++++--
 l10n/hy/settings.po                 | 53 +++++++++++++-------
 l10n/ia/files_versions.po           | 16 ++++--
 l10n/ia/settings.po                 | 53 +++++++++++++-------
 l10n/id/files_versions.po           | 16 ++++--
 l10n/id/settings.po                 | 53 +++++++++++++-------
 l10n/id_ID/files_versions.po        | 16 ++++--
 l10n/id_ID/settings.po              | 53 +++++++++++++-------
 l10n/it/files_versions.po           | 16 ++++--
 l10n/it/lib.po                      | 12 ++---
 l10n/it/settings.po                 | 55 ++++++++++++++-------
 l10n/ja_JP/files_versions.po        | 16 ++++--
 l10n/ja_JP/settings.po              | 55 ++++++++++++++-------
 l10n/ko/files_versions.po           | 16 ++++--
 l10n/ko/settings.po                 | 53 +++++++++++++-------
 l10n/lb/files_versions.po           | 16 ++++--
 l10n/lb/settings.po                 | 53 +++++++++++++-------
 l10n/lt_LT/files_versions.po        | 16 ++++--
 l10n/lt_LT/settings.po              | 53 +++++++++++++-------
 l10n/lv/files_versions.po           | 16 ++++--
 l10n/lv/settings.po                 | 53 +++++++++++++-------
 l10n/mk/files_versions.po           | 16 ++++--
 l10n/mk/settings.po                 | 53 +++++++++++++-------
 l10n/ms_MY/files_versions.po        | 16 ++++--
 l10n/ms_MY/settings.po              | 53 +++++++++++++-------
 l10n/nb_NO/files_versions.po        | 16 ++++--
 l10n/nb_NO/settings.po              | 53 +++++++++++++-------
 l10n/nl/files_sharing.po            | 14 +++---
 l10n/nl/files_versions.po           | 16 ++++--
 l10n/nl/settings.po                 | 75 ++++++++++++++++++-----------
 l10n/nn_NO/files_versions.po        | 16 ++++--
 l10n/nn_NO/settings.po              | 53 +++++++++++++-------
 l10n/pl/files_versions.po           | 16 ++++--
 l10n/pl/settings.po                 | 53 +++++++++++++-------
 l10n/pl_PL/files_versions.po        | 16 ++++--
 l10n/pl_PL/settings.po              | 53 +++++++++++++-------
 l10n/pt_BR/files_versions.po        | 16 ++++--
 l10n/pt_BR/settings.po              | 53 +++++++++++++-------
 l10n/pt_PT/files_versions.po        | 16 ++++--
 l10n/pt_PT/settings.po              | 53 +++++++++++++-------
 l10n/ro/files_versions.po           | 16 ++++--
 l10n/ro/settings.po                 | 53 +++++++++++++-------
 l10n/ru/files_versions.po           | 16 ++++--
 l10n/ru/settings.po                 | 53 +++++++++++++-------
 l10n/ru_RU/files_versions.po        | 16 ++++--
 l10n/ru_RU/settings.po              | 53 +++++++++++++-------
 l10n/sk_SK/files_versions.po        | 16 ++++--
 l10n/sk_SK/settings.po              | 53 +++++++++++++-------
 l10n/sl/files_versions.po           | 16 ++++--
 l10n/sl/lib.po                      | 12 ++---
 l10n/sl/settings.po                 | 55 ++++++++++++++-------
 l10n/so/files_versions.po           | 16 ++++--
 l10n/so/settings.po                 | 53 +++++++++++++-------
 l10n/sr/files_versions.po           | 16 ++++--
 l10n/sr/settings.po                 | 53 +++++++++++++-------
 l10n/sr@latin/files_versions.po     | 16 ++++--
 l10n/sr@latin/settings.po           | 53 +++++++++++++-------
 l10n/sv/files_versions.po           | 16 ++++--
 l10n/sv/lib.po                      | 12 ++---
 l10n/sv/settings.po                 | 55 ++++++++++++++-------
 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   | 12 ++++-
 l10n/templates/lib.pot              |  2 +-
 l10n/templates/settings.pot         | 50 +++++++++++++------
 l10n/templates/user_ldap.pot        |  2 +-
 l10n/th_TH/files_versions.po        | 16 ++++--
 l10n/th_TH/settings.po              | 55 ++++++++++++++-------
 l10n/tr/files_versions.po           | 16 ++++--
 l10n/tr/settings.po                 | 53 +++++++++++++-------
 l10n/uk/files_versions.po           | 16 ++++--
 l10n/uk/settings.po                 | 53 +++++++++++++-------
 l10n/vi/files_versions.po           | 16 ++++--
 l10n/vi/settings.po                 | 62 ++++++++++++++++--------
 l10n/zh_CN.GB2312/files_versions.po | 16 ++++--
 l10n/zh_CN.GB2312/settings.po       | 53 +++++++++++++-------
 l10n/zh_CN/files_versions.po        | 16 ++++--
 l10n/zh_CN/settings.po              | 53 +++++++++++++-------
 l10n/zh_TW/files_versions.po        | 16 ++++--
 l10n/zh_TW/settings.po              | 53 +++++++++++++-------
 lib/l10n/de.php                     |  5 +-
 lib/l10n/fi_FI.php                  |  5 +-
 lib/l10n/it.php                     |  5 +-
 lib/l10n/sl.php                     |  5 +-
 lib/l10n/sv.php                     |  5 +-
 settings/l10n/nl.php                |  9 ++++
 settings/l10n/vi.php                |  4 ++
 141 files changed, 2938 insertions(+), 1316 deletions(-)

diff --git a/apps/files/l10n/fi_FI.php b/apps/files/l10n/fi_FI.php
index 902ea859a3..399adb0b1d 100644
--- a/apps/files/l10n/fi_FI.php
+++ b/apps/files/l10n/fi_FI.php
@@ -20,6 +20,7 @@
 "Upload Error" => "Lähetysvirhe.",
 "Pending" => "Odottaa",
 "Upload cancelled." => "Lähetys peruttu.",
+"File upload is in progress. Leaving the page now will cancel the upload." => "Tiedoston lähetys on meneillään. Sivulta poistuminen nyt peruu tiedoston lähetyksen.",
 "Invalid name, '/' is not allowed." => "Virheellinen nimi, merkki '/' ei ole sallittu.",
 "Size" => "Koko",
 "Modified" => "Muutettu",
diff --git a/apps/files_sharing/l10n/nl.php b/apps/files_sharing/l10n/nl.php
index d357d66f67..a4da2723ca 100644
--- a/apps/files_sharing/l10n/nl.php
+++ b/apps/files_sharing/l10n/nl.php
@@ -1,6 +1,6 @@
 <?php $TRANSLATIONS = array(
-"Size" => "Grootte",
-"Modified" => "Aangepast",
-"Delete all" => "Verwijder alles",
-"Delete" => "Vewijder"
+"Password" => "Passeerwoord",
+"Download" => "Downloaden",
+"No preview available for" => "Geen voorbeeldweergave beschikbaar voor",
+"web services under your control" => "Webdiensten in eigen beheer"
 );
diff --git a/l10n/af/files_versions.po b/l10n/af/files_versions.po
index d7b621cc6f..48efcf1e43 100644
--- a/l10n/af/files_versions.po
+++ b/l10n/af/files_versions.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:37+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-09-01 13:35+0200\n"
+"PO-Revision-Date: 2012-09-01 11:35+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,10 +17,18 @@ msgstr ""
 "Language: af\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: js/settings-personal.js:31
+#: js/settings-personal.js:31 templates/settings-personal.php:10
 msgid "Expire all versions"
 msgstr ""
 
+#: templates/settings-personal.php:4
+msgid "Versions"
+msgstr ""
+
+#: templates/settings-personal.php:7
+msgid "This will delete all existing backup versions of your files"
+msgstr ""
+
 #: templates/settings.php:3
 msgid "Enable Files Versioning"
 msgstr ""
diff --git a/l10n/af/settings.po b/l10n/af/settings.po
index 11af545b8c..1595e659d4 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-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-01 13:35+0200\n"
+"PO-Revision-Date: 2012-09-01 11:35+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"
@@ -69,66 +69,85 @@ msgstr ""
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:29
-msgid "Cron"
+#: templates/admin.php:17
+msgid ""
+"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."
 msgstr ""
 
 #: templates/admin.php:31
-msgid "execute one task with each page loaded"
+msgid "Cron"
 msgstr ""
 
 #: templates/admin.php:33
-msgid "cron.php is registered at a webcron service"
+msgid "execute one task with each page loaded"
 msgstr ""
 
 #: templates/admin.php:35
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:37
 msgid "use systems cron service"
 msgstr ""
 
-#: templates/admin.php:39
+#: templates/admin.php:41
 msgid "Share API"
 msgstr ""
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:45
+#: templates/admin.php:47
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:49
+#: templates/admin.php:51
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:50
+#: templates/admin.php:52
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:54
+#: templates/admin.php:56
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:55
+#: templates/admin.php:57
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:62
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:67
+#: templates/admin.php:69
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:95
+#: templates/admin.php:97
 msgid "More"
 msgstr ""
 
+#: templates/admin.php:105
+msgid ""
+"Developed by the <a href=\"http://ownCloud.org/contact\" "
+"target=\"_blank\">ownCloud community</a>, the <a "
+"href=\"https://github.com/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>."
+msgstr ""
+
 #: templates/apps.php:10
 msgid "Add your App"
 msgstr ""
diff --git a/l10n/ar/files_versions.po b/l10n/ar/files_versions.po
index de2471bc46..ab6c449389 100644
--- a/l10n/ar/files_versions.po
+++ b/l10n/ar/files_versions.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:37+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-09-01 13:35+0200\n"
+"PO-Revision-Date: 2012-09-01 11:35+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,10 +17,18 @@ 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"
 
-#: js/settings-personal.js:31
+#: js/settings-personal.js:31 templates/settings-personal.php:10
 msgid "Expire all versions"
 msgstr ""
 
+#: templates/settings-personal.php:4
+msgid "Versions"
+msgstr ""
+
+#: templates/settings-personal.php:7
+msgid "This will delete all existing backup versions of your files"
+msgstr ""
+
 #: templates/settings.php:3
 msgid "Enable Files Versioning"
 msgstr ""
diff --git a/l10n/ar/settings.po b/l10n/ar/settings.po
index c1af2bbd91..4d45c84aa4 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-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-01 13:35+0200\n"
+"PO-Revision-Date: 2012-09-01 11:35+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"
@@ -71,66 +71,85 @@ msgstr "__language_name__"
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:29
-msgid "Cron"
+#: templates/admin.php:17
+msgid ""
+"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."
 msgstr ""
 
 #: templates/admin.php:31
-msgid "execute one task with each page loaded"
+msgid "Cron"
 msgstr ""
 
 #: templates/admin.php:33
-msgid "cron.php is registered at a webcron service"
+msgid "execute one task with each page loaded"
 msgstr ""
 
 #: templates/admin.php:35
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:37
 msgid "use systems cron service"
 msgstr ""
 
-#: templates/admin.php:39
+#: templates/admin.php:41
 msgid "Share API"
 msgstr ""
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:45
+#: templates/admin.php:47
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:49
+#: templates/admin.php:51
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:50
+#: templates/admin.php:52
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:54
+#: templates/admin.php:56
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:55
+#: templates/admin.php:57
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:62
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:67
+#: templates/admin.php:69
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:95
+#: templates/admin.php:97
 msgid "More"
 msgstr ""
 
+#: templates/admin.php:105
+msgid ""
+"Developed by the <a href=\"http://ownCloud.org/contact\" "
+"target=\"_blank\">ownCloud community</a>, the <a "
+"href=\"https://github.com/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>."
+msgstr ""
+
 #: templates/apps.php:10
 msgid "Add your App"
 msgstr ""
diff --git a/l10n/ar_SA/files_versions.po b/l10n/ar_SA/files_versions.po
index 0b3630c504..9596994e8a 100644
--- a/l10n/ar_SA/files_versions.po
+++ b/l10n/ar_SA/files_versions.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:37+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-09-01 13:35+0200\n"
+"PO-Revision-Date: 2012-09-01 11:35+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,10 +17,18 @@ msgstr ""
 "Language: ar_SA\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: js/settings-personal.js:31
+#: js/settings-personal.js:31 templates/settings-personal.php:10
 msgid "Expire all versions"
 msgstr ""
 
+#: templates/settings-personal.php:4
+msgid "Versions"
+msgstr ""
+
+#: templates/settings-personal.php:7
+msgid "This will delete all existing backup versions of your files"
+msgstr ""
+
 #: templates/settings.php:3
 msgid "Enable Files Versioning"
 msgstr ""
diff --git a/l10n/ar_SA/settings.po b/l10n/ar_SA/settings.po
index cfa336caae..beb499e9f2 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-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-01 13:35+0200\n"
+"PO-Revision-Date: 2012-09-01 11:35+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"
@@ -69,66 +69,85 @@ msgstr ""
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:29
-msgid "Cron"
+#: templates/admin.php:17
+msgid ""
+"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."
 msgstr ""
 
 #: templates/admin.php:31
-msgid "execute one task with each page loaded"
+msgid "Cron"
 msgstr ""
 
 #: templates/admin.php:33
-msgid "cron.php is registered at a webcron service"
+msgid "execute one task with each page loaded"
 msgstr ""
 
 #: templates/admin.php:35
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:37
 msgid "use systems cron service"
 msgstr ""
 
-#: templates/admin.php:39
+#: templates/admin.php:41
 msgid "Share API"
 msgstr ""
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:45
+#: templates/admin.php:47
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:49
+#: templates/admin.php:51
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:50
+#: templates/admin.php:52
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:54
+#: templates/admin.php:56
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:55
+#: templates/admin.php:57
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:62
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:67
+#: templates/admin.php:69
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:95
+#: templates/admin.php:97
 msgid "More"
 msgstr ""
 
+#: templates/admin.php:105
+msgid ""
+"Developed by the <a href=\"http://ownCloud.org/contact\" "
+"target=\"_blank\">ownCloud community</a>, the <a "
+"href=\"https://github.com/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>."
+msgstr ""
+
 #: templates/apps.php:10
 msgid "Add your App"
 msgstr ""
diff --git a/l10n/bg_BG/files_versions.po b/l10n/bg_BG/files_versions.po
index 40a5fc5e9b..bc5aaca01c 100644
--- a/l10n/bg_BG/files_versions.po
+++ b/l10n/bg_BG/files_versions.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:37+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-09-01 13:35+0200\n"
+"PO-Revision-Date: 2012-09-01 11:35+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,10 +17,18 @@ msgstr ""
 "Language: bg_BG\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: js/settings-personal.js:31
+#: js/settings-personal.js:31 templates/settings-personal.php:10
 msgid "Expire all versions"
 msgstr ""
 
+#: templates/settings-personal.php:4
+msgid "Versions"
+msgstr ""
+
+#: templates/settings-personal.php:7
+msgid "This will delete all existing backup versions of your files"
+msgstr ""
+
 #: templates/settings.php:3
 msgid "Enable Files Versioning"
 msgstr ""
diff --git a/l10n/bg_BG/settings.po b/l10n/bg_BG/settings.po
index 123996f9b8..e05c9110f2 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-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-01 13:35+0200\n"
+"PO-Revision-Date: 2012-09-01 11:35+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"
@@ -72,66 +72,85 @@ msgstr ""
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:29
-msgid "Cron"
+#: templates/admin.php:17
+msgid ""
+"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."
 msgstr ""
 
 #: templates/admin.php:31
-msgid "execute one task with each page loaded"
+msgid "Cron"
 msgstr ""
 
 #: templates/admin.php:33
-msgid "cron.php is registered at a webcron service"
+msgid "execute one task with each page loaded"
 msgstr ""
 
 #: templates/admin.php:35
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:37
 msgid "use systems cron service"
 msgstr ""
 
-#: templates/admin.php:39
+#: templates/admin.php:41
 msgid "Share API"
 msgstr ""
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:45
+#: templates/admin.php:47
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:49
+#: templates/admin.php:51
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:50
+#: templates/admin.php:52
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:54
+#: templates/admin.php:56
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:55
+#: templates/admin.php:57
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:62
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:67
+#: templates/admin.php:69
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:95
+#: templates/admin.php:97
 msgid "More"
 msgstr ""
 
+#: templates/admin.php:105
+msgid ""
+"Developed by the <a href=\"http://ownCloud.org/contact\" "
+"target=\"_blank\">ownCloud community</a>, the <a "
+"href=\"https://github.com/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>."
+msgstr ""
+
 #: templates/apps.php:10
 msgid "Add your App"
 msgstr ""
diff --git a/l10n/ca/files_versions.po b/l10n/ca/files_versions.po
index d0555a50f1..ae5ccd77e0 100644
--- a/l10n/ca/files_versions.po
+++ b/l10n/ca/files_versions.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:18+0000\n"
-"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
+"POT-Creation-Date: 2012-09-01 13:35+0200\n"
+"PO-Revision-Date: 2012-09-01 11:35+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,10 +18,18 @@ msgstr ""
 "Language: ca\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: js/settings-personal.js:31
+#: js/settings-personal.js:31 templates/settings-personal.php:10
 msgid "Expire all versions"
 msgstr "Expira totes les versions"
 
+#: templates/settings-personal.php:4
+msgid "Versions"
+msgstr ""
+
+#: templates/settings-personal.php:7
+msgid "This will delete all existing backup versions of your files"
+msgstr ""
+
 #: templates/settings.php:3
 msgid "Enable Files Versioning"
 msgstr "Habilita les versions de fitxers"
diff --git a/l10n/ca/settings.po b/l10n/ca/settings.po
index 35cb1e5db2..7e9e39e072 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-09-01 02:01+0200\n"
-"PO-Revision-Date: 2012-08-31 11:33+0000\n"
-"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
+"POT-Creation-Date: 2012-09-01 13:35+0200\n"
+"PO-Revision-Date: 2012-09-01 11:35+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"
@@ -71,66 +71,85 @@ msgstr "Català"
 msgid "Security Warning"
 msgstr "Avís de seguretat"
 
-#: templates/admin.php:29
+#: templates/admin.php:17
+msgid ""
+"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."
+msgstr ""
+
+#: templates/admin.php:31
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:31
+#: templates/admin.php:33
 msgid "execute one task with each page loaded"
 msgstr "executa una tasca en carregar cada pàgina"
 
-#: templates/admin.php:33
+#: templates/admin.php:35
 msgid "cron.php is registered at a webcron service"
 msgstr "cron.php està registrat en un servei web cron"
 
-#: templates/admin.php:35
+#: templates/admin.php:37
 msgid "use systems cron service"
 msgstr "usa el servei cron del sistema"
 
-#: templates/admin.php:39
+#: templates/admin.php:41
 msgid "Share API"
 msgstr "API de compartir"
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Enable Share API"
 msgstr "Activa l'API de compartir"
 
-#: templates/admin.php:45
+#: templates/admin.php:47
 msgid "Allow apps to use the Share API"
 msgstr "Permet que les aplicacions usin l'API de compartir"
 
-#: templates/admin.php:49
+#: templates/admin.php:51
 msgid "Allow links"
 msgstr "Permet enllaços"
 
-#: templates/admin.php:50
+#: templates/admin.php:52
 msgid "Allow users to share items to the public with links"
 msgstr "Permet als usuaris compartir elements amb el públic amb enllaços"
 
-#: templates/admin.php:54
+#: templates/admin.php:56
 msgid "Allow resharing"
 msgstr "Permet compartir de nou"
 
-#: templates/admin.php:55
+#: templates/admin.php:57
 msgid "Allow users to share items shared with them again"
 msgstr "Permet als usuaris comparir elements ja compartits amb ells"
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Allow users to share with anyone"
 msgstr "Permet als usuaris compartir amb qualsevol"
 
-#: templates/admin.php:60
+#: templates/admin.php:62
 msgid "Allow users to only share with users in their groups"
 msgstr "Permet als usuaris compartir només amb usuaris del seu grup"
 
-#: templates/admin.php:67
+#: templates/admin.php:69
 msgid "Log"
 msgstr "Registre"
 
-#: templates/admin.php:95
+#: templates/admin.php:97
 msgid "More"
 msgstr "Més"
 
+#: templates/admin.php:105
+msgid ""
+"Developed by the <a href=\"http://ownCloud.org/contact\" "
+"target=\"_blank\">ownCloud community</a>, the <a "
+"href=\"https://github.com/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>."
+msgstr ""
+
 #: templates/apps.php:10
 msgid "Add your App"
 msgstr "Afegiu la vostra aplicació"
diff --git a/l10n/cs_CZ/files_versions.po b/l10n/cs_CZ/files_versions.po
index cac58a2122..a75fe502f6 100644
--- a/l10n/cs_CZ/files_versions.po
+++ b/l10n/cs_CZ/files_versions.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:32+0000\n"
-"Last-Translator: Martin <fireball@atlas.cz>\n"
+"POT-Creation-Date: 2012-09-01 13:35+0200\n"
+"PO-Revision-Date: 2012-09-01 11:35+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,10 +18,18 @@ msgstr ""
 "Language: cs_CZ\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
 
-#: js/settings-personal.js:31
+#: js/settings-personal.js:31 templates/settings-personal.php:10
 msgid "Expire all versions"
 msgstr "Vypršení všech verzí"
 
+#: templates/settings-personal.php:4
+msgid "Versions"
+msgstr ""
+
+#: templates/settings-personal.php:7
+msgid "This will delete all existing backup versions of your files"
+msgstr ""
+
 #: templates/settings.php:3
 msgid "Enable Files Versioning"
 msgstr "Povolit verzování souborů"
diff --git a/l10n/cs_CZ/settings.po b/l10n/cs_CZ/settings.po
index aa8bbf08b2..394d3ebe64 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-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-01 13:35+0200\n"
+"PO-Revision-Date: 2012-09-01 11:35+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"
@@ -74,66 +74,85 @@ msgstr "Česky"
 msgid "Security Warning"
 msgstr "Bezpečnostní upozornění"
 
-#: templates/admin.php:29
+#: templates/admin.php:17
+msgid ""
+"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."
+msgstr ""
+
+#: templates/admin.php:31
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:31
+#: templates/admin.php:33
 msgid "execute one task with each page loaded"
 msgstr "spustit jednu úlohu s každou nataženou stranou"
 
-#: templates/admin.php:33
+#: templates/admin.php:35
 msgid "cron.php is registered at a webcron service"
 msgstr "cron.php je registrován jako služba webcron"
 
-#: templates/admin.php:35
+#: templates/admin.php:37
 msgid "use systems cron service"
 msgstr "použijte systémovou službu cron"
 
-#: templates/admin.php:39
+#: templates/admin.php:41
 msgid "Share API"
 msgstr ""
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:45
+#: templates/admin.php:47
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:49
+#: templates/admin.php:51
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:50
+#: templates/admin.php:52
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:54
+#: templates/admin.php:56
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:55
+#: templates/admin.php:57
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:62
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:67
+#: templates/admin.php:69
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:95
+#: templates/admin.php:97
 msgid "More"
 msgstr "Více"
 
+#: templates/admin.php:105
+msgid ""
+"Developed by the <a href=\"http://ownCloud.org/contact\" "
+"target=\"_blank\">ownCloud community</a>, the <a "
+"href=\"https://github.com/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>."
+msgstr ""
+
 #: templates/apps.php:10
 msgid "Add your App"
 msgstr "Přidat vaší aplikaci"
diff --git a/l10n/da/files_versions.po b/l10n/da/files_versions.po
index 2aae166d77..667b5eef55 100644
--- a/l10n/da/files_versions.po
+++ b/l10n/da/files_versions.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:37+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-09-01 13:35+0200\n"
+"PO-Revision-Date: 2012-09-01 11:35+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,10 +17,18 @@ msgstr ""
 "Language: da\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: js/settings-personal.js:31
+#: js/settings-personal.js:31 templates/settings-personal.php:10
 msgid "Expire all versions"
 msgstr ""
 
+#: templates/settings-personal.php:4
+msgid "Versions"
+msgstr ""
+
+#: templates/settings-personal.php:7
+msgid "This will delete all existing backup versions of your files"
+msgstr ""
+
 #: templates/settings.php:3
 msgid "Enable Files Versioning"
 msgstr ""
diff --git a/l10n/da/settings.po b/l10n/da/settings.po
index d2f0b1630e..58ca661b31 100644
--- a/l10n/da/settings.po
+++ b/l10n/da/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-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-01 13:35+0200\n"
+"PO-Revision-Date: 2012-09-01 11:35+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"
@@ -76,66 +76,85 @@ msgstr "Dansk"
 msgid "Security Warning"
 msgstr "Sikkerhedsadvarsel"
 
-#: templates/admin.php:29
+#: templates/admin.php:17
+msgid ""
+"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."
+msgstr ""
+
+#: templates/admin.php:31
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:31
+#: templates/admin.php:33
 msgid "execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:33
+#: templates/admin.php:35
 msgid "cron.php is registered at a webcron service"
 msgstr "cron.php er tilmeldt en webcron tjeneste"
 
-#: templates/admin.php:35
+#: templates/admin.php:37
 msgid "use systems cron service"
 msgstr ""
 
-#: templates/admin.php:39
+#: templates/admin.php:41
 msgid "Share API"
 msgstr ""
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:45
+#: templates/admin.php:47
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:49
+#: templates/admin.php:51
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:50
+#: templates/admin.php:52
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:54
+#: templates/admin.php:56
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:55
+#: templates/admin.php:57
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:62
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:67
+#: templates/admin.php:69
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:95
+#: templates/admin.php:97
 msgid "More"
 msgstr "Mere"
 
+#: templates/admin.php:105
+msgid ""
+"Developed by the <a href=\"http://ownCloud.org/contact\" "
+"target=\"_blank\">ownCloud community</a>, the <a "
+"href=\"https://github.com/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>."
+msgstr ""
+
 #: templates/apps.php:10
 msgid "Add your App"
 msgstr "Tilføj din App"
diff --git a/l10n/de/files_versions.po b/l10n/de/files_versions.po
index 789af981fb..70c88c7100 100644
--- a/l10n/de/files_versions.po
+++ b/l10n/de/files_versions.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 08:15+0000\n"
+"POT-Creation-Date: 2012-09-01 13:35+0200\n"
+"PO-Revision-Date: 2012-09-01 11:35+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"
@@ -18,10 +18,18 @@ msgstr ""
 "Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: js/settings-personal.js:31
+#: js/settings-personal.js:31 templates/settings-personal.php:10
 msgid "Expire all versions"
 msgstr "Alle Versionen löschen"
 
+#: templates/settings-personal.php:4
+msgid "Versions"
+msgstr ""
+
+#: templates/settings-personal.php:7
+msgid "This will delete all existing backup versions of your files"
+msgstr ""
+
 #: templates/settings.php:3
 msgid "Enable Files Versioning"
 msgstr "Datei-Versionierung aktivieren"
diff --git a/l10n/de/lib.po b/l10n/de/lib.po
index c2a625b076..b43e2799fd 100644
--- a/l10n/de/lib.po
+++ b/l10n/de/lib.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-09-01 02:01+0200\n"
-"PO-Revision-Date: 2012-09-01 00:02+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-01 13:35+0200\n"
+"PO-Revision-Date: 2012-09-01 08: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"
@@ -117,12 +117,12 @@ msgstr "Vor Jahren"
 #: updater.php:66
 #, php-format
 msgid "%s is available. Get <a href=\"%s\">more information</a>"
-msgstr ""
+msgstr "%s ist verfügbar. <a href=\"%s\">Weitere Informationen</a>"
 
 #: updater.php:68
 msgid "up to date"
-msgstr ""
+msgstr "aktuell"
 
 #: updater.php:71
 msgid "updates check is disabled"
-msgstr ""
+msgstr "Die Update-Überprüfung ist ausgeschaltet"
diff --git a/l10n/de/settings.po b/l10n/de/settings.po
index df25c0b715..a0b92971b1 100644
--- a/l10n/de/settings.po
+++ b/l10n/de/settings.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-09-01 02:01+0200\n"
-"PO-Revision-Date: 2012-08-31 07:39+0000\n"
-"Last-Translator: JamFX <niko@nik-o-mat.de>\n"
+"POT-Creation-Date: 2012-09-01 13:35+0200\n"
+"PO-Revision-Date: 2012-09-01 11:35+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,66 +78,85 @@ msgstr "Deutsch"
 msgid "Security Warning"
 msgstr "Sicherheitshinweis"
 
-#: templates/admin.php:29
+#: templates/admin.php:17
+msgid ""
+"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."
+msgstr ""
+
+#: templates/admin.php:31
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:31
+#: templates/admin.php:33
 msgid "execute one task with each page loaded"
 msgstr "Führe eine Aufgabe pro geladener Seite aus."
 
-#: templates/admin.php:33
+#: templates/admin.php:35
 msgid "cron.php is registered at a webcron service"
 msgstr "cron.php ist beim Webcron-Service registriert"
 
-#: templates/admin.php:35
+#: templates/admin.php:37
 msgid "use systems cron service"
 msgstr "Nutze System-Cron-Service"
 
-#: templates/admin.php:39
+#: templates/admin.php:41
 msgid "Share API"
 msgstr "Teilungs-API"
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Enable Share API"
 msgstr "Teilungs-API aktivieren"
 
-#: templates/admin.php:45
+#: templates/admin.php:47
 msgid "Allow apps to use the Share API"
 msgstr "Erlaubt Nutzern die Teilungs-API zu nutzen"
 
-#: templates/admin.php:49
+#: templates/admin.php:51
 msgid "Allow links"
 msgstr "Links erlauben"
 
-#: templates/admin.php:50
+#: templates/admin.php:52
 msgid "Allow users to share items to the public with links"
 msgstr "Erlaube Nutzern Dateien mithilfe von Links mit der Öffentlichkeit zu teilen"
 
-#: templates/admin.php:54
+#: templates/admin.php:56
 msgid "Allow resharing"
 msgstr "Erneutes Teilen erlauben"
 
-#: templates/admin.php:55
+#: templates/admin.php:57
 msgid "Allow users to share items shared with them again"
 msgstr "Erlaubt Nutzern, Dateien die mit ihnen geteilt wurden, erneut zu teilen"
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Allow users to share with anyone"
 msgstr "Erlaube Nutzern mit jedem zu Teilen"
 
-#: templates/admin.php:60
+#: templates/admin.php:62
 msgid "Allow users to only share with users in their groups"
 msgstr "Erlaube Nutzern nur das Teilen in ihrer Gruppe"
 
-#: templates/admin.php:67
+#: templates/admin.php:69
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:95
+#: templates/admin.php:97
 msgid "More"
 msgstr "Mehr"
 
+#: templates/admin.php:105
+msgid ""
+"Developed by the <a href=\"http://ownCloud.org/contact\" "
+"target=\"_blank\">ownCloud community</a>, the <a "
+"href=\"https://github.com/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>."
+msgstr ""
+
 #: templates/apps.php:10
 msgid "Add your App"
 msgstr "Fügen Sie Ihre App hinzu"
diff --git a/l10n/el/files_versions.po b/l10n/el/files_versions.po
index 134edc89db..df855bfec1 100644
--- a/l10n/el/files_versions.po
+++ b/l10n/el/files_versions.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-24 02:02+0200\n"
-"PO-Revision-Date: 2012-08-23 18:26+0000\n"
-"Last-Translator: Nisok Kosin <nikos.efthimiou@gmail.com>\n"
+"POT-Creation-Date: 2012-09-01 13:35+0200\n"
+"PO-Revision-Date: 2012-09-01 11:35+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"
@@ -18,10 +18,18 @@ msgstr ""
 "Language: el\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: js/settings-personal.js:31
+#: js/settings-personal.js:31 templates/settings-personal.php:10
 msgid "Expire all versions"
 msgstr "Λήξη όλων των εκδόσεων"
 
+#: templates/settings-personal.php:4
+msgid "Versions"
+msgstr ""
+
+#: templates/settings-personal.php:7
+msgid "This will delete all existing backup versions of your files"
+msgstr ""
+
 #: templates/settings.php:3
 msgid "Enable Files Versioning"
 msgstr "Ενεργοποίηση παρακολούθησης εκδόσεων αρχείων"
diff --git a/l10n/el/settings.po b/l10n/el/settings.po
index 9ecb275bd7..4953e4d355 100644
--- a/l10n/el/settings.po
+++ b/l10n/el/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-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-01 13:35+0200\n"
+"PO-Revision-Date: 2012-09-01 11:35+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"
@@ -76,66 +76,85 @@ msgstr "__όνομα_γλώσσας__"
 msgid "Security Warning"
 msgstr "Προειδοποίηση Ασφαλείας"
 
-#: templates/admin.php:29
+#: templates/admin.php:17
+msgid ""
+"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."
+msgstr ""
+
+#: templates/admin.php:31
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:31
+#: templates/admin.php:33
 msgid "execute one task with each page loaded"
 msgstr "Εκτέλεση μίας εργασίας με κάθε σελίδα που φορτώνεται"
 
-#: templates/admin.php:33
+#: templates/admin.php:35
 msgid "cron.php is registered at a webcron service"
 msgstr "Το cron.php έχει καταχωρηθεί σε μια webcron υπηρεσία"
 
-#: templates/admin.php:35
+#: templates/admin.php:37
 msgid "use systems cron service"
 msgstr "Χρήση της υπηρεσίας cron του συστήματος"
 
-#: templates/admin.php:39
+#: templates/admin.php:41
 msgid "Share API"
 msgstr ""
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:45
+#: templates/admin.php:47
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:49
+#: templates/admin.php:51
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:50
+#: templates/admin.php:52
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:54
+#: templates/admin.php:56
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:55
+#: templates/admin.php:57
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:62
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:67
+#: templates/admin.php:69
 msgid "Log"
 msgstr "Αρχείο καταγραφής"
 
-#: templates/admin.php:95
+#: templates/admin.php:97
 msgid "More"
 msgstr "Περισσότερο"
 
+#: templates/admin.php:105
+msgid ""
+"Developed by the <a href=\"http://ownCloud.org/contact\" "
+"target=\"_blank\">ownCloud community</a>, the <a "
+"href=\"https://github.com/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>."
+msgstr ""
+
 #: templates/apps.php:10
 msgid "Add your App"
 msgstr "Πρόσθεσε τη δικιά σου εφαρμογή "
diff --git a/l10n/eo/files_versions.po b/l10n/eo/files_versions.po
index 23851036ea..d9e4f78ec1 100644
--- a/l10n/eo/files_versions.po
+++ b/l10n/eo/files_versions.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 20:20+0000\n"
-"Last-Translator: Mariano <mstreet@kde.org.ar>\n"
+"POT-Creation-Date: 2012-09-01 13:35+0200\n"
+"PO-Revision-Date: 2012-09-01 11:35+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,10 +18,18 @@ msgstr ""
 "Language: eo\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: js/settings-personal.js:31
+#: js/settings-personal.js:31 templates/settings-personal.php:10
 msgid "Expire all versions"
 msgstr "Eksvalidigi ĉiujn eldonojn"
 
+#: templates/settings-personal.php:4
+msgid "Versions"
+msgstr ""
+
+#: templates/settings-personal.php:7
+msgid "This will delete all existing backup versions of your files"
+msgstr ""
+
 #: templates/settings.php:3
 msgid "Enable Files Versioning"
 msgstr "Kapabligi dosiereldonkontrolon"
diff --git a/l10n/eo/settings.po b/l10n/eo/settings.po
index 776ade3f9e..745ce72a47 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-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-01 13:35+0200\n"
+"PO-Revision-Date: 2012-09-01 11:35+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"
@@ -71,66 +71,85 @@ msgstr "Esperanto"
 msgid "Security Warning"
 msgstr "Sekureca averto"
 
-#: templates/admin.php:29
+#: templates/admin.php:17
+msgid ""
+"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."
+msgstr ""
+
+#: templates/admin.php:31
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:31
+#: templates/admin.php:33
 msgid "execute one task with each page loaded"
 msgstr "lanĉi unu taskon po ĉiu paĝo ŝargita"
 
-#: templates/admin.php:33
+#: templates/admin.php:35
 msgid "cron.php is registered at a webcron service"
 msgstr "cron.php estas registrita kiel webcron-servilo"
 
-#: templates/admin.php:35
+#: templates/admin.php:37
 msgid "use systems cron service"
 msgstr "uzi la cron-servon de la sistemo"
 
-#: templates/admin.php:39
+#: templates/admin.php:41
 msgid "Share API"
 msgstr ""
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:45
+#: templates/admin.php:47
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:49
+#: templates/admin.php:51
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:50
+#: templates/admin.php:52
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:54
+#: templates/admin.php:56
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:55
+#: templates/admin.php:57
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:62
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:67
+#: templates/admin.php:69
 msgid "Log"
 msgstr "Protokolo"
 
-#: templates/admin.php:95
+#: templates/admin.php:97
 msgid "More"
 msgstr "Pli"
 
+#: templates/admin.php:105
+msgid ""
+"Developed by the <a href=\"http://ownCloud.org/contact\" "
+"target=\"_blank\">ownCloud community</a>, the <a "
+"href=\"https://github.com/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>."
+msgstr ""
+
 #: templates/apps.php:10
 msgid "Add your App"
 msgstr "Aldonu vian aplikaĵon"
diff --git a/l10n/es/files_versions.po b/l10n/es/files_versions.po
index 544b3a53b0..0f7858a3de 100644
--- a/l10n/es/files_versions.po
+++ b/l10n/es/files_versions.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-28 02:01+0200\n"
-"PO-Revision-Date: 2012-08-27 05:54+0000\n"
-"Last-Translator: juanman <juanma@kde.org.ar>\n"
+"POT-Creation-Date: 2012-09-01 13:35+0200\n"
+"PO-Revision-Date: 2012-09-01 11:35+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"
@@ -19,10 +19,18 @@ msgstr ""
 "Language: es\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: js/settings-personal.js:31
+#: js/settings-personal.js:31 templates/settings-personal.php:10
 msgid "Expire all versions"
 msgstr "Expirar todas las versiones"
 
+#: templates/settings-personal.php:4
+msgid "Versions"
+msgstr ""
+
+#: templates/settings-personal.php:7
+msgid "This will delete all existing backup versions of your files"
+msgstr ""
+
 #: templates/settings.php:3
 msgid "Enable Files Versioning"
 msgstr "Habilitar versionamiento de archivos"
diff --git a/l10n/es/settings.po b/l10n/es/settings.po
index 128b7d82b4..a55e35b124 100644
--- a/l10n/es/settings.po
+++ b/l10n/es/settings.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-09-01 02:01+0200\n"
-"PO-Revision-Date: 2012-08-31 22:51+0000\n"
-"Last-Translator: Rubén Trujillo <rubentrf@gmail.com>\n"
+"POT-Creation-Date: 2012-09-01 13:35+0200\n"
+"PO-Revision-Date: 2012-09-01 11:35+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"
@@ -78,66 +78,85 @@ msgstr "Castellano"
 msgid "Security Warning"
 msgstr "Advertencia de seguridad"
 
-#: templates/admin.php:29
+#: templates/admin.php:17
+msgid ""
+"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."
+msgstr ""
+
+#: templates/admin.php:31
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:31
+#: templates/admin.php:33
 msgid "execute one task with each page loaded"
 msgstr "ejecutar una tarea con cada página cargada"
 
-#: templates/admin.php:33
+#: templates/admin.php:35
 msgid "cron.php is registered at a webcron service"
 msgstr "cron.php se registra en un servicio webcron"
 
-#: templates/admin.php:35
+#: templates/admin.php:37
 msgid "use systems cron service"
 msgstr "usar servicio cron del sistema"
 
-#: templates/admin.php:39
+#: templates/admin.php:41
 msgid "Share API"
 msgstr "API de compartición"
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Enable Share API"
 msgstr "Activar API de compartición"
 
-#: templates/admin.php:45
+#: templates/admin.php:47
 msgid "Allow apps to use the Share API"
 msgstr "Permitir a las aplicaciones usar la API de compartición"
 
-#: templates/admin.php:49
+#: templates/admin.php:51
 msgid "Allow links"
 msgstr "Permitir enlaces"
 
-#: templates/admin.php:50
+#: templates/admin.php:52
 msgid "Allow users to share items to the public with links"
 msgstr "Permitir a los usuarios compartir elementos públicamente con enlaces"
 
-#: templates/admin.php:54
+#: templates/admin.php:56
 msgid "Allow resharing"
 msgstr "Permitir re-compartir"
 
-#: templates/admin.php:55
+#: templates/admin.php:57
 msgid "Allow users to share items shared with them again"
 msgstr "Permitir a los usuarios compartir elementos compartidos con ellos de nuevo"
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Allow users to share with anyone"
 msgstr "Permitir a los usuarios compartir con cualquiera"
 
-#: templates/admin.php:60
+#: templates/admin.php:62
 msgid "Allow users to only share with users in their groups"
 msgstr "Permitir a los usuarios compartir con usuarios en sus grupos"
 
-#: templates/admin.php:67
+#: templates/admin.php:69
 msgid "Log"
 msgstr "Registro"
 
-#: templates/admin.php:95
+#: templates/admin.php:97
 msgid "More"
 msgstr "Más"
 
+#: templates/admin.php:105
+msgid ""
+"Developed by the <a href=\"http://ownCloud.org/contact\" "
+"target=\"_blank\">ownCloud community</a>, the <a "
+"href=\"https://github.com/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>."
+msgstr ""
+
 #: templates/apps.php:10
 msgid "Add your App"
 msgstr "Añade tu aplicación"
diff --git a/l10n/et_EE/files_versions.po b/l10n/et_EE/files_versions.po
index fd569f5b70..afd1bc89da 100644
--- a/l10n/et_EE/files_versions.po
+++ b/l10n/et_EE/files_versions.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-09-01 13:35+0200\n"
+"PO-Revision-Date: 2012-09-01 11:35+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,10 +18,18 @@ msgstr ""
 "Language: et_EE\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: js/settings-personal.js:31
+#: js/settings-personal.js:31 templates/settings-personal.php:10
 msgid "Expire all versions"
 msgstr "Kõikide versioonide aegumine"
 
+#: templates/settings-personal.php:4
+msgid "Versions"
+msgstr ""
+
+#: templates/settings-personal.php:7
+msgid "This will delete all existing backup versions of your files"
+msgstr ""
+
 #: templates/settings.php:3
 msgid "Enable Files Versioning"
 msgstr "Luba failide versioonihaldus"
diff --git a/l10n/et_EE/settings.po b/l10n/et_EE/settings.po
index e0a595aa1a..259a824537 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-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-01 13:35+0200\n"
+"PO-Revision-Date: 2012-09-01 11:35+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"
@@ -71,66 +71,85 @@ msgstr "Eesti"
 msgid "Security Warning"
 msgstr "Turvahoiatus"
 
-#: templates/admin.php:29
+#: templates/admin.php:17
+msgid ""
+"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."
+msgstr ""
+
+#: templates/admin.php:31
 msgid "Cron"
 msgstr "Ajastatud töö"
 
-#: templates/admin.php:31
+#: templates/admin.php:33
 msgid "execute one task with each page loaded"
 msgstr "käivita iga laetud lehe juures üks ülesanne"
 
-#: templates/admin.php:33
+#: templates/admin.php:35
 msgid "cron.php is registered at a webcron service"
 msgstr "cron.php on webcron teenuses registreeritud"
 
-#: templates/admin.php:35
+#: templates/admin.php:37
 msgid "use systems cron service"
 msgstr "kasuta süsteemide cron teenuseid"
 
-#: templates/admin.php:39
+#: templates/admin.php:41
 msgid "Share API"
 msgstr ""
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:45
+#: templates/admin.php:47
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:49
+#: templates/admin.php:51
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:50
+#: templates/admin.php:52
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:54
+#: templates/admin.php:56
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:55
+#: templates/admin.php:57
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:62
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:67
+#: templates/admin.php:69
 msgid "Log"
 msgstr "Logi"
 
-#: templates/admin.php:95
+#: templates/admin.php:97
 msgid "More"
 msgstr "Veel"
 
+#: templates/admin.php:105
+msgid ""
+"Developed by the <a href=\"http://ownCloud.org/contact\" "
+"target=\"_blank\">ownCloud community</a>, the <a "
+"href=\"https://github.com/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>."
+msgstr ""
+
 #: templates/apps.php:10
 msgid "Add your App"
 msgstr "Lisa oma rakendus"
diff --git a/l10n/eu/files_versions.po b/l10n/eu/files_versions.po
index 3279db24a3..357b26164d 100644
--- a/l10n/eu/files_versions.po
+++ b/l10n/eu/files_versions.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-28 02:01+0200\n"
-"PO-Revision-Date: 2012-08-27 08:55+0000\n"
-"Last-Translator: asieriko <asieriko@gmail.com>\n"
+"POT-Creation-Date: 2012-09-01 13:35+0200\n"
+"PO-Revision-Date: 2012-09-01 11:35+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"
@@ -18,10 +18,18 @@ msgstr ""
 "Language: eu\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: js/settings-personal.js:31
+#: js/settings-personal.js:31 templates/settings-personal.php:10
 msgid "Expire all versions"
 msgstr "Iraungi bertsio guztiak"
 
+#: templates/settings-personal.php:4
+msgid "Versions"
+msgstr ""
+
+#: templates/settings-personal.php:7
+msgid "This will delete all existing backup versions of your files"
+msgstr ""
+
 #: templates/settings.php:3
 msgid "Enable Files Versioning"
 msgstr "Gaitu fitxategien bertsioak"
diff --git a/l10n/eu/settings.po b/l10n/eu/settings.po
index bf2a28693e..f069773c1d 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-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-01 13:35+0200\n"
+"PO-Revision-Date: 2012-09-01 11:35+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"
@@ -72,66 +72,85 @@ msgstr "Euskera"
 msgid "Security Warning"
 msgstr "Segurtasun abisua"
 
-#: templates/admin.php:29
+#: templates/admin.php:17
+msgid ""
+"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."
+msgstr ""
+
+#: templates/admin.php:31
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:31
+#: templates/admin.php:33
 msgid "execute one task with each page loaded"
 msgstr "exekutatu zeregina orri karga bakoitzean"
 
-#: templates/admin.php:33
+#: templates/admin.php:35
 msgid "cron.php is registered at a webcron service"
 msgstr "cron.php webcron zerbitzu batean erregistratuta dago"
 
-#: templates/admin.php:35
+#: templates/admin.php:37
 msgid "use systems cron service"
 msgstr "erabili sistemaren cron zerbitzua"
 
-#: templates/admin.php:39
+#: templates/admin.php:41
 msgid "Share API"
 msgstr ""
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:45
+#: templates/admin.php:47
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:49
+#: templates/admin.php:51
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:50
+#: templates/admin.php:52
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:54
+#: templates/admin.php:56
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:55
+#: templates/admin.php:57
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:62
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:67
+#: templates/admin.php:69
 msgid "Log"
 msgstr "Egunkaria"
 
-#: templates/admin.php:95
+#: templates/admin.php:97
 msgid "More"
 msgstr "Gehiago"
 
+#: templates/admin.php:105
+msgid ""
+"Developed by the <a href=\"http://ownCloud.org/contact\" "
+"target=\"_blank\">ownCloud community</a>, the <a "
+"href=\"https://github.com/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>."
+msgstr ""
+
 #: templates/apps.php:10
 msgid "Add your App"
 msgstr "Gehitu zure aplikazioa"
diff --git a/l10n/eu_ES/files_versions.po b/l10n/eu_ES/files_versions.po
index e27dd7812a..cf5651aa22 100644
--- a/l10n/eu_ES/files_versions.po
+++ b/l10n/eu_ES/files_versions.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:37+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-09-01 13:35+0200\n"
+"PO-Revision-Date: 2012-09-01 11:35+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,10 +17,18 @@ msgstr ""
 "Language: eu_ES\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: js/settings-personal.js:31
+#: js/settings-personal.js:31 templates/settings-personal.php:10
 msgid "Expire all versions"
 msgstr ""
 
+#: templates/settings-personal.php:4
+msgid "Versions"
+msgstr ""
+
+#: templates/settings-personal.php:7
+msgid "This will delete all existing backup versions of your files"
+msgstr ""
+
 #: templates/settings.php:3
 msgid "Enable Files Versioning"
 msgstr ""
diff --git a/l10n/eu_ES/settings.po b/l10n/eu_ES/settings.po
index 1b7b2386fa..f3e0319075 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-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-01 13:35+0200\n"
+"PO-Revision-Date: 2012-09-01 11:35+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"
@@ -69,66 +69,85 @@ msgstr ""
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:29
-msgid "Cron"
+#: templates/admin.php:17
+msgid ""
+"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."
 msgstr ""
 
 #: templates/admin.php:31
-msgid "execute one task with each page loaded"
+msgid "Cron"
 msgstr ""
 
 #: templates/admin.php:33
-msgid "cron.php is registered at a webcron service"
+msgid "execute one task with each page loaded"
 msgstr ""
 
 #: templates/admin.php:35
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:37
 msgid "use systems cron service"
 msgstr ""
 
-#: templates/admin.php:39
+#: templates/admin.php:41
 msgid "Share API"
 msgstr ""
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:45
+#: templates/admin.php:47
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:49
+#: templates/admin.php:51
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:50
+#: templates/admin.php:52
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:54
+#: templates/admin.php:56
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:55
+#: templates/admin.php:57
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:62
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:67
+#: templates/admin.php:69
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:95
+#: templates/admin.php:97
 msgid "More"
 msgstr ""
 
+#: templates/admin.php:105
+msgid ""
+"Developed by the <a href=\"http://ownCloud.org/contact\" "
+"target=\"_blank\">ownCloud community</a>, the <a "
+"href=\"https://github.com/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>."
+msgstr ""
+
 #: templates/apps.php:10
 msgid "Add your App"
 msgstr ""
diff --git a/l10n/fa/files_versions.po b/l10n/fa/files_versions.po
index 10bdb92792..012dceedd1 100644
--- a/l10n/fa/files_versions.po
+++ b/l10n/fa/files_versions.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-24 02:02+0200\n"
-"PO-Revision-Date: 2012-08-23 20:14+0000\n"
-"Last-Translator: Mohammad Dashtizadeh <mohammad@dashtizadeh.net>\n"
+"POT-Creation-Date: 2012-09-01 13:35+0200\n"
+"PO-Revision-Date: 2012-09-01 11:35+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"
@@ -18,10 +18,18 @@ msgstr ""
 "Language: fa\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: js/settings-personal.js:31
+#: js/settings-personal.js:31 templates/settings-personal.php:10
 msgid "Expire all versions"
 msgstr "انقضای تمامی نسخه‌ها"
 
+#: templates/settings-personal.php:4
+msgid "Versions"
+msgstr ""
+
+#: templates/settings-personal.php:7
+msgid "This will delete all existing backup versions of your files"
+msgstr ""
+
 #: templates/settings.php:3
 msgid "Enable Files Versioning"
 msgstr "فعال‌کردن پرونده‌های نسخه‌بندی"
diff --git a/l10n/fa/settings.po b/l10n/fa/settings.po
index 639ac0d539..d585c8edf8 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-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-01 13:35+0200\n"
+"PO-Revision-Date: 2012-09-01 11:35+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"
@@ -71,66 +71,85 @@ msgstr "__language_name__"
 msgid "Security Warning"
 msgstr "اخطار امنیتی"
 
-#: templates/admin.php:29
-msgid "Cron"
+#: templates/admin.php:17
+msgid ""
+"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."
 msgstr ""
 
 #: templates/admin.php:31
-msgid "execute one task with each page loaded"
+msgid "Cron"
 msgstr ""
 
 #: templates/admin.php:33
-msgid "cron.php is registered at a webcron service"
+msgid "execute one task with each page loaded"
 msgstr ""
 
 #: templates/admin.php:35
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:37
 msgid "use systems cron service"
 msgstr ""
 
-#: templates/admin.php:39
+#: templates/admin.php:41
 msgid "Share API"
 msgstr ""
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:45
+#: templates/admin.php:47
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:49
+#: templates/admin.php:51
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:50
+#: templates/admin.php:52
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:54
+#: templates/admin.php:56
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:55
+#: templates/admin.php:57
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:62
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:67
+#: templates/admin.php:69
 msgid "Log"
 msgstr "کارنامه"
 
-#: templates/admin.php:95
+#: templates/admin.php:97
 msgid "More"
 msgstr "بیشتر"
 
+#: templates/admin.php:105
+msgid ""
+"Developed by the <a href=\"http://ownCloud.org/contact\" "
+"target=\"_blank\">ownCloud community</a>, the <a "
+"href=\"https://github.com/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>."
+msgstr ""
+
 #: templates/apps.php:10
 msgid "Add your App"
 msgstr "برنامه خود را بیافزایید"
diff --git a/l10n/fi/files_versions.po b/l10n/fi/files_versions.po
index 89bfb8144e..cd80c0a486 100644
--- a/l10n/fi/files_versions.po
+++ b/l10n/fi/files_versions.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:37+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-09-01 13:35+0200\n"
+"PO-Revision-Date: 2012-09-01 11:35+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,10 +17,18 @@ msgstr ""
 "Language: fi\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: js/settings-personal.js:31
+#: js/settings-personal.js:31 templates/settings-personal.php:10
 msgid "Expire all versions"
 msgstr ""
 
+#: templates/settings-personal.php:4
+msgid "Versions"
+msgstr ""
+
+#: templates/settings-personal.php:7
+msgid "This will delete all existing backup versions of your files"
+msgstr ""
+
 #: templates/settings.php:3
 msgid "Enable Files Versioning"
 msgstr ""
diff --git a/l10n/fi/settings.po b/l10n/fi/settings.po
index 6b51b7912a..47ea71f72a 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-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-01 13:35+0200\n"
+"PO-Revision-Date: 2012-09-01 11:35+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"
@@ -69,66 +69,85 @@ msgstr ""
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:29
-msgid "Cron"
+#: templates/admin.php:17
+msgid ""
+"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."
 msgstr ""
 
 #: templates/admin.php:31
-msgid "execute one task with each page loaded"
+msgid "Cron"
 msgstr ""
 
 #: templates/admin.php:33
-msgid "cron.php is registered at a webcron service"
+msgid "execute one task with each page loaded"
 msgstr ""
 
 #: templates/admin.php:35
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:37
 msgid "use systems cron service"
 msgstr ""
 
-#: templates/admin.php:39
+#: templates/admin.php:41
 msgid "Share API"
 msgstr ""
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:45
+#: templates/admin.php:47
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:49
+#: templates/admin.php:51
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:50
+#: templates/admin.php:52
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:54
+#: templates/admin.php:56
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:55
+#: templates/admin.php:57
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:62
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:67
+#: templates/admin.php:69
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:95
+#: templates/admin.php:97
 msgid "More"
 msgstr ""
 
+#: templates/admin.php:105
+msgid ""
+"Developed by the <a href=\"http://ownCloud.org/contact\" "
+"target=\"_blank\">ownCloud community</a>, the <a "
+"href=\"https://github.com/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>."
+msgstr ""
+
 #: templates/apps.php:10
 msgid "Add your App"
 msgstr ""
diff --git a/l10n/fi_FI/files.po b/l10n/fi_FI/files.po
index 1faa1deb75..d9cca99c90 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-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-01 13:35+0200\n"
+"PO-Revision-Date: 2012-09-01 10:00+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"
@@ -110,7 +110,7 @@ msgstr "Lähetys peruttu."
 #: js/files.js:409
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
-msgstr ""
+msgstr "Tiedoston lähetys on meneillään. Sivulta poistuminen nyt peruu tiedoston lähetyksen."
 
 #: js/files.js:480
 msgid "Invalid name, '/' is not allowed."
diff --git a/l10n/fi_FI/files_versions.po b/l10n/fi_FI/files_versions.po
index c4bdbdc582..f5badf4ae7 100644
--- a/l10n/fi_FI/files_versions.po
+++ b/l10n/fi_FI/files_versions.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-09-01 13:35+0200\n"
+"PO-Revision-Date: 2012-09-01 11:35+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,10 +18,18 @@ msgstr ""
 "Language: fi_FI\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: js/settings-personal.js:31
+#: js/settings-personal.js:31 templates/settings-personal.php:10
 msgid "Expire all versions"
 msgstr "Vanhenna kaikki versiot"
 
+#: templates/settings-personal.php:4
+msgid "Versions"
+msgstr ""
+
+#: templates/settings-personal.php:7
+msgid "This will delete all existing backup versions of your files"
+msgstr ""
+
 #: templates/settings.php:3
 msgid "Enable Files Versioning"
 msgstr "Käytä tiedostojen versiointia"
diff --git a/l10n/fi_FI/lib.po b/l10n/fi_FI/lib.po
index 4306f98338..961500dae1 100644
--- a/l10n/fi_FI/lib.po
+++ b/l10n/fi_FI/lib.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-09-01 02:01+0200\n"
-"PO-Revision-Date: 2012-09-01 00:02+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-01 13:35+0200\n"
+"PO-Revision-Date: 2012-09-01 10: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"
@@ -115,12 +115,12 @@ msgstr "vuotta sitten"
 #: updater.php:66
 #, php-format
 msgid "%s is available. Get <a href=\"%s\">more information</a>"
-msgstr ""
+msgstr "%s on saatavilla. Lue <a href=\"%s\">lisätietoja</a>"
 
 #: updater.php:68
 msgid "up to date"
-msgstr ""
+msgstr "ajan tasalla"
 
 #: updater.php:71
 msgid "updates check is disabled"
-msgstr ""
+msgstr "päivitysten tarkistus on pois käytöstä"
diff --git a/l10n/fi_FI/settings.po b/l10n/fi_FI/settings.po
index 5423bc6e94..98c69430bb 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-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-01 13:35+0200\n"
+"PO-Revision-Date: 2012-09-01 11:35+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"
@@ -71,66 +71,85 @@ msgstr "_kielen_nimi_"
 msgid "Security Warning"
 msgstr "Turvallisuusvaroitus"
 
-#: templates/admin.php:29
+#: templates/admin.php:17
+msgid ""
+"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."
+msgstr ""
+
+#: templates/admin.php:31
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:31
+#: templates/admin.php:33
 msgid "execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:33
+#: templates/admin.php:35
 msgid "cron.php is registered at a webcron service"
 msgstr ""
 
-#: templates/admin.php:35
+#: templates/admin.php:37
 msgid "use systems cron service"
 msgstr "käytä järjestelmän cron-palvelua"
 
-#: templates/admin.php:39
+#: templates/admin.php:41
 msgid "Share API"
 msgstr ""
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:45
+#: templates/admin.php:47
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:49
+#: templates/admin.php:51
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:50
+#: templates/admin.php:52
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:54
+#: templates/admin.php:56
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:55
+#: templates/admin.php:57
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:62
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:67
+#: templates/admin.php:69
 msgid "Log"
 msgstr "Loki"
 
-#: templates/admin.php:95
+#: templates/admin.php:97
 msgid "More"
 msgstr "Lisää"
 
+#: templates/admin.php:105
+msgid ""
+"Developed by the <a href=\"http://ownCloud.org/contact\" "
+"target=\"_blank\">ownCloud community</a>, the <a "
+"href=\"https://github.com/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>."
+msgstr ""
+
 #: templates/apps.php:10
 msgid "Add your App"
 msgstr "Lisää ohjelmasi"
diff --git a/l10n/fr/files_versions.po b/l10n/fr/files_versions.po
index 74b1426e8c..0a1701812e 100644
--- a/l10n/fr/files_versions.po
+++ b/l10n/fr/files_versions.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:49+0000\n"
-"Last-Translator: Romain DEP. <rom1dep@gmail.com>\n"
+"POT-Creation-Date: 2012-09-01 13:35+0200\n"
+"PO-Revision-Date: 2012-09-01 11:35+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,10 +18,18 @@ msgstr ""
 "Language: fr\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
-#: js/settings-personal.js:31
+#: js/settings-personal.js:31 templates/settings-personal.php:10
 msgid "Expire all versions"
 msgstr "Supprimer les versions intermédiaires"
 
+#: templates/settings-personal.php:4
+msgid "Versions"
+msgstr ""
+
+#: templates/settings-personal.php:7
+msgid "This will delete all existing backup versions of your files"
+msgstr ""
+
 #: templates/settings.php:3
 msgid "Enable Files Versioning"
 msgstr "Activer le versionnage"
diff --git a/l10n/fr/settings.po b/l10n/fr/settings.po
index 2cde4d6103..542a7ea0b0 100644
--- a/l10n/fr/settings.po
+++ b/l10n/fr/settings.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-09-01 02:01+0200\n"
-"PO-Revision-Date: 2012-08-31 18:08+0000\n"
-"Last-Translator: Florentin Le Moal <florentin.lemoal@gmail.com>\n"
+"POT-Creation-Date: 2012-09-01 13:35+0200\n"
+"PO-Revision-Date: 2012-09-01 11:35+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,66 +79,85 @@ msgstr "Français"
 msgid "Security Warning"
 msgstr "Alertes de sécurité"
 
-#: templates/admin.php:29
+#: templates/admin.php:17
+msgid ""
+"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."
+msgstr ""
+
+#: templates/admin.php:31
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:31
+#: templates/admin.php:33
 msgid "execute one task with each page loaded"
 msgstr "exécuter une tâche pour chaque page chargée"
 
-#: templates/admin.php:33
+#: templates/admin.php:35
 msgid "cron.php is registered at a webcron service"
 msgstr "cron.php est enregistré comme un service webcron"
 
-#: templates/admin.php:35
+#: templates/admin.php:37
 msgid "use systems cron service"
 msgstr "utiliser le service cron du système "
 
-#: templates/admin.php:39
+#: templates/admin.php:41
 msgid "Share API"
 msgstr "API de partage"
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Enable Share API"
 msgstr "Activer l'API de partage"
 
-#: templates/admin.php:45
+#: templates/admin.php:47
 msgid "Allow apps to use the Share API"
 msgstr "Autoriser les applications à utiliser l'API de partage"
 
-#: templates/admin.php:49
+#: templates/admin.php:51
 msgid "Allow links"
 msgstr "Autoriser les liens"
 
-#: templates/admin.php:50
+#: templates/admin.php:52
 msgid "Allow users to share items to the public with links"
 msgstr "Autoriser les utilisateurs à partager du contenu public avec des liens"
 
-#: templates/admin.php:54
+#: templates/admin.php:56
 msgid "Allow resharing"
 msgstr "Autoriser le re-partage"
 
-#: templates/admin.php:55
+#: templates/admin.php:57
 msgid "Allow users to share items shared with them again"
 msgstr "Autoriser les utilisateurs à partager des éléments déjà partagés entre eux"
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Allow users to share with anyone"
 msgstr "Autoriser les utilisateurs à partager avec tout le monde"
 
-#: templates/admin.php:60
+#: templates/admin.php:62
 msgid "Allow users to only share with users in their groups"
 msgstr "Autoriser les utilisateurs à ne partager qu'avec les utilisateurs dans leurs groupes"
 
-#: templates/admin.php:67
+#: templates/admin.php:69
 msgid "Log"
 msgstr "Journaux"
 
-#: templates/admin.php:95
+#: templates/admin.php:97
 msgid "More"
 msgstr "Plus"
 
+#: templates/admin.php:105
+msgid ""
+"Developed by the <a href=\"http://ownCloud.org/contact\" "
+"target=\"_blank\">ownCloud community</a>, the <a "
+"href=\"https://github.com/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>."
+msgstr ""
+
 #: templates/apps.php:10
 msgid "Add your App"
 msgstr "Ajoutez votre application"
diff --git a/l10n/gl/files_versions.po b/l10n/gl/files_versions.po
index 7c68c81752..035f808024 100644
--- a/l10n/gl/files_versions.po
+++ b/l10n/gl/files_versions.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:37+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-09-01 13:35+0200\n"
+"PO-Revision-Date: 2012-09-01 11:35+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,10 +17,18 @@ msgstr ""
 "Language: gl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: js/settings-personal.js:31
+#: js/settings-personal.js:31 templates/settings-personal.php:10
 msgid "Expire all versions"
 msgstr ""
 
+#: templates/settings-personal.php:4
+msgid "Versions"
+msgstr ""
+
+#: templates/settings-personal.php:7
+msgid "This will delete all existing backup versions of your files"
+msgstr ""
+
 #: templates/settings.php:3
 msgid "Enable Files Versioning"
 msgstr ""
diff --git a/l10n/gl/settings.po b/l10n/gl/settings.po
index cd8e1f47a9..b66625e6ad 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-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-01 13:35+0200\n"
+"PO-Revision-Date: 2012-09-01 11:35+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"
@@ -71,66 +71,85 @@ msgstr "Galego"
 msgid "Security Warning"
 msgstr "Aviso de seguridade"
 
-#: templates/admin.php:29
+#: templates/admin.php:17
+msgid ""
+"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."
+msgstr ""
+
+#: templates/admin.php:31
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:31
+#: templates/admin.php:33
 msgid "execute one task with each page loaded"
 msgstr "executar unha tarefa con cada páxina cargada"
 
-#: templates/admin.php:33
+#: templates/admin.php:35
 msgid "cron.php is registered at a webcron service"
 msgstr "cron.php está rexistrada como un servizo webcron"
 
-#: templates/admin.php:35
+#: templates/admin.php:37
 msgid "use systems cron service"
 msgstr "utilice o servizo cron do sistema"
 
-#: templates/admin.php:39
+#: templates/admin.php:41
 msgid "Share API"
 msgstr ""
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:45
+#: templates/admin.php:47
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:49
+#: templates/admin.php:51
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:50
+#: templates/admin.php:52
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:54
+#: templates/admin.php:56
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:55
+#: templates/admin.php:57
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:62
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:67
+#: templates/admin.php:69
 msgid "Log"
 msgstr "Conectar"
 
-#: templates/admin.php:95
+#: templates/admin.php:97
 msgid "More"
 msgstr "Máis"
 
+#: templates/admin.php:105
+msgid ""
+"Developed by the <a href=\"http://ownCloud.org/contact\" "
+"target=\"_blank\">ownCloud community</a>, the <a "
+"href=\"https://github.com/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>."
+msgstr ""
+
 #: templates/apps.php:10
 msgid "Add your App"
 msgstr "Engade o teu aplicativo"
diff --git a/l10n/he/files_versions.po b/l10n/he/files_versions.po
index 824d188bfd..bab655f32c 100644
--- a/l10n/he/files_versions.po
+++ b/l10n/he/files_versions.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:37+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-09-01 13:35+0200\n"
+"PO-Revision-Date: 2012-09-01 11:35+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,10 +17,18 @@ msgstr ""
 "Language: he\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: js/settings-personal.js:31
+#: js/settings-personal.js:31 templates/settings-personal.php:10
 msgid "Expire all versions"
 msgstr ""
 
+#: templates/settings-personal.php:4
+msgid "Versions"
+msgstr ""
+
+#: templates/settings-personal.php:7
+msgid "This will delete all existing backup versions of your files"
+msgstr ""
+
 #: templates/settings.php:3
 msgid "Enable Files Versioning"
 msgstr ""
diff --git a/l10n/he/settings.po b/l10n/he/settings.po
index faaab3bd66..93491b67a7 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-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-01 13:35+0200\n"
+"PO-Revision-Date: 2012-09-01 11:35+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"
@@ -72,66 +72,85 @@ msgstr "עברית"
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:29
-msgid "Cron"
+#: templates/admin.php:17
+msgid ""
+"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."
 msgstr ""
 
 #: templates/admin.php:31
-msgid "execute one task with each page loaded"
+msgid "Cron"
 msgstr ""
 
 #: templates/admin.php:33
-msgid "cron.php is registered at a webcron service"
+msgid "execute one task with each page loaded"
 msgstr ""
 
 #: templates/admin.php:35
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:37
 msgid "use systems cron service"
 msgstr ""
 
-#: templates/admin.php:39
+#: templates/admin.php:41
 msgid "Share API"
 msgstr ""
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:45
+#: templates/admin.php:47
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:49
+#: templates/admin.php:51
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:50
+#: templates/admin.php:52
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:54
+#: templates/admin.php:56
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:55
+#: templates/admin.php:57
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:62
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:67
+#: templates/admin.php:69
 msgid "Log"
 msgstr "יומן"
 
-#: templates/admin.php:95
+#: templates/admin.php:97
 msgid "More"
 msgstr "עוד"
 
+#: templates/admin.php:105
+msgid ""
+"Developed by the <a href=\"http://ownCloud.org/contact\" "
+"target=\"_blank\">ownCloud community</a>, the <a "
+"href=\"https://github.com/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>."
+msgstr ""
+
 #: templates/apps.php:10
 msgid "Add your App"
 msgstr "הוספת היישום שלך"
diff --git a/l10n/hi/files_versions.po b/l10n/hi/files_versions.po
index f35accb51d..c1e27c1c31 100644
--- a/l10n/hi/files_versions.po
+++ b/l10n/hi/files_versions.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-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-12 22:37+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-09-01 13:35+0200\n"
+"PO-Revision-Date: 2012-09-01 11:35+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,10 +17,18 @@ msgstr ""
 "Language: hi\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: js/settings-personal.js:31
+#: js/settings-personal.js:31 templates/settings-personal.php:10
 msgid "Expire all versions"
 msgstr ""
 
+#: templates/settings-personal.php:4
+msgid "Versions"
+msgstr ""
+
+#: templates/settings-personal.php:7
+msgid "This will delete all existing backup versions of your files"
+msgstr ""
+
 #: templates/settings.php:3
 msgid "Enable Files Versioning"
 msgstr ""
diff --git a/l10n/hi/settings.po b/l10n/hi/settings.po
index 967800015d..6868b2aab1 100644
--- a/l10n/hi/settings.po
+++ b/l10n/hi/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-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-01 13:35+0200\n"
+"PO-Revision-Date: 2012-09-01 11:35+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
 "MIME-Version: 1.0\n"
@@ -69,66 +69,85 @@ msgstr ""
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:29
-msgid "Cron"
+#: templates/admin.php:17
+msgid ""
+"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."
 msgstr ""
 
 #: templates/admin.php:31
-msgid "execute one task with each page loaded"
+msgid "Cron"
 msgstr ""
 
 #: templates/admin.php:33
-msgid "cron.php is registered at a webcron service"
+msgid "execute one task with each page loaded"
 msgstr ""
 
 #: templates/admin.php:35
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:37
 msgid "use systems cron service"
 msgstr ""
 
-#: templates/admin.php:39
+#: templates/admin.php:41
 msgid "Share API"
 msgstr ""
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:45
+#: templates/admin.php:47
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:49
+#: templates/admin.php:51
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:50
+#: templates/admin.php:52
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:54
+#: templates/admin.php:56
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:55
+#: templates/admin.php:57
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:62
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:67
+#: templates/admin.php:69
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:95
+#: templates/admin.php:97
 msgid "More"
 msgstr ""
 
+#: templates/admin.php:105
+msgid ""
+"Developed by the <a href=\"http://ownCloud.org/contact\" "
+"target=\"_blank\">ownCloud community</a>, the <a "
+"href=\"https://github.com/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>."
+msgstr ""
+
 #: templates/apps.php:10
 msgid "Add your App"
 msgstr ""
diff --git a/l10n/hr/files_versions.po b/l10n/hr/files_versions.po
index f49ed48608..46ae106827 100644
--- a/l10n/hr/files_versions.po
+++ b/l10n/hr/files_versions.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:37+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-09-01 13:35+0200\n"
+"PO-Revision-Date: 2012-09-01 11:35+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,10 +17,18 @@ 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"
 
-#: js/settings-personal.js:31
+#: js/settings-personal.js:31 templates/settings-personal.php:10
 msgid "Expire all versions"
 msgstr ""
 
+#: templates/settings-personal.php:4
+msgid "Versions"
+msgstr ""
+
+#: templates/settings-personal.php:7
+msgid "This will delete all existing backup versions of your files"
+msgstr ""
+
 #: templates/settings.php:3
 msgid "Enable Files Versioning"
 msgstr ""
diff --git a/l10n/hr/settings.po b/l10n/hr/settings.po
index 5a912d160e..88b5f981c6 100644
--- a/l10n/hr/settings.po
+++ b/l10n/hr/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-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-01 13:35+0200\n"
+"PO-Revision-Date: 2012-09-01 11:35+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"
@@ -72,66 +72,85 @@ msgstr "__ime_jezika__"
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:29
+#: templates/admin.php:17
+msgid ""
+"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."
+msgstr ""
+
+#: templates/admin.php:31
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:31
+#: templates/admin.php:33
 msgid "execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:33
+#: templates/admin.php:35
 msgid "cron.php is registered at a webcron service"
 msgstr "cron.php je registriran kod webcron servisa"
 
-#: templates/admin.php:35
+#: templates/admin.php:37
 msgid "use systems cron service"
 msgstr "koristi sistemski cron servis"
 
-#: templates/admin.php:39
+#: templates/admin.php:41
 msgid "Share API"
 msgstr ""
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:45
+#: templates/admin.php:47
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:49
+#: templates/admin.php:51
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:50
+#: templates/admin.php:52
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:54
+#: templates/admin.php:56
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:55
+#: templates/admin.php:57
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:62
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:67
+#: templates/admin.php:69
 msgid "Log"
 msgstr "dnevnik"
 
-#: templates/admin.php:95
+#: templates/admin.php:97
 msgid "More"
 msgstr "više"
 
+#: templates/admin.php:105
+msgid ""
+"Developed by the <a href=\"http://ownCloud.org/contact\" "
+"target=\"_blank\">ownCloud community</a>, the <a "
+"href=\"https://github.com/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>."
+msgstr ""
+
 #: templates/apps.php:10
 msgid "Add your App"
 msgstr "Dodajte vašu aplikaciju"
diff --git a/l10n/hu_HU/files_versions.po b/l10n/hu_HU/files_versions.po
index c7ef6a41ba..8110815df5 100644
--- a/l10n/hu_HU/files_versions.po
+++ b/l10n/hu_HU/files_versions.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:37+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-09-01 13:35+0200\n"
+"PO-Revision-Date: 2012-09-01 11:35+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,10 +17,18 @@ msgstr ""
 "Language: hu_HU\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: js/settings-personal.js:31
+#: js/settings-personal.js:31 templates/settings-personal.php:10
 msgid "Expire all versions"
 msgstr ""
 
+#: templates/settings-personal.php:4
+msgid "Versions"
+msgstr ""
+
+#: templates/settings-personal.php:7
+msgid "This will delete all existing backup versions of your files"
+msgstr ""
+
 #: templates/settings.php:3
 msgid "Enable Files Versioning"
 msgstr ""
diff --git a/l10n/hu_HU/settings.po b/l10n/hu_HU/settings.po
index 3c7c74c977..07e242e85e 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-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-01 13:35+0200\n"
+"PO-Revision-Date: 2012-09-01 11:35+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"
@@ -71,66 +71,85 @@ msgstr "__language_name__"
 msgid "Security Warning"
 msgstr "Biztonsági figyelmeztetés"
 
-#: templates/admin.php:29
-msgid "Cron"
+#: templates/admin.php:17
+msgid ""
+"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."
 msgstr ""
 
 #: templates/admin.php:31
-msgid "execute one task with each page loaded"
+msgid "Cron"
 msgstr ""
 
 #: templates/admin.php:33
-msgid "cron.php is registered at a webcron service"
+msgid "execute one task with each page loaded"
 msgstr ""
 
 #: templates/admin.php:35
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:37
 msgid "use systems cron service"
 msgstr ""
 
-#: templates/admin.php:39
+#: templates/admin.php:41
 msgid "Share API"
 msgstr ""
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:45
+#: templates/admin.php:47
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:49
+#: templates/admin.php:51
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:50
+#: templates/admin.php:52
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:54
+#: templates/admin.php:56
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:55
+#: templates/admin.php:57
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:62
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:67
+#: templates/admin.php:69
 msgid "Log"
 msgstr "Napló"
 
-#: templates/admin.php:95
+#: templates/admin.php:97
 msgid "More"
 msgstr "Tovább"
 
+#: templates/admin.php:105
+msgid ""
+"Developed by the <a href=\"http://ownCloud.org/contact\" "
+"target=\"_blank\">ownCloud community</a>, the <a "
+"href=\"https://github.com/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>."
+msgstr ""
+
 #: templates/apps.php:10
 msgid "Add your App"
 msgstr "App hozzáadása"
diff --git a/l10n/hy/files_versions.po b/l10n/hy/files_versions.po
index 756f8887dd..7ac5f7649e 100644
--- a/l10n/hy/files_versions.po
+++ b/l10n/hy/files_versions.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:37+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-09-01 13:35+0200\n"
+"PO-Revision-Date: 2012-09-01 11:35+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,10 +17,18 @@ msgstr ""
 "Language: hy\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: js/settings-personal.js:31
+#: js/settings-personal.js:31 templates/settings-personal.php:10
 msgid "Expire all versions"
 msgstr ""
 
+#: templates/settings-personal.php:4
+msgid "Versions"
+msgstr ""
+
+#: templates/settings-personal.php:7
+msgid "This will delete all existing backup versions of your files"
+msgstr ""
+
 #: templates/settings.php:3
 msgid "Enable Files Versioning"
 msgstr ""
diff --git a/l10n/hy/settings.po b/l10n/hy/settings.po
index 2ec80355b8..7f4518b1f1 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-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-01 13:35+0200\n"
+"PO-Revision-Date: 2012-09-01 11:35+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"
@@ -69,66 +69,85 @@ msgstr ""
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:29
-msgid "Cron"
+#: templates/admin.php:17
+msgid ""
+"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."
 msgstr ""
 
 #: templates/admin.php:31
-msgid "execute one task with each page loaded"
+msgid "Cron"
 msgstr ""
 
 #: templates/admin.php:33
-msgid "cron.php is registered at a webcron service"
+msgid "execute one task with each page loaded"
 msgstr ""
 
 #: templates/admin.php:35
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:37
 msgid "use systems cron service"
 msgstr ""
 
-#: templates/admin.php:39
+#: templates/admin.php:41
 msgid "Share API"
 msgstr ""
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:45
+#: templates/admin.php:47
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:49
+#: templates/admin.php:51
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:50
+#: templates/admin.php:52
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:54
+#: templates/admin.php:56
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:55
+#: templates/admin.php:57
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:62
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:67
+#: templates/admin.php:69
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:95
+#: templates/admin.php:97
 msgid "More"
 msgstr ""
 
+#: templates/admin.php:105
+msgid ""
+"Developed by the <a href=\"http://ownCloud.org/contact\" "
+"target=\"_blank\">ownCloud community</a>, the <a "
+"href=\"https://github.com/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>."
+msgstr ""
+
 #: templates/apps.php:10
 msgid "Add your App"
 msgstr ""
diff --git a/l10n/ia/files_versions.po b/l10n/ia/files_versions.po
index d98c59df09..c874ecb7e4 100644
--- a/l10n/ia/files_versions.po
+++ b/l10n/ia/files_versions.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:37+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-09-01 13:35+0200\n"
+"PO-Revision-Date: 2012-09-01 11:35+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,10 +17,18 @@ msgstr ""
 "Language: ia\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: js/settings-personal.js:31
+#: js/settings-personal.js:31 templates/settings-personal.php:10
 msgid "Expire all versions"
 msgstr ""
 
+#: templates/settings-personal.php:4
+msgid "Versions"
+msgstr ""
+
+#: templates/settings-personal.php:7
+msgid "This will delete all existing backup versions of your files"
+msgstr ""
+
 #: templates/settings.php:3
 msgid "Enable Files Versioning"
 msgstr ""
diff --git a/l10n/ia/settings.po b/l10n/ia/settings.po
index f280838090..56b7b32070 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-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-01 13:35+0200\n"
+"PO-Revision-Date: 2012-09-01 11:35+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"
@@ -71,66 +71,85 @@ msgstr "Interlingua"
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:29
-msgid "Cron"
+#: templates/admin.php:17
+msgid ""
+"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."
 msgstr ""
 
 #: templates/admin.php:31
-msgid "execute one task with each page loaded"
+msgid "Cron"
 msgstr ""
 
 #: templates/admin.php:33
-msgid "cron.php is registered at a webcron service"
+msgid "execute one task with each page loaded"
 msgstr ""
 
 #: templates/admin.php:35
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:37
 msgid "use systems cron service"
 msgstr ""
 
-#: templates/admin.php:39
+#: templates/admin.php:41
 msgid "Share API"
 msgstr ""
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:45
+#: templates/admin.php:47
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:49
+#: templates/admin.php:51
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:50
+#: templates/admin.php:52
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:54
+#: templates/admin.php:56
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:55
+#: templates/admin.php:57
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:62
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:67
+#: templates/admin.php:69
 msgid "Log"
 msgstr "Registro"
 
-#: templates/admin.php:95
+#: templates/admin.php:97
 msgid "More"
 msgstr "Plus"
 
+#: templates/admin.php:105
+msgid ""
+"Developed by the <a href=\"http://ownCloud.org/contact\" "
+"target=\"_blank\">ownCloud community</a>, the <a "
+"href=\"https://github.com/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>."
+msgstr ""
+
 #: templates/apps.php:10
 msgid "Add your App"
 msgstr "Adder tu application"
diff --git a/l10n/id/files_versions.po b/l10n/id/files_versions.po
index 2014a3f2f1..b28e40950f 100644
--- a/l10n/id/files_versions.po
+++ b/l10n/id/files_versions.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:37+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-09-01 13:35+0200\n"
+"PO-Revision-Date: 2012-09-01 11:35+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,10 +17,18 @@ msgstr ""
 "Language: id\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: js/settings-personal.js:31
+#: js/settings-personal.js:31 templates/settings-personal.php:10
 msgid "Expire all versions"
 msgstr ""
 
+#: templates/settings-personal.php:4
+msgid "Versions"
+msgstr ""
+
+#: templates/settings-personal.php:7
+msgid "This will delete all existing backup versions of your files"
+msgstr ""
+
 #: templates/settings.php:3
 msgid "Enable Files Versioning"
 msgstr ""
diff --git a/l10n/id/settings.po b/l10n/id/settings.po
index 0f56ddfbc0..48dcb7d719 100644
--- a/l10n/id/settings.po
+++ b/l10n/id/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-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-01 13:35+0200\n"
+"PO-Revision-Date: 2012-09-01 11:35+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"
@@ -72,66 +72,85 @@ msgstr "__language_name__"
 msgid "Security Warning"
 msgstr "Peringatan Keamanan"
 
-#: templates/admin.php:29
-msgid "Cron"
+#: templates/admin.php:17
+msgid ""
+"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."
 msgstr ""
 
 #: templates/admin.php:31
-msgid "execute one task with each page loaded"
+msgid "Cron"
 msgstr ""
 
 #: templates/admin.php:33
-msgid "cron.php is registered at a webcron service"
+msgid "execute one task with each page loaded"
 msgstr ""
 
 #: templates/admin.php:35
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:37
 msgid "use systems cron service"
 msgstr ""
 
-#: templates/admin.php:39
+#: templates/admin.php:41
 msgid "Share API"
 msgstr ""
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:45
+#: templates/admin.php:47
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:49
+#: templates/admin.php:51
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:50
+#: templates/admin.php:52
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:54
+#: templates/admin.php:56
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:55
+#: templates/admin.php:57
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:62
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:67
+#: templates/admin.php:69
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:95
+#: templates/admin.php:97
 msgid "More"
 msgstr "Lebih"
 
+#: templates/admin.php:105
+msgid ""
+"Developed by the <a href=\"http://ownCloud.org/contact\" "
+"target=\"_blank\">ownCloud community</a>, the <a "
+"href=\"https://github.com/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>."
+msgstr ""
+
 #: templates/apps.php:10
 msgid "Add your App"
 msgstr "Tambahkan App anda"
diff --git a/l10n/id_ID/files_versions.po b/l10n/id_ID/files_versions.po
index f8b53c2af4..027df71e5e 100644
--- a/l10n/id_ID/files_versions.po
+++ b/l10n/id_ID/files_versions.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:37+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-09-01 13:35+0200\n"
+"PO-Revision-Date: 2012-09-01 11:35+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,10 +17,18 @@ msgstr ""
 "Language: id_ID\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: js/settings-personal.js:31
+#: js/settings-personal.js:31 templates/settings-personal.php:10
 msgid "Expire all versions"
 msgstr ""
 
+#: templates/settings-personal.php:4
+msgid "Versions"
+msgstr ""
+
+#: templates/settings-personal.php:7
+msgid "This will delete all existing backup versions of your files"
+msgstr ""
+
 #: templates/settings.php:3
 msgid "Enable Files Versioning"
 msgstr ""
diff --git a/l10n/id_ID/settings.po b/l10n/id_ID/settings.po
index f396f6be32..98ce6547b5 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-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-01 13:35+0200\n"
+"PO-Revision-Date: 2012-09-01 11:35+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"
@@ -69,66 +69,85 @@ msgstr ""
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:29
-msgid "Cron"
+#: templates/admin.php:17
+msgid ""
+"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."
 msgstr ""
 
 #: templates/admin.php:31
-msgid "execute one task with each page loaded"
+msgid "Cron"
 msgstr ""
 
 #: templates/admin.php:33
-msgid "cron.php is registered at a webcron service"
+msgid "execute one task with each page loaded"
 msgstr ""
 
 #: templates/admin.php:35
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:37
 msgid "use systems cron service"
 msgstr ""
 
-#: templates/admin.php:39
+#: templates/admin.php:41
 msgid "Share API"
 msgstr ""
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:45
+#: templates/admin.php:47
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:49
+#: templates/admin.php:51
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:50
+#: templates/admin.php:52
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:54
+#: templates/admin.php:56
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:55
+#: templates/admin.php:57
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:62
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:67
+#: templates/admin.php:69
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:95
+#: templates/admin.php:97
 msgid "More"
 msgstr ""
 
+#: templates/admin.php:105
+msgid ""
+"Developed by the <a href=\"http://ownCloud.org/contact\" "
+"target=\"_blank\">ownCloud community</a>, the <a "
+"href=\"https://github.com/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>."
+msgstr ""
+
 #: templates/apps.php:10
 msgid "Add your App"
 msgstr ""
diff --git a/l10n/it/files_versions.po b/l10n/it/files_versions.po
index 54f176fb2e..586c50a741 100644
--- a/l10n/it/files_versions.po
+++ b/l10n/it/files_versions.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:12+0000\n"
-"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
+"POT-Creation-Date: 2012-09-01 13:35+0200\n"
+"PO-Revision-Date: 2012-09-01 11:35+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,10 +18,18 @@ msgstr ""
 "Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: js/settings-personal.js:31
+#: js/settings-personal.js:31 templates/settings-personal.php:10
 msgid "Expire all versions"
 msgstr "Scadenza di tutte le versioni"
 
+#: templates/settings-personal.php:4
+msgid "Versions"
+msgstr ""
+
+#: templates/settings-personal.php:7
+msgid "This will delete all existing backup versions of your files"
+msgstr ""
+
 #: templates/settings.php:3
 msgid "Enable Files Versioning"
 msgstr "Abilita controllo di versione"
diff --git a/l10n/it/lib.po b/l10n/it/lib.po
index c4f2d4bd3b..c8853c8257 100644
--- a/l10n/it/lib.po
+++ b/l10n/it/lib.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-09-01 02:01+0200\n"
-"PO-Revision-Date: 2012-09-01 00:02+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-01 13:35+0200\n"
+"PO-Revision-Date: 2012-09-01 08: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"
@@ -115,12 +115,12 @@ msgstr "anni fa"
 #: updater.php:66
 #, php-format
 msgid "%s is available. Get <a href=\"%s\">more information</a>"
-msgstr ""
+msgstr "%s è disponibile. Ottieni <a href=\"%s\">ulteriori informazioni</a>"
 
 #: updater.php:68
 msgid "up to date"
-msgstr ""
+msgstr "aggiornato"
 
 #: updater.php:71
 msgid "updates check is disabled"
-msgstr ""
+msgstr "il controllo degli aggiornamenti è disabilitato"
diff --git a/l10n/it/settings.po b/l10n/it/settings.po
index 0847f13efb..34568001b5 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-09-01 02:01+0200\n"
-"PO-Revision-Date: 2012-08-31 10:32+0000\n"
-"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
+"POT-Creation-Date: 2012-09-01 13:35+0200\n"
+"PO-Revision-Date: 2012-09-01 11:35+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"
@@ -76,66 +76,85 @@ msgstr "Italiano"
 msgid "Security Warning"
 msgstr "Avviso di sicurezza"
 
-#: templates/admin.php:29
+#: templates/admin.php:17
+msgid ""
+"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."
+msgstr ""
+
+#: templates/admin.php:31
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:31
+#: templates/admin.php:33
 msgid "execute one task with each page loaded"
 msgstr "esegui un'attività con ogni pagina caricata"
 
-#: templates/admin.php:33
+#: templates/admin.php:35
 msgid "cron.php is registered at a webcron service"
 msgstr "cron.php è registrato a un servizio webcron"
 
-#: templates/admin.php:35
+#: templates/admin.php:37
 msgid "use systems cron service"
 msgstr "usa il servizio cron di sistema"
 
-#: templates/admin.php:39
+#: templates/admin.php:41
 msgid "Share API"
 msgstr "API di condivisione"
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Enable Share API"
 msgstr "Abilita API di condivisione"
 
-#: templates/admin.php:45
+#: templates/admin.php:47
 msgid "Allow apps to use the Share API"
 msgstr "Consenti alle applicazioni di utilizzare le API di condivisione"
 
-#: templates/admin.php:49
+#: templates/admin.php:51
 msgid "Allow links"
 msgstr "Consenti collegamenti"
 
-#: templates/admin.php:50
+#: templates/admin.php:52
 msgid "Allow users to share items to the public with links"
 msgstr "Consenti agli utenti di condividere elementi al pubblico con collegamenti"
 
-#: templates/admin.php:54
+#: templates/admin.php:56
 msgid "Allow resharing"
 msgstr "Consenti la ri-condivisione"
 
-#: templates/admin.php:55
+#: templates/admin.php:57
 msgid "Allow users to share items shared with them again"
 msgstr "Consenti agli utenti di condividere elementi già condivisi"
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Allow users to share with anyone"
 msgstr "Consenti agli utenti di condividere con chiunque"
 
-#: templates/admin.php:60
+#: templates/admin.php:62
 msgid "Allow users to only share with users in their groups"
 msgstr "Consenti agli utenti di condividere con gli utenti del proprio gruppo"
 
-#: templates/admin.php:67
+#: templates/admin.php:69
 msgid "Log"
 msgstr "Registro"
 
-#: templates/admin.php:95
+#: templates/admin.php:97
 msgid "More"
 msgstr "Altro"
 
+#: templates/admin.php:105
+msgid ""
+"Developed by the <a href=\"http://ownCloud.org/contact\" "
+"target=\"_blank\">ownCloud community</a>, the <a "
+"href=\"https://github.com/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>."
+msgstr ""
+
 #: templates/apps.php:10
 msgid "Add your App"
 msgstr "Aggiungi la tua applicazione"
diff --git a/l10n/ja_JP/files_versions.po b/l10n/ja_JP/files_versions.po
index 893e07db20..bed89934fb 100644
--- a/l10n/ja_JP/files_versions.po
+++ b/l10n/ja_JP/files_versions.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 02:41+0000\n"
-"Last-Translator: Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>\n"
+"POT-Creation-Date: 2012-09-01 13:35+0200\n"
+"PO-Revision-Date: 2012-09-01 11:35+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"
@@ -18,10 +18,18 @@ msgstr ""
 "Language: ja_JP\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: js/settings-personal.js:31
+#: js/settings-personal.js:31 templates/settings-personal.php:10
 msgid "Expire all versions"
 msgstr "すべてのバージョンを削除する"
 
+#: templates/settings-personal.php:4
+msgid "Versions"
+msgstr ""
+
+#: templates/settings-personal.php:7
+msgid "This will delete all existing backup versions of your files"
+msgstr ""
+
 #: templates/settings.php:3
 msgid "Enable Files Versioning"
 msgstr "ファイルのバージョン管理を有効にする"
diff --git a/l10n/ja_JP/settings.po b/l10n/ja_JP/settings.po
index 2964354ae9..90fcca014b 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-09-01 02:01+0200\n"
-"PO-Revision-Date: 2012-08-31 08:06+0000\n"
-"Last-Translator: ttyn <tetuyano+transi@gmail.com>\n"
+"POT-Creation-Date: 2012-09-01 13:35+0200\n"
+"PO-Revision-Date: 2012-09-01 11:35+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"
@@ -71,66 +71,85 @@ msgstr "Japanese (日本語)"
 msgid "Security Warning"
 msgstr "セキュリティ警告"
 
-#: templates/admin.php:29
+#: templates/admin.php:17
+msgid ""
+"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."
+msgstr ""
+
+#: templates/admin.php:31
 msgid "Cron"
 msgstr "cron(自動定期実行)"
 
-#: templates/admin.php:31
+#: templates/admin.php:33
 msgid "execute one task with each page loaded"
 msgstr "ページを開く毎にタスクを1つ実行"
 
-#: templates/admin.php:33
+#: templates/admin.php:35
 msgid "cron.php is registered at a webcron service"
 msgstr "cron.phpをwebcronサービスに登録しました"
 
-#: templates/admin.php:35
+#: templates/admin.php:37
 msgid "use systems cron service"
 msgstr "システムのcronサービスを使用"
 
-#: templates/admin.php:39
+#: templates/admin.php:41
 msgid "Share API"
 msgstr "Share API"
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Enable Share API"
 msgstr "Share APIを有効"
 
-#: templates/admin.php:45
+#: templates/admin.php:47
 msgid "Allow apps to use the Share API"
 msgstr "Share APIの使用をアプリケーションに許可"
 
-#: templates/admin.php:49
+#: templates/admin.php:51
 msgid "Allow links"
 msgstr "リンクを許可"
 
-#: templates/admin.php:50
+#: templates/admin.php:52
 msgid "Allow users to share items to the public with links"
 msgstr "ユーザーがリンクによる公開でアイテムを共有することが出来るようにする"
 
-#: templates/admin.php:54
+#: templates/admin.php:56
 msgid "Allow resharing"
 msgstr "再共有を許可"
 
-#: templates/admin.php:55
+#: templates/admin.php:57
 msgid "Allow users to share items shared with them again"
 msgstr "ユーザーが共有されているアイテムをさらに共有することが出来るようにする"
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Allow users to share with anyone"
 msgstr "ユーザーが誰にでも共有出来るようにする"
 
-#: templates/admin.php:60
+#: templates/admin.php:62
 msgid "Allow users to only share with users in their groups"
 msgstr "ユーザーがグループの人にしか共有出来ないようにする"
 
-#: templates/admin.php:67
+#: templates/admin.php:69
 msgid "Log"
 msgstr "ログ"
 
-#: templates/admin.php:95
+#: templates/admin.php:97
 msgid "More"
 msgstr "もっと"
 
+#: templates/admin.php:105
+msgid ""
+"Developed by the <a href=\"http://ownCloud.org/contact\" "
+"target=\"_blank\">ownCloud community</a>, the <a "
+"href=\"https://github.com/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>."
+msgstr ""
+
 #: templates/apps.php:10
 msgid "Add your App"
 msgstr "アプリを追加"
diff --git a/l10n/ko/files_versions.po b/l10n/ko/files_versions.po
index 7646c3ad8e..bf42a0a8c8 100644
--- a/l10n/ko/files_versions.po
+++ b/l10n/ko/files_versions.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:37+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-09-01 13:35+0200\n"
+"PO-Revision-Date: 2012-09-01 11:35+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,10 +17,18 @@ msgstr ""
 "Language: ko\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: js/settings-personal.js:31
+#: js/settings-personal.js:31 templates/settings-personal.php:10
 msgid "Expire all versions"
 msgstr ""
 
+#: templates/settings-personal.php:4
+msgid "Versions"
+msgstr ""
+
+#: templates/settings-personal.php:7
+msgid "This will delete all existing backup versions of your files"
+msgstr ""
+
 #: templates/settings.php:3
 msgid "Enable Files Versioning"
 msgstr ""
diff --git a/l10n/ko/settings.po b/l10n/ko/settings.po
index 66e8cb31bf..a07aecc3b9 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-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-01 13:35+0200\n"
+"PO-Revision-Date: 2012-09-01 11:35+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"
@@ -71,66 +71,85 @@ msgstr "한국어"
 msgid "Security Warning"
 msgstr "보안 경고"
 
-#: templates/admin.php:29
+#: templates/admin.php:17
+msgid ""
+"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."
+msgstr ""
+
+#: templates/admin.php:31
 msgid "Cron"
 msgstr "크론"
 
-#: templates/admin.php:31
+#: templates/admin.php:33
 msgid "execute one task with each page loaded"
 msgstr "각 페이지가 로드 된 하나의 작업을 실행"
 
-#: templates/admin.php:33
+#: templates/admin.php:35
 msgid "cron.php is registered at a webcron service"
 msgstr "cron.php는 webcron 서비스에 등록이 되어 있습니다."
 
-#: templates/admin.php:35
+#: templates/admin.php:37
 msgid "use systems cron service"
 msgstr "cron 시스템 서비스를 사용"
 
-#: templates/admin.php:39
+#: templates/admin.php:41
 msgid "Share API"
 msgstr ""
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:45
+#: templates/admin.php:47
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:49
+#: templates/admin.php:51
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:50
+#: templates/admin.php:52
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:54
+#: templates/admin.php:56
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:55
+#: templates/admin.php:57
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:62
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:67
+#: templates/admin.php:69
 msgid "Log"
 msgstr "로그"
 
-#: templates/admin.php:95
+#: templates/admin.php:97
 msgid "More"
 msgstr "더"
 
+#: templates/admin.php:105
+msgid ""
+"Developed by the <a href=\"http://ownCloud.org/contact\" "
+"target=\"_blank\">ownCloud community</a>, the <a "
+"href=\"https://github.com/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>."
+msgstr ""
+
 #: templates/apps.php:10
 msgid "Add your App"
 msgstr "앱 추가"
diff --git a/l10n/lb/files_versions.po b/l10n/lb/files_versions.po
index 1ecdf054fe..b2a52fe368 100644
--- a/l10n/lb/files_versions.po
+++ b/l10n/lb/files_versions.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:37+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-09-01 13:35+0200\n"
+"PO-Revision-Date: 2012-09-01 11:35+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,10 +17,18 @@ msgstr ""
 "Language: lb\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: js/settings-personal.js:31
+#: js/settings-personal.js:31 templates/settings-personal.php:10
 msgid "Expire all versions"
 msgstr ""
 
+#: templates/settings-personal.php:4
+msgid "Versions"
+msgstr ""
+
+#: templates/settings-personal.php:7
+msgid "This will delete all existing backup versions of your files"
+msgstr ""
+
 #: templates/settings.php:3
 msgid "Enable Files Versioning"
 msgstr ""
diff --git a/l10n/lb/settings.po b/l10n/lb/settings.po
index 05eb7eea10..46b0f23beb 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-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-01 13:35+0200\n"
+"PO-Revision-Date: 2012-09-01 11:35+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"
@@ -70,66 +70,85 @@ msgstr "__language_name__"
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:29
-msgid "Cron"
+#: templates/admin.php:17
+msgid ""
+"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."
 msgstr ""
 
 #: templates/admin.php:31
-msgid "execute one task with each page loaded"
+msgid "Cron"
 msgstr ""
 
 #: templates/admin.php:33
-msgid "cron.php is registered at a webcron service"
+msgid "execute one task with each page loaded"
 msgstr ""
 
 #: templates/admin.php:35
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:37
 msgid "use systems cron service"
 msgstr ""
 
-#: templates/admin.php:39
+#: templates/admin.php:41
 msgid "Share API"
 msgstr ""
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:45
+#: templates/admin.php:47
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:49
+#: templates/admin.php:51
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:50
+#: templates/admin.php:52
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:54
+#: templates/admin.php:56
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:55
+#: templates/admin.php:57
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:62
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:67
+#: templates/admin.php:69
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:95
+#: templates/admin.php:97
 msgid "More"
 msgstr "Méi"
 
+#: templates/admin.php:105
+msgid ""
+"Developed by the <a href=\"http://ownCloud.org/contact\" "
+"target=\"_blank\">ownCloud community</a>, the <a "
+"href=\"https://github.com/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>."
+msgstr ""
+
 #: templates/apps.php:10
 msgid "Add your App"
 msgstr "Setz deng App bei"
diff --git a/l10n/lt_LT/files_versions.po b/l10n/lt_LT/files_versions.po
index 78d03bc051..02e8567562 100644
--- a/l10n/lt_LT/files_versions.po
+++ b/l10n/lt_LT/files_versions.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-22 12:34+0000\n"
-"Last-Translator: Dr. ROX <to.dr.rox@gmail.com>\n"
+"POT-Creation-Date: 2012-09-01 13:35+0200\n"
+"PO-Revision-Date: 2012-09-01 11:35+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"
@@ -18,10 +18,18 @@ 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"
 
-#: js/settings-personal.js:31
+#: js/settings-personal.js:31 templates/settings-personal.php:10
 msgid "Expire all versions"
 msgstr "Panaikinti visų versijų galiojimą"
 
+#: templates/settings-personal.php:4
+msgid "Versions"
+msgstr ""
+
+#: templates/settings-personal.php:7
+msgid "This will delete all existing backup versions of your files"
+msgstr ""
+
 #: templates/settings.php:3
 msgid "Enable Files Versioning"
 msgstr "Įjungti failų versijų vedimą"
diff --git a/l10n/lt_LT/settings.po b/l10n/lt_LT/settings.po
index 89933ccb88..7f3126ba76 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-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-01 13:35+0200\n"
+"PO-Revision-Date: 2012-09-01 11:35+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"
@@ -70,66 +70,85 @@ msgstr "Kalba"
 msgid "Security Warning"
 msgstr "Saugumo įspėjimas"
 
-#: templates/admin.php:29
+#: templates/admin.php:17
+msgid ""
+"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."
+msgstr ""
+
+#: templates/admin.php:31
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:31
+#: templates/admin.php:33
 msgid "execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:33
+#: templates/admin.php:35
 msgid "cron.php is registered at a webcron service"
 msgstr ""
 
-#: templates/admin.php:35
+#: templates/admin.php:37
 msgid "use systems cron service"
 msgstr "naudoti sistemos cron servisą"
 
-#: templates/admin.php:39
+#: templates/admin.php:41
 msgid "Share API"
 msgstr ""
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:45
+#: templates/admin.php:47
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:49
+#: templates/admin.php:51
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:50
+#: templates/admin.php:52
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:54
+#: templates/admin.php:56
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:55
+#: templates/admin.php:57
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:62
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:67
+#: templates/admin.php:69
 msgid "Log"
 msgstr "Žurnalas"
 
-#: templates/admin.php:95
+#: templates/admin.php:97
 msgid "More"
 msgstr "Daugiau"
 
+#: templates/admin.php:105
+msgid ""
+"Developed by the <a href=\"http://ownCloud.org/contact\" "
+"target=\"_blank\">ownCloud community</a>, the <a "
+"href=\"https://github.com/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>."
+msgstr ""
+
 #: templates/apps.php:10
 msgid "Add your App"
 msgstr "Pridėti programėlę"
diff --git a/l10n/lv/files_versions.po b/l10n/lv/files_versions.po
index 5802b0782b..11755dfbc9 100644
--- a/l10n/lv/files_versions.po
+++ b/l10n/lv/files_versions.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:37+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-09-01 13:35+0200\n"
+"PO-Revision-Date: 2012-09-01 11:35+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,10 +17,18 @@ msgstr ""
 "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
+#: js/settings-personal.js:31 templates/settings-personal.php:10
 msgid "Expire all versions"
 msgstr ""
 
+#: templates/settings-personal.php:4
+msgid "Versions"
+msgstr ""
+
+#: templates/settings-personal.php:7
+msgid "This will delete all existing backup versions of your files"
+msgstr ""
+
 #: templates/settings.php:3
 msgid "Enable Files Versioning"
 msgstr ""
diff --git a/l10n/lv/settings.po b/l10n/lv/settings.po
index b518362de9..e9a03d16be 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-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-01 13:35+0200\n"
+"PO-Revision-Date: 2012-09-01 11:35+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"
@@ -70,66 +70,85 @@ msgstr "__valodas_nosaukums__"
 msgid "Security Warning"
 msgstr "Brīdinājums par drošību"
 
-#: templates/admin.php:29
+#: templates/admin.php:17
+msgid ""
+"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."
+msgstr ""
+
+#: templates/admin.php:31
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:31
+#: templates/admin.php:33
 msgid "execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:33
+#: templates/admin.php:35
 msgid "cron.php is registered at a webcron service"
 msgstr ""
 
-#: templates/admin.php:35
+#: templates/admin.php:37
 msgid "use systems cron service"
 msgstr ""
 
-#: templates/admin.php:39
+#: templates/admin.php:41
 msgid "Share API"
 msgstr ""
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:45
+#: templates/admin.php:47
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:49
+#: templates/admin.php:51
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:50
+#: templates/admin.php:52
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:54
+#: templates/admin.php:56
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:55
+#: templates/admin.php:57
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:62
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:67
+#: templates/admin.php:69
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:95
+#: templates/admin.php:97
 msgid "More"
 msgstr "Vairāk"
 
+#: templates/admin.php:105
+msgid ""
+"Developed by the <a href=\"http://ownCloud.org/contact\" "
+"target=\"_blank\">ownCloud community</a>, the <a "
+"href=\"https://github.com/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>."
+msgstr ""
+
 #: templates/apps.php:10
 msgid "Add your App"
 msgstr "Pievieno savu aplikāciju"
diff --git a/l10n/mk/files_versions.po b/l10n/mk/files_versions.po
index cafc33279c..a19a0758d7 100644
--- a/l10n/mk/files_versions.po
+++ b/l10n/mk/files_versions.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:37+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-09-01 13:35+0200\n"
+"PO-Revision-Date: 2012-09-01 11:35+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,10 +17,18 @@ msgstr ""
 "Language: mk\n"
 "Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1\n"
 
-#: js/settings-personal.js:31
+#: js/settings-personal.js:31 templates/settings-personal.php:10
 msgid "Expire all versions"
 msgstr ""
 
+#: templates/settings-personal.php:4
+msgid "Versions"
+msgstr ""
+
+#: templates/settings-personal.php:7
+msgid "This will delete all existing backup versions of your files"
+msgstr ""
+
 #: templates/settings.php:3
 msgid "Enable Files Versioning"
 msgstr ""
diff --git a/l10n/mk/settings.po b/l10n/mk/settings.po
index 8d491633f3..346d808cac 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-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-01 13:35+0200\n"
+"PO-Revision-Date: 2012-09-01 11:35+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"
@@ -71,66 +71,85 @@ msgstr "__language_name__"
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:29
-msgid "Cron"
+#: templates/admin.php:17
+msgid ""
+"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."
 msgstr ""
 
 #: templates/admin.php:31
-msgid "execute one task with each page loaded"
+msgid "Cron"
 msgstr ""
 
 #: templates/admin.php:33
-msgid "cron.php is registered at a webcron service"
+msgid "execute one task with each page loaded"
 msgstr ""
 
 #: templates/admin.php:35
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:37
 msgid "use systems cron service"
 msgstr ""
 
-#: templates/admin.php:39
+#: templates/admin.php:41
 msgid "Share API"
 msgstr ""
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:45
+#: templates/admin.php:47
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:49
+#: templates/admin.php:51
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:50
+#: templates/admin.php:52
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:54
+#: templates/admin.php:56
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:55
+#: templates/admin.php:57
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:62
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:67
+#: templates/admin.php:69
 msgid "Log"
 msgstr "Записник"
 
-#: templates/admin.php:95
+#: templates/admin.php:97
 msgid "More"
 msgstr "Повеќе"
 
+#: templates/admin.php:105
+msgid ""
+"Developed by the <a href=\"http://ownCloud.org/contact\" "
+"target=\"_blank\">ownCloud community</a>, the <a "
+"href=\"https://github.com/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>."
+msgstr ""
+
 #: templates/apps.php:10
 msgid "Add your App"
 msgstr "Додадете ја Вашата апликација"
diff --git a/l10n/ms_MY/files_versions.po b/l10n/ms_MY/files_versions.po
index 3e40393f2a..d8056fb58e 100644
--- a/l10n/ms_MY/files_versions.po
+++ b/l10n/ms_MY/files_versions.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:37+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-09-01 13:35+0200\n"
+"PO-Revision-Date: 2012-09-01 11:35+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,10 +17,18 @@ msgstr ""
 "Language: ms_MY\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: js/settings-personal.js:31
+#: js/settings-personal.js:31 templates/settings-personal.php:10
 msgid "Expire all versions"
 msgstr ""
 
+#: templates/settings-personal.php:4
+msgid "Versions"
+msgstr ""
+
+#: templates/settings-personal.php:7
+msgid "This will delete all existing backup versions of your files"
+msgstr ""
+
 #: templates/settings.php:3
 msgid "Enable Files Versioning"
 msgstr ""
diff --git a/l10n/ms_MY/settings.po b/l10n/ms_MY/settings.po
index f88b49ab73..47b3ac00c2 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-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-01 13:35+0200\n"
+"PO-Revision-Date: 2012-09-01 11:35+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"
@@ -73,66 +73,85 @@ msgstr "_nama_bahasa_"
 msgid "Security Warning"
 msgstr "Amaran keselamatan"
 
-#: templates/admin.php:29
-msgid "Cron"
+#: templates/admin.php:17
+msgid ""
+"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."
 msgstr ""
 
 #: templates/admin.php:31
-msgid "execute one task with each page loaded"
+msgid "Cron"
 msgstr ""
 
 #: templates/admin.php:33
-msgid "cron.php is registered at a webcron service"
+msgid "execute one task with each page loaded"
 msgstr ""
 
 #: templates/admin.php:35
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:37
 msgid "use systems cron service"
 msgstr ""
 
-#: templates/admin.php:39
+#: templates/admin.php:41
 msgid "Share API"
 msgstr ""
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:45
+#: templates/admin.php:47
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:49
+#: templates/admin.php:51
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:50
+#: templates/admin.php:52
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:54
+#: templates/admin.php:56
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:55
+#: templates/admin.php:57
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:62
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:67
+#: templates/admin.php:69
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:95
+#: templates/admin.php:97
 msgid "More"
 msgstr "Lanjutan"
 
+#: templates/admin.php:105
+msgid ""
+"Developed by the <a href=\"http://ownCloud.org/contact\" "
+"target=\"_blank\">ownCloud community</a>, the <a "
+"href=\"https://github.com/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>."
+msgstr ""
+
 #: templates/apps.php:10
 msgid "Add your App"
 msgstr "Tambah apps anda"
diff --git a/l10n/nb_NO/files_versions.po b/l10n/nb_NO/files_versions.po
index 9b44f48273..536b4d262e 100644
--- a/l10n/nb_NO/files_versions.po
+++ b/l10n/nb_NO/files_versions.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-24 02:02+0200\n"
-"PO-Revision-Date: 2012-08-23 17:25+0000\n"
-"Last-Translator: Arvid Nornes <arvid.nornes@gmail.com>\n"
+"POT-Creation-Date: 2012-09-01 13:35+0200\n"
+"PO-Revision-Date: 2012-09-01 11:35+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"
@@ -18,10 +18,18 @@ msgstr ""
 "Language: nb_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: js/settings-personal.js:31
+#: js/settings-personal.js:31 templates/settings-personal.php:10
 msgid "Expire all versions"
 msgstr ""
 
+#: templates/settings-personal.php:4
+msgid "Versions"
+msgstr ""
+
+#: templates/settings-personal.php:7
+msgid "This will delete all existing backup versions of your files"
+msgstr ""
+
 #: templates/settings.php:3
 msgid "Enable Files Versioning"
 msgstr "Slå på versjonering"
diff --git a/l10n/nb_NO/settings.po b/l10n/nb_NO/settings.po
index 74b34751ae..80cb20c73d 100644
--- a/l10n/nb_NO/settings.po
+++ b/l10n/nb_NO/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-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-01 13:35+0200\n"
+"PO-Revision-Date: 2012-09-01 11:35+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"
@@ -75,66 +75,85 @@ msgstr "__language_name__"
 msgid "Security Warning"
 msgstr "Sikkerhetsadvarsel"
 
-#: templates/admin.php:29
+#: templates/admin.php:17
+msgid ""
+"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."
+msgstr ""
+
+#: templates/admin.php:31
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:31
+#: templates/admin.php:33
 msgid "execute one task with each page loaded"
 msgstr "utfør en oppgave med hver side som blir lastet"
 
-#: templates/admin.php:33
+#: templates/admin.php:35
 msgid "cron.php is registered at a webcron service"
 msgstr "cron.php er registrert som en webcron tjeneste"
 
-#: templates/admin.php:35
+#: templates/admin.php:37
 msgid "use systems cron service"
 msgstr "benytt systemets cron tjeneste"
 
-#: templates/admin.php:39
+#: templates/admin.php:41
 msgid "Share API"
 msgstr ""
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:45
+#: templates/admin.php:47
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:49
+#: templates/admin.php:51
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:50
+#: templates/admin.php:52
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:54
+#: templates/admin.php:56
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:55
+#: templates/admin.php:57
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:62
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:67
+#: templates/admin.php:69
 msgid "Log"
 msgstr "Logg"
 
-#: templates/admin.php:95
+#: templates/admin.php:97
 msgid "More"
 msgstr "Mer"
 
+#: templates/admin.php:105
+msgid ""
+"Developed by the <a href=\"http://ownCloud.org/contact\" "
+"target=\"_blank\">ownCloud community</a>, the <a "
+"href=\"https://github.com/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>."
+msgstr ""
+
 #: templates/apps.php:10
 msgid "Add your App"
 msgstr "Legg til din App"
diff --git a/l10n/nl/files_sharing.po b/l10n/nl/files_sharing.po
index 98f93a33de..48b5c0641a 100644
--- a/l10n/nl/files_sharing.po
+++ b/l10n/nl/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-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-01 13:35+0200\n"
+"PO-Revision-Date: 2012-09-01 08:29+0000\n"
+"Last-Translator: Richard Bos <radoeka@gmail.com>\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"
@@ -20,7 +20,7 @@ msgstr ""
 
 #: templates/authenticate.php:4
 msgid "Password"
-msgstr ""
+msgstr "Passeerwoord"
 
 #: templates/authenticate.php:6
 msgid "Submit"
@@ -28,12 +28,12 @@ msgstr ""
 
 #: templates/public.php:9 templates/public.php:19
 msgid "Download"
-msgstr ""
+msgstr "Downloaden"
 
 #: templates/public.php:18
 msgid "No preview available for"
-msgstr ""
+msgstr "Geen voorbeeldweergave beschikbaar voor"
 
 #: templates/public.php:23
 msgid "web services under your control"
-msgstr ""
+msgstr "Webdiensten in eigen beheer"
diff --git a/l10n/nl/files_versions.po b/l10n/nl/files_versions.po
index cd67120849..257098e81f 100644
--- a/l10n/nl/files_versions.po
+++ b/l10n/nl/files_versions.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-25 02:04+0200\n"
-"PO-Revision-Date: 2012-08-24 16:58+0000\n"
-"Last-Translator: Richard Bos <radoeka@gmail.com>\n"
+"POT-Creation-Date: 2012-09-01 13:35+0200\n"
+"PO-Revision-Date: 2012-09-01 11:35+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"
@@ -18,10 +18,18 @@ msgstr ""
 "Language: nl\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: js/settings-personal.js:31
+#: js/settings-personal.js:31 templates/settings-personal.php:10
 msgid "Expire all versions"
 msgstr "Alle versies laten verlopen"
 
+#: templates/settings-personal.php:4
+msgid "Versions"
+msgstr ""
+
+#: templates/settings-personal.php:7
+msgid "This will delete all existing backup versions of your files"
+msgstr ""
+
 #: templates/settings.php:3
 msgid "Enable Files Versioning"
 msgstr "Activeer file versioning"
diff --git a/l10n/nl/settings.po b/l10n/nl/settings.po
index 7abf382c2c..80f22f6088 100644
--- a/l10n/nl/settings.po
+++ b/l10n/nl/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-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-01 13:35+0200\n"
+"PO-Revision-Date: 2012-09-01 11:35+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"
@@ -76,66 +76,85 @@ msgstr "Nederlands"
 msgid "Security Warning"
 msgstr "Veiligheidswaarschuwing"
 
-#: templates/admin.php:29
+#: templates/admin.php:17
+msgid ""
+"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."
+msgstr ""
+
+#: templates/admin.php:31
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:31
+#: templates/admin.php:33
 msgid "execute one task with each page loaded"
 msgstr "Voer 1 taak uit bij elke geladen pagina"
 
-#: templates/admin.php:33
+#: templates/admin.php:35
 msgid "cron.php is registered at a webcron service"
 msgstr "cron.php is geregistreerd bij een webcron service"
 
-#: templates/admin.php:35
+#: templates/admin.php:37
 msgid "use systems cron service"
 msgstr "gebruik de systeem cron service"
 
-#: templates/admin.php:39
+#: templates/admin.php:41
 msgid "Share API"
-msgstr ""
+msgstr "Deel API"
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Enable Share API"
-msgstr ""
+msgstr "Zet de Deel API aan"
 
-#: templates/admin.php:45
+#: templates/admin.php:47
 msgid "Allow apps to use the Share API"
-msgstr ""
+msgstr "Sta apps toe om de Deel API te gebruiken"
 
-#: templates/admin.php:49
+#: templates/admin.php:51
 msgid "Allow links"
-msgstr ""
+msgstr "Sta links toe"
 
-#: templates/admin.php:50
+#: templates/admin.php:52
 msgid "Allow users to share items to the public with links"
-msgstr ""
+msgstr "Sta gebruikers toe om items via links publiekelijk te maken"
 
-#: templates/admin.php:54
+#: templates/admin.php:56
 msgid "Allow resharing"
-msgstr ""
+msgstr "Sta verder delen toe"
 
-#: templates/admin.php:55
+#: templates/admin.php:57
 msgid "Allow users to share items shared with them again"
-msgstr ""
-
-#: templates/admin.php:58
-msgid "Allow users to share with anyone"
-msgstr ""
+msgstr "Sta gebruikers toe om items nogmaals te delen"
 
 #: templates/admin.php:60
-msgid "Allow users to only share with users in their groups"
-msgstr ""
+msgid "Allow users to share with anyone"
+msgstr "Sta gebruikers toe om met iedereen te delen"
 
-#: templates/admin.php:67
+#: templates/admin.php:62
+msgid "Allow users to only share with users in their groups"
+msgstr "Sta gebruikers toe om alleen met gebruikers in hun groepen te delen"
+
+#: templates/admin.php:69
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:95
+#: templates/admin.php:97
 msgid "More"
 msgstr "Meer"
 
+#: templates/admin.php:105
+msgid ""
+"Developed by the <a href=\"http://ownCloud.org/contact\" "
+"target=\"_blank\">ownCloud community</a>, the <a "
+"href=\"https://github.com/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>."
+msgstr ""
+
 #: templates/apps.php:10
 msgid "Add your App"
 msgstr "Voeg je App toe"
diff --git a/l10n/nn_NO/files_versions.po b/l10n/nn_NO/files_versions.po
index 3ae26d5f13..d440d7524f 100644
--- a/l10n/nn_NO/files_versions.po
+++ b/l10n/nn_NO/files_versions.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:37+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-09-01 13:35+0200\n"
+"PO-Revision-Date: 2012-09-01 11:35+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,10 +17,18 @@ msgstr ""
 "Language: nn_NO\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: js/settings-personal.js:31
+#: js/settings-personal.js:31 templates/settings-personal.php:10
 msgid "Expire all versions"
 msgstr ""
 
+#: templates/settings-personal.php:4
+msgid "Versions"
+msgstr ""
+
+#: templates/settings-personal.php:7
+msgid "This will delete all existing backup versions of your files"
+msgstr ""
+
 #: templates/settings.php:3
 msgid "Enable Files Versioning"
 msgstr ""
diff --git a/l10n/nn_NO/settings.po b/l10n/nn_NO/settings.po
index 6eeb591969..f4c7090799 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-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-01 13:35+0200\n"
+"PO-Revision-Date: 2012-09-01 11:35+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"
@@ -71,66 +71,85 @@ msgstr "Nynorsk"
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:29
-msgid "Cron"
+#: templates/admin.php:17
+msgid ""
+"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."
 msgstr ""
 
 #: templates/admin.php:31
-msgid "execute one task with each page loaded"
+msgid "Cron"
 msgstr ""
 
 #: templates/admin.php:33
-msgid "cron.php is registered at a webcron service"
+msgid "execute one task with each page loaded"
 msgstr ""
 
 #: templates/admin.php:35
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:37
 msgid "use systems cron service"
 msgstr ""
 
-#: templates/admin.php:39
+#: templates/admin.php:41
 msgid "Share API"
 msgstr ""
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:45
+#: templates/admin.php:47
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:49
+#: templates/admin.php:51
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:50
+#: templates/admin.php:52
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:54
+#: templates/admin.php:56
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:55
+#: templates/admin.php:57
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:62
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:67
+#: templates/admin.php:69
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:95
+#: templates/admin.php:97
 msgid "More"
 msgstr ""
 
+#: templates/admin.php:105
+msgid ""
+"Developed by the <a href=\"http://ownCloud.org/contact\" "
+"target=\"_blank\">ownCloud community</a>, the <a "
+"href=\"https://github.com/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>."
+msgstr ""
+
 #: templates/apps.php:10
 msgid "Add your App"
 msgstr ""
diff --git a/l10n/pl/files_versions.po b/l10n/pl/files_versions.po
index bdacd74f04..9db71f8d1a 100644
--- a/l10n/pl/files_versions.po
+++ b/l10n/pl/files_versions.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:35+0000\n"
-"Last-Translator: Cyryl Sochacki <>\n"
+"POT-Creation-Date: 2012-09-01 13:35+0200\n"
+"PO-Revision-Date: 2012-09-01 11:35+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,10 +18,18 @@ 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"
 
-#: js/settings-personal.js:31
+#: js/settings-personal.js:31 templates/settings-personal.php:10
 msgid "Expire all versions"
 msgstr "Wygasają wszystkie wersje"
 
+#: templates/settings-personal.php:4
+msgid "Versions"
+msgstr ""
+
+#: templates/settings-personal.php:7
+msgid "This will delete all existing backup versions of your files"
+msgstr ""
+
 #: templates/settings.php:3
 msgid "Enable Files Versioning"
 msgstr "Włącz wersjonowanie plików"
diff --git a/l10n/pl/settings.po b/l10n/pl/settings.po
index 887143014b..8afec9db2a 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-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-01 13:35+0200\n"
+"PO-Revision-Date: 2012-09-01 11:35+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"
@@ -76,66 +76,85 @@ msgstr "Polski"
 msgid "Security Warning"
 msgstr "Ostrzeżenia bezpieczeństwa"
 
-#: templates/admin.php:29
+#: templates/admin.php:17
+msgid ""
+"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."
+msgstr ""
+
+#: templates/admin.php:31
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:31
+#: templates/admin.php:33
 msgid "execute one task with each page loaded"
 msgstr "wykonanie jednego zadania z każdej  załadowanej strony"
 
-#: templates/admin.php:33
+#: templates/admin.php:35
 msgid "cron.php is registered at a webcron service"
 msgstr "cron.php jest zarejestrowany w usłudze webcron"
 
-#: templates/admin.php:35
+#: templates/admin.php:37
 msgid "use systems cron service"
 msgstr "korzystaj z usługi systemowej cron"
 
-#: templates/admin.php:39
+#: templates/admin.php:41
 msgid "Share API"
 msgstr ""
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:45
+#: templates/admin.php:47
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:49
+#: templates/admin.php:51
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:50
+#: templates/admin.php:52
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:54
+#: templates/admin.php:56
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:55
+#: templates/admin.php:57
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:62
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:67
+#: templates/admin.php:69
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:95
+#: templates/admin.php:97
 msgid "More"
 msgstr "Więcej"
 
+#: templates/admin.php:105
+msgid ""
+"Developed by the <a href=\"http://ownCloud.org/contact\" "
+"target=\"_blank\">ownCloud community</a>, the <a "
+"href=\"https://github.com/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>."
+msgstr ""
+
 #: templates/apps.php:10
 msgid "Add your App"
 msgstr "Dodaj aplikacje"
diff --git a/l10n/pl_PL/files_versions.po b/l10n/pl_PL/files_versions.po
index 1e25481245..5f9feef04f 100644
--- a/l10n/pl_PL/files_versions.po
+++ b/l10n/pl_PL/files_versions.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-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 22:37+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-09-01 13:35+0200\n"
+"PO-Revision-Date: 2012-09-01 11:35+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/owncloud/language/pl_PL/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,10 +17,18 @@ msgstr ""
 "Language: pl_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
+#: js/settings-personal.js:31 templates/settings-personal.php:10
 msgid "Expire all versions"
 msgstr ""
 
+#: templates/settings-personal.php:4
+msgid "Versions"
+msgstr ""
+
+#: templates/settings-personal.php:7
+msgid "This will delete all existing backup versions of your files"
+msgstr ""
+
 #: templates/settings.php:3
 msgid "Enable Files Versioning"
 msgstr ""
diff --git a/l10n/pl_PL/settings.po b/l10n/pl_PL/settings.po
index d87991490d..6d84ed791a 100644
--- a/l10n/pl_PL/settings.po
+++ b/l10n/pl_PL/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-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-01 13:35+0200\n"
+"PO-Revision-Date: 2012-09-01 11:35+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/owncloud/language/pl_PL/)\n"
 "MIME-Version: 1.0\n"
@@ -69,66 +69,85 @@ msgstr ""
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:29
-msgid "Cron"
+#: templates/admin.php:17
+msgid ""
+"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."
 msgstr ""
 
 #: templates/admin.php:31
-msgid "execute one task with each page loaded"
+msgid "Cron"
 msgstr ""
 
 #: templates/admin.php:33
-msgid "cron.php is registered at a webcron service"
+msgid "execute one task with each page loaded"
 msgstr ""
 
 #: templates/admin.php:35
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:37
 msgid "use systems cron service"
 msgstr ""
 
-#: templates/admin.php:39
+#: templates/admin.php:41
 msgid "Share API"
 msgstr ""
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:45
+#: templates/admin.php:47
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:49
+#: templates/admin.php:51
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:50
+#: templates/admin.php:52
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:54
+#: templates/admin.php:56
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:55
+#: templates/admin.php:57
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:62
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:67
+#: templates/admin.php:69
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:95
+#: templates/admin.php:97
 msgid "More"
 msgstr ""
 
+#: templates/admin.php:105
+msgid ""
+"Developed by the <a href=\"http://ownCloud.org/contact\" "
+"target=\"_blank\">ownCloud community</a>, the <a "
+"href=\"https://github.com/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>."
+msgstr ""
+
 #: templates/apps.php:10
 msgid "Add your App"
 msgstr ""
diff --git a/l10n/pt_BR/files_versions.po b/l10n/pt_BR/files_versions.po
index 5c59fa1633..14e3834e40 100644
--- a/l10n/pt_BR/files_versions.po
+++ b/l10n/pt_BR/files_versions.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-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-28 14:35+0000\n"
-"Last-Translator: tbsoares <tbsoares@gmail.com>\n"
+"POT-Creation-Date: 2012-09-01 13:35+0200\n"
+"PO-Revision-Date: 2012-09-01 11:35+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"
@@ -18,10 +18,18 @@ msgstr ""
 "Language: pt_BR\n"
 "Plural-Forms: nplurals=2; plural=(n > 1)\n"
 
-#: js/settings-personal.js:31
+#: js/settings-personal.js:31 templates/settings-personal.php:10
 msgid "Expire all versions"
 msgstr "Expirar todas as versões"
 
+#: templates/settings-personal.php:4
+msgid "Versions"
+msgstr ""
+
+#: templates/settings-personal.php:7
+msgid "This will delete all existing backup versions of your files"
+msgstr ""
+
 #: templates/settings.php:3
 msgid "Enable Files Versioning"
 msgstr "Habilitar versionamento de arquivos"
diff --git a/l10n/pt_BR/settings.po b/l10n/pt_BR/settings.po
index e3bbe54b78..d5dbac47b9 100644
--- a/l10n/pt_BR/settings.po
+++ b/l10n/pt_BR/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-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-01 13:35+0200\n"
+"PO-Revision-Date: 2012-09-01 11:35+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"
@@ -75,66 +75,85 @@ msgstr "Português"
 msgid "Security Warning"
 msgstr "Aviso de Segurança"
 
-#: templates/admin.php:29
-msgid "Cron"
+#: templates/admin.php:17
+msgid ""
+"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."
 msgstr ""
 
 #: templates/admin.php:31
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:33
 msgid "execute one task with each page loaded"
 msgstr "executar uma tarefa com cada página em aberto"
 
-#: templates/admin.php:33
+#: templates/admin.php:35
 msgid "cron.php is registered at a webcron service"
 msgstr "cron.php esta registrado no serviço de webcron"
 
-#: templates/admin.php:35
+#: templates/admin.php:37
 msgid "use systems cron service"
 msgstr ""
 
-#: templates/admin.php:39
+#: templates/admin.php:41
 msgid "Share API"
 msgstr ""
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:45
+#: templates/admin.php:47
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:49
+#: templates/admin.php:51
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:50
+#: templates/admin.php:52
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:54
+#: templates/admin.php:56
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:55
+#: templates/admin.php:57
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:62
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:67
+#: templates/admin.php:69
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:95
+#: templates/admin.php:97
 msgid "More"
 msgstr "Mais"
 
+#: templates/admin.php:105
+msgid ""
+"Developed by the <a href=\"http://ownCloud.org/contact\" "
+"target=\"_blank\">ownCloud community</a>, the <a "
+"href=\"https://github.com/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>."
+msgstr ""
+
 #: templates/apps.php:10
 msgid "Add your App"
 msgstr "Adicione seu Aplicativo"
diff --git a/l10n/pt_PT/files_versions.po b/l10n/pt_PT/files_versions.po
index 5d6fb5fe06..56a1489aa8 100644
--- a/l10n/pt_PT/files_versions.po
+++ b/l10n/pt_PT/files_versions.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:37+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-09-01 13:35+0200\n"
+"PO-Revision-Date: 2012-09-01 11:35+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,10 +17,18 @@ msgstr ""
 "Language: pt_PT\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: js/settings-personal.js:31
+#: js/settings-personal.js:31 templates/settings-personal.php:10
 msgid "Expire all versions"
 msgstr ""
 
+#: templates/settings-personal.php:4
+msgid "Versions"
+msgstr ""
+
+#: templates/settings-personal.php:7
+msgid "This will delete all existing backup versions of your files"
+msgstr ""
+
 #: templates/settings.php:3
 msgid "Enable Files Versioning"
 msgstr ""
diff --git a/l10n/pt_PT/settings.po b/l10n/pt_PT/settings.po
index 7077d64cc4..87d7e76647 100644
--- a/l10n/pt_PT/settings.po
+++ b/l10n/pt_PT/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-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-01 13:35+0200\n"
+"PO-Revision-Date: 2012-09-01 11:35+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"
@@ -72,66 +72,85 @@ msgstr "__language_name__"
 msgid "Security Warning"
 msgstr "Aviso de Segurança"
 
-#: templates/admin.php:29
+#: templates/admin.php:17
+msgid ""
+"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."
+msgstr ""
+
+#: templates/admin.php:31
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:31
+#: templates/admin.php:33
 msgid "execute one task with each page loaded"
 msgstr "Executar uma tarefa com cada página carregada"
 
-#: templates/admin.php:33
+#: templates/admin.php:35
 msgid "cron.php is registered at a webcron service"
 msgstr "cron.php está registado num serviço webcron"
 
-#: templates/admin.php:35
+#: templates/admin.php:37
 msgid "use systems cron service"
 msgstr "usar o serviço cron do sistema"
 
-#: templates/admin.php:39
+#: templates/admin.php:41
 msgid "Share API"
 msgstr ""
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:45
+#: templates/admin.php:47
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:49
+#: templates/admin.php:51
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:50
+#: templates/admin.php:52
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:54
+#: templates/admin.php:56
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:55
+#: templates/admin.php:57
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:62
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:67
+#: templates/admin.php:69
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:95
+#: templates/admin.php:97
 msgid "More"
 msgstr "Mais"
 
+#: templates/admin.php:105
+msgid ""
+"Developed by the <a href=\"http://ownCloud.org/contact\" "
+"target=\"_blank\">ownCloud community</a>, the <a "
+"href=\"https://github.com/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>."
+msgstr ""
+
 #: templates/apps.php:10
 msgid "Add your App"
 msgstr "Adicione a sua aplicação"
diff --git a/l10n/ro/files_versions.po b/l10n/ro/files_versions.po
index bb1b9526f0..936d92da9a 100644
--- a/l10n/ro/files_versions.po
+++ b/l10n/ro/files_versions.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:37+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-09-01 13:35+0200\n"
+"PO-Revision-Date: 2012-09-01 11:35+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,10 +17,18 @@ msgstr ""
 "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
+#: js/settings-personal.js:31 templates/settings-personal.php:10
 msgid "Expire all versions"
 msgstr ""
 
+#: templates/settings-personal.php:4
+msgid "Versions"
+msgstr ""
+
+#: templates/settings-personal.php:7
+msgid "This will delete all existing backup versions of your files"
+msgstr ""
+
 #: templates/settings.php:3
 msgid "Enable Files Versioning"
 msgstr ""
diff --git a/l10n/ro/settings.po b/l10n/ro/settings.po
index e6e410f73d..a203a47619 100644
--- a/l10n/ro/settings.po
+++ b/l10n/ro/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-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-01 13:35+0200\n"
+"PO-Revision-Date: 2012-09-01 11:35+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"
@@ -74,66 +74,85 @@ msgstr "_language_name_"
 msgid "Security Warning"
 msgstr "Avertisment de securitate"
 
-#: templates/admin.php:29
+#: templates/admin.php:17
+msgid ""
+"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."
+msgstr ""
+
+#: templates/admin.php:31
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:31
+#: templates/admin.php:33
 msgid "execute one task with each page loaded"
 msgstr "executâ o sarcină cu fiecare pagină încărcată"
 
-#: templates/admin.php:33
+#: templates/admin.php:35
 msgid "cron.php is registered at a webcron service"
 msgstr "cron.php e înregistrat la un serviciu de webcron"
 
-#: templates/admin.php:35
+#: templates/admin.php:37
 msgid "use systems cron service"
 msgstr "utilizează serviciul de cron al sistemului"
 
-#: templates/admin.php:39
+#: templates/admin.php:41
 msgid "Share API"
 msgstr ""
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:45
+#: templates/admin.php:47
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:49
+#: templates/admin.php:51
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:50
+#: templates/admin.php:52
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:54
+#: templates/admin.php:56
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:55
+#: templates/admin.php:57
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:62
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:67
+#: templates/admin.php:69
 msgid "Log"
 msgstr "Jurnal de activitate"
 
-#: templates/admin.php:95
+#: templates/admin.php:97
 msgid "More"
 msgstr "Mai mult"
 
+#: templates/admin.php:105
+msgid ""
+"Developed by the <a href=\"http://ownCloud.org/contact\" "
+"target=\"_blank\">ownCloud community</a>, the <a "
+"href=\"https://github.com/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>."
+msgstr ""
+
 #: templates/apps.php:10
 msgid "Add your App"
 msgstr "Adaugă aplicația ta"
diff --git a/l10n/ru/files_versions.po b/l10n/ru/files_versions.po
index 466c1629db..fc36a2ead4 100644
--- a/l10n/ru/files_versions.po
+++ b/l10n/ru/files_versions.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-25 02:04+0200\n"
-"PO-Revision-Date: 2012-08-24 07:24+0000\n"
-"Last-Translator: Denis <reg.transifex.net@demitel.ru>\n"
+"POT-Creation-Date: 2012-09-01 13:35+0200\n"
+"PO-Revision-Date: 2012-09-01 11:35+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"
@@ -18,10 +18,18 @@ 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"
 
-#: js/settings-personal.js:31
+#: js/settings-personal.js:31 templates/settings-personal.php:10
 msgid "Expire all versions"
 msgstr "Просрочить все версии"
 
+#: templates/settings-personal.php:4
+msgid "Versions"
+msgstr ""
+
+#: templates/settings-personal.php:7
+msgid "This will delete all existing backup versions of your files"
+msgstr ""
+
 #: templates/settings.php:3
 msgid "Enable Files Versioning"
 msgstr "Включить ведение версий файлов"
diff --git a/l10n/ru/settings.po b/l10n/ru/settings.po
index 42e7017adc..e72a9f71d8 100644
--- a/l10n/ru/settings.po
+++ b/l10n/ru/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-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-01 13:35+0200\n"
+"PO-Revision-Date: 2012-09-01 11:35+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"
@@ -77,66 +77,85 @@ msgstr "Русский "
 msgid "Security Warning"
 msgstr "Предупреждение безопасности"
 
-#: templates/admin.php:29
+#: templates/admin.php:17
+msgid ""
+"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."
+msgstr ""
+
+#: templates/admin.php:31
 msgid "Cron"
 msgstr "Задание"
 
-#: templates/admin.php:31
+#: templates/admin.php:33
 msgid "execute one task with each page loaded"
 msgstr "Запускать задание при загрузке каждой страницы"
 
-#: templates/admin.php:33
+#: templates/admin.php:35
 msgid "cron.php is registered at a webcron service"
 msgstr "cron.php зарегистрирован в webcron сервисе"
 
-#: templates/admin.php:35
+#: templates/admin.php:37
 msgid "use systems cron service"
 msgstr "использовать системные задания"
 
-#: templates/admin.php:39
+#: templates/admin.php:41
 msgid "Share API"
 msgstr ""
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:45
+#: templates/admin.php:47
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:49
+#: templates/admin.php:51
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:50
+#: templates/admin.php:52
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:54
+#: templates/admin.php:56
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:55
+#: templates/admin.php:57
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:62
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:67
+#: templates/admin.php:69
 msgid "Log"
 msgstr "Журнал"
 
-#: templates/admin.php:95
+#: templates/admin.php:97
 msgid "More"
 msgstr "Ещё"
 
+#: templates/admin.php:105
+msgid ""
+"Developed by the <a href=\"http://ownCloud.org/contact\" "
+"target=\"_blank\">ownCloud community</a>, the <a "
+"href=\"https://github.com/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>."
+msgstr ""
+
 #: templates/apps.php:10
 msgid "Add your App"
 msgstr "Добавить приложение"
diff --git a/l10n/ru_RU/files_versions.po b/l10n/ru_RU/files_versions.po
index ca15399f31..f7ff8068c7 100644
--- a/l10n/ru_RU/files_versions.po
+++ b/l10n/ru_RU/files_versions.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-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-12 22:37+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-09-01 13:35+0200\n"
+"PO-Revision-Date: 2012-09-01 11:35+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -17,10 +17,18 @@ msgstr ""
 "Language: ru_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
+#: js/settings-personal.js:31 templates/settings-personal.php:10
 msgid "Expire all versions"
 msgstr ""
 
+#: templates/settings-personal.php:4
+msgid "Versions"
+msgstr ""
+
+#: templates/settings-personal.php:7
+msgid "This will delete all existing backup versions of your files"
+msgstr ""
+
 #: templates/settings.php:3
 msgid "Enable Files Versioning"
 msgstr ""
diff --git a/l10n/ru_RU/settings.po b/l10n/ru_RU/settings.po
index 5b3ed47251..92c57bb805 100644
--- a/l10n/ru_RU/settings.po
+++ b/l10n/ru_RU/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-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-01 13:35+0200\n"
+"PO-Revision-Date: 2012-09-01 11:35+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n"
 "MIME-Version: 1.0\n"
@@ -69,66 +69,85 @@ msgstr ""
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:29
-msgid "Cron"
+#: templates/admin.php:17
+msgid ""
+"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."
 msgstr ""
 
 #: templates/admin.php:31
-msgid "execute one task with each page loaded"
+msgid "Cron"
 msgstr ""
 
 #: templates/admin.php:33
-msgid "cron.php is registered at a webcron service"
+msgid "execute one task with each page loaded"
 msgstr ""
 
 #: templates/admin.php:35
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:37
 msgid "use systems cron service"
 msgstr ""
 
-#: templates/admin.php:39
+#: templates/admin.php:41
 msgid "Share API"
 msgstr ""
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:45
+#: templates/admin.php:47
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:49
+#: templates/admin.php:51
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:50
+#: templates/admin.php:52
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:54
+#: templates/admin.php:56
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:55
+#: templates/admin.php:57
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:62
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:67
+#: templates/admin.php:69
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:95
+#: templates/admin.php:97
 msgid "More"
 msgstr ""
 
+#: templates/admin.php:105
+msgid ""
+"Developed by the <a href=\"http://ownCloud.org/contact\" "
+"target=\"_blank\">ownCloud community</a>, the <a "
+"href=\"https://github.com/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>."
+msgstr ""
+
 #: templates/apps.php:10
 msgid "Add your App"
 msgstr ""
diff --git a/l10n/sk_SK/files_versions.po b/l10n/sk_SK/files_versions.po
index 0b50ad267a..0f50826d2b 100644
--- a/l10n/sk_SK/files_versions.po
+++ b/l10n/sk_SK/files_versions.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:37+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-09-01 13:35+0200\n"
+"PO-Revision-Date: 2012-09-01 11:35+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,10 +17,18 @@ msgstr ""
 "Language: sk_SK\n"
 "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
 
-#: js/settings-personal.js:31
+#: js/settings-personal.js:31 templates/settings-personal.php:10
 msgid "Expire all versions"
 msgstr ""
 
+#: templates/settings-personal.php:4
+msgid "Versions"
+msgstr ""
+
+#: templates/settings-personal.php:7
+msgid "This will delete all existing backup versions of your files"
+msgstr ""
+
 #: templates/settings.php:3
 msgid "Enable Files Versioning"
 msgstr ""
diff --git a/l10n/sk_SK/settings.po b/l10n/sk_SK/settings.po
index cdc21b8fc6..c16ce73069 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-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-01 13:35+0200\n"
+"PO-Revision-Date: 2012-09-01 11:35+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"
@@ -72,66 +72,85 @@ msgstr "Slovensky"
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:29
-msgid "Cron"
+#: templates/admin.php:17
+msgid ""
+"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."
 msgstr ""
 
 #: templates/admin.php:31
-msgid "execute one task with each page loaded"
+msgid "Cron"
 msgstr ""
 
 #: templates/admin.php:33
-msgid "cron.php is registered at a webcron service"
+msgid "execute one task with each page loaded"
 msgstr ""
 
 #: templates/admin.php:35
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:37
 msgid "use systems cron service"
 msgstr ""
 
-#: templates/admin.php:39
+#: templates/admin.php:41
 msgid "Share API"
 msgstr ""
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:45
+#: templates/admin.php:47
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:49
+#: templates/admin.php:51
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:50
+#: templates/admin.php:52
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:54
+#: templates/admin.php:56
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:55
+#: templates/admin.php:57
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:62
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:67
+#: templates/admin.php:69
 msgid "Log"
 msgstr "Záznam"
 
-#: templates/admin.php:95
+#: templates/admin.php:97
 msgid "More"
 msgstr "Viac"
 
+#: templates/admin.php:105
+msgid ""
+"Developed by the <a href=\"http://ownCloud.org/contact\" "
+"target=\"_blank\">ownCloud community</a>, the <a "
+"href=\"https://github.com/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>."
+msgstr ""
+
 #: templates/apps.php:10
 msgid "Add your App"
 msgstr "Pridať vašu aplikáciu"
diff --git a/l10n/sl/files_versions.po b/l10n/sl/files_versions.po
index 5e6bbbb485..a018b4cf42 100644
--- a/l10n/sl/files_versions.po
+++ b/l10n/sl/files_versions.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 00:25+0000\n"
-"Last-Translator: Peter Peroša <peter.perosa@gmail.com>\n"
+"POT-Creation-Date: 2012-09-01 13:35+0200\n"
+"PO-Revision-Date: 2012-09-01 11:35+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,10 +18,18 @@ 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"
 
-#: js/settings-personal.js:31
+#: js/settings-personal.js:31 templates/settings-personal.php:10
 msgid "Expire all versions"
 msgstr "Zastaraj vse različice"
 
+#: templates/settings-personal.php:4
+msgid "Versions"
+msgstr ""
+
+#: templates/settings-personal.php:7
+msgid "This will delete all existing backup versions of your files"
+msgstr ""
+
 #: templates/settings.php:3
 msgid "Enable Files Versioning"
 msgstr "Omogoči sledenje različicam datotek"
diff --git a/l10n/sl/lib.po b/l10n/sl/lib.po
index 8b9d7de0fa..c94a108ee3 100644
--- a/l10n/sl/lib.po
+++ b/l10n/sl/lib.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-09-01 02:01+0200\n"
-"PO-Revision-Date: 2012-09-01 00:02+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-01 13:35+0200\n"
+"PO-Revision-Date: 2012-09-01 09: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"
@@ -115,12 +115,12 @@ msgstr "let nazaj"
 #: updater.php:66
 #, php-format
 msgid "%s is available. Get <a href=\"%s\">more information</a>"
-msgstr ""
+msgstr "%s je na voljo. <a href=\"%s\">Več informacij.</a>"
 
 #: updater.php:68
 msgid "up to date"
-msgstr ""
+msgstr "ažuren"
 
 #: updater.php:71
 msgid "updates check is disabled"
-msgstr ""
+msgstr "preverjanje za posodobitve je onemogočeno"
diff --git a/l10n/sl/settings.po b/l10n/sl/settings.po
index 6cb24d59f8..299979763b 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-09-01 02:01+0200\n"
-"PO-Revision-Date: 2012-08-31 14:24+0000\n"
-"Last-Translator: Peter Peroša <peter.perosa@gmail.com>\n"
+"POT-Creation-Date: 2012-09-01 13:35+0200\n"
+"PO-Revision-Date: 2012-09-01 11:35+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"
@@ -72,66 +72,85 @@ msgstr "__ime_jezika__"
 msgid "Security Warning"
 msgstr "Varnostno opozorilo"
 
-#: templates/admin.php:29
+#: templates/admin.php:17
+msgid ""
+"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."
+msgstr ""
+
+#: templates/admin.php:31
 msgid "Cron"
 msgstr "Periodično opravilo"
 
-#: templates/admin.php:31
+#: templates/admin.php:33
 msgid "execute one task with each page loaded"
 msgstr "izvedi eno nalogo z vsako naloženo stranjo"
 
-#: templates/admin.php:33
+#: templates/admin.php:35
 msgid "cron.php is registered at a webcron service"
 msgstr "cron.php je vpisan na storitev webcron"
 
-#: templates/admin.php:35
+#: templates/admin.php:37
 msgid "use systems cron service"
 msgstr "uporabi sistemski servis za periodična opravila"
 
-#: templates/admin.php:39
+#: templates/admin.php:41
 msgid "Share API"
 msgstr "API souporabe"
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Enable Share API"
 msgstr "Omogoči API souporabe"
 
-#: templates/admin.php:45
+#: templates/admin.php:47
 msgid "Allow apps to use the Share API"
 msgstr "Dovoli aplikacijam uporabo API-ja souporabe"
 
-#: templates/admin.php:49
+#: templates/admin.php:51
 msgid "Allow links"
 msgstr "Dovoli povezave"
 
-#: templates/admin.php:50
+#: templates/admin.php:52
 msgid "Allow users to share items to the public with links"
 msgstr "Uporabnikom dovoli souporabo z javnimi povezavami"
 
-#: templates/admin.php:54
+#: templates/admin.php:56
 msgid "Allow resharing"
 msgstr "Dovoli nadaljnjo souporabo"
 
-#: templates/admin.php:55
+#: templates/admin.php:57
 msgid "Allow users to share items shared with them again"
 msgstr "Uporabnikom dovoli nadaljnjo souporabo"
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Allow users to share with anyone"
 msgstr "Uporabnikom dovoli souporabo s komerkoli"
 
-#: templates/admin.php:60
+#: templates/admin.php:62
 msgid "Allow users to only share with users in their groups"
 msgstr "Uporabnikom dovoli souporabo le znotraj njihove skupine"
 
-#: templates/admin.php:67
+#: templates/admin.php:69
 msgid "Log"
 msgstr "Dnevnik"
 
-#: templates/admin.php:95
+#: templates/admin.php:97
 msgid "More"
 msgstr "Več"
 
+#: templates/admin.php:105
+msgid ""
+"Developed by the <a href=\"http://ownCloud.org/contact\" "
+"target=\"_blank\">ownCloud community</a>, the <a "
+"href=\"https://github.com/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>."
+msgstr ""
+
 #: templates/apps.php:10
 msgid "Add your App"
 msgstr "Dodajte vašo aplikacijo"
diff --git a/l10n/so/files_versions.po b/l10n/so/files_versions.po
index 0c1f4e95a6..ce768ee5ce 100644
--- a/l10n/so/files_versions.po
+++ b/l10n/so/files_versions.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:37+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-09-01 13:35+0200\n"
+"PO-Revision-Date: 2012-09-01 11:35+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,10 +17,18 @@ msgstr ""
 "Language: so\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: js/settings-personal.js:31
+#: js/settings-personal.js:31 templates/settings-personal.php:10
 msgid "Expire all versions"
 msgstr ""
 
+#: templates/settings-personal.php:4
+msgid "Versions"
+msgstr ""
+
+#: templates/settings-personal.php:7
+msgid "This will delete all existing backup versions of your files"
+msgstr ""
+
 #: templates/settings.php:3
 msgid "Enable Files Versioning"
 msgstr ""
diff --git a/l10n/so/settings.po b/l10n/so/settings.po
index a3488b9f01..213fb1dc72 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-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-01 13:35+0200\n"
+"PO-Revision-Date: 2012-09-01 11:35+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"
@@ -69,66 +69,85 @@ msgstr ""
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:29
-msgid "Cron"
+#: templates/admin.php:17
+msgid ""
+"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."
 msgstr ""
 
 #: templates/admin.php:31
-msgid "execute one task with each page loaded"
+msgid "Cron"
 msgstr ""
 
 #: templates/admin.php:33
-msgid "cron.php is registered at a webcron service"
+msgid "execute one task with each page loaded"
 msgstr ""
 
 #: templates/admin.php:35
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:37
 msgid "use systems cron service"
 msgstr ""
 
-#: templates/admin.php:39
+#: templates/admin.php:41
 msgid "Share API"
 msgstr ""
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:45
+#: templates/admin.php:47
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:49
+#: templates/admin.php:51
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:50
+#: templates/admin.php:52
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:54
+#: templates/admin.php:56
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:55
+#: templates/admin.php:57
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:62
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:67
+#: templates/admin.php:69
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:95
+#: templates/admin.php:97
 msgid "More"
 msgstr ""
 
+#: templates/admin.php:105
+msgid ""
+"Developed by the <a href=\"http://ownCloud.org/contact\" "
+"target=\"_blank\">ownCloud community</a>, the <a "
+"href=\"https://github.com/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>."
+msgstr ""
+
 #: templates/apps.php:10
 msgid "Add your App"
 msgstr ""
diff --git a/l10n/sr/files_versions.po b/l10n/sr/files_versions.po
index e25e3766f3..b252793ef8 100644
--- a/l10n/sr/files_versions.po
+++ b/l10n/sr/files_versions.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:37+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-09-01 13:35+0200\n"
+"PO-Revision-Date: 2012-09-01 11:35+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,10 +17,18 @@ 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"
 
-#: js/settings-personal.js:31
+#: js/settings-personal.js:31 templates/settings-personal.php:10
 msgid "Expire all versions"
 msgstr ""
 
+#: templates/settings-personal.php:4
+msgid "Versions"
+msgstr ""
+
+#: templates/settings-personal.php:7
+msgid "This will delete all existing backup versions of your files"
+msgstr ""
+
 #: templates/settings.php:3
 msgid "Enable Files Versioning"
 msgstr ""
diff --git a/l10n/sr/settings.po b/l10n/sr/settings.po
index f15d091582..a88fd07b1e 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-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-01 13:35+0200\n"
+"PO-Revision-Date: 2012-09-01 11:35+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"
@@ -70,66 +70,85 @@ msgstr ""
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:29
-msgid "Cron"
+#: templates/admin.php:17
+msgid ""
+"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."
 msgstr ""
 
 #: templates/admin.php:31
-msgid "execute one task with each page loaded"
+msgid "Cron"
 msgstr ""
 
 #: templates/admin.php:33
-msgid "cron.php is registered at a webcron service"
+msgid "execute one task with each page loaded"
 msgstr ""
 
 #: templates/admin.php:35
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:37
 msgid "use systems cron service"
 msgstr ""
 
-#: templates/admin.php:39
+#: templates/admin.php:41
 msgid "Share API"
 msgstr ""
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:45
+#: templates/admin.php:47
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:49
+#: templates/admin.php:51
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:50
+#: templates/admin.php:52
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:54
+#: templates/admin.php:56
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:55
+#: templates/admin.php:57
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:62
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:67
+#: templates/admin.php:69
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:95
+#: templates/admin.php:97
 msgid "More"
 msgstr ""
 
+#: templates/admin.php:105
+msgid ""
+"Developed by the <a href=\"http://ownCloud.org/contact\" "
+"target=\"_blank\">ownCloud community</a>, the <a "
+"href=\"https://github.com/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>."
+msgstr ""
+
 #: templates/apps.php:10
 msgid "Add your App"
 msgstr ""
diff --git a/l10n/sr@latin/files_versions.po b/l10n/sr@latin/files_versions.po
index 5fae2a88e1..23dcd43098 100644
--- a/l10n/sr@latin/files_versions.po
+++ b/l10n/sr@latin/files_versions.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:37+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-09-01 13:35+0200\n"
+"PO-Revision-Date: 2012-09-01 11:35+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,10 +17,18 @@ 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"
 
-#: js/settings-personal.js:31
+#: js/settings-personal.js:31 templates/settings-personal.php:10
 msgid "Expire all versions"
 msgstr ""
 
+#: templates/settings-personal.php:4
+msgid "Versions"
+msgstr ""
+
+#: templates/settings-personal.php:7
+msgid "This will delete all existing backup versions of your files"
+msgstr ""
+
 #: templates/settings.php:3
 msgid "Enable Files Versioning"
 msgstr ""
diff --git a/l10n/sr@latin/settings.po b/l10n/sr@latin/settings.po
index 6c84ec656f..30636c4044 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-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-01 13:35+0200\n"
+"PO-Revision-Date: 2012-09-01 11:35+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"
@@ -70,66 +70,85 @@ msgstr ""
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:29
-msgid "Cron"
+#: templates/admin.php:17
+msgid ""
+"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."
 msgstr ""
 
 #: templates/admin.php:31
-msgid "execute one task with each page loaded"
+msgid "Cron"
 msgstr ""
 
 #: templates/admin.php:33
-msgid "cron.php is registered at a webcron service"
+msgid "execute one task with each page loaded"
 msgstr ""
 
 #: templates/admin.php:35
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:37
 msgid "use systems cron service"
 msgstr ""
 
-#: templates/admin.php:39
+#: templates/admin.php:41
 msgid "Share API"
 msgstr ""
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:45
+#: templates/admin.php:47
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:49
+#: templates/admin.php:51
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:50
+#: templates/admin.php:52
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:54
+#: templates/admin.php:56
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:55
+#: templates/admin.php:57
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:62
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:67
+#: templates/admin.php:69
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:95
+#: templates/admin.php:97
 msgid "More"
 msgstr ""
 
+#: templates/admin.php:105
+msgid ""
+"Developed by the <a href=\"http://ownCloud.org/contact\" "
+"target=\"_blank\">ownCloud community</a>, the <a "
+"href=\"https://github.com/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>."
+msgstr ""
+
 #: templates/apps.php:10
 msgid "Add your App"
 msgstr ""
diff --git a/l10n/sv/files_versions.po b/l10n/sv/files_versions.po
index f33072ac6d..53aac5ef45 100644
--- a/l10n/sv/files_versions.po
+++ b/l10n/sv/files_versions.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:33+0000\n"
-"Last-Translator: Magnus Höglund <magnus@linux.com>\n"
+"POT-Creation-Date: 2012-09-01 13:35+0200\n"
+"PO-Revision-Date: 2012-09-01 11:35+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,10 +18,18 @@ msgstr ""
 "Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: js/settings-personal.js:31
+#: js/settings-personal.js:31 templates/settings-personal.php:10
 msgid "Expire all versions"
 msgstr "Upphör alla versioner"
 
+#: templates/settings-personal.php:4
+msgid "Versions"
+msgstr ""
+
+#: templates/settings-personal.php:7
+msgid "This will delete all existing backup versions of your files"
+msgstr ""
+
 #: templates/settings.php:3
 msgid "Enable Files Versioning"
 msgstr "Aktivera versionshantering"
diff --git a/l10n/sv/lib.po b/l10n/sv/lib.po
index 711935d56e..088f184b99 100644
--- a/l10n/sv/lib.po
+++ b/l10n/sv/lib.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-09-01 02:01+0200\n"
-"PO-Revision-Date: 2012-09-01 00:02+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-01 13:35+0200\n"
+"PO-Revision-Date: 2012-09-01 10:13+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"
@@ -116,12 +116,12 @@ msgstr "år sedan"
 #: updater.php:66
 #, php-format
 msgid "%s is available. Get <a href=\"%s\">more information</a>"
-msgstr ""
+msgstr "%s finns. Få <a href=\"%s\">mer information</a>"
 
 #: updater.php:68
 msgid "up to date"
-msgstr ""
+msgstr "uppdaterad"
 
 #: updater.php:71
 msgid "updates check is disabled"
-msgstr ""
+msgstr "uppdateringskontroll är inaktiverad"
diff --git a/l10n/sv/settings.po b/l10n/sv/settings.po
index b2111ddb48..997e9e8f8e 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-09-01 02:01+0200\n"
-"PO-Revision-Date: 2012-08-31 08:23+0000\n"
-"Last-Translator: Magnus Höglund <magnus@linux.com>\n"
+"POT-Creation-Date: 2012-09-01 13:35+0200\n"
+"PO-Revision-Date: 2012-09-01 11:35+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"
@@ -76,66 +76,85 @@ msgstr "__language_name__"
 msgid "Security Warning"
 msgstr "Säkerhetsvarning"
 
-#: templates/admin.php:29
+#: templates/admin.php:17
+msgid ""
+"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."
+msgstr ""
+
+#: templates/admin.php:31
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:31
+#: templates/admin.php:33
 msgid "execute one task with each page loaded"
 msgstr "utför en uppgift vid varje sidladdning"
 
-#: templates/admin.php:33
+#: templates/admin.php:35
 msgid "cron.php is registered at a webcron service"
 msgstr "cron.php är registrerad på en webcron-tjänst"
 
-#: templates/admin.php:35
+#: templates/admin.php:37
 msgid "use systems cron service"
 msgstr "använd systemets cron-tjänst"
 
-#: templates/admin.php:39
+#: templates/admin.php:41
 msgid "Share API"
 msgstr "Delat API"
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Enable Share API"
 msgstr "Aktivera delat API"
 
-#: templates/admin.php:45
+#: templates/admin.php:47
 msgid "Allow apps to use the Share API"
 msgstr "Tillåt applikationer att använda delat API"
 
-#: templates/admin.php:49
+#: templates/admin.php:51
 msgid "Allow links"
 msgstr "Tillåt länkar"
 
-#: templates/admin.php:50
+#: templates/admin.php:52
 msgid "Allow users to share items to the public with links"
 msgstr "Tillåt delning till allmänheten via publika länkar"
 
-#: templates/admin.php:54
+#: templates/admin.php:56
 msgid "Allow resharing"
 msgstr "Tillåt dela vidare"
 
-#: templates/admin.php:55
+#: templates/admin.php:57
 msgid "Allow users to share items shared with them again"
 msgstr "Tillåt användare att dela vidare filer som delats med dom"
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Allow users to share with anyone"
 msgstr "Tillåt delning med alla"
 
-#: templates/admin.php:60
+#: templates/admin.php:62
 msgid "Allow users to only share with users in their groups"
 msgstr "Tillåt bara delning med användare i egna grupper"
 
-#: templates/admin.php:67
+#: templates/admin.php:69
 msgid "Log"
 msgstr "Logg"
 
-#: templates/admin.php:95
+#: templates/admin.php:97
 msgid "More"
 msgstr "Mera"
 
+#: templates/admin.php:105
+msgid ""
+"Developed by the <a href=\"http://ownCloud.org/contact\" "
+"target=\"_blank\">ownCloud community</a>, the <a "
+"href=\"https://github.com/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>."
+msgstr ""
+
 #: templates/apps.php:10
 msgid "Add your App"
 msgstr "Lägg till din applikation"
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index 5ec454483f..952661ec2c 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-09-01 02:01+0200\n"
+"POT-Creation-Date: 2012-09-01 13:35+0200\n"
 "PO-Revision-Date: YEAR-MO-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 aba316e626..89e2e6fd42 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-09-01 02:01+0200\n"
+"POT-Creation-Date: 2012-09-01 13:35+0200\n"
 "PO-Revision-Date: YEAR-MO-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 80c2aea915..bcc4c1f485 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-09-01 02:01+0200\n"
+"POT-Creation-Date: 2012-09-01 13:35+0200\n"
 "PO-Revision-Date: YEAR-MO-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 e9739cd6a0..e1bf8b8970 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-09-01 02:01+0200\n"
+"POT-Creation-Date: 2012-09-01 13:35+0200\n"
 "PO-Revision-Date: YEAR-MO-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 6cfc4adf2a..c184445e56 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-09-01 02:01+0200\n"
+"POT-Creation-Date: 2012-09-01 13:35+0200\n"
 "PO-Revision-Date: YEAR-MO-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 8eb6946278..41fa04d0eb 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-09-01 02:01+0200\n"
+"POT-Creation-Date: 2012-09-01 13:35+0200\n"
 "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,18 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: js/settings-personal.js:31
+#: js/settings-personal.js:31 templates/settings-personal.php:10
 msgid "Expire all versions"
 msgstr ""
 
+#: templates/settings-personal.php:4
+msgid "Versions"
+msgstr ""
+
+#: templates/settings-personal.php:7
+msgid "This will delete all existing backup versions of your files"
+msgstr ""
+
 #: templates/settings.php:3
 msgid "Enable Files Versioning"
 msgstr ""
diff --git a/l10n/templates/lib.pot b/l10n/templates/lib.pot
index 1024b00ff3..5daeff661a 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-09-01 02:01+0200\n"
+"POT-Creation-Date: 2012-09-01 13:35+0200\n"
 "PO-Revision-Date: YEAR-MO-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 110d19e434..a44d444bc8 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-09-01 02:01+0200\n"
+"POT-Creation-Date: 2012-09-01 13:35+0200\n"
 "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,66 +69,84 @@ msgstr ""
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:29
-msgid "Cron"
+#: templates/admin.php:17
+msgid ""
+"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."
 msgstr ""
 
 #: templates/admin.php:31
-msgid "execute one task with each page loaded"
+msgid "Cron"
 msgstr ""
 
 #: templates/admin.php:33
-msgid "cron.php is registered at a webcron service"
+msgid "execute one task with each page loaded"
 msgstr ""
 
 #: templates/admin.php:35
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:37
 msgid "use systems cron service"
 msgstr ""
 
-#: templates/admin.php:39
+#: templates/admin.php:41
 msgid "Share API"
 msgstr ""
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:45
+#: templates/admin.php:47
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:49
+#: templates/admin.php:51
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:50
+#: templates/admin.php:52
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:54
+#: templates/admin.php:56
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:55
+#: templates/admin.php:57
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:62
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:67
+#: templates/admin.php:69
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:95
+#: templates/admin.php:97
 msgid "More"
 msgstr ""
 
+#: templates/admin.php:105
+msgid ""
+"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank"
+"\">ownCloud community</a>, the <a href=\"https://github.com/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>."
+msgstr ""
+
 #: templates/apps.php:10
 msgid "Add your App"
 msgstr ""
diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot
index 7b87fc39d3..56b6b0067b 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-09-01 02:01+0200\n"
+"POT-Creation-Date: 2012-09-01 13:35+0200\n"
 "PO-Revision-Date: YEAR-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_versions.po b/l10n/th_TH/files_versions.po
index 4bab33ad9f..178ff67a95 100644
--- a/l10n/th_TH/files_versions.po
+++ b/l10n/th_TH/files_versions.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:11+0000\n"
-"Last-Translator: AriesAnywhere Anywhere <ariesanywhere@gmail.com>\n"
+"POT-Creation-Date: 2012-09-01 13:35+0200\n"
+"PO-Revision-Date: 2012-09-01 11:35+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,10 +18,18 @@ msgstr ""
 "Language: th_TH\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: js/settings-personal.js:31
+#: js/settings-personal.js:31 templates/settings-personal.php:10
 msgid "Expire all versions"
 msgstr "หมดอายุทุกรุ่น"
 
+#: templates/settings-personal.php:4
+msgid "Versions"
+msgstr ""
+
+#: templates/settings-personal.php:7
+msgid "This will delete all existing backup versions of your files"
+msgstr ""
+
 #: templates/settings.php:3
 msgid "Enable Files Versioning"
 msgstr "เปิดใช้งานคุณสมบัติการแยกสถานะรุ่นหรือเวอร์ชั่นของไฟล์"
diff --git a/l10n/th_TH/settings.po b/l10n/th_TH/settings.po
index fa0161c36c..fe1fc15e9e 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-09-01 02:01+0200\n"
-"PO-Revision-Date: 2012-08-31 17:08+0000\n"
-"Last-Translator: AriesAnywhere Anywhere <ariesanywhere@gmail.com>\n"
+"POT-Creation-Date: 2012-09-01 13:35+0200\n"
+"PO-Revision-Date: 2012-09-01 11:35+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"
@@ -72,66 +72,85 @@ msgstr "ภาษาไทย"
 msgid "Security Warning"
 msgstr "คำเตือนเกี่ยวกับความปลอดภัย"
 
-#: templates/admin.php:29
+#: templates/admin.php:17
+msgid ""
+"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."
+msgstr ""
+
+#: templates/admin.php:31
 msgid "Cron"
 msgstr "Cron"
 
-#: templates/admin.php:31
+#: templates/admin.php:33
 msgid "execute one task with each page loaded"
 msgstr "ประมวลผลหนึ่งงานเมื่อโหลดหน้าเว็บแต่ละครั้ง"
 
-#: templates/admin.php:33
+#: templates/admin.php:35
 msgid "cron.php is registered at a webcron service"
 msgstr "cron.php ได้ถูกลงทะเบียนที่บริการ webcron"
 
-#: templates/admin.php:35
+#: templates/admin.php:37
 msgid "use systems cron service"
 msgstr "ใช้บริการ cron จากระบบ"
 
-#: templates/admin.php:39
+#: templates/admin.php:41
 msgid "Share API"
 msgstr "API สำหรับคุณสมบัติแชร์ข้อมูล"
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Enable Share API"
 msgstr "เปิดใช้งาน API สำหรับคุณสมบัติแชร์ข้อมูล"
 
-#: templates/admin.php:45
+#: templates/admin.php:47
 msgid "Allow apps to use the Share API"
 msgstr "อนุญาตให้แอปฯสามารถใช้ API สำหรับแชร์ข้อมูลได้"
 
-#: templates/admin.php:49
+#: templates/admin.php:51
 msgid "Allow links"
 msgstr "อนุญาตให้ใช้งานลิงก์ได้"
 
-#: templates/admin.php:50
+#: templates/admin.php:52
 msgid "Allow users to share items to the public with links"
 msgstr "อนุญาตให้ผู้ใช้งานสามารถแชร์ข้อมูลรายการต่างๆไปให้สาธารณะชนเป็นลิงก์ได้"
 
-#: templates/admin.php:54
+#: templates/admin.php:56
 msgid "Allow resharing"
 msgstr "อนุญาตให้แชร์ข้อมูลซ้ำใหม่ได้"
 
-#: templates/admin.php:55
+#: templates/admin.php:57
 msgid "Allow users to share items shared with them again"
 msgstr "อนุญาตให้ผู้ใช้งานแชร์ข้อมูลรายการต่างๆที่ถูกแชร์มาให้ตัวผู้ใช้งานได้เท่านั้น"
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Allow users to share with anyone"
 msgstr "อนุญาตให้ผู้ใช้งานแชร์ข้อมูลถึงใครก็ได้"
 
-#: templates/admin.php:60
+#: templates/admin.php:62
 msgid "Allow users to only share with users in their groups"
 msgstr "อนุญาตให้ผู้ใช้งานแชร์ข้อมูลได้เฉพาะกับผู้ใช้งานที่อยู่ในกลุ่มเดียวกันเท่านั้น"
 
-#: templates/admin.php:67
+#: templates/admin.php:69
 msgid "Log"
 msgstr "บันทึกการเปลี่ยนแปลง"
 
-#: templates/admin.php:95
+#: templates/admin.php:97
 msgid "More"
 msgstr "เพิ่มเติม"
 
+#: templates/admin.php:105
+msgid ""
+"Developed by the <a href=\"http://ownCloud.org/contact\" "
+"target=\"_blank\">ownCloud community</a>, the <a "
+"href=\"https://github.com/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>."
+msgstr ""
+
 #: templates/apps.php:10
 msgid "Add your App"
 msgstr "เพิ่มแอปของคุณ"
diff --git a/l10n/tr/files_versions.po b/l10n/tr/files_versions.po
index 5b16302845..be45079a55 100644
--- a/l10n/tr/files_versions.po
+++ b/l10n/tr/files_versions.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:37+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-09-01 13:35+0200\n"
+"PO-Revision-Date: 2012-09-01 11:35+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,10 +17,18 @@ msgstr ""
 "Language: tr\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: js/settings-personal.js:31
+#: js/settings-personal.js:31 templates/settings-personal.php:10
 msgid "Expire all versions"
 msgstr ""
 
+#: templates/settings-personal.php:4
+msgid "Versions"
+msgstr ""
+
+#: templates/settings-personal.php:7
+msgid "This will delete all existing backup versions of your files"
+msgstr ""
+
 #: templates/settings.php:3
 msgid "Enable Files Versioning"
 msgstr ""
diff --git a/l10n/tr/settings.po b/l10n/tr/settings.po
index 708860c4e4..3c94cad642 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-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-01 13:35+0200\n"
+"PO-Revision-Date: 2012-09-01 11:35+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"
@@ -72,66 +72,85 @@ msgstr "__dil_adı__"
 msgid "Security Warning"
 msgstr "Güvenlik Uyarisi"
 
-#: templates/admin.php:29
-msgid "Cron"
+#: templates/admin.php:17
+msgid ""
+"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."
 msgstr ""
 
 #: templates/admin.php:31
-msgid "execute one task with each page loaded"
+msgid "Cron"
 msgstr ""
 
 #: templates/admin.php:33
-msgid "cron.php is registered at a webcron service"
+msgid "execute one task with each page loaded"
 msgstr ""
 
 #: templates/admin.php:35
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:37
 msgid "use systems cron service"
 msgstr ""
 
-#: templates/admin.php:39
+#: templates/admin.php:41
 msgid "Share API"
 msgstr ""
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:45
+#: templates/admin.php:47
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:49
+#: templates/admin.php:51
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:50
+#: templates/admin.php:52
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:54
+#: templates/admin.php:56
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:55
+#: templates/admin.php:57
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:62
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:67
+#: templates/admin.php:69
 msgid "Log"
 msgstr "Günlük"
 
-#: templates/admin.php:95
+#: templates/admin.php:97
 msgid "More"
 msgstr "Devamı"
 
+#: templates/admin.php:105
+msgid ""
+"Developed by the <a href=\"http://ownCloud.org/contact\" "
+"target=\"_blank\">ownCloud community</a>, the <a "
+"href=\"https://github.com/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>."
+msgstr ""
+
 #: templates/apps.php:10
 msgid "Add your App"
 msgstr "Uygulamanı Ekle"
diff --git a/l10n/uk/files_versions.po b/l10n/uk/files_versions.po
index fdbf46f9cb..f2a35bd674 100644
--- a/l10n/uk/files_versions.po
+++ b/l10n/uk/files_versions.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:37+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-09-01 13:35+0200\n"
+"PO-Revision-Date: 2012-09-01 11:35+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,10 +17,18 @@ 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"
 
-#: js/settings-personal.js:31
+#: js/settings-personal.js:31 templates/settings-personal.php:10
 msgid "Expire all versions"
 msgstr ""
 
+#: templates/settings-personal.php:4
+msgid "Versions"
+msgstr ""
+
+#: templates/settings-personal.php:7
+msgid "This will delete all existing backup versions of your files"
+msgstr ""
+
 #: templates/settings.php:3
 msgid "Enable Files Versioning"
 msgstr ""
diff --git a/l10n/uk/settings.po b/l10n/uk/settings.po
index 2520334ef9..39b06fff47 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-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-01 13:35+0200\n"
+"PO-Revision-Date: 2012-09-01 11:35+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"
@@ -70,66 +70,85 @@ msgstr ""
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:29
-msgid "Cron"
+#: templates/admin.php:17
+msgid ""
+"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."
 msgstr ""
 
 #: templates/admin.php:31
-msgid "execute one task with each page loaded"
+msgid "Cron"
 msgstr ""
 
 #: templates/admin.php:33
-msgid "cron.php is registered at a webcron service"
+msgid "execute one task with each page loaded"
 msgstr ""
 
 #: templates/admin.php:35
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:37
 msgid "use systems cron service"
 msgstr ""
 
-#: templates/admin.php:39
+#: templates/admin.php:41
 msgid "Share API"
 msgstr ""
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:45
+#: templates/admin.php:47
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:49
+#: templates/admin.php:51
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:50
+#: templates/admin.php:52
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:54
+#: templates/admin.php:56
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:55
+#: templates/admin.php:57
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:62
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:67
+#: templates/admin.php:69
 msgid "Log"
 msgstr ""
 
-#: templates/admin.php:95
+#: templates/admin.php:97
 msgid "More"
 msgstr ""
 
+#: templates/admin.php:105
+msgid ""
+"Developed by the <a href=\"http://ownCloud.org/contact\" "
+"target=\"_blank\">ownCloud community</a>, the <a "
+"href=\"https://github.com/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>."
+msgstr ""
+
 #: templates/apps.php:10
 msgid "Add your App"
 msgstr ""
diff --git a/l10n/vi/files_versions.po b/l10n/vi/files_versions.po
index 2f97cd4aa3..54f38f2812 100644
--- a/l10n/vi/files_versions.po
+++ b/l10n/vi/files_versions.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:37+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-09-01 13:35+0200\n"
+"PO-Revision-Date: 2012-09-01 11:35+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,10 +17,18 @@ msgstr ""
 "Language: vi\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: js/settings-personal.js:31
+#: js/settings-personal.js:31 templates/settings-personal.php:10
 msgid "Expire all versions"
 msgstr ""
 
+#: templates/settings-personal.php:4
+msgid "Versions"
+msgstr ""
+
+#: templates/settings-personal.php:7
+msgid "This will delete all existing backup versions of your files"
+msgstr ""
+
 #: templates/settings.php:3
 msgid "Enable Files Versioning"
 msgstr ""
diff --git a/l10n/vi/settings.po b/l10n/vi/settings.po
index a83d1c1185..c36c1286e2 100644
--- a/l10n/vi/settings.po
+++ b/l10n/vi/settings.po
@@ -5,12 +5,13 @@
 # Translators:
 # Son Nguyen <sonnghit@gmail.com>, 2012.
 # Sơn Nguyễn <sonnghit@gmail.com>, 2012.
+#   <vlinhd11@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-01 13:35+0200\n"
+"PO-Revision-Date: 2012-09-01 11:35+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"
@@ -21,7 +22,7 @@ msgstr ""
 
 #: ajax/apps/ocs.php:23
 msgid "Unable to load list from App Store"
-msgstr ""
+msgstr "Không thể tải danh sách ứng dụng từ App Store"
 
 #: ajax/lostpassword.php:14
 msgid "Email saved"
@@ -41,7 +42,7 @@ 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 ""
+msgstr "Lỗi xác thực"
 
 #: ajax/setlanguage.php:18
 msgid "Language changed"
@@ -49,7 +50,7 @@ msgstr "Ngôn ngữ đã được thay đổi"
 
 #: js/apps.js:18
 msgid "Error"
-msgstr ""
+msgstr "Lỗi"
 
 #: js/apps.js:39 js/apps.js:73
 msgid "Disable"
@@ -69,68 +70,87 @@ msgstr "__Ngôn ngữ___"
 
 #: templates/admin.php:14
 msgid "Security Warning"
-msgstr ""
+msgstr "Cảnh bảo bảo mật"
 
-#: templates/admin.php:29
-msgid "Cron"
+#: templates/admin.php:17
+msgid ""
+"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."
 msgstr ""
 
 #: templates/admin.php:31
-msgid "execute one task with each page loaded"
+msgid "Cron"
 msgstr ""
 
 #: templates/admin.php:33
-msgid "cron.php is registered at a webcron service"
+msgid "execute one task with each page loaded"
 msgstr ""
 
 #: templates/admin.php:35
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:37
 msgid "use systems cron service"
 msgstr ""
 
-#: templates/admin.php:39
+#: templates/admin.php:41
 msgid "Share API"
 msgstr ""
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:45
+#: templates/admin.php:47
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:49
+#: templates/admin.php:51
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:50
+#: templates/admin.php:52
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:54
+#: templates/admin.php:56
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:55
+#: templates/admin.php:57
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:62
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:67
+#: templates/admin.php:69
 msgid "Log"
 msgstr "Log"
 
-#: templates/admin.php:95
+#: templates/admin.php:97
 msgid "More"
 msgstr "nhiều hơn"
 
+#: templates/admin.php:105
+msgid ""
+"Developed by the <a href=\"http://ownCloud.org/contact\" "
+"target=\"_blank\">ownCloud community</a>, the <a "
+"href=\"https://github.com/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>."
+msgstr ""
+
 #: templates/apps.php:10
 msgid "Add your App"
 msgstr "Thêm ứng dụng của bạn"
diff --git a/l10n/zh_CN.GB2312/files_versions.po b/l10n/zh_CN.GB2312/files_versions.po
index 4eaa105db8..89fa8dd1ef 100644
--- a/l10n/zh_CN.GB2312/files_versions.po
+++ b/l10n/zh_CN.GB2312/files_versions.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:37+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-09-01 13:35+0200\n"
+"PO-Revision-Date: 2012-09-01 11:35+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,10 +17,18 @@ msgstr ""
 "Language: zh_CN.GB2312\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: js/settings-personal.js:31
+#: js/settings-personal.js:31 templates/settings-personal.php:10
 msgid "Expire all versions"
 msgstr ""
 
+#: templates/settings-personal.php:4
+msgid "Versions"
+msgstr ""
+
+#: templates/settings-personal.php:7
+msgid "This will delete all existing backup versions of your files"
+msgstr ""
+
 #: templates/settings.php:3
 msgid "Enable Files Versioning"
 msgstr ""
diff --git a/l10n/zh_CN.GB2312/settings.po b/l10n/zh_CN.GB2312/settings.po
index d0cd8450fc..bba93d3dff 100644
--- a/l10n/zh_CN.GB2312/settings.po
+++ b/l10n/zh_CN.GB2312/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-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-01 13:35+0200\n"
+"PO-Revision-Date: 2012-09-01 11:35+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"
@@ -70,66 +70,85 @@ msgstr "Chinese"
 msgid "Security Warning"
 msgstr "安全警告"
 
-#: templates/admin.php:29
+#: templates/admin.php:17
+msgid ""
+"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."
+msgstr ""
+
+#: templates/admin.php:31
 msgid "Cron"
 msgstr "定时"
 
-#: templates/admin.php:31
+#: templates/admin.php:33
 msgid "execute one task with each page loaded"
 msgstr ""
 
-#: templates/admin.php:33
+#: templates/admin.php:35
 msgid "cron.php is registered at a webcron service"
 msgstr ""
 
-#: templates/admin.php:35
+#: templates/admin.php:37
 msgid "use systems cron service"
 msgstr ""
 
-#: templates/admin.php:39
+#: templates/admin.php:41
 msgid "Share API"
 msgstr ""
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:45
+#: templates/admin.php:47
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:49
+#: templates/admin.php:51
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:50
+#: templates/admin.php:52
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:54
+#: templates/admin.php:56
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:55
+#: templates/admin.php:57
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:62
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:67
+#: templates/admin.php:69
 msgid "Log"
 msgstr "日志"
 
-#: templates/admin.php:95
+#: templates/admin.php:97
 msgid "More"
 msgstr "更多"
 
+#: templates/admin.php:105
+msgid ""
+"Developed by the <a href=\"http://ownCloud.org/contact\" "
+"target=\"_blank\">ownCloud community</a>, the <a "
+"href=\"https://github.com/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>."
+msgstr ""
+
 #: templates/apps.php:10
 msgid "Add your App"
 msgstr "添加你的应用程序"
diff --git a/l10n/zh_CN/files_versions.po b/l10n/zh_CN/files_versions.po
index 4e84f1f4d8..31e3aedf8a 100644
--- a/l10n/zh_CN/files_versions.po
+++ b/l10n/zh_CN/files_versions.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:37+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-09-01 13:35+0200\n"
+"PO-Revision-Date: 2012-09-01 11:35+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,10 +17,18 @@ msgstr ""
 "Language: zh_CN\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: js/settings-personal.js:31
+#: js/settings-personal.js:31 templates/settings-personal.php:10
 msgid "Expire all versions"
 msgstr ""
 
+#: templates/settings-personal.php:4
+msgid "Versions"
+msgstr ""
+
+#: templates/settings-personal.php:7
+msgid "This will delete all existing backup versions of your files"
+msgstr ""
+
 #: templates/settings.php:3
 msgid "Enable Files Versioning"
 msgstr ""
diff --git a/l10n/zh_CN/settings.po b/l10n/zh_CN/settings.po
index d65dee34ef..f5ae4171e6 100644
--- a/l10n/zh_CN/settings.po
+++ b/l10n/zh_CN/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-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-01 13:35+0200\n"
+"PO-Revision-Date: 2012-09-01 11:35+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"
@@ -73,66 +73,85 @@ msgstr "简体中文"
 msgid "Security Warning"
 msgstr "安全警告"
 
-#: templates/admin.php:29
+#: templates/admin.php:17
+msgid ""
+"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."
+msgstr ""
+
+#: templates/admin.php:31
 msgid "Cron"
 msgstr "计划任务"
 
-#: templates/admin.php:31
+#: templates/admin.php:33
 msgid "execute one task with each page loaded"
 msgstr "为每个装入的页面执行任务"
 
-#: templates/admin.php:33
+#: templates/admin.php:35
 msgid "cron.php is registered at a webcron service"
 msgstr "crop.php 已"
 
-#: templates/admin.php:35
+#: templates/admin.php:37
 msgid "use systems cron service"
 msgstr "实现系统 cron 服务"
 
-#: templates/admin.php:39
+#: templates/admin.php:41
 msgid "Share API"
 msgstr ""
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:45
+#: templates/admin.php:47
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:49
+#: templates/admin.php:51
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:50
+#: templates/admin.php:52
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:54
+#: templates/admin.php:56
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:55
+#: templates/admin.php:57
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:62
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:67
+#: templates/admin.php:69
 msgid "Log"
 msgstr "日志"
 
-#: templates/admin.php:95
+#: templates/admin.php:97
 msgid "More"
 msgstr "更多"
 
+#: templates/admin.php:105
+msgid ""
+"Developed by the <a href=\"http://ownCloud.org/contact\" "
+"target=\"_blank\">ownCloud community</a>, the <a "
+"href=\"https://github.com/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>."
+msgstr ""
+
 #: templates/apps.php:10
 msgid "Add your App"
 msgstr "添加应用"
diff --git a/l10n/zh_TW/files_versions.po b/l10n/zh_TW/files_versions.po
index 2214a0ec19..731c9d14f5 100644
--- a/l10n/zh_TW/files_versions.po
+++ b/l10n/zh_TW/files_versions.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:37+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2012-09-01 13:35+0200\n"
+"PO-Revision-Date: 2012-09-01 11:35+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,10 +17,18 @@ msgstr ""
 "Language: zh_TW\n"
 "Plural-Forms: nplurals=1; plural=0\n"
 
-#: js/settings-personal.js:31
+#: js/settings-personal.js:31 templates/settings-personal.php:10
 msgid "Expire all versions"
 msgstr ""
 
+#: templates/settings-personal.php:4
+msgid "Versions"
+msgstr ""
+
+#: templates/settings-personal.php:7
+msgid "This will delete all existing backup versions of your files"
+msgstr ""
+
 #: templates/settings.php:3
 msgid "Enable Files Versioning"
 msgstr ""
diff --git a/l10n/zh_TW/settings.po b/l10n/zh_TW/settings.po
index 19686a64f5..e4c0e92c2d 100644
--- a/l10n/zh_TW/settings.po
+++ b/l10n/zh_TW/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-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-01 13:35+0200\n"
+"PO-Revision-Date: 2012-09-01 11:35+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"
@@ -71,66 +71,85 @@ msgstr "__語言_名稱__"
 msgid "Security Warning"
 msgstr ""
 
-#: templates/admin.php:29
-msgid "Cron"
+#: templates/admin.php:17
+msgid ""
+"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."
 msgstr ""
 
 #: templates/admin.php:31
-msgid "execute one task with each page loaded"
+msgid "Cron"
 msgstr ""
 
 #: templates/admin.php:33
-msgid "cron.php is registered at a webcron service"
+msgid "execute one task with each page loaded"
 msgstr ""
 
 #: templates/admin.php:35
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:37
 msgid "use systems cron service"
 msgstr ""
 
-#: templates/admin.php:39
+#: templates/admin.php:41
 msgid "Share API"
 msgstr ""
 
-#: templates/admin.php:44
+#: templates/admin.php:46
 msgid "Enable Share API"
 msgstr ""
 
-#: templates/admin.php:45
+#: templates/admin.php:47
 msgid "Allow apps to use the Share API"
 msgstr ""
 
-#: templates/admin.php:49
+#: templates/admin.php:51
 msgid "Allow links"
 msgstr ""
 
-#: templates/admin.php:50
+#: templates/admin.php:52
 msgid "Allow users to share items to the public with links"
 msgstr ""
 
-#: templates/admin.php:54
+#: templates/admin.php:56
 msgid "Allow resharing"
 msgstr ""
 
-#: templates/admin.php:55
+#: templates/admin.php:57
 msgid "Allow users to share items shared with them again"
 msgstr ""
 
-#: templates/admin.php:58
+#: templates/admin.php:60
 msgid "Allow users to share with anyone"
 msgstr ""
 
-#: templates/admin.php:60
+#: templates/admin.php:62
 msgid "Allow users to only share with users in their groups"
 msgstr ""
 
-#: templates/admin.php:67
+#: templates/admin.php:69
 msgid "Log"
 msgstr "紀錄"
 
-#: templates/admin.php:95
+#: templates/admin.php:97
 msgid "More"
 msgstr "更多"
 
+#: templates/admin.php:105
+msgid ""
+"Developed by the <a href=\"http://ownCloud.org/contact\" "
+"target=\"_blank\">ownCloud community</a>, the <a "
+"href=\"https://github.com/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>."
+msgstr ""
+
 #: templates/apps.php:10
 msgid "Add your App"
 msgstr "添加你的 App"
diff --git a/lib/l10n/de.php b/lib/l10n/de.php
index e77ec97df7..4a567003de 100644
--- a/lib/l10n/de.php
+++ b/lib/l10n/de.php
@@ -21,5 +21,8 @@
 "last month" => "Letzten Monat",
 "months ago" => "Vor Monaten",
 "last year" => "Letztes Jahr",
-"years ago" => "Vor Jahren"
+"years ago" => "Vor Jahren",
+"%s is available. Get <a href=\"%s\">more information</a>" => "%s ist verfügbar. <a href=\"%s\">Weitere Informationen</a>",
+"up to date" => "aktuell",
+"updates check is disabled" => "Die Update-Überprüfung ist ausgeschaltet"
 );
diff --git a/lib/l10n/fi_FI.php b/lib/l10n/fi_FI.php
index dda2c76037..6f0ebcd16e 100644
--- a/lib/l10n/fi_FI.php
+++ b/lib/l10n/fi_FI.php
@@ -21,5 +21,8 @@
 "last month" => "viime kuussa",
 "months ago" => "kuukautta sitten",
 "last year" => "viime vuonna",
-"years ago" => "vuotta sitten"
+"years ago" => "vuotta sitten",
+"%s is available. Get <a href=\"%s\">more information</a>" => "%s on saatavilla. Lue <a href=\"%s\">lisätietoja</a>",
+"up to date" => "ajan tasalla",
+"updates check is disabled" => "päivitysten tarkistus on pois käytöstä"
 );
diff --git a/lib/l10n/it.php b/lib/l10n/it.php
index 2c88818dc6..c4c7d90610 100644
--- a/lib/l10n/it.php
+++ b/lib/l10n/it.php
@@ -21,5 +21,8 @@
 "last month" => "il mese scorso",
 "months ago" => "mesi fa",
 "last year" => "l'anno scorso",
-"years ago" => "anni fa"
+"years ago" => "anni fa",
+"%s is available. Get <a href=\"%s\">more information</a>" => "%s è disponibile. Ottieni <a href=\"%s\">ulteriori informazioni</a>",
+"up to date" => "aggiornato",
+"updates check is disabled" => "il controllo degli aggiornamenti è disabilitato"
 );
diff --git a/lib/l10n/sl.php b/lib/l10n/sl.php
index fad1641725..273773f2f7 100644
--- a/lib/l10n/sl.php
+++ b/lib/l10n/sl.php
@@ -21,5 +21,8 @@
 "last month" => "prejšnji mesec",
 "months ago" => "mesecev nazaj",
 "last year" => "lani",
-"years ago" => "let nazaj"
+"years ago" => "let nazaj",
+"%s is available. Get <a href=\"%s\">more information</a>" => "%s je na voljo. <a href=\"%s\">Več informacij.</a>",
+"up to date" => "ažuren",
+"updates check is disabled" => "preverjanje za posodobitve je onemogočeno"
 );
diff --git a/lib/l10n/sv.php b/lib/l10n/sv.php
index cff3a63c44..3d377133f2 100644
--- a/lib/l10n/sv.php
+++ b/lib/l10n/sv.php
@@ -21,5 +21,8 @@
 "last month" => "förra månaden",
 "months ago" => "månader sedan",
 "last year" => "förra året",
-"years ago" => "år sedan"
+"years ago" => "år sedan",
+"%s is available. Get <a href=\"%s\">more information</a>" => "%s finns. Få <a href=\"%s\">mer information</a>",
+"up to date" => "uppdaterad",
+"updates check is disabled" => "uppdateringskontroll är inaktiverad"
 );
diff --git a/settings/l10n/nl.php b/settings/l10n/nl.php
index 6048cbd63b..f480acba66 100644
--- a/settings/l10n/nl.php
+++ b/settings/l10n/nl.php
@@ -16,6 +16,15 @@
 "execute one task with each page loaded" => "Voer 1 taak uit bij elke geladen pagina",
 "cron.php is registered at a webcron service" => "cron.php is geregistreerd bij een webcron service",
 "use systems cron service" => "gebruik de systeem cron service",
+"Share API" => "Deel API",
+"Enable Share API" => "Zet de Deel API aan",
+"Allow apps to use the Share API" => "Sta apps toe om de Deel API te gebruiken",
+"Allow links" => "Sta links toe",
+"Allow users to share items to the public with links" => "Sta gebruikers toe om items via links publiekelijk te maken",
+"Allow resharing" => "Sta verder delen toe",
+"Allow users to share items shared with them again" => "Sta gebruikers toe om items nogmaals te delen",
+"Allow users to share with anyone" => "Sta gebruikers toe om met iedereen te delen",
+"Allow users to only share with users in their groups" => "Sta gebruikers toe om alleen met gebruikers in hun groepen te delen",
 "Log" => "Log",
 "More" => "Meer",
 "Add your App" => "Voeg je App toe",
diff --git a/settings/l10n/vi.php b/settings/l10n/vi.php
index 41e4441b1c..9e0709239f 100644
--- a/settings/l10n/vi.php
+++ b/settings/l10n/vi.php
@@ -1,13 +1,17 @@
 <?php $TRANSLATIONS = array(
+"Unable to load list from App Store" => "Không thể tải danh sách ứng dụng từ App Store",
 "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ệ",
+"Authentication error" => "Lỗi xác thực",
 "Language changed" => "Ngôn ngữ đã được thay đổi",
+"Error" => "Lỗi",
 "Disable" => "Vô hiệu",
 "Enable" => "Cho phép",
 "Saving..." => "Đang tiến hành lưu ...",
 "__language_name__" => "__Ngôn ngữ___",
+"Security Warning" => "Cảnh bảo bảo mật",
 "Log" => "Log",
 "More" => "nhiều hơn",
 "Add your App" => "Thêm ứng dụng của bạn",

From ef8cf87f49a1ab0f8f0ab87a82580d4cebebfc1c Mon Sep 17 00:00:00 2001
From: Thomas Mueller <thomas.mueller@tmit.eu>
Date: Sat, 1 Sep 2012 13:53:50 +0200
Subject: [PATCH 1029/1224] removing unmaintained (unused?) translation de_DE

---
 l10n/de_DE/calendar.po | 636 -----------------------------------------
 l10n/de_DE/core.po     | 170 -----------
 l10n/de_DE/files.po    | 108 -------
 l10n/de_DE/media.po    |  64 -----
 l10n/de_DE/settings.po | 156 ----------
 5 files changed, 1134 deletions(-)
 delete mode 100644 l10n/de_DE/calendar.po
 delete mode 100644 l10n/de_DE/core.po
 delete mode 100644 l10n/de_DE/files.po
 delete mode 100644 l10n/de_DE/media.po
 delete mode 100644 l10n/de_DE/settings.po

diff --git a/l10n/de_DE/calendar.po b/l10n/de_DE/calendar.po
deleted file mode 100644
index cc381094ca..0000000000
--- a/l10n/de_DE/calendar.po
+++ /dev/null
@@ -1,636 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# 
-# Translators:
-msgid ""
-msgstr ""
-"Project-Id-Version: ownCloud\n"
-"Report-Msgid-Bugs-To: http://owncloud.shapado.com/\n"
-"POT-Creation-Date: 2012-01-24 00:24+0100\n"
-"PO-Revision-Date: 2011-09-03 16:52+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: de_DE\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-
-#: ajax/guesstimezone.php:42
-msgid "New Timezone:"
-msgstr ""
-
-#: ajax/settimezone.php:22
-msgid "Timezone changed"
-msgstr ""
-
-#: ajax/settimezone.php:24
-msgid "Invalid request"
-msgstr ""
-
-#: appinfo/app.php:20 templates/calendar.php:14
-#: templates/part.eventform.php:20
-msgid "Calendar"
-msgstr ""
-
-#: lib/app.php:19
-msgid "Wrong calendar"
-msgstr ""
-
-#: lib/app.php:60 lib/object.php:332
-msgid "Birthday"
-msgstr ""
-
-#: lib/app.php:61 lib/object.php:333
-msgid "Business"
-msgstr ""
-
-#: lib/app.php:62 lib/object.php:334
-msgid "Call"
-msgstr ""
-
-#: lib/app.php:63 lib/object.php:335
-msgid "Clients"
-msgstr ""
-
-#: lib/app.php:64 lib/object.php:336
-msgid "Deliverer"
-msgstr ""
-
-#: lib/app.php:65 lib/object.php:337
-msgid "Holidays"
-msgstr ""
-
-#: lib/app.php:66 lib/object.php:338
-msgid "Ideas"
-msgstr ""
-
-#: lib/app.php:67 lib/object.php:339
-msgid "Journey"
-msgstr ""
-
-#: lib/app.php:68 lib/object.php:340
-msgid "Jubilee"
-msgstr ""
-
-#: lib/app.php:69 lib/object.php:341
-msgid "Meeting"
-msgstr ""
-
-#: lib/app.php:70 lib/object.php:342
-msgid "Other"
-msgstr ""
-
-#: lib/app.php:71 lib/object.php:343
-msgid "Personal"
-msgstr ""
-
-#: lib/app.php:72 lib/object.php:344
-msgid "Projects"
-msgstr ""
-
-#: lib/app.php:73 lib/object.php:345
-msgid "Questions"
-msgstr ""
-
-#: lib/app.php:74 lib/object.php:346
-msgid "Work"
-msgstr ""
-
-#: lib/object.php:353
-msgid "Does not repeat"
-msgstr ""
-
-#: lib/object.php:354
-msgid "Daily"
-msgstr ""
-
-#: lib/object.php:355
-msgid "Weekly"
-msgstr ""
-
-#: lib/object.php:356
-msgid "Every Weekday"
-msgstr ""
-
-#: lib/object.php:357
-msgid "Bi-Weekly"
-msgstr ""
-
-#: lib/object.php:358
-msgid "Monthly"
-msgstr ""
-
-#: lib/object.php:359
-msgid "Yearly"
-msgstr ""
-
-#: lib/object.php:366
-msgid "never"
-msgstr ""
-
-#: lib/object.php:367
-msgid "by occurrences"
-msgstr ""
-
-#: lib/object.php:368
-msgid "by date"
-msgstr ""
-
-#: lib/object.php:375
-msgid "by monthday"
-msgstr ""
-
-#: lib/object.php:376
-msgid "by weekday"
-msgstr ""
-
-#: lib/object.php:383 templates/lAfix.php:3
-msgid "Monday"
-msgstr ""
-
-#: lib/object.php:384 templates/lAfix.php:4
-msgid "Tuesday"
-msgstr ""
-
-#: lib/object.php:385 templates/lAfix.php:5
-msgid "Wednesday"
-msgstr ""
-
-#: lib/object.php:386 templates/lAfix.php:6
-msgid "Thursday"
-msgstr ""
-
-#: lib/object.php:387 templates/lAfix.php:7
-msgid "Friday"
-msgstr ""
-
-#: lib/object.php:388 templates/lAfix.php:8
-msgid "Saturday"
-msgstr ""
-
-#: lib/object.php:389 templates/lAfix.php:2
-msgid "Sunday"
-msgstr ""
-
-#: lib/object.php:396
-msgid "events week of month"
-msgstr ""
-
-#: lib/object.php:397
-msgid "first"
-msgstr ""
-
-#: lib/object.php:398
-msgid "second"
-msgstr ""
-
-#: lib/object.php:399
-msgid "third"
-msgstr ""
-
-#: lib/object.php:400
-msgid "fourth"
-msgstr ""
-
-#: lib/object.php:401
-msgid "fifth"
-msgstr ""
-
-#: lib/object.php:402
-msgid "last"
-msgstr ""
-
-#: lib/object.php:424 templates/lAfix.php:16
-msgid "January"
-msgstr ""
-
-#: lib/object.php:425 templates/lAfix.php:17
-msgid "February"
-msgstr ""
-
-#: lib/object.php:426 templates/lAfix.php:18
-msgid "March"
-msgstr ""
-
-#: lib/object.php:427 templates/lAfix.php:19
-msgid "April"
-msgstr ""
-
-#: lib/object.php:428 templates/lAfix.php:20
-msgid "May"
-msgstr ""
-
-#: lib/object.php:429 templates/lAfix.php:21
-msgid "June"
-msgstr ""
-
-#: lib/object.php:430 templates/lAfix.php:22
-msgid "July"
-msgstr ""
-
-#: lib/object.php:431 templates/lAfix.php:23
-msgid "August"
-msgstr ""
-
-#: lib/object.php:432 templates/lAfix.php:24
-msgid "September"
-msgstr ""
-
-#: lib/object.php:433 templates/lAfix.php:25
-msgid "October"
-msgstr ""
-
-#: lib/object.php:434 templates/lAfix.php:26
-msgid "November"
-msgstr ""
-
-#: lib/object.php:435 templates/lAfix.php:27
-msgid "December"
-msgstr ""
-
-#: lib/object.php:441
-msgid "by events date"
-msgstr ""
-
-#: lib/object.php:442
-msgid "by yearday(s)"
-msgstr ""
-
-#: lib/object.php:443
-msgid "by weeknumber(s)"
-msgstr ""
-
-#: lib/object.php:444
-msgid "by day and month"
-msgstr ""
-
-#: lib/object.php:467
-msgid "Not an array"
-msgstr ""
-
-#: lib/search.php:32 lib/search.php:34 lib/search.php:37
-msgid "Date"
-msgstr ""
-
-#: lib/search.php:40
-msgid "Cal."
-msgstr ""
-
-#: templates/calendar.php:10
-msgid "All day"
-msgstr ""
-
-#: templates/calendar.php:11 templates/part.choosecalendar.php:15
-msgid "New Calendar"
-msgstr ""
-
-#: templates/calendar.php:12
-msgid "Missing fields"
-msgstr ""
-
-#: templates/calendar.php:13 templates/part.eventform.php:3
-msgid "Title"
-msgstr ""
-
-#: templates/calendar.php:15
-msgid "From Date"
-msgstr ""
-
-#: templates/calendar.php:16
-msgid "From Time"
-msgstr ""
-
-#: templates/calendar.php:17
-msgid "To Date"
-msgstr ""
-
-#: templates/calendar.php:18
-msgid "To Time"
-msgstr ""
-
-#: templates/calendar.php:19
-msgid "The event ends before it starts"
-msgstr ""
-
-#: templates/calendar.php:20
-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:46
-msgid "Today"
-msgstr ""
-
-#: templates/calendar.php:47
-msgid "Calendars"
-msgstr ""
-
-#: templates/calendar.php:65
-msgid "There was a fail, while parsing the file."
-msgstr ""
-
-#: templates/lAfix.php:9
-msgid "Sun."
-msgstr ""
-
-#: templates/lAfix.php:10
-msgid "Mon."
-msgstr ""
-
-#: templates/lAfix.php:11
-msgid "Tue."
-msgstr ""
-
-#: templates/lAfix.php:12
-msgid "Wed."
-msgstr ""
-
-#: templates/lAfix.php:13
-msgid "Thu."
-msgstr ""
-
-#: templates/lAfix.php:14
-msgid "Fri."
-msgstr ""
-
-#: templates/lAfix.php:15
-msgid "Sat."
-msgstr ""
-
-#: templates/lAfix.php:28
-msgid "Jan."
-msgstr ""
-
-#: templates/lAfix.php:29
-msgid "Feb."
-msgstr ""
-
-#: templates/lAfix.php:30
-msgid "Mar."
-msgstr ""
-
-#: templates/lAfix.php:31
-msgid "Apr."
-msgstr ""
-
-#: templates/lAfix.php:32
-msgid "May."
-msgstr ""
-
-#: templates/lAfix.php:33
-msgid "Jun."
-msgstr ""
-
-#: templates/lAfix.php:34
-msgid "Jul."
-msgstr ""
-
-#: templates/lAfix.php:35
-msgid "Aug."
-msgstr ""
-
-#: templates/lAfix.php:36
-msgid "Sep."
-msgstr ""
-
-#: templates/lAfix.php:37
-msgid "Oct."
-msgstr ""
-
-#: templates/lAfix.php:38
-msgid "Nov."
-msgstr ""
-
-#: templates/lAfix.php:39
-msgid "Dec."
-msgstr ""
-
-#: templates/part.choosecalendar.php:1
-msgid "Choose active calendars"
-msgstr ""
-
-#: templates/part.choosecalendar.php:20
-#: templates/part.choosecalendar.rowfields.php:4
-msgid "CalDav Link"
-msgstr ""
-
-#: templates/part.choosecalendar.rowfields.php:4
-msgid "Download"
-msgstr ""
-
-#: templates/part.choosecalendar.rowfields.php:4
-msgid "Edit"
-msgstr ""
-
-#: templates/part.choosecalendar.rowfields.php:4
-#: templates/part.editevent.php:9
-msgid "Delete"
-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:5
-msgid "Title of the Event"
-msgstr ""
-
-#: templates/part.eventform.php:11
-msgid "Category"
-msgstr ""
-
-#: templates/part.eventform.php:13
-msgid "Select category"
-msgstr ""
-
-#: templates/part.eventform.php:37
-msgid "All Day Event"
-msgstr ""
-
-#: templates/part.eventform.php:41
-msgid "From"
-msgstr ""
-
-#: templates/part.eventform.php:49
-msgid "To"
-msgstr ""
-
-#: templates/part.eventform.php:57
-msgid "Advanced options"
-msgstr ""
-
-#: templates/part.eventform.php:61
-msgid "Repeat"
-msgstr ""
-
-#: templates/part.eventform.php:68
-msgid "Advanced"
-msgstr ""
-
-#: templates/part.eventform.php:112
-msgid "Select weekdays"
-msgstr ""
-
-#: templates/part.eventform.php:125 templates/part.eventform.php:138
-msgid "Select days"
-msgstr ""
-
-#: templates/part.eventform.php:130
-msgid "and the events day of year."
-msgstr ""
-
-#: templates/part.eventform.php:143
-msgid "and the events day of month."
-msgstr ""
-
-#: templates/part.eventform.php:151
-msgid "Select months"
-msgstr ""
-
-#: templates/part.eventform.php:164
-msgid "Select weeks"
-msgstr ""
-
-#: templates/part.eventform.php:169
-msgid "and the events week of year."
-msgstr ""
-
-#: templates/part.eventform.php:175
-msgid "Interval"
-msgstr ""
-
-#: templates/part.eventform.php:181
-msgid "End"
-msgstr ""
-
-#: templates/part.eventform.php:193
-msgid "occurrences"
-msgstr ""
-
-#: templates/part.eventform.php:208
-msgid "Location"
-msgstr ""
-
-#: templates/part.eventform.php:210
-msgid "Location of the Event"
-msgstr ""
-
-#: templates/part.eventform.php:216
-msgid "Description"
-msgstr ""
-
-#: templates/part.eventform.php:218
-msgid "Description of the Event"
-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
-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"
-msgstr ""
-
-#: templates/part.newevent.php:1
-msgid "Create a new event"
-msgstr ""
-
-#: templates/settings.php:13
-msgid "Timezone"
-msgstr ""
-
-#: templates/settings.php:30
-msgid "Check always for changes of the timezone"
-msgstr ""
-
-#: templates/settings.php:32
-msgid "Timeformat"
-msgstr ""
-
-#: templates/settings.php:34
-msgid "24h"
-msgstr ""
-
-#: templates/settings.php:35
-msgid "12h"
-msgstr ""
-
-#: templates/settings.php:41
-msgid "Calendar CalDAV syncing address:"
-msgstr ""
-
-
diff --git a/l10n/de_DE/core.po b/l10n/de_DE/core.po
deleted file mode 100644
index 22a83603b4..0000000000
--- a/l10n/de_DE/core.po
+++ /dev/null
@@ -1,170 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# 
-# Translators:
-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-07-25 16:05+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: de_DE\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-
-#: lostpassword/index.php:24
-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:22
-#: templates/login.php:8
-msgid "Username"
-msgstr ""
-
-#: lostpassword/templates/lostpassword.php:14
-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/404.php:12
-msgid "Cloud not found"
-msgstr ""
-
-#: templates/installation.php:20
-msgid "Create an <strong>admin account</strong>"
-msgstr ""
-
-#: templates/installation.php:26 templates/login.php:12
-msgid "Password"
-msgstr ""
-
-#: templates/installation.php:32
-msgid "Advanced"
-msgstr ""
-
-#: templates/installation.php:34
-msgid "Data folder"
-msgstr ""
-
-#: templates/installation.php:41
-msgid "Configure the database"
-msgstr ""
-
-#: templates/installation.php:46 templates/installation.php:57
-#: templates/installation.php:67
-msgid "will be used"
-msgstr ""
-
-#: templates/installation.php:79
-msgid "Database user"
-msgstr ""
-
-#: templates/installation.php:83
-msgid "Database password"
-msgstr ""
-
-#: templates/installation.php:87
-msgid "Database name"
-msgstr ""
-
-#: templates/installation.php:93
-msgid "Database host"
-msgstr ""
-
-#: templates/installation.php:98
-msgid "Finish setup"
-msgstr ""
-
-#: templates/layout.guest.php:35
-msgid "web services under your control"
-msgstr ""
-
-#: templates/layout.user.php:34
-msgid "Log out"
-msgstr ""
-
-#: templates/layout.user.php:46 templates/layout.user.php:47
-msgid "Settings"
-msgstr ""
-
-#: templates/login.php:5
-msgid "Lost your password?"
-msgstr ""
-
-#: templates/login.php:15
-msgid "remember"
-msgstr ""
-
-#: templates/login.php:16
-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/de_DE/files.po b/l10n/de_DE/files.po
deleted file mode 100644
index b9201beb1d..0000000000
--- a/l10n/de_DE/files.po
+++ /dev/null
@@ -1,108 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# 
-# Translators:
-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: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: de_DE\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-
-#: ajax/upload.php:19
-msgid "There is no error, the file uploaded with success"
-msgstr ""
-
-#: ajax/upload.php:20
-msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
-msgstr ""
-
-#: ajax/upload.php:21
-msgid ""
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
-"the HTML form"
-msgstr ""
-
-#: ajax/upload.php:22
-msgid "The uploaded file was only partially uploaded"
-msgstr ""
-
-#: ajax/upload.php:23
-msgid "No file was uploaded"
-msgstr ""
-
-#: ajax/upload.php:24
-msgid "Missing a temporary folder"
-msgstr ""
-
-#: appinfo/app.php:8
-msgid "Files"
-msgstr ""
-
-#: templates/admin.php:5
-msgid "Maximum upload size"
-msgstr ""
-
-#: templates/index.php:7
-msgid "New"
-msgstr ""
-
-#: templates/index.php:10
-msgid "Text file"
-msgstr ""
-
-#: templates/index.php:11
-msgid "Folder"
-msgstr ""
-
-#: templates/index.php:12
-msgid "From the web"
-msgstr ""
-
-#: templates/index.php:22
-msgid "Upload"
-msgstr ""
-
-#: templates/index.php:35
-msgid "Nothing in here. Upload something!"
-msgstr ""
-
-#: templates/index.php:43
-msgid "Name"
-msgstr ""
-
-#: templates/index.php:45
-msgid "Download"
-msgstr ""
-
-#: templates/index.php:49
-msgid "Size"
-msgstr ""
-
-#: templates/index.php:50
-msgid "Modified"
-msgstr ""
-
-#: templates/index.php:50
-msgid "Delete"
-msgstr ""
-
-#: templates/index.php:58
-msgid "Upload too large"
-msgstr ""
-
-#: templates/index.php:60
-msgid ""
-"The files you are trying to upload exceed the maximum size for file uploads "
-"on this server."
-msgstr ""
-
-
diff --git a/l10n/de_DE/media.po b/l10n/de_DE/media.po
deleted file mode 100644
index 0e994abde2..0000000000
--- a/l10n/de_DE/media.po
+++ /dev/null
@@ -1,64 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# 
-# Translators:
-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: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: de_DE\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-
-#: appinfo/app.php:32 templates/player.php:9
-msgid "Music"
-msgstr ""
-
-#: templates/music.php:3 templates/player.php:13
-msgid "Play"
-msgstr ""
-
-#: templates/music.php:4 templates/music.php:26 templates/player.php:14
-msgid "Pause"
-msgstr ""
-
-#: templates/music.php:5
-msgid "Previous"
-msgstr ""
-
-#: templates/music.php:6 templates/player.php:15
-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/de_DE/settings.po b/l10n/de_DE/settings.po
deleted file mode 100644
index 53aba4ceba..0000000000
--- a/l10n/de_DE/settings.po
+++ /dev/null
@@ -1,156 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# 
-# Translators:
-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-07-25 16:05+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Language: de_DE\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
-
-#: ajax/lostpassword.php:14
-msgid "email Changed"
-msgstr ""
-
-#: ajax/lostpassword.php:16 ajax/openid.php:17 ajax/setlanguage.php:16
-msgid "Invalid request"
-msgstr ""
-
-#: ajax/openid.php:15
-msgid "OpenID Changed"
-msgstr ""
-
-#: ajax/setlanguage.php:14
-msgid "Language changed"
-msgstr ""
-
-#: personal.php:36 personal.php:37
-msgid "__language_name__"
-msgstr ""
-
-#: templates/admin.php:13
-msgid "Log level"
-msgstr ""
-
-#: templates/apps.php:8
-msgid "Add your application"
-msgstr ""
-
-#: templates/apps.php:21
-msgid "Select an App"
-msgstr ""
-
-#: templates/apps.php:23
-msgid "-licensed"
-msgstr ""
-
-#: templates/apps.php:23
-msgid "by"
-msgstr ""
-
-#: templates/help.php:8
-msgid "Ask a question"
-msgstr ""
-
-#: templates/help.php:20
-msgid "Problems connecting to help database."
-msgstr ""
-
-#: templates/help.php:21
-msgid "Go there manually."
-msgstr ""
-
-#: templates/help.php:29
-msgid "Answer"
-msgstr ""
-
-#: templates/personal.php:8
-msgid "You use"
-msgstr ""
-
-#: templates/personal.php:8
-msgid "of the available"
-msgstr ""
-
-#: templates/personal.php:13
-msgid "Your password got changed"
-msgstr ""
-
-#: templates/personal.php:14
-msgid "Unable to change your password"
-msgstr ""
-
-#: templates/personal.php:15
-msgid "Current password"
-msgstr ""
-
-#: templates/personal.php:16
-msgid "New password"
-msgstr ""
-
-#: templates/personal.php:17
-msgid "show"
-msgstr ""
-
-#: templates/personal.php:18
-msgid "Change password"
-msgstr ""
-
-#: templates/personal.php:24
-msgid "Email"
-msgstr ""
-
-#: templates/personal.php:25
-msgid "Your email address"
-msgstr ""
-
-#: templates/personal.php:26
-msgid "Fill in an email address to enable password recovery"
-msgstr ""
-
-#: templates/personal.php:32 templates/personal.php:33
-msgid "Language"
-msgstr ""
-
-#: templates/personal.php:38
-msgid "Help translate"
-msgstr ""
-
-#: templates/personal.php:45
-msgid "use this address to connect to your ownCloud in your file manager"
-msgstr ""
-
-#: templates/users.php:15 templates/users.php:30
-msgid "Name"
-msgstr ""
-
-#: templates/users.php:16 templates/users.php:31
-msgid "Password"
-msgstr ""
-
-#: templates/users.php:17 templates/users.php:32 templates/users.php:46
-msgid "Groups"
-msgstr ""
-
-#: templates/users.php:23
-msgid "Create"
-msgstr ""
-
-#: templates/users.php:33
-msgid "Quota"
-msgstr ""
-
-#: templates/users.php:58
-msgid "Delete"
-msgstr ""
-
-

From a7255181ad8218543c34c9637477b31210768699 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sat, 1 Sep 2012 15:36:07 +0200
Subject: [PATCH 1030/1224] fix autoloader throwing errors for non-oc classes

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

diff --git a/lib/base.php b/lib/base.php
index fb83f6ea0a..bfefa1425a 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -91,6 +91,8 @@ class OC{
 		}
 		elseif(strpos($className,'Test_')===0){
 			$path =  'tests/lib/'.strtolower(str_replace('_','/',substr($className,5)) . '.php');
+		}else{
+			return false;
 		}
 		
 		if($fullPath = stream_resolve_include_path($path)){

From 0fa254508d85dad079845c53b5b5c13c0ada6740 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sat, 1 Sep 2012 16:38:23 +0200
Subject: [PATCH 1031/1224] dont use shorthand php tags

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

diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index a02d3f5cfe..22e13571d0 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -102,6 +102,6 @@ if(!$_['htaccessworking']) {
 
 <p class="personalblock">
 	<strong>ownCloud</strong> <?php echo(OC_Util::getVersionString()); ?> <?php echo(OC_Util::getEditionString()); ?> (<?php echo(OC_Updater::ShowUpdatingHint()); ?>)<br />
-    <? echo $l->t('Developed by the <a href="http://ownCloud.org/contact" target="_blank">ownCloud community</a>, the <a href="https://github.com/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>.'); ?>
+    <?php echo $l->t('Developed by the <a href="http://ownCloud.org/contact" target="_blank">ownCloud community</a>, the <a href="https://github.com/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>
 

From 6d48f3fab8c19b2f2b0986c294d45449e47025ea Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sat, 1 Sep 2012 16:49:29 +0200
Subject: [PATCH 1032/1224] we still need this for pgsql

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

diff --git a/lib/db.php b/lib/db.php
index de72dee255..884bbb5e90 100644
--- a/lib/db.php
+++ b/lib/db.php
@@ -405,11 +405,12 @@ class OC_DB {
 		 * http://www.postgresql.org/docs/8.1/static/functions-datetime.html
 		 * http://www.sqlite.org/lang_createtable.html
 		 * http://docs.oracle.com/cd/B19306_01/server.102/b14200/functions037.htm
+		 */
 
 		 if( $CONFIG_DBTYPE == 'pgsql' ){ //mysql support it too but sqlite doesn't
 				 $content = str_replace( '<default>0000-00-00 00:00:00</default>', '<default>CURRENT_TIMESTAMP</default>', $content );
 		 }
-		 */
+		 
 		file_put_contents( $file2, $content );
 
 		// Try to create tables

From 29d1e8087d3f94a78fc23e1fdd44c139349625b0 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Sat, 1 Sep 2012 13:46:57 -0400
Subject: [PATCH 1033/1224] Implement generateTarget for file sharing backend

---
 apps/files_sharing/lib/share/file.php | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/apps/files_sharing/lib/share/file.php b/apps/files_sharing/lib/share/file.php
index b1e3ca8b48..82744924be 100644
--- a/apps/files_sharing/lib/share/file.php
+++ b/apps/files_sharing/lib/share/file.php
@@ -46,9 +46,25 @@ class OC_Share_Backend_File implements OCP\Share_Backend_File_Dependent {
 		return false;
 	}
 
-	public function generateTarget($itemSource, $shareWith, $exclude = null) {
-		// TODO Make sure target path doesn't exist already
-		return $itemSource;
+	public function generateTarget($filePath, $shareWith, $exclude = null) {
+		$target = $filePath;
+		if (isset($exclude)) {
+			if ($pos = strrpos($target, '.')) {
+				$name = substr($target, 0, $pos);
+				$ext = substr($target, $pos);
+			} else {
+				$name = $filePath;
+				$ext = '';
+			}
+			$i = 2;
+			$append = '';
+			while (in_array($name.$append.$ext, $exclude)) {
+				$append = ' ('.$i.')';
+				$i++;
+			}
+			$target = $name.$append.$ext;
+		}
+		return $target;
 	}
 
 	public function formatItems($items, $format, $parameters = null) {

From 5a9a795cd5b69d9a6acd2b82f77c9437c362d71a Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Sat, 1 Sep 2012 13:52:12 -0400
Subject: [PATCH 1034/1224] Fix check in Javascript for password protected link

---
 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 642c2e1fe4..e97302b0d5 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -277,7 +277,7 @@ OC.Share={
 		$('#linkText').val(link);
 		$('#linkText').show('blind');
 		$('#showPassword').show();
-		if (password.length > 0) {
+		if (password != null) {
 			$('#linkPass').show('blind');
 			$('#linkPassText').attr('placeholder', 'Password protected');
 		}

From 828ca2ba3624d4fb39970a84733dcbb6ab836336 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sat, 1 Sep 2012 20:37:35 +0200
Subject: [PATCH 1035/1224] translate UNIX_TIMESTAMP() into sqlite and pgsql
 equivilents

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

diff --git a/lib/db.php b/lib/db.php
index 884bbb5e90..1979b82f8c 100644
--- a/lib/db.php
+++ b/lib/db.php
@@ -535,8 +535,12 @@ class OC_DB {
 			$query = str_replace( '`', '"', $query );
 			$query = str_replace( 'NOW()', 'datetime(\'now\')', $query );
 			$query = str_replace( 'now()', 'datetime(\'now\')', $query );
+			$query = str_replace( 'UNIX_TIMESTAMP()', 'strftime(\'%s\',\'now\')', $query );
+			$query = str_replace( 'unix_timestamp()', 'strftime(\'%s\',\'now\')', $query );
 		}elseif( $type == 'pgsql' ){
 			$query = str_replace( '`', '"', $query );
+			$query = str_replace( 'UNIX_TIMESTAMP()', 'cast(extract(epoch from current_timestamp) as integer)', $query );
+			$query = str_replace( 'unix_timestamp()', 'cast(extract(epoch from current_timestamp) as integer)', $query );
 		}elseif( $type == 'oci'  ){
 			$query = str_replace( '`', '"', $query );
 			$query = str_replace( 'NOW()', 'CURRENT_TIMESTAMP', $query );

From 2c1f732880ebb43247bdaec73329777b99bcebf0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= <jfd@butonic.de>
Date: Sat, 1 Sep 2012 20:49:50 +0200
Subject: [PATCH 1036/1224] use null instead of -1 on all getUser()

---
 lib/public/user.php    | 2 +-
 lib/user/backend.php   | 2 +-
 lib/user/dummy.php     | 2 +-
 lib/user/interface.php | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/public/user.php b/lib/public/user.php
index 6228268d75..327e2a7735 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 = -1, $offset = 0) {
+	public static function getUsers($search = '', $limit = null, $offset = null) {
 		return \OC_USER::getUsers();
 	}
 
diff --git a/lib/user/backend.php b/lib/user/backend.php
index 36e4bd9f76..0ef7ccd046 100644
--- a/lib/user/backend.php
+++ b/lib/user/backend.php
@@ -99,7 +99,7 @@ abstract class OC_User_Backend implements OC_User_Interface {
 	*
 	* Get a list of all users.
 	*/
-	public function getUsers($search = '', $limit = -1, $offset = 0) {
+	public function getUsers($search = '', $limit = null, $offset = null) {
 		return array();
 	}
 
diff --git a/lib/user/dummy.php b/lib/user/dummy.php
index da3edfb2df..15a67b7e1e 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($search = '', $limit = -1, $offset = 0) {
+	public function getUsers($search = '', $limit = null, $offset = null) {
 		return array_keys($this->users);
 	}
 
diff --git a/lib/user/interface.php b/lib/user/interface.php
index a4903898fb..3d9f4691f2 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 = -1, $offset = 0);
+	public function getUsers($search = '', $limit = null, $offset = null);
 
 	/**
 	* @brief check if a user exists

From 2508f64efee5204fdb38eda51435d0bad7da76f2 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sat, 1 Sep 2012 20:51:48 +0200
Subject: [PATCH 1037/1224] set debug mode if an xdebug session is active

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

diff --git a/lib/base.php b/lib/base.php
index bfefa1425a..1875edb500 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -315,6 +315,13 @@ class OC{
 
 		self::initPaths();
 
+		// set debug mode if an xdebug session is active
+		if (!defined('DEBUG') || !DEBUG){
+			if(isset($_COOKIE['XDEBUG_SESSION'])){
+				define('DEBUG',true);
+			}
+		}
+
 		// register the stream wrappers
 		require_once('streamwrappers.php');
 		stream_wrapper_register("fakedir", "OC_FakeDirStream");

From 6c29334b4888309e7b60cbdf4defdac1c47195bf Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Sat, 1 Sep 2012 18:53:48 -0400
Subject: [PATCH 1038/1224] Add support for share expiration

---
 core/ajax/share.php  |  6 ++++++
 core/js/share.js     | 27 +++++++++++++++++++++++++++
 lib/public/share.php | 29 +++++++++++++++++++++++------
 3 files changed, 56 insertions(+), 6 deletions(-)

diff --git a/core/ajax/share.php b/core/ajax/share.php
index debdf612c0..8c2e85523e 100644
--- a/core/ajax/share.php
+++ b/core/ajax/share.php
@@ -55,6 +55,12 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo
 				($return) ? OC_JSON::success() : OC_JSON::error();
 			}
 			break;
+		case 'setExpirationDate':
+			if (isset($_POST['date'])) {
+				$return = OCP\Share::setExpirationDate($_POST['itemType'], $_POST['itemSource'], $_POST['date']);
+				($return) ? OC_JSON::success() : OC_JSON::error();
+			}
+			break;
 	}
 } else if (isset($_GET['fetch'])) {
 	switch ($_GET['fetch']) {
diff --git a/core/js/share.js b/core/js/share.js
index 4c164f65b2..2f3b5c2fa5 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -143,6 +143,9 @@ OC.Share={
 				html += '<input id="linkPassText" type="password" placeholder="Password" style="display:none; width:90%;" />';
 				html += '</div>';
 			}
+			html += '<div id="expiration">';
+			html += '<input type="checkbox" name="expirationCheckbox" id="expirationCheckbox" value="1" /><label for="expirationCheckbox">Set expiration date</label>';
+			html += '<input id="expirationDate" type="text" placeholder="Expiration date" style="display:none; width:90%;" />';
 			html += '</div>';
 			$(html).appendTo(appendTo);
 			// Reset item shares
@@ -422,6 +425,30 @@ $(document).ready(function() {
 		}
 	});
 
+	$('#expirationCheckbox').live('change', function() {
+		if (this.checked) {
+			console.log('checked');
+			$('#expirationDate').before('<br />');
+			$('#expirationDate').show();
+			$('#expirationDate').datepicker({
+				dateFormat : 'dd-mm-yy'
+			});
+		} else {
+			console.log('unchecled');
+			$('#expirationDate').hide();
+		}
+	});
+	
+	$('#expirationDate').live('change', function() {
+		var itemType = $('#dropdown').data('item-type');
+		var itemSource = $('#dropdown').data('item-source');
+		$.post(OC.filePath('core', 'ajax', 'share.php'), { action: 'setExpirationDate', itemType: itemType, itemSource: itemSource, date: $(this).val() }, function(result) {
+			if (!result || result.status !== 'success') {
+				OC.dialogs.alert('Error', 'Error setting expiration date');
+			}
+		});
+	});
+
 	$('#emailPrivateLink').live('submit', function() {
 		OC.Share.emailPrivateLink();
 	});
diff --git a/lib/public/share.php b/lib/public/share.php
index 165e3df452..a9fd23bfac 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -395,6 +395,16 @@ class Share {
 		throw new \Exception($message);
 	}
 
+	public static function setExpirationDate($itemType, $itemSource, $date) {
+		if ($item = self::getItems($itemType, $itemSource, null, null, \OC_User::getUser(), self::FORMAT_NONE, null, 1, false)) {
+			error_log('setting');
+			$query = \OC_DB::prepare('UPDATE `*PREFIX*share` SET `expiration` = ? WHERE `id` = ?');
+			$query->execute(array($date, $item['id']));
+			return true;
+		}
+		return false;
+	}
+
 	/**
 	* @brief Get the backend class for the specified item type
 	* @param string Item type
@@ -582,23 +592,23 @@ class Share {
 		// TODO Optimize selects
 		if ($format == self::FORMAT_STATUSES) {
 			if ($itemType == 'file' || $itemType == 'folder') {
-				$select = '`*PREFIX*share`.`id`, `item_type`, `*PREFIX*share`.`parent`, `share_type`, `file_source`, `path`';
+				$select = '`*PREFIX*share`.`id`, `item_type`, `*PREFIX*share`.`parent`, `share_type`, `file_source`, `path`, `expiration`';
 			} else {
-				$select = '`id`, `item_type`, `item_source`, `parent`, `share_type`';
+				$select = '`id`, `item_type`, `item_source`, `parent`, `share_type`, `expiration`';
 			}
 		} else {
 			if (isset($uidOwner)) {
 				if ($itemType == 'file' || $itemType == 'folder') {
-					$select = '`*PREFIX*share`.`id`, `item_type`, `*PREFIX*share`.`parent`, `share_type`, `share_with`, `file_source`, `path`, `permissions`, `stime`';
+					$select = '`*PREFIX*share`.`id`, `item_type`, `*PREFIX*share`.`parent`, `share_type`, `share_with`, `file_source`, `path`, `permissions`, `stime`, `expiration`';
 				} else {
-					$select = '`id`, `item_type`, `item_source`, `parent`, `share_type`, `share_with`, `permissions`, `stime`, `file_source`';
+					$select = '`id`, `item_type`, `item_source`, `parent`, `share_type`, `share_with`, `permissions`, `stime`, `file_source`, `expiration`';
 				}
 			} else {
 				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`, `file_source`, `path`, `file_target`, `permissions`, `name`, `ctime`, `mtime`, `mimetype`, `size`, `encrypted`, `versioned`, `writable`';
+						$select = '`*PREFIX*share`.`id`, `item_type`, `*PREFIX*share`.`parent`, `share_type`, `share_with`, `file_source`, `path`, `file_target`, `permissions`, `expiration`, `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`, `uid_owner`, `file_source`, `path`, `file_target`, `permissions`, `stime`';
+						$select = '`*PREFIX*share`.`id`, `item_type`, `item_source`, `item_target`, `*PREFIX*share`.`parent`, `share_type`, `share_with`, `uid_owner`, `file_source`, `path`, `file_target`, `permissions`, `stime`, `expiration`';
 					}
 				} else {
 					$select = '*';
@@ -650,6 +660,13 @@ class Share {
 					$row['path'] = substr($row['path'], $root);
 				}
 			}
+			if (isset($row['expiration'])) {
+				$time = new \DateTime();
+				if ($row['expiration'] < date('Y-m-d H:i', $time->format('U') - $time->getOffset())) {
+					self::delete($row['id']);
+					continue;
+				}
+			}
 			$items[$row['id']] = $row;
 		}
 		if (!empty($items)) {

From 2bb7cb9f64b0244290ce8df745fdb040823dbd62 Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <thomas.mueller@tmit.eu>
Date: Sun, 2 Sep 2012 02:02:53 +0200
Subject: [PATCH 1039/1224] [tx-robot] updated from transifex

---
 apps/files/l10n/tr.php               |  6 ++++++
 apps/files_encryption/l10n/zh_TW.php |  6 ++++++
 apps/files_versions/l10n/de.php      |  1 +
 apps/files_versions/l10n/es.php      |  2 ++
 apps/files_versions/l10n/fr.php      |  2 ++
 apps/files_versions/l10n/it.php      |  2 ++
 apps/files_versions/l10n/nl.php      |  2 ++
 core/l10n/nl.php                     |  1 +
 l10n/de/files_versions.po            |  7 ++++---
 l10n/de/settings.po                  |  7 ++++---
 l10n/es/files_versions.po            | 11 ++++++-----
 l10n/es/lib.po                       | 13 +++++++------
 l10n/es/settings.po                  |  8 ++++----
 l10n/fr/files_versions.po            | 10 +++++-----
 l10n/fr/lib.po                       | 12 ++++++------
 l10n/fr/settings.po                  | 10 +++++-----
 l10n/it/files_versions.po            | 10 +++++-----
 l10n/it/settings.po                  | 10 +++++-----
 l10n/nl/core.po                      |  9 +++++----
 l10n/nl/files_versions.po            | 10 +++++-----
 l10n/nl/lib.po                       | 12 ++++++------
 l10n/sv/settings.po                  | 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/lib.pot               |  2 +-
 l10n/templates/settings.pot          |  2 +-
 l10n/templates/user_ldap.pot         |  2 +-
 l10n/tr/files.po                     | 19 ++++++++++---------
 l10n/zh_TW/files_encryption.po       | 15 ++++++++-------
 l10n/zh_TW/lib.po                    | 13 +++++++------
 l10n/zh_TW/settings.po               | 27 ++++++++++++++-------------
 lib/l10n/es.php                      |  5 ++++-
 lib/l10n/fr.php                      |  5 ++++-
 lib/l10n/nl.php                      |  5 ++++-
 lib/l10n/zh_TW.php                   |  5 ++++-
 settings/l10n/de.php                 |  1 +
 settings/l10n/es.php                 |  1 +
 settings/l10n/fr.php                 |  2 ++
 settings/l10n/it.php                 |  2 ++
 settings/l10n/sv.php                 |  2 ++
 settings/l10n/zh_TW.php              | 10 ++++++++++
 45 files changed, 176 insertions(+), 115 deletions(-)
 create mode 100644 apps/files_encryption/l10n/zh_TW.php

diff --git a/apps/files/l10n/tr.php b/apps/files/l10n/tr.php
index 224322b24e..630e3563ad 100644
--- a/apps/files/l10n/tr.php
+++ b/apps/files/l10n/tr.php
@@ -8,6 +8,11 @@
 "Failed to write to disk" => "Diske yazılamadı",
 "Files" => "Dosyalar",
 "Delete" => "Sil",
+"already exists" => "zaten mevcut",
+"replace" => "değiştir",
+"cancel" => "iptal",
+"replaced" => "değiştirildi",
+"with" => "ile",
 "undo" => "geri al",
 "deleted" => "silindi",
 "generating ZIP-file, it may take some time." => "ZIP dosyası oluşturuluyor, biraz sürebilir.",
@@ -15,6 +20,7 @@
 "Upload Error" => "Yükleme hatası",
 "Pending" => "Bekliyor",
 "Upload cancelled." => "Yükleme iptal edildi.",
+"File upload is in progress. Leaving the page now will cancel the upload." => "Dosya yükleme işlemi sürüyor. Şimdi sayfadan ayrılırsanız işleminiz iptal olur.",
 "Invalid name, '/' is not allowed." => "Geçersiz isim, '/' işaretine izin verilmiyor.",
 "Size" => "Boyut",
 "Modified" => "Değiştirilme",
diff --git a/apps/files_encryption/l10n/zh_TW.php b/apps/files_encryption/l10n/zh_TW.php
new file mode 100644
index 0000000000..4c62130cf4
--- /dev/null
+++ b/apps/files_encryption/l10n/zh_TW.php
@@ -0,0 +1,6 @@
+<?php $TRANSLATIONS = array(
+"Encryption" => "加密",
+"Exclude the following file types from encryption" => "下列的檔案類型不加密",
+"None" => "無",
+"Enable Encryption" => "啟用加密"
+);
diff --git a/apps/files_versions/l10n/de.php b/apps/files_versions/l10n/de.php
index 3d1a0a43f5..b1ba62a801 100644
--- a/apps/files_versions/l10n/de.php
+++ b/apps/files_versions/l10n/de.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
 "Expire all versions" => "Alle Versionen löschen",
+"Versions" => "Versionen",
 "Enable Files Versioning" => "Datei-Versionierung aktivieren"
 );
diff --git a/apps/files_versions/l10n/es.php b/apps/files_versions/l10n/es.php
index be416f5bfb..83d7ed0da2 100644
--- a/apps/files_versions/l10n/es.php
+++ b/apps/files_versions/l10n/es.php
@@ -1,4 +1,6 @@
 <?php $TRANSLATIONS = array(
 "Expire all versions" => "Expirar todas las versiones",
+"Versions" => "Versiones",
+"This will delete all existing backup versions of your files" => "Esto eliminará todas las versiones guardadas como copia de seguridad de tus archivos",
 "Enable Files Versioning" => "Habilitar versionamiento de archivos"
 );
diff --git a/apps/files_versions/l10n/fr.php b/apps/files_versions/l10n/fr.php
index 02209f543b..965fa02de9 100644
--- a/apps/files_versions/l10n/fr.php
+++ b/apps/files_versions/l10n/fr.php
@@ -1,4 +1,6 @@
 <?php $TRANSLATIONS = array(
 "Expire all versions" => "Supprimer les versions intermédiaires",
+"Versions" => "Versions",
+"This will delete all existing backup versions of your files" => "Cette opération va effacer toutes les versions intermédiaires de vos fichiers (et ne garder que la dernière version en date).",
 "Enable Files Versioning" => "Activer le versionnage"
 );
diff --git a/apps/files_versions/l10n/it.php b/apps/files_versions/l10n/it.php
index 9711ce18aa..b7b0b9627b 100644
--- a/apps/files_versions/l10n/it.php
+++ b/apps/files_versions/l10n/it.php
@@ -1,4 +1,6 @@
 <?php $TRANSLATIONS = array(
 "Expire all versions" => "Scadenza di tutte le versioni",
+"Versions" => "Versioni",
+"This will delete all existing backup versions of your files" => "Ciò eliminerà tutte le versioni esistenti dei tuoi file",
 "Enable Files Versioning" => "Abilita controllo di versione"
 );
diff --git a/apps/files_versions/l10n/nl.php b/apps/files_versions/l10n/nl.php
index 87e72a3620..da31603ff5 100644
--- a/apps/files_versions/l10n/nl.php
+++ b/apps/files_versions/l10n/nl.php
@@ -1,4 +1,6 @@
 <?php $TRANSLATIONS = array(
 "Expire all versions" => "Alle versies laten verlopen",
+"Versions" => "Versies",
+"This will delete all existing backup versions of your files" => "Dit zal alle bestaande backup versies van uw bestanden verwijderen",
 "Enable Files Versioning" => "Activeer file versioning"
 );
diff --git a/core/l10n/nl.php b/core/l10n/nl.php
index 874a710a75..2c020623d6 100644
--- a/core/l10n/nl.php
+++ b/core/l10n/nl.php
@@ -50,6 +50,7 @@
 "Database user" => "Gebruiker databank",
 "Database password" => "Wachtwoord databank",
 "Database name" => "Naam databank",
+"Database tablespace" => "Database tablespace",
 "Database host" => "Database server",
 "Finish setup" => "Installatie afronden",
 "web services under your control" => "webdiensten die je beheerst",
diff --git a/l10n/de/files_versions.po b/l10n/de/files_versions.po
index 70c88c7100..773e4b2c44 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:
+# I Robot <thomas.mueller@tmit.eu>, 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-09-01 13:35+0200\n"
-"PO-Revision-Date: 2012-09-01 11:35+0000\n"
+"POT-Creation-Date: 2012-09-02 02:01+0200\n"
+"PO-Revision-Date: 2012-09-01 11:47+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"
@@ -24,7 +25,7 @@ msgstr "Alle Versionen löschen"
 
 #: templates/settings-personal.php:4
 msgid "Versions"
-msgstr ""
+msgstr "Versionen"
 
 #: templates/settings-personal.php:7
 msgid "This will delete all existing backup versions of your files"
diff --git a/l10n/de/settings.po b/l10n/de/settings.po
index a0b92971b1..b99b4b03c5 100644
--- a/l10n/de/settings.po
+++ b/l10n/de/settings.po
@@ -5,6 +5,7 @@
 # Translators:
 #   <admin@s-goecker.de>, 2011, 2012.
 #   <icewind1991@gmail.com>, 2012.
+# I Robot <thomas.mueller@tmit.eu>, 2012.
 # Jan-Christoph Borchardt <JanCBorchardt@fsfe.org>, 2011.
 # Marcel Kühlhorn <susefan93@gmx.de>, 2012.
 #   <nelsonfritsch@gmail.com>, 2012.
@@ -16,8 +17,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 13:35+0200\n"
-"PO-Revision-Date: 2012-09-01 11:35+0000\n"
+"POT-Creation-Date: 2012-09-02 02:01+0200\n"
+"PO-Revision-Date: 2012-09-01 11:46+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"
@@ -155,7 +156,7 @@ msgid ""
 "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>."
-msgstr ""
+msgstr "Entwickelt von der <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud-Community</a>, der <a href=\"https://github.com/owncloud\" target=\"_blank\">Quellcode</a> ist unter der <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> lizenziert."
 
 #: templates/apps.php:10
 msgid "Add your App"
diff --git a/l10n/es/files_versions.po b/l10n/es/files_versions.po
index 0f7858a3de..05f6814b37 100644
--- a/l10n/es/files_versions.po
+++ b/l10n/es/files_versions.po
@@ -5,13 +5,14 @@
 # Translators:
 # Javier Llorente <javier@opensuse.org>, 2012.
 #   <juanma@kde.org.ar>, 2012.
+# Rubén Trujillo <rubentrf@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 13:35+0200\n"
-"PO-Revision-Date: 2012-09-01 11:35+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-02 02:01+0200\n"
+"PO-Revision-Date: 2012-09-01 18:22+0000\n"
+"Last-Translator: Rubén Trujillo <rubentrf@gmail.com>\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"
@@ -25,11 +26,11 @@ msgstr "Expirar todas las versiones"
 
 #: templates/settings-personal.php:4
 msgid "Versions"
-msgstr ""
+msgstr "Versiones"
 
 #: templates/settings-personal.php:7
 msgid "This will delete all existing backup versions of your files"
-msgstr ""
+msgstr "Esto eliminará todas las versiones guardadas como copia de seguridad de tus archivos"
 
 #: templates/settings.php:3
 msgid "Enable Files Versioning"
diff --git a/l10n/es/lib.po b/l10n/es/lib.po
index 016a35e522..a98b88c383 100644
--- a/l10n/es/lib.po
+++ b/l10n/es/lib.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 #   <juanma@kde.org.ar>, 2012.
+# Rubén Trujillo <rubentrf@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 02:01+0200\n"
-"PO-Revision-Date: 2012-09-01 00:02+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-02 02:01+0200\n"
+"PO-Revision-Date: 2012-09-01 18:23+0000\n"
+"Last-Translator: Rubén Trujillo <rubentrf@gmail.com>\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"
@@ -115,12 +116,12 @@ msgstr "hace años"
 #: updater.php:66
 #, php-format
 msgid "%s is available. Get <a href=\"%s\">more information</a>"
-msgstr ""
+msgstr "%s está disponible. Obtén <a href=\"%s\">más información</a>"
 
 #: updater.php:68
 msgid "up to date"
-msgstr ""
+msgstr "actualizado"
 
 #: updater.php:71
 msgid "updates check is disabled"
-msgstr ""
+msgstr "comprobar actualizaciones está desactivado"
diff --git a/l10n/es/settings.po b/l10n/es/settings.po
index a55e35b124..030414a8b3 100644
--- a/l10n/es/settings.po
+++ b/l10n/es/settings.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-09-01 13:35+0200\n"
-"PO-Revision-Date: 2012-09-01 11:35+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-02 02:01+0200\n"
+"PO-Revision-Date: 2012-09-01 18:24+0000\n"
+"Last-Translator: Rubén Trujillo <rubentrf@gmail.com>\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"
@@ -155,7 +155,7 @@ msgid ""
 "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>."
-msgstr ""
+msgstr "Desarrollado por la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidad ownCloud</a>, el <a href=\"https://github.com/owncloud\" target=\"_blank\">código fuente</a> está bajo licencia <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
 
 #: templates/apps.php:10
 msgid "Add your App"
diff --git a/l10n/fr/files_versions.po b/l10n/fr/files_versions.po
index 0a1701812e..7077189352 100644
--- a/l10n/fr/files_versions.po
+++ b/l10n/fr/files_versions.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-09-01 13:35+0200\n"
-"PO-Revision-Date: 2012-09-01 11:35+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-02 02:01+0200\n"
+"PO-Revision-Date: 2012-09-01 16:41+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"
@@ -24,11 +24,11 @@ msgstr "Supprimer les versions intermédiaires"
 
 #: templates/settings-personal.php:4
 msgid "Versions"
-msgstr ""
+msgstr "Versions"
 
 #: templates/settings-personal.php:7
 msgid "This will delete all existing backup versions of your files"
-msgstr ""
+msgstr "Cette opération va effacer toutes les versions intermédiaires de vos fichiers (et ne garder que la dernière version en date)."
 
 #: templates/settings.php:3
 msgid "Enable Files Versioning"
diff --git a/l10n/fr/lib.po b/l10n/fr/lib.po
index 5b9ac2ed7f..7eaa311dfd 100644
--- a/l10n/fr/lib.po
+++ b/l10n/fr/lib.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-09-01 02:01+0200\n"
-"PO-Revision-Date: 2012-09-01 00:02+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-02 02:01+0200\n"
+"PO-Revision-Date: 2012-09-01 16:36+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"
@@ -116,12 +116,12 @@ msgstr "il y a plusieurs années"
 #: updater.php:66
 #, php-format
 msgid "%s is available. Get <a href=\"%s\">more information</a>"
-msgstr ""
+msgstr "%s est disponible. Obtenez <a href=\"%s\">plus d'informations</a>"
 
 #: updater.php:68
 msgid "up to date"
-msgstr ""
+msgstr "À jour"
 
 #: updater.php:71
 msgid "updates check is disabled"
-msgstr ""
+msgstr "la vérification des mises à jour est désactivée"
diff --git a/l10n/fr/settings.po b/l10n/fr/settings.po
index 542a7ea0b0..8f41df09e8 100644
--- a/l10n/fr/settings.po
+++ b/l10n/fr/settings.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-09-01 13:35+0200\n"
-"PO-Revision-Date: 2012-09-01 11:35+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-02 02:01+0200\n"
+"PO-Revision-Date: 2012-09-01 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"
@@ -86,7 +86,7 @@ msgid ""
 "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."
-msgstr ""
+msgstr "Votre répertoire de données et vos fichiers sont probablement accessibles depuis internet. Le fichier .htaccess fourni avec ownCloud ne fonctionne pas. Nous vous recommandons vivement de configurer votre serveur web de façon à ce que ce répertoire ne soit plus accessible, ou bien de déplacer le répertoire de données à l'extérieur de la racine du serveur web."
 
 #: templates/admin.php:31
 msgid "Cron"
@@ -156,7 +156,7 @@ msgid ""
 "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>."
-msgstr ""
+msgstr "Développé par la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">communauté ownCloud</a>, le <a href=\"https://github.com/owncloud\" target=\"_blank\">code source</a> est publié sous license <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
 
 #: templates/apps.php:10
 msgid "Add your App"
diff --git a/l10n/it/files_versions.po b/l10n/it/files_versions.po
index 586c50a741..9e8a8ae6bb 100644
--- a/l10n/it/files_versions.po
+++ b/l10n/it/files_versions.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-09-01 13:35+0200\n"
-"PO-Revision-Date: 2012-09-01 11:35+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-02 02:01+0200\n"
+"PO-Revision-Date: 2012-09-01 11:42+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"
@@ -24,11 +24,11 @@ msgstr "Scadenza di tutte le versioni"
 
 #: templates/settings-personal.php:4
 msgid "Versions"
-msgstr ""
+msgstr "Versioni"
 
 #: templates/settings-personal.php:7
 msgid "This will delete all existing backup versions of your files"
-msgstr ""
+msgstr "Ciò eliminerà tutte le versioni esistenti dei tuoi file"
 
 #: templates/settings.php:3
 msgid "Enable Files Versioning"
diff --git a/l10n/it/settings.po b/l10n/it/settings.po
index 34568001b5..a79176c2e1 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-09-01 13:35+0200\n"
-"PO-Revision-Date: 2012-09-01 11:35+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-02 02:01+0200\n"
+"PO-Revision-Date: 2012-09-01 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"
@@ -83,7 +83,7 @@ msgid ""
 "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."
-msgstr ""
+msgstr "La cartella dei dati e i tuoi file sono probabilmente accessibili da Internet.\nIl file .htaccess fornito da ownCloud non funziona. Ti consigliamo vivamente di configurare il server web in modo che la cartella dei dati non sia più accessibile e spostare la cartella fuori dalla radice del server web."
 
 #: templates/admin.php:31
 msgid "Cron"
@@ -153,7 +153,7 @@ msgid ""
 "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>."
-msgstr ""
+msgstr "Sviluppato dalla <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunità di ownCloud</a>, il <a href=\"https://github.com/owncloud\" target=\"_blank\">codice sorgente</a> è licenziato nei termini della <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
 
 #: templates/apps.php:10
 msgid "Add your App"
diff --git a/l10n/nl/core.po b/l10n/nl/core.po
index 171120bab7..2a40cf0571 100644
--- a/l10n/nl/core.po
+++ b/l10n/nl/core.po
@@ -9,13 +9,14 @@
 #   <jos@gelauff.net>, 2012.
 #   <koen@vervloesem.eu>, 2011.
 #   <pietje8501@gmail.com>, 2012.
+# Richard Bos <radoeka@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-02 02:01+0200\n"
+"PO-Revision-Date: 2012-09-01 20:13+0000\n"
+"Last-Translator: Richard Bos <radoeka@gmail.com>\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"
@@ -235,7 +236,7 @@ msgstr "Naam databank"
 
 #: templates/installation.php:109
 msgid "Database tablespace"
-msgstr ""
+msgstr "Database tablespace"
 
 #: templates/installation.php:115
 msgid "Database host"
diff --git a/l10n/nl/files_versions.po b/l10n/nl/files_versions.po
index 257098e81f..9e4a68ec09 100644
--- a/l10n/nl/files_versions.po
+++ b/l10n/nl/files_versions.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-09-01 13:35+0200\n"
-"PO-Revision-Date: 2012-09-01 11:35+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-02 02:01+0200\n"
+"PO-Revision-Date: 2012-09-01 20:09+0000\n"
+"Last-Translator: Richard Bos <radoeka@gmail.com>\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"
@@ -24,11 +24,11 @@ msgstr "Alle versies laten verlopen"
 
 #: templates/settings-personal.php:4
 msgid "Versions"
-msgstr ""
+msgstr "Versies"
 
 #: templates/settings-personal.php:7
 msgid "This will delete all existing backup versions of your files"
-msgstr ""
+msgstr "Dit zal alle bestaande backup versies van uw bestanden verwijderen"
 
 #: templates/settings.php:3
 msgid "Enable Files Versioning"
diff --git a/l10n/nl/lib.po b/l10n/nl/lib.po
index d7e354e9f4..80648c52cf 100644
--- a/l10n/nl/lib.po
+++ b/l10n/nl/lib.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-09-01 02:01+0200\n"
-"PO-Revision-Date: 2012-09-01 00:02+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-02 02:01+0200\n"
+"PO-Revision-Date: 2012-09-01 20:12+0000\n"
+"Last-Translator: Richard Bos <radoeka@gmail.com>\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"
@@ -115,12 +115,12 @@ msgstr "jaar geleden"
 #: updater.php:66
 #, php-format
 msgid "%s is available. Get <a href=\"%s\">more information</a>"
-msgstr ""
+msgstr "%s is beschikbaar. Verkrijg <a href=\"%s\">meer informatie</a>"
 
 #: updater.php:68
 msgid "up to date"
-msgstr ""
+msgstr "Bijgewerkt"
 
 #: updater.php:71
 msgid "updates check is disabled"
-msgstr ""
+msgstr "Meest recente versie controle is uitgeschakeld"
diff --git a/l10n/sv/settings.po b/l10n/sv/settings.po
index 997e9e8f8e..796ab42e63 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-09-01 13:35+0200\n"
-"PO-Revision-Date: 2012-09-01 11:35+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-02 02:01+0200\n"
+"PO-Revision-Date: 2012-09-01 12:52+0000\n"
+"Last-Translator: Daniel Sandman <revoltism@gmail.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"
@@ -83,7 +83,7 @@ msgid ""
 "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."
-msgstr ""
+msgstr "Din datamapp och dina filer kan möjligen vara nåbara från internet. Filen .htaccess som ownCloud tillhandahåller fungerar inte. Vi rekommenderar starkt att du ställer in din webbserver på ett sätt så att datamappen inte är nåbar. Alternativt att ni flyttar datamappen utanför webbservern."
 
 #: templates/admin.php:31
 msgid "Cron"
@@ -153,7 +153,7 @@ msgid ""
 "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>."
-msgstr ""
+msgstr "Utvecklad av <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud kommunity</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">källkoden</a> är licenserad under <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
 
 #: templates/apps.php:10
 msgid "Add your App"
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index 952661ec2c..ee6aa77b12 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-09-01 13:35+0200\n"
+"POT-Creation-Date: 2012-09-02 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 89e2e6fd42..39453f66ed 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-09-01 13:35+0200\n"
+"POT-Creation-Date: 2012-09-02 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 bcc4c1f485..18a12f4b7d 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-09-01 13:35+0200\n"
+"POT-Creation-Date: 2012-09-02 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 e1bf8b8970..794c132aaf 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-09-01 13:35+0200\n"
+"POT-Creation-Date: 2012-09-02 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 c184445e56..b78bed0cb8 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-09-01 13:35+0200\n"
+"POT-Creation-Date: 2012-09-02 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 41fa04d0eb..7536c6fd39 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-09-01 13:35+0200\n"
+"POT-Creation-Date: 2012-09-02 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 5daeff661a..580fc07f7b 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-09-01 13:35+0200\n"
+"POT-Creation-Date: 2012-09-02 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 a44d444bc8..eca1559ddb 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-09-01 13:35+0200\n"
+"POT-Creation-Date: 2012-09-02 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 56b6b0067b..eb372a1f02 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-09-01 13:35+0200\n"
+"POT-Creation-Date: 2012-09-02 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/tr/files.po b/l10n/tr/files.po
index 31e1b22ebf..94595a995e 100644
--- a/l10n/tr/files.po
+++ b/l10n/tr/files.po
@@ -4,15 +4,16 @@
 # 
 # Translators:
 # Aranel Surion <aranel@aranelsurion.org>, 2011, 2012.
+# Caner Başaran <basaran.caner@gmail.com>, 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-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-02 02:01+0200\n"
+"PO-Revision-Date: 2012-09-01 13:44+0000\n"
+"Last-Translator: Caner Başaran <basaran.caner@gmail.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"
@@ -60,23 +61,23 @@ msgstr "Sil"
 
 #: js/filelist.js:141
 msgid "already exists"
-msgstr ""
+msgstr "zaten mevcut"
 
 #: js/filelist.js:141
 msgid "replace"
-msgstr ""
+msgstr "değiştir"
 
 #: js/filelist.js:141
 msgid "cancel"
-msgstr ""
+msgstr "iptal"
 
 #: js/filelist.js:195
 msgid "replaced"
-msgstr ""
+msgstr "değiştirildi"
 
 #: js/filelist.js:195
 msgid "with"
-msgstr ""
+msgstr "ile"
 
 #: js/filelist.js:195 js/filelist.js:246
 msgid "undo"
@@ -109,7 +110,7 @@ msgstr "Yükleme iptal edildi."
 #: js/files.js:409
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
-msgstr ""
+msgstr "Dosya yükleme işlemi sürüyor. Şimdi sayfadan ayrılırsanız işleminiz iptal olur."
 
 #: js/files.js:480
 msgid "Invalid name, '/' is not allowed."
diff --git a/l10n/zh_TW/files_encryption.po b/l10n/zh_TW/files_encryption.po
index 86ca709cfa..1da95b438b 100644
--- a/l10n/zh_TW/files_encryption.po
+++ b/l10n/zh_TW/files_encryption.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# ywang  <ywang1007@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-09-02 02:01+0200\n"
+"PO-Revision-Date: 2012-09-01 14:48+0000\n"
+"Last-Translator: ywang <ywang1007@gmail.com>\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"
@@ -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/zh_TW/lib.po b/l10n/zh_TW/lib.po
index 750304e5a1..7e0c4b47b6 100644
--- a/l10n/zh_TW/lib.po
+++ b/l10n/zh_TW/lib.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <ywang1007+transifex@gmail.com>, 2012.
 # ywang  <ywang1007@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 02:01+0200\n"
-"PO-Revision-Date: 2012-09-01 00:02+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-02 02:01+0200\n"
+"PO-Revision-Date: 2012-09-01 13:47+0000\n"
+"Last-Translator: ywang <ywang1007@gmail.com>\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"
@@ -115,12 +116,12 @@ msgstr "幾年前"
 #: updater.php:66
 #, php-format
 msgid "%s is available. Get <a href=\"%s\">more information</a>"
-msgstr ""
+msgstr "%s 已經可用. 取得 <a href=\"%s\">更多資訊</a>"
 
 #: updater.php:68
 msgid "up to date"
-msgstr ""
+msgstr "最新的"
 
 #: updater.php:71
 msgid "updates check is disabled"
-msgstr ""
+msgstr "檢查更新已停用"
diff --git a/l10n/zh_TW/settings.po b/l10n/zh_TW/settings.po
index e4c0e92c2d..bdb4435bdf 100644
--- a/l10n/zh_TW/settings.po
+++ b/l10n/zh_TW/settings.po
@@ -5,13 +5,14 @@
 # Translators:
 # Donahue Chuang <soshinwu@gmail.com>, 2012.
 #   <weiyu871@ms14.url.com.tw>, 2012.
+# ywang  <ywang1007@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 13:35+0200\n"
-"PO-Revision-Date: 2012-09-01 11:35+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-02 02:01+0200\n"
+"PO-Revision-Date: 2012-09-01 13:53+0000\n"
+"Last-Translator: ywang <ywang1007@gmail.com>\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"
@@ -21,15 +22,15 @@ 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"
@@ -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"
@@ -49,19 +50,19 @@ 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__"
@@ -69,7 +70,7 @@ msgstr "__語言_名稱__"
 
 #: templates/admin.php:14
 msgid "Security Warning"
-msgstr ""
+msgstr "安全性警告"
 
 #: templates/admin.php:17
 msgid ""
@@ -160,7 +161,7 @@ msgstr "選擇一個應用程式"
 
 #: templates/apps.php:29
 msgid "See application page at apps.owncloud.com"
-msgstr ""
+msgstr "查看應用程式頁面於 apps.owncloud.com"
 
 #: templates/apps.php:30
 msgid "-licensed"
diff --git a/lib/l10n/es.php b/lib/l10n/es.php
index 174fe0720f..6d2a310ca3 100644
--- a/lib/l10n/es.php
+++ b/lib/l10n/es.php
@@ -21,5 +21,8 @@
 "last month" => "este mes",
 "months ago" => "hace meses",
 "last year" => "este año",
-"years ago" => "hace años"
+"years ago" => "hace años",
+"%s is available. Get <a href=\"%s\">more information</a>" => "%s está disponible. Obtén <a href=\"%s\">más información</a>",
+"up to date" => "actualizado",
+"updates check is disabled" => "comprobar actualizaciones está desactivado"
 );
diff --git a/lib/l10n/fr.php b/lib/l10n/fr.php
index c674b79b95..c10259e637 100644
--- a/lib/l10n/fr.php
+++ b/lib/l10n/fr.php
@@ -21,5 +21,8 @@
 "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"
+"years ago" => "il y a plusieurs années",
+"%s is available. Get <a href=\"%s\">more information</a>" => "%s est disponible. Obtenez <a href=\"%s\">plus d'informations</a>",
+"up to date" => "À jour",
+"updates check is disabled" => "la vérification des mises à jour est désactivée"
 );
diff --git a/lib/l10n/nl.php b/lib/l10n/nl.php
index 01bc4d3e19..a90fc6caa6 100644
--- a/lib/l10n/nl.php
+++ b/lib/l10n/nl.php
@@ -21,5 +21,8 @@
 "last month" => "vorige maand",
 "months ago" => "maanden geleden",
 "last year" => "vorig jaar",
-"years ago" => "jaar geleden"
+"years ago" => "jaar geleden",
+"%s is available. Get <a href=\"%s\">more information</a>" => "%s is beschikbaar. Verkrijg <a href=\"%s\">meer informatie</a>",
+"up to date" => "Bijgewerkt",
+"updates check is disabled" => "Meest recente versie controle is uitgeschakeld"
 );
diff --git a/lib/l10n/zh_TW.php b/lib/l10n/zh_TW.php
index 008c9483a0..c9a26a53b2 100644
--- a/lib/l10n/zh_TW.php
+++ b/lib/l10n/zh_TW.php
@@ -21,5 +21,8 @@
 "last month" => "上個月",
 "months ago" => "幾個月前",
 "last year" => "去年",
-"years ago" => "幾年前"
+"years ago" => "幾年前",
+"%s is available. Get <a href=\"%s\">more information</a>" => "%s 已經可用. 取得 <a href=\"%s\">更多資訊</a>",
+"up to date" => "最新的",
+"updates check is disabled" => "檢查更新已停用"
 );
diff --git a/settings/l10n/de.php b/settings/l10n/de.php
index 6d1d28fa2e..8ca01243e5 100644
--- a/settings/l10n/de.php
+++ b/settings/l10n/de.php
@@ -27,6 +27,7 @@
 "Allow users to only share with users in their groups" => "Erlaube Nutzern nur das Teilen in ihrer Gruppe",
 "Log" => "Log",
 "More" => "Mehr",
+"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/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>." => "Entwickelt von der <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud-Community</a>, der <a href=\"https://github.com/owncloud\" target=\"_blank\">Quellcode</a> ist unter der <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> lizenziert.",
 "Add your App" => "Fügen Sie Ihre App hinzu",
 "Select an App" => "Wählen Sie eine Anwendung aus",
 "See application page at apps.owncloud.com" => "Weitere Anwendungen finden Sie auf apps.owncloud.com",
diff --git a/settings/l10n/es.php b/settings/l10n/es.php
index d86dc3663a..be496cd964 100644
--- a/settings/l10n/es.php
+++ b/settings/l10n/es.php
@@ -27,6 +27,7 @@
 "Allow users to only share with users in their groups" => "Permitir a los usuarios compartir con usuarios en sus grupos",
 "Log" => "Registro",
 "More" => "Más",
+"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/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>." => "Desarrollado por la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunidad ownCloud</a>, el <a href=\"https://github.com/owncloud\" target=\"_blank\">código fuente</a> está bajo licencia <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "Add your App" => "Añade tu aplicación",
 "Select an App" => "Seleccionar una aplicación",
 "See application page at apps.owncloud.com" => "Echa un vistazo a la web de aplicaciones apps.owncloud.com",
diff --git a/settings/l10n/fr.php b/settings/l10n/fr.php
index 81fb9f56a2..235c5430df 100644
--- a/settings/l10n/fr.php
+++ b/settings/l10n/fr.php
@@ -12,6 +12,7 @@
 "Saving..." => "Sauvegarde...",
 "__language_name__" => "Français",
 "Security Warning" => "Alertes de sécurité",
+"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." => "Votre répertoire de données et vos fichiers sont probablement accessibles depuis internet. Le fichier .htaccess fourni avec ownCloud ne fonctionne pas. Nous vous recommandons vivement de configurer votre serveur web de façon à ce que ce répertoire ne soit plus accessible, ou bien de déplacer le répertoire de données à l'extérieur de la racine du serveur web.",
 "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",
@@ -27,6 +28,7 @@
 "Allow users to only share with users in their groups" => "Autoriser les utilisateurs à ne partager qu'avec les utilisateurs dans leurs groupes",
 "Log" => "Journaux",
 "More" => "Plus",
+"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/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>." => "Développé par la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">communauté ownCloud</a>, le <a href=\"https://github.com/owncloud\" target=\"_blank\">code source</a> est publié sous license <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "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",
diff --git a/settings/l10n/it.php b/settings/l10n/it.php
index 64df0cd9d4..dc42c00999 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",
+"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." => "La cartella dei dati e i tuoi file sono probabilmente accessibili da Internet.\nIl file .htaccess fornito da ownCloud non funziona. Ti consigliamo vivamente di configurare il server web in modo che la cartella dei dati non sia più accessibile e spostare la cartella fuori dalla radice del server web.",
 "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",
@@ -27,6 +28,7 @@
 "Allow users to only share with users in their groups" => "Consenti agli utenti di condividere con gli utenti del proprio gruppo",
 "Log" => "Registro",
 "More" => "Altro",
+"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/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>." => "Sviluppato dalla <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunità di ownCloud</a>, il <a href=\"https://github.com/owncloud\" target=\"_blank\">codice sorgente</a> è licenziato nei termini della <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "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",
diff --git a/settings/l10n/sv.php b/settings/l10n/sv.php
index 4a1d1b2c47..74b5406f80 100644
--- a/settings/l10n/sv.php
+++ b/settings/l10n/sv.php
@@ -12,6 +12,7 @@
 "Saving..." => "Sparar...",
 "__language_name__" => "__language_name__",
 "Security Warning" => "Säkerhetsvarning",
+"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." => "Din datamapp och dina filer kan möjligen vara nåbara från internet. Filen .htaccess som ownCloud tillhandahåller fungerar inte. Vi rekommenderar starkt att du ställer in din webbserver på ett sätt så att datamappen inte är nåbar. Alternativt att ni flyttar datamappen utanför webbservern.",
 "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",
@@ -27,6 +28,7 @@
 "Allow users to only share with users in their groups" => "Tillåt bara delning med användare i egna grupper",
 "Log" => "Logg",
 "More" => "Mera",
+"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/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>." => "Utvecklad av <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud kommunity</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">källkoden</a> är licenserad under <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "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",
diff --git a/settings/l10n/zh_TW.php b/settings/l10n/zh_TW.php
index 0218133f65..f0b0de7d73 100644
--- a/settings/l10n/zh_TW.php
+++ b/settings/l10n/zh_TW.php
@@ -1,12 +1,22 @@
 <?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" => "安全性警告",
 "Log" => "紀錄",
 "More" => "更多",
 "Add your App" => "添加你的 App",
 "Select an App" => "選擇一個應用程式",
+"See application page at apps.owncloud.com" => "查看應用程式頁面於 apps.owncloud.com",
 "-licensed" => "-已許可",
 "by" => "由",
 "Documentation" => "文件",

From 3c784ede830974a6816f5d971d6e14305c34c0c9 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sun, 2 Sep 2012 13:58:01 +0200
Subject: [PATCH 1040/1224] use str_ireplace instead of duplicate str_replace

---
 lib/db.php | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/lib/db.php b/lib/db.php
index 1979b82f8c..16b3920873 100644
--- a/lib/db.php
+++ b/lib/db.php
@@ -533,18 +533,14 @@ class OC_DB {
 		// differences in escaping of table names ('`' for mysql) and getting the current timestamp
 		if( $type == 'sqlite' || $type == 'sqlite3' ){
 			$query = str_replace( '`', '"', $query );
-			$query = str_replace( 'NOW()', 'datetime(\'now\')', $query );
-			$query = str_replace( 'now()', 'datetime(\'now\')', $query );
-			$query = str_replace( 'UNIX_TIMESTAMP()', 'strftime(\'%s\',\'now\')', $query );
-			$query = str_replace( 'unix_timestamp()', 'strftime(\'%s\',\'now\')', $query );
+			$query = str_ireplace( 'NOW()', 'datetime(\'now\')', $query );
+			$query = str_ireplace( 'UNIX_TIMESTAMP()', 'strftime(\'%s\',\'now\')', $query );
 		}elseif( $type == 'pgsql' ){
 			$query = str_replace( '`', '"', $query );
-			$query = str_replace( 'UNIX_TIMESTAMP()', 'cast(extract(epoch from current_timestamp) as integer)', $query );
-			$query = str_replace( 'unix_timestamp()', 'cast(extract(epoch from current_timestamp) as integer)', $query );
+			$query = str_ireplace( 'UNIX_TIMESTAMP()', 'cast(extract(epoch from current_timestamp) as integer)', $query );
 		}elseif( $type == 'oci'  ){
 			$query = str_replace( '`', '"', $query );
-			$query = str_replace( 'NOW()', 'CURRENT_TIMESTAMP', $query );
-			$query = str_replace( 'now()', 'CURRENT_TIMESTAMP', $query );
+			$query = str_ireplace( 'NOW()', 'CURRENT_TIMESTAMP', $query );
 		}
 
 		// replace table name prefix

From 5f2751c67261643cace2a6fce374f723a4838e34 Mon Sep 17 00:00:00 2001
From: Thomas Mueller <thomas.mueller@tmit.eu>
Date: Sun, 2 Sep 2012 14:14:15 +0200
Subject: [PATCH 1041/1224] in some cases no translations are loaded because
 $this->lang is empty not null

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

diff --git a/lib/l10n.php b/lib/l10n.php
index 4560cb7dbb..cd1d53bce0 100644
--- a/lib/l10n.php
+++ b/lib/l10n.php
@@ -99,7 +99,7 @@ class OC_L10N{
 		$lang = $this->lang;
 		$this->app = true;
 		// Find the right language
-		if(is_null($lang)){
+		if(is_null($lang) || $lang == '') {
 			$lang = self::findLanguage($app);
 		}
 

From a77c16371ff8f01f57cfd110b8a277dcdf23ef82 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Sat, 1 Sep 2012 16:57:50 -0400
Subject: [PATCH 1042/1224] Make item targets be based off of the parent item
 target for reshares

---
 lib/public/share.php | 46 ++++++++++++++++++++++++++------------------
 1 file changed, 27 insertions(+), 19 deletions(-)

diff --git a/lib/public/share.php b/lib/public/share.php
index 9ad0f0f68f..204521f43e 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -762,9 +762,9 @@ 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'];
+					$suggestedItemTarget = $checkReshare['item_target'];
+					$suggestedFileTarget = $checkReshare['file_target'];
 					$filePath = $checkReshare['file_target'];
 				}
 			} else {
@@ -774,6 +774,8 @@ class Share {
 			}
 		} else {
 			$parent = null;
+			$suggestedItemTarget = null;
+			$suggestedFileTarget = null;
 			if (!$backend->isValidSource($itemSource, $uidOwner)) {
 				$message = 'Sharing '.$itemSource.' failed, because the sharing backend for '.$itemType.' could not find its source';
 				\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
@@ -782,7 +784,7 @@ class Share {
 			$parent = null;
 			if ($backend instanceof Share_Backend_File_Dependent) {
 				$filePath = $backend->getFilePath($itemSource, $uidOwner);
-				if ($itemType == 'file' && $itemType == 'folder') {
+				if ($itemType == 'file' || $itemType == 'folder') {
 					$fileSource = $itemSource;
 				} else {
 					$fileSource = \OC_FileCache::getId($filePath);
@@ -800,10 +802,11 @@ class Share {
 		$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) {
+			$groupItemTarget = self::generateTarget($itemType, $itemSource, $shareType, $shareWith['group'], $uidOwner, $suggestedItemTarget);
 			if (isset($fileSource)) {
 				if ($parentFolder) {
 					if ($parentFolder === true) {
-						$groupFileTarget = self::generateTarget('file', $filePath, $shareType, $shareWith['group'], $uidOwner);
+						$groupFileTarget = self::generateTarget('file', $filePath, $shareType, $shareWith['group'], $uidOwner, $suggestedFileTarget);
 						// Set group default file target for future use
 						$parentFolders[0]['folder'] = $groupFileTarget;
 					} else {
@@ -815,12 +818,11 @@ class Share {
 						$uidSharedWith = array_keys($parentFolder);
 					}
 				} else {
-					$groupFileTarget = self::generateTarget('file', $filePath, $shareType, $shareWith['group'], $uidOwner);
+					$groupFileTarget = self::generateTarget('file', $filePath, $shareType, $shareWith['group'], $uidOwner, $suggestedFileTarget);
 				}
 			} else {
 				$groupFileTarget = null;
 			}
-			$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) {
@@ -862,18 +864,18 @@ class Share {
 				return $parentFolders;
 			}
 		} else {
-			$itemTarget = self::generateTarget($itemType, $itemSource, $shareType, $shareWith, $uidOwner);
+			$itemTarget = self::generateTarget($itemType, $itemSource, $shareType, $shareWith, $uidOwner, $suggestedItemTarget);
 			if (isset($fileSource)) {
 				if ($parentFolder) {
 					if ($parentFolder === true) {
-						$fileTarget = self::generateTarget('file', $filePath, $shareType, $shareWith, $uidOwner);
+						$fileTarget = self::generateTarget('file', $filePath, $shareType, $shareWith, $uidOwner, $suggestedFileTarget);
 						$parentFolders['folder'] = $fileTarget;
 					} else {
 						$fileTarget = $parentFolder['folder'].$itemSource;
 						$parent = $parentFolder['id'];
 					}
 				} else {
-					$fileTarget = self::generateTarget('file', $filePath, $shareType, $shareWith, $uidOwner);
+					$fileTarget = self::generateTarget('file', $filePath, $shareType, $shareWith, $uidOwner, $suggestedFileTarget);
 				}
 			} else {
 				$fileTarget = null;
@@ -895,14 +897,15 @@ class Share {
 	* @param string Item source
 	* @param int SHARE_TYPE_USER, SHARE_TYPE_GROUP, or SHARE_TYPE_LINK
 	* @param string User or group the item is being shared with
+	* @param string The suggested target originating from a reshare (optional)
 	* @return string Item target
-	*
-	* TODO Use a suggested item target by default
-	*
 	*/
-	private static function generateTarget($itemType, $itemSource, $shareType, $shareWith, $uidOwner) {
+	private static function generateTarget($itemType, $itemSource, $shareType, $shareWith, $uidOwner, $suggestedTarget = null) {
 		$backend = self::getBackend($itemType);
 		if ($shareType == self::SHARE_TYPE_LINK) {
+			if (isset($suggestedTarget)) {
+				return $suggestedTarget;
+			}
 			return $backend->generateTarget($itemSource, false);
 		} else {
 			if ($itemType == 'file' || $itemType == 'folder') {
@@ -920,13 +923,18 @@ class Share {
 			$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);
+				// Check if suggested target exists first
+				if ($i == 0 && isset($suggestedTarget)) {
+					$target = $suggestedTarget;
 				} else {
-					$target = $backend->generateTarget($itemSource, $shareWith, $exclude);
-				}
-				if (is_array($exclude) && in_array($target, $exclude)) {
-					break;
+					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)) {

From f0f2d939087b2349a4f3250afc17162194bd5c6a Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Sun, 2 Sep 2012 18:23:09 -0400
Subject: [PATCH 1043/1224] Restructure generateTarget for the post_addToGroup
 hook

---
 lib/public/share.php      | 64 +++++++++++++++++++++++++++------------
 tests/lib/share/share.php | 25 +++++++--------
 2 files changed, 57 insertions(+), 32 deletions(-)

diff --git a/lib/public/share.php b/lib/public/share.php
index 204521f43e..481f60d06d 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -823,14 +823,17 @@ class Share {
 			} else {
 				$groupFileTarget = null;
 			}
+			$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');
 			$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, $uidOwner);
+				$itemTarget = self::generateTarget($itemType, $itemSource, self::SHARE_TYPE_USER, $uid, $uidOwner, $suggestedItemTarget, $parent);
 				if (isset($fileSource)) {
 					if ($parentFolder) {
 						if ($parentFolder === true) {
-							$fileTarget = self::generateTarget('file', $filePath, self::SHARE_TYPE_USER, $uid, $uidOwner);
+							$fileTarget = self::generateTarget('file', $filePath, self::SHARE_TYPE_USER, $uid, $uidOwner, $suggestedFileTarget, $parent);
 							if ($fileTarget != $groupFileTarget) {
 								$parentFolders[$uid]['folder'] = $fileTarget;
 							}
@@ -839,24 +842,14 @@ class Share {
 							$parent = $parentFolder[$uid]['id'];
 						}
 					} else {
-						$fileTarget = self::generateTarget('file', $filePath, self::SHARE_TYPE_USER, $uid, $uidOwner);
+						$fileTarget = self::generateTarget('file', $filePath, self::SHARE_TYPE_USER, $uid, $uidOwner, $suggestedFileTarget, $parent);
 					}
 				} 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)) {
-					$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;
+					$query->execute(array($itemType, $itemSource, $itemTarget, $parent, self::$shareTypeGroupUserUnique, $uid, $uidOwner, $permissions, time(), $fileSource, $fileTarget));
 				}
 			}
 			if ($parentFolder === true) {
@@ -900,7 +893,7 @@ class Share {
 	* @param string The suggested target originating from a reshare (optional)
 	* @return string Item target
 	*/
-	private static function generateTarget($itemType, $itemSource, $shareType, $shareWith, $uidOwner, $suggestedTarget = null) {
+	private static function generateTarget($itemType, $itemSource, $shareType, $shareWith, $uidOwner, $suggestedTarget = null, $groupParent = null) {
 		$backend = self::getBackend($itemType);
 		if ($shareType == self::SHARE_TYPE_LINK) {
 			if (isset($suggestedTarget)) {
@@ -937,10 +930,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;
+				$checkTarget = self::getItems($itemType, $target, $shareType, $shareWith);
+				if (!empty($checkTarget)) {
+					foreach ($checkTarget as $item) {
+						// Skip item if it is the group parent row
+						if (isset($groupParent) && $item['id'] == $groupParent) {
+							if (count($checkTarget) == 1) {
+								return $target;
+							} else {
+								continue;
+							}
+						}
+						// 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 ($item['uid_owner'] == $uidOwner) {
+							return $target;
+						}
 					}
 					if (!isset($exclude)) {
 						$exclude = array();
@@ -1031,7 +1035,27 @@ class Share {
 	}
 
 	public static function post_addToGroup($arguments) {
-		// TODO
+		// Find the group shares and check if the user needs a unique target
+		$query = \OC_DB::prepare('SELECT * FROM `*PREFIX*share` WHERE `share_type` = ? AND `share_with` = ?');
+		$result = $query->execute(array(self::SHARE_TYPE_GROUP, $arguments['gid']));
+		$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 (?,?,?,?,?,?,?,?,?,?,?)');
+		while ($item = $result->fetchRow()) {
+			if ($item['item_type'] == 'file' || $item['item_type'] == 'file') {
+				$itemTarget = null;
+			} else {
+				$itemTarget = self::generateTarget($item['item_type'], $item['item_source'], self::SHARE_TYPE_USER, $arguments['uid'], $item['uid_owner'], $item['item_target'], $item['id']);
+			}
+			if (isset($item['file_source'])) {
+				$fileTarget = self::generateTarget($item['item_type'], $item['item_source'], self::SHARE_TYPE_USER, $arguments['uid'], $item['uid_owner'], $item['file_target'], $item['id']);
+			} else {
+				$fileTarget = null;
+			}
+			// Insert an extra row for the group share if the item or file target is unique for this user
+			if ($itemTarget != $item['item_target'] || $fileTarget != $item['file_target']) {
+				$query->execute(array($item['item_type'], $item['item_source'], $itemTarget, $item['id'], self::$shareTypeGroupUserUnique, $arguments['uid'], $item['uid_owner'], $item['permissions'], $item['stime'], $item['file_source'], $fileTarget));
+				$id = \OC_DB::insertid('*PREFIX*share');
+			}
+		}
 	}
 
 	public static function post_removeFromGroup($arguments) {
diff --git a/tests/lib/share/share.php b/tests/lib/share/share.php
index 18ca5031ca..082e265571 100644
--- a/tests/lib/share/share.php
+++ b/tests/lib/share/share.php
@@ -366,21 +366,22 @@ class Test_Share extends UnitTestCase {
 		$this->assertEqual(count($to_test), 2);
 		$this->assertTrue(in_array('test.txt', $to_test));
 		$this->assertTrue(in_array('test1.txt', $to_test));
-		//$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', '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 
+		$this->assertTrue(OCP\Share::shareItem('test', 'share.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
+		OC_Group::addToGroup($this->user4, $this->group1);
+		$this->assertEqual(OCP\Share::getItemsSharedWith('test', Test_Share_Backend::FORMAT_TARGET), array('test.txt'));
 		
 		// Remove group
 	}

From db37a454b345acea72c693cf1043608722ce14d2 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Sun, 2 Sep 2012 18:29:55 -0400
Subject: [PATCH 1044/1224] Add parameter documentation

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

diff --git a/lib/public/share.php b/lib/public/share.php
index 481f60d06d..9b42b417f3 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -891,6 +891,7 @@ class Share {
 	* @param int SHARE_TYPE_USER, SHARE_TYPE_GROUP, or SHARE_TYPE_LINK
 	* @param string User or group the item is being shared with
 	* @param string The suggested target originating from a reshare (optional)
+	* @param int The id of the parent group share (optional)
 	* @return string Item target
 	*/
 	private static function generateTarget($itemType, $itemSource, $shareType, $shareWith, $uidOwner, $suggestedTarget = null, $groupParent = null) {

From dc569ea300ac7112aec7ca6f4e2e409ba8fb7382 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Sun, 2 Sep 2012 19:30:01 -0400
Subject: [PATCH 1045/1224] Fix some warnings from Jenkins in the Share API

---
 lib/public/share.php | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/lib/public/share.php b/lib/public/share.php
index 9b42b417f3..a7a47ee14c 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -357,7 +357,7 @@ class Share {
 		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` = ?',1);
+				$query = \OC_DB::prepare('SELECT `permissions` FROM `*PREFIX*share` WHERE `id` = ?', 1);
 				$result = $query->execute(array($item['parent']))->fetchRow();
 				if (~(int)$result['permissions'] & $permissions) {
 					$message = 'Setting permissions for '.$itemSource.' failed, because the permissions exceed permissions granted to '.\OC_User::getUser();
@@ -813,9 +813,6 @@ class Share {
 						// 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['group'], $uidOwner, $suggestedFileTarget);
@@ -826,7 +823,6 @@ class Share {
 			$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');
-			$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, $uidOwner, $suggestedItemTarget, $parent);
@@ -1054,7 +1050,7 @@ class Share {
 			// Insert an extra row for the group share if the item or file target is unique for this user
 			if ($itemTarget != $item['item_target'] || $fileTarget != $item['file_target']) {
 				$query->execute(array($item['item_type'], $item['item_source'], $itemTarget, $item['id'], self::$shareTypeGroupUserUnique, $arguments['uid'], $item['uid_owner'], $item['permissions'], $item['stime'], $item['file_source'], $fileTarget));
-				$id = \OC_DB::insertid('*PREFIX*share');
+				\OC_DB::insertid('*PREFIX*share');
 			}
 		}
 	}

From 4c065deb55b1c61059c7693c5861a68869758607 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Sun, 2 Sep 2012 20:01:09 -0400
Subject: [PATCH 1046/1224] Listen to post_deleteGroup hook in Share API

---
 lib/public/share.php      | 9 +++++++++
 tests/lib/share/share.php | 4 ++++
 2 files changed, 13 insertions(+)

diff --git a/lib/public/share.php b/lib/public/share.php
index a7a47ee14c..7b6b78561d 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -23,6 +23,7 @@ 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');
+\OC_Hook::connect('OC_User', 'post_deleteGroup', 'OCP\Share', 'post_deleteGroup');
 
 /**
 * This class provides the ability for apps to share their content between users.
@@ -1069,6 +1070,14 @@ class Share {
 		}
 	}
 
+	public static function post_deleteGroup($arguments) {
+		$query = \OC_DB::prepare('SELECT id FROM `*PREFIX*share` WHERE `share_type` = ? AND `share_with` = ?');
+		$result = $query->execute(array(self::SHARE_TYPE_GROUP, $arguments['gid']));
+		while ($item = $result->fetchRow()) {
+			self::delete($item['id']);
+		}
+	}
+
 }
 
 /**
diff --git a/tests/lib/share/share.php b/tests/lib/share/share.php
index 082e265571..b45779038b 100644
--- a/tests/lib/share/share.php
+++ b/tests/lib/share/share.php
@@ -384,6 +384,10 @@ class Test_Share extends UnitTestCase {
 		$this->assertEqual(OCP\Share::getItemsSharedWith('test', Test_Share_Backend::FORMAT_TARGET), array('test.txt'));
 		
 		// Remove group
+		OC_Group::deleteGroup($this->group1);
+		$this->assertEqual(OCP\Share::getItemsSharedWith('test', Test_Share_Backend::FORMAT_TARGET), array());
+		OC_User::setUserId($this->user3);
+		$this->assertEqual(OCP\Share::getItemsShared('test'), array());
 	}
 
 }

From d386e0172a54df88694a9f4942b651ce69a25058 Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <thomas.mueller@tmit.eu>
Date: Mon, 3 Sep 2012 02:07:40 +0200
Subject: [PATCH 1047/1224] [tx-robot] updated from transifex

---
 apps/files/l10n/da.php              |  1 +
 apps/files_versions/l10n/de.php     |  1 +
 apps/files_versions/l10n/fi_FI.php  |  2 ++
 apps/files_versions/l10n/sl.php     |  2 ++
 apps/files_versions/l10n/sv.php     |  2 ++
 apps/files_versions/l10n/th_TH.php  |  2 ++
 core/l10n/da.php                    |  1 +
 l10n/da/core.po                     |  9 +++++----
 l10n/da/files.po                    |  9 +++++----
 l10n/da/settings.po                 | 29 +++++++++++++++--------------
 l10n/de/files_versions.po           |  9 +++++----
 l10n/de/settings.po                 | 12 ++++++------
 l10n/fi_FI/files_versions.po        | 10 +++++-----
 l10n/fi_FI/settings.po              | 18 +++++++++---------
 l10n/ru/lib.po                      |  9 +++++----
 l10n/sl/files_versions.po           | 10 +++++-----
 l10n/sl/settings.po                 | 10 +++++-----
 l10n/sv/files_versions.po           | 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/lib.pot              |  2 +-
 l10n/templates/settings.pot         |  2 +-
 l10n/templates/user_ldap.pot        |  2 +-
 l10n/th_TH/files_versions.po        | 10 +++++-----
 l10n/th_TH/lib.po                   | 12 ++++++------
 l10n/th_TH/settings.po              | 10 +++++-----
 lib/l10n/ru.php                     |  3 ++-
 lib/l10n/th_TH.php                  |  5 ++++-
 settings/l10n/da.php                | 11 +++++++++++
 settings/l10n/de.php                |  5 +++--
 settings/l10n/fi_FI.php             |  6 ++++++
 settings/l10n/sl.php                |  2 ++
 settings/l10n/th_TH.php             |  2 ++
 37 files changed, 136 insertions(+), 94 deletions(-)

diff --git a/apps/files/l10n/da.php b/apps/files/l10n/da.php
index 56af0fa61d..a842088e7b 100644
--- a/apps/files/l10n/da.php
+++ b/apps/files/l10n/da.php
@@ -20,6 +20,7 @@
 "Upload Error" => "Fejl ved upload",
 "Pending" => "Afventer",
 "Upload cancelled." => "Upload afbrudt.",
+"File upload is in progress. Leaving the page now will cancel the upload." => "Fil upload kører. Hvis du forlader siden nu, vil uploadet blive annuleret.",
 "Invalid name, '/' is not allowed." => "Ugyldigt navn, '/' er ikke tilladt.",
 "Size" => "Størrelse",
 "Modified" => "Ændret",
diff --git a/apps/files_versions/l10n/de.php b/apps/files_versions/l10n/de.php
index b1ba62a801..2c15884d1b 100644
--- a/apps/files_versions/l10n/de.php
+++ b/apps/files_versions/l10n/de.php
@@ -1,5 +1,6 @@
 <?php $TRANSLATIONS = array(
 "Expire all versions" => "Alle Versionen löschen",
 "Versions" => "Versionen",
+"This will delete all existing backup versions of your files" => "Dies löscht alle vorhandenen Sicherungsversionen Ihrer Dateien.",
 "Enable Files Versioning" => "Datei-Versionierung aktivieren"
 );
diff --git a/apps/files_versions/l10n/fi_FI.php b/apps/files_versions/l10n/fi_FI.php
index c5092daf99..5cfcbf28bd 100644
--- a/apps/files_versions/l10n/fi_FI.php
+++ b/apps/files_versions/l10n/fi_FI.php
@@ -1,4 +1,6 @@
 <?php $TRANSLATIONS = array(
 "Expire all versions" => "Vanhenna kaikki versiot",
+"Versions" => "Versiot",
+"This will delete all existing backup versions of your files" => "Tämä poistaa kaikki tiedostojesi olemassa olevat varmuuskopioversiot",
 "Enable Files Versioning" => "Käytä tiedostojen versiointia"
 );
diff --git a/apps/files_versions/l10n/sl.php b/apps/files_versions/l10n/sl.php
index e7db55930c..aec6edb3c2 100644
--- a/apps/files_versions/l10n/sl.php
+++ b/apps/files_versions/l10n/sl.php
@@ -1,4 +1,6 @@
 <?php $TRANSLATIONS = array(
 "Expire all versions" => "Zastaraj vse različice",
+"Versions" => "Različice",
+"This will delete all existing backup versions of your files" => "To bo izbrisalo vse obstoječe različice varnostnih kopij vaših datotek",
 "Enable Files Versioning" => "Omogoči sledenje različicam datotek"
 );
diff --git a/apps/files_versions/l10n/sv.php b/apps/files_versions/l10n/sv.php
index 03d4d54d0b..5788d8ae19 100644
--- a/apps/files_versions/l10n/sv.php
+++ b/apps/files_versions/l10n/sv.php
@@ -1,4 +1,6 @@
 <?php $TRANSLATIONS = array(
 "Expire all versions" => "Upphör alla versioner",
+"Versions" => "Versioner",
+"This will delete all existing backup versions of your files" => "Detta kommer att radera alla befintliga säkerhetskopior av dina filer",
 "Enable Files Versioning" => "Aktivera versionshantering"
 );
diff --git a/apps/files_versions/l10n/th_TH.php b/apps/files_versions/l10n/th_TH.php
index e880840f4b..4f26e3bd03 100644
--- a/apps/files_versions/l10n/th_TH.php
+++ b/apps/files_versions/l10n/th_TH.php
@@ -1,4 +1,6 @@
 <?php $TRANSLATIONS = array(
 "Expire all versions" => "หมดอายุทุกรุ่น",
+"Versions" => "รุ่น",
+"This will delete all existing backup versions of your files" => "นี่จะเป็นลบทิ้งไฟล์รุ่นที่ทำการสำรองข้อมูลทั้งหมดที่มีอยู่ของคุณทิ้งไป",
 "Enable Files Versioning" => "เปิดใช้งานคุณสมบัติการแยกสถานะรุ่นหรือเวอร์ชั่นของไฟล์"
 );
diff --git a/core/l10n/da.php b/core/l10n/da.php
index 5e62b5b95d..398ebdb670 100644
--- a/core/l10n/da.php
+++ b/core/l10n/da.php
@@ -51,6 +51,7 @@
 "Database user" => "Databasebruger",
 "Database password" => "Databasekodeord",
 "Database name" => "Navn på database",
+"Database tablespace" => "Database tabelplads",
 "Database host" => "Databasehost",
 "Finish setup" => "Afslut opsætning",
 "web services under your control" => "Webtjenester under din kontrol",
diff --git a/l10n/da/core.po b/l10n/da/core.po
index 383cb162d3..542e8425fa 100644
--- a/l10n/da/core.po
+++ b/l10n/da/core.po
@@ -6,15 +6,16 @@
 #   <mikkelbjerglarsen@gmail.com>, 2011, 2012.
 # Morten Juhl-Johansen Zölde-Fejér <morten@writtenandread.net>, 2011, 2012.
 # Pascal d'Hermilly <pascal@dhermilly.dk>, 2011.
+#   <simon@rosmi.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-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-03 02:04+0200\n"
+"PO-Revision-Date: 2012-09-02 14:21+0000\n"
+"Last-Translator: muunsim <simon@rosmi.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"
@@ -234,7 +235,7 @@ msgstr "Navn på database"
 
 #: templates/installation.php:109
 msgid "Database tablespace"
-msgstr ""
+msgstr "Database tabelplads"
 
 #: templates/installation.php:115
 msgid "Database host"
diff --git a/l10n/da/files.po b/l10n/da/files.po
index 777667d6f5..de51c340b8 100644
--- a/l10n/da/files.po
+++ b/l10n/da/files.po
@@ -5,15 +5,16 @@
 # Translators:
 # Morten Juhl-Johansen Zölde-Fejér <morten@writtenandread.net>, 2011, 2012.
 # Pascal d'Hermilly <pascal@dhermilly.dk>, 2011.
+#   <simon@rosmi.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-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-03 02:04+0200\n"
+"PO-Revision-Date: 2012-09-02 14:21+0000\n"
+"Last-Translator: muunsim <simon@rosmi.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"
@@ -110,7 +111,7 @@ msgstr "Upload afbrudt."
 #: js/files.js:409
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
-msgstr ""
+msgstr "Fil upload kører. Hvis du forlader siden nu, vil uploadet blive annuleret."
 
 #: js/files.js:480
 msgid "Invalid name, '/' is not allowed."
diff --git a/l10n/da/settings.po b/l10n/da/settings.po
index 58ca661b31..0e6fe9214b 100644
--- a/l10n/da/settings.po
+++ b/l10n/da/settings.po
@@ -7,6 +7,7 @@
 #   <mikkelbjerglarsen@gmail.com>, 2011.
 # Morten Juhl-Johansen Zölde-Fejér <morten@writtenandread.net>, 2011, 2012.
 # Pascal d'Hermilly <pascal@dhermilly.dk>, 2011.
+#   <simon@rosmi.dk>, 2012.
 #   <sr@ybnet.dk>, 2012.
 # Thomas Tanghus <>, 2012.
 # Thomas Tanghus <thomas@tanghus.net>, 2012.
@@ -14,9 +15,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 13:35+0200\n"
-"PO-Revision-Date: 2012-09-01 11:35+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-03 02:05+0200\n"
+"PO-Revision-Date: 2012-09-02 14:13+0000\n"
+"Last-Translator: muunsim <simon@rosmi.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"
@@ -91,7 +92,7 @@ msgstr "Cron"
 
 #: templates/admin.php:33
 msgid "execute one task with each page loaded"
-msgstr ""
+msgstr "udfør en opgave for hver indlæst side"
 
 #: templates/admin.php:35
 msgid "cron.php is registered at a webcron service"
@@ -99,31 +100,31 @@ msgstr "cron.php er tilmeldt en webcron tjeneste"
 
 #: templates/admin.php:37
 msgid "use systems cron service"
-msgstr ""
+msgstr "brug systemets cron service"
 
 #: templates/admin.php:41
 msgid "Share API"
-msgstr ""
+msgstr "Del API"
 
 #: templates/admin.php:46
 msgid "Enable Share API"
-msgstr ""
+msgstr "Aktiver dele API"
 
 #: templates/admin.php:47
 msgid "Allow apps to use the Share API"
-msgstr ""
+msgstr "Tillad apps a bruge dele APIen"
 
 #: templates/admin.php:51
 msgid "Allow links"
-msgstr ""
+msgstr "Tillad links"
 
 #: templates/admin.php:52
 msgid "Allow users to share items to the public with links"
-msgstr ""
+msgstr "Tillad brugere at dele elementer med offentligheden med links"
 
 #: templates/admin.php:56
 msgid "Allow resharing"
-msgstr ""
+msgstr "Tillad gendeling"
 
 #: templates/admin.php:57
 msgid "Allow users to share items shared with them again"
@@ -131,11 +132,11 @@ msgstr ""
 
 #: templates/admin.php:60
 msgid "Allow users to share with anyone"
-msgstr ""
+msgstr "Tillad brugere at dele med hvem som helst"
 
 #: templates/admin.php:62
 msgid "Allow users to only share with users in their groups"
-msgstr ""
+msgstr "Tillad kun deling med brugere i brugerens egen gruppe"
 
 #: templates/admin.php:69
 msgid "Log"
@@ -289,7 +290,7 @@ msgstr "Andet"
 
 #: templates/users.php:80 templates/users.php:112
 msgid "Group Admin"
-msgstr ""
+msgstr "Gruppe Administrator"
 
 #: templates/users.php:82
 msgid "Quota"
diff --git a/l10n/de/files_versions.po b/l10n/de/files_versions.po
index 773e4b2c44..f4e27ec514 100644
--- a/l10n/de/files_versions.po
+++ b/l10n/de/files_versions.po
@@ -4,14 +4,15 @@
 # 
 # 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-09-02 02:01+0200\n"
-"PO-Revision-Date: 2012-09-01 11:47+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-03 02:04+0200\n"
+"PO-Revision-Date: 2012-09-02 06:01+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"
@@ -29,7 +30,7 @@ msgstr "Versionen"
 
 #: templates/settings-personal.php:7
 msgid "This will delete all existing backup versions of your files"
-msgstr ""
+msgstr "Dies löscht alle vorhandenen Sicherungsversionen Ihrer Dateien."
 
 #: templates/settings.php:3
 msgid "Enable Files Versioning"
diff --git a/l10n/de/settings.po b/l10n/de/settings.po
index b99b4b03c5..4f41b94c0d 100644
--- a/l10n/de/settings.po
+++ b/l10n/de/settings.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-09-02 02:01+0200\n"
-"PO-Revision-Date: 2012-09-01 11:46+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-03 02:05+0200\n"
+"PO-Revision-Date: 2012-09-02 20:12+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"
@@ -86,7 +86,7 @@ msgid ""
 "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."
-msgstr ""
+msgstr "Ihr Datenverzeichnis ist möglicher Weise aus dem Internet erreichbar. Die .htaccess-Datei von OwnCloud funktioniert nicht. Wir raten Ihnen dringend, dass Sie Ihren Webserver dahingehend konfigurieren, dass Ihr Datenverzeichnis nicht länger aus dem Internet erreichbar ist, oder Sie verschieben das Datenverzeichnis außerhalb des Wurzelverzeichnisses des Webservers."
 
 #: templates/admin.php:31
 msgid "Cron"
@@ -114,7 +114,7 @@ msgstr "Teilungs-API aktivieren"
 
 #: templates/admin.php:47
 msgid "Allow apps to use the Share API"
-msgstr "Erlaubt Nutzern die Teilungs-API zu nutzen"
+msgstr "Erlaubt Nutzern, die Teilungs-API zu nutzen"
 
 #: templates/admin.php:51
 msgid "Allow links"
@@ -122,7 +122,7 @@ msgstr "Links erlauben"
 
 #: templates/admin.php:52
 msgid "Allow users to share items to the public with links"
-msgstr "Erlaube Nutzern Dateien mithilfe von Links mit der Öffentlichkeit zu teilen"
+msgstr "Erlaube Nutzern, Dateien mithilfe von Links mit der Öffentlichkeit zu teilen"
 
 #: templates/admin.php:56
 msgid "Allow resharing"
diff --git a/l10n/fi_FI/files_versions.po b/l10n/fi_FI/files_versions.po
index f5badf4ae7..7d47ae4214 100644
--- a/l10n/fi_FI/files_versions.po
+++ b/l10n/fi_FI/files_versions.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-09-01 13:35+0200\n"
-"PO-Revision-Date: 2012-09-01 11:35+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-03 02:04+0200\n"
+"PO-Revision-Date: 2012-09-02 15:39+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"
@@ -24,11 +24,11 @@ msgstr "Vanhenna kaikki versiot"
 
 #: templates/settings-personal.php:4
 msgid "Versions"
-msgstr ""
+msgstr "Versiot"
 
 #: templates/settings-personal.php:7
 msgid "This will delete all existing backup versions of your files"
-msgstr ""
+msgstr "Tämä poistaa kaikki tiedostojesi olemassa olevat varmuuskopioversiot"
 
 #: templates/settings.php:3
 msgid "Enable Files Versioning"
diff --git a/l10n/fi_FI/settings.po b/l10n/fi_FI/settings.po
index 98c69430bb..b2d28143e9 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-09-01 13:35+0200\n"
-"PO-Revision-Date: 2012-09-01 11:35+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-03 02:05+0200\n"
+"PO-Revision-Date: 2012-09-02 15:47+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"
@@ -110,15 +110,15 @@ msgstr ""
 
 #: templates/admin.php:51
 msgid "Allow links"
-msgstr ""
+msgstr "Salli linkit"
 
 #: templates/admin.php:52
 msgid "Allow users to share items to the public with links"
-msgstr ""
+msgstr "Salli käyttäjien jakaa kohteita julkisesti linkkejä käyttäen"
 
 #: templates/admin.php:56
 msgid "Allow resharing"
-msgstr ""
+msgstr "Salli uudelleenjako"
 
 #: templates/admin.php:57
 msgid "Allow users to share items shared with them again"
@@ -126,11 +126,11 @@ msgstr ""
 
 #: templates/admin.php:60
 msgid "Allow users to share with anyone"
-msgstr ""
+msgstr "Salli käyttäjien jakaa kohteita kenen tahansa kanssa"
 
 #: templates/admin.php:62
 msgid "Allow users to only share with users in their groups"
-msgstr ""
+msgstr "Salli käyttäjien jakaa kohteita vain omien ryhmien jäsenten kesken"
 
 #: templates/admin.php:69
 msgid "Log"
@@ -148,7 +148,7 @@ msgid ""
 "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>."
-msgstr ""
+msgstr "Kehityksestä on vastannut <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud-yhteisö</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">lähdekoodi</a> on julkaistu lisenssin <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> alaisena."
 
 #: templates/apps.php:10
 msgid "Add your App"
diff --git a/l10n/ru/lib.po b/l10n/ru/lib.po
index e345d2c974..9a75b9546a 100644
--- a/l10n/ru/lib.po
+++ b/l10n/ru/lib.po
@@ -4,13 +4,14 @@
 # 
 # Translators:
 # Denis  <reg.transifex.net@demitel.ru>, 2012.
+#   <mpolr21@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 02:01+0200\n"
-"PO-Revision-Date: 2012-09-01 00:02+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-03 02:04+0200\n"
+"PO-Revision-Date: 2012-09-02 14:32+0000\n"
+"Last-Translator: mPolr <mpolr21@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"
@@ -123,4 +124,4 @@ msgstr ""
 
 #: updater.php:71
 msgid "updates check is disabled"
-msgstr ""
+msgstr "проверка обновлений отключена"
diff --git a/l10n/sl/files_versions.po b/l10n/sl/files_versions.po
index a018b4cf42..d37dc15d09 100644
--- a/l10n/sl/files_versions.po
+++ b/l10n/sl/files_versions.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-09-01 13:35+0200\n"
-"PO-Revision-Date: 2012-09-01 11:35+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-03 02:04+0200\n"
+"PO-Revision-Date: 2012-09-02 02: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"
@@ -24,11 +24,11 @@ msgstr "Zastaraj vse različice"
 
 #: templates/settings-personal.php:4
 msgid "Versions"
-msgstr ""
+msgstr "Različice"
 
 #: templates/settings-personal.php:7
 msgid "This will delete all existing backup versions of your files"
-msgstr ""
+msgstr "To bo izbrisalo vse obstoječe različice varnostnih kopij vaših datotek"
 
 #: templates/settings.php:3
 msgid "Enable Files Versioning"
diff --git a/l10n/sl/settings.po b/l10n/sl/settings.po
index 299979763b..95cdc0a22a 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-09-01 13:35+0200\n"
-"PO-Revision-Date: 2012-09-01 11:35+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-03 02:05+0200\n"
+"PO-Revision-Date: 2012-09-02 02:00+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"
@@ -79,7 +79,7 @@ msgid ""
 "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."
-msgstr ""
+msgstr "Vaša mapa data in vaše datoteke so verjetno vsem dostopne preko interneta. Datoteka .htaccess vključena v ownCloud ni omogočena. Močno vam priporočamo, da nastavite vaš spletni strežnik tako, da mapa data ne bo več na voljo vsem, ali pa jo preselite izven korenske mape spletnega strežnika."
 
 #: templates/admin.php:31
 msgid "Cron"
@@ -149,7 +149,7 @@ msgid ""
 "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>."
-msgstr ""
+msgstr "Razvit s strani <a href=\"http://ownCloud.org/contact\" target=\"_blank\">skupnosti ownCloud</a>. <a href=\"https://github.com/owncloud\" target=\"_blank\">Izvorna koda</a> je izdana pod licenco <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
 
 #: templates/apps.php:10
 msgid "Add your App"
diff --git a/l10n/sv/files_versions.po b/l10n/sv/files_versions.po
index 53aac5ef45..29af9f4e97 100644
--- a/l10n/sv/files_versions.po
+++ b/l10n/sv/files_versions.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-09-01 13:35+0200\n"
-"PO-Revision-Date: 2012-09-01 11:35+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-03 02:04+0200\n"
+"PO-Revision-Date: 2012-09-02 09:50+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,11 +24,11 @@ msgstr "Upphör alla versioner"
 
 #: templates/settings-personal.php:4
 msgid "Versions"
-msgstr ""
+msgstr "Versioner"
 
 #: templates/settings-personal.php:7
 msgid "This will delete all existing backup versions of your files"
-msgstr ""
+msgstr "Detta kommer att radera alla befintliga säkerhetskopior av dina filer"
 
 #: templates/settings.php:3
 msgid "Enable Files Versioning"
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index ee6aa77b12..2ab352a0a8 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-09-02 02:01+0200\n"
+"POT-Creation-Date: 2012-09-03 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 39453f66ed..66d9dbcd1b 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-09-02 02:01+0200\n"
+"POT-Creation-Date: 2012-09-03 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 18a12f4b7d..5b047fcf46 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-09-02 02:01+0200\n"
+"POT-Creation-Date: 2012-09-03 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 794c132aaf..3f295496fd 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-09-02 02:01+0200\n"
+"POT-Creation-Date: 2012-09-03 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 b78bed0cb8..d386ad1e35 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-09-02 02:01+0200\n"
+"POT-Creation-Date: 2012-09-03 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 7536c6fd39..72af58b8b5 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-09-02 02:01+0200\n"
+"POT-Creation-Date: 2012-09-03 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 580fc07f7b..3c27e4b0f8 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-09-02 02:01+0200\n"
+"POT-Creation-Date: 2012-09-03 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 eca1559ddb..dcdeac2fdc 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-09-02 02:01+0200\n"
+"POT-Creation-Date: 2012-09-03 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/user_ldap.pot b/l10n/templates/user_ldap.pot
index eb372a1f02..a8e7af2412 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-09-02 02:01+0200\n"
+"POT-Creation-Date: 2012-09-03 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/files_versions.po b/l10n/th_TH/files_versions.po
index 178ff67a95..28f3effc2a 100644
--- a/l10n/th_TH/files_versions.po
+++ b/l10n/th_TH/files_versions.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-09-01 13:35+0200\n"
-"PO-Revision-Date: 2012-09-01 11:35+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-03 02:04+0200\n"
+"PO-Revision-Date: 2012-09-02 22:45+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"
@@ -24,11 +24,11 @@ msgstr "หมดอายุทุกรุ่น"
 
 #: templates/settings-personal.php:4
 msgid "Versions"
-msgstr ""
+msgstr "รุ่น"
 
 #: templates/settings-personal.php:7
 msgid "This will delete all existing backup versions of your files"
-msgstr ""
+msgstr "นี่จะเป็นลบทิ้งไฟล์รุ่นที่ทำการสำรองข้อมูลทั้งหมดที่มีอยู่ของคุณทิ้งไป"
 
 #: templates/settings.php:3
 msgid "Enable Files Versioning"
diff --git a/l10n/th_TH/lib.po b/l10n/th_TH/lib.po
index 93925a0b0d..ea4639ff8f 100644
--- a/l10n/th_TH/lib.po
+++ b/l10n/th_TH/lib.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-09-01 02:01+0200\n"
-"PO-Revision-Date: 2012-09-01 00:02+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-03 02:04+0200\n"
+"PO-Revision-Date: 2012-09-02 22:43+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"
@@ -115,12 +115,12 @@ msgstr "ปีที่ผ่านมา"
 #: updater.php:66
 #, php-format
 msgid "%s is available. Get <a href=\"%s\">more information</a>"
-msgstr ""
+msgstr "%s พร้อมให้ใช้งานได้แล้ว. <a href=\"%s\">ดูรายละเอียดเพิ่มเติม</a>"
 
 #: updater.php:68
 msgid "up to date"
-msgstr ""
+msgstr "ทันสมัย"
 
 #: updater.php:71
 msgid "updates check is disabled"
-msgstr ""
+msgstr "การตรวจสอบชุดอัพเดทถูกปิดใช้งานไว้"
diff --git a/l10n/th_TH/settings.po b/l10n/th_TH/settings.po
index fe1fc15e9e..383a4a47c8 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-09-01 13:35+0200\n"
-"PO-Revision-Date: 2012-09-01 11:35+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-03 02:05+0200\n"
+"PO-Revision-Date: 2012-09-02 22: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"
@@ -79,7 +79,7 @@ msgid ""
 "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."
-msgstr ""
+msgstr "ไดเร็กทอรี่ข้อมูลและไฟล์ของคุณสามารถเข้าถึงได้จากอินเทอร์เน็ต ไฟล์ .htaccess ที่ ownCloud มีให้ไม่สามารถทำงานได้อย่างเหมาะสม เราขอแนะนำให้คุณกำหนดค่าเว็บเซิร์ฟเวอร์ใหม่ในรูปแบบที่ไดเร็กทอรี่เก็บข้อมูลไม่สามารถเข้าถึงได้อีกต่อไป หรือคุณได้ย้ายไดเร็กทอรี่ที่ใช้เก็บข้อมูลไปอยู่ภายนอกตำแหน่ง root ของเว็บเซิร์ฟเวอร์แล้ว"
 
 #: templates/admin.php:31
 msgid "Cron"
@@ -149,7 +149,7 @@ msgid ""
 "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>."
-msgstr ""
+msgstr "พัฒนาโดย the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ชุมชนผู้ใช้งาน ownCloud</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">ซอร์สโค้ด</a>อยู่ภายใต้สัญญาอนุญาตของ <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
 
 #: templates/apps.php:10
 msgid "Add your App"
diff --git a/lib/l10n/ru.php b/lib/l10n/ru.php
index 07dacc598a..3b2681ba8d 100644
--- a/lib/l10n/ru.php
+++ b/lib/l10n/ru.php
@@ -21,5 +21,6 @@
 "last month" => "в прошлом месяце",
 "months ago" => "месяцы назад",
 "last year" => "в прошлом году",
-"years ago" => "годы назад"
+"years ago" => "годы назад",
+"updates check is disabled" => "проверка обновлений отключена"
 );
diff --git a/lib/l10n/th_TH.php b/lib/l10n/th_TH.php
index cb2610fa20..2aa2ffaba8 100644
--- a/lib/l10n/th_TH.php
+++ b/lib/l10n/th_TH.php
@@ -21,5 +21,8 @@
 "last month" => "เดือนที่แล้ว",
 "months ago" => "เดือนมาแล้ว",
 "last year" => "ปีที่แล้ว",
-"years ago" => "ปีที่ผ่านมา"
+"years ago" => "ปีที่ผ่านมา",
+"%s is available. Get <a href=\"%s\">more information</a>" => "%s พร้อมให้ใช้งานได้แล้ว. <a href=\"%s\">ดูรายละเอียดเพิ่มเติม</a>",
+"up to date" => "ทันสมัย",
+"updates check is disabled" => "การตรวจสอบชุดอัพเดทถูกปิดใช้งานไว้"
 );
diff --git a/settings/l10n/da.php b/settings/l10n/da.php
index f17fb11fa7..775087a707 100644
--- a/settings/l10n/da.php
+++ b/settings/l10n/da.php
@@ -13,7 +13,17 @@
 "__language_name__" => "Dansk",
 "Security Warning" => "Sikkerhedsadvarsel",
 "Cron" => "Cron",
+"execute one task with each page loaded" => "udfør en opgave for hver indlæst side",
 "cron.php is registered at a webcron service" => "cron.php er tilmeldt en webcron tjeneste",
+"use systems cron service" => "brug systemets cron service",
+"Share API" => "Del API",
+"Enable Share API" => "Aktiver dele API",
+"Allow apps to use the Share API" => "Tillad apps a bruge dele APIen",
+"Allow links" => "Tillad links",
+"Allow users to share items to the public with links" => "Tillad brugere at dele elementer med offentligheden med links",
+"Allow resharing" => "Tillad gendeling",
+"Allow users to share with anyone" => "Tillad brugere at dele med hvem som helst",
+"Allow users to only share with users in their groups" => "Tillad kun deling med brugere i brugerens egen gruppe",
 "Log" => "Log",
 "More" => "Mere",
 "Add your App" => "Tilføj din App",
@@ -49,6 +59,7 @@
 "Create" => "Ny",
 "Default Quota" => "Standard kvote",
 "Other" => "Andet",
+"Group Admin" => "Gruppe Administrator",
 "Quota" => "Kvote",
 "Delete" => "Slet"
 );
diff --git a/settings/l10n/de.php b/settings/l10n/de.php
index 8ca01243e5..68bdb81f55 100644
--- a/settings/l10n/de.php
+++ b/settings/l10n/de.php
@@ -12,15 +12,16 @@
 "Saving..." => "Speichern...",
 "__language_name__" => "Deutsch",
 "Security Warning" => "Sicherheitshinweis",
+"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." => "Ihr Datenverzeichnis ist möglicher Weise aus dem Internet erreichbar. Die .htaccess-Datei von OwnCloud funktioniert nicht. Wir raten Ihnen dringend, dass Sie Ihren Webserver dahingehend konfigurieren, dass Ihr Datenverzeichnis nicht länger aus dem Internet erreichbar ist, oder Sie verschieben das Datenverzeichnis außerhalb des Wurzelverzeichnisses des Webservers.",
 "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",
 "Share API" => "Teilungs-API",
 "Enable Share API" => "Teilungs-API aktivieren",
-"Allow apps to use the Share API" => "Erlaubt Nutzern die Teilungs-API zu nutzen",
+"Allow apps to use the Share API" => "Erlaubt Nutzern, die Teilungs-API zu nutzen",
 "Allow links" => "Links erlauben",
-"Allow users to share items to the public with links" => "Erlaube Nutzern Dateien mithilfe von Links mit der Öffentlichkeit zu teilen",
+"Allow users to share items to the public with links" => "Erlaube Nutzern, Dateien mithilfe von Links mit der Öffentlichkeit zu teilen",
 "Allow resharing" => "Erneutes Teilen erlauben",
 "Allow users to share items shared with them again" => "Erlaubt Nutzern, Dateien die mit ihnen geteilt wurden, erneut zu teilen",
 "Allow users to share with anyone" => "Erlaube Nutzern mit jedem zu Teilen",
diff --git a/settings/l10n/fi_FI.php b/settings/l10n/fi_FI.php
index bfcf1a59dd..0ca490d8d5 100644
--- a/settings/l10n/fi_FI.php
+++ b/settings/l10n/fi_FI.php
@@ -13,8 +13,14 @@
 "Security Warning" => "Turvallisuusvaroitus",
 "Cron" => "Cron",
 "use systems cron service" => "käytä järjestelmän cron-palvelua",
+"Allow links" => "Salli linkit",
+"Allow users to share items to the public with links" => "Salli käyttäjien jakaa kohteita julkisesti linkkejä käyttäen",
+"Allow resharing" => "Salli uudelleenjako",
+"Allow users to share with anyone" => "Salli käyttäjien jakaa kohteita kenen tahansa kanssa",
+"Allow users to only share with users in their groups" => "Salli käyttäjien jakaa kohteita vain omien ryhmien jäsenten kesken",
 "Log" => "Loki",
 "More" => "Lisää",
+"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/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>." => "Kehityksestä on vastannut <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud-yhteisö</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">lähdekoodi</a> on julkaistu lisenssin <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> alaisena.",
 "Add your App" => "Lisää ohjelmasi",
 "Select an App" => "Valitse ohjelma",
 "See application page at apps.owncloud.com" => "Katso sovellussivu osoitteessa apps.owncloud.com",
diff --git a/settings/l10n/sl.php b/settings/l10n/sl.php
index 884acaf576..9dd7813cc1 100644
--- a/settings/l10n/sl.php
+++ b/settings/l10n/sl.php
@@ -12,6 +12,7 @@
 "Saving..." => "Shranjevanje...",
 "__language_name__" => "__ime_jezika__",
 "Security Warning" => "Varnostno opozorilo",
+"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." => "Vaša mapa data in vaše datoteke so verjetno vsem dostopne preko interneta. Datoteka .htaccess vključena v ownCloud ni omogočena. Močno vam priporočamo, da nastavite vaš spletni strežnik tako, da mapa data ne bo več na voljo vsem, ali pa jo preselite izven korenske mape spletnega strežnika.",
 "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",
@@ -27,6 +28,7 @@
 "Allow users to only share with users in their groups" => "Uporabnikom dovoli souporabo le znotraj njihove skupine",
 "Log" => "Dnevnik",
 "More" => "Več",
+"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/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>." => "Razvit s strani <a href=\"http://ownCloud.org/contact\" target=\"_blank\">skupnosti ownCloud</a>. <a href=\"https://github.com/owncloud\" target=\"_blank\">Izvorna koda</a> je izdana pod licenco <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "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",
diff --git a/settings/l10n/th_TH.php b/settings/l10n/th_TH.php
index 6ab253362e..862445524f 100644
--- a/settings/l10n/th_TH.php
+++ b/settings/l10n/th_TH.php
@@ -12,6 +12,7 @@
 "Saving..." => "กำลังบันทึุกข้อมูล...",
 "__language_name__" => "ภาษาไทย",
 "Security Warning" => "คำเตือนเกี่ยวกับความปลอดภัย",
+"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." => "ไดเร็กทอรี่ข้อมูลและไฟล์ของคุณสามารถเข้าถึงได้จากอินเทอร์เน็ต ไฟล์ .htaccess ที่ ownCloud มีให้ไม่สามารถทำงานได้อย่างเหมาะสม เราขอแนะนำให้คุณกำหนดค่าเว็บเซิร์ฟเวอร์ใหม่ในรูปแบบที่ไดเร็กทอรี่เก็บข้อมูลไม่สามารถเข้าถึงได้อีกต่อไป หรือคุณได้ย้ายไดเร็กทอรี่ที่ใช้เก็บข้อมูลไปอยู่ภายนอกตำแหน่ง root ของเว็บเซิร์ฟเวอร์แล้ว",
 "Cron" => "Cron",
 "execute one task with each page loaded" => "ประมวลผลหนึ่งงานเมื่อโหลดหน้าเว็บแต่ละครั้ง",
 "cron.php is registered at a webcron service" => "cron.php ได้ถูกลงทะเบียนที่บริการ webcron",
@@ -27,6 +28,7 @@
 "Allow users to only share with users in their groups" => "อนุญาตให้ผู้ใช้งานแชร์ข้อมูลได้เฉพาะกับผู้ใช้งานที่อยู่ในกลุ่มเดียวกันเท่านั้น",
 "Log" => "บันทึกการเปลี่ยนแปลง",
 "More" => "เพิ่มเติม",
+"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/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>." => "พัฒนาโดย the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ชุมชนผู้ใช้งาน ownCloud</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">ซอร์สโค้ด</a>อยู่ภายใต้สัญญาอนุญาตของ <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "Add your App" => "เพิ่มแอปของคุณ",
 "Select an App" => "เลือก App",
 "See application page at apps.owncloud.com" => "ดูหน้าแอพพลิเคชั่นที่ apps.owncloud.com",

From c6858fb5ca2b78057564278636231f940d4a120c Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Mon, 3 Sep 2012 13:14:07 -0400
Subject: [PATCH 1048/1224] Add additional html tags to public links template
 for previewers

---
 apps/files_sharing/templates/public.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/apps/files_sharing/templates/public.php b/apps/files_sharing/templates/public.php
index 1c08b5b26a..ca48a35575 100755
--- a/apps/files_sharing/templates/public.php
+++ b/apps/files_sharing/templates/public.php
@@ -19,5 +19,7 @@
 			<a href="<?php echo $_['downloadURL']; ?>" id="download"><img class="svg" alt="Download" src="<?php echo OCP\image_path("core", "actions/download.svg"); ?>" /><?php echo $l->t('Download')?></a>
 		</li>
 	</ul>
+	<div id="content"></div>
+	<table></table>
 </div>
 <footer><p class="info"><a href="http://owncloud.org/">ownCloud</a> &ndash; <?php echo $l->t('web services under your control'); ?></p></footer>
\ No newline at end of file

From bb65e173d416fb91800ebe9d63fe8d3d519c0164 Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <frank@owncloud.org>
Date: Mon, 3 Sep 2012 20:38:50 +0200
Subject: [PATCH 1049/1224] 4.5 beta 2

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

diff --git a/lib/util.php b/lib/util.php
index 10b88b2443..581b6bdb31 100755
--- a/lib/util.php
+++ b/lib/util.php
@@ -74,7 +74,7 @@ class OC_Util {
 	 */
 	public static function getVersion(){
 		// hint: We only can count up. So the internal version number of ownCloud 4.5 will be 4,9,0. This is not visible to the user
-		return array(4,83,5);
+		return array(4,83,6);
 	}
 
 	/**
@@ -82,7 +82,7 @@ class OC_Util {
 	 * @return string
 	 */
 	public static function getVersionString(){
-		return '4.5 beta 1';
+		return '4.5 beta 2';
 	}
 
 	/**

From 38116c7efa2b922c2fa0eaa48eb538e8bb420f57 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Sat, 1 Sep 2012 01:14:12 +0200
Subject: [PATCH 1050/1224] Add check for missing appinfo in apps settings page

---
 settings/apps.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/settings/apps.php b/settings/apps.php
index 27bbcc9ada..7e21973805 100644
--- a/settings/apps.php
+++ b/settings/apps.php
@@ -38,6 +38,10 @@ $blacklist=array('files');//we dont want to show configuration for these
 foreach($registeredApps as $app){
 	if(array_search($app,$blacklist)===false){
 		$info=OC_App::getAppInfo($app);
+		if (!isset($info['name'])) {
+			OC_Log::write('core','App id "'.$app.'" has no name in appinfo',OC_Log::ERROR);
+			continue;
+		}
 		$active=(OC_Appconfig::getValue($app,'enabled','no')=='yes')?true:false;
 		$info['active']=$active;
 		if(isset($info['shipped']) and ($info['shipped']=='true')) {

From 1a461924336f8ab227c135e13d7661b7a4f1e1df Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Mon, 3 Sep 2012 18:13:45 +0200
Subject: [PATCH 1051/1224] Add args parameter to linkTo(Absolute) function, to
 append the args automaticly

---
 lib/helper.php      | 12 +++++++++---
 lib/public/util.php | 10 ++++++----
 lib/template.php    |  5 +++--
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/lib/helper.php b/lib/helper.php
index 3cf464dfa7..ea43304da5 100644
--- a/lib/helper.php
+++ b/lib/helper.php
@@ -32,11 +32,12 @@ class OC_Helper {
 	 * @brief Creates an url
 	 * @param $app app
 	 * @param $file file
+	 * @param $args array with param=>value, will be appended to the returned url
 	 * @returns the url
 	 *
 	 * Returns a url to the given app and file.
 	 */
-	public static function linkTo( $app, $file ){
+	public static function linkTo( $app, $file, $args = array() ){
 		if( $app != '' ){
 			$app_path = OC_App::getAppPath($app);
 			// Check if the app is in the app folder
@@ -61,6 +62,10 @@ class OC_Helper {
 			}
 		}
 
+		foreach($args as $k => $v) {
+			$urlLinkTo .= '&'.$k.'='.$v;
+		}
+
 		return $urlLinkTo;
 	}
 
@@ -68,12 +73,13 @@ class OC_Helper {
 	 * @brief Creates an absolute url
 	 * @param $app app
 	 * @param $file file
+	 * @param $args array with param=>value, will be appended to the returned url
 	 * @returns the url
 	 *
 	 * Returns a absolute url to the given app and file.
 	 */
-	public static function linkToAbsolute( $app, $file ) {
-		$urlLinkTo = self::linkTo( $app, $file );
+	public static function linkToAbsolute( $app, $file, $args = array() ) {
+		$urlLinkTo = self::linkTo( $app, $file, $args );
 		return self::makeURLAbsolute($urlLinkTo);
 	}
 
diff --git a/lib/public/util.php b/lib/public/util.php
index 6ad578441e..cc05e6d535 100644
--- a/lib/public/util.php
+++ b/lib/public/util.php
@@ -124,12 +124,13 @@ class Util {
 	 * @brief Creates an absolute url
 	 * @param $app app
 	 * @param $file file
+	 * @param $args array with param=>value, will be appended to the returned url
 	 * @returns the url
 	 *
 	 * Returns a absolute url to the given app and file.
 	 */
-	public static function linkToAbsolute( $app, $file ) {
-		return(\OC_Helper::linkToAbsolute( $app, $file ));
+	public static function linkToAbsolute( $app, $file, $args = array() ) {
+		return(\OC_Helper::linkToAbsolute( $app, $file, $args ));
 	}
 
 
@@ -160,12 +161,13 @@ class Util {
 	* @brief Creates an url
 	* @param $app app
 	* @param $file file
+	* @param $args array with param=>value, will be appended to the returned url
 	* @returns the url
 	*
 	* Returns a url to the given app and file.
 	*/
-	public static function linkTo( $app, $file ){
-		return(\OC_Helper::linkTo( $app, $file ));
+	public static function linkTo( $app, $file, $args = array() ){
+		return(\OC_Helper::linkTo( $app, $file, $args ));
 	}
 
 	/**
diff --git a/lib/template.php b/lib/template.php
index fa8d419261..2359bd50c4 100644
--- a/lib/template.php
+++ b/lib/template.php
@@ -25,12 +25,13 @@
  * @brief make OC_Helper::linkTo available as a simple function
  * @param $app app
  * @param $file file
+ * @param $args array with param=>value, will be appended to the returned url
  * @returns link to the file
  *
  * For further information have a look at OC_Helper::linkTo
  */
-function link_to( $app, $file ){
-	return OC_Helper::linkTo( $app, $file );
+function link_to( $app, $file, $args = array() ){
+	return OC_Helper::linkTo( $app, $file, $args );
 }
 
 /**

From 5153b8b293b5485b9aa3d321f6a93979ec302068 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Mon, 3 Sep 2012 19:12:52 +0200
Subject: [PATCH 1052/1224] Add url-params to url with new parameter in linkTo
 function

---
 apps/files_versions/templates/history.php |  2 +-
 core/lostpassword/index.php               |  2 +-
 lib/search/provider/file.php              | 10 +++++-----
 lib/util.php                              |  2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/apps/files_versions/templates/history.php b/apps/files_versions/templates/history.php
index d4f875a36e..99bc153a81 100644
--- a/apps/files_versions/templates/history.php
+++ b/apps/files_versions/templates/history.php
@@ -22,7 +22,7 @@ if( isset( $_['message'] ) ) {
 	foreach ( $_['versions'] as $v ) {
 		echo ' ';
 		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 />';
+		echo ' <a href="'.OCP\Util::linkTo('files_versions', 'history.php', array('path' => urlencode( $_['path'] ), 'revert' => $v['version'])) .'" class="button">Revert</a><br /><br />';
 		if ( $v['cur'] ) { echo '  (<b>Current</b>)'; }
 		echo '<br /><br />';
 	}
diff --git a/core/lostpassword/index.php b/core/lostpassword/index.php
index 8f86fe23aa..58dab59732 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='.urlencode($_POST['user']).'&token='.$token;
+			$link = OC_Helper::linkToAbsolute('core/lostpassword', 'resetpassword.php', array('user' => urlencode($_POST['user']), 'token' => $token));
 			$tmpl = new OC_Template('core/lostpassword', 'email');
 			$tmpl->assign('link', $link, false);
 			$msg = $tmpl->fetchPage();
diff --git a/lib/search/provider/file.php b/lib/search/provider/file.php
index a37af49559..12a535876f 100644
--- a/lib/search/provider/file.php
+++ b/lib/search/provider/file.php
@@ -8,23 +8,23 @@ class OC_Search_Provider_File extends OC_Search_Provider{
 			$file=$fileData['path'];
 			$mime=$fileData['mimetype'];
 			if($mime=='httpd/unix-directory'){
-				$results[]=new OC_Search_Result(basename($file),'',OC_Helper::linkTo( 'files', 'index.php' ).'?dir='.$file,'Files');
+				$results[]=new OC_Search_Result(basename($file),'',OC_Helper::linkTo( 'files', 'index.php', array('dir' => $file)),'Files');
 			}else{
 				$mimeBase=$fileData['mimepart'];
 				switch($mimeBase){
 					case 'audio':
 						break;
 					case 'text':
-						$results[]=new OC_Search_Result(basename($file),'',OC_Helper::linkTo( 'files', 'download.php' ).'?file='.$file,'Text');
+						$results[]=new OC_Search_Result(basename($file),'',OC_Helper::linkTo( 'files', 'download.php', array('dir' => $file) ),'Text');
 						break;
 					case 'image':
-						$results[]=new OC_Search_Result(basename($file),'',OC_Helper::linkTo( 'files', 'download.php' ).'?file='.$file,'Images');
+						$results[]=new OC_Search_Result(basename($file),'',OC_Helper::linkTo( 'files', 'download.php', array('dir' => $file) ),'Images');
 						break;
 					default:
 						if($mime=='application/xml'){
-							$results[]=new OC_Search_Result(basename($file),'',OC_Helper::linkTo( 'files', 'download.php' ).'?file='.$file,'Text');
+							$results[]=new OC_Search_Result(basename($file),'',OC_Helper::linkTo( 'files', 'download.php', array('dir' => $file) ),'Text');
 						}else{
-							$results[]=new OC_Search_Result(basename($file),'',OC_Helper::linkTo( 'files', 'download.php' ).'?file='.$file,'Files');
+							$results[]=new OC_Search_Result(basename($file),'',OC_Helper::linkTo( 'files', 'download.php', array('dir' => $file) ),'Files');
 						}
 				}
 			}
diff --git a/lib/util.php b/lib/util.php
index 581b6bdb31..42a0f5c7df 100755
--- a/lib/util.php
+++ b/lib/util.php
@@ -320,7 +320,7 @@ class OC_Util {
 	public static function checkLoggedIn(){
 		// Check if we are a user
 		if( !OC_User::isLoggedIn()){
-			header( 'Location: '.OC_Helper::linkToAbsolute( '', 'index.php' ).'?redirect_url='.urlencode($_SERVER["REQUEST_URI"]));
+			header( 'Location: '.OC_Helper::linkToAbsolute( '', 'index.php', array('redirect_url' => urlencode($_SERVER["REQUEST_URI"]))));
 			exit();
 		}
 	}

From b867b738e8772ac8806b031baccebf150d701dde Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <thomas.mueller@tmit.eu>
Date: Tue, 4 Sep 2012 02:03:21 +0200
Subject: [PATCH 1053/1224] [tx-robot] updated from transifex

---
 apps/files/l10n/fi_FI.php           |  3 +-
 apps/files/l10n/lb.php              | 17 ++++++++++
 apps/files/l10n/pl.php              |  1 +
 apps/files_sharing/l10n/eu.php      |  1 +
 apps/files_sharing/l10n/fi_FI.php   |  1 +
 apps/files_sharing/l10n/pl.php      |  1 +
 apps/files_versions/l10n/ca.php     |  2 ++
 apps/files_versions/l10n/eu.php     |  2 ++
 apps/files_versions/l10n/ja_JP.php  |  2 ++
 apps/files_versions/l10n/pl.php     |  2 ++
 apps/user_ldap/l10n/es.php          |  5 +++
 core/l10n/fi_FI.php                 |  2 ++
 core/l10n/lb.php                    | 21 +++++++++++-
 core/l10n/pl.php                    |  1 +
 l10n/ca/files_versions.po           | 12 +++----
 l10n/ca/lib.po                      | 34 +++++++++----------
 l10n/ca/settings.po                 | 12 +++----
 l10n/es/settings.po                 | 12 +++----
 l10n/es/user_ldap.po                | 20 ++++++-----
 l10n/eu/files_sharing.po            | 12 +++----
 l10n/eu/files_versions.po           | 12 +++----
 l10n/eu/lib.po                      | 34 +++++++++----------
 l10n/eu/settings.po                 | 30 ++++++++---------
 l10n/fi_FI/core.po                  | 13 ++++----
 l10n/fi_FI/files.po                 | 11 +++---
 l10n/fi_FI/files_sharing.po         | 13 ++++----
 l10n/fi_FI/settings.po              | 27 +++++++--------
 l10n/ja_JP/files_versions.po        | 12 +++----
 l10n/ja_JP/lib.po                   | 34 +++++++++----------
 l10n/lb/core.po                     | 50 +++++++++++++--------------
 l10n/lb/files.po                    | 44 ++++++++++++------------
 l10n/lb/settings.po                 | 52 ++++++++++++++---------------
 l10n/pl/core.po                     | 10 +++---
 l10n/pl/files.po                    | 10 +++---
 l10n/pl/files_sharing.po            | 12 +++----
 l10n/pl/files_versions.po           | 12 +++----
 l10n/pl/lib.po                      | 34 +++++++++----------
 l10n/pl/settings.po                 | 18 +++++-----
 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    |  4 +--
 l10n/templates/files_versions.pot   |  2 +-
 l10n/templates/lib.pot              | 22 ++++++------
 l10n/templates/settings.pot         |  2 +-
 l10n/templates/user_ldap.pot        |  2 +-
 lib/l10n/ca.php                     |  5 ++-
 lib/l10n/eu.php                     |  5 ++-
 lib/l10n/ja_JP.php                  |  5 ++-
 lib/l10n/pl.php                     |  5 ++-
 settings/l10n/ca.php                |  2 ++
 settings/l10n/es.php                |  1 +
 settings/l10n/eu.php                | 11 ++++++
 settings/l10n/fi_FI.php             |  9 +++++
 settings/l10n/lb.php                | 21 ++++++++++++
 settings/l10n/pl.php                |  5 +++
 57 files changed, 412 insertions(+), 288 deletions(-)

diff --git a/apps/files/l10n/fi_FI.php b/apps/files/l10n/fi_FI.php
index 399adb0b1d..3ed56de641 100644
--- a/apps/files/l10n/fi_FI.php
+++ b/apps/files/l10n/fi_FI.php
@@ -47,5 +47,6 @@
 "Download" => "Lataa",
 "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."
+"Files are being scanned, please wait." => "Tiedostoja tarkistetaan, odota hetki.",
+"Current scanning" => "Tämänhetkinen tutkinta"
 );
diff --git a/apps/files/l10n/lb.php b/apps/files/l10n/lb.php
index f7a10fbc5c..7c8244a874 100644
--- a/apps/files/l10n/lb.php
+++ b/apps/files/l10n/lb.php
@@ -8,8 +8,25 @@
 "Failed to write to disk" => "Konnt net op den Disk schreiwen",
 "Files" => "Dateien",
 "Delete" => "Läschen",
+"already exists" => "existéiert schonn",
+"replace" => "ersetzen",
+"cancel" => "ofbriechen",
+"replaced" => "ersat",
+"with" => "mat",
+"undo" => "réckgängeg man",
+"deleted" => "geläscht",
+"generating ZIP-file, it may take some time." => "Et  gëtt eng ZIP-File generéiert, dëst ka bëssen daueren.",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Kann deng Datei net eroplueden well et en Dossier ass oder 0 byte grouss ass.",
+"Upload Error" => "Fehler beim eroplueden",
+"Upload cancelled." => "Upload ofgebrach.",
+"File upload is in progress. Leaving the page now will cancel the upload." => "File Upload am gaang. Wann's de des Säit verléiss gëtt den Upload ofgebrach.",
+"Invalid name, '/' is not allowed." => "Ongültege Numm, '/' net erlaabt.",
 "Size" => "Gréisst",
 "Modified" => "Geännert",
+"folder" => "Dossier",
+"folders" => "Dossieren",
+"file" => "Datei",
+"files" => "Dateien",
 "File handling" => "Fichier handling",
 "Maximum upload size" => "Maximum Upload Gréisst ",
 "max. possible: " => "max. méiglech:",
diff --git a/apps/files/l10n/pl.php b/apps/files/l10n/pl.php
index eb791330bf..a95c995d25 100644
--- a/apps/files/l10n/pl.php
+++ b/apps/files/l10n/pl.php
@@ -20,6 +20,7 @@
 "Upload Error" => "Błąd wczytywania",
 "Pending" => "Oczekujące",
 "Upload cancelled." => "Wczytywanie anulowane.",
+"File upload is in progress. Leaving the page now will cancel the upload." => "Wysyłanie pliku jest w toku. Teraz opuszczając stronę wysyłanie zostanie anulowane.",
 "Invalid name, '/' is not allowed." => "Nieprawidłowa nazwa '/' jest niedozwolone.",
 "Size" => "Rozmiar",
 "Modified" => "Czas modyfikacji",
diff --git a/apps/files_sharing/l10n/eu.php b/apps/files_sharing/l10n/eu.php
index a1f810826c..70ff2e8876 100644
--- a/apps/files_sharing/l10n/eu.php
+++ b/apps/files_sharing/l10n/eu.php
@@ -2,5 +2,6 @@
 "Password" => "Pasahitza",
 "Submit" => "Bidali",
 "Download" => "Deskargatu",
+"No preview available for" => "Ez dago aurrebista eskuragarririk hauentzat ",
 "web services under your control" => "web zerbitzuak zure kontrolpean"
 );
diff --git a/apps/files_sharing/l10n/fi_FI.php b/apps/files_sharing/l10n/fi_FI.php
index ce2c5932d4..85c6c7a713 100644
--- a/apps/files_sharing/l10n/fi_FI.php
+++ b/apps/files_sharing/l10n/fi_FI.php
@@ -2,5 +2,6 @@
 "Password" => "Salasana",
 "Submit" => "Lähetä",
 "Download" => "Lataa",
+"No preview available for" => "Ei esikatselua kohteelle",
 "web services under your control" => "verkkopalvelut hallinnassasi"
 );
diff --git a/apps/files_sharing/l10n/pl.php b/apps/files_sharing/l10n/pl.php
index 5810cc6d79..1d5e6261ef 100644
--- a/apps/files_sharing/l10n/pl.php
+++ b/apps/files_sharing/l10n/pl.php
@@ -2,5 +2,6 @@
 "Password" => "Hasło",
 "Submit" => "Wyślij",
 "Download" => "Pobierz",
+"No preview available for" => "Podgląd nie jest dostępny dla",
 "web services under your control" => "Kontrolowane serwisy"
 );
diff --git a/apps/files_versions/l10n/ca.php b/apps/files_versions/l10n/ca.php
index 8388556bec..b6ddc6feec 100644
--- a/apps/files_versions/l10n/ca.php
+++ b/apps/files_versions/l10n/ca.php
@@ -1,4 +1,6 @@
 <?php $TRANSLATIONS = array(
 "Expire all versions" => "Expira totes les versions",
+"Versions" => "Versions",
+"This will delete all existing backup versions of your files" => "Això eliminarà totes les versions de còpia de seguretat dels vostres fitxers",
 "Enable Files Versioning" => "Habilita les versions de fitxers"
 );
diff --git a/apps/files_versions/l10n/eu.php b/apps/files_versions/l10n/eu.php
index eacbdd0993..0f065c1e93 100644
--- a/apps/files_versions/l10n/eu.php
+++ b/apps/files_versions/l10n/eu.php
@@ -1,4 +1,6 @@
 <?php $TRANSLATIONS = array(
 "Expire all versions" => "Iraungi bertsio guztiak",
+"Versions" => "Bertsioak",
+"This will delete all existing backup versions of your files" => "Honek zure fitxategien bertsio guztiak ezabatuko ditu",
 "Enable Files Versioning" => "Gaitu fitxategien bertsioak"
 );
diff --git a/apps/files_versions/l10n/ja_JP.php b/apps/files_versions/l10n/ja_JP.php
index ec5e32f3e2..81d17f56f8 100644
--- a/apps/files_versions/l10n/ja_JP.php
+++ b/apps/files_versions/l10n/ja_JP.php
@@ -1,4 +1,6 @@
 <?php $TRANSLATIONS = array(
 "Expire all versions" => "すべてのバージョンを削除する",
+"Versions" => "バージョン",
+"This will delete all existing backup versions of your files" => "これは、あなたのファイルのすべてのバックアップバージョンを削除します",
 "Enable Files Versioning" => "ファイルのバージョン管理を有効にする"
 );
diff --git a/apps/files_versions/l10n/pl.php b/apps/files_versions/l10n/pl.php
index faf2d39e70..c25d37611a 100644
--- a/apps/files_versions/l10n/pl.php
+++ b/apps/files_versions/l10n/pl.php
@@ -1,4 +1,6 @@
 <?php $TRANSLATIONS = array(
 "Expire all versions" => "Wygasają wszystkie wersje",
+"Versions" => "Wersje",
+"This will delete all existing backup versions of your files" => "Spowoduje to usunięcie wszystkich istniejących wersji kopii zapasowych plików",
 "Enable Files Versioning" => "Włącz wersjonowanie plików"
 );
diff --git a/apps/user_ldap/l10n/es.php b/apps/user_ldap/l10n/es.php
index 8d9c7f9ad3..c89ceb8eee 100644
--- a/apps/user_ldap/l10n/es.php
+++ b/apps/user_ldap/l10n/es.php
@@ -7,10 +7,15 @@
 "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." => "El DN del usuario cliente con el que se hará la asociación, p.ej. uid=agente,dc=ejemplo,dc=com. Para acceso anónimo, deje DN y contraseña vacíos.",
 "Password" => "Contraseña",
 "For anonymous access, leave DN and Password empty." => "Para acceso anónimo, deje DN y contraseña vacíos.",
+"User Login Filter" => "Filtro de inicio de sesión de usuario",
+"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Define el filtro a aplicar cuando se ha realizado un login. %%uid remplazrá el nombre de usuario en el proceso de login.",
+"use %%uid placeholder, e.g. \"uid=%%uid\"" => "usar %%uid como placeholder, ej: \"uid=%%uid\"",
 "User List Filter" => "Lista de filtros de usuario",
 "Defines the filter to apply, when retrieving users." => "Define el filtro a aplicar, cuando se obtienen usuarios.",
+"without any placeholder, e.g. \"objectClass=person\"." => "Sin placeholder, ej: \"objectClass=person\".",
 "Group Filter" => "Filtro de grupo",
 "Defines the filter to apply, when retrieving groups." => "Define el filtro a aplicar, cuando se obtienen grupos.",
+"without any placeholder, e.g. \"objectClass=posixGroup\"." => "Con cualquier placeholder, ej: \"objectClass=posixGroup\".",
 "Port" => "Puerto",
 "Base User Tree" => "Árbol base de usuario",
 "Base Group Tree" => "Árbol base de grupo",
diff --git a/core/l10n/fi_FI.php b/core/l10n/fi_FI.php
index 64bb4dca63..34a69b6c64 100644
--- a/core/l10n/fi_FI.php
+++ b/core/l10n/fi_FI.php
@@ -2,6 +2,7 @@
 "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: ",
+"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" => "Asetukset",
 "January" => "Tammikuu",
 "February" => "Helmikuu",
@@ -50,6 +51,7 @@
 "Database user" => "Tietokannan käyttäjä",
 "Database password" => "Tietokannan salasana",
 "Database name" => "Tietokannan nimi",
+"Database tablespace" => "Tietokannan taulukkotila",
 "Database host" => "Tietokantapalvelin",
 "Finish setup" => "Viimeistele asennus",
 "web services under your control" => "verkkopalvelut hallinnassasi",
diff --git a/core/l10n/lb.php b/core/l10n/lb.php
index eafdcc3737..0959e0ed25 100644
--- a/core/l10n/lb.php
+++ b/core/l10n/lb.php
@@ -3,6 +3,24 @@
 "No category to add?" => "Keng Kategorie fir bäizesetzen?",
 "This category already exists: " => "Des Kategorie existéiert schonn:",
 "Settings" => "Astellungen",
+"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",
+"Cancel" => "Ofbriechen",
+"No" => "Nee",
+"Yes" => "Jo",
+"Ok" => "OK",
+"No categories selected for deletion." => "Keng Kategorien ausgewielt fir ze läschen.",
+"Error" => "Fehler",
 "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.",
@@ -25,13 +43,14 @@
 "Add" => "Bäisetzen",
 "Create an <strong>admin account</strong>" => "En <strong>Admin Account</strong> uleeën",
 "Password" => "Passwuert",
-"Advanced" => "Erweidert",
+"Advanced" => "Advanced",
 "Data folder" => "Daten Dossier",
 "Configure the database" => "Datebank konfiguréieren",
 "will be used" => "wärt benotzt ginn",
 "Database user" => "Datebank Benotzer",
 "Database password" => "Datebank Passwuert",
 "Database name" => "Datebank Numm",
+"Database tablespace" => "Datebank Tabelle-Gréisst",
 "Database host" => "Datebank Server",
 "Finish setup" => "Installatioun ofschléissen",
 "web services under your control" => "Web Servicer ënnert denger Kontroll",
diff --git a/core/l10n/pl.php b/core/l10n/pl.php
index 4eb5f1f9ae..2751b85152 100644
--- a/core/l10n/pl.php
+++ b/core/l10n/pl.php
@@ -51,6 +51,7 @@
 "Database user" => "Użytkownik bazy danych",
 "Database password" => "Hasło do bazy danych",
 "Database name" => "Nazwa bazy danych",
+"Database tablespace" => "Obszar tabel bazy danych",
 "Database host" => "Komputer bazy danych",
 "Finish setup" => "Zakończ konfigurowanie",
 "web services under your control" => "usługi internetowe pod kontrolą",
diff --git a/l10n/ca/files_versions.po b/l10n/ca/files_versions.po
index ae5ccd77e0..12b6059c7b 100644
--- a/l10n/ca/files_versions.po
+++ b/l10n/ca/files_versions.po
@@ -8,15 +8,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 13:35+0200\n"
-"PO-Revision-Date: 2012-09-01 11:35+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-04 02:01+0200\n"
+"PO-Revision-Date: 2012-09-03 10:13+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"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: js/settings-personal.js:31 templates/settings-personal.php:10
 msgid "Expire all versions"
@@ -24,11 +24,11 @@ msgstr "Expira totes les versions"
 
 #: templates/settings-personal.php:4
 msgid "Versions"
-msgstr ""
+msgstr "Versions"
 
 #: templates/settings-personal.php:7
 msgid "This will delete all existing backup versions of your files"
-msgstr ""
+msgstr "Això eliminarà totes les versions de còpia de seguretat dels vostres fitxers"
 
 #: templates/settings.php:3
 msgid "Enable Files Versioning"
diff --git a/l10n/ca/lib.po b/l10n/ca/lib.po
index 2b24de6352..e43b91310b 100644
--- a/l10n/ca/lib.po
+++ b/l10n/ca/lib.po
@@ -8,15 +8,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 02:01+0200\n"
-"PO-Revision-Date: 2012-09-01 00:02+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-04 02:01+0200\n"
+"PO-Revision-Date: 2012-09-03 10:11+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"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: app.php:288
 msgid "Help"
@@ -70,57 +70,57 @@ msgstr "Error d'autenticació"
 msgid "Token expired. Please reload page."
 msgstr "El testimoni ha expirat. Torneu a carregar la pàgina."
 
-#: template.php:86
+#: template.php:87
 msgid "seconds ago"
 msgstr "segons enrere"
 
-#: template.php:87
+#: template.php:88
 msgid "1 minute ago"
 msgstr "fa 1 minut"
 
-#: template.php:88
+#: template.php:89
 #, php-format
 msgid "%d minutes ago"
 msgstr "fa %d minuts"
 
-#: template.php:91
+#: template.php:92
 msgid "today"
 msgstr "avui"
 
-#: template.php:92
+#: template.php:93
 msgid "yesterday"
 msgstr "ahir"
 
-#: template.php:93
+#: template.php:94
 #, php-format
 msgid "%d days ago"
 msgstr "fa %d dies"
 
-#: template.php:94
+#: template.php:95
 msgid "last month"
 msgstr "el mes passat"
 
-#: template.php:95
+#: template.php:96
 msgid "months ago"
 msgstr "mesos enrere"
 
-#: template.php:96
+#: template.php:97
 msgid "last year"
 msgstr "l'any passat"
 
-#: template.php:97
+#: template.php:98
 msgid "years ago"
 msgstr "fa anys"
 
 #: updater.php:66
 #, php-format
 msgid "%s is available. Get <a href=\"%s\">more information</a>"
-msgstr ""
+msgstr "%s està disponible. Obtén <a href=\"%s\">més informació</a>"
 
 #: updater.php:68
 msgid "up to date"
-msgstr ""
+msgstr "actualitzat"
 
 #: updater.php:71
 msgid "updates check is disabled"
-msgstr ""
+msgstr "la comprovació d'actualitzacions està desactivada"
diff --git a/l10n/ca/settings.po b/l10n/ca/settings.po
index 7e9e39e072..e15a614d68 100644
--- a/l10n/ca/settings.po
+++ b/l10n/ca/settings.po
@@ -9,15 +9,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 13:35+0200\n"
-"PO-Revision-Date: 2012-09-01 11:35+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-04 02:01+0200\n"
+"PO-Revision-Date: 2012-09-03 10: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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ca\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ajax/apps/ocs.php:23
 msgid "Unable to load list from App Store"
@@ -78,7 +78,7 @@ msgid ""
 "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."
-msgstr ""
+msgstr "La carpeta de dades i els vostres fitxersprobablement són accessibles des d'Internet. La fitxer .htaccess que ownCloud proporciona no funciona. Us recomanem que configureu el servidor web de tal manera que la carpeta de dades no sigui accessible o que moveu la carpeta de dades fora de l'arrel de documents del servidor web."
 
 #: templates/admin.php:31
 msgid "Cron"
@@ -148,7 +148,7 @@ msgid ""
 "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>."
-msgstr ""
+msgstr "Desenvolupat per la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunitat ownCloud</a>, el <a href=\"https://github.com/owncloud\" target=\"_blank\">codi font</a> té llicència <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
 
 #: templates/apps.php:10
 msgid "Add your App"
diff --git a/l10n/es/settings.po b/l10n/es/settings.po
index 030414a8b3..be7300b045 100644
--- a/l10n/es/settings.po
+++ b/l10n/es/settings.po
@@ -5,7 +5,7 @@
 # Translators:
 #   <davidlopez.david@gmail.com>, 2012.
 # Javier Llorente <javier@opensuse.org>, 2012.
-#   <juanma@kde.org.ar>, 2011, 2012.
+#   <juanma@kde.org.ar>, 2011-2012.
 #   <monty_2731@hotmail.com>, 2011.
 # oSiNaReF  <>, 2012.
 #   <rodrigo.calvo@gmail.com>, 2012.
@@ -16,15 +16,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-02 02:01+0200\n"
-"PO-Revision-Date: 2012-09-01 18:24+0000\n"
-"Last-Translator: Rubén Trujillo <rubentrf@gmail.com>\n"
+"POT-Creation-Date: 2012-09-04 02:01+0200\n"
+"PO-Revision-Date: 2012-09-03 04:35+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"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ajax/apps/ocs.php:23
 msgid "Unable to load list from App Store"
@@ -85,7 +85,7 @@ msgid ""
 "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."
-msgstr ""
+msgstr "El directorio de datos -data- y sus archivos probablemente son accesibles desde internet. El archivo .htaccess que provee ownCloud no está funcionando. Recomendamos fuertemente que configure su servidor web de forma que el directorio de datos ya no sea accesible o mueva el directorio de datos fuera de la raíz de documentos del servidor web."
 
 #: templates/admin.php:31
 msgid "Cron"
diff --git a/l10n/es/user_ldap.po b/l10n/es/user_ldap.po
index e87843eac9..fdf3b2be40 100644
--- a/l10n/es/user_ldap.po
+++ b/l10n/es/user_ldap.po
@@ -4,21 +4,23 @@
 # 
 # Translators:
 # Javier Llorente <javier@opensuse.org>, 2012.
+#   <juanma@kde.org.ar>, 2012.
+# Raul Fernandez Garcia <raulfg3@gmail.com>, 2012.
 # Rubén Trujillo <rubentrf@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-09-01 02:01+0200\n"
-"PO-Revision-Date: 2012-08-31 23:04+0000\n"
-"Last-Translator: Rubén Trujillo <rubentrf@gmail.com>\n"
+"POT-Creation-Date: 2012-09-04 02:01+0200\n"
+"PO-Revision-Date: 2012-09-03 14:15+0000\n"
+"Last-Translator: Raul Fernandez Garcia <raulfg3@gmail.com>\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"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/settings.php:8
 msgid "Host"
@@ -58,19 +60,19 @@ msgstr "Para acceso anónimo, deje DN y contraseña vacíos."
 
 #: templates/settings.php:12
 msgid "User Login Filter"
-msgstr ""
+msgstr "Filtro de inicio de sesión de usuario"
 
 #: 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 el filtro a aplicar cuando se ha realizado un login. %%uid remplazrá el nombre de usuario en el proceso de login."
 
 #: templates/settings.php:12
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr ""
+msgstr "usar %%uid como placeholder, ej: \"uid=%%uid\""
 
 #: templates/settings.php:13
 msgid "User List Filter"
@@ -82,7 +84,7 @@ msgstr "Define el filtro a aplicar, cuando se obtienen usuarios."
 
 #: templates/settings.php:13
 msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr ""
+msgstr "Sin placeholder, ej: \"objectClass=person\"."
 
 #: templates/settings.php:14
 msgid "Group Filter"
@@ -94,7 +96,7 @@ msgstr "Define el filtro a aplicar, cuando se obtienen grupos."
 
 #: templates/settings.php:14
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr ""
+msgstr "Con cualquier placeholder, ej: \"objectClass=posixGroup\"."
 
 #: templates/settings.php:17
 msgid "Port"
diff --git a/l10n/eu/files_sharing.po b/l10n/eu/files_sharing.po
index a519a3b4f4..162fca4372 100644
--- a/l10n/eu/files_sharing.po
+++ b/l10n/eu/files_sharing.po
@@ -8,15 +8,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-04 02:01+0200\n"
+"PO-Revision-Date: 2012-09-03 13:00+0000\n"
+"Last-Translator: asieriko <asieriko@gmail.com>\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"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/authenticate.php:4
 msgid "Password"
@@ -32,8 +32,8 @@ msgstr "Deskargatu"
 
 #: templates/public.php:18
 msgid "No preview available for"
-msgstr ""
+msgstr "Ez dago aurrebista eskuragarririk hauentzat "
 
-#: templates/public.php:23
+#: templates/public.php:25
 msgid "web services under your control"
 msgstr "web zerbitzuak zure kontrolpean"
diff --git a/l10n/eu/files_versions.po b/l10n/eu/files_versions.po
index 357b26164d..0f7610079c 100644
--- a/l10n/eu/files_versions.po
+++ b/l10n/eu/files_versions.po
@@ -8,15 +8,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 13:35+0200\n"
-"PO-Revision-Date: 2012-09-01 11:35+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-04 02:01+0200\n"
+"PO-Revision-Date: 2012-09-03 12:58+0000\n"
+"Last-Translator: asieriko <asieriko@gmail.com>\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"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: js/settings-personal.js:31 templates/settings-personal.php:10
 msgid "Expire all versions"
@@ -24,11 +24,11 @@ msgstr "Iraungi bertsio guztiak"
 
 #: templates/settings-personal.php:4
 msgid "Versions"
-msgstr ""
+msgstr "Bertsioak"
 
 #: templates/settings-personal.php:7
 msgid "This will delete all existing backup versions of your files"
-msgstr ""
+msgstr "Honek zure fitxategien bertsio guztiak ezabatuko ditu"
 
 #: templates/settings.php:3
 msgid "Enable Files Versioning"
diff --git a/l10n/eu/lib.po b/l10n/eu/lib.po
index c083e4f865..1fd4db54aa 100644
--- a/l10n/eu/lib.po
+++ b/l10n/eu/lib.po
@@ -8,15 +8,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 02:01+0200\n"
-"PO-Revision-Date: 2012-09-01 00:02+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-04 02:01+0200\n"
+"PO-Revision-Date: 2012-09-03 13:06+0000\n"
+"Last-Translator: asieriko <asieriko@gmail.com>\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"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: app.php:288
 msgid "Help"
@@ -70,57 +70,57 @@ msgstr "Autentikazio errorea"
 msgid "Token expired. Please reload page."
 msgstr "Tokena iraungitu da. Mesedez birkargatu orria."
 
-#: template.php:86
+#: template.php:87
 msgid "seconds ago"
 msgstr "orain dela segundu batzuk"
 
-#: template.php:87
+#: template.php:88
 msgid "1 minute ago"
 msgstr "orain dela minutu 1"
 
-#: template.php:88
+#: template.php:89
 #, php-format
 msgid "%d minutes ago"
 msgstr "orain dela %d minutu"
 
-#: template.php:91
+#: template.php:92
 msgid "today"
 msgstr "gaur"
 
-#: template.php:92
+#: template.php:93
 msgid "yesterday"
 msgstr "atzo"
 
-#: template.php:93
+#: template.php:94
 #, php-format
 msgid "%d days ago"
 msgstr "orain dela %d egun"
 
-#: template.php:94
+#: template.php:95
 msgid "last month"
 msgstr "joan den hilabetea"
 
-#: template.php:95
+#: template.php:96
 msgid "months ago"
 msgstr "orain dela hilabete batzuk"
 
-#: template.php:96
+#: template.php:97
 msgid "last year"
 msgstr "joan den urtea"
 
-#: template.php:97
+#: template.php:98
 msgid "years ago"
 msgstr "orain dela urte batzuk"
 
 #: updater.php:66
 #, php-format
 msgid "%s is available. Get <a href=\"%s\">more information</a>"
-msgstr ""
+msgstr "%s eskuragarri dago. Lortu <a href=\"%s\">informazio gehiago</a>"
 
 #: updater.php:68
 msgid "up to date"
-msgstr ""
+msgstr "eguneratuta"
 
 #: updater.php:71
 msgid "updates check is disabled"
-msgstr ""
+msgstr "eguneraketen egiaztapena ez dago gaituta"
diff --git a/l10n/eu/settings.po b/l10n/eu/settings.po
index f069773c1d..b22e432ec7 100644
--- a/l10n/eu/settings.po
+++ b/l10n/eu/settings.po
@@ -10,15 +10,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 13:35+0200\n"
-"PO-Revision-Date: 2012-09-01 11:35+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-04 02:01+0200\n"
+"PO-Revision-Date: 2012-09-03 13:05+0000\n"
+"Last-Translator: asieriko <asieriko@gmail.com>\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"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ajax/apps/ocs.php:23
 msgid "Unable to load list from App Store"
@@ -79,7 +79,7 @@ msgid ""
 "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."
-msgstr ""
+msgstr "Zure data karpeta eta zure fitxategiak internetetik zuzenean eskuragarri egon daitezke. ownCloudek emandako .htaccess fitxategia ez du bere lana egiten. Aholkatzen dizugu zure web zerbitzaria ongi konfiguratzea data karpeta eskuragarri ez izateko edo data karpeta web zerbitzariaren dokumentu errotik mugitzea."
 
 #: templates/admin.php:31
 msgid "Cron"
@@ -99,39 +99,39 @@ msgstr "erabili sistemaren cron zerbitzua"
 
 #: templates/admin.php:41
 msgid "Share API"
-msgstr ""
+msgstr "Partekatze APIa"
 
 #: templates/admin.php:46
 msgid "Enable Share API"
-msgstr ""
+msgstr "Gaitu Partekatze APIa"
 
 #: templates/admin.php:47
 msgid "Allow apps to use the Share API"
-msgstr ""
+msgstr "Baimendu aplikazioak Partekatze APIa erabiltzeko"
 
 #: templates/admin.php:51
 msgid "Allow links"
-msgstr ""
+msgstr "Baimendu loturak"
 
 #: templates/admin.php:52
 msgid "Allow users to share items to the public with links"
-msgstr ""
+msgstr "Baimendu erabiltzaileak loturen bidez fitxategiak publikoki partekatzen"
 
 #: templates/admin.php:56
 msgid "Allow resharing"
-msgstr ""
+msgstr "Baimendu birpartekatzea"
 
 #: templates/admin.php:57
 msgid "Allow users to share items shared with them again"
-msgstr ""
+msgstr "Baimendu erabiltzaileak haiekin partekatutako fitxategiak berriz ere partekatzen"
 
 #: templates/admin.php:60
 msgid "Allow users to share with anyone"
-msgstr ""
+msgstr "Baimendu erabiltzaileak edonorekin partekatzen"
 
 #: templates/admin.php:62
 msgid "Allow users to only share with users in their groups"
-msgstr ""
+msgstr "Baimendu erabiltzaileak bakarrik bere taldeko erabiltzaileekin partekatzen"
 
 #: templates/admin.php:69
 msgid "Log"
@@ -149,7 +149,7 @@ msgid ""
 "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>."
-msgstr ""
+msgstr "<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud komunitateak</a> garatuta, <a href=\"https://github.com/owncloud\" target=\"_blank\">itubruru kodea</a><a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr> lizentziarekin banatzen da</a>."
 
 #: templates/apps.php:10
 msgid "Add your App"
diff --git a/l10n/fi_FI/core.po b/l10n/fi_FI/core.po
index 6ad322c5cc..7506e66bc4 100644
--- a/l10n/fi_FI/core.po
+++ b/l10n/fi_FI/core.po
@@ -7,20 +7,21 @@
 # Jiri Grönroos <jiri.gronroos@iki.fi>, 2012.
 # Johannes Korpela <>, 2012.
 # Pekka Sutela <pekka.sutela@gmail.com>, 2012.
+#   <tehoratopato@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-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-04 02:01+0200\n"
+"PO-Revision-Date: 2012-09-03 16:24+0000\n"
+"Last-Translator: teho <tehoratopato@gmail.com>\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"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ajax/vcategories/add.php:23 ajax/vcategories/delete.php:23
 msgid "Application name not provided."
@@ -36,7 +37,7 @@ 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 ""
+msgstr "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 
 #: js/js.js:206 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
@@ -234,7 +235,7 @@ msgstr "Tietokannan nimi"
 
 #: templates/installation.php:109
 msgid "Database tablespace"
-msgstr ""
+msgstr "Tietokannan taulukkotila"
 
 #: templates/installation.php:115
 msgid "Database host"
diff --git a/l10n/fi_FI/files.po b/l10n/fi_FI/files.po
index d9cca99c90..4bac70c1c2 100644
--- a/l10n/fi_FI/files.po
+++ b/l10n/fi_FI/files.po
@@ -6,20 +6,21 @@
 # Jesse Jaara <jesse.jaara@gmail.com>, 2012.
 # Jiri Grönroos <jiri.gronroos@iki.fi>, 2012.
 # Johannes Korpela <>, 2012.
+#   <tehoratopato@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-09-01 13:35+0200\n"
-"PO-Revision-Date: 2012-09-01 10:00+0000\n"
-"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
+"POT-Creation-Date: 2012-09-04 02:01+0200\n"
+"PO-Revision-Date: 2012-09-03 16:25+0000\n"
+"Last-Translator: teho <tehoratopato@gmail.com>\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"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ajax/upload.php:20
 msgid "There is no error, the file uploaded with success"
@@ -224,4 +225,4 @@ msgstr "Tiedostoja tarkistetaan, odota hetki."
 
 #: templates/index.php:74
 msgid "Current scanning"
-msgstr ""
+msgstr "Tämänhetkinen tutkinta"
diff --git a/l10n/fi_FI/files_sharing.po b/l10n/fi_FI/files_sharing.po
index 252458e4cb..f55a452032 100644
--- a/l10n/fi_FI/files_sharing.po
+++ b/l10n/fi_FI/files_sharing.po
@@ -4,19 +4,20 @@
 # 
 # Translators:
 # Jiri Grönroos <jiri.gronroos@iki.fi>, 2012.
+#   <tehoratopato@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-04 02:01+0200\n"
+"PO-Revision-Date: 2012-09-03 15:46+0000\n"
+"Last-Translator: teho <tehoratopato@gmail.com>\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"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/authenticate.php:4
 msgid "Password"
@@ -32,8 +33,8 @@ msgstr "Lataa"
 
 #: templates/public.php:18
 msgid "No preview available for"
-msgstr ""
+msgstr "Ei esikatselua kohteelle"
 
-#: templates/public.php:23
+#: templates/public.php:25
 msgid "web services under your control"
 msgstr "verkkopalvelut hallinnassasi"
diff --git a/l10n/fi_FI/settings.po b/l10n/fi_FI/settings.po
index b2d28143e9..528da08db5 100644
--- a/l10n/fi_FI/settings.po
+++ b/l10n/fi_FI/settings.po
@@ -5,23 +5,24 @@
 # Translators:
 # Jesse Jaara <jesse.jaara@gmail.com>, 2012.
 # Jiri Grönroos <jiri.gronroos@iki.fi>, 2012.
+#   <tehoratopato@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-03 02:05+0200\n"
-"PO-Revision-Date: 2012-09-02 15:47+0000\n"
-"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
+"POT-Creation-Date: 2012-09-04 02:01+0200\n"
+"PO-Revision-Date: 2012-09-03 16:42+0000\n"
+"Last-Translator: teho <tehoratopato@gmail.com>\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"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ajax/apps/ocs.php:23
 msgid "Unable to load list from App Store"
-msgstr ""
+msgstr "Ei pystytä lataamaan listaa sovellusvarastosta (App Store)"
 
 #: ajax/lostpassword.php:14
 msgid "Email saved"
@@ -78,7 +79,7 @@ msgid ""
 "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."
-msgstr ""
+msgstr "Data-kansio ja tiedostot ovat ehkä saavutettavissa Internetistä. .htaccess-tiedosto, jolla kontrolloidaan pääsyä, ei toimi. Suosittelemme, että muutat web-palvelimesi asetukset niin ettei data-kansio ole enää pääsyä tai siirrät data-kansion pois web-palvelimen tiedostojen juuresta."
 
 #: templates/admin.php:31
 msgid "Cron"
@@ -86,11 +87,11 @@ msgstr "Cron"
 
 #: templates/admin.php:33
 msgid "execute one task with each page loaded"
-msgstr ""
+msgstr "suorita yksi tehtävä jokaisella ladatulla sivulla"
 
 #: templates/admin.php:35
 msgid "cron.php is registered at a webcron service"
-msgstr ""
+msgstr "cron.php on rekisteröity webcron-palvelulla"
 
 #: templates/admin.php:37
 msgid "use systems cron service"
@@ -98,15 +99,15 @@ msgstr "käytä järjestelmän cron-palvelua"
 
 #: templates/admin.php:41
 msgid "Share API"
-msgstr ""
+msgstr "Jaon ohelmointirajapinta (Share API)"
 
 #: templates/admin.php:46
 msgid "Enable Share API"
-msgstr ""
+msgstr "Ota käyttöön jaon ohjelmoitirajapinta (Share API)"
 
 #: templates/admin.php:47
 msgid "Allow apps to use the Share API"
-msgstr ""
+msgstr "Salli sovellusten käyttää jaon ohjelmointirajapintaa (Share API)"
 
 #: templates/admin.php:51
 msgid "Allow links"
@@ -122,7 +123,7 @@ msgstr "Salli uudelleenjako"
 
 #: templates/admin.php:57
 msgid "Allow users to share items shared with them again"
-msgstr ""
+msgstr "Salli käyttäjien jakaa heille itselleen jaettuja tietoja edelleen"
 
 #: templates/admin.php:60
 msgid "Allow users to share with anyone"
@@ -284,7 +285,7 @@ msgstr "Muu"
 
 #: templates/users.php:80 templates/users.php:112
 msgid "Group Admin"
-msgstr ""
+msgstr "Ryhmän ylläpitäjä"
 
 #: templates/users.php:82
 msgid "Quota"
diff --git a/l10n/ja_JP/files_versions.po b/l10n/ja_JP/files_versions.po
index bed89934fb..a2dc028900 100644
--- a/l10n/ja_JP/files_versions.po
+++ b/l10n/ja_JP/files_versions.po
@@ -8,15 +8,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 13:35+0200\n"
-"PO-Revision-Date: 2012-09-01 11:35+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-04 02:01+0200\n"
+"PO-Revision-Date: 2012-09-03 15:56+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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ja_JP\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: js/settings-personal.js:31 templates/settings-personal.php:10
 msgid "Expire all versions"
@@ -24,11 +24,11 @@ msgstr "すべてのバージョンを削除する"
 
 #: templates/settings-personal.php:4
 msgid "Versions"
-msgstr ""
+msgstr "バージョン"
 
 #: templates/settings-personal.php:7
 msgid "This will delete all existing backup versions of your files"
-msgstr ""
+msgstr "これは、あなたのファイルのすべてのバックアップバージョンを削除します"
 
 #: templates/settings.php:3
 msgid "Enable Files Versioning"
diff --git a/l10n/ja_JP/lib.po b/l10n/ja_JP/lib.po
index a2197a2994..d9b410fa88 100644
--- a/l10n/ja_JP/lib.po
+++ b/l10n/ja_JP/lib.po
@@ -8,15 +8,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 02:01+0200\n"
-"PO-Revision-Date: 2012-09-01 00:02+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-04 02:01+0200\n"
+"PO-Revision-Date: 2012-09-03 15:55+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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ja_JP\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: app.php:288
 msgid "Help"
@@ -70,57 +70,57 @@ msgstr "認証エラー"
 msgid "Token expired. Please reload page."
 msgstr "トークンが無効になりました。ページを再読込してください。"
 
-#: template.php:86
+#: template.php:87
 msgid "seconds ago"
 msgstr "秒前"
 
-#: template.php:87
+#: template.php:88
 msgid "1 minute ago"
 msgstr "1分前"
 
-#: template.php:88
+#: template.php:89
 #, php-format
 msgid "%d minutes ago"
 msgstr "%d 分前"
 
-#: template.php:91
+#: template.php:92
 msgid "today"
 msgstr "今日"
 
-#: template.php:92
+#: template.php:93
 msgid "yesterday"
 msgstr "昨日"
 
-#: template.php:93
+#: template.php:94
 #, php-format
 msgid "%d days ago"
 msgstr "%d 日前"
 
-#: template.php:94
+#: template.php:95
 msgid "last month"
 msgstr "先月"
 
-#: template.php:95
+#: template.php:96
 msgid "months ago"
 msgstr "月前"
 
-#: template.php:96
+#: template.php:97
 msgid "last year"
 msgstr "昨年"
 
-#: template.php:97
+#: template.php:98
 msgid "years ago"
 msgstr "年前"
 
 #: updater.php:66
 #, php-format
 msgid "%s is available. Get <a href=\"%s\">more information</a>"
-msgstr ""
+msgstr "%s が利用可能です。<a href=\"%s\">詳細情報</a> を確認ください"
 
 #: updater.php:68
 msgid "up to date"
-msgstr ""
+msgstr "最新です"
 
 #: updater.php:71
 msgid "updates check is disabled"
-msgstr ""
+msgstr "更新チェックは無効です"
diff --git a/l10n/lb/core.po b/l10n/lb/core.po
index fbc1cddc1c..a9de075246 100644
--- a/l10n/lb/core.po
+++ b/l10n/lb/core.po
@@ -3,20 +3,20 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <sim0n@trypill.org>, 2011, 2012.
+#   <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-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-04 02:01+0200\n"
+"PO-Revision-Date: 2012-09-03 21:47+0000\n"
+"Last-Translator: sim0n <sim0n@trypill.org>\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"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ajax/vcategories/add.php:23 ajax/vcategories/delete.php:23
 msgid "Application name not provided."
@@ -40,75 +40,75 @@ msgstr "Astellungen"
 
 #: js/js.js:591
 msgid "January"
-msgstr ""
+msgstr "Januar"
 
 #: js/js.js:591
 msgid "February"
-msgstr ""
+msgstr "Februar"
 
 #: js/js.js:591
 msgid "March"
-msgstr ""
+msgstr "Mäerz"
 
 #: js/js.js:591
 msgid "April"
-msgstr ""
+msgstr "Abrëll"
 
 #: js/js.js:591
 msgid "May"
-msgstr ""
+msgstr "Mee"
 
 #: js/js.js:591
 msgid "June"
-msgstr ""
+msgstr "Juni"
 
 #: js/js.js:592
 msgid "July"
-msgstr ""
+msgstr "Juli"
 
 #: js/js.js:592
 msgid "August"
-msgstr ""
+msgstr "August"
 
 #: js/js.js:592
 msgid "September"
-msgstr ""
+msgstr "September"
 
 #: js/js.js:592
 msgid "October"
-msgstr ""
+msgstr "Oktober"
 
 #: js/js.js:592
 msgid "November"
-msgstr ""
+msgstr "November"
 
 #: js/js.js:592
 msgid "December"
-msgstr ""
+msgstr "Dezember"
 
 #: js/oc-dialogs.js:143 js/oc-dialogs.js:163
 msgid "Cancel"
-msgstr ""
+msgstr "Ofbriechen"
 
 #: js/oc-dialogs.js:159
 msgid "No"
-msgstr ""
+msgstr "Nee"
 
 #: js/oc-dialogs.js:160
 msgid "Yes"
-msgstr ""
+msgstr "Jo"
 
 #: js/oc-dialogs.js:177
 msgid "Ok"
-msgstr ""
+msgstr "OK"
 
 #: js/oc-vcategories.js:68
 msgid "No categories selected for deletion."
-msgstr ""
+msgstr "Keng Kategorien ausgewielt fir ze läschen."
 
 #: js/oc-vcategories.js:68
 msgid "Error"
-msgstr ""
+msgstr "Fehler"
 
 #: lostpassword/index.php:26
 msgid "ownCloud password reset"
@@ -201,7 +201,7 @@ msgstr "Passwuert"
 
 #: templates/installation.php:36
 msgid "Advanced"
-msgstr "Erweidert"
+msgstr "Advanced"
 
 #: templates/installation.php:38
 msgid "Data folder"
@@ -230,7 +230,7 @@ msgstr "Datebank Numm"
 
 #: templates/installation.php:109
 msgid "Database tablespace"
-msgstr ""
+msgstr "Datebank Tabelle-Gréisst"
 
 #: templates/installation.php:115
 msgid "Database host"
diff --git a/l10n/lb/files.po b/l10n/lb/files.po
index ae57349ec9..45773897b6 100644
--- a/l10n/lb/files.po
+++ b/l10n/lb/files.po
@@ -3,20 +3,20 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <sim0n@trypill.org>, 2011, 2012.
+#   <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-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-04 02:01+0200\n"
+"PO-Revision-Date: 2012-09-03 21:52+0000\n"
+"Last-Translator: sim0n <sim0n@trypill.org>\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"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ajax/upload.php:20
 msgid "There is no error, the file uploaded with success"
@@ -58,43 +58,43 @@ msgstr "Läschen"
 
 #: js/filelist.js:141
 msgid "already exists"
-msgstr ""
+msgstr "existéiert schonn"
 
 #: js/filelist.js:141
 msgid "replace"
-msgstr ""
+msgstr "ersetzen"
 
 #: js/filelist.js:141
 msgid "cancel"
-msgstr ""
+msgstr "ofbriechen"
 
 #: js/filelist.js:195
 msgid "replaced"
-msgstr ""
+msgstr "ersat"
 
 #: js/filelist.js:195
 msgid "with"
-msgstr ""
+msgstr "mat"
 
 #: js/filelist.js:195 js/filelist.js:246
 msgid "undo"
-msgstr ""
+msgstr "réckgängeg man"
 
 #: js/filelist.js:246
 msgid "deleted"
-msgstr ""
+msgstr "geläscht"
 
 #: js/files.js:179
 msgid "generating ZIP-file, it may take some time."
-msgstr ""
+msgstr "Et  gëtt eng ZIP-File generéiert, dëst ka bëssen daueren."
 
 #: js/files.js:208
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr ""
+msgstr "Kann deng Datei net eroplueden well et en Dossier ass oder 0 byte grouss ass."
 
 #: js/files.js:208
 msgid "Upload Error"
-msgstr ""
+msgstr "Fehler beim eroplueden"
 
 #: js/files.js:236 js/files.js:327 js/files.js:356
 msgid "Pending"
@@ -102,16 +102,16 @@ msgstr ""
 
 #: js/files.js:341
 msgid "Upload cancelled."
-msgstr ""
+msgstr "Upload ofgebrach."
 
 #: js/files.js:409
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
-msgstr ""
+msgstr "File Upload am gaang. Wann's de des Säit verléiss gëtt den Upload ofgebrach."
 
 #: js/files.js:480
 msgid "Invalid name, '/' is not allowed."
-msgstr ""
+msgstr "Ongültege Numm, '/' net erlaabt."
 
 #: js/files.js:726 templates/index.php:55
 msgid "Size"
@@ -123,19 +123,19 @@ msgstr "Geännert"
 
 #: js/files.js:754
 msgid "folder"
-msgstr ""
+msgstr "Dossier"
 
 #: js/files.js:756
 msgid "folders"
-msgstr ""
+msgstr "Dossieren"
 
 #: js/files.js:764
 msgid "file"
-msgstr ""
+msgstr "Datei"
 
 #: js/files.js:766
 msgid "files"
-msgstr ""
+msgstr "Dateien"
 
 #: templates/admin.php:5
 msgid "File handling"
diff --git a/l10n/lb/settings.po b/l10n/lb/settings.po
index 46b0f23beb..ce3cde89a0 100644
--- a/l10n/lb/settings.po
+++ b/l10n/lb/settings.po
@@ -3,32 +3,32 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-#   <sim0n@trypill.org>, 2011, 2012.
+#   <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-09-01 13:35+0200\n"
-"PO-Revision-Date: 2012-09-01 11:35+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-04 02:01+0200\n"
+"PO-Revision-Date: 2012-09-03 21:57+0000\n"
+"Last-Translator: sim0n <sim0n@trypill.org>\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"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ajax/apps/ocs.php:23
 msgid "Unable to load list from App Store"
-msgstr ""
+msgstr "Konnt Lescht net vum App Store lueden"
 
 #: ajax/lostpassword.php:14
 msgid "Email saved"
-msgstr ""
+msgstr "E-mail gespäichert"
 
 #: ajax/lostpassword.php:16
 msgid "Invalid email"
-msgstr ""
+msgstr "Ongülteg e-mail"
 
 #: ajax/openid.php:16
 msgid "OpenID Changed"
@@ -40,7 +40,7 @@ msgstr "Ongülteg Requête"
 
 #: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
 msgid "Authentication error"
-msgstr ""
+msgstr "Authentifikatioun's Fehler"
 
 #: ajax/setlanguage.php:18
 msgid "Language changed"
@@ -48,19 +48,19 @@ msgstr "Sprooch huet geännert"
 
 #: js/apps.js:18
 msgid "Error"
-msgstr ""
+msgstr "Fehler"
 
 #: js/apps.js:39 js/apps.js:73
 msgid "Disable"
-msgstr ""
+msgstr "Ofschalten"
 
 #: js/apps.js:39 js/apps.js:62
 msgid "Enable"
-msgstr ""
+msgstr "Aschalten"
 
 #: js/personal.js:69
 msgid "Saving..."
-msgstr ""
+msgstr "Speicheren..."
 
 #: personal.php:46 personal.php:47
 msgid "__language_name__"
@@ -68,7 +68,7 @@ msgstr "__language_name__"
 
 #: templates/admin.php:14
 msgid "Security Warning"
-msgstr ""
+msgstr "Sécherheets Warnung"
 
 #: templates/admin.php:17
 msgid ""
@@ -81,7 +81,7 @@ msgstr ""
 
 #: templates/admin.php:31
 msgid "Cron"
-msgstr ""
+msgstr "Cron"
 
 #: templates/admin.php:33
 msgid "execute one task with each page loaded"
@@ -89,27 +89,27 @@ msgstr ""
 
 #: templates/admin.php:35
 msgid "cron.php is registered at a webcron service"
-msgstr ""
+msgstr "cron.php ass als en webcron Service registréiert"
 
 #: templates/admin.php:37
 msgid "use systems cron service"
-msgstr ""
+msgstr "benotz den systems cron Service"
 
 #: templates/admin.php:41
 msgid "Share API"
-msgstr ""
+msgstr "Share API"
 
 #: templates/admin.php:46
 msgid "Enable Share API"
-msgstr ""
+msgstr "Share API aschalten"
 
 #: templates/admin.php:47
 msgid "Allow apps to use the Share API"
-msgstr ""
+msgstr "Erlab Apps d'Share API ze benotzen"
 
 #: templates/admin.php:51
 msgid "Allow links"
-msgstr ""
+msgstr "Links erlaben"
 
 #: templates/admin.php:52
 msgid "Allow users to share items to the public with links"
@@ -117,7 +117,7 @@ msgstr ""
 
 #: templates/admin.php:56
 msgid "Allow resharing"
-msgstr ""
+msgstr "Resharing erlaben"
 
 #: templates/admin.php:57
 msgid "Allow users to share items shared with them again"
@@ -125,11 +125,11 @@ msgstr ""
 
 #: templates/admin.php:60
 msgid "Allow users to share with anyone"
-msgstr ""
+msgstr "Useren erlaben mat egal wiem ze sharen"
 
 #: templates/admin.php:62
 msgid "Allow users to only share with users in their groups"
-msgstr ""
+msgstr "Useren nëmmen erlaben mat Useren aus hirer Grupp ze sharen"
 
 #: templates/admin.php:69
 msgid "Log"
@@ -159,7 +159,7 @@ msgstr "Wiel eng Applikatioun aus"
 
 #: templates/apps.php:29
 msgid "See application page at apps.owncloud.com"
-msgstr ""
+msgstr "Kuck dir d'Applicatioun's Säit op apps.owncloud.com un"
 
 #: templates/apps.php:30
 msgid "-licensed"
@@ -283,7 +283,7 @@ msgstr "Aner"
 
 #: templates/users.php:80 templates/users.php:112
 msgid "Group Admin"
-msgstr ""
+msgstr "Gruppen Admin"
 
 #: templates/users.php:82
 msgid "Quota"
diff --git a/l10n/pl/core.po b/l10n/pl/core.po
index 39c80a75e6..3889b13622 100644
--- a/l10n/pl/core.po
+++ b/l10n/pl/core.po
@@ -13,15 +13,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:02+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-04 02:01+0200\n"
+"PO-Revision-Date: 2012-09-03 06:40+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"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: ajax/vcategories/add.php:23 ajax/vcategories/delete.php:23
 msgid "Application name not provided."
@@ -235,7 +235,7 @@ msgstr "Nazwa bazy danych"
 
 #: templates/installation.php:109
 msgid "Database tablespace"
-msgstr ""
+msgstr "Obszar tabel bazy danych"
 
 #: templates/installation.php:115
 msgid "Database host"
diff --git a/l10n/pl/files.po b/l10n/pl/files.po
index 652fd35016..02f24afbe7 100644
--- a/l10n/pl/files.po
+++ b/l10n/pl/files.po
@@ -11,15 +11,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-04 02:01+0200\n"
+"PO-Revision-Date: 2012-09-03 06:33+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"
+"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:20
 msgid "There is no error, the file uploaded with success"
@@ -110,7 +110,7 @@ msgstr "Wczytywanie anulowane."
 #: js/files.js:409
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
-msgstr ""
+msgstr "Wysyłanie pliku jest w toku. Teraz opuszczając stronę wysyłanie zostanie anulowane."
 
 #: js/files.js:480
 msgid "Invalid name, '/' is not allowed."
diff --git a/l10n/pl/files_sharing.po b/l10n/pl/files_sharing.po
index 0cb14cf441..fee8ef8b65 100644
--- a/l10n/pl/files_sharing.po
+++ b/l10n/pl/files_sharing.po
@@ -9,15 +9,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-04 02:01+0200\n"
+"PO-Revision-Date: 2012-09-03 07:03+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"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: templates/authenticate.php:4
 msgid "Password"
@@ -33,8 +33,8 @@ msgstr "Pobierz"
 
 #: templates/public.php:18
 msgid "No preview available for"
-msgstr ""
+msgstr "Podgląd nie jest dostępny dla"
 
-#: templates/public.php:23
+#: templates/public.php:25
 msgid "web services under your control"
 msgstr "Kontrolowane serwisy"
diff --git a/l10n/pl/files_versions.po b/l10n/pl/files_versions.po
index 9db71f8d1a..ea579c0b6a 100644
--- a/l10n/pl/files_versions.po
+++ b/l10n/pl/files_versions.po
@@ -8,15 +8,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 13:35+0200\n"
-"PO-Revision-Date: 2012-09-01 11:35+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-04 02:01+0200\n"
+"PO-Revision-Date: 2012-09-03 06:57+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"
+"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 templates/settings-personal.php:10
 msgid "Expire all versions"
@@ -24,11 +24,11 @@ msgstr "Wygasają wszystkie wersje"
 
 #: templates/settings-personal.php:4
 msgid "Versions"
-msgstr ""
+msgstr "Wersje"
 
 #: templates/settings-personal.php:7
 msgid "This will delete all existing backup versions of your files"
-msgstr ""
+msgstr "Spowoduje to usunięcie wszystkich istniejących wersji kopii zapasowych plików"
 
 #: templates/settings.php:3
 msgid "Enable Files Versioning"
diff --git a/l10n/pl/lib.po b/l10n/pl/lib.po
index cea78bc05f..09263ad142 100644
--- a/l10n/pl/lib.po
+++ b/l10n/pl/lib.po
@@ -8,15 +8,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 02:01+0200\n"
-"PO-Revision-Date: 2012-09-01 00:02+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-04 02:01+0200\n"
+"PO-Revision-Date: 2012-09-03 07:02+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"
+"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:288
 msgid "Help"
@@ -70,57 +70,57 @@ msgstr "Błąd uwierzytelniania"
 msgid "Token expired. Please reload page."
 msgstr "Token wygasł. Proszę ponownie załadować stronę."
 
-#: template.php:86
+#: template.php:87
 msgid "seconds ago"
 msgstr "sekund temu"
 
-#: template.php:87
+#: template.php:88
 msgid "1 minute ago"
 msgstr "1 minutę temu"
 
-#: template.php:88
+#: template.php:89
 #, php-format
 msgid "%d minutes ago"
 msgstr "%d minut temu"
 
-#: template.php:91
+#: template.php:92
 msgid "today"
 msgstr "dzisiaj"
 
-#: template.php:92
+#: template.php:93
 msgid "yesterday"
 msgstr "wczoraj"
 
-#: template.php:93
+#: template.php:94
 #, php-format
 msgid "%d days ago"
 msgstr "%d dni temu"
 
-#: template.php:94
+#: template.php:95
 msgid "last month"
 msgstr "ostatni miesiąc"
 
-#: template.php:95
+#: template.php:96
 msgid "months ago"
 msgstr "miesięcy temu"
 
-#: template.php:96
+#: template.php:97
 msgid "last year"
 msgstr "ostatni rok"
 
-#: template.php:97
+#: template.php:98
 msgid "years ago"
 msgstr "lat temu"
 
 #: updater.php:66
 #, php-format
 msgid "%s is available. Get <a href=\"%s\">more information</a>"
-msgstr ""
+msgstr "%s jest dostępna. Uzyskaj <a href=\"%s\">więcej informacji</a>"
 
 #: updater.php:68
 msgid "up to date"
-msgstr ""
+msgstr "Aktualne"
 
 #: updater.php:71
 msgid "updates check is disabled"
-msgstr ""
+msgstr "wybór aktualizacji jest wyłączony"
diff --git a/l10n/pl/settings.po b/l10n/pl/settings.po
index 8afec9db2a..3eb675060a 100644
--- a/l10n/pl/settings.po
+++ b/l10n/pl/settings.po
@@ -14,15 +14,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 13:35+0200\n"
-"PO-Revision-Date: 2012-09-01 11:35+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-04 02:01+0200\n"
+"PO-Revision-Date: 2012-09-03 07:00+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"
+"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"
@@ -103,19 +103,19 @@ msgstr "korzystaj z usługi systemowej cron"
 
 #: templates/admin.php:41
 msgid "Share API"
-msgstr ""
+msgstr "Udostępnij API"
 
 #: templates/admin.php:46
 msgid "Enable Share API"
-msgstr ""
+msgstr "Włącz udostępniane API"
 
 #: templates/admin.php:47
 msgid "Allow apps to use the Share API"
-msgstr ""
+msgstr "Zezwalaj aplikacjom na używanie API"
 
 #: templates/admin.php:51
 msgid "Allow links"
-msgstr ""
+msgstr "Zezwalaj na łącza"
 
 #: templates/admin.php:52
 msgid "Allow users to share items to the public with links"
@@ -123,7 +123,7 @@ msgstr ""
 
 #: templates/admin.php:56
 msgid "Allow resharing"
-msgstr ""
+msgstr "Zezwól na ponowne udostępnianie"
 
 #: templates/admin.php:57
 msgid "Allow users to share items shared with them again"
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index 2ab352a0a8..136685c098 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-09-03 02:04+0200\n"
+"POT-Creation-Date: 2012-09-04 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 66d9dbcd1b..2c15a9049b 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-09-03 02:04+0200\n"
+"POT-Creation-Date: 2012-09-04 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 5b047fcf46..7346533735 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-09-03 02:04+0200\n"
+"POT-Creation-Date: 2012-09-04 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 3f295496fd..a4d2244600 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-09-03 02:04+0200\n"
+"POT-Creation-Date: 2012-09-04 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 d386ad1e35..cffd3fd505 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-09-03 02:04+0200\n"
+"POT-Creation-Date: 2012-09-04 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"
@@ -33,6 +33,6 @@ msgstr ""
 msgid "No preview available for"
 msgstr ""
 
-#: templates/public.php:23
+#: templates/public.php:25
 msgid "web services under your control"
 msgstr ""
diff --git a/l10n/templates/files_versions.pot b/l10n/templates/files_versions.pot
index 72af58b8b5..88f3182b3e 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-09-03 02:04+0200\n"
+"POT-Creation-Date: 2012-09-04 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 3c27e4b0f8..82b69d86b8 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-09-03 02:04+0200\n"
+"POT-Creation-Date: 2012-09-04 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"
@@ -69,45 +69,45 @@ msgstr ""
 msgid "Token expired. Please reload page."
 msgstr ""
 
-#: template.php:86
+#: template.php:87
 msgid "seconds ago"
 msgstr ""
 
-#: template.php:87
+#: template.php:88
 msgid "1 minute ago"
 msgstr ""
 
-#: template.php:88
+#: template.php:89
 #, php-format
 msgid "%d minutes ago"
 msgstr ""
 
-#: template.php:91
+#: template.php:92
 msgid "today"
 msgstr ""
 
-#: template.php:92
+#: template.php:93
 msgid "yesterday"
 msgstr ""
 
-#: template.php:93
+#: template.php:94
 #, php-format
 msgid "%d days ago"
 msgstr ""
 
-#: template.php:94
+#: template.php:95
 msgid "last month"
 msgstr ""
 
-#: template.php:95
+#: template.php:96
 msgid "months ago"
 msgstr ""
 
-#: template.php:96
+#: template.php:97
 msgid "last year"
 msgstr ""
 
-#: template.php:97
+#: template.php:98
 msgid "years ago"
 msgstr ""
 
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index dcdeac2fdc..35a5a06eca 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-09-03 02:05+0200\n"
+"POT-Creation-Date: 2012-09-04 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 a8e7af2412..8a2113c6e1 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-09-03 02:04+0200\n"
+"POT-Creation-Date: 2012-09-04 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/lib/l10n/ca.php b/lib/l10n/ca.php
index 8e4c30caec..031207227e 100644
--- a/lib/l10n/ca.php
+++ b/lib/l10n/ca.php
@@ -21,5 +21,8 @@
 "last month" => "el mes passat",
 "months ago" => "mesos enrere",
 "last year" => "l'any passat",
-"years ago" => "fa anys"
+"years ago" => "fa anys",
+"%s is available. Get <a href=\"%s\">more information</a>" => "%s està disponible. Obtén <a href=\"%s\">més informació</a>",
+"up to date" => "actualitzat",
+"updates check is disabled" => "la comprovació d'actualitzacions està desactivada"
 );
diff --git a/lib/l10n/eu.php b/lib/l10n/eu.php
index 989b369413..461bf45877 100644
--- a/lib/l10n/eu.php
+++ b/lib/l10n/eu.php
@@ -21,5 +21,8 @@
 "last month" => "joan den hilabetea",
 "months ago" => "orain dela hilabete batzuk",
 "last year" => "joan den urtea",
-"years ago" => "orain dela urte batzuk"
+"years ago" => "orain dela urte batzuk",
+"%s is available. Get <a href=\"%s\">more information</a>" => "%s eskuragarri dago. Lortu <a href=\"%s\">informazio gehiago</a>",
+"up to date" => "eguneratuta",
+"updates check is disabled" => "eguneraketen egiaztapena ez dago gaituta"
 );
diff --git a/lib/l10n/ja_JP.php b/lib/l10n/ja_JP.php
index 3552a525c9..10f7276703 100644
--- a/lib/l10n/ja_JP.php
+++ b/lib/l10n/ja_JP.php
@@ -21,5 +21,8 @@
 "last month" => "先月",
 "months ago" => "月前",
 "last year" => "昨年",
-"years ago" => "年前"
+"years ago" => "年前",
+"%s is available. Get <a href=\"%s\">more information</a>" => "%s が利用可能です。<a href=\"%s\">詳細情報</a> を確認ください",
+"up to date" => "最新です",
+"updates check is disabled" => "更新チェックは無効です"
 );
diff --git a/lib/l10n/pl.php b/lib/l10n/pl.php
index 169462fabb..087aaa227d 100644
--- a/lib/l10n/pl.php
+++ b/lib/l10n/pl.php
@@ -21,5 +21,8 @@
 "last month" => "ostatni miesiąc",
 "months ago" => "miesięcy temu",
 "last year" => "ostatni rok",
-"years ago" => "lat temu"
+"years ago" => "lat temu",
+"%s is available. Get <a href=\"%s\">more information</a>" => "%s jest dostępna. Uzyskaj <a href=\"%s\">więcej informacji</a>",
+"up to date" => "Aktualne",
+"updates check is disabled" => "wybór aktualizacji jest wyłączony"
 );
diff --git a/settings/l10n/ca.php b/settings/l10n/ca.php
index 29cad92715..6d9a043bc2 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",
+"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." => "La carpeta de dades i els vostres fitxersprobablement són accessibles des d'Internet. La fitxer .htaccess que ownCloud proporciona no funciona. Us recomanem que configureu el servidor web de tal manera que la carpeta de dades no sigui accessible o que moveu la carpeta de dades fora de l'arrel de documents del servidor web.",
 "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",
@@ -27,6 +28,7 @@
 "Allow users to only share with users in their groups" => "Permet als usuaris compartir només amb usuaris del seu grup",
 "Log" => "Registre",
 "More" => "Més",
+"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/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>." => "Desenvolupat per la <a href=\"http://ownCloud.org/contact\" target=\"_blank\">comunitat ownCloud</a>, el <a href=\"https://github.com/owncloud\" target=\"_blank\">codi font</a> té llicència <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "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",
diff --git a/settings/l10n/es.php b/settings/l10n/es.php
index be496cd964..54a42eaad2 100644
--- a/settings/l10n/es.php
+++ b/settings/l10n/es.php
@@ -12,6 +12,7 @@
 "Saving..." => "Guardando...",
 "__language_name__" => "Castellano",
 "Security Warning" => "Advertencia de seguridad",
+"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." => "El directorio de datos -data- y sus archivos probablemente son accesibles desde internet. El archivo .htaccess que provee ownCloud no está funcionando. Recomendamos fuertemente que configure su servidor web de forma que el directorio de datos ya no sea accesible o mueva el directorio de datos fuera de la raíz de documentos del servidor web.",
 "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",
diff --git a/settings/l10n/eu.php b/settings/l10n/eu.php
index d5dcf396ad..61ccec9da8 100644
--- a/settings/l10n/eu.php
+++ b/settings/l10n/eu.php
@@ -12,12 +12,23 @@
 "Saving..." => "Gordetzen...",
 "__language_name__" => "Euskera",
 "Security Warning" => "Segurtasun abisua",
+"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." => "Zure data karpeta eta zure fitxategiak internetetik zuzenean eskuragarri egon daitezke. ownCloudek emandako .htaccess fitxategia ez du bere lana egiten. Aholkatzen dizugu zure web zerbitzaria ongi konfiguratzea data karpeta eskuragarri ez izateko edo data karpeta web zerbitzariaren dokumentu errotik mugitzea.",
 "Cron" => "Cron",
 "execute one task with each page loaded" => "exekutatu zeregina orri karga bakoitzean",
 "cron.php is registered at a webcron service" => "cron.php webcron zerbitzu batean erregistratuta dago",
 "use systems cron service" => "erabili sistemaren cron zerbitzua",
+"Share API" => "Partekatze APIa",
+"Enable Share API" => "Gaitu Partekatze APIa",
+"Allow apps to use the Share API" => "Baimendu aplikazioak Partekatze APIa erabiltzeko",
+"Allow links" => "Baimendu loturak",
+"Allow users to share items to the public with links" => "Baimendu erabiltzaileak loturen bidez fitxategiak publikoki partekatzen",
+"Allow resharing" => "Baimendu birpartekatzea",
+"Allow users to share items shared with them again" => "Baimendu erabiltzaileak haiekin partekatutako fitxategiak berriz ere partekatzen",
+"Allow users to share with anyone" => "Baimendu erabiltzaileak edonorekin partekatzen",
+"Allow users to only share with users in their groups" => "Baimendu erabiltzaileak bakarrik bere taldeko erabiltzaileekin partekatzen",
 "Log" => "Egunkaria",
 "More" => "Gehiago",
+"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/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>." => "<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud komunitateak</a> garatuta, <a href=\"https://github.com/owncloud\" target=\"_blank\">itubruru kodea</a><a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr> lizentziarekin banatzen da</a>.",
 "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",
diff --git a/settings/l10n/fi_FI.php b/settings/l10n/fi_FI.php
index 0ca490d8d5..0bca371983 100644
--- a/settings/l10n/fi_FI.php
+++ b/settings/l10n/fi_FI.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"Unable to load list from App Store" => "Ei pystytä lataamaan listaa sovellusvarastosta (App Store)",
 "Email saved" => "Sähköposti tallennettu",
 "Invalid email" => "Virheellinen sähköposti",
 "OpenID Changed" => "OpenID on vaihdettu",
@@ -11,11 +12,18 @@
 "Saving..." => "Tallennetaan...",
 "__language_name__" => "_kielen_nimi_",
 "Security Warning" => "Turvallisuusvaroitus",
+"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." => "Data-kansio ja tiedostot ovat ehkä saavutettavissa Internetistä. .htaccess-tiedosto, jolla kontrolloidaan pääsyä, ei toimi. Suosittelemme, että muutat web-palvelimesi asetukset niin ettei data-kansio ole enää pääsyä tai siirrät data-kansion pois web-palvelimen tiedostojen juuresta.",
 "Cron" => "Cron",
+"execute one task with each page loaded" => "suorita yksi tehtävä jokaisella ladatulla sivulla",
+"cron.php is registered at a webcron service" => "cron.php on rekisteröity webcron-palvelulla",
 "use systems cron service" => "käytä järjestelmän cron-palvelua",
+"Share API" => "Jaon ohelmointirajapinta (Share API)",
+"Enable Share API" => "Ota käyttöön jaon ohjelmoitirajapinta (Share API)",
+"Allow apps to use the Share API" => "Salli sovellusten käyttää jaon ohjelmointirajapintaa (Share API)",
 "Allow links" => "Salli linkit",
 "Allow users to share items to the public with links" => "Salli käyttäjien jakaa kohteita julkisesti linkkejä käyttäen",
 "Allow resharing" => "Salli uudelleenjako",
+"Allow users to share items shared with them again" => "Salli käyttäjien jakaa heille itselleen jaettuja tietoja edelleen",
 "Allow users to share with anyone" => "Salli käyttäjien jakaa kohteita kenen tahansa kanssa",
 "Allow users to only share with users in their groups" => "Salli käyttäjien jakaa kohteita vain omien ryhmien jäsenten kesken",
 "Log" => "Loki",
@@ -54,6 +62,7 @@
 "Create" => "Luo",
 "Default Quota" => "Oletuskiintiö",
 "Other" => "Muu",
+"Group Admin" => "Ryhmän ylläpitäjä",
 "Quota" => "Kiintiö",
 "Delete" => "Poista"
 );
diff --git a/settings/l10n/lb.php b/settings/l10n/lb.php
index 29072720a0..b419cb9278 100644
--- a/settings/l10n/lb.php
+++ b/settings/l10n/lb.php
@@ -1,12 +1,32 @@
 <?php $TRANSLATIONS = array(
+"Unable to load list from App Store" => "Konnt Lescht net vum App Store lueden",
+"Email saved" => "E-mail gespäichert",
+"Invalid email" => "Ongülteg e-mail",
 "OpenID Changed" => "OpenID huet geännert",
 "Invalid request" => "Ongülteg Requête",
+"Authentication error" => "Authentifikatioun's Fehler",
 "Language changed" => "Sprooch huet geännert",
+"Error" => "Fehler",
+"Disable" => "Ofschalten",
+"Enable" => "Aschalten",
+"Saving..." => "Speicheren...",
 "__language_name__" => "__language_name__",
+"Security Warning" => "Sécherheets Warnung",
+"Cron" => "Cron",
+"cron.php is registered at a webcron service" => "cron.php ass als en webcron Service registréiert",
+"use systems cron service" => "benotz den systems cron Service",
+"Share API" => "Share API",
+"Enable Share API" => "Share API aschalten",
+"Allow apps to use the Share API" => "Erlab Apps d'Share API ze benotzen",
+"Allow links" => "Links erlaben",
+"Allow resharing" => "Resharing erlaben",
+"Allow users to share with anyone" => "Useren erlaben mat egal wiem ze sharen",
+"Allow users to only share with users in their groups" => "Useren nëmmen erlaben mat Useren aus hirer Grupp ze sharen",
 "Log" => "Log",
 "More" => "Méi",
 "Add your App" => "Setz deng App bei",
 "Select an App" => "Wiel eng Applikatioun aus",
+"See application page at apps.owncloud.com" => "Kuck dir d'Applicatioun's Säit op apps.owncloud.com un",
 "-licensed" => "-Lizenséiert",
 "by" => "vun",
 "Documentation" => "Dokumentatioun",
@@ -37,6 +57,7 @@
 "Create" => "Erstellen",
 "Default Quota" => "Standard Quota",
 "Other" => "Aner",
+"Group Admin" => "Gruppen Admin",
 "Quota" => "Quota",
 "Delete" => "Läschen"
 );
diff --git a/settings/l10n/pl.php b/settings/l10n/pl.php
index de9384a244..d331f2e147 100644
--- a/settings/l10n/pl.php
+++ b/settings/l10n/pl.php
@@ -16,6 +16,11 @@
 "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",
+"Share API" => "Udostępnij API",
+"Enable Share API" => "Włącz udostępniane API",
+"Allow apps to use the Share API" => "Zezwalaj aplikacjom na używanie API",
+"Allow links" => "Zezwalaj na łącza",
+"Allow resharing" => "Zezwól na ponowne udostępnianie",
 "Log" => "Log",
 "More" => "Więcej",
 "Add your App" => "Dodaj aplikacje",

From b0d186265aef4d7095bb4e6626928f5eb4944e36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Tue, 4 Sep 2012 12:07:05 +0300
Subject: [PATCH 1054/1224] Update files/webdav.php

respect coding style
---
 files/webdav.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/files/webdav.php b/files/webdav.php
index c19c4c6b72..cfbb3f486d 100644
--- a/files/webdav.php
+++ b/files/webdav.php
@@ -25,7 +25,7 @@
 
 // only need filesystem apps
 $RUNTIME_APPTYPES=array('filesystem','authentication');
-require_once('../lib/base.php');
+require_once '../lib/base.php';
 
 // Backends
 $authBackend = new OC_Connector_Sabre_Auth();
@@ -36,7 +36,7 @@ $publicDir = new OC_Connector_Sabre_Directory('');
 
 // Fire up server
 $server = new Sabre_DAV_Server($publicDir);
-$server->setBaseUri(OC::$WEBROOT.'/files/webdav.php');
+$server->setBaseUri(OC::$WEBROOT. '/files/webdav.php');
 
 // Load plugins
 $server->addPlugin(new Sabre_DAV_Auth_Plugin($authBackend,'ownCloud'));

From a1bd1ae484f2a1436deed129c18ffd47d78967dc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Tue, 4 Sep 2012 12:08:58 +0300
Subject: [PATCH 1055/1224] Update cron.php

respect coding style
---
 cron.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/cron.php b/cron.php
index 83285e8a47..d204c1dbe6 100644
--- a/cron.php
+++ b/cron.php
@@ -26,8 +26,8 @@ class my_temporary_cron_class {
 }
 
 function handleUnexpectedShutdown() {
-	if( !my_temporary_cron_class::$sent ){
-		if( OC::$CLI ){
+	if( !my_temporary_cron_class::$sent ) {
+		if( OC::$CLI ) {
 			echo 'Unexpected error!'.PHP_EOL;
 		}
 		else{
@@ -37,10 +37,10 @@ function handleUnexpectedShutdown() {
 }
 
 $RUNTIME_NOSETUPFS = true;
-require_once('lib/base.php');
+require_once 'lib/base.php';
 
 // Don't do anything if ownCloud has not been installed
-if( !OC_Config::getValue( 'installed', false )){
+if( !OC_Config::getValue( 'installed', false )) {
 	exit( 0 );
 }
 
@@ -49,9 +49,9 @@ register_shutdown_function('handleUnexpectedShutdown');
 
 // Exit if background jobs are disabled!
 $appmode = OC_Appconfig::getValue( 'core', 'backgroundjobs_mode', 'ajax' );
-if( $appmode == 'none' ){
+if( $appmode == 'none' ) {
 	my_temporary_cron_class::$sent = true;
-	if( OC::$CLI ){
+	if( OC::$CLI ) {
 		echo 'Background Jobs are disabled!'.PHP_EOL;
 	}
 	else{
@@ -60,14 +60,14 @@ if( $appmode == 'none' ){
 	exit( 1 );
 }
 
-if( OC::$CLI ){
-	if( $appmode != 'cron' ){
+if( OC::$CLI ) {
+	if( $appmode != 'cron' ) {
 		OC_Appconfig::setValue( 'core', 'backgroundjobs_mode', 'cron' );
 	}
 
 	// check if backgroundjobs is still running
 	$pid = OC_Appconfig::getValue( 'core', 'backgroundjobs_pid', false );
-	if( $pid !== false ){
+	if( $pid !== false ) {
 		// FIXME: check if $pid is still alive (*nix/mswin). if so then exit
 	}
 	// save pid

From 08edb5dc58e9384aab704d36d8c16d452d56db58 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Tue, 4 Sep 2012 12:09:39 +0300
Subject: [PATCH 1056/1224] Update index.php

---
 index.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/index.php b/index.php
index a972993c19..12b2d8f406 100755
--- a/index.php
+++ b/index.php
@@ -23,6 +23,6 @@
 
 $RUNTIME_NOAPPS = TRUE; //no apps, yet
 
-require_once('lib/base.php');
+require_once 'lib/base.php';
 
 OC::handleRequest();

From cfa2fded0570ef0ceee634862f73761af36e2cb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Tue, 4 Sep 2012 12:10:26 +0300
Subject: [PATCH 1057/1224] Update public.php

respect coding style
---
 public.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/public.php b/public.php
index e46559595f..db8419373e 100644
--- a/public.php
+++ b/public.php
@@ -1,20 +1,20 @@
 <?php
 $RUNTIME_NOAPPS = TRUE;
-require_once('lib/base.php');
+require_once 'lib/base.php';
 if (!isset($_GET['service'])) {
 	header('HTTP/1.0 404 Not Found');
 	exit;
 }
 $file = OCP\CONFIG::getAppValue('core', 'public_' . strip_tags($_GET['service']));
-if(is_null($file)){
+if(is_null($file)) {
 	header('HTTP/1.0 404 Not Found');
 	exit;
 }
 
-$parts=explode('/',$file,2);
+$parts=explode('/', $file, 2);
 $app=$parts[0];
 
 OC_Util::checkAppEnabled($app);
 OC_App::loadApp($app);
 
-require_once(OC_App::getAppPath($app) .'/'. $parts[1]);
+require_once OC_App::getAppPath($app) .'/'. $parts[1];

From ca2a51894588819c4dee78fd2d6f655adaebd8b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Tue, 4 Sep 2012 12:11:11 +0300
Subject: [PATCH 1058/1224] Update remote.php

respect coding style
---
 remote.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/remote.php b/remote.php
index 809a4a9bf5..9d9903338a 100644
--- a/remote.php
+++ b/remote.php
@@ -1,6 +1,6 @@
 <?php
 $RUNTIME_NOAPPS = TRUE;
-require_once('lib/base.php');
+require_once 'lib/base.php';
 $path_info = OC_Request::getPathInfo();
 if ($path_info === false || $path_info === '') {
 	OC_Response::setStatus(OC_Response::STATUS_NOT_FOUND);
@@ -13,12 +13,12 @@ $service=substr($path_info, 1, $pos-1);
 
 $file = OC_AppConfig::getValue('core', 'remote_' . $service);
 
-if(is_null($file)){
+if(is_null($file)) {
 	OC_Response::setStatus(OC_Response::STATUS_NOT_FOUND);
 	exit;
 }
 
-$file=ltrim($file,'/');
+$file=ltrim($file, '/');
 
 $parts=explode('/', $file, 2);
 $app=$parts[0];
@@ -33,4 +33,4 @@ switch ($app) {
 		break;
 }
 $baseuri = OC::$WEBROOT . '/remote.php/'.$service.'/';
-require_once($file);
+require_once $file;

From c25f53c3f9b1c8a276b5644c03b90c28c7d1fdf2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Tue, 4 Sep 2012 12:12:38 +0300
Subject: [PATCH 1059/1224] Update status.php

respect coding style
---
 status.php | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/status.php b/status.php
index f314a3a1c6..2673115357 100644
--- a/status.php
+++ b/status.php
@@ -23,9 +23,13 @@
 
 $RUNTIME_NOAPPS = TRUE; //no apps, yet
 
-require_once('lib/base.php');
+require_once 'lib/base.php';
 
 if(OC_Config::getValue('installed')==1) $installed='true'; else $installed='false';
-$values=array('installed'=>$installed,'version'=>implode('.',OC_Util::getVersion()),'versionstring'=>OC_Util::getVersionString(),'edition'=>OC_Util::getEditionString());
+$values=array(
+	'installed'=>$installed,
+	'version'=>implode('.', OC_Util::getVersion()),
+	'versionstring'=>OC_Util::getVersionString(),
+	'edition'=>OC_Util::getEditionString());
 
 echo(json_encode($values));

From cfd62d422b4b0cc0c27680d1c9b247bd63eac516 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Tue, 4 Sep 2012 12:14:09 +0300
Subject: [PATCH 1060/1224] Update settings/apps.php

respect coding style
---
 settings/apps.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/settings/apps.php b/settings/apps.php
index 7e21973805..3524f65d6a 100644
--- a/settings/apps.php
+++ b/settings/apps.php
@@ -21,7 +21,7 @@
 *
 */
 
-require_once('../lib/base.php');
+require_once '../lib/base.php';
 OC_Util::checkAdminUser();
 
 // Load the files we need
@@ -35,11 +35,11 @@ $apps=array();
 //TODO which apps do we want to blacklist and how do we integrate blacklisting with the multi apps folder feature
 $blacklist=array('files');//we dont want to show configuration for these
 
-foreach($registeredApps as $app){
-	if(array_search($app,$blacklist)===false){
+foreach($registeredApps as $app) {
+	if(array_search($app, $blacklist)===false) {
 		$info=OC_App::getAppInfo($app);
 		if (!isset($info['name'])) {
-			OC_Log::write('core','App id "'.$app.'" has no name in appinfo',OC_Log::ERROR);
+			OC_Log::write('core', 'App id "'.$app.'" has no name in appinfo', OC_Log::ERROR);
 			continue;
 		}
 		$active=(OC_Appconfig::getValue($app,'enabled','no')=='yes')?true:false;
@@ -58,7 +58,7 @@ foreach($registeredApps as $app){
 }
 
 function app_sort($a, $b){
-	if ($a['active'] != $b['active']){
+	if ($a['active'] != $b['active']) {
 		return $b['active'] - $a['active'];
 	}
 	return strcmp($a['name'], $b['name']);
@@ -66,8 +66,8 @@ function app_sort($a, $b){
 usort($apps, 'app_sort');
 
 $tmpl = new OC_Template( "settings", "apps", "user" );
-$tmpl->assign('apps',$apps, false);
+$tmpl->assign('apps', $apps, false);
 $appid = (isset($_GET['appid'])?strip_tags($_GET['appid']):'');
-$tmpl->assign('appid',$appid);
+$tmpl->assign('appid', $appid);
 
 $tmpl->printPage();

From 0fe0bd86b8e3e8cd5decf642d45c86be87e9cb7b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Tue, 4 Sep 2012 12:14:43 +0300
Subject: [PATCH 1061/1224] Update settings/help.php

respect coding style
---
 settings/help.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/settings/help.php b/settings/help.php
index b1dc1c5be7..9157308dd5 100644
--- a/settings/help.php
+++ b/settings/help.php
@@ -5,7 +5,7 @@
  * See the COPYING-README file.
  */
 
-require_once('../lib/base.php');
+require_once '../lib/base.php';
 OC_Util::checkLoggedIn();
 
 
@@ -15,7 +15,7 @@ OC_App::setActiveNavigationEntry( "help" );
 
 $pagesize=7;
 if(isset($_GET['page'])) $page=$_GET['page']; else $page=0;
-$kbe=OC_OCSClient::getKnownledgebaseEntries($page,$pagesize);
+$kbe=OC_OCSClient::getKnownledgebaseEntries($page, $pagesize);
 $totalitems=$kbe['totalitems'];
 unset($kbe['totalitems']);
 $pagecount=ceil($totalitems/$pagesize);

From dc2648b14cfffcb3da944bfca6a81d42217d790e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Tue, 4 Sep 2012 12:16:24 +0300
Subject: [PATCH 1062/1224] Update settings/personal.php

respect coding style
---
 settings/personal.php | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/settings/personal.php b/settings/personal.php
index 82626526d5..7683c8e910 100644
--- a/settings/personal.php
+++ b/settings/personal.php
@@ -5,7 +5,7 @@
  * See the COPYING-README file.
  */
 
-require_once('../lib/base.php');
+require_once '../lib/base.php';
 OC_Util::checkLoggedIn();
 
 // Highlight navigation entry
@@ -29,21 +29,21 @@ $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','');
+$email=OC_Preferences::getValue(OC_User::getUser(), 'settings', 'email', '');
 
 $lang=OC_Preferences::getValue( OC_User::getUser(), 'core', 'lang', OC_L10N::findLanguage() );
 $languageCodes=OC_L10N::findAvailableLanguages();
 sort ($languageCodes);
 
 //put the current language in the front
-unset($languageCodes[array_search($lang,$languageCodes)]);
+unset($languageCodes[array_search($lang, $languageCodes)]);
 array_unshift($languageCodes,$lang);
 
 $languageNames=include 'languageCodes.php';
 $languages=array();
 foreach($languageCodes as $lang){
 	$l=OC_L10N::get('settings',$lang);
-	if(substr($l->t('__language_name__'),0,1)!='_'){//first check if the language name is in the translation file
+	if(substr($l->t('__language_name__'), 0, 1)!='_') {//first check if the language name is in the translation file
 		$languages[]=array('code'=>$lang,'name'=>$l->t('__language_name__'));
 	}elseif(isset($languageNames[$lang])){
 		$languages[]=array('code'=>$lang,'name'=>$languageNames[$lang]);
@@ -54,15 +54,15 @@ 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->assign('usage', OC_Helper::humanFileSize($used));
+$tmpl->assign('total_space', OC_Helper::humanFileSize($total));
+$tmpl->assign('usage_relative', $relative);
+$tmpl->assign('email', $email);
+$tmpl->assign('languages', $languages);
 
 $forms=OC_App::getForms('personal');
-$tmpl->assign('forms',array());
+$tmpl->assign('forms', array());
 foreach($forms as $form){
-	$tmpl->append('forms',$form);
+	$tmpl->append('forms', $form);
 }
 $tmpl->printPage();

From 01f5aa1b2db1c1cb3e009211212541fe61cde7a3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Tue, 4 Sep 2012 12:17:02 +0300
Subject: [PATCH 1063/1224] Update settings/settings.php

respect coding style
---
 settings/settings.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/settings/settings.php b/settings/settings.php
index a49de85520..ae41fecaf9 100644
--- a/settings/settings.php
+++ b/settings/settings.php
@@ -5,7 +5,7 @@
  * See the COPYING-README file.
  */
 
-require_once('../lib/base.php');
+require_once '../lib/base.php';
 OC_Util::checkLoggedIn();
 
 OC_Util::addStyle( 'settings', 'settings' );
@@ -13,8 +13,8 @@ OC_App::setActiveNavigationEntry( 'settings' );
 
 $tmpl = new OC_Template( 'settings', 'settings', 'user');
 $forms=OC_App::getForms('settings');
-$tmpl->assign('forms',array());
+$tmpl->assign('forms', array());
 foreach($forms as $form){
-	$tmpl->append('forms',$form);
+	$tmpl->append('forms', $form);
 }
 $tmpl->printPage();

From e87387c956b8009a215bd068b7518829ee28f100 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Tue, 4 Sep 2012 12:19:01 +0300
Subject: [PATCH 1064/1224] Update settings/users.php

respect coding style
---
 settings/users.php | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/settings/users.php b/settings/users.php
index b04f0c99e8..f176977ade 100644
--- a/settings/users.php
+++ b/settings/users.php
@@ -5,7 +5,7 @@
  * See the COPYING-README file.
  */
 
-require_once('../lib/base.php');
+require_once '../lib/base.php';
 OC_Util::checkSubAdminUser();
 
 // We have some javascript foo!
@@ -18,8 +18,8 @@ OC_App::setActiveNavigationEntry( 'core_users' );
 $users = array();
 $groups = array();
 
-$isadmin = OC_Group::inGroup(OC_User::getUser(),'admin')?true:false;
-if($isadmin){
+$isadmin = OC_Group::inGroup(OC_User::getUser(), 'admin')?true:false;
+if($isadmin) {
 	$accessiblegroups = OC_Group::getGroups();
 	$accessibleusers = OC_User::getUsers('', 30);
 	$subadmins = OC_SubAdmin::getAllSubAdmins();
@@ -30,20 +30,24 @@ if($isadmin){
 }
 
 foreach($accessibleusers as $i){
-	$users[] = array( "name" => $i, "groups" => join( ", ", /*array_intersect(*/OC_Group::getUserGroups($i)/*, OC_SubAdmin::getSubAdminsGroups(OC_User::getUser()))*/),'quota'=>OC_Preferences::getValue($i,'files','quota','default'),'subadmin'=>implode(', ',OC_SubAdmin::getSubAdminsGroups($i)));
+	$users[] = array(
+		"name" => $i, 
+		"groups" => join( ", ", /*array_intersect(*/OC_Group::getUserGroups($i)/*, OC_SubAdmin::getSubAdminsGroups(OC_User::getUser()))*/),
+		'quota'=>OC_Preferences::getValue($i, 'files', 'quota', 'default'),
+		'subadmin'=>implode(', ', OC_SubAdmin::getSubAdminsGroups($i)));
 }
 
 foreach( $accessiblegroups as $i ){
 	// Do some more work here soon
 	$groups[] = array( "name" => $i );
 }
-$quotaPreset=OC_Appconfig::getValue('files','quota_preset','default,none,1 GB, 5 GB, 10 GB');
+$quotaPreset=OC_Appconfig::getValue('files', 'quota_preset', 'default,none,1 GB, 5 GB, 10 GB');
 $quotaPreset=explode(',',$quotaPreset);
 foreach($quotaPreset as &$preset){
 	$preset=trim($preset);
 }
 
-$defaultQuota=OC_Appconfig::getValue('files','default_quota','none');
+$defaultQuota=OC_Appconfig::getValue('files', 'default_quota', 'none');
 
 $tmpl = new OC_Template( "settings", "users", "user" );
 $tmpl->assign( "users", $users );

From 1063034e937724101d562c6acaf9ba2adc423179 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Tue, 4 Sep 2012 12:28:49 +0300
Subject: [PATCH 1065/1224] Update settings/apps.php

respect coding style
---
 settings/apps.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings/apps.php b/settings/apps.php
index 3524f65d6a..686972c334 100644
--- a/settings/apps.php
+++ b/settings/apps.php
@@ -42,7 +42,7 @@ foreach($registeredApps as $app) {
 			OC_Log::write('core', 'App id "'.$app.'" has no name in appinfo', OC_Log::ERROR);
 			continue;
 		}
-		$active=(OC_Appconfig::getValue($app,'enabled','no')=='yes')?true:false;
+		$active=(OC_Appconfig::getValue($app, 'enabled', 'no')=='yes')?true:false;
 		$info['active']=$active;
 		if(isset($info['shipped']) and ($info['shipped']=='true')) {
 			$info['internal']=true;

From 7ab5256922f975c9528b599d70f5bf4d417863d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Tue, 4 Sep 2012 12:29:41 +0300
Subject: [PATCH 1066/1224] Update settings/personal.php

respect coding style
---
 settings/personal.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/settings/personal.php b/settings/personal.php
index 7683c8e910..2fa8cd4f5e 100644
--- a/settings/personal.php
+++ b/settings/personal.php
@@ -37,12 +37,12 @@ sort ($languageCodes);
 
 //put the current language in the front
 unset($languageCodes[array_search($lang, $languageCodes)]);
-array_unshift($languageCodes,$lang);
+array_unshift($languageCodes, $lang);
 
 $languageNames=include 'languageCodes.php';
 $languages=array();
 foreach($languageCodes as $lang){
-	$l=OC_L10N::get('settings',$lang);
+	$l=OC_L10N::get('settings', $lang);
 	if(substr($l->t('__language_name__'), 0, 1)!='_') {//first check if the language name is in the translation file
 		$languages[]=array('code'=>$lang,'name'=>$l->t('__language_name__'));
 	}elseif(isset($languageNames[$lang])){

From 8bea9f34e65207a0aaeddd294fe4a894d38bbaf0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Tue, 4 Sep 2012 12:31:28 +0300
Subject: [PATCH 1067/1224] Update settings/ajax/apps/ocs.php

respect coding style
---
 settings/ajax/apps/ocs.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/settings/ajax/apps/ocs.php b/settings/ajax/apps/ocs.php
index f68843fac3..1f3e3b3dfe 100644
--- a/settings/ajax/apps/ocs.php
+++ b/settings/ajax/apps/ocs.php
@@ -7,13 +7,13 @@
  */
 
 // Init owncloud
-require_once('../../../lib/base.php');
+require_once '../../../lib/base.php';
 
 OC_JSON::checkAdminUser();
 
 $l = OC_L10N::get('core');
 
-if(OC_Config::getValue('appstoreenabled', true)==false){
+if(OC_Config::getValue('appstoreenabled', true)==false) {
 	OCP\JSON::success(array('type' => 'external', 'data' => array()));
 }
 
@@ -27,11 +27,11 @@ $apps=array();
 
 // apps from external repo via OCS
 $catagoryNames=OC_OCSClient::getCategories();
-if(is_array($catagoryNames)){
+if(is_array($catagoryNames)) {
 	$categories=array_keys($catagoryNames);
 	$page=0;
 	$filter='approved';
-	$externalApps=OC_OCSClient::getApplications($categories,$page,$filter);
+	$externalApps=OC_OCSClient::getApplications($categories, $page, $filter);
 	foreach($externalApps as $app){
 		// show only external apps that aren't enabled yet
 		$local=false;

From 69240afd7af48e8166aa80fad75659c079c2f991 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Tue, 4 Sep 2012 12:32:27 +0300
Subject: [PATCH 1068/1224] Update settings/ajax/changepassword.php

respect coding style
---
 settings/ajax/changepassword.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/settings/ajax/changepassword.php b/settings/ajax/changepassword.php
index c7cb651233..b251fea504 100644
--- a/settings/ajax/changepassword.php
+++ b/settings/ajax/changepassword.php
@@ -1,7 +1,7 @@
 <?php
 
 // Init owncloud
-require_once('../../lib/base.php');
+require_once '../../lib/base.php';
 OCP\JSON::callCheck();
 
 $username = isset($_POST["username"]) ? $_POST["username"] : OC_User::getUser();
@@ -13,23 +13,23 @@ OC_JSON::checkLoggedIn();
 OCP\JSON::callCheck();
 
 $userstatus = null;
-if(OC_Group::inGroup(OC_User::getUser(), 'admin')){
+if(OC_Group::inGroup(OC_User::getUser(), 'admin')) {
 	$userstatus = 'admin';
 }
-if(OC_SubAdmin::isUserAccessible(OC_User::getUser(), $username)){
+if(OC_SubAdmin::isUserAccessible(OC_User::getUser(), $username)) {
 	$userstatus = 'subadmin';
 }
-if(OC_User::getUser() == $username && OC_User::checkPassword($username,$oldPassword)){
+if(OC_User::getUser() == $username && OC_User::checkPassword($username, $oldPassword)) {
 	$userstatus = 'user';
 }
 
-if(is_null($userstatus)){
+if(is_null($userstatus)) {
 	OC_JSON::error( array( "data" => array( "message" => "Authentication error" )));
 	exit();
 }
 
 // Return Success story
-if( OC_User::setPassword( $username, $password )){
+if( OC_User::setPassword( $username, $password )) {
 	OC_JSON::success(array("data" => array( "username" => $username )));
 }
 else{

From e10f46d97879ee08d7cc29e914ae96fb6bd125d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Tue, 4 Sep 2012 12:34:52 +0300
Subject: [PATCH 1069/1224] Update settings/ajax/createuser.php

respect coding style
---
 settings/ajax/createuser.php | 25 ++++++++++++++-----------
 1 file changed, 14 insertions(+), 11 deletions(-)

diff --git a/settings/ajax/createuser.php b/settings/ajax/createuser.php
index eaca5b5074..22320b870e 100644
--- a/settings/ajax/createuser.php
+++ b/settings/ajax/createuser.php
@@ -1,32 +1,32 @@
 <?php
 
 // Init owncloud
-require_once('../../lib/base.php');
+require_once '../../lib/base.php';
 OCP\JSON::callCheck();
 
 // Check if we are a user
-if( !OC_User::isLoggedIn() || (!OC_Group::inGroup( OC_User::getUser(), 'admin' ) && !OC_SubAdmin::isSubAdmin(OC_User::getUser()))){
+if( !OC_User::isLoggedIn() || (!OC_Group::inGroup( OC_User::getUser(), 'admin' ) && !OC_SubAdmin::isSubAdmin(OC_User::getUser()))) {
 	OC_JSON::error(array("data" => array( "message" => "Authentication error" )));
 	exit();
 }
 OCP\JSON::callCheck();
 
-$isadmin = OC_Group::inGroup(OC_User::getUser(),'admin')?true:false;
+$isadmin = OC_Group::inGroup(OC_User::getUser(), 'admin')?true:false;
 
-if($isadmin){
+if($isadmin) {
 	$groups = array();
-	if( isset( $_POST["groups"] )){
+	if( isset( $_POST["groups"] )) {
 		$groups = $_POST["groups"];
 	}
 }else{
-	if(isset( $_POST["groups"] )){
+	if(isset( $_POST["groups"] )) {
 		$groups = array();
 		foreach($_POST["groups"] as $group){
-			if(OC_SubAdmin::isGroupAccessible(OC_User::getUser(), $group)){
+			if(OC_SubAdmin::isGroupAccessible(OC_User::getUser(), $group)) {
 				$groups[] = $group;
 			}
 		}
-		if(count($groups) == 0){
+		if(count($groups) == 0) {
 			$groups = OC_SubAdmin::getSubAdminsGroups(OC_User::getUser());
 		}
 	}else{
@@ -37,7 +37,7 @@ $username = $_POST["username"];
 $password = $_POST["password"];
 
 // Does the group exist?
-if( in_array( $username, OC_User::getUsers())){
+if( in_array( $username, OC_User::getUsers())) {
 	OC_JSON::error(array("data" => array( "message" => "User already exists" )));
 	exit();
 }
@@ -46,12 +46,15 @@ if( in_array( $username, OC_User::getUsers())){
 try {
 	OC_User::createUser($username, $password);
 	foreach( $groups as $i ){
-		if(!OC_Group::groupExists($i)){
+		if(!OC_Group::groupExists($i)) {
 			OC_Group::createGroup($i);
 		}
 		OC_Group::addToGroup( $username, $i );
 	}
-	OC_JSON::success(array("data" => array( "username" => $username, "groups" => implode( ", ", OC_Group::getUserGroups( $username )))));
+	OC_JSON::success(array("data" => 
+				array( 
+					"username" => $username, 
+					"groups" => implode( ", ", OC_Group::getUserGroups( $username )))));
 } catch (Exception $exception) {
 	OC_JSON::error(array("data" => array( "message" => $exception->getMessage())));
 }

From a570cc7b6054dd6659204763d8e9b1b0e7478381 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Tue, 4 Sep 2012 12:36:21 +0300
Subject: [PATCH 1070/1224] Update settings/ajax/setquota.php

respect coding style
---
 settings/ajax/setquota.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/settings/ajax/setquota.php b/settings/ajax/setquota.php
index 2a30b1d97e..2352ae9e42 100644
--- a/settings/ajax/setquota.php
+++ b/settings/ajax/setquota.php
@@ -6,14 +6,14 @@
  */
 
 // Init owncloud
-require_once('../../lib/base.php');
+require_once '../../lib/base.php';
 
 OC_JSON::checkSubAdminUser();
 OCP\JSON::callCheck();
 
 $username = isset($_POST["username"])?$_POST["username"]:'';
 
-if(($username == '' && !OC_Group::inGroup(OC_User::getUser(), 'admin')) || (!OC_Group::inGroup(OC_User::getUser(), 'admin') && !OC_SubAdmin::isUserAccessible(OC_User::getUser(), $username))){
+if(($username == '' && !OC_Group::inGroup(OC_User::getUser(), 'admin')) || (!OC_Group::inGroup(OC_User::getUser(), 'admin') && !OC_SubAdmin::isUserAccessible(OC_User::getUser(), $username))) {
 	$l = OC_L10N::get('core');
 	OC_JSON::error(array( 'data' => array( 'message' => $l->t('Authentication error') )));
 	exit();
@@ -21,9 +21,9 @@ if(($username == '' && !OC_Group::inGroup(OC_User::getUser(), 'admin')) || (!OC_
 
 //make sure the quota is in the expected format
 $quota=$_POST["quota"];
-if($quota!='none' and $quota!='default'){
+if($quota!='none' and $quota!='default') {
 	$quota= OC_Helper::computerFileSize($quota);
-	if($quota==0){
+	if($quota==0) {
 		$quota='default';
 	}else{
 		$quota=OC_Helper::humanFileSize($quota);
@@ -31,13 +31,13 @@ if($quota!='none' and $quota!='default'){
 }
 
 // Return Success story
-if($username){
-	OC_Preferences::setValue($username,'files','quota',$quota);
+if($username) {
+	OC_Preferences::setValue($username, 'files', 'quota', $quota);
 }else{//set the default quota when no username is specified
-	if($quota=='default'){//'default' as default quota makes no sense
+	if($quota=='default') {//'default' as default quota makes no sense
 		$quota='none';
 	}
-	OC_Appconfig::setValue('files','default_quota',$quota);
+	OC_Appconfig::setValue('files', 'default_quota', $quota);
 }
-OC_JSON::success(array("data" => array( "username" => $username ,'quota'=>$quota)));
+OC_JSON::success(array("data" => array( "username" => $username ,'quota' => $quota)));
 

From caaaf7a7bf55814a6a3bd44ae5a649c230317c31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Tue, 4 Sep 2012 12:45:54 +0300
Subject: [PATCH 1071/1224] Update settings/ajax/creategroup.php

respect coding style
---
 settings/ajax/creategroup.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/settings/ajax/creategroup.php b/settings/ajax/creategroup.php
index 16cf57aebb..1307e18559 100644
--- a/settings/ajax/creategroup.php
+++ b/settings/ajax/creategroup.php
@@ -1,11 +1,11 @@
 <?php
 
 // Init owncloud
-require_once('../../lib/base.php');
+require_once '../../lib/base.php';
 OCP\JSON::callCheck();
 
 // Check if we are a user
-if( !OC_User::isLoggedIn() || !OC_Group::inGroup( OC_User::getUser(), 'admin' )){
+if( !OC_User::isLoggedIn() || !OC_Group::inGroup( OC_User::getUser(), 'admin' )) {
 	OC_JSON::error(array("data" => array( "message" => "Authentication error" )));
 	exit();
 }
@@ -15,13 +15,13 @@ OCP\JSON::callCheck();
 $groupname = $_POST["groupname"];
 
 // Does the group exist?
-if( in_array( $groupname, OC_Group::getGroups())){
+if( in_array( $groupname, OC_Group::getGroups())) {
 	OC_JSON::error(array("data" => array( "message" => "Group already exists" )));
 	exit();
 }
 
 // Return Success story
-if( OC_Group::createGroup( $groupname )){
+if( OC_Group::createGroup( $groupname )) {
 	OC_JSON::success(array("data" => array( "groupname" => $groupname )));
 }
 else{

From 6308f803297f87e1c0b22503adfe81758a129f96 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Tue, 4 Sep 2012 12:46:56 +0300
Subject: [PATCH 1072/1224] Update settings/ajax/getlog.php

respect coding style
---
 settings/ajax/getlog.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/settings/ajax/getlog.php b/settings/ajax/getlog.php
index d5af22ac33..9b9240f825 100644
--- a/settings/ajax/getlog.php
+++ b/settings/ajax/getlog.php
@@ -6,7 +6,7 @@
  */
 
 // Init owncloud
-require_once('../../lib/base.php');
+require_once '../../lib/base.php';
 
 OC_JSON::checkAdminUser();
 
@@ -14,4 +14,6 @@ $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), "remain"=>(count(OC_Log_Owncloud::getEntries(1,$offset + $offset)) != 0)?true:false));
+OC_JSON::success(array(
+	"data" => OC_Util::sanitizeHTML($entries), 
+	"remain"=>(count(OC_Log_Owncloud::getEntries(1, $offset + $offset)) != 0) ? true : false));

From 04033585b04f7811d036c19d56408ff97171e0c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Tue, 4 Sep 2012 12:47:35 +0300
Subject: [PATCH 1073/1224] Update settings/ajax/lostpassword.php

respect coding style
---
 settings/ajax/lostpassword.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/settings/ajax/lostpassword.php b/settings/ajax/lostpassword.php
index 803a424854..2a40ba09a8 100644
--- a/settings/ajax/lostpassword.php
+++ b/settings/ajax/lostpassword.php
@@ -1,16 +1,16 @@
 <?php
 
 // Init owncloud
-require_once('../../lib/base.php');
+require_once '../../lib/base.php';
 OC_JSON::checkLoggedIn();
 OCP\JSON::callCheck();
 
 $l=OC_L10N::get('core');
 
 // Get data
-if( isset( $_POST['email'] ) && filter_var( $_POST['email'], FILTER_VALIDATE_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_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") )));

From 83575a44360357dbbace4038afff220c5aa3a36d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Tue, 4 Sep 2012 12:48:42 +0300
Subject: [PATCH 1074/1224] Update settings/ajax/creategroup.php

$l->t added to error messages
---
 settings/ajax/creategroup.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/settings/ajax/creategroup.php b/settings/ajax/creategroup.php
index 1307e18559..83733ac4d2 100644
--- a/settings/ajax/creategroup.php
+++ b/settings/ajax/creategroup.php
@@ -6,7 +6,7 @@ OCP\JSON::callCheck();
 
 // Check if we are a user
 if( !OC_User::isLoggedIn() || !OC_Group::inGroup( OC_User::getUser(), 'admin' )) {
-	OC_JSON::error(array("data" => array( "message" => "Authentication error" )));
+	OC_JSON::error(array("data" => array( "message" => $l->t("Authentication error") )));
 	exit();
 }
 
@@ -16,7 +16,7 @@ $groupname = $_POST["groupname"];
 
 // Does the group exist?
 if( in_array( $groupname, OC_Group::getGroups())) {
-	OC_JSON::error(array("data" => array( "message" => "Group already exists" )));
+	OC_JSON::error(array("data" => array( "message" => $l->t("Group already exists") )));
 	exit();
 }
 
@@ -25,5 +25,5 @@ if( OC_Group::createGroup( $groupname )) {
 	OC_JSON::success(array("data" => array( "groupname" => $groupname )));
 }
 else{
-	OC_JSON::error(array("data" => array( "message" => "Unable to add group" )));
+	OC_JSON::error(array("data" => array( "message" => $l->t("Unable to add group") )));
 }

From 16b3ffb5888b8eda6f2f42902df1f441fcbb7609 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Tue, 4 Sep 2012 12:49:21 +0300
Subject: [PATCH 1075/1224] Update settings/ajax/openid.php

respect coding style
---
 settings/ajax/openid.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/settings/ajax/openid.php b/settings/ajax/openid.php
index bf4ead0602..ecec085383 100644
--- a/settings/ajax/openid.php
+++ b/settings/ajax/openid.php
@@ -1,7 +1,7 @@
 <?php
 
 // Init owncloud
-require_once('../../lib/base.php');
+require_once '../../lib/base.php';
 
 $l=OC_L10N::get('settings');
 
@@ -10,9 +10,9 @@ OCP\JSON::callCheck();
 OC_JSON::checkAppEnabled('user_openid');
 
 // Get data
-if( isset( $_POST['identity'] ) ){
+if( isset( $_POST['identity'] ) ) {
 	$identity=$_POST['identity'];
-	OC_Preferences::setValue(OC_User::getUser(),'user_openid','identity',$identity);
+	OC_Preferences::setValue(OC_User::getUser(), 'user_openid', 'identity', $identity);
 	OC_JSON::success(array("data" => array( "message" => $l->t("OpenID Changed") )));
 }else{
 	OC_JSON::error(array("data" => array( "message" => $l->t("Invalid request") )));

From b49e8cd04d77c4b9ed139cb85ca002d551214943 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Tue, 4 Sep 2012 12:49:50 +0300
Subject: [PATCH 1076/1224] Update settings/ajax/removegroup.php

respect coding style
---
 settings/ajax/removegroup.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/settings/ajax/removegroup.php b/settings/ajax/removegroup.php
index f8c2065956..cd1b8faf26 100644
--- a/settings/ajax/removegroup.php
+++ b/settings/ajax/removegroup.php
@@ -1,7 +1,7 @@
 <?php
 
 // Init owncloud
-require_once('../../lib/base.php');
+require_once '../../lib/base.php';
 
 OC_JSON::checkAdminUser();
 OCP\JSON::callCheck();
@@ -9,7 +9,7 @@ OCP\JSON::callCheck();
 $name = $_POST["groupname"];
 
 // Return Success story
-if( OC_Group::deleteGroup( $name )){
+if( OC_Group::deleteGroup( $name )) {
 	OC_JSON::success(array("data" => array( "groupname" => $name )));
 }
 else{

From 04aea1eb2ed0530f05928f680568c136acb1d5e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Tue, 4 Sep 2012 12:50:16 +0300
Subject: [PATCH 1077/1224] Update settings/ajax/removegroup.php

$l->t added for error message
---
 settings/ajax/removegroup.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings/ajax/removegroup.php b/settings/ajax/removegroup.php
index cd1b8faf26..33e1a514c8 100644
--- a/settings/ajax/removegroup.php
+++ b/settings/ajax/removegroup.php
@@ -13,5 +13,5 @@ if( OC_Group::deleteGroup( $name )) {
 	OC_JSON::success(array("data" => array( "groupname" => $name )));
 }
 else{
-	OC_JSON::error(array("data" => array( "message" => "Unable to delete group" )));
+	OC_JSON::error(array("data" => array( "message" => $l->t("Unable to delete group") )));
 }

From de987b475d2e2868e1ef144cc7df091893e73b66 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Tue, 4 Sep 2012 12:51:04 +0300
Subject: [PATCH 1078/1224] Update settings/ajax/removeuser.php

respect coding style
---
 settings/ajax/removeuser.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/settings/ajax/removeuser.php b/settings/ajax/removeuser.php
index bfab13a68c..666adb09d2 100644
--- a/settings/ajax/removeuser.php
+++ b/settings/ajax/removeuser.php
@@ -1,21 +1,21 @@
 <?php
 
 // Init owncloud
-require_once('../../lib/base.php');
+require_once '../../lib/base.php';
 
 OC_JSON::checkSubAdminUser();
 OCP\JSON::callCheck();
 
 $username = $_POST["username"];
 
-if(!OC_Group::inGroup(OC_User::getUser(), 'admin') && !OC_SubAdmin::isUserAccessible(OC_User::getUser(), $username)){
+if(!OC_Group::inGroup(OC_User::getUser(), 'admin') && !OC_SubAdmin::isUserAccessible(OC_User::getUser(), $username)) {
 	$l = OC_L10N::get('core');
 	OC_JSON::error(array( 'data' => array( 'message' => $l->t('Authentication error') )));
 	exit();
 }
 
 // Return Success story
-if( OC_User::deleteUser( $username )){
+if( OC_User::deleteUser( $username )) {
 	OC_JSON::success(array("data" => array( "username" => $username )));
 }
 else{

From 93496a32cc3c28d36936d089857dd6fca870c0f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Tue, 4 Sep 2012 12:54:04 +0300
Subject: [PATCH 1079/1224] Update settings/ajax/removeuser.php

$l->t added for error message
---
 settings/ajax/removeuser.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings/ajax/removeuser.php b/settings/ajax/removeuser.php
index 666adb09d2..6b11fa5c4f 100644
--- a/settings/ajax/removeuser.php
+++ b/settings/ajax/removeuser.php
@@ -19,5 +19,5 @@ if( OC_User::deleteUser( $username )) {
 	OC_JSON::success(array("data" => array( "username" => $username )));
 }
 else{
-	OC_JSON::error(array("data" => array( "message" => "Unable to delete user" )));
+	OC_JSON::error(array("data" => array( "message" => $l->t("Unable to delete user") )));
 }

From dafe28e079bd1458b19d6951401924651d622781 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Tue, 4 Sep 2012 12:54:36 +0300
Subject: [PATCH 1080/1224] Update settings/ajax/setlanguage.php

respect coding style
---
 settings/ajax/setlanguage.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/settings/ajax/setlanguage.php b/settings/ajax/setlanguage.php
index 54b103cd4f..42eea7a96f 100644
--- a/settings/ajax/setlanguage.php
+++ b/settings/ajax/setlanguage.php
@@ -1,7 +1,7 @@
 <?php
 
 // Init owncloud
-require_once('../../lib/base.php');
+require_once '../../lib/base.php';
 
 $l=OC_L10N::get('settings');
 
@@ -10,10 +10,10 @@ OCP\JSON::callCheck();
 
 
 // Get data
-if( isset( $_POST['lang'] ) ){
+if( isset( $_POST['lang'] ) ) {
 	$languageCodes=OC_L10N::findAvailableLanguages();
 	$lang=$_POST['lang'];
-	if(array_search($lang,$languageCodes) or $lang=='en'){
+	if(array_search($lang, $languageCodes) or $lang=='en') {
 		OC_Preferences::setValue( OC_User::getUser(), 'core', 'lang', $lang );
 		OC_JSON::success(array("data" => array( "message" => $l->t("Language changed") )));
 	}else{

From 9a8a1017567c309b638d96bb8559389fc0033a99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Tue, 4 Sep 2012 12:55:20 +0300
Subject: [PATCH 1081/1224] Update settings/ajax/setloglevel.php

respect coding style
---
 settings/ajax/setloglevel.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/settings/ajax/setloglevel.php b/settings/ajax/setloglevel.php
index 4b97ba2aa3..982899e106 100644
--- a/settings/ajax/setloglevel.php
+++ b/settings/ajax/setloglevel.php
@@ -5,12 +5,10 @@
  * See the COPYING-README file.
  */
 
-require_once('../../lib/base.php');
+require_once '../../lib/base.php';
 OC_Util::checkAdminUser();
 OCP\JSON::callCheck();
 
 OC_Config::setValue( 'loglevel', $_POST['level'] );
 
 echo 'true';
-
-?>
\ No newline at end of file

From 4b3fc27a22214c322bf804b36043591a731183e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Tue, 4 Sep 2012 12:58:07 +0300
Subject: [PATCH 1082/1224] Update settings/ajax/togglegroups.php

respect coding style
---
 settings/ajax/togglegroups.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/settings/ajax/togglegroups.php b/settings/ajax/togglegroups.php
index 75cd0858bb..ab7c22fba3 100644
--- a/settings/ajax/togglegroups.php
+++ b/settings/ajax/togglegroups.php
@@ -1,7 +1,7 @@
 <?php
 
 // Init owncloud
-require_once('../../lib/base.php');
+require_once '../../lib/base.php';
 
 OC_JSON::checkSubAdminUser();
 OCP\JSON::callCheck();
@@ -13,23 +13,23 @@ $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))){
+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)){
+if(!OC_Group::groupExists($group)) {
 	OC_Group::createGroup($group);
 }
 
 // Toggle group
-if( OC_Group::inGroup( $username, $group )){
+if( OC_Group::inGroup( $username, $group )) {
 	$action = "remove";
 	$error = "remove user from";
 	$success = OC_Group::removeFromGroup( $username, $group );
 	$usersInGroup=OC_Group::usersInGroup($group);
-	if(count($usersInGroup)==0){
+	if(count($usersInGroup)==0) {
 		OC_Group::deleteGroup($group);
 	}
 }
@@ -38,7 +38,7 @@ else{
 }
 
 // Return Success story
-if( $success ){
+if( $success ) {
 	OC_JSON::success(array("data" => array( "username" => $username, "action" => $action, "groupname" => $group )));
 }
 else{

From b698fab10934d34b4dc29eb36027a2bb40f98351 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Tue, 4 Sep 2012 13:00:56 +0300
Subject: [PATCH 1083/1224] Update settings/ajax/userlist.php

respect coding style
---
 settings/ajax/userlist.php | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/settings/ajax/userlist.php b/settings/ajax/userlist.php
index b89b8c55ef..840b6d72dc 100644
--- a/settings/ajax/userlist.php
+++ b/settings/ajax/userlist.php
@@ -33,13 +33,20 @@ $users = array();
 if (OC_Group::inGroup(OC_User::getUser(), 'admin')) {
 	$batch = OC_User::getUsers('', 10, $offset);
 	foreach ($batch as $user) {
-		$users[] = array('name' => $user, 'groups' => join(', ', OC_Group::getUserGroups($user)), 'subadmin' => join(', ',OC_SubAdmin::getSubAdminsGroups($user)), 'quota' => OC_Preferences::getValue($user, 'files', 'quota', 'default'));
+		$users[] = array(
+			'name' => $user, 
+			'groups' => join(', ', OC_Group::getUserGroups($user)), 
+			'subadmin' => join(', ', OC_SubAdmin::getSubAdminsGroups($user)), 
+			'quota' => OC_Preferences::getValue($user, 'files', 'quota', 'default'));
 	}
 } else {
 	$groups = OC_SubAdmin::getSubAdminsGroups(OC_User::getUser());
 	$batch = OC_Group::usersInGroups($groups, '', 10, $offset);
 	foreach ($batch as $user) {
-		$users[] = array('name' => $user, 'groups' => join(', ', OC_Group::getUserGroups($user)), 'quota' => OC_Preferences::getValue($user, 'files', 'quota', 'default'));
+		$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

From f3e330ce64a75eff637a31ef6095f989b344db24 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Tue, 4 Sep 2012 13:03:51 +0300
Subject: [PATCH 1084/1224] Update settings/templates/help.php

respect coding style
---
 settings/templates/help.php | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/settings/templates/help.php b/settings/templates/help.php
index a53ec76d68..b2a78ff851 100644
--- a/settings/templates/help.php
+++ b/settings/templates/help.php
@@ -1,4 +1,5 @@
-<?php /**
+<?php 
+/**
  * 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.
@@ -10,7 +11,7 @@
 	<a class="button newquestion" href="http://apps.owncloud.com/knowledgebase/editquestion.php?action=new" target="_blank"><?php echo $l->t( 'Ask a question' ); ?></a>
 	<?php
 		$url=OC_Helper::linkTo( "settings", "help.php" ).'?page=';
-		$pageNavi=OC_Util::getPageNavi($_['pagecount'],$_['page'],$url);
+		$pageNavi=OC_Util::getPageNavi($_['pagecount'], $_['page'], $url);
 		if($pageNavi)
 		{
 			$pageNavi->printPage();
@@ -25,7 +26,7 @@
 <?php else:?>
 	<?php foreach($_["kbe"] as $kb): ?>
 	<div class="helpblock">
-		<?php if($kb["preview1"] <> "") { echo('<img class="preview" src="'.$kb["preview1"].'" />'); } ?>
+		<?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>');?>

From 409ede09756f0eb67e2fedf8c4febf08ed5ce171 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Tue, 4 Sep 2012 13:05:09 +0300
Subject: [PATCH 1085/1224] Update settings/templates/users.php

respect coding style
---
 settings/templates/users.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/settings/templates/users.php b/settings/templates/users.php
index 295b7761cf..d862fa1cad 100644
--- a/settings/templates/users.php
+++ b/settings/templates/users.php
@@ -45,7 +45,7 @@ var isadmin = <?php echo $_['isadmin']?'true':'false'; ?>;
 				</option>
 				<?php endif;?>
 				<?php endforeach;?>
-				<?php if(array_search($_['default_quota'],$_['quota_preset'])===false):?>
+				<?php if(array_search($_['default_quota'], $_['quota_preset'])===false):?>
 				<option selected="selected"
 					value='<?php echo $_['default_quota'];?>'>
 					<?php echo $_['default_quota'];?>
@@ -70,7 +70,7 @@ var isadmin = <?php echo $_['isadmin']?'true':'false'; ?>;
 
 <div id='notification'></div>
 
-<table data-groups="<?php echo implode(', ',$allGroups);?>">
+<table data-groups="<?php echo implode(', ', $allGroups);?>">
 	<thead>
 		<tr>
 			<th id='headerName'><?php echo $l->t('Name')?></th>
@@ -88,7 +88,7 @@ var isadmin = <?php echo $_['isadmin']?'true':'false'; ?>;
 		<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')?>"
+				src="<?php echo image_path('core', 'actions/rename.svg')?>"
 				alt="set new password" title="set new password"/>
 			</td>
 			<td class="groups"><select
@@ -129,7 +129,7 @@ var isadmin = <?php echo $_['isadmin']?'true':'false'; ?>;
 							<?php echo $preset;?>
 						</option>
 						<?php endforeach;?>
-						<?php if(array_search($user['quota'],$_['quota_preset'])===false):?>
+						<?php if(array_search($user['quota'], $_['quota_preset'])===false):?>
 						<option selected="selected" value='<?php echo $user['quota'];?>'>
 							<?php echo $user['quota'];?>
 						</option>
@@ -144,7 +144,7 @@ var isadmin = <?php echo $_['isadmin']?'true':'false'; ?>;
 			<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') ?>" />
+						<img src="<?php echo image_path('core', 'actions/delete.svg') ?>" />
 					</a>
 				<?php endif;?>
 			</td>

From c252de56d095d452f0a0b47e236b7ce5b478e785 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Tue, 4 Sep 2012 13:06:03 +0300
Subject: [PATCH 1086/1224] Update search/index.php

respect coding style
---
 search/index.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/search/index.php b/search/index.php
index de55aec399..958065dc40 100644
--- a/search/index.php
+++ b/search/index.php
@@ -23,7 +23,7 @@
 
 
 // Init owncloud
-require_once('../lib/base.php');
+require_once '../lib/base.php';
 
 // Check if we are a user
 OC_Util::checkLoggedIn();
@@ -32,7 +32,7 @@ OC_Util::checkLoggedIn();
 OC_Util::addStyle( 'search', 'search' );
 
 $query=(isset($_POST['query']))?$_POST['query']:'';
-if($query){
+if($query) {
 	$results=OC_Search::search($query);
 }else{
 	OC_Util::redirectToDefaultPage();
@@ -40,12 +40,12 @@ if($query){
 
 $resultTypes=array();
 foreach($results as $result){
-	if(!isset($resultTypes[$result->type])){
+	if(!isset($resultTypes[$result->type])) {
 		$resultTypes[$result->type]=array();
 	}
 	$resultTypes[$result->type][]=$result;
 }
 
 $tmpl = new OC_Template( 'search', 'index', 'user' );
-$tmpl->assign('resultTypes',$resultTypes);
+$tmpl->assign('resultTypes', $resultTypes);
 $tmpl->printPage();

From 3ddd28b97223625963b9ae932aa34e0abd0e313f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Tue, 4 Sep 2012 13:06:55 +0300
Subject: [PATCH 1087/1224] Update files/webdav.php

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

diff --git a/files/webdav.php b/files/webdav.php
index cfbb3f486d..e7292d5a19 100644
--- a/files/webdav.php
+++ b/files/webdav.php
@@ -39,7 +39,7 @@ $server = new Sabre_DAV_Server($publicDir);
 $server->setBaseUri(OC::$WEBROOT. '/files/webdav.php');
 
 // Load plugins
-$server->addPlugin(new Sabre_DAV_Auth_Plugin($authBackend,'ownCloud'));
+$server->addPlugin(new Sabre_DAV_Auth_Plugin($authBackend, 'ownCloud'));
 $server->addPlugin(new Sabre_DAV_Locks_Plugin($lockBackend));
 $server->addPlugin(new Sabre_DAV_Browser_Plugin(false)); // Show something in the Browser, but no upload
 

From 395ea2a02853471478ff529a2dfbd8ba5787865e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Tue, 4 Sep 2012 13:08:55 +0300
Subject: [PATCH 1088/1224] Update core/lostpassword/index.php

respect coding style
---
 core/lostpassword/index.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/core/lostpassword/index.php b/core/lostpassword/index.php
index 58dab59732..3f58b03c98 100644
--- a/core/lostpassword/index.php
+++ b/core/lostpassword/index.php
@@ -7,7 +7,7 @@
 */
 
 $RUNTIME_NOAPPS = TRUE; //no apps
-require_once('../../lib/base.php');
+require_once '../../lib/base.php';
 
 
 // Someone lost their password:
@@ -23,20 +23,20 @@ if (isset($_POST['user'])) {
 			$msg = $tmpl->fetchPage();
 			$l = OC_L10N::get('core');
 			$from = 'lostpassword-noreply@' . OCP\Util::getServerHost();
-			OC_MAIL::send($email,$_POST['user'],$l->t('ownCloud password reset'),$msg,$from,'ownCloud');
+			OC_MAIL::send($email, $_POST['user'], $l->t('ownCloud password reset'), $msg, $from, 'ownCloud');
 			echo('sent');
 
 		}
-		$sectoken=rand(1000000,9999999);
+		$sectoken=rand(1000000, 9999999);
 		$_SESSION['sectoken']=$sectoken;
 		OC_Template::printGuestPage('core/lostpassword', 'lostpassword', array('error' => false, 'requested' => true, 'sectoken' => $sectoken));
 	} else {
-		$sectoken=rand(1000000,9999999);
+		$sectoken=rand(1000000, 9999999);
 		$_SESSION['sectoken']=$sectoken;
 		OC_Template::printGuestPage('core/lostpassword', 'lostpassword', array('error' => true, 'requested' => false, 'sectoken' => $sectoken));
 	}
 } else {
-	$sectoken=rand(1000000,9999999);
+	$sectoken=rand(1000000, 9999999);
 	$_SESSION['sectoken']=$sectoken;
 	OC_Template::printGuestPage('core/lostpassword', 'lostpassword', array('error' => false, 'requested' => false, 'sectoken' => $sectoken));
 }

From 97e4647ad57255f320b85de410f747961167cc88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Tue, 4 Sep 2012 13:09:25 +0300
Subject: [PATCH 1089/1224] Update core/lostpassword/resetpassword.php

---
 core/lostpassword/resetpassword.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/lostpassword/resetpassword.php b/core/lostpassword/resetpassword.php
index 33be9d7053..28a0063fc6 100644
--- a/core/lostpassword/resetpassword.php
+++ b/core/lostpassword/resetpassword.php
@@ -7,7 +7,7 @@
 */
 
 $RUNTIME_NOAPPS = TRUE; //no apps
-require_once('../../lib/base.php');
+require_once '../../lib/base.php';
 
 // Someone wants to reset their password:
 if(isset($_GET['token']) && isset($_GET['user']) && OC_Preferences::getValue($_GET['user'], 'owncloud', 'lostpassword') === $_GET['token']) {

From 6d358c051f1de1a717234e94ddbf6a63fbb57b02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Tue, 4 Sep 2012 13:10:14 +0300
Subject: [PATCH 1090/1224] Update core/lostpassword/templates/email.php

respect coding style
---
 core/lostpassword/templates/email.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/lostpassword/templates/email.php b/core/lostpassword/templates/email.php
index d146d8e4c3..bf025e4197 100644
--- a/core/lostpassword/templates/email.php
+++ b/core/lostpassword/templates/email.php
@@ -1 +1,2 @@
-<?php echo str_replace('{link}', $_['link'], $l->t('Use the following link to reset your password: {link}')) ?>
+<?php
+echo str_replace('{link}', $_['link'], $l->t('Use the following link to reset your password: {link}'))
\ No newline at end of file

From 9e5807d1f9ae1b33c5cdbd6a1a126ec52270865e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Tue, 4 Sep 2012 13:13:18 +0300
Subject: [PATCH 1091/1224] fixing syntax error - sorry for that

---
 core/lostpassword/templates/email.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/lostpassword/templates/email.php b/core/lostpassword/templates/email.php
index bf025e4197..b65049feff 100644
--- a/core/lostpassword/templates/email.php
+++ b/core/lostpassword/templates/email.php
@@ -1,2 +1,2 @@
 <?php
-echo str_replace('{link}', $_['link'], $l->t('Use the following link to reset your password: {link}'))
\ No newline at end of file
+echo str_replace('{link}', $_['link'], $l->t('Use the following link to reset your password: {link}'));
\ No newline at end of file

From 5bd4d6b0513dd7944641dfc4498b77f7c66da40b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Tue, 4 Sep 2012 13:17:14 +0300
Subject: [PATCH 1092/1224] Respect coding style

---
 core/ajax/translations.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/ajax/translations.php b/core/ajax/translations.php
index 2bd6b7ed63..75679da2c0 100644
--- a/core/ajax/translations.php
+++ b/core/ajax/translations.php
@@ -22,7 +22,7 @@
 */
 
 // Init owncloud
-require_once('../../lib/base.php');
+require_once '../../lib/base.php';
 
 $app = $_POST["app"];
 

From 6e76c59007ef51c78a056cb0be7e1f96f6e4a210 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Tue, 4 Sep 2012 13:18:11 +0300
Subject: [PATCH 1093/1224] Remove closing php tag

---
 core/ajax/share.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/core/ajax/share.php b/core/ajax/share.php
index debdf612c0..3ace97d4d0 100644
--- a/core/ajax/share.php
+++ b/core/ajax/share.php
@@ -135,5 +135,3 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo
 			break;
 	}
 }
-
-?>
\ No newline at end of file

From f4cace6cc1da872ac6a06cb5ccac7f0335be4261 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Tue, 4 Sep 2012 13:19:04 +0300
Subject: [PATCH 1094/1224] Respect coding style

---
 core/ajax/appconfig.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/core/ajax/appconfig.php b/core/ajax/appconfig.php
index bf749be3e3..3ad9e2326c 100644
--- a/core/ajax/appconfig.php
+++ b/core/ajax/appconfig.php
@@ -5,7 +5,7 @@
  * See the COPYING-README file.
  */
 
-require_once ("../../lib/base.php");
+require_once "../../lib/base.php";
 OC_Util::checkAdminUser();
 OCP\JSON::callCheck();
 
@@ -13,10 +13,10 @@ $action=isset($_POST['action'])?$_POST['action']:$_GET['action'];
 $result=false;
 switch($action){
 	case 'getValue':
-		$result=OC_Appconfig::getValue($_GET['app'],$_GET['key'],$_GET['defaultValue']);
+		$result=OC_Appconfig::getValue($_GET['app'], $_GET['key'], $_GET['defaultValue']);
 		break;
 	case 'setValue':
-		$result=OC_Appconfig::setValue($_POST['app'],$_POST['key'],$_POST['value']);
+		$result=OC_Appconfig::setValue($_POST['app'], $_POST['key'], $_POST['value']);
 		break;
 	case 'getApps':
 		$result=OC_Appconfig::getApps();
@@ -25,10 +25,10 @@ switch($action){
 		$result=OC_Appconfig::getKeys($_GET['app']);
 		break;
 	case 'hasKey':
-		$result=OC_Appconfig::hasKey($_GET['app'],$_GET['key']);
+		$result=OC_Appconfig::hasKey($_GET['app'], $_GET['key']);
 		break;
 	case 'deleteKey':
-		$result=OC_Appconfig::deleteKey($_POST['app'],$_POST['key']);
+		$result=OC_Appconfig::deleteKey($_POST['app'], $_POST['key']);
 		break;
 	case 'deleteApp':
 		$result=OC_Appconfig::deleteApp($_POST['app']);

From ff8b8909c1116551bff14853bcc4d930e10a1664 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Tue, 4 Sep 2012 13:19:44 +0300
Subject: [PATCH 1095/1224] Respect coding style

---
 core/ajax/vcategories/add.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/ajax/vcategories/add.php b/core/ajax/vcategories/add.php
index e69f8bb726..81fa06dbf1 100644
--- a/core/ajax/vcategories/add.php
+++ b/core/ajax/vcategories/add.php
@@ -7,14 +7,14 @@
  */
 function bailOut($msg) {
 	OC_JSON::error(array('data' => array('message' => $msg)));
-	OC_Log::write('core','ajax/vcategories/add.php: '.$msg, OC_Log::DEBUG);
+	OC_Log::write('core', 'ajax/vcategories/add.php: '.$msg, OC_Log::DEBUG);
 	exit();
 }
 function debug($msg) {
-	OC_Log::write('core','ajax/vcategories/add.php: '.$msg, OC_Log::DEBUG);
+	OC_Log::write('core', 'ajax/vcategories/add.php: '.$msg, OC_Log::DEBUG);
 }
 
-require_once('../../../lib/base.php');
+require_once '../../../lib/base.php';
 OC_JSON::checkLoggedIn();
 $category = isset($_GET['category'])?strip_tags($_GET['category']):null;
 $app = isset($_GET['app'])?$_GET['app']:null;

From ae678414611e8f2a8cab488a51db8c54088ed2e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Tue, 4 Sep 2012 13:21:00 +0300
Subject: [PATCH 1096/1224] Respect coding style

---
 core/ajax/vcategories/delete.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/ajax/vcategories/delete.php b/core/ajax/vcategories/delete.php
index a41fa083c3..cd46a25b79 100644
--- a/core/ajax/vcategories/delete.php
+++ b/core/ajax/vcategories/delete.php
@@ -8,14 +8,14 @@
 
 function bailOut($msg) {
 	OC_JSON::error(array('data' => array('message' => $msg)));
-	OC_Log::write('core','ajax/vcategories/delete.php: '.$msg, OC_Log::DEBUG);
+	OC_Log::write('core', 'ajax/vcategories/delete.php: '.$msg, OC_Log::DEBUG);
 	exit();
 }
 function debug($msg) {
-	OC_Log::write('core','ajax/vcategories/delete.php: '.$msg, OC_Log::DEBUG);
+	OC_Log::write('core', 'ajax/vcategories/delete.php: '.$msg, OC_Log::DEBUG);
 }
 
-require_once('../../../lib/base.php');
+require_once '../../../lib/base.php';
 OC_JSON::checkLoggedIn();
 $app = isset($_POST['app'])?$_POST['app']:null;
 $categories = isset($_POST['categories'])?$_POST['categories']:null;

From 5868f834c8e38e211759bc1fd31949d77c55fb6a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Tue, 4 Sep 2012 13:21:36 +0300
Subject: [PATCH 1097/1224] Respect coding style

---
 core/ajax/vcategories/edit.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/core/ajax/vcategories/edit.php b/core/ajax/vcategories/edit.php
index 3e5540cbc2..a0e67841c5 100644
--- a/core/ajax/vcategories/edit.php
+++ b/core/ajax/vcategories/edit.php
@@ -8,14 +8,14 @@
 
 function bailOut($msg) {
 	OC_JSON::error(array('data' => array('message' => $msg)));
-	OC_Log::write('core','ajax/vcategories/edit.php: '.$msg, OC_Log::DEBUG);
+	OC_Log::write('core', 'ajax/vcategories/edit.php: '.$msg, OC_Log::DEBUG);
 	exit();
 }
 function debug($msg) {
-	OC_Log::write('core','ajax/vcategories/edit.php: '.$msg, OC_Log::DEBUG);
+	OC_Log::write('core', 'ajax/vcategories/edit.php: '.$msg, OC_Log::DEBUG);
 }
 
-require_once('../../../lib/base.php');
+require_once '../../../lib/base.php';
 OC_JSON::checkLoggedIn();
 $app = isset($_GET['app'])?$_GET['app']:null;
 
@@ -29,5 +29,5 @@ $tmpl = new OC_TEMPLATE("core", "edit_categories_dialog");
 $vcategories = new OC_VCategories($app);
 $categories = $vcategories->categories();
 debug(print_r($categories, true));
-$tmpl->assign('categories',$categories);
+$tmpl->assign('categories', $categories);
 $tmpl->printpage();

From 3d74c5b3ec6758fadeb641bf6b215c42b355ec5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Tue, 4 Sep 2012 13:25:53 +0300
Subject: [PATCH 1098/1224] Respect coding style

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

diff --git a/ocs/providers.php b/ocs/providers.php
index cc6de32266..4c68ded914 100644
--- a/ocs/providers.php
+++ b/ocs/providers.php
@@ -21,9 +21,9 @@
 * 
 */
 
-require_once('../lib/base.php');
+require_once '../lib/base.php';
 
-$url='http://'.substr(OCP\Util::getServerHost().$_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 a3cda32392b2c605427de2aff4898b509680a6f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Tue, 4 Sep 2012 13:26:13 +0300
Subject: [PATCH 1099/1224] Respect coding style

---
 ocs/v1.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ocs/v1.php b/ocs/v1.php
index ab0dc80f4b..b12ea5ef18 100644
--- a/ocs/v1.php
+++ b/ocs/v1.php
@@ -21,6 +21,6 @@
 * 
 */
 
-require_once('../lib/base.php');
+require_once '../lib/base.php';
 @ob_clean();
 OC_OCS::handle();

From 9760b5e1531fd48a5744750e5eeec1d448b305f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Tue, 4 Sep 2012 13:32:27 +0300
Subject: [PATCH 1100/1224] Respect coding style

---
 lib/app.php | 100 ++++++++++++++++++++++++++--------------------------
 1 file changed, 50 insertions(+), 50 deletions(-)

diff --git a/lib/app.php b/lib/app.php
index 261f079399..154b1a964e 100755
--- a/lib/app.php
+++ b/lib/app.php
@@ -54,14 +54,14 @@ class OC_App{
 		// prevent app.php from printing output
 		ob_start();
 		foreach( $apps as $app ){
-			if((is_null($types) or self::isType($app,$types)) && !in_array($app, self::$loadedApps)){
+			if((is_null($types) or self::isType($app, $types)) && !in_array($app, self::$loadedApps)) {
 				self::loadApp($app);
 				self::$loadedApps[] = $app;
 			}
 		}
 		ob_end_clean();
 
-		if (!defined('DEBUG') || !DEBUG){
+		if (!defined('DEBUG') || !DEBUG) {
 			if (is_null($types)) {
 				OC_Util::$core_scripts = OC_Util::$scripts;
 				OC_Util::$scripts = array();
@@ -82,10 +82,10 @@ class OC_App{
 	 * load a single app
 	 * @param string app
 	 */
-	public static function loadApp($app){
+	public static function loadApp($app) {
 		if(is_file(self::getAppPath($app).'/appinfo/app.php')){
 			self::checkUpgrade($app);
-			require_once( $app.'/appinfo/app.php' );
+			require_once $app.'/appinfo/app.php';
 		}
 	}
 
@@ -95,12 +95,12 @@ class OC_App{
 	 * @param string/array $types
 	 */
 	public static function isType($app,$types){
-		if(is_string($types)){
+		if(is_string($types)) {
 			$types=array($types);
 		}
 		$appTypes=self::getAppTypes($app);
 		foreach($types as $type){
-			if(array_search($type,$appTypes)!==false){
+			if(array_search($type, $appTypes)!==false) {
 				return true;
 			}
 		}
@@ -114,12 +114,12 @@ class OC_App{
 	 */
 	private static function getAppTypes($app){
 		//load the cache
-		if(count(self::$appTypes)==0){
-			self::$appTypes=OC_Appconfig::getValues(false,'types');
+		if(count(self::$appTypes)==0) {
+			self::$appTypes=OC_Appconfig::getValues(false, 'types');
 		}
 
-		if(isset(self::$appTypes[$app])){
-			return explode(',',self::$appTypes[$app]);
+		if(isset(self::$appTypes[$app])) {
+			return explode(',', self::$appTypes[$app]);
 		}else{
 			return array();
 		}
@@ -131,13 +131,13 @@ class OC_App{
 	public static function setAppTypes($app){
 		$appData=self::getAppInfo($app);
 
-		if(isset($appData['types'])){
-			$appTypes=implode(',',$appData['types']);
+		if(isset($appData['types'])) {
+			$appTypes=implode(',', $appData['types']);
 		}else{
 			$appTypes='';
 		}
 
-		OC_Appconfig::setValue($app,'types',$appTypes);
+		OC_Appconfig::setValue($app, 'types', $appTypes);
 	}
 
 	/**
@@ -150,7 +150,7 @@ class OC_App{
 		$query = OC_DB::prepare( 'SELECT `appid` FROM `*PREFIX*appconfig` WHERE `configkey` = \'enabled\' AND `configvalue`=\'yes\'' );
 		$result=$query->execute();
 		while($row=$result->fetchRow()){
-			if(array_search($row['appid'],$apps)===false){
+			if(array_search($row['appid'], $apps)===false) {
 				$apps[]=$row['appid'];
 			}
 		}
@@ -165,7 +165,7 @@ class OC_App{
 	 * This function checks whether or not an app is enabled.
 	 */
 	public static function isEnabled( $app ){
-		if( 'files'==$app or 'yes' == OC_Appconfig::getValue( $app, 'enabled' )){
+		if( 'files'==$app or 'yes' == OC_Appconfig::getValue( $app, 'enabled' )) {
 			return true;
 		}
 
@@ -180,23 +180,23 @@ class OC_App{
 	 * This function set an app as enabled in appconfig.
 	 */
 	public static function enable( $app ){
-		if(!OC_Installer::isInstalled($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)){
+			if(!is_numeric($app)) {
 				$app = OC_Installer::installShippedApp($app);
 			}else{
-				$download=OC_OCSClient::getApplicationDownload($app,1);
+				$download=OC_OCSClient::getApplicationDownload($app, 1);
 				if(isset($download['downloadlink']) and $download['downloadlink']!='') {
 					$app=OC_Installer::installApp(array('source'=>'http','href'=>$download['downloadlink']));
 				}
 			}
 		}
-		if($app!==false){
+		if($app!==false) {
 			// 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 "'.$info['name'].'" can\'t be installed because it is not compatible with this version of ownCloud',OC_Log::ERROR);
+			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{
 				OC_Appconfig::setValue( $app, 'enabled', 'yes' );
@@ -239,7 +239,7 @@ class OC_App{
 	 */
 	public static function addNavigationEntry( $data ){
 		$data['active']=false;
-		if(!isset($data['icon'])){
+		if(!isset($data['icon'])) {
 			$data['icon']='';
 		}
 		OC_App::$navigation[] = $data;
@@ -283,7 +283,7 @@ class OC_App{
 
 		$settings = array();
 		// by default, settings only contain the help menu
-		if(OC_Config::getValue('knowledgebaseenabled', true)==true){
+		if(OC_Config::getValue('knowledgebaseenabled', true)==true) {
 			$settings = array(
 				array( "id" => "help", "order" => 1000, "href" => OC_Helper::linkTo( "settings", "help.php" ), "name" => $l->t("Help"), "icon" => OC_Helper::imagePath( "settings", "help.svg" ))
 			);
@@ -300,7 +300,7 @@ class OC_App{
 				$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" )){
+			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" ));
 			}
@@ -323,7 +323,7 @@ class OC_App{
 	private static function proceedNavigation( $list ){
 		foreach( $list as &$naventry ){
 			$naventry['subnavigation'] = array();
-			if( $naventry['id'] == self::$activeapp ){
+			if( $naventry['id'] == self::$activeapp ) {
 				$naventry['active'] = true;
 			}
 			else{
@@ -349,7 +349,7 @@ class OC_App{
 				return $dir['path'];
 		}
 
-		OC_Log::write('core','No application directories are marked as writable.',OC_Log::ERROR);
+		OC_Log::write('core', 'No application directories are marked as writable.', OC_Log::ERROR);
 		return null;
 	}
 
@@ -391,7 +391,7 @@ class OC_App{
 	public static function getAppVersion($appid){
 		$file= self::getAppPath($appid).'/appinfo/version';
 		$version=@file_get_contents($file);
-		if($version){
+		if($version) {
 			return trim($version);
 		}else{
 			$appData=self::getAppInfo($appid);
@@ -406,17 +406,17 @@ class OC_App{
 	 * @returns array
 	*/
 	public static function getAppInfo($appid,$path=false){
-		if($path){
+		if($path) {
 			$file=$appid;
 		}else{
-			if(isset(self::$appInfo[$appid])){
+			if(isset(self::$appInfo[$appid])) {
 				return self::$appInfo[$appid];
 			}
 			$file= self::getAppPath($appid).'/appinfo/info.xml';
 		}
 		$data=array();
 		$content=@file_get_contents($file);
-		if(!$content){
+		if(!$content) {
 			return;
 		}
 		$xml = new SimpleXMLElement($content);
@@ -424,22 +424,22 @@ class OC_App{
 		$data['remote']=array();
 		$data['public']=array();
 		foreach($xml->children() as $child){
-			if($child->getName()=='remote'){
+			if($child->getName()=='remote') {
 				foreach($child->children() as $remote){
 					$data['remote'][$remote->getName()]=(string)$remote;
 				}
-			}elseif($child->getName()=='public'){
+			}elseif($child->getName()=='public') {
 				foreach($child->children() as $public){
 					$data['public'][$public->getName()]=(string)$public;
 				}
-			}elseif($child->getName()=='types'){
+			}elseif($child->getName()=='types') {
 				$data['types']=array();
 				foreach($child->children() as $type){
 					$data['types'][]=$type->getName();
 				}
-			}elseif($child->getName()=='description'){
+			}elseif($child->getName()=='description') {
 				$xml=(string)$child->asXML();
-				$data[$child->getName()]=substr($xml,13,-14);//script <description> tags
+				$data[$child->getName()]=substr($xml, 13, -14);//script <description> tags
 			}else{
 				$data[$child->getName()]=(string)$child;
 			}
@@ -469,11 +469,11 @@ class OC_App{
 	 * @return string
 	 */
 	public static function getCurrentApp(){
-		$script=substr($_SERVER["SCRIPT_NAME"],strlen(OC::$WEBROOT)+1);
-		$topFolder=substr($script,0,strpos($script,'/'));
-		if($topFolder=='apps'){
+		$script=substr($_SERVER["SCRIPT_NAME"], strlen(OC::$WEBROOT)+1);
+		$topFolder=substr($script, 0, strpos($script, '/'));
+		if($topFolder=='apps') {
 			$length=strlen($topFolder);
-			return substr($script,$length+1,strpos($script,'/',$length+1)-$length-1);
+			return substr($script, $length+1, strpos($script, '/', $length+1)-$length-1);
 		}else{
 			return $topFolder;
 		}
@@ -531,7 +531,7 @@ class OC_App{
 		foreach(OC::$APPSROOTS as $apps_dir) {
 			$dh=opendir($apps_dir['path']);
 			while($file=readdir($dh)){
-				if($file[0]!='.' and is_file($apps_dir['path'].'/'.$file.'/appinfo/app.php')){
+				if($file[0]!='.' and is_file($apps_dir['path'].'/'.$file.'/appinfo/app.php')) {
 					$apps[]=$file;
 				}
 			}
@@ -552,7 +552,7 @@ class OC_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_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));
 			}
@@ -573,8 +573,8 @@ class OC_App{
 		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'].'" ('.$app.') can\'t be used because it is not compatible with this version of ownCloud',OC_Log::ERROR);
+			if(!isset($info['require']) or ($version[0]>$info['require'])) {
+				OC_Log::write('core', 'App "'.$info['name'].'" ('.$app.') can\'t be used because it is not compatible with this version of ownCloud', OC_Log::ERROR);
 				OC_App::disable( $app );
 			}
 		}
@@ -602,13 +602,13 @@ class OC_App{
 	 * @param string appid
 	 */
 	public static function updateApp($appid){
-		if(file_exists(self::getAppPath($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)){
+		if(!self::isEnabled($appid)) {
 			return;
 		}
-		if(file_exists(self::getAppPath($appid).'/appinfo/update.php')){
+		if(file_exists(self::getAppPath($appid).'/appinfo/update.php')) {
 			self::loadApp($appid);
 			include self::getAppPath($appid).'/appinfo/update.php';
 		}
@@ -630,19 +630,19 @@ class OC_App{
 	 * @return OC_FilesystemView
 	 */
 	public static function getStorage($appid){
-		if(OC_App::isEnabled($appid)){//sanity check
-			if(OC_User::isLoggedIn()){
+		if(OC_App::isEnabled($appid)) {//sanity check
+			if(OC_User::isLoggedIn()) {
 				$view = new OC_FilesystemView('/'.OC_User::getUser());
 				if(!$view->file_exists($appid)) {
 					$view->mkdir($appid);
 				}
 				return new OC_FilesystemView('/'.OC_User::getUser().'/'.$appid);
 			}else{
-				OC_Log::write('core','Can\'t get app storage, app, user not logged in',OC_Log::ERROR);
+				OC_Log::write('core', 'Can\'t get app storage, app, user not logged in', OC_Log::ERROR);
 				return false;
 			}
 		}else{
-			OC_Log::write('core','Can\'t get app storage, app '.$appid.' not enabled',OC_Log::ERROR);
+			OC_Log::write('core', 'Can\'t get app storage, app '.$appid.' not enabled', OC_Log::ERROR);
 			false;
 		}
 	}

From acb96828074a7583de7b279ea37742bd51f3be3c Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <thomas.mueller@tmit.eu>
Date: Tue, 4 Sep 2012 12:43:53 +0200
Subject: [PATCH 1101/1224] [tx-robot] updated from transifex

---
 l10n/af/settings.po                 | 39 ++++++++++++++++++-------
 l10n/ar/settings.po                 | 39 ++++++++++++++++++-------
 l10n/ar_SA/settings.po              | 39 ++++++++++++++++++-------
 l10n/bg_BG/settings.po              | 39 ++++++++++++++++++-------
 l10n/ca/settings.po                 | 41 ++++++++++++++++++--------
 l10n/cs_CZ/settings.po              | 41 ++++++++++++++++++--------
 l10n/da/settings.po                 | 43 ++++++++++++++++++---------
 l10n/de/settings.po                 | 43 ++++++++++++++++++---------
 l10n/el/settings.po                 | 41 ++++++++++++++++++--------
 l10n/eo/settings.po                 | 41 ++++++++++++++++++--------
 l10n/es/settings.po                 | 41 ++++++++++++++++++--------
 l10n/et_EE/settings.po              | 41 ++++++++++++++++++--------
 l10n/eu/settings.po                 | 41 ++++++++++++++++++--------
 l10n/eu_ES/settings.po              | 39 ++++++++++++++++++-------
 l10n/fa/settings.po                 | 39 ++++++++++++++++++-------
 l10n/fi/settings.po                 | 39 ++++++++++++++++++-------
 l10n/fi_FI/settings.po              | 41 ++++++++++++++++++--------
 l10n/fr/settings.po                 | 43 ++++++++++++++++++---------
 l10n/gl/settings.po                 | 41 ++++++++++++++++++--------
 l10n/he/settings.po                 | 39 ++++++++++++++++++-------
 l10n/hi/settings.po                 | 39 ++++++++++++++++++-------
 l10n/hr/settings.po                 | 41 ++++++++++++++++++--------
 l10n/hu_HU/settings.po              | 41 ++++++++++++++++++--------
 l10n/hy/settings.po                 | 39 ++++++++++++++++++-------
 l10n/ia/settings.po                 | 39 ++++++++++++++++++-------
 l10n/id/settings.po                 | 39 ++++++++++++++++++-------
 l10n/id_ID/settings.po              | 39 ++++++++++++++++++-------
 l10n/it/settings.po                 | 43 ++++++++++++++++++---------
 l10n/ja_JP/settings.po              | 45 ++++++++++++++++++++---------
 l10n/ko/settings.po                 | 41 ++++++++++++++++++--------
 l10n/lb/settings.po                 | 41 ++++++++++++++++++--------
 l10n/lt_LT/settings.po              | 39 ++++++++++++++++++-------
 l10n/lv/settings.po                 | 41 ++++++++++++++++++--------
 l10n/mk/settings.po                 | 39 ++++++++++++++++++-------
 l10n/ms_MY/settings.po              | 41 ++++++++++++++++++--------
 l10n/nb_NO/settings.po              | 41 ++++++++++++++++++--------
 l10n/nl/settings.po                 | 41 ++++++++++++++++++--------
 l10n/nn_NO/settings.po              | 41 ++++++++++++++++++--------
 l10n/pl/settings.po                 | 41 ++++++++++++++++++--------
 l10n/pl_PL/settings.po              | 39 ++++++++++++++++++-------
 l10n/pt_BR/settings.po              | 41 ++++++++++++++++++--------
 l10n/pt_PT/settings.po              | 41 ++++++++++++++++++--------
 l10n/ro/settings.po                 | 41 ++++++++++++++++++--------
 l10n/ru/settings.po                 | 41 ++++++++++++++++++--------
 l10n/ru_RU/settings.po              | 39 ++++++++++++++++++-------
 l10n/sk_SK/settings.po              | 39 ++++++++++++++++++-------
 l10n/sl/settings.po                 | 43 ++++++++++++++++++---------
 l10n/so/settings.po                 | 39 ++++++++++++++++++-------
 l10n/sr/settings.po                 | 39 ++++++++++++++++++-------
 l10n/sr@latin/settings.po           | 39 ++++++++++++++++++-------
 l10n/sv/settings.po                 | 43 ++++++++++++++++++---------
 l10n/templates/core.pot             |  4 +--
 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/lib.pot              |  2 +-
 l10n/templates/settings.pot         | 35 ++++++++++++++++------
 l10n/templates/user_ldap.pot        |  2 +-
 l10n/th_TH/settings.po              | 43 ++++++++++++++++++---------
 l10n/tr/settings.po                 | 41 ++++++++++++++++++--------
 l10n/uk/settings.po                 | 39 ++++++++++++++++++-------
 l10n/vi/settings.po                 | 41 ++++++++++++++++++--------
 l10n/zh_CN.GB2312/settings.po       | 41 ++++++++++++++++++--------
 l10n/zh_CN/settings.po              | 41 ++++++++++++++++++--------
 l10n/zh_TW/settings.po              | 43 ++++++++++++++++++---------
 settings/l10n/ca.php                |  2 +-
 settings/l10n/cs_CZ.php             |  2 +-
 settings/l10n/da.php                |  2 +-
 settings/l10n/de.php                |  2 +-
 settings/l10n/el.php                |  2 +-
 settings/l10n/eo.php                |  2 +-
 settings/l10n/es.php                |  2 +-
 settings/l10n/et_EE.php             |  2 +-
 settings/l10n/eu.php                |  2 +-
 settings/l10n/fi_FI.php             |  2 +-
 settings/l10n/fr.php                |  2 +-
 settings/l10n/gl.php                |  2 +-
 settings/l10n/hr.php                |  2 +-
 settings/l10n/hu_HU.php             |  2 +-
 settings/l10n/it.php                |  2 +-
 settings/l10n/ja_JP.php             |  4 ++-
 settings/l10n/ko.php                |  2 +-
 settings/l10n/lb.php                |  2 +-
 settings/l10n/lv.php                |  2 +-
 settings/l10n/ms_MY.php             |  2 +-
 settings/l10n/nb_NO.php             |  2 +-
 settings/l10n/nl.php                |  2 +-
 settings/l10n/nn_NO.php             |  2 +-
 settings/l10n/pl.php                |  2 +-
 settings/l10n/pt_BR.php             |  2 +-
 settings/l10n/pt_PT.php             |  2 +-
 settings/l10n/ro.php                |  2 +-
 settings/l10n/ru.php                |  2 +-
 settings/l10n/sl.php                |  2 +-
 settings/l10n/sv.php                |  2 +-
 settings/l10n/th_TH.php             |  2 +-
 settings/l10n/tr.php                |  2 +-
 settings/l10n/vi.php                |  2 +-
 settings/l10n/zh_CN.GB2312.php      |  2 +-
 settings/l10n/zh_CN.php             |  2 +-
 settings/l10n/zh_TW.php             |  2 +-
 103 files changed, 1743 insertions(+), 738 deletions(-)

diff --git a/l10n/af/settings.po b/l10n/af/settings.po
index 1595e659d4..3011a18662 100644
--- a/l10n/af/settings.po
+++ b/l10n/af/settings.po
@@ -7,20 +7,33 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 13:35+0200\n"
-"PO-Revision-Date: 2012-09-01 11:35+0000\n"
+"POT-Creation-Date: 2012-09-04 12:42+0200\n"
+"PO-Revision-Date: 2012-09-04 10:42+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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: af\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ajax/apps/ocs.php:23
 msgid "Unable to load list from App Store"
 msgstr ""
 
+#: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr ""
+
+#: ajax/creategroup.php:19
+msgid "Group already exists"
+msgstr ""
+
+#: ajax/creategroup.php:28
+msgid "Unable to add group"
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr ""
@@ -37,8 +50,12 @@ msgstr ""
 msgid "Invalid request"
 msgstr ""
 
-#: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
-msgid "Authentication error"
+#: ajax/removegroup.php:16
+msgid "Unable to delete group"
+msgstr ""
+
+#: ajax/removeuser.php:22
+msgid "Unable to delete user"
 msgstr ""
 
 #: ajax/setlanguage.php:18
@@ -168,27 +185,27 @@ msgstr ""
 msgid "by"
 msgstr ""
 
-#: templates/help.php:8
+#: templates/help.php:9
 msgid "Documentation"
 msgstr ""
 
-#: templates/help.php:9
+#: templates/help.php:10
 msgid "Managing Big Files"
 msgstr ""
 
-#: templates/help.php:10
+#: templates/help.php:11
 msgid "Ask a question"
 msgstr ""
 
-#: templates/help.php:22
+#: templates/help.php:23
 msgid "Problems connecting to help database."
 msgstr ""
 
-#: templates/help.php:23
+#: templates/help.php:24
 msgid "Go there manually."
 msgstr ""
 
-#: templates/help.php:31
+#: templates/help.php:32
 msgid "Answer"
 msgstr ""
 
diff --git a/l10n/ar/settings.po b/l10n/ar/settings.po
index 4d45c84aa4..3de638d666 100644
--- a/l10n/ar/settings.po
+++ b/l10n/ar/settings.po
@@ -9,20 +9,33 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 13:35+0200\n"
-"PO-Revision-Date: 2012-09-01 11:35+0000\n"
+"POT-Creation-Date: 2012-09-04 12:42+0200\n"
+"PO-Revision-Date: 2012-09-04 10:42+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"
 "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"
+"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/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr ""
+
+#: ajax/creategroup.php:19
+msgid "Group already exists"
+msgstr ""
+
+#: ajax/creategroup.php:28
+msgid "Unable to add group"
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr ""
@@ -39,8 +52,12 @@ msgstr "تم تغيير ال OpenID"
 msgid "Invalid request"
 msgstr "طلبك غير مفهوم"
 
-#: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
-msgid "Authentication error"
+#: ajax/removegroup.php:16
+msgid "Unable to delete group"
+msgstr ""
+
+#: ajax/removeuser.php:22
+msgid "Unable to delete user"
 msgstr ""
 
 #: ajax/setlanguage.php:18
@@ -170,27 +187,27 @@ msgstr "-مسجل"
 msgid "by"
 msgstr "من قبل"
 
-#: templates/help.php:8
+#: templates/help.php:9
 msgid "Documentation"
 msgstr ""
 
-#: templates/help.php:9
+#: templates/help.php:10
 msgid "Managing Big Files"
 msgstr ""
 
-#: templates/help.php:10
+#: templates/help.php:11
 msgid "Ask a question"
 msgstr "إسأل سؤال"
 
-#: templates/help.php:22
+#: templates/help.php:23
 msgid "Problems connecting to help database."
 msgstr "الاتصال بقاعدة بيانات المساعدة لم يتم بنجاح"
 
-#: templates/help.php:23
+#: templates/help.php:24
 msgid "Go there manually."
 msgstr "إذهب هنالك بنفسك"
 
-#: templates/help.php:31
+#: templates/help.php:32
 msgid "Answer"
 msgstr "الجواب"
 
diff --git a/l10n/ar_SA/settings.po b/l10n/ar_SA/settings.po
index beb499e9f2..ee8598f1bf 100644
--- a/l10n/ar_SA/settings.po
+++ b/l10n/ar_SA/settings.po
@@ -7,20 +7,33 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 13:35+0200\n"
-"PO-Revision-Date: 2012-09-01 11:35+0000\n"
+"POT-Creation-Date: 2012-09-04 12:42+0200\n"
+"PO-Revision-Date: 2012-09-04 10:42+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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ar_SA\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ajax/apps/ocs.php:23
 msgid "Unable to load list from App Store"
 msgstr ""
 
+#: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr ""
+
+#: ajax/creategroup.php:19
+msgid "Group already exists"
+msgstr ""
+
+#: ajax/creategroup.php:28
+msgid "Unable to add group"
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr ""
@@ -37,8 +50,12 @@ msgstr ""
 msgid "Invalid request"
 msgstr ""
 
-#: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
-msgid "Authentication error"
+#: ajax/removegroup.php:16
+msgid "Unable to delete group"
+msgstr ""
+
+#: ajax/removeuser.php:22
+msgid "Unable to delete user"
 msgstr ""
 
 #: ajax/setlanguage.php:18
@@ -168,27 +185,27 @@ msgstr ""
 msgid "by"
 msgstr ""
 
-#: templates/help.php:8
+#: templates/help.php:9
 msgid "Documentation"
 msgstr ""
 
-#: templates/help.php:9
+#: templates/help.php:10
 msgid "Managing Big Files"
 msgstr ""
 
-#: templates/help.php:10
+#: templates/help.php:11
 msgid "Ask a question"
 msgstr ""
 
-#: templates/help.php:22
+#: templates/help.php:23
 msgid "Problems connecting to help database."
 msgstr ""
 
-#: templates/help.php:23
+#: templates/help.php:24
 msgid "Go there manually."
 msgstr ""
 
-#: templates/help.php:31
+#: templates/help.php:32
 msgid "Answer"
 msgstr ""
 
diff --git a/l10n/bg_BG/settings.po b/l10n/bg_BG/settings.po
index e05c9110f2..a2fc986bb2 100644
--- a/l10n/bg_BG/settings.po
+++ b/l10n/bg_BG/settings.po
@@ -10,20 +10,33 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 13:35+0200\n"
-"PO-Revision-Date: 2012-09-01 11:35+0000\n"
+"POT-Creation-Date: 2012-09-04 12:42+0200\n"
+"PO-Revision-Date: 2012-09-04 10:42+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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: bg_BG\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ajax/apps/ocs.php:23
 msgid "Unable to load list from App Store"
 msgstr ""
 
+#: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr ""
+
+#: ajax/creategroup.php:19
+msgid "Group already exists"
+msgstr ""
+
+#: ajax/creategroup.php:28
+msgid "Unable to add group"
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr "Е-пощата е записана"
@@ -40,8 +53,12 @@ msgstr "OpenID е сменено"
 msgid "Invalid request"
 msgstr "Невалидна заявка"
 
-#: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
-msgid "Authentication error"
+#: ajax/removegroup.php:16
+msgid "Unable to delete group"
+msgstr ""
+
+#: ajax/removeuser.php:22
+msgid "Unable to delete user"
 msgstr ""
 
 #: ajax/setlanguage.php:18
@@ -171,27 +188,27 @@ msgstr "-лицензирано"
 msgid "by"
 msgstr "от"
 
-#: templates/help.php:8
+#: templates/help.php:9
 msgid "Documentation"
 msgstr "Документация"
 
-#: templates/help.php:9
+#: templates/help.php:10
 msgid "Managing Big Files"
 msgstr ""
 
-#: templates/help.php:10
+#: templates/help.php:11
 msgid "Ask a question"
 msgstr "Задайте въпрос"
 
-#: templates/help.php:22
+#: templates/help.php:23
 msgid "Problems connecting to help database."
 msgstr "Проблеми при свързване с помощната база"
 
-#: templates/help.php:23
+#: templates/help.php:24
 msgid "Go there manually."
 msgstr "Отидете ръчно."
 
-#: templates/help.php:31
+#: templates/help.php:32
 msgid "Answer"
 msgstr "Отговор"
 
diff --git a/l10n/ca/settings.po b/l10n/ca/settings.po
index e15a614d68..3a8b55e793 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-09-04 02:01+0200\n"
-"PO-Revision-Date: 2012-09-03 10:06+0000\n"
-"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
+"POT-Creation-Date: 2012-09-04 12:42+0200\n"
+"PO-Revision-Date: 2012-09-04 10:42+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"
@@ -23,6 +23,19 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "No s'ha pogut carregar la llista des de l'App Store"
 
+#: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr "Error d'autenticació"
+
+#: ajax/creategroup.php:19
+msgid "Group already exists"
+msgstr ""
+
+#: ajax/creategroup.php:28
+msgid "Unable to add group"
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr "S'ha desat el correu electrònic"
@@ -39,9 +52,13 @@ msgstr "OpenID ha canviat"
 msgid "Invalid request"
 msgstr "Sol.licitud no vàlida"
 
-#: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
-msgid "Authentication error"
-msgstr "Error d'autenticació"
+#: ajax/removegroup.php:16
+msgid "Unable to delete group"
+msgstr ""
+
+#: ajax/removeuser.php:22
+msgid "Unable to delete user"
+msgstr ""
 
 #: ajax/setlanguage.php:18
 msgid "Language changed"
@@ -170,27 +187,27 @@ msgstr "- amb llicència"
 msgid "by"
 msgstr "de"
 
-#: templates/help.php:8
+#: templates/help.php:9
 msgid "Documentation"
 msgstr "Documentació"
 
-#: templates/help.php:9
+#: templates/help.php:10
 msgid "Managing Big Files"
 msgstr "Gestió de fitxers grans"
 
-#: templates/help.php:10
+#: templates/help.php:11
 msgid "Ask a question"
 msgstr "Feu una pregunta"
 
-#: templates/help.php:22
+#: templates/help.php:23
 msgid "Problems connecting to help database."
 msgstr "Problemes per connectar amb la base de dades d'ajuda."
 
-#: templates/help.php:23
+#: templates/help.php:24
 msgid "Go there manually."
 msgstr "Vés-hi manualment."
 
-#: templates/help.php:31
+#: templates/help.php:32
 msgid "Answer"
 msgstr "Resposta"
 
diff --git a/l10n/cs_CZ/settings.po b/l10n/cs_CZ/settings.po
index 394d3ebe64..bd57318d44 100644
--- a/l10n/cs_CZ/settings.po
+++ b/l10n/cs_CZ/settings.po
@@ -12,20 +12,33 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 13:35+0200\n"
-"PO-Revision-Date: 2012-09-01 11:35+0000\n"
+"POT-Creation-Date: 2012-09-04 12:42+0200\n"
+"PO-Revision-Date: 2012-09-04 10:42+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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: cs_CZ\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\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 "Nepodařílo se stáhnout seznam z App Store"
 
+#: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr "Chyba autorizace"
+
+#: ajax/creategroup.php:19
+msgid "Group already exists"
+msgstr ""
+
+#: ajax/creategroup.php:28
+msgid "Unable to add group"
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr "E-mail uložen"
@@ -42,9 +55,13 @@ msgstr "OpenID změněn"
 msgid "Invalid request"
 msgstr "Chybný dotaz"
 
-#: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
-msgid "Authentication error"
-msgstr "Chyba autorizace"
+#: ajax/removegroup.php:16
+msgid "Unable to delete group"
+msgstr ""
+
+#: ajax/removeuser.php:22
+msgid "Unable to delete user"
+msgstr ""
 
 #: ajax/setlanguage.php:18
 msgid "Language changed"
@@ -173,27 +190,27 @@ msgstr "-licencováno"
 msgid "by"
 msgstr "podle"
 
-#: templates/help.php:8
+#: templates/help.php:9
 msgid "Documentation"
 msgstr "Dokumentace"
 
-#: templates/help.php:9
+#: templates/help.php:10
 msgid "Managing Big Files"
 msgstr "Spravování velkých souborů"
 
-#: templates/help.php:10
+#: templates/help.php:11
 msgid "Ask a question"
 msgstr "Zeptat se"
 
-#: templates/help.php:22
+#: templates/help.php:23
 msgid "Problems connecting to help database."
 msgstr "Problémy s připojením k databázi s nápovědou."
 
-#: templates/help.php:23
+#: templates/help.php:24
 msgid "Go there manually."
 msgstr "Přejít ručně."
 
-#: templates/help.php:31
+#: templates/help.php:32
 msgid "Answer"
 msgstr "Odpověď"
 
diff --git a/l10n/da/settings.po b/l10n/da/settings.po
index 0e6fe9214b..48df28c6b1 100644
--- a/l10n/da/settings.po
+++ b/l10n/da/settings.po
@@ -15,20 +15,33 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-03 02:05+0200\n"
-"PO-Revision-Date: 2012-09-02 14:13+0000\n"
-"Last-Translator: muunsim <simon@rosmi.dk>\n"
+"POT-Creation-Date: 2012-09-04 12:42+0200\n"
+"PO-Revision-Date: 2012-09-04 10:42+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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: da\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ajax/apps/ocs.php:23
 msgid "Unable to load list from App Store"
 msgstr "Kunne ikke indlæse listen fra App Store"
 
+#: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr "Adgangsfejl"
+
+#: ajax/creategroup.php:19
+msgid "Group already exists"
+msgstr ""
+
+#: ajax/creategroup.php:28
+msgid "Unable to add group"
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr "Email adresse gemt"
@@ -45,9 +58,13 @@ msgstr "OpenID ændret"
 msgid "Invalid request"
 msgstr "Ugyldig forespørgsel"
 
-#: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
-msgid "Authentication error"
-msgstr "Adgangsfejl"
+#: ajax/removegroup.php:16
+msgid "Unable to delete group"
+msgstr ""
+
+#: ajax/removeuser.php:22
+msgid "Unable to delete user"
+msgstr ""
 
 #: ajax/setlanguage.php:18
 msgid "Language changed"
@@ -176,27 +193,27 @@ msgstr "-licenseret"
 msgid "by"
 msgstr "af"
 
-#: templates/help.php:8
+#: templates/help.php:9
 msgid "Documentation"
 msgstr "Dokumentation"
 
-#: templates/help.php:9
+#: templates/help.php:10
 msgid "Managing Big Files"
 msgstr "Håndter store filer"
 
-#: templates/help.php:10
+#: templates/help.php:11
 msgid "Ask a question"
 msgstr "Stil et spørgsmål"
 
-#: templates/help.php:22
+#: templates/help.php:23
 msgid "Problems connecting to help database."
 msgstr "Problemer med at forbinde til hjælpe-databasen."
 
-#: templates/help.php:23
+#: templates/help.php:24
 msgid "Go there manually."
 msgstr "Gå derhen manuelt."
 
-#: templates/help.php:31
+#: templates/help.php:32
 msgid "Answer"
 msgstr "Svar"
 
diff --git a/l10n/de/settings.po b/l10n/de/settings.po
index 4f41b94c0d..01a425d251 100644
--- a/l10n/de/settings.po
+++ b/l10n/de/settings.po
@@ -17,20 +17,33 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-03 02:05+0200\n"
-"PO-Revision-Date: 2012-09-02 20:12+0000\n"
-"Last-Translator: traductor <transifex.3.mensaje@spamgourmet.com>\n"
+"POT-Creation-Date: 2012-09-04 12:42+0200\n"
+"PO-Revision-Date: 2012-09-04 10:42+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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: de\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ajax/apps/ocs.php:23
 msgid "Unable to load list from App Store"
 msgstr "Die Liste der Apps im Store konnte nicht geladen werden."
 
+#: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr "Anmeldungsfehler"
+
+#: ajax/creategroup.php:19
+msgid "Group already exists"
+msgstr ""
+
+#: ajax/creategroup.php:28
+msgid "Unable to add group"
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr "E-Mail gespeichert"
@@ -47,9 +60,13 @@ msgstr "OpenID geändert"
 msgid "Invalid request"
 msgstr "Ungültige Anfrage"
 
-#: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
-msgid "Authentication error"
-msgstr "Anmeldungsfehler"
+#: ajax/removegroup.php:16
+msgid "Unable to delete group"
+msgstr ""
+
+#: ajax/removeuser.php:22
+msgid "Unable to delete user"
+msgstr ""
 
 #: ajax/setlanguage.php:18
 msgid "Language changed"
@@ -178,27 +195,27 @@ msgstr "-lizenziert"
 msgid "by"
 msgstr "von"
 
-#: templates/help.php:8
+#: templates/help.php:9
 msgid "Documentation"
 msgstr "Dokumentation"
 
-#: templates/help.php:9
+#: templates/help.php:10
 msgid "Managing Big Files"
 msgstr "Große Dateien verwalten"
 
-#: templates/help.php:10
+#: templates/help.php:11
 msgid "Ask a question"
 msgstr "Stellen Sie eine Frage"
 
-#: templates/help.php:22
+#: templates/help.php:23
 msgid "Problems connecting to help database."
 msgstr "Probleme bei der Verbindung zur Hilfe-Datenbank."
 
-#: templates/help.php:23
+#: templates/help.php:24
 msgid "Go there manually."
 msgstr "Datenbank direkt besuchen."
 
-#: templates/help.php:31
+#: templates/help.php:32
 msgid "Answer"
 msgstr "Antwort"
 
diff --git a/l10n/el/settings.po b/l10n/el/settings.po
index 4953e4d355..2592bb4253 100644
--- a/l10n/el/settings.po
+++ b/l10n/el/settings.po
@@ -14,20 +14,33 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 13:35+0200\n"
-"PO-Revision-Date: 2012-09-01 11:35+0000\n"
+"POT-Creation-Date: 2012-09-04 12:42+0200\n"
+"PO-Revision-Date: 2012-09-04 10:42+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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: el\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ajax/apps/ocs.php:23
 msgid "Unable to load list from App Store"
 msgstr "Σφάλμα στην φόρτωση της λίστας από το App Store"
 
+#: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr "Σφάλμα πιστοποίησης"
+
+#: ajax/creategroup.php:19
+msgid "Group already exists"
+msgstr ""
+
+#: ajax/creategroup.php:28
+msgid "Unable to add group"
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr "Το Email αποθηκεύτηκε "
@@ -44,9 +57,13 @@ msgstr "Το OpenID άλλαξε"
 msgid "Invalid request"
 msgstr "Μη έγκυρο αίτημα"
 
-#: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
-msgid "Authentication error"
-msgstr "Σφάλμα πιστοποίησης"
+#: ajax/removegroup.php:16
+msgid "Unable to delete group"
+msgstr ""
+
+#: ajax/removeuser.php:22
+msgid "Unable to delete user"
+msgstr ""
 
 #: ajax/setlanguage.php:18
 msgid "Language changed"
@@ -175,27 +192,27 @@ msgstr "-με άδεια"
 msgid "by"
 msgstr "από"
 
-#: templates/help.php:8
+#: templates/help.php:9
 msgid "Documentation"
 msgstr "Τεκμηρίωση"
 
-#: templates/help.php:9
+#: templates/help.php:10
 msgid "Managing Big Files"
 msgstr "Διαχείριση μεγάλων αρχείων"
 
-#: templates/help.php:10
+#: templates/help.php:11
 msgid "Ask a question"
 msgstr "Ρωτήστε μια ερώτηση"
 
-#: templates/help.php:22
+#: templates/help.php:23
 msgid "Problems connecting to help database."
 msgstr "Προβλήματα κατά τη σύνδεση με τη βάση δεδομένων βοήθειας."
 
-#: templates/help.php:23
+#: templates/help.php:24
 msgid "Go there manually."
 msgstr "Χειροκίνητη μετάβαση."
 
-#: templates/help.php:31
+#: templates/help.php:32
 msgid "Answer"
 msgstr "Απάντηση"
 
diff --git a/l10n/eo/settings.po b/l10n/eo/settings.po
index 745ce72a47..6389216930 100644
--- a/l10n/eo/settings.po
+++ b/l10n/eo/settings.po
@@ -9,20 +9,33 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 13:35+0200\n"
-"PO-Revision-Date: 2012-09-01 11:35+0000\n"
+"POT-Creation-Date: 2012-09-04 12:42+0200\n"
+"PO-Revision-Date: 2012-09-04 10:42+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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: eo\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ajax/apps/ocs.php:23
 msgid "Unable to load list from App Store"
 msgstr "Ne eblis ŝargi liston el aplikaĵovendejo"
 
+#: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr "Aŭtentiga eraro"
+
+#: ajax/creategroup.php:19
+msgid "Group already exists"
+msgstr ""
+
+#: ajax/creategroup.php:28
+msgid "Unable to add group"
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr "La retpoŝtadreso konserviĝis"
@@ -39,9 +52,13 @@ msgstr "La agordo de OpenID estas ŝanĝita"
 msgid "Invalid request"
 msgstr "Nevalida peto"
 
-#: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
-msgid "Authentication error"
-msgstr "Aŭtentiga eraro"
+#: ajax/removegroup.php:16
+msgid "Unable to delete group"
+msgstr ""
+
+#: ajax/removeuser.php:22
+msgid "Unable to delete user"
+msgstr ""
 
 #: ajax/setlanguage.php:18
 msgid "Language changed"
@@ -170,27 +187,27 @@ msgstr "-permesila"
 msgid "by"
 msgstr "de"
 
-#: templates/help.php:8
+#: templates/help.php:9
 msgid "Documentation"
 msgstr "Dokumentaro"
 
-#: templates/help.php:9
+#: templates/help.php:10
 msgid "Managing Big Files"
 msgstr "Administrante grandajn dosierojn"
 
-#: templates/help.php:10
+#: templates/help.php:11
 msgid "Ask a question"
 msgstr "Faru demandon"
 
-#: templates/help.php:22
+#: templates/help.php:23
 msgid "Problems connecting to help database."
 msgstr "Problemoj okazis dum konektado al la helpa datumbazo."
 
-#: templates/help.php:23
+#: templates/help.php:24
 msgid "Go there manually."
 msgstr "Iri tien mane."
 
-#: templates/help.php:31
+#: templates/help.php:32
 msgid "Answer"
 msgstr "Respondi"
 
diff --git a/l10n/es/settings.po b/l10n/es/settings.po
index be7300b045..c8eaee979f 100644
--- a/l10n/es/settings.po
+++ b/l10n/es/settings.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-09-04 02:01+0200\n"
-"PO-Revision-Date: 2012-09-03 04:35+0000\n"
-"Last-Translator: juanman <juanma@kde.org.ar>\n"
+"POT-Creation-Date: 2012-09-04 12:42+0200\n"
+"PO-Revision-Date: 2012-09-04 10:42+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"
@@ -30,6 +30,19 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "Imposible cargar la lista desde el App Store"
 
+#: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr "Error de autenticación"
+
+#: ajax/creategroup.php:19
+msgid "Group already exists"
+msgstr ""
+
+#: ajax/creategroup.php:28
+msgid "Unable to add group"
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr "Correo guardado"
@@ -46,9 +59,13 @@ 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 "Error de autenticación"
+#: ajax/removegroup.php:16
+msgid "Unable to delete group"
+msgstr ""
+
+#: ajax/removeuser.php:22
+msgid "Unable to delete user"
+msgstr ""
 
 #: ajax/setlanguage.php:18
 msgid "Language changed"
@@ -177,27 +194,27 @@ msgstr "-autorizado"
 msgid "by"
 msgstr "por"
 
-#: templates/help.php:8
+#: templates/help.php:9
 msgid "Documentation"
 msgstr "Documentación"
 
-#: templates/help.php:9
+#: templates/help.php:10
 msgid "Managing Big Files"
 msgstr "Administra archivos grandes"
 
-#: templates/help.php:10
+#: templates/help.php:11
 msgid "Ask a question"
 msgstr "Hacer una pregunta"
 
-#: templates/help.php:22
+#: templates/help.php:23
 msgid "Problems connecting to help database."
 msgstr "Problemas al conectar con la base de datos de ayuda."
 
-#: templates/help.php:23
+#: templates/help.php:24
 msgid "Go there manually."
 msgstr "Ir manualmente"
 
-#: templates/help.php:31
+#: templates/help.php:32
 msgid "Answer"
 msgstr "Respuesta"
 
diff --git a/l10n/et_EE/settings.po b/l10n/et_EE/settings.po
index 259a824537..4c8dabda4a 100644
--- a/l10n/et_EE/settings.po
+++ b/l10n/et_EE/settings.po
@@ -9,20 +9,33 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 13:35+0200\n"
-"PO-Revision-Date: 2012-09-01 11:35+0000\n"
+"POT-Creation-Date: 2012-09-04 12:42+0200\n"
+"PO-Revision-Date: 2012-09-04 10:42+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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: et_EE\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ajax/apps/ocs.php:23
 msgid "Unable to load list from App Store"
 msgstr "App Sotre'i nimekirja laadimine ebaõnnestus"
 
+#: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr "Autentimise viga"
+
+#: ajax/creategroup.php:19
+msgid "Group already exists"
+msgstr ""
+
+#: ajax/creategroup.php:28
+msgid "Unable to add group"
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr "Kiri on salvestatud"
@@ -39,9 +52,13 @@ msgstr "OpenID on muudetud"
 msgid "Invalid request"
 msgstr "Vigane päring"
 
-#: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
-msgid "Authentication error"
-msgstr "Autentimise viga"
+#: ajax/removegroup.php:16
+msgid "Unable to delete group"
+msgstr ""
+
+#: ajax/removeuser.php:22
+msgid "Unable to delete user"
+msgstr ""
 
 #: ajax/setlanguage.php:18
 msgid "Language changed"
@@ -170,27 +187,27 @@ msgstr "-litsenseeritud"
 msgid "by"
 msgstr "kelle poolt"
 
-#: templates/help.php:8
+#: templates/help.php:9
 msgid "Documentation"
 msgstr "Dokumentatsioon"
 
-#: templates/help.php:9
+#: templates/help.php:10
 msgid "Managing Big Files"
 msgstr "Suurte failide haldamine"
 
-#: templates/help.php:10
+#: templates/help.php:11
 msgid "Ask a question"
 msgstr "Küsi küsimus"
 
-#: templates/help.php:22
+#: templates/help.php:23
 msgid "Problems connecting to help database."
 msgstr "Probleemid abiinfo andmebaasiga ühendumisel."
 
-#: templates/help.php:23
+#: templates/help.php:24
 msgid "Go there manually."
 msgstr "Mine sinna käsitsi."
 
-#: templates/help.php:31
+#: templates/help.php:32
 msgid "Answer"
 msgstr "Vasta"
 
diff --git a/l10n/eu/settings.po b/l10n/eu/settings.po
index b22e432ec7..c7fd18eb34 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-09-04 02:01+0200\n"
-"PO-Revision-Date: 2012-09-03 13:05+0000\n"
-"Last-Translator: asieriko <asieriko@gmail.com>\n"
+"POT-Creation-Date: 2012-09-04 12:42+0200\n"
+"PO-Revision-Date: 2012-09-04 10:42+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"
@@ -24,6 +24,19 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "Ezin izan da App Dendatik zerrenda kargatu"
 
+#: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr "Autentifikazio errorea"
+
+#: ajax/creategroup.php:19
+msgid "Group already exists"
+msgstr ""
+
+#: ajax/creategroup.php:28
+msgid "Unable to add group"
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr "Eposta gorde da"
@@ -40,9 +53,13 @@ msgstr "OpenID aldatuta"
 msgid "Invalid request"
 msgstr "Baliogabeko eskaria"
 
-#: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
-msgid "Authentication error"
-msgstr "Autentifikazio errorea"
+#: ajax/removegroup.php:16
+msgid "Unable to delete group"
+msgstr ""
+
+#: ajax/removeuser.php:22
+msgid "Unable to delete user"
+msgstr ""
 
 #: ajax/setlanguage.php:18
 msgid "Language changed"
@@ -171,27 +188,27 @@ msgstr "lizentziarekin"
 msgid "by"
 msgstr " Egilea:"
 
-#: templates/help.php:8
+#: templates/help.php:9
 msgid "Documentation"
 msgstr "Dokumentazioa"
 
-#: templates/help.php:9
+#: templates/help.php:10
 msgid "Managing Big Files"
 msgstr "Fitxategi handien kudeaketa"
 
-#: templates/help.php:10
+#: templates/help.php:11
 msgid "Ask a question"
 msgstr "Egin galdera bat"
 
-#: templates/help.php:22
+#: templates/help.php:23
 msgid "Problems connecting to help database."
 msgstr "Arazoak daude laguntza datubasera konektatzeko."
 
-#: templates/help.php:23
+#: templates/help.php:24
 msgid "Go there manually."
 msgstr "Joan hara eskuz."
 
-#: templates/help.php:31
+#: templates/help.php:32
 msgid "Answer"
 msgstr "Erantzun"
 
diff --git a/l10n/eu_ES/settings.po b/l10n/eu_ES/settings.po
index f3e0319075..a4cf700a20 100644
--- a/l10n/eu_ES/settings.po
+++ b/l10n/eu_ES/settings.po
@@ -7,20 +7,33 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 13:35+0200\n"
-"PO-Revision-Date: 2012-09-01 11:35+0000\n"
+"POT-Creation-Date: 2012-09-04 12:42+0200\n"
+"PO-Revision-Date: 2012-09-04 10:42+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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: eu_ES\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ajax/apps/ocs.php:23
 msgid "Unable to load list from App Store"
 msgstr ""
 
+#: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr ""
+
+#: ajax/creategroup.php:19
+msgid "Group already exists"
+msgstr ""
+
+#: ajax/creategroup.php:28
+msgid "Unable to add group"
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr ""
@@ -37,8 +50,12 @@ msgstr ""
 msgid "Invalid request"
 msgstr ""
 
-#: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
-msgid "Authentication error"
+#: ajax/removegroup.php:16
+msgid "Unable to delete group"
+msgstr ""
+
+#: ajax/removeuser.php:22
+msgid "Unable to delete user"
 msgstr ""
 
 #: ajax/setlanguage.php:18
@@ -168,27 +185,27 @@ msgstr ""
 msgid "by"
 msgstr ""
 
-#: templates/help.php:8
+#: templates/help.php:9
 msgid "Documentation"
 msgstr ""
 
-#: templates/help.php:9
+#: templates/help.php:10
 msgid "Managing Big Files"
 msgstr ""
 
-#: templates/help.php:10
+#: templates/help.php:11
 msgid "Ask a question"
 msgstr ""
 
-#: templates/help.php:22
+#: templates/help.php:23
 msgid "Problems connecting to help database."
 msgstr ""
 
-#: templates/help.php:23
+#: templates/help.php:24
 msgid "Go there manually."
 msgstr ""
 
-#: templates/help.php:31
+#: templates/help.php:32
 msgid "Answer"
 msgstr ""
 
diff --git a/l10n/fa/settings.po b/l10n/fa/settings.po
index d585c8edf8..17f939836a 100644
--- a/l10n/fa/settings.po
+++ b/l10n/fa/settings.po
@@ -9,20 +9,33 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 13:35+0200\n"
-"PO-Revision-Date: 2012-09-01 11:35+0000\n"
+"POT-Creation-Date: 2012-09-04 12:42+0200\n"
+"PO-Revision-Date: 2012-09-04 10:42+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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fa\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ajax/apps/ocs.php:23
 msgid "Unable to load list from App Store"
 msgstr ""
 
+#: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr ""
+
+#: ajax/creategroup.php:19
+msgid "Group already exists"
+msgstr ""
+
+#: ajax/creategroup.php:28
+msgid "Unable to add group"
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr "ایمیل ذخیره شد"
@@ -39,8 +52,12 @@ msgstr "OpenID تغییر کرد"
 msgid "Invalid request"
 msgstr "درخواست غیر قابل قبول"
 
-#: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
-msgid "Authentication error"
+#: ajax/removegroup.php:16
+msgid "Unable to delete group"
+msgstr ""
+
+#: ajax/removeuser.php:22
+msgid "Unable to delete user"
 msgstr ""
 
 #: ajax/setlanguage.php:18
@@ -170,27 +187,27 @@ msgstr "مجوزنامه"
 msgid "by"
 msgstr "به وسیله"
 
-#: templates/help.php:8
+#: templates/help.php:9
 msgid "Documentation"
 msgstr "مستندات"
 
-#: templates/help.php:9
+#: templates/help.php:10
 msgid "Managing Big Files"
 msgstr "مدیریت پرونده های بزرگ"
 
-#: templates/help.php:10
+#: templates/help.php:11
 msgid "Ask a question"
 msgstr "یک سوال بپرسید"
 
-#: templates/help.php:22
+#: templates/help.php:23
 msgid "Problems connecting to help database."
 msgstr "مشکلاتی برای وصل شدن به پایگاه داده کمکی"
 
-#: templates/help.php:23
+#: templates/help.php:24
 msgid "Go there manually."
 msgstr "بروید آنجا به صورت دستی"
 
-#: templates/help.php:31
+#: templates/help.php:32
 msgid "Answer"
 msgstr "پاسخ"
 
diff --git a/l10n/fi/settings.po b/l10n/fi/settings.po
index 47ea71f72a..e91b258aa2 100644
--- a/l10n/fi/settings.po
+++ b/l10n/fi/settings.po
@@ -7,20 +7,33 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 13:35+0200\n"
-"PO-Revision-Date: 2012-09-01 11:35+0000\n"
+"POT-Creation-Date: 2012-09-04 12:42+0200\n"
+"PO-Revision-Date: 2012-09-04 10:42+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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fi\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ajax/apps/ocs.php:23
 msgid "Unable to load list from App Store"
 msgstr ""
 
+#: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr ""
+
+#: ajax/creategroup.php:19
+msgid "Group already exists"
+msgstr ""
+
+#: ajax/creategroup.php:28
+msgid "Unable to add group"
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr ""
@@ -37,8 +50,12 @@ msgstr ""
 msgid "Invalid request"
 msgstr ""
 
-#: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
-msgid "Authentication error"
+#: ajax/removegroup.php:16
+msgid "Unable to delete group"
+msgstr ""
+
+#: ajax/removeuser.php:22
+msgid "Unable to delete user"
 msgstr ""
 
 #: ajax/setlanguage.php:18
@@ -168,27 +185,27 @@ msgstr ""
 msgid "by"
 msgstr ""
 
-#: templates/help.php:8
+#: templates/help.php:9
 msgid "Documentation"
 msgstr ""
 
-#: templates/help.php:9
+#: templates/help.php:10
 msgid "Managing Big Files"
 msgstr ""
 
-#: templates/help.php:10
+#: templates/help.php:11
 msgid "Ask a question"
 msgstr ""
 
-#: templates/help.php:22
+#: templates/help.php:23
 msgid "Problems connecting to help database."
 msgstr ""
 
-#: templates/help.php:23
+#: templates/help.php:24
 msgid "Go there manually."
 msgstr ""
 
-#: templates/help.php:31
+#: templates/help.php:32
 msgid "Answer"
 msgstr ""
 
diff --git a/l10n/fi_FI/settings.po b/l10n/fi_FI/settings.po
index 528da08db5..405a3a62d3 100644
--- a/l10n/fi_FI/settings.po
+++ b/l10n/fi_FI/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-09-04 02:01+0200\n"
-"PO-Revision-Date: 2012-09-03 16:42+0000\n"
-"Last-Translator: teho <tehoratopato@gmail.com>\n"
+"POT-Creation-Date: 2012-09-04 12:42+0200\n"
+"PO-Revision-Date: 2012-09-04 10:42+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"
@@ -24,6 +24,19 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "Ei pystytä lataamaan listaa sovellusvarastosta (App Store)"
 
+#: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr "Todennusvirhe"
+
+#: ajax/creategroup.php:19
+msgid "Group already exists"
+msgstr ""
+
+#: ajax/creategroup.php:28
+msgid "Unable to add group"
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr "Sähköposti tallennettu"
@@ -40,9 +53,13 @@ msgstr "OpenID on vaihdettu"
 msgid "Invalid request"
 msgstr "Virheellinen pyyntö"
 
-#: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
-msgid "Authentication error"
-msgstr "Todennusvirhe"
+#: ajax/removegroup.php:16
+msgid "Unable to delete group"
+msgstr ""
+
+#: ajax/removeuser.php:22
+msgid "Unable to delete user"
+msgstr ""
 
 #: ajax/setlanguage.php:18
 msgid "Language changed"
@@ -171,27 +188,27 @@ msgstr "-lisenssöity"
 msgid "by"
 msgstr "henkilölle"
 
-#: templates/help.php:8
+#: templates/help.php:9
 msgid "Documentation"
 msgstr "Dokumentaatio"
 
-#: templates/help.php:9
+#: templates/help.php:10
 msgid "Managing Big Files"
 msgstr "Suurten tiedostojen hallinta"
 
-#: templates/help.php:10
+#: templates/help.php:11
 msgid "Ask a question"
 msgstr "Kysy jotain"
 
-#: templates/help.php:22
+#: templates/help.php:23
 msgid "Problems connecting to help database."
 msgstr "Virhe yhdistettäessä tietokantaan."
 
-#: templates/help.php:23
+#: templates/help.php:24
 msgid "Go there manually."
 msgstr "Ohje löytyy sieltä."
 
-#: templates/help.php:31
+#: templates/help.php:32
 msgid "Answer"
 msgstr "Vastaus"
 
diff --git a/l10n/fr/settings.po b/l10n/fr/settings.po
index 8f41df09e8..0c8e1d758d 100644
--- a/l10n/fr/settings.po
+++ b/l10n/fr/settings.po
@@ -17,20 +17,33 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-02 02:01+0200\n"
-"PO-Revision-Date: 2012-09-01 16:35+0000\n"
-"Last-Translator: Romain DEP. <rom1dep@gmail.com>\n"
+"POT-Creation-Date: 2012-09-04 12:42+0200\n"
+"PO-Revision-Date: 2012-09-04 10:42+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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fr\n"
-"Plural-Forms: nplurals=2; plural=(n > 1)\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: ajax/apps/ocs.php:23
 msgid "Unable to load list from App Store"
 msgstr "Impossible de charger la liste depuis l'App Store"
 
+#: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr "Erreur d'authentification"
+
+#: ajax/creategroup.php:19
+msgid "Group already exists"
+msgstr ""
+
+#: ajax/creategroup.php:28
+msgid "Unable to add group"
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr "E-mail sauvegardé"
@@ -47,9 +60,13 @@ msgstr "Identifiant OpenID changé"
 msgid "Invalid request"
 msgstr "Requête invalide"
 
-#: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
-msgid "Authentication error"
-msgstr "Erreur d'authentification"
+#: ajax/removegroup.php:16
+msgid "Unable to delete group"
+msgstr ""
+
+#: ajax/removeuser.php:22
+msgid "Unable to delete user"
+msgstr ""
 
 #: ajax/setlanguage.php:18
 msgid "Language changed"
@@ -178,27 +195,27 @@ msgstr "sous licence"
 msgid "by"
 msgstr "par"
 
-#: templates/help.php:8
+#: templates/help.php:9
 msgid "Documentation"
 msgstr "Documentation"
 
-#: templates/help.php:9
+#: templates/help.php:10
 msgid "Managing Big Files"
 msgstr "Gérer les gros fichiers"
 
-#: templates/help.php:10
+#: templates/help.php:11
 msgid "Ask a question"
 msgstr "Poser une question"
 
-#: templates/help.php:22
+#: templates/help.php:23
 msgid "Problems connecting to help database."
 msgstr "Problème de connexion à la base de données d'aide."
 
-#: templates/help.php:23
+#: templates/help.php:24
 msgid "Go there manually."
 msgstr "S'y rendre manuellement."
 
-#: templates/help.php:31
+#: templates/help.php:32
 msgid "Answer"
 msgstr "Réponse"
 
diff --git a/l10n/gl/settings.po b/l10n/gl/settings.po
index b66625e6ad..abf9124621 100644
--- a/l10n/gl/settings.po
+++ b/l10n/gl/settings.po
@@ -9,20 +9,33 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 13:35+0200\n"
-"PO-Revision-Date: 2012-09-01 11:35+0000\n"
+"POT-Creation-Date: 2012-09-04 12:42+0200\n"
+"PO-Revision-Date: 2012-09-04 10:42+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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: gl\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ajax/apps/ocs.php:23
 msgid "Unable to load list from App Store"
 msgstr "Non se puido cargar a lista desde a App Store"
 
+#: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr "Erro na autenticación"
+
+#: ajax/creategroup.php:19
+msgid "Group already exists"
+msgstr ""
+
+#: ajax/creategroup.php:28
+msgid "Unable to add group"
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr "Correo electrónico gardado"
@@ -39,9 +52,13 @@ msgstr "Mudou o OpenID"
 msgid "Invalid request"
 msgstr "Petición incorrecta"
 
-#: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
-msgid "Authentication error"
-msgstr "Erro na autenticación"
+#: ajax/removegroup.php:16
+msgid "Unable to delete group"
+msgstr ""
+
+#: ajax/removeuser.php:22
+msgid "Unable to delete user"
+msgstr ""
 
 #: ajax/setlanguage.php:18
 msgid "Language changed"
@@ -170,27 +187,27 @@ msgstr "-licenciado"
 msgid "by"
 msgstr "por"
 
-#: templates/help.php:8
+#: templates/help.php:9
 msgid "Documentation"
 msgstr "Documentación"
 
-#: templates/help.php:9
+#: templates/help.php:10
 msgid "Managing Big Files"
 msgstr "Xestionar Grandes Ficheiros"
 
-#: templates/help.php:10
+#: templates/help.php:11
 msgid "Ask a question"
 msgstr "Pregunte"
 
-#: templates/help.php:22
+#: templates/help.php:23
 msgid "Problems connecting to help database."
 msgstr "Problemas conectando coa base de datos de axuda"
 
-#: templates/help.php:23
+#: templates/help.php:24
 msgid "Go there manually."
 msgstr "Ir manualmente."
 
-#: templates/help.php:31
+#: templates/help.php:32
 msgid "Answer"
 msgstr "Resposta"
 
diff --git a/l10n/he/settings.po b/l10n/he/settings.po
index 93491b67a7..1bad10caaf 100644
--- a/l10n/he/settings.po
+++ b/l10n/he/settings.po
@@ -10,20 +10,33 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 13:35+0200\n"
-"PO-Revision-Date: 2012-09-01 11:35+0000\n"
+"POT-Creation-Date: 2012-09-04 12:42+0200\n"
+"PO-Revision-Date: 2012-09-04 10:42+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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: he\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ajax/apps/ocs.php:23
 msgid "Unable to load list from App Store"
 msgstr ""
 
+#: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr ""
+
+#: ajax/creategroup.php:19
+msgid "Group already exists"
+msgstr ""
+
+#: ajax/creategroup.php:28
+msgid "Unable to add group"
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr "הדוא״ל נשמר"
@@ -40,8 +53,12 @@ msgstr "OpenID השתנה"
 msgid "Invalid request"
 msgstr "בקשה לא חוקית"
 
-#: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
-msgid "Authentication error"
+#: ajax/removegroup.php:16
+msgid "Unable to delete group"
+msgstr ""
+
+#: ajax/removeuser.php:22
+msgid "Unable to delete user"
 msgstr ""
 
 #: ajax/setlanguage.php:18
@@ -171,27 +188,27 @@ msgstr "רשיון"
 msgid "by"
 msgstr "מאת"
 
-#: templates/help.php:8
+#: templates/help.php:9
 msgid "Documentation"
 msgstr "תיעוד"
 
-#: templates/help.php:9
+#: templates/help.php:10
 msgid "Managing Big Files"
 msgstr "ניהול קבצים גדולים"
 
-#: templates/help.php:10
+#: templates/help.php:11
 msgid "Ask a question"
 msgstr "שאל שאלה"
 
-#: templates/help.php:22
+#: templates/help.php:23
 msgid "Problems connecting to help database."
 msgstr "בעיות בהתחברות לבסיס נתוני העזרה"
 
-#: templates/help.php:23
+#: templates/help.php:24
 msgid "Go there manually."
 msgstr "גש לשם באופן ידני"
 
-#: templates/help.php:31
+#: templates/help.php:32
 msgid "Answer"
 msgstr "מענה"
 
diff --git a/l10n/hi/settings.po b/l10n/hi/settings.po
index 6868b2aab1..f29fbed414 100644
--- a/l10n/hi/settings.po
+++ b/l10n/hi/settings.po
@@ -7,20 +7,33 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 13:35+0200\n"
-"PO-Revision-Date: 2012-09-01 11:35+0000\n"
+"POT-Creation-Date: 2012-09-04 12:42+0200\n"
+"PO-Revision-Date: 2012-09-04 10:42+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: hi\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ajax/apps/ocs.php:23
 msgid "Unable to load list from App Store"
 msgstr ""
 
+#: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr ""
+
+#: ajax/creategroup.php:19
+msgid "Group already exists"
+msgstr ""
+
+#: ajax/creategroup.php:28
+msgid "Unable to add group"
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr ""
@@ -37,8 +50,12 @@ msgstr ""
 msgid "Invalid request"
 msgstr ""
 
-#: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
-msgid "Authentication error"
+#: ajax/removegroup.php:16
+msgid "Unable to delete group"
+msgstr ""
+
+#: ajax/removeuser.php:22
+msgid "Unable to delete user"
 msgstr ""
 
 #: ajax/setlanguage.php:18
@@ -168,27 +185,27 @@ msgstr ""
 msgid "by"
 msgstr ""
 
-#: templates/help.php:8
+#: templates/help.php:9
 msgid "Documentation"
 msgstr ""
 
-#: templates/help.php:9
+#: templates/help.php:10
 msgid "Managing Big Files"
 msgstr ""
 
-#: templates/help.php:10
+#: templates/help.php:11
 msgid "Ask a question"
 msgstr ""
 
-#: templates/help.php:22
+#: templates/help.php:23
 msgid "Problems connecting to help database."
 msgstr ""
 
-#: templates/help.php:23
+#: templates/help.php:24
 msgid "Go there manually."
 msgstr ""
 
-#: templates/help.php:31
+#: templates/help.php:32
 msgid "Answer"
 msgstr ""
 
diff --git a/l10n/hr/settings.po b/l10n/hr/settings.po
index 88b5f981c6..22cbd59156 100644
--- a/l10n/hr/settings.po
+++ b/l10n/hr/settings.po
@@ -10,20 +10,33 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 13:35+0200\n"
-"PO-Revision-Date: 2012-09-01 11:35+0000\n"
+"POT-Creation-Date: 2012-09-04 12:42+0200\n"
+"PO-Revision-Date: 2012-09-04 10:42+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"
 "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"
+"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 "Nemogićnost učitavanja liste sa Apps Stora"
 
+#: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr "Greška kod autorizacije"
+
+#: ajax/creategroup.php:19
+msgid "Group already exists"
+msgstr ""
+
+#: ajax/creategroup.php:28
+msgid "Unable to add group"
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr "Email spremljen"
@@ -40,9 +53,13 @@ msgstr "OpenID promijenjen"
 msgid "Invalid request"
 msgstr "Neispravan zahtjev"
 
-#: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
-msgid "Authentication error"
-msgstr "Greška kod autorizacije"
+#: ajax/removegroup.php:16
+msgid "Unable to delete group"
+msgstr ""
+
+#: ajax/removeuser.php:22
+msgid "Unable to delete user"
+msgstr ""
 
 #: ajax/setlanguage.php:18
 msgid "Language changed"
@@ -171,27 +188,27 @@ msgstr "-licencirano"
 msgid "by"
 msgstr "od"
 
-#: templates/help.php:8
+#: templates/help.php:9
 msgid "Documentation"
 msgstr "dokumentacija"
 
-#: templates/help.php:9
+#: templates/help.php:10
 msgid "Managing Big Files"
 msgstr "Upravljanje velikih datoteka"
 
-#: templates/help.php:10
+#: templates/help.php:11
 msgid "Ask a question"
 msgstr "Postavite pitanje"
 
-#: templates/help.php:22
+#: templates/help.php:23
 msgid "Problems connecting to help database."
 msgstr "Problem pri spajanju na bazu podataka pomoći"
 
-#: templates/help.php:23
+#: templates/help.php:24
 msgid "Go there manually."
 msgstr "Idite tamo ručno."
 
-#: templates/help.php:31
+#: templates/help.php:32
 msgid "Answer"
 msgstr "Odgovor"
 
diff --git a/l10n/hu_HU/settings.po b/l10n/hu_HU/settings.po
index 07e242e85e..1a47a633a7 100644
--- a/l10n/hu_HU/settings.po
+++ b/l10n/hu_HU/settings.po
@@ -9,20 +9,33 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 13:35+0200\n"
-"PO-Revision-Date: 2012-09-01 11:35+0000\n"
+"POT-Creation-Date: 2012-09-04 12:42+0200\n"
+"PO-Revision-Date: 2012-09-04 10:42+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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: hu_HU\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ajax/apps/ocs.php:23
 msgid "Unable to load list from App Store"
 msgstr "Nem tölthető le a lista az App Store-ból"
 
+#: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr "Hitelesítési hiba"
+
+#: ajax/creategroup.php:19
+msgid "Group already exists"
+msgstr ""
+
+#: ajax/creategroup.php:28
+msgid "Unable to add group"
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr "Email mentve"
@@ -39,9 +52,13 @@ msgstr "OpenID megváltozott"
 msgid "Invalid request"
 msgstr "Érvénytelen kérés"
 
-#: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
-msgid "Authentication error"
-msgstr "Hitelesítési hiba"
+#: ajax/removegroup.php:16
+msgid "Unable to delete group"
+msgstr ""
+
+#: ajax/removeuser.php:22
+msgid "Unable to delete user"
+msgstr ""
 
 #: ajax/setlanguage.php:18
 msgid "Language changed"
@@ -170,27 +187,27 @@ msgstr "-licencelt"
 msgid "by"
 msgstr ":"
 
-#: templates/help.php:8
+#: templates/help.php:9
 msgid "Documentation"
 msgstr "Dokumentáció"
 
-#: templates/help.php:9
+#: templates/help.php:10
 msgid "Managing Big Files"
 msgstr "Nagy fájlok kezelése"
 
-#: templates/help.php:10
+#: templates/help.php:11
 msgid "Ask a question"
 msgstr "Tégy fel egy kérdést"
 
-#: templates/help.php:22
+#: templates/help.php:23
 msgid "Problems connecting to help database."
 msgstr "Sikertelen csatlakozás a Súgó adatbázishoz"
 
-#: templates/help.php:23
+#: templates/help.php:24
 msgid "Go there manually."
 msgstr "Menj oda kézzel"
 
-#: templates/help.php:31
+#: templates/help.php:32
 msgid "Answer"
 msgstr "Válasz"
 
diff --git a/l10n/hy/settings.po b/l10n/hy/settings.po
index 7f4518b1f1..17b840f15d 100644
--- a/l10n/hy/settings.po
+++ b/l10n/hy/settings.po
@@ -7,20 +7,33 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 13:35+0200\n"
-"PO-Revision-Date: 2012-09-01 11:35+0000\n"
+"POT-Creation-Date: 2012-09-04 12:42+0200\n"
+"PO-Revision-Date: 2012-09-04 10:42+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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: hy\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ajax/apps/ocs.php:23
 msgid "Unable to load list from App Store"
 msgstr ""
 
+#: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr ""
+
+#: ajax/creategroup.php:19
+msgid "Group already exists"
+msgstr ""
+
+#: ajax/creategroup.php:28
+msgid "Unable to add group"
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr ""
@@ -37,8 +50,12 @@ msgstr ""
 msgid "Invalid request"
 msgstr ""
 
-#: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
-msgid "Authentication error"
+#: ajax/removegroup.php:16
+msgid "Unable to delete group"
+msgstr ""
+
+#: ajax/removeuser.php:22
+msgid "Unable to delete user"
 msgstr ""
 
 #: ajax/setlanguage.php:18
@@ -168,27 +185,27 @@ msgstr ""
 msgid "by"
 msgstr ""
 
-#: templates/help.php:8
+#: templates/help.php:9
 msgid "Documentation"
 msgstr ""
 
-#: templates/help.php:9
+#: templates/help.php:10
 msgid "Managing Big Files"
 msgstr ""
 
-#: templates/help.php:10
+#: templates/help.php:11
 msgid "Ask a question"
 msgstr ""
 
-#: templates/help.php:22
+#: templates/help.php:23
 msgid "Problems connecting to help database."
 msgstr ""
 
-#: templates/help.php:23
+#: templates/help.php:24
 msgid "Go there manually."
 msgstr ""
 
-#: templates/help.php:31
+#: templates/help.php:32
 msgid "Answer"
 msgstr ""
 
diff --git a/l10n/ia/settings.po b/l10n/ia/settings.po
index 56b7b32070..b495b59ed9 100644
--- a/l10n/ia/settings.po
+++ b/l10n/ia/settings.po
@@ -9,20 +9,33 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 13:35+0200\n"
-"PO-Revision-Date: 2012-09-01 11:35+0000\n"
+"POT-Creation-Date: 2012-09-04 12:42+0200\n"
+"PO-Revision-Date: 2012-09-04 10:42+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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ia\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ajax/apps/ocs.php:23
 msgid "Unable to load list from App Store"
 msgstr ""
 
+#: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr ""
+
+#: ajax/creategroup.php:19
+msgid "Group already exists"
+msgstr ""
+
+#: ajax/creategroup.php:28
+msgid "Unable to add group"
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr ""
@@ -39,8 +52,12 @@ msgstr "OpenID cambiate"
 msgid "Invalid request"
 msgstr "Requesta invalide"
 
-#: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
-msgid "Authentication error"
+#: ajax/removegroup.php:16
+msgid "Unable to delete group"
+msgstr ""
+
+#: ajax/removeuser.php:22
+msgid "Unable to delete user"
 msgstr ""
 
 #: ajax/setlanguage.php:18
@@ -170,27 +187,27 @@ msgstr ""
 msgid "by"
 msgstr "per"
 
-#: templates/help.php:8
+#: templates/help.php:9
 msgid "Documentation"
 msgstr "Documentation"
 
-#: templates/help.php:9
+#: templates/help.php:10
 msgid "Managing Big Files"
 msgstr ""
 
-#: templates/help.php:10
+#: templates/help.php:11
 msgid "Ask a question"
 msgstr "Facer un question"
 
-#: templates/help.php:22
+#: templates/help.php:23
 msgid "Problems connecting to help database."
 msgstr ""
 
-#: templates/help.php:23
+#: templates/help.php:24
 msgid "Go there manually."
 msgstr ""
 
-#: templates/help.php:31
+#: templates/help.php:32
 msgid "Answer"
 msgstr "Responsa"
 
diff --git a/l10n/id/settings.po b/l10n/id/settings.po
index 48dcb7d719..b5a17ff764 100644
--- a/l10n/id/settings.po
+++ b/l10n/id/settings.po
@@ -10,20 +10,33 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 13:35+0200\n"
-"PO-Revision-Date: 2012-09-01 11:35+0000\n"
+"POT-Creation-Date: 2012-09-04 12:42+0200\n"
+"PO-Revision-Date: 2012-09-04 10:42+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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: id\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ajax/apps/ocs.php:23
 msgid "Unable to load list from App Store"
 msgstr ""
 
+#: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr ""
+
+#: ajax/creategroup.php:19
+msgid "Group already exists"
+msgstr ""
+
+#: ajax/creategroup.php:28
+msgid "Unable to add group"
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr "Email tersimpan"
@@ -40,8 +53,12 @@ msgstr "OpenID telah dirubah"
 msgid "Invalid request"
 msgstr "Permintaan tidak valid"
 
-#: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
-msgid "Authentication error"
+#: ajax/removegroup.php:16
+msgid "Unable to delete group"
+msgstr ""
+
+#: ajax/removeuser.php:22
+msgid "Unable to delete user"
 msgstr ""
 
 #: ajax/setlanguage.php:18
@@ -171,27 +188,27 @@ msgstr "-terlisensi"
 msgid "by"
 msgstr "oleh"
 
-#: templates/help.php:8
+#: templates/help.php:9
 msgid "Documentation"
 msgstr "Dokumentasi"
 
-#: templates/help.php:9
+#: templates/help.php:10
 msgid "Managing Big Files"
 msgstr "Mengelola berkas besar"
 
-#: templates/help.php:10
+#: templates/help.php:11
 msgid "Ask a question"
 msgstr "Ajukan pertanyaan"
 
-#: templates/help.php:22
+#: templates/help.php:23
 msgid "Problems connecting to help database."
 msgstr "Bermasalah saat menghubungi database bantuan."
 
-#: templates/help.php:23
+#: templates/help.php:24
 msgid "Go there manually."
 msgstr "Pergi kesana secara manual."
 
-#: templates/help.php:31
+#: templates/help.php:32
 msgid "Answer"
 msgstr "Jawab"
 
diff --git a/l10n/id_ID/settings.po b/l10n/id_ID/settings.po
index 98ce6547b5..140d43b480 100644
--- a/l10n/id_ID/settings.po
+++ b/l10n/id_ID/settings.po
@@ -7,20 +7,33 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 13:35+0200\n"
-"PO-Revision-Date: 2012-09-01 11:35+0000\n"
+"POT-Creation-Date: 2012-09-04 12:42+0200\n"
+"PO-Revision-Date: 2012-09-04 10:42+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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: id_ID\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ajax/apps/ocs.php:23
 msgid "Unable to load list from App Store"
 msgstr ""
 
+#: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr ""
+
+#: ajax/creategroup.php:19
+msgid "Group already exists"
+msgstr ""
+
+#: ajax/creategroup.php:28
+msgid "Unable to add group"
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr ""
@@ -37,8 +50,12 @@ msgstr ""
 msgid "Invalid request"
 msgstr ""
 
-#: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
-msgid "Authentication error"
+#: ajax/removegroup.php:16
+msgid "Unable to delete group"
+msgstr ""
+
+#: ajax/removeuser.php:22
+msgid "Unable to delete user"
 msgstr ""
 
 #: ajax/setlanguage.php:18
@@ -168,27 +185,27 @@ msgstr ""
 msgid "by"
 msgstr ""
 
-#: templates/help.php:8
+#: templates/help.php:9
 msgid "Documentation"
 msgstr ""
 
-#: templates/help.php:9
+#: templates/help.php:10
 msgid "Managing Big Files"
 msgstr ""
 
-#: templates/help.php:10
+#: templates/help.php:11
 msgid "Ask a question"
 msgstr ""
 
-#: templates/help.php:22
+#: templates/help.php:23
 msgid "Problems connecting to help database."
 msgstr ""
 
-#: templates/help.php:23
+#: templates/help.php:24
 msgid "Go there manually."
 msgstr ""
 
-#: templates/help.php:31
+#: templates/help.php:32
 msgid "Answer"
 msgstr ""
 
diff --git a/l10n/it/settings.po b/l10n/it/settings.po
index a79176c2e1..a0f7597544 100644
--- a/l10n/it/settings.po
+++ b/l10n/it/settings.po
@@ -14,20 +14,33 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-02 02:01+0200\n"
-"PO-Revision-Date: 2012-09-01 11:46+0000\n"
-"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
+"POT-Creation-Date: 2012-09-04 12:42+0200\n"
+"PO-Revision-Date: 2012-09-04 10:42+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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: it\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ajax/apps/ocs.php:23
 msgid "Unable to load list from App Store"
 msgstr "Impossibile caricare l'elenco dall'App Store"
 
+#: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr "Errore di autenticazione"
+
+#: ajax/creategroup.php:19
+msgid "Group already exists"
+msgstr ""
+
+#: ajax/creategroup.php:28
+msgid "Unable to add group"
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr "Email salvata"
@@ -44,9 +57,13 @@ 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 "Errore di autenticazione"
+#: ajax/removegroup.php:16
+msgid "Unable to delete group"
+msgstr ""
+
+#: ajax/removeuser.php:22
+msgid "Unable to delete user"
+msgstr ""
 
 #: ajax/setlanguage.php:18
 msgid "Language changed"
@@ -175,27 +192,27 @@ msgstr "-rilasciato"
 msgid "by"
 msgstr "da"
 
-#: templates/help.php:8
+#: templates/help.php:9
 msgid "Documentation"
 msgstr "Documentazione"
 
-#: templates/help.php:9
+#: templates/help.php:10
 msgid "Managing Big Files"
 msgstr "Gestione file grandi"
 
-#: templates/help.php:10
+#: templates/help.php:11
 msgid "Ask a question"
 msgstr "Fai una domanda"
 
-#: templates/help.php:22
+#: templates/help.php:23
 msgid "Problems connecting to help database."
 msgstr "Problemi di connessione al database di supporto."
 
-#: templates/help.php:23
+#: templates/help.php:24
 msgid "Go there manually."
 msgstr "Raggiungilo manualmente."
 
-#: templates/help.php:31
+#: templates/help.php:32
 msgid "Answer"
 msgstr "Risposta"
 
diff --git a/l10n/ja_JP/settings.po b/l10n/ja_JP/settings.po
index 90fcca014b..4721075e9d 100644
--- a/l10n/ja_JP/settings.po
+++ b/l10n/ja_JP/settings.po
@@ -9,20 +9,33 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 13:35+0200\n"
-"PO-Revision-Date: 2012-09-01 11:35+0000\n"
+"POT-Creation-Date: 2012-09-04 12:42+0200\n"
+"PO-Revision-Date: 2012-09-04 10:42+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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ja_JP\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ajax/apps/ocs.php:23
 msgid "Unable to load list from App Store"
 msgstr "アプリストアからリストをロードできません"
 
+#: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr "認証エラー"
+
+#: ajax/creategroup.php:19
+msgid "Group already exists"
+msgstr ""
+
+#: ajax/creategroup.php:28
+msgid "Unable to add group"
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr "メールアドレスを保存しました"
@@ -39,9 +52,13 @@ msgstr "OpenIDが変更されました"
 msgid "Invalid request"
 msgstr "無効なリクエストです"
 
-#: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
-msgid "Authentication error"
-msgstr "認証エラー"
+#: ajax/removegroup.php:16
+msgid "Unable to delete group"
+msgstr ""
+
+#: ajax/removeuser.php:22
+msgid "Unable to delete user"
+msgstr ""
 
 #: ajax/setlanguage.php:18
 msgid "Language changed"
@@ -78,7 +95,7 @@ msgid ""
 "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."
-msgstr ""
+msgstr "データディレクトリとファイルが恐らくインターネットからアクセスできるようになっています。ownCloudが提供する .htaccessファイルが機能していません。データディレクトリを全くアクセスできないようにするか、データディレクトリをウェブサーバのドキュメントルートの外に置くようにウェブサーバを設定することを強くお勧めします。"
 
 #: templates/admin.php:31
 msgid "Cron"
@@ -148,7 +165,7 @@ msgid ""
 "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>."
-msgstr ""
+msgstr "<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>により開発されています、<a href=\"https://github.com/owncloud\" target=\"_blank\">ソースコード</a>ライセンスは、<a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> ライセンスにより提供されています。"
 
 #: templates/apps.php:10
 msgid "Add your App"
@@ -170,27 +187,27 @@ msgstr "ライセンス"
 msgid "by"
 msgstr "@"
 
-#: templates/help.php:8
+#: templates/help.php:9
 msgid "Documentation"
 msgstr "ドキュメント"
 
-#: templates/help.php:9
+#: templates/help.php:10
 msgid "Managing Big Files"
 msgstr "大きなファイルを扱うには"
 
-#: templates/help.php:10
+#: templates/help.php:11
 msgid "Ask a question"
 msgstr "質問してください"
 
-#: templates/help.php:22
+#: templates/help.php:23
 msgid "Problems connecting to help database."
 msgstr "ヘルプデータベースへの接続時に問題が発生しました"
 
-#: templates/help.php:23
+#: templates/help.php:24
 msgid "Go there manually."
 msgstr "手動で移動してください。"
 
-#: templates/help.php:31
+#: templates/help.php:32
 msgid "Answer"
 msgstr "解答"
 
diff --git a/l10n/ko/settings.po b/l10n/ko/settings.po
index a07aecc3b9..8fd52bd74a 100644
--- a/l10n/ko/settings.po
+++ b/l10n/ko/settings.po
@@ -9,20 +9,33 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 13:35+0200\n"
-"PO-Revision-Date: 2012-09-01 11:35+0000\n"
+"POT-Creation-Date: 2012-09-04 12:42+0200\n"
+"PO-Revision-Date: 2012-09-04 10:42+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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ko\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ajax/apps/ocs.php:23
 msgid "Unable to load list from App Store"
 msgstr "앱 스토어에서 목록을 가져올 수 없습니다"
 
+#: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr "인증 오류"
+
+#: ajax/creategroup.php:19
+msgid "Group already exists"
+msgstr ""
+
+#: ajax/creategroup.php:28
+msgid "Unable to add group"
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr "이메일 저장"
@@ -39,9 +52,13 @@ msgstr "OpenID 변경됨"
 msgid "Invalid request"
 msgstr "잘못된 요청"
 
-#: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
-msgid "Authentication error"
-msgstr "인증 오류"
+#: ajax/removegroup.php:16
+msgid "Unable to delete group"
+msgstr ""
+
+#: ajax/removeuser.php:22
+msgid "Unable to delete user"
+msgstr ""
 
 #: ajax/setlanguage.php:18
 msgid "Language changed"
@@ -170,27 +187,27 @@ msgstr " 라이선스 사용"
 msgid "by"
 msgstr " by "
 
-#: templates/help.php:8
+#: templates/help.php:9
 msgid "Documentation"
 msgstr "문서"
 
-#: templates/help.php:9
+#: templates/help.php:10
 msgid "Managing Big Files"
 msgstr "큰 파일 관리"
 
-#: templates/help.php:10
+#: templates/help.php:11
 msgid "Ask a question"
 msgstr "질문하기"
 
-#: templates/help.php:22
+#: templates/help.php:23
 msgid "Problems connecting to help database."
 msgstr "데이터베이스에 연결하는 데 문제가 발생하였습니다."
 
-#: templates/help.php:23
+#: templates/help.php:24
 msgid "Go there manually."
 msgstr "직접 갈 수 있습니다."
 
-#: templates/help.php:31
+#: templates/help.php:32
 msgid "Answer"
 msgstr "대답"
 
diff --git a/l10n/lb/settings.po b/l10n/lb/settings.po
index ce3cde89a0..1359a8c64f 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-09-04 02:01+0200\n"
-"PO-Revision-Date: 2012-09-03 21:57+0000\n"
-"Last-Translator: sim0n <sim0n@trypill.org>\n"
+"POT-Creation-Date: 2012-09-04 12:42+0200\n"
+"PO-Revision-Date: 2012-09-04 10:42+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"
@@ -22,6 +22,19 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "Konnt Lescht net vum App Store lueden"
 
+#: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr "Authentifikatioun's Fehler"
+
+#: ajax/creategroup.php:19
+msgid "Group already exists"
+msgstr ""
+
+#: ajax/creategroup.php:28
+msgid "Unable to add group"
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr "E-mail gespäichert"
@@ -38,9 +51,13 @@ msgstr "OpenID huet geännert"
 msgid "Invalid request"
 msgstr "Ongülteg Requête"
 
-#: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
-msgid "Authentication error"
-msgstr "Authentifikatioun's Fehler"
+#: ajax/removegroup.php:16
+msgid "Unable to delete group"
+msgstr ""
+
+#: ajax/removeuser.php:22
+msgid "Unable to delete user"
+msgstr ""
 
 #: ajax/setlanguage.php:18
 msgid "Language changed"
@@ -169,27 +186,27 @@ msgstr "-Lizenséiert"
 msgid "by"
 msgstr "vun"
 
-#: templates/help.php:8
+#: templates/help.php:9
 msgid "Documentation"
 msgstr "Dokumentatioun"
 
-#: templates/help.php:9
+#: templates/help.php:10
 msgid "Managing Big Files"
 msgstr "Grouss Fichieren verwalten"
 
-#: templates/help.php:10
+#: templates/help.php:11
 msgid "Ask a question"
 msgstr "Stell eng Fro"
 
-#: templates/help.php:22
+#: templates/help.php:23
 msgid "Problems connecting to help database."
 msgstr "Problemer sinn opgetrueden beim Versuch sech un d'Hëllef Datebank ze verbannen."
 
-#: templates/help.php:23
+#: templates/help.php:24
 msgid "Go there manually."
 msgstr "Gei manuell dohinner."
 
-#: templates/help.php:31
+#: templates/help.php:32
 msgid "Answer"
 msgstr "Äntwert"
 
diff --git a/l10n/lt_LT/settings.po b/l10n/lt_LT/settings.po
index 7f3126ba76..d6268c7d3f 100644
--- a/l10n/lt_LT/settings.po
+++ b/l10n/lt_LT/settings.po
@@ -8,20 +8,33 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 13:35+0200\n"
-"PO-Revision-Date: 2012-09-01 11:35+0000\n"
+"POT-Creation-Date: 2012-09-04 12:42+0200\n"
+"PO-Revision-Date: 2012-09-04 10:42+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"
 "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"
+"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 "Neįmanoma įkelti sąrašo iš Programų Katalogo"
 
+#: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr ""
+
+#: ajax/creategroup.php:19
+msgid "Group already exists"
+msgstr ""
+
+#: ajax/creategroup.php:28
+msgid "Unable to add group"
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr "El. paštas išsaugotas"
@@ -38,8 +51,12 @@ msgstr "OpenID pakeistas"
 msgid "Invalid request"
 msgstr "Klaidinga užklausa"
 
-#: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
-msgid "Authentication error"
+#: ajax/removegroup.php:16
+msgid "Unable to delete group"
+msgstr ""
+
+#: ajax/removeuser.php:22
+msgid "Unable to delete user"
 msgstr ""
 
 #: ajax/setlanguage.php:18
@@ -169,27 +186,27 @@ msgstr "-licencijuota"
 msgid "by"
 msgstr ""
 
-#: templates/help.php:8
+#: templates/help.php:9
 msgid "Documentation"
 msgstr "Dokumentacija"
 
-#: templates/help.php:9
+#: templates/help.php:10
 msgid "Managing Big Files"
 msgstr ""
 
-#: templates/help.php:10
+#: templates/help.php:11
 msgid "Ask a question"
 msgstr "Užduoti klausimą"
 
-#: templates/help.php:22
+#: templates/help.php:23
 msgid "Problems connecting to help database."
 msgstr "Problemos jungiantis prie duomenų bazės"
 
-#: templates/help.php:23
+#: templates/help.php:24
 msgid "Go there manually."
 msgstr ""
 
-#: templates/help.php:31
+#: templates/help.php:32
 msgid "Answer"
 msgstr "Atsakyti"
 
diff --git a/l10n/lv/settings.po b/l10n/lv/settings.po
index e9a03d16be..3e27f0ed58 100644
--- a/l10n/lv/settings.po
+++ b/l10n/lv/settings.po
@@ -8,20 +8,33 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 13:35+0200\n"
-"PO-Revision-Date: 2012-09-01 11:35+0000\n"
+"POT-Creation-Date: 2012-09-04 12:42+0200\n"
+"PO-Revision-Date: 2012-09-04 10:42+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"
 "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"
+"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 "Nebija iespējams lejuplādēt sarakstu no aplikāciju veikala"
 
+#: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr "Ielogošanās kļūme"
+
+#: ajax/creategroup.php:19
+msgid "Group already exists"
+msgstr ""
+
+#: ajax/creategroup.php:28
+msgid "Unable to add group"
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr "Epasts tika saglabāts"
@@ -38,9 +51,13 @@ msgstr "OpenID nomainīts"
 msgid "Invalid request"
 msgstr "Nepareizs vaicājums"
 
-#: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
-msgid "Authentication error"
-msgstr "Ielogošanās kļūme"
+#: ajax/removegroup.php:16
+msgid "Unable to delete group"
+msgstr ""
+
+#: ajax/removeuser.php:22
+msgid "Unable to delete user"
+msgstr ""
 
 #: ajax/setlanguage.php:18
 msgid "Language changed"
@@ -169,27 +186,27 @@ msgstr "licenzēts"
 msgid "by"
 msgstr "no"
 
-#: templates/help.php:8
+#: templates/help.php:9
 msgid "Documentation"
 msgstr "Dokumentācija"
 
-#: templates/help.php:9
+#: templates/help.php:10
 msgid "Managing Big Files"
 msgstr "Rīkoties ar apjomīgiem failiem"
 
-#: templates/help.php:10
+#: templates/help.php:11
 msgid "Ask a question"
 msgstr "Uzdod jautajumu"
 
-#: templates/help.php:22
+#: templates/help.php:23
 msgid "Problems connecting to help database."
 msgstr "Problēmas ar datubāzes savienojumu"
 
-#: templates/help.php:23
+#: templates/help.php:24
 msgid "Go there manually."
 msgstr "Nokļūt tur pašrocīgi"
 
-#: templates/help.php:31
+#: templates/help.php:32
 msgid "Answer"
 msgstr "Atbildēt"
 
diff --git a/l10n/mk/settings.po b/l10n/mk/settings.po
index 346d808cac..ab5e4f3717 100644
--- a/l10n/mk/settings.po
+++ b/l10n/mk/settings.po
@@ -9,20 +9,33 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 13:35+0200\n"
-"PO-Revision-Date: 2012-09-01 11:35+0000\n"
+"POT-Creation-Date: 2012-09-04 12:42+0200\n"
+"PO-Revision-Date: 2012-09-04 10:42+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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: mk\n"
-"Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1\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/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr ""
+
+#: ajax/creategroup.php:19
+msgid "Group already exists"
+msgstr ""
+
+#: ajax/creategroup.php:28
+msgid "Unable to add group"
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr "Електронската пошта е снимена"
@@ -39,8 +52,12 @@ msgstr "OpenID сменето"
 msgid "Invalid request"
 msgstr "неправилно барање"
 
-#: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
-msgid "Authentication error"
+#: ajax/removegroup.php:16
+msgid "Unable to delete group"
+msgstr ""
+
+#: ajax/removeuser.php:22
+msgid "Unable to delete user"
 msgstr ""
 
 #: ajax/setlanguage.php:18
@@ -170,27 +187,27 @@ msgstr "-licensed"
 msgid "by"
 msgstr "од"
 
-#: templates/help.php:8
+#: templates/help.php:9
 msgid "Documentation"
 msgstr "Документација"
 
-#: templates/help.php:9
+#: templates/help.php:10
 msgid "Managing Big Files"
 msgstr "Управување со големи датотеки"
 
-#: templates/help.php:10
+#: templates/help.php:11
 msgid "Ask a question"
 msgstr "Постави прашање"
 
-#: templates/help.php:22
+#: templates/help.php:23
 msgid "Problems connecting to help database."
 msgstr "Проблем при поврзување со базата за помош"
 
-#: templates/help.php:23
+#: templates/help.php:24
 msgid "Go there manually."
 msgstr "Оди таму рачно."
 
-#: templates/help.php:31
+#: templates/help.php:32
 msgid "Answer"
 msgstr "Одговор"
 
diff --git a/l10n/ms_MY/settings.po b/l10n/ms_MY/settings.po
index 47b3ac00c2..68249d4e7e 100644
--- a/l10n/ms_MY/settings.po
+++ b/l10n/ms_MY/settings.po
@@ -11,20 +11,33 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 13:35+0200\n"
-"PO-Revision-Date: 2012-09-01 11:35+0000\n"
+"POT-Creation-Date: 2012-09-04 12:42+0200\n"
+"PO-Revision-Date: 2012-09-04 10:42+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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ms_MY\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ajax/apps/ocs.php:23
 msgid "Unable to load list from App Store"
 msgstr ""
 
+#: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr "Ralat pengesahan"
+
+#: ajax/creategroup.php:19
+msgid "Group already exists"
+msgstr ""
+
+#: ajax/creategroup.php:28
+msgid "Unable to add group"
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr "Emel disimpan"
@@ -41,9 +54,13 @@ msgstr "OpenID diubah"
 msgid "Invalid request"
 msgstr "Permintaan tidak sah"
 
-#: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
-msgid "Authentication error"
-msgstr "Ralat pengesahan"
+#: ajax/removegroup.php:16
+msgid "Unable to delete group"
+msgstr ""
+
+#: ajax/removeuser.php:22
+msgid "Unable to delete user"
+msgstr ""
 
 #: ajax/setlanguage.php:18
 msgid "Language changed"
@@ -172,27 +189,27 @@ msgstr "-dilesen"
 msgid "by"
 msgstr "oleh"
 
-#: templates/help.php:8
+#: templates/help.php:9
 msgid "Documentation"
 msgstr "Dokumentasi"
 
-#: templates/help.php:9
+#: templates/help.php:10
 msgid "Managing Big Files"
 msgstr "Mengurus Fail Besar"
 
-#: templates/help.php:10
+#: templates/help.php:11
 msgid "Ask a question"
 msgstr "Tanya soalan"
 
-#: templates/help.php:22
+#: templates/help.php:23
 msgid "Problems connecting to help database."
 msgstr "Masalah menghubung untuk membantu pengkalan data"
 
-#: templates/help.php:23
+#: templates/help.php:24
 msgid "Go there manually."
 msgstr "Pergi ke sana secara manual"
 
-#: templates/help.php:31
+#: templates/help.php:32
 msgid "Answer"
 msgstr "Jawapan"
 
diff --git a/l10n/nb_NO/settings.po b/l10n/nb_NO/settings.po
index 80cb20c73d..56f93ec3e4 100644
--- a/l10n/nb_NO/settings.po
+++ b/l10n/nb_NO/settings.po
@@ -13,20 +13,33 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 13:35+0200\n"
-"PO-Revision-Date: 2012-09-01 11:35+0000\n"
+"POT-Creation-Date: 2012-09-04 12:42+0200\n"
+"PO-Revision-Date: 2012-09-04 10:42+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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: nb_NO\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ajax/apps/ocs.php:23
 msgid "Unable to load list from App Store"
 msgstr "Lasting av liste fra App Store feilet."
 
+#: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr "Autentikasjonsfeil"
+
+#: ajax/creategroup.php:19
+msgid "Group already exists"
+msgstr ""
+
+#: ajax/creategroup.php:28
+msgid "Unable to add group"
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr "Epost lagret"
@@ -43,9 +56,13 @@ msgstr "OpenID endret"
 msgid "Invalid request"
 msgstr "Ugyldig forespørsel"
 
-#: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
-msgid "Authentication error"
-msgstr "Autentikasjonsfeil"
+#: ajax/removegroup.php:16
+msgid "Unable to delete group"
+msgstr ""
+
+#: ajax/removeuser.php:22
+msgid "Unable to delete user"
+msgstr ""
 
 #: ajax/setlanguage.php:18
 msgid "Language changed"
@@ -174,27 +191,27 @@ msgstr "-lisensiert"
 msgid "by"
 msgstr "av"
 
-#: templates/help.php:8
+#: templates/help.php:9
 msgid "Documentation"
 msgstr "Dokumentasjon"
 
-#: templates/help.php:9
+#: templates/help.php:10
 msgid "Managing Big Files"
 msgstr "Håndtere store filer"
 
-#: templates/help.php:10
+#: templates/help.php:11
 msgid "Ask a question"
 msgstr "Still et spørsmål"
 
-#: templates/help.php:22
+#: templates/help.php:23
 msgid "Problems connecting to help database."
 msgstr "Problemer med å koble til hjelp-databasen"
 
-#: templates/help.php:23
+#: templates/help.php:24
 msgid "Go there manually."
 msgstr "Gå dit manuelt"
 
-#: templates/help.php:31
+#: templates/help.php:32
 msgid "Answer"
 msgstr "Svar"
 
diff --git a/l10n/nl/settings.po b/l10n/nl/settings.po
index 80f22f6088..a3a72a3379 100644
--- a/l10n/nl/settings.po
+++ b/l10n/nl/settings.po
@@ -14,20 +14,33 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 13:35+0200\n"
-"PO-Revision-Date: 2012-09-01 11:35+0000\n"
+"POT-Creation-Date: 2012-09-04 12:42+0200\n"
+"PO-Revision-Date: 2012-09-04 10:42+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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: nl\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ajax/apps/ocs.php:23
 msgid "Unable to load list from App Store"
 msgstr "Kan de lijst niet van de App store laden"
 
+#: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr "Authenticatie fout"
+
+#: ajax/creategroup.php:19
+msgid "Group already exists"
+msgstr ""
+
+#: ajax/creategroup.php:28
+msgid "Unable to add group"
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr "E-mail bewaard"
@@ -44,9 +57,13 @@ msgstr "OpenID is aangepast"
 msgid "Invalid request"
 msgstr "Ongeldig verzoek"
 
-#: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
-msgid "Authentication error"
-msgstr "Authenticatie fout"
+#: ajax/removegroup.php:16
+msgid "Unable to delete group"
+msgstr ""
+
+#: ajax/removeuser.php:22
+msgid "Unable to delete user"
+msgstr ""
 
 #: ajax/setlanguage.php:18
 msgid "Language changed"
@@ -175,27 +192,27 @@ msgstr "-gelicentieerd"
 msgid "by"
 msgstr "door"
 
-#: templates/help.php:8
+#: templates/help.php:9
 msgid "Documentation"
 msgstr "Documentatie"
 
-#: templates/help.php:9
+#: templates/help.php:10
 msgid "Managing Big Files"
 msgstr "Onderhoud van grote bestanden"
 
-#: templates/help.php:10
+#: templates/help.php:11
 msgid "Ask a question"
 msgstr "Stel een vraag"
 
-#: templates/help.php:22
+#: templates/help.php:23
 msgid "Problems connecting to help database."
 msgstr "Problemen bij het verbinden met de helpdatabank."
 
-#: templates/help.php:23
+#: templates/help.php:24
 msgid "Go there manually."
 msgstr "Ga er zelf heen."
 
-#: templates/help.php:31
+#: templates/help.php:32
 msgid "Answer"
 msgstr "Beantwoord"
 
diff --git a/l10n/nn_NO/settings.po b/l10n/nn_NO/settings.po
index f4c7090799..82dfce0048 100644
--- a/l10n/nn_NO/settings.po
+++ b/l10n/nn_NO/settings.po
@@ -9,20 +9,33 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 13:35+0200\n"
-"PO-Revision-Date: 2012-09-01 11:35+0000\n"
+"POT-Creation-Date: 2012-09-04 12:42+0200\n"
+"PO-Revision-Date: 2012-09-04 10:42+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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: nn_NO\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ajax/apps/ocs.php:23
 msgid "Unable to load list from App Store"
 msgstr "Klarer ikkje å laste inn liste fra App Store"
 
+#: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr "Feil i autentisering"
+
+#: ajax/creategroup.php:19
+msgid "Group already exists"
+msgstr ""
+
+#: ajax/creategroup.php:28
+msgid "Unable to add group"
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr "E-postadresse lagra"
@@ -39,9 +52,13 @@ msgstr "OpenID endra"
 msgid "Invalid request"
 msgstr "Ugyldig førespurnad"
 
-#: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
-msgid "Authentication error"
-msgstr "Feil i autentisering"
+#: ajax/removegroup.php:16
+msgid "Unable to delete group"
+msgstr ""
+
+#: ajax/removeuser.php:22
+msgid "Unable to delete user"
+msgstr ""
 
 #: ajax/setlanguage.php:18
 msgid "Language changed"
@@ -170,27 +187,27 @@ msgstr "-lisensiert"
 msgid "by"
 msgstr "av"
 
-#: templates/help.php:8
+#: templates/help.php:9
 msgid "Documentation"
 msgstr ""
 
-#: templates/help.php:9
+#: templates/help.php:10
 msgid "Managing Big Files"
 msgstr ""
 
-#: templates/help.php:10
+#: templates/help.php:11
 msgid "Ask a question"
 msgstr "Spør om noko"
 
-#: templates/help.php:22
+#: templates/help.php:23
 msgid "Problems connecting to help database."
 msgstr "Problem ved tilkopling til hjelpedatabasen."
 
-#: templates/help.php:23
+#: templates/help.php:24
 msgid "Go there manually."
 msgstr "Gå der på eigen hand."
 
-#: templates/help.php:31
+#: templates/help.php:32
 msgid "Answer"
 msgstr "Svar"
 
diff --git a/l10n/pl/settings.po b/l10n/pl/settings.po
index 3eb675060a..b0b24757ca 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-09-04 02:01+0200\n"
-"PO-Revision-Date: 2012-09-03 07:00+0000\n"
-"Last-Translator: Cyryl Sochacki <>\n"
+"POT-Creation-Date: 2012-09-04 12:42+0200\n"
+"PO-Revision-Date: 2012-09-04 10:42+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"
@@ -28,6 +28,19 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr "Nie mogę załadować listy aplikacji"
 
+#: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr "Błąd uwierzytelniania"
+
+#: ajax/creategroup.php:19
+msgid "Group already exists"
+msgstr ""
+
+#: ajax/creategroup.php:28
+msgid "Unable to add group"
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr "Email zapisany"
@@ -44,9 +57,13 @@ msgstr "Zmieniono OpenID"
 msgid "Invalid request"
 msgstr "Nieprawidłowe żądanie"
 
-#: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
-msgid "Authentication error"
-msgstr "Błąd uwierzytelniania"
+#: ajax/removegroup.php:16
+msgid "Unable to delete group"
+msgstr ""
+
+#: ajax/removeuser.php:22
+msgid "Unable to delete user"
+msgstr ""
 
 #: ajax/setlanguage.php:18
 msgid "Language changed"
@@ -175,27 +192,27 @@ msgstr "-licencjonowany"
 msgid "by"
 msgstr "przez"
 
-#: templates/help.php:8
+#: templates/help.php:9
 msgid "Documentation"
 msgstr "Dokumentacja"
 
-#: templates/help.php:9
+#: templates/help.php:10
 msgid "Managing Big Files"
 msgstr "Zarządzanie dużymi plikami"
 
-#: templates/help.php:10
+#: templates/help.php:11
 msgid "Ask a question"
 msgstr "Zadaj pytanie"
 
-#: templates/help.php:22
+#: templates/help.php:23
 msgid "Problems connecting to help database."
 msgstr "Problem z połączeniem z bazą danych."
 
-#: templates/help.php:23
+#: templates/help.php:24
 msgid "Go there manually."
 msgstr "Przejdź na stronę ręcznie."
 
-#: templates/help.php:31
+#: templates/help.php:32
 msgid "Answer"
 msgstr "Odpowiedź"
 
diff --git a/l10n/pl_PL/settings.po b/l10n/pl_PL/settings.po
index 6d84ed791a..7f69392cff 100644
--- a/l10n/pl_PL/settings.po
+++ b/l10n/pl_PL/settings.po
@@ -7,20 +7,33 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 13:35+0200\n"
-"PO-Revision-Date: 2012-09-01 11:35+0000\n"
+"POT-Creation-Date: 2012-09-04 12:42+0200\n"
+"PO-Revision-Date: 2012-09-04 10:42+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/owncloud/language/pl_PL/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pl_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"
+"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/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr ""
+
+#: ajax/creategroup.php:19
+msgid "Group already exists"
+msgstr ""
+
+#: ajax/creategroup.php:28
+msgid "Unable to add group"
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr ""
@@ -37,8 +50,12 @@ msgstr ""
 msgid "Invalid request"
 msgstr ""
 
-#: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
-msgid "Authentication error"
+#: ajax/removegroup.php:16
+msgid "Unable to delete group"
+msgstr ""
+
+#: ajax/removeuser.php:22
+msgid "Unable to delete user"
 msgstr ""
 
 #: ajax/setlanguage.php:18
@@ -168,27 +185,27 @@ msgstr ""
 msgid "by"
 msgstr ""
 
-#: templates/help.php:8
+#: templates/help.php:9
 msgid "Documentation"
 msgstr ""
 
-#: templates/help.php:9
+#: templates/help.php:10
 msgid "Managing Big Files"
 msgstr ""
 
-#: templates/help.php:10
+#: templates/help.php:11
 msgid "Ask a question"
 msgstr ""
 
-#: templates/help.php:22
+#: templates/help.php:23
 msgid "Problems connecting to help database."
 msgstr ""
 
-#: templates/help.php:23
+#: templates/help.php:24
 msgid "Go there manually."
 msgstr ""
 
-#: templates/help.php:31
+#: templates/help.php:32
 msgid "Answer"
 msgstr ""
 
diff --git a/l10n/pt_BR/settings.po b/l10n/pt_BR/settings.po
index d5dbac47b9..f8da7b4d5d 100644
--- a/l10n/pt_BR/settings.po
+++ b/l10n/pt_BR/settings.po
@@ -13,20 +13,33 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 13:35+0200\n"
-"PO-Revision-Date: 2012-09-01 11:35+0000\n"
+"POT-Creation-Date: 2012-09-04 12:42+0200\n"
+"PO-Revision-Date: 2012-09-04 10:42+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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pt_BR\n"
-"Plural-Forms: nplurals=2; plural=(n > 1)\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: ajax/apps/ocs.php:23
 msgid "Unable to load list from App Store"
 msgstr ""
 
+#: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr "erro de autenticação"
+
+#: ajax/creategroup.php:19
+msgid "Group already exists"
+msgstr ""
+
+#: ajax/creategroup.php:28
+msgid "Unable to add group"
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr "Email gravado"
@@ -43,9 +56,13 @@ msgstr "Mudou OpenID"
 msgid "Invalid request"
 msgstr "Pedido inválido"
 
-#: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
-msgid "Authentication error"
-msgstr "erro de autenticação"
+#: ajax/removegroup.php:16
+msgid "Unable to delete group"
+msgstr ""
+
+#: ajax/removeuser.php:22
+msgid "Unable to delete user"
+msgstr ""
 
 #: ajax/setlanguage.php:18
 msgid "Language changed"
@@ -174,27 +191,27 @@ msgstr "-licenciados"
 msgid "by"
 msgstr "por"
 
-#: templates/help.php:8
+#: templates/help.php:9
 msgid "Documentation"
 msgstr "Documentação"
 
-#: templates/help.php:9
+#: templates/help.php:10
 msgid "Managing Big Files"
 msgstr "Gerênciando Arquivos Grandes"
 
-#: templates/help.php:10
+#: templates/help.php:11
 msgid "Ask a question"
 msgstr "Faça uma pergunta"
 
-#: templates/help.php:22
+#: templates/help.php:23
 msgid "Problems connecting to help database."
 msgstr "Problemas ao conectar na base de dados."
 
-#: templates/help.php:23
+#: templates/help.php:24
 msgid "Go there manually."
 msgstr "Ir manualmente."
 
-#: templates/help.php:31
+#: templates/help.php:32
 msgid "Answer"
 msgstr "Resposta"
 
diff --git a/l10n/pt_PT/settings.po b/l10n/pt_PT/settings.po
index 87d7e76647..7e75ded7df 100644
--- a/l10n/pt_PT/settings.po
+++ b/l10n/pt_PT/settings.po
@@ -10,20 +10,33 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 13:35+0200\n"
-"PO-Revision-Date: 2012-09-01 11:35+0000\n"
+"POT-Creation-Date: 2012-09-04 12:42+0200\n"
+"PO-Revision-Date: 2012-09-04 10:42+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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pt_PT\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ajax/apps/ocs.php:23
 msgid "Unable to load list from App Store"
 msgstr "Incapaz de carregar a lista da App Store"
 
+#: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr "Erro de autenticação"
+
+#: ajax/creategroup.php:19
+msgid "Group already exists"
+msgstr ""
+
+#: ajax/creategroup.php:28
+msgid "Unable to add group"
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr "Email guardado"
@@ -40,9 +53,13 @@ msgstr "OpenID alterado"
 msgid "Invalid request"
 msgstr "Pedido inválido"
 
-#: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
-msgid "Authentication error"
-msgstr "Erro de autenticação"
+#: ajax/removegroup.php:16
+msgid "Unable to delete group"
+msgstr ""
+
+#: ajax/removeuser.php:22
+msgid "Unable to delete user"
+msgstr ""
 
 #: ajax/setlanguage.php:18
 msgid "Language changed"
@@ -171,27 +188,27 @@ msgstr "-licenciado"
 msgid "by"
 msgstr "por"
 
-#: templates/help.php:8
+#: templates/help.php:9
 msgid "Documentation"
 msgstr "Documentação"
 
-#: templates/help.php:9
+#: templates/help.php:10
 msgid "Managing Big Files"
 msgstr "Gestão de ficheiros grandes"
 
-#: templates/help.php:10
+#: templates/help.php:11
 msgid "Ask a question"
 msgstr "Coloque uma questão"
 
-#: templates/help.php:22
+#: templates/help.php:23
 msgid "Problems connecting to help database."
 msgstr "Problemas ao conectar à base de dados de ajuda"
 
-#: templates/help.php:23
+#: templates/help.php:24
 msgid "Go there manually."
 msgstr "Vá lá manualmente"
 
-#: templates/help.php:31
+#: templates/help.php:32
 msgid "Answer"
 msgstr "Resposta"
 
diff --git a/l10n/ro/settings.po b/l10n/ro/settings.po
index a203a47619..a79fb9745d 100644
--- a/l10n/ro/settings.po
+++ b/l10n/ro/settings.po
@@ -12,20 +12,33 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 13:35+0200\n"
-"PO-Revision-Date: 2012-09-01 11:35+0000\n"
+"POT-Creation-Date: 2012-09-04 12:42+0200\n"
+"PO-Revision-Date: 2012-09-04 10:42+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"
 "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"
+"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 "Imposibil de încărcat lista din App Store"
 
+#: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr "Eroare de autentificare"
+
+#: ajax/creategroup.php:19
+msgid "Group already exists"
+msgstr ""
+
+#: ajax/creategroup.php:28
+msgid "Unable to add group"
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr "E-mail salvat"
@@ -42,9 +55,13 @@ msgstr "OpenID schimbat"
 msgid "Invalid request"
 msgstr "Cerere eronată"
 
-#: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
-msgid "Authentication error"
-msgstr "Eroare de autentificare"
+#: ajax/removegroup.php:16
+msgid "Unable to delete group"
+msgstr ""
+
+#: ajax/removeuser.php:22
+msgid "Unable to delete user"
+msgstr ""
 
 #: ajax/setlanguage.php:18
 msgid "Language changed"
@@ -173,27 +190,27 @@ msgstr "-autorizat"
 msgid "by"
 msgstr "de"
 
-#: templates/help.php:8
+#: templates/help.php:9
 msgid "Documentation"
 msgstr "Documetație"
 
-#: templates/help.php:9
+#: templates/help.php:10
 msgid "Managing Big Files"
 msgstr "Gestionînd fișiere mari"
 
-#: templates/help.php:10
+#: templates/help.php:11
 msgid "Ask a question"
 msgstr "Întreabă"
 
-#: templates/help.php:22
+#: templates/help.php:23
 msgid "Problems connecting to help database."
 msgstr "Probleme de conectare la baza de date."
 
-#: templates/help.php:23
+#: templates/help.php:24
 msgid "Go there manually."
 msgstr "Pe cale manuală."
 
-#: templates/help.php:31
+#: templates/help.php:32
 msgid "Answer"
 msgstr "Răspuns"
 
diff --git a/l10n/ru/settings.po b/l10n/ru/settings.po
index e72a9f71d8..77b85075dd 100644
--- a/l10n/ru/settings.po
+++ b/l10n/ru/settings.po
@@ -15,20 +15,33 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 13:35+0200\n"
-"PO-Revision-Date: 2012-09-01 11:35+0000\n"
+"POT-Creation-Date: 2012-09-04 12:42+0200\n"
+"PO-Revision-Date: 2012-09-04 10:42+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"
 "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"
+"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 "Загрузка из App Store запрещена"
 
+#: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr "Ошибка авторизации"
+
+#: ajax/creategroup.php:19
+msgid "Group already exists"
+msgstr ""
+
+#: ajax/creategroup.php:28
+msgid "Unable to add group"
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr "Email сохранен"
@@ -45,9 +58,13 @@ msgstr "OpenID изменён"
 msgid "Invalid request"
 msgstr "Неверный запрос"
 
-#: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
-msgid "Authentication error"
-msgstr "Ошибка авторизации"
+#: ajax/removegroup.php:16
+msgid "Unable to delete group"
+msgstr ""
+
+#: ajax/removeuser.php:22
+msgid "Unable to delete user"
+msgstr ""
 
 #: ajax/setlanguage.php:18
 msgid "Language changed"
@@ -176,27 +193,27 @@ msgstr "-лицензия"
 msgid "by"
 msgstr "от"
 
-#: templates/help.php:8
+#: templates/help.php:9
 msgid "Documentation"
 msgstr "Документация"
 
-#: templates/help.php:9
+#: templates/help.php:10
 msgid "Managing Big Files"
 msgstr "Управление большими файлами"
 
-#: templates/help.php:10
+#: templates/help.php:11
 msgid "Ask a question"
 msgstr "Задать вопрос"
 
-#: templates/help.php:22
+#: templates/help.php:23
 msgid "Problems connecting to help database."
 msgstr "Проблема соединения с базой данных помощи."
 
-#: templates/help.php:23
+#: templates/help.php:24
 msgid "Go there manually."
 msgstr "Войти самостоятельно."
 
-#: templates/help.php:31
+#: templates/help.php:32
 msgid "Answer"
 msgstr "Ответ"
 
diff --git a/l10n/ru_RU/settings.po b/l10n/ru_RU/settings.po
index 92c57bb805..83bd8af32d 100644
--- a/l10n/ru_RU/settings.po
+++ b/l10n/ru_RU/settings.po
@@ -7,20 +7,33 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 13:35+0200\n"
-"PO-Revision-Date: 2012-09-01 11:35+0000\n"
+"POT-Creation-Date: 2012-09-04 12:42+0200\n"
+"PO-Revision-Date: 2012-09-04 10:42+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ru_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"
+"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/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr ""
+
+#: ajax/creategroup.php:19
+msgid "Group already exists"
+msgstr ""
+
+#: ajax/creategroup.php:28
+msgid "Unable to add group"
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr ""
@@ -37,8 +50,12 @@ msgstr ""
 msgid "Invalid request"
 msgstr ""
 
-#: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
-msgid "Authentication error"
+#: ajax/removegroup.php:16
+msgid "Unable to delete group"
+msgstr ""
+
+#: ajax/removeuser.php:22
+msgid "Unable to delete user"
 msgstr ""
 
 #: ajax/setlanguage.php:18
@@ -168,27 +185,27 @@ msgstr ""
 msgid "by"
 msgstr ""
 
-#: templates/help.php:8
+#: templates/help.php:9
 msgid "Documentation"
 msgstr ""
 
-#: templates/help.php:9
+#: templates/help.php:10
 msgid "Managing Big Files"
 msgstr ""
 
-#: templates/help.php:10
+#: templates/help.php:11
 msgid "Ask a question"
 msgstr ""
 
-#: templates/help.php:22
+#: templates/help.php:23
 msgid "Problems connecting to help database."
 msgstr ""
 
-#: templates/help.php:23
+#: templates/help.php:24
 msgid "Go there manually."
 msgstr ""
 
-#: templates/help.php:31
+#: templates/help.php:32
 msgid "Answer"
 msgstr ""
 
diff --git a/l10n/sk_SK/settings.po b/l10n/sk_SK/settings.po
index c16ce73069..3bf4af03dc 100644
--- a/l10n/sk_SK/settings.po
+++ b/l10n/sk_SK/settings.po
@@ -10,20 +10,33 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 13:35+0200\n"
-"PO-Revision-Date: 2012-09-01 11:35+0000\n"
+"POT-Creation-Date: 2012-09-04 12:42+0200\n"
+"PO-Revision-Date: 2012-09-04 10:42+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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: sk_SK\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\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/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr ""
+
+#: ajax/creategroup.php:19
+msgid "Group already exists"
+msgstr ""
+
+#: ajax/creategroup.php:28
+msgid "Unable to add group"
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr "Email uložený"
@@ -40,8 +53,12 @@ msgstr "OpenID zmenené"
 msgid "Invalid request"
 msgstr "Neplatná požiadavka"
 
-#: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
-msgid "Authentication error"
+#: ajax/removegroup.php:16
+msgid "Unable to delete group"
+msgstr ""
+
+#: ajax/removeuser.php:22
+msgid "Unable to delete user"
 msgstr ""
 
 #: ajax/setlanguage.php:18
@@ -171,27 +188,27 @@ msgstr "-licencované"
 msgid "by"
 msgstr "od"
 
-#: templates/help.php:8
+#: templates/help.php:9
 msgid "Documentation"
 msgstr "Dokumentácia"
 
-#: templates/help.php:9
+#: templates/help.php:10
 msgid "Managing Big Files"
 msgstr "Spravovanie veľké súbory"
 
-#: templates/help.php:10
+#: templates/help.php:11
 msgid "Ask a question"
 msgstr "Opýtajte sa otázku"
 
-#: templates/help.php:22
+#: templates/help.php:23
 msgid "Problems connecting to help database."
 msgstr "Problémy spojené s pomocnou databázou."
 
-#: templates/help.php:23
+#: templates/help.php:24
 msgid "Go there manually."
 msgstr "Prejsť tam ručne."
 
-#: templates/help.php:31
+#: templates/help.php:32
 msgid "Answer"
 msgstr "Odpoveď"
 
diff --git a/l10n/sl/settings.po b/l10n/sl/settings.po
index 95cdc0a22a..b30ea513e3 100644
--- a/l10n/sl/settings.po
+++ b/l10n/sl/settings.po
@@ -10,20 +10,33 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-03 02:05+0200\n"
-"PO-Revision-Date: 2012-09-02 02:00+0000\n"
-"Last-Translator: Peter Peroša <peter.perosa@gmail.com>\n"
+"POT-Creation-Date: 2012-09-04 12:42+0200\n"
+"PO-Revision-Date: 2012-09-04 10:42+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"
 "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"
+"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 "Ne morem naložiti seznama iz App Store"
 
+#: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr "Napaka overitve"
+
+#: ajax/creategroup.php:19
+msgid "Group already exists"
+msgstr ""
+
+#: ajax/creategroup.php:28
+msgid "Unable to add group"
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr "E-poštni naslov je bil shranjen"
@@ -40,9 +53,13 @@ msgstr "OpenID je bil spremenjen"
 msgid "Invalid request"
 msgstr "Neveljaven zahtevek"
 
-#: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
-msgid "Authentication error"
-msgstr "Napaka overitve"
+#: ajax/removegroup.php:16
+msgid "Unable to delete group"
+msgstr ""
+
+#: ajax/removeuser.php:22
+msgid "Unable to delete user"
+msgstr ""
 
 #: ajax/setlanguage.php:18
 msgid "Language changed"
@@ -171,27 +188,27 @@ msgstr "-licencirana"
 msgid "by"
 msgstr "s strani"
 
-#: templates/help.php:8
+#: templates/help.php:9
 msgid "Documentation"
 msgstr "Dokumentacija"
 
-#: templates/help.php:9
+#: templates/help.php:10
 msgid "Managing Big Files"
 msgstr "Upravljanje velikih datotek"
 
-#: templates/help.php:10
+#: templates/help.php:11
 msgid "Ask a question"
 msgstr "Postavi vprašanje"
 
-#: templates/help.php:22
+#: templates/help.php:23
 msgid "Problems connecting to help database."
 msgstr "Težave pri povezovanju s podatkovno zbirko pomoči."
 
-#: templates/help.php:23
+#: templates/help.php:24
 msgid "Go there manually."
 msgstr "Pojdi tja ročno."
 
-#: templates/help.php:31
+#: templates/help.php:32
 msgid "Answer"
 msgstr "Odgovor"
 
diff --git a/l10n/so/settings.po b/l10n/so/settings.po
index 213fb1dc72..6663a83b9a 100644
--- a/l10n/so/settings.po
+++ b/l10n/so/settings.po
@@ -7,20 +7,33 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 13:35+0200\n"
-"PO-Revision-Date: 2012-09-01 11:35+0000\n"
+"POT-Creation-Date: 2012-09-04 12:42+0200\n"
+"PO-Revision-Date: 2012-09-04 10:42+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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: so\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ajax/apps/ocs.php:23
 msgid "Unable to load list from App Store"
 msgstr ""
 
+#: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr ""
+
+#: ajax/creategroup.php:19
+msgid "Group already exists"
+msgstr ""
+
+#: ajax/creategroup.php:28
+msgid "Unable to add group"
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr ""
@@ -37,8 +50,12 @@ msgstr ""
 msgid "Invalid request"
 msgstr ""
 
-#: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
-msgid "Authentication error"
+#: ajax/removegroup.php:16
+msgid "Unable to delete group"
+msgstr ""
+
+#: ajax/removeuser.php:22
+msgid "Unable to delete user"
 msgstr ""
 
 #: ajax/setlanguage.php:18
@@ -168,27 +185,27 @@ msgstr ""
 msgid "by"
 msgstr ""
 
-#: templates/help.php:8
+#: templates/help.php:9
 msgid "Documentation"
 msgstr ""
 
-#: templates/help.php:9
+#: templates/help.php:10
 msgid "Managing Big Files"
 msgstr ""
 
-#: templates/help.php:10
+#: templates/help.php:11
 msgid "Ask a question"
 msgstr ""
 
-#: templates/help.php:22
+#: templates/help.php:23
 msgid "Problems connecting to help database."
 msgstr ""
 
-#: templates/help.php:23
+#: templates/help.php:24
 msgid "Go there manually."
 msgstr ""
 
-#: templates/help.php:31
+#: templates/help.php:32
 msgid "Answer"
 msgstr ""
 
diff --git a/l10n/sr/settings.po b/l10n/sr/settings.po
index a88fd07b1e..2106184cec 100644
--- a/l10n/sr/settings.po
+++ b/l10n/sr/settings.po
@@ -8,20 +8,33 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 13:35+0200\n"
-"PO-Revision-Date: 2012-09-01 11:35+0000\n"
+"POT-Creation-Date: 2012-09-04 12:42+0200\n"
+"PO-Revision-Date: 2012-09-04 10:42+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"
 "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"
+"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/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr ""
+
+#: ajax/creategroup.php:19
+msgid "Group already exists"
+msgstr ""
+
+#: ajax/creategroup.php:28
+msgid "Unable to add group"
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr ""
@@ -38,8 +51,12 @@ msgstr "OpenID је измењен"
 msgid "Invalid request"
 msgstr "Неисправан захтев"
 
-#: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
-msgid "Authentication error"
+#: ajax/removegroup.php:16
+msgid "Unable to delete group"
+msgstr ""
+
+#: ajax/removeuser.php:22
+msgid "Unable to delete user"
 msgstr ""
 
 #: ajax/setlanguage.php:18
@@ -169,27 +186,27 @@ msgstr "-лиценциран"
 msgid "by"
 msgstr "од"
 
-#: templates/help.php:8
+#: templates/help.php:9
 msgid "Documentation"
 msgstr ""
 
-#: templates/help.php:9
+#: templates/help.php:10
 msgid "Managing Big Files"
 msgstr ""
 
-#: templates/help.php:10
+#: templates/help.php:11
 msgid "Ask a question"
 msgstr "Поставите питање"
 
-#: templates/help.php:22
+#: templates/help.php:23
 msgid "Problems connecting to help database."
 msgstr "Проблем у повезивању са базом помоћи"
 
-#: templates/help.php:23
+#: templates/help.php:24
 msgid "Go there manually."
 msgstr "Отиђите тамо ручно."
 
-#: templates/help.php:31
+#: templates/help.php:32
 msgid "Answer"
 msgstr "Одговор"
 
diff --git a/l10n/sr@latin/settings.po b/l10n/sr@latin/settings.po
index 30636c4044..4ed74b2b60 100644
--- a/l10n/sr@latin/settings.po
+++ b/l10n/sr@latin/settings.po
@@ -8,20 +8,33 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 13:35+0200\n"
-"PO-Revision-Date: 2012-09-01 11:35+0000\n"
+"POT-Creation-Date: 2012-09-04 12:42+0200\n"
+"PO-Revision-Date: 2012-09-04 10:42+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"
 "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"
+"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/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr ""
+
+#: ajax/creategroup.php:19
+msgid "Group already exists"
+msgstr ""
+
+#: ajax/creategroup.php:28
+msgid "Unable to add group"
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr ""
@@ -38,8 +51,12 @@ msgstr "OpenID je izmenjen"
 msgid "Invalid request"
 msgstr "Neispravan zahtev"
 
-#: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
-msgid "Authentication error"
+#: ajax/removegroup.php:16
+msgid "Unable to delete group"
+msgstr ""
+
+#: ajax/removeuser.php:22
+msgid "Unable to delete user"
 msgstr ""
 
 #: ajax/setlanguage.php:18
@@ -169,27 +186,27 @@ msgstr "-licenciran"
 msgid "by"
 msgstr "od"
 
-#: templates/help.php:8
+#: templates/help.php:9
 msgid "Documentation"
 msgstr ""
 
-#: templates/help.php:9
+#: templates/help.php:10
 msgid "Managing Big Files"
 msgstr ""
 
-#: templates/help.php:10
+#: templates/help.php:11
 msgid "Ask a question"
 msgstr "Postavite pitanje"
 
-#: templates/help.php:22
+#: templates/help.php:23
 msgid "Problems connecting to help database."
 msgstr "Problem u povezivanju sa bazom pomoći"
 
-#: templates/help.php:23
+#: templates/help.php:24
 msgid "Go there manually."
 msgstr "Otiđite tamo ručno."
 
-#: templates/help.php:31
+#: templates/help.php:32
 msgid "Answer"
 msgstr "Odgovor"
 
diff --git a/l10n/sv/settings.po b/l10n/sv/settings.po
index 796ab42e63..d764dba474 100644
--- a/l10n/sv/settings.po
+++ b/l10n/sv/settings.po
@@ -14,20 +14,33 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-02 02:01+0200\n"
-"PO-Revision-Date: 2012-09-01 12:52+0000\n"
-"Last-Translator: Daniel Sandman <revoltism@gmail.com>\n"
+"POT-Creation-Date: 2012-09-04 12:42+0200\n"
+"PO-Revision-Date: 2012-09-04 10:42+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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: sv\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ajax/apps/ocs.php:23
 msgid "Unable to load list from App Store"
 msgstr "Kan inte ladda listan från App Store"
 
+#: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr "Autentiseringsfel"
+
+#: ajax/creategroup.php:19
+msgid "Group already exists"
+msgstr ""
+
+#: ajax/creategroup.php:28
+msgid "Unable to add group"
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr "E-post sparad"
@@ -44,9 +57,13 @@ msgstr "OpenID ändrat"
 msgid "Invalid request"
 msgstr "Ogiltig begäran"
 
-#: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
-msgid "Authentication error"
-msgstr "Autentiseringsfel"
+#: ajax/removegroup.php:16
+msgid "Unable to delete group"
+msgstr ""
+
+#: ajax/removeuser.php:22
+msgid "Unable to delete user"
+msgstr ""
 
 #: ajax/setlanguage.php:18
 msgid "Language changed"
@@ -175,27 +192,27 @@ msgstr "-licensierat"
 msgid "by"
 msgstr "av"
 
-#: templates/help.php:8
+#: templates/help.php:9
 msgid "Documentation"
 msgstr "Dokumentation"
 
-#: templates/help.php:9
+#: templates/help.php:10
 msgid "Managing Big Files"
 msgstr "Hantering av stora filer"
 
-#: templates/help.php:10
+#: templates/help.php:11
 msgid "Ask a question"
 msgstr "Ställ en fråga"
 
-#: templates/help.php:22
+#: templates/help.php:23
 msgid "Problems connecting to help database."
 msgstr "Problem med att ansluta till hjälpdatabasen."
 
-#: templates/help.php:23
+#: templates/help.php:24
 msgid "Go there manually."
 msgstr "Gå dit manuellt."
 
-#: templates/help.php:31
+#: templates/help.php:32
 msgid "Answer"
 msgstr "Svar"
 
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index 136685c098..bd9a67a3e1 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-09-04 02:01+0200\n"
+"POT-Creation-Date: 2012-09-04 12:42+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -113,7 +113,7 @@ msgstr ""
 msgid "ownCloud password reset"
 msgstr ""
 
-#: lostpassword/templates/email.php:1
+#: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr ""
 
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index 2c15a9049b..44f427e91d 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-09-04 02:01+0200\n"
+"POT-Creation-Date: 2012-09-04 12:42+0200\n"
 "PO-Revision-Date: YEAR-MO-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 7346533735..9a7f6a0e57 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-09-04 02:01+0200\n"
+"POT-Creation-Date: 2012-09-04 12:42+0200\n"
 "PO-Revision-Date: YEAR-MO-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 a4d2244600..f8a9b597aa 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-09-04 02:01+0200\n"
+"POT-Creation-Date: 2012-09-04 12:42+0200\n"
 "PO-Revision-Date: YEAR-MO-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 cffd3fd505..7365c76903 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-09-04 02:01+0200\n"
+"POT-Creation-Date: 2012-09-04 12:42+0200\n"
 "PO-Revision-Date: YEAR-MO-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 88f3182b3e..bf919618a2 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-09-04 02:01+0200\n"
+"POT-Creation-Date: 2012-09-04 12:42+0200\n"
 "PO-Revision-Date: YEAR-MO-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 82b69d86b8..100a197226 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-09-04 02:01+0200\n"
+"POT-Creation-Date: 2012-09-04 12:42+0200\n"
 "PO-Revision-Date: YEAR-MO-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 35a5a06eca..15dce5bb11 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-09-04 02:01+0200\n"
+"POT-Creation-Date: 2012-09-04 12:42+0200\n"
 "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,19 @@ msgstr ""
 msgid "Unable to load list from App Store"
 msgstr ""
 
+#: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr ""
+
+#: ajax/creategroup.php:19
+msgid "Group already exists"
+msgstr ""
+
+#: ajax/creategroup.php:28
+msgid "Unable to add group"
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr ""
@@ -37,8 +50,12 @@ msgstr ""
 msgid "Invalid request"
 msgstr ""
 
-#: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
-msgid "Authentication error"
+#: ajax/removegroup.php:16
+msgid "Unable to delete group"
+msgstr ""
+
+#: ajax/removeuser.php:22
+msgid "Unable to delete user"
 msgstr ""
 
 #: ajax/setlanguage.php:18
@@ -167,27 +184,27 @@ msgstr ""
 msgid "by"
 msgstr ""
 
-#: templates/help.php:8
+#: templates/help.php:9
 msgid "Documentation"
 msgstr ""
 
-#: templates/help.php:9
+#: templates/help.php:10
 msgid "Managing Big Files"
 msgstr ""
 
-#: templates/help.php:10
+#: templates/help.php:11
 msgid "Ask a question"
 msgstr ""
 
-#: templates/help.php:22
+#: templates/help.php:23
 msgid "Problems connecting to help database."
 msgstr ""
 
-#: templates/help.php:23
+#: templates/help.php:24
 msgid "Go there manually."
 msgstr ""
 
-#: templates/help.php:31
+#: templates/help.php:32
 msgid "Answer"
 msgstr ""
 
diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot
index 8a2113c6e1..0b3490afd5 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-09-04 02:01+0200\n"
+"POT-Creation-Date: 2012-09-04 12:42+0200\n"
 "PO-Revision-Date: YEAR-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 383a4a47c8..0e3f5e3398 100644
--- a/l10n/th_TH/settings.po
+++ b/l10n/th_TH/settings.po
@@ -10,20 +10,33 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-03 02:05+0200\n"
-"PO-Revision-Date: 2012-09-02 22:49+0000\n"
-"Last-Translator: AriesAnywhere Anywhere <ariesanywhere@gmail.com>\n"
+"POT-Creation-Date: 2012-09-04 12:42+0200\n"
+"PO-Revision-Date: 2012-09-04 10:42+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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: th_TH\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ajax/apps/ocs.php:23
 msgid "Unable to load list from App Store"
 msgstr "ไม่สามารถโหลดรายการจาก App Store ได้"
 
+#: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr "เกิดข้อผิดพลาดเกี่ยวกับสิทธิ์การเข้าใช้งาน"
+
+#: ajax/creategroup.php:19
+msgid "Group already exists"
+msgstr ""
+
+#: ajax/creategroup.php:28
+msgid "Unable to add group"
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr "อีเมลถูกบันทึกแล้ว"
@@ -40,9 +53,13 @@ msgstr "เปลี่ยนชื่อบัญชี OpenID แล้ว"
 msgid "Invalid request"
 msgstr "คำร้องขอไม่ถูกต้อง"
 
-#: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
-msgid "Authentication error"
-msgstr "เกิดข้อผิดพลาดเกี่ยวกับสิทธิ์การเข้าใช้งาน"
+#: ajax/removegroup.php:16
+msgid "Unable to delete group"
+msgstr ""
+
+#: ajax/removeuser.php:22
+msgid "Unable to delete user"
+msgstr ""
 
 #: ajax/setlanguage.php:18
 msgid "Language changed"
@@ -171,27 +188,27 @@ msgstr "-ได้รับอนุญาติแล้ว"
 msgid "by"
 msgstr "โดย"
 
-#: templates/help.php:8
+#: templates/help.php:9
 msgid "Documentation"
 msgstr "เอกสารคู่มือการใช้งาน"
 
-#: templates/help.php:9
+#: templates/help.php:10
 msgid "Managing Big Files"
 msgstr "การจัดการไฟล์ขนาดใหญ่"
 
-#: templates/help.php:10
+#: templates/help.php:11
 msgid "Ask a question"
 msgstr "สอบถามข้อมูล"
 
-#: templates/help.php:22
+#: templates/help.php:23
 msgid "Problems connecting to help database."
 msgstr "เกิดปัญหาในการเชื่อมต่อกับฐานข้อมูลช่วยเหลือ"
 
-#: templates/help.php:23
+#: templates/help.php:24
 msgid "Go there manually."
 msgstr "ไปที่นั่นด้วยตนเอง"
 
-#: templates/help.php:31
+#: templates/help.php:32
 msgid "Answer"
 msgstr "คำตอบ"
 
diff --git a/l10n/tr/settings.po b/l10n/tr/settings.po
index 3c94cad642..f5eccfa400 100644
--- a/l10n/tr/settings.po
+++ b/l10n/tr/settings.po
@@ -10,20 +10,33 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 13:35+0200\n"
-"PO-Revision-Date: 2012-09-01 11:35+0000\n"
+"POT-Creation-Date: 2012-09-04 12:42+0200\n"
+"PO-Revision-Date: 2012-09-04 10:42+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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: tr\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ajax/apps/ocs.php:23
 msgid "Unable to load list from App Store"
 msgstr ""
 
+#: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr "Eşleşme hata"
+
+#: ajax/creategroup.php:19
+msgid "Group already exists"
+msgstr ""
+
+#: ajax/creategroup.php:28
+msgid "Unable to add group"
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr "Eposta kaydedildi"
@@ -40,9 +53,13 @@ msgstr "OpenID Değiştirildi"
 msgid "Invalid request"
 msgstr "Geçersiz istek"
 
-#: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
-msgid "Authentication error"
-msgstr "Eşleşme hata"
+#: ajax/removegroup.php:16
+msgid "Unable to delete group"
+msgstr ""
+
+#: ajax/removeuser.php:22
+msgid "Unable to delete user"
+msgstr ""
 
 #: ajax/setlanguage.php:18
 msgid "Language changed"
@@ -171,27 +188,27 @@ msgstr "-lisanslı"
 msgid "by"
 msgstr "yapan"
 
-#: templates/help.php:8
+#: templates/help.php:9
 msgid "Documentation"
 msgstr "Dökümantasyon"
 
-#: templates/help.php:9
+#: templates/help.php:10
 msgid "Managing Big Files"
 msgstr "Büyük Dosyaların Yönetimi"
 
-#: templates/help.php:10
+#: templates/help.php:11
 msgid "Ask a question"
 msgstr "Bir soru sorun"
 
-#: templates/help.php:22
+#: templates/help.php:23
 msgid "Problems connecting to help database."
 msgstr "Yardım veritabanına bağlanmada sorunlar var."
 
-#: templates/help.php:23
+#: templates/help.php:24
 msgid "Go there manually."
 msgstr "Oraya elle gidin."
 
-#: templates/help.php:31
+#: templates/help.php:32
 msgid "Answer"
 msgstr "Cevap"
 
diff --git a/l10n/uk/settings.po b/l10n/uk/settings.po
index 39b06fff47..c0020d02c0 100644
--- a/l10n/uk/settings.po
+++ b/l10n/uk/settings.po
@@ -8,20 +8,33 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 13:35+0200\n"
-"PO-Revision-Date: 2012-09-01 11:35+0000\n"
+"POT-Creation-Date: 2012-09-04 12:42+0200\n"
+"PO-Revision-Date: 2012-09-04 10:42+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"
 "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"
+"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/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr ""
+
+#: ajax/creategroup.php:19
+msgid "Group already exists"
+msgstr ""
+
+#: ajax/creategroup.php:28
+msgid "Unable to add group"
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr ""
@@ -38,8 +51,12 @@ msgstr "OpenID змінено"
 msgid "Invalid request"
 msgstr "Помилковий запит"
 
-#: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
-msgid "Authentication error"
+#: ajax/removegroup.php:16
+msgid "Unable to delete group"
+msgstr ""
+
+#: ajax/removeuser.php:22
+msgid "Unable to delete user"
 msgstr ""
 
 #: ajax/setlanguage.php:18
@@ -169,27 +186,27 @@ msgstr "-ліцензовано"
 msgid "by"
 msgstr "по"
 
-#: templates/help.php:8
+#: templates/help.php:9
 msgid "Documentation"
 msgstr ""
 
-#: templates/help.php:9
+#: templates/help.php:10
 msgid "Managing Big Files"
 msgstr ""
 
-#: templates/help.php:10
+#: templates/help.php:11
 msgid "Ask a question"
 msgstr "Запитати"
 
-#: templates/help.php:22
+#: templates/help.php:23
 msgid "Problems connecting to help database."
 msgstr "Проблема при з'єднані з базою допомоги"
 
-#: templates/help.php:23
+#: templates/help.php:24
 msgid "Go there manually."
 msgstr ""
 
-#: templates/help.php:31
+#: templates/help.php:32
 msgid "Answer"
 msgstr ""
 
diff --git a/l10n/vi/settings.po b/l10n/vi/settings.po
index c36c1286e2..d1b52d3342 100644
--- a/l10n/vi/settings.po
+++ b/l10n/vi/settings.po
@@ -10,20 +10,33 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 13:35+0200\n"
-"PO-Revision-Date: 2012-09-01 11:35+0000\n"
+"POT-Creation-Date: 2012-09-04 12:42+0200\n"
+"PO-Revision-Date: 2012-09-04 10:42+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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: vi\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ajax/apps/ocs.php:23
 msgid "Unable to load list from App Store"
 msgstr "Không thể tải danh sách ứng dụng từ App Store"
 
+#: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr "Lỗi xác thực"
+
+#: ajax/creategroup.php:19
+msgid "Group already exists"
+msgstr ""
+
+#: ajax/creategroup.php:28
+msgid "Unable to add group"
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr "Lưu email"
@@ -40,9 +53,13 @@ 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 "Lỗi xác thực"
+#: ajax/removegroup.php:16
+msgid "Unable to delete group"
+msgstr ""
+
+#: ajax/removeuser.php:22
+msgid "Unable to delete user"
+msgstr ""
 
 #: ajax/setlanguage.php:18
 msgid "Language changed"
@@ -171,27 +188,27 @@ msgstr "Giấy phép đã được cấp"
 msgid "by"
 msgstr "bởi"
 
-#: templates/help.php:8
+#: templates/help.php:9
 msgid "Documentation"
 msgstr "Tài liệu"
 
-#: templates/help.php:9
+#: templates/help.php:10
 msgid "Managing Big Files"
 msgstr "Quản lý tập tin lớn"
 
-#: templates/help.php:10
+#: templates/help.php:11
 msgid "Ask a question"
 msgstr "Đặt câu hỏi"
 
-#: templates/help.php:22
+#: templates/help.php:23
 msgid "Problems connecting to help database."
 msgstr "Vấn đề kết nối đến cơ sở dữ liệu."
 
-#: templates/help.php:23
+#: templates/help.php:24
 msgid "Go there manually."
 msgstr "Đến bằng thủ công"
 
-#: templates/help.php:31
+#: templates/help.php:32
 msgid "Answer"
 msgstr "trả lời"
 
diff --git a/l10n/zh_CN.GB2312/settings.po b/l10n/zh_CN.GB2312/settings.po
index bba93d3dff..5b26ea5904 100644
--- a/l10n/zh_CN.GB2312/settings.po
+++ b/l10n/zh_CN.GB2312/settings.po
@@ -8,20 +8,33 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 13:35+0200\n"
-"PO-Revision-Date: 2012-09-01 11:35+0000\n"
+"POT-Creation-Date: 2012-09-04 12:42+0200\n"
+"PO-Revision-Date: 2012-09-04 10:42+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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: zh_CN.GB2312\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ajax/apps/ocs.php:23
 msgid "Unable to load list from App Store"
 msgstr "不能从App Store 中加载列表"
 
+#: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr "认证错误"
+
+#: ajax/creategroup.php:19
+msgid "Group already exists"
+msgstr ""
+
+#: ajax/creategroup.php:28
+msgid "Unable to add group"
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr "Email 保存了"
@@ -38,9 +51,13 @@ msgstr "OpenID 改变了"
 msgid "Invalid request"
 msgstr "非法请求"
 
-#: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
-msgid "Authentication error"
-msgstr "认证错误"
+#: ajax/removegroup.php:16
+msgid "Unable to delete group"
+msgstr ""
+
+#: ajax/removeuser.php:22
+msgid "Unable to delete user"
+msgstr ""
 
 #: ajax/setlanguage.php:18
 msgid "Language changed"
@@ -169,27 +186,27 @@ msgstr "-许可了"
 msgid "by"
 msgstr "由"
 
-#: templates/help.php:8
+#: templates/help.php:9
 msgid "Documentation"
 msgstr "文档"
 
-#: templates/help.php:9
+#: templates/help.php:10
 msgid "Managing Big Files"
 msgstr "管理大文件"
 
-#: templates/help.php:10
+#: templates/help.php:11
 msgid "Ask a question"
 msgstr "提一个问题"
 
-#: templates/help.php:22
+#: templates/help.php:23
 msgid "Problems connecting to help database."
 msgstr "连接到帮助数据库时的问题"
 
-#: templates/help.php:23
+#: templates/help.php:24
 msgid "Go there manually."
 msgstr "收到转到."
 
-#: templates/help.php:31
+#: templates/help.php:32
 msgid "Answer"
 msgstr "回答"
 
diff --git a/l10n/zh_CN/settings.po b/l10n/zh_CN/settings.po
index f5ae4171e6..9d7fb799db 100644
--- a/l10n/zh_CN/settings.po
+++ b/l10n/zh_CN/settings.po
@@ -11,20 +11,33 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 13:35+0200\n"
-"PO-Revision-Date: 2012-09-01 11:35+0000\n"
+"POT-Creation-Date: 2012-09-04 12:42+0200\n"
+"PO-Revision-Date: 2012-09-04 10:42+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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: zh_CN\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ajax/apps/ocs.php:23
 msgid "Unable to load list from App Store"
 msgstr "无法从应用商店载入列表"
 
+#: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr "认证错误"
+
+#: ajax/creategroup.php:19
+msgid "Group already exists"
+msgstr ""
+
+#: ajax/creategroup.php:28
+msgid "Unable to add group"
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr "电子邮件已保存"
@@ -41,9 +54,13 @@ msgstr "OpenID 已修改"
 msgid "Invalid request"
 msgstr "非法请求"
 
-#: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
-msgid "Authentication error"
-msgstr "认证错误"
+#: ajax/removegroup.php:16
+msgid "Unable to delete group"
+msgstr ""
+
+#: ajax/removeuser.php:22
+msgid "Unable to delete user"
+msgstr ""
 
 #: ajax/setlanguage.php:18
 msgid "Language changed"
@@ -172,27 +189,27 @@ msgstr "-许可证"
 msgid "by"
 msgstr "由"
 
-#: templates/help.php:8
+#: templates/help.php:9
 msgid "Documentation"
 msgstr "文档"
 
-#: templates/help.php:9
+#: templates/help.php:10
 msgid "Managing Big Files"
 msgstr "管理大文件"
 
-#: templates/help.php:10
+#: templates/help.php:11
 msgid "Ask a question"
 msgstr "提问"
 
-#: templates/help.php:22
+#: templates/help.php:23
 msgid "Problems connecting to help database."
 msgstr "连接帮助数据库错误 "
 
-#: templates/help.php:23
+#: templates/help.php:24
 msgid "Go there manually."
 msgstr "手动访问"
 
-#: templates/help.php:31
+#: templates/help.php:32
 msgid "Answer"
 msgstr "回答"
 
diff --git a/l10n/zh_TW/settings.po b/l10n/zh_TW/settings.po
index bdb4435bdf..fe812d4e27 100644
--- a/l10n/zh_TW/settings.po
+++ b/l10n/zh_TW/settings.po
@@ -10,20 +10,33 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-02 02:01+0200\n"
-"PO-Revision-Date: 2012-09-01 13:53+0000\n"
-"Last-Translator: ywang <ywang1007@gmail.com>\n"
+"POT-Creation-Date: 2012-09-04 12:42+0200\n"
+"PO-Revision-Date: 2012-09-04 10:42+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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: zh_TW\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ajax/apps/ocs.php:23
 msgid "Unable to load list from App Store"
 msgstr "無法從 App Store 讀取清單"
 
+#: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
+#: ajax/togglegroups.php:18
+msgid "Authentication error"
+msgstr "認證錯誤"
+
+#: ajax/creategroup.php:19
+msgid "Group already exists"
+msgstr ""
+
+#: ajax/creategroup.php:28
+msgid "Unable to add group"
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr "Email已儲存"
@@ -40,9 +53,13 @@ msgstr "OpenID 已變更"
 msgid "Invalid request"
 msgstr "無效請求"
 
-#: ajax/removeuser.php:13 ajax/setquota.php:18 ajax/togglegroups.php:18
-msgid "Authentication error"
-msgstr "認證錯誤"
+#: ajax/removegroup.php:16
+msgid "Unable to delete group"
+msgstr ""
+
+#: ajax/removeuser.php:22
+msgid "Unable to delete user"
+msgstr ""
 
 #: ajax/setlanguage.php:18
 msgid "Language changed"
@@ -171,27 +188,27 @@ msgstr "-已許可"
 msgid "by"
 msgstr "由"
 
-#: templates/help.php:8
+#: templates/help.php:9
 msgid "Documentation"
 msgstr "文件"
 
-#: templates/help.php:9
+#: templates/help.php:10
 msgid "Managing Big Files"
 msgstr "管理大檔案"
 
-#: templates/help.php:10
+#: templates/help.php:11
 msgid "Ask a question"
 msgstr "提問"
 
-#: templates/help.php:22
+#: templates/help.php:23
 msgid "Problems connecting to help database."
 msgstr "連接到求助資料庫發生問題"
 
-#: templates/help.php:23
+#: templates/help.php:24
 msgid "Go there manually."
 msgstr "手動前往"
 
-#: templates/help.php:31
+#: templates/help.php:32
 msgid "Answer"
 msgstr "答案"
 
diff --git a/settings/l10n/ca.php b/settings/l10n/ca.php
index 6d9a043bc2..5c3f0edd97 100644
--- a/settings/l10n/ca.php
+++ b/settings/l10n/ca.php
@@ -1,10 +1,10 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "No s'ha pogut carregar la llista des de l'App Store",
+"Authentication error" => "Error d'autenticació",
 "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",
diff --git a/settings/l10n/cs_CZ.php b/settings/l10n/cs_CZ.php
index 39ac247aed..a9c14b5366 100644
--- a/settings/l10n/cs_CZ.php
+++ b/settings/l10n/cs_CZ.php
@@ -1,10 +1,10 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Nepodařílo se stáhnout seznam z App Store",
+"Authentication error" => "Chyba autorizace",
 "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",
diff --git a/settings/l10n/da.php b/settings/l10n/da.php
index 775087a707..35d34f6d3e 100644
--- a/settings/l10n/da.php
+++ b/settings/l10n/da.php
@@ -1,10 +1,10 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Kunne ikke indlæse listen fra App Store",
+"Authentication error" => "Adgangsfejl",
 "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",
diff --git a/settings/l10n/de.php b/settings/l10n/de.php
index 68bdb81f55..09fc7674d5 100644
--- a/settings/l10n/de.php
+++ b/settings/l10n/de.php
@@ -1,10 +1,10 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Die Liste der Apps im Store konnte nicht geladen werden.",
+"Authentication error" => "Anmeldungsfehler",
 "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",
diff --git a/settings/l10n/el.php b/settings/l10n/el.php
index d7333fab2c..671c3960bd 100644
--- a/settings/l10n/el.php
+++ b/settings/l10n/el.php
@@ -1,10 +1,10 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Σφάλμα στην φόρτωση της λίστας από το App Store",
+"Authentication error" => "Σφάλμα πιστοποίησης",
 "Email saved" => "Το Email αποθηκεύτηκε ",
 "Invalid email" => "Μη έγκυρο email",
 "OpenID Changed" => "Το OpenID άλλαξε",
 "Invalid request" => "Μη έγκυρο αίτημα",
-"Authentication error" => "Σφάλμα πιστοποίησης",
 "Language changed" => "Η γλώσσα άλλαξε",
 "Error" => "Σφάλμα",
 "Disable" => "Απενεργοποίηση",
diff --git a/settings/l10n/eo.php b/settings/l10n/eo.php
index c0ad6ef105..ccc184097a 100644
--- a/settings/l10n/eo.php
+++ b/settings/l10n/eo.php
@@ -1,10 +1,10 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Ne eblis ŝargi liston el aplikaĵovendejo",
+"Authentication error" => "Aŭtentiga eraro",
 "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",
diff --git a/settings/l10n/es.php b/settings/l10n/es.php
index 54a42eaad2..4b6bb2b90b 100644
--- a/settings/l10n/es.php
+++ b/settings/l10n/es.php
@@ -1,10 +1,10 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Imposible cargar la lista desde el App Store",
+"Authentication error" => "Error de autenticación",
 "Email saved" => "Correo guardado",
 "Invalid email" => "Correo no válido",
 "OpenID Changed" => "OpenID cambiado",
 "Invalid request" => "Solicitud no válida",
-"Authentication error" => "Error de autenticación",
 "Language changed" => "Idioma cambiado",
 "Error" => "Error",
 "Disable" => "Desactivar",
diff --git a/settings/l10n/et_EE.php b/settings/l10n/et_EE.php
index b2efd4d469..e0f0bcf7cf 100644
--- a/settings/l10n/et_EE.php
+++ b/settings/l10n/et_EE.php
@@ -1,10 +1,10 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "App Sotre'i nimekirja laadimine ebaõnnestus",
+"Authentication error" => "Autentimise viga",
 "Email saved" => "Kiri on salvestatud",
 "Invalid email" => "Vigane e-post",
 "OpenID Changed" => "OpenID on muudetud",
 "Invalid request" => "Vigane päring",
-"Authentication error" => "Autentimise viga",
 "Language changed" => "Keel on muudetud",
 "Error" => "Viga",
 "Disable" => "Lülita välja",
diff --git a/settings/l10n/eu.php b/settings/l10n/eu.php
index 61ccec9da8..ab3d36e2a4 100644
--- a/settings/l10n/eu.php
+++ b/settings/l10n/eu.php
@@ -1,10 +1,10 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Ezin izan da App Dendatik zerrenda kargatu",
+"Authentication error" => "Autentifikazio errorea",
 "Email saved" => "Eposta gorde da",
 "Invalid email" => "Baliogabeko eposta",
 "OpenID Changed" => "OpenID aldatuta",
 "Invalid request" => "Baliogabeko eskaria",
-"Authentication error" => "Autentifikazio errorea",
 "Language changed" => "Hizkuntza aldatuta",
 "Error" => "Errorea",
 "Disable" => "Ez-gaitu",
diff --git a/settings/l10n/fi_FI.php b/settings/l10n/fi_FI.php
index 0bca371983..4671f8b39a 100644
--- a/settings/l10n/fi_FI.php
+++ b/settings/l10n/fi_FI.php
@@ -1,10 +1,10 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Ei pystytä lataamaan listaa sovellusvarastosta (App Store)",
+"Authentication error" => "Todennusvirhe",
 "Email saved" => "Sähköposti tallennettu",
 "Invalid email" => "Virheellinen sähköposti",
 "OpenID Changed" => "OpenID on vaihdettu",
 "Invalid request" => "Virheellinen pyyntö",
-"Authentication error" => "Todennusvirhe",
 "Language changed" => "Kieli on vaihdettu",
 "Error" => "Virhe",
 "Disable" => "Poista käytöstä",
diff --git a/settings/l10n/fr.php b/settings/l10n/fr.php
index 235c5430df..c0a9b17df0 100644
--- a/settings/l10n/fr.php
+++ b/settings/l10n/fr.php
@@ -1,10 +1,10 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Impossible de charger la liste depuis l'App Store",
+"Authentication error" => "Erreur d'authentification",
 "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",
diff --git a/settings/l10n/gl.php b/settings/l10n/gl.php
index 67937e4921..96a6b53694 100644
--- a/settings/l10n/gl.php
+++ b/settings/l10n/gl.php
@@ -1,10 +1,10 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Non se puido cargar a lista desde a App Store",
+"Authentication error" => "Erro na autenticación",
 "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",
diff --git a/settings/l10n/hr.php b/settings/l10n/hr.php
index a0a8e2e100..608a23e69e 100644
--- a/settings/l10n/hr.php
+++ b/settings/l10n/hr.php
@@ -1,10 +1,10 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Nemogićnost učitavanja liste sa Apps Stora",
+"Authentication error" => "Greška kod autorizacije",
 "Email saved" => "Email spremljen",
 "Invalid email" => "Neispravan email",
 "OpenID Changed" => "OpenID promijenjen",
 "Invalid request" => "Neispravan zahtjev",
-"Authentication error" => "Greška kod autorizacije",
 "Language changed" => "Jezik promijenjen",
 "Error" => "Greška",
 "Disable" => "Isključi",
diff --git a/settings/l10n/hu_HU.php b/settings/l10n/hu_HU.php
index 4981f44654..0a8c6c14cd 100644
--- a/settings/l10n/hu_HU.php
+++ b/settings/l10n/hu_HU.php
@@ -1,10 +1,10 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Nem tölthető le a lista az App Store-ból",
+"Authentication error" => "Hitelesítési hiba",
 "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",
diff --git a/settings/l10n/it.php b/settings/l10n/it.php
index dc42c00999..cc3e6578ac 100644
--- a/settings/l10n/it.php
+++ b/settings/l10n/it.php
@@ -1,10 +1,10 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Impossibile caricare l'elenco dall'App Store",
+"Authentication error" => "Errore di autenticazione",
 "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",
diff --git a/settings/l10n/ja_JP.php b/settings/l10n/ja_JP.php
index 617020daa3..0e5add877c 100644
--- a/settings/l10n/ja_JP.php
+++ b/settings/l10n/ja_JP.php
@@ -1,10 +1,10 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "アプリストアからリストをロードできません",
+"Authentication error" => "認証エラー",
 "Email saved" => "メールアドレスを保存しました",
 "Invalid email" => "無効なメールアドレス",
 "OpenID Changed" => "OpenIDが変更されました",
 "Invalid request" => "無効なリクエストです",
-"Authentication error" => "認証エラー",
 "Language changed" => "言語が変更されました",
 "Error" => "エラー",
 "Disable" => "無効",
@@ -12,6 +12,7 @@
 "Saving..." => "保存中...",
 "__language_name__" => "Japanese (日本語)",
 "Security Warning" => "セキュリティ警告",
+"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." => "データディレクトリとファイルが恐らくインターネットからアクセスできるようになっています。ownCloudが提供する .htaccessファイルが機能していません。データディレクトリを全くアクセスできないようにするか、データディレクトリをウェブサーバのドキュメントルートの外に置くようにウェブサーバを設定することを強くお勧めします。",
 "Cron" => "cron(自動定期実行)",
 "execute one task with each page loaded" => "ページを開く毎にタスクを1つ実行",
 "cron.php is registered at a webcron service" => "cron.phpをwebcronサービスに登録しました",
@@ -27,6 +28,7 @@
 "Allow users to only share with users in their groups" => "ユーザーがグループの人にしか共有出来ないようにする",
 "Log" => "ログ",
 "More" => "もっと",
+"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/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>." => "<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>により開発されています、<a href=\"https://github.com/owncloud\" target=\"_blank\">ソースコード</a>ライセンスは、<a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a> ライセンスにより提供されています。",
 "Add your App" => "アプリを追加",
 "Select an App" => "アプリを選択してください",
 "See application page at apps.owncloud.com" => "apps.owncloud.com でアプリケーションのページを見てください",
diff --git a/settings/l10n/ko.php b/settings/l10n/ko.php
index 7bcf67cc2a..e0baad73d2 100644
--- a/settings/l10n/ko.php
+++ b/settings/l10n/ko.php
@@ -1,10 +1,10 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "앱 스토어에서 목록을 가져올 수 없습니다",
+"Authentication error" => "인증 오류",
 "Email saved" => "이메일 저장",
 "Invalid email" => "잘못된 이메일",
 "OpenID Changed" => "OpenID 변경됨",
 "Invalid request" => "잘못된 요청",
-"Authentication error" => "인증 오류",
 "Language changed" => "언어가 변경되었습니다",
 "Error" => "에러",
 "Disable" => "비활성화",
diff --git a/settings/l10n/lb.php b/settings/l10n/lb.php
index b419cb9278..8dc05e6b49 100644
--- a/settings/l10n/lb.php
+++ b/settings/l10n/lb.php
@@ -1,10 +1,10 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Konnt Lescht net vum App Store lueden",
+"Authentication error" => "Authentifikatioun's Fehler",
 "Email saved" => "E-mail gespäichert",
 "Invalid email" => "Ongülteg e-mail",
 "OpenID Changed" => "OpenID huet geännert",
 "Invalid request" => "Ongülteg Requête",
-"Authentication error" => "Authentifikatioun's Fehler",
 "Language changed" => "Sprooch huet geännert",
 "Error" => "Fehler",
 "Disable" => "Ofschalten",
diff --git a/settings/l10n/lv.php b/settings/l10n/lv.php
index eb87bed7f8..67b55f9001 100644
--- a/settings/l10n/lv.php
+++ b/settings/l10n/lv.php
@@ -1,10 +1,10 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Nebija iespējams lejuplādēt sarakstu no aplikāciju veikala",
+"Authentication error" => "Ielogošanās kļūme",
 "Email saved" => "Epasts tika saglabāts",
 "Invalid email" => "Nepareizs epasts",
 "OpenID Changed" => "OpenID nomainīts",
 "Invalid request" => "Nepareizs vaicājums",
-"Authentication error" => "Ielogošanās kļūme",
 "Language changed" => "Valoda tika nomainīta",
 "Error" => "Kļūme",
 "Disable" => "Atvienot",
diff --git a/settings/l10n/ms_MY.php b/settings/l10n/ms_MY.php
index de2384a4ae..8d9ac2fa69 100644
--- a/settings/l10n/ms_MY.php
+++ b/settings/l10n/ms_MY.php
@@ -1,9 +1,9 @@
 <?php $TRANSLATIONS = array(
+"Authentication error" => "Ralat pengesahan",
 "Email saved" => "Emel disimpan",
 "Invalid email" => "Emel tidak sah",
 "OpenID Changed" => "OpenID diubah",
 "Invalid request" => "Permintaan tidak sah",
-"Authentication error" => "Ralat pengesahan",
 "Language changed" => "Bahasa diubah",
 "Disable" => "Nyahaktif",
 "Enable" => "Aktif",
diff --git a/settings/l10n/nb_NO.php b/settings/l10n/nb_NO.php
index 137e5802a2..6536e50e21 100644
--- a/settings/l10n/nb_NO.php
+++ b/settings/l10n/nb_NO.php
@@ -1,10 +1,10 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Lasting av liste fra App Store feilet.",
+"Authentication error" => "Autentikasjonsfeil",
 "Email saved" => "Epost lagret",
 "Invalid email" => "Ugyldig epost",
 "OpenID Changed" => "OpenID endret",
 "Invalid request" => "Ugyldig forespørsel",
-"Authentication error" => "Autentikasjonsfeil",
 "Language changed" => "Språk endret",
 "Error" => "Feil",
 "Disable" => "Slå avBehandle ",
diff --git a/settings/l10n/nl.php b/settings/l10n/nl.php
index f480acba66..081e6af8f5 100644
--- a/settings/l10n/nl.php
+++ b/settings/l10n/nl.php
@@ -1,10 +1,10 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Kan de lijst niet van de App store laden",
+"Authentication error" => "Authenticatie fout",
 "Email saved" => "E-mail bewaard",
 "Invalid email" => "Ongeldige e-mail",
 "OpenID Changed" => "OpenID is aangepast",
 "Invalid request" => "Ongeldig verzoek",
-"Authentication error" => "Authenticatie fout",
 "Language changed" => "Taal aangepast",
 "Error" => "Fout",
 "Disable" => "Uitschakelen",
diff --git a/settings/l10n/nn_NO.php b/settings/l10n/nn_NO.php
index e5968bcd4a..7b1a35c8ef 100644
--- a/settings/l10n/nn_NO.php
+++ b/settings/l10n/nn_NO.php
@@ -1,10 +1,10 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Klarer ikkje å laste inn liste fra App Store",
+"Authentication error" => "Feil i autentisering",
 "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",
diff --git a/settings/l10n/pl.php b/settings/l10n/pl.php
index d331f2e147..693727bcb7 100644
--- a/settings/l10n/pl.php
+++ b/settings/l10n/pl.php
@@ -1,10 +1,10 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Nie mogę załadować listy aplikacji",
+"Authentication error" => "Błąd uwierzytelniania",
 "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",
diff --git a/settings/l10n/pt_BR.php b/settings/l10n/pt_BR.php
index 57aaa27260..55b09b27f8 100644
--- a/settings/l10n/pt_BR.php
+++ b/settings/l10n/pt_BR.php
@@ -1,9 +1,9 @@
 <?php $TRANSLATIONS = array(
+"Authentication error" => "erro de autenticação",
 "Email saved" => "Email gravado",
 "Invalid email" => "Email inválido",
 "OpenID Changed" => "Mudou OpenID",
 "Invalid request" => "Pedido inválido",
-"Authentication error" => "erro de autenticação",
 "Language changed" => "Mudou Idioma",
 "Error" => "Erro",
 "Disable" => "Desabilitado",
diff --git a/settings/l10n/pt_PT.php b/settings/l10n/pt_PT.php
index af12c42de4..c3c575bcbe 100644
--- a/settings/l10n/pt_PT.php
+++ b/settings/l10n/pt_PT.php
@@ -1,10 +1,10 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Incapaz de carregar a lista da App Store",
+"Authentication error" => "Erro de autenticação",
 "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",
diff --git a/settings/l10n/ro.php b/settings/l10n/ro.php
index b47e9c491a..ebb1066a74 100644
--- a/settings/l10n/ro.php
+++ b/settings/l10n/ro.php
@@ -1,10 +1,10 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Imposibil de încărcat lista din App Store",
+"Authentication error" => "Eroare de autentificare",
 "Email saved" => "E-mail salvat",
 "Invalid email" => "E-mail nevalid",
 "OpenID Changed" => "OpenID schimbat",
 "Invalid request" => "Cerere eronată",
-"Authentication error" => "Eroare de autentificare",
 "Language changed" => "Limba a fost schimbată",
 "Error" => "Erroare",
 "Disable" => "Dezactivați",
diff --git a/settings/l10n/ru.php b/settings/l10n/ru.php
index 949e9572c1..3d8ecbf516 100644
--- a/settings/l10n/ru.php
+++ b/settings/l10n/ru.php
@@ -1,10 +1,10 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Загрузка из App Store запрещена",
+"Authentication error" => "Ошибка авторизации",
 "Email saved" => "Email сохранен",
 "Invalid email" => "Неправильный Email",
 "OpenID Changed" => "OpenID изменён",
 "Invalid request" => "Неверный запрос",
-"Authentication error" => "Ошибка авторизации",
 "Language changed" => "Язык изменён",
 "Error" => "Ошибка",
 "Disable" => "Отключить",
diff --git a/settings/l10n/sl.php b/settings/l10n/sl.php
index 9dd7813cc1..834311a7e7 100644
--- a/settings/l10n/sl.php
+++ b/settings/l10n/sl.php
@@ -1,10 +1,10 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Ne morem naložiti seznama iz App Store",
+"Authentication error" => "Napaka overitve",
 "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",
diff --git a/settings/l10n/sv.php b/settings/l10n/sv.php
index 74b5406f80..c2292b23f9 100644
--- a/settings/l10n/sv.php
+++ b/settings/l10n/sv.php
@@ -1,10 +1,10 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Kan inte ladda listan från App Store",
+"Authentication error" => "Autentiseringsfel",
 "Email saved" => "E-post sparad",
 "Invalid email" => "Ogiltig e-post",
 "OpenID Changed" => "OpenID ändrat",
 "Invalid request" => "Ogiltig begäran",
-"Authentication error" => "Autentiseringsfel",
 "Language changed" => "Språk ändrades",
 "Error" => "Fel",
 "Disable" => "Deaktivera",
diff --git a/settings/l10n/th_TH.php b/settings/l10n/th_TH.php
index 862445524f..46bdf08aa9 100644
--- a/settings/l10n/th_TH.php
+++ b/settings/l10n/th_TH.php
@@ -1,10 +1,10 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "ไม่สามารถโหลดรายการจาก App Store ได้",
+"Authentication error" => "เกิดข้อผิดพลาดเกี่ยวกับสิทธิ์การเข้าใช้งาน",
 "Email saved" => "อีเมลถูกบันทึกแล้ว",
 "Invalid email" => "อีเมลไม่ถูกต้อง",
 "OpenID Changed" => "เปลี่ยนชื่อบัญชี OpenID แล้ว",
 "Invalid request" => "คำร้องขอไม่ถูกต้อง",
-"Authentication error" => "เกิดข้อผิดพลาดเกี่ยวกับสิทธิ์การเข้าใช้งาน",
 "Language changed" => "เปลี่ยนภาษาเรียบร้อยแล้ว",
 "Error" => "ข้อผิดพลาด",
 "Disable" => "ปิดใช้งาน",
diff --git a/settings/l10n/tr.php b/settings/l10n/tr.php
index 8182236a2d..2350dc49aa 100644
--- a/settings/l10n/tr.php
+++ b/settings/l10n/tr.php
@@ -1,9 +1,9 @@
 <?php $TRANSLATIONS = array(
+"Authentication error" => "Eşleşme hata",
 "Email saved" => "Eposta kaydedildi",
 "Invalid email" => "Geçersiz eposta",
 "OpenID Changed" => "OpenID Değiştirildi",
 "Invalid request" => "Geçersiz istek",
-"Authentication error" => "Eşleşme hata",
 "Language changed" => "Dil değiştirildi",
 "Disable" => "Etkin değil",
 "Enable" => "Etkin",
diff --git a/settings/l10n/vi.php b/settings/l10n/vi.php
index 9e0709239f..95dd88c62c 100644
--- a/settings/l10n/vi.php
+++ b/settings/l10n/vi.php
@@ -1,10 +1,10 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Không thể tải danh sách ứng dụng từ App Store",
+"Authentication error" => "Lỗi xác thực",
 "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ệ",
-"Authentication error" => "Lỗi xác thực",
 "Language changed" => "Ngôn ngữ đã được thay đổi",
 "Error" => "Lỗi",
 "Disable" => "Vô hiệu",
diff --git a/settings/l10n/zh_CN.GB2312.php b/settings/l10n/zh_CN.GB2312.php
index faf125225b..f4e0a42c83 100644
--- a/settings/l10n/zh_CN.GB2312.php
+++ b/settings/l10n/zh_CN.GB2312.php
@@ -1,10 +1,10 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "不能从App Store 中加载列表",
+"Authentication error" => "认证错误",
 "Email saved" => "Email 保存了",
 "Invalid email" => "非法Email",
 "OpenID Changed" => "OpenID 改变了",
 "Invalid request" => "非法请求",
-"Authentication error" => "认证错误",
 "Language changed" => "语言改变了",
 "Error" => "错误",
 "Disable" => "禁用",
diff --git a/settings/l10n/zh_CN.php b/settings/l10n/zh_CN.php
index b008955a4b..2adb0e104e 100644
--- a/settings/l10n/zh_CN.php
+++ b/settings/l10n/zh_CN.php
@@ -1,10 +1,10 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "无法从应用商店载入列表",
+"Authentication error" => "认证错误",
 "Email saved" => "电子邮件已保存",
 "Invalid email" => "无效的电子邮件",
 "OpenID Changed" => "OpenID 已修改",
 "Invalid request" => "非法请求",
-"Authentication error" => "认证错误",
 "Language changed" => "语言已修改",
 "Error" => "错误",
 "Disable" => "禁用",
diff --git a/settings/l10n/zh_TW.php b/settings/l10n/zh_TW.php
index f0b0de7d73..82dd8dd42b 100644
--- a/settings/l10n/zh_TW.php
+++ b/settings/l10n/zh_TW.php
@@ -1,10 +1,10 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "無法從 App Store 讀取清單",
+"Authentication error" => "認證錯誤",
 "Email saved" => "Email已儲存",
 "Invalid email" => "無效的email",
 "OpenID Changed" => "OpenID 已變更",
 "Invalid request" => "無效請求",
-"Authentication error" => "認證錯誤",
 "Language changed" => "語言已變更",
 "Error" => "錯誤",
 "Disable" => "停用",

From d14f8fa681aa820334fcb1747cc171275c84a72d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Tue, 4 Sep 2012 15:21:52 +0300
Subject: [PATCH 1102/1224] Respect coding style

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

diff --git a/lib/app.php b/lib/app.php
index 154b1a964e..e772704b7d 100755
--- a/lib/app.php
+++ b/lib/app.php
@@ -83,7 +83,7 @@ class OC_App{
 	 * @param string app
 	 */
 	public static function loadApp($app) {
-		if(is_file(self::getAppPath($app).'/appinfo/app.php')){
+		if(is_file(self::getAppPath($app).'/appinfo/app.php')) {
 			self::checkUpgrade($app);
 			require_once $app.'/appinfo/app.php';
 		}

From e4e0b5a82217be7a86d47db1b5fd0de545a6fbb2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Tue, 4 Sep 2012 15:34:09 +0300
Subject: [PATCH 1103/1224] Respect coding style

---
 lib/base.php | 165 +++++++++++++++++++++++++--------------------------
 1 file changed, 82 insertions(+), 83 deletions(-)

diff --git a/lib/base.php b/lib/base.php
index 1875edb500..20f5fca204 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -70,32 +70,32 @@ class OC{
 	 * SPL autoload
 	 */
 	public static function autoload($className){
-		if(array_key_exists($className,OC::$CLASSPATH)){
+		if(array_key_exists($className, OC::$CLASSPATH)) {
 			/** @TODO: Remove this when necessary
 			 Remove "apps/" from inclusion path for smooth migration to mutli app dir
 			*/
-			$path = preg_replace('/apps\//','', OC::$CLASSPATH[$className]);
+			$path = preg_replace('/apps\//', '', OC::$CLASSPATH[$className]);
 			require_once $path;
 		}
-		elseif(strpos($className,'OC_')===0){
-			$path = strtolower(str_replace('_','/',substr($className,3)) . '.php');
+		elseif(strpos($className, 'OC_')===0) {
+			$path = strtolower(str_replace('_', '/', substr($className,3)) . '.php');
 		}
-		elseif(strpos($className,'OCP\\')===0){
-			$path = 'public/'.strtolower(str_replace('\\','/',substr($className,3)) . '.php');
+		elseif(strpos($className, 'OCP\\')===0) {
+			$path = 'public/'.strtolower(str_replace('\\',' /',s ubstr($className,3)) . '.php');
 		}
-		elseif(strpos($className,'OCA\\')===0){
-			$path = 'apps/'.strtolower(str_replace('\\','/',substr($className,3)) . '.php');
+		elseif(strpos($className, 'OCA\\')===0) {
+			$path = 'apps/'.strtolower(str_replace('\\', '/', substr($className,3)) . '.php');
 		}
-		elseif(strpos($className,'Sabre_')===0) {
-			$path =  str_replace('_','/',$className) . '.php';
+		elseif(strpos($className, 'Sabre_')===0) {
+			$path =  str_replace('_', '/', $className) . '.php';
 		}
-		elseif(strpos($className,'Test_')===0){
-			$path =  'tests/lib/'.strtolower(str_replace('_','/',substr($className,5)) . '.php');
+		elseif(strpos($className,'Test_')===0) {
+			$path =  'tests/lib/'.strtolower(str_replace('_', '/', substr($className,5 )) . '.php');
 		}else{
 			return false;
 		}
 		
-		if($fullPath = stream_resolve_include_path($path)){
+		if($fullPath = stream_resolve_include_path($path)) {
 			require_once $path;
 		}
 		return false;
@@ -103,23 +103,23 @@ class OC{
 
 	public static function initPaths(){
 		// calculate the root directories
-		OC::$SERVERROOT=str_replace("\\",'/',substr(__FILE__,0,-13));
-		OC::$SUBURI= str_replace("\\","/",substr(realpath($_SERVER["SCRIPT_FILENAME"]),strlen(OC::$SERVERROOT)));
+		OC::$SERVERROOT=str_replace("\\", '/', substr(__FILE__, 0, -13));
+		OC::$SUBURI= str_replace("\\", "/", substr(realpath($_SERVER["SCRIPT_FILENAME"]), strlen(OC::$SERVERROOT)));
 		$scriptName=$_SERVER["SCRIPT_NAME"];
-		if(substr($scriptName,-1)=='/'){
+		if(substr($scriptName, -1)=='/') {
 			$scriptName.='index.php';
 			//make sure suburi follows the same rules as scriptName
-			if(substr(OC::$SUBURI,-9)!='index.php'){
-				if(substr(OC::$SUBURI,-1)!='/'){
+			if(substr(OC::$SUBURI, -9)!='index.php') {
+				if(substr(OC::$SUBURI,-1)!='/' {
 					OC::$SUBURI=OC::$SUBURI.'/';
 				}
 				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]!=='/'){
+		if(OC::$WEBROOT!='' and OC::$WEBROOT[0]!=='/') {
 			OC::$WEBROOT='/'.OC::$WEBROOT;
 		}
 
@@ -130,13 +130,13 @@ class OC{
 		);
 
 		// search the 3rdparty folder
-		if(OC_Config::getValue('3rdpartyroot', '')<>'' and OC_Config::getValue('3rdpartyurl', '')<>''){
+		if(OC_Config::getValue('3rdpartyroot', '')<>'' and OC_Config::getValue('3rdpartyurl', '')<>'') {
 			OC::$THIRDPARTYROOT=OC_Config::getValue('3rdpartyroot', '');
 			OC::$THIRDPARTYWEBROOT=OC_Config::getValue('3rdpartyurl', '');
-		}elseif(file_exists(OC::$SERVERROOT.'/3rdparty')){
+		}elseif(file_exists(OC::$SERVERROOT.'/3rdparty')) {
 			OC::$THIRDPARTYROOT=OC::$SERVERROOT;
 			OC::$THIRDPARTYWEBROOT=OC::$WEBROOT;
-		}elseif(file_exists(OC::$SERVERROOT.'/../3rdparty')){
+		}elseif(file_exists(OC::$SERVERROOT.'/../3rdparty')) {
 			OC::$THIRDPARTYWEBROOT=rtrim(dirname(OC::$WEBROOT), '/');
 			OC::$THIRDPARTYROOT=rtrim(dirname(OC::$SERVERROOT), '/');
 		}else{
@@ -145,21 +145,21 @@ class OC{
 		}
 		// search the apps folder
 		$config_paths = OC_Config::getValue('apps_paths', array());
-		if(! empty($config_paths)){
+		if(! empty($config_paths)) {
 			foreach($config_paths as $paths) {
 				if( isset($paths['url']) && isset($paths['path'])) {
-					$paths['url'] = rtrim($paths['url'],'/');
-					$paths['path'] = rtrim($paths['path'],'/');
+					$paths['url'] = rtrim($paths['url'], '/');
+					$paths['path'] = rtrim($paths['path'], '/');
 					OC::$APPSROOTS[] = $paths;
 				}
 			}
-		}elseif(file_exists(OC::$SERVERROOT.'/apps')){
+		}elseif(file_exists(OC::$SERVERROOT.'/apps')) {
 			OC::$APPSROOTS[] = array('path'=> OC::$SERVERROOT.'/apps', 'url' => '/apps', 'writable' => true);
-		}elseif(file_exists(OC::$SERVERROOT.'/../apps')){
+		}elseif(file_exists(OC::$SERVERROOT.'/../apps')) {
 			OC::$APPSROOTS[] = array('path'=> rtrim(dirname(OC::$SERVERROOT), '/').'/apps', 'url' => '/apps', 'writable' => true);
 		}
 
-		if(empty(OC::$APPSROOTS)){
+		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;
 		}
@@ -181,7 +181,7 @@ 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){
+			if(!OC::$CLI) {
 				$url = 'http://'.$_SERVER['SERVER_NAME'].OC::$WEBROOT.'/index.php';
 				header("Location: $url");
 			}
@@ -191,7 +191,7 @@ class OC{
 
 	public static function checkSSL() {
 		// redirect to https site if configured
-		if( OC_Config::getValue( "forcessl", false )){
+		if( OC_Config::getValue( "forcessl", false )) {
 			ini_set("session.cookie_secure", "on");
 			if(OC_Request::serverProtocol()<>'https' and !OC::$CLI) {
 				$url = "https://". OC_Request::serverHost() . $_SERVER['REQUEST_URI'];
@@ -202,24 +202,24 @@ class OC{
 	}
 
 	public static function checkUpgrade() {
-		if(OC_Config::getValue('installed', false)){
-			$installedVersion=OC_Config::getValue('version','0.0.0');
-			$currentVersion=implode('.',OC_Util::getVersion());
+		if(OC_Config::getValue('installed', false)) {
+			$installedVersion=OC_Config::getValue('version', '0.0.0');
+			$currentVersion=implode('.', OC_Util::getVersion());
 			if (version_compare($currentVersion, $installedVersion, '>')) {
-				OC_Log::write('core','starting upgrade from '.$installedVersion.' to '.$currentVersion,OC_Log::DEBUG);
+				OC_Log::write('core', 'starting upgrade from '.$installedVersion.' to '.$currentVersion, OC_Log::DEBUG);
 				$result=OC_DB::updateDbFromStructure(OC::$SERVERROOT.'/db_structure.xml');
-				if(!$result){
+				if(!$result) {
 					echo 'Error while upgrading the database';
 					die();
 				}
 				if(file_exists(OC::$SERVERROOT."/config/config.php") and !is_writable(OC::$SERVERROOT."/config/config.php")) {
 					$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->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;
 				}
 
-				OC_Config::setValue('version',implode('.',OC_Util::getVersion()));
+				OC_Config::setValue('version', implode('.', OC_Util::getVersion()));
 				OC_App::checkAppsRequirements();
 				// load all apps to also upgrade enabled apps
 				OC_App::loadApps();
@@ -239,10 +239,10 @@ class OC{
 		OC_Util::addScript( "eventsource" );
 		OC_Util::addScript( "config" );
 		//OC_Util::addScript( "multiselect" );
-		OC_Util::addScript('search','result');
+		OC_Util::addScript('search', 'result');
 
 		if( OC_Config::getValue( 'installed', false )){
-			if( OC_Appconfig::getValue( 'core', 'backgroundjobs_mode', 'ajax' ) == 'ajax' ){
+			if( OC_Appconfig::getValue( 'core', 'backgroundjobs_mode', 'ajax' ) == 'ajax' ) {
 				OC_Util::addScript( 'backgroundjobs' );
 			}
 		}
@@ -254,7 +254,7 @@ class OC{
 	}
 
 	public static function initSession() {
-		ini_set('session.cookie_httponly','1;');
+		ini_set('session.cookie_httponly', '1;');
 		session_start();
 	}
 
@@ -266,13 +266,13 @@ class OC{
 		// set some stuff
 		//ob_start();
 		error_reporting(E_ALL | E_STRICT);
-		if (defined('DEBUG') && DEBUG){
+		if (defined('DEBUG') && DEBUG) {
 			ini_set('display_errors', 1);
 		}
 		self::$CLI=(php_sapi_name() == 'cli');
 
 		date_default_timezone_set('UTC');
-		ini_set('arg_separator.output','&amp;');
+		ini_set('arg_separator.output', '&amp;');
 
 		// try to switch magic quotes off.
 		if(function_exists('set_magic_quotes_runtime')) {
@@ -285,29 +285,27 @@ class OC{
 
 		//try to set the maximum execution time to 60min
 		@set_time_limit(3600);
-		@ini_set('max_execution_time',3600);
-		@ini_set('max_input_time',3600);
+		@ini_set('max_execution_time', 3600);
+		@ini_set('max_input_time', 3600);
 
 		//try to set the maximum filesize to 10G
-		@ini_set('upload_max_filesize','10G');
-		@ini_set('post_max_size','10G');
-		@ini_set('file_uploads','50');
+		@ini_set('upload_max_filesize', '10G');
+		@ini_set('post_max_size', '10G');
+		@ini_set('file_uploads', '50');
 
 		//try to set the session lifetime to 60min
-		@ini_set('gc_maxlifetime','3600');
+		@ini_set('gc_maxlifetime', '3600');
 
 
 		//set http auth headers for apache+php-cgi work around
-		if (isset($_SERVER['HTTP_AUTHORIZATION']) && preg_match('/Basic\s+(.*)$/i', $_SERVER['HTTP_AUTHORIZATION'], $matches))
-		{
+		if (isset($_SERVER['HTTP_AUTHORIZATION']) && preg_match('/Basic\s+(.*)$/i', $_SERVER['HTTP_AUTHORIZATION'], $matches)) {
 			list($name, $password) = explode(':', base64_decode($matches[1]));
 			$_SERVER['PHP_AUTH_USER'] = strip_tags($name);
 			$_SERVER['PHP_AUTH_PW'] = strip_tags($password);
 		}
 
 		//set http auth headers for apache+php-cgi work around if variable gets renamed by apache
-		if (isset($_SERVER['REDIRECT_HTTP_AUTHORIZATION']) && preg_match('/Basic\s+(.*)$/i', $_SERVER['REDIRECT_HTTP_AUTHORIZATION'], $matches))
-		{
+		if (isset($_SERVER['REDIRECT_HTTP_AUTHORIZATION']) && preg_match('/Basic\s+(.*)$/i', $_SERVER['REDIRECT_HTTP_AUTHORIZATION'], $matches)) {
 			list($name, $password) = explode(':', base64_decode($matches[1]));
 			$_SERVER['PHP_AUTH_USER'] = strip_tags($name);
 			$_SERVER['PHP_AUTH_PW'] = strip_tags($password);
@@ -316,14 +314,14 @@ class OC{
 		self::initPaths();
 
 		// set debug mode if an xdebug session is active
-		if (!defined('DEBUG') || !DEBUG){
-			if(isset($_COOKIE['XDEBUG_SESSION'])){
+		if (!defined('DEBUG') || !DEBUG) {
+			if(isset($_COOKIE['XDEBUG_SESSION'])) {
 				define('DEBUG',true);
 			}
 		}
 
 		// register the stream wrappers
-		require_once('streamwrappers.php');
+		require_once 'streamwrappers.php';
 		stream_wrapper_register("fakedir", "OC_FakeDirStream");
 		stream_wrapper_register('static', 'OC_StaticStreamWrapper');
 		stream_wrapper_register('close', 'OC_CloseStreamWrapper');
@@ -341,7 +339,7 @@ class OC{
 		}
 
 		// User and Groups
-		if( !OC_Config::getValue( "installed", false )){
+		if( !OC_Config::getValue( "installed", false )) {
 			$_SESSION['user_id'] = '';
 		}
 
@@ -352,8 +350,8 @@ class OC{
 		// This includes plugins for users and filesystems as well
 		global $RUNTIME_NOAPPS;
 		global $RUNTIME_APPTYPES;
-		if(!$RUNTIME_NOAPPS ){
-			if($RUNTIME_APPTYPES){
+		if(!$RUNTIME_NOAPPS ) {
+			if($RUNTIME_APPTYPES) {
 				OC_App::loadApps($RUNTIME_APPTYPES);
 			}else{
 				OC_App::loadApps();
@@ -368,7 +366,7 @@ class OC{
 		OC_Hook::connect('OC_User', 'post_login', 'OC_Cache_File', 'loginListener');
 
 		// Check for blacklisted files
-		OC_Hook::connect('OC_Filesystem','write','OC_Filesystem','isBlacklisted');
+		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
@@ -376,7 +374,7 @@ class OC{
 
 		//parse the given parameters
 		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){
+		if(substr_count(self::$REQUESTEDAPP, '?') != 0) {
 			$app = substr(self::$REQUESTEDAPP, 0, strpos(self::$REQUESTEDAPP, '?'));
 			$param = substr($_GET['app'], strpos($_GET['app'], '?') + 1);
 			parse_str($param, $get);
@@ -385,7 +383,7 @@ class OC{
 			$_GET['app'] = $app;
 		}
 		self::$REQUESTEDFILE = (isset($_GET['getfile'])?$_GET['getfile']:null);
-		if(substr_count(self::$REQUESTEDFILE, '?') != 0){
+		if(substr_count(self::$REQUESTEDFILE, '?') != 0) {
 			$file = substr(self::$REQUESTEDFILE, 0, strpos(self::$REQUESTEDFILE, '?'));
 			$param = substr(self::$REQUESTEDFILE, strpos(self::$REQUESTEDFILE, '?') + 1);
 			parse_str($param, $get);
@@ -393,10 +391,10 @@ class OC{
 			self::$REQUESTEDFILE = $file;
 			$_GET['getfile'] = $file;
 		}
-		if(!is_null(self::$REQUESTEDFILE)){
+		if(!is_null(self::$REQUESTEDFILE)) {
 			$subdir = OC_App::getAppPath(OC::$REQUESTEDAPP) . '/' . self::$REQUESTEDFILE;
 			$parent = OC_App::getAppPath(OC::$REQUESTEDAPP);
-			if(!OC_Helper::issubdirectory($subdir, $parent)){
+			if(!OC_Helper::issubdirectory($subdir, $parent)) {
 				self::$REQUESTEDFILE = null;
 				header('HTTP/1.0 404 Not Found');
 				exit;
@@ -411,24 +409,24 @@ class OC{
 		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 );
+			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');
+			require_once 'setup.php';
 			exit();
 		}
 		// Handle WebDAV
-		if($_SERVER['REQUEST_METHOD']=='PROPFIND'){
+		if($_SERVER['REQUEST_METHOD']=='PROPFIND') {
 			header('location: '.OC_Helper::linkToRemote('webdav'));
 			return;
 		}
 		// Handle app css files
-		if(substr(OC::$REQUESTEDFILE,-3) == 'css') {
+		if(substr(OC::$REQUESTEDFILE, -3) == 'css') {
 			self::loadCSSFile();
 			return;
 		}
@@ -446,8 +444,7 @@ class OC{
 					$file = 'index.php';
 				}
 				$file_ext = substr($file, -3);
-				if ($file_ext != 'php'
-					|| !self::loadAppScriptFile($app, $file)) {
+				if ($file_ext != 'php'|| !self::loadAppScriptFile($app, $file)) {
 					header('HTTP/1.0 404 Not Found');
 				}
 			}
@@ -462,7 +459,7 @@ class OC{
 		$file = $app_path . '/' . $file;
 		unset($app, $app_path);
 		if (file_exists($file)) {
-			require_once($file);
+			require_once $file;
 			return true;
 		}
 		return false;
@@ -501,18 +498,20 @@ class OC{
 
 	protected static function tryRememberLogin() {
 		if(!isset($_COOKIE["oc_remember_login"])
-		|| !isset($_COOKIE["oc_token"])
-		|| !isset($_COOKIE["oc_username"])
-		|| !$_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);
+			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_Preferences::getValue($_COOKIE['oc_username'], "login", "token") === $_COOKIE['oc_token'])
+		{
 			OC_User::setUserId($_COOKIE['oc_username']);
 			OC_Util::redirectToDefaultPage();
 		}
@@ -537,9 +536,9 @@ class OC{
 		OC_User::setupBackends();
 		
 		if(OC_User::login($_POST["user"], $_POST["password"])) {
-			if(!empty($_POST["remember_login"])){
+			if(!empty($_POST["remember_login"])) {
 				if(defined("DEBUG") && DEBUG) {
-					OC_Log::write('core','Setting remember login to cookie', OC_Log::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);
@@ -559,7 +558,7 @@ class OC{
 			return false;
 		}
 		OC_App::loadApps(array('authentication'));
-		if (OC_User::login($_SERVER["PHP_AUTH_USER"],$_SERVER["PHP_AUTH_PW"]))	{
+		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']:'');
@@ -571,7 +570,7 @@ class OC{
 }
 
 // define runtime variables - unless this already has been done
-if( !isset( $RUNTIME_NOAPPS )){
+if( !isset( $RUNTIME_NOAPPS )) {
 	$RUNTIME_NOAPPS = false;
 }
 
@@ -581,7 +580,7 @@ if(!function_exists('get_temp_dir')) {
 		if( $temp=getenv('TMP') )        return $temp;
 		if( $temp=getenv('TEMP') )        return $temp;
 		if( $temp=getenv('TMPDIR') )    return $temp;
-		$temp=tempnam(__FILE__,'');
+		$temp=tempnam(__FILE__, '');
 		if (file_exists($temp)) {
 			unlink($temp);
 			return dirname($temp);

From 2028500c0a46440c635d0fb8daec38abc4742700 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Tue, 4 Sep 2012 15:42:58 +0300
Subject: [PATCH 1104/1224] fixing syntax error - sorry for that

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

diff --git a/lib/base.php b/lib/base.php
index 20f5fca204..b1117eda11 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -78,19 +78,19 @@ class OC{
 			require_once $path;
 		}
 		elseif(strpos($className, 'OC_')===0) {
-			$path = strtolower(str_replace('_', '/', substr($className,3)) . '.php');
+			$path = strtolower(str_replace('_', '/', substr($className, 3)) . '.php');
 		}
 		elseif(strpos($className, 'OCP\\')===0) {
-			$path = 'public/'.strtolower(str_replace('\\',' /',s ubstr($className,3)) . '.php');
+			$path = 'public/'.strtolower(str_replace('\\',' /', substr($className, 3)) . '.php');
 		}
 		elseif(strpos($className, 'OCA\\')===0) {
-			$path = 'apps/'.strtolower(str_replace('\\', '/', substr($className,3)) . '.php');
+			$path = 'apps/'.strtolower(str_replace('\\', '/', substr($className, 3)) . '.php');
 		}
 		elseif(strpos($className, 'Sabre_')===0) {
 			$path =  str_replace('_', '/', $className) . '.php';
 		}
 		elseif(strpos($className,'Test_')===0) {
-			$path =  'tests/lib/'.strtolower(str_replace('_', '/', substr($className,5 )) . '.php');
+			$path =  'tests/lib/'.strtolower(str_replace('_', '/', substr($className, 5)) . '.php');
 		}else{
 			return false;
 		}

From aff08925c1a831ca494bdabcd96ed97f15d0f08b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Tue, 4 Sep 2012 15:46:43 +0300
Subject: [PATCH 1105/1224] fixing syntax error - sorry for that

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

diff --git a/lib/base.php b/lib/base.php
index b1117eda11..9b728de25a 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -110,7 +110,7 @@ class OC{
 			$scriptName.='index.php';
 			//make sure suburi follows the same rules as scriptName
 			if(substr(OC::$SUBURI, -9)!='index.php') {
-				if(substr(OC::$SUBURI,-1)!='/' {
+				if(substr(OC::$SUBURI, -1)!='/') {
 					OC::$SUBURI=OC::$SUBURI.'/';
 				}
 				OC::$SUBURI=OC::$SUBURI.'index.php';

From 7901fc33a867d5bdb121ce29d1d09d549d84b173 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Tue, 4 Sep 2012 15:54:38 +0300
Subject: [PATCH 1106/1224] fixing syntax error

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

diff --git a/lib/base.php b/lib/base.php
index 9b728de25a..61dea18689 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -81,7 +81,7 @@ class OC{
 			$path = strtolower(str_replace('_', '/', substr($className, 3)) . '.php');
 		}
 		elseif(strpos($className, 'OCP\\')===0) {
-			$path = 'public/'.strtolower(str_replace('\\',' /', substr($className, 3)) . '.php');
+			$path = 'public/'.strtolower(str_replace('\\', '/', substr($className, 3)) . '.php');
 		}
 		elseif(strpos($className, 'OCA\\')===0) {
 			$path = 'apps/'.strtolower(str_replace('\\', '/', substr($className, 3)) . '.php');

From 745f279fbc613cd90f2bf6e2c9432b9534c133de Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Tue, 4 Sep 2012 15:51:19 +0200
Subject: [PATCH 1107/1224] make use of OC_User::getHome in files_external app

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

diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php
index f1bc16e253..063b149027 100755
--- a/apps/files_external/lib/config.php
+++ b/apps/files_external/lib/config.php
@@ -186,7 +186,7 @@ class OC_Mount_Config {
 	*/
 	private static function readData($isPersonal) {
 		if ($isPersonal) {
-			$file = OC::$SERVERROOT.'/data/'.OCP\User::getUser().'/mount.php';
+			$file = OC_User::getHome(OCP\User::getUser()).'/mount.php';
 		} else {
 			$file = OC::$SERVERROOT.'/config/mount.php';
 		}
@@ -206,7 +206,7 @@ class OC_Mount_Config {
 	*/
 	private static function writeData($isPersonal, $data) {
 		if ($isPersonal) {
-			$file = OC::$SERVERROOT.'/data/'.OCP\User::getUser().'/mount.php';
+			$file = OC_User::getHome(OCP\User::getUser()).'/mount.php';
 		} else {
 			$file = OC::$SERVERROOT.'/config/mount.php';
 		}

From 69ee84252135cc9ef4aa4526c3dbe6483e2459f5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Tue, 4 Sep 2012 17:13:34 +0300
Subject: [PATCH 1108/1224] Fixing:
 http://bugs.owncloud.org/thebuggenie/owncloud/issues/oc-1617

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

diff --git a/lib/mail.php b/lib/mail.php
index acdadeffd3..fc9aebfda3 100644
--- a/lib/mail.php
+++ b/lib/mail.php
@@ -55,6 +55,7 @@ class OC_Mail {
 
 		$mailo->From =$fromaddress;
 		$mailo->FromName = $fromname;;
+		$mailo->Sender =$fromaddress;
 		$a=explode(' ',$toaddress);
 		try {
 			foreach($a as $ad) {

From ae8d2d029f2cb44b4932a9c33b667dbc918904ae Mon Sep 17 00:00:00 2001
From: Thomas Mueller <thomas.mueller@tmit.eu>
Date: Tue, 4 Sep 2012 20:47:15 +0200
Subject: [PATCH 1109/1224] Adding missing translation

---
 settings/ajax/togglegroups.php | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/settings/ajax/togglegroups.php b/settings/ajax/togglegroups.php
index ab7c22fba3..65747968c1 100644
--- a/settings/ajax/togglegroups.php
+++ b/settings/ajax/togglegroups.php
@@ -7,9 +7,6 @@ OC_JSON::checkSubAdminUser();
 OCP\JSON::callCheck();
 
 $success = true;
-$error = "add user to";
-$action = "add";
-
 $username = $_POST["username"];
 $group = OC_Util::sanitizeHTML($_POST["group"]);
 
@@ -23,11 +20,16 @@ if(!OC_Group::groupExists($group)) {
 	OC_Group::createGroup($group);
 }
 
+$l = OC_L10N::get('settings');
+
+$error = $l->t("Unable to add user to group %s", $group);
+$action = "add";
+
 // Toggle group
 if( OC_Group::inGroup( $username, $group )) {
 	$action = "remove";
-	$error = "remove user from";
-	$success = OC_Group::removeFromGroup( $username, $group );
+    $error = $l->t("Unable to remove user from group %s", $group);
+    $success = OC_Group::removeFromGroup( $username, $group );
 	$usersInGroup=OC_Group::usersInGroup($group);
 	if(count($usersInGroup)==0) {
 		OC_Group::deleteGroup($group);
@@ -42,5 +44,5 @@ if( $success ) {
 	OC_JSON::success(array("data" => array( "username" => $username, "action" => $action, "groupname" => $group )));
 }
 else{
-	OC_JSON::error(array("data" => array( "message" => "Unable to $error group $group" )));
+	OC_JSON::error(array("data" => array( "message" => $error )));
 }

From 41f135daeeff8ddb6914be786ebf4b90272b15b6 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Tue, 4 Sep 2012 08:18:28 +0200
Subject: [PATCH 1110/1224] Remove () from return statement

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

diff --git a/lib/request.php b/lib/request.php
index 3fe61fbddc..10f6e91bac 100644
--- a/lib/request.php
+++ b/lib/request.php
@@ -49,7 +49,7 @@ class OC_Request {
 				$proto = 'http';
 			}
 		}
-		return($proto);
+		return $proto;
 	}
 
 	/**

From f188f6cc2fed10bdc78a34df95b898a770bcf506 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Tue, 4 Sep 2012 21:27:04 +0200
Subject: [PATCH 1111/1224] Fix some jslint warnings

---
 apps/files/js/fileactions.js | 10 +++++-----
 apps/files/js/filelist.js    |  4 ++--
 core/js/js.js                |  2 ++
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js
index ea3522cb10..f4e7b7723f 100644
--- a/apps/files/js/fileactions.js
+++ b/apps/files/js/fileactions.js
@@ -1,4 +1,4 @@
-FileActions={
+var FileActions={
 	actions:{},
 	defaults:{},
 	icons:{},
@@ -20,20 +20,20 @@ FileActions={
 	get:function(mime,type,permissions){
 		var actions={};
 		if(FileActions.actions.all){
-			actions=$.extend( actions, FileActions.actions.all )
+			actions=$.extend( actions, FileActions.actions.all );
 		}
 		if(mime){
 			if(FileActions.actions[mime]){
-				actions=$.extend( actions, FileActions.actions[mime] )
+				actions=$.extend( actions, FileActions.actions[mime] );
 			}
 			var mimePart=mime.substr(0,mime.indexOf('/'));
 			if(FileActions.actions[mimePart]){
-				actions=$.extend( actions, FileActions.actions[mimePart] )
+				actions=$.extend( actions, FileActions.actions[mimePart] );
 			}
 		}
 		if(type){//type is 'dir' or 'file'
 			if(FileActions.actions[type]){
-				actions=$.extend( actions, FileActions.actions[type] )
+				actions=$.extend( actions, FileActions.actions[type] );
 			}
 		}
 		var filteredActions = {};
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index e0cf516411..85e5cfb14c 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -1,4 +1,4 @@
-FileList={
+var FileList={
 	useUndo:true,
 	update:function(fileListHtml) {
 		$('#fileList').empty().html(fileListHtml);
@@ -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().replace(/</, '&lt;').replace(/>/, '&gt;')+'/'+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>';
 		}
diff --git a/core/js/js.js b/core/js/js.js
index 7ce349a214..8b9ecd38dc 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -4,6 +4,8 @@
  * @param text the string to translate
  * @return string
  */
+var OC;
+
 function t(app,text){
 	if( !( app in t.cache )){
 		$.ajax(OC.filePath('core','ajax','translations.php'),{

From 1e2d5821235d47584e0dd7ebf48b3e3c3afc68d8 Mon Sep 17 00:00:00 2001
From: Thomas Mueller <thomas.mueller@tmit.eu>
Date: Tue, 4 Sep 2012 21:01:36 +0200
Subject: [PATCH 1112/1224] fixing button to add additional site

---
 lib/l10n.php | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/lib/l10n.php b/lib/l10n.php
index cd1d53bce0..0421e4eba8 100644
--- a/lib/l10n.php
+++ b/lib/l10n.php
@@ -137,15 +137,15 @@ class OC_L10N{
 		}
 	}
 
-	/**
-	 * @brief Translating
-	 * @param $text The text we need a translation for
-	 * @param $parameters default:array() Parameters for sprintf
-	 * @returns Translation or the same text
-	 *
-	 * Returns the translation. If no translation is found, $text will be
-	 * returned.
-	 */
+    /**
+     * @brief Translating
+     * @param $text String The text we need a translation for
+     * @param array|\default $parameters default:array() Parameters for sprintf
+     * @return \OC_L10N_String Translation or the same text
+     *
+     * Returns the translation. If no translation is found, $text will be
+     * returned.
+     */
 	public function t($text, $parameters = array()){
 		return new OC_L10N_String($this, $text, $parameters);
 	}

From 02f9de55a32d46af6324a489da61cf8ca7c13396 Mon Sep 17 00:00:00 2001
From: Thomas Mueller <thomas.mueller@tmit.eu>
Date: Tue, 4 Sep 2012 21:35:04 +0200
Subject: [PATCH 1113/1224] add translation string

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

diff --git a/apps/files/templates/admin.php b/apps/files/templates/admin.php
index 3ad0629750..c4fe4c8656 100644
--- a/apps/files/templates/admin.php
+++ b/apps/files/templates/admin.php
@@ -11,6 +11,6 @@
 			<input name="maxZipInputSize" id="maxZipInputSize" style="width:180px;" value='<?php echo $_['maxZipInputSize'] ?>' title="<?php echo $l->t( '0 is unlimited' ); ?>"<?php if (!$_['allowZipDownload']) echo ' disabled="disabled"'; ?> />
 			<label for="maxZipInputSize"><?php echo $l->t( 'Maximum input size for ZIP files' ); ?> </label><br />
 
-		<input type="submit" name="submitFilesAdminSettings" id="submitFilesAdminSettings" value="Save"/>
+		<input type="submit" name="submitFilesAdminSettings" id="submitFilesAdminSettings" value="<?php echo $l->t( 'Save' ); ?>"/>
 	</fieldset>
 </form>

From 66c2a391cbc5417752eb0beea15277cfdf97412d Mon Sep 17 00:00:00 2001
From: Thomas Mueller <thomas.mueller@tmit.eu>
Date: Tue, 4 Sep 2012 23:42:22 +0200
Subject: [PATCH 1114/1224] underline link to the app store

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

diff --git a/settings/css/settings.css b/settings/css/settings.css
index 74a3a1acc8..f41edc96fb 100644
--- a/settings/css/settings.css
+++ b/settings/css/settings.css
@@ -57,6 +57,8 @@ span.version { margin-left:3em; margin-right:3em; color:#555; }
 /* Transition to complete width! */
 .app:hover, .app:active { max-width: inherit; }
 
+.appslink { text-decoration: underline; }
+
 /* LOG */
 #log { white-space:normal; }
 

From 685f03edf6e35e24e71ecd3e89d9df23638df769 Mon Sep 17 00:00:00 2001
From: Thomas Mueller <thomas.mueller@tmit.eu>
Date: Tue, 4 Sep 2012 23:49:43 +0200
Subject: [PATCH 1115/1224] fixing translation - thx eMerzh

---
 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 8efbcf0a7e..30f919ac75 100644
--- a/settings/templates/apps.php
+++ b/settings/templates/apps.php
@@ -27,7 +27,7 @@
 	<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>
+    <p class="license hidden"><?php echo $l->t('<span class="licence"></span>-licensed by <span class="author"></span>');?></p>
 	<input class="enable hidden" type="submit" />
 	</div>
 </div>

From e8fcc7112918ac425560655384ba54ed09657145 Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <thomas.mueller@tmit.eu>
Date: Wed, 5 Sep 2012 02:05:39 +0200
Subject: [PATCH 1116/1224] [tx-robot] updated from transifex

---
 apps/files_external/l10n/he.php     | 13 +++++
 apps/files_sharing/l10n/he.php      |  7 +++
 apps/files_versions/l10n/he.php     |  6 ++
 apps/user_ldap/l10n/fi_FI.php       | 12 ++--
 l10n/af/files.po                    | 10 +++-
 l10n/af/settings.po                 | 22 +++++---
 l10n/ar/files.po                    | 10 +++-
 l10n/ar/settings.po                 | 24 +++++---
 l10n/ar_SA/files.po                 | 10 +++-
 l10n/ar_SA/settings.po              | 22 +++++---
 l10n/bg_BG/files.po                 | 10 +++-
 l10n/bg_BG/settings.po              | 24 +++++---
 l10n/ca/files.po                    | 12 ++--
 l10n/ca/settings.po                 | 32 ++++++-----
 l10n/cs_CZ/files.po                 | 10 +++-
 l10n/cs_CZ/settings.po              | 24 +++++---
 l10n/da/files.po                    | 12 ++--
 l10n/da/settings.po                 | 24 +++++---
 l10n/de/files.po                    | 12 ++--
 l10n/de/settings.po                 | 32 ++++++-----
 l10n/el/files.po                    | 10 +++-
 l10n/el/settings.po                 | 24 +++++---
 l10n/eo/files.po                    | 10 +++-
 l10n/eo/settings.po                 | 24 +++++---
 l10n/es/files.po                    | 12 ++--
 l10n/es/settings.po                 | 32 ++++++-----
 l10n/et_EE/files.po                 | 10 +++-
 l10n/et_EE/settings.po              | 24 +++++---
 l10n/eu/files.po                    | 10 +++-
 l10n/eu/settings.po                 | 24 +++++---
 l10n/eu_ES/files.po                 | 10 +++-
 l10n/eu_ES/settings.po              | 22 +++++---
 l10n/fa/files.po                    | 10 +++-
 l10n/fa/settings.po                 | 24 +++++---
 l10n/fi/files.po                    | 10 +++-
 l10n/fi/settings.po                 | 22 +++++---
 l10n/fi_FI/files.po                 | 10 +++-
 l10n/fi_FI/settings.po              | 32 ++++++-----
 l10n/fi_FI/user_ldap.po             | 20 +++----
 l10n/fr/files.po                    | 12 ++--
 l10n/fr/settings.po                 | 32 ++++++-----
 l10n/gl/files.po                    | 10 +++-
 l10n/gl/settings.po                 | 24 +++++---
 l10n/he/files.po                    | 10 +++-
 l10n/he/files_external.po           | 31 +++++-----
 l10n/he/files_sharing.po            | 21 +++----
 l10n/he/files_versions.po           | 17 +++---
 l10n/he/lib.po                      | 87 +++++++++++++++--------------
 l10n/he/settings.po                 | 24 +++++---
 l10n/hi/files.po                    | 10 +++-
 l10n/hi/settings.po                 | 22 +++++---
 l10n/hr/files.po                    | 10 +++-
 l10n/hr/settings.po                 | 24 +++++---
 l10n/hu_HU/files.po                 | 10 +++-
 l10n/hu_HU/settings.po              | 24 +++++---
 l10n/hy/files.po                    | 10 +++-
 l10n/hy/settings.po                 | 22 +++++---
 l10n/ia/files.po                    | 10 +++-
 l10n/ia/settings.po                 | 22 +++++---
 l10n/id/files.po                    | 10 +++-
 l10n/id/settings.po                 | 24 +++++---
 l10n/id_ID/files.po                 | 10 +++-
 l10n/id_ID/settings.po              | 22 +++++---
 l10n/it/files.po                    | 12 ++--
 l10n/it/settings.po                 | 32 ++++++-----
 l10n/ja_JP/files.po                 | 12 ++--
 l10n/ja_JP/settings.po              | 24 +++++---
 l10n/ko/files.po                    | 10 +++-
 l10n/ko/settings.po                 | 24 +++++---
 l10n/lb/files.po                    | 10 +++-
 l10n/lb/settings.po                 | 24 +++++---
 l10n/lt_LT/files.po                 | 10 +++-
 l10n/lt_LT/settings.po              | 22 +++++---
 l10n/lv/files.po                    | 10 +++-
 l10n/lv/settings.po                 | 24 +++++---
 l10n/mk/files.po                    | 10 +++-
 l10n/mk/settings.po                 | 24 +++++---
 l10n/ms_MY/files.po                 | 10 +++-
 l10n/ms_MY/settings.po              | 24 +++++---
 l10n/nb_NO/files.po                 | 10 +++-
 l10n/nb_NO/settings.po              | 24 +++++---
 l10n/nl/files.po                    | 10 +++-
 l10n/nl/settings.po                 | 24 +++++---
 l10n/nn_NO/files.po                 | 10 +++-
 l10n/nn_NO/settings.po              | 24 +++++---
 l10n/pl/files.po                    | 10 +++-
 l10n/pl/settings.po                 | 32 ++++++-----
 l10n/pl_PL/files.po                 | 10 +++-
 l10n/pl_PL/settings.po              | 22 +++++---
 l10n/pt_BR/files.po                 | 10 +++-
 l10n/pt_BR/settings.po              | 24 +++++---
 l10n/pt_PT/files.po                 | 10 +++-
 l10n/pt_PT/settings.po              | 24 +++++---
 l10n/ro/files.po                    | 10 +++-
 l10n/ro/settings.po                 | 24 +++++---
 l10n/ru/files.po                    | 12 ++--
 l10n/ru/settings.po                 | 24 +++++---
 l10n/ru_RU/files.po                 | 10 +++-
 l10n/ru_RU/settings.po              | 22 +++++---
 l10n/sk_SK/files.po                 | 10 +++-
 l10n/sk_SK/settings.po              | 24 +++++---
 l10n/sl/files.po                    | 12 ++--
 l10n/sl/settings.po                 | 32 ++++++-----
 l10n/so/files.po                    | 10 +++-
 l10n/so/settings.po                 | 22 +++++---
 l10n/sr/files.po                    | 10 +++-
 l10n/sr/settings.po                 | 24 +++++---
 l10n/sr@latin/files.po              | 10 +++-
 l10n/sr@latin/settings.po           | 24 +++++---
 l10n/sv/files.po                    | 12 ++--
 l10n/sv/settings.po                 | 24 +++++---
 l10n/templates/core.pot             | 28 +++++-----
 l10n/templates/files.pot            |  6 +-
 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/lib.pot              |  2 +-
 l10n/templates/settings.pot         | 21 ++++---
 l10n/templates/user_ldap.pot        |  2 +-
 l10n/th_TH/files.po                 | 12 ++--
 l10n/th_TH/settings.po              | 24 +++++---
 l10n/tr/files.po                    | 12 ++--
 l10n/tr/settings.po                 | 24 +++++---
 l10n/uk/files.po                    | 10 +++-
 l10n/uk/settings.po                 | 24 +++++---
 l10n/vi/files.po                    | 10 +++-
 l10n/vi/settings.po                 | 24 +++++---
 l10n/zh_CN.GB2312/files.po          | 10 +++-
 l10n/zh_CN.GB2312/settings.po       | 24 +++++---
 l10n/zh_CN/files.po                 | 10 +++-
 l10n/zh_CN/settings.po              | 24 +++++---
 l10n/zh_TW/files.po                 | 12 ++--
 l10n/zh_TW/settings.po              | 24 +++++---
 lib/l10n/he.php                     | 28 ++++++++++
 settings/l10n/ar.php                |  2 -
 settings/l10n/bg_BG.php             |  2 -
 settings/l10n/ca.php                |  6 +-
 settings/l10n/cs_CZ.php             |  2 -
 settings/l10n/da.php                |  2 -
 settings/l10n/de.php                |  6 +-
 settings/l10n/el.php                |  2 -
 settings/l10n/eo.php                |  2 -
 settings/l10n/es.php                |  6 +-
 settings/l10n/et_EE.php             |  2 -
 settings/l10n/eu.php                |  2 -
 settings/l10n/fa.php                |  2 -
 settings/l10n/fi_FI.php             |  6 +-
 settings/l10n/fr.php                |  6 +-
 settings/l10n/gl.php                |  2 -
 settings/l10n/he.php                |  2 -
 settings/l10n/hr.php                |  2 -
 settings/l10n/hu_HU.php             |  2 -
 settings/l10n/ia.php                |  1 -
 settings/l10n/id.php                |  2 -
 settings/l10n/it.php                |  6 +-
 settings/l10n/ja_JP.php             |  2 -
 settings/l10n/ko.php                |  2 -
 settings/l10n/lb.php                |  2 -
 settings/l10n/lt_LT.php             |  1 -
 settings/l10n/lv.php                |  2 -
 settings/l10n/mk.php                |  2 -
 settings/l10n/ms_MY.php             |  2 -
 settings/l10n/nb_NO.php             |  2 -
 settings/l10n/nl.php                |  2 -
 settings/l10n/nn_NO.php             |  2 -
 settings/l10n/pl.php                |  6 +-
 settings/l10n/pt_BR.php             |  2 -
 settings/l10n/pt_PT.php             |  2 -
 settings/l10n/ro.php                |  2 -
 settings/l10n/ru.php                |  2 -
 settings/l10n/sk_SK.php             |  2 -
 settings/l10n/sl.php                |  6 +-
 settings/l10n/sr.php                |  2 -
 settings/l10n/sr@latin.php          |  2 -
 settings/l10n/sv.php                |  2 -
 settings/l10n/th_TH.php             |  2 -
 settings/l10n/tr.php                |  2 -
 settings/l10n/uk.php                |  2 -
 settings/l10n/vi.php                |  2 -
 settings/l10n/zh_CN.GB2312.php      |  2 -
 settings/l10n/zh_CN.php             |  2 -
 settings/l10n/zh_TW.php             |  2 -
 183 files changed, 1530 insertions(+), 943 deletions(-)
 create mode 100644 apps/files_external/l10n/he.php
 create mode 100644 apps/files_sharing/l10n/he.php
 create mode 100644 apps/files_versions/l10n/he.php
 create mode 100644 lib/l10n/he.php

diff --git a/apps/files_external/l10n/he.php b/apps/files_external/l10n/he.php
new file mode 100644
index 0000000000..edfa9aa85f
--- /dev/null
+++ b/apps/files_external/l10n/he.php
@@ -0,0 +1,13 @@
+<?php $TRANSLATIONS = array(
+"External Storage" => "אחסון חיצוני",
+"Configuration" => "הגדרות",
+"Options" => "אפשרויות",
+"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_sharing/l10n/he.php b/apps/files_sharing/l10n/he.php
new file mode 100644
index 0000000000..68a337241d
--- /dev/null
+++ b/apps/files_sharing/l10n/he.php
@@ -0,0 +1,7 @@
+<?php $TRANSLATIONS = array(
+"Password" => "ססמה",
+"Submit" => "שליחה",
+"Download" => "הורדה",
+"No preview available for" => "אין תצוגה מקדימה זמינה עבור",
+"web services under your control" => "שירותי רשת תחת השליטה שלך"
+);
diff --git a/apps/files_versions/l10n/he.php b/apps/files_versions/l10n/he.php
new file mode 100644
index 0000000000..097169b2a4
--- /dev/null
+++ b/apps/files_versions/l10n/he.php
@@ -0,0 +1,6 @@
+<?php $TRANSLATIONS = array(
+"Expire all versions" => "הפגת תוקף כל הגרסאות",
+"Versions" => "גרסאות",
+"This will delete all existing backup versions of your files" => "פעולה זו תמחק את כל גיבויי הגרסאות הקיימים של הקבצים שלך",
+"Enable Files Versioning" => "הפעלת ניהול גרסאות לקבצים"
+);
diff --git a/apps/user_ldap/l10n/fi_FI.php b/apps/user_ldap/l10n/fi_FI.php
index f6d16f3acc..8bf3a024ef 100644
--- a/apps/user_ldap/l10n/fi_FI.php
+++ b/apps/user_ldap/l10n/fi_FI.php
@@ -1,8 +1,8 @@
 <?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://",
+"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Voit jättää protokollan määrittämättä, paitsi kun vaadit 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ä  ",
+"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",
@@ -16,14 +16,14 @@
 "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 User Tree" => "Oletuskä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. ",
+"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. ",
+"Turn off SSL certificate validation." => "Poista käytöstä SSL-varmenteen vahvistus",
+"If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Jos yhteys toimii vain tällä valinnalla, siirrä LDAP-palvelimen SSL-varmenne ownCloud-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.",
diff --git a/l10n/af/files.po b/l10n/af/files.po
index 8e51d3bfb6..f93921f751 100644
--- a/l10n/af/files.po
+++ b/l10n/af/files.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-05 02:01+0200\n"
+"PO-Revision-Date: 2012-09-05 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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: af\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ajax/upload.php:20
 msgid "There is no error, the file uploaded with success"
@@ -164,6 +164,10 @@ msgstr ""
 msgid "Maximum input size for ZIP files"
 msgstr ""
 
+#: templates/admin.php:14
+msgid "Save"
+msgstr ""
+
 #: templates/index.php:7
 msgid "New"
 msgstr ""
diff --git a/l10n/af/settings.po b/l10n/af/settings.po
index 3011a18662..b6b7b9e156 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-09-04 12:42+0200\n"
-"PO-Revision-Date: 2012-09-04 10:42+0000\n"
+"POT-Creation-Date: 2012-09-05 02:02+0200\n"
+"PO-Revision-Date: 2012-09-05 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"
@@ -22,7 +22,7 @@ msgid "Unable to load list from App Store"
 msgstr ""
 
 #: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
-#: ajax/togglegroups.php:18
+#: ajax/togglegroups.php:15
 msgid "Authentication error"
 msgstr ""
 
@@ -62,6 +62,16 @@ msgstr ""
 msgid "Language changed"
 msgstr ""
 
+#: ajax/togglegroups.php:25
+#, php-format
+msgid "Unable to add user to group %s"
+msgstr ""
+
+#: ajax/togglegroups.php:31
+#, php-format
+msgid "Unable to remove user from group %s"
+msgstr ""
+
 #: js/apps.js:18
 msgid "Error"
 msgstr ""
@@ -178,11 +188,7 @@ msgid "See application page at apps.owncloud.com"
 msgstr ""
 
 #: templates/apps.php:30
-msgid "-licensed"
-msgstr ""
-
-#: templates/apps.php:30
-msgid "by"
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr ""
 
 #: templates/help.php:9
diff --git a/l10n/ar/files.po b/l10n/ar/files.po
index 5c481bb7b5..f0fdb23c94 100644
--- a/l10n/ar/files.po
+++ b/l10n/ar/files.po
@@ -8,15 +8,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-05 02:01+0200\n"
+"PO-Revision-Date: 2012-09-05 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"
 "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"
+"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:20
 msgid "There is no error, the file uploaded with success"
@@ -165,6 +165,10 @@ msgstr ""
 msgid "Maximum input size for ZIP files"
 msgstr ""
 
+#: templates/admin.php:14
+msgid "Save"
+msgstr ""
+
 #: templates/index.php:7
 msgid "New"
 msgstr "جديد"
diff --git a/l10n/ar/settings.po b/l10n/ar/settings.po
index 3de638d666..ece25b8fda 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-09-04 12:42+0200\n"
-"PO-Revision-Date: 2012-09-04 10:42+0000\n"
+"POT-Creation-Date: 2012-09-05 02:02+0200\n"
+"PO-Revision-Date: 2012-09-05 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"
@@ -24,7 +24,7 @@ msgid "Unable to load list from App Store"
 msgstr ""
 
 #: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
-#: ajax/togglegroups.php:18
+#: ajax/togglegroups.php:15
 msgid "Authentication error"
 msgstr ""
 
@@ -64,6 +64,16 @@ msgstr ""
 msgid "Language changed"
 msgstr "تم تغيير اللغة"
 
+#: ajax/togglegroups.php:25
+#, php-format
+msgid "Unable to add user to group %s"
+msgstr ""
+
+#: ajax/togglegroups.php:31
+#, php-format
+msgid "Unable to remove user from group %s"
+msgstr ""
+
 #: js/apps.js:18
 msgid "Error"
 msgstr ""
@@ -180,12 +190,8 @@ msgid "See application page at apps.owncloud.com"
 msgstr ""
 
 #: templates/apps.php:30
-msgid "-licensed"
-msgstr "-مسجل"
-
-#: templates/apps.php:30
-msgid "by"
-msgstr "من قبل"
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+msgstr ""
 
 #: templates/help.php:9
 msgid "Documentation"
diff --git a/l10n/ar_SA/files.po b/l10n/ar_SA/files.po
index 70a8de06f9..7f04256bac 100644
--- a/l10n/ar_SA/files.po
+++ b/l10n/ar_SA/files.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-05 02:01+0200\n"
+"PO-Revision-Date: 2012-09-05 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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ar_SA\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ajax/upload.php:20
 msgid "There is no error, the file uploaded with success"
@@ -164,6 +164,10 @@ msgstr ""
 msgid "Maximum input size for ZIP files"
 msgstr ""
 
+#: templates/admin.php:14
+msgid "Save"
+msgstr ""
+
 #: templates/index.php:7
 msgid "New"
 msgstr ""
diff --git a/l10n/ar_SA/settings.po b/l10n/ar_SA/settings.po
index ee8598f1bf..22e19d517d 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-09-04 12:42+0200\n"
-"PO-Revision-Date: 2012-09-04 10:42+0000\n"
+"POT-Creation-Date: 2012-09-05 02:02+0200\n"
+"PO-Revision-Date: 2012-09-05 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"
@@ -22,7 +22,7 @@ msgid "Unable to load list from App Store"
 msgstr ""
 
 #: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
-#: ajax/togglegroups.php:18
+#: ajax/togglegroups.php:15
 msgid "Authentication error"
 msgstr ""
 
@@ -62,6 +62,16 @@ msgstr ""
 msgid "Language changed"
 msgstr ""
 
+#: ajax/togglegroups.php:25
+#, php-format
+msgid "Unable to add user to group %s"
+msgstr ""
+
+#: ajax/togglegroups.php:31
+#, php-format
+msgid "Unable to remove user from group %s"
+msgstr ""
+
 #: js/apps.js:18
 msgid "Error"
 msgstr ""
@@ -178,11 +188,7 @@ msgid "See application page at apps.owncloud.com"
 msgstr ""
 
 #: templates/apps.php:30
-msgid "-licensed"
-msgstr ""
-
-#: templates/apps.php:30
-msgid "by"
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr ""
 
 #: templates/help.php:9
diff --git a/l10n/bg_BG/files.po b/l10n/bg_BG/files.po
index 98e68910a2..9eb5ac463a 100644
--- a/l10n/bg_BG/files.po
+++ b/l10n/bg_BG/files.po
@@ -9,15 +9,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-05 02:01+0200\n"
+"PO-Revision-Date: 2012-09-05 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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: bg_BG\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ajax/upload.php:20
 msgid "There is no error, the file uploaded with success"
@@ -166,6 +166,10 @@ msgstr "0 означава без ограничение"
 msgid "Maximum input size for ZIP files"
 msgstr ""
 
+#: templates/admin.php:14
+msgid "Save"
+msgstr ""
+
 #: templates/index.php:7
 msgid "New"
 msgstr "Нов"
diff --git a/l10n/bg_BG/settings.po b/l10n/bg_BG/settings.po
index a2fc986bb2..fc6de0ffaa 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-09-04 12:42+0200\n"
-"PO-Revision-Date: 2012-09-04 10:42+0000\n"
+"POT-Creation-Date: 2012-09-05 02:02+0200\n"
+"PO-Revision-Date: 2012-09-05 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"
@@ -25,7 +25,7 @@ msgid "Unable to load list from App Store"
 msgstr ""
 
 #: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
-#: ajax/togglegroups.php:18
+#: ajax/togglegroups.php:15
 msgid "Authentication error"
 msgstr ""
 
@@ -65,6 +65,16 @@ msgstr ""
 msgid "Language changed"
 msgstr "Езика е сменен"
 
+#: ajax/togglegroups.php:25
+#, php-format
+msgid "Unable to add user to group %s"
+msgstr ""
+
+#: ajax/togglegroups.php:31
+#, php-format
+msgid "Unable to remove user from group %s"
+msgstr ""
+
 #: js/apps.js:18
 msgid "Error"
 msgstr ""
@@ -181,12 +191,8 @@ msgid "See application page at apps.owncloud.com"
 msgstr ""
 
 #: templates/apps.php:30
-msgid "-licensed"
-msgstr "-лицензирано"
-
-#: templates/apps.php:30
-msgid "by"
-msgstr "от"
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+msgstr ""
 
 #: templates/help.php:9
 msgid "Documentation"
diff --git a/l10n/ca/files.po b/l10n/ca/files.po
index 0857b5ed92..93e8a18260 100644
--- a/l10n/ca/files.po
+++ b/l10n/ca/files.po
@@ -9,15 +9,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 02:01+0200\n"
-"PO-Revision-Date: 2012-08-31 11:28+0000\n"
-"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
+"POT-Creation-Date: 2012-09-05 02:01+0200\n"
+"PO-Revision-Date: 2012-09-05 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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ca\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ajax/upload.php:20
 msgid "There is no error, the file uploaded with success"
@@ -166,6 +166,10 @@ msgstr "0 és sense límit"
 msgid "Maximum input size for ZIP files"
 msgstr "Mida màxima d'entrada per fitxers ZIP"
 
+#: templates/admin.php:14
+msgid "Save"
+msgstr ""
+
 #: templates/index.php:7
 msgid "New"
 msgstr "Nou"
diff --git a/l10n/ca/settings.po b/l10n/ca/settings.po
index 3a8b55e793..baded31fd5 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-09-04 12:42+0200\n"
-"PO-Revision-Date: 2012-09-04 10:42+0000\n"
+"POT-Creation-Date: 2012-09-05 02:02+0200\n"
+"PO-Revision-Date: 2012-09-05 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,17 +24,17 @@ msgid "Unable to load list from App Store"
 msgstr "No s'ha pogut carregar la llista des de l'App Store"
 
 #: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
-#: ajax/togglegroups.php:18
+#: ajax/togglegroups.php:15
 msgid "Authentication error"
 msgstr "Error d'autenticació"
 
 #: ajax/creategroup.php:19
 msgid "Group already exists"
-msgstr ""
+msgstr "El grup ja existeix"
 
 #: ajax/creategroup.php:28
 msgid "Unable to add group"
-msgstr ""
+msgstr "No es pot afegir el grup"
 
 #: ajax/lostpassword.php:14
 msgid "Email saved"
@@ -54,16 +54,26 @@ msgstr "Sol.licitud no vàlida"
 
 #: ajax/removegroup.php:16
 msgid "Unable to delete group"
-msgstr ""
+msgstr "No es pot eliminar el grup"
 
 #: ajax/removeuser.php:22
 msgid "Unable to delete user"
-msgstr ""
+msgstr "No es pot eliminar l'usuari"
 
 #: ajax/setlanguage.php:18
 msgid "Language changed"
 msgstr "S'ha canviat l'idioma"
 
+#: ajax/togglegroups.php:25
+#, php-format
+msgid "Unable to add user to group %s"
+msgstr ""
+
+#: ajax/togglegroups.php:31
+#, php-format
+msgid "Unable to remove user from group %s"
+msgstr ""
+
 #: js/apps.js:18
 msgid "Error"
 msgstr "Error"
@@ -180,12 +190,8 @@ msgid "See application page at apps.owncloud.com"
 msgstr "Mireu la pàgina d'aplicacions a apps.owncloud.com"
 
 #: templates/apps.php:30
-msgid "-licensed"
-msgstr "- amb llicència"
-
-#: templates/apps.php:30
-msgid "by"
-msgstr "de"
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+msgstr ""
 
 #: templates/help.php:9
 msgid "Documentation"
diff --git a/l10n/cs_CZ/files.po b/l10n/cs_CZ/files.po
index 0fbfcb882d..2e9b7e78c1 100644
--- a/l10n/cs_CZ/files.po
+++ b/l10n/cs_CZ/files.po
@@ -9,15 +9,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-05 02:01+0200\n"
+"PO-Revision-Date: 2012-09-05 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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: cs_CZ\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #: ajax/upload.php:20
 msgid "There is no error, the file uploaded with success"
@@ -166,6 +166,10 @@ msgstr "0 znamená bez omezení"
 msgid "Maximum input size for ZIP files"
 msgstr "Maximální velikost vstupu pro ZIP soubory"
 
+#: templates/admin.php:14
+msgid "Save"
+msgstr ""
+
 #: templates/index.php:7
 msgid "New"
 msgstr "Nový"
diff --git a/l10n/cs_CZ/settings.po b/l10n/cs_CZ/settings.po
index bd57318d44..b83f36882a 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-09-04 12:42+0200\n"
-"PO-Revision-Date: 2012-09-04 10:42+0000\n"
+"POT-Creation-Date: 2012-09-05 02:02+0200\n"
+"PO-Revision-Date: 2012-09-05 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"
@@ -27,7 +27,7 @@ msgid "Unable to load list from App Store"
 msgstr "Nepodařílo se stáhnout seznam z App Store"
 
 #: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
-#: ajax/togglegroups.php:18
+#: ajax/togglegroups.php:15
 msgid "Authentication error"
 msgstr "Chyba autorizace"
 
@@ -67,6 +67,16 @@ msgstr ""
 msgid "Language changed"
 msgstr "Jazyk byl změněn"
 
+#: ajax/togglegroups.php:25
+#, php-format
+msgid "Unable to add user to group %s"
+msgstr ""
+
+#: ajax/togglegroups.php:31
+#, php-format
+msgid "Unable to remove user from group %s"
+msgstr ""
+
 #: js/apps.js:18
 msgid "Error"
 msgstr "Chyba"
@@ -183,12 +193,8 @@ msgid "See application page at apps.owncloud.com"
 msgstr "Více na stránce s aplikacemi na apps.owncloud.com"
 
 #: templates/apps.php:30
-msgid "-licensed"
-msgstr "-licencováno"
-
-#: templates/apps.php:30
-msgid "by"
-msgstr "podle"
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+msgstr ""
 
 #: templates/help.php:9
 msgid "Documentation"
diff --git a/l10n/da/files.po b/l10n/da/files.po
index de51c340b8..5c3233a281 100644
--- a/l10n/da/files.po
+++ b/l10n/da/files.po
@@ -12,15 +12,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-03 02:04+0200\n"
-"PO-Revision-Date: 2012-09-02 14:21+0000\n"
-"Last-Translator: muunsim <simon@rosmi.dk>\n"
+"POT-Creation-Date: 2012-09-05 02:01+0200\n"
+"PO-Revision-Date: 2012-09-05 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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: da\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ajax/upload.php:20
 msgid "There is no error, the file uploaded with success"
@@ -169,6 +169,10 @@ msgstr "0 er ubegrænset"
 msgid "Maximum input size for ZIP files"
 msgstr "Maksimal størrelse på ZIP filer"
 
+#: templates/admin.php:14
+msgid "Save"
+msgstr ""
+
 #: templates/index.php:7
 msgid "New"
 msgstr "Ny"
diff --git a/l10n/da/settings.po b/l10n/da/settings.po
index 48df28c6b1..022d5ee233 100644
--- a/l10n/da/settings.po
+++ b/l10n/da/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-09-04 12:42+0200\n"
-"PO-Revision-Date: 2012-09-04 10:42+0000\n"
+"POT-Creation-Date: 2012-09-05 02:02+0200\n"
+"PO-Revision-Date: 2012-09-05 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"
@@ -30,7 +30,7 @@ msgid "Unable to load list from App Store"
 msgstr "Kunne ikke indlæse listen fra App Store"
 
 #: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
-#: ajax/togglegroups.php:18
+#: ajax/togglegroups.php:15
 msgid "Authentication error"
 msgstr "Adgangsfejl"
 
@@ -70,6 +70,16 @@ msgstr ""
 msgid "Language changed"
 msgstr "Sprog ændret"
 
+#: ajax/togglegroups.php:25
+#, php-format
+msgid "Unable to add user to group %s"
+msgstr ""
+
+#: ajax/togglegroups.php:31
+#, php-format
+msgid "Unable to remove user from group %s"
+msgstr ""
+
 #: js/apps.js:18
 msgid "Error"
 msgstr "Fejl"
@@ -186,12 +196,8 @@ msgid "See application page at apps.owncloud.com"
 msgstr "Se applikationens side på apps.owncloud.com"
 
 #: templates/apps.php:30
-msgid "-licensed"
-msgstr "-licenseret"
-
-#: templates/apps.php:30
-msgid "by"
-msgstr "af"
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+msgstr ""
 
 #: templates/help.php:9
 msgid "Documentation"
diff --git a/l10n/de/files.po b/l10n/de/files.po
index 2f61acb8ec..63ae8dc7c8 100644
--- a/l10n/de/files.po
+++ b/l10n/de/files.po
@@ -18,15 +18,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 02:01+0200\n"
-"PO-Revision-Date: 2012-08-31 07:32+0000\n"
-"Last-Translator: JamFX <niko@nik-o-mat.de>\n"
+"POT-Creation-Date: 2012-09-05 02:01+0200\n"
+"PO-Revision-Date: 2012-09-05 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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: de\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ajax/upload.php:20
 msgid "There is no error, the file uploaded with success"
@@ -175,6 +175,10 @@ msgstr "0 bedeutet unbegrenzt"
 msgid "Maximum input size for ZIP files"
 msgstr "Maximale Größe für ZIP-Dateien"
 
+#: templates/admin.php:14
+msgid "Save"
+msgstr ""
+
 #: templates/index.php:7
 msgid "New"
 msgstr "Neu"
diff --git a/l10n/de/settings.po b/l10n/de/settings.po
index 01a425d251..795cd88fa2 100644
--- a/l10n/de/settings.po
+++ b/l10n/de/settings.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-09-04 12:42+0200\n"
-"PO-Revision-Date: 2012-09-04 10:42+0000\n"
+"POT-Creation-Date: 2012-09-05 02:02+0200\n"
+"PO-Revision-Date: 2012-09-05 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"
@@ -32,17 +32,17 @@ msgid "Unable to load list from App Store"
 msgstr "Die Liste der Apps im Store konnte nicht geladen werden."
 
 #: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
-#: ajax/togglegroups.php:18
+#: ajax/togglegroups.php:15
 msgid "Authentication error"
 msgstr "Anmeldungsfehler"
 
 #: ajax/creategroup.php:19
 msgid "Group already exists"
-msgstr ""
+msgstr "Gruppe existiert bereits"
 
 #: ajax/creategroup.php:28
 msgid "Unable to add group"
-msgstr ""
+msgstr "Gruppe konnte nicht angelegt werden"
 
 #: ajax/lostpassword.php:14
 msgid "Email saved"
@@ -62,16 +62,26 @@ msgstr "Ungültige Anfrage"
 
 #: ajax/removegroup.php:16
 msgid "Unable to delete group"
-msgstr ""
+msgstr "Gruppe konnte nicht gelöscht werden"
 
 #: ajax/removeuser.php:22
 msgid "Unable to delete user"
-msgstr ""
+msgstr "Benutzer konnte nicht gelöscht werden"
 
 #: ajax/setlanguage.php:18
 msgid "Language changed"
 msgstr "Sprache geändert"
 
+#: ajax/togglegroups.php:25
+#, php-format
+msgid "Unable to add user to group %s"
+msgstr ""
+
+#: ajax/togglegroups.php:31
+#, php-format
+msgid "Unable to remove user from group %s"
+msgstr ""
+
 #: js/apps.js:18
 msgid "Error"
 msgstr "Fehler"
@@ -188,12 +198,8 @@ msgid "See application page at apps.owncloud.com"
 msgstr "Weitere Anwendungen finden Sie auf apps.owncloud.com"
 
 #: templates/apps.php:30
-msgid "-licensed"
-msgstr "-lizenziert"
-
-#: templates/apps.php:30
-msgid "by"
-msgstr "von"
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+msgstr ""
 
 #: templates/help.php:9
 msgid "Documentation"
diff --git a/l10n/el/files.po b/l10n/el/files.po
index cb1f1d7a3d..ee2a70ac7c 100644
--- a/l10n/el/files.po
+++ b/l10n/el/files.po
@@ -10,15 +10,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-05 02:01+0200\n"
+"PO-Revision-Date: 2012-09-05 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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: el\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ajax/upload.php:20
 msgid "There is no error, the file uploaded with success"
@@ -167,6 +167,10 @@ msgstr "0 για απεριόριστο"
 msgid "Maximum input size for ZIP files"
 msgstr "Μέγιστο μέγεθος για αρχεία ZIP"
 
+#: templates/admin.php:14
+msgid "Save"
+msgstr ""
+
 #: templates/index.php:7
 msgid "New"
 msgstr "Νέο"
diff --git a/l10n/el/settings.po b/l10n/el/settings.po
index 2592bb4253..bbec7abd9b 100644
--- a/l10n/el/settings.po
+++ b/l10n/el/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-09-04 12:42+0200\n"
-"PO-Revision-Date: 2012-09-04 10:42+0000\n"
+"POT-Creation-Date: 2012-09-05 02:02+0200\n"
+"PO-Revision-Date: 2012-09-05 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 "Unable to load list from App Store"
 msgstr "Σφάλμα στην φόρτωση της λίστας από το App Store"
 
 #: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
-#: ajax/togglegroups.php:18
+#: ajax/togglegroups.php:15
 msgid "Authentication error"
 msgstr "Σφάλμα πιστοποίησης"
 
@@ -69,6 +69,16 @@ msgstr ""
 msgid "Language changed"
 msgstr "Η γλώσσα άλλαξε"
 
+#: ajax/togglegroups.php:25
+#, php-format
+msgid "Unable to add user to group %s"
+msgstr ""
+
+#: ajax/togglegroups.php:31
+#, php-format
+msgid "Unable to remove user from group %s"
+msgstr ""
+
 #: js/apps.js:18
 msgid "Error"
 msgstr "Σφάλμα"
@@ -185,12 +195,8 @@ msgid "See application page at apps.owncloud.com"
 msgstr "Η σελίδα εφαρμογών στο apps.owncloud.com"
 
 #: templates/apps.php:30
-msgid "-licensed"
-msgstr "-με άδεια"
-
-#: templates/apps.php:30
-msgid "by"
-msgstr "από"
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+msgstr ""
 
 #: templates/help.php:9
 msgid "Documentation"
diff --git a/l10n/eo/files.po b/l10n/eo/files.po
index d84ef73a64..d771ee745f 100644
--- a/l10n/eo/files.po
+++ b/l10n/eo/files.po
@@ -9,15 +9,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-05 02:01+0200\n"
+"PO-Revision-Date: 2012-09-05 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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: eo\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ajax/upload.php:20
 msgid "There is no error, the file uploaded with success"
@@ -166,6 +166,10 @@ msgstr "0 signifas senlime"
 msgid "Maximum input size for ZIP files"
 msgstr "Maksimuma enirgrando por ZIP-dosieroj"
 
+#: templates/admin.php:14
+msgid "Save"
+msgstr ""
+
 #: templates/index.php:7
 msgid "New"
 msgstr "Nova"
diff --git a/l10n/eo/settings.po b/l10n/eo/settings.po
index 6389216930..d51e0c5423 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-09-04 12:42+0200\n"
-"PO-Revision-Date: 2012-09-04 10:42+0000\n"
+"POT-Creation-Date: 2012-09-05 02:02+0200\n"
+"PO-Revision-Date: 2012-09-05 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"
@@ -24,7 +24,7 @@ msgid "Unable to load list from App Store"
 msgstr "Ne eblis ŝargi liston el aplikaĵovendejo"
 
 #: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
-#: ajax/togglegroups.php:18
+#: ajax/togglegroups.php:15
 msgid "Authentication error"
 msgstr "Aŭtentiga eraro"
 
@@ -64,6 +64,16 @@ msgstr ""
 msgid "Language changed"
 msgstr "La lingvo estas ŝanĝita"
 
+#: ajax/togglegroups.php:25
+#, php-format
+msgid "Unable to add user to group %s"
+msgstr ""
+
+#: ajax/togglegroups.php:31
+#, php-format
+msgid "Unable to remove user from group %s"
+msgstr ""
+
 #: js/apps.js:18
 msgid "Error"
 msgstr "Eraro"
@@ -180,12 +190,8 @@ msgid "See application page at apps.owncloud.com"
 msgstr "Vidu la paĝon pri aplikaĵoj ĉe apps.owncloud.com"
 
 #: templates/apps.php:30
-msgid "-licensed"
-msgstr "-permesila"
-
-#: templates/apps.php:30
-msgid "by"
-msgstr "de"
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+msgstr ""
 
 #: templates/help.php:9
 msgid "Documentation"
diff --git a/l10n/es/files.po b/l10n/es/files.po
index b8ef1ea582..28809d589c 100644
--- a/l10n/es/files.po
+++ b/l10n/es/files.po
@@ -11,15 +11,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 02:01+0200\n"
-"PO-Revision-Date: 2012-08-31 22:38+0000\n"
-"Last-Translator: Rubén Trujillo <rubentrf@gmail.com>\n"
+"POT-Creation-Date: 2012-09-05 02:01+0200\n"
+"PO-Revision-Date: 2012-09-05 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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: es\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ajax/upload.php:20
 msgid "There is no error, the file uploaded with success"
@@ -168,6 +168,10 @@ msgstr "0 es ilimitado"
 msgid "Maximum input size for ZIP files"
 msgstr "Tamaño máximo para archivos ZIP de entrada"
 
+#: templates/admin.php:14
+msgid "Save"
+msgstr ""
+
 #: templates/index.php:7
 msgid "New"
 msgstr "Nuevo"
diff --git a/l10n/es/settings.po b/l10n/es/settings.po
index c8eaee979f..2d38de5f75 100644
--- a/l10n/es/settings.po
+++ b/l10n/es/settings.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-09-04 12:42+0200\n"
-"PO-Revision-Date: 2012-09-04 10:42+0000\n"
+"POT-Creation-Date: 2012-09-05 02:02+0200\n"
+"PO-Revision-Date: 2012-09-05 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"
@@ -31,17 +31,17 @@ msgid "Unable to load list from App Store"
 msgstr "Imposible cargar la lista desde el App Store"
 
 #: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
-#: ajax/togglegroups.php:18
+#: ajax/togglegroups.php:15
 msgid "Authentication error"
 msgstr "Error de autenticación"
 
 #: ajax/creategroup.php:19
 msgid "Group already exists"
-msgstr ""
+msgstr "El grupo ya existe"
 
 #: ajax/creategroup.php:28
 msgid "Unable to add group"
-msgstr ""
+msgstr "No se pudo añadir el grupo"
 
 #: ajax/lostpassword.php:14
 msgid "Email saved"
@@ -61,16 +61,26 @@ msgstr "Solicitud no válida"
 
 #: ajax/removegroup.php:16
 msgid "Unable to delete group"
-msgstr ""
+msgstr "No se pudo eliminar el grupo"
 
 #: ajax/removeuser.php:22
 msgid "Unable to delete user"
-msgstr ""
+msgstr "No se pudo eliminar el usuario"
 
 #: ajax/setlanguage.php:18
 msgid "Language changed"
 msgstr "Idioma cambiado"
 
+#: ajax/togglegroups.php:25
+#, php-format
+msgid "Unable to add user to group %s"
+msgstr ""
+
+#: ajax/togglegroups.php:31
+#, php-format
+msgid "Unable to remove user from group %s"
+msgstr ""
+
 #: js/apps.js:18
 msgid "Error"
 msgstr "Error"
@@ -187,12 +197,8 @@ msgid "See application page at apps.owncloud.com"
 msgstr "Echa un vistazo a la web de aplicaciones apps.owncloud.com"
 
 #: templates/apps.php:30
-msgid "-licensed"
-msgstr "-autorizado"
-
-#: templates/apps.php:30
-msgid "by"
-msgstr "por"
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+msgstr ""
 
 #: templates/help.php:9
 msgid "Documentation"
diff --git a/l10n/et_EE/files.po b/l10n/et_EE/files.po
index 89b36a8415..7b09da2e4f 100644
--- a/l10n/et_EE/files.po
+++ b/l10n/et_EE/files.po
@@ -8,15 +8,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-05 02:01+0200\n"
+"PO-Revision-Date: 2012-09-05 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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: et_EE\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ajax/upload.php:20
 msgid "There is no error, the file uploaded with success"
@@ -165,6 +165,10 @@ msgstr "0 tähendab piiramatut"
 msgid "Maximum input size for ZIP files"
 msgstr "Maksimaalne ZIP-faili sisestatava faili suurus"
 
+#: templates/admin.php:14
+msgid "Save"
+msgstr ""
+
 #: templates/index.php:7
 msgid "New"
 msgstr "Uus"
diff --git a/l10n/et_EE/settings.po b/l10n/et_EE/settings.po
index 4c8dabda4a..2060adcac0 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-09-04 12:42+0200\n"
-"PO-Revision-Date: 2012-09-04 10:42+0000\n"
+"POT-Creation-Date: 2012-09-05 02:02+0200\n"
+"PO-Revision-Date: 2012-09-05 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"
@@ -24,7 +24,7 @@ msgid "Unable to load list from App Store"
 msgstr "App Sotre'i nimekirja laadimine ebaõnnestus"
 
 #: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
-#: ajax/togglegroups.php:18
+#: ajax/togglegroups.php:15
 msgid "Authentication error"
 msgstr "Autentimise viga"
 
@@ -64,6 +64,16 @@ msgstr ""
 msgid "Language changed"
 msgstr "Keel on muudetud"
 
+#: ajax/togglegroups.php:25
+#, php-format
+msgid "Unable to add user to group %s"
+msgstr ""
+
+#: ajax/togglegroups.php:31
+#, php-format
+msgid "Unable to remove user from group %s"
+msgstr ""
+
 #: js/apps.js:18
 msgid "Error"
 msgstr "Viga"
@@ -180,12 +190,8 @@ msgid "See application page at apps.owncloud.com"
 msgstr "Vaata rakenduste lehte aadressil apps.owncloud.com"
 
 #: templates/apps.php:30
-msgid "-licensed"
-msgstr "-litsenseeritud"
-
-#: templates/apps.php:30
-msgid "by"
-msgstr "kelle poolt"
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+msgstr ""
 
 #: templates/help.php:9
 msgid "Documentation"
diff --git a/l10n/eu/files.po b/l10n/eu/files.po
index a0e689fba4..19d4a2e58c 100644
--- a/l10n/eu/files.po
+++ b/l10n/eu/files.po
@@ -9,15 +9,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-05 02:01+0200\n"
+"PO-Revision-Date: 2012-09-05 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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: eu\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ajax/upload.php:20
 msgid "There is no error, the file uploaded with success"
@@ -166,6 +166,10 @@ msgstr "0 mugarik gabe esan nahi du"
 msgid "Maximum input size for ZIP files"
 msgstr "ZIP fitxategien gehienezko tamaina"
 
+#: templates/admin.php:14
+msgid "Save"
+msgstr ""
+
 #: templates/index.php:7
 msgid "New"
 msgstr "Berria"
diff --git a/l10n/eu/settings.po b/l10n/eu/settings.po
index c7fd18eb34..f23e12e728 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-09-04 12:42+0200\n"
-"PO-Revision-Date: 2012-09-04 10:42+0000\n"
+"POT-Creation-Date: 2012-09-05 02:02+0200\n"
+"PO-Revision-Date: 2012-09-05 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"
@@ -25,7 +25,7 @@ msgid "Unable to load list from App Store"
 msgstr "Ezin izan da App Dendatik zerrenda kargatu"
 
 #: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
-#: ajax/togglegroups.php:18
+#: ajax/togglegroups.php:15
 msgid "Authentication error"
 msgstr "Autentifikazio errorea"
 
@@ -65,6 +65,16 @@ msgstr ""
 msgid "Language changed"
 msgstr "Hizkuntza aldatuta"
 
+#: ajax/togglegroups.php:25
+#, php-format
+msgid "Unable to add user to group %s"
+msgstr ""
+
+#: ajax/togglegroups.php:31
+#, php-format
+msgid "Unable to remove user from group %s"
+msgstr ""
+
 #: js/apps.js:18
 msgid "Error"
 msgstr "Errorea"
@@ -181,12 +191,8 @@ msgid "See application page at apps.owncloud.com"
 msgstr "Ikusi programen orria apps.owncloud.com en"
 
 #: templates/apps.php:30
-msgid "-licensed"
-msgstr "lizentziarekin"
-
-#: templates/apps.php:30
-msgid "by"
-msgstr " Egilea:"
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+msgstr ""
 
 #: templates/help.php:9
 msgid "Documentation"
diff --git a/l10n/eu_ES/files.po b/l10n/eu_ES/files.po
index 1a86a78d4b..5a8745c031 100644
--- a/l10n/eu_ES/files.po
+++ b/l10n/eu_ES/files.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-05 02:01+0200\n"
+"PO-Revision-Date: 2012-09-05 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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: eu_ES\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ajax/upload.php:20
 msgid "There is no error, the file uploaded with success"
@@ -164,6 +164,10 @@ msgstr ""
 msgid "Maximum input size for ZIP files"
 msgstr ""
 
+#: templates/admin.php:14
+msgid "Save"
+msgstr ""
+
 #: templates/index.php:7
 msgid "New"
 msgstr ""
diff --git a/l10n/eu_ES/settings.po b/l10n/eu_ES/settings.po
index a4cf700a20..bca1c25deb 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-09-04 12:42+0200\n"
-"PO-Revision-Date: 2012-09-04 10:42+0000\n"
+"POT-Creation-Date: 2012-09-05 02:02+0200\n"
+"PO-Revision-Date: 2012-09-05 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"
@@ -22,7 +22,7 @@ msgid "Unable to load list from App Store"
 msgstr ""
 
 #: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
-#: ajax/togglegroups.php:18
+#: ajax/togglegroups.php:15
 msgid "Authentication error"
 msgstr ""
 
@@ -62,6 +62,16 @@ msgstr ""
 msgid "Language changed"
 msgstr ""
 
+#: ajax/togglegroups.php:25
+#, php-format
+msgid "Unable to add user to group %s"
+msgstr ""
+
+#: ajax/togglegroups.php:31
+#, php-format
+msgid "Unable to remove user from group %s"
+msgstr ""
+
 #: js/apps.js:18
 msgid "Error"
 msgstr ""
@@ -178,11 +188,7 @@ msgid "See application page at apps.owncloud.com"
 msgstr ""
 
 #: templates/apps.php:30
-msgid "-licensed"
-msgstr ""
-
-#: templates/apps.php:30
-msgid "by"
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr ""
 
 #: templates/help.php:9
diff --git a/l10n/fa/files.po b/l10n/fa/files.po
index 136043a67d..a1981830b7 100644
--- a/l10n/fa/files.po
+++ b/l10n/fa/files.po
@@ -10,15 +10,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-05 02:01+0200\n"
+"PO-Revision-Date: 2012-09-05 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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fa\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ajax/upload.php:20
 msgid "There is no error, the file uploaded with success"
@@ -167,6 +167,10 @@ msgstr "0 نامحدود است"
 msgid "Maximum input size for ZIP files"
 msgstr "حداکثرمقدار برای بار گزاری پرونده های فشرده"
 
+#: templates/admin.php:14
+msgid "Save"
+msgstr ""
+
 #: templates/index.php:7
 msgid "New"
 msgstr "جدید"
diff --git a/l10n/fa/settings.po b/l10n/fa/settings.po
index 17f939836a..9f3314e706 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-09-04 12:42+0200\n"
-"PO-Revision-Date: 2012-09-04 10:42+0000\n"
+"POT-Creation-Date: 2012-09-05 02:02+0200\n"
+"PO-Revision-Date: 2012-09-05 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"
@@ -24,7 +24,7 @@ msgid "Unable to load list from App Store"
 msgstr ""
 
 #: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
-#: ajax/togglegroups.php:18
+#: ajax/togglegroups.php:15
 msgid "Authentication error"
 msgstr ""
 
@@ -64,6 +64,16 @@ msgstr ""
 msgid "Language changed"
 msgstr "زبان تغییر کرد"
 
+#: ajax/togglegroups.php:25
+#, php-format
+msgid "Unable to add user to group %s"
+msgstr ""
+
+#: ajax/togglegroups.php:31
+#, php-format
+msgid "Unable to remove user from group %s"
+msgstr ""
+
 #: js/apps.js:18
 msgid "Error"
 msgstr "خطا"
@@ -180,12 +190,8 @@ msgid "See application page at apps.owncloud.com"
 msgstr "صفحه این اٌپ را در apps.owncloud.com ببینید"
 
 #: templates/apps.php:30
-msgid "-licensed"
-msgstr "مجوزنامه"
-
-#: templates/apps.php:30
-msgid "by"
-msgstr "به وسیله"
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+msgstr ""
 
 #: templates/help.php:9
 msgid "Documentation"
diff --git a/l10n/fi/files.po b/l10n/fi/files.po
index 64ed983196..a46618c502 100644
--- a/l10n/fi/files.po
+++ b/l10n/fi/files.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-05 02:01+0200\n"
+"PO-Revision-Date: 2012-09-05 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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fi\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ajax/upload.php:20
 msgid "There is no error, the file uploaded with success"
@@ -164,6 +164,10 @@ msgstr ""
 msgid "Maximum input size for ZIP files"
 msgstr ""
 
+#: templates/admin.php:14
+msgid "Save"
+msgstr ""
+
 #: templates/index.php:7
 msgid "New"
 msgstr ""
diff --git a/l10n/fi/settings.po b/l10n/fi/settings.po
index e91b258aa2..b2daafd990 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-09-04 12:42+0200\n"
-"PO-Revision-Date: 2012-09-04 10:42+0000\n"
+"POT-Creation-Date: 2012-09-05 02:02+0200\n"
+"PO-Revision-Date: 2012-09-05 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"
@@ -22,7 +22,7 @@ msgid "Unable to load list from App Store"
 msgstr ""
 
 #: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
-#: ajax/togglegroups.php:18
+#: ajax/togglegroups.php:15
 msgid "Authentication error"
 msgstr ""
 
@@ -62,6 +62,16 @@ msgstr ""
 msgid "Language changed"
 msgstr ""
 
+#: ajax/togglegroups.php:25
+#, php-format
+msgid "Unable to add user to group %s"
+msgstr ""
+
+#: ajax/togglegroups.php:31
+#, php-format
+msgid "Unable to remove user from group %s"
+msgstr ""
+
 #: js/apps.js:18
 msgid "Error"
 msgstr ""
@@ -178,11 +188,7 @@ msgid "See application page at apps.owncloud.com"
 msgstr ""
 
 #: templates/apps.php:30
-msgid "-licensed"
-msgstr ""
-
-#: templates/apps.php:30
-msgid "by"
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr ""
 
 #: templates/help.php:9
diff --git a/l10n/fi_FI/files.po b/l10n/fi_FI/files.po
index 4bac70c1c2..7b28a31a63 100644
--- a/l10n/fi_FI/files.po
+++ b/l10n/fi_FI/files.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-09-04 02:01+0200\n"
-"PO-Revision-Date: 2012-09-03 16:25+0000\n"
-"Last-Translator: teho <tehoratopato@gmail.com>\n"
+"POT-Creation-Date: 2012-09-05 02:01+0200\n"
+"PO-Revision-Date: 2012-09-05 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"
@@ -169,6 +169,10 @@ msgstr "0 on rajoittamaton"
 msgid "Maximum input size for ZIP files"
 msgstr "ZIP-tiedostojen enimmäiskoko"
 
+#: templates/admin.php:14
+msgid "Save"
+msgstr ""
+
 #: templates/index.php:7
 msgid "New"
 msgstr "Uusi"
diff --git a/l10n/fi_FI/settings.po b/l10n/fi_FI/settings.po
index 405a3a62d3..e540a68630 100644
--- a/l10n/fi_FI/settings.po
+++ b/l10n/fi_FI/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-09-04 12:42+0200\n"
-"PO-Revision-Date: 2012-09-04 10:42+0000\n"
+"POT-Creation-Date: 2012-09-05 02:02+0200\n"
+"PO-Revision-Date: 2012-09-05 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"
@@ -25,17 +25,17 @@ msgid "Unable to load list from App Store"
 msgstr "Ei pystytä lataamaan listaa sovellusvarastosta (App Store)"
 
 #: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
-#: ajax/togglegroups.php:18
+#: ajax/togglegroups.php:15
 msgid "Authentication error"
 msgstr "Todennusvirhe"
 
 #: ajax/creategroup.php:19
 msgid "Group already exists"
-msgstr ""
+msgstr "Ryhmä on jo olemassa"
 
 #: ajax/creategroup.php:28
 msgid "Unable to add group"
-msgstr ""
+msgstr "Ryhmän lisäys epäonnistui"
 
 #: ajax/lostpassword.php:14
 msgid "Email saved"
@@ -55,16 +55,26 @@ msgstr "Virheellinen pyyntö"
 
 #: ajax/removegroup.php:16
 msgid "Unable to delete group"
-msgstr ""
+msgstr "Ryhmän poisto epäonnistui"
 
 #: ajax/removeuser.php:22
 msgid "Unable to delete user"
-msgstr ""
+msgstr "Käyttäjän poisto epäonnistui"
 
 #: ajax/setlanguage.php:18
 msgid "Language changed"
 msgstr "Kieli on vaihdettu"
 
+#: ajax/togglegroups.php:25
+#, php-format
+msgid "Unable to add user to group %s"
+msgstr ""
+
+#: ajax/togglegroups.php:31
+#, php-format
+msgid "Unable to remove user from group %s"
+msgstr ""
+
 #: js/apps.js:18
 msgid "Error"
 msgstr "Virhe"
@@ -181,12 +191,8 @@ msgid "See application page at apps.owncloud.com"
 msgstr "Katso sovellussivu osoitteessa apps.owncloud.com"
 
 #: templates/apps.php:30
-msgid "-licensed"
-msgstr "-lisenssöity"
-
-#: templates/apps.php:30
-msgid "by"
-msgstr "henkilölle"
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+msgstr ""
 
 #: templates/help.php:9
 msgid "Documentation"
diff --git a/l10n/fi_FI/user_ldap.po b/l10n/fi_FI/user_ldap.po
index 8d3344a831..e1e890a161 100644
--- a/l10n/fi_FI/user_ldap.po
+++ b/l10n/fi_FI/user_ldap.po
@@ -9,15 +9,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-05 02:01+0200\n"
+"PO-Revision-Date: 2012-09-04 14:29+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"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/settings.php:8
 msgid "Host"
@@ -26,7 +26,7 @@ msgstr "Isäntä"
 #: templates/settings.php:8
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
-msgstr "Voit jättää protokollan määrittämättä, paitsi kun käytät SSL:ää. Aloita silloin ldaps://"
+msgstr "Voit jättää protokollan määrittämättä, paitsi kun vaadit SSL:ää. Aloita silloin ldaps://"
 
 #: templates/settings.php:9
 msgid "Base DN"
@@ -34,7 +34,7 @@ msgstr "Oletus DN"
 
 #: templates/settings.php:9
 msgid "You can specify Base DN for users and groups in the Advanced tab"
-msgstr "Voit määrittää käyttäjien ja ryhmien oletus DN:n (distinguished name) 'tarkemmat asetukset' välilehdeltä  "
+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"
@@ -101,7 +101,7 @@ msgstr "Portti"
 
 #: templates/settings.php:18
 msgid "Base User Tree"
-msgstr "Oletus käyttäjäpuu"
+msgstr "Oletuskäyttäjäpuu"
 
 #: templates/settings.php:19
 msgid "Base Group Tree"
@@ -117,7 +117,7 @@ msgstr "Käytä TLS:ää"
 
 #: templates/settings.php:21
 msgid "Do not use it for SSL connections, it will fail."
-msgstr "Älä käytä SSL yhteyttä varten, se epäonnistuu. "
+msgstr "Älä käytä SSL-yhteyttä varten, se epäonnistuu. "
 
 #: templates/settings.php:22
 msgid "Case insensitve LDAP server (Windows)"
@@ -125,13 +125,13 @@ msgstr "Kirjainkoosta piittamaton LDAP-palvelin (Windows)"
 
 #: templates/settings.php:23
 msgid "Turn off SSL certificate validation."
-msgstr "Sulje SSL sertifikaatin käyttö"
+msgstr "Poista käytöstä SSL-varmenteen vahvistus"
 
 #: templates/settings.php:23
 msgid ""
 "If connection only works with this option, import the LDAP server's SSL "
 "certificate in your ownCloud server."
-msgstr "Jos yhteys toimii vain tällä optiolla, siirrä LDAP palvelimen SSL sertifikaatti onwCloud palvelimellesi. "
+msgstr "Jos yhteys toimii vain tällä valinnalla, siirrä LDAP-palvelimen SSL-varmenne ownCloud-palvelimellesi."
 
 #: templates/settings.php:23
 msgid "Not recommended, use for testing only."
diff --git a/l10n/fr/files.po b/l10n/fr/files.po
index 9131d0d350..6467b47697 100644
--- a/l10n/fr/files.po
+++ b/l10n/fr/files.po
@@ -15,15 +15,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 02:01+0200\n"
-"PO-Revision-Date: 2012-08-31 09:27+0000\n"
-"Last-Translator: gp4004 <gp4004@arghh.org>\n"
+"POT-Creation-Date: 2012-09-05 02:01+0200\n"
+"PO-Revision-Date: 2012-09-05 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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fr\n"
-"Plural-Forms: nplurals=2; plural=(n > 1)\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: ajax/upload.php:20
 msgid "There is no error, the file uploaded with success"
@@ -172,6 +172,10 @@ msgstr "0 est illimité"
 msgid "Maximum input size for ZIP files"
 msgstr "Taille maximale pour les fichiers ZIP"
 
+#: templates/admin.php:14
+msgid "Save"
+msgstr ""
+
 #: templates/index.php:7
 msgid "New"
 msgstr "Nouveau"
diff --git a/l10n/fr/settings.po b/l10n/fr/settings.po
index 0c8e1d758d..0fd897ba24 100644
--- a/l10n/fr/settings.po
+++ b/l10n/fr/settings.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-09-04 12:42+0200\n"
-"PO-Revision-Date: 2012-09-04 10:42+0000\n"
+"POT-Creation-Date: 2012-09-05 02:02+0200\n"
+"PO-Revision-Date: 2012-09-05 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"
@@ -32,17 +32,17 @@ msgid "Unable to load list from App Store"
 msgstr "Impossible de charger la liste depuis l'App Store"
 
 #: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
-#: ajax/togglegroups.php:18
+#: ajax/togglegroups.php:15
 msgid "Authentication error"
 msgstr "Erreur d'authentification"
 
 #: ajax/creategroup.php:19
 msgid "Group already exists"
-msgstr ""
+msgstr "Ce groupe existe déjà"
 
 #: ajax/creategroup.php:28
 msgid "Unable to add group"
-msgstr ""
+msgstr "Impossible d'ajouter le groupe"
 
 #: ajax/lostpassword.php:14
 msgid "Email saved"
@@ -62,16 +62,26 @@ msgstr "Requête invalide"
 
 #: ajax/removegroup.php:16
 msgid "Unable to delete group"
-msgstr ""
+msgstr "Impossible de supprimer le groupe"
 
 #: ajax/removeuser.php:22
 msgid "Unable to delete user"
-msgstr ""
+msgstr "Impossible de supprimer l'utilisateur"
 
 #: ajax/setlanguage.php:18
 msgid "Language changed"
 msgstr "Langue changée"
 
+#: ajax/togglegroups.php:25
+#, php-format
+msgid "Unable to add user to group %s"
+msgstr ""
+
+#: ajax/togglegroups.php:31
+#, php-format
+msgid "Unable to remove user from group %s"
+msgstr ""
+
 #: js/apps.js:18
 msgid "Error"
 msgstr "Erreur"
@@ -188,12 +198,8 @@ msgid "See application page at apps.owncloud.com"
 msgstr "Voir la page des applications à l'url apps.owncloud.com"
 
 #: templates/apps.php:30
-msgid "-licensed"
-msgstr "sous licence"
-
-#: templates/apps.php:30
-msgid "by"
-msgstr "par"
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+msgstr ""
 
 #: templates/help.php:9
 msgid "Documentation"
diff --git a/l10n/gl/files.po b/l10n/gl/files.po
index d42c63821b..9413551a21 100644
--- a/l10n/gl/files.po
+++ b/l10n/gl/files.po
@@ -9,15 +9,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-05 02:01+0200\n"
+"PO-Revision-Date: 2012-09-05 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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: gl\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ajax/upload.php:20
 msgid "There is no error, the file uploaded with success"
@@ -166,6 +166,10 @@ msgstr "0 significa ilimitado"
 msgid "Maximum input size for ZIP files"
 msgstr "Tamaño máximo de descarga para os ZIP"
 
+#: templates/admin.php:14
+msgid "Save"
+msgstr ""
+
 #: templates/index.php:7
 msgid "New"
 msgstr "Novo"
diff --git a/l10n/gl/settings.po b/l10n/gl/settings.po
index abf9124621..60828ee96f 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-09-04 12:42+0200\n"
-"PO-Revision-Date: 2012-09-04 10:42+0000\n"
+"POT-Creation-Date: 2012-09-05 02:02+0200\n"
+"PO-Revision-Date: 2012-09-05 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"
@@ -24,7 +24,7 @@ msgid "Unable to load list from App Store"
 msgstr "Non se puido cargar a lista desde a App Store"
 
 #: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
-#: ajax/togglegroups.php:18
+#: ajax/togglegroups.php:15
 msgid "Authentication error"
 msgstr "Erro na autenticación"
 
@@ -64,6 +64,16 @@ msgstr ""
 msgid "Language changed"
 msgstr "O idioma mudou"
 
+#: ajax/togglegroups.php:25
+#, php-format
+msgid "Unable to add user to group %s"
+msgstr ""
+
+#: ajax/togglegroups.php:31
+#, php-format
+msgid "Unable to remove user from group %s"
+msgstr ""
+
 #: js/apps.js:18
 msgid "Error"
 msgstr "Erro"
@@ -180,12 +190,8 @@ msgid "See application page at apps.owncloud.com"
 msgstr "Vexa a páxina do aplicativo en apps.owncloud.com"
 
 #: templates/apps.php:30
-msgid "-licensed"
-msgstr "-licenciado"
-
-#: templates/apps.php:30
-msgid "by"
-msgstr "por"
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+msgstr ""
 
 #: templates/help.php:9
 msgid "Documentation"
diff --git a/l10n/he/files.po b/l10n/he/files.po
index 2d4d668d0c..51db52ac27 100644
--- a/l10n/he/files.po
+++ b/l10n/he/files.po
@@ -10,15 +10,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-05 02:01+0200\n"
+"PO-Revision-Date: 2012-09-05 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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: he\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ajax/upload.php:20
 msgid "There is no error, the file uploaded with success"
@@ -167,6 +167,10 @@ msgstr "0 - ללא הגבלה"
 msgid "Maximum input size for ZIP files"
 msgstr "גודל הקלט המרבי לקובצי ZIP"
 
+#: templates/admin.php:14
+msgid "Save"
+msgstr ""
+
 #: templates/index.php:7
 msgid "New"
 msgstr "חדש"
diff --git a/l10n/he/files_external.po b/l10n/he/files_external.po
index ba3aa0596e..78e36b4a5a 100644
--- a/l10n/he/files_external.po
+++ b/l10n/he/files_external.po
@@ -3,23 +3,24 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Tomer Cohen <tomerc+transifex.net@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-09-05 02:01+0200\n"
+"PO-Revision-Date: 2012-09-04 23:27+0000\n"
+"Last-Translator: Tomer Cohen <tomerc+transifex.net@gmail.com>\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"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: 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,32 +52,32 @@ 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/he/files_sharing.po b/l10n/he/files_sharing.po
index e9ce7816e2..0e6dea4b5b 100644
--- a/l10n/he/files_sharing.po
+++ b/l10n/he/files_sharing.po
@@ -3,36 +3,37 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Tomer Cohen <tomerc+transifex.net@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-05 02:01+0200\n"
+"PO-Revision-Date: 2012-09-04 23:20+0000\n"
+"Last-Translator: Tomer Cohen <tomerc+transifex.net@gmail.com>\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"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/authenticate.php:4
 msgid "Password"
-msgstr ""
+msgstr "ססמה"
 
 #: templates/authenticate.php:6
 msgid "Submit"
-msgstr ""
+msgstr "שליחה"
 
 #: templates/public.php:9 templates/public.php:19
 msgid "Download"
-msgstr ""
+msgstr "הורדה"
 
 #: templates/public.php:18
 msgid "No preview available for"
-msgstr ""
+msgstr "אין תצוגה מקדימה זמינה עבור"
 
-#: templates/public.php:23
+#: templates/public.php:25
 msgid "web services under your control"
-msgstr ""
+msgstr "שירותי רשת תחת השליטה שלך"
diff --git a/l10n/he/files_versions.po b/l10n/he/files_versions.po
index bab655f32c..e0cb0e526e 100644
--- a/l10n/he/files_versions.po
+++ b/l10n/he/files_versions.po
@@ -3,32 +3,33 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Tomer Cohen <tomerc+transifex.net@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 13:35+0200\n"
-"PO-Revision-Date: 2012-09-01 11:35+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-05 02:01+0200\n"
+"PO-Revision-Date: 2012-09-04 23:22+0000\n"
+"Last-Translator: Tomer Cohen <tomerc+transifex.net@gmail.com>\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"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: js/settings-personal.js:31 templates/settings-personal.php:10
 msgid "Expire all versions"
-msgstr ""
+msgstr "הפגת תוקף כל הגרסאות"
 
 #: templates/settings-personal.php:4
 msgid "Versions"
-msgstr ""
+msgstr "גרסאות"
 
 #: templates/settings-personal.php:7
 msgid "This will delete all existing backup versions of your files"
-msgstr ""
+msgstr "פעולה זו תמחק את כל גיבויי הגרסאות הקיימים של הקבצים שלך"
 
 #: templates/settings.php:3
 msgid "Enable Files Versioning"
-msgstr ""
+msgstr "הפעלת ניהול גרסאות לקבצים"
diff --git a/l10n/he/lib.po b/l10n/he/lib.po
index eed328e6ce..d85313a6ab 100644
--- a/l10n/he/lib.po
+++ b/l10n/he/lib.po
@@ -3,123 +3,124 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+# Tomer Cohen <tomerc+transifex.net@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 02:01+0200\n"
-"PO-Revision-Date: 2012-09-01 00:02+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-05 02:01+0200\n"
+"PO-Revision-Date: 2012-09-04 23:19+0000\n"
+"Last-Translator: Tomer Cohen <tomerc+transifex.net@gmail.com>\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"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: app.php:288
 msgid "Help"
-msgstr ""
+msgstr "עזרה"
 
 #: app.php:295
 msgid "Personal"
-msgstr ""
+msgstr "אישי"
 
 #: app.php:300
 msgid "Settings"
-msgstr ""
+msgstr "הגדרות"
 
 #: app.php:305
 msgid "Users"
-msgstr ""
+msgstr "משתמשים"
 
 #: app.php:312
 msgid "Apps"
-msgstr ""
+msgstr "יישומים"
 
 #: app.php:314
 msgid "Admin"
-msgstr ""
+msgstr "מנהל"
 
 #: files.php:280
 msgid "ZIP download is turned off."
-msgstr ""
+msgstr "הורדת ZIP כבויה"
 
 #: files.php:281
 msgid "Files need to be downloaded one by one."
-msgstr ""
+msgstr "יש להוריד את הקבצים אחד אחרי השני."
 
 #: files.php:281 files.php:306
 msgid "Back to Files"
-msgstr ""
+msgstr "חזרה לקבצים"
 
 #: files.php:305
 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 ""
-
-#: template.php:86
-msgid "seconds ago"
-msgstr ""
+msgstr "פג תוקף. נא לטעון שוב את הדף."
 
 #: template.php:87
-msgid "1 minute ago"
-msgstr ""
+msgid "seconds ago"
+msgstr "שניות"
 
 #: template.php:88
+msgid "1 minute ago"
+msgstr "לפני דקה אחת"
+
+#: template.php:89
 #, php-format
 msgid "%d minutes ago"
-msgstr ""
-
-#: template.php:91
-msgid "today"
-msgstr ""
+msgstr "לפני %d דקות"
 
 #: template.php:92
-msgid "yesterday"
-msgstr ""
+msgid "today"
+msgstr "היום"
 
 #: template.php:93
-#, php-format
-msgid "%d days ago"
-msgstr ""
+msgid "yesterday"
+msgstr "אתמול"
 
 #: template.php:94
-msgid "last month"
-msgstr ""
+#, php-format
+msgid "%d days ago"
+msgstr "לפני %d ימים"
 
 #: template.php:95
-msgid "months ago"
-msgstr ""
+msgid "last month"
+msgstr "חודש שעבר"
 
 #: template.php:96
-msgid "last year"
-msgstr ""
+msgid "months ago"
+msgstr "חודשים"
 
 #: template.php:97
+msgid "last year"
+msgstr "שנה שעברה"
+
+#: template.php:98
 msgid "years ago"
-msgstr ""
+msgstr "שנים"
 
 #: updater.php:66
 #, php-format
 msgid "%s is available. Get <a href=\"%s\">more information</a>"
-msgstr ""
+msgstr "%s זמין. קבלת <a href=\"%s\">מידע נוסף</a>"
 
 #: updater.php:68
 msgid "up to date"
-msgstr ""
+msgstr "עדכני"
 
 #: updater.php:71
 msgid "updates check is disabled"
-msgstr ""
+msgstr "בדיקת עדכונים מנוטרלת"
diff --git a/l10n/he/settings.po b/l10n/he/settings.po
index 1bad10caaf..bd56d36427 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-09-04 12:42+0200\n"
-"PO-Revision-Date: 2012-09-04 10:42+0000\n"
+"POT-Creation-Date: 2012-09-05 02:02+0200\n"
+"PO-Revision-Date: 2012-09-05 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"
@@ -25,7 +25,7 @@ msgid "Unable to load list from App Store"
 msgstr ""
 
 #: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
-#: ajax/togglegroups.php:18
+#: ajax/togglegroups.php:15
 msgid "Authentication error"
 msgstr ""
 
@@ -65,6 +65,16 @@ msgstr ""
 msgid "Language changed"
 msgstr "שפה השתנתה"
 
+#: ajax/togglegroups.php:25
+#, php-format
+msgid "Unable to add user to group %s"
+msgstr ""
+
+#: ajax/togglegroups.php:31
+#, php-format
+msgid "Unable to remove user from group %s"
+msgstr ""
+
 #: js/apps.js:18
 msgid "Error"
 msgstr ""
@@ -181,12 +191,8 @@ msgid "See application page at apps.owncloud.com"
 msgstr "צפה בעמוד הישום ב apps.owncloud.com"
 
 #: templates/apps.php:30
-msgid "-licensed"
-msgstr "רשיון"
-
-#: templates/apps.php:30
-msgid "by"
-msgstr "מאת"
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+msgstr ""
 
 #: templates/help.php:9
 msgid "Documentation"
diff --git a/l10n/hi/files.po b/l10n/hi/files.po
index 8270c796eb..58546409d5 100644
--- a/l10n/hi/files.po
+++ b/l10n/hi/files.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-05 02:01+0200\n"
+"PO-Revision-Date: 2012-09-05 00:02+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: hi\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ajax/upload.php:20
 msgid "There is no error, the file uploaded with success"
@@ -164,6 +164,10 @@ msgstr ""
 msgid "Maximum input size for ZIP files"
 msgstr ""
 
+#: templates/admin.php:14
+msgid "Save"
+msgstr ""
+
 #: templates/index.php:7
 msgid "New"
 msgstr ""
diff --git a/l10n/hi/settings.po b/l10n/hi/settings.po
index f29fbed414..db0cc7e30f 100644
--- a/l10n/hi/settings.po
+++ b/l10n/hi/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-09-04 12:42+0200\n"
-"PO-Revision-Date: 2012-09-04 10:42+0000\n"
+"POT-Creation-Date: 2012-09-05 02:02+0200\n"
+"PO-Revision-Date: 2012-09-05 00:02+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
 "MIME-Version: 1.0\n"
@@ -22,7 +22,7 @@ msgid "Unable to load list from App Store"
 msgstr ""
 
 #: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
-#: ajax/togglegroups.php:18
+#: ajax/togglegroups.php:15
 msgid "Authentication error"
 msgstr ""
 
@@ -62,6 +62,16 @@ msgstr ""
 msgid "Language changed"
 msgstr ""
 
+#: ajax/togglegroups.php:25
+#, php-format
+msgid "Unable to add user to group %s"
+msgstr ""
+
+#: ajax/togglegroups.php:31
+#, php-format
+msgid "Unable to remove user from group %s"
+msgstr ""
+
 #: js/apps.js:18
 msgid "Error"
 msgstr ""
@@ -178,11 +188,7 @@ msgid "See application page at apps.owncloud.com"
 msgstr ""
 
 #: templates/apps.php:30
-msgid "-licensed"
-msgstr ""
-
-#: templates/apps.php:30
-msgid "by"
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr ""
 
 #: templates/help.php:9
diff --git a/l10n/hr/files.po b/l10n/hr/files.po
index f6640c03c3..c0d12a58c8 100644
--- a/l10n/hr/files.po
+++ b/l10n/hr/files.po
@@ -10,15 +10,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-05 02:01+0200\n"
+"PO-Revision-Date: 2012-09-05 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"
 "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"
+"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:20
 msgid "There is no error, the file uploaded with success"
@@ -167,6 +167,10 @@ msgstr "0 je \"bez limita\""
 msgid "Maximum input size for ZIP files"
 msgstr "Maksimalna veličina za ZIP datoteke"
 
+#: templates/admin.php:14
+msgid "Save"
+msgstr ""
+
 #: templates/index.php:7
 msgid "New"
 msgstr "novo"
diff --git a/l10n/hr/settings.po b/l10n/hr/settings.po
index 22cbd59156..ef3eacff14 100644
--- a/l10n/hr/settings.po
+++ b/l10n/hr/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-09-04 12:42+0200\n"
-"PO-Revision-Date: 2012-09-04 10:42+0000\n"
+"POT-Creation-Date: 2012-09-05 02:02+0200\n"
+"PO-Revision-Date: 2012-09-05 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"
@@ -25,7 +25,7 @@ msgid "Unable to load list from App Store"
 msgstr "Nemogićnost učitavanja liste sa Apps Stora"
 
 #: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
-#: ajax/togglegroups.php:18
+#: ajax/togglegroups.php:15
 msgid "Authentication error"
 msgstr "Greška kod autorizacije"
 
@@ -65,6 +65,16 @@ msgstr ""
 msgid "Language changed"
 msgstr "Jezik promijenjen"
 
+#: ajax/togglegroups.php:25
+#, php-format
+msgid "Unable to add user to group %s"
+msgstr ""
+
+#: ajax/togglegroups.php:31
+#, php-format
+msgid "Unable to remove user from group %s"
+msgstr ""
+
 #: js/apps.js:18
 msgid "Error"
 msgstr "Greška"
@@ -181,12 +191,8 @@ msgid "See application page at apps.owncloud.com"
 msgstr "Pogledajte stranicu s aplikacijama na apps.owncloud.com"
 
 #: templates/apps.php:30
-msgid "-licensed"
-msgstr "-licencirano"
-
-#: templates/apps.php:30
-msgid "by"
-msgstr "od"
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+msgstr ""
 
 #: templates/help.php:9
 msgid "Documentation"
diff --git a/l10n/hu_HU/files.po b/l10n/hu_HU/files.po
index 4a97620ae7..a2baaea844 100644
--- a/l10n/hu_HU/files.po
+++ b/l10n/hu_HU/files.po
@@ -10,15 +10,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-05 02:01+0200\n"
+"PO-Revision-Date: 2012-09-05 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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: hu_HU\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ajax/upload.php:20
 msgid "There is no error, the file uploaded with success"
@@ -167,6 +167,10 @@ msgstr "0 = korlátlan"
 msgid "Maximum input size for ZIP files"
 msgstr "ZIP file-ok maximum mérete"
 
+#: templates/admin.php:14
+msgid "Save"
+msgstr ""
+
 #: templates/index.php:7
 msgid "New"
 msgstr "Új"
diff --git a/l10n/hu_HU/settings.po b/l10n/hu_HU/settings.po
index 1a47a633a7..5f3d66a4dd 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-09-04 12:42+0200\n"
-"PO-Revision-Date: 2012-09-04 10:42+0000\n"
+"POT-Creation-Date: 2012-09-05 02:02+0200\n"
+"PO-Revision-Date: 2012-09-05 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"
@@ -24,7 +24,7 @@ msgid "Unable to load list from App Store"
 msgstr "Nem tölthető le a lista az App Store-ból"
 
 #: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
-#: ajax/togglegroups.php:18
+#: ajax/togglegroups.php:15
 msgid "Authentication error"
 msgstr "Hitelesítési hiba"
 
@@ -64,6 +64,16 @@ msgstr ""
 msgid "Language changed"
 msgstr "A nyelv megváltozott"
 
+#: ajax/togglegroups.php:25
+#, php-format
+msgid "Unable to add user to group %s"
+msgstr ""
+
+#: ajax/togglegroups.php:31
+#, php-format
+msgid "Unable to remove user from group %s"
+msgstr ""
+
 #: js/apps.js:18
 msgid "Error"
 msgstr "Hiba"
@@ -180,12 +190,8 @@ msgid "See application page at apps.owncloud.com"
 msgstr "Lásd apps.owncloud.com, alkalmazások oldal"
 
 #: templates/apps.php:30
-msgid "-licensed"
-msgstr "-licencelt"
-
-#: templates/apps.php:30
-msgid "by"
-msgstr ":"
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+msgstr ""
 
 #: templates/help.php:9
 msgid "Documentation"
diff --git a/l10n/hy/files.po b/l10n/hy/files.po
index 1e64d6f49e..fdc067d326 100644
--- a/l10n/hy/files.po
+++ b/l10n/hy/files.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-05 02:01+0200\n"
+"PO-Revision-Date: 2012-09-05 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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: hy\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ajax/upload.php:20
 msgid "There is no error, the file uploaded with success"
@@ -164,6 +164,10 @@ msgstr ""
 msgid "Maximum input size for ZIP files"
 msgstr ""
 
+#: templates/admin.php:14
+msgid "Save"
+msgstr ""
+
 #: templates/index.php:7
 msgid "New"
 msgstr ""
diff --git a/l10n/hy/settings.po b/l10n/hy/settings.po
index 17b840f15d..394122cdf1 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-09-04 12:42+0200\n"
-"PO-Revision-Date: 2012-09-04 10:42+0000\n"
+"POT-Creation-Date: 2012-09-05 02:02+0200\n"
+"PO-Revision-Date: 2012-09-05 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"
@@ -22,7 +22,7 @@ msgid "Unable to load list from App Store"
 msgstr ""
 
 #: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
-#: ajax/togglegroups.php:18
+#: ajax/togglegroups.php:15
 msgid "Authentication error"
 msgstr ""
 
@@ -62,6 +62,16 @@ msgstr ""
 msgid "Language changed"
 msgstr ""
 
+#: ajax/togglegroups.php:25
+#, php-format
+msgid "Unable to add user to group %s"
+msgstr ""
+
+#: ajax/togglegroups.php:31
+#, php-format
+msgid "Unable to remove user from group %s"
+msgstr ""
+
 #: js/apps.js:18
 msgid "Error"
 msgstr ""
@@ -178,11 +188,7 @@ msgid "See application page at apps.owncloud.com"
 msgstr ""
 
 #: templates/apps.php:30
-msgid "-licensed"
-msgstr ""
-
-#: templates/apps.php:30
-msgid "by"
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr ""
 
 #: templates/help.php:9
diff --git a/l10n/ia/files.po b/l10n/ia/files.po
index 66430afef4..b2010914e2 100644
--- a/l10n/ia/files.po
+++ b/l10n/ia/files.po
@@ -9,15 +9,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-05 02:01+0200\n"
+"PO-Revision-Date: 2012-09-05 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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ia\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ajax/upload.php:20
 msgid "There is no error, the file uploaded with success"
@@ -166,6 +166,10 @@ msgstr ""
 msgid "Maximum input size for ZIP files"
 msgstr ""
 
+#: templates/admin.php:14
+msgid "Save"
+msgstr ""
+
 #: templates/index.php:7
 msgid "New"
 msgstr "Nove"
diff --git a/l10n/ia/settings.po b/l10n/ia/settings.po
index b495b59ed9..ab80ed851a 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-09-04 12:42+0200\n"
-"PO-Revision-Date: 2012-09-04 10:42+0000\n"
+"POT-Creation-Date: 2012-09-05 02:02+0200\n"
+"PO-Revision-Date: 2012-09-05 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"
@@ -24,7 +24,7 @@ msgid "Unable to load list from App Store"
 msgstr ""
 
 #: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
-#: ajax/togglegroups.php:18
+#: ajax/togglegroups.php:15
 msgid "Authentication error"
 msgstr ""
 
@@ -64,6 +64,16 @@ msgstr ""
 msgid "Language changed"
 msgstr "Linguage cambiate"
 
+#: ajax/togglegroups.php:25
+#, php-format
+msgid "Unable to add user to group %s"
+msgstr ""
+
+#: ajax/togglegroups.php:31
+#, php-format
+msgid "Unable to remove user from group %s"
+msgstr ""
+
 #: js/apps.js:18
 msgid "Error"
 msgstr ""
@@ -180,13 +190,9 @@ msgid "See application page at apps.owncloud.com"
 msgstr ""
 
 #: templates/apps.php:30
-msgid "-licensed"
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr ""
 
-#: templates/apps.php:30
-msgid "by"
-msgstr "per"
-
 #: templates/help.php:9
 msgid "Documentation"
 msgstr "Documentation"
diff --git a/l10n/id/files.po b/l10n/id/files.po
index 53122c53b6..806ae3250e 100644
--- a/l10n/id/files.po
+++ b/l10n/id/files.po
@@ -10,15 +10,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-05 02:01+0200\n"
+"PO-Revision-Date: 2012-09-05 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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: id\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ajax/upload.php:20
 msgid "There is no error, the file uploaded with success"
@@ -167,6 +167,10 @@ msgstr "0 adalah tidak terbatas"
 msgid "Maximum input size for ZIP files"
 msgstr "Ukuran masukan maksimal untuk berkas ZIP"
 
+#: templates/admin.php:14
+msgid "Save"
+msgstr ""
+
 #: templates/index.php:7
 msgid "New"
 msgstr "Baru"
diff --git a/l10n/id/settings.po b/l10n/id/settings.po
index b5a17ff764..c2bd93b9e1 100644
--- a/l10n/id/settings.po
+++ b/l10n/id/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-09-04 12:42+0200\n"
-"PO-Revision-Date: 2012-09-04 10:42+0000\n"
+"POT-Creation-Date: 2012-09-05 02:02+0200\n"
+"PO-Revision-Date: 2012-09-05 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"
@@ -25,7 +25,7 @@ msgid "Unable to load list from App Store"
 msgstr ""
 
 #: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
-#: ajax/togglegroups.php:18
+#: ajax/togglegroups.php:15
 msgid "Authentication error"
 msgstr ""
 
@@ -65,6 +65,16 @@ msgstr ""
 msgid "Language changed"
 msgstr "Bahasa telah diganti"
 
+#: ajax/togglegroups.php:25
+#, php-format
+msgid "Unable to add user to group %s"
+msgstr ""
+
+#: ajax/togglegroups.php:31
+#, php-format
+msgid "Unable to remove user from group %s"
+msgstr ""
+
 #: js/apps.js:18
 msgid "Error"
 msgstr ""
@@ -181,12 +191,8 @@ msgid "See application page at apps.owncloud.com"
 msgstr "Lihat halaman aplikasi di apps.owncloud.com"
 
 #: templates/apps.php:30
-msgid "-licensed"
-msgstr "-terlisensi"
-
-#: templates/apps.php:30
-msgid "by"
-msgstr "oleh"
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+msgstr ""
 
 #: templates/help.php:9
 msgid "Documentation"
diff --git a/l10n/id_ID/files.po b/l10n/id_ID/files.po
index cbc59367cd..a138ce1d22 100644
--- a/l10n/id_ID/files.po
+++ b/l10n/id_ID/files.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-05 02:01+0200\n"
+"PO-Revision-Date: 2012-09-05 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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: id_ID\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ajax/upload.php:20
 msgid "There is no error, the file uploaded with success"
@@ -164,6 +164,10 @@ msgstr ""
 msgid "Maximum input size for ZIP files"
 msgstr ""
 
+#: templates/admin.php:14
+msgid "Save"
+msgstr ""
+
 #: templates/index.php:7
 msgid "New"
 msgstr ""
diff --git a/l10n/id_ID/settings.po b/l10n/id_ID/settings.po
index 140d43b480..b70af6b0c3 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-09-04 12:42+0200\n"
-"PO-Revision-Date: 2012-09-04 10:42+0000\n"
+"POT-Creation-Date: 2012-09-05 02:02+0200\n"
+"PO-Revision-Date: 2012-09-05 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"
@@ -22,7 +22,7 @@ msgid "Unable to load list from App Store"
 msgstr ""
 
 #: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
-#: ajax/togglegroups.php:18
+#: ajax/togglegroups.php:15
 msgid "Authentication error"
 msgstr ""
 
@@ -62,6 +62,16 @@ msgstr ""
 msgid "Language changed"
 msgstr ""
 
+#: ajax/togglegroups.php:25
+#, php-format
+msgid "Unable to add user to group %s"
+msgstr ""
+
+#: ajax/togglegroups.php:31
+#, php-format
+msgid "Unable to remove user from group %s"
+msgstr ""
+
 #: js/apps.js:18
 msgid "Error"
 msgstr ""
@@ -178,11 +188,7 @@ msgid "See application page at apps.owncloud.com"
 msgstr ""
 
 #: templates/apps.php:30
-msgid "-licensed"
-msgstr ""
-
-#: templates/apps.php:30
-msgid "by"
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr ""
 
 #: templates/help.php:9
diff --git a/l10n/it/files.po b/l10n/it/files.po
index ccf33f1c45..29c50647d1 100644
--- a/l10n/it/files.po
+++ b/l10n/it/files.po
@@ -11,15 +11,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 02:01+0200\n"
-"PO-Revision-Date: 2012-08-31 05:43+0000\n"
-"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
+"POT-Creation-Date: 2012-09-05 02:01+0200\n"
+"PO-Revision-Date: 2012-09-05 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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: it\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ajax/upload.php:20
 msgid "There is no error, the file uploaded with success"
@@ -168,6 +168,10 @@ msgstr "0 è illimitato"
 msgid "Maximum input size for ZIP files"
 msgstr "Dimensione massima per i file ZIP"
 
+#: templates/admin.php:14
+msgid "Save"
+msgstr ""
+
 #: templates/index.php:7
 msgid "New"
 msgstr "Nuovo"
diff --git a/l10n/it/settings.po b/l10n/it/settings.po
index a0f7597544..7a1601c881 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-09-04 12:42+0200\n"
-"PO-Revision-Date: 2012-09-04 10:42+0000\n"
+"POT-Creation-Date: 2012-09-05 02:02+0200\n"
+"PO-Revision-Date: 2012-09-05 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"
@@ -29,17 +29,17 @@ msgid "Unable to load list from App Store"
 msgstr "Impossibile caricare l'elenco dall'App Store"
 
 #: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
-#: ajax/togglegroups.php:18
+#: ajax/togglegroups.php:15
 msgid "Authentication error"
 msgstr "Errore di autenticazione"
 
 #: ajax/creategroup.php:19
 msgid "Group already exists"
-msgstr ""
+msgstr "Il gruppo esiste già"
 
 #: ajax/creategroup.php:28
 msgid "Unable to add group"
-msgstr ""
+msgstr "Impossibile aggiungere il gruppo"
 
 #: ajax/lostpassword.php:14
 msgid "Email saved"
@@ -59,16 +59,26 @@ msgstr "Richiesta non valida"
 
 #: ajax/removegroup.php:16
 msgid "Unable to delete group"
-msgstr ""
+msgstr "Impossibile eliminare il gruppo"
 
 #: ajax/removeuser.php:22
 msgid "Unable to delete user"
-msgstr ""
+msgstr "Impossibile eliminare l'utente"
 
 #: ajax/setlanguage.php:18
 msgid "Language changed"
 msgstr "Lingua modificata"
 
+#: ajax/togglegroups.php:25
+#, php-format
+msgid "Unable to add user to group %s"
+msgstr ""
+
+#: ajax/togglegroups.php:31
+#, php-format
+msgid "Unable to remove user from group %s"
+msgstr ""
+
 #: js/apps.js:18
 msgid "Error"
 msgstr "Errore"
@@ -185,12 +195,8 @@ msgid "See application page at apps.owncloud.com"
 msgstr "Vedere la pagina dell'applicazione su apps.owncloud.com"
 
 #: templates/apps.php:30
-msgid "-licensed"
-msgstr "-rilasciato"
-
-#: templates/apps.php:30
-msgid "by"
-msgstr "da"
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+msgstr ""
 
 #: templates/help.php:9
 msgid "Documentation"
diff --git a/l10n/ja_JP/files.po b/l10n/ja_JP/files.po
index 3fbe7f60e9..7474142217 100644
--- a/l10n/ja_JP/files.po
+++ b/l10n/ja_JP/files.po
@@ -9,15 +9,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 02:01+0200\n"
-"PO-Revision-Date: 2012-08-31 07:52+0000\n"
-"Last-Translator: ttyn <tetuyano+transi@gmail.com>\n"
+"POT-Creation-Date: 2012-09-05 02:01+0200\n"
+"PO-Revision-Date: 2012-09-05 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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ja_JP\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ajax/upload.php:20
 msgid "There is no error, the file uploaded with success"
@@ -166,6 +166,10 @@ msgstr "0を指定した場合は無制限"
 msgid "Maximum input size for ZIP files"
 msgstr "ZIPファイルへの最大入力サイズ"
 
+#: templates/admin.php:14
+msgid "Save"
+msgstr ""
+
 #: templates/index.php:7
 msgid "New"
 msgstr "新規"
diff --git a/l10n/ja_JP/settings.po b/l10n/ja_JP/settings.po
index 4721075e9d..b98da01025 100644
--- a/l10n/ja_JP/settings.po
+++ b/l10n/ja_JP/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-09-04 12:42+0200\n"
-"PO-Revision-Date: 2012-09-04 10:42+0000\n"
+"POT-Creation-Date: 2012-09-05 02:02+0200\n"
+"PO-Revision-Date: 2012-09-05 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"
@@ -24,7 +24,7 @@ msgid "Unable to load list from App Store"
 msgstr "アプリストアからリストをロードできません"
 
 #: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
-#: ajax/togglegroups.php:18
+#: ajax/togglegroups.php:15
 msgid "Authentication error"
 msgstr "認証エラー"
 
@@ -64,6 +64,16 @@ msgstr ""
 msgid "Language changed"
 msgstr "言語が変更されました"
 
+#: ajax/togglegroups.php:25
+#, php-format
+msgid "Unable to add user to group %s"
+msgstr ""
+
+#: ajax/togglegroups.php:31
+#, php-format
+msgid "Unable to remove user from group %s"
+msgstr ""
+
 #: js/apps.js:18
 msgid "Error"
 msgstr "エラー"
@@ -180,12 +190,8 @@ msgid "See application page at apps.owncloud.com"
 msgstr "apps.owncloud.com でアプリケーションのページを見てください"
 
 #: templates/apps.php:30
-msgid "-licensed"
-msgstr "ライセンス"
-
-#: templates/apps.php:30
-msgid "by"
-msgstr "@"
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+msgstr ""
 
 #: templates/help.php:9
 msgid "Documentation"
diff --git a/l10n/ko/files.po b/l10n/ko/files.po
index fa66c13988..05dda7be5a 100644
--- a/l10n/ko/files.po
+++ b/l10n/ko/files.po
@@ -9,15 +9,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-05 02:01+0200\n"
+"PO-Revision-Date: 2012-09-05 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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ko\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ajax/upload.php:20
 msgid "There is no error, the file uploaded with success"
@@ -166,6 +166,10 @@ msgstr "0은 무제한 입니다"
 msgid "Maximum input size for ZIP files"
 msgstr "ZIP 파일에 대한 최대 입력 크기"
 
+#: templates/admin.php:14
+msgid "Save"
+msgstr ""
+
 #: templates/index.php:7
 msgid "New"
 msgstr "새로 만들기"
diff --git a/l10n/ko/settings.po b/l10n/ko/settings.po
index 8fd52bd74a..74a1df4738 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-09-04 12:42+0200\n"
-"PO-Revision-Date: 2012-09-04 10:42+0000\n"
+"POT-Creation-Date: 2012-09-05 02:02+0200\n"
+"PO-Revision-Date: 2012-09-05 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"
@@ -24,7 +24,7 @@ msgid "Unable to load list from App Store"
 msgstr "앱 스토어에서 목록을 가져올 수 없습니다"
 
 #: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
-#: ajax/togglegroups.php:18
+#: ajax/togglegroups.php:15
 msgid "Authentication error"
 msgstr "인증 오류"
 
@@ -64,6 +64,16 @@ msgstr ""
 msgid "Language changed"
 msgstr "언어가 변경되었습니다"
 
+#: ajax/togglegroups.php:25
+#, php-format
+msgid "Unable to add user to group %s"
+msgstr ""
+
+#: ajax/togglegroups.php:31
+#, php-format
+msgid "Unable to remove user from group %s"
+msgstr ""
+
 #: js/apps.js:18
 msgid "Error"
 msgstr "에러"
@@ -180,12 +190,8 @@ msgid "See application page at apps.owncloud.com"
 msgstr "application page at apps.owncloud.com을 보시오."
 
 #: templates/apps.php:30
-msgid "-licensed"
-msgstr " 라이선스 사용"
-
-#: templates/apps.php:30
-msgid "by"
-msgstr " by "
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+msgstr ""
 
 #: templates/help.php:9
 msgid "Documentation"
diff --git a/l10n/lb/files.po b/l10n/lb/files.po
index 45773897b6..bda384f1ce 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-09-04 02:01+0200\n"
-"PO-Revision-Date: 2012-09-03 21:52+0000\n"
-"Last-Translator: sim0n <sim0n@trypill.org>\n"
+"POT-Creation-Date: 2012-09-05 02:01+0200\n"
+"PO-Revision-Date: 2012-09-05 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"
@@ -165,6 +165,10 @@ msgstr "0 ass onlimitéiert"
 msgid "Maximum input size for ZIP files"
 msgstr "Maximal Gréisst fir ZIP Fichieren"
 
+#: templates/admin.php:14
+msgid "Save"
+msgstr ""
+
 #: templates/index.php:7
 msgid "New"
 msgstr "Nei"
diff --git a/l10n/lb/settings.po b/l10n/lb/settings.po
index 1359a8c64f..ae12b3db40 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-09-04 12:42+0200\n"
-"PO-Revision-Date: 2012-09-04 10:42+0000\n"
+"POT-Creation-Date: 2012-09-05 02:02+0200\n"
+"PO-Revision-Date: 2012-09-05 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 "Unable to load list from App Store"
 msgstr "Konnt Lescht net vum App Store lueden"
 
 #: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
-#: ajax/togglegroups.php:18
+#: ajax/togglegroups.php:15
 msgid "Authentication error"
 msgstr "Authentifikatioun's Fehler"
 
@@ -63,6 +63,16 @@ msgstr ""
 msgid "Language changed"
 msgstr "Sprooch huet geännert"
 
+#: ajax/togglegroups.php:25
+#, php-format
+msgid "Unable to add user to group %s"
+msgstr ""
+
+#: ajax/togglegroups.php:31
+#, php-format
+msgid "Unable to remove user from group %s"
+msgstr ""
+
 #: js/apps.js:18
 msgid "Error"
 msgstr "Fehler"
@@ -179,12 +189,8 @@ msgid "See application page at apps.owncloud.com"
 msgstr "Kuck dir d'Applicatioun's Säit op apps.owncloud.com un"
 
 #: templates/apps.php:30
-msgid "-licensed"
-msgstr "-Lizenséiert"
-
-#: templates/apps.php:30
-msgid "by"
-msgstr "vun"
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+msgstr ""
 
 #: templates/help.php:9
 msgid "Documentation"
diff --git a/l10n/lt_LT/files.po b/l10n/lt_LT/files.po
index 940281d35e..1aff17e92e 100644
--- a/l10n/lt_LT/files.po
+++ b/l10n/lt_LT/files.po
@@ -9,15 +9,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-05 02:01+0200\n"
+"PO-Revision-Date: 2012-09-05 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"
 "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"
+"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:20
 msgid "There is no error, the file uploaded with success"
@@ -166,6 +166,10 @@ msgstr "0 yra neribotas"
 msgid "Maximum input size for ZIP files"
 msgstr "Maksimalus ZIP archyvo failo dydis"
 
+#: templates/admin.php:14
+msgid "Save"
+msgstr ""
+
 #: templates/index.php:7
 msgid "New"
 msgstr "Naujas"
diff --git a/l10n/lt_LT/settings.po b/l10n/lt_LT/settings.po
index d6268c7d3f..5db913f5a2 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-09-04 12:42+0200\n"
-"PO-Revision-Date: 2012-09-04 10:42+0000\n"
+"POT-Creation-Date: 2012-09-05 02:02+0200\n"
+"PO-Revision-Date: 2012-09-05 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"
@@ -23,7 +23,7 @@ msgid "Unable to load list from App Store"
 msgstr "Neįmanoma įkelti sąrašo iš Programų Katalogo"
 
 #: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
-#: ajax/togglegroups.php:18
+#: ajax/togglegroups.php:15
 msgid "Authentication error"
 msgstr ""
 
@@ -63,6 +63,16 @@ msgstr ""
 msgid "Language changed"
 msgstr "Kalba pakeista"
 
+#: ajax/togglegroups.php:25
+#, php-format
+msgid "Unable to add user to group %s"
+msgstr ""
+
+#: ajax/togglegroups.php:31
+#, php-format
+msgid "Unable to remove user from group %s"
+msgstr ""
+
 #: js/apps.js:18
 msgid "Error"
 msgstr "Klaida"
@@ -179,11 +189,7 @@ msgid "See application page at apps.owncloud.com"
 msgstr ""
 
 #: templates/apps.php:30
-msgid "-licensed"
-msgstr "-licencijuota"
-
-#: templates/apps.php:30
-msgid "by"
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr ""
 
 #: templates/help.php:9
diff --git a/l10n/lv/files.po b/l10n/lv/files.po
index f4af2d90e4..b6fb8d8d07 100644
--- a/l10n/lv/files.po
+++ b/l10n/lv/files.po
@@ -8,15 +8,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-05 02:01+0200\n"
+"PO-Revision-Date: 2012-09-05 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"
 "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"
+"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"
@@ -165,6 +165,10 @@ msgstr "0 ir neierobežots"
 msgid "Maximum input size for ZIP files"
 msgstr ""
 
+#: templates/admin.php:14
+msgid "Save"
+msgstr ""
+
 #: templates/index.php:7
 msgid "New"
 msgstr "Jauns"
diff --git a/l10n/lv/settings.po b/l10n/lv/settings.po
index 3e27f0ed58..6c04e77d75 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-09-04 12:42+0200\n"
-"PO-Revision-Date: 2012-09-04 10:42+0000\n"
+"POT-Creation-Date: 2012-09-05 02:02+0200\n"
+"PO-Revision-Date: 2012-09-05 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"
@@ -23,7 +23,7 @@ msgid "Unable to load list from App Store"
 msgstr "Nebija iespējams lejuplādēt sarakstu no aplikāciju veikala"
 
 #: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
-#: ajax/togglegroups.php:18
+#: ajax/togglegroups.php:15
 msgid "Authentication error"
 msgstr "Ielogošanās kļūme"
 
@@ -63,6 +63,16 @@ msgstr ""
 msgid "Language changed"
 msgstr "Valoda tika nomainīta"
 
+#: ajax/togglegroups.php:25
+#, php-format
+msgid "Unable to add user to group %s"
+msgstr ""
+
+#: ajax/togglegroups.php:31
+#, php-format
+msgid "Unable to remove user from group %s"
+msgstr ""
+
 #: js/apps.js:18
 msgid "Error"
 msgstr "Kļūme"
@@ -179,12 +189,8 @@ msgid "See application page at apps.owncloud.com"
 msgstr "Apskatie aplikāciju lapu - apps.owncloud.com"
 
 #: templates/apps.php:30
-msgid "-licensed"
-msgstr "licenzēts"
-
-#: templates/apps.php:30
-msgid "by"
-msgstr "no"
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+msgstr ""
 
 #: templates/help.php:9
 msgid "Documentation"
diff --git a/l10n/mk/files.po b/l10n/mk/files.po
index 378ca4a4e1..2ddfad5b8c 100644
--- a/l10n/mk/files.po
+++ b/l10n/mk/files.po
@@ -10,15 +10,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-05 02:01+0200\n"
+"PO-Revision-Date: 2012-09-05 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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: mk\n"
-"Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1\n"
+"Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
 
 #: ajax/upload.php:20
 msgid "There is no error, the file uploaded with success"
@@ -167,6 +167,10 @@ msgstr "0 е неограничено"
 msgid "Maximum input size for ZIP files"
 msgstr "Максимална големина за внес на ZIP датотеки"
 
+#: templates/admin.php:14
+msgid "Save"
+msgstr ""
+
 #: templates/index.php:7
 msgid "New"
 msgstr "Ново"
diff --git a/l10n/mk/settings.po b/l10n/mk/settings.po
index ab5e4f3717..6bd27051c3 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-09-04 12:42+0200\n"
-"PO-Revision-Date: 2012-09-04 10:42+0000\n"
+"POT-Creation-Date: 2012-09-05 02:02+0200\n"
+"PO-Revision-Date: 2012-09-05 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"
@@ -24,7 +24,7 @@ msgid "Unable to load list from App Store"
 msgstr ""
 
 #: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
-#: ajax/togglegroups.php:18
+#: ajax/togglegroups.php:15
 msgid "Authentication error"
 msgstr ""
 
@@ -64,6 +64,16 @@ msgstr ""
 msgid "Language changed"
 msgstr "Јазикот е сменет"
 
+#: ajax/togglegroups.php:25
+#, php-format
+msgid "Unable to add user to group %s"
+msgstr ""
+
+#: ajax/togglegroups.php:31
+#, php-format
+msgid "Unable to remove user from group %s"
+msgstr ""
+
 #: js/apps.js:18
 msgid "Error"
 msgstr ""
@@ -180,12 +190,8 @@ msgid "See application page at apps.owncloud.com"
 msgstr "Види ја страницата со апликации на apps.owncloud.com"
 
 #: templates/apps.php:30
-msgid "-licensed"
-msgstr "-licensed"
-
-#: templates/apps.php:30
-msgid "by"
-msgstr "од"
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+msgstr ""
 
 #: templates/help.php:9
 msgid "Documentation"
diff --git a/l10n/ms_MY/files.po b/l10n/ms_MY/files.po
index ebf4d8af0f..9ba3bb1e22 100644
--- a/l10n/ms_MY/files.po
+++ b/l10n/ms_MY/files.po
@@ -11,15 +11,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-05 02:01+0200\n"
+"PO-Revision-Date: 2012-09-05 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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ms_MY\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ajax/upload.php:20
 msgid "There is no error, the file uploaded with success"
@@ -168,6 +168,10 @@ msgstr "0 adalah tanpa had"
 msgid "Maximum input size for ZIP files"
 msgstr "Saiz maksimum input untuk fail ZIP"
 
+#: templates/admin.php:14
+msgid "Save"
+msgstr ""
+
 #: templates/index.php:7
 msgid "New"
 msgstr "Baru"
diff --git a/l10n/ms_MY/settings.po b/l10n/ms_MY/settings.po
index 68249d4e7e..585daefb75 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-09-04 12:42+0200\n"
-"PO-Revision-Date: 2012-09-04 10:42+0000\n"
+"POT-Creation-Date: 2012-09-05 02:02+0200\n"
+"PO-Revision-Date: 2012-09-05 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"
@@ -26,7 +26,7 @@ msgid "Unable to load list from App Store"
 msgstr ""
 
 #: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
-#: ajax/togglegroups.php:18
+#: ajax/togglegroups.php:15
 msgid "Authentication error"
 msgstr "Ralat pengesahan"
 
@@ -66,6 +66,16 @@ msgstr ""
 msgid "Language changed"
 msgstr "Bahasa diubah"
 
+#: ajax/togglegroups.php:25
+#, php-format
+msgid "Unable to add user to group %s"
+msgstr ""
+
+#: ajax/togglegroups.php:31
+#, php-format
+msgid "Unable to remove user from group %s"
+msgstr ""
+
 #: js/apps.js:18
 msgid "Error"
 msgstr ""
@@ -182,12 +192,8 @@ msgid "See application page at apps.owncloud.com"
 msgstr "Lihat halaman applikasi di apps.owncloud.com"
 
 #: templates/apps.php:30
-msgid "-licensed"
-msgstr "-dilesen"
-
-#: templates/apps.php:30
-msgid "by"
-msgstr "oleh"
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+msgstr ""
 
 #: templates/help.php:9
 msgid "Documentation"
diff --git a/l10n/nb_NO/files.po b/l10n/nb_NO/files.po
index e909322805..a65a66c964 100644
--- a/l10n/nb_NO/files.po
+++ b/l10n/nb_NO/files.po
@@ -12,15 +12,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-05 02:01+0200\n"
+"PO-Revision-Date: 2012-09-05 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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: nb_NO\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ajax/upload.php:20
 msgid "There is no error, the file uploaded with success"
@@ -169,6 +169,10 @@ msgstr "0 er ubegrenset"
 msgid "Maximum input size for ZIP files"
 msgstr "Maksimal størrelse på ZIP-filer"
 
+#: templates/admin.php:14
+msgid "Save"
+msgstr ""
+
 #: templates/index.php:7
 msgid "New"
 msgstr "Ny"
diff --git a/l10n/nb_NO/settings.po b/l10n/nb_NO/settings.po
index 56f93ec3e4..4b095682b5 100644
--- a/l10n/nb_NO/settings.po
+++ b/l10n/nb_NO/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-09-04 12:42+0200\n"
-"PO-Revision-Date: 2012-09-04 10:42+0000\n"
+"POT-Creation-Date: 2012-09-05 02:02+0200\n"
+"PO-Revision-Date: 2012-09-05 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"
@@ -28,7 +28,7 @@ msgid "Unable to load list from App Store"
 msgstr "Lasting av liste fra App Store feilet."
 
 #: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
-#: ajax/togglegroups.php:18
+#: ajax/togglegroups.php:15
 msgid "Authentication error"
 msgstr "Autentikasjonsfeil"
 
@@ -68,6 +68,16 @@ msgstr ""
 msgid "Language changed"
 msgstr "Språk endret"
 
+#: ajax/togglegroups.php:25
+#, php-format
+msgid "Unable to add user to group %s"
+msgstr ""
+
+#: ajax/togglegroups.php:31
+#, php-format
+msgid "Unable to remove user from group %s"
+msgstr ""
+
 #: js/apps.js:18
 msgid "Error"
 msgstr "Feil"
@@ -184,12 +194,8 @@ msgid "See application page at apps.owncloud.com"
 msgstr "Se applikasjonens side på apps.owncloud.org"
 
 #: templates/apps.php:30
-msgid "-licensed"
-msgstr "-lisensiert"
-
-#: templates/apps.php:30
-msgid "by"
-msgstr "av"
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+msgstr ""
 
 #: templates/help.php:9
 msgid "Documentation"
diff --git a/l10n/nl/files.po b/l10n/nl/files.po
index f5d8cf3bfe..96f7a87e84 100644
--- a/l10n/nl/files.po
+++ b/l10n/nl/files.po
@@ -15,15 +15,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-05 02:01+0200\n"
+"PO-Revision-Date: 2012-09-05 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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: nl\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ajax/upload.php:20
 msgid "There is no error, the file uploaded with success"
@@ -172,6 +172,10 @@ msgstr "0 is ongelimiteerd"
 msgid "Maximum input size for ZIP files"
 msgstr "Maximale grootte voor ZIP bestanden"
 
+#: templates/admin.php:14
+msgid "Save"
+msgstr ""
+
 #: templates/index.php:7
 msgid "New"
 msgstr "Nieuw"
diff --git a/l10n/nl/settings.po b/l10n/nl/settings.po
index a3a72a3379..3c52376d35 100644
--- a/l10n/nl/settings.po
+++ b/l10n/nl/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-09-04 12:42+0200\n"
-"PO-Revision-Date: 2012-09-04 10:42+0000\n"
+"POT-Creation-Date: 2012-09-05 02:02+0200\n"
+"PO-Revision-Date: 2012-09-05 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"
@@ -29,7 +29,7 @@ msgid "Unable to load list from App Store"
 msgstr "Kan de lijst niet van de App store laden"
 
 #: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
-#: ajax/togglegroups.php:18
+#: ajax/togglegroups.php:15
 msgid "Authentication error"
 msgstr "Authenticatie fout"
 
@@ -69,6 +69,16 @@ msgstr ""
 msgid "Language changed"
 msgstr "Taal aangepast"
 
+#: ajax/togglegroups.php:25
+#, php-format
+msgid "Unable to add user to group %s"
+msgstr ""
+
+#: ajax/togglegroups.php:31
+#, php-format
+msgid "Unable to remove user from group %s"
+msgstr ""
+
 #: js/apps.js:18
 msgid "Error"
 msgstr "Fout"
@@ -185,12 +195,8 @@ msgid "See application page at apps.owncloud.com"
 msgstr "Zie de applicatiepagina op apps.owncloud.com"
 
 #: templates/apps.php:30
-msgid "-licensed"
-msgstr "-gelicentieerd"
-
-#: templates/apps.php:30
-msgid "by"
-msgstr "door"
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+msgstr ""
 
 #: templates/help.php:9
 msgid "Documentation"
diff --git a/l10n/nn_NO/files.po b/l10n/nn_NO/files.po
index 1fecca7984..9bf43656e8 100644
--- a/l10n/nn_NO/files.po
+++ b/l10n/nn_NO/files.po
@@ -9,15 +9,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-05 02:01+0200\n"
+"PO-Revision-Date: 2012-09-05 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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: nn_NO\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ajax/upload.php:20
 msgid "There is no error, the file uploaded with success"
@@ -166,6 +166,10 @@ msgstr ""
 msgid "Maximum input size for ZIP files"
 msgstr ""
 
+#: templates/admin.php:14
+msgid "Save"
+msgstr ""
+
 #: templates/index.php:7
 msgid "New"
 msgstr "Ny"
diff --git a/l10n/nn_NO/settings.po b/l10n/nn_NO/settings.po
index 82dfce0048..8276d41ed6 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-09-04 12:42+0200\n"
-"PO-Revision-Date: 2012-09-04 10:42+0000\n"
+"POT-Creation-Date: 2012-09-05 02:02+0200\n"
+"PO-Revision-Date: 2012-09-05 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"
@@ -24,7 +24,7 @@ msgid "Unable to load list from App Store"
 msgstr "Klarer ikkje å laste inn liste fra App Store"
 
 #: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
-#: ajax/togglegroups.php:18
+#: ajax/togglegroups.php:15
 msgid "Authentication error"
 msgstr "Feil i autentisering"
 
@@ -64,6 +64,16 @@ msgstr ""
 msgid "Language changed"
 msgstr "Språk endra"
 
+#: ajax/togglegroups.php:25
+#, php-format
+msgid "Unable to add user to group %s"
+msgstr ""
+
+#: ajax/togglegroups.php:31
+#, php-format
+msgid "Unable to remove user from group %s"
+msgstr ""
+
 #: js/apps.js:18
 msgid "Error"
 msgstr "Feil"
@@ -180,12 +190,8 @@ msgid "See application page at apps.owncloud.com"
 msgstr ""
 
 #: templates/apps.php:30
-msgid "-licensed"
-msgstr "-lisensiert"
-
-#: templates/apps.php:30
-msgid "by"
-msgstr "av"
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+msgstr ""
 
 #: templates/help.php:9
 msgid "Documentation"
diff --git a/l10n/pl/files.po b/l10n/pl/files.po
index 02f24afbe7..cce7204605 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-09-04 02:01+0200\n"
-"PO-Revision-Date: 2012-09-03 06:33+0000\n"
-"Last-Translator: Cyryl Sochacki <>\n"
+"POT-Creation-Date: 2012-09-05 02:01+0200\n"
+"PO-Revision-Date: 2012-09-05 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"
@@ -168,6 +168,10 @@ msgstr "0 jest nielimitowane"
 msgid "Maximum input size for ZIP files"
 msgstr "Maksymalna wielkość pliku wejściowego ZIP "
 
+#: templates/admin.php:14
+msgid "Save"
+msgstr ""
+
 #: templates/index.php:7
 msgid "New"
 msgstr "Nowy"
diff --git a/l10n/pl/settings.po b/l10n/pl/settings.po
index b0b24757ca..d6fef0cea3 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-09-04 12:42+0200\n"
-"PO-Revision-Date: 2012-09-04 10:42+0000\n"
+"POT-Creation-Date: 2012-09-05 02:02+0200\n"
+"PO-Revision-Date: 2012-09-05 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"
@@ -29,17 +29,17 @@ msgid "Unable to load list from App Store"
 msgstr "Nie mogę załadować listy aplikacji"
 
 #: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
-#: ajax/togglegroups.php:18
+#: ajax/togglegroups.php:15
 msgid "Authentication error"
 msgstr "Błąd uwierzytelniania"
 
 #: ajax/creategroup.php:19
 msgid "Group already exists"
-msgstr ""
+msgstr "Grupa już istnieje"
 
 #: ajax/creategroup.php:28
 msgid "Unable to add group"
-msgstr ""
+msgstr "Nie można dodać grupy"
 
 #: ajax/lostpassword.php:14
 msgid "Email saved"
@@ -59,16 +59,26 @@ msgstr "Nieprawidłowe żądanie"
 
 #: ajax/removegroup.php:16
 msgid "Unable to delete group"
-msgstr ""
+msgstr "Nie można usunąć grupy"
 
 #: ajax/removeuser.php:22
 msgid "Unable to delete user"
-msgstr ""
+msgstr "Nie można usunąć użytkownika"
 
 #: ajax/setlanguage.php:18
 msgid "Language changed"
 msgstr "Język zmieniony"
 
+#: ajax/togglegroups.php:25
+#, php-format
+msgid "Unable to add user to group %s"
+msgstr ""
+
+#: ajax/togglegroups.php:31
+#, php-format
+msgid "Unable to remove user from group %s"
+msgstr ""
+
 #: js/apps.js:18
 msgid "Error"
 msgstr "Błąd"
@@ -185,12 +195,8 @@ msgid "See application page at apps.owncloud.com"
 msgstr "Zobacz stronę aplikacji na apps.owncloud.com"
 
 #: templates/apps.php:30
-msgid "-licensed"
-msgstr "-licencjonowany"
-
-#: templates/apps.php:30
-msgid "by"
-msgstr "przez"
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+msgstr ""
 
 #: templates/help.php:9
 msgid "Documentation"
diff --git a/l10n/pl_PL/files.po b/l10n/pl_PL/files.po
index de6cf10414..c47ae7e822 100644
--- a/l10n/pl_PL/files.po
+++ b/l10n/pl_PL/files.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-05 02:01+0200\n"
+"PO-Revision-Date: 2012-09-05 00:02+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/owncloud/language/pl_PL/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pl_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"
+"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:20
 msgid "There is no error, the file uploaded with success"
@@ -164,6 +164,10 @@ msgstr ""
 msgid "Maximum input size for ZIP files"
 msgstr ""
 
+#: templates/admin.php:14
+msgid "Save"
+msgstr ""
+
 #: templates/index.php:7
 msgid "New"
 msgstr ""
diff --git a/l10n/pl_PL/settings.po b/l10n/pl_PL/settings.po
index 7f69392cff..0d57138874 100644
--- a/l10n/pl_PL/settings.po
+++ b/l10n/pl_PL/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-09-04 12:42+0200\n"
-"PO-Revision-Date: 2012-09-04 10:42+0000\n"
+"POT-Creation-Date: 2012-09-05 02:02+0200\n"
+"PO-Revision-Date: 2012-09-05 00:02+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/owncloud/language/pl_PL/)\n"
 "MIME-Version: 1.0\n"
@@ -22,7 +22,7 @@ msgid "Unable to load list from App Store"
 msgstr ""
 
 #: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
-#: ajax/togglegroups.php:18
+#: ajax/togglegroups.php:15
 msgid "Authentication error"
 msgstr ""
 
@@ -62,6 +62,16 @@ msgstr ""
 msgid "Language changed"
 msgstr ""
 
+#: ajax/togglegroups.php:25
+#, php-format
+msgid "Unable to add user to group %s"
+msgstr ""
+
+#: ajax/togglegroups.php:31
+#, php-format
+msgid "Unable to remove user from group %s"
+msgstr ""
+
 #: js/apps.js:18
 msgid "Error"
 msgstr ""
@@ -178,11 +188,7 @@ msgid "See application page at apps.owncloud.com"
 msgstr ""
 
 #: templates/apps.php:30
-msgid "-licensed"
-msgstr ""
-
-#: templates/apps.php:30
-msgid "by"
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr ""
 
 #: templates/help.php:9
diff --git a/l10n/pt_BR/files.po b/l10n/pt_BR/files.po
index c7241bdb7d..82a5a58bd6 100644
--- a/l10n/pt_BR/files.po
+++ b/l10n/pt_BR/files.po
@@ -12,15 +12,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-05 02:01+0200\n"
+"PO-Revision-Date: 2012-09-05 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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pt_BR\n"
-"Plural-Forms: nplurals=2; plural=(n > 1)\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: ajax/upload.php:20
 msgid "There is no error, the file uploaded with success"
@@ -169,6 +169,10 @@ msgstr "0 para ilimitado"
 msgid "Maximum input size for ZIP files"
 msgstr "Tamanho máximo para arquivo ZIP"
 
+#: templates/admin.php:14
+msgid "Save"
+msgstr ""
+
 #: templates/index.php:7
 msgid "New"
 msgstr "Novo"
diff --git a/l10n/pt_BR/settings.po b/l10n/pt_BR/settings.po
index f8da7b4d5d..5c7f19c769 100644
--- a/l10n/pt_BR/settings.po
+++ b/l10n/pt_BR/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-09-04 12:42+0200\n"
-"PO-Revision-Date: 2012-09-04 10:42+0000\n"
+"POT-Creation-Date: 2012-09-05 02:02+0200\n"
+"PO-Revision-Date: 2012-09-05 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"
@@ -28,7 +28,7 @@ msgid "Unable to load list from App Store"
 msgstr ""
 
 #: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
-#: ajax/togglegroups.php:18
+#: ajax/togglegroups.php:15
 msgid "Authentication error"
 msgstr "erro de autenticação"
 
@@ -68,6 +68,16 @@ msgstr ""
 msgid "Language changed"
 msgstr "Mudou Idioma"
 
+#: ajax/togglegroups.php:25
+#, php-format
+msgid "Unable to add user to group %s"
+msgstr ""
+
+#: ajax/togglegroups.php:31
+#, php-format
+msgid "Unable to remove user from group %s"
+msgstr ""
+
 #: js/apps.js:18
 msgid "Error"
 msgstr "Erro"
@@ -184,12 +194,8 @@ msgid "See application page at apps.owncloud.com"
 msgstr "Ver página do aplicativo em apps.owncloud.com"
 
 #: templates/apps.php:30
-msgid "-licensed"
-msgstr "-licenciados"
-
-#: templates/apps.php:30
-msgid "by"
-msgstr "por"
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+msgstr ""
 
 #: templates/help.php:9
 msgid "Documentation"
diff --git a/l10n/pt_PT/files.po b/l10n/pt_PT/files.po
index 57098cd5e0..80b71ab553 100644
--- a/l10n/pt_PT/files.po
+++ b/l10n/pt_PT/files.po
@@ -10,15 +10,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-05 02:01+0200\n"
+"PO-Revision-Date: 2012-09-05 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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pt_PT\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ajax/upload.php:20
 msgid "There is no error, the file uploaded with success"
@@ -167,6 +167,10 @@ msgstr "0 é ilimitado"
 msgid "Maximum input size for ZIP files"
 msgstr "Tamanho máximo para ficheiros ZIP"
 
+#: templates/admin.php:14
+msgid "Save"
+msgstr ""
+
 #: templates/index.php:7
 msgid "New"
 msgstr "Novo"
diff --git a/l10n/pt_PT/settings.po b/l10n/pt_PT/settings.po
index 7e75ded7df..05fcf5b8bd 100644
--- a/l10n/pt_PT/settings.po
+++ b/l10n/pt_PT/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-09-04 12:42+0200\n"
-"PO-Revision-Date: 2012-09-04 10:42+0000\n"
+"POT-Creation-Date: 2012-09-05 02:02+0200\n"
+"PO-Revision-Date: 2012-09-05 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"
@@ -25,7 +25,7 @@ msgid "Unable to load list from App Store"
 msgstr "Incapaz de carregar a lista da App Store"
 
 #: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
-#: ajax/togglegroups.php:18
+#: ajax/togglegroups.php:15
 msgid "Authentication error"
 msgstr "Erro de autenticação"
 
@@ -65,6 +65,16 @@ msgstr ""
 msgid "Language changed"
 msgstr "Idioma alterado"
 
+#: ajax/togglegroups.php:25
+#, php-format
+msgid "Unable to add user to group %s"
+msgstr ""
+
+#: ajax/togglegroups.php:31
+#, php-format
+msgid "Unable to remove user from group %s"
+msgstr ""
+
 #: js/apps.js:18
 msgid "Error"
 msgstr "Erro"
@@ -181,12 +191,8 @@ msgid "See application page at apps.owncloud.com"
 msgstr "Ver a página da aplicação em apps.owncloud.com"
 
 #: templates/apps.php:30
-msgid "-licensed"
-msgstr "-licenciado"
-
-#: templates/apps.php:30
-msgid "by"
-msgstr "por"
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+msgstr ""
 
 #: templates/help.php:9
 msgid "Documentation"
diff --git a/l10n/ro/files.po b/l10n/ro/files.po
index 44b3e74b60..c9ff62753c 100644
--- a/l10n/ro/files.po
+++ b/l10n/ro/files.po
@@ -10,15 +10,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-05 02:01+0200\n"
+"PO-Revision-Date: 2012-09-05 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"
 "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"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
 
 #: ajax/upload.php:20
 msgid "There is no error, the file uploaded with success"
@@ -167,6 +167,10 @@ msgstr "0 e nelimitat"
 msgid "Maximum input size for ZIP files"
 msgstr "Dimensiunea maximă de intrare pentru fișiere compresate"
 
+#: templates/admin.php:14
+msgid "Save"
+msgstr ""
+
 #: templates/index.php:7
 msgid "New"
 msgstr "Nou"
diff --git a/l10n/ro/settings.po b/l10n/ro/settings.po
index a79fb9745d..a1bc80deb8 100644
--- a/l10n/ro/settings.po
+++ b/l10n/ro/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-09-04 12:42+0200\n"
-"PO-Revision-Date: 2012-09-04 10:42+0000\n"
+"POT-Creation-Date: 2012-09-05 02:02+0200\n"
+"PO-Revision-Date: 2012-09-05 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"
@@ -27,7 +27,7 @@ msgid "Unable to load list from App Store"
 msgstr "Imposibil de încărcat lista din App Store"
 
 #: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
-#: ajax/togglegroups.php:18
+#: ajax/togglegroups.php:15
 msgid "Authentication error"
 msgstr "Eroare de autentificare"
 
@@ -67,6 +67,16 @@ msgstr ""
 msgid "Language changed"
 msgstr "Limba a fost schimbată"
 
+#: ajax/togglegroups.php:25
+#, php-format
+msgid "Unable to add user to group %s"
+msgstr ""
+
+#: ajax/togglegroups.php:31
+#, php-format
+msgid "Unable to remove user from group %s"
+msgstr ""
+
 #: js/apps.js:18
 msgid "Error"
 msgstr "Erroare"
@@ -183,12 +193,8 @@ msgid "See application page at apps.owncloud.com"
 msgstr "Vizualizează pagina applicației pe apps.owncloud.com"
 
 #: templates/apps.php:30
-msgid "-licensed"
-msgstr "-autorizat"
-
-#: templates/apps.php:30
-msgid "by"
-msgstr "de"
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+msgstr ""
 
 #: templates/help.php:9
 msgid "Documentation"
diff --git a/l10n/ru/files.po b/l10n/ru/files.po
index 2203f972c1..e558e9777a 100644
--- a/l10n/ru/files.po
+++ b/l10n/ru/files.po
@@ -13,15 +13,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 02:01+0200\n"
-"PO-Revision-Date: 2012-08-31 02:57+0000\n"
-"Last-Translator: Denis <reg.transifex.net@demitel.ru>\n"
+"POT-Creation-Date: 2012-09-05 02:01+0200\n"
+"PO-Revision-Date: 2012-09-05 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"
 "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"
+"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:20
 msgid "There is no error, the file uploaded with success"
@@ -170,6 +170,10 @@ msgstr "0 - без ограничений"
 msgid "Maximum input size for ZIP files"
 msgstr "Максимальный исходный размер для ZIP файлов"
 
+#: templates/admin.php:14
+msgid "Save"
+msgstr ""
+
 #: templates/index.php:7
 msgid "New"
 msgstr "Новый"
diff --git a/l10n/ru/settings.po b/l10n/ru/settings.po
index 77b85075dd..e898279374 100644
--- a/l10n/ru/settings.po
+++ b/l10n/ru/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-09-04 12:42+0200\n"
-"PO-Revision-Date: 2012-09-04 10:42+0000\n"
+"POT-Creation-Date: 2012-09-05 02:02+0200\n"
+"PO-Revision-Date: 2012-09-05 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"
@@ -30,7 +30,7 @@ msgid "Unable to load list from App Store"
 msgstr "Загрузка из App Store запрещена"
 
 #: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
-#: ajax/togglegroups.php:18
+#: ajax/togglegroups.php:15
 msgid "Authentication error"
 msgstr "Ошибка авторизации"
 
@@ -70,6 +70,16 @@ msgstr ""
 msgid "Language changed"
 msgstr "Язык изменён"
 
+#: ajax/togglegroups.php:25
+#, php-format
+msgid "Unable to add user to group %s"
+msgstr ""
+
+#: ajax/togglegroups.php:31
+#, php-format
+msgid "Unable to remove user from group %s"
+msgstr ""
+
 #: js/apps.js:18
 msgid "Error"
 msgstr "Ошибка"
@@ -186,12 +196,8 @@ msgid "See application page at apps.owncloud.com"
 msgstr "Смотрите дополнения на apps.owncloud.com"
 
 #: templates/apps.php:30
-msgid "-licensed"
-msgstr "-лицензия"
-
-#: templates/apps.php:30
-msgid "by"
-msgstr "от"
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+msgstr ""
 
 #: templates/help.php:9
 msgid "Documentation"
diff --git a/l10n/ru_RU/files.po b/l10n/ru_RU/files.po
index f9bdd2abc9..2ea2165835 100644
--- a/l10n/ru_RU/files.po
+++ b/l10n/ru_RU/files.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-05 02:01+0200\n"
+"PO-Revision-Date: 2012-09-05 00:02+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ru_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"
+"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:20
 msgid "There is no error, the file uploaded with success"
@@ -164,6 +164,10 @@ msgstr ""
 msgid "Maximum input size for ZIP files"
 msgstr ""
 
+#: templates/admin.php:14
+msgid "Save"
+msgstr ""
+
 #: templates/index.php:7
 msgid "New"
 msgstr ""
diff --git a/l10n/ru_RU/settings.po b/l10n/ru_RU/settings.po
index 83bd8af32d..210a41b049 100644
--- a/l10n/ru_RU/settings.po
+++ b/l10n/ru_RU/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-09-04 12:42+0200\n"
-"PO-Revision-Date: 2012-09-04 10:42+0000\n"
+"POT-Creation-Date: 2012-09-05 02:02+0200\n"
+"PO-Revision-Date: 2012-09-05 00:02+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n"
 "MIME-Version: 1.0\n"
@@ -22,7 +22,7 @@ msgid "Unable to load list from App Store"
 msgstr ""
 
 #: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
-#: ajax/togglegroups.php:18
+#: ajax/togglegroups.php:15
 msgid "Authentication error"
 msgstr ""
 
@@ -62,6 +62,16 @@ msgstr ""
 msgid "Language changed"
 msgstr ""
 
+#: ajax/togglegroups.php:25
+#, php-format
+msgid "Unable to add user to group %s"
+msgstr ""
+
+#: ajax/togglegroups.php:31
+#, php-format
+msgid "Unable to remove user from group %s"
+msgstr ""
+
 #: js/apps.js:18
 msgid "Error"
 msgstr ""
@@ -178,11 +188,7 @@ msgid "See application page at apps.owncloud.com"
 msgstr ""
 
 #: templates/apps.php:30
-msgid "-licensed"
-msgstr ""
-
-#: templates/apps.php:30
-msgid "by"
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr ""
 
 #: templates/help.php:9
diff --git a/l10n/sk_SK/files.po b/l10n/sk_SK/files.po
index 49d1f0dcb6..5d83420bec 100644
--- a/l10n/sk_SK/files.po
+++ b/l10n/sk_SK/files.po
@@ -9,15 +9,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-05 02:01+0200\n"
+"PO-Revision-Date: 2012-09-05 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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: sk_SK\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #: ajax/upload.php:20
 msgid "There is no error, the file uploaded with success"
@@ -166,6 +166,10 @@ msgstr "0 znamená neobmedzené"
 msgid "Maximum input size for ZIP files"
 msgstr "Najväčšia veľkosť ZIP súborov"
 
+#: templates/admin.php:14
+msgid "Save"
+msgstr ""
+
 #: templates/index.php:7
 msgid "New"
 msgstr "Nový"
diff --git a/l10n/sk_SK/settings.po b/l10n/sk_SK/settings.po
index 3bf4af03dc..952da74548 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-09-04 12:42+0200\n"
-"PO-Revision-Date: 2012-09-04 10:42+0000\n"
+"POT-Creation-Date: 2012-09-05 02:02+0200\n"
+"PO-Revision-Date: 2012-09-05 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"
@@ -25,7 +25,7 @@ msgid "Unable to load list from App Store"
 msgstr ""
 
 #: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
-#: ajax/togglegroups.php:18
+#: ajax/togglegroups.php:15
 msgid "Authentication error"
 msgstr ""
 
@@ -65,6 +65,16 @@ msgstr ""
 msgid "Language changed"
 msgstr "Jazyk zmenený"
 
+#: ajax/togglegroups.php:25
+#, php-format
+msgid "Unable to add user to group %s"
+msgstr ""
+
+#: ajax/togglegroups.php:31
+#, php-format
+msgid "Unable to remove user from group %s"
+msgstr ""
+
 #: js/apps.js:18
 msgid "Error"
 msgstr ""
@@ -181,12 +191,8 @@ msgid "See application page at apps.owncloud.com"
 msgstr "Pozrite si stránku aplikácie na apps.owncloud.com"
 
 #: templates/apps.php:30
-msgid "-licensed"
-msgstr "-licencované"
-
-#: templates/apps.php:30
-msgid "by"
-msgstr "od"
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+msgstr ""
 
 #: templates/help.php:9
 msgid "Documentation"
diff --git a/l10n/sl/files.po b/l10n/sl/files.po
index 10c581f987..f905c7b48c 100644
--- a/l10n/sl/files.po
+++ b/l10n/sl/files.po
@@ -10,15 +10,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 02:01+0200\n"
-"PO-Revision-Date: 2012-08-31 14:14+0000\n"
-"Last-Translator: Peter Peroša <peter.perosa@gmail.com>\n"
+"POT-Creation-Date: 2012-09-05 02:01+0200\n"
+"PO-Revision-Date: 2012-09-05 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"
 "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"
+"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:20
 msgid "There is no error, the file uploaded with success"
@@ -167,6 +167,10 @@ msgstr "0 je neskončno"
 msgid "Maximum input size for ZIP files"
 msgstr "Največja vhodna velikost za ZIP datoteke"
 
+#: templates/admin.php:14
+msgid "Save"
+msgstr ""
+
 #: templates/index.php:7
 msgid "New"
 msgstr "Nova"
diff --git a/l10n/sl/settings.po b/l10n/sl/settings.po
index b30ea513e3..870976e906 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-09-04 12:42+0200\n"
-"PO-Revision-Date: 2012-09-04 10:42+0000\n"
+"POT-Creation-Date: 2012-09-05 02:02+0200\n"
+"PO-Revision-Date: 2012-09-05 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"
@@ -25,17 +25,17 @@ msgid "Unable to load list from App Store"
 msgstr "Ne morem naložiti seznama iz App Store"
 
 #: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
-#: ajax/togglegroups.php:18
+#: ajax/togglegroups.php:15
 msgid "Authentication error"
 msgstr "Napaka overitve"
 
 #: ajax/creategroup.php:19
 msgid "Group already exists"
-msgstr ""
+msgstr "Skupina že obstaja"
 
 #: ajax/creategroup.php:28
 msgid "Unable to add group"
-msgstr ""
+msgstr "Ni mogoče dodati skupine"
 
 #: ajax/lostpassword.php:14
 msgid "Email saved"
@@ -55,16 +55,26 @@ msgstr "Neveljaven zahtevek"
 
 #: ajax/removegroup.php:16
 msgid "Unable to delete group"
-msgstr ""
+msgstr "Ni mogoče izbrisati skupine"
 
 #: ajax/removeuser.php:22
 msgid "Unable to delete user"
-msgstr ""
+msgstr "Ni mogoče izbrisati uporabnika"
 
 #: ajax/setlanguage.php:18
 msgid "Language changed"
 msgstr "Jezik je bil spremenjen"
 
+#: ajax/togglegroups.php:25
+#, php-format
+msgid "Unable to add user to group %s"
+msgstr ""
+
+#: ajax/togglegroups.php:31
+#, php-format
+msgid "Unable to remove user from group %s"
+msgstr ""
+
 #: js/apps.js:18
 msgid "Error"
 msgstr "Napaka"
@@ -181,12 +191,8 @@ msgid "See application page at apps.owncloud.com"
 msgstr "Obiščite spletno stran aplikacije na apps.owncloud.com"
 
 #: templates/apps.php:30
-msgid "-licensed"
-msgstr "-licencirana"
-
-#: templates/apps.php:30
-msgid "by"
-msgstr "s strani"
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+msgstr ""
 
 #: templates/help.php:9
 msgid "Documentation"
diff --git a/l10n/so/files.po b/l10n/so/files.po
index 346d96b8bd..c9c8fbd1ca 100644
--- a/l10n/so/files.po
+++ b/l10n/so/files.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-05 02:01+0200\n"
+"PO-Revision-Date: 2012-09-05 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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: so\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ajax/upload.php:20
 msgid "There is no error, the file uploaded with success"
@@ -164,6 +164,10 @@ msgstr ""
 msgid "Maximum input size for ZIP files"
 msgstr ""
 
+#: templates/admin.php:14
+msgid "Save"
+msgstr ""
+
 #: templates/index.php:7
 msgid "New"
 msgstr ""
diff --git a/l10n/so/settings.po b/l10n/so/settings.po
index 6663a83b9a..8ed5f9eb22 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-09-04 12:42+0200\n"
-"PO-Revision-Date: 2012-09-04 10:42+0000\n"
+"POT-Creation-Date: 2012-09-05 02:02+0200\n"
+"PO-Revision-Date: 2012-09-05 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"
@@ -22,7 +22,7 @@ msgid "Unable to load list from App Store"
 msgstr ""
 
 #: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
-#: ajax/togglegroups.php:18
+#: ajax/togglegroups.php:15
 msgid "Authentication error"
 msgstr ""
 
@@ -62,6 +62,16 @@ msgstr ""
 msgid "Language changed"
 msgstr ""
 
+#: ajax/togglegroups.php:25
+#, php-format
+msgid "Unable to add user to group %s"
+msgstr ""
+
+#: ajax/togglegroups.php:31
+#, php-format
+msgid "Unable to remove user from group %s"
+msgstr ""
+
 #: js/apps.js:18
 msgid "Error"
 msgstr ""
@@ -178,11 +188,7 @@ msgid "See application page at apps.owncloud.com"
 msgstr ""
 
 #: templates/apps.php:30
-msgid "-licensed"
-msgstr ""
-
-#: templates/apps.php:30
-msgid "by"
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr ""
 
 #: templates/help.php:9
diff --git a/l10n/sr/files.po b/l10n/sr/files.po
index 67e491506f..49d3090e68 100644
--- a/l10n/sr/files.po
+++ b/l10n/sr/files.po
@@ -8,15 +8,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-05 02:01+0200\n"
+"PO-Revision-Date: 2012-09-05 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"
 "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"
+"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:20
 msgid "There is no error, the file uploaded with success"
@@ -165,6 +165,10 @@ msgstr ""
 msgid "Maximum input size for ZIP files"
 msgstr ""
 
+#: templates/admin.php:14
+msgid "Save"
+msgstr ""
+
 #: templates/index.php:7
 msgid "New"
 msgstr "Нови"
diff --git a/l10n/sr/settings.po b/l10n/sr/settings.po
index 2106184cec..bccf5024d3 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-09-04 12:42+0200\n"
-"PO-Revision-Date: 2012-09-04 10:42+0000\n"
+"POT-Creation-Date: 2012-09-05 02:02+0200\n"
+"PO-Revision-Date: 2012-09-05 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 "Unable to load list from App Store"
 msgstr ""
 
 #: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
-#: ajax/togglegroups.php:18
+#: ajax/togglegroups.php:15
 msgid "Authentication error"
 msgstr ""
 
@@ -63,6 +63,16 @@ msgstr ""
 msgid "Language changed"
 msgstr "Језик је измењен"
 
+#: ajax/togglegroups.php:25
+#, php-format
+msgid "Unable to add user to group %s"
+msgstr ""
+
+#: ajax/togglegroups.php:31
+#, php-format
+msgid "Unable to remove user from group %s"
+msgstr ""
+
 #: js/apps.js:18
 msgid "Error"
 msgstr ""
@@ -179,12 +189,8 @@ msgid "See application page at apps.owncloud.com"
 msgstr ""
 
 #: templates/apps.php:30
-msgid "-licensed"
-msgstr "-лиценциран"
-
-#: templates/apps.php:30
-msgid "by"
-msgstr "од"
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+msgstr ""
 
 #: templates/help.php:9
 msgid "Documentation"
diff --git a/l10n/sr@latin/files.po b/l10n/sr@latin/files.po
index 0c7f3b5aca..fd9e18816f 100644
--- a/l10n/sr@latin/files.po
+++ b/l10n/sr@latin/files.po
@@ -8,15 +8,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-05 02:01+0200\n"
+"PO-Revision-Date: 2012-09-05 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"
 "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"
+"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:20
 msgid "There is no error, the file uploaded with success"
@@ -165,6 +165,10 @@ msgstr ""
 msgid "Maximum input size for ZIP files"
 msgstr ""
 
+#: templates/admin.php:14
+msgid "Save"
+msgstr ""
+
 #: templates/index.php:7
 msgid "New"
 msgstr ""
diff --git a/l10n/sr@latin/settings.po b/l10n/sr@latin/settings.po
index 4ed74b2b60..4e8ca92540 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-09-04 12:42+0200\n"
-"PO-Revision-Date: 2012-09-04 10:42+0000\n"
+"POT-Creation-Date: 2012-09-05 02:02+0200\n"
+"PO-Revision-Date: 2012-09-05 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 "Unable to load list from App Store"
 msgstr ""
 
 #: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
-#: ajax/togglegroups.php:18
+#: ajax/togglegroups.php:15
 msgid "Authentication error"
 msgstr ""
 
@@ -63,6 +63,16 @@ msgstr ""
 msgid "Language changed"
 msgstr "Jezik je izmenjen"
 
+#: ajax/togglegroups.php:25
+#, php-format
+msgid "Unable to add user to group %s"
+msgstr ""
+
+#: ajax/togglegroups.php:31
+#, php-format
+msgid "Unable to remove user from group %s"
+msgstr ""
+
 #: js/apps.js:18
 msgid "Error"
 msgstr ""
@@ -179,12 +189,8 @@ msgid "See application page at apps.owncloud.com"
 msgstr ""
 
 #: templates/apps.php:30
-msgid "-licensed"
-msgstr "-licenciran"
-
-#: templates/apps.php:30
-msgid "by"
-msgstr "od"
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+msgstr ""
 
 #: templates/help.php:9
 msgid "Documentation"
diff --git a/l10n/sv/files.po b/l10n/sv/files.po
index 719ccf3db6..38e7c5af59 100644
--- a/l10n/sv/files.po
+++ b/l10n/sv/files.po
@@ -13,15 +13,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 02:01+0200\n"
-"PO-Revision-Date: 2012-08-31 08:09+0000\n"
-"Last-Translator: Magnus Höglund <magnus@linux.com>\n"
+"POT-Creation-Date: 2012-09-05 02:01+0200\n"
+"PO-Revision-Date: 2012-09-05 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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: sv\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ajax/upload.php:20
 msgid "There is no error, the file uploaded with success"
@@ -170,6 +170,10 @@ msgstr "0 är oändligt"
 msgid "Maximum input size for ZIP files"
 msgstr "Största tillåtna storlek för ZIP-filer"
 
+#: templates/admin.php:14
+msgid "Save"
+msgstr ""
+
 #: templates/index.php:7
 msgid "New"
 msgstr "Ny"
diff --git a/l10n/sv/settings.po b/l10n/sv/settings.po
index d764dba474..77788a1797 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-09-04 12:42+0200\n"
-"PO-Revision-Date: 2012-09-04 10:42+0000\n"
+"POT-Creation-Date: 2012-09-05 02:02+0200\n"
+"PO-Revision-Date: 2012-09-05 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"
@@ -29,7 +29,7 @@ msgid "Unable to load list from App Store"
 msgstr "Kan inte ladda listan från App Store"
 
 #: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
-#: ajax/togglegroups.php:18
+#: ajax/togglegroups.php:15
 msgid "Authentication error"
 msgstr "Autentiseringsfel"
 
@@ -69,6 +69,16 @@ msgstr ""
 msgid "Language changed"
 msgstr "Språk ändrades"
 
+#: ajax/togglegroups.php:25
+#, php-format
+msgid "Unable to add user to group %s"
+msgstr ""
+
+#: ajax/togglegroups.php:31
+#, php-format
+msgid "Unable to remove user from group %s"
+msgstr ""
+
 #: js/apps.js:18
 msgid "Error"
 msgstr "Fel"
@@ -185,12 +195,8 @@ msgid "See application page at apps.owncloud.com"
 msgstr "Se programsida på apps.owncloud.com"
 
 #: templates/apps.php:30
-msgid "-licensed"
-msgstr "-licensierat"
-
-#: templates/apps.php:30
-msgid "by"
-msgstr "av"
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+msgstr ""
 
 #: templates/help.php:9
 msgid "Documentation"
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index bd9a67a3e1..329879e864 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-09-04 12:42+0200\n"
+"POT-Creation-Date: 2012-09-05 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"
@@ -33,55 +33,55 @@ msgstr ""
 msgid "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
 msgstr ""
 
-#: js/js.js:206 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "January"
 msgstr ""
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "February"
 msgstr ""
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "March"
 msgstr ""
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "April"
 msgstr ""
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "May"
 msgstr ""
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "June"
 msgstr ""
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "July"
 msgstr ""
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "August"
 msgstr ""
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "September"
 msgstr ""
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "October"
 msgstr ""
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "November"
 msgstr ""
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "December"
 msgstr ""
 
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index 44f427e91d..9d519c1a51 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-09-04 12:42+0200\n"
+"POT-Creation-Date: 2012-09-05 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"
@@ -164,6 +164,10 @@ msgstr ""
 msgid "Maximum input size for ZIP files"
 msgstr ""
 
+#: templates/admin.php:14
+msgid "Save"
+msgstr ""
+
 #: templates/index.php:7
 msgid "New"
 msgstr ""
diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot
index 9a7f6a0e57..460fd2df78 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-09-04 12:42+0200\n"
+"POT-Creation-Date: 2012-09-05 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 f8a9b597aa..de03296ccb 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-09-04 12:42+0200\n"
+"POT-Creation-Date: 2012-09-05 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 7365c76903..e1ab849fe3 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-09-04 12:42+0200\n"
+"POT-Creation-Date: 2012-09-05 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 bf919618a2..61a011e4e3 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-09-04 12:42+0200\n"
+"POT-Creation-Date: 2012-09-05 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 100a197226..82f5c27fdd 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-09-04 12:42+0200\n"
+"POT-Creation-Date: 2012-09-05 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 15dce5bb11..7c8028eff7 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-09-04 12:42+0200\n"
+"POT-Creation-Date: 2012-09-05 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 "Unable to load list from App Store"
 msgstr ""
 
 #: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
-#: ajax/togglegroups.php:18
+#: ajax/togglegroups.php:15
 msgid "Authentication error"
 msgstr ""
 
@@ -62,6 +62,16 @@ msgstr ""
 msgid "Language changed"
 msgstr ""
 
+#: ajax/togglegroups.php:25
+#, php-format
+msgid "Unable to add user to group %s"
+msgstr ""
+
+#: ajax/togglegroups.php:31
+#, php-format
+msgid "Unable to remove user from group %s"
+msgstr ""
+
 #: js/apps.js:18
 msgid "Error"
 msgstr ""
@@ -177,11 +187,8 @@ msgid "See application page at apps.owncloud.com"
 msgstr ""
 
 #: templates/apps.php:30
-msgid "-licensed"
-msgstr ""
-
-#: templates/apps.php:30
-msgid "by"
+msgid ""
+"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
 msgstr ""
 
 #: templates/help.php:9
diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot
index 0b3490afd5..b33a2245ac 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-09-04 12:42+0200\n"
+"POT-Creation-Date: 2012-09-05 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/files.po b/l10n/th_TH/files.po
index 5068c75cf7..93ca73a3d1 100644
--- a/l10n/th_TH/files.po
+++ b/l10n/th_TH/files.po
@@ -9,15 +9,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 02:01+0200\n"
-"PO-Revision-Date: 2012-08-31 17:03+0000\n"
-"Last-Translator: AriesAnywhere Anywhere <ariesanywhere@gmail.com>\n"
+"POT-Creation-Date: 2012-09-05 02:01+0200\n"
+"PO-Revision-Date: 2012-09-05 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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: th_TH\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ajax/upload.php:20
 msgid "There is no error, the file uploaded with success"
@@ -166,6 +166,10 @@ msgstr "0 หมายถึงไม่จำกัด"
 msgid "Maximum input size for ZIP files"
 msgstr "ขนาดไฟล์ ZIP สูงสุด"
 
+#: templates/admin.php:14
+msgid "Save"
+msgstr ""
+
 #: templates/index.php:7
 msgid "New"
 msgstr "อัพโหลดไฟล์ใหม่"
diff --git a/l10n/th_TH/settings.po b/l10n/th_TH/settings.po
index 0e3f5e3398..4de6824155 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-09-04 12:42+0200\n"
-"PO-Revision-Date: 2012-09-04 10:42+0000\n"
+"POT-Creation-Date: 2012-09-05 02:02+0200\n"
+"PO-Revision-Date: 2012-09-05 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"
@@ -25,7 +25,7 @@ msgid "Unable to load list from App Store"
 msgstr "ไม่สามารถโหลดรายการจาก App Store ได้"
 
 #: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
-#: ajax/togglegroups.php:18
+#: ajax/togglegroups.php:15
 msgid "Authentication error"
 msgstr "เกิดข้อผิดพลาดเกี่ยวกับสิทธิ์การเข้าใช้งาน"
 
@@ -65,6 +65,16 @@ msgstr ""
 msgid "Language changed"
 msgstr "เปลี่ยนภาษาเรียบร้อยแล้ว"
 
+#: ajax/togglegroups.php:25
+#, php-format
+msgid "Unable to add user to group %s"
+msgstr ""
+
+#: ajax/togglegroups.php:31
+#, php-format
+msgid "Unable to remove user from group %s"
+msgstr ""
+
 #: js/apps.js:18
 msgid "Error"
 msgstr "ข้อผิดพลาด"
@@ -181,12 +191,8 @@ msgid "See application page at apps.owncloud.com"
 msgstr "ดูหน้าแอพพลิเคชั่นที่ apps.owncloud.com"
 
 #: templates/apps.php:30
-msgid "-licensed"
-msgstr "-ได้รับอนุญาติแล้ว"
-
-#: templates/apps.php:30
-msgid "by"
-msgstr "โดย"
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+msgstr ""
 
 #: templates/help.php:9
 msgid "Documentation"
diff --git a/l10n/tr/files.po b/l10n/tr/files.po
index 94595a995e..865f2bc6d6 100644
--- a/l10n/tr/files.po
+++ b/l10n/tr/files.po
@@ -11,15 +11,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-02 02:01+0200\n"
-"PO-Revision-Date: 2012-09-01 13:44+0000\n"
-"Last-Translator: Caner Başaran <basaran.caner@gmail.com>\n"
+"POT-Creation-Date: 2012-09-05 02:01+0200\n"
+"PO-Revision-Date: 2012-09-05 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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: tr\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ajax/upload.php:20
 msgid "There is no error, the file uploaded with success"
@@ -168,6 +168,10 @@ msgstr "0 limitsiz demektir"
 msgid "Maximum input size for ZIP files"
 msgstr "ZIP dosyaları için en fazla girdi sayısı"
 
+#: templates/admin.php:14
+msgid "Save"
+msgstr ""
+
 #: templates/index.php:7
 msgid "New"
 msgstr "Yeni"
diff --git a/l10n/tr/settings.po b/l10n/tr/settings.po
index f5eccfa400..927817d543 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-09-04 12:42+0200\n"
-"PO-Revision-Date: 2012-09-04 10:42+0000\n"
+"POT-Creation-Date: 2012-09-05 02:02+0200\n"
+"PO-Revision-Date: 2012-09-05 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"
@@ -25,7 +25,7 @@ msgid "Unable to load list from App Store"
 msgstr ""
 
 #: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
-#: ajax/togglegroups.php:18
+#: ajax/togglegroups.php:15
 msgid "Authentication error"
 msgstr "Eşleşme hata"
 
@@ -65,6 +65,16 @@ msgstr ""
 msgid "Language changed"
 msgstr "Dil değiştirildi"
 
+#: ajax/togglegroups.php:25
+#, php-format
+msgid "Unable to add user to group %s"
+msgstr ""
+
+#: ajax/togglegroups.php:31
+#, php-format
+msgid "Unable to remove user from group %s"
+msgstr ""
+
 #: js/apps.js:18
 msgid "Error"
 msgstr ""
@@ -181,12 +191,8 @@ msgid "See application page at apps.owncloud.com"
 msgstr "Uygulamanın sayfasına apps.owncloud.com adresinden bakın "
 
 #: templates/apps.php:30
-msgid "-licensed"
-msgstr "-lisanslı"
-
-#: templates/apps.php:30
-msgid "by"
-msgstr "yapan"
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+msgstr ""
 
 #: templates/help.php:9
 msgid "Documentation"
diff --git a/l10n/uk/files.po b/l10n/uk/files.po
index 7b0f0a27ec..ebdc5f8b9c 100644
--- a/l10n/uk/files.po
+++ b/l10n/uk/files.po
@@ -9,15 +9,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-05 02:01+0200\n"
+"PO-Revision-Date: 2012-09-05 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"
 "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"
+"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:20
 msgid "There is no error, the file uploaded with success"
@@ -166,6 +166,10 @@ msgstr "0 є безліміт"
 msgid "Maximum input size for ZIP files"
 msgstr ""
 
+#: templates/admin.php:14
+msgid "Save"
+msgstr ""
+
 #: templates/index.php:7
 msgid "New"
 msgstr "Створити"
diff --git a/l10n/uk/settings.po b/l10n/uk/settings.po
index c0020d02c0..7a1ef6e3a0 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-09-04 12:42+0200\n"
-"PO-Revision-Date: 2012-09-04 10:42+0000\n"
+"POT-Creation-Date: 2012-09-05 02:02+0200\n"
+"PO-Revision-Date: 2012-09-05 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"
@@ -23,7 +23,7 @@ msgid "Unable to load list from App Store"
 msgstr ""
 
 #: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
-#: ajax/togglegroups.php:18
+#: ajax/togglegroups.php:15
 msgid "Authentication error"
 msgstr ""
 
@@ -63,6 +63,16 @@ msgstr ""
 msgid "Language changed"
 msgstr "Мова змінена"
 
+#: ajax/togglegroups.php:25
+#, php-format
+msgid "Unable to add user to group %s"
+msgstr ""
+
+#: ajax/togglegroups.php:31
+#, php-format
+msgid "Unable to remove user from group %s"
+msgstr ""
+
 #: js/apps.js:18
 msgid "Error"
 msgstr ""
@@ -179,12 +189,8 @@ msgid "See application page at apps.owncloud.com"
 msgstr ""
 
 #: templates/apps.php:30
-msgid "-licensed"
-msgstr "-ліцензовано"
-
-#: templates/apps.php:30
-msgid "by"
-msgstr "по"
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+msgstr ""
 
 #: templates/help.php:9
 msgid "Documentation"
diff --git a/l10n/vi/files.po b/l10n/vi/files.po
index 556eb3d9ac..6e2d43a349 100644
--- a/l10n/vi/files.po
+++ b/l10n/vi/files.po
@@ -8,15 +8,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-05 02:01+0200\n"
+"PO-Revision-Date: 2012-09-05 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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: vi\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ajax/upload.php:20
 msgid "There is no error, the file uploaded with success"
@@ -165,6 +165,10 @@ msgstr "0 là không giới hạn"
 msgid "Maximum input size for ZIP files"
 msgstr "Kích thước tối đa cho các tập tin ZIP"
 
+#: templates/admin.php:14
+msgid "Save"
+msgstr ""
+
 #: templates/index.php:7
 msgid "New"
 msgstr "Mới"
diff --git a/l10n/vi/settings.po b/l10n/vi/settings.po
index d1b52d3342..b8c57b3723 100644
--- a/l10n/vi/settings.po
+++ b/l10n/vi/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-09-04 12:42+0200\n"
-"PO-Revision-Date: 2012-09-04 10:42+0000\n"
+"POT-Creation-Date: 2012-09-05 02:02+0200\n"
+"PO-Revision-Date: 2012-09-05 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"
@@ -25,7 +25,7 @@ msgid "Unable to load list from App Store"
 msgstr "Không thể tải danh sách ứng dụng từ App Store"
 
 #: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
-#: ajax/togglegroups.php:18
+#: ajax/togglegroups.php:15
 msgid "Authentication error"
 msgstr "Lỗi xác thực"
 
@@ -65,6 +65,16 @@ msgstr ""
 msgid "Language changed"
 msgstr "Ngôn ngữ đã được thay đổi"
 
+#: ajax/togglegroups.php:25
+#, php-format
+msgid "Unable to add user to group %s"
+msgstr ""
+
+#: ajax/togglegroups.php:31
+#, php-format
+msgid "Unable to remove user from group %s"
+msgstr ""
+
 #: js/apps.js:18
 msgid "Error"
 msgstr "Lỗi"
@@ -181,12 +191,8 @@ msgid "See application page at apps.owncloud.com"
 msgstr "Xem ứng dụng tại apps.owncloud.com"
 
 #: templates/apps.php:30
-msgid "-licensed"
-msgstr "Giấy phép đã được cấp"
-
-#: templates/apps.php:30
-msgid "by"
-msgstr "bởi"
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+msgstr ""
 
 #: templates/help.php:9
 msgid "Documentation"
diff --git a/l10n/zh_CN.GB2312/files.po b/l10n/zh_CN.GB2312/files.po
index fb7416be4a..00bdb62e96 100644
--- a/l10n/zh_CN.GB2312/files.po
+++ b/l10n/zh_CN.GB2312/files.po
@@ -8,15 +8,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-05 02:01+0200\n"
+"PO-Revision-Date: 2012-09-05 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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: zh_CN.GB2312\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ajax/upload.php:20
 msgid "There is no error, the file uploaded with success"
@@ -165,6 +165,10 @@ msgstr "0是无限的"
 msgid "Maximum input size for ZIP files"
 msgstr "最大的ZIP文件输入大小"
 
+#: templates/admin.php:14
+msgid "Save"
+msgstr ""
+
 #: templates/index.php:7
 msgid "New"
 msgstr "新建"
diff --git a/l10n/zh_CN.GB2312/settings.po b/l10n/zh_CN.GB2312/settings.po
index 5b26ea5904..5e3311e021 100644
--- a/l10n/zh_CN.GB2312/settings.po
+++ b/l10n/zh_CN.GB2312/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-09-04 12:42+0200\n"
-"PO-Revision-Date: 2012-09-04 10:42+0000\n"
+"POT-Creation-Date: 2012-09-05 02:02+0200\n"
+"PO-Revision-Date: 2012-09-05 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"
@@ -23,7 +23,7 @@ msgid "Unable to load list from App Store"
 msgstr "不能从App Store 中加载列表"
 
 #: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
-#: ajax/togglegroups.php:18
+#: ajax/togglegroups.php:15
 msgid "Authentication error"
 msgstr "认证错误"
 
@@ -63,6 +63,16 @@ msgstr ""
 msgid "Language changed"
 msgstr "语言改变了"
 
+#: ajax/togglegroups.php:25
+#, php-format
+msgid "Unable to add user to group %s"
+msgstr ""
+
+#: ajax/togglegroups.php:31
+#, php-format
+msgid "Unable to remove user from group %s"
+msgstr ""
+
 #: js/apps.js:18
 msgid "Error"
 msgstr "错误"
@@ -179,12 +189,8 @@ msgid "See application page at apps.owncloud.com"
 msgstr "在owncloud.com上查看应用程序"
 
 #: templates/apps.php:30
-msgid "-licensed"
-msgstr "-许可了"
-
-#: templates/apps.php:30
-msgid "by"
-msgstr "由"
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+msgstr ""
 
 #: templates/help.php:9
 msgid "Documentation"
diff --git a/l10n/zh_CN/files.po b/l10n/zh_CN/files.po
index 315f265482..4e2d600c1e 100644
--- a/l10n/zh_CN/files.po
+++ b/l10n/zh_CN/files.po
@@ -10,15 +10,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-05 02:01+0200\n"
+"PO-Revision-Date: 2012-09-05 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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: zh_CN\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ajax/upload.php:20
 msgid "There is no error, the file uploaded with success"
@@ -167,6 +167,10 @@ msgstr "0 为无限制"
 msgid "Maximum input size for ZIP files"
 msgstr "ZIP 文件的最大输入大小"
 
+#: templates/admin.php:14
+msgid "Save"
+msgstr ""
+
 #: templates/index.php:7
 msgid "New"
 msgstr "新建"
diff --git a/l10n/zh_CN/settings.po b/l10n/zh_CN/settings.po
index 9d7fb799db..8af73f8879 100644
--- a/l10n/zh_CN/settings.po
+++ b/l10n/zh_CN/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-09-04 12:42+0200\n"
-"PO-Revision-Date: 2012-09-04 10:42+0000\n"
+"POT-Creation-Date: 2012-09-05 02:02+0200\n"
+"PO-Revision-Date: 2012-09-05 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"
@@ -26,7 +26,7 @@ msgid "Unable to load list from App Store"
 msgstr "无法从应用商店载入列表"
 
 #: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
-#: ajax/togglegroups.php:18
+#: ajax/togglegroups.php:15
 msgid "Authentication error"
 msgstr "认证错误"
 
@@ -66,6 +66,16 @@ msgstr ""
 msgid "Language changed"
 msgstr "语言已修改"
 
+#: ajax/togglegroups.php:25
+#, php-format
+msgid "Unable to add user to group %s"
+msgstr ""
+
+#: ajax/togglegroups.php:31
+#, php-format
+msgid "Unable to remove user from group %s"
+msgstr ""
+
 #: js/apps.js:18
 msgid "Error"
 msgstr "错误"
@@ -182,12 +192,8 @@ msgid "See application page at apps.owncloud.com"
 msgstr "查看在 app.owncloud.com 的应用程序页面"
 
 #: templates/apps.php:30
-msgid "-licensed"
-msgstr "-许可证"
-
-#: templates/apps.php:30
-msgid "by"
-msgstr "由"
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+msgstr ""
 
 #: templates/help.php:9
 msgid "Documentation"
diff --git a/l10n/zh_TW/files.po b/l10n/zh_TW/files.po
index 2bbfc8d860..3c6aad93fc 100644
--- a/l10n/zh_TW/files.po
+++ b/l10n/zh_TW/files.po
@@ -10,15 +10,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 02:01+0200\n"
-"PO-Revision-Date: 2012-08-31 20:40+0000\n"
-"Last-Translator: ywang <ywang1007@gmail.com>\n"
+"POT-Creation-Date: 2012-09-05 02:01+0200\n"
+"PO-Revision-Date: 2012-09-05 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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: zh_TW\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ajax/upload.php:20
 msgid "There is no error, the file uploaded with success"
@@ -167,6 +167,10 @@ msgstr "0代表沒有限制"
 msgid "Maximum input size for ZIP files"
 msgstr "針對ZIP檔案最大輸入大小"
 
+#: templates/admin.php:14
+msgid "Save"
+msgstr ""
+
 #: templates/index.php:7
 msgid "New"
 msgstr "新增"
diff --git a/l10n/zh_TW/settings.po b/l10n/zh_TW/settings.po
index fe812d4e27..ed6dc81bc1 100644
--- a/l10n/zh_TW/settings.po
+++ b/l10n/zh_TW/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-09-04 12:42+0200\n"
-"PO-Revision-Date: 2012-09-04 10:42+0000\n"
+"POT-Creation-Date: 2012-09-05 02:02+0200\n"
+"PO-Revision-Date: 2012-09-05 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"
@@ -25,7 +25,7 @@ msgid "Unable to load list from App Store"
 msgstr "無法從 App Store 讀取清單"
 
 #: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
-#: ajax/togglegroups.php:18
+#: ajax/togglegroups.php:15
 msgid "Authentication error"
 msgstr "認證錯誤"
 
@@ -65,6 +65,16 @@ msgstr ""
 msgid "Language changed"
 msgstr "語言已變更"
 
+#: ajax/togglegroups.php:25
+#, php-format
+msgid "Unable to add user to group %s"
+msgstr ""
+
+#: ajax/togglegroups.php:31
+#, php-format
+msgid "Unable to remove user from group %s"
+msgstr ""
+
 #: js/apps.js:18
 msgid "Error"
 msgstr "錯誤"
@@ -181,12 +191,8 @@ msgid "See application page at apps.owncloud.com"
 msgstr "查看應用程式頁面於 apps.owncloud.com"
 
 #: templates/apps.php:30
-msgid "-licensed"
-msgstr "-已許可"
-
-#: templates/apps.php:30
-msgid "by"
-msgstr "由"
+msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+msgstr ""
 
 #: templates/help.php:9
 msgid "Documentation"
diff --git a/lib/l10n/he.php b/lib/l10n/he.php
new file mode 100644
index 0000000000..149637d09d
--- /dev/null
+++ b/lib/l10n/he.php
@@ -0,0 +1,28 @@
+<?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" => "לפני דקה אחת",
+"%d minutes ago" => "לפני %d דקות",
+"today" => "היום",
+"yesterday" => "אתמול",
+"%d days ago" => "לפני %d ימים",
+"last month" => "חודש שעבר",
+"months ago" => "חודשים",
+"last year" => "שנה שעברה",
+"years ago" => "שנים",
+"%s is available. Get <a href=\"%s\">more information</a>" => "%s זמין. קבלת <a href=\"%s\">מידע נוסף</a>",
+"up to date" => "עדכני",
+"updates check is disabled" => "בדיקת עדכונים מנוטרלת"
+);
diff --git a/settings/l10n/ar.php b/settings/l10n/ar.php
index ff711e7ccc..eca8a300b1 100644
--- a/settings/l10n/ar.php
+++ b/settings/l10n/ar.php
@@ -4,8 +4,6 @@
 "Language changed" => "تم تغيير اللغة",
 "__language_name__" => "__language_name__",
 "Select an App" => "إختر تطبيقاً",
-"-licensed" => "-مسجل",
-"by" => "من قبل",
 "Ask a question" => "إسأل سؤال",
 "Problems connecting to help database." => "الاتصال بقاعدة بيانات المساعدة لم يتم بنجاح",
 "Go there manually." => "إذهب هنالك بنفسك",
diff --git a/settings/l10n/bg_BG.php b/settings/l10n/bg_BG.php
index 4464f7596d..b261c22b03 100644
--- a/settings/l10n/bg_BG.php
+++ b/settings/l10n/bg_BG.php
@@ -8,8 +8,6 @@
 "Enable" => "Включване",
 "Saving..." => "Записване...",
 "Select an App" => "Изберете програма",
-"-licensed" => "-лицензирано",
-"by" => "от",
 "Documentation" => "Документация",
 "Ask a question" => "Задайте въпрос",
 "Problems connecting to help database." => "Проблеми при свързване с помощната база",
diff --git a/settings/l10n/ca.php b/settings/l10n/ca.php
index 5c3f0edd97..76fb2fd7fe 100644
--- a/settings/l10n/ca.php
+++ b/settings/l10n/ca.php
@@ -1,10 +1,14 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "No s'ha pogut carregar la llista des de l'App Store",
 "Authentication error" => "Error d'autenticació",
+"Group already exists" => "El grup ja existeix",
+"Unable to add group" => "No es pot afegir el grup",
 "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",
+"Unable to delete group" => "No es pot eliminar el grup",
+"Unable to delete user" => "No es pot eliminar l'usuari",
 "Language changed" => "S'ha canviat l'idioma",
 "Error" => "Error",
 "Disable" => "Desactiva",
@@ -32,8 +36,6 @@
 "Add your App" => "Afegiu la vostra aplicació",
 "Select an App" => "Seleccioneu una aplicació",
 "See application page at apps.owncloud.com" => "Mireu la pàgina d'aplicacions a apps.owncloud.com",
-"-licensed" => "- amb llicència",
-"by" => "de",
 "Documentation" => "Documentació",
 "Managing Big Files" => "Gestió de fitxers grans",
 "Ask a question" => "Feu una pregunta",
diff --git a/settings/l10n/cs_CZ.php b/settings/l10n/cs_CZ.php
index a9c14b5366..e0be2117b8 100644
--- a/settings/l10n/cs_CZ.php
+++ b/settings/l10n/cs_CZ.php
@@ -21,8 +21,6 @@
 "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",
 "Managing Big Files" => "Spravování velkých souborů",
 "Ask a question" => "Zeptat se",
diff --git a/settings/l10n/da.php b/settings/l10n/da.php
index 35d34f6d3e..0c09a25dfd 100644
--- a/settings/l10n/da.php
+++ b/settings/l10n/da.php
@@ -29,8 +29,6 @@
 "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",
 "Managing Big Files" => "Håndter store filer",
 "Ask a question" => "Stil et spørgsmål",
diff --git a/settings/l10n/de.php b/settings/l10n/de.php
index 09fc7674d5..d955b75d0c 100644
--- a/settings/l10n/de.php
+++ b/settings/l10n/de.php
@@ -1,10 +1,14 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Die Liste der Apps im Store konnte nicht geladen werden.",
 "Authentication error" => "Anmeldungsfehler",
+"Group already exists" => "Gruppe existiert bereits",
+"Unable to add group" => "Gruppe konnte nicht angelegt werden",
 "Email saved" => "E-Mail gespeichert",
 "Invalid email" => "Ungültige E-Mail",
 "OpenID Changed" => "OpenID geändert",
 "Invalid request" => "Ungültige Anfrage",
+"Unable to delete group" => "Gruppe konnte nicht gelöscht werden",
+"Unable to delete user" => "Benutzer konnte nicht gelöscht werden",
 "Language changed" => "Sprache geändert",
 "Error" => "Fehler",
 "Disable" => "Deaktivieren",
@@ -32,8 +36,6 @@
 "Add your App" => "Fügen Sie Ihre App hinzu",
 "Select an App" => "Wählen Sie eine Anwendung aus",
 "See application page at apps.owncloud.com" => "Weitere Anwendungen finden Sie auf apps.owncloud.com",
-"-licensed" => "-lizenziert",
-"by" => "von",
 "Documentation" => "Dokumentation",
 "Managing Big Files" => "Große Dateien verwalten",
 "Ask a question" => "Stellen Sie eine Frage",
diff --git a/settings/l10n/el.php b/settings/l10n/el.php
index 671c3960bd..833ef8e10d 100644
--- a/settings/l10n/el.php
+++ b/settings/l10n/el.php
@@ -21,8 +21,6 @@
 "Add your App" => "Πρόσθεσε τη δικιά σου εφαρμογή ",
 "Select an App" => "Επιλέξτε μια εφαρμογή",
 "See application page at apps.owncloud.com" => "Η σελίδα εφαρμογών στο apps.owncloud.com",
-"-licensed" => "-με άδεια",
-"by" => "από",
 "Documentation" => "Τεκμηρίωση",
 "Managing Big Files" => "Διαχείριση μεγάλων αρχείων",
 "Ask a question" => "Ρωτήστε μια ερώτηση",
diff --git a/settings/l10n/eo.php b/settings/l10n/eo.php
index ccc184097a..cb84b2da03 100644
--- a/settings/l10n/eo.php
+++ b/settings/l10n/eo.php
@@ -21,8 +21,6 @@
 "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",
 "Managing Big Files" => "Administrante grandajn dosierojn",
 "Ask a question" => "Faru demandon",
diff --git a/settings/l10n/es.php b/settings/l10n/es.php
index 4b6bb2b90b..3ab7cb32ba 100644
--- a/settings/l10n/es.php
+++ b/settings/l10n/es.php
@@ -1,10 +1,14 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Imposible cargar la lista desde el App Store",
 "Authentication error" => "Error de autenticación",
+"Group already exists" => "El grupo ya existe",
+"Unable to add group" => "No se pudo añadir el grupo",
 "Email saved" => "Correo guardado",
 "Invalid email" => "Correo no válido",
 "OpenID Changed" => "OpenID cambiado",
 "Invalid request" => "Solicitud no válida",
+"Unable to delete group" => "No se pudo eliminar el grupo",
+"Unable to delete user" => "No se pudo eliminar el usuario",
 "Language changed" => "Idioma cambiado",
 "Error" => "Error",
 "Disable" => "Desactivar",
@@ -32,8 +36,6 @@
 "Add your App" => "Añade tu aplicación",
 "Select an App" => "Seleccionar una aplicación",
 "See application page at apps.owncloud.com" => "Echa un vistazo a la web de aplicaciones apps.owncloud.com",
-"-licensed" => "-autorizado",
-"by" => "por",
 "Documentation" => "Documentación",
 "Managing Big Files" => "Administra archivos grandes",
 "Ask a question" => "Hacer una pregunta",
diff --git a/settings/l10n/et_EE.php b/settings/l10n/et_EE.php
index e0f0bcf7cf..1f6cf1265d 100644
--- a/settings/l10n/et_EE.php
+++ b/settings/l10n/et_EE.php
@@ -21,8 +21,6 @@
 "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",
 "Managing Big Files" => "Suurte failide haldamine",
 "Ask a question" => "Küsi küsimus",
diff --git a/settings/l10n/eu.php b/settings/l10n/eu.php
index ab3d36e2a4..4c95c7e471 100644
--- a/settings/l10n/eu.php
+++ b/settings/l10n/eu.php
@@ -32,8 +32,6 @@
 "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",
 "Managing Big Files" => "Fitxategi handien kudeaketa",
 "Ask a question" => "Egin galdera bat",
diff --git a/settings/l10n/fa.php b/settings/l10n/fa.php
index 5fe6df4d9d..215966728d 100644
--- a/settings/l10n/fa.php
+++ b/settings/l10n/fa.php
@@ -15,8 +15,6 @@
 "Add your App" => "برنامه خود را بیافزایید",
 "Select an App" => "یک برنامه انتخاب کنید",
 "See application page at apps.owncloud.com" => "صفحه این اٌپ را در apps.owncloud.com ببینید",
-"-licensed" => "مجوزنامه",
-"by" => "به وسیله",
 "Documentation" => "مستندات",
 "Managing Big Files" => "مدیریت پرونده های بزرگ",
 "Ask a question" => "یک سوال بپرسید",
diff --git a/settings/l10n/fi_FI.php b/settings/l10n/fi_FI.php
index 4671f8b39a..37a80aaeea 100644
--- a/settings/l10n/fi_FI.php
+++ b/settings/l10n/fi_FI.php
@@ -1,10 +1,14 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Ei pystytä lataamaan listaa sovellusvarastosta (App Store)",
 "Authentication error" => "Todennusvirhe",
+"Group already exists" => "Ryhmä on jo olemassa",
+"Unable to add group" => "Ryhmän lisäys epäonnistui",
 "Email saved" => "Sähköposti tallennettu",
 "Invalid email" => "Virheellinen sähköposti",
 "OpenID Changed" => "OpenID on vaihdettu",
 "Invalid request" => "Virheellinen pyyntö",
+"Unable to delete group" => "Ryhmän poisto epäonnistui",
+"Unable to delete user" => "Käyttäjän poisto epäonnistui",
 "Language changed" => "Kieli on vaihdettu",
 "Error" => "Virhe",
 "Disable" => "Poista käytöstä",
@@ -32,8 +36,6 @@
 "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",
 "Managing Big Files" => "Suurten tiedostojen hallinta",
 "Ask a question" => "Kysy jotain",
diff --git a/settings/l10n/fr.php b/settings/l10n/fr.php
index c0a9b17df0..890d1e39f1 100644
--- a/settings/l10n/fr.php
+++ b/settings/l10n/fr.php
@@ -1,10 +1,14 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Impossible de charger la liste depuis l'App Store",
 "Authentication error" => "Erreur d'authentification",
+"Group already exists" => "Ce groupe existe déjà",
+"Unable to add group" => "Impossible d'ajouter le groupe",
 "Email saved" => "E-mail sauvegardé",
 "Invalid email" => "E-mail invalide",
 "OpenID Changed" => "Identifiant OpenID changé",
 "Invalid request" => "Requête invalide",
+"Unable to delete group" => "Impossible de supprimer le groupe",
+"Unable to delete user" => "Impossible de supprimer l'utilisateur",
 "Language changed" => "Langue changée",
 "Error" => "Erreur",
 "Disable" => "Désactiver",
@@ -32,8 +36,6 @@
 "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",
 "Managing Big Files" => "Gérer les gros fichiers",
 "Ask a question" => "Poser une question",
diff --git a/settings/l10n/gl.php b/settings/l10n/gl.php
index 96a6b53694..52aa13c461 100644
--- a/settings/l10n/gl.php
+++ b/settings/l10n/gl.php
@@ -21,8 +21,6 @@
 "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",
 "Managing Big Files" => "Xestionar Grandes Ficheiros",
 "Ask a question" => "Pregunte",
diff --git a/settings/l10n/he.php b/settings/l10n/he.php
index 17e803a325..c7189e9435 100644
--- a/settings/l10n/he.php
+++ b/settings/l10n/he.php
@@ -13,8 +13,6 @@
 "Add your App" => "הוספת היישום שלך",
 "Select an App" => "בחירת יישום",
 "See application page at apps.owncloud.com" => "צפה בעמוד הישום ב apps.owncloud.com",
-"-licensed" => "רשיון",
-"by" => "מאת",
 "Documentation" => "תיעוד",
 "Managing Big Files" => "ניהול קבצים גדולים",
 "Ask a question" => "שאל שאלה",
diff --git a/settings/l10n/hr.php b/settings/l10n/hr.php
index 608a23e69e..8c5251520c 100644
--- a/settings/l10n/hr.php
+++ b/settings/l10n/hr.php
@@ -19,8 +19,6 @@
 "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",
 "Managing Big Files" => "Upravljanje velikih datoteka",
 "Ask a question" => "Postavite pitanje",
diff --git a/settings/l10n/hu_HU.php b/settings/l10n/hu_HU.php
index 0a8c6c14cd..23534d8575 100644
--- a/settings/l10n/hu_HU.php
+++ b/settings/l10n/hu_HU.php
@@ -17,8 +17,6 @@
 "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ó",
 "Managing Big Files" => "Nagy fájlok kezelése",
 "Ask a question" => "Tégy fel egy kérdést",
diff --git a/settings/l10n/ia.php b/settings/l10n/ia.php
index 7b2b631b68..e9d6a065a2 100644
--- a/settings/l10n/ia.php
+++ b/settings/l10n/ia.php
@@ -7,7 +7,6 @@
 "More" => "Plus",
 "Add your App" => "Adder tu application",
 "Select an App" => "Selectionar un app",
-"by" => "per",
 "Documentation" => "Documentation",
 "Ask a question" => "Facer un question",
 "Answer" => "Responsa",
diff --git a/settings/l10n/id.php b/settings/l10n/id.php
index a69d9855ca..636be1af95 100644
--- a/settings/l10n/id.php
+++ b/settings/l10n/id.php
@@ -14,8 +14,6 @@
 "Add your App" => "Tambahkan App anda",
 "Select an App" => "Pilih satu aplikasi",
 "See application page at apps.owncloud.com" => "Lihat halaman aplikasi di apps.owncloud.com",
-"-licensed" => "-terlisensi",
-"by" => "oleh",
 "Documentation" => "Dokumentasi",
 "Managing Big Files" => "Mengelola berkas besar",
 "Ask a question" => "Ajukan pertanyaan",
diff --git a/settings/l10n/it.php b/settings/l10n/it.php
index cc3e6578ac..8c8ec63f4c 100644
--- a/settings/l10n/it.php
+++ b/settings/l10n/it.php
@@ -1,10 +1,14 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Impossibile caricare l'elenco dall'App Store",
 "Authentication error" => "Errore di autenticazione",
+"Group already exists" => "Il gruppo esiste già",
+"Unable to add group" => "Impossibile aggiungere il gruppo",
 "Email saved" => "Email salvata",
 "Invalid email" => "Email non valida",
 "OpenID Changed" => "OpenID modificato",
 "Invalid request" => "Richiesta non valida",
+"Unable to delete group" => "Impossibile eliminare il gruppo",
+"Unable to delete user" => "Impossibile eliminare l'utente",
 "Language changed" => "Lingua modificata",
 "Error" => "Errore",
 "Disable" => "Disabilita",
@@ -32,8 +36,6 @@
 "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",
 "Managing Big Files" => "Gestione file grandi",
 "Ask a question" => "Fai una domanda",
diff --git a/settings/l10n/ja_JP.php b/settings/l10n/ja_JP.php
index 0e5add877c..dcf0568cba 100644
--- a/settings/l10n/ja_JP.php
+++ b/settings/l10n/ja_JP.php
@@ -32,8 +32,6 @@
 "Add your App" => "アプリを追加",
 "Select an App" => "アプリを選択してください",
 "See application page at apps.owncloud.com" => "apps.owncloud.com でアプリケーションのページを見てください",
-"-licensed" => "ライセンス",
-"by" => "@",
 "Documentation" => "ドキュメント",
 "Managing Big Files" => "大きなファイルを扱うには",
 "Ask a question" => "質問してください",
diff --git a/settings/l10n/ko.php b/settings/l10n/ko.php
index e0baad73d2..ada09c845c 100644
--- a/settings/l10n/ko.php
+++ b/settings/l10n/ko.php
@@ -21,8 +21,6 @@
 "Add your App" => "앱 추가",
 "Select an App" => "프로그램 선택",
 "See application page at apps.owncloud.com" => "application page at apps.owncloud.com을 보시오.",
-"-licensed" => " 라이선스 사용",
-"by" => " by ",
 "Documentation" => "문서",
 "Managing Big Files" => "큰 파일 관리",
 "Ask a question" => "질문하기",
diff --git a/settings/l10n/lb.php b/settings/l10n/lb.php
index 8dc05e6b49..55db067f8c 100644
--- a/settings/l10n/lb.php
+++ b/settings/l10n/lb.php
@@ -27,8 +27,6 @@
 "Add your App" => "Setz deng App bei",
 "Select an App" => "Wiel eng Applikatioun aus",
 "See application page at apps.owncloud.com" => "Kuck dir d'Applicatioun's Säit op apps.owncloud.com un",
-"-licensed" => "-Lizenséiert",
-"by" => "vun",
 "Documentation" => "Dokumentatioun",
 "Managing Big Files" => "Grouss Fichieren verwalten",
 "Ask a question" => "Stell eng Fro",
diff --git a/settings/l10n/lt_LT.php b/settings/l10n/lt_LT.php
index e8076e293b..701ec86727 100644
--- a/settings/l10n/lt_LT.php
+++ b/settings/l10n/lt_LT.php
@@ -17,7 +17,6 @@
 "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",
diff --git a/settings/l10n/lv.php b/settings/l10n/lv.php
index 67b55f9001..9780127890 100644
--- a/settings/l10n/lv.php
+++ b/settings/l10n/lv.php
@@ -18,8 +18,6 @@
 "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",
diff --git a/settings/l10n/mk.php b/settings/l10n/mk.php
index 38e3cc6e09..ce89f3b40c 100644
--- a/settings/l10n/mk.php
+++ b/settings/l10n/mk.php
@@ -13,8 +13,6 @@
 "Add your App" => "Додадете ја Вашата апликација",
 "Select an App" => "Избери аппликација",
 "See application page at apps.owncloud.com" => "Види ја страницата со апликации на apps.owncloud.com",
-"-licensed" => "-licensed",
-"by" => "од",
 "Documentation" => "Документација",
 "Managing Big Files" => "Управување со големи датотеки",
 "Ask a question" => "Постави прашање",
diff --git a/settings/l10n/ms_MY.php b/settings/l10n/ms_MY.php
index 8d9ac2fa69..a1d3007c89 100644
--- a/settings/l10n/ms_MY.php
+++ b/settings/l10n/ms_MY.php
@@ -15,8 +15,6 @@
 "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",
diff --git a/settings/l10n/nb_NO.php b/settings/l10n/nb_NO.php
index 6536e50e21..57c1881352 100644
--- a/settings/l10n/nb_NO.php
+++ b/settings/l10n/nb_NO.php
@@ -21,8 +21,6 @@
 "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",
diff --git a/settings/l10n/nl.php b/settings/l10n/nl.php
index 081e6af8f5..ffa00dabaa 100644
--- a/settings/l10n/nl.php
+++ b/settings/l10n/nl.php
@@ -30,8 +30,6 @@
 "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",
 "Managing Big Files" => "Onderhoud van grote bestanden",
 "Ask a question" => "Stel een vraag",
diff --git a/settings/l10n/nn_NO.php b/settings/l10n/nn_NO.php
index 7b1a35c8ef..25cf29b91d 100644
--- a/settings/l10n/nn_NO.php
+++ b/settings/l10n/nn_NO.php
@@ -11,8 +11,6 @@
 "Enable" => "Slå på",
 "__language_name__" => "Nynorsk",
 "Select an App" => "Vel ein applikasjon",
-"-licensed" => "-lisensiert",
-"by" => "av",
 "Ask a question" => "Spør om noko",
 "Problems connecting to help database." => "Problem ved tilkopling til hjelpedatabasen.",
 "Go there manually." => "Gå der på eigen hand.",
diff --git a/settings/l10n/pl.php b/settings/l10n/pl.php
index 693727bcb7..ee50d0fffa 100644
--- a/settings/l10n/pl.php
+++ b/settings/l10n/pl.php
@@ -1,10 +1,14 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Nie mogę załadować listy aplikacji",
 "Authentication error" => "Błąd uwierzytelniania",
+"Group already exists" => "Grupa już istnieje",
+"Unable to add group" => "Nie można dodać grupy",
 "Email saved" => "Email zapisany",
 "Invalid email" => "Niepoprawny email",
 "OpenID Changed" => "Zmieniono OpenID",
 "Invalid request" => "Nieprawidłowe żądanie",
+"Unable to delete group" => "Nie można usunąć grupy",
+"Unable to delete user" => "Nie można usunąć użytkownika",
 "Language changed" => "Język zmieniony",
 "Error" => "Błąd",
 "Disable" => "Wyłączone",
@@ -26,8 +30,6 @@
 "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",
 "Managing Big Files" => "Zarządzanie dużymi plikami",
 "Ask a question" => "Zadaj pytanie",
diff --git a/settings/l10n/pt_BR.php b/settings/l10n/pt_BR.php
index 55b09b27f8..6933e58554 100644
--- a/settings/l10n/pt_BR.php
+++ b/settings/l10n/pt_BR.php
@@ -18,8 +18,6 @@
 "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",
 "Managing Big Files" => "Gerênciando Arquivos Grandes",
 "Ask a question" => "Faça uma pergunta",
diff --git a/settings/l10n/pt_PT.php b/settings/l10n/pt_PT.php
index c3c575bcbe..bf939df4ae 100644
--- a/settings/l10n/pt_PT.php
+++ b/settings/l10n/pt_PT.php
@@ -21,8 +21,6 @@
 "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",
 "Managing Big Files" => "Gestão de ficheiros grandes",
 "Ask a question" => "Coloque uma questão",
diff --git a/settings/l10n/ro.php b/settings/l10n/ro.php
index ebb1066a74..c82cdaab2a 100644
--- a/settings/l10n/ro.php
+++ b/settings/l10n/ro.php
@@ -21,8 +21,6 @@
 "Add your App" => "Adaugă aplicația ta",
 "Select an App" => "Selectează o aplicație",
 "See application page at apps.owncloud.com" => "Vizualizează pagina applicației pe apps.owncloud.com",
-"-licensed" => "-autorizat",
-"by" => "de",
 "Documentation" => "Documetație",
 "Managing Big Files" => "Gestionînd fișiere mari",
 "Ask a question" => "Întreabă",
diff --git a/settings/l10n/ru.php b/settings/l10n/ru.php
index 3d8ecbf516..5cbeb002ec 100644
--- a/settings/l10n/ru.php
+++ b/settings/l10n/ru.php
@@ -21,8 +21,6 @@
 "Add your App" => "Добавить приложение",
 "Select an App" => "Выберите приложение",
 "See application page at apps.owncloud.com" => "Смотрите дополнения на apps.owncloud.com",
-"-licensed" => "-лицензия",
-"by" => "от",
 "Documentation" => "Документация",
 "Managing Big Files" => "Управление большими файлами",
 "Ask a question" => "Задать вопрос",
diff --git a/settings/l10n/sk_SK.php b/settings/l10n/sk_SK.php
index edf908ce09..f8032afe5b 100644
--- a/settings/l10n/sk_SK.php
+++ b/settings/l10n/sk_SK.php
@@ -13,8 +13,6 @@
 "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",
 "Managing Big Files" => "Spravovanie veľké súbory",
 "Ask a question" => "Opýtajte sa otázku",
diff --git a/settings/l10n/sl.php b/settings/l10n/sl.php
index 834311a7e7..fc49d940b4 100644
--- a/settings/l10n/sl.php
+++ b/settings/l10n/sl.php
@@ -1,10 +1,14 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Ne morem naložiti seznama iz App Store",
 "Authentication error" => "Napaka overitve",
+"Group already exists" => "Skupina že obstaja",
+"Unable to add group" => "Ni mogoče dodati skupine",
 "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",
+"Unable to delete group" => "Ni mogoče izbrisati skupine",
+"Unable to delete user" => "Ni mogoče izbrisati uporabnika",
 "Language changed" => "Jezik je bil spremenjen",
 "Error" => "Napaka",
 "Disable" => "Onemogoči",
@@ -32,8 +36,6 @@
 "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",
 "Managing Big Files" => "Upravljanje velikih datotek",
 "Ask a question" => "Postavi vprašanje",
diff --git a/settings/l10n/sr.php b/settings/l10n/sr.php
index 7dede8fdc7..84881c2f1a 100644
--- a/settings/l10n/sr.php
+++ b/settings/l10n/sr.php
@@ -3,8 +3,6 @@
 "Invalid request" => "Неисправан захтев",
 "Language changed" => "Језик је измењен",
 "Select an App" => "Изаберите програм",
-"-licensed" => "-лиценциран",
-"by" => "од",
 "Ask a question" => "Поставите питање",
 "Problems connecting to help database." => "Проблем у повезивању са базом помоћи",
 "Go there manually." => "Отиђите тамо ручно.",
diff --git a/settings/l10n/sr@latin.php b/settings/l10n/sr@latin.php
index 0229a76361..8bfc0fa989 100644
--- a/settings/l10n/sr@latin.php
+++ b/settings/l10n/sr@latin.php
@@ -3,8 +3,6 @@
 "Invalid request" => "Neispravan zahtev",
 "Language changed" => "Jezik je izmenjen",
 "Select an App" => "Izaberite program",
-"-licensed" => "-licenciran",
-"by" => "od",
 "Ask a question" => "Postavite pitanje",
 "Problems connecting to help database." => "Problem u povezivanju sa bazom pomoći",
 "Go there manually." => "Otiđite tamo ručno.",
diff --git a/settings/l10n/sv.php b/settings/l10n/sv.php
index c2292b23f9..9beb500194 100644
--- a/settings/l10n/sv.php
+++ b/settings/l10n/sv.php
@@ -32,8 +32,6 @@
 "Add your App" => "Lägg till din applikation",
 "Select an App" => "Välj en App",
 "See application page at apps.owncloud.com" => "Se programsida på apps.owncloud.com",
-"-licensed" => "-licensierat",
-"by" => "av",
 "Documentation" => "Dokumentation",
 "Managing Big Files" => "Hantering av stora filer",
 "Ask a question" => "Ställ en fråga",
diff --git a/settings/l10n/th_TH.php b/settings/l10n/th_TH.php
index 46bdf08aa9..7166c26a1c 100644
--- a/settings/l10n/th_TH.php
+++ b/settings/l10n/th_TH.php
@@ -32,8 +32,6 @@
 "Add your App" => "เพิ่มแอปของคุณ",
 "Select an App" => "เลือก App",
 "See application page at apps.owncloud.com" => "ดูหน้าแอพพลิเคชั่นที่ apps.owncloud.com",
-"-licensed" => "-ได้รับอนุญาติแล้ว",
-"by" => "โดย",
 "Documentation" => "เอกสารคู่มือการใช้งาน",
 "Managing Big Files" => "การจัดการไฟล์ขนาดใหญ่",
 "Ask a question" => "สอบถามข้อมูล",
diff --git a/settings/l10n/tr.php b/settings/l10n/tr.php
index 2350dc49aa..6e68d792e7 100644
--- a/settings/l10n/tr.php
+++ b/settings/l10n/tr.php
@@ -15,8 +15,6 @@
 "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",
 "Managing Big Files" => "Büyük Dosyaların Yönetimi",
 "Ask a question" => "Bir soru sorun",
diff --git a/settings/l10n/uk.php b/settings/l10n/uk.php
index 7331ff324c..37ecd73fb6 100644
--- a/settings/l10n/uk.php
+++ b/settings/l10n/uk.php
@@ -3,8 +3,6 @@
 "Invalid request" => "Помилковий запит",
 "Language changed" => "Мова змінена",
 "Select an App" => "Вибрати додаток",
-"-licensed" => "-ліцензовано",
-"by" => "по",
 "Ask a question" => "Запитати",
 "Problems connecting to help database." => "Проблема при з'єднані з базою допомоги",
 "You use" => "Ви використовуєте",
diff --git a/settings/l10n/vi.php b/settings/l10n/vi.php
index 95dd88c62c..1cad2e148d 100644
--- a/settings/l10n/vi.php
+++ b/settings/l10n/vi.php
@@ -17,8 +17,6 @@
 "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",
diff --git a/settings/l10n/zh_CN.GB2312.php b/settings/l10n/zh_CN.GB2312.php
index f4e0a42c83..83111beb10 100644
--- a/settings/l10n/zh_CN.GB2312.php
+++ b/settings/l10n/zh_CN.GB2312.php
@@ -18,8 +18,6 @@
 "Add your App" => "添加你的应用程序",
 "Select an App" => "选择一个程序",
 "See application page at apps.owncloud.com" => "在owncloud.com上查看应用程序",
-"-licensed" => "-许可了",
-"by" => "由",
 "Documentation" => "文档",
 "Managing Big Files" => "管理大文件",
 "Ask a question" => "提一个问题",
diff --git a/settings/l10n/zh_CN.php b/settings/l10n/zh_CN.php
index 2adb0e104e..0667cee74b 100644
--- a/settings/l10n/zh_CN.php
+++ b/settings/l10n/zh_CN.php
@@ -21,8 +21,6 @@
 "Add your App" => "添加应用",
 "Select an App" => "选择一个应用",
 "See application page at apps.owncloud.com" => "查看在 app.owncloud.com 的应用程序页面",
-"-licensed" => "-许可证",
-"by" => "由",
 "Documentation" => "文档",
 "Managing Big Files" => "管理大文件",
 "Ask a question" => "提问",
diff --git a/settings/l10n/zh_TW.php b/settings/l10n/zh_TW.php
index 82dd8dd42b..e0eeddb375 100644
--- a/settings/l10n/zh_TW.php
+++ b/settings/l10n/zh_TW.php
@@ -17,8 +17,6 @@
 "Add your App" => "添加你的 App",
 "Select an App" => "選擇一個應用程式",
 "See application page at apps.owncloud.com" => "查看應用程式頁面於 apps.owncloud.com",
-"-licensed" => "-已許可",
-"by" => "由",
 "Documentation" => "文件",
 "Managing Big Files" => "管理大檔案",
 "Ask a question" => "提問",

From a26ea6d65c2117d5af78a64244b2d7e5f4e9ccfe Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Wed, 5 Sep 2012 00:12:11 -0400
Subject: [PATCH 1117/1224] Implement support for replacing files during upload
 with the actions: replace, suggest name, and cancel

---
 apps/files/js/filelist.js | 117 ++++++++++++++++++++++++++------------
 apps/files/js/files.js    |  34 ++++++++---
 2 files changed, 107 insertions(+), 44 deletions(-)

diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index 85e5cfb14c..ce215cb843 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -3,7 +3,7 @@ var FileList={
 	update:function(fileListHtml) {
 		$('#fileList').empty().html(fileListHtml);
 	},
-	addFile:function(name,size,lastModified,loading){
+	addFile:function(name,size,lastModified,loading,hidden){
 		var img=(loading)?OC.imagePath('core', 'loading.gif'):OC.imagePath('core', 'filetypes/file.png');
 		var html='<tr data-type="file" data-size="'+size+'">';
 		if(name.indexOf('.')!=-1){
@@ -36,8 +36,11 @@ var FileList={
 		}else{
 			$('tr').filterAttr('data-file',name).find('td.filename').draggable(dragOptions);
 		}
+		if (hidden) {
+			$('tr').filterAttr('data-file', name).hide();
+		}
 	},
-	addDir:function(name,size,lastModified){
+	addDir:function(name,size,lastModified,hidden){
 		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" />');
@@ -63,6 +66,9 @@ var FileList={
 		FileList.insertElement(name,'dir',html);
 		$('tr').filterAttr('data-file',name).find('td.filename').draggable(dragOptions);
 		$('tr').filterAttr('data-file',name).find('td.filename').droppable(folderDropOptions);
+		if (hidden) {
+			$('tr').filterAttr('data-file', name).hide();
+		}
 	},
 	refresh:function(data) {
 		result = jQuery.parseJSON(data.responseText);
@@ -82,7 +88,7 @@ var FileList={
 	},
 	insertElement:function(name,type,element){
 		//find the correct spot to insert the file or folder
-		var fileElements=$('tr[data-file][data-type="'+type+'"]');
+		var fileElements=$('tr[data-file][data-type="'+type+'"]:visible');
 		var pos;
 		if(name.localeCompare($(fileElements[0]).attr('data-file'))<0){
 			pos=-1;
@@ -137,11 +143,7 @@ var FileList={
 			event.preventDefault();
 			var newname=input.val();
 			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();
+				if (FileList.checkName(name, newname, false)) {
 					newname = name;
 				} else {
 					$.get(OC.filePath('files','ajax','rename.php'), { dir : $('#dir').val(), newname: newname, file: name },function(result) {
@@ -151,7 +153,6 @@ var FileList={
 						}
 					});
 				}
-
 			}
 			tr.attr('data-file', newname);
 			var path = td.children('a.name').attr('href');
@@ -179,20 +180,62 @@ var FileList={
 			form.trigger('submit');
 		});
 	},
-	replace:function(oldName, newName) {
+	checkName:function(oldName, newName, isNewFile) {
+		if (isNewFile || $('tr').filterAttr('data-file', newName).length > 0) {
+			if (isNewFile) {
+				$('#notification').html(newName+' '+t('files', 'already exists')+'<span class="replace">'+t('files', 'replace')+'</span><span class="suggest">'+t('files', 'suggest name')+'</span><span class="cancel">'+t('files', 'cancel')+'</span>');
+			} else {
+				$('#notification').html(newName+' '+t('files', 'already exists')+'<span class="replace">'+t('files', 'replace')+'</span><span class="cancel">'+t('files', 'cancel')+'</span>');
+			}
+			$('#notification').data('oldName', oldName);
+			$('#notification').data('newName', newName);
+			$('#notification').data('isNewFile', isNewFile);
+			$('#notification').fadeIn();
+			return true;
+		} else {
+			return false;
+		}
+	},
+	replace:function(oldName, newName, isNewFile) {
 		// Finish any existing actions
 		if (FileList.lastAction || !FileList.useUndo) {
 			FileList.lastAction();
 		}
-		var tr = $('tr').filterAttr('data-file', oldName);
-		tr.hide();
+		$('tr').filterAttr('data-file', oldName).hide();
+		$('tr').filterAttr('data-file', newName).hide();
+		var tr = $('tr').filterAttr('data-file', oldName).clone();
+		tr.attr('data-replace', 'true');
+		tr.attr('data-file', newName);
+		var td = tr.children('td.filename');
+		td.children('a.name .span').text(newName);
+		var path = td.children('a.name').attr('href');
+		td.children('a.name').attr('href', path.replace(encodeURIComponent(oldName), encodeURIComponent(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) {
+			span.append($('<span class="extension">'+newName.substr(newName.lastIndexOf('.'))+'</span>'));
+		}
+		FileList.insertElement(newName, tr.data('type'), tr);
+		tr.show();
 		FileList.replaceCanceled = false;
 		FileList.replaceOldName = oldName;
 		FileList.replaceNewName = newName;
+		FileList.replaceIsNewFile = isNewFile;
 		FileList.lastAction = function() {
 			FileList.finishReplace();
 		};
-		$('#notification').html(t('files', 'replaced')+' '+newName+' '+t('files', 'with')+' '+oldName+'<span class="undo">'+t('files', 'undo')+'</span>');
+		if (isNewFile) {
+			$('#notification').html(t('files', 'replaced')+' '+newName+'<span class="undo">'+t('files', 'undo')+'</span>');
+		} else {
+			$('#notification').html(t('files', 'replaced')+' '+newName+' '+t('files', 'with')+' '+oldName+'<span class="undo">'+t('files', 'undo')+'</span>');
+		}
 		$('#notification').fadeIn();
 	},
 	finishReplace:function() {
@@ -203,25 +246,7 @@ var FileList={
 			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();
+						$('tr').filterAttr('data-replace', 'true').removeAttr('data-replace');
 					} else {
 						OC.dialogs.alert(result.data.message, 'Error moving file');
 					}
@@ -255,7 +280,7 @@ var FileList={
 				data: {dir:$('#dir').val(),files:fileNames},
 				complete: function(data){
 					boolOperationFinished(data, function(){
-						$('#notification').fadeOut();
+						$('#notification').fadeOut('400');
 						$.each(FileList.deleteFiles,function(index,file){
 							FileList.remove(file);
 						});
@@ -299,21 +324,39 @@ $(document).ready(function(){
 			FileList.deleteCanceled=true;
 			FileList.deleteFiles=null;
 		} else if (FileList.replaceOldName && FileList.replaceNewName) {
-			$('tr').filterAttr('data-file', FileList.replaceOldName).show();
+			if (FileList.replaceIsNewFile) {
+				// Delete the new uploaded file
+				FileList.deleteCanceled = false;
+				FileList.deleteFiles = [FileList.replaceOldName];
+				FileList.finishDelete(null, true);
+			} else {
+				$('tr').filterAttr('data-file', FileList.replaceOldName).show();
+			}
+			$('tr').filterAttr('data-replace', 'true').remove();
+			$('tr').filterAttr('data-file', FileList.replaceNewName).show();
 			FileList.replaceCanceled = true;
 			FileList.replaceOldName = null;
 			FileList.replaceNewName = null;
+			FileList.replaceIsNewFile = null;
 		}
 		FileList.lastAction = null;
-		$('#notification').fadeOut();
+		$('#notification').fadeOut('400');
 	});
 	$('#notification .replace').live('click', function() {
 		$('#notification').fadeOut('400', function() {
-			FileList.replace($('#notification').data('oldName'), $('#notification').data('newName'));
+			FileList.replace($('#notification').data('oldName'), $('#notification').data('newName'), $('#notification').data('isNewFile'));
 		});
 	});
+	$('#notification .suggest').live('click', function() {
+		$('tr').filterAttr('data-file', $('#notification').data('oldName')).show();
+		$('#notification').fadeOut('400');
+	});
 	$('#notification .cancel').live('click', function() {
-		$('#notification').fadeOut();
+		if ($('#notification').data('isNewFile')) {
+			FileList.deleteCanceled = false;
+			FileList.deleteFiles = [$('#notification').data('oldName')];
+			FileList.finishDelete(null, true);
+		}
 	});
 	FileList.useUndo=('onbeforeunload' in window)
 	$(window).bind('beforeunload', function (){
diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index a729b5f2e6..3d347c3f56 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -236,7 +236,14 @@ $(document).ready(function() {
 								var size=t('files','Pending');
 							}
 							if(files && !dirName){
-								FileList.addFile(getUniqueName(files[i].name),size,date,true);
+								var uniqueName = getUniqueName(files[i].name);
+								if (uniqueName != files[i].name) {
+									FileList.checkName(uniqueName, files[i].name, true);
+									var hidden = true;
+								} else {
+									var hidden = false;
+								}
+								FileList.addFile(uniqueName,size,date,true,hidden);
 							} else if(dirName) {
 								var uploadtext = $('tr').filterAttr('data-type', 'dir').filterAttr('data-file', dirName).find('.uploadtext')
 								var currentUploads = parseInt(uploadtext.attr('currentUploads'));
@@ -255,7 +262,14 @@ $(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);
+						var uniqueName = getUniqueName(filename);
+						if (uniqueName != filename) {
+							FileList.checkName(uniqueName, filename, true);
+							var hidden = true;
+						} else {
+							var hidden = false;
+						}
+						FileList.addFile(uniqueName,'Pending',date,true,hidden);
 					}
 					if($.support.xhrFileUpload) {
 						for(var i=0;i<files.length;i++){
@@ -475,12 +489,18 @@ $(document).ready(function() {
 		$(this).append(input);
 		input.focus();
 		input.change(function(){
-			var name=getUniqueName($(this).val());
-			if(type != 'web' && name.indexOf('/')!=-1){
+			if(type != 'web' && $(this).val().indexOf('/')!=-1){
 				$('#notification').text(t('files','Invalid name, \'/\' is not allowed.'));
 				$('#notification').fadeIn();
 				return;
 			}
+			var name = getUniqueName($(this).val());
+			if (name != $(this).val()) {
+				FileList.checkName(name, $(this).val(), true);
+				var hidden = true;
+			} else {
+				var hidden = false;
+			}
 			switch(type){
 				case 'file':
 					$.post(
@@ -489,7 +509,7 @@ $(document).ready(function() {
 						function(result){
 							if (result.status == 'success') {
 								var date=new Date();
-								FileList.addFile(name,0,date);
+								FileList.addFile(name,0,date,false,hidden);
 								var tr=$('tr').filterAttr('data-file',name);
 								tr.data('mime','text/plain');
 								getMimeIcon('text/plain',function(path){
@@ -508,7 +528,7 @@ $(document).ready(function() {
 						function(result){
 							if (result.status == 'success') {
 								var date=new Date();
-								FileList.addDir(name,0,date);
+								FileList.addDir(name,0,date,hidden);
 							} else {
 								OC.dialogs.alert(result.data.message, 'Error');
 							}
@@ -539,7 +559,7 @@ $(document).ready(function() {
 					eventSource.listen('success',function(mime){
 						$('#uploadprogressbar').fadeOut();
 						var date=new Date();
-						FileList.addFile(localName,0,date);
+						FileList.addFile(localName,0,date,false,hidden);
 						var tr=$('tr').filterAttr('data-file',localName);
 						tr.data('mime',mime);
 						getMimeIcon(mime,function(path){

From 9eccc0121a5274627a3b32324b5a86c32e09aba8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Wed, 5 Sep 2012 13:22:38 +0300
Subject: [PATCH 1118/1224] Respect coding style

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

diff --git a/lib/base.php b/lib/base.php
index 61dea18689..6c556e3d19 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -51,7 +51,8 @@ class OC{
 	 */
 	public static $THIRDPARTYWEBROOT = '';
 	/**
-	 * The installation path array of the apps folder on the server (e.g. /srv/http/owncloud) 'path' and web path in 'url'
+	 * 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();
 	/*
@@ -89,7 +90,7 @@ class OC{
 		elseif(strpos($className, 'Sabre_')===0) {
 			$path =  str_replace('_', '/', $className) . '.php';
 		}
-		elseif(strpos($className,'Test_')===0) {
+		elseif(strpos($className, 'Test_')===0) {
 			$path =  'tests/lib/'.strtolower(str_replace('_', '/', substr($className, 5)) . '.php');
 		}else{
 			return false;
@@ -241,7 +242,7 @@ class OC{
 		//OC_Util::addScript( "multiselect" );
 		OC_Util::addScript('search', 'result');
 
-		if( OC_Config::getValue( 'installed', false )){
+		if( OC_Config::getValue( 'installed', false )) {
 			if( OC_Appconfig::getValue( 'core', 'backgroundjobs_mode', 'ajax' ) == 'ajax' ) {
 				OC_Util::addScript( 'backgroundjobs' );
 			}
@@ -316,7 +317,7 @@ class OC{
 		// set debug mode if an xdebug session is active
 		if (!defined('DEBUG') || !DEBUG) {
 			if(isset($_COOKIE['XDEBUG_SESSION'])) {
-				define('DEBUG',true);
+				define('DEBUG', true);
 			}
 		}
 
@@ -366,7 +367,7 @@ class OC{
 		OC_Hook::connect('OC_User', 'post_login', 'OC_Cache_File', 'loginListener');
 
 		// Check for blacklisted files
-		OC_Hook::connect('OC_Filesystem','write', 'OC_Filesystem', 'isBlacklisted');
+		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
@@ -558,7 +559,7 @@ class OC{
 			return false;
 		}
 		OC_App::loadApps(array('authentication'));
-		if (OC_User::login($_SERVER["PHP_AUTH_USER"],$_SERVER["PHP_AUTH_PW"])) {
+		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']:'');

From d5fd5cd5845b29312d301f57324c406e812ed9c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Wed, 5 Sep 2012 15:40:21 +0300
Subject: [PATCH 1119/1224] Respect coding style

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

diff --git a/lib/cache.php b/lib/cache.php
index fed990b5b3..62003793d5 100644
--- a/lib/cache.php
+++ b/lib/cache.php
@@ -44,8 +44,8 @@ class OC_Cache {
 				self::$global_cache = new OC_Cache_Broker(self::$global_cache_fast, self::$global_cache);
 			}
 		}
-		if($fast){
-			if(self::$global_cache_fast){
+		if($fast) {
+			if(self::$global_cache_fast) {
 				return self::$global_cache_fast;
 			}else{
 				return false;
@@ -74,8 +74,8 @@ class OC_Cache {
 			}
 		}
 
-		if($fast){
-			if(self::$user_cache_fast){
+		if($fast) {
+			if(self::$user_cache_fast) {
 				return self::$user_cache_fast;
 			}else{
 				return false;
@@ -138,7 +138,7 @@ class OC_Cache {
 	 * @return true
 	 */
 	static public function isFast() {
-		if(is_null(self::$isFast)){
+		if(is_null(self::$isFast)) {
 			self::$isFast=function_exists('xcache_set') || function_exists('apc_store');
 		}
 		return self::$isFast;

From e5cb638c0920c421b7e0104d19591720eed6fe56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Wed, 5 Sep 2012 15:42:06 +0300
Subject: [PATCH 1120/1224] Respect coding style

---
 lib/config.php | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/lib/config.php b/lib/config.php
index 266d559126..390469beac 100644
--- a/lib/config.php
+++ b/lib/config.php
@@ -70,7 +70,7 @@ class OC_Config{
 	public static function getValue( $key, $default = null ){
 		self::readData();
 
-		if( array_key_exists( $key, self::$cache )){
+		if( array_key_exists( $key, self::$cache )) {
 			return self::$cache[$key];
 		}
 
@@ -108,7 +108,7 @@ class OC_Config{
 	public static function deleteKey( $key ){
 		self::readData();
 
-		if( array_key_exists( $key, self::$cache )){
+		if( array_key_exists( $key, self::$cache )) {
 			// Delete key from cache
 			unset( self::$cache[$key] );
 
@@ -126,17 +126,17 @@ class OC_Config{
 	 * Reads the config file and saves it to the cache
 	 */
 	private static function readData(){
-		if( self::$init ){
+		if( self::$init ) {
 			return true;
 		}
 
-		if( !file_exists( OC::$SERVERROOT."/config/config.php" )){
+		if( !file_exists( OC::$SERVERROOT."/config/config.php" )) {
 			return false;
 		}
 
 		// Include the file, save the data from $CONFIG
-		include( OC::$SERVERROOT."/config/config.php" );
-		if( isset( $CONFIG ) && is_array( $CONFIG )){
+		include OC::$SERVERROOT."/config/config.php";
+		if( isset( $CONFIG ) && is_array( $CONFIG )) {
 			self::$cache = $CONFIG;
 		}
 
@@ -164,7 +164,9 @@ class OC_Config{
 		$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->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;
 		}

From 24977d0fd07ab40564cddae5661a4ae6bbfec7f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Wed, 5 Sep 2012 15:49:42 +0300
Subject: [PATCH 1121/1224] Respect coding style

---
 lib/db.php | 114 ++++++++++++++++++++++++++---------------------------
 1 file changed, 57 insertions(+), 57 deletions(-)

diff --git a/lib/db.php b/lib/db.php
index 16b3920873..2f36416d0a 100644
--- a/lib/db.php
+++ b/lib/db.php
@@ -42,14 +42,15 @@ class OC_DB {
 	 * @return BACKEND_MDB2 or BACKEND_PDO
 	 */
 	private static function getDBBackend(){
-		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)
+		//check if we can use PDO, else use MDB2 (installation always needs to be done my mdb2)
+		if(class_exists('PDO') && OC_Config::getValue('installed', false)) {
 			$type = OC_Config::getValue( "dbtype", "sqlite" );
 			if($type=='oci') { //oracle also always needs mdb2
 				return self::BACKEND_MDB2;
 			}
 			if($type=='sqlite3') $type='sqlite';
 			$drivers=PDO::getAvailableDrivers();
-			if(array_search($type,$drivers)!==false){
+			if(array_search($type, $drivers)!==false) {
 				return self::BACKEND_PDO;
 			}
 		}
@@ -63,13 +64,13 @@ class OC_DB {
 	 * Connects to the database as specified in config.php
 	 */
 	public static function connect($backend=null){
-		if(self::$connection){
+		if(self::$connection) {
 			return;
 		}
-		if(is_null($backend)){
+		if(is_null($backend)) {
 			$backend=self::getDBBackend();
 		}
-		if($backend==self::BACKEND_PDO){
+		if($backend==self::BACKEND_PDO) {
 			self::connectPDO();
 			self::$connection=self::$PDO;
 			self::$backend=self::BACKEND_PDO;
@@ -84,8 +85,8 @@ class OC_DB {
 	 * connect to the database using pdo
 	 */
 	public static function connectPDO(){
-		if(self::$connection){
-			if(self::$backend==self::BACKEND_MDB2){
+		if(self::$connection) {
+			if(self::$backend==self::BACKEND_MDB2) {
 				self::disconnect();
 			}else{
 				return;
@@ -97,8 +98,8 @@ class OC_DB {
 		$user = OC_Config::getValue( "dbuser", "" );
 		$pass = OC_Config::getValue( "dbpassword", "" );
 		$type = OC_Config::getValue( "dbtype", "sqlite" );
-		if(strpos($host,':')){
-			list($host,$port)=explode(':',$host,2);
+		if(strpos($host, ':')) {
+			list($host, $port)=explode(':', $host,2);
 		}else{
 			$port=false;
 		}
@@ -106,9 +107,9 @@ class OC_DB {
 		$datadir=OC_Config::getValue( "datadirectory", OC::$SERVERROOT.'/data' );
 
 		// do nothing if the connection already has been established
-		if(!self::$PDO){
+		if(!self::$PDO) {
 			// Add the dsn according to the database type
-			switch($type){
+			switch($type) {
 				case 'sqlite':
 					$dsn='sqlite2:'.$datadir.'/'.$name.'.db';
 					break;
@@ -116,7 +117,7 @@ class OC_DB {
 					$dsn='sqlite:'.$datadir.'/'.$name.'.db';
 					break;
 				case 'mysql':
-					if($port){
+					if($port) {
 						$dsn='mysql:dbname='.$name.';host='.$host.';port='.$port;
 					}else{
 						$dsn='mysql:dbname='.$name.';host='.$host;
@@ -124,7 +125,7 @@ class OC_DB {
 					$opts[PDO::MYSQL_ATTR_INIT_COMMAND] = "SET NAMES 'UTF8'";
 					break;
 				case 'pgsql':
-					if($port){
+					if($port) {
 						$dsn='pgsql:dbname='.$name.';host='.$host.';port='.$port;
 					}else{
 						$dsn='pgsql:dbname='.$name.';host='.$host;
@@ -139,22 +140,22 @@ class OC_DB {
 					/** END OF FIX***/
 					break;
 				case 'oci': // Oracle with PDO is unsupported
-						if ($port) {
-								$dsn = 'oci:dbname=//' . $host . ':' . $port . '/' . $name;
-						} else {
-								$dsn = 'oci:dbname=//' . $host . '/' . $name;
-						}
-						break;
+					if ($port) {
+							$dsn = 'oci:dbname=//' . $host . ':' . $port . '/' . $name;
+					} else {
+							$dsn = 'oci:dbname=//' . $host . '/' . $name;
+					}
+					break;
 			}
 			try{
-				self::$PDO=new PDO($dsn,$user,$pass,$opts);
+				self::$PDO=new PDO($dsn, $user, $pass, $opts);
 			}catch(PDOException $e){
 				echo( '<b>can not connect to database, using '.$type.'. ('.$e->getMessage().')</center>');
 				die();
 			}
 			// We always, really always want associative arrays
-			self::$PDO->setAttribute(PDO::ATTR_DEFAULT_FETCH_MODE,PDO::FETCH_ASSOC);
-			self::$PDO->setAttribute(PDO::ATTR_ERRMODE,PDO::ERRMODE_EXCEPTION);
+			self::$PDO->setAttribute(PDO::ATTR_DEFAULT_FETCH_MODE, PDO::FETCH_ASSOC);
+			self::$PDO->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION);
 		}
 		return true;
 	}
@@ -162,9 +163,9 @@ class OC_DB {
 	/**
 	 * connect to the database using mdb2
 	 */
-	public static function connectMDB2(){
-		if(self::$connection){
-			if(self::$backend==self::BACKEND_PDO){
+	public static function connectMDB2() {
+		if(self::$connection) {
+			if(self::$backend==self::BACKEND_PDO) {
 				self::disconnect();
 			}else{
 				return;
@@ -180,9 +181,9 @@ class OC_DB {
 		$datadir=OC_Config::getValue( "datadirectory", "$SERVERROOT/data" );
 
 		// do nothing if the connection already has been established
-		if(!self::$MDB2){
+		if(!self::$MDB2) {
 			// Require MDB2.php (not required in the head of the file so we only load it when needed)
-			require_once('MDB2.php');
+			require_once 'MDB2.php';
 
 			// Prepare options array
 			$options = array(
@@ -239,10 +240,10 @@ class OC_DB {
 			self::$MDB2 = MDB2::factory( $dsn, $options );
 
 			// Die if we could not connect
-			if( PEAR::isError( self::$MDB2 )){
+			if( PEAR::isError( self::$MDB2 )) {
 				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);
+				OC_Log::write('core', self::$MDB2->getUserInfo(), OC_Log::FATAL);
+				OC_Log::write('core', self::$MDB2->getMessage(), OC_Log::FATAL);
 				die( $error );
 			}
 
@@ -290,14 +291,14 @@ class OC_DB {
 
 		self::connect();
 		// return the result
-		if(self::$backend==self::BACKEND_MDB2){
+		if(self::$backend==self::BACKEND_MDB2) {
 			$result = self::$connection->prepare( $query );
 
 			// Die if we have an error (error means: bad query, not 0 results!)
 			if( PEAR::isError($result)) {
 				$entry = 'DB Error: "'.$result->getMessage().'"<br />';
 				$entry .= 'Offending command was: '.$query.'<br />';
-				OC_Log::write('core',$entry,OC_Log::FATAL);
+				OC_Log::write('core', $entry,OC_Log::FATAL);
 				error_log('DB error: '.$entry);
 				die( $entry );
 			}
@@ -307,7 +308,7 @@ class OC_DB {
 			}catch(PDOException $e){
 				$entry = 'DB Error: "'.$e->getMessage().'"<br />';
 				$entry .= 'Offending command was: '.$query.'<br />';
-				OC_Log::write('core',$entry,OC_Log::FATAL);
+				OC_Log::write('core', $entry,OC_Log::FATAL);
 				error_log('DB error: '.$entry);
 				die( $entry );
 			}
@@ -328,7 +329,7 @@ class OC_DB {
 	 */
 	public static function insertid($table=null){
 		self::connect();
-		if($table !== null){
+		if($table !== null) {
 			$prefix = OC_Config::getValue( "dbtableprefix", "oc_" );
 			$suffix = OC_Config::getValue( "dbsequencesuffix", "_id_seq" );
 			$table = str_replace( '*PREFIX*', $prefix, $table );
@@ -344,8 +345,8 @@ class OC_DB {
 	 */
 	public static function disconnect(){
 		// Cut connection if required
-		if(self::$connection){
-			if(self::$backend==self::BACKEND_MDB2){
+		if(self::$connection) {
+			if(self::$backend==self::BACKEND_MDB2) {
 				self::$connection->disconnect();
 			}
 			self::$connection=false;
@@ -407,7 +408,7 @@ class OC_DB {
 		 * http://docs.oracle.com/cd/B19306_01/server.102/b14200/functions037.htm
 		 */
 
-		 if( $CONFIG_DBTYPE == 'pgsql' ){ //mysql support it too but sqlite doesn't
+		 if( $CONFIG_DBTYPE == 'pgsql' ) { //mysql support it too but sqlite doesn't
 				 $content = str_replace( '<default>0000-00-00 00:00:00</default>', '<default>CURRENT_TIMESTAMP</default>', $content );
 		 }
 		 
@@ -420,10 +421,10 @@ class OC_DB {
 		unlink( $file2 );
 
 		// Die in case something went wrong
-		if( $definition instanceof MDB2_Schema_Error ){
+		if( $definition instanceof MDB2_Schema_Error ) {
 			die( $definition->getMessage().': '.$definition->getUserInfo());
 		}
-		if(OC_Config::getValue('dbtype','sqlite')==='oci'){
+		if(OC_Config::getValue('dbtype', 'sqlite')==='oci') {
 			unset($definition['charset']); //or MDB2 tries SHUTDOWN IMMEDIATE
 			$oldname = $definition['name'];
 			$definition['name']=OC_Config::getValue( "dbuser", $oldname );
@@ -432,7 +433,7 @@ class OC_DB {
 		$ret=self::$schema->createDatabase( $definition );
 
 		// Die in case something went wrong
-		if( $ret instanceof MDB2_Error ){
+		if( $ret instanceof MDB2_Error ) {
 			echo (self::$MDB2->getDebugOutput());
 			die ($ret->getMessage() . ': ' . $ret->getUserInfo());
 		}
@@ -456,7 +457,7 @@ class OC_DB {
 		$previousSchema = self::$schema->getDefinitionFromDatabase();
 		if (PEAR::isError($previousSchema)) {
 			$error = $previousSchema->getMessage();
-			OC_Log::write('core','Failed to get existing database structure for upgrading ('.$error.')',OC_Log::FATAL);
+			OC_Log::write('core', 'Failed to get existing database structure for upgrading ('.$error.')', OC_Log::FATAL);
 			return false;
 		}
 
@@ -483,7 +484,7 @@ class OC_DB {
 		if (PEAR::isError($op)) {
 			$error = $op->getMessage();
 			$detail = $op->getDebugInfo();
-			OC_Log::write('core','Failed to update database structure ('.$error.', '.$detail.')',OC_Log::FATAL);
+			OC_Log::write('core', 'Failed to update database structure ('.$error.', '.$detail.')', OC_Log::FATAL);
 			return false;
 		}
 		return true;
@@ -502,8 +503,8 @@ class OC_DB {
 		self::$MDB2->loadModule('Reverse');
 
 		// Connect if this did not happen before
-		if(!self::$schema){
-			require_once('MDB2/Schema.php');
+		if(!self::$schema) {
+			require_once 'MDB2/Schema.php';
 			self::$schema=MDB2_Schema::factory(self::$MDB2);
 		}
 
@@ -521,24 +522,24 @@ class OC_DB {
 	private static function processQuery( $query ){
 		self::connect();
 		// We need Database type and table prefix
-		if(is_null(self::$type)){
+		if(is_null(self::$type)) {
 			self::$type=OC_Config::getValue( "dbtype", "sqlite" );
 		}
 		$type = self::$type;
-		if(is_null(self::$prefix)){
+		if(is_null(self::$prefix)) {
 			self::$prefix=OC_Config::getValue( "dbtableprefix", "oc_" );
 		}
 		$prefix = self::$prefix;
 
 		// differences in escaping of table names ('`' for mysql) and getting the current timestamp
-		if( $type == 'sqlite' || $type == 'sqlite3' ){
+		if( $type == 'sqlite' || $type == 'sqlite3' ) {
 			$query = str_replace( '`', '"', $query );
 			$query = str_ireplace( 'NOW()', 'datetime(\'now\')', $query );
 			$query = str_ireplace( 'UNIX_TIMESTAMP()', 'strftime(\'%s\',\'now\')', $query );
-		}elseif( $type == 'pgsql' ){
+		}elseif( $type == 'pgsql' ) {
 			$query = str_replace( '`', '"', $query );
 			$query = str_ireplace( 'UNIX_TIMESTAMP()', 'cast(extract(epoch from current_timestamp) as integer)', $query );
-		}elseif( $type == 'oci'  ){
+		}elseif( $type == 'oci'  ) {
 			$query = str_replace( '`', '"', $query );
 			$query = str_ireplace( 'NOW()', 'CURRENT_TIMESTAMP', $query );
 		}
@@ -600,7 +601,7 @@ class OC_DB {
 
 		foreach($apps as $app){
 			$path = OC_App::getAppPath($app).'/appinfo/database.xml';
-			if(file_exists($path)){
+			if(file_exists($path)) {
 				self::removeDBStructure( $path );
 			}
 		}
@@ -608,8 +609,7 @@ class OC_DB {
 		// Create new tables
 		self::createDBFromStructure( $file );
 		self::commit();
-
-	 }
+	}
 
 	/**
 	 * Start a transaction
@@ -626,9 +626,9 @@ class OC_DB {
 	/**
 	 * Commit the database changes done during a transaction that is in progress
 	 */
-	public static function commit(){
+	public static function commit() {
 		self::connect();
-		if(!self::$inTransaction){
+		if(!self::$inTransaction) {
 			return false;
 		}
 		self::$connection->commit();
@@ -641,7 +641,7 @@ class OC_DB {
 	 * @return bool
 	 */
 	public static function isError($result){
-		if(!$result){
+		if(!$result) {
 			return true;
 		}elseif(self::$backend==self::BACKEND_MDB2 and PEAR::isError($result)){
 			return true;
@@ -672,7 +672,7 @@ class PDOStatementWrapper{
 		}else{
 			$result=$this->statement->execute();
 		}
-		if($result){
+		if($result) {
 			return $this;
 		}else{
 			return false;
@@ -703,7 +703,7 @@ class PDOStatementWrapper{
 	 * pass all other function directly to the PDOStatement
 	 */
 	public function __call($name,$arguments){
-		return call_user_func_array(array($this->statement,$name),$arguments);
+		return call_user_func_array(array($this->statement,$name), $arguments);
 	}
 
 	/**

From a2b6a921076731a75a1a41fab0d77afd421a72fc Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sat, 1 Sep 2012 19:47:31 +0200
Subject: [PATCH 1122/1224] Disable asking to save password when adding users.

---
 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 d862fa1cad..eef9b29135 100644
--- a/settings/templates/users.php
+++ b/settings/templates/users.php
@@ -17,7 +17,7 @@ $_['subadmingroups'] = array_flip($items);
 var isadmin = <?php echo $_['isadmin']?'true':'false'; ?>;
 </script>
 <div id="controls">
-	<form id="newuser">
+	<form id="newuser" autocomplete="off">
 		<input id="newusername" type="text" placeholder="<?php echo $l->t('Name')?>" /> <input
 			type="password" id="newuserpassword"
 			placeholder="<?php echo $l->t('Password')?>" /> <select

From 1edab438d1c1490d5257fc2469a6bd8c46582dd1 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Mon, 3 Sep 2012 00:02:42 +0200
Subject: [PATCH 1123/1224] Added possibility to get permissions for shared
 item with ajax call.

---
 core/ajax/share.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/core/ajax/share.php b/core/ajax/share.php
index 3ace97d4d0..0629a1697f 100644
--- a/core/ajax/share.php
+++ b/core/ajax/share.php
@@ -78,6 +78,10 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo
 				}
 				OC_JSON::success(array('data' => array('reshare' => $reshare, 'shares' => $shares)));
 			}
+			if (isset($_GET['itemType']) && isset($_GET['itemSource']) && isset($_GET['getPermissions'])) {
+				$info = OCP\Share::getItemSharedWithBySource($_GET['itemType'], $_GET['itemSource']);
+				OC_JSON::success(array('data' => array('info' => $info)));
+			}
 			break;
 		case 'getShareWith':
 			if (isset($_GET['search'])) {

From f2fd22880117cecc30d0df1d4d0f18214286133d Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Mon, 3 Sep 2012 02:47:04 +0200
Subject: [PATCH 1124/1224] Revert commit
 8cf0e853686a5c4f9f082d8e47832277f50ea6c0.

---
 core/ajax/share.php | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/core/ajax/share.php b/core/ajax/share.php
index 0629a1697f..3ace97d4d0 100644
--- a/core/ajax/share.php
+++ b/core/ajax/share.php
@@ -78,10 +78,6 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo
 				}
 				OC_JSON::success(array('data' => array('reshare' => $reshare, 'shares' => $shares)));
 			}
-			if (isset($_GET['itemType']) && isset($_GET['itemSource']) && isset($_GET['getPermissions'])) {
-				$info = OCP\Share::getItemSharedWithBySource($_GET['itemType'], $_GET['itemSource']);
-				OC_JSON::success(array('data' => array('info' => $info)));
-			}
 			break;
 		case 'getShareWith':
 			if (isset($_GET['search'])) {

From e2ead7db86f5d2a784b15f0ce2835e8e45fd21fa Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Wed, 5 Sep 2012 17:09:20 +0200
Subject: [PATCH 1125/1224] Changed oc_preferences configvalue back to clob as
 it will give us bug reports in calendar, contacts and tasks if less.

---
 db_structure.xml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/db_structure.xml b/db_structure.xml
index e42dc894e8..523329e66d 100644
--- a/db_structure.xml
+++ b/db_structure.xml
@@ -402,9 +402,8 @@
 
    <field>
     <name>configvalue</name>
-    <type>text</type>
-    <notnull>true</notnull>
-    <length>255</length>
+    <type>clob</type>
+    <notnull>false</notnull>
    </field>
 
   </declaration>

From a928b4cd6671aeeb4ad4488e814c1c4a6475b145 Mon Sep 17 00:00:00 2001
From: Brice Maron <brice@bmaron.net>
Date: Wed, 5 Sep 2012 16:16:19 +0000
Subject: [PATCH 1126/1224] Add more language name instead of codes for the
 setting choice

---
 settings/languageCodes.php | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/settings/languageCodes.php b/settings/languageCodes.php
index 621ee5ab55..6d3b6ebe63 100644
--- a/settings/languageCodes.php
+++ b/settings/languageCodes.php
@@ -14,10 +14,14 @@ return array(
 'en'=>'English',
 'es'=>'Español',
 'et_EE'=>'Eesti',
+'fa'=>'فارسى',
+'fi_FI'=>'Suomi',
 'fr'=>'Français',
+'hi'=>'हिन्दी',
 'id'=>'Bahasa Indonesia',
 'it'=>'Italiano',
 'lb'=>'Lëtzebuergesch',
+//'l10n-de'=>'',
 'ms_MY'=>'Bahasa Melayu',
 'nb_NO'=>'Norwegian Bokmål',
 'nl'=>'Nederlands',
@@ -42,4 +46,9 @@ return array(
 'ia'=>'Interlingua',
 'sl'=>'Slovenski',
 'nn_NO'=>'Nynorsk',
+'lv'=>'Latviešu',
+'mk'=>'македонски',
+'uk'=>'Українська',
+'vi'=>'tiếng việt',
+'zh_TW'=>'臺灣話',
 );

From aa8cee1afa3e1bacf195610b75dbfd1103bf48c3 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sun, 2 Sep 2012 15:12:03 +0200
Subject: [PATCH 1127/1224] I don't think this file was meant to be commited

---
 apps/files_external/tests/test.php | 6 ------
 1 file changed, 6 deletions(-)
 delete mode 100644 apps/files_external/tests/test.php

diff --git a/apps/files_external/tests/test.php b/apps/files_external/tests/test.php
deleted file mode 100644
index 5387279fb0..0000000000
--- a/apps/files_external/tests/test.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php
-require_once 'files_external/lib/config.php';
-echo "<pre>";
-print_r(OC_Mount_Config::getSystemMountPoints());
-echo "</pre>";
-// OC_Mount_Config::addMountPoint('Photos', 'OC_Filestorage_SWIFT', array('host' => 'gapinthecloud.com', 'user' => 'Gap', 'token' => '23423afdasFJEW22', 'secure' => 'true', 'root' => ''), OC_Mount_Config::MOUNT_TYPE_GROUP, 'admin', false);

From 9f1c76beef44fb841e6a4137c409ccb941c9236b Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sun, 2 Sep 2012 15:26:32 +0200
Subject: [PATCH 1128/1224] fix running test cases in multiply app dirs

---
 tests/index.php | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/tests/index.php b/tests/index.php
index 0be27ee3fd..032689970f 100644
--- a/tests/index.php
+++ b/tests/index.php
@@ -20,6 +20,8 @@
 *
 */
 
+//to run only specific tests, use the test parameter to specify an app or 'lib'. e.g. http://localhost/owncloud/tests/?test=user_external
+
 require_once '../lib/base.php';
 require_once 'simpletest/unit_tester.php';
 require_once 'simpletest/mock_objects.php';
@@ -49,7 +51,7 @@ if(OC::$CLI){
 $testSuite=new TestSuite($testSuiteName);
 
 //load core test cases
-loadTests(dirname(__FILE__), $testSuite, $test);
+loadTests(dirname(__FILE__), $testSuite, $test, 'lib');
 
 //load app test cases
 
@@ -59,8 +61,9 @@ loadTests(dirname(__FILE__), $testSuite, $test);
 
 $apps=OC_App::getEnabledApps();
 foreach($apps as $app){
-	if(is_dir(OC::$SERVERROOT.'/apps/'.$app.'/tests')){
-		loadTests(OC::$SERVERROOT.'/apps/'.$app.'/tests', $testSuite, $test);
+	$testDir=OC_App::getAppPath($app).'/tests';
+	if(is_dir($testDir)){
+		loadTests($testDir, $testSuite, $test, $app);
 	}
 }
 
@@ -70,15 +73,16 @@ if($testSuite->getSize()>0){
 }
 
 // helper below
-function loadTests($dir,$testSuite, $test){
+function loadTests($dir,$testSuite, $test, $app){
+	$root=($app=='lib')?OC::$SERVERROOT.'/tests/lib/':OC_App::getAppPath($app).'/tests/';
 	if($dh=opendir($dir)){
 		while($name=readdir($dh)){
 			if($name[0]!='.'){//no hidden files, '.' or '..'
 				$file=$dir.'/'.$name;
 				if(is_dir($file)){
-					loadTests($file, $testSuite, $test);
+					loadTests($file, $testSuite, $test, $app);
 				}elseif(substr($file,-4)=='.php' and $file!=__FILE__){
-					$name=getTestName($file);
+					$name=$app.'/'.getTestName($file,$root);
 					if($test===false or $test==$name or substr($name,0,strlen($test))==$test){
 						$extractor = new SimpleFileLoader();
 						$loadedSuite=$extractor->load($file);
@@ -91,8 +95,8 @@ function loadTests($dir,$testSuite, $test){
 	}
 }
 
-function getTestName($file){
+function getTestName($file,$root){
 // 	//TODO: get better test names
-	$file=substr($file,strlen(OC::$SERVERROOT));
+	$file=substr($file,strlen($root));
 	return substr($file,0,-4);//strip .php
 }

From 9329af921d6d9bf7861fe9f996562f17beecf6a2 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Wed, 5 Sep 2012 22:17:33 +0200
Subject: [PATCH 1129/1224] Add missing ; to js code

---
 apps/files/js/fileactions.js         |  8 ++++----
 apps/files/js/files.js               |  2 +-
 apps/files_encryption/js/settings.js |  4 ++--
 apps/files_external/js/dropbox.js    |  4 ++--
 apps/files_external/js/settings.js   |  4 ++--
 apps/files_versions/js/versions.js   |  4 ++--
 core/js/config.js                    |  2 +-
 core/js/js.js                        |  2 +-
 core/js/listview.js                  | 10 +++++-----
 core/js/setup.js                     |  4 ++--
 core/js/share.js                     |  2 +-
 settings/js/admin.js                 |  4 ++--
 settings/js/apps.js                  |  4 ++--
 settings/js/personal.js              |  2 +-
 14 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js
index f4e7b7723f..b7670fa225 100644
--- a/apps/files/js/fileactions.js
+++ b/apps/files/js/fileactions.js
@@ -143,7 +143,7 @@ var FileActions={
 	getCurrentPermissions:function() {
 		return FileActions.currentFile.parent().data('permissions');
 	}
-}
+};
 
 $(document).ready(function(){
 	if($('#allowZipDownload').val() == 1){
@@ -151,12 +151,12 @@ $(document).ready(function(){
 	} else {
 		var downloadScope = 'file';
 	}
-	FileActions.register(downloadScope,'Download', OC.PERMISSION_READ, function(){return OC.imagePath('core','actions/download')},function(filename){
+	FileActions.register(downloadScope,'Download', OC.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', OC.PERMISSION_DELETE, function(){return OC.imagePath('core','actions/delete')},function(filename){
+FileActions.register('all','Delete', OC.PERMISSION_DELETE, function(){return OC.imagePath('core','actions/delete');},function(filename){
 	if(Files.cancelUpload(filename)) {
 		if(filename.substr){
 			filename=[filename];
@@ -174,7 +174,7 @@ FileActions.register('all','Delete', OC.PERMISSION_DELETE, function(){return OC.
 	$('.tipsy').remove();
 });
 
-FileActions.register('all','Rename', OC.PERMISSION_UPDATE, function(){return OC.imagePath('core','actions/rename')},function(filename){
+FileActions.register('all','Rename', OC.PERMISSION_UPDATE, function(){return OC.imagePath('core','actions/rename');},function(filename){
 	FileList.rename(filename);
 });
 
diff --git a/apps/files/js/files.js b/apps/files/js/files.js
index 3d347c3f56..8229bfa24f 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -26,7 +26,7 @@ Files={
 		});
 		procesSelection();
 	}
-}
+};
 $(document).ready(function() {
 	$('#fileList tr').each(function(){
 		//little hack to set unescape filenames in attribute
diff --git a/apps/files_encryption/js/settings.js b/apps/files_encryption/js/settings.js
index a160b9e0e1..6fc70eba7f 100644
--- a/apps/files_encryption/js/settings.js
+++ b/apps/files_encryption/js/settings.js
@@ -20,5 +20,5 @@ $(document).ready(function(){
 	$('#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_external/js/dropbox.js b/apps/files_external/js/dropbox.js
index 92194792f4..dd3a1cb185 100644
--- a/apps/files_external/js/dropbox.js
+++ b/apps/files_external/js/dropbox.js
@@ -10,7 +10,7 @@ $(document).ready(function() {
 			var app_secret = $(this).find('.configuration [data-parameter="app_secret"]').val();
 			var config = $(this).find('.configuration');
 			if (app_key != '' && app_secret != '') {
-				var pos = window.location.search.indexOf('oauth_token') + 12
+				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"]');
@@ -73,7 +73,7 @@ $(document).ready(function() {
 				}
 			});
 		} else {
-			OC.dialogs.alert('Please provide a valid Dropbox app key and secret.', 'Error configuring Dropbox storage')
+			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 f346007090..89f346574e 100644
--- a/apps/files_external/js/settings.js
+++ b/apps/files_external/js/settings.js
@@ -66,7 +66,7 @@ OC.MountConfig={
 			return true;
 		}
 	}
-}
+};
 
 $(document).ready(function() {
 	$('.chzn-select').chosen();
@@ -179,4 +179,4 @@ $(document).ready(function() {
 		}
 	});
 
-});
\ No newline at end of file
+});
diff --git a/apps/files_versions/js/versions.js b/apps/files_versions/js/versions.js
index a9cf6171e4..1c8d083ea4 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', OC.PERMISSION_UPDATE, function(){return OC.imagePath('core','actions/history')},function(filename){
+		FileActions.register('file','History', OC.PERMISSION_UPDATE, function(){return OC.imagePath('core','actions/history');},function(filename){
 
 			if (scanFiles.scanning){return;}//workaround to prevent additional http request block scanning feedback
 
@@ -76,7 +76,7 @@ function createVersionsDropdown(filename, files) {
 			$('#found_versions').change(function(){
 				var revision=parseInt($(this).val());
 				revertFile(files,revision);
-			})
+			});
 		}
 	});
 
diff --git a/core/js/config.js b/core/js/config.js
index 11168f1c48..f7a29276f7 100644
--- a/core/js/config.js
+++ b/core/js/config.js
@@ -51,5 +51,5 @@ OC.AppConfig={
 	deleteApp:function(app){
 		OC.AppConfig.postCall('deleteApp',{app:app});
 	},
-}
+};
 //TODO OC.Preferences
diff --git a/core/js/js.js b/core/js/js.js
index 8b9ecd38dc..1bd650bb6b 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -208,7 +208,7 @@ OC={
 					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) {
diff --git a/core/js/listview.js b/core/js/listview.js
index e3e5ebdab8..3a713a6222 100644
--- a/core/js/listview.js
+++ b/core/js/listview.js
@@ -11,15 +11,15 @@ ListView.generateTable=function(collumns){
 	html+='<thead>';
 	html+='</head>';
 	html+='<tbody>';
-	html+'<tr class="template">'
+	html+'<tr class="template">';
 	$.each(collumns,function(index,collumn){
 		html+='<th class="'+collumn.toLower()+'"</th>';
 	});
-	html+'</tr>'
+	html+'</tr>';
 	html+='</tbody>';
 	html='</table>';
 	return $(html);
-}
+};
 
 ListView.prototype={
 	rows:{},
@@ -49,7 +49,7 @@ ListView.prototype={
 				var element=$(html);
 				element.append($('<img src="'+element.icon+'"/>'));
 				element.click(element.callback);
-				tr.children('td.'+collumn).append(element)
+				tr.children('td.'+collumn).append(element);
 			});
 		});
 		if(this.deleteCallback){
@@ -68,4 +68,4 @@ ListView.prototype={
 	empty:function(){
 		this.element.children('tr:not(.template)').remove();
 	}
-}
\ No newline at end of file
+};
diff --git a/core/js/setup.js b/core/js/setup.js
index 23c705a068..39fcf4a271 100644
--- a/core/js/setup.js
+++ b/core/js/setup.js
@@ -1,11 +1,11 @@
-var dbtypes
+var dbtypes;
 $(document).ready(function() {
 	dbtypes={
 		sqlite:!!$('#hasSQLite').val(),
 		mysql:!!$('#hasMySQL').val(),
 		postgresql:!!$('#hasPostgreSQL').val(),
 		oracle:!!$('#hasOracle').val(),
-	}
+	};
 	
 	$('#selectDbType').buttonset();
 	$('#datadirContent').hide(250);
diff --git a/core/js/share.js b/core/js/share.js
index e97302b0d5..b5e8b0e661 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -137,7 +137,7 @@ OC.Share={
 				html += '<input id="linkText" type="text" readonly="readonly" />';
 				html += '<div id="linkPass">';
 				html += '<input id="linkPassText" type="password" placeholder="Password" />';
-				html += '</div>'
+				html += '</div>';
 				html += '</div>';
 			}
 			html += '</div>';
diff --git a/settings/js/admin.js b/settings/js/admin.js
index 23f445b708..95b7a503c2 100644
--- a/settings/js/admin.js
+++ b/settings/js/admin.js
@@ -26,8 +26,8 @@ $(document).ready(function(){
 				var value = 'no';
 			}
 		} else {
-			var value = $(this).val()
+			var value = $(this).val();
 		}
 		OC.AppConfig.setValue('core', $(this).attr('name'), value);
 	});
-});
\ No newline at end of file
+});
diff --git a/settings/js/apps.js b/settings/js/apps.js
index f961248237..bb93123276 100644
--- a/settings/js/apps.js
+++ b/settings/js/apps.js
@@ -96,7 +96,7 @@ OC.Settings.Apps = OC.Settings.Apps || {
 		}
 		return app;
 	}
-}
+};
 
 $(document).ready(function(){
 	$('#leftcontent li').each(function(index,li){
@@ -106,7 +106,7 @@ $(document).ready(function(){
 	});
 	$('#leftcontent li').keydown(function(event) {
 		if (event.which == 13 || event.which == 32) {
-			$(event.target).click()
+			$(event.target).click();
 		}
 		return false;
 	});
diff --git a/settings/js/personal.js b/settings/js/personal.js
index 77d103c53b..a866e321ad 100644
--- a/settings/js/personal.js
+++ b/settings/js/personal.js
@@ -83,4 +83,4 @@ OC.msg={
 			$(selector).html( data.data.message ).addClass('error');
 		}
 	}
-}
+};

From a8de0af2732020e9f9d60dcf6a4571fe62e242de Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Wed, 5 Sep 2012 22:22:04 +0200
Subject: [PATCH 1130/1224] Add 'var' before some global js vars

---
 core/js/oc-dialogs.js     | 2 +-
 core/js/oc-vcategories.js | 2 +-
 settings/js/users.js      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/core/js/oc-dialogs.js b/core/js/oc-dialogs.js
index 0fa41696a1..4dd3c89c14 100644
--- a/core/js/oc-dialogs.js
+++ b/core/js/oc-dialogs.js
@@ -22,7 +22,7 @@
 /**
  * this class to ease the usage of jquery dialogs
  */
-OCdialogs = {
+var OCdialogs = {
 	/**
 	* displays alert dialog
 	* @param text content of dialog
diff --git a/core/js/oc-vcategories.js b/core/js/oc-vcategories.js
index dfed8223b1..c7b536a2a7 100644
--- a/core/js/oc-vcategories.js
+++ b/core/js/oc-vcategories.js
@@ -1,4 +1,4 @@
-OCCategories={
+var OCCategories={
 	edit:function(){
 		if(OCCategories.app == undefined) {
 			OC.dialogs.alert('OCCategories.app is not set!');
diff --git a/settings/js/users.js b/settings/js/users.js
index d0a3c1c21a..20bd94993b 100644
--- a/settings/js/users.js
+++ b/settings/js/users.js
@@ -4,7 +4,7 @@
  * See the COPYING-README file.
  */
 
-UserList={
+var UserList={
 	useUndo:true,
 	
 	/**

From e0db35fac0e1938a0337790162657b64143d87fd Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Wed, 5 Sep 2012 22:23:32 +0200
Subject: [PATCH 1131/1224] Fix name for OCCategories

---
 core/js/oc-vcategories.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/js/oc-vcategories.js b/core/js/oc-vcategories.js
index c7b536a2a7..c99dd51f53 100644
--- a/core/js/oc-vcategories.js
+++ b/core/js/oc-vcategories.js
@@ -95,7 +95,7 @@ var OCCategories={
 			}
 		}).error(function(xhr){
 			if (xhr.status == 404) {
-				OC.dialogs.alert('The required file ' + OC.filePath(Categories.app, 'ajax', 'categories/rescan.php') + ' is not installed!', 'Error');
+				OC.dialogs.alert('The required file ' + OC.filePath(OCCategories.app, 'ajax', 'categories/rescan.php') + ' is not installed!', 'Error');
 			}
 		});
 	},

From daf41885e5481b80b15b4b2987f071608b7ad235 Mon Sep 17 00:00:00 2001
From: Thomas Mueller <thomas.mueller@tmit.eu>
Date: Wed, 5 Sep 2012 22:53:48 +0200
Subject: [PATCH 1132/1224] jquery added to ignorelist for l10n

---
 core/l10n/ignorelist | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 core/l10n/ignorelist

diff --git a/core/l10n/ignorelist b/core/l10n/ignorelist
new file mode 100644
index 0000000000..a2b225cbe4
--- /dev/null
+++ b/core/l10n/ignorelist
@@ -0,0 +1 @@
+js/jquery-ui-1.8.16.custom.min.js

From ebb28412ca47889019aa4c0f278fe3b9097996f8 Mon Sep 17 00:00:00 2001
From: Thomas Mueller <thomas.mueller@tmit.eu>
Date: Wed, 5 Sep 2012 23:28:59 +0200
Subject: [PATCH 1133/1224] no more require_once()

---
 apps/files_encryption/lib/crypt.php  |  2 +-
 apps/files_external/lib/smb.php      |  2 +-
 apps/files_external/lib/swift.php    |  2 +-
 apps/files_versions/appinfo/app.php  |  2 +-
 apps/user_webdavauth/appinfo/app.php |  2 +-
 l10n/templates/core.pot              |  6 +---
 l10n/templates/files.pot             | 46 +++++++++++++++-------------
 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/lib.pot               |  2 +-
 l10n/templates/settings.pot          |  2 +-
 l10n/templates/user_ldap.pot         |  2 +-
 lib/MDB2/Driver/Datatype/sqlite3.php |  2 +-
 lib/MDB2/Driver/Function/sqlite3.php |  2 +-
 lib/MDB2/Driver/Manager/sqlite3.php  |  2 +-
 lib/MDB2/Driver/Reverse/sqlite3.php  |  2 +-
 lib/filesystem.php                   |  2 +-
 lib/mail.php                         |  2 +-
 lib/migrate.php                      |  4 +--
 lib/minimizer/css.php                |  2 +-
 lib/minimizer/js.php                 |  2 +-
 search/ajax/search.php               |  2 +-
 settings/admin.php                   |  2 +-
 settings/ajax/disableapp.php         |  2 +-
 settings/ajax/enableapp.php          |  2 +-
 settings/ajax/togglesubadmins.php    |  2 +-
 tests/lib/archive/tar.php            |  2 +-
 tests/lib/archive/zip.php            |  2 +-
 30 files changed, 55 insertions(+), 55 deletions(-)

diff --git a/apps/files_encryption/lib/crypt.php b/apps/files_encryption/lib/crypt.php
index 0770bca018..ebc09e7896 100644
--- a/apps/files_encryption/lib/crypt.php
+++ b/apps/files_encryption/lib/crypt.php
@@ -31,7 +31,7 @@
 //  - IMPORTANT! Check if the block lenght of the encrypted data stays the same
 
 
-require_once('Crypt_Blowfish/Blowfish.php');
+require_once 'Crypt_Blowfish/Blowfish.php';
 
 /**
  * This class is for crypting and decrypting
diff --git a/apps/files_external/lib/smb.php b/apps/files_external/lib/smb.php
index 8a5e993b1d..91c0f16c1f 100644
--- a/apps/files_external/lib/smb.php
+++ b/apps/files_external/lib/smb.php
@@ -6,7 +6,7 @@
  * See the COPYING-README file.
  */
 
-require_once('smb4php/smb.php');
+require_once 'smb4php/smb.php';
 
 class OC_FileStorage_SMB extends OC_FileStorage_StreamWrapper{
 	private $password;
diff --git a/apps/files_external/lib/swift.php b/apps/files_external/lib/swift.php
index 1868bc4ba7..9a4b5c6dd2 100644
--- a/apps/files_external/lib/swift.php
+++ b/apps/files_external/lib/swift.php
@@ -6,7 +6,7 @@
  * See the COPYING-README file.
  */
 
-require_once('php-cloudfiles/cloudfiles.php');
+require_once 'php-cloudfiles/cloudfiles.php';
 
 class OC_FileStorage_SWIFT extends OC_Filestorage_Common{
 	private $host;
diff --git a/apps/files_versions/appinfo/app.php b/apps/files_versions/appinfo/app.php
index 9ac7f6d5cd..746f89a813 100644
--- a/apps/files_versions/appinfo/app.php
+++ b/apps/files_versions/appinfo/app.php
@@ -1,6 +1,6 @@
 <?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';
 
diff --git a/apps/user_webdavauth/appinfo/app.php b/apps/user_webdavauth/appinfo/app.php
index ebadcf30b6..3ab323becc 100755
--- a/apps/user_webdavauth/appinfo/app.php
+++ b/apps/user_webdavauth/appinfo/app.php
@@ -21,7 +21,7 @@
 *
 */
 
-require_once('apps/user_webdavauth/user_webdavauth.php');
+require_once 'apps/user_webdavauth/user_webdavauth.php';
 
 OC_APP::registerAdmin('user_webdavauth','settings');
 
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index 329879e864..d59cc85eb8 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-09-05 02:01+0200\n"
+"POT-Creation-Date: 2012-09-05 22:51+0200\n"
 "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,10 +29,6 @@ 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:208 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr ""
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index 9d519c1a51..44a43dfd40 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-09-05 02:01+0200\n"
+"POT-Creation-Date: 2012-09-05 22:50+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -55,31 +55,35 @@ msgstr ""
 msgid "Delete"
 msgstr ""
 
-#: js/filelist.js:141
+#: js/filelist.js:186 js/filelist.js:188
 msgid "already exists"
 msgstr ""
 
-#: js/filelist.js:141
+#: js/filelist.js:186 js/filelist.js:188
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:141
+#: js/filelist.js:186
+msgid "suggest name"
+msgstr ""
+
+#: js/filelist.js:186 js/filelist.js:188
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:195
+#: js/filelist.js:235 js/filelist.js:237
 msgid "replaced"
 msgstr ""
 
-#: js/filelist.js:195
-msgid "with"
-msgstr ""
-
-#: js/filelist.js:195 js/filelist.js:246
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:246
+#: js/filelist.js:237
+msgid "with"
+msgstr ""
+
+#: js/filelist.js:271
 msgid "deleted"
 msgstr ""
 
@@ -95,44 +99,44 @@ msgstr ""
 msgid "Upload Error"
 msgstr ""
 
-#: js/files.js:236 js/files.js:327 js/files.js:356
+#: js/files.js:236 js/files.js:341 js/files.js:370
 msgid "Pending"
 msgstr ""
 
-#: js/files.js:341
+#: js/files.js:355
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:409
+#: js/files.js:423
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:480
+#: js/files.js:493
 msgid "Invalid name, '/' is not allowed."
 msgstr ""
 
-#: js/files.js:726 templates/index.php:55
+#: js/files.js:746 templates/index.php:55
 msgid "Size"
 msgstr ""
 
-#: js/files.js:727 templates/index.php:56
+#: js/files.js:747 templates/index.php:56
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:754
+#: js/files.js:774
 msgid "folder"
 msgstr ""
 
-#: js/files.js:756
+#: js/files.js:776
 msgid "folders"
 msgstr ""
 
-#: js/files.js:764
+#: js/files.js:784
 msgid "file"
 msgstr ""
 
-#: js/files.js:766
+#: js/files.js:786
 msgid "files"
 msgstr ""
 
diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot
index 460fd2df78..99b6ae69c3 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-09-05 02:01+0200\n"
+"POT-Creation-Date: 2012-09-05 22:50+0200\n"
 "PO-Revision-Date: YEAR-MO-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 de03296ccb..adca26e6ea 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-09-05 02:01+0200\n"
+"POT-Creation-Date: 2012-09-05 22:50+0200\n"
 "PO-Revision-Date: YEAR-MO-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 e1ab849fe3..160cb143db 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-09-05 02:01+0200\n"
+"POT-Creation-Date: 2012-09-05 22:50+0200\n"
 "PO-Revision-Date: YEAR-MO-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 61a011e4e3..be0aedd0b8 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-09-05 02:01+0200\n"
+"POT-Creation-Date: 2012-09-05 22:50+0200\n"
 "PO-Revision-Date: YEAR-MO-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 82f5c27fdd..cfbef6875d 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-09-05 02:01+0200\n"
+"POT-Creation-Date: 2012-09-05 22:51+0200\n"
 "PO-Revision-Date: YEAR-MO-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 7c8028eff7..f506265f12 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-09-05 02:02+0200\n"
+"POT-Creation-Date: 2012-09-05 22:51+0200\n"
 "PO-Revision-Date: YEAR-MO-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 b33a2245ac..403d1173b3 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-09-05 02:01+0200\n"
+"POT-Creation-Date: 2012-09-05 22:50+0200\n"
 "PO-Revision-Date: 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/MDB2/Driver/Datatype/sqlite3.php b/lib/MDB2/Driver/Datatype/sqlite3.php
index 66c68b9377..673706e518 100644
--- a/lib/MDB2/Driver/Datatype/sqlite3.php
+++ b/lib/MDB2/Driver/Datatype/sqlite3.php
@@ -20,7 +20,7 @@
  *
  */
 
-require_once('MDB2/Driver/Datatype/Common.php');
+require_once 'MDB2/Driver/Datatype/Common.php';
 
 /**
  * MDB2 SQLite driver
diff --git a/lib/MDB2/Driver/Function/sqlite3.php b/lib/MDB2/Driver/Function/sqlite3.php
index 790bd0e747..235a106e18 100644
--- a/lib/MDB2/Driver/Function/sqlite3.php
+++ b/lib/MDB2/Driver/Function/sqlite3.php
@@ -20,7 +20,7 @@
  *
  */
 
-require_once('MDB2/Driver/Function/Common.php');
+require_once 'MDB2/Driver/Function/Common.php';
 
 /**
  * MDB2 SQLite driver for the function modules
diff --git a/lib/MDB2/Driver/Manager/sqlite3.php b/lib/MDB2/Driver/Manager/sqlite3.php
index 10255a3619..0101f8ee2a 100644
--- a/lib/MDB2/Driver/Manager/sqlite3.php
+++ b/lib/MDB2/Driver/Manager/sqlite3.php
@@ -20,7 +20,7 @@
  *
  */
 
-require_once('MDB2/Driver/Manager/Common.php');
+require_once 'MDB2/Driver/Manager/Common.php';
 
 /**
  * MDB2 SQLite driver for the management modules
diff --git a/lib/MDB2/Driver/Reverse/sqlite3.php b/lib/MDB2/Driver/Reverse/sqlite3.php
index e5c758e350..36626478ce 100644
--- a/lib/MDB2/Driver/Reverse/sqlite3.php
+++ b/lib/MDB2/Driver/Reverse/sqlite3.php
@@ -20,7 +20,7 @@
  *
  */
 
-require_once('MDB2/Driver/Reverse/Common.php');
+require_once 'MDB2/Driver/Reverse/Common.php';
 
 /**
  * MDB2 SQlite driver for the schema reverse engineering module
diff --git a/lib/filesystem.php b/lib/filesystem.php
index 327329f9d9..c69970467f 100644
--- a/lib/filesystem.php
+++ b/lib/filesystem.php
@@ -559,4 +559,4 @@ 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');
+require_once 'filecache.php';
diff --git a/lib/mail.php b/lib/mail.php
index fc9aebfda3..15e91158e1 100644
--- a/lib/mail.php
+++ b/lib/mail.php
@@ -12,7 +12,7 @@
  * A class to handle mail sending.
  */
 
-require_once('class.phpmailer.php');
+require_once 'class.phpmailer.php';
 
 class OC_Mail {
 
diff --git a/lib/migrate.php b/lib/migrate.php
index 7d7169c4e4..b3ef00cbf6 100644
--- a/lib/migrate.php
+++ b/lib/migrate.php
@@ -376,7 +376,7 @@ class OC_Migrate{
 
 		// Connect if this did not happen before
 		if( !self::$schema ){
-			require_once('MDB2/Schema.php');
+			require_once 'MDB2/Schema.php';
 			self::$schema=MDB2_Schema::factory( self::$MDB2 );
 		}
 
@@ -471,7 +471,7 @@ class OC_Migrate{
 		}
 		// Already connected
 		if(!self::$MDB2){
-			require_once('MDB2.php');
+			require_once 'MDB2.php';
 
 			$datadir = OC_Config::getValue( "datadirectory", OC::$SERVERROOT."/data" );
 
diff --git a/lib/minimizer/css.php b/lib/minimizer/css.php
index 110935ea3b..0f1435fde4 100644
--- a/lib/minimizer/css.php
+++ b/lib/minimizer/css.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once('mediawiki/CSSMin.php');
+require_once 'mediawiki/CSSMin.php';
 
 class OC_Minimizer_CSS extends OC_Minimizer
 {
diff --git a/lib/minimizer/js.php b/lib/minimizer/js.php
index 0f5cb7e557..97d54c8fb9 100644
--- a/lib/minimizer/js.php
+++ b/lib/minimizer/js.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once('mediawiki/JavaScriptMinifier.php');
+require_once 'mediawiki/JavaScriptMinifier.php';
 
 class OC_Minimizer_JS extends OC_Minimizer
 {
diff --git a/search/ajax/search.php b/search/ajax/search.php
index 95ddfedf8b..b524993d24 100644
--- a/search/ajax/search.php
+++ b/search/ajax/search.php
@@ -23,7 +23,7 @@
 
 
 // Init owncloud
-require_once('../../lib/base.php');
+require_once '../../lib/base.php';
 
 // Check if we are a user
 OC_JSON::checkLoggedIn();
diff --git a/settings/admin.php b/settings/admin.php
index 8788de940b..351c8a3fff 100755
--- a/settings/admin.php
+++ b/settings/admin.php
@@ -5,7 +5,7 @@
  * See the COPYING-README file.
  */
 
-require_once('../lib/base.php');
+require_once '../lib/base.php';
 OC_Util::checkAdminUser();
 
 OC_Util::addStyle( "settings", "settings" );
diff --git a/settings/ajax/disableapp.php b/settings/ajax/disableapp.php
index cc00698870..977a536af2 100644
--- a/settings/ajax/disableapp.php
+++ b/settings/ajax/disableapp.php
@@ -1,6 +1,6 @@
 <?php
 // Init owncloud
-require_once('../../lib/base.php');
+require_once '../../lib/base.php';
 OC_JSON::checkAdminUser();
 OCP\JSON::callCheck();
 OC_JSON::setContentTypeHeader();
diff --git a/settings/ajax/enableapp.php b/settings/ajax/enableapp.php
index fe3922fa02..b9cf6a1367 100644
--- a/settings/ajax/enableapp.php
+++ b/settings/ajax/enableapp.php
@@ -1,7 +1,7 @@
 <?php
 
 // Init owncloud
-require_once('../../lib/base.php');
+require_once '../../lib/base.php';
 OC_JSON::checkAdminUser();
 OCP\JSON::callCheck();
 OC_JSON::setContentTypeHeader();
diff --git a/settings/ajax/togglesubadmins.php b/settings/ajax/togglesubadmins.php
index 42db845030..82bb6ac45f 100644
--- a/settings/ajax/togglesubadmins.php
+++ b/settings/ajax/togglesubadmins.php
@@ -1,7 +1,7 @@
 <?php
 
 // Init owncloud
-require_once('../../lib/base.php');
+require_once '../../lib/base.php';
 
 OC_JSON::checkAdminUser();
 OCP\JSON::callCheck();
diff --git a/tests/lib/archive/tar.php b/tests/lib/archive/tar.php
index c138a51a65..22481f1a54 100644
--- a/tests/lib/archive/tar.php
+++ b/tests/lib/archive/tar.php
@@ -6,7 +6,7 @@
  * See the COPYING-README file.
  */
 
-require_once('archive.php');
+require_once 'archive.php';
 
 if(is_dir(OC::$SERVERROOT.'/apps/files_archive/tests/data')){
 	class Test_Archive_TAR extends Test_Archive{
diff --git a/tests/lib/archive/zip.php b/tests/lib/archive/zip.php
index 615c9e3c7e..b61d8aeac2 100644
--- a/tests/lib/archive/zip.php
+++ b/tests/lib/archive/zip.php
@@ -6,7 +6,7 @@
  * See the COPYING-README file.
  */
 
-require_once('archive.php');
+require_once 'archive.php';
 
 if(is_dir(OC::$SERVERROOT.'/apps/files_archive/tests/data')){
 	class Test_Archive_ZIP extends Test_Archive{

From af3e7674898251f27cc5ec4fe5337583a1eb2398 Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <thomas.mueller@tmit.eu>
Date: Thu, 6 Sep 2012 02:06:37 +0200
Subject: [PATCH 1134/1224] [tx-robot] updated from transifex

---
 apps/files/l10n/ca.php               |   3 +-
 apps/files/l10n/cs_CZ.php            |  58 +++++++-------
 apps/files/l10n/da.php               |   2 +-
 apps/files/l10n/de.php               |   3 +-
 apps/files/l10n/el.php               |   2 +-
 apps/files/l10n/eo.php               |   2 +-
 apps/files/l10n/es.php               |   3 +-
 apps/files/l10n/et_EE.php            |   2 +-
 apps/files/l10n/eu.php               |   2 +-
 apps/files/l10n/fa.php               |   2 +-
 apps/files/l10n/fi_FI.php            |   3 +-
 apps/files/l10n/fr.php               |   3 +-
 apps/files/l10n/gl.php               |   2 +-
 apps/files/l10n/hr.php               |   2 +-
 apps/files/l10n/hu_HU.php            |   2 +-
 apps/files/l10n/id.php               |   2 +-
 apps/files/l10n/it.php               |   3 +-
 apps/files/l10n/ja_JP.php            |   3 +-
 apps/files/l10n/ko.php               |   2 +-
 apps/files/l10n/lb.php               |   2 +-
 apps/files/l10n/lv.php               |   2 +-
 apps/files/l10n/nb_NO.php            |   2 +-
 apps/files/l10n/nl.php               |   4 +-
 apps/files/l10n/pl.php               |   3 +-
 apps/files/l10n/pt_BR.php            |   2 +-
 apps/files/l10n/pt_PT.php            |   2 +-
 apps/files/l10n/ru.php               |   2 +-
 apps/files/l10n/sl.php               |   3 +-
 apps/files/l10n/sv.php               |   3 +-
 apps/files/l10n/th_TH.php            |   3 +-
 apps/files/l10n/tr.php               |   2 +-
 apps/files/l10n/zh_CN.GB2312.php     |   2 +-
 apps/files/l10n/zh_CN.php            |   2 +-
 apps/files_encryption/l10n/cs_CZ.php |   8 +-
 apps/files_encryption/l10n/sk_SK.php |   6 ++
 apps/files_external/l10n/cs_CZ.php   |  16 ++--
 apps/files_external/l10n/fi_FI.php   |   2 +
 apps/files_sharing/l10n/cs_CZ.php    |   5 +-
 apps/files_sharing/l10n/nl.php       |   3 +-
 apps/files_versions/l10n/cs_CZ.php   |   4 +-
 apps/user_ldap/l10n/cs_CZ.php        |  46 +++++------
 apps/user_ldap/l10n/fi_FI.php        |   6 ++
 core/l10n/ca.php                     |   1 -
 core/l10n/cs_CZ.php                  |  38 +++++-----
 core/l10n/da.php                     |   1 -
 core/l10n/de.php                     |   1 -
 core/l10n/el.php                     |   1 -
 core/l10n/eo.php                     |   1 -
 core/l10n/es.php                     |   1 -
 core/l10n/et_EE.php                  |   1 -
 core/l10n/eu.php                     |   1 -
 core/l10n/fa.php                     |   1 -
 core/l10n/fi_FI.php                  |   1 -
 core/l10n/fr.php                     |   1 -
 core/l10n/gl.php                     |   1 -
 core/l10n/hr.php                     |   1 -
 core/l10n/hu_HU.php                  |   1 -
 core/l10n/it.php                     |   1 -
 core/l10n/ja_JP.php                  |   1 -
 core/l10n/ko.php                     |   1 -
 core/l10n/lt_LT.php                  |   1 -
 core/l10n/mk.php                     |   1 -
 core/l10n/ms_MY.php                  |   1 -
 core/l10n/nb_NO.php                  |   1 -
 core/l10n/nl.php                     |   2 +-
 core/l10n/pl.php                     |   1 -
 core/l10n/pt_BR.php                  |   1 -
 core/l10n/pt_PT.php                  |   1 -
 core/l10n/ru.php                     |   1 -
 core/l10n/sk_SK.php                  |   1 -
 core/l10n/sl.php                     |   1 -
 core/l10n/sv.php                     |   1 -
 core/l10n/th_TH.php                  |   1 -
 core/l10n/tr.php                     |   1 -
 core/l10n/vi.php                     |   1 -
 core/l10n/zh_CN.GB2312.php           |   1 -
 core/l10n/zh_TW.php                  |   1 -
 l10n/af/core.po                      |  38 +++++-----
 l10n/af/files.po                     |  48 ++++++------
 l10n/ar/core.po                      |  38 +++++-----
 l10n/ar/files.po                     |  48 ++++++------
 l10n/ar_SA/core.po                   |  38 +++++-----
 l10n/ar_SA/files.po                  |  48 ++++++------
 l10n/bg_BG/core.po                   |  38 +++++-----
 l10n/bg_BG/files.po                  |  48 ++++++------
 l10n/ca/core.po                      |  40 +++++-----
 l10n/ca/files.po                     |  51 +++++++------
 l10n/ca/settings.po                  |  13 ++--
 l10n/cs_CZ/core.po                   |  79 ++++++++++---------
 l10n/cs_CZ/files.po                  | 109 ++++++++++++++-------------
 l10n/cs_CZ/files_encryption.po       |  17 +++--
 l10n/cs_CZ/files_external.po         |  25 +++---
 l10n/cs_CZ/files_sharing.po          |  19 ++---
 l10n/cs_CZ/files_versions.po         |  15 ++--
 l10n/cs_CZ/lib.po                    |  45 +++++------
 l10n/cs_CZ/settings.po               |  87 ++++++++++-----------
 l10n/cs_CZ/user_ldap.po              |  55 +++++++-------
 l10n/da/core.po                      |  40 +++++-----
 l10n/da/files.po                     |  48 ++++++------
 l10n/de/core.po                      |  40 +++++-----
 l10n/de/files.po                     |  50 ++++++------
 l10n/de/settings.po                  |  10 +--
 l10n/el/core.po                      |  38 +++++-----
 l10n/el/files.po                     |  48 ++++++------
 l10n/eo/core.po                      |  38 +++++-----
 l10n/eo/files.po                     |  48 ++++++------
 l10n/es/core.po                      |  40 +++++-----
 l10n/es/files.po                     |  50 ++++++------
 l10n/es/settings.po                  |  12 +--
 l10n/et_EE/core.po                   |  38 +++++-----
 l10n/et_EE/files.po                  |  48 ++++++------
 l10n/eu/core.po                      |  38 +++++-----
 l10n/eu/files.po                     |  48 ++++++------
 l10n/eu_ES/core.po                   |  38 +++++-----
 l10n/eu_ES/files.po                  |  48 ++++++------
 l10n/fa/core.po                      |  38 +++++-----
 l10n/fa/files.po                     |  48 ++++++------
 l10n/fi/core.po                      |  38 +++++-----
 l10n/fi/files.po                     |  48 ++++++------
 l10n/fi_FI/core.po                   |  38 +++++-----
 l10n/fi_FI/files.po                  |  50 ++++++------
 l10n/fi_FI/files_external.po         |  13 ++--
 l10n/fi_FI/settings.po               |  12 +--
 l10n/fi_FI/user_ldap.po              |  19 ++---
 l10n/fr/core.po                      |  40 +++++-----
 l10n/fr/files.po                     |  51 +++++++------
 l10n/fr/settings.po                  |  13 ++--
 l10n/gl/core.po                      |  38 +++++-----
 l10n/gl/files.po                     |  48 ++++++------
 l10n/he/core.po                      |  38 +++++-----
 l10n/he/files.po                     |  48 ++++++------
 l10n/hi/core.po                      |  38 +++++-----
 l10n/hi/files.po                     |  48 ++++++------
 l10n/hr/core.po                      |  38 +++++-----
 l10n/hr/files.po                     |  48 ++++++------
 l10n/hu_HU/core.po                   |  38 +++++-----
 l10n/hu_HU/files.po                  |  48 ++++++------
 l10n/hy/core.po                      |  38 +++++-----
 l10n/hy/files.po                     |  48 ++++++------
 l10n/ia/core.po                      |  38 +++++-----
 l10n/ia/files.po                     |  48 ++++++------
 l10n/id/core.po                      |  38 +++++-----
 l10n/id/files.po                     |  48 ++++++------
 l10n/id_ID/core.po                   |  38 +++++-----
 l10n/id_ID/files.po                  |  48 ++++++------
 l10n/it/core.po                      |  40 +++++-----
 l10n/it/files.po                     |  50 ++++++------
 l10n/it/settings.po                  |  12 +--
 l10n/ja_JP/core.po                   |  40 +++++-----
 l10n/ja_JP/files.po                  |  50 ++++++------
 l10n/ja_JP/settings.po               |  20 ++---
 l10n/ko/core.po                      |  38 +++++-----
 l10n/ko/files.po                     |  48 ++++++------
 l10n/lb/core.po                      |  38 +++++-----
 l10n/lb/files.po                     |  48 ++++++------
 l10n/lt_LT/core.po                   |  38 +++++-----
 l10n/lt_LT/files.po                  |  48 ++++++------
 l10n/lv/core.po                      |  38 +++++-----
 l10n/lv/files.po                     |  48 ++++++------
 l10n/mk/core.po                      |  38 +++++-----
 l10n/mk/files.po                     |  48 ++++++------
 l10n/ms_MY/core.po                   |  38 +++++-----
 l10n/ms_MY/files.po                  |  48 ++++++------
 l10n/nb_NO/core.po                   |  38 +++++-----
 l10n/nb_NO/files.po                  |  48 ++++++------
 l10n/nl/core.po                      |  43 +++++------
 l10n/nl/files.po                     |  53 +++++++------
 l10n/nl/files_sharing.po             |  15 ++--
 l10n/nl/settings.po                  |  23 +++---
 l10n/nn_NO/core.po                   |  38 +++++-----
 l10n/nn_NO/files.po                  |  48 ++++++------
 l10n/pl/core.po                      |  38 +++++-----
 l10n/pl/files.po                     |  51 +++++++------
 l10n/pl/settings.po                  |  25 +++---
 l10n/pl_PL/core.po                   |  38 +++++-----
 l10n/pl_PL/files.po                  |  48 ++++++------
 l10n/pt_BR/core.po                   |  38 +++++-----
 l10n/pt_BR/files.po                  |  48 ++++++------
 l10n/pt_PT/core.po                   |  38 +++++-----
 l10n/pt_PT/files.po                  |  48 ++++++------
 l10n/ro/core.po                      |  38 +++++-----
 l10n/ro/files.po                     |  48 ++++++------
 l10n/ru/core.po                      |  38 +++++-----
 l10n/ru/files.po                     |  48 ++++++------
 l10n/ru_RU/core.po                   |  38 +++++-----
 l10n/ru_RU/files.po                  |  48 ++++++------
 l10n/sk_SK/core.po                   |  38 +++++-----
 l10n/sk_SK/files.po                  |  48 ++++++------
 l10n/sk_SK/files_encryption.po       |  17 +++--
 l10n/sl/core.po                      |  40 +++++-----
 l10n/sl/files.po                     |  50 ++++++------
 l10n/sl/settings.po                  |  12 +--
 l10n/so/core.po                      |  38 +++++-----
 l10n/so/files.po                     |  48 ++++++------
 l10n/sr/core.po                      |  38 +++++-----
 l10n/sr/files.po                     |  48 ++++++------
 l10n/sr@latin/core.po                |  38 +++++-----
 l10n/sr@latin/files.po               |  48 ++++++------
 l10n/sv/core.po                      |  40 +++++-----
 l10n/sv/files.po                     |  50 ++++++------
 l10n/sv/settings.po                  |  20 ++---
 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/lib.pot               |   2 +-
 l10n/templates/settings.pot          |   2 +-
 l10n/templates/user_ldap.pot         |   2 +-
 l10n/th_TH/core.po                   |  40 +++++-----
 l10n/th_TH/files.po                  |  50 ++++++------
 l10n/th_TH/settings.po               |  20 ++---
 l10n/tr/core.po                      |  40 +++++-----
 l10n/tr/files.po                     |  48 ++++++------
 l10n/uk/core.po                      |  38 +++++-----
 l10n/uk/files.po                     |  48 ++++++------
 l10n/vi/core.po                      |  38 +++++-----
 l10n/vi/files.po                     |  48 ++++++------
 l10n/zh_CN.GB2312/core.po            |  38 +++++-----
 l10n/zh_CN.GB2312/files.po           |  48 ++++++------
 l10n/zh_CN/core.po                   |  38 +++++-----
 l10n/zh_CN/files.po                  |  48 ++++++------
 l10n/zh_TW/core.po                   |  40 +++++-----
 l10n/zh_TW/files.po                  |  48 ++++++------
 lib/l10n/cs_CZ.php                   |  15 ++--
 settings/l10n/ca.php                 |   3 +
 settings/l10n/cs_CZ.php              |  60 +++++++++------
 settings/l10n/de.php                 |   3 +
 settings/l10n/es.php                 |   3 +
 settings/l10n/fi_FI.php              |   3 +
 settings/l10n/fr.php                 |   3 +
 settings/l10n/it.php                 |   3 +
 settings/l10n/ja_JP.php              |   7 ++
 settings/l10n/nl.php                 |   8 ++
 settings/l10n/pl.php                 |   9 +++
 settings/l10n/sl.php                 |   3 +
 settings/l10n/sv.php                 |   7 ++
 settings/l10n/th_TH.php              |   7 ++
 239 files changed, 3114 insertions(+), 3010 deletions(-)
 create mode 100644 apps/files_encryption/l10n/sk_SK.php

diff --git a/apps/files/l10n/ca.php b/apps/files/l10n/ca.php
index d887c8a952..6d232f217e 100644
--- a/apps/files/l10n/ca.php
+++ b/apps/files/l10n/ca.php
@@ -12,8 +12,8 @@
 "replace" => "substitueix",
 "cancel" => "cancel·la",
 "replaced" => "substituït",
-"with" => "per",
 "undo" => "desfés",
+"with" => "per",
 "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",
@@ -35,6 +35,7 @@
 "Enable ZIP-download" => "Activa la baixada ZIP",
 "0 is unlimited" => "0 és sense límit",
 "Maximum input size for ZIP files" => "Mida màxima d'entrada per fitxers ZIP",
+"Save" => "Desar",
 "New" => "Nou",
 "Text file" => "Fitxer de text",
 "Folder" => "Carpeta",
diff --git a/apps/files/l10n/cs_CZ.php b/apps/files/l10n/cs_CZ.php
index 4dc4b8b0cb..228f6a3898 100644
--- a/apps/files/l10n/cs_CZ.php
+++ b/apps/files/l10n/cs_CZ.php
@@ -1,51 +1,53 @@
 <?php $TRANSLATIONS = array(
 "There is no error, the file uploaded with success" => "Soubor byl odeslán úspěšně",
-"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Odeslaný soubor přesáhl velikostí parametr upload_max_filesize v php.ini",
-"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Odeslaný soubor přesáhl velikostí parametr MAX_FILE_SIZE specifikovaný v HTML formuláři",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Odeslaný soubor přesáhl svou velikostí parametr upload_max_filesize v php.ini",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Odeslaný soubor přesáhl svou velikostí parametr MAX_FILE_SIZE specifikovaný v formuláři HTML",
 "The uploaded file was only partially uploaded" => "Soubor byl odeslán pouze částečně",
-"No file was uploaded" => "Soubor nebyl odeslán",
-"Missing a temporary folder" => "Chybí adresář pro sočasné soubory",
-"Failed to write to disk" => "Zápis na disk se nezdařil",
+"No file was uploaded" => "Žádný soubor nebyl odeslán",
+"Missing a temporary folder" => "Chybí adresář pro dočasné soubory",
+"Failed to write to disk" => "Zápis na disk selhal",
 "Files" => "Soubory",
-"Delete" => "Vymazat",
+"Delete" => "Smazat",
 "already exists" => "již existuje",
-"replace" => "zaměnit",
-"cancel" => "storno",
-"replaced" => "zaměněno",
-"with" => "s",
+"replace" => "nahradit",
+"cancel" => "zrušit",
+"replaced" => "nahrazeno",
 "undo" => "zpět",
+"with" => "s",
 "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í",
-"Pending" => "Očekává se",
-"Upload cancelled." => "Nahrávání zrušeno",
-"Invalid name, '/' is not allowed." => "Špatné jméno, znak '/' není povolen",
+"generating ZIP-file, it may take some time." => "generuji ZIP soubor, může to nějakou dobu trvat.",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Nelze odeslat Váš soubor, protože je to adresář nebo má velikost 0 bajtů",
+"Upload Error" => "Chyba odesílání",
+"Pending" => "Čekající",
+"Upload cancelled." => "Odesílání zrušeno.",
+"File upload is in progress. Leaving the page now will cancel the upload." => "Probíhá odesílání souboru. Opuštění stránky vyústí ve zrušení nahrávání.",
+"Invalid name, '/' is not allowed." => "Neplatný název, znak '/' není povolen",
 "Size" => "Velikost",
 "Modified" => "Změněno",
-"folder" => "adresář",
-"folders" => "adresáře",
+"folder" => "složka",
+"folders" => "složky",
 "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á:",
-"Needed for multi-file and folder downloads." => "Potřeba pro vícesoborvé stahování a stahování adresářů",
+"File handling" => "Zacházení se soubory",
+"Maximum upload size" => "Maximální velikost pro odesílání",
+"max. possible: " => "největší možná: ",
+"Needed for multi-file and folder downloads." => "Potřebné pro více-souborové stahování a stahování složek.",
 "Enable ZIP-download" => "Povolit ZIP-stahování",
 "0 is unlimited" => "0 znamená bez omezení",
 "Maximum input size for ZIP files" => "Maximální velikost vstupu pro ZIP soubory",
+"Save" => "Uložit",
 "New" => "Nový",
 "Text file" => "Textový soubor",
-"Folder" => "Adresář",
+"Folder" => "Složka",
 "From url" => "Z url",
-"Upload" => "Uložit",
-"Cancel upload" => "Zrušit upload",
-"Nothing in here. Upload something!" => "Žádný obsah. Uložte si něco!",
+"Upload" => "Odeslat",
+"Cancel upload" => "Zrušit odesílání",
+"Nothing in here. Upload something!" => "Žádný obsah. Nahrajte něco.",
 "Name" => "Název",
 "Share" => "Sdílet",
 "Download" => "Stáhnout",
-"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.",
+"Upload too large" => "Odeslaný soubor je příliš velký",
+"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Soubory, které se snažíte odeslat, překračují limit velikosti odesílání na tomto serveru.",
 "Files are being scanned, please wait." => "Soubory se prohledávají, prosím čekejte.",
 "Current scanning" => "Aktuální prohledávání"
 );
diff --git a/apps/files/l10n/da.php b/apps/files/l10n/da.php
index a842088e7b..020f6142ec 100644
--- a/apps/files/l10n/da.php
+++ b/apps/files/l10n/da.php
@@ -12,8 +12,8 @@
 "replace" => "erstat",
 "cancel" => "fortryd",
 "replaced" => "erstattet",
-"with" => "med",
 "undo" => "fortryd",
+"with" => "med",
 "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",
diff --git a/apps/files/l10n/de.php b/apps/files/l10n/de.php
index 7a3e61f9be..a267d31009 100644
--- a/apps/files/l10n/de.php
+++ b/apps/files/l10n/de.php
@@ -12,8 +12,8 @@
 "replace" => "ersetzen",
 "cancel" => "abbrechen",
 "replaced" => "ersetzt",
-"with" => "mit",
 "undo" => "rückgängig machen",
+"with" => "mit",
 "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" => "Ihre Datei kann nicht hochgeladen werden, da sie ein Verzeichnis ist oder 0 Bytes hat.",
@@ -35,6 +35,7 @@
 "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",
+"Save" => "Speichern",
 "New" => "Neu",
 "Text file" => "Textdatei",
 "Folder" => "Ordner",
diff --git a/apps/files/l10n/el.php b/apps/files/l10n/el.php
index 3ab4b12094..9f311c6b28 100644
--- a/apps/files/l10n/el.php
+++ b/apps/files/l10n/el.php
@@ -12,8 +12,8 @@
 "replace" => "αντικατέστησε",
 "cancel" => "ακύρωση",
 "replaced" => "αντικαταστάθηκε",
-"with" => "με",
 "undo" => "αναίρεση",
+"with" => "με",
 "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",
diff --git a/apps/files/l10n/eo.php b/apps/files/l10n/eo.php
index acaf06e830..bf17b97244 100644
--- a/apps/files/l10n/eo.php
+++ b/apps/files/l10n/eo.php
@@ -12,8 +12,8 @@
 "replace" => "anstataŭigi",
 "cancel" => "nuligi",
 "replaced" => "anstataŭigita",
-"with" => "kun",
 "undo" => "malfari",
+"with" => "kun",
 "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",
diff --git a/apps/files/l10n/es.php b/apps/files/l10n/es.php
index 8e17b7931b..c998c8cb57 100644
--- a/apps/files/l10n/es.php
+++ b/apps/files/l10n/es.php
@@ -12,8 +12,8 @@
 "replace" => "reemplazar",
 "cancel" => "cancelar",
 "replaced" => "reemplazado",
-"with" => "con",
 "undo" => "deshacer",
+"with" => "con",
 "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",
@@ -35,6 +35,7 @@
 "Enable ZIP-download" => "Habilitar descarga en ZIP",
 "0 is unlimited" => "0 es ilimitado",
 "Maximum input size for ZIP files" => "Tamaño máximo para archivos ZIP de entrada",
+"Save" => "Guardar",
 "New" => "Nuevo",
 "Text file" => "Archivo de texto",
 "Folder" => "Carpeta",
diff --git a/apps/files/l10n/et_EE.php b/apps/files/l10n/et_EE.php
index 956c5cc911..0763745788 100644
--- a/apps/files/l10n/et_EE.php
+++ b/apps/files/l10n/et_EE.php
@@ -12,8 +12,8 @@
 "replace" => "asenda",
 "cancel" => "loobu",
 "replaced" => "asendatud",
-"with" => "millega",
 "undo" => "tagasi",
+"with" => "millega",
 "deleted" => "kustutatud",
 "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",
diff --git a/apps/files/l10n/eu.php b/apps/files/l10n/eu.php
index d9c2689d1c..3897a5580f 100644
--- a/apps/files/l10n/eu.php
+++ b/apps/files/l10n/eu.php
@@ -12,8 +12,8 @@
 "replace" => "ordeztu",
 "cancel" => "ezeztatu",
 "replaced" => "ordeztua",
-"with" => "honekin",
 "undo" => "desegin",
+"with" => "honekin",
 "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",
diff --git a/apps/files/l10n/fa.php b/apps/files/l10n/fa.php
index 4dac88fc54..e6ddd50f91 100644
--- a/apps/files/l10n/fa.php
+++ b/apps/files/l10n/fa.php
@@ -12,8 +12,8 @@
 "replace" => "جایگزین",
 "cancel" => "لغو",
 "replaced" => "جایگزین‌شده",
-"with" => "همراه",
 "undo" => "بازگشت",
+"with" => "همراه",
 "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 3ed56de641..eaed70c624 100644
--- a/apps/files/l10n/fi_FI.php
+++ b/apps/files/l10n/fi_FI.php
@@ -12,8 +12,8 @@
 "replace" => "korvaa",
 "cancel" => "peru",
 "replaced" => "korvattu",
-"with" => "käyttäen",
 "undo" => "kumoa",
+"with" => "käyttäen",
 "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",
@@ -35,6 +35,7 @@
 "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",
+"Save" => "Tallenna",
 "New" => "Uusi",
 "Text file" => "Tekstitiedosto",
 "Folder" => "Kansio",
diff --git a/apps/files/l10n/fr.php b/apps/files/l10n/fr.php
index d0a4c020f3..0b7d226de7 100644
--- a/apps/files/l10n/fr.php
+++ b/apps/files/l10n/fr.php
@@ -12,8 +12,8 @@
 "replace" => "remplacer",
 "cancel" => "annuler",
 "replaced" => "remplacé",
-"with" => "avec",
 "undo" => "annuler",
+"with" => "avec",
 "deleted" => "supprimé",
 "generating ZIP-file, it may take some time." => "Fichier ZIP en cours d'assemblage ;  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.",
@@ -35,6 +35,7 @@
 "Enable ZIP-download" => "Activer le téléchargement ZIP",
 "0 is unlimited" => "0 est illimité",
 "Maximum input size for ZIP files" => "Taille maximale pour les fichiers ZIP",
+"Save" => "Sauvegarder",
 "New" => "Nouveau",
 "Text file" => "Fichier texte",
 "Folder" => "Dossier",
diff --git a/apps/files/l10n/gl.php b/apps/files/l10n/gl.php
index 3a36a23f0c..67293de5cb 100644
--- a/apps/files/l10n/gl.php
+++ b/apps/files/l10n/gl.php
@@ -12,8 +12,8 @@
 "replace" => "substituír",
 "cancel" => "cancelar",
 "replaced" => "substituído",
-"with" => "con",
 "undo" => "desfacer",
+"with" => "con",
 "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",
diff --git a/apps/files/l10n/hr.php b/apps/files/l10n/hr.php
index cb8eb4033c..b05b7c568b 100644
--- a/apps/files/l10n/hr.php
+++ b/apps/files/l10n/hr.php
@@ -12,8 +12,8 @@
 "replace" => "zamjeni",
 "cancel" => "odustani",
 "replaced" => "zamjenjeno",
-"with" => "sa",
 "undo" => "vrati",
+"with" => "sa",
 "deleted" => "izbrisano",
 "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",
diff --git a/apps/files/l10n/hu_HU.php b/apps/files/l10n/hu_HU.php
index 8d52765e93..95b3c57ce1 100644
--- a/apps/files/l10n/hu_HU.php
+++ b/apps/files/l10n/hu_HU.php
@@ -12,8 +12,8 @@
 "replace" => "cserél",
 "cancel" => "mégse",
 "replaced" => "kicserélve",
-"with" => "-val/-vel",
 "undo" => "visszavon",
+"with" => "-val/-vel",
 "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ű",
diff --git a/apps/files/l10n/id.php b/apps/files/l10n/id.php
index 399056bf27..351d064138 100644
--- a/apps/files/l10n/id.php
+++ b/apps/files/l10n/id.php
@@ -12,8 +12,8 @@
 "replace" => "mengganti",
 "cancel" => "batalkan",
 "replaced" => "diganti",
-"with" => "dengan",
 "undo" => "batal dikerjakan",
+"with" => "dengan",
 "deleted" => "dihapus",
 "generating ZIP-file, it may take some time." => "membuat berkas ZIP, ini mungkin memakan waktu.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Gagal mengunggah berkas anda karena berupa direktori atau mempunyai ukuran 0 byte",
diff --git a/apps/files/l10n/it.php b/apps/files/l10n/it.php
index 607969746c..d0deb4f0f0 100644
--- a/apps/files/l10n/it.php
+++ b/apps/files/l10n/it.php
@@ -12,8 +12,8 @@
 "replace" => "sostituisci",
 "cancel" => "annulla",
 "replaced" => "sostituito",
-"with" => "con",
 "undo" => "annulla",
+"with" => "con",
 "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",
@@ -35,6 +35,7 @@
 "Enable ZIP-download" => "Abilita scaricamento ZIP",
 "0 is unlimited" => "0 è illimitato",
 "Maximum input size for ZIP files" => "Dimensione massima per i file ZIP",
+"Save" => "Salva",
 "New" => "Nuovo",
 "Text file" => "File di testo",
 "Folder" => "Cartella",
diff --git a/apps/files/l10n/ja_JP.php b/apps/files/l10n/ja_JP.php
index 6dbdf8215d..2de716fec8 100644
--- a/apps/files/l10n/ja_JP.php
+++ b/apps/files/l10n/ja_JP.php
@@ -12,8 +12,8 @@
 "replace" => "置き換え",
 "cancel" => "キャンセル",
 "replaced" => "置換：",
-"with" => "←",
 "undo" => "元に戻す",
+"with" => "←",
 "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バイトのため、アップロードできません。",
@@ -35,6 +35,7 @@
 "Enable ZIP-download" => "ZIP形式のダウンロードを有効にする",
 "0 is unlimited" => "0を指定した場合は無制限",
 "Maximum input size for ZIP files" => "ZIPファイルへの最大入力サイズ",
+"Save" => "保存",
 "New" => "新規",
 "Text file" => "テキストファイル",
 "Folder" => "フォルダ",
diff --git a/apps/files/l10n/ko.php b/apps/files/l10n/ko.php
index dafd859702..121be7d1ab 100644
--- a/apps/files/l10n/ko.php
+++ b/apps/files/l10n/ko.php
@@ -12,8 +12,8 @@
 "replace" => "대체",
 "cancel" => "취소",
 "replaced" => "대체됨",
-"with" => "와",
 "undo" => "복구",
+"with" => "와",
 "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 바이트이기 때문에 업로드 할 수 없습니다.",
diff --git a/apps/files/l10n/lb.php b/apps/files/l10n/lb.php
index 7c8244a874..92acea1d11 100644
--- a/apps/files/l10n/lb.php
+++ b/apps/files/l10n/lb.php
@@ -12,8 +12,8 @@
 "replace" => "ersetzen",
 "cancel" => "ofbriechen",
 "replaced" => "ersat",
-"with" => "mat",
 "undo" => "réckgängeg man",
+"with" => "mat",
 "deleted" => "geläscht",
 "generating ZIP-file, it may take some time." => "Et  gëtt eng ZIP-File generéiert, dëst ka bëssen daueren.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Kann deng Datei net eroplueden well et en Dossier ass oder 0 byte grouss ass.",
diff --git a/apps/files/l10n/lv.php b/apps/files/l10n/lv.php
index 2ce800a065..eedab2546c 100644
--- a/apps/files/l10n/lv.php
+++ b/apps/files/l10n/lv.php
@@ -7,8 +7,8 @@
 "replace" => "aizvietot",
 "cancel" => "atcelt",
 "replaced" => "aizvietots",
-"with" => "ar",
 "undo" => "vienu soli atpakaļ",
+"with" => "ar",
 "deleted" => "izdzests",
 "generating ZIP-file, it may take some time." => "lai uzģenerētu ZIP failu, kāds brīdis ir jāpagaida",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Nav iespējams augšuplādēt jūsu failu, jo tāds jau eksistē vai arī failam nav izmēra (0 baiti)",
diff --git a/apps/files/l10n/nb_NO.php b/apps/files/l10n/nb_NO.php
index 92d0c23bfd..4a747af2f3 100644
--- a/apps/files/l10n/nb_NO.php
+++ b/apps/files/l10n/nb_NO.php
@@ -12,8 +12,8 @@
 "replace" => "erstatt",
 "cancel" => "avbryt",
 "replaced" => "erstattet",
-"with" => "med",
 "undo" => "angre",
+"with" => "med",
 "deleted" => "slettet",
 "generating ZIP-file, it may take some time." => "opprettet ZIP-fil, dette kan ta litt tid",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Kan ikke laste opp filen din siden det er en mappe eller den har 0 bytes",
diff --git a/apps/files/l10n/nl.php b/apps/files/l10n/nl.php
index fb7ea34b9b..7acb15054c 100644
--- a/apps/files/l10n/nl.php
+++ b/apps/files/l10n/nl.php
@@ -12,14 +12,15 @@
 "replace" => "vervang",
 "cancel" => "annuleren",
 "replaced" => "vervangen",
-"with" => "door",
 "undo" => "ongedaan maken",
+"with" => "door",
 "deleted" => "verwijderd",
 "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.",
+"File upload is in progress. Leaving the page now will cancel the upload." => "Bestands upload is bezig. Wanneer de pagina nu verlaten wordt, stopt de upload.",
 "Invalid name, '/' is not allowed." => "Ongeldige naam, '/' is niet toegestaan.",
 "Size" => "Bestandsgrootte",
 "Modified" => "Laatst aangepast",
@@ -34,6 +35,7 @@
 "Enable ZIP-download" => "Zet ZIP-download aan",
 "0 is unlimited" => "0 is ongelimiteerd",
 "Maximum input size for ZIP files" => "Maximale grootte voor ZIP bestanden",
+"Save" => "Opslaan",
 "New" => "Nieuw",
 "Text file" => "Tekstbestand",
 "Folder" => "Map",
diff --git a/apps/files/l10n/pl.php b/apps/files/l10n/pl.php
index a95c995d25..7fd31faefd 100644
--- a/apps/files/l10n/pl.php
+++ b/apps/files/l10n/pl.php
@@ -12,8 +12,8 @@
 "replace" => "zastap",
 "cancel" => "anuluj",
 "replaced" => "zastąpione",
-"with" => "z",
 "undo" => "wróć",
+"with" => "z",
 "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",
@@ -35,6 +35,7 @@
 "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 ",
+"Save" => "Zapisz",
 "New" => "Nowy",
 "Text file" => "Plik tekstowy",
 "Folder" => "Katalog",
diff --git a/apps/files/l10n/pt_BR.php b/apps/files/l10n/pt_BR.php
index 09c4f2b026..e9fe7747c1 100644
--- a/apps/files/l10n/pt_BR.php
+++ b/apps/files/l10n/pt_BR.php
@@ -12,8 +12,8 @@
 "replace" => "substituir",
 "cancel" => "cancelar",
 "replaced" => "substituido ",
-"with" => "com",
 "undo" => "desfazer",
+"with" => "com",
 "deleted" => "deletado",
 "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.",
diff --git a/apps/files/l10n/pt_PT.php b/apps/files/l10n/pt_PT.php
index e413d7cbe7..998c494a69 100644
--- a/apps/files/l10n/pt_PT.php
+++ b/apps/files/l10n/pt_PT.php
@@ -12,8 +12,8 @@
 "replace" => "substituir",
 "cancel" => "cancelar",
 "replaced" => "substituido",
-"with" => "com",
 "undo" => "desfazer",
+"with" => "com",
 "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",
diff --git a/apps/files/l10n/ru.php b/apps/files/l10n/ru.php
index 3976baeae3..6a76c25404 100644
--- a/apps/files/l10n/ru.php
+++ b/apps/files/l10n/ru.php
@@ -12,8 +12,8 @@
 "replace" => "заменить",
 "cancel" => "отмена",
 "replaced" => "заменён",
-"with" => "с",
 "undo" => "отмена",
+"with" => "с",
 "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 байт в каталог",
diff --git a/apps/files/l10n/sl.php b/apps/files/l10n/sl.php
index fa506795d9..85da041629 100644
--- a/apps/files/l10n/sl.php
+++ b/apps/files/l10n/sl.php
@@ -12,8 +12,8 @@
 "replace" => "nadomesti",
 "cancel" => "ekliči",
 "replaced" => "nadomeščen",
-"with" => "z",
 "undo" => "razveljavi",
+"with" => "z",
 "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.",
@@ -35,6 +35,7 @@
 "Enable ZIP-download" => "Omogoči ZIP-prejemanje",
 "0 is unlimited" => "0 je neskončno",
 "Maximum input size for ZIP files" => "Največja vhodna velikost za ZIP datoteke",
+"Save" => "Shrani",
 "New" => "Nova",
 "Text file" => "Besedilna datoteka",
 "Folder" => "Mapa",
diff --git a/apps/files/l10n/sv.php b/apps/files/l10n/sv.php
index b76914b642..f63039d9ee 100644
--- a/apps/files/l10n/sv.php
+++ b/apps/files/l10n/sv.php
@@ -12,8 +12,8 @@
 "replace" => "ersätt",
 "cancel" => "avbryt",
 "replaced" => "ersatt",
-"with" => "med",
 "undo" => "ångra",
+"with" => "med",
 "deleted" => "raderad",
 "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.",
@@ -35,6 +35,7 @@
 "Enable ZIP-download" => "Aktivera ZIP-nerladdning",
 "0 is unlimited" => "0 är oändligt",
 "Maximum input size for ZIP files" => "Största tillåtna storlek för ZIP-filer",
+"Save" => "Spara",
 "New" => "Ny",
 "Text file" => "Textfil",
 "Folder" => "Mapp",
diff --git a/apps/files/l10n/th_TH.php b/apps/files/l10n/th_TH.php
index d80ec2d877..689871a11d 100644
--- a/apps/files/l10n/th_TH.php
+++ b/apps/files/l10n/th_TH.php
@@ -12,8 +12,8 @@
 "replace" => "แทนที่",
 "cancel" => "ยกเลิก",
 "replaced" => "แทนที่แล้ว",
-"with" => "กับ",
 "undo" => "เลิกทำ",
+"with" => "กับ",
 "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 ไบต์",
@@ -35,6 +35,7 @@
 "Enable ZIP-download" => "อนุญาตให้ดาวน์โหลดเป็นไฟล์ ZIP ได้",
 "0 is unlimited" => "0 หมายถึงไม่จำกัด",
 "Maximum input size for ZIP files" => "ขนาดไฟล์ ZIP สูงสุด",
+"Save" => "บันทึก",
 "New" => "อัพโหลดไฟล์ใหม่",
 "Text file" => "ไฟล์ข้อความ",
 "Folder" => "แฟ้มเอกสาร",
diff --git a/apps/files/l10n/tr.php b/apps/files/l10n/tr.php
index 630e3563ad..72e0e1427d 100644
--- a/apps/files/l10n/tr.php
+++ b/apps/files/l10n/tr.php
@@ -12,8 +12,8 @@
 "replace" => "değiştir",
 "cancel" => "iptal",
 "replaced" => "değiştirildi",
-"with" => "ile",
 "undo" => "geri al",
+"with" => "ile",
 "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",
diff --git a/apps/files/l10n/zh_CN.GB2312.php b/apps/files/l10n/zh_CN.GB2312.php
index 6703e6f908..42063712ea 100644
--- a/apps/files/l10n/zh_CN.GB2312.php
+++ b/apps/files/l10n/zh_CN.GB2312.php
@@ -12,8 +12,8 @@
 "replace" => "替换",
 "cancel" => "取消",
 "replaced" => "替换过了",
-"with" => "随着",
 "undo" => "撤销",
+"with" => "随着",
 "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",
diff --git a/apps/files/l10n/zh_CN.php b/apps/files/l10n/zh_CN.php
index dc78301884..f24db8f3cb 100644
--- a/apps/files/l10n/zh_CN.php
+++ b/apps/files/l10n/zh_CN.php
@@ -12,8 +12,8 @@
 "replace" => "替换",
 "cancel" => "取消",
 "replaced" => "已经替换",
-"with" => "随着",
 "undo" => "撤销",
+"with" => "随着",
 "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 字节",
diff --git a/apps/files_encryption/l10n/cs_CZ.php b/apps/files_encryption/l10n/cs_CZ.php
index 15cf770570..9be2be9809 100644
--- a/apps/files_encryption/l10n/cs_CZ.php
+++ b/apps/files_encryption/l10n/cs_CZ.php
@@ -1,6 +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í"
+"Encryption" => "Šifrování",
+"Exclude the following file types from encryption" => "Při šifrování vynechat následující typy souborů",
+"None" => "Žádné",
+"Enable Encryption" => "Povolit šifrování"
 );
diff --git a/apps/files_encryption/l10n/sk_SK.php b/apps/files_encryption/l10n/sk_SK.php
new file mode 100644
index 0000000000..598f1294f6
--- /dev/null
+++ b/apps/files_encryption/l10n/sk_SK.php
@@ -0,0 +1,6 @@
+<?php $TRANSLATIONS = array(
+"Encryption" => "Šifrovanie",
+"Exclude the following file types from encryption" => "Vynechať nasledujúce súbory pri šifrovaní",
+"None" => "Žiadne",
+"Enable Encryption" => "Zapnúť šifrovanie"
+);
diff --git a/apps/files_external/l10n/cs_CZ.php b/apps/files_external/l10n/cs_CZ.php
index e8a38d8661..7589960334 100644
--- a/apps/files_external/l10n/cs_CZ.php
+++ b/apps/files_external/l10n/cs_CZ.php
@@ -1,18 +1,18 @@
 <?php $TRANSLATIONS = array(
 "External Storage" => "Externí úložiště",
 "Mount point" => "Přípojný bod",
-"Backend" => "Končící",
-"Configuration" => "Konfigurace",
-"Options" => "Nastavení",
+"Backend" => "Podpůrná vrstva",
+"Configuration" => "Nastavení",
+"Options" => "Možnosti",
 "Applicable" => "Platný",
-"Add mount point" => "Přidat přípojný bod",
+"Add mount point" => "Přidat bod připojení",
 "None set" => "Nenastaveno",
 "All Users" => "Všichni uživatelé",
 "Groups" => "Skupiny",
 "Users" => "Uživatelé",
 "Delete" => "Smazat",
-"SSL root certificates" => "Kořenové SSL certifikáty",
-"Import Root Certificate" => "Import kořenového certifikátu",
-"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ě"
+"SSL root certificates" => "Kořenové certifikáty SSL",
+"Import Root Certificate" => "Importovat kořenového certifikátu",
+"Enable User External Storage" => "Zapnout externí uživatelské úložiště",
+"Allow users to mount their own external storage" => "Povolit uživatelům připojení jejich vlastních externích úložišť"
 );
diff --git a/apps/files_external/l10n/fi_FI.php b/apps/files_external/l10n/fi_FI.php
index 7dca49791e..cea671368e 100644
--- a/apps/files_external/l10n/fi_FI.php
+++ b/apps/files_external/l10n/fi_FI.php
@@ -4,6 +4,7 @@
 "Backend" => "Taustaosa",
 "Configuration" => "Asetukset",
 "Options" => "Valinnat",
+"Applicable" => "Sovellettavissa",
 "Add mount point" => "Lisää liitospiste",
 "None set" => "Ei asetettu",
 "All Users" => "Kaikki käyttäjät",
@@ -12,5 +13,6 @@
 "Delete" => "Poista",
 "SSL root certificates" => "SSL-juurivarmenteet",
 "Import Root Certificate" => "Tuo juurivarmenne",
+"Enable User External Storage" => "Ota käyttöön ulkopuoliset tallennuspaikat",
 "Allow users to mount their own external storage" => "Salli käyttäjien liittää omia erillisiä tallennusvälineitä"
 );
diff --git a/apps/files_sharing/l10n/cs_CZ.php b/apps/files_sharing/l10n/cs_CZ.php
index 4836f15109..e9185e979c 100644
--- a/apps/files_sharing/l10n/cs_CZ.php
+++ b/apps/files_sharing/l10n/cs_CZ.php
@@ -1,4 +1,7 @@
 <?php $TRANSLATIONS = array(
 "Password" => "Heslo",
-"Submit" => "Potvrdit"
+"Submit" => "Odeslat",
+"Download" => "Stáhnout",
+"No preview available for" => "Náhled není dostupný pro",
+"web services under your control" => "služby webu pod Vaší kontrolou"
 );
diff --git a/apps/files_sharing/l10n/nl.php b/apps/files_sharing/l10n/nl.php
index a4da2723ca..2f732ed662 100644
--- a/apps/files_sharing/l10n/nl.php
+++ b/apps/files_sharing/l10n/nl.php
@@ -1,5 +1,6 @@
 <?php $TRANSLATIONS = array(
-"Password" => "Passeerwoord",
+"Password" => "Wachtwoord",
+"Submit" => "Verzenden",
 "Download" => "Downloaden",
 "No preview available for" => "Geen voorbeeldweergave beschikbaar voor",
 "web services under your control" => "Webdiensten in eigen beheer"
diff --git a/apps/files_versions/l10n/cs_CZ.php b/apps/files_versions/l10n/cs_CZ.php
index 3297648fa3..4f33c1915f 100644
--- a/apps/files_versions/l10n/cs_CZ.php
+++ b/apps/files_versions/l10n/cs_CZ.php
@@ -1,4 +1,6 @@
 <?php $TRANSLATIONS = array(
-"Expire all versions" => "Vypršení všech verzí",
+"Expire all versions" => "Vypršet všechny verze",
+"Versions" => "Verze",
+"This will delete all existing backup versions of your files" => "Odstraní všechny existující zálohované verze Vašich souborů",
 "Enable Files Versioning" => "Povolit verzování souborů"
 );
diff --git a/apps/user_ldap/l10n/cs_CZ.php b/apps/user_ldap/l10n/cs_CZ.php
index 31d9d7f089..c90dc9ed56 100644
--- a/apps/user_ldap/l10n/cs_CZ.php
+++ b/apps/user_ldap/l10n/cs_CZ.php
@@ -1,37 +1,37 @@
 <?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",
+"Host" => "Počítač",
+"You can omit the protocol, except you require SSL. Then start with ldaps://" => "Můžete vynechat protokol, vyjma pokud požadujete SSL. Tehdy začněte s ldaps://",
+"Base DN" => "Základní DN",
+"You can specify Base DN for users and groups in the Advanced tab" => "V rozšířeném nastavení můžete určit základní DN pro uživatele a skupiny",
+"User DN" => "Uživatelské 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 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\".",
+"For anonymous access, leave DN and Password empty." => "Pro anonymní přístup, ponechte údaje DN and heslo prázdné.",
+"User Login Filter" => "Filtr přihlášení uživatelů",
+"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Určuje použitý filtr, při pokusu o přihlášení. %%uid nahrazuje uživatelské jméno v činnosti přihlášení.",
+"use %%uid placeholder, e.g. \"uid=%%uid\"" => "použijte zástupný vzor %%uid, např. \"uid=%%uid\"",
+"User List Filter" => "Filtr uživatelských seznamů",
+"Defines the filter to apply, when retrieving users." => "Určuje použitý filtr, pro získávaní uživatelů.",
+"without any placeholder, e.g. \"objectClass=person\"." => "bez zástupných znaků, např. \"objectClass=person\".",
+"Group Filter" => "Filtr skupin",
+"Defines the filter to apply, when retrieving groups." => "Určuje použitý filtr, pro získávaní skupin.",
+"without any placeholder, e.g. \"objectClass=posixGroup\"." => "bez zástupných znaků, 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.",
+"Use TLS" => "Použít TLS",
+"Do not use it for SSL connections, it will fail." => "Nepoužívejte pro připojení pomocí SSL, 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í.",
+"Turn off SSL certificate validation." => "Vypnout 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 připojení pracuje pouze s touto možností, tak importujte SSL certifikát SSL serveru do Vašeho serveru ownCloud",
+"Not recommended, use for testing only." => "Není doporučeno, pouze pro testovací účely.",
 "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ěť.",
-"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Ponechte prázdné pro uživateslké jméno (výchozí). Jinak uveďte LDAP/AD paramerty",
+"in bytes" => "v bajtech",
+"in seconds. A change empties the cache." => "ve vteřinách. Změna vyprázdní vyrovnávací paměť.",
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Ponechte prázdné pro uživatelské jméno (výchozí). Jinak uveďte LDAP/AD parametr.",
 "Help" => "Nápověda"
 );
diff --git a/apps/user_ldap/l10n/fi_FI.php b/apps/user_ldap/l10n/fi_FI.php
index 8bf3a024ef..6d0040868f 100644
--- a/apps/user_ldap/l10n/fi_FI.php
+++ b/apps/user_ldap/l10n/fi_FI.php
@@ -8,6 +8,7 @@
 "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",
+"Defines the filter to apply, when login is attempted. %%uid replaces the username in the login action." => "Määrittelee käytettävän suodattimen, kun sisäänkirjautumista yritetään. %%uid korvaa sisäänkirjautumisessa käyttäjätunnuksen.",
 "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.  ",
@@ -25,7 +26,12 @@
 "Turn off SSL certificate validation." => "Poista käytöstä SSL-varmenteen vahvistus",
 "If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Jos yhteys toimii vain tällä valinnalla, siirrä LDAP-palvelimen SSL-varmenne ownCloud-palvelimellesi.",
 "Not recommended, use for testing only." => "Ei suositella, käytä vain testausta varten.",
+"User Display Name Field" => "Käyttäjän näytettävän nimen kenttä",
+"The LDAP attribute to use to generate the user`s ownCloud name." => "LDAP attribuutti, jota käytetään käyttäjän ownCloud käyttäjänimenä ",
+"Group Display Name Field" => "Ryhmän \"näytettävä nimi\"-kenttä",
+"The LDAP attribute to use to generate the groups`s ownCloud name." => "LDAP atribuutti, jota käytetään luomaan ryhmän ownCloud nimi",
 "in bytes" => "tavuissa",
 "in seconds. A change empties the cache." => "sekunneissa. Muutos tyhjentää välimuistin.",
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Jätä tyhjäksi käyttäjänimi (oletusasetus). Muutoin anna LDAP/AD atribuutti.",
 "Help" => "Ohje"
 );
diff --git a/core/l10n/ca.php b/core/l10n/ca.php
index 52b6d68e47..6c70c29e6c 100644
--- a/core/l10n/ca.php
+++ b/core/l10n/ca.php
@@ -2,7 +2,6 @@
 "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:",
-"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",
diff --git a/core/l10n/cs_CZ.php b/core/l10n/cs_CZ.php
index 7daeb52e63..6a4dad08cb 100644
--- a/core/l10n/cs_CZ.php
+++ b/core/l10n/cs_CZ.php
@@ -1,8 +1,7 @@
 <?php $TRANSLATIONS = array(
-"Application name not provided." => "Jméno aplikace nezadáno.",
+"Application name not provided." => "Nezadán název aplikace.",
 "No category to add?" => "Žádná kategorie k přidání?",
-"This category already exists: " => "Tato kategorie již existuje:",
-"ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=" => "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=",
+"This category already exists: " => "Tato kategorie již existuje: ",
 "Settings" => "Nastavení",
 "January" => "Leden",
 "February" => "Únor",
@@ -19,14 +18,14 @@
 "Cancel" => "Zrušit",
 "No" => "Ne",
 "Yes" => "Ano",
-"Ok" => "Budiž",
+"Ok" => "Ok",
 "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",
+"ownCloud password reset" => "Obnovení hesla pro ownCloud",
+"Use the following link to reset your password: {link}" => "Heslo obnovíte použitím následujícího odkazu: {link}",
+"You will receive a link to reset your password via Email." => "Bude Vám e-mailem zaslán odkaz pro obnovu hesla.",
 "Requested" => "Požadováno",
-"Login failed!" => "Přihlášení selhalo",
+"Login failed!" => "Přihlášení selhalo.",
 "Username" => "Uživatelské jméno",
 "Request reset" => "Vyžádat obnovu",
 "Your password was reset" => "Vaše heslo bylo obnoveno",
@@ -36,29 +35,30 @@
 "Personal" => "Osobní",
 "Users" => "Uživatelé",
 "Apps" => "Aplikace",
-"Admin" => "Admin",
+"Admin" => "Administrace",
 "Help" => "Nápověda",
-"Access forbidden" => "Přístup odmítnut",
+"Access forbidden" => "Přístup zakázán",
 "Cloud not found" => "Cloud nebyl nalezen",
 "Edit categories" => "Upravit kategorie",
 "Add" => "Přidat",
 "Create an <strong>admin account</strong>" => "Vytvořit <strong>účet správce</strong>",
 "Password" => "Heslo",
-"Advanced" => "Rozšířené volby",
-"Data folder" => "Datový adresář",
-"Configure the database" => "Konfigurace databáze",
+"Advanced" => "Pokročilé",
+"Data folder" => "Složka s daty",
+"Configure the database" => "Nastavit databázi",
 "will be used" => "bude použito",
 "Database user" => "Uživatel databáze",
-"Database password" => "Heslo k databázi",
+"Database password" => "Heslo databáze",
 "Database name" => "Název databáze",
+"Database tablespace" => "Tabulkový prostor databáze",
 "Database host" => "Hostitel databáze",
-"Finish setup" => "Dokončit instalaci",
+"Finish setup" => "Dokončit nastavení",
 "web services under your control" => "webové služby pod Vaší kontrolou",
 "Log out" => "Odhlásit se",
-"Lost your password?" => "Zapomenuté heslo?",
+"Lost your password?" => "Ztratili jste své heslo?",
 "remember" => "zapamatovat si",
-"Log in" => "Login",
+"Log in" => "Přihlásit",
 "You are logged out." => "Jste odhlášeni.",
-"prev" => "zpět",
-"next" => "vpřed"
+"prev" => "předchozí",
+"next" => "následující"
 );
diff --git a/core/l10n/da.php b/core/l10n/da.php
index 398ebdb670..4bb953a4c5 100644
--- a/core/l10n/da.php
+++ b/core/l10n/da.php
@@ -2,7 +2,6 @@
 "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: ",
-"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",
diff --git a/core/l10n/de.php b/core/l10n/de.php
index fdd940ea39..611c208fe4 100644
--- a/core/l10n/de.php
+++ b/core/l10n/de.php
@@ -2,7 +2,6 @@
 "Application name not provided." => "Applikationsname nicht angegeben",
 "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",
diff --git a/core/l10n/el.php b/core/l10n/el.php
index d8f32fb51e..18a26f892c 100644
--- a/core/l10n/el.php
+++ b/core/l10n/el.php
@@ -2,7 +2,6 @@
 "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" => "Φεβρουάριος",
diff --git a/core/l10n/eo.php b/core/l10n/eo.php
index f5e5ca9d0e..930b20a30a 100644
--- a/core/l10n/eo.php
+++ b/core/l10n/eo.php
@@ -2,7 +2,6 @@
 "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",
diff --git a/core/l10n/es.php b/core/l10n/es.php
index 3a7da551b6..21866d2ed6 100644
--- a/core/l10n/es.php
+++ b/core/l10n/es.php
@@ -2,7 +2,6 @@
 "Application name not provided." => "Nombre de la aplicación no provisto.",
 "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",
 "January" => "Enero",
 "February" => "Febrero",
diff --git a/core/l10n/et_EE.php b/core/l10n/et_EE.php
index 734021605c..871cc25fee 100644
--- a/core/l10n/et_EE.php
+++ b/core/l10n/et_EE.php
@@ -2,7 +2,6 @@
 "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: ",
-"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",
diff --git a/core/l10n/eu.php b/core/l10n/eu.php
index 2e5a2c00e2..9e9717dd8d 100644
--- a/core/l10n/eu.php
+++ b/core/l10n/eu.php
@@ -2,7 +2,6 @@
 "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:",
-"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",
diff --git a/core/l10n/fa.php b/core/l10n/fa.php
index 5fe98629ba..7b7af3937b 100644
--- a/core/l10n/fa.php
+++ b/core/l10n/fa.php
@@ -2,7 +2,6 @@
 "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" => "فبریه",
diff --git a/core/l10n/fi_FI.php b/core/l10n/fi_FI.php
index 34a69b6c64..d253ee9433 100644
--- a/core/l10n/fi_FI.php
+++ b/core/l10n/fi_FI.php
@@ -2,7 +2,6 @@
 "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: ",
-"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" => "Asetukset",
 "January" => "Tammikuu",
 "February" => "Helmikuu",
diff --git a/core/l10n/fr.php b/core/l10n/fr.php
index a563218084..2904ebf48b 100644
--- a/core/l10n/fr.php
+++ b/core/l10n/fr.php
@@ -2,7 +2,6 @@
 "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à : ",
-"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",
diff --git a/core/l10n/gl.php b/core/l10n/gl.php
index eeff78826f..af84971219 100644
--- a/core/l10n/gl.php
+++ b/core/l10n/gl.php
@@ -2,7 +2,6 @@
 "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: ",
-"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",
diff --git a/core/l10n/hr.php b/core/l10n/hr.php
index d4e773afc1..723cceb4d0 100644
--- a/core/l10n/hr.php
+++ b/core/l10n/hr.php
@@ -2,7 +2,6 @@
 "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: ",
-"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",
diff --git a/core/l10n/hu_HU.php b/core/l10n/hu_HU.php
index dbfe2781d5..a97c4cb886 100644
--- a/core/l10n/hu_HU.php
+++ b/core/l10n/hu_HU.php
@@ -2,7 +2,6 @@
 "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",
-"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",
diff --git a/core/l10n/it.php b/core/l10n/it.php
index b7f174e57a..8d9ac21cd4 100644
--- a/core/l10n/it.php
+++ b/core/l10n/it.php
@@ -2,7 +2,6 @@
 "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à: ",
-"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",
diff --git a/core/l10n/ja_JP.php b/core/l10n/ja_JP.php
index bef84b09d6..62f5e16f3c 100644
--- a/core/l10n/ja_JP.php
+++ b/core/l10n/ja_JP.php
@@ -2,7 +2,6 @@
 "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" => "1月",
 "February" => "2月",
diff --git a/core/l10n/ko.php b/core/l10n/ko.php
index 5a330581ff..9f82a79c43 100644
--- a/core/l10n/ko.php
+++ b/core/l10n/ko.php
@@ -2,7 +2,6 @@
 "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" => "1월",
 "February" => "2월",
diff --git a/core/l10n/lt_LT.php b/core/l10n/lt_LT.php
index f36f697b67..0a3320351c 100644
--- a/core/l10n/lt_LT.php
+++ b/core/l10n/lt_LT.php
@@ -2,7 +2,6 @@
 "Application name not provided." => "Nepateiktas programos pavadinimas.",
 "No category to add?" => "Nepridėsite jokios kategorijos?",
 "This category already exists: " => "Tokia kategorija jau yra:",
-"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",
diff --git a/core/l10n/mk.php b/core/l10n/mk.php
index af49a04f11..3eea6cd58d 100644
--- a/core/l10n/mk.php
+++ b/core/l10n/mk.php
@@ -2,7 +2,6 @@
 "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" => "Февруари",
diff --git a/core/l10n/ms_MY.php b/core/l10n/ms_MY.php
index 25da7cd862..c99c510be6 100644
--- a/core/l10n/ms_MY.php
+++ b/core/l10n/ms_MY.php
@@ -2,7 +2,6 @@
 "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",
diff --git a/core/l10n/nb_NO.php b/core/l10n/nb_NO.php
index d30823b59f..a8bfebb8a5 100644
--- a/core/l10n/nb_NO.php
+++ b/core/l10n/nb_NO.php
@@ -2,7 +2,6 @@
 "Application name not provided." => "Applikasjonsnavn ikke angitt.",
 "No category to add?" => "Ingen kategorier å legge til?",
 "This category already exists: " => "Denne kategorien finnes allerede:",
-"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" => "Innstillinger",
 "January" => "Januar",
 "February" => "Februar",
diff --git a/core/l10n/nl.php b/core/l10n/nl.php
index 2c020623d6..3497381f74 100644
--- a/core/l10n/nl.php
+++ b/core/l10n/nl.php
@@ -28,7 +28,7 @@
 "Login failed!" => "Login mislukt!",
 "Username" => "Gebruikersnaam",
 "Request reset" => "Resetaanvraag",
-"Your password was reset" => "Je wachtwoord is geweizigd",
+"Your password was reset" => "Je wachtwoord is gewijzigd",
 "To login page" => "Naar de login-pagina",
 "New password" => "Nieuw wachtwoord",
 "Reset password" => "Reset wachtwoord",
diff --git a/core/l10n/pl.php b/core/l10n/pl.php
index 2751b85152..5f8752b69b 100644
--- a/core/l10n/pl.php
+++ b/core/l10n/pl.php
@@ -2,7 +2,6 @@
 "Application name not provided." => "Brak nazwy dla aplikacji",
 "No category to add?" => "Brak kategorii",
 "This category already exists: " => "Ta kategoria już istnieje",
-"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",
diff --git a/core/l10n/pt_BR.php b/core/l10n/pt_BR.php
index 46d601e6eb..9ad2f3de53 100644
--- a/core/l10n/pt_BR.php
+++ b/core/l10n/pt_BR.php
@@ -2,7 +2,6 @@
 "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",
-"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",
diff --git a/core/l10n/pt_PT.php b/core/l10n/pt_PT.php
index 29135f0d66..4da513c1ae 100644
--- a/core/l10n/pt_PT.php
+++ b/core/l10n/pt_PT.php
@@ -2,7 +2,6 @@
 "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:",
-"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",
diff --git a/core/l10n/ru.php b/core/l10n/ru.php
index edb5557777..81b579aeb0 100644
--- a/core/l10n/ru.php
+++ b/core/l10n/ru.php
@@ -2,7 +2,6 @@
 "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" => "Февраль",
diff --git a/core/l10n/sk_SK.php b/core/l10n/sk_SK.php
index b6bff1e049..8c3339170d 100644
--- a/core/l10n/sk_SK.php
+++ b/core/l10n/sk_SK.php
@@ -2,7 +2,6 @@
 "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:",
-"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",
diff --git a/core/l10n/sl.php b/core/l10n/sl.php
index ad41231431..b7850c2861 100644
--- a/core/l10n/sl.php
+++ b/core/l10n/sl.php
@@ -2,7 +2,6 @@
 "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:",
-"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",
diff --git a/core/l10n/sv.php b/core/l10n/sv.php
index f459272eba..6b075f0aaf 100644
--- a/core/l10n/sv.php
+++ b/core/l10n/sv.php
@@ -2,7 +2,6 @@
 "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+=",
 "Settings" => "Inställningar",
 "January" => "Januari",
 "February" => "Februari",
diff --git a/core/l10n/th_TH.php b/core/l10n/th_TH.php
index 4bfdb524fe..fd25105f15 100644
--- a/core/l10n/th_TH.php
+++ b/core/l10n/th_TH.php
@@ -2,7 +2,6 @@
 "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" => "กุมภาพันธ์",
diff --git a/core/l10n/tr.php b/core/l10n/tr.php
index a34443e8dd..7d6d4a33a6 100644
--- a/core/l10n/tr.php
+++ b/core/l10n/tr.php
@@ -2,7 +2,6 @@
 "Application name not provided." => "Uygulama adı verilmedi.",
 "No category to add?" => "Eklenecek kategori yok?",
 "This category already exists: " => "Bu kategori zaten mevcut: ",
-"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",
diff --git a/core/l10n/vi.php b/core/l10n/vi.php
index 4a4c97032f..de4764c3a5 100644
--- a/core/l10n/vi.php
+++ b/core/l10n/vi.php
@@ -2,7 +2,6 @@
 "Application name not provided." => "Tên ứng dụng không tồn tại",
 "No category to add?" => "Không có danh mục được thêm?",
 "This category already exists: " => "Danh mục này đã được tạo :",
-"ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=" => "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+=",
 "Settings" => "Cài đặt",
 "January" => "Tháng 1",
 "February" => "Tháng 2",
diff --git a/core/l10n/zh_CN.GB2312.php b/core/l10n/zh_CN.GB2312.php
index 770d2b6772..58104df399 100644
--- a/core/l10n/zh_CN.GB2312.php
+++ b/core/l10n/zh_CN.GB2312.php
@@ -2,7 +2,6 @@
 "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" => "二月",
diff --git a/core/l10n/zh_TW.php b/core/l10n/zh_TW.php
index 753dde0a99..57a087fae9 100644
--- a/core/l10n/zh_TW.php
+++ b/core/l10n/zh_TW.php
@@ -2,7 +2,6 @@
 "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" => "二月",
diff --git a/l10n/af/core.po b/l10n/af/core.po
index ea01e99a96..437c1e2695 100644
--- a/l10n/af/core.po
+++ b/l10n/af/core.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-06 02:02+0200\n"
+"PO-Revision-Date: 2012-09-06 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"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: af\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ajax/vcategories/add.php:23 ajax/vcategories/delete.php:23
 msgid "Application name not provided."
@@ -29,59 +29,55 @@ 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:206 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "January"
 msgstr ""
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "February"
 msgstr ""
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "March"
 msgstr ""
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "April"
 msgstr ""
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "May"
 msgstr ""
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "June"
 msgstr ""
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "July"
 msgstr ""
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "August"
 msgstr ""
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "September"
 msgstr ""
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "October"
 msgstr ""
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "November"
 msgstr ""
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "December"
 msgstr ""
 
@@ -113,7 +109,7 @@ msgstr ""
 msgid "ownCloud password reset"
 msgstr ""
 
-#: lostpassword/templates/email.php:1
+#: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr ""
 
diff --git a/l10n/af/files.po b/l10n/af/files.po
index f93921f751..31f2a00b0f 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-09-05 02:01+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-06 02:01+0200\n"
+"PO-Revision-Date: 2012-09-06 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"
@@ -55,31 +55,35 @@ msgstr ""
 msgid "Delete"
 msgstr ""
 
-#: js/filelist.js:141
+#: js/filelist.js:186 js/filelist.js:188
 msgid "already exists"
 msgstr ""
 
-#: js/filelist.js:141
+#: js/filelist.js:186 js/filelist.js:188
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:141
+#: js/filelist.js:186
+msgid "suggest name"
+msgstr ""
+
+#: js/filelist.js:186 js/filelist.js:188
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:195
+#: js/filelist.js:235 js/filelist.js:237
 msgid "replaced"
 msgstr ""
 
-#: js/filelist.js:195
-msgid "with"
-msgstr ""
-
-#: js/filelist.js:195 js/filelist.js:246
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:246
+#: js/filelist.js:237
+msgid "with"
+msgstr ""
+
+#: js/filelist.js:271
 msgid "deleted"
 msgstr ""
 
@@ -95,44 +99,44 @@ msgstr ""
 msgid "Upload Error"
 msgstr ""
 
-#: js/files.js:236 js/files.js:327 js/files.js:356
+#: js/files.js:236 js/files.js:341 js/files.js:370
 msgid "Pending"
 msgstr ""
 
-#: js/files.js:341
+#: js/files.js:355
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:409
+#: js/files.js:423
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:480
+#: js/files.js:493
 msgid "Invalid name, '/' is not allowed."
 msgstr ""
 
-#: js/files.js:726 templates/index.php:55
+#: js/files.js:746 templates/index.php:55
 msgid "Size"
 msgstr ""
 
-#: js/files.js:727 templates/index.php:56
+#: js/files.js:747 templates/index.php:56
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:754
+#: js/files.js:774
 msgid "folder"
 msgstr ""
 
-#: js/files.js:756
+#: js/files.js:776
 msgid "folders"
 msgstr ""
 
-#: js/files.js:764
+#: js/files.js:784
 msgid "file"
 msgstr ""
 
-#: js/files.js:766
+#: js/files.js:786
 msgid "files"
 msgstr ""
 
diff --git a/l10n/ar/core.po b/l10n/ar/core.po
index 090905898d..febb0d7a63 100644
--- a/l10n/ar/core.po
+++ b/l10n/ar/core.po
@@ -8,15 +8,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-06 02:02+0200\n"
+"PO-Revision-Date: 2012-09-06 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"
 "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"
+"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/vcategories/add.php:23 ajax/vcategories/delete.php:23
 msgid "Application name not provided."
@@ -30,59 +30,55 @@ 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:206 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr "تعديلات"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "January"
 msgstr ""
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "February"
 msgstr ""
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "March"
 msgstr ""
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "April"
 msgstr ""
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "May"
 msgstr ""
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "June"
 msgstr ""
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "July"
 msgstr ""
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "August"
 msgstr ""
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "September"
 msgstr ""
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "October"
 msgstr ""
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "November"
 msgstr ""
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "December"
 msgstr ""
 
@@ -114,7 +110,7 @@ msgstr ""
 msgid "ownCloud password reset"
 msgstr ""
 
-#: lostpassword/templates/email.php:1
+#: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr "استخدم هذه الوصلة لاسترجاع كلمة السر: {link}"
 
diff --git a/l10n/ar/files.po b/l10n/ar/files.po
index f0fdb23c94..52370a91d0 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-09-05 02:01+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-06 02:01+0200\n"
+"PO-Revision-Date: 2012-09-06 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"
@@ -56,31 +56,35 @@ msgstr "الملفات"
 msgid "Delete"
 msgstr "محذوف"
 
-#: js/filelist.js:141
+#: js/filelist.js:186 js/filelist.js:188
 msgid "already exists"
 msgstr ""
 
-#: js/filelist.js:141
+#: js/filelist.js:186 js/filelist.js:188
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:141
+#: js/filelist.js:186
+msgid "suggest name"
+msgstr ""
+
+#: js/filelist.js:186 js/filelist.js:188
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:195
+#: js/filelist.js:235 js/filelist.js:237
 msgid "replaced"
 msgstr ""
 
-#: js/filelist.js:195
-msgid "with"
-msgstr ""
-
-#: js/filelist.js:195 js/filelist.js:246
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:246
+#: js/filelist.js:237
+msgid "with"
+msgstr ""
+
+#: js/filelist.js:271
 msgid "deleted"
 msgstr ""
 
@@ -96,44 +100,44 @@ msgstr ""
 msgid "Upload Error"
 msgstr ""
 
-#: js/files.js:236 js/files.js:327 js/files.js:356
+#: js/files.js:236 js/files.js:341 js/files.js:370
 msgid "Pending"
 msgstr ""
 
-#: js/files.js:341
+#: js/files.js:355
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:409
+#: js/files.js:423
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:480
+#: js/files.js:493
 msgid "Invalid name, '/' is not allowed."
 msgstr ""
 
-#: js/files.js:726 templates/index.php:55
+#: js/files.js:746 templates/index.php:55
 msgid "Size"
 msgstr "حجم"
 
-#: js/files.js:727 templates/index.php:56
+#: js/files.js:747 templates/index.php:56
 msgid "Modified"
 msgstr "معدل"
 
-#: js/files.js:754
+#: js/files.js:774
 msgid "folder"
 msgstr ""
 
-#: js/files.js:756
+#: js/files.js:776
 msgid "folders"
 msgstr ""
 
-#: js/files.js:764
+#: js/files.js:784
 msgid "file"
 msgstr ""
 
-#: js/files.js:766
+#: js/files.js:786
 msgid "files"
 msgstr ""
 
diff --git a/l10n/ar_SA/core.po b/l10n/ar_SA/core.po
index c5b0902e92..c251db4e53 100644
--- a/l10n/ar_SA/core.po
+++ b/l10n/ar_SA/core.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-06 02:02+0200\n"
+"PO-Revision-Date: 2012-09-06 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"
 "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"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ajax/vcategories/add.php:23 ajax/vcategories/delete.php:23
 msgid "Application name not provided."
@@ -29,59 +29,55 @@ 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:206 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "January"
 msgstr ""
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "February"
 msgstr ""
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "March"
 msgstr ""
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "April"
 msgstr ""
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "May"
 msgstr ""
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "June"
 msgstr ""
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "July"
 msgstr ""
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "August"
 msgstr ""
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "September"
 msgstr ""
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "October"
 msgstr ""
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "November"
 msgstr ""
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "December"
 msgstr ""
 
@@ -113,7 +109,7 @@ msgstr ""
 msgid "ownCloud password reset"
 msgstr ""
 
-#: lostpassword/templates/email.php:1
+#: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr ""
 
diff --git a/l10n/ar_SA/files.po b/l10n/ar_SA/files.po
index 7f04256bac..f5fadbff02 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-09-05 02:01+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-06 02:01+0200\n"
+"PO-Revision-Date: 2012-09-06 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"
@@ -55,31 +55,35 @@ msgstr ""
 msgid "Delete"
 msgstr ""
 
-#: js/filelist.js:141
+#: js/filelist.js:186 js/filelist.js:188
 msgid "already exists"
 msgstr ""
 
-#: js/filelist.js:141
+#: js/filelist.js:186 js/filelist.js:188
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:141
+#: js/filelist.js:186
+msgid "suggest name"
+msgstr ""
+
+#: js/filelist.js:186 js/filelist.js:188
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:195
+#: js/filelist.js:235 js/filelist.js:237
 msgid "replaced"
 msgstr ""
 
-#: js/filelist.js:195
-msgid "with"
-msgstr ""
-
-#: js/filelist.js:195 js/filelist.js:246
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:246
+#: js/filelist.js:237
+msgid "with"
+msgstr ""
+
+#: js/filelist.js:271
 msgid "deleted"
 msgstr ""
 
@@ -95,44 +99,44 @@ msgstr ""
 msgid "Upload Error"
 msgstr ""
 
-#: js/files.js:236 js/files.js:327 js/files.js:356
+#: js/files.js:236 js/files.js:341 js/files.js:370
 msgid "Pending"
 msgstr ""
 
-#: js/files.js:341
+#: js/files.js:355
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:409
+#: js/files.js:423
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:480
+#: js/files.js:493
 msgid "Invalid name, '/' is not allowed."
 msgstr ""
 
-#: js/files.js:726 templates/index.php:55
+#: js/files.js:746 templates/index.php:55
 msgid "Size"
 msgstr ""
 
-#: js/files.js:727 templates/index.php:56
+#: js/files.js:747 templates/index.php:56
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:754
+#: js/files.js:774
 msgid "folder"
 msgstr ""
 
-#: js/files.js:756
+#: js/files.js:776
 msgid "folders"
 msgstr ""
 
-#: js/files.js:764
+#: js/files.js:784
 msgid "file"
 msgstr ""
 
-#: js/files.js:766
+#: js/files.js:786
 msgid "files"
 msgstr ""
 
diff --git a/l10n/bg_BG/core.po b/l10n/bg_BG/core.po
index f4673d7f74..681b5dd14b 100644
--- a/l10n/bg_BG/core.po
+++ b/l10n/bg_BG/core.po
@@ -11,15 +11,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-06 02:02+0200\n"
+"PO-Revision-Date: 2012-09-06 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"
 "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"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ajax/vcategories/add.php:23 ajax/vcategories/delete.php:23
 msgid "Application name not provided."
@@ -33,59 +33,55 @@ 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:206 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr "Настройки"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "January"
 msgstr "Януари"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "February"
 msgstr "Февруари"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "March"
 msgstr "Март"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "April"
 msgstr "Април"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "May"
 msgstr "Май"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "June"
 msgstr "Юни"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "July"
 msgstr "Юли"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "August"
 msgstr "Август"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "September"
 msgstr "Септември"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "October"
 msgstr "Октомври"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "November"
 msgstr "Ноември"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "December"
 msgstr "Декември"
 
@@ -117,7 +113,7 @@ msgstr "Грешка"
 msgid "ownCloud password reset"
 msgstr ""
 
-#: lostpassword/templates/email.php:1
+#: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr ""
 
diff --git a/l10n/bg_BG/files.po b/l10n/bg_BG/files.po
index 9eb5ac463a..c51de878e9 100644
--- a/l10n/bg_BG/files.po
+++ b/l10n/bg_BG/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-09-05 02:01+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-06 02:01+0200\n"
+"PO-Revision-Date: 2012-09-06 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"
@@ -57,31 +57,35 @@ msgstr "Файлове"
 msgid "Delete"
 msgstr "Изтриване"
 
-#: js/filelist.js:141
+#: js/filelist.js:186 js/filelist.js:188
 msgid "already exists"
 msgstr ""
 
-#: js/filelist.js:141
+#: js/filelist.js:186 js/filelist.js:188
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:141
+#: js/filelist.js:186
+msgid "suggest name"
+msgstr ""
+
+#: js/filelist.js:186 js/filelist.js:188
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:195
+#: js/filelist.js:235 js/filelist.js:237
 msgid "replaced"
 msgstr ""
 
-#: js/filelist.js:195
-msgid "with"
-msgstr ""
-
-#: js/filelist.js:195 js/filelist.js:246
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:246
+#: js/filelist.js:237
+msgid "with"
+msgstr ""
+
+#: js/filelist.js:271
 msgid "deleted"
 msgstr ""
 
@@ -97,44 +101,44 @@ msgstr ""
 msgid "Upload Error"
 msgstr "Грешка при качване"
 
-#: js/files.js:236 js/files.js:327 js/files.js:356
+#: js/files.js:236 js/files.js:341 js/files.js:370
 msgid "Pending"
 msgstr ""
 
-#: js/files.js:341
+#: js/files.js:355
 msgid "Upload cancelled."
 msgstr "Качването е отменено."
 
-#: js/files.js:409
+#: js/files.js:423
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:480
+#: js/files.js:493
 msgid "Invalid name, '/' is not allowed."
 msgstr "Неправилно име – \"/\" не е позволено."
 
-#: js/files.js:726 templates/index.php:55
+#: js/files.js:746 templates/index.php:55
 msgid "Size"
 msgstr "Размер"
 
-#: js/files.js:727 templates/index.php:56
+#: js/files.js:747 templates/index.php:56
 msgid "Modified"
 msgstr "Променено"
 
-#: js/files.js:754
+#: js/files.js:774
 msgid "folder"
 msgstr "папка"
 
-#: js/files.js:756
+#: js/files.js:776
 msgid "folders"
 msgstr "папки"
 
-#: js/files.js:764
+#: js/files.js:784
 msgid "file"
 msgstr "файл"
 
-#: js/files.js:766
+#: js/files.js:786
 msgid "files"
 msgstr ""
 
diff --git a/l10n/ca/core.po b/l10n/ca/core.po
index 821e89c924..6366450bdd 100644
--- a/l10n/ca/core.po
+++ b/l10n/ca/core.po
@@ -9,15 +9,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 02:01+0200\n"
-"PO-Revision-Date: 2012-08-31 11:29+0000\n"
-"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
+"POT-Creation-Date: 2012-09-06 02:02+0200\n"
+"PO-Revision-Date: 2012-09-06 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"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ca\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ajax/vcategories/add.php:23 ajax/vcategories/delete.php:23
 msgid "Application name not provided."
@@ -31,59 +31,55 @@ 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 "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
-
-#: js/js.js:206 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr "Arranjament"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "January"
 msgstr "Gener"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "February"
 msgstr "Febrer"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "March"
 msgstr "Març"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "April"
 msgstr "Abril"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "May"
 msgstr "Maig"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "June"
 msgstr "Juny"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "July"
 msgstr "Juliol"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "August"
 msgstr "Agost"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "September"
 msgstr "Setembre"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "October"
 msgstr "Octubre"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "November"
 msgstr "Novembre"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "December"
 msgstr "Desembre"
 
@@ -115,7 +111,7 @@ msgstr "Error"
 msgid "ownCloud password reset"
 msgstr "estableix de nou la contrasenya Owncloud"
 
-#: lostpassword/templates/email.php:1
+#: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr "Useu l'enllaç següent per restablir la contrasenya: {link}"
 
diff --git a/l10n/ca/files.po b/l10n/ca/files.po
index 93e8a18260..baaa56b4eb 100644
--- a/l10n/ca/files.po
+++ b/l10n/ca/files.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <bury1000@gmail.com>, 2012.
 #   <joan@montane.cat>, 2012.
 #   <rcalvoi@yahoo.com>, 2011-2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-05 02:01+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-06 02:01+0200\n"
+"PO-Revision-Date: 2012-09-06 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"
@@ -57,31 +58,35 @@ msgstr "Fitxers"
 msgid "Delete"
 msgstr "Suprimeix"
 
-#: js/filelist.js:141
+#: js/filelist.js:186 js/filelist.js:188
 msgid "already exists"
 msgstr "ja existeix"
 
-#: js/filelist.js:141
+#: js/filelist.js:186 js/filelist.js:188
 msgid "replace"
 msgstr "substitueix"
 
-#: js/filelist.js:141
+#: js/filelist.js:186
+msgid "suggest name"
+msgstr ""
+
+#: js/filelist.js:186 js/filelist.js:188
 msgid "cancel"
 msgstr "cancel·la"
 
-#: js/filelist.js:195
+#: js/filelist.js:235 js/filelist.js:237
 msgid "replaced"
 msgstr "substituït"
 
-#: js/filelist.js:195
-msgid "with"
-msgstr "per"
-
-#: js/filelist.js:195 js/filelist.js:246
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
 msgid "undo"
 msgstr "desfés"
 
-#: js/filelist.js:246
+#: js/filelist.js:237
+msgid "with"
+msgstr "per"
+
+#: js/filelist.js:271
 msgid "deleted"
 msgstr "esborrat"
 
@@ -97,44 +102,44 @@ msgstr "No es pot pujar el fitxer perquè és una carpeta o té 0 bytes"
 msgid "Upload Error"
 msgstr "Error en la pujada"
 
-#: js/files.js:236 js/files.js:327 js/files.js:356
+#: js/files.js:236 js/files.js:341 js/files.js:370
 msgid "Pending"
 msgstr "Pendents"
 
-#: js/files.js:341
+#: js/files.js:355
 msgid "Upload cancelled."
 msgstr "La pujada s'ha cancel·lat."
 
-#: js/files.js:409
+#: js/files.js:423
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Hi ha una pujada en curs. Si abandoneu la pàgina la pujada es cancel·larà."
 
-#: js/files.js:480
+#: js/files.js:493
 msgid "Invalid name, '/' is not allowed."
 msgstr "El nom no és vàlid, no es permet '/'."
 
-#: js/files.js:726 templates/index.php:55
+#: js/files.js:746 templates/index.php:55
 msgid "Size"
 msgstr "Mida"
 
-#: js/files.js:727 templates/index.php:56
+#: js/files.js:747 templates/index.php:56
 msgid "Modified"
 msgstr "Modificat"
 
-#: js/files.js:754
+#: js/files.js:774
 msgid "folder"
 msgstr "carpeta"
 
-#: js/files.js:756
+#: js/files.js:776
 msgid "folders"
 msgstr "carpetes"
 
-#: js/files.js:764
+#: js/files.js:784
 msgid "file"
 msgstr "fitxer"
 
-#: js/files.js:766
+#: js/files.js:786
 msgid "files"
 msgstr "fitxers"
 
@@ -168,7 +173,7 @@ msgstr "Mida màxima d'entrada per fitxers ZIP"
 
 #: templates/admin.php:14
 msgid "Save"
-msgstr ""
+msgstr "Desar"
 
 #: templates/index.php:7
 msgid "New"
diff --git a/l10n/ca/settings.po b/l10n/ca/settings.po
index baded31fd5..28539a5b19 100644
--- a/l10n/ca/settings.po
+++ b/l10n/ca/settings.po
@@ -3,15 +3,16 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <bury1000@gmail.com>, 2012.
 #   <joan@montane.cat>, 2012.
 #   <rcalvoi@yahoo.com>, 2011-2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-05 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-06 02:02+0200\n"
+"PO-Revision-Date: 2012-09-05 11:42+0000\n"
+"Last-Translator: bury1000 <bury1000@gmail.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"
@@ -67,12 +68,12 @@ msgstr "S'ha canviat l'idioma"
 #: ajax/togglegroups.php:25
 #, php-format
 msgid "Unable to add user to group %s"
-msgstr ""
+msgstr "No es pot afegir l'usuari al grup %s"
 
 #: ajax/togglegroups.php:31
 #, php-format
 msgid "Unable to remove user from group %s"
-msgstr ""
+msgstr "No es pot eliminar l'usuari del grup %s"
 
 #: js/apps.js:18
 msgid "Error"
@@ -191,7 +192,7 @@ msgstr "Mireu la pàgina d'aplicacions a apps.owncloud.com"
 
 #: templates/apps.php:30
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
-msgstr ""
+msgstr "<span class=\"licence\"></span>-propietat de <span class=\"author\"></span>"
 
 #: templates/help.php:9
 msgid "Documentation"
diff --git a/l10n/cs_CZ/core.po b/l10n/cs_CZ/core.po
index 3db3e84583..c1d1ba2da0 100644
--- a/l10n/cs_CZ/core.po
+++ b/l10n/cs_CZ/core.po
@@ -4,25 +4,26 @@
 # 
 # Translators:
 # Jan Krejci <krejca85@gmail.com>, 2011.
-# Martin  <fireball@atlas.cz>, 2011, 2012.
+# Martin  <fireball@atlas.cz>, 2011-2012.
 # Michal Hrušecký <Michal@hrusecky.net>, 2012.
+# Tomáš Chvátal <tomas.chvatal@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-06 02:02+0200\n"
+"PO-Revision-Date: 2012-09-06 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"
 "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"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #: ajax/vcategories/add.php:23 ajax/vcategories/delete.php:23
 msgid "Application name not provided."
-msgstr "Jméno aplikace nezadáno."
+msgstr "Nezadán název aplikace."
 
 #: ajax/vcategories/add.php:29
 msgid "No category to add?"
@@ -30,61 +31,57 @@ msgstr "Žádná kategorie k přidání?"
 
 #: ajax/vcategories/add.php:36
 msgid "This category already exists: "
-msgstr "Tato kategorie již existuje:"
+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:206 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr "Nastavení"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "January"
 msgstr "Leden"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "February"
 msgstr "Únor"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "March"
 msgstr "Březen"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "April"
 msgstr "Duben"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "May"
 msgstr "Květen"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "June"
 msgstr "Červen"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "July"
 msgstr "Červenec"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "August"
 msgstr "Srpen"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "September"
 msgstr "Září"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "October"
 msgstr "Říjen"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "November"
 msgstr "Listopad"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "December"
 msgstr "Prosinec"
 
@@ -102,7 +99,7 @@ msgstr "Ano"
 
 #: js/oc-dialogs.js:177
 msgid "Ok"
-msgstr "Budiž"
+msgstr "Ok"
 
 #: js/oc-vcategories.js:68
 msgid "No categories selected for deletion."
@@ -114,15 +111,15 @@ msgstr "Chyba"
 
 #: lostpassword/index.php:26
 msgid "ownCloud password reset"
-msgstr "Reset hesla pro ownCloud"
+msgstr "Obnovení hesla pro ownCloud"
 
-#: lostpassword/templates/email.php:1
+#: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
-msgstr "Heslo vyresetujete použitím následujícího odkazu: {link}"
+msgstr "Heslo obnovíte použitím následujícího odkazu: {link}"
 
 #: lostpassword/templates/lostpassword.php:3
 msgid "You will receive a link to reset your password via Email."
-msgstr "Bude Vám zaslán odkaz pro obnovu hesla"
+msgstr "Bude Vám e-mailem zaslán odkaz pro obnovu hesla."
 
 #: lostpassword/templates/lostpassword.php:5
 msgid "Requested"
@@ -130,7 +127,7 @@ msgstr "Požadováno"
 
 #: lostpassword/templates/lostpassword.php:8
 msgid "Login failed!"
-msgstr "Přihlášení selhalo"
+msgstr "Přihlášení selhalo."
 
 #: lostpassword/templates/lostpassword.php:11 templates/installation.php:26
 #: templates/login.php:9
@@ -171,7 +168,7 @@ msgstr "Aplikace"
 
 #: strings.php:8
 msgid "Admin"
-msgstr "Admin"
+msgstr "Administrace"
 
 #: strings.php:9
 msgid "Help"
@@ -179,7 +176,7 @@ msgstr "Nápověda"
 
 #: templates/403.php:12
 msgid "Access forbidden"
-msgstr "Přístup odmítnut"
+msgstr "Přístup zakázán"
 
 #: templates/404.php:12
 msgid "Cloud not found"
@@ -203,15 +200,15 @@ msgstr "Heslo"
 
 #: templates/installation.php:36
 msgid "Advanced"
-msgstr "Rozšířené volby"
+msgstr "Pokročilé"
 
 #: templates/installation.php:38
 msgid "Data folder"
-msgstr "Datový adresář"
+msgstr "Složka s daty"
 
 #: templates/installation.php:45
 msgid "Configure the database"
-msgstr "Konfigurace databáze"
+msgstr "Nastavit databázi"
 
 #: templates/installation.php:50 templates/installation.php:61
 #: templates/installation.php:71 templates/installation.php:81
@@ -224,7 +221,7 @@ msgstr "Uživatel databáze"
 
 #: templates/installation.php:97
 msgid "Database password"
-msgstr "Heslo k databázi"
+msgstr "Heslo databáze"
 
 #: templates/installation.php:101
 msgid "Database name"
@@ -232,7 +229,7 @@ msgstr "Název databáze"
 
 #: templates/installation.php:109
 msgid "Database tablespace"
-msgstr ""
+msgstr "Tabulkový prostor databáze"
 
 #: templates/installation.php:115
 msgid "Database host"
@@ -240,7 +237,7 @@ msgstr "Hostitel databáze"
 
 #: templates/installation.php:120
 msgid "Finish setup"
-msgstr "Dokončit instalaci"
+msgstr "Dokončit nastavení"
 
 #: templates/layout.guest.php:42
 msgid "web services under your control"
@@ -252,7 +249,7 @@ msgstr "Odhlásit se"
 
 #: templates/login.php:6
 msgid "Lost your password?"
-msgstr "Zapomenuté heslo?"
+msgstr "Ztratili jste své heslo?"
 
 #: templates/login.php:17
 msgid "remember"
@@ -260,7 +257,7 @@ msgstr "zapamatovat si"
 
 #: templates/login.php:18
 msgid "Log in"
-msgstr "Login"
+msgstr "Přihlásit"
 
 #: templates/logout.php:1
 msgid "You are logged out."
@@ -268,8 +265,8 @@ msgstr "Jste odhlášeni."
 
 #: templates/part.pagenavi.php:3
 msgid "prev"
-msgstr "zpět"
+msgstr "předchozí"
 
 #: templates/part.pagenavi.php:20
 msgid "next"
-msgstr "vpřed"
+msgstr "následující"
diff --git a/l10n/cs_CZ/files.po b/l10n/cs_CZ/files.po
index 2e9b7e78c1..53a6691385 100644
--- a/l10n/cs_CZ/files.po
+++ b/l10n/cs_CZ/files.po
@@ -3,14 +3,15 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Martin  <fireball@atlas.cz>, 2011, 2012.
+# Martin  <fireball@atlas.cz>, 2011-2012.
 # Michal Hrušecký <Michal@hrusecky.net>, 2012.
+# Tomáš Chvátal <tomas.chvatal@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-05 02:01+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-06 02:01+0200\n"
+"PO-Revision-Date: 2012-09-06 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"
@@ -25,13 +26,13 @@ msgstr "Soubor byl odeslán úspěšně"
 
 #: 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"
+msgstr "Odeslaný soubor přesáhl svou velikostí parametr upload_max_filesize v php.ini"
 
 #: 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"
+msgstr "Odeslaný soubor přesáhl svou velikostí parametr MAX_FILE_SIZE specifikovaný v formuláři HTML"
 
 #: ajax/upload.php:23
 msgid "The uploaded file was only partially uploaded"
@@ -39,15 +40,15 @@ msgstr "Soubor byl odeslán pouze částečně"
 
 #: ajax/upload.php:24
 msgid "No file was uploaded"
-msgstr "Soubor nebyl odeslán"
+msgstr "Žádný soubor nebyl odeslán"
 
 #: ajax/upload.php:25
 msgid "Missing a temporary folder"
-msgstr "Chybí adresář pro sočasné soubory"
+msgstr "Chybí adresář pro dočasné soubory"
 
 #: ajax/upload.php:26
 msgid "Failed to write to disk"
-msgstr "Zápis na disk se nezdařil"
+msgstr "Zápis na disk selhal"
 
 #: appinfo/app.php:6
 msgid "Files"
@@ -55,104 +56,108 @@ msgstr "Soubory"
 
 #: js/fileactions.js:106 templates/index.php:56
 msgid "Delete"
-msgstr "Vymazat"
+msgstr "Smazat"
 
-#: js/filelist.js:141
+#: js/filelist.js:186 js/filelist.js:188
 msgid "already exists"
 msgstr "již existuje"
 
-#: js/filelist.js:141
+#: js/filelist.js:186 js/filelist.js:188
 msgid "replace"
-msgstr "zaměnit"
+msgstr "nahradit"
 
-#: js/filelist.js:141
+#: js/filelist.js:186
+msgid "suggest name"
+msgstr ""
+
+#: js/filelist.js:186 js/filelist.js:188
 msgid "cancel"
-msgstr "storno"
+msgstr "zrušit"
 
-#: js/filelist.js:195
+#: js/filelist.js:235 js/filelist.js:237
 msgid "replaced"
-msgstr "zaměněno"
+msgstr "nahrazeno"
 
-#: js/filelist.js:195
-msgid "with"
-msgstr "s"
-
-#: js/filelist.js:195 js/filelist.js:246
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
 msgid "undo"
 msgstr "zpět"
 
-#: js/filelist.js:246
+#: js/filelist.js:237
+msgid "with"
+msgstr "s"
+
+#: js/filelist.js:271
 msgid "deleted"
 msgstr "smazáno"
 
 #: js/files.js:179
 msgid "generating ZIP-file, it may take some time."
-msgstr "generuji ZIP soubor, může to chvíli trvat"
+msgstr "generuji ZIP soubor, může to nějakou dobu trvat."
 
 #: js/files.js:208
 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."
+msgstr "Nelze odeslat Váš soubor, protože je to adresář nebo má velikost 0 bajtů"
 
 #: js/files.js:208
 msgid "Upload Error"
-msgstr "Chyba při nahrávání"
+msgstr "Chyba odesílání"
 
-#: js/files.js:236 js/files.js:327 js/files.js:356
+#: js/files.js:236 js/files.js:341 js/files.js:370
 msgid "Pending"
-msgstr "Očekává se"
+msgstr "Čekající"
 
-#: js/files.js:341
+#: js/files.js:355
 msgid "Upload cancelled."
-msgstr "Nahrávání zrušeno"
+msgstr "Odesílání zrušeno."
 
-#: js/files.js:409
+#: js/files.js:423
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
-msgstr ""
+msgstr "Probíhá odesílání souboru. Opuštění stránky vyústí ve zrušení nahrávání."
 
-#: js/files.js:480
+#: js/files.js:493
 msgid "Invalid name, '/' is not allowed."
-msgstr "Špatné jméno, znak '/' není povolen"
+msgstr "Neplatný název, znak '/' není povolen"
 
-#: js/files.js:726 templates/index.php:55
+#: js/files.js:746 templates/index.php:55
 msgid "Size"
 msgstr "Velikost"
 
-#: js/files.js:727 templates/index.php:56
+#: js/files.js:747 templates/index.php:56
 msgid "Modified"
 msgstr "Změněno"
 
-#: js/files.js:754
+#: js/files.js:774
 msgid "folder"
-msgstr "adresář"
+msgstr "složka"
 
-#: js/files.js:756
+#: js/files.js:776
 msgid "folders"
-msgstr "adresáře"
+msgstr "složky"
 
-#: js/files.js:764
+#: js/files.js:784
 msgid "file"
 msgstr "soubor"
 
-#: js/files.js:766
+#: js/files.js:786
 msgid "files"
 msgstr "soubory"
 
 #: templates/admin.php:5
 msgid "File handling"
-msgstr "Nastavení chování k souborům"
+msgstr "Zacházení se soubory"
 
 #: templates/admin.php:7
 msgid "Maximum upload size"
-msgstr "Maximální velikost ukládaných souborů"
+msgstr "Maximální velikost pro odesílání"
 
 #: templates/admin.php:7
 msgid "max. possible: "
-msgstr "největší možná:"
+msgstr "největší možná: "
 
 #: templates/admin.php:9
 msgid "Needed for multi-file and folder downloads."
-msgstr "Potřeba pro vícesoborvé stahování a stahování adresářů"
+msgstr "Potřebné pro více-souborové stahování a stahování složek."
 
 #: templates/admin.php:9
 msgid "Enable ZIP-download"
@@ -168,7 +173,7 @@ msgstr "Maximální velikost vstupu pro ZIP soubory"
 
 #: templates/admin.php:14
 msgid "Save"
-msgstr ""
+msgstr "Uložit"
 
 #: templates/index.php:7
 msgid "New"
@@ -180,7 +185,7 @@ msgstr "Textový soubor"
 
 #: templates/index.php:10
 msgid "Folder"
-msgstr "Adresář"
+msgstr "Složka"
 
 #: templates/index.php:11
 msgid "From url"
@@ -188,15 +193,15 @@ msgstr "Z url"
 
 #: templates/index.php:21
 msgid "Upload"
-msgstr "Uložit"
+msgstr "Odeslat"
 
 #: templates/index.php:27
 msgid "Cancel upload"
-msgstr "Zrušit upload"
+msgstr "Zrušit odesílání"
 
 #: templates/index.php:39
 msgid "Nothing in here. Upload something!"
-msgstr "Žádný obsah. Uložte si něco!"
+msgstr "Žádný obsah. Nahrajte něco."
 
 #: templates/index.php:47
 msgid "Name"
@@ -212,13 +217,13 @@ msgstr "Stáhnout"
 
 #: templates/index.php:64
 msgid "Upload too large"
-msgstr "Příliš velký soubor"
+msgstr "Odeslaný soubor je příliš velký"
 
 #: templates/index.php:66
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
-msgstr "Soubory, které se snažíte uložit, překračují maximální velikosti uploadu na tomto serveru."
+msgstr "Soubory, které se snažíte odeslat, překračují limit velikosti odesílání na tomto serveru."
 
 #: templates/index.php:71
 msgid "Files are being scanned, please wait."
diff --git a/l10n/cs_CZ/files_encryption.po b/l10n/cs_CZ/files_encryption.po
index 4055cc18fc..96298cc220 100644
--- a/l10n/cs_CZ/files_encryption.po
+++ b/l10n/cs_CZ/files_encryption.po
@@ -4,32 +4,33 @@
 # 
 # Translators:
 # Martin  <fireball@atlas.cz>, 2012.
+# Tomáš Chvátal <tomas.chvatal@gmail.com>, 2012.
 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:33+0000\n"
-"Last-Translator: Martin <fireball@atlas.cz>\n"
+"POT-Creation-Date: 2012-09-06 02:01+0200\n"
+"PO-Revision-Date: 2012-09-05 13:37+0000\n"
+"Last-Translator: Tomáš Chvátal <tomas.chvatal@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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: cs_CZ\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #: templates/settings.php:3
 msgid "Encryption"
-msgstr "Kryptování"
+msgstr "Šifrování"
 
 #: templates/settings.php:4
 msgid "Exclude the following file types from encryption"
-msgstr "Při kryptování vynechat následující typy souborů"
+msgstr "Při šifrování vynechat následující typy souborů"
 
 #: templates/settings.php:5
 msgid "None"
-msgstr "Žádný"
+msgstr "Žádné"
 
 #: templates/settings.php:10
 msgid "Enable Encryption"
-msgstr "Povolit kryptování"
+msgstr "Povolit šifrování"
diff --git a/l10n/cs_CZ/files_external.po b/l10n/cs_CZ/files_external.po
index 8c21e14483..90f40c4ffc 100644
--- a/l10n/cs_CZ/files_external.po
+++ b/l10n/cs_CZ/files_external.po
@@ -6,19 +6,20 @@
 # Jan Krejci <krejca85@gmail.com>, 2012.
 # Martin  <fireball@atlas.cz>, 2012.
 # Michal Hrušecký <Michal@hrusecky.net>, 2012.
+# Tomáš Chvátal <tomas.chvatal@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-28 19:11+0000\n"
-"Last-Translator: Martin <fireball@atlas.cz>\n"
+"POT-Creation-Date: 2012-09-06 02:01+0200\n"
+"PO-Revision-Date: 2012-09-05 13:37+0000\n"
+"Last-Translator: Tomáš Chvátal <tomas.chvatal@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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: cs_CZ\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #: templates/settings.php:3
 msgid "External Storage"
@@ -30,15 +31,15 @@ msgstr "Přípojný bod"
 
 #: templates/settings.php:8
 msgid "Backend"
-msgstr "Končící"
+msgstr "Podpůrná vrstva"
 
 #: templates/settings.php:9
 msgid "Configuration"
-msgstr "Konfigurace"
+msgstr "Nastavení"
 
 #: templates/settings.php:10
 msgid "Options"
-msgstr "Nastavení"
+msgstr "Možnosti"
 
 #: templates/settings.php:11
 msgid "Applicable"
@@ -46,7 +47,7 @@ msgstr "Platný"
 
 #: templates/settings.php:23
 msgid "Add mount point"
-msgstr "Přidat přípojný bod"
+msgstr "Přidat bod připojení"
 
 #: templates/settings.php:54 templates/settings.php:62
 msgid "None set"
@@ -70,16 +71,16 @@ msgstr "Smazat"
 
 #: templates/settings.php:88
 msgid "SSL root certificates"
-msgstr "Kořenové SSL certifikáty"
+msgstr "Kořenové certifikáty SSL"
 
 #: templates/settings.php:102
 msgid "Import Root Certificate"
-msgstr "Import kořenového certifikátu"
+msgstr "Importovat kořenového certifikátu"
 
 #: templates/settings.php:108
 msgid "Enable User External Storage"
-msgstr "Zapnout uživatelské externí úložiště"
+msgstr "Zapnout externí uživatelské úložiště"
 
 #: templates/settings.php:109
 msgid "Allow users to mount their own external storage"
-msgstr "Povolit uživatelů připojit jejich vlastní externí úložiště"
+msgstr "Povolit uživatelům připojení jejich vlastních externích úložišť"
diff --git a/l10n/cs_CZ/files_sharing.po b/l10n/cs_CZ/files_sharing.po
index 1927da6f11..d4c56e7635 100644
--- a/l10n/cs_CZ/files_sharing.po
+++ b/l10n/cs_CZ/files_sharing.po
@@ -5,19 +5,20 @@
 # Translators:
 # Martin  <fireball@atlas.cz>, 2012.
 # Michal Hrušecký <Michal@hrusecky.net>, 2012.
+# Tomáš Chvátal <tomas.chvatal@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-06 02:01+0200\n"
+"PO-Revision-Date: 2012-09-05 13:37+0000\n"
+"Last-Translator: Tomáš Chvátal <tomas.chvatal@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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: cs_CZ\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #: templates/authenticate.php:4
 msgid "Password"
@@ -25,16 +26,16 @@ msgstr "Heslo"
 
 #: templates/authenticate.php:6
 msgid "Submit"
-msgstr "Potvrdit"
+msgstr "Odeslat"
 
 #: templates/public.php:9 templates/public.php:19
 msgid "Download"
-msgstr ""
+msgstr "Stáhnout"
 
 #: templates/public.php:18
 msgid "No preview available for"
-msgstr ""
+msgstr "Náhled není dostupný pro"
 
-#: templates/public.php:23
+#: templates/public.php:25
 msgid "web services under your control"
-msgstr ""
+msgstr "služby webu pod Vaší kontrolou"
diff --git a/l10n/cs_CZ/files_versions.po b/l10n/cs_CZ/files_versions.po
index a75fe502f6..0c6a43324f 100644
--- a/l10n/cs_CZ/files_versions.po
+++ b/l10n/cs_CZ/files_versions.po
@@ -4,31 +4,32 @@
 # 
 # Translators:
 # Martin  <fireball@atlas.cz>, 2012.
+# Tomáš Chvátal <tomas.chvatal@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 13:35+0200\n"
-"PO-Revision-Date: 2012-09-01 11:35+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-06 02:02+0200\n"
+"PO-Revision-Date: 2012-09-05 13:37+0000\n"
+"Last-Translator: Tomáš Chvátal <tomas.chvatal@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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: cs_CZ\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #: js/settings-personal.js:31 templates/settings-personal.php:10
 msgid "Expire all versions"
-msgstr "Vypršení všech verzí"
+msgstr "Vypršet všechny verze"
 
 #: templates/settings-personal.php:4
 msgid "Versions"
-msgstr ""
+msgstr "Verze"
 
 #: templates/settings-personal.php:7
 msgid "This will delete all existing backup versions of your files"
-msgstr ""
+msgstr "Odstraní všechny existující zálohované verze Vašich souborů"
 
 #: templates/settings.php:3
 msgid "Enable Files Versioning"
diff --git a/l10n/cs_CZ/lib.po b/l10n/cs_CZ/lib.po
index 35f62dc63c..eb0f3cb40a 100644
--- a/l10n/cs_CZ/lib.po
+++ b/l10n/cs_CZ/lib.po
@@ -4,19 +4,20 @@
 # 
 # Translators:
 # Martin  <fireball@atlas.cz>, 2012.
+# Tomáš Chvátal <tomas.chvatal@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 02:01+0200\n"
-"PO-Revision-Date: 2012-09-01 00:02+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-06 02:02+0200\n"
+"PO-Revision-Date: 2012-09-05 13:37+0000\n"
+"Last-Translator: Tomáš Chvátal <tomas.chvatal@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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: cs_CZ\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #: app.php:288
 msgid "Help"
@@ -40,7 +41,7 @@ msgstr "Aplikace"
 
 #: app.php:314
 msgid "Admin"
-msgstr "Admin"
+msgstr "Administrace"
 
 #: files.php:280
 msgid "ZIP download is turned off."
@@ -48,7 +49,7 @@ msgstr "Stahování ZIPu je vypnuto."
 
 #: files.php:281
 msgid "Files need to be downloaded one by one."
-msgstr "Soubory je nutno stahovat samostatně."
+msgstr "Soubory musí být stahovány jednotlivě."
 
 #: files.php:281 files.php:306
 msgid "Back to Files"
@@ -56,7 +57,7 @@ msgstr "Zpět k souborům"
 
 #: files.php:305
 msgid "Selected files too large to generate zip file."
-msgstr "Vybarné soubory jsou pro vytvoření zipu příliš velké."
+msgstr "Vybrané soubory jsou příliš velké pro vytvoření zip souboru."
 
 #: json.php:28
 msgid "Application is not enabled"
@@ -64,63 +65,63 @@ msgstr "Aplikace není povolena"
 
 #: json.php:39 json.php:63 json.php:75
 msgid "Authentication error"
-msgstr "Chyba autorizace"
+msgstr "Chyba ověření"
 
 #: json.php:51
 msgid "Token expired. Please reload page."
-msgstr "Realce expirovala. Obnovte prosím stranu."
+msgstr "Token vypršel. Obnovte prosím stránku."
 
-#: template.php:86
+#: template.php:87
 msgid "seconds ago"
 msgstr "před vteřinami"
 
-#: template.php:87
+#: template.php:88
 msgid "1 minute ago"
 msgstr "před 1 minutou"
 
-#: template.php:88
+#: template.php:89
 #, php-format
 msgid "%d minutes ago"
 msgstr "před %d minutami"
 
-#: template.php:91
+#: template.php:92
 msgid "today"
 msgstr "dnes"
 
-#: template.php:92
+#: template.php:93
 msgid "yesterday"
 msgstr "včera"
 
-#: template.php:93
+#: template.php:94
 #, php-format
 msgid "%d days ago"
 msgstr "před %d dny"
 
-#: template.php:94
+#: template.php:95
 msgid "last month"
 msgstr "minulý měsíc"
 
-#: template.php:95
+#: template.php:96
 msgid "months ago"
 msgstr "před měsíci"
 
-#: template.php:96
+#: template.php:97
 msgid "last year"
 msgstr "loni"
 
-#: template.php:97
+#: template.php:98
 msgid "years ago"
 msgstr "před lety"
 
 #: updater.php:66
 #, php-format
 msgid "%s is available. Get <a href=\"%s\">more information</a>"
-msgstr ""
+msgstr "%s je dostupná. Získat <a href=\"%s\">více informací</a>"
 
 #: updater.php:68
 msgid "up to date"
-msgstr ""
+msgstr "aktuální"
 
 #: updater.php:71
 msgid "updates check is disabled"
-msgstr ""
+msgstr "kontrola aktualizací je vypnuta"
diff --git a/l10n/cs_CZ/settings.po b/l10n/cs_CZ/settings.po
index b83f36882a..3511d379d6 100644
--- a/l10n/cs_CZ/settings.po
+++ b/l10n/cs_CZ/settings.po
@@ -4,17 +4,18 @@
 # 
 # Translators:
 #   <icewind1991@gmail.com>, 2012.
-# Jan Krejci <krejca85@gmail.com>, 2011, 2012.
+# Jan Krejci <krejca85@gmail.com>, 2011-2012.
 # Martin  <fireball@atlas.cz>, 2011-2012.
 # Michal Hrušecký <Michal@hrusecky.net>, 2012.
 #   <Michal@hrusecky.net>, 2012.
+# Tomáš Chvátal <tomas.chvatal@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-05 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-06 02:02+0200\n"
+"PO-Revision-Date: 2012-09-05 13:36+0000\n"
+"Last-Translator: Tomáš Chvátal <tomas.chvatal@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"
@@ -24,20 +25,20 @@ msgstr ""
 
 #: ajax/apps/ocs.php:23
 msgid "Unable to load list from App Store"
-msgstr "Nepodařílo se stáhnout seznam z App Store"
+msgstr "Nelze načíst seznam z App Store"
 
 #: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
 #: ajax/togglegroups.php:15
 msgid "Authentication error"
-msgstr "Chyba autorizace"
+msgstr "Chyba ověření"
 
 #: ajax/creategroup.php:19
 msgid "Group already exists"
-msgstr ""
+msgstr "Skupina již existuje"
 
 #: ajax/creategroup.php:28
 msgid "Unable to add group"
-msgstr ""
+msgstr "Nelze přidat skupinu"
 
 #: ajax/lostpassword.php:14
 msgid "Email saved"
@@ -49,19 +50,19 @@ msgstr "Neplatný e-mail"
 
 #: ajax/openid.php:16
 msgid "OpenID Changed"
-msgstr "OpenID změněn"
+msgstr "OpenID změněno"
 
 #: ajax/openid.php:18 ajax/setlanguage.php:20 ajax/setlanguage.php:23
 msgid "Invalid request"
-msgstr "Chybný dotaz"
+msgstr "Neplatný požadavek"
 
 #: ajax/removegroup.php:16
 msgid "Unable to delete group"
-msgstr ""
+msgstr "Nelze smazat skupinu"
 
 #: ajax/removeuser.php:22
 msgid "Unable to delete user"
-msgstr ""
+msgstr "Nelze smazat uživatele"
 
 #: ajax/setlanguage.php:18
 msgid "Language changed"
@@ -70,12 +71,12 @@ msgstr "Jazyk byl změněn"
 #: ajax/togglegroups.php:25
 #, php-format
 msgid "Unable to add user to group %s"
-msgstr ""
+msgstr "Nelze přidat uživatele do skupiny %s"
 
 #: ajax/togglegroups.php:31
 #, php-format
 msgid "Unable to remove user from group %s"
-msgstr ""
+msgstr "Nelze odstranit uživatele ze skupiny %s"
 
 #: js/apps.js:18
 msgid "Error"
@@ -83,11 +84,11 @@ msgstr "Chyba"
 
 #: js/apps.js:39 js/apps.js:73
 msgid "Disable"
-msgstr "Vypnout"
+msgstr "Zakázat"
 
 #: js/apps.js:39 js/apps.js:62
 msgid "Enable"
-msgstr "Zapnout"
+msgstr "Povolit"
 
 #: js/personal.js:69
 msgid "Saving..."
@@ -99,7 +100,7 @@ msgstr "Česky"
 
 #: templates/admin.php:14
 msgid "Security Warning"
-msgstr "Bezpečnostní upozornění"
+msgstr "Bezpečnostní varování"
 
 #: templates/admin.php:17
 msgid ""
@@ -108,7 +109,7 @@ msgid ""
 "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."
-msgstr ""
+msgstr "Váš adresář dat a soubory jsou pravděpodobně přístupné z internetu. Soubor .htacces, který ownCloud poskytuje nefunguje. Doporučujeme Vám abyste nastavili Váš webový server tak, aby nebylo možno přistupovat do adresáře s daty, nebo přesunuli adresář dat mimo kořenovou složku dokumentů webového serveru."
 
 #: templates/admin.php:31
 msgid "Cron"
@@ -116,7 +117,7 @@ msgstr "Cron"
 
 #: templates/admin.php:33
 msgid "execute one task with each page loaded"
-msgstr "spustit jednu úlohu s každou nataženou stranou"
+msgstr "spustit jednu úlohu s každou načtenou stránkou"
 
 #: templates/admin.php:35
 msgid "cron.php is registered at a webcron service"
@@ -124,47 +125,47 @@ msgstr "cron.php je registrován jako služba webcron"
 
 #: templates/admin.php:37
 msgid "use systems cron service"
-msgstr "použijte systémovou službu cron"
+msgstr "použít systémovou službu cron"
 
 #: templates/admin.php:41
 msgid "Share API"
-msgstr ""
+msgstr "API sdílení"
 
 #: templates/admin.php:46
 msgid "Enable Share API"
-msgstr ""
+msgstr "Povolit API sdílení"
 
 #: templates/admin.php:47
 msgid "Allow apps to use the Share API"
-msgstr ""
+msgstr "Povolit aplikacím používat API sdílení"
 
 #: templates/admin.php:51
 msgid "Allow links"
-msgstr ""
+msgstr "Povolit odkazy"
 
 #: templates/admin.php:52
 msgid "Allow users to share items to the public with links"
-msgstr ""
+msgstr "Povolit uživatelům sdílet položky s veřejností pomocí odkazů"
 
 #: templates/admin.php:56
 msgid "Allow resharing"
-msgstr ""
+msgstr "Povolit znovu-sdílení"
 
 #: templates/admin.php:57
 msgid "Allow users to share items shared with them again"
-msgstr ""
+msgstr "Povolit uživatelům znovu sdílet položky, které jsou pro ně sdíleny"
 
 #: templates/admin.php:60
 msgid "Allow users to share with anyone"
-msgstr ""
+msgstr "Povolit uživatelům sdílet s kýmkoliv"
 
 #: templates/admin.php:62
 msgid "Allow users to only share with users in their groups"
-msgstr ""
+msgstr "Povolit uživatelům sdílet pouze s uživateli v jejich skupinách"
 
 #: templates/admin.php:69
 msgid "Log"
-msgstr "Log"
+msgstr "Záznam"
 
 #: templates/admin.php:97
 msgid "More"
@@ -178,11 +179,11 @@ msgid ""
 "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>."
-msgstr ""
+msgstr "Vyvinuto <a href=\"http://ownCloud.org/contact\" target=\"_blank\">komunitou ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">zdrojový kód</a> je licencován pod <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
 
 #: templates/apps.php:10
 msgid "Add your App"
-msgstr "Přidat vaší aplikaci"
+msgstr "Přidat Vaší aplikaci"
 
 #: templates/apps.php:26
 msgid "Select an App"
@@ -194,7 +195,7 @@ msgstr "Více na stránce s aplikacemi na apps.owncloud.com"
 
 #: templates/apps.php:30
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
-msgstr ""
+msgstr "<span class=\"licence\"></span>-licencováno <span class=\"author\"></span>"
 
 #: templates/help.php:9
 msgid "Documentation"
@@ -202,7 +203,7 @@ msgstr "Dokumentace"
 
 #: templates/help.php:10
 msgid "Managing Big Files"
-msgstr "Spravování velkých souborů"
+msgstr "Správa velkých souborů"
 
 #: templates/help.php:11
 msgid "Ask a question"
@@ -242,11 +243,11 @@ msgstr "Vaše heslo bylo změněno"
 
 #: templates/personal.php:20
 msgid "Unable to change your password"
-msgstr "Vaše heslo se nepodařilo změnit"
+msgstr "Vaše heslo nelze změnit"
 
 #: templates/personal.php:21
 msgid "Current password"
-msgstr "Aktuální heslo"
+msgstr "Současné heslo"
 
 #: templates/personal.php:22
 msgid "New password"
@@ -262,15 +263,15 @@ msgstr "Změnit heslo"
 
 #: templates/personal.php:30
 msgid "Email"
-msgstr "Email"
+msgstr "E-mail"
 
 #: templates/personal.php:31
 msgid "Your email address"
-msgstr "Vaše emailová adresa"
+msgstr "Vaše e-mailová adresa"
 
 #: templates/personal.php:32
 msgid "Fill in an email address to enable password recovery"
-msgstr "Pro povolení změny hesla vyplňte email adresu"
+msgstr "Pro povolení změny hesla vyplňte adresu e-mailu"
 
 #: templates/personal.php:38 templates/personal.php:39
 msgid "Language"
@@ -278,7 +279,7 @@ msgstr "Jazyk"
 
 #: templates/personal.php:44
 msgid "Help translate"
-msgstr "Pomoci překládat"
+msgstr "Pomoci s překladem"
 
 #: templates/personal.php:51
 msgid "use this address to connect to your ownCloud in your file manager"
@@ -306,11 +307,11 @@ msgstr "Výchozí kvóta"
 
 #: templates/users.php:55 templates/users.php:138
 msgid "Other"
-msgstr "Jiné"
+msgstr "Jiná"
 
 #: templates/users.php:80 templates/users.php:112
 msgid "Group Admin"
-msgstr "Administrace skupiny"
+msgstr "Správa skupiny"
 
 #: templates/users.php:82
 msgid "Quota"
@@ -318,4 +319,4 @@ msgstr "Kvóta"
 
 #: templates/users.php:146
 msgid "Delete"
-msgstr "Vymazat"
+msgstr "Smazat"
diff --git a/l10n/cs_CZ/user_ldap.po b/l10n/cs_CZ/user_ldap.po
index 57bcba3d70..808367304a 100644
--- a/l10n/cs_CZ/user_ldap.po
+++ b/l10n/cs_CZ/user_ldap.po
@@ -4,40 +4,41 @@
 # 
 # Translators:
 # Martin  <fireball@atlas.cz>, 2012.
+# Tomáš Chvátal <tomas.chvatal@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-30 02:02+0200\n"
-"PO-Revision-Date: 2012-08-29 13:53+0000\n"
-"Last-Translator: Martin <fireball@atlas.cz>\n"
+"POT-Creation-Date: 2012-09-06 02:02+0200\n"
+"PO-Revision-Date: 2012-09-05 13:37+0000\n"
+"Last-Translator: Tomáš Chvátal <tomas.chvatal@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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: cs_CZ\n"
-"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #: templates/settings.php:8
 msgid "Host"
-msgstr "Hostitel"
+msgstr "Počítač"
 
 #: templates/settings.php:8
 msgid ""
 "You can omit the protocol, except you require SSL. Then start with ldaps://"
-msgstr "Nelze vynechat protokol vyžadující SSL. Začněte s ldaps://"
+msgstr "Můžete vynechat protokol, vyjma pokud požadujete SSL. Tehdy začněte s ldaps://"
 
 #: templates/settings.php:9
 msgid "Base DN"
-msgstr "Base DN"
+msgstr "Základní DN"
 
 #: templates/settings.php:9
 msgid "You can specify Base DN for users and groups in the Advanced tab"
-msgstr "V Rozšířeném nastavení můžete specifikovat pro své uživatele a skupiny element Base DN"
+msgstr "V rozšířeném nastavení můžete určit základní DN pro uživatele a skupiny"
 
 #: templates/settings.php:10
 msgid "User DN"
-msgstr "DN uživatele"
+msgstr "Uživatelské DN"
 
 #: templates/settings.php:10
 msgid ""
@@ -52,47 +53,47 @@ msgstr "Heslo"
 
 #: templates/settings.php:11
 msgid "For anonymous access, leave DN and Password empty."
-msgstr "Pro anonymní přístup ponechte údaje DN and Heslo prázdné."
+msgstr "Pro anonymní přístup, ponechte údaje DN and heslo prázdné."
 
 #: templates/settings.php:12
 msgid "User Login Filter"
-msgstr "Filtr uživatelských loginů"
+msgstr "Filtr přihlášení uživatelů"
 
 #: 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 "Definuje filtr, který je aplikován v průběhu logování. %%uid nahrazuje uživatelské jméno během logování."
+msgstr "Určuje použitý filtr, při pokusu o přihlášení. %%uid nahrazuje uživatelské jméno v činnosti přihlášení."
 
 #: templates/settings.php:12
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr "použijte %%uid pro rezervované místo, např. \"uid=%%uid\""
+msgstr "použijte zástupný vzor %%uid, např. \"uid=%%uid\""
 
 #: templates/settings.php:13
 msgid "User List Filter"
-msgstr "Filtr uživateslkých seznamů"
+msgstr "Filtr uživatelských seznamů"
 
 #: templates/settings.php:13
 msgid "Defines the filter to apply, when retrieving users."
-msgstr "Defunije filtr, který je plaikován při návratu uživatelů."
+msgstr "Určuje použitý filtr, pro získávaní uživatelů."
 
 #: templates/settings.php:13
 msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr "bez rezervace místa, např. \"objectClass=person\"."
+msgstr "bez zástupných znaků, např. \"objectClass=person\"."
 
 #: templates/settings.php:14
 msgid "Group Filter"
-msgstr "Filtr skupiny"
+msgstr "Filtr skupin"
 
 #: templates/settings.php:14
 msgid "Defines the filter to apply, when retrieving groups."
-msgstr "Definuje filtr, který je aplikován při návratu skupin"
+msgstr "Určuje použitý filtr, pro získávaní skupin."
 
 #: templates/settings.php:14
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr "bez rezervace místa, např. \"objectClass=posixGroup\"."
+msgstr "bez zástupných znaků, např. \"objectClass=posixGroup\"."
 
 #: templates/settings.php:17
 msgid "Port"
@@ -112,11 +113,11 @@ msgstr "Asociace člena skupiny"
 
 #: templates/settings.php:21
 msgid "Use TLS"
-msgstr "Použijte TLS"
+msgstr "Použít TLS"
 
 #: templates/settings.php:21
 msgid "Do not use it for SSL connections, it will fail."
-msgstr "Nepoužívejte pro SSL připojení, připojení selže."
+msgstr "Nepoužívejte pro připojení pomocí SSL, připojení selže."
 
 #: templates/settings.php:22
 msgid "Case insensitve LDAP server (Windows)"
@@ -124,17 +125,17 @@ msgstr "LDAP server nerozlišující velikost znaků (Windows)"
 
 #: templates/settings.php:23
 msgid "Turn off SSL certificate validation."
-msgstr "Vypněte ověřování SSL certifikátu"
+msgstr "Vypnout 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 "pokud pracuje připojení pouze pokud je teto volba aktivní, importujte SSL certifikát LDAP serveru do Vašeho serveru ownCloud."
+msgstr "Pokud připojení pracuje pouze s touto možností, tak importujte SSL certifikát SSL serveru do Vašeho serveru ownCloud"
 
 #: templates/settings.php:23
 msgid "Not recommended, use for testing only."
-msgstr "Není doporučeno, pouze pro účely testování."
+msgstr "Není doporučeno, pouze pro testovací účely."
 
 #: templates/settings.php:24
 msgid "User Display Name Field"
@@ -154,17 +155,17 @@ msgstr "Atribut LDAP použitý k vytvoření jména skupiny ownCloud"
 
 #: templates/settings.php:27
 msgid "in bytes"
-msgstr "v bytech"
+msgstr "v bajtech"
 
 #: templates/settings.php:29
 msgid "in seconds. A change empties the cache."
-msgstr "ve vteřinách. Změna vyprázdní dočasnou paměť."
+msgstr "ve vteřinách. Změna vyprázdní vyrovnávací paměť."
 
 #: templates/settings.php:30
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
-msgstr "Ponechte prázdné pro uživateslké jméno (výchozí). Jinak uveďte LDAP/AD paramerty"
+msgstr "Ponechte prázdné pro uživatelské jméno (výchozí). Jinak uveďte LDAP/AD parametr."
 
 #: templates/settings.php:32
 msgid "Help"
diff --git a/l10n/da/core.po b/l10n/da/core.po
index 542e8425fa..bbb688dca5 100644
--- a/l10n/da/core.po
+++ b/l10n/da/core.po
@@ -13,15 +13,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-03 02:04+0200\n"
-"PO-Revision-Date: 2012-09-02 14:21+0000\n"
-"Last-Translator: muunsim <simon@rosmi.dk>\n"
+"POT-Creation-Date: 2012-09-06 02:02+0200\n"
+"PO-Revision-Date: 2012-09-06 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"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: da\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ajax/vcategories/add.php:23 ajax/vcategories/delete.php:23
 msgid "Application name not provided."
@@ -35,59 +35,55 @@ msgstr "Ingen kategori at tilføje?"
 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 "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
-
-#: js/js.js:206 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr "Indstillinger"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "January"
 msgstr "Januar"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "February"
 msgstr "Februar"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "March"
 msgstr "Marts"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "April"
 msgstr "April"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "May"
 msgstr "Maj"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "June"
 msgstr "Juni"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "July"
 msgstr "Juli"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "August"
 msgstr "August"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "September"
 msgstr "September"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "October"
 msgstr "Oktober"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "November"
 msgstr "November"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "December"
 msgstr "December"
 
@@ -119,7 +115,7 @@ msgstr "Fejl"
 msgid "ownCloud password reset"
 msgstr "Nulstil ownCloud kodeord"
 
-#: lostpassword/templates/email.php:1
+#: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr "Anvend følgende link til at nulstille din adgangskode: {link}"
 
diff --git a/l10n/da/files.po b/l10n/da/files.po
index 5c3233a281..ef7718c6d0 100644
--- a/l10n/da/files.po
+++ b/l10n/da/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-09-05 02:01+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-06 02:01+0200\n"
+"PO-Revision-Date: 2012-09-06 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"
@@ -60,31 +60,35 @@ msgstr "Filer"
 msgid "Delete"
 msgstr "Slet"
 
-#: js/filelist.js:141
+#: js/filelist.js:186 js/filelist.js:188
 msgid "already exists"
 msgstr "findes allerede"
 
-#: js/filelist.js:141
+#: js/filelist.js:186 js/filelist.js:188
 msgid "replace"
 msgstr "erstat"
 
-#: js/filelist.js:141
+#: js/filelist.js:186
+msgid "suggest name"
+msgstr ""
+
+#: js/filelist.js:186 js/filelist.js:188
 msgid "cancel"
 msgstr "fortryd"
 
-#: js/filelist.js:195
+#: js/filelist.js:235 js/filelist.js:237
 msgid "replaced"
 msgstr "erstattet"
 
-#: js/filelist.js:195
-msgid "with"
-msgstr "med"
-
-#: js/filelist.js:195 js/filelist.js:246
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
 msgid "undo"
 msgstr "fortryd"
 
-#: js/filelist.js:246
+#: js/filelist.js:237
+msgid "with"
+msgstr "med"
+
+#: js/filelist.js:271
 msgid "deleted"
 msgstr "Slettet"
 
@@ -100,44 +104,44 @@ msgstr "Kunne ikke uploade din fil, da det enten er en mappe eller er tom"
 msgid "Upload Error"
 msgstr "Fejl ved upload"
 
-#: js/files.js:236 js/files.js:327 js/files.js:356
+#: js/files.js:236 js/files.js:341 js/files.js:370
 msgid "Pending"
 msgstr "Afventer"
 
-#: js/files.js:341
+#: js/files.js:355
 msgid "Upload cancelled."
 msgstr "Upload afbrudt."
 
-#: js/files.js:409
+#: js/files.js:423
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Fil upload kører. Hvis du forlader siden nu, vil uploadet blive annuleret."
 
-#: js/files.js:480
+#: js/files.js:493
 msgid "Invalid name, '/' is not allowed."
 msgstr "Ugyldigt navn, '/' er ikke tilladt."
 
-#: js/files.js:726 templates/index.php:55
+#: js/files.js:746 templates/index.php:55
 msgid "Size"
 msgstr "Størrelse"
 
-#: js/files.js:727 templates/index.php:56
+#: js/files.js:747 templates/index.php:56
 msgid "Modified"
 msgstr "Ændret"
 
-#: js/files.js:754
+#: js/files.js:774
 msgid "folder"
 msgstr "mappe"
 
-#: js/files.js:756
+#: js/files.js:776
 msgid "folders"
 msgstr "mapper"
 
-#: js/files.js:764
+#: js/files.js:784
 msgid "file"
 msgstr "fil"
 
-#: js/files.js:766
+#: js/files.js:786
 msgid "files"
 msgstr "filer"
 
diff --git a/l10n/de/core.po b/l10n/de/core.po
index 9f06a2c9f4..d2dca57566 100644
--- a/l10n/de/core.po
+++ b/l10n/de/core.po
@@ -18,15 +18,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 02:01+0200\n"
-"PO-Revision-Date: 2012-08-31 09:48+0000\n"
-"Last-Translator: traductor <transifex.3.mensaje@spamgourmet.com>\n"
+"POT-Creation-Date: 2012-09-06 02:02+0200\n"
+"PO-Revision-Date: 2012-09-06 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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: de\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ajax/vcategories/add.php:23 ajax/vcategories/delete.php:23
 msgid "Application name not provided."
@@ -40,59 +40,55 @@ msgstr "Keine Kategorie hinzuzufügen?"
 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 "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
-
-#: js/js.js:206 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "January"
 msgstr "Januar"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "February"
 msgstr "Februar"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "March"
 msgstr "März"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "April"
 msgstr "April"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "May"
 msgstr "Mai"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "June"
 msgstr "Juni"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "July"
 msgstr "Juli"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "August"
 msgstr "August"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "September"
 msgstr "September"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "October"
 msgstr "Oktober"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "November"
 msgstr "November"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "December"
 msgstr "Dezember"
 
@@ -124,7 +120,7 @@ msgstr "Fehler"
 msgid "ownCloud password reset"
 msgstr "ownCloud-Passwort zurücksetzen"
 
-#: lostpassword/templates/email.php:1
+#: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr "Nutzen Sie den nachfolgenden Link, um Ihr Passwort zurückzusetzen: {link}"
 
diff --git a/l10n/de/files.po b/l10n/de/files.po
index 63ae8dc7c8..186ed35ccd 100644
--- a/l10n/de/files.po
+++ b/l10n/de/files.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-09-05 02:01+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-06 02:01+0200\n"
+"PO-Revision-Date: 2012-09-06 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"
@@ -66,31 +66,35 @@ msgstr "Dateien"
 msgid "Delete"
 msgstr "Löschen"
 
-#: js/filelist.js:141
+#: js/filelist.js:186 js/filelist.js:188
 msgid "already exists"
 msgstr "ist bereits vorhanden"
 
-#: js/filelist.js:141
+#: js/filelist.js:186 js/filelist.js:188
 msgid "replace"
 msgstr "ersetzen"
 
-#: js/filelist.js:141
+#: js/filelist.js:186
+msgid "suggest name"
+msgstr ""
+
+#: js/filelist.js:186 js/filelist.js:188
 msgid "cancel"
 msgstr "abbrechen"
 
-#: js/filelist.js:195
+#: js/filelist.js:235 js/filelist.js:237
 msgid "replaced"
 msgstr "ersetzt"
 
-#: js/filelist.js:195
-msgid "with"
-msgstr "mit"
-
-#: js/filelist.js:195 js/filelist.js:246
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
 msgid "undo"
 msgstr "rückgängig machen"
 
-#: js/filelist.js:246
+#: js/filelist.js:237
+msgid "with"
+msgstr "mit"
+
+#: js/filelist.js:271
 msgid "deleted"
 msgstr "gelöscht"
 
@@ -106,44 +110,44 @@ msgstr "Ihre Datei kann nicht hochgeladen werden, da sie ein Verzeichnis ist ode
 msgid "Upload Error"
 msgstr "Fehler beim Hochladen"
 
-#: js/files.js:236 js/files.js:327 js/files.js:356
+#: js/files.js:236 js/files.js:341 js/files.js:370
 msgid "Pending"
 msgstr "Ausstehend"
 
-#: js/files.js:341
+#: js/files.js:355
 msgid "Upload cancelled."
 msgstr "Hochladen abgebrochen."
 
-#: js/files.js:409
+#: js/files.js:423
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Dateiupload läuft. Wenn Sie die Seite jetzt verlassen, wird der Upload abgebrochen."
 
-#: js/files.js:480
+#: js/files.js:493
 msgid "Invalid name, '/' is not allowed."
 msgstr "Ungültiger Name: \"/\" ist nicht erlaubt."
 
-#: js/files.js:726 templates/index.php:55
+#: js/files.js:746 templates/index.php:55
 msgid "Size"
 msgstr "Größe"
 
-#: js/files.js:727 templates/index.php:56
+#: js/files.js:747 templates/index.php:56
 msgid "Modified"
 msgstr "Bearbeitet"
 
-#: js/files.js:754
+#: js/files.js:774
 msgid "folder"
 msgstr "Ordner"
 
-#: js/files.js:756
+#: js/files.js:776
 msgid "folders"
 msgstr "Ordner"
 
-#: js/files.js:764
+#: js/files.js:784
 msgid "file"
 msgstr "Datei"
 
-#: js/files.js:766
+#: js/files.js:786
 msgid "files"
 msgstr "Dateien"
 
@@ -177,7 +181,7 @@ msgstr "Maximale Größe für ZIP-Dateien"
 
 #: templates/admin.php:14
 msgid "Save"
-msgstr ""
+msgstr "Speichern"
 
 #: templates/index.php:7
 msgid "New"
diff --git a/l10n/de/settings.po b/l10n/de/settings.po
index 795cd88fa2..e0d81804f6 100644
--- a/l10n/de/settings.po
+++ b/l10n/de/settings.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-09-05 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-06 02:02+0200\n"
+"PO-Revision-Date: 2012-09-05 07: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"
@@ -75,12 +75,12 @@ msgstr "Sprache geändert"
 #: ajax/togglegroups.php:25
 #, php-format
 msgid "Unable to add user to group %s"
-msgstr ""
+msgstr "Der Benutzer konnte nicht zur Gruppe %s hinzugefügt werden"
 
 #: ajax/togglegroups.php:31
 #, php-format
 msgid "Unable to remove user from group %s"
-msgstr ""
+msgstr "Der Benutzer konnte nicht aus der Gruppe %s entfernt werden"
 
 #: js/apps.js:18
 msgid "Error"
@@ -199,7 +199,7 @@ msgstr "Weitere Anwendungen finden Sie auf apps.owncloud.com"
 
 #: templates/apps.php:30
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
-msgstr ""
+msgstr "<span class=\"licence\"></span>-lizenziert von <span class=\"author\"></span>"
 
 #: templates/help.php:9
 msgid "Documentation"
diff --git a/l10n/el/core.po b/l10n/el/core.po
index 57cba80d05..0a9a6e0388 100644
--- a/l10n/el/core.po
+++ b/l10n/el/core.po
@@ -11,15 +11,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-06 02:02+0200\n"
+"PO-Revision-Date: 2012-09-06 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"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: el\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ajax/vcategories/add.php:23 ajax/vcategories/delete.php:23
 msgid "Application name not provided."
@@ -33,59 +33,55 @@ 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 "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
-
-#: js/js.js:206 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr "Ρυθμίσεις"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "January"
 msgstr "Ιανουάριος"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "February"
 msgstr "Φεβρουάριος"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "March"
 msgstr "Μάρτιος"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "April"
 msgstr "Απρίλιος"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "May"
 msgstr "Μάϊος"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "June"
 msgstr "Ιούνιος"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "July"
 msgstr "Ιούλιος"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "August"
 msgstr "Αύγουστος"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "September"
 msgstr "Σεπτέμβριος"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "October"
 msgstr "Οκτώβριος"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "November"
 msgstr "Νοέμβριος"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "December"
 msgstr "Δεκέμβριος"
 
@@ -117,7 +113,7 @@ msgstr "Σφάλμα"
 msgid "ownCloud password reset"
 msgstr "Επαναφορά κωδικού ownCloud"
 
-#: lostpassword/templates/email.php:1
+#: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr "Χρησιμοποιήστε τον ακόλουθο σύνδεσμο για να επανεκδόσετε τον κωδικό: {link}"
 
diff --git a/l10n/el/files.po b/l10n/el/files.po
index ee2a70ac7c..8ddd036c71 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-09-05 02:01+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-06 02:01+0200\n"
+"PO-Revision-Date: 2012-09-06 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"
@@ -58,31 +58,35 @@ msgstr "Αρχεία"
 msgid "Delete"
 msgstr "Διαγραφή"
 
-#: js/filelist.js:141
+#: js/filelist.js:186 js/filelist.js:188
 msgid "already exists"
 msgstr "υπάρχει ήδη"
 
-#: js/filelist.js:141
+#: js/filelist.js:186 js/filelist.js:188
 msgid "replace"
 msgstr "αντικατέστησε"
 
-#: js/filelist.js:141
+#: js/filelist.js:186
+msgid "suggest name"
+msgstr ""
+
+#: js/filelist.js:186 js/filelist.js:188
 msgid "cancel"
 msgstr "ακύρωση"
 
-#: js/filelist.js:195
+#: js/filelist.js:235 js/filelist.js:237
 msgid "replaced"
 msgstr "αντικαταστάθηκε"
 
-#: js/filelist.js:195
-msgid "with"
-msgstr "με"
-
-#: js/filelist.js:195 js/filelist.js:246
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
 msgid "undo"
 msgstr "αναίρεση"
 
-#: js/filelist.js:246
+#: js/filelist.js:237
+msgid "with"
+msgstr "με"
+
+#: js/filelist.js:271
 msgid "deleted"
 msgstr "διαγράφηκε"
 
@@ -98,44 +102,44 @@ msgstr "Αδυναμία στην μεταφόρτωση του αρχείου 
 msgid "Upload Error"
 msgstr "Σφάλμα Μεταφόρτωσης"
 
-#: js/files.js:236 js/files.js:327 js/files.js:356
+#: js/files.js:236 js/files.js:341 js/files.js:370
 msgid "Pending"
 msgstr "Εν αναμονή"
 
-#: js/files.js:341
+#: js/files.js:355
 msgid "Upload cancelled."
 msgstr "Η μεταφόρτωση ακυρώθηκε."
 
-#: js/files.js:409
+#: js/files.js:423
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:480
+#: js/files.js:493
 msgid "Invalid name, '/' is not allowed."
 msgstr "Μη έγκυρο όνομα, το '/' δεν επιτρέπεται."
 
-#: js/files.js:726 templates/index.php:55
+#: js/files.js:746 templates/index.php:55
 msgid "Size"
 msgstr "Μέγεθος"
 
-#: js/files.js:727 templates/index.php:56
+#: js/files.js:747 templates/index.php:56
 msgid "Modified"
 msgstr "Τροποποιήθηκε"
 
-#: js/files.js:754
+#: js/files.js:774
 msgid "folder"
 msgstr "φάκελος"
 
-#: js/files.js:756
+#: js/files.js:776
 msgid "folders"
 msgstr "φάκελοι"
 
-#: js/files.js:764
+#: js/files.js:784
 msgid "file"
 msgstr "αρχείο"
 
-#: js/files.js:766
+#: js/files.js:786
 msgid "files"
 msgstr "αρχεία"
 
diff --git a/l10n/eo/core.po b/l10n/eo/core.po
index ccfd988fd2..416d3dd21f 100644
--- a/l10n/eo/core.po
+++ b/l10n/eo/core.po
@@ -10,15 +10,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-06 02:02+0200\n"
+"PO-Revision-Date: 2012-09-06 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"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: eo\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ajax/vcategories/add.php:23 ajax/vcategories/delete.php:23
 msgid "Application name not provided."
@@ -32,59 +32,55 @@ msgstr "Ĉu neniu kategorio estas aldonota?"
 msgid "This category already exists: "
 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:206 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr "Agordo"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "January"
 msgstr "Januaro"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "February"
 msgstr "Februaro"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "March"
 msgstr "Marto"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "April"
 msgstr "Aprilo"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "May"
 msgstr "Majo"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "June"
 msgstr "Junio"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "July"
 msgstr "Julio"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "August"
 msgstr "Aŭgusto"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "September"
 msgstr "Septembro"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "October"
 msgstr "Oktobro"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "November"
 msgstr "Novembro"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "December"
 msgstr "Decembro"
 
@@ -116,7 +112,7 @@ msgstr "Eraro"
 msgid "ownCloud password reset"
 msgstr "La pasvorto de ownCloud restariĝis."
 
-#: lostpassword/templates/email.php:1
+#: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr "Uzu la jenan ligilon por restarigi vian pasvorton: {link}"
 
diff --git a/l10n/eo/files.po b/l10n/eo/files.po
index d771ee745f..d0b82a0e4f 100644
--- a/l10n/eo/files.po
+++ b/l10n/eo/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-09-05 02:01+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-06 02:01+0200\n"
+"PO-Revision-Date: 2012-09-06 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"
@@ -57,31 +57,35 @@ msgstr "Dosieroj"
 msgid "Delete"
 msgstr "Forigi"
 
-#: js/filelist.js:141
+#: js/filelist.js:186 js/filelist.js:188
 msgid "already exists"
 msgstr "jam ekzistas"
 
-#: js/filelist.js:141
+#: js/filelist.js:186 js/filelist.js:188
 msgid "replace"
 msgstr "anstataŭigi"
 
-#: js/filelist.js:141
+#: js/filelist.js:186
+msgid "suggest name"
+msgstr ""
+
+#: js/filelist.js:186 js/filelist.js:188
 msgid "cancel"
 msgstr "nuligi"
 
-#: js/filelist.js:195
+#: js/filelist.js:235 js/filelist.js:237
 msgid "replaced"
 msgstr "anstataŭigita"
 
-#: js/filelist.js:195
-msgid "with"
-msgstr "kun"
-
-#: js/filelist.js:195 js/filelist.js:246
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
 msgid "undo"
 msgstr "malfari"
 
-#: js/filelist.js:246
+#: js/filelist.js:237
+msgid "with"
+msgstr "kun"
+
+#: js/filelist.js:271
 msgid "deleted"
 msgstr "forigita"
 
@@ -97,44 +101,44 @@ msgstr "Ne eblis alŝuti vian dosieron ĉar ĝi estas dosierujo aŭ havas 0 duum
 msgid "Upload Error"
 msgstr "Alŝuta eraro"
 
-#: js/files.js:236 js/files.js:327 js/files.js:356
+#: js/files.js:236 js/files.js:341 js/files.js:370
 msgid "Pending"
 msgstr "Traktotaj"
 
-#: js/files.js:341
+#: js/files.js:355
 msgid "Upload cancelled."
 msgstr "La alŝuto nuliĝis."
 
-#: js/files.js:409
+#: js/files.js:423
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:480
+#: js/files.js:493
 msgid "Invalid name, '/' is not allowed."
 msgstr "Nevalida nomo, “/” ne estas permesata."
 
-#: js/files.js:726 templates/index.php:55
+#: js/files.js:746 templates/index.php:55
 msgid "Size"
 msgstr "Grando"
 
-#: js/files.js:727 templates/index.php:56
+#: js/files.js:747 templates/index.php:56
 msgid "Modified"
 msgstr "Modifita"
 
-#: js/files.js:754
+#: js/files.js:774
 msgid "folder"
 msgstr "dosierujo"
 
-#: js/files.js:756
+#: js/files.js:776
 msgid "folders"
 msgstr "dosierujoj"
 
-#: js/files.js:764
+#: js/files.js:784
 msgid "file"
 msgstr "dosiero"
 
-#: js/files.js:766
+#: js/files.js:786
 msgid "files"
 msgstr "dosieroj"
 
diff --git a/l10n/es/core.po b/l10n/es/core.po
index fd0e4112ab..efe18cd7f0 100644
--- a/l10n/es/core.po
+++ b/l10n/es/core.po
@@ -15,15 +15,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 02:01+0200\n"
-"PO-Revision-Date: 2012-08-31 22:41+0000\n"
-"Last-Translator: Rubén Trujillo <rubentrf@gmail.com>\n"
+"POT-Creation-Date: 2012-09-06 02:02+0200\n"
+"PO-Revision-Date: 2012-09-06 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"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: es\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ajax/vcategories/add.php:23 ajax/vcategories/delete.php:23
 msgid "Application name not provided."
@@ -37,59 +37,55 @@ msgstr "¿Ninguna categoría para añadir?"
 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 "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
-
-#: js/js.js:206 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr "Ajustes"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "January"
 msgstr "Enero"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "February"
 msgstr "Febrero"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "March"
 msgstr "Marzo"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "April"
 msgstr "Abril"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "May"
 msgstr "Mayo"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "June"
 msgstr "Junio"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "July"
 msgstr "Julio"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "August"
 msgstr "Agosto"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "September"
 msgstr "Septiembre"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "October"
 msgstr "Octubre"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "November"
 msgstr "Noviembre"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "December"
 msgstr "Diciembre"
 
@@ -121,7 +117,7 @@ msgstr "Fallo"
 msgid "ownCloud password reset"
 msgstr "Reiniciar contraseña de ownCloud"
 
-#: lostpassword/templates/email.php:1
+#: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr "Utiliza el siguiente enlace para restablecer tu contraseña: {link}"
 
diff --git a/l10n/es/files.po b/l10n/es/files.po
index 28809d589c..feda263183 100644
--- a/l10n/es/files.po
+++ b/l10n/es/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-09-05 02:01+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-06 02:01+0200\n"
+"PO-Revision-Date: 2012-09-06 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"
@@ -59,31 +59,35 @@ msgstr "Archivos"
 msgid "Delete"
 msgstr "Eliminado"
 
-#: js/filelist.js:141
+#: js/filelist.js:186 js/filelist.js:188
 msgid "already exists"
 msgstr "ya existe"
 
-#: js/filelist.js:141
+#: js/filelist.js:186 js/filelist.js:188
 msgid "replace"
 msgstr "reemplazar"
 
-#: js/filelist.js:141
+#: js/filelist.js:186
+msgid "suggest name"
+msgstr ""
+
+#: js/filelist.js:186 js/filelist.js:188
 msgid "cancel"
 msgstr "cancelar"
 
-#: js/filelist.js:195
+#: js/filelist.js:235 js/filelist.js:237
 msgid "replaced"
 msgstr "reemplazado"
 
-#: js/filelist.js:195
-msgid "with"
-msgstr "con"
-
-#: js/filelist.js:195 js/filelist.js:246
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
 msgid "undo"
 msgstr "deshacer"
 
-#: js/filelist.js:246
+#: js/filelist.js:237
+msgid "with"
+msgstr "con"
+
+#: js/filelist.js:271
 msgid "deleted"
 msgstr "borrado"
 
@@ -99,44 +103,44 @@ msgstr "No ha sido posible subir tu archivo porque es un directorio o tiene 0 by
 msgid "Upload Error"
 msgstr "Error al subir el archivo"
 
-#: js/files.js:236 js/files.js:327 js/files.js:356
+#: js/files.js:236 js/files.js:341 js/files.js:370
 msgid "Pending"
 msgstr "Pendiente"
 
-#: js/files.js:341
+#: js/files.js:355
 msgid "Upload cancelled."
 msgstr "Subida cancelada."
 
-#: js/files.js:409
+#: js/files.js:423
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "La subida del archivo está en proceso. Salir de la página ahora cancelará la subida."
 
-#: js/files.js:480
+#: js/files.js:493
 msgid "Invalid name, '/' is not allowed."
 msgstr "Nombre no válido, '/' no está permitido."
 
-#: js/files.js:726 templates/index.php:55
+#: js/files.js:746 templates/index.php:55
 msgid "Size"
 msgstr "Tamaño"
 
-#: js/files.js:727 templates/index.php:56
+#: js/files.js:747 templates/index.php:56
 msgid "Modified"
 msgstr "Modificado"
 
-#: js/files.js:754
+#: js/files.js:774
 msgid "folder"
 msgstr "carpeta"
 
-#: js/files.js:756
+#: js/files.js:776
 msgid "folders"
 msgstr "carpetas"
 
-#: js/files.js:764
+#: js/files.js:784
 msgid "file"
 msgstr "archivo"
 
-#: js/files.js:766
+#: js/files.js:786
 msgid "files"
 msgstr "archivos"
 
@@ -170,7 +174,7 @@ msgstr "Tamaño máximo para archivos ZIP de entrada"
 
 #: templates/admin.php:14
 msgid "Save"
-msgstr ""
+msgstr "Guardar"
 
 #: templates/index.php:7
 msgid "New"
diff --git a/l10n/es/settings.po b/l10n/es/settings.po
index 2d38de5f75..8d1da62428 100644
--- a/l10n/es/settings.po
+++ b/l10n/es/settings.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-09-05 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-06 02:02+0200\n"
+"PO-Revision-Date: 2012-09-05 15:29+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"
@@ -74,12 +74,12 @@ msgstr "Idioma cambiado"
 #: ajax/togglegroups.php:25
 #, php-format
 msgid "Unable to add user to group %s"
-msgstr ""
+msgstr "Imposible añadir el usuario al grupo %s"
 
 #: ajax/togglegroups.php:31
 #, php-format
 msgid "Unable to remove user from group %s"
-msgstr ""
+msgstr "Imposible eliminar al usuario del grupo %s"
 
 #: js/apps.js:18
 msgid "Error"
@@ -198,7 +198,7 @@ msgstr "Echa un vistazo a la web de aplicaciones apps.owncloud.com"
 
 #: templates/apps.php:30
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
-msgstr ""
+msgstr "<span class=\"licence\"></span>-licenciado por <span class=\"author\"></span>"
 
 #: templates/help.php:9
 msgid "Documentation"
diff --git a/l10n/et_EE/core.po b/l10n/et_EE/core.po
index 0767a4e42f..f8d3d18652 100644
--- a/l10n/et_EE/core.po
+++ b/l10n/et_EE/core.po
@@ -8,15 +8,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-06 02:02+0200\n"
+"PO-Revision-Date: 2012-09-06 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"
 "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"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ajax/vcategories/add.php:23 ajax/vcategories/delete.php:23
 msgid "Application name not provided."
@@ -30,59 +30,55 @@ 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 "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
-
-#: js/js.js:206 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr "Seaded"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "January"
 msgstr "Jaanuar"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "February"
 msgstr "Veebruar"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "March"
 msgstr "Märts"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "April"
 msgstr "Aprill"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "May"
 msgstr "Mai"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "June"
 msgstr "Juuni"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "July"
 msgstr "Juuli"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "August"
 msgstr "August"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "September"
 msgstr "September"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "October"
 msgstr "Oktoober"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "November"
 msgstr "November"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "December"
 msgstr "Detsember"
 
@@ -114,7 +110,7 @@ msgstr "Viga"
 msgid "ownCloud password reset"
 msgstr "ownCloud parooli taastamine"
 
-#: lostpassword/templates/email.php:1
+#: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr "Kasuta järgnevat linki oma parooli taastamiseks: {link}"
 
diff --git a/l10n/et_EE/files.po b/l10n/et_EE/files.po
index 7b09da2e4f..fac2c5dc01 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-09-05 02:01+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-06 02:01+0200\n"
+"PO-Revision-Date: 2012-09-06 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"
@@ -56,31 +56,35 @@ msgstr "Failid"
 msgid "Delete"
 msgstr "Kustuta"
 
-#: js/filelist.js:141
+#: js/filelist.js:186 js/filelist.js:188
 msgid "already exists"
 msgstr "on juba olemas"
 
-#: js/filelist.js:141
+#: js/filelist.js:186 js/filelist.js:188
 msgid "replace"
 msgstr "asenda"
 
-#: js/filelist.js:141
+#: js/filelist.js:186
+msgid "suggest name"
+msgstr ""
+
+#: js/filelist.js:186 js/filelist.js:188
 msgid "cancel"
 msgstr "loobu"
 
-#: js/filelist.js:195
+#: js/filelist.js:235 js/filelist.js:237
 msgid "replaced"
 msgstr "asendatud"
 
-#: js/filelist.js:195
-msgid "with"
-msgstr "millega"
-
-#: js/filelist.js:195 js/filelist.js:246
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
 msgid "undo"
 msgstr "tagasi"
 
-#: js/filelist.js:246
+#: js/filelist.js:237
+msgid "with"
+msgstr "millega"
+
+#: js/filelist.js:271
 msgid "deleted"
 msgstr "kustutatud"
 
@@ -96,44 +100,44 @@ msgstr "Sinu faili üleslaadimine ebaõnnestus, kuna see on kaust või selle suu
 msgid "Upload Error"
 msgstr "Üleslaadimise viga"
 
-#: js/files.js:236 js/files.js:327 js/files.js:356
+#: js/files.js:236 js/files.js:341 js/files.js:370
 msgid "Pending"
 msgstr "Ootel"
 
-#: js/files.js:341
+#: js/files.js:355
 msgid "Upload cancelled."
 msgstr "Üleslaadimine tühistati."
 
-#: js/files.js:409
+#: js/files.js:423
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:480
+#: js/files.js:493
 msgid "Invalid name, '/' is not allowed."
 msgstr "Vigane nimi, '/' pole lubatud."
 
-#: js/files.js:726 templates/index.php:55
+#: js/files.js:746 templates/index.php:55
 msgid "Size"
 msgstr "Suurus"
 
-#: js/files.js:727 templates/index.php:56
+#: js/files.js:747 templates/index.php:56
 msgid "Modified"
 msgstr "Muudetud"
 
-#: js/files.js:754
+#: js/files.js:774
 msgid "folder"
 msgstr "kaust"
 
-#: js/files.js:756
+#: js/files.js:776
 msgid "folders"
 msgstr "kausta"
 
-#: js/files.js:764
+#: js/files.js:784
 msgid "file"
 msgstr "fail"
 
-#: js/files.js:766
+#: js/files.js:786
 msgid "files"
 msgstr "faili"
 
diff --git a/l10n/eu/core.po b/l10n/eu/core.po
index 63b63ad545..476fbcd0a1 100644
--- a/l10n/eu/core.po
+++ b/l10n/eu/core.po
@@ -9,15 +9,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-06 02:02+0200\n"
+"PO-Revision-Date: 2012-09-06 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"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: eu\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ajax/vcategories/add.php:23 ajax/vcategories/delete.php:23
 msgid "Application name not provided."
@@ -31,59 +31,55 @@ 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 "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
-
-#: js/js.js:206 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr "Ezarpenak"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "January"
 msgstr "Urtarrila"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "February"
 msgstr "Otsaila"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "March"
 msgstr "Martxoa"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "April"
 msgstr "Apirila"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "May"
 msgstr "Maiatza"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "June"
 msgstr "Ekaina"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "July"
 msgstr "Uztaila"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "August"
 msgstr "Abuztua"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "September"
 msgstr "Iraila"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "October"
 msgstr "Urria"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "November"
 msgstr "Azaroa"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "December"
 msgstr "Abendua"
 
@@ -115,7 +111,7 @@ msgstr "Errorea"
 msgid "ownCloud password reset"
 msgstr "ownCloud-en pasahitza berrezarri"
 
-#: lostpassword/templates/email.php:1
+#: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr "Eribili hurrengo lotura zure pasahitza berrezartzeko: {link}"
 
diff --git a/l10n/eu/files.po b/l10n/eu/files.po
index 19d4a2e58c..810a5ae18c 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-09-05 02:01+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-06 02:01+0200\n"
+"PO-Revision-Date: 2012-09-06 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"
@@ -57,31 +57,35 @@ msgstr "Fitxategiak"
 msgid "Delete"
 msgstr "Ezabatu"
 
-#: js/filelist.js:141
+#: js/filelist.js:186 js/filelist.js:188
 msgid "already exists"
 msgstr "dagoeneko existitzen da"
 
-#: js/filelist.js:141
+#: js/filelist.js:186 js/filelist.js:188
 msgid "replace"
 msgstr "ordeztu"
 
-#: js/filelist.js:141
+#: js/filelist.js:186
+msgid "suggest name"
+msgstr ""
+
+#: js/filelist.js:186 js/filelist.js:188
 msgid "cancel"
 msgstr "ezeztatu"
 
-#: js/filelist.js:195
+#: js/filelist.js:235 js/filelist.js:237
 msgid "replaced"
 msgstr "ordeztua"
 
-#: js/filelist.js:195
-msgid "with"
-msgstr "honekin"
-
-#: js/filelist.js:195 js/filelist.js:246
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
 msgid "undo"
 msgstr "desegin"
 
-#: js/filelist.js:246
+#: js/filelist.js:237
+msgid "with"
+msgstr "honekin"
+
+#: js/filelist.js:271
 msgid "deleted"
 msgstr "ezabatuta"
 
@@ -97,44 +101,44 @@ msgstr "Ezin da zure fitxategia igo, karpeta bat da edo 0 byt ditu"
 msgid "Upload Error"
 msgstr "Igotzean errore bat suertatu da"
 
-#: js/files.js:236 js/files.js:327 js/files.js:356
+#: js/files.js:236 js/files.js:341 js/files.js:370
 msgid "Pending"
 msgstr "Zain"
 
-#: js/files.js:341
+#: js/files.js:355
 msgid "Upload cancelled."
 msgstr "Igoera ezeztatuta"
 
-#: js/files.js:409
+#: js/files.js:423
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:480
+#: js/files.js:493
 msgid "Invalid name, '/' is not allowed."
 msgstr "Baliogabeko izena, '/' ezin da erabili. "
 
-#: js/files.js:726 templates/index.php:55
+#: js/files.js:746 templates/index.php:55
 msgid "Size"
 msgstr "Tamaina"
 
-#: js/files.js:727 templates/index.php:56
+#: js/files.js:747 templates/index.php:56
 msgid "Modified"
 msgstr "Aldatuta"
 
-#: js/files.js:754
+#: js/files.js:774
 msgid "folder"
 msgstr "karpeta"
 
-#: js/files.js:756
+#: js/files.js:776
 msgid "folders"
 msgstr "Karpetak"
 
-#: js/files.js:764
+#: js/files.js:784
 msgid "file"
 msgstr "fitxategia"
 
-#: js/files.js:766
+#: js/files.js:786
 msgid "files"
 msgstr "fitxategiak"
 
diff --git a/l10n/eu_ES/core.po b/l10n/eu_ES/core.po
index a6da3a496e..b3baf2cb39 100644
--- a/l10n/eu_ES/core.po
+++ b/l10n/eu_ES/core.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-06 02:02+0200\n"
+"PO-Revision-Date: 2012-09-06 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"
 "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"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ajax/vcategories/add.php:23 ajax/vcategories/delete.php:23
 msgid "Application name not provided."
@@ -29,59 +29,55 @@ 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:206 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "January"
 msgstr ""
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "February"
 msgstr ""
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "March"
 msgstr ""
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "April"
 msgstr ""
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "May"
 msgstr ""
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "June"
 msgstr ""
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "July"
 msgstr ""
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "August"
 msgstr ""
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "September"
 msgstr ""
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "October"
 msgstr ""
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "November"
 msgstr ""
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "December"
 msgstr ""
 
@@ -113,7 +109,7 @@ msgstr ""
 msgid "ownCloud password reset"
 msgstr ""
 
-#: lostpassword/templates/email.php:1
+#: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr ""
 
diff --git a/l10n/eu_ES/files.po b/l10n/eu_ES/files.po
index 5a8745c031..0ed5582c4f 100644
--- a/l10n/eu_ES/files.po
+++ b/l10n/eu_ES/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-09-05 02:01+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-06 02:01+0200\n"
+"PO-Revision-Date: 2012-09-06 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"
@@ -55,31 +55,35 @@ msgstr ""
 msgid "Delete"
 msgstr ""
 
-#: js/filelist.js:141
+#: js/filelist.js:186 js/filelist.js:188
 msgid "already exists"
 msgstr ""
 
-#: js/filelist.js:141
+#: js/filelist.js:186 js/filelist.js:188
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:141
+#: js/filelist.js:186
+msgid "suggest name"
+msgstr ""
+
+#: js/filelist.js:186 js/filelist.js:188
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:195
+#: js/filelist.js:235 js/filelist.js:237
 msgid "replaced"
 msgstr ""
 
-#: js/filelist.js:195
-msgid "with"
-msgstr ""
-
-#: js/filelist.js:195 js/filelist.js:246
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:246
+#: js/filelist.js:237
+msgid "with"
+msgstr ""
+
+#: js/filelist.js:271
 msgid "deleted"
 msgstr ""
 
@@ -95,44 +99,44 @@ msgstr ""
 msgid "Upload Error"
 msgstr ""
 
-#: js/files.js:236 js/files.js:327 js/files.js:356
+#: js/files.js:236 js/files.js:341 js/files.js:370
 msgid "Pending"
 msgstr ""
 
-#: js/files.js:341
+#: js/files.js:355
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:409
+#: js/files.js:423
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:480
+#: js/files.js:493
 msgid "Invalid name, '/' is not allowed."
 msgstr ""
 
-#: js/files.js:726 templates/index.php:55
+#: js/files.js:746 templates/index.php:55
 msgid "Size"
 msgstr ""
 
-#: js/files.js:727 templates/index.php:56
+#: js/files.js:747 templates/index.php:56
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:754
+#: js/files.js:774
 msgid "folder"
 msgstr ""
 
-#: js/files.js:756
+#: js/files.js:776
 msgid "folders"
 msgstr ""
 
-#: js/files.js:764
+#: js/files.js:784
 msgid "file"
 msgstr ""
 
-#: js/files.js:766
+#: js/files.js:786
 msgid "files"
 msgstr ""
 
diff --git a/l10n/fa/core.po b/l10n/fa/core.po
index 6099da454e..df53177524 100644
--- a/l10n/fa/core.po
+++ b/l10n/fa/core.po
@@ -8,15 +8,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-06 02:02+0200\n"
+"PO-Revision-Date: 2012-09-06 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"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fa\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ajax/vcategories/add.php:23 ajax/vcategories/delete.php:23
 msgid "Application name not provided."
@@ -30,59 +30,55 @@ 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 "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
-
-#: js/js.js:206 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr "تنظیمات"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "January"
 msgstr "ژانویه"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "February"
 msgstr "فبریه"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "March"
 msgstr "مارس"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "April"
 msgstr "آوریل"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "May"
 msgstr "می"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "June"
 msgstr "ژوئن"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "July"
 msgstr "جولای"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "August"
 msgstr "آگوست"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "September"
 msgstr "سپتامبر"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "October"
 msgstr "اکتبر"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "November"
 msgstr "نوامبر"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "December"
 msgstr "دسامبر"
 
@@ -114,7 +110,7 @@ msgstr "خطا"
 msgid "ownCloud password reset"
 msgstr "پسورد ابرهای شما تغییرکرد"
 
-#: lostpassword/templates/email.php:1
+#: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr "از لینک زیر جهت دوباره سازی پسورد استفاده کنید :\n{link}"
 
diff --git a/l10n/fa/files.po b/l10n/fa/files.po
index a1981830b7..2e1f164504 100644
--- a/l10n/fa/files.po
+++ b/l10n/fa/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-09-05 02:01+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-06 02:01+0200\n"
+"PO-Revision-Date: 2012-09-06 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"
@@ -58,31 +58,35 @@ msgstr "فایل ها"
 msgid "Delete"
 msgstr "پاک کردن"
 
-#: js/filelist.js:141
+#: js/filelist.js:186 js/filelist.js:188
 msgid "already exists"
 msgstr "وجود دارد"
 
-#: js/filelist.js:141
+#: js/filelist.js:186 js/filelist.js:188
 msgid "replace"
 msgstr "جایگزین"
 
-#: js/filelist.js:141
+#: js/filelist.js:186
+msgid "suggest name"
+msgstr ""
+
+#: js/filelist.js:186 js/filelist.js:188
 msgid "cancel"
 msgstr "لغو"
 
-#: js/filelist.js:195
+#: js/filelist.js:235 js/filelist.js:237
 msgid "replaced"
 msgstr "جایگزین‌شده"
 
-#: js/filelist.js:195
-msgid "with"
-msgstr "همراه"
-
-#: js/filelist.js:195 js/filelist.js:246
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
 msgid "undo"
 msgstr "بازگشت"
 
-#: js/filelist.js:246
+#: js/filelist.js:237
+msgid "with"
+msgstr "همراه"
+
+#: js/filelist.js:271
 msgid "deleted"
 msgstr "حذف شده"
 
@@ -98,44 +102,44 @@ msgstr "ناتوان در بارگذاری یا فایل یک پوشه است ی
 msgid "Upload Error"
 msgstr "خطا در بار گذاری"
 
-#: js/files.js:236 js/files.js:327 js/files.js:356
+#: js/files.js:236 js/files.js:341 js/files.js:370
 msgid "Pending"
 msgstr "در انتظار"
 
-#: js/files.js:341
+#: js/files.js:355
 msgid "Upload cancelled."
 msgstr "بار گذاری لغو شد"
 
-#: js/files.js:409
+#: js/files.js:423
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:480
+#: js/files.js:493
 msgid "Invalid name, '/' is not allowed."
 msgstr "نام نامناسب '/' غیرفعال است"
 
-#: js/files.js:726 templates/index.php:55
+#: js/files.js:746 templates/index.php:55
 msgid "Size"
 msgstr "اندازه"
 
-#: js/files.js:727 templates/index.php:56
+#: js/files.js:747 templates/index.php:56
 msgid "Modified"
 msgstr "تغییر یافته"
 
-#: js/files.js:754
+#: js/files.js:774
 msgid "folder"
 msgstr "پوشه"
 
-#: js/files.js:756
+#: js/files.js:776
 msgid "folders"
 msgstr "پوشه ها"
 
-#: js/files.js:764
+#: js/files.js:784
 msgid "file"
 msgstr "پرونده"
 
-#: js/files.js:766
+#: js/files.js:786
 msgid "files"
 msgstr "پرونده ها"
 
diff --git a/l10n/fi/core.po b/l10n/fi/core.po
index 9471fc3066..6b84b56072 100644
--- a/l10n/fi/core.po
+++ b/l10n/fi/core.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-06 02:02+0200\n"
+"PO-Revision-Date: 2012-09-06 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"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fi\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ajax/vcategories/add.php:23 ajax/vcategories/delete.php:23
 msgid "Application name not provided."
@@ -29,59 +29,55 @@ 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:206 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "January"
 msgstr ""
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "February"
 msgstr ""
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "March"
 msgstr ""
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "April"
 msgstr ""
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "May"
 msgstr ""
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "June"
 msgstr ""
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "July"
 msgstr ""
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "August"
 msgstr ""
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "September"
 msgstr ""
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "October"
 msgstr ""
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "November"
 msgstr ""
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "December"
 msgstr ""
 
@@ -113,7 +109,7 @@ msgstr ""
 msgid "ownCloud password reset"
 msgstr ""
 
-#: lostpassword/templates/email.php:1
+#: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr ""
 
diff --git a/l10n/fi/files.po b/l10n/fi/files.po
index a46618c502..0a9580f346 100644
--- a/l10n/fi/files.po
+++ b/l10n/fi/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-09-05 02:01+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-06 02:01+0200\n"
+"PO-Revision-Date: 2012-09-06 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"
@@ -55,31 +55,35 @@ msgstr ""
 msgid "Delete"
 msgstr ""
 
-#: js/filelist.js:141
+#: js/filelist.js:186 js/filelist.js:188
 msgid "already exists"
 msgstr ""
 
-#: js/filelist.js:141
+#: js/filelist.js:186 js/filelist.js:188
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:141
+#: js/filelist.js:186
+msgid "suggest name"
+msgstr ""
+
+#: js/filelist.js:186 js/filelist.js:188
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:195
+#: js/filelist.js:235 js/filelist.js:237
 msgid "replaced"
 msgstr ""
 
-#: js/filelist.js:195
-msgid "with"
-msgstr ""
-
-#: js/filelist.js:195 js/filelist.js:246
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:246
+#: js/filelist.js:237
+msgid "with"
+msgstr ""
+
+#: js/filelist.js:271
 msgid "deleted"
 msgstr ""
 
@@ -95,44 +99,44 @@ msgstr ""
 msgid "Upload Error"
 msgstr ""
 
-#: js/files.js:236 js/files.js:327 js/files.js:356
+#: js/files.js:236 js/files.js:341 js/files.js:370
 msgid "Pending"
 msgstr ""
 
-#: js/files.js:341
+#: js/files.js:355
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:409
+#: js/files.js:423
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:480
+#: js/files.js:493
 msgid "Invalid name, '/' is not allowed."
 msgstr ""
 
-#: js/files.js:726 templates/index.php:55
+#: js/files.js:746 templates/index.php:55
 msgid "Size"
 msgstr ""
 
-#: js/files.js:727 templates/index.php:56
+#: js/files.js:747 templates/index.php:56
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:754
+#: js/files.js:774
 msgid "folder"
 msgstr ""
 
-#: js/files.js:756
+#: js/files.js:776
 msgid "folders"
 msgstr ""
 
-#: js/files.js:764
+#: js/files.js:784
 msgid "file"
 msgstr ""
 
-#: js/files.js:766
+#: js/files.js:786
 msgid "files"
 msgstr ""
 
diff --git a/l10n/fi_FI/core.po b/l10n/fi_FI/core.po
index 7506e66bc4..cbce731369 100644
--- a/l10n/fi_FI/core.po
+++ b/l10n/fi_FI/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-09-04 02:01+0200\n"
-"PO-Revision-Date: 2012-09-03 16:24+0000\n"
-"Last-Translator: teho <tehoratopato@gmail.com>\n"
+"POT-Creation-Date: 2012-09-06 02:02+0200\n"
+"PO-Revision-Date: 2012-09-06 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"
@@ -35,59 +35,55 @@ msgstr "Ei lisättävää luokkaa?"
 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 "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
-
-#: js/js.js:206 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr "Asetukset"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "January"
 msgstr "Tammikuu"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "February"
 msgstr "Helmikuu"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "March"
 msgstr "Maaliskuu"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "April"
 msgstr "Huhtikuu"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "May"
 msgstr "Toukokuu"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "June"
 msgstr "Kesäkuu"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "July"
 msgstr "Heinäkuu"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "August"
 msgstr "Elokuu"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "September"
 msgstr "Syyskuu"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "October"
 msgstr "Lokakuu"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "November"
 msgstr "Marraskuu"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "December"
 msgstr "Joulukuu"
 
@@ -119,7 +115,7 @@ msgstr "Virhe"
 msgid "ownCloud password reset"
 msgstr "ownCloud-salasanan nollaus"
 
-#: lostpassword/templates/email.php:1
+#: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr "Voit palauttaa salasanasi seuraavassa osoitteessa: {link}"
 
diff --git a/l10n/fi_FI/files.po b/l10n/fi_FI/files.po
index 7b28a31a63..f82b204f60 100644
--- a/l10n/fi_FI/files.po
+++ b/l10n/fi_FI/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-09-05 02:01+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-06 02:01+0200\n"
+"PO-Revision-Date: 2012-09-06 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"
@@ -60,31 +60,35 @@ msgstr "Tiedostot"
 msgid "Delete"
 msgstr "Poista"
 
-#: js/filelist.js:141
+#: js/filelist.js:186 js/filelist.js:188
 msgid "already exists"
 msgstr "on jo olemassa"
 
-#: js/filelist.js:141
+#: js/filelist.js:186 js/filelist.js:188
 msgid "replace"
 msgstr "korvaa"
 
-#: js/filelist.js:141
+#: js/filelist.js:186
+msgid "suggest name"
+msgstr ""
+
+#: js/filelist.js:186 js/filelist.js:188
 msgid "cancel"
 msgstr "peru"
 
-#: js/filelist.js:195
+#: js/filelist.js:235 js/filelist.js:237
 msgid "replaced"
 msgstr "korvattu"
 
-#: js/filelist.js:195
-msgid "with"
-msgstr "käyttäen"
-
-#: js/filelist.js:195 js/filelist.js:246
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
 msgid "undo"
 msgstr "kumoa"
 
-#: js/filelist.js:246
+#: js/filelist.js:237
+msgid "with"
+msgstr "käyttäen"
+
+#: js/filelist.js:271
 msgid "deleted"
 msgstr "poistettu"
 
@@ -100,44 +104,44 @@ msgstr "Tiedoston lähetys epäonnistui, koska sen koko on 0 tavua tai kyseessä
 msgid "Upload Error"
 msgstr "Lähetysvirhe."
 
-#: js/files.js:236 js/files.js:327 js/files.js:356
+#: js/files.js:236 js/files.js:341 js/files.js:370
 msgid "Pending"
 msgstr "Odottaa"
 
-#: js/files.js:341
+#: js/files.js:355
 msgid "Upload cancelled."
 msgstr "Lähetys peruttu."
 
-#: js/files.js:409
+#: js/files.js:423
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Tiedoston lähetys on meneillään. Sivulta poistuminen nyt peruu tiedoston lähetyksen."
 
-#: js/files.js:480
+#: js/files.js:493
 msgid "Invalid name, '/' is not allowed."
 msgstr "Virheellinen nimi, merkki '/' ei ole sallittu."
 
-#: js/files.js:726 templates/index.php:55
+#: js/files.js:746 templates/index.php:55
 msgid "Size"
 msgstr "Koko"
 
-#: js/files.js:727 templates/index.php:56
+#: js/files.js:747 templates/index.php:56
 msgid "Modified"
 msgstr "Muutettu"
 
-#: js/files.js:754
+#: js/files.js:774
 msgid "folder"
 msgstr "kansio"
 
-#: js/files.js:756
+#: js/files.js:776
 msgid "folders"
 msgstr "kansiota"
 
-#: js/files.js:764
+#: js/files.js:784
 msgid "file"
 msgstr "tiedosto"
 
-#: js/files.js:766
+#: js/files.js:786
 msgid "files"
 msgstr "tiedostoa"
 
@@ -171,7 +175,7 @@ msgstr "ZIP-tiedostojen enimmäiskoko"
 
 #: templates/admin.php:14
 msgid "Save"
-msgstr ""
+msgstr "Tallenna"
 
 #: templates/index.php:7
 msgid "New"
diff --git a/l10n/fi_FI/files_external.po b/l10n/fi_FI/files_external.po
index 2cee464ea2..404c33a014 100644
--- a/l10n/fi_FI/files_external.po
+++ b/l10n/fi_FI/files_external.po
@@ -4,19 +4,20 @@
 # 
 # Translators:
 # Jiri Grönroos <jiri.gronroos@iki.fi>, 2012.
+#   <tehoratopato@gmail.com>, 2012.
 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:04+0000\n"
-"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
+"POT-Creation-Date: 2012-09-06 02:01+0200\n"
+"PO-Revision-Date: 2012-09-05 16:30+0000\n"
+"Last-Translator: teho <tehoratopato@gmail.com>\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"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/settings.php:3
 msgid "External Storage"
@@ -40,7 +41,7 @@ msgstr "Valinnat"
 
 #: templates/settings.php:11
 msgid "Applicable"
-msgstr ""
+msgstr "Sovellettavissa"
 
 #: templates/settings.php:23
 msgid "Add mount point"
@@ -76,7 +77,7 @@ msgstr "Tuo juurivarmenne"
 
 #: templates/settings.php:108
 msgid "Enable User External Storage"
-msgstr ""
+msgstr "Ota käyttöön ulkopuoliset tallennuspaikat"
 
 #: templates/settings.php:109
 msgid "Allow users to mount their own external storage"
diff --git a/l10n/fi_FI/settings.po b/l10n/fi_FI/settings.po
index e540a68630..2f9cfc602d 100644
--- a/l10n/fi_FI/settings.po
+++ b/l10n/fi_FI/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-09-05 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-06 02:02+0200\n"
+"PO-Revision-Date: 2012-09-05 16:14+0000\n"
+"Last-Translator: teho <tehoratopato@gmail.com>\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"
@@ -68,12 +68,12 @@ msgstr "Kieli on vaihdettu"
 #: ajax/togglegroups.php:25
 #, php-format
 msgid "Unable to add user to group %s"
-msgstr ""
+msgstr "Käyttäjän tai ryhmän %s lisääminen ei onnistu"
 
 #: ajax/togglegroups.php:31
 #, php-format
 msgid "Unable to remove user from group %s"
-msgstr ""
+msgstr "Käyttäjän poistaminen ryhmästä %s ei onnistu"
 
 #: js/apps.js:18
 msgid "Error"
@@ -192,7 +192,7 @@ msgstr "Katso sovellussivu osoitteessa apps.owncloud.com"
 
 #: templates/apps.php:30
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
-msgstr ""
+msgstr "<span class=\"licence\"></span>-lisensoija <span class=\"author\"></span>"
 
 #: templates/help.php:9
 msgid "Documentation"
diff --git a/l10n/fi_FI/user_ldap.po b/l10n/fi_FI/user_ldap.po
index e1e890a161..62a31960b0 100644
--- a/l10n/fi_FI/user_ldap.po
+++ b/l10n/fi_FI/user_ldap.po
@@ -5,13 +5,14 @@
 # Translators:
 #   <jarkko.moilanen@want3d.fi>, 2012.
 # Jiri Grönroos <jiri.gronroos@iki.fi>, 2012.
+#   <tehoratopato@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-05 02:01+0200\n"
-"PO-Revision-Date: 2012-09-04 14:29+0000\n"
-"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
+"POT-Creation-Date: 2012-09-06 02:02+0200\n"
+"PO-Revision-Date: 2012-09-05 16:49+0000\n"
+"Last-Translator: teho <tehoratopato@gmail.com>\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,7 +65,7 @@ msgstr "Login suodatus"
 msgid ""
 "Defines the filter to apply, when login is attempted. %%uid replaces the "
 "username in the login action."
-msgstr ""
+msgstr "Määrittelee käytettävän suodattimen, kun sisäänkirjautumista yritetään. %%uid korvaa sisäänkirjautumisessa käyttäjätunnuksen."
 
 #: templates/settings.php:12
 #, php-format
@@ -139,19 +140,19 @@ msgstr "Ei suositella, käytä vain testausta varten."
 
 #: templates/settings.php:24
 msgid "User Display Name Field"
-msgstr ""
+msgstr "Käyttäjän näytettävän nimen kenttä"
 
 #: templates/settings.php:24
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
-msgstr ""
+msgstr "LDAP attribuutti, jota käytetään käyttäjän ownCloud käyttäjänimenä "
 
 #: templates/settings.php:25
 msgid "Group Display Name Field"
-msgstr ""
+msgstr "Ryhmän \"näytettävä nimi\"-kenttä"
 
 #: templates/settings.php:25
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
-msgstr ""
+msgstr "LDAP atribuutti, jota käytetään luomaan ryhmän ownCloud nimi"
 
 #: templates/settings.php:27
 msgid "in bytes"
@@ -165,7 +166,7 @@ msgstr "sekunneissa. Muutos tyhjentää välimuistin."
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
-msgstr ""
+msgstr "Jätä tyhjäksi käyttäjänimi (oletusasetus). Muutoin anna LDAP/AD atribuutti."
 
 #: templates/settings.php:32
 msgid "Help"
diff --git a/l10n/fr/core.po b/l10n/fr/core.po
index 9d16fe11ba..c6fd6a4041 100644
--- a/l10n/fr/core.po
+++ b/l10n/fr/core.po
@@ -13,15 +13,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 02:01+0200\n"
-"PO-Revision-Date: 2012-08-31 19:09+0000\n"
-"Last-Translator: Florentin Le Moal <florentin.lemoal@gmail.com>\n"
+"POT-Creation-Date: 2012-09-06 02:02+0200\n"
+"PO-Revision-Date: 2012-09-06 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"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fr\n"
-"Plural-Forms: nplurals=2; plural=(n > 1)\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: ajax/vcategories/add.php:23 ajax/vcategories/delete.php:23
 msgid "Application name not provided."
@@ -35,59 +35,55 @@ 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 "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
-
-#: js/js.js:206 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr "Paramètres"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "January"
 msgstr "janvier"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "February"
 msgstr "février"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "March"
 msgstr "mars"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "April"
 msgstr "avril"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "May"
 msgstr "mai"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "June"
 msgstr "juin"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "July"
 msgstr "juillet"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "August"
 msgstr "août"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "September"
 msgstr "septembre"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "October"
 msgstr "octobre"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "November"
 msgstr "novembre"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "December"
 msgstr "décembre"
 
@@ -119,7 +115,7 @@ msgstr "Erreur"
 msgid "ownCloud password reset"
 msgstr "Réinitialisation de votre mot de passe Owncloud"
 
-#: lostpassword/templates/email.php:1
+#: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr "Utilisez le lien suivant pour réinitialiser votre mot de passe : {link}"
 
diff --git a/l10n/fr/files.po b/l10n/fr/files.po
index 6467b47697..222dbece71 100644
--- a/l10n/fr/files.po
+++ b/l10n/fr/files.po
@@ -8,6 +8,7 @@
 #   <gp4004@arghh.org>, 2012.
 #   <guiguidu31300@gmail.com>, 2012.
 # Guillaume Paumier <guillom.pom@gmail.com>, 2012.
+#   <life_0n_mars@live.fr>, 2012.
 # Nahir Mohamed <nahirmoha@gmail.com>, 2012.
 #   <rom1dep@gmail.com>, 2011.
 # Romain DEP. <rom1dep@gmail.com>, 2012.
@@ -15,8 +16,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-05 02:01+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-06 02:01+0200\n"
+"PO-Revision-Date: 2012-09-06 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"
@@ -63,31 +64,35 @@ msgstr "Fichiers"
 msgid "Delete"
 msgstr "Supprimer"
 
-#: js/filelist.js:141
+#: js/filelist.js:186 js/filelist.js:188
 msgid "already exists"
 msgstr "existe déjà"
 
-#: js/filelist.js:141
+#: js/filelist.js:186 js/filelist.js:188
 msgid "replace"
 msgstr "remplacer"
 
-#: js/filelist.js:141
+#: js/filelist.js:186
+msgid "suggest name"
+msgstr ""
+
+#: js/filelist.js:186 js/filelist.js:188
 msgid "cancel"
 msgstr "annuler"
 
-#: js/filelist.js:195
+#: js/filelist.js:235 js/filelist.js:237
 msgid "replaced"
 msgstr "remplacé"
 
-#: js/filelist.js:195
-msgid "with"
-msgstr "avec"
-
-#: js/filelist.js:195 js/filelist.js:246
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
 msgid "undo"
 msgstr "annuler"
 
-#: js/filelist.js:246
+#: js/filelist.js:237
+msgid "with"
+msgstr "avec"
+
+#: js/filelist.js:271
 msgid "deleted"
 msgstr "supprimé"
 
@@ -103,44 +108,44 @@ msgstr "Impossible de charger vos fichiers car il s'agit d'un dossier ou le fich
 msgid "Upload Error"
 msgstr "Erreur de chargement"
 
-#: js/files.js:236 js/files.js:327 js/files.js:356
+#: js/files.js:236 js/files.js:341 js/files.js:370
 msgid "Pending"
 msgstr "En cours"
 
-#: js/files.js:341
+#: js/files.js:355
 msgid "Upload cancelled."
 msgstr "Chargement annulé."
 
-#: js/files.js:409
+#: js/files.js:423
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "L'envoi du fichier est en cours. Quitter cette page maintenant annulera l'envoi du fichier."
 
-#: js/files.js:480
+#: js/files.js:493
 msgid "Invalid name, '/' is not allowed."
 msgstr "Nom invalide, '/' n'est pas autorisé."
 
-#: js/files.js:726 templates/index.php:55
+#: js/files.js:746 templates/index.php:55
 msgid "Size"
 msgstr "Taille"
 
-#: js/files.js:727 templates/index.php:56
+#: js/files.js:747 templates/index.php:56
 msgid "Modified"
 msgstr "Modifié"
 
-#: js/files.js:754
+#: js/files.js:774
 msgid "folder"
 msgstr "dossier"
 
-#: js/files.js:756
+#: js/files.js:776
 msgid "folders"
 msgstr "dossiers"
 
-#: js/files.js:764
+#: js/files.js:784
 msgid "file"
 msgstr "fichier"
 
-#: js/files.js:766
+#: js/files.js:786
 msgid "files"
 msgstr "fichiers"
 
@@ -174,7 +179,7 @@ msgstr "Taille maximale pour les fichiers ZIP"
 
 #: templates/admin.php:14
 msgid "Save"
-msgstr ""
+msgstr "Sauvegarder"
 
 #: templates/index.php:7
 msgid "New"
diff --git a/l10n/fr/settings.po b/l10n/fr/settings.po
index 0fd897ba24..bdf3e67d24 100644
--- a/l10n/fr/settings.po
+++ b/l10n/fr/settings.po
@@ -9,6 +9,7 @@
 #   <gp4004@arghh.org>, 2012.
 #   <guiguidu31300@gmail.com>, 2012.
 # Jan-Christoph Borchardt <JanCBorchardt@fsfe.org>, 2011.
+#   <life_0n_mars@live.fr>, 2012.
 # Nahir Mohamed <nahirmoha@gmail.com>, 2012.
 #   <pierreamiel.giraud@gmail.com>, 2012.
 #   <rom1dep@gmail.com>, 2011, 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-09-05 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-06 02:02+0200\n"
+"PO-Revision-Date: 2012-09-05 13:18+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"
@@ -75,12 +76,12 @@ msgstr "Langue changée"
 #: ajax/togglegroups.php:25
 #, php-format
 msgid "Unable to add user to group %s"
-msgstr ""
+msgstr "Impossible d'ajouter l'utilisateur au groupe %s"
 
 #: ajax/togglegroups.php:31
 #, php-format
 msgid "Unable to remove user from group %s"
-msgstr ""
+msgstr "Impossible de supprimer l'utilisateur du groupe %s"
 
 #: js/apps.js:18
 msgid "Error"
@@ -199,7 +200,7 @@ msgstr "Voir la page des applications à l'url apps.owncloud.com"
 
 #: templates/apps.php:30
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
-msgstr ""
+msgstr "<span class=\"licence\"></span>-sous licence, par <span class=\"author\"></span>"
 
 #: templates/help.php:9
 msgid "Documentation"
diff --git a/l10n/gl/core.po b/l10n/gl/core.po
index 4dd5e3d6f2..98c21db78b 100644
--- a/l10n/gl/core.po
+++ b/l10n/gl/core.po
@@ -9,15 +9,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-06 02:02+0200\n"
+"PO-Revision-Date: 2012-09-06 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"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: gl\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ajax/vcategories/add.php:23 ajax/vcategories/delete.php:23
 msgid "Application name not provided."
@@ -31,59 +31,55 @@ msgstr "Sen categoría que engadir?"
 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 "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
-
-#: js/js.js:206 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr "Preferencias"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "January"
 msgstr "Xaneiro"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "February"
 msgstr "Febreiro"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "March"
 msgstr "Marzo"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "April"
 msgstr "Abril"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "May"
 msgstr "Maio"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "June"
 msgstr "Xuño"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "July"
 msgstr "Xullo"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "August"
 msgstr "Agosto"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "September"
 msgstr "Setembro"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "October"
 msgstr "Outubro"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "November"
 msgstr "Novembro"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "December"
 msgstr "Nadal"
 
@@ -115,7 +111,7 @@ msgstr "Erro"
 msgid "ownCloud password reset"
 msgstr "Restablecer contrasinal de ownCloud"
 
-#: lostpassword/templates/email.php:1
+#: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr "Use a seguinte ligazón para restablecer o contrasinal: {link}"
 
diff --git a/l10n/gl/files.po b/l10n/gl/files.po
index 9413551a21..0de0ff2a7d 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-09-05 02:01+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-06 02:01+0200\n"
+"PO-Revision-Date: 2012-09-06 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"
@@ -57,31 +57,35 @@ msgstr "Ficheiros"
 msgid "Delete"
 msgstr "Eliminar"
 
-#: js/filelist.js:141
+#: js/filelist.js:186 js/filelist.js:188
 msgid "already exists"
 msgstr "xa existe"
 
-#: js/filelist.js:141
+#: js/filelist.js:186 js/filelist.js:188
 msgid "replace"
 msgstr "substituír"
 
-#: js/filelist.js:141
+#: js/filelist.js:186
+msgid "suggest name"
+msgstr ""
+
+#: js/filelist.js:186 js/filelist.js:188
 msgid "cancel"
 msgstr "cancelar"
 
-#: js/filelist.js:195
+#: js/filelist.js:235 js/filelist.js:237
 msgid "replaced"
 msgstr "substituído"
 
-#: js/filelist.js:195
-msgid "with"
-msgstr "con"
-
-#: js/filelist.js:195 js/filelist.js:246
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
 msgid "undo"
 msgstr "desfacer"
 
-#: js/filelist.js:246
+#: js/filelist.js:237
+msgid "with"
+msgstr "con"
+
+#: js/filelist.js:271
 msgid "deleted"
 msgstr "eliminado"
 
@@ -97,44 +101,44 @@ msgstr "Non se puido subir o ficheiro pois ou é un directorio ou ten 0 bytes"
 msgid "Upload Error"
 msgstr "Erro na subida"
 
-#: js/files.js:236 js/files.js:327 js/files.js:356
+#: js/files.js:236 js/files.js:341 js/files.js:370
 msgid "Pending"
 msgstr "Pendentes"
 
-#: js/files.js:341
+#: js/files.js:355
 msgid "Upload cancelled."
 msgstr "Subida cancelada."
 
-#: js/files.js:409
+#: js/files.js:423
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:480
+#: js/files.js:493
 msgid "Invalid name, '/' is not allowed."
 msgstr "Nome non válido, '/' non está permitido."
 
-#: js/files.js:726 templates/index.php:55
+#: js/files.js:746 templates/index.php:55
 msgid "Size"
 msgstr "Tamaño"
 
-#: js/files.js:727 templates/index.php:56
+#: js/files.js:747 templates/index.php:56
 msgid "Modified"
 msgstr "Modificado"
 
-#: js/files.js:754
+#: js/files.js:774
 msgid "folder"
 msgstr "cartafol"
 
-#: js/files.js:756
+#: js/files.js:776
 msgid "folders"
 msgstr "cartafoles"
 
-#: js/files.js:764
+#: js/files.js:784
 msgid "file"
 msgstr "ficheiro"
 
-#: js/files.js:766
+#: js/files.js:786
 msgid "files"
 msgstr "ficheiros"
 
diff --git a/l10n/he/core.po b/l10n/he/core.po
index e061910f3c..babf202fb3 100644
--- a/l10n/he/core.po
+++ b/l10n/he/core.po
@@ -10,15 +10,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-06 02:02+0200\n"
+"PO-Revision-Date: 2012-09-06 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"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: he\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ajax/vcategories/add.php:23 ajax/vcategories/delete.php:23
 msgid "Application name not provided."
@@ -32,59 +32,55 @@ 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:206 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr "הגדרות"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "January"
 msgstr "ינואר"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "February"
 msgstr "פברואר"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "March"
 msgstr "מרץ"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "April"
 msgstr "אפריל"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "May"
 msgstr "מאי"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "June"
 msgstr "יוני"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "July"
 msgstr "יולי"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "August"
 msgstr "אוגוסט"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "September"
 msgstr "ספטמבר"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "October"
 msgstr "אוקטובר"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "November"
 msgstr "נובמבר"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "December"
 msgstr "דצמבר"
 
@@ -116,7 +112,7 @@ msgstr "שגיאה"
 msgid "ownCloud password reset"
 msgstr "איפוס הססמה של ownCloud"
 
-#: lostpassword/templates/email.php:1
+#: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr "יש להשתמש בקישור הבא כדי לאפס את הססמה שלך: {link}"
 
diff --git a/l10n/he/files.po b/l10n/he/files.po
index 51db52ac27..808345fa8f 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-09-05 02:01+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-06 02:01+0200\n"
+"PO-Revision-Date: 2012-09-06 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"
@@ -58,31 +58,35 @@ msgstr "קבצים"
 msgid "Delete"
 msgstr "מחיקה"
 
-#: js/filelist.js:141
+#: js/filelist.js:186 js/filelist.js:188
 msgid "already exists"
 msgstr ""
 
-#: js/filelist.js:141
+#: js/filelist.js:186 js/filelist.js:188
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:141
+#: js/filelist.js:186
+msgid "suggest name"
+msgstr ""
+
+#: js/filelist.js:186 js/filelist.js:188
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:195
+#: js/filelist.js:235 js/filelist.js:237
 msgid "replaced"
 msgstr ""
 
-#: js/filelist.js:195
-msgid "with"
-msgstr ""
-
-#: js/filelist.js:195 js/filelist.js:246
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:246
+#: js/filelist.js:237
+msgid "with"
+msgstr ""
+
+#: js/filelist.js:271
 msgid "deleted"
 msgstr ""
 
@@ -98,44 +102,44 @@ msgstr "לא יכול להעלות את הקובץ מכיוון שזו תקיה
 msgid "Upload Error"
 msgstr "שגיאת העלאה"
 
-#: js/files.js:236 js/files.js:327 js/files.js:356
+#: js/files.js:236 js/files.js:341 js/files.js:370
 msgid "Pending"
 msgstr "ממתין"
 
-#: js/files.js:341
+#: js/files.js:355
 msgid "Upload cancelled."
 msgstr "ההעלאה בוטלה."
 
-#: js/files.js:409
+#: js/files.js:423
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:480
+#: js/files.js:493
 msgid "Invalid name, '/' is not allowed."
 msgstr "שם לא חוקי, '/' אסור לשימוש."
 
-#: js/files.js:726 templates/index.php:55
+#: js/files.js:746 templates/index.php:55
 msgid "Size"
 msgstr "גודל"
 
-#: js/files.js:727 templates/index.php:56
+#: js/files.js:747 templates/index.php:56
 msgid "Modified"
 msgstr "זמן שינוי"
 
-#: js/files.js:754
+#: js/files.js:774
 msgid "folder"
 msgstr "תקיה"
 
-#: js/files.js:756
+#: js/files.js:776
 msgid "folders"
 msgstr "תקיות"
 
-#: js/files.js:764
+#: js/files.js:784
 msgid "file"
 msgstr "קובץ"
 
-#: js/files.js:766
+#: js/files.js:786
 msgid "files"
 msgstr "קבצים"
 
diff --git a/l10n/hi/core.po b/l10n/hi/core.po
index ab39ae0190..67cd5aa9ff 100644
--- a/l10n/hi/core.po
+++ b/l10n/hi/core.po
@@ -8,15 +8,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-06 02:02+0200\n"
+"PO-Revision-Date: 2012-09-06 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: hi\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ajax/vcategories/add.php:23 ajax/vcategories/delete.php:23
 msgid "Application name not provided."
@@ -30,59 +30,55 @@ 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:206 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "January"
 msgstr ""
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "February"
 msgstr ""
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "March"
 msgstr ""
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "April"
 msgstr ""
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "May"
 msgstr ""
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "June"
 msgstr ""
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "July"
 msgstr ""
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "August"
 msgstr ""
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "September"
 msgstr ""
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "October"
 msgstr ""
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "November"
 msgstr ""
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "December"
 msgstr ""
 
@@ -114,7 +110,7 @@ msgstr ""
 msgid "ownCloud password reset"
 msgstr ""
 
-#: lostpassword/templates/email.php:1
+#: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr ""
 
diff --git a/l10n/hi/files.po b/l10n/hi/files.po
index 58546409d5..b4b909333c 100644
--- a/l10n/hi/files.po
+++ b/l10n/hi/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-09-05 02:01+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-06 02:01+0200\n"
+"PO-Revision-Date: 2012-09-06 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
 "MIME-Version: 1.0\n"
@@ -55,31 +55,35 @@ msgstr ""
 msgid "Delete"
 msgstr ""
 
-#: js/filelist.js:141
+#: js/filelist.js:186 js/filelist.js:188
 msgid "already exists"
 msgstr ""
 
-#: js/filelist.js:141
+#: js/filelist.js:186 js/filelist.js:188
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:141
+#: js/filelist.js:186
+msgid "suggest name"
+msgstr ""
+
+#: js/filelist.js:186 js/filelist.js:188
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:195
+#: js/filelist.js:235 js/filelist.js:237
 msgid "replaced"
 msgstr ""
 
-#: js/filelist.js:195
-msgid "with"
-msgstr ""
-
-#: js/filelist.js:195 js/filelist.js:246
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:246
+#: js/filelist.js:237
+msgid "with"
+msgstr ""
+
+#: js/filelist.js:271
 msgid "deleted"
 msgstr ""
 
@@ -95,44 +99,44 @@ msgstr ""
 msgid "Upload Error"
 msgstr ""
 
-#: js/files.js:236 js/files.js:327 js/files.js:356
+#: js/files.js:236 js/files.js:341 js/files.js:370
 msgid "Pending"
 msgstr ""
 
-#: js/files.js:341
+#: js/files.js:355
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:409
+#: js/files.js:423
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:480
+#: js/files.js:493
 msgid "Invalid name, '/' is not allowed."
 msgstr ""
 
-#: js/files.js:726 templates/index.php:55
+#: js/files.js:746 templates/index.php:55
 msgid "Size"
 msgstr ""
 
-#: js/files.js:727 templates/index.php:56
+#: js/files.js:747 templates/index.php:56
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:754
+#: js/files.js:774
 msgid "folder"
 msgstr ""
 
-#: js/files.js:756
+#: js/files.js:776
 msgid "folders"
 msgstr ""
 
-#: js/files.js:764
+#: js/files.js:784
 msgid "file"
 msgstr ""
 
-#: js/files.js:766
+#: js/files.js:786
 msgid "files"
 msgstr ""
 
diff --git a/l10n/hr/core.po b/l10n/hr/core.po
index 6e8a498243..3c0fc97186 100644
--- a/l10n/hr/core.po
+++ b/l10n/hr/core.po
@@ -10,15 +10,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-06 02:02+0200\n"
+"PO-Revision-Date: 2012-09-06 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"
 "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"
+"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/vcategories/add.php:23 ajax/vcategories/delete.php:23
 msgid "Application name not provided."
@@ -32,59 +32,55 @@ msgstr "Nemate kategorija koje možete dodati?"
 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 "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
-
-#: js/js.js:206 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr "Postavke"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "January"
 msgstr "Siječanj"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "February"
 msgstr "Veljača"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "March"
 msgstr "Ožujak"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "April"
 msgstr "Travanj"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "May"
 msgstr "Svibanj"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "June"
 msgstr "Lipanj"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "July"
 msgstr "Srpanj"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "August"
 msgstr "Kolovoz"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "September"
 msgstr "Rujan"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "October"
 msgstr "Listopad"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "November"
 msgstr "Studeni"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "December"
 msgstr "Prosinac"
 
@@ -116,7 +112,7 @@ msgstr "Pogreška"
 msgid "ownCloud password reset"
 msgstr "ownCloud resetiranje lozinke"
 
-#: lostpassword/templates/email.php:1
+#: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr "Koristite ovaj link da biste poništili lozinku: {link}"
 
diff --git a/l10n/hr/files.po b/l10n/hr/files.po
index c0d12a58c8..6163c004ba 100644
--- a/l10n/hr/files.po
+++ b/l10n/hr/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-09-05 02:01+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-06 02:01+0200\n"
+"PO-Revision-Date: 2012-09-06 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"
@@ -58,31 +58,35 @@ msgstr "Datoteke"
 msgid "Delete"
 msgstr "Briši"
 
-#: js/filelist.js:141
+#: js/filelist.js:186 js/filelist.js:188
 msgid "already exists"
 msgstr "već postoji"
 
-#: js/filelist.js:141
+#: js/filelist.js:186 js/filelist.js:188
 msgid "replace"
 msgstr "zamjeni"
 
-#: js/filelist.js:141
+#: js/filelist.js:186
+msgid "suggest name"
+msgstr ""
+
+#: js/filelist.js:186 js/filelist.js:188
 msgid "cancel"
 msgstr "odustani"
 
-#: js/filelist.js:195
+#: js/filelist.js:235 js/filelist.js:237
 msgid "replaced"
 msgstr "zamjenjeno"
 
-#: js/filelist.js:195
-msgid "with"
-msgstr "sa"
-
-#: js/filelist.js:195 js/filelist.js:246
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
 msgid "undo"
 msgstr "vrati"
 
-#: js/filelist.js:246
+#: js/filelist.js:237
+msgid "with"
+msgstr "sa"
+
+#: js/filelist.js:271
 msgid "deleted"
 msgstr "izbrisano"
 
@@ -98,44 +102,44 @@ msgstr "Nemoguće poslati datoteku jer je prazna ili je direktorij"
 msgid "Upload Error"
 msgstr "Pogreška pri slanju"
 
-#: js/files.js:236 js/files.js:327 js/files.js:356
+#: js/files.js:236 js/files.js:341 js/files.js:370
 msgid "Pending"
 msgstr "U tijeku"
 
-#: js/files.js:341
+#: js/files.js:355
 msgid "Upload cancelled."
 msgstr "Slanje poništeno."
 
-#: js/files.js:409
+#: js/files.js:423
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:480
+#: js/files.js:493
 msgid "Invalid name, '/' is not allowed."
 msgstr "Neispravan naziv, znak '/' nije dozvoljen."
 
-#: js/files.js:726 templates/index.php:55
+#: js/files.js:746 templates/index.php:55
 msgid "Size"
 msgstr "Veličina"
 
-#: js/files.js:727 templates/index.php:56
+#: js/files.js:747 templates/index.php:56
 msgid "Modified"
 msgstr "Zadnja promjena"
 
-#: js/files.js:754
+#: js/files.js:774
 msgid "folder"
 msgstr "mapa"
 
-#: js/files.js:756
+#: js/files.js:776
 msgid "folders"
 msgstr "mape"
 
-#: js/files.js:764
+#: js/files.js:784
 msgid "file"
 msgstr "datoteka"
 
-#: js/files.js:766
+#: js/files.js:786
 msgid "files"
 msgstr "datoteke"
 
diff --git a/l10n/hu_HU/core.po b/l10n/hu_HU/core.po
index 3e89b7e6af..6d1680b032 100644
--- a/l10n/hu_HU/core.po
+++ b/l10n/hu_HU/core.po
@@ -10,15 +10,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-06 02:02+0200\n"
+"PO-Revision-Date: 2012-09-06 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"
 "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"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ajax/vcategories/add.php:23 ajax/vcategories/delete.php:23
 msgid "Application name not provided."
@@ -32,59 +32,55 @@ 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 "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
-
-#: js/js.js:206 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr "Beállítások"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "January"
 msgstr "Január"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "February"
 msgstr "Február"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "March"
 msgstr "Március"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "April"
 msgstr "Április"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "May"
 msgstr "Május"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "June"
 msgstr "Június"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "July"
 msgstr "Július"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "August"
 msgstr "Augusztus"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "September"
 msgstr "Szeptember"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "October"
 msgstr "Október"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "November"
 msgstr "November"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "December"
 msgstr "December"
 
@@ -116,7 +112,7 @@ msgstr "Hiba"
 msgid "ownCloud password reset"
 msgstr "ownCloud jelszó-visszaállítás"
 
-#: lostpassword/templates/email.php:1
+#: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr "Használja az alábbi linket a jelszó-visszaállításhoz: {link}"
 
diff --git a/l10n/hu_HU/files.po b/l10n/hu_HU/files.po
index a2baaea844..ca00f03792 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-09-05 02:01+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-06 02:01+0200\n"
+"PO-Revision-Date: 2012-09-06 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"
@@ -58,31 +58,35 @@ msgstr "Fájlok"
 msgid "Delete"
 msgstr "Törlés"
 
-#: js/filelist.js:141
+#: js/filelist.js:186 js/filelist.js:188
 msgid "already exists"
 msgstr "már létezik"
 
-#: js/filelist.js:141
+#: js/filelist.js:186 js/filelist.js:188
 msgid "replace"
 msgstr "cserél"
 
-#: js/filelist.js:141
+#: js/filelist.js:186
+msgid "suggest name"
+msgstr ""
+
+#: js/filelist.js:186 js/filelist.js:188
 msgid "cancel"
 msgstr "mégse"
 
-#: js/filelist.js:195
+#: js/filelist.js:235 js/filelist.js:237
 msgid "replaced"
 msgstr "kicserélve"
 
-#: js/filelist.js:195
-msgid "with"
-msgstr "-val/-vel"
-
-#: js/filelist.js:195 js/filelist.js:246
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
 msgid "undo"
 msgstr "visszavon"
 
-#: js/filelist.js:246
+#: js/filelist.js:237
+msgid "with"
+msgstr "-val/-vel"
+
+#: js/filelist.js:271
 msgid "deleted"
 msgstr "törölve"
 
@@ -98,44 +102,44 @@ msgstr "Nem tölthető fel, mert mappa volt, vagy 0 byte méretű"
 msgid "Upload Error"
 msgstr "Feltöltési hiba"
 
-#: js/files.js:236 js/files.js:327 js/files.js:356
+#: js/files.js:236 js/files.js:341 js/files.js:370
 msgid "Pending"
 msgstr "Folyamatban"
 
-#: js/files.js:341
+#: js/files.js:355
 msgid "Upload cancelled."
 msgstr "Feltöltés megszakítva"
 
-#: js/files.js:409
+#: js/files.js:423
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:480
+#: js/files.js:493
 msgid "Invalid name, '/' is not allowed."
 msgstr "Érvénytelen név, a '/' nem megengedett"
 
-#: js/files.js:726 templates/index.php:55
+#: js/files.js:746 templates/index.php:55
 msgid "Size"
 msgstr "Méret"
 
-#: js/files.js:727 templates/index.php:56
+#: js/files.js:747 templates/index.php:56
 msgid "Modified"
 msgstr "Módosítva"
 
-#: js/files.js:754
+#: js/files.js:774
 msgid "folder"
 msgstr "mappa"
 
-#: js/files.js:756
+#: js/files.js:776
 msgid "folders"
 msgstr "mappák"
 
-#: js/files.js:764
+#: js/files.js:784
 msgid "file"
 msgstr "fájl"
 
-#: js/files.js:766
+#: js/files.js:786
 msgid "files"
 msgstr "fájlok"
 
diff --git a/l10n/hy/core.po b/l10n/hy/core.po
index 046e483ecc..bd1b74571d 100644
--- a/l10n/hy/core.po
+++ b/l10n/hy/core.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-06 02:02+0200\n"
+"PO-Revision-Date: 2012-09-06 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"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: hy\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ajax/vcategories/add.php:23 ajax/vcategories/delete.php:23
 msgid "Application name not provided."
@@ -29,59 +29,55 @@ 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:206 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "January"
 msgstr ""
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "February"
 msgstr ""
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "March"
 msgstr ""
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "April"
 msgstr ""
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "May"
 msgstr ""
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "June"
 msgstr ""
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "July"
 msgstr ""
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "August"
 msgstr ""
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "September"
 msgstr ""
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "October"
 msgstr ""
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "November"
 msgstr ""
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "December"
 msgstr ""
 
@@ -113,7 +109,7 @@ msgstr ""
 msgid "ownCloud password reset"
 msgstr ""
 
-#: lostpassword/templates/email.php:1
+#: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr ""
 
diff --git a/l10n/hy/files.po b/l10n/hy/files.po
index fdc067d326..e94b853649 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-09-05 02:01+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-06 02:01+0200\n"
+"PO-Revision-Date: 2012-09-06 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"
@@ -55,31 +55,35 @@ msgstr ""
 msgid "Delete"
 msgstr ""
 
-#: js/filelist.js:141
+#: js/filelist.js:186 js/filelist.js:188
 msgid "already exists"
 msgstr ""
 
-#: js/filelist.js:141
+#: js/filelist.js:186 js/filelist.js:188
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:141
+#: js/filelist.js:186
+msgid "suggest name"
+msgstr ""
+
+#: js/filelist.js:186 js/filelist.js:188
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:195
+#: js/filelist.js:235 js/filelist.js:237
 msgid "replaced"
 msgstr ""
 
-#: js/filelist.js:195
-msgid "with"
-msgstr ""
-
-#: js/filelist.js:195 js/filelist.js:246
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:246
+#: js/filelist.js:237
+msgid "with"
+msgstr ""
+
+#: js/filelist.js:271
 msgid "deleted"
 msgstr ""
 
@@ -95,44 +99,44 @@ msgstr ""
 msgid "Upload Error"
 msgstr ""
 
-#: js/files.js:236 js/files.js:327 js/files.js:356
+#: js/files.js:236 js/files.js:341 js/files.js:370
 msgid "Pending"
 msgstr ""
 
-#: js/files.js:341
+#: js/files.js:355
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:409
+#: js/files.js:423
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:480
+#: js/files.js:493
 msgid "Invalid name, '/' is not allowed."
 msgstr ""
 
-#: js/files.js:726 templates/index.php:55
+#: js/files.js:746 templates/index.php:55
 msgid "Size"
 msgstr ""
 
-#: js/files.js:727 templates/index.php:56
+#: js/files.js:747 templates/index.php:56
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:754
+#: js/files.js:774
 msgid "folder"
 msgstr ""
 
-#: js/files.js:756
+#: js/files.js:776
 msgid "folders"
 msgstr ""
 
-#: js/files.js:764
+#: js/files.js:784
 msgid "file"
 msgstr ""
 
-#: js/files.js:766
+#: js/files.js:786
 msgid "files"
 msgstr ""
 
diff --git a/l10n/ia/core.po b/l10n/ia/core.po
index cc9ee26ccc..100482b024 100644
--- a/l10n/ia/core.po
+++ b/l10n/ia/core.po
@@ -8,15 +8,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-06 02:02+0200\n"
+"PO-Revision-Date: 2012-09-06 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"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ia\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ajax/vcategories/add.php:23 ajax/vcategories/delete.php:23
 msgid "Application name not provided."
@@ -30,59 +30,55 @@ 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:206 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr "Configurationes"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "January"
 msgstr ""
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "February"
 msgstr ""
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "March"
 msgstr ""
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "April"
 msgstr ""
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "May"
 msgstr ""
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "June"
 msgstr ""
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "July"
 msgstr ""
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "August"
 msgstr ""
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "September"
 msgstr ""
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "October"
 msgstr ""
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "November"
 msgstr ""
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "December"
 msgstr ""
 
@@ -114,7 +110,7 @@ msgstr ""
 msgid "ownCloud password reset"
 msgstr "Reinitialisation del contrasigno de ownCLoud"
 
-#: lostpassword/templates/email.php:1
+#: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr ""
 
diff --git a/l10n/ia/files.po b/l10n/ia/files.po
index b2010914e2..0324e32bd0 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-09-05 02:01+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-06 02:01+0200\n"
+"PO-Revision-Date: 2012-09-06 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"
@@ -57,31 +57,35 @@ msgstr "Files"
 msgid "Delete"
 msgstr "Deler"
 
-#: js/filelist.js:141
+#: js/filelist.js:186 js/filelist.js:188
 msgid "already exists"
 msgstr ""
 
-#: js/filelist.js:141
+#: js/filelist.js:186 js/filelist.js:188
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:141
+#: js/filelist.js:186
+msgid "suggest name"
+msgstr ""
+
+#: js/filelist.js:186 js/filelist.js:188
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:195
+#: js/filelist.js:235 js/filelist.js:237
 msgid "replaced"
 msgstr ""
 
-#: js/filelist.js:195
-msgid "with"
-msgstr ""
-
-#: js/filelist.js:195 js/filelist.js:246
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:246
+#: js/filelist.js:237
+msgid "with"
+msgstr ""
+
+#: js/filelist.js:271
 msgid "deleted"
 msgstr ""
 
@@ -97,44 +101,44 @@ msgstr ""
 msgid "Upload Error"
 msgstr ""
 
-#: js/files.js:236 js/files.js:327 js/files.js:356
+#: js/files.js:236 js/files.js:341 js/files.js:370
 msgid "Pending"
 msgstr ""
 
-#: js/files.js:341
+#: js/files.js:355
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:409
+#: js/files.js:423
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:480
+#: js/files.js:493
 msgid "Invalid name, '/' is not allowed."
 msgstr ""
 
-#: js/files.js:726 templates/index.php:55
+#: js/files.js:746 templates/index.php:55
 msgid "Size"
 msgstr "Dimension"
 
-#: js/files.js:727 templates/index.php:56
+#: js/files.js:747 templates/index.php:56
 msgid "Modified"
 msgstr "Modificate"
 
-#: js/files.js:754
+#: js/files.js:774
 msgid "folder"
 msgstr ""
 
-#: js/files.js:756
+#: js/files.js:776
 msgid "folders"
 msgstr ""
 
-#: js/files.js:764
+#: js/files.js:784
 msgid "file"
 msgstr ""
 
-#: js/files.js:766
+#: js/files.js:786
 msgid "files"
 msgstr ""
 
diff --git a/l10n/id/core.po b/l10n/id/core.po
index 1b1676d042..9cb0f7651e 100644
--- a/l10n/id/core.po
+++ b/l10n/id/core.po
@@ -10,15 +10,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-06 02:02+0200\n"
+"PO-Revision-Date: 2012-09-06 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"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: id\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ajax/vcategories/add.php:23 ajax/vcategories/delete.php:23
 msgid "Application name not provided."
@@ -32,59 +32,55 @@ msgstr "Tidak ada kategori yang akan ditambahkan?"
 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:206 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr "Setelan"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "January"
 msgstr "Januari"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "February"
 msgstr "Februari"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "March"
 msgstr "Maret"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "April"
 msgstr "April"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "May"
 msgstr "Mei"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "June"
 msgstr "Juni"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "July"
 msgstr "Juli"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "August"
 msgstr "Agustus"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "September"
 msgstr "September"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "October"
 msgstr "Oktober"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "November"
 msgstr "Nopember"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "December"
 msgstr "Desember"
 
@@ -116,7 +112,7 @@ msgstr ""
 msgid "ownCloud password reset"
 msgstr "reset password ownCloud"
 
-#: lostpassword/templates/email.php:1
+#: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr "Gunakan tautan berikut untuk mereset password anda: {link}"
 
diff --git a/l10n/id/files.po b/l10n/id/files.po
index 806ae3250e..5e1a38df08 100644
--- a/l10n/id/files.po
+++ b/l10n/id/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-09-05 02:01+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-06 02:01+0200\n"
+"PO-Revision-Date: 2012-09-06 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"
@@ -58,31 +58,35 @@ msgstr "Berkas"
 msgid "Delete"
 msgstr "Hapus"
 
-#: js/filelist.js:141
+#: js/filelist.js:186 js/filelist.js:188
 msgid "already exists"
 msgstr "sudah ada"
 
-#: js/filelist.js:141
+#: js/filelist.js:186 js/filelist.js:188
 msgid "replace"
 msgstr "mengganti"
 
-#: js/filelist.js:141
+#: js/filelist.js:186
+msgid "suggest name"
+msgstr ""
+
+#: js/filelist.js:186 js/filelist.js:188
 msgid "cancel"
 msgstr "batalkan"
 
-#: js/filelist.js:195
+#: js/filelist.js:235 js/filelist.js:237
 msgid "replaced"
 msgstr "diganti"
 
-#: js/filelist.js:195
-msgid "with"
-msgstr "dengan"
-
-#: js/filelist.js:195 js/filelist.js:246
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
 msgid "undo"
 msgstr "batal dikerjakan"
 
-#: js/filelist.js:246
+#: js/filelist.js:237
+msgid "with"
+msgstr "dengan"
+
+#: js/filelist.js:271
 msgid "deleted"
 msgstr "dihapus"
 
@@ -98,44 +102,44 @@ msgstr "Gagal mengunggah berkas anda karena berupa direktori atau mempunyai ukur
 msgid "Upload Error"
 msgstr "Terjadi Galat Pengunggahan"
 
-#: js/files.js:236 js/files.js:327 js/files.js:356
+#: js/files.js:236 js/files.js:341 js/files.js:370
 msgid "Pending"
 msgstr "Menunggu"
 
-#: js/files.js:341
+#: js/files.js:355
 msgid "Upload cancelled."
 msgstr "Pengunggahan dibatalkan."
 
-#: js/files.js:409
+#: js/files.js:423
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:480
+#: js/files.js:493
 msgid "Invalid name, '/' is not allowed."
 msgstr "Kesalahan nama, '/' tidak diijinkan."
 
-#: js/files.js:726 templates/index.php:55
+#: js/files.js:746 templates/index.php:55
 msgid "Size"
 msgstr "Ukuran"
 
-#: js/files.js:727 templates/index.php:56
+#: js/files.js:747 templates/index.php:56
 msgid "Modified"
 msgstr "Dimodifikasi"
 
-#: js/files.js:754
+#: js/files.js:774
 msgid "folder"
 msgstr "folder"
 
-#: js/files.js:756
+#: js/files.js:776
 msgid "folders"
 msgstr "folder-folder"
 
-#: js/files.js:764
+#: js/files.js:784
 msgid "file"
 msgstr "berkas"
 
-#: js/files.js:766
+#: js/files.js:786
 msgid "files"
 msgstr "berkas-berkas"
 
diff --git a/l10n/id_ID/core.po b/l10n/id_ID/core.po
index 7227d27665..a7ada9179b 100644
--- a/l10n/id_ID/core.po
+++ b/l10n/id_ID/core.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-06 02:02+0200\n"
+"PO-Revision-Date: 2012-09-06 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"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: id_ID\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ajax/vcategories/add.php:23 ajax/vcategories/delete.php:23
 msgid "Application name not provided."
@@ -29,59 +29,55 @@ 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:206 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "January"
 msgstr ""
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "February"
 msgstr ""
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "March"
 msgstr ""
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "April"
 msgstr ""
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "May"
 msgstr ""
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "June"
 msgstr ""
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "July"
 msgstr ""
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "August"
 msgstr ""
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "September"
 msgstr ""
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "October"
 msgstr ""
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "November"
 msgstr ""
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "December"
 msgstr ""
 
@@ -113,7 +109,7 @@ msgstr ""
 msgid "ownCloud password reset"
 msgstr ""
 
-#: lostpassword/templates/email.php:1
+#: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr ""
 
diff --git a/l10n/id_ID/files.po b/l10n/id_ID/files.po
index a138ce1d22..3ef54242d3 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-09-05 02:01+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-06 02:01+0200\n"
+"PO-Revision-Date: 2012-09-06 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"
@@ -55,31 +55,35 @@ msgstr ""
 msgid "Delete"
 msgstr ""
 
-#: js/filelist.js:141
+#: js/filelist.js:186 js/filelist.js:188
 msgid "already exists"
 msgstr ""
 
-#: js/filelist.js:141
+#: js/filelist.js:186 js/filelist.js:188
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:141
+#: js/filelist.js:186
+msgid "suggest name"
+msgstr ""
+
+#: js/filelist.js:186 js/filelist.js:188
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:195
+#: js/filelist.js:235 js/filelist.js:237
 msgid "replaced"
 msgstr ""
 
-#: js/filelist.js:195
-msgid "with"
-msgstr ""
-
-#: js/filelist.js:195 js/filelist.js:246
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:246
+#: js/filelist.js:237
+msgid "with"
+msgstr ""
+
+#: js/filelist.js:271
 msgid "deleted"
 msgstr ""
 
@@ -95,44 +99,44 @@ msgstr ""
 msgid "Upload Error"
 msgstr ""
 
-#: js/files.js:236 js/files.js:327 js/files.js:356
+#: js/files.js:236 js/files.js:341 js/files.js:370
 msgid "Pending"
 msgstr ""
 
-#: js/files.js:341
+#: js/files.js:355
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:409
+#: js/files.js:423
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:480
+#: js/files.js:493
 msgid "Invalid name, '/' is not allowed."
 msgstr ""
 
-#: js/files.js:726 templates/index.php:55
+#: js/files.js:746 templates/index.php:55
 msgid "Size"
 msgstr ""
 
-#: js/files.js:727 templates/index.php:56
+#: js/files.js:747 templates/index.php:56
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:754
+#: js/files.js:774
 msgid "folder"
 msgstr ""
 
-#: js/files.js:756
+#: js/files.js:776
 msgid "folders"
 msgstr ""
 
-#: js/files.js:764
+#: js/files.js:784
 msgid "file"
 msgstr ""
 
-#: js/files.js:766
+#: js/files.js:786
 msgid "files"
 msgstr ""
 
diff --git a/l10n/it/core.po b/l10n/it/core.po
index 281cd036ad..39884ebdc9 100644
--- a/l10n/it/core.po
+++ b/l10n/it/core.po
@@ -12,15 +12,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 02:01+0200\n"
-"PO-Revision-Date: 2012-08-31 05:26+0000\n"
-"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
+"POT-Creation-Date: 2012-09-06 02:02+0200\n"
+"PO-Revision-Date: 2012-09-06 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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: it\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ajax/vcategories/add.php:23 ajax/vcategories/delete.php:23
 msgid "Application name not provided."
@@ -34,59 +34,55 @@ 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 "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
-
-#: js/js.js:206 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr "Impostazioni"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "January"
 msgstr "Gennaio"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "February"
 msgstr "Febbraio"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "March"
 msgstr "Marzo"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "April"
 msgstr "Aprile"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "May"
 msgstr "Maggio"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "June"
 msgstr "Giugno"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "July"
 msgstr "Luglio"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "August"
 msgstr "Agosto"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "September"
 msgstr "Settembre"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "October"
 msgstr "Ottobre"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "November"
 msgstr "Novembre"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "December"
 msgstr "Dicembre"
 
@@ -118,7 +114,7 @@ msgstr "Errore"
 msgid "ownCloud password reset"
 msgstr "Ripristino password di ownCloud"
 
-#: lostpassword/templates/email.php:1
+#: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr "Usa il collegamento seguente per ripristinare la password: {link}"
 
diff --git a/l10n/it/files.po b/l10n/it/files.po
index 29c50647d1..daa29074e6 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-09-05 02:01+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-06 02:01+0200\n"
+"PO-Revision-Date: 2012-09-06 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"
@@ -59,31 +59,35 @@ msgstr "File"
 msgid "Delete"
 msgstr "Elimina"
 
-#: js/filelist.js:141
+#: js/filelist.js:186 js/filelist.js:188
 msgid "already exists"
 msgstr "esiste già"
 
-#: js/filelist.js:141
+#: js/filelist.js:186 js/filelist.js:188
 msgid "replace"
 msgstr "sostituisci"
 
-#: js/filelist.js:141
+#: js/filelist.js:186
+msgid "suggest name"
+msgstr ""
+
+#: js/filelist.js:186 js/filelist.js:188
 msgid "cancel"
 msgstr "annulla"
 
-#: js/filelist.js:195
+#: js/filelist.js:235 js/filelist.js:237
 msgid "replaced"
 msgstr "sostituito"
 
-#: js/filelist.js:195
-msgid "with"
-msgstr "con"
-
-#: js/filelist.js:195 js/filelist.js:246
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
 msgid "undo"
 msgstr "annulla"
 
-#: js/filelist.js:246
+#: js/filelist.js:237
+msgid "with"
+msgstr "con"
+
+#: js/filelist.js:271
 msgid "deleted"
 msgstr "eliminati"
 
@@ -99,44 +103,44 @@ msgstr "Impossibile inviare il file poiché è una cartella o ha dimensione 0 by
 msgid "Upload Error"
 msgstr "Errore di invio"
 
-#: js/files.js:236 js/files.js:327 js/files.js:356
+#: js/files.js:236 js/files.js:341 js/files.js:370
 msgid "Pending"
 msgstr "In corso"
 
-#: js/files.js:341
+#: js/files.js:355
 msgid "Upload cancelled."
 msgstr "Invio annullato"
 
-#: js/files.js:409
+#: js/files.js:423
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Caricamento del file in corso. La chiusura della pagina annullerà il caricamento."
 
-#: js/files.js:480
+#: js/files.js:493
 msgid "Invalid name, '/' is not allowed."
 msgstr "Nome non valido"
 
-#: js/files.js:726 templates/index.php:55
+#: js/files.js:746 templates/index.php:55
 msgid "Size"
 msgstr "Dimensione"
 
-#: js/files.js:727 templates/index.php:56
+#: js/files.js:747 templates/index.php:56
 msgid "Modified"
 msgstr "Modificato"
 
-#: js/files.js:754
+#: js/files.js:774
 msgid "folder"
 msgstr "cartella"
 
-#: js/files.js:756
+#: js/files.js:776
 msgid "folders"
 msgstr "cartelle"
 
-#: js/files.js:764
+#: js/files.js:784
 msgid "file"
 msgstr "file"
 
-#: js/files.js:766
+#: js/files.js:786
 msgid "files"
 msgstr "file"
 
@@ -170,7 +174,7 @@ msgstr "Dimensione massima per i file ZIP"
 
 #: templates/admin.php:14
 msgid "Save"
-msgstr ""
+msgstr "Salva"
 
 #: templates/index.php:7
 msgid "New"
diff --git a/l10n/it/settings.po b/l10n/it/settings.po
index 7a1601c881..1ec0daf688 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-09-05 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-06 02:02+0200\n"
+"PO-Revision-Date: 2012-09-05 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"
@@ -72,12 +72,12 @@ msgstr "Lingua modificata"
 #: ajax/togglegroups.php:25
 #, php-format
 msgid "Unable to add user to group %s"
-msgstr ""
+msgstr "Impossibile aggiungere l'utente al gruppo %s"
 
 #: ajax/togglegroups.php:31
 #, php-format
 msgid "Unable to remove user from group %s"
-msgstr ""
+msgstr "Impossibile rimuovere l'utente dal gruppo %s"
 
 #: js/apps.js:18
 msgid "Error"
@@ -196,7 +196,7 @@ msgstr "Vedere la pagina dell'applicazione su apps.owncloud.com"
 
 #: templates/apps.php:30
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
-msgstr ""
+msgstr "<span class=\"licence\"></span>-licenziato da <span class=\"author\"></span>"
 
 #: templates/help.php:9
 msgid "Documentation"
diff --git a/l10n/ja_JP/core.po b/l10n/ja_JP/core.po
index d0d6924197..139012d619 100644
--- a/l10n/ja_JP/core.po
+++ b/l10n/ja_JP/core.po
@@ -9,15 +9,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 02:01+0200\n"
-"PO-Revision-Date: 2012-08-31 07:44+0000\n"
-"Last-Translator: ttyn <tetuyano+transi@gmail.com>\n"
+"POT-Creation-Date: 2012-09-06 02:02+0200\n"
+"PO-Revision-Date: 2012-09-06 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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ja_JP\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ajax/vcategories/add.php:23 ajax/vcategories/delete.php:23
 msgid "Application name not provided."
@@ -31,59 +31,55 @@ 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 "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
-
-#: js/js.js:206 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr "設定"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "January"
 msgstr "1月"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "February"
 msgstr "2月"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "March"
 msgstr "3月"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "April"
 msgstr "4月"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "May"
 msgstr "5月"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "June"
 msgstr "6月"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "July"
 msgstr "7月"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "August"
 msgstr "8月"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "September"
 msgstr "9月"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "October"
 msgstr "10月"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "November"
 msgstr "11月"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "December"
 msgstr "12月"
 
@@ -115,7 +111,7 @@ msgstr "エラー"
 msgid "ownCloud password reset"
 msgstr "ownCloudのパスワードをリセットします"
 
-#: lostpassword/templates/email.php:1
+#: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr "パスワードをリセットするには次のリンクをクリックして下さい: {link}"
 
diff --git a/l10n/ja_JP/files.po b/l10n/ja_JP/files.po
index 7474142217..c73d204ecb 100644
--- a/l10n/ja_JP/files.po
+++ b/l10n/ja_JP/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-09-05 02:01+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-06 02:01+0200\n"
+"PO-Revision-Date: 2012-09-06 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"
@@ -57,31 +57,35 @@ msgstr "ファイル"
 msgid "Delete"
 msgstr "削除"
 
-#: js/filelist.js:141
+#: js/filelist.js:186 js/filelist.js:188
 msgid "already exists"
 msgstr "既に存在します"
 
-#: js/filelist.js:141
+#: js/filelist.js:186 js/filelist.js:188
 msgid "replace"
 msgstr "置き換え"
 
-#: js/filelist.js:141
+#: js/filelist.js:186
+msgid "suggest name"
+msgstr ""
+
+#: js/filelist.js:186 js/filelist.js:188
 msgid "cancel"
 msgstr "キャンセル"
 
-#: js/filelist.js:195
+#: js/filelist.js:235 js/filelist.js:237
 msgid "replaced"
 msgstr "置換："
 
-#: js/filelist.js:195
-msgid "with"
-msgstr "←"
-
-#: js/filelist.js:195 js/filelist.js:246
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
 msgid "undo"
 msgstr "元に戻す"
 
-#: js/filelist.js:246
+#: js/filelist.js:237
+msgid "with"
+msgstr "←"
+
+#: js/filelist.js:271
 msgid "deleted"
 msgstr "削除"
 
@@ -97,44 +101,44 @@ msgstr "アップロード使用としているファイルがディレクトリ
 msgid "Upload Error"
 msgstr "アップロードエラー"
 
-#: js/files.js:236 js/files.js:327 js/files.js:356
+#: js/files.js:236 js/files.js:341 js/files.js:370
 msgid "Pending"
 msgstr "保留"
 
-#: js/files.js:341
+#: js/files.js:355
 msgid "Upload cancelled."
 msgstr "アップロードはキャンセルされました。"
 
-#: js/files.js:409
+#: js/files.js:423
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "ファイル転送を実行中です。今このページから移動するとアップロードが中止されます。"
 
-#: js/files.js:480
+#: js/files.js:493
 msgid "Invalid name, '/' is not allowed."
 msgstr "無効な名前、'/' は使用できません。"
 
-#: js/files.js:726 templates/index.php:55
+#: js/files.js:746 templates/index.php:55
 msgid "Size"
 msgstr "サイズ"
 
-#: js/files.js:727 templates/index.php:56
+#: js/files.js:747 templates/index.php:56
 msgid "Modified"
 msgstr "更新日時"
 
-#: js/files.js:754
+#: js/files.js:774
 msgid "folder"
 msgstr "フォルダ"
 
-#: js/files.js:756
+#: js/files.js:776
 msgid "folders"
 msgstr "フォルダ"
 
-#: js/files.js:764
+#: js/files.js:784
 msgid "file"
 msgstr "ファイル"
 
-#: js/files.js:766
+#: js/files.js:786
 msgid "files"
 msgstr "ファイル"
 
@@ -168,7 +172,7 @@ msgstr "ZIPファイルへの最大入力サイズ"
 
 #: templates/admin.php:14
 msgid "Save"
-msgstr ""
+msgstr "保存"
 
 #: templates/index.php:7
 msgid "New"
diff --git a/l10n/ja_JP/settings.po b/l10n/ja_JP/settings.po
index b98da01025..9652d0d975 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-09-05 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-06 02:02+0200\n"
+"PO-Revision-Date: 2012-09-05 02:09+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"
@@ -30,11 +30,11 @@ msgstr "認証エラー"
 
 #: ajax/creategroup.php:19
 msgid "Group already exists"
-msgstr ""
+msgstr "グループは既に存在しています"
 
 #: ajax/creategroup.php:28
 msgid "Unable to add group"
-msgstr ""
+msgstr "グループを追加できません"
 
 #: ajax/lostpassword.php:14
 msgid "Email saved"
@@ -54,11 +54,11 @@ msgstr "無効なリクエストです"
 
 #: ajax/removegroup.php:16
 msgid "Unable to delete group"
-msgstr ""
+msgstr "グループを削除できません"
 
 #: ajax/removeuser.php:22
 msgid "Unable to delete user"
-msgstr ""
+msgstr "ユーザを削除できません"
 
 #: ajax/setlanguage.php:18
 msgid "Language changed"
@@ -67,12 +67,12 @@ msgstr "言語が変更されました"
 #: ajax/togglegroups.php:25
 #, php-format
 msgid "Unable to add user to group %s"
-msgstr ""
+msgstr "ユーザをグループ %s に追加できません"
 
 #: ajax/togglegroups.php:31
 #, php-format
 msgid "Unable to remove user from group %s"
-msgstr ""
+msgstr "ユーザをグループ %s から削除できません"
 
 #: js/apps.js:18
 msgid "Error"
@@ -191,7 +191,7 @@ msgstr "apps.owncloud.com でアプリケーションのページを見てくだ
 
 #: templates/apps.php:30
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
-msgstr ""
+msgstr "<span class=\"licence\"></span>-ライセンス: <span class=\"author\"></span>"
 
 #: templates/help.php:9
 msgid "Documentation"
diff --git a/l10n/ko/core.po b/l10n/ko/core.po
index d414be7753..4d2f0561de 100644
--- a/l10n/ko/core.po
+++ b/l10n/ko/core.po
@@ -9,15 +9,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-06 02:02+0200\n"
+"PO-Revision-Date: 2012-09-06 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"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ko\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ajax/vcategories/add.php:23 ajax/vcategories/delete.php:23
 msgid "Application name not provided."
@@ -31,59 +31,55 @@ 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 "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
-
-#: js/js.js:206 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr "설정"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "January"
 msgstr "1월"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "February"
 msgstr "2월"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "March"
 msgstr "3월"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "April"
 msgstr "4월"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "May"
 msgstr "5월"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "June"
 msgstr "6월"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "July"
 msgstr "7월"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "August"
 msgstr "8월"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "September"
 msgstr "9월"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "October"
 msgstr "10월"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "November"
 msgstr "11월"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "December"
 msgstr "12월"
 
@@ -115,7 +111,7 @@ msgstr "에러"
 msgid "ownCloud password reset"
 msgstr "ownCloud 비밀번호 재설정"
 
-#: lostpassword/templates/email.php:1
+#: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr "다음 링크를 사용하여 암호를 초기화할 수 있습니다: {link}"
 
diff --git a/l10n/ko/files.po b/l10n/ko/files.po
index 05dda7be5a..2abe6f9ed6 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-09-05 02:01+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-06 02:01+0200\n"
+"PO-Revision-Date: 2012-09-06 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"
@@ -57,31 +57,35 @@ msgstr "파일"
 msgid "Delete"
 msgstr "삭제"
 
-#: js/filelist.js:141
+#: js/filelist.js:186 js/filelist.js:188
 msgid "already exists"
 msgstr "이미 존재 합니다"
 
-#: js/filelist.js:141
+#: js/filelist.js:186 js/filelist.js:188
 msgid "replace"
 msgstr "대체"
 
-#: js/filelist.js:141
+#: js/filelist.js:186
+msgid "suggest name"
+msgstr ""
+
+#: js/filelist.js:186 js/filelist.js:188
 msgid "cancel"
 msgstr "취소"
 
-#: js/filelist.js:195
+#: js/filelist.js:235 js/filelist.js:237
 msgid "replaced"
 msgstr "대체됨"
 
-#: js/filelist.js:195
-msgid "with"
-msgstr "와"
-
-#: js/filelist.js:195 js/filelist.js:246
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
 msgid "undo"
 msgstr "복구"
 
-#: js/filelist.js:246
+#: js/filelist.js:237
+msgid "with"
+msgstr "와"
+
+#: js/filelist.js:271
 msgid "deleted"
 msgstr "삭제"
 
@@ -97,44 +101,44 @@ msgstr "이 파일은 디렉토리이거나 0 바이트이기 때문에 업로
 msgid "Upload Error"
 msgstr "업로드 에러"
 
-#: js/files.js:236 js/files.js:327 js/files.js:356
+#: js/files.js:236 js/files.js:341 js/files.js:370
 msgid "Pending"
 msgstr "보류 중"
 
-#: js/files.js:341
+#: js/files.js:355
 msgid "Upload cancelled."
 msgstr "업로드 취소."
 
-#: js/files.js:409
+#: js/files.js:423
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:480
+#: js/files.js:493
 msgid "Invalid name, '/' is not allowed."
 msgstr "잘못된 이름, '/' 은 허용이 되지 않습니다."
 
-#: js/files.js:726 templates/index.php:55
+#: js/files.js:746 templates/index.php:55
 msgid "Size"
 msgstr "크기"
 
-#: js/files.js:727 templates/index.php:56
+#: js/files.js:747 templates/index.php:56
 msgid "Modified"
 msgstr "수정됨"
 
-#: js/files.js:754
+#: js/files.js:774
 msgid "folder"
 msgstr "폴더"
 
-#: js/files.js:756
+#: js/files.js:776
 msgid "folders"
 msgstr "폴더"
 
-#: js/files.js:764
+#: js/files.js:784
 msgid "file"
 msgstr "파일"
 
-#: js/files.js:766
+#: js/files.js:786
 msgid "files"
 msgstr "파일"
 
diff --git a/l10n/lb/core.po b/l10n/lb/core.po
index a9de075246..6c3da7e6b5 100644
--- a/l10n/lb/core.po
+++ b/l10n/lb/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-09-04 02:01+0200\n"
-"PO-Revision-Date: 2012-09-03 21:47+0000\n"
-"Last-Translator: sim0n <sim0n@trypill.org>\n"
+"POT-Creation-Date: 2012-09-06 02:02+0200\n"
+"PO-Revision-Date: 2012-09-06 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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -30,59 +30,55 @@ msgstr "Keng Kategorie fir bäizesetzen?"
 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:206 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr "Astellungen"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "January"
 msgstr "Januar"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "February"
 msgstr "Februar"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "March"
 msgstr "Mäerz"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "April"
 msgstr "Abrëll"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "May"
 msgstr "Mee"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "June"
 msgstr "Juni"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "July"
 msgstr "Juli"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "August"
 msgstr "August"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "September"
 msgstr "September"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "October"
 msgstr "Oktober"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "November"
 msgstr "November"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "December"
 msgstr "Dezember"
 
@@ -114,7 +110,7 @@ msgstr "Fehler"
 msgid "ownCloud password reset"
 msgstr "ownCloud Passwuert reset"
 
-#: lostpassword/templates/email.php:1
+#: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr "Benotz folgende Link fir däi Passwuert ze reseten: {link}"
 
diff --git a/l10n/lb/files.po b/l10n/lb/files.po
index bda384f1ce..bdce420aa1 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-09-05 02:01+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-06 02:01+0200\n"
+"PO-Revision-Date: 2012-09-06 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"
@@ -56,31 +56,35 @@ msgstr "Dateien"
 msgid "Delete"
 msgstr "Läschen"
 
-#: js/filelist.js:141
+#: js/filelist.js:186 js/filelist.js:188
 msgid "already exists"
 msgstr "existéiert schonn"
 
-#: js/filelist.js:141
+#: js/filelist.js:186 js/filelist.js:188
 msgid "replace"
 msgstr "ersetzen"
 
-#: js/filelist.js:141
+#: js/filelist.js:186
+msgid "suggest name"
+msgstr ""
+
+#: js/filelist.js:186 js/filelist.js:188
 msgid "cancel"
 msgstr "ofbriechen"
 
-#: js/filelist.js:195
+#: js/filelist.js:235 js/filelist.js:237
 msgid "replaced"
 msgstr "ersat"
 
-#: js/filelist.js:195
-msgid "with"
-msgstr "mat"
-
-#: js/filelist.js:195 js/filelist.js:246
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
 msgid "undo"
 msgstr "réckgängeg man"
 
-#: js/filelist.js:246
+#: js/filelist.js:237
+msgid "with"
+msgstr "mat"
+
+#: js/filelist.js:271
 msgid "deleted"
 msgstr "geläscht"
 
@@ -96,44 +100,44 @@ msgstr "Kann deng Datei net eroplueden well et en Dossier ass oder 0 byte grouss
 msgid "Upload Error"
 msgstr "Fehler beim eroplueden"
 
-#: js/files.js:236 js/files.js:327 js/files.js:356
+#: js/files.js:236 js/files.js:341 js/files.js:370
 msgid "Pending"
 msgstr ""
 
-#: js/files.js:341
+#: js/files.js:355
 msgid "Upload cancelled."
 msgstr "Upload ofgebrach."
 
-#: js/files.js:409
+#: js/files.js:423
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "File Upload am gaang. Wann's de des Säit verléiss gëtt den Upload ofgebrach."
 
-#: js/files.js:480
+#: js/files.js:493
 msgid "Invalid name, '/' is not allowed."
 msgstr "Ongültege Numm, '/' net erlaabt."
 
-#: js/files.js:726 templates/index.php:55
+#: js/files.js:746 templates/index.php:55
 msgid "Size"
 msgstr "Gréisst"
 
-#: js/files.js:727 templates/index.php:56
+#: js/files.js:747 templates/index.php:56
 msgid "Modified"
 msgstr "Geännert"
 
-#: js/files.js:754
+#: js/files.js:774
 msgid "folder"
 msgstr "Dossier"
 
-#: js/files.js:756
+#: js/files.js:776
 msgid "folders"
 msgstr "Dossieren"
 
-#: js/files.js:764
+#: js/files.js:784
 msgid "file"
 msgstr "Datei"
 
-#: js/files.js:766
+#: js/files.js:786
 msgid "files"
 msgstr "Dateien"
 
diff --git a/l10n/lt_LT/core.po b/l10n/lt_LT/core.po
index d2e08de437..1e9dd8d63a 100644
--- a/l10n/lt_LT/core.po
+++ b/l10n/lt_LT/core.po
@@ -8,15 +8,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-06 02:02+0200\n"
+"PO-Revision-Date: 2012-09-06 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"
 "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"
+"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/vcategories/add.php:23 ajax/vcategories/delete.php:23
 msgid "Application name not provided."
@@ -30,59 +30,55 @@ msgstr "Nepridėsite jokios kategorijos?"
 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 "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
-
-#: js/js.js:206 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr "Nustatymai"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "January"
 msgstr "Sausis"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "February"
 msgstr "Vasaris"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "March"
 msgstr "Kovas"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "April"
 msgstr "Balandis"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "May"
 msgstr "Gegužė"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "June"
 msgstr "Birželis"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "July"
 msgstr "Liepa"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "August"
 msgstr "Rugpjūtis"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "September"
 msgstr "Rugsėjis"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "October"
 msgstr "Spalis"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "November"
 msgstr "Lapkritis"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "December"
 msgstr "Gruodis"
 
@@ -114,7 +110,7 @@ msgstr "Klaida"
 msgid "ownCloud password reset"
 msgstr "ownCloud slaptažodžio atkūrimas"
 
-#: lostpassword/templates/email.php:1
+#: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr "Slaptažodio atkūrimui naudokite šią nuorodą: {link}"
 
diff --git a/l10n/lt_LT/files.po b/l10n/lt_LT/files.po
index 1aff17e92e..058124ee7f 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-09-05 02:01+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-06 02:01+0200\n"
+"PO-Revision-Date: 2012-09-06 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"
@@ -57,31 +57,35 @@ msgstr "Failai"
 msgid "Delete"
 msgstr "Ištrinti"
 
-#: js/filelist.js:141
+#: js/filelist.js:186 js/filelist.js:188
 msgid "already exists"
 msgstr ""
 
-#: js/filelist.js:141
+#: js/filelist.js:186 js/filelist.js:188
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:141
+#: js/filelist.js:186
+msgid "suggest name"
+msgstr ""
+
+#: js/filelist.js:186 js/filelist.js:188
 msgid "cancel"
 msgstr "atšaukti"
 
-#: js/filelist.js:195
+#: js/filelist.js:235 js/filelist.js:237
 msgid "replaced"
 msgstr ""
 
-#: js/filelist.js:195
-msgid "with"
-msgstr ""
-
-#: js/filelist.js:195 js/filelist.js:246
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:246
+#: js/filelist.js:237
+msgid "with"
+msgstr ""
+
+#: js/filelist.js:271
 msgid "deleted"
 msgstr ""
 
@@ -97,44 +101,44 @@ msgstr "Neįmanoma įkelti failo - jo dydis gali būti 0 bitų arba tai kataloga
 msgid "Upload Error"
 msgstr "Įkėlimo klaida"
 
-#: js/files.js:236 js/files.js:327 js/files.js:356
+#: js/files.js:236 js/files.js:341 js/files.js:370
 msgid "Pending"
 msgstr "Laukiantis"
 
-#: js/files.js:341
+#: js/files.js:355
 msgid "Upload cancelled."
 msgstr "Įkėlimas atšauktas."
 
-#: js/files.js:409
+#: js/files.js:423
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:480
+#: js/files.js:493
 msgid "Invalid name, '/' is not allowed."
 msgstr "Pavadinime negali būti naudojamas ženklas \"/\"."
 
-#: js/files.js:726 templates/index.php:55
+#: js/files.js:746 templates/index.php:55
 msgid "Size"
 msgstr "Dydis"
 
-#: js/files.js:727 templates/index.php:56
+#: js/files.js:747 templates/index.php:56
 msgid "Modified"
 msgstr "Pakeista"
 
-#: js/files.js:754
+#: js/files.js:774
 msgid "folder"
 msgstr "katalogas"
 
-#: js/files.js:756
+#: js/files.js:776
 msgid "folders"
 msgstr "katalogai"
 
-#: js/files.js:764
+#: js/files.js:784
 msgid "file"
 msgstr "failas"
 
-#: js/files.js:766
+#: js/files.js:786
 msgid "files"
 msgstr "failai"
 
diff --git a/l10n/lv/core.po b/l10n/lv/core.po
index 35b9d2e808..3716a06f25 100644
--- a/l10n/lv/core.po
+++ b/l10n/lv/core.po
@@ -8,15 +8,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-06 02:02+0200\n"
+"PO-Revision-Date: 2012-09-06 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"
 "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"
+"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."
@@ -30,59 +30,55 @@ 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:206 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr "Iestatījumi"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "January"
 msgstr ""
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "February"
 msgstr ""
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "March"
 msgstr ""
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "April"
 msgstr ""
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "May"
 msgstr ""
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "June"
 msgstr ""
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "July"
 msgstr ""
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "August"
 msgstr ""
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "September"
 msgstr ""
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "October"
 msgstr ""
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "November"
 msgstr ""
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "December"
 msgstr ""
 
@@ -114,7 +110,7 @@ msgstr ""
 msgid "ownCloud password reset"
 msgstr ""
 
-#: lostpassword/templates/email.php:1
+#: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr "Izmantojiet šo linku lai mainītu paroli"
 
diff --git a/l10n/lv/files.po b/l10n/lv/files.po
index b6fb8d8d07..5b5c7464b7 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-09-05 02:01+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-06 02:01+0200\n"
+"PO-Revision-Date: 2012-09-06 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"
@@ -56,31 +56,35 @@ msgstr "Faili"
 msgid "Delete"
 msgstr "Izdzēst"
 
-#: js/filelist.js:141
+#: js/filelist.js:186 js/filelist.js:188
 msgid "already exists"
 msgstr "tāds fails jau eksistē"
 
-#: js/filelist.js:141
+#: js/filelist.js:186 js/filelist.js:188
 msgid "replace"
 msgstr "aizvietot"
 
-#: js/filelist.js:141
+#: js/filelist.js:186
+msgid "suggest name"
+msgstr ""
+
+#: js/filelist.js:186 js/filelist.js:188
 msgid "cancel"
 msgstr "atcelt"
 
-#: js/filelist.js:195
+#: js/filelist.js:235 js/filelist.js:237
 msgid "replaced"
 msgstr "aizvietots"
 
-#: js/filelist.js:195
-msgid "with"
-msgstr "ar"
-
-#: js/filelist.js:195 js/filelist.js:246
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
 msgid "undo"
 msgstr "vienu soli atpakaļ"
 
-#: js/filelist.js:246
+#: js/filelist.js:237
+msgid "with"
+msgstr "ar"
+
+#: js/filelist.js:271
 msgid "deleted"
 msgstr "izdzests"
 
@@ -96,44 +100,44 @@ msgstr "Nav iespējams augšuplādēt jūsu failu, jo tāds jau eksistē vai ar
 msgid "Upload Error"
 msgstr "Augšuplādēšanas laikā radās kļūda"
 
-#: js/files.js:236 js/files.js:327 js/files.js:356
+#: js/files.js:236 js/files.js:341 js/files.js:370
 msgid "Pending"
 msgstr "Gaida savu kārtu"
 
-#: js/files.js:341
+#: js/files.js:355
 msgid "Upload cancelled."
 msgstr "Augšuplāde ir atcelta"
 
-#: js/files.js:409
+#: js/files.js:423
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:480
+#: js/files.js:493
 msgid "Invalid name, '/' is not allowed."
 msgstr "Šis simbols '/', nav atļauts."
 
-#: js/files.js:726 templates/index.php:55
+#: js/files.js:746 templates/index.php:55
 msgid "Size"
 msgstr "Izmērs"
 
-#: js/files.js:727 templates/index.php:56
+#: js/files.js:747 templates/index.php:56
 msgid "Modified"
 msgstr "Izmainīts"
 
-#: js/files.js:754
+#: js/files.js:774
 msgid "folder"
 msgstr "mape"
 
-#: js/files.js:756
+#: js/files.js:776
 msgid "folders"
 msgstr "mapes"
 
-#: js/files.js:764
+#: js/files.js:784
 msgid "file"
 msgstr "fails"
 
-#: js/files.js:766
+#: js/files.js:786
 msgid "files"
 msgstr "faili"
 
diff --git a/l10n/mk/core.po b/l10n/mk/core.po
index b8fbb8b2a1..f818b6bad6 100644
--- a/l10n/mk/core.po
+++ b/l10n/mk/core.po
@@ -10,15 +10,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-06 02:02+0200\n"
+"PO-Revision-Date: 2012-09-06 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"
 "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"
+"Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
 
 #: ajax/vcategories/add.php:23 ajax/vcategories/delete.php:23
 msgid "Application name not provided."
@@ -32,59 +32,55 @@ 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 "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
-
-#: js/js.js:206 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr "Поставки"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "January"
 msgstr "Јануари"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "February"
 msgstr "Февруари"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "March"
 msgstr "Март"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "April"
 msgstr "Април"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "May"
 msgstr "Мај"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "June"
 msgstr "Јуни"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "July"
 msgstr "Јули"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "August"
 msgstr "Август"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "September"
 msgstr "Септември"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "October"
 msgstr "Октомври"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "November"
 msgstr "Ноември"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "December"
 msgstr "Декември"
 
@@ -116,7 +112,7 @@ msgstr "Грешка"
 msgid "ownCloud password reset"
 msgstr "ресетирање на лозинка за ownCloud"
 
-#: lostpassword/templates/email.php:1
+#: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr "Користете ја следната врска да ја ресетирате Вашата лозинка: {link}"
 
diff --git a/l10n/mk/files.po b/l10n/mk/files.po
index 2ddfad5b8c..7b01b54341 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-09-05 02:01+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-06 02:01+0200\n"
+"PO-Revision-Date: 2012-09-06 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"
@@ -58,31 +58,35 @@ msgstr "Датотеки"
 msgid "Delete"
 msgstr "Избриши"
 
-#: js/filelist.js:141
+#: js/filelist.js:186 js/filelist.js:188
 msgid "already exists"
 msgstr ""
 
-#: js/filelist.js:141
+#: js/filelist.js:186 js/filelist.js:188
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:141
+#: js/filelist.js:186
+msgid "suggest name"
+msgstr ""
+
+#: js/filelist.js:186 js/filelist.js:188
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:195
+#: js/filelist.js:235 js/filelist.js:237
 msgid "replaced"
 msgstr ""
 
-#: js/filelist.js:195
-msgid "with"
-msgstr ""
-
-#: js/filelist.js:195 js/filelist.js:246
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:246
+#: js/filelist.js:237
+msgid "with"
+msgstr ""
+
+#: js/filelist.js:271
 msgid "deleted"
 msgstr ""
 
@@ -98,44 +102,44 @@ msgstr "Не може да се преземе вашата датотека б
 msgid "Upload Error"
 msgstr "Грешка при преземање"
 
-#: js/files.js:236 js/files.js:327 js/files.js:356
+#: js/files.js:236 js/files.js:341 js/files.js:370
 msgid "Pending"
 msgstr "Чека"
 
-#: js/files.js:341
+#: js/files.js:355
 msgid "Upload cancelled."
 msgstr "Преземањето е прекинато."
 
-#: js/files.js:409
+#: js/files.js:423
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:480
+#: js/files.js:493
 msgid "Invalid name, '/' is not allowed."
 msgstr "неисправно име, '/' не е дозволено."
 
-#: js/files.js:726 templates/index.php:55
+#: js/files.js:746 templates/index.php:55
 msgid "Size"
 msgstr "Големина"
 
-#: js/files.js:727 templates/index.php:56
+#: js/files.js:747 templates/index.php:56
 msgid "Modified"
 msgstr "Променето"
 
-#: js/files.js:754
+#: js/files.js:774
 msgid "folder"
 msgstr "фолдер"
 
-#: js/files.js:756
+#: js/files.js:776
 msgid "folders"
 msgstr "фолдери"
 
-#: js/files.js:764
+#: js/files.js:784
 msgid "file"
 msgstr "датотека"
 
-#: js/files.js:766
+#: js/files.js:786
 msgid "files"
 msgstr "датотеки"
 
diff --git a/l10n/ms_MY/core.po b/l10n/ms_MY/core.po
index 76453523a6..9902f55e84 100644
--- a/l10n/ms_MY/core.po
+++ b/l10n/ms_MY/core.po
@@ -10,15 +10,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-06 02:02+0200\n"
+"PO-Revision-Date: 2012-09-06 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"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ms_MY\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ajax/vcategories/add.php:23 ajax/vcategories/delete.php:23
 msgid "Application name not provided."
@@ -32,59 +32,55 @@ msgstr "Tiada kategori untuk di tambah?"
 msgid "This category already exists: "
 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:206 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr "Tetapan"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "January"
 msgstr "Januari"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "February"
 msgstr "Februari"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "March"
 msgstr "Mac"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "April"
 msgstr "April"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "May"
 msgstr "Mei"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "June"
 msgstr "Jun"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "July"
 msgstr "Julai"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "August"
 msgstr "Ogos"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "September"
 msgstr "September"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "October"
 msgstr "Oktober"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "November"
 msgstr "November"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "December"
 msgstr "Disember"
 
@@ -116,7 +112,7 @@ msgstr "Ralat"
 msgid "ownCloud password reset"
 msgstr "Set semula kata lalaun ownCloud"
 
-#: lostpassword/templates/email.php:1
+#: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr "Guna pautan berikut untuk menetapkan semula kata laluan anda: {link}"
 
diff --git a/l10n/ms_MY/files.po b/l10n/ms_MY/files.po
index 9ba3bb1e22..8c80a09dc7 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-09-05 02:01+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-06 02:01+0200\n"
+"PO-Revision-Date: 2012-09-06 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"
@@ -59,31 +59,35 @@ msgstr "fail"
 msgid "Delete"
 msgstr "Padam"
 
-#: js/filelist.js:141
+#: js/filelist.js:186 js/filelist.js:188
 msgid "already exists"
 msgstr "Sudah wujud"
 
-#: js/filelist.js:141
+#: js/filelist.js:186 js/filelist.js:188
 msgid "replace"
 msgstr "ganti"
 
-#: js/filelist.js:141
+#: js/filelist.js:186
+msgid "suggest name"
+msgstr ""
+
+#: js/filelist.js:186 js/filelist.js:188
 msgid "cancel"
 msgstr "Batal"
 
-#: js/filelist.js:195
+#: js/filelist.js:235 js/filelist.js:237
 msgid "replaced"
 msgstr "diganti"
 
-#: js/filelist.js:195
-msgid "with"
-msgstr "dengan"
-
-#: js/filelist.js:195 js/filelist.js:246
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:246
+#: js/filelist.js:237
+msgid "with"
+msgstr "dengan"
+
+#: js/filelist.js:271
 msgid "deleted"
 msgstr "dihapus"
 
@@ -99,44 +103,44 @@ msgstr "Tidak boleh memuatnaik fail anda kerana mungkin ianya direktori atau sai
 msgid "Upload Error"
 msgstr "Muat naik ralat"
 
-#: js/files.js:236 js/files.js:327 js/files.js:356
+#: js/files.js:236 js/files.js:341 js/files.js:370
 msgid "Pending"
 msgstr "Dalam proses"
 
-#: js/files.js:341
+#: js/files.js:355
 msgid "Upload cancelled."
 msgstr "Muatnaik dibatalkan."
 
-#: js/files.js:409
+#: js/files.js:423
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:480
+#: js/files.js:493
 msgid "Invalid name, '/' is not allowed."
 msgstr "penggunaa nama tidak sah, '/' tidak dibenarkan."
 
-#: js/files.js:726 templates/index.php:55
+#: js/files.js:746 templates/index.php:55
 msgid "Size"
 msgstr "Saiz"
 
-#: js/files.js:727 templates/index.php:56
+#: js/files.js:747 templates/index.php:56
 msgid "Modified"
 msgstr "Dimodifikasi"
 
-#: js/files.js:754
+#: js/files.js:774
 msgid "folder"
 msgstr "direktori"
 
-#: js/files.js:756
+#: js/files.js:776
 msgid "folders"
 msgstr "direktori"
 
-#: js/files.js:764
+#: js/files.js:784
 msgid "file"
 msgstr "fail"
 
-#: js/files.js:766
+#: js/files.js:786
 msgid "files"
 msgstr "fail"
 
diff --git a/l10n/nb_NO/core.po b/l10n/nb_NO/core.po
index 7f1fc5fdb4..edb38d95e5 100644
--- a/l10n/nb_NO/core.po
+++ b/l10n/nb_NO/core.po
@@ -12,15 +12,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-06 02:02+0200\n"
+"PO-Revision-Date: 2012-09-06 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"
 "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"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ajax/vcategories/add.php:23 ajax/vcategories/delete.php:23
 msgid "Application name not provided."
@@ -34,59 +34,55 @@ msgstr "Ingen kategorier å legge til?"
 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 "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
-
-#: js/js.js:206 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr "Innstillinger"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "January"
 msgstr "Januar"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "February"
 msgstr "Februar"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "March"
 msgstr "Mars"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "April"
 msgstr "April"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "May"
 msgstr "Mai"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "June"
 msgstr "Juni"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "July"
 msgstr "Juli"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "August"
 msgstr "August"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "September"
 msgstr "September"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "October"
 msgstr "Oktober"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "November"
 msgstr "November"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "December"
 msgstr "Desember"
 
@@ -118,7 +114,7 @@ msgstr "Feil"
 msgid "ownCloud password reset"
 msgstr "Tilbakestill ownCloud passord"
 
-#: lostpassword/templates/email.php:1
+#: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr "Bruk følgende lenke for å tilbakestille passordet ditt: {link}"
 
diff --git a/l10n/nb_NO/files.po b/l10n/nb_NO/files.po
index a65a66c964..c39e87c982 100644
--- a/l10n/nb_NO/files.po
+++ b/l10n/nb_NO/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-09-05 02:01+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-06 02:01+0200\n"
+"PO-Revision-Date: 2012-09-06 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"
@@ -60,31 +60,35 @@ msgstr "Filer"
 msgid "Delete"
 msgstr "Slett"
 
-#: js/filelist.js:141
+#: js/filelist.js:186 js/filelist.js:188
 msgid "already exists"
 msgstr "eksisterer allerede"
 
-#: js/filelist.js:141
+#: js/filelist.js:186 js/filelist.js:188
 msgid "replace"
 msgstr "erstatt"
 
-#: js/filelist.js:141
+#: js/filelist.js:186
+msgid "suggest name"
+msgstr ""
+
+#: js/filelist.js:186 js/filelist.js:188
 msgid "cancel"
 msgstr "avbryt"
 
-#: js/filelist.js:195
+#: js/filelist.js:235 js/filelist.js:237
 msgid "replaced"
 msgstr "erstattet"
 
-#: js/filelist.js:195
-msgid "with"
-msgstr "med"
-
-#: js/filelist.js:195 js/filelist.js:246
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
 msgid "undo"
 msgstr "angre"
 
-#: js/filelist.js:246
+#: js/filelist.js:237
+msgid "with"
+msgstr "med"
+
+#: js/filelist.js:271
 msgid "deleted"
 msgstr "slettet"
 
@@ -100,44 +104,44 @@ msgstr "Kan ikke laste opp filen din siden det er en mappe eller den har 0 bytes
 msgid "Upload Error"
 msgstr "Opplasting feilet"
 
-#: js/files.js:236 js/files.js:327 js/files.js:356
+#: js/files.js:236 js/files.js:341 js/files.js:370
 msgid "Pending"
 msgstr "Ventende"
 
-#: js/files.js:341
+#: js/files.js:355
 msgid "Upload cancelled."
 msgstr "Opplasting avbrutt."
 
-#: js/files.js:409
+#: js/files.js:423
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:480
+#: js/files.js:493
 msgid "Invalid name, '/' is not allowed."
 msgstr "Ugyldig navn, '/' er ikke tillatt. "
 
-#: js/files.js:726 templates/index.php:55
+#: js/files.js:746 templates/index.php:55
 msgid "Size"
 msgstr "Størrelse"
 
-#: js/files.js:727 templates/index.php:56
+#: js/files.js:747 templates/index.php:56
 msgid "Modified"
 msgstr "Endret"
 
-#: js/files.js:754
+#: js/files.js:774
 msgid "folder"
 msgstr "mappe"
 
-#: js/files.js:756
+#: js/files.js:776
 msgid "folders"
 msgstr "mapper"
 
-#: js/files.js:764
+#: js/files.js:784
 msgid "file"
 msgstr "fil"
 
-#: js/files.js:766
+#: js/files.js:786
 msgid "files"
 msgstr "filer"
 
diff --git a/l10n/nl/core.po b/l10n/nl/core.po
index 2a40cf0571..03a847800e 100644
--- a/l10n/nl/core.po
+++ b/l10n/nl/core.po
@@ -4,6 +4,7 @@
 # 
 # Translators:
 #   <bart.formosus@gmail.com>, 2011.
+#   <didi.debian@cknow.org>, 2012.
 # Erik Bent <hj.bent.60@gmail.com>, 2012.
 #   <icewind1991@gmail.com>, 2011.
 #   <jos@gelauff.net>, 2012.
@@ -14,15 +15,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-02 02:01+0200\n"
-"PO-Revision-Date: 2012-09-01 20:13+0000\n"
-"Last-Translator: Richard Bos <radoeka@gmail.com>\n"
+"POT-Creation-Date: 2012-09-06 02:02+0200\n"
+"PO-Revision-Date: 2012-09-06 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"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: nl\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ajax/vcategories/add.php:23 ajax/vcategories/delete.php:23
 msgid "Application name not provided."
@@ -36,59 +37,55 @@ 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:206 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr "Instellingen"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "January"
 msgstr "Januari"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "February"
 msgstr "Februari"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "March"
 msgstr "Maart"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "April"
 msgstr "April"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "May"
 msgstr "Mei"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "June"
 msgstr "Juni"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "July"
 msgstr "Juli"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "August"
 msgstr "Augustus"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "September"
 msgstr "September"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "October"
 msgstr "Oktober"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "November"
 msgstr "November"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "December"
 msgstr "December"
 
@@ -120,7 +117,7 @@ msgstr "Fout"
 msgid "ownCloud password reset"
 msgstr "ownCloud wachtwoord herstellen"
 
-#: lostpassword/templates/email.php:1
+#: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr "Gebruik de volgende link om je wachtwoord te resetten: {link}"
 
@@ -147,7 +144,7 @@ msgstr "Resetaanvraag"
 
 #: lostpassword/templates/resetpassword.php:4
 msgid "Your password was reset"
-msgstr "Je wachtwoord is geweizigd"
+msgstr "Je wachtwoord is gewijzigd"
 
 #: lostpassword/templates/resetpassword.php:5
 msgid "To login page"
diff --git a/l10n/nl/files.po b/l10n/nl/files.po
index 96f7a87e84..b710bae7f6 100644
--- a/l10n/nl/files.po
+++ b/l10n/nl/files.po
@@ -5,6 +5,7 @@
 # Translators:
 #   <bart.formosus@gmail.com>, 2011.
 #   <bartv@thisnet.nl>, 2011.
+#   <didi.debian@cknow.org>, 2012.
 # Erik Bent <hj.bent.60@gmail.com>, 2012.
 #   <icewind1991@gmail.com>, 2011.
 #   <jos@gelauff.net>, 2012.
@@ -15,8 +16,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-05 02:01+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-06 02:01+0200\n"
+"PO-Revision-Date: 2012-09-06 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"
@@ -63,31 +64,35 @@ msgstr "Bestanden"
 msgid "Delete"
 msgstr "Verwijder"
 
-#: js/filelist.js:141
+#: js/filelist.js:186 js/filelist.js:188
 msgid "already exists"
 msgstr "bestaat al"
 
-#: js/filelist.js:141
+#: js/filelist.js:186 js/filelist.js:188
 msgid "replace"
 msgstr "vervang"
 
-#: js/filelist.js:141
+#: js/filelist.js:186
+msgid "suggest name"
+msgstr ""
+
+#: js/filelist.js:186 js/filelist.js:188
 msgid "cancel"
 msgstr "annuleren"
 
-#: js/filelist.js:195
+#: js/filelist.js:235 js/filelist.js:237
 msgid "replaced"
 msgstr "vervangen"
 
-#: js/filelist.js:195
-msgid "with"
-msgstr "door"
-
-#: js/filelist.js:195 js/filelist.js:246
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
 msgid "undo"
 msgstr "ongedaan maken"
 
-#: js/filelist.js:246
+#: js/filelist.js:237
+msgid "with"
+msgstr "door"
+
+#: js/filelist.js:271
 msgid "deleted"
 msgstr "verwijderd"
 
@@ -103,44 +108,44 @@ msgstr "uploaden van de file mislukt, het is of een directory of de bestandsgroo
 msgid "Upload Error"
 msgstr "Upload Fout"
 
-#: js/files.js:236 js/files.js:327 js/files.js:356
+#: js/files.js:236 js/files.js:341 js/files.js:370
 msgid "Pending"
 msgstr "Wachten"
 
-#: js/files.js:341
+#: js/files.js:355
 msgid "Upload cancelled."
 msgstr "Uploaden geannuleerd."
 
-#: js/files.js:409
+#: js/files.js:423
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
-msgstr ""
+msgstr "Bestands upload is bezig. Wanneer de pagina nu verlaten wordt, stopt de upload."
 
-#: js/files.js:480
+#: js/files.js:493
 msgid "Invalid name, '/' is not allowed."
 msgstr "Ongeldige naam, '/' is niet toegestaan."
 
-#: js/files.js:726 templates/index.php:55
+#: js/files.js:746 templates/index.php:55
 msgid "Size"
 msgstr "Bestandsgrootte"
 
-#: js/files.js:727 templates/index.php:56
+#: js/files.js:747 templates/index.php:56
 msgid "Modified"
 msgstr "Laatst aangepast"
 
-#: js/files.js:754
+#: js/files.js:774
 msgid "folder"
 msgstr "map"
 
-#: js/files.js:756
+#: js/files.js:776
 msgid "folders"
 msgstr "mappen"
 
-#: js/files.js:764
+#: js/files.js:784
 msgid "file"
 msgstr "bestand"
 
-#: js/files.js:766
+#: js/files.js:786
 msgid "files"
 msgstr "bestanden"
 
@@ -174,7 +179,7 @@ msgstr "Maximale grootte voor ZIP bestanden"
 
 #: templates/admin.php:14
 msgid "Save"
-msgstr ""
+msgstr "Opslaan"
 
 #: templates/index.php:7
 msgid "New"
diff --git a/l10n/nl/files_sharing.po b/l10n/nl/files_sharing.po
index 48b5c0641a..7027b58719 100644
--- a/l10n/nl/files_sharing.po
+++ b/l10n/nl/files_sharing.po
@@ -3,28 +3,29 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <didi.debian@cknow.org>, 2012.
 # Richard Bos <radoeka@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 13:35+0200\n"
-"PO-Revision-Date: 2012-09-01 08:29+0000\n"
-"Last-Translator: Richard Bos <radoeka@gmail.com>\n"
+"POT-Creation-Date: 2012-09-06 02:01+0200\n"
+"PO-Revision-Date: 2012-09-05 11:13+0000\n"
+"Last-Translator: diederikdehaas <didi.debian@cknow.org>\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"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/authenticate.php:4
 msgid "Password"
-msgstr "Passeerwoord"
+msgstr "Wachtwoord"
 
 #: templates/authenticate.php:6
 msgid "Submit"
-msgstr ""
+msgstr "Verzenden"
 
 #: templates/public.php:9 templates/public.php:19
 msgid "Download"
@@ -34,6 +35,6 @@ msgstr "Downloaden"
 msgid "No preview available for"
 msgstr "Geen voorbeeldweergave beschikbaar voor"
 
-#: templates/public.php:23
+#: templates/public.php:25
 msgid "web services under your control"
 msgstr "Webdiensten in eigen beheer"
diff --git a/l10n/nl/settings.po b/l10n/nl/settings.po
index 3c52376d35..207f04819e 100644
--- a/l10n/nl/settings.po
+++ b/l10n/nl/settings.po
@@ -4,6 +4,7 @@
 # 
 # Translators:
 #   <bart.formosus@gmail.com>, 2011.
+#   <didi.debian@cknow.org>, 2012.
 # Erik Bent <hj.bent.60@gmail.com>, 2012.
 #   <icewind1991@gmail.com>, 2011, 2012.
 #   <jos@gelauff.net>, 2012.
@@ -14,9 +15,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-05 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-06 02:02+0200\n"
+"PO-Revision-Date: 2012-09-05 11:28+0000\n"
+"Last-Translator: diederikdehaas <didi.debian@cknow.org>\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"
@@ -35,11 +36,11 @@ msgstr "Authenticatie fout"
 
 #: ajax/creategroup.php:19
 msgid "Group already exists"
-msgstr ""
+msgstr "Groep bestaat al"
 
 #: ajax/creategroup.php:28
 msgid "Unable to add group"
-msgstr ""
+msgstr "Niet in staat om groep toe te voegen"
 
 #: ajax/lostpassword.php:14
 msgid "Email saved"
@@ -59,11 +60,11 @@ msgstr "Ongeldig verzoek"
 
 #: ajax/removegroup.php:16
 msgid "Unable to delete group"
-msgstr ""
+msgstr "Niet in staat om groep te verwijderen"
 
 #: ajax/removeuser.php:22
 msgid "Unable to delete user"
-msgstr ""
+msgstr "Niet in staat om gebruiker te verwijderen"
 
 #: ajax/setlanguage.php:18
 msgid "Language changed"
@@ -72,12 +73,12 @@ msgstr "Taal aangepast"
 #: ajax/togglegroups.php:25
 #, php-format
 msgid "Unable to add user to group %s"
-msgstr ""
+msgstr "Niet in staat om gebruiker toe te voegen aan groep %s"
 
 #: ajax/togglegroups.php:31
 #, php-format
 msgid "Unable to remove user from group %s"
-msgstr ""
+msgstr "Niet in staat om gebruiker te verwijderen uit groep %s"
 
 #: js/apps.js:18
 msgid "Error"
@@ -180,7 +181,7 @@ msgid ""
 "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>."
-msgstr ""
+msgstr "Ontwikkeld door de <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud gemeenschap</a>, de <a href=\"https://github.com/owncloud\" target=\"_blank\">bron code</a> is gelicenseerd onder de <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
 
 #: templates/apps.php:10
 msgid "Add your App"
@@ -196,7 +197,7 @@ msgstr "Zie de applicatiepagina op apps.owncloud.com"
 
 #: templates/apps.php:30
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
-msgstr ""
+msgstr "<span class=\"licence\"></span>-Gelicenseerd door <span class=\"author\"></span>"
 
 #: templates/help.php:9
 msgid "Documentation"
diff --git a/l10n/nn_NO/core.po b/l10n/nn_NO/core.po
index aa0a9a4c8b..ea34767b84 100644
--- a/l10n/nn_NO/core.po
+++ b/l10n/nn_NO/core.po
@@ -9,15 +9,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-06 02:02+0200\n"
+"PO-Revision-Date: 2012-09-06 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"
 "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"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ajax/vcategories/add.php:23 ajax/vcategories/delete.php:23
 msgid "Application name not provided."
@@ -31,59 +31,55 @@ 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:206 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr "Innstillingar"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "January"
 msgstr ""
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "February"
 msgstr ""
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "March"
 msgstr ""
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "April"
 msgstr ""
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "May"
 msgstr ""
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "June"
 msgstr ""
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "July"
 msgstr ""
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "August"
 msgstr ""
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "September"
 msgstr ""
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "October"
 msgstr ""
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "November"
 msgstr ""
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "December"
 msgstr ""
 
@@ -115,7 +111,7 @@ msgstr ""
 msgid "ownCloud password reset"
 msgstr ""
 
-#: lostpassword/templates/email.php:1
+#: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr "Bruk føljane link til å tilbakestille passordet ditt: {link}"
 
diff --git a/l10n/nn_NO/files.po b/l10n/nn_NO/files.po
index 9bf43656e8..fc058e3f3e 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-09-05 02:01+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-06 02:01+0200\n"
+"PO-Revision-Date: 2012-09-06 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"
@@ -57,31 +57,35 @@ msgstr "Filer"
 msgid "Delete"
 msgstr "Slett"
 
-#: js/filelist.js:141
+#: js/filelist.js:186 js/filelist.js:188
 msgid "already exists"
 msgstr ""
 
-#: js/filelist.js:141
+#: js/filelist.js:186 js/filelist.js:188
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:141
+#: js/filelist.js:186
+msgid "suggest name"
+msgstr ""
+
+#: js/filelist.js:186 js/filelist.js:188
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:195
+#: js/filelist.js:235 js/filelist.js:237
 msgid "replaced"
 msgstr ""
 
-#: js/filelist.js:195
-msgid "with"
-msgstr ""
-
-#: js/filelist.js:195 js/filelist.js:246
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:246
+#: js/filelist.js:237
+msgid "with"
+msgstr ""
+
+#: js/filelist.js:271
 msgid "deleted"
 msgstr ""
 
@@ -97,44 +101,44 @@ msgstr ""
 msgid "Upload Error"
 msgstr ""
 
-#: js/files.js:236 js/files.js:327 js/files.js:356
+#: js/files.js:236 js/files.js:341 js/files.js:370
 msgid "Pending"
 msgstr ""
 
-#: js/files.js:341
+#: js/files.js:355
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:409
+#: js/files.js:423
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:480
+#: js/files.js:493
 msgid "Invalid name, '/' is not allowed."
 msgstr ""
 
-#: js/files.js:726 templates/index.php:55
+#: js/files.js:746 templates/index.php:55
 msgid "Size"
 msgstr "Storleik"
 
-#: js/files.js:727 templates/index.php:56
+#: js/files.js:747 templates/index.php:56
 msgid "Modified"
 msgstr "Endra"
 
-#: js/files.js:754
+#: js/files.js:774
 msgid "folder"
 msgstr ""
 
-#: js/files.js:756
+#: js/files.js:776
 msgid "folders"
 msgstr ""
 
-#: js/files.js:764
+#: js/files.js:784
 msgid "file"
 msgstr ""
 
-#: js/files.js:766
+#: js/files.js:786
 msgid "files"
 msgstr ""
 
diff --git a/l10n/pl/core.po b/l10n/pl/core.po
index 3889b13622..0cd447bf8e 100644
--- a/l10n/pl/core.po
+++ b/l10n/pl/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-09-04 02:01+0200\n"
-"PO-Revision-Date: 2012-09-03 06:40+0000\n"
-"Last-Translator: Cyryl Sochacki <>\n"
+"POT-Creation-Date: 2012-09-06 02:02+0200\n"
+"PO-Revision-Date: 2012-09-06 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"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -35,59 +35,55 @@ msgstr "Brak kategorii"
 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 "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
-
-#: js/js.js:206 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr "Ustawienia"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "January"
 msgstr "Styczeń"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "February"
 msgstr "Luty"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "March"
 msgstr "Marzec"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "April"
 msgstr "Kwiecień"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "May"
 msgstr "Maj"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "June"
 msgstr "Czerwiec"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "July"
 msgstr "Lipiec"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "August"
 msgstr "Sierpień"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "September"
 msgstr "Wrzesień"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "October"
 msgstr "Październik"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "November"
 msgstr "Listopad"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "December"
 msgstr "Grudzień"
 
@@ -119,7 +115,7 @@ msgstr "Błąd"
 msgid "ownCloud password reset"
 msgstr "restart hasła"
 
-#: lostpassword/templates/email.php:1
+#: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr "Proszę użyć tego odnośnika do zresetowania hasła: {link}"
 
diff --git a/l10n/pl/files.po b/l10n/pl/files.po
index cce7204605..2512f6db59 100644
--- a/l10n/pl/files.po
+++ b/l10n/pl/files.po
@@ -6,13 +6,14 @@
 # Cyryl Sochacki <>, 2012.
 # Marcin Małecki <gerber@tkdami.net>, 2011, 2012.
 #   <mosslar@gmail.com>, 2011.
+#   <mplichta@gmail.com>, 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-09-05 02:01+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-06 02:01+0200\n"
+"PO-Revision-Date: 2012-09-06 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"
@@ -59,31 +60,35 @@ msgstr "Pliki"
 msgid "Delete"
 msgstr "Usuwa element"
 
-#: js/filelist.js:141
+#: js/filelist.js:186 js/filelist.js:188
 msgid "already exists"
 msgstr "Już istnieje"
 
-#: js/filelist.js:141
+#: js/filelist.js:186 js/filelist.js:188
 msgid "replace"
 msgstr "zastap"
 
-#: js/filelist.js:141
+#: js/filelist.js:186
+msgid "suggest name"
+msgstr ""
+
+#: js/filelist.js:186 js/filelist.js:188
 msgid "cancel"
 msgstr "anuluj"
 
-#: js/filelist.js:195
+#: js/filelist.js:235 js/filelist.js:237
 msgid "replaced"
 msgstr "zastąpione"
 
-#: js/filelist.js:195
-msgid "with"
-msgstr "z"
-
-#: js/filelist.js:195 js/filelist.js:246
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
 msgid "undo"
 msgstr "wróć"
 
-#: js/filelist.js:246
+#: js/filelist.js:237
+msgid "with"
+msgstr "z"
+
+#: js/filelist.js:271
 msgid "deleted"
 msgstr "skasuj"
 
@@ -99,44 +104,44 @@ msgstr "Nie można wczytać pliku jeśli jest katalogiem lub ma 0 bajtów"
 msgid "Upload Error"
 msgstr "Błąd wczytywania"
 
-#: js/files.js:236 js/files.js:327 js/files.js:356
+#: js/files.js:236 js/files.js:341 js/files.js:370
 msgid "Pending"
 msgstr "Oczekujące"
 
-#: js/files.js:341
+#: js/files.js:355
 msgid "Upload cancelled."
 msgstr "Wczytywanie anulowane."
 
-#: js/files.js:409
+#: js/files.js:423
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Wysyłanie pliku jest w toku. Teraz opuszczając stronę wysyłanie zostanie anulowane."
 
-#: js/files.js:480
+#: js/files.js:493
 msgid "Invalid name, '/' is not allowed."
 msgstr "Nieprawidłowa nazwa '/' jest niedozwolone."
 
-#: js/files.js:726 templates/index.php:55
+#: js/files.js:746 templates/index.php:55
 msgid "Size"
 msgstr "Rozmiar"
 
-#: js/files.js:727 templates/index.php:56
+#: js/files.js:747 templates/index.php:56
 msgid "Modified"
 msgstr "Czas modyfikacji"
 
-#: js/files.js:754
+#: js/files.js:774
 msgid "folder"
 msgstr "folder"
 
-#: js/files.js:756
+#: js/files.js:776
 msgid "folders"
 msgstr "foldery"
 
-#: js/files.js:764
+#: js/files.js:784
 msgid "file"
 msgstr "plik"
 
-#: js/files.js:766
+#: js/files.js:786
 msgid "files"
 msgstr "pliki"
 
@@ -170,7 +175,7 @@ msgstr "Maksymalna wielkość pliku wejściowego ZIP "
 
 #: templates/admin.php:14
 msgid "Save"
-msgstr ""
+msgstr "Zapisz"
 
 #: templates/index.php:7
 msgid "New"
diff --git a/l10n/pl/settings.po b/l10n/pl/settings.po
index d6fef0cea3..adfbe39053 100644
--- a/l10n/pl/settings.po
+++ b/l10n/pl/settings.po
@@ -9,14 +9,15 @@
 # Marcin Małecki <gerber@tkdami.net>, 2011, 2012.
 # Marcin Małecki <mosslar@gmail.com>, 2011.
 #   <mosslar@gmail.com>, 2011.
+#   <mplichta@gmail.com>, 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-09-05 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-06 02:02+0200\n"
+"PO-Revision-Date: 2012-09-05 12:06+0000\n"
+"Last-Translator: emc <mplichta@gmail.com>\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"
@@ -72,12 +73,12 @@ msgstr "Język zmieniony"
 #: ajax/togglegroups.php:25
 #, php-format
 msgid "Unable to add user to group %s"
-msgstr ""
+msgstr "Nie można dodać użytkownika do grupy %s"
 
 #: ajax/togglegroups.php:31
 #, php-format
 msgid "Unable to remove user from group %s"
-msgstr ""
+msgstr "Nie można usunąć użytkownika z grupy %s"
 
 #: js/apps.js:18
 msgid "Error"
@@ -110,7 +111,7 @@ msgid ""
 "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."
-msgstr ""
+msgstr "Twój katalog danych i pliki są prawdopodobnie dostępne z Internetu. Plik .htaccess, który dostarcza ownCloud nie działa. Sugerujemy, aby skonfigurować serwer WWW w taki sposób, aby katalog danych nie był dostępny lub przenieść katalog danych poza główny katalog serwera WWW."
 
 #: templates/admin.php:31
 msgid "Cron"
@@ -146,7 +147,7 @@ msgstr "Zezwalaj na łącza"
 
 #: templates/admin.php:52
 msgid "Allow users to share items to the public with links"
-msgstr ""
+msgstr "Zezwalaj użytkownikom na puliczne współdzielenie elementów za pomocą linków"
 
 #: templates/admin.php:56
 msgid "Allow resharing"
@@ -154,15 +155,15 @@ msgstr "Zezwól na ponowne udostępnianie"
 
 #: templates/admin.php:57
 msgid "Allow users to share items shared with them again"
-msgstr ""
+msgstr "Zezwalaj użytkownikom na ponowne współdzielenie elementów już z nimi współdzilonych"
 
 #: templates/admin.php:60
 msgid "Allow users to share with anyone"
-msgstr ""
+msgstr "Zezwalaj użytkownikom na współdzielenie z kimkolwiek"
 
 #: templates/admin.php:62
 msgid "Allow users to only share with users in their groups"
-msgstr ""
+msgstr "Zezwalaj użytkownikom współdzielić z użytkownikami ze swoich grup"
 
 #: templates/admin.php:69
 msgid "Log"
@@ -180,7 +181,7 @@ msgid ""
 "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>."
-msgstr ""
+msgstr "Stwirzone przez <a href=\"http://ownCloud.org/contact\" target=\"_blank\"> społeczność ownCloud</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">kod źródłowy</a> na licencji <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
 
 #: templates/apps.php:10
 msgid "Add your App"
@@ -196,7 +197,7 @@ msgstr "Zobacz stronę aplikacji na apps.owncloud.com"
 
 #: templates/apps.php:30
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
-msgstr ""
+msgstr "<span class=\"licence\"></span>-licencjonowane przez <span class=\"author\"></span>"
 
 #: templates/help.php:9
 msgid "Documentation"
diff --git a/l10n/pl_PL/core.po b/l10n/pl_PL/core.po
index f7b7d5a38d..55486564fd 100644
--- a/l10n/pl_PL/core.po
+++ b/l10n/pl_PL/core.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-06 02:02+0200\n"
+"PO-Revision-Date: 2012-09-06 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/owncloud/language/pl_PL/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pl_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"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: ajax/vcategories/add.php:23 ajax/vcategories/delete.php:23
 msgid "Application name not provided."
@@ -29,59 +29,55 @@ 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:206 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "January"
 msgstr ""
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "February"
 msgstr ""
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "March"
 msgstr ""
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "April"
 msgstr ""
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "May"
 msgstr ""
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "June"
 msgstr ""
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "July"
 msgstr ""
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "August"
 msgstr ""
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "September"
 msgstr ""
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "October"
 msgstr ""
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "November"
 msgstr ""
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "December"
 msgstr ""
 
@@ -113,7 +109,7 @@ msgstr ""
 msgid "ownCloud password reset"
 msgstr ""
 
-#: lostpassword/templates/email.php:1
+#: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr ""
 
diff --git a/l10n/pl_PL/files.po b/l10n/pl_PL/files.po
index c47ae7e822..227d04a1ec 100644
--- a/l10n/pl_PL/files.po
+++ b/l10n/pl_PL/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-09-05 02:01+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-06 02:01+0200\n"
+"PO-Revision-Date: 2012-09-06 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/owncloud/language/pl_PL/)\n"
 "MIME-Version: 1.0\n"
@@ -55,31 +55,35 @@ msgstr ""
 msgid "Delete"
 msgstr ""
 
-#: js/filelist.js:141
+#: js/filelist.js:186 js/filelist.js:188
 msgid "already exists"
 msgstr ""
 
-#: js/filelist.js:141
+#: js/filelist.js:186 js/filelist.js:188
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:141
+#: js/filelist.js:186
+msgid "suggest name"
+msgstr ""
+
+#: js/filelist.js:186 js/filelist.js:188
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:195
+#: js/filelist.js:235 js/filelist.js:237
 msgid "replaced"
 msgstr ""
 
-#: js/filelist.js:195
-msgid "with"
-msgstr ""
-
-#: js/filelist.js:195 js/filelist.js:246
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:246
+#: js/filelist.js:237
+msgid "with"
+msgstr ""
+
+#: js/filelist.js:271
 msgid "deleted"
 msgstr ""
 
@@ -95,44 +99,44 @@ msgstr ""
 msgid "Upload Error"
 msgstr ""
 
-#: js/files.js:236 js/files.js:327 js/files.js:356
+#: js/files.js:236 js/files.js:341 js/files.js:370
 msgid "Pending"
 msgstr ""
 
-#: js/files.js:341
+#: js/files.js:355
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:409
+#: js/files.js:423
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:480
+#: js/files.js:493
 msgid "Invalid name, '/' is not allowed."
 msgstr ""
 
-#: js/files.js:726 templates/index.php:55
+#: js/files.js:746 templates/index.php:55
 msgid "Size"
 msgstr ""
 
-#: js/files.js:727 templates/index.php:56
+#: js/files.js:747 templates/index.php:56
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:754
+#: js/files.js:774
 msgid "folder"
 msgstr ""
 
-#: js/files.js:756
+#: js/files.js:776
 msgid "folders"
 msgstr ""
 
-#: js/files.js:764
+#: js/files.js:784
 msgid "file"
 msgstr ""
 
-#: js/files.js:766
+#: js/files.js:786
 msgid "files"
 msgstr ""
 
diff --git a/l10n/pt_BR/core.po b/l10n/pt_BR/core.po
index be5dc9aeb6..6e1c9fdcd9 100644
--- a/l10n/pt_BR/core.po
+++ b/l10n/pt_BR/core.po
@@ -12,15 +12,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-06 02:02+0200\n"
+"PO-Revision-Date: 2012-09-06 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"
 "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"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
 #: ajax/vcategories/add.php:23 ajax/vcategories/delete.php:23
 msgid "Application name not provided."
@@ -34,59 +34,55 @@ 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 "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
-
-#: js/js.js:206 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr "Configurações"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "January"
 msgstr "Janeiro"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "February"
 msgstr "Fevereiro"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "March"
 msgstr "Março"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "April"
 msgstr "Abril"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "May"
 msgstr "Maio"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "June"
 msgstr "Junho"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "July"
 msgstr "Julho"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "August"
 msgstr "Agosto"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "September"
 msgstr "Setembro"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "October"
 msgstr "Outubro"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "November"
 msgstr "Novembro"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "December"
 msgstr "Dezembro"
 
@@ -118,7 +114,7 @@ msgstr "Erro"
 msgid "ownCloud password reset"
 msgstr "Redefinir senha ownCloud"
 
-#: lostpassword/templates/email.php:1
+#: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr "Use o seguinte link para redefinir sua senha: {link}"
 
diff --git a/l10n/pt_BR/files.po b/l10n/pt_BR/files.po
index 82a5a58bd6..6e29f6321b 100644
--- a/l10n/pt_BR/files.po
+++ b/l10n/pt_BR/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-09-05 02:01+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-06 02:01+0200\n"
+"PO-Revision-Date: 2012-09-06 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"
@@ -60,31 +60,35 @@ msgstr "Arquivos"
 msgid "Delete"
 msgstr "Excluir"
 
-#: js/filelist.js:141
+#: js/filelist.js:186 js/filelist.js:188
 msgid "already exists"
 msgstr "já existe"
 
-#: js/filelist.js:141
+#: js/filelist.js:186 js/filelist.js:188
 msgid "replace"
 msgstr "substituir"
 
-#: js/filelist.js:141
+#: js/filelist.js:186
+msgid "suggest name"
+msgstr ""
+
+#: js/filelist.js:186 js/filelist.js:188
 msgid "cancel"
 msgstr "cancelar"
 
-#: js/filelist.js:195
+#: js/filelist.js:235 js/filelist.js:237
 msgid "replaced"
 msgstr "substituido "
 
-#: js/filelist.js:195
-msgid "with"
-msgstr "com"
-
-#: js/filelist.js:195 js/filelist.js:246
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
 msgid "undo"
 msgstr "desfazer"
 
-#: js/filelist.js:246
+#: js/filelist.js:237
+msgid "with"
+msgstr "com"
+
+#: js/filelist.js:271
 msgid "deleted"
 msgstr "deletado"
 
@@ -100,44 +104,44 @@ msgstr "Impossível enviar seus arquivo como diretório ou ele tem 0 bytes."
 msgid "Upload Error"
 msgstr "Erro de envio"
 
-#: js/files.js:236 js/files.js:327 js/files.js:356
+#: js/files.js:236 js/files.js:341 js/files.js:370
 msgid "Pending"
 msgstr "Pendente"
 
-#: js/files.js:341
+#: js/files.js:355
 msgid "Upload cancelled."
 msgstr "Envio cancelado."
 
-#: js/files.js:409
+#: js/files.js:423
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:480
+#: js/files.js:493
 msgid "Invalid name, '/' is not allowed."
 msgstr "Nome inválido, '/' não é permitido."
 
-#: js/files.js:726 templates/index.php:55
+#: js/files.js:746 templates/index.php:55
 msgid "Size"
 msgstr "Tamanho"
 
-#: js/files.js:727 templates/index.php:56
+#: js/files.js:747 templates/index.php:56
 msgid "Modified"
 msgstr "Modificado"
 
-#: js/files.js:754
+#: js/files.js:774
 msgid "folder"
 msgstr "pasta"
 
-#: js/files.js:756
+#: js/files.js:776
 msgid "folders"
 msgstr "pastas"
 
-#: js/files.js:764
+#: js/files.js:784
 msgid "file"
 msgstr "arquivo"
 
-#: js/files.js:766
+#: js/files.js:786
 msgid "files"
 msgstr "arquivos"
 
diff --git a/l10n/pt_PT/core.po b/l10n/pt_PT/core.po
index 159432daa9..ef75d8f6bd 100644
--- a/l10n/pt_PT/core.po
+++ b/l10n/pt_PT/core.po
@@ -10,15 +10,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-06 02:02+0200\n"
+"PO-Revision-Date: 2012-09-06 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"
 "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"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ajax/vcategories/add.php:23 ajax/vcategories/delete.php:23
 msgid "Application name not provided."
@@ -32,59 +32,55 @@ msgstr "Nenhuma categoria para adicionar?"
 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 "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
-
-#: js/js.js:206 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr "Definições"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "January"
 msgstr "Janeiro"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "February"
 msgstr "Fevereiro"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "March"
 msgstr "Março"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "April"
 msgstr "Abril"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "May"
 msgstr "Maio"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "June"
 msgstr "Junho"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "July"
 msgstr "Julho"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "August"
 msgstr "Agosto"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "September"
 msgstr "Setembro"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "October"
 msgstr "Outubro"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "November"
 msgstr "Novembro"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "December"
 msgstr "Dezembro"
 
@@ -116,7 +112,7 @@ msgstr "Erro"
 msgid "ownCloud password reset"
 msgstr "Reposição da password ownCloud"
 
-#: lostpassword/templates/email.php:1
+#: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr "Use o seguinte endereço para repor a sua password: {link}"
 
diff --git a/l10n/pt_PT/files.po b/l10n/pt_PT/files.po
index 80b71ab553..c0ba21ecbc 100644
--- a/l10n/pt_PT/files.po
+++ b/l10n/pt_PT/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-09-05 02:01+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-06 02:01+0200\n"
+"PO-Revision-Date: 2012-09-06 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"
@@ -58,31 +58,35 @@ msgstr "Ficheiros"
 msgid "Delete"
 msgstr "Apagar"
 
-#: js/filelist.js:141
+#: js/filelist.js:186 js/filelist.js:188
 msgid "already exists"
 msgstr "Já existe"
 
-#: js/filelist.js:141
+#: js/filelist.js:186 js/filelist.js:188
 msgid "replace"
 msgstr "substituir"
 
-#: js/filelist.js:141
+#: js/filelist.js:186
+msgid "suggest name"
+msgstr ""
+
+#: js/filelist.js:186 js/filelist.js:188
 msgid "cancel"
 msgstr "cancelar"
 
-#: js/filelist.js:195
+#: js/filelist.js:235 js/filelist.js:237
 msgid "replaced"
 msgstr "substituido"
 
-#: js/filelist.js:195
-msgid "with"
-msgstr "com"
-
-#: js/filelist.js:195 js/filelist.js:246
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
 msgid "undo"
 msgstr "desfazer"
 
-#: js/filelist.js:246
+#: js/filelist.js:237
+msgid "with"
+msgstr "com"
+
+#: js/filelist.js:271
 msgid "deleted"
 msgstr "apagado"
 
@@ -98,44 +102,44 @@ msgstr "Não é possivel fazer o upload do ficheiro devido a ser uma pasta ou te
 msgid "Upload Error"
 msgstr "Erro no upload"
 
-#: js/files.js:236 js/files.js:327 js/files.js:356
+#: js/files.js:236 js/files.js:341 js/files.js:370
 msgid "Pending"
 msgstr "Pendente"
 
-#: js/files.js:341
+#: js/files.js:355
 msgid "Upload cancelled."
 msgstr "O upload foi cancelado."
 
-#: js/files.js:409
+#: js/files.js:423
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:480
+#: js/files.js:493
 msgid "Invalid name, '/' is not allowed."
 msgstr "nome inválido, '/' não permitido."
 
-#: js/files.js:726 templates/index.php:55
+#: js/files.js:746 templates/index.php:55
 msgid "Size"
 msgstr "Tamanho"
 
-#: js/files.js:727 templates/index.php:56
+#: js/files.js:747 templates/index.php:56
 msgid "Modified"
 msgstr "Modificado"
 
-#: js/files.js:754
+#: js/files.js:774
 msgid "folder"
 msgstr "pasta"
 
-#: js/files.js:756
+#: js/files.js:776
 msgid "folders"
 msgstr "pastas"
 
-#: js/files.js:764
+#: js/files.js:784
 msgid "file"
 msgstr "ficheiro"
 
-#: js/files.js:766
+#: js/files.js:786
 msgid "files"
 msgstr "ficheiros"
 
diff --git a/l10n/ro/core.po b/l10n/ro/core.po
index 40d7fc389f..42e779595e 100644
--- a/l10n/ro/core.po
+++ b/l10n/ro/core.po
@@ -10,15 +10,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-06 02:02+0200\n"
+"PO-Revision-Date: 2012-09-06 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"
 "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"
+"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
 
 #: ajax/vcategories/add.php:23 ajax/vcategories/delete.php:23
 msgid "Application name not provided."
@@ -32,59 +32,55 @@ msgstr "Nici o categorie de adăugat?"
 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:206 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr "Configurări"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "January"
 msgstr ""
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "February"
 msgstr ""
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "March"
 msgstr ""
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "April"
 msgstr ""
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "May"
 msgstr ""
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "June"
 msgstr ""
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "July"
 msgstr ""
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "August"
 msgstr ""
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "September"
 msgstr ""
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "October"
 msgstr ""
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "November"
 msgstr ""
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "December"
 msgstr ""
 
@@ -116,7 +112,7 @@ msgstr ""
 msgid "ownCloud password reset"
 msgstr "Resetarea parolei ownCloud "
 
-#: lostpassword/templates/email.php:1
+#: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr "Folosește următorul link pentru a reseta parola: {link}"
 
diff --git a/l10n/ro/files.po b/l10n/ro/files.po
index c9ff62753c..84051830b4 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-09-05 02:01+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-06 02:01+0200\n"
+"PO-Revision-Date: 2012-09-06 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"
@@ -58,31 +58,35 @@ msgstr "Fișiere"
 msgid "Delete"
 msgstr "Șterge"
 
-#: js/filelist.js:141
+#: js/filelist.js:186 js/filelist.js:188
 msgid "already exists"
 msgstr ""
 
-#: js/filelist.js:141
+#: js/filelist.js:186 js/filelist.js:188
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:141
+#: js/filelist.js:186
+msgid "suggest name"
+msgstr ""
+
+#: js/filelist.js:186 js/filelist.js:188
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:195
+#: js/filelist.js:235 js/filelist.js:237
 msgid "replaced"
 msgstr ""
 
-#: js/filelist.js:195
-msgid "with"
-msgstr ""
-
-#: js/filelist.js:195 js/filelist.js:246
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:246
+#: js/filelist.js:237
+msgid "with"
+msgstr ""
+
+#: js/filelist.js:271
 msgid "deleted"
 msgstr ""
 
@@ -98,44 +102,44 @@ msgstr ""
 msgid "Upload Error"
 msgstr ""
 
-#: js/files.js:236 js/files.js:327 js/files.js:356
+#: js/files.js:236 js/files.js:341 js/files.js:370
 msgid "Pending"
 msgstr ""
 
-#: js/files.js:341
+#: js/files.js:355
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:409
+#: js/files.js:423
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:480
+#: js/files.js:493
 msgid "Invalid name, '/' is not allowed."
 msgstr ""
 
-#: js/files.js:726 templates/index.php:55
+#: js/files.js:746 templates/index.php:55
 msgid "Size"
 msgstr "Dimensiune"
 
-#: js/files.js:727 templates/index.php:56
+#: js/files.js:747 templates/index.php:56
 msgid "Modified"
 msgstr "Modificat"
 
-#: js/files.js:754
+#: js/files.js:774
 msgid "folder"
 msgstr ""
 
-#: js/files.js:756
+#: js/files.js:776
 msgid "folders"
 msgstr ""
 
-#: js/files.js:764
+#: js/files.js:784
 msgid "file"
 msgstr ""
 
-#: js/files.js:766
+#: js/files.js:786
 msgid "files"
 msgstr ""
 
diff --git a/l10n/ru/core.po b/l10n/ru/core.po
index cd7648d5b9..fa6451a38b 100644
--- a/l10n/ru/core.po
+++ b/l10n/ru/core.po
@@ -11,15 +11,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-06 02:02+0200\n"
+"PO-Revision-Date: 2012-09-06 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"
 "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"
+"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/vcategories/add.php:23 ajax/vcategories/delete.php:23
 msgid "Application name not provided."
@@ -33,59 +33,55 @@ 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 "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
-
-#: js/js.js:206 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr "Настройки"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "January"
 msgstr "Январь"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "February"
 msgstr "Февраль"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "March"
 msgstr "Март"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "April"
 msgstr "Апрель"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "May"
 msgstr "Май"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "June"
 msgstr "Июнь"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "July"
 msgstr "Июль"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "August"
 msgstr "Август"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "September"
 msgstr "Сентябрь"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "October"
 msgstr "Октябрь"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "November"
 msgstr "Ноябрь"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "December"
 msgstr "Декабрь"
 
@@ -117,7 +113,7 @@ msgstr "Ошибка"
 msgid "ownCloud password reset"
 msgstr "Сброс пароля "
 
-#: lostpassword/templates/email.php:1
+#: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr "Используйте следующую ссылку чтобы сбросить пароль: {link}"
 
diff --git a/l10n/ru/files.po b/l10n/ru/files.po
index e558e9777a..250d6badf4 100644
--- a/l10n/ru/files.po
+++ b/l10n/ru/files.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-09-05 02:01+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-06 02:01+0200\n"
+"PO-Revision-Date: 2012-09-06 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"
@@ -61,31 +61,35 @@ msgstr "Файлы"
 msgid "Delete"
 msgstr "Удалить"
 
-#: js/filelist.js:141
+#: js/filelist.js:186 js/filelist.js:188
 msgid "already exists"
 msgstr "уже существует"
 
-#: js/filelist.js:141
+#: js/filelist.js:186 js/filelist.js:188
 msgid "replace"
 msgstr "заменить"
 
-#: js/filelist.js:141
+#: js/filelist.js:186
+msgid "suggest name"
+msgstr ""
+
+#: js/filelist.js:186 js/filelist.js:188
 msgid "cancel"
 msgstr "отмена"
 
-#: js/filelist.js:195
+#: js/filelist.js:235 js/filelist.js:237
 msgid "replaced"
 msgstr "заменён"
 
-#: js/filelist.js:195
-msgid "with"
-msgstr "с"
-
-#: js/filelist.js:195 js/filelist.js:246
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
 msgid "undo"
 msgstr "отмена"
 
-#: js/filelist.js:246
+#: js/filelist.js:237
+msgid "with"
+msgstr "с"
+
+#: js/filelist.js:271
 msgid "deleted"
 msgstr "удален"
 
@@ -101,44 +105,44 @@ msgstr "Не удается загрузить файл размером 0 ба
 msgid "Upload Error"
 msgstr "Ошибка загрузки"
 
-#: js/files.js:236 js/files.js:327 js/files.js:356
+#: js/files.js:236 js/files.js:341 js/files.js:370
 msgid "Pending"
 msgstr "Ожидание"
 
-#: js/files.js:341
+#: js/files.js:355
 msgid "Upload cancelled."
 msgstr "Загрузка отменена."
 
-#: js/files.js:409
+#: js/files.js:423
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Файл в процессе загрузки. Покинув страницу вы прервёте загрузку."
 
-#: js/files.js:480
+#: js/files.js:493
 msgid "Invalid name, '/' is not allowed."
 msgstr "Неверное имя, '/' не допускается."
 
-#: js/files.js:726 templates/index.php:55
+#: js/files.js:746 templates/index.php:55
 msgid "Size"
 msgstr "Размер"
 
-#: js/files.js:727 templates/index.php:56
+#: js/files.js:747 templates/index.php:56
 msgid "Modified"
 msgstr "Изменён"
 
-#: js/files.js:754
+#: js/files.js:774
 msgid "folder"
 msgstr "папка"
 
-#: js/files.js:756
+#: js/files.js:776
 msgid "folders"
 msgstr "папки"
 
-#: js/files.js:764
+#: js/files.js:784
 msgid "file"
 msgstr "файл"
 
-#: js/files.js:766
+#: js/files.js:786
 msgid "files"
 msgstr "файлы"
 
diff --git a/l10n/ru_RU/core.po b/l10n/ru_RU/core.po
index 61648a74b2..6c4aeee5d5 100644
--- a/l10n/ru_RU/core.po
+++ b/l10n/ru_RU/core.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-06 02:02+0200\n"
+"PO-Revision-Date: 2012-09-06 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: ru_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"
+"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/vcategories/add.php:23 ajax/vcategories/delete.php:23
 msgid "Application name not provided."
@@ -29,59 +29,55 @@ 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:206 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "January"
 msgstr ""
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "February"
 msgstr ""
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "March"
 msgstr ""
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "April"
 msgstr ""
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "May"
 msgstr ""
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "June"
 msgstr ""
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "July"
 msgstr ""
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "August"
 msgstr ""
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "September"
 msgstr ""
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "October"
 msgstr ""
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "November"
 msgstr ""
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "December"
 msgstr ""
 
@@ -113,7 +109,7 @@ msgstr ""
 msgid "ownCloud password reset"
 msgstr ""
 
-#: lostpassword/templates/email.php:1
+#: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr ""
 
diff --git a/l10n/ru_RU/files.po b/l10n/ru_RU/files.po
index 2ea2165835..3d22b6c936 100644
--- a/l10n/ru_RU/files.po
+++ b/l10n/ru_RU/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-09-05 02:01+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-06 02:01+0200\n"
+"PO-Revision-Date: 2012-09-06 00:03+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n"
 "MIME-Version: 1.0\n"
@@ -55,31 +55,35 @@ msgstr ""
 msgid "Delete"
 msgstr ""
 
-#: js/filelist.js:141
+#: js/filelist.js:186 js/filelist.js:188
 msgid "already exists"
 msgstr ""
 
-#: js/filelist.js:141
+#: js/filelist.js:186 js/filelist.js:188
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:141
+#: js/filelist.js:186
+msgid "suggest name"
+msgstr ""
+
+#: js/filelist.js:186 js/filelist.js:188
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:195
+#: js/filelist.js:235 js/filelist.js:237
 msgid "replaced"
 msgstr ""
 
-#: js/filelist.js:195
-msgid "with"
-msgstr ""
-
-#: js/filelist.js:195 js/filelist.js:246
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:246
+#: js/filelist.js:237
+msgid "with"
+msgstr ""
+
+#: js/filelist.js:271
 msgid "deleted"
 msgstr ""
 
@@ -95,44 +99,44 @@ msgstr ""
 msgid "Upload Error"
 msgstr ""
 
-#: js/files.js:236 js/files.js:327 js/files.js:356
+#: js/files.js:236 js/files.js:341 js/files.js:370
 msgid "Pending"
 msgstr ""
 
-#: js/files.js:341
+#: js/files.js:355
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:409
+#: js/files.js:423
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:480
+#: js/files.js:493
 msgid "Invalid name, '/' is not allowed."
 msgstr ""
 
-#: js/files.js:726 templates/index.php:55
+#: js/files.js:746 templates/index.php:55
 msgid "Size"
 msgstr ""
 
-#: js/files.js:727 templates/index.php:56
+#: js/files.js:747 templates/index.php:56
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:754
+#: js/files.js:774
 msgid "folder"
 msgstr ""
 
-#: js/files.js:756
+#: js/files.js:776
 msgid "folders"
 msgstr ""
 
-#: js/files.js:764
+#: js/files.js:784
 msgid "file"
 msgstr ""
 
-#: js/files.js:766
+#: js/files.js:786
 msgid "files"
 msgstr ""
 
diff --git a/l10n/sk_SK/core.po b/l10n/sk_SK/core.po
index e0a133b9ed..bcdf41a7d2 100644
--- a/l10n/sk_SK/core.po
+++ b/l10n/sk_SK/core.po
@@ -9,15 +9,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-06 02:02+0200\n"
+"PO-Revision-Date: 2012-09-06 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"
 "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"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #: ajax/vcategories/add.php:23 ajax/vcategories/delete.php:23
 msgid "Application name not provided."
@@ -31,59 +31,55 @@ 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 "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
-
-#: js/js.js:206 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr "Nastavenia"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "January"
 msgstr "Január"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "February"
 msgstr "Február"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "March"
 msgstr "Marec"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "April"
 msgstr "Apríl"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "May"
 msgstr "Máj"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "June"
 msgstr "Jún"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "July"
 msgstr "Júl"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "August"
 msgstr "August"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "September"
 msgstr "September"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "October"
 msgstr "Október"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "November"
 msgstr "November"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "December"
 msgstr "December"
 
@@ -115,7 +111,7 @@ msgstr "Chyba"
 msgid "ownCloud password reset"
 msgstr "Obnovenie hesla pre ownCloud"
 
-#: lostpassword/templates/email.php:1
+#: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr "Použite nasledujúci odkaz pre obnovenie vášho hesla: {link}"
 
diff --git a/l10n/sk_SK/files.po b/l10n/sk_SK/files.po
index 5d83420bec..e47f0b0088 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-09-05 02:01+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-06 02:01+0200\n"
+"PO-Revision-Date: 2012-09-06 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"
@@ -57,31 +57,35 @@ msgstr "Súbory"
 msgid "Delete"
 msgstr "Odstrániť"
 
-#: js/filelist.js:141
+#: js/filelist.js:186 js/filelist.js:188
 msgid "already exists"
 msgstr ""
 
-#: js/filelist.js:141
+#: js/filelist.js:186 js/filelist.js:188
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:141
+#: js/filelist.js:186
+msgid "suggest name"
+msgstr ""
+
+#: js/filelist.js:186 js/filelist.js:188
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:195
+#: js/filelist.js:235 js/filelist.js:237
 msgid "replaced"
 msgstr ""
 
-#: js/filelist.js:195
-msgid "with"
-msgstr ""
-
-#: js/filelist.js:195 js/filelist.js:246
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:246
+#: js/filelist.js:237
+msgid "with"
+msgstr ""
+
+#: js/filelist.js:271
 msgid "deleted"
 msgstr ""
 
@@ -97,44 +101,44 @@ msgstr "Nemôžem nahrať súbor lebo je to priečinok alebo má 0 bajtov."
 msgid "Upload Error"
 msgstr "Chyba nahrávania"
 
-#: js/files.js:236 js/files.js:327 js/files.js:356
+#: js/files.js:236 js/files.js:341 js/files.js:370
 msgid "Pending"
 msgstr "Čaká sa"
 
-#: js/files.js:341
+#: js/files.js:355
 msgid "Upload cancelled."
 msgstr "Nahrávanie zrušené"
 
-#: js/files.js:409
+#: js/files.js:423
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:480
+#: js/files.js:493
 msgid "Invalid name, '/' is not allowed."
 msgstr "Chybný názov, \"/\" nie je povolené"
 
-#: js/files.js:726 templates/index.php:55
+#: js/files.js:746 templates/index.php:55
 msgid "Size"
 msgstr "Veľkosť"
 
-#: js/files.js:727 templates/index.php:56
+#: js/files.js:747 templates/index.php:56
 msgid "Modified"
 msgstr "Upravené"
 
-#: js/files.js:754
+#: js/files.js:774
 msgid "folder"
 msgstr "priečinok"
 
-#: js/files.js:756
+#: js/files.js:776
 msgid "folders"
 msgstr "priečinky"
 
-#: js/files.js:764
+#: js/files.js:784
 msgid "file"
 msgstr "súbor"
 
-#: js/files.js:766
+#: js/files.js:786
 msgid "files"
 msgstr "súbory"
 
diff --git a/l10n/sk_SK/files_encryption.po b/l10n/sk_SK/files_encryption.po
index c7ae40ae63..a698624cb5 100644
--- a/l10n/sk_SK/files_encryption.po
+++ b/l10n/sk_SK/files_encryption.po
@@ -3,32 +3,33 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <intense.feel@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-09-06 02:01+0200\n"
+"PO-Revision-Date: 2012-09-05 17:32+0000\n"
+"Last-Translator: intense <intense.feel@gmail.com>\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"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #: templates/settings.php:3
 msgid "Encryption"
-msgstr ""
+msgstr "Šifrovanie"
 
 #: templates/settings.php:4
 msgid "Exclude the following file types from encryption"
-msgstr ""
+msgstr "Vynechať nasledujúce súbory pri šifrovaní"
 
 #: templates/settings.php:5
 msgid "None"
-msgstr ""
+msgstr "Žiadne"
 
 #: templates/settings.php:10
 msgid "Enable Encryption"
-msgstr ""
+msgstr "Zapnúť šifrovanie"
diff --git a/l10n/sl/core.po b/l10n/sl/core.po
index 5039ad2eac..66b5310397 100644
--- a/l10n/sl/core.po
+++ b/l10n/sl/core.po
@@ -10,15 +10,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 02:01+0200\n"
-"PO-Revision-Date: 2012-08-31 14:09+0000\n"
-"Last-Translator: Peter Peroša <peter.perosa@gmail.com>\n"
+"POT-Creation-Date: 2012-09-06 02:02+0200\n"
+"PO-Revision-Date: 2012-09-06 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"
 "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"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
 
 #: ajax/vcategories/add.php:23 ajax/vcategories/delete.php:23
 msgid "Application name not provided."
@@ -32,59 +32,55 @@ 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 "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
-
-#: js/js.js:206 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr "Nastavitve"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "January"
 msgstr "januar"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "February"
 msgstr "februar"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "March"
 msgstr "marec"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "April"
 msgstr "april"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "May"
 msgstr "maj"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "June"
 msgstr "junij"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "July"
 msgstr "julij"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "August"
 msgstr "avgust"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "September"
 msgstr "september"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "October"
 msgstr "oktober"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "November"
 msgstr "november"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "December"
 msgstr "december"
 
@@ -116,7 +112,7 @@ msgstr "Napaka"
 msgid "ownCloud password reset"
 msgstr "Ponastavitev gesla ownCloud"
 
-#: lostpassword/templates/email.php:1
+#: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr "Uporabite sledečo povezavo za ponastavitev gesla: {link}"
 
diff --git a/l10n/sl/files.po b/l10n/sl/files.po
index f905c7b48c..73d23c2579 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-09-05 02:01+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-06 02:01+0200\n"
+"PO-Revision-Date: 2012-09-06 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"
@@ -58,31 +58,35 @@ msgstr "Datoteke"
 msgid "Delete"
 msgstr "Izbriši"
 
-#: js/filelist.js:141
+#: js/filelist.js:186 js/filelist.js:188
 msgid "already exists"
 msgstr "že obstaja"
 
-#: js/filelist.js:141
+#: js/filelist.js:186 js/filelist.js:188
 msgid "replace"
 msgstr "nadomesti"
 
-#: js/filelist.js:141
+#: js/filelist.js:186
+msgid "suggest name"
+msgstr ""
+
+#: js/filelist.js:186 js/filelist.js:188
 msgid "cancel"
 msgstr "ekliči"
 
-#: js/filelist.js:195
+#: js/filelist.js:235 js/filelist.js:237
 msgid "replaced"
 msgstr "nadomeščen"
 
-#: js/filelist.js:195
-msgid "with"
-msgstr "z"
-
-#: js/filelist.js:195 js/filelist.js:246
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
 msgid "undo"
 msgstr "razveljavi"
 
-#: js/filelist.js:246
+#: js/filelist.js:237
+msgid "with"
+msgstr "z"
+
+#: js/filelist.js:271
 msgid "deleted"
 msgstr "izbrisano"
 
@@ -98,44 +102,44 @@ msgstr "Nalaganje ni mogoče, saj gre za mapo, ali pa ima datoteka velikost 0 ba
 msgid "Upload Error"
 msgstr "Napaka pri nalaganju"
 
-#: js/files.js:236 js/files.js:327 js/files.js:356
+#: js/files.js:236 js/files.js:341 js/files.js:370
 msgid "Pending"
 msgstr "Na čakanju"
 
-#: js/files.js:341
+#: js/files.js:355
 msgid "Upload cancelled."
 msgstr "Nalaganje je bilo preklicano."
 
-#: js/files.js:409
+#: js/files.js:423
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Nalaganje datoteke je v teku. Če zapustite to stran zdaj, boste nalaganje preklicali."
 
-#: js/files.js:480
+#: js/files.js:493
 msgid "Invalid name, '/' is not allowed."
 msgstr "Neveljavno ime. Znak '/' ni dovoljen."
 
-#: js/files.js:726 templates/index.php:55
+#: js/files.js:746 templates/index.php:55
 msgid "Size"
 msgstr "Velikost"
 
-#: js/files.js:727 templates/index.php:56
+#: js/files.js:747 templates/index.php:56
 msgid "Modified"
 msgstr "Spremenjeno"
 
-#: js/files.js:754
+#: js/files.js:774
 msgid "folder"
 msgstr "mapa"
 
-#: js/files.js:756
+#: js/files.js:776
 msgid "folders"
 msgstr "mape"
 
-#: js/files.js:764
+#: js/files.js:784
 msgid "file"
 msgstr "datoteka"
 
-#: js/files.js:766
+#: js/files.js:786
 msgid "files"
 msgstr "datoteke"
 
@@ -169,7 +173,7 @@ msgstr "Največja vhodna velikost za ZIP datoteke"
 
 #: templates/admin.php:14
 msgid "Save"
-msgstr ""
+msgstr "Shrani"
 
 #: templates/index.php:7
 msgid "New"
diff --git a/l10n/sl/settings.po b/l10n/sl/settings.po
index 870976e906..bd1e022b7d 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-09-05 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-06 02:02+0200\n"
+"PO-Revision-Date: 2012-09-05 06:02+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"
@@ -68,12 +68,12 @@ msgstr "Jezik je bil spremenjen"
 #: ajax/togglegroups.php:25
 #, php-format
 msgid "Unable to add user to group %s"
-msgstr ""
+msgstr "Uporabnika ni mogoče dodati k skupini %s"
 
 #: ajax/togglegroups.php:31
 #, php-format
 msgid "Unable to remove user from group %s"
-msgstr ""
+msgstr "Uporabnika ni mogoče odstraniti iz skupine %s"
 
 #: js/apps.js:18
 msgid "Error"
@@ -192,7 +192,7 @@ msgstr "Obiščite spletno stran aplikacije na apps.owncloud.com"
 
 #: templates/apps.php:30
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
-msgstr ""
+msgstr "<span class=\"licence\"></span>-licencirana s strani <span class=\"author\"></span>"
 
 #: templates/help.php:9
 msgid "Documentation"
diff --git a/l10n/so/core.po b/l10n/so/core.po
index 4ace6abe5b..f34edceab5 100644
--- a/l10n/so/core.po
+++ b/l10n/so/core.po
@@ -7,15 +7,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-06 02:02+0200\n"
+"PO-Revision-Date: 2012-09-06 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"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: so\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ajax/vcategories/add.php:23 ajax/vcategories/delete.php:23
 msgid "Application name not provided."
@@ -29,59 +29,55 @@ 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:206 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "January"
 msgstr ""
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "February"
 msgstr ""
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "March"
 msgstr ""
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "April"
 msgstr ""
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "May"
 msgstr ""
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "June"
 msgstr ""
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "July"
 msgstr ""
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "August"
 msgstr ""
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "September"
 msgstr ""
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "October"
 msgstr ""
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "November"
 msgstr ""
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "December"
 msgstr ""
 
@@ -113,7 +109,7 @@ msgstr ""
 msgid "ownCloud password reset"
 msgstr ""
 
-#: lostpassword/templates/email.php:1
+#: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr ""
 
diff --git a/l10n/so/files.po b/l10n/so/files.po
index c9c8fbd1ca..a00a9a156c 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-09-05 02:01+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-06 02:01+0200\n"
+"PO-Revision-Date: 2012-09-06 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"
@@ -55,31 +55,35 @@ msgstr ""
 msgid "Delete"
 msgstr ""
 
-#: js/filelist.js:141
+#: js/filelist.js:186 js/filelist.js:188
 msgid "already exists"
 msgstr ""
 
-#: js/filelist.js:141
+#: js/filelist.js:186 js/filelist.js:188
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:141
+#: js/filelist.js:186
+msgid "suggest name"
+msgstr ""
+
+#: js/filelist.js:186 js/filelist.js:188
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:195
+#: js/filelist.js:235 js/filelist.js:237
 msgid "replaced"
 msgstr ""
 
-#: js/filelist.js:195
-msgid "with"
-msgstr ""
-
-#: js/filelist.js:195 js/filelist.js:246
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:246
+#: js/filelist.js:237
+msgid "with"
+msgstr ""
+
+#: js/filelist.js:271
 msgid "deleted"
 msgstr ""
 
@@ -95,44 +99,44 @@ msgstr ""
 msgid "Upload Error"
 msgstr ""
 
-#: js/files.js:236 js/files.js:327 js/files.js:356
+#: js/files.js:236 js/files.js:341 js/files.js:370
 msgid "Pending"
 msgstr ""
 
-#: js/files.js:341
+#: js/files.js:355
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:409
+#: js/files.js:423
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:480
+#: js/files.js:493
 msgid "Invalid name, '/' is not allowed."
 msgstr ""
 
-#: js/files.js:726 templates/index.php:55
+#: js/files.js:746 templates/index.php:55
 msgid "Size"
 msgstr ""
 
-#: js/files.js:727 templates/index.php:56
+#: js/files.js:747 templates/index.php:56
 msgid "Modified"
 msgstr ""
 
-#: js/files.js:754
+#: js/files.js:774
 msgid "folder"
 msgstr ""
 
-#: js/files.js:756
+#: js/files.js:776
 msgid "folders"
 msgstr ""
 
-#: js/files.js:764
+#: js/files.js:784
 msgid "file"
 msgstr ""
 
-#: js/files.js:766
+#: js/files.js:786
 msgid "files"
 msgstr ""
 
diff --git a/l10n/sr/core.po b/l10n/sr/core.po
index a26d7b7529..2e4f99fe34 100644
--- a/l10n/sr/core.po
+++ b/l10n/sr/core.po
@@ -8,15 +8,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-06 02:02+0200\n"
+"PO-Revision-Date: 2012-09-06 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"
 "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"
+"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/vcategories/add.php:23 ajax/vcategories/delete.php:23
 msgid "Application name not provided."
@@ -30,59 +30,55 @@ 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:206 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr "Подешавања"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "January"
 msgstr ""
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "February"
 msgstr ""
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "March"
 msgstr ""
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "April"
 msgstr ""
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "May"
 msgstr ""
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "June"
 msgstr ""
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "July"
 msgstr ""
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "August"
 msgstr ""
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "September"
 msgstr ""
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "October"
 msgstr ""
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "November"
 msgstr ""
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "December"
 msgstr ""
 
@@ -114,7 +110,7 @@ msgstr ""
 msgid "ownCloud password reset"
 msgstr ""
 
-#: lostpassword/templates/email.php:1
+#: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr "Овом везом ресетујте своју лозинку: {link}"
 
diff --git a/l10n/sr/files.po b/l10n/sr/files.po
index 49d3090e68..8dac0a4264 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-09-05 02:01+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-06 02:01+0200\n"
+"PO-Revision-Date: 2012-09-06 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"
@@ -56,31 +56,35 @@ msgstr "Фајлови"
 msgid "Delete"
 msgstr "Обриши"
 
-#: js/filelist.js:141
+#: js/filelist.js:186 js/filelist.js:188
 msgid "already exists"
 msgstr ""
 
-#: js/filelist.js:141
+#: js/filelist.js:186 js/filelist.js:188
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:141
+#: js/filelist.js:186
+msgid "suggest name"
+msgstr ""
+
+#: js/filelist.js:186 js/filelist.js:188
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:195
+#: js/filelist.js:235 js/filelist.js:237
 msgid "replaced"
 msgstr ""
 
-#: js/filelist.js:195
-msgid "with"
-msgstr ""
-
-#: js/filelist.js:195 js/filelist.js:246
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:246
+#: js/filelist.js:237
+msgid "with"
+msgstr ""
+
+#: js/filelist.js:271
 msgid "deleted"
 msgstr ""
 
@@ -96,44 +100,44 @@ msgstr ""
 msgid "Upload Error"
 msgstr ""
 
-#: js/files.js:236 js/files.js:327 js/files.js:356
+#: js/files.js:236 js/files.js:341 js/files.js:370
 msgid "Pending"
 msgstr ""
 
-#: js/files.js:341
+#: js/files.js:355
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:409
+#: js/files.js:423
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:480
+#: js/files.js:493
 msgid "Invalid name, '/' is not allowed."
 msgstr ""
 
-#: js/files.js:726 templates/index.php:55
+#: js/files.js:746 templates/index.php:55
 msgid "Size"
 msgstr "Величина"
 
-#: js/files.js:727 templates/index.php:56
+#: js/files.js:747 templates/index.php:56
 msgid "Modified"
 msgstr "Задња измена"
 
-#: js/files.js:754
+#: js/files.js:774
 msgid "folder"
 msgstr ""
 
-#: js/files.js:756
+#: js/files.js:776
 msgid "folders"
 msgstr ""
 
-#: js/files.js:764
+#: js/files.js:784
 msgid "file"
 msgstr ""
 
-#: js/files.js:766
+#: js/files.js:786
 msgid "files"
 msgstr ""
 
diff --git a/l10n/sr@latin/core.po b/l10n/sr@latin/core.po
index 57abf6fe74..c3541b058a 100644
--- a/l10n/sr@latin/core.po
+++ b/l10n/sr@latin/core.po
@@ -8,15 +8,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-06 02:02+0200\n"
+"PO-Revision-Date: 2012-09-06 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"
 "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"
+"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/vcategories/add.php:23 ajax/vcategories/delete.php:23
 msgid "Application name not provided."
@@ -30,59 +30,55 @@ 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:206 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr "Podešavanja"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "January"
 msgstr ""
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "February"
 msgstr ""
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "March"
 msgstr ""
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "April"
 msgstr ""
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "May"
 msgstr ""
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "June"
 msgstr ""
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "July"
 msgstr ""
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "August"
 msgstr ""
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "September"
 msgstr ""
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "October"
 msgstr ""
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "November"
 msgstr ""
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "December"
 msgstr ""
 
@@ -114,7 +110,7 @@ msgstr ""
 msgid "ownCloud password reset"
 msgstr ""
 
-#: lostpassword/templates/email.php:1
+#: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr ""
 
diff --git a/l10n/sr@latin/files.po b/l10n/sr@latin/files.po
index fd9e18816f..e52820431e 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-09-05 02:01+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-06 02:01+0200\n"
+"PO-Revision-Date: 2012-09-06 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"
@@ -56,31 +56,35 @@ msgstr "Fajlovi"
 msgid "Delete"
 msgstr "Obriši"
 
-#: js/filelist.js:141
+#: js/filelist.js:186 js/filelist.js:188
 msgid "already exists"
 msgstr ""
 
-#: js/filelist.js:141
+#: js/filelist.js:186 js/filelist.js:188
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:141
+#: js/filelist.js:186
+msgid "suggest name"
+msgstr ""
+
+#: js/filelist.js:186 js/filelist.js:188
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:195
+#: js/filelist.js:235 js/filelist.js:237
 msgid "replaced"
 msgstr ""
 
-#: js/filelist.js:195
-msgid "with"
-msgstr ""
-
-#: js/filelist.js:195 js/filelist.js:246
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:246
+#: js/filelist.js:237
+msgid "with"
+msgstr ""
+
+#: js/filelist.js:271
 msgid "deleted"
 msgstr ""
 
@@ -96,44 +100,44 @@ msgstr ""
 msgid "Upload Error"
 msgstr ""
 
-#: js/files.js:236 js/files.js:327 js/files.js:356
+#: js/files.js:236 js/files.js:341 js/files.js:370
 msgid "Pending"
 msgstr ""
 
-#: js/files.js:341
+#: js/files.js:355
 msgid "Upload cancelled."
 msgstr ""
 
-#: js/files.js:409
+#: js/files.js:423
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:480
+#: js/files.js:493
 msgid "Invalid name, '/' is not allowed."
 msgstr ""
 
-#: js/files.js:726 templates/index.php:55
+#: js/files.js:746 templates/index.php:55
 msgid "Size"
 msgstr "Veličina"
 
-#: js/files.js:727 templates/index.php:56
+#: js/files.js:747 templates/index.php:56
 msgid "Modified"
 msgstr "Zadnja izmena"
 
-#: js/files.js:754
+#: js/files.js:774
 msgid "folder"
 msgstr ""
 
-#: js/files.js:756
+#: js/files.js:776
 msgid "folders"
 msgstr ""
 
-#: js/files.js:764
+#: js/files.js:784
 msgid "file"
 msgstr ""
 
-#: js/files.js:766
+#: js/files.js:786
 msgid "files"
 msgstr ""
 
diff --git a/l10n/sv/core.po b/l10n/sv/core.po
index 870dffe8a9..57ad5c15e4 100644
--- a/l10n/sv/core.po
+++ b/l10n/sv/core.po
@@ -13,15 +13,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 02:01+0200\n"
-"PO-Revision-Date: 2012-08-31 08:10+0000\n"
-"Last-Translator: Magnus Höglund <magnus@linux.com>\n"
+"POT-Creation-Date: 2012-09-06 02:02+0200\n"
+"PO-Revision-Date: 2012-09-06 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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: sv\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ajax/vcategories/add.php:23 ajax/vcategories/delete.php:23
 msgid "Application name not provided."
@@ -35,59 +35,55 @@ msgstr "Ingen kategori att lägga till?"
 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 "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
-
-#: js/js.js:206 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr "Inställningar"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "January"
 msgstr "Januari"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "February"
 msgstr "Februari"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "March"
 msgstr "Mars"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "April"
 msgstr "April"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "May"
 msgstr "Maj"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "June"
 msgstr "Juni"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "July"
 msgstr "Juli"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "August"
 msgstr "Augusti"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "September"
 msgstr "September"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "October"
 msgstr "Oktober"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "November"
 msgstr "November"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "December"
 msgstr "December"
 
@@ -119,7 +115,7 @@ msgstr "Fel"
 msgid "ownCloud password reset"
 msgstr "ownCloud lösenordsåterställning"
 
-#: lostpassword/templates/email.php:1
+#: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr "Använd följande länk för att återställa lösenordet: {link}"
 
diff --git a/l10n/sv/files.po b/l10n/sv/files.po
index 38e7c5af59..847a38a395 100644
--- a/l10n/sv/files.po
+++ b/l10n/sv/files.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-09-05 02:01+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-06 02:01+0200\n"
+"PO-Revision-Date: 2012-09-06 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"
@@ -61,31 +61,35 @@ msgstr "Filer"
 msgid "Delete"
 msgstr "Radera"
 
-#: js/filelist.js:141
+#: js/filelist.js:186 js/filelist.js:188
 msgid "already exists"
 msgstr "finns redan"
 
-#: js/filelist.js:141
+#: js/filelist.js:186 js/filelist.js:188
 msgid "replace"
 msgstr "ersätt"
 
-#: js/filelist.js:141
+#: js/filelist.js:186
+msgid "suggest name"
+msgstr ""
+
+#: js/filelist.js:186 js/filelist.js:188
 msgid "cancel"
 msgstr "avbryt"
 
-#: js/filelist.js:195
+#: js/filelist.js:235 js/filelist.js:237
 msgid "replaced"
 msgstr "ersatt"
 
-#: js/filelist.js:195
-msgid "with"
-msgstr "med"
-
-#: js/filelist.js:195 js/filelist.js:246
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
 msgid "undo"
 msgstr "ångra"
 
-#: js/filelist.js:246
+#: js/filelist.js:237
+msgid "with"
+msgstr "med"
+
+#: js/filelist.js:271
 msgid "deleted"
 msgstr "raderad"
 
@@ -101,44 +105,44 @@ msgstr "Kunde inte ladda upp dina filer eftersom det antingen är en mapp eller
 msgid "Upload Error"
 msgstr "Uppladdningsfel"
 
-#: js/files.js:236 js/files.js:327 js/files.js:356
+#: js/files.js:236 js/files.js:341 js/files.js:370
 msgid "Pending"
 msgstr "Väntar"
 
-#: js/files.js:341
+#: js/files.js:355
 msgid "Upload cancelled."
 msgstr "Uppladdning avbruten."
 
-#: js/files.js:409
+#: js/files.js:423
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Filuppladdning pågår. Lämnar du sidan så avbryts uppladdningen."
 
-#: js/files.js:480
+#: js/files.js:493
 msgid "Invalid name, '/' is not allowed."
 msgstr "Ogiltigt namn, '/' är inte tillåten."
 
-#: js/files.js:726 templates/index.php:55
+#: js/files.js:746 templates/index.php:55
 msgid "Size"
 msgstr "Storlek"
 
-#: js/files.js:727 templates/index.php:56
+#: js/files.js:747 templates/index.php:56
 msgid "Modified"
 msgstr "Ändrad"
 
-#: js/files.js:754
+#: js/files.js:774
 msgid "folder"
 msgstr "mapp"
 
-#: js/files.js:756
+#: js/files.js:776
 msgid "folders"
 msgstr "mappar"
 
-#: js/files.js:764
+#: js/files.js:784
 msgid "file"
 msgstr "fil"
 
-#: js/files.js:766
+#: js/files.js:786
 msgid "files"
 msgstr "filer"
 
@@ -172,7 +176,7 @@ msgstr "Största tillåtna storlek för ZIP-filer"
 
 #: templates/admin.php:14
 msgid "Save"
-msgstr ""
+msgstr "Spara"
 
 #: templates/index.php:7
 msgid "New"
diff --git a/l10n/sv/settings.po b/l10n/sv/settings.po
index 77788a1797..f93b1f0f3c 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-09-05 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-06 02:02+0200\n"
+"PO-Revision-Date: 2012-09-05 06:05+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"
@@ -35,11 +35,11 @@ msgstr "Autentiseringsfel"
 
 #: ajax/creategroup.php:19
 msgid "Group already exists"
-msgstr ""
+msgstr "Gruppen finns redan"
 
 #: ajax/creategroup.php:28
 msgid "Unable to add group"
-msgstr ""
+msgstr "Kan inte lägga till grupp"
 
 #: ajax/lostpassword.php:14
 msgid "Email saved"
@@ -59,11 +59,11 @@ msgstr "Ogiltig begäran"
 
 #: ajax/removegroup.php:16
 msgid "Unable to delete group"
-msgstr ""
+msgstr "Kan inte radera grupp"
 
 #: ajax/removeuser.php:22
 msgid "Unable to delete user"
-msgstr ""
+msgstr "Kan inte radera användare"
 
 #: ajax/setlanguage.php:18
 msgid "Language changed"
@@ -72,12 +72,12 @@ msgstr "Språk ändrades"
 #: ajax/togglegroups.php:25
 #, php-format
 msgid "Unable to add user to group %s"
-msgstr ""
+msgstr "Kan inte lägga till användare i gruppen %s"
 
 #: ajax/togglegroups.php:31
 #, php-format
 msgid "Unable to remove user from group %s"
-msgstr ""
+msgstr "Kan inte radera användare från gruppen %s"
 
 #: js/apps.js:18
 msgid "Error"
@@ -196,7 +196,7 @@ msgstr "Se programsida på apps.owncloud.com"
 
 #: templates/apps.php:30
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
-msgstr ""
+msgstr "<span class=\"licence\"></span>-licensierad av <span class=\"author\"></span>"
 
 #: templates/help.php:9
 msgid "Documentation"
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index d59cc85eb8..9112352a3a 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-09-05 22:51+0200\n"
+"POT-Creation-Date: 2012-09-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 44a43dfd40..74ab323086 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-09-05 22:50+0200\n"
+"POT-Creation-Date: 2012-09-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/files_encryption.pot b/l10n/templates/files_encryption.pot
index 99b6ae69c3..0590a19880 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-09-05 22:50+0200\n"
+"POT-Creation-Date: 2012-09-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/files_external.pot b/l10n/templates/files_external.pot
index adca26e6ea..76fafddc1b 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-09-05 22:50+0200\n"
+"POT-Creation-Date: 2012-09-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/files_sharing.pot b/l10n/templates/files_sharing.pot
index 160cb143db..b0c4586782 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-09-05 22:50+0200\n"
+"POT-Creation-Date: 2012-09-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/files_versions.pot b/l10n/templates/files_versions.pot
index be0aedd0b8..b17eb3894d 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-09-05 22:50+0200\n"
+"POT-Creation-Date: 2012-09-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 cfbef6875d..5a86298e89 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-09-05 22:51+0200\n"
+"POT-Creation-Date: 2012-09-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 f506265f12..42965d3e0b 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-09-05 22:51+0200\n"
+"POT-Creation-Date: 2012-09-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/user_ldap.pot b/l10n/templates/user_ldap.pot
index 403d1173b3..82b19373c1 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-09-05 22:50+0200\n"
+"POT-Creation-Date: 2012-09-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/th_TH/core.po b/l10n/th_TH/core.po
index 80fbd9a5ac..57ee6a0d22 100644
--- a/l10n/th_TH/core.po
+++ b/l10n/th_TH/core.po
@@ -9,15 +9,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 02:01+0200\n"
-"PO-Revision-Date: 2012-08-31 17:01+0000\n"
-"Last-Translator: AriesAnywhere Anywhere <ariesanywhere@gmail.com>\n"
+"POT-Creation-Date: 2012-09-06 02:02+0200\n"
+"PO-Revision-Date: 2012-09-06 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"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: th_TH\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ajax/vcategories/add.php:23 ajax/vcategories/delete.php:23
 msgid "Application name not provided."
@@ -31,59 +31,55 @@ 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 "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
-
-#: js/js.js:206 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr "ตั้งค่า"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "January"
 msgstr "มกราคม"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "February"
 msgstr "กุมภาพันธ์"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "March"
 msgstr "มีนาคม"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "April"
 msgstr "เมษายน"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "May"
 msgstr "พฤษภาคม"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "June"
 msgstr "มิถุนายน"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "July"
 msgstr "กรกฏาคม"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "August"
 msgstr "สิงหาคม"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "September"
 msgstr "กันยายน"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "October"
 msgstr "ตุลาคม"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "November"
 msgstr "พฤศจิกายน"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "December"
 msgstr "ธันวาคม"
 
@@ -115,7 +111,7 @@ msgstr "พบข้อผิดพลาด"
 msgid "ownCloud password reset"
 msgstr "รีเซ็ตรหัสผ่าน ownCloud"
 
-#: lostpassword/templates/email.php:1
+#: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr "ใช้ลิงค์ต่อไปนี้เพื่อเปลี่ยนรหัสผ่านของคุณใหม่: {link}"
 
diff --git a/l10n/th_TH/files.po b/l10n/th_TH/files.po
index 93ca73a3d1..b6ff21b382 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-09-05 02:01+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-06 02:01+0200\n"
+"PO-Revision-Date: 2012-09-06 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"
@@ -57,31 +57,35 @@ msgstr "ไฟล์"
 msgid "Delete"
 msgstr "ลบ"
 
-#: js/filelist.js:141
+#: js/filelist.js:186 js/filelist.js:188
 msgid "already exists"
 msgstr "มีอยู่แล้ว"
 
-#: js/filelist.js:141
+#: js/filelist.js:186 js/filelist.js:188
 msgid "replace"
 msgstr "แทนที่"
 
-#: js/filelist.js:141
+#: js/filelist.js:186
+msgid "suggest name"
+msgstr ""
+
+#: js/filelist.js:186 js/filelist.js:188
 msgid "cancel"
 msgstr "ยกเลิก"
 
-#: js/filelist.js:195
+#: js/filelist.js:235 js/filelist.js:237
 msgid "replaced"
 msgstr "แทนที่แล้ว"
 
-#: js/filelist.js:195
-msgid "with"
-msgstr "กับ"
-
-#: js/filelist.js:195 js/filelist.js:246
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
 msgid "undo"
 msgstr "เลิกทำ"
 
-#: js/filelist.js:246
+#: js/filelist.js:237
+msgid "with"
+msgstr "กับ"
+
+#: js/filelist.js:271
 msgid "deleted"
 msgstr "ลบแล้ว"
 
@@ -97,44 +101,44 @@ msgstr "ไม่สามารถอัพโหลดไฟล์ของค
 msgid "Upload Error"
 msgstr "เกิดข้อผิดพลาดในการอัพโหลด"
 
-#: js/files.js:236 js/files.js:327 js/files.js:356
+#: js/files.js:236 js/files.js:341 js/files.js:370
 msgid "Pending"
 msgstr "อยู่ระหว่างดำเนินการ"
 
-#: js/files.js:341
+#: js/files.js:355
 msgid "Upload cancelled."
 msgstr "การอัพโหลดถูกยกเลิก"
 
-#: js/files.js:409
+#: js/files.js:423
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "การอัพโหลดไฟล์กำลังอยู่ในระหว่างดำเนินการ การออกจากหน้าเว็บนี้จะทำให้การอัพโหลดถูกยกเลิก"
 
-#: js/files.js:480
+#: js/files.js:493
 msgid "Invalid name, '/' is not allowed."
 msgstr "ชื่อที่ใช้ไม่ถูกต้อง '/' ไม่อนุญาตให้ใช้งาน"
 
-#: js/files.js:726 templates/index.php:55
+#: js/files.js:746 templates/index.php:55
 msgid "Size"
 msgstr "ขนาด"
 
-#: js/files.js:727 templates/index.php:56
+#: js/files.js:747 templates/index.php:56
 msgid "Modified"
 msgstr "ปรับปรุงล่าสุด"
 
-#: js/files.js:754
+#: js/files.js:774
 msgid "folder"
 msgstr "โฟลเดอร์"
 
-#: js/files.js:756
+#: js/files.js:776
 msgid "folders"
 msgstr "โฟลเดอร์"
 
-#: js/files.js:764
+#: js/files.js:784
 msgid "file"
 msgstr "ไฟล์"
 
-#: js/files.js:766
+#: js/files.js:786
 msgid "files"
 msgstr "ไฟล์"
 
@@ -168,7 +172,7 @@ msgstr "ขนาดไฟล์ ZIP สูงสุด"
 
 #: templates/admin.php:14
 msgid "Save"
-msgstr ""
+msgstr "บันทึก"
 
 #: templates/index.php:7
 msgid "New"
diff --git a/l10n/th_TH/settings.po b/l10n/th_TH/settings.po
index 4de6824155..1919a13b9e 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-09-05 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-06 02:02+0200\n"
+"PO-Revision-Date: 2012-09-05 00:31+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"
@@ -31,11 +31,11 @@ msgstr "เกิดข้อผิดพลาดเกี่ยวกับส
 
 #: ajax/creategroup.php:19
 msgid "Group already exists"
-msgstr ""
+msgstr "มีกลุ่มดังกล่าวอยู่ในระบบอยู่แล้ว"
 
 #: ajax/creategroup.php:28
 msgid "Unable to add group"
-msgstr ""
+msgstr "ไม่สามารถเพิ่มกลุ่มได้"
 
 #: ajax/lostpassword.php:14
 msgid "Email saved"
@@ -55,11 +55,11 @@ msgstr "คำร้องขอไม่ถูกต้อง"
 
 #: ajax/removegroup.php:16
 msgid "Unable to delete group"
-msgstr ""
+msgstr "ไม่สามารถลบกลุ่มได้"
 
 #: ajax/removeuser.php:22
 msgid "Unable to delete user"
-msgstr ""
+msgstr "ไม่สามารถลบผู้ใช้งานได้"
 
 #: ajax/setlanguage.php:18
 msgid "Language changed"
@@ -68,12 +68,12 @@ msgstr "เปลี่ยนภาษาเรียบร้อยแล้ว
 #: ajax/togglegroups.php:25
 #, php-format
 msgid "Unable to add user to group %s"
-msgstr ""
+msgstr "ไม่สามารถเพิ่มผู้ใช้งานเข้าไปที่กลุ่ม %s ได้"
 
 #: ajax/togglegroups.php:31
 #, php-format
 msgid "Unable to remove user from group %s"
-msgstr ""
+msgstr "ไม่สามารถลบผู้ใช้งานออกจากกลุ่ม %s ได้"
 
 #: js/apps.js:18
 msgid "Error"
@@ -192,7 +192,7 @@ msgstr "ดูหน้าแอพพลิเคชั่นที่ apps.own
 
 #: templates/apps.php:30
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
-msgstr ""
+msgstr "<span class=\"licence\"></span>-ลิขสิทธิ์การใช้งานโดย <span class=\"author\"></span>"
 
 #: templates/help.php:9
 msgid "Documentation"
diff --git a/l10n/tr/core.po b/l10n/tr/core.po
index 8644c4df37..a715d982b6 100644
--- a/l10n/tr/core.po
+++ b/l10n/tr/core.po
@@ -10,15 +10,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 02:01+0200\n"
-"PO-Revision-Date: 2012-08-31 21:48+0000\n"
-"Last-Translator: Caner Başaran <basaran.caner@gmail.com>\n"
+"POT-Creation-Date: 2012-09-06 02:02+0200\n"
+"PO-Revision-Date: 2012-09-06 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"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: tr\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ajax/vcategories/add.php:23 ajax/vcategories/delete.php:23
 msgid "Application name not provided."
@@ -32,59 +32,55 @@ 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 "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
-
-#: js/js.js:206 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr "Ayarlar"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "January"
 msgstr "Ocak"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "February"
 msgstr "Şubat"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "March"
 msgstr "Mart"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "April"
 msgstr "Nisan"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "May"
 msgstr "Mayıs"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "June"
 msgstr "Haziran"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "July"
 msgstr "Temmuz"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "August"
 msgstr "Ağustos"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "September"
 msgstr "Eylül"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "October"
 msgstr "Ekim"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "November"
 msgstr "Kasım"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "December"
 msgstr "Aralık"
 
@@ -116,7 +112,7 @@ msgstr "Hata"
 msgid "ownCloud password reset"
 msgstr "ownCloud parola sıfırlama"
 
-#: lostpassword/templates/email.php:1
+#: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr "Bu bağlantıyı kullanarak parolanızı sıfırlayın: {link}"
 
diff --git a/l10n/tr/files.po b/l10n/tr/files.po
index 865f2bc6d6..01675ca064 100644
--- a/l10n/tr/files.po
+++ b/l10n/tr/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-09-05 02:01+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-06 02:01+0200\n"
+"PO-Revision-Date: 2012-09-06 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"
@@ -59,31 +59,35 @@ msgstr "Dosyalar"
 msgid "Delete"
 msgstr "Sil"
 
-#: js/filelist.js:141
+#: js/filelist.js:186 js/filelist.js:188
 msgid "already exists"
 msgstr "zaten mevcut"
 
-#: js/filelist.js:141
+#: js/filelist.js:186 js/filelist.js:188
 msgid "replace"
 msgstr "değiştir"
 
-#: js/filelist.js:141
+#: js/filelist.js:186
+msgid "suggest name"
+msgstr ""
+
+#: js/filelist.js:186 js/filelist.js:188
 msgid "cancel"
 msgstr "iptal"
 
-#: js/filelist.js:195
+#: js/filelist.js:235 js/filelist.js:237
 msgid "replaced"
 msgstr "değiştirildi"
 
-#: js/filelist.js:195
-msgid "with"
-msgstr "ile"
-
-#: js/filelist.js:195 js/filelist.js:246
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
 msgid "undo"
 msgstr "geri al"
 
-#: js/filelist.js:246
+#: js/filelist.js:237
+msgid "with"
+msgstr "ile"
+
+#: js/filelist.js:271
 msgid "deleted"
 msgstr "silindi"
 
@@ -99,44 +103,44 @@ msgstr "Dosyanızın boyutu 0 byte olduğundan veya bir dizin olduğundan yükle
 msgid "Upload Error"
 msgstr "Yükleme hatası"
 
-#: js/files.js:236 js/files.js:327 js/files.js:356
+#: js/files.js:236 js/files.js:341 js/files.js:370
 msgid "Pending"
 msgstr "Bekliyor"
 
-#: js/files.js:341
+#: js/files.js:355
 msgid "Upload cancelled."
 msgstr "Yükleme iptal edildi."
 
-#: js/files.js:409
+#: js/files.js:423
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "Dosya yükleme işlemi sürüyor. Şimdi sayfadan ayrılırsanız işleminiz iptal olur."
 
-#: js/files.js:480
+#: js/files.js:493
 msgid "Invalid name, '/' is not allowed."
 msgstr "Geçersiz isim, '/' işaretine izin verilmiyor."
 
-#: js/files.js:726 templates/index.php:55
+#: js/files.js:746 templates/index.php:55
 msgid "Size"
 msgstr "Boyut"
 
-#: js/files.js:727 templates/index.php:56
+#: js/files.js:747 templates/index.php:56
 msgid "Modified"
 msgstr "Değiştirilme"
 
-#: js/files.js:754
+#: js/files.js:774
 msgid "folder"
 msgstr "dizin"
 
-#: js/files.js:756
+#: js/files.js:776
 msgid "folders"
 msgstr "dizinler"
 
-#: js/files.js:764
+#: js/files.js:784
 msgid "file"
 msgstr "dosya"
 
-#: js/files.js:766
+#: js/files.js:786
 msgid "files"
 msgstr "dosyalar"
 
diff --git a/l10n/uk/core.po b/l10n/uk/core.po
index f68db85912..532bd0a547 100644
--- a/l10n/uk/core.po
+++ b/l10n/uk/core.po
@@ -9,15 +9,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-06 02:02+0200\n"
+"PO-Revision-Date: 2012-09-06 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"
 "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"
+"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/vcategories/add.php:23 ajax/vcategories/delete.php:23
 msgid "Application name not provided."
@@ -31,59 +31,55 @@ 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:206 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr "Налаштування"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "January"
 msgstr ""
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "February"
 msgstr ""
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "March"
 msgstr ""
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "April"
 msgstr ""
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "May"
 msgstr ""
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "June"
 msgstr ""
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "July"
 msgstr ""
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "August"
 msgstr ""
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "September"
 msgstr ""
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "October"
 msgstr ""
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "November"
 msgstr ""
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "December"
 msgstr ""
 
@@ -115,7 +111,7 @@ msgstr ""
 msgid "ownCloud password reset"
 msgstr ""
 
-#: lostpassword/templates/email.php:1
+#: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr ""
 
diff --git a/l10n/uk/files.po b/l10n/uk/files.po
index ebdc5f8b9c..558899c1a2 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-09-05 02:01+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-06 02:01+0200\n"
+"PO-Revision-Date: 2012-09-06 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"
@@ -57,31 +57,35 @@ msgstr "Файли"
 msgid "Delete"
 msgstr "Видалити"
 
-#: js/filelist.js:141
+#: js/filelist.js:186 js/filelist.js:188
 msgid "already exists"
 msgstr ""
 
-#: js/filelist.js:141
+#: js/filelist.js:186 js/filelist.js:188
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:141
+#: js/filelist.js:186
+msgid "suggest name"
+msgstr ""
+
+#: js/filelist.js:186 js/filelist.js:188
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:195
+#: js/filelist.js:235 js/filelist.js:237
 msgid "replaced"
 msgstr ""
 
-#: js/filelist.js:195
-msgid "with"
-msgstr ""
-
-#: js/filelist.js:195 js/filelist.js:246
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
 msgid "undo"
 msgstr "відмінити"
 
-#: js/filelist.js:246
+#: js/filelist.js:237
+msgid "with"
+msgstr ""
+
+#: js/filelist.js:271
 msgid "deleted"
 msgstr "видалені"
 
@@ -97,44 +101,44 @@ msgstr "Неможливо завантажити ваш файл тому, що
 msgid "Upload Error"
 msgstr "Помилка завантаження"
 
-#: js/files.js:236 js/files.js:327 js/files.js:356
+#: js/files.js:236 js/files.js:341 js/files.js:370
 msgid "Pending"
 msgstr "Очікування"
 
-#: js/files.js:341
+#: js/files.js:355
 msgid "Upload cancelled."
 msgstr "Завантаження перервано."
 
-#: js/files.js:409
+#: js/files.js:423
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:480
+#: js/files.js:493
 msgid "Invalid name, '/' is not allowed."
 msgstr "Некоректне ім'я, '/' не дозволено."
 
-#: js/files.js:726 templates/index.php:55
+#: js/files.js:746 templates/index.php:55
 msgid "Size"
 msgstr "Розмір"
 
-#: js/files.js:727 templates/index.php:56
+#: js/files.js:747 templates/index.php:56
 msgid "Modified"
 msgstr "Змінено"
 
-#: js/files.js:754
+#: js/files.js:774
 msgid "folder"
 msgstr "тека"
 
-#: js/files.js:756
+#: js/files.js:776
 msgid "folders"
 msgstr "теки"
 
-#: js/files.js:764
+#: js/files.js:784
 msgid "file"
 msgstr "файл"
 
-#: js/files.js:766
+#: js/files.js:786
 msgid "files"
 msgstr "файли"
 
diff --git a/l10n/vi/core.po b/l10n/vi/core.po
index 16e671b63c..4030732e1e 100644
--- a/l10n/vi/core.po
+++ b/l10n/vi/core.po
@@ -8,15 +8,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-06 02:02+0200\n"
+"PO-Revision-Date: 2012-09-06 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"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: vi\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ajax/vcategories/add.php:23 ajax/vcategories/delete.php:23
 msgid "Application name not provided."
@@ -30,59 +30,55 @@ msgstr "Không có danh mục được thêm?"
 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:206 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr "Cài đặt"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "January"
 msgstr "Tháng 1"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "February"
 msgstr "Tháng 2"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "March"
 msgstr "Tháng 3"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "April"
 msgstr "Tháng 4"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "May"
 msgstr "Tháng 5"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "June"
 msgstr "Tháng 6"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "July"
 msgstr "Tháng 7"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "August"
 msgstr "Tháng 8"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "September"
 msgstr "Tháng 9"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "October"
 msgstr "Tháng 10"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "November"
 msgstr "Tháng 11"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "December"
 msgstr "Tháng 12"
 
@@ -114,7 +110,7 @@ msgstr "Lỗi"
 msgid "ownCloud password reset"
 msgstr "Khôi phục mật khẩu Owncloud "
 
-#: lostpassword/templates/email.php:1
+#: lostpassword/templates/email.php:2
 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}"
 
diff --git a/l10n/vi/files.po b/l10n/vi/files.po
index 6e2d43a349..fb95389e33 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-09-05 02:01+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-06 02:01+0200\n"
+"PO-Revision-Date: 2012-09-06 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"
@@ -56,31 +56,35 @@ msgstr "Tập tin"
 msgid "Delete"
 msgstr "Xóa"
 
-#: js/filelist.js:141
+#: js/filelist.js:186 js/filelist.js:188
 msgid "already exists"
 msgstr ""
 
-#: js/filelist.js:141
+#: js/filelist.js:186 js/filelist.js:188
 msgid "replace"
 msgstr ""
 
-#: js/filelist.js:141
+#: js/filelist.js:186
+msgid "suggest name"
+msgstr ""
+
+#: js/filelist.js:186 js/filelist.js:188
 msgid "cancel"
 msgstr ""
 
-#: js/filelist.js:195
+#: js/filelist.js:235 js/filelist.js:237
 msgid "replaced"
 msgstr ""
 
-#: js/filelist.js:195
-msgid "with"
-msgstr ""
-
-#: js/filelist.js:195 js/filelist.js:246
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:246
+#: js/filelist.js:237
+msgid "with"
+msgstr ""
+
+#: js/filelist.js:271
 msgid "deleted"
 msgstr ""
 
@@ -96,44 +100,44 @@ msgstr ""
 msgid "Upload Error"
 msgstr "Tải lên lỗi"
 
-#: js/files.js:236 js/files.js:327 js/files.js:356
+#: js/files.js:236 js/files.js:341 js/files.js:370
 msgid "Pending"
 msgstr "Chờ"
 
-#: js/files.js:341
+#: js/files.js:355
 msgid "Upload cancelled."
 msgstr "Hủy tải lên"
 
-#: js/files.js:409
+#: js/files.js:423
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:480
+#: js/files.js:493
 msgid "Invalid name, '/' is not allowed."
 msgstr "Tên không hợp lệ ,không được phép dùng '/'"
 
-#: js/files.js:726 templates/index.php:55
+#: js/files.js:746 templates/index.php:55
 msgid "Size"
 msgstr "Kích cỡ"
 
-#: js/files.js:727 templates/index.php:56
+#: js/files.js:747 templates/index.php:56
 msgid "Modified"
 msgstr "Thay đổi"
 
-#: js/files.js:754
+#: js/files.js:774
 msgid "folder"
 msgstr "folder"
 
-#: js/files.js:756
+#: js/files.js:776
 msgid "folders"
 msgstr "folders"
 
-#: js/files.js:764
+#: js/files.js:784
 msgid "file"
 msgstr "file"
 
-#: js/files.js:766
+#: js/files.js:786
 msgid "files"
 msgstr "files"
 
diff --git a/l10n/zh_CN.GB2312/core.po b/l10n/zh_CN.GB2312/core.po
index 428eaa941b..1993d8aed9 100644
--- a/l10n/zh_CN.GB2312/core.po
+++ b/l10n/zh_CN.GB2312/core.po
@@ -8,15 +8,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-06 02:02+0200\n"
+"PO-Revision-Date: 2012-09-06 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"
 "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"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ajax/vcategories/add.php:23 ajax/vcategories/delete.php:23
 msgid "Application name not provided."
@@ -30,59 +30,55 @@ 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 "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
-
-#: js/js.js:206 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr "设置"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "January"
 msgstr "一月"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "February"
 msgstr "二月"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "March"
 msgstr "三月"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "April"
 msgstr "四月"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "May"
 msgstr "五月"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "June"
 msgstr "六月"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "July"
 msgstr "七月"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "August"
 msgstr "八月"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "September"
 msgstr "九月"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "October"
 msgstr "十月"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "November"
 msgstr "十一月"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "December"
 msgstr "十二月"
 
@@ -114,7 +110,7 @@ msgstr "错误"
 msgid "ownCloud password reset"
 msgstr "私有云密码重置"
 
-#: lostpassword/templates/email.php:1
+#: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr "使用下面的链接来重置你的密码:{link}"
 
diff --git a/l10n/zh_CN.GB2312/files.po b/l10n/zh_CN.GB2312/files.po
index 00bdb62e96..3224b4b01d 100644
--- a/l10n/zh_CN.GB2312/files.po
+++ b/l10n/zh_CN.GB2312/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-09-05 02:01+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-06 02:01+0200\n"
+"PO-Revision-Date: 2012-09-06 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"
@@ -56,31 +56,35 @@ msgstr "文件"
 msgid "Delete"
 msgstr "删除"
 
-#: js/filelist.js:141
+#: js/filelist.js:186 js/filelist.js:188
 msgid "already exists"
 msgstr "已经存在了"
 
-#: js/filelist.js:141
+#: js/filelist.js:186 js/filelist.js:188
 msgid "replace"
 msgstr "替换"
 
-#: js/filelist.js:141
+#: js/filelist.js:186
+msgid "suggest name"
+msgstr ""
+
+#: js/filelist.js:186 js/filelist.js:188
 msgid "cancel"
 msgstr "取消"
 
-#: js/filelist.js:195
+#: js/filelist.js:235 js/filelist.js:237
 msgid "replaced"
 msgstr "替换过了"
 
-#: js/filelist.js:195
-msgid "with"
-msgstr "随着"
-
-#: js/filelist.js:195 js/filelist.js:246
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
 msgid "undo"
 msgstr "撤销"
 
-#: js/filelist.js:246
+#: js/filelist.js:237
+msgid "with"
+msgstr "随着"
+
+#: js/filelist.js:271
 msgid "deleted"
 msgstr "删除"
 
@@ -96,44 +100,44 @@ msgstr "不能上传你指定的文件,可能因为它是个文件夹或者大
 msgid "Upload Error"
 msgstr "上传错误"
 
-#: js/files.js:236 js/files.js:327 js/files.js:356
+#: js/files.js:236 js/files.js:341 js/files.js:370
 msgid "Pending"
 msgstr "Pending"
 
-#: js/files.js:341
+#: js/files.js:355
 msgid "Upload cancelled."
 msgstr "上传取消了"
 
-#: js/files.js:409
+#: js/files.js:423
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:480
+#: js/files.js:493
 msgid "Invalid name, '/' is not allowed."
 msgstr "非法文件名,\"/\"是不被许可的"
 
-#: js/files.js:726 templates/index.php:55
+#: js/files.js:746 templates/index.php:55
 msgid "Size"
 msgstr "大小"
 
-#: js/files.js:727 templates/index.php:56
+#: js/files.js:747 templates/index.php:56
 msgid "Modified"
 msgstr "修改日期"
 
-#: js/files.js:754
+#: js/files.js:774
 msgid "folder"
 msgstr "文件夹"
 
-#: js/files.js:756
+#: js/files.js:776
 msgid "folders"
 msgstr "文件夹"
 
-#: js/files.js:764
+#: js/files.js:784
 msgid "file"
 msgstr "文件"
 
-#: js/files.js:766
+#: js/files.js:786
 msgid "files"
 msgstr "文件"
 
diff --git a/l10n/zh_CN/core.po b/l10n/zh_CN/core.po
index 83cd931d85..57d881dcff 100644
--- a/l10n/zh_CN/core.po
+++ b/l10n/zh_CN/core.po
@@ -9,15 +9,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
+"POT-Creation-Date: 2012-09-06 02:02+0200\n"
+"PO-Revision-Date: 2012-09-06 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"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: zh_CN\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ajax/vcategories/add.php:23 ajax/vcategories/delete.php:23
 msgid "Application name not provided."
@@ -31,59 +31,55 @@ 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:206 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr "设置"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "January"
 msgstr "一月"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "February"
 msgstr "二月"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "March"
 msgstr "三月"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "April"
 msgstr "四月"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "May"
 msgstr "五月"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "June"
 msgstr "六月"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "July"
 msgstr "七月"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "August"
 msgstr "八月"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "September"
 msgstr "九月"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "October"
 msgstr "十月"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "November"
 msgstr "十一月"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "December"
 msgstr "十二月"
 
@@ -115,7 +111,7 @@ msgstr "错误"
 msgid "ownCloud password reset"
 msgstr "重置 ownCloud 密码"
 
-#: lostpassword/templates/email.php:1
+#: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr "使用以下链接重置您的密码：{link}"
 
diff --git a/l10n/zh_CN/files.po b/l10n/zh_CN/files.po
index 4e2d600c1e..3b55dd6341 100644
--- a/l10n/zh_CN/files.po
+++ b/l10n/zh_CN/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-09-05 02:01+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-06 02:01+0200\n"
+"PO-Revision-Date: 2012-09-06 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"
@@ -58,31 +58,35 @@ msgstr "文件"
 msgid "Delete"
 msgstr "删除"
 
-#: js/filelist.js:141
+#: js/filelist.js:186 js/filelist.js:188
 msgid "already exists"
 msgstr "已经存在"
 
-#: js/filelist.js:141
+#: js/filelist.js:186 js/filelist.js:188
 msgid "replace"
 msgstr "替换"
 
-#: js/filelist.js:141
+#: js/filelist.js:186
+msgid "suggest name"
+msgstr ""
+
+#: js/filelist.js:186 js/filelist.js:188
 msgid "cancel"
 msgstr "取消"
 
-#: js/filelist.js:195
+#: js/filelist.js:235 js/filelist.js:237
 msgid "replaced"
 msgstr "已经替换"
 
-#: js/filelist.js:195
-msgid "with"
-msgstr "随着"
-
-#: js/filelist.js:195 js/filelist.js:246
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
 msgid "undo"
 msgstr "撤销"
 
-#: js/filelist.js:246
+#: js/filelist.js:237
+msgid "with"
+msgstr "随着"
+
+#: js/filelist.js:271
 msgid "deleted"
 msgstr "已经删除"
 
@@ -98,44 +102,44 @@ msgstr "无法上传文件，因为它是一个目录或者大小为 0 字节"
 msgid "Upload Error"
 msgstr "上传错误"
 
-#: js/files.js:236 js/files.js:327 js/files.js:356
+#: js/files.js:236 js/files.js:341 js/files.js:370
 msgid "Pending"
 msgstr "操作等待中"
 
-#: js/files.js:341
+#: js/files.js:355
 msgid "Upload cancelled."
 msgstr "上传已取消"
 
-#: js/files.js:409
+#: js/files.js:423
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr ""
 
-#: js/files.js:480
+#: js/files.js:493
 msgid "Invalid name, '/' is not allowed."
 msgstr "非法的名称，不允许使用‘/’。"
 
-#: js/files.js:726 templates/index.php:55
+#: js/files.js:746 templates/index.php:55
 msgid "Size"
 msgstr "大小"
 
-#: js/files.js:727 templates/index.php:56
+#: js/files.js:747 templates/index.php:56
 msgid "Modified"
 msgstr "修改日期"
 
-#: js/files.js:754
+#: js/files.js:774
 msgid "folder"
 msgstr "文件夹"
 
-#: js/files.js:756
+#: js/files.js:776
 msgid "folders"
 msgstr "文件夹"
 
-#: js/files.js:764
+#: js/files.js:784
 msgid "file"
 msgstr "文件"
 
-#: js/files.js:766
+#: js/files.js:786
 msgid "files"
 msgstr "文件"
 
diff --git a/l10n/zh_TW/core.po b/l10n/zh_TW/core.po
index 7af51044d5..72df7a953c 100644
--- a/l10n/zh_TW/core.po
+++ b/l10n/zh_TW/core.po
@@ -9,15 +9,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 02:01+0200\n"
-"PO-Revision-Date: 2012-08-31 07:35+0000\n"
-"Last-Translator: Ming Yi Wu <mingi.wu@gmail.com>\n"
+"POT-Creation-Date: 2012-09-06 02:02+0200\n"
+"PO-Revision-Date: 2012-09-06 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"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: zh_TW\n"
-"Plural-Forms: nplurals=1; plural=0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ajax/vcategories/add.php:23 ajax/vcategories/delete.php:23
 msgid "Application name not provided."
@@ -31,59 +31,55 @@ 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 "ui-datepicker-group';if(i[1]>1)switch(G){case 0:y+="
-
-#: js/js.js:206 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61
 msgid "Settings"
 msgstr "設定"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "January"
 msgstr "一月"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "February"
 msgstr "二月"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "March"
 msgstr "三月"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "April"
 msgstr "四月"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "May"
 msgstr "五月"
 
-#: js/js.js:591
+#: js/js.js:593
 msgid "June"
 msgstr "六月"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "July"
 msgstr "七月"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "August"
 msgstr "八月"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "September"
 msgstr "九月"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "October"
 msgstr "十月"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "November"
 msgstr "十一月"
 
-#: js/js.js:592
+#: js/js.js:594
 msgid "December"
 msgstr "十二月"
 
@@ -115,7 +111,7 @@ msgstr "錯誤"
 msgid "ownCloud password reset"
 msgstr "ownCloud 密碼重設"
 
-#: lostpassword/templates/email.php:1
+#: lostpassword/templates/email.php:2
 msgid "Use the following link to reset your password: {link}"
 msgstr "請循以下聯結重設你的密碼: （聯結） "
 
diff --git a/l10n/zh_TW/files.po b/l10n/zh_TW/files.po
index 3c6aad93fc..ac4a772abd 100644
--- a/l10n/zh_TW/files.po
+++ b/l10n/zh_TW/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-09-05 02:01+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-06 02:01+0200\n"
+"PO-Revision-Date: 2012-09-06 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"
@@ -58,31 +58,35 @@ msgstr "檔案"
 msgid "Delete"
 msgstr "刪除"
 
-#: js/filelist.js:141
+#: js/filelist.js:186 js/filelist.js:188
 msgid "already exists"
 msgstr "已經存在"
 
-#: js/filelist.js:141
+#: js/filelist.js:186 js/filelist.js:188
 msgid "replace"
 msgstr "取代"
 
-#: js/filelist.js:141
+#: js/filelist.js:186
+msgid "suggest name"
+msgstr ""
+
+#: js/filelist.js:186 js/filelist.js:188
 msgid "cancel"
 msgstr "取消"
 
-#: js/filelist.js:195
+#: js/filelist.js:235 js/filelist.js:237
 msgid "replaced"
 msgstr ""
 
-#: js/filelist.js:195
-msgid "with"
-msgstr ""
-
-#: js/filelist.js:195 js/filelist.js:246
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
 msgid "undo"
 msgstr ""
 
-#: js/filelist.js:246
+#: js/filelist.js:237
+msgid "with"
+msgstr ""
+
+#: js/filelist.js:271
 msgid "deleted"
 msgstr ""
 
@@ -98,44 +102,44 @@ msgstr "無法上傳您的檔案因為它可能是一個目錄或檔案大小為
 msgid "Upload Error"
 msgstr "上傳發生錯誤"
 
-#: js/files.js:236 js/files.js:327 js/files.js:356
+#: js/files.js:236 js/files.js:341 js/files.js:370
 msgid "Pending"
 msgstr ""
 
-#: js/files.js:341
+#: js/files.js:355
 msgid "Upload cancelled."
 msgstr "上傳取消"
 
-#: js/files.js:409
+#: js/files.js:423
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
 msgstr "檔案上傳中. 離開此頁面將會取消上傳."
 
-#: js/files.js:480
+#: js/files.js:493
 msgid "Invalid name, '/' is not allowed."
 msgstr "無效的名稱, '/'是不被允許的"
 
-#: js/files.js:726 templates/index.php:55
+#: js/files.js:746 templates/index.php:55
 msgid "Size"
 msgstr "大小"
 
-#: js/files.js:727 templates/index.php:56
+#: js/files.js:747 templates/index.php:56
 msgid "Modified"
 msgstr "修改"
 
-#: js/files.js:754
+#: js/files.js:774
 msgid "folder"
 msgstr ""
 
-#: js/files.js:756
+#: js/files.js:776
 msgid "folders"
 msgstr ""
 
-#: js/files.js:764
+#: js/files.js:784
 msgid "file"
 msgstr ""
 
-#: js/files.js:766
+#: js/files.js:786
 msgid "files"
 msgstr ""
 
diff --git a/lib/l10n/cs_CZ.php b/lib/l10n/cs_CZ.php
index 933dbe541f..00815f9753 100644
--- a/lib/l10n/cs_CZ.php
+++ b/lib/l10n/cs_CZ.php
@@ -4,14 +4,14 @@
 "Settings" => "Nastavení",
 "Users" => "Uživatelé",
 "Apps" => "Aplikace",
-"Admin" => "Admin",
+"Admin" => "Administrace",
 "ZIP download is turned off." => "Stahování ZIPu je vypnuto.",
-"Files need to be downloaded one by one." => "Soubory je nutno stahovat samostatně.",
+"Files need to be downloaded one by one." => "Soubory musí být stahovány jednotlivě.",
 "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é.",
+"Selected files too large to generate zip file." => "Vybrané soubory jsou příliš velké pro vytvoření zip souboru.",
 "Application is not enabled" => "Aplikace není povolena",
-"Authentication error" => "Chyba autorizace",
-"Token expired. Please reload page." => "Realce expirovala. Obnovte prosím stranu.",
+"Authentication error" => "Chyba ověření",
+"Token expired. Please reload page." => "Token vypršel. Obnovte prosím stránku.",
 "seconds ago" => "před vteřinami",
 "1 minute ago" => "před 1 minutou",
 "%d minutes ago" => "před %d minutami",
@@ -21,5 +21,8 @@
 "last month" => "minulý měsíc",
 "months ago" => "před měsíci",
 "last year" => "loni",
-"years ago" => "před lety"
+"years ago" => "před lety",
+"%s is available. Get <a href=\"%s\">more information</a>" => "%s je dostupná. Získat <a href=\"%s\">více informací</a>",
+"up to date" => "aktuální",
+"updates check is disabled" => "kontrola aktualizací je vypnuta"
 );
diff --git a/settings/l10n/ca.php b/settings/l10n/ca.php
index 76fb2fd7fe..524d6c7925 100644
--- a/settings/l10n/ca.php
+++ b/settings/l10n/ca.php
@@ -10,6 +10,8 @@
 "Unable to delete group" => "No es pot eliminar el grup",
 "Unable to delete user" => "No es pot eliminar l'usuari",
 "Language changed" => "S'ha canviat l'idioma",
+"Unable to add user to group %s" => "No es pot afegir l'usuari al grup %s",
+"Unable to remove user from group %s" => "No es pot eliminar l'usuari del grup %s",
 "Error" => "Error",
 "Disable" => "Desactiva",
 "Enable" => "Activa",
@@ -36,6 +38,7 @@
 "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",
+"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-propietat de <span class=\"author\"></span>",
 "Documentation" => "Documentació",
 "Managing Big Files" => "Gestió de fitxers grans",
 "Ask a question" => "Feu una pregunta",
diff --git a/settings/l10n/cs_CZ.php b/settings/l10n/cs_CZ.php
index e0be2117b8..a68f10269f 100644
--- a/settings/l10n/cs_CZ.php
+++ b/settings/l10n/cs_CZ.php
@@ -1,28 +1,46 @@
 <?php $TRANSLATIONS = array(
-"Unable to load list from App Store" => "Nepodařílo se stáhnout seznam z App Store",
-"Authentication error" => "Chyba autorizace",
+"Unable to load list from App Store" => "Nelze načíst seznam z App Store",
+"Authentication error" => "Chyba ověření",
+"Group already exists" => "Skupina již existuje",
+"Unable to add group" => "Nelze přidat skupinu",
 "Email saved" => "E-mail uložen",
 "Invalid email" => "Neplatný e-mail",
-"OpenID Changed" => "OpenID změněn",
-"Invalid request" => "Chybný dotaz",
+"OpenID Changed" => "OpenID změněno",
+"Invalid request" => "Neplatný požadavek",
+"Unable to delete group" => "Nelze smazat skupinu",
+"Unable to delete user" => "Nelze smazat uživatele",
 "Language changed" => "Jazyk byl změněn",
+"Unable to add user to group %s" => "Nelze přidat uživatele do skupiny %s",
+"Unable to remove user from group %s" => "Nelze odstranit uživatele ze skupiny %s",
 "Error" => "Chyba",
-"Disable" => "Vypnout",
-"Enable" => "Zapnout",
+"Disable" => "Zakázat",
+"Enable" => "Povolit",
 "Saving..." => "Ukládám...",
 "__language_name__" => "Česky",
-"Security Warning" => "Bezpečnostní upozornění",
+"Security Warning" => "Bezpečnostní varování",
+"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." => "Váš adresář dat a soubory jsou pravděpodobně přístupné z internetu. Soubor .htacces, který ownCloud poskytuje nefunguje. Doporučujeme Vám abyste nastavili Váš webový server tak, aby nebylo možno přistupovat do adresáře s daty, nebo přesunuli adresář dat mimo kořenovou složku dokumentů webového serveru.",
 "Cron" => "Cron",
-"execute one task with each page loaded" => "spustit jednu úlohu s každou nataženou stranou",
+"execute one task with each page loaded" => "spustit jednu úlohu s každou načtenou stránkou",
 "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",
+"use systems cron service" => "použít systémovou službu cron",
+"Share API" => "API sdílení",
+"Enable Share API" => "Povolit API sdílení",
+"Allow apps to use the Share API" => "Povolit aplikacím používat API sdílení",
+"Allow links" => "Povolit odkazy",
+"Allow users to share items to the public with links" => "Povolit uživatelům sdílet položky s veřejností pomocí odkazů",
+"Allow resharing" => "Povolit znovu-sdílení",
+"Allow users to share items shared with them again" => "Povolit uživatelům znovu sdílet položky, které jsou pro ně sdíleny",
+"Allow users to share with anyone" => "Povolit uživatelům sdílet s kýmkoliv",
+"Allow users to only share with users in their groups" => "Povolit uživatelům sdílet pouze s uživateli v jejich skupinách",
+"Log" => "Záznam",
 "More" => "Více",
-"Add your App" => "Přidat vaší aplikaci",
+"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/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>." => "Vyvinuto <a href=\"http://ownCloud.org/contact\" target=\"_blank\">komunitou ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">zdrojový kód</a> je licencován pod <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
+"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",
+"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licencováno <span class=\"author\"></span>",
 "Documentation" => "Dokumentace",
-"Managing Big Files" => "Spravování velkých souborů",
+"Managing Big Files" => "Správa velkých souborů",
 "Ask a question" => "Zeptat se",
 "Problems connecting to help database." => "Problémy s připojením k databázi s nápovědou.",
 "Go there manually." => "Přejít ručně.",
@@ -32,24 +50,24 @@
 "Desktop and Mobile Syncing Clients" => "Klienti pro synchronizaci",
 "Download" => "Stáhnout",
 "Your password got changed" => "Vaše heslo bylo změněno",
-"Unable to change your password" => "Vaše heslo se nepodařilo změnit",
-"Current password" => "Aktuální heslo",
+"Unable to change your password" => "Vaše heslo nelze změnit",
+"Current password" => "Současné heslo",
 "New password" => "Nové heslo",
 "show" => "zobrazit",
 "Change password" => "Změnit heslo",
-"Email" => "Email",
-"Your email address" => "Vaše emailová adresa",
-"Fill in an email address to enable password recovery" => "Pro povolení změny hesla vyplňte email adresu",
+"Email" => "E-mail",
+"Your email address" => "Vaše e-mailová adresa",
+"Fill in an email address to enable password recovery" => "Pro povolení změny hesla vyplňte adresu e-mailu",
 "Language" => "Jazyk",
-"Help translate" => "Pomoci překládat",
+"Help translate" => "Pomoci s překladem",
 "use this address to connect to your ownCloud in your file manager" => "tuto adresu použijte pro připojení k ownCloud ve Vašem správci souborů",
 "Name" => "Jméno",
 "Password" => "Heslo",
 "Groups" => "Skupiny",
 "Create" => "Vytvořit",
 "Default Quota" => "Výchozí kvóta",
-"Other" => "Jiné",
-"Group Admin" => "Administrace skupiny",
+"Other" => "Jiná",
+"Group Admin" => "Správa skupiny",
 "Quota" => "Kvóta",
-"Delete" => "Vymazat"
+"Delete" => "Smazat"
 );
diff --git a/settings/l10n/de.php b/settings/l10n/de.php
index d955b75d0c..4f3a12934e 100644
--- a/settings/l10n/de.php
+++ b/settings/l10n/de.php
@@ -10,6 +10,8 @@
 "Unable to delete group" => "Gruppe konnte nicht gelöscht werden",
 "Unable to delete user" => "Benutzer konnte nicht gelöscht werden",
 "Language changed" => "Sprache geändert",
+"Unable to add user to group %s" => "Der Benutzer konnte nicht zur Gruppe %s hinzugefügt werden",
+"Unable to remove user from group %s" => "Der Benutzer konnte nicht aus der Gruppe %s entfernt werden",
 "Error" => "Fehler",
 "Disable" => "Deaktivieren",
 "Enable" => "Aktivieren",
@@ -36,6 +38,7 @@
 "Add your App" => "Fügen Sie Ihre App hinzu",
 "Select an App" => "Wählen Sie eine Anwendung aus",
 "See application page at apps.owncloud.com" => "Weitere Anwendungen finden Sie auf apps.owncloud.com",
+"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-lizenziert von <span class=\"author\"></span>",
 "Documentation" => "Dokumentation",
 "Managing Big Files" => "Große Dateien verwalten",
 "Ask a question" => "Stellen Sie eine Frage",
diff --git a/settings/l10n/es.php b/settings/l10n/es.php
index 3ab7cb32ba..2f2a06ce05 100644
--- a/settings/l10n/es.php
+++ b/settings/l10n/es.php
@@ -10,6 +10,8 @@
 "Unable to delete group" => "No se pudo eliminar el grupo",
 "Unable to delete user" => "No se pudo eliminar el usuario",
 "Language changed" => "Idioma cambiado",
+"Unable to add user to group %s" => "Imposible añadir el usuario al grupo %s",
+"Unable to remove user from group %s" => "Imposible eliminar al usuario del grupo %s",
 "Error" => "Error",
 "Disable" => "Desactivar",
 "Enable" => "Activar",
@@ -36,6 +38,7 @@
 "Add your App" => "Añade tu aplicación",
 "Select an App" => "Seleccionar una aplicación",
 "See application page at apps.owncloud.com" => "Echa un vistazo a la web de aplicaciones apps.owncloud.com",
+"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licenciado por <span class=\"author\"></span>",
 "Documentation" => "Documentación",
 "Managing Big Files" => "Administra archivos grandes",
 "Ask a question" => "Hacer una pregunta",
diff --git a/settings/l10n/fi_FI.php b/settings/l10n/fi_FI.php
index 37a80aaeea..54647c2961 100644
--- a/settings/l10n/fi_FI.php
+++ b/settings/l10n/fi_FI.php
@@ -10,6 +10,8 @@
 "Unable to delete group" => "Ryhmän poisto epäonnistui",
 "Unable to delete user" => "Käyttäjän poisto epäonnistui",
 "Language changed" => "Kieli on vaihdettu",
+"Unable to add user to group %s" => "Käyttäjän tai ryhmän %s lisääminen ei onnistu",
+"Unable to remove user from group %s" => "Käyttäjän poistaminen ryhmästä %s ei onnistu",
 "Error" => "Virhe",
 "Disable" => "Poista käytöstä",
 "Enable" => "Käytä",
@@ -36,6 +38,7 @@
 "Add your App" => "Lisää ohjelmasi",
 "Select an App" => "Valitse ohjelma",
 "See application page at apps.owncloud.com" => "Katso sovellussivu osoitteessa apps.owncloud.com",
+"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-lisensoija <span class=\"author\"></span>",
 "Documentation" => "Dokumentaatio",
 "Managing Big Files" => "Suurten tiedostojen hallinta",
 "Ask a question" => "Kysy jotain",
diff --git a/settings/l10n/fr.php b/settings/l10n/fr.php
index 890d1e39f1..7baa923bfc 100644
--- a/settings/l10n/fr.php
+++ b/settings/l10n/fr.php
@@ -10,6 +10,8 @@
 "Unable to delete group" => "Impossible de supprimer le groupe",
 "Unable to delete user" => "Impossible de supprimer l'utilisateur",
 "Language changed" => "Langue changée",
+"Unable to add user to group %s" => "Impossible d'ajouter l'utilisateur au groupe %s",
+"Unable to remove user from group %s" => "Impossible de supprimer l'utilisateur du groupe %s",
 "Error" => "Erreur",
 "Disable" => "Désactiver",
 "Enable" => "Activer",
@@ -36,6 +38,7 @@
 "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",
+"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-sous licence, par <span class=\"author\"></span>",
 "Documentation" => "Documentation",
 "Managing Big Files" => "Gérer les gros fichiers",
 "Ask a question" => "Poser une question",
diff --git a/settings/l10n/it.php b/settings/l10n/it.php
index 8c8ec63f4c..695ed31eee 100644
--- a/settings/l10n/it.php
+++ b/settings/l10n/it.php
@@ -10,6 +10,8 @@
 "Unable to delete group" => "Impossibile eliminare il gruppo",
 "Unable to delete user" => "Impossibile eliminare l'utente",
 "Language changed" => "Lingua modificata",
+"Unable to add user to group %s" => "Impossibile aggiungere l'utente al gruppo %s",
+"Unable to remove user from group %s" => "Impossibile rimuovere l'utente dal gruppo %s",
 "Error" => "Errore",
 "Disable" => "Disabilita",
 "Enable" => "Abilita",
@@ -36,6 +38,7 @@
 "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",
+"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licenziato da <span class=\"author\"></span>",
 "Documentation" => "Documentazione",
 "Managing Big Files" => "Gestione file grandi",
 "Ask a question" => "Fai una domanda",
diff --git a/settings/l10n/ja_JP.php b/settings/l10n/ja_JP.php
index dcf0568cba..fe1eed1980 100644
--- a/settings/l10n/ja_JP.php
+++ b/settings/l10n/ja_JP.php
@@ -1,11 +1,17 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "アプリストアからリストをロードできません",
 "Authentication error" => "認証エラー",
+"Group already exists" => "グループは既に存在しています",
+"Unable to add group" => "グループを追加できません",
 "Email saved" => "メールアドレスを保存しました",
 "Invalid email" => "無効なメールアドレス",
 "OpenID Changed" => "OpenIDが変更されました",
 "Invalid request" => "無効なリクエストです",
+"Unable to delete group" => "グループを削除できません",
+"Unable to delete user" => "ユーザを削除できません",
 "Language changed" => "言語が変更されました",
+"Unable to add user to group %s" => "ユーザをグループ %s に追加できません",
+"Unable to remove user from group %s" => "ユーザをグループ %s から削除できません",
 "Error" => "エラー",
 "Disable" => "無効",
 "Enable" => "有効",
@@ -32,6 +38,7 @@
 "Add your App" => "アプリを追加",
 "Select an App" => "アプリを選択してください",
 "See application page at apps.owncloud.com" => "apps.owncloud.com でアプリケーションのページを見てください",
+"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-ライセンス: <span class=\"author\"></span>",
 "Documentation" => "ドキュメント",
 "Managing Big Files" => "大きなファイルを扱うには",
 "Ask a question" => "質問してください",
diff --git a/settings/l10n/nl.php b/settings/l10n/nl.php
index ffa00dabaa..5957f6282f 100644
--- a/settings/l10n/nl.php
+++ b/settings/l10n/nl.php
@@ -1,11 +1,17 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Kan de lijst niet van de App store laden",
 "Authentication error" => "Authenticatie fout",
+"Group already exists" => "Groep bestaat al",
+"Unable to add group" => "Niet in staat om groep toe te voegen",
 "Email saved" => "E-mail bewaard",
 "Invalid email" => "Ongeldige e-mail",
 "OpenID Changed" => "OpenID is aangepast",
 "Invalid request" => "Ongeldig verzoek",
+"Unable to delete group" => "Niet in staat om groep te verwijderen",
+"Unable to delete user" => "Niet in staat om gebruiker te verwijderen",
 "Language changed" => "Taal aangepast",
+"Unable to add user to group %s" => "Niet in staat om gebruiker toe te voegen aan groep %s",
+"Unable to remove user from group %s" => "Niet in staat om gebruiker te verwijderen uit groep %s",
 "Error" => "Fout",
 "Disable" => "Uitschakelen",
 "Enable" => "Inschakelen",
@@ -27,9 +33,11 @@
 "Allow users to only share with users in their groups" => "Sta gebruikers toe om alleen met gebruikers in hun groepen te delen",
 "Log" => "Log",
 "More" => "Meer",
+"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/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>." => "Ontwikkeld door de <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud gemeenschap</a>, de <a href=\"https://github.com/owncloud\" target=\"_blank\">bron code</a> is gelicenseerd onder de <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "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",
+"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-Gelicenseerd door <span class=\"author\"></span>",
 "Documentation" => "Documentatie",
 "Managing Big Files" => "Onderhoud van grote bestanden",
 "Ask a question" => "Stel een vraag",
diff --git a/settings/l10n/pl.php b/settings/l10n/pl.php
index ee50d0fffa..851099ef6b 100644
--- a/settings/l10n/pl.php
+++ b/settings/l10n/pl.php
@@ -10,12 +10,15 @@
 "Unable to delete group" => "Nie można usunąć grupy",
 "Unable to delete user" => "Nie można usunąć użytkownika",
 "Language changed" => "Język zmieniony",
+"Unable to add user to group %s" => "Nie można dodać użytkownika do grupy %s",
+"Unable to remove user from group %s" => "Nie można usunąć użytkownika z grupy %s",
 "Error" => "Błąd",
 "Disable" => "Wyłączone",
 "Enable" => "Włączone",
 "Saving..." => "Zapisywanie...",
 "__language_name__" => "Polski",
 "Security Warning" => "Ostrzeżenia bezpieczeństwa",
+"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." => "Twój katalog danych i pliki są prawdopodobnie dostępne z Internetu. Plik .htaccess, który dostarcza ownCloud nie działa. Sugerujemy, aby skonfigurować serwer WWW w taki sposób, aby katalog danych nie był dostępny lub przenieść katalog danych poza główny katalog serwera WWW.",
 "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",
@@ -24,12 +27,18 @@
 "Enable Share API" => "Włącz udostępniane API",
 "Allow apps to use the Share API" => "Zezwalaj aplikacjom na używanie API",
 "Allow links" => "Zezwalaj na łącza",
+"Allow users to share items to the public with links" => "Zezwalaj użytkownikom na puliczne współdzielenie elementów za pomocą linków",
 "Allow resharing" => "Zezwól na ponowne udostępnianie",
+"Allow users to share items shared with them again" => "Zezwalaj użytkownikom na ponowne współdzielenie elementów już z nimi współdzilonych",
+"Allow users to share with anyone" => "Zezwalaj użytkownikom na współdzielenie z kimkolwiek",
+"Allow users to only share with users in their groups" => "Zezwalaj użytkownikom współdzielić z użytkownikami ze swoich grup",
 "Log" => "Log",
 "More" => "Więcej",
+"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/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>." => "Stwirzone przez <a href=\"http://ownCloud.org/contact\" target=\"_blank\"> społeczność ownCloud</a>, the <a href=\"https://github.com/owncloud\" target=\"_blank\">kod źródłowy</a> na licencji <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "Add your App" => "Dodaj aplikacje",
 "Select an App" => "Zaznacz aplikacje",
 "See application page at apps.owncloud.com" => "Zobacz stronę aplikacji na apps.owncloud.com",
+"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licencjonowane przez <span class=\"author\"></span>",
 "Documentation" => "Dokumentacja",
 "Managing Big Files" => "Zarządzanie dużymi plikami",
 "Ask a question" => "Zadaj pytanie",
diff --git a/settings/l10n/sl.php b/settings/l10n/sl.php
index fc49d940b4..7b5c6bee3c 100644
--- a/settings/l10n/sl.php
+++ b/settings/l10n/sl.php
@@ -10,6 +10,8 @@
 "Unable to delete group" => "Ni mogoče izbrisati skupine",
 "Unable to delete user" => "Ni mogoče izbrisati uporabnika",
 "Language changed" => "Jezik je bil spremenjen",
+"Unable to add user to group %s" => "Uporabnika ni mogoče dodati k skupini %s",
+"Unable to remove user from group %s" => "Uporabnika ni mogoče odstraniti iz skupine %s",
 "Error" => "Napaka",
 "Disable" => "Onemogoči",
 "Enable" => "Omogoči",
@@ -36,6 +38,7 @@
 "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",
+"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licencirana s strani <span class=\"author\"></span>",
 "Documentation" => "Dokumentacija",
 "Managing Big Files" => "Upravljanje velikih datotek",
 "Ask a question" => "Postavi vprašanje",
diff --git a/settings/l10n/sv.php b/settings/l10n/sv.php
index 9beb500194..1a18e9670d 100644
--- a/settings/l10n/sv.php
+++ b/settings/l10n/sv.php
@@ -1,11 +1,17 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Kan inte ladda listan från App Store",
 "Authentication error" => "Autentiseringsfel",
+"Group already exists" => "Gruppen finns redan",
+"Unable to add group" => "Kan inte lägga till grupp",
 "Email saved" => "E-post sparad",
 "Invalid email" => "Ogiltig e-post",
 "OpenID Changed" => "OpenID ändrat",
 "Invalid request" => "Ogiltig begäran",
+"Unable to delete group" => "Kan inte radera grupp",
+"Unable to delete user" => "Kan inte radera användare",
 "Language changed" => "Språk ändrades",
+"Unable to add user to group %s" => "Kan inte lägga till användare i gruppen %s",
+"Unable to remove user from group %s" => "Kan inte radera användare från gruppen %s",
 "Error" => "Fel",
 "Disable" => "Deaktivera",
 "Enable" => "Aktivera",
@@ -32,6 +38,7 @@
 "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",
+"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-licensierad av <span class=\"author\"></span>",
 "Documentation" => "Dokumentation",
 "Managing Big Files" => "Hantering av stora filer",
 "Ask a question" => "Ställ en fråga",
diff --git a/settings/l10n/th_TH.php b/settings/l10n/th_TH.php
index 7166c26a1c..d775af7671 100644
--- a/settings/l10n/th_TH.php
+++ b/settings/l10n/th_TH.php
@@ -1,11 +1,17 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "ไม่สามารถโหลดรายการจาก App Store ได้",
 "Authentication error" => "เกิดข้อผิดพลาดเกี่ยวกับสิทธิ์การเข้าใช้งาน",
+"Group already exists" => "มีกลุ่มดังกล่าวอยู่ในระบบอยู่แล้ว",
+"Unable to add group" => "ไม่สามารถเพิ่มกลุ่มได้",
 "Email saved" => "อีเมลถูกบันทึกแล้ว",
 "Invalid email" => "อีเมลไม่ถูกต้อง",
 "OpenID Changed" => "เปลี่ยนชื่อบัญชี OpenID แล้ว",
 "Invalid request" => "คำร้องขอไม่ถูกต้อง",
+"Unable to delete group" => "ไม่สามารถลบกลุ่มได้",
+"Unable to delete user" => "ไม่สามารถลบผู้ใช้งานได้",
 "Language changed" => "เปลี่ยนภาษาเรียบร้อยแล้ว",
+"Unable to add user to group %s" => "ไม่สามารถเพิ่มผู้ใช้งานเข้าไปที่กลุ่ม %s ได้",
+"Unable to remove user from group %s" => "ไม่สามารถลบผู้ใช้งานออกจากกลุ่ม %s ได้",
 "Error" => "ข้อผิดพลาด",
 "Disable" => "ปิดใช้งาน",
 "Enable" => "เปิดใช้งาน",
@@ -32,6 +38,7 @@
 "Add your App" => "เพิ่มแอปของคุณ",
 "Select an App" => "เลือก App",
 "See application page at apps.owncloud.com" => "ดูหน้าแอพพลิเคชั่นที่ apps.owncloud.com",
+"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-ลิขสิทธิ์การใช้งานโดย <span class=\"author\"></span>",
 "Documentation" => "เอกสารคู่มือการใช้งาน",
 "Managing Big Files" => "การจัดการไฟล์ขนาดใหญ่",
 "Ask a question" => "สอบถามข้อมูล",

From a5211e31bc170f44edce3c80df831e7705e93396 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Wed, 5 Sep 2012 21:46:59 -0400
Subject: [PATCH 1135/1224] Add permissions to new files/folders, bug fix for
 oc-1649

---
 apps/files/index.php           | 12 ++++++++++++
 apps/files/js/filelist.js      |  4 ++--
 apps/files/templates/index.php |  1 +
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/apps/files/index.php b/apps/files/index.php
index 6d53527025..ba785f7d6b 100644
--- a/apps/files/index.php
+++ b/apps/files/index.php
@@ -89,11 +89,23 @@ $freeSpace=OC_Filesystem::free_space('/');
 $freeSpace=max($freeSpace,0);
 $maxUploadFilesize = min($maxUploadFilesize ,$freeSpace);
 
+$permissions = OCP\Share::PERMISSION_READ;
+if (OC_Filesystem::isUpdatable($dir.'/')) {
+	$permissions |= OCP\Share::PERMISSION_UPDATE;
+}
+if (OC_Filesystem::isDeletable($dir.'/')) {
+	$permissions |= OCP\Share::PERMISSION_DELETE;
+}
+if (OC_Filesystem::isSharable($dir.'/')) {
+	$permissions |= OCP\Share::PERMISSION_SHARE;
+}
+
 $tmpl = new OCP\Template( 'files', 'index', 'user' );
 $tmpl->assign( 'fileList', $list->fetchPage(), false );
 $tmpl->assign( 'breadcrumb', $breadcrumbNav->fetchPage(), false );
 $tmpl->assign( 'dir', OC_Filesystem::normalizePath($dir));
 $tmpl->assign( 'isCreatable', OC_Filesystem::isCreatable($dir.'/'));
+$tmpl->assign('permissions', $permissions);
 $tmpl->assign( 'files', $files );
 $tmpl->assign( 'uploadMaxFilesize', $maxUploadFilesize);
 $tmpl->assign( 'uploadMaxHumanFilesize', OCP\Util::humanFileSize($maxUploadFilesize));
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index ce215cb843..a9e48f2405 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -5,7 +5,7 @@ var FileList={
 	},
 	addFile:function(name,size,lastModified,loading,hidden){
 		var img=(loading)?OC.imagePath('core', 'loading.gif'):OC.imagePath('core', 'filetypes/file.png');
-		var html='<tr data-type="file" data-size="'+size+'">';
+		var html='<tr data-type="file" data-size="'+size+'" data-permissions="'+$('#permissions').val()+'">';
 		if(name.indexOf('.')!=-1){
 			var basename=name.substr(0,name.lastIndexOf('.'));
 			var extension=name.substr(name.lastIndexOf('.'));
@@ -41,7 +41,7 @@ var FileList={
 		}
 	},
 	addDir:function(name,size,lastModified,hidden){
-		html = $('<tr></tr>').attr({ "data-type": "dir", "data-size": size, "data-file": name});
+		html = $('<tr></tr>').attr({ "data-type": "dir", "data-size": size, "data-file": name, "data-permissions": $('#permissions').val()});
 		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": OC.linkTo('files', 'index.php')+"&dir="+ encodeURIComponent($('#dir').val()+'/'+name).replace(/%2F/g, '/') });
diff --git a/apps/files/templates/index.php b/apps/files/templates/index.php
index bcf683ae4a..a874529330 100644
--- a/apps/files/templates/index.php
+++ b/apps/files/templates/index.php
@@ -32,6 +32,7 @@
 	<?php else:?>
 		<input type="hidden" name="dir" value="<?php echo $_['dir'] ?>" id="dir">
 	<?php endif;?>
+	<input type="hidden" name="permissions" value="<?php echo $_['permissions']; ?>" id="permissions">
 </div>
 <div id='notification'></div>
 

From 837eb1871d9b99fce32a418dd13284edfc41a398 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Wed, 5 Sep 2012 22:13:50 -0400
Subject: [PATCH 1136/1224] Don't delete the file anymore to replace it in the
 UI, just overwrite it

---
 apps/files/js/filelist.js | 27 +++++++++++----------------
 lib/filecache.php         |  4 ++++
 lib/files.php             |  2 +-
 3 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index a9e48f2405..b777785f4d 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -240,22 +240,17 @@ var FileList={
 	},
 	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') {
-						$('tr').filterAttr('data-replace', 'true').removeAttr('data-replace');
-					} else {
-						OC.dialogs.alert(result.data.message, 'Error moving file');
-					}
-					FileList.replaceCanceled = true;
-					FileList.replaceOldName = null;
-					FileList.replaceNewName = null;
-					FileList.lastAction = null;
-				}});
-			}, true);
+			$.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') {
+					$('tr').filterAttr('data-replace', 'true').removeAttr('data-replace');
+				} else {
+					OC.dialogs.alert(result.data.message, 'Error moving file');
+				}
+				FileList.replaceCanceled = true;
+				FileList.replaceOldName = null;
+				FileList.replaceNewName = null;
+				FileList.lastAction = null;
+			}});
 		}
 	},
 	do_delete:function(files){
diff --git a/lib/filecache.php b/lib/filecache.php
index 364b908bcf..811e8a3e6a 100644
--- a/lib/filecache.php
+++ b/lib/filecache.php
@@ -155,6 +155,10 @@ class OC_FileCache{
 		if($root===false){
 			$root=OC_Filesystem::getRoot();
 		}
+		// If replacing an existing file, delete the file
+		if (self::inCache($newPath, $root)) {
+			self::delete($newPath, $root);
+		}
 		$oldPath=$root.$oldPath;
 		$newPath=$root.$newPath;
 		$newParent=self::getParentId($newPath);
diff --git a/lib/files.php b/lib/files.php
index b8af5e04b7..00cbc63aba 100644
--- a/lib/files.php
+++ b/lib/files.php
@@ -202,7 +202,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($targetDir.'/'.$target)){
+		if(OC_User::isLoggedIn() && ($sourceDir != '' || $source != 'Shared')){
 			$targetFile=self::normalizePath($targetDir.'/'.$target);
 			$sourceFile=self::normalizePath($sourceDir.'/'.$source);
 			return OC_Filesystem::rename($sourceFile,$targetFile);

From 90462b2dcffd2ced85fb5c00557edef5ebcb3d4b Mon Sep 17 00:00:00 2001
From: Jan-Christoph Borchardt <hey@jancborchardt.net>
Date: Tue, 4 Sep 2012 19:24:40 -0700
Subject: [PATCH 1137/1224] make icons look good on bright and dark backgrounds

---
 core/img/icon-error.png | Bin 1344 -> 1571 bytes
 core/img/icon-error.svg |  24 ++++++++++++------------
 core/img/icon-sync.png  | Bin 1271 -> 1544 bytes
 core/img/icon-sync.svg  |  20 ++++++++++----------
 core/img/icon.png       | Bin 1109 -> 1305 bytes
 core/img/icon.svg       |  22 +++++++++++-----------
 6 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/core/img/icon-error.png b/core/img/icon-error.png
index 1ce0be0fb2ebbb2778f59be6a57f111d55e36999..edeaceb16980c6af896cfb1b5f46447f3e91b5d1 100644
GIT binary patch
delta 1480
zcmV;(1vmP@3Zo2=ZGQ!zNkl<ZScUDDU2I&%703VQ%-p+o*Xv!pS+6&CvIb?1m)MEw
zeAto`<Tk28L&6rQ$ODP`gak-DQ&qr29}q2l3J_IoAD~5YXyw+iogg(qM2Iy=DC7e>
zj!hJkIOQW*lKpbLANS5oA7Wb$kkGV3dC5pey64_AXMQ^Wdw*tzj4`;KgKz8VcL44H
z0FeL7q`^&_V$yY6J<B@($mr;${|A6>r45I=yH^UWUogz;iHMCc+8A>bKHqQBnameI
z2*BIx*0l=enhO+Q%m7(df`wR=PAjF2>rMwlp`AZIa-?#r05_FjWbNADf_baf+9l>U
z$g)}qASksM!+!u9DOb&2xv~?$UvCxQh7}l2rP_txKfqE784OOVYV|AQy1h3{B;^sW
zSe#PE2+Np*51u~#>3;)o!wNX9t#_G1A?J%mCjzn9@#6IKTDNko!fe|`D;z#!H#Gbk
z0IIoMv#HfId0sD7tE-jgJwDRW@%x8Po%;Lt0o<?+SAX1h-<NhUIB|7mW^MMv51$A`
zqvJ*?)U8-?*p5a&sAjWGg|V@1g|V@1wM&<lgE{ZN`|hL63}IPyY|O8QQ>pgv1Ncq}
z4keSZ8t@ibRwE0+1|Sg#><hKEAvZSGYihL?5<(C&0f5ok7^M`1xX{?s^WNo;KKi8r
zn1DC7jen27d^3RWl%PuVYbj+DhzMGP07%DCSB@R)Y3%JCs^xO6#mUK^FZmfMyn6LP
zyP@Iy*Q299i>zPYUn`X&x>6|&ClVW~q0r=G<Kwe81sF*rHfpUmlhz+gzyBxDniivk
zxQbd$u;;DHA3GM@di?mS6VE+2bz%ShrvYH)!+#I|VfBkI9y-+3^*AY&ES)*?zMIc?
z8`u3Q6B(ya@J3dy93ZV<-SPS7bKe3Oj>n&8A$}o+5LP(sdF8UbwAJizc+$(~Q!s|z
z%a?Z_XlfeWaq;3m!#zFc0iY$F{`f#sQwRBcyV<r`<#Jsz5XdX7qYwfBe7aWKrH#1<
zM1N0XiS9fcjXo-++$k)}$IOx}tAPL)o`(fvDL>Pd%DwPBFtZKjmj>f;rzM@vw4~FS
z!Fb#O^GnQZ!}DNVx7`W^&Rmy+S+bOy55{6!msWr+$9asHCA0>#hAI>~tor)X3qCOy
zgwJ=Dh}?yDmg6|FWKsff0l2YbQd*AVEPu`+a#g8B3;u#Jz#<Un1JR<q46Tz(NmaSr
zA?oT*u@L!CXXij&BJpl{W~S8&2B+b9FiN2%o!+}ClgSR&*T)9y>tmZTnQTisz1JuO
zcpj`^a9Wj0ZA<emR)VN`I2``ta47WhJCR6&h2Nk3CS`eY@{z_ZTmDo!d9uCq$$uw1
zynOyqD;z!ntr1G4hC27`89ERMY_NcR7O?L?Ah4lx&z_-BDm4VHVFiO@s#0nFW(A-%
z>`3H-W!pazw!N(aJi|_N^C*<Ub;j&u4<D{m<#GoJVG)sCK6h?~FB&~c)#~_&<Loxf
zdxg&z7d~IyFz+34oZVEdj{Bm~qknVf&ZVG~{8nCLJkt7-(K^UPLI|;uJ70hOFESLG
zTpCE%dOvOj0$(opUa`0(+Sk`#oSNzqQa&kd+kw^utx4LpBcyz?I5pK3?d$8;mC72@
z`ufGSHla0Z24>Hm-M;WGm`r{ke)q~NrBzQob>i~qXjRY65fRM=+uGh+c7Ol<|B7tf
zc(O7x6E<3#W!>HT*Y)=gv_1RmM0t8Tt7d1b+I5L7tKeV0{6y0O4-9S2Wd7E)efw#<
zzW%e~#6;Lss}77&b|f;H*tP4=>)w3xA5dzhcJU&X_4dBq{@QDAE!~P60fguGh9ZC*
z00IyP-~h<Z8|LHg0uY$@=RpAE0Tkwa2S77`I$S$%t^)W9z$^eifav^l{+4b;Kg780
im(n``cK~iXz<&U8OtY>ut=LEa0000<MNUMnLSTa89^haA

delta 1251
zcmV<91RVRL48RJIZGQy4Nkl<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
N002ovPDHLkV1nxEY?lB4

diff --git a/core/img/icon-error.svg b/core/img/icon-error.svg
index 6392d819ad..bba639bfd7 100644
--- a/core/img/icon-error.svg
+++ b/core/img/icon-error.svg
@@ -19,9 +19,9 @@
    viewBox="0 0 32 31.999997"
    enable-background="new 0 0 595.275 311.111"
    xml:space="preserve"
-   inkscape:version="0.48.2 r9819"
-   sodipodi:docname="icon-error.svg"
-   inkscape:export-filename="/home/user/owncloud/core/img/icon-error.png"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="icon-error-light.svg"
+   inkscape:export-filename="/home/user/owncloud/core/img/icon-error-light.png"
    inkscape:export-xdpi="89.826416"
    inkscape:export-ydpi="89.826416"><metadata
    id="metadata327"><rdf:RDF><cc:Work
@@ -245,11 +245,11 @@
    id="SVGID_9_">
 		<stop
    id="stop317"
-   style="stop-color:#BED5E1"
+   style="stop-color:#b23636;stop-opacity:1;"
    offset="0" />
 		<stop
    id="stop319"
-   style="stop-color:#567B8F"
+   style="stop-color:#b20000;stop-opacity:1;"
    offset="1" />
 	</linearGradient>
 	
@@ -289,7 +289,7 @@
    x2="-2.4040222"
    y2="18.967093" /><linearGradient
    inkscape:collect="always"
-   xlink:href="#linearGradient3587-6-5-26"
+   xlink:href="#SVGID_9_"
    id="linearGradient3956"
    gradientUnits="userSpaceOnUse"
    gradientTransform="matrix(0.25,0,0,0.25,0,0.500024)"
@@ -306,14 +306,14 @@
    inkscape:pageopacity="0"
    inkscape:pageshadow="2"
    inkscape:window-width="1280"
-   inkscape:window-height="774"
+   inkscape:window-height="800"
    id="namedview323"
    showgrid="true"
-   inkscape:zoom="2.8284271"
-   inkscape:cx="-37.832842"
-   inkscape:cy="0.28559212"
+   inkscape:zoom="5.6568542"
+   inkscape:cx="20.718961"
+   inkscape:cy="-0.99657908"
    inkscape:window-x="0"
-   inkscape:window-y="26"
+   inkscape:window-y="-31"
    inkscape:window-maximized="1"
    inkscape:current-layer="Layer_1"
    units="px"
@@ -796,7 +796,7 @@
    d="M 14.5 7.6875 C 12.118202 7.6875 10.1875 9.6181999 10.1875 12 C 10.1875 12.98178 10.511318 13.90142 11.0625 14.625 C 12.258208 13.24105 14.029595 12.34375 16 12.34375 C 16.964013 12.34375 17.863805 12.56114 18.6875 12.9375 C 18.75419 12.6359 18.78125 12.32193 18.78125 12 C 18.78125 9.6181999 16.8818 7.6875 14.5 7.6875 z M 8.875 9.6875 C 7.634625 9.6875 6.625 10.69712 6.625 11.9375 C 6.625 12.3391 6.72279 12.70624 6.90625 13.03125 C 7.65474 12.60902 8.5183475 12.375 9.4375 12.375 C 9.526205 12.375 9.63115 12.371 9.71875 12.375 C 9.70882 12.2497 9.6875 12.12826 9.6875 12 C 9.6875 11.30913 9.83008 10.65627 10.09375 10.0625 C 9.7387425 9.8244499 9.3358175 9.6875 8.875 9.6875 z M 19.21875 11.25 C 19.25778 11.49606 19.28125 11.74306 19.28125 12 C 19.28125 12.39985 19.248935 12.78521 19.15625 13.15625 C 20.2429 13.75761 21.12418 14.65908 21.71875 15.75 C 22.335455 15.42894 23.01983 15.23643 23.75 15.1875 C 23.56182 12.98063 21.755825 11.25 19.5 11.25 C 19.40836 11.25 19.30897 11.2444 19.21875 11.25 z M 16 12.84375 C 12.66715 12.84375 9.96875 15.54192 9.96875 18.875 C 9.96875 22.20772 12.667013 24.90625 16 24.90625 C 19.33299 24.90625 22.03125 22.20771 22.03125 18.875 C 22.03125 15.54193 19.332853 12.84375 16 12.84375 z M 9.4375 12.875 C 6.85184 12.875 4.78125 14.94559 4.78125 17.53125 C 4.78125 19.05338 5.501155 20.42736 6.625 21.28125 C 7.09879 20.36744 8.0570875 19.71875 9.15625 19.71875 C 9.289095 19.71875 9.403215 19.7323 9.53125 19.75 C 9.491058 19.45758 9.46875 19.1784 9.46875 18.875 C 9.46875 17.4244 9.947247 16.08344 10.75 15 C 10.26948 14.39871 9.9278275 13.66206 9.78125 12.875 C 9.6726175 12.867 9.5480625 12.875 9.4375 12.875 z M 12.8125 15 L 16 17.40625 L 19.1875 15 L 20 15.8125 L 17.59375 19 L 20 22.1875 L 19.1875 23 L 16 20.59375 L 12.8125 23 L 12 22.1875 L 14.40625 19 L 12 15.8125 L 12.8125 15 z M 24.09375 15.65625 C 23.308625 15.65625 22.586838 15.84758 21.9375 16.1875 C 22.306215 17.00423 22.5 17.92139 22.5 18.875 C 22.5 20.66055 21.78996 22.2909 20.625 23.46875 C 21.48082 24.41888 22.712632 25 24.09375 25 C 26.67941 25 28.78125 22.89816 28.78125 20.3125 C 28.78125 17.726839 26.67941 15.65625 24.09375 15.65625 z M 4.3125 16.28125 C 1.9306325 16.28125 0 18.18063 0 20.5625 C 0 22.94437 1.9306325 24.875 4.3125 24.875 C 5.2190732 24.875 6.056265 24.602439 6.75 24.125 C 6.463335 23.67955 6.3125 23.129619 6.3125 22.5625 C 6.3125 22.268139 6.3542845 21.98594 6.4375 21.71875 C 5.13876 20.78017 4.28125 19.25317 4.28125 17.53125 C 4.28125 17.09375 4.3347293 16.6872 4.4375 16.28125 C 4.394842 16.28025 4.3554647 16.28125 4.3125 16.28125 z M 29.625 19.96875 C 29.497935 19.96875 29.371487 19.9807 29.25 20 C 29.2567 20.1074 29.28125 20.20342 29.28125 20.3125 C 29.28125 21.68587 28.720337 22.9487 27.84375 23.875 C 28.275 24.37649 28.908165 24.6875 29.625 24.6875 C 30.93072 24.6875 32 23.64947 32 22.34375 C 32 21.03803 30.93072 19.96875 29.625 19.96875 z M 9.15625 20.21875 C 7.8505975 20.21875 6.78125 21.25684 6.78125 22.5625 C 6.78125 23.86815 7.8505975 24.9375 9.15625 24.9375 C 10.15705 24.9375 10.99878 24.31592 11.34375 23.4375 C 10.50201 22.5802 9.8922975 21.49648 9.625 20.28125 C 9.4685825 20.24891 9.322335 20.21875 9.15625 20.21875 z "
    transform="translate(0,-1.5e-6)"
    id="path7625" /><path
-   style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.8;color:#000000;fill:url(#linearGradient3956);fill-opacity:1;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+   style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.80000000000000004;color:#000000;fill:url(#linearGradient3956);fill-opacity:1.0;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
    d="m 14.5,6.687498 c -2.381798,0 -4.3125,1.9307 -4.3125,4.312501 0,0.98178 0.323818,1.90142 0.875,2.625 1.195708,-1.38395 2.967095,-2.28125 4.9375,-2.28125 0.964013,0 1.863805,0.21739 2.6875,0.59375 0.06669,-0.3016 0.09375,-0.61557 0.09375,-0.9375 0,-2.381801 -1.89945,-4.312501 -4.28125,-4.312501 z m -5.625,2 c -1.240375,0 -2.25,1.00963 -2.25,2.250001 0,0.4016 0.09779,0.76874 0.28125,1.09375 0.74849,-0.422231 1.6120975,-0.65625 2.53125,-0.65625 0.088705,0 0.19365,-0.004 0.28125,0 -0.00993,-0.1253 -0.03125,-0.246741 -0.03125,-0.375 0,-0.69086 0.14258,-1.343731 0.40625,-1.937501 -0.3550075,-0.238049 -0.7579325,-0.375 -1.21875,-0.375 z m 10.34375,1.562501 c 0.03903,0.24606 0.0625,0.49307 0.0625,0.75 0,0.39985 -0.03232,0.78521 -0.125,1.15625 1.08665,0.60137 1.96793,1.50283 2.5625,2.59375 0.616705,-0.32106 1.30108,-0.51356 2.03125,-0.5625 -0.18818,-2.20687 -1.994175,-3.9375 -4.25,-3.9375 -0.09164,0 -0.19103,-0.0056 -0.28125,0 z M 16,11.843749 c -3.33285,0 -6.03125,2.69817 -6.03125,6.031249 0,3.33272 2.698263,6.03125 6.03125,6.03125 3.33299,0 6.03125,-2.69854 6.03125,-6.03125 0,-3.333069 -2.698397,-6.031249 -6.03125,-6.031249 z m -6.5625,0.03125 c -2.58566,0 -4.65625,2.07058 -4.65625,4.656249 0,1.52212 0.719905,2.89611 1.84375,3.75 0.47379,-0.913811 1.4320875,-1.5625 2.53125,-1.5625 0.132845,0 0.246965,0.01355 0.375,0.03125 -0.040192,-0.29242 -0.0625,-0.5716 -0.0625,-0.875 0,-1.450599 0.478497,-2.791559 1.28125,-3.874999 -0.48052,-0.60129 -0.8221725,-1.33794 -0.96875,-2.125 -0.1086325,-0.008 -0.2331875,0 -0.34375,0 z m 3.375,2.125 L 16,16.406248 19.1875,13.999999 20,14.812499 17.59375,17.999998 20,21.187498 19.1875,21.999998 16,19.593748 12.8125,21.999998 12,21.187498 14.40625,17.999998 12,14.812499 l 0.8125,-0.8125 z m 11.28125,0.65625 c -0.785125,0 -1.506912,0.19133 -2.15625,0.53125 0.368715,0.816729 0.5625,1.733889 0.5625,2.687499 0,1.78555 -0.71004,3.4159 -1.875,4.59375 0.85582,0.950131 2.087632,1.53125 3.46875,1.53125 2.58566,0 4.6875,-2.10184 4.6875,-4.6875 0,-2.58566 -2.10184,-4.656249 -4.6875,-4.656249 z m -19.78125,0.625 C 1.9306325,15.281249 0,17.180628 0,19.562498 c 0,2.38187 1.9306325,4.3125 4.3125,4.3125 0.9065732,0 1.743765,-0.272561 2.4375,-0.75 -0.286665,-0.44545 -0.4375,-0.99538 -0.4375,-1.5625 0,-0.29436 0.041785,-0.57656 0.125,-0.84375 -1.29874,-0.938579 -2.15625,-2.465589 -2.15625,-4.1875 0,-0.43751 0.053479,-0.844049 0.15625,-1.249999 -0.042658,-0.001 -0.082035,0 -0.125,0 z m 25.3125,3.687499 c -0.127065,0 -0.253513,0.01195 -0.375,0.03125 0.0067,0.1074 0.03125,0.203421 0.03125,0.3125 0,1.373371 -0.560913,2.6362 -1.4375,3.5625 0.43125,0.50149 1.064415,0.8125 1.78125,0.8125 1.30572,0 2.375,-1.03803 2.375,-2.34375 0,-1.30572 -1.06928,-2.375 -2.375,-2.375 z m -20.46875,0.25 c -1.3056525,0 -2.375,1.03809 -2.375,2.34375 0,1.30565 1.0693475,2.375 2.375,2.375 1.0008,0 1.84253,-0.621579 2.1875,-1.5 -0.84174,-0.857299 -1.4514525,-1.941019 -1.71875,-3.15625 -0.1564175,-0.03234 -0.302665,-0.0625 -0.46875,-0.0625 z"
    id="circle238"
    inkscape:connector-curvature="0" />
diff --git a/core/img/icon-sync.png b/core/img/icon-sync.png
index a3d09704246107252ca46d79d4791f66b23055e3..c38ca87a237bd0be449e41c845c8f7add91b230c 100644
GIT binary patch
delta 1453
zcmV;e1ycI=35X1kZGQ!YNkl<ZScUDDdyG_99ml`FbMCz}v#*)L?DAT6xANGnkQG}H
z+|ZQ77J_L*P)bdzCML#c{KIG>#>A#E(WEu0Ce#=kjV%fy>8_L(NlQyfO?Wh=h&*Hg
z7usdBY?s-`%+Ai^Jbpj_*hfYv>e@8?!%0qZ?>)csJD>Y|9)A)M+|HqH>*;p@?f?J?
z{+~?;PxmxvP0ilR`|H~m4So~=nn@ZSJlnGnteybmJ_3{g45AYh1wVeMbz%R<0&w7O
z=bJUdSfsL`u})3Y1W<+RguUQ$O)lKJZe2@hrU3uZ1%Ez%?kNE439zJxULeuU0?-X&
ziXn?es?1gZzki=8z%4EC;*ry>BGRdq(t*~OJ@bHwblg%A=&-T&0+eVX{g=nqe(K`?
z0&vSLh%{2dJQ8X8YgMRTfpFPa3u7&;^Em~)n+U^wiJ0COkh~+_GekO^<*%8t*|p>F
z$*ms=AYE5;jg<OFCOh7KHIw~%pwwAoEaEzNJ=AnGSAQ(c85qfK92gqgIGQid^WsJm
zvFL<n0W(*#wLkdXt4CV@8^DLgz^@M;Z4l#LP^9XWA_Wo3WXIC!x|-dCBiRlwvVe#*
zks<(aVi%N*Y*Hv)omXGC^V(4Es}M;DsZ9WWHe-NtzVyRD>p22Xe)3zW$@dNnuLf~b
z80ewK^na{9Z7u2U!nliH=>K3vHeYNnl+5xg{X=%a?9?C2wmi!VXMfT4`pO)K-A_Kc
zF8^U?O$XsqyIx(THP$loyI~k?S4u_GLcn+|3|}r9^H>n*;m!B2{C@A?(7^F?Jr6)6
z{n@r92eg*@Bj^7490;6<!sm;|Y+^<oi-?FgfPXquHTKzWJp6FsCJX#@$NnEd(-*~)
zj)KTJZzFg=EmReYb?1wvHWpS3(|7H9<IKqmeSPCED^QXMbm-LCFOj1DD9}zs0_Xjw
z!$6OEcIinKF=l=|GfZ~__!fZa)KgFVcJCKF{8kZ;dG-O|@3PigV;!a@i@#Df<)y|t
z#D5dPo4xOiJ_6=6iw`IENKHV9HzaF!8|z?<X;r|bN*&Joz>8n|<n#O1S6V=k!lTan
zU@FDN3Wa5%#`&pt?_CxoJ)YSbYjOPSr8SOai*Xa{Q?s_J>dof*`n|?lcxIa~mZ);w
zSPSc&(n=nnieeTRYZg;QEn<;nHL+-qFn>4ANhRMXv(uU3vF1nzm#wk)I_B@hLX3E3
zhD@X}kt(fTzPPLF(6Lq#K@^W)&X1Rti15up7X<Ua`|KZ{`yQ*&D8auBNYr)XOm(GI
z`ZB|t?_1ik{q&{Yjh4BM1TwcFwbSI?y(CDiU(>!Vm8`*QZ=c>6k979)9V-rZ?tgzP
zQ!JZbDMd&I>P%_OJWe+jZ2(n?#8oP)4W1-XDiVU)M0DiZaG~V}x%jDz?^TzbUq&?1
zcs|Hv8><qr6WM%W<?cgAw?NUc4WDU!F$`m4&+Ojc;+^b@Lfx3Gtv)f38E*4(bBYte
zId2Bb*3}RJM6!zdhK3q{zVpELe1ECbRw<l_g<Z^8Q?_;i00^_|X#eE4i|_Ysxt`6f
zW)aUU9sm?b2Z0J_*VP_d+T7TA^i20ph*0(Khm+hrH@&B)f3SmyngC$ltkhop%+pVg
zZCKrY>im_f<zmSYfI>s6_N{xG8(&*AclO^iqq(GWUKY=v^U}AsJk<HQRe#G*4h&@n
zOJ(c89EDnsCu^(EEdNB)-fdrgWXFmnP3Plbc%^qBleE^wnb{{|QTN*Rdw%oH%@205
zmEMtj4vXi{JMfhU@BdR}H>?Mc#6)e#0T{tVw9W+(2XK9IVp1*zO#fv8z$k$1lnVjO
z2T+ZPelreW06-o<0zi85c_ws5H=>VY-1bZ99e_Ikw;kYLUUBhTfn8>k00000NkvXX
Hu0mjf{nOlA

delta 1178
zcmV;L1ZDe(4EG6;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<$f?1V3+5i9m

diff --git a/core/img/icon-sync.svg b/core/img/icon-sync.svg
index f9ebec4a5b..0806572f2c 100644
--- a/core/img/icon-sync.svg
+++ b/core/img/icon-sync.svg
@@ -19,9 +19,9 @@
    viewBox="0 0 32 31.999997"
    enable-background="new 0 0 595.275 311.111"
    xml:space="preserve"
-   inkscape:version="0.48.2 r9819"
-   sodipodi:docname="icon-sync.svg"
-   inkscape:export-filename="/home/user/owncloud/core/img/icon.png"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="icon-sync-light.svg"
+   inkscape:export-filename="/home/user/owncloud/core/img/icon-sync-light.png"
    inkscape:export-xdpi="89.826416"
    inkscape:export-ydpi="89.826416"><metadata
    id="metadata327"><rdf:RDF><cc:Work
@@ -289,7 +289,7 @@
    x2="-2.4040222"
    y2="18.967093" /><linearGradient
    inkscape:collect="always"
-   xlink:href="#linearGradient3587-6-5-26"
+   xlink:href="#SVGID_9_"
    id="linearGradient3342"
    gradientUnits="userSpaceOnUse"
    gradientTransform="matrix(0.25,0,0,0.25,0,0.500024)"
@@ -306,14 +306,14 @@
    inkscape:pageopacity="0"
    inkscape:pageshadow="2"
    inkscape:window-width="1280"
-   inkscape:window-height="774"
+   inkscape:window-height="800"
    id="namedview323"
    showgrid="true"
-   inkscape:zoom="8"
-   inkscape:cx="9.2669664"
-   inkscape:cy="16.482737"
+   inkscape:zoom="5.6568543"
+   inkscape:cx="30.833096"
+   inkscape:cy="24.980259"
    inkscape:window-x="0"
-   inkscape:window-y="26"
+   inkscape:window-y="-31"
    inkscape:window-maximized="1"
    inkscape:current-layer="Layer_1"
    units="px"
@@ -796,7 +796,7 @@
    d="M 14.5 7.6875 C 12.118202 7.6875 10.1875 9.6181999 10.1875 12 C 10.1875 12.98178 10.511318 13.90142 11.0625 14.625 C 12.258208 13.24105 14.029595 12.34375 16 12.34375 C 16.964013 12.34375 17.863805 12.56114 18.6875 12.9375 C 18.75419 12.6359 18.78125 12.32193 18.78125 12 C 18.78125 9.6181999 16.8818 7.6875 14.5 7.6875 z M 8.875 9.6875 C 7.634625 9.6875 6.625 10.69712 6.625 11.9375 C 6.625 12.3391 6.72279 12.70624 6.90625 13.03125 C 7.65474 12.60902 8.5183475 12.375 9.4375 12.375 C 9.526205 12.375 9.63115 12.371 9.71875 12.375 C 9.70882 12.2497 9.6875 12.12826 9.6875 12 C 9.6875 11.30913 9.83008 10.65627 10.09375 10.0625 C 9.7387425 9.8244499 9.3358175 9.6875 8.875 9.6875 z M 19.21875 11.25 C 19.25778 11.49606 19.28125 11.74306 19.28125 12 C 19.28125 12.39985 19.248935 12.78521 19.15625 13.15625 C 20.2429 13.75761 21.12418 14.65908 21.71875 15.75 C 22.335455 15.42894 23.01983 15.23643 23.75 15.1875 C 23.56182 12.98063 21.755825 11.25 19.5 11.25 C 19.40836 11.25 19.30897 11.2444 19.21875 11.25 z M 16 12.84375 C 12.66715 12.84375 9.96875 15.54192 9.96875 18.875 C 9.96875 22.20772 12.667013 24.90625 16 24.90625 C 19.33299 24.90625 22.03125 22.20771 22.03125 18.875 C 22.03125 15.54193 19.332853 12.84375 16 12.84375 z M 9.4375 12.875 C 6.85184 12.875 4.78125 14.94559 4.78125 17.53125 C 4.78125 19.05338 5.501155 20.42736 6.625 21.28125 C 7.09879 20.36744 8.0570875 19.71875 9.15625 19.71875 C 9.289095 19.71875 9.403215 19.7323 9.53125 19.75 C 9.491058 19.45758 9.46875 19.1784 9.46875 18.875 C 9.46875 17.4244 9.947247 16.08344 10.75 15 C 10.26948 14.39871 9.9278275 13.66206 9.78125 12.875 C 9.6726175 12.867 9.5480625 12.875 9.4375 12.875 z M 16 15 C 16.786501 15 17.505108 15.232582 18.125 15.625 L 18.375 15.3125 L 18.78125 16.28125 L 19.15625 17.25 L 18.125 17.09375 L 17.125 16.9375 L 17.34375 16.65625 C 16.954783 16.434451 16.48047 16.34375 16 16.34375 C 14.525735 16.34375 13.34375 17.525635 13.34375 19 C 13.34375 19.1555 13.34954 19.289339 13.375 19.4375 L 12.0625 19.65625 C 12.02588 19.438476 12 19.228287 12 19 C 12 16.788454 13.788603 15 16 15 z M 24.09375 15.65625 C 23.308625 15.65625 22.586838 15.84758 21.9375 16.1875 C 22.306215 17.00423 22.5 17.92139 22.5 18.875 C 22.5 20.66055 21.78996 22.2909 20.625 23.46875 C 21.48082 24.41888 22.712632 25 24.09375 25 C 26.67941 25 28.78125 22.89816 28.78125 20.3125 C 28.78125 17.726839 26.67941 15.65625 24.09375 15.65625 z M 4.3125 16.28125 C 1.9306325 16.28125 0 18.18063 0 20.5625 C 0 22.94437 1.9306325 24.875 4.3125 24.875 C 5.2190732 24.875 6.056265 24.602439 6.75 24.125 C 6.463335 23.67955 6.3125 23.129619 6.3125 22.5625 C 6.3125 22.268139 6.3542845 21.98594 6.4375 21.71875 C 5.13876 20.78017 4.28125 19.25317 4.28125 17.53125 C 4.28125 17.09375 4.3347293 16.6872 4.4375 16.28125 C 4.394842 16.28025 4.3554647 16.28125 4.3125 16.28125 z M 19.9375 18.34375 C 19.97413 18.561539 20 18.771691 20 19 C 20 21.211306 18.21149 23 16 23 C 15.213467 23 14.494885 22.767434 13.875 22.375 L 13.625 22.6875 L 13.21875 21.71875 L 12.84375 20.75 L 13.875 20.90625 L 14.875 21.0625 L 14.65625 21.34375 C 15.045211 21.565557 15.51951 21.65625 16 21.65625 C 17.474326 21.65625 18.65625 20.474204 18.65625 19 C 18.65625 18.844486 18.65047 18.710671 18.625 18.5625 L 19.9375 18.34375 z M 29.625 19.96875 C 29.497935 19.96875 29.371487 19.9807 29.25 20 C 29.2567 20.1074 29.28125 20.20342 29.28125 20.3125 C 29.28125 21.68587 28.720337 22.9487 27.84375 23.875 C 28.275 24.37649 28.908165 24.6875 29.625 24.6875 C 30.93072 24.6875 32 23.64947 32 22.34375 C 32 21.03803 30.93072 19.96875 29.625 19.96875 z M 9.15625 20.21875 C 7.8505975 20.21875 6.78125 21.25684 6.78125 22.5625 C 6.78125 23.86815 7.8505975 24.9375 9.15625 24.9375 C 10.15705 24.9375 10.99878 24.31592 11.34375 23.4375 C 10.50201 22.5802 9.8922975 21.49648 9.625 20.28125 C 9.4685825 20.24891 9.322335 20.21875 9.15625 20.21875 z "
    transform="translate(0,-1.5e-6)"
    id="path7625" /><path
-   style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.8;color:#000000;fill:url(#linearGradient3342);fill-opacity:1;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+   style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.80000000000000004;color:#000000;fill:url(#linearGradient3342);fill-opacity:1.0;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
    d="m 14.5,6.687498 c -2.381798,0 -4.3125,1.9307 -4.3125,4.312501 0,0.98178 0.323818,1.90142 0.875,2.625 1.195708,-1.38395 2.967095,-2.28125 4.9375,-2.28125 0.964013,0 1.863805,0.21739 2.6875,0.59375 0.06669,-0.3016 0.09375,-0.61557 0.09375,-0.9375 0,-2.381801 -1.89945,-4.312501 -4.28125,-4.312501 z M 8.875,8.687499 c -1.240375,0 -2.25,1.009629 -2.25,2.25 0,0.4016 0.09779,0.76874 0.28125,1.09375 0.74849,-0.422231 1.6120975,-0.65625 2.53125,-0.65625 0.088705,0 0.19365,-0.004 0.28125,0 -0.00993,-0.1253 -0.03125,-0.246741 -0.03125,-0.375 0,-0.69086 0.14258,-1.343731 0.40625,-1.9375 -0.3550075,-0.23805 -0.7579325,-0.375 -1.21875,-0.375 z m 10.34375,1.5625 c 0.03903,0.24606 0.0625,0.49307 0.0625,0.75 0,0.39985 -0.03232,0.78521 -0.125,1.15625 1.08665,0.60137 1.96793,1.50283 2.5625,2.593749 0.616705,-0.32106 1.30108,-0.51356 2.03125,-0.5625 -0.18818,-2.206869 -1.994175,-3.937499 -4.25,-3.937499 -0.09164,0 -0.19103,-0.0056 -0.28125,0 z M 16,11.843749 c -3.33285,0 -6.03125,2.69817 -6.03125,6.031249 0,3.33272 2.698263,6.03125 6.03125,6.03125 3.33299,0 6.03125,-2.69854 6.03125,-6.03125 0,-3.33307 -2.698397,-6.031249 -6.03125,-6.031249 z m -6.5625,0.03125 c -2.58566,0 -4.65625,2.07058 -4.65625,4.656249 0,1.52212 0.719905,2.89611 1.84375,3.75 0.47379,-0.913811 1.4320875,-1.5625 2.53125,-1.5625 0.132845,0 0.246965,0.01355 0.375,0.03125 -0.040192,-0.29242 -0.0625,-0.5716 -0.0625,-0.875 0,-1.4506 0.478497,-2.79156 1.28125,-3.874999 -0.48052,-0.60129 -0.8221725,-1.33794 -0.96875,-2.125 -0.1086325,-0.008 -0.2331875,0 -0.34375,0 z m 6.5625,2.125 c 0.786501,0 1.505108,0.232583 2.125,0.624999 l 0.25,-0.3125 0.40625,0.96875 0.375,0.96875 -1.03125,-0.15625 -1,-0.15625 0.21875,-0.28125 c -0.388967,-0.221799 -0.86328,-0.3125 -1.34375,-0.3125 -1.474265,0 -2.65625,1.181886 -2.65625,2.65625 0,0.1555 0.0058,0.28934 0.03125,0.4375 l -1.3125,0.21875 C 12.02588,18.438475 12,18.228286 12,17.999998 c 0,-2.211546 1.788603,-3.999999 4,-3.999999 z m 8.09375,0.656249 c -0.785125,0 -1.506912,0.19133 -2.15625,0.53125 0.368715,0.81673 0.5625,1.73389 0.5625,2.6875 0,1.78555 -0.71004,3.4159 -1.875,4.59375 0.85582,0.950131 2.087632,1.53125 3.46875,1.53125 2.58566,0 4.6875,-2.10184 4.6875,-4.6875 0,-2.585661 -2.10184,-4.65625 -4.6875,-4.65625 z m -19.78125,0.625 c -2.3818675,0 -4.3125,1.89938 -4.3125,4.28125 0,2.38187 1.9306325,4.3125 4.3125,4.3125 0.9065732,0 1.743765,-0.272561 2.4375,-0.75 -0.286665,-0.44545 -0.4375,-0.99538 -0.4375,-1.5625 0,-0.29436 0.041785,-0.57656 0.125,-0.84375 -1.29874,-0.93858 -2.15625,-2.465589 -2.15625,-4.1875 0,-0.43751 0.053479,-0.84405 0.15625,-1.25 -0.042658,-10e-4 -0.082035,0 -0.125,0 z m 15.625,2.0625 C 19.97413,17.561537 20,17.771689 20,17.999998 c 0,2.211306 -1.78851,4 -4,4 -0.786533,0 -1.505115,-0.232565 -2.125,-0.625 l -0.25,0.3125 -0.40625,-0.96875 -0.375,-0.96875 1.03125,0.15625 1,0.15625 -0.21875,0.28125 c 0.388961,0.221806 0.86326,0.3125 1.34375,0.3125 1.474326,0 2.65625,-1.182046 2.65625,-2.65625 0,-0.155514 -0.0058,-0.289328 -0.03125,-0.4375 l 1.3125,-0.21875 z m 9.6875,1.625 c -0.127065,0 -0.253513,0.01195 -0.375,0.03125 0.0067,0.1074 0.03125,0.203421 0.03125,0.3125 0,1.373371 -0.560913,2.6362 -1.4375,3.5625 0.43125,0.50149 1.064415,0.8125 1.78125,0.8125 1.30572,0 2.375,-1.03803 2.375,-2.34375 0,-1.30572 -1.06928,-2.375 -2.375,-2.375 z m -20.46875,0.25 c -1.3056525,0 -2.375,1.03809 -2.375,2.34375 0,1.30565 1.0693475,2.375 2.375,2.375 1.0008,0 1.84253,-0.62158 2.1875,-1.5 -0.84174,-0.857299 -1.4514525,-1.94102 -1.71875,-3.15625 -0.1564175,-0.03234 -0.302665,-0.0625 -0.46875,-0.0625 z"
    id="circle238"
    inkscape:connector-curvature="0" />
diff --git a/core/img/icon.png b/core/img/icon.png
index 745b82584c6547aa4293f7b3cf97956eed3cc22d..e87191f1c0cedd918056b7330b9966e1f65cca3f 100644
GIT binary patch
delta 1212
zcmV;t1Vj7P2$>3yZGQxoNkl<ZScUCXOKeqD6kYqA``&%GukEX}^oLEMl#hZ1iNsh!
z6eT4P(FBn|1RXdsVZ=Zu7&T5{;K0U2qXE(ZmGILhC}~6!{2=BDp+YQa<r8Xb;g$CN
z`riGVbGCz0Qu+flGO;V!gS*$-=dSbH2bjh*{_miFQq<n@M}N7LRO{R3>biOJ5)aHk
z+u4iN5i9%-n4cg(Fkk?j2Kc=-OX_d@CkDPc`+Kc4@Y8-W8MVs}5@8NNV$=xQXk3bB
ztj()d&2jJ7fHf6)<mU^!T+cKS5J<%K1}dl%ps}W<0nZzB{4D_X-LHX3SK#1}9SfNG
zuoOaCQeM_d^?xx@<79fle9}|sBw=hwaeVWNB^U0+fS8O3OO&uNgCW8X1z~v%1kVow
z_(6a`>9hdOIH6FRW6L&+IBpCpkZM$c+UC1n%f4^p+y0e-XmMe$0J;V;LrZ%S$=59*
zF8F=`CloqiOFEU#yA^$dskMDKGi#GsuS&B@I(GP1Wq%mPu)|94`0V)i4R<pz;Tib&
zXnT3r<v;gI5*30V0iZvXDVtGTa5#}lKV`J3AR<X52mllZvs|BFL?-{&tg={Z??8Gh
zKsH0J2k_fe1|~cMA0GLxSxWI7jpChfXn)T48X1@^ASSFcY?wgZRWnO|@jR~-Ox-t9
znX^ePJAdEZv?@ELfnA@sHv+m*NGom;Hxr4_2q%QdM5H{H_5963jJpMQfSHXG34fY*
zy^Y48*f6s(tcmDQNT!>2Y}%9`t+xQ+{gz{IYaMJ5ASng=fz}~F-xd|v;jVPvU1-?Q
zsPtqII;)piA(_-hl>q<|V2pVsA2>Atw%;M%xqqka1;grPV~nkgwhTBH1Um2og^@5?
zUGaQx{^;CP;RgPr0_Yx{Q(9Y!`RSc|zG%8*1qf=3(y*Y1r>2!&<k(hc)(si}KnhAh
z+LyF3fzsx#(;u!8!BEZ>eh`eKLQ*^f=5Ij606=ejav)BO=!n8FoAOw!HJKZFzM>>{
z!hbVLrZPD%EUo!NuDk4B3`CtsJn#9X#+bUXT*#8~Y(DS7h-BC?A6djA;VVBnN+Ws_
zH(y$|U{3S-?yKtpV-^yFD@z}0^_99O1I1FDcRl~riSC$VhkFR3NfSG6o?sO@;h%a3
za<j+kI=U_wdP*-M8h&`Lr;^nXD|{}K&wnqS>gOeePP{KMxY&Tl^%!E(+BOL<P=!PQ
z5ib|7tzX#^mh$3An;i+wrcw~~j(lgcxo79rRPB#O!l%b-N1`ZVpQ@{=YV~}7@i^WO
zP+eAhxOZS+ZJ>s8GYSh&$q#n#&a8Q|;aumH9xw0u1Rz&lQgrf>+K1ccR+e`3Cx6p1
zr8L)9SA4mBW7DD4%O5+_+n>Cib3IQhMS>_*6fHQnxUS~tn_JhnJYHYhX@^2ruJ!fD
zf<Q%#F}lDGUtH0!V9y&Hnhu$OuMK9?sIRX2dfV!i2X5~YGtUGN!*Fj%0~o|`qpAcD
z0gxb~#4T+MKnZ|?Tje<bNg_(!;x!`xssThX{N4-!xK2bFW_AFS0muSKPPLuWn8q|7
a2>u43{f&kX%7NDa0000<MNUMnLSTZYhddGh

delta 1014
zcmV<S0}1?@3e^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<$f)`Hiod5s;

diff --git a/core/img/icon.svg b/core/img/icon.svg
index 95eac44548..6f91abe6e4 100644
--- a/core/img/icon.svg
+++ b/core/img/icon.svg
@@ -19,14 +19,14 @@
    viewBox="0 0 32 31.999997"
    enable-background="new 0 0 595.275 311.111"
    xml:space="preserve"
-   inkscape:version="0.48.2 r9819"
-   sodipodi:docname="icon.svg"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="icon-light.svg"
    inkscape:export-filename="/home/user/owncloud/core/img/icon.png"
    inkscape:export-xdpi="89.826416"
    inkscape:export-ydpi="89.826416"><metadata
    id="metadata327"><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><defs
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title /></cc:Work></rdf:RDF></metadata><defs
    id="defs325"><linearGradient
    inkscape:collect="always"
    xlink:href="#SVGID_1_"
@@ -289,7 +289,7 @@
    x2="-2.4040222"
    y2="18.967093" /><linearGradient
    inkscape:collect="always"
-   xlink:href="#linearGradient3587-6-5-26"
+   xlink:href="#SVGID_9_"
    id="linearGradient7623"
    x1="58.866638"
    y1="24.928007"
@@ -297,7 +297,7 @@
    y2="93.882034"
    gradientUnits="userSpaceOnUse"
    gradientTransform="matrix(0.25,0,0,0.25,0,0.500024)" /></defs><sodipodi:namedview
-   pagecolor="#ffffff"
+   pagecolor="#000000"
    bordercolor="#666666"
    borderopacity="1"
    objecttolerance="10"
@@ -306,14 +306,14 @@
    inkscape:pageopacity="0"
    inkscape:pageshadow="2"
    inkscape:window-width="1280"
-   inkscape:window-height="774"
+   inkscape:window-height="800"
    id="namedview323"
    showgrid="true"
-   inkscape:zoom="8"
-   inkscape:cx="32.984032"
-   inkscape:cy="11.601392"
+   inkscape:zoom="16"
+   inkscape:cx="24.701671"
+   inkscape:cy="13.807816"
    inkscape:window-x="0"
-   inkscape:window-y="26"
+   inkscape:window-y="-31"
    inkscape:window-maximized="1"
    inkscape:current-layer="Layer_1"
    units="px"
@@ -800,7 +800,7 @@
    id="path7625"
    d="m 14.488658,7.6997589 c -2.381798,0 -4.30607,1.92427 -4.30607,4.3060701 0,0.98178 0.32692,1.88539 0.878102,2.60897 1.195708,-1.38395 2.960465,-2.2628 4.93087,-2.2628 0.964013,0 1.878155,0.21467 2.70185,0.59103 0.06669,-0.3016 0.101318,-0.61527 0.101318,-0.9372 0,-2.3818001 -1.92427,-4.3060701 -4.30607,-4.3060701 z m -5.6232205,1.99261 c -1.240375,0 -2.2374675,1.0055301 -2.2374675,2.2459101 0,0.4016 0.10361,0.78106 0.28707,1.10607 0.74849,-0.42223 1.61383,-0.66702 2.5329825,-0.66702 0.088705,0 0.1741425,0.004 0.2617425,0.008 -0.00993,-0.1253 -0.016875,-0.25124 -0.016875,-0.3795 0,-0.69087 0.15005,-1.34819 0.41372,-1.94196 C 9.7516025,9.8258189 9.3262675,9.6923689 8.86545,9.6923689 z M 19.487078,11.237489 c -0.09164,0 -0.179965,0.0113 -0.270185,0.0169 0.03903,0.24606 0.06755,0.49451 0.06755,0.75145 0,0.39985 -0.05085,0.78569 -0.143535,1.15673 1.08665,0.60136 1.989072,1.50116 2.583642,2.59208 0.616705,-0.32106 1.30466,-0.52521 2.03483,-0.57414 -0.18818,-2.20687 -2.016472,-3.94301 -4.272297,-3.94301 z m -3.495518,1.60422 c -3.33285,0 -6.0284975,2.69542 -6.0284975,6.0285 0,3.33272 2.6955105,6.0285 6.0284975,6.0285 3.33299,0 6.0285,-2.69579 6.0285,-6.0285 0,-3.33307 -2.695647,-6.0285 -6.0285,-6.0285 z m -6.5435375,0.0253 c -2.58566,0 -4.6775725,2.09191 -4.6775725,4.67757 0,1.52213 0.7252325,2.8696 1.8490775,3.72349 0.47379,-0.91381 1.425375,-1.53668 2.5245375,-1.53668 0.132845,0 0.260355,0.0161 0.38839,0.0338 -0.040192,-0.29242 -0.0591,-0.59159 -0.0591,-0.89499 0,-1.4506 0.47218,-2.79202 1.274933,-3.87546 -0.48052,-0.60129 -0.8244005,-1.32376 -0.970978,-2.11082 -0.1086325,-0.008 -0.218725,-0.0169 -0.3292875,-0.0169 z m 14.6575255,2.78628 c -0.785125,0 -1.520585,0.20045 -2.169923,0.54037 0.368715,0.81673 0.574143,1.72291 0.574143,2.67652 0,1.78555 -0.71789,3.406849 -1.88285,4.584699 0.85582,0.95013 2.097512,1.54512 3.47863,1.54512 2.58566,0 4.677575,-2.091919 4.677575,-4.677579 0,-2.585661 -2.091915,-4.66913 -4.677575,-4.66913 z M 4.3145118,16.269679 C 1.9326443,16.269679 0,18.185439 0,20.567309 c 0,2.38187 1.9326443,4.31451 4.3145118,4.31451 0.9065732,0 1.7463732,-0.282451 2.4401082,-0.75989 -0.286665,-0.44545 -0.4559375,-0.978001 -0.4559375,-1.54512 0,-0.294361 0.043432,-0.57714 0.1266475,-0.84433 -1.29874,-0.93858 -2.1445912,-2.46595 -2.1445912,-4.18787 0,-0.4375 0.057653,-0.86054 0.1604237,-1.26649 -0.042658,-0.001 -0.083686,-0.008 -0.1266507,-0.008 z m 25.3213812,3.69816 c -0.127065,0 -0.250018,0.0145 -0.371505,0.0338 0.0067,0.1074 0.0084,0.21176 0.0084,0.32084 0,1.37337 -0.541883,2.61988 -1.41847,3.54618 0.43125,0.50149 1.064697,0.819 1.781532,0.819 1.30572,0 2.364118,-1.04996 2.364118,-2.35568 0,-1.30572 -1.058398,-2.36411 -2.364118,-2.36411 z m -20.491828,0.25329 c -1.3056525,0 -2.3556725,1.05002 -2.3556725,2.35568 0,1.30565 1.05002,2.36411 2.3556725,2.36411 1.0008,0 1.850283,-0.62448 2.195253,-1.5029 -0.84174,-0.8573 -1.446688,-1.951 -1.7139855,-3.16623 C 9.468915,20.239449 9.31015,20.221129 9.144065,20.221129 z"
    style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.2;color:#000000;fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans" /><path
-   style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.8;color:#000000;fill:url(#linearGradient7623);fill-opacity:1;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
+   style="font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;baseline-shift:baseline;opacity:0.80000000000000004;color:#000000;fill:url(#linearGradient7623);fill-opacity:1.0;stroke:none;stroke-width:4;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Sans;-inkscape-font-specification:Sans"
    d="m 14.488658,6.699758 c -2.381798,0 -4.30607,1.92427 -4.30607,4.306071 0,0.98178 0.32692,1.88539 0.878102,2.60897 1.195708,-1.38395 2.960465,-2.2628 4.93087,-2.2628 0.964013,0 1.878155,0.21467 2.70185,0.59103 0.06669,-0.3016 0.101318,-0.61527 0.101318,-0.9372 0,-2.381801 -1.92427,-4.306071 -4.30607,-4.306071 z m -5.6232205,1.99261 c -1.240375,0 -2.2374675,1.00554 -2.2374675,2.245911 0,0.4016 0.10361,0.78106 0.28707,1.10607 0.74849,-0.42223 1.61383,-0.66702 2.5329825,-0.66702 0.088705,0 0.1741425,0.004 0.2617425,0.008 -0.00993,-0.1253 -0.016875,-0.25124 -0.016875,-0.3795 0,-0.69086 0.15005,-1.348191 0.41372,-1.941961 -0.3550075,-0.23805 -0.7803425,-0.3715 -1.24116,-0.3715 z m 10.6216405,1.545121 c -0.09164,0 -0.179965,0.0113 -0.270185,0.0169 0.03903,0.24606 0.06755,0.49452 0.06755,0.75145 0,0.39985 -0.05085,0.78569 -0.143535,1.15673 1.08665,0.60137 1.989072,1.50116 2.583642,2.59208 0.616705,-0.32106 1.30466,-0.5252 2.03483,-0.57414 -0.18818,-2.20687 -2.016472,-3.94301 -4.272297,-3.94301 z m -3.495518,1.60422 c -3.33285,0 -6.0284975,2.69542 -6.0284975,6.0285 0,3.33272 2.6955105,6.0285 6.0284975,6.0285 3.33299,0 6.0285,-2.69579 6.0285,-6.0285 0,-3.33307 -2.695647,-6.0285 -6.0285,-6.0285 z m -6.5435375,0.0253 c -2.58566,0 -4.6775725,2.09191 -4.6775725,4.67758 0,1.52212 0.7252325,2.86959 1.8490775,3.72348 0.47379,-0.913811 1.425375,-1.53668 2.5245375,-1.53668 0.132845,0 0.260355,0.0161 0.38839,0.0338 -0.040192,-0.29242 -0.0591,-0.59159 -0.0591,-0.89499 0,-1.4506 0.47218,-2.792019 1.274933,-3.875459 -0.48052,-0.60129 -0.8244005,-1.32376 -0.970978,-2.11082 -0.1086325,-0.008 -0.218725,-0.0169 -0.3292875,-0.0169 z m 14.6575255,2.78628 c -0.785125,0 -1.520585,0.20045 -2.169923,0.54037 0.368715,0.81673 0.574143,1.72291 0.574143,2.67652 0,1.78555 -0.71789,3.406849 -1.88285,4.584699 0.85582,0.95013 2.097512,1.54512 3.47863,1.54512 2.58566,0 4.677575,-2.091919 4.677575,-4.677579 0,-2.585661 -2.091915,-4.66913 -4.677575,-4.66913 z M 4.3145118,15.269679 C 1.9326443,15.269679 0,17.185439 0,19.567309 c 0,2.38187 1.9326443,4.31451 4.3145118,4.31451 0.9065732,0 1.7463732,-0.282451 2.4401082,-0.75989 -0.286665,-0.44545 -0.4559375,-0.978001 -0.4559375,-1.54512 0,-0.294361 0.043432,-0.57714 0.1266475,-0.84433 -1.29874,-0.93858 -2.1445912,-2.46595 -2.1445912,-4.18786 0,-0.43751 0.057653,-0.86055 0.1604237,-1.2665 -0.042658,-10e-4 -0.083686,-0.008 -0.1266507,-0.008 z m 25.3213812,3.69816 c -0.127065,0 -0.250018,0.0145 -0.371505,0.0338 0.0067,0.1074 0.0084,0.21176 0.0084,0.32084 0,1.37337 -0.541883,2.61988 -1.41847,3.54618 0.43125,0.50149 1.064697,0.819 1.781532,0.819 1.30572,0 2.364118,-1.04996 2.364118,-2.35568 0,-1.30572 -1.058398,-2.36411 -2.364118,-2.36411 z m -20.491828,0.25329 c -1.3056525,0 -2.3556725,1.05002 -2.3556725,2.35568 0,1.30565 1.05002,2.36411 2.3556725,2.36411 1.0008,0 1.850283,-0.62448 2.195253,-1.5029 -0.84174,-0.8573 -1.446688,-1.951 -1.7139855,-3.16623 C 9.468915,19.239449 9.31015,19.221129 9.144065,19.221129 z"
    id="circle238"
    inkscape:export-filename="/home/user/owncloud/core/img/logo.png"

From d936590f77ac314cbb682924bf281fccf996781b Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Thu, 6 Sep 2012 16:01:51 -0400
Subject: [PATCH 1138/1224] Don't pass content for a new text file from UI,
 fixes bug oc-1660

---
 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 8229bfa24f..101e2bad2e 100644
--- a/apps/files/js/files.js
+++ b/apps/files/js/files.js
@@ -505,7 +505,7 @@ $(document).ready(function() {
 				case 'file':
 					$.post(
 						OC.filePath('files','ajax','newfile.php'),
-						{dir:$('#dir').val(),filename:name,content:" \n"},
+						{dir:$('#dir').val(),filename:name},
 						function(result){
 							if (result.status == 'success') {
 								var date=new Date();

From 39577495e122a9d94507f99c6b3f9f3430735c13 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Thu, 6 Sep 2012 22:27:56 +0200
Subject: [PATCH 1139/1224] Add a directory separator to filter app directories
 with the same prefix.

Fixes: oc-1663
---
 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 0f1435fde4..4188608719 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 = rtrim($webroot.$app_root['url'], '/');
 					break;
 				}

From 2144b2f37ae90faa03a44e5526c29893c5c7e7d0 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Thu, 6 Sep 2012 23:10:24 +0200
Subject: [PATCH 1140/1224] clear the filecache if the mount configuration has
 changed

---
 lib/filecache.php  | 14 ++++++++++++++
 lib/filesystem.php |  7 +++++++
 2 files changed, 21 insertions(+)

diff --git a/lib/filecache.php b/lib/filecache.php
index 811e8a3e6a..de38ad99e8 100644
--- a/lib/filecache.php
+++ b/lib/filecache.php
@@ -474,6 +474,20 @@ class OC_FileCache{
 		$query=OC_DB::prepare('DELETE FROM `*PREFIX*fscache` WHERE LENGTH(`path_hash`)<30');
 		$query->execute();
 	}
+
+	/**
+	 * clear filecache entries
+	 * @param string user (optonal)
+	 */
+	public static function clear($user=''){
+		if($user){
+			$query=OC_DB::prepare('DELETE FROM `*PREFIX*fscache` WHERE user=?');
+			$query->execute(array($user));
+		}else{
+			$query=OC_DB::prepare('DELETE FROM `*PREFIX*fscache`');
+			$query->execute();
+		}
+	}
 }
 
 //watch for changes and try to keep the cache up to date
diff --git a/lib/filesystem.php b/lib/filesystem.php
index c69970467f..01467b54c8 100644
--- a/lib/filesystem.php
+++ b/lib/filesystem.php
@@ -236,6 +236,13 @@ class OC_Filesystem{
 					}
 				}
 			}
+
+			$mtime=filemtime(OC::$SERVERROOT.'/config/mount.php');
+			$previousMTime=OC_Appconfig::getValue('files','mountconfigmtime',0);
+			if($mtime>$previousMTime){//mount config has changed, filecache needs to be updated
+				OC_FileCache::clear();
+				OC_Appconfig::setValue('files','mountconfigmtime',$mtime);
+			}
 		}
 
 		self::$loaded=true;

From d4fd47d43f01f14f392e55dd0469ee58ca200729 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Thu, 6 Sep 2012 23:14:43 +0200
Subject: [PATCH 1141/1224] clear user filecache after the user mount
 configuration has changed

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

diff --git a/lib/util.php b/lib/util.php
index 42a0f5c7df..1dcf7c2cbf 100755
--- a/lib/util.php
+++ b/lib/util.php
@@ -58,6 +58,13 @@ class OC_Util {
 						OC_Filesystem::mount($options['class'], $options['options'], $mountPoint);
 					}
 				}
+
+				$mtime=filemtime($user_root.'/mount.php');
+				$previousMTime=OC_Preferences::getValue($user,'files','mountconfigmtime',0);
+				if($mtime>$previousMTime){//mount config has changed, filecache needs to be updated
+					OC_FileCache::clear($user);
+					OC_Preferences::setValue($user,'files','mountconfigmtime',$mtime);
+				}
 			}
 			OC_Hook::emit('OC_Filesystem', 'setup', array('user' => $user, 'user_dir' => $user_dir));
 		}

From 294cff27a7e5a61b3ca4d1af0b87b2d39aae1534 Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <frank@owncloud.org>
Date: Fri, 7 Sep 2012 01:39:11 +0200
Subject: [PATCH 1142/1224] add check for zlib

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

diff --git a/lib/util.php b/lib/util.php
index 1dcf7c2cbf..b742e27b55 100755
--- a/lib/util.php
+++ b/lib/util.php
@@ -276,6 +276,9 @@ class OC_Util {
 		if(!function_exists('imagepng')){
 			$errors[]=array('error'=>'PHP module GD is not installed.<br/>','hint'=>'Please ask your server administrator to install the module.');
 		}
+		if(!function_exists('gzencode')){
+			$errors[]=array('error'=>'PHP module zlib is not installed.<br/>','hint'=>'Please ask your server administrator to install the module.');
+		}
 		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.');
 		}

From a94b56b57baeb36a9e9bb547e213180757041576 Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <thomas.mueller@tmit.eu>
Date: Fri, 7 Sep 2012 02:07:22 +0200
Subject: [PATCH 1143/1224] [tx-robot] updated from transifex

---
 apps/files/l10n/ca.php               |  3 +-
 apps/files/l10n/cs_CZ.php            |  1 +
 apps/files/l10n/de.php               |  1 +
 apps/files/l10n/es.php               |  1 +
 apps/files/l10n/fi_FI.php            |  1 +
 apps/files/l10n/it.php               |  1 +
 apps/files/l10n/pl.php               |  1 +
 apps/files/l10n/sl.php               |  1 +
 apps/files/l10n/sv.php               |  1 +
 apps/files/l10n/th_TH.php            |  1 +
 apps/files/l10n/zh_CN.php            |  3 ++
 apps/files_encryption/l10n/zh_CN.php |  5 ++++
 apps/files_external/l10n/it.php      |  6 ++--
 apps/files_external/l10n/sk_SK.php   | 18 ++++++++++++
 apps/files_sharing/l10n/sk_SK.php    |  7 +++++
 apps/files_versions/l10n/zh_CN.php   |  6 ++++
 apps/user_ldap/l10n/fi_FI.php        |  8 +++---
 core/l10n/zh_CN.php                  |  1 +
 l10n/ca/files.po                     | 36 ++++++++++++------------
 l10n/ca/settings.po                  |  8 +++---
 l10n/cs_CZ/files.po                  | 34 +++++++++++-----------
 l10n/de/files.po                     | 34 +++++++++++-----------
 l10n/es/files.po                     | 34 +++++++++++-----------
 l10n/fi_FI/files.po                  | 34 +++++++++++-----------
 l10n/fi_FI/user_ldap.po              | 14 +++++-----
 l10n/it/core.po                      |  6 ++--
 l10n/it/files.po                     | 34 +++++++++++-----------
 l10n/it/files_external.po            | 14 +++++-----
 l10n/pl/files.po                     | 36 ++++++++++++------------
 l10n/sk_SK/files_external.po         | 41 ++++++++++++++-------------
 l10n/sk_SK/files_sharing.po          | 21 +++++++-------
 l10n/sl/files.po                     | 34 +++++++++++-----------
 l10n/sv/files.po                     | 34 +++++++++++-----------
 l10n/templates/core.pot              |  2 +-
 l10n/templates/files.pot             | 28 +++++++++----------
 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/lib.pot               |  2 +-
 l10n/templates/settings.pot          |  2 +-
 l10n/templates/user_ldap.pot         |  2 +-
 l10n/th_TH/files.po                  | 34 +++++++++++-----------
 l10n/zh_CN/core.po                   |  9 +++---
 l10n/zh_CN/files.po                  | 38 ++++++++++++-------------
 l10n/zh_CN/files_encryption.po       | 15 +++++-----
 l10n/zh_CN/files_versions.po         | 17 +++++------
 l10n/zh_CN/lib.po                    | 35 ++++++++++++-----------
 l10n/zh_CN/settings.po               | 42 ++++++++++++++--------------
 lib/l10n/zh_CN.php                   |  5 +++-
 settings/l10n/ca.php                 |  2 +-
 settings/l10n/zh_CN.php              | 18 ++++++++++++
 52 files changed, 408 insertions(+), 331 deletions(-)
 create mode 100644 apps/files_encryption/l10n/zh_CN.php
 create mode 100644 apps/files_external/l10n/sk_SK.php
 create mode 100644 apps/files_sharing/l10n/sk_SK.php
 create mode 100644 apps/files_versions/l10n/zh_CN.php

diff --git a/apps/files/l10n/ca.php b/apps/files/l10n/ca.php
index 6d232f217e..336f59ae86 100644
--- a/apps/files/l10n/ca.php
+++ b/apps/files/l10n/ca.php
@@ -10,6 +10,7 @@
 "Delete" => "Suprimeix",
 "already exists" => "ja existeix",
 "replace" => "substitueix",
+"suggest name" => "sugereix un nom",
 "cancel" => "cancel·la",
 "replaced" => "substituït",
 "undo" => "desfés",
@@ -35,7 +36,7 @@
 "Enable ZIP-download" => "Activa la baixada ZIP",
 "0 is unlimited" => "0 és sense límit",
 "Maximum input size for ZIP files" => "Mida màxima d'entrada per fitxers ZIP",
-"Save" => "Desar",
+"Save" => "Desa",
 "New" => "Nou",
 "Text file" => "Fitxer de text",
 "Folder" => "Carpeta",
diff --git a/apps/files/l10n/cs_CZ.php b/apps/files/l10n/cs_CZ.php
index 228f6a3898..f29df70ee6 100644
--- a/apps/files/l10n/cs_CZ.php
+++ b/apps/files/l10n/cs_CZ.php
@@ -10,6 +10,7 @@
 "Delete" => "Smazat",
 "already exists" => "již existuje",
 "replace" => "nahradit",
+"suggest name" => "navrhnout název",
 "cancel" => "zrušit",
 "replaced" => "nahrazeno",
 "undo" => "zpět",
diff --git a/apps/files/l10n/de.php b/apps/files/l10n/de.php
index a267d31009..3db6af8477 100644
--- a/apps/files/l10n/de.php
+++ b/apps/files/l10n/de.php
@@ -10,6 +10,7 @@
 "Delete" => "Löschen",
 "already exists" => "ist bereits vorhanden",
 "replace" => "ersetzen",
+"suggest name" => "Name vorschlagen",
 "cancel" => "abbrechen",
 "replaced" => "ersetzt",
 "undo" => "rückgängig machen",
diff --git a/apps/files/l10n/es.php b/apps/files/l10n/es.php
index c998c8cb57..0ba3c56aa1 100644
--- a/apps/files/l10n/es.php
+++ b/apps/files/l10n/es.php
@@ -10,6 +10,7 @@
 "Delete" => "Eliminado",
 "already exists" => "ya existe",
 "replace" => "reemplazar",
+"suggest name" => "sugerir nombre",
 "cancel" => "cancelar",
 "replaced" => "reemplazado",
 "undo" => "deshacer",
diff --git a/apps/files/l10n/fi_FI.php b/apps/files/l10n/fi_FI.php
index eaed70c624..757d0594d3 100644
--- a/apps/files/l10n/fi_FI.php
+++ b/apps/files/l10n/fi_FI.php
@@ -10,6 +10,7 @@
 "Delete" => "Poista",
 "already exists" => "on jo olemassa",
 "replace" => "korvaa",
+"suggest name" => "ehdota nimeä",
 "cancel" => "peru",
 "replaced" => "korvattu",
 "undo" => "kumoa",
diff --git a/apps/files/l10n/it.php b/apps/files/l10n/it.php
index d0deb4f0f0..0df60832c5 100644
--- a/apps/files/l10n/it.php
+++ b/apps/files/l10n/it.php
@@ -10,6 +10,7 @@
 "Delete" => "Elimina",
 "already exists" => "esiste già",
 "replace" => "sostituisci",
+"suggest name" => "suggerisci nome",
 "cancel" => "annulla",
 "replaced" => "sostituito",
 "undo" => "annulla",
diff --git a/apps/files/l10n/pl.php b/apps/files/l10n/pl.php
index 7fd31faefd..d3814333ac 100644
--- a/apps/files/l10n/pl.php
+++ b/apps/files/l10n/pl.php
@@ -10,6 +10,7 @@
 "Delete" => "Usuwa element",
 "already exists" => "Już istnieje",
 "replace" => "zastap",
+"suggest name" => "zasugeruj nazwę",
 "cancel" => "anuluj",
 "replaced" => "zastąpione",
 "undo" => "wróć",
diff --git a/apps/files/l10n/sl.php b/apps/files/l10n/sl.php
index 85da041629..0d56a0c647 100644
--- a/apps/files/l10n/sl.php
+++ b/apps/files/l10n/sl.php
@@ -10,6 +10,7 @@
 "Delete" => "Izbriši",
 "already exists" => "že obstaja",
 "replace" => "nadomesti",
+"suggest name" => "predlagaj ime",
 "cancel" => "ekliči",
 "replaced" => "nadomeščen",
 "undo" => "razveljavi",
diff --git a/apps/files/l10n/sv.php b/apps/files/l10n/sv.php
index f63039d9ee..137222b417 100644
--- a/apps/files/l10n/sv.php
+++ b/apps/files/l10n/sv.php
@@ -10,6 +10,7 @@
 "Delete" => "Radera",
 "already exists" => "finns redan",
 "replace" => "ersätt",
+"suggest name" => "föreslå namn",
 "cancel" => "avbryt",
 "replaced" => "ersatt",
 "undo" => "ångra",
diff --git a/apps/files/l10n/th_TH.php b/apps/files/l10n/th_TH.php
index 689871a11d..5809ac1f09 100644
--- a/apps/files/l10n/th_TH.php
+++ b/apps/files/l10n/th_TH.php
@@ -10,6 +10,7 @@
 "Delete" => "ลบ",
 "already exists" => "มีอยู่แล้ว",
 "replace" => "แทนที่",
+"suggest name" => "แนะนำชื่อ",
 "cancel" => "ยกเลิก",
 "replaced" => "แทนที่แล้ว",
 "undo" => "เลิกทำ",
diff --git a/apps/files/l10n/zh_CN.php b/apps/files/l10n/zh_CN.php
index f24db8f3cb..3fdb5b6af3 100644
--- a/apps/files/l10n/zh_CN.php
+++ b/apps/files/l10n/zh_CN.php
@@ -10,6 +10,7 @@
 "Delete" => "删除",
 "already exists" => "已经存在",
 "replace" => "替换",
+"suggest name" => "建议名称",
 "cancel" => "取消",
 "replaced" => "已经替换",
 "undo" => "撤销",
@@ -20,6 +21,7 @@
 "Upload Error" => "上传错误",
 "Pending" => "操作等待中",
 "Upload cancelled." => "上传已取消",
+"File upload is in progress. Leaving the page now will cancel the upload." => "文件正在上传中。现在离开此页会导致上传动作被取消。",
 "Invalid name, '/' is not allowed." => "非法的名称，不允许使用‘/’。",
 "Size" => "大小",
 "Modified" => "修改日期",
@@ -34,6 +36,7 @@
 "Enable ZIP-download" => "启用 ZIP 下载",
 "0 is unlimited" => "0 为无限制",
 "Maximum input size for ZIP files" => "ZIP 文件的最大输入大小",
+"Save" => "保存",
 "New" => "新建",
 "Text file" => "文本文件",
 "Folder" => "文件夹",
diff --git a/apps/files_encryption/l10n/zh_CN.php b/apps/files_encryption/l10n/zh_CN.php
new file mode 100644
index 0000000000..139ae90970
--- /dev/null
+++ b/apps/files_encryption/l10n/zh_CN.php
@@ -0,0 +1,5 @@
+<?php $TRANSLATIONS = array(
+"Encryption" => "加密",
+"None" => "None",
+"Enable Encryption" => "开启加密"
+);
diff --git a/apps/files_external/l10n/it.php b/apps/files_external/l10n/it.php
index 927499b017..5c5d32b214 100644
--- a/apps/files_external/l10n/it.php
+++ b/apps/files_external/l10n/it.php
@@ -11,8 +11,8 @@
 "Groups" => "Gruppi",
 "Users" => "Utenti",
 "Delete" => "Elimina",
-"SSL root certificates" => "Certificato principale per SSL",
-"Import Root Certificate" => "Importa certificato principale",
+"SSL root certificates" => "Certificati SSL radice",
+"Import Root Certificate" => "Importa certificato radice",
 "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"
+"Allow users to mount their own external storage" => "Consenti agli utenti di montare la propria memoria esterna"
 );
diff --git a/apps/files_external/l10n/sk_SK.php b/apps/files_external/l10n/sk_SK.php
new file mode 100644
index 0000000000..24087ea7fe
--- /dev/null
+++ b/apps/files_external/l10n/sk_SK.php
@@ -0,0 +1,18 @@
+<?php $TRANSLATIONS = array(
+"External Storage" => "Externé úložisko",
+"Mount point" => "Prípojný bod",
+"Backend" => "Backend",
+"Configuration" => "Nastavenia",
+"Options" => "Možnosti",
+"Applicable" => "Aplikovateľné",
+"Add mount point" => "Pridať prípojný bod",
+"None set" => "Žiadne nastavené",
+"All Users" => "Všetci užívatelia",
+"Groups" => "Skupiny",
+"Users" => "Užívatelia",
+"Delete" => "Odstrániť",
+"SSL root certificates" => "Koreňové SSL certifikáty",
+"Import Root Certificate" => "Importovať koreňový certifikát",
+"Enable User External Storage" => "Povoliť externé úložisko",
+"Allow users to mount their own external storage" => "Povoliť užívateľom pripojiť ich vlastné externé úložisko"
+);
diff --git a/apps/files_sharing/l10n/sk_SK.php b/apps/files_sharing/l10n/sk_SK.php
new file mode 100644
index 0000000000..ec9fc31c87
--- /dev/null
+++ b/apps/files_sharing/l10n/sk_SK.php
@@ -0,0 +1,7 @@
+<?php $TRANSLATIONS = array(
+"Password" => "Heslo",
+"Submit" => "Odoslať",
+"Download" => "Stiahnuť",
+"No preview available for" => "Žiaden náhľad k dispozícii pre",
+"web services under your control" => "webové služby pod Vašou kontrolou"
+);
diff --git a/apps/files_versions/l10n/zh_CN.php b/apps/files_versions/l10n/zh_CN.php
new file mode 100644
index 0000000000..56a474be89
--- /dev/null
+++ b/apps/files_versions/l10n/zh_CN.php
@@ -0,0 +1,6 @@
+<?php $TRANSLATIONS = array(
+"Expire all versions" => "过期所有版本",
+"Versions" => "版本",
+"This will delete all existing backup versions of your files" => "将会删除您的文件的所有备份版本",
+"Enable Files Versioning" => "开启文件版本"
+);
diff --git a/apps/user_ldap/l10n/fi_FI.php b/apps/user_ldap/l10n/fi_FI.php
index 6d0040868f..24195649a6 100644
--- a/apps/user_ldap/l10n/fi_FI.php
+++ b/apps/user_ldap/l10n/fi_FI.php
@@ -19,7 +19,7 @@
 "Port" => "Portti",
 "Base User Tree" => "Oletuskäyttäjäpuu",
 "Base Group Tree" => "Ryhmien juuri",
-"Group-Member association" => "Ryhmä-jäsen assosiaatio (yhteys)",
+"Group-Member association" => "Ryhmän ja jäsenen 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)",
@@ -27,11 +27,11 @@
 "If connection only works with this option, import the LDAP server's SSL certificate in your ownCloud server." => "Jos yhteys toimii vain tällä valinnalla, siirrä LDAP-palvelimen SSL-varmenne ownCloud-palvelimellesi.",
 "Not recommended, use for testing only." => "Ei suositella, käytä vain testausta varten.",
 "User Display Name Field" => "Käyttäjän näytettävän nimen kenttä",
-"The LDAP attribute to use to generate the user`s ownCloud name." => "LDAP attribuutti, jota käytetään käyttäjän ownCloud käyttäjänimenä ",
+"The LDAP attribute to use to generate the user`s ownCloud name." => "LDAP-attribuutti, jota käytetään käyttäjän ownCloud-käyttäjänimenä ",
 "Group Display Name Field" => "Ryhmän \"näytettävä nimi\"-kenttä",
-"The LDAP attribute to use to generate the groups`s ownCloud name." => "LDAP atribuutti, jota käytetään luomaan ryhmän ownCloud nimi",
+"The LDAP attribute to use to generate the groups`s ownCloud name." => "LDAP-attribuutti, jota käytetään luomaan ryhmän ownCloud-nimi",
 "in bytes" => "tavuissa",
 "in seconds. A change empties the cache." => "sekunneissa. Muutos tyhjentää välimuistin.",
-"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Jätä tyhjäksi käyttäjänimi (oletusasetus). Muutoin anna LDAP/AD atribuutti.",
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Jätä tyhjäksi käyttäjänimi (oletusasetus). Muutoin anna LDAP/AD-atribuutti.",
 "Help" => "Ohje"
 );
diff --git a/core/l10n/zh_CN.php b/core/l10n/zh_CN.php
index 1f5216a2ff..4e0a37a877 100644
--- a/core/l10n/zh_CN.php
+++ b/core/l10n/zh_CN.php
@@ -50,6 +50,7 @@
 "Database user" => "数据库用户",
 "Database password" => "数据库密码",
 "Database name" => "数据库名",
+"Database tablespace" => "数据库表空间",
 "Database host" => "数据库主机",
 "Finish setup" => "安装完成",
 "web services under your control" => "由您掌控的网络服务",
diff --git a/l10n/ca/files.po b/l10n/ca/files.po
index baaa56b4eb..b00e52830d 100644
--- a/l10n/ca/files.po
+++ b/l10n/ca/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-09-06 02:01+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-07 02:04+0200\n"
+"PO-Revision-Date: 2012-09-06 06: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"
@@ -54,7 +54,7 @@ msgstr "Ha fallat en escriure al disc"
 msgid "Files"
 msgstr "Fitxers"
 
-#: js/fileactions.js:106 templates/index.php:56
+#: js/fileactions.js:106 templates/index.php:57
 msgid "Delete"
 msgstr "Suprimeix"
 
@@ -68,7 +68,7 @@ msgstr "substitueix"
 
 #: js/filelist.js:186
 msgid "suggest name"
-msgstr ""
+msgstr "sugereix un nom"
 
 #: js/filelist.js:186 js/filelist.js:188
 msgid "cancel"
@@ -78,7 +78,7 @@ msgstr "cancel·la"
 msgid "replaced"
 msgstr "substituït"
 
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:266
 msgid "undo"
 msgstr "desfés"
 
@@ -86,7 +86,7 @@ msgstr "desfés"
 msgid "with"
 msgstr "per"
 
-#: js/filelist.js:271
+#: js/filelist.js:266
 msgid "deleted"
 msgstr "esborrat"
 
@@ -119,11 +119,11 @@ msgstr "Hi ha una pujada en curs. Si abandoneu la pàgina la pujada es cancel·l
 msgid "Invalid name, '/' is not allowed."
 msgstr "El nom no és vàlid, no es permet '/'."
 
-#: js/files.js:746 templates/index.php:55
+#: js/files.js:746 templates/index.php:56
 msgid "Size"
 msgstr "Mida"
 
-#: js/files.js:747 templates/index.php:56
+#: js/files.js:747 templates/index.php:57
 msgid "Modified"
 msgstr "Modificat"
 
@@ -173,7 +173,7 @@ msgstr "Mida màxima d'entrada per fitxers ZIP"
 
 #: templates/admin.php:14
 msgid "Save"
-msgstr "Desar"
+msgstr "Desa"
 
 #: templates/index.php:7
 msgid "New"
@@ -199,36 +199,36 @@ msgstr "Puja"
 msgid "Cancel upload"
 msgstr "Cancel·la la pujada"
 
-#: templates/index.php:39
+#: templates/index.php:40
 msgid "Nothing in here. Upload something!"
 msgstr "Res per aquí. Pugeu alguna cosa!"
 
-#: templates/index.php:47
+#: templates/index.php:48
 msgid "Name"
 msgstr "Nom"
 
-#: templates/index.php:49
+#: templates/index.php:50
 msgid "Share"
 msgstr "Comparteix"
 
-#: templates/index.php:51
+#: templates/index.php:52
 msgid "Download"
 msgstr "Baixa"
 
-#: templates/index.php:64
+#: templates/index.php:65
 msgid "Upload too large"
 msgstr "La pujada és massa gran"
 
-#: templates/index.php:66
+#: templates/index.php:67
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Els fitxers que esteu intentant pujar excedeixen la mida màxima de pujada del servidor"
 
-#: templates/index.php:71
+#: templates/index.php:72
 msgid "Files are being scanned, please wait."
 msgstr "S'estan escanejant els fitxers, espereu"
 
-#: templates/index.php:74
+#: templates/index.php:75
 msgid "Current scanning"
 msgstr "Actualment escanejant"
diff --git a/l10n/ca/settings.po b/l10n/ca/settings.po
index 28539a5b19..8065c1ebee 100644
--- a/l10n/ca/settings.po
+++ b/l10n/ca/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-09-06 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 11:42+0000\n"
-"Last-Translator: bury1000 <bury1000@gmail.com>\n"
+"POT-Creation-Date: 2012-09-07 02:04+0200\n"
+"PO-Revision-Date: 2012-09-06 06: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"
@@ -224,7 +224,7 @@ msgstr "Esteu usant"
 
 #: templates/personal.php:8
 msgid "of the available"
-msgstr "del disponible"
+msgstr "d'un total disponible de"
 
 #: templates/personal.php:12
 msgid "Desktop and Mobile Syncing Clients"
diff --git a/l10n/cs_CZ/files.po b/l10n/cs_CZ/files.po
index 53a6691385..855b138c2a 100644
--- a/l10n/cs_CZ/files.po
+++ b/l10n/cs_CZ/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-09-06 02:01+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-07 02:04+0200\n"
+"PO-Revision-Date: 2012-09-06 08:41+0000\n"
+"Last-Translator: Tomáš Chvátal <tomas.chvatal@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"
@@ -54,7 +54,7 @@ msgstr "Zápis na disk selhal"
 msgid "Files"
 msgstr "Soubory"
 
-#: js/fileactions.js:106 templates/index.php:56
+#: js/fileactions.js:106 templates/index.php:57
 msgid "Delete"
 msgstr "Smazat"
 
@@ -68,7 +68,7 @@ msgstr "nahradit"
 
 #: js/filelist.js:186
 msgid "suggest name"
-msgstr ""
+msgstr "navrhnout název"
 
 #: js/filelist.js:186 js/filelist.js:188
 msgid "cancel"
@@ -78,7 +78,7 @@ msgstr "zrušit"
 msgid "replaced"
 msgstr "nahrazeno"
 
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:266
 msgid "undo"
 msgstr "zpět"
 
@@ -86,7 +86,7 @@ msgstr "zpět"
 msgid "with"
 msgstr "s"
 
-#: js/filelist.js:271
+#: js/filelist.js:266
 msgid "deleted"
 msgstr "smazáno"
 
@@ -119,11 +119,11 @@ msgstr "Probíhá odesílání souboru. Opuštění stránky vyústí ve zrušen
 msgid "Invalid name, '/' is not allowed."
 msgstr "Neplatný název, znak '/' není povolen"
 
-#: js/files.js:746 templates/index.php:55
+#: js/files.js:746 templates/index.php:56
 msgid "Size"
 msgstr "Velikost"
 
-#: js/files.js:747 templates/index.php:56
+#: js/files.js:747 templates/index.php:57
 msgid "Modified"
 msgstr "Změněno"
 
@@ -199,36 +199,36 @@ msgstr "Odeslat"
 msgid "Cancel upload"
 msgstr "Zrušit odesílání"
 
-#: templates/index.php:39
+#: templates/index.php:40
 msgid "Nothing in here. Upload something!"
 msgstr "Žádný obsah. Nahrajte něco."
 
-#: templates/index.php:47
+#: templates/index.php:48
 msgid "Name"
 msgstr "Název"
 
-#: templates/index.php:49
+#: templates/index.php:50
 msgid "Share"
 msgstr "Sdílet"
 
-#: templates/index.php:51
+#: templates/index.php:52
 msgid "Download"
 msgstr "Stáhnout"
 
-#: templates/index.php:64
+#: templates/index.php:65
 msgid "Upload too large"
 msgstr "Odeslaný soubor je příliš velký"
 
-#: templates/index.php:66
+#: templates/index.php:67
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Soubory, které se snažíte odeslat, překračují limit velikosti odesílání na tomto serveru."
 
-#: templates/index.php:71
+#: templates/index.php:72
 msgid "Files are being scanned, please wait."
 msgstr "Soubory se prohledávají, prosím čekejte."
 
-#: templates/index.php:74
+#: templates/index.php:75
 msgid "Current scanning"
 msgstr "Aktuální prohledávání"
diff --git a/l10n/de/files.po b/l10n/de/files.po
index 186ed35ccd..a06845cc3b 100644
--- a/l10n/de/files.po
+++ b/l10n/de/files.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-09-06 02:01+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-07 02:04+0200\n"
+"PO-Revision-Date: 2012-09-06 06:59+0000\n"
+"Last-Translator: goeck <admin@s-goecker.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"
@@ -62,7 +62,7 @@ msgstr "Fehler beim Schreiben auf die Festplatte"
 msgid "Files"
 msgstr "Dateien"
 
-#: js/fileactions.js:106 templates/index.php:56
+#: js/fileactions.js:106 templates/index.php:57
 msgid "Delete"
 msgstr "Löschen"
 
@@ -76,7 +76,7 @@ msgstr "ersetzen"
 
 #: js/filelist.js:186
 msgid "suggest name"
-msgstr ""
+msgstr "Name vorschlagen"
 
 #: js/filelist.js:186 js/filelist.js:188
 msgid "cancel"
@@ -86,7 +86,7 @@ msgstr "abbrechen"
 msgid "replaced"
 msgstr "ersetzt"
 
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:266
 msgid "undo"
 msgstr "rückgängig machen"
 
@@ -94,7 +94,7 @@ msgstr "rückgängig machen"
 msgid "with"
 msgstr "mit"
 
-#: js/filelist.js:271
+#: js/filelist.js:266
 msgid "deleted"
 msgstr "gelöscht"
 
@@ -127,11 +127,11 @@ msgstr "Dateiupload läuft. Wenn Sie die Seite jetzt verlassen, wird der Upload
 msgid "Invalid name, '/' is not allowed."
 msgstr "Ungültiger Name: \"/\" ist nicht erlaubt."
 
-#: js/files.js:746 templates/index.php:55
+#: js/files.js:746 templates/index.php:56
 msgid "Size"
 msgstr "Größe"
 
-#: js/files.js:747 templates/index.php:56
+#: js/files.js:747 templates/index.php:57
 msgid "Modified"
 msgstr "Bearbeitet"
 
@@ -207,36 +207,36 @@ msgstr "Hochladen"
 msgid "Cancel upload"
 msgstr "Upload abbrechen"
 
-#: templates/index.php:39
+#: templates/index.php:40
 msgid "Nothing in here. Upload something!"
 msgstr "Alles leer. Lade etwas hoch!"
 
-#: templates/index.php:47
+#: templates/index.php:48
 msgid "Name"
 msgstr "Name"
 
-#: templates/index.php:49
+#: templates/index.php:50
 msgid "Share"
 msgstr "Teilen"
 
-#: templates/index.php:51
+#: templates/index.php:52
 msgid "Download"
 msgstr "Herunterladen"
 
-#: templates/index.php:64
+#: templates/index.php:65
 msgid "Upload too large"
 msgstr "Upload zu groß"
 
-#: templates/index.php:66
+#: templates/index.php:67
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Die Datei überschreitet die Maximalgröße für Uploads auf diesem Server."
 
-#: templates/index.php:71
+#: templates/index.php:72
 msgid "Files are being scanned, please wait."
 msgstr "Dateien werden gescannt, bitte warten."
 
-#: templates/index.php:74
+#: templates/index.php:75
 msgid "Current scanning"
 msgstr "Scannen"
diff --git a/l10n/es/files.po b/l10n/es/files.po
index feda263183..1889dd54e9 100644
--- a/l10n/es/files.po
+++ b/l10n/es/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-09-06 02:01+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-07 02:04+0200\n"
+"PO-Revision-Date: 2012-09-06 05:09+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"
@@ -55,7 +55,7 @@ msgstr "La escritura en disco ha fallado"
 msgid "Files"
 msgstr "Archivos"
 
-#: js/fileactions.js:106 templates/index.php:56
+#: js/fileactions.js:106 templates/index.php:57
 msgid "Delete"
 msgstr "Eliminado"
 
@@ -69,7 +69,7 @@ msgstr "reemplazar"
 
 #: js/filelist.js:186
 msgid "suggest name"
-msgstr ""
+msgstr "sugerir nombre"
 
 #: js/filelist.js:186 js/filelist.js:188
 msgid "cancel"
@@ -79,7 +79,7 @@ msgstr "cancelar"
 msgid "replaced"
 msgstr "reemplazado"
 
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:266
 msgid "undo"
 msgstr "deshacer"
 
@@ -87,7 +87,7 @@ msgstr "deshacer"
 msgid "with"
 msgstr "con"
 
-#: js/filelist.js:271
+#: js/filelist.js:266
 msgid "deleted"
 msgstr "borrado"
 
@@ -120,11 +120,11 @@ msgstr "La subida del archivo está en proceso. Salir de la página ahora cancel
 msgid "Invalid name, '/' is not allowed."
 msgstr "Nombre no válido, '/' no está permitido."
 
-#: js/files.js:746 templates/index.php:55
+#: js/files.js:746 templates/index.php:56
 msgid "Size"
 msgstr "Tamaño"
 
-#: js/files.js:747 templates/index.php:56
+#: js/files.js:747 templates/index.php:57
 msgid "Modified"
 msgstr "Modificado"
 
@@ -200,36 +200,36 @@ msgstr "Subir"
 msgid "Cancel upload"
 msgstr "Cancelar subida"
 
-#: templates/index.php:39
+#: templates/index.php:40
 msgid "Nothing in here. Upload something!"
 msgstr "Aquí no hay nada. ¡Sube algo!"
 
-#: templates/index.php:47
+#: templates/index.php:48
 msgid "Name"
 msgstr "Nombre"
 
-#: templates/index.php:49
+#: templates/index.php:50
 msgid "Share"
 msgstr "Compartir"
 
-#: templates/index.php:51
+#: templates/index.php:52
 msgid "Download"
 msgstr "Descargar"
 
-#: templates/index.php:64
+#: templates/index.php:65
 msgid "Upload too large"
 msgstr "El archivo es demasiado grande"
 
-#: templates/index.php:66
+#: templates/index.php:67
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Los archivos que estás intentando subir sobrepasan el tamaño máximo permitido por este servidor."
 
-#: templates/index.php:71
+#: templates/index.php:72
 msgid "Files are being scanned, please wait."
 msgstr "Se están escaneando los archivos, por favor espere."
 
-#: templates/index.php:74
+#: templates/index.php:75
 msgid "Current scanning"
 msgstr "Escaneo actual"
diff --git a/l10n/fi_FI/files.po b/l10n/fi_FI/files.po
index f82b204f60..67278ea29f 100644
--- a/l10n/fi_FI/files.po
+++ b/l10n/fi_FI/files.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-09-06 02:01+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-07 02:04+0200\n"
+"PO-Revision-Date: 2012-09-06 10:47+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"
@@ -56,7 +56,7 @@ msgstr "Levylle kirjoitus epäonnistui"
 msgid "Files"
 msgstr "Tiedostot"
 
-#: js/fileactions.js:106 templates/index.php:56
+#: js/fileactions.js:106 templates/index.php:57
 msgid "Delete"
 msgstr "Poista"
 
@@ -70,7 +70,7 @@ msgstr "korvaa"
 
 #: js/filelist.js:186
 msgid "suggest name"
-msgstr ""
+msgstr "ehdota nimeä"
 
 #: js/filelist.js:186 js/filelist.js:188
 msgid "cancel"
@@ -80,7 +80,7 @@ msgstr "peru"
 msgid "replaced"
 msgstr "korvattu"
 
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:266
 msgid "undo"
 msgstr "kumoa"
 
@@ -88,7 +88,7 @@ msgstr "kumoa"
 msgid "with"
 msgstr "käyttäen"
 
-#: js/filelist.js:271
+#: js/filelist.js:266
 msgid "deleted"
 msgstr "poistettu"
 
@@ -121,11 +121,11 @@ msgstr "Tiedoston lähetys on meneillään. Sivulta poistuminen nyt peruu tiedos
 msgid "Invalid name, '/' is not allowed."
 msgstr "Virheellinen nimi, merkki '/' ei ole sallittu."
 
-#: js/files.js:746 templates/index.php:55
+#: js/files.js:746 templates/index.php:56
 msgid "Size"
 msgstr "Koko"
 
-#: js/files.js:747 templates/index.php:56
+#: js/files.js:747 templates/index.php:57
 msgid "Modified"
 msgstr "Muutettu"
 
@@ -201,36 +201,36 @@ msgstr "Lähetä"
 msgid "Cancel upload"
 msgstr "Peru lähetys"
 
-#: templates/index.php:39
+#: templates/index.php:40
 msgid "Nothing in here. Upload something!"
 msgstr "Täällä ei ole mitään. Lähetä tänne jotakin!"
 
-#: templates/index.php:47
+#: templates/index.php:48
 msgid "Name"
 msgstr "Nimi"
 
-#: templates/index.php:49
+#: templates/index.php:50
 msgid "Share"
 msgstr "Jaa"
 
-#: templates/index.php:51
+#: templates/index.php:52
 msgid "Download"
 msgstr "Lataa"
 
-#: templates/index.php:64
+#: templates/index.php:65
 msgid "Upload too large"
 msgstr "Lähetettävä tiedosto on liian suuri"
 
-#: templates/index.php:66
+#: templates/index.php:67
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Lähetettäväksi valitsemasi tiedostot ylittävät palvelimen salliman tiedostokoon rajan."
 
-#: templates/index.php:71
+#: templates/index.php:72
 msgid "Files are being scanned, please wait."
 msgstr "Tiedostoja tarkistetaan, odota hetki."
 
-#: templates/index.php:74
+#: templates/index.php:75
 msgid "Current scanning"
 msgstr "Tämänhetkinen tutkinta"
diff --git a/l10n/fi_FI/user_ldap.po b/l10n/fi_FI/user_ldap.po
index 62a31960b0..085ca3dd65 100644
--- a/l10n/fi_FI/user_ldap.po
+++ b/l10n/fi_FI/user_ldap.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-09-06 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 16:49+0000\n"
-"Last-Translator: teho <tehoratopato@gmail.com>\n"
+"POT-Creation-Date: 2012-09-07 02:04+0200\n"
+"PO-Revision-Date: 2012-09-06 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"
@@ -110,7 +110,7 @@ msgstr "Ryhmien juuri"
 
 #: templates/settings.php:20
 msgid "Group-Member association"
-msgstr "Ryhmä-jäsen assosiaatio (yhteys)"
+msgstr "Ryhmän ja jäsenen assosiaatio (yhteys)"
 
 #: templates/settings.php:21
 msgid "Use TLS"
@@ -144,7 +144,7 @@ msgstr "Käyttäjän näytettävän nimen kenttä"
 
 #: templates/settings.php:24
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
-msgstr "LDAP attribuutti, jota käytetään käyttäjän ownCloud käyttäjänimenä "
+msgstr "LDAP-attribuutti, jota käytetään käyttäjän ownCloud-käyttäjänimenä "
 
 #: templates/settings.php:25
 msgid "Group Display Name Field"
@@ -152,7 +152,7 @@ msgstr "Ryhmän \"näytettävä nimi\"-kenttä"
 
 #: templates/settings.php:25
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
-msgstr "LDAP atribuutti, jota käytetään luomaan ryhmän ownCloud nimi"
+msgstr "LDAP-attribuutti, jota käytetään luomaan ryhmän ownCloud-nimi"
 
 #: templates/settings.php:27
 msgid "in bytes"
@@ -166,7 +166,7 @@ msgstr "sekunneissa. Muutos tyhjentää välimuistin."
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
-msgstr "Jätä tyhjäksi käyttäjänimi (oletusasetus). Muutoin anna LDAP/AD atribuutti."
+msgstr "Jätä tyhjäksi käyttäjänimi (oletusasetus). Muutoin anna LDAP/AD-atribuutti."
 
 #: templates/settings.php:32
 msgid "Help"
diff --git a/l10n/it/core.po b/l10n/it/core.po
index 39884ebdc9..f4904b2792 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-09-06 02:02+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-07 02:04+0200\n"
+"PO-Revision-Date: 2012-09-06 05:05+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"
diff --git a/l10n/it/files.po b/l10n/it/files.po
index daa29074e6..6175346abd 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-09-06 02:01+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-07 02:04+0200\n"
+"PO-Revision-Date: 2012-09-06 04:57+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"
@@ -55,7 +55,7 @@ msgstr "Scrittura su disco non riuscita"
 msgid "Files"
 msgstr "File"
 
-#: js/fileactions.js:106 templates/index.php:56
+#: js/fileactions.js:106 templates/index.php:57
 msgid "Delete"
 msgstr "Elimina"
 
@@ -69,7 +69,7 @@ msgstr "sostituisci"
 
 #: js/filelist.js:186
 msgid "suggest name"
-msgstr ""
+msgstr "suggerisci nome"
 
 #: js/filelist.js:186 js/filelist.js:188
 msgid "cancel"
@@ -79,7 +79,7 @@ msgstr "annulla"
 msgid "replaced"
 msgstr "sostituito"
 
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:266
 msgid "undo"
 msgstr "annulla"
 
@@ -87,7 +87,7 @@ msgstr "annulla"
 msgid "with"
 msgstr "con"
 
-#: js/filelist.js:271
+#: js/filelist.js:266
 msgid "deleted"
 msgstr "eliminati"
 
@@ -120,11 +120,11 @@ msgstr "Caricamento del file in corso. La chiusura della pagina annullerà il ca
 msgid "Invalid name, '/' is not allowed."
 msgstr "Nome non valido"
 
-#: js/files.js:746 templates/index.php:55
+#: js/files.js:746 templates/index.php:56
 msgid "Size"
 msgstr "Dimensione"
 
-#: js/files.js:747 templates/index.php:56
+#: js/files.js:747 templates/index.php:57
 msgid "Modified"
 msgstr "Modificato"
 
@@ -200,36 +200,36 @@ msgstr "Carica"
 msgid "Cancel upload"
 msgstr "Annulla invio"
 
-#: templates/index.php:39
+#: templates/index.php:40
 msgid "Nothing in here. Upload something!"
 msgstr "Non c'è niente qui. Carica qualcosa!"
 
-#: templates/index.php:47
+#: templates/index.php:48
 msgid "Name"
 msgstr "Nome"
 
-#: templates/index.php:49
+#: templates/index.php:50
 msgid "Share"
 msgstr "Condividi"
 
-#: templates/index.php:51
+#: templates/index.php:52
 msgid "Download"
 msgstr "Scarica"
 
-#: templates/index.php:64
+#: templates/index.php:65
 msgid "Upload too large"
 msgstr "Il file caricato è troppo grande"
 
-#: templates/index.php:66
+#: templates/index.php:67
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "I file che stai provando a caricare superano la dimensione massima consentita su questo server."
 
-#: templates/index.php:71
+#: templates/index.php:72
 msgid "Files are being scanned, please wait."
 msgstr "Scansione dei file in corso, attendi"
 
-#: templates/index.php:74
+#: templates/index.php:75
 msgid "Current scanning"
 msgstr "Scansione corrente"
diff --git a/l10n/it/files_external.po b/l10n/it/files_external.po
index 801511ce3b..1875987bf4 100644
--- a/l10n/it/files_external.po
+++ b/l10n/it/files_external.po
@@ -9,15 +9,15 @@ 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:42+0000\n"
-"Last-Translator: Innocenzo Ventre <el.diabl09@gmail.com>\n"
+"POT-Creation-Date: 2012-09-07 02:04+0200\n"
+"PO-Revision-Date: 2012-09-06 05:03+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"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/settings.php:3
 msgid "External Storage"
@@ -69,11 +69,11 @@ msgstr "Elimina"
 
 #: templates/settings.php:88
 msgid "SSL root certificates"
-msgstr "Certificato principale per SSL"
+msgstr "Certificati SSL radice"
 
 #: templates/settings.php:102
 msgid "Import Root Certificate"
-msgstr "Importa certificato principale"
+msgstr "Importa certificato radice"
 
 #: templates/settings.php:108
 msgid "Enable User External Storage"
@@ -81,4 +81,4 @@ msgstr "Abilita la memoria esterna dell'utente"
 
 #: templates/settings.php:109
 msgid "Allow users to mount their own external storage"
-msgstr "Consente agli utenti di montare la propria memoria esterna"
+msgstr "Consenti agli utenti di montare la propria memoria esterna"
diff --git a/l10n/pl/files.po b/l10n/pl/files.po
index 2512f6db59..a3ea40e9bd 100644
--- a/l10n/pl/files.po
+++ b/l10n/pl/files.po
@@ -4,7 +4,7 @@
 # 
 # Translators:
 # Cyryl Sochacki <>, 2012.
-# Marcin Małecki <gerber@tkdami.net>, 2011, 2012.
+# Marcin Małecki <gerber@tkdami.net>, 2011-2012.
 #   <mosslar@gmail.com>, 2011.
 #   <mplichta@gmail.com>, 2012.
 # Piotr Sokół <psokol@jabster.pl>, 2012.
@@ -12,9 +12,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-06 02:01+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-07 02:04+0200\n"
+"PO-Revision-Date: 2012-09-06 13:42+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"
@@ -56,7 +56,7 @@ msgstr "Błąd zapisu na dysk"
 msgid "Files"
 msgstr "Pliki"
 
-#: js/fileactions.js:106 templates/index.php:56
+#: js/fileactions.js:106 templates/index.php:57
 msgid "Delete"
 msgstr "Usuwa element"
 
@@ -70,7 +70,7 @@ msgstr "zastap"
 
 #: js/filelist.js:186
 msgid "suggest name"
-msgstr ""
+msgstr "zasugeruj nazwę"
 
 #: js/filelist.js:186 js/filelist.js:188
 msgid "cancel"
@@ -80,7 +80,7 @@ msgstr "anuluj"
 msgid "replaced"
 msgstr "zastąpione"
 
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:266
 msgid "undo"
 msgstr "wróć"
 
@@ -88,7 +88,7 @@ msgstr "wróć"
 msgid "with"
 msgstr "z"
 
-#: js/filelist.js:271
+#: js/filelist.js:266
 msgid "deleted"
 msgstr "skasuj"
 
@@ -121,11 +121,11 @@ msgstr "Wysyłanie pliku jest w toku. Teraz opuszczając stronę wysyłanie zost
 msgid "Invalid name, '/' is not allowed."
 msgstr "Nieprawidłowa nazwa '/' jest niedozwolone."
 
-#: js/files.js:746 templates/index.php:55
+#: js/files.js:746 templates/index.php:56
 msgid "Size"
 msgstr "Rozmiar"
 
-#: js/files.js:747 templates/index.php:56
+#: js/files.js:747 templates/index.php:57
 msgid "Modified"
 msgstr "Czas modyfikacji"
 
@@ -201,36 +201,36 @@ msgstr "Prześlij"
 msgid "Cancel upload"
 msgstr "Przestań wysyłać"
 
-#: templates/index.php:39
+#: templates/index.php:40
 msgid "Nothing in here. Upload something!"
 msgstr "Brak zawartości. Proszę wysłać pliki!"
 
-#: templates/index.php:47
+#: templates/index.php:48
 msgid "Name"
 msgstr "Nazwa"
 
-#: templates/index.php:49
+#: templates/index.php:50
 msgid "Share"
 msgstr "Współdziel"
 
-#: templates/index.php:51
+#: templates/index.php:52
 msgid "Download"
 msgstr "Pobiera element"
 
-#: templates/index.php:64
+#: templates/index.php:65
 msgid "Upload too large"
 msgstr "Wysyłany plik ma za duży rozmiar"
 
-#: templates/index.php:66
+#: templates/index.php:67
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Pliki które próbujesz przesłać, przekraczają maksymalną, dopuszczalną wielkość."
 
-#: templates/index.php:71
+#: templates/index.php:72
 msgid "Files are being scanned, please wait."
 msgstr "Skanowanie plików, proszę czekać."
 
-#: templates/index.php:74
+#: templates/index.php:75
 msgid "Current scanning"
 msgstr "Aktualnie skanowane"
diff --git a/l10n/sk_SK/files_external.po b/l10n/sk_SK/files_external.po
index 99cbb6e3c4..5c0dd5a8c7 100644
--- a/l10n/sk_SK/files_external.po
+++ b/l10n/sk_SK/files_external.po
@@ -3,80 +3,81 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <intense.feel@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-09-07 02:04+0200\n"
+"PO-Revision-Date: 2012-09-06 17:51+0000\n"
+"Last-Translator: intense <intense.feel@gmail.com>\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"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #: templates/settings.php:3
 msgid "External Storage"
-msgstr ""
+msgstr "Externé úložisko"
 
 #: templates/settings.php:7 templates/settings.php:19
 msgid "Mount point"
-msgstr ""
+msgstr "Prípojný bod"
 
 #: templates/settings.php:8
 msgid "Backend"
-msgstr ""
+msgstr "Backend"
 
 #: templates/settings.php:9
 msgid "Configuration"
-msgstr ""
+msgstr "Nastavenia"
 
 #: templates/settings.php:10
 msgid "Options"
-msgstr ""
+msgstr "Možnosti"
 
 #: templates/settings.php:11
 msgid "Applicable"
-msgstr ""
+msgstr "Aplikovateľné"
 
 #: templates/settings.php:23
 msgid "Add mount point"
-msgstr ""
+msgstr "Pridať prípojný bod"
 
 #: templates/settings.php:54 templates/settings.php:62
 msgid "None set"
-msgstr ""
+msgstr "Žiadne nastavené"
 
 #: templates/settings.php:63
 msgid "All Users"
-msgstr ""
+msgstr "Všetci užívatelia"
 
 #: templates/settings.php:64
 msgid "Groups"
-msgstr ""
+msgstr "Skupiny"
 
 #: templates/settings.php:69
 msgid "Users"
-msgstr ""
+msgstr "Užívatelia"
 
 #: templates/settings.php:77 templates/settings.php:96
 msgid "Delete"
-msgstr ""
+msgstr "Odstrániť"
 
 #: templates/settings.php:88
 msgid "SSL root certificates"
-msgstr ""
+msgstr "Koreňové SSL certifikáty"
 
 #: templates/settings.php:102
 msgid "Import Root Certificate"
-msgstr ""
+msgstr "Importovať koreňový certifikát"
 
 #: templates/settings.php:108
 msgid "Enable User External Storage"
-msgstr ""
+msgstr "Povoliť externé úložisko"
 
 #: templates/settings.php:109
 msgid "Allow users to mount their own external storage"
-msgstr ""
+msgstr "Povoliť užívateľom pripojiť ich vlastné externé úložisko"
diff --git a/l10n/sk_SK/files_sharing.po b/l10n/sk_SK/files_sharing.po
index bda598320e..d28ae49cf7 100644
--- a/l10n/sk_SK/files_sharing.po
+++ b/l10n/sk_SK/files_sharing.po
@@ -3,36 +3,37 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <intense.feel@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-07 02:04+0200\n"
+"PO-Revision-Date: 2012-09-06 17:47+0000\n"
+"Last-Translator: intense <intense.feel@gmail.com>\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"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
 
 #: templates/authenticate.php:4
 msgid "Password"
-msgstr ""
+msgstr "Heslo"
 
 #: templates/authenticate.php:6
 msgid "Submit"
-msgstr ""
+msgstr "Odoslať"
 
 #: templates/public.php:9 templates/public.php:19
 msgid "Download"
-msgstr ""
+msgstr "Stiahnuť"
 
 #: templates/public.php:18
 msgid "No preview available for"
-msgstr ""
+msgstr "Žiaden náhľad k dispozícii pre"
 
-#: templates/public.php:23
+#: templates/public.php:25
 msgid "web services under your control"
-msgstr ""
+msgstr "webové služby pod Vašou kontrolou"
diff --git a/l10n/sl/files.po b/l10n/sl/files.po
index 73d23c2579..af1cffc01a 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-09-06 02:01+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-07 02:04+0200\n"
+"PO-Revision-Date: 2012-09-06 05:16+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"
@@ -54,7 +54,7 @@ msgstr "Pisanje na disk je spodletelo"
 msgid "Files"
 msgstr "Datoteke"
 
-#: js/fileactions.js:106 templates/index.php:56
+#: js/fileactions.js:106 templates/index.php:57
 msgid "Delete"
 msgstr "Izbriši"
 
@@ -68,7 +68,7 @@ msgstr "nadomesti"
 
 #: js/filelist.js:186
 msgid "suggest name"
-msgstr ""
+msgstr "predlagaj ime"
 
 #: js/filelist.js:186 js/filelist.js:188
 msgid "cancel"
@@ -78,7 +78,7 @@ msgstr "ekliči"
 msgid "replaced"
 msgstr "nadomeščen"
 
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:266
 msgid "undo"
 msgstr "razveljavi"
 
@@ -86,7 +86,7 @@ msgstr "razveljavi"
 msgid "with"
 msgstr "z"
 
-#: js/filelist.js:271
+#: js/filelist.js:266
 msgid "deleted"
 msgstr "izbrisano"
 
@@ -119,11 +119,11 @@ msgstr "Nalaganje datoteke je v teku. Če zapustite to stran zdaj, boste nalagan
 msgid "Invalid name, '/' is not allowed."
 msgstr "Neveljavno ime. Znak '/' ni dovoljen."
 
-#: js/files.js:746 templates/index.php:55
+#: js/files.js:746 templates/index.php:56
 msgid "Size"
 msgstr "Velikost"
 
-#: js/files.js:747 templates/index.php:56
+#: js/files.js:747 templates/index.php:57
 msgid "Modified"
 msgstr "Spremenjeno"
 
@@ -199,36 +199,36 @@ msgstr "Naloži"
 msgid "Cancel upload"
 msgstr "Prekliči nalaganje"
 
-#: templates/index.php:39
+#: templates/index.php:40
 msgid "Nothing in here. Upload something!"
 msgstr "Tukaj ni ničesar. Naložite kaj!"
 
-#: templates/index.php:47
+#: templates/index.php:48
 msgid "Name"
 msgstr "Ime"
 
-#: templates/index.php:49
+#: templates/index.php:50
 msgid "Share"
 msgstr "Souporaba"
 
-#: templates/index.php:51
+#: templates/index.php:52
 msgid "Download"
 msgstr "Prenesi"
 
-#: templates/index.php:64
+#: templates/index.php:65
 msgid "Upload too large"
 msgstr "Nalaganje ni mogoče, ker je preveliko"
 
-#: templates/index.php:66
+#: templates/index.php:67
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Datoteke, ki jih želite naložiti, presegajo največjo dovoljeno velikost na tem strežniku."
 
-#: templates/index.php:71
+#: templates/index.php:72
 msgid "Files are being scanned, please wait."
 msgstr "Preiskujem datoteke, prosimo počakajte."
 
-#: templates/index.php:74
+#: templates/index.php:75
 msgid "Current scanning"
 msgstr "Trenutno preiskujem"
diff --git a/l10n/sv/files.po b/l10n/sv/files.po
index 847a38a395..81ea65ce48 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-09-06 02:01+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-07 02:04+0200\n"
+"PO-Revision-Date: 2012-09-06 13:34+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"
@@ -57,7 +57,7 @@ msgstr "Misslyckades spara till disk"
 msgid "Files"
 msgstr "Filer"
 
-#: js/fileactions.js:106 templates/index.php:56
+#: js/fileactions.js:106 templates/index.php:57
 msgid "Delete"
 msgstr "Radera"
 
@@ -71,7 +71,7 @@ msgstr "ersätt"
 
 #: js/filelist.js:186
 msgid "suggest name"
-msgstr ""
+msgstr "föreslå namn"
 
 #: js/filelist.js:186 js/filelist.js:188
 msgid "cancel"
@@ -81,7 +81,7 @@ msgstr "avbryt"
 msgid "replaced"
 msgstr "ersatt"
 
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:266
 msgid "undo"
 msgstr "ångra"
 
@@ -89,7 +89,7 @@ msgstr "ångra"
 msgid "with"
 msgstr "med"
 
-#: js/filelist.js:271
+#: js/filelist.js:266
 msgid "deleted"
 msgstr "raderad"
 
@@ -122,11 +122,11 @@ msgstr "Filuppladdning pågår. Lämnar du sidan så avbryts uppladdningen."
 msgid "Invalid name, '/' is not allowed."
 msgstr "Ogiltigt namn, '/' är inte tillåten."
 
-#: js/files.js:746 templates/index.php:55
+#: js/files.js:746 templates/index.php:56
 msgid "Size"
 msgstr "Storlek"
 
-#: js/files.js:747 templates/index.php:56
+#: js/files.js:747 templates/index.php:57
 msgid "Modified"
 msgstr "Ändrad"
 
@@ -202,36 +202,36 @@ msgstr "Ladda upp"
 msgid "Cancel upload"
 msgstr "Avbryt uppladdning"
 
-#: templates/index.php:39
+#: templates/index.php:40
 msgid "Nothing in here. Upload something!"
 msgstr "Ingenting här. Ladda upp något!"
 
-#: templates/index.php:47
+#: templates/index.php:48
 msgid "Name"
 msgstr "Namn"
 
-#: templates/index.php:49
+#: templates/index.php:50
 msgid "Share"
 msgstr "Dela"
 
-#: templates/index.php:51
+#: templates/index.php:52
 msgid "Download"
 msgstr "Ladda ner"
 
-#: templates/index.php:64
+#: templates/index.php:65
 msgid "Upload too large"
 msgstr "För stor uppladdning"
 
-#: templates/index.php:66
+#: templates/index.php:67
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Filerna du försöker ladda upp överstiger den maximala storleken för filöverföringar på servern."
 
-#: templates/index.php:71
+#: templates/index.php:72
 msgid "Files are being scanned, please wait."
 msgstr "Filer skannas, var god vänta"
 
-#: templates/index.php:74
+#: templates/index.php:75
 msgid "Current scanning"
 msgstr "Aktuell skanning"
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index 9112352a3a..b702651ccd 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-09-06 02:02+0200\n"
+"POT-Creation-Date: 2012-09-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 74ab323086..08fbebab79 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-09-06 02:01+0200\n"
+"POT-Creation-Date: 2012-09-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"
@@ -51,7 +51,7 @@ msgstr ""
 msgid "Files"
 msgstr ""
 
-#: js/fileactions.js:106 templates/index.php:56
+#: js/fileactions.js:106 templates/index.php:57
 msgid "Delete"
 msgstr ""
 
@@ -75,7 +75,7 @@ msgstr ""
 msgid "replaced"
 msgstr ""
 
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:266
 msgid "undo"
 msgstr ""
 
@@ -83,7 +83,7 @@ msgstr ""
 msgid "with"
 msgstr ""
 
-#: js/filelist.js:271
+#: js/filelist.js:266
 msgid "deleted"
 msgstr ""
 
@@ -116,11 +116,11 @@ msgstr ""
 msgid "Invalid name, '/' is not allowed."
 msgstr ""
 
-#: js/files.js:746 templates/index.php:55
+#: js/files.js:746 templates/index.php:56
 msgid "Size"
 msgstr ""
 
-#: js/files.js:747 templates/index.php:56
+#: js/files.js:747 templates/index.php:57
 msgid "Modified"
 msgstr ""
 
@@ -196,36 +196,36 @@ msgstr ""
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:39
+#: templates/index.php:40
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:47
+#: templates/index.php:48
 msgid "Name"
 msgstr ""
 
-#: templates/index.php:49
+#: templates/index.php:50
 msgid "Share"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/index.php:52
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:64
+#: templates/index.php:65
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:66
+#: templates/index.php:67
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:71
+#: templates/index.php:72
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:74
+#: templates/index.php:75
 msgid "Current scanning"
 msgstr ""
diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot
index 0590a19880..372d9301ed 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-09-06 02:01+0200\n"
+"POT-Creation-Date: 2012-09-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_external.pot b/l10n/templates/files_external.pot
index 76fafddc1b..d09f705535 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-09-06 02:01+0200\n"
+"POT-Creation-Date: 2012-09-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_sharing.pot b/l10n/templates/files_sharing.pot
index b0c4586782..e9f6afc98d 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-09-06 02:01+0200\n"
+"POT-Creation-Date: 2012-09-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_versions.pot b/l10n/templates/files_versions.pot
index b17eb3894d..9750a4acc5 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-09-06 02:02+0200\n"
+"POT-Creation-Date: 2012-09-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 5a86298e89..d9c9f8aade 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-09-06 02:02+0200\n"
+"POT-Creation-Date: 2012-09-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 42965d3e0b..8bd0ab8fda 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-09-06 02:02+0200\n"
+"POT-Creation-Date: 2012-09-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/user_ldap.pot b/l10n/templates/user_ldap.pot
index 82b19373c1..45eb19bf9f 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-09-06 02:02+0200\n"
+"POT-Creation-Date: 2012-09-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/th_TH/files.po b/l10n/th_TH/files.po
index b6ff21b382..7c73207131 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-09-06 02:01+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-07 02:04+0200\n"
+"PO-Revision-Date: 2012-09-06 04:45+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"
@@ -53,7 +53,7 @@ msgstr "เขียนข้อมูลลงแผ่นดิสก์ล้
 msgid "Files"
 msgstr "ไฟล์"
 
-#: js/fileactions.js:106 templates/index.php:56
+#: js/fileactions.js:106 templates/index.php:57
 msgid "Delete"
 msgstr "ลบ"
 
@@ -67,7 +67,7 @@ msgstr "แทนที่"
 
 #: js/filelist.js:186
 msgid "suggest name"
-msgstr ""
+msgstr "แนะนำชื่อ"
 
 #: js/filelist.js:186 js/filelist.js:188
 msgid "cancel"
@@ -77,7 +77,7 @@ msgstr "ยกเลิก"
 msgid "replaced"
 msgstr "แทนที่แล้ว"
 
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:266
 msgid "undo"
 msgstr "เลิกทำ"
 
@@ -85,7 +85,7 @@ msgstr "เลิกทำ"
 msgid "with"
 msgstr "กับ"
 
-#: js/filelist.js:271
+#: js/filelist.js:266
 msgid "deleted"
 msgstr "ลบแล้ว"
 
@@ -118,11 +118,11 @@ msgstr "การอัพโหลดไฟล์กำลังอยู่ใ
 msgid "Invalid name, '/' is not allowed."
 msgstr "ชื่อที่ใช้ไม่ถูกต้อง '/' ไม่อนุญาตให้ใช้งาน"
 
-#: js/files.js:746 templates/index.php:55
+#: js/files.js:746 templates/index.php:56
 msgid "Size"
 msgstr "ขนาด"
 
-#: js/files.js:747 templates/index.php:56
+#: js/files.js:747 templates/index.php:57
 msgid "Modified"
 msgstr "ปรับปรุงล่าสุด"
 
@@ -198,36 +198,36 @@ msgstr "อัพโหลด"
 msgid "Cancel upload"
 msgstr "ยกเลิกการอัพโหลด"
 
-#: templates/index.php:39
+#: templates/index.php:40
 msgid "Nothing in here. Upload something!"
 msgstr "ยังไม่มีไฟล์ใดๆอยู่ที่นี่ กรุณาอัพโหลดไฟล์!"
 
-#: templates/index.php:47
+#: templates/index.php:48
 msgid "Name"
 msgstr "ชื่อ"
 
-#: templates/index.php:49
+#: templates/index.php:50
 msgid "Share"
 msgstr "แชร์"
 
-#: templates/index.php:51
+#: templates/index.php:52
 msgid "Download"
 msgstr "ดาวน์โหลด"
 
-#: templates/index.php:64
+#: templates/index.php:65
 msgid "Upload too large"
 msgstr "ไฟล์ที่อัพโหลดมีขนาดใหญ่เกินไป"
 
-#: templates/index.php:66
+#: templates/index.php:67
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "ไฟล์ที่คุณพยายามที่จะอัพโหลดมีขนาดเกินกว่าขนาดสูงสุดที่กำหนดไว้ให้อัพโหลดได้สำหรับเซิร์ฟเวอร์นี้"
 
-#: templates/index.php:71
+#: templates/index.php:72
 msgid "Files are being scanned, please wait."
 msgstr "ไฟล์กำลังอยู่ระหว่างการสแกน, กรุณารอสักครู่."
 
-#: templates/index.php:74
+#: templates/index.php:75
 msgid "Current scanning"
 msgstr "ไฟล์ที่กำลังสแกนอยู่ขณะนี้"
diff --git a/l10n/zh_CN/core.po b/l10n/zh_CN/core.po
index 57d881dcff..5ecd449a62 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:
+#   <appweb.cn@gmail.com>, 2012.
 # 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-09-06 02:02+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-07 02:04+0200\n"
+"PO-Revision-Date: 2012-09-06 07:30+0000\n"
+"Last-Translator: hanfeng <appweb.cn@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"
@@ -227,7 +228,7 @@ msgstr "数据库名"
 
 #: templates/installation.php:109
 msgid "Database tablespace"
-msgstr ""
+msgstr "数据库表空间"
 
 #: templates/installation.php:115
 msgid "Database host"
diff --git a/l10n/zh_CN/files.po b/l10n/zh_CN/files.po
index 3b55dd6341..585310a408 100644
--- a/l10n/zh_CN/files.po
+++ b/l10n/zh_CN/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-09-06 02:01+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-07 02:04+0200\n"
+"PO-Revision-Date: 2012-09-06 07:31+0000\n"
+"Last-Translator: hanfeng <appweb.cn@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 +54,7 @@ msgstr "写入磁盘失败"
 msgid "Files"
 msgstr "文件"
 
-#: js/fileactions.js:106 templates/index.php:56
+#: js/fileactions.js:106 templates/index.php:57
 msgid "Delete"
 msgstr "删除"
 
@@ -68,7 +68,7 @@ msgstr "替换"
 
 #: js/filelist.js:186
 msgid "suggest name"
-msgstr ""
+msgstr "建议名称"
 
 #: js/filelist.js:186 js/filelist.js:188
 msgid "cancel"
@@ -78,7 +78,7 @@ msgstr "取消"
 msgid "replaced"
 msgstr "已经替换"
 
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:266
 msgid "undo"
 msgstr "撤销"
 
@@ -86,7 +86,7 @@ msgstr "撤销"
 msgid "with"
 msgstr "随着"
 
-#: js/filelist.js:271
+#: js/filelist.js:266
 msgid "deleted"
 msgstr "已经删除"
 
@@ -113,17 +113,17 @@ msgstr "上传已取消"
 #: js/files.js:423
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
-msgstr ""
+msgstr "文件正在上传中。现在离开此页会导致上传动作被取消。"
 
 #: js/files.js:493
 msgid "Invalid name, '/' is not allowed."
 msgstr "非法的名称，不允许使用‘/’。"
 
-#: js/files.js:746 templates/index.php:55
+#: js/files.js:746 templates/index.php:56
 msgid "Size"
 msgstr "大小"
 
-#: js/files.js:747 templates/index.php:56
+#: js/files.js:747 templates/index.php:57
 msgid "Modified"
 msgstr "修改日期"
 
@@ -173,7 +173,7 @@ msgstr "ZIP 文件的最大输入大小"
 
 #: templates/admin.php:14
 msgid "Save"
-msgstr ""
+msgstr "保存"
 
 #: templates/index.php:7
 msgid "New"
@@ -199,36 +199,36 @@ msgstr "上传"
 msgid "Cancel upload"
 msgstr "取消上传"
 
-#: templates/index.php:39
+#: templates/index.php:40
 msgid "Nothing in here. Upload something!"
 msgstr "这里还什么都没有。上传些东西吧！"
 
-#: templates/index.php:47
+#: templates/index.php:48
 msgid "Name"
 msgstr "名称"
 
-#: templates/index.php:49
+#: templates/index.php:50
 msgid "Share"
 msgstr "共享"
 
-#: templates/index.php:51
+#: templates/index.php:52
 msgid "Download"
 msgstr "下载"
 
-#: templates/index.php:64
+#: templates/index.php:65
 msgid "Upload too large"
 msgstr "上传文件过大"
 
-#: templates/index.php:66
+#: templates/index.php:67
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "您正尝试上传的文件超过了此服务器可以上传的最大大小"
 
-#: templates/index.php:71
+#: templates/index.php:72
 msgid "Files are being scanned, please wait."
 msgstr "文件正在被扫描，请稍候。"
 
-#: templates/index.php:74
+#: templates/index.php:75
 msgid "Current scanning"
 msgstr "当前扫描"
diff --git a/l10n/zh_CN/files_encryption.po b/l10n/zh_CN/files_encryption.po
index 19d9d60f7d..7e030749cf 100644
--- a/l10n/zh_CN/files_encryption.po
+++ b/l10n/zh_CN/files_encryption.po
@@ -3,23 +3,24 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <appweb.cn@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-09-07 02:04+0200\n"
+"PO-Revision-Date: 2012-09-06 15:39+0000\n"
+"Last-Translator: hanfeng <appweb.cn@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"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: 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 "None"
 
 #: templates/settings.php:10
 msgid "Enable Encryption"
-msgstr ""
+msgstr "开启加密"
diff --git a/l10n/zh_CN/files_versions.po b/l10n/zh_CN/files_versions.po
index 31e3aedf8a..8fc46b7498 100644
--- a/l10n/zh_CN/files_versions.po
+++ b/l10n/zh_CN/files_versions.po
@@ -3,32 +3,33 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <appweb.cn@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 13:35+0200\n"
-"PO-Revision-Date: 2012-09-01 11:35+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-07 02:04+0200\n"
+"PO-Revision-Date: 2012-09-06 13:03+0000\n"
+"Last-Translator: hanfeng <appweb.cn@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"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: js/settings-personal.js:31 templates/settings-personal.php:10
 msgid "Expire all versions"
-msgstr ""
+msgstr "过期所有版本"
 
 #: templates/settings-personal.php:4
 msgid "Versions"
-msgstr ""
+msgstr "版本"
 
 #: templates/settings-personal.php:7
 msgid "This will delete all existing backup versions of your files"
-msgstr ""
+msgstr "将会删除您的文件的所有备份版本"
 
 #: templates/settings.php:3
 msgid "Enable Files Versioning"
-msgstr ""
+msgstr "开启文件版本"
diff --git a/l10n/zh_CN/lib.po b/l10n/zh_CN/lib.po
index 7bb4a2e786..ff9847c828 100644
--- a/l10n/zh_CN/lib.po
+++ b/l10n/zh_CN/lib.po
@@ -3,20 +3,21 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <appweb.cn@gmail.com>, 2012.
 #   <rainofchaos@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 02:01+0200\n"
-"PO-Revision-Date: 2012-09-01 00:02+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-07 02:04+0200\n"
+"PO-Revision-Date: 2012-09-06 07:33+0000\n"
+"Last-Translator: hanfeng <appweb.cn@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"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: app.php:288
 msgid "Help"
@@ -70,57 +71,57 @@ msgstr "认证错误"
 msgid "Token expired. Please reload page."
 msgstr "Token 过期，请刷新页面。"
 
-#: template.php:86
+#: template.php:87
 msgid "seconds ago"
 msgstr "几秒前"
 
-#: template.php:87
+#: template.php:88
 msgid "1 minute ago"
 msgstr "1分钟前"
 
-#: template.php:88
+#: template.php:89
 #, php-format
 msgid "%d minutes ago"
 msgstr "%d 分钟前"
 
-#: template.php:91
+#: template.php:92
 msgid "today"
 msgstr "今天"
 
-#: template.php:92
+#: template.php:93
 msgid "yesterday"
 msgstr "昨天"
 
-#: template.php:93
+#: template.php:94
 #, php-format
 msgid "%d days ago"
 msgstr "%d 天前"
 
-#: template.php:94
+#: template.php:95
 msgid "last month"
 msgstr "上月"
 
-#: template.php:95
+#: template.php:96
 msgid "months ago"
 msgstr "几月前"
 
-#: template.php:96
+#: template.php:97
 msgid "last year"
 msgstr "上年"
 
-#: template.php:97
+#: template.php:98
 msgid "years ago"
 msgstr "几年前"
 
 #: updater.php:66
 #, php-format
 msgid "%s is available. Get <a href=\"%s\">more information</a>"
-msgstr ""
+msgstr "%s 已存在. 点此 <a href=\"%s\">获取更多信息</a>"
 
 #: updater.php:68
 msgid "up to date"
-msgstr ""
+msgstr "已更新。"
 
 #: updater.php:71
 msgid "updates check is disabled"
-msgstr ""
+msgstr "检查更新功能被关闭。"
diff --git a/l10n/zh_CN/settings.po b/l10n/zh_CN/settings.po
index 8af73f8879..c72ea361e0 100644
--- a/l10n/zh_CN/settings.po
+++ b/l10n/zh_CN/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-09-05 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-07 02:04+0200\n"
+"PO-Revision-Date: 2012-09-06 08:01+0000\n"
+"Last-Translator: hanfeng <appweb.cn@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"
@@ -32,11 +32,11 @@ msgstr "认证错误"
 
 #: ajax/creategroup.php:19
 msgid "Group already exists"
-msgstr ""
+msgstr "已存在组"
 
 #: ajax/creategroup.php:28
 msgid "Unable to add group"
-msgstr ""
+msgstr "不能添加组"
 
 #: ajax/lostpassword.php:14
 msgid "Email saved"
@@ -56,11 +56,11 @@ msgstr "非法请求"
 
 #: ajax/removegroup.php:16
 msgid "Unable to delete group"
-msgstr ""
+msgstr "不能删除组"
 
 #: ajax/removeuser.php:22
 msgid "Unable to delete user"
-msgstr ""
+msgstr "不能删除用户"
 
 #: ajax/setlanguage.php:18
 msgid "Language changed"
@@ -69,12 +69,12 @@ msgstr "语言已修改"
 #: ajax/togglegroups.php:25
 #, php-format
 msgid "Unable to add user to group %s"
-msgstr ""
+msgstr "不能把用户添加到组 %s"
 
 #: ajax/togglegroups.php:31
 #, php-format
 msgid "Unable to remove user from group %s"
-msgstr ""
+msgstr "不能从组%s中移除用户"
 
 #: js/apps.js:18
 msgid "Error"
@@ -107,7 +107,7 @@ msgid ""
 "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."
-msgstr ""
+msgstr "您的数据文件夹和文件可由互联网访问。OwnCloud提供的.htaccess文件未生效。我们强烈建议您配置服务器，以使数据文件夹不可被访问，或者将数据文件夹移到web服务器以外。"
 
 #: templates/admin.php:31
 msgid "Cron"
@@ -127,39 +127,39 @@ msgstr "实现系统 cron 服务"
 
 #: templates/admin.php:41
 msgid "Share API"
-msgstr ""
+msgstr "共享API"
 
 #: templates/admin.php:46
 msgid "Enable Share API"
-msgstr ""
+msgstr "开启共享API"
 
 #: templates/admin.php:47
 msgid "Allow apps to use the Share API"
-msgstr ""
+msgstr "允许 应用 使用共享API"
 
 #: templates/admin.php:51
 msgid "Allow links"
-msgstr ""
+msgstr "允许连接"
 
 #: templates/admin.php:52
 msgid "Allow users to share items to the public with links"
-msgstr ""
+msgstr "允许用户使用连接向公众共享"
 
 #: templates/admin.php:56
 msgid "Allow resharing"
-msgstr ""
+msgstr "允许再次共享"
 
 #: templates/admin.php:57
 msgid "Allow users to share items shared with them again"
-msgstr ""
+msgstr "允许用户将共享给他们的项目再次共享"
 
 #: templates/admin.php:60
 msgid "Allow users to share with anyone"
-msgstr ""
+msgstr "允许用户向任何人共享"
 
 #: templates/admin.php:62
 msgid "Allow users to only share with users in their groups"
-msgstr ""
+msgstr "允许用户只向同组用户共享"
 
 #: templates/admin.php:69
 msgid "Log"
@@ -177,7 +177,7 @@ msgid ""
 "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>."
-msgstr ""
+msgstr "由<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud社区</a>开发，  <a href=\"https://github.com/owncloud\" target=\"_blank\">源代码</a>在<a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>许可证下发布。"
 
 #: templates/apps.php:10
 msgid "Add your App"
@@ -193,7 +193,7 @@ msgstr "查看在 app.owncloud.com 的应用程序页面"
 
 #: templates/apps.php:30
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
-msgstr ""
+msgstr "<span class=\"licence\"></span>-核准： <span class=\"author\"></span>"
 
 #: templates/help.php:9
 msgid "Documentation"
diff --git a/lib/l10n/zh_CN.php b/lib/l10n/zh_CN.php
index 2d05ad3567..8229c77d2d 100644
--- a/lib/l10n/zh_CN.php
+++ b/lib/l10n/zh_CN.php
@@ -21,5 +21,8 @@
 "last month" => "上月",
 "months ago" => "几月前",
 "last year" => "上年",
-"years ago" => "几年前"
+"years ago" => "几年前",
+"%s is available. Get <a href=\"%s\">more information</a>" => "%s 已存在. 点此 <a href=\"%s\">获取更多信息</a>",
+"up to date" => "已更新。",
+"updates check is disabled" => "检查更新功能被关闭。"
 );
diff --git a/settings/l10n/ca.php b/settings/l10n/ca.php
index 524d6c7925..062e9a9734 100644
--- a/settings/l10n/ca.php
+++ b/settings/l10n/ca.php
@@ -46,7 +46,7 @@
 "Go there manually." => "Vés-hi manualment.",
 "Answer" => "Resposta",
 "You use" => "Esteu usant",
-"of the available" => "del disponible",
+"of the available" => "d'un total disponible de",
 "Desktop and Mobile Syncing Clients" => "Clients de sincronització d'escriptori i de mòbil",
 "Download" => "Baixada",
 "Your password got changed" => "La contrasenya ha canviat",
diff --git a/settings/l10n/zh_CN.php b/settings/l10n/zh_CN.php
index 0667cee74b..7927cec61c 100644
--- a/settings/l10n/zh_CN.php
+++ b/settings/l10n/zh_CN.php
@@ -1,26 +1,44 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "无法从应用商店载入列表",
 "Authentication error" => "认证错误",
+"Group already exists" => "已存在组",
+"Unable to add group" => "不能添加组",
 "Email saved" => "电子邮件已保存",
 "Invalid email" => "无效的电子邮件",
 "OpenID Changed" => "OpenID 已修改",
 "Invalid request" => "非法请求",
+"Unable to delete group" => "不能删除组",
+"Unable to delete user" => "不能删除用户",
 "Language changed" => "语言已修改",
+"Unable to add user to group %s" => "不能把用户添加到组 %s",
+"Unable to remove user from group %s" => "不能从组%s中移除用户",
 "Error" => "错误",
 "Disable" => "禁用",
 "Enable" => "启用",
 "Saving..." => "正在保存",
 "__language_name__" => "简体中文",
 "Security Warning" => "安全警告",
+"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." => "您的数据文件夹和文件可由互联网访问。OwnCloud提供的.htaccess文件未生效。我们强烈建议您配置服务器，以使数据文件夹不可被访问，或者将数据文件夹移到web服务器以外。",
 "Cron" => "计划任务",
 "execute one task with each page loaded" => "为每个装入的页面执行任务",
 "cron.php is registered at a webcron service" => "crop.php 已",
 "use systems cron service" => "实现系统 cron 服务",
+"Share API" => "共享API",
+"Enable Share API" => "开启共享API",
+"Allow apps to use the Share API" => "允许 应用 使用共享API",
+"Allow links" => "允许连接",
+"Allow users to share items to the public with links" => "允许用户使用连接向公众共享",
+"Allow resharing" => "允许再次共享",
+"Allow users to share items shared with them again" => "允许用户将共享给他们的项目再次共享",
+"Allow users to share with anyone" => "允许用户向任何人共享",
+"Allow users to only share with users in their groups" => "允许用户只向同组用户共享",
 "Log" => "日志",
 "More" => "更多",
+"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/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>." => "由<a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud社区</a>开发，  <a href=\"https://github.com/owncloud\" target=\"_blank\">源代码</a>在<a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>许可证下发布。",
 "Add your App" => "添加应用",
 "Select an App" => "选择一个应用",
 "See application page at apps.owncloud.com" => "查看在 app.owncloud.com 的应用程序页面",
+"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-核准： <span class=\"author\"></span>",
 "Documentation" => "文档",
 "Managing Big Files" => "管理大文件",
 "Ask a question" => "提问",

From 17dadd5c8a39f1903ffeec2c2c78e5e6cd145d9c Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Thu, 6 Sep 2012 20:36:25 -0400
Subject: [PATCH 1144/1224] Don't show the delete all action if delete
 permission is not granted

---
 apps/files/templates/index.php | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/apps/files/templates/index.php b/apps/files/templates/index.php
index a874529330..ec9e80e955 100644
--- a/apps/files/templates/index.php
+++ b/apps/files/templates/index.php
@@ -54,7 +54,12 @@
 				</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')?> <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>
+				<?php if ($_['permissions'] & OCP\Share::PERMISSION_DELETE): ?>
+					<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>
+				<?php endif; ?>
+			</th>
 		</tr>
 	</thead>
 	<tbody id="fileList">

From 73d726d1b26f011e77761934bcf7f5ce8db86241 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Fri, 7 Sep 2012 00:01:52 -0400
Subject: [PATCH 1145/1224] Support for unshare from self, with a bunch of
 temporary fixes to overcome configuration problems with file actions

---
 apps/files/js/fileactions.js             |  7 ++++++-
 apps/files/js/filelist.js                |  7 ++++++-
 apps/files/templates/index.php           |  7 ++++++-
 apps/files_sharing/lib/share/file.php    |  2 ++
 apps/files_sharing/lib/sharedstorage.php | 18 ++++++++++++++----
 lib/public/share.php                     |  3 ++-
 6 files changed, 36 insertions(+), 8 deletions(-)

diff --git a/apps/files/js/fileactions.js b/apps/files/js/fileactions.js
index b7670fa225..1403d345e8 100644
--- a/apps/files/js/fileactions.js
+++ b/apps/files/js/fileactions.js
@@ -103,7 +103,12 @@ var FileActions={
 			if(img.call){
 				img=img(file);
 			}
-			var html='<a href="#" original-title="' + t('files', 'Delete') + '" class="action delete" style="display:none" />';
+			// NOTE: Temporary fix to allow unsharing of files in root of Shared folder
+			if ($('#dir').val() == '/Shared') {
+				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+'"/>'));
diff --git a/apps/files/js/filelist.js b/apps/files/js/filelist.js
index b777785f4d..7ebfd4b68b 100644
--- a/apps/files/js/filelist.js
+++ b/apps/files/js/filelist.js
@@ -263,7 +263,12 @@ var FileList={
 			return;
 		}
 		FileList.prepareDeletion(files);
-		$('#notification').html(t('files', 'deleted')+' '+files+'<span class="undo">'+t('files', 'undo')+'</span>');
+		// NOTE: Temporary fix to change the text to unshared for files in root of Shared folder
+		if ($('#dir').val() == '/Shared') {
+			$('#notification').html(t('files', 'unshared')+' '+files+'<span class="undo">'+t('files', 'undo')+'</span>');
+		} else {
+			$('#notification').html(t('files', 'deleted')+' '+files+'<span class="undo">'+t('files', 'undo')+'</span>');
+		}
 		$('#notification').fadeIn();
 	},
 	finishDelete:function(ready,sync){
diff --git a/apps/files/templates/index.php b/apps/files/templates/index.php
index ec9e80e955..911a312fb9 100644
--- a/apps/files/templates/index.php
+++ b/apps/files/templates/index.php
@@ -57,7 +57,12 @@
 			<th id="headerDate">
 				<span id="modified"><?php echo $l->t( 'Modified' ); ?></span>
 				<?php if ($_['permissions'] & OCP\Share::PERMISSION_DELETE): ?>
-					<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>
+<!-- 					NOTE: Temporary fix to allow unsharing of files in root of Shared folder -->
+					<?php if ($_['dir'] == '/Shared'): ?>
+						<span class="selectedActions"><a href="" class="delete"><?php echo $l->t('Unshare')?> <img class="svg" alt="<?php echo $l->t('Unshare')?>" src="<?php echo OCP\image_path("core", "actions/delete.svg"); ?>" /></a></span>
+					<?php else: ?>
+						<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>
+					<?php endif; ?>
 				<?php endif; ?>
 			</th>
 		</tr>
diff --git a/apps/files_sharing/lib/share/file.php b/apps/files_sharing/lib/share/file.php
index 82744924be..c8821ee0fe 100644
--- a/apps/files_sharing/lib/share/file.php
+++ b/apps/files_sharing/lib/share/file.php
@@ -91,6 +91,8 @@ class OC_Share_Backend_File implements OCP\Share_Backend_File_Dependent {
 					// Remove Create permission if type is file
 					$file['permissions'] &= ~OCP\Share::PERMISSION_CREATE;
 				}
+				// NOTE: Temporary fix to allow unsharing of files in root of Shared directory
+				$file['permissions'] |= OCP\Share::PERMISSION_DELETE;
 				$files[] = $file;
 			}
 			return $files;
diff --git a/apps/files_sharing/lib/sharedstorage.php b/apps/files_sharing/lib/sharedstorage.php
index 6a2905b52c..4530ce8777 100644
--- a/apps/files_sharing/lib/sharedstorage.php
+++ b/apps/files_sharing/lib/sharedstorage.php
@@ -209,7 +209,7 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
 
 	public function isDeletable($path) {
 		if ($path == '') {
-			return false;
+			return true;
 		}
 		return ($this->getPermissions($path) & OCP\Share::PERMISSION_DELETE);
 	}
@@ -306,9 +306,19 @@ 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->isDeletable($path)) {
-			$storage = OC_Filesystem::getStorage($source);
-			return $storage->unlink($this->getInternalPath($source));
+		if ($source = $this->getSourcePath($path)) {
+			if ($this->isDeletable($path)) {
+				$storage = OC_Filesystem::getStorage($source);
+				return $storage->unlink($this->getInternalPath($source));
+			} else if (dirname($path) == '/' || dirname($path) == '.') {
+				// Unshare the file from the user if in the root of the Shared folder
+				if ($this->is_dir($path)) {
+					$itemType = 'folder';
+				} else {
+					$itemType = 'file';
+				}
+				return OCP\Share::unshareFromSelf($itemType, $path);
+			}
 		}
 		return false;
 	}
diff --git a/lib/public/share.php b/lib/public/share.php
index 7b6b78561d..cf61681424 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -340,7 +340,7 @@ class Share {
 				// TODO
 			}
 			// Delete
-			return self::delete($item['id'], true);
+			return self::delete($item['id']);
 		}
 		return false;
 	}
@@ -564,6 +564,7 @@ class Share {
 			} else {
 				if ($itemType == 'file' || $itemType == 'folder') {
 					$where .= ' `file_target` = ?';
+					$item = \OC_Filesystem::normalizePath($item);
 				} else {
 					$where .= ' `item_target` = ?';
 				}

From 9ea7817a4074ba63a95bda9d0937e7ff01ac2e85 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Fri, 7 Sep 2012 12:27:47 +0200
Subject: [PATCH 1146/1224] Remove core.{css,js} cache on upgrade

---
 lib/base.php      | 1 +
 lib/minimizer.php | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/lib/base.php b/lib/base.php
index 6c556e3d19..cbcbdd2ad0 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -219,6 +219,7 @@ class OC{
 					$tmpl->printPage();
 					exit;
 				}
+				OC_Minimizer::clearCache();
 
 				OC_Config::setValue('version', implode('.', OC_Util::getVersion()));
 				OC_App::checkAppsRequirements();
diff --git a/lib/minimizer.php b/lib/minimizer.php
index 3dc89e331a..6e425efad5 100644
--- a/lib/minimizer.php
+++ b/lib/minimizer.php
@@ -45,6 +45,12 @@ abstract class OC_Minimizer {
 		header('Content-Length: '.strlen($out));
 		echo $out;
 	}
+
+	public function clearCache() {
+		$cache = OC_Cache::getGlobalCache();
+		$cache->delete('core.css.gz');
+		$cache->delete('core.js.gz');
+	}
 }
 
 if (!function_exists('gzdecode')) {

From ff42da58b96999221e8ce0df555b8837ff67bb08 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Fri, 7 Sep 2012 13:16:50 +0200
Subject: [PATCH 1147/1224] Global file cache should also be able to clear with
 prefix

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

diff --git a/lib/cache/fileglobal.php b/lib/cache/fileglobal.php
index d4336553c3..e551ad472a 100644
--- a/lib/cache/fileglobal.php
+++ b/lib/cache/fileglobal.php
@@ -64,12 +64,13 @@ class OC_Cache_FileGlobal{
 		return unlink($cache_dir.$key);
 	}
 
-	public function clear(){
+	public function clear($prefix=''){
 		$cache_dir = self::getCacheDir();
+		$prefix = $this->fixKey($prefix);
 		if($cache_dir and is_dir($cache_dir)){
 			$dh=opendir($cache_dir);
 			while($file=readdir($dh)){
-				if($file!='.' and $file!='..'){
+				if($file!='.' and $file!='..' and ($prefix==='' || strpos($file, $prefix) === 0)){
 					unlink($cache_dir.$file);
 				}
 			}

From cd4b8dbacd04fc821b14534cb43e301e0d2255f1 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Fri, 7 Sep 2012 13:40:04 +0200
Subject: [PATCH 1148/1224] Change caching checks for minimized files

Only use a ETag, but include last modified time into this
Also added the filesize to this. And used the ETag for the
internal cache.
---
 lib/minimizer.php | 27 ++++++++++++---------------
 1 file changed, 12 insertions(+), 15 deletions(-)

diff --git a/lib/minimizer.php b/lib/minimizer.php
index 6e425efad5..ff5f9304d9 100644
--- a/lib/minimizer.php
+++ b/lib/minimizer.php
@@ -1,16 +1,15 @@
 <?php
 
 abstract class OC_Minimizer {
-	public function getLastModified($files) {
-		$last_modified = 0;
+	public function generateETag($files) {
+		$etag = '';
+		sort($files);
 		foreach($files as $file_info) {
 			$file = $file_info[0] . '/' . $file_info[2];
-			$filemtime = filemtime($file);
-			if ($filemtime > $last_modified) {
-				$last_modified = $filemtime;
-			}
+			$stat = stat($file);
+			$etag .= $file.$stat['mtime'].$stat['size'];
 		}
-		return $last_modified;
+		return md5($etag);
 	}
 
 	abstract public function minimizeFiles($files);
@@ -18,23 +17,21 @@ abstract class OC_Minimizer {
 	public function output($files, $cache_key) {
 		header('Content-Type: '.$this->contentType);
 		OC_Response::enableCaching();
-		$last_modified = $this->getLastModified($files);
-		OC_Response::setLastModifiedHeader($last_modified);
+		$etag = $this->generateETag($files);
+		$cache_key .= '-'.$etag;
 
 		$gzout = false;
 		$cache = OC_Cache::getGlobalCache();
 		if (!OC_Request::isNoCache() && (!defined('DEBUG') || !DEBUG)){
+			OC_Response::setETagHeader($etag);
 			$gzout = $cache->get($cache_key.'.gz');
-			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);
+			OC_Response::setETagHeader($etag);
 		}
 		if ($encoding = OC_Request::acceptGZip()) {
 			header('Content-Encoding: '.$encoding);
@@ -48,8 +45,8 @@ abstract class OC_Minimizer {
 
 	public function clearCache() {
 		$cache = OC_Cache::getGlobalCache();
-		$cache->delete('core.css.gz');
-		$cache->delete('core.js.gz');
+		$cache->clear('core.css');
+		$cache->clear('core.js');
 	}
 }
 

From 386d1ac49f0e759c3ed7f23f2df86b721a72b9d1 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Fri, 7 Sep 2012 13:40:30 +0200
Subject: [PATCH 1149/1224] Fix setEtagHeader function

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

diff --git a/lib/response.php b/lib/response.php
index a75135c017..49d79fda70 100644
--- a/lib/response.php
+++ b/lib/response.php
@@ -111,12 +111,13 @@ class OC_Response {
 		if (empty($etag)) {
 			return;
 		}
+		$etag = '"'.$etag.'"';
 		if (isset($_SERVER['HTTP_IF_NONE_MATCH']) &&
 		    trim($_SERVER['HTTP_IF_NONE_MATCH']) == $etag) {
 			self::setStatus(self::STATUS_NOT_MODIFIED);
 			exit;
 		}
-		header('ETag: "'.$etag.'"');
+		header('ETag: '.$etag);
 	}
 
 	/**

From 5e55b4d6e77b91e29838d26765e7f1bd55fe6bbd Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Fri, 7 Sep 2012 14:05:51 +0200
Subject: [PATCH 1150/1224] Whitespace fixes in lib

---
 lib/base.php | 8 ++++----
 lib/db.php   | 2 +-
 lib/l10n.php | 6 +++---
 lib/user.php | 2 +-
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/lib/base.php b/lib/base.php
index cbcbdd2ad0..a145fd1cf2 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -51,7 +51,7 @@ class OC{
 	 */
 	public static $THIRDPARTYWEBROOT = '';
 	/**
-	 * The installation path array of the apps folder on the server (e.g. /srv/http/owncloud) 'path' and 
+	 * 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();
@@ -95,7 +95,7 @@ class OC{
 		}else{
 			return false;
 		}
-		
+
 		if($fullPath = stream_resolve_include_path($path)) {
 			require_once $path;
 		}
@@ -533,10 +533,10 @@ class OC{
 		}
 
 		OC_App::loadApps();
-		
+
 		//setup extra user backends
 		OC_User::setupBackends();
-		
+
 		if(OC_User::login($_POST["user"], $_POST["password"])) {
 			if(!empty($_POST["remember_login"])) {
 				if(defined("DEBUG") && DEBUG) {
diff --git a/lib/db.php b/lib/db.php
index 2f36416d0a..bd3afe2b06 100644
--- a/lib/db.php
+++ b/lib/db.php
@@ -411,7 +411,7 @@ class OC_DB {
 		 if( $CONFIG_DBTYPE == 'pgsql' ) { //mysql support it too but sqlite doesn't
 				 $content = str_replace( '<default>0000-00-00 00:00:00</default>', '<default>CURRENT_TIMESTAMP</default>', $content );
 		 }
-		 
+
 		file_put_contents( $file2, $content );
 
 		// Try to create tables
diff --git a/lib/l10n.php b/lib/l10n.php
index 0421e4eba8..f827412613 100644
--- a/lib/l10n.php
+++ b/lib/l10n.php
@@ -113,9 +113,9 @@ 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((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.'/lib/l10n/') || 
+			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.'/lib/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');
diff --git a/lib/user.php b/lib/user.php
index 305fb8ed3a..236478e9e5 100644
--- a/lib/user.php
+++ b/lib/user.php
@@ -39,7 +39,7 @@
 class OC_User {
 	// The backend used for user management
 	private static $_usedBackends = array();
-	
+
 	private static $_setupedBackends = array();
 
 	// Backends available (except database)

From 285c198c365765eb7cd1952715080d4d79458f5b Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Fri, 7 Sep 2012 14:09:41 +0200
Subject: [PATCH 1151/1224] EOL fixes

apps/files_external/lib/config.php
apps/files_versions/lib/versions.php
lib/connector/sabre/client.php
---
 apps/files_external/lib/config.php   | 564 ++++++++++++------------
 apps/files_versions/lib/versions.php | 622 +++++++++++++--------------
 lib/connector/sabre/client.php       | 344 +++++++--------
 3 files changed, 764 insertions(+), 766 deletions(-)

diff --git a/apps/files_external/lib/config.php b/apps/files_external/lib/config.php
index 063b149027..eec31ec2ef 100755
--- a/apps/files_external/lib/config.php
+++ b/apps/files_external/lib/config.php
@@ -1,283 +1,281 @@
-<?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_User::getHome(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_User::getHome(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() {
-		$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;
-	} 
-
-}
-
-?>
\ No newline at end of file
+<?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_User::getHome(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_User::getHome(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() {
+		$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_versions/lib/versions.php b/apps/files_versions/lib/versions.php
index 30f0b93a7f..4ea1a07b94 100644
--- a/apps/files_versions/lib/versions.php
+++ b/apps/files_versions/lib/versions.php
@@ -1,311 +1,311 @@
-<?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 DEFAULTBLACKLIST='avi mp3 mpg mp4 ctmp';
-	const DEFAULTMAXFILESIZE=1048576; // 10MB
-	const DEFAULTMININTERVAL=60; // 1 min
-	const DEFAULTMAXVERSIONS=50;
-
-	private $view;
-
-	function __construct() {
-
-		$this->view = \OCP\Files::getStorage('files_versions');
-
-	}
-
-	/**
-	 * 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') {
-
-			$files_view = \OCP\Files::getStorage("files");
-			$users_view = \OCP\Files::getStorage("files_versions");
-			$users_view->chroot(\OCP\User::getUser().'/');
-                        
-			//FIXME OC_Share no longer exists
-			//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') .  $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;
-			}
-
-			// 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($files_view->filesize($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
-			@$users_view->copy('files'.$filename, 'files_versions'.$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') {
-			$users_view = \OCP\Files::getStorage("files_versions");
-			$users_view->chroot(\OCP\User::getUser().'/');
-				
-			//FIXME OC_Share no longer exists
-			//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();
-			//}
-				
-			// rollback
-			if( @$users_view->copy('files_versions'.$filename.'.v'.$revision, 'files'.$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') {
-			$versions_fileview = \OCP\Files::getStorage("files_versions");
-			//FIXME OC_Share no longer exists
-			//if (\OCP\App::isEnabled('files_sharing') && $source = \OC_Share::getSource('/'.\OCP\User::getUser().'/files'.$filename)) {
-			//	$pos = strpos($source, '/files', 1);
-			//	$filename = substr($source, $pos + 6);
-			//}
-
-			$versionsFolderName=\OCP\Config::getSystemValue('datadirectory'). $versions_fileview->getAbsolutePath('');
-			
-			// check for old versions
-			$matches=glob($versionsFolderName.$filename.'.v*');
-			if(count($matches)>0){
-				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' ) {
-
-			//FIXME OC_Share no longer exists
-			//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();
-			//}
-			$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;
-				
-			$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
-				( \md5_file( $ma ) == \md5_file( $local_file ) ? $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 ( $value['fileMatch'] ) {
-
-					$value['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') {
-
-			//FIXME OC_Share no longer exists
-			//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();
-			//}
-			$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() {
-		return $this->view->deleteAll('', 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 DEFAULTBLACKLIST='avi mp3 mpg mp4 ctmp';
+	const DEFAULTMAXFILESIZE=1048576; // 10MB
+	const DEFAULTMININTERVAL=60; // 1 min
+	const DEFAULTMAXVERSIONS=50;
+
+	private $view;
+
+	function __construct() {
+
+		$this->view = \OCP\Files::getStorage('files_versions');
+
+	}
+
+	/**
+	 * 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') {
+
+			$files_view = \OCP\Files::getStorage("files");
+			$users_view = \OCP\Files::getStorage("files_versions");
+			$users_view->chroot(\OCP\User::getUser().'/');
+
+			//FIXME OC_Share no longer exists
+			//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') .  $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;
+			}
+
+			// 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($files_view->filesize($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
+			@$users_view->copy('files'.$filename, 'files_versions'.$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') {
+			$users_view = \OCP\Files::getStorage("files_versions");
+			$users_view->chroot(\OCP\User::getUser().'/');
+
+			//FIXME OC_Share no longer exists
+			//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();
+			//}
+
+			// rollback
+			if( @$users_view->copy('files_versions'.$filename.'.v'.$revision, 'files'.$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') {
+			$versions_fileview = \OCP\Files::getStorage("files_versions");
+			//FIXME OC_Share no longer exists
+			//if (\OCP\App::isEnabled('files_sharing') && $source = \OC_Share::getSource('/'.\OCP\User::getUser().'/files'.$filename)) {
+			//	$pos = strpos($source, '/files', 1);
+			//	$filename = substr($source, $pos + 6);
+			//}
+
+			$versionsFolderName=\OCP\Config::getSystemValue('datadirectory'). $versions_fileview->getAbsolutePath('');
+
+			// check for old versions
+			$matches=glob($versionsFolderName.$filename.'.v*');
+			if(count($matches)>0){
+				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' ) {
+
+			//FIXME OC_Share no longer exists
+			//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();
+			//}
+			$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;
+
+			$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
+				( \md5_file( $ma ) == \md5_file( $local_file ) ? $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 ( $value['fileMatch'] ) {
+
+					$value['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') {
+
+			//FIXME OC_Share no longer exists
+			//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();
+			//}
+			$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() {
+		return $this->view->deleteAll('', true);
+	}
+}
diff --git a/lib/connector/sabre/client.php b/lib/connector/sabre/client.php
index 7e8f21264f..8df5fb9a9a 100644
--- a/lib/connector/sabre/client.php
+++ b/lib/connector/sabre/client.php
@@ -1,173 +1,173 @@
-<?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 $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;
-	}
-	
-	/**
-	 * 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()) {
-	
-		$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,
-		);
-	
-		if($this->trustedCertificates) {
-			$curlSettings[CURLOPT_CAINFO] = $this->trustedCertificates;
-		}
-		
-		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;
-	
-	}	
+<?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 $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;
+	}
+
+	/**
+	 * 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()) {
+
+		$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,
+		);
+
+		if($this->trustedCertificates) {
+			$curlSettings[CURLOPT_CAINFO] = $this->trustedCertificates;
+		}
+
+		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;
+
+	}
 }
\ No newline at end of file

From 785aa751bb5f9a4bcdd677b96207550482e17d3c Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Fri, 7 Sep 2012 14:10:43 +0200
Subject: [PATCH 1152/1224] Whitespace fixes

---
 apps/files_versions/lib/hooks.php | 92 +++++++++++++++----------------
 1 file changed, 46 insertions(+), 46 deletions(-)

diff --git a/apps/files_versions/lib/hooks.php b/apps/files_versions/lib/hooks.php
index bfc8fd3a37..330f10afb5 100644
--- a/apps/files_versions/lib/hooks.php
+++ b/apps/files_versions/lib/hooks.php
@@ -9,7 +9,7 @@
 /**
  * This class contains all hooks.
  */
- 
+
 namespace OCA_Versions;
 
 class Hooks {
@@ -18,58 +18,58 @@ 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 );
-			
+
 		}
 	}
-	
 
-	/**
-	 * @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) {
-		$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) {
-		$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)) {
-			$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']);
-			}
-		}
+		$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) {
+		$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)) {
+			$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']);
+			}
+		}
+	}
+
 }

From 3829460ab8cbb6de65c53583a20fd04cbe7927dd Mon Sep 17 00:00:00 2001
From: Thomas Mueller <thomas.mueller@tmit.eu>
Date: Fri, 7 Sep 2012 15:22:01 +0200
Subject: [PATCH 1153/1224] adding space between) and {

---
 apps/files/admin.php                         |   2 +-
 apps/files/ajax/list.php                     |   4 +-
 apps/files/ajax/upload.php                   |   4 +-
 apps/files/appinfo/filesync.php              |   6 +-
 apps/files/appinfo/update.php                |   2 +-
 apps/files/download.php                      |   2 +-
 apps/files/index.php                         |  12 +-
 apps/files/settings.php                      |   6 +-
 apps/files_encryption/appinfo/app.php        |   2 +-
 apps/files_encryption/lib/crypt.php          |  28 +--
 apps/files_encryption/lib/cryptstream.php    |  54 +++---
 apps/files_encryption/lib/proxy.php          |  44 ++---
 apps/files_encryption/templates/settings.php |   2 +-
 apps/files_encryption/tests/encryption.php   |   4 +-
 apps/files_encryption/tests/proxy.php        |  12 +-
 apps/files_encryption/tests/stream.php       |  10 +-
 apps/files_external/lib/ftp.php              |  20 +--
 apps/files_external/lib/smb.php              |  34 ++--
 apps/files_external/lib/streamwrapper.php    |  34 ++--
 apps/files_external/lib/swift.php            | 170 +++++++++---------
 apps/files_external/lib/webdav.php           |  88 +++++-----
 apps/files_external/tests/ftp.php            |   6 +-
 apps/files_external/tests/google.php         |   6 +-
 apps/files_external/tests/smb.php            |   6 +-
 apps/files_external/tests/swift.php          |   6 +-
 apps/files_external/tests/webdav.php         |   6 +-
 apps/files_sharing/lib/sharedstorage.php     |   2 +-
 apps/files_versions/ajax/expireAll.php       |   2 +-
 apps/files_versions/ajax/rollbackVersion.php |   2 +-
 apps/files_versions/lib/hooks.php            |   4 +-
 apps/files_versions/lib/versions.php         |   8 +-
 apps/user_ldap/appinfo/install.php           |   2 +-
 apps/user_ldap/appinfo/update.php            |   2 +-
 apps/user_ldap/group_ldap.php                |   2 +-
 apps/user_ldap/settings.php                  |   6 +-
 apps/user_ldap/tests/group_ldap.php          |   4 +-
 apps/user_ldap/user_ldap.php                 |  10 +-
 apps/user_webdavauth/settings.php            |   4 +-
 apps/user_webdavauth/user_webdavauth.php     |   6 +-
 core/ajax/appconfig.php                      |   2 +-
 core/minimizer.php                           |   4 +-
 core/templates/403.php                       |   2 +-
 core/templates/404.php                       |   2 +-
 core/templates/exception.php                 |   2 +-
 core/templates/layout.guest.php              |   2 +-
 core/templates/layout.user.php               |   6 +-
 cron.php                                     |   2 +-
 lib/MDB2/Driver/Datatype/sqlite3.php         |   2 +-
 lib/MDB2/Driver/Manager/sqlite3.php          |   2 +-
 lib/MDB2/Driver/sqlite3.php                  |  28 +--
 lib/app.php                                  |  82 ++++-----
 lib/appconfig.php                            |  30 ++--
 lib/archive.php                              |  16 +-
 lib/archive/tar.php                          | 100 +++++------
 lib/archive/zip.php                          |  58 +++----
 lib/backgroundjob/queuedtask.php             |  14 +-
 lib/backgroundjob/regulartask.php            |   4 +-
 lib/backgroundjob/worker.php                 |  20 +--
 lib/base.php                                 |   8 +-
 lib/cache/apc.php                            |   2 +-
 lib/cache/broker.php                         |   2 +-
 lib/cache/file.php                           |  12 +-
 lib/cache/fileglobal.php                     |  10 +-
 lib/cache/xcache.php                         |   4 +-
 lib/config.php                               |  12 +-
 lib/connector/sabre/auth.php                 |   4 +-
 lib/connector/sabre/directory.php            |   2 +-
 lib/connector/sabre/locks.php                |   2 +-
 lib/connector/sabre/node.php                 |   8 +-
 lib/connector/sabre/principal.php            |   4 +-
 lib/db.php                                   |  60 +++----
 lib/eventsource.php                          |  16 +-
 lib/filecache.php                            | 128 +++++++-------
 lib/filecache/cached.php                     |  18 +-
 lib/filecache/update.php                     |  62 +++----
 lib/fileproxy.php                            |  32 ++--
 lib/fileproxy/quota.php                      |  24 +--
 lib/files.php                                |  84 ++++-----
 lib/filestorage/common.php                   |  62 +++----
 lib/filestorage/commontest.php               |  26 +--
 lib/filestorage/local.php                    |  96 +++++-----
 lib/filestorage/temporary.php                |   6 +-
 lib/filesystem.php                           | 156 ++++++++---------
 lib/filesystemview.php                       |  22 +--
 lib/geo.php                                  |   4 +-
 lib/group.php                                |  62 +++----
 lib/group/backend.php                        |  12 +-
 lib/group/database.php                       |  18 +-
 lib/group/dummy.php                          |  32 ++--
 lib/helper.php                               | 112 ++++++------
 lib/hook.php                                 |  20 +--
 lib/image.php                                |  10 +-
 lib/installer.php                            |  92 +++++-----
 lib/json.php                                 |  34 ++--
 lib/l10n.php                                 |  70 ++++----
 lib/l10n/string.php                          |   6 +-
 lib/log/owncloud.php                         |   4 +-
 lib/mail.php                                 |   4 +-
 lib/migrate.php                              | 174 +++++++++----------
 lib/migration/content.php                    |  42 ++---
 lib/migration/provider.php                   |   8 +-
 lib/minimizer.php                            |   2 +-
 lib/minimizer/css.php                        |   2 +-
 lib/minimizer/js.php                         |   2 +-
 lib/ocs.php                                  |  66 +++----
 lib/ocsclient.php                            |  34 ++--
 lib/preferences.php                          |  28 +--
 lib/public/app.php                           |  18 +-
 lib/public/backgroundjob.php                 |  14 +-
 lib/public/config.php                        |  12 +-
 lib/public/db.php                            |  10 +-
 lib/public/files.php                         |  12 +-
 lib/public/json.php                          |  16 +-
 lib/public/template.php                      |   6 +-
 lib/public/user.php                          |  14 +-
 lib/public/util.php                          |  30 ++--
 lib/request.php                              |   4 +-
 lib/search.php                               |  14 +-
 lib/search/provider.php                      |   2 +-
 lib/search/provider/file.php                 |  10 +-
 lib/search/result.php                        |   2 +-
 lib/setup.php                                |  10 +-
 lib/streamwrappers.php                       |  40 ++---
 lib/subadmin.php                             |  40 ++---
 lib/template.php                             |  80 ++++-----
 lib/templatelayout.php                       |  18 +-
 lib/updater.php                              |  10 +-
 lib/user.php                                 | 104 +++++------
 lib/user/backend.php                         |  12 +-
 lib/user/database.php                        |  30 ++--
 lib/user/dummy.php                           |  18 +-
 lib/user/http.php                            |  18 +-
 lib/util.php                                 | 116 ++++++-------
 lib/vcategories.php                          |   4 +-
 lib/vobject.php                              |  64 +++----
 search/ajax/search.php                       |   2 +-
 search/index.php                             |   2 +-
 settings/admin.php                           |   4 +-
 settings/ajax/apps/ocs.php                   |   4 +-
 settings/ajax/createuser.php                 |   4 +-
 settings/ajax/togglesubadmins.php            |   2 +-
 settings/apps.php                            |   2 +-
 settings/personal.php                        |   6 +-
 settings/settings.php                        |   2 +-
 settings/templates/admin.php                 |   8 +-
 settings/templates/personal.php              |   2 +-
 settings/templates/settings.php              |   2 +-
 settings/users.php                           |   6 +-
 tests/index.php                              |  28 +--
 tests/lib/archive.php                        |  24 +--
 tests/lib/archive/tar.php                    |   6 +-
 tests/lib/archive/zip.php                    |   6 +-
 tests/lib/cache.php                          |   8 +-
 tests/lib/cache/apc.php                      |   4 +-
 tests/lib/cache/file.php                     |   6 +-
 tests/lib/cache/xcache.php                   |   4 +-
 tests/lib/filestorage.php                    |  28 +--
 tests/lib/filestorage/commontest.php         |   6 +-
 tests/lib/filestorage/local.php              |   4 +-
 tests/lib/filesystem.php                     |  14 +-
 tests/lib/group.php                          |   6 +-
 tests/lib/group/backend.php                  |   8 +-
 tests/lib/group/database.php                 |  10 +-
 tests/lib/group/dummy.php                    |   2 +-
 tests/lib/streamwrappers.php                 |  12 +-
 tests/lib/user/backend.php                   |   6 +-
 tests/lib/user/database.php                  |   8 +-
 tests/lib/user/dummy.php                     |   2 +-
 168 files changed, 1834 insertions(+), 1834 deletions(-)

diff --git a/apps/files/admin.php b/apps/files/admin.php
index b49c0f61a0..a8f2deffc9 100644
--- a/apps/files/admin.php
+++ b/apps/files/admin.php
@@ -33,7 +33,7 @@ $upload_max_filesize = OCP\Util::computerFileSize(ini_get('upload_max_filesize')
 $post_max_size = OCP\Util::computerFileSize(ini_get('post_max_size'));
 $maxUploadFilesize = OCP\Util::humanFileSize(min($upload_max_filesize, $post_max_size));
 if($_POST) {
-	if(isset($_POST['maxUploadSize'])){
+	if(isset($_POST['maxUploadSize'])) {
 		if(($setMaxSize = OC_Files::setUploadLimit(OCP\Util::computerFileSize($_POST['maxUploadSize']))) !== false) {
 			$maxUploadFilesize = OCP\Util::humanFileSize($setMaxSize);
 		}
diff --git a/apps/files/ajax/list.php b/apps/files/ajax/list.php
index 2254526231..568fe754c0 100644
--- a/apps/files/ajax/list.php
+++ b/apps/files/ajax/list.php
@@ -17,7 +17,7 @@ $data = array();
 if($doBreadcrumb) {
 	$breadcrumb = array();
 	$pathtohere = "/";
-	foreach( explode( "/", $dir ) as $i ){
+	foreach( explode( "/", $dir ) as $i ) {
 		if( $i != "" ) {
 			$pathtohere .= "$i/";
 			$breadcrumb[] = array( "dir" => $pathtohere, "name" => $i );
@@ -32,7 +32,7 @@ if($doBreadcrumb) {
 
 // make filelist
 $files = array();
-foreach( OC_Files::getdirectorycontent( $dir ) as $i ){
+foreach( OC_Files::getdirectorycontent( $dir ) as $i ) {
 	$i["date"] = OCP\Util::formatDate($i["mtime"] );
 	$files[] = $i;
 }
diff --git a/apps/files/ajax/upload.php b/apps/files/ajax/upload.php
index 813a6c67b5..7709becc6a 100644
--- a/apps/files/ajax/upload.php
+++ b/apps/files/ajax/upload.php
@@ -35,7 +35,7 @@ $dir = $_POST['dir'];
 $error='';
 
 $totalSize=0;
-foreach($files['size'] as $size){
+foreach($files['size'] as $size) {
 	$totalSize+=$size;
 }
 if($totalSize>OC_Filesystem::free_space('/')) {
@@ -46,7 +46,7 @@ if($totalSize>OC_Filesystem::free_space('/')) {
 $result=array();
 if(strpos($dir, '..') === false) {
 	$fileCount=count($files['name']);
-	for($i=0;$i<$fileCount;$i++){
+	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_Cached::get($target);
diff --git a/apps/files/appinfo/filesync.php b/apps/files/appinfo/filesync.php
index 707ee2435c..c1fe444cec 100644
--- a/apps/files/appinfo/filesync.php
+++ b/apps/files/appinfo/filesync.php
@@ -23,14 +23,14 @@
 // only need filesystem apps
 $RUNTIME_APPTYPES=array('filesystem','authentication');
 OC_App::loadApps($RUNTIME_APPTYPES);
-if(!OC_User::isLoggedIn()){
-        if(!isset($_SERVER['PHP_AUTH_USER'])){
+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"])){
+                if(!OC_User::login($_SERVER["PHP_AUTH_USER"], $_SERVER["PHP_AUTH_PW"])) {
                         exit();
                 }
         }
diff --git a/apps/files/appinfo/update.php b/apps/files/appinfo/update.php
index 32ac89f006..35008e345b 100644
--- a/apps/files/appinfo/update.php
+++ b/apps/files/appinfo/update.php
@@ -5,7 +5,7 @@ $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()){
+	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"] ));
 	}
diff --git a/apps/files/download.php b/apps/files/download.php
index 44a328e25d..ff6aefbbe0 100644
--- a/apps/files/download.php
+++ b/apps/files/download.php
@@ -29,7 +29,7 @@ OCP\User::checkLoggedIn();
 
 $filename = $_GET["file"];
 
-if(!OC_Filesystem::file_exists($filename)){
+if(!OC_Filesystem::file_exists($filename)) {
 	header("HTTP/1.0 404 Not Found");
 	$tmpl = new OCP\Template( '', '404', 'guest' );
 	$tmpl->assign('file',$filename);
diff --git a/apps/files/index.php b/apps/files/index.php
index ba785f7d6b..493087d26f 100644
--- a/apps/files/index.php
+++ b/apps/files/index.php
@@ -31,7 +31,7 @@ OCP\Util::addscript( 'files', 'jquery.fileupload' );
 OCP\Util::addscript( 'files', 'files' );
 OCP\Util::addscript( 'files', 'filelist' );
 OCP\Util::addscript( 'files', 'fileactions' );
-if(!isset($_SESSION['timezone'])){
+if(!isset($_SESSION['timezone'])) {
 	OCP\Util::addscript( 'files', 'timezone' );
 }
 OCP\App::setActiveNavigationEntry( 'files_index' );
@@ -44,9 +44,9 @@ if(!OC_Filesystem::is_dir($dir.'/')) {
 }
 
 $files = array();
-foreach( OC_Files::getdirectorycontent( $dir ) as $i ){
+foreach( OC_Files::getdirectorycontent( $dir ) as $i ) {
 	$i['date'] = OCP\Util::formatDate($i['mtime'] );
-	if($i['type']=='file'){
+	if($i['type']=='file') {
 		$fileinfo=pathinfo($i['name']);
 		$i['basename']=$fileinfo['filename'];
 		if (!empty($fileinfo['extension'])) {
@@ -56,7 +56,7 @@ foreach( OC_Files::getdirectorycontent( $dir ) as $i ){
 			$i['extension']='';
 		}
 	}
-	if($i['directory']=='/'){
+	if($i['directory']=='/') {
 		$i['directory']='';
 	}
 	$files[] = $i;
@@ -65,8 +65,8 @@ foreach( OC_Files::getdirectorycontent( $dir ) as $i ){
 // Make breadcrumb
 $breadcrumb = array();
 $pathtohere = '';
-foreach( explode( '/', $dir ) as $i ){
-	if( $i != '' ){
+foreach( explode( '/', $dir ) as $i ) {
+	if( $i != '' ) {
 		$pathtohere .= '/'.str_replace('+','%20', urlencode($i));
 		$breadcrumb[] = array( 'dir' => $pathtohere, 'name' => $i );
 	}
diff --git a/apps/files/settings.php b/apps/files/settings.php
index b02c3738c6..52ec9fd0fe 100644
--- a/apps/files/settings.php
+++ b/apps/files/settings.php
@@ -36,7 +36,7 @@ OCP\Util::addscript( "files", "files" );
 $dir = isset( $_GET['dir'] ) ? $_GET['dir'] : '';
 
 $files = array();
-foreach( OC_Files::getdirectorycontent( $dir ) as $i ){
+foreach( OC_Files::getdirectorycontent( $dir ) as $i ) {
 	$i["date"] = date( $CONFIG_DATEFORMAT, $i["mtime"] );
 	$files[] = $i;
 }
@@ -44,8 +44,8 @@ foreach( OC_Files::getdirectorycontent( $dir ) as $i ){
 // Make breadcrumb
 $breadcrumb = array();
 $pathtohere = "/";
-foreach( explode( "/", $dir ) as $i ){
-	if( $i != "" ){
+foreach( explode( "/", $dir ) as $i ) {
+	if( $i != "" ) {
 		$pathtohere .= "$i/";
 		$breadcrumb[] = array( "dir" => $pathtohere, "name" => $i );
 	}
diff --git a/apps/files_encryption/appinfo/app.php b/apps/files_encryption/appinfo/app.php
index 679d0b95ed..bb130a366b 100644
--- a/apps/files_encryption/appinfo/app.php
+++ b/apps/files_encryption/appinfo/app.php
@@ -10,7 +10,7 @@ OCP\Util::connectHook('OC_User','post_login','OC_Crypt','loginListener');
 
 stream_wrapper_register('crypt','OC_CryptStream');
 
-if(!isset($_SESSION['enckey']) and OCP\User::isLoggedIn()){//force the user to re-loggin if the encryption key isn't unlocked (happens when a user is logged in before the encryption app is enabled)
+if(!isset($_SESSION['enckey']) and OCP\User::isLoggedIn()) {//force the user to re-loggin if the encryption key isn't unlocked (happens when a user is logged in before the encryption app is enabled)
 	OCP\User::logout();
 	header("Location: ".OC::$WEBROOT.'/');
 	exit();
diff --git a/apps/files_encryption/lib/crypt.php b/apps/files_encryption/lib/crypt.php
index ebc09e7896..38d8edf28c 100644
--- a/apps/files_encryption/lib/crypt.php
+++ b/apps/files_encryption/lib/crypt.php
@@ -39,18 +39,18 @@ require_once 'Crypt_Blowfish/Blowfish.php';
 class OC_Crypt {
 	static private $bf = null;
 
-	public static function loginListener($params){
+	public static function loginListener($params) {
 		self::init($params['uid'],$params['password']);
 	}
 
 	public static function init($login,$password) {
 		$view=new OC_FilesystemView('/');
-		if(!$view->file_exists('/'.$login)){
+		if(!$view->file_exists('/'.$login)) {
 			$view->mkdir('/'.$login);
 		}
 
 		OC_FileProxy::$enabled=false;
-		if(!$view->file_exists('/'.$login.'/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('/'.$login.'/encryption.key');
@@ -66,14 +66,14 @@ class OC_Crypt {
 	 *
 	 * if the key is left out, the default handeler will be used
 	 */
-	public static function getBlowfish($key=''){
-		if($key){
+	public static function getBlowfish($key='') {
+		if($key) {
 			return new Crypt_Blowfish($key);
 		}else{
-			if(!isset($_SESSION['enckey'])){
+			if(!isset($_SESSION['enckey'])) {
 				return false;
 			}
-			if(!self::$bf){
+			if(!self::$bf) {
 				self::$bf=new Crypt_Blowfish($_SESSION['enckey']);
 			}
 			return self::$bf;
@@ -96,7 +96,7 @@ class OC_Crypt {
 	}
 
 	public static function changekeypasscode($oldPassword, $newPassword) {
-		if(OCP\User::isLoggedIn()){
+		if(OCP\User::isLoggedIn()) {
 			$username=OCP\USER::getUser();
 			$view=new OC_FilesystemView('/'.$username);
 
@@ -179,7 +179,7 @@ class OC_Crypt {
 			while (!feof($handleread)) {
 				$content = fread($handleread, 8192);
 				$enccontent=OC_CRYPT::decrypt( $content, $key);
-				if(feof($handleread)){
+				if(feof($handleread)) {
 					$enccontent=rtrim($enccontent, "\0");
 				}
 				fwrite($handlewrite, $enccontent);
@@ -192,9 +192,9 @@ class OC_Crypt {
 	/**
 	 * encrypt data in 8192b sized blocks
 	 */
-	public static function blockEncrypt($data, $key=''){
+	public static function blockEncrypt($data, $key='') {
 		$result='';
-		while(strlen($data)){
+		while(strlen($data)) {
 			$result.=self::encrypt(substr($data,0,8192),$key);
 			$data=substr($data,8192);
 		}
@@ -204,13 +204,13 @@ class OC_Crypt {
 	/**
 	 * decrypt data in 8192b sized blocks
 	 */
-	public static function blockDecrypt($data, $key='',$maxLength=0){
+	public static function blockDecrypt($data, $key='',$maxLength=0) {
 		$result='';
-		while(strlen($data)){
+		while(strlen($data)) {
 			$result.=self::decrypt(substr($data,0,8192),$key);
 			$data=substr($data,8192);
 		}
-		if($maxLength>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 75ad62659d..721a1b955d 100644
--- a/apps/files_encryption/lib/cryptstream.php
+++ b/apps/files_encryption/lib/cryptstream.php
@@ -36,18 +36,18 @@ class OC_CryptStream{
 	private $size;
 	private static $rootView;
 
-	public function stream_open($path, $mode, $options, &$opened_path){
-		if(!self::$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)])){
+		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+'){
+			if($mode=='w' or $mode=='w+' or $mode=='wb' or $mode=='wb+') {
 				$this->size=0;
 			}else{
 				$this->size=self::$rootView->filesize($path,$mode);
@@ -55,55 +55,55 @@ class OC_CryptStream{
 			OC_FileProxy::$enabled=false;//disable fileproxies so we can open the source file
 			$this->source=self::$rootView->fopen($path,$mode);
 			OC_FileProxy::$enabled=true;
-			if(!is_resource($this->source)){
+			if(!is_resource($this->source)) {
 				OCP\Util::writeLog('files_encryption','failed to open '.$path,OCP\Util::ERROR);
 			}
 		}
-		if(is_resource($this->source)){
+		if(is_resource($this->source)) {
 			$this->meta=stream_get_meta_data($this->source);
 		}
 		return is_resource($this->source);
 	}
 
-	public function stream_seek($offset, $whence=SEEK_SET){
+	public function stream_seek($offset, $whence=SEEK_SET) {
 		$this->flush();
 		fseek($this->source,$offset,$whence);
 	}
 
-	public function stream_tell(){
+	public function stream_tell() {
 		return ftell($this->source);
 	}
 
-	public function stream_read($count){
+	public function stream_read($count) {
 		//$count will always be 8192 https://bugs.php.net/bug.php?id=21641
 		//This makes this function a lot simpler but will breake everything the moment it's fixed
 		$this->writeCache='';
-		if($count!=8192){
+		if($count!=8192) {
 			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)){
+		if(strlen($data)) {
 			$result=OC_Crypt::decrypt($data);
 		}else{
 			$result='';
 		}
 		$length=$this->size-$pos;
-		if($length<8192){
+		if($length<8192) {
 			$result=substr($result,0,$length);
 		}
 		return $result;
 	}
 
-	public function stream_write($data){
+	public function stream_write($data) {
 		$length=strlen($data);
 		$currentPos=ftell($this->source);
-		if($this->writeCache){
+		if($this->writeCache) {
 			$data=$this->writeCache.$data;
 			$this->writeCache='';
 		}
-		if($currentPos%8192!=0){
+		if($currentPos%8192!=0) {
 			//make sure we always start on a block start
 			fseek($this->source,-($currentPos%8192),SEEK_CUR);
 			$encryptedBlock=fread($this->source,8192);
@@ -113,8 +113,8 @@ class OC_CryptStream{
 			fseek($this->source,-($currentPos%8192),SEEK_CUR);
 		}
 		$currentPos=ftell($this->source);
-		while($remainingLength=strlen($data)>0){
-			if($remainingLength<8192){
+		while($remainingLength=strlen($data)>0) {
+			if($remainingLength<8192) {
 				$this->writeCache=$data;
 				$data='';
 			}else{
@@ -127,8 +127,8 @@ class OC_CryptStream{
 		return $length;
 	}
 
-	public function stream_set_option($option,$arg1,$arg2){
-		switch($option){
+	public function stream_set_option($option,$arg1,$arg2) {
+		switch($option) {
 			case STREAM_OPTION_BLOCKING:
 				stream_set_blocking($this->source,$arg1);
 				break;
@@ -140,33 +140,33 @@ class OC_CryptStream{
 		}
 	}
 
-	public function stream_stat(){
+	public function stream_stat() {
 		return fstat($this->source);
 	}
 
-	public function stream_lock($mode){
+	public function stream_lock($mode) {
 		flock($this->source,$mode);
 	}
 
-	public function stream_flush(){
+	public function stream_flush() {
 		return fflush($this->source);
 	}
 
-	public function stream_eof(){
+	public function stream_eof() {
 		return feof($this->source);
 	}
 
-	private function flush(){
-		if($this->writeCache){
+	private function flush() {
+		if($this->writeCache) {
 			$encrypted=OC_Crypt::encrypt($this->writeCache);
 			fwrite($this->source,$encrypted);
 			$this->writeCache='';
 		}
 	}
 
-	public function stream_close(){
+	public function stream_close() {
 		$this->flush();
-		if($this->meta['mode']!='r' and $this->meta['mode']!='rb'){
+		if($this->meta['mode']!='r' and $this->meta['mode']!='rb') {
 			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 247924b2aa..f61cd1e377 100644
--- a/apps/files_encryption/lib/proxy.php
+++ b/apps/files_encryption/lib/proxy.php
@@ -34,21 +34,21 @@ class OC_FileProxy_Encryption extends OC_FileProxy{
 	 * @param string $path
 	 * @return bool
 	 */
-	private static function shouldEncrypt($path){
-		if(is_null(self::$enableEncryption)){
+	private static function shouldEncrypt($path) {
+		if(is_null(self::$enableEncryption)) {
 			self::$enableEncryption=(OCP\Config::getAppValue('files_encryption','enable_encryption','true')=='true');
 		}
-		if(!self::$enableEncryption){
+		if(!self::$enableEncryption) {
 			return false;
 		}
-		if(is_null(self::$blackList)){
+		if(is_null(self::$blackList)) {
 			self::$blackList=explode(',',OCP\Config::getAppValue('files_encryption','type_blacklist','jpg,png,jpeg,avi,mpg,mpeg,mkv,mp3,oga,ogv,ogg'));
 		}
-		if(self::isEncrypted($path)){
+		if(self::isEncrypted($path)) {
 			return true;
 		}
 		$extension=substr($path,strrpos($path,'.')+1);
-		if(array_search($extension,self::$blackList)===false){
+		if(array_search($extension,self::$blackList)===false) {
 			return true;
 		}
 	}
@@ -58,13 +58,13 @@ class OC_FileProxy_Encryption extends OC_FileProxy{
 	 * @param string $path
 	 * @return bool
 	 */
-	private static function isEncrypted($path){
+	private static function isEncrypted($path) {
 		$metadata=OC_FileCache_Cached::get($path,'');
 		return isset($metadata['encrypted']) and (bool)$metadata['encrypted'];
 	}
 
-	public function preFile_put_contents($path,&$data){
-		if(self::shouldEncrypt($path)){
+	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);
@@ -73,24 +73,24 @@ class OC_FileProxy_Encryption extends OC_FileProxy{
 		}
 	}
 
-	public function postFile_get_contents($path,$data){
-		if(self::isEncrypted($path)){
+	public function postFile_get_contents($path,$data) {
+		if(self::isEncrypted($path)) {
 			$cached=OC_FileCache_Cached::get($path,'');
 			$data=OC_Crypt::blockDecrypt($data,'',$cached['size']);
 		}
 		return $data;
 	}
 
-	public function postFopen($path,&$result){
-		if(!$result){
+	public function postFopen($path,&$result) {
+		if(!$result) {
 			return $result;
 		}
 		$meta=stream_get_meta_data($result);
-		if(self::isEncrypted($path)){
+		if(self::isEncrypted($path)) {
 			fclose($result);
 			$result=fopen('crypt://'.$path,$meta['mode']);
-		}elseif(self::shouldEncrypt($path) and $meta['mode']!='r' and $meta['mode']!='rb'){
-			if(OC_Filesystem::file_exists($path) and OC_Filesystem::filesize($path)>0){
+		}elseif(self::shouldEncrypt($path) and $meta['mode']!='r' and $meta['mode']!='rb') {
+			if(OC_Filesystem::file_exists($path) and OC_Filesystem::filesize($path)>0) {
 				//first encrypt the target file so we don't end up with a half encrypted file
 				OCP\Util::writeLog('files_encryption','Decrypting '.$path.' before writing',OCP\Util::DEBUG);
 				$tmp=fopen('php://temp');
@@ -104,23 +104,23 @@ class OC_FileProxy_Encryption extends OC_FileProxy{
 		return $result;
 	}
 
-	public function postGetMimeType($path,$mime){
-		if(self::isEncrypted($path)){
+	public function postGetMimeType($path,$mime) {
+		if(self::isEncrypted($path)) {
 			$mime=OCP\Files::getMimeType('crypt://'.$path,'w');
 		}
 		return $mime;
 	}
 
-	public function postStat($path,$data){
-		if(self::isEncrypted($path)){
+	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)){
+	public function postFileSize($path,$size) {
+		if(self::isEncrypted($path)) {
 			$cached=OC_FileCache_Cached::get($path,'');
 			return  $cached['size'];
 		}else{
diff --git a/apps/files_encryption/templates/settings.php b/apps/files_encryption/templates/settings.php
index 79780d694c..55e8cf1542 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='enable_encryption' <?php if($_['encryption_enabled']){echo 'checked="checked"';} ?>></input><label for='enable_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>
diff --git a/apps/files_encryption/tests/encryption.php b/apps/files_encryption/tests/encryption.php
index f70411ed63..89397f6ef2 100644
--- a/apps/files_encryption/tests/encryption.php
+++ b/apps/files_encryption/tests/encryption.php
@@ -7,7 +7,7 @@
  */
 
 class Test_Encryption extends UnitTestCase {
-	function testEncryption(){
+	function testEncryption() {
 		$key=uniqid();
 		$file=OC::$SERVERROOT.'/3rdparty/MDB2.php';
 		$source=file_get_contents($file); //nice large text file
@@ -54,7 +54,7 @@ class Test_Encryption extends UnitTestCase {
 
 	}
 
-	function testBinary(){
+	function testBinary() {
 		$key=uniqid();
 
 		$file=__DIR__.'/binary';
diff --git a/apps/files_encryption/tests/proxy.php b/apps/files_encryption/tests/proxy.php
index c4952d13d3..042011a6c8 100644
--- a/apps/files_encryption/tests/proxy.php
+++ b/apps/files_encryption/tests/proxy.php
@@ -10,7 +10,7 @@ class Test_CryptProxy extends UnitTestCase {
 	private $oldConfig;
 	private $oldKey;
 
-	public function setUp(){
+	public function setUp() {
 		$user=OC_User::getUser();
 
 		$this->oldConfig=OCP\Config::getAppValue('files_encryption','enable_encryption','true');
@@ -40,14 +40,14 @@ class Test_CryptProxy extends UnitTestCase {
 		$rootView->mkdir('/'.$user.'/files');
 	}
 
-	public function tearDown(){
+	public function tearDown() {
 		OCP\Config::setAppValue('files_encryption','enable_encryption',$this->oldConfig);
-		if(!is_null($this->oldKey)){
+		if(!is_null($this->oldKey)) {
 			$_SESSION['enckey']=$this->oldKey;
 		}
 	}
 
-	public function testSimple(){
+	public function testSimple() {
 		$file=OC::$SERVERROOT.'/3rdparty/MDB2.php';
 		$original=file_get_contents($file);
 
@@ -64,7 +64,7 @@ class Test_CryptProxy extends UnitTestCase {
 
 	}
 
-	public function testView(){
+	public function testView() {
 		$file=OC::$SERVERROOT.'/3rdparty/MDB2.php';
 		$original=file_get_contents($file);
 
@@ -86,7 +86,7 @@ class Test_CryptProxy extends UnitTestCase {
 		$this->assertEqual($original,$fromFile);
 	}
 
-	public function testBinary(){
+	public function testBinary() {
 		$file=__DIR__.'/binary';
 		$original=file_get_contents($file);
 
diff --git a/apps/files_encryption/tests/stream.php b/apps/files_encryption/tests/stream.php
index 517d497344..39b1362078 100644
--- a/apps/files_encryption/tests/stream.php
+++ b/apps/files_encryption/tests/stream.php
@@ -9,7 +9,7 @@
 class Test_CryptStream extends UnitTestCase {
 	private $tmpFiles=array();
 
-	function testStream(){
+	function testStream() {
 		$stream=$this->getStream('test1','w',strlen('foobar'));
 		fwrite($stream,'foobar');
 		fclose($stream);
@@ -40,11 +40,11 @@ class Test_CryptStream extends UnitTestCase {
 	 * @param int size
 	 * @return resource
 	 */
-	function getStream($id,$mode,$size){
-		if($id===''){
+	function getStream($id,$mode,$size) {
+		if($id==='') {
 			$id=uniqid();
 		}
-		if(!isset($this->tmpFiles[$id])){
+		if(!isset($this->tmpFiles[$id])) {
 			$file=OCP\Files::tmpFile();
 			$this->tmpFiles[$id]=$file;
 		}else{
@@ -55,7 +55,7 @@ class Test_CryptStream extends UnitTestCase {
 		return fopen('crypt://streams/'.$id,$mode);
 	}
 
-	function testBinary(){
+	function testBinary() {
 		$file=__DIR__.'/binary';
 		$source=file_get_contents($file);
 
diff --git a/apps/files_external/lib/ftp.php b/apps/files_external/lib/ftp.php
index 818273f6c2..261141455c 100644
--- a/apps/files_external/lib/ftp.php
+++ b/apps/files_external/lib/ftp.php
@@ -15,13 +15,13 @@ class OC_FileStorage_FTP extends OC_FileStorage_StreamWrapper{
 
 	private static $tempFiles=array();
 
-	public function __construct($params){
+	public function __construct($params) {
 		$this->host=$params['host'];
 		$this->user=$params['user'];
 		$this->password=$params['password'];
 		$this->secure=isset($params['secure'])?(bool)$params['secure']:false;
 		$this->root=isset($params['root'])?$params['root']:'/';
-		if(!$this->root || $this->root[0]!='/'){
+		if(!$this->root || $this->root[0]!='/') {
 			$this->root='/'.$this->root;
 		}
 		//create the root folder if necesary
@@ -35,16 +35,16 @@ class OC_FileStorage_FTP extends OC_FileStorage_StreamWrapper{
 	 * @param string path
 	 * @return string
 	 */
-	public function constructUrl($path){
+	public function constructUrl($path) {
 		$url='ftp';
-		if($this->secure){
+		if($this->secure) {
 			$url.='s';
 		}
 		$url.='://'.$this->user.':'.$this->password.'@'.$this->host.$this->root.$path;
 		return $url;
 	}
-	public function fopen($path,$mode){
-		switch($mode){
+	public function fopen($path,$mode) {
+		switch($mode) {
 			case 'r':
 			case 'rb':
 			case 'w':
@@ -63,14 +63,14 @@ class OC_FileStorage_FTP extends OC_FileStorage_StreamWrapper{
 			case 'c':
 			case 'c+':
 				//emulate these
-				if(strrpos($path,'.')!==false){
+				if(strrpos($path,'.')!==false) {
 					$ext=substr($path,strrpos($path,'.'));
 				}else{
 					$ext='';
 				}
 				$tmpFile=OCP\Files::tmpFile($ext);
 				OC_CloseStreamWrapper::$callBacks[$tmpFile]=array($this,'writeBack');
-				if($this->file_exists($path)){
+				if($this->file_exists($path)) {
 					$this->getFile($path,$tmpFile);
 				}
 				self::$tempFiles[$tmpFile]=$path;
@@ -78,8 +78,8 @@ class OC_FileStorage_FTP extends OC_FileStorage_StreamWrapper{
 		}
 	}
 
-	public function writeBack($tmpFile){
-		if(isset(self::$tempFiles[$tmpFile])){
+	public function writeBack($tmpFile) {
+		if(isset(self::$tempFiles[$tmpFile])) {
 			$this->uploadFile($tmpFile,self::$tempFiles[$tmpFile]);
 			unlink($tmpFile);
 		}
diff --git a/apps/files_external/lib/smb.php b/apps/files_external/lib/smb.php
index 91c0f16c1f..e5ba7a1774 100644
--- a/apps/files_external/lib/smb.php
+++ b/apps/files_external/lib/smb.php
@@ -15,40 +15,40 @@ class OC_FileStorage_SMB extends OC_FileStorage_StreamWrapper{
 	private $root;
 	private $share;
 
-	public function __construct($params){
+	public function __construct($params) {
 		$this->host=$params['host'];
 		$this->user=$params['user'];
 		$this->password=$params['password'];
 		$this->share=$params['share'];
 		$this->root=isset($params['root'])?$params['root']:'/';
-		if(!$this->root || $this->root[0]!='/'){
+		if(!$this->root || $this->root[0]!='/') {
 			$this->root='/'.$this->root;
 		}
-		if(substr($this->root,-1,1)!='/'){
+		if(substr($this->root,-1,1)!='/') {
 			$this->root.='/';
 		}
-		if(!$this->share || $this->share[0]!='/'){
+		if(!$this->share || $this->share[0]!='/') {
 			$this->share='/'.$this->share;
 		}
-		if(substr($this->share,-1,1)=='/'){
+		if(substr($this->share,-1,1)=='/') {
 			$this->share=substr($this->share,0,-1);
 		}
 
 		//create the root folder if necesary
-		if(!$this->is_dir('')){
+		if(!$this->is_dir('')) {
 			$this->mkdir('');
 		}
 	}
 
-	public function constructUrl($path){
-		if(substr($path,-1)=='/'){
+	public function constructUrl($path) {
+		if(substr($path,-1)=='/') {
 			$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
+	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;
@@ -58,7 +58,7 @@ class OC_FileStorage_SMB extends OC_FileStorage_StreamWrapper{
 		}
 	}
 
-	public function filetype($path){
+	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
 	}
 
@@ -67,8 +67,8 @@ class OC_FileStorage_SMB extends OC_FileStorage_StreamWrapper{
 	 * @param int $time
 	 * @return bool
 	 */
-	public function hasUpdated($path,$time){
-		if(!$path and $this->root=='/'){
+	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{
@@ -80,13 +80,13 @@ class OC_FileStorage_SMB extends OC_FileStorage_StreamWrapper{
 	/**
 	 * get the best guess for the modification time of the share
 	 */
-	private function shareMTime(){
+	private function shareMTime() {
 		$dh=$this->opendir('');
 		$lastCtime=0;
-		while($file=readdir($dh)){
-			if($file!='.' and $file!='..'){
+		while($file=readdir($dh)) {
+			if($file!='.' and $file!='..') {
 				$ctime=$this->filemtime($file);
-				if($ctime>$lastCtime){
+				if($ctime>$lastCtime) {
 					$lastCtime=$ctime;
 				}
 			}
diff --git a/apps/files_external/lib/streamwrapper.php b/apps/files_external/lib/streamwrapper.php
index 467c5a5b84..7263ef2325 100644
--- a/apps/files_external/lib/streamwrapper.php
+++ b/apps/files_external/lib/streamwrapper.php
@@ -10,12 +10,12 @@
 abstract class OC_FileStorage_StreamWrapper extends OC_Filestorage_Common{
 	abstract public function constructUrl($path);
 
-	public function mkdir($path){
+	public function mkdir($path) {
 		return mkdir($this->constructUrl($path));
 	}
 
-	public function rmdir($path){
-		if($this->file_exists($path)){
+	public function rmdir($path) {
+		if($this->file_exists($path)) {
 			$succes=rmdir($this->constructUrl($path));
 			clearstatcache();
 			return $succes;
@@ -24,42 +24,42 @@ abstract class OC_FileStorage_StreamWrapper extends OC_Filestorage_Common{
 		}
 	}
 
-	public function opendir($path){
+	public function opendir($path) {
 		return opendir($this->constructUrl($path));
 	}
 
-	public function filetype($path){
+	public function filetype($path) {
 		return filetype($this->constructUrl($path));
 	}
 
-	public function isReadable($path){
+	public function isReadable($path) {
 		return true;//not properly supported
 	}
 
-	public function isUpdatable($path){
+	public function isUpdatable($path) {
 		return true;//not properly supported
 	}
 
-	public function file_exists($path){
+	public function file_exists($path) {
 		return file_exists($this->constructUrl($path));
 	}
 
-	public function unlink($path){
+	public function unlink($path) {
 		$succes=unlink($this->constructUrl($path));
 		clearstatcache();
 		return $succes;
 	}
 
-	public function fopen($path,$mode){
+	public function fopen($path,$mode) {
 		return fopen($this->constructUrl($path),$mode);
 	}
 
-	public function free_space($path){
+	public function free_space($path) {
 		return 0;
 	}
 
-	public function touch($path,$mtime=null){
-		if(is_null($mtime)){
+	public function touch($path,$mtime=null) {
+		if(is_null($mtime)) {
 			$fh=$this->fopen($path,'a');
 			fwrite($fh,'');
 			fclose($fh);
@@ -68,19 +68,19 @@ abstract class OC_FileStorage_StreamWrapper extends OC_Filestorage_Common{
 		}
 	}
 
-	public function getFile($path,$target){
+	public function getFile($path,$target) {
 		return copy($this->constructUrl($path),$target);
 	}
 
-	public function uploadFile($path,$target){
+	public function uploadFile($path,$target) {
 		return copy($path,$this->constructUrl($target));
 	}
 
-	public function rename($path1,$path2){
+	public function rename($path1,$path2) {
 		return rename($this->constructUrl($path1),$this->constructUrl($path2));
 	}
 
-	public function stat($path){
+	public function stat($path) {
 		return stat($this->constructUrl($path));
 	}
 
diff --git a/apps/files_external/lib/swift.php b/apps/files_external/lib/swift.php
index 9a4b5c6dd2..c29d28b44c 100644
--- a/apps/files_external/lib/swift.php
+++ b/apps/files_external/lib/swift.php
@@ -38,7 +38,7 @@ class OC_FileStorage_SWIFT extends OC_Filestorage_Common{
 	 * @param string path
 	 * @return string
 	 */
-	private function getContainerName($path){
+	private function getContainerName($path) {
 		$path=trim($this->root.$path,'/');
 		return str_replace('/','\\',$path);
 	}
@@ -48,18 +48,18 @@ class OC_FileStorage_SWIFT extends OC_Filestorage_Common{
 	 * @param string path
 	 * @return CF_Container
 	 */
-	private function getContainer($path){
-		if($path=='' or $path=='/'){
+	private function getContainer($path) {
+		if($path=='' or $path=='/') {
 			return $this->rootContainer;
 		}
-		if(isset($this->containers[$path])){
+		if(isset($this->containers[$path])) {
 			return $this->containers[$path];
 		}
 		try{
 			$container=$this->conn->get_container($this->getContainerName($path));
 			$this->containers[$path]=$container;
 			return $container;
-		}catch(NoSuchContainerException $e){
+		}catch(NoSuchContainerException $e) {
 			return null;
 		}
 	}
@@ -69,15 +69,15 @@ class OC_FileStorage_SWIFT extends OC_Filestorage_Common{
 	 * @param string path
 	 * @return CF_Container
 	 */
-	private function createContainer($path){
-		if($path=='' or $path=='/'){
+	private function createContainer($path) {
+		if($path=='' or $path=='/') {
 			return $this->conn->create_container($this->getContainerName($path));
 		}
 		$parent=dirname($path);
-		if($parent=='' or $parent=='/'){
+		if($parent=='' or $parent=='/') {
 			$parentContainer=$this->rootContainer;
 		}else{
-			if(!$this->containerExists($parent)){
+			if(!$this->containerExists($parent)) {
 				$parentContainer=$this->createContainer($parent);
 			}else{
 				$parentContainer=$this->getContainer($parent);
@@ -92,19 +92,19 @@ class OC_FileStorage_SWIFT extends OC_Filestorage_Common{
 	 * @param string path
 	 * @return CF_Object
 	 */
-	private function getObject($path){
-		if(isset($this->objects[$path])){
+	private function getObject($path) {
+		if(isset($this->objects[$path])) {
 			return $this->objects[$path];
 		}
 		$container=$this->getContainer(dirname($path));
-		if(is_null($container)){
+		if(is_null($container)) {
 			return null;
 		}else{
 			try{
 				$obj=$container->get_object(basename($path));
 				$this->objects[$path]=$obj;
 				return $obj;
-			}catch(NoSuchObjectException $e){
+			}catch(NoSuchObjectException $e) {
 				return null;
 			}
 		}
@@ -115,12 +115,12 @@ class OC_FileStorage_SWIFT extends OC_Filestorage_Common{
 	 * @param CF_Container
 	 * @return array
 	 */
-	private function getObjects($container){
-		if(is_null($container)){
+	private function getObjects($container) {
+		if(is_null($container)) {
 			return array();
 		}else{
 			$files=$container->get_objects();
-			foreach($files as &$file){
+			foreach($files as &$file) {
 				$file=$file->name;
 			}
 			return $files;
@@ -132,9 +132,9 @@ class OC_FileStorage_SWIFT extends OC_Filestorage_Common{
 	 * @param string path
 	 * @return CF_Object
 	 */
-	private function createObject($path){
+	private function createObject($path) {
 		$container=$this->getContainer(dirname($path));
-		if(!is_null($container)){
+		if(!is_null($container)) {
 			$container=$this->createContainer($path);
 		}
 		return $container->create_object(basename($path));
@@ -145,7 +145,7 @@ class OC_FileStorage_SWIFT extends OC_Filestorage_Common{
 	 * @param string
 	 * @return bool
 	 */
-	private function objectExists($path){
+	private function objectExists($path) {
 		return !is_null($this->getObject($path));
 	}
 
@@ -154,7 +154,7 @@ class OC_FileStorage_SWIFT extends OC_Filestorage_Common{
 	 * @param string path
 	 * @return bool
 	 */
-	private function containerExists($path){
+	private function containerExists($path) {
 		return !is_null($this->getContainer($path));
 	}
 
@@ -163,18 +163,18 @@ class OC_FileStorage_SWIFT extends OC_Filestorage_Common{
 	 * @param CF_Container container
 	 * @return array
 	 */
-	private function getSubContainers($container){
+	private function getSubContainers($container) {
 		$tmpFile=OCP\Files::tmpFile();
 		$obj=$this->getSubContainerFile($container);
 		try{
 			$obj->save_to_filename($tmpFile);
-		}catch(Exception $e){
+		}catch(Exception $e) {
 			return array();
 		}
 		$obj->save_to_filename($tmpFile);
 		$containers=file($tmpFile);
 		unlink($tmpFile);
-		foreach($containers as &$sub){
+		foreach($containers as &$sub) {
 			$sub=trim($sub);
 		}
 		return $containers;
@@ -186,8 +186,8 @@ class OC_FileStorage_SWIFT extends OC_Filestorage_Common{
 	 * @param string name
 	 * @return bool
 	 */
-	private function addSubContainer($container,$name){
-		if(!$name){
+	private function addSubContainer($container,$name) {
+		if(!$name) {
 			return false;
 		}
 		$tmpFile=OCP\Files::tmpFile();
@@ -195,17 +195,17 @@ class OC_FileStorage_SWIFT extends OC_Filestorage_Common{
 		try{
 			$obj->save_to_filename($tmpFile);
 			$containers=file($tmpFile);
-			foreach($containers as &$sub){
+			foreach($containers as &$sub) {
 				$sub=trim($sub);
 			}
-			if(array_search($name,$containers)!==false){
+			if(array_search($name,$containers)!==false) {
 				unlink($tmpFile);
 				return false;
 			}else{
 				$fh=fopen($tmpFile,'a');
 				fwrite($fh,$name."\n");
 			}
-		}catch(Exception $e){
+		}catch(Exception $e) {
 			$containers=array();
 			file_put_contents($tmpFile,$name."\n");
 		}
@@ -221,8 +221,8 @@ class OC_FileStorage_SWIFT extends OC_Filestorage_Common{
 	 * @param string name
 	 * @return bool
 	 */
-	private function removeSubContainer($container,$name){
-		if(!$name){
+	private function removeSubContainer($container,$name) {
+		if(!$name) {
 			return false;
 		}
 		$tmpFile=OCP\Files::tmpFile();
@@ -230,14 +230,14 @@ class OC_FileStorage_SWIFT extends OC_Filestorage_Common{
 		try{
 			$obj->save_to_filename($tmpFile);
 			$containers=file($tmpFile);
-		}catch(Exception $e){
+		}catch(Exception $e) {
 			return false;
 		}
-		foreach($containers as &$sub){
+		foreach($containers as &$sub) {
 			$sub=trim($sub);
 		}
 		$i=array_search($name,$containers);
-		if($i===false){
+		if($i===false) {
 			unlink($tmpFile);
 			return false;
 		}else{
@@ -255,21 +255,21 @@ class OC_FileStorage_SWIFT extends OC_Filestorage_Common{
 	 * @param CF_Container container
 	 * @return CF_Object
 	 */
-	private function getSubContainerFile($container){
+	private function getSubContainerFile($container) {
 		try{
 			return $container->get_object(self::SUBCONTAINER_FILE);
-		}catch(NoSuchObjectException $e){
+		}catch(NoSuchObjectException $e) {
 			return $container->create_object(self::SUBCONTAINER_FILE);
 		}
 	}
 
-	public function __construct($params){
+	public function __construct($params) {
 		$this->token=$params['token'];
 		$this->host=$params['host'];
 		$this->user=$params['user'];
 		$this->root=isset($params['root'])?$params['root']:'/';
 		$this->secure=isset($params['secure'])?(bool)$params['secure']:true;
-		if(!$this->root || $this->root[0]!='/'){
+		if(!$this->root || $this->root[0]!='/') {
 			$this->root='/'.$this->root;
 		}
 		$this->auth = new CF_Authentication($this->user, $this->token, null, $this->host);
@@ -277,7 +277,7 @@ class OC_FileStorage_SWIFT extends OC_Filestorage_Common{
 
 		$this->conn = new CF_Connection($this->auth);
 
-		if(!$this->containerExists($this->root)){
+		if(!$this->containerExists($this->root)) {
 			$this->rootContainer=$this->createContainer('/');
 		}else{
 			$this->rootContainer=$this->getContainer('/');
@@ -285,8 +285,8 @@ class OC_FileStorage_SWIFT extends OC_Filestorage_Common{
 	}
 
 
-	public function mkdir($path){
-		if($this->containerExists($path)){
+	public function mkdir($path) {
+		if($this->containerExists($path)) {
 			return false;
 		}else{
 			$this->createContainer($path);
@@ -294,12 +294,12 @@ class OC_FileStorage_SWIFT extends OC_Filestorage_Common{
 		}
 	}
 
-	public function rmdir($path){
-		if(!$this->containerExists($path)){
+	public function rmdir($path) {
+		if(!$this->containerExists($path)) {
 			return false;
 		}else{
 			$this->emptyContainer($path);
-			if($path!='' and $path!='/'){
+			if($path!='' and $path!='/') {
 				$parentContainer=$this->getContainer(dirname($path));
 				$this->removeSubContainer($parentContainer,basename($path));
 			}
@@ -310,14 +310,14 @@ class OC_FileStorage_SWIFT extends OC_Filestorage_Common{
 		}
 	}
 
-	private function emptyContainer($path){
+	private function emptyContainer($path) {
 		$container=$this->getContainer($path);
-		if(is_null($container)){
+		if(is_null($container)) {
 			return;
 		}
 		$subContainers=$this->getSubContainers($container);
-		foreach($subContainers as $sub){
-			if($sub){
+		foreach($subContainers as $sub) {
+			if($sub) {
 				$this->emptyContainer($path.'/'.$sub);
 				$this->conn->delete_container($this->getContainerName($path.'/'.$sub));
 				unset($this->containers[$path.'/'.$sub]);
@@ -325,17 +325,17 @@ class OC_FileStorage_SWIFT extends OC_Filestorage_Common{
 		}
 
 		$objects=$this->getObjects($container);
-		foreach($objects as $object){
+		foreach($objects as $object) {
 			$container->delete_object($object);
 			unset($this->objects[$path.'/'.$object]);
 		}
 	}
 
-	public function opendir($path){
+	public function opendir($path) {
 		$container=$this->getContainer($path);
 		$files=$this->getObjects($container);
 		$i=array_search(self::SUBCONTAINER_FILE,$files);
-		if($i!==false){
+		if($i!==false) {
 			unset($files[$i]);
 		}
 		$subContainers=$this->getSubContainers($container);
@@ -345,43 +345,43 @@ class OC_FileStorage_SWIFT extends OC_Filestorage_Common{
 		return opendir('fakedir://'.$id);
 	}
 
-	public function filetype($path){
-		if($this->containerExists($path)){
+	public function filetype($path) {
+		if($this->containerExists($path)) {
 			return 'dir';
 		}else{
 			return 'file';
 		}
 	}
 
-	public function isReadable($path){
+	public function isReadable($path) {
 		return true;
 	}
 
-	public function isUpdatable($path){
+	public function isUpdatable($path) {
 		return true;
 	}
 
-	public function file_exists($path){
-		if($this->is_dir($path)){
+	public function file_exists($path) {
+		if($this->is_dir($path)) {
 			return true;
 		}else{
 			return $this->objectExists($path);
 		}
 	}
 
-	public function file_get_contents($path){
+	public function file_get_contents($path) {
 		$obj=$this->getObject($path);
-		if(is_null($obj)){
+		if(is_null($obj)) {
 			return false;
 		}
 		return $obj->read();
 	}
 
-	public function file_put_contents($path,$content){
+	public function file_put_contents($path,$content) {
 		$obj=$this->getObject($path);
-		if(is_null($obj)){
+		if(is_null($obj)) {
 			$container=$this->getContainer(dirname($path));
-			if(is_null($container)){
+			if(is_null($container)) {
 				return false;
 			}
 			$obj=$container->create_object(basename($path));
@@ -390,8 +390,8 @@ class OC_FileStorage_SWIFT extends OC_Filestorage_Common{
 		return $obj->write($content);
 	}
 
-	public function unlink($path){
-		if($this->objectExists($path)){
+	public function unlink($path) {
+		if($this->objectExists($path)) {
 			$container=$this->getContainer(dirname($path));
 			$container->delete_object(basename($path));
 			unset($this->objects[$path]);
@@ -400,12 +400,12 @@ class OC_FileStorage_SWIFT extends OC_Filestorage_Common{
 		}
 	}
 
-	public function fopen($path,$mode){
+	public function fopen($path,$mode) {
 		$obj=$this->getObject($path);
-		if(is_null($obj)){
+		if(is_null($obj)) {
 			return false;
 		}
-		switch($mode){
+		switch($mode) {
 			case 'r':
 			case 'rb':
 				$fp = fopen('php://temp', 'r+');
@@ -432,23 +432,23 @@ class OC_FileStorage_SWIFT extends OC_Filestorage_Common{
 		}
 	}
 
-	public function writeBack($tmpFile){
-		if(isset(self::$tempFiles[$tmpFile])){
+	public function writeBack($tmpFile) {
+		if(isset(self::$tempFiles[$tmpFile])) {
 			$this->fromTmpFile($tmpFile,self::$tempFiles[$tmpFile]);
 			unlink($tmpFile);
 		}
 	}
 
-	public function free_space($path){
+	public function free_space($path) {
 		return 0;
 	}
 
-	public function touch($path,$mtime=null){
+	public function touch($path,$mtime=null) {
 		$obj=$this->getObject($path);
-		if(is_null($obj)){
+		if(is_null($obj)) {
 			return false;
 		}
-		if(is_null($mtime)){
+		if(is_null($mtime)) {
 			$mtime=time();
 		}
 
@@ -457,36 +457,36 @@ class OC_FileStorage_SWIFT extends OC_Filestorage_Common{
 		$obj->sync_metadata();
 	}
 
-	public function rename($path1,$path2){
+	public function rename($path1,$path2) {
 		$sourceContainer=$this->getContainer(dirname($path1));
 		$targetContainer=$this->getContainer(dirname($path2));
 		$result=$sourceContainer->move_object_to(basename($path1),$targetContainer,basename($path2));
 		unset($this->objects[$path1]);
-		if($result){
+		if($result) {
 			$targetObj=$this->getObject($path2);
 			$this->resetMTime($targetObj);
 		}
 		return $result;
 	}
 
-	public function copy($path1,$path2){
+	public function copy($path1,$path2) {
 		$sourceContainer=$this->getContainer(dirname($path1));
 		$targetContainer=$this->getContainer(dirname($path2));
 		$result=$sourceContainer->copy_object_to(basename($path1),$targetContainer,basename($path2));
-		if($result){
+		if($result) {
 			$targetObj=$this->getObject($path2);
 			$this->resetMTime($targetObj);
 		}
 		return $result;
 	}
 
-	public function stat($path){
+	public function stat($path) {
 		$obj=$this->getObject($path);
-		if(is_null($obj)){
+		if(is_null($obj)) {
 			return false;
 		}
 
-		if(isset($obj->metadata['Mtime']) and $obj->metadata['Mtime']>-1){
+		if(isset($obj->metadata['Mtime']) and $obj->metadata['Mtime']>-1) {
 			$mtime=$obj->metadata['Mtime'];
 		}else{
 			$mtime=strtotime($obj->last_modified);
@@ -498,9 +498,9 @@ class OC_FileStorage_SWIFT extends OC_Filestorage_Common{
 		);
 	}
 
-	private function getTmpFile($path){
+	private function getTmpFile($path) {
 		$obj=$this->getObject($path);
-		if(!is_null($obj)){
+		if(!is_null($obj)) {
 			$tmpFile=OCP\Files::tmpFile();
 			$obj->save_to_filename($tmpFile);
 			return $tmpFile;
@@ -509,9 +509,9 @@ class OC_FileStorage_SWIFT extends OC_Filestorage_Common{
 		}
 	}
 
-	private function fromTmpFile($tmpFile,$path){
+	private function fromTmpFile($tmpFile,$path) {
 		$obj=$this->getObject($path);
-		if(is_null($obj)){
+		if(is_null($obj)) {
 			$obj=$this->createObject($path);
 		}
 		$obj->load_from_filename($tmpFile);
@@ -522,8 +522,8 @@ class OC_FileStorage_SWIFT extends OC_Filestorage_Common{
 	 * remove custom mtime metadata
 	 * @param CF_Object obj
 	 */
-	private function resetMTime($obj){
-		if(isset($obj->metadata['Mtime'])){
+	private function resetMTime($obj) {
+		if(isset($obj->metadata['Mtime'])) {
 			$obj->metadata['Mtime']=-1;
 			$obj->sync_metadata();
 		}
diff --git a/apps/files_external/lib/webdav.php b/apps/files_external/lib/webdav.php
index 1b9c3e3333..3c18b227fa 100644
--- a/apps/files_external/lib/webdav.php
+++ b/apps/files_external/lib/webdav.php
@@ -19,7 +19,7 @@ class OC_FileStorage_DAV extends OC_Filestorage_Common{
 
 	private static $tempFiles=array();
 
-	public function __construct($params){
+	public function __construct($params) {
 		$host = $params['host'];
 		//remove leading http[s], will be generated in createBaseUri()
 		if (substr($host,0,8) == "https://") $host = substr($host, 8);
@@ -29,10 +29,10 @@ class OC_FileStorage_DAV extends OC_Filestorage_Common{
 		$this->password=$params['password'];
 		$this->secure=(isset($params['secure']) && $params['secure'] == 'true')?true:false;
 		$this->root=isset($params['root'])?$params['root']:'/';
-		if(!$this->root || $this->root[0]!='/'){
+		if(!$this->root || $this->root[0]!='/') {
 			$this->root='/'.$this->root;
 		}
-		if(substr($this->root,-1,1)!='/'){
+		if(substr($this->root,-1,1)!='/') {
 			$this->root.='/';
 		}
 
@@ -54,26 +54,26 @@ class OC_FileStorage_DAV extends OC_Filestorage_Common{
 		$this->mkdir('');
 	}
 
-	private function createBaseUri(){
+	private function createBaseUri() {
 		$baseUri='http';
-		if($this->secure){
+		if($this->secure) {
 			$baseUri.='s';
 		}
 		$baseUri.='://'.$this->host.$this->root;
 		return $baseUri;
 	}
 
-	public function mkdir($path){
+	public function mkdir($path) {
 		$path=$this->cleanPath($path);
 		return $this->simpleResponse('MKCOL',$path,null,201);
 	}
 
-	public function rmdir($path){
+	public function rmdir($path) {
 		$path=$this->cleanPath($path);
 		return $this->simpleResponse('DELETE',$path,null,204);
 	}
 
-	public function opendir($path){
+	public function opendir($path) {
 		$path=$this->cleanPath($path);
 		try{
 			$response=$this->client->propfind($path, array(),1);
@@ -81,54 +81,54 @@ class OC_FileStorage_DAV extends OC_Filestorage_Common{
 			OC_FakeDirStream::$dirs[$id]=array();
 			$files=array_keys($response);
 			array_shift($files);//the first entry is the current directory
-			foreach($files as $file){
+			foreach($files as $file) {
 				$file = urldecode(basename($file));
 				OC_FakeDirStream::$dirs[$id][]=$file;
 			}
 			return opendir('fakedir://'.$id);
-		}catch(Exception $e){
+		}catch(Exception $e) {
 			return false;
 		}
 	}
 
-	public function filetype($path){
+	public function filetype($path) {
 		$path=$this->cleanPath($path);
 		try{
 			$response=$this->client->propfind($path, array('{DAV:}resourcetype'));
 			$responseType=$response["{DAV:}resourcetype"]->resourceType;
 			return (count($responseType)>0 and $responseType[0]=="{DAV:}collection")?'dir':'file';
-		}catch(Exception $e){
+		}catch(Exception $e) {
 			error_log($e->getMessage());
 			\OCP\Util::writeLog("webdav client", \OCP\Util::sanitizeHTML($e->getMessage()), \OCP\Util::ERROR);
 			return false;
 		}
 	}
 
-	public function isReadable($path){
+	public function isReadable($path) {
 		return true;//not properly supported
 	}
 
-	public function isUpdatable($path){
+	public function isUpdatable($path) {
 		return true;//not properly supported
 	}
 
-	public function file_exists($path){
+	public function file_exists($path) {
 		$path=$this->cleanPath($path);
 		try{
 			$this->client->propfind($path, array('{DAV:}resourcetype'));
 			return true;//no 404 exception
-		}catch(Exception $e){
+		}catch(Exception $e) {
 			return false;
 		}
 	}
 
-	public function unlink($path){
+	public function unlink($path) {
 		return $this->simpleResponse('DELETE',$path,null,204);
 	}
 
-	public function fopen($path,$mode){
+	public function fopen($path,$mode) {
 		$path=$this->cleanPath($path);
-		switch($mode){
+		switch($mode) {
 			case 'r':
 			case 'rb':
 				//straight up curl instead of sabredav here, sabredav put's the entire get result in memory
@@ -155,14 +155,14 @@ class OC_FileStorage_DAV extends OC_Filestorage_Common{
 			case 'c':
 			case 'c+':
 				//emulate these
-				if(strrpos($path,'.')!==false){
+				if(strrpos($path,'.')!==false) {
 					$ext=substr($path,strrpos($path,'.'));
 				}else{
 					$ext='';
 				}
 				$tmpFile=OCP\Files::tmpFile($ext);
 				OC_CloseStreamWrapper::$callBacks[$tmpFile]=array($this,'writeBack');
-				if($this->file_exists($path)){
+				if($this->file_exists($path)) {
 					$this->getFile($path,$tmpFile);
 				}
 				self::$tempFiles[$tmpFile]=$path;
@@ -170,41 +170,41 @@ class OC_FileStorage_DAV extends OC_Filestorage_Common{
 		}
 	}
 
-	public function writeBack($tmpFile){
-		if(isset(self::$tempFiles[$tmpFile])){
+	public function writeBack($tmpFile) {
+		if(isset(self::$tempFiles[$tmpFile])) {
 			$this->uploadFile($tmpFile,self::$tempFiles[$tmpFile]);
 			unlink($tmpFile);
 		}
 	}
 
-	public function free_space($path){
+	public function free_space($path) {
 		$path=$this->cleanPath($path);
 		try{
 			$response=$this->client->propfind($path, array('{DAV:}quota-available-bytes'));
-			if(isset($response['{DAV:}quota-available-bytes'])){
+			if(isset($response['{DAV:}quota-available-bytes'])) {
 				return (int)$response['{DAV:}quota-available-bytes'];
 			}else{
 				return 0;
 			}
-		}catch(Exception $e){
+		}catch(Exception $e) {
 			return 0;
 		}
 	}
 
-	public function touch($path,$mtime=null){
-		if(is_null($mtime)){
+	public function touch($path,$mtime=null) {
+		if(is_null($mtime)) {
 			$mtime=time();
 		}
 		$path=$this->cleanPath($path);
 		$this->client->proppatch($path, array('{DAV:}lastmodified' => $mtime));
 	}
 
-	public function getFile($path,$target){
+	public function getFile($path,$target) {
 		$source=$this->fopen($path,'r');
 		file_put_contents($target,$source);
 	}
 
-	public function uploadFile($path,$target){
+	public function uploadFile($path,$target) {
 		$source=fopen($path,'r');
 
 		$curl = curl_init();
@@ -218,13 +218,13 @@ class OC_FileStorage_DAV extends OC_Filestorage_Common{
 		curl_close ($curl);
 	}
 
-	public function rename($path1,$path2){
+	public function rename($path1,$path2) {
 		$path1=$this->cleanPath($path1);
 		$path2=$this->root.$this->cleanPath($path2);
 		try{
 			$response=$this->client->request('MOVE',$path1,null,array('Destination'=>$path2));
 			return true;
-		}catch(Exception $e){
+		}catch(Exception $e) {
 			echo $e;
 			echo 'fail';
 			var_dump($response);
@@ -232,13 +232,13 @@ class OC_FileStorage_DAV extends OC_Filestorage_Common{
 		}
 	}
 
-	public function copy($path1,$path2){
+	public function copy($path1,$path2) {
 		$path1=$this->cleanPath($path1);
 		$path2=$this->root.$this->cleanPath($path2);
 		try{
 			$response=$this->client->request('COPY',$path1,null,array('Destination'=>$path2));
 			return true;
-		}catch(Exception $e){
+		}catch(Exception $e) {
 			echo $e;
 			echo 'fail';
 			var_dump($response);
@@ -246,7 +246,7 @@ class OC_FileStorage_DAV extends OC_Filestorage_Common{
 		}
 	}
 
-	public function stat($path){
+	public function stat($path) {
 		$path=$this->cleanPath($path);
 		try{
 			$response=$this->client->propfind($path, array('{DAV:}getlastmodified','{DAV:}getcontentlength'));
@@ -255,43 +255,43 @@ class OC_FileStorage_DAV extends OC_Filestorage_Common{
 				'size'=>(int)isset($response['{DAV:}getcontentlength']) ? $response['{DAV:}getcontentlength'] : 0,
 				'ctime'=>-1,
 			);
-		}catch(Exception $e){
+		}catch(Exception $e) {
 			return array();
 		}
 	}
 
-	public function getMimeType($path){
+	public function getMimeType($path) {
 		$path=$this->cleanPath($path);
 		try{
 			$response=$this->client->propfind($path, array('{DAV:}getcontenttype','{DAV:}resourcetype'));
 			$responseType=$response["{DAV:}resourcetype"]->resourceType;
 			$type=(count($responseType)>0 and $responseType[0]=="{DAV:}collection")?'dir':'file';
-			if($type=='dir'){
+			if($type=='dir') {
 				return 'httpd/unix-directory';
-			}elseif(isset($response['{DAV:}getcontenttype'])){
+			}elseif(isset($response['{DAV:}getcontenttype'])) {
 				return $response['{DAV:}getcontenttype'];
 			}else{
 				return false;
 			}
-		}catch(Exception $e){
+		}catch(Exception $e) {
 			return false;
 		}
 	}
 
-	private function cleanPath($path){
-		if(!$path || $path[0]=='/'){
+	private function cleanPath($path) {
+		if(!$path || $path[0]=='/') {
 			return substr($path,1);
 		}else{
 			return $path;
 		}
 	}
 
-	private function simpleResponse($method,$path,$body,$expected){
+	private function simpleResponse($method,$path,$body,$expected) {
 		$path=$this->cleanPath($path);
 		try{
 			$response=$this->client->request($method,$path,$body);
 			return $response['statusCode']==$expected;
-		}catch(Exception $e){
+		}catch(Exception $e) {
 			return false;
 		}
 	}
diff --git a/apps/files_external/tests/ftp.php b/apps/files_external/tests/ftp.php
index 3548880e83..12f3ec3908 100644
--- a/apps/files_external/tests/ftp.php
+++ b/apps/files_external/tests/ftp.php
@@ -7,21 +7,21 @@
  */
 
 $config=include('apps/files_external/tests/config.php');
-if(!is_array($config) or !isset($config['ftp']) or !$config['ftp']['run']){
+if(!is_array($config) or !isset($config['ftp']) or !$config['ftp']['run']) {
 	abstract class Test_Filestorage_FTP extends Test_FileStorage{}
 	return;
 }else{
 	class Test_Filestorage_FTP extends Test_FileStorage {
 		private $config;
 
-		public function setUp(){
+		public function setUp() {
 			$id=uniqid();
 			$this->config=include('apps/files_external/tests/config.php');
 			$this->config['ftp']['root'].='/'.$id;//make sure we have an new empty folder to work in
 			$this->instance=new OC_Filestorage_FTP($this->config['ftp']);
 		}
 
-		public function tearDown(){
+		public function tearDown() {
 			OCP\Files::rmdirr($this->instance->constructUrl(''));
 		}
 	}
diff --git a/apps/files_external/tests/google.php b/apps/files_external/tests/google.php
index b0bd9cbbea..d2a6358ade 100644
--- a/apps/files_external/tests/google.php
+++ b/apps/files_external/tests/google.php
@@ -21,7 +21,7 @@
 */
 
 $config=include('apps/files_external/tests/config.php');
-if(!is_array($config) or !isset($config['google']) or !$config['google']['run']){
+if(!is_array($config) or !isset($config['google']) or !$config['google']['run']) {
 	abstract class Test_Filestorage_Google extends Test_FileStorage{}
 	return;
 }else{
@@ -29,14 +29,14 @@ if(!is_array($config) or !isset($config['google']) or !$config['google']['run'])
 
 		private $config;
 
-		public function setUp(){
+		public function setUp() {
 			$id=uniqid();
 			$this->config=include('apps/files_external/tests/config.php');
 			$this->config['google']['root'].='/'.$id;//make sure we have an new empty folder to work in
 			$this->instance=new OC_Filestorage_Google($this->config['google']);
 		}
 
-		public function tearDown(){
+		public function tearDown() {
 			$this->instance->rmdir('/');
 		}
 	}
diff --git a/apps/files_external/tests/smb.php b/apps/files_external/tests/smb.php
index 001ef84227..7de4fddbb3 100644
--- a/apps/files_external/tests/smb.php
+++ b/apps/files_external/tests/smb.php
@@ -8,21 +8,21 @@
 
 $config=include('apps/files_external/tests/config.php');
 
-if(!is_array($config) or !isset($config['smb']) or !$config['smb']['run']){
+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;
 
-		public function setUp(){
+		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(){
+		public function tearDown() {
 			OCP\Files::rmdirr($this->instance->constructUrl(''));
 		}
 	}
diff --git a/apps/files_external/tests/swift.php b/apps/files_external/tests/swift.php
index bfe7b77aac..a6f5eace1c 100644
--- a/apps/files_external/tests/swift.php
+++ b/apps/files_external/tests/swift.php
@@ -7,14 +7,14 @@
  */
 
 $config=include('apps/files_external/tests/config.php');
-if(!is_array($config) or !isset($config['swift']) or !$config['swift']['run']){
+if(!is_array($config) or !isset($config['swift']) or !$config['swift']['run']) {
 	abstract class Test_Filestorage_SWIFT extends Test_FileStorage{}
 	return;
 }else{
 	class Test_Filestorage_SWIFT extends Test_FileStorage {
 		private $config;
 
-		public function setUp(){
+		public function setUp() {
 			$id=uniqid();
 			$this->config=include('apps/files_external/tests/config.php');
 			$this->config['swift']['root'].='/'.$id;//make sure we have an new empty folder to work in
@@ -22,7 +22,7 @@ if(!is_array($config) or !isset($config['swift']) or !$config['swift']['run']){
 		}
 
 
-		public function tearDown(){
+		public function tearDown() {
 		    $this->instance->rmdir('');
 		}
 
diff --git a/apps/files_external/tests/webdav.php b/apps/files_external/tests/webdav.php
index 49c44124f3..74d980aa3f 100644
--- a/apps/files_external/tests/webdav.php
+++ b/apps/files_external/tests/webdav.php
@@ -7,21 +7,21 @@
  */
 
 $config=include('apps/files_external/tests/config.php');
-if(!is_array($config) or !isset($config['webdav']) or !$config['webdav']['run']){
+if(!is_array($config) or !isset($config['webdav']) or !$config['webdav']['run']) {
 	abstract class Test_Filestorage_DAV extends Test_FileStorage{}
 	return;
 }else{
 	class Test_Filestorage_DAV extends Test_FileStorage {
 		private $config;
 
-		public function setUp(){
+		public function setUp() {
 			$id=uniqid();
 			$this->config=include('apps/files_external/tests/config.php');
 			$this->config['webdav']['root'].='/'.$id;//make sure we have an new empty folder to work in
 			$this->instance=new OC_Filestorage_DAV($this->config['webdav']);
 		}
 
-		public function tearDown(){
+		public function tearDown() {
 			$this->instance->rmdir('/');
 		}
 	}
diff --git a/apps/files_sharing/lib/sharedstorage.php b/apps/files_sharing/lib/sharedstorage.php
index 4530ce8777..6dba76955a 100644
--- a/apps/files_sharing/lib/sharedstorage.php
+++ b/apps/files_sharing/lib/sharedstorage.php
@@ -443,7 +443,7 @@ class OC_Filestorage_Shared extends OC_Filestorage_Common {
 	 * @param int $time
 	 * @return bool
 	 */
-	public function hasUpdated($path,$time){
+	public function hasUpdated($path,$time) {
 		//TODO
 		return false;
 	}
diff --git a/apps/files_versions/ajax/expireAll.php b/apps/files_versions/ajax/expireAll.php
index f76da3da98..5c95885ffb 100644
--- a/apps/files_versions/ajax/expireAll.php
+++ b/apps/files_versions/ajax/expireAll.php
@@ -31,7 +31,7 @@ OCP\JSON::callCheck();
 
 $versions = new OCA_Versions\Storage();
 
-if( $versions->expireAll() ){
+if( $versions->expireAll() ) {
 
 	OCP\JSON::success();
 	die();
diff --git a/apps/files_versions/ajax/rollbackVersion.php b/apps/files_versions/ajax/rollbackVersion.php
index 24d71a914a..f1b02eb4b9 100644
--- a/apps/files_versions/ajax/rollbackVersion.php
+++ b/apps/files_versions/ajax/rollbackVersion.php
@@ -9,7 +9,7 @@ $file = $_GET['file'];
 $revision=(int)$_GET['revision'];
 
 if( OCA_Versions\Storage::isversioned( $file ) ) {
-	if(OCA_Versions\Storage::rollback( $file, $revision )){
+	if(OCA_Versions\Storage::rollback( $file, $revision )) {
 		OCP\JSON::success(array("data" => array( "revision" => $revision, "file" => $file )));
 	}else{
 		OCP\JSON::error(array("data" => array( "message" => "Could not revert:" . $file )));
diff --git a/apps/files_versions/lib/hooks.php b/apps/files_versions/lib/hooks.php
index 330f10afb5..9ec0b01a7f 100644
--- a/apps/files_versions/lib/hooks.php
+++ b/apps/files_versions/lib/hooks.php
@@ -44,7 +44,7 @@ class Hooks {
 		$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){
+			foreach ($versions as $v) {
 				unlink($abs_path . $v['version']);
 			}
 		}
@@ -66,7 +66,7 @@ class Hooks {
 			$info=pathinfo($abs_newpath);
 			if(!file_exists($info['dirname'])) mkdir($info['dirname'],0700,true);
 			$versions = Storage::getVersions($rel_oldpath);
-			foreach ($versions as $v){
+			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 4ea1a07b94..dedd83fc25 100644
--- a/apps/files_versions/lib/versions.php
+++ b/apps/files_versions/lib/versions.php
@@ -82,7 +82,7 @@ class Storage {
 			}
 
 			// check if filename is a directory
-			if($files_view->is_dir($filename)){
+			if($files_view->is_dir($filename)) {
 				return false;
 			}
 
@@ -97,7 +97,7 @@ class Storage {
 			}
 
 			// check filesize
-			if($files_view->filesize($filename)>\OCP\Config::getSystemValue('files_versionsmaxfilesize', Storage::DEFAULTMAXFILESIZE)){
+			if($files_view->filesize($filename)>\OCP\Config::getSystemValue('files_versionsmaxfilesize', Storage::DEFAULTMAXFILESIZE)) {
 				return false;
 			}
 
@@ -107,7 +107,7 @@ class Storage {
 				$matches=glob($versionsFolderName.'/'.$filename.'.v*');
 				sort($matches);
 				$parts=explode('.v',end($matches));
-				if((end($parts)+Storage::DEFAULTMININTERVAL)>time()){
+				if((end($parts)+Storage::DEFAULTMININTERVAL)>time()) {
 					return false;
 				}
 			}
@@ -175,7 +175,7 @@ class Storage {
 
 			// check for old versions
 			$matches=glob($versionsFolderName.$filename.'.v*');
-			if(count($matches)>0){
+			if(count($matches)>0) {
 				return true;
 			}else{
 				return false;
diff --git a/apps/user_ldap/appinfo/install.php b/apps/user_ldap/appinfo/install.php
index 9efc3bb24d..378957ec40 100644
--- a/apps/user_ldap/appinfo/install.php
+++ b/apps/user_ldap/appinfo/install.php
@@ -1,6 +1,6 @@
 <?php
 
 $state = OCP\Config::getSystemValue('ldapIgnoreNamingRules', 'doSet');
-if($state == 'doSet'){
+if($state == 'doSet') {
 	OCP\Config::setSystemValue('ldapIgnoreNamingRules', false);
 }
diff --git a/apps/user_ldap/appinfo/update.php b/apps/user_ldap/appinfo/update.php
index da36211b66..f23285a0dc 100644
--- a/apps/user_ldap/appinfo/update.php
+++ b/apps/user_ldap/appinfo/update.php
@@ -18,7 +18,7 @@ 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', 'unset');
-if($state == 'unset'){
+if($state == 'unset') {
 	OCP\Config::setSystemValue('ldapIgnoreNamingRules', false);
 }
 
diff --git a/apps/user_ldap/group_ldap.php b/apps/user_ldap/group_ldap.php
index aac3ed7891..5ec259f6c4 100644
--- a/apps/user_ldap/group_ldap.php
+++ b/apps/user_ldap/group_ldap.php
@@ -231,7 +231,7 @@ class GROUP_LDAP extends lib\Access implements \OCP\GroupInterface {
 	 * @param string $gid
 	 * @return bool
 	 */
-	public function groupExists($gid){
+	public function groupExists($gid) {
 		if($this->connection->isCached('groupExists'.$gid)) {
 			return $this->connection->getFromCache('groupExists'.$gid);
 		}
diff --git a/apps/user_ldap/settings.php b/apps/user_ldap/settings.php
index 23018890ea..f765151456 100644
--- a/apps/user_ldap/settings.php
+++ b/apps/user_ldap/settings.php
@@ -26,8 +26,8 @@ OCP\Util::addscript('user_ldap', 'settings');
 OCP\Util::addstyle('user_ldap', 'settings');
 
 if ($_POST) {
-	foreach($params as $param){
-		if(isset($_POST[$param])){
+	foreach($params as $param) {
+		if(isset($_POST[$param])) {
 			if('ldap_agent_password' == $param) {
 				OCP\Config::setAppValue('user_ldap', $param, base64_encode($_POST[$param]));
 			} elseif('ldap_cache_ttl' == $param) {
@@ -58,7 +58,7 @@ if ($_POST) {
 
 // fill template
 $tmpl = new OCP\Template( 'user_ldap', 'settings');
-foreach($params as $param){
+foreach($params as $param) {
 		$value = OCP\Config::getAppValue('user_ldap', $param,'');
 		$tmpl->assign($param, $value);
 }
diff --git a/apps/user_ldap/tests/group_ldap.php b/apps/user_ldap/tests/group_ldap.php
index ac66a608b7..b953127d86 100644
--- a/apps/user_ldap/tests/group_ldap.php
+++ b/apps/user_ldap/tests/group_ldap.php
@@ -21,11 +21,11 @@
 */
 
 class Test_Group_Ldap extends UnitTestCase {
-	function setUp(){
+	function setUp() {
 		OC_Group::clearBackends();
 	}
 
-	function testSingleBackend(){
+	function testSingleBackend() {
 		OC_Group::useBackend(new OCA\user_ldap\GROUP_LDAP());
 		$group_ldap = new OCA\user_ldap\GROUP_LDAP();
 
diff --git a/apps/user_ldap/user_ldap.php b/apps/user_ldap/user_ldap.php
index d297374600..bacdb8b9ae 100644
--- a/apps/user_ldap/user_ldap.php
+++ b/apps/user_ldap/user_ldap.php
@@ -65,7 +65,7 @@ class USER_LDAP extends lib\Access implements \OCP\UserInterface {
 	 *
 	 * Check if the password is correct without logging in the user
 	 */
-	public function checkPassword($uid, $password){
+	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');
 		$ldap_users = $this->fetchListOfUsers($filter, 'dn');
@@ -82,7 +82,7 @@ class USER_LDAP extends lib\Access implements \OCP\UserInterface {
 		//do we have a username for him/her?
 		$ocname = $this->dn2username($dn);
 
-		if($ocname){
+		if($ocname) {
 			//update some settings, if necessary
 			$this->updateQuota($dn);
 			$this->updateEmail($dn);
@@ -100,7 +100,7 @@ class USER_LDAP extends lib\Access implements \OCP\UserInterface {
 	 *
 	 * Get a list of all users.
 	 */
-	public function getUsers($search = '', $limit = 10, $offset = 0){
+	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'));
@@ -126,7 +126,7 @@ class USER_LDAP extends lib\Access implements \OCP\UserInterface {
 	 * @param string $uid the username
 	 * @return boolean
 	 */
-	public function userExists($uid){
+	public function userExists($uid) {
 		if($this->connection->isCached('userExists'.$uid)) {
 			return $this->connection->getFromCache('userExists'.$uid);
 		}
@@ -187,7 +187,7 @@ class USER_LDAP extends lib\Access implements \OCP\UserInterface {
 	* @param string $uid the username
 	* @return boolean
 	*/
-	public function getHome($uid){
+	public function getHome($uid) {
 		if($this->userExists($uid)) {
 			$homedir = \OCP\Config::getUserValue($uid, 'user_ldap', 'homedir', false);
 			if(!$homedir) {
diff --git a/apps/user_webdavauth/settings.php b/apps/user_webdavauth/settings.php
index 1b80b1bba3..4f1ddbbefd 100755
--- a/apps/user_webdavauth/settings.php
+++ b/apps/user_webdavauth/settings.php
@@ -22,9 +22,9 @@
  */
 
 print_r($_POST);
-if($_POST){
+if($_POST) {
 
-		if(isset($_POST['webdav_url'])){
+		if(isset($_POST['webdav_url'])) {
 			OC_CONFIG::setValue('user_webdavauth_url', strip_tags($_POST['webdav_url']));
 		}
 }
diff --git a/apps/user_webdavauth/user_webdavauth.php b/apps/user_webdavauth/user_webdavauth.php
index 571aca2f70..c36d37c1fa 100755
--- a/apps/user_webdavauth/user_webdavauth.php
+++ b/apps/user_webdavauth/user_webdavauth.php
@@ -50,7 +50,7 @@ class OC_USER_WEBDAVAUTH extends OC_User_Backend {
 
 		$url= 'http://'.urlencode($uid).':'.urlencode($password).'@'.$this->webdavauth_url;
 		$headers = get_headers($url);
-		if($headers==false){
+		if($headers==false) {
 			OC_Log::write('OC_USER_WEBDAVAUTH', 'Not possible to connect to WebDAV Url: "'.$this->webdavauth_url.'" ' ,3);
 			return false;
 
@@ -68,14 +68,14 @@ class OC_USER_WEBDAVAUTH extends OC_User_Backend {
 	/*
 	* we don´t know if a user exists without the password. so we have to return false all the time
 	*/
-	public function userExists( $uid ){
+	public function userExists( $uid ) {
 		return false;
 	}
 
 	/*
 	* we don´t know the users so all we can do it return an empty array here
 	*/
-	public function getUsers(){
+	public function getUsers() {
 		$returnArray = array();
 
 		return $returnArray;
diff --git a/core/ajax/appconfig.php b/core/ajax/appconfig.php
index 3ad9e2326c..1b43afa74f 100644
--- a/core/ajax/appconfig.php
+++ b/core/ajax/appconfig.php
@@ -11,7 +11,7 @@ OCP\JSON::callCheck();
 
 $action=isset($_POST['action'])?$_POST['action']:$_GET['action'];
 $result=false;
-switch($action){
+switch($action) {
 	case 'getValue':
 		$result=OC_Appconfig::getValue($_GET['app'], $_GET['key'], $_GET['defaultValue']);
 		break;
diff --git a/core/minimizer.php b/core/minimizer.php
index 0abbca7502..4da9037c41 100644
--- a/core/minimizer.php
+++ b/core/minimizer.php
@@ -3,12 +3,12 @@ session_write_close();
 
 OC_App::loadApps();
 
-if ($service == 'core.css'){
+if ($service == 'core.css') {
 	$minimizer = new OC_Minimizer_CSS();
 	$files = OC_TemplateLayout::findStylesheetFiles(OC_Util::$core_styles);
 	$minimizer->output($files, $service);
 }
-else if ($service == 'core.js'){
+else if ($service == 'core.js') {
 	$minimizer = new OC_Minimizer_JS();
 	$files = OC_TemplateLayout::findJavascriptFiles(OC_Util::$core_scripts);
 	$minimizer->output($files, $service);
diff --git a/core/templates/403.php b/core/templates/403.php
index cdfef08ac7..fbf0e64fdb 100644
--- a/core/templates/403.php
+++ b/core/templates/403.php
@@ -1,5 +1,5 @@
 <?php
-if(!isset($_)){//also provide standalone error page
+if(!isset($_)) {//also provide standalone error page
 	require_once '../../lib/base.php';
 	
 	$tmpl = new OC_Template( '', '403', 'guest' );
diff --git a/core/templates/404.php b/core/templates/404.php
index 13a8101034..c111fd70fa 100644
--- a/core/templates/404.php
+++ b/core/templates/404.php
@@ -1,5 +1,5 @@
 <?php
-if(!isset($_)){//also provide standalone error page
+if(!isset($_)) {//also provide standalone error page
 	require_once '../../lib/base.php';
 	
 	$tmpl = new OC_Template( '', '404', 'guest' );
diff --git a/core/templates/exception.php b/core/templates/exception.php
index 7f58ce252c..4b951fca51 100644
--- a/core/templates/exception.php
+++ b/core/templates/exception.php
@@ -4,7 +4,7 @@
 		<summary class="error">We're sorry, but something went terribly wrong.<br></summary>
 		<p class="exception">
 		<?php
-		if($_['showsysinfo'] == true){
+		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";
diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php
index 4cdbfd16e5..9a5a056eb2 100644
--- a/core/templates/layout.guest.php
+++ b/core/templates/layout.guest.php
@@ -24,7 +24,7 @@
 		<?php foreach($_['headers'] as $header): ?>
 			<?php
 				echo '<'.$header['tag'].' ';
-				foreach($header['attributes'] as $name=>$value){
+				foreach($header['attributes'] as $name=>$value) {
 					echo "$name='$value' ";
 				};
 				echo '/>';
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index a2560b755f..89b8027fc0 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -24,7 +24,7 @@
 		<?php foreach($_['headers'] as $header): ?>
 			<?php
 				echo '<'.$header['tag'].' ';
-				foreach($header['attributes'] as $name=>$value){
+				foreach($header['attributes'] as $name=>$value) {
 					echo "$name='$value' ";
 				};
 				echo '/>';
@@ -33,7 +33,7 @@
 		<script type="text/javascript">
 			requesttoken = '<?php echo $_['requesttoken']; ?>';
 			OC.EventSource.requesttoken=requesttoken;
-			$(document).bind('ajaxSend', function(elm, xhr, s){
+			$(document).bind('ajaxSend', function(elm, xhr, s) {
 				xhr.setRequestHeader('requesttoken', requesttoken);
 			});
 		</script>
@@ -44,7 +44,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" x-webkit-speech />
+				<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>
 
diff --git a/cron.php b/cron.php
index d204c1dbe6..f13b284b81 100644
--- a/cron.php
+++ b/cron.php
@@ -77,7 +77,7 @@ if( OC::$CLI ) {
 	OC_BackgroundJob_Worker::doAllSteps();
 }
 else{
-	if( $appmode == 'cron' ){
+	if( $appmode == 'cron' ) {
 		OC_JSON::error( array( 'data' => array( 'message' => 'Backgroundjobs are using system cron!')));
 	}
 	else{
diff --git a/lib/MDB2/Driver/Datatype/sqlite3.php b/lib/MDB2/Driver/Datatype/sqlite3.php
index 673706e518..ca4c1cbceb 100644
--- a/lib/MDB2/Driver/Datatype/sqlite3.php
+++ b/lib/MDB2/Driver/Datatype/sqlite3.php
@@ -191,7 +191,7 @@ class MDB2_Driver_Datatype_sqlite3 extends MDB2_Driver_Datatype_Common
         $notnull = empty($field['notnull']) ? '' : ' NOT NULL';
         $unsigned = empty($field['unsigned']) ? '' : ' UNSIGNED';
         $name = $db->quoteIdentifier($name, true);
-        if($autoinc){
+        if($autoinc) {
 			return $name.' '.$this->getTypeDeclaration($field).$autoinc;
         }else{
 			return $name.' '.$this->getTypeDeclaration($field).$unsigned.$default.$notnull.$autoinc;
diff --git a/lib/MDB2/Driver/Manager/sqlite3.php b/lib/MDB2/Driver/Manager/sqlite3.php
index 0101f8ee2a..921153c17d 100644
--- a/lib/MDB2/Driver/Manager/sqlite3.php
+++ b/lib/MDB2/Driver/Manager/sqlite3.php
@@ -531,7 +531,7 @@ class MDB2_Driver_Manager_sqlite3 extends MDB2_Driver_Manager_Common
             return MDB2_OK;
         }
 
-        if (empty($changes['remove']) and empty($changes['rename']) and empty($changes['change']) ){//if only rename or add changes are required, we can use ALTER TABLE
+        if (empty($changes['remove']) and empty($changes['rename']) and empty($changes['change']) ) {//if only rename or add changes are required, we can use ALTER TABLE
 			$query = '';
 			if (!empty($changes['name'])) {
 				$change_name = $db->quoteIdentifier($changes['name'], true);
diff --git a/lib/MDB2/Driver/sqlite3.php b/lib/MDB2/Driver/sqlite3.php
index 6bfccadad9..9757e4faf9 100644
--- a/lib/MDB2/Driver/sqlite3.php
+++ b/lib/MDB2/Driver/sqlite3.php
@@ -150,7 +150,7 @@ class MDB2_Driver_sqlite3 extends MDB2_Driver_Common
      */
     public function escape($text, $escape_wildcards = false)
     {
-		if($this->connection){
+		if($this->connection) {
 			return $this->connection->escapeString($text);
 		}else{
 			return str_replace("'","''",$text);//TODO; more
@@ -324,7 +324,7 @@ class MDB2_Driver_sqlite3 extends MDB2_Driver_Common
      **/
     function connect()
     {
-		if($this->connection instanceof SQLite3){
+		if($this->connection instanceof SQLite3) {
 			return MDB2_OK;
 		}
 		$datadir=OC_Config::getValue( "datadirectory", OC::$SERVERROOT."/data" );
@@ -351,7 +351,7 @@ class MDB2_Driver_sqlite3 extends MDB2_Driver_Common
         }
 
         if ($database_file !== ':memory:') {
-			if(!strpos($database_file,'.db')){
+			if(!strpos($database_file,'.db')) {
 				$database_file="$datadir/$database_file.db";
 			}
             if (!file_exists($database_file)) {
@@ -387,7 +387,7 @@ class MDB2_Driver_sqlite3 extends MDB2_Driver_Common
 
         $php_errormsg = '';
 		$this->connection = new SQLite3($database_file);
-		if(is_callable(array($this->connection,'busyTimeout'))){//busy timout is only available in php>=5.3
+		if(is_callable(array($this->connection,'busyTimeout'))) {//busy timout is only available in php>=5.3
 			$this->connection->busyTimeout(100);
 		}
         $this->_lasterror = $this->connection->lastErrorMsg();
@@ -1055,7 +1055,7 @@ class MDB2_BufferedResult_sqlite3 extends MDB2_Result_sqlite3
     function seek($rownum = 0)
     {
 		$this->result->reset();
-		for($i=0;$i<$rownum;$i++){
+		for($i=0;$i<$rownum;$i++) {
 			$this->result->fetchArray();
 		}
         $this->rownum = $rownum - 1;
@@ -1093,7 +1093,7 @@ class MDB2_BufferedResult_sqlite3 extends MDB2_Result_sqlite3
     {
         $rows = 0;
         $this->result->reset();
-        while($this->result->fetchArray()){
+        while($this->result->fetchArray()) {
 			$rows++;
         }
         $this->result->reset();
@@ -1113,8 +1113,8 @@ class MDB2_Statement_sqlite3 extends MDB2_Statement_Common
 	// }}}
     // {{{ function bindValue($parameter, &$value, $type = null)
 
-	private function getParamType($type){
-		switch(strtolower($type)){
+	private function getParamType($type) {
+		switch(strtolower($type)) {
 			case 'text':
 				return SQLITE3_TEXT;
 			case 'boolean':
@@ -1139,8 +1139,8 @@ class MDB2_Statement_sqlite3 extends MDB2_Statement_Common
      *
      * @access  public
      */
-    function bindValue($parameter, $value, $type = null){
-		if($type){
+    function bindValue($parameter, $value, $type = null) {
+		if($type) {
 			$type=$this->getParamType($type);
 			$this->statement->bindValue($parameter,$value,$type);
 		}else{
@@ -1162,8 +1162,8 @@ class MDB2_Statement_sqlite3 extends MDB2_Statement_Common
      *
      * @access  public
      */
-    function bindParam($parameter, &$value, $type = null){
-        if($type){
+    function bindParam($parameter, &$value, $type = null) {
+        if($type) {
 			$type=$this->getParamType($type);
 			$this->statement->bindParam($parameter,$value,$type);
 		}else{
@@ -1193,7 +1193,7 @@ class MDB2_Statement_sqlite3 extends MDB2_Statement_Common
      *               a MDB2 error on failure
      * @access private
      */
-    function _execute($result_class = true, $result_wrap_class = false){
+    function _execute($result_class = true, $result_wrap_class = false) {
 		if (is_null($this->statement)) {
             $result =& parent::_execute($result_class, $result_wrap_class);
             return $result;
@@ -1313,7 +1313,7 @@ class MDB2_Statement_sqlite3 extends MDB2_Statement_Common
         }
         $values = (array)$values;
         if (!empty($values)) {
-			if(count($this->types)){
+			if(count($this->types)) {
 				$types=$this->types;
 			}else{
 				$types=null;
diff --git a/lib/app.php b/lib/app.php
index e772704b7d..f5c328afe7 100755
--- a/lib/app.php
+++ b/lib/app.php
@@ -48,12 +48,12 @@ class OC_App{
 	 *
 	 * if $types is set, only apps of those types will be loaded
 	 */
-	public static function loadApps($types=null){
+	public static function loadApps($types=null) {
 		// Load the enabled apps here
 		$apps = self::getEnabledApps();
 		// prevent app.php from printing output
 		ob_start();
-		foreach( $apps as $app ){
+		foreach( $apps as $app ) {
 			if((is_null($types) or self::isType($app, $types)) && !in_array($app, self::$loadedApps)) {
 				self::loadApp($app);
 				self::$loadedApps[] = $app;
@@ -94,12 +94,12 @@ class OC_App{
 	 * @param string $app
 	 * @param string/array $types
 	 */
-	public static function isType($app,$types){
+	public static function isType($app,$types) {
 		if(is_string($types)) {
 			$types=array($types);
 		}
 		$appTypes=self::getAppTypes($app);
-		foreach($types as $type){
+		foreach($types as $type) {
 			if(array_search($type, $appTypes)!==false) {
 				return true;
 			}
@@ -112,7 +112,7 @@ class OC_App{
 	 * @param string $app
 	 * @return array
 	 */
-	private static function getAppTypes($app){
+	private static function getAppTypes($app) {
 		//load the cache
 		if(count(self::$appTypes)==0) {
 			self::$appTypes=OC_Appconfig::getValues(false, 'types');
@@ -128,7 +128,7 @@ class OC_App{
 	/**
 	 * read app types from info.xml and cache them in the database
 	 */
-	public static function setAppTypes($app){
+	public static function setAppTypes($app) {
 		$appData=self::getAppInfo($app);
 
 		if(isset($appData['types'])) {
@@ -143,13 +143,13 @@ class OC_App{
 	/**
 	 * get all enabled apps
 	 */
-	public static function getEnabledApps(){
+	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();
-		while($row=$result->fetchRow()){
+		while($row=$result->fetchRow()) {
 			if(array_search($row['appid'], $apps)===false) {
 				$apps[]=$row['appid'];
 			}
@@ -164,7 +164,7 @@ class OC_App{
 	 *
 	 * This function checks whether or not an app is enabled.
 	 */
-	public static function isEnabled( $app ){
+	public static function isEnabled( $app ) {
 		if( 'files'==$app or 'yes' == OC_Appconfig::getValue( $app, 'enabled' )) {
 			return true;
 		}
@@ -179,7 +179,7 @@ class OC_App{
 	 *
 	 * This function set an app as enabled in appconfig.
 	 */
-	public static function enable( $app ){
+	public static function enable( $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)) {
@@ -215,7 +215,7 @@ class OC_App{
 	 *
 	 * This function set an app as disabled in appconfig.
 	 */
-	public static function disable( $app ){
+	public static function disable( $app ) {
 		// check if app is a shiped app or not. if not delete
 		OC_Appconfig::setValue( $app, 'enabled', 'no' );
 	}
@@ -237,7 +237,7 @@ class OC_App{
 	 *   - order: integer, that influences the position of your application in
 	 *     the navigation. Lower values come first.
 	 */
-	public static function addNavigationEntry( $data ){
+	public static function addNavigationEntry( $data ) {
 		$data['active']=false;
 		if(!isset($data['icon'])) {
 			$data['icon']='';
@@ -255,7 +255,7 @@ class OC_App{
 	 * property from all other entries. The templates can use this for
 	 * highlighting the current position of the user.
 	 */
-	public static function setActiveNavigationEntry( $id ){
+	public static function setActiveNavigationEntry( $id ) {
 		self::$activeapp = $id;
 		return true;
 	}
@@ -267,7 +267,7 @@ class OC_App{
 	 * This function returns the id of the active navigation entry (set by
 	 * setActiveNavigationEntry
 	 */
-	public static function getActiveNavigationEntry(){
+	public static function getActiveNavigationEntry() {
 		return self::$activeapp;
 	}
 
@@ -278,7 +278,7 @@ class OC_App{
 	 * This function returns an array containing all settings pages added. The
 	 * entries are sorted by the key 'order' ascending.
 	 */
-	public static function getSettingsNavigation(){
+	public static function getSettingsNavigation() {
 		$l=OC_L10N::get('lib');
 
 		$settings = array();
@@ -320,8 +320,8 @@ class OC_App{
 	}
 
 	/// This is private as well. It simply works, so don't ask for more details
-	private static function proceedNavigation( $list ){
-		foreach( $list as &$naventry ){
+	private static function proceedNavigation( $list ) {
+		foreach( $list as &$naventry ) {
 			$naventry['subnavigation'] = array();
 			if( $naventry['id'] == self::$activeapp ) {
 				$naventry['active'] = true;
@@ -331,7 +331,7 @@ class OC_App{
 			}
 		} unset( $naventry );
 
-		usort( $list, create_function( '$a, $b', 'if( $a["order"] == $b["order"] ){return 0;}elseif( $a["order"] < $b["order"] ){return -1;}else{return 1;}' ));
+		usort( $list, create_function( '$a, $b', 'if( $a["order"] == $b["order"] ) {return 0;}elseif( $a["order"] < $b["order"] ) {return -1;}else{return 1;}' ));
 
 		return $list;
 	}
@@ -388,7 +388,7 @@ class OC_App{
 	/**
 	 * get the last version of the app, either from appinfo/version or from appinfo/info.xml
 	 */
-	public static function getAppVersion($appid){
+	public static function getAppVersion($appid) {
 		$file= self::getAppPath($appid).'/appinfo/version';
 		$version=@file_get_contents($file);
 		if($version) {
@@ -405,7 +405,7 @@ class OC_App{
 	 * @param boolean path (optional)
 	 * @returns array
 	*/
-	public static function getAppInfo($appid,$path=false){
+	public static function getAppInfo($appid,$path=false) {
 		if($path) {
 			$file=$appid;
 		}else{
@@ -423,18 +423,18 @@ class OC_App{
 		$data['info']=array();
 		$data['remote']=array();
 		$data['public']=array();
-		foreach($xml->children() as $child){
+		foreach($xml->children() as $child) {
 			if($child->getName()=='remote') {
-				foreach($child->children() as $remote){
+				foreach($child->children() as $remote) {
 					$data['remote'][$remote->getName()]=(string)$remote;
 				}
 			}elseif($child->getName()=='public') {
-				foreach($child->children() as $public){
+				foreach($child->children() as $public) {
 					$data['public'][$public->getName()]=(string)$public;
 				}
 			}elseif($child->getName()=='types') {
 				$data['types']=array();
-				foreach($child->children() as $type){
+				foreach($child->children() as $type) {
 					$data['types'][]=$type->getName();
 				}
 			}elseif($child->getName()=='description') {
@@ -459,7 +459,7 @@ class OC_App{
 	 *   - children: array that is empty if the key 'active' is false or
 	 *     contains the subentries if the key 'active' is true
 	 */
-	public static function getNavigation(){
+	public static function getNavigation() {
 		$navigation = self::proceedNavigation( self::$navigation );
 		return $navigation;
 	}
@@ -468,7 +468,7 @@ class OC_App{
 	 * get the id of loaded app
 	 * @return string
 	 */
-	public static function getCurrentApp(){
+	public static function getCurrentApp() {
 		$script=substr($_SERVER["SCRIPT_NAME"], strlen(OC::$WEBROOT)+1);
 		$topFolder=substr($script, 0, strpos($script, '/'));
 		if($topFolder=='apps') {
@@ -483,9 +483,9 @@ class OC_App{
 	/**
 	 * get the forms for either settings, admin or personal
 	 */
-	public static function getForms($type){
+	public static function getForms($type) {
 		$forms=array();
-		switch($type){
+		switch($type) {
 			case 'settings':
 				$source=self::$settingsForms;
 				break;
@@ -496,7 +496,7 @@ class OC_App{
 				$source=self::$personalForms;
 				break;
 		}
-		foreach($source as $form){
+		foreach($source as $form) {
 			$forms[]=include $form;
 		}
 		return $forms;
@@ -505,32 +505,32 @@ class OC_App{
 	/**
 	 * register a settings form to be shown
 	 */
-	public static function registerSettings($app,$page){
+	public static function registerSettings($app,$page) {
 		self::$settingsForms[]= $app.'/'.$page.'.php';
 	}
 
 	/**
 	 * register an admin form to be shown
 	 */
-	public static function registerAdmin($app,$page){
+	public static function registerAdmin($app,$page) {
 		self::$adminForms[]= $app.'/'.$page.'.php';
 	}
 
 	/**
 	 * register a personal form to be shown
 	 */
-	public static function registerPersonal($app,$page){
+	public static function registerPersonal($app,$page) {
 		self::$personalForms[]= $app.'/'.$page.'.php';
 	}
 
 	/**
 	 * get a list of all apps in the apps folder
 	 */
-	public static function getAllApps(){
+	public static function getAllApps() {
 		$apps=array();
 		foreach(OC::$APPSROOTS as $apps_dir) {
 			$dh=opendir($apps_dir['path']);
-			while($file=readdir($dh)){
+			while($file=readdir($dh)) {
 				if($file[0]!='.' and is_file($apps_dir['path'].'/'.$file.'/appinfo/app.php')) {
 					$apps[]=$file;
 				}
@@ -565,7 +565,7 @@ class OC_App{
 	 * This is important if you upgrade ownCloud and have non ported 3rd
 	 * party apps installed.
 	 */
-	public static function checkAppsRequirements($apps = array()){
+	public static function checkAppsRequirements($apps = array()) {
 		if (empty($apps)) {
 			$apps = OC_App::getEnabledApps();
 		}
@@ -583,7 +583,7 @@ class OC_App{
 	/**
 	 * get the installed version of all apps
 	 */
-	public static function getAppVersions(){
+	public static function getAppVersions() {
 		static $versions;
 		if (isset($versions)) {   // simple cache, needs to be fixed
 			return $versions; // when function is used besides in checkUpgrade
@@ -591,7 +591,7 @@ class OC_App{
 		$versions=array();
 		$query = OC_DB::prepare( 'SELECT `appid`, `configvalue` FROM `*PREFIX*appconfig` WHERE `configkey` = \'installed_version\'' );
 		$result = $query->execute();
-		while($row = $result->fetchRow()){
+		while($row = $result->fetchRow()) {
 			$versions[$row['appid']]=$row['configvalue'];
 		}
 		return $versions;
@@ -601,7 +601,7 @@ class OC_App{
 	 * update the database for the app and call the update script
 	 * @param string appid
 	 */
-	public static function updateApp($appid){
+	public static function updateApp($appid) {
 		if(file_exists(self::getAppPath($appid).'/appinfo/database.xml')) {
 			OC_DB::updateDbFromStructure(self::getAppPath($appid).'/appinfo/database.xml');
 		}
@@ -615,10 +615,10 @@ class OC_App{
 
 		//set remote/public handelers
 		$appData=self::getAppInfo($appid);
-		foreach($appData['remote'] as $name=>$path){
+		foreach($appData['remote'] as $name=>$path) {
 			OCP\CONFIG::setAppValue('core', 'remote_'.$name, $appid.'/'.$path);
 		}
-		foreach($appData['public'] as $name=>$path){
+		foreach($appData['public'] as $name=>$path) {
 			OCP\CONFIG::setAppValue('core', 'public_'.$name, $appid.'/'.$path);
 		}
 
@@ -629,7 +629,7 @@ class OC_App{
 	 * @param string appid
 	 * @return OC_FilesystemView
 	 */
-	public static function getStorage($appid){
+	public static function getStorage($appid) {
 		if(OC_App::isEnabled($appid)) {//sanity check
 			if(OC_User::isLoggedIn()) {
 				$view = new OC_FilesystemView('/'.OC_User::getUser());
diff --git a/lib/appconfig.php b/lib/appconfig.php
index 0e608b540b..7f58b87850 100644
--- a/lib/appconfig.php
+++ b/lib/appconfig.php
@@ -45,13 +45,13 @@ class OC_Appconfig{
 	 * This function returns a list of all apps that have at least one
 	 * entry in the appconfig table.
 	 */
-	public static function getApps(){
+	public static function getApps() {
 		// No magic in here!
 		$query = OC_DB::prepare( 'SELECT DISTINCT `appid` FROM `*PREFIX*appconfig`' );
 		$result = $query->execute();
 
 		$apps = array();
-		while( $row = $result->fetchRow()){
+		while( $row = $result->fetchRow()) {
 			$apps[] = $row["appid"];
 		}
 
@@ -66,13 +66,13 @@ class OC_Appconfig{
 	 * This function gets all keys of an app. Please note that the values are
 	 * not returned.
 	 */
-	public static function getKeys( $app ){
+	public static function getKeys( $app ) {
 		// No magic in here as well
 		$query = OC_DB::prepare( 'SELECT `configkey` FROM `*PREFIX*appconfig` WHERE `appid` = ?' );
 		$result = $query->execute( array( $app ));
 
 		$keys = array();
-		while( $row = $result->fetchRow()){
+		while( $row = $result->fetchRow()) {
 			$keys[] = $row["configkey"];
 		}
 
@@ -89,12 +89,12 @@ class OC_Appconfig{
 	 * This function gets a value from the appconfig table. If the key does
 	 * not exist the default value will be returnes
 	 */
-	public static function getValue( $app, $key, $default = null ){
+	public static function getValue( $app, $key, $default = null ) {
 		// At least some magic in here :-)
 		$query = OC_DB::prepare( 'SELECT `configvalue` FROM `*PREFIX*appconfig` WHERE `appid` = ? AND `configkey` = ?' );
 		$result = $query->execute( array( $app, $key ));
 		$row = $result->fetchRow();
-		if($row){
+		if($row) {
 			return $row["configvalue"];
 		}else{
 			return $default;
@@ -107,7 +107,7 @@ class OC_Appconfig{
 	 * @param string $key
 	 * @return bool
 	 */
-	public static function hasKey($app,$key){
+	public static function hasKey($app,$key) {
 		$exists = self::getKeys( $app );
 		return in_array( $key, $exists );
 	}
@@ -121,9 +121,9 @@ class OC_Appconfig{
 	 *
 	 * Sets a value. If the key did not exist before it will be created.
 	 */
-	public static function setValue( $app, $key, $value ){
+	public static function setValue( $app, $key, $value ) {
 		// Does the key exist? yes: update. No: insert
-		if(! self::hasKey($app,$key)){
+		if(! self::hasKey($app,$key)) {
 			$query = OC_DB::prepare( 'INSERT INTO `*PREFIX*appconfig` ( `appid`, `configkey`, `configvalue` ) VALUES( ?, ?, ? )' );
 			$query->execute( array( $app, $key, $value ));
 		}
@@ -141,7 +141,7 @@ class OC_Appconfig{
 	 *
 	 * Deletes a key.
 	 */
-	public static function deleteKey( $app, $key ){
+	public static function deleteKey( $app, $key ) {
 		// Boring!
 		$query = OC_DB::prepare( 'DELETE FROM `*PREFIX*appconfig` WHERE `appid` = ? AND `configkey` = ?' );
 		$query->execute( array( $app, $key ));
@@ -156,7 +156,7 @@ class OC_Appconfig{
 	 *
 	 * Removes all keys in appconfig belonging to the app.
 	 */
-	public static function deleteApp( $app ){
+	public static function deleteApp( $app ) {
 		// Nothing special
 		$query = OC_DB::prepare( 'DELETE FROM `*PREFIX*appconfig` WHERE `appid` = ?' );
 		$query->execute( array( $app ));
@@ -170,14 +170,14 @@ class OC_Appconfig{
 	 * @param key
 	 * @return array
 	 */
-	public static function getValues($app,$key){
-		if($app!==false and $key!==false){
+	public static function getValues($app,$key) {
+		if($app!==false and $key!==false) {
 			return false;
 		}
 		$fields='`configvalue`';
 		$where='WHERE';
 		$params=array();
-		if($app!==false){
+		if($app!==false) {
 			$fields.=', `configkey`';
 			$where.=' `appid` = ?';
 			$params[]=$app;
@@ -192,7 +192,7 @@ class OC_Appconfig{
 		$query=OC_DB::prepare($queryString);
 		$result=$query->execute($params);
 		$values=array();
-		while($row=$result->fetchRow()){
+		while($row=$result->fetchRow()) {
 			$values[$row[$key]]=$row['configvalue'];
 		}
 		return $values;
diff --git a/lib/archive.php b/lib/archive.php
index 5ac4edbfd1..b4459c2b6c 100644
--- a/lib/archive.php
+++ b/lib/archive.php
@@ -12,15 +12,15 @@ abstract class OC_Archive{
 	 * @param string path
 	 * @return OC_Archive
 	 */
-	public static function open($path){
+	public static function open($path) {
 		$ext=substr($path,strrpos($path,'.'));
-		switch($ext){
+		switch($ext) {
 			case '.zip':
 				return new OC_Archive_ZIP($path);
 			case '.gz':
 			case '.bz':
 			case '.bz2':
-				if(strpos($path,'.tar.')){
+				if(strpos($path,'.tar.')) {
 					return new OC_Archive_TAR($path);
 				}
 				break;
@@ -118,14 +118,14 @@ abstract class OC_Archive{
 	 * @param string source
 	 * @return bool
 	 */
-	function addRecursive($path,$source){
-		if($dh=opendir($source)){
+	function addRecursive($path,$source) {
+		if($dh=opendir($source)) {
 			$this->addFolder($path);
-			while($file=readdir($dh)){
-				if($file=='.' or $file=='..'){
+			while($file=readdir($dh)) {
+				if($file=='.' or $file=='..') {
 					continue;
 				}
-				if(is_dir($source.'/'.$file)){
+				if(is_dir($source.'/'.$file)) {
 					$this->addRecursive($path.'/'.$file,$source.'/'.$file);
 				}else{
 					$this->addFile($path.'/'.$file,$source.'/'.$file);
diff --git a/lib/archive/tar.php b/lib/archive/tar.php
index 095362d0cd..ebd581fc16 100644
--- a/lib/archive/tar.php
+++ b/lib/archive/tar.php
@@ -21,7 +21,7 @@ class OC_Archive_TAR extends OC_Archive{
 	private $tar=null;
 	private $path;
 
-	function __construct($source){
+	function __construct($source) {
 		$types=array(null,'gz','bz');
 		$this->path=$source;
 		$this->tar=new Archive_Tar($source,$types[self::getTarType($source)]);
@@ -32,10 +32,10 @@ class OC_Archive_TAR extends OC_Archive{
 	 * @param string file
 	 * @return str
 	 */
-	static public function getTarType($file){
-		if(strpos($file,'.')){
+	static public function getTarType($file) {
+		if(strpos($file,'.')) {
 			$extension=substr($file,strrpos($file,'.'));
-			switch($extension){
+			switch($extension) {
 				case 'gz':
 				case 'tgz':
 					return self::GZIP;
@@ -55,19 +55,19 @@ class OC_Archive_TAR extends OC_Archive{
 	 * @param string path
 	 * @return bool
 	 */
-	function addFolder($path){
+	function addFolder($path) {
 		$tmpBase=OC_Helper::tmpFolder();
-		if(substr($path,-1,1)!='/'){
+		if(substr($path,-1,1)!='/') {
 			$path.='/';
 		}
-		if($this->fileExists($path)){
+		if($this->fileExists($path)) {
 			return false;
 		}
 		$parts=explode('/',$path);
 		$folder=$tmpBase;
-		foreach($parts as $part){
+		foreach($parts as $part) {
 			$folder.='/'.$part;
-			if(!is_dir($folder)){
+			if(!is_dir($folder)) {
 				mkdir($folder);
 			}
 		}
@@ -82,11 +82,11 @@ class OC_Archive_TAR extends OC_Archive{
 	 * @param string source either a local file or string data
 	 * @return bool
 	 */
-	function addFile($path,$source=''){
-		if($this->fileExists($path)){
+	function addFile($path,$source='') {
+		if($this->fileExists($path)) {
 			$this->remove($path);
 		}
-		if($source and $source[0]=='/' and file_exists($source)){
+		if($source and $source[0]=='/' and file_exists($source)) {
 			$header=array();
 			$dummy='';
 			$this->tar->_openAppend();
@@ -104,7 +104,7 @@ class OC_Archive_TAR extends OC_Archive{
 	 * @param string dest
 	 * @return bool
 	 */
-	function rename($source,$dest){
+	function rename($source,$dest) {
 		//no proper way to delete, rename entire archive, rename file and remake archive
 		$tmp=OCP\Files::tmpFolder();
 		$this->tar->extract($tmp);
@@ -118,10 +118,10 @@ class OC_Archive_TAR extends OC_Archive{
 		return true;
 	}
 
-	private function getHeader($file){
+	private function getHeader($file) {
 		$headers=$this->tar->listContent();
-		foreach($headers as $header){
-			if($file==$header['filename'] or $file.'/'==$header['filename'] or '/'.$file.'/'==$header['filename'] or '/'.$file==$header['filename']){
+		foreach($headers as $header) {
+			if($file==$header['filename'] or $file.'/'==$header['filename'] or '/'.$file.'/'==$header['filename'] or '/'.$file==$header['filename']) {
 				return $header;
 			}
 		}
@@ -133,7 +133,7 @@ class OC_Archive_TAR extends OC_Archive{
 	 * @param string path
 	 * @return int
 	 */
-	function filesize($path){
+	function filesize($path) {
 		$stat=$this->getHeader($path);
 		return $stat['size'];
 	}
@@ -142,7 +142,7 @@ class OC_Archive_TAR extends OC_Archive{
 	 * @param string path
 	 * @return int
 	 */
-	function mtime($path){
+	function mtime($path) {
 		$stat=$this->getHeader($path);
 		return $stat['mtime'];
 	}
@@ -152,20 +152,20 @@ class OC_Archive_TAR extends OC_Archive{
 	 * @param path
 	 * @return array
 	 */
-	function getFolder($path){
+	function getFolder($path) {
 		$files=$this->getFiles();
 		$folderContent=array();
 		$pathLength=strlen($path);
-		foreach($files as $file){
-			if($file[0]=='/'){
+		foreach($files as $file) {
+			if($file[0]=='/') {
 				$file=substr($file,1);
 			}
-			if(substr($file,0,$pathLength)==$path and $file!=$path){
+			if(substr($file,0,$pathLength)==$path and $file!=$path) {
 				$result=substr($file,$pathLength);
-				if($pos=strpos($result,'/')){
+				if($pos=strpos($result,'/')) {
 					$result=substr($result,0,$pos+1);
 				}
-				if(array_search($result,$folderContent)===false){
+				if(array_search($result,$folderContent)===false) {
 					$folderContent[]=$result;
 				}
 			}
@@ -176,13 +176,13 @@ class OC_Archive_TAR extends OC_Archive{
 	 *get all files in the archive
 	 * @return array
 	 */
-	function getFiles(){
-		if($this->fileList){
+	function getFiles() {
+		if($this->fileList) {
 			return $this->fileList;
 		}
 		$headers=$this->tar->listContent();
 		$files=array();
-		foreach($headers as $header){
+		foreach($headers as $header) {
 			$files[]=$header['filename'];
 		}
 		$this->fileList=$files;
@@ -193,7 +193,7 @@ class OC_Archive_TAR extends OC_Archive{
 	 * @param string path
 	 * @return string
 	 */
-	function getFile($path){
+	function getFile($path) {
 		return $this->tar->extractInString($path);
 	}
 	/**
@@ -202,17 +202,17 @@ class OC_Archive_TAR extends OC_Archive{
 	 * @param string dest
 	 * @return bool
 	 */
-	function extractFile($path,$dest){
+	function extractFile($path,$dest) {
 		$tmp=OCP\Files::tmpFolder();
-		if(!$this->fileExists($path)){
+		if(!$this->fileExists($path)) {
 			return false;
 		}
-		if($this->fileExists('/'.$path)){
+		if($this->fileExists('/'.$path)) {
 			$success=$this->tar->extractList(array('/'.$path),$tmp);
 		}else{
 			$success=$this->tar->extractList(array($path),$tmp);
 		}
-		if($success){
+		if($success) {
 			rename($tmp.$path,$dest);
 		}
 		OCP\Files::rmdirr($tmp);
@@ -224,7 +224,7 @@ class OC_Archive_TAR extends OC_Archive{
 	 * @param string dest
 	 * @return bool
 	 */
-	function extract($dest){
+	function extract($dest) {
 		return $this->tar->extract($dest);
 	}
 	/**
@@ -232,23 +232,23 @@ class OC_Archive_TAR extends OC_Archive{
 	 * @param string path
 	 * @return bool
 	 */
-	function fileExists($path){
+	function fileExists($path) {
 		$files=$this->getFiles();
-		if((array_search($path,$files)!==false) or (array_search($path.'/',$files)!==false)){
+		if((array_search($path,$files)!==false) or (array_search($path.'/',$files)!==false)) {
 			return true;
 		}else{
 			$folderPath=$path;
-			if(substr($folderPath,-1,1)!='/'){
+			if(substr($folderPath,-1,1)!='/') {
 				$folderPath.='/';
 			}
 			$pathLength=strlen($folderPath);
-			foreach($files as $file){
-				if(strlen($file)>$pathLength and substr($file,0,$pathLength)==$folderPath){
+			foreach($files as $file) {
+				if(strlen($file)>$pathLength and substr($file,0,$pathLength)==$folderPath) {
 					return true;
 				}
 			}
 		}
-		if($path[0]!='/'){//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;
@@ -260,8 +260,8 @@ class OC_Archive_TAR extends OC_Archive{
 	 * @param string path
 	 * @return bool
 	 */
-	function remove($path){
-		if(!$this->fileExists($path)){
+	function remove($path) {
+		if(!$this->fileExists($path)) {
 			return false;
 		}
 		$this->fileList=false;
@@ -281,19 +281,19 @@ class OC_Archive_TAR extends OC_Archive{
 	 * @param string mode
 	 * @return resource
 	 */
-	function getStream($path,$mode){
-		if(strrpos($path,'.')!==false){
+	function getStream($path,$mode) {
+		if(strrpos($path,'.')!==false) {
 			$ext=substr($path,strrpos($path,'.'));
 		}else{
 			$ext='';
 		}
 		$tmpFile=OCP\Files::tmpFile($ext);
-		if($this->fileExists($path)){
+		if($this->fileExists($path)) {
 			$this->extractFile($path,$tmpFile);
-		}elseif($mode=='r' or $mode=='rb'){
+		}elseif($mode=='r' or $mode=='rb') {
 			return false;
 		}
-		if($mode=='r' or $mode=='rb'){
+		if($mode=='r' or $mode=='rb') {
 			return fopen($tmpFile,$mode);
 		}else{
 			OC_CloseStreamWrapper::$callBacks[$tmpFile]=array($this,'writeBack');
@@ -306,8 +306,8 @@ class OC_Archive_TAR extends OC_Archive{
 	/**
 	 * write back temporary files
 	 */
-	function writeBack($tmpFile){
-		if(isset(self::$tempFiles[$tmpFile])){
+	function writeBack($tmpFile) {
+		if(isset(self::$tempFiles[$tmpFile])) {
 			$this->addFile(self::$tempFiles[$tmpFile],$tmpFile);
 			unlink($tmpFile);
 		}
@@ -316,8 +316,8 @@ class OC_Archive_TAR extends OC_Archive{
 	/**
 	 * reopen the archive to ensure everything is written
 	 */
-	private function reopen(){
-		if($this->tar){
+	private function reopen() {
+		if($this->tar) {
 			$this->tar->_close();
 			$this->tar=null;
 		}
diff --git a/lib/archive/zip.php b/lib/archive/zip.php
index 396b1f6c05..45992ee3d8 100644
--- a/lib/archive/zip.php
+++ b/lib/archive/zip.php
@@ -13,10 +13,10 @@ class OC_Archive_ZIP extends OC_Archive{
 	private $zip=null;
 	private $path;
 
-	function __construct($source){
+	function __construct($source) {
 		$this->path=$source;
 		$this->zip=new ZipArchive();
-		if($this->zip->open($source,ZipArchive::CREATE)){
+		if($this->zip->open($source,ZipArchive::CREATE)) {
 		}else{
 			OCP\Util::writeLog('files_archive','Error while opening archive '.$source,OCP\Util::WARN);
 		}
@@ -26,7 +26,7 @@ class OC_Archive_ZIP extends OC_Archive{
 	 * @param string path
 	 * @return bool
 	 */
-	function addFolder($path){
+	function addFolder($path) {
 		return $this->zip->addEmptyDir($path);
 	}
 	/**
@@ -35,13 +35,13 @@ class OC_Archive_ZIP extends OC_Archive{
 	 * @param string source either a local file or string data
 	 * @return bool
 	 */
-	function addFile($path,$source=''){
-		if($source and $source[0]=='/' and file_exists($source)){
+	function addFile($path,$source='') {
+		if($source and $source[0]=='/' and file_exists($source)) {
 			$result=$this->zip->addFile($source,$path);
 		}else{
 			$result=$this->zip->addFromString($path,$source);
 		}
-		if($result){
+		if($result) {
 			$this->zip->close();//close and reopen to save the zip
 			$this->zip->open($this->path);
 		}
@@ -53,7 +53,7 @@ class OC_Archive_ZIP extends OC_Archive{
 	 * @param string dest
 	 * @return bool
 	 */
-	function rename($source,$dest){
+	function rename($source,$dest) {
 		$source=$this->stripPath($source);
 		$dest=$this->stripPath($dest);
 		$this->zip->renameName($source,$dest);
@@ -63,7 +63,7 @@ class OC_Archive_ZIP extends OC_Archive{
 	 * @param string path
 	 * @return int
 	 */
-	function filesize($path){
+	function filesize($path) {
 		$stat=$this->zip->statName($path);
 		return $stat['size'];
 	}
@@ -72,7 +72,7 @@ class OC_Archive_ZIP extends OC_Archive{
 	 * @param string path
 	 * @return int
 	 */
-	function mtime($path){
+	function mtime($path) {
 		return filemtime($this->path);
 	}
 	/**
@@ -80,13 +80,13 @@ class OC_Archive_ZIP extends OC_Archive{
 	 * @param path
 	 * @return array
 	 */
-	function getFolder($path){
+	function getFolder($path) {
 		$files=$this->getFiles();
 		$folderContent=array();
 		$pathLength=strlen($path);
-		foreach($files as $file){
-			if(substr($file,0,$pathLength)==$path and $file!=$path){
-				if(strrpos(substr($file,0,-1),'/')<=$pathLength){
+		foreach($files as $file) {
+			if(substr($file,0,$pathLength)==$path and $file!=$path) {
+				if(strrpos(substr($file,0,-1),'/')<=$pathLength) {
 					$folderContent[]=substr($file,$pathLength);
 				}
 			}
@@ -97,10 +97,10 @@ class OC_Archive_ZIP extends OC_Archive{
 	 *get all files in the archive
 	 * @return array
 	 */
-	function getFiles(){
+	function getFiles() {
 		$fileCount=$this->zip->numFiles;
 		$files=array();
-		for($i=0;$i<$fileCount;$i++){
+		for($i=0;$i<$fileCount;$i++) {
 			$files[]=$this->zip->getNameIndex($i);
 		}
 		return $files;
@@ -110,7 +110,7 @@ class OC_Archive_ZIP extends OC_Archive{
 	 * @param string path
 	 * @return string
 	 */
-	function getFile($path){
+	function getFile($path) {
 		return $this->zip->getFromName($path);
 	}
 	/**
@@ -119,7 +119,7 @@ class OC_Archive_ZIP extends OC_Archive{
 	 * @param string dest
 	 * @return bool
 	 */
-	function extractFile($path,$dest){
+	function extractFile($path,$dest) {
 		$fp = $this->zip->getStream($path);
 		file_put_contents($dest,$fp);
 	}
@@ -129,7 +129,7 @@ class OC_Archive_ZIP extends OC_Archive{
 	 * @param string dest
 	 * @return bool
 	 */
-	function extract($dest){
+	function extract($dest) {
 		return $this->zip->extractTo($dest);
 	}
 	/**
@@ -137,7 +137,7 @@ class OC_Archive_ZIP extends OC_Archive{
 	 * @param string path
 	 * @return bool
 	 */
-	function fileExists($path){
+	function fileExists($path) {
 		return ($this->zip->locateName($path)!==false) or ($this->zip->locateName($path.'/')!==false);
 	}
 	/**
@@ -145,8 +145,8 @@ class OC_Archive_ZIP extends OC_Archive{
 	 * @param string path
 	 * @return bool
 	 */
-	function remove($path){
-		if($this->fileExists($path.'/')){
+	function remove($path) {
+		if($this->fileExists($path.'/')) {
 			return $this->zip->deleteName($path.'/');
 		}else{
 			return $this->zip->deleteName($path);
@@ -158,18 +158,18 @@ class OC_Archive_ZIP extends OC_Archive{
 	 * @param string mode
 	 * @return resource
 	 */
-	function getStream($path,$mode){
-		if($mode=='r' or $mode=='rb'){
+	function getStream($path,$mode) {
+		if($mode=='r' or $mode=='rb') {
 			return $this->zip->getStream($path);
 		}else{//since we cant directly get a writable stream, make a temp copy of the file and put it back in the archive when the stream is closed
-			if(strrpos($path,'.')!==false){
+			if(strrpos($path,'.')!==false) {
 				$ext=substr($path,strrpos($path,'.'));
 			}else{
 				$ext='';
 			}
 			$tmpFile=OCP\Files::tmpFile($ext);
 			OC_CloseStreamWrapper::$callBacks[$tmpFile]=array($this,'writeBack');
-			if($this->fileExists($path)){
+			if($this->fileExists($path)) {
 				$this->extractFile($path,$tmpFile);
 			}
 			self::$tempFiles[$tmpFile]=$path;
@@ -181,15 +181,15 @@ class OC_Archive_ZIP extends OC_Archive{
 	/**
 	 * write back temporary files
 	 */
-	function writeBack($tmpFile){
-		if(isset(self::$tempFiles[$tmpFile])){
+	function writeBack($tmpFile) {
+		if(isset(self::$tempFiles[$tmpFile])) {
 			$this->addFile(self::$tempFiles[$tmpFile],$tmpFile);
 			unlink($tmpFile);
 		}
 	}
 
-	private function stripPath($path){
-		if(!$path || $path[0]=='/'){
+	private function stripPath($path) {
+		if(!$path || $path[0]=='/') {
 			return substr($path,1);
 		}else{
 			return $path;
diff --git a/lib/backgroundjob/queuedtask.php b/lib/backgroundjob/queuedtask.php
index a7ec3efbf3..8264e1a0ae 100644
--- a/lib/backgroundjob/queuedtask.php
+++ b/lib/backgroundjob/queuedtask.php
@@ -29,7 +29,7 @@ class OC_BackgroundJob_QueuedTask{
 	 * @param $id ID of the task
 	 * @return associative array
 	 */
-	public static function find( $id ){
+	public static function find( $id ) {
 		$stmt = OC_DB::prepare( 'SELECT * FROM `*PREFIX*queuedtasks` WHERE `id` = ?' );
 		$result = $stmt->execute(array($id));
 		return $result->fetchRow();
@@ -39,14 +39,14 @@ class OC_BackgroundJob_QueuedTask{
 	 * @brief Gets all queued tasks
 	 * @return array with associative arrays
 	 */
-	public static function all(){
+	public static function all() {
 		// Array for objects
 		$return = array();
 
 		// Get Data
 		$stmt = OC_DB::prepare( 'SELECT * FROM `*PREFIX*queuedtasks`' );
 		$result = $stmt->execute(array());
-		while( $row = $result->fetchRow()){
+		while( $row = $result->fetchRow()) {
 			$return[] = $row;
 		}
 
@@ -58,14 +58,14 @@ class OC_BackgroundJob_QueuedTask{
 	 * @param $app app name
 	 * @return array with associative arrays
 	 */
-	public static function whereAppIs( $app ){
+	public static function whereAppIs( $app ) {
 		// Array for objects
 		$return = array();
 
 		// Get Data
 		$stmt = OC_DB::prepare( 'SELECT * FROM `*PREFIX*queuedtasks` WHERE `app` = ?' );
 		$result = $stmt->execute(array($app));
-		while( $row = $result->fetchRow()){
+		while( $row = $result->fetchRow()) {
 			$return[] = $row;
 		}
 
@@ -81,7 +81,7 @@ class OC_BackgroundJob_QueuedTask{
 	 * @param $parameters all useful data as text
 	 * @return id of task
 	 */
-	public static function add( $app, $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 ));
 
@@ -95,7 +95,7 @@ class OC_BackgroundJob_QueuedTask{
 	 *
 	 * Deletes a report
 	 */
-	public static function delete( $id ){
+	public static function delete( $id ) {
 		$stmt = OC_DB::prepare( 'DELETE FROM `*PREFIX*queuedtasks` WHERE `id` = ?' );
 		$result = $stmt->execute(array($id));
 
diff --git a/lib/backgroundjob/regulartask.php b/lib/backgroundjob/regulartask.php
index 53bd4eb5e9..9976872ee1 100644
--- a/lib/backgroundjob/regulartask.php
+++ b/lib/backgroundjob/regulartask.php
@@ -32,7 +32,7 @@ class OC_BackgroundJob_RegularTask{
 	 * @param $method method name
 	 * @return true
 	 */
-	static public function register( $klass, $method ){
+	static public function register( $klass, $method ) {
 		// Create the data structure
 		self::$registered["$klass-$method"] = array( $klass, $method );
 
@@ -46,7 +46,7 @@ class OC_BackgroundJob_RegularTask{
 	 *
 	 * key is string "$klass-$method", value is array( $klass, $method )
 	 */
-	static public function all(){
+	static public function all() {
 		return self::$registered;
 	}
 }
diff --git a/lib/backgroundjob/worker.php b/lib/backgroundjob/worker.php
index 8684e0df11..e966ac9647 100644
--- a/lib/backgroundjob/worker.php
+++ b/lib/backgroundjob/worker.php
@@ -34,14 +34,14 @@ class OC_BackgroundJob_Worker{
 	 * This method should be called by cli scripts that do not let the user
 	 * wait.
 	 */
-	public static function doAllSteps(){
+	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 ){
-			if( strcmp( $key, $lasttask ) > 0 ){
+		foreach( $regular_tasks as $key => $value ) {
+			if( strcmp( $key, $lasttask ) > 0 ) {
 				// Set "restart here" config value
 				OC_Appconfig::setValue( 'core', 'backgroundjobs_task', $key );
 				call_user_func( $value );
@@ -52,7 +52,7 @@ class OC_BackgroundJob_Worker{
 
 		// Do our queued tasks
 		$queued_tasks = OC_BackgroundJob_QueuedTask::all();
-		foreach( $queued_tasks as $task ){
+		foreach( $queued_tasks as $task ) {
 			OC_BackgroundJob_QueuedTask::delete( $task['id'] );
 			call_user_func( array( $task['klass'], $task['method'] ), $task['parameters'] );
 		}
@@ -68,10 +68,10 @@ class OC_BackgroundJob_Worker{
 	 * with the next step. This method should be used by webcron and ajax
 	 * services.
 	 */
-	public static function doNextStep(){
+	public static function doNextStep() {
 		$laststep = OC_Appconfig::getValue( 'core', 'backgroundjobs_step', 'regular_tasks' );
 
-		if( $laststep == 'regular_tasks' ){
+		if( $laststep == 'regular_tasks' ) {
 			// get last app
 			$lasttask = OC_Appconfig::getValue( 'core', 'backgroundjobs_task', '' );
 
@@ -81,8 +81,8 @@ class OC_BackgroundJob_Worker{
 			$done = false;
 
 			// search for next background job
-			foreach( $regular_tasks as $key => $value ){
-				if( strcmp( $key, $lasttask ) > 0 ){
+			foreach( $regular_tasks as $key => $value ) {
+				if( strcmp( $key, $lasttask ) > 0 ) {
 					OC_Appconfig::setValue( 'core', 'backgroundjobs_task', $key );
 					$done = true;
 					call_user_func( $value );
@@ -90,14 +90,14 @@ class OC_BackgroundJob_Worker{
 				}
 			}
 
-			if( $done == false ){
+			if( $done == false ) {
 				// Next time load queued tasks
 				OC_Appconfig::setValue( 'core', 'backgroundjobs_step', 'queued_tasks' );
 			}
 		}
 		else{
 			$tasks = OC_BackgroundJob_QueuedTask::all();
-			if( count( $tasks )){
+			if( count( $tasks )) {
 				$task = $tasks[0];
 				// delete job before we execute it. This prevents endless loops
 				// of failing jobs.
diff --git a/lib/base.php b/lib/base.php
index a145fd1cf2..1c6cc70b0e 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -70,7 +70,7 @@ class OC{
 	/**
 	 * SPL autoload
 	 */
-	public static function autoload($className){
+	public static function autoload($className) {
 		if(array_key_exists($className, OC::$CLASSPATH)) {
 			/** @TODO: Remove this when necessary
 			 Remove "apps/" from inclusion path for smooth migration to mutli app dir
@@ -102,7 +102,7 @@ class OC{
 		return false;
 	}
 
-	public static function initPaths(){
+	public static function initPaths() {
 		// calculate the root directories
 		OC::$SERVERROOT=str_replace("\\", '/', substr(__FILE__, 0, -13));
 		OC::$SUBURI= str_replace("\\", "/", substr(realpath($_SERVER["SCRIPT_FILENAME"]), strlen(OC::$SERVERROOT)));
@@ -260,7 +260,7 @@ class OC{
 		session_start();
 	}
 
-	public static function init(){
+	public static function init() {
 		// register autoloader
 		spl_autoload_register(array('OC','autoload'));
 		setlocale(LC_ALL, 'en_US.UTF-8');
@@ -556,7 +556,7 @@ class OC{
 
 	protected static function tryBasicAuthLogin() {
 		if (!isset($_SERVER["PHP_AUTH_USER"])
-		 || !isset($_SERVER["PHP_AUTH_PW"])){
+		 || !isset($_SERVER["PHP_AUTH_PW"])) {
 			return false;
 		}
 		OC_App::loadApps(array('authentication'));
diff --git a/lib/cache/apc.php b/lib/cache/apc.php
index c192fe2f19..6dda0a0ff8 100644
--- a/lib/cache/apc.php
+++ b/lib/cache/apc.php
@@ -43,7 +43,7 @@ class OC_Cache_APC {
 		return apc_delete($this->getNamespace().$key);
 	}
 
-	public function clear($prefix=''){
+	public function clear($prefix='') {
 		$ns = $this->getNamespace().$prefix;
 		$cache = apc_cache_info('user');
 		foreach($cache['cache_list'] as $entry) {
diff --git a/lib/cache/broker.php b/lib/cache/broker.php
index c2aceabaf5..a161dbfa3b 100644
--- a/lib/cache/broker.php
+++ b/lib/cache/broker.php
@@ -46,7 +46,7 @@ class OC_Cache_Broker {
 		return $this->slow_cache->remove($key);
 	}
 
-	public function clear($prefix=''){
+	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 b9073dee09..a4f83f76c9 100644
--- a/lib/cache/file.php
+++ b/lib/cache/file.php
@@ -13,7 +13,7 @@ class OC_Cache_File{
 		if (isset($this->storage)) {
 			return $this->storage;
 		}
-		if(OC_User::isLoggedIn()){
+		if(OC_User::isLoggedIn()) {
 			$subdir = 'cache';
 			$view = new OC_FilesystemView('/'.OC_User::getUser());
 			if(!$view->file_exists($subdir)) {
@@ -61,18 +61,18 @@ class OC_Cache_File{
 
 	public function remove($key) {
 		$storage = $this->getStorage();
-		if(!$storage){
+		if(!$storage) {
 			return false;
 		}
 		return $storage->unlink($key);
 	}
 
-	public function clear($prefix=''){
+	public function clear($prefix='') {
 		$storage = $this->getStorage();
-		if($storage and $storage->is_dir('/')){
+		if($storage and $storage->is_dir('/')) {
 			$dh=$storage->opendir('/');
-			while($file=readdir($dh)){
-				if($file!='.' and $file!='..' and ($prefix==='' || strpos($file, $prefix) === 0)){
+			while($file=readdir($dh)) {
+				if($file!='.' and $file!='..' and ($prefix==='' || strpos($file, $prefix) === 0)) {
 					$storage->unlink('/'.$file);
 				}
 			}
diff --git a/lib/cache/fileglobal.php b/lib/cache/fileglobal.php
index e551ad472a..6d01964e18 100644
--- a/lib/cache/fileglobal.php
+++ b/lib/cache/fileglobal.php
@@ -57,20 +57,20 @@ class OC_Cache_FileGlobal{
 
 	public function remove($key) {
 		$cache_dir = self::getCacheDir();
-		if(!$cache_dir){
+		if(!$cache_dir) {
 			return false;
 		}
 		$key = $this->fixKey($key);
 		return unlink($cache_dir.$key);
 	}
 
-	public function clear($prefix=''){
+	public function clear($prefix='') {
 		$cache_dir = self::getCacheDir();
 		$prefix = $this->fixKey($prefix);
-		if($cache_dir and is_dir($cache_dir)){
+		if($cache_dir and is_dir($cache_dir)) {
 			$dh=opendir($cache_dir);
-			while($file=readdir($dh)){
-				if($file!='.' and $file!='..' and ($prefix==='' || strpos($file, $prefix) === 0)){
+			while($file=readdir($dh)) {
+				if($file!='.' and $file!='..' and ($prefix==='' || strpos($file, $prefix) === 0)) {
 					unlink($cache_dir.$file);
 				}
 			}
diff --git a/lib/cache/xcache.php b/lib/cache/xcache.php
index 951f9b4754..0739e4a2fa 100644
--- a/lib/cache/xcache.php
+++ b/lib/cache/xcache.php
@@ -28,7 +28,7 @@ class OC_Cache_XCache {
 	}
 
 	public function set($key, $value, $ttl=0) {
-		if($ttl>0){
+		if($ttl>0) {
 			return xcache_set($this->getNamespace().$key,$value,$ttl);
 		}else{
 			return xcache_set($this->getNamespace().$key,$value);
@@ -43,7 +43,7 @@ class OC_Cache_XCache {
 		return xcache_unset($this->getNamespace().$key);
 	}
 
-	public function clear($prefix=''){
+	public function clear($prefix='') {
 		xcache_unset_by_prefix($this->getNamespace().$prefix);
 		return true;
 	}
diff --git a/lib/config.php b/lib/config.php
index 390469beac..032d401264 100644
--- a/lib/config.php
+++ b/lib/config.php
@@ -52,7 +52,7 @@ class OC_Config{
 	 * This function returns all keys saved in config.php. Please note that it
 	 * does not return the values.
 	 */
-	public static function getKeys(){
+	public static function getKeys() {
 		self::readData();
 
 		return array_keys( self::$cache );
@@ -67,7 +67,7 @@ class OC_Config{
 	 * This function gets the value from config.php. If it does not exist,
 	 * $default will be returned.
 	 */
-	public static function getValue( $key, $default = null ){
+	public static function getValue( $key, $default = null ) {
 		self::readData();
 
 		if( array_key_exists( $key, self::$cache )) {
@@ -86,7 +86,7 @@ class OC_Config{
 	 * This function sets the value and writes the config.php. If the file can
 	 * not be written, false will be returned.
 	 */
-	public static function setValue( $key, $value ){
+	public static function setValue( $key, $value ) {
 		self::readData();
 
 		// Add change
@@ -105,7 +105,7 @@ class OC_Config{
 	 * This function removes a key from the config.php. If owncloud has no
 	 * write access to config.php, the function will return false.
 	 */
-	public static function deleteKey( $key ){
+	public static function deleteKey( $key ) {
 		self::readData();
 
 		if( array_key_exists( $key, self::$cache )) {
@@ -125,7 +125,7 @@ class OC_Config{
 	 *
 	 * Reads the config file and saves it to the cache
 	 */
-	private static function readData(){
+	private static function readData() {
 		if( self::$init ) {
 			return true;
 		}
@@ -153,7 +153,7 @@ class OC_Config{
 	 * Saves the config to the config file.
 	 *
 	 */
-	public static function writeData(){
+	public static function writeData() {
 		// Create a php file ...
 		$content = "<?php\n\$CONFIG = ";
 		$content .= var_export(self::$cache, true);
diff --git a/lib/connector/sabre/auth.php b/lib/connector/sabre/auth.php
index 8197571e94..34fc5fee50 100644
--- a/lib/connector/sabre/auth.php
+++ b/lib/connector/sabre/auth.php
@@ -30,13 +30,13 @@ class OC_Connector_Sabre_Auth extends Sabre_DAV_Auth_Backend_AbstractBasic {
 	 *
 	 * @return bool
 	 */
-	protected function validateUserPass($username, $password){
+	protected function validateUserPass($username, $password) {
 		if (OC_User::isLoggedIn()) {
 			OC_Util::setupFS($username);
 			return true;
 		} else {
 			OC_Util::setUpFS();//login hooks may need early access to the filesystem
-			if(OC_User::login($username,$password)){
+			if(OC_User::login($username,$password)) {
 				OC_Util::setUpFS($username);
 				return true;
 			}
diff --git a/lib/connector/sabre/directory.php b/lib/connector/sabre/directory.php
index a750244615..8fff77ac74 100644
--- a/lib/connector/sabre/directory.php
+++ b/lib/connector/sabre/directory.php
@@ -119,7 +119,7 @@ class OC_Connector_Sabre_Directory extends OC_Connector_Sabre_Node implements Sa
 			$paths[] = $this->path.'/'.$info['name'];
 		}
 		$properties = array_fill_keys($paths, array());
-		if(count($paths)>0){
+		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
diff --git a/lib/connector/sabre/locks.php b/lib/connector/sabre/locks.php
index a01653d960..dbcc57558e 100644
--- a/lib/connector/sabre/locks.php
+++ b/lib/connector/sabre/locks.php
@@ -77,7 +77,7 @@ class OC_Connector_Sabre_Locks extends Sabre_DAV_Locks_Backend_Abstract {
 		$result = $stmt->execute( $params );
 
 		$lockList = array();
-		while( $row = $result->fetchRow()){
+		while( $row = $result->fetchRow()) {
 
 			$lockInfo = new Sabre_DAV_Locks_LockInfo();
 			$lockInfo->owner = $row['owner'];
diff --git a/lib/connector/sabre/node.php b/lib/connector/sabre/node.php
index afcabe7bef..2916575e2d 100644
--- a/lib/connector/sabre/node.php
+++ b/lib/connector/sabre/node.php
@@ -145,7 +145,7 @@ abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IPr
 			$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 )){
+				if(array_key_exists( $propertyName, $existing )) {
 					$query = OC_DB::prepare( 'DELETE FROM `*PREFIX*properties` WHERE `userid` = ? AND `propertypath` = ? AND `propertyname` = ?' );
 					$query->execute( array( OC_User::getUser(), $this->path, $propertyName ));
 				}
@@ -154,7 +154,7 @@ abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IPr
 				if( strcmp( $propertyName, "lastmodified") === 0) {
 					$this->touch($propertyValue);
 				} else {
-					if(!array_key_exists( $propertyName, $existing )){
+					if(!array_key_exists( $propertyName, $existing )) {
 						$query = OC_DB::prepare( 'INSERT INTO `*PREFIX*properties` (`userid`,`propertypath`,`propertyname`,`propertyvalue`) VALUES(?,?,?,?)' );
 						$query->execute( array( OC_User::getUser(), $this->path, $propertyName,$propertyValue ));
 					} else {
@@ -186,13 +186,13 @@ abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IPr
 			$result = $query->execute( array( OC_User::getUser(), $this->path ));
 
 			$this->property_cache = array();
-			while( $row = $result->fetchRow()){
+			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){
+		if(count($properties) == 0) {
 			return $this->property_cache;
 		}
 
diff --git a/lib/connector/sabre/principal.php b/lib/connector/sabre/principal.php
index d1456f7c64..cfc72eda9f 100644
--- a/lib/connector/sabre/principal.php
+++ b/lib/connector/sabre/principal.php
@@ -115,6 +115,6 @@ class OC_Connector_Sabre_Principal implements Sabre_DAVACL_IPrincipalBackend {
 	public function setGroupMemberSet($principal, array $members) {
 		throw new Sabre_DAV_Exception('Setting members of the group is not supported yet');
 	}
-	function updatePrincipal($path, $mutations){return 0;}
-	function searchPrincipals($prefixPath, array $searchProperties){return 0;}
+	function updatePrincipal($path, $mutations) {return 0;}
+	function searchPrincipals($prefixPath, array $searchProperties) {return 0;}
 }
diff --git a/lib/db.php b/lib/db.php
index bd3afe2b06..ee69e5f829 100644
--- a/lib/db.php
+++ b/lib/db.php
@@ -41,7 +41,7 @@ class OC_DB {
 	 * check which backend we should use
 	 * @return BACKEND_MDB2 or BACKEND_PDO
 	 */
-	private static function getDBBackend(){
+	private static function getDBBackend() {
 		//check if we can use PDO, else use MDB2 (installation always needs to be done my mdb2)
 		if(class_exists('PDO') && OC_Config::getValue('installed', false)) {
 			$type = OC_Config::getValue( "dbtype", "sqlite" );
@@ -63,7 +63,7 @@ class OC_DB {
 	 *
 	 * Connects to the database as specified in config.php
 	 */
-	public static function connect($backend=null){
+	public static function connect($backend=null) {
 		if(self::$connection) {
 			return;
 		}
@@ -84,7 +84,7 @@ class OC_DB {
 	/**
 	 * connect to the database using pdo
 	 */
-	public static function connectPDO(){
+	public static function connectPDO() {
 		if(self::$connection) {
 			if(self::$backend==self::BACKEND_MDB2) {
 				self::disconnect();
@@ -149,7 +149,7 @@ class OC_DB {
 			}
 			try{
 				self::$PDO=new PDO($dsn, $user, $pass, $opts);
-			}catch(PDOException $e){
+			}catch(PDOException $e) {
 				echo( '<b>can not connect to database, using '.$type.'. ('.$e->getMessage().')</center>');
 				die();
 			}
@@ -194,7 +194,7 @@ class OC_DB {
 			  'quote_identifier' => true  );
 
 			// Add the dsn according to the database type
-			switch($type){
+			switch($type) {
 				case 'sqlite':
 				case 'sqlite3':
 					$dsn = array(
@@ -262,7 +262,7 @@ class OC_DB {
 	 *
 	 * SQL query via MDB2 prepare(), needs to be execute()'d!
 	 */
-	static public function prepare( $query , $limit=null, $offset=null ){
+	static public function prepare( $query , $limit=null, $offset=null ) {
 
 		if (!is_null($limit) && $limit != -1) {
 			if (self::$backend == self::BACKEND_MDB2) {
@@ -305,7 +305,7 @@ class OC_DB {
 		}else{
 			try{
 				$result=self::$connection->prepare($query);
-			}catch(PDOException $e){
+			}catch(PDOException $e) {
 				$entry = 'DB Error: "'.$e->getMessage().'"<br />';
 				$entry .= 'Offending command was: '.$query.'<br />';
 				OC_Log::write('core', $entry,OC_Log::FATAL);
@@ -327,7 +327,7 @@ class OC_DB {
 	 * Call this method right after the insert command or other functions may
 	 * cause trouble!
 	 */
-	public static function insertid($table=null){
+	public static function insertid($table=null) {
 		self::connect();
 		if($table !== null) {
 			$prefix = OC_Config::getValue( "dbtableprefix", "oc_" );
@@ -343,7 +343,7 @@ class OC_DB {
 	 *
 	 * This is good bye, good bye, yeah!
 	 */
-	public static function disconnect(){
+	public static function disconnect() {
 		// Cut connection if required
 		if(self::$connection) {
 			if(self::$backend==self::BACKEND_MDB2) {
@@ -364,7 +364,7 @@ class OC_DB {
 	 *
 	 * TODO: write more documentation
 	 */
-	public static function getDbStructure( $file ,$mode=MDB2_SCHEMA_DUMP_STRUCTURE){
+	public static function getDbStructure( $file ,$mode=MDB2_SCHEMA_DUMP_STRUCTURE) {
 		self::connectScheme();
 
 		// write the scheme
@@ -386,7 +386,7 @@ class OC_DB {
 	 *
 	 * TODO: write more documentation
 	 */
-	public static function createDbFromStructure( $file ){
+	public static function createDbFromStructure( $file ) {
 		$CONFIG_DBNAME  = OC_Config::getValue( "dbname", "owncloud" );
 		$CONFIG_DBTABLEPREFIX = OC_Config::getValue( "dbtableprefix", "oc_" );
 		$CONFIG_DBTYPE = OC_Config::getValue( "dbtype", "sqlite" );
@@ -445,7 +445,7 @@ class OC_DB {
 	 * @brief update the database scheme
 	 * @param $file file to read structure from
 	 */
-	public static function updateDbFromStructure($file){
+	public static function updateDbFromStructure($file) {
 		$CONFIG_DBTABLEPREFIX = OC_Config::getValue( "dbtableprefix", "oc_" );
 		$CONFIG_DBTYPE = OC_Config::getValue( "dbtype", "sqlite" );
 
@@ -471,7 +471,7 @@ class OC_DB {
 		 * http://www.postgresql.org/docs/8.1/static/functions-datetime.html
 		 * http://www.sqlite.org/lang_createtable.html
 		 * http://docs.oracle.com/cd/B19306_01/server.102/b14200/functions037.htm
-		if( $CONFIG_DBTYPE == 'pgsql' ){ //mysql support it too but sqlite doesn't
+		if( $CONFIG_DBTYPE == 'pgsql' ) { //mysql support it too but sqlite doesn't
 			$content = str_replace( '<default>0000-00-00 00:00:00</default>', '<default>CURRENT_TIMESTAMP</default>', $content );
 		}
 		 */
@@ -496,7 +496,7 @@ class OC_DB {
 	 *
 	 * Connects to a MDB2 database scheme
 	 */
-	private static function connectScheme(){
+	private static function connectScheme() {
 		// We need a mdb2 database connection
 		self::connectMDB2();
 		self::$MDB2->loadModule('Manager');
@@ -519,7 +519,7 @@ class OC_DB {
 	 * This function replaces *PREFIX* with the value of $CONFIG_DBTABLEPREFIX
 	 * and replaces the ` woth ' or " according to the database driver.
 	 */
-	private static function processQuery( $query ){
+	private static function processQuery( $query ) {
 		self::connect();
 		// We need Database type and table prefix
 		if(is_null(self::$type)) {
@@ -554,7 +554,7 @@ class OC_DB {
 	 * @brief drop a table
 	 * @param string $tableNamme the table to drop
 	 */
-	public static function dropTable($tableName){
+	public static function dropTable($tableName) {
 		self::connectMDB2();
 		self::$MDB2->loadModule('Manager');
 		self::$MDB2->dropTable($tableName);
@@ -564,7 +564,7 @@ class OC_DB {
 	 * remove all tables defined in a database structure xml file
 	 * @param string $file the xml file describing the tables
 	 */
-	public static function removeDBStructure($file){
+	public static function removeDBStructure($file) {
 		$CONFIG_DBNAME  = OC_Config::getValue( "dbname", "owncloud" );
 		$CONFIG_DBTABLEPREFIX = OC_Config::getValue( "dbtableprefix", "oc_" );
 		self::connectScheme();
@@ -584,7 +584,7 @@ class OC_DB {
 		// Delete our temporary file
 		unlink( $file2 );
 		$tables=array_keys($definition['tables']);
-		foreach($tables as $table){
+		foreach($tables as $table) {
 			self::dropTable($table);
 		}
 	}
@@ -593,13 +593,13 @@ 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
 		self::removeDBStructure( OC::$SERVERROOT . '/db_structure.xml' );
 
-		foreach($apps as $app){
+		foreach($apps as $app) {
 			$path = OC_App::getAppPath($app).'/appinfo/database.xml';
 			if(file_exists($path)) {
 				self::removeDBStructure( $path );
@@ -614,7 +614,7 @@ class OC_DB {
 	/**
 	 * Start a transaction
 	 */
-	public static function beginTransaction(){
+	public static function beginTransaction() {
 		self::connect();
 		if (self::$backend==self::BACKEND_MDB2 && !self::$connection->supports('transactions')) {
 			return false;
@@ -640,10 +640,10 @@ class OC_DB {
 	 * @param mixed $result
 	 * @return bool
 	 */
-	public static function isError($result){
+	public static function isError($result) {
 		if(!$result) {
 			return true;
-		}elseif(self::$backend==self::BACKEND_MDB2 and PEAR::isError($result)){
+		}elseif(self::$backend==self::BACKEND_MDB2 and PEAR::isError($result)) {
 			return true;
 		}else{
 			return false;
@@ -658,16 +658,16 @@ class PDOStatementWrapper{
 	private $statement=null;
 	private $lastArguments=array();
 
-	public function __construct($statement){
+	public function __construct($statement) {
 		$this->statement=$statement;
 	}
 
 	/**
 	 * make execute return the result instead of a bool
 	 */
-	public function execute($input=array()){
+	public function execute($input=array()) {
 		$this->lastArguments=$input;
-		if(count($input)>0){
+		if(count($input)>0) {
 			$result=$this->statement->execute($input);
 		}else{
 			$result=$this->statement->execute();
@@ -682,7 +682,7 @@ class PDOStatementWrapper{
 	/**
 	 * provide numRows
 	 */
-	public function numRows(){
+	public function numRows() {
 		$regex = '/^SELECT\s+(?:ALL\s+|DISTINCT\s+)?(?:.*?)\s+FROM\s+(.*)$/i';
 		if (preg_match($regex, $this->statement->queryString, $output) > 0) {
 			$query = OC_DB::prepare("SELECT COUNT(*) FROM {$output[1]}", PDO::FETCH_NUM);
@@ -695,14 +695,14 @@ class PDOStatementWrapper{
 	/**
 	 * provide an alias for fetch
 	 */
-	public function fetchRow(){
+	public function fetchRow() {
 		return $this->statement->fetch();
 	}
 
 	/**
 	 * pass all other function directly to the PDOStatement
 	 */
-	public function __call($name,$arguments){
+	public function __call($name,$arguments) {
 		return call_user_func_array(array($this->statement,$name), $arguments);
 	}
 
@@ -711,7 +711,7 @@ class PDOStatementWrapper{
 	 * fetch single column from the next row
 	 * @param int $colnum the column number to fetch
 	 */
-	public function fetchOne($colnum = 0){
+	public function fetchOne($colnum = 0) {
 		return $this->statement->fetchColumn($colnum);
 	}
 }
diff --git a/lib/eventsource.php b/lib/eventsource.php
index 45a20806b6..900b5b101e 100644
--- a/lib/eventsource.php
+++ b/lib/eventsource.php
@@ -31,18 +31,18 @@ class OC_EventSource{
 	private $fallback;
 	private $fallBackId=0;
 
-	public function __construct(){
+	public function __construct() {
 		@ob_end_clean();
 		header('Cache-Control: no-cache');
 		$this->fallback=isset($_GET['fallback']) and $_GET['fallback']=='true';
-		if($this->fallback){
+		if($this->fallback) {
 			$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{
 			header("Content-Type: text/event-stream");
 		}
-		if( !OC_Util::isCallRegistered()){
+		if( !OC_Util::isCallRegistered()) {
 			exit();
 		}
 		flush();
@@ -56,16 +56,16 @@ class OC_EventSource{
 	 *
 	 * if only one paramater is given, a typeless message will be send with that paramater as data
 	 */
-	public function send($type,$data=null){
-		if(is_null($data)){
+	public function send($type,$data=null) {
+		if(is_null($data)) {
 			$data=$type;
 			$type=null;
 		}
-		if($this->fallback){
+		if($this->fallback) {
 			$response='<script type="text/javascript">window.parent.OC.EventSource.fallBackCallBack('.$this->fallBackId.',"'.$type.'",'.json_encode($data).')</script>'.PHP_EOL;
 			echo $response;
 		}else{
-			if($type){
+			if($type) {
 				echo 'event: '.$type.PHP_EOL;
 			}
 			echo 'data: '.json_encode($data).PHP_EOL;
@@ -77,7 +77,7 @@ class OC_EventSource{
 	/**
 	 * close the connection of the even source
 	 */
-	public function close(){
+	public function close() {
 		$this->send('__internal__','close');//server side closing can be an issue, let the client do it
 	}
 }
\ No newline at end of file
diff --git a/lib/filecache.php b/lib/filecache.php
index de38ad99e8..adcf97753e 100644
--- a/lib/filecache.php
+++ b/lib/filecache.php
@@ -42,9 +42,9 @@ class OC_FileCache{
 	 * - encrypted
 	 * - versioned
 	 */
-	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
+	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{
 				OC_FileCache_Update::update($path,$root);
@@ -61,18 +61,18 @@ class OC_FileCache{
 	 *
 	 * $data is an assiciative array in the same format as returned by get
 	 */
-	public static function put($path,$data,$root=false){
-		if($root===false){
+	public static function put($path,$data,$root=false) {
+		if($root===false) {
 			$root=OC_Filesystem::getRoot();
 		}
 		$fullpath=$root.$path;
 		$parent=self::getParentId($fullpath);
 		$id=self::getId($fullpath,'');
-		if(isset(OC_FileCache_Cached::$savedData[$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){
+		if($id!=-1) {
 			self::update($id,$data);
 			return;
 		}
@@ -84,14 +84,14 @@ class OC_FileCache{
 			$parent = self::getParentId($fullpath);
 		}
 
-		if(!isset($data['size']) or !isset($data['mtime'])){//save incomplete data for the next time we write it
+		if(!isset($data['size']) or !isset($data['mtime'])) {//save incomplete data for the next time we write it
 			OC_FileCache_Cached::$savedData[$fullpath]=$data;
 			return;
 		}
-		if(!isset($data['encrypted'])){
+		if(!isset($data['encrypted'])) {
 			$data['encrypted']=false;
 		}
-		if(!isset($data['versioned'])){
+		if(!isset($data['versioned'])) {
 			$data['versioned']=false;
 		}
 		$mimePart=dirname($data['mimetype']);
@@ -103,11 +103,11 @@ class OC_FileCache{
 		$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($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)){
+		if(OC_DB::isError($result)) {
 			OC_Log::write('files','error while writing file('.$fullpath.') to cache',OC_Log::ERROR);
 		}
 
-		if($cache=OC_Cache::getUserCache(true)){
+		if($cache=OC_Cache::getUserCache(true)) {
 			$cache->remove('fileid/'.$fullpath);//ensure we don't have -1 cached
 		}
 	}
@@ -117,13 +117,13 @@ class OC_FileCache{
 	 * @param int $id
 	 * @param array $data
 	 */
-	private static function update($id,$data){
+	private static function update($id,$data) {
 		$arguments=array();
 		$queryParts=array();
-		foreach(array('size','mtime','ctime','mimetype','encrypted','versioned','writable') as $attribute){
-			if(isset($data[$attribute])){
+		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){
+				if($data[$attribute] === false) {
 					$arguments[] = 0;
 				}else{
 					$arguments[] = $data[$attribute];
@@ -131,7 +131,7 @@ class OC_FileCache{
 				$queryParts[]='`'.$attribute.'`=?';
 			}
 		}
-		if(isset($data['mimetype'])){
+		if(isset($data['mimetype'])) {
 			$arguments[]=dirname($data['mimetype']);
 			$queryParts[]='`mimepart`=?';
 		}
@@ -140,7 +140,7 @@ class OC_FileCache{
 		$sql = 'UPDATE `*PREFIX*fscache` SET '.implode(' , ',$queryParts).' WHERE `id`=?';
 		$query=OC_DB::prepare($sql);
 		$result=$query->execute($arguments);
-		if(OC_DB::isError($result)){
+		if(OC_DB::isError($result)) {
 			OC_Log::write('files','error while updating file('.$id.') in cache',OC_Log::ERROR);
 		}
 	}
@@ -151,8 +151,8 @@ class OC_FileCache{
 	 * @param string newPath
 	 * @param string root (optional)
 	 */
-	public static function move($oldPath,$newPath,$root=false){
-		if($root===false){
+	public static function move($oldPath,$newPath,$root=false) {
+		if($root===false) {
 			$root=OC_Filesystem::getRoot();
 		}
 		// If replacing an existing file, delete the file
@@ -165,7 +165,7 @@ 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)){
+		if(($cache=OC_Cache::getUserCache(true)) && $cache->hasKey('fileid/'.$oldPath)) {
 			$cache->set('fileid/'.$newPath,$cache->get('fileid/'.$oldPath));
 			$cache->remove('fileid/'.$oldPath);
 		}
@@ -173,12 +173,12 @@ class OC_FileCache{
 		$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()){
+		while($row= $query->execute(array($oldPath.'/%'))->fetchRow()) {
 			$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)){
+			if(($cache=OC_Cache::getUserCache(true)) && $cache->hasKey('fileid/'.$old)) {
 				$cache->set('fileid/'.$new,$cache->get('fileid/'.$old));
 				$cache->remove('fileid/'.$old);
 			}
@@ -190,8 +190,8 @@ class OC_FileCache{
 	 * @param string path
 	 * @param string root (optional)
 	 */
-	public static function delete($path,$root=false){
-		if($root===false){
+	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`=?');
@@ -211,20 +211,20 @@ class OC_FileCache{
 	 * @param string root (optional)
 	 * @return array of filepaths
 	 */
-	public static function search($search,$returnData=false,$root=false){
-		if($root===false){
+	public static function search($search,$returnData=false,$root=false) {
+		if($root===false) {
 			$root=OC_Filesystem::getRoot();
 		}
 		$rootLen=strlen($root);
-		if(!$returnData){
+		if(!$returnData) {
 			$query=OC_DB::prepare('SELECT `path` FROM `*PREFIX*fscache` WHERE `name` LIKE ? AND `user`=?');
 		}else{
 			$query=OC_DB::prepare('SELECT * FROM `*PREFIX*fscache` WHERE `name` LIKE ? AND `user`=?');
 		}
 		$result=$query->execute(array("%$search%",OC_User::getUser()));
 		$names=array();
-		while($row=$result->fetchRow()){
-			if(!$returnData){
+		while($row=$result->fetchRow()) {
+			if(!$returnData) {
 				$names[]=substr($row['path'],$rootLen);
 			}else{
 				$row['path']=substr($row['path'],$rootLen);
@@ -249,8 +249,8 @@ class OC_FileCache{
 	 * - encrypted
 	 * - versioned
 	 */
-	public static function getFolderContent($path,$root=false,$mimetype_filter=''){
-		if(OC_FileCache_Update::hasUpdated($path,$root,true)){
+	public static function getFolderContent($path,$root=false,$mimetype_filter='') {
+		if(OC_FileCache_Update::hasUpdated($path,$root,true)) {
 			OC_FileCache_Update::updateFolder($path,$root);
 		}
 		return OC_FileCache_Cached::getFolderContent($path,$root,$mimetype_filter);
@@ -262,7 +262,7 @@ class OC_FileCache{
 	 * @param string root (optional)
 	 * @return bool
 	 */
-	public static function inCache($path,$root=false){
+	public static function inCache($path,$root=false) {
 		return self::getId($path,$root)!=-1;
 	}
 
@@ -272,30 +272,30 @@ class OC_FileCache{
 	 * @param string root (optional)
 	 * @return int
 	 */
-	public static function getId($path,$root=false){
-		if($root===false){
+	public static function getId($path,$root=false) {
+		if($root===false) {
 			$root=OC_Filesystem::getRoot();
 		}
 
 		$fullPath=$root.$path;
-		if(($cache=OC_Cache::getUserCache(true)) && $cache->hasKey('fileid/'.$fullPath)){
+		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($fullPath)));
-		if(OC_DB::isError($result)){
+		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)){
+		if(is_array($result)) {
 			$id=$result['id'];
 		}else{
 			$id=-1;
 		}
-		if($cache=OC_Cache::getUserCache(true)){
+		if($cache=OC_Cache::getUserCache(true)) {
 			$cache->set('fileid/'.$fullPath,$id);
 		}
 
@@ -308,8 +308,8 @@ class OC_FileCache{
 	 * @param string user (optional)
 	 * @return string
 	 */
-	public static function getPath($id,$user=''){
-		if(!$user){
+	public static function getPath($id,$user='') {
+		if(!$user) {
 			$user=OC_User::getUser();
 		}
 		$query=OC_DB::prepare('SELECT `path` FROM `*PREFIX*fscache` WHERE `id`=? AND `user`=?');
@@ -317,7 +317,7 @@ class OC_FileCache{
 		$row=$result->fetchRow();
 		$path=$row['path'];
 		$root='/'.$user.'/files';
-		if(substr($path,0,strlen($root))!=$root){
+		if(substr($path,0,strlen($root))!=$root) {
 			return false;
 		}
 		return substr($path,strlen($root));
@@ -328,8 +328,8 @@ class OC_FileCache{
 	 * @param string $path
 	 * @return int
 	 */
-	private static function getParentId($path){
-		if($path=='/'){
+	private static function getParentId($path) {
+		if($path=='/') {
 			return -1;
 		}else{
 			return self::getId(dirname($path),'');
@@ -342,10 +342,10 @@ class OC_FileCache{
 	 * @param int $sizeDiff
 	 * @param string root (optinal)
 	 */
-	public static function increaseSize($path,$sizeDiff, $root=false){
+	public static function increaseSize($path,$sizeDiff, $root=false) {
 		if($sizeDiff==0) return;
 		$id=self::getId($path,$root);
-		while($id!=-1){//walk up the filetree increasing the size of all parent folders
+		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);
@@ -360,8 +360,8 @@ class OC_FileCache{
 	 * @param int count (optional)
 	 * @param string root (optional)
 	 */
-	public static function scan($path,$eventSource=false,&$count=0,$root=false){
-		if($eventSource){
+	public static function scan($path,$eventSource=false,&$count=0,$root=false) {
+		if($eventSource) {
 			$eventSource->send('scanning',array('file'=>$path,'count'=>$count));
 		}
 		$lastSend=$count;
@@ -369,7 +369,7 @@ class OC_FileCache{
 		if (substr($path, 0, 7) == '/Shared') {
 			return;
 		}
-		if($root===false){
+		if($root===false) {
 			$view=OC_Filesystem::getView();
 		}else{
 			$view=new OC_FilesystemView($root);
@@ -377,16 +377,16 @@ class OC_FileCache{
 		self::scanFile($path,$root);
 		$dh=$view->opendir($path.'/');
 		$totalSize=0;
-		if($dh){
+		if($dh) {
 			while (($filename = readdir($dh)) !== false) {
-				if($filename != '.' and $filename != '..'){
+				if($filename != '.' and $filename != '..') {
 					$file=$path.'/'.$filename;
-					if($view->is_dir($file.'/')){
+					if($view->is_dir($file.'/')) {
 						self::scan($file,$eventSource,$count,$root);
 					}else{
 						$totalSize+=self::scanFile($file,$root);
 						$count++;
-						if($count>$lastSend+25 and $eventSource){
+						if($count>$lastSend+25 and $eventSource) {
 							$lastSend=$count;
 							$eventSource->send('scanning',array('file'=>$path,'count'=>$count));
 						}
@@ -405,12 +405,12 @@ class OC_FileCache{
 	 * @param string root (optional)
 	 * @return int size of the scanned file
 	 */
-	public static function scanFile($path,$root=false){
+	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){
+		if($root===false) {
 			$view=OC_Filesystem::getView();
 		}else{
 			$view=new OC_FilesystemView($root);
@@ -419,14 +419,14 @@ class OC_FileCache{
 		clearstatcache();
 		$mimetype=$view->getMimeType($path);
 		$stat=$view->stat($path);
-		if($mimetype=='httpd/unix-directory'){
+		if($mimetype=='httpd/unix-directory') {
 			$writable=$view->is_writable($path.'/');
 		}else{
 			$writable=$view->is_writable($path);
 		}
 		$stat['mimetype']=$mimetype;
 		$stat['writable']=$writable;
-		if($path=='/'){
+		if($path=='/') {
 			$path='';
 		}
 		self::put($path,$stat,$root);
@@ -446,14 +446,14 @@ class OC_FileCache{
 	 * seccond mimetype part can be ommited
 	 * e.g. searchByMime('audio')
 	 */
-	public static function searchByMime($part1,$part2=null,$root=false){
-		if($root===false){
+	public static function searchByMime($part1,$part2=null,$root=false) {
+		if($root===false) {
 			$root=OC_Filesystem::getRoot();
 		}
 		$rootLen=strlen($root);
 		$root .= '%';
 		$user=OC_User::getUser();
-		if(!$part2){
+		if(!$part2) {
 			$query=OC_DB::prepare('SELECT `path` FROM `*PREFIX*fscache` WHERE `mimepart`=? AND `user`=? AND `path` LIKE ?');
 			$result=$query->execute(array($part1,$user, $root));
 		}else{
@@ -461,7 +461,7 @@ class OC_FileCache{
 			$result=$query->execute(array($part1.'/'.$part2,$user, $root));
 		}
 		$names=array();
-		while($row=$result->fetchRow()){
+		while($row=$result->fetchRow()) {
 			$names[]=substr($row['path'],$rootLen);
 		}
 		return $names;
@@ -470,7 +470,7 @@ class OC_FileCache{
 	/**
 	 * clean old pre-path_hash entries
 	 */
-	public static function clean(){
+	public static function clean() {
 		$query=OC_DB::prepare('DELETE FROM `*PREFIX*fscache` WHERE LENGTH(`path_hash`)<30');
 		$query->execute();
 	}
@@ -479,8 +479,8 @@ class OC_FileCache{
 	 * clear filecache entries
 	 * @param string user (optonal)
 	 */
-	public static function clear($user=''){
-		if($user){
+	public static function clear($user='') {
+		if($user) {
 			$query=OC_DB::prepare('DELETE FROM `*PREFIX*fscache` WHERE user=?');
 			$query->execute(array($user));
 		}else{
diff --git a/lib/filecache/cached.php b/lib/filecache/cached.php
index 505f1a5e2a..261bd2f572 100644
--- a/lib/filecache/cached.php
+++ b/lib/filecache/cached.php
@@ -13,20 +13,20 @@
 class OC_FileCache_Cached{
 	public static $savedData=array();
 
-	public static function get($path,$root=false){
-		if($root===false){
+	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])){
+		if(is_array($result)) {
+			if(isset(self::$savedData[$path])) {
 				$result=array_merge($result,self::$savedData[$path]);
 			}
 			return $result;
 		}else{
-			if(isset(self::$savedData[$path])){
+			if(isset(self::$savedData[$path])) {
 				return self::$savedData[$path];
 			}else{
 				return array();
@@ -50,17 +50,17 @@ class OC_FileCache_Cached{
 	 * - encrypted
 	 * - versioned
 	 */
-	public static function getFolderContent($path,$root=false,$mimetype_filter=''){
-		if($root===false){
+	public static function getFolderContent($path,$root=false,$mimetype_filter='') {
+		if($root===false) {
 			$root=OC_Filesystem::getRoot();
 		}
 		$parent=OC_FileCache::getId($path,$root);
-		if($parent==-1){
+		if($parent==-1) {
 			return array();
 		}
 		$query=OC_DB::prepare('SELECT `id`,`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)){
+		if(is_array($result)) {
 			return $result;
 		}else{
 			OC_Log::write('files','getFolderContent(): file not found in cache ('.$path.')',OC_Log::DEBUG);
diff --git a/lib/filecache/update.php b/lib/filecache/update.php
index 7b5f18fe5c..3d10f5ea7b 100644
--- a/lib/filecache/update.php
+++ b/lib/filecache/update.php
@@ -18,25 +18,25 @@ class OC_FileCache_Update{
 	 * @param boolean folder
 	 * @return bool
 	 */
-	public static function hasUpdated($path,$root=false,$folder=false){
-		if($root===false){
+	public static function hasUpdated($path,$root=false,$folder=false) {
+		if($root===false) {
 			$view=OC_Filesystem::getView();
 		}else{
 			$view=new OC_FilesystemView($root);
 		}
-		if(!$view->file_exists($path)){
+		if(!$view->file_exists($path)) {
 			return false;
 		}
 		$cachedData=OC_FileCache_Cached::get($path,$root);
-		if(isset($cachedData['mtime'])){
+		if(isset($cachedData['mtime'])) {
 			$cachedMTime=$cachedData['mtime'];
-			if($folder){
+			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
+			if(($path=='/' or $path=='') and $root===false) {//dont auto update the home folder, it will be scanned
 				return false;
 			}
 			return true;
@@ -46,19 +46,19 @@ class OC_FileCache_Update{
 	/**
 	 * delete non existing files from the cache
 	 */
-	public static function cleanFolder($path,$root=false){
-		if($root===false){
+	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){
+		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
+			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);
@@ -72,19 +72,19 @@ class OC_FileCache_Update{
 	 * @param string path
 	 * @param string root (optional)
 	 */
-	public static function updateFolder($path,$root=false){
-		if($root===false){
+	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
+		if($dh) {//check for changed/new files
 			while (($filename = readdir($dh)) !== false) {
-				if($filename != '.' and $filename != '..'){
+				if($filename != '.' and $filename != '..') {
 					$file=$path.'/'.$filename;
-					if(self::hasUpdated($file,$root)){
-						if($root===false){//filesystem hooks are only valid for the default root
+					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);
@@ -97,7 +97,7 @@ class OC_FileCache_Update{
 		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
+		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);
@@ -109,7 +109,7 @@ class OC_FileCache_Update{
 	 * @param array $params
 	 * @param string root (optional)
 	 */
-	public static function fileSystemWatcherWrite($params){
+	public static function fileSystemWatcherWrite($params) {
 		$path=$params['path'];
 		self::update($path);
 	}
@@ -119,7 +119,7 @@ class OC_FileCache_Update{
 	 * @param array $params
 	 * @param string root (optional)
 	 */
-	public static function fileSystemWatcherDelete($params){
+	public static function fileSystemWatcherDelete($params) {
 		$path=$params['path'];
 		self::delete($path);
 	}
@@ -129,7 +129,7 @@ class OC_FileCache_Update{
 	 * @param array $params
 	 * @param string root (optional)
 	 */
-	public static function fileSystemWatcherRename($params){
+	public static function fileSystemWatcherRename($params) {
 		$oldPath=$params['oldpath'];
 		$newPath=$params['newpath'];
 		self::rename($oldPath,$newPath);
@@ -140,8 +140,8 @@ class OC_FileCache_Update{
 	 * @param string path
 	 * @param string root (optional)
 	 */
-	public static function update($path,$root=false){
-		if($root===false){
+	public static function update($path,$root=false) {
+		if($root===false) {
 			$view=OC_Filesystem::getView();
 		}else{
 			$view=new OC_FilesystemView($root);
@@ -153,10 +153,10 @@ class OC_FileCache_Update{
 		$cached=OC_FileCache_Cached::get($path,$root);
 		$cachedSize=isset($cached['size'])?$cached['size']:0;
 
-		if($view->is_dir($path.'/')){
-			if(OC_FileCache::inCache($path,$root)){
+		if($view->is_dir($path.'/')) {
+			if(OC_FileCache::inCache($path,$root)) {
 				$cachedContent=OC_FileCache_Cached::getFolderContent($path,$root);
-				foreach($cachedContent as $file){
+				foreach($cachedContent as $file) {
 					$size+=$file['size'];
 				}
 				$mtime=$view->filemtime($path.'/');
@@ -179,9 +179,9 @@ class OC_FileCache_Update{
 	 * @param string path
 	 * @param string root (optional)
 	 */
-	public static function delete($path,$root=false){
+	public static function delete($path,$root=false) {
 		$cached=OC_FileCache_Cached::get($path,$root);
-		if(!isset($cached['size'])){
+		if(!isset($cached['size'])) {
 			return;
 		}
 		$size=$cached['size'];
@@ -195,11 +195,11 @@ class OC_FileCache_Update{
 	 * @param string newPath
 	 * @param string root (optional)
 	 */
-	public static function rename($oldPath,$newPath,$root=false){
-		if(!OC_FileCache::inCache($oldPath,$root)){
+	public static function rename($oldPath,$newPath,$root=false) {
+		if(!OC_FileCache::inCache($oldPath,$root)) {
 			return;
 		}
-		if($root===false){
+		if($root===false) {
 			$view=OC_Filesystem::getView();
 		}else{
 			$view=new OC_FilesystemView($root);
diff --git a/lib/fileproxy.php b/lib/fileproxy.php
index a1c79874bf..17380c656a 100644
--- a/lib/fileproxy.php
+++ b/lib/fileproxy.php
@@ -51,8 +51,8 @@ class OC_FileProxy{
 	 *
 	 * this implements a dummy proxy for all operations
 	 */
-	public function __call($function,$arguments){
-		if(substr($function,0,3)=='pre'){
+	public function __call($function,$arguments) {
+		if(substr($function,0,3)=='pre') {
 			return true;
 		}else{
 			return $arguments[1];
@@ -63,33 +63,33 @@ class OC_FileProxy{
 	 * register a proxy to be used
 	 * @param OC_FileProxy $proxy
 	 */
-	public static function register($proxy){
+	public static function register($proxy) {
 		self::$proxies[]=$proxy;
 	}
 
-	public static function getProxies($operation){
+	public static function getProxies($operation) {
 		$proxies=array();
-		foreach(self::$proxies as $proxy){
-			if(method_exists($proxy,$operation)){
+		foreach(self::$proxies as $proxy) {
+			if(method_exists($proxy,$operation)) {
 				$proxies[]=$proxy;
 			}
 		}
 		return $proxies;
 	}
 
-	public static function runPreProxies($operation,&$filepath,&$filepath2=null){
-		if(!self::$enabled){
+	public static function runPreProxies($operation,&$filepath,&$filepath2=null) {
+		if(!self::$enabled) {
 			return true;
 		}
 		$operation='pre'.$operation;
 		$proxies=self::getProxies($operation);
-		foreach($proxies as $proxy){
-			if(!is_null($filepath2)){
-				if($proxy->$operation($filepath,$filepath2)===false){
+		foreach($proxies as $proxy) {
+			if(!is_null($filepath2)) {
+				if($proxy->$operation($filepath,$filepath2)===false) {
 					return false;
 				}
 			}else{
-				if($proxy->$operation($filepath)===false){
+				if($proxy->$operation($filepath)===false) {
 					return false;
 				}
 			}
@@ -97,19 +97,19 @@ class OC_FileProxy{
 		return true;
 	}
 
-	public static function runPostProxies($operation,$path,$result){
-		if(!self::$enabled){
+	public static function runPostProxies($operation,$path,$result) {
+		if(!self::$enabled) {
 			return $result;
 		}
 		$operation='post'.$operation;
 		$proxies=self::getProxies($operation);
-		foreach($proxies as $proxy){
+		foreach($proxies as $proxy) {
 			$result=$proxy->$operation($path,$result);
 		}
 		return $result;
 	}
 
-	public static function clearProxies(){
+	public static function clearProxies() {
 		self::$proxies=array();
 	}
 }
diff --git a/lib/fileproxy/quota.php b/lib/fileproxy/quota.php
index 4c6261fc51..adbff3d301 100644
--- a/lib/fileproxy/quota.php
+++ b/lib/fileproxy/quota.php
@@ -32,15 +32,15 @@ class OC_FileProxy_Quota extends OC_FileProxy{
 	 * get the quota for the current user
 	 * @return int
 	 */
-	private function getQuota(){
-		if($this->userQuota!=-1){
+	private function getQuota() {
+		if($this->userQuota!=-1) {
 			return $this->userQuota;
 		}
 		$userQuota=OC_Preferences::getValue(OC_User::getUser(),'files','quota','default');
-		if($userQuota=='default'){
+		if($userQuota=='default') {
 			$userQuota=OC_AppConfig::getValue('files','default_quota','none');
 		}
-		if($userQuota=='none'){
+		if($userQuota=='none') {
 			$this->userQuota=0;
 		}else{
 			$this->userQuota=OC_Helper::computerFileSize($userQuota);
@@ -53,7 +53,7 @@ class OC_FileProxy_Quota extends OC_FileProxy{
 	 * get the free space in the users home folder
 	 * @return int
 	 */
-	private function getFreeSpace(){
+	private function getFreeSpace() {
 		$rootInfo=OC_FileCache_Cached::get('');
 		// TODO Remove after merge of share_api
 		if (OC_FileCache::inCache('/Shared')) {
@@ -64,36 +64,36 @@ class OC_FileProxy_Quota extends OC_FileProxy{
 		$usedSpace=isset($rootInfo['size'])?$rootInfo['size']:0;
 		$usedSpace=isset($sharedInfo['size'])?$usedSpace-$sharedInfo['size']:$usedSpace;
 		$totalSpace=$this->getQuota();
-		if($totalSpace==0){
+		if($totalSpace==0) {
 			return 0;
 		}
 		return $totalSpace-$usedSpace;
 	}
 
-	public function postFree_space($path,$space){
+	public function postFree_space($path,$space) {
 		$free=$this->getFreeSpace();
-		if($free==0){
+		if($free==0) {
 			return $space;
 		}
 		return min($free,$space);
 	}
 
-	public function preFile_put_contents($path,$data){
+	public function preFile_put_contents($path,$data) {
 		if (is_resource($data)) {
 			$data = '';//TODO: find a way to get the length of the stream without emptying it
 		}
 		return (strlen($data)<$this->getFreeSpace() or $this->getFreeSpace()==0);
 	}
 
-	public function preCopy($path1,$path2){
+	public function preCopy($path1,$path2) {
 		return (OC_Filesystem::filesize($path1)<$this->getFreeSpace() or $this->getFreeSpace()==0);
 	}
 
-	public function preFromTmpFile($tmpfile,$path){
+	public function preFromTmpFile($tmpfile,$path) {
 		return (filesize($tmpfile)<$this->getFreeSpace() or $this->getFreeSpace()==0);
 	}
 
-	public function preFromUploadedFile($tmpfile,$path){
+	public function preFromUploadedFile($tmpfile,$path) {
 		return (filesize($tmpfile)<$this->getFreeSpace() or $this->getFreeSpace()==0);
 	}
 }
\ No newline at end of file
diff --git a/lib/files.php b/lib/files.php
index 00cbc63aba..63dd96b950 100644
--- a/lib/files.php
+++ b/lib/files.php
@@ -32,9 +32,9 @@ class OC_Files {
 	* get the content of a directory
 	* @param dir $directory path under datadirectory
 	*/
-	public static function getDirectoryContent($directory, $mimetype_filter = ''){
+	public static function getDirectoryContent($directory, $mimetype_filter = '') {
 		$directory=OC_Filesystem::normalizePath($directory);
-		if($directory=='/'){
+		if($directory=='/') {
 			$directory='';
 		}
 		$files = array();
@@ -87,12 +87,12 @@ class OC_Files {
 	* @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, $only_header = false){
-		if(strpos($files,';')){
+	public static function get($dir,$files, $only_header = false) {
+		if(strpos($files,';')) {
 			$files=explode(';',$files);
 		}
 
-		if(is_array($files)){
+		if(is_array($files)) {
 			self::validateZipDownload($dir,$files);
 			$executionTime = intval(ini_get('max_execution_time'));
 			set_time_limit(0);
@@ -101,19 +101,19 @@ class OC_Files {
 			if ($zip->open($filename, ZIPARCHIVE::CREATE | ZIPARCHIVE::OVERWRITE)!==TRUE) {
 				exit("cannot open <$filename>\n");
 			}
-			foreach($files as $file){
+			foreach($files as $file) {
 				$file=$dir.'/'.$file;
-				if(OC_Filesystem::is_file($file)){
+				if(OC_Filesystem::is_file($file)) {
 					$tmpFile=OC_Filesystem::toTmpFile($file);
 					self::$tmpFiles[]=$tmpFile;
 					$zip->addFile($tmpFile,basename($file));
-				}elseif(OC_Filesystem::is_dir($file)){
+				}elseif(OC_Filesystem::is_dir($file)) {
 					self::zipAddDir($file,$zip);
 				}
 			}
 			$zip->close();
 			set_time_limit($executionTime);
-		}elseif(OC_Filesystem::is_dir($dir.'/'.$files)){
+		}elseif(OC_Filesystem::is_dir($dir.'/'.$files)) {
 			self::validateZipDownload($dir,$files);
 			$executionTime = intval(ini_get('max_execution_time'));
 			set_time_limit(0);
@@ -131,18 +131,18 @@ class OC_Files {
 			$filename=$dir.'/'.$files;
 		}
 		@ob_end_clean();
-		if($zip or OC_Filesystem::is_readable($filename)){
+		if($zip or OC_Filesystem::is_readable($filename)) {
 			header('Content-Disposition: attachment; filename="'.basename($filename).'"');
 			header('Content-Transfer-Encoding: binary');
 			OC_Response::disableCaching();
-			if($zip){
+			if($zip) {
 				ini_set('zlib.output_compression', 'off');
 				header('Content-Type: application/zip');
 				header('Content-Length: ' . filesize($filename));
 			}else{
 				header('Content-Type: '.OC_Filesystem::getMimeType($filename));
 			}
-		}elseif($zip or !OC_Filesystem::file_exists($filename)){
+		}elseif($zip or !OC_Filesystem::file_exists($filename)) {
 			header("HTTP/1.0 404 Not Found");
 			$tmpl = new OC_Template( '', '404', 'guest' );
 			$tmpl->assign('file',$filename);
@@ -151,12 +151,12 @@ class OC_Files {
 			header("HTTP/1.0 403 Forbidden");
 			die('403 Forbidden');
 		}
-		if($only_header){
+		if($only_header) {
 			if(!$zip)
 				header("Content-Length: ".OC_Filesystem::filesize($filename));
 			return ;
 		}
-		if($zip){
+		if($zip) {
 			$handle=fopen($filename,'r');
 			if ($handle) {
 				$chunkSize = 8*1024;// 1 MB chunks
@@ -169,26 +169,26 @@ class OC_Files {
 		}else{
 			OC_Filesystem::readfile($filename);
 		}
-		foreach(self::$tmpFiles as $tmpFile){
-			if(file_exists($tmpFile) and is_file($tmpFile)){
+		foreach(self::$tmpFiles as $tmpFile) {
+			if(file_exists($tmpFile) and is_file($tmpFile)) {
 				unlink($tmpFile);
 			}
 		}
 	}
 
-	public static function zipAddDir($dir,$zip,$internalDir=''){
+	public static function zipAddDir($dir,$zip,$internalDir='') {
 		$dirname=basename($dir);
 		$zip->addEmptyDir($internalDir.$dirname);
 		$internalDir.=$dirname.='/';
 		$files=OC_Files::getdirectorycontent($dir);
-		foreach($files as $file){
+		foreach($files as $file) {
 			$filename=$file['name'];
 			$file=$dir.'/'.$filename;
-			if(OC_Filesystem::is_file($file)){
+			if(OC_Filesystem::is_file($file)) {
 				$tmpFile=OC_Filesystem::toTmpFile($file);
 				OC_Files::$tmpFiles[]=$tmpFile;
 				$zip->addFile($tmpFile,$internalDir.$filename);
-			}elseif(OC_Filesystem::is_dir($file)){
+			}elseif(OC_Filesystem::is_dir($file)) {
 				self::zipAddDir($file,$zip,$internalDir);
 			}
 		}
@@ -201,8 +201,8 @@ class OC_Files {
 	* @param dir  $targetDir
 	* @param file $target
 	*/
-	public static function move($sourceDir,$source,$targetDir,$target){
-		if(OC_User::isLoggedIn() && ($sourceDir != '' || $source != 'Shared')){
+	public static function move($sourceDir,$source,$targetDir,$target) {
+		if(OC_User::isLoggedIn() && ($sourceDir != '' || $source != 'Shared')) {
 			$targetFile=self::normalizePath($targetDir.'/'.$target);
 			$sourceFile=self::normalizePath($sourceDir.'/'.$source);
 			return OC_Filesystem::rename($sourceFile,$targetFile);
@@ -219,8 +219,8 @@ class OC_Files {
 	* @param dir  $targetDir
 	* @param file $target
 	*/
-	public static function copy($sourceDir,$source,$targetDir,$target){
-		if(OC_User::isLoggedIn()){
+	public static function copy($sourceDir,$source,$targetDir,$target) {
+		if(OC_User::isLoggedIn()) {
 			$targetFile=$targetDir.'/'.$target;
 			$sourceFile=$sourceDir.'/'.$source;
 			return OC_Filesystem::copy($sourceFile,$targetFile);
@@ -234,14 +234,14 @@ class OC_Files {
 	* @param file $name
 	* @param type $type
 	*/
-	public static function newFile($dir,$name,$type){
-		if(OC_User::isLoggedIn()){
+	public static function newFile($dir,$name,$type) {
+		if(OC_User::isLoggedIn()) {
 			$file=$dir.'/'.$name;
-			if($type=='dir'){
+			if($type=='dir') {
 				return OC_Filesystem::mkdir($file);
-			}elseif($type=='file'){
+			}elseif($type=='file') {
 				$fileHandle=OC_Filesystem::fopen($file, 'w');
-				if($fileHandle){
+				if($fileHandle) {
 					fclose($fileHandle);
 					return true;
 				}else{
@@ -257,7 +257,7 @@ class OC_Files {
 	* @param dir  $dir
 	* @param file $name
 	*/
-	public static function delete($dir,$file){
+	public static function delete($dir,$file) {
 		if(OC_User::isLoggedIn() && ($dir!= '' || $file != 'Shared')) {
 			$file=$dir.'/'.$file;
 			return OC_Filesystem::unlink($file);
@@ -289,8 +289,8 @@ class OC_Files {
 		$zipLimit = OC_Config::getValue('maxZipInputSize', OC_Helper::computerFileSize('800 MB'));
 		if($zipLimit > 0) {
 			$totalsize = 0;
-			if(is_array($files)){
-				foreach($files as $file){
+			if(is_array($files)) {
+				foreach($files as $file) {
 					$totalsize += OC_Filesystem::filesize($dir.'/'.$file);
 				}
 			}else{
@@ -319,7 +319,7 @@ class OC_Files {
 	* @param  string  path
 	* @return string  guessed mime type
 	*/
-	static function getMimeType($path){
+	static function getMimeType($path) {
 		return OC_Filesystem::getMimeType($path);
 	}
 
@@ -329,7 +329,7 @@ class OC_Files {
 	* @param  string  path
 	* @return array
 	*/
-	static function getTree($path){
+	static function getTree($path) {
 		return OC_Filesystem::getTree($path);
 	}
 
@@ -341,7 +341,7 @@ class OC_Files {
 	* @param  string  file
 	* @return string  guessed mime type
 	*/
-	static function pull($source,$token,$dir,$file){
+	static function pull($source,$token,$dir,$file) {
 		$tmpfile=tempnam(get_temp_dir(),'remoteCloudFile');
 		$fp=fopen($tmpfile,'w+');
 		$url=$source.="/files/pull.php?token=$token";
@@ -353,7 +353,7 @@ class OC_Files {
 		$info=curl_getinfo($ch);
 		$httpCode=$info['http_code'];
 		curl_close($ch);
-		if($httpCode==200 or $httpCode==0){
+		if($httpCode==200 or $httpCode==0) {
 			OC_Filesystem::fromTmpFile($tmpfile,$dir.'/'.$file);
 			return true;
 		}else{
@@ -366,7 +366,7 @@ class OC_Files {
 	 * @param int size filesisze in bytes
 	 * @return false on failure, size on success
 	 */
-	static function setUploadLimit($size){
+	static function setUploadLimit($size) {
 		//don't allow user to break his config -- upper boundary
 		if($size > PHP_INT_MAX) {
 			//max size is always 1 byte lower than computerFileSize returns
@@ -421,10 +421,10 @@ class OC_Files {
 	 * @param string $path
 	 * @return string
 	 */
-	static public function normalizePath($path){
+	static public function normalizePath($path) {
 		$path='/'.$path;
 		$old='';
-		while($old!=$path){//replace any multiplicity of slashes with a single one
+		while($old!=$path) {//replace any multiplicity of slashes with a single one
 			$old=$path;
 			$path=str_replace('//','/',$path);
 		}
@@ -432,10 +432,10 @@ class OC_Files {
 	}
 }
 
-function fileCmp($a,$b){
-	if($a['type']=='dir' and $b['type']!='dir'){
+function fileCmp($a,$b) {
+	if($a['type']=='dir' and $b['type']!='dir') {
 		return -1;
-	}elseif($a['type']!='dir' and $b['type']=='dir'){
+	}elseif($a['type']!='dir' and $b['type']=='dir') {
 		return 1;
 	}else{
 		return strnatcasecmp($a['name'],$b['name']);
diff --git a/lib/filestorage/common.php b/lib/filestorage/common.php
index e2828e5617..351714437c 100644
--- a/lib/filestorage/common.php
+++ b/lib/filestorage/common.php
@@ -34,20 +34,20 @@
 
 abstract class OC_Filestorage_Common extends OC_Filestorage {
 
-	public function __construct($parameters){}
+	public function __construct($parameters) {}
 // 	abstract public function mkdir($path);
 // 	abstract public function rmdir($path);
 // 	abstract public function opendir($path);
-	public function is_dir($path){
+	public function is_dir($path) {
 		return $this->filetype($path)=='dir';
 	}
-	public function is_file($path){
+	public function is_file($path) {
 		return $this->filetype($path)=='file';
 	}
 // 	abstract public function stat($path);
 // 	abstract public function filetype($path);
 	public function filesize($path) {
-		if($this->is_dir($path)){
+		if($this->is_dir($path)) {
 			return 0;//by definition
 		}else{
 			$stat = $this->stat($path);
@@ -80,11 +80,11 @@ abstract class OC_Filestorage_Common extends OC_Filestorage {
 	}
 	public function file_get_contents($path) {
 		$handle = $this->fopen($path, "r");
-		if(!$handle){
+		if(!$handle) {
 			return false;
 		}
 		$size=$this->filesize($path);
-		if($size==0){
+		if($size==0) {
 			return '';
 		}
 		return fread($handle, $size);
@@ -94,8 +94,8 @@ abstract class OC_Filestorage_Common extends OC_Filestorage {
 		return fwrite($handle, $data);
 	}
 // 	abstract public function unlink($path);
-	public function rename($path1,$path2){
-		if($this->copy($path1,$path2)){
+	public function rename($path1,$path2) {
+		if($this->copy($path1,$path2)) {
 			return $this->unlink($path1);
 		}else{
 			return false;
@@ -181,19 +181,19 @@ abstract class OC_Filestorage_Common extends OC_Filestorage {
 		}
 
 	}
-	public function getMimeType($path){
-		if(!$this->file_exists($path)){
+	public function getMimeType($path) {
+		if(!$this->file_exists($path)) {
 			return false;
 		}
-		if($this->is_dir($path)){
+		if($this->is_dir($path)) {
 			return 'httpd/unix-directory';
 		}
 		$source=$this->fopen($path,'r');
-		if(!$source){
+		if(!$source) {
 			return false;
 		}
 		$head=fread($source,8192);//8kb should suffice to determine a mimetype
-		if($pos=strrpos($path,'.')){
+		if($pos=strrpos($path,'.')) {
 			$extension=substr($path,$pos);
 		}else{
 			$extension='';
@@ -204,25 +204,25 @@ abstract class OC_Filestorage_Common extends OC_Filestorage {
 		unlink($tmpFile);
 		return $mime;
 	}
-	public function hash($type,$path,$raw = false){
+	public function hash($type,$path,$raw = false) {
 		$tmpFile=$this->getLocalFile();
 		$hash=hash($type,$tmpFile,$raw);
 		unlink($tmpFile);
 		return $hash;
 	}
 // 	abstract public function free_space($path);
-	public function search($query){
+	public function search($query) {
 		return $this->searchInDir($query);
 	}
-	public function getLocalFile($path){
+	public function getLocalFile($path) {
 		return $this->toTmpFile($path);
 	}
-	private function toTmpFile($path){//no longer in the storage api, still usefull here
+	private function toTmpFile($path) {//no longer in the storage api, still usefull here
 		$source=$this->fopen($path,'r');
-		if(!$source){
+		if(!$source) {
 			return false;
 		}
-		if($pos=strrpos($path,'.')){
+		if($pos=strrpos($path,'.')) {
 			$extension=substr($path,$pos);
 		}else{
 			$extension='';
@@ -232,16 +232,16 @@ abstract class OC_Filestorage_Common extends OC_Filestorage {
 		OC_Helper::streamCopy($source,$target);
 		return $tmpFile;
 	}
-	public function getLocalFolder($path){
+	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)){
+	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{
@@ -254,16 +254,16 @@ abstract class OC_Filestorage_Common extends OC_Filestorage {
 	}
 // 	abstract public function touch($path, $mtime=null);
 
-	protected function searchInDir($query,$dir=''){
+	protected function searchInDir($query,$dir='') {
 		$files=array();
 		$dh=$this->opendir($dir);
-		if($dh){
-			while($item=readdir($dh)){
+		if($dh) {
+			while($item=readdir($dh)) {
 				if ($item == '.' || $item == '..') continue;
-				if(strstr(strtolower($item),strtolower($query))!==false){
+				if(strstr(strtolower($item),strtolower($query))!==false) {
 					$files[]=$dir.'/'.$item;
 				}
-				if($this->is_dir($dir.'/'.$item)){
+				if($this->is_dir($dir.'/'.$item)) {
 					$files=array_merge($files,$this->searchInDir($query,$dir.'/'.$item));
 				}
 			}
@@ -276,7 +276,7 @@ abstract class OC_Filestorage_Common extends OC_Filestorage {
 	 * @param int $time
 	 * @return bool
 	 */
-	public function hasUpdated($path,$time){
+	public function hasUpdated($path,$time) {
 		return $this->filemtime($path)>$time;
 	}
 }
diff --git a/lib/filestorage/commontest.php b/lib/filestorage/commontest.php
index 4d06e4fa32..b88bb232c3 100644
--- a/lib/filestorage/commontest.php
+++ b/lib/filestorage/commontest.php
@@ -32,44 +32,44 @@ class OC_Filestorage_CommonTest extends OC_Filestorage_Common{
 	 */
 	private $storage;
 
-	public function __construct($params){
+	public function __construct($params) {
 		$this->storage=new OC_Filestorage_Local($params);
 	}
 
-	public function mkdir($path){
+	public function mkdir($path) {
 		return $this->storage->mkdir($path);
 	}
-	public function rmdir($path){
+	public function rmdir($path) {
 		return $this->storage->rmdir($path);
 	}
-	public function opendir($path){
+	public function opendir($path) {
 		return $this->storage->opendir($path);
 	}
-	public function stat($path){
+	public function stat($path) {
 		return $this->storage->stat($path);
 	}
-	public function filetype($path){
+	public function filetype($path) {
 		return $this->storage->filetype($path);
 	}
-	public function isReadable($path){
+	public function isReadable($path) {
 		return $this->storage->isReadable($path);
 	}
-	public function isUpdatable($path){
+	public function isUpdatable($path) {
 		return $this->storage->isUpdatable($path);
 	}
-	public function file_exists($path){
+	public function file_exists($path) {
 		return $this->storage->file_exists($path);
 	}
-	public function unlink($path){
+	public function unlink($path) {
 		return $this->storage->unlink($path);
 	}
-	public function fopen($path,$mode){
+	public function fopen($path,$mode) {
 		return $this->storage->fopen($path,$mode);
 	}
-	public function free_space($path){
+	public function free_space($path) {
 		return $this->storage->free_space($path);
 	}
-	public function touch($path, $mtime=null){
+	public function touch($path, $mtime=null) {
 		return $this->storage->touch($path,$mtime);
 	}
 }
\ No newline at end of file
diff --git a/lib/filestorage/local.php b/lib/filestorage/local.php
index b19205f45b..e26d3d3ef9 100644
--- a/lib/filestorage/local.php
+++ b/lib/filestorage/local.php
@@ -4,67 +4,67 @@
  */
 class OC_Filestorage_Local extends OC_Filestorage_Common{
 	protected $datadir;
-	public function __construct($arguments){
+	public function __construct($arguments) {
 		$this->datadir=$arguments['datadir'];
-		if(substr($this->datadir,-1)!=='/'){
+		if(substr($this->datadir,-1)!=='/') {
 			$this->datadir.='/';
 		}
 	}
-	public function mkdir($path){
+	public function mkdir($path) {
 		return @mkdir($this->datadir.$path);
 	}
-	public function rmdir($path){
+	public function rmdir($path) {
 		return @rmdir($this->datadir.$path);
 	}
-	public function opendir($path){
+	public function opendir($path) {
 		return opendir($this->datadir.$path);
 	}
-	public function is_dir($path){
-		if(substr($path,-1)=='/'){
+	public function is_dir($path) {
+		if(substr($path,-1)=='/') {
 			$path=substr($path,0,-1);
 		}
 		return is_dir($this->datadir.$path);
 	}
-	public function is_file($path){
+	public function is_file($path) {
 		return is_file($this->datadir.$path);
 	}
-	public function stat($path){
+	public function stat($path) {
 		return stat($this->datadir.$path);
 	}
-	public function filetype($path){
+	public function filetype($path) {
 		$filetype=filetype($this->datadir.$path);
-		if($filetype=='link'){
+		if($filetype=='link') {
 			$filetype=filetype(realpath($this->datadir.$path));
 		}
 		return $filetype;
 	}
-	public function filesize($path){
-		if($this->is_dir($path)){
+	public function filesize($path) {
+		if($this->is_dir($path)) {
 			return 0;
 		}else{
 			return filesize($this->datadir.$path);
 		}
 	}
-	public function isReadable($path){
+	public function isReadable($path) {
 		return is_readable($this->datadir.$path);
 	}
-	public function isUpdatable($path){
+	public function isUpdatable($path) {
 		return is_writable($this->datadir.$path);
 	}
-	public function file_exists($path){
+	public function file_exists($path) {
 		return file_exists($this->datadir.$path);
 	}
-	public function filectime($path){
+	public function filectime($path) {
 		return filectime($this->datadir.$path);
 	}
-	public function filemtime($path){
+	public function filemtime($path) {
 		return filemtime($this->datadir.$path);
 	}
-	public function touch($path, $mtime=null){
+	public function touch($path, $mtime=null) {
 		// sets the modification time of the file to the given value.
 		// If mtime is nil the current time is set.
 		// note that the access time of the file always changes to the current time.
-		if(!is_null($mtime)){
+		if(!is_null($mtime)) {
 			$result=touch( $this->datadir.$path, $mtime );
 		}else{
 			$result=touch( $this->datadir.$path);
@@ -75,32 +75,32 @@ class OC_Filestorage_Local extends OC_Filestorage_Common{
 
 		return $result;
 	}
-	public function file_get_contents($path){
+	public function file_get_contents($path) {
 		return file_get_contents($this->datadir.$path);
 	}
-	public function file_put_contents($path,$data){
+	public function file_put_contents($path,$data) {
 		return file_put_contents($this->datadir.$path,$data);
 	}
-	public function unlink($path){
+	public function unlink($path) {
 		return $this->delTree($path);
 	}
-	public function rename($path1,$path2){
+	public function rename($path1,$path2) {
 		if (!$this->isUpdatable($path1)) {
 			OC_Log::write('core','unable to rename, file is not writable : '.$path1,OC_Log::ERROR);
 			return false;
 		}
-		if(! $this->file_exists($path1)){
+		if(! $this->file_exists($path1)) {
 			OC_Log::write('core','unable to rename, file does not exists : '.$path1,OC_Log::ERROR);
 			return false;
 		}
 
-		if($return=rename($this->datadir.$path1,$this->datadir.$path2)){
+		if($return=rename($this->datadir.$path1,$this->datadir.$path2)) {
 		}
 		return $return;
 	}
-	public function copy($path1,$path2){
-		if($this->is_dir($path2)){
-			if(!$this->file_exists($path2)){
+	public function copy($path1,$path2) {
+		if($this->is_dir($path2)) {
+			if(!$this->file_exists($path2)) {
 				$this->mkdir($path2);
 			}
 			$source=substr($path1,strrpos($path1,'/')+1);
@@ -108,9 +108,9 @@ class OC_Filestorage_Local extends OC_Filestorage_Common{
 		}
 		return copy($this->datadir.$path1,$this->datadir.$path2);
 	}
-	public function fopen($path,$mode){
-		if($return=fopen($this->datadir.$path,$mode)){
-			switch($mode){
+	public function fopen($path,$mode) {
+		if($return=fopen($this->datadir.$path,$mode)) {
+			switch($mode) {
 				case 'r':
 					break;
 				case 'r+':
@@ -127,8 +127,8 @@ class OC_Filestorage_Local extends OC_Filestorage_Common{
 		return $return;
 	}
 
-	public function getMimeType($path){
-		if($this->isReadable($path)){
+	public function getMimeType($path) {
+		if($this->isReadable($path)) {
 			return OC_Helper::getMimeType($this->datadir.$path);
 		}else{
 			return false;
@@ -142,46 +142,46 @@ class OC_Filestorage_Local extends OC_Filestorage_Common{
 		if (!is_dir($dir) || is_link($dir)) return unlink($dir);
 		foreach (scandir($dir) as $item) {
 			if ($item == '.' || $item == '..') continue;
-			if(is_file($dir.'/'.$item)){
-				if(unlink($dir.'/'.$item)){
+			if(is_file($dir.'/'.$item)) {
+				if(unlink($dir.'/'.$item)) {
 				}
-			}elseif(is_dir($dir.'/'.$item)){
-				if (!$this->delTree($dirRelative. "/" . $item)){
+			}elseif(is_dir($dir.'/'.$item)) {
+				if (!$this->delTree($dirRelative. "/" . $item)) {
 					return false;
 				};
 			}
 		}
-		if($return=rmdir($dir)){
+		if($return=rmdir($dir)) {
 		}
 		return $return;
 	}
 
-	public function hash($path,$type,$raw=false){
+	public function hash($path,$type,$raw=false) {
 		return hash_file($type,$this->datadir.$path,$raw);
 	}
 
-	public function free_space($path){
+	public function free_space($path) {
 		return disk_free_space($this->datadir.$path);
 	}
 
-	public function search($query){
+	public function search($query) {
 		return $this->searchInDir($query);
 	}
-	public function getLocalFile($path){
+	public function getLocalFile($path) {
 		return $this->datadir.$path;
 	}
-	public function getLocalFolder($path){
+	public function getLocalFolder($path) {
 		return $this->datadir.$path;
 	}
 
-	protected function searchInDir($query,$dir=''){
+	protected function searchInDir($query,$dir='') {
 		$files=array();
 		foreach (scandir($this->datadir.$dir) as $item) {
 			if ($item == '.' || $item == '..') continue;
-			if(strstr(strtolower($item),strtolower($query))!==false){
+			if(strstr(strtolower($item),strtolower($query))!==false) {
 				$files[]=$dir.'/'.$item;
 			}
-			if(is_dir($this->datadir.$dir.'/'.$item)){
+			if(is_dir($this->datadir.$dir.'/'.$item)) {
 				$files=array_merge($files,$this->searchInDir($query,$dir.'/'.$item));
 			}
 		}
@@ -193,7 +193,7 @@ class OC_Filestorage_Local extends OC_Filestorage_Common{
 	 * @param int $time
 	 * @return bool
 	 */
-	public function hasUpdated($path,$time){
+	public function hasUpdated($path,$time) {
 		return $this->filemtime($path)>$time;
 	}
 }
diff --git a/lib/filestorage/temporary.php b/lib/filestorage/temporary.php
index 8f2373c8e9..876ba045a6 100644
--- a/lib/filestorage/temporary.php
+++ b/lib/filestorage/temporary.php
@@ -3,15 +3,15 @@
  * local storage backnd in temporary folder for testing purpores
  */
 class OC_Filestorage_Temporary extends OC_Filestorage_Local{
-	public function __construct($arguments){
+	public function __construct($arguments) {
 		$this->datadir=OC_Helper::tmpFolder();
 	}
 
-	public function cleanUp(){
+	public function cleanUp() {
 		OC_Helper::rmdirr($this->datadir);
 	}
 
-	public function __destruct(){
+	public function __destruct() {
 		$this->cleanUp();
 	}
 }
diff --git a/lib/filesystem.php b/lib/filesystem.php
index 01467b54c8..92eb4fa477 100644
--- a/lib/filesystem.php
+++ b/lib/filesystem.php
@@ -146,22 +146,22 @@ class OC_Filesystem{
 	 * @param string path
 	  * @return string
 	 */
-	static public function getMountPoint($path){
+	static public function getMountPoint($path) {
 		OC_Hook::emit(self::CLASSNAME,'get_mountpoint',array('path'=>$path));
-		if(!$path){
+		if(!$path) {
 			$path='/';
 		}
-		if($path[0]!=='/'){
+		if($path[0]!=='/') {
 			$path='/'.$path;
 		}
 		$path=str_replace('//', '/',$path);
 		$foundMountPoint='';
 		$mountPoints=array_keys(OC_Filesystem::$mounts);
-		foreach($mountPoints as $mountpoint){
-			if($mountpoint==$path){
+		foreach($mountPoints as $mountpoint) {
+			if($mountpoint==$path) {
 				return $mountpoint;
 			}
-			if(strpos($path,$mountpoint)===0 and strlen($mountpoint)>strlen($foundMountPoint)){
+			if(strpos($path,$mountpoint)===0 and strlen($mountpoint)>strlen($foundMountPoint)) {
 				$foundMountPoint=$mountpoint;
 			}
 		}
@@ -173,7 +173,7 @@ class OC_Filesystem{
 	* @param  string  path
 	* @return bool
 	*/
-	static public function getInternalPath($path){
+	static public function getInternalPath($path) {
 		$mountPoint=self::getMountPoint($path);
 		$internalPath=substr($path,strlen($mountPoint));
 		return $internalPath;
@@ -183,10 +183,10 @@ class OC_Filesystem{
 	* @param string path
 	* @return OC_Filestorage
 	*/
-	static public function getStorage($path){
+	static public function getStorage($path) {
 		$mountpoint=self::getMountPoint($path);
-		if($mountpoint){
-			if(!isset(OC_Filesystem::$storages[$mountpoint])){
+		if($mountpoint) {
+			if(!isset(OC_Filesystem::$storages[$mountpoint])) {
 				$mount=OC_Filesystem::$mounts[$mountpoint];
 				OC_Filesystem::$storages[$mountpoint]=OC_Filesystem::createStorage($mount['class'],$mount['arguments']);
 			}
@@ -194,27 +194,27 @@ class OC_Filesystem{
 		}
 	}
 
-	static public function init($root){
-		if(self::$defaultInstance){
+	static public function init($root) {
+		if(self::$defaultInstance) {
 			return false;
 		}
 		self::$defaultInstance=new OC_FilesystemView($root);
 
 		//load custom mount config
-		if(is_file(OC::$SERVERROOT.'/config/mount.php')){
+		if(is_file(OC::$SERVERROOT.'/config/mount.php')) {
 			$mountConfig=include(OC::$SERVERROOT.'/config/mount.php');
-			if(isset($mountConfig['global'])){
-				foreach($mountConfig['global'] as $mountPoint=>$options){
+			if(isset($mountConfig['global'])) {
+				foreach($mountConfig['global'] as $mountPoint=>$options) {
 					self::mount($options['class'],$options['options'],$mountPoint);
 				}
 			}
 
-			if(isset($mountConfig['group'])){
-				foreach($mountConfig['group'] as $group=>$mounts){
-					if(OC_Group::inGroup(OC_User::getUser(),$group)){
-						foreach($mounts as $mountPoint=>$options){
+			if(isset($mountConfig['group'])) {
+				foreach($mountConfig['group'] as $group=>$mounts) {
+					if(OC_Group::inGroup(OC_User::getUser(),$group)) {
+						foreach($mounts as $mountPoint=>$options) {
 							$mountPoint=self::setUserVars($mountPoint);
-							foreach($options as &$option){
+							foreach($options as &$option) {
 								$option=self::setUserVars($option);
 							}
 							self::mount($options['class'],$options['options'],$mountPoint);
@@ -223,12 +223,12 @@ class OC_Filesystem{
 				}
 			}
 
-			if(isset($mountConfig['user'])){
-				foreach($mountConfig['user'] as $user=>$mounts){
-					if($user==='all' or strtolower($user)===strtolower(OC_User::getUser())){
-						foreach($mounts as $mountPoint=>$options){
+			if(isset($mountConfig['user'])) {
+				foreach($mountConfig['user'] as $user=>$mounts) {
+					if($user==='all' or strtolower($user)===strtolower(OC_User::getUser())) {
+						foreach($mounts as $mountPoint=>$options) {
 							$mountPoint=self::setUserVars($mountPoint);
-							foreach($options as &$option){
+							foreach($options as &$option) {
 								$option=self::setUserVars($option);
 							}
 							self::mount($options['class'],$options['options'],$mountPoint);
@@ -239,7 +239,7 @@ class OC_Filesystem{
 
 			$mtime=filemtime(OC::$SERVERROOT.'/config/mount.php');
 			$previousMTime=OC_Appconfig::getValue('files','mountconfigmtime',0);
-			if($mtime>$previousMTime){//mount config has changed, filecache needs to be updated
+			if($mtime>$previousMTime) {//mount config has changed, filecache needs to be updated
 				OC_FileCache::clear();
 				OC_Appconfig::setValue('files','mountconfigmtime',$mtime);
 			}
@@ -253,7 +253,7 @@ class OC_Filesystem{
 	 * @param string intput
 	 * @return string
 	 */
-	private static function setUserVars($input){
+	private static function setUserVars($input) {
 		return str_replace('$user',OC_User::getUser(),$input);
 	}
 
@@ -261,14 +261,14 @@ class OC_Filesystem{
 	 * get the default filesystem view
 	 * @return OC_FilesystemView
 	 */
-	static public function getView(){
+	static public function getView() {
 		return self::$defaultInstance;
 	}
 
 	/**
 	 * tear down the filesystem, removing all storage providers
 	 */
-	static public function tearDown(){
+	static public function tearDown() {
 		self::$storages=array();
 	}
 
@@ -278,8 +278,8 @@ class OC_Filesystem{
 	* @param  array  arguments
 	* @return OC_Filestorage
 	*/
-	static private function createStorage($class,$arguments){
-		if(class_exists($class)){
+	static private function createStorage($class,$arguments) {
+		if(class_exists($class)) {
 			try {
 				return new $class($arguments);
 			} catch (Exception $exception) {
@@ -297,7 +297,7 @@ class OC_Filesystem{
 	* @param  string  fakeRoot
 	* @return bool
 	*/
-	static public function chroot($fakeRoot){
+	static public function chroot($fakeRoot) {
 		return self::$defaultInstance->chroot($fakeRoot);
 	}
 
@@ -307,14 +307,14 @@ class OC_Filesystem{
 	 *
 	 * Returns path like /admin/files
 	 */
-	static public function getRoot(){
+	static public function getRoot() {
 		return self::$defaultInstance->getRoot();
 	}
 
 	/**
 	 * clear all mounts and storage backends
 	 */
-	public static function clearMounts(){
+	public static function clearMounts() {
 		self::$mounts=array();
 		self::$storages=array();
 	}
@@ -324,11 +324,11 @@ class OC_Filesystem{
 	* @param OC_Filestorage storage
 	* @param string mountpoint
 	*/
-	static public function mount($class,$arguments,$mountpoint){
-		if($mountpoint[0]!='/'){
+	static public function mount($class,$arguments,$mountpoint) {
+		if($mountpoint[0]!='/') {
 			$mountpoint='/'.$mountpoint;
 		}
-		if(substr($mountpoint,-1)!=='/'){
+		if(substr($mountpoint,-1)!=='/') {
 			$mountpoint=$mountpoint.'/';
 		}
 		self::$mounts[$mountpoint]=array('class'=>$class,'arguments'=>$arguments);
@@ -340,14 +340,14 @@ class OC_Filesystem{
 	* @param string path
 	* @return string
 	*/
-	static public function getLocalFile($path){
+	static public function getLocalFile($path) {
 		return self::$defaultInstance->getLocalFile($path);
 	}
 	/**
 	 * @param string path
 	 * @return string
 	 */
-	static public function getLocalFolder($path){
+	static public function getLocalFolder($path) {
 		return self::$defaultInstance->getLocalFolder($path);
 	}
 
@@ -370,11 +370,11 @@ class OC_Filesystem{
 	 * @param string path
 	 * @return bool
 	 */
-	static public function isValidPath($path){
-		if(!$path || $path[0]!=='/'){
+	static public function isValidPath($path) {
+		if(!$path || $path[0]!=='/') {
 			$path='/'.$path;
 		}
-		if(strstr($path,'/../') || strrchr($path, '/') === '/..' ){
+		if(strstr($path,'/../') || strrchr($path, '/') === '/..' ) {
 			return false;
 		}
 		return true;
@@ -385,7 +385,7 @@ class OC_Filesystem{
 	 * Listens to write and rename hooks
 	 * @param array $data from hook
 	 */
-	static public function isBlacklisted($data){
+	static public function isBlacklisted($data) {
 		$blacklist = array('.htaccess');
 		if (isset($data['path'])) {
 			$path = $data['path'];
@@ -403,46 +403,46 @@ class OC_Filesystem{
 	/**
 	 * following functions are equivilent to their php buildin equivilents for arguments/return values.
 	 */
-	static public function mkdir($path){
+	static public function mkdir($path) {
 		return self::$defaultInstance->mkdir($path);
 	}
-	static public function rmdir($path){
+	static public function rmdir($path) {
 		return self::$defaultInstance->rmdir($path);
 	}
-	static public function opendir($path){
+	static public function opendir($path) {
 		return self::$defaultInstance->opendir($path);
 	}
-	static public function readdir($path){
+	static public function readdir($path) {
 		return self::$defaultInstance->readdir($path);
 	}
-	static public function is_dir($path){
+	static public function is_dir($path) {
 		return self::$defaultInstance->is_dir($path);
 	}
-	static public function is_file($path){
+	static public function is_file($path) {
 		return self::$defaultInstance->is_file($path);
 	}
-	static public function stat($path){
+	static public function stat($path) {
 		return self::$defaultInstance->stat($path);
 	}
-	static public function filetype($path){
+	static public function filetype($path) {
 		return self::$defaultInstance->filetype($path);
 	}
-	static public function filesize($path){
+	static public function filesize($path) {
 		return self::$defaultInstance->filesize($path);
 	}
-	static public function readfile($path){
+	static public function readfile($path) {
 		return self::$defaultInstance->readfile($path);
 	}
 	/**
 	* @deprecated Replaced by isReadable() as part of CRUDS
 	*/
-	static public function is_readable($path){
+	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){
+	static public function is_writable($path) {
 		return self::$defaultInstance->is_writable($path);
 	}
 	static public function isCreatable($path) {
@@ -460,55 +460,55 @@ class OC_Filesystem{
 	static public function isSharable($path) {
 		return self::$defaultInstance->isSharable($path);
 	}
-	static public function file_exists($path){
+	static public function file_exists($path) {
 		return self::$defaultInstance->file_exists($path);
 	}
-	static public function filectime($path){
+	static public function filectime($path) {
 		return self::$defaultInstance->filectime($path);
 	}
-	static public function filemtime($path){
+	static public function filemtime($path) {
 		return self::$defaultInstance->filemtime($path);
 	}
-	static public function touch($path, $mtime=null){
+	static public function touch($path, $mtime=null) {
 		return self::$defaultInstance->touch($path, $mtime);
 	}
-	static public function file_get_contents($path){
+	static public function file_get_contents($path) {
 		return self::$defaultInstance->file_get_contents($path);
 	}
-	static public function file_put_contents($path,$data){
+	static public function file_put_contents($path,$data) {
 		return self::$defaultInstance->file_put_contents($path,$data);
 	}
-	static public function unlink($path){
+	static public function unlink($path) {
 		return self::$defaultInstance->unlink($path);
 	}
-	static public function rename($path1,$path2){
+	static public function rename($path1,$path2) {
 		return self::$defaultInstance->rename($path1,$path2);
 	}
-	static public function copy($path1,$path2){
+	static public function copy($path1,$path2) {
 		return self::$defaultInstance->copy($path1,$path2);
 	}
-	static public function fopen($path,$mode){
+	static public function fopen($path,$mode) {
 		return self::$defaultInstance->fopen($path,$mode);
 	}
-	static public function toTmpFile($path){
+	static public function toTmpFile($path) {
 		return self::$defaultInstance->toTmpFile($path);
 	}
-	static public function fromTmpFile($tmpFile,$path){
+	static public function fromTmpFile($tmpFile,$path) {
 		return self::$defaultInstance->fromTmpFile($tmpFile,$path);
 	}
 
-	static public function getMimeType($path){
+	static public function getMimeType($path) {
 		return self::$defaultInstance->getMimeType($path);
 	}
-	static public function hash($type,$path, $raw = false){
+	static public function hash($type,$path, $raw = false) {
 		return self::$defaultInstance->hash($type,$path, $raw);
 	}
 
-	static public function free_space($path='/'){
+	static public function free_space($path='/') {
 		return self::$defaultInstance->free_space($path);
 	}
 
-	static public function search($query){
+	static public function search($query) {
 		return OC_FileCache::search($query);
 	}
 
@@ -517,7 +517,7 @@ class OC_Filesystem{
 	 * @param int $time
 	 * @return bool
 	 */
-	static public function hasUpdated($path,$time){
+	static public function hasUpdated($path,$time) {
 		return self::$defaultInstance->hasUpdated($path,$time);
 	}
 
@@ -536,26 +536,26 @@ class OC_Filesystem{
 	 * @param bool $stripTrailingSlash
 	 * @return string
 	 */
-	public static function normalizePath($path,$stripTrailingSlash=true){
-		if($path==''){
+	public static function normalizePath($path,$stripTrailingSlash=true) {
+		if($path=='') {
 			return '/';
 		}
 		//no windows style slashes
 		$path=str_replace('\\','/',$path);
 		//add leading slash
-		if($path[0]!=='/'){
+		if($path[0]!=='/') {
 			$path='/'.$path;
 		}
 		//remove trainling slash
-		if($stripTrailingSlash and 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
-		while(strpos($path,'//')!==false){
+		while(strpos($path,'//')!==false) {
 			$path=str_replace('//','/',$path);
 		}
 		//normalize unicode if possible
-		if(class_exists('Normalizer')){
+		if(class_exists('Normalizer')) {
 			$path=Normalizer::normalize($path);
 		}
 		return $path;
diff --git a/lib/filesystemview.php b/lib/filesystemview.php
index 461a026256..743f940301 100644
--- a/lib/filesystemview.php
+++ b/lib/filesystemview.php
@@ -48,10 +48,10 @@ class OC_FilesystemView {
 	}
 
 	public function getAbsolutePath($path) {
-		if(!$path){
+		if(!$path) {
 			$path='/';
 		}
-		if($path[0]!=='/'){
+		if($path[0]!=='/') {
 			$path='/'.$path;
 		}
 		return $this->fakeRoot.$path;
@@ -63,7 +63,7 @@ class OC_FilesystemView {
 	* @return bool
 	*/
 	public function chroot($fakeRoot) {
-		if(!$fakeRoot==''){
+		if(!$fakeRoot=='') {
 			if($fakeRoot[0]!=='/') {
 				$fakeRoot='/'.$fakeRoot;
 			}
@@ -104,7 +104,7 @@ class OC_FilesystemView {
 			return null;
 		}else{
 			$path=substr($path, strlen($this->fakeRoot));
-			if(strlen($path)===0){
+			if(strlen($path)===0) {
 				return '/';
 			}else{
 				return $path;
@@ -177,13 +177,13 @@ class OC_FilesystemView {
 		return $fsLocal->readdir( $handle );
 	}
 	public function is_dir($path) {
-		if($path=='/'){
+		if($path=='/') {
 			return true;
 		}
 		return $this->basicOperation('is_dir', $path);
 	}
 	public function is_file($path) {
-		if($path=='/'){
+		if($path=='/') {
 			return false;
 		}
 		return $this->basicOperation('is_file', $path);
@@ -214,13 +214,13 @@ class OC_FilesystemView {
 	/**
 	* @deprecated Replaced by isReadable() as part of CRUDS
 	*/
-	public function is_readable($path){
+	public function is_readable($path) {
 		return $this->basicOperation('isReadable',$path);
 	}
 	/**
 	* @deprecated Replaced by isCreatable(), isUpdatable(), isDeletable() as part of CRUDS
 	*/
-	public function is_writable($path){
+	public function is_writable($path) {
 		return $this->basicOperation('isUpdatable',$path);
 	}
 	public function isCreatable($path) {
@@ -239,7 +239,7 @@ class OC_FilesystemView {
 		return $this->basicOperation('isSharable', $path);
 	}
 	public function file_exists($path) {
-		if($path=='/'){
+		if($path=='/') {
 			return true;
 		}
 		return $this->basicOperation('file_exists', $path);
@@ -411,7 +411,7 @@ class OC_FilesystemView {
 			if($run) {
 				$mp1=$this->getMountPoint($path1.$postFix1);
 				$mp2=$this->getMountPoint($path2.$postFix2);
-				if($mp1 == $mp2){
+				if($mp1 == $mp2) {
 					if($storage = $this->getStorage($path1.$postFix1)) {
 						$result=$storage->copy($this->getInternalPath($path1.$postFix1), $this->getInternalPath($path2.$postFix2));
 					}
@@ -579,7 +579,7 @@ class OC_FilesystemView {
 		return null;
 	}
 
-	private function runHooks($hooks,$path,$post=false){
+	private function runHooks($hooks,$path,$post=false) {
 		$prefix=($post)?'post_':'';
 		$run=true;
 		if(OC_Filesystem::$loaded and $this->fakeRoot==OC_Filesystem::getRoot()) {
diff --git a/lib/geo.php b/lib/geo.php
index 964605b1c1..4eb785da35 100644
--- a/lib/geo.php
+++ b/lib/geo.php
@@ -12,11 +12,11 @@ class OC_Geo{
 	 * @param (string) $longitude - Longitude
 	 * @return (string) $timezone - closest timezone
 	 */
-	public static function timezone($latitude, $longitude){
+	public static function timezone($latitude, $longitude) {
 		$alltimezones = DateTimeZone::listIdentifiers();
 		$variances = array();
 		//calculate for all timezones the system know
-		foreach($alltimezones as $timezone){
+		foreach($alltimezones as $timezone) {
 			$datetimezoneobj = new DateTimeZone($timezone);
 			$locationinformations = $datetimezoneobj->getLocation();
 			$latitudeoftimezone = $locationinformations['latitude'];
diff --git a/lib/group.php b/lib/group.php
index dd70a94eb0..b56a4ad456 100644
--- a/lib/group.php
+++ b/lib/group.php
@@ -42,8 +42,8 @@ class OC_Group {
 	 * @param  string  $backend  The backend to use for user managment
 	 * @returns true/false
 	 */
-	public static function useBackend( $backend ){
-		if($backend instanceof OC_Group_Interface){
+	public static function useBackend( $backend ) {
+		if($backend instanceof OC_Group_Interface) {
 			self::$_usedBackends[]=$backend;
 		}
 	}
@@ -51,7 +51,7 @@ class OC_Group {
 	/**
 	 * remove all used backends
 	 */
-	public static function clearBackends(){
+	public static function clearBackends() {
 		self::$_usedBackends=array();
 	}
 
@@ -65,27 +65,27 @@ class OC_Group {
 	 *
 	 * Allowed characters in the username are: "a-z", "A-Z", "0-9" and "_.@-"
 	 */
-	public static function createGroup( $gid ){
+	public static function createGroup( $gid ) {
 		// Check the name for bad characters
 		// Allowed are: "a-z", "A-Z", "0-9" and "_.@-"
-		if( preg_match( '/[^a-zA-Z0-9 _\.@\-]/', $gid )){
+		if( preg_match( '/[^a-zA-Z0-9 _\.@\-]/', $gid )) {
 			return false;
 		}
 		// No empty group names!
-		if( !$gid ){
+		if( !$gid ) {
 			return false;
 		}
 		// No duplicate group names
-		if( in_array( $gid, self::getGroups())){
+		if( in_array( $gid, self::getGroups())) {
 			return false;
 		}
 
 		$run = true;
 		OC_Hook::emit( "OC_Group", "pre_createGroup", array( "run" => &$run, "gid" => $gid ));
 
-		if($run){
+		if($run) {
 			//create the group in the first backend that supports creating groups
-			foreach(self::$_usedBackends as $backend){
+			foreach(self::$_usedBackends as $backend) {
 				if(!$backend->implementsActions(OC_GROUP_BACKEND_CREATE_GROUP))
 					continue;
 
@@ -106,18 +106,18 @@ class OC_Group {
 	 *
 	 * Deletes a group and removes it from the group_user-table
 	 */
-	public static function deleteGroup( $gid ){
+	public static function deleteGroup( $gid ) {
 		// Prevent users from deleting group admin
-		if( $gid == "admin" ){
+		if( $gid == "admin" ) {
 			return false;
 		}
 
 		$run = true;
 		OC_Hook::emit( "OC_Group", "pre_deleteGroup", array( "run" => &$run, "gid" => $gid ));
 
-		if($run){
+		if($run) {
 			//delete the group from all backends
-			foreach(self::$_usedBackends as $backend){
+			foreach(self::$_usedBackends as $backend) {
 				if(!$backend->implementsActions(OC_GROUP_BACKEND_DELETE_GROUP))
 					continue;
 
@@ -139,9 +139,9 @@ class OC_Group {
 	 *
 	 * Checks whether the user is member of a group or not.
 	 */
-	public static function inGroup( $uid, $gid ){
-		foreach(self::$_usedBackends as $backend){
-			if($backend->inGroup($uid,$gid)){
+	public static function inGroup( $uid, $gid ) {
+		foreach(self::$_usedBackends as $backend) {
+			if($backend->inGroup($uid,$gid)) {
 				return true;
 			}
 		}
@@ -156,9 +156,9 @@ class OC_Group {
 	 *
 	 * Adds a user to a group.
 	 */
-	public static function addToGroup( $uid, $gid ){
+	public static function addToGroup( $uid, $gid ) {
 		// Does the group exist?
-		if( !OC_Group::groupExists($gid)){
+		if( !OC_Group::groupExists($gid)) {
 			return false;
 		}
 
@@ -166,19 +166,19 @@ class OC_Group {
 		$run = true;
 		OC_Hook::emit( "OC_Group", "pre_addToGroup", array( "run" => &$run, "uid" => $uid, "gid" => $gid ));
 
-		if($run){
+		if($run) {
 			$succes=false;
 
 			//add the user to the all backends that have the group
-			foreach(self::$_usedBackends as $backend){
+			foreach(self::$_usedBackends as $backend) {
 				if(!$backend->implementsActions(OC_GROUP_BACKEND_ADD_TO_GROUP))
 					continue;
 
-				if($backend->groupExists($gid)){
+				if($backend->groupExists($gid)) {
 					$succes|=$backend->addToGroup($uid, $gid);
 				}
 			}
-			if($succes){
+			if($succes) {
 				OC_Hook::emit( "OC_User", "post_addToGroup", array( "uid" => $uid, "gid" => $gid ));
 			}
 			return $succes;
@@ -195,13 +195,13 @@ class OC_Group {
 	 *
 	 * removes the user from a group.
 	 */
-	public static function removeFromGroup( $uid, $gid ){
+	public static function removeFromGroup( $uid, $gid ) {
 		$run = true;
 		OC_Hook::emit( "OC_Group", "pre_removeFromGroup", array( "run" => &$run, "uid" => $uid, "gid" => $gid ));
 
-		if($run){
+		if($run) {
 			//remove the user from the all backends that have the group
-			foreach(self::$_usedBackends as $backend){
+			foreach(self::$_usedBackends as $backend) {
 				if(!$backend->implementsActions(OC_GROUP_BACKEND_REMOVE_FROM_GOUP))
 					continue;
 
@@ -222,9 +222,9 @@ class OC_Group {
 	 * 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 static function getUserGroups( $uid ) {
 		$groups=array();
-		foreach(self::$_usedBackends as $backend){
+		foreach(self::$_usedBackends as $backend) {
 			$groups=array_merge($backend->getUserGroups($uid),$groups);
 		}
 		asort($groups);
@@ -251,9 +251,9 @@ class OC_Group {
 	 * @param string $gid
 	 * @return bool
 	 */
-	public static function groupExists($gid){
-		foreach(self::$_usedBackends as $backend){
-			if ($backend->groupExists($gid)){
+	public static function groupExists($gid) {
+		foreach(self::$_usedBackends as $backend) {
+			if ($backend->groupExists($gid)) {
 				return true;
 			}
 		}
@@ -266,7 +266,7 @@ class OC_Group {
 	 */
 	public static function usersInGroup($gid, $search = '', $limit = -1, $offset = 0) {
 		$users=array();
-		foreach(self::$_usedBackends as $backend){
+		foreach(self::$_usedBackends as $backend) {
 			$users = array_merge($backend->usersInGroup($gid, $search, $limit, $offset), $users);
 		}
 		return $users;
diff --git a/lib/group/backend.php b/lib/group/backend.php
index 5969986c65..1ba34c940c 100644
--- a/lib/group/backend.php
+++ b/lib/group/backend.php
@@ -52,9 +52,9 @@ abstract class OC_Group_Backend implements OC_Group_Interface {
 	* Returns the supported actions as int to be
 	* compared with OC_USER_BACKEND_CREATE_USER etc.
 	*/
-	public function getSupportedActions(){
+	public function getSupportedActions() {
 		$actions = 0;
-		foreach($this->possibleActions AS $action => $methodName){
+		foreach($this->possibleActions AS $action => $methodName) {
 			if(method_exists($this, $methodName)) {
 				$actions |= $action;
 			}
@@ -71,7 +71,7 @@ abstract class OC_Group_Backend implements OC_Group_Interface {
 	* Returns the supported actions as int to be
 	* compared with OC_GROUP_BACKEND_CREATE_GROUP etc.
 	*/
-	public function implementsActions($actions){
+	public function implementsActions($actions) {
 		return (bool)($this->getSupportedActions() & $actions);
 	}
 
@@ -83,7 +83,7 @@ abstract class OC_Group_Backend implements OC_Group_Interface {
 	 *
 	 * Checks whether the user is member of a group or not.
 	 */
-	public 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 implements OC_Group_Interface {
 	 * This function fetches all groups a user belongs to. It does not check
 	 * if the user exists at all.
 	 */
-	public function getUserGroups($uid){
+	public function getUserGroups($uid) {
 		return array();
 	}
 
@@ -115,7 +115,7 @@ abstract class OC_Group_Backend implements OC_Group_Interface {
 	 * @param string $gid
 	 * @return bool
 	 */
-	public function groupExists($gid){
+	public function groupExists($gid) {
 		return in_array($gid, $this->getGroups($gid, 1));
 	}
 
diff --git a/lib/group/database.php b/lib/group/database.php
index 52608b2db7..f3012563ac 100644
--- a/lib/group/database.php
+++ b/lib/group/database.php
@@ -50,12 +50,12 @@ 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 function createGroup( $gid ){
+	public function createGroup( $gid ) {
 		// Check for existence
 		$stmt = OC_DB::prepare( "SELECT `gid` FROM `*PREFIX*groups` WHERE `gid` = ?" );
 		$result = $stmt->execute( array( $gid ));
 
-		if( $result->fetchRow() ){
+		if( $result->fetchRow() ) {
 			// Can not add an existing group
 			return false;
 		}
@@ -75,7 +75,7 @@ class OC_Group_Database extends OC_Group_Backend {
 	 *
 	 * Deletes a group and removes it from the group_user-table
 	 */
-	public function deleteGroup( $gid ){
+	public function deleteGroup( $gid ) {
 		// Delete the group
 		$stmt = OC_DB::prepare( "DELETE FROM `*PREFIX*groups` WHERE `gid` = ?" );
 		$result = $stmt->execute( array( $gid ));
@@ -95,7 +95,7 @@ class OC_Group_Database extends OC_Group_Backend {
 	 *
 	 * Checks whether the user is member of a group or not.
 	 */
-	public function inGroup( $uid, $gid ){
+	public function inGroup( $uid, $gid ) {
 		// check
 		$stmt = OC_DB::prepare( "SELECT `uid` FROM `*PREFIX*group_user` WHERE `gid` = ? AND `uid` = ?" );
 		$result = $stmt->execute( array( $gid, $uid ));
@@ -111,9 +111,9 @@ class OC_Group_Database extends OC_Group_Backend {
 	 *
 	 * Adds a user to a group.
 	 */
-	public function addToGroup( $uid, $gid ){
+	public function addToGroup( $uid, $gid ) {
 		// No duplicate entries!
-		if( !$this->inGroup( $uid, $gid )){
+		if( !$this->inGroup( $uid, $gid )) {
 			$stmt = OC_DB::prepare( "INSERT INTO `*PREFIX*group_user` ( `uid`, `gid` ) VALUES( ?, ? )" );
 			$stmt->execute( array( $uid, $gid ));
 			return true;
@@ -130,7 +130,7 @@ class OC_Group_Database extends OC_Group_Backend {
 	 *
 	 * removes the user from a group.
 	 */
-	public function removeFromGroup( $uid, $gid ){
+	public function removeFromGroup( $uid, $gid ) {
 		$stmt = OC_DB::prepare( "DELETE FROM `*PREFIX*group_user` WHERE `uid` = ? AND `gid` = ?" );
 		$stmt->execute( array( $uid, $gid ));
 
@@ -145,13 +145,13 @@ 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 function getUserGroups( $uid ){
+	public function getUserGroups( $uid ) {
 		// No magic!
 		$stmt = OC_DB::prepare( "SELECT `gid` FROM `*PREFIX*group_user` WHERE `uid` = ?" );
 		$result = $stmt->execute( array( $uid ));
 
 		$groups = array();
-		while( $row = $result->fetchRow()){
+		while( $row = $result->fetchRow()) {
 			$groups[] = $row["gid"];
 		}
 
diff --git a/lib/group/dummy.php b/lib/group/dummy.php
index 51eca28f3f..8116dcbd67 100644
--- a/lib/group/dummy.php
+++ b/lib/group/dummy.php
@@ -34,8 +34,8 @@ class OC_Group_Dummy extends OC_Group_Backend {
 	 * Trys to create a new group. If the group name already exists, false will
 	 * be returned.
 	 */
-	public function createGroup($gid){
-		if(!isset($this->groups[$gid])){
+	public function createGroup($gid) {
+		if(!isset($this->groups[$gid])) {
 			$this->groups[$gid]=array();
 			return true;
 		}else{
@@ -50,8 +50,8 @@ class OC_Group_Dummy extends OC_Group_Backend {
 	 *
 	 * Deletes a group and removes it from the group_user-table
 	 */
-	public function deleteGroup($gid){
-		if(isset($this->groups[$gid])){
+	public function deleteGroup($gid) {
+		if(isset($this->groups[$gid])) {
 			unset($this->groups[$gid]);
 			return true;
 		}else{
@@ -67,8 +67,8 @@ class OC_Group_Dummy extends OC_Group_Backend {
 	 *
 	 * Checks whether the user is member of a group or not.
 	 */
-	public function inGroup($uid, $gid){
-		if(isset($this->groups[$gid])){
+	public function inGroup($uid, $gid) {
+		if(isset($this->groups[$gid])) {
 			return (array_search($uid,$this->groups[$gid])!==false);
 		}else{
 			return false;
@@ -83,9 +83,9 @@ class OC_Group_Dummy extends OC_Group_Backend {
 	 *
 	 * Adds a user to a group.
 	 */
-	public function addToGroup($uid, $gid){
-		if(isset($this->groups[$gid])){
-			if(array_search($uid,$this->groups[$gid])===false){
+	public function addToGroup($uid, $gid) {
+		if(isset($this->groups[$gid])) {
+			if(array_search($uid,$this->groups[$gid])===false) {
 				$this->groups[$gid][]=$uid;
 				return true;
 			}else{
@@ -104,9 +104,9 @@ class OC_Group_Dummy extends OC_Group_Backend {
 	 *
 	 * removes the user from a group.
 	 */
-	public function removeFromGroup($uid,$gid){
-		if(isset($this->groups[$gid])){
-			if(($index=array_search($uid,$this->groups[$gid]))!==false){
+	public function removeFromGroup($uid,$gid) {
+		if(isset($this->groups[$gid])) {
+			if(($index=array_search($uid,$this->groups[$gid]))!==false) {
 				unset($this->groups[$gid][$index]);
 			}else{
 				return false;
@@ -124,11 +124,11 @@ class OC_Group_Dummy extends OC_Group_Backend {
 	 * This function fetches all groups a user belongs to. It does not check
 	 * if the user exists at all.
 	 */
-	public function getUserGroups($uid){
+	public function getUserGroups($uid) {
 		$groups=array();
 		$allGroups=array_keys($this->groups);
-		foreach($allGroups as $group){
-			if($this->inGroup($uid,$group)){
+		foreach($allGroups as $group) {
+			if($this->inGroup($uid,$group)) {
 				$groups[]=$group;
 			}
 		}
@@ -150,7 +150,7 @@ class OC_Group_Dummy extends OC_Group_Backend {
 	 * @returns array with user ids
 	 */
 	public function usersInGroup($gid, $search = '', $limit = -1, $offset = 0) {
-		if(isset($this->groups[$gid])){
+		if(isset($this->groups[$gid])) {
 			return $this->groups[$gid];
 		}else{
 			return array();
diff --git a/lib/helper.php b/lib/helper.php
index ea43304da5..70b2f78862 100644
--- a/lib/helper.php
+++ b/lib/helper.php
@@ -37,12 +37,12 @@ class OC_Helper {
 	 *
 	 * Returns a url to the given app and file.
 	 */
-	public static function linkTo( $app, $file, $args = array() ){
-		if( $app != '' ){
+	public static function linkTo( $app, $file, $args = array() ) {
+		if( $app != '' ) {
 			$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( $app_path && file_exists( $app_path.'/'.$file )) {
+				if(substr($file, -3) == 'php' || substr($file, -3) == 'css') {
 					$urlLinkTo =  OC::$WEBROOT . '/?app=' . $app;
 					$urlLinkTo .= ($file!='index.php')?'&getfile=' . urlencode($file):'';
 				}else{
@@ -54,7 +54,7 @@ class OC_Helper {
 			}
 		}
 		else{
-			if( file_exists( OC::$SERVERROOT . '/core/'. $file )){
+			if( file_exists( OC::$SERVERROOT . '/core/'. $file )) {
 				$urlLinkTo =  OC::$WEBROOT . '/core/'.$file;
 			}
 			else{
@@ -125,22 +125,22 @@ 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" );
 
 		// Check if the app is in the app folder
-		if( file_exists( OC::$SERVERROOT."/themes/$theme/apps/$app/img/$image" )){
+		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" )){
+		}elseif( file_exists(OC_App::getAppPath($app)."/img/$image" )) {
 			return OC_App::getAppWebPath($app)."/img/$image";
-		}elseif( !empty( $app ) and file_exists( OC::$SERVERROOT."/themes/$theme/$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" )){
+		}elseif( !empty( $app ) and file_exists( OC::$SERVERROOT."/$app/img/$image" )) {
 			return OC::$WEBROOT."/$app/img/$image";
-		}elseif( file_exists( OC::$SERVERROOT."/themes/$theme/core/img/$image" )){
+		}elseif( file_exists( OC::$SERVERROOT."/themes/$theme/core/img/$image" )) {
 			return OC::$WEBROOT."/themes/$theme/core/img/$image";
-		}elseif( file_exists( OC::$SERVERROOT."/core/img/$image" )){
+		}elseif( file_exists( OC::$SERVERROOT."/core/img/$image" )) {
 			return OC::$WEBROOT."/core/img/$image";
 		}else{
 			echo('image not found: image:'.$image.' webroot:'.OC::$WEBROOT.' serverroot:'.OC::$SERVERROOT);
@@ -155,26 +155,26 @@ class OC_Helper {
 	 *
 	 * Returns the path to the image of this file type.
 	 */
-	public static function mimetypeIcon( $mimetype ){
+	public static function mimetypeIcon( $mimetype ) {
 		$alias=array('application/xml'=>'code/xml');
-		if(isset($alias[$mimetype])){
+		if(isset($alias[$mimetype])) {
 			$mimetype=$alias[$mimetype];
 		}
 		// Replace slash with a minus
 		$mimetype = str_replace( "/", "-", $mimetype );
 
 		// Is it a dir?
-		if( $mimetype == "dir" ){
+		if( $mimetype == "dir" ) {
 			return OC::$WEBROOT."/core/img/filetypes/folder.png";
 		}
 
 		// Icon exists?
-		if( file_exists( OC::$SERVERROOT."/core/img/filetypes/$mimetype.png" )){
+		if( file_exists( OC::$SERVERROOT."/core/img/filetypes/$mimetype.png" )) {
 			return OC::$WEBROOT."/core/img/filetypes/$mimetype.png";
 		}
 		//try only the first part of the filetype
 		$mimetype=substr($mimetype,0,strpos($mimetype,'-'));
-		if( file_exists( OC::$SERVERROOT."/core/img/filetypes/$mimetype.png" )){
+		if( file_exists( OC::$SERVERROOT."/core/img/filetypes/$mimetype.png" )) {
 			return OC::$WEBROOT."/core/img/filetypes/$mimetype.png";
 		}
 		else{
@@ -189,16 +189,16 @@ class OC_Helper {
 	 *
 	 * Makes 2048 to 2 kB.
 	 */
-	public static function humanFileSize( $bytes ){
-		if( $bytes < 1024 ){
+	public static function humanFileSize( $bytes ) {
+		if( $bytes < 1024 ) {
 			return "$bytes B";
 		}
 		$bytes = round( $bytes / 1024, 1 );
-		if( $bytes < 1024 ){
+		if( $bytes < 1024 ) {
 			return "$bytes kB";
 		}
 		$bytes = round( $bytes / 1024, 1 );
-		if( $bytes < 1024 ){
+		if( $bytes < 1024 ) {
 			return "$bytes MB";
 		}
 
@@ -216,7 +216,7 @@ class OC_Helper {
 	 *
 	 * Inspired by: http://www.php.net/manual/en/function.filesize.php#92418
 	 */
-	public static function computerFileSize( $str ){
+	public static function computerFileSize( $str ) {
 		$bytes = 0;
 		$str=strtolower($str);
 
@@ -280,17 +280,17 @@ class OC_Helper {
 	 *
 	 */
 	static function copyr($src, $dest) {
-		if(is_dir($src)){
-			if(!is_dir($dest)){
+		if(is_dir($src)) {
+			if(!is_dir($dest)) {
 				mkdir($dest);
 			}
 			$files = scandir($src);
-			foreach ($files as $file){
-				if ($file != "." && $file != ".."){
+			foreach ($files as $file) {
+				if ($file != "." && $file != "..") {
 					self::copyr("$src/$file", "$dest/$file");
 				}
 			}
-		}elseif(file_exists($src)){
+		}elseif(file_exists($src)) {
 			copy($src, $dest);
 		}
 	}
@@ -303,13 +303,13 @@ class OC_Helper {
 	static function rmdirr($dir) {
 		if(is_dir($dir)) {
 			$files=scandir($dir);
-			foreach($files as $file){
-				if ($file != "." && $file != ".."){
+			foreach($files as $file) {
+				if ($file != "." && $file != "..") {
 					self::rmdirr("$dir/$file");
 				}
 			}
 			rmdir($dir);
-		}elseif(file_exists($dir)){
+		}elseif(file_exists($dir)) {
 			unlink($dir);
 		}
 		if(file_exists($dir)) {
@@ -323,7 +323,7 @@ class OC_Helper {
 	 * @return string
 	 * does NOT work for ownClouds filesystem, use OC_FileSystem::getMimeType instead
 	 */
-	static function getMimeType($path){
+	static function getMimeType($path) {
 		$isWrapped=(strpos($path,'://')!==false) and (substr($path,0,7)=='file://');
 
 		if (@is_dir($path)) {
@@ -331,9 +331,9 @@ class OC_Helper {
 			return "httpd/unix-directory";
 		}
 
-		if(strpos($path,'.')){
+		if(strpos($path,'.')) {
 			//try to guess the type by the file extension
-			if(!self::$mimetypes || self::$mimetypes != include('mimetypes.list.php')){
+			if(!self::$mimetypes || self::$mimetypes != include('mimetypes.list.php')) {
 				self::$mimetypes=include('mimetypes.list.php');
 			}
 			$extension=strtolower(strrchr(basename($path), "."));
@@ -343,9 +343,9 @@ class OC_Helper {
 			$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)){
+		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){
+			if($info) {
 				$mimeType=substr($info,0,strpos($info,';'));
 			}
 			finfo_close($finfo);
@@ -379,8 +379,8 @@ class OC_Helper {
 	 * @param string data
 	 * @return string
 	 */
-	static function getStringMimeType($data){
-		if(function_exists('finfo_open') and function_exists('finfo_file')){
+	static function getStringMimeType($data) {
+		if(function_exists('finfo_open') and function_exists('finfo_file')) {
 			$finfo=finfo_open(FILEINFO_MIME);
 			return finfo_buffer($finfo, $data);
 		}else{
@@ -429,7 +429,7 @@ class OC_Helper {
 	* @param  string  optional search path, defaults to $PATH
 	* @return bool    true if executable program found in path
 	*/
-	public static function canExecute($name, $path = false){
+	public static function canExecute($name, $path = false) {
 		// path defaults to PATH from environment if not set
 		if ($path === false) {
 			$path = getenv("PATH");
@@ -473,12 +473,12 @@ class OC_Helper {
 	 * @param resource target
 	 * @return int the number of bytes copied
 	 */
-	public static function streamCopy($source,$target){
-		if(!$source or !$target){
+	public static function streamCopy($source,$target) {
+		if(!$source or !$target) {
 			return false;
 		}
 		$count=0;
-		while(!feof($source)){
+		while(!feof($source)) {
 			$count+=fwrite($target,fread($source,8192));
 		}
 		return $count;
@@ -491,7 +491,7 @@ class OC_Helper {
 	 *
 	 * temporary files are automatically cleaned up after the script is finished
 	 */
-	public static function tmpFile($postfix=''){
+	public static function tmpFile($postfix='') {
 		$file=get_temp_dir().'/'.md5(time().rand()).$postfix;
 		$fh=fopen($file,'w');
 		fclose($fh);
@@ -505,7 +505,7 @@ class OC_Helper {
 	 *
 	 * temporary files are automatically cleaned up after the script is finished
 	 */
-	public static function tmpFolder(){
+	public static function tmpFolder() {
 		$path=get_temp_dir().'/'.md5(time().rand());
 		mkdir($path);
 		self::$tmpFiles[]=$path;
@@ -515,9 +515,9 @@ class OC_Helper {
 	/**
 	 * remove all files created by self::tmpFile
 	 */
-	public static function cleanTmp(){
+	public static function cleanTmp() {
 		$leftoversFile=get_temp_dir().'/oc-not-deleted';
-		if(file_exists($leftoversFile)){
+		if(file_exists($leftoversFile)) {
 			$leftovers=file($leftoversFile);
 			foreach($leftovers as $file) {
 				self::rmdirr($file);
@@ -525,8 +525,8 @@ class OC_Helper {
 			unlink($leftoversFile);
 		}
 
-		foreach(self::$tmpFiles as $file){
-			if(file_exists($file)){
+		foreach(self::$tmpFiles as $file) {
+			if(file_exists($file)) {
 				if(!self::rmdirr($file)) {
 					file_put_contents($leftoversFile, $file."\n", FILE_APPEND);
 				}
@@ -541,8 +541,8 @@ class OC_Helper {
 	* @param $filename
 	* @return string
 	*/
-	public static function buildNotExistingFileName($path, $filename){
-		if($path==='/'){
+	public static function buildNotExistingFileName($path, $filename) {
+		if($path==='/') {
 			$path='';
 		}
 		if ($pos = strrpos($filename, '.')) {
@@ -571,21 +571,21 @@ class OC_Helper {
 	 * @param $parent
 	 * @return bool
 	 */
-	public static function issubdirectory($sub, $parent){
-		if($sub == null || $sub == '' || $parent == null || $parent == ''){
+	public static function issubdirectory($sub, $parent) {
+		if($sub == null || $sub == '' || $parent == null || $parent == '') {
 			return false;
 		}
 		$realpath_sub = realpath($sub);
 		$realpath_parent = realpath($parent);
-		if(($realpath_sub == false && substr_count($realpath_sub, './') != 0) || ($realpath_parent == false && substr_count($realpath_parent, './') != 0)){ //it checks for  both ./ and ../
+		if(($realpath_sub == false && substr_count($realpath_sub, './') != 0) || ($realpath_parent == false && substr_count($realpath_parent, './') != 0)) { //it checks for  both ./ and ../
 			return false;
 		}
-		if($realpath_sub && $realpath_sub != '' && $realpath_parent && $realpath_parent != ''){
-			if(substr($realpath_sub, 0, strlen($realpath_parent)) == $realpath_parent){
+		if($realpath_sub && $realpath_sub != '' && $realpath_parent && $realpath_parent != '') {
+			if(substr($realpath_sub, 0, strlen($realpath_parent)) == $realpath_parent) {
 				return true;
 			}
 		}else{
-			if(substr($sub, 0, strlen($parent)) == $parent){
+			if(substr($sub, 0, strlen($parent)) == $parent) {
 				return true;
 			}
 		}
@@ -610,7 +610,7 @@ class OC_Helper {
 	* 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'){
+	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) {
diff --git a/lib/hook.php b/lib/hook.php
index ee390d6cd5..1bf80f604f 100644
--- a/lib/hook.php
+++ b/lib/hook.php
@@ -19,12 +19,12 @@ class OC_Hook{
 	 *
 	 * TODO: write example
 	 */
-	static public function connect( $signalclass, $signalname, $slotclass, $slotname ){
+	static public function connect( $signalclass, $signalname, $slotclass, $slotname ) {
 		// Create the data structure
-		if( !array_key_exists( $signalclass, self::$registered )){
+		if( !array_key_exists( $signalclass, self::$registered )) {
 			self::$registered[$signalclass] = array();
 		}
-		if( !array_key_exists( $signalname, self::$registered[$signalclass] )){
+		if( !array_key_exists( $signalname, self::$registered[$signalclass] )) {
 			self::$registered[$signalclass][$signalname] = array();
 		}
 
@@ -48,17 +48,17 @@ class OC_Hook{
 	 *
 	 * TODO: write example
 	 */
-	static public function emit( $signalclass, $signalname, $params = array()){
+	static public function emit( $signalclass, $signalname, $params = array()) {
 		// Return false if there are no slots
-		if( !array_key_exists( $signalclass, self::$registered )){
+		if( !array_key_exists( $signalclass, self::$registered )) {
 			return false;
 		}
-		if( !array_key_exists( $signalname, self::$registered[$signalclass] )){
+		if( !array_key_exists( $signalname, self::$registered[$signalclass] )) {
 			return false;
 		}
 
 		// Call all slots
-		foreach( self::$registered[$signalclass][$signalname] as $i ){
+		foreach( self::$registered[$signalclass][$signalname] as $i ) {
 			call_user_func( array( $i["class"], $i["name"] ), $params );
 		}
 
@@ -71,9 +71,9 @@ class OC_Hook{
 	 * @param string signalclass
 	 * @param string signalname
 	 */
-	static public function clear($signalclass='', $signalname=''){
-		if($signalclass){
-			if($signalname){
+	static public function clear($signalclass='', $signalname='') {
+		if($signalclass) {
+			if($signalname) {
 				self::$registered[$signalclass][$signalname]=array();
 			}else{
 				self::$registered[$signalclass]=array();
diff --git a/lib/image.php b/lib/image.php
index e87cf9e16d..f4b3c2cc07 100644
--- a/lib/image.php
+++ b/lib/image.php
@@ -262,7 +262,7 @@ class OC_Image {
 	* @returns The orientation or -1 if no EXIF data is available.
 	*/
 	public function getOrientation() {
-		if(!is_callable('exif_read_data')){
+		if(!is_callable('exif_read_data')) {
 			OC_Log::write('core','OC_Image->fixOrientation() Exif module not enabled.', OC_Log::DEBUG);
 			return -1;
 		}
@@ -612,7 +612,7 @@ class OC_Image {
 			$y = ($height_orig/2) - ($height/2);
 			$x = 0;
 		}
-		if($size>0){
+		if($size>0) {
 			$targetWidth=$size;
 			$targetHeight=$size;
 		}else{
@@ -666,14 +666,14 @@ class OC_Image {
 		return true;
 	}
 
-	public function destroy(){
-		if($this->valid()){
+	public function destroy() {
+		if($this->valid()) {
 			imagedestroy($this->resource);
 		}
 		$this->resource=null;
 	}
 
-	public function __destruct(){
+	public function __destruct() {
 		$this->destroy();
 	}
 }
diff --git a/lib/installer.php b/lib/installer.php
index b8a3226aa0..9135c60fc0 100644
--- a/lib/installer.php
+++ b/lib/installer.php
@@ -55,22 +55,22 @@ class OC_Installer{
 	 * It is the task of oc_app_install to create the tables and do whatever is
 	 * needed to get the app working.
 	 */
-	public static function installApp( $data = array()){
-		if(!isset($data['source'])){
+	public static function installApp( $data = array()) {
+		if(!isset($data['source'])) {
 			OC_Log::write('core','No source specified when installing app',OC_Log::ERROR);
 			return false;
 		}
 
 		//download the file if necesary
-		if($data['source']=='http'){
+		if($data['source']=='http') {
 			$path=OC_Helper::tmpFile();
-			if(!isset($data['href'])){
+			if(!isset($data['href'])) {
 				OC_Log::write('core','No href specified when installing app from http',OC_Log::ERROR);
 				return false;
 			}
 			copy($data['href'],$path);
 		}else{
-			if(!isset($data['path'])){
+			if(!isset($data['path'])) {
 				OC_Log::write('core','No path specified when installing app from local file',OC_Log::ERROR);
 				return false;
 			}
@@ -79,10 +79,10 @@ class OC_Installer{
 
 		//detect the archive type
 		$mime=OC_Helper::getMimeType($path);
-		if($mime=='application/zip'){
+		if($mime=='application/zip') {
 			rename($path,$path.'.zip');
 			$path.='.zip';
-		}elseif($mime=='application/x-gzip'){
+		}elseif($mime=='application/x-gzip') {
 			rename($path,$path.'.tgz');
 			$path.='.tgz';
 		}else{
@@ -94,40 +94,40 @@ class OC_Installer{
 		$extractDir=OC_Helper::tmpFolder();
 		OC_Helper::rmdirr($extractDir);
 		mkdir($extractDir);
-		if($archive=OC_Archive::open($path)){
+		if($archive=OC_Archive::open($path)) {
 			$archive->extract($extractDir);
 		} else {
 			OC_Log::write('core','Failed to open archive when installing app',OC_Log::ERROR);
 			OC_Helper::rmdirr($extractDir);
-			if($data['source']=='http'){
+			if($data['source']=='http') {
 				unlink($path);
 			}
 			return false;
 		}
 
 		//load the info.xml file of the app
-		if(!is_file($extractDir.'/appinfo/info.xml')){
+		if(!is_file($extractDir.'/appinfo/info.xml')) {
 			//try to find it in a subdir
 			$dh=opendir($extractDir);
-			while($folder=readdir($dh)){
-				if($folder[0]!='.' and is_dir($extractDir.'/'.$folder)){
-					if(is_file($extractDir.'/'.$folder.'/appinfo/info.xml')){
+			while($folder=readdir($dh)) {
+				if($folder[0]!='.' and is_dir($extractDir.'/'.$folder)) {
+					if(is_file($extractDir.'/'.$folder.'/appinfo/info.xml')) {
 						$extractDir.='/'.$folder;
 					}
 				}
 			}
 		}
-		if(!is_file($extractDir.'/appinfo/info.xml')){
+		if(!is_file($extractDir.'/appinfo/info.xml')) {
 			OC_Log::write('core','App does not provide an info.xml file',OC_Log::ERROR);
 			OC_Helper::rmdirr($extractDir);
-			if($data['source']=='http'){
+			if($data['source']=='http') {
 				unlink($path);
 			}
 			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)){
+		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;
@@ -135,17 +135,17 @@ class OC_Installer{
 
 		// 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;
 		}
 
 		//check if an app with the same id is already installed
-		if(self::isInstalled( $info['id'] )){
+		if(self::isInstalled( $info['id'] )) {
 			OC_Log::write('core','App already installed',OC_Log::WARN);
 			OC_Helper::rmdirr($extractDir);
-			if($data['source']=='http'){
+			if($data['source']=='http') {
 				unlink($path);
 			}
 			return false;
@@ -153,24 +153,24 @@ class OC_Installer{
 
 		$basedir=OC_App::getInstallPath().'/'.$info['id'];
 		//check if the destination directory already exists
-		if(is_dir($basedir)){
+		if(is_dir($basedir)) {
 			OC_Log::write('core','App directory already exists',OC_Log::WARN);
 			OC_Helper::rmdirr($extractDir);
-			if($data['source']=='http'){
+			if($data['source']=='http') {
 				unlink($path);
 			}
 			return false;
 		}
 
-		if(isset($data['pretent']) and $data['pretent']==true){
+		if(isset($data['pretent']) and $data['pretent']==true) {
 			return false;
 		}
 
 		//copy the app to the correct place
-		if(@!mkdir($basedir)){
+		if(@!mkdir($basedir)) {
 			OC_Log::write('core','Can\'t create app folder. Please fix permissions. ('.$basedir.')',OC_Log::ERROR);
 			OC_Helper::rmdirr($extractDir);
-			if($data['source']=='http'){
+			if($data['source']=='http') {
 				unlink($path);
 			}
 			return false;
@@ -181,12 +181,12 @@ class OC_Installer{
 		OC_Helper::rmdirr($extractDir);
 
 		//install the database
-		if(is_file($basedir.'/appinfo/database.xml')){
+		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')){
+		if((!isset($data['noinstall']) or $data['noinstall']==false) and file_exists($basedir.'/appinfo/install.php')) {
 			include($basedir.'/appinfo/install.php');
 		}
 
@@ -195,10 +195,10 @@ class OC_Installer{
 		OC_Appconfig::setValue($info['id'],'enabled','no');
 
 		//set remote/public handelers
-		foreach($info['remote'] as $name=>$path){
+		foreach($info['remote'] as $name=>$path) {
 			OCP\CONFIG::setAppValue('core', 'remote_'.$name, $info['id'].'/'.$path);
 		}
-		foreach($info['public'] as $name=>$path){
+		foreach($info['public'] as $name=>$path) {
 			OCP\CONFIG::setAppValue('core', 'public_'.$name, $info['id'].'/'.$path);
 		}
 
@@ -214,9 +214,9 @@ class OC_Installer{
 	 *
 	 * Checks whether or not an app is installed, i.e. registered in apps table.
 	 */
-	public static function isInstalled( $app ){
+	public static function isInstalled( $app ) {
 
-		if( null == OC_Appconfig::getValue( $app, "installed_version" )){
+		if( null == OC_Appconfig::getValue( $app, "installed_version" )) {
 			return false;
 		}
 
@@ -250,7 +250,7 @@ class OC_Installer{
 	 *
 	 * upgrade.php can determine the current installed version of the app using "OC_Appconfig::getValue($appid,'installed_version')"
 	 */
-	public static function upgradeApp( $data = array()){
+	public static function upgradeApp( $data = array()) {
 		// TODO: write function
 		return true;
 	}
@@ -275,7 +275,7 @@ class OC_Installer{
 	 * The function will not delete preferences, tables and the configuration,
 	 * this has to be done by the function oc_app_uninstall().
 	 */
-	public static function removeApp( $name, $options = array()){
+	public static function removeApp( $name, $options = array()) {
 		// TODO: write function
 		return true;
 	}
@@ -285,16 +285,16 @@ class OC_Installer{
 	 *
 	 * This function installs all apps found in the 'apps' directory that should be enabled by default;
 	 */
-	public static function installShippedApps(){
+	public static function installShippedApps() {
 		foreach(OC::$APPSROOTS as $app_dir) {
-			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)){
+			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 ){
+								if( $enabled ) {
 									OC_Installer::installShippedApp($filename);
 									OC_Appconfig::setValue($filename,'enabled','yes');
 								}
@@ -312,24 +312,24 @@ class OC_Installer{
 	 * @param string $app id of the app to install
 	 * @returns array see OC_App::getAppInfo
 	 */
-	public static function installShippedApp($app){
+	public static function installShippedApp($app) {
 		//install the database
-		if(is_file(OC_App::getAppPath($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_App::getAppPath($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));
 
 		//set remote/public handelers
-		foreach($info['remote'] as $name=>$path){
+		foreach($info['remote'] as $name=>$path) {
 			OCP\CONFIG::setAppValue('core', 'remote_'.$name, $app.'/'.$path);
 		}
-		foreach($info['public'] as $name=>$path){
+		foreach($info['public'] as $name=>$path) {
 			OCP\CONFIG::setAppValue('core', 'public_'.$name, $app.'/'.$path);
 		}
 
@@ -344,7 +344,7 @@ class OC_Installer{
 	 * @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){
+	public static function checkCode($appname,$folder) {
 
 		$blacklist=array(
 			'exec(',
@@ -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');
diff --git a/lib/json.php b/lib/json.php
index 12442cc83d..518c3c87c4 100644
--- a/lib/json.php
+++ b/lib/json.php
@@ -11,8 +11,8 @@ class OC_JSON{
 	/**
 	 * set Content-Type header to jsonrequest
 	 */
-	public static function setContentTypeHeader($type='application/json'){
-		if (!self::$send_content_type_header){
+	public static function setContentTypeHeader($type='application/json') {
+		if (!self::$send_content_type_header) {
 			// We send json data
 			header( 'Content-Type: '.$type );
 			self::$send_content_type_header = true;
@@ -22,8 +22,8 @@ class OC_JSON{
 	/**
 	* Check if the app is enabled, send json error msg if not
 	*/
-	public static function checkAppEnabled($app){
-		if( !OC_App::isEnabled($app)){
+	public static function checkAppEnabled($app) {
+		if( !OC_App::isEnabled($app)) {
 			$l = OC_L10N::get('lib');
 			self::error(array( 'data' => array( 'message' => $l->t('Application is not enabled') )));
 			exit();
@@ -33,8 +33,8 @@ class OC_JSON{
 	/**
 	* Check if the user is logged in, send json error msg if not
 	*/
-	public static function checkLoggedIn(){
-		if( !OC_User::isLoggedIn()){
+	public static function checkLoggedIn() {
+		if( !OC_User::isLoggedIn()) {
 			$l = OC_L10N::get('lib');
 			self::error(array( 'data' => array( 'message' => $l->t('Authentication error') )));
 			exit();
@@ -45,8 +45,8 @@ 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()){
+	public static function callCheck() {
+		if( !OC_Util::isCallRegistered()) {
 			$l = OC_L10N::get('lib');
 			self::error(array( 'data' => array( 'message' => $l->t('Token expired. Please reload page.') )));
 			exit();
@@ -56,9 +56,9 @@ class OC_JSON{
 	/**
 	* Check if the user is a admin, send json error msg if not
 	*/
-	public static function checkAdminUser(){
+	public static function checkAdminUser() {
 		self::checkLoggedIn();
-		if( !OC_Group::inGroup( OC_User::getUser(), 'admin' )){
+		if( !OC_Group::inGroup( OC_User::getUser(), 'admin' )) {
 			$l = OC_L10N::get('lib');
 			self::error(array( 'data' => array( 'message' => $l->t('Authentication error') )));
 			exit();
@@ -68,9 +68,9 @@ class OC_JSON{
 	/**
 	* Check if the user is a subadmin, send json error msg if not
 	*/
-	public static function checkSubAdminUser(){
+	public static function checkSubAdminUser() {
 		self::checkLoggedIn();
-		if(!OC_Group::inGroup(OC_User::getUser(),'admin') && !OC_SubAdmin::isSubAdmin(OC_User::getUser())){
+		if(!OC_Group::inGroup(OC_User::getUser(),'admin') && !OC_SubAdmin::isSubAdmin(OC_User::getUser())) {
 			$l = OC_L10N::get('lib');
 			self::error(array( 'data' => array( 'message' => $l->t('Authentication error') )));
 			exit();
@@ -80,7 +80,7 @@ class OC_JSON{
 	/**
 	* Send json error msg
 	*/
-	public static function error($data = array()){
+	public static function error($data = array()) {
 		$data['status'] = 'error';
 		self::encodedPrint($data);
 	}
@@ -88,7 +88,7 @@ class OC_JSON{
 	/**
 	* Send json success msg
 	*/
-	public static function success($data = array()){
+	public static function success($data = array()) {
 		$data['status'] = 'success';
 		self::encodedPrint($data);
 	}
@@ -96,7 +96,7 @@ class OC_JSON{
 	/**
 	 * Convert OC_L10N_String to string, for use in json encodings
 	 */
-	protected static function to_string(&$value){
+	protected static function to_string(&$value) {
 		if ($value instanceof OC_L10N_String) {
 			$value = (string)$value;
 		}
@@ -105,10 +105,10 @@ class OC_JSON{
 	/**
 	* Encode and print $data in json format
 	*/
-	public static function encodedPrint($data,$setContentType=true){
+	public static function encodedPrint($data,$setContentType=true) {
 		// Disable mimesniffing, don't move this to setContentTypeHeader!
 		header( 'X-Content-Type-Options: nosniff' );
-		if($setContentType){
+		if($setContentType) {
 			self::setContentTypeHeader();
 		}
 		array_walk_recursive($data, array('OC_JSON', 'to_string'));
diff --git a/lib/l10n.php b/lib/l10n.php
index f827412613..90877cbd74 100644
--- a/lib/l10n.php
+++ b/lib/l10n.php
@@ -66,9 +66,9 @@ class OC_L10N{
 	 * get an L10N instance
 	 * @return OC_L10N
 	 */
-	public static function get($app,$lang=null){
-		if(is_null($lang)){
-			if(!isset(self::$instances[$app])){
+	public static function get($app,$lang=null) {
+		if(is_null($lang)) {
+			if(!isset(self::$instances[$app])) {
 				self::$instances[$app]=new OC_L10N($app);
 			}
 			return self::$instances[$app];
@@ -86,12 +86,12 @@ class OC_L10N{
 	 * If language is not set, the constructor tries to find the right
 	 * language.
 	 */
-	public function __construct($app, $lang = null){
+	public function __construct($app, $lang = null) {
 		$this->app = $app;
 		$this->lang = $lang;
 	}
 
-	protected function init(){
+	protected function init() {
 		if ($this->app === true) {
 			return;
 		}
@@ -104,7 +104,7 @@ class OC_L10N{
 		}
 
 		// Use cache if possible
-		if(array_key_exists($app.'::'.$lang, self::$cache)){
+		if(array_key_exists($app.'::'.$lang, self::$cache)) {
 
 			$this->translations = self::$cache[$app.'::'.$lang]['t'];
 			$this->localizations = self::$cache[$app.'::'.$lang]['l'];
@@ -119,15 +119,15 @@ class OC_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)){
+				if(isset($TRANSLATIONS) && is_array($TRANSLATIONS)) {
 					$this->translations = $TRANSLATIONS;
 				}
 			}
 
-			if(file_exists(OC::$SERVERROOT.'/core/l10n/l10n-'.$lang.'.php')){
+			if(file_exists(OC::$SERVERROOT.'/core/l10n/l10n-'.$lang.'.php')) {
 				// Include the file, save the data from $CONFIG
 				include(OC::$SERVERROOT.'/core/l10n/l10n-'.$lang.'.php');
-				if(isset($LOCALIZATIONS) && is_array($LOCALIZATIONS)){
+				if(isset($LOCALIZATIONS) && is_array($LOCALIZATIONS)) {
 					$this->localizations = array_merge($this->localizations, $LOCALIZATIONS);
 				}
 			}
@@ -146,7 +146,7 @@ class OC_L10N{
      * Returns the translation. If no translation is found, $text will be
      * returned.
      */
-	public function t($text, $parameters = array()){
+	public function t($text, $parameters = array()) {
 		return new OC_L10N_String($this, $text, $parameters);
 	}
 
@@ -164,10 +164,10 @@ class OC_L10N{
 	 *
 	 *
 	 */
-	public function tA($textArray){
+	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){
+		foreach($textArray as $key => $text) {
 			$result[$key] = (string)$this->t($text);
 		}
 		return $result;
@@ -179,7 +179,7 @@ class OC_L10N{
 	 *
 	 * Returns an associative array with all translations
 	 */
-	public function getTranslations(){
+	public function getTranslations() {
 		$this->init();
 		return $this->translations;
 	}
@@ -206,9 +206,9 @@ class OC_L10N{
 	 *    - l10n-field: time
 	 *    - params: timestamp (int/string)
 	 */
-	public function l($type, $data){
+	public function l($type, $data) {
 		$this->init();
-		switch($type){
+		switch($type) {
 			// If you add something don't forget to add it to $localizations
 			// at the top of the page
 			case 'date':
@@ -233,7 +233,7 @@ class OC_L10N{
 	 * This function is useful to avoid loading thousands of files if only one
 	 * simple string is needed, for example in appinfo.php
 	 */
-	public static function selectLanguage($text){
+	public static function selectLanguage($text) {
 		$lang = self::findLanguage(array_keys($text));
 		return $text[$lang];
 	}
@@ -249,37 +249,37 @@ class OC_L10N{
 	 *
 	 * If nothing works it returns 'en'
 	 */
-	public static function findLanguage($app = null){
-		if(!is_array($app) && self::$language != ''){
+	public static function findLanguage($app = null) {
+		if(!is_array($app) && self::$language != '') {
 			return self::$language;
 		}
 
-		if(OC_User::getUser() && OC_Preferences::getValue(OC_User::getUser(), 'core', 'lang')){
+		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(is_array($app)){
+			if(is_array($app)) {
 				$available = $app;
 				$lang_exists = array_search($lang, $available) !== false;
 			}
 			else {
 				$lang_exists = self::languageExists($app, $lang);
 			}
-			if($lang_exists){
+			if($lang_exists) {
 				return $lang;
 			}
 		}
 
-		if(isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])){
+		if(isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
 			$accepted_languages = preg_split('/,\s*/', $_SERVER['HTTP_ACCEPT_LANGUAGE']);
-			if(is_array($app)){
+			if(is_array($app)) {
 				$available = $app;
 			}
 			else{
 				$available = self::findAvailableLanguages($app);
 			}
-			foreach($accepted_languages as $i){
+			foreach($accepted_languages as $i) {
 				$temp = explode(';', $i);
-				if(array_search($temp[0], $available) !== false){
+				if(array_search($temp[0], $available) !== false) {
 					return $temp[0];
 				}
 			}
@@ -294,12 +294,12 @@ class OC_L10N{
 	 * @param $app App that needs to be translated
 	 * @returns directory
 	 */
-	protected static function findI18nDir($app){
+	protected static function findI18nDir($app) {
 		// find the i18n dir
 		$i18ndir = OC::$SERVERROOT.'/core/l10n/';
-		if($app != ''){
+		if($app != '') {
 			// Check if the app is in the app folder
-			if(file_exists(OC_App::getAppPath($app).'/l10n/')){
+			if(file_exists(OC_App::getAppPath($app).'/l10n/')) {
 				$i18ndir = OC_App::getAppPath($app).'/l10n/';
 			}
 			else{
@@ -314,13 +314,13 @@ class OC_L10N{
 	 * @param $app App that needs to be translated
 	 * @returns array an array of available languages
 	 */
-	public static function findAvailableLanguages($app=null){
+	public static function findAvailableLanguages($app=null) {
 		$available=array('en');//english is always available
 		$dir = self::findI18nDir($app);
-		if(is_dir($dir)){
+		if(is_dir($dir)) {
 			$files=scandir($dir);
-			foreach($files as $file){
-				if(substr($file, -4, 4) == '.php'){
+			foreach($files as $file) {
+				if(substr($file, -4, 4) == '.php') {
 					$i = substr($file, 0, -4);
 					$available[] = $i;
 				}
@@ -329,12 +329,12 @@ class OC_L10N{
 		return $available;
 	}
 
-	public static function languageExists($app, $lang){
-		if ($lang == 'en'){//english is always available
+	public static function languageExists($app, $lang) {
+		if ($lang == 'en') {//english is always available
 			return true;
 		}
 		$dir = self::findI18nDir($app);
-		if(is_dir($dir)){
+		if(is_dir($dir)) {
 			return file_exists($dir.'/'.$lang.'.php');
 		}
 		return false;
diff --git a/lib/l10n/string.php b/lib/l10n/string.php
index 4769790a16..8eef10071e 100644
--- a/lib/l10n/string.php
+++ b/lib/l10n/string.php
@@ -8,16 +8,16 @@
 
 class OC_L10N_String{
 	protected $l10n;
-	public function __construct($l10n, $text, $parameters){
+	public function __construct($l10n, $text, $parameters) {
 		$this->l10n = $l10n;
 		$this->text = $text;
 		$this->parameters = $parameters;
 
 	}
 
-	public function __toString(){
+	public function __toString() {
 		$translations = $this->l10n->getTranslations();
-		if(array_key_exists($this->text, $translations)){
+		if(array_key_exists($this->text, $translations)) {
 			return vsprintf($translations[$this->text], $this->parameters);
 		}
 		return vsprintf($this->text, $this->parameters);
diff --git a/lib/log/owncloud.php b/lib/log/owncloud.php
index 9eb21832c5..d4644163ad 100644
--- a/lib/log/owncloud.php
+++ b/lib/log/owncloud.php
@@ -45,7 +45,7 @@ class OC_Log_Owncloud {
 	 */
 	public static function write($app, $message, $level) {
 		$minLevel=min(OC_Config::getValue( "loglevel", OC_Log::WARN ),OC_Log::ERROR);
-		if($level>=$minLevel){
+		if($level>=$minLevel) {
 			$entry=array('app'=>$app, 'message'=>$message, 'level'=>$level,'time'=>time());
 			$fh=fopen(self::$logFile, 'a');
 			fwrite($fh, json_encode($entry)."\n");
@@ -59,7 +59,7 @@ class OC_Log_Owncloud {
 	 * @param int offset
 	 * @return array
 	 */
-	public static function getEntries($limit=50, $offset=0){
+	public static function getEntries($limit=50, $offset=0) {
 		self::init();
 		$minLevel=OC_Config::getValue( "loglevel", OC_Log::WARN );
 		$entries = array();
diff --git a/lib/mail.php b/lib/mail.php
index 15e91158e1..8d30fff9f2 100644
--- a/lib/mail.php
+++ b/lib/mail.php
@@ -39,9 +39,9 @@ class OC_Mail {
 		$mailo = new PHPMailer(true);
 		if($SMTPMODE=='sendmail') {
 			$mailo->IsSendmail();
-		}elseif($SMTPMODE=='smtp'){
+		}elseif($SMTPMODE=='smtp') {
 			$mailo->IsSMTP();
-		}elseif($SMTPMODE=='qmail'){
+		}elseif($SMTPMODE=='qmail') {
 			$mailo->IsQmail();
 		}else{
 			$mailo->IsMail();
diff --git a/lib/migrate.php b/lib/migrate.php
index b3ef00cbf6..823b3574f1 100644
--- a/lib/migrate.php
+++ b/lib/migrate.php
@@ -52,20 +52,20 @@ class OC_Migrate{
 	 * register a new migration provider
 	 * @param OC_Migrate_Provider $provider
 	 */
-	public static function registerProvider($provider){
+	public static function registerProvider($provider) {
 		self::$providers[]=$provider;
 	}
 
 	/**
 	* @brief finds and loads the providers
 	*/
-	static private function findProviders(){
+	static private function findProviders() {
 		// Find the providers
 		$apps = OC_App::getAllApps();
 
-		foreach($apps as $app){
+		foreach($apps as $app) {
 			$path = OC_App::getAppPath($app) . '/appinfo/migrate.php';
-			if( file_exists( $path ) ){
+			if( file_exists( $path ) ) {
 				include( $path );
 			}
 		}
@@ -78,21 +78,21 @@ class OC_Migrate{
 	 * @param otional $path string path to zip output folder
 	 * @return false on error, path to zip on success
 	 */
-	 public static function export( $uid=null, $type='user', $path=null ){
+	 public static function export( $uid=null, $type='user', $path=null ) {
 		$datadir = OC_Config::getValue( 'datadirectory' );
 	 	// Validate export type
 	 	$types = array( 'user', 'instance', 'system', 'userfiles' );
-	 	if( !in_array( $type, $types ) ){
+	 	if( !in_array( $type, $types ) ) {
 	 		OC_Log::write( 'migration', 'Invalid export type', OC_Log::ERROR );
 	 		return json_encode( array( array( 'success' => false ) ) );
 	 	}
 	 	self::$exporttype = $type;
 	 	// Userid?
-	 	if( self::$exporttype == 'user' ){
+	 	if( self::$exporttype == 'user' ) {
 	 		// Check user exists
-	 		if( !is_null($uid) ){
+	 		if( !is_null($uid) ) {
 				$db = new OC_User_Database;
-		 		if( !$db->userExists( $uid ) ){
+		 		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 ) );
 				}
@@ -102,18 +102,18 @@ class OC_Migrate{
 	 		}
 	 	}
 	 	// Calculate zipname
-	 	if( self::$exporttype == 'user' ){
+	 	if( self::$exporttype == 'user' ) {
 	 		$zipname = 'oc_export_' . self::$uid . '_' . date("y-m-d_H-i-s") . '.zip';
 	 	} else {
 	 		$zipname = 'oc_export_' . self::$exporttype . '_' . date("y-m-d_H-i-s") . '.zip';
 	 	}
 	 	// Calculate path
-	 	if( self::$exporttype == 'user' ){
+	 	if( self::$exporttype == 'user' ) {
 	 		self::$zippath = $datadir . '/' . self::$uid . '/' . $zipname;
 	 	} else {
-	 		if( !is_null( $path ) ){
+	 		if( !is_null( $path ) ) {
 	 			// Validate custom path
-	 			if( !file_exists( $path ) || !is_writeable( $path ) ){
+	 			if( !file_exists( $path ) || !is_writeable( $path ) ) {
 	 				OC_Log::write( 'migration', 'Path supplied is invalid.', OC_Log::ERROR );
 	 				return json_encode( array( 'success' => false ) );
 	 			}
@@ -124,17 +124,17 @@ class OC_Migrate{
 	 		}
 	 	}
 	 	// Create the zip object
-	 	if( !self::createZip() ){
+	 	if( !self::createZip() ) {
 	 		return json_encode( array( 'success' => false ) );
 	 	}
 	 	// Do the export
 	 	self::findProviders();
 	 	$exportdata = array();
-	 	switch( self::$exporttype ){
+	 	switch( self::$exporttype ) {
 	 		case 'user':
 	 			// Connect to the db
 	 			self::$dbpath = $datadir . '/' . self::$uid . '/migration.db';
-	 			if( !self::connectDB() ){
+	 			if( !self::connectDB() ) {
 	 				return json_encode( array( 'success' => false ) );
 	 			}
 	 			self::$content = new OC_Migration_Content( self::$zip, self::$MDB2 );
@@ -158,14 +158,14 @@ class OC_Migrate{
 				// Add the export to the zip
 				self::$content->addFromString( $dbexport, "dbexport.xml" );
 				// Add user data
-				foreach(OC_User::getUsers() as $user){
+				foreach(OC_User::getUsers() as $user) {
 					self::$content->addDir(OC_User::getHome($user), true, "/userdata/" );
 				}
 			break;
 			case 'userfiles':
 				self::$content = new OC_Migration_Content( self::$zip );
 				// Creates a zip with all of the users files
-				foreach(OC_User::getUsers() as $user){
+				foreach(OC_User::getUsers() as $user) {
 					self::$content->addDir(OC_User::getHome($user), true, "/" );
 				}
 			break;
@@ -178,12 +178,12 @@ class OC_Migrate{
 				}
 			break;
 	 	}
-	 	if( !$info = self::getExportInfo( $exportdata ) ){
+	 	if( !$info = self::getExportInfo( $exportdata ) ) {
 	 		return json_encode( array( 'success' => false ) );
 	 	}
 	 	// Add the export info json to the export zip
 	 	self::$content->addFromString( $info, 'export_info.json' );
-	 	if( !self::$content->finish() ){
+	 	if( !self::$content->finish() ) {
 	 		return json_encode( array( 'success' => false ) );
 	 	}
 	 	return json_encode( array( 'success' => true, 'data' => self::$zippath ) );
@@ -195,22 +195,22 @@ class OC_Migrate{
 	* @param optional $type type of import (user or instance)
 	* @param optional $uid userid of new user
 	*/
-	public static function import( $path, $type='user', $uid=null ){
+	public static function import( $path, $type='user', $uid=null ) {
 
 		$datadir = OC_Config::getValue( 'datadirectory' );
 		// Extract the zip
-		if( !$extractpath = self::extractZip( $path ) ){
+		if( !$extractpath = self::extractZip( $path ) ) {
 			return json_encode( array( 'success' => false ) );
 		}
 		// Get export_info.json
 		$scan = scandir( $extractpath );
 		// Check for export_info.json
-		if( !in_array( 'export_info.json', $scan ) ){
+		if( !in_array( 'export_info.json', $scan ) ) {
 			OC_Log::write( 'migration', 'Invalid import file, export_info.json note found', OC_Log::ERROR );
 			return json_encode( array( 'success' => false ) );
 		}
 		$json = json_decode( file_get_contents( $extractpath . 'export_info.json' ) );
-		if( $json->exporttype != $type ){
+		if( $json->exporttype != $type ) {
 			OC_Log::write( 'migration', 'Invalid import file', OC_Log::ERROR );
 			return json_encode( array( 'success' => false ) );
 		}
@@ -219,13 +219,13 @@ class OC_Migrate{
 		$currentuser = OC_User::getUser();
 
 		// Have we got a user if type is user
-		if( self::$exporttype == 'user' ){
+		if( self::$exporttype == 'user' ) {
 			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' )){
+		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 ) );
@@ -233,23 +233,23 @@ class OC_Migrate{
 		}
 
 		// Handle export types
-		switch( self::$exporttype ){
+		switch( self::$exporttype ) {
 			case 'user':
 				// Check user availability
-				if( !OC_User::userExists( self::$uid ) ){
+				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
-				if( !self::copy_r( $extractpath . $json->exporteduser, $datadir . '/' . self::$uid ) ){
+				if( !self::copy_r( $extractpath . $json->exporteduser, $datadir . '/' . self::$uid ) ) {
 					return json_encode( array( 'success' => false ) );
 				}
 				// Import user app data
-				if( !$appsimported = self::importAppData( $extractpath . $json->exporteduser . '/migration.db', $json, self::$uid ) ){
+				if( !$appsimported = self::importAppData( $extractpath . $json->exporteduser . '/migration.db', $json, self::$uid ) ) {
 					return json_encode( array( 'success' => false ) );
 				}
 				// All done!
-				if( !self::unlink_r( $extractpath ) ){
+				if( !self::unlink_r( $extractpath ) ) {
 					OC_Log::write( 'migration', 'Failed to delete the extracted zip', OC_Log::ERROR );
 				}
 				return json_encode( array( 'success' => true, 'data' => $appsimported ) );
@@ -262,19 +262,19 @@ class OC_Migrate{
 
 					// Delete current data folder.
 					OC_Log::write( 'migration', "Deleting current data dir", OC_Log::INFO );
-					if( !self::unlink_r( $datadir, false ) ){
+					if( !self::unlink_r( $datadir, false ) ) {
 						OC_Log::write( 'migration', 'Failed to delete the current data dir', OC_Log::ERROR );
 						return json_encode( array( 'success' => false ) );
 					}
 
 					// Copy over data
-					if( !self::copy_r( $extractpath . 'userdata', $datadir ) ){
+					if( !self::copy_r( $extractpath . 'userdata', $datadir ) ) {
 						OC_Log::write( 'migration', 'Failed to copy over data directory', OC_Log::ERROR );
 						return json_encode( array( 'success' => false ) );
 					}
 
 					// Import the db
-					if( !OC_DB::replaceDB( $extractpath . 'dbexport.xml' ) ){
+					if( !OC_DB::replaceDB( $extractpath . 'dbexport.xml' ) ) {
 						return json_encode( array( 'success' => false ) );
 					}
 					// Done
@@ -291,15 +291,15 @@ class OC_Migrate{
 	* $param optional $deleteRootToo bool delete the root directory
 	* @return bool
 	*/
-	private static function unlink_r( $dir, $deleteRootToo=true ){
-		if( !$dh = @opendir( $dir ) ){
+	private static function unlink_r( $dir, $deleteRootToo=true ) {
+		if( !$dh = @opendir( $dir ) ) {
 			return false;
 		}
-		while (false !== ($obj = readdir($dh))){
+		while (false !== ($obj = readdir($dh))) {
 			if($obj == '.' || $obj == '..') {
 				continue;
 			}
-			if (!@unlink($dir . '/' . $obj)){
+			if (!@unlink($dir . '/' . $obj)) {
 				self::unlink_r($dir.'/'.$obj, true);
 			}
 		}
@@ -316,16 +316,16 @@ class OC_Migrate{
 	* @param $dest string path to destination
 	* @return bool
 	*/
-	private static function copy_r( $path, $dest ){
-		if( is_dir($path) ){
+	private static function copy_r( $path, $dest ) {
+		if( is_dir($path) ) {
 			@mkdir( $dest );
 			$objects = scandir( $path );
-			if( sizeof( $objects ) > 0 ){
-				foreach( $objects as $file ){
+			if( sizeof( $objects ) > 0 ) {
+				foreach( $objects as $file ) {
 					if( $file == "." || $file == ".." || $file == ".htaccess")
 					continue;
 					// go on
-					if( is_dir( $path . '/' . $file ) ){
+					if( is_dir( $path . '/' . $file ) ) {
 						self::copy_r( $path  .'/' . $file, $dest . '/' . $file );
 					} else {
 						copy( $path . '/' . $file, $dest . '/' . $file );
@@ -334,7 +334,7 @@ class OC_Migrate{
 			}
 			return true;
 		}
-		elseif( is_file( $path ) ){
+		elseif( is_file( $path ) ) {
 			return copy( $path, $dest );
 		} else {
 			return false;
@@ -346,10 +346,10 @@ class OC_Migrate{
 	* @param $path string path to the zip
 	* @return string path to extract location (with a trailing slash) or false on failure
 	*/
-	static private function extractZip( $path ){
+	static private function extractZip( $path ) {
 		self::$zip = new ZipArchive;
 		// Validate path
-	 	if( !file_exists( $path ) ){
+	 	if( !file_exists( $path ) ) {
 	 		OC_Log::write( 'migration', 'Zip not found', OC_Log::ERROR );
 	 		return false;
 	 	}
@@ -358,7 +358,7 @@ class OC_Migrate{
 			return false;
 		}
 		$to = get_temp_dir() . '/oc_import_' . self::$exporttype . '_' . date("y-m-d_H-i-s") . '/';
-		if( !self::$zip->extractTo( $to ) ){
+		if( !self::$zip->extractTo( $to ) ) {
 			return false;
 		}
 		self::$zip->close();
@@ -369,13 +369,13 @@ class OC_Migrate{
 	 * @brief connects to a MDB2 database scheme
 	 * @returns bool
 	 */
-	static private function connectScheme(){
+	static private function connectScheme() {
 		// We need a mdb2 database connection
 		self::$MDB2->loadModule( 'Manager' );
 		self::$MDB2->loadModule( 'Reverse' );
 
 		// Connect if this did not happen before
-		if( !self::$schema ){
+		if( !self::$schema ) {
 			require_once 'MDB2/Schema.php';
 			self::$schema=MDB2_Schema::factory( self::$MDB2 );
 		}
@@ -387,23 +387,23 @@ class OC_Migrate{
 	 * @brief creates a migration.db in the users data dir with their app data in
 	 * @return bool whether operation was successfull
 	 */
-	private static function exportAppData( ){
+	private static function exportAppData( ) {
 
 		$success = true;
 		$return = array();
 
 		// Foreach provider
-		foreach( self::$providers as $provider ){
+		foreach( self::$providers as $provider ) {
 			// Check if the app is enabled
-			if( OC_App::isEnabled( $provider->getID() ) ){
+			if( OC_App::isEnabled( $provider->getID() ) ) {
 				$success = true;
 				// Does this app use the database?
-				if( file_exists( OC_App::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 ) ){
+					if( is_array( $tables ) ) {
 						// Save the table names
-						foreach($tables as $table){
+						foreach($tables as $table) {
 							$return['apps'][$provider->getID()]['tables'][] = $table;
 						}
 					} else {
@@ -413,7 +413,7 @@ class OC_Migrate{
 				}
 
 				// Run the export function?
-				if( $success ){
+				if( $success ) {
 					// Set the provider properties
 					$provider->setData( self::$uid, self::$content );
 					$return['apps'][$provider->getID()]['success'] = $provider->export();
@@ -438,7 +438,7 @@ class OC_Migrate{
 	 * @param optional $array array of data to include in the returned json
 	 * @return bool
 	 */
-	static private function getExportInfo( $array=array() ){
+	static private function getExportInfo( $array=array() ) {
 		$info = array(
 						'ocversion' => OC_Util::getVersion(),
 						'exporttime' => time(),
@@ -447,7 +447,7 @@ class OC_Migrate{
 						'exporteduser' => self::$uid
 					);
 
-		if( !is_array( $array ) ){
+		if( !is_array( $array ) ) {
 			OC_Log::write( 'migration', 'Supplied $array was not an array in getExportInfo()', OC_Log::ERROR );
 		}
 		// Merge in other data
@@ -462,23 +462,23 @@ class OC_Migrate{
 	 * @param $db optional path to migration.db, defaults to user data dir
 	 * @return bool whether the operation was successful
 	 */
-	static private function connectDB( $path=null ){
+	static private function connectDB( $path=null ) {
 		// Has the dbpath been set?
 		self::$dbpath = !is_null( $path ) ? $path : self::$dbpath;
-		if( !self::$dbpath ){
+		if( !self::$dbpath ) {
 			OC_Log::write( 'migration', 'connectDB() was called without dbpath being set', OC_Log::ERROR );
 			return false;
 		}
 		// Already connected
-		if(!self::$MDB2){
+		if(!self::$MDB2) {
 			require_once 'MDB2.php';
 
 			$datadir = OC_Config::getValue( "datadirectory", OC::$SERVERROOT."/data" );
 
 			// DB type
-			if( class_exists( 'SQLite3' ) ){
+			if( class_exists( 'SQLite3' ) ) {
 				$dbtype = 'sqlite3';
-			} else if( is_callable( 'sqlite_open' ) ){
+			} else if( is_callable( 'sqlite_open' ) ) {
 				$dbtype = 'sqlite';
 			} else {
 				OC_Log::write( 'migration', 'SQLite not found', OC_Log::ERROR );
@@ -502,7 +502,7 @@ class OC_Migrate{
 			// Try to establish connection
 			self::$MDB2 = MDB2::factory( $dsn, $options );
 			// Die if we could not connect
-			if( PEAR::isError( self::$MDB2 ) ){
+			if( PEAR::isError( self::$MDB2 ) ) {
 				die( self::$MDB2->getMessage() );
 				OC_Log::write( 'migration', 'Failed to create/connect to migration.db', OC_Log::FATAL );
 				OC_Log::write( 'migration', self::$MDB2->getUserInfo(), OC_Log::FATAL );
@@ -521,9 +521,9 @@ class OC_Migrate{
 	 * @param $appid string id of the app
 	 * @return bool whether the operation was successful
 	 */
-	static private function createAppTables( $appid ){
+	static private function createAppTables( $appid ) {
 
-		if( !self::connectScheme() ){
+		if( !self::connectScheme() ) {
 			return false;
 		}
 
@@ -538,7 +538,7 @@ class OC_Migrate{
 		$content = str_replace( '*dbprefix*', '', $content );
 
 		$xml = new SimpleXMLElement($content);
-		foreach($xml->table as $table){
+		foreach($xml->table as $table) {
 			$tables[] = (string)$table->name;
 		}
 
@@ -550,7 +550,7 @@ class OC_Migrate{
 		unlink( $file2 );
 
 		// Die in case something went wrong
-		if( $definition instanceof MDB2_Schema_Error ){
+		if( $definition instanceof MDB2_Schema_Error ) {
 			OC_Log::write( 'migration', 'Failed to parse database.xml for: '.$appid, OC_Log::FATAL );
 			OC_Log::write( 'migration', $definition->getMessage().': '.$definition->getUserInfo(), OC_Log::FATAL );
 			return false;
@@ -561,7 +561,7 @@ class OC_Migrate{
 		$ret = self::$schema->createDatabase( $definition );
 
 		// Die in case something went wrong
-		if( $ret instanceof MDB2_Error ){
+		if( $ret instanceof MDB2_Error ) {
 			OC_Log::write( 'migration', 'Failed to create tables for: '.$appid, OC_Log::FATAL );
 			OC_Log::write( 'migration', $ret->getMessage().': '.$ret->getUserInfo(), OC_Log::FATAL );
 			return false;
@@ -575,10 +575,10 @@ class OC_Migrate{
 	* @param $path string path to zip destination
 	* @return bool
 	*/
-	static private function createZip(){
+	static private function createZip() {
 		self::$zip = new ZipArchive;
 		// Check if properties are set
-		if( !self::$zippath ){
+		if( !self::$zippath ) {
 			OC_Log::write('migration', 'createZip() called but $zip and/or $zippath have not been set', OC_Log::ERROR);
 			return false;
 		}
@@ -594,11 +594,11 @@ class OC_Migrate{
 	* @brief returns an array of apps that support migration
 	* @return array
 	*/
-	static public function getApps(){
+	static public function getApps() {
 		$allapps = OC_App::getAllApps();
-		foreach($allapps as $app){
+		foreach($allapps as $app) {
 			$path = self::getAppPath($app) . '/lib/migrate.php';
-			if( file_exists( $path ) ){
+			if( file_exists( $path ) ) {
 				$supportsmigration[] = $app;
 			}
 		}
@@ -612,11 +612,11 @@ class OC_Migrate{
 	* @param $uid optional uid to use
 	* @return array of apps with import statuses, or false on failure.
 	*/
-	public static function importAppData( $db, $info, $uid=null ){
+	public static function importAppData( $db, $info, $uid=null ) {
 		// Check if the db exists
-		if( file_exists( $db ) ){
+		if( file_exists( $db ) ) {
 			// Connect to the db
-			if(!self::connectDB( $db )){
+			if(!self::connectDB( $db )) {
 				OC_Log::write('migration','Failed to connect to migration.db',OC_Log::ERROR);
 				return false;
 			}
@@ -634,25 +634,25 @@ class OC_Migrate{
 							'newuid' => self::$uid
 							);
 
-		foreach( self::$providers as $provider){
+		foreach( self::$providers as $provider) {
 			// Is the app in the export?
 			$id = $provider->getID();
-			if( isset( $info->apps->$id ) ){
+			if( isset( $info->apps->$id ) ) {
 				// Is the app installed
-				if( !OC_App::isEnabled( $id ) ){
+				if( !OC_App::isEnabled( $id ) ) {
 					OC_Log::write( 'migration', 'App: ' . $id . ' is not installed, can\'t import data.', OC_Log::INFO );
 					$appsstatus[$id] = 'notsupported';
 				} else {
 					// Did it succeed on export?
-					if( $info->apps->$id->success ){
+					if( $info->apps->$id->success ) {
 						// Give the provider the content object
-						if( !self::connectDB( $db ) ){
+						if( !self::connectDB( $db ) ) {
 							return false;
 						}
 						$content = new OC_Migration_Content( self::$zip, self::$MDB2 );
 						$provider->setData( self::$uid, $content, $info );
 						// Then do the import
-						if( !$appsstatus[$id] = $provider->import( $info->apps->$id, $importinfo ) ){
+						if( !$appsstatus[$id] = $provider->import( $info->apps->$id, $importinfo ) ) {
 							// Failed to import app
 							OC_Log::write( 'migration', 'Failed to import app data for user: ' . self::$uid . ' for app: ' . $id, OC_Log::ERROR );
 						}
@@ -674,17 +674,17 @@ class OC_Migrate{
 	* @param $hash string hash of the user to be created
 	* @return bool result of user creation
 	*/
-	public static function createUser( $uid, $hash ){
+	public static function createUser( $uid, $hash ) {
 
 		// Check if userid exists
-		if(OC_User::userExists( $uid )){
+		if(OC_User::userExists( $uid )) {
 			return false;
 		}
 
 		// Create the user
 		$query = OC_DB::prepare( "INSERT INTO `*PREFIX*users` ( `uid`, `password` ) VALUES( ?, ? )" );
 		$result = $query->execute( array( $uid, $hash));
-		if( !$result ){
+		if( !$result ) {
 			OC_Log::write('migration', 'Failed to create the new user "'.$uid."");
 		}
 		return $result ? true : false;
diff --git a/lib/migration/content.php b/lib/migration/content.php
index e04ac224f7..64b8168cd9 100644
--- a/lib/migration/content.php
+++ b/lib/migration/content.php
@@ -38,12 +38,12 @@ class OC_Migration_Content{
 	* @param optional $db a MDB2 database object (required for exporttype user)
 	* @return bool
 	*/
-	public function __construct( $zip, $db=null ){
+	public function __construct( $zip, $db=null ) {
 
 		$this->zip = $zip;
 		$this->db = $db;
 
-		if( !is_null( $db ) ){
+		if( !is_null( $db ) ) {
 			// Get db path
 			$db = $this->db->getDatabase();
 			$this->tmpfiles[] = $db;
@@ -53,7 +53,7 @@ class OC_Migration_Content{
 
 	// @brief prepares the db
 	// @param $query the sql query to prepare
-	public function prepare( $query ){
+	public function prepare( $query ) {
 
 		// Optimize the query
 		$query = $this->processQuery( $query );
@@ -78,7 +78,7 @@ class OC_Migration_Content{
 	* @param $query the query to process
 	* @return string of processed query
 	*/
-	private function processQuery( $query ){
+	private function processQuery( $query ) {
 		$query = str_replace( '`', '\'', $query );
 		$query = str_replace( 'NOW()', 'datetime(\'now\')', $query );
 		$query = str_replace( 'now()', 'datetime(\'now\')', $query );
@@ -92,22 +92,22 @@ class OC_Migration_Content{
 	* @param $options array of options.
 	* @return bool
 	*/
-	public function copyRows( $options ){
-		if( !array_key_exists( 'table', $options ) ){
+	public function copyRows( $options ) {
+		if( !array_key_exists( 'table', $options ) ) {
 			return false;
 		}
 
 		$return = array();
 
 		// Need to include 'where' in the query?
-		if( array_key_exists( 'matchval', $options ) && array_key_exists( 'matchcol', $options ) ){
+		if( array_key_exists( 'matchval', $options ) && array_key_exists( 'matchcol', $options ) ) {
 
 			// If only one matchval, create an array
-			if(!is_array($options['matchval'])){
+			if(!is_array($options['matchval'])) {
 				$options['matchval'] = array( $options['matchval'] );
 			}
 
-			foreach( $options['matchval'] as $matchval ){
+			foreach( $options['matchval'] as $matchval ) {
 				// Run the query for this match value (where x = y value)
 				$sql = 'SELECT * FROM `*PREFIX*' . $options['table'] . '` WHERE `' . $options['matchcol'] . '` LIKE ?';
 				$query = OC_DB::prepare( $sql );
@@ -135,12 +135,12 @@ class OC_Migration_Content{
 	* @param $options array of copyRows options
 	* @return void
 	*/
-	private function insertData( $data, $options ){
+	private function insertData( $data, $options ) {
 		$return = array();
 		// Foreach row of data to insert
-		while( $row = $data->fetchRow() ){
+		while( $row = $data->fetchRow() ) {
 			// Now save all this to the migration.db
-			foreach($row as $field=>$value){
+			foreach($row as $field=>$value) {
 				$fields[] = $field;
 				$values[] = $value;
 			}
@@ -153,14 +153,14 @@ class OC_Migration_Content{
 			$sql .= $valuessql . " )";
 			// Make the query
 			$query = $this->prepare( $sql );
-			if( !$query ){
+			if( !$query ) {
 				OC_Log::write( 'migration', 'Invalid sql produced: '.$sql, OC_Log::FATAL );
 				return false;
 				exit();
 			} else {
 				$query->execute( $values );
 				// Do we need to return some values?
-				if( array_key_exists( 'idcol', $options ) ){
+				if( array_key_exists( 'idcol', $options ) ) {
 					// Yes we do
 					$return[] = $row[$options['idcol']];
 				} else {
@@ -185,7 +185,7 @@ class OC_Migration_Content{
 	    $dirname = basename($dir);
 	    $this->zip->addEmptyDir($internaldir . $dirname);
 	    $internaldir.=$dirname.='/';
-		if( !file_exists( $dir ) ){
+		if( !file_exists( $dir ) ) {
 			return false;
 		}
 	    if ($dirhandle = opendir($dir)) {
@@ -214,11 +214,11 @@ class OC_Migration_Content{
 	* @param $path the relative path inside of the zip to save the file to
 	* @return bool
 	*/
-	public function addFromString( $data, $path ){
+	public function addFromString( $data, $path ) {
 		// Create a temp file
 		$file = tempnam( get_temp_dir(). '/', 'oc_export_tmp_' );
 		$this->tmpfiles[] = $file;
-		if( !file_put_contents( $file, $data ) ){
+		if( !file_put_contents( $file, $data ) ) {
 			OC_Log::write( 'migation', 'Failed to save data to a temporary file', OC_Log::ERROR );
 			return false;
 		}
@@ -231,8 +231,8 @@ class OC_Migration_Content{
 	* @brief closes the zip, removes temp files
 	* @return bool
 	*/
-	public function finish(){
-		if( !$this->zip->close() ){
+	public function finish() {
+		if( !$this->zip->close() ) {
 			OC_Log::write( 'migration', 'Failed to write the zip file with error: '.$this->zip->getStatusString(), OC_Log::ERROR );
 			return false;
 		}
@@ -243,9 +243,9 @@ class OC_Migration_Content{
 		/**
 	* @brief cleans up after the zip
 	*/
-	private function cleanup(){
+	private function cleanup() {
 		// Delete tmp files
-		foreach($this->tmpfiles as $i){
+		foreach($this->tmpfiles as $i) {
 			unlink( $i );
 		}
 	}
diff --git a/lib/migration/provider.php b/lib/migration/provider.php
index 259b1fe7ae..234ab3351f 100644
--- a/lib/migration/provider.php
+++ b/lib/migration/provider.php
@@ -10,7 +10,7 @@ abstract class OC_Migration_Provider{
 	protected $olduid=false;
 	protected $appinfo=false;
 
-	public function __construct( $appid ){
+	public function __construct( $appid ) {
 		// Set the id
 		$this->id = $appid;
 		OC_Migrate::registerProvider( $this );
@@ -32,11 +32,11 @@ abstract class OC_Migration_Provider{
 	* @brief sets the OC_Migration_Content object to $this->content
 	* @param $content a OC_Migration_Content object
 	*/
-	public function setData( $uid, $content, $info=null ){
+	public function setData( $uid, $content, $info=null ) {
 		$this->content = $content;
 		$this->uid = $uid;
 		$id = $this->id;
-		if( !is_null( $info ) ){
+		if( !is_null( $info ) ) {
 			$this->olduid = $info->exporteduser;
 			$this->appinfo = $info->apps->$id;
 		}
@@ -46,7 +46,7 @@ abstract class OC_Migration_Provider{
 	* @brief returns the appid of the provider
 	* @return string
 	*/
-	public function getID(){
+	public function getID() {
 		return $this->id;
 	}
 }
diff --git a/lib/minimizer.php b/lib/minimizer.php
index ff5f9304d9..d50ab0d239 100644
--- a/lib/minimizer.php
+++ b/lib/minimizer.php
@@ -22,7 +22,7 @@ abstract class OC_Minimizer {
 
 		$gzout = false;
 		$cache = OC_Cache::getGlobalCache();
-		if (!OC_Request::isNoCache() && (!defined('DEBUG') || !DEBUG)){
+		if (!OC_Request::isNoCache() && (!defined('DEBUG') || !DEBUG)) {
 			OC_Response::setETagHeader($etag);
 			$gzout = $cache->get($cache_key.'.gz');
 		}
diff --git a/lib/minimizer/css.php b/lib/minimizer/css.php
index 4188608719..8d130572e2 100644
--- a/lib/minimizer/css.php
+++ b/lib/minimizer/css.php
@@ -30,7 +30,7 @@ class OC_Minimizer_CSS extends OC_Minimizer
 			$remote .= dirname($file_info[2]);
 			$css_out .= CSSMin::remap($css, dirname($file), $remote, true);
 		}
-		if (!defined('DEBUG') || !DEBUG){
+		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 97d54c8fb9..bd2d836deb 100644
--- a/lib/minimizer/js.php
+++ b/lib/minimizer/js.php
@@ -13,7 +13,7 @@ class OC_Minimizer_JS extends OC_Minimizer
 			$js_out .= '/* ' . $file . ' */' . "\n";
 			$js_out .= file_get_contents($file);
 		}
-		if (!defined('DEBUG') || !DEBUG){
+		if (!defined('DEBUG') || !DEBUG) {
 			$js_out = JavaScriptMinifier::minify($js_out);
 		}
 		return $js_out;
diff --git a/lib/ocs.php b/lib/ocs.php
index ad01e5c42f..3a9be4cf09 100644
--- a/lib/ocs.php
+++ b/lib/ocs.php
@@ -102,79 +102,79 @@ class OC_OCS {
 		// eventhandler
 		// CONFIG
 		// apiconfig - GET - CONFIG
-		if(($method=='get') and ($ex[$paracount-3] == 'v1.php') and ($ex[$paracount-2] == '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')){
+		}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);
 
 		// ACTIVITY
 		// activityget - GET ACTIVITY   page,pagesize als urlparameter
-		}elseif(($method=='get') and ($ex[$paracount-3] == 'v1.php') and ($ex[$paracount-2] == 'activity')){
+		}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')){
+		}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);
 
 
 		// PRIVATEDATA
 		// get - GET DATA
-		}elseif(($method=='get') and ($ex[$paracount-4] == 'v1.php') and ($ex[$paracount-2] == 'getattribute')){
+		}elseif(($method=='get') and ($ex[$paracount-4] == 'v1.php') and ($ex[$paracount-2] == 'getattribute')) {
 			OC_OCS::privateDataGet($format);
 
-		}elseif(($method=='get') and ($ex[$paracount-5] == 'v1.php') and ($ex[$paracount-3] == 'getattribute')){
+		}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);
 
 		// set - POST DATA
-		}elseif(($method=='post') and ($ex[$paracount-6] == 'v1.php') and ($ex[$paracount-4] == 'setattribute')){
+		}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')){
+		}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);
 
 		// 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')){
+		}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')){
+		}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')){
+		}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);
 
 		// 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')){
+		}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')){
+		}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);
 
@@ -229,7 +229,7 @@ class OC_OCS {
 		if(isset($_SERVER['PHP_AUTH_PW']))   $authpw=$_SERVER['PHP_AUTH_PW']; else $authpw='';
 
 		if(empty($authuser)) {
-			if($forceuser){
+			if($forceuser) {
 				header('WWW-Authenticate: Basic realm="your valid user account or api key"');
 				header('HTTP/1.0 401 Unauthorized');
 				exit;
@@ -237,8 +237,8 @@ class OC_OCS {
 				$identifieduser='';
 			}
 		}else{
-			if(!OC_User::login($authuser,$authpw)){
-				if($forceuser){
+			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;
@@ -310,7 +310,7 @@ class OC_OCS {
 				xmlwriter_write_attribute($writer,'details',$tagattribute);
 				}
 				foreach($entry as $key=>$value) {
-				if(is_array($value)){
+				if(is_array($value)) {
 				foreach($value as $k=>$v) {
 					xmlwriter_write_element($writer,$k,$v);
 				}
@@ -330,7 +330,7 @@ class OC_OCS {
 				xmlwriter_write_attribute($writer,'details',$tagattribute);
 				}
 				foreach($entry as $key=>$value) {
-				if(is_array($value)){
+				if(is_array($value)) {
 				xmlwriter_start_element($writer,$entrykey);
 				foreach($value as $k=>$v) {
 					xmlwriter_write_element($writer,$k,$v);
@@ -363,7 +363,7 @@ class OC_OCS {
 			if (is_numeric($key)) {
 				$key = $node;
 			}
-			if (is_array($value)){
+			if (is_array($value)) {
 				xmlwriter_start_element($writer,$key);
 				OC_OCS::toxml($writer,$value,$node);
 				xmlwriter_end_element($writer);
@@ -402,8 +402,8 @@ class OC_OCS {
 	* @return string xml/json
 	*/
 	private static function personCheck($format,$login,$passwd) {
-		if($login<>''){
-			if(OC_User::login($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{
@@ -480,7 +480,7 @@ class OC_OCS {
 	*/
 	private static function privateDataSet($format, $app, $key, $value) {
 		$user=OC_OCS::checkpassword();
-		if(OC_OCS::setData($user,$app,$key,$value)){
+		if(OC_OCS::setData($user,$app,$key,$value)) {
 			echo(OC_OCS::generatexml($format,'ok',100,''));
 		}
 	}
@@ -493,11 +493,11 @@ class OC_OCS {
 	* @return string xml/json
 	*/
 	private static function privateDataDelete($format, $app, $key) {
-		if($key=="" or $app==""){
+		if($key=="" or $app=="") {
 			return; //key and app are NOT optional here
 		}
 		$user=OC_OCS::checkpassword();
-		if(OC_OCS::deleteData($user,$app,$key)){
+		if(OC_OCS::deleteData($user,$app,$key)) {
 			echo(OC_OCS::generatexml($format,'ok',100,''));
 		}
 	}
@@ -511,21 +511,21 @@ class OC_OCS {
 	* @return array
 	*/
 	public static function getData($user,$app="",$key="") {
-		if($app){
+		if($app) {
 			$apps=array($app);
 		}else{
 			$apps=OC_Preferences::getApps($user);
 		}
-		if($key){
+		if($key) {
 			$keys=array($key);
 		}else{
-			foreach($apps as $app){
+			foreach($apps as $app) {
 				$keys=OC_Preferences::getKeys($user,$app);
 			}
 		}
 		$result=array();
-		foreach($apps as $app){
-			foreach($keys as $key){
+		foreach($apps as $app) {
+			foreach($keys as $key) {
 				$value=OC_Preferences::getValue($user,$app,$key);
 				$result[]=array('app'=>$app,'key'=>$key,'value'=>$value);
 			}
@@ -592,7 +592,7 @@ class OC_OCS {
                 $login=OC_OCS::checkpassword();
 		if(OC_Group::inGroup($login, 'admin') or ($login==$user)) {
 
-			if(OC_User::userExists($user)){
+			if(OC_User::userExists($user)) {
 				// calculate the disc space
 				$user_dir = '/'.$user.'/files';
 				OC_Filesystem::init($user_dir);
@@ -653,7 +653,7 @@ class OC_OCS {
         private static function publicKeyGet($format,$user) {
                 $login=OC_OCS::checkpassword();
 
-		if(OC_User::userExists($user)){
+		if(OC_User::userExists($user)) {
 			// calculate the disc space
 			$txt='this is the public key of '.$user;
 			echo($txt);
@@ -672,7 +672,7 @@ class OC_OCS {
                 $login=OC_OCS::checkpassword();
                 if(OC_Group::inGroup($login, 'admin') or ($login==$user)) {
 
-                        if(OC_User::userExists($user)){
+                        if(OC_User::userExists($user)) {
                                 // calculate the disc space
                                 $txt='this is the private key of '.$user;
                                 echo($txt);
diff --git a/lib/ocsclient.php b/lib/ocsclient.php
index dde2545858..8596ea0b3c 100644
--- a/lib/ocsclient.php
+++ b/lib/ocsclient.php
@@ -34,7 +34,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(){
+	private static function getAppStoreURL() {
 		$url = OC_Config::getValue('appstoreurl', 'http://api.apps.owncloud.com/v1');
 		return($url);
 	}
@@ -44,7 +44,7 @@ class OC_OCSClient{
          * @returns string of the KB server
          * 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(){
+        private static function getKBURL() {
                 $url = OC_Config::getValue('knowledgebaseurl', 'http://api.apps.owncloud.com/v1');
                 return($url);
         }
@@ -56,14 +56,14 @@ 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){
+	public static function getCategories() {
+		if(OC_Config::getValue('appstoreenabled', true)==false) {
 			return NULL;
 		}
 		$url=OC_OCSClient::getAppStoreURL().'/content/categories';
 
 		$xml=@file_get_contents($url);
-		if($xml==FALSE){
+		if($xml==FALSE) {
 			return NULL;
 		}
 		$data=simplexml_load_string($xml);
@@ -88,8 +88,8 @@ class OC_OCSClient{
 	 *
 	 * This function returns a list of all the applications on the OCS server
 	 */
-	public static function getApplications($categories,$page,$filter){
-		if(OC_Config::getValue('appstoreenabled', true)==false){
+	public static function getApplications($categories,$page,$filter) {
+		if(OC_Config::getValue('appstoreenabled', true)==false) {
 			return(array());
 		}
 
@@ -104,7 +104,7 @@ class OC_OCSClient{
 		$url=OC_OCSClient::getAppStoreURL().'/content/data?categories='.urlencode($categoriesstring).'&sortmode=new&page='.urlencode($page).'&pagesize=100'.$filterurl.$version;
 		$apps=array();
 		$xml=@file_get_contents($url);
-		if($xml==FALSE){
+		if($xml==FALSE) {
 			return NULL;
 		}
 		$data=simplexml_load_string($xml);
@@ -135,14 +135,14 @@ class OC_OCSClient{
 	 *
 	 * This function returns an  applications from the OCS server
 	 */
-	public static function getApplication($id){
-		if(OC_Config::getValue('appstoreenabled', true)==false){
+	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);
-		if($xml==FALSE){
+		if($xml==FALSE) {
 			OC_Log::write('core','Unable to parse OCS content',OC_Log::FATAL);
 			return NULL;
 		}
@@ -172,14 +172,14 @@ class OC_OCSClient{
 		*
 		* 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){
+	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){
+		if($xml==FALSE) {
 			OC_Log::write('core','Unable to parse OCS content',OC_Log::FATAL);
 			return NULL;
 		}
@@ -202,8 +202,8 @@ class OC_OCSClient{
 	 *
 	 * This function returns a list of all the knowledgebase entries from the OCS server
 	 */
-	public static function getKnownledgebaseEntries($page,$pagesize,$search=''){
-		if(OC_Config::getValue('knowledgebaseenabled', true)==false){
+	public static function getKnownledgebaseEntries($page,$pagesize,$search='') {
+		if(OC_Config::getValue('knowledgebaseenabled', true)==false) {
 			$kbe=array();
 			$kbe['totalitems']=0;
 			return $kbe;
@@ -216,7 +216,7 @@ class OC_OCSClient{
 
 		$kbe=array();
 		$xml=@file_get_contents($url);
-		if($xml==FALSE){
+		if($xml==FALSE) {
 			OC_Log::write('core','Unable to parse knowledgebase content',OC_Log::FATAL);
 			return NULL;
 		}
diff --git a/lib/preferences.php b/lib/preferences.php
index de5747fccc..3d61887785 100644
--- a/lib/preferences.php
+++ b/lib/preferences.php
@@ -45,13 +45,13 @@ class OC_Preferences{
 	 * This function returns a list of all users that have at least one entry
 	 * in the preferences table.
 	 */
-	public static function getUsers(){
+	public static function getUsers() {
 		// No need for more comments
 		$query = OC_DB::prepare( 'SELECT DISTINCT( `userid` ) FROM `*PREFIX*preferences`' );
 		$result = $query->execute();
 
 		$users = array();
-		while( $row = $result->fetchRow()){
+		while( $row = $result->fetchRow()) {
 			$users[] = $row["userid"];
 		}
 
@@ -66,13 +66,13 @@ class OC_Preferences{
 	 * This function returns a list of all apps of the user that have at least
 	 * one entry in the preferences table.
 	 */
-	public static function getApps( $user ){
+	public static function getApps( $user ) {
 		// No need for more comments
 		$query = OC_DB::prepare( 'SELECT DISTINCT( `appid` ) FROM `*PREFIX*preferences` WHERE `userid` = ?' );
 		$result = $query->execute( array( $user ));
 
 		$apps = array();
-		while( $row = $result->fetchRow()){
+		while( $row = $result->fetchRow()) {
 			$apps[] = $row["appid"];
 		}
 
@@ -88,13 +88,13 @@ class OC_Preferences{
 	 * This function gets all keys of an app of an user. Please note that the
 	 * values are not returned.
 	 */
-	public static function getKeys( $user, $app ){
+	public static function getKeys( $user, $app ) {
 		// No need for more comments
 		$query = OC_DB::prepare( 'SELECT `configkey` FROM `*PREFIX*preferences` WHERE `userid` = ? AND `appid` = ?' );
 		$result = $query->execute( array( $user, $app ));
 
 		$keys = array();
-		while( $row = $result->fetchRow()){
+		while( $row = $result->fetchRow()) {
 			$keys[] = $row["configkey"];
 		}
 
@@ -112,13 +112,13 @@ class OC_Preferences{
 	 * This function gets a value from the prefernces table. If the key does
 	 * not exist the default value will be returnes
 	 */
-	public static function getValue( $user, $app, $key, $default = null ){
+	public static function getValue( $user, $app, $key, $default = null ) {
 		// Try to fetch the value, return default if not exists.
 		$query = OC_DB::prepare( 'SELECT `configvalue` FROM `*PREFIX*preferences` WHERE `userid` = ? AND `appid` = ? AND `configkey` = ?' );
 		$result = $query->execute( array( $user, $app, $key ));
 
 		$row = $result->fetchRow();
-		if($row){
+		if($row) {
 			return $row["configvalue"];
 		}else{
 			return $default;
@@ -136,13 +136,13 @@ class OC_Preferences{
 	 * Adds a value to the preferences. If the key did not exist before, it
 	 * will be added automagically.
 	 */
-	public static function setValue( $user, $app, $key, $value ){
+	public static function setValue( $user, $app, $key, $value ) {
 		// Check if the key does exist
 		$query = OC_DB::prepare( 'SELECT `configvalue` FROM `*PREFIX*preferences` WHERE `userid` = ? AND `appid` = ? AND `configkey` = ?' );
 		$values=$query->execute(array($user,$app,$key))->fetchAll();
 		$exists=(count($values)>0);
 
-		if( !$exists ){
+		if( !$exists ) {
 			$query = OC_DB::prepare( 'INSERT INTO `*PREFIX*preferences` ( `userid`, `appid`, `configkey`, `configvalue` ) VALUES( ?, ?, ?, ? )' );
 			$query->execute( array( $user, $app, $key, $value ));
 		}
@@ -162,7 +162,7 @@ class OC_Preferences{
 	 *
 	 * Deletes a key.
 	 */
-	public static function deleteKey( $user, $app, $key ){
+	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 ));
@@ -178,7 +178,7 @@ class OC_Preferences{
 	 *
 	 * Removes all keys in appconfig belonging to the app and the user.
 	 */
-	public static function deleteApp( $user, $app ){
+	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 ));
@@ -193,7 +193,7 @@ class OC_Preferences{
 	 *
 	 * Removes all keys in appconfig belonging to the user.
 	 */
-	public static function deleteUser( $user ){
+	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 ));
@@ -208,7 +208,7 @@ class OC_Preferences{
 	 *
 	 * Removes all keys in preferences belonging to the app.
 	 */
-	public static function deleteAppFromAllUsers( $app ){
+	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 ));
diff --git a/lib/public/app.php b/lib/public/app.php
index be38bbff98..eb824f043e 100644
--- a/lib/public/app.php
+++ b/lib/public/app.php
@@ -45,7 +45,7 @@ class App {
          * It'll remain in our public API for compatibility reasons
          *
          */
-        public static function register( $data ){
+        public static function register( $data ) {
 		return true; // don't do anything
         }
 
@@ -66,7 +66,7 @@ class App {
          *   - order: integer, that influences the position of your application in
          *     the navigation. Lower values come first.
          */
-        public static function addNavigationEntry( $data ){
+        public static function addNavigationEntry( $data ) {
 		return \OC_App::addNavigationEntry( $data );
 	}
 
@@ -80,7 +80,7 @@ class App {
          * property from all other entries. The templates can use this for
          * highlighting the current position of the user.
          */
-        public static function setActiveNavigationEntry( $id ){
+        public static function setActiveNavigationEntry( $id ) {
 		return \OC_App::setActiveNavigationEntry( $id );
 	}
 
@@ -90,7 +90,7 @@ class App {
          * @param $app string appid
          * @param $page string page to be included
         */
-        public static function registerPersonal( $app, $page ){
+        public static function registerPersonal( $app, $page ) {
 		return \OC_App::registerPersonal( $app, $page );
 	}
 
@@ -100,7 +100,7 @@ class App {
          * @param $app string appid
          * @param $page string page to be included
 	 */
-	public static function registerAdmin( $app, $page ){
+	public static function registerAdmin( $app, $page ) {
 		return \OC_App::registerAdmin( $app, $page );
 	}
 
@@ -111,7 +111,7 @@ class App {
          * @param boolean path (optional)
          * @returns array
         */
-        public static function getAppInfo( $app, $path=false ){
+        public static function getAppInfo( $app, $path=false ) {
 		return \OC_App::getAppInfo( $app, $path);
 	}
 
@@ -124,7 +124,7 @@ class App {
          *
          * This function checks whether or not an app is enabled.
          */
-        public static function isEnabled( $app ){
+        public static function isEnabled( $app ) {
 		return \OC_App::isEnabled( $app );
 	}
 
@@ -134,7 +134,7 @@ class App {
          * @param $app app
          * @returns true/false
         */
-        public static function checkAppEnabled( $app ){
+        public static function checkAppEnabled( $app ) {
                 return \OC_Util::checkAppEnabled( $app );
         }
 
@@ -144,7 +144,7 @@ class App {
          * @param $app app
          * @returns true/false
          */
-        public static function getAppVersion( $app ){
+        public static function getAppVersion( $app ) {
 		return \OC_App::getAppVersion( $app );
 	}
 
diff --git a/lib/public/backgroundjob.php b/lib/public/backgroundjob.php
index 2962346dbc..aba7d2b762 100644
--- a/lib/public/backgroundjob.php
+++ b/lib/public/backgroundjob.php
@@ -52,7 +52,7 @@ class BackgroundJob {
 	 * @param $method method name
 	 * @return true
 	 */
-	public static function addRegularTask( $klass, $method ){
+	public static function addRegularTask( $klass, $method ) {
 		return \OC_BackgroundJob_RegularTask::register( $klass, $method );
 	}
 
@@ -62,7 +62,7 @@ class BackgroundJob {
 	 *
 	 * key is string "$klass-$method", value is array( $klass, $method )
 	 */
-	static public function allRegularTasks(){
+	static public function allRegularTasks() {
 		return \OC_BackgroundJob_RegularTask::all();
 	}
 
@@ -71,7 +71,7 @@ class BackgroundJob {
 	 * @param $id ID of the task
 	 * @return associative array
 	 */
-	public static function findQueuedTask( $id ){
+	public static function findQueuedTask( $id ) {
 		return \OC_BackgroundJob_QueuedTask::find( $id );
 	}
 
@@ -79,7 +79,7 @@ class BackgroundJob {
 	 * @brief Gets all queued tasks
 	 * @return array with associative arrays
 	 */
-	public static function allQueuedTasks(){
+	public static function allQueuedTasks() {
 		return \OC_BackgroundJob_QueuedTask::all();
 	}
 
@@ -88,7 +88,7 @@ class BackgroundJob {
 	 * @param $app app name
 	 * @return array with associative arrays
 	 */
-	public static function queuedTaskWhereAppIs( $app ){
+	public static function queuedTaskWhereAppIs( $app ) {
 		return \OC_BackgroundJob_QueuedTask::whereAppIs( $app );
 	}
 
@@ -100,7 +100,7 @@ class BackgroundJob {
 	 * @param $parameters all useful data as text
 	 * @return id of task
 	 */
-	public static function addQueuedTask( $app, $klass, $method, $parameters ){
+	public static function addQueuedTask( $app, $klass, $method, $parameters ) {
 		return \OC_BackgroundJob_QueuedTask::add( $app, $klass, $method, $parameters );
 	}
 
@@ -111,7 +111,7 @@ class BackgroundJob {
 	 *
 	 * Deletes a report
 	 */
-	public static function deleteQueuedTask( $id ){
+	public static function deleteQueuedTask( $id ) {
 		return \OC_BackgroundJob_QueuedTask::delete( $id );
 	}
 }
diff --git a/lib/public/config.php b/lib/public/config.php
index f3120b9aaa..fa9658e728 100644
--- a/lib/public/config.php
+++ b/lib/public/config.php
@@ -49,7 +49,7 @@ class Config {
 	 * This function gets the value from config.php. If it does not exist,
 	 * $default will be returned.
 	 */
-	public static function getSystemValue( $key, $default = null ){
+	public static function getSystemValue( $key, $default = null ) {
 		return(\OC_Config::getValue( $key, $default ));
 	}
 
@@ -63,7 +63,7 @@ class Config {
 	 * This function sets the value and writes the config.php. If the file can
 	 * not be written, false will be returned.
 	 */
-	public static function setSystemValue( $key, $value ){
+	public static function setSystemValue( $key, $value ) {
 		return(\OC_Config::setValue( $key, $value ));
 	}
 
@@ -78,7 +78,7 @@ class Config {
          * This function gets a value from the appconfig table. If the key does
          * not exist the default value will be returnes
          */
-        public static function getAppValue( $app, $key, $default = null ){
+        public static function getAppValue( $app, $key, $default = null ) {
 		return(\OC_Appconfig::getValue( $app, $key, $default ));
 	}
 
@@ -92,7 +92,7 @@ class Config {
          *
          * Sets a value. If the key did not exist before it will be created.
          */
-        public static function setAppValue( $app, $key, $value ){
+        public static function setAppValue( $app, $key, $value ) {
 		return(\OC_Appconfig::setValue( $app, $key, $value ));
 	}
 
@@ -108,7 +108,7 @@ class Config {
          * This function gets a value from the prefernces table. If the key does
          * not exist the default value will be returnes
          */
-        public static function getUserValue( $user, $app, $key, $default = null ){
+        public static function getUserValue( $user, $app, $key, $default = null ) {
 		return(\OC_Preferences::getValue( $user, $app, $key, $default ));
 	}
 
@@ -124,7 +124,7 @@ class Config {
          * Adds a value to the preferences. If the key did not exist before, it
          * will be added automagically.
          */
-        public static function setUserValue( $user, $app, $key, $value ){
+        public static function setUserValue( $user, $app, $key, $value ) {
 		return(\OC_Preferences::setValue(  $user, $app, $key, $value ));
 	}
 
diff --git a/lib/public/db.php b/lib/public/db.php
index e1da62e2d2..5ac356bb47 100644
--- a/lib/public/db.php
+++ b/lib/public/db.php
@@ -43,7 +43,7 @@ class DB {
 	 *
 	 * SQL query via MDB2 prepare(), needs to be execute()'d!
 	 */
-	static public function prepare( $query, $limit=null, $offset=null ){
+	static public function prepare( $query, $limit=null, $offset=null ) {
 		return(\OC_DB::prepare($query,$limit,$offset));
 	}
 
@@ -58,7 +58,7 @@ class DB {
 	 * Call this method right after the insert command or other functions may
 	 * cause trouble!
 	 */
-	public static function insertid($table=null){
+	public static function insertid($table=null) {
 		return(\OC_DB::insertid($table));
 	}
 
@@ -66,7 +66,7 @@ class DB {
 	/**
 	 * @brief Start a transaction
 	 */
-	public static function beginTransaction(){
+	public static function beginTransaction() {
 		return(\OC_DB::beginTransaction());
 	}
 
@@ -74,7 +74,7 @@ class DB {
 	/**
 	 * @brief Commit the database changes done during a transaction that is in progress
 	 */
-	public static function commit(){
+	public static function commit() {
 		return(\OC_DB::commit());
 	}
 
@@ -84,7 +84,7 @@ class DB {
 	 * @param mixed $result
 	 * @return bool
 	 */
-	public static function isError($result){
+	public static function isError($result) {
 		return(\OC_DB::isError($result));
 	}
 
diff --git a/lib/public/files.php b/lib/public/files.php
index be5952d362..2f4f459bd9 100644
--- a/lib/public/files.php
+++ b/lib/public/files.php
@@ -52,7 +52,7 @@ class Files {
 	 * @return string
 	 * does NOT work for ownClouds filesystem, use OC_FileSystem::getMimeType instead
 	 */
-	static function getMimeType( $path ){
+	static function getMimeType( $path ) {
 		return(\OC_Helper::getMimeType( $path ));
 	}
 
@@ -63,7 +63,7 @@ class Files {
 	 * @param resource target
 	 * @return int the number of bytes copied
 	 */
-	public static function streamCopy( $source, $target ){
+	public static function streamCopy( $source, $target ) {
 		return(\OC_Helper::streamCopy( $source, $target ));
 	}
 
@@ -75,7 +75,7 @@ class Files {
 	 *
 	 * temporary files are automatically cleaned up after the script is finished
 	 */
-	public static function tmpFile( $postfix='' ){
+	public static function tmpFile( $postfix='' ) {
 		return(\OC_Helper::tmpFile( $postfix ));
 	}
 
@@ -86,7 +86,7 @@ class Files {
 	 *
 	 * temporary files are automatically cleaned up after the script is finished
 	 */
-	public static function tmpFolder(){
+	public static function tmpFolder() {
 		return(\OC_Helper::tmpFolder());
 	}
 
@@ -98,7 +98,7 @@ class Files {
 	 * @param $filename
 	 * @return string
 	 */
-	public static function buildNotExistingFileName( $path, $filename ){
+	public static function buildNotExistingFileName( $path, $filename ) {
 		return(\OC_Helper::buildNotExistingFileName( $path, $filename ));
 	}
 
@@ -107,7 +107,7 @@ class Files {
          * @param $app app
          * @return OC_FilesystemView
          */
-        public static function getStorage( $app ){
+        public static function getStorage( $app ) {
 		return \OC_App::getStorage( $app );
 	}
 
diff --git a/lib/public/json.php b/lib/public/json.php
index c37b42c3f7..93be920c6d 100644
--- a/lib/public/json.php
+++ b/lib/public/json.php
@@ -41,7 +41,7 @@ class JSON {
 	* @param string $setContentType the optional content type
 	* @return string json formatted string.
 	*/
-	public static function encodedPrint( $data, $setContentType=true ){
+	public static function encodedPrint( $data, $setContentType=true ) {
 		return(\OC_JSON::encodedPrint( $data, $setContentType ));
 	}
 
@@ -60,7 +60,7 @@ class JSON {
 	*
 	* @return string json formatted error string if not authenticated.
 	*/
-	public static function checkLoggedIn(){
+	public static function checkLoggedIn() {
 		return(\OC_JSON::checkLoggedIn());
 	}
 
@@ -84,7 +84,7 @@ class JSON {
 	*
 	* @return string json formatted error string if not valid.
 	*/
-	public static function callCheck(){
+	public static function callCheck() {
 		return(\OC_JSON::callCheck());
 	}
 
@@ -97,7 +97,7 @@ class JSON {
 	* @param array $data The data to use
 	* @return string json formatted string.
 	*/
-	public static function success( $data = array() ){
+	public static function success( $data = array() ) {
 		return(\OC_JSON::success( $data ));
 	}
 
@@ -119,7 +119,7 @@ class JSON {
 	* @param array $data The data to use
 	* @return string json formatted error string.
 	*/
-	public static function error( $data = array() ){
+	public static function error( $data = array() ) {
 		return(\OC_JSON::error( $data ));
 	}
 
@@ -128,7 +128,7 @@ class JSON {
 	* @param array $type The contwnt type header
 	* @return string json formatted string.
 	*/
-	public static function setContentTypeHeader( $type='application/json' ){
+	public static function setContentTypeHeader( $type='application/json' ) {
 		return(\OC_JSON::setContentTypeHeader( $type ));
 	}
 
@@ -148,7 +148,7 @@ class JSON {
 	* @param string $app The app to check
 	* @return string json formatted string if not enabled.
 	*/
-	public static function checkAppEnabled( $app ){
+	public static function checkAppEnabled( $app ) {
 		return(\OC_JSON::checkAppEnabled( $app ));
 	}
 
@@ -167,7 +167,7 @@ class JSON {
 	*
 	* @return string json formatted string if not admin user.
 	*/
-	public static function checkAdminUser(){
+	public static function checkAdminUser() {
 		return(\OC_JSON::checkAdminUser());
 	}
 
diff --git a/lib/public/template.php b/lib/public/template.php
index 11c740d13a..4cda365086 100644
--- a/lib/public/template.php
+++ b/lib/public/template.php
@@ -39,7 +39,7 @@ namespace OCP;
  *
  * For further information have a look at OC_Helper::imagePath
  */
-function image_path( $app, $image ){
+function image_path( $app, $image ) {
 	return(\image_path( $app, $image ));
 }
 
@@ -50,7 +50,7 @@ function image_path( $app, $image ){
  * @param $mimetype mimetype
  * @returns link to the image
  */
-function mimetype_icon( $mimetype ){
+function mimetype_icon( $mimetype ) {
 	return(\mimetype_icon( $mimetype ));
 }
 
@@ -61,7 +61,7 @@ function mimetype_icon( $mimetype ){
  * @param $bytes size in bytes
  * @returns size as string
  */
-function human_file_size( $bytes ){
+function human_file_size( $bytes ) {
 	return(\human_file_size( $bytes ));
 }
 
diff --git a/lib/public/user.php b/lib/public/user.php
index 327e2a7735..b530321f21 100644
--- a/lib/public/user.php
+++ b/lib/public/user.php
@@ -40,7 +40,7 @@ class User {
 	 * @brief get the user id of the user currently logged in.
 	 * @return string uid or false
 	 */
-	public static function getUser(){
+	public static function getUser() {
 		return \OC_USER::getUser();
 	}
 
@@ -62,7 +62,7 @@ class User {
 	 *
 	 * Checks if the user is logged in
 	 */
-	public static function isLoggedIn(){
+	public static function isLoggedIn() {
 		return \OC_USER::isLoggedIn();
 	}
 
@@ -72,7 +72,7 @@ class User {
 	 * @param string $uid the username
 	 * @return boolean
 	 */
-	public static function userExists( $uid ){
+	public static function userExists( $uid ) {
 		return \OC_USER::userExists( $uid );
 	}
 
@@ -83,7 +83,7 @@ class User {
 	 *
 	 * Logout, destroys session
 	 */
-	public static function logout(){
+	public static function logout() {
 		return \OC_USER::logout();
 	}
 
@@ -96,7 +96,7 @@ class User {
 	 *
 	 * Check if the password is correct without logging in the user
 	 */
-	public static function checkPassword( $uid, $password ){
+	public static function checkPassword( $uid, $password ) {
 		return \OC_USER::checkPassword( $uid, $password );
 	}
 
@@ -104,7 +104,7 @@ class User {
         /**
         * Check if the user is a admin, redirects to home if not
         */
-        public static function checkAdminUser(){
+        public static function checkAdminUser() {
                 \OC_Util::checkAdminUser();
         }
 
@@ -113,7 +113,7 @@ class User {
         * Check if the user is logged in, redirects to home if not. With
         * redirect URL parameter to the request URI.
         */
-        public static function checkLoggedIn(){
+        public static function checkLoggedIn() {
                 \OC_Util::checkLoggedIn();
         }
 
diff --git a/lib/public/util.php b/lib/public/util.php
index cc05e6d535..ed23521b04 100644
--- a/lib/public/util.php
+++ b/lib/public/util.php
@@ -48,7 +48,7 @@ class Util {
 	 * @brief get the current installed version of ownCloud
 	 * @return array
 	 */
-	public static function getVersion(){
+	public static function getVersion() {
 		return(\OC_Util::getVersion());
 	}
 
@@ -85,7 +85,7 @@ class Util {
 	 * @brief add a css file
 	 * @param url  $url
 	 */
-	public static function addStyle( $application, $file = null ){
+	public static function addStyle( $application, $file = null ) {
 		\OC_Util::addStyle( $application, $file );
         }
 
@@ -95,7 +95,7 @@ class Util {
 	 * @param appid  $application
 	 * @param filename  $file
 	 */
-	public static function addScript( $application, $file = null ){
+	public static function addScript( $application, $file = null ) {
 		\OC_Util::addScript( $application, $file );
         }
 
@@ -105,7 +105,7 @@ class Util {
 	 * @param array $attributes array of attributes for the element
 	 * @param string $text the text content for the element
 	 */
-	public static function addHeader( $tag, $attributes, $text=''){
+	public static function addHeader( $tag, $attributes, $text='') {
 		\OC_Util::addHeader( $tag, $attributes, $text );
 	}
 
@@ -114,7 +114,7 @@ class Util {
 	 * @param int timestamp $timestamp
 	 * @param bool dateOnly option to ommit time from the result
 	 */
-	public static function formatDate( $timestamp,$dateOnly=false){
+	public static function formatDate( $timestamp,$dateOnly=false) {
 		return(\OC_Util::formatDate( $timestamp,$dateOnly ));
 	}
 
@@ -166,7 +166,7 @@ class Util {
 	*
 	* Returns a url to the given app and file.
 	*/
-	public static function linkTo( $app, $file, $args = array() ){
+	public static function linkTo( $app, $file, $args = array() ) {
 		return(\OC_Helper::linkTo( $app, $file, $args ));
 	}
 
@@ -199,7 +199,7 @@ class Util {
 	 *
 	 * Returns the path to the image.
 	 */
-        public static function imagePath( $app, $image ){
+        public static function imagePath( $app, $image ) {
 		return(\OC_Helper::imagePath( $app, $image ));
 	}
 
@@ -211,7 +211,7 @@ class Util {
 	 *
 	 * Makes 2048 to 2 kB.
 	 */
-	public static function humanFileSize( $bytes ){
+	public static function humanFileSize( $bytes ) {
 		return(\OC_Helper::humanFileSize( $bytes ));
 	}
 
@@ -224,7 +224,7 @@ class Util {
 	 *
 	 * Inspired by: http://www.php.net/manual/en/function.filesize.php#92418
 	 */
-	public static function computerFileSize( $str ){
+	public static function computerFileSize( $str ) {
 		return(\OC_Helper::computerFileSize( $str ));
 	}
 
@@ -240,7 +240,7 @@ class Util {
 	 *
 	 * TODO: write example
 	 */
-	static public function connectHook( $signalclass, $signalname, $slotclass, $slotname ){
+	static public function connectHook( $signalclass, $signalname, $slotclass, $slotname ) {
 		return(\OC_Hook::connect( $signalclass, $signalname, $slotclass, $slotname ));
 	}
 
@@ -256,7 +256,7 @@ class Util {
 	 *
 	 * TODO: write example
 	 */
-	static public function emitHook( $signalclass, $signalname, $params = array()){
+	static public function emitHook( $signalclass, $signalname, $params = array()) {
 		return(\OC_Hook::emit( $signalclass, $signalname, $params ));
 	}
 
@@ -265,7 +265,7 @@ class Util {
 	 * Register an get/post call. This is important to prevent CSRF attacks
 	 * TODO: write example
 	 */
-	public static function callRegister(){
+	public static function callRegister() {
 		return(\OC_Util::callRegister());
 	}
 
@@ -274,7 +274,7 @@ class Util {
 	 * Check an ajax get/post call if the request token is valid. exit if not.
 	 * Todo: Write howto
 	 */
-	public static function callCheck(){
+	public static function callCheck() {
 		return(\OC_Util::callCheck());
 	}
 
@@ -286,7 +286,7 @@ class Util {
 	 * @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 ){
+	public static function sanitizeHTML( $value ) {
 		return(\OC_Util::sanitizeHTML($value));
 	}
 
@@ -300,7 +300,7 @@ class Util {
 	*
 	*
 	*/
-	public static function mb_array_change_key_case($input, $case = MB_CASE_LOWER, $encoding = 'UTF-8'){
+	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));
 	}
 
diff --git a/lib/request.php b/lib/request.php
index 10f6e91bac..87262d9862 100644
--- a/lib/request.php
+++ b/lib/request.php
@@ -15,7 +15,7 @@ class OC_Request {
 	 * reverse proxies
 	 */
 	public static function serverHost() {
-		if(OC::$CLI){
+		if(OC::$CLI) {
 			return 'localhost';
 		}
 		if (isset($_SERVER['HTTP_X_FORWARDED_HOST'])) {
@@ -57,7 +57,7 @@ class OC_Request {
 	 * @returns string Path info or false when not found
 	 */
 	public static function getPathInfo() {
-		if (array_key_exists('PATH_INFO', $_SERVER)){
+		if (array_key_exists('PATH_INFO', $_SERVER)) {
 			$path_info = $_SERVER['PATH_INFO'];
 		}else{
 			$path_info = substr($_SERVER['REQUEST_URI'], strlen($_SERVER['SCRIPT_NAME']));
diff --git a/lib/search.php b/lib/search.php
index 9dfd0cf69e..0b6ad05002 100644
--- a/lib/search.php
+++ b/lib/search.php
@@ -31,7 +31,7 @@ class OC_Search{
 	/**
 	 * remove all registered search providers
 	 */
-	public static function clearProviders(){
+	public static function clearProviders() {
 		self::$providers=array();
 		self::$registeredProviders=array();
 	}
@@ -40,7 +40,7 @@ class OC_Search{
 	 * register a new search provider to be used
 	 * @param string $provider class name of a OC_Search_Provider
 	 */
-	public static function registerProvider($class,$options=array()){
+	public static function registerProvider($class,$options=array()) {
 		self::$registeredProviders[]=array('class'=>$class,'options'=>$options);
 	}
 
@@ -49,10 +49,10 @@ class OC_Search{
 	 * @param string query
 	 * @return array An array of OC_Search_Result's
 	 */
-	public static function search($query){
+	public static function search($query) {
 		self::initProviders();
 		$results=array();
-		foreach(self::$providers as $provider){
+		foreach(self::$providers as $provider) {
 			$results=array_merge($results, $provider->search($query));
 		}
 		return $results;
@@ -61,11 +61,11 @@ class OC_Search{
 	/**
 	 * create instances of all the registered search providers
 	 */
-	private static function initProviders(){
-		if(count(self::$providers)>0){
+	private static function initProviders() {
+		if(count(self::$providers)>0) {
 			return;
 		}
-		foreach(self::$registeredProviders as $provider){
+		foreach(self::$registeredProviders as $provider) {
 			$class=$provider['class'];
 			$options=$provider['options'];
 			self::$providers[]=new $class($options);
diff --git a/lib/search/provider.php b/lib/search/provider.php
index b83c5aa61b..b617b9c5d9 100644
--- a/lib/search/provider.php
+++ b/lib/search/provider.php
@@ -5,7 +5,7 @@
 abstract class OC_Search_Provider {
 	private $options;
 
-	public function __construct($options){
+	public function __construct($options) {
 		$this->options=$options;
 	}
 
diff --git a/lib/search/provider/file.php b/lib/search/provider/file.php
index 12a535876f..50e1645767 100644
--- a/lib/search/provider/file.php
+++ b/lib/search/provider/file.php
@@ -1,17 +1,17 @@
 <?php
 
 class OC_Search_Provider_File extends OC_Search_Provider{
-	function search($query){
+	function search($query) {
 		$files=OC_FileCache::search($query,true);
 		$results=array();
-		foreach($files as $fileData){
+		foreach($files as $fileData) {
 			$file=$fileData['path'];
 			$mime=$fileData['mimetype'];
-			if($mime=='httpd/unix-directory'){
+			if($mime=='httpd/unix-directory') {
 				$results[]=new OC_Search_Result(basename($file),'',OC_Helper::linkTo( 'files', 'index.php', array('dir' => $file)),'Files');
 			}else{
 				$mimeBase=$fileData['mimepart'];
-				switch($mimeBase){
+				switch($mimeBase) {
 					case 'audio':
 						break;
 					case 'text':
@@ -21,7 +21,7 @@ class OC_Search_Provider_File extends OC_Search_Provider{
 						$results[]=new OC_Search_Result(basename($file),'',OC_Helper::linkTo( 'files', 'download.php', array('dir' => $file) ),'Images');
 						break;
 					default:
-						if($mime=='application/xml'){
+						if($mime=='application/xml') {
 							$results[]=new OC_Search_Result(basename($file),'',OC_Helper::linkTo( 'files', 'download.php', array('dir' => $file) ),'Text');
 						}else{
 							$results[]=new OC_Search_Result(basename($file),'',OC_Helper::linkTo( 'files', 'download.php', array('dir' => $file) ),'Files');
diff --git a/lib/search/result.php b/lib/search/result.php
index cd78a5cf25..63b5cfabce 100644
--- a/lib/search/result.php
+++ b/lib/search/result.php
@@ -15,7 +15,7 @@ class OC_Search_Result{
 	 * @param string $link link for the result
 	 * @param string $type the type of result as human readable string ('File', 'Music', etc)
 	 */
-	public function __construct($name,$text,$link,$type){
+	public function __construct($name,$text,$link,$type) {
 		$this->name=$name;
 		$this->text=$text;
 		$this->link=$link;
diff --git a/lib/setup.php b/lib/setup.php
index 271fe55fd7..f27254a42a 100644
--- a/lib/setup.php
+++ b/lib/setup.php
@@ -74,7 +74,7 @@ class OC_Setup {
 			$datadir = htmlspecialchars_decode($options['directory']);
 
 			//use sqlite3 when available, otherise sqlite2 will be used.
-			if($dbtype=='sqlite' and class_exists('SQLite3')){
+			if($dbtype=='sqlite' and class_exists('SQLite3')) {
 				$dbtype='sqlite3';
 			}
 
@@ -114,7 +114,7 @@ class OC_Setup {
 
 						//add prefix to the mysql user name to prevent collisions
 						$dbusername=substr('oc_'.$username,0,16);
-						if($dbusername!=$oldUser){
+						if($dbusername!=$oldUser) {
 							//hash the password so we don't need to store the admin config in the config file
 							$dbpassword=md5(time().$password);
 
@@ -128,7 +128,7 @@ class OC_Setup {
 						self::createDatabase($dbname, $dbusername, $connection);
 					}
 					else {
-						if($dbuser!=$oldUser){
+						if($dbuser!=$oldUser) {
 							OC_Config::setValue('dbuser', $dbuser);
 							OC_Config::setValue('dbpassword', $dbpass);
 						}
@@ -140,7 +140,7 @@ class OC_Setup {
 					//fill the database if needed
 					$query="select count(*) from information_schema.tables where table_schema='$dbname' AND table_name = '{$dbtableprefix}users';";
 					$result = mysql_query($query,$connection);
-					if($result){
+					if($result) {
 						$row=mysql_fetch_row($result);
 					}
 					if(!$result or $row[0]==0) {
@@ -345,7 +345,7 @@ class OC_Setup {
                         }
 			else {
 				//delete the old sqlite database first, might cause infinte loops otherwise
-				if(file_exists("$datadir/owncloud.db")){
+				if(file_exists("$datadir/owncloud.db")) {
 					unlink("$datadir/owncloud.db");
 				}
 				//in case of sqlite, we can always fill the database
diff --git a/lib/streamwrappers.php b/lib/streamwrappers.php
index f502c6170b..1e5b19a11f 100644
--- a/lib/streamwrappers.php
+++ b/lib/streamwrappers.php
@@ -5,17 +5,17 @@ class OC_FakeDirStream{
 	private $name;
 	private $index;
 
-	public function dir_opendir($path,$options){
+	public function dir_opendir($path,$options) {
 		$this->name=substr($path,strlen('fakedir://'));
 		$this->index=0;
-		if(!isset(self::$dirs[$this->name])){
+		if(!isset(self::$dirs[$this->name])) {
 			self::$dirs[$this->name]=array();
 		}
 		return true;
 	}
 
-	public function dir_readdir(){
-		if($this->index>=count(self::$dirs[$this->name])){
+	public function dir_readdir() {
+		if($this->index>=count(self::$dirs[$this->name])) {
 			return false;
 		}
 		$filename=self::$dirs[$this->name][$this->index];
@@ -222,35 +222,35 @@ class OC_CloseStreamWrapper{
 	private $path='';
 	private $source;
 	private static $open=array();
-	public function stream_open($path, $mode, $options, &$opened_path){
+	public function stream_open($path, $mode, $options, &$opened_path) {
 		$path=substr($path,strlen('close://'));
 		$this->path=$path;
 		$this->source=fopen($path,$mode);
-		if(is_resource($this->source)){
+		if(is_resource($this->source)) {
 			$this->meta=stream_get_meta_data($this->source);
 		}
 		self::$open[]=$path;
 		return is_resource($this->source);
 	}
 
-	public function stream_seek($offset, $whence=SEEK_SET){
+	public function stream_seek($offset, $whence=SEEK_SET) {
 		fseek($this->source,$offset,$whence);
 	}
 
-	public function stream_tell(){
+	public function stream_tell() {
 		return ftell($this->source);
 	}
 
-	public function stream_read($count){
+	public function stream_read($count) {
 		return fread($this->source,$count);
 	}
 
-	public function stream_write($data){
+	public function stream_write($data) {
 		return fwrite($this->source,$data);
 	}
 
-	public function stream_set_option($option,$arg1,$arg2){
-		switch($option){
+	public function stream_set_option($option,$arg1,$arg2) {
+		switch($option) {
 			case STREAM_OPTION_BLOCKING:
 				stream_set_blocking($this->source,$arg1);
 				break;
@@ -262,39 +262,39 @@ class OC_CloseStreamWrapper{
 		}
 	}
 
-	public function stream_stat(){
+	public function stream_stat() {
 		return fstat($this->source);
 	}
 
-	public function stream_lock($mode){
+	public function stream_lock($mode) {
 		flock($this->source,$mode);
 	}
 
-	public function stream_flush(){
+	public function stream_flush() {
 		return fflush($this->source);
 	}
 
-	public function stream_eof(){
+	public function stream_eof() {
 		return feof($this->source);
 	}
 
 	public function url_stat($path) {
 		$path=substr($path,strlen('close://'));
-		if(file_exists($path)){
+		if(file_exists($path)) {
 			return stat($path);
 		}else{
 			return false;
 		}
 	}
 
-	public function stream_close(){
+	public function stream_close() {
 		fclose($this->source);
-		if(isset(self::$callBacks[$this->path])){
+		if(isset(self::$callBacks[$this->path])) {
 			call_user_func(self::$callBacks[$this->path],$this->path);
 		}
 	}
 
-	public function unlink($path){
+	public function unlink($path) {
 		$path=substr($path,strlen('close://'));
 		return unlink($path);
 	}
diff --git a/lib/subadmin.php b/lib/subadmin.php
index 4752492df3..363e4a97ca 100644
--- a/lib/subadmin.php
+++ b/lib/subadmin.php
@@ -36,7 +36,7 @@ class OC_SubAdmin{
 	 * @param $gid gid of the group
 	 * @return boolean
 	 */
-	public static function createSubAdmin($uid, $gid){
+	public static function createSubAdmin($uid, $gid) {
 		$stmt = OC_DB::prepare('INSERT INTO `*PREFIX*group_admin` (`gid`,`uid`) VALUES(?,?)');
 		$result = $stmt->execute(array($gid, $uid));
 		OC_Hook::emit( "OC_SubAdmin", "post_createSubAdmin", array( "gid" => $gid ));
@@ -49,7 +49,7 @@ class OC_SubAdmin{
 	 * @param $gid gid of the group
 	 * @return boolean
 	 */
-	public static function deleteSubAdmin($uid, $gid){
+	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));
 		OC_Hook::emit( "OC_SubAdmin", "post_deleteSubAdmin", array( "gid" => $gid ));
@@ -61,11 +61,11 @@ class OC_SubAdmin{
 	 * @param $uid uid of the SubAdmin
 	 * @return array
 	 */
-	public static function getSubAdminsGroups($uid){
+	public static function getSubAdminsGroups($uid) {
 		$stmt = OC_DB::prepare('SELECT `gid` FROM `*PREFIX*group_admin` WHERE `uid` = ?');
 		$result = $stmt->execute(array($uid));
 		$gids = array();
-		while($row = $result->fetchRow()){
+		while($row = $result->fetchRow()) {
 			$gids[] = $row['gid'];
 		}
 		return $gids;
@@ -76,11 +76,11 @@ class OC_SubAdmin{
 	 * @param $gid gid of the group
 	 * @return array
 	 */
-	public static function getGroupsSubAdmins($gid){
+	public static function getGroupsSubAdmins($gid) {
 		$stmt = OC_DB::prepare('SELECT `uid` FROM `*PREFIX*group_admin` WHERE `gid` = ?');
 		$result = $stmt->execute(array($gid));
 		$uids = array();
-		while($row = $result->fetchRow()){
+		while($row = $result->fetchRow()) {
 			$uids[] = $row['uid'];
 		}
 		return $uids;
@@ -90,11 +90,11 @@ class OC_SubAdmin{
 	 * @brief get all SubAdmins
 	 * @return array
 	 */
-	public static function getAllSubAdmins(){
+	public static function getAllSubAdmins() {
 		$stmt = OC_DB::prepare('SELECT * FROM `*PREFIX*group_admin`');
 		$result = $stmt->execute();
 		$subadmins = array();
-		while($row = $result->fetchRow()){
+		while($row = $result->fetchRow()) {
 			$subadmins[] = $row;
 		}
 		return $subadmins;
@@ -106,11 +106,11 @@ class OC_SubAdmin{
 	 * @param $gid gid of the group
 	 * @return bool
 	 */
-	public static function isSubAdminofGroup($uid, $gid){
+	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){
+		if($result['count'] >= 1) {
 			return true;
 		}
 		return false;
@@ -121,11 +121,11 @@ class OC_SubAdmin{
 	 * @param $uid uid of the subadmin
 	 * @return bool
 	 */
-	public static function isSubAdmin($uid){
+	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){
+		if($result['count'] > 0) {
 			return true;
 		}
 		return false;
@@ -137,16 +137,16 @@ class OC_SubAdmin{
 	 * @param $user uid of the user
 	 * @return bool
 	 */
-	public static function isUserAccessible($subadmin, $user){
-		if(!self::isSubAdmin($subadmin)){
+	public static function isUserAccessible($subadmin, $user) {
+		if(!self::isSubAdmin($subadmin)) {
 			return false;
 		}
-		if(OC_Group::inGroup($user, 'admin')){
+		if(OC_Group::inGroup($user, 'admin')) {
 			return false;
 		}
 		$accessiblegroups = self::getSubAdminsGroups($subadmin);
-		foreach($accessiblegroups as $accessiblegroup){
-			if(OC_Group::inGroup($user, $accessiblegroup)){
+		foreach($accessiblegroups as $accessiblegroup) {
+			if(OC_Group::inGroup($user, $accessiblegroup)) {
 				return true;
 			}
 		}
@@ -156,7 +156,7 @@ class OC_SubAdmin{
 	/*
 	 * @brief alias for self::isSubAdminofGroup()
 	 */
-	public static function isGroupAccessible($subadmin, $group){
+	public static function isGroupAccessible($subadmin, $group) {
 		return self::isSubAdminofGroup($subadmin, $group);
 	}
 
@@ -165,7 +165,7 @@ class OC_SubAdmin{
 	 * @param $parameters
 	 * @return boolean
 	 */
-	public static function post_deleteUser($parameters){
+	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;
@@ -176,7 +176,7 @@ class OC_SubAdmin{
 	 * @param $parameters
 	 * @return boolean
 	 */
-	public static function post_deleteGroup($parameters){
+	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;
diff --git a/lib/template.php b/lib/template.php
index 2359bd50c4..8c872a2059 100644
--- a/lib/template.php
+++ b/lib/template.php
@@ -30,7 +30,7 @@
  *
  * For further information have a look at OC_Helper::linkTo
  */
-function link_to( $app, $file, $args = array() ){
+function link_to( $app, $file, $args = array() ) {
 	return OC_Helper::linkTo( $app, $file, $args );
 }
 
@@ -42,7 +42,7 @@ function link_to( $app, $file, $args = array() ){
  *
  * For further information have a look at OC_Helper::imagePath
  */
-function image_path( $app, $image ){
+function image_path( $app, $image ) {
 	return OC_Helper::imagePath( $app, $image );
 }
 
@@ -53,7 +53,7 @@ function image_path( $app, $image ){
  *
  * For further information have a look at OC_Helper::mimetypeIcon
  */
-function mimetype_icon( $mimetype ){
+function mimetype_icon( $mimetype ) {
 	return OC_Helper::mimetypeIcon( $mimetype );
 }
 
@@ -64,7 +64,7 @@ function mimetype_icon( $mimetype ){
  *
  * For further information have a look at OC_Helper::humanFileSize
  */
-function human_file_size( $bytes ){
+function human_file_size( $bytes ) {
 	return OC_Helper::humanFileSize( $bytes );
 }
 
@@ -99,25 +99,25 @@ function relative_modified_date($timestamp) {
 }
 
 function html_select_options($options, $selected, $params=array()) {
-	if (!is_array($selected)){
+	if (!is_array($selected)) {
 		$selected=array($selected);
 	}
-	if (isset($params['combine']) && $params['combine']){
+	if (isset($params['combine']) && $params['combine']) {
 		$options = array_combine($options, $options);
 	}
 	$value_name = $label_name = false;
-	if (isset($params['value'])){
+	if (isset($params['value'])) {
 		$value_name = $params['value'];
 	}
-	if (isset($params['label'])){
+	if (isset($params['label'])) {
 		$label_name = $params['label'];
 	}
 	$html = '';
-	foreach($options as $value => $label){
-		if ($value_name && is_array($label)){
+	foreach($options as $value => $label) {
+		if ($value_name && is_array($label)) {
 			$value = $label[$value_name];
 		}
-		if ($label_name && is_array($label)){
+		if ($label_name && is_array($label)) {
 			$label = $label[$label_name];
 		}
 		$select = in_array($value, $selected) ? ' selected="selected"' : '';
@@ -150,7 +150,7 @@ class OC_Template{
 	 * according layout. For now, renderas can be set to "guest", "user" or
 	 * "admin".
 	 */
-	public function __construct( $app, $name, $renderas = "" ){
+	public function __construct( $app, $name, $renderas = "" ) {
 		// Set the private data
 		$this->renderas = $renderas;
 		$this->application = $app;
@@ -175,14 +175,14 @@ class OC_Template{
 	 *	sidebar, just the application. Useful to use just a specific
 	 *	app on the desktop in a standalone window.
 	 */
-	public static function detectFormfactor(){
+	public static function detectFormfactor() {
 		// please add more useragent strings for other devices
-		if(isset($_SERVER['HTTP_USER_AGENT'])){
+		if(isset($_SERVER['HTTP_USER_AGENT'])) {
 			if(stripos($_SERVER['HTTP_USER_AGENT'],'ipad')>0) {
 				$mode='tablet';
-			}elseif(stripos($_SERVER['HTTP_USER_AGENT'],'iphone')>0){
+			}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)){
+			}elseif((stripos($_SERVER['HTTP_USER_AGENT'],'N9')>0) and (stripos($_SERVER['HTTP_USER_AGENT'],'nokia')>0)) {
 				$mode='mobile';
 			}else{
 				$mode='default';
@@ -201,11 +201,11 @@ class OC_Template{
 		// if the formfactor is not yet autodetected do the
 		// autodetection now. For possible formfactors check the
 		// detectFormfactor documentation
-		if(!isset($_SESSION['formfactor'])){
+		if(!isset($_SESSION['formfactor'])) {
 			$_SESSION['formfactor'] = self::detectFormfactor();
 		}
 		// allow manual override via GET parameter
-		if(isset($_GET['formfactor'])){
+		if(isset($_GET['formfactor'])) {
 			$_SESSION['formfactor']=$_GET['formfactor'];
 		}
 		$formfactor=$_SESSION['formfactor'];
@@ -240,9 +240,9 @@ class OC_Template{
 
 		$app = $this->application;
 		// Check if it is a app template or not.
-		if( $app != "" ){
+		if( $app != "" ) {
 			// Check if the app is in the app folder or in the root
-			if( file_exists(OC_App::getAppPath($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_App::getAppPath($app)."/templates/", $name, $fext)) {
@@ -282,9 +282,9 @@ class OC_Template{
 	{
 		if ($name =='') return false;
 		$template = null;
-		if( is_file( $path.$name.$fext.'.php' )){
+		if( is_file( $path.$name.$fext.'.php' )) {
 			$template = $path.$name.$fext.'.php';
-		}elseif( is_file( $path.$name.'.php' )){
+		}elseif( is_file( $path.$name.'.php' )) {
 			$template = $path.$name.'.php';
 		}
 		if ($template) {
@@ -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) $value=OC_Util::sanitizeHTML($value);
 		$this->vars[$key] = $value;
 		return true;
@@ -323,8 +323,8 @@ class OC_Template{
 	 * exists, the value will be appended. It can be accessed via
 	 * $_[$key][$position] in the template.
 	 */
-	public function append( $key, $value ){
-		if( array_key_exists( $key, $this->vars )){
+	public function append( $key, $value ) {
+		if( array_key_exists( $key, $this->vars )) {
 			$this->vars[$key][] = $value;
 		}
 		else{
@@ -338,7 +338,7 @@ class OC_Template{
 	 * @param array $attributes array of attrobutes for the element
 	 * @param string $text the text content for the element
 	 */
-	public function addHeader( $tag, $attributes, $text=''){
+	public function addHeader( $tag, $attributes, $text='') {
 		$this->headers[]=array('tag'=>$tag,'attributes'=>$attributes,'text'=>$text);
 	}
 
@@ -348,9 +348,9 @@ class OC_Template{
 	 *
 	 * This function proceeds the template and prints its output.
 	 */
-	public function printPage(){
+	public function printPage() {
 		$data = $this->fetchPage();
-		if( $data === false ){
+		if( $data === false ) {
 			return false;
 		}
 		else{
@@ -366,10 +366,10 @@ class OC_Template{
 	 * This function proceeds the template. If $this->renderas is set, it
 	 * will produce a full page.
 	 */
-	public function fetchPage(){
+	public function fetchPage() {
 		$data = $this->_fetch();
 
-		if( $this->renderas ){
+		if( $this->renderas ) {
 			$page = new OC_TemplateLayout($this->renderas);
 			if($this->renderas == 'user') {
 				$page->assign('requesttoken', $this->vars['requesttoken']);
@@ -377,7 +377,7 @@ class OC_Template{
 
 			// Add custom headers
 			$page->assign('headers',$this->headers, false);
-			foreach(OC_Util::$headers as $header){
+			foreach(OC_Util::$headers as $header) {
 				$page->append('headers',$header);
 			}
 
@@ -395,7 +395,7 @@ class OC_Template{
 	 *
 	 * Includes the template file, fetches its output
 	 */
-	private function _fetch(){
+	private function _fetch() {
 		// Register the variables
 		$_ = $this->vars;
 		$l = $this->l10n;
@@ -417,12 +417,12 @@ class OC_Template{
 	 * Includes another template. use <?php echo $this->inc('template'); ?> to
 	 * do this.
 	 */
-	public function inc( $file, $additionalparams = null ){
+	public function inc( $file, $additionalparams = null ) {
 		// $_ erstellen
 		$_ = $this->vars;
 		$l = $this->l10n;
 
-		if( !is_null($additionalparams)){
+		if( !is_null($additionalparams)) {
 			$_ = array_merge( $additionalparams, $this->vars );
 		}
 
@@ -443,9 +443,9 @@ class OC_Template{
 	 * @param $parameters Parameters for the template
 	 * @returns true/false
 	 */
-	public static function printUserPage( $application, $name, $parameters = array() ){
+	public static function printUserPage( $application, $name, $parameters = array() ) {
 		$content = new OC_Template( $application, $name, "user" );
-		foreach( $parameters as $key => $value ){
+		foreach( $parameters as $key => $value ) {
 			$content->assign( $key, $value, false );
 		}
 		print $content->printPage();
@@ -458,9 +458,9 @@ class OC_Template{
 	 * @param $parameters Parameters for the template
 	 * @returns true/false
 	 */
-	public static function printAdminPage( $application, $name, $parameters = array() ){
+	public static function printAdminPage( $application, $name, $parameters = array() ) {
 		$content = new OC_Template( $application, $name, "admin" );
-		foreach( $parameters as $key => $value ){
+		foreach( $parameters as $key => $value ) {
 			$content->assign( $key, $value, false );
 		}
 		return $content->printPage();
@@ -473,9 +473,9 @@ class OC_Template{
 	 * @param $parameters Parameters for the template
 	 * @returns true/false
 	 */
-	public static function printGuestPage( $application, $name, $parameters = array() ){
+	public static function printGuestPage( $application, $name, $parameters = array() ) {
 		$content = new OC_Template( $application, $name, "guest" );
-		foreach( $parameters as $key => $value ){
+		foreach( $parameters as $key => $value ) {
 			$content->assign( $key, $value, false );
 		}
 		return $content->printPage();
diff --git a/lib/templatelayout.php b/lib/templatelayout.php
index 18fd23aac9..ad013edad8 100644
--- a/lib/templatelayout.php
+++ b/lib/templatelayout.php
@@ -7,13 +7,13 @@
  */
 
 class OC_TemplateLayout extends OC_Template {
-	public function __construct( $renderas ){
+	public function __construct( $renderas ) {
 		// Decide which page we show
 
-		if( $renderas == 'user' ){
+		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){
+			if(array_search(OC_APP::getCurrentApp(),array('settings','admin','help'))!==false) {
 				$this->assign('bodyid','body-settings', false);
 			}else{
 				$this->assign('bodyid','body-user', false);
@@ -36,7 +36,7 @@ class OC_TemplateLayout extends OC_Template {
 		}
 
 		$apps_paths = array();
-		foreach(OC_App::getEnabledApps() as $app){
+		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
@@ -96,7 +96,7 @@ class OC_TemplateLayout extends OC_Template {
                 return false;
         }
 
-	static public function findStylesheetFiles($styles){
+	static public function findStylesheetFiles($styles) {
 		// Read the selected theme from the config file
 		$theme=OC_Config::getValue( 'theme' );
 
@@ -104,7 +104,7 @@ class OC_TemplateLayout extends OC_Template {
 		$fext = self::getFormFactorExtension();
 
 		$files = array();
-		foreach($styles as $style){
+		foreach($styles as $style) {
 			// is it in 3rdparty?
 			if(self::appendIfExist($files, OC::$THIRDPARTYROOT, OC::$THIRDPARTYWEBROOT, $style.'.css')) {
 
@@ -132,7 +132,7 @@ 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){
+			foreach($styles as $style) {
 				     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" )) {
 
@@ -147,7 +147,7 @@ class OC_TemplateLayout extends OC_Template {
 		return $files;
 	}
 
-	static public function findJavascriptFiles($scripts){
+	static public function findJavascriptFiles($scripts) {
 		// Read the selected theme from the config file
 		$theme=OC_Config::getValue( 'theme' );
 
@@ -155,7 +155,7 @@ class OC_TemplateLayout extends OC_Template {
 		$fext = self::getFormFactorExtension();
 
 		$files = array();
-		foreach($scripts as $script){
+		foreach($scripts as $script) {
 			// Is it in 3rd party?
 			if(self::appendIfExist($files, OC::$THIRDPARTYROOT, OC::$THIRDPARTYWEBROOT, $script.'.js')) {
 
diff --git a/lib/updater.php b/lib/updater.php
index 1b1a4eab97..ad42f2bf60 100644
--- a/lib/updater.php
+++ b/lib/updater.php
@@ -28,7 +28,7 @@ class OC_Updater{
 	/**
 	 * Check if a new version is available
 	 */
-	public static function check(){
+	public static function check() {
 		OC_Appconfig::setValue('core', 'lastupdatedat',microtime(true));
 		if(OC_Appconfig::getValue('core', 'installedat','')=='') OC_Appconfig::setValue('core', 'installedat',microtime(true));
 
@@ -43,7 +43,7 @@ class OC_Updater{
 		//fetch xml data from updater
 		$url=$updaterurl.'?version='.$versionstring;
                 $xml=@file_get_contents($url);
-                if($xml==FALSE){
+                if($xml==FALSE) {
                         return array();
                 }
                 $data=@simplexml_load_string($xml);
@@ -57,10 +57,10 @@ class OC_Updater{
                 return $tmp;
 	}
 
-	public static function ShowUpdatingHint(){
+	public static function ShowUpdatingHint() {
 		$l = OC_L10N::get('lib');
 
-		if(OC_Config::getValue('updatechecker', true)==true){
+		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;">'.$l->t('%s is available. Get <a href="%s">more information</a>',array($data['versionstring'], $data['web'])).'</span>';
@@ -77,7 +77,7 @@ class OC_Updater{
 	/**
 	 * do ownCloud update
 	 */
-	public static function doUpdate(){
+	public static function doUpdate() {
 
 		//update ownCloud core
 
diff --git a/lib/user.php b/lib/user.php
index 236478e9e5..89dab9f964 100644
--- a/lib/user.php
+++ b/lib/user.php
@@ -52,7 +52,7 @@ class OC_User {
 	 *
 	 * Makes a list of backends that can be used by other modules
 	 */
-	public static function registerBackend( $backend ){
+	public static function registerBackend( $backend ) {
 		self::$_backends[] = $backend;
 		return true;
 	}
@@ -63,7 +63,7 @@ class OC_User {
 	 *
 	 * Returns the names of all backends.
 	 */
-	public static function getBackends(){
+	public static function getBackends() {
 		return self::$_backends;
 	}
 
@@ -73,7 +73,7 @@ class OC_User {
 	 *
 	 * Returns the names of all used backends.
 	 */
-	public static function getUsedBackends(){
+	public static function getUsedBackends() {
 		return array_keys(self::$_usedBackends);
 	}
 
@@ -84,17 +84,17 @@ class OC_User {
 	 *
 	 * Set the User Authentication Module
 	 */
-	public static function useBackend( $backend = 'database' ){
-		if($backend instanceof OC_User_Interface){
+	public static function useBackend( $backend = 'database' ) {
+		if($backend instanceof OC_User_Interface) {
 			self::$_usedBackends[get_class($backend)]=$backend;
 		}else{
 			// You'll never know what happens
-			if( null === $backend OR !is_string( $backend )){
+			if( null === $backend OR !is_string( $backend )) {
 				$backend = 'database';
 			}
 
 			// Load backend
-			switch( $backend ){
+			switch( $backend ) {
 				case 'database':
 				case 'mysql':
 				case 'sqlite':
@@ -112,19 +112,19 @@ class OC_User {
 	/**
 	 * remove all used backends
 	 */
-	public static function clearBackends(){
+	public static function clearBackends() {
 		self::$_usedBackends=array();
 	}
 
 	/**
 	 * setup the configured backends in config.php
 	 */
-	public static function setupBackends(){
+	public static function setupBackends() {
 		$backends=OC_Config::getValue('user_backends',array());
-		foreach($backends as $i=>$config){
+		foreach($backends as $i=>$config) {
 			$class=$config['class'];
 			$arguments=$config['arguments'];
-			if(class_exists($class) and array_search($i,self::$_setupedBackends)===false){
+			if(class_exists($class) and array_search($i,self::$_setupedBackends)===false) {
 				// make a reflection object
 				$reflectionObj = new ReflectionClass($class);
 
@@ -149,23 +149,23 @@ class OC_User {
 	 *
 	 * Allowed characters in the username are: "a-z", "A-Z", "0-9" and "_.@-"
 	 */
-	public static function createUser( $uid, $password ){
+	public static function createUser( $uid, $password ) {
 		// Check the name for bad characters
 		// Allowed are: "a-z", "A-Z", "0-9" and "_.@-"
-		if( preg_match( '/[^a-zA-Z0-9 _\.@\-]/', $uid )){
+		if( preg_match( '/[^a-zA-Z0-9 _\.@\-]/', $uid )) {
 			throw new Exception('Only the following characters are allowed in a username: "a-z", "A-Z", "0-9", and "_.@-"');
 		}
 		// No empty username
-		if(trim($uid) == ''){
+		if(trim($uid) == '') {
 			throw new Exception('A valid username must be provided');
 		}
 		// No empty password
-		if(trim($password) == ''){
+		if(trim($password) == '') {
 			throw new Exception('A valid password must be provided');
 		}
 
 		// Check if user already exists
-		if( self::userExists($uid) ){
+		if( self::userExists($uid) ) {
 			throw new Exception('The username is already being used');
 		}
 
@@ -173,9 +173,9 @@ class OC_User {
 		$run = true;
 		OC_Hook::emit( "OC_User", "pre_createUser", array( "run" => &$run, "uid" => $uid, "password" => $password ));
 
-		if( $run ){
+		if( $run ) {
 			//create the user in the first backend that supports creating users
-			foreach(self::$_usedBackends as $backend){
+			foreach(self::$_usedBackends as $backend) {
 				if(!$backend->implementsActions(OC_USER_BACKEND_CREATE_USER))
 					continue;
 
@@ -195,17 +195,17 @@ class OC_User {
 	 *
 	 * Deletes a user
 	 */
-	public static function deleteUser( $uid ){
+	public static function deleteUser( $uid ) {
 		$run = true;
 		OC_Hook::emit( "OC_User", "pre_deleteUser", array( "run" => &$run, "uid" => $uid ));
 
-		if( $run ){
+		if( $run ) {
 			//delete the user from all backends
-			foreach(self::$_usedBackends as $backend){
+			foreach(self::$_usedBackends as $backend) {
 				$backend->deleteUser($uid);
 			}
 			// We have to delete the user from all groups
-			foreach( OC_Group::getUserGroups( $uid ) as $i ){
+			foreach( OC_Group::getUserGroups( $uid ) as $i ) {
 				OC_Group::removeFromGroup( $uid, $i );
 			}
 			// Delete the user's keys in preferences
@@ -227,14 +227,14 @@ class OC_User {
 	 *
 	 * Log in a user and regenerate a new session - if the password is ok
 	 */
-	public static function login( $uid, $password ){
+	public static function login( $uid, $password ) {
 		$run = true;
 		OC_Hook::emit( "OC_User", "pre_login", array( "run" => &$run, "uid" => $uid ));
 
-		if( $run ){
+		if( $run ) {
 			$uid = self::checkPassword( $uid, $password );
 			$enabled = self::isEnabled($uid);
-			if($uid && $enabled){
+			if($uid && $enabled) {
 				session_regenerate_id(true);
 				self::setUserId($uid);
 				OC_Hook::emit( "OC_User", "post_login", array( "uid" => $uid, 'password'=>$password ));
@@ -260,7 +260,7 @@ class OC_User {
 	 *
 	 * Logout, destroys session
 	 */
-	public static function logout(){
+	public static function logout() {
 		OC_Hook::emit( "OC_User", "logout", array());
 		session_unset();
 		session_destroy();
@@ -274,11 +274,11 @@ class OC_User {
 	 *
 	 * Checks if the user is logged in
 	 */
-	public static function isLoggedIn(){
+	public static function isLoggedIn() {
 		if( isset($_SESSION['user_id']) AND $_SESSION['user_id']) {
 			OC_App::loadApps(array('authentication'));
 			self::setupBackends();
-			if (self::userExists($_SESSION['user_id']) ){
+			if (self::userExists($_SESSION['user_id']) ) {
 				return true;
 			}
 		}
@@ -289,8 +289,8 @@ class OC_User {
 	 * @brief get the user id of the user currently logged in.
 	 * @return string uid or false
 	 */
-	public static function getUser(){
-		if( isset($_SESSION['user_id']) AND $_SESSION['user_id'] ){
+	public static function getUser() {
+		if( isset($_SESSION['user_id']) AND $_SESSION['user_id'] ) {
 			return $_SESSION['user_id'];
 		}
 		else{
@@ -304,7 +304,7 @@ class OC_User {
 	 *
 	 * generates a password
 	 */
-	public static function generatePassword(){
+	public static function generatePassword() {
 		return uniqId();
 	}
 
@@ -316,15 +316,15 @@ class OC_User {
 	 *
 	 * Change the password of a user
 	 */
-	public static function setPassword( $uid, $password ){
+	public static function setPassword( $uid, $password ) {
 		$run = true;
 		OC_Hook::emit( "OC_User", "pre_setPassword", array( "run" => &$run, "uid" => $uid, "password" => $password ));
 
-		if( $run ){
+		if( $run ) {
 			$success = false;
-			foreach(self::$_usedBackends as $backend){
-				if($backend->implementsActions(OC_USER_BACKEND_SET_PASSWORD)){
-					if($backend->userExists($uid)){
+			foreach(self::$_usedBackends as $backend) {
+				if($backend->implementsActions(OC_USER_BACKEND_SET_PASSWORD)) {
+					if($backend->userExists($uid)) {
 						$success |= $backend->setPassword($uid,$password);
 					}
 				}
@@ -346,11 +346,11 @@ class OC_User {
 	 * Check if the password is correct without logging in the user
 	 * returns the user id or false
 	 */
-	public static function checkPassword( $uid, $password ){
-		foreach(self::$_usedBackends as $backend){
-			if($backend->implementsActions(OC_USER_BACKEND_CHECK_PASSWORD)){
+	public static function checkPassword( $uid, $password ) {
+		foreach(self::$_usedBackends as $backend) {
+			if($backend->implementsActions(OC_USER_BACKEND_CHECK_PASSWORD)) {
 				$result=$backend->checkPassword( $uid, $password );
-				if($result){
+				if($result) {
 					return $result;
 				}
 			}
@@ -366,11 +366,11 @@ class OC_User {
 	 * Check if the password is correct without logging in the user
 	 * returns the user id or false
 	 */
-	public static function getHome($uid){
-		foreach(self::$_usedBackends as $backend){
-			if($backend->implementsActions(OC_USER_BACKEND_GET_HOME)){
+	public static function getHome($uid) {
+		foreach(self::$_usedBackends as $backend) {
+			if($backend->implementsActions(OC_USER_BACKEND_GET_HOME)) {
 				$result=$backend->getHome($uid);
-				if($result){
+				if($result) {
 					return $result;
 				}
 			}
@@ -401,10 +401,10 @@ class OC_User {
 	 * @param string $uid the username
 	 * @return boolean
 	 */
-	public static function userExists($uid){
-		foreach(self::$_usedBackends as $backend){
+	public static function userExists($uid) {
+		foreach(self::$_usedBackends as $backend) {
 			$result=$backend->userExists($uid);
-			if($result===true){
+			if($result===true) {
 				return true;
 			}
 		}
@@ -415,7 +415,7 @@ class OC_User {
 	 * disables a user
 	 * @param string $userid the user to disable
 	 */
-	public static function disableUser($userid){
+	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'));
@@ -425,7 +425,7 @@ class OC_User {
 	 * enable a user
 	 * @param string $userid
 	 */
-	public static function enableUser($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'));
@@ -436,7 +436,7 @@ class OC_User {
 	 * @param string $userid
 	 * @return bool
 	 */
-	public static function isEnabled($userid){
+	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'));
@@ -447,7 +447,7 @@ class OC_User {
 	 * @brief Set cookie value to use in next page load
 	 * @param string $username username to be set
 	 */
-	public static function setMagicInCookie($username, $token){
+	public static function setMagicInCookie($username, $token) {
 		$secure_cookie = OC_Config::getValue("forcessl", false);
 		setcookie("oc_username", $username, time()+60*60*24*15, '', '', $secure_cookie);
 		setcookie("oc_token", $token, time()+60*60*24*15, '', '', $secure_cookie);
@@ -457,7 +457,7 @@ class OC_User {
 	/**
 	 * @brief Remove cookie for "remember username"
 	 */
-	public static function unsetMagicInCookie(){
+	public static function unsetMagicInCookie() {
 		unset($_COOKIE["oc_username"]);
 		unset($_COOKIE["oc_token"]);
 		unset($_COOKIE["oc_remember_login"]);
diff --git a/lib/user/backend.php b/lib/user/backend.php
index 0ef7ccd046..2a95db9369 100644
--- a/lib/user/backend.php
+++ b/lib/user/backend.php
@@ -59,9 +59,9 @@ abstract class OC_User_Backend implements OC_User_Interface {
 	* Returns the supported actions as int to be
 	* compared with OC_USER_BACKEND_CREATE_USER etc.
 	*/
-	public function getSupportedActions(){
+	public function getSupportedActions() {
 		$actions = 0;
-		foreach($this->possibleActions AS $action => $methodName){
+		foreach($this->possibleActions AS $action => $methodName) {
 			if(method_exists($this, $methodName)) {
 				$actions |= $action;
 			}
@@ -78,7 +78,7 @@ abstract class OC_User_Backend implements OC_User_Interface {
 	* Returns the supported actions as int to be
 	* compared with OC_USER_BACKEND_CREATE_USER etc.
 	*/
-	public function implementsActions($actions){
+	public function implementsActions($actions) {
 		return (bool)($this->getSupportedActions() & $actions);
 	}
 
@@ -89,7 +89,7 @@ abstract class OC_User_Backend implements OC_User_Interface {
 	*
 	* Deletes a user
 	*/
-	public function deleteUser( $uid ){
+	public function deleteUser( $uid ) {
 		return false;
 	}
 
@@ -108,7 +108,7 @@ abstract class OC_User_Backend implements OC_User_Interface {
 	* @param string $uid the username
 	* @return boolean
 	*/
-	public function userExists($uid){
+	public function userExists($uid) {
 		return false;
 	}
 
@@ -117,7 +117,7 @@ abstract class OC_User_Backend implements OC_User_Interface {
 	* @param string $uid the username
 	* @return boolean
 	*/
-	public function getHome($uid){
+	public function getHome($uid) {
 		return false;
 	}
 }
diff --git a/lib/user/database.php b/lib/user/database.php
index 52f3b35fa5..76b44a2f6c 100644
--- a/lib/user/database.php
+++ b/lib/user/database.php
@@ -44,8 +44,8 @@ class OC_User_Database extends OC_User_Backend {
 	 */
 	static private $hasher=null;
 
-	private function getHasher(){
-		if(!self::$hasher){
+	private function getHasher() {
+		if(!self::$hasher) {
 			//we don't want to use DES based crypt(), since it doesn't return a has with a recognisable prefix
 			$forcePortable=(CRYPT_BLOWFISH!=1);
 			self::$hasher=new PasswordHash(8,$forcePortable);
@@ -63,8 +63,8 @@ class OC_User_Database 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 ){
-		if( $this->userExists($uid) ){
+	public function createUser( $uid, $password ) {
+		if( $this->userExists($uid) ) {
 			return false;
 		}else{
 			$hasher=$this->getHasher();
@@ -83,7 +83,7 @@ class OC_User_Database extends OC_User_Backend {
 	 *
 	 * Deletes a user
 	 */
-	public function deleteUser( $uid ){
+	public function deleteUser( $uid ) {
 		// Delete user-group-relation
 		$query = OC_DB::prepare( 'DELETE FROM `*PREFIX*users` WHERE uid = ?' );
 		$query->execute( array( $uid ));
@@ -98,8 +98,8 @@ class OC_User_Database extends OC_User_Backend {
 	 *
 	 * Change the password of a user
 	 */
-	public function setPassword( $uid, $password ){
-		if( $this->userExists($uid) ){
+	public function setPassword( $uid, $password ) {
+		if( $this->userExists($uid) ) {
 			$hasher=$this->getHasher();
 			$hash = $hasher->HashPassword($password.OC_Config::getValue('passwordsalt', ''));
 			$query = OC_DB::prepare( 'UPDATE `*PREFIX*users` SET `password` = ? WHERE `uid` = ?' );
@@ -120,22 +120,22 @@ class OC_User_Database 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 ){
+	public function checkPassword( $uid, $password ) {
 		$query = OC_DB::prepare( 'SELECT `uid`, `password` FROM `*PREFIX*users` WHERE LOWER(`uid`) = LOWER(?)' );
 		$result = $query->execute( array( $uid));
 
 		$row=$result->fetchRow();
-		if($row){
+		if($row) {
 			$storedHash=$row['password'];
-			if ($storedHash[0]=='$'){//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)){
+				if($hasher->CheckPassword($password.OC_Config::getValue('passwordsalt', ''), $storedHash)) {
 					return $row['uid'];
 				}else{
 					return false;
 				}
 			}else{//old sha1 based hashing
-				if(sha1($password)==$storedHash){
+				if(sha1($password)==$storedHash) {
 					//upgrade to new hashing
 					$this->setPassword($row['uid'],$password);
 					return $row['uid'];
@@ -169,7 +169,7 @@ class OC_User_Database extends OC_User_Backend {
 	 * @param string $uid the username
 	 * @return boolean
 	 */
-	public function userExists($uid){
+	public function userExists($uid) {
 		$query = OC_DB::prepare( 'SELECT * FROM `*PREFIX*users` WHERE LOWER(`uid`) = LOWER(?)' );
 		$result = $query->execute( array( $uid ));
 
@@ -181,8 +181,8 @@ class OC_User_Database extends OC_User_Backend {
 	* @param string $uid the username
 	* @return boolean
 	*/
-	public function getHome($uid){
-		if($this->userExists($uid)){
+	public function getHome($uid) {
+		if($this->userExists($uid)) {
 			return OC_Config::getValue( "datadirectory", OC::$SERVERROOT."/data" ) . '/' . $uid;
 		}else{
 			return false;
diff --git a/lib/user/dummy.php b/lib/user/dummy.php
index 15a67b7e1e..4dbbc02b88 100644
--- a/lib/user/dummy.php
+++ b/lib/user/dummy.php
@@ -35,8 +35,8 @@ class OC_User_Dummy 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){
-		if(isset($this->users[$uid])){
+	public function createUser($uid, $password) {
+		if(isset($this->users[$uid])) {
 			return false;
 		}else{
 			$this->users[$uid]=$password;
@@ -51,8 +51,8 @@ class OC_User_Dummy extends OC_User_Backend {
 		*
 		* Deletes a user
 		*/
-	public function deleteUser( $uid ){
-		if(isset($this->users[$uid])){
+	public function deleteUser( $uid ) {
+		if(isset($this->users[$uid])) {
 			unset($this->users[$uid]);
 			return true;
 		}else{
@@ -68,8 +68,8 @@ class OC_User_Dummy extends OC_User_Backend {
 		*
 		* Change the password of a user
 		*/
-	public function setPassword($uid, $password){
-		if(isset($this->users[$uid])){
+	public function setPassword($uid, $password) {
+		if(isset($this->users[$uid])) {
 			$this->users[$uid]=$password;
 			return true;
 		}else{
@@ -86,8 +86,8 @@ class OC_User_Dummy 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){
-		if(isset($this->users[$uid])){
+	public function checkPassword($uid, $password) {
+		if(isset($this->users[$uid])) {
 			return ($this->users[$uid]==$password);
 		}else{
 			return false;
@@ -109,7 +109,7 @@ class OC_User_Dummy extends OC_User_Backend {
 		* @param string $uid the username
 		* @return boolean
 		*/
-	public function userExists($uid){
+	public function userExists($uid) {
 		return isset($this->users[$uid]);
 	}
 }
diff --git a/lib/user/http.php b/lib/user/http.php
index 5149678e4e..2668341408 100644
--- a/lib/user/http.php
+++ b/lib/user/http.php
@@ -30,14 +30,14 @@ class OC_User_HTTP extends OC_User_Backend {
 	 * @param string path
 	 * @return array
 	 */
-	private function parseUrl($url){
+	private function parseUrl($url) {
 		$parts=parse_url($url);
 		$url=$parts['scheme'].'://'.$parts['host'];
-		if(isset($parts['port'])){
+		if(isset($parts['port'])) {
 			$url.=':'.$parts['port'];
 		}
 		$url.=$parts['path'];
-		if(isset($parts['query'])){
+		if(isset($parts['query'])) {
 			$url.='?'.$parts['query'];
 		}
 		return array($parts['user'],$url);
@@ -49,7 +49,7 @@ class OC_User_HTTP extends OC_User_Backend {
 	 * @param string url
 	 * @return boolean
 	 */
-	private function matchUrl($url){
+	private function matchUrl($url) {
 		return ! is_null(parse_url($url,PHP_URL_USER));
 	}
 
@@ -62,8 +62,8 @@ class OC_User_HTTP 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){
-		if(!$this->matchUrl($uid)){
+	public function checkPassword($uid, $password) {
+		if(!$this->matchUrl($uid)) {
 			return false;
 		}
 		list($user,$url)=$this->parseUrl($uid);
@@ -87,7 +87,7 @@ class OC_User_HTTP extends OC_User_Backend {
 	 * @param string $uid the username
 	 * @return boolean
 	 */
-	public function userExists($uid){
+	public function userExists($uid) {
 		return $this->matchUrl($uid);
 	}
 
@@ -96,8 +96,8 @@ class OC_User_HTTP extends OC_User_Backend {
 	* @param string $uid the username
 	* @return boolean
 	*/
-	public function getHome($uid){
-		if($this->userExists($uid)){
+	public function getHome($uid) {
+		if($this->userExists($uid)) {
 			return OC_Config::getValue( "datadirectory", OC::$SERVERROOT."/data" ) . '/' . $uid;
 		}else{
 			return false;
diff --git a/lib/util.php b/lib/util.php
index b742e27b55..5046550d6a 100755
--- a/lib/util.php
+++ b/lib/util.php
@@ -14,13 +14,13 @@ class OC_Util {
 	public static $core_scripts=array();
 
 	// Can be set up
-	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
+	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;
 		}
 
 		// If we are not forced to load a specific user we load the one that is logged in
-		if( $user == "" && OC_User::isLoggedIn()){
+		if( $user == "" && OC_User::isLoggedIn()) {
 			$user = OC_User::getUser();
 		}
 
@@ -33,16 +33,16 @@ class OC_Util {
 
 		$CONFIG_DATADIRECTORY = OC_Config::getValue( "datadirectory", OC::$SERVERROOT."/data" );
 		//first set up the local "root" storage
-		if(!self::$rootMounted){
+		if(!self::$rootMounted) {
 			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
+		if( $user != "" ) { //if we aren't logged in, there is no use to set up the filesystem
 			$user_dir = '/'.$user.'/files';
 			$user_root = OC_User::getHome($user);
 			$userdirectory = $user_root . '/files';
-			if( !is_dir( $userdirectory )){
+			if( !is_dir( $userdirectory )) {
 				mkdir( $userdirectory, 0755, true );
 			}
 			//jail the user into his "home" directory
@@ -61,7 +61,7 @@ class OC_Util {
 
 				$mtime=filemtime($user_root.'/mount.php');
 				$previousMTime=OC_Preferences::getValue($user,'files','mountconfigmtime',0);
-				if($mtime>$previousMTime){//mount config has changed, filecache needs to be updated
+				if($mtime>$previousMTime) {//mount config has changed, filecache needs to be updated
 					OC_FileCache::clear($user);
 					OC_Preferences::setValue($user,'files','mountconfigmtime',$mtime);
 				}
@@ -70,7 +70,7 @@ class OC_Util {
 		}
 	}
 
-	public static function tearDownFS(){
+	public static function tearDownFS() {
 		OC_Filesystem::tearDown();
 		self::$fsSetup=false;
 	}
@@ -79,7 +79,7 @@ class OC_Util {
 	 * get the current installed version of ownCloud
 	 * @return array
 	 */
-	public static function getVersion(){
+	public static function getVersion() {
 		// hint: We only can count up. So the internal version number of ownCloud 4.5 will be 4,9,0. This is not visible to the user
 		return array(4,83,6);
 	}
@@ -88,7 +88,7 @@ class OC_Util {
 	 * get the current installed version string of ownCloud
 	 * @return string
 	 */
-	public static function getVersionString(){
+	public static function getVersionString() {
 		return '4.5 beta 2';
 	}
 
@@ -96,7 +96,7 @@ class OC_Util {
 	 * 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(){
+	public static function getEditionString() {
 			return '';
 	}
 
@@ -106,12 +106,12 @@ class OC_Util {
 	 * @param appid  $application
 	 * @param filename  $file
 	 */
-	public static function addScript( $application, $file = null ){
-		if( is_null( $file )){
+	public static function addScript( $application, $file = null ) {
+		if( is_null( $file )) {
 			$file = $application;
 			$application = "";
 		}
-		if( !empty( $application )){
+		if( !empty( $application )) {
 			self::$scripts[] = "$application/js/$file";
 		}else{
 			self::$scripts[] = "js/$file";
@@ -124,12 +124,12 @@ class OC_Util {
 	 * @param appid  $application
 	 * @param filename  $file
 	 */
-	public static function addStyle( $application, $file = null ){
-		if( is_null( $file )){
+	public static function addStyle( $application, $file = null ) {
+		if( is_null( $file )) {
 			$file = $application;
 			$application = "";
 		}
-		if( !empty( $application )){
+		if( !empty( $application )) {
 			self::$styles[] = "$application/css/$file";
 		}else{
 			self::$styles[] = "css/$file";
@@ -142,7 +142,7 @@ class OC_Util {
 	 * @param array $attributes array of attributes for the element
 	 * @param string $text the text content for the element
 	 */
-	public static function addHeader( $tag, $attributes, $text=''){
+	public static function addHeader( $tag, $attributes, $text='') {
 		self::$headers[]=array('tag'=>$tag,'attributes'=>$attributes,'text'=>$text);
 	}
 
@@ -152,8 +152,8 @@ class OC_Util {
 	 * @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
+    public static function formatDate( $timestamp,$dateOnly=false) {
+		if(isset($_SESSION['timezone'])) {//adjust to clients timezone if we know it
 			$systemTimeZone = intval(date('O'));
 			$systemTimeZone=(round($systemTimeZone/100,0)*60)+($systemTimeZone%100);
 			$clientTimeZone=$_SESSION['timezone']*60;
@@ -197,11 +197,11 @@ class OC_Util {
 	 * check if the current server configuration is suitable for ownCloud
 	 * @return array arrays with error messages and hints
 	 */
-	public static function checkServer(){
+	public static function checkServer() {
 		$errors=array();
 
 		//check for database drivers
-		if(!(is_callable('sqlite_open') or class_exists('SQLite3')) and !is_callable('mysql_connect') and !is_callable('pg_connect')){
+		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
 		}
 
@@ -223,25 +223,25 @@ class OC_Util {
 
 		$CONFIG_DATADIRECTORY = OC_Config::getValue( "datadirectory", OC::$SERVERROOT."/data" );
 		//check for correct file permissions
-		if(!stristr(PHP_OS, 'WIN')){
+		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)),-3);
-			if(substr($prems,-1)!='0'){
+			if(substr($prems,-1)!='0') {
 				OC_Helper::chmodr($CONFIG_DATADIRECTORY,0770);
 				clearstatcache();
 				$prems=substr(decoct(@fileperms($CONFIG_DATADIRECTORY)),-3);
-				if(substr($prems,2,1)!='0'){
+				if(substr($prems,2,1)!='0') {
 					$errors[]=array('error'=>'Data directory ('.$CONFIG_DATADIRECTORY.') is readable for other users<br/>','hint'=>$permissionsModHint);
 				}
 			}
-			if( OC_Config::getValue( "enablebackup", false )){
+			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'){
+				if(substr($prems,-1)!='0') {
 					OC_Helper::chmodr($CONFIG_BACKUPDIRECTORY,0770);
 					clearstatcache();
 					$prems=substr(decoct(@fileperms($CONFIG_BACKUPDIRECTORY)),-3);
-					if(substr($prems,2,1)!='0'){
+					if(substr($prems,2,1)!='0') {
 						$errors[]=array('error'=>'Data directory ('.$CONFIG_BACKUPDIRECTORY.') is readable for other users<br/>','hint'=>$permissionsModHint);
 					}
 				}
@@ -250,39 +250,39 @@ class OC_Util {
 			//TODO: permissions checks for windows hosts
 		}
 		// Create root dir.
-		if(!is_dir($CONFIG_DATADIRECTORY)){
+		if(!is_dir($CONFIG_DATADIRECTORY)) {
 			$success=@mkdir($CONFIG_DATADIRECTORY);
 			if(!$success) {
 				$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)){
+		} 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
-		if(!class_exists('ZipArchive')){
+		if(!class_exists('ZipArchive')) {
 			$errors[]=array('error'=>'PHP module zip not installed.<br/>','hint'=>'Please ask your server administrator to install the module.');
 		}
 
-		if(!function_exists('mb_detect_encoding')){
+		if(!function_exists('mb_detect_encoding')) {
 			$errors[]=array('error'=>'PHP module mb multibyte not installed.<br/>','hint'=>'Please ask your server administrator to install the module.');
 		}
-		if(!function_exists('ctype_digit')){
+		if(!function_exists('ctype_digit')) {
 			$errors[]=array('error'=>'PHP module ctype is not installed.<br/>','hint'=>'Please ask your server administrator to install the module.');
 		}
-		if(!function_exists('json_encode')){
+		if(!function_exists('json_encode')) {
 			$errors[]=array('error'=>'PHP module JSON is not installed.<br/>','hint'=>'Please ask your server administrator to install the module.');
 		}
-		if(!function_exists('imagepng')){
+		if(!function_exists('imagepng')) {
 			$errors[]=array('error'=>'PHP module GD is not installed.<br/>','hint'=>'Please ask your server administrator to install the module.');
 		}
-		if(!function_exists('gzencode')){
+		if(!function_exists('gzencode')) {
 			$errors[]=array('error'=>'PHP module zlib is not installed.<br/>','hint'=>'Please ask your server administrator to install the module.');
 		}
-		if(floatval(phpversion())<5.3){
+		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')){
+		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.');
 		}
 
@@ -316,8 +316,8 @@ class OC_Util {
 	/**
 	* Check if the app is enabled, redirects to home if not
 	*/
-	public static function checkAppEnabled($app){
-		if( !OC_App::isEnabled($app)){
+	public static function checkAppEnabled($app) {
+		if( !OC_App::isEnabled($app)) {
 			header( 'Location: '.OC_Helper::linkToAbsolute( '', 'index.php' ));
 			exit();
 		}
@@ -327,9 +327,9 @@ class OC_Util {
 	* Check if the user is logged in, redirects to home if not. With
 	* redirect URL parameter to the request URI.
 	*/
-	public static function checkLoggedIn(){
+	public static function checkLoggedIn() {
 		// Check if we are a user
-		if( !OC_User::isLoggedIn()){
+		if( !OC_User::isLoggedIn()) {
 			header( 'Location: '.OC_Helper::linkToAbsolute( '', 'index.php', array('redirect_url' => urlencode($_SERVER["REQUEST_URI"]))));
 			exit();
 		}
@@ -338,10 +338,10 @@ class OC_Util {
 	/**
 	* Check if the user is a admin, redirects to home if not
 	*/
-	public static function checkAdminUser(){
+	public static function checkAdminUser() {
 		// Check if we are a user
 		self::checkLoggedIn();
-		if( !OC_Group::inGroup( OC_User::getUser(), 'admin' )){
+		if( !OC_Group::inGroup( OC_User::getUser(), 'admin' )) {
 			header( 'Location: '.OC_Helper::linkToAbsolute( '', 'index.php' ));
 			exit();
 		}
@@ -351,13 +351,13 @@ 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(){
+	public static function checkSubAdminUser() {
 		// Check if we are a user
 		self::checkLoggedIn();
-		if(OC_Group::inGroup(OC_User::getUser(),'admin')){
+		if(OC_Group::inGroup(OC_User::getUser(),'admin')) {
 			return true;
 		}
-		if(!OC_SubAdmin::isSubAdmin(OC_User::getUser())){
+		if(!OC_SubAdmin::isSubAdmin(OC_User::getUser())) {
 			header( 'Location: '.OC_Helper::linkToAbsolute( '', 'index.php' ));
 			exit();
 		}
@@ -367,7 +367,7 @@ class OC_Util {
 	/**
 	* Redirect to the user default page
 	*/
-	public static function redirectToDefaultPage(){
+	public static function redirectToDefaultPage() {
 		if(isset($_REQUEST['redirect_url']) && (substr($_REQUEST['redirect_url'], 0, strlen(OC::$WEBROOT)) == OC::$WEBROOT || $_REQUEST['redirect_url'][0] == '/')) {
 			$location = $_REQUEST['redirect_url'];
 		}
@@ -392,9 +392,9 @@ class OC_Util {
 	 * get an id unqiue for this instance
 	 * @return string
 	 */
-	public static function getInstanceId(){
+	public static function getInstanceId() {
 		$id=OC_Config::getValue('instanceid',null);
-		if(is_null($id)){
+		if(is_null($id)) {
 			$id=uniqid();
 			OC_Config::setValue('instanceid',$id);
 		}
@@ -406,7 +406,7 @@ class OC_Util {
 	 * Todo: Write howto
 	 * @return $token Generated token.
 	 */
-	public static function callRegister(){
+	public static function callRegister() {
 		//mamimum time before token exires
 		$maxtime=(60*60);  // 1 hour
 
@@ -422,7 +422,7 @@ class OC_Util {
 			foreach($_SESSION as $key=>$value) {
 				// search all tokens in the session
 				if(substr($key,0,12)=='requesttoken') {
-					if($value+$maxtime<time()){
+					if($value+$maxtime<time()) {
 						// remove outdated tokens
 						unset($_SESSION[$key]);
 					}
@@ -438,14 +438,14 @@ class OC_Util {
 	 * @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 isCallRegistered(){
+	public static function isCallRegistered() {
 		//mamimum time before token exires
 		$maxtime=(60*60);  // 1 hour
 		if(isset($_GET['requesttoken'])) {
 			$token=$_GET['requesttoken'];
-		}elseif(isset($_POST['requesttoken'])){
+		}elseif(isset($_POST['requesttoken'])) {
 			$token=$_POST['requesttoken'];
-		}elseif(isset($_SERVER['HTTP_REQUESTTOKEN'])){
+		}elseif(isset($_SERVER['HTTP_REQUESTTOKEN'])) {
 			$token=$_SERVER['HTTP_REQUESTTOKEN'];
 		}else{
 			//no token found.
@@ -453,7 +453,7 @@ class OC_Util {
 		}
 		if(isset($_SESSION['requesttoken-'.$token])) {
 			$timestamp=$_SESSION['requesttoken-'.$token];
-			if($timestamp+$maxtime<time()){
+			if($timestamp+$maxtime<time()) {
 				return false;
 			}else{
 				//token valid
@@ -468,7 +468,7 @@ class OC_Util {
 	 * @brief Check an ajax get/post call if the request token is valid. exit if not.
 	 * Todo: Write howto
 	 */
-	public static function callCheck(){
+	public static function callCheck() {
 		if(!OC_Util::isCallRegistered()) {
 			exit;
 		}
@@ -483,7 +483,7 @@ class OC_Util {
 	 * @param string or array of strings
 	 * @return array with sanitized strings or a single sanitized string, depends on the input parameter.
 	 */
-	public static function sanitizeHTML( &$value ){
+	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;
diff --git a/lib/vcategories.php b/lib/vcategories.php
index 05dfe18db6..f5123adeeb 100644
--- a/lib/vcategories.php
+++ b/lib/vcategories.php
@@ -125,7 +125,7 @@ class OC_VCategories {
 	*	$result = $stmt->execute();
 	*	$objects = array();
 	*	if(!is_null($result)) {
-	*		while( $row = $result->fetchRow()){
+	*		while( $row = $result->fetchRow()) {
 	*			$objects[] = $row['carddata'];
 	*		}
 	*	}
@@ -183,7 +183,7 @@ class OC_VCategories {
 		if(!is_null($objects)) {
 			foreach($objects as $key=>&$value) {
 				$vobject = OC_VObject::parse($value[1]);
-				if(!is_null($vobject)){
+				if(!is_null($vobject)) {
 					$categories = $vobject->getAsArray('CATEGORIES');
 					//OC_Log::write('core','OC_VCategories::delete, before: '.$key.': '.print_r($categories, true), OC_Log::DEBUG);
 					foreach($names as $name) {
diff --git a/lib/vobject.php b/lib/vobject.php
index ec80e1d605..b5a04b4bf6 100644
--- a/lib/vobject.php
+++ b/lib/vobject.php
@@ -30,7 +30,7 @@ class OC_VObject{
 	/**
 	 * @returns Sabre_VObject_Component
 	 */
-	public function getVObject(){
+	public function getVObject() {
 		return $this->vobject;
 	}
 
@@ -39,11 +39,11 @@ class OC_VObject{
 	 * @param string VObject as string
 	 * @returns Sabre_VObject or null
 	 */
-	public static function parse($data){
+	public static function parse($data) {
 		try {
 			Sabre_VObject_Property::$classMap['LAST-MODIFIED'] = 'Sabre_VObject_Property_DateTime';
 			$vobject = Sabre_VObject_Reader::read($data);
-			if ($vobject instanceof Sabre_VObject_Component){
+			if ($vobject instanceof Sabre_VObject_Component) {
 				$vobject = new OC_VObject($vobject);
 			}
 			return $vobject;
@@ -58,8 +58,8 @@ class OC_VObject{
 	 * @param string $value
 	 * @return string
 	 */
-	public static function escapeSemicolons($value){
-		foreach($value as &$i ){
+	public static function escapeSemicolons($value) {
+		foreach($value as &$i ) {
 			$i = implode("\\\\;", explode(';', $i));
 		}
 		return implode(';',$value);
@@ -70,11 +70,11 @@ class OC_VObject{
 	 * @param string $value
 	 * @return array
 	 */
-	public static function unescapeSemicolons($value){
+	public static function unescapeSemicolons($value) {
 		$array = explode(';',$value);
-		for($i=0;$i<count($array);$i++){
-			if(substr($array[$i],-2,2)=="\\\\"){
-				if(isset($array[$i+1])){
+		for($i=0;$i<count($array);$i++) {
+			if(substr($array[$i],-2,2)=="\\\\") {
+				if(isset($array[$i+1])) {
 					$array[$i] = substr($array[$i],0,count($array[$i])-2).';'.$array[$i+1];
 					unset($array[$i+1]);
 				}
@@ -91,16 +91,16 @@ class OC_VObject{
 	 * Constuctor
 	 * @param Sabre_VObject_Component or string
 	 */
-	public function __construct($vobject_or_name){
-		if (is_object($vobject_or_name)){
+	public function __construct($vobject_or_name) {
+		if (is_object($vobject_or_name)) {
 			$this->vobject = $vobject_or_name;
 		} else {
 			$this->vobject = new Sabre_VObject_Component($vobject_or_name);
 		}
 	}
 
-	public function add($item, $itemValue = null){
-		if ($item instanceof OC_VObject){
+	public function add($item, $itemValue = null) {
+		if ($item instanceof OC_VObject) {
 			$item = $item->getVObject();
 		}
 		$this->vobject->add($item, $itemValue);
@@ -113,12 +113,12 @@ class OC_VObject{
 	 * @param object $parameters of property
 	 * @returns Sabre_VObject_Property newly created
 	 */
-	public function addProperty($name, $value, $parameters=array()){
-		if(is_array($value)){
+	public function addProperty($name, $value, $parameters=array()) {
+		if(is_array($value)) {
 			$value = OC_VObject::escapeSemicolons($value);
 		}
 		$property = new Sabre_VObject_Property( $name, $value );
-		foreach($parameters as $name => $value){
+		foreach($parameters as $name => $value) {
 			$property->parameters[] = new Sabre_VObject_Parameter($name, $value);
 		}
 
@@ -126,13 +126,13 @@ class OC_VObject{
 		return $property;
 	}
 
-	public function setUID(){
+	public function setUID() {
 		$uid = substr(md5(rand().time()),0,10);
 		$this->vobject->add('UID',$uid);
 	}
 
-	public function setString($name, $string){
-		if ($string != ''){
+	public function setString($name, $string) {
+		if ($string != '') {
 			$string = strtr($string, array("\r\n"=>"\n"));
 			$this->vobject->__set($name, $string);
 		}else{
@@ -150,11 +150,11 @@ class OC_VObject{
 	 * @param int $dateType
 	 * @return void
 	 */
-	public function setDateTime($name, $datetime, $dateType=Sabre_VObject_Property_DateTime::LOCALTZ){
-		if ($datetime == 'now'){
+	public function setDateTime($name, $datetime, $dateType=Sabre_VObject_Property_DateTime::LOCALTZ) {
+		if ($datetime == 'now') {
 			$datetime = new DateTime();
 		}
-		if ($datetime instanceof DateTime){
+		if ($datetime instanceof DateTime) {
 			$datetime_element = new Sabre_VObject_Property_DateTime($name);
 			$datetime_element->setDateTime($datetime, $dateType);
 			$this->vobject->__set($name, $datetime_element);
@@ -163,45 +163,45 @@ class OC_VObject{
 		}
 	}
 
-	public function getAsString($name){
+	public function getAsString($name) {
 		return $this->vobject->__isset($name) ?
 			$this->vobject->__get($name)->value :
 			'';
 	}
 
-	public function getAsArray($name){
+	public function getAsArray($name) {
 		$values = array();
-		if ($this->vobject->__isset($name)){
+		if ($this->vobject->__isset($name)) {
 			$values = explode(',', $this->getAsString($name));
 			$values = array_map('trim', $values);
 		}
 		return $values;
 	}
 
-	public function &__get($name){
-		if ($name == 'children'){
+	public function &__get($name) {
+		if ($name == 'children') {
 			return $this->vobject->children;
 		}
 		$return = $this->vobject->__get($name);
-		if ($return instanceof Sabre_VObject_Component){
+		if ($return instanceof Sabre_VObject_Component) {
 			$return = new OC_VObject($return);
 		}
 		return $return;
 	}
 
-	public function __set($name, $value){
+	public function __set($name, $value) {
 		return $this->vobject->__set($name, $value);
 	}
 
-	public function __unset($name){
+	public function __unset($name) {
 		return $this->vobject->__unset($name);
 	}
 
-	public function __isset($name){
+	public function __isset($name) {
 		return $this->vobject->__isset($name);
 	}
 
-	public function __call($function,$arguments){
+	public function __call($function,$arguments) {
 		return call_user_func_array(array($this->vobject, $function), $arguments);
 	}
 }
diff --git a/search/ajax/search.php b/search/ajax/search.php
index b524993d24..41ee9ad5ab 100644
--- a/search/ajax/search.php
+++ b/search/ajax/search.php
@@ -29,7 +29,7 @@ require_once '../../lib/base.php';
 OC_JSON::checkLoggedIn();
 
 $query=(isset($_GET['query']))?$_GET['query']:'';
-if($query){
+if($query) {
 	$result=OC_Search::search($query);
 	OC_JSON::encodedPrint($result);
 }else{
diff --git a/search/index.php b/search/index.php
index 958065dc40..9c515ff3dd 100644
--- a/search/index.php
+++ b/search/index.php
@@ -39,7 +39,7 @@ if($query) {
 }
 
 $resultTypes=array();
-foreach($results as $result){
+foreach($results as $result) {
 	if(!isset($resultTypes[$result->type])) {
 		$resultTypes[$result->type]=array();
 	}
diff --git a/settings/admin.php b/settings/admin.php
index 351c8a3fff..a36f219038 100755
--- a/settings/admin.php
+++ b/settings/admin.php
@@ -20,7 +20,7 @@ $htaccessworking=OC_Util::ishtaccessworking();
 $entries=OC_Log_Owncloud::getEntries(3);
 $entriesremain=(count(OC_Log_Owncloud::getEntries(4)) > 3)?true:false;
 
-function compareEntries($a,$b){
+function compareEntries($a,$b) {
 	return $b->time - $a->time;
 }
 usort($entries, 'compareEntries');
@@ -35,7 +35,7 @@ $tmpl->assign('allowLinks', OC_Appconfig::getValue('core', 'shareapi_allow_links
 $tmpl->assign('allowResharing', OC_Appconfig::getValue('core', 'shareapi_allow_resharing', 'yes'));
 $tmpl->assign('sharePolicy', OC_Appconfig::getValue('core', 'shareapi_share_policy', 'global'));
 $tmpl->assign('forms',array());
-foreach($forms as $form){
+foreach($forms as $form) {
 	$tmpl->append('forms',$form);
 }
 $tmpl->printPage();
diff --git a/settings/ajax/apps/ocs.php b/settings/ajax/apps/ocs.php
index 1f3e3b3dfe..71cb046fc8 100644
--- a/settings/ajax/apps/ocs.php
+++ b/settings/ajax/apps/ocs.php
@@ -32,10 +32,10 @@ if(is_array($catagoryNames)) {
 	$page=0;
 	$filter='approved';
 	$externalApps=OC_OCSClient::getApplications($categories, $page, $filter);
-	foreach($externalApps as $app){
+	foreach($externalApps as $app) {
 		// show only external apps that aren't enabled yet
 		$local=false;
-		foreach($enabledApps as $a){
+		foreach($enabledApps as $a) {
 			if($a == $app['name']) {
 				$local=true;
 			}
diff --git a/settings/ajax/createuser.php b/settings/ajax/createuser.php
index 22320b870e..bdf7e4983a 100644
--- a/settings/ajax/createuser.php
+++ b/settings/ajax/createuser.php
@@ -21,7 +21,7 @@ if($isadmin) {
 }else{
 	if(isset( $_POST["groups"] )) {
 		$groups = array();
-		foreach($_POST["groups"] as $group){
+		foreach($_POST["groups"] as $group) {
 			if(OC_SubAdmin::isGroupAccessible(OC_User::getUser(), $group)) {
 				$groups[] = $group;
 			}
@@ -45,7 +45,7 @@ if( in_array( $username, OC_User::getUsers())) {
 // Return Success story
 try {
 	OC_User::createUser($username, $password);
-	foreach( $groups as $i ){
+	foreach( $groups as $i ) {
 		if(!OC_Group::groupExists($i)) {
 			OC_Group::createGroup($i);
 		}
diff --git a/settings/ajax/togglesubadmins.php b/settings/ajax/togglesubadmins.php
index 82bb6ac45f..5f7126dca3 100644
--- a/settings/ajax/togglesubadmins.php
+++ b/settings/ajax/togglesubadmins.php
@@ -10,7 +10,7 @@ $username = $_POST["username"];
 $group = OC_Util::sanitizeHTML($_POST["group"]);
 
 // Toggle group
-if(OC_SubAdmin::isSubAdminofGroup($username, $group)){
+if(OC_SubAdmin::isSubAdminofGroup($username, $group)) {
 	OC_SubAdmin::deleteSubAdmin($username, $group);
 }else{
 	OC_SubAdmin::createSubAdmin($username, $group);
diff --git a/settings/apps.php b/settings/apps.php
index 686972c334..e613814fe9 100644
--- a/settings/apps.php
+++ b/settings/apps.php
@@ -57,7 +57,7 @@ foreach($registeredApps as $app) {
 	}
 }
 
-function app_sort($a, $b){
+function app_sort($a, $b) {
 	if ($a['active'] != $b['active']) {
 		return $b['active'] - $a['active'];
 	}
diff --git a/settings/personal.php b/settings/personal.php
index 2fa8cd4f5e..4f92985c79 100644
--- a/settings/personal.php
+++ b/settings/personal.php
@@ -41,11 +41,11 @@ array_unshift($languageCodes, $lang);
 
 $languageNames=include 'languageCodes.php';
 $languages=array();
-foreach($languageCodes as $lang){
+foreach($languageCodes as $lang) {
 	$l=OC_L10N::get('settings', $lang);
 	if(substr($l->t('__language_name__'), 0, 1)!='_') {//first check if the language name is in the translation file
 		$languages[]=array('code'=>$lang,'name'=>$l->t('__language_name__'));
-	}elseif(isset($languageNames[$lang])){
+	}elseif(isset($languageNames[$lang])) {
 		$languages[]=array('code'=>$lang,'name'=>$languageNames[$lang]);
 	}else{//fallback to language code
 		$languages[]=array('code'=>$lang,'name'=>$lang);
@@ -62,7 +62,7 @@ $tmpl->assign('languages', $languages);
 
 $forms=OC_App::getForms('personal');
 $tmpl->assign('forms', array());
-foreach($forms as $form){
+foreach($forms as $form) {
 	$tmpl->append('forms', $form);
 }
 $tmpl->printPage();
diff --git a/settings/settings.php b/settings/settings.php
index ae41fecaf9..24099ef574 100644
--- a/settings/settings.php
+++ b/settings/settings.php
@@ -14,7 +14,7 @@ OC_App::setActiveNavigationEntry( 'settings' );
 $tmpl = new OC_Template( 'settings', 'settings', 'user');
 $forms=OC_App::getForms('settings');
 $tmpl->assign('forms', array());
-foreach($forms as $form){
+foreach($forms as $form) {
 	$tmpl->append('forms', $form);
 }
 $tmpl->printPage();
diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index 22e13571d0..5fa9e26c9c 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -23,17 +23,17 @@ if(!$_['htaccessworking']) {
 ?>
 
 
-<?php foreach($_['forms'] as $form){
+<?php foreach($_['forms'] as $form) {
 	echo $form;
 };?>
 
 <fieldset class="personalblock" id="backgroundjobs">
 	<legend><strong><?php echo $l->t('Cron');?></strong></legend>
-	<input type="radio" name="mode" value="ajax" id="backgroundjobs_ajax" <?php if( $_['backgroundjobs_mode'] == "ajax" ){ echo 'checked="checked"'; } ?>>
+	<input type="radio" name="mode" value="ajax" id="backgroundjobs_ajax" <?php if( $_['backgroundjobs_mode'] == "ajax" ) { echo 'checked="checked"'; } ?>>
 	<label for="backgroundjobs_ajax" title="<?php echo $l->t("execute one task with each page loaded"); ?>">AJAX</label><br />
-	<input type="radio" name="mode" value="webcron" id="backgroundjobs_webcron" <?php if( $_['backgroundjobs_mode'] == "webcron" ){ echo 'checked="checked"'; } ?>>
+	<input type="radio" name="mode" value="webcron" id="backgroundjobs_webcron" <?php if( $_['backgroundjobs_mode'] == "webcron" ) { echo 'checked="checked"'; } ?>>
 	<label for="backgroundjobs_webcron" title="<?php echo $l->t("cron.php is registered at a webcron service"); ?>">Webcron</label><br />
-	<input type="radio" name="mode" value="cron" id="backgroundjobs_cron" <?php if( $_['backgroundjobs_mode'] == "cron" ){ echo 'checked="checked"'; } ?>>
+	<input type="radio" name="mode" value="cron" id="backgroundjobs_cron" <?php if( $_['backgroundjobs_mode'] == "cron" ) { echo 'checked="checked"'; } ?>>
 	<label for="backgroundjobs_cron" title="<?php echo $l->t("use systems cron service"); ?>">Cron</label><br />
 </fieldset>
 
diff --git a/settings/templates/personal.php b/settings/templates/personal.php
index ee40120d72..4503f3d50b 100644
--- a/settings/templates/personal.php
+++ b/settings/templates/personal.php
@@ -51,7 +51,7 @@
 	<em><?php echo $l->t('use this address to connect to your ownCloud in your file manager');?></em>
 </p>
 
-<?php foreach($_['forms'] as $form){
+<?php foreach($_['forms'] as $form) {
 	echo $form;
 };?>
 
diff --git a/settings/templates/settings.php b/settings/templates/settings.php
index 98acd541e3..12368a1cdb 100644
--- a/settings/templates/settings.php
+++ b/settings/templates/settings.php
@@ -4,6 +4,6 @@
  * See the COPYING-README file.
  */?>
 
-<?php foreach($_['forms'] as $form){
+<?php foreach($_['forms'] as $form) {
 	echo $form;
 };?>
\ No newline at end of file
diff --git a/settings/users.php b/settings/users.php
index f176977ade..e76505cc78 100644
--- a/settings/users.php
+++ b/settings/users.php
@@ -29,7 +29,7 @@ if($isadmin) {
 	$subadmins = false;
 }
 
-foreach($accessibleusers as $i){
+foreach($accessibleusers as $i) {
 	$users[] = array(
 		"name" => $i, 
 		"groups" => join( ", ", /*array_intersect(*/OC_Group::getUserGroups($i)/*, OC_SubAdmin::getSubAdminsGroups(OC_User::getUser()))*/),
@@ -37,13 +37,13 @@ foreach($accessibleusers as $i){
 		'subadmin'=>implode(', ', OC_SubAdmin::getSubAdminsGroups($i)));
 }
 
-foreach( $accessiblegroups as $i ){
+foreach( $accessiblegroups as $i ) {
 	// Do some more work here soon
 	$groups[] = array( "name" => $i );
 }
 $quotaPreset=OC_Appconfig::getValue('files', 'quota_preset', 'default,none,1 GB, 5 GB, 10 GB');
 $quotaPreset=explode(',',$quotaPreset);
-foreach($quotaPreset as &$preset){
+foreach($quotaPreset as &$preset) {
 	$preset=trim($preset);
 }
 
diff --git a/tests/index.php b/tests/index.php
index 032689970f..82a61c281f 100644
--- a/tests/index.php
+++ b/tests/index.php
@@ -31,14 +31,14 @@ require_once 'simpletest/default_reporter.php';
 $testSuiteName="ownCloud Unit Test Suite";
 
 // prepare the reporter
-if(OC::$CLI){
+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;
 
-		if(isset($_SERVER['argv'][2])){
+		if(isset($_SERVER['argv'][2])) {
 			$testSuiteName=$testSuiteName." (".$_SERVER['argv'][2].")";
 		}
 	}
@@ -60,30 +60,30 @@ loadTests(dirname(__FILE__), $testSuite, $test, 'lib');
 //
 
 $apps=OC_App::getEnabledApps();
-foreach($apps as $app){
+foreach($apps as $app) {
 	$testDir=OC_App::getAppPath($app).'/tests';
-	if(is_dir($testDir)){
+	if(is_dir($testDir)) {
 		loadTests($testDir, $testSuite, $test, $app);
 	}
 }
 
 // run the suite
-if($testSuite->getSize()>0){
+if($testSuite->getSize()>0) {
 	$testSuite->run($reporter);
 }
 
 // helper below
-function loadTests($dir,$testSuite, $test, $app){
+function loadTests($dir,$testSuite, $test, $app) {
 	$root=($app=='lib')?OC::$SERVERROOT.'/tests/lib/':OC_App::getAppPath($app).'/tests/';
-	if($dh=opendir($dir)){
-		while($name=readdir($dh)){
-			if($name[0]!='.'){//no hidden files, '.' or '..'
+	if($dh=opendir($dir)) {
+		while($name=readdir($dh)) {
+			if($name[0]!='.') {//no hidden files, '.' or '..'
 				$file=$dir.'/'.$name;
-				if(is_dir($file)){
+				if(is_dir($file)) {
 					loadTests($file, $testSuite, $test, $app);
-				}elseif(substr($file,-4)=='.php' and $file!=__FILE__){
+				}elseif(substr($file,-4)=='.php' and $file!=__FILE__) {
 					$name=$app.'/'.getTestName($file,$root);
-					if($test===false or $test==$name or substr($name,0,strlen($test))==$test){
+					if($test===false or $test==$name or substr($name,0,strlen($test))==$test) {
 						$extractor = new SimpleFileLoader();
 						$loadedSuite=$extractor->load($file);
 						if ($loadedSuite->getSize() > 0)
@@ -95,7 +95,7 @@ function loadTests($dir,$testSuite, $test, $app){
 	}
 }
 
-function getTestName($file,$root){
+function getTestName($file,$root) {
 // 	//TODO: get better test names
 	$file=substr($file,strlen($root));
 	return substr($file,0,-4);//strip .php
diff --git a/tests/lib/archive.php b/tests/lib/archive.php
index 1711be58e0..565c314cb8 100644
--- a/tests/lib/archive.php
+++ b/tests/lib/archive.php
@@ -23,12 +23,12 @@ abstract class Test_Archive extends UnitTestCase {
 	 */
 	abstract protected function getNew();
 	
-	public function testGetFiles(){
+	public function testGetFiles() {
 		$this->instance=$this->getExisting();
 		$allFiles=$this->instance->getFiles();
 		$expected=array('lorem.txt','logo-wide.png','dir/','dir/lorem.txt');
 		$this->assertEqual(4,count($allFiles),'only found '.count($allFiles).' out of 4 expected files');
-		foreach($expected as $file){
+		foreach($expected as $file) {
 			$this->assertNotIdentical(false,array_search($file,$allFiles),'cant find '.$file.' in archive');
 			$this->assertTrue($this->instance->fileExists($file),'file '.$file.' does not exist in archive');
 		}
@@ -37,19 +37,19 @@ abstract class Test_Archive extends UnitTestCase {
 		$rootContent=$this->instance->getFolder('');
 		$expected=array('lorem.txt','logo-wide.png','dir/');
 		$this->assertEqual(3,count($rootContent));
-		foreach($expected as $file){
+		foreach($expected as $file) {
 			$this->assertNotIdentical(false,array_search($file,$rootContent),'cant find '.$file.' in archive');
 		}
 
 		$dirContent=$this->instance->getFolder('dir/');
 		$expected=array('lorem.txt');
 		$this->assertEqual(1,count($dirContent));
-		foreach($expected as $file){
+		foreach($expected as $file) {
 			$this->assertNotIdentical(false,array_search($file,$dirContent),'cant find '.$file.' in archive');
 		}
 	}
 	
-	public function testContent(){
+	public function testContent() {
 		$this->instance=$this->getExisting();
 		$dir=OC::$SERVERROOT.'/apps/files_archive/tests/data';
 		$textFile=$dir.'/lorem.txt';
@@ -60,7 +60,7 @@ abstract class Test_Archive extends UnitTestCase {
 		$this->assertEqual(file_get_contents($textFile),file_get_contents($tmpFile));
 	}
 
-	public function testWrite(){
+	public function testWrite() {
 		$dir=OC::$SERVERROOT.'/apps/files_archive/tests/data';
 		$textFile=$dir.'/lorem.txt';
 		$this->instance=$this->getNew();
@@ -75,7 +75,7 @@ abstract class Test_Archive extends UnitTestCase {
 		$this->assertEqual('foobar',$this->instance->getFile('lorem.txt'));
 	}
 
-	public function testReadStream(){
+	public function testReadStream() {
 		$dir=OC::$SERVERROOT.'/apps/files_archive/tests/data';
 		$this->instance=$this->getExisting();
 		$fh=$this->instance->getStream('lorem.txt','r');
@@ -84,7 +84,7 @@ abstract class Test_Archive extends UnitTestCase {
 		fclose($fh);
 		$this->assertEqual(file_get_contents($dir.'/lorem.txt'),$content);
 	}
-	public function testWriteStream(){
+	public function testWriteStream() {
 		$dir=OC::$SERVERROOT.'/apps/files_archive/tests/data';
 		$this->instance=$this->getNew();
 		$fh=$this->instance->getStream('lorem.txt','w');
@@ -95,7 +95,7 @@ abstract class Test_Archive extends UnitTestCase {
 		$this->assertTrue($this->instance->fileExists('lorem.txt'));
 		$this->assertEqual(file_get_contents($dir.'/lorem.txt'),$this->instance->getFile('lorem.txt'));
 	}
-	public function testFolder(){
+	public function testFolder() {
 		$this->instance=$this->getNew();
 		$this->assertFalse($this->instance->fileExists('/test'));
 		$this->assertFalse($this->instance->fileExists('/test/'));
@@ -106,7 +106,7 @@ abstract class Test_Archive extends UnitTestCase {
 		$this->assertFalse($this->instance->fileExists('/test'));
 		$this->assertFalse($this->instance->fileExists('/test/'));
 	}
-	public function testExtract(){
+	public function testExtract() {
 		$dir=OC::$SERVERROOT.'/apps/files_archive/tests/data';
 		$this->instance=$this->getExisting();
 		$tmpDir=OCP\Files::tmpFolder();
@@ -117,7 +117,7 @@ abstract class Test_Archive extends UnitTestCase {
 		$this->assertEqual(file_get_contents($dir.'/lorem.txt'),file_get_contents($tmpDir.'lorem.txt'));
 		OCP\Files::rmdirr($tmpDir);
 	}
-	public function testMoveRemove(){
+	public function testMoveRemove() {
 		$dir=OC::$SERVERROOT.'/apps/files_archive/tests/data';
 		$textFile=$dir.'/lorem.txt';
 		$this->instance=$this->getNew();
@@ -130,7 +130,7 @@ abstract class Test_Archive extends UnitTestCase {
 		$this->instance->remove('target.txt');
 		$this->assertFalse($this->instance->fileExists('target.txt'));
 	}
-	public function testRecursive(){
+	public function testRecursive() {
 		$dir=OC::$SERVERROOT.'/apps/files_archive/tests/data';
 		$this->instance=$this->getNew();
 		$this->instance->addRecursive('/dir',$dir);
diff --git a/tests/lib/archive/tar.php b/tests/lib/archive/tar.php
index 22481f1a54..2595b7cb19 100644
--- a/tests/lib/archive/tar.php
+++ b/tests/lib/archive/tar.php
@@ -8,14 +8,14 @@
 
 require_once 'archive.php';
 
-if(is_dir(OC::$SERVERROOT.'/apps/files_archive/tests/data')){
+if(is_dir(OC::$SERVERROOT.'/apps/files_archive/tests/data')) {
 	class Test_Archive_TAR extends Test_Archive{
-		protected function getExisting(){
+		protected function getExisting() {
 			$dir=OC::$SERVERROOT.'/apps/files_archive/tests/data';
 			return new OC_Archive_TAR($dir.'/data.tar.gz');
 		}
 
-		protected function getNew(){
+		protected function getNew() {
 			return new OC_Archive_TAR(OCP\Files::tmpFile('.tar.gz'));
 		}
 	}
diff --git a/tests/lib/archive/zip.php b/tests/lib/archive/zip.php
index b61d8aeac2..a7682e3418 100644
--- a/tests/lib/archive/zip.php
+++ b/tests/lib/archive/zip.php
@@ -8,14 +8,14 @@
 
 require_once 'archive.php';
 
-if(is_dir(OC::$SERVERROOT.'/apps/files_archive/tests/data')){
+if(is_dir(OC::$SERVERROOT.'/apps/files_archive/tests/data')) {
 	class Test_Archive_ZIP extends Test_Archive{
-		protected function getExisting(){
+		protected function getExisting() {
 			$dir=OC::$SERVERROOT.'/apps/files_archive/tests/data';
 			return new OC_Archive_ZIP($dir.'/data.zip');
 		}
 
-		protected function getNew(){
+		protected function getNew() {
 			return new OC_Archive_ZIP(OCP\Files::tmpFile('.zip'));
 		}
 	}
diff --git a/tests/lib/cache.php b/tests/lib/cache.php
index 511999be95..9ada0accc2 100644
--- a/tests/lib/cache.php
+++ b/tests/lib/cache.php
@@ -12,11 +12,11 @@ abstract class Test_Cache extends UnitTestCase {
 	 */
 	protected $instance;
 
-	public function tearDown(){
+	public function tearDown() {
 		$this->instance->clear();
 	}
 
-	function testSimple(){
+	function testSimple() {
 		$this->assertNull($this->instance->get('value1'));
 		$this->assertFalse($this->instance->hasKey('value1'));
 		
@@ -45,7 +45,7 @@ abstract class Test_Cache extends UnitTestCase {
 		$this->assertFalse($this->instance->hasKey('value1'));
 	}
 
-	function testClear(){
+	function testClear() {
 		$value='ipsum lorum';
 		$this->instance->set('1_value1',$value);
 		$this->instance->set('1_value2',$value);
@@ -65,7 +65,7 @@ abstract class Test_Cache extends UnitTestCase {
 		$this->assertFalse($this->instance->hasKey('3_value1'));
 	}
 
-	function testTTL(){
+	function testTTL() {
 		$value='foobar';
 		$this->instance->set('value1',$value,1);
 		$value2='foobar';
diff --git a/tests/lib/cache/apc.php b/tests/lib/cache/apc.php
index ab8eb18866..34ea968cd5 100644
--- a/tests/lib/cache/apc.php
+++ b/tests/lib/cache/apc.php
@@ -25,11 +25,11 @@ class Test_Cache_APC extends Test_Cache {
 		$this->skipUnless(function_exists('apc_store'));
 	}
 
-	public function setUp(){
+	public function setUp() {
 		$this->instance=new OC_Cache_APC();
 	}
 
-	function testTTL(){
+	function testTTL() {
 		// ttl doesn't work correctly in the same request
 		// see https://bugs.php.net/bug.php?id=58084
 	}
diff --git a/tests/lib/cache/file.php b/tests/lib/cache/file.php
index 28778efb68..00be005d08 100644
--- a/tests/lib/cache/file.php
+++ b/tests/lib/cache/file.php
@@ -27,13 +27,13 @@ class Test_Cache_File extends Test_Cache {
 		//$this->skipUnless(OC_User::isLoggedIn());
 	}
 	
-	public function setUp(){
+	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 if needed
-		if(OC_App::isEnabled('files_encryption')){
+		if(OC_App::isEnabled('files_encryption')) {
 			OC_FileProxy::register(new OC_FileProxy_Encryption());
 		}
 		
@@ -57,7 +57,7 @@ class Test_Cache_File extends Test_Cache {
 		$this->instance=new OC_Cache_File();
 	}
 
-	public function tearDown(){
+	public function tearDown() {
 		OC_User::setUserId($this->user);
 	}
 }
diff --git a/tests/lib/cache/xcache.php b/tests/lib/cache/xcache.php
index cc2077076c..85cc2d8b3c 100644
--- a/tests/lib/cache/xcache.php
+++ b/tests/lib/cache/xcache.php
@@ -25,11 +25,11 @@ class Test_Cache_XCache extends Test_Cache {
 		$this->skipUnless(function_exists('xcache_get'));
 	}
 
-	public function setUp(){
+	public function setUp() {
 		$this->instance=new OC_Cache_XCache();
 	}
 
-	function testTTL(){
+	function testTTL() {
 		// ttl doesn't work correctly in the same request
 	}
 }
diff --git a/tests/lib/filestorage.php b/tests/lib/filestorage.php
index 0a8715600d..3f7bb7b62d 100644
--- a/tests/lib/filestorage.php
+++ b/tests/lib/filestorage.php
@@ -29,7 +29,7 @@ abstract class Test_FileStorage extends UnitTestCase {
 	/**
 	 * the root folder of the storage should always exist, be readable and be recognized as a directory
 	 */
-	public function testRoot(){
+	public function testRoot() {
 		$this->assertTrue($this->instance->file_exists('/'),'Root folder does not exist');
 		$this->assertTrue($this->instance->isReadable('/'),'Root folder is not readable');
 		$this->assertTrue($this->instance->is_dir('/'),'Root folder is not a directory');
@@ -40,7 +40,7 @@ abstract class Test_FileStorage extends UnitTestCase {
 		$this->assertTrue($this->instance->isUpdatable('/'),'Root folder is not writable');
 	}
 	
-	public function testDirectories(){
+	public function testDirectories() {
 		$this->assertFalse($this->instance->file_exists('/folder'));
 		
 		$this->assertTrue($this->instance->mkdir('/folder'));
@@ -55,8 +55,8 @@ abstract class Test_FileStorage extends UnitTestCase {
 		
 		$dh=$this->instance->opendir('/');
 		$content=array();
-		while($file=readdir($dh)){
-			if($file!='.' and $file!='..'){
+		while($file=readdir($dh)) {
+			if($file!='.' and $file!='..') {
 				$content[]=$file;
 			}
 		}
@@ -71,8 +71,8 @@ abstract class Test_FileStorage extends UnitTestCase {
 
 		$dh=$this->instance->opendir('/');
 		$content=array();
-		while($file=readdir($dh)){
-			if($file!='.' and $file!='..'){
+		while($file=readdir($dh)) {
+			if($file!='.' and $file!='..') {
 				$content[]=$file;
 			}
 		}
@@ -82,7 +82,7 @@ abstract class Test_FileStorage extends UnitTestCase {
 	/**
 	 * test the various uses of file_get_contents and file_put_contents
 	 */
-	public function testGetPutContents(){
+	public function testGetPutContents() {
 		$sourceFile=OC::$SERVERROOT.'/tests/data/lorem.txt';
 		$sourceText=file_get_contents($sourceFile);
 		
@@ -99,7 +99,7 @@ abstract class Test_FileStorage extends UnitTestCase {
 	/**
 	 * test various known mimetypes
 	 */
-	public function testMimeType(){
+	public function testMimeType() {
 		$this->assertEqual('httpd/unix-directory',$this->instance->getMimeType('/'));
 		$this->assertEqual(false,$this->instance->getMimeType('/non/existing/file'));
 		
@@ -116,7 +116,7 @@ abstract class Test_FileStorage extends UnitTestCase {
 		$this->assertEqual('image/svg+xml',$this->instance->getMimeType('/logo-wide.svg'));
 	}
 	
-	public function testCopyAndMove(){
+	public function testCopyAndMove() {
 		$textFile=OC::$SERVERROOT.'/tests/data/lorem.txt';
 		$this->instance->file_put_contents('/source.txt',file_get_contents($textFile));
 		$this->instance->copy('/source.txt','/target.txt');
@@ -129,7 +129,7 @@ abstract class Test_FileStorage extends UnitTestCase {
 		$this->assertEqual(file_get_contents($textFile),$this->instance->file_get_contents('/target.txt'));
 	}
 	
-	public function testLocal(){
+	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');
@@ -150,7 +150,7 @@ abstract class Test_FileStorage extends UnitTestCase {
 		$this->assertEqual(file_get_contents($localFolder.'/recursive/file.txt'),'foo');
 	}
 
-	public function testStat(){
+	public function testStat() {
 		$textFile=OC::$SERVERROOT.'/tests/data/lorem.txt';
 		$ctimeStart=time();
 		$this->instance->file_put_contents('/lorem.txt',file_get_contents($textFile));
@@ -158,7 +158,7 @@ abstract class Test_FileStorage extends UnitTestCase {
 		$ctimeEnd=time();
 		$cTime=$this->instance->filectime('/lorem.txt');
 		$mTime=$this->instance->filemtime('/lorem.txt');
-		if($cTime!=-1){//not everything can support ctime
+		if($cTime!=-1) {//not everything can support ctime
 			$this->assertTrue(($ctimeStart-1)<=$cTime);
 			$this->assertTrue($cTime<=($ctimeEnd+1));
 		}
@@ -187,7 +187,7 @@ abstract class Test_FileStorage extends UnitTestCase {
 
 		$this->assertTrue($this->instance->hasUpdated('/lorem.txt',$mtimeStart-1));
 		
-		if($this->instance->touch('/lorem.txt',100)!==false){
+		if($this->instance->touch('/lorem.txt',100)!==false) {
 			$mTime=$this->instance->filemtime('/lorem.txt');
 			$this->assertEqual($mTime,100);
 		}
@@ -207,7 +207,7 @@ abstract class Test_FileStorage extends UnitTestCase {
 		$this->assertTrue($this->instance->hasUpdated('/',$mtimeStart-1));
 	}
 
-	public function testSearch(){
+	public function testSearch() {
 		$textFile=OC::$SERVERROOT.'/tests/data/lorem.txt';
 		$this->instance->file_put_contents('/lorem.txt',file_get_contents($textFile,'r'));
 		$pngFile=OC::$SERVERROOT.'/tests/data/logo-wide.png';
diff --git a/tests/lib/filestorage/commontest.php b/tests/lib/filestorage/commontest.php
index ab5375ec2b..89e83589e5 100644
--- a/tests/lib/filestorage/commontest.php
+++ b/tests/lib/filestorage/commontest.php
@@ -25,15 +25,15 @@ class Test_Filestorage_CommonTest extends Test_FileStorage {
 	 * @var string tmpDir
 	 */
 	private $tmpDir;
-	public function setUp(){
+	public function setUp() {
 		$this->tmpDir=get_temp_dir().'/filestoragecommon';
-		if(!file_exists($this->tmpDir)){
+		if(!file_exists($this->tmpDir)) {
 			mkdir($this->tmpDir);
 		}
 		$this->instance=new OC_Filestorage_CommonTest(array('datadir'=>$this->tmpDir));
 	}
 
-	public function tearDown(){
+	public function tearDown() {
 		OC_Helper::rmdirr($this->tmpDir);
 	}
 }
diff --git a/tests/lib/filestorage/local.php b/tests/lib/filestorage/local.php
index 692f05f9fc..f68fb69b97 100644
--- a/tests/lib/filestorage/local.php
+++ b/tests/lib/filestorage/local.php
@@ -25,12 +25,12 @@ class Test_Filestorage_Local extends Test_FileStorage {
 	 * @var string tmpDir
 	 */
 	private $tmpDir;
-	public function setUp(){
+	public function setUp() {
 		$this->tmpDir=OC_Helper::tmpFolder();
 		$this->instance=new OC_Filestorage_Local(array('datadir'=>$this->tmpDir));
 	}
 
-	public function tearDown(){
+	public function tearDown() {
 		OC_Helper::rmdirr($this->tmpDir);
 	}
 }
diff --git a/tests/lib/filesystem.php b/tests/lib/filesystem.php
index 72af083578..1cfa35e305 100644
--- a/tests/lib/filesystem.php
+++ b/tests/lib/filesystem.php
@@ -29,23 +29,23 @@ class Test_Filesystem extends UnitTestCase{
 	/**
 	 * @return array
 	 */
-	private function getStorageData(){
+	private function getStorageData() {
 		$dir=OC_Helper::tmpFolder();
 		$this->tmpDirs[]=$dir;
 		return array('datadir'=>$dir);
 	}
 
-	public function tearDown(){
-		foreach($this->tmpDirs as $dir){
+	public function tearDown() {
+		foreach($this->tmpDirs as $dir) {
 			OC_Helper::rmdirr($dir);
 		}
 	}
 	
-	public function setUp(){
+	public function setUp() {
 		OC_Filesystem::clearMounts();
 	}
 
-	public function testMount(){
+	public function testMount() {
 		OC_Filesystem::mount('OC_Filestorage_Local',self::getStorageData(),'/');
 		$this->assertEqual('/',OC_Filesystem::getMountPoint('/'));
 		$this->assertEqual('/',OC_Filesystem::getMountPoint('/some/folder'));
@@ -60,14 +60,14 @@ class Test_Filesystem extends UnitTestCase{
 		$this->assertEqual('folder',OC_Filesystem::getInternalPath('/some/folder'));
 	}
 
-	public function testNormalize(){
+	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/'));
 		$this->assertEqual('/foo/bar',OC_Filesystem::normalizePath('/foo////bar'));
-		if(class_exists('Normalizer')){
+		if(class_exists('Normalizer')) {
 			$this->assertEqual("/foo/bar\xC3\xBC",OC_Filesystem::normalizePath("/foo/baru\xCC\x88"));
 		}
 	}
diff --git a/tests/lib/group.php b/tests/lib/group.php
index 922613211b..0bea9a0088 100644
--- a/tests/lib/group.php
+++ b/tests/lib/group.php
@@ -21,11 +21,11 @@
 */
 
 class Test_Group extends UnitTestCase {
-	function setUp(){
+	function setUp() {
 		OC_Group::clearBackends();
 	}
 
-	function testSingleBackend(){
+	function testSingleBackend() {
 		OC_Group::useBackend(new OC_Group_Dummy());
 		
 		$group1=uniqid();
@@ -62,7 +62,7 @@ class Test_Group extends UnitTestCase {
 		$this->assertFalse(OC_Group::inGroup($user1,$group1));
 	}
 
-	function testMultiBackend(){
+	function testMultiBackend() {
 		$backend1=new OC_Group_Dummy();
 		$backend2=new OC_Group_Dummy();
 		OC_Group::useBackend($backend1);
diff --git a/tests/lib/group/backend.php b/tests/lib/group/backend.php
index 9405e90aab..61e008b6ca 100644
--- a/tests/lib/group/backend.php
+++ b/tests/lib/group/backend.php
@@ -31,7 +31,7 @@ abstract class Test_Group_Backend extends UnitTestCase {
 	 * test cases can override this in order to clean up created groups
 	 * @return array
 	 */
-	public function getGroupName(){
+	public function getGroupName() {
 		return uniqid('test_');
 	}
 
@@ -40,11 +40,11 @@ abstract class Test_Group_Backend extends UnitTestCase {
 	 * test cases can override this in order to clean up created user
 	 * @return array
 	 */
-	public function getUserName(){
+	public function getUserName() {
 		return uniqid('test_');
 	}
 
-	public function testAddRemove(){
+	public function testAddRemove() {
 		//get the number of groups we start with, in case there are exising groups
 		$startCount=count($this->backend->getGroups());
 
@@ -68,7 +68,7 @@ abstract class Test_Group_Backend extends UnitTestCase {
 		$this->assertFalse((array_search($name2,$this->backend->getGroups())!==false));
 	}
 
-	public function testUser(){
+	public function testUser() {
 		$group1=$this->getGroupName();
 		$group2=$this->getGroupName();
 		$this->backend->createGroup($group1);
diff --git a/tests/lib/group/database.php b/tests/lib/group/database.php
index fb51bc8d8d..5278c26f4d 100644
--- a/tests/lib/group/database.php
+++ b/tests/lib/group/database.php
@@ -28,7 +28,7 @@ class Test_Group_Database extends Test_Group_Backend {
 	 * test cases can override this in order to clean up created groups
 	 * @return array
 	 */
-	public function getGroupName(){
+	public function getGroupName() {
 		$name=uniqid('test_');
 		$this->groups[]=$name;
 		return $name;
@@ -39,16 +39,16 @@ class Test_Group_Database extends Test_Group_Backend {
 	 * test cases can override this in order to clean up created user
 	 * @return array
 	 */
-	public function getUserName(){
+	public function getUserName() {
 		return uniqid('test_');
 	}
 	
-	public function setUp(){
+	public function setUp() {
 		$this->backend=new OC_Group_Database();
 	}
 
-	public function tearDown(){
-		foreach($this->groups as $group){
+	public function tearDown() {
+		foreach($this->groups as $group) {
 			$this->backend->deleteGroup($group);
 		}
 	}
diff --git a/tests/lib/group/dummy.php b/tests/lib/group/dummy.php
index d0b475d3ec..287d6f1a97 100644
--- a/tests/lib/group/dummy.php
+++ b/tests/lib/group/dummy.php
@@ -21,7 +21,7 @@
 */
 
 class Test_Group_Dummy extends Test_Group_Backend {
-	public function setUp(){
+	public function setUp() {
 		$this->backend=new OC_Group_Dummy();
 	}
 }
diff --git a/tests/lib/streamwrappers.php b/tests/lib/streamwrappers.php
index 17a92c6658..5d6fe8da82 100644
--- a/tests/lib/streamwrappers.php
+++ b/tests/lib/streamwrappers.php
@@ -21,19 +21,19 @@
 */
 
 class Test_StreamWrappers extends UnitTestCase {
-	public function testFakeDir(){
+	public function testFakeDir() {
 		$items=array('foo','bar');
 		OC_FakeDirStream::$dirs['test']=$items;
 		$dh=opendir('fakedir://test');
 		$result=array();
-		while($file=readdir($dh)){
+		while($file=readdir($dh)) {
 			$result[]=$file;
 			$this->assertNotIdentical(false,array_search($file,$items));
 		}
 		$this->assertEqual(count($items),count($result));
 	}
 
-	public function testStaticStream(){
+	public function testStaticStream() {
 		$sourceFile=OC::$SERVERROOT.'/tests/data/lorem.txt';
 		$staticFile='static://test';
 		$this->assertFalse(file_exists($staticFile));
@@ -45,7 +45,7 @@ class Test_StreamWrappers extends UnitTestCase {
 		$this->assertFalse(file_exists($staticFile));
 	}
 
-	public function testCloseStream(){
+	public function testCloseStream() {
 		//ensure all basic stream stuff works
 		$sourceFile=OC::$SERVERROOT.'/tests/data/lorem.txt';
 		$tmpFile=OC_Helper::TmpFile('.txt');
@@ -66,13 +66,13 @@ class Test_StreamWrappers extends UnitTestCase {
 		try{
 			fclose($fh);
 			$this->fail('Expected exception');
-		}catch(Exception $e){
+		}catch(Exception $e) {
 			$path=$e->getMessage();
 			$this->assertEqual($path,$tmpFile);
 		}
 	}
 
-	public static function closeCallBack($path){
+	public static function closeCallBack($path) {
 		throw new Exception($path);
 	}
 }
\ No newline at end of file
diff --git a/tests/lib/user/backend.php b/tests/lib/user/backend.php
index 984249e84e..c69c1bad51 100644
--- a/tests/lib/user/backend.php
+++ b/tests/lib/user/backend.php
@@ -41,11 +41,11 @@ abstract class Test_User_Backend extends UnitTestCase {
 	 * test cases can override this in order to clean up created user
 	 * @return array
 	 */
-	public function getUser(){
+	public function getUser() {
 		return uniqid('test_');
 	}
 
-	public function testAddRemove(){
+	public function testAddRemove() {
 		//get the number of groups we start with, in case there are exising groups
 		$startCount=count($this->backend->getUsers());
 
@@ -69,7 +69,7 @@ abstract class Test_User_Backend extends UnitTestCase {
 		$this->assertFalse((array_search($name2,$this->backend->getUsers())!==false));
 	}
 	
-	public function testLogin(){
+	public function testLogin() {
 		$name1=$this->getUser();
 		$name2=$this->getUser();
 		
diff --git a/tests/lib/user/database.php b/tests/lib/user/database.php
index f484ffa78f..fe7d87c44d 100644
--- a/tests/lib/user/database.php
+++ b/tests/lib/user/database.php
@@ -26,18 +26,18 @@ class Test_User_Database extends Test_User_Backend {
 	 * test cases can override this in order to clean up created user
 	 * @return array
 	 */
-	public function getUser(){
+	public function getUser() {
 		$user=uniqid('test_');
 		$this->users[]=$user;
 		return $user;
 	}
 	
-	public function setUp(){
+	public function setUp() {
 		$this->backend=new OC_User_Dummy();
 	}
 	
-	public function tearDown(){
-		foreach($this->users as $user){
+	public function tearDown() {
+		foreach($this->users as $user) {
 			$this->backend->deleteUser($user);
 		}
 	}
diff --git a/tests/lib/user/dummy.php b/tests/lib/user/dummy.php
index 062f55ba07..e417fd9760 100644
--- a/tests/lib/user/dummy.php
+++ b/tests/lib/user/dummy.php
@@ -21,7 +21,7 @@
 */
 
 class Test_User_Dummy extends Test_User_Backend {
-	public function setUp(){
+	public function setUp() {
 		$this->backend=new OC_User_Dummy();
 	}
 }

From 631df21de640183623e626409903a0a1f7b0105d Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Fri, 7 Sep 2012 16:20:13 +0200
Subject: [PATCH 1154/1224] Prevent loading all apps twice from overwriting the
 core scripts and styles

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

diff --git a/lib/app.php b/lib/app.php
index f5c328afe7..f1e4f965ef 100755
--- a/lib/app.php
+++ b/lib/app.php
@@ -62,7 +62,9 @@ class OC_App{
 		ob_end_clean();
 
 		if (!defined('DEBUG') || !DEBUG) {
-			if (is_null($types)) {
+			if (is_null($types)
+			    && empty(OC_Util::$core_scripts) 
+			    && empty(OC_Util::$core_styles)) {
 				OC_Util::$core_scripts = OC_Util::$scripts;
 				OC_Util::$scripts = array();
 				OC_Util::$core_styles = OC_Util::$styles;

From edcd29747692ff1ffbec927b9f31ac239c5e192d Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Fri, 7 Sep 2012 16:42:46 +0200
Subject: [PATCH 1155/1224] Move handling of core remotes to OC_TemplateLayout

---
 core/templates/layout.base.php  |  6 ------
 core/templates/layout.guest.php |  6 ------
 core/templates/layout.user.php  |  6 ------
 lib/app.php                     |  5 -----
 lib/templatelayout.php          | 12 +++++++++++-
 5 files changed, 11 insertions(+), 24 deletions(-)

diff --git a/core/templates/layout.base.php b/core/templates/layout.base.php
index bfd23a9ce9..c113a4db24 100644
--- a/core/templates/layout.base.php
+++ b/core/templates/layout.base.php
@@ -4,9 +4,6 @@
 		<title>ownCloud</title>
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 		<link rel="shortcut icon" href="<?php echo image_path('', 'favicon.png'); ?>" /><link rel="apple-touch-icon-precomposed" href="<?php echo image_path('', 'favicon-touch.png'); ?>" />
-		<?php if (!empty(OC_Util::$core_styles)): ?>
-			<link rel="stylesheet" href="<?php echo OC_Helper::linkToRemote('core.css', false) ?>" type="text/css" media="screen" />
-		<?php endif ?>
 		<?php foreach ($_['cssfiles'] as $cssfile): ?>
 			<link rel="stylesheet" href="<?php echo $cssfile; ?>" type="text/css" media="screen" />
 		<?php endforeach; ?>
@@ -14,9 +11,6 @@
 			var oc_webroot = '<?php echo OC::$WEBROOT; ?>';
 			var oc_appswebroots = <?php echo $_['apps_paths'] ?>;
 		</script>
-		<?php if (!empty(OC_Util::$core_scripts)): ?>
-			<script type="text/javascript" src="<?php echo OC_Helper::linkToRemote('core.js', false) ?>"></script>
-		<?php endif ?>
 		<?php foreach ($_['jsfiles'] as $jsfile): ?>
 			<script type="text/javascript" src="<?php echo $jsfile; ?>"></script>
 		<?php endforeach; ?>
diff --git a/core/templates/layout.guest.php b/core/templates/layout.guest.php
index 9a5a056eb2..0d2e71c180 100644
--- a/core/templates/layout.guest.php
+++ b/core/templates/layout.guest.php
@@ -4,9 +4,6 @@
 		<title>ownCloud</title>
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 		<link rel="shortcut icon" href="<?php echo image_path('', 'favicon.png'); ?>" /><link rel="apple-touch-icon-precomposed" href="<?php echo image_path('', 'favicon-touch.png'); ?>" />
-		<?php if (!empty(OC_Util::$core_styles)): ?>
-		<link rel="stylesheet" href="<?php echo OC_Helper::linkToRemote('core.css', false) ?>" type="text/css" media="screen" />
-		<?php endif ?>
 		<?php foreach($_['cssfiles'] as $cssfile): ?>
 			<link rel="stylesheet" href="<?php echo $cssfile; ?>" type="text/css" media="screen" />
 		<?php endforeach; ?>
@@ -14,9 +11,6 @@
 			var oc_webroot = '<?php echo OC::$WEBROOT; ?>';
 			var oc_appswebroots = <?php echo $_['apps_paths'] ?>;
 		</script>
-		<?php if (!empty(OC_Util::$core_scripts)): ?>
-		<script type="text/javascript" src="<?php echo OC_Helper::linkToRemote('core.js', false) ?>"></script>
-		<?php endif ?>
 		<?php foreach($_['jsfiles'] as $jsfile): ?>
 			<script type="text/javascript" src="<?php echo $jsfile; ?>"></script>
 		<?php endforeach; ?>
diff --git a/core/templates/layout.user.php b/core/templates/layout.user.php
index 89b8027fc0..4fa0fd0136 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -4,9 +4,6 @@
 		<title><?php echo isset($_['application']) && !empty($_['application'])?$_['application'].' | ':'' ?>ownCloud <?php echo OC_User::getUser()?' ('.OC_User::getUser().') ':'' ?></title>
 		<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 		<link rel="shortcut icon" href="<?php echo image_path('', 'favicon.png'); ?>" /><link rel="apple-touch-icon-precomposed" href="<?php echo image_path('', 'favicon-touch.png'); ?>" />
-		<?php if (!empty(OC_Util::$core_styles)): ?>
-		<link rel="stylesheet" href="<?php echo OC_Helper::linkToRemote('core.css', false) ?>" type="text/css" media="screen" />
-		<?php endif ?>
 		<?php foreach($_['cssfiles'] as $cssfile): ?>
 			<link rel="stylesheet" href="<?php echo $cssfile; ?>" type="text/css" media="screen" />
 		<?php endforeach; ?>
@@ -15,9 +12,6 @@
 			var oc_appswebroots = <?php echo $_['apps_paths'] ?>;
 			var oc_current_user = '<?php echo OC_User::getUser() ?>';
 		</script>
-		<?php if (!empty(OC_Util::$core_scripts)): ?>
-		<script type="text/javascript" src="<?php echo OC_Helper::linkToRemote('core.js', false) ?>"></script>
-		<?php endif ?>
 		<?php foreach($_['jsfiles'] as $jsfile): ?>
 			<script type="text/javascript" src="<?php echo $jsfile; ?>"></script>
 		<?php endforeach; ?>
diff --git a/lib/app.php b/lib/app.php
index f1e4f965ef..28f1f16eba 100755
--- a/lib/app.php
+++ b/lib/app.php
@@ -69,11 +69,6 @@ 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/templatelayout.php b/lib/templatelayout.php
index ad013edad8..d72f5552fd 100644
--- a/lib/templatelayout.php
+++ b/lib/templatelayout.php
@@ -41,9 +41,17 @@ class OC_TemplateLayout extends OC_Template {
 		}
 		$this->assign( 'apps_paths', str_replace('\\/', '/',json_encode($apps_paths)),false ); // Ugly unescape slashes waiting for better solution
 
+		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');
+		}
+
 		// Add the js files
 		$jsfiles = self::findJavascriptFiles(OC_Util::$scripts);
 		$this->assign('jsfiles', array(), false);
+		if (!empty(OC_Util::$core_scripts)) {
+			$this->append( 'jsfiles', OC_Helper::linkToRemote('core.js', false));
+		}
 		foreach($jsfiles as $info) {
 			$root = $info[0];
 			$web = $info[1];
@@ -53,8 +61,10 @@ class OC_TemplateLayout extends OC_Template {
 
 		// Add the css files
 		$cssfiles = self::findStylesheetFiles(OC_Util::$styles);
-
 		$this->assign('cssfiles', array());
+		if (!empty(OC_Util::$core_styles)) {
+			$this->append( 'cssfiles', OC_Helper::linkToRemote('core.css', false));
+		}
 		foreach($cssfiles as $info) {
 			$root = $info[0];
 			$web = $info[1];

From d5d2e896220de5b11e86dcfaf5f25787b7838811 Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <thomas.mueller@tmit.eu>
Date: Sat, 8 Sep 2012 02:05:41 +0200
Subject: [PATCH 1156/1224] [tx-robot] updated from transifex

---
 apps/files/l10n/fr.php               |   1 +
 apps/files/l10n/nb_NO.php            |   1 +
 apps/files/l10n/nl.php               |   1 +
 apps/files/l10n/ru.php               |   2 +
 apps/files/l10n/vi.php               |   2 +
 apps/files_encryption/l10n/vi.php    |   6 +
 apps/files_encryption/l10n/zh_CN.php |   1 +
 apps/files_external/l10n/vi.php      |  18 ++
 apps/files_sharing/l10n/vi.php       |   7 +
 apps/files_versions/l10n/ru.php      |   2 +
 apps/files_versions/l10n/vi.php      |   6 +
 apps/user_ldap/l10n/el.php           |  11 +
 core/l10n/ru.php                     |   1 +
 l10n/af/files.po                     |  38 ++--
 l10n/ar/files.po                     |  38 ++--
 l10n/ar_SA/files.po                  |  38 ++--
 l10n/bg_BG/files.po                  |  38 ++--
 l10n/ca/files.po                     |  30 ++-
 l10n/cs_CZ/files.po                  |  30 ++-
 l10n/da/files.po                     |  38 ++--
 l10n/de/files.po                     |  30 ++-
 l10n/el/files.po                     |  38 ++--
 l10n/el/user_ldap.po                 |  31 +--
 l10n/eo/files.po                     |  38 ++--
 l10n/es/files.po                     |  30 ++-
 l10n/et_EE/files.po                  |  38 ++--
 l10n/eu/files.po                     |  38 ++--
 l10n/eu/settings.po                  |  20 +-
 l10n/eu_ES/files.po                  |  38 ++--
 l10n/fa/files.po                     |  38 ++--
 l10n/fi/files.po                     |  38 ++--
 l10n/fi_FI/files.po                  |  30 ++-
 l10n/fr/files.po                     |  40 ++--
 l10n/gl/files.po                     |  38 ++--
 l10n/he/files.po                     |  38 ++--
 l10n/hi/files.po                     |  38 ++--
 l10n/hr/files.po                     |  38 ++--
 l10n/hu_HU/files.po                  |  38 ++--
 l10n/hy/files.po                     |  38 ++--
 l10n/ia/files.po                     |  38 ++--
 l10n/id/files.po                     |  38 ++--
 l10n/id_ID/files.po                  |  38 ++--
 l10n/it/files.po                     |  30 ++-
 l10n/ja_JP/files.po                  |  38 ++--
 l10n/ko/files.po                     |  38 ++--
 l10n/lb/files.po                     |  38 ++--
 l10n/lt_LT/files.po                  |  38 ++--
 l10n/lv/files.po                     |  38 ++--
 l10n/mk/files.po                     |  38 ++--
 l10n/ms_MY/files.po                  |  38 ++--
 l10n/nb_NO/files.po                  |  41 ++--
 l10n/nl/files.po                     |  40 ++--
 l10n/nl/settings.po                  |   8 +-
 l10n/nn_NO/files.po                  |  38 ++--
 l10n/oc/core.po                      | 268 +++++++++++++++++++++++
 l10n/oc/files.po                     | 239 ++++++++++++++++++++
 l10n/oc/files_encryption.po          |  34 +++
 l10n/oc/files_external.po            |  82 +++++++
 l10n/oc/files_sharing.po             |  38 ++++
 l10n/oc/files_versions.po            |  34 +++
 l10n/oc/lib.po                       | 125 +++++++++++
 l10n/oc/settings.po                  | 316 +++++++++++++++++++++++++++
 l10n/oc/user_ldap.po                 | 170 ++++++++++++++
 l10n/pl/files.po                     |  30 ++-
 l10n/pl_PL/files.po                  |  38 ++--
 l10n/pt_BR/files.po                  |  38 ++--
 l10n/pt_PT/files.po                  |  38 ++--
 l10n/ro/files.po                     |  38 ++--
 l10n/ru/core.po                      |  15 +-
 l10n/ru/files.po                     |  43 ++--
 l10n/ru/files_versions.po            |  13 +-
 l10n/ru/lib.po                       |  45 ++--
 l10n/ru_RU/files.po                  |  38 ++--
 l10n/sk_SK/files.po                  |  38 ++--
 l10n/sl/files.po                     |  30 ++-
 l10n/so/files.po                     |  38 ++--
 l10n/sr/files.po                     |  38 ++--
 l10n/sr@latin/files.po               |  38 ++--
 l10n/sv/files.po                     |  30 ++-
 l10n/templates/core.pot              |   8 +-
 l10n/templates/files.pot             |  26 ++-
 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/lib.pot               |  14 +-
 l10n/templates/settings.pot          |   2 +-
 l10n/templates/user_ldap.pot         |   2 +-
 l10n/th_TH/files.po                  |  30 ++-
 l10n/tr/files.po                     |  38 ++--
 l10n/uk/files.po                     |  38 ++--
 l10n/vi/files.po                     |  43 ++--
 l10n/vi/files_encryption.po          |  17 +-
 l10n/vi/files_external.po            |  41 ++--
 l10n/vi/files_sharing.po             |  21 +-
 l10n/vi/files_versions.po            |  17 +-
 l10n/vi/lib.po                       |  99 ++++-----
 l10n/vi/settings.po                  |  53 ++---
 l10n/zh_CN.GB2312/files.po           |  38 ++--
 l10n/zh_CN/files.po                  |  30 ++-
 l10n/zh_CN/files_encryption.po       |   6 +-
 l10n/zh_TW/files.po                  |  38 ++--
 lib/l10n/ru.php                      |   2 +
 lib/l10n/vi.php                      |  28 +++
 settings/l10n/eu.php                 |   7 +
 settings/l10n/nl.php                 |   1 +
 settings/l10n/vi.php                 |  23 ++
 107 files changed, 2958 insertions(+), 1047 deletions(-)
 create mode 100644 apps/files_encryption/l10n/vi.php
 create mode 100644 apps/files_external/l10n/vi.php
 create mode 100644 apps/files_sharing/l10n/vi.php
 create mode 100644 apps/files_versions/l10n/vi.php
 create mode 100644 l10n/oc/core.po
 create mode 100644 l10n/oc/files.po
 create mode 100644 l10n/oc/files_encryption.po
 create mode 100644 l10n/oc/files_external.po
 create mode 100644 l10n/oc/files_sharing.po
 create mode 100644 l10n/oc/files_versions.po
 create mode 100644 l10n/oc/lib.po
 create mode 100644 l10n/oc/settings.po
 create mode 100644 l10n/oc/user_ldap.po
 create mode 100644 lib/l10n/vi.php

diff --git a/apps/files/l10n/fr.php b/apps/files/l10n/fr.php
index 0b7d226de7..bce17be3b5 100644
--- a/apps/files/l10n/fr.php
+++ b/apps/files/l10n/fr.php
@@ -10,6 +10,7 @@
 "Delete" => "Supprimer",
 "already exists" => "existe déjà",
 "replace" => "remplacer",
+"suggest name" => "Suggérer un nom",
 "cancel" => "annuler",
 "replaced" => "remplacé",
 "undo" => "annuler",
diff --git a/apps/files/l10n/nb_NO.php b/apps/files/l10n/nb_NO.php
index 4a747af2f3..6331de6d45 100644
--- a/apps/files/l10n/nb_NO.php
+++ b/apps/files/l10n/nb_NO.php
@@ -34,6 +34,7 @@
 "Enable ZIP-download" => "Aktiver nedlasting av ZIP",
 "0 is unlimited" => "0 er ubegrenset",
 "Maximum input size for ZIP files" => "Maksimal størrelse på ZIP-filer",
+"Save" => "Lagre",
 "New" => "Ny",
 "Text file" => "Tekstfil",
 "Folder" => "Mappe",
diff --git a/apps/files/l10n/nl.php b/apps/files/l10n/nl.php
index 7acb15054c..515d67a76a 100644
--- a/apps/files/l10n/nl.php
+++ b/apps/files/l10n/nl.php
@@ -10,6 +10,7 @@
 "Delete" => "Verwijder",
 "already exists" => "bestaat al",
 "replace" => "vervang",
+"suggest name" => "Stel een naam voor",
 "cancel" => "annuleren",
 "replaced" => "vervangen",
 "undo" => "ongedaan maken",
diff --git a/apps/files/l10n/ru.php b/apps/files/l10n/ru.php
index 6a76c25404..b013ae8985 100644
--- a/apps/files/l10n/ru.php
+++ b/apps/files/l10n/ru.php
@@ -10,6 +10,7 @@
 "Delete" => "Удалить",
 "already exists" => "уже существует",
 "replace" => "заменить",
+"suggest name" => "предложить название",
 "cancel" => "отмена",
 "replaced" => "заменён",
 "undo" => "отмена",
@@ -35,6 +36,7 @@
 "Enable ZIP-download" => "Включить ZIP-скачивание",
 "0 is unlimited" => "0 - без ограничений",
 "Maximum input size for ZIP files" => "Максимальный исходный размер для ZIP файлов",
+"Save" => "Сохранить",
 "New" => "Новый",
 "Text file" => "Текстовый файл",
 "Folder" => "Папка",
diff --git a/apps/files/l10n/vi.php b/apps/files/l10n/vi.php
index c2284d5feb..876d5abe9a 100644
--- a/apps/files/l10n/vi.php
+++ b/apps/files/l10n/vi.php
@@ -1,4 +1,5 @@
 <?php $TRANSLATIONS = array(
+"There is no error, the file uploaded with success" => "Không có lỗi, các tập tin đã được tải lên thành công",
 "Files" => "Tập tin",
 "Delete" => "Xóa",
 "Upload Error" => "Tải lên lỗi",
@@ -27,5 +28,6 @@
 "Share" => "Chia sẻ",
 "Download" => "Tải xuống",
 "Upload too large" => "File tải lên quá lớn",
+"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Các tập tin bạn đang cố gắng tải lên vượt quá kích thước tối đa cho phép trên máy chủ này.",
 "Files are being scanned, please wait." => "Tập tin đang được quét ,vui lòng chờ."
 );
diff --git a/apps/files_encryption/l10n/vi.php b/apps/files_encryption/l10n/vi.php
new file mode 100644
index 0000000000..cabf2da7dc
--- /dev/null
+++ b/apps/files_encryption/l10n/vi.php
@@ -0,0 +1,6 @@
+<?php $TRANSLATIONS = array(
+"Encryption" => "Mã hóa",
+"Exclude the following file types from encryption" => "Loại trừ các loại tập tin sau đây từ mã hóa",
+"None" => "none",
+"Enable Encryption" => "BẬT mã hóa"
+);
diff --git a/apps/files_encryption/l10n/zh_CN.php b/apps/files_encryption/l10n/zh_CN.php
index 139ae90970..1e1247d15f 100644
--- a/apps/files_encryption/l10n/zh_CN.php
+++ b/apps/files_encryption/l10n/zh_CN.php
@@ -1,5 +1,6 @@
 <?php $TRANSLATIONS = array(
 "Encryption" => "加密",
+"Exclude the following file types from encryption" => "从加密中排除列出的文件类型",
 "None" => "None",
 "Enable Encryption" => "开启加密"
 );
diff --git a/apps/files_external/l10n/vi.php b/apps/files_external/l10n/vi.php
new file mode 100644
index 0000000000..35312329da
--- /dev/null
+++ b/apps/files_external/l10n/vi.php
@@ -0,0 +1,18 @@
+<?php $TRANSLATIONS = array(
+"External Storage" => "Lưu trữ ngoài",
+"Mount point" => "Điểm gắn",
+"Backend" => "phụ trợ",
+"Configuration" => "Cấu hình",
+"Options" => "Tùy chọn",
+"Applicable" => "Áp dụng",
+"Add mount point" => "Thêm điểm lắp",
+"None set" => "không",
+"All Users" => "Tất cả người dùng",
+"Groups" => "Nhóm",
+"Users" => "Người dùng",
+"Delete" => "Xóa",
+"SSL root certificates" => "Chứng chỉ SSL root",
+"Import Root Certificate" => "Nhập Root Certificate",
+"Enable User External Storage" => "Kích hoạt tính năng lưu trữ ngoài",
+"Allow users to mount their own external storage" => "Cho phép người dùng kết nối với lưu trữ riêng bên ngoài của họ"
+);
diff --git a/apps/files_sharing/l10n/vi.php b/apps/files_sharing/l10n/vi.php
new file mode 100644
index 0000000000..d4faee06bf
--- /dev/null
+++ b/apps/files_sharing/l10n/vi.php
@@ -0,0 +1,7 @@
+<?php $TRANSLATIONS = array(
+"Password" => "Mật khẩu",
+"Submit" => "Xác nhận",
+"Download" => "Tải về",
+"No preview available for" => "Không có xem trước cho",
+"web services under your control" => "dịch vụ web dưới sự kiểm soát của bạn"
+);
diff --git a/apps/files_versions/l10n/ru.php b/apps/files_versions/l10n/ru.php
index 6a824779f3..675dd090d3 100644
--- a/apps/files_versions/l10n/ru.php
+++ b/apps/files_versions/l10n/ru.php
@@ -1,4 +1,6 @@
 <?php $TRANSLATIONS = array(
 "Expire all versions" => "Просрочить все версии",
+"Versions" => "Версии",
+"This will delete all existing backup versions of your files" => "Очистить список версий ваших файлов",
 "Enable Files Versioning" => "Включить ведение версий файлов"
 );
diff --git a/apps/files_versions/l10n/vi.php b/apps/files_versions/l10n/vi.php
new file mode 100644
index 0000000000..6743395481
--- /dev/null
+++ b/apps/files_versions/l10n/vi.php
@@ -0,0 +1,6 @@
+<?php $TRANSLATIONS = array(
+"Expire all versions" => "Hết hạn tất cả các phiên bản",
+"Versions" => "Phiên bản",
+"This will delete all existing backup versions of your files" => "Điều này sẽ xóa tất cả các phiên bản sao lưu hiện có ",
+"Enable Files Versioning" => "BẬT tập tin phiên bản"
+);
diff --git a/apps/user_ldap/l10n/el.php b/apps/user_ldap/l10n/el.php
index 2f3c747a67..1bb72f163a 100644
--- a/apps/user_ldap/l10n/el.php
+++ b/apps/user_ldap/l10n/el.php
@@ -1,6 +1,17 @@
 <?php $TRANSLATIONS = array(
+"Base DN" => "Base DN",
+"User DN" => "User DN",
 "Password" => "Συνθηματικό",
+"User Login Filter" => "User Login Filter",
+"User List Filter" => "User List Filter",
+"Group Filter" => "Group Filter",
 "Port" => "Θύρα",
+"Base User Tree" => "Base User Tree",
+"Base Group Tree" => "Base Group Tree",
+"Group-Member association" => "Group-Member association",
+"Use TLS" => "Χρήση TLS",
+"User Display Name Field" => "User Display Name Field",
+"Group Display Name Field" => "Group Display Name Field",
 "in bytes" => "σε bytes",
 "Help" => "Βοήθεια"
 );
diff --git a/core/l10n/ru.php b/core/l10n/ru.php
index 81b579aeb0..c7ce381c05 100644
--- a/core/l10n/ru.php
+++ b/core/l10n/ru.php
@@ -50,6 +50,7 @@
 "Database user" => "Имя пользователя для базы данных",
 "Database password" => "Пароль для базы данных",
 "Database name" => "Название базы данных",
+"Database tablespace" => "Табличое пространство базы данных",
 "Database host" => "Хост базы данных",
 "Finish setup" => "Завершить установку",
 "web services under your control" => "Сетевые службы под твоим контролем",
diff --git a/l10n/af/files.po b/l10n/af/files.po
index 31f2a00b0f..6cd6b21cef 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-09-06 02:01+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-08 02:01+0200\n"
+"PO-Revision-Date: 2012-09-08 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"
@@ -51,7 +51,11 @@ msgstr ""
 msgid "Files"
 msgstr ""
 
-#: js/fileactions.js:106 templates/index.php:56
+#: js/fileactions.js:108 templates/index.php:62
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:110 templates/index.php:64
 msgid "Delete"
 msgstr ""
 
@@ -75,7 +79,7 @@ msgstr ""
 msgid "replaced"
 msgstr ""
 
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:268 js/filelist.js:270
 msgid "undo"
 msgstr ""
 
@@ -83,7 +87,11 @@ msgstr ""
 msgid "with"
 msgstr ""
 
-#: js/filelist.js:271
+#: js/filelist.js:268
+msgid "unshared"
+msgstr ""
+
+#: js/filelist.js:270
 msgid "deleted"
 msgstr ""
 
@@ -116,11 +124,11 @@ msgstr ""
 msgid "Invalid name, '/' is not allowed."
 msgstr ""
 
-#: js/files.js:746 templates/index.php:55
+#: js/files.js:746 templates/index.php:56
 msgid "Size"
 msgstr ""
 
-#: js/files.js:747 templates/index.php:56
+#: js/files.js:747 templates/index.php:58
 msgid "Modified"
 msgstr ""
 
@@ -196,36 +204,36 @@ msgstr ""
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:39
+#: templates/index.php:40
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:47
+#: templates/index.php:48
 msgid "Name"
 msgstr ""
 
-#: templates/index.php:49
+#: templates/index.php:50
 msgid "Share"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/index.php:52
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:64
+#: templates/index.php:75
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:66
+#: templates/index.php:77
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:71
+#: templates/index.php:82
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:74
+#: templates/index.php:85
 msgid "Current scanning"
 msgstr ""
diff --git a/l10n/ar/files.po b/l10n/ar/files.po
index 52370a91d0..7221caf070 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-09-06 02:01+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-08 02:01+0200\n"
+"PO-Revision-Date: 2012-09-08 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"
@@ -52,7 +52,11 @@ msgstr ""
 msgid "Files"
 msgstr "الملفات"
 
-#: js/fileactions.js:106 templates/index.php:56
+#: js/fileactions.js:108 templates/index.php:62
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:110 templates/index.php:64
 msgid "Delete"
 msgstr "محذوف"
 
@@ -76,7 +80,7 @@ msgstr ""
 msgid "replaced"
 msgstr ""
 
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:268 js/filelist.js:270
 msgid "undo"
 msgstr ""
 
@@ -84,7 +88,11 @@ msgstr ""
 msgid "with"
 msgstr ""
 
-#: js/filelist.js:271
+#: js/filelist.js:268
+msgid "unshared"
+msgstr ""
+
+#: js/filelist.js:270
 msgid "deleted"
 msgstr ""
 
@@ -117,11 +125,11 @@ msgstr ""
 msgid "Invalid name, '/' is not allowed."
 msgstr ""
 
-#: js/files.js:746 templates/index.php:55
+#: js/files.js:746 templates/index.php:56
 msgid "Size"
 msgstr "حجم"
 
-#: js/files.js:747 templates/index.php:56
+#: js/files.js:747 templates/index.php:58
 msgid "Modified"
 msgstr "معدل"
 
@@ -197,36 +205,36 @@ msgstr "إرفع"
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:39
+#: templates/index.php:40
 msgid "Nothing in here. Upload something!"
 msgstr "لا يوجد شيء هنا. إرفع بعض الملفات!"
 
-#: templates/index.php:47
+#: templates/index.php:48
 msgid "Name"
 msgstr "الاسم"
 
-#: templates/index.php:49
+#: templates/index.php:50
 msgid "Share"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/index.php:52
 msgid "Download"
 msgstr "تحميل"
 
-#: templates/index.php:64
+#: templates/index.php:75
 msgid "Upload too large"
 msgstr "حجم الترفيع أعلى من المسموح"
 
-#: templates/index.php:66
+#: templates/index.php:77
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "حجم الملفات التي تريد ترفيعها أعلى من المسموح على الخادم."
 
-#: templates/index.php:71
+#: templates/index.php:82
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:74
+#: templates/index.php:85
 msgid "Current scanning"
 msgstr ""
diff --git a/l10n/ar_SA/files.po b/l10n/ar_SA/files.po
index f5fadbff02..8651ddd072 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-09-06 02:01+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-08 02:01+0200\n"
+"PO-Revision-Date: 2012-09-08 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"
@@ -51,7 +51,11 @@ msgstr ""
 msgid "Files"
 msgstr ""
 
-#: js/fileactions.js:106 templates/index.php:56
+#: js/fileactions.js:108 templates/index.php:62
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:110 templates/index.php:64
 msgid "Delete"
 msgstr ""
 
@@ -75,7 +79,7 @@ msgstr ""
 msgid "replaced"
 msgstr ""
 
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:268 js/filelist.js:270
 msgid "undo"
 msgstr ""
 
@@ -83,7 +87,11 @@ msgstr ""
 msgid "with"
 msgstr ""
 
-#: js/filelist.js:271
+#: js/filelist.js:268
+msgid "unshared"
+msgstr ""
+
+#: js/filelist.js:270
 msgid "deleted"
 msgstr ""
 
@@ -116,11 +124,11 @@ msgstr ""
 msgid "Invalid name, '/' is not allowed."
 msgstr ""
 
-#: js/files.js:746 templates/index.php:55
+#: js/files.js:746 templates/index.php:56
 msgid "Size"
 msgstr ""
 
-#: js/files.js:747 templates/index.php:56
+#: js/files.js:747 templates/index.php:58
 msgid "Modified"
 msgstr ""
 
@@ -196,36 +204,36 @@ msgstr ""
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:39
+#: templates/index.php:40
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:47
+#: templates/index.php:48
 msgid "Name"
 msgstr ""
 
-#: templates/index.php:49
+#: templates/index.php:50
 msgid "Share"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/index.php:52
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:64
+#: templates/index.php:75
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:66
+#: templates/index.php:77
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:71
+#: templates/index.php:82
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:74
+#: templates/index.php:85
 msgid "Current scanning"
 msgstr ""
diff --git a/l10n/bg_BG/files.po b/l10n/bg_BG/files.po
index c51de878e9..f1667a2327 100644
--- a/l10n/bg_BG/files.po
+++ b/l10n/bg_BG/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-09-06 02:01+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-08 02:01+0200\n"
+"PO-Revision-Date: 2012-09-08 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"
@@ -53,7 +53,11 @@ msgstr "Грешка при запис на диска"
 msgid "Files"
 msgstr "Файлове"
 
-#: js/fileactions.js:106 templates/index.php:56
+#: js/fileactions.js:108 templates/index.php:62
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:110 templates/index.php:64
 msgid "Delete"
 msgstr "Изтриване"
 
@@ -77,7 +81,7 @@ msgstr ""
 msgid "replaced"
 msgstr ""
 
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:268 js/filelist.js:270
 msgid "undo"
 msgstr ""
 
@@ -85,7 +89,11 @@ msgstr ""
 msgid "with"
 msgstr ""
 
-#: js/filelist.js:271
+#: js/filelist.js:268
+msgid "unshared"
+msgstr ""
+
+#: js/filelist.js:270
 msgid "deleted"
 msgstr ""
 
@@ -118,11 +126,11 @@ msgstr ""
 msgid "Invalid name, '/' is not allowed."
 msgstr "Неправилно име – \"/\" не е позволено."
 
-#: js/files.js:746 templates/index.php:55
+#: js/files.js:746 templates/index.php:56
 msgid "Size"
 msgstr "Размер"
 
-#: js/files.js:747 templates/index.php:56
+#: js/files.js:747 templates/index.php:58
 msgid "Modified"
 msgstr "Променено"
 
@@ -198,36 +206,36 @@ msgstr "Качване"
 msgid "Cancel upload"
 msgstr "Отказване на качването"
 
-#: templates/index.php:39
+#: templates/index.php:40
 msgid "Nothing in here. Upload something!"
 msgstr "Няма нищо, качете нещо!"
 
-#: templates/index.php:47
+#: templates/index.php:48
 msgid "Name"
 msgstr "Име"
 
-#: templates/index.php:49
+#: templates/index.php:50
 msgid "Share"
 msgstr "Споделяне"
 
-#: templates/index.php:51
+#: templates/index.php:52
 msgid "Download"
 msgstr "Изтегляне"
 
-#: templates/index.php:64
+#: templates/index.php:75
 msgid "Upload too large"
 msgstr "Файлът е прекалено голям"
 
-#: templates/index.php:66
+#: templates/index.php:77
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Файловете които се опитвате да качите са по-големи от позволеното за сървъра."
 
-#: templates/index.php:71
+#: templates/index.php:82
 msgid "Files are being scanned, please wait."
 msgstr "Файловете се претърсват, изчакайте."
 
-#: templates/index.php:74
+#: templates/index.php:85
 msgid "Current scanning"
 msgstr ""
diff --git a/l10n/ca/files.po b/l10n/ca/files.po
index b00e52830d..f43fdccfb5 100644
--- a/l10n/ca/files.po
+++ b/l10n/ca/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-09-07 02:04+0200\n"
-"PO-Revision-Date: 2012-09-06 06:33+0000\n"
-"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
+"POT-Creation-Date: 2012-09-08 02:01+0200\n"
+"PO-Revision-Date: 2012-09-08 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"
@@ -54,7 +54,11 @@ msgstr "Ha fallat en escriure al disc"
 msgid "Files"
 msgstr "Fitxers"
 
-#: js/fileactions.js:106 templates/index.php:57
+#: js/fileactions.js:108 templates/index.php:62
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:110 templates/index.php:64
 msgid "Delete"
 msgstr "Suprimeix"
 
@@ -78,7 +82,7 @@ msgstr "cancel·la"
 msgid "replaced"
 msgstr "substituït"
 
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:266
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:268 js/filelist.js:270
 msgid "undo"
 msgstr "desfés"
 
@@ -86,7 +90,11 @@ msgstr "desfés"
 msgid "with"
 msgstr "per"
 
-#: js/filelist.js:266
+#: js/filelist.js:268
+msgid "unshared"
+msgstr ""
+
+#: js/filelist.js:270
 msgid "deleted"
 msgstr "esborrat"
 
@@ -123,7 +131,7 @@ msgstr "El nom no és vàlid, no es permet '/'."
 msgid "Size"
 msgstr "Mida"
 
-#: js/files.js:747 templates/index.php:57
+#: js/files.js:747 templates/index.php:58
 msgid "Modified"
 msgstr "Modificat"
 
@@ -215,20 +223,20 @@ msgstr "Comparteix"
 msgid "Download"
 msgstr "Baixa"
 
-#: templates/index.php:65
+#: templates/index.php:75
 msgid "Upload too large"
 msgstr "La pujada és massa gran"
 
-#: templates/index.php:67
+#: templates/index.php:77
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Els fitxers que esteu intentant pujar excedeixen la mida màxima de pujada del servidor"
 
-#: templates/index.php:72
+#: templates/index.php:82
 msgid "Files are being scanned, please wait."
 msgstr "S'estan escanejant els fitxers, espereu"
 
-#: templates/index.php:75
+#: templates/index.php:85
 msgid "Current scanning"
 msgstr "Actualment escanejant"
diff --git a/l10n/cs_CZ/files.po b/l10n/cs_CZ/files.po
index 855b138c2a..bbdfc08e88 100644
--- a/l10n/cs_CZ/files.po
+++ b/l10n/cs_CZ/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-09-07 02:04+0200\n"
-"PO-Revision-Date: 2012-09-06 08:41+0000\n"
-"Last-Translator: Tomáš Chvátal <tomas.chvatal@gmail.com>\n"
+"POT-Creation-Date: 2012-09-08 02:01+0200\n"
+"PO-Revision-Date: 2012-09-08 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"
@@ -54,7 +54,11 @@ msgstr "Zápis na disk selhal"
 msgid "Files"
 msgstr "Soubory"
 
-#: js/fileactions.js:106 templates/index.php:57
+#: js/fileactions.js:108 templates/index.php:62
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:110 templates/index.php:64
 msgid "Delete"
 msgstr "Smazat"
 
@@ -78,7 +82,7 @@ msgstr "zrušit"
 msgid "replaced"
 msgstr "nahrazeno"
 
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:266
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:268 js/filelist.js:270
 msgid "undo"
 msgstr "zpět"
 
@@ -86,7 +90,11 @@ msgstr "zpět"
 msgid "with"
 msgstr "s"
 
-#: js/filelist.js:266
+#: js/filelist.js:268
+msgid "unshared"
+msgstr ""
+
+#: js/filelist.js:270
 msgid "deleted"
 msgstr "smazáno"
 
@@ -123,7 +131,7 @@ msgstr "Neplatný název, znak '/' není povolen"
 msgid "Size"
 msgstr "Velikost"
 
-#: js/files.js:747 templates/index.php:57
+#: js/files.js:747 templates/index.php:58
 msgid "Modified"
 msgstr "Změněno"
 
@@ -215,20 +223,20 @@ msgstr "Sdílet"
 msgid "Download"
 msgstr "Stáhnout"
 
-#: templates/index.php:65
+#: templates/index.php:75
 msgid "Upload too large"
 msgstr "Odeslaný soubor je příliš velký"
 
-#: templates/index.php:67
+#: templates/index.php:77
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Soubory, které se snažíte odeslat, překračují limit velikosti odesílání na tomto serveru."
 
-#: templates/index.php:72
+#: templates/index.php:82
 msgid "Files are being scanned, please wait."
 msgstr "Soubory se prohledávají, prosím čekejte."
 
-#: templates/index.php:75
+#: templates/index.php:85
 msgid "Current scanning"
 msgstr "Aktuální prohledávání"
diff --git a/l10n/da/files.po b/l10n/da/files.po
index ef7718c6d0..c2e2ab70ee 100644
--- a/l10n/da/files.po
+++ b/l10n/da/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-09-06 02:01+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-08 02:01+0200\n"
+"PO-Revision-Date: 2012-09-08 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"
@@ -56,7 +56,11 @@ msgstr "Fejl ved skrivning til disk."
 msgid "Files"
 msgstr "Filer"
 
-#: js/fileactions.js:106 templates/index.php:56
+#: js/fileactions.js:108 templates/index.php:62
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:110 templates/index.php:64
 msgid "Delete"
 msgstr "Slet"
 
@@ -80,7 +84,7 @@ msgstr "fortryd"
 msgid "replaced"
 msgstr "erstattet"
 
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:268 js/filelist.js:270
 msgid "undo"
 msgstr "fortryd"
 
@@ -88,7 +92,11 @@ msgstr "fortryd"
 msgid "with"
 msgstr "med"
 
-#: js/filelist.js:271
+#: js/filelist.js:268
+msgid "unshared"
+msgstr ""
+
+#: js/filelist.js:270
 msgid "deleted"
 msgstr "Slettet"
 
@@ -121,11 +129,11 @@ msgstr "Fil upload kører. Hvis du forlader siden nu, vil uploadet blive annuler
 msgid "Invalid name, '/' is not allowed."
 msgstr "Ugyldigt navn, '/' er ikke tilladt."
 
-#: js/files.js:746 templates/index.php:55
+#: js/files.js:746 templates/index.php:56
 msgid "Size"
 msgstr "Størrelse"
 
-#: js/files.js:747 templates/index.php:56
+#: js/files.js:747 templates/index.php:58
 msgid "Modified"
 msgstr "Ændret"
 
@@ -201,36 +209,36 @@ msgstr "Upload"
 msgid "Cancel upload"
 msgstr "Fortryd upload"
 
-#: templates/index.php:39
+#: templates/index.php:40
 msgid "Nothing in here. Upload something!"
 msgstr "Her er tomt. Upload noget!"
 
-#: templates/index.php:47
+#: templates/index.php:48
 msgid "Name"
 msgstr "Navn"
 
-#: templates/index.php:49
+#: templates/index.php:50
 msgid "Share"
 msgstr "Del"
 
-#: templates/index.php:51
+#: templates/index.php:52
 msgid "Download"
 msgstr "Download"
 
-#: templates/index.php:64
+#: templates/index.php:75
 msgid "Upload too large"
 msgstr "Upload for stor"
 
-#: templates/index.php:66
+#: templates/index.php:77
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Filerne, du prøver at uploade, er større end den maksimale størrelse for fil-upload på denne server."
 
-#: templates/index.php:71
+#: templates/index.php:82
 msgid "Files are being scanned, please wait."
 msgstr "Filerne bliver indlæst, vent venligst."
 
-#: templates/index.php:74
+#: templates/index.php:85
 msgid "Current scanning"
 msgstr "Indlæser"
diff --git a/l10n/de/files.po b/l10n/de/files.po
index a06845cc3b..571a069b9c 100644
--- a/l10n/de/files.po
+++ b/l10n/de/files.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-09-07 02:04+0200\n"
-"PO-Revision-Date: 2012-09-06 06:59+0000\n"
-"Last-Translator: goeck <admin@s-goecker.de>\n"
+"POT-Creation-Date: 2012-09-08 02:01+0200\n"
+"PO-Revision-Date: 2012-09-08 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"
@@ -62,7 +62,11 @@ msgstr "Fehler beim Schreiben auf die Festplatte"
 msgid "Files"
 msgstr "Dateien"
 
-#: js/fileactions.js:106 templates/index.php:57
+#: js/fileactions.js:108 templates/index.php:62
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:110 templates/index.php:64
 msgid "Delete"
 msgstr "Löschen"
 
@@ -86,7 +90,7 @@ msgstr "abbrechen"
 msgid "replaced"
 msgstr "ersetzt"
 
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:266
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:268 js/filelist.js:270
 msgid "undo"
 msgstr "rückgängig machen"
 
@@ -94,7 +98,11 @@ msgstr "rückgängig machen"
 msgid "with"
 msgstr "mit"
 
-#: js/filelist.js:266
+#: js/filelist.js:268
+msgid "unshared"
+msgstr ""
+
+#: js/filelist.js:270
 msgid "deleted"
 msgstr "gelöscht"
 
@@ -131,7 +139,7 @@ msgstr "Ungültiger Name: \"/\" ist nicht erlaubt."
 msgid "Size"
 msgstr "Größe"
 
-#: js/files.js:747 templates/index.php:57
+#: js/files.js:747 templates/index.php:58
 msgid "Modified"
 msgstr "Bearbeitet"
 
@@ -223,20 +231,20 @@ msgstr "Teilen"
 msgid "Download"
 msgstr "Herunterladen"
 
-#: templates/index.php:65
+#: templates/index.php:75
 msgid "Upload too large"
 msgstr "Upload zu groß"
 
-#: templates/index.php:67
+#: templates/index.php:77
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Die Datei überschreitet die Maximalgröße für Uploads auf diesem Server."
 
-#: templates/index.php:72
+#: templates/index.php:82
 msgid "Files are being scanned, please wait."
 msgstr "Dateien werden gescannt, bitte warten."
 
-#: templates/index.php:75
+#: templates/index.php:85
 msgid "Current scanning"
 msgstr "Scannen"
diff --git a/l10n/el/files.po b/l10n/el/files.po
index 8ddd036c71..0daee77ea7 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-09-06 02:01+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-08 02:01+0200\n"
+"PO-Revision-Date: 2012-09-08 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"
@@ -54,7 +54,11 @@ msgstr "Η εγγραφή στο δίσκο απέτυχε"
 msgid "Files"
 msgstr "Αρχεία"
 
-#: js/fileactions.js:106 templates/index.php:56
+#: js/fileactions.js:108 templates/index.php:62
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:110 templates/index.php:64
 msgid "Delete"
 msgstr "Διαγραφή"
 
@@ -78,7 +82,7 @@ msgstr "ακύρωση"
 msgid "replaced"
 msgstr "αντικαταστάθηκε"
 
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:268 js/filelist.js:270
 msgid "undo"
 msgstr "αναίρεση"
 
@@ -86,7 +90,11 @@ msgstr "αναίρεση"
 msgid "with"
 msgstr "με"
 
-#: js/filelist.js:271
+#: js/filelist.js:268
+msgid "unshared"
+msgstr ""
+
+#: js/filelist.js:270
 msgid "deleted"
 msgstr "διαγράφηκε"
 
@@ -119,11 +127,11 @@ msgstr ""
 msgid "Invalid name, '/' is not allowed."
 msgstr "Μη έγκυρο όνομα, το '/' δεν επιτρέπεται."
 
-#: js/files.js:746 templates/index.php:55
+#: js/files.js:746 templates/index.php:56
 msgid "Size"
 msgstr "Μέγεθος"
 
-#: js/files.js:747 templates/index.php:56
+#: js/files.js:747 templates/index.php:58
 msgid "Modified"
 msgstr "Τροποποιήθηκε"
 
@@ -199,36 +207,36 @@ msgstr "Μεταφόρτωση"
 msgid "Cancel upload"
 msgstr "Ακύρωση ανεβάσματος"
 
-#: templates/index.php:39
+#: templates/index.php:40
 msgid "Nothing in here. Upload something!"
 msgstr "Δεν υπάρχει τίποτα εδώ. Ανέβασε κάτι!"
 
-#: templates/index.php:47
+#: templates/index.php:48
 msgid "Name"
 msgstr "Όνομα"
 
-#: templates/index.php:49
+#: templates/index.php:50
 msgid "Share"
 msgstr "Διαμοίρασε"
 
-#: templates/index.php:51
+#: templates/index.php:52
 msgid "Download"
 msgstr "Λήψη"
 
-#: templates/index.php:64
+#: templates/index.php:75
 msgid "Upload too large"
 msgstr "Πολύ μεγάλο το αρχείο προς μεταφόρτωση"
 
-#: templates/index.php:66
+#: templates/index.php:77
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Τα αρχεία που προσπαθείτε να ανεβάσετε υπερβαίνουν το μέγιστο μέγεθος μεταφόρτωσης αρχείων σε αυτόν το διακομιστή."
 
-#: templates/index.php:71
+#: templates/index.php:82
 msgid "Files are being scanned, please wait."
 msgstr "Τα αρχεία ανιχνεύονται, παρακαλώ περιμένετε"
 
-#: templates/index.php:74
+#: templates/index.php:85
 msgid "Current scanning"
 msgstr "Τρέχουσα αναζήτηση "
diff --git a/l10n/el/user_ldap.po b/l10n/el/user_ldap.po
index 3752a64b5d..0509e10da4 100644
--- a/l10n/el/user_ldap.po
+++ b/l10n/el/user_ldap.po
@@ -4,19 +4,20 @@
 # 
 # Translators:
 # Efstathios Iosifidis <diamond_gr@freemail.gr>, 2012.
+# Marios Bekatoros <>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-08 02:02+0200\n"
+"PO-Revision-Date: 2012-09-07 07:17+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"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/settings.php:8
 msgid "Host"
@@ -29,7 +30,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"
@@ -37,7 +38,7 @@ msgstr ""
 
 #: templates/settings.php:10
 msgid "User DN"
-msgstr ""
+msgstr "User DN"
 
 #: templates/settings.php:10
 msgid ""
@@ -56,7 +57,7 @@ msgstr ""
 
 #: templates/settings.php:12
 msgid "User Login Filter"
-msgstr ""
+msgstr "User Login Filter"
 
 #: templates/settings.php:12
 #, php-format
@@ -72,7 +73,7 @@ msgstr ""
 
 #: templates/settings.php:13
 msgid "User List Filter"
-msgstr ""
+msgstr "User List Filter"
 
 #: templates/settings.php:13
 msgid "Defines the filter to apply, when retrieving users."
@@ -84,7 +85,7 @@ msgstr ""
 
 #: templates/settings.php:14
 msgid "Group Filter"
-msgstr ""
+msgstr "Group Filter"
 
 #: templates/settings.php:14
 msgid "Defines the filter to apply, when retrieving groups."
@@ -100,19 +101,19 @@ msgstr "Θύρα"
 
 #: templates/settings.php:18
 msgid "Base User Tree"
-msgstr ""
+msgstr "Base User Tree"
 
 #: templates/settings.php:19
 msgid "Base Group Tree"
-msgstr ""
+msgstr "Base Group Tree"
 
 #: templates/settings.php:20
 msgid "Group-Member association"
-msgstr ""
+msgstr "Group-Member association"
 
 #: 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."
@@ -138,7 +139,7 @@ msgstr ""
 
 #: templates/settings.php:24
 msgid "User Display Name Field"
-msgstr ""
+msgstr "User Display Name Field"
 
 #: templates/settings.php:24
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
@@ -146,7 +147,7 @@ msgstr ""
 
 #: templates/settings.php:25
 msgid "Group Display Name Field"
-msgstr ""
+msgstr "Group Display Name Field"
 
 #: templates/settings.php:25
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
diff --git a/l10n/eo/files.po b/l10n/eo/files.po
index d0b82a0e4f..c8529b431a 100644
--- a/l10n/eo/files.po
+++ b/l10n/eo/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-09-06 02:01+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-08 02:01+0200\n"
+"PO-Revision-Date: 2012-09-08 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"
@@ -53,7 +53,11 @@ msgstr "Malsukcesis skribo al disko"
 msgid "Files"
 msgstr "Dosieroj"
 
-#: js/fileactions.js:106 templates/index.php:56
+#: js/fileactions.js:108 templates/index.php:62
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:110 templates/index.php:64
 msgid "Delete"
 msgstr "Forigi"
 
@@ -77,7 +81,7 @@ msgstr "nuligi"
 msgid "replaced"
 msgstr "anstataŭigita"
 
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:268 js/filelist.js:270
 msgid "undo"
 msgstr "malfari"
 
@@ -85,7 +89,11 @@ msgstr "malfari"
 msgid "with"
 msgstr "kun"
 
-#: js/filelist.js:271
+#: js/filelist.js:268
+msgid "unshared"
+msgstr ""
+
+#: js/filelist.js:270
 msgid "deleted"
 msgstr "forigita"
 
@@ -118,11 +126,11 @@ msgstr ""
 msgid "Invalid name, '/' is not allowed."
 msgstr "Nevalida nomo, “/” ne estas permesata."
 
-#: js/files.js:746 templates/index.php:55
+#: js/files.js:746 templates/index.php:56
 msgid "Size"
 msgstr "Grando"
 
-#: js/files.js:747 templates/index.php:56
+#: js/files.js:747 templates/index.php:58
 msgid "Modified"
 msgstr "Modifita"
 
@@ -198,36 +206,36 @@ msgstr "Alŝuti"
 msgid "Cancel upload"
 msgstr "Nuligi alŝuton"
 
-#: templates/index.php:39
+#: templates/index.php:40
 msgid "Nothing in here. Upload something!"
 msgstr "Nenio estas ĉi tie. Alŝutu ion!"
 
-#: templates/index.php:47
+#: templates/index.php:48
 msgid "Name"
 msgstr "Nomo"
 
-#: templates/index.php:49
+#: templates/index.php:50
 msgid "Share"
 msgstr "Kunhavigi"
 
-#: templates/index.php:51
+#: templates/index.php:52
 msgid "Download"
 msgstr "Elŝuti"
 
-#: templates/index.php:64
+#: templates/index.php:75
 msgid "Upload too large"
 msgstr "Elŝuto tro larĝa"
 
-#: templates/index.php:66
+#: templates/index.php:77
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "La dosieroj, kiujn vi provas alŝuti, transpasas la maksimuman grandon por dosieralŝutoj en ĉi tiu servilo."
 
-#: templates/index.php:71
+#: templates/index.php:82
 msgid "Files are being scanned, please wait."
 msgstr "Dosieroj estas skanataj, bonvolu atendi."
 
-#: templates/index.php:74
+#: templates/index.php:85
 msgid "Current scanning"
 msgstr "Nuna skano"
diff --git a/l10n/es/files.po b/l10n/es/files.po
index 1889dd54e9..4c7a65443d 100644
--- a/l10n/es/files.po
+++ b/l10n/es/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-09-07 02:04+0200\n"
-"PO-Revision-Date: 2012-09-06 05:09+0000\n"
-"Last-Translator: juanman <juanma@kde.org.ar>\n"
+"POT-Creation-Date: 2012-09-08 02:01+0200\n"
+"PO-Revision-Date: 2012-09-08 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"
@@ -55,7 +55,11 @@ msgstr "La escritura en disco ha fallado"
 msgid "Files"
 msgstr "Archivos"
 
-#: js/fileactions.js:106 templates/index.php:57
+#: js/fileactions.js:108 templates/index.php:62
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:110 templates/index.php:64
 msgid "Delete"
 msgstr "Eliminado"
 
@@ -79,7 +83,7 @@ msgstr "cancelar"
 msgid "replaced"
 msgstr "reemplazado"
 
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:266
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:268 js/filelist.js:270
 msgid "undo"
 msgstr "deshacer"
 
@@ -87,7 +91,11 @@ msgstr "deshacer"
 msgid "with"
 msgstr "con"
 
-#: js/filelist.js:266
+#: js/filelist.js:268
+msgid "unshared"
+msgstr ""
+
+#: js/filelist.js:270
 msgid "deleted"
 msgstr "borrado"
 
@@ -124,7 +132,7 @@ msgstr "Nombre no válido, '/' no está permitido."
 msgid "Size"
 msgstr "Tamaño"
 
-#: js/files.js:747 templates/index.php:57
+#: js/files.js:747 templates/index.php:58
 msgid "Modified"
 msgstr "Modificado"
 
@@ -216,20 +224,20 @@ msgstr "Compartir"
 msgid "Download"
 msgstr "Descargar"
 
-#: templates/index.php:65
+#: templates/index.php:75
 msgid "Upload too large"
 msgstr "El archivo es demasiado grande"
 
-#: templates/index.php:67
+#: templates/index.php:77
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Los archivos que estás intentando subir sobrepasan el tamaño máximo permitido por este servidor."
 
-#: templates/index.php:72
+#: templates/index.php:82
 msgid "Files are being scanned, please wait."
 msgstr "Se están escaneando los archivos, por favor espere."
 
-#: templates/index.php:75
+#: templates/index.php:85
 msgid "Current scanning"
 msgstr "Escaneo actual"
diff --git a/l10n/et_EE/files.po b/l10n/et_EE/files.po
index fac2c5dc01..7ce5cdf145 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-09-06 02:01+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-08 02:01+0200\n"
+"PO-Revision-Date: 2012-09-08 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"
@@ -52,7 +52,11 @@ msgstr "Kettale kirjutamine ebaõnnestus"
 msgid "Files"
 msgstr "Failid"
 
-#: js/fileactions.js:106 templates/index.php:56
+#: js/fileactions.js:108 templates/index.php:62
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:110 templates/index.php:64
 msgid "Delete"
 msgstr "Kustuta"
 
@@ -76,7 +80,7 @@ msgstr "loobu"
 msgid "replaced"
 msgstr "asendatud"
 
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:268 js/filelist.js:270
 msgid "undo"
 msgstr "tagasi"
 
@@ -84,7 +88,11 @@ msgstr "tagasi"
 msgid "with"
 msgstr "millega"
 
-#: js/filelist.js:271
+#: js/filelist.js:268
+msgid "unshared"
+msgstr ""
+
+#: js/filelist.js:270
 msgid "deleted"
 msgstr "kustutatud"
 
@@ -117,11 +125,11 @@ msgstr ""
 msgid "Invalid name, '/' is not allowed."
 msgstr "Vigane nimi, '/' pole lubatud."
 
-#: js/files.js:746 templates/index.php:55
+#: js/files.js:746 templates/index.php:56
 msgid "Size"
 msgstr "Suurus"
 
-#: js/files.js:747 templates/index.php:56
+#: js/files.js:747 templates/index.php:58
 msgid "Modified"
 msgstr "Muudetud"
 
@@ -197,36 +205,36 @@ msgstr "Lae üles"
 msgid "Cancel upload"
 msgstr "Tühista üleslaadimine"
 
-#: templates/index.php:39
+#: templates/index.php:40
 msgid "Nothing in here. Upload something!"
 msgstr "Siin pole midagi. Lae midagi üles!"
 
-#: templates/index.php:47
+#: templates/index.php:48
 msgid "Name"
 msgstr "Nimi"
 
-#: templates/index.php:49
+#: templates/index.php:50
 msgid "Share"
 msgstr "Jaga"
 
-#: templates/index.php:51
+#: templates/index.php:52
 msgid "Download"
 msgstr "Lae alla"
 
-#: templates/index.php:64
+#: templates/index.php:75
 msgid "Upload too large"
 msgstr "Üleslaadimine on liiga suur"
 
-#: templates/index.php:66
+#: templates/index.php:77
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Failid, mida sa proovid üles laadida, ületab serveri poolt üleslaetavatele failidele määratud maksimaalse suuruse."
 
-#: templates/index.php:71
+#: templates/index.php:82
 msgid "Files are being scanned, please wait."
 msgstr "Faile skannitakse, palun oota"
 
-#: templates/index.php:74
+#: templates/index.php:85
 msgid "Current scanning"
 msgstr "Praegune skannimine"
diff --git a/l10n/eu/files.po b/l10n/eu/files.po
index 810a5ae18c..8f0d7e685d 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-09-06 02:01+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-08 02:01+0200\n"
+"PO-Revision-Date: 2012-09-08 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"
@@ -53,7 +53,11 @@ msgstr "Errore bat izan da diskoan idazterakoan"
 msgid "Files"
 msgstr "Fitxategiak"
 
-#: js/fileactions.js:106 templates/index.php:56
+#: js/fileactions.js:108 templates/index.php:62
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:110 templates/index.php:64
 msgid "Delete"
 msgstr "Ezabatu"
 
@@ -77,7 +81,7 @@ msgstr "ezeztatu"
 msgid "replaced"
 msgstr "ordeztua"
 
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:268 js/filelist.js:270
 msgid "undo"
 msgstr "desegin"
 
@@ -85,7 +89,11 @@ msgstr "desegin"
 msgid "with"
 msgstr "honekin"
 
-#: js/filelist.js:271
+#: js/filelist.js:268
+msgid "unshared"
+msgstr ""
+
+#: js/filelist.js:270
 msgid "deleted"
 msgstr "ezabatuta"
 
@@ -118,11 +126,11 @@ msgstr ""
 msgid "Invalid name, '/' is not allowed."
 msgstr "Baliogabeko izena, '/' ezin da erabili. "
 
-#: js/files.js:746 templates/index.php:55
+#: js/files.js:746 templates/index.php:56
 msgid "Size"
 msgstr "Tamaina"
 
-#: js/files.js:747 templates/index.php:56
+#: js/files.js:747 templates/index.php:58
 msgid "Modified"
 msgstr "Aldatuta"
 
@@ -198,36 +206,36 @@ msgstr "Igo"
 msgid "Cancel upload"
 msgstr "Ezeztatu igoera"
 
-#: templates/index.php:39
+#: templates/index.php:40
 msgid "Nothing in here. Upload something!"
 msgstr "Ez dago ezer. Igo zerbait!"
 
-#: templates/index.php:47
+#: templates/index.php:48
 msgid "Name"
 msgstr "Izena"
 
-#: templates/index.php:49
+#: templates/index.php:50
 msgid "Share"
 msgstr "Elkarbanatu"
 
-#: templates/index.php:51
+#: templates/index.php:52
 msgid "Download"
 msgstr "Deskargatu"
 
-#: templates/index.php:64
+#: templates/index.php:75
 msgid "Upload too large"
 msgstr "Igotakoa handiegia da"
 
-#: templates/index.php:66
+#: templates/index.php:77
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Igotzen saiatzen ari zaren fitxategiak zerbitzari honek igotzeko onartzen duena baino handiagoak dira."
 
-#: templates/index.php:71
+#: templates/index.php:82
 msgid "Files are being scanned, please wait."
 msgstr "Fitxategiak eskaneatzen ari da, itxoin mezedez."
 
-#: templates/index.php:74
+#: templates/index.php:85
 msgid "Current scanning"
 msgstr "Orain eskaneatzen ari da"
diff --git a/l10n/eu/settings.po b/l10n/eu/settings.po
index f23e12e728..1fb2c354a9 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-09-05 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-08 02:02+0200\n"
+"PO-Revision-Date: 2012-09-07 14:30+0000\n"
+"Last-Translator: asieriko <asieriko@gmail.com>\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"
@@ -31,11 +31,11 @@ msgstr "Autentifikazio errorea"
 
 #: ajax/creategroup.php:19
 msgid "Group already exists"
-msgstr ""
+msgstr "Taldea dagoeneko existitzenda"
 
 #: ajax/creategroup.php:28
 msgid "Unable to add group"
-msgstr ""
+msgstr "Ezin izan da taldea gehitu"
 
 #: ajax/lostpassword.php:14
 msgid "Email saved"
@@ -55,11 +55,11 @@ msgstr "Baliogabeko eskaria"
 
 #: ajax/removegroup.php:16
 msgid "Unable to delete group"
-msgstr ""
+msgstr "Ezin izan da taldea ezabatu"
 
 #: ajax/removeuser.php:22
 msgid "Unable to delete user"
-msgstr ""
+msgstr "Ezin izan da erabiltzailea ezabatu"
 
 #: ajax/setlanguage.php:18
 msgid "Language changed"
@@ -68,12 +68,12 @@ msgstr "Hizkuntza aldatuta"
 #: ajax/togglegroups.php:25
 #, php-format
 msgid "Unable to add user to group %s"
-msgstr ""
+msgstr "Ezin izan da erabiltzailea %s taldera gehitu"
 
 #: ajax/togglegroups.php:31
 #, php-format
 msgid "Unable to remove user from group %s"
-msgstr ""
+msgstr "Ezin izan da erabiltzailea %s taldetik ezabatu"
 
 #: js/apps.js:18
 msgid "Error"
@@ -192,7 +192,7 @@ msgstr "Ikusi programen orria apps.owncloud.com en"
 
 #: templates/apps.php:30
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
-msgstr ""
+msgstr "<span class=\"licence\"></span>-lizentziatua <span class=\"author\"></span>"
 
 #: templates/help.php:9
 msgid "Documentation"
diff --git a/l10n/eu_ES/files.po b/l10n/eu_ES/files.po
index 0ed5582c4f..0b6110c70d 100644
--- a/l10n/eu_ES/files.po
+++ b/l10n/eu_ES/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-09-06 02:01+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-08 02:01+0200\n"
+"PO-Revision-Date: 2012-09-08 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"
@@ -51,7 +51,11 @@ msgstr ""
 msgid "Files"
 msgstr ""
 
-#: js/fileactions.js:106 templates/index.php:56
+#: js/fileactions.js:108 templates/index.php:62
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:110 templates/index.php:64
 msgid "Delete"
 msgstr ""
 
@@ -75,7 +79,7 @@ msgstr ""
 msgid "replaced"
 msgstr ""
 
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:268 js/filelist.js:270
 msgid "undo"
 msgstr ""
 
@@ -83,7 +87,11 @@ msgstr ""
 msgid "with"
 msgstr ""
 
-#: js/filelist.js:271
+#: js/filelist.js:268
+msgid "unshared"
+msgstr ""
+
+#: js/filelist.js:270
 msgid "deleted"
 msgstr ""
 
@@ -116,11 +124,11 @@ msgstr ""
 msgid "Invalid name, '/' is not allowed."
 msgstr ""
 
-#: js/files.js:746 templates/index.php:55
+#: js/files.js:746 templates/index.php:56
 msgid "Size"
 msgstr ""
 
-#: js/files.js:747 templates/index.php:56
+#: js/files.js:747 templates/index.php:58
 msgid "Modified"
 msgstr ""
 
@@ -196,36 +204,36 @@ msgstr ""
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:39
+#: templates/index.php:40
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:47
+#: templates/index.php:48
 msgid "Name"
 msgstr ""
 
-#: templates/index.php:49
+#: templates/index.php:50
 msgid "Share"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/index.php:52
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:64
+#: templates/index.php:75
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:66
+#: templates/index.php:77
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:71
+#: templates/index.php:82
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:74
+#: templates/index.php:85
 msgid "Current scanning"
 msgstr ""
diff --git a/l10n/fa/files.po b/l10n/fa/files.po
index 2e1f164504..37b2cc70c3 100644
--- a/l10n/fa/files.po
+++ b/l10n/fa/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-09-06 02:01+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-08 02:01+0200\n"
+"PO-Revision-Date: 2012-09-08 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"
@@ -54,7 +54,11 @@ msgstr "نوشتن بر روی دیسک سخت ناموفق بود"
 msgid "Files"
 msgstr "فایل ها"
 
-#: js/fileactions.js:106 templates/index.php:56
+#: js/fileactions.js:108 templates/index.php:62
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:110 templates/index.php:64
 msgid "Delete"
 msgstr "پاک کردن"
 
@@ -78,7 +82,7 @@ msgstr "لغو"
 msgid "replaced"
 msgstr "جایگزین‌شده"
 
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:268 js/filelist.js:270
 msgid "undo"
 msgstr "بازگشت"
 
@@ -86,7 +90,11 @@ msgstr "بازگشت"
 msgid "with"
 msgstr "همراه"
 
-#: js/filelist.js:271
+#: js/filelist.js:268
+msgid "unshared"
+msgstr ""
+
+#: js/filelist.js:270
 msgid "deleted"
 msgstr "حذف شده"
 
@@ -119,11 +127,11 @@ msgstr ""
 msgid "Invalid name, '/' is not allowed."
 msgstr "نام نامناسب '/' غیرفعال است"
 
-#: js/files.js:746 templates/index.php:55
+#: js/files.js:746 templates/index.php:56
 msgid "Size"
 msgstr "اندازه"
 
-#: js/files.js:747 templates/index.php:56
+#: js/files.js:747 templates/index.php:58
 msgid "Modified"
 msgstr "تغییر یافته"
 
@@ -199,36 +207,36 @@ msgstr "بارگذاری"
 msgid "Cancel upload"
 msgstr "متوقف کردن بار گذاری"
 
-#: templates/index.php:39
+#: templates/index.php:40
 msgid "Nothing in here. Upload something!"
 msgstr "اینجا هیچ چیز نیست."
 
-#: templates/index.php:47
+#: templates/index.php:48
 msgid "Name"
 msgstr "نام"
 
-#: templates/index.php:49
+#: templates/index.php:50
 msgid "Share"
 msgstr "به اشتراک گذاری"
 
-#: templates/index.php:51
+#: templates/index.php:52
 msgid "Download"
 msgstr "بارگیری"
 
-#: templates/index.php:64
+#: templates/index.php:75
 msgid "Upload too large"
 msgstr "حجم بارگذاری بسیار زیاد است"
 
-#: templates/index.php:66
+#: templates/index.php:77
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "فایلها بیش از حد تعیین شده در این سرور هستند\nمترجم:با تغییر فایل php,ini میتوان این محدودیت را برطرف کرد"
 
-#: templates/index.php:71
+#: templates/index.php:82
 msgid "Files are being scanned, please wait."
 msgstr "پرونده ها در حال بازرسی هستند لطفا صبر کنید"
 
-#: templates/index.php:74
+#: templates/index.php:85
 msgid "Current scanning"
 msgstr "بازرسی کنونی"
diff --git a/l10n/fi/files.po b/l10n/fi/files.po
index 0a9580f346..1d569839df 100644
--- a/l10n/fi/files.po
+++ b/l10n/fi/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-09-06 02:01+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-08 02:01+0200\n"
+"PO-Revision-Date: 2012-09-08 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"
@@ -51,7 +51,11 @@ msgstr ""
 msgid "Files"
 msgstr ""
 
-#: js/fileactions.js:106 templates/index.php:56
+#: js/fileactions.js:108 templates/index.php:62
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:110 templates/index.php:64
 msgid "Delete"
 msgstr ""
 
@@ -75,7 +79,7 @@ msgstr ""
 msgid "replaced"
 msgstr ""
 
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:268 js/filelist.js:270
 msgid "undo"
 msgstr ""
 
@@ -83,7 +87,11 @@ msgstr ""
 msgid "with"
 msgstr ""
 
-#: js/filelist.js:271
+#: js/filelist.js:268
+msgid "unshared"
+msgstr ""
+
+#: js/filelist.js:270
 msgid "deleted"
 msgstr ""
 
@@ -116,11 +124,11 @@ msgstr ""
 msgid "Invalid name, '/' is not allowed."
 msgstr ""
 
-#: js/files.js:746 templates/index.php:55
+#: js/files.js:746 templates/index.php:56
 msgid "Size"
 msgstr ""
 
-#: js/files.js:747 templates/index.php:56
+#: js/files.js:747 templates/index.php:58
 msgid "Modified"
 msgstr ""
 
@@ -196,36 +204,36 @@ msgstr ""
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:39
+#: templates/index.php:40
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:47
+#: templates/index.php:48
 msgid "Name"
 msgstr ""
 
-#: templates/index.php:49
+#: templates/index.php:50
 msgid "Share"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/index.php:52
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:64
+#: templates/index.php:75
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:66
+#: templates/index.php:77
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:71
+#: templates/index.php:82
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:74
+#: templates/index.php:85
 msgid "Current scanning"
 msgstr ""
diff --git a/l10n/fi_FI/files.po b/l10n/fi_FI/files.po
index 67278ea29f..c642c07ab8 100644
--- a/l10n/fi_FI/files.po
+++ b/l10n/fi_FI/files.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-09-07 02:04+0200\n"
-"PO-Revision-Date: 2012-09-06 10:47+0000\n"
-"Last-Translator: Jiri Grönroos <jiri.gronroos@iki.fi>\n"
+"POT-Creation-Date: 2012-09-08 02:01+0200\n"
+"PO-Revision-Date: 2012-09-08 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"
@@ -56,7 +56,11 @@ msgstr "Levylle kirjoitus epäonnistui"
 msgid "Files"
 msgstr "Tiedostot"
 
-#: js/fileactions.js:106 templates/index.php:57
+#: js/fileactions.js:108 templates/index.php:62
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:110 templates/index.php:64
 msgid "Delete"
 msgstr "Poista"
 
@@ -80,7 +84,7 @@ msgstr "peru"
 msgid "replaced"
 msgstr "korvattu"
 
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:266
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:268 js/filelist.js:270
 msgid "undo"
 msgstr "kumoa"
 
@@ -88,7 +92,11 @@ msgstr "kumoa"
 msgid "with"
 msgstr "käyttäen"
 
-#: js/filelist.js:266
+#: js/filelist.js:268
+msgid "unshared"
+msgstr ""
+
+#: js/filelist.js:270
 msgid "deleted"
 msgstr "poistettu"
 
@@ -125,7 +133,7 @@ msgstr "Virheellinen nimi, merkki '/' ei ole sallittu."
 msgid "Size"
 msgstr "Koko"
 
-#: js/files.js:747 templates/index.php:57
+#: js/files.js:747 templates/index.php:58
 msgid "Modified"
 msgstr "Muutettu"
 
@@ -217,20 +225,20 @@ msgstr "Jaa"
 msgid "Download"
 msgstr "Lataa"
 
-#: templates/index.php:65
+#: templates/index.php:75
 msgid "Upload too large"
 msgstr "Lähetettävä tiedosto on liian suuri"
 
-#: templates/index.php:67
+#: templates/index.php:77
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Lähetettäväksi valitsemasi tiedostot ylittävät palvelimen salliman tiedostokoon rajan."
 
-#: templates/index.php:72
+#: templates/index.php:82
 msgid "Files are being scanned, please wait."
 msgstr "Tiedostoja tarkistetaan, odota hetki."
 
-#: templates/index.php:75
+#: templates/index.php:85
 msgid "Current scanning"
 msgstr "Tämänhetkinen tutkinta"
diff --git a/l10n/fr/files.po b/l10n/fr/files.po
index 222dbece71..bd3172a21d 100644
--- a/l10n/fr/files.po
+++ b/l10n/fr/files.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-09-06 02:01+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-08 02:01+0200\n"
+"PO-Revision-Date: 2012-09-08 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"
@@ -60,7 +60,11 @@ msgstr "Erreur d'écriture sur le disque"
 msgid "Files"
 msgstr "Fichiers"
 
-#: js/fileactions.js:106 templates/index.php:56
+#: js/fileactions.js:108 templates/index.php:62
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:110 templates/index.php:64
 msgid "Delete"
 msgstr "Supprimer"
 
@@ -74,7 +78,7 @@ msgstr "remplacer"
 
 #: js/filelist.js:186
 msgid "suggest name"
-msgstr ""
+msgstr "Suggérer un nom"
 
 #: js/filelist.js:186 js/filelist.js:188
 msgid "cancel"
@@ -84,7 +88,7 @@ msgstr "annuler"
 msgid "replaced"
 msgstr "remplacé"
 
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:268 js/filelist.js:270
 msgid "undo"
 msgstr "annuler"
 
@@ -92,7 +96,11 @@ msgstr "annuler"
 msgid "with"
 msgstr "avec"
 
-#: js/filelist.js:271
+#: js/filelist.js:268
+msgid "unshared"
+msgstr ""
+
+#: js/filelist.js:270
 msgid "deleted"
 msgstr "supprimé"
 
@@ -125,11 +133,11 @@ msgstr "L'envoi du fichier est en cours. Quitter cette page maintenant annulera
 msgid "Invalid name, '/' is not allowed."
 msgstr "Nom invalide, '/' n'est pas autorisé."
 
-#: js/files.js:746 templates/index.php:55
+#: js/files.js:746 templates/index.php:56
 msgid "Size"
 msgstr "Taille"
 
-#: js/files.js:747 templates/index.php:56
+#: js/files.js:747 templates/index.php:58
 msgid "Modified"
 msgstr "Modifié"
 
@@ -205,36 +213,36 @@ msgstr "Envoyer"
 msgid "Cancel upload"
 msgstr "Annuler l'envoi"
 
-#: templates/index.php:39
+#: templates/index.php:40
 msgid "Nothing in here. Upload something!"
 msgstr "Il n'y a rien ici ! Envoyez donc quelque chose :)"
 
-#: templates/index.php:47
+#: templates/index.php:48
 msgid "Name"
 msgstr "Nom"
 
-#: templates/index.php:49
+#: templates/index.php:50
 msgid "Share"
 msgstr "Partager"
 
-#: templates/index.php:51
+#: templates/index.php:52
 msgid "Download"
 msgstr "Téléchargement"
 
-#: templates/index.php:64
+#: templates/index.php:75
 msgid "Upload too large"
 msgstr "Fichier trop volumineux"
 
-#: templates/index.php:66
+#: templates/index.php:77
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Les fichiers que vous essayez d'envoyer dépassent la taille maximale permise par ce serveur."
 
-#: templates/index.php:71
+#: templates/index.php:82
 msgid "Files are being scanned, please wait."
 msgstr "Les fichiers sont en cours d'analyse, veuillez patienter."
 
-#: templates/index.php:74
+#: templates/index.php:85
 msgid "Current scanning"
 msgstr "Analyse en cours"
diff --git a/l10n/gl/files.po b/l10n/gl/files.po
index 0de0ff2a7d..f51ab64695 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-09-06 02:01+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-08 02:01+0200\n"
+"PO-Revision-Date: 2012-09-08 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"
@@ -53,7 +53,11 @@ msgstr "Erro ao escribir no disco"
 msgid "Files"
 msgstr "Ficheiros"
 
-#: js/fileactions.js:106 templates/index.php:56
+#: js/fileactions.js:108 templates/index.php:62
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:110 templates/index.php:64
 msgid "Delete"
 msgstr "Eliminar"
 
@@ -77,7 +81,7 @@ msgstr "cancelar"
 msgid "replaced"
 msgstr "substituído"
 
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:268 js/filelist.js:270
 msgid "undo"
 msgstr "desfacer"
 
@@ -85,7 +89,11 @@ msgstr "desfacer"
 msgid "with"
 msgstr "con"
 
-#: js/filelist.js:271
+#: js/filelist.js:268
+msgid "unshared"
+msgstr ""
+
+#: js/filelist.js:270
 msgid "deleted"
 msgstr "eliminado"
 
@@ -118,11 +126,11 @@ msgstr ""
 msgid "Invalid name, '/' is not allowed."
 msgstr "Nome non válido, '/' non está permitido."
 
-#: js/files.js:746 templates/index.php:55
+#: js/files.js:746 templates/index.php:56
 msgid "Size"
 msgstr "Tamaño"
 
-#: js/files.js:747 templates/index.php:56
+#: js/files.js:747 templates/index.php:58
 msgid "Modified"
 msgstr "Modificado"
 
@@ -198,36 +206,36 @@ msgstr "Enviar"
 msgid "Cancel upload"
 msgstr "Cancelar subida"
 
-#: templates/index.php:39
+#: templates/index.php:40
 msgid "Nothing in here. Upload something!"
 msgstr "Nada por aquí. Envíe algo."
 
-#: templates/index.php:47
+#: templates/index.php:48
 msgid "Name"
 msgstr "Nome"
 
-#: templates/index.php:49
+#: templates/index.php:50
 msgid "Share"
 msgstr "Compartir"
 
-#: templates/index.php:51
+#: templates/index.php:52
 msgid "Download"
 msgstr "Descargar"
 
-#: templates/index.php:64
+#: templates/index.php:75
 msgid "Upload too large"
 msgstr "Envío demasiado grande"
 
-#: templates/index.php:66
+#: templates/index.php:77
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Os ficheiros que trata de subir superan o tamaño máximo permitido neste servidor"
 
-#: templates/index.php:71
+#: templates/index.php:82
 msgid "Files are being scanned, please wait."
 msgstr "Estanse analizando os ficheiros, espere por favor."
 
-#: templates/index.php:74
+#: templates/index.php:85
 msgid "Current scanning"
 msgstr "Análise actual."
diff --git a/l10n/he/files.po b/l10n/he/files.po
index 808345fa8f..5cac6d4e90 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-09-06 02:01+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-08 02:01+0200\n"
+"PO-Revision-Date: 2012-09-08 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"
@@ -54,7 +54,11 @@ msgstr "הכתיבה לכונן נכשלה"
 msgid "Files"
 msgstr "קבצים"
 
-#: js/fileactions.js:106 templates/index.php:56
+#: js/fileactions.js:108 templates/index.php:62
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:110 templates/index.php:64
 msgid "Delete"
 msgstr "מחיקה"
 
@@ -78,7 +82,7 @@ msgstr ""
 msgid "replaced"
 msgstr ""
 
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:268 js/filelist.js:270
 msgid "undo"
 msgstr ""
 
@@ -86,7 +90,11 @@ msgstr ""
 msgid "with"
 msgstr ""
 
-#: js/filelist.js:271
+#: js/filelist.js:268
+msgid "unshared"
+msgstr ""
+
+#: js/filelist.js:270
 msgid "deleted"
 msgstr ""
 
@@ -119,11 +127,11 @@ msgstr ""
 msgid "Invalid name, '/' is not allowed."
 msgstr "שם לא חוקי, '/' אסור לשימוש."
 
-#: js/files.js:746 templates/index.php:55
+#: js/files.js:746 templates/index.php:56
 msgid "Size"
 msgstr "גודל"
 
-#: js/files.js:747 templates/index.php:56
+#: js/files.js:747 templates/index.php:58
 msgid "Modified"
 msgstr "זמן שינוי"
 
@@ -199,36 +207,36 @@ msgstr "העלאה"
 msgid "Cancel upload"
 msgstr "ביטול ההעלאה"
 
-#: templates/index.php:39
+#: templates/index.php:40
 msgid "Nothing in here. Upload something!"
 msgstr "אין כאן שום דבר. אולי ברצונך להעלות משהו?"
 
-#: templates/index.php:47
+#: templates/index.php:48
 msgid "Name"
 msgstr "שם"
 
-#: templates/index.php:49
+#: templates/index.php:50
 msgid "Share"
 msgstr "שיתוף"
 
-#: templates/index.php:51
+#: templates/index.php:52
 msgid "Download"
 msgstr "הורדה"
 
-#: templates/index.php:64
+#: templates/index.php:75
 msgid "Upload too large"
 msgstr "העלאה גדולה מידי"
 
-#: templates/index.php:66
+#: templates/index.php:77
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "הקבצים שניסית להעלות חרגו מהגודל המקסימלי להעלאת קבצים על שרת זה."
 
-#: templates/index.php:71
+#: templates/index.php:82
 msgid "Files are being scanned, please wait."
 msgstr "הקבצים נסרקים, נא להמתין."
 
-#: templates/index.php:74
+#: templates/index.php:85
 msgid "Current scanning"
 msgstr "הסריקה הנוכחית"
diff --git a/l10n/hi/files.po b/l10n/hi/files.po
index b4b909333c..238575d5e4 100644
--- a/l10n/hi/files.po
+++ b/l10n/hi/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-09-06 02:01+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-08 02:01+0200\n"
+"PO-Revision-Date: 2012-09-08 00:02+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
 "MIME-Version: 1.0\n"
@@ -51,7 +51,11 @@ msgstr ""
 msgid "Files"
 msgstr ""
 
-#: js/fileactions.js:106 templates/index.php:56
+#: js/fileactions.js:108 templates/index.php:62
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:110 templates/index.php:64
 msgid "Delete"
 msgstr ""
 
@@ -75,7 +79,7 @@ msgstr ""
 msgid "replaced"
 msgstr ""
 
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:268 js/filelist.js:270
 msgid "undo"
 msgstr ""
 
@@ -83,7 +87,11 @@ msgstr ""
 msgid "with"
 msgstr ""
 
-#: js/filelist.js:271
+#: js/filelist.js:268
+msgid "unshared"
+msgstr ""
+
+#: js/filelist.js:270
 msgid "deleted"
 msgstr ""
 
@@ -116,11 +124,11 @@ msgstr ""
 msgid "Invalid name, '/' is not allowed."
 msgstr ""
 
-#: js/files.js:746 templates/index.php:55
+#: js/files.js:746 templates/index.php:56
 msgid "Size"
 msgstr ""
 
-#: js/files.js:747 templates/index.php:56
+#: js/files.js:747 templates/index.php:58
 msgid "Modified"
 msgstr ""
 
@@ -196,36 +204,36 @@ msgstr ""
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:39
+#: templates/index.php:40
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:47
+#: templates/index.php:48
 msgid "Name"
 msgstr ""
 
-#: templates/index.php:49
+#: templates/index.php:50
 msgid "Share"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/index.php:52
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:64
+#: templates/index.php:75
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:66
+#: templates/index.php:77
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:71
+#: templates/index.php:82
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:74
+#: templates/index.php:85
 msgid "Current scanning"
 msgstr ""
diff --git a/l10n/hr/files.po b/l10n/hr/files.po
index 6163c004ba..c7d3870a5a 100644
--- a/l10n/hr/files.po
+++ b/l10n/hr/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-09-06 02:01+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-08 02:01+0200\n"
+"PO-Revision-Date: 2012-09-08 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"
@@ -54,7 +54,11 @@ msgstr "Neuspjelo pisanje na disk"
 msgid "Files"
 msgstr "Datoteke"
 
-#: js/fileactions.js:106 templates/index.php:56
+#: js/fileactions.js:108 templates/index.php:62
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:110 templates/index.php:64
 msgid "Delete"
 msgstr "Briši"
 
@@ -78,7 +82,7 @@ msgstr "odustani"
 msgid "replaced"
 msgstr "zamjenjeno"
 
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:268 js/filelist.js:270
 msgid "undo"
 msgstr "vrati"
 
@@ -86,7 +90,11 @@ msgstr "vrati"
 msgid "with"
 msgstr "sa"
 
-#: js/filelist.js:271
+#: js/filelist.js:268
+msgid "unshared"
+msgstr ""
+
+#: js/filelist.js:270
 msgid "deleted"
 msgstr "izbrisano"
 
@@ -119,11 +127,11 @@ msgstr ""
 msgid "Invalid name, '/' is not allowed."
 msgstr "Neispravan naziv, znak '/' nije dozvoljen."
 
-#: js/files.js:746 templates/index.php:55
+#: js/files.js:746 templates/index.php:56
 msgid "Size"
 msgstr "Veličina"
 
-#: js/files.js:747 templates/index.php:56
+#: js/files.js:747 templates/index.php:58
 msgid "Modified"
 msgstr "Zadnja promjena"
 
@@ -199,36 +207,36 @@ msgstr "Pošalji"
 msgid "Cancel upload"
 msgstr "Prekini upload"
 
-#: templates/index.php:39
+#: templates/index.php:40
 msgid "Nothing in here. Upload something!"
 msgstr "Nema ničega u ovoj mapi. Pošalji nešto!"
 
-#: templates/index.php:47
+#: templates/index.php:48
 msgid "Name"
 msgstr "Naziv"
 
-#: templates/index.php:49
+#: templates/index.php:50
 msgid "Share"
 msgstr "podjeli"
 
-#: templates/index.php:51
+#: templates/index.php:52
 msgid "Download"
 msgstr "Preuzmi"
 
-#: templates/index.php:64
+#: templates/index.php:75
 msgid "Upload too large"
 msgstr "Prijenos je preobiman"
 
-#: templates/index.php:66
+#: templates/index.php:77
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Datoteke koje pokušavate prenijeti prelaze maksimalnu veličinu za prijenos datoteka na ovom poslužitelju."
 
-#: templates/index.php:71
+#: templates/index.php:82
 msgid "Files are being scanned, please wait."
 msgstr "Datoteke se skeniraju, molimo pričekajte."
 
-#: templates/index.php:74
+#: templates/index.php:85
 msgid "Current scanning"
 msgstr "Trenutno skeniranje"
diff --git a/l10n/hu_HU/files.po b/l10n/hu_HU/files.po
index ca00f03792..09722e3871 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-09-06 02:01+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-08 02:01+0200\n"
+"PO-Revision-Date: 2012-09-08 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"
@@ -54,7 +54,11 @@ msgstr "Nem írható lemezre"
 msgid "Files"
 msgstr "Fájlok"
 
-#: js/fileactions.js:106 templates/index.php:56
+#: js/fileactions.js:108 templates/index.php:62
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:110 templates/index.php:64
 msgid "Delete"
 msgstr "Törlés"
 
@@ -78,7 +82,7 @@ msgstr "mégse"
 msgid "replaced"
 msgstr "kicserélve"
 
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:268 js/filelist.js:270
 msgid "undo"
 msgstr "visszavon"
 
@@ -86,7 +90,11 @@ msgstr "visszavon"
 msgid "with"
 msgstr "-val/-vel"
 
-#: js/filelist.js:271
+#: js/filelist.js:268
+msgid "unshared"
+msgstr ""
+
+#: js/filelist.js:270
 msgid "deleted"
 msgstr "törölve"
 
@@ -119,11 +127,11 @@ msgstr ""
 msgid "Invalid name, '/' is not allowed."
 msgstr "Érvénytelen név, a '/' nem megengedett"
 
-#: js/files.js:746 templates/index.php:55
+#: js/files.js:746 templates/index.php:56
 msgid "Size"
 msgstr "Méret"
 
-#: js/files.js:747 templates/index.php:56
+#: js/files.js:747 templates/index.php:58
 msgid "Modified"
 msgstr "Módosítva"
 
@@ -199,36 +207,36 @@ msgstr "Feltöltés"
 msgid "Cancel upload"
 msgstr "Feltöltés megszakítása"
 
-#: templates/index.php:39
+#: templates/index.php:40
 msgid "Nothing in here. Upload something!"
 msgstr "Töltsön fel egy fájlt."
 
-#: templates/index.php:47
+#: templates/index.php:48
 msgid "Name"
 msgstr "Név"
 
-#: templates/index.php:49
+#: templates/index.php:50
 msgid "Share"
 msgstr "Megosztás"
 
-#: templates/index.php:51
+#: templates/index.php:52
 msgid "Download"
 msgstr "Letöltés"
 
-#: templates/index.php:64
+#: templates/index.php:75
 msgid "Upload too large"
 msgstr "Feltöltés túl nagy"
 
-#: templates/index.php:66
+#: templates/index.php:77
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "A fájlokat amit próbálsz feltölteni meghaladta a legnagyobb fájlméretet ezen a szerveren."
 
-#: templates/index.php:71
+#: templates/index.php:82
 msgid "Files are being scanned, please wait."
 msgstr "File-ok vizsgálata, kis türelmet"
 
-#: templates/index.php:74
+#: templates/index.php:85
 msgid "Current scanning"
 msgstr "Aktuális vizsgálat"
diff --git a/l10n/hy/files.po b/l10n/hy/files.po
index e94b853649..9a144a8130 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-09-06 02:01+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-08 02:01+0200\n"
+"PO-Revision-Date: 2012-09-08 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"
@@ -51,7 +51,11 @@ msgstr ""
 msgid "Files"
 msgstr ""
 
-#: js/fileactions.js:106 templates/index.php:56
+#: js/fileactions.js:108 templates/index.php:62
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:110 templates/index.php:64
 msgid "Delete"
 msgstr ""
 
@@ -75,7 +79,7 @@ msgstr ""
 msgid "replaced"
 msgstr ""
 
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:268 js/filelist.js:270
 msgid "undo"
 msgstr ""
 
@@ -83,7 +87,11 @@ msgstr ""
 msgid "with"
 msgstr ""
 
-#: js/filelist.js:271
+#: js/filelist.js:268
+msgid "unshared"
+msgstr ""
+
+#: js/filelist.js:270
 msgid "deleted"
 msgstr ""
 
@@ -116,11 +124,11 @@ msgstr ""
 msgid "Invalid name, '/' is not allowed."
 msgstr ""
 
-#: js/files.js:746 templates/index.php:55
+#: js/files.js:746 templates/index.php:56
 msgid "Size"
 msgstr ""
 
-#: js/files.js:747 templates/index.php:56
+#: js/files.js:747 templates/index.php:58
 msgid "Modified"
 msgstr ""
 
@@ -196,36 +204,36 @@ msgstr ""
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:39
+#: templates/index.php:40
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:47
+#: templates/index.php:48
 msgid "Name"
 msgstr ""
 
-#: templates/index.php:49
+#: templates/index.php:50
 msgid "Share"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/index.php:52
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:64
+#: templates/index.php:75
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:66
+#: templates/index.php:77
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:71
+#: templates/index.php:82
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:74
+#: templates/index.php:85
 msgid "Current scanning"
 msgstr ""
diff --git a/l10n/ia/files.po b/l10n/ia/files.po
index 0324e32bd0..cdce2e1a66 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-09-06 02:01+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-08 02:01+0200\n"
+"PO-Revision-Date: 2012-09-08 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"
@@ -53,7 +53,11 @@ msgstr ""
 msgid "Files"
 msgstr "Files"
 
-#: js/fileactions.js:106 templates/index.php:56
+#: js/fileactions.js:108 templates/index.php:62
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:110 templates/index.php:64
 msgid "Delete"
 msgstr "Deler"
 
@@ -77,7 +81,7 @@ msgstr ""
 msgid "replaced"
 msgstr ""
 
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:268 js/filelist.js:270
 msgid "undo"
 msgstr ""
 
@@ -85,7 +89,11 @@ msgstr ""
 msgid "with"
 msgstr ""
 
-#: js/filelist.js:271
+#: js/filelist.js:268
+msgid "unshared"
+msgstr ""
+
+#: js/filelist.js:270
 msgid "deleted"
 msgstr ""
 
@@ -118,11 +126,11 @@ msgstr ""
 msgid "Invalid name, '/' is not allowed."
 msgstr ""
 
-#: js/files.js:746 templates/index.php:55
+#: js/files.js:746 templates/index.php:56
 msgid "Size"
 msgstr "Dimension"
 
-#: js/files.js:747 templates/index.php:56
+#: js/files.js:747 templates/index.php:58
 msgid "Modified"
 msgstr "Modificate"
 
@@ -198,36 +206,36 @@ msgstr "Incargar"
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:39
+#: templates/index.php:40
 msgid "Nothing in here. Upload something!"
 msgstr "Nihil hic. Incarga alcun cosa!"
 
-#: templates/index.php:47
+#: templates/index.php:48
 msgid "Name"
 msgstr "Nomine"
 
-#: templates/index.php:49
+#: templates/index.php:50
 msgid "Share"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/index.php:52
 msgid "Download"
 msgstr "Discargar"
 
-#: templates/index.php:64
+#: templates/index.php:75
 msgid "Upload too large"
 msgstr "Incargamento troppo longe"
 
-#: templates/index.php:66
+#: templates/index.php:77
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:71
+#: templates/index.php:82
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:74
+#: templates/index.php:85
 msgid "Current scanning"
 msgstr ""
diff --git a/l10n/id/files.po b/l10n/id/files.po
index 5e1a38df08..9479165468 100644
--- a/l10n/id/files.po
+++ b/l10n/id/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-09-06 02:01+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-08 02:01+0200\n"
+"PO-Revision-Date: 2012-09-08 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"
@@ -54,7 +54,11 @@ msgstr "Gagal menulis ke disk"
 msgid "Files"
 msgstr "Berkas"
 
-#: js/fileactions.js:106 templates/index.php:56
+#: js/fileactions.js:108 templates/index.php:62
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:110 templates/index.php:64
 msgid "Delete"
 msgstr "Hapus"
 
@@ -78,7 +82,7 @@ msgstr "batalkan"
 msgid "replaced"
 msgstr "diganti"
 
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:268 js/filelist.js:270
 msgid "undo"
 msgstr "batal dikerjakan"
 
@@ -86,7 +90,11 @@ msgstr "batal dikerjakan"
 msgid "with"
 msgstr "dengan"
 
-#: js/filelist.js:271
+#: js/filelist.js:268
+msgid "unshared"
+msgstr ""
+
+#: js/filelist.js:270
 msgid "deleted"
 msgstr "dihapus"
 
@@ -119,11 +127,11 @@ msgstr ""
 msgid "Invalid name, '/' is not allowed."
 msgstr "Kesalahan nama, '/' tidak diijinkan."
 
-#: js/files.js:746 templates/index.php:55
+#: js/files.js:746 templates/index.php:56
 msgid "Size"
 msgstr "Ukuran"
 
-#: js/files.js:747 templates/index.php:56
+#: js/files.js:747 templates/index.php:58
 msgid "Modified"
 msgstr "Dimodifikasi"
 
@@ -199,36 +207,36 @@ msgstr "Unggah"
 msgid "Cancel upload"
 msgstr "Batal mengunggah"
 
-#: templates/index.php:39
+#: templates/index.php:40
 msgid "Nothing in here. Upload something!"
 msgstr "Tidak ada apa-apa di sini. Unggah sesuatu!"
 
-#: templates/index.php:47
+#: templates/index.php:48
 msgid "Name"
 msgstr "Nama"
 
-#: templates/index.php:49
+#: templates/index.php:50
 msgid "Share"
 msgstr "Bagikan"
 
-#: templates/index.php:51
+#: templates/index.php:52
 msgid "Download"
 msgstr "Unduh"
 
-#: templates/index.php:64
+#: templates/index.php:75
 msgid "Upload too large"
 msgstr "Unggahan terlalu besar"
 
-#: templates/index.php:66
+#: templates/index.php:77
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Berkas yang anda coba unggah melebihi ukuran maksimum untuk pengunggahan berkas di server ini."
 
-#: templates/index.php:71
+#: templates/index.php:82
 msgid "Files are being scanned, please wait."
 msgstr "Berkas sedang dipindai, silahkan tunggu."
 
-#: templates/index.php:74
+#: templates/index.php:85
 msgid "Current scanning"
 msgstr "Sedang memindai"
diff --git a/l10n/id_ID/files.po b/l10n/id_ID/files.po
index 3ef54242d3..813b83410c 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-09-06 02:01+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-08 02:01+0200\n"
+"PO-Revision-Date: 2012-09-08 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"
@@ -51,7 +51,11 @@ msgstr ""
 msgid "Files"
 msgstr ""
 
-#: js/fileactions.js:106 templates/index.php:56
+#: js/fileactions.js:108 templates/index.php:62
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:110 templates/index.php:64
 msgid "Delete"
 msgstr ""
 
@@ -75,7 +79,7 @@ msgstr ""
 msgid "replaced"
 msgstr ""
 
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:268 js/filelist.js:270
 msgid "undo"
 msgstr ""
 
@@ -83,7 +87,11 @@ msgstr ""
 msgid "with"
 msgstr ""
 
-#: js/filelist.js:271
+#: js/filelist.js:268
+msgid "unshared"
+msgstr ""
+
+#: js/filelist.js:270
 msgid "deleted"
 msgstr ""
 
@@ -116,11 +124,11 @@ msgstr ""
 msgid "Invalid name, '/' is not allowed."
 msgstr ""
 
-#: js/files.js:746 templates/index.php:55
+#: js/files.js:746 templates/index.php:56
 msgid "Size"
 msgstr ""
 
-#: js/files.js:747 templates/index.php:56
+#: js/files.js:747 templates/index.php:58
 msgid "Modified"
 msgstr ""
 
@@ -196,36 +204,36 @@ msgstr ""
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:39
+#: templates/index.php:40
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:47
+#: templates/index.php:48
 msgid "Name"
 msgstr ""
 
-#: templates/index.php:49
+#: templates/index.php:50
 msgid "Share"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/index.php:52
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:64
+#: templates/index.php:75
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:66
+#: templates/index.php:77
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:71
+#: templates/index.php:82
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:74
+#: templates/index.php:85
 msgid "Current scanning"
 msgstr ""
diff --git a/l10n/it/files.po b/l10n/it/files.po
index 6175346abd..8d0209eb47 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-09-07 02:04+0200\n"
-"PO-Revision-Date: 2012-09-06 04:57+0000\n"
-"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
+"POT-Creation-Date: 2012-09-08 02:01+0200\n"
+"PO-Revision-Date: 2012-09-08 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"
@@ -55,7 +55,11 @@ msgstr "Scrittura su disco non riuscita"
 msgid "Files"
 msgstr "File"
 
-#: js/fileactions.js:106 templates/index.php:57
+#: js/fileactions.js:108 templates/index.php:62
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:110 templates/index.php:64
 msgid "Delete"
 msgstr "Elimina"
 
@@ -79,7 +83,7 @@ msgstr "annulla"
 msgid "replaced"
 msgstr "sostituito"
 
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:266
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:268 js/filelist.js:270
 msgid "undo"
 msgstr "annulla"
 
@@ -87,7 +91,11 @@ msgstr "annulla"
 msgid "with"
 msgstr "con"
 
-#: js/filelist.js:266
+#: js/filelist.js:268
+msgid "unshared"
+msgstr ""
+
+#: js/filelist.js:270
 msgid "deleted"
 msgstr "eliminati"
 
@@ -124,7 +132,7 @@ msgstr "Nome non valido"
 msgid "Size"
 msgstr "Dimensione"
 
-#: js/files.js:747 templates/index.php:57
+#: js/files.js:747 templates/index.php:58
 msgid "Modified"
 msgstr "Modificato"
 
@@ -216,20 +224,20 @@ msgstr "Condividi"
 msgid "Download"
 msgstr "Scarica"
 
-#: templates/index.php:65
+#: templates/index.php:75
 msgid "Upload too large"
 msgstr "Il file caricato è troppo grande"
 
-#: templates/index.php:67
+#: templates/index.php:77
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "I file che stai provando a caricare superano la dimensione massima consentita su questo server."
 
-#: templates/index.php:72
+#: templates/index.php:82
 msgid "Files are being scanned, please wait."
 msgstr "Scansione dei file in corso, attendi"
 
-#: templates/index.php:75
+#: templates/index.php:85
 msgid "Current scanning"
 msgstr "Scansione corrente"
diff --git a/l10n/ja_JP/files.po b/l10n/ja_JP/files.po
index c73d204ecb..5dec378931 100644
--- a/l10n/ja_JP/files.po
+++ b/l10n/ja_JP/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-09-06 02:01+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-08 02:01+0200\n"
+"PO-Revision-Date: 2012-09-08 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"
@@ -53,7 +53,11 @@ msgstr "ディスクへの書き込みに失敗しました"
 msgid "Files"
 msgstr "ファイル"
 
-#: js/fileactions.js:106 templates/index.php:56
+#: js/fileactions.js:108 templates/index.php:62
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:110 templates/index.php:64
 msgid "Delete"
 msgstr "削除"
 
@@ -77,7 +81,7 @@ msgstr "キャンセル"
 msgid "replaced"
 msgstr "置換："
 
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:268 js/filelist.js:270
 msgid "undo"
 msgstr "元に戻す"
 
@@ -85,7 +89,11 @@ msgstr "元に戻す"
 msgid "with"
 msgstr "←"
 
-#: js/filelist.js:271
+#: js/filelist.js:268
+msgid "unshared"
+msgstr ""
+
+#: js/filelist.js:270
 msgid "deleted"
 msgstr "削除"
 
@@ -118,11 +126,11 @@ msgstr "ファイル転送を実行中です。今このページから移動す
 msgid "Invalid name, '/' is not allowed."
 msgstr "無効な名前、'/' は使用できません。"
 
-#: js/files.js:746 templates/index.php:55
+#: js/files.js:746 templates/index.php:56
 msgid "Size"
 msgstr "サイズ"
 
-#: js/files.js:747 templates/index.php:56
+#: js/files.js:747 templates/index.php:58
 msgid "Modified"
 msgstr "更新日時"
 
@@ -198,36 +206,36 @@ msgstr "アップロード"
 msgid "Cancel upload"
 msgstr "アップロードをキャンセル"
 
-#: templates/index.php:39
+#: templates/index.php:40
 msgid "Nothing in here. Upload something!"
 msgstr "ここには何もありません。何かアップロードしてください。"
 
-#: templates/index.php:47
+#: templates/index.php:48
 msgid "Name"
 msgstr "名前"
 
-#: templates/index.php:49
+#: templates/index.php:50
 msgid "Share"
 msgstr "共有"
 
-#: templates/index.php:51
+#: templates/index.php:52
 msgid "Download"
 msgstr "ダウンロード"
 
-#: templates/index.php:64
+#: templates/index.php:75
 msgid "Upload too large"
 msgstr "ファイルサイズが大きすぎます"
 
-#: templates/index.php:66
+#: templates/index.php:77
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "アップロードしようとしているファイルは、サーバで規定された最大サイズを超えています。"
 
-#: templates/index.php:71
+#: templates/index.php:82
 msgid "Files are being scanned, please wait."
 msgstr "ファイルをスキャンしています、しばらくお待ちください。"
 
-#: templates/index.php:74
+#: templates/index.php:85
 msgid "Current scanning"
 msgstr "スキャン中"
diff --git a/l10n/ko/files.po b/l10n/ko/files.po
index 2abe6f9ed6..7167506ae4 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-09-06 02:01+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-08 02:01+0200\n"
+"PO-Revision-Date: 2012-09-08 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"
@@ -53,7 +53,11 @@ msgstr "디스크에 쓰지 못했습니다"
 msgid "Files"
 msgstr "파일"
 
-#: js/fileactions.js:106 templates/index.php:56
+#: js/fileactions.js:108 templates/index.php:62
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:110 templates/index.php:64
 msgid "Delete"
 msgstr "삭제"
 
@@ -77,7 +81,7 @@ msgstr "취소"
 msgid "replaced"
 msgstr "대체됨"
 
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:268 js/filelist.js:270
 msgid "undo"
 msgstr "복구"
 
@@ -85,7 +89,11 @@ msgstr "복구"
 msgid "with"
 msgstr "와"
 
-#: js/filelist.js:271
+#: js/filelist.js:268
+msgid "unshared"
+msgstr ""
+
+#: js/filelist.js:270
 msgid "deleted"
 msgstr "삭제"
 
@@ -118,11 +126,11 @@ msgstr ""
 msgid "Invalid name, '/' is not allowed."
 msgstr "잘못된 이름, '/' 은 허용이 되지 않습니다."
 
-#: js/files.js:746 templates/index.php:55
+#: js/files.js:746 templates/index.php:56
 msgid "Size"
 msgstr "크기"
 
-#: js/files.js:747 templates/index.php:56
+#: js/files.js:747 templates/index.php:58
 msgid "Modified"
 msgstr "수정됨"
 
@@ -198,36 +206,36 @@ msgstr "업로드"
 msgid "Cancel upload"
 msgstr "업로드 취소"
 
-#: templates/index.php:39
+#: templates/index.php:40
 msgid "Nothing in here. Upload something!"
 msgstr "내용이 없습니다. 업로드할 수 있습니다!"
 
-#: templates/index.php:47
+#: templates/index.php:48
 msgid "Name"
 msgstr "이름"
 
-#: templates/index.php:49
+#: templates/index.php:50
 msgid "Share"
 msgstr "공유"
 
-#: templates/index.php:51
+#: templates/index.php:52
 msgid "Download"
 msgstr "다운로드"
 
-#: templates/index.php:64
+#: templates/index.php:75
 msgid "Upload too large"
 msgstr "업로드 용량 초과"
 
-#: templates/index.php:66
+#: templates/index.php:77
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "이 파일이 서버에서 허용하는 최대 업로드 가능 용량보다 큽니다."
 
-#: templates/index.php:71
+#: templates/index.php:82
 msgid "Files are being scanned, please wait."
 msgstr "파일을 검색중입니다, 기다려 주십시오."
 
-#: templates/index.php:74
+#: templates/index.php:85
 msgid "Current scanning"
 msgstr "커런트 스캐닝"
diff --git a/l10n/lb/files.po b/l10n/lb/files.po
index bdce420aa1..6e4157f7be 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-09-06 02:01+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-08 02:01+0200\n"
+"PO-Revision-Date: 2012-09-08 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"
@@ -52,7 +52,11 @@ msgstr "Konnt net op den Disk schreiwen"
 msgid "Files"
 msgstr "Dateien"
 
-#: js/fileactions.js:106 templates/index.php:56
+#: js/fileactions.js:108 templates/index.php:62
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:110 templates/index.php:64
 msgid "Delete"
 msgstr "Läschen"
 
@@ -76,7 +80,7 @@ msgstr "ofbriechen"
 msgid "replaced"
 msgstr "ersat"
 
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:268 js/filelist.js:270
 msgid "undo"
 msgstr "réckgängeg man"
 
@@ -84,7 +88,11 @@ msgstr "réckgängeg man"
 msgid "with"
 msgstr "mat"
 
-#: js/filelist.js:271
+#: js/filelist.js:268
+msgid "unshared"
+msgstr ""
+
+#: js/filelist.js:270
 msgid "deleted"
 msgstr "geläscht"
 
@@ -117,11 +125,11 @@ msgstr "File Upload am gaang. Wann's de des Säit verléiss gëtt den Upload ofg
 msgid "Invalid name, '/' is not allowed."
 msgstr "Ongültege Numm, '/' net erlaabt."
 
-#: js/files.js:746 templates/index.php:55
+#: js/files.js:746 templates/index.php:56
 msgid "Size"
 msgstr "Gréisst"
 
-#: js/files.js:747 templates/index.php:56
+#: js/files.js:747 templates/index.php:58
 msgid "Modified"
 msgstr "Geännert"
 
@@ -197,36 +205,36 @@ msgstr "Eroplueden"
 msgid "Cancel upload"
 msgstr "Upload ofbriechen"
 
-#: templates/index.php:39
+#: templates/index.php:40
 msgid "Nothing in here. Upload something!"
 msgstr "Hei ass näischt. Lued eppes rop!"
 
-#: templates/index.php:47
+#: templates/index.php:48
 msgid "Name"
 msgstr "Numm"
 
-#: templates/index.php:49
+#: templates/index.php:50
 msgid "Share"
 msgstr "Share"
 
-#: templates/index.php:51
+#: templates/index.php:52
 msgid "Download"
 msgstr "Eroflueden"
 
-#: templates/index.php:64
+#: templates/index.php:75
 msgid "Upload too large"
 msgstr "Upload ze grouss"
 
-#: templates/index.php:66
+#: templates/index.php:77
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "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."
 
-#: templates/index.php:71
+#: templates/index.php:82
 msgid "Files are being scanned, please wait."
 msgstr "Fichieren gi gescannt, war weg."
 
-#: templates/index.php:74
+#: templates/index.php:85
 msgid "Current scanning"
 msgstr "Momentane Scan"
diff --git a/l10n/lt_LT/files.po b/l10n/lt_LT/files.po
index 058124ee7f..d4a5701df7 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-09-06 02:01+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-08 02:01+0200\n"
+"PO-Revision-Date: 2012-09-08 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"
@@ -53,7 +53,11 @@ msgstr "Nepavyko įrašyti į diską"
 msgid "Files"
 msgstr "Failai"
 
-#: js/fileactions.js:106 templates/index.php:56
+#: js/fileactions.js:108 templates/index.php:62
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:110 templates/index.php:64
 msgid "Delete"
 msgstr "Ištrinti"
 
@@ -77,7 +81,7 @@ msgstr "atšaukti"
 msgid "replaced"
 msgstr ""
 
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:268 js/filelist.js:270
 msgid "undo"
 msgstr ""
 
@@ -85,7 +89,11 @@ msgstr ""
 msgid "with"
 msgstr ""
 
-#: js/filelist.js:271
+#: js/filelist.js:268
+msgid "unshared"
+msgstr ""
+
+#: js/filelist.js:270
 msgid "deleted"
 msgstr ""
 
@@ -118,11 +126,11 @@ msgstr ""
 msgid "Invalid name, '/' is not allowed."
 msgstr "Pavadinime negali būti naudojamas ženklas \"/\"."
 
-#: js/files.js:746 templates/index.php:55
+#: js/files.js:746 templates/index.php:56
 msgid "Size"
 msgstr "Dydis"
 
-#: js/files.js:747 templates/index.php:56
+#: js/files.js:747 templates/index.php:58
 msgid "Modified"
 msgstr "Pakeista"
 
@@ -198,36 +206,36 @@ msgstr "Įkelti"
 msgid "Cancel upload"
 msgstr "Atšaukti siuntimą"
 
-#: templates/index.php:39
+#: templates/index.php:40
 msgid "Nothing in here. Upload something!"
 msgstr "Čia tuščia. Įkelkite ką nors!"
 
-#: templates/index.php:47
+#: templates/index.php:48
 msgid "Name"
 msgstr "Pavadinimas"
 
-#: templates/index.php:49
+#: templates/index.php:50
 msgid "Share"
 msgstr "Dalintis"
 
-#: templates/index.php:51
+#: templates/index.php:52
 msgid "Download"
 msgstr "Atsisiųsti"
 
-#: templates/index.php:64
+#: templates/index.php:75
 msgid "Upload too large"
 msgstr "Įkėlimui failas per didelis"
 
-#: templates/index.php:66
+#: templates/index.php:77
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Bandomų įkelti failų dydis viršija maksimalų leidžiamą šiame serveryje"
 
-#: templates/index.php:71
+#: templates/index.php:82
 msgid "Files are being scanned, please wait."
 msgstr "Skenuojami failai, prašome palaukti."
 
-#: templates/index.php:74
+#: templates/index.php:85
 msgid "Current scanning"
 msgstr "Šiuo metu skenuojama"
diff --git a/l10n/lv/files.po b/l10n/lv/files.po
index 5b5c7464b7..4adbfa4bf0 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-09-06 02:01+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-08 02:01+0200\n"
+"PO-Revision-Date: 2012-09-08 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"
@@ -52,7 +52,11 @@ msgstr "Nav iespējams saglabāt"
 msgid "Files"
 msgstr "Faili"
 
-#: js/fileactions.js:106 templates/index.php:56
+#: js/fileactions.js:108 templates/index.php:62
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:110 templates/index.php:64
 msgid "Delete"
 msgstr "Izdzēst"
 
@@ -76,7 +80,7 @@ msgstr "atcelt"
 msgid "replaced"
 msgstr "aizvietots"
 
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:268 js/filelist.js:270
 msgid "undo"
 msgstr "vienu soli atpakaļ"
 
@@ -84,7 +88,11 @@ msgstr "vienu soli atpakaļ"
 msgid "with"
 msgstr "ar"
 
-#: js/filelist.js:271
+#: js/filelist.js:268
+msgid "unshared"
+msgstr ""
+
+#: js/filelist.js:270
 msgid "deleted"
 msgstr "izdzests"
 
@@ -117,11 +125,11 @@ msgstr ""
 msgid "Invalid name, '/' is not allowed."
 msgstr "Šis simbols '/', nav atļauts."
 
-#: js/files.js:746 templates/index.php:55
+#: js/files.js:746 templates/index.php:56
 msgid "Size"
 msgstr "Izmērs"
 
-#: js/files.js:747 templates/index.php:56
+#: js/files.js:747 templates/index.php:58
 msgid "Modified"
 msgstr "Izmainīts"
 
@@ -197,36 +205,36 @@ msgstr "Augšuplādet"
 msgid "Cancel upload"
 msgstr "Atcelt augšuplādi"
 
-#: templates/index.php:39
+#: templates/index.php:40
 msgid "Nothing in here. Upload something!"
 msgstr "Te vēl nekas nav. Rīkojies, sāc augšuplādēt"
 
-#: templates/index.php:47
+#: templates/index.php:48
 msgid "Name"
 msgstr "Nosaukums"
 
-#: templates/index.php:49
+#: templates/index.php:50
 msgid "Share"
 msgstr "Līdzdalīt"
 
-#: templates/index.php:51
+#: templates/index.php:52
 msgid "Download"
 msgstr "Lejuplādēt"
 
-#: templates/index.php:64
+#: templates/index.php:75
 msgid "Upload too large"
 msgstr "Fails ir par lielu lai to augšuplādetu"
 
-#: templates/index.php:66
+#: templates/index.php:77
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:71
+#: templates/index.php:82
 msgid "Files are being scanned, please wait."
 msgstr "Faili šobrīd tiek caurskatīti, nedaudz jāpagaida."
 
-#: templates/index.php:74
+#: templates/index.php:85
 msgid "Current scanning"
 msgstr "Šobrīd tiek pārbaudīti"
diff --git a/l10n/mk/files.po b/l10n/mk/files.po
index 7b01b54341..7793167ca3 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-09-06 02:01+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-08 02:01+0200\n"
+"PO-Revision-Date: 2012-09-08 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"
@@ -54,7 +54,11 @@ msgstr "Неуспеав да запишам на диск"
 msgid "Files"
 msgstr "Датотеки"
 
-#: js/fileactions.js:106 templates/index.php:56
+#: js/fileactions.js:108 templates/index.php:62
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:110 templates/index.php:64
 msgid "Delete"
 msgstr "Избриши"
 
@@ -78,7 +82,7 @@ msgstr ""
 msgid "replaced"
 msgstr ""
 
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:268 js/filelist.js:270
 msgid "undo"
 msgstr ""
 
@@ -86,7 +90,11 @@ msgstr ""
 msgid "with"
 msgstr ""
 
-#: js/filelist.js:271
+#: js/filelist.js:268
+msgid "unshared"
+msgstr ""
+
+#: js/filelist.js:270
 msgid "deleted"
 msgstr ""
 
@@ -119,11 +127,11 @@ msgstr ""
 msgid "Invalid name, '/' is not allowed."
 msgstr "неисправно име, '/' не е дозволено."
 
-#: js/files.js:746 templates/index.php:55
+#: js/files.js:746 templates/index.php:56
 msgid "Size"
 msgstr "Големина"
 
-#: js/files.js:747 templates/index.php:56
+#: js/files.js:747 templates/index.php:58
 msgid "Modified"
 msgstr "Променето"
 
@@ -199,36 +207,36 @@ msgstr "Подигни"
 msgid "Cancel upload"
 msgstr "Откажи прикачување"
 
-#: templates/index.php:39
+#: templates/index.php:40
 msgid "Nothing in here. Upload something!"
 msgstr "Тука нема ништо. Снимете нешто!"
 
-#: templates/index.php:47
+#: templates/index.php:48
 msgid "Name"
 msgstr "Име"
 
-#: templates/index.php:49
+#: templates/index.php:50
 msgid "Share"
 msgstr "Сподели"
 
-#: templates/index.php:51
+#: templates/index.php:52
 msgid "Download"
 msgstr "Преземи"
 
-#: templates/index.php:64
+#: templates/index.php:75
 msgid "Upload too large"
 msgstr "Датотеката е премногу голема"
 
-#: templates/index.php:66
+#: templates/index.php:77
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Датотеките кои се обидувате да ги подигнете ја надминуваат максималната големина за подигнување датотеки на овој сервер."
 
-#: templates/index.php:71
+#: templates/index.php:82
 msgid "Files are being scanned, please wait."
 msgstr "Се скенираат датотеки, ве молам почекајте."
 
-#: templates/index.php:74
+#: templates/index.php:85
 msgid "Current scanning"
 msgstr "Моментално скенирам"
diff --git a/l10n/ms_MY/files.po b/l10n/ms_MY/files.po
index 8c80a09dc7..e429d35b82 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-09-06 02:01+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-08 02:01+0200\n"
+"PO-Revision-Date: 2012-09-08 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"
@@ -55,7 +55,11 @@ msgstr "Gagal untuk disimpan"
 msgid "Files"
 msgstr "fail"
 
-#: js/fileactions.js:106 templates/index.php:56
+#: js/fileactions.js:108 templates/index.php:62
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:110 templates/index.php:64
 msgid "Delete"
 msgstr "Padam"
 
@@ -79,7 +83,7 @@ msgstr "Batal"
 msgid "replaced"
 msgstr "diganti"
 
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:268 js/filelist.js:270
 msgid "undo"
 msgstr ""
 
@@ -87,7 +91,11 @@ msgstr ""
 msgid "with"
 msgstr "dengan"
 
-#: js/filelist.js:271
+#: js/filelist.js:268
+msgid "unshared"
+msgstr ""
+
+#: js/filelist.js:270
 msgid "deleted"
 msgstr "dihapus"
 
@@ -120,11 +128,11 @@ msgstr ""
 msgid "Invalid name, '/' is not allowed."
 msgstr "penggunaa nama tidak sah, '/' tidak dibenarkan."
 
-#: js/files.js:746 templates/index.php:55
+#: js/files.js:746 templates/index.php:56
 msgid "Size"
 msgstr "Saiz"
 
-#: js/files.js:747 templates/index.php:56
+#: js/files.js:747 templates/index.php:58
 msgid "Modified"
 msgstr "Dimodifikasi"
 
@@ -200,36 +208,36 @@ msgstr "Muat naik"
 msgid "Cancel upload"
 msgstr "Batal muat naik"
 
-#: templates/index.php:39
+#: templates/index.php:40
 msgid "Nothing in here. Upload something!"
 msgstr "Tiada apa-apa di sini. Muat naik sesuatu!"
 
-#: templates/index.php:47
+#: templates/index.php:48
 msgid "Name"
 msgstr "Nama "
 
-#: templates/index.php:49
+#: templates/index.php:50
 msgid "Share"
 msgstr "Kongsi"
 
-#: templates/index.php:51
+#: templates/index.php:52
 msgid "Download"
 msgstr "Muat turun"
 
-#: templates/index.php:64
+#: templates/index.php:75
 msgid "Upload too large"
 msgstr "Muat naik terlalu besar"
 
-#: templates/index.php:66
+#: templates/index.php:77
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Fail yang cuba dimuat naik melebihi saiz maksimum fail upload server"
 
-#: templates/index.php:71
+#: templates/index.php:82
 msgid "Files are being scanned, please wait."
 msgstr "Fail sedang diimbas, harap bersabar."
 
-#: templates/index.php:74
+#: templates/index.php:85
 msgid "Current scanning"
 msgstr "Imbasan semasa"
diff --git a/l10n/nb_NO/files.po b/l10n/nb_NO/files.po
index c39e87c982..8366b5c7be 100644
--- a/l10n/nb_NO/files.po
+++ b/l10n/nb_NO/files.po
@@ -7,13 +7,14 @@
 # Arvid Nornes <arvid.nornes@gmail.com>, 2012.
 # Christer Eriksson <post@hc3web.com>, 2012.
 # Daniel  <i18n@daniel.priv.no>, 2012.
+#   <olamaekle@gmail.com>, 2012.
 #   <runesudden@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-06 02:01+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-08 02:01+0200\n"
+"PO-Revision-Date: 2012-09-08 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"
@@ -56,7 +57,11 @@ msgstr "Klarte ikke å skrive til disk"
 msgid "Files"
 msgstr "Filer"
 
-#: js/fileactions.js:106 templates/index.php:56
+#: js/fileactions.js:108 templates/index.php:62
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:110 templates/index.php:64
 msgid "Delete"
 msgstr "Slett"
 
@@ -80,7 +85,7 @@ msgstr "avbryt"
 msgid "replaced"
 msgstr "erstattet"
 
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:268 js/filelist.js:270
 msgid "undo"
 msgstr "angre"
 
@@ -88,7 +93,11 @@ msgstr "angre"
 msgid "with"
 msgstr "med"
 
-#: js/filelist.js:271
+#: js/filelist.js:268
+msgid "unshared"
+msgstr ""
+
+#: js/filelist.js:270
 msgid "deleted"
 msgstr "slettet"
 
@@ -121,11 +130,11 @@ msgstr ""
 msgid "Invalid name, '/' is not allowed."
 msgstr "Ugyldig navn, '/' er ikke tillatt. "
 
-#: js/files.js:746 templates/index.php:55
+#: js/files.js:746 templates/index.php:56
 msgid "Size"
 msgstr "Størrelse"
 
-#: js/files.js:747 templates/index.php:56
+#: js/files.js:747 templates/index.php:58
 msgid "Modified"
 msgstr "Endret"
 
@@ -175,7 +184,7 @@ msgstr "Maksimal størrelse på ZIP-filer"
 
 #: templates/admin.php:14
 msgid "Save"
-msgstr ""
+msgstr "Lagre"
 
 #: templates/index.php:7
 msgid "New"
@@ -201,36 +210,36 @@ msgstr "Last opp"
 msgid "Cancel upload"
 msgstr "Avbryt opplasting"
 
-#: templates/index.php:39
+#: templates/index.php:40
 msgid "Nothing in here. Upload something!"
 msgstr "Ingenting her. Last opp noe!"
 
-#: templates/index.php:47
+#: templates/index.php:48
 msgid "Name"
 msgstr "Navn"
 
-#: templates/index.php:49
+#: templates/index.php:50
 msgid "Share"
 msgstr "Del"
 
-#: templates/index.php:51
+#: templates/index.php:52
 msgid "Download"
 msgstr "Last ned"
 
-#: templates/index.php:64
+#: templates/index.php:75
 msgid "Upload too large"
 msgstr "Opplasting for stor"
 
-#: templates/index.php:66
+#: templates/index.php:77
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Filene du prøver å laste opp er for store for å laste opp til denne serveren."
 
-#: templates/index.php:71
+#: templates/index.php:82
 msgid "Files are being scanned, please wait."
 msgstr "Skanner etter filer, vennligst vent."
 
-#: templates/index.php:74
+#: templates/index.php:85
 msgid "Current scanning"
 msgstr "Pågående skanning"
diff --git a/l10n/nl/files.po b/l10n/nl/files.po
index b710bae7f6..95befc34bd 100644
--- a/l10n/nl/files.po
+++ b/l10n/nl/files.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-09-06 02:01+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-08 02:01+0200\n"
+"PO-Revision-Date: 2012-09-08 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"
@@ -60,7 +60,11 @@ msgstr "Schrijven naar schijf mislukt"
 msgid "Files"
 msgstr "Bestanden"
 
-#: js/fileactions.js:106 templates/index.php:56
+#: js/fileactions.js:108 templates/index.php:62
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:110 templates/index.php:64
 msgid "Delete"
 msgstr "Verwijder"
 
@@ -74,7 +78,7 @@ msgstr "vervang"
 
 #: js/filelist.js:186
 msgid "suggest name"
-msgstr ""
+msgstr "Stel een naam voor"
 
 #: js/filelist.js:186 js/filelist.js:188
 msgid "cancel"
@@ -84,7 +88,7 @@ msgstr "annuleren"
 msgid "replaced"
 msgstr "vervangen"
 
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:268 js/filelist.js:270
 msgid "undo"
 msgstr "ongedaan maken"
 
@@ -92,7 +96,11 @@ msgstr "ongedaan maken"
 msgid "with"
 msgstr "door"
 
-#: js/filelist.js:271
+#: js/filelist.js:268
+msgid "unshared"
+msgstr ""
+
+#: js/filelist.js:270
 msgid "deleted"
 msgstr "verwijderd"
 
@@ -125,11 +133,11 @@ msgstr "Bestands upload is bezig. Wanneer de pagina nu verlaten wordt, stopt de
 msgid "Invalid name, '/' is not allowed."
 msgstr "Ongeldige naam, '/' is niet toegestaan."
 
-#: js/files.js:746 templates/index.php:55
+#: js/files.js:746 templates/index.php:56
 msgid "Size"
 msgstr "Bestandsgrootte"
 
-#: js/files.js:747 templates/index.php:56
+#: js/files.js:747 templates/index.php:58
 msgid "Modified"
 msgstr "Laatst aangepast"
 
@@ -205,36 +213,36 @@ msgstr "Upload"
 msgid "Cancel upload"
 msgstr "Upload afbreken"
 
-#: templates/index.php:39
+#: templates/index.php:40
 msgid "Nothing in here. Upload something!"
 msgstr "Er bevindt zich hier niets. Upload een bestand!"
 
-#: templates/index.php:47
+#: templates/index.php:48
 msgid "Name"
 msgstr "Naam"
 
-#: templates/index.php:49
+#: templates/index.php:50
 msgid "Share"
 msgstr "Delen"
 
-#: templates/index.php:51
+#: templates/index.php:52
 msgid "Download"
 msgstr "Download"
 
-#: templates/index.php:64
+#: templates/index.php:75
 msgid "Upload too large"
 msgstr "Bestanden te groot"
 
-#: templates/index.php:66
+#: templates/index.php:77
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "De bestanden die u probeert te uploaden zijn groter dan de maximaal toegestane  bestandsgrootte voor deze server."
 
-#: templates/index.php:71
+#: templates/index.php:82
 msgid "Files are being scanned, please wait."
 msgstr "Bestanden worden gescand, even wachten."
 
-#: templates/index.php:74
+#: templates/index.php:85
 msgid "Current scanning"
 msgstr "Er wordt gescand"
diff --git a/l10n/nl/settings.po b/l10n/nl/settings.po
index 207f04819e..8644b83dc0 100644
--- a/l10n/nl/settings.po
+++ b/l10n/nl/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-09-06 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 11:28+0000\n"
-"Last-Translator: diederikdehaas <didi.debian@cknow.org>\n"
+"POT-Creation-Date: 2012-09-08 02:02+0200\n"
+"PO-Revision-Date: 2012-09-07 13:23+0000\n"
+"Last-Translator: Richard Bos <radoeka@gmail.com>\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"
@@ -111,7 +111,7 @@ msgid ""
 "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."
-msgstr ""
+msgstr "Uw data folder en uw bestanden zijn hoogst waarschijnlijk vanaf het internet bereikbaar.  Het .htaccess bestand dat ownCloud meelevert werkt niet.  Het is ten zeerste aangeraden om uw webserver zodanig te configureren, dat de data folder niet bereikbaar is vanaf het internet of verplaatst uw data folder naar een locatie buiten de webserver document root."
 
 #: templates/admin.php:31
 msgid "Cron"
diff --git a/l10n/nn_NO/files.po b/l10n/nn_NO/files.po
index fc058e3f3e..f473b58ff4 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-09-06 02:01+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-08 02:01+0200\n"
+"PO-Revision-Date: 2012-09-08 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"
@@ -53,7 +53,11 @@ msgstr ""
 msgid "Files"
 msgstr "Filer"
 
-#: js/fileactions.js:106 templates/index.php:56
+#: js/fileactions.js:108 templates/index.php:62
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:110 templates/index.php:64
 msgid "Delete"
 msgstr "Slett"
 
@@ -77,7 +81,7 @@ msgstr ""
 msgid "replaced"
 msgstr ""
 
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:268 js/filelist.js:270
 msgid "undo"
 msgstr ""
 
@@ -85,7 +89,11 @@ msgstr ""
 msgid "with"
 msgstr ""
 
-#: js/filelist.js:271
+#: js/filelist.js:268
+msgid "unshared"
+msgstr ""
+
+#: js/filelist.js:270
 msgid "deleted"
 msgstr ""
 
@@ -118,11 +126,11 @@ msgstr ""
 msgid "Invalid name, '/' is not allowed."
 msgstr ""
 
-#: js/files.js:746 templates/index.php:55
+#: js/files.js:746 templates/index.php:56
 msgid "Size"
 msgstr "Storleik"
 
-#: js/files.js:747 templates/index.php:56
+#: js/files.js:747 templates/index.php:58
 msgid "Modified"
 msgstr "Endra"
 
@@ -198,36 +206,36 @@ msgstr "Last opp"
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:39
+#: templates/index.php:40
 msgid "Nothing in here. Upload something!"
 msgstr "Ingenting her. Last noko opp!"
 
-#: templates/index.php:47
+#: templates/index.php:48
 msgid "Name"
 msgstr "Namn"
 
-#: templates/index.php:49
+#: templates/index.php:50
 msgid "Share"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/index.php:52
 msgid "Download"
 msgstr "Last ned"
 
-#: templates/index.php:64
+#: templates/index.php:75
 msgid "Upload too large"
 msgstr "For stor opplasting"
 
-#: templates/index.php:66
+#: templates/index.php:77
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Filene du prøver å laste opp er større enn maksgrensa til denne tenaren."
 
-#: templates/index.php:71
+#: templates/index.php:82
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:74
+#: templates/index.php:85
 msgid "Current scanning"
 msgstr ""
diff --git a/l10n/oc/core.po b/l10n/oc/core.po
new file mode 100644
index 0000000000..00223969d7
--- /dev/null
+++ b/l10n/oc/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-09-08 02:02+0200\n"
+"PO-Revision-Date: 2011-07-25 16:05+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: oc\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/js.js:208 templates/layout.user.php:54 templates/layout.user.php:55
+msgid "Settings"
+msgstr ""
+
+#: js/js.js:593
+msgid "January"
+msgstr ""
+
+#: js/js.js:593
+msgid "February"
+msgstr ""
+
+#: js/js.js:593
+msgid "March"
+msgstr ""
+
+#: js/js.js:593
+msgid "April"
+msgstr ""
+
+#: js/js.js:593
+msgid "May"
+msgstr ""
+
+#: js/js.js:593
+msgid "June"
+msgstr ""
+
+#: js/js.js:594
+msgid "July"
+msgstr ""
+
+#: js/js.js:594
+msgid "August"
+msgstr ""
+
+#: js/js.js:594
+msgid "September"
+msgstr ""
+
+#: js/js.js:594
+msgid "October"
+msgstr ""
+
+#: js/js.js:594
+msgid "November"
+msgstr ""
+
+#: js/js.js:594
+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:2
+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:26
+#: 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:24
+msgid "Create an <strong>admin account</strong>"
+msgstr ""
+
+#: templates/installation.php:30 templates/login.php:13
+msgid "Password"
+msgstr ""
+
+#: templates/installation.php:36
+msgid "Advanced"
+msgstr ""
+
+#: templates/installation.php:38
+msgid "Data folder"
+msgstr ""
+
+#: templates/installation.php:45
+msgid "Configure the database"
+msgstr ""
+
+#: templates/installation.php:50 templates/installation.php:61
+#: templates/installation.php:71 templates/installation.php:81
+msgid "will be used"
+msgstr ""
+
+#: templates/installation.php:93
+msgid "Database user"
+msgstr ""
+
+#: templates/installation.php:97
+msgid "Database password"
+msgstr ""
+
+#: templates/installation.php:101
+msgid "Database name"
+msgstr ""
+
+#: templates/installation.php:109
+msgid "Database tablespace"
+msgstr ""
+
+#: templates/installation.php:115
+msgid "Database host"
+msgstr ""
+
+#: templates/installation.php:120
+msgid "Finish setup"
+msgstr ""
+
+#: templates/layout.guest.php:36
+msgid "web services under your control"
+msgstr ""
+
+#: templates/layout.user.php:39
+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/oc/files.po b/l10n/oc/files.po
new file mode 100644
index 0000000000..a6f4c0b62c
--- /dev/null
+++ b/l10n/oc/files.po
@@ -0,0 +1,239 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-09-08 02:01+0200\n"
+"PO-Revision-Date: 2012-09-08 00:02+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: oc\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:108 templates/index.php:62
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:110 templates/index.php:64
+msgid "Delete"
+msgstr ""
+
+#: js/filelist.js:186 js/filelist.js:188
+msgid "already exists"
+msgstr ""
+
+#: js/filelist.js:186 js/filelist.js:188
+msgid "replace"
+msgstr ""
+
+#: js/filelist.js:186
+msgid "suggest name"
+msgstr ""
+
+#: js/filelist.js:186 js/filelist.js:188
+msgid "cancel"
+msgstr ""
+
+#: js/filelist.js:235 js/filelist.js:237
+msgid "replaced"
+msgstr ""
+
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:268 js/filelist.js:270
+msgid "undo"
+msgstr ""
+
+#: js/filelist.js:237
+msgid "with"
+msgstr ""
+
+#: js/filelist.js:268
+msgid "unshared"
+msgstr ""
+
+#: js/filelist.js:270
+msgid "deleted"
+msgstr ""
+
+#: js/files.js:179
+msgid "generating ZIP-file, it may take some time."
+msgstr ""
+
+#: js/files.js:208
+msgid "Unable to upload your file as it is a directory or has 0 bytes"
+msgstr ""
+
+#: js/files.js:208
+msgid "Upload Error"
+msgstr ""
+
+#: js/files.js:236 js/files.js:341 js/files.js:370
+msgid "Pending"
+msgstr ""
+
+#: js/files.js:355
+msgid "Upload cancelled."
+msgstr ""
+
+#: js/files.js:423
+msgid ""
+"File upload is in progress. Leaving the page now will cancel the upload."
+msgstr ""
+
+#: js/files.js:493
+msgid "Invalid name, '/' is not allowed."
+msgstr ""
+
+#: js/files.js:746 templates/index.php:56
+msgid "Size"
+msgstr ""
+
+#: js/files.js:747 templates/index.php:58
+msgid "Modified"
+msgstr ""
+
+#: js/files.js:774
+msgid "folder"
+msgstr ""
+
+#: js/files.js:776
+msgid "folders"
+msgstr ""
+
+#: js/files.js:784
+msgid "file"
+msgstr ""
+
+#: js/files.js:786
+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/admin.php:14
+msgid "Save"
+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:40
+msgid "Nothing in here. Upload something!"
+msgstr ""
+
+#: templates/index.php:48
+msgid "Name"
+msgstr ""
+
+#: templates/index.php:50
+msgid "Share"
+msgstr ""
+
+#: templates/index.php:52
+msgid "Download"
+msgstr ""
+
+#: templates/index.php:75
+msgid "Upload too large"
+msgstr ""
+
+#: templates/index.php:77
+msgid ""
+"The files you are trying to upload exceed the maximum size for file uploads "
+"on this server."
+msgstr ""
+
+#: templates/index.php:82
+msgid "Files are being scanned, please wait."
+msgstr ""
+
+#: templates/index.php:85
+msgid "Current scanning"
+msgstr ""
diff --git a/l10n/oc/files_encryption.po b/l10n/oc/files_encryption.po
new file mode 100644
index 0000000000..d6e0c7a83b
--- /dev/null
+++ b/l10n/oc/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-09-08 02:01+0200\n"
+"PO-Revision-Date: 2012-08-12 22:33+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: oc\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/oc/files_external.po b/l10n/oc/files_external.po
new file mode 100644
index 0000000000..5ddc431f8c
--- /dev/null
+++ b/l10n/oc/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-09-08 02:02+0200\n"
+"PO-Revision-Date: 2012-08-12 22:34+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: oc\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/oc/files_sharing.po b/l10n/oc/files_sharing.po
new file mode 100644
index 0000000000..1f90264d68
--- /dev/null
+++ b/l10n/oc/files_sharing.po
@@ -0,0 +1,38 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-09-08 02:02+0200\n"
+"PO-Revision-Date: 2012-08-12 22:35+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: oc\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: templates/authenticate.php:4
+msgid "Password"
+msgstr ""
+
+#: templates/authenticate.php:6
+msgid "Submit"
+msgstr ""
+
+#: templates/public.php:9 templates/public.php:19
+msgid "Download"
+msgstr ""
+
+#: templates/public.php:18
+msgid "No preview available for"
+msgstr ""
+
+#: templates/public.php:25
+msgid "web services under your control"
+msgstr ""
diff --git a/l10n/oc/files_versions.po b/l10n/oc/files_versions.po
new file mode 100644
index 0000000000..d38fef98d5
--- /dev/null
+++ b/l10n/oc/files_versions.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-09-08 02:02+0200\n"
+"PO-Revision-Date: 2012-08-12 22:37+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: oc\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: js/settings-personal.js:31 templates/settings-personal.php:10
+msgid "Expire all versions"
+msgstr ""
+
+#: templates/settings-personal.php:4
+msgid "Versions"
+msgstr ""
+
+#: templates/settings-personal.php:7
+msgid "This will delete all existing backup versions of your files"
+msgstr ""
+
+#: templates/settings.php:3
+msgid "Enable Files Versioning"
+msgstr ""
diff --git a/l10n/oc/lib.po b/l10n/oc/lib.po
new file mode 100644
index 0000000000..499df461d8
--- /dev/null
+++ b/l10n/oc/lib.po
@@ -0,0 +1,125 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-09-08 02:02+0200\n"
+"PO-Revision-Date: 2012-07-27 22:23+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: oc\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: app.php:285
+msgid "Help"
+msgstr ""
+
+#: app.php:292
+msgid "Personal"
+msgstr ""
+
+#: app.php:297
+msgid "Settings"
+msgstr ""
+
+#: app.php:302
+msgid "Users"
+msgstr ""
+
+#: app.php:309
+msgid "Apps"
+msgstr ""
+
+#: app.php:311
+msgid "Admin"
+msgstr ""
+
+#: files.php:280
+msgid "ZIP download is turned off."
+msgstr ""
+
+#: files.php:281
+msgid "Files need to be downloaded one by one."
+msgstr ""
+
+#: files.php:281 files.php:306
+msgid "Back to Files"
+msgstr ""
+
+#: files.php:305
+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:87
+msgid "seconds ago"
+msgstr ""
+
+#: template.php:88
+msgid "1 minute ago"
+msgstr ""
+
+#: template.php:89
+#, php-format
+msgid "%d minutes ago"
+msgstr ""
+
+#: template.php:92
+msgid "today"
+msgstr ""
+
+#: template.php:93
+msgid "yesterday"
+msgstr ""
+
+#: template.php:94
+#, php-format
+msgid "%d days ago"
+msgstr ""
+
+#: template.php:95
+msgid "last month"
+msgstr ""
+
+#: template.php:96
+msgid "months ago"
+msgstr ""
+
+#: template.php:97
+msgid "last year"
+msgstr ""
+
+#: template.php:98
+msgid "years ago"
+msgstr ""
+
+#: updater.php:66
+#, php-format
+msgid "%s is available. Get <a href=\"%s\">more information</a>"
+msgstr ""
+
+#: updater.php:68
+msgid "up to date"
+msgstr ""
+
+#: updater.php:71
+msgid "updates check is disabled"
+msgstr ""
diff --git a/l10n/oc/settings.po b/l10n/oc/settings.po
new file mode 100644
index 0000000000..fe8e3adeb4
--- /dev/null
+++ b/l10n/oc/settings.po
@@ -0,0 +1,316 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-09-08 02:02+0200\n"
+"PO-Revision-Date: 2011-07-25 16:05+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: oc\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#: ajax/apps/ocs.php:23
+msgid "Unable to load list from App Store"
+msgstr ""
+
+#: ajax/creategroup.php:9 ajax/removeuser.php:13 ajax/setquota.php:18
+#: ajax/togglegroups.php:15
+msgid "Authentication error"
+msgstr ""
+
+#: ajax/creategroup.php:19
+msgid "Group already exists"
+msgstr ""
+
+#: ajax/creategroup.php:28
+msgid "Unable to add group"
+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/removegroup.php:16
+msgid "Unable to delete group"
+msgstr ""
+
+#: ajax/removeuser.php:22
+msgid "Unable to delete user"
+msgstr ""
+
+#: ajax/setlanguage.php:18
+msgid "Language changed"
+msgstr ""
+
+#: ajax/togglegroups.php:25
+#, php-format
+msgid "Unable to add user to group %s"
+msgstr ""
+
+#: ajax/togglegroups.php:31
+#, php-format
+msgid "Unable to remove user from group %s"
+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:17
+msgid ""
+"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."
+msgstr ""
+
+#: templates/admin.php:31
+msgid "Cron"
+msgstr ""
+
+#: templates/admin.php:33
+msgid "execute one task with each page loaded"
+msgstr ""
+
+#: templates/admin.php:35
+msgid "cron.php is registered at a webcron service"
+msgstr ""
+
+#: templates/admin.php:37
+msgid "use systems cron service"
+msgstr ""
+
+#: templates/admin.php:41
+msgid "Share API"
+msgstr ""
+
+#: templates/admin.php:46
+msgid "Enable Share API"
+msgstr ""
+
+#: templates/admin.php:47
+msgid "Allow apps to use the Share API"
+msgstr ""
+
+#: templates/admin.php:51
+msgid "Allow links"
+msgstr ""
+
+#: templates/admin.php:52
+msgid "Allow users to share items to the public with links"
+msgstr ""
+
+#: templates/admin.php:56
+msgid "Allow resharing"
+msgstr ""
+
+#: templates/admin.php:57
+msgid "Allow users to share items shared with them again"
+msgstr ""
+
+#: templates/admin.php:60
+msgid "Allow users to share with anyone"
+msgstr ""
+
+#: templates/admin.php:62
+msgid "Allow users to only share with users in their groups"
+msgstr ""
+
+#: templates/admin.php:69
+msgid "Log"
+msgstr ""
+
+#: templates/admin.php:97
+msgid "More"
+msgstr ""
+
+#: templates/admin.php:105
+msgid ""
+"Developed by the <a href=\"http://ownCloud.org/contact\" "
+"target=\"_blank\">ownCloud community</a>, the <a "
+"href=\"https://github.com/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>."
+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 "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
+msgstr ""
+
+#: templates/help.php:9
+msgid "Documentation"
+msgstr ""
+
+#: templates/help.php:10
+msgid "Managing Big Files"
+msgstr ""
+
+#: templates/help.php:11
+msgid "Ask a question"
+msgstr ""
+
+#: templates/help.php:23
+msgid "Problems connecting to help database."
+msgstr ""
+
+#: templates/help.php:24
+msgid "Go there manually."
+msgstr ""
+
+#: templates/help.php:32
+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 "Group Admin"
+msgstr ""
+
+#: templates/users.php:82
+msgid "Quota"
+msgstr ""
+
+#: templates/users.php:146
+msgid "Delete"
+msgstr ""
diff --git a/l10n/oc/user_ldap.po b/l10n/oc/user_ldap.po
new file mode 100644
index 0000000000..e4321202c2
--- /dev/null
+++ b/l10n/oc/user_ldap.po
@@ -0,0 +1,170 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# 
+# Translators:
+msgid ""
+msgstr ""
+"Project-Id-Version: ownCloud\n"
+"Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
+"POT-Creation-Date: 2012-09-08 02:02+0200\n"
+"PO-Revision-Date: 2012-08-12 22:45+0000\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: oc\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:30
+msgid ""
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD "
+"attribute."
+msgstr ""
+
+#: templates/settings.php:32
+msgid "Help"
+msgstr ""
diff --git a/l10n/pl/files.po b/l10n/pl/files.po
index a3ea40e9bd..2f0082e002 100644
--- a/l10n/pl/files.po
+++ b/l10n/pl/files.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-09-07 02:04+0200\n"
-"PO-Revision-Date: 2012-09-06 13:42+0000\n"
-"Last-Translator: Marcin Małecki <gerber@tkdami.net>\n"
+"POT-Creation-Date: 2012-09-08 02:01+0200\n"
+"PO-Revision-Date: 2012-09-08 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"
@@ -56,7 +56,11 @@ msgstr "Błąd zapisu na dysk"
 msgid "Files"
 msgstr "Pliki"
 
-#: js/fileactions.js:106 templates/index.php:57
+#: js/fileactions.js:108 templates/index.php:62
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:110 templates/index.php:64
 msgid "Delete"
 msgstr "Usuwa element"
 
@@ -80,7 +84,7 @@ msgstr "anuluj"
 msgid "replaced"
 msgstr "zastąpione"
 
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:266
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:268 js/filelist.js:270
 msgid "undo"
 msgstr "wróć"
 
@@ -88,7 +92,11 @@ msgstr "wróć"
 msgid "with"
 msgstr "z"
 
-#: js/filelist.js:266
+#: js/filelist.js:268
+msgid "unshared"
+msgstr ""
+
+#: js/filelist.js:270
 msgid "deleted"
 msgstr "skasuj"
 
@@ -125,7 +133,7 @@ msgstr "Nieprawidłowa nazwa '/' jest niedozwolone."
 msgid "Size"
 msgstr "Rozmiar"
 
-#: js/files.js:747 templates/index.php:57
+#: js/files.js:747 templates/index.php:58
 msgid "Modified"
 msgstr "Czas modyfikacji"
 
@@ -217,20 +225,20 @@ msgstr "Współdziel"
 msgid "Download"
 msgstr "Pobiera element"
 
-#: templates/index.php:65
+#: templates/index.php:75
 msgid "Upload too large"
 msgstr "Wysyłany plik ma za duży rozmiar"
 
-#: templates/index.php:67
+#: templates/index.php:77
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Pliki które próbujesz przesłać, przekraczają maksymalną, dopuszczalną wielkość."
 
-#: templates/index.php:72
+#: templates/index.php:82
 msgid "Files are being scanned, please wait."
 msgstr "Skanowanie plików, proszę czekać."
 
-#: templates/index.php:75
+#: templates/index.php:85
 msgid "Current scanning"
 msgstr "Aktualnie skanowane"
diff --git a/l10n/pl_PL/files.po b/l10n/pl_PL/files.po
index 227d04a1ec..6b1c826da5 100644
--- a/l10n/pl_PL/files.po
+++ b/l10n/pl_PL/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-09-06 02:01+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-08 02:01+0200\n"
+"PO-Revision-Date: 2012-09-08 00:02+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/owncloud/language/pl_PL/)\n"
 "MIME-Version: 1.0\n"
@@ -51,7 +51,11 @@ msgstr ""
 msgid "Files"
 msgstr ""
 
-#: js/fileactions.js:106 templates/index.php:56
+#: js/fileactions.js:108 templates/index.php:62
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:110 templates/index.php:64
 msgid "Delete"
 msgstr ""
 
@@ -75,7 +79,7 @@ msgstr ""
 msgid "replaced"
 msgstr ""
 
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:268 js/filelist.js:270
 msgid "undo"
 msgstr ""
 
@@ -83,7 +87,11 @@ msgstr ""
 msgid "with"
 msgstr ""
 
-#: js/filelist.js:271
+#: js/filelist.js:268
+msgid "unshared"
+msgstr ""
+
+#: js/filelist.js:270
 msgid "deleted"
 msgstr ""
 
@@ -116,11 +124,11 @@ msgstr ""
 msgid "Invalid name, '/' is not allowed."
 msgstr ""
 
-#: js/files.js:746 templates/index.php:55
+#: js/files.js:746 templates/index.php:56
 msgid "Size"
 msgstr ""
 
-#: js/files.js:747 templates/index.php:56
+#: js/files.js:747 templates/index.php:58
 msgid "Modified"
 msgstr ""
 
@@ -196,36 +204,36 @@ msgstr ""
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:39
+#: templates/index.php:40
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:47
+#: templates/index.php:48
 msgid "Name"
 msgstr ""
 
-#: templates/index.php:49
+#: templates/index.php:50
 msgid "Share"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/index.php:52
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:64
+#: templates/index.php:75
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:66
+#: templates/index.php:77
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:71
+#: templates/index.php:82
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:74
+#: templates/index.php:85
 msgid "Current scanning"
 msgstr ""
diff --git a/l10n/pt_BR/files.po b/l10n/pt_BR/files.po
index 6e29f6321b..dba70ec6de 100644
--- a/l10n/pt_BR/files.po
+++ b/l10n/pt_BR/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-09-06 02:01+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-08 02:01+0200\n"
+"PO-Revision-Date: 2012-09-08 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"
@@ -56,7 +56,11 @@ msgstr "Falha ao escrever no disco"
 msgid "Files"
 msgstr "Arquivos"
 
-#: js/fileactions.js:106 templates/index.php:56
+#: js/fileactions.js:108 templates/index.php:62
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:110 templates/index.php:64
 msgid "Delete"
 msgstr "Excluir"
 
@@ -80,7 +84,7 @@ msgstr "cancelar"
 msgid "replaced"
 msgstr "substituido "
 
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:268 js/filelist.js:270
 msgid "undo"
 msgstr "desfazer"
 
@@ -88,7 +92,11 @@ msgstr "desfazer"
 msgid "with"
 msgstr "com"
 
-#: js/filelist.js:271
+#: js/filelist.js:268
+msgid "unshared"
+msgstr ""
+
+#: js/filelist.js:270
 msgid "deleted"
 msgstr "deletado"
 
@@ -121,11 +129,11 @@ msgstr ""
 msgid "Invalid name, '/' is not allowed."
 msgstr "Nome inválido, '/' não é permitido."
 
-#: js/files.js:746 templates/index.php:55
+#: js/files.js:746 templates/index.php:56
 msgid "Size"
 msgstr "Tamanho"
 
-#: js/files.js:747 templates/index.php:56
+#: js/files.js:747 templates/index.php:58
 msgid "Modified"
 msgstr "Modificado"
 
@@ -201,36 +209,36 @@ msgstr "Carregar"
 msgid "Cancel upload"
 msgstr "Cancelar upload"
 
-#: templates/index.php:39
+#: templates/index.php:40
 msgid "Nothing in here. Upload something!"
 msgstr "Nada aqui.Carrege alguma coisa!"
 
-#: templates/index.php:47
+#: templates/index.php:48
 msgid "Name"
 msgstr "Nome"
 
-#: templates/index.php:49
+#: templates/index.php:50
 msgid "Share"
 msgstr "Compartilhar"
 
-#: templates/index.php:51
+#: templates/index.php:52
 msgid "Download"
 msgstr "Baixar"
 
-#: templates/index.php:64
+#: templates/index.php:75
 msgid "Upload too large"
 msgstr "Arquivo muito grande"
 
-#: templates/index.php:66
+#: templates/index.php:77
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Os arquivos que você está tentando carregar excedeu o tamanho máximo para arquivos no servidor."
 
-#: templates/index.php:71
+#: templates/index.php:82
 msgid "Files are being scanned, please wait."
 msgstr "Arquivos sendo escaneados, por favor aguarde."
 
-#: templates/index.php:74
+#: templates/index.php:85
 msgid "Current scanning"
 msgstr "Scanning atual"
diff --git a/l10n/pt_PT/files.po b/l10n/pt_PT/files.po
index c0ba21ecbc..874fc55cb8 100644
--- a/l10n/pt_PT/files.po
+++ b/l10n/pt_PT/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-09-06 02:01+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-08 02:01+0200\n"
+"PO-Revision-Date: 2012-09-08 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"
@@ -54,7 +54,11 @@ msgstr "Falhou a escrita no disco"
 msgid "Files"
 msgstr "Ficheiros"
 
-#: js/fileactions.js:106 templates/index.php:56
+#: js/fileactions.js:108 templates/index.php:62
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:110 templates/index.php:64
 msgid "Delete"
 msgstr "Apagar"
 
@@ -78,7 +82,7 @@ msgstr "cancelar"
 msgid "replaced"
 msgstr "substituido"
 
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:268 js/filelist.js:270
 msgid "undo"
 msgstr "desfazer"
 
@@ -86,7 +90,11 @@ msgstr "desfazer"
 msgid "with"
 msgstr "com"
 
-#: js/filelist.js:271
+#: js/filelist.js:268
+msgid "unshared"
+msgstr ""
+
+#: js/filelist.js:270
 msgid "deleted"
 msgstr "apagado"
 
@@ -119,11 +127,11 @@ msgstr ""
 msgid "Invalid name, '/' is not allowed."
 msgstr "nome inválido, '/' não permitido."
 
-#: js/files.js:746 templates/index.php:55
+#: js/files.js:746 templates/index.php:56
 msgid "Size"
 msgstr "Tamanho"
 
-#: js/files.js:747 templates/index.php:56
+#: js/files.js:747 templates/index.php:58
 msgid "Modified"
 msgstr "Modificado"
 
@@ -199,36 +207,36 @@ msgstr "Enviar"
 msgid "Cancel upload"
 msgstr "Cancelar upload"
 
-#: templates/index.php:39
+#: templates/index.php:40
 msgid "Nothing in here. Upload something!"
 msgstr "Vazio. Envia alguma coisa!"
 
-#: templates/index.php:47
+#: templates/index.php:48
 msgid "Name"
 msgstr "Nome"
 
-#: templates/index.php:49
+#: templates/index.php:50
 msgid "Share"
 msgstr "Partilhar"
 
-#: templates/index.php:51
+#: templates/index.php:52
 msgid "Download"
 msgstr "Transferir"
 
-#: templates/index.php:64
+#: templates/index.php:75
 msgid "Upload too large"
 msgstr "Envio muito grande"
 
-#: templates/index.php:66
+#: templates/index.php:77
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Os ficheiro que estás a tentar enviar excedem o tamanho máximo de envio neste servidor."
 
-#: templates/index.php:71
+#: templates/index.php:82
 msgid "Files are being scanned, please wait."
 msgstr "Os ficheiros estão a ser analisados, por favor aguarde."
 
-#: templates/index.php:74
+#: templates/index.php:85
 msgid "Current scanning"
 msgstr "Análise actual"
diff --git a/l10n/ro/files.po b/l10n/ro/files.po
index 84051830b4..a1551d7f5c 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-09-06 02:01+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-08 02:01+0200\n"
+"PO-Revision-Date: 2012-09-08 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"
@@ -54,7 +54,11 @@ msgstr "Eroare la scriere pe disc"
 msgid "Files"
 msgstr "Fișiere"
 
-#: js/fileactions.js:106 templates/index.php:56
+#: js/fileactions.js:108 templates/index.php:62
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:110 templates/index.php:64
 msgid "Delete"
 msgstr "Șterge"
 
@@ -78,7 +82,7 @@ msgstr ""
 msgid "replaced"
 msgstr ""
 
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:268 js/filelist.js:270
 msgid "undo"
 msgstr ""
 
@@ -86,7 +90,11 @@ msgstr ""
 msgid "with"
 msgstr ""
 
-#: js/filelist.js:271
+#: js/filelist.js:268
+msgid "unshared"
+msgstr ""
+
+#: js/filelist.js:270
 msgid "deleted"
 msgstr ""
 
@@ -119,11 +127,11 @@ msgstr ""
 msgid "Invalid name, '/' is not allowed."
 msgstr ""
 
-#: js/files.js:746 templates/index.php:55
+#: js/files.js:746 templates/index.php:56
 msgid "Size"
 msgstr "Dimensiune"
 
-#: js/files.js:747 templates/index.php:56
+#: js/files.js:747 templates/index.php:58
 msgid "Modified"
 msgstr "Modificat"
 
@@ -199,36 +207,36 @@ msgstr "Încarcă"
 msgid "Cancel upload"
 msgstr "Anulează încărcarea"
 
-#: templates/index.php:39
+#: templates/index.php:40
 msgid "Nothing in here. Upload something!"
 msgstr "Nimic aici. Încarcă ceva!"
 
-#: templates/index.php:47
+#: templates/index.php:48
 msgid "Name"
 msgstr "Nume"
 
-#: templates/index.php:49
+#: templates/index.php:50
 msgid "Share"
 msgstr "Partajează"
 
-#: templates/index.php:51
+#: templates/index.php:52
 msgid "Download"
 msgstr "Descarcă"
 
-#: templates/index.php:64
+#: templates/index.php:75
 msgid "Upload too large"
 msgstr "Fișierul încărcat este prea mare"
 
-#: templates/index.php:66
+#: templates/index.php:77
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Fișierul care l-ai încărcat a depășită limita maximă admisă la încărcare pe acest server."
 
-#: templates/index.php:71
+#: templates/index.php:82
 msgid "Files are being scanned, please wait."
 msgstr "Fișierele sunt scanate, te rog așteptă."
 
-#: templates/index.php:74
+#: templates/index.php:85
 msgid "Current scanning"
 msgstr "În curs de scanare"
diff --git a/l10n/ru/core.po b/l10n/ru/core.po
index fa6451a38b..303b4ff13f 100644
--- a/l10n/ru/core.po
+++ b/l10n/ru/core.po
@@ -7,13 +7,14 @@
 #   <jekader@gmail.com>, 2011, 2012.
 #   <tony.mccourin@gmail.com>, 2011.
 # Victor Bravo <>, 2012.
+#   <victor.dubiniuk@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-06 02:02+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-08 02:02+0200\n"
+"PO-Revision-Date: 2012-09-07 10:55+0000\n"
+"Last-Translator: VicDeo <victor.dubiniuk@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"
@@ -33,7 +34,7 @@ msgstr "Нет категорий для добавления?"
 msgid "This category already exists: "
 msgstr "Эта категория уже существует: "
 
-#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/js.js:208 templates/layout.user.php:54 templates/layout.user.php:55
 msgid "Settings"
 msgstr "Настройки"
 
@@ -229,7 +230,7 @@ msgstr "Название базы данных"
 
 #: templates/installation.php:109
 msgid "Database tablespace"
-msgstr ""
+msgstr "Табличое пространство базы данных"
 
 #: templates/installation.php:115
 msgid "Database host"
@@ -239,11 +240,11 @@ msgstr "Хост базы данных"
 msgid "Finish setup"
 msgstr "Завершить установку"
 
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:36
 msgid "web services under your control"
 msgstr "Сетевые службы под твоим контролем"
 
-#: templates/layout.user.php:45
+#: templates/layout.user.php:39
 msgid "Log out"
 msgstr "Выйти"
 
diff --git a/l10n/ru/files.po b/l10n/ru/files.po
index 250d6badf4..6d0f5f2024 100644
--- a/l10n/ru/files.po
+++ b/l10n/ru/files.po
@@ -9,12 +9,13 @@
 # Nick Remeslennikov <homolibere@gmail.com>, 2012.
 #   <tony.mccourin@gmail.com>, 2011.
 # Victor Bravo <>, 2012.
+#   <victor.dubiniuk@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-06 02:01+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-08 02:01+0200\n"
+"PO-Revision-Date: 2012-09-08 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"
@@ -57,7 +58,11 @@ msgstr "Ошибка записи на диск"
 msgid "Files"
 msgstr "Файлы"
 
-#: js/fileactions.js:106 templates/index.php:56
+#: js/fileactions.js:108 templates/index.php:62
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:110 templates/index.php:64
 msgid "Delete"
 msgstr "Удалить"
 
@@ -71,7 +76,7 @@ msgstr "заменить"
 
 #: js/filelist.js:186
 msgid "suggest name"
-msgstr ""
+msgstr "предложить название"
 
 #: js/filelist.js:186 js/filelist.js:188
 msgid "cancel"
@@ -81,7 +86,7 @@ msgstr "отмена"
 msgid "replaced"
 msgstr "заменён"
 
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:268 js/filelist.js:270
 msgid "undo"
 msgstr "отмена"
 
@@ -89,7 +94,11 @@ msgstr "отмена"
 msgid "with"
 msgstr "с"
 
-#: js/filelist.js:271
+#: js/filelist.js:268
+msgid "unshared"
+msgstr ""
+
+#: js/filelist.js:270
 msgid "deleted"
 msgstr "удален"
 
@@ -122,11 +131,11 @@ msgstr "Файл в процессе загрузки. Покинув стран
 msgid "Invalid name, '/' is not allowed."
 msgstr "Неверное имя, '/' не допускается."
 
-#: js/files.js:746 templates/index.php:55
+#: js/files.js:746 templates/index.php:56
 msgid "Size"
 msgstr "Размер"
 
-#: js/files.js:747 templates/index.php:56
+#: js/files.js:747 templates/index.php:58
 msgid "Modified"
 msgstr "Изменён"
 
@@ -176,7 +185,7 @@ msgstr "Максимальный исходный размер для ZIP фай
 
 #: templates/admin.php:14
 msgid "Save"
-msgstr ""
+msgstr "Сохранить"
 
 #: templates/index.php:7
 msgid "New"
@@ -202,36 +211,36 @@ msgstr "Загрузить"
 msgid "Cancel upload"
 msgstr "Отмена загрузки"
 
-#: templates/index.php:39
+#: templates/index.php:40
 msgid "Nothing in here. Upload something!"
 msgstr "Здесь ничего нет. Загрузите что-нибудь!"
 
-#: templates/index.php:47
+#: templates/index.php:48
 msgid "Name"
 msgstr "Название"
 
-#: templates/index.php:49
+#: templates/index.php:50
 msgid "Share"
 msgstr "Опубликовать"
 
-#: templates/index.php:51
+#: templates/index.php:52
 msgid "Download"
 msgstr "Скачать"
 
-#: templates/index.php:64
+#: templates/index.php:75
 msgid "Upload too large"
 msgstr "Файл слишком большой"
 
-#: templates/index.php:66
+#: templates/index.php:77
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Файлы, которые Вы пытаетесь загрузить, превышают лимит для файлов на этом сервере."
 
-#: templates/index.php:71
+#: templates/index.php:82
 msgid "Files are being scanned, please wait."
 msgstr "Подождите, файлы сканируются."
 
-#: templates/index.php:74
+#: templates/index.php:85
 msgid "Current scanning"
 msgstr "Текущее сканирование"
diff --git a/l10n/ru/files_versions.po b/l10n/ru/files_versions.po
index fc36a2ead4..4eec64b43e 100644
--- a/l10n/ru/files_versions.po
+++ b/l10n/ru/files_versions.po
@@ -4,19 +4,20 @@
 # 
 # Translators:
 # Denis  <reg.transifex.net@demitel.ru>, 2012.
+#   <victor.dubiniuk@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 13:35+0200\n"
-"PO-Revision-Date: 2012-09-01 11:35+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-08 02:02+0200\n"
+"PO-Revision-Date: 2012-09-07 11:40+0000\n"
+"Last-Translator: VicDeo <victor.dubiniuk@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"
+"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 templates/settings-personal.php:10
 msgid "Expire all versions"
@@ -24,11 +25,11 @@ msgstr "Просрочить все версии"
 
 #: templates/settings-personal.php:4
 msgid "Versions"
-msgstr ""
+msgstr "Версии"
 
 #: templates/settings-personal.php:7
 msgid "This will delete all existing backup versions of your files"
-msgstr ""
+msgstr "Очистить список версий ваших файлов"
 
 #: templates/settings.php:3
 msgid "Enable Files Versioning"
diff --git a/l10n/ru/lib.po b/l10n/ru/lib.po
index 9a75b9546a..da6e478500 100644
--- a/l10n/ru/lib.po
+++ b/l10n/ru/lib.po
@@ -5,41 +5,42 @@
 # Translators:
 # Denis  <reg.transifex.net@demitel.ru>, 2012.
 #   <mpolr21@gmail.com>, 2012.
+#   <victor.dubiniuk@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-03 02:04+0200\n"
-"PO-Revision-Date: 2012-09-02 14:32+0000\n"
-"Last-Translator: mPolr <mpolr21@gmail.com>\n"
+"POT-Creation-Date: 2012-09-08 02:02+0200\n"
+"PO-Revision-Date: 2012-09-07 11:22+0000\n"
+"Last-Translator: VicDeo <victor.dubiniuk@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"
+"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:288
+#: app.php:285
 msgid "Help"
 msgstr "Помощь"
 
-#: app.php:295
+#: app.php:292
 msgid "Personal"
 msgstr "Личное"
 
-#: app.php:300
+#: app.php:297
 msgid "Settings"
 msgstr "Настройки"
 
-#: app.php:305
+#: app.php:302
 msgid "Users"
 msgstr "Пользователи"
 
-#: app.php:312
+#: app.php:309
 msgid "Apps"
 msgstr "Приложения"
 
-#: app.php:314
+#: app.php:311
 msgid "Admin"
 msgstr "Admin"
 
@@ -71,56 +72,56 @@ msgstr "Ошибка аутентификации"
 msgid "Token expired. Please reload page."
 msgstr "Токен просрочен. Перезагрузите страницу."
 
-#: template.php:86
+#: template.php:87
 msgid "seconds ago"
 msgstr "менее минуты"
 
-#: template.php:87
+#: template.php:88
 msgid "1 minute ago"
 msgstr "1 минуту назад"
 
-#: template.php:88
+#: template.php:89
 #, php-format
 msgid "%d minutes ago"
 msgstr "%d минут назад"
 
-#: template.php:91
+#: template.php:92
 msgid "today"
 msgstr "сегодня"
 
-#: template.php:92
+#: template.php:93
 msgid "yesterday"
 msgstr "вчера"
 
-#: template.php:93
+#: template.php:94
 #, php-format
 msgid "%d days ago"
 msgstr "%d дней назад"
 
-#: template.php:94
+#: template.php:95
 msgid "last month"
 msgstr "в прошлом месяце"
 
-#: template.php:95
+#: template.php:96
 msgid "months ago"
 msgstr "месяцы назад"
 
-#: template.php:96
+#: template.php:97
 msgid "last year"
 msgstr "в прошлом году"
 
-#: template.php:97
+#: template.php:98
 msgid "years ago"
 msgstr "годы назад"
 
 #: updater.php:66
 #, php-format
 msgid "%s is available. Get <a href=\"%s\">more information</a>"
-msgstr ""
+msgstr "Возможно обновление до %s. <a href=\"%s\">Подробнее</a>"
 
 #: updater.php:68
 msgid "up to date"
-msgstr ""
+msgstr "актуальная версия"
 
 #: updater.php:71
 msgid "updates check is disabled"
diff --git a/l10n/ru_RU/files.po b/l10n/ru_RU/files.po
index 3d22b6c936..441a2de6ae 100644
--- a/l10n/ru_RU/files.po
+++ b/l10n/ru_RU/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-09-06 02:01+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-08 02:01+0200\n"
+"PO-Revision-Date: 2012-09-08 00:02+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n"
 "MIME-Version: 1.0\n"
@@ -51,7 +51,11 @@ msgstr ""
 msgid "Files"
 msgstr ""
 
-#: js/fileactions.js:106 templates/index.php:56
+#: js/fileactions.js:108 templates/index.php:62
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:110 templates/index.php:64
 msgid "Delete"
 msgstr ""
 
@@ -75,7 +79,7 @@ msgstr ""
 msgid "replaced"
 msgstr ""
 
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:268 js/filelist.js:270
 msgid "undo"
 msgstr ""
 
@@ -83,7 +87,11 @@ msgstr ""
 msgid "with"
 msgstr ""
 
-#: js/filelist.js:271
+#: js/filelist.js:268
+msgid "unshared"
+msgstr ""
+
+#: js/filelist.js:270
 msgid "deleted"
 msgstr ""
 
@@ -116,11 +124,11 @@ msgstr ""
 msgid "Invalid name, '/' is not allowed."
 msgstr ""
 
-#: js/files.js:746 templates/index.php:55
+#: js/files.js:746 templates/index.php:56
 msgid "Size"
 msgstr ""
 
-#: js/files.js:747 templates/index.php:56
+#: js/files.js:747 templates/index.php:58
 msgid "Modified"
 msgstr ""
 
@@ -196,36 +204,36 @@ msgstr ""
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:39
+#: templates/index.php:40
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:47
+#: templates/index.php:48
 msgid "Name"
 msgstr ""
 
-#: templates/index.php:49
+#: templates/index.php:50
 msgid "Share"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/index.php:52
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:64
+#: templates/index.php:75
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:66
+#: templates/index.php:77
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:71
+#: templates/index.php:82
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:74
+#: templates/index.php:85
 msgid "Current scanning"
 msgstr ""
diff --git a/l10n/sk_SK/files.po b/l10n/sk_SK/files.po
index e47f0b0088..a9285f4547 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-09-06 02:01+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-08 02:01+0200\n"
+"PO-Revision-Date: 2012-09-08 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"
@@ -53,7 +53,11 @@ msgstr "Zápis na disk sa nepodaril"
 msgid "Files"
 msgstr "Súbory"
 
-#: js/fileactions.js:106 templates/index.php:56
+#: js/fileactions.js:108 templates/index.php:62
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:110 templates/index.php:64
 msgid "Delete"
 msgstr "Odstrániť"
 
@@ -77,7 +81,7 @@ msgstr ""
 msgid "replaced"
 msgstr ""
 
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:268 js/filelist.js:270
 msgid "undo"
 msgstr ""
 
@@ -85,7 +89,11 @@ msgstr ""
 msgid "with"
 msgstr ""
 
-#: js/filelist.js:271
+#: js/filelist.js:268
+msgid "unshared"
+msgstr ""
+
+#: js/filelist.js:270
 msgid "deleted"
 msgstr ""
 
@@ -118,11 +126,11 @@ msgstr ""
 msgid "Invalid name, '/' is not allowed."
 msgstr "Chybný názov, \"/\" nie je povolené"
 
-#: js/files.js:746 templates/index.php:55
+#: js/files.js:746 templates/index.php:56
 msgid "Size"
 msgstr "Veľkosť"
 
-#: js/files.js:747 templates/index.php:56
+#: js/files.js:747 templates/index.php:58
 msgid "Modified"
 msgstr "Upravené"
 
@@ -198,36 +206,36 @@ msgstr "Nahrať"
 msgid "Cancel upload"
 msgstr "Zrušiť odosielanie"
 
-#: templates/index.php:39
+#: templates/index.php:40
 msgid "Nothing in here. Upload something!"
 msgstr "Nič tu nie je. Nahrajte niečo!"
 
-#: templates/index.php:47
+#: templates/index.php:48
 msgid "Name"
 msgstr "Meno"
 
-#: templates/index.php:49
+#: templates/index.php:50
 msgid "Share"
 msgstr "Zdielať"
 
-#: templates/index.php:51
+#: templates/index.php:52
 msgid "Download"
 msgstr "Stiahnuť"
 
-#: templates/index.php:64
+#: templates/index.php:75
 msgid "Upload too large"
 msgstr "Nahrávanie príliš veľké"
 
-#: templates/index.php:66
+#: templates/index.php:77
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Súbory ktoré sa snažíte nahrať presahujú maximálnu veľkosť pre nahratie súborov na tento server."
 
-#: templates/index.php:71
+#: templates/index.php:82
 msgid "Files are being scanned, please wait."
 msgstr "Súbory sa práve prehľadávajú, prosím čakajte."
 
-#: templates/index.php:74
+#: templates/index.php:85
 msgid "Current scanning"
 msgstr "Práve prehliadané"
diff --git a/l10n/sl/files.po b/l10n/sl/files.po
index af1cffc01a..419db6b3fa 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-09-07 02:04+0200\n"
-"PO-Revision-Date: 2012-09-06 05:16+0000\n"
-"Last-Translator: Peter Peroša <peter.perosa@gmail.com>\n"
+"POT-Creation-Date: 2012-09-08 02:01+0200\n"
+"PO-Revision-Date: 2012-09-08 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"
@@ -54,7 +54,11 @@ msgstr "Pisanje na disk je spodletelo"
 msgid "Files"
 msgstr "Datoteke"
 
-#: js/fileactions.js:106 templates/index.php:57
+#: js/fileactions.js:108 templates/index.php:62
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:110 templates/index.php:64
 msgid "Delete"
 msgstr "Izbriši"
 
@@ -78,7 +82,7 @@ msgstr "ekliči"
 msgid "replaced"
 msgstr "nadomeščen"
 
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:266
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:268 js/filelist.js:270
 msgid "undo"
 msgstr "razveljavi"
 
@@ -86,7 +90,11 @@ msgstr "razveljavi"
 msgid "with"
 msgstr "z"
 
-#: js/filelist.js:266
+#: js/filelist.js:268
+msgid "unshared"
+msgstr ""
+
+#: js/filelist.js:270
 msgid "deleted"
 msgstr "izbrisano"
 
@@ -123,7 +131,7 @@ msgstr "Neveljavno ime. Znak '/' ni dovoljen."
 msgid "Size"
 msgstr "Velikost"
 
-#: js/files.js:747 templates/index.php:57
+#: js/files.js:747 templates/index.php:58
 msgid "Modified"
 msgstr "Spremenjeno"
 
@@ -215,20 +223,20 @@ msgstr "Souporaba"
 msgid "Download"
 msgstr "Prenesi"
 
-#: templates/index.php:65
+#: templates/index.php:75
 msgid "Upload too large"
 msgstr "Nalaganje ni mogoče, ker je preveliko"
 
-#: templates/index.php:67
+#: templates/index.php:77
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Datoteke, ki jih želite naložiti, presegajo največjo dovoljeno velikost na tem strežniku."
 
-#: templates/index.php:72
+#: templates/index.php:82
 msgid "Files are being scanned, please wait."
 msgstr "Preiskujem datoteke, prosimo počakajte."
 
-#: templates/index.php:75
+#: templates/index.php:85
 msgid "Current scanning"
 msgstr "Trenutno preiskujem"
diff --git a/l10n/so/files.po b/l10n/so/files.po
index a00a9a156c..f168f0b775 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-09-06 02:01+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-08 02:01+0200\n"
+"PO-Revision-Date: 2012-09-08 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"
@@ -51,7 +51,11 @@ msgstr ""
 msgid "Files"
 msgstr ""
 
-#: js/fileactions.js:106 templates/index.php:56
+#: js/fileactions.js:108 templates/index.php:62
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:110 templates/index.php:64
 msgid "Delete"
 msgstr ""
 
@@ -75,7 +79,7 @@ msgstr ""
 msgid "replaced"
 msgstr ""
 
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:268 js/filelist.js:270
 msgid "undo"
 msgstr ""
 
@@ -83,7 +87,11 @@ msgstr ""
 msgid "with"
 msgstr ""
 
-#: js/filelist.js:271
+#: js/filelist.js:268
+msgid "unshared"
+msgstr ""
+
+#: js/filelist.js:270
 msgid "deleted"
 msgstr ""
 
@@ -116,11 +124,11 @@ msgstr ""
 msgid "Invalid name, '/' is not allowed."
 msgstr ""
 
-#: js/files.js:746 templates/index.php:55
+#: js/files.js:746 templates/index.php:56
 msgid "Size"
 msgstr ""
 
-#: js/files.js:747 templates/index.php:56
+#: js/files.js:747 templates/index.php:58
 msgid "Modified"
 msgstr ""
 
@@ -196,36 +204,36 @@ msgstr ""
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:39
+#: templates/index.php:40
 msgid "Nothing in here. Upload something!"
 msgstr ""
 
-#: templates/index.php:47
+#: templates/index.php:48
 msgid "Name"
 msgstr ""
 
-#: templates/index.php:49
+#: templates/index.php:50
 msgid "Share"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/index.php:52
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:64
+#: templates/index.php:75
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:66
+#: templates/index.php:77
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:71
+#: templates/index.php:82
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:74
+#: templates/index.php:85
 msgid "Current scanning"
 msgstr ""
diff --git a/l10n/sr/files.po b/l10n/sr/files.po
index 8dac0a4264..8874f6a4db 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-09-06 02:01+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-08 02:01+0200\n"
+"PO-Revision-Date: 2012-09-08 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"
@@ -52,7 +52,11 @@ msgstr ""
 msgid "Files"
 msgstr "Фајлови"
 
-#: js/fileactions.js:106 templates/index.php:56
+#: js/fileactions.js:108 templates/index.php:62
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:110 templates/index.php:64
 msgid "Delete"
 msgstr "Обриши"
 
@@ -76,7 +80,7 @@ msgstr ""
 msgid "replaced"
 msgstr ""
 
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:268 js/filelist.js:270
 msgid "undo"
 msgstr ""
 
@@ -84,7 +88,11 @@ msgstr ""
 msgid "with"
 msgstr ""
 
-#: js/filelist.js:271
+#: js/filelist.js:268
+msgid "unshared"
+msgstr ""
+
+#: js/filelist.js:270
 msgid "deleted"
 msgstr ""
 
@@ -117,11 +125,11 @@ msgstr ""
 msgid "Invalid name, '/' is not allowed."
 msgstr ""
 
-#: js/files.js:746 templates/index.php:55
+#: js/files.js:746 templates/index.php:56
 msgid "Size"
 msgstr "Величина"
 
-#: js/files.js:747 templates/index.php:56
+#: js/files.js:747 templates/index.php:58
 msgid "Modified"
 msgstr "Задња измена"
 
@@ -197,36 +205,36 @@ msgstr "Пошаљи"
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:39
+#: templates/index.php:40
 msgid "Nothing in here. Upload something!"
 msgstr "Овде нема ничег. Пошаљите нешто!"
 
-#: templates/index.php:47
+#: templates/index.php:48
 msgid "Name"
 msgstr "Име"
 
-#: templates/index.php:49
+#: templates/index.php:50
 msgid "Share"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/index.php:52
 msgid "Download"
 msgstr "Преузми"
 
-#: templates/index.php:64
+#: templates/index.php:75
 msgid "Upload too large"
 msgstr "Пошиљка је превелика"
 
-#: templates/index.php:66
+#: templates/index.php:77
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Фајлови које желите да пошаљете превазилазе ограничење максималне величине пошиљке на овом серверу."
 
-#: templates/index.php:71
+#: templates/index.php:82
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:74
+#: templates/index.php:85
 msgid "Current scanning"
 msgstr ""
diff --git a/l10n/sr@latin/files.po b/l10n/sr@latin/files.po
index e52820431e..11f37da7d1 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-09-06 02:01+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-08 02:01+0200\n"
+"PO-Revision-Date: 2012-09-08 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"
@@ -52,7 +52,11 @@ msgstr ""
 msgid "Files"
 msgstr "Fajlovi"
 
-#: js/fileactions.js:106 templates/index.php:56
+#: js/fileactions.js:108 templates/index.php:62
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:110 templates/index.php:64
 msgid "Delete"
 msgstr "Obriši"
 
@@ -76,7 +80,7 @@ msgstr ""
 msgid "replaced"
 msgstr ""
 
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:268 js/filelist.js:270
 msgid "undo"
 msgstr ""
 
@@ -84,7 +88,11 @@ msgstr ""
 msgid "with"
 msgstr ""
 
-#: js/filelist.js:271
+#: js/filelist.js:268
+msgid "unshared"
+msgstr ""
+
+#: js/filelist.js:270
 msgid "deleted"
 msgstr ""
 
@@ -117,11 +125,11 @@ msgstr ""
 msgid "Invalid name, '/' is not allowed."
 msgstr ""
 
-#: js/files.js:746 templates/index.php:55
+#: js/files.js:746 templates/index.php:56
 msgid "Size"
 msgstr "Veličina"
 
-#: js/files.js:747 templates/index.php:56
+#: js/files.js:747 templates/index.php:58
 msgid "Modified"
 msgstr "Zadnja izmena"
 
@@ -197,36 +205,36 @@ msgstr "Pošalji"
 msgid "Cancel upload"
 msgstr ""
 
-#: templates/index.php:39
+#: templates/index.php:40
 msgid "Nothing in here. Upload something!"
 msgstr "Ovde nema ničeg. Pošaljite nešto!"
 
-#: templates/index.php:47
+#: templates/index.php:48
 msgid "Name"
 msgstr "Ime"
 
-#: templates/index.php:49
+#: templates/index.php:50
 msgid "Share"
 msgstr ""
 
-#: templates/index.php:51
+#: templates/index.php:52
 msgid "Download"
 msgstr "Preuzmi"
 
-#: templates/index.php:64
+#: templates/index.php:75
 msgid "Upload too large"
 msgstr "Pošiljka je prevelika"
 
-#: templates/index.php:66
+#: templates/index.php:77
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Fajlovi koje želite da pošaljete prevazilaze ograničenje maksimalne veličine pošiljke na ovom serveru."
 
-#: templates/index.php:71
+#: templates/index.php:82
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:74
+#: templates/index.php:85
 msgid "Current scanning"
 msgstr ""
diff --git a/l10n/sv/files.po b/l10n/sv/files.po
index 81ea65ce48..c9508d5b64 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-09-07 02:04+0200\n"
-"PO-Revision-Date: 2012-09-06 13:34+0000\n"
-"Last-Translator: Magnus Höglund <magnus@linux.com>\n"
+"POT-Creation-Date: 2012-09-08 02:01+0200\n"
+"PO-Revision-Date: 2012-09-08 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"
@@ -57,7 +57,11 @@ msgstr "Misslyckades spara till disk"
 msgid "Files"
 msgstr "Filer"
 
-#: js/fileactions.js:106 templates/index.php:57
+#: js/fileactions.js:108 templates/index.php:62
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:110 templates/index.php:64
 msgid "Delete"
 msgstr "Radera"
 
@@ -81,7 +85,7 @@ msgstr "avbryt"
 msgid "replaced"
 msgstr "ersatt"
 
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:266
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:268 js/filelist.js:270
 msgid "undo"
 msgstr "ångra"
 
@@ -89,7 +93,11 @@ msgstr "ångra"
 msgid "with"
 msgstr "med"
 
-#: js/filelist.js:266
+#: js/filelist.js:268
+msgid "unshared"
+msgstr ""
+
+#: js/filelist.js:270
 msgid "deleted"
 msgstr "raderad"
 
@@ -126,7 +134,7 @@ msgstr "Ogiltigt namn, '/' är inte tillåten."
 msgid "Size"
 msgstr "Storlek"
 
-#: js/files.js:747 templates/index.php:57
+#: js/files.js:747 templates/index.php:58
 msgid "Modified"
 msgstr "Ändrad"
 
@@ -218,20 +226,20 @@ msgstr "Dela"
 msgid "Download"
 msgstr "Ladda ner"
 
-#: templates/index.php:65
+#: templates/index.php:75
 msgid "Upload too large"
 msgstr "För stor uppladdning"
 
-#: templates/index.php:67
+#: templates/index.php:77
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Filerna du försöker ladda upp överstiger den maximala storleken för filöverföringar på servern."
 
-#: templates/index.php:72
+#: templates/index.php:82
 msgid "Files are being scanned, please wait."
 msgstr "Filer skannas, var god vänta"
 
-#: templates/index.php:75
+#: templates/index.php:85
 msgid "Current scanning"
 msgstr "Aktuell skanning"
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index b702651ccd..c74b265889 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-09-07 02:04+0200\n"
+"POT-Creation-Date: 2012-09-08 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"
@@ -29,7 +29,7 @@ msgstr ""
 msgid "This category already exists: "
 msgstr ""
 
-#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/js.js:208 templates/layout.user.php:54 templates/layout.user.php:55
 msgid "Settings"
 msgstr ""
 
@@ -235,11 +235,11 @@ msgstr ""
 msgid "Finish setup"
 msgstr ""
 
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:36
 msgid "web services under your control"
 msgstr ""
 
-#: templates/layout.user.php:45
+#: templates/layout.user.php:39
 msgid "Log out"
 msgstr ""
 
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index 08fbebab79..e97ace3f33 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-09-07 02:04+0200\n"
+"POT-Creation-Date: 2012-09-08 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"
@@ -51,7 +51,11 @@ msgstr ""
 msgid "Files"
 msgstr ""
 
-#: js/fileactions.js:106 templates/index.php:57
+#: js/fileactions.js:108 templates/index.php:62
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:110 templates/index.php:64
 msgid "Delete"
 msgstr ""
 
@@ -75,7 +79,7 @@ msgstr ""
 msgid "replaced"
 msgstr ""
 
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:266
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:268 js/filelist.js:270
 msgid "undo"
 msgstr ""
 
@@ -83,7 +87,11 @@ msgstr ""
 msgid "with"
 msgstr ""
 
-#: js/filelist.js:266
+#: js/filelist.js:268
+msgid "unshared"
+msgstr ""
+
+#: js/filelist.js:270
 msgid "deleted"
 msgstr ""
 
@@ -120,7 +128,7 @@ msgstr ""
 msgid "Size"
 msgstr ""
 
-#: js/files.js:747 templates/index.php:57
+#: js/files.js:747 templates/index.php:58
 msgid "Modified"
 msgstr ""
 
@@ -212,20 +220,20 @@ msgstr ""
 msgid "Download"
 msgstr ""
 
-#: templates/index.php:65
+#: templates/index.php:75
 msgid "Upload too large"
 msgstr ""
 
-#: templates/index.php:67
+#: templates/index.php:77
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr ""
 
-#: templates/index.php:72
+#: templates/index.php:82
 msgid "Files are being scanned, please wait."
 msgstr ""
 
-#: templates/index.php:75
+#: templates/index.php:85
 msgid "Current scanning"
 msgstr ""
diff --git a/l10n/templates/files_encryption.pot b/l10n/templates/files_encryption.pot
index 372d9301ed..7e2709f019 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-09-07 02:04+0200\n"
+"POT-Creation-Date: 2012-09-08 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 d09f705535..311891242c 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-09-07 02:04+0200\n"
+"POT-Creation-Date: 2012-09-08 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 e9f6afc98d..9f4a05645a 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-09-07 02:04+0200\n"
+"POT-Creation-Date: 2012-09-08 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 9750a4acc5..a8efc666c9 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-09-07 02:04+0200\n"
+"POT-Creation-Date: 2012-09-08 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 d9c9f8aade..41dc540143 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-09-07 02:04+0200\n"
+"POT-Creation-Date: 2012-09-08 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,27 +17,27 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: app.php:288
+#: app.php:285
 msgid "Help"
 msgstr ""
 
-#: app.php:295
+#: app.php:292
 msgid "Personal"
 msgstr ""
 
-#: app.php:300
+#: app.php:297
 msgid "Settings"
 msgstr ""
 
-#: app.php:305
+#: app.php:302
 msgid "Users"
 msgstr ""
 
-#: app.php:312
+#: app.php:309
 msgid "Apps"
 msgstr ""
 
-#: app.php:314
+#: app.php:311
 msgid "Admin"
 msgstr ""
 
diff --git a/l10n/templates/settings.pot b/l10n/templates/settings.pot
index 8bd0ab8fda..ce3a92f62a 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-09-07 02:04+0200\n"
+"POT-Creation-Date: 2012-09-08 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 45eb19bf9f..7283addbb6 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-09-07 02:04+0200\n"
+"POT-Creation-Date: 2012-09-08 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/files.po b/l10n/th_TH/files.po
index 7c73207131..021f82d452 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-09-07 02:04+0200\n"
-"PO-Revision-Date: 2012-09-06 04:45+0000\n"
-"Last-Translator: AriesAnywhere Anywhere <ariesanywhere@gmail.com>\n"
+"POT-Creation-Date: 2012-09-08 02:01+0200\n"
+"PO-Revision-Date: 2012-09-08 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"
@@ -53,7 +53,11 @@ msgstr "เขียนข้อมูลลงแผ่นดิสก์ล้
 msgid "Files"
 msgstr "ไฟล์"
 
-#: js/fileactions.js:106 templates/index.php:57
+#: js/fileactions.js:108 templates/index.php:62
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:110 templates/index.php:64
 msgid "Delete"
 msgstr "ลบ"
 
@@ -77,7 +81,7 @@ msgstr "ยกเลิก"
 msgid "replaced"
 msgstr "แทนที่แล้ว"
 
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:266
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:268 js/filelist.js:270
 msgid "undo"
 msgstr "เลิกทำ"
 
@@ -85,7 +89,11 @@ msgstr "เลิกทำ"
 msgid "with"
 msgstr "กับ"
 
-#: js/filelist.js:266
+#: js/filelist.js:268
+msgid "unshared"
+msgstr ""
+
+#: js/filelist.js:270
 msgid "deleted"
 msgstr "ลบแล้ว"
 
@@ -122,7 +130,7 @@ msgstr "ชื่อที่ใช้ไม่ถูกต้อง '/' ไม
 msgid "Size"
 msgstr "ขนาด"
 
-#: js/files.js:747 templates/index.php:57
+#: js/files.js:747 templates/index.php:58
 msgid "Modified"
 msgstr "ปรับปรุงล่าสุด"
 
@@ -214,20 +222,20 @@ msgstr "แชร์"
 msgid "Download"
 msgstr "ดาวน์โหลด"
 
-#: templates/index.php:65
+#: templates/index.php:75
 msgid "Upload too large"
 msgstr "ไฟล์ที่อัพโหลดมีขนาดใหญ่เกินไป"
 
-#: templates/index.php:67
+#: templates/index.php:77
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "ไฟล์ที่คุณพยายามที่จะอัพโหลดมีขนาดเกินกว่าขนาดสูงสุดที่กำหนดไว้ให้อัพโหลดได้สำหรับเซิร์ฟเวอร์นี้"
 
-#: templates/index.php:72
+#: templates/index.php:82
 msgid "Files are being scanned, please wait."
 msgstr "ไฟล์กำลังอยู่ระหว่างการสแกน, กรุณารอสักครู่."
 
-#: templates/index.php:75
+#: templates/index.php:85
 msgid "Current scanning"
 msgstr "ไฟล์ที่กำลังสแกนอยู่ขณะนี้"
diff --git a/l10n/tr/files.po b/l10n/tr/files.po
index 01675ca064..c0a9c6b876 100644
--- a/l10n/tr/files.po
+++ b/l10n/tr/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-09-06 02:01+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-08 02:01+0200\n"
+"PO-Revision-Date: 2012-09-08 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"
@@ -55,7 +55,11 @@ msgstr "Diske yazılamadı"
 msgid "Files"
 msgstr "Dosyalar"
 
-#: js/fileactions.js:106 templates/index.php:56
+#: js/fileactions.js:108 templates/index.php:62
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:110 templates/index.php:64
 msgid "Delete"
 msgstr "Sil"
 
@@ -79,7 +83,7 @@ msgstr "iptal"
 msgid "replaced"
 msgstr "değiştirildi"
 
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:268 js/filelist.js:270
 msgid "undo"
 msgstr "geri al"
 
@@ -87,7 +91,11 @@ msgstr "geri al"
 msgid "with"
 msgstr "ile"
 
-#: js/filelist.js:271
+#: js/filelist.js:268
+msgid "unshared"
+msgstr ""
+
+#: js/filelist.js:270
 msgid "deleted"
 msgstr "silindi"
 
@@ -120,11 +128,11 @@ msgstr "Dosya yükleme işlemi sürüyor. Şimdi sayfadan ayrılırsanız işlem
 msgid "Invalid name, '/' is not allowed."
 msgstr "Geçersiz isim, '/' işaretine izin verilmiyor."
 
-#: js/files.js:746 templates/index.php:55
+#: js/files.js:746 templates/index.php:56
 msgid "Size"
 msgstr "Boyut"
 
-#: js/files.js:747 templates/index.php:56
+#: js/files.js:747 templates/index.php:58
 msgid "Modified"
 msgstr "Değiştirilme"
 
@@ -200,36 +208,36 @@ msgstr "Yükle"
 msgid "Cancel upload"
 msgstr "Yüklemeyi iptal et"
 
-#: templates/index.php:39
+#: templates/index.php:40
 msgid "Nothing in here. Upload something!"
 msgstr "Burada hiçbir şey yok. Birşeyler yükleyin!"
 
-#: templates/index.php:47
+#: templates/index.php:48
 msgid "Name"
 msgstr "Ad"
 
-#: templates/index.php:49
+#: templates/index.php:50
 msgid "Share"
 msgstr "Paylaş"
 
-#: templates/index.php:51
+#: templates/index.php:52
 msgid "Download"
 msgstr "İndir"
 
-#: templates/index.php:64
+#: templates/index.php:75
 msgid "Upload too large"
 msgstr "Yüklemeniz çok büyük"
 
-#: templates/index.php:66
+#: templates/index.php:77
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Yüklemeye çalıştığınız dosyalar bu sunucudaki maksimum yükleme boyutunu aşıyor."
 
-#: templates/index.php:71
+#: templates/index.php:82
 msgid "Files are being scanned, please wait."
 msgstr "Dosyalar taranıyor, lütfen bekleyin."
 
-#: templates/index.php:74
+#: templates/index.php:85
 msgid "Current scanning"
 msgstr "Güncel tarama"
diff --git a/l10n/uk/files.po b/l10n/uk/files.po
index 558899c1a2..f81ff99674 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-09-06 02:01+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-08 02:01+0200\n"
+"PO-Revision-Date: 2012-09-08 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"
@@ -53,7 +53,11 @@ msgstr ""
 msgid "Files"
 msgstr "Файли"
 
-#: js/fileactions.js:106 templates/index.php:56
+#: js/fileactions.js:108 templates/index.php:62
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:110 templates/index.php:64
 msgid "Delete"
 msgstr "Видалити"
 
@@ -77,7 +81,7 @@ msgstr ""
 msgid "replaced"
 msgstr ""
 
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:268 js/filelist.js:270
 msgid "undo"
 msgstr "відмінити"
 
@@ -85,7 +89,11 @@ msgstr "відмінити"
 msgid "with"
 msgstr ""
 
-#: js/filelist.js:271
+#: js/filelist.js:268
+msgid "unshared"
+msgstr ""
+
+#: js/filelist.js:270
 msgid "deleted"
 msgstr "видалені"
 
@@ -118,11 +126,11 @@ msgstr ""
 msgid "Invalid name, '/' is not allowed."
 msgstr "Некоректне ім'я, '/' не дозволено."
 
-#: js/files.js:746 templates/index.php:55
+#: js/files.js:746 templates/index.php:56
 msgid "Size"
 msgstr "Розмір"
 
-#: js/files.js:747 templates/index.php:56
+#: js/files.js:747 templates/index.php:58
 msgid "Modified"
 msgstr "Змінено"
 
@@ -198,36 +206,36 @@ msgstr "Відвантажити"
 msgid "Cancel upload"
 msgstr "Перервати завантаження"
 
-#: templates/index.php:39
+#: templates/index.php:40
 msgid "Nothing in here. Upload something!"
 msgstr "Тут нічого немає. Відвантажте що-небудь!"
 
-#: templates/index.php:47
+#: templates/index.php:48
 msgid "Name"
 msgstr "Ім'я"
 
-#: templates/index.php:49
+#: templates/index.php:50
 msgid "Share"
 msgstr "Поділитися"
 
-#: templates/index.php:51
+#: templates/index.php:52
 msgid "Download"
 msgstr "Завантажити"
 
-#: templates/index.php:64
+#: templates/index.php:75
 msgid "Upload too large"
 msgstr "Файл занадто великий"
 
-#: templates/index.php:66
+#: templates/index.php:77
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "Файли,що ви намагаєтесь відвантажити перевищують максимальний дозволений розмір файлів на цьому сервері."
 
-#: templates/index.php:71
+#: templates/index.php:82
 msgid "Files are being scanned, please wait."
 msgstr "Файли скануються, зачекайте, будь-ласка."
 
-#: templates/index.php:74
+#: templates/index.php:85
 msgid "Current scanning"
 msgstr "Поточне сканування"
diff --git a/l10n/vi/files.po b/l10n/vi/files.po
index fb95389e33..e6cb256217 100644
--- a/l10n/vi/files.po
+++ b/l10n/vi/files.po
@@ -3,13 +3,14 @@
 # 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-09-06 02:01+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-08 02:01+0200\n"
+"PO-Revision-Date: 2012-09-08 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"
@@ -20,7 +21,7 @@ msgstr ""
 
 #: ajax/upload.php:20
 msgid "There is no error, the file uploaded with success"
-msgstr ""
+msgstr "Không có lỗi, các tập tin đã được tải lên thành công"
 
 #: ajax/upload.php:21
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
@@ -52,7 +53,11 @@ msgstr ""
 msgid "Files"
 msgstr "Tập tin"
 
-#: js/fileactions.js:106 templates/index.php:56
+#: js/fileactions.js:108 templates/index.php:62
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:110 templates/index.php:64
 msgid "Delete"
 msgstr "Xóa"
 
@@ -76,7 +81,7 @@ msgstr ""
 msgid "replaced"
 msgstr ""
 
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:268 js/filelist.js:270
 msgid "undo"
 msgstr ""
 
@@ -84,7 +89,11 @@ msgstr ""
 msgid "with"
 msgstr ""
 
-#: js/filelist.js:271
+#: js/filelist.js:268
+msgid "unshared"
+msgstr ""
+
+#: js/filelist.js:270
 msgid "deleted"
 msgstr ""
 
@@ -117,11 +126,11 @@ msgstr ""
 msgid "Invalid name, '/' is not allowed."
 msgstr "Tên không hợp lệ ,không được phép dùng '/'"
 
-#: js/files.js:746 templates/index.php:55
+#: js/files.js:746 templates/index.php:56
 msgid "Size"
 msgstr "Kích cỡ"
 
-#: js/files.js:747 templates/index.php:56
+#: js/files.js:747 templates/index.php:58
 msgid "Modified"
 msgstr "Thay đổi"
 
@@ -197,36 +206,36 @@ msgstr "Tải lên"
 msgid "Cancel upload"
 msgstr "Hủy upload"
 
-#: templates/index.php:39
+#: templates/index.php:40
 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
+#: templates/index.php:48
 msgid "Name"
 msgstr "Tên"
 
-#: templates/index.php:49
+#: templates/index.php:50
 msgid "Share"
 msgstr "Chia sẻ"
 
-#: templates/index.php:51
+#: templates/index.php:52
 msgid "Download"
 msgstr "Tải xuống"
 
-#: templates/index.php:64
+#: templates/index.php:75
 msgid "Upload too large"
 msgstr "File tải lên quá lớn"
 
-#: templates/index.php:66
+#: templates/index.php:77
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
-msgstr ""
+msgstr "Các tập tin bạn đang cố gắng tải lên vượt quá kích thước tối đa cho phép trên máy chủ này."
 
-#: templates/index.php:71
+#: templates/index.php:82
 msgid "Files are being scanned, please wait."
 msgstr "Tập tin đang được quét ,vui lòng chờ."
 
-#: templates/index.php:74
+#: templates/index.php:85
 msgid "Current scanning"
 msgstr ""
diff --git a/l10n/vi/files_encryption.po b/l10n/vi/files_encryption.po
index d76c619333..9c55fc8c75 100644
--- a/l10n/vi/files_encryption.po
+++ b/l10n/vi/files_encryption.po
@@ -3,32 +3,33 @@
 # 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-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-09-08 02:01+0200\n"
+"PO-Revision-Date: 2012-09-07 14:56+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"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: templates/settings.php:3
 msgid "Encryption"
-msgstr ""
+msgstr "Mã hóa"
 
 #: templates/settings.php:4
 msgid "Exclude the following file types from encryption"
-msgstr ""
+msgstr "Loại trừ các loại tập tin sau đây từ mã hóa"
 
 #: templates/settings.php:5
 msgid "None"
-msgstr ""
+msgstr "none"
 
 #: templates/settings.php:10
 msgid "Enable Encryption"
-msgstr ""
+msgstr "BẬT mã hóa"
diff --git a/l10n/vi/files_external.po b/l10n/vi/files_external.po
index 8633bedfa5..d91134daff 100644
--- a/l10n/vi/files_external.po
+++ b/l10n/vi/files_external.po
@@ -3,80 +3,81 @@
 # 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-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-09-08 02:02+0200\n"
+"PO-Revision-Date: 2012-09-07 15:39+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"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: templates/settings.php:3
 msgid "External Storage"
-msgstr ""
+msgstr "Lưu trữ ngoài"
 
 #: templates/settings.php:7 templates/settings.php:19
 msgid "Mount point"
-msgstr ""
+msgstr "Điểm gắn"
 
 #: templates/settings.php:8
 msgid "Backend"
-msgstr ""
+msgstr "phụ trợ"
 
 #: templates/settings.php:9
 msgid "Configuration"
-msgstr ""
+msgstr "Cấu hình"
 
 #: templates/settings.php:10
 msgid "Options"
-msgstr ""
+msgstr "Tùy chọn"
 
 #: templates/settings.php:11
 msgid "Applicable"
-msgstr ""
+msgstr "Áp dụng"
 
 #: templates/settings.php:23
 msgid "Add mount point"
-msgstr ""
+msgstr "Thêm điểm lắp"
 
 #: templates/settings.php:54 templates/settings.php:62
 msgid "None set"
-msgstr ""
+msgstr "không"
 
 #: templates/settings.php:63
 msgid "All Users"
-msgstr ""
+msgstr "Tất cả người dùng"
 
 #: templates/settings.php:64
 msgid "Groups"
-msgstr ""
+msgstr "Nhóm"
 
 #: templates/settings.php:69
 msgid "Users"
-msgstr ""
+msgstr "Người dùng"
 
 #: templates/settings.php:77 templates/settings.php:96
 msgid "Delete"
-msgstr ""
+msgstr "Xóa"
 
 #: templates/settings.php:88
 msgid "SSL root certificates"
-msgstr ""
+msgstr "Chứng chỉ SSL root"
 
 #: templates/settings.php:102
 msgid "Import Root Certificate"
-msgstr ""
+msgstr "Nhập Root Certificate"
 
 #: templates/settings.php:108
 msgid "Enable User External Storage"
-msgstr ""
+msgstr "Kích hoạt tính năng lưu trữ ngoài"
 
 #: templates/settings.php:109
 msgid "Allow users to mount their own external storage"
-msgstr ""
+msgstr "Cho phép người dùng kết nối với lưu trữ riêng bên ngoài của họ"
diff --git a/l10n/vi/files_sharing.po b/l10n/vi/files_sharing.po
index a3aaf62a3e..fd39b546fd 100644
--- a/l10n/vi/files_sharing.po
+++ b/l10n/vi/files_sharing.po
@@ -3,36 +3,37 @@
 # 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-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:04+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-08 02:02+0200\n"
+"PO-Revision-Date: 2012-09-07 14:58+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"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: templates/authenticate.php:4
 msgid "Password"
-msgstr ""
+msgstr "Mật khẩu"
 
 #: templates/authenticate.php:6
 msgid "Submit"
-msgstr ""
+msgstr "Xác nhận"
 
 #: templates/public.php:9 templates/public.php:19
 msgid "Download"
-msgstr ""
+msgstr "Tải về"
 
 #: templates/public.php:18
 msgid "No preview available for"
-msgstr ""
+msgstr "Không có xem trước cho"
 
-#: templates/public.php:23
+#: templates/public.php:25
 msgid "web services under your control"
-msgstr ""
+msgstr "dịch vụ web dưới sự kiểm soát của bạn"
diff --git a/l10n/vi/files_versions.po b/l10n/vi/files_versions.po
index 54f38f2812..9a03e55a3b 100644
--- a/l10n/vi/files_versions.po
+++ b/l10n/vi/files_versions.po
@@ -3,32 +3,33 @@
 # 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-09-01 13:35+0200\n"
-"PO-Revision-Date: 2012-09-01 11:35+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-08 02:02+0200\n"
+"PO-Revision-Date: 2012-09-07 14:50+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"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: js/settings-personal.js:31 templates/settings-personal.php:10
 msgid "Expire all versions"
-msgstr ""
+msgstr "Hết hạn tất cả các phiên bản"
 
 #: templates/settings-personal.php:4
 msgid "Versions"
-msgstr ""
+msgstr "Phiên bản"
 
 #: templates/settings-personal.php:7
 msgid "This will delete all existing backup versions of your files"
-msgstr ""
+msgstr "Điều này sẽ xóa tất cả các phiên bản sao lưu hiện có "
 
 #: templates/settings.php:3
 msgid "Enable Files Versioning"
-msgstr ""
+msgstr "BẬT tập tin phiên bản"
diff --git a/l10n/vi/lib.po b/l10n/vi/lib.po
index 966ae22706..23d2427771 100644
--- a/l10n/vi/lib.po
+++ b/l10n/vi/lib.po
@@ -3,123 +3,124 @@
 # 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-09-01 02:01+0200\n"
-"PO-Revision-Date: 2012-09-01 00:02+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-08 02:02+0200\n"
+"PO-Revision-Date: 2012-09-07 14:09+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"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: app.php:288
+#: app.php:285
 msgid "Help"
-msgstr ""
+msgstr "Giúp đỡ"
 
-#: app.php:295
+#: app.php:292
 msgid "Personal"
-msgstr ""
+msgstr "Cá nhân"
 
-#: app.php:300
+#: app.php:297
 msgid "Settings"
-msgstr ""
+msgstr "Cài đặt"
 
-#: app.php:305
+#: app.php:302
 msgid "Users"
-msgstr ""
+msgstr "Người dùng"
 
-#: app.php:312
+#: app.php:309
 msgid "Apps"
-msgstr ""
+msgstr "Ứng dụng"
 
-#: app.php:314
+#: app.php:311
 msgid "Admin"
-msgstr ""
+msgstr "Quản trị"
 
 #: files.php:280
 msgid "ZIP download is turned off."
-msgstr ""
+msgstr "Tải về ZIP đã bị tắt."
 
 #: files.php:281
 msgid "Files need to be downloaded one by one."
-msgstr ""
+msgstr "Tập tin cần phải được tải về từng người một."
 
 #: files.php:281 files.php:306
 msgid "Back to Files"
-msgstr ""
+msgstr "Trở lại tập tin"
 
 #: files.php:305
 msgid "Selected files too large to generate zip file."
-msgstr ""
+msgstr "Tập tin được chọn quá lớn để tạo tập tin ZIP."
 
 #: json.php:28
 msgid "Application is not enabled"
-msgstr ""
+msgstr "Ứng dụng không được BẬT"
 
 #: json.php:39 json.php:63 json.php:75
 msgid "Authentication error"
-msgstr ""
+msgstr "Lỗi xác thực"
 
 #: json.php:51
 msgid "Token expired. Please reload page."
-msgstr ""
-
-#: template.php:86
-msgid "seconds ago"
-msgstr ""
+msgstr "Mã Token đã hết hạn. Hãy tải lại trang."
 
 #: template.php:87
-msgid "1 minute ago"
-msgstr ""
+msgid "seconds ago"
+msgstr "1 giây trước"
 
 #: template.php:88
+msgid "1 minute ago"
+msgstr "1 phút trước"
+
+#: template.php:89
 #, php-format
 msgid "%d minutes ago"
-msgstr ""
-
-#: template.php:91
-msgid "today"
-msgstr ""
+msgstr "%d phút trước"
 
 #: template.php:92
-msgid "yesterday"
-msgstr ""
+msgid "today"
+msgstr "hôm nay"
 
 #: template.php:93
-#, php-format
-msgid "%d days ago"
-msgstr ""
+msgid "yesterday"
+msgstr "hôm qua"
 
 #: template.php:94
-msgid "last month"
-msgstr ""
+#, php-format
+msgid "%d days ago"
+msgstr "%d ngày trước"
 
 #: template.php:95
-msgid "months ago"
-msgstr ""
+msgid "last month"
+msgstr "tháng trước"
 
 #: template.php:96
-msgid "last year"
-msgstr ""
+msgid "months ago"
+msgstr "tháng trước"
 
 #: template.php:97
+msgid "last year"
+msgstr "năm trước"
+
+#: template.php:98
 msgid "years ago"
-msgstr ""
+msgstr "năm trước"
 
 #: updater.php:66
 #, php-format
 msgid "%s is available. Get <a href=\"%s\">more information</a>"
-msgstr ""
+msgstr "%s có sẵn.  <a href=\"%s\">xem thêm ở đây</a>"
 
 #: updater.php:68
 msgid "up to date"
-msgstr ""
+msgstr "đến ngày"
 
 #: updater.php:71
 msgid "updates check is disabled"
-msgstr ""
+msgstr "đã TĂT chức năng cập nhật "
diff --git a/l10n/vi/settings.po b/l10n/vi/settings.po
index b8c57b3723..12a6254703 100644
--- a/l10n/vi/settings.po
+++ b/l10n/vi/settings.po
@@ -3,6 +3,7 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <mattheu_9x@yahoo.com>, 2012.
 # Son Nguyen <sonnghit@gmail.com>, 2012.
 # Sơn Nguyễn <sonnghit@gmail.com>, 2012.
 #   <vlinhd11@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-09-05 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-08 02:02+0200\n"
+"PO-Revision-Date: 2012-09-07 16:01+0000\n"
+"Last-Translator: mattheu_9x <mattheu_9x@yahoo.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"
@@ -31,11 +32,11 @@ msgstr "Lỗi xác thực"
 
 #: ajax/creategroup.php:19
 msgid "Group already exists"
-msgstr ""
+msgstr "Nhóm đã tồn tại"
 
 #: ajax/creategroup.php:28
 msgid "Unable to add group"
-msgstr ""
+msgstr "Không thể thêm nhóm"
 
 #: ajax/lostpassword.php:14
 msgid "Email saved"
@@ -55,11 +56,11 @@ msgstr "Yêu cầu không hợp lệ"
 
 #: ajax/removegroup.php:16
 msgid "Unable to delete group"
-msgstr ""
+msgstr "Không thể xóa nhóm"
 
 #: ajax/removeuser.php:22
 msgid "Unable to delete user"
-msgstr ""
+msgstr "Không thể xóa người dùng"
 
 #: ajax/setlanguage.php:18
 msgid "Language changed"
@@ -68,12 +69,12 @@ msgstr "Ngôn ngữ đã được thay đổi"
 #: ajax/togglegroups.php:25
 #, php-format
 msgid "Unable to add user to group %s"
-msgstr ""
+msgstr "Không thể thêm người dùng vào nhóm %s"
 
 #: ajax/togglegroups.php:31
 #, php-format
 msgid "Unable to remove user from group %s"
-msgstr ""
+msgstr "Không thể xóa người dùng từ nhóm %s"
 
 #: js/apps.js:18
 msgid "Error"
@@ -106,59 +107,59 @@ msgid ""
 "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."
-msgstr ""
+msgstr "Thư mục dữ liệu và những tập tin của bạn có thể dễ dàng bị truy cập từ internet. Tập tin .htaccess của ownCloud cung cấp không hoạt động. Chúng tôi đề nghị bạn nên cấu hình lại máy chủ webserver của bạn để thư mục dữ liệu không  còn bị truy cập hoặc bạn di chuyển thư mục dữ liệu ra bên ngoài thư mục gốc của máy chủ."
 
 #: templates/admin.php:31
 msgid "Cron"
-msgstr ""
+msgstr "Cron"
 
 #: templates/admin.php:33
 msgid "execute one task with each page loaded"
-msgstr ""
+msgstr "Thực thi một nhiệm vụ với mỗi trang được nạp"
 
 #: templates/admin.php:35
 msgid "cron.php is registered at a webcron service"
-msgstr ""
+msgstr "cron.php đã được đăng ký ở một dịch vụ webcron"
 
 #: templates/admin.php:37
 msgid "use systems cron service"
-msgstr ""
+msgstr "sử dụng hệ thống dịch vụ cron"
 
 #: templates/admin.php:41
 msgid "Share API"
-msgstr ""
+msgstr "Chia sẻ API"
 
 #: templates/admin.php:46
 msgid "Enable Share API"
-msgstr ""
+msgstr "Bật chia sẻ API"
 
 #: templates/admin.php:47
 msgid "Allow apps to use the Share API"
-msgstr ""
+msgstr "Cho phép các ứng dụng sử dụng chia sẻ API"
 
 #: templates/admin.php:51
 msgid "Allow links"
-msgstr ""
+msgstr "Cho phép liên kết"
 
 #: templates/admin.php:52
 msgid "Allow users to share items to the public with links"
-msgstr ""
+msgstr "Cho phép người dùng chia sẻ công khai các mục bằng các liên kết"
 
 #: templates/admin.php:56
 msgid "Allow resharing"
-msgstr ""
+msgstr "Cho phép chia sẻ lại"
 
 #: templates/admin.php:57
 msgid "Allow users to share items shared with them again"
-msgstr ""
+msgstr "Cho phép người dùng chia sẻ lại những mục đã được chia sẻ"
 
 #: templates/admin.php:60
 msgid "Allow users to share with anyone"
-msgstr ""
+msgstr "Cho phép người dùng chia sẻ với bất cứ ai"
 
 #: templates/admin.php:62
 msgid "Allow users to only share with users in their groups"
-msgstr ""
+msgstr "Chỉ cho phép người dùng chia sẻ với những người dùng trong nhóm của họ"
 
 #: templates/admin.php:69
 msgid "Log"
@@ -176,7 +177,7 @@ msgid ""
 "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>."
-msgstr ""
+msgstr "Được phát triển bởi <a href=\"http://ownCloud.org/contact\" target=\"_blank\">cộng đồng ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">mã nguồn </a> đã được cấp phép theo chuẩn <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
 
 #: templates/apps.php:10
 msgid "Add your App"
@@ -192,7 +193,7 @@ msgstr "Xem ứng dụng tại apps.owncloud.com"
 
 #: templates/apps.php:30
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
-msgstr ""
+msgstr "<span class=\"licence\"></span>-Giấy phép được cấp bởi  <span class=\"author\"></span>"
 
 #: templates/help.php:9
 msgid "Documentation"
@@ -308,7 +309,7 @@ msgstr "Khác"
 
 #: templates/users.php:80 templates/users.php:112
 msgid "Group Admin"
-msgstr ""
+msgstr "Nhóm quản trị"
 
 #: templates/users.php:82
 msgid "Quota"
diff --git a/l10n/zh_CN.GB2312/files.po b/l10n/zh_CN.GB2312/files.po
index 3224b4b01d..27fb4d0b39 100644
--- a/l10n/zh_CN.GB2312/files.po
+++ b/l10n/zh_CN.GB2312/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-09-06 02:01+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-08 02:01+0200\n"
+"PO-Revision-Date: 2012-09-08 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"
@@ -52,7 +52,11 @@ msgstr "写磁盘失败"
 msgid "Files"
 msgstr "文件"
 
-#: js/fileactions.js:106 templates/index.php:56
+#: js/fileactions.js:108 templates/index.php:62
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:110 templates/index.php:64
 msgid "Delete"
 msgstr "删除"
 
@@ -76,7 +80,7 @@ msgstr "取消"
 msgid "replaced"
 msgstr "替换过了"
 
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:268 js/filelist.js:270
 msgid "undo"
 msgstr "撤销"
 
@@ -84,7 +88,11 @@ msgstr "撤销"
 msgid "with"
 msgstr "随着"
 
-#: js/filelist.js:271
+#: js/filelist.js:268
+msgid "unshared"
+msgstr ""
+
+#: js/filelist.js:270
 msgid "deleted"
 msgstr "删除"
 
@@ -117,11 +125,11 @@ msgstr ""
 msgid "Invalid name, '/' is not allowed."
 msgstr "非法文件名,\"/\"是不被许可的"
 
-#: js/files.js:746 templates/index.php:55
+#: js/files.js:746 templates/index.php:56
 msgid "Size"
 msgstr "大小"
 
-#: js/files.js:747 templates/index.php:56
+#: js/files.js:747 templates/index.php:58
 msgid "Modified"
 msgstr "修改日期"
 
@@ -197,36 +205,36 @@ msgstr "上传"
 msgid "Cancel upload"
 msgstr "取消上传"
 
-#: templates/index.php:39
+#: templates/index.php:40
 msgid "Nothing in here. Upload something!"
 msgstr "这里没有东西.上传点什么!"
 
-#: templates/index.php:47
+#: templates/index.php:48
 msgid "Name"
 msgstr "名字"
 
-#: templates/index.php:49
+#: templates/index.php:50
 msgid "Share"
 msgstr "分享"
 
-#: templates/index.php:51
+#: templates/index.php:52
 msgid "Download"
 msgstr "下载"
 
-#: templates/index.php:64
+#: templates/index.php:75
 msgid "Upload too large"
 msgstr "上传的文件太大了"
 
-#: templates/index.php:66
+#: templates/index.php:77
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "你正在试图上传的文件超过了此服务器支持的最大的文件大小."
 
-#: templates/index.php:71
+#: templates/index.php:82
 msgid "Files are being scanned, please wait."
 msgstr "正在扫描文件,请稍候."
 
-#: templates/index.php:74
+#: templates/index.php:85
 msgid "Current scanning"
 msgstr "正在扫描"
diff --git a/l10n/zh_CN/files.po b/l10n/zh_CN/files.po
index 585310a408..a7489a4246 100644
--- a/l10n/zh_CN/files.po
+++ b/l10n/zh_CN/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-09-07 02:04+0200\n"
-"PO-Revision-Date: 2012-09-06 07:31+0000\n"
-"Last-Translator: hanfeng <appweb.cn@gmail.com>\n"
+"POT-Creation-Date: 2012-09-08 02:01+0200\n"
+"PO-Revision-Date: 2012-09-08 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"
@@ -54,7 +54,11 @@ msgstr "写入磁盘失败"
 msgid "Files"
 msgstr "文件"
 
-#: js/fileactions.js:106 templates/index.php:57
+#: js/fileactions.js:108 templates/index.php:62
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:110 templates/index.php:64
 msgid "Delete"
 msgstr "删除"
 
@@ -78,7 +82,7 @@ msgstr "取消"
 msgid "replaced"
 msgstr "已经替换"
 
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:266
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:268 js/filelist.js:270
 msgid "undo"
 msgstr "撤销"
 
@@ -86,7 +90,11 @@ msgstr "撤销"
 msgid "with"
 msgstr "随着"
 
-#: js/filelist.js:266
+#: js/filelist.js:268
+msgid "unshared"
+msgstr ""
+
+#: js/filelist.js:270
 msgid "deleted"
 msgstr "已经删除"
 
@@ -123,7 +131,7 @@ msgstr "非法的名称，不允许使用‘/’。"
 msgid "Size"
 msgstr "大小"
 
-#: js/files.js:747 templates/index.php:57
+#: js/files.js:747 templates/index.php:58
 msgid "Modified"
 msgstr "修改日期"
 
@@ -215,20 +223,20 @@ msgstr "共享"
 msgid "Download"
 msgstr "下载"
 
-#: templates/index.php:65
+#: templates/index.php:75
 msgid "Upload too large"
 msgstr "上传文件过大"
 
-#: templates/index.php:67
+#: templates/index.php:77
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "您正尝试上传的文件超过了此服务器可以上传的最大大小"
 
-#: templates/index.php:72
+#: templates/index.php:82
 msgid "Files are being scanned, please wait."
 msgstr "文件正在被扫描，请稍候。"
 
-#: templates/index.php:75
+#: templates/index.php:85
 msgid "Current scanning"
 msgstr "当前扫描"
diff --git a/l10n/zh_CN/files_encryption.po b/l10n/zh_CN/files_encryption.po
index 7e030749cf..502f4e08a6 100644
--- a/l10n/zh_CN/files_encryption.po
+++ b/l10n/zh_CN/files_encryption.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-09-07 02:04+0200\n"
-"PO-Revision-Date: 2012-09-06 15:39+0000\n"
+"POT-Creation-Date: 2012-09-08 02:01+0200\n"
+"PO-Revision-Date: 2012-09-07 09:38+0000\n"
 "Last-Translator: hanfeng <appweb.cn@gmail.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/owncloud/language/zh_CN/)\n"
 "MIME-Version: 1.0\n"
@@ -24,7 +24,7 @@ msgstr "加密"
 
 #: templates/settings.php:4
 msgid "Exclude the following file types from encryption"
-msgstr ""
+msgstr "从加密中排除列出的文件类型"
 
 #: templates/settings.php:5
 msgid "None"
diff --git a/l10n/zh_TW/files.po b/l10n/zh_TW/files.po
index ac4a772abd..b4564768b7 100644
--- a/l10n/zh_TW/files.po
+++ b/l10n/zh_TW/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-09-06 02:01+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
+"POT-Creation-Date: 2012-09-08 02:01+0200\n"
+"PO-Revision-Date: 2012-09-08 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"
@@ -54,7 +54,11 @@ msgstr "寫入硬碟失敗"
 msgid "Files"
 msgstr "檔案"
 
-#: js/fileactions.js:106 templates/index.php:56
+#: js/fileactions.js:108 templates/index.php:62
+msgid "Unshare"
+msgstr ""
+
+#: js/fileactions.js:110 templates/index.php:64
 msgid "Delete"
 msgstr "刪除"
 
@@ -78,7 +82,7 @@ msgstr "取消"
 msgid "replaced"
 msgstr ""
 
-#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:271
+#: js/filelist.js:235 js/filelist.js:237 js/filelist.js:268 js/filelist.js:270
 msgid "undo"
 msgstr ""
 
@@ -86,7 +90,11 @@ msgstr ""
 msgid "with"
 msgstr ""
 
-#: js/filelist.js:271
+#: js/filelist.js:268
+msgid "unshared"
+msgstr ""
+
+#: js/filelist.js:270
 msgid "deleted"
 msgstr ""
 
@@ -119,11 +127,11 @@ msgstr "檔案上傳中. 離開此頁面將會取消上傳."
 msgid "Invalid name, '/' is not allowed."
 msgstr "無效的名稱, '/'是不被允許的"
 
-#: js/files.js:746 templates/index.php:55
+#: js/files.js:746 templates/index.php:56
 msgid "Size"
 msgstr "大小"
 
-#: js/files.js:747 templates/index.php:56
+#: js/files.js:747 templates/index.php:58
 msgid "Modified"
 msgstr "修改"
 
@@ -199,36 +207,36 @@ msgstr "上傳"
 msgid "Cancel upload"
 msgstr "取消上傳"
 
-#: templates/index.php:39
+#: templates/index.php:40
 msgid "Nothing in here. Upload something!"
 msgstr "沒有任何東西。請上傳內容!"
 
-#: templates/index.php:47
+#: templates/index.php:48
 msgid "Name"
 msgstr "名稱"
 
-#: templates/index.php:49
+#: templates/index.php:50
 msgid "Share"
 msgstr "分享"
 
-#: templates/index.php:51
+#: templates/index.php:52
 msgid "Download"
 msgstr "下載"
 
-#: templates/index.php:64
+#: templates/index.php:75
 msgid "Upload too large"
 msgstr "上傳過大"
 
-#: templates/index.php:66
+#: templates/index.php:77
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
 msgstr "你試圖上傳的檔案已超過伺服器的最大容量限制。　"
 
-#: templates/index.php:71
+#: templates/index.php:82
 msgid "Files are being scanned, please wait."
 msgstr "正在掃描檔案，請稍等。"
 
-#: templates/index.php:74
+#: templates/index.php:85
 msgid "Current scanning"
 msgstr "目前掃描"
diff --git a/lib/l10n/ru.php b/lib/l10n/ru.php
index 3b2681ba8d..74425f0e13 100644
--- a/lib/l10n/ru.php
+++ b/lib/l10n/ru.php
@@ -22,5 +22,7 @@
 "months ago" => "месяцы назад",
 "last year" => "в прошлом году",
 "years ago" => "годы назад",
+"%s is available. Get <a href=\"%s\">more information</a>" => "Возможно обновление до %s. <a href=\"%s\">Подробнее</a>",
+"up to date" => "актуальная версия",
 "updates check is disabled" => "проверка обновлений отключена"
 );
diff --git a/lib/l10n/vi.php b/lib/l10n/vi.php
new file mode 100644
index 0000000000..fc41d69819
--- /dev/null
+++ b/lib/l10n/vi.php
@@ -0,0 +1,28 @@
+<?php $TRANSLATIONS = array(
+"Help" => "Giúp đỡ",
+"Personal" => "Cá nhân",
+"Settings" => "Cài đặt",
+"Users" => "Người dùng",
+"Apps" => "Ứng dụng",
+"Admin" => "Quản trị",
+"ZIP download is turned off." => "Tải về ZIP đã bị tắt.",
+"Files need to be downloaded one by one." => "Tập tin cần phải được tải về từng người một.",
+"Back to Files" => "Trở lại tập tin",
+"Selected files too large to generate zip file." => "Tập tin được chọn quá lớn để tạo tập tin ZIP.",
+"Application is not enabled" => "Ứng dụng không được BẬT",
+"Authentication error" => "Lỗi xác thực",
+"Token expired. Please reload page." => "Mã Token đã hết hạn. Hãy tải lại trang.",
+"seconds ago" => "1 giây trước",
+"1 minute ago" => "1 phút trước",
+"%d minutes ago" => "%d phút trước",
+"today" => "hôm nay",
+"yesterday" => "hôm qua",
+"%d days ago" => "%d ngày trước",
+"last month" => "tháng trước",
+"months ago" => "tháng trước",
+"last year" => "năm trước",
+"years ago" => "năm trước",
+"%s is available. Get <a href=\"%s\">more information</a>" => "%s có sẵn.  <a href=\"%s\">xem thêm ở đây</a>",
+"up to date" => "đến ngày",
+"updates check is disabled" => "đã TĂT chức năng cập nhật "
+);
diff --git a/settings/l10n/eu.php b/settings/l10n/eu.php
index 4c95c7e471..a30382f030 100644
--- a/settings/l10n/eu.php
+++ b/settings/l10n/eu.php
@@ -1,11 +1,17 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Ezin izan da App Dendatik zerrenda kargatu",
 "Authentication error" => "Autentifikazio errorea",
+"Group already exists" => "Taldea dagoeneko existitzenda",
+"Unable to add group" => "Ezin izan da taldea gehitu",
 "Email saved" => "Eposta gorde da",
 "Invalid email" => "Baliogabeko eposta",
 "OpenID Changed" => "OpenID aldatuta",
 "Invalid request" => "Baliogabeko eskaria",
+"Unable to delete group" => "Ezin izan da taldea ezabatu",
+"Unable to delete user" => "Ezin izan da erabiltzailea ezabatu",
 "Language changed" => "Hizkuntza aldatuta",
+"Unable to add user to group %s" => "Ezin izan da erabiltzailea %s taldera gehitu",
+"Unable to remove user from group %s" => "Ezin izan da erabiltzailea %s taldetik ezabatu",
 "Error" => "Errorea",
 "Disable" => "Ez-gaitu",
 "Enable" => "Gaitu",
@@ -32,6 +38,7 @@
 "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",
+"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-lizentziatua <span class=\"author\"></span>",
 "Documentation" => "Dokumentazioa",
 "Managing Big Files" => "Fitxategi handien kudeaketa",
 "Ask a question" => "Egin galdera bat",
diff --git a/settings/l10n/nl.php b/settings/l10n/nl.php
index 5957f6282f..8ac7b58a4c 100644
--- a/settings/l10n/nl.php
+++ b/settings/l10n/nl.php
@@ -18,6 +18,7 @@
 "Saving..." => "Aan het bewaren.....",
 "__language_name__" => "Nederlands",
 "Security Warning" => "Veiligheidswaarschuwing",
+"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." => "Uw data folder en uw bestanden zijn hoogst waarschijnlijk vanaf het internet bereikbaar.  Het .htaccess bestand dat ownCloud meelevert werkt niet.  Het is ten zeerste aangeraden om uw webserver zodanig te configureren, dat de data folder niet bereikbaar is vanaf het internet of verplaatst uw data folder naar een locatie buiten de webserver document root.",
 "Cron" => "Cron",
 "execute one task with each page loaded" => "Voer 1 taak uit bij elke geladen pagina",
 "cron.php is registered at a webcron service" => "cron.php is geregistreerd bij een webcron service",
diff --git a/settings/l10n/vi.php b/settings/l10n/vi.php
index 1cad2e148d..c410bb4c3d 100644
--- a/settings/l10n/vi.php
+++ b/settings/l10n/vi.php
@@ -1,22 +1,44 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Không thể tải danh sách ứng dụng từ App Store",
 "Authentication error" => "Lỗi xác thực",
+"Group already exists" => "Nhóm đã tồn tại",
+"Unable to add group" => "Không thể thêm nhóm",
 "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ệ",
+"Unable to delete group" => "Không thể xóa nhóm",
+"Unable to delete user" => "Không thể xóa người dùng",
 "Language changed" => "Ngôn ngữ đã được thay đổi",
+"Unable to add user to group %s" => "Không thể thêm người dùng vào nhóm %s",
+"Unable to remove user from group %s" => "Không thể xóa người dùng từ nhóm %s",
 "Error" => "Lỗi",
 "Disable" => "Vô hiệu",
 "Enable" => "Cho phép",
 "Saving..." => "Đang tiến hành lưu ...",
 "__language_name__" => "__Ngôn ngữ___",
 "Security Warning" => "Cảnh bảo bảo mật",
+"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." => "Thư mục dữ liệu và những tập tin của bạn có thể dễ dàng bị truy cập từ internet. Tập tin .htaccess của ownCloud cung cấp không hoạt động. Chúng tôi đề nghị bạn nên cấu hình lại máy chủ webserver của bạn để thư mục dữ liệu không  còn bị truy cập hoặc bạn di chuyển thư mục dữ liệu ra bên ngoài thư mục gốc của máy chủ.",
+"Cron" => "Cron",
+"execute one task with each page loaded" => "Thực thi một nhiệm vụ với mỗi trang được nạp",
+"cron.php is registered at a webcron service" => "cron.php đã được đăng ký ở một dịch vụ webcron",
+"use systems cron service" => "sử dụng hệ thống dịch vụ cron",
+"Share API" => "Chia sẻ API",
+"Enable Share API" => "Bật chia sẻ API",
+"Allow apps to use the Share API" => "Cho phép các ứng dụng sử dụng chia sẻ API",
+"Allow links" => "Cho phép liên kết",
+"Allow users to share items to the public with links" => "Cho phép người dùng chia sẻ công khai các mục bằng các liên kết",
+"Allow resharing" => "Cho phép chia sẻ lại",
+"Allow users to share items shared with them again" => "Cho phép người dùng chia sẻ lại những mục đã được chia sẻ",
+"Allow users to share with anyone" => "Cho phép người dùng chia sẻ với bất cứ ai",
+"Allow users to only share with users in their groups" => "Chỉ cho phép người dùng chia sẻ với những người dùng trong nhóm của họ",
 "Log" => "Log",
 "More" => "nhiều hơn",
+"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/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>." => "Được phát triển bởi <a href=\"http://ownCloud.org/contact\" target=\"_blank\">cộng đồng ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">mã nguồn </a> đã được cấp phép theo chuẩn <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "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",
+"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-Giấy phép được cấp bởi  <span class=\"author\"></span>",
 "Documentation" => "Tài liệu",
 "Managing Big Files" => "Quản lý tập tin lớn",
 "Ask a question" => "Đặt câu hỏi",
@@ -45,6 +67,7 @@
 "Create" => "Tạo",
 "Default Quota" => "Hạn ngạch mặt định",
 "Other" => "Khác",
+"Group Admin" => "Nhóm quản trị",
 "Quota" => "Hạn ngạch",
 "Delete" => "Xóa"
 );

From c692dfc1ab2d1267827c3e973ce126f6c0367297 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Sat, 8 Sep 2012 15:52:29 +0200
Subject: [PATCH 1157/1224] style fixes for public app api

---
 lib/public/app.php | 205 +++++++++++++++++++++------------------------
 1 file changed, 97 insertions(+), 108 deletions(-)

diff --git a/lib/public/app.php b/lib/public/app.php
index eb824f043e..acb401a1d3 100644
--- a/lib/public/app.php
+++ b/lib/public/app.php
@@ -34,120 +34,109 @@ 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 true; // don't do anything
-        }
+		/**
+		 * @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 true; // don't do anything
+		}
 
-        /**
-         * @brief adds an entry to the navigation
-         * @param $data array containing the data
-         * @returns true/false
-         *
-         * This function adds a new entry to the navigation visible to users. $data
-         * is an associative array.
-         * The following keys are required:
-         *   - id: unique id for this entry ('addressbook_index')
-         *   - href: link to the page
-         *   - name: Human readable name ('Addressbook')
-         *
-         * The following keys are optional:
-         *   - icon: path to the icon of the app
-         *   - order: integer, that influences the position of your application in
-         *     the navigation. Lower values come first.
-         */
-        public static function addNavigationEntry( $data ) {
-		return \OC_App::addNavigationEntry( $data );
-	}
+		/**
+		 * @brief adds an entry to the navigation
+		 * @param $data array containing the data
+		 * @returns true/false
+		 *
+		 * This function adds a new entry to the navigation visible to users. $data
+		 * is an associative array.
+		 * The following keys are required:
+		 *   - id: unique id for this entry ('addressbook_index')
+		 *   - href: link to the page
+		 *   - name: Human readable name ('Addressbook')
+		 *
+		 * The following keys are optional:
+		 *   - icon: path to the icon of the app
+		 *   - order: integer, that influences the position of your application in
+		 *	 the navigation. Lower values come first.
+		 */
+		public static function addNavigationEntry( $data ) {
+			return \OC_App::addNavigationEntry( $data );
+		}
 
+		/**
+		 * @brief marks a navigation entry as active
+		 * @param $id id of the entry
+		 * @returns true/false
+		 *
+		 * This function sets a navigation entry as active and removes the 'active'
+		 * property from all other entries. The templates can use this for
+		 * highlighting the current position of the user.
+		 */
+		public static function setActiveNavigationEntry( $id ) {
+			return \OC_App::setActiveNavigationEntry( $id );
+		}
 
-        /**
-         * @brief marks a navigation entry as active
-         * @param $id id of the entry
-         * @returns true/false
-         *
-         * This function sets a navigation entry as active and removes the 'active'
-         * property from all other entries. The templates can use this for
-         * highlighting the current position of the user.
-         */
-        public static function setActiveNavigationEntry( $id ) {
-		return \OC_App::setActiveNavigationEntry( $id );
-	}
+		/**
+		 * @brief Register a Configuration Screen that should appear in the personal settings section.
+		 * @param $app string appid
+		 * @param $page string page to be included
+		*/
+		public static function registerPersonal( $app, $page ) {
+			return \OC_App::registerPersonal( $app, $page );
+		}
 
+		/**
+		 * @brief Register a Configuration Screen that should appear in the Admin section.
+		 * @param $app string appid
+		 * @param $page string page to be included
+		 */
+		public static function registerAdmin( $app, $page ) {
+			return \OC_App::registerAdmin( $app, $page );
+		}
 
-        /**
-         * @brief Register a Configuration Screen that should appear in the personal settings section.
-         * @param $app string appid
-         * @param $page string page to be included
-        */
-        public static function registerPersonal( $app, $page ) {
-		return \OC_App::registerPersonal( $app, $page );
-	}
-
-
-	/**
-         * @brief Register a Configuration Screen that should appear in the Admin section.
-         * @param $app string appid
-         * @param $page string page to be included
-	 */
-	public static function registerAdmin( $app, $page ) {
-		return \OC_App::registerAdmin( $app, $page );
-	}
-
-
-        /**
-         * @brief Read app metadata from the info.xml file
-         * @param string $app id of the app or the path of the info.xml file
-         * @param boolean path (optional)
-         * @returns array
-        */
-        public static function getAppInfo( $app, $path=false ) {
-		return \OC_App::getAppInfo( $app, $path);
-	}
-
-
-
-        /**
-         * @brief checks whether or not an app is enabled
-         * @param $app app
-         * @returns true/false
-         *
-         * This function checks whether or not an app is enabled.
-         */
-        public static function isEnabled( $app ) {
-		return \OC_App::isEnabled( $app );
-	}
-
-
-        /**
-         * @brief Check if the app is enabled, redirects to home if not
-         * @param $app app
-         * @returns true/false
-        */
-        public static function checkAppEnabled( $app ) {
-                return \OC_Util::checkAppEnabled( $app );
-        }
-
-
-        /**
-         * @brief Get the last version of the app, either from appinfo/version or from appinfo/info.xml
-         * @param $app app
-         * @returns true/false
-         */
-        public static function getAppVersion( $app ) {
-		return \OC_App::getAppVersion( $app );
-	}
+		/**
+		 * @brief Read app metadata from the info.xml file
+		 * @param string $app id of the app or the path of the info.xml file
+		 * @param boolean path (optional)
+		 * @returns array
+		*/
+		public static function getAppInfo( $app, $path=false ) {
+			return \OC_App::getAppInfo( $app, $path);
+		}
 
+		/**
+		 * @brief checks whether or not an app is enabled
+		 * @param $app app
+		 * @returns true/false
+		 *
+		 * This function checks whether or not an app is enabled.
+		 */
+		public static function isEnabled( $app ) {
+			return \OC_App::isEnabled( $app );
+		}
 
+		/**
+		 * @brief Check if the app is enabled, redirects to home if not
+		 * @param $app app
+		 * @returns true/false
+		*/
+		public static function checkAppEnabled( $app ) {
+			return \OC_Util::checkAppEnabled( $app );
+		}
 
+		/**
+		 * @brief Get the last version of the app, either from appinfo/version or from appinfo/info.xml
+		 * @param $app app
+		 * @returns true/false
+		 */
+		public static function getAppVersion( $app ) {
+			return \OC_App::getAppVersion( $app );
+		}
 }

From eca24f74f74ad3a76c7900d8267d01f616696a5b Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Sat, 8 Sep 2012 15:54:30 +0200
Subject: [PATCH 1158/1224] style fixes for public app api

---
 lib/public/app.php | 194 ++++++++++++++++++++++-----------------------
 1 file changed, 97 insertions(+), 97 deletions(-)

diff --git a/lib/public/app.php b/lib/public/app.php
index acb401a1d3..809a656f17 100644
--- a/lib/public/app.php
+++ b/lib/public/app.php
@@ -34,109 +34,109 @@ 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 true; // don't do anything
-		}
+	/**
+	 * @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 true; // don't do anything
+	}
 
-		/**
-		 * @brief adds an entry to the navigation
-		 * @param $data array containing the data
-		 * @returns true/false
-		 *
-		 * This function adds a new entry to the navigation visible to users. $data
-		 * is an associative array.
-		 * The following keys are required:
-		 *   - id: unique id for this entry ('addressbook_index')
-		 *   - href: link to the page
-		 *   - name: Human readable name ('Addressbook')
-		 *
-		 * The following keys are optional:
-		 *   - icon: path to the icon of the app
-		 *   - order: integer, that influences the position of your application in
-		 *	 the navigation. Lower values come first.
-		 */
-		public static function addNavigationEntry( $data ) {
-			return \OC_App::addNavigationEntry( $data );
-		}
+	/**
+	 * @brief adds an entry to the navigation
+	 * @param $data array containing the data
+	 * @returns true/false
+	 *
+	 * This function adds a new entry to the navigation visible to users. $data
+	 * is an associative array.
+	 * The following keys are required:
+	 *   - id: unique id for this entry ('addressbook_index')
+	 *   - href: link to the page
+	 *   - name: Human readable name ('Addressbook')
+	 *
+	 * The following keys are optional:
+	 *   - icon: path to the icon of the app
+	 *   - order: integer, that influences the position of your application in
+	 *	 the navigation. Lower values come first.
+	 */
+	public static function addNavigationEntry( $data ) {
+		return \OC_App::addNavigationEntry( $data );
+	}
 
-		/**
-		 * @brief marks a navigation entry as active
-		 * @param $id id of the entry
-		 * @returns true/false
-		 *
-		 * This function sets a navigation entry as active and removes the 'active'
-		 * property from all other entries. The templates can use this for
-		 * highlighting the current position of the user.
-		 */
-		public static function setActiveNavigationEntry( $id ) {
-			return \OC_App::setActiveNavigationEntry( $id );
-		}
+	/**
+	 * @brief marks a navigation entry as active
+	 * @param $id id of the entry
+	 * @returns true/false
+	 *
+	 * This function sets a navigation entry as active and removes the 'active'
+	 * property from all other entries. The templates can use this for
+	 * highlighting the current position of the user.
+	 */
+	public static function setActiveNavigationEntry( $id ) {
+		return \OC_App::setActiveNavigationEntry( $id );
+	}
 
-		/**
-		 * @brief Register a Configuration Screen that should appear in the personal settings section.
-		 * @param $app string appid
-		 * @param $page string page to be included
-		*/
-		public static function registerPersonal( $app, $page ) {
-			return \OC_App::registerPersonal( $app, $page );
-		}
+	/**
+	 * @brief Register a Configuration Screen that should appear in the personal settings section.
+	 * @param $app string appid
+	 * @param $page string page to be included
+	*/
+	public static function registerPersonal( $app, $page ) {
+		return \OC_App::registerPersonal( $app, $page );
+	}
 
-		/**
-		 * @brief Register a Configuration Screen that should appear in the Admin section.
-		 * @param $app string appid
-		 * @param $page string page to be included
-		 */
-		public static function registerAdmin( $app, $page ) {
-			return \OC_App::registerAdmin( $app, $page );
-		}
+	/**
+	 * @brief Register a Configuration Screen that should appear in the Admin section.
+	 * @param $app string appid
+	 * @param $page string page to be included
+	 */
+	public static function registerAdmin( $app, $page ) {
+		return \OC_App::registerAdmin( $app, $page );
+	}
 
-		/**
-		 * @brief Read app metadata from the info.xml file
-		 * @param string $app id of the app or the path of the info.xml file
-		 * @param boolean path (optional)
-		 * @returns array
-		*/
-		public static function getAppInfo( $app, $path=false ) {
-			return \OC_App::getAppInfo( $app, $path);
-		}
+	/**
+	 * @brief Read app metadata from the info.xml file
+	 * @param string $app id of the app or the path of the info.xml file
+	 * @param boolean path (optional)
+	 * @returns array
+	*/
+	public static function getAppInfo( $app, $path=false ) {
+		return \OC_App::getAppInfo( $app, $path);
+	}
 
-		/**
-		 * @brief checks whether or not an app is enabled
-		 * @param $app app
-		 * @returns true/false
-		 *
-		 * This function checks whether or not an app is enabled.
-		 */
-		public static function isEnabled( $app ) {
-			return \OC_App::isEnabled( $app );
-		}
+	/**
+	 * @brief checks whether or not an app is enabled
+	 * @param $app app
+	 * @returns true/false
+	 *
+	 * This function checks whether or not an app is enabled.
+	 */
+	public static function isEnabled( $app ) {
+		return \OC_App::isEnabled( $app );
+	}
 
-		/**
-		 * @brief Check if the app is enabled, redirects to home if not
-		 * @param $app app
-		 * @returns true/false
-		*/
-		public static function checkAppEnabled( $app ) {
-			return \OC_Util::checkAppEnabled( $app );
-		}
+	/**
+	 * @brief Check if the app is enabled, redirects to home if not
+	 * @param $app app
+	 * @returns true/false
+	*/
+	public static function checkAppEnabled( $app ) {
+		return \OC_Util::checkAppEnabled( $app );
+	}
 
-		/**
-		 * @brief Get the last version of the app, either from appinfo/version or from appinfo/info.xml
-		 * @param $app app
-		 * @returns true/false
-		 */
-		public static function getAppVersion( $app ) {
-			return \OC_App::getAppVersion( $app );
-		}
+	/**
+	 * @brief Get the last version of the app, either from appinfo/version or from appinfo/info.xml
+	 * @param $app app
+	 * @returns true/false
+	 */
+	public static function getAppVersion( $app ) {
+		return \OC_App::getAppVersion( $app );
+	}
 }

From 221257d2fbe5b0f6f440ef5ba38a7562e37eaf1a Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Sat, 8 Sep 2012 15:58:28 +0200
Subject: [PATCH 1159/1224] style fixes for public config api

---
 lib/public/config.php | 103 ++++++++++++++++++------------------------
 1 file changed, 45 insertions(+), 58 deletions(-)

diff --git a/lib/public/config.php b/lib/public/config.php
index fa9658e728..377150115f 100644
--- a/lib/public/config.php
+++ b/lib/public/config.php
@@ -38,8 +38,6 @@ namespace OCP;
  * This class provides functions to read and write configuration data. configuration can be on a system, application or user level
  */
 class Config {
-
-
 	/**
 	 * @brief Gets a value from config.php
 	 * @param $key key
@@ -53,7 +51,6 @@ class Config {
 		return(\OC_Config::getValue( $key, $default ));
 	}
 
-
 	/**
 	 * @brief Sets a value
 	 * @param $key key
@@ -67,70 +64,60 @@ class Config {
 		return(\OC_Config::setValue( $key, $value ));
 	}
 
-
-        /**
-         * @brief Gets the config value
-         * @param $app app
-         * @param $key key
-         * @param $default = null, default value if the key does not exist
-         * @returns the value or $default
-         *
-         * This function gets a value from the appconfig table. If the key does
-         * not exist the default value will be returnes
-         */
-        public static function getAppValue( $app, $key, $default = null ) {
+	/**
+	 * @brief Gets the config value
+	 * @param $app app
+	 * @param $key key
+	 * @param $default = null, default value if the key does not exist
+	 * @returns the value or $default
+	 *
+	 * This function gets a value from the appconfig table. If the key does
+	 * not exist the default value will be returnes
+	 */
+	public static function getAppValue( $app, $key, $default = null ) {
 		return(\OC_Appconfig::getValue( $app, $key, $default ));
 	}
 
-
-        /**
-         * @brief sets a value in the appconfig
-         * @param $app app
-         * @param $key key
-         * @param $value value
-         * @returns true/false
-         *
-         * Sets a value. If the key did not exist before it will be created.
-         */
-        public static function setAppValue( $app, $key, $value ) {
+	/**
+	 * @brief sets a value in the appconfig
+	 * @param $app app
+	 * @param $key key
+	 * @param $value value
+	 * @returns true/false
+	 *
+	 * Sets a value. If the key did not exist before it will be created.
+	 */
+	public static function setAppValue( $app, $key, $value ) {
 		return(\OC_Appconfig::setValue( $app, $key, $value ));
 	}
 
-
-        /**
-         * @brief Gets the preference
-         * @param $user user
-         * @param $app app
-         * @param $key key
-         * @param $default = null, default value if the key does not exist
-         * @returns the value or $default
-         *
-         * This function gets a value from the prefernces table. If the key does
-         * not exist the default value will be returnes
-         */
-        public static function getUserValue( $user, $app, $key, $default = null ) {
+	/**
+	 * @brief Gets the preference
+	 * @param $user user
+	 * @param $app app
+	 * @param $key key
+	 * @param $default = null, default value if the key does not exist
+	 * @returns the value or $default
+	 *
+	 * This function gets a value from the prefernces table. If the key does
+	 * not exist the default value will be returnes
+	 */
+	public static function getUserValue( $user, $app, $key, $default = null ) {
 		return(\OC_Preferences::getValue( $user, $app, $key, $default ));
 	}
 
-
-        /**
-         * @brief sets a value in the preferences
-         * @param $user user
-         * @param $app app
-         * @param $key key
-         * @param $value value
-         * @returns true/false
-         *
-         * Adds a value to the preferences. If the key did not exist before, it
-         * will be added automagically.
-         */
-        public static function setUserValue( $user, $app, $key, $value ) {
+	/**
+	 * @brief sets a value in the preferences
+	 * @param $user user
+	 * @param $app app
+	 * @param $key key
+	 * @param $value value
+	 * @returns true/false
+	 *
+	 * Adds a value to the preferences. If the key did not exist before, it
+	 * will be added automagically.
+	 */
+	public static function setUserValue( $user, $app, $key, $value ) {
 		return(\OC_Preferences::setValue(  $user, $app, $key, $value ));
 	}
-
-
-
-
-
-
 }

From 6b2b8b10ee771776023e64a62f59c1bd620605fb Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Sat, 8 Sep 2012 16:00:32 +0200
Subject: [PATCH 1160/1224] style fixes for public db api

---
 lib/public/db.php | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/lib/public/db.php b/lib/public/db.php
index 5ac356bb47..6ce62b27ca 100644
--- a/lib/public/db.php
+++ b/lib/public/db.php
@@ -34,8 +34,6 @@ namespace OCP;
  * This class provides access to the internal database system. Use this class exlusively if you want to access databases
  */
 class DB {
-
-
 	/**
 	 * @brief Prepare a SQL query
 	 * @param $query Query string
@@ -47,7 +45,6 @@ class DB {
 		return(\OC_DB::prepare($query,$limit,$offset));
 	}
 
-
 	/**
 	 * @brief gets last value of autoincrement
 	 * @param $table string The optional table name (will replace *PREFIX*) and add sequence suffix
@@ -62,7 +59,6 @@ class DB {
 		return(\OC_DB::insertid($table));
 	}
 
-
 	/**
 	 * @brief Start a transaction
 	 */
@@ -70,7 +66,6 @@ class DB {
 		return(\OC_DB::beginTransaction());
 	}
 
-
 	/**
 	 * @brief Commit the database changes done during a transaction that is in progress
 	 */
@@ -78,7 +73,6 @@ class DB {
 		return(\OC_DB::commit());
 	}
 
-
 	/**
 	 * @brief check if a result is an error, works with MDB2 and PDOException
 	 * @param mixed $result
@@ -87,7 +81,4 @@ class DB {
 	public static function isError($result) {
 		return(\OC_DB::isError($result));
 	}
-
-
-
 }

From 89e5b85fa7c64c5989224dd41142cb9a6d3c816e Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Sat, 8 Sep 2012 16:02:11 +0200
Subject: [PATCH 1161/1224] style fixes for public files api

---
 lib/public/files.php | 23 ++++++-----------------
 1 file changed, 6 insertions(+), 17 deletions(-)

diff --git a/lib/public/files.php b/lib/public/files.php
index 2f4f459bd9..90889c59ad 100644
--- a/lib/public/files.php
+++ b/lib/public/files.php
@@ -34,8 +34,6 @@ namespace OCP;
  * This class provides access to the internal filesystem abstraction layer. Use this class exlusively if you want to access files
  */
 class Files {
-
-
 	/**
 	 * @brief Recusive deletion of folders
 	 * @param string $dir path to the folder
@@ -45,7 +43,6 @@ class Files {
 		\OC_Helper::rmdirr( $dir );
 	}
 
-
 	/**
 	 * get the mimetype form a local file
 	 * @param string path
@@ -56,7 +53,6 @@ class Files {
 		return(\OC_Helper::getMimeType( $path ));
 	}
 
-
 	/**
 	 * copy the contents of one stream to another
 	 * @param resource source
@@ -67,7 +63,6 @@ class Files {
 		return(\OC_Helper::streamCopy( $source, $target ));
 	}
 
-
 	/**
 	 * create a temporary file with an unique filename
 	 * @param string postfix
@@ -79,7 +74,6 @@ class Files {
 		return(\OC_Helper::tmpFile( $postfix ));
 	}
 
-
 	/**
 	 * create a temporary folder with an unique filename
 	 * @return string
@@ -90,7 +84,6 @@ class Files {
 		return(\OC_Helper::tmpFolder());
 	}
 
-
 	/**
 	 * Adds a suffix to the name in case the file exists
 	 *
@@ -102,16 +95,12 @@ class Files {
 		return(\OC_Helper::buildNotExistingFileName( $path, $filename ));
 	}
 
-        /**
-         * @param string appid
-         * @param $app app
-         * @return OC_FilesystemView
-         */
-        public static function getStorage( $app ) {
+	/**
+	 * @param string appid
+	 * @param $app app
+	 * @return OC_FilesystemView
+	 */
+	public static function getStorage( $app ) {
 		return \OC_App::getStorage( $app );
 	}
-
-
-
-
 }

From a16565a7faff363bbb093e3cbeda6e843251cdeb Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Sat, 8 Sep 2012 16:14:06 +0200
Subject: [PATCH 1162/1224] style fixes for public json api

---
 lib/public/json.php | 2 --
 1 file changed, 2 deletions(-)

diff --git a/lib/public/json.php b/lib/public/json.php
index 93be920c6d..2186dd8ee4 100644
--- a/lib/public/json.php
+++ b/lib/public/json.php
@@ -34,7 +34,6 @@ namespace OCP;
  * This class provides convinient functions to generate and send JSON data. Usefull for Ajax calls
  */
 class JSON {
-
 	/**
 	* @brief Encode and print $data in JSON format
 	* @param array $data The data to use
@@ -170,5 +169,4 @@ class JSON {
 	public static function checkAdminUser() {
 		return(\OC_JSON::checkAdminUser());
 	}
-
 }

From 439ede2a1d06b707ebce8195a551224dc5e3dbfd Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Sat, 8 Sep 2012 16:15:42 +0200
Subject: [PATCH 1163/1224] style fixes for public response api

---
 lib/public/response.php | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/lib/public/response.php b/lib/public/response.php
index febb3f1436..95e67a8572 100644
--- a/lib/public/response.php
+++ b/lib/public/response.php
@@ -34,8 +34,6 @@ namespace OCP;
  * This class provides convinient functions to send the correct http response headers
  */
 class Response {
-
-
 	/**
 	* @brief Enable response caching by sending correct HTTP headers
 	* @param $cache_time time to cache the response
@@ -47,7 +45,6 @@ class Response {
 		return(\OC_Response::enableCaching( $cache_time ));
 	}
 
-
 	/**
 	* Checks and set Last-Modified header, when the request matches sends a
 	* 'not modified' response
@@ -57,7 +54,6 @@ class Response {
 		return(\OC_Response::setLastModifiedHeader( $lastModified ));
 	}
 
-
 	/**
 	* @brief disable browser caching
 	* @see enableCaching with cache_time = 0
@@ -66,7 +62,6 @@ class Response {
 		return(\OC_Response::disableCaching());
 	}
 
-
 	/**
 	* Checks and set ETag header, when the request matches sends a
 	* 'not modified' response
@@ -76,7 +71,6 @@ class Response {
 		return(\OC_Response::setETagHeader( $etag ));
 	}
 
-
 	/**
 	* @brief Send file as response, checking and setting caching headers
 	* @param $filepath of file to send
@@ -102,6 +96,4 @@ class Response {
 	static public function redirect( $location ) {
 		return(\OC_Response::redirect( $location ));
 	}
-
-
-}
+}
\ No newline at end of file

From 89f3afe2fead6f40eaeaa23db88ee70edb9cd61a Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Sat, 8 Sep 2012 16:17:01 +0200
Subject: [PATCH 1164/1224] style fixes for public user api

---
 lib/public/user.php | 38 +++++++++++++-------------------------
 1 file changed, 13 insertions(+), 25 deletions(-)

diff --git a/lib/public/user.php b/lib/public/user.php
index b530321f21..b320ce8ea0 100644
--- a/lib/public/user.php
+++ b/lib/public/user.php
@@ -34,8 +34,6 @@ namespace OCP;
  * This class provides access to the user management. You can get information about the currently logged in user and the permissions for example
  */
 class User {
-
-
 	/**
 	 * @brief get the user id of the user currently logged in.
 	 * @return string uid or false
@@ -44,7 +42,6 @@ class User {
 		return \OC_USER::getUser();
 	}
 
-
 	/**
 	 * @brief Get a list of all users
 	 * @returns array with all uids
@@ -55,7 +52,6 @@ class User {
 		return \OC_USER::getUsers();
 	}
 
-
 	/**
 	 * @brief Check if the user is logged in
 	 * @returns true/false
@@ -66,7 +62,6 @@ class User {
 		return \OC_USER::isLoggedIn();
 	}
 
-
 	/**
 	 * @brief check if a user exists
 	 * @param string $uid the username
@@ -76,7 +71,6 @@ class User {
 		return \OC_USER::userExists( $uid );
 	}
 
-
 	/**
 	 * @brief Loggs the user out including all the session data
 	 * @returns true
@@ -87,7 +81,6 @@ class User {
 		return \OC_USER::logout();
 	}
 
-
 	/**
 	 * @brief Check if the password is correct
 	 * @param $uid The username
@@ -100,23 +93,18 @@ class User {
 		return \OC_USER::checkPassword( $uid, $password );
 	}
 
+	/**
+	* Check if the user is a admin, redirects to home if not
+	*/
+	public static function checkAdminUser() {
+		\OC_Util::checkAdminUser();
+	}
 
-        /**
-        * Check if the user is a admin, redirects to home if not
-        */
-        public static function checkAdminUser() {
-                \OC_Util::checkAdminUser();
-        }
-
-
-        /**
-        * Check if the user is logged in, redirects to home if not. With
-        * redirect URL parameter to the request URI.
-        */
-        public static function checkLoggedIn() {
-                \OC_Util::checkLoggedIn();
-        }
-
-
-
+	/**
+	* Check if the user is logged in, redirects to home if not. With
+	* redirect URL parameter to the request URI.
+	*/
+	public static function checkLoggedIn() {
+		\OC_Util::checkLoggedIn();
+	}
 }

From 2b42893fa9e8d564abf47d495558295d2979c0de Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Sat, 8 Sep 2012 16:18:47 +0200
Subject: [PATCH 1165/1224] style fixes for public util api

---
 lib/public/util.php | 33 +++++++++------------------------
 1 file changed, 9 insertions(+), 24 deletions(-)

diff --git a/lib/public/util.php b/lib/public/util.php
index ed23521b04..747448e62e 100644
--- a/lib/public/util.php
+++ b/lib/public/util.php
@@ -34,8 +34,6 @@ namespace OCP;
  * This class provides different helper functions to make the life of a developer easier
  */
 class Util {
-
-
 	// consts for Logging
 	const DEBUG=0;
 	const INFO=1;
@@ -43,7 +41,6 @@ class Util {
 	const ERROR=3;
 	const FATAL=4;
 
-
 	/**
 	 * @brief get the current installed version of ownCloud
 	 * @return array
@@ -52,7 +49,6 @@ class Util {
 		return(\OC_Util::getVersion());
 	}
 
-
 	/**
 	 * @brief send an email
 	 * @param string $toaddress
@@ -68,18 +64,16 @@ class Util {
 		\OC_MAIL::send( $toaddress, $toname, $subject, $mailtext, $fromaddress, $fromname, $html=0, $altbody='', $ccaddress='', $ccname='', $bcc='');
 	}
 
-
-        /**
+	/**
 	 * @brief write a message in the log
 	 * @param string $app
 	 * @param string $message
 	 * @param int level
-         */
-        public static function writeLog( $app, $message, $level ) {
-                // call the internal log class
-                \OC_LOG::write( $app, $message, $level );
-        }
-
+	 */
+	public static function writeLog( $app, $message, $level ) {
+		// call the internal log class
+		\OC_LOG::write( $app, $message, $level );
+	}
 
 	/**
 	 * @brief add a css file
@@ -87,8 +81,7 @@ class Util {
 	 */
 	public static function addStyle( $application, $file = null ) {
 		\OC_Util::addStyle( $application, $file );
-        }
-
+	}
 
 	/**
 	 * @brief add a javascript file
@@ -97,7 +90,7 @@ class Util {
 	 */
 	public static function addScript( $application, $file = null ) {
 		\OC_Util::addScript( $application, $file );
-        }
+	}
 
 	/**
 	 * @brief Add a custom element to the header
@@ -118,8 +111,6 @@ class Util {
 		return(\OC_Util::formatDate( $timestamp,$dateOnly ));
 	}
 
-
-
 	/**
 	 * @brief Creates an absolute url
 	 * @param $app app
@@ -133,7 +124,6 @@ class Util {
 		return(\OC_Helper::linkToAbsolute( $app, $file, $args ));
 	}
 
-
 	/**
 	 * @brief Creates an absolute url for remote use
 	 * @param $service id
@@ -156,7 +146,6 @@ class Util {
 		return \OC_Helper::linkToPublic($service);
 	}
 
-
 	/**
 	* @brief Creates an url
 	* @param $app app
@@ -199,11 +188,10 @@ class Util {
 	 *
 	 * Returns the path to the image.
 	 */
-        public static function imagePath( $app, $image ) {
+	public static function imagePath( $app, $image ) {
 		return(\OC_Helper::imagePath( $app, $image ));
 	}
 
-
 	/**
 	 * @brief Make a human file size
 	 * @param $bytes file size in bytes
@@ -244,7 +232,6 @@ class Util {
 		return(\OC_Hook::connect( $signalclass, $signalname, $slotclass, $slotname ));
 	}
 
-
 	/**
 	 * @brief emitts a signal
 	 * @param $signalclass class name of emitter
@@ -260,7 +247,6 @@ class Util {
 		return(\OC_Hook::emit( $signalclass, $signalname, $params ));
 	}
 
-
 	/**
 	 * Register an get/post call. This is important to prevent CSRF attacks
 	 * TODO: write example
@@ -269,7 +255,6 @@ class Util {
 		return(\OC_Util::callRegister());
 	}
 
-
 	/**
 	 * Check an ajax get/post call if the request token is valid. exit if not.
 	 * Todo: Write howto

From abc930c57c02f605229d6caa8f5aedef39d7ee76 Mon Sep 17 00:00:00 2001
From: Thomas Tanghus <thomas@tanghus.net>
Date: Sat, 8 Sep 2012 17:58:59 +0200
Subject: [PATCH 1166/1224] Suppress error message which would send headers for
 hosted sited where disk_free_space() has been disabled for security.

---
 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 e26d3d3ef9..80aa548047 100644
--- a/lib/filestorage/local.php
+++ b/lib/filestorage/local.php
@@ -161,7 +161,7 @@ class OC_Filestorage_Local extends OC_Filestorage_Common{
 	}
 
 	public function free_space($path) {
-		return disk_free_space($this->datadir.$path);
+		return @disk_free_space($this->datadir.$path);
 	}
 
 	public function search($query) {

From 697061fa9f6279b8d8f24d984543aeccb6214ba2 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sat, 8 Sep 2012 23:26:19 +0200
Subject: [PATCH 1167/1224] add OC_Image::fitIn

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

diff --git a/lib/image.php b/lib/image.php
index f4b3c2cc07..861353e039 100644
--- a/lib/image.php
+++ b/lib/image.php
@@ -543,21 +543,7 @@ class OC_Image {
 			$new_height = $maxsize;
 		}
 
-		$process = imagecreatetruecolor(round($new_width), round($new_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, $new_width, $new_height, $width_orig, $height_orig);
-		if ($process == false) {
-			OC_Log::write('core',__METHOD__.'(): Error resampling process image '.$new_width.'x'.$new_height,OC_Log::ERROR);
-			imagedestroy($process);
-			return false;
-		}
-		imagedestroy($this->resource);
-		$this->resource = $process;
+		$this->preciseResize(round($new_width), round($new_height));
 		return true;
 	}
 
@@ -666,6 +652,28 @@ class OC_Image {
 		return true;
 	}
 
+	/**
+	 * @brief Resizes the image to fit within a boundry while preserving ratio.
+	 * @param $maxWidth
+	 * @param $maxHeight
+	 * @returns bool
+	 */
+	public function fitIn($maxWidth, $maxHeight) {
+		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);
+		$ratio = $width_orig/$height_orig;
+
+		$newWidth = min($maxWidth, $ratio*$maxHeight);
+		$newHeight = min($maxHeight, $maxWidth/$ratio);
+		
+		$this->preciseResize(round($newWidth), round($newHeight));
+		return true;
+	}
+
 	public function destroy() {
 		if($this->valid()) {
 			imagedestroy($this->resource);

From 46422e6dbeac4993a4750f1dfec16f8e22a1d876 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sat, 8 Sep 2012 23:40:23 +0200
Subject: [PATCH 1168/1224] don't use regular expresions for a simple string
 replace

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

diff --git a/lib/base.php b/lib/base.php
index 1c6cc70b0e..679acdb6e5 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -75,7 +75,7 @@ class OC{
 			/** @TODO: Remove this when necessary
 			 Remove "apps/" from inclusion path for smooth migration to mutli app dir
 			*/
-			$path = preg_replace('/apps\//', '', OC::$CLASSPATH[$className]);
+			$path = str_replace('apps/', '', OC::$CLASSPATH[$className]);
 			require_once $path;
 		}
 		elseif(strpos($className, 'OC_')===0) {

From b14265b5c3671c260c75b1fa7b39504ea2e058e3 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sat, 8 Sep 2012 23:56:37 +0200
Subject: [PATCH 1169/1224] add js versions of basename and dirname

---
 core/js/js.js | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/core/js/js.js b/core/js/js.js
index 1bd650bb6b..21466a809b 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -154,6 +154,12 @@ OC={
 			$('head').append(style);
 		}
 	},
+	basename: function(path) {
+		return path.replace(/\\/g,'/').replace( /.*\//, '' );
+	},
+	dirname: function(path) {
+		return path.replace(/\\/g,'/').replace(/\/[^\/]*$/, '');;
+	}
 	/**
 	 * do a search query and display the results
 	 * @param query the search query

From 9beb95884599640d94f0e8de2d03963b5109a22f Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sun, 9 Sep 2012 00:35:02 +0200
Subject: [PATCH 1170/1224] forgot a ,

---
 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 21466a809b..afc0732d66 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -159,7 +159,7 @@ OC={
 	},
 	dirname: function(path) {
 		return path.replace(/\\/g,'/').replace(/\/[^\/]*$/, '');;
-	}
+	},
 	/**
 	 * do a search query and display the results
 	 * @param query the search query

From 5e790368bc72167eb3c390cc43d00956714d7fff Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <thomas.mueller@tmit.eu>
Date: Sun, 9 Sep 2012 02:03:35 +0200
Subject: [PATCH 1171/1224] [tx-robot] updated from transifex

---
 apps/files/l10n/cs_CZ.php           |  2 ++
 apps/files/l10n/eo.php              |  5 ++++
 apps/files/l10n/eu.php              |  5 ++++
 apps/files/l10n/it.php              |  2 ++
 apps/files/l10n/ru.php              |  2 ++
 apps/files/l10n/sl.php              |  2 ++
 apps/files/l10n/sv.php              |  2 ++
 apps/files/l10n/th_TH.php           |  2 ++
 apps/files_external/l10n/eu.php     |  1 +
 apps/files_sharing/l10n/eo.php      |  5 +++-
 apps/files_sharing/l10n/et_EE.php   |  6 +++-
 apps/files_sharing/l10n/ru.php      |  1 +
 apps/files_versions/l10n/eo.php     |  2 ++
 core/l10n/eo.php                    |  1 +
 core/l10n/eu.php                    |  1 +
 l10n/cs_CZ/files.po                 | 10 +++----
 l10n/eo/core.po                     | 38 ++++++++++++------------
 l10n/eo/files.po                    | 16 +++++-----
 l10n/eo/files_sharing.po            | 16 +++++-----
 l10n/eo/files_versions.po           | 12 ++++----
 l10n/eo/lib.po                      | 46 ++++++++++++++---------------
 l10n/et_EE/files_sharing.po         | 20 ++++++-------
 l10n/eu/core.po                     | 38 ++++++++++++------------
 l10n/eu/files.po                    | 16 +++++-----
 l10n/eu/files_external.po           |  8 ++---
 l10n/it/files.po                    | 10 +++----
 l10n/ru/files.po                    | 10 +++----
 l10n/ru/files_sharing.po            | 13 ++++----
 l10n/ru/settings.po                 | 43 ++++++++++++++-------------
 l10n/sl/files.po                    | 10 +++----
 l10n/sv/files.po                    | 10 +++----
 l10n/templates/core.pot             | 28 +++++++++---------
 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/lib.pot              |  2 +-
 l10n/templates/settings.pot         |  2 +-
 l10n/templates/user_ldap.pot        |  2 +-
 l10n/th_TH/files.po                 | 10 +++----
 lib/l10n/eo.php                     |  5 +++-
 settings/l10n/ru.php                | 18 +++++++++++
 43 files changed, 245 insertions(+), 187 deletions(-)

diff --git a/apps/files/l10n/cs_CZ.php b/apps/files/l10n/cs_CZ.php
index f29df70ee6..3269420e5a 100644
--- a/apps/files/l10n/cs_CZ.php
+++ b/apps/files/l10n/cs_CZ.php
@@ -7,6 +7,7 @@
 "Missing a temporary folder" => "Chybí adresář pro dočasné soubory",
 "Failed to write to disk" => "Zápis na disk selhal",
 "Files" => "Soubory",
+"Unshare" => "Zrušit sdílení",
 "Delete" => "Smazat",
 "already exists" => "již existuje",
 "replace" => "nahradit",
@@ -15,6 +16,7 @@
 "replaced" => "nahrazeno",
 "undo" => "zpět",
 "with" => "s",
+"unshared" => "Sdílení zrušeno",
 "deleted" => "smazáno",
 "generating ZIP-file, it may take some time." => "generuji ZIP soubor, může to nějakou dobu trvat.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Nelze odeslat Váš soubor, protože je to adresář nebo má velikost 0 bajtů",
diff --git a/apps/files/l10n/eo.php b/apps/files/l10n/eo.php
index bf17b97244..95df1363ff 100644
--- a/apps/files/l10n/eo.php
+++ b/apps/files/l10n/eo.php
@@ -7,19 +7,23 @@
 "Missing a temporary folder" => "Mankas tempa dosierujo",
 "Failed to write to disk" => "Malsukcesis skribo al disko",
 "Files" => "Dosieroj",
+"Unshare" => "Malkunhavigi",
 "Delete" => "Forigi",
 "already exists" => "jam ekzistas",
 "replace" => "anstataŭigi",
+"suggest name" => "sugesti nomon",
 "cancel" => "nuligi",
 "replaced" => "anstataŭigita",
 "undo" => "malfari",
 "with" => "kun",
+"unshared" => "malkunhavigita",
 "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",
 "Pending" => "Traktotaj",
 "Upload cancelled." => "La alŝuto nuliĝis.",
+"File upload is in progress. Leaving the page now will cancel the upload." => "Dosieralŝuto plenumiĝas. Lasi la paĝon nun nuligus la alŝuton.",
 "Invalid name, '/' is not allowed." => "Nevalida nomo, “/” ne estas permesata.",
 "Size" => "Grando",
 "Modified" => "Modifita",
@@ -34,6 +38,7 @@
 "Enable ZIP-download" => "Kapabligi ZIP-elŝuton",
 "0 is unlimited" => "0 signifas senlime",
 "Maximum input size for ZIP files" => "Maksimuma enirgrando por ZIP-dosieroj",
+"Save" => "Konservi",
 "New" => "Nova",
 "Text file" => "Tekstodosiero",
 "Folder" => "Dosierujo",
diff --git a/apps/files/l10n/eu.php b/apps/files/l10n/eu.php
index 3897a5580f..d72e73adf0 100644
--- a/apps/files/l10n/eu.php
+++ b/apps/files/l10n/eu.php
@@ -7,19 +7,23 @@
 "Missing a temporary folder" => "Aldi baterako karpeta falta da",
 "Failed to write to disk" => "Errore bat izan da diskoan idazterakoan",
 "Files" => "Fitxategiak",
+"Unshare" => "Ez partekatu",
 "Delete" => "Ezabatu",
 "already exists" => "dagoeneko existitzen da",
 "replace" => "ordeztu",
+"suggest name" => "aholkatu izena",
 "cancel" => "ezeztatu",
 "replaced" => "ordeztua",
 "undo" => "desegin",
 "with" => "honekin",
+"unshared" => "Ez partekatuta",
 "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",
 "Pending" => "Zain",
 "Upload cancelled." => "Igoera ezeztatuta",
+"File upload is in progress. Leaving the page now will cancel the upload." => "Fitxategien igoera martxan da. Orria orain uzteak igoera ezeztatutko du.",
 "Invalid name, '/' is not allowed." => "Baliogabeko izena, '/' ezin da erabili. ",
 "Size" => "Tamaina",
 "Modified" => "Aldatuta",
@@ -34,6 +38,7 @@
 "Enable ZIP-download" => "Gaitu ZIP-deskarga",
 "0 is unlimited" => "0 mugarik gabe esan nahi du",
 "Maximum input size for ZIP files" => "ZIP fitxategien gehienezko tamaina",
+"Save" => "Gorde",
 "New" => "Berria",
 "Text file" => "Testu fitxategia",
 "Folder" => "Karpeta",
diff --git a/apps/files/l10n/it.php b/apps/files/l10n/it.php
index 0df60832c5..c7046118a3 100644
--- a/apps/files/l10n/it.php
+++ b/apps/files/l10n/it.php
@@ -7,6 +7,7 @@
 "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",
@@ -15,6 +16,7 @@
 "replaced" => "sostituito",
 "undo" => "annulla",
 "with" => "con",
+"unshared" => "condivisione rimossa",
 "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",
diff --git a/apps/files/l10n/ru.php b/apps/files/l10n/ru.php
index b013ae8985..61091790af 100644
--- a/apps/files/l10n/ru.php
+++ b/apps/files/l10n/ru.php
@@ -7,6 +7,7 @@
 "Missing a temporary folder" => "Невозможно найти временную папку",
 "Failed to write to disk" => "Ошибка записи на диск",
 "Files" => "Файлы",
+"Unshare" => "Отменить публикацию",
 "Delete" => "Удалить",
 "already exists" => "уже существует",
 "replace" => "заменить",
@@ -15,6 +16,7 @@
 "replaced" => "заменён",
 "undo" => "отмена",
 "with" => "с",
+"unshared" => "публикация отменена",
 "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 байт в каталог",
diff --git a/apps/files/l10n/sl.php b/apps/files/l10n/sl.php
index 0d56a0c647..1a7ae8c0b1 100644
--- a/apps/files/l10n/sl.php
+++ b/apps/files/l10n/sl.php
@@ -7,6 +7,7 @@
 "Missing a temporary folder" => "Manjka začasna mapa",
 "Failed to write to disk" => "Pisanje na disk je spodletelo",
 "Files" => "Datoteke",
+"Unshare" => "Odstrani iz souporabe",
 "Delete" => "Izbriši",
 "already exists" => "že obstaja",
 "replace" => "nadomesti",
@@ -15,6 +16,7 @@
 "replaced" => "nadomeščen",
 "undo" => "razveljavi",
 "with" => "z",
+"unshared" => "odstranjeno iz souporabe",
 "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.",
diff --git a/apps/files/l10n/sv.php b/apps/files/l10n/sv.php
index 137222b417..06d988d451 100644
--- a/apps/files/l10n/sv.php
+++ b/apps/files/l10n/sv.php
@@ -7,6 +7,7 @@
 "Missing a temporary folder" => "Saknar en tillfällig mapp",
 "Failed to write to disk" => "Misslyckades spara till disk",
 "Files" => "Filer",
+"Unshare" => "Sluta dela",
 "Delete" => "Radera",
 "already exists" => "finns redan",
 "replace" => "ersätt",
@@ -15,6 +16,7 @@
 "replaced" => "ersatt",
 "undo" => "ångra",
 "with" => "med",
+"unshared" => "Ej delad",
 "deleted" => "raderad",
 "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.",
diff --git a/apps/files/l10n/th_TH.php b/apps/files/l10n/th_TH.php
index 5809ac1f09..2208051236 100644
--- a/apps/files/l10n/th_TH.php
+++ b/apps/files/l10n/th_TH.php
@@ -7,6 +7,7 @@
 "Missing a temporary folder" => "แฟ้มเอกสารชั่วคราวเกิดการสูญหาย",
 "Failed to write to disk" => "เขียนข้อมูลลงแผ่นดิสก์ล้มเหลว",
 "Files" => "ไฟล์",
+"Unshare" => "ยกเลิกการแชร์ข้อมูล",
 "Delete" => "ลบ",
 "already exists" => "มีอยู่แล้ว",
 "replace" => "แทนที่",
@@ -15,6 +16,7 @@
 "replaced" => "แทนที่แล้ว",
 "undo" => "เลิกทำ",
 "with" => "กับ",
+"unshared" => "ยกเลิกการแชร์ข้อมูลแล้ว",
 "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 ไบต์",
diff --git a/apps/files_external/l10n/eu.php b/apps/files_external/l10n/eu.php
index d1028d2b9b..6299390c26 100644
--- a/apps/files_external/l10n/eu.php
+++ b/apps/files_external/l10n/eu.php
@@ -4,6 +4,7 @@
 "Backend" => "Motorra",
 "Configuration" => "Konfigurazioa",
 "Options" => "Aukerak",
+"Applicable" => "Aplikagarria",
 "Add mount point" => "Gehitu muntatze puntua",
 "None set" => "Ezarri gabe",
 "All Users" => "Erabiltzaile guztiak",
diff --git a/apps/files_sharing/l10n/eo.php b/apps/files_sharing/l10n/eo.php
index 5ef330a53e..e71715f0f1 100644
--- a/apps/files_sharing/l10n/eo.php
+++ b/apps/files_sharing/l10n/eo.php
@@ -1,4 +1,7 @@
 <?php $TRANSLATIONS = array(
 "Password" => "Pasvorto",
-"Submit" => "Sendi"
+"Submit" => "Sendi",
+"Download" => "Elŝuti",
+"No preview available for" => "Ne haveblas antaŭvido por",
+"web services under your control" => "TTT-servoj regataj de vi"
 );
diff --git a/apps/files_sharing/l10n/et_EE.php b/apps/files_sharing/l10n/et_EE.php
index da299f4ff7..94b9b1d7ae 100644
--- a/apps/files_sharing/l10n/et_EE.php
+++ b/apps/files_sharing/l10n/et_EE.php
@@ -1,3 +1,7 @@
 <?php $TRANSLATIONS = array(
-"Delete" => "Kustutamine"
+"Password" => "Parool",
+"Submit" => "Saada",
+"Download" => "Lae alla",
+"No preview available for" => "Eelvaadet pole saadaval",
+"web services under your control" => "veebitenused sinu kontrolli all"
 );
diff --git a/apps/files_sharing/l10n/ru.php b/apps/files_sharing/l10n/ru.php
index 958ac1030d..398d9a8bbc 100644
--- a/apps/files_sharing/l10n/ru.php
+++ b/apps/files_sharing/l10n/ru.php
@@ -2,5 +2,6 @@
 "Password" => "Пароль",
 "Submit" => "Отправить",
 "Download" => "Скачать",
+"No preview available for" => "Предпросмотр недоступен для",
 "web services under your control" => "веб-сервисы под вашим управлением"
 );
diff --git a/apps/files_versions/l10n/eo.php b/apps/files_versions/l10n/eo.php
index 8ec0895638..2f22b5ac0a 100644
--- a/apps/files_versions/l10n/eo.php
+++ b/apps/files_versions/l10n/eo.php
@@ -1,4 +1,6 @@
 <?php $TRANSLATIONS = array(
 "Expire all versions" => "Eksvalidigi ĉiujn eldonojn",
+"Versions" => "Eldonoj",
+"This will delete all existing backup versions of your files" => "Ĉi tio forigos ĉiujn estantajn sekurkopiajn eldonojn de viaj dosieroj",
 "Enable Files Versioning" => "Kapabligi dosiereldonkontrolon"
 );
diff --git a/core/l10n/eo.php b/core/l10n/eo.php
index 930b20a30a..f1deaf3c9d 100644
--- a/core/l10n/eo.php
+++ b/core/l10n/eo.php
@@ -50,6 +50,7 @@
 "Database user" => "Datumbaza uzanto",
 "Database password" => "Datumbaza pasvorto",
 "Database name" => "Datumbaza nomo",
+"Database tablespace" => "Datumbaza tabelospaco",
 "Database host" => "Datumbaza gastigo",
 "Finish setup" => "Fini la instalon",
 "web services under your control" => "TTT-servoj sub via kontrolo",
diff --git a/core/l10n/eu.php b/core/l10n/eu.php
index 9e9717dd8d..58a63b6e68 100644
--- a/core/l10n/eu.php
+++ b/core/l10n/eu.php
@@ -50,6 +50,7 @@
 "Database user" => "Datubasearen erabiltzailea",
 "Database password" => "Datubasearen pasahitza",
 "Database name" => "Datubasearen izena",
+"Database tablespace" => "Datu basearen taula-lekua",
 "Database host" => "Datubasearen hostalaria",
 "Finish setup" => "Bukatu konfigurazioa",
 "web services under your control" => "web zerbitzuak zure kontrolpean",
diff --git a/l10n/cs_CZ/files.po b/l10n/cs_CZ/files.po
index bbdfc08e88..9a8fb88304 100644
--- a/l10n/cs_CZ/files.po
+++ b/l10n/cs_CZ/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-09-08 02:01+0200\n"
-"PO-Revision-Date: 2012-09-08 00:02+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-09 02:01+0200\n"
+"PO-Revision-Date: 2012-09-08 09:02+0000\n"
+"Last-Translator: Tomáš Chvátal <tomas.chvatal@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"
@@ -56,7 +56,7 @@ msgstr "Soubory"
 
 #: js/fileactions.js:108 templates/index.php:62
 msgid "Unshare"
-msgstr ""
+msgstr "Zrušit sdílení"
 
 #: js/fileactions.js:110 templates/index.php:64
 msgid "Delete"
@@ -92,7 +92,7 @@ msgstr "s"
 
 #: js/filelist.js:268
 msgid "unshared"
-msgstr ""
+msgstr "Sdílení zrušeno"
 
 #: js/filelist.js:270
 msgid "deleted"
diff --git a/l10n/eo/core.po b/l10n/eo/core.po
index 416d3dd21f..5af54675c7 100644
--- a/l10n/eo/core.po
+++ b/l10n/eo/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-09-06 02:02+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-09 02:01+0200\n"
+"PO-Revision-Date: 2012-09-08 21: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"
@@ -32,55 +32,55 @@ msgstr "Ĉu neniu kategorio estas aldonota?"
 msgid "This category already exists: "
 msgstr "Ĉi tiu kategorio jam ekzistas: "
 
-#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/js.js:214 templates/layout.user.php:54 templates/layout.user.php:55
 msgid "Settings"
 msgstr "Agordo"
 
-#: js/js.js:593
+#: js/js.js:599
 msgid "January"
 msgstr "Januaro"
 
-#: js/js.js:593
+#: js/js.js:599
 msgid "February"
 msgstr "Februaro"
 
-#: js/js.js:593
+#: js/js.js:599
 msgid "March"
 msgstr "Marto"
 
-#: js/js.js:593
+#: js/js.js:599
 msgid "April"
 msgstr "Aprilo"
 
-#: js/js.js:593
+#: js/js.js:599
 msgid "May"
 msgstr "Majo"
 
-#: js/js.js:593
+#: js/js.js:599
 msgid "June"
 msgstr "Junio"
 
-#: js/js.js:594
+#: js/js.js:600
 msgid "July"
 msgstr "Julio"
 
-#: js/js.js:594
+#: js/js.js:600
 msgid "August"
 msgstr "Aŭgusto"
 
-#: js/js.js:594
+#: js/js.js:600
 msgid "September"
 msgstr "Septembro"
 
-#: js/js.js:594
+#: js/js.js:600
 msgid "October"
 msgstr "Oktobro"
 
-#: js/js.js:594
+#: js/js.js:600
 msgid "November"
 msgstr "Novembro"
 
-#: js/js.js:594
+#: js/js.js:600
 msgid "December"
 msgstr "Decembro"
 
@@ -228,7 +228,7 @@ msgstr "Datumbaza nomo"
 
 #: templates/installation.php:109
 msgid "Database tablespace"
-msgstr ""
+msgstr "Datumbaza tabelospaco"
 
 #: templates/installation.php:115
 msgid "Database host"
@@ -238,11 +238,11 @@ msgstr "Datumbaza gastigo"
 msgid "Finish setup"
 msgstr "Fini la instalon"
 
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:36
 msgid "web services under your control"
 msgstr "TTT-servoj sub via kontrolo"
 
-#: templates/layout.user.php:45
+#: templates/layout.user.php:39
 msgid "Log out"
 msgstr "Elsaluti"
 
diff --git a/l10n/eo/files.po b/l10n/eo/files.po
index c8529b431a..d62532d142 100644
--- a/l10n/eo/files.po
+++ b/l10n/eo/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-09-08 02:01+0200\n"
-"PO-Revision-Date: 2012-09-08 00:02+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-09 02:01+0200\n"
+"PO-Revision-Date: 2012-09-08 21:57+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"
@@ -55,7 +55,7 @@ msgstr "Dosieroj"
 
 #: js/fileactions.js:108 templates/index.php:62
 msgid "Unshare"
-msgstr ""
+msgstr "Malkunhavigi"
 
 #: js/fileactions.js:110 templates/index.php:64
 msgid "Delete"
@@ -71,7 +71,7 @@ msgstr "anstataŭigi"
 
 #: js/filelist.js:186
 msgid "suggest name"
-msgstr ""
+msgstr "sugesti nomon"
 
 #: js/filelist.js:186 js/filelist.js:188
 msgid "cancel"
@@ -91,7 +91,7 @@ msgstr "kun"
 
 #: js/filelist.js:268
 msgid "unshared"
-msgstr ""
+msgstr "malkunhavigita"
 
 #: js/filelist.js:270
 msgid "deleted"
@@ -120,7 +120,7 @@ msgstr "La alŝuto nuliĝis."
 #: js/files.js:423
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
-msgstr ""
+msgstr "Dosieralŝuto plenumiĝas. Lasi la paĝon nun nuligus la alŝuton."
 
 #: js/files.js:493
 msgid "Invalid name, '/' is not allowed."
@@ -180,7 +180,7 @@ msgstr "Maksimuma enirgrando por ZIP-dosieroj"
 
 #: templates/admin.php:14
 msgid "Save"
-msgstr ""
+msgstr "Konservi"
 
 #: templates/index.php:7
 msgid "New"
diff --git a/l10n/eo/files_sharing.po b/l10n/eo/files_sharing.po
index 8ad6599fb0..633cd4eca8 100644
--- a/l10n/eo/files_sharing.po
+++ b/l10n/eo/files_sharing.po
@@ -8,15 +8,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-09 02:01+0200\n"
+"PO-Revision-Date: 2012-09-08 21:35+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"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/authenticate.php:4
 msgid "Password"
@@ -28,12 +28,12 @@ msgstr "Sendi"
 
 #: templates/public.php:9 templates/public.php:19
 msgid "Download"
-msgstr ""
+msgstr "Elŝuti"
 
 #: templates/public.php:18
 msgid "No preview available for"
-msgstr ""
+msgstr "Ne haveblas antaŭvido por"
 
-#: templates/public.php:23
+#: templates/public.php:25
 msgid "web services under your control"
-msgstr ""
+msgstr "TTT-servoj regataj de vi"
diff --git a/l10n/eo/files_versions.po b/l10n/eo/files_versions.po
index d9e4f78ec1..75c78ded12 100644
--- a/l10n/eo/files_versions.po
+++ b/l10n/eo/files_versions.po
@@ -8,15 +8,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 13:35+0200\n"
-"PO-Revision-Date: 2012-09-01 11:35+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-09 02:01+0200\n"
+"PO-Revision-Date: 2012-09-08 21: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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: eo\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: js/settings-personal.js:31 templates/settings-personal.php:10
 msgid "Expire all versions"
@@ -24,11 +24,11 @@ msgstr "Eksvalidigi ĉiujn eldonojn"
 
 #: templates/settings-personal.php:4
 msgid "Versions"
-msgstr ""
+msgstr "Eldonoj"
 
 #: templates/settings-personal.php:7
 msgid "This will delete all existing backup versions of your files"
-msgstr ""
+msgstr "Ĉi tio forigos ĉiujn estantajn sekurkopiajn eldonojn de viaj dosieroj"
 
 #: templates/settings.php:3
 msgid "Enable Files Versioning"
diff --git a/l10n/eo/lib.po b/l10n/eo/lib.po
index 6b56eeafde..5e677a6045 100644
--- a/l10n/eo/lib.po
+++ b/l10n/eo/lib.po
@@ -8,37 +8,37 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 02:01+0200\n"
-"PO-Revision-Date: 2012-09-01 00:02+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-09 02:01+0200\n"
+"PO-Revision-Date: 2012-09-08 21:50+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"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:288
+#: app.php:285
 msgid "Help"
 msgstr "Helpo"
 
-#: app.php:295
+#: app.php:292
 msgid "Personal"
 msgstr "Persona"
 
-#: app.php:300
+#: app.php:297
 msgid "Settings"
 msgstr "Agordo"
 
-#: app.php:305
+#: app.php:302
 msgid "Users"
 msgstr "Uzantoj"
 
-#: app.php:312
+#: app.php:309
 msgid "Apps"
 msgstr "Aplikaĵoj"
 
-#: app.php:314
+#: app.php:311
 msgid "Admin"
 msgstr "Administranto"
 
@@ -70,57 +70,57 @@ msgstr "Aŭtentiga eraro"
 msgid "Token expired. Please reload page."
 msgstr "Ĵetono eksvalidiĝis. Bonvolu reŝargi la paĝon."
 
-#: template.php:86
+#: template.php:87
 msgid "seconds ago"
 msgstr "sekundojn antaŭe"
 
-#: template.php:87
+#: template.php:88
 msgid "1 minute ago"
 msgstr "antaŭ 1 minuto"
 
-#: template.php:88
+#: template.php:89
 #, php-format
 msgid "%d minutes ago"
 msgstr "antaŭ %d minutoj"
 
-#: template.php:91
+#: template.php:92
 msgid "today"
 msgstr "hodiaŭ"
 
-#: template.php:92
+#: template.php:93
 msgid "yesterday"
 msgstr "hieraŭ"
 
-#: template.php:93
+#: template.php:94
 #, php-format
 msgid "%d days ago"
 msgstr "antaŭ %d tagoj"
 
-#: template.php:94
+#: template.php:95
 msgid "last month"
 msgstr "lasta monato"
 
-#: template.php:95
+#: template.php:96
 msgid "months ago"
 msgstr "monatojn antaŭe"
 
-#: template.php:96
+#: template.php:97
 msgid "last year"
 msgstr "lasta jaro"
 
-#: template.php:97
+#: template.php:98
 msgid "years ago"
 msgstr "jarojn antaŭe"
 
 #: updater.php:66
 #, php-format
 msgid "%s is available. Get <a href=\"%s\">more information</a>"
-msgstr ""
+msgstr "%s haveblas. Ekhavu <a href=\"%s\">pli da informo</a>"
 
 #: updater.php:68
 msgid "up to date"
-msgstr ""
+msgstr "ĝisdata"
 
 #: updater.php:71
 msgid "updates check is disabled"
-msgstr ""
+msgstr "ĝisdateckontrolo estas malkapabligita"
diff --git a/l10n/et_EE/files_sharing.po b/l10n/et_EE/files_sharing.po
index 7942c92767..44a935c9b7 100644
--- a/l10n/et_EE/files_sharing.po
+++ b/l10n/et_EE/files_sharing.po
@@ -8,32 +8,32 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-09 02:01+0200\n"
+"PO-Revision-Date: 2012-09-08 13:31+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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: et_EE\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/authenticate.php:4
 msgid "Password"
-msgstr ""
+msgstr "Parool"
 
 #: templates/authenticate.php:6
 msgid "Submit"
-msgstr ""
+msgstr "Saada"
 
 #: templates/public.php:9 templates/public.php:19
 msgid "Download"
-msgstr ""
+msgstr "Lae alla"
 
 #: templates/public.php:18
 msgid "No preview available for"
-msgstr ""
+msgstr "Eelvaadet pole saadaval"
 
-#: templates/public.php:23
+#: templates/public.php:25
 msgid "web services under your control"
-msgstr ""
+msgstr "veebitenused sinu kontrolli all"
diff --git a/l10n/eu/core.po b/l10n/eu/core.po
index 476fbcd0a1..610d3d95db 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-09-06 02:02+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-09 02:01+0200\n"
+"PO-Revision-Date: 2012-09-08 19:24+0000\n"
+"Last-Translator: asieriko <asieriko@gmail.com>\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"
@@ -31,55 +31,55 @@ msgstr "Ez dago gehitzeko kategoriarik?"
 msgid "This category already exists: "
 msgstr "Kategoria hau dagoeneko existitzen da:"
 
-#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/js.js:214 templates/layout.user.php:54 templates/layout.user.php:55
 msgid "Settings"
 msgstr "Ezarpenak"
 
-#: js/js.js:593
+#: js/js.js:599
 msgid "January"
 msgstr "Urtarrila"
 
-#: js/js.js:593
+#: js/js.js:599
 msgid "February"
 msgstr "Otsaila"
 
-#: js/js.js:593
+#: js/js.js:599
 msgid "March"
 msgstr "Martxoa"
 
-#: js/js.js:593
+#: js/js.js:599
 msgid "April"
 msgstr "Apirila"
 
-#: js/js.js:593
+#: js/js.js:599
 msgid "May"
 msgstr "Maiatza"
 
-#: js/js.js:593
+#: js/js.js:599
 msgid "June"
 msgstr "Ekaina"
 
-#: js/js.js:594
+#: js/js.js:600
 msgid "July"
 msgstr "Uztaila"
 
-#: js/js.js:594
+#: js/js.js:600
 msgid "August"
 msgstr "Abuztua"
 
-#: js/js.js:594
+#: js/js.js:600
 msgid "September"
 msgstr "Iraila"
 
-#: js/js.js:594
+#: js/js.js:600
 msgid "October"
 msgstr "Urria"
 
-#: js/js.js:594
+#: js/js.js:600
 msgid "November"
 msgstr "Azaroa"
 
-#: js/js.js:594
+#: js/js.js:600
 msgid "December"
 msgstr "Abendua"
 
@@ -227,7 +227,7 @@ msgstr "Datubasearen izena"
 
 #: templates/installation.php:109
 msgid "Database tablespace"
-msgstr ""
+msgstr "Datu basearen taula-lekua"
 
 #: templates/installation.php:115
 msgid "Database host"
@@ -237,11 +237,11 @@ msgstr "Datubasearen hostalaria"
 msgid "Finish setup"
 msgstr "Bukatu konfigurazioa"
 
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:36
 msgid "web services under your control"
 msgstr "web zerbitzuak zure kontrolpean"
 
-#: templates/layout.user.php:45
+#: templates/layout.user.php:39
 msgid "Log out"
 msgstr "Saioa bukatu"
 
diff --git a/l10n/eu/files.po b/l10n/eu/files.po
index 8f0d7e685d..2cd338beb7 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-09-08 02:01+0200\n"
-"PO-Revision-Date: 2012-09-08 00:02+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-09 02:01+0200\n"
+"PO-Revision-Date: 2012-09-08 19:20+0000\n"
+"Last-Translator: asieriko <asieriko@gmail.com>\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"
@@ -55,7 +55,7 @@ msgstr "Fitxategiak"
 
 #: js/fileactions.js:108 templates/index.php:62
 msgid "Unshare"
-msgstr ""
+msgstr "Ez partekatu"
 
 #: js/fileactions.js:110 templates/index.php:64
 msgid "Delete"
@@ -71,7 +71,7 @@ msgstr "ordeztu"
 
 #: js/filelist.js:186
 msgid "suggest name"
-msgstr ""
+msgstr "aholkatu izena"
 
 #: js/filelist.js:186 js/filelist.js:188
 msgid "cancel"
@@ -91,7 +91,7 @@ msgstr "honekin"
 
 #: js/filelist.js:268
 msgid "unshared"
-msgstr ""
+msgstr "Ez partekatuta"
 
 #: js/filelist.js:270
 msgid "deleted"
@@ -120,7 +120,7 @@ msgstr "Igoera ezeztatuta"
 #: js/files.js:423
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
-msgstr ""
+msgstr "Fitxategien igoera martxan da. Orria orain uzteak igoera ezeztatutko du."
 
 #: js/files.js:493
 msgid "Invalid name, '/' is not allowed."
@@ -180,7 +180,7 @@ msgstr "ZIP fitxategien gehienezko tamaina"
 
 #: templates/admin.php:14
 msgid "Save"
-msgstr ""
+msgstr "Gorde"
 
 #: templates/index.php:7
 msgid "New"
diff --git a/l10n/eu/files_external.po b/l10n/eu/files_external.po
index f614dd9418..5ba75efacd 100644
--- a/l10n/eu/files_external.po
+++ b/l10n/eu/files_external.po
@@ -8,15 +8,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-30 20:52+0000\n"
+"POT-Creation-Date: 2012-09-09 02:01+0200\n"
+"PO-Revision-Date: 2012-09-08 19:25+0000\n"
 "Last-Translator: asieriko <asieriko@gmail.com>\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"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/settings.php:3
 msgid "External Storage"
@@ -40,7 +40,7 @@ msgstr "Aukerak"
 
 #: templates/settings.php:11
 msgid "Applicable"
-msgstr ""
+msgstr "Aplikagarria"
 
 #: templates/settings.php:23
 msgid "Add mount point"
diff --git a/l10n/it/files.po b/l10n/it/files.po
index 8d0209eb47..0c00e3d9e9 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-09-08 02:01+0200\n"
-"PO-Revision-Date: 2012-09-08 00:02+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-09 02:01+0200\n"
+"PO-Revision-Date: 2012-09-08 07:13+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,7 +57,7 @@ msgstr "File"
 
 #: js/fileactions.js:108 templates/index.php:62
 msgid "Unshare"
-msgstr ""
+msgstr "Rimuovi condivisione"
 
 #: js/fileactions.js:110 templates/index.php:64
 msgid "Delete"
@@ -93,7 +93,7 @@ msgstr "con"
 
 #: js/filelist.js:268
 msgid "unshared"
-msgstr ""
+msgstr "condivisione rimossa"
 
 #: js/filelist.js:270
 msgid "deleted"
diff --git a/l10n/ru/files.po b/l10n/ru/files.po
index 6d0f5f2024..234fbe404e 100644
--- a/l10n/ru/files.po
+++ b/l10n/ru/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-09-08 02:01+0200\n"
-"PO-Revision-Date: 2012-09-08 00:02+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-09 02:01+0200\n"
+"PO-Revision-Date: 2012-09-08 14:18+0000\n"
+"Last-Translator: VicDeo <victor.dubiniuk@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"
@@ -60,7 +60,7 @@ msgstr "Файлы"
 
 #: js/fileactions.js:108 templates/index.php:62
 msgid "Unshare"
-msgstr ""
+msgstr "Отменить публикацию"
 
 #: js/fileactions.js:110 templates/index.php:64
 msgid "Delete"
@@ -96,7 +96,7 @@ msgstr "с"
 
 #: js/filelist.js:268
 msgid "unshared"
-msgstr ""
+msgstr "публикация отменена"
 
 #: js/filelist.js:270
 msgid "deleted"
diff --git a/l10n/ru/files_sharing.po b/l10n/ru/files_sharing.po
index 97fc33e4ef..217d6cdf37 100644
--- a/l10n/ru/files_sharing.po
+++ b/l10n/ru/files_sharing.po
@@ -5,19 +5,20 @@
 # Translators:
 # Denis  <reg.transifex.net@demitel.ru>, 2012.
 #   <iuranemo@gmail.com>, 2012.
+#   <victor.dubiniuk@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-09 02:01+0200\n"
+"PO-Revision-Date: 2012-09-08 12:10+0000\n"
+"Last-Translator: VicDeo <victor.dubiniuk@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"
+"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/authenticate.php:4
 msgid "Password"
@@ -33,8 +34,8 @@ msgstr "Скачать"
 
 #: templates/public.php:18
 msgid "No preview available for"
-msgstr ""
+msgstr "Предпросмотр недоступен для"
 
-#: templates/public.php:23
+#: templates/public.php:25
 msgid "web services under your control"
 msgstr "веб-сервисы под вашим управлением"
diff --git a/l10n/ru/settings.po b/l10n/ru/settings.po
index e898279374..2b830ce906 100644
--- a/l10n/ru/settings.po
+++ b/l10n/ru/settings.po
@@ -11,13 +11,14 @@
 #   <rasperepodvipodvert@gmail.com>, 2012.
 #   <tony.mccourin@gmail.com>, 2011.
 # Victor Bravo <>, 2012.
+#   <victor.dubiniuk@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-05 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-09 02:01+0200\n"
+"PO-Revision-Date: 2012-09-08 12:08+0000\n"
+"Last-Translator: VicDeo <victor.dubiniuk@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"
@@ -36,11 +37,11 @@ msgstr "Ошибка авторизации"
 
 #: ajax/creategroup.php:19
 msgid "Group already exists"
-msgstr ""
+msgstr "Группа уже существует"
 
 #: ajax/creategroup.php:28
 msgid "Unable to add group"
-msgstr ""
+msgstr "Невозможно добавить группу"
 
 #: ajax/lostpassword.php:14
 msgid "Email saved"
@@ -60,11 +61,11 @@ msgstr "Неверный запрос"
 
 #: ajax/removegroup.php:16
 msgid "Unable to delete group"
-msgstr ""
+msgstr "Невозможно удалить группу"
 
 #: ajax/removeuser.php:22
 msgid "Unable to delete user"
-msgstr ""
+msgstr "Невозможно удалить пользователя"
 
 #: ajax/setlanguage.php:18
 msgid "Language changed"
@@ -73,12 +74,12 @@ msgstr "Язык изменён"
 #: ajax/togglegroups.php:25
 #, php-format
 msgid "Unable to add user to group %s"
-msgstr ""
+msgstr "Невозможно добавить пользователя в группу %s"
 
 #: ajax/togglegroups.php:31
 #, php-format
 msgid "Unable to remove user from group %s"
-msgstr ""
+msgstr "Невозможно удалить пользователя из группы %s"
 
 #: js/apps.js:18
 msgid "Error"
@@ -111,7 +112,7 @@ msgid ""
 "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."
-msgstr ""
+msgstr "Похоже, что каталог data и ваши файлы в нем доступны из интернета. Предоставляемый ownCloud файл htaccess не работает. Настоятельно рекомендуем настроить сервер таким образом, чтобы закрыть доступ к каталогу data или перенести каталог data за пределы корневого каталога веб-сервера."
 
 #: templates/admin.php:31
 msgid "Cron"
@@ -131,39 +132,39 @@ msgstr "использовать системные задания"
 
 #: templates/admin.php:41
 msgid "Share API"
-msgstr ""
+msgstr "API общего доступа"
 
 #: templates/admin.php:46
 msgid "Enable Share API"
-msgstr ""
+msgstr "Включить API общего доступа"
 
 #: templates/admin.php:47
 msgid "Allow apps to use the Share API"
-msgstr ""
+msgstr "Разрешить приложениям доступ к API общего доступа"
 
 #: templates/admin.php:51
 msgid "Allow links"
-msgstr ""
+msgstr "Разрешить ссылки"
 
 #: templates/admin.php:52
 msgid "Allow users to share items to the public with links"
-msgstr ""
+msgstr "Разрешить пользователям предоставлять публичный доступ при помощи ссылок"
 
 #: templates/admin.php:56
 msgid "Allow resharing"
-msgstr ""
+msgstr "Включить расширенный общий доступ"
 
 #: templates/admin.php:57
 msgid "Allow users to share items shared with them again"
-msgstr ""
+msgstr "Разрешить пользователям отдавать в общий доступ доступные им элементы других пользователей"
 
 #: templates/admin.php:60
 msgid "Allow users to share with anyone"
-msgstr ""
+msgstr "Разрешить предоставлять общий доступ любым пользователям"
 
 #: templates/admin.php:62
 msgid "Allow users to only share with users in their groups"
-msgstr ""
+msgstr "Ограничить общий доступ группами пользователя"
 
 #: templates/admin.php:69
 msgid "Log"
@@ -181,7 +182,7 @@ msgid ""
 "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>."
-msgstr ""
+msgstr "Разрабатывается <a href=\"http://ownCloud.org/contact\" target=\"_blank\">сообществом ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">исходный код</a> доступен под лицензией <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>."
 
 #: templates/apps.php:10
 msgid "Add your App"
@@ -197,7 +198,7 @@ msgstr "Смотрите дополнения на apps.owncloud.com"
 
 #: templates/apps.php:30
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
-msgstr ""
+msgstr "<span class=\"licence\"></span> лицензия. Автор <span class=\"author\"></span>"
 
 #: templates/help.php:9
 msgid "Documentation"
diff --git a/l10n/sl/files.po b/l10n/sl/files.po
index 419db6b3fa..4f9fad5d5f 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-09-08 02:01+0200\n"
-"PO-Revision-Date: 2012-09-08 00:02+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-09 02:01+0200\n"
+"PO-Revision-Date: 2012-09-08 07:24+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"
@@ -56,7 +56,7 @@ msgstr "Datoteke"
 
 #: js/fileactions.js:108 templates/index.php:62
 msgid "Unshare"
-msgstr ""
+msgstr "Odstrani iz souporabe"
 
 #: js/fileactions.js:110 templates/index.php:64
 msgid "Delete"
@@ -92,7 +92,7 @@ msgstr "z"
 
 #: js/filelist.js:268
 msgid "unshared"
-msgstr ""
+msgstr "odstranjeno iz souporabe"
 
 #: js/filelist.js:270
 msgid "deleted"
diff --git a/l10n/sv/files.po b/l10n/sv/files.po
index c9508d5b64..53d2e5a81a 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-09-08 02:01+0200\n"
-"PO-Revision-Date: 2012-09-08 00:02+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-09 02:01+0200\n"
+"PO-Revision-Date: 2012-09-08 12:05+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"
@@ -59,7 +59,7 @@ msgstr "Filer"
 
 #: js/fileactions.js:108 templates/index.php:62
 msgid "Unshare"
-msgstr ""
+msgstr "Sluta dela"
 
 #: js/fileactions.js:110 templates/index.php:64
 msgid "Delete"
@@ -95,7 +95,7 @@ msgstr "med"
 
 #: js/filelist.js:268
 msgid "unshared"
-msgstr ""
+msgstr "Ej delad"
 
 #: js/filelist.js:270
 msgid "deleted"
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index c74b265889..c96cb3d21e 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-09-08 02:02+0200\n"
+"POT-Creation-Date: 2012-09-09 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"
@@ -29,55 +29,55 @@ msgstr ""
 msgid "This category already exists: "
 msgstr ""
 
-#: js/js.js:208 templates/layout.user.php:54 templates/layout.user.php:55
+#: js/js.js:214 templates/layout.user.php:54 templates/layout.user.php:55
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:593
+#: js/js.js:599
 msgid "January"
 msgstr ""
 
-#: js/js.js:593
+#: js/js.js:599
 msgid "February"
 msgstr ""
 
-#: js/js.js:593
+#: js/js.js:599
 msgid "March"
 msgstr ""
 
-#: js/js.js:593
+#: js/js.js:599
 msgid "April"
 msgstr ""
 
-#: js/js.js:593
+#: js/js.js:599
 msgid "May"
 msgstr ""
 
-#: js/js.js:593
+#: js/js.js:599
 msgid "June"
 msgstr ""
 
-#: js/js.js:594
+#: js/js.js:600
 msgid "July"
 msgstr ""
 
-#: js/js.js:594
+#: js/js.js:600
 msgid "August"
 msgstr ""
 
-#: js/js.js:594
+#: js/js.js:600
 msgid "September"
 msgstr ""
 
-#: js/js.js:594
+#: js/js.js:600
 msgid "October"
 msgstr ""
 
-#: js/js.js:594
+#: js/js.js:600
 msgid "November"
 msgstr ""
 
-#: js/js.js:594
+#: js/js.js:600
 msgid "December"
 msgstr ""
 
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index e97ace3f33..58cf33ef54 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-09-08 02:01+0200\n"
+"POT-Creation-Date: 2012-09-09 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 7e2709f019..51d6d1bc51 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-09-08 02:01+0200\n"
+"POT-Creation-Date: 2012-09-09 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 311891242c..8e2151c185 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-09-08 02:02+0200\n"
+"POT-Creation-Date: 2012-09-09 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 9f4a05645a..bdd784daef 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-09-08 02:02+0200\n"
+"POT-Creation-Date: 2012-09-09 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 a8efc666c9..55b9c78549 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-09-08 02:02+0200\n"
+"POT-Creation-Date: 2012-09-09 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 41dc540143..bc10d0b809 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-09-08 02:02+0200\n"
+"POT-Creation-Date: 2012-09-09 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 ce3a92f62a..a0b4c398f7 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-09-08 02:02+0200\n"
+"POT-Creation-Date: 2012-09-09 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 7283addbb6..f4c6b8245c 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-09-08 02:02+0200\n"
+"POT-Creation-Date: 2012-09-09 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/files.po b/l10n/th_TH/files.po
index 021f82d452..1ade0abea9 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-09-08 02:01+0200\n"
-"PO-Revision-Date: 2012-09-08 00:02+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-09 02:01+0200\n"
+"PO-Revision-Date: 2012-09-08 03:31+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:108 templates/index.php:62
 msgid "Unshare"
-msgstr ""
+msgstr "ยกเลิกการแชร์ข้อมูล"
 
 #: js/fileactions.js:110 templates/index.php:64
 msgid "Delete"
@@ -91,7 +91,7 @@ msgstr "กับ"
 
 #: js/filelist.js:268
 msgid "unshared"
-msgstr ""
+msgstr "ยกเลิกการแชร์ข้อมูลแล้ว"
 
 #: js/filelist.js:270
 msgid "deleted"
diff --git a/lib/l10n/eo.php b/lib/l10n/eo.php
index 3f89e2eca7..b3c1c52ece 100644
--- a/lib/l10n/eo.php
+++ b/lib/l10n/eo.php
@@ -21,5 +21,8 @@
 "last month" => "lasta monato",
 "months ago" => "monatojn antaŭe",
 "last year" => "lasta jaro",
-"years ago" => "jarojn antaŭe"
+"years ago" => "jarojn antaŭe",
+"%s is available. Get <a href=\"%s\">more information</a>" => "%s haveblas. Ekhavu <a href=\"%s\">pli da informo</a>",
+"up to date" => "ĝisdata",
+"updates check is disabled" => "ĝisdateckontrolo estas malkapabligita"
 );
diff --git a/settings/l10n/ru.php b/settings/l10n/ru.php
index 5cbeb002ec..bab81560be 100644
--- a/settings/l10n/ru.php
+++ b/settings/l10n/ru.php
@@ -1,26 +1,44 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "Загрузка из App Store запрещена",
 "Authentication error" => "Ошибка авторизации",
+"Group already exists" => "Группа уже существует",
+"Unable to add group" => "Невозможно добавить группу",
 "Email saved" => "Email сохранен",
 "Invalid email" => "Неправильный Email",
 "OpenID Changed" => "OpenID изменён",
 "Invalid request" => "Неверный запрос",
+"Unable to delete group" => "Невозможно удалить группу",
+"Unable to delete user" => "Невозможно удалить пользователя",
 "Language changed" => "Язык изменён",
+"Unable to add user to group %s" => "Невозможно добавить пользователя в группу %s",
+"Unable to remove user from group %s" => "Невозможно удалить пользователя из группы %s",
 "Error" => "Ошибка",
 "Disable" => "Отключить",
 "Enable" => "Включить",
 "Saving..." => "Сохранение...",
 "__language_name__" => "Русский ",
 "Security Warning" => "Предупреждение безопасности",
+"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." => "Похоже, что каталог data и ваши файлы в нем доступны из интернета. Предоставляемый ownCloud файл htaccess не работает. Настоятельно рекомендуем настроить сервер таким образом, чтобы закрыть доступ к каталогу data или перенести каталог data за пределы корневого каталога веб-сервера.",
 "Cron" => "Задание",
 "execute one task with each page loaded" => "Запускать задание при загрузке каждой страницы",
 "cron.php is registered at a webcron service" => "cron.php зарегистрирован в webcron сервисе",
 "use systems cron service" => "использовать системные задания",
+"Share API" => "API общего доступа",
+"Enable Share API" => "Включить API общего доступа",
+"Allow apps to use the Share API" => "Разрешить приложениям доступ к API общего доступа",
+"Allow links" => "Разрешить ссылки",
+"Allow users to share items to the public with links" => "Разрешить пользователям предоставлять публичный доступ при помощи ссылок",
+"Allow resharing" => "Включить расширенный общий доступ",
+"Allow users to share items shared with them again" => "Разрешить пользователям отдавать в общий доступ доступные им элементы других пользователей",
+"Allow users to share with anyone" => "Разрешить предоставлять общий доступ любым пользователям",
+"Allow users to only share with users in their groups" => "Ограничить общий доступ группами пользователя",
 "Log" => "Журнал",
 "More" => "Ещё",
+"Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/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>." => "Разрабатывается <a href=\"http://ownCloud.org/contact\" target=\"_blank\">сообществом ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">исходный код</a> доступен под лицензией <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
 "Add your App" => "Добавить приложение",
 "Select an App" => "Выберите приложение",
 "See application page at apps.owncloud.com" => "Смотрите дополнения на apps.owncloud.com",
+"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span> лицензия. Автор <span class=\"author\"></span>",
 "Documentation" => "Документация",
 "Managing Big Files" => "Управление большими файлами",
 "Ask a question" => "Задать вопрос",

From f23f719d99f43138739d3a77e2d63fede43e9687 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Sat, 8 Sep 2012 20:15:35 -0400
Subject: [PATCH 1172/1224] Fix unsharing from self for group shares and add
 test for it

---
 lib/public/share.php      | 20 +++++++++++++++++---
 tests/lib/share/share.php |  8 ++++++++
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/lib/public/share.php b/lib/public/share.php
index cf61681424..a3cfe4f6dd 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -337,10 +337,21 @@ class Share {
 	public static function unshareFromSelf($itemType, $itemTarget) {
 		if ($item = self::getItemSharedWith($itemType, $itemTarget)) {
 			if ((int)$item['share_type'] === self::SHARE_TYPE_GROUP) {
-				// TODO
+				// Insert an extra row for the group share and set permission to 0 to prevent it from showing up for the user
+				$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 (?,?,?,?,?,?,?,?,?,?,?)');
+				$query->execute(array($item['item_type'], $item['item_source'], $item['item_target'], $item['id'], self::$shareTypeGroupUserUnique, \OC_User::getUser(), $item['uid_owner'], 0, $item['stime'], $item['file_source'], $item['file_target']));
+				\OC_DB::insertid('*PREFIX*share');
+				// Delete all reshares by this user of the group share
+				self::delete($item['id'], true, \OC_User::getUser());
+			} else if ((int)$item['share_type'] === self::$shareTypeGroupUserUnique) {
+				// Set permission to 0 to prevent it from showing up for the user
+				$query = \OC_DB::prepare('UPDATE `*PREFIX*share` SET `permissions` = ? WHERE `id` = ?');
+				$query->execute(array(0, $item['id']));
+				self::delete($item['id'], true);
+			} else {
+				self::delete($item['id']);
 			}
-			// Delete
-			return self::delete($item['id']);
+			return true;
 		}
 		return false;
 	}
@@ -629,6 +640,9 @@ class Share {
 				$row['share_with'] = $items[$row['parent']]['share_with'];
 				// Remove the parent group share
 				unset($items[$row['parent']]);
+				if ($row['permissions'] == 0) {
+					continue;
+				}
 			} else if (!isset($uidOwner)) {
 				// Check if the same target already exists
 				if (isset($targets[$row[$column]])) {
diff --git a/tests/lib/share/share.php b/tests/lib/share/share.php
index b45779038b..b2fecdc8bf 100644
--- a/tests/lib/share/share.php
+++ b/tests/lib/share/share.php
@@ -249,6 +249,7 @@ class Test_Share extends UnitTestCase {
 		$this->assertTrue(in_array('test1.txt', $to_test));
 
 		// Remove user
+		OC_User::setUserId($this->user1);
 		OC_User::deleteUser($this->user1);
 		OC_User::setUserId($this->user2);
 		$this->assertEqual(OCP\Share::getItemsSharedWith('test', Test_Share_Backend::FORMAT_TARGET), array('test1.txt'));
@@ -383,8 +384,15 @@ class Test_Share extends UnitTestCase {
 		OC_Group::addToGroup($this->user4, $this->group1);
 		$this->assertEqual(OCP\Share::getItemsSharedWith('test', Test_Share_Backend::FORMAT_TARGET), array('test.txt'));
 		
+		// Unshare from self
+		$this->assertTrue(OCP\Share::unshareFromSelf('test', 'test.txt'));
+		$this->assertEqual(OCP\Share::getItemsSharedWith('test', Test_Share_Backend::FORMAT_TARGET), array());
+		OC_User::setUserId($this->user2);
+		$this->assertEqual(OCP\Share::getItemsSharedWith('test', Test_Share_Backend::FORMAT_TARGET), array('test.txt'));
+		
 		// Remove group
 		OC_Group::deleteGroup($this->group1);
+		OC_User::setUserId($this->user4);
 		$this->assertEqual(OCP\Share::getItemsSharedWith('test', Test_Share_Backend::FORMAT_TARGET), array());
 		OC_User::setUserId($this->user3);
 		$this->assertEqual(OCP\Share::getItemsShared('test'), array());

From 0b2633a787b8c5944962f02740abf1f75b9035e0 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sun, 9 Sep 2012 02:58:16 +0200
Subject: [PATCH 1173/1224] add breadcrumb controll to js

---
 core/js/js.js | 43 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 43 insertions(+)

diff --git a/core/js/js.js b/core/js/js.js
index afc0732d66..e3c3716e05 100644
--- a/core/js/js.js
+++ b/core/js/js.js
@@ -244,6 +244,49 @@ OC.search.lastResults={};
 OC.addStyle.loaded=[];
 OC.addScript.loaded=[];
 
+OC.Breadcrumb={
+	container:null,
+	crumbs:[],
+	push:function(name, link){
+		if(!OC.Breadcrumb.container){//default
+			OC.Breadcrumb.container=$('#controls');
+		}
+		var crumb=$('<div/>');
+		crumb.addClass('crumb').addClass('last');
+		crumb.attr('style','background-image:url("'+OC.imagePath('core','breadcrumb')+'")');
+
+		var crumbLink=$('<a/>');
+		crumbLink.attr('href',link);
+		crumbLink.text(name);
+		crumb.append(crumbLink);
+
+		var existing=OC.Breadcrumb.container.find('div.crumb');
+		if(existing.length){
+			existing.removeClass('last');
+			existing.last().after(crumb);
+		}else{
+			OC.Breadcrumb.container.append(crumb);
+		}
+		OC.Breadcrumb.crumbs.push(crumb);
+		return crumb;
+	},
+	pop:function(){
+		if(!OC.Breadcrumb.container){//default
+			OC.Breadcrumb.container=$('#controls');
+		}
+		OC.Breadcrumb.container.find('div.crumb').last().remove();
+		OC.Breadcrumb.container.find('div.crumb').last().addClass('last');
+		OC.Breadcrumb.crumbs.pop();
+	},
+	clear:function(){
+		if(!OC.Breadcrumb.container){//default
+			OC.Breadcrumb.container=$('#controls');
+		}
+		OC.Breadcrumb.container.find('div.crumb').remove();
+		OC.Breadcrumb.crumbs=[];
+	}
+}
+
 if(typeof localStorage !='undefined' && localStorage != null){
 	//user and instance awere localstorage
 	OC.localStorage={

From a050915167cdcb0f5b99d5c0007ed9f9f25a20de Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Sun, 9 Sep 2012 02:59:43 +0200
Subject: [PATCH 1174/1224] move breadcrumb css to core so we can reuse it

---
 apps/files/css/files.css | 3 ---
 core/css/styles.css      | 5 +++++
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/apps/files/css/files.css b/apps/files/css/files.css
index bdd35285e7..f35478ecc2 100644
--- a/apps/files/css/files.css
+++ b/apps/files/css/files.css
@@ -47,9 +47,6 @@ tbody a { color:#000; }
 span.extension, span.uploading, td.date { color:#999; }
 span.extension { text-transform:lowercase; -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; }
 tr:hover span.extension { -ms-filter:"progid:DXImageTransform.Microsoft.Alpha(Opacity=100)"; filter:alpha(opacity=100); opacity:1; color:#777; }
-div.crumb { float:left; display:block; background:no-repeat right 0; padding:.75em 1.5em 0 1em; height:2.9em; }
-div.crumb:first-child { padding-left:1em; }
-div.crumb.last { font-weight:bold; }
 table tr.mouseOver td { background-color:#eee; }
 table th { height:2em; padding:0 .5em; color:#999; }
 table th .name { float:left; margin-left:.5em; }
diff --git a/core/css/styles.css b/core/css/styles.css
index 488ac48e4b..6bf3757df2 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -169,3 +169,8 @@ a.bookmarklet { background-color: #ddd; border:1px solid #ccc; padding: 5px;padd
 .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); }
+
+/* ---- BREADCRUMB ---- */
+div.crumb { float:left; display:block; background:no-repeat right 0; padding:.75em 1.5em 0 1em; height:2.9em; }
+div.crumb:first-child { padding-left:1em; }
+div.crumb.last { font-weight:bold; }

From b163bd514f65999cd8aa66262d10ca92dcdf99d1 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Sat, 8 Sep 2012 23:07:43 -0400
Subject: [PATCH 1175/1224] Fix fetching shared children items, fixes problem
 with displaying owner of a shared file inside a shared folder

---
 apps/files_sharing/lib/share/folder.php | 22 ++++++++++++++-----
 lib/public/share.php                    | 29 ++++++++++++++++---------
 2 files changed, 35 insertions(+), 16 deletions(-)

diff --git a/apps/files_sharing/lib/share/folder.php b/apps/files_sharing/lib/share/folder.php
index 665583e83a..e29e9b7e00 100644
--- a/apps/files_sharing/lib/share/folder.php
+++ b/apps/files_sharing/lib/share/folder.php
@@ -19,7 +19,7 @@
 * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-class OC_Share_Backend_Folder extends OC_Share_Backend_File {
+class OC_Share_Backend_Folder extends OC_Share_Backend_File implements OCP\Share_Backend_Collection {
 
 	public function formatItems($items, $format, $parameters = null) {
 		if ($format == self::FORMAT_SHARED_STORAGE) {
@@ -50,12 +50,22 @@ class OC_Share_Backend_Folder extends OC_Share_Backend_File {
 	}
 
 	public function getChildren($itemSource) {
-		$files = OC_FileCache::getFolderContent($itemSource);
-		$sources = array();
-		foreach ($files as $file) {
-			$sources[] = $file['path'];
+		$children = array();
+		$parents = array($itemSource);
+		while (!empty($parents)) {
+			$parents = "'".implode("','", $parents)."'";
+			$query = OC_DB::prepare('SELECT `id`, `name`, `mimetype` FROM `*PREFIX*fscache` WHERE `parent` IN ('.$parents.')');
+			$result = $query->execute();
+			$parents = array();
+			while ($file = $result->fetchRow()) {
+				$children[] = array('source' => $file['id'], 'file_path' => $file['name']);
+				// If a child folder is found look inside it 
+				if ($file['mimetype'] == 'httpd/unix-directory') {
+					$parents[] = $file['id'];
+				}
+			}
 		}
-		return $sources;
+		return $children;
 	}
 
 }
\ No newline at end of file
diff --git a/lib/public/share.php b/lib/public/share.php
index a3cfe4f6dd..87144735a6 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -458,8 +458,8 @@ class Share {
 				$collectionTypes[] = $type;
 			}
 		}
-		if (count($collectionTypes) > 1) {
-			unset($collectionTypes[0]);
+		// Return array if collections were found or the item type is a collection itself - collections can be inside collections
+		if (count($collectionTypes) > 1 || self::getBackend($itemType) instanceof Share_Backend_Collection) {
 			return $collectionTypes;
 		}
 		return false;
@@ -504,10 +504,9 @@ class Share {
 			$root = '';
 			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;
+				$placeholders = join(',', array_fill(0, count($collectionTypes), '?'));
+				$where .= ' OR item_type IN ('.$placeholders.'))';
+				$queryArgs = $collectionTypes;
 			} else {
 				$where = ' WHERE `item_type` = ?';
 				$queryArgs = array($itemType);
@@ -690,15 +689,25 @@ class Share {
 					}
 				}
 				// Check if this is a collection of the requested item type
-				if ($includeCollections && $row['item_type'] != $itemType) {
+				if ($includeCollections && in_array($row['item_type'], $collectionTypes)) {
 					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]);
 						foreach ($children as $child) {
 							$childItem = $row;
-							$childItem['item_source'] = $child;
-	// 						$childItem['item_target'] = $child['target']; TODO
+							if ($row['item_type'] != 'file' && $row['item_type'] != 'folder') {
+								$childItem['item_source'] = $child['source'];
+								$childItem['item_target'] = $child['target'];
+							}
+							if ($backend instanceof Share_Backend_File_Dependent) {
+								if ($row['item_type'] == 'file' || $row['item_type'] == 'folder') {
+									$childItem['file_source'] = $child['source'];
+								} else {
+									$childItem['file_source'] = \OC_FileCache::getId($child['file_path']);
+								}
+								$childItem['file_target'] = $child['file_path'];
+							}
 							if (isset($item)) {
 								if ($childItem[$column] == $item) {
 									// Return only the item instead of a 2-dimensional array
@@ -1167,7 +1176,7 @@ interface Share_Backend_Collection extends Share_Backend {
 	/**
 	* @brief Get the sources of the children of the item
 	* @param string Item source
-	* @return array Returns an array of sources
+	* @return array Returns an array of children each inside an array with the keys: source, target, and file_path if applicable
 	*/
 	public function getChildren($itemSource);
 

From fe7f095b08e765486ff3dda206b46bdb41ab7d31 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Sat, 8 Sep 2012 23:09:45 -0400
Subject: [PATCH 1176/1224] Insert id for unique user group share rows

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

diff --git a/lib/public/share.php b/lib/public/share.php
index 87144735a6..94644d0b65 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -871,6 +871,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));
+					\OC_DB::insertid('*PREFIX*share');
 				}
 			}
 			if ($parentFolder === true) {

From 3e7951e1e6d8928e1c2e47d25489635d337cac04 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Sat, 8 Sep 2012 23:42:24 -0400
Subject: [PATCH 1177/1224] Normalize the file path for shared children as a
 precaution

---
 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 94644d0b65..5ed04c3e16 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -629,6 +629,7 @@ class Share {
 		}
 		$root = strlen($root);
 		$query = \OC_DB::prepare('SELECT '.$select.' FROM `*PREFIX*share` '.$where, $queryLimit);
+		
 		$result = $query->execute($queryArgs);
 		$items = array();
 		$targets = array();
@@ -706,7 +707,7 @@ class Share {
 								} else {
 									$childItem['file_source'] = \OC_FileCache::getId($child['file_path']);
 								}
-								$childItem['file_target'] = $child['file_path'];
+								$childItem['file_target'] = \OC_Filesystem::normalizePath($child['file_path']);
 							}
 							if (isset($item)) {
 								if ($childItem[$column] == $item) {

From 13d513c17c264a3bbb1b2c874bb742afbce76e10 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Sun, 9 Sep 2012 11:50:12 -0400
Subject: [PATCH 1178/1224] Fix shared collection item searching

---
 core/ajax/share.php  |  2 +-
 lib/public/share.php | 67 +++++++++++++++++++++++++-------------------
 2 files changed, 39 insertions(+), 30 deletions(-)

diff --git a/core/ajax/share.php b/core/ajax/share.php
index 3ace97d4d0..5b6763c08e 100644
--- a/core/ajax/share.php
+++ b/core/ajax/share.php
@@ -72,7 +72,7 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo
 					$reshare = false;
 				}
 				if ($_GET['checkShares'] == 'true') {
-					$shares = OCP\Share::getItemShared($_GET['itemType'], $_GET['itemSource']);
+					$shares = OCP\Share::getItemShared($_GET['itemType'], $_GET['itemSource'], OCP\Share::FORMAT_NONE, null, true);
 				} else {
 					$shares = false;
 				}
diff --git a/lib/public/share.php b/lib/public/share.php
index 5ed04c3e16..3e42e91d04 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -629,7 +629,6 @@ class Share {
 		}
 		$root = strlen($root);
 		$query = \OC_DB::prepare('SELECT '.$select.' FROM `*PREFIX*share` '.$where, $queryLimit);
-		
 		$result = $query->execute($queryArgs);
 		$items = array();
 		$targets = array();
@@ -692,37 +691,47 @@ class Share {
 				// Check if this is a collection of the requested item type
 				if ($includeCollections && in_array($row['item_type'], $collectionTypes)) {
 					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]);
-						foreach ($children as $child) {
-							$childItem = $row;
-							if ($row['item_type'] != 'file' && $row['item_type'] != 'folder') {
-								$childItem['item_source'] = $child['source'];
-								$childItem['item_target'] = $child['target'];
-							}
-							if ($backend instanceof Share_Backend_File_Dependent) {
-								if ($row['item_type'] == 'file' || $row['item_type'] == 'folder') {
-									$childItem['file_source'] = $child['source'];
-								} else {
-									$childItem['file_source'] = \OC_FileCache::getId($child['file_path']);
+						// Collections can be inside collections, check if the item is a collection
+						if (isset($item) && $row['item_type'] == $itemType && $row[$column] == $item) {
+							$collectionItems[] = $row;
+						} else {
+							$row['collection'] = array('item_type' => $row['item_type'], $column => $row[$column]);
+							// Fetch all of the children sources
+							$children = $collectionBackend->getChildren($row[$column]);
+							foreach ($children as $child) {
+								$childItem = $row;
+								$childItem['item_type'] = $itemType;
+								if ($row['item_type'] != 'file' && $row['item_type'] != 'folder') {
+									$childItem['item_source'] = $child['source'];
+									$childItem['item_target'] = $child['target'];
 								}
-								$childItem['file_target'] = \OC_Filesystem::normalizePath($child['file_path']);
-							}
-							if (isset($item)) {
-								if ($childItem[$column] == $item) {
-									// Return only the item instead of a 2-dimensional array
-									if ($limit == 1 && $format == self::FORMAT_NONE) {
-										return $childItem;
+								if ($backend instanceof Share_Backend_File_Dependent) {
+									if ($row['item_type'] == 'file' || $row['item_type'] == 'folder') {
+										$childItem['file_source'] = $child['source'];
 									} else {
-										// Unset the items array and break out of both loops
-										$items = array();
-										$items[] = $childItem;
-										break 2;
+										$childItem['file_source'] = \OC_FileCache::getId($child['file_path']);
 									}
+									$childItem['file_target'] = \OC_Filesystem::normalizePath($child['file_path']);
+								}
+								if (isset($item)) {
+									if ($childItem[$column] == $item) {
+										// Return only the item instead of a 2-dimensional array
+										if ($limit == 1) {
+											if ($format == self::FORMAT_NONE) {
+												return $childItem;
+											} else {
+												// Unset the items array and break out of both loops
+												$items = array();
+												$items[] = $childItem;
+												break 2;
+											}
+										} else {
+											$collectionItems[] = $childItem;
+										}
+									}
+								} else {
+									$collectionItems[] = $childItem;
 								}
-							} else {
-								$collectionItems[] = $childItem;
 							}
 						}
 					}
@@ -1182,4 +1191,4 @@ interface Share_Backend_Collection extends Share_Backend {
 	*/
 	public function getChildren($itemSource);
 
-}
+}
\ No newline at end of file

From 6c17a4cb77f50ce851ce8f3bc9a94f7f40967df0 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Sun, 9 Sep 2012 14:44:08 -0400
Subject: [PATCH 1179/1224] Don't display actions for children in shared
 collections, show the parent collection the child is shared in

---
 core/js/share.js     | 109 +++++++++++++++++++++++++------------------
 lib/public/share.php |   7 ++-
 2 files changed, 70 insertions(+), 46 deletions(-)

diff --git a/core/js/share.js b/core/js/share.js
index b5e8b0e661..535ae6da99 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -71,7 +71,8 @@ OC.Share={
 			var item = itemSource;
 		}
 		if (typeof OC.Share.statuses[item] === 'undefined') {
-			checkShares = false;
+			// NOTE: Check doesn't always work and misses some shares, fix later
+			checkShares = true;
 		} else {
 			checkShares = true;
 		}
@@ -149,7 +150,11 @@ OC.Share={
 					if (share.share_type == OC.Share.SHARE_TYPE_LINK) {
 						OC.Share.showLink(itemSource, share.share_with);
 					} else {
-						OC.Share.addShareWith(share.share_type, share.share_with, share.permissions, possiblePermissions);
+						if (share.collection) {
+							OC.Share.addShareWith(share.share_type, share.share_with, share.permissions, possiblePermissions, share.collection);
+						} else {
+							OC.Share.addShareWith(share.share_type, share.share_with, share.permissions, possiblePermissions, false);
+						}
 					}
 				});
 			}
@@ -213,56 +218,70 @@ OC.Share={
 			}
 		});
 	},
-	addShareWith:function(shareType, shareWith, permissions, possiblePermissions) {
+	addShareWith:function(shareType, shareWith, permissions, possiblePermissions, collection) {
 		if (!OC.Share.itemShares[shareType]) {
 			OC.Share.itemShares[shareType] = [];
 		}
 		OC.Share.itemShares[shareType].push(shareWith);
-		var editChecked = createChecked = updateChecked = deleteChecked = shareChecked = '';
-		if (permissions & OC.PERMISSION_CREATE) {
-			createChecked = 'checked="checked"';
-			editChecked = 'checked="checked"';
-		}
-		if (permissions & OC.PERMISSION_UPDATE) {
-			updateChecked = 'checked="checked"';
-			editChecked = 'checked="checked"';
-		}
-		if (permissions & OC.PERMISSION_DELETE) {
-			deleteChecked = 'checked="checked"';
-			editChecked = 'checked="checked"';
-		}
-		if (permissions & OC.PERMISSION_SHARE) {
-			shareChecked = 'checked="checked"';
-		}
-		var html = '<li style="clear: both;" data-share-type="'+shareType+'" data-share-with="'+shareWith+'">';
-		html += shareWith;
-		if (possiblePermissions & OC.PERMISSION_CREATE || possiblePermissions & OC.PERMISSION_UPDATE || possiblePermissions & OC.PERMISSION_DELETE) {
-			if (editChecked == '') {
-				html += '<label style="display:none;">';
+		if (collection) {
+			if (collection.item_type == 'file' || collection.item_type == 'folder') {
+				var item = collection.path;
 			} else {
-				html += '<label>';
+				var item = collection.item_source;
 			}
-			html += '<input type="checkbox" name="edit" class="permissions" '+editChecked+' />can edit</label>';
+			var collectionList = $('#shareWithList li').filterAttr('data-collection', item);
+			if (collectionList.length > 0) {
+				$(collectionList).append(', '+shareWith);
+			} else {
+				var html = '<li style="clear: both;" data-collection="'+item+'">Shared in '+item+' with '+shareWith+'</li>';
+				$('#shareWithList').prepend(html);
+			}
+		} else {
+			var editChecked = createChecked = updateChecked = deleteChecked = shareChecked = '';
+			if (permissions & OC.PERMISSION_CREATE) {
+				createChecked = 'checked="checked"';
+				editChecked = 'checked="checked"';
+			}
+			if (permissions & OC.PERMISSION_UPDATE) {
+				updateChecked = 'checked="checked"';
+				editChecked = 'checked="checked"';
+			}
+			if (permissions & OC.PERMISSION_DELETE) {
+				deleteChecked = 'checked="checked"';
+				editChecked = 'checked="checked"';
+			}
+			if (permissions & OC.PERMISSION_SHARE) {
+				shareChecked = 'checked="checked"';
+			}
+			var html = '<li style="clear: both;" data-share-type="'+shareType+'" data-share-with="'+shareWith+'">';
+			html += shareWith;
+			if (possiblePermissions & OC.PERMISSION_CREATE || possiblePermissions & OC.PERMISSION_UPDATE || possiblePermissions & OC.PERMISSION_DELETE) {
+				if (editChecked == '') {
+					html += '<label style="display:none;">';
+				} else {
+					html += '<label>';
+				}
+				html += '<input type="checkbox" name="edit" class="permissions" '+editChecked+' />can edit</label>';
+			}
+			html += '<a href="#" class="showCruds" style="display:none;"><img class="svg" alt="Unshare" src="'+OC.imagePath('core', 'actions/triangle-s')+'"/></a>';
+			html += '<a href="#" class="unshare" style="display:none;"><img class="svg" alt="Unshare" src="'+OC.imagePath('core', 'actions/delete')+'"/></a>';
+			html += '<div class="cruds" style="display:none;">';
+				if (possiblePermissions & OC.PERMISSION_CREATE) {
+					html += '<label><input type="checkbox" name="create" class="permissions" '+createChecked+' data-permissions="'+OC.PERMISSION_CREATE+'" />create</label>';
+				}
+				if (possiblePermissions & OC.PERMISSION_UPDATE) {
+					html += '<label><input type="checkbox" name="update" class="permissions" '+updateChecked+' data-permissions="'+OC.PERMISSION_UPDATE+'" />update</label>';
+				}
+				if (possiblePermissions & OC.PERMISSION_DELETE) {
+					html += '<label><input type="checkbox" name="delete" class="permissions" '+deleteChecked+' data-permissions="'+OC.PERMISSION_DELETE+'" />delete</label>';
+				}
+				if (possiblePermissions & OC.PERMISSION_SHARE) {
+					html += '<label><input type="checkbox" name="share" class="permissions" '+shareChecked+' data-permissions="'+OC.PERMISSION_SHARE+'" />share</label>';
+				}
+			html += '</div>';
+			html += '</li>';
+			$(html).appendTo('#shareWithList');
 		}
-		html += '<a href="#" class="showCruds" style="display:none;"><img class="svg" alt="Unshare" src="'+OC.imagePath('core', 'actions/triangle-s')+'"/></a>';
-		html += '<a href="#" class="unshare" style="display:none;"><img class="svg" alt="Unshare" src="'+OC.imagePath('core', 'actions/delete')+'"/></a>';
-		html += '<div class="cruds" style="display:none;">';
-			if (possiblePermissions & OC.PERMISSION_CREATE) {
-				html += '<label><input type="checkbox" name="create" class="permissions" '+createChecked+' data-permissions="'+OC.PERMISSION_CREATE+'" />create</label>';
-			}
-			if (possiblePermissions & OC.PERMISSION_UPDATE) {
-				html += '<label><input type="checkbox" name="update" class="permissions" '+updateChecked+' data-permissions="'+OC.PERMISSION_UPDATE+'" />update</label>';
-			}
-			if (possiblePermissions & OC.PERMISSION_DELETE) {
-				html += '<label><input type="checkbox" name="delete" class="permissions" '+deleteChecked+' data-permissions="'+OC.PERMISSION_DELETE+'" />delete</label>';
-			}
-			if (possiblePermissions & OC.PERMISSION_SHARE) {
-				html += '<label><input type="checkbox" name="share" class="permissions" '+shareChecked+' data-permissions="'+OC.PERMISSION_SHARE+'" />share</label>';
-			}
-		html += '</div>';
-		html += '</li>';
-		$(html).appendTo('#shareWithList');
-
 	},
 	showLink:function(itemSource, password) {
 		$('#linkCheckbox').attr('checked', true);
diff --git a/lib/public/share.php b/lib/public/share.php
index 3e42e91d04..6186c2d1c1 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -695,7 +695,12 @@ class Share {
 						if (isset($item) && $row['item_type'] == $itemType && $row[$column] == $item) {
 							$collectionItems[] = $row;
 						} else {
-							$row['collection'] = array('item_type' => $row['item_type'], $column => $row[$column]);
+							$collection = array();
+							$collection['item_type'] = $row['item_type'];
+							if ($row['item_type'] == 'file' || $row['item_type'] == 'folder') {
+								$collection['path'] = basename($row['path']);
+							}
+							$row['collection'] = $collection;
 							// Fetch all of the children sources
 							$children = $collectionBackend->getChildren($row[$column]);
 							foreach ($children as $child) {

From 5c5955b31f25aa637edf955580508aa1a333777a Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Sun, 9 Sep 2012 14:52:03 -0400
Subject: [PATCH 1180/1224] Disable link sharing for folders temporarily - next
 release

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

diff --git a/apps/files_sharing/js/share.js b/apps/files_sharing/js/share.js
index a171751589..9d0e2c90f8 100644
--- a/apps/files_sharing/js/share.js
+++ b/apps/files_sharing/js/share.js
@@ -39,8 +39,10 @@ $(document).ready(function() {
 			var tr = $('tr').filterAttr('data-file', filename);
 			if ($(tr).data('type') == 'dir') {
 				var itemType = 'folder';
+				var link = false;
 			} else {
 				var itemType = 'file';
+				var link = true;
 			}
 			var possiblePermissions = $(tr).data('permissions');
 			var appendTo = $(tr).find('td.filename');
@@ -49,14 +51,14 @@ $(document).ready(function() {
 				if (item != $('#dropdown').data('item')) {
 					OC.Share.hideDropDown(function () {
 						$(tr).addClass('mouseOver');
-						OC.Share.showDropDown(itemType, $(tr).data('id'), appendTo, true, possiblePermissions);
+						OC.Share.showDropDown(itemType, $(tr).data('id'), appendTo, link, possiblePermissions);
 					});
 				} else {
 					OC.Share.hideDropDown();
 				}
 			} else {
 				$(tr).addClass('mouseOver');
-				OC.Share.showDropDown(itemType, $(tr).data('id'), appendTo, true, possiblePermissions);
+				OC.Share.showDropDown(itemType, $(tr).data('id'), appendTo, link, possiblePermissions);
 			}
 		});
 	}

From deb1fbf9a1b9e3f0ac8da4ccc2c3d0e13c0d4f5a Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Sun, 9 Sep 2012 18:29:47 -0400
Subject: [PATCH 1181/1224] Provide update script for files sharing

---
 apps/files_sharing/appinfo/update.php | 53 +++++++++++++++++++++------
 apps/files_sharing/appinfo/version    |  2 +-
 apps/files_sharing/lib/share/file.php |  2 +-
 3 files changed, 44 insertions(+), 13 deletions(-)

diff --git a/apps/files_sharing/appinfo/update.php b/apps/files_sharing/appinfo/update.php
index feafa5fb99..cb6af2d5f0 100644
--- a/apps/files_sharing/appinfo/update.php
+++ b/apps/files_sharing/appinfo/update.php
@@ -1,16 +1,47 @@
 <?php
-
-// touch shared directories to trigger one-time re-scan for all users
-$datadir = \OCP\Config::getSystemValue('datadirectory');
-$currentVersion=OC_Appconfig::getValue('files_sharing', 'installed_version');
-if (version_compare($currentVersion, '0.2.2', '<')) {
-	if ($handle = opendir($datadir)) {
-		while (false !== ($entry = readdir($handle))) {
-			$sharedFolder = $datadir.'/'.$entry.'/files/Shared';
-			if ($entry != "." && $entry != ".." && is_dir($sharedFolder)) {
-				touch($sharedFolder);
+$installedVersion = OCP\Config::getAppValue('files_sharing', 'installed_version');
+if (version_compare($installedVersion, '0.3.2', '<')) {
+	$query = OCP\DB::prepare('SELECT * FROM `*PREFIX*sharing`');
+	$result = $query->execute();
+	$groupShares = array();
+	while ($row = $result->fetchRow()) {
+		$itemSource = OC_FileCache::getId($row['source'], '');
+		if ($itemSource != -1) {
+			$file = OC_FileCache::get($row['source'], '');
+			if ($file['mimetype'] == 'httpd/unix-directory') {
+				$itemType = 'folder';
+			} else {
+				$itemType = 'file';
 			}
+			if ($row['permissions'] == 0) {
+				$permissions = OCP\Share::PERMISSION_READ;
+			} else {
+				$permissions = OCP\Share::PERMISSION_READ | OCP\Share::PERMISSION_UPDATE;
+				if ($itemType == 'folder') {
+					$permissions |= OCP\Share::PERMISSION_CREATE;
+				}
+			}
+			$pos = strrpos($row['uid_shared_with'], '@');
+			if ($pos !== false && OC_Group::groupExists(substr($row['uid_shared_with'], $pos + 1))) {
+				$shareType = OCP\Share::SHARE_TYPE_GROUP;
+				$shareWith = substr($row['uid_shared_with'], 0, $pos);
+				if (isset($groupShares[$shareWith][$itemSource])) {
+					continue;
+				} else {
+					$groupShares[$shareWith][$itemSource] = true;
+				}
+			} else if ($row['uid_shared_with'] == 'public') {
+				$shareType = OCP\Share::SHARE_TYPE_LINK;
+				$shareWith = null;
+			} else {
+				$shareType = OCP\Share::SHARE_TYPE_USER;
+				$shareWith = $row['uid_shared_with'];
+			}
+			OC_User::setUserId($row['uid_owner']);
+			OCP\Share::shareItem($itemType, $itemSource, $shareType, $shareWith, $permissions);
 		}
-		closedir($handle);
 	}
+	// NOTE: Let's drop the table after more testing
+// 	$query = OCP\DB::prepare('DROP TABLE `*PREFIX*sharing`');
+// 	$query->execute();
 }
\ No newline at end of file
diff --git a/apps/files_sharing/appinfo/version b/apps/files_sharing/appinfo/version
index a2268e2de4..9fc80f937f 100644
--- a/apps/files_sharing/appinfo/version
+++ b/apps/files_sharing/appinfo/version
@@ -1 +1 @@
-0.3.1
\ No newline at end of file
+0.3.2
\ No newline at end of file
diff --git a/apps/files_sharing/lib/share/file.php b/apps/files_sharing/lib/share/file.php
index c8821ee0fe..2149da1d73 100644
--- a/apps/files_sharing/lib/share/file.php
+++ b/apps/files_sharing/lib/share/file.php
@@ -30,7 +30,7 @@ class OC_Share_Backend_File implements OCP\Share_Backend_File_Dependent {
 
 	public function isValidSource($itemSource, $uidOwner) {
 		$path = OC_FileCache::getPath($itemSource, $uidOwner);
-		if (OC_Filesystem::file_exists($path)) {
+		if ($path) {
 			$this->path = $path;
 			return true;
 		}

From bd720bdf4cd7f4c017c301e7f69c3c20862bd419 Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <thomas.mueller@tmit.eu>
Date: Mon, 10 Sep 2012 02:04:59 +0200
Subject: [PATCH 1182/1224] [tx-robot] updated from transifex

---
 apps/files/l10n/cs_CZ.php           |  2 +-
 apps/files/l10n/es.php              |  2 ++
 apps/files/l10n/ja_JP.php           |  3 +++
 apps/files/l10n/nl.php              |  2 ++
 apps/files_external/l10n/et_EE.php  |  8 +++++++-
 l10n/cs_CZ/files.po                 |  6 +++---
 l10n/es/files.po                    | 10 +++++-----
 l10n/et_EE/files_external.po        | 18 +++++++++---------
 l10n/ja_JP/files.po                 | 12 ++++++------
 l10n/nl/files.po                    | 10 +++++-----
 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/lib.pot              |  2 +-
 l10n/templates/settings.pot         |  2 +-
 l10n/templates/user_ldap.pot        |  2 +-
 19 files changed, 64 insertions(+), 51 deletions(-)

diff --git a/apps/files/l10n/cs_CZ.php b/apps/files/l10n/cs_CZ.php
index 3269420e5a..41ef4e7849 100644
--- a/apps/files/l10n/cs_CZ.php
+++ b/apps/files/l10n/cs_CZ.php
@@ -16,7 +16,7 @@
 "replaced" => "nahrazeno",
 "undo" => "zpět",
 "with" => "s",
-"unshared" => "Sdílení zrušeno",
+"unshared" => "sdílení zrušeno",
 "deleted" => "smazáno",
 "generating ZIP-file, it may take some time." => "generuji ZIP soubor, může to nějakou dobu trvat.",
 "Unable to upload your file as it is a directory or has 0 bytes" => "Nelze odeslat Váš soubor, protože je to adresář nebo má velikost 0 bajtů",
diff --git a/apps/files/l10n/es.php b/apps/files/l10n/es.php
index 0ba3c56aa1..d07149d859 100644
--- a/apps/files/l10n/es.php
+++ b/apps/files/l10n/es.php
@@ -7,6 +7,7 @@
 "Missing a temporary folder" => "Falta un directorio temporal",
 "Failed to write to disk" => "La escritura en disco ha fallado",
 "Files" => "Archivos",
+"Unshare" => "Dejar de compartir",
 "Delete" => "Eliminado",
 "already exists" => "ya existe",
 "replace" => "reemplazar",
@@ -15,6 +16,7 @@
 "replaced" => "reemplazado",
 "undo" => "deshacer",
 "with" => "con",
+"unshared" => "no compartido",
 "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",
diff --git a/apps/files/l10n/ja_JP.php b/apps/files/l10n/ja_JP.php
index 2de716fec8..6d278c3f0f 100644
--- a/apps/files/l10n/ja_JP.php
+++ b/apps/files/l10n/ja_JP.php
@@ -7,13 +7,16 @@
 "Missing a temporary folder" => "テンポラリフォルダが見つかりません",
 "Failed to write to disk" => "ディスクへの書き込みに失敗しました",
 "Files" => "ファイル",
+"Unshare" => "共有しない",
 "Delete" => "削除",
 "already exists" => "既に存在します",
 "replace" => "置き換え",
+"suggest name" => "推奨名称",
 "cancel" => "キャンセル",
 "replaced" => "置換：",
 "undo" => "元に戻す",
 "with" => "←",
+"unshared" => "未共有",
 "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バイトのため、アップロードできません。",
diff --git a/apps/files/l10n/nl.php b/apps/files/l10n/nl.php
index 515d67a76a..b54c96bd9a 100644
--- a/apps/files/l10n/nl.php
+++ b/apps/files/l10n/nl.php
@@ -7,6 +7,7 @@
 "Missing a temporary folder" => "Een tijdelijke map mist",
 "Failed to write to disk" => "Schrijven naar schijf mislukt",
 "Files" => "Bestanden",
+"Unshare" => "Stop delen",
 "Delete" => "Verwijder",
 "already exists" => "bestaat al",
 "replace" => "vervang",
@@ -15,6 +16,7 @@
 "replaced" => "vervangen",
 "undo" => "ongedaan maken",
 "with" => "door",
+"unshared" => "niet gedeeld",
 "deleted" => "verwijderd",
 "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",
diff --git a/apps/files_external/l10n/et_EE.php b/apps/files_external/l10n/et_EE.php
index a6907e775b..f47ebc936b 100644
--- a/apps/files_external/l10n/et_EE.php
+++ b/apps/files_external/l10n/et_EE.php
@@ -1,12 +1,18 @@
 <?php $TRANSLATIONS = array(
 "External Storage" => "Väline salvestuskoht",
 "Mount point" => "Ühenduspunkt",
+"Backend" => "Admin",
 "Configuration" => "Seadistamine",
 "Options" => "Valikud",
+"Applicable" => "Rakendatav",
 "Add mount point" => "Lisa ühenduspunkt",
 "None set" => "Pole määratud",
 "All Users" => "Kõik kasutajad",
 "Groups" => "Grupid",
 "Users" => "Kasutajad",
-"Delete" => "Kustuta"
+"Delete" => "Kustuta",
+"SSL root certificates" => "SSL root sertifikaadid",
+"Import Root Certificate" => "Impordi root sertifikaadid",
+"Enable User External Storage" => "Luba kasutajatele väline salvestamine",
+"Allow users to mount their own external storage" => "Luba kasutajatel ühendada külge nende enda välised salvestusseadmed"
 );
diff --git a/l10n/cs_CZ/files.po b/l10n/cs_CZ/files.po
index 9a8fb88304..8da1d5687e 100644
--- a/l10n/cs_CZ/files.po
+++ b/l10n/cs_CZ/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-09-09 02:01+0200\n"
-"PO-Revision-Date: 2012-09-08 09:02+0000\n"
+"POT-Creation-Date: 2012-09-10 02:02+0200\n"
+"PO-Revision-Date: 2012-09-09 10:25+0000\n"
 "Last-Translator: Tomáš Chvátal <tomas.chvatal@gmail.com>\n"
 "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n"
 "MIME-Version: 1.0\n"
@@ -92,7 +92,7 @@ msgstr "s"
 
 #: js/filelist.js:268
 msgid "unshared"
-msgstr "Sdílení zrušeno"
+msgstr "sdílení zrušeno"
 
 #: js/filelist.js:270
 msgid "deleted"
diff --git a/l10n/es/files.po b/l10n/es/files.po
index 4c7a65443d..a50f0e53fd 100644
--- a/l10n/es/files.po
+++ b/l10n/es/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-09-08 02:01+0200\n"
-"PO-Revision-Date: 2012-09-08 00:02+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-10 02:02+0200\n"
+"PO-Revision-Date: 2012-09-09 03:24+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"
@@ -57,7 +57,7 @@ msgstr "Archivos"
 
 #: js/fileactions.js:108 templates/index.php:62
 msgid "Unshare"
-msgstr ""
+msgstr "Dejar de compartir"
 
 #: js/fileactions.js:110 templates/index.php:64
 msgid "Delete"
@@ -93,7 +93,7 @@ msgstr "con"
 
 #: js/filelist.js:268
 msgid "unshared"
-msgstr ""
+msgstr "no compartido"
 
 #: js/filelist.js:270
 msgid "deleted"
diff --git a/l10n/et_EE/files_external.po b/l10n/et_EE/files_external.po
index 3daaecb163..e8e4379ae0 100644
--- a/l10n/et_EE/files_external.po
+++ b/l10n/et_EE/files_external.po
@@ -8,15 +8,15 @@ 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:32+0000\n"
+"POT-Creation-Date: 2012-09-10 02:02+0200\n"
+"PO-Revision-Date: 2012-09-09 20:19+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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: et_EE\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/settings.php:3
 msgid "External Storage"
@@ -28,7 +28,7 @@ msgstr "Ühenduspunkt"
 
 #: templates/settings.php:8
 msgid "Backend"
-msgstr ""
+msgstr "Admin"
 
 #: templates/settings.php:9
 msgid "Configuration"
@@ -40,7 +40,7 @@ msgstr "Valikud"
 
 #: templates/settings.php:11
 msgid "Applicable"
-msgstr ""
+msgstr "Rakendatav"
 
 #: templates/settings.php:23
 msgid "Add mount point"
@@ -68,16 +68,16 @@ msgstr "Kustuta"
 
 #: templates/settings.php:88
 msgid "SSL root certificates"
-msgstr ""
+msgstr "SSL root sertifikaadid"
 
 #: templates/settings.php:102
 msgid "Import Root Certificate"
-msgstr ""
+msgstr "Impordi root sertifikaadid"
 
 #: templates/settings.php:108
 msgid "Enable User External Storage"
-msgstr ""
+msgstr "Luba kasutajatele väline salvestamine"
 
 #: templates/settings.php:109
 msgid "Allow users to mount their own external storage"
-msgstr ""
+msgstr "Luba kasutajatel ühendada külge nende enda välised salvestusseadmed"
diff --git a/l10n/ja_JP/files.po b/l10n/ja_JP/files.po
index 5dec378931..6e3d70c125 100644
--- a/l10n/ja_JP/files.po
+++ b/l10n/ja_JP/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-09-08 02:01+0200\n"
-"PO-Revision-Date: 2012-09-08 00:02+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-10 02:02+0200\n"
+"PO-Revision-Date: 2012-09-09 05:11+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"
@@ -55,7 +55,7 @@ msgstr "ファイル"
 
 #: js/fileactions.js:108 templates/index.php:62
 msgid "Unshare"
-msgstr ""
+msgstr "共有しない"
 
 #: js/fileactions.js:110 templates/index.php:64
 msgid "Delete"
@@ -71,7 +71,7 @@ msgstr "置き換え"
 
 #: js/filelist.js:186
 msgid "suggest name"
-msgstr ""
+msgstr "推奨名称"
 
 #: js/filelist.js:186 js/filelist.js:188
 msgid "cancel"
@@ -91,7 +91,7 @@ msgstr "←"
 
 #: js/filelist.js:268
 msgid "unshared"
-msgstr ""
+msgstr "未共有"
 
 #: js/filelist.js:270
 msgid "deleted"
diff --git a/l10n/nl/files.po b/l10n/nl/files.po
index 95befc34bd..0a77bef234 100644
--- a/l10n/nl/files.po
+++ b/l10n/nl/files.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-09-08 02:01+0200\n"
-"PO-Revision-Date: 2012-09-08 00:02+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-10 02:02+0200\n"
+"PO-Revision-Date: 2012-09-09 07:08+0000\n"
+"Last-Translator: Richard Bos <radoeka@gmail.com>\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"
@@ -62,7 +62,7 @@ msgstr "Bestanden"
 
 #: js/fileactions.js:108 templates/index.php:62
 msgid "Unshare"
-msgstr ""
+msgstr "Stop delen"
 
 #: js/fileactions.js:110 templates/index.php:64
 msgid "Delete"
@@ -98,7 +98,7 @@ msgstr "door"
 
 #: js/filelist.js:268
 msgid "unshared"
-msgstr ""
+msgstr "niet gedeeld"
 
 #: js/filelist.js:270
 msgid "deleted"
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index c96cb3d21e..932761bdcb 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-09-09 02:01+0200\n"
+"POT-Creation-Date: 2012-09-10 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,51 +33,51 @@ msgstr ""
 msgid "Settings"
 msgstr ""
 
-#: js/js.js:599
+#: js/js.js:642
 msgid "January"
 msgstr ""
 
-#: js/js.js:599
+#: js/js.js:642
 msgid "February"
 msgstr ""
 
-#: js/js.js:599
+#: js/js.js:642
 msgid "March"
 msgstr ""
 
-#: js/js.js:599
+#: js/js.js:642
 msgid "April"
 msgstr ""
 
-#: js/js.js:599
+#: js/js.js:642
 msgid "May"
 msgstr ""
 
-#: js/js.js:599
+#: js/js.js:642
 msgid "June"
 msgstr ""
 
-#: js/js.js:600
+#: js/js.js:643
 msgid "July"
 msgstr ""
 
-#: js/js.js:600
+#: js/js.js:643
 msgid "August"
 msgstr ""
 
-#: js/js.js:600
+#: js/js.js:643
 msgid "September"
 msgstr ""
 
-#: js/js.js:600
+#: js/js.js:643
 msgid "October"
 msgstr ""
 
-#: js/js.js:600
+#: js/js.js:643
 msgid "November"
 msgstr ""
 
-#: js/js.js:600
+#: js/js.js:643
 msgid "December"
 msgstr ""
 
diff --git a/l10n/templates/files.pot b/l10n/templates/files.pot
index 58cf33ef54..bd2aaf3f74 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-09-09 02:01+0200\n"
+"POT-Creation-Date: 2012-09-10 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 51d6d1bc51..357ef03faf 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-09-09 02:01+0200\n"
+"POT-Creation-Date: 2012-09-10 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 8e2151c185..37669ac70f 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-09-09 02:01+0200\n"
+"POT-Creation-Date: 2012-09-10 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 bdd784daef..0b0636f1de 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-09-09 02:01+0200\n"
+"POT-Creation-Date: 2012-09-10 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 55b9c78549..7bc8ac862b 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-09-09 02:01+0200\n"
+"POT-Creation-Date: 2012-09-10 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 bc10d0b809..3fa354b572 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-09-09 02:01+0200\n"
+"POT-Creation-Date: 2012-09-10 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 a0b4c398f7..01583d6a5b 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-09-09 02:01+0200\n"
+"POT-Creation-Date: 2012-09-10 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 f4c6b8245c..5df0ca0963 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-09-09 02:01+0200\n"
+"POT-Creation-Date: 2012-09-10 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 f34588d1fffbc4d8222148b2bbb9834d943bfe3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Mon, 10 Sep 2012 12:21:54 +0300
Subject: [PATCH 1183/1224] Respect coding style

---
 lib/archive/tar.php | 66 ++++++++++++++++++++++-----------------------
 1 file changed, 33 insertions(+), 33 deletions(-)

diff --git a/lib/archive/tar.php b/lib/archive/tar.php
index ebd581fc16..639d2392b6 100644
--- a/lib/archive/tar.php
+++ b/lib/archive/tar.php
@@ -6,7 +6,7 @@
  * See the COPYING-README file.
  */
 
-require_once '3rdparty/Archive/Tar.php';
+require_once 'Archive/Tar.php';
 
 class OC_Archive_TAR extends OC_Archive{
 	const PLAIN=0;
@@ -24,7 +24,7 @@ class OC_Archive_TAR extends OC_Archive{
 	function __construct($source) {
 		$types=array(null,'gz','bz');
 		$this->path=$source;
-		$this->tar=new Archive_Tar($source,$types[self::getTarType($source)]);
+		$this->tar=new Archive_Tar($source, $types[self::getTarType($source)]);
 	}
 
 	/**
@@ -33,8 +33,8 @@ class OC_Archive_TAR extends OC_Archive{
 	 * @return str
 	 */
 	static public function getTarType($file) {
-		if(strpos($file,'.')) {
-			$extension=substr($file,strrpos($file,'.'));
+		if(strpos($file, '.')) {
+			$extension=substr($file, strrpos($file, '.'));
 			switch($extension) {
 				case 'gz':
 				case 'tgz':
@@ -57,13 +57,13 @@ class OC_Archive_TAR extends OC_Archive{
 	 */
 	function addFolder($path) {
 		$tmpBase=OC_Helper::tmpFolder();
-		if(substr($path,-1,1)!='/') {
+		if(substr($path, -1, 1)!='/') {
 			$path.='/';
 		}
 		if($this->fileExists($path)) {
 			return false;
 		}
-		$parts=explode('/',$path);
+		$parts=explode('/', $path);
 		$folder=$tmpBase;
 		foreach($parts as $part) {
 			$folder.='/'.$part;
@@ -71,7 +71,7 @@ class OC_Archive_TAR extends OC_Archive{
 				mkdir($folder);
 			}
 		}
-		$result=$this->tar->addModify(array($tmpBase.$path),'',$tmpBase);
+		$result=$this->tar->addModify(array($tmpBase.$path), '', $tmpBase);
 		rmdir($tmpBase.$path);
 		$this->fileList=false;
 		return $result;
@@ -90,9 +90,9 @@ class OC_Archive_TAR extends OC_Archive{
 			$header=array();
 			$dummy='';
 			$this->tar->_openAppend();
-			$result=$this->tar->_addfile($source,$header,$dummy,$dummy,$path);
+			$result=$this->tar->_addfile($source, $header, $dummy, $dummy, $path);
 		}else{
-			$result=$this->tar->addString($path,$source);
+			$result=$this->tar->addString($path, $source);
 		}
 		$this->fileList=false;
 		return $result;
@@ -108,12 +108,12 @@ class OC_Archive_TAR extends OC_Archive{
 		//no proper way to delete, rename entire archive, rename file and remake archive
 		$tmp=OCP\Files::tmpFolder();
 		$this->tar->extract($tmp);
-		rename($tmp.$source,$tmp.$dest);
+		rename($tmp.$source, $tmp.$dest);
 		$this->tar=null;
 		unlink($this->path);
-		$types=array(null,'gz','bz');
-		$this->tar=new Archive_Tar($this->path,$types[self::getTarType($this->path)]);
-		$this->tar->createModify(array($tmp),'',$tmp.'/');
+		$types=array(null, 'gz', 'bz');
+		$this->tar=new Archive_Tar($this->path, $types[self::getTarType($this->path)]);
+		$this->tar->createModify(array($tmp), '', $tmp.'/');
 		$this->fileList=false;
 		return true;
 	}
@@ -158,14 +158,14 @@ class OC_Archive_TAR extends OC_Archive{
 		$pathLength=strlen($path);
 		foreach($files as $file) {
 			if($file[0]=='/') {
-				$file=substr($file,1);
+				$file=substr($file, 1);
 			}
-			if(substr($file,0,$pathLength)==$path and $file!=$path) {
-				$result=substr($file,$pathLength);
-				if($pos=strpos($result,'/')) {
-					$result=substr($result,0,$pos+1);
+			if(substr($file, 0, $pathLength)==$path and $file!=$path) {
+				$result=substr($file, $pathLength);
+				if($pos=strpos($result, '/')) {
+					$result=substr($result, 0, $pos+1);
 				}
-				if(array_search($result,$folderContent)===false) {
+				if(array_search($result, $folderContent)===false) {
 					$folderContent[]=$result;
 				}
 			}
@@ -208,12 +208,12 @@ class OC_Archive_TAR extends OC_Archive{
 			return false;
 		}
 		if($this->fileExists('/'.$path)) {
-			$success=$this->tar->extractList(array('/'.$path),$tmp);
+			$success=$this->tar->extractList(array('/'.$path), $tmp);
 		}else{
-			$success=$this->tar->extractList(array($path),$tmp);
+			$success=$this->tar->extractList(array($path), $tmp);
 		}
 		if($success) {
-			rename($tmp.$path,$dest);
+			rename($tmp.$path, $dest);
 		}
 		OCP\Files::rmdirr($tmp);
 		return $success;
@@ -234,16 +234,16 @@ class OC_Archive_TAR extends OC_Archive{
 	 */
 	function fileExists($path) {
 		$files=$this->getFiles();
-		if((array_search($path,$files)!==false) or (array_search($path.'/',$files)!==false)) {
+		if((array_search($path, $files)!==false) or (array_search($path.'/', $files)!==false)) {
 			return true;
 		}else{
 			$folderPath=$path;
-			if(substr($folderPath,-1,1)!='/') {
+			if(substr($folderPath, -1, 1)!='/') {
 				$folderPath.='/';
 			}
 			$pathLength=strlen($folderPath);
 			foreach($files as $file) {
-				if(strlen($file)>$pathLength and substr($file,0,$pathLength)==$folderPath) {
+				if(strlen($file)>$pathLength and substr($file, 0, $pathLength)==$folderPath) {
 					return true;
 				}
 			}
@@ -272,7 +272,7 @@ class OC_Archive_TAR extends OC_Archive{
 		$this->tar=null;
 		unlink($this->path);
 		$this->reopen();
-		$this->tar->createModify(array($tmp),'',$tmp);
+		$this->tar->createModify(array($tmp), '', $tmp);
 		return true;
 	}
 	/**
@@ -282,23 +282,23 @@ class OC_Archive_TAR extends OC_Archive{
 	 * @return resource
 	 */
 	function getStream($path,$mode) {
-		if(strrpos($path,'.')!==false) {
-			$ext=substr($path,strrpos($path,'.'));
+		if(strrpos($path, '.')!==false) {
+			$ext=substr($path, strrpos($path, '.'));
 		}else{
 			$ext='';
 		}
 		$tmpFile=OCP\Files::tmpFile($ext);
 		if($this->fileExists($path)) {
-			$this->extractFile($path,$tmpFile);
+			$this->extractFile($path, $tmpFile);
 		}elseif($mode=='r' or $mode=='rb') {
 			return false;
 		}
 		if($mode=='r' or $mode=='rb') {
-			return fopen($tmpFile,$mode);
+			return fopen($tmpFile, $mode);
 		}else{
 			OC_CloseStreamWrapper::$callBacks[$tmpFile]=array($this,'writeBack');
 			self::$tempFiles[$tmpFile]=$path;
-			return fopen('close://'.$tmpFile,$mode);
+			return fopen('close://'.$tmpFile, $mode);
 		}
 	}
 
@@ -308,7 +308,7 @@ class OC_Archive_TAR extends OC_Archive{
 	 */
 	function writeBack($tmpFile) {
 		if(isset(self::$tempFiles[$tmpFile])) {
-			$this->addFile(self::$tempFiles[$tmpFile],$tmpFile);
+			$this->addFile(self::$tempFiles[$tmpFile], $tmpFile);
 			unlink($tmpFile);
 		}
 	}
@@ -322,6 +322,6 @@ class OC_Archive_TAR extends OC_Archive{
 			$this->tar=null;
 		}
 		$types=array(null,'gz','bz');
-		$this->tar=new Archive_Tar($this->path,$types[self::getTarType($this->path)]);
+		$this->tar=new Archive_Tar($this->path, $types[self::getTarType($this->path)]);
 	}
 }

From 87e1a27fde1267921e0b4a025fec96395d83b6c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Mon, 10 Sep 2012 12:23:55 +0300
Subject: [PATCH 1184/1224] Respect coding style

---
 lib/archive/zip.php | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/lib/archive/zip.php b/lib/archive/zip.php
index 45992ee3d8..a2b07f1a35 100644
--- a/lib/archive/zip.php
+++ b/lib/archive/zip.php
@@ -16,9 +16,9 @@ class OC_Archive_ZIP extends OC_Archive{
 	function __construct($source) {
 		$this->path=$source;
 		$this->zip=new ZipArchive();
-		if($this->zip->open($source,ZipArchive::CREATE)) {
+		if($this->zip->open($source, ZipArchive::CREATE)) {
 		}else{
-			OCP\Util::writeLog('files_archive','Error while opening archive '.$source,OCP\Util::WARN);
+			OCP\Util::writeLog('files_archive', 'Error while opening archive '.$source, OCP\Util::WARN);
 		}
 	}
 	/**
@@ -37,9 +37,9 @@ class OC_Archive_ZIP extends OC_Archive{
 	 */
 	function addFile($path,$source='') {
 		if($source and $source[0]=='/' and file_exists($source)) {
-			$result=$this->zip->addFile($source,$path);
+			$result=$this->zip->addFile($source, $path);
 		}else{
-			$result=$this->zip->addFromString($path,$source);
+			$result=$this->zip->addFromString($path, $source);
 		}
 		if($result) {
 			$this->zip->close();//close and reopen to save the zip
@@ -56,7 +56,7 @@ class OC_Archive_ZIP extends OC_Archive{
 	function rename($source,$dest) {
 		$source=$this->stripPath($source);
 		$dest=$this->stripPath($dest);
-		$this->zip->renameName($source,$dest);
+		$this->zip->renameName($source, $dest);
 	}
 	/**
 	 * get the uncompressed size of a file in the archive
@@ -85,9 +85,9 @@ class OC_Archive_ZIP extends OC_Archive{
 		$folderContent=array();
 		$pathLength=strlen($path);
 		foreach($files as $file) {
-			if(substr($file,0,$pathLength)==$path and $file!=$path) {
-				if(strrpos(substr($file,0,-1),'/')<=$pathLength) {
-					$folderContent[]=substr($file,$pathLength);
+			if(substr($file, 0, $pathLength)==$path and $file!=$path) {
+				if(strrpos(substr($file, 0, -1),'/')<=$pathLength) {
+					$folderContent[]=substr($file, $pathLength);
 				}
 			}
 		}
@@ -121,7 +121,7 @@ class OC_Archive_ZIP extends OC_Archive{
 	 */
 	function extractFile($path,$dest) {
 		$fp = $this->zip->getStream($path);
-		file_put_contents($dest,$fp);
+		file_put_contents($dest, $fp);
 	}
 	/**
 	 * extract the archive
@@ -162,18 +162,18 @@ class OC_Archive_ZIP extends OC_Archive{
 		if($mode=='r' or $mode=='rb') {
 			return $this->zip->getStream($path);
 		}else{//since we cant directly get a writable stream, make a temp copy of the file and put it back in the archive when the stream is closed
-			if(strrpos($path,'.')!==false) {
-				$ext=substr($path,strrpos($path,'.'));
+			if(strrpos($path, '.')!==false) {
+				$ext=substr($path, strrpos($path, '.'));
 			}else{
 				$ext='';
 			}
 			$tmpFile=OCP\Files::tmpFile($ext);
 			OC_CloseStreamWrapper::$callBacks[$tmpFile]=array($this,'writeBack');
 			if($this->fileExists($path)) {
-				$this->extractFile($path,$tmpFile);
+				$this->extractFile($path, $tmpFile);
 			}
 			self::$tempFiles[$tmpFile]=$path;
-			return fopen('close://'.$tmpFile,$mode);
+			return fopen('close://'.$tmpFile, $mode);
 		}
 	}
 
@@ -183,14 +183,14 @@ class OC_Archive_ZIP extends OC_Archive{
 	 */
 	function writeBack($tmpFile) {
 		if(isset(self::$tempFiles[$tmpFile])) {
-			$this->addFile(self::$tempFiles[$tmpFile],$tmpFile);
+			$this->addFile(self::$tempFiles[$tmpFile], $tmpFile);
 			unlink($tmpFile);
 		}
 	}
 
 	private function stripPath($path) {
 		if(!$path || $path[0]=='/') {
-			return substr($path,1);
+			return substr($path, 1);
 		}else{
 			return $path;
 		}

From 23f348c99fccb38779985d8cee2c3e7ae7e43e5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Mon, 10 Sep 2012 12:25:42 +0300
Subject: [PATCH 1185/1224] Respect coding style

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

diff --git a/lib/cache/file.php b/lib/cache/file.php
index a4f83f76c9..27d8b19f36 100644
--- a/lib/cache/file.php
+++ b/lib/cache/file.php
@@ -22,7 +22,7 @@ class OC_Cache_File{
 			$this->storage = new OC_FilesystemView('/'.OC_User::getUser().'/'.$subdir);
 			return $this->storage;
 		}else{
-			OC_Log::write('core','Can\'t get cache storage, user not logged in', OC_Log::ERROR);
+			OC_Log::write('core', 'Can\'t get cache storage, user not logged in', OC_Log::ERROR);
 			return false;
 		}
 	}

From 9a2bc5255bbf0a80ab1c4269d2b308b3ba6377d3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Mon, 10 Sep 2012 12:26:20 +0300
Subject: [PATCH 1186/1224] Respect coding style

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

diff --git a/lib/cache/xcache.php b/lib/cache/xcache.php
index 0739e4a2fa..cecdf46351 100644
--- a/lib/cache/xcache.php
+++ b/lib/cache/xcache.php
@@ -29,9 +29,9 @@ class OC_Cache_XCache {
 
 	public function set($key, $value, $ttl=0) {
 		if($ttl>0) {
-			return xcache_set($this->getNamespace().$key,$value,$ttl);
+			return xcache_set($this->getNamespace().$key, $value, $ttl);
 		}else{
-			return xcache_set($this->getNamespace().$key,$value);
+			return xcache_set($this->getNamespace().$key, $value);
 		}
 	}
 

From 2271a9799282b5dde00a49a291b0f5f11de0358e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Mon, 10 Sep 2012 12:28:09 +0300
Subject: [PATCH 1187/1224] Respect coding style

---
 lib/connector/sabre/principal.php | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/lib/connector/sabre/principal.php b/lib/connector/sabre/principal.php
index cfc72eda9f..ee95ae6330 100644
--- a/lib/connector/sabre/principal.php
+++ b/lib/connector/sabre/principal.php
@@ -66,7 +66,7 @@ class OC_Connector_Sabre_Principal implements Sabre_DAVACL_IPrincipalBackend {
 	 */
 	public function getGroupMemberSet($principal) {
 		// TODO: for now the group principal has only one member, the user itself
-		list($prefix,$name) = Sabre_DAV_URLUtil::splitPath($principal);
+		list($prefix, $name) = Sabre_DAV_URLUtil::splitPath($principal);
 
 		$principal = $this->getPrincipalByPath($prefix);
 		if (!$principal) throw new Sabre_DAV_Exception('Principal not found');
@@ -115,6 +115,12 @@ class OC_Connector_Sabre_Principal implements Sabre_DAVACL_IPrincipalBackend {
 	public function setGroupMemberSet($principal, array $members) {
 		throw new Sabre_DAV_Exception('Setting members of the group is not supported yet');
 	}
-	function updatePrincipal($path, $mutations) {return 0;}
-	function searchPrincipals($prefixPath, array $searchProperties) {return 0;}
+	
+	function updatePrincipal($path, $mutations) {
+		return 0;
+	}
+	
+	function searchPrincipals($prefixPath, array $searchProperties) {
+		return 0;
+	}
 }

From 1a10955644b6b56431679f64a7756fe99090f837 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Mon, 10 Sep 2012 12:29:35 +0300
Subject: [PATCH 1188/1224] Respect coding style

---
 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 34fc5fee50..0c34c7ea29 100644
--- a/lib/connector/sabre/auth.php
+++ b/lib/connector/sabre/auth.php
@@ -36,7 +36,7 @@ class OC_Connector_Sabre_Auth extends Sabre_DAV_Auth_Backend_AbstractBasic {
 			return true;
 		} else {
 			OC_Util::setUpFS();//login hooks may need early access to the filesystem
-			if(OC_User::login($username,$password)) {
+			if(OC_User::login($username, $password)) {
 				OC_Util::setUpFS($username);
 				return true;
 			}

From 5721bd27861f7119fd51711583ca68b4bcce42bc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Mon, 10 Sep 2012 12:31:57 +0300
Subject: [PATCH 1189/1224] Respect coding style

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

diff --git a/lib/connector/sabre/directory.php b/lib/connector/sabre/directory.php
index 8fff77ac74..39606577f6 100644
--- a/lib/connector/sabre/directory.php
+++ b/lib/connector/sabre/directory.php
@@ -60,7 +60,7 @@ class OC_Connector_Sabre_Directory extends OC_Connector_Sabre_Node implements Sa
 			}
 		} else {
 			$newPath = $this->path . '/' . $name;
-			OC_Filesystem::file_put_contents($newPath,$data);
+			OC_Filesystem::file_put_contents($newPath, $data);
 			return OC_Connector_Sabre_Node::getETagPropertyForPath($newPath);
 		}
 
@@ -195,10 +195,9 @@ class OC_Connector_Sabre_Directory extends OC_Connector_Sabre_Node implements Sa
 	 */
 	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);
+		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;
 	}

From c6cd1b77d31be34c164e7c647507929941266d76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Mon, 10 Sep 2012 12:32:49 +0300
Subject: [PATCH 1190/1224] Respect coding style

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

diff --git a/lib/filecache/cached.php b/lib/filecache/cached.php
index 261bd2f572..4e8ff23793 100644
--- a/lib/filecache/cached.php
+++ b/lib/filecache/cached.php
@@ -22,7 +22,7 @@ class OC_FileCache_Cached{
 		$result=$query->execute(array(md5($path)))->fetchRow();
 		if(is_array($result)) {
 			if(isset(self::$savedData[$path])) {
-				$result=array_merge($result,self::$savedData[$path]);
+				$result=array_merge($result, self::$savedData[$path]);
 			}
 			return $result;
 		}else{
@@ -54,7 +54,7 @@ class OC_FileCache_Cached{
 		if($root===false) {
 			$root=OC_Filesystem::getRoot();
 		}
-		$parent=OC_FileCache::getId($path,$root);
+		$parent=OC_FileCache::getId($path, $root);
 		if($parent==-1) {
 			return array();
 		}
@@ -63,7 +63,7 @@ class OC_FileCache_Cached{
 		if(is_array($result)) {
 			return $result;
 		}else{
-			OC_Log::write('files','getFolderContent(): file not found in cache ('.$path.')',OC_Log::DEBUG);
+			OC_Log::write('files', 'getFolderContent(): file not found in cache ('.$path.')', OC_Log::DEBUG);
 			return false;
 		}
 	}

From 04448772189b74892fdacecce3ce78f71f774760 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Mon, 10 Sep 2012 12:35:15 +0300
Subject: [PATCH 1191/1224] Respect coding style

---
 lib/filecache/update.php | 52 ++++++++++++++++++++--------------------
 1 file changed, 26 insertions(+), 26 deletions(-)

diff --git a/lib/filecache/update.php b/lib/filecache/update.php
index 3d10f5ea7b..2b64a2a90f 100644
--- a/lib/filecache/update.php
+++ b/lib/filecache/update.php
@@ -27,13 +27,13 @@ class OC_FileCache_Update{
 		if(!$view->file_exists($path)) {
 			return false;
 		}
-		$cachedData=OC_FileCache_Cached::get($path,$root);
+		$cachedData=OC_FileCache_Cached::get($path, $root);
 		if(isset($cachedData['mtime'])) {
 			$cachedMTime=$cachedData['mtime'];
 			if($folder) {
-				return $view->hasUpdated($path.'/',$cachedMTime);
+				return $view->hasUpdated($path.'/', $cachedMTime);
 			}else{
-				return $view->hasUpdated($path,$cachedMTime);
+				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
@@ -59,9 +59,9 @@ class OC_FileCache_Update{
 			$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));
+					OC_Hook::emit('OC_Filesystem', 'post_delete', array('path'=>$file));
 				}else{
-					self::delete($file,$root);
+					self::delete($file, $root);
 				}
 			}
 		}
@@ -83,24 +83,24 @@ class OC_FileCache_Update{
 			while (($filename = readdir($dh)) !== false) {
 				if($filename != '.' and $filename != '..') {
 					$file=$path.'/'.$filename;
-					if(self::hasUpdated($file,$root)) {
+					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));
+							OC_Hook::emit('OC_Filesystem', 'post_write', array('path'=>$file));
 						}else{
-							self::update($file,$root);
+							self::update($file, $root);
 						}
 					}
 				}
 			}
 		}
 
-		self::cleanFolder($path,$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));
+			OC_Hook::emit('OC_Filesystem', 'post_write', array('path'=>$path));
 		}else{
-			self::update($path,$root);
+			self::update($path, $root);
 		}
 	}
 
@@ -132,7 +132,7 @@ class OC_FileCache_Update{
 	public static function fileSystemWatcherRename($params) {
 		$oldPath=$params['oldpath'];
 		$newPath=$params['newpath'];
-		self::rename($oldPath,$newPath);
+		self::rename($oldPath, $newPath);
 	}
 
 	/**
@@ -154,24 +154,24 @@ class OC_FileCache_Update{
 		$cachedSize=isset($cached['size'])?$cached['size']:0;
 
 		if($view->is_dir($path.'/')) {
-			if(OC_FileCache::inCache($path,$root)) {
-				$cachedContent=OC_FileCache_Cached::getFolderContent($path,$root);
+			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));
+				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);
+				OC_FileCache::scan($path, null, $count, $root);
 				return; //increaseSize is already called inside scan
 			}
 		}else{
-			$size=OC_FileCache::scanFile($path,$root);
+			$size=OC_FileCache::scanFile($path, $root);
 		}
-		OC_FileCache::increaseSize(dirname($path),$size-$cachedSize,$root);
+		OC_FileCache::increaseSize(dirname($path), $size-$cachedSize, $root);
 	}
 
 	/**
@@ -180,13 +180,13 @@ class OC_FileCache_Update{
 	 * @param string root (optional)
 	 */
 	public static function delete($path,$root=false) {
-		$cached=OC_FileCache_Cached::get($path,$root);
+		$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);
+		OC_FileCache::increaseSize(dirname($path), -$size, $root);
+		OC_FileCache::delete($path, $root);
 	}
 
 	/**
@@ -196,7 +196,7 @@ class OC_FileCache_Update{
 	 * @param string root (optional)
 	 */
 	public static function rename($oldPath,$newPath,$root=false) {
-		if(!OC_FileCache::inCache($oldPath,$root)) {
+		if(!OC_FileCache::inCache($oldPath, $root)) {
 			return;
 		}
 		if($root===false) {
@@ -205,10 +205,10 @@ class OC_FileCache_Update{
 			$view=new OC_FilesystemView($root);
 		}
 
-		$cached=OC_FileCache_Cached::get($oldPath,$root);
+		$cached=OC_FileCache_Cached::get($oldPath, $root);
 		$oldSize=$cached['size'];
-		OC_FileCache::increaseSize(dirname($oldPath),-$oldSize,$root);
-		OC_FileCache::increaseSize(dirname($newPath),$oldSize,$root);
-		OC_FileCache::move($oldPath,$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

From 5a65c5a46cdf624d143c02af8e2fd9ef9e1e9cba Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Thomas=20M=C3=BCller?= <thomas.mueller@tmit.eu>
Date: Mon, 10 Sep 2012 14:59:08 +0300
Subject: [PATCH 1192/1224] Respect coding style

---
 lib/ocs.php | 170 +++++++++++++++++++++++++---------------------------
 1 file changed, 82 insertions(+), 88 deletions(-)

diff --git a/lib/ocs.php b/lib/ocs.php
index 3a9be4cf09..7350c3c882 100644
--- a/lib/ocs.php
+++ b/lib/ocs.php
@@ -84,7 +84,7 @@ class OC_OCS {
 			$method='get';
 		}elseif($_SERVER['REQUEST_METHOD'] == 'PUT') {
 			$method='put';
-			parse_str(file_get_contents("php://input"),$put_vars);
+			parse_str(file_get_contents("php://input"), $put_vars);
 		}elseif($_SERVER['REQUEST_METHOD'] == 'POST') {
 			$method='post';
 		}else{
@@ -94,8 +94,8 @@ class OC_OCS {
 
 		// preprocess url
 		$url = strtolower($_SERVER['REQUEST_URI']);
-		if(substr($url,(strlen($url)-1))<>'/') $url.='/';
-		$ex=explode('/',$url);
+		if(substr($url, (strlen($url)-1))<>'/') $url.='/';
+		$ex=explode('/', $url);
 		$paracount=count($ex);
 		$format = self::readData($method, 'format', 'text', '');
 
@@ -107,23 +107,23 @@ class OC_OCS {
 
 		// PERSON
 		// personcheck - POST - PERSON/CHECK
-		}elseif(($method=='post') and ($ex[$paracount-4] == 'v1.php') and ($ex[$paracount-3]=='person') and ($ex[$paracount-2] == '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);
+			OC_OCS::personcheck($format, $login, $passwd);
 
 		// 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);
+			$pagesize = self::readData($method, 'pagesize', 'int', 10);
 			if($pagesize<1 or $pagesize>100) $pagesize=10;
-			OC_OCS::activityget($format,$page,$pagesize);
+			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);
+			OC_OCS::activityput($format, $message);
 
 
 		// PRIVATEDATA
@@ -138,7 +138,7 @@ class OC_OCS {
 
 			$key=$ex[$paracount-2];
 			$app=$ex[$paracount-3];
-			OC_OCS::privateDataGet($format, $app,$key);
+			OC_OCS::privateDataGet($format, $app, $key);
 
 		// set - POST DATA
 		}elseif(($method=='post') and ($ex[$paracount-6] == 'v1.php') and ($ex[$paracount-4] == 'setattribute')) {
@@ -160,23 +160,23 @@ class OC_OCS {
 		// 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);
+			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);
+			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);
+			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);
+			OC_OCS::privateKeyGet($format, $user);
 
 
 // add more calls here
@@ -196,7 +196,7 @@ class OC_OCS {
 		}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));
+			echo(OC_OCS::generatexml($format, 'failed', 999, $txt));
 		}
 		exit();
 	}
@@ -237,7 +237,7 @@ class OC_OCS {
 				$identifieduser='';
 			}
 		}else{
-			if(!OC_User::login($authuser,$authpw)) {
+			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');
@@ -283,69 +283,69 @@ class OC_OCS {
 			$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);
+			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);
+			if(!empty($itemsperpage)) xmlwriter_write_element($writer, 'itemsperpage', $itemsperpage);
 			xmlwriter_end_element($writer);
 			if($dimension=='0') {
 				// 0 dimensions
-				xmlwriter_write_element($writer,'data',$data);
+				xmlwriter_write_element($writer, 'data', $data);
 
 			}elseif($dimension=='1') {
-				xmlwriter_start_element($writer,'data');
+				xmlwriter_start_element($writer, 'data');
 				foreach($data as $key=>$entry) {
-				xmlwriter_write_element($writer,$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_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');
+				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_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_start_element($writer, 'data');
+				OC_OCS::toxml($writer, $data, 'comment');
 				xmlwriter_end_element($writer);
 			}
 
@@ -364,18 +364,15 @@ class OC_OCS {
 				$key = $node;
 			}
 			if (is_array($value)) {
-				xmlwriter_start_element($writer,$key);
-				OC_OCS::toxml($writer,$value,$node);
+				xmlwriter_start_element($writer, $key);
+				OC_OCS::toxml($writer,$value, $node);
 				xmlwriter_end_element($writer);
 			}else{
-				xmlwriter_write_element($writer,$key,$value);
+				xmlwriter_write_element($writer, $key, $value);
 			}
 		}
 	}
 
-
-
-
 	/**
 	* return the config data of this server
 	* @param string $format
@@ -383,17 +380,16 @@ class OC_OCS {
 	*/
 	private static function apiConfig($format) {
 		$user=OC_OCS::checkpassword(false);
-		$url=substr(OCP\Util::getServerHost().$_SERVER['SCRIPT_NAME'],0,-11).'';
+		$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));
+		echo(OC_OCS::generatexml($format, 'ok', 100, '', $xml, 'config', '', 1));
 	}
 
-
 	/**
 	* check if the provided login/apikey/password is valid
 	* @param string $format
@@ -403,19 +399,17 @@ class OC_OCS {
 	*/
 	private static function personCheck($format,$login,$passwd) {
 		if($login<>'') {
-			if(OC_User::login($login,$passwd)) {
+			if(OC_User::login($login, $passwd)) {
 				$xml['person']['personid']=$login;
-				echo(OC_OCS::generatexml($format,'ok',100,'',$xml,'person','check',2));
+				echo(OC_OCS::generatexml($format, 'ok', 100, '', $xml, 'person', 'check', 2));
 			}else{
-				echo(OC_OCS::generatexml($format,'failed',102,'login not valid'));
+				echo(OC_OCS::generatexml($format, 'failed', 102, 'login not valid'));
 			}
 		}else{
-			echo(OC_OCS::generatexml($format,'failed',101,'please specify all mandatory fields'));
+			echo(OC_OCS::generatexml($format, 'failed', 101, 'please specify all mandatory fields'));
 		}
 	}
 
-
-
 	// ACTIVITY API #############################################
 
 	/**
@@ -425,12 +419,12 @@ class OC_OCS {
 	* @param string $pagesize
 	* @return string xml/json
 	*/
-	private static function activityGet($format,$page,$pagesize) {
+	private static function activityGet($format, $page, $pagesize) {
 		$user=OC_OCS::checkpassword();
 
 			//TODO
 
-		$txt=OC_OCS::generatexml($format,'ok',100,'',$xml,'activity','full',2,$totalcount,$pagesize);
+		$txt=OC_OCS::generatexml($format, 'ok', 100, '', $xml, 'activity', 'full', 2, $totalcount,$pagesize);
 		echo($txt);
 	}
 
@@ -443,7 +437,7 @@ class OC_OCS {
 	private static function activityPut($format,$message) {
 		// not implemented in ownCloud
 		$user=OC_OCS::checkpassword();
-		echo(OC_OCS::generatexml($format,'ok',100,''));
+		echo(OC_OCS::generatexml($format, 'ok', 100, ''));
 	}
 
 	// PRIVATEDATA API #############################################
@@ -455,9 +449,9 @@ class OC_OCS {
 	* @param string $key
 	* @return string xml/json
 	*/
-	private static function privateDataGet($format,$app="",$key="") {
+	private static function privateDataGet($format, $app="", $key="") {
 		$user=OC_OCS::checkpassword();
-		$result=OC_OCS::getData($user,$app,$key);
+		$result=OC_OCS::getData($user, $app, $key);
 		$xml=array();
 		foreach($result as $i=>$log) {
 			$xml[$i]['key']=$log['key'];
@@ -480,8 +474,8 @@ class OC_OCS {
 	*/
 	private static function privateDataSet($format, $app, $key, $value) {
 		$user=OC_OCS::checkpassword();
-		if(OC_OCS::setData($user,$app,$key,$value)) {
-			echo(OC_OCS::generatexml($format,'ok',100,''));
+		if(OC_OCS::setData($user, $app, $key, $value)) {
+			echo(OC_OCS::generatexml($format, 'ok', 100, ''));
 		}
 	}
 
@@ -497,8 +491,8 @@ class OC_OCS {
 			return; //key and app are NOT optional here
 		}
 		$user=OC_OCS::checkpassword();
-		if(OC_OCS::deleteData($user,$app,$key)) {
-			echo(OC_OCS::generatexml($format,'ok',100,''));
+		if(OC_OCS::deleteData($user, $app, $key)) {
+			echo(OC_OCS::generatexml($format, 'ok', 100, ''));
 		}
 	}
 
@@ -510,7 +504,7 @@ class OC_OCS {
 	* @param bool $like use LIKE instead of = when comparing keys
 	* @return array
 	*/
-	public static function getData($user,$app="",$key="") {
+	public static function getData($user, $app="", $key="") {
 		if($app) {
 			$apps=array($app);
 		}else{
@@ -520,14 +514,14 @@ class OC_OCS {
 			$keys=array($key);
 		}else{
 			foreach($apps as $app) {
-				$keys=OC_Preferences::getKeys($user,$app);
+				$keys=OC_Preferences::getKeys($user, $app);
 			}
 		}
 		$result=array();
 		foreach($apps as $app) {
 			foreach($keys as $key) {
-				$value=OC_Preferences::getValue($user,$app,$key);
-				$result[]=array('app'=>$app,'key'=>$key,'value'=>$value);
+				$value=OC_Preferences::getValue($user, $app, $key);
+				$result[]=array('app'=>$app, 'key'=>$key, 'value'=>$value);
 			}
 		}
 		return $result;
@@ -542,7 +536,7 @@ class OC_OCS {
 	* @return bool
 	*/
 	public static function setData($user, $app, $key, $value) {
-		return OC_Preferences::setValue($user,$app,$key,$value);
+		return OC_Preferences::setValue($user, $app, $key, $value);
 	}
 
 	/**
@@ -553,7 +547,7 @@ class OC_OCS {
 	* @return string xml/json
 	*/
 	public static function deleteData($user, $app, $key) {
-		return OC_Preferences::deleteKey($user,$app,$key);
+		return OC_Preferences::deleteKey($user, $app, $key);
 	}
 
 

From db7a18455f938e580e4788c5806a4797d8214a80 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= <jfd@butonic.de>
Date: Mon, 10 Sep 2012 14:14:36 +0200
Subject: [PATCH 1193/1224] use tabs for indentation

---
 lib/setup.php | 344 +++++++++++++++++++++++++-------------------------
 1 file changed, 172 insertions(+), 172 deletions(-)

diff --git a/lib/setup.php b/lib/setup.php
index f27254a42a..67346799fe 100644
--- a/lib/setup.php
+++ b/lib/setup.php
@@ -9,7 +9,7 @@ $opts = array(
 	'hasSQLite' => $hasSQLite,
 	'hasMySQL' => $hasMySQL,
 	'hasPostgreSQL' => $hasPostgreSQL,
-        'hasOracle' => $hasOracle,
+	'hasOracle' => $hasOracle,
 	'directory' => $datadir,
 	'errors' => array(),
 );
@@ -51,10 +51,10 @@ class OC_Setup {
 		if($dbtype=='mysql' or $dbtype == 'pgsql' or $dbtype == 'oci') { //mysql and postgresql needs more config options
 			if($dbtype=='mysql')
 				$dbprettyname = 'MySQL';
-                        else if($dbtype=='pgsql')
-                                $dbprettyname = 'PostgreSQL';
-                        else
-                                $dbprettyname = 'Oracle';
+			else if($dbtype=='pgsql')
+					$dbprettyname = 'PostgreSQL';
+			else
+					$dbprettyname = 'Oracle';
 
 
 			if(empty($options['dbuser'])) {
@@ -232,117 +232,117 @@ class OC_Setup {
 					}
 				}
 			}
-                        elseif($dbtype == 'oci') {
-                                $dbuser = $options['dbuser'];
-                                $dbpass = $options['dbpass'];
-                                $dbname = $options['dbname'];
-                                $dbtablespace = $options['dbtablespace'];
-                                $dbhost = $options['dbhost'];
-                                $dbtableprefix = isset($options['dbtableprefix']) ? $options['dbtableprefix'] : 'oc_';
-                                OC_CONFIG::setValue('dbname', $dbname);
-                                OC_CONFIG::setValue('dbtablespace', $dbtablespace);
-                                OC_CONFIG::setValue('dbhost', $dbhost);
-                                OC_CONFIG::setValue('dbtableprefix', $dbtableprefix);
+			elseif($dbtype == 'oci') {
+				$dbuser = $options['dbuser'];
+				$dbpass = $options['dbpass'];
+				$dbname = $options['dbname'];
+				$dbtablespace = $options['dbtablespace'];
+				$dbhost = $options['dbhost'];
+				$dbtableprefix = isset($options['dbtableprefix']) ? $options['dbtableprefix'] : 'oc_';
+				OC_CONFIG::setValue('dbname', $dbname);
+				OC_CONFIG::setValue('dbtablespace', $dbtablespace);
+				OC_CONFIG::setValue('dbhost', $dbhost);
+				OC_CONFIG::setValue('dbtableprefix', $dbtableprefix);
 
-                                $e_host = addslashes($dbhost);
-                                $e_dbname = addslashes($dbname);
-                                //check if the database user has admin right
-                                $connection_string = '//'.$e_host.'/'.$e_dbname;
-                                $connection = @oci_connect($dbuser, $dbpass, $connection_string);
-                                if(!$connection) {
-                                        $e = oci_error();
-                                        $error[] = array(
-                                                'error' => 'Oracle 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 oracle
+				$e_host = addslashes($dbhost);
+				$e_dbname = addslashes($dbname);
+				//check if the database user has admin right
+				$connection_string = '//'.$e_host.'/'.$e_dbname;
+				$connection = @oci_connect($dbuser, $dbpass, $connection_string);
+				if(!$connection) {
+					$e = oci_error();
+					$error[] = array(
+						'error' => 'Oracle 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 oracle
 
-                                        $query="SELECT count(*) FROM user_role_privs, role_sys_privs WHERE user_role_privs.granted_role = role_sys_privs.role AND privilege = 'CREATE ROLE'";
-                                        $stmt = oci_parse($connection, $query);
-                                        if (!$stmt) {
-                                                $entry='DB Error: "'.oci_last_error($connection).'"<br />';
-                                                $entry.='Offending command was: '.$query.'<br />';
-                                                echo($entry);
-                                        }
-                                        $result = oci_execute($stmt);
-                                        if($result) {
-                                                $row = oci_fetch_row($stmt);
-                                        }
-                                        if($result and $row[0] > 0) {
-                                                //use the admin login data for the new database user
+					$query="SELECT count(*) FROM user_role_privs, role_sys_privs WHERE user_role_privs.granted_role = role_sys_privs.role AND privilege = 'CREATE ROLE'";
+					$stmt = oci_parse($connection, $query);
+					if (!$stmt) {
+						$entry='DB Error: "'.oci_last_error($connection).'"<br />';
+						$entry.='Offending command was: '.$query.'<br />';
+						echo($entry);
+					}
+					$result = oci_execute($stmt);
+					if($result) {
+						$row = oci_fetch_row($stmt);
+					}
+					if($result and $row[0] > 0) {
+						//use the admin login data for the new database user
 
-                                                //add prefix to the oracle user name to prevent collisions
-                                                $dbusername='oc_'.$username;
-                                                //create a new password so we don't need to store the admin config in the config file
-                                                $dbpassword=md5(time().$dbpass);
+						//add prefix to the oracle user name to prevent collisions
+						$dbusername='oc_'.$username;
+						//create a new password so we don't need to store the admin config in the config file
+						$dbpassword=md5(time().$dbpass);
 
-                                                //oracle passwords are treated as identifiers:
-                                                //  must start with aphanumeric char
-                                                //  needs to be shortened to 30 bytes, as the two " needed to escape the identifier count towards the identifier length.
-                                                $dbpassword=substr($dbpassword, 0, 30);
+						//oracle passwords are treated as identifiers:
+						//  must start with aphanumeric char
+						//  needs to be shortened to 30 bytes, as the two " needed to escape the identifier count towards the identifier length.
+						$dbpassword=substr($dbpassword, 0, 30);
 
-                                                self::oci_createDBUser($dbusername, $dbpassword, $dbtablespace, $connection);
+						self::oci_createDBUser($dbusername, $dbpassword, $dbtablespace, $connection);
 
-                                                OC_CONFIG::setValue('dbuser', $dbusername);
-                                                OC_CONFIG::setValue('dbname', $dbusername);
-                                                OC_CONFIG::setValue('dbpassword', $dbpassword);
+						OC_CONFIG::setValue('dbuser', $dbusername);
+						OC_CONFIG::setValue('dbname', $dbusername);
+						OC_CONFIG::setValue('dbpassword', $dbpassword);
 
-                                                //create the database not neccessary, oracle implies user = schema
-                                                //self::oci_createDatabase($dbname, $dbusername, $connection);
-                                        } else {
+						//create the database not neccessary, oracle implies user = schema
+						//self::oci_createDatabase($dbname, $dbusername, $connection);
+					} else {
 
-                                                OC_CONFIG::setValue('dbuser', $dbuser);
-                                                OC_CONFIG::setValue('dbname', $dbname);
-                                                OC_CONFIG::setValue('dbpassword', $dbpass);
+						OC_CONFIG::setValue('dbuser', $dbuser);
+						OC_CONFIG::setValue('dbname', $dbname);
+						OC_CONFIG::setValue('dbpassword', $dbpass);
 
-                                                //create the database not neccessary, oracle implies user = schema
-                                                //self::oci_createDatabase($dbname, $dbuser, $connection);
-                                        }
+						//create the database not neccessary, oracle implies user = schema
+						//self::oci_createDatabase($dbname, $dbuser, $connection);
+					}
 
-                                        //FIXME check tablespace exists: select * from user_tablespaces
+					//FIXME check tablespace exists: select * from user_tablespaces
 
-                                        // the connection to dbname=oracle is not needed anymore
-                                        oci_close($connection);
+					// the connection to dbname=oracle is not needed anymore
+					oci_close($connection);
 
-                                        // connect to the oracle database (schema=$dbuser) an check if the schema needs to be filled
-                                        $dbuser = OC_CONFIG::getValue('dbuser');
-                                        //$dbname = OC_CONFIG::getValue('dbname');
-                                        $dbpass = OC_CONFIG::getValue('dbpassword');
+					// connect to the oracle database (schema=$dbuser) an check if the schema needs to be filled
+					$dbuser = OC_CONFIG::getValue('dbuser');
+					//$dbname = OC_CONFIG::getValue('dbname');
+					$dbpass = OC_CONFIG::getValue('dbpassword');
 
-                                        $e_host = addslashes($dbhost);
-                                        $e_dbname = addslashes($dbname);
+					$e_host = addslashes($dbhost);
+					$e_dbname = addslashes($dbname);
 
-                                        $connection_string = '//'.$e_host.'/'.$e_dbname;
-                                        $connection = @oci_connect($dbuser, $dbpass, $connection_string);
-                                        if(!$connection) {
-                                                $error[] = array(
-                                                        'error' => 'Oracle username and/or password not valid',
-                                                        'hint' => 'You need to enter either an existing account or the administrator.'
-                                                );
-                                                return $error;
-                                        } else {
-                                                $query = "SELECT count(*) FROM user_tables WHERE table_name = :un";
-                                                $stmt = oci_parse($connection, $query);
-                                                $un = $dbtableprefix.'users';
-                                                oci_bind_by_name($stmt, ':un', $un);
-                                                if (!$stmt) {
-                                                        $entry='DB Error: "'.oci_last_error($connection).'"<br />';
-                                                        $entry.='Offending command was: '.$query.'<br />';
-                                                        echo($entry);
-                                                }
-                                                $result = oci_execute($stmt);
+					$connection_string = '//'.$e_host.'/'.$e_dbname;
+					$connection = @oci_connect($dbuser, $dbpass, $connection_string);
+					if(!$connection) {
+						$error[] = array(
+							'error' => 'Oracle username and/or password not valid',
+							'hint' => 'You need to enter either an existing account or the administrator.'
+						);
+						return $error;
+					} else {
+						$query = "SELECT count(*) FROM user_tables WHERE table_name = :un";
+						$stmt = oci_parse($connection, $query);
+						$un = $dbtableprefix.'users';
+						oci_bind_by_name($stmt, ':un', $un);
+						if (!$stmt) {
+							$entry='DB Error: "'.oci_last_error($connection).'"<br />';
+							$entry.='Offending command was: '.$query.'<br />';
+							echo($entry);
+						}
+						$result = oci_execute($stmt);
 
-                                                if($result) {
-                                                        $row = oci_fetch_row($stmt);
-                                                }
-                                                if(!$result or $row[0]==0) {
-                                                        OC_DB::createDbFromStructure('db_structure.xml');
-                                                }
-                                        }
-                                }
-                        }
+						if($result) {
+							$row = oci_fetch_row($stmt);
+						}
+						if(!$result or $row[0]==0) {
+							OC_DB::createDbFromStructure('db_structure.xml');
+						}
+					}
+				}
+			}
 			else {
 				//delete the old sqlite database first, might cause infinte loops otherwise
 				if(file_exists("$datadir/owncloud.db")) {
@@ -462,79 +462,79 @@ class OC_Setup {
 			}
 		}
 	}
-        /**
-         *
-         * @param String $name
-         * @param String $password
-         * @param String $tablespace
-         * @param resource $connection
-         */
-        private static function oci_createDBUser($name, $password, $tablespace, $connection) {
+	/**
+	 *
+	 * @param String $name
+	 * @param String $password
+	 * @param String $tablespace
+	 * @param resource $connection
+	 */
+	private static function oci_createDBUser($name, $password, $tablespace, $connection) {
 
-                $query = "SELECT * FROM all_users WHERE USERNAME = :un";
-                $stmt = oci_parse($connection, $query);
-                if (!$stmt) {
-                        $entry='DB Error: "'.oci_error($connection).'"<br />';
-                        $entry.='Offending command was: '.$query.'<br />';
-                        echo($entry);
-                }
-                oci_bind_by_name($stmt, ':un', $name);
-                $result = oci_execute($stmt);
-                if(!$result) {
-                        $entry='DB Error: "'.oci_error($connection).'"<br />';
-                        $entry.='Offending command was: '.$query.'<br />';
-                        echo($entry);
-                }
+		$query = "SELECT * FROM all_users WHERE USERNAME = :un";
+		$stmt = oci_parse($connection, $query);
+		if (!$stmt) {
+			$entry='DB Error: "'.oci_error($connection).'"<br />';
+			$entry.='Offending command was: '.$query.'<br />';
+			echo($entry);
+		}
+		oci_bind_by_name($stmt, ':un', $name);
+		$result = oci_execute($stmt);
+		if(!$result) {
+			$entry='DB Error: "'.oci_error($connection).'"<br />';
+			$entry.='Offending command was: '.$query.'<br />';
+			echo($entry);
+		}
 
-                if(! oci_fetch_row($stmt)) {
-                        //user does not exists let's create it :)
-                        //password must start with alphabetic character in oracle
-                        $query = 'CREATE USER '.$name.' IDENTIFIED BY "'.$password.'" DEFAULT TABLESPACE '.$tablespace; //TODO set default tablespace
-                        $stmt = oci_parse($connection, $query);
-                        if (!$stmt) {
-                                $entry='DB Error: "'.oci_error($connection).'"<br />';
-                                $entry.='Offending command was: '.$query.'<br />';
-                                echo($entry);
-                        }
-                        //oci_bind_by_name($stmt, ':un', $name);
-                        $result = oci_execute($stmt);
-                        if(!$result) {
-                                $entry='DB Error: "'.oci_error($connection).'"<br />';
-                                $entry.='Offending command was: '.$query.', name:'.$name.', password:'.$password.'<br />';
-                                echo($entry);
-                        }
-                } else { // change password of the existing role
-                        $query = "ALTER USER :un IDENTIFIED BY :pw";
-                        $stmt = oci_parse($connection, $query);
-                        if (!$stmt) {
-                                $entry='DB Error: "'.oci_error($connection).'"<br />';
-                                $entry.='Offending command was: '.$query.'<br />';
-                                echo($entry);
-                        }
-                        oci_bind_by_name($stmt, ':un', $name);
-                        oci_bind_by_name($stmt, ':pw', $password);
-                        $result = oci_execute($stmt);
-                        if(!$result) {
-                                $entry='DB Error: "'.oci_error($connection).'"<br />';
-                                $entry.='Offending command was: '.$query.'<br />';
-                                echo($entry);
-                        }
-                }
-                // grant neccessary roles
-                $query = 'GRANT CREATE SESSION, CREATE TABLE, CREATE SEQUENCE, CREATE TRIGGER, UNLIMITED TABLESPACE TO '.$name;
-                $stmt = oci_parse($connection, $query);
-                if (!$stmt) {
-                        $entry='DB Error: "'.oci_error($connection).'"<br />';
-                        $entry.='Offending command was: '.$query.'<br />';
-                        echo($entry);
-                }
-                $result = oci_execute($stmt);
-                if(!$result) {
-                        $entry='DB Error: "'.oci_error($connection).'"<br />';
-                        $entry.='Offending command was: '.$query.', name:'.$name.', password:'.$password.'<br />';
-                        echo($entry);
-                }
-        }
+		if(! oci_fetch_row($stmt)) {
+			//user does not exists let's create it :)
+			//password must start with alphabetic character in oracle
+			$query = 'CREATE USER '.$name.' IDENTIFIED BY "'.$password.'" DEFAULT TABLESPACE '.$tablespace; //TODO set default tablespace
+			$stmt = oci_parse($connection, $query);
+			if (!$stmt) {
+				$entry='DB Error: "'.oci_error($connection).'"<br />';
+				$entry.='Offending command was: '.$query.'<br />';
+				echo($entry);
+			}
+			//oci_bind_by_name($stmt, ':un', $name);
+			$result = oci_execute($stmt);
+			if(!$result) {
+				$entry='DB Error: "'.oci_error($connection).'"<br />';
+				$entry.='Offending command was: '.$query.', name:'.$name.', password:'.$password.'<br />';
+				echo($entry);
+			}
+		} else { // change password of the existing role
+			$query = "ALTER USER :un IDENTIFIED BY :pw";
+			$stmt = oci_parse($connection, $query);
+			if (!$stmt) {
+				$entry='DB Error: "'.oci_error($connection).'"<br />';
+				$entry.='Offending command was: '.$query.'<br />';
+				echo($entry);
+			}
+			oci_bind_by_name($stmt, ':un', $name);
+			oci_bind_by_name($stmt, ':pw', $password);
+			$result = oci_execute($stmt);
+			if(!$result) {
+				$entry='DB Error: "'.oci_error($connection).'"<br />';
+				$entry.='Offending command was: '.$query.'<br />';
+				echo($entry);
+			}
+		}
+		// grant neccessary roles
+		$query = 'GRANT CREATE SESSION, CREATE TABLE, CREATE SEQUENCE, CREATE TRIGGER, UNLIMITED TABLESPACE TO '.$name;
+		$stmt = oci_parse($connection, $query);
+		if (!$stmt) {
+			$entry='DB Error: "'.oci_error($connection).'"<br />';
+			$entry.='Offending command was: '.$query.'<br />';
+			echo($entry);
+		}
+		$result = oci_execute($stmt);
+		if(!$result) {
+			$entry='DB Error: "'.oci_error($connection).'"<br />';
+			$entry.='Offending command was: '.$query.', name:'.$name.', password:'.$password.'<br />';
+			echo($entry);
+		}
+	}
 
 	/**
 	 * create .htaccess files for apache hosts

From 463b48b2e1e337c1531f094b26cae79d11bdcf27 Mon Sep 17 00:00:00 2001
From: Georg Ehrke <dev@georgswebsite.de>
Date: Mon, 10 Sep 2012 14:40:54 +0200
Subject: [PATCH 1194/1224] fix file upload

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

diff --git a/lib/filesystemview.php b/lib/filesystemview.php
index 743f940301..3a17af510c 100644
--- a/lib/filesystemview.php
+++ b/lib/filesystemview.php
@@ -295,12 +295,12 @@ class OC_FilesystemView {
 							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)
-					);
+					);*/
 					OC_FileProxy::runPostProxies('file_put_contents', $absolutePath, $count);
 					return $count > 0;
 				}else{

From 6a29bbda7ad87c8bd606c606d237f4c9a0cca9eb Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <thomas.mueller@tmit.eu>
Date: Tue, 11 Sep 2012 02:03:53 +0200
Subject: [PATCH 1195/1224] [tx-robot] updated from transifex

---
 apps/files/l10n/ca.php              |  2 +
 apps/files/l10n/de.php              |  2 +
 apps/files/l10n/vi.php              | 23 +++++++++-
 apps/files_external/l10n/uk.php     |  5 ++
 apps/files_sharing/l10n/uk.php      |  4 ++
 apps/user_ldap/l10n/uk.php          |  4 ++
 apps/user_ldap/l10n/vi.php          | 13 ++++++
 core/l10n/uk.php                    | 17 +++++++
 l10n/ca/files.po                    | 10 ++--
 l10n/de/files.po                    |  9 ++--
 l10n/fr/settings.po                 |  9 ++--
 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/lib.pot              |  2 +-
 l10n/templates/settings.pot         |  2 +-
 l10n/templates/user_ldap.pot        |  2 +-
 l10n/uk/core.po                     | 71 +++++++++++++++--------------
 l10n/uk/files_external.po           | 15 +++---
 l10n/uk/files_sharing.po            | 15 +++---
 l10n/uk/lib.po                      | 43 ++++++++---------
 l10n/uk/user_ldap.po                | 13 +++---
 l10n/vi/files.po                    | 48 +++++++++----------
 l10n/vi/user_ldap.po                | 31 +++++++------
 lib/l10n/uk.php                     |  3 +-
 settings/l10n/fr.php                |  2 +-
 29 files changed, 217 insertions(+), 140 deletions(-)
 create mode 100644 apps/files_external/l10n/uk.php
 create mode 100644 apps/files_sharing/l10n/uk.php
 create mode 100644 apps/user_ldap/l10n/uk.php
 create mode 100644 apps/user_ldap/l10n/vi.php

diff --git a/apps/files/l10n/ca.php b/apps/files/l10n/ca.php
index 336f59ae86..26c6ad4de6 100644
--- a/apps/files/l10n/ca.php
+++ b/apps/files/l10n/ca.php
@@ -7,6 +7,7 @@
 "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",
@@ -15,6 +16,7 @@
 "replaced" => "substituït",
 "undo" => "desfés",
 "with" => "per",
+"unshared" => "No compartits",
 "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",
diff --git a/apps/files/l10n/de.php b/apps/files/l10n/de.php
index 3db6af8477..324fae16f0 100644
--- a/apps/files/l10n/de.php
+++ b/apps/files/l10n/de.php
@@ -7,6 +7,7 @@
 "Missing a temporary folder" => "Temporärer Ordner fehlt.",
 "Failed to write to disk" => "Fehler beim Schreiben auf die Festplatte",
 "Files" => "Dateien",
+"Unshare" => "Nicht mehr teilen",
 "Delete" => "Löschen",
 "already exists" => "ist bereits vorhanden",
 "replace" => "ersetzen",
@@ -15,6 +16,7 @@
 "replaced" => "ersetzt",
 "undo" => "rückgängig machen",
 "with" => "mit",
+"unshared" => "Nicht mehr teilen",
 "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" => "Ihre Datei kann nicht hochgeladen werden, da sie ein Verzeichnis ist oder 0 Bytes hat.",
diff --git a/apps/files/l10n/vi.php b/apps/files/l10n/vi.php
index 876d5abe9a..ce7e0c219a 100644
--- a/apps/files/l10n/vi.php
+++ b/apps/files/l10n/vi.php
@@ -1,10 +1,28 @@
 <?php $TRANSLATIONS = array(
 "There is no error, the file uploaded with success" => "Không có lỗi, các tập tin đã được tải lên thành công",
+"The uploaded file exceeds the upload_max_filesize directive in php.ini" => "Những tập tin được tải lên vượt quá upload_max_filesize được chỉ định trong php.ini",
+"The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form" => "Kích thước những tập tin tải lên vượt quá MAX_FILE_SIZE đã được quy định",
+"The uploaded file was only partially uploaded" => "Tập tin tải lên mới chỉ tải lên được một phần",
+"No file was uploaded" => "Không có tập tin nào được tải lên",
+"Missing a temporary folder" => "Không tìm thấy thư mục tạm",
+"Failed to write to disk" => "Không thể ghi vào đĩa cứng",
 "Files" => "Tập tin",
+"Unshare" => "Không chia sẽ",
 "Delete" => "Xóa",
+"already exists" => "đã tồn tại",
+"replace" => "thay thế",
+"suggest name" => "tên gợi ý",
+"cancel" => "hủy",
+"replaced" => "đã được thay thế",
+"undo" => "lùi lại",
+"with" => "với",
+"deleted" => "đã xóa",
+"generating ZIP-file, it may take some time." => "Tạo tập tinh ZIP, điều này có thể mất một ít thời gian",
+"Unable to upload your file as it is a directory or has 0 bytes" => "Không thể tải lên tập tin này do nó là một thư mục hoặc kích thước tập tin bằng 0 byte",
 "Upload Error" => "Tải lên lỗi",
 "Pending" => "Chờ",
 "Upload cancelled." => "Hủy tải lên",
+"File upload is in progress. Leaving the page now will cancel the upload." => "Tập tin tải lên đang được xử lý. Nếu bạn rời khỏi trang bây giờ sẽ hủy quá trình này.",
 "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",
@@ -14,9 +32,11 @@
 "files" => "files",
 "File handling" => "Xử lý tập tin",
 "Maximum upload size" => "Kích thước tối đa ",
+"Needed for multi-file and folder downloads." => "Cần thiết cho tải nhiều tập tin và thư mục.",
 "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",
+"Save" => "Lưu",
 "New" => "Mới",
 "Text file" => "Tập tin văn bản",
 "Folder" => "Folder",
@@ -29,5 +49,6 @@
 "Download" => "Tải xuống",
 "Upload too large" => "File tải lên quá lớn",
 "The files you are trying to upload exceed the maximum size for file uploads on this server." => "Các tập tin bạn đang cố gắng tải lên vượt quá kích thước tối đa cho phép trên máy chủ này.",
-"Files are being scanned, please wait." => "Tập tin đang được quét ,vui lòng chờ."
+"Files are being scanned, please wait." => "Tập tin đang được quét ,vui lòng chờ.",
+"Current scanning" => "Hiện tại đang quét"
 );
diff --git a/apps/files_external/l10n/uk.php b/apps/files_external/l10n/uk.php
new file mode 100644
index 0000000000..79920b9014
--- /dev/null
+++ b/apps/files_external/l10n/uk.php
@@ -0,0 +1,5 @@
+<?php $TRANSLATIONS = array(
+"Groups" => "Групи",
+"Users" => "Користувачі",
+"Delete" => "Видалити"
+);
diff --git a/apps/files_sharing/l10n/uk.php b/apps/files_sharing/l10n/uk.php
new file mode 100644
index 0000000000..43b86a28c1
--- /dev/null
+++ b/apps/files_sharing/l10n/uk.php
@@ -0,0 +1,4 @@
+<?php $TRANSLATIONS = array(
+"Password" => "Пароль",
+"Download" => "Завантажити"
+);
diff --git a/apps/user_ldap/l10n/uk.php b/apps/user_ldap/l10n/uk.php
new file mode 100644
index 0000000000..fd6a88d237
--- /dev/null
+++ b/apps/user_ldap/l10n/uk.php
@@ -0,0 +1,4 @@
+<?php $TRANSLATIONS = array(
+"Password" => "Пароль",
+"Help" => "Допомога"
+);
diff --git a/apps/user_ldap/l10n/vi.php b/apps/user_ldap/l10n/vi.php
new file mode 100644
index 0000000000..7a6ac2665c
--- /dev/null
+++ b/apps/user_ldap/l10n/vi.php
@@ -0,0 +1,13 @@
+<?php $TRANSLATIONS = array(
+"Host" => "Máy chủ",
+"Password" => "Mật khẩu",
+"Port" => "Cổng",
+"Use TLS" => "Sử dụng TLS",
+"Turn off SSL certificate validation." => "Tắt xác thực chứng nhận SSL",
+"Not recommended, use for testing only." => "Không khuyến khích, Chỉ sử dụng để thử nghiệm.",
+"User Display Name Field" => "Hiển thị tên người sử dụng",
+"Group Display Name Field" => "Hiển thị tên nhóm",
+"in bytes" => "Theo Byte",
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Để trống tên người dùng (mặc định). Nếu không chỉ định thuộc tính LDAP/AD",
+"Help" => "Giúp đỡ"
+);
diff --git a/core/l10n/uk.php b/core/l10n/uk.php
index 4a10a9fc74..e84ec8f883 100644
--- a/core/l10n/uk.php
+++ b/core/l10n/uk.php
@@ -1,5 +1,21 @@
 <?php $TRANSLATIONS = array(
 "Settings" => "Налаштування",
+"January" => "Січень",
+"February" => "Лютий",
+"March" => "Березень",
+"April" => "Квітень",
+"May" => "Травень",
+"June" => "Червень",
+"July" => "Липень",
+"August" => "Серпень",
+"September" => "Вересень",
+"October" => "Жовтень",
+"November" => "Листопад",
+"December" => "Грудень",
+"Cancel" => "Відмінити",
+"No" => "Ні",
+"Yes" => "Так",
+"Error" => "Помилка",
 "You will receive a link to reset your password via Email." => "Ви отримаєте посилання для скидання вашого паролю на e-mail.",
 "Username" => "Ім'я користувача",
 "Your password was reset" => "Ваш пароль був скинутий",
@@ -10,6 +26,7 @@
 "Users" => "Користувачі",
 "Admin" => "Адміністратор",
 "Help" => "Допомога",
+"Add" => "Додати",
 "Password" => "Пароль",
 "Configure the database" => "Налаштування бази даних",
 "will be used" => "буде використано",
diff --git a/l10n/ca/files.po b/l10n/ca/files.po
index f43fdccfb5..09799489c8 100644
--- a/l10n/ca/files.po
+++ b/l10n/ca/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-09-08 02:01+0200\n"
-"PO-Revision-Date: 2012-09-08 00:02+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-11 02:02+0200\n"
+"PO-Revision-Date: 2012-09-10 07:25+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"
@@ -56,7 +56,7 @@ msgstr "Fitxers"
 
 #: js/fileactions.js:108 templates/index.php:62
 msgid "Unshare"
-msgstr ""
+msgstr "Deixa de compartir"
 
 #: js/fileactions.js:110 templates/index.php:64
 msgid "Delete"
@@ -92,7 +92,7 @@ msgstr "per"
 
 #: js/filelist.js:268
 msgid "unshared"
-msgstr ""
+msgstr "No compartits"
 
 #: js/filelist.js:270
 msgid "deleted"
diff --git a/l10n/de/files.po b/l10n/de/files.po
index 571a069b9c..406a0d2506 100644
--- a/l10n/de/files.po
+++ b/l10n/de/files.po
@@ -4,6 +4,7 @@
 # 
 # Translators:
 #   <admin@s-goecker.de>, 2012.
+# I Robot <thomas.mueller@tmit.eu>, 2012.
 # Jan-Christoph Borchardt <JanCBorchardt@fsfe.org>, 2011.
 # Jan-Christoph Borchardt <jan@unhosted.org>, 2011.
 # Marcel Kühlhorn <susefan93@gmx.de>, 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-09-08 02:01+0200\n"
-"PO-Revision-Date: 2012-09-08 00:02+0000\n"
+"POT-Creation-Date: 2012-09-11 02:02+0200\n"
+"PO-Revision-Date: 2012-09-10 13:09+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"
@@ -64,7 +65,7 @@ msgstr "Dateien"
 
 #: js/fileactions.js:108 templates/index.php:62
 msgid "Unshare"
-msgstr ""
+msgstr "Nicht mehr teilen"
 
 #: js/fileactions.js:110 templates/index.php:64
 msgid "Delete"
@@ -100,7 +101,7 @@ msgstr "mit"
 
 #: js/filelist.js:268
 msgid "unshared"
-msgstr ""
+msgstr "Nicht mehr teilen"
 
 #: js/filelist.js:270
 msgid "deleted"
diff --git a/l10n/fr/settings.po b/l10n/fr/settings.po
index bdf3e67d24..ae731ca30b 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:
+# Brice  <bmaron@gmail.com>, 2012.
 # Cyril Glapa <kyriog@gmail.com>, 2012.
 #   <fboulogne@april.org>, 2011.
 #   <florentin.lemoal@gmail.com>, 2012.
@@ -18,9 +19,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-06 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 13:18+0000\n"
-"Last-Translator: Romain DEP. <rom1dep@gmail.com>\n"
+"POT-Creation-Date: 2012-09-11 02:02+0200\n"
+"PO-Revision-Date: 2012-09-10 20:41+0000\n"
+"Last-Translator: Brice <bmaron@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"
@@ -200,7 +201,7 @@ msgstr "Voir la page des applications à l'url apps.owncloud.com"
 
 #: templates/apps.php:30
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
-msgstr "<span class=\"licence\"></span>-sous licence, par <span class=\"author\"></span>"
+msgstr "Distribué sous licence <span class=\"licence\"></span>, par <span class=\"author\"></span>"
 
 #: templates/help.php:9
 msgid "Documentation"
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index 932761bdcb..d9f9f4de0e 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-09-10 02:02+0200\n"
+"POT-Creation-Date: 2012-09-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 bd2aaf3f74..bfc75b5455 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-09-10 02:02+0200\n"
+"POT-Creation-Date: 2012-09-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_encryption.pot b/l10n/templates/files_encryption.pot
index 357ef03faf..0f964a37ff 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-09-10 02:02+0200\n"
+"POT-Creation-Date: 2012-09-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_external.pot b/l10n/templates/files_external.pot
index 37669ac70f..98d019bb92 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-09-10 02:02+0200\n"
+"POT-Creation-Date: 2012-09-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_sharing.pot b/l10n/templates/files_sharing.pot
index 0b0636f1de..b10575b0c7 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-09-10 02:02+0200\n"
+"POT-Creation-Date: 2012-09-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_versions.pot b/l10n/templates/files_versions.pot
index 7bc8ac862b..0368a7d338 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-09-10 02:02+0200\n"
+"POT-Creation-Date: 2012-09-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 3fa354b572..d30053736d 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-09-10 02:02+0200\n"
+"POT-Creation-Date: 2012-09-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 01583d6a5b..93f7e40d44 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-09-10 02:02+0200\n"
+"POT-Creation-Date: 2012-09-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/user_ldap.pot b/l10n/templates/user_ldap.pot
index 5df0ca0963..89ab2c5695 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-09-10 02:02+0200\n"
+"POT-Creation-Date: 2012-09-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/uk/core.po b/l10n/uk/core.po
index 532bd0a547..a544613a18 100644
--- a/l10n/uk/core.po
+++ b/l10n/uk/core.po
@@ -5,13 +5,14 @@
 # Translators:
 #   <dzubchikd@gmail.com>, 2012.
 # Soul Kim <warlock.rf@gmail.com>, 2012.
+#   <victor.dubiniuk@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-06 02:02+0200\n"
-"PO-Revision-Date: 2012-09-06 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-11 02:02+0200\n"
+"PO-Revision-Date: 2012-09-10 11:16+0000\n"
+"Last-Translator: VicDeo <victor.dubiniuk@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"
@@ -31,69 +32,69 @@ msgstr ""
 msgid "This category already exists: "
 msgstr ""
 
-#: js/js.js:208 templates/layout.user.php:60 templates/layout.user.php:61
+#: js/js.js:214 templates/layout.user.php:54 templates/layout.user.php:55
 msgid "Settings"
 msgstr "Налаштування"
 
-#: js/js.js:593
+#: js/js.js:642
 msgid "January"
-msgstr ""
+msgstr "Січень"
 
-#: js/js.js:593
+#: js/js.js:642
 msgid "February"
-msgstr ""
+msgstr "Лютий"
 
-#: js/js.js:593
+#: js/js.js:642
 msgid "March"
-msgstr ""
+msgstr "Березень"
 
-#: js/js.js:593
+#: js/js.js:642
 msgid "April"
-msgstr ""
+msgstr "Квітень"
 
-#: js/js.js:593
+#: js/js.js:642
 msgid "May"
-msgstr ""
+msgstr "Травень"
 
-#: js/js.js:593
+#: js/js.js:642
 msgid "June"
-msgstr ""
+msgstr "Червень"
 
-#: js/js.js:594
+#: js/js.js:643
 msgid "July"
-msgstr ""
+msgstr "Липень"
 
-#: js/js.js:594
+#: js/js.js:643
 msgid "August"
-msgstr ""
+msgstr "Серпень"
 
-#: js/js.js:594
+#: js/js.js:643
 msgid "September"
-msgstr ""
+msgstr "Вересень"
 
-#: js/js.js:594
+#: js/js.js:643
 msgid "October"
-msgstr ""
+msgstr "Жовтень"
 
-#: js/js.js:594
+#: js/js.js:643
 msgid "November"
-msgstr ""
+msgstr "Листопад"
 
-#: js/js.js:594
+#: js/js.js:643
 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"
@@ -105,7 +106,7 @@ msgstr ""
 
 #: js/oc-vcategories.js:68
 msgid "Error"
-msgstr ""
+msgstr "Помилка"
 
 #: lostpassword/index.php:26
 msgid "ownCloud password reset"
@@ -186,7 +187,7 @@ msgstr ""
 
 #: templates/edit_categories_dialog.php:14
 msgid "Add"
-msgstr ""
+msgstr "Додати"
 
 #: templates/installation.php:24
 msgid "Create an <strong>admin account</strong>"
@@ -237,11 +238,11 @@ msgstr ""
 msgid "Finish setup"
 msgstr "Завершити налаштування"
 
-#: templates/layout.guest.php:42
+#: templates/layout.guest.php:36
 msgid "web services under your control"
 msgstr "веб-сервіс під вашим контролем"
 
-#: templates/layout.user.php:45
+#: templates/layout.user.php:39
 msgid "Log out"
 msgstr "Вихід"
 
diff --git a/l10n/uk/files_external.po b/l10n/uk/files_external.po
index 4d2de48c58..c40b94e138 100644
--- a/l10n/uk/files_external.po
+++ b/l10n/uk/files_external.po
@@ -3,19 +3,20 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <victor.dubiniuk@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-09-11 02:02+0200\n"
+"PO-Revision-Date: 2012-09-10 10:46+0000\n"
+"Last-Translator: VicDeo <victor.dubiniuk@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"
+"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"
@@ -55,15 +56,15 @@ 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/uk/files_sharing.po b/l10n/uk/files_sharing.po
index cfebfcf491..411329b93c 100644
--- a/l10n/uk/files_sharing.po
+++ b/l10n/uk/files_sharing.po
@@ -3,23 +3,24 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <victor.dubiniuk@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-11 02:02+0200\n"
+"PO-Revision-Date: 2012-09-10 10:38+0000\n"
+"Last-Translator: VicDeo <victor.dubiniuk@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"
+"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/authenticate.php:4
 msgid "Password"
-msgstr ""
+msgstr "Пароль"
 
 #: templates/authenticate.php:6
 msgid "Submit"
@@ -27,12 +28,12 @@ msgstr ""
 
 #: templates/public.php:9 templates/public.php:19
 msgid "Download"
-msgstr ""
+msgstr "Завантажити"
 
 #: templates/public.php:18
 msgid "No preview available for"
 msgstr ""
 
-#: templates/public.php:23
+#: templates/public.php:25
 msgid "web services under your control"
 msgstr ""
diff --git a/l10n/uk/lib.po b/l10n/uk/lib.po
index d2a2e0eac4..4458c03b3f 100644
--- a/l10n/uk/lib.po
+++ b/l10n/uk/lib.po
@@ -4,41 +4,42 @@
 # 
 # Translators:
 #   <dzubchikd@gmail.com>, 2012.
+#   <victor.dubiniuk@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 02:01+0200\n"
-"PO-Revision-Date: 2012-09-01 00:02+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-11 02:02+0200\n"
+"PO-Revision-Date: 2012-09-10 11:28+0000\n"
+"Last-Translator: VicDeo <victor.dubiniuk@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"
+"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:288
+#: app.php:285
 msgid "Help"
 msgstr "Допомога"
 
-#: app.php:295
+#: app.php:292
 msgid "Personal"
 msgstr "Особисте"
 
-#: app.php:300
+#: app.php:297
 msgid "Settings"
 msgstr "Налаштування"
 
-#: app.php:305
+#: app.php:302
 msgid "Users"
 msgstr "Користувачі"
 
-#: app.php:312
+#: app.php:309
 msgid "Apps"
 msgstr "Додатки"
 
-#: app.php:314
+#: app.php:311
 msgid "Admin"
 msgstr "Адмін"
 
@@ -70,45 +71,45 @@ msgstr "Помилка автентифікації"
 msgid "Token expired. Please reload page."
 msgstr ""
 
-#: template.php:86
+#: template.php:87
 msgid "seconds ago"
 msgstr "секунди тому"
 
-#: template.php:87
+#: template.php:88
 msgid "1 minute ago"
 msgstr "1 хвилину тому"
 
-#: template.php:88
+#: template.php:89
 #, php-format
 msgid "%d minutes ago"
 msgstr "%d хвилин тому"
 
-#: template.php:91
+#: template.php:92
 msgid "today"
 msgstr "сьогодні"
 
-#: template.php:92
+#: template.php:93
 msgid "yesterday"
 msgstr "вчора"
 
-#: template.php:93
+#: template.php:94
 #, php-format
 msgid "%d days ago"
 msgstr "%d днів тому"
 
-#: template.php:94
+#: template.php:95
 msgid "last month"
 msgstr "минулого місяця"
 
-#: template.php:95
+#: template.php:96
 msgid "months ago"
 msgstr "місяці тому"
 
-#: template.php:96
+#: template.php:97
 msgid "last year"
 msgstr "минулого року"
 
-#: template.php:97
+#: template.php:98
 msgid "years ago"
 msgstr "роки тому"
 
@@ -123,4 +124,4 @@ msgstr ""
 
 #: updater.php:71
 msgid "updates check is disabled"
-msgstr ""
+msgstr "перевірка оновлень відключена"
diff --git a/l10n/uk/user_ldap.po b/l10n/uk/user_ldap.po
index d948126316..d82593c3df 100644
--- a/l10n/uk/user_ldap.po
+++ b/l10n/uk/user_ldap.po
@@ -3,19 +3,20 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <victor.dubiniuk@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-11 02:02+0200\n"
+"PO-Revision-Date: 2012-09-10 11:08+0000\n"
+"Last-Translator: VicDeo <victor.dubiniuk@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"
+"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"
@@ -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."
@@ -167,4 +168,4 @@ msgstr ""
 
 #: templates/settings.php:32
 msgid "Help"
-msgstr ""
+msgstr "Допомога"
diff --git a/l10n/vi/files.po b/l10n/vi/files.po
index e6cb256217..451fc69587 100644
--- a/l10n/vi/files.po
+++ b/l10n/vi/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-09-08 02:01+0200\n"
-"PO-Revision-Date: 2012-09-08 00:02+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-11 02:02+0200\n"
+"PO-Revision-Date: 2012-09-10 09:22+0000\n"
+"Last-Translator: mattheu_9x <mattheu_9x@yahoo.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"
@@ -25,29 +25,29 @@ msgstr "Không có lỗi, các tập tin đã được tải lên thành công"
 
 #: ajax/upload.php:21
 msgid "The uploaded file exceeds the upload_max_filesize directive in php.ini"
-msgstr ""
+msgstr "Những tập tin được tải lên vượt quá upload_max_filesize được chỉ định trong php.ini"
 
 #: ajax/upload.php:22
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
-msgstr ""
+msgstr "Kích thước những tập tin tải lên vượt quá MAX_FILE_SIZE đã được quy định"
 
 #: ajax/upload.php:23
 msgid "The uploaded file was only partially uploaded"
-msgstr ""
+msgstr "Tập tin tải lên mới chỉ tải lên được một phần"
 
 #: ajax/upload.php:24
 msgid "No file was uploaded"
-msgstr ""
+msgstr "Không có tập tin nào được tải lên"
 
 #: ajax/upload.php:25
 msgid "Missing a temporary folder"
-msgstr ""
+msgstr "Không tìm thấy thư mục tạm"
 
 #: ajax/upload.php:26
 msgid "Failed to write to disk"
-msgstr ""
+msgstr "Không thể ghi vào đĩa cứng"
 
 #: appinfo/app.php:6
 msgid "Files"
@@ -55,7 +55,7 @@ msgstr "Tập tin"
 
 #: js/fileactions.js:108 templates/index.php:62
 msgid "Unshare"
-msgstr ""
+msgstr "Không chia sẽ"
 
 #: js/fileactions.js:110 templates/index.php:64
 msgid "Delete"
@@ -63,31 +63,31 @@ msgstr "Xóa"
 
 #: js/filelist.js:186 js/filelist.js:188
 msgid "already exists"
-msgstr ""
+msgstr "đã tồn tại"
 
 #: js/filelist.js:186 js/filelist.js:188
 msgid "replace"
-msgstr ""
+msgstr "thay thế"
 
 #: js/filelist.js:186
 msgid "suggest name"
-msgstr ""
+msgstr "tên gợi ý"
 
 #: js/filelist.js:186 js/filelist.js:188
 msgid "cancel"
-msgstr ""
+msgstr "hủy"
 
 #: js/filelist.js:235 js/filelist.js:237
 msgid "replaced"
-msgstr ""
+msgstr "đã được thay thế"
 
 #: js/filelist.js:235 js/filelist.js:237 js/filelist.js:268 js/filelist.js:270
 msgid "undo"
-msgstr ""
+msgstr "lùi lại"
 
 #: js/filelist.js:237
 msgid "with"
-msgstr ""
+msgstr "với"
 
 #: js/filelist.js:268
 msgid "unshared"
@@ -95,15 +95,15 @@ msgstr ""
 
 #: js/filelist.js:270
 msgid "deleted"
-msgstr ""
+msgstr "đã xóa"
 
 #: js/files.js:179
 msgid "generating ZIP-file, it may take some time."
-msgstr ""
+msgstr "Tạo tập tinh ZIP, điều này có thể mất một ít thời gian"
 
 #: js/files.js:208
 msgid "Unable to upload your file as it is a directory or has 0 bytes"
-msgstr ""
+msgstr "Không thể tải lên tập tin này do nó là một thư mục hoặc kích thước tập tin bằng 0 byte"
 
 #: js/files.js:208
 msgid "Upload Error"
@@ -120,7 +120,7 @@ msgstr "Hủy tải lên"
 #: js/files.js:423
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
-msgstr ""
+msgstr "Tập tin tải lên đang được xử lý. Nếu bạn rời khỏi trang bây giờ sẽ hủy quá trình này."
 
 #: js/files.js:493
 msgid "Invalid name, '/' is not allowed."
@@ -164,7 +164,7 @@ msgstr ""
 
 #: templates/admin.php:9
 msgid "Needed for multi-file and folder downloads."
-msgstr ""
+msgstr "Cần thiết cho tải nhiều tập tin và thư mục."
 
 #: templates/admin.php:9
 msgid "Enable ZIP-download"
@@ -180,7 +180,7 @@ msgstr "Kích thước tối đa cho các tập tin ZIP"
 
 #: templates/admin.php:14
 msgid "Save"
-msgstr ""
+msgstr "Lưu"
 
 #: templates/index.php:7
 msgid "New"
@@ -238,4 +238,4 @@ msgstr "Tập tin đang được quét ,vui lòng chờ."
 
 #: templates/index.php:85
 msgid "Current scanning"
-msgstr ""
+msgstr "Hiện tại đang quét"
diff --git a/l10n/vi/user_ldap.po b/l10n/vi/user_ldap.po
index 6fd933c5b5..111219c720 100644
--- a/l10n/vi/user_ldap.po
+++ b/l10n/vi/user_ldap.po
@@ -3,23 +3,24 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <mattheu_9x@yahoo.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-11 02:02+0200\n"
+"PO-Revision-Date: 2012-09-10 08:50+0000\n"
+"Last-Translator: mattheu_9x <mattheu_9x@yahoo.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"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: templates/settings.php:8
 msgid "Host"
-msgstr ""
+msgstr "Máy chủ"
 
 #: templates/settings.php:8
 msgid ""
@@ -47,7 +48,7 @@ msgstr ""
 
 #: templates/settings.php:11
 msgid "Password"
-msgstr ""
+msgstr "Mật khẩu"
 
 #: 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 "Cổng"
 
 #: templates/settings.php:18
 msgid "Base User Tree"
@@ -111,7 +112,7 @@ msgstr ""
 
 #: templates/settings.php:21
 msgid "Use TLS"
-msgstr ""
+msgstr "Sử dụng 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 "Tắt xác thực chứng nhận SSL"
 
 #: templates/settings.php:23
 msgid ""
@@ -133,11 +134,11 @@ msgstr ""
 
 #: templates/settings.php:23
 msgid "Not recommended, use for testing only."
-msgstr ""
+msgstr "Không khuyến khích, Chỉ sử dụng để thử nghiệm."
 
 #: templates/settings.php:24
 msgid "User Display Name Field"
-msgstr ""
+msgstr "Hiển thị tên người sử dụng"
 
 #: templates/settings.php:24
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
@@ -145,7 +146,7 @@ msgstr ""
 
 #: templates/settings.php:25
 msgid "Group Display Name Field"
-msgstr ""
+msgstr "Hiển thị tên nhóm"
 
 #: templates/settings.php:25
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
@@ -153,7 +154,7 @@ msgstr ""
 
 #: templates/settings.php:27
 msgid "in bytes"
-msgstr ""
+msgstr "Theo Byte"
 
 #: templates/settings.php:29
 msgid "in seconds. A change empties the cache."
@@ -163,8 +164,8 @@ msgstr ""
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
-msgstr ""
+msgstr "Để trống tên người dùng (mặc định). Nếu không chỉ định thuộc tính LDAP/AD"
 
 #: templates/settings.php:32
 msgid "Help"
-msgstr ""
+msgstr "Giúp đỡ"
diff --git a/lib/l10n/uk.php b/lib/l10n/uk.php
index 18f6a4a623..423aa12b2d 100644
--- a/lib/l10n/uk.php
+++ b/lib/l10n/uk.php
@@ -20,5 +20,6 @@
 "last month" => "минулого місяця",
 "months ago" => "місяці тому",
 "last year" => "минулого року",
-"years ago" => "роки тому"
+"years ago" => "роки тому",
+"updates check is disabled" => "перевірка оновлень відключена"
 );
diff --git a/settings/l10n/fr.php b/settings/l10n/fr.php
index 7baa923bfc..906e80eabb 100644
--- a/settings/l10n/fr.php
+++ b/settings/l10n/fr.php
@@ -38,7 +38,7 @@
 "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",
-"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-sous licence, par <span class=\"author\"></span>",
+"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "Distribué sous licence <span class=\"licence\"></span>, par <span class=\"author\"></span>",
 "Documentation" => "Documentation",
 "Managing Big Files" => "Gérer les gros fichiers",
 "Ask a question" => "Poser une question",

From ff6141b1e9fa265557ddae11963a577a5a4eb240 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Mon, 10 Sep 2012 21:57:05 -0400
Subject: [PATCH 1196/1224] Change version number update occurs on to prevent
 problem with betas, users using the 4.5 betas will have to manually trigger
 the update if they want to get their old shared files back again

---
 apps/files_sharing/appinfo/update.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/apps/files_sharing/appinfo/update.php b/apps/files_sharing/appinfo/update.php
index cb6af2d5f0..eabd1167c9 100644
--- a/apps/files_sharing/appinfo/update.php
+++ b/apps/files_sharing/appinfo/update.php
@@ -1,6 +1,6 @@
 <?php
 $installedVersion = OCP\Config::getAppValue('files_sharing', 'installed_version');
-if (version_compare($installedVersion, '0.3.2', '<')) {
+if (version_compare($installedVersion, '0.3', '<')) {
 	$query = OCP\DB::prepare('SELECT * FROM `*PREFIX*sharing`');
 	$result = $query->execute();
 	$groupShares = array();

From 37f0b85d3f0517a1548a0e62d1d1aa1b04e0c79c Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Tue, 11 Sep 2012 00:37:31 -0400
Subject: [PATCH 1197/1224] Fix problem with non share collection item types
 being treated as collections

---
 lib/public/share.php | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/lib/public/share.php b/lib/public/share.php
index 6186c2d1c1..ccb5a56ac7 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -458,8 +458,11 @@ class Share {
 				$collectionTypes[] = $type;
 			}
 		}
+		if (!self::getBackend($itemType) instanceof Share_Backend_Collection) {
+			unset($collectionTypes[0]);
+		}
 		// Return array if collections were found or the item type is a collection itself - collections can be inside collections
-		if (count($collectionTypes) > 1 || self::getBackend($itemType) instanceof Share_Backend_Collection) {
+		if (count($collectionTypes) > 0) {
 			return $collectionTypes;
 		}
 		return false;
@@ -504,9 +507,14 @@ class Share {
 			$root = '';
 			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
-				$placeholders = join(',', array_fill(0, count($collectionTypes), '?'));
-				$where .= ' OR item_type IN ('.$placeholders.'))';
-				$queryArgs = $collectionTypes;
+				if (!in_array($itemType, $collectionTypes)) {
+					$itemTypes = array_merge(array($itemType), $collectionTypes);
+				} else {
+					$itemTypes = $collectionTypes;
+				}
+				$placeholders = join(',', array_fill(0, count($itemTypes), '?'));
+				$where .= ' WHERE item_type IN ('.$placeholders.'))';
+				$queryArgs = $itemTypes;
 			} else {
 				$where = ' WHERE `item_type` = ?';
 				$queryArgs = array($itemType);
@@ -580,7 +588,7 @@ class Share {
 				}
 			}
 			$queryArgs[] = $item;
-			if ($includeCollections && $collectionTypes = self::getCollectionItemTypes($itemType)) {
+			if ($includeCollections && $collectionTypes) {
 				$placeholders = join(',', array_fill(0, count($collectionTypes), '?'));
 				$where .= ' OR item_type IN ('.$placeholders.'))';
 				$queryArgs = array_merge($queryArgs, $collectionTypes);
@@ -689,7 +697,7 @@ class Share {
 					}
 				}
 				// Check if this is a collection of the requested item type
-				if ($includeCollections && in_array($row['item_type'], $collectionTypes)) {
+				if ($includeCollections && $collectionTypes && in_array($row['item_type'], $collectionTypes)) {
 					if (($collectionBackend = self::getBackend($row['item_type'])) && $collectionBackend instanceof Share_Backend_Collection) {
 						// Collections can be inside collections, check if the item is a collection
 						if (isset($item) && $row['item_type'] == $itemType && $row[$column] == $item) {

From bf2d1e78f23e736f3306d4625b09b1beac9f6db3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= <jfd@butonic.de>
Date: Tue, 11 Sep 2012 13:16:34 +0200
Subject: [PATCH 1198/1224] don't set values with oc_appconfig when oc is not
 installed yet, allows to render guest page for installation again

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

diff --git a/lib/templatelayout.php b/lib/templatelayout.php
index d72f5552fd..c898628bcd 100644
--- a/lib/templatelayout.php
+++ b/lib/templatelayout.php
@@ -41,7 +41,7 @@ class OC_TemplateLayout extends OC_Template {
 		}
 		$this->assign( 'apps_paths', str_replace('\\/', '/',json_encode($apps_paths)),false ); // Ugly unescape slashes waiting for better solution
 
-		if (!OC_AppConfig::getValue('core', 'remote_core.css', false)) {
+		if (OC_Config::getValue('installed', false) && !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');
 		}

From b6a106a920654efe8e73139dc2aec3a72f5215a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= <jfd@butonic.de>
Date: Tue, 11 Sep 2012 18:12:38 +0200
Subject: [PATCH 1199/1224] allow using only dbname for oracle

---
 lib/setup.php | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/lib/setup.php b/lib/setup.php
index 67346799fe..c21c8be395 100644
--- a/lib/setup.php
+++ b/lib/setup.php
@@ -63,7 +63,7 @@ class OC_Setup {
 			if(empty($options['dbname'])) {
 				$error[] = "$dbprettyname enter the database name.";
 			}
-			if(empty($options['dbhost'])) {
+			if($dbtype != 'oci' && empty($options['dbhost'])) {
 				$error[] = "$dbprettyname set the database host.";
 			}
 		}
@@ -237,7 +237,7 @@ class OC_Setup {
 				$dbpass = $options['dbpass'];
 				$dbname = $options['dbname'];
 				$dbtablespace = $options['dbtablespace'];
-				$dbhost = $options['dbhost'];
+				$dbhost = isset($options['dbhost'])?$options['dbhost']:'';
 				$dbtableprefix = isset($options['dbtableprefix']) ? $options['dbtableprefix'] : 'oc_';
 				OC_CONFIG::setValue('dbname', $dbname);
 				OC_CONFIG::setValue('dbtablespace', $dbtablespace);
@@ -247,8 +247,12 @@ class OC_Setup {
 				$e_host = addslashes($dbhost);
 				$e_dbname = addslashes($dbname);
 				//check if the database user has admin right
-				$connection_string = '//'.$e_host.'/'.$e_dbname;
-				$connection = @oci_connect($dbuser, $dbpass, $connection_string);
+				if ($e_host == '') {
+					$easy_connect_string = $e_dbname; // use dbname as easy connect name
+				} else {
+					$easy_connect_string = '//'.$e_host.'/'.$e_dbname;
+				}
+				$connection = @oci_connect($dbuser, $dbpass, $easy_connect_string);
 				if(!$connection) {
 					$e = oci_error();
 					$error[] = array(
@@ -314,8 +318,12 @@ class OC_Setup {
 					$e_host = addslashes($dbhost);
 					$e_dbname = addslashes($dbname);
 
-					$connection_string = '//'.$e_host.'/'.$e_dbname;
-					$connection = @oci_connect($dbuser, $dbpass, $connection_string);
+					if ($e_host == '') {
+						$easy_connect_string = $e_dbname; // use dbname as easy connect name
+					} else {
+						$easy_connect_string = '//'.$e_host.'/'.$e_dbname;
+					}
+					$connection = @oci_connect($dbuser, $dbpass, $easy_connect_string);
 					if(!$connection) {
 						$error[] = array(
 							'error' => 'Oracle username and/or password not valid',

From 5c1a79210f5db0a4942c6628350954d70e7a39ea Mon Sep 17 00:00:00 2001
From: Thomas Mueller <thomas.mueller@tmit.eu>
Date: Tue, 11 Sep 2012 23:51:12 +0200
Subject: [PATCH 1200/1224] added hint to restart the web server in case
 recetly installed php modules are still not available

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

diff --git a/lib/util.php b/lib/util.php
index 5046550d6a..f69dacaa22 100755
--- a/lib/util.php
+++ b/lib/util.php
@@ -200,9 +200,11 @@ class OC_Util {
 	public static function checkServer() {
 		$errors=array();
 
+		$web_server_restart= false;
 		//check for database drivers
 		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
+			$web_server_restart= true;
 		}
 
 		//common hint for all file permissons error messages
@@ -262,28 +264,40 @@ class OC_Util {
 		// check if all required php modules are present
 		if(!class_exists('ZipArchive')) {
 			$errors[]=array('error'=>'PHP module zip not installed.<br/>','hint'=>'Please ask your server administrator to install the module.');
+			$web_server_restart= false;
 		}
 
 		if(!function_exists('mb_detect_encoding')) {
 			$errors[]=array('error'=>'PHP module mb multibyte not installed.<br/>','hint'=>'Please ask your server administrator to install the module.');
+			$web_server_restart= false;
 		}
 		if(!function_exists('ctype_digit')) {
 			$errors[]=array('error'=>'PHP module ctype is not installed.<br/>','hint'=>'Please ask your server administrator to install the module.');
+			$web_server_restart= false;
 		}
 		if(!function_exists('json_encode')) {
 			$errors[]=array('error'=>'PHP module JSON is not installed.<br/>','hint'=>'Please ask your server administrator to install the module.');
+			$web_server_restart= false;
 		}
 		if(!function_exists('imagepng')) {
 			$errors[]=array('error'=>'PHP module GD is not installed.<br/>','hint'=>'Please ask your server administrator to install the module.');
+			$web_server_restart= false;
 		}
 		if(!function_exists('gzencode')) {
 			$errors[]=array('error'=>'PHP module zlib is not installed.<br/>','hint'=>'Please ask your server administrator to install the module.');
+			$web_server_restart= false;
 		}
 		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.');
+			$web_server_restart= false;
 		}
 		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.');
+			$web_server_restart= false;
+		}
+
+		if($web_server_restart) {
+			$errors[]=array('error'=>'PHP modules have been installed, but they are still listed as missing?<br/>','hint'=>'Please ask your server administrator to restart the web server.');
 		}
 
 		return $errors;

From 8c9c095d485f0b2e27d7e5636167169bb3aefca1 Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <thomas.mueller@tmit.eu>
Date: Wed, 12 Sep 2012 02:02:58 +0200
Subject: [PATCH 1201/1224] [tx-robot] updated from transifex

---
 apps/files/l10n/et_EE.php           |  5 +++
 apps/files/l10n/fr.php              |  1 +
 apps/files_sharing/l10n/zh_TW.php   |  6 ++++
 apps/files_versions/l10n/et_EE.php  |  2 ++
 apps/user_ldap/l10n/et_EE.php       | 22 ++++++++++++
 l10n/et_EE/files.po                 | 18 +++++-----
 l10n/et_EE/files_versions.po        | 12 +++----
 l10n/et_EE/lib.po                   | 46 ++++++++++++-------------
 l10n/et_EE/settings.po              | 40 +++++++++++-----------
 l10n/et_EE/user_ldap.po             | 52 ++++++++++++++---------------
 l10n/fr/files.po                    |  8 ++---
 l10n/ru/settings.po                 | 26 +++++++--------
 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/lib.pot              |  2 +-
 l10n/templates/settings.pot         |  2 +-
 l10n/templates/user_ldap.pot        |  2 +-
 l10n/zh_TW/files_sharing.po         | 19 ++++++-----
 l10n/zh_TW/settings.po              | 39 +++++++++++-----------
 lib/l10n/et_EE.php                  |  5 ++-
 settings/l10n/et_EE.php             | 16 +++++++++
 settings/l10n/ru.php                | 22 ++++++------
 settings/l10n/zh_TW.php             | 16 +++++++++
 27 files changed, 223 insertions(+), 150 deletions(-)
 create mode 100644 apps/files_sharing/l10n/zh_TW.php

diff --git a/apps/files/l10n/et_EE.php b/apps/files/l10n/et_EE.php
index 0763745788..88e9171928 100644
--- a/apps/files/l10n/et_EE.php
+++ b/apps/files/l10n/et_EE.php
@@ -7,19 +7,23 @@
 "Missing a temporary folder" => "Ajutiste failide kaust puudub",
 "Failed to write to disk" => "Kettale kirjutamine ebaõnnestus",
 "Files" => "Failid",
+"Unshare" => "Lõpeta jagamine",
 "Delete" => "Kustuta",
 "already exists" => "on juba olemas",
 "replace" => "asenda",
+"suggest name" => "soovita nime",
 "cancel" => "loobu",
 "replaced" => "asendatud",
 "undo" => "tagasi",
 "with" => "millega",
+"unshared" => "jagamata",
 "deleted" => "kustutatud",
 "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.",
+"File upload is in progress. Leaving the page now will cancel the upload." => "Faili üleslaadimine on töös.  Lehelt lahkumine katkestab selle üleslaadimise.",
 "Invalid name, '/' is not allowed." => "Vigane nimi, '/' pole lubatud.",
 "Size" => "Suurus",
 "Modified" => "Muudetud",
@@ -34,6 +38,7 @@
 "Enable ZIP-download" => "Luba ZIP-ina allalaadimine",
 "0 is unlimited" => "0 tähendab piiramatut",
 "Maximum input size for ZIP files" => "Maksimaalne ZIP-faili sisestatava faili suurus",
+"Save" => "Salvesta",
 "New" => "Uus",
 "Text file" => "Tekstifail",
 "Folder" => "Kaust",
diff --git a/apps/files/l10n/fr.php b/apps/files/l10n/fr.php
index bce17be3b5..929a2ffd4a 100644
--- a/apps/files/l10n/fr.php
+++ b/apps/files/l10n/fr.php
@@ -15,6 +15,7 @@
 "replaced" => "remplacé",
 "undo" => "annuler",
 "with" => "avec",
+"unshared" => "non partagée",
 "deleted" => "supprimé",
 "generating ZIP-file, it may take some time." => "Fichier ZIP en cours d'assemblage ;  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.",
diff --git a/apps/files_sharing/l10n/zh_TW.php b/apps/files_sharing/l10n/zh_TW.php
new file mode 100644
index 0000000000..27fa634c03
--- /dev/null
+++ b/apps/files_sharing/l10n/zh_TW.php
@@ -0,0 +1,6 @@
+<?php $TRANSLATIONS = array(
+"Password" => "密碼",
+"Submit" => "送出",
+"Download" => "下載",
+"No preview available for" => "無法預覽"
+);
diff --git a/apps/files_versions/l10n/et_EE.php b/apps/files_versions/l10n/et_EE.php
index d136ae241c..cfc48537e0 100644
--- a/apps/files_versions/l10n/et_EE.php
+++ b/apps/files_versions/l10n/et_EE.php
@@ -1,4 +1,6 @@
 <?php $TRANSLATIONS = array(
 "Expire all versions" => "Kõikide versioonide aegumine",
+"Versions" => "Versioonid",
+"This will delete all existing backup versions of your files" => "See kustutab kõik sinu failidest tehtud varuversiooni",
 "Enable Files Versioning" => "Luba failide versioonihaldus"
 );
diff --git a/apps/user_ldap/l10n/et_EE.php b/apps/user_ldap/l10n/et_EE.php
index d62e1212dc..f83142225e 100644
--- a/apps/user_ldap/l10n/et_EE.php
+++ b/apps/user_ldap/l10n/et_EE.php
@@ -1,9 +1,31 @@
 <?php $TRANSLATIONS = array(
 "Host" => "Host",
+"Base DN" => "Baas DN",
+"User DN" => "Kasutaja DN",
 "Password" => "Parool",
+"User Login Filter" => "Kasutajanime filter",
+"use %%uid placeholder, e.g. \"uid=%%uid\"" => "kasuta %%uid kohatäitjat, nt. \"uid=%%uid\"",
+"User List Filter" => "Kasutajate nimekirja filter",
+"Defines the filter to apply, when retrieving users." => "Määrab kasutajaid hankides filtri, mida rakendatakse.",
+"without any placeholder, e.g. \"objectClass=person\"." => "ilma ühegi kohatäitjata, nt. \"objectClass=person\".",
 "Group Filter" => "Grupi filter",
+"Defines the filter to apply, when retrieving groups." => "Määrab gruppe hankides filtri, mida rakendatakse.",
+"without any placeholder, e.g. \"objectClass=posixGroup\"." => "ilma ühegi kohatäitjata, nt. \"objectClass=posixGroup\".",
 "Port" => "Port",
+"Base User Tree" => "Baaskasutaja puu",
+"Base Group Tree" => "Baasgrupi puu",
+"Group-Member association" => "Grupiliikme seotus",
 "Use TLS" => "Kasutaja TLS",
+"Do not use it for SSL connections, it will fail." => "Ära kasuta seda SSL ühenduse jaoks, see ei toimi.",
+"Case insensitve LDAP server (Windows)" => "Mittetõstutundlik LDAP server (Windows)",
+"Turn off SSL certificate validation." => "Lülita SSL sertifikaadi kontrollimine välja.",
+"Not recommended, use for testing only." => "Pole soovitatav, kasuta ainult testimiseks.",
+"User Display Name Field" => "Kasutaja näidatava nime väli",
+"The LDAP attribute to use to generate the user`s ownCloud name." => "LDAP omadus, mida kasutatakse kasutaja ownCloudi nime loomiseks.",
+"Group Display Name Field" => "Grupi näidatava nime väli",
+"The LDAP attribute to use to generate the groups`s ownCloud name." => "LDAP omadus, mida kasutatakse ownCloudi grupi nime loomiseks.",
 "in bytes" => "baitides",
+"in seconds. A change empties the cache." => "sekundites. Muudatus tühjendab vahemälu.",
+"Leave empty for user name (default). Otherwise, specify an LDAP/AD attribute." => "Kasutajanime (vaikeväärtus) kasutamiseks jäta tühjaks. Vastasel juhul määra LDAP/AD omadus.",
 "Help" => "Abiinfo"
 );
diff --git a/l10n/et_EE/files.po b/l10n/et_EE/files.po
index 7ce5cdf145..a2e851dd2f 100644
--- a/l10n/et_EE/files.po
+++ b/l10n/et_EE/files.po
@@ -3,14 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
-# Rivo Zängov <eraser@eraser.ee>, 2011, 2012.
+# Rivo Zängov <eraser@eraser.ee>, 2011-2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-08 02:01+0200\n"
-"PO-Revision-Date: 2012-09-08 00:02+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-12 02:01+0200\n"
+"PO-Revision-Date: 2012-09-11 10:21+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"
@@ -54,7 +54,7 @@ msgstr "Failid"
 
 #: js/fileactions.js:108 templates/index.php:62
 msgid "Unshare"
-msgstr ""
+msgstr "Lõpeta jagamine"
 
 #: js/fileactions.js:110 templates/index.php:64
 msgid "Delete"
@@ -70,7 +70,7 @@ msgstr "asenda"
 
 #: js/filelist.js:186
 msgid "suggest name"
-msgstr ""
+msgstr "soovita nime"
 
 #: js/filelist.js:186 js/filelist.js:188
 msgid "cancel"
@@ -90,7 +90,7 @@ msgstr "millega"
 
 #: js/filelist.js:268
 msgid "unshared"
-msgstr ""
+msgstr "jagamata"
 
 #: js/filelist.js:270
 msgid "deleted"
@@ -119,7 +119,7 @@ msgstr "Üleslaadimine tühistati."
 #: js/files.js:423
 msgid ""
 "File upload is in progress. Leaving the page now will cancel the upload."
-msgstr ""
+msgstr "Faili üleslaadimine on töös.  Lehelt lahkumine katkestab selle üleslaadimise."
 
 #: js/files.js:493
 msgid "Invalid name, '/' is not allowed."
@@ -179,7 +179,7 @@ msgstr "Maksimaalne ZIP-faili sisestatava faili suurus"
 
 #: templates/admin.php:14
 msgid "Save"
-msgstr ""
+msgstr "Salvesta"
 
 #: templates/index.php:7
 msgid "New"
diff --git a/l10n/et_EE/files_versions.po b/l10n/et_EE/files_versions.po
index afd1bc89da..4344220fe7 100644
--- a/l10n/et_EE/files_versions.po
+++ b/l10n/et_EE/files_versions.po
@@ -8,15 +8,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 13:35+0200\n"
-"PO-Revision-Date: 2012-09-01 11:35+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-12 02:01+0200\n"
+"PO-Revision-Date: 2012-09-11 10:28+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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: et_EE\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: js/settings-personal.js:31 templates/settings-personal.php:10
 msgid "Expire all versions"
@@ -24,11 +24,11 @@ msgstr "Kõikide versioonide aegumine"
 
 #: templates/settings-personal.php:4
 msgid "Versions"
-msgstr ""
+msgstr "Versioonid"
 
 #: templates/settings-personal.php:7
 msgid "This will delete all existing backup versions of your files"
-msgstr ""
+msgstr "See kustutab kõik sinu failidest tehtud varuversiooni"
 
 #: templates/settings.php:3
 msgid "Enable Files Versioning"
diff --git a/l10n/et_EE/lib.po b/l10n/et_EE/lib.po
index 789beb732b..da4dcfe526 100644
--- a/l10n/et_EE/lib.po
+++ b/l10n/et_EE/lib.po
@@ -8,37 +8,37 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-01 02:01+0200\n"
-"PO-Revision-Date: 2012-09-01 00:02+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-12 02:01+0200\n"
+"PO-Revision-Date: 2012-09-11 10:18+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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: et_EE\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: app.php:288
+#: app.php:285
 msgid "Help"
 msgstr "Abiinfo"
 
-#: app.php:295
+#: app.php:292
 msgid "Personal"
 msgstr "Isiklik"
 
-#: app.php:300
+#: app.php:297
 msgid "Settings"
 msgstr "Seaded"
 
-#: app.php:305
+#: app.php:302
 msgid "Users"
 msgstr "Kasutajad"
 
-#: app.php:312
+#: app.php:309
 msgid "Apps"
 msgstr "Rakendused"
 
-#: app.php:314
+#: app.php:311
 msgid "Admin"
 msgstr "Admin"
 
@@ -70,57 +70,57 @@ msgstr "Autentimise viga"
 msgid "Token expired. Please reload page."
 msgstr "Kontrollkood aegus. Paelun lae leht uuesti."
 
-#: template.php:86
+#: template.php:87
 msgid "seconds ago"
 msgstr "sekundit tagasi"
 
-#: template.php:87
+#: template.php:88
 msgid "1 minute ago"
 msgstr "1 minut tagasi"
 
-#: template.php:88
+#: template.php:89
 #, php-format
 msgid "%d minutes ago"
 msgstr "%d minutit tagasi"
 
-#: template.php:91
+#: template.php:92
 msgid "today"
 msgstr "täna"
 
-#: template.php:92
+#: template.php:93
 msgid "yesterday"
 msgstr "eile"
 
-#: template.php:93
+#: template.php:94
 #, php-format
 msgid "%d days ago"
 msgstr "%d päeva tagasi"
 
-#: template.php:94
+#: template.php:95
 msgid "last month"
 msgstr "eelmisel kuul"
 
-#: template.php:95
+#: template.php:96
 msgid "months ago"
 msgstr "kuud tagasi"
 
-#: template.php:96
+#: template.php:97
 msgid "last year"
 msgstr "eelmisel aastal"
 
-#: template.php:97
+#: template.php:98
 msgid "years ago"
 msgstr "aastat tagasi"
 
 #: updater.php:66
 #, php-format
 msgid "%s is available. Get <a href=\"%s\">more information</a>"
-msgstr ""
+msgstr "%s on saadaval. Vaata <a href=\"%s\">lisainfot</a>"
 
 #: updater.php:68
 msgid "up to date"
-msgstr ""
+msgstr "ajakohane"
 
 #: updater.php:71
 msgid "updates check is disabled"
-msgstr ""
+msgstr "uuenduste kontrollimine on välja lülitatud"
diff --git a/l10n/et_EE/settings.po b/l10n/et_EE/settings.po
index 2060adcac0..90042b1958 100644
--- a/l10n/et_EE/settings.po
+++ b/l10n/et_EE/settings.po
@@ -4,14 +4,14 @@
 # 
 # Translators:
 #   <icewind1991@gmail.com>, 2012.
-# Rivo Zängov <eraser@eraser.ee>, 2011, 2012.
+# Rivo Zängov <eraser@eraser.ee>, 2011-2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-05 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-12 02:01+0200\n"
+"PO-Revision-Date: 2012-09-11 11:12+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"
@@ -30,11 +30,11 @@ msgstr "Autentimise viga"
 
 #: ajax/creategroup.php:19
 msgid "Group already exists"
-msgstr ""
+msgstr "Grupp on juba olemas"
 
 #: ajax/creategroup.php:28
 msgid "Unable to add group"
-msgstr ""
+msgstr "Keela grupi lisamine"
 
 #: ajax/lostpassword.php:14
 msgid "Email saved"
@@ -54,11 +54,11 @@ msgstr "Vigane päring"
 
 #: ajax/removegroup.php:16
 msgid "Unable to delete group"
-msgstr ""
+msgstr "Keela grupi kustutamine"
 
 #: ajax/removeuser.php:22
 msgid "Unable to delete user"
-msgstr ""
+msgstr "Keela kasutaja kustutamine"
 
 #: ajax/setlanguage.php:18
 msgid "Language changed"
@@ -67,12 +67,12 @@ msgstr "Keel on muudetud"
 #: ajax/togglegroups.php:25
 #, php-format
 msgid "Unable to add user to group %s"
-msgstr ""
+msgstr "Kasutajat ei saa lisada gruppi %s"
 
 #: ajax/togglegroups.php:31
 #, php-format
 msgid "Unable to remove user from group %s"
-msgstr ""
+msgstr "Kasutajat ei saa eemaldada grupist %s"
 
 #: js/apps.js:18
 msgid "Error"
@@ -125,39 +125,39 @@ msgstr "kasuta süsteemide cron teenuseid"
 
 #: templates/admin.php:41
 msgid "Share API"
-msgstr ""
+msgstr "Jagamise API"
 
 #: templates/admin.php:46
 msgid "Enable Share API"
-msgstr ""
+msgstr "Luba jagamise API"
 
 #: templates/admin.php:47
 msgid "Allow apps to use the Share API"
-msgstr ""
+msgstr "Luba rakendustel kasutada jagamise API-t"
 
 #: templates/admin.php:51
 msgid "Allow links"
-msgstr ""
+msgstr "Luba linke"
 
 #: templates/admin.php:52
 msgid "Allow users to share items to the public with links"
-msgstr ""
+msgstr "Luba kasutajatel jagada kirjeid avalike linkidega"
 
 #: templates/admin.php:56
 msgid "Allow resharing"
-msgstr ""
+msgstr "Luba edasijagamine"
 
 #: templates/admin.php:57
 msgid "Allow users to share items shared with them again"
-msgstr ""
+msgstr "Luba kasutajatel jagada edasi kirjeid, mida on neile jagatud"
 
 #: templates/admin.php:60
 msgid "Allow users to share with anyone"
-msgstr ""
+msgstr "Luba kasutajatel kõigiga jagada"
 
 #: templates/admin.php:62
 msgid "Allow users to only share with users in their groups"
-msgstr ""
+msgstr "Luba kasutajatel jagada kirjeid ainult nende grupi liikmetele, millesse nad ise kuuluvad"
 
 #: templates/admin.php:69
 msgid "Log"
@@ -191,7 +191,7 @@ msgstr "Vaata rakenduste lehte aadressil apps.owncloud.com"
 
 #: templates/apps.php:30
 msgid "<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>"
-msgstr ""
+msgstr "<span class=\"licence\"></span>-litsenseeritud <span class=\"author\"></span>"
 
 #: templates/help.php:9
 msgid "Documentation"
diff --git a/l10n/et_EE/user_ldap.po b/l10n/et_EE/user_ldap.po
index 80d9727ff0..d955f91c9d 100644
--- a/l10n/et_EE/user_ldap.po
+++ b/l10n/et_EE/user_ldap.po
@@ -8,15 +8,15 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-29 02:01+0200\n"
-"PO-Revision-Date: 2012-08-29 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-12 02:01+0200\n"
+"PO-Revision-Date: 2012-09-11 10:46+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"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: et_EE\n"
-"Plural-Forms: nplurals=2; plural=(n != 1)\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: templates/settings.php:8
 msgid "Host"
@@ -29,7 +29,7 @@ msgstr ""
 
 #: templates/settings.php:9
 msgid "Base DN"
-msgstr ""
+msgstr "Baas 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 "Kasutaja DN"
 
 #: templates/settings.php:10
 msgid ""
@@ -56,7 +56,7 @@ msgstr ""
 
 #: templates/settings.php:12
 msgid "User Login Filter"
-msgstr ""
+msgstr "Kasutajanime filter"
 
 #: templates/settings.php:12
 #, php-format
@@ -68,19 +68,19 @@ msgstr ""
 #: templates/settings.php:12
 #, php-format
 msgid "use %%uid placeholder, e.g. \"uid=%%uid\""
-msgstr ""
+msgstr "kasuta %%uid kohatäitjat, nt. \"uid=%%uid\""
 
 #: templates/settings.php:13
 msgid "User List Filter"
-msgstr ""
+msgstr "Kasutajate nimekirja filter"
 
 #: templates/settings.php:13
 msgid "Defines the filter to apply, when retrieving users."
-msgstr ""
+msgstr "Määrab kasutajaid hankides filtri, mida rakendatakse."
 
 #: templates/settings.php:13
 msgid "without any placeholder, e.g. \"objectClass=person\"."
-msgstr ""
+msgstr "ilma ühegi kohatäitjata, nt. \"objectClass=person\"."
 
 #: templates/settings.php:14
 msgid "Group Filter"
@@ -88,11 +88,11 @@ msgstr "Grupi filter"
 
 #: templates/settings.php:14
 msgid "Defines the filter to apply, when retrieving groups."
-msgstr ""
+msgstr "Määrab gruppe hankides filtri, mida rakendatakse."
 
 #: templates/settings.php:14
 msgid "without any placeholder, e.g. \"objectClass=posixGroup\"."
-msgstr ""
+msgstr "ilma ühegi kohatäitjata, nt. \"objectClass=posixGroup\"."
 
 #: templates/settings.php:17
 msgid "Port"
@@ -100,15 +100,15 @@ msgstr "Port"
 
 #: templates/settings.php:18
 msgid "Base User Tree"
-msgstr ""
+msgstr "Baaskasutaja puu"
 
 #: templates/settings.php:19
 msgid "Base Group Tree"
-msgstr ""
+msgstr "Baasgrupi puu"
 
 #: templates/settings.php:20
 msgid "Group-Member association"
-msgstr ""
+msgstr "Grupiliikme seotus"
 
 #: templates/settings.php:21
 msgid "Use TLS"
@@ -116,15 +116,15 @@ msgstr "Kasutaja TLS"
 
 #: templates/settings.php:21
 msgid "Do not use it for SSL connections, it will fail."
-msgstr ""
+msgstr "Ära kasuta seda SSL ühenduse jaoks, see ei toimi."
 
 #: templates/settings.php:22
 msgid "Case insensitve LDAP server (Windows)"
-msgstr ""
+msgstr "Mittetõstutundlik LDAP server (Windows)"
 
 #: templates/settings.php:23
 msgid "Turn off SSL certificate validation."
-msgstr ""
+msgstr "Lülita SSL sertifikaadi kontrollimine välja."
 
 #: templates/settings.php:23
 msgid ""
@@ -134,23 +134,23 @@ msgstr ""
 
 #: templates/settings.php:23
 msgid "Not recommended, use for testing only."
-msgstr ""
+msgstr "Pole soovitatav, kasuta ainult testimiseks."
 
 #: templates/settings.php:24
 msgid "User Display Name Field"
-msgstr ""
+msgstr "Kasutaja näidatava nime väli"
 
 #: templates/settings.php:24
 msgid "The LDAP attribute to use to generate the user`s ownCloud name."
-msgstr ""
+msgstr "LDAP omadus, mida kasutatakse kasutaja ownCloudi nime loomiseks."
 
 #: templates/settings.php:25
 msgid "Group Display Name Field"
-msgstr ""
+msgstr "Grupi näidatava nime väli"
 
 #: templates/settings.php:25
 msgid "The LDAP attribute to use to generate the groups`s ownCloud name."
-msgstr ""
+msgstr "LDAP omadus, mida kasutatakse ownCloudi grupi nime loomiseks."
 
 #: templates/settings.php:27
 msgid "in bytes"
@@ -158,13 +158,13 @@ msgstr "baitides"
 
 #: templates/settings.php:29
 msgid "in seconds. A change empties the cache."
-msgstr ""
+msgstr "sekundites. Muudatus tühjendab vahemälu."
 
 #: templates/settings.php:30
 msgid ""
 "Leave empty for user name (default). Otherwise, specify an LDAP/AD "
 "attribute."
-msgstr ""
+msgstr "Kasutajanime (vaikeväärtus) kasutamiseks jäta tühjaks. Vastasel juhul määra LDAP/AD omadus."
 
 #: templates/settings.php:32
 msgid "Help"
diff --git a/l10n/fr/files.po b/l10n/fr/files.po
index bd3172a21d..c60dcb1567 100644
--- a/l10n/fr/files.po
+++ b/l10n/fr/files.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-09-08 02:01+0200\n"
-"PO-Revision-Date: 2012-09-08 00:02+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-12 02:01+0200\n"
+"PO-Revision-Date: 2012-09-11 14:35+0000\n"
+"Last-Translator: Geoffrey Guerrier <geoffrey.guerrier@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"
@@ -98,7 +98,7 @@ msgstr "avec"
 
 #: js/filelist.js:268
 msgid "unshared"
-msgstr ""
+msgstr "non partagée"
 
 #: js/filelist.js:270
 msgid "deleted"
diff --git a/l10n/ru/settings.po b/l10n/ru/settings.po
index 2b830ce906..53b8f54895 100644
--- a/l10n/ru/settings.po
+++ b/l10n/ru/settings.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-09-09 02:01+0200\n"
-"PO-Revision-Date: 2012-09-08 12:08+0000\n"
+"POT-Creation-Date: 2012-09-12 02:01+0200\n"
+"PO-Revision-Date: 2012-09-11 01:35+0000\n"
 "Last-Translator: VicDeo <victor.dubiniuk@gmail.com>\n"
 "Language-Team: Russian (http://www.transifex.com/projects/p/owncloud/language/ru/)\n"
 "MIME-Version: 1.0\n"
@@ -87,7 +87,7 @@ msgstr "Ошибка"
 
 #: js/apps.js:39 js/apps.js:73
 msgid "Disable"
-msgstr "Отключить"
+msgstr "Выключить"
 
 #: js/apps.js:39 js/apps.js:62
 msgid "Enable"
@@ -112,7 +112,7 @@ msgid ""
 "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."
-msgstr "Похоже, что каталог data и ваши файлы в нем доступны из интернета. Предоставляемый ownCloud файл htaccess не работает. Настоятельно рекомендуем настроить сервер таким образом, чтобы закрыть доступ к каталогу data или перенести каталог data за пределы корневого каталога веб-сервера."
+msgstr "Похоже, что каталог data и ваши файлы в нем доступны из интернета. Предоставляемый ownCloud файл htaccess не работает. Настоятельно рекомендуем настроить сервер таким образом, чтобы закрыть доступ к каталогу data или вынести каталог data за пределы корневого каталога веб-сервера."
 
 #: templates/admin.php:31
 msgid "Cron"
@@ -124,7 +124,7 @@ msgstr "Запускать задание при загрузке каждой 
 
 #: templates/admin.php:35
 msgid "cron.php is registered at a webcron service"
-msgstr "cron.php зарегистрирован в webcron сервисе"
+msgstr "cron.php зарегистрирован в службе webcron"
 
 #: templates/admin.php:37
 msgid "use systems cron service"
@@ -132,15 +132,15 @@ msgstr "использовать системные задания"
 
 #: templates/admin.php:41
 msgid "Share API"
-msgstr "API общего доступа"
+msgstr "API публикации"
 
 #: templates/admin.php:46
 msgid "Enable Share API"
-msgstr "Включить API общего доступа"
+msgstr "Включить API публикации"
 
 #: templates/admin.php:47
 msgid "Allow apps to use the Share API"
-msgstr "Разрешить приложениям доступ к API общего доступа"
+msgstr "Разрешить API публикации для приложений"
 
 #: templates/admin.php:51
 msgid "Allow links"
@@ -148,23 +148,23 @@ msgstr "Разрешить ссылки"
 
 #: templates/admin.php:52
 msgid "Allow users to share items to the public with links"
-msgstr "Разрешить пользователям предоставлять публичный доступ при помощи ссылок"
+msgstr "Разрешить пользователям публикацию при помощи ссылок"
 
 #: templates/admin.php:56
 msgid "Allow resharing"
-msgstr "Включить расширенный общий доступ"
+msgstr "Включить повторную публикацию"
 
 #: templates/admin.php:57
 msgid "Allow users to share items shared with them again"
-msgstr "Разрешить пользователям отдавать в общий доступ доступные им элементы других пользователей"
+msgstr "Разрешить пользователям публиковать доступные им элементы других пользователей"
 
 #: templates/admin.php:60
 msgid "Allow users to share with anyone"
-msgstr "Разрешить предоставлять общий доступ любым пользователям"
+msgstr "Разрешить публиковать для любых пользователей"
 
 #: templates/admin.php:62
 msgid "Allow users to only share with users in their groups"
-msgstr "Ограничить общий доступ группами пользователя"
+msgstr "Ограничить публикацию группами пользователя"
 
 #: templates/admin.php:69
 msgid "Log"
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index d9f9f4de0e..13cf5608b9 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-09-11 02:02+0200\n"
+"POT-Creation-Date: 2012-09-12 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 bfc75b5455..ea363823aa 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-09-11 02:02+0200\n"
+"POT-Creation-Date: 2012-09-12 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 0f964a37ff..02737458e0 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-09-11 02:02+0200\n"
+"POT-Creation-Date: 2012-09-12 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 98d019bb92..75f49385fd 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-09-11 02:02+0200\n"
+"POT-Creation-Date: 2012-09-12 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 b10575b0c7..2eec3ef024 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-09-11 02:02+0200\n"
+"POT-Creation-Date: 2012-09-12 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 0368a7d338..7bc25825f9 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-09-11 02:02+0200\n"
+"POT-Creation-Date: 2012-09-12 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 d30053736d..c1f018d3ec 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-09-11 02:02+0200\n"
+"POT-Creation-Date: 2012-09-12 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 93f7e40d44..33da8992be 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-09-11 02:02+0200\n"
+"POT-Creation-Date: 2012-09-12 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 89ab2c5695..86f79b98fc 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-09-11 02:02+0200\n"
+"POT-Creation-Date: 2012-09-12 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/zh_TW/files_sharing.po b/l10n/zh_TW/files_sharing.po
index 3699385698..0b9f8057b5 100644
--- a/l10n/zh_TW/files_sharing.po
+++ b/l10n/zh_TW/files_sharing.po
@@ -3,36 +3,37 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <wu0809@msn.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-08-31 02:02+0200\n"
-"PO-Revision-Date: 2012-08-31 00:03+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-12 02:01+0200\n"
+"PO-Revision-Date: 2012-09-11 15:56+0000\n"
+"Last-Translator: Jeff5555 <wu0809@msn.com>\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"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
 #: templates/authenticate.php:4
 msgid "Password"
-msgstr ""
+msgstr "密碼"
 
 #: templates/authenticate.php:6
 msgid "Submit"
-msgstr ""
+msgstr "送出"
 
 #: templates/public.php:9 templates/public.php:19
 msgid "Download"
-msgstr ""
+msgstr "下載"
 
 #: templates/public.php:18
 msgid "No preview available for"
-msgstr ""
+msgstr "無法預覽"
 
-#: templates/public.php:23
+#: templates/public.php:25
 msgid "web services under your control"
 msgstr ""
diff --git a/l10n/zh_TW/settings.po b/l10n/zh_TW/settings.po
index ed6dc81bc1..64bf08a813 100644
--- a/l10n/zh_TW/settings.po
+++ b/l10n/zh_TW/settings.po
@@ -5,14 +5,15 @@
 # Translators:
 # Donahue Chuang <soshinwu@gmail.com>, 2012.
 #   <weiyu871@ms14.url.com.tw>, 2012.
+#   <wu0809@msn.com>, 2012.
 # ywang  <ywang1007@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-05 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-12 02:01+0200\n"
+"PO-Revision-Date: 2012-09-11 15:49+0000\n"
+"Last-Translator: Jeff5555 <wu0809@msn.com>\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"
@@ -31,11 +32,11 @@ msgstr "認證錯誤"
 
 #: ajax/creategroup.php:19
 msgid "Group already exists"
-msgstr ""
+msgstr "群組已存在"
 
 #: ajax/creategroup.php:28
 msgid "Unable to add group"
-msgstr ""
+msgstr "群組增加失敗"
 
 #: ajax/lostpassword.php:14
 msgid "Email saved"
@@ -55,11 +56,11 @@ msgstr "無效請求"
 
 #: ajax/removegroup.php:16
 msgid "Unable to delete group"
-msgstr ""
+msgstr "群組刪除錯誤"
 
 #: ajax/removeuser.php:22
 msgid "Unable to delete user"
-msgstr ""
+msgstr "使用者刪除錯誤"
 
 #: ajax/setlanguage.php:18
 msgid "Language changed"
@@ -68,12 +69,12 @@ msgstr "語言已變更"
 #: ajax/togglegroups.php:25
 #, php-format
 msgid "Unable to add user to group %s"
-msgstr ""
+msgstr "使用者加入群組%s錯誤"
 
 #: ajax/togglegroups.php:31
 #, php-format
 msgid "Unable to remove user from group %s"
-msgstr ""
+msgstr "使用者移出群組%s錯誤"
 
 #: js/apps.js:18
 msgid "Error"
@@ -110,11 +111,11 @@ msgstr ""
 
 #: templates/admin.php:31
 msgid "Cron"
-msgstr ""
+msgstr "定期執行"
 
 #: templates/admin.php:33
 msgid "execute one task with each page loaded"
-msgstr ""
+msgstr "當頁面載入時，執行"
 
 #: templates/admin.php:35
 msgid "cron.php is registered at a webcron service"
@@ -122,7 +123,7 @@ msgstr ""
 
 #: templates/admin.php:37
 msgid "use systems cron service"
-msgstr ""
+msgstr "使用系統定期執行服務"
 
 #: templates/admin.php:41
 msgid "Share API"
@@ -138,27 +139,27 @@ msgstr ""
 
 #: templates/admin.php:51
 msgid "Allow links"
-msgstr ""
+msgstr "允許連結"
 
 #: templates/admin.php:52
 msgid "Allow users to share items to the public with links"
-msgstr ""
+msgstr "允許使用者以結連公開分享檔案"
 
 #: templates/admin.php:56
 msgid "Allow resharing"
-msgstr ""
+msgstr "允許轉貼分享"
 
 #: templates/admin.php:57
 msgid "Allow users to share items shared with them again"
-msgstr ""
+msgstr "允許使用者轉貼共享檔案"
 
 #: templates/admin.php:60
 msgid "Allow users to share with anyone"
-msgstr ""
+msgstr "允許使用者公開分享"
 
 #: templates/admin.php:62
 msgid "Allow users to only share with users in their groups"
-msgstr ""
+msgstr "僅允許使用者在群組內分享"
 
 #: templates/admin.php:69
 msgid "Log"
@@ -308,7 +309,7 @@ msgstr "其他"
 
 #: templates/users.php:80 templates/users.php:112
 msgid "Group Admin"
-msgstr ""
+msgstr "群組 管理員"
 
 #: templates/users.php:82
 msgid "Quota"
diff --git a/lib/l10n/et_EE.php b/lib/l10n/et_EE.php
index d8da90a3cb..87f222af83 100644
--- a/lib/l10n/et_EE.php
+++ b/lib/l10n/et_EE.php
@@ -21,5 +21,8 @@
 "last month" => "eelmisel kuul",
 "months ago" => "kuud tagasi",
 "last year" => "eelmisel aastal",
-"years ago" => "aastat tagasi"
+"years ago" => "aastat tagasi",
+"%s is available. Get <a href=\"%s\">more information</a>" => "%s on saadaval. Vaata <a href=\"%s\">lisainfot</a>",
+"up to date" => "ajakohane",
+"updates check is disabled" => "uuenduste kontrollimine on välja lülitatud"
 );
diff --git a/settings/l10n/et_EE.php b/settings/l10n/et_EE.php
index 1f6cf1265d..ef36dbf951 100644
--- a/settings/l10n/et_EE.php
+++ b/settings/l10n/et_EE.php
@@ -1,11 +1,17 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "App Sotre'i nimekirja laadimine ebaõnnestus",
 "Authentication error" => "Autentimise viga",
+"Group already exists" => "Grupp on juba olemas",
+"Unable to add group" => "Keela grupi lisamine",
 "Email saved" => "Kiri on salvestatud",
 "Invalid email" => "Vigane e-post",
 "OpenID Changed" => "OpenID on muudetud",
 "Invalid request" => "Vigane päring",
+"Unable to delete group" => "Keela grupi kustutamine",
+"Unable to delete user" => "Keela kasutaja kustutamine",
 "Language changed" => "Keel on muudetud",
+"Unable to add user to group %s" => "Kasutajat ei saa lisada gruppi %s",
+"Unable to remove user from group %s" => "Kasutajat ei saa eemaldada grupist %s",
 "Error" => "Viga",
 "Disable" => "Lülita välja",
 "Enable" => "Lülita sisse",
@@ -16,11 +22,21 @@
 "execute one task with each page loaded" => "käivita iga laetud lehe juures üks ülesanne",
 "cron.php is registered at a webcron service" => "cron.php on webcron teenuses registreeritud",
 "use systems cron service" => "kasuta süsteemide cron teenuseid",
+"Share API" => "Jagamise API",
+"Enable Share API" => "Luba jagamise API",
+"Allow apps to use the Share API" => "Luba rakendustel kasutada jagamise API-t",
+"Allow links" => "Luba linke",
+"Allow users to share items to the public with links" => "Luba kasutajatel jagada kirjeid avalike linkidega",
+"Allow resharing" => "Luba edasijagamine",
+"Allow users to share items shared with them again" => "Luba kasutajatel jagada edasi kirjeid, mida on neile jagatud",
+"Allow users to share with anyone" => "Luba kasutajatel kõigiga jagada",
+"Allow users to only share with users in their groups" => "Luba kasutajatel jagada kirjeid ainult nende grupi liikmetele, millesse nad ise kuuluvad",
 "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",
+"<span class=\"licence\"></span>-licensed by <span class=\"author\"></span>" => "<span class=\"licence\"></span>-litsenseeritud <span class=\"author\"></span>",
 "Documentation" => "Dokumentatsioon",
 "Managing Big Files" => "Suurte failide haldamine",
 "Ask a question" => "Küsi küsimus",
diff --git a/settings/l10n/ru.php b/settings/l10n/ru.php
index bab81560be..4e0a7e7d78 100644
--- a/settings/l10n/ru.php
+++ b/settings/l10n/ru.php
@@ -13,25 +13,25 @@
 "Unable to add user to group %s" => "Невозможно добавить пользователя в группу %s",
 "Unable to remove user from group %s" => "Невозможно удалить пользователя из группы %s",
 "Error" => "Ошибка",
-"Disable" => "Отключить",
+"Disable" => "Выключить",
 "Enable" => "Включить",
 "Saving..." => "Сохранение...",
 "__language_name__" => "Русский ",
 "Security Warning" => "Предупреждение безопасности",
-"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." => "Похоже, что каталог data и ваши файлы в нем доступны из интернета. Предоставляемый ownCloud файл htaccess не работает. Настоятельно рекомендуем настроить сервер таким образом, чтобы закрыть доступ к каталогу data или перенести каталог data за пределы корневого каталога веб-сервера.",
+"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." => "Похоже, что каталог data и ваши файлы в нем доступны из интернета. Предоставляемый ownCloud файл htaccess не работает. Настоятельно рекомендуем настроить сервер таким образом, чтобы закрыть доступ к каталогу data или вынести каталог data за пределы корневого каталога веб-сервера.",
 "Cron" => "Задание",
 "execute one task with each page loaded" => "Запускать задание при загрузке каждой страницы",
-"cron.php is registered at a webcron service" => "cron.php зарегистрирован в webcron сервисе",
+"cron.php is registered at a webcron service" => "cron.php зарегистрирован в службе webcron",
 "use systems cron service" => "использовать системные задания",
-"Share API" => "API общего доступа",
-"Enable Share API" => "Включить API общего доступа",
-"Allow apps to use the Share API" => "Разрешить приложениям доступ к API общего доступа",
+"Share API" => "API публикации",
+"Enable Share API" => "Включить API публикации",
+"Allow apps to use the Share API" => "Разрешить API публикации для приложений",
 "Allow links" => "Разрешить ссылки",
-"Allow users to share items to the public with links" => "Разрешить пользователям предоставлять публичный доступ при помощи ссылок",
-"Allow resharing" => "Включить расширенный общий доступ",
-"Allow users to share items shared with them again" => "Разрешить пользователям отдавать в общий доступ доступные им элементы других пользователей",
-"Allow users to share with anyone" => "Разрешить предоставлять общий доступ любым пользователям",
-"Allow users to only share with users in their groups" => "Ограничить общий доступ группами пользователя",
+"Allow users to share items to the public with links" => "Разрешить пользователям публикацию при помощи ссылок",
+"Allow resharing" => "Включить повторную публикацию",
+"Allow users to share items shared with them again" => "Разрешить пользователям публиковать доступные им элементы других пользователей",
+"Allow users to share with anyone" => "Разрешить публиковать для любых пользователей",
+"Allow users to only share with users in their groups" => "Ограничить публикацию группами пользователя",
 "Log" => "Журнал",
 "More" => "Ещё",
 "Developed by the <a href=\"http://ownCloud.org/contact\" target=\"_blank\">ownCloud community</a>, the <a href=\"https://github.com/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>." => "Разрабатывается <a href=\"http://ownCloud.org/contact\" target=\"_blank\">сообществом ownCloud</a>, <a href=\"https://github.com/owncloud\" target=\"_blank\">исходный код</a> доступен под лицензией <a href=\"http://www.gnu.org/licenses/agpl-3.0.html\" target=\"_blank\"><abbr title=\"Affero General Public License\">AGPL</abbr></a>.",
diff --git a/settings/l10n/zh_TW.php b/settings/l10n/zh_TW.php
index e0eeddb375..4f72c8398b 100644
--- a/settings/l10n/zh_TW.php
+++ b/settings/l10n/zh_TW.php
@@ -1,17 +1,32 @@
 <?php $TRANSLATIONS = array(
 "Unable to load list from App Store" => "無法從 App Store 讀取清單",
 "Authentication error" => "認證錯誤",
+"Group already exists" => "群組已存在",
+"Unable to add group" => "群組增加失敗",
 "Email saved" => "Email已儲存",
 "Invalid email" => "無效的email",
 "OpenID Changed" => "OpenID 已變更",
 "Invalid request" => "無效請求",
+"Unable to delete group" => "群組刪除錯誤",
+"Unable to delete user" => "使用者刪除錯誤",
 "Language changed" => "語言已變更",
+"Unable to add user to group %s" => "使用者加入群組%s錯誤",
+"Unable to remove user from group %s" => "使用者移出群組%s錯誤",
 "Error" => "錯誤",
 "Disable" => "停用",
 "Enable" => "啟用",
 "Saving..." => "儲存中...",
 "__language_name__" => "__語言_名稱__",
 "Security Warning" => "安全性警告",
+"Cron" => "定期執行",
+"execute one task with each page loaded" => "當頁面載入時，執行",
+"use systems cron service" => "使用系統定期執行服務",
+"Allow links" => "允許連結",
+"Allow users to share items to the public with links" => "允許使用者以結連公開分享檔案",
+"Allow resharing" => "允許轉貼分享",
+"Allow users to share items shared with them again" => "允許使用者轉貼共享檔案",
+"Allow users to share with anyone" => "允許使用者公開分享",
+"Allow users to only share with users in their groups" => "僅允許使用者在群組內分享",
 "Log" => "紀錄",
 "More" => "更多",
 "Add your App" => "添加你的 App",
@@ -45,6 +60,7 @@
 "Create" => "創造",
 "Default Quota" => "預設容量限制",
 "Other" => "其他",
+"Group Admin" => "群組 管理員",
 "Quota" => "容量限制",
 "Delete" => "刪除"
 );

From b194ac3ddeeab6ce923a313725b3ce85fe849baa Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Wed, 12 Sep 2012 01:01:45 -0400
Subject: [PATCH 1202/1224] Add expiration column to share table and bump
 version number

---
 db_structure.xml | 7 +++++++
 lib/util.php     | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/db_structure.xml b/db_structure.xml
index 8c96fa7c39..d4299e1e8a 100644
--- a/db_structure.xml
+++ b/db_structure.xml
@@ -563,6 +563,13 @@
     <length>1</length>
    </field>
 
+   <field>
+    <name>expiration</name>
+    <type>timestamp</type>
+    <default></default>
+    <notnull>false</notnull>
+   </field>
+   
   </declaration>
 
  </table>
diff --git a/lib/util.php b/lib/util.php
index 3b2f476ada..01f53cb2f3 100755
--- a/lib/util.php
+++ b/lib/util.php
@@ -75,7 +75,7 @@ class OC_Util {
 	 * @return array
 	 */
 	public static function getVersion(){
-		return array(4,82,4);
+		return array(4,82,5);
 	}
 
 	/**

From 8f0354bcddb466006689f86369c9e27170ea691b Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Wed, 12 Sep 2012 00:23:45 -0400
Subject: [PATCH 1203/1224] Temporarily disable sharing with contacts and
 emails, will come in next release

---
 core/ajax/share.php  | 34 +++++++++++++++++-----------------
 core/js/share.js     | 10 +++++-----
 lib/public/share.php | 40 ++++++++++++++++++++--------------------
 3 files changed, 42 insertions(+), 42 deletions(-)

diff --git a/core/ajax/share.php b/core/ajax/share.php
index 5b6763c08e..b8e88acec2 100644
--- a/core/ajax/share.php
+++ b/core/ajax/share.php
@@ -82,23 +82,23 @@ if (isset($_POST['action']) && isset($_POST['itemType']) && isset($_POST['itemSo
 		case 'getShareWith':
 			if (isset($_GET['search'])) {
 				$shareWith = array();
-				if (OC_App::isEnabled('contacts')) {
-					// TODO Add function to contacts to only get the 'fullname' column to improve performance
-					$ids = OC_Contacts_Addressbook::activeIds();
-					foreach ($ids as $id) {
-						$vcards = OC_Contacts_VCard::all($id);
-						foreach ($vcards as $vcard) {
-							$contact = $vcard['fullname'];
-							if (stripos($contact, $_GET['search']) !== false
-								&& (!isset($_GET['itemShares'])
-								|| !isset($_GET['itemShares'][OCP\Share::SHARE_TYPE_CONTACT])
-								|| !is_array($_GET['itemShares'][OCP\Share::SHARE_TYPE_CONTACT])
-								|| !in_array($contact, $_GET['itemShares'][OCP\Share::SHARE_TYPE_CONTACT]))) {
-								$shareWith[] = array('label' => $contact, 'value' => array('shareType' => 5, 'shareWith' => $vcard['id']));
-							}
-						}
-					}
-				}
+// 				if (OC_App::isEnabled('contacts')) {
+// 					// TODO Add function to contacts to only get the 'fullname' column to improve performance
+// 					$ids = OC_Contacts_Addressbook::activeIds();
+// 					foreach ($ids as $id) {
+// 						$vcards = OC_Contacts_VCard::all($id);
+// 						foreach ($vcards as $vcard) {
+// 							$contact = $vcard['fullname'];
+// 							if (stripos($contact, $_GET['search']) !== false
+// 								&& (!isset($_GET['itemShares'])
+// 								|| !isset($_GET['itemShares'][OCP\Share::SHARE_TYPE_CONTACT])
+// 								|| !is_array($_GET['itemShares'][OCP\Share::SHARE_TYPE_CONTACT])
+// 								|| !in_array($contact, $_GET['itemShares'][OCP\Share::SHARE_TYPE_CONTACT]))) {
+// 								$shareWith[] = array('label' => $contact, 'value' => array('shareType' => 5, 'shareWith' => $vcard['id']));
+// 							}
+// 						}
+// 					}
+// 				}
 				$count = 0;
 				$users = array();
 				$limit = 0;
diff --git a/core/js/share.js b/core/js/share.js
index 535ae6da99..e85c134f82 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -167,12 +167,12 @@ OC.Share={
 							response(result.data);
 						} else {
 							// Suggest sharing via email if valid email address
-							var pattern = new RegExp(/^[+a-zA-Z0-9._-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,4}$/i);
-							if (pattern.test(search.term)) {
-								response([{label: 'Share via email: '+search.term, value: {shareType: OC.Share.SHARE_TYPE_EMAIL, shareWith: search.term}}]);
-							} else {
+// 							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']);
-							}
+// 							}
 						}
 					});
 	// 			}
diff --git a/lib/public/share.php b/lib/public/share.php
index ccb5a56ac7..9d2c98e417 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -252,26 +252,26 @@ class Share {
 			\OC_Log::write('OCP\Share', $message, \OC_Log::ERROR);
 			throw new \Exception($message);
 			return false;
-		} 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 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;

From 54d4e556fe3302d1e580cb6d4abbfcd5699263a5 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Wed, 12 Sep 2012 00:57:01 -0400
Subject: [PATCH 1204/1224] Add lock and clock icon for sharing

---
 AUTHORS                    |   3 +++
 core/img/actions/clock.png | Bin 0 -> 466 bytes
 core/img/actions/clock.svg |  20 ++++++++++++++++++++
 core/img/actions/lock.png  | Bin 0 -> 346 bytes
 core/img/actions/lock.svg  |   8 ++++++++
 core/js/share.js           |   3 +--
 6 files changed, 32 insertions(+), 2 deletions(-)
 create mode 100644 core/img/actions/clock.png
 create mode 100755 core/img/actions/clock.svg
 create mode 100644 core/img/actions/lock.png
 create mode 100755 core/img/actions/lock.svg

diff --git a/AUTHORS b/AUTHORS
index f618df9311..f79733c250 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -19,3 +19,6 @@ With help from many libraries and frameworks including:
 	SabreDAV
 	jQuery
 	…
+
+"Lock” symbol from thenounproject.com collection
+"Clock” symbol by Brandon Hopkins, from thenounproject.com collection
\ No newline at end of file
diff --git a/core/img/actions/clock.png b/core/img/actions/clock.png
new file mode 100644
index 0000000000000000000000000000000000000000..671b3f4f0c1daf8bbea5eb8c8881b07e79ec3b4c
GIT binary patch
literal 466
zcmV;@0WJQCP)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS00009a7bBm000ie000ie0hKEb8vp<SbV)=(R5*=&(?4reQ4j_2-`!ne(yU;R
zWs``;+CnX~5F`+>OKTbN14s%*1qDH{^a}_Y{L@(&NCFm`Z(%2zq!KLzLDLw<;@%hT
zhPRpK@n+_nnRn*A6cOr3Db3;*7IC_yzu_ZRBjWoAAR-i!E*@dKJkR4QuHYgbV+Z%p
zIlxumw|IvkhD}4M-^6vy;yqqABu&G^0`6i0$18Bc7o01#ZXvnTeEv*Xdj^w-Cf~p_
zY*o3bvdInxog&x^1SXBfS=`2(DmR6Hc!g!y!i9QrHSGcR&~K?-!iNsdpl^JvMa1ux
zd>`|@^0Ge$ypFXowSDNx0{&_1h=|WeY_^B5J=tMPDWxCy8xg;b07)rL%jaCeC$e$2
z<ugvSiFru8W0=D(PBzK=vN^i)nNG9-rwh1;4Xo5o>|j+EYz~7Kf+0>}6VH(j2r81h
zWwj^rov&d5m+`dJRvK_b6qZqu2C~BzF)ur``JG=!#Lv3_KdxZutm_X>mjD0&07*qo
IM6N<$g5^5J6#xJL

literal 0
HcmV?d00001

diff --git a/core/img/actions/clock.svg b/core/img/actions/clock.svg
new file mode 100755
index 0000000000..1821f474df
--- /dev/null
+++ b/core/img/actions/clock.svg
@@ -0,0 +1,20 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" id="Layer_1" x="0px" y="0px" width="16px" height="16px" viewBox="0 0 100 100" xml:space="preserve">
+<path d="M50,89.836c-23.389,0-42.418-19.027-42.418-42.417C7.582,24.029,26.611,5,50,5c23.389,0,42.418,19.029,42.418,42.419  C92.418,70.809,73.389,89.836,50,89.836z M50,9.912c-20.681,0-37.506,16.826-37.506,37.508c0,20.681,16.826,37.505,37.506,37.505  s37.507-16.824,37.507-37.505C87.507,26.737,70.681,9.912,50,9.912z"/>
+<path d="M50.001,49.875c-0.141,0-0.283-0.011-0.427-0.037c-1.173-0.206-2.03-1.226-2.03-2.419V29.442c0-1.355,1.1-2.456,2.456-2.456  c1.355,0,2.456,1.1,2.456,2.456v4.003l5.431-14.974c0.464-1.274,1.872-1.937,3.146-1.471c1.274,0.462,1.934,1.871,1.471,3.146  l-10.195,28.11C51.952,49.241,51.019,49.875,50.001,49.875z"/>
+<circle cx="49.999" cy="12.956" r="1.617"/>
+<path d="M50,14.778c-1.006,0-1.823-0.817-1.823-1.823c0-1.005,0.817-1.823,1.823-1.823c1.004,0,1.821,0.817,1.821,1.823  C51.821,13.961,51.004,14.778,50,14.778z M50,11.542c-0.779,0-1.414,0.635-1.414,1.413c0,0.779,0.635,1.414,1.414,1.414  s1.412-0.635,1.412-1.414C51.412,12.177,50.779,11.542,50,11.542z"/>
+<circle cx="34.343" cy="20.301" r="1.47"/>
+<path d="M23.617,30.488c0.703,0.409,0.945,1.305,0.537,2.008c-0.405,0.704-1.305,0.947-2.007,0.538  c-0.703-0.403-0.945-1.305-0.539-2.008C22.016,30.325,22.913,30.085,23.617,30.488z"/>
+<circle cx="15.536" cy="47.42" r="1.618"/>
+<path d="M15.536,49.242c-1.006,0-1.823-0.817-1.823-1.823c0.001-1,0.819-1.819,1.823-1.822c1.006,0,1.823,0.817,1.823,1.822  C17.359,48.425,16.542,49.242,15.536,49.242z M15.536,46.006c-0.777,0.003-1.412,0.636-1.414,1.413c0,0.779,0.635,1.414,1.414,1.414  s1.413-0.635,1.413-1.414C16.949,46.641,16.315,46.006,15.536,46.006z"/>
+<path d="M22.147,61.803c0.705-0.406,1.602-0.167,2.007,0.537c0.408,0.703,0.166,1.602-0.537,2.008  c-0.704,0.406-1.604,0.163-2.008-0.537C21.202,63.104,21.447,62.209,22.147,61.803z"/>
+<path d="M33.07,73.803c0.408-0.706,1.305-0.946,2.008-0.537c0.704,0.403,0.945,1.302,0.538,2.005  c-0.405,0.704-1.307,0.947-2.007,0.537C32.904,75.402,32.667,74.507,33.07,73.803z"/>
+<path d="M48.382,81.884c0-0.896,0.725-1.618,1.618-1.618c0.892-0.003,1.618,0.723,1.618,1.618c0,0.892-0.728,1.618-1.618,1.618  C49.104,83.498,48.385,82.775,48.382,81.884z"/>
+<path d="M50,83.706L50,83.706c-1.002-0.003-1.819-0.82-1.823-1.822c0-1.006,0.817-1.823,1.823-1.823  c1.007,0,1.822,0.817,1.822,1.823C51.822,82.889,51.006,83.706,50,83.706z M50.006,80.47c-0.785,0-1.42,0.635-1.42,1.414  c0.003,0.775,0.637,1.41,1.414,1.413c0.78,0,1.413-0.635,1.413-1.413C51.413,81.104,50.782,80.47,50.006,80.47z"/>
+<path d="M64.385,75.271c-0.408-0.703-0.167-1.602,0.537-2.005c0.702-0.409,1.601-0.169,2.008,0.537  c0.406,0.7,0.163,1.603-0.539,2.005C65.686,76.214,64.791,75.971,64.385,75.271z"/>
+<path d="M76.384,64.348c-0.704-0.406-0.945-1.305-0.537-2.008c0.402-0.704,1.301-0.943,2.006-0.537  c0.704,0.402,0.945,1.308,0.539,2.008C77.98,64.511,77.087,64.751,76.384,64.348z"/>
+<path d="M84.464,49.038c-0.896-0.003-1.618-0.726-1.618-1.618c-0.001-0.892,0.723-1.618,1.618-1.618  c0.893-0.003,1.618,0.726,1.618,1.618C86.077,48.315,85.356,49.034,84.464,49.038z"/>
+<path d="M84.464,49.242L84.464,49.242c-1.006-0.003-1.822-0.822-1.822-1.823c-0.002-0.486,0.188-0.943,0.532-1.287  c0.344-0.345,0.803-0.535,1.29-0.535c1.007,0,1.822,0.817,1.822,1.822C86.282,48.422,85.463,49.239,84.464,49.242z M84.471,46.006  c-0.386,0-0.74,0.147-1.008,0.416c-0.267,0.267-0.412,0.621-0.412,0.998c0,0.777,0.635,1.41,1.413,1.414  c0.775-0.003,1.408-0.638,1.413-1.415C85.877,46.641,85.246,46.006,84.471,46.006z"/>
+<path d="M77.853,33.034c-0.705,0.409-1.604,0.166-2.006-0.538c-0.408-0.7-0.168-1.599,0.537-2.008  c0.701-0.406,1.604-0.163,2.008,0.537C78.795,31.732,78.553,32.627,77.853,33.034z"/>
+<path d="M66.93,21.036c-0.407,0.704-1.308,0.943-2.008,0.537c-0.704-0.403-0.945-1.305-0.537-2.008  c0.404-0.703,1.306-0.943,2.006-0.537C67.095,19.437,67.333,20.333,66.93,21.036z"/>
+</svg>
\ No newline at end of file
diff --git a/core/img/actions/lock.png b/core/img/actions/lock.png
new file mode 100644
index 0000000000000000000000000000000000000000..511bfa615bb4b28755140658d0f868cb3fe411ec
GIT binary patch
literal 346
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf<Z~8yL>4nJ
z@ErkR#;MwT(m=sKo-U3d7QJsL8fLX52(-o@Qi{3}k@b|7g?r;Skw>N?bvij~Tt0}H
z#kmP=*(8vA#BcU}r`ev9bqd3sIijD19zHWWKTYC7=c!F9*GoOGmtHEJYjb|_s#WLK
zeCcC<TFG~N+eRJkCIyCMp3gRiH|dDDe#~Isclp*fRYw60-^<HAJts}j=(<vRSFxVq
z$3FjMne*0pxui(2wI){7I$bs?ka=Et*59(PdDlAroy-aM%RMHQa0<8z-rg3={BM!D
zk`hD5V~NOVj?+?Ctg6bAJ1+QoSCe6zMi&Fa_Vr2kzdxAMT-=vAt8R`J&*9g8KiKy$
o6x1(Xq;bLIZMbjOqC1cI{nT$i?ACs|8W;`?p00i_>zopr0NoXd6aWAK

literal 0
HcmV?d00001

diff --git a/core/img/actions/lock.svg b/core/img/actions/lock.svg
new file mode 100755
index 0000000000..8fb039b9e3
--- /dev/null
+++ b/core/img/actions/lock.svg
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 width="16px" height="16px" viewBox="0 0 71 100" xml:space="preserve">
+<path d="M65.5,45V30c0-16.542-13.458-30-30-30s-30,13.458-30,30v15H0v55h71V45H65.5z M13.5,30c0-12.131,9.869-22,22-22
+	s22,9.869,22,22v15h-44V30z"/>
+</svg>
diff --git a/core/js/share.js b/core/js/share.js
index e85c134f82..3fe1f25961 100644
--- a/core/js/share.js
+++ b/core/js/share.js
@@ -132,8 +132,7 @@ OC.Share={
 			if (link) {
 				html += '<div id="link">';
 				html += '<input type="checkbox" name="linkCheckbox" id="linkCheckbox" value="1" /><label for="linkCheckbox">Share with link</label>';
-				// TODO Change to lock/unlock icon?
-				html += '<a href="#" id="showPassword" style="display:none;"><img class="svg" alt="Password protect" src="'+OC.imagePath('core', 'actions/triangle-n')+'"/></a>';
+				html += '<a href="#" id="showPassword" style="display:none;"><img class="svg" alt="Password protect" src="'+OC.imagePath('core', 'actions/lock')+'"/></a>';
 				html += '<br />';
 				html += '<input id="linkText" type="text" readonly="readonly" />';
 				html += '<div id="linkPass">';

From ca6322465d8edab9fc4d321e93015c27a0f3091c Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Wed, 12 Sep 2012 01:12:25 -0400
Subject: [PATCH 1205/1224] Treat getUsers() as case insensitive, helpful for
 showing proper results in the share with autocomplete

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

diff --git a/lib/user/database.php b/lib/user/database.php
index 76b44a2f6c..25e24fcf7e 100644
--- a/lib/user/database.php
+++ b/lib/user/database.php
@@ -155,7 +155,7 @@ class OC_User_Database extends OC_User_Backend {
 	 * Get a list of all users.
 	 */
 	public function getUsers($search = '', $limit = null, $offset = null) {
-		$query = OC_DB::prepare('SELECT `uid` FROM `*PREFIX*users` WHERE `uid` LIKE ?',$limit,$offset);
+		$query = OC_DB::prepare('SELECT `uid` FROM `*PREFIX*users` WHERE LOWER(`uid`) LIKE LOWER(?)',$limit,$offset);
 		$result = $query->execute(array($search.'%'));
 		$users = array();
 		while ($row = $result->fetchRow()) {

From c5f9b887ffc9ec793d0d5f35536fa215fb95efc6 Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Wed, 12 Sep 2012 01:18:07 -0400
Subject: [PATCH 1206/1224] Don't call clearCache() for OC_Minimizer
 statically, create OC_Minimizer objects for both CSS and JS to clear cache
 after upgrade

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

diff --git a/lib/base.php b/lib/base.php
index 679acdb6e5..6b4dd789b2 100644
--- a/lib/base.php
+++ b/lib/base.php
@@ -219,8 +219,10 @@ class OC{
 					$tmpl->printPage();
 					exit;
 				}
-				OC_Minimizer::clearCache();
-
+				$minimizerCSS = new OC_Minimizer_CSS();
+				$minimizerCSS->clearCache();
+				$minimizerJS = new OC_Minimizer_JS();
+				$minimizerJS->clearCache();
 				OC_Config::setValue('version', implode('.', OC_Util::getVersion()));
 				OC_App::checkAppsRequirements();
 				// load all apps to also upgrade enabled apps

From 62d8202d59c7a98c9a9faf0f2de90d52dd94ce56 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= <jfd@butonic.de>
Date: Wed, 12 Sep 2012 12:02:39 +0200
Subject: [PATCH 1207/1224] return a message when app could not be enabled

---
 settings/ajax/enableapp.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/settings/ajax/enableapp.php b/settings/ajax/enableapp.php
index b9cf6a1367..1075a9a433 100644
--- a/settings/ajax/enableapp.php
+++ b/settings/ajax/enableapp.php
@@ -10,5 +10,5 @@ $appid = OC_App::enable($_POST['appid']);
 if($appid !== false) {
 	OC_JSON::success(array('data' => array('appid' => $appid)));
 } else {
-	OC_JSON::error();
+	OC_JSON::error(array("data" => array( "message" => $l->t("Could not enable app. ") )));
 }

From c0a3bdb7575945629fe99ee13076c56d3578436a Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <frank@owncloud.org>
Date: Wed, 12 Sep 2012 12:09:46 +0200
Subject: [PATCH 1208/1224] improve the documentation for the cron config a bit

---
 settings/templates/admin.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/settings/templates/admin.php b/settings/templates/admin.php
index 5fa9e26c9c..4edbe64e96 100644
--- a/settings/templates/admin.php
+++ b/settings/templates/admin.php
@@ -32,9 +32,9 @@ if(!$_['htaccessworking']) {
 	<input type="radio" name="mode" value="ajax" id="backgroundjobs_ajax" <?php if( $_['backgroundjobs_mode'] == "ajax" ) { echo 'checked="checked"'; } ?>>
 	<label for="backgroundjobs_ajax" title="<?php echo $l->t("execute one task with each page loaded"); ?>">AJAX</label><br />
 	<input type="radio" name="mode" value="webcron" id="backgroundjobs_webcron" <?php if( $_['backgroundjobs_mode'] == "webcron" ) { echo 'checked="checked"'; } ?>>
-	<label for="backgroundjobs_webcron" title="<?php echo $l->t("cron.php is registered at a webcron service"); ?>">Webcron</label><br />
+	<label for="backgroundjobs_webcron" title="<?php echo $l->t("cron.php is registered at a webcron service. Call the cron.php page in the owncloud root once a minute over http."); ?>">Webcron</label><br />
 	<input type="radio" name="mode" value="cron" id="backgroundjobs_cron" <?php if( $_['backgroundjobs_mode'] == "cron" ) { echo 'checked="checked"'; } ?>>
-	<label for="backgroundjobs_cron" title="<?php echo $l->t("use systems cron service"); ?>">Cron</label><br />
+	<label for="backgroundjobs_cron" title="<?php echo $l->t("use systems cron service. Call the cron.php file in the owncloud folder via a system cronjob once a minute."); ?>">Cron</label><br />
 </fieldset>
 
 <fieldset class="personalblock" id="shareAPI">

From f31264a0c207c740b0611c04ea03f766509cd54a Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <frank@owncloud.org>
Date: Wed, 12 Sep 2012 12:12:23 +0200
Subject: [PATCH 1209/1224] this is now 4.5 beta 3

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

diff --git a/lib/util.php b/lib/util.php
index f28f83ad71..c2edc660e8 100755
--- a/lib/util.php
+++ b/lib/util.php
@@ -81,7 +81,7 @@ class OC_Util {
 	 */
 	public static function getVersion() {
 		// hint: We only can count up. So the internal version number of ownCloud 4.5 will be 4,9,0. This is not visible to the user
-		return array(4,83,7);
+		return array(4,84,7);
 	}
 
 	/**
@@ -89,7 +89,7 @@ class OC_Util {
 	 * @return string
 	 */
 	public static function getVersionString() {
-		return '4.5 beta 2';
+		return '4.5 beta 3';
 	}
 
 	/**

From df528cfe95a8545605248465c60fbb18f60fb557 Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <frank@owncloud.org>
Date: Wed, 12 Sep 2012 12:23:21 +0200
Subject: [PATCH 1210/1224] show the current username. This confused some
 people

---
 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 4fa0fd0136..679be2657d 100644
--- a/core/templates/layout.user.php
+++ b/core/templates/layout.user.php
@@ -36,7 +36,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 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>
+			<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');  echo OC_User::getUser()?' ('.OC_User::getUser().') ':'' ?>" src="<?php echo image_path('', 'actions/logout.svg'); ?>" /></a>
 			<form class="searchbox header-right" action="#" method="post">
 				<input id="searchbox" class="svg" type="search" name="query" value="<?php if(isset($_POST['query'])) {echo OC_Util::sanitizeHTML($_POST['query']);};?>" autocomplete="off" x-webkit-speech />
 			</form>

From e31dfb643a2b70b1ae7dc467b379fb2026709341 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= <jfd@butonic.de>
Date: Wed, 12 Sep 2012 12:45:20 +0200
Subject: [PATCH 1211/1224] add getErrorMessage to OC_DB

---
 lib/db.php | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/lib/db.php b/lib/db.php
index ee69e5f829..4317f79848 100644
--- a/lib/db.php
+++ b/lib/db.php
@@ -649,6 +649,30 @@ class OC_DB {
 			return false;
 		}
 	}
+	
+	/**
+	 * returns the error code and message as a string for logging
+	 * works with MDB2 and PDOException
+	 * @param mixed $error
+	 * @return string
+	 */
+	public static function getErrorMessage($error) {
+		if ( self::$backend==self::BACKEND_MDB2 and PEAR::isError($error) ) {
+			$msg = $error->getCode() . ': ' . $error->getMessage();
+			if (defined('DEBUG') && DEBUG) {
+				$msg .= '(' . $error->getDebugInfo() . ')';
+			}
+		} elseif (self::$backend==self::BACKEND_PDO and self::$PDO) {
+			$msg = self::$PDO->errorCode() . ': ';
+			$errorInfo = self::$PDO->errorInfo();
+			if (is_array($errorInfo)) {
+				$msg .= 'SQLSTATE = '.$errorInfo[0] . ', ';
+				$msg .= 'Driver Code = '.$errorInfo[1] . ', ';
+				$msg .= 'Driver Message = '.$errorInfo[2];
+			}
+		}
+		return $msg;
+	}
 }
 
 /**

From 0fe3354c61827b55708fc79f81d0edd2ca8b4c00 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= <jfd@butonic.de>
Date: Wed, 12 Sep 2012 12:47:18 +0200
Subject: [PATCH 1212/1224] add proper error logging in OC_User database
 queries

---
 lib/user.php | 43 +++++++++++++++++++++++++++++++++----------
 1 file changed, 33 insertions(+), 10 deletions(-)

diff --git a/lib/user.php b/lib/user.php
index 89dab9f964..7de2a4b7fe 100644
--- a/lib/user.php
+++ b/lib/user.php
@@ -416,9 +416,16 @@ class OC_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'));
+		$sql = "INSERT INTO `*PREFIX*preferences` (`userid`, `appid`, `configkey`, `configvalue`) VALUES(?, ?, ?, ?)";
+		$stmt = OC_DB::prepare($sql);
+		if ( ! OC_DB::isError($stmt) ) {
+			$result = $stmt->execute(array($userid, 'core', 'enabled', 'false'));
+			if ( OC_DB::isError($result) ) {
+				OC_Log::write('OC_User', 'could not enable user: '. OC_DB::getErrorMessage($result), OC_Log::ERROR);
+			}
+		} else {
+			OC_Log::write('OC_User', 'could not disable user: '. OC_DB::getErrorMessage($stmt), OC_Log::ERROR);
+		}
 	}
 
 	/**
@@ -426,9 +433,16 @@ class OC_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'));
+		$sql = "DELETE FROM `*PREFIX*preferences` WHERE `userid` = ? AND `appid` = ? AND `configkey` = ? AND `configvalue` = ?";
+		$stmt = OC_DB::prepare($sql);
+		if ( ! OC_DB::isError($stmt) ) {
+			$result = $stmt->execute(array($userid, 'core', 'enabled', 'false'));
+			if ( OC_DB::isError($result) ) {
+				OC_Log::write('OC_User', 'could not enable user: '. OC_DB::getErrorMessage($result), OC_Log::ERROR);
+			}
+		} else {
+			OC_Log::write('OC_User', 'could not enable user: '. OC_DB::getErrorMessage($stmt), OC_Log::ERROR);
+		}
 	}
 
 	/**
@@ -437,10 +451,19 @@ class OC_User {
 	 * @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;
+		$sql = "SELECT `userid` FROM `*PREFIX*preferences` WHERE `userid` = ? AND `appid` = ? AND `configkey` = ? AND `configvalue` = ?";
+		$stmt = OC_DB::prepare($sql);
+		if ( ! OC_DB::isError($stmt) ) {
+			$result = $stmt->execute(array($userid, 'core', 'enabled', 'false'));
+			if ( ! OC_DB::isError($result) ) {
+				return $result->numRows() ? false : true;
+			} else {
+				OC_Log::write('OC_User', 'could not check if enabled: '. OC_DB::getErrorMessage($result), OC_Log::ERROR);
+			}
+		} else {
+			OC_Log::write('OC_User', 'could not check if enabled: '. OC_DB::getErrorMessage($stmt), OC_Log::ERROR);
+		}
+		return false;
 	}
 
 	/**

From 9bfdf47cd43139ca5c3fba255fd4486d06b6d72c Mon Sep 17 00:00:00 2001
From: Sam Tuke <samtuke@owncloud.com>
Date: Wed, 12 Sep 2012 14:10:12 +0100
Subject: [PATCH 1213/1224] Fixed bug oc-1659 - history dialogue cannot be
 closed once opened

---
 apps/files_versions/js/versions.js | 67 ++++++++++++++++++++----------
 1 file changed, 44 insertions(+), 23 deletions(-)

diff --git a/apps/files_versions/js/versions.js b/apps/files_versions/js/versions.js
index 1c8d083ea4..495848b822 100644
--- a/apps/files_versions/js/versions.js
+++ b/apps/files_versions/js/versions.js
@@ -11,24 +11,33 @@ $(document).ready(function() {
 $(document).ready(function(){
 	if (typeof FileActions !== 'undefined') {
 		// Add history button to files/index.php
-		FileActions.register('file','History', OC.PERMISSION_UPDATE, 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;
-			// Check if drop down is already visible for a different file
-			if (($('#dropdown').length > 0)) {
-				if (file != $('#dropdown').data('file')) {
-					$('#dropdown').hide('blind', function() {
-						$('#dropdown').remove();
-						$('tr').removeClass('mouseOver');
-						createVersionsDropdown(filename, file);
-					});
-				}
-			} else {
-				createVersionsDropdown(filename, file);
+		FileActions.register(
+			'file'
+			,'History'
+			, OC.PERMISSION_UPDATE
+			, function() {
+				// Specify icon for hitory button
+				return OC.imagePath('core','actions/history');
 			}
-		});
+			,function(filename){
+				// Action to perform when clicked
+				if (scanFiles.scanning){return;}//workaround to prevent additional http request block scanning feedback
+
+				var file = $('#dir').val()+'/'+filename;
+				// Check if drop down is already visible for a different file
+				if (($('#dropdown').length > 0)) {
+					if (file != $('#dropdown').data('file')) {
+						$('#dropdown').hide('blind', function() {
+							$('#dropdown').remove();
+							$('tr').removeClass('mouseOver');
+							createVersionsDropdown(filename, file);
+						});
+					}
+				} else {
+					createVersionsDropdown(filename, file);
+				}
+			}
+		);
 	}
 });
 
@@ -42,7 +51,6 @@ function createVersionsDropdown(filename, files) {
 	html += '<option value=""></option>';
 	html += '</select>';
 	html += '</div>';
-	//html += '<input type="button" value="Revert file" onclick="revertFile()" />';
 	html += '<input type="button" value="All versions..." onclick="window.location=\''+historyUrl+'\'" name="makelink" id="makelink" />';
 	html += '<input id="link" style="display:none; width:90%;" />';
 
@@ -60,9 +68,7 @@ function createVersionsDropdown(filename, files) {
 		data: { source: files },
 		async: false,
 		success: function( versions ) {
-
-			//alert("helo "+OC.linkTo('files_versions', 'ajax/getVersions.php'));
-
+			
 			if (versions) {
 				$.each( versions, function(index, row ) {
 					addVersion( row );
@@ -103,7 +109,7 @@ function createVersionsDropdown(filename, files) {
 
 	}
 
-	function addVersion(revision ) {
+	function addVersion( revision ) {
 		name=formatDate(revision.version*1000);
 		var version=$('<option/>');
 		version.attr('value',revision.version);
@@ -122,8 +128,23 @@ function createVersionsDropdown(filename, files) {
 
 		version.appendTo('#found_versions');
 	}
-
+	
+	$('tr').filterAttr('data-file',filename).addClass('mouseOver');
 	$('#dropdown').show('blind');
 
 
 }
+
+$(this).click(
+	function(event) {
+	
+	if ($('#dropdown').has(event.target).length === 0) {
+		$('#dropdown').hide('blind', function() {
+			$('#dropdown').remove();
+			$('tr').removeClass('mouseOver');
+		});
+	}
+
+	
+	}
+);
\ No newline at end of file

From 87b7a236486394c9224b25ada0814ca9dc0406fd Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Wed, 12 Sep 2012 17:00:25 -0400
Subject: [PATCH 1214/1224] Don't get metadata directly from the 'cached' file
 cache after upload

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

diff --git a/apps/files/ajax/upload.php b/apps/files/ajax/upload.php
index 7709becc6a..fb3e277a21 100644
--- a/apps/files/ajax/upload.php
+++ b/apps/files/ajax/upload.php
@@ -49,7 +49,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_Cached::get($target);
+			$meta = OC_FileCache::get($target);
 			$result[]=array( "status" => "success", 'mime'=>$meta['mimetype'],'size'=>$meta['size'],'name'=>basename($target));
 		}
 	}

From b2d60ed6b709333e1cab1c566bc3bdd677d5a3a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= <jfd@butonic.de>
Date: Wed, 12 Sep 2012 22:56:16 +0200
Subject: [PATCH 1215/1224] add proper logging to filecache

---
 lib/filecache/cached.php | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/lib/filecache/cached.php b/lib/filecache/cached.php
index 4e8ff23793..9b1eb4f780 100644
--- a/lib/filecache/cached.php
+++ b/lib/filecache/cached.php
@@ -18,8 +18,19 @@ class OC_FileCache_Cached{
 			$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();
+		$stmt=OC_DB::prepare('SELECT `path`,`ctime`,`mtime`,`mimetype`,`size`,`encrypted`,`versioned`,`writable` FROM `*PREFIX*fscache` WHERE `path_hash`=?');
+		if ( ! OC_DB::isError($stmt) ) {
+			$result=$stmt->execute(array(md5($path)));
+			if ( ! OC_DB::isError($result) ) {
+				$result = $result->fetchRow();
+			} else {
+				OC:Log::write('OC_FileCache_Cached', 'could not execute get: '. OC_DB::getErrorMessage($result), OC_Log::ERROR);
+				$result = false;
+			}
+		} else {
+			OC_Log::write('OC_FileCache_Cached', 'could not prepare get: '. OC_DB::getErrorMessage($stmt), OC_Log::ERROR);
+			$result = false;
+		}
 		if(is_array($result)) {
 			if(isset(self::$savedData[$path])) {
 				$result=array_merge($result, self::$savedData[$path]);

From 53b0e6dcc1c3d13ccf61ad35be74b774f97375d1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= <jfd@butonic.de>
Date: Wed, 12 Sep 2012 23:01:06 +0200
Subject: [PATCH 1216/1224] fix schema updates with oracle\n basically this
 took me all day to debug and hack, we need a new db layer! MDB2 is dead and
 pecl oci8 even more so! It has officially been deprecated in php 5.4:
 http://www.php.net/manual/de/function.ocifetchinto.php

---
 3rdparty/MDB2/Driver/Reverse/oci8.php | 48 +++++++++++++-----------
 3rdparty/MDB2/Driver/oci8.php         | 53 +++++++++++++++++++++++++++
 2 files changed, 79 insertions(+), 22 deletions(-)

diff --git a/3rdparty/MDB2/Driver/Reverse/oci8.php b/3rdparty/MDB2/Driver/Reverse/oci8.php
index c86847fa6b..d89ad77137 100644
--- a/3rdparty/MDB2/Driver/Reverse/oci8.php
+++ b/3rdparty/MDB2/Driver/Reverse/oci8.php
@@ -84,12 +84,12 @@ class MDB2_Driver_Reverse_oci8 extends MDB2_Driver_Reverse_Common
             $owner = $db->dsn['username'];
         }
 
-        $query = 'SELECT column_name name,
-                         data_type "type",
-                         nullable,
-                         data_default "default",
-                         COALESCE(data_precision, data_length) "length",
-                         data_scale "scale"
+        $query = 'SELECT column_name AS "name",
+                         data_type AS "type",
+                         nullable AS "nullable",
+                         data_default AS "default",
+                         COALESCE(data_precision, data_length) AS "length",
+                         data_scale AS "scale"
                     FROM all_tab_columns
                    WHERE (table_name=? OR table_name=?)
                      AND (owner=? OR owner=?)
@@ -146,6 +146,10 @@ class MDB2_Driver_Reverse_oci8 extends MDB2_Driver_Reverse_Common
             if ($default === 'NULL') {
                 $default = null;
             }
+			//ugly hack, but works for the reverse direction
+			if ($default == "''") {
+				$default = '';
+			}
             if ((null === $default) && $notnull) {
                 $default = '';
             }
@@ -221,11 +225,11 @@ class MDB2_Driver_Reverse_oci8 extends MDB2_Driver_Reverse_Common
             $owner = $db->dsn['username'];
         }
 
-        $query = "SELECT aic.column_name,
-                         aic.column_position,
-                         aic.descend,
-                         aic.table_owner,
-                         alc.constraint_type
+        $query = 'SELECT aic.column_name AS "column_name",
+                         aic.column_position AS "column_position",
+                         aic.descend AS "descend",
+                         aic.table_owner AS "table_owner",
+                         alc.constraint_type AS "constraint_type"
                     FROM all_ind_columns aic
                LEFT JOIN all_constraints alc
                       ON aic.index_name = alc.constraint_name
@@ -234,7 +238,7 @@ class MDB2_Driver_Reverse_oci8 extends MDB2_Driver_Reverse_Common
                    WHERE (aic.table_name=? OR aic.table_name=?)
                      AND (aic.index_name=? OR aic.index_name=?)
                      AND (aic.table_owner=? OR aic.table_owner=?)
-                ORDER BY column_position";
+                ORDER BY column_position';
         $stmt = $db->prepare($query);
         if (PEAR::isError($stmt)) {
             return $stmt;
@@ -331,9 +335,9 @@ class MDB2_Driver_Reverse_oci8 extends MDB2_Driver_Reverse_Common
                          \'SIMPLE\' "match",
                          CASE alc.deferrable WHEN \'NOT DEFERRABLE\' THEN 0 ELSE 1 END "deferrable",
                          CASE alc.deferred WHEN \'IMMEDIATE\' THEN 0 ELSE 1 END "initiallydeferred",
-                         alc.search_condition,
+                         alc.search_condition AS "search_condition",
                          alc.table_name,
-                         cols.column_name,
+                         cols.column_name AS "column_name",
                          cols.position,
                          r_alc.table_name "references_table",
                          r_cols.column_name "references_field",
@@ -509,14 +513,14 @@ class MDB2_Driver_Reverse_oci8 extends MDB2_Driver_Reverse_Common
             return $db;
         }
 
-        $query = 'SELECT trigger_name,
-                         table_name,
-                         trigger_body,
-                         trigger_type,
-                         triggering_event trigger_event,
-                         description trigger_comment,
-                         1 trigger_enabled,
-                         when_clause
+        $query = 'SELECT trigger_name AS "trigger_name",
+                         table_name AS "table_name",
+                         trigger_body AS "trigger_body",
+                         trigger_type AS "trigger_type",
+                         triggering_event AS "trigger_event",
+                         description AS "trigger_comment",
+                         1 AS "trigger_enabled",
+                         when_clause AS "when_clause"
                     FROM user_triggers
                    WHERE trigger_name = \''. strtoupper($trigger).'\'';
         $types = array(
diff --git a/3rdparty/MDB2/Driver/oci8.php b/3rdparty/MDB2/Driver/oci8.php
index 9f4137d610..a1eefc94d1 100644
--- a/3rdparty/MDB2/Driver/oci8.php
+++ b/3rdparty/MDB2/Driver/oci8.php
@@ -634,6 +634,59 @@ class MDB2_Driver_oci8 extends MDB2_Driver_Common
         return $query;
     }
 
+    /**
+     * Obtain DBMS specific SQL code portion needed to declare a generic type
+     * field to be used in statement like CREATE TABLE, without the field name
+     * and type values (ie. just the character set, default value, if the
+     * field is permitted to be NULL or not, and the collation options).
+     *
+     * @param array  $field  associative array with the name of the properties
+     *      of the field being declared as array indexes. Currently, the types
+     *      of supported field properties are as follows:
+     *
+     *      default
+     *          Text value to be used as default for this field.
+     *      notnull
+     *          Boolean flag that indicates whether this field is constrained
+     *          to not be set to null.
+     *      charset
+     *          Text value with the default CHARACTER SET for this field.
+     *      collation
+     *          Text value with the default COLLATION for this field.
+     * @return string  DBMS specific SQL code portion that should be used to
+     *      declare the specified field's options.
+     * @access protected
+     */
+    function _getDeclarationOptions($field)
+    {
+        $charset = empty($field['charset']) ? '' :
+            ' '.$this->_getCharsetFieldDeclaration($field['charset']);
+
+        $notnull = empty($field['notnull']) ? ' NULL' : ' NOT NULL';
+        $default = '';
+        if (array_key_exists('default', $field)) {
+            if ($field['default'] === '') {
+                $db = $this->getDBInstance();
+                if (PEAR::isError($db)) {
+                    return $db;
+                }
+                $valid_default_values = $this->getValidTypes();
+                $field['default'] = $valid_default_values[$field['type']];
+                if ($field['default'] === '' && ($db->options['portability'] & MDB2_PORTABILITY_EMPTY_TO_NULL)) {
+                    $field['default'] = ' ';
+                }
+            }
+            if (null !== $field['default']) {
+                $default = ' DEFAULT ' . $this->quote($field['default'], $field['type']);
+            }
+        }
+
+        $collation = empty($field['collation']) ? '' :
+            ' '.$this->_getCollationFieldDeclaration($field['collation']);
+
+        return $charset.$default.$notnull.$collation;
+    }
+
     // }}}
     // {{{ _doQuery()
 

From c7054f374ca0d77df12df513426e583e7fba4e3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= <jfd@butonic.de>
Date: Wed, 12 Sep 2012 23:03:12 +0200
Subject: [PATCH 1217/1224] log details for an error when upgrading the schema

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

diff --git a/lib/db.php b/lib/db.php
index 4317f79848..bfb8e4afbd 100644
--- a/lib/db.php
+++ b/lib/db.php
@@ -457,7 +457,8 @@ class OC_DB {
 		$previousSchema = self::$schema->getDefinitionFromDatabase();
 		if (PEAR::isError($previousSchema)) {
 			$error = $previousSchema->getMessage();
-			OC_Log::write('core', 'Failed to get existing database structure for upgrading ('.$error.')', OC_Log::FATAL);
+			$detail = $previousSchema->getDebugInfo();
+			OC_Log::write('core', 'Failed to get existing database structure for upgrading ('.$error.', '.$detail.')', OC_Log::FATAL);
 			return false;
 		}
 

From d3553ce33d6e971c5e19ef83c8a3cfe1d8e76ba6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rn=20Friedrich=20Dreyer?= <jfd@butonic.de>
Date: Wed, 12 Sep 2012 23:10:45 +0200
Subject: [PATCH 1218/1224] correctly calculate the MDB2 portability

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

diff --git a/lib/db.php b/lib/db.php
index bfb8e4afbd..4d8e5a1a86 100644
--- a/lib/db.php
+++ b/lib/db.php
@@ -187,7 +187,7 @@ class OC_DB {
 
 			// Prepare options array
 			$options = array(
-			  'portability' => MDB2_PORTABILITY_ALL & (!MDB2_PORTABILITY_FIX_CASE),
+			  'portability' => MDB2_PORTABILITY_ALL - MDB2_PORTABILITY_FIX_CASE,
 			  'log_line_break' => '<br>',
 			  'idxname_format' => '%s',
 			  'debug' => true,

From 10b74f9d057a22f018eaaf535cb597354d82e948 Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Thu, 13 Sep 2012 00:08:04 +0200
Subject: [PATCH 1219/1224] Don't hide errors doing the versioning copy

---
 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 dedd83fc25..e429782aed 100644
--- a/apps/files_versions/lib/versions.php
+++ b/apps/files_versions/lib/versions.php
@@ -118,7 +118,7 @@ class Storage {
 			if(!file_exists($versionsFolderName.'/'.$info['dirname'])) mkdir($versionsFolderName.'/'.$info['dirname'],0700,true);
 
 			// store a new version of a file
-			@$users_view->copy('files'.$filename, 'files_versions'.$filename.'.v'.time());
+			$users_view->copy('files'.$filename, 'files_versions'.$filename.'.v'.time());
 
 			// expire old revisions if necessary
 			Storage::expire($filename);

From 78a022fda657febf4d42ba10f10fb3c7feaf7efa Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Thu, 13 Sep 2012 00:08:52 +0200
Subject: [PATCH 1220/1224] dirname can also return '.' for empty path

---
 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 2916575e2d..ecbbef8129 100644
--- a/lib/connector/sabre/node.php
+++ b/lib/connector/sabre/node.php
@@ -235,7 +235,7 @@ abstract class OC_Connector_Sabre_Node implements Sabre_DAV_INode, Sabre_DAV_IPr
 	static public function removeETagPropertyForPath($path) {
 		// remove tags from this and parent paths
 		$paths = array();
-		while ($path != '/' && $path != '') {
+		while ($path != '/' && $path != '.' && $path != '') {
 			$paths[] = $path;
 			$path = dirname($path);
 		}

From e3e4a2bec2809a506fcca7450373b9d736a8da3e Mon Sep 17 00:00:00 2001
From: Bart Visscher <bartv@thisnet.nl>
Date: Thu, 13 Sep 2012 00:12:10 +0200
Subject: [PATCH 1221/1224] Enable post_write trigger

This is used when uploading a file with webdav. The trigger will add the file to the cache and make it show up in listings
---
 lib/filesystemview.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/filesystemview.php b/lib/filesystemview.php
index 3a17af510c..743f940301 100644
--- a/lib/filesystemview.php
+++ b/lib/filesystemview.php
@@ -295,12 +295,12 @@ class OC_FilesystemView {
 							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)
-					);*/
+					);
 					OC_FileProxy::runPostProxies('file_put_contents', $absolutePath, $count);
 					return $count > 0;
 				}else{

From bb0b438ace9ae51b5aec64dd1a1a4868f2f1d4b5 Mon Sep 17 00:00:00 2001
From: Jenkins for ownCloud <thomas.mueller@tmit.eu>
Date: Thu, 13 Sep 2012 02:03:54 +0200
Subject: [PATCH 1222/1224] [tx-robot] updated from transifex

---
 apps/files/l10n/fr.php              |  1 +
 apps/files/l10n/pl.php              |  2 +
 apps/files/l10n/ru_RU.php           | 38 ++++++++++++++
 l10n/af/settings.po                 | 16 ++++--
 l10n/ar/settings.po                 | 16 ++++--
 l10n/ar_SA/settings.po              | 16 ++++--
 l10n/bg_BG/settings.po              | 16 ++++--
 l10n/ca/settings.po                 | 22 +++++---
 l10n/cs_CZ/settings.po              | 22 +++++---
 l10n/da/settings.po                 | 20 +++++---
 l10n/de/settings.po                 | 20 +++++---
 l10n/el/settings.po                 | 20 +++++---
 l10n/eo/settings.po                 | 20 +++++---
 l10n/es/settings.po                 | 22 +++++---
 l10n/et_EE/settings.po              | 22 +++++---
 l10n/eu/settings.po                 | 22 +++++---
 l10n/eu_ES/settings.po              | 16 ++++--
 l10n/fa/settings.po                 | 16 ++++--
 l10n/fi/settings.po                 | 16 ++++--
 l10n/fi_FI/settings.po              | 22 +++++---
 l10n/fr/files.po                    |  8 +--
 l10n/fr/settings.po                 | 22 +++++---
 l10n/gl/settings.po                 | 20 +++++---
 l10n/he/settings.po                 | 16 ++++--
 l10n/hi/settings.po                 | 16 ++++--
 l10n/hr/settings.po                 | 20 +++++---
 l10n/hu_HU/settings.po              | 16 ++++--
 l10n/hy/settings.po                 | 16 ++++--
 l10n/ia/settings.po                 | 16 ++++--
 l10n/id/settings.po                 | 16 ++++--
 l10n/id_ID/settings.po              | 16 ++++--
 l10n/it/settings.po                 | 22 +++++---
 l10n/ja_JP/settings.po              | 22 +++++---
 l10n/ko/settings.po                 | 20 +++++---
 l10n/lb/settings.po                 | 20 +++++---
 l10n/lt_LT/settings.po              | 18 +++++--
 l10n/lv/settings.po                 | 16 ++++--
 l10n/mk/settings.po                 | 16 ++++--
 l10n/ms_MY/settings.po              | 16 ++++--
 l10n/nb_NO/settings.po              | 20 +++++---
 l10n/nl/settings.po                 | 22 +++++---
 l10n/nn_NO/settings.po              | 16 ++++--
 l10n/oc/settings.po                 | 18 +++++--
 l10n/pl/files.po                    | 10 ++--
 l10n/pl/settings.po                 | 22 +++++---
 l10n/pl_PL/settings.po              | 16 ++++--
 l10n/pt_BR/settings.po              | 18 +++++--
 l10n/pt_PT/settings.po              | 20 +++++---
 l10n/ro/settings.po                 | 20 +++++---
 l10n/ru/settings.po                 | 22 +++++---
 l10n/ru_RU/files.po                 | 79 +++++++++++++++--------------
 l10n/ru_RU/settings.po              | 16 ++++--
 l10n/sk_SK/settings.po              | 16 ++++--
 l10n/sl/settings.po                 | 22 +++++---
 l10n/so/settings.po                 | 16 ++++--
 l10n/sr/settings.po                 | 16 ++++--
 l10n/sr@latin/settings.po           | 16 ++++--
 l10n/sv/settings.po                 | 22 +++++---
 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/lib.pot              |  2 +-
 l10n/templates/settings.pot         | 14 +++--
 l10n/templates/user_ldap.pot        |  2 +-
 l10n/th_TH/settings.po              | 22 +++++---
 l10n/tr/settings.po                 | 16 ++++--
 l10n/uk/settings.po                 | 16 ++++--
 l10n/vi/settings.po                 | 22 +++++---
 l10n/zh_CN.GB2312/settings.po       | 16 ++++--
 l10n/zh_CN/settings.po              | 22 +++++---
 l10n/zh_TW/settings.po              | 20 +++++---
 settings/l10n/ca.php                |  2 -
 settings/l10n/cs_CZ.php             |  2 -
 settings/l10n/da.php                |  2 -
 settings/l10n/de.php                |  2 -
 settings/l10n/el.php                |  2 -
 settings/l10n/eo.php                |  2 -
 settings/l10n/es.php                |  2 -
 settings/l10n/et_EE.php             |  2 -
 settings/l10n/eu.php                |  2 -
 settings/l10n/fi_FI.php             |  2 -
 settings/l10n/fr.php                |  2 -
 settings/l10n/gl.php                |  2 -
 settings/l10n/hr.php                |  2 -
 settings/l10n/it.php                |  2 -
 settings/l10n/ja_JP.php             |  2 -
 settings/l10n/ko.php                |  2 -
 settings/l10n/lb.php                |  2 -
 settings/l10n/lt_LT.php             |  1 -
 settings/l10n/nb_NO.php             |  2 -
 settings/l10n/nl.php                |  2 -
 settings/l10n/pl.php                |  2 -
 settings/l10n/pt_BR.php             |  1 -
 settings/l10n/pt_PT.php             |  2 -
 settings/l10n/ro.php                |  2 -
 settings/l10n/ru.php                |  2 -
 settings/l10n/sl.php                |  2 -
 settings/l10n/sv.php                |  2 -
 settings/l10n/th_TH.php             |  2 -
 settings/l10n/vi.php                |  2 -
 settings/l10n/zh_CN.php             |  2 -
 settings/l10n/zh_TW.php             |  1 -
 105 files changed, 895 insertions(+), 432 deletions(-)
 create mode 100644 apps/files/l10n/ru_RU.php

diff --git a/apps/files/l10n/fr.php b/apps/files/l10n/fr.php
index 929a2ffd4a..c0f08b118d 100644
--- a/apps/files/l10n/fr.php
+++ b/apps/files/l10n/fr.php
@@ -7,6 +7,7 @@
 "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/pl.php b/apps/files/l10n/pl.php
index d3814333ac..289a613915 100644
--- a/apps/files/l10n/pl.php
+++ b/apps/files/l10n/pl.php
@@ -7,6 +7,7 @@
 "Missing a temporary folder" => "Brak katalogu tymczasowego",
 "Failed to write to disk" => "Błąd zapisu na dysk",
 "Files" => "Pliki",
+"Unshare" => "Nie udostępniaj",
 "Delete" => "Usuwa element",
 "already exists" => "Już istnieje",
 "replace" => "zastap",
@@ -15,6 +16,7 @@
 "replaced" => "zastąpione",
 "undo" => "wróć",
 "with" => "z",
+"unshared" => "Nie udostępnione",
 "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",
diff --git a/apps/files/l10n/ru_RU.php b/apps/files/l10n/ru_RU.php
new file mode 100644
index 0000000000..d272d9580d
--- /dev/null
+++ b/apps/files/l10n/ru_RU.php
@@ -0,0 +1,38 @@
+<?php $TRANSLATIONS = array(
+"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" => "Размер загруженного",
+"The uploaded file was only partially uploaded" => "Загружаемый файл был загружен частично",
+"No file was uploaded" => "Файл не был загружен",
+"Missing a temporary folder" => "Отсутствует временная папка",
+"Failed to write to disk" => "Не удалось записать на диск",
+"Files" => "Файлы",
+"Delete" => "Удалить",
+"already exists" => "уже существует",
+"replace" => "отмена",
+"cancel" => "отменить",
+"replaced" => "заменено",
+"undo" => "отменить действие",
+"with" => "с",
+"deleted" => "удалено",
+"Upload Error" => "Ошибка загрузки",
+"Upload cancelled." => "Загрузка отменена",
+"Invalid name, '/' is not allowed." => "Неправильное имя, '/' не допускается.",
+"Size" => "Размер",
+"Modified" => "Изменен",
+"File handling" => "Работа с файлами",
+"Maximum upload size" => "Максимальный размер загружаемого файла",
+"max. possible: " => "Максимально возможный",
+"Save" => "Сохранить",
+"New" => "Новый",
+"Text file" => "Текстовый файл",
+"Folder" => "Папка",
+"Upload" => "Загрузить ",
+"Cancel upload" => "Отмена загрузки",
+"Nothing in here. Upload something!" => "Здесь ничего нет. Загрузите что-нибудь!",
+"Name" => "Имя",
+"Download" => "Загрузить",
+"Upload too large" => "Загрузка слишком велика",
+"The files you are trying to upload exceed the maximum size for file uploads on this server." => "Размер файлов, которые Вы пытаетесь загрузить, превышает максимально допустимый размер для загрузки на данный сервер.",
+"Current scanning" => "Текущее сканирование"
+);
diff --git a/l10n/af/settings.po b/l10n/af/settings.po
index b6b7b9e156..e6f46a265a 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-09-05 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-13 02:01+0200\n"
+"PO-Revision-Date: 2012-09-13 00:01+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"
@@ -34,6 +34,10 @@ msgstr ""
 msgid "Unable to add group"
 msgstr ""
 
+#: ajax/enableapp.php:13
+msgid "Could not enable app. "
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr ""
@@ -114,11 +118,15 @@ msgid "execute one task with each page loaded"
 msgstr ""
 
 #: templates/admin.php:35
-msgid "cron.php is registered at a webcron service"
+msgid ""
+"cron.php is registered at a webcron service. Call the cron.php page in the "
+"owncloud root once a minute over http."
 msgstr ""
 
 #: templates/admin.php:37
-msgid "use systems cron service"
+msgid ""
+"use systems cron service. Call the cron.php file in the owncloud folder via "
+"a system cronjob once a minute."
 msgstr ""
 
 #: templates/admin.php:41
diff --git a/l10n/ar/settings.po b/l10n/ar/settings.po
index ece25b8fda..3ee010d847 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-09-05 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-13 02:01+0200\n"
+"PO-Revision-Date: 2012-09-13 00:01+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"
@@ -36,6 +36,10 @@ msgstr ""
 msgid "Unable to add group"
 msgstr ""
 
+#: ajax/enableapp.php:13
+msgid "Could not enable app. "
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr ""
@@ -116,11 +120,15 @@ msgid "execute one task with each page loaded"
 msgstr ""
 
 #: templates/admin.php:35
-msgid "cron.php is registered at a webcron service"
+msgid ""
+"cron.php is registered at a webcron service. Call the cron.php page in the "
+"owncloud root once a minute over http."
 msgstr ""
 
 #: templates/admin.php:37
-msgid "use systems cron service"
+msgid ""
+"use systems cron service. Call the cron.php file in the owncloud folder via "
+"a system cronjob once a minute."
 msgstr ""
 
 #: templates/admin.php:41
diff --git a/l10n/ar_SA/settings.po b/l10n/ar_SA/settings.po
index 22e19d517d..0319103fe1 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-09-05 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-13 02:01+0200\n"
+"PO-Revision-Date: 2012-09-13 00:01+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"
@@ -34,6 +34,10 @@ msgstr ""
 msgid "Unable to add group"
 msgstr ""
 
+#: ajax/enableapp.php:13
+msgid "Could not enable app. "
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr ""
@@ -114,11 +118,15 @@ msgid "execute one task with each page loaded"
 msgstr ""
 
 #: templates/admin.php:35
-msgid "cron.php is registered at a webcron service"
+msgid ""
+"cron.php is registered at a webcron service. Call the cron.php page in the "
+"owncloud root once a minute over http."
 msgstr ""
 
 #: templates/admin.php:37
-msgid "use systems cron service"
+msgid ""
+"use systems cron service. Call the cron.php file in the owncloud folder via "
+"a system cronjob once a minute."
 msgstr ""
 
 #: templates/admin.php:41
diff --git a/l10n/bg_BG/settings.po b/l10n/bg_BG/settings.po
index fc6de0ffaa..19376143c6 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-09-05 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-13 02:01+0200\n"
+"PO-Revision-Date: 2012-09-13 00:01+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"
@@ -37,6 +37,10 @@ msgstr ""
 msgid "Unable to add group"
 msgstr ""
 
+#: ajax/enableapp.php:13
+msgid "Could not enable app. "
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr "Е-пощата е записана"
@@ -117,11 +121,15 @@ msgid "execute one task with each page loaded"
 msgstr ""
 
 #: templates/admin.php:35
-msgid "cron.php is registered at a webcron service"
+msgid ""
+"cron.php is registered at a webcron service. Call the cron.php page in the "
+"owncloud root once a minute over http."
 msgstr ""
 
 #: templates/admin.php:37
-msgid "use systems cron service"
+msgid ""
+"use systems cron service. Call the cron.php file in the owncloud folder via "
+"a system cronjob once a minute."
 msgstr ""
 
 #: templates/admin.php:41
diff --git a/l10n/ca/settings.po b/l10n/ca/settings.po
index 8065c1ebee..0aea78aa04 100644
--- a/l10n/ca/settings.po
+++ b/l10n/ca/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-09-07 02:04+0200\n"
-"PO-Revision-Date: 2012-09-06 06:39+0000\n"
-"Last-Translator: rogerc <rcalvoi@yahoo.com>\n"
+"POT-Creation-Date: 2012-09-13 02:01+0200\n"
+"PO-Revision-Date: 2012-09-13 00:01+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"
@@ -37,6 +37,10 @@ msgstr "El grup ja existeix"
 msgid "Unable to add group"
 msgstr "No es pot afegir el grup"
 
+#: ajax/enableapp.php:13
+msgid "Could not enable app. "
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr "S'ha desat el correu electrònic"
@@ -117,12 +121,16 @@ msgid "execute one task with each page loaded"
 msgstr "executa una tasca en carregar cada pàgina"
 
 #: templates/admin.php:35
-msgid "cron.php is registered at a webcron service"
-msgstr "cron.php està registrat en un servei web cron"
+msgid ""
+"cron.php is registered at a webcron service. Call the cron.php page in the "
+"owncloud root once a minute over http."
+msgstr ""
 
 #: templates/admin.php:37
-msgid "use systems cron service"
-msgstr "usa el servei cron del sistema"
+msgid ""
+"use systems cron service. Call the cron.php file in the owncloud folder via "
+"a system cronjob once a minute."
+msgstr ""
 
 #: templates/admin.php:41
 msgid "Share API"
diff --git a/l10n/cs_CZ/settings.po b/l10n/cs_CZ/settings.po
index 3511d379d6..f57fe29fdc 100644
--- a/l10n/cs_CZ/settings.po
+++ b/l10n/cs_CZ/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-09-06 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 13:36+0000\n"
-"Last-Translator: Tomáš Chvátal <tomas.chvatal@gmail.com>\n"
+"POT-Creation-Date: 2012-09-13 02:01+0200\n"
+"PO-Revision-Date: 2012-09-13 00:01+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"
@@ -40,6 +40,10 @@ msgstr "Skupina již existuje"
 msgid "Unable to add group"
 msgstr "Nelze přidat skupinu"
 
+#: ajax/enableapp.php:13
+msgid "Could not enable app. "
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr "E-mail uložen"
@@ -120,12 +124,16 @@ msgid "execute one task with each page loaded"
 msgstr "spustit jednu úlohu s každou načtenou stránkou"
 
 #: templates/admin.php:35
-msgid "cron.php is registered at a webcron service"
-msgstr "cron.php je registrován jako služba webcron"
+msgid ""
+"cron.php is registered at a webcron service. Call the cron.php page in the "
+"owncloud root once a minute over http."
+msgstr ""
 
 #: templates/admin.php:37
-msgid "use systems cron service"
-msgstr "použít systémovou službu cron"
+msgid ""
+"use systems cron service. Call the cron.php file in the owncloud folder via "
+"a system cronjob once a minute."
+msgstr ""
 
 #: templates/admin.php:41
 msgid "Share API"
diff --git a/l10n/da/settings.po b/l10n/da/settings.po
index 022d5ee233..4406d06cee 100644
--- a/l10n/da/settings.po
+++ b/l10n/da/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-09-05 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-13 02:01+0200\n"
+"PO-Revision-Date: 2012-09-13 00:01+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"
@@ -42,6 +42,10 @@ msgstr ""
 msgid "Unable to add group"
 msgstr ""
 
+#: ajax/enableapp.php:13
+msgid "Could not enable app. "
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr "Email adresse gemt"
@@ -122,12 +126,16 @@ msgid "execute one task with each page loaded"
 msgstr "udfør en opgave for hver indlæst side"
 
 #: templates/admin.php:35
-msgid "cron.php is registered at a webcron service"
-msgstr "cron.php er tilmeldt en webcron tjeneste"
+msgid ""
+"cron.php is registered at a webcron service. Call the cron.php page in the "
+"owncloud root once a minute over http."
+msgstr ""
 
 #: templates/admin.php:37
-msgid "use systems cron service"
-msgstr "brug systemets cron service"
+msgid ""
+"use systems cron service. Call the cron.php file in the owncloud folder via "
+"a system cronjob once a minute."
+msgstr ""
 
 #: templates/admin.php:41
 msgid "Share API"
diff --git a/l10n/de/settings.po b/l10n/de/settings.po
index e0d81804f6..c6825198ff 100644
--- a/l10n/de/settings.po
+++ b/l10n/de/settings.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-09-06 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 07:52+0000\n"
+"POT-Creation-Date: 2012-09-13 02:01+0200\n"
+"PO-Revision-Date: 2012-09-13 00:01+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"
@@ -44,6 +44,10 @@ msgstr "Gruppe existiert bereits"
 msgid "Unable to add group"
 msgstr "Gruppe konnte nicht angelegt werden"
 
+#: ajax/enableapp.php:13
+msgid "Could not enable app. "
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr "E-Mail gespeichert"
@@ -124,12 +128,16 @@ msgid "execute one task with each page loaded"
 msgstr "Führe eine Aufgabe pro geladener Seite aus."
 
 #: templates/admin.php:35
-msgid "cron.php is registered at a webcron service"
-msgstr "cron.php ist beim Webcron-Service registriert"
+msgid ""
+"cron.php is registered at a webcron service. Call the cron.php page in the "
+"owncloud root once a minute over http."
+msgstr ""
 
 #: templates/admin.php:37
-msgid "use systems cron service"
-msgstr "Nutze System-Cron-Service"
+msgid ""
+"use systems cron service. Call the cron.php file in the owncloud folder via "
+"a system cronjob once a minute."
+msgstr ""
 
 #: templates/admin.php:41
 msgid "Share API"
diff --git a/l10n/el/settings.po b/l10n/el/settings.po
index bbec7abd9b..19fcdfb501 100644
--- a/l10n/el/settings.po
+++ b/l10n/el/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-09-05 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-13 02:01+0200\n"
+"PO-Revision-Date: 2012-09-13 00:01+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"
@@ -41,6 +41,10 @@ msgstr ""
 msgid "Unable to add group"
 msgstr ""
 
+#: ajax/enableapp.php:13
+msgid "Could not enable app. "
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr "Το Email αποθηκεύτηκε "
@@ -121,12 +125,16 @@ msgid "execute one task with each page loaded"
 msgstr "Εκτέλεση μίας εργασίας με κάθε σελίδα που φορτώνεται"
 
 #: templates/admin.php:35
-msgid "cron.php is registered at a webcron service"
-msgstr "Το cron.php έχει καταχωρηθεί σε μια webcron υπηρεσία"
+msgid ""
+"cron.php is registered at a webcron service. Call the cron.php page in the "
+"owncloud root once a minute over http."
+msgstr ""
 
 #: templates/admin.php:37
-msgid "use systems cron service"
-msgstr "Χρήση της υπηρεσίας cron του συστήματος"
+msgid ""
+"use systems cron service. Call the cron.php file in the owncloud folder via "
+"a system cronjob once a minute."
+msgstr ""
 
 #: templates/admin.php:41
 msgid "Share API"
diff --git a/l10n/eo/settings.po b/l10n/eo/settings.po
index d51e0c5423..d58cb7ddeb 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-09-05 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-13 02:01+0200\n"
+"PO-Revision-Date: 2012-09-13 00:01+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"
@@ -36,6 +36,10 @@ msgstr ""
 msgid "Unable to add group"
 msgstr ""
 
+#: ajax/enableapp.php:13
+msgid "Could not enable app. "
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr "La retpoŝtadreso konserviĝis"
@@ -116,12 +120,16 @@ msgid "execute one task with each page loaded"
 msgstr "lanĉi unu taskon po ĉiu paĝo ŝargita"
 
 #: templates/admin.php:35
-msgid "cron.php is registered at a webcron service"
-msgstr "cron.php estas registrita kiel webcron-servilo"
+msgid ""
+"cron.php is registered at a webcron service. Call the cron.php page in the "
+"owncloud root once a minute over http."
+msgstr ""
 
 #: templates/admin.php:37
-msgid "use systems cron service"
-msgstr "uzi la cron-servon de la sistemo"
+msgid ""
+"use systems cron service. Call the cron.php file in the owncloud folder via "
+"a system cronjob once a minute."
+msgstr ""
 
 #: templates/admin.php:41
 msgid "Share API"
diff --git a/l10n/es/settings.po b/l10n/es/settings.po
index 8d1da62428..5b0d89c24d 100644
--- a/l10n/es/settings.po
+++ b/l10n/es/settings.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-09-06 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 15:29+0000\n"
-"Last-Translator: juanman <juanma@kde.org.ar>\n"
+"POT-Creation-Date: 2012-09-13 02:01+0200\n"
+"PO-Revision-Date: 2012-09-13 00:01+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"
@@ -43,6 +43,10 @@ msgstr "El grupo ya existe"
 msgid "Unable to add group"
 msgstr "No se pudo añadir el grupo"
 
+#: ajax/enableapp.php:13
+msgid "Could not enable app. "
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr "Correo guardado"
@@ -123,12 +127,16 @@ msgid "execute one task with each page loaded"
 msgstr "ejecutar una tarea con cada página cargada"
 
 #: templates/admin.php:35
-msgid "cron.php is registered at a webcron service"
-msgstr "cron.php se registra en un servicio webcron"
+msgid ""
+"cron.php is registered at a webcron service. Call the cron.php page in the "
+"owncloud root once a minute over http."
+msgstr ""
 
 #: templates/admin.php:37
-msgid "use systems cron service"
-msgstr "usar servicio cron del sistema"
+msgid ""
+"use systems cron service. Call the cron.php file in the owncloud folder via "
+"a system cronjob once a minute."
+msgstr ""
 
 #: templates/admin.php:41
 msgid "Share API"
diff --git a/l10n/et_EE/settings.po b/l10n/et_EE/settings.po
index 90042b1958..d46fc7de21 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-09-12 02:01+0200\n"
-"PO-Revision-Date: 2012-09-11 11:12+0000\n"
-"Last-Translator: Rivo Zängov <eraser@eraser.ee>\n"
+"POT-Creation-Date: 2012-09-13 02:01+0200\n"
+"PO-Revision-Date: 2012-09-13 00:01+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"
@@ -36,6 +36,10 @@ msgstr "Grupp on juba olemas"
 msgid "Unable to add group"
 msgstr "Keela grupi lisamine"
 
+#: ajax/enableapp.php:13
+msgid "Could not enable app. "
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr "Kiri on salvestatud"
@@ -116,12 +120,16 @@ msgid "execute one task with each page loaded"
 msgstr "käivita iga laetud lehe juures üks ülesanne"
 
 #: templates/admin.php:35
-msgid "cron.php is registered at a webcron service"
-msgstr "cron.php on webcron teenuses registreeritud"
+msgid ""
+"cron.php is registered at a webcron service. Call the cron.php page in the "
+"owncloud root once a minute over http."
+msgstr ""
 
 #: templates/admin.php:37
-msgid "use systems cron service"
-msgstr "kasuta süsteemide cron teenuseid"
+msgid ""
+"use systems cron service. Call the cron.php file in the owncloud folder via "
+"a system cronjob once a minute."
+msgstr ""
 
 #: templates/admin.php:41
 msgid "Share API"
diff --git a/l10n/eu/settings.po b/l10n/eu/settings.po
index 1fb2c354a9..be8c78b68d 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-09-08 02:02+0200\n"
-"PO-Revision-Date: 2012-09-07 14:30+0000\n"
-"Last-Translator: asieriko <asieriko@gmail.com>\n"
+"POT-Creation-Date: 2012-09-13 02:01+0200\n"
+"PO-Revision-Date: 2012-09-13 00:01+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"
@@ -37,6 +37,10 @@ msgstr "Taldea dagoeneko existitzenda"
 msgid "Unable to add group"
 msgstr "Ezin izan da taldea gehitu"
 
+#: ajax/enableapp.php:13
+msgid "Could not enable app. "
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr "Eposta gorde da"
@@ -117,12 +121,16 @@ msgid "execute one task with each page loaded"
 msgstr "exekutatu zeregina orri karga bakoitzean"
 
 #: templates/admin.php:35
-msgid "cron.php is registered at a webcron service"
-msgstr "cron.php webcron zerbitzu batean erregistratuta dago"
+msgid ""
+"cron.php is registered at a webcron service. Call the cron.php page in the "
+"owncloud root once a minute over http."
+msgstr ""
 
 #: templates/admin.php:37
-msgid "use systems cron service"
-msgstr "erabili sistemaren cron zerbitzua"
+msgid ""
+"use systems cron service. Call the cron.php file in the owncloud folder via "
+"a system cronjob once a minute."
+msgstr ""
 
 #: templates/admin.php:41
 msgid "Share API"
diff --git a/l10n/eu_ES/settings.po b/l10n/eu_ES/settings.po
index bca1c25deb..267038a707 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-09-05 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-13 02:01+0200\n"
+"PO-Revision-Date: 2012-09-13 00:01+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"
@@ -34,6 +34,10 @@ msgstr ""
 msgid "Unable to add group"
 msgstr ""
 
+#: ajax/enableapp.php:13
+msgid "Could not enable app. "
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr ""
@@ -114,11 +118,15 @@ msgid "execute one task with each page loaded"
 msgstr ""
 
 #: templates/admin.php:35
-msgid "cron.php is registered at a webcron service"
+msgid ""
+"cron.php is registered at a webcron service. Call the cron.php page in the "
+"owncloud root once a minute over http."
 msgstr ""
 
 #: templates/admin.php:37
-msgid "use systems cron service"
+msgid ""
+"use systems cron service. Call the cron.php file in the owncloud folder via "
+"a system cronjob once a minute."
 msgstr ""
 
 #: templates/admin.php:41
diff --git a/l10n/fa/settings.po b/l10n/fa/settings.po
index 9f3314e706..f3d18a42a2 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-09-05 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-13 02:01+0200\n"
+"PO-Revision-Date: 2012-09-13 00:01+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"
@@ -36,6 +36,10 @@ msgstr ""
 msgid "Unable to add group"
 msgstr ""
 
+#: ajax/enableapp.php:13
+msgid "Could not enable app. "
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr "ایمیل ذخیره شد"
@@ -116,11 +120,15 @@ msgid "execute one task with each page loaded"
 msgstr ""
 
 #: templates/admin.php:35
-msgid "cron.php is registered at a webcron service"
+msgid ""
+"cron.php is registered at a webcron service. Call the cron.php page in the "
+"owncloud root once a minute over http."
 msgstr ""
 
 #: templates/admin.php:37
-msgid "use systems cron service"
+msgid ""
+"use systems cron service. Call the cron.php file in the owncloud folder via "
+"a system cronjob once a minute."
 msgstr ""
 
 #: templates/admin.php:41
diff --git a/l10n/fi/settings.po b/l10n/fi/settings.po
index b2daafd990..cc2d672b09 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-09-05 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-13 02:01+0200\n"
+"PO-Revision-Date: 2012-09-13 00:01+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"
@@ -34,6 +34,10 @@ msgstr ""
 msgid "Unable to add group"
 msgstr ""
 
+#: ajax/enableapp.php:13
+msgid "Could not enable app. "
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr ""
@@ -114,11 +118,15 @@ msgid "execute one task with each page loaded"
 msgstr ""
 
 #: templates/admin.php:35
-msgid "cron.php is registered at a webcron service"
+msgid ""
+"cron.php is registered at a webcron service. Call the cron.php page in the "
+"owncloud root once a minute over http."
 msgstr ""
 
 #: templates/admin.php:37
-msgid "use systems cron service"
+msgid ""
+"use systems cron service. Call the cron.php file in the owncloud folder via "
+"a system cronjob once a minute."
 msgstr ""
 
 #: templates/admin.php:41
diff --git a/l10n/fi_FI/settings.po b/l10n/fi_FI/settings.po
index 2f9cfc602d..8831474047 100644
--- a/l10n/fi_FI/settings.po
+++ b/l10n/fi_FI/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-09-06 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 16:14+0000\n"
-"Last-Translator: teho <tehoratopato@gmail.com>\n"
+"POT-Creation-Date: 2012-09-13 02:01+0200\n"
+"PO-Revision-Date: 2012-09-13 00:01+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"
@@ -37,6 +37,10 @@ msgstr "Ryhmä on jo olemassa"
 msgid "Unable to add group"
 msgstr "Ryhmän lisäys epäonnistui"
 
+#: ajax/enableapp.php:13
+msgid "Could not enable app. "
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr "Sähköposti tallennettu"
@@ -117,12 +121,16 @@ msgid "execute one task with each page loaded"
 msgstr "suorita yksi tehtävä jokaisella ladatulla sivulla"
 
 #: templates/admin.php:35
-msgid "cron.php is registered at a webcron service"
-msgstr "cron.php on rekisteröity webcron-palvelulla"
+msgid ""
+"cron.php is registered at a webcron service. Call the cron.php page in the "
+"owncloud root once a minute over http."
+msgstr ""
 
 #: templates/admin.php:37
-msgid "use systems cron service"
-msgstr "käytä järjestelmän cron-palvelua"
+msgid ""
+"use systems cron service. Call the cron.php file in the owncloud folder via "
+"a system cronjob once a minute."
+msgstr ""
 
 #: templates/admin.php:41
 msgid "Share API"
diff --git a/l10n/fr/files.po b/l10n/fr/files.po
index c60dcb1567..07b8735002 100644
--- a/l10n/fr/files.po
+++ b/l10n/fr/files.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-09-12 02:01+0200\n"
-"PO-Revision-Date: 2012-09-11 14:35+0000\n"
-"Last-Translator: Geoffrey Guerrier <geoffrey.guerrier@gmail.com>\n"
+"POT-Creation-Date: 2012-09-13 02:01+0200\n"
+"PO-Revision-Date: 2012-09-12 16:41+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"
@@ -62,7 +62,7 @@ msgstr "Fichiers"
 
 #: js/fileactions.js:108 templates/index.php:62
 msgid "Unshare"
-msgstr ""
+msgstr "Ne plus partager"
 
 #: js/fileactions.js:110 templates/index.php:64
 msgid "Delete"
diff --git a/l10n/fr/settings.po b/l10n/fr/settings.po
index ae731ca30b..f780bb5692 100644
--- a/l10n/fr/settings.po
+++ b/l10n/fr/settings.po
@@ -19,9 +19,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-11 02:02+0200\n"
-"PO-Revision-Date: 2012-09-10 20:41+0000\n"
-"Last-Translator: Brice <bmaron@gmail.com>\n"
+"POT-Creation-Date: 2012-09-13 02:01+0200\n"
+"PO-Revision-Date: 2012-09-13 00:01+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"
@@ -46,6 +46,10 @@ msgstr "Ce groupe existe déjà"
 msgid "Unable to add group"
 msgstr "Impossible d'ajouter le groupe"
 
+#: ajax/enableapp.php:13
+msgid "Could not enable app. "
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr "E-mail sauvegardé"
@@ -126,12 +130,16 @@ msgid "execute one task with each page loaded"
 msgstr "exécuter une tâche pour chaque page chargée"
 
 #: templates/admin.php:35
-msgid "cron.php is registered at a webcron service"
-msgstr "cron.php est enregistré comme un service webcron"
+msgid ""
+"cron.php is registered at a webcron service. Call the cron.php page in the "
+"owncloud root once a minute over http."
+msgstr ""
 
 #: templates/admin.php:37
-msgid "use systems cron service"
-msgstr "utiliser le service cron du système "
+msgid ""
+"use systems cron service. Call the cron.php file in the owncloud folder via "
+"a system cronjob once a minute."
+msgstr ""
 
 #: templates/admin.php:41
 msgid "Share API"
diff --git a/l10n/gl/settings.po b/l10n/gl/settings.po
index 60828ee96f..769aacbf09 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-09-05 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-13 02:01+0200\n"
+"PO-Revision-Date: 2012-09-13 00:01+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"
@@ -36,6 +36,10 @@ msgstr ""
 msgid "Unable to add group"
 msgstr ""
 
+#: ajax/enableapp.php:13
+msgid "Could not enable app. "
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr "Correo electrónico gardado"
@@ -116,12 +120,16 @@ msgid "execute one task with each page loaded"
 msgstr "executar unha tarefa con cada páxina cargada"
 
 #: templates/admin.php:35
-msgid "cron.php is registered at a webcron service"
-msgstr "cron.php está rexistrada como un servizo webcron"
+msgid ""
+"cron.php is registered at a webcron service. Call the cron.php page in the "
+"owncloud root once a minute over http."
+msgstr ""
 
 #: templates/admin.php:37
-msgid "use systems cron service"
-msgstr "utilice o servizo cron do sistema"
+msgid ""
+"use systems cron service. Call the cron.php file in the owncloud folder via "
+"a system cronjob once a minute."
+msgstr ""
 
 #: templates/admin.php:41
 msgid "Share API"
diff --git a/l10n/he/settings.po b/l10n/he/settings.po
index bd56d36427..a8bc3ed1f9 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-09-05 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-13 02:01+0200\n"
+"PO-Revision-Date: 2012-09-13 00:01+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"
@@ -37,6 +37,10 @@ msgstr ""
 msgid "Unable to add group"
 msgstr ""
 
+#: ajax/enableapp.php:13
+msgid "Could not enable app. "
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr "הדוא״ל נשמר"
@@ -117,11 +121,15 @@ msgid "execute one task with each page loaded"
 msgstr ""
 
 #: templates/admin.php:35
-msgid "cron.php is registered at a webcron service"
+msgid ""
+"cron.php is registered at a webcron service. Call the cron.php page in the "
+"owncloud root once a minute over http."
 msgstr ""
 
 #: templates/admin.php:37
-msgid "use systems cron service"
+msgid ""
+"use systems cron service. Call the cron.php file in the owncloud folder via "
+"a system cronjob once a minute."
 msgstr ""
 
 #: templates/admin.php:41
diff --git a/l10n/hi/settings.po b/l10n/hi/settings.po
index db0cc7e30f..78b99c18d3 100644
--- a/l10n/hi/settings.po
+++ b/l10n/hi/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-09-05 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-13 02:01+0200\n"
+"PO-Revision-Date: 2012-09-13 00:01+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n"
 "MIME-Version: 1.0\n"
@@ -34,6 +34,10 @@ msgstr ""
 msgid "Unable to add group"
 msgstr ""
 
+#: ajax/enableapp.php:13
+msgid "Could not enable app. "
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr ""
@@ -114,11 +118,15 @@ msgid "execute one task with each page loaded"
 msgstr ""
 
 #: templates/admin.php:35
-msgid "cron.php is registered at a webcron service"
+msgid ""
+"cron.php is registered at a webcron service. Call the cron.php page in the "
+"owncloud root once a minute over http."
 msgstr ""
 
 #: templates/admin.php:37
-msgid "use systems cron service"
+msgid ""
+"use systems cron service. Call the cron.php file in the owncloud folder via "
+"a system cronjob once a minute."
 msgstr ""
 
 #: templates/admin.php:41
diff --git a/l10n/hr/settings.po b/l10n/hr/settings.po
index ef3eacff14..bf3c88d31f 100644
--- a/l10n/hr/settings.po
+++ b/l10n/hr/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-09-05 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-13 02:01+0200\n"
+"PO-Revision-Date: 2012-09-13 00:01+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"
@@ -37,6 +37,10 @@ msgstr ""
 msgid "Unable to add group"
 msgstr ""
 
+#: ajax/enableapp.php:13
+msgid "Could not enable app. "
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr "Email spremljen"
@@ -117,12 +121,16 @@ msgid "execute one task with each page loaded"
 msgstr ""
 
 #: templates/admin.php:35
-msgid "cron.php is registered at a webcron service"
-msgstr "cron.php je registriran kod webcron servisa"
+msgid ""
+"cron.php is registered at a webcron service. Call the cron.php page in the "
+"owncloud root once a minute over http."
+msgstr ""
 
 #: templates/admin.php:37
-msgid "use systems cron service"
-msgstr "koristi sistemski cron servis"
+msgid ""
+"use systems cron service. Call the cron.php file in the owncloud folder via "
+"a system cronjob once a minute."
+msgstr ""
 
 #: templates/admin.php:41
 msgid "Share API"
diff --git a/l10n/hu_HU/settings.po b/l10n/hu_HU/settings.po
index 5f3d66a4dd..a240440b5f 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-09-05 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-13 02:01+0200\n"
+"PO-Revision-Date: 2012-09-13 00:01+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"
@@ -36,6 +36,10 @@ msgstr ""
 msgid "Unable to add group"
 msgstr ""
 
+#: ajax/enableapp.php:13
+msgid "Could not enable app. "
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr "Email mentve"
@@ -116,11 +120,15 @@ msgid "execute one task with each page loaded"
 msgstr ""
 
 #: templates/admin.php:35
-msgid "cron.php is registered at a webcron service"
+msgid ""
+"cron.php is registered at a webcron service. Call the cron.php page in the "
+"owncloud root once a minute over http."
 msgstr ""
 
 #: templates/admin.php:37
-msgid "use systems cron service"
+msgid ""
+"use systems cron service. Call the cron.php file in the owncloud folder via "
+"a system cronjob once a minute."
 msgstr ""
 
 #: templates/admin.php:41
diff --git a/l10n/hy/settings.po b/l10n/hy/settings.po
index 394122cdf1..d758fb7e94 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-09-05 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-13 02:01+0200\n"
+"PO-Revision-Date: 2012-09-13 00:01+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"
@@ -34,6 +34,10 @@ msgstr ""
 msgid "Unable to add group"
 msgstr ""
 
+#: ajax/enableapp.php:13
+msgid "Could not enable app. "
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr ""
@@ -114,11 +118,15 @@ msgid "execute one task with each page loaded"
 msgstr ""
 
 #: templates/admin.php:35
-msgid "cron.php is registered at a webcron service"
+msgid ""
+"cron.php is registered at a webcron service. Call the cron.php page in the "
+"owncloud root once a minute over http."
 msgstr ""
 
 #: templates/admin.php:37
-msgid "use systems cron service"
+msgid ""
+"use systems cron service. Call the cron.php file in the owncloud folder via "
+"a system cronjob once a minute."
 msgstr ""
 
 #: templates/admin.php:41
diff --git a/l10n/ia/settings.po b/l10n/ia/settings.po
index ab80ed851a..f90eb48800 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-09-05 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-13 02:01+0200\n"
+"PO-Revision-Date: 2012-09-13 00:01+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"
@@ -36,6 +36,10 @@ msgstr ""
 msgid "Unable to add group"
 msgstr ""
 
+#: ajax/enableapp.php:13
+msgid "Could not enable app. "
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr ""
@@ -116,11 +120,15 @@ msgid "execute one task with each page loaded"
 msgstr ""
 
 #: templates/admin.php:35
-msgid "cron.php is registered at a webcron service"
+msgid ""
+"cron.php is registered at a webcron service. Call the cron.php page in the "
+"owncloud root once a minute over http."
 msgstr ""
 
 #: templates/admin.php:37
-msgid "use systems cron service"
+msgid ""
+"use systems cron service. Call the cron.php file in the owncloud folder via "
+"a system cronjob once a minute."
 msgstr ""
 
 #: templates/admin.php:41
diff --git a/l10n/id/settings.po b/l10n/id/settings.po
index c2bd93b9e1..b32796f551 100644
--- a/l10n/id/settings.po
+++ b/l10n/id/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-09-05 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-13 02:01+0200\n"
+"PO-Revision-Date: 2012-09-13 00:01+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"
@@ -37,6 +37,10 @@ msgstr ""
 msgid "Unable to add group"
 msgstr ""
 
+#: ajax/enableapp.php:13
+msgid "Could not enable app. "
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr "Email tersimpan"
@@ -117,11 +121,15 @@ msgid "execute one task with each page loaded"
 msgstr ""
 
 #: templates/admin.php:35
-msgid "cron.php is registered at a webcron service"
+msgid ""
+"cron.php is registered at a webcron service. Call the cron.php page in the "
+"owncloud root once a minute over http."
 msgstr ""
 
 #: templates/admin.php:37
-msgid "use systems cron service"
+msgid ""
+"use systems cron service. Call the cron.php file in the owncloud folder via "
+"a system cronjob once a minute."
 msgstr ""
 
 #: templates/admin.php:41
diff --git a/l10n/id_ID/settings.po b/l10n/id_ID/settings.po
index b70af6b0c3..8d272ad770 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-09-05 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-13 02:01+0200\n"
+"PO-Revision-Date: 2012-09-13 00:01+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"
@@ -34,6 +34,10 @@ msgstr ""
 msgid "Unable to add group"
 msgstr ""
 
+#: ajax/enableapp.php:13
+msgid "Could not enable app. "
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr ""
@@ -114,11 +118,15 @@ msgid "execute one task with each page loaded"
 msgstr ""
 
 #: templates/admin.php:35
-msgid "cron.php is registered at a webcron service"
+msgid ""
+"cron.php is registered at a webcron service. Call the cron.php page in the "
+"owncloud root once a minute over http."
 msgstr ""
 
 #: templates/admin.php:37
-msgid "use systems cron service"
+msgid ""
+"use systems cron service. Call the cron.php file in the owncloud folder via "
+"a system cronjob once a minute."
 msgstr ""
 
 #: templates/admin.php:41
diff --git a/l10n/it/settings.po b/l10n/it/settings.po
index 1ec0daf688..23f0669725 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-09-06 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 05:39+0000\n"
-"Last-Translator: Vincenzo Reale <vinx.reale@gmail.com>\n"
+"POT-Creation-Date: 2012-09-13 02:01+0200\n"
+"PO-Revision-Date: 2012-09-13 00:01+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"
@@ -41,6 +41,10 @@ msgstr "Il gruppo esiste già"
 msgid "Unable to add group"
 msgstr "Impossibile aggiungere il gruppo"
 
+#: ajax/enableapp.php:13
+msgid "Could not enable app. "
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr "Email salvata"
@@ -121,12 +125,16 @@ msgid "execute one task with each page loaded"
 msgstr "esegui un'attività con ogni pagina caricata"
 
 #: templates/admin.php:35
-msgid "cron.php is registered at a webcron service"
-msgstr "cron.php è registrato a un servizio webcron"
+msgid ""
+"cron.php is registered at a webcron service. Call the cron.php page in the "
+"owncloud root once a minute over http."
+msgstr ""
 
 #: templates/admin.php:37
-msgid "use systems cron service"
-msgstr "usa il servizio cron di sistema"
+msgid ""
+"use systems cron service. Call the cron.php file in the owncloud folder via "
+"a system cronjob once a minute."
+msgstr ""
 
 #: templates/admin.php:41
 msgid "Share API"
diff --git a/l10n/ja_JP/settings.po b/l10n/ja_JP/settings.po
index 9652d0d975..e768e4fe2e 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-09-06 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 02:09+0000\n"
-"Last-Translator: Daisuke Deguchi <ddeguchi@is.nagoya-u.ac.jp>\n"
+"POT-Creation-Date: 2012-09-13 02:01+0200\n"
+"PO-Revision-Date: 2012-09-13 00:01+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"
@@ -36,6 +36,10 @@ msgstr "グループは既に存在しています"
 msgid "Unable to add group"
 msgstr "グループを追加できません"
 
+#: ajax/enableapp.php:13
+msgid "Could not enable app. "
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr "メールアドレスを保存しました"
@@ -116,12 +120,16 @@ msgid "execute one task with each page loaded"
 msgstr "ページを開く毎にタスクを1つ実行"
 
 #: templates/admin.php:35
-msgid "cron.php is registered at a webcron service"
-msgstr "cron.phpをwebcronサービスに登録しました"
+msgid ""
+"cron.php is registered at a webcron service. Call the cron.php page in the "
+"owncloud root once a minute over http."
+msgstr ""
 
 #: templates/admin.php:37
-msgid "use systems cron service"
-msgstr "システムのcronサービスを使用"
+msgid ""
+"use systems cron service. Call the cron.php file in the owncloud folder via "
+"a system cronjob once a minute."
+msgstr ""
 
 #: templates/admin.php:41
 msgid "Share API"
diff --git a/l10n/ko/settings.po b/l10n/ko/settings.po
index 74a1df4738..5caaccb275 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-09-05 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-13 02:01+0200\n"
+"PO-Revision-Date: 2012-09-13 00:01+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"
@@ -36,6 +36,10 @@ msgstr ""
 msgid "Unable to add group"
 msgstr ""
 
+#: ajax/enableapp.php:13
+msgid "Could not enable app. "
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr "이메일 저장"
@@ -116,12 +120,16 @@ msgid "execute one task with each page loaded"
 msgstr "각 페이지가 로드 된 하나의 작업을 실행"
 
 #: templates/admin.php:35
-msgid "cron.php is registered at a webcron service"
-msgstr "cron.php는 webcron 서비스에 등록이 되어 있습니다."
+msgid ""
+"cron.php is registered at a webcron service. Call the cron.php page in the "
+"owncloud root once a minute over http."
+msgstr ""
 
 #: templates/admin.php:37
-msgid "use systems cron service"
-msgstr "cron 시스템 서비스를 사용"
+msgid ""
+"use systems cron service. Call the cron.php file in the owncloud folder via "
+"a system cronjob once a minute."
+msgstr ""
 
 #: templates/admin.php:41
 msgid "Share API"
diff --git a/l10n/lb/settings.po b/l10n/lb/settings.po
index ae12b3db40..8df0495662 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-09-05 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-13 02:01+0200\n"
+"PO-Revision-Date: 2012-09-13 00:01+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"
@@ -35,6 +35,10 @@ msgstr ""
 msgid "Unable to add group"
 msgstr ""
 
+#: ajax/enableapp.php:13
+msgid "Could not enable app. "
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr "E-mail gespäichert"
@@ -115,12 +119,16 @@ msgid "execute one task with each page loaded"
 msgstr ""
 
 #: templates/admin.php:35
-msgid "cron.php is registered at a webcron service"
-msgstr "cron.php ass als en webcron Service registréiert"
+msgid ""
+"cron.php is registered at a webcron service. Call the cron.php page in the "
+"owncloud root once a minute over http."
+msgstr ""
 
 #: templates/admin.php:37
-msgid "use systems cron service"
-msgstr "benotz den systems cron Service"
+msgid ""
+"use systems cron service. Call the cron.php file in the owncloud folder via "
+"a system cronjob once a minute."
+msgstr ""
 
 #: templates/admin.php:41
 msgid "Share API"
diff --git a/l10n/lt_LT/settings.po b/l10n/lt_LT/settings.po
index 5db913f5a2..f9f0412202 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-09-05 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-13 02:01+0200\n"
+"PO-Revision-Date: 2012-09-13 00:01+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"
@@ -35,6 +35,10 @@ msgstr ""
 msgid "Unable to add group"
 msgstr ""
 
+#: ajax/enableapp.php:13
+msgid "Could not enable app. "
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr "El. paštas išsaugotas"
@@ -115,12 +119,16 @@ msgid "execute one task with each page loaded"
 msgstr ""
 
 #: templates/admin.php:35
-msgid "cron.php is registered at a webcron service"
+msgid ""
+"cron.php is registered at a webcron service. Call the cron.php page in the "
+"owncloud root once a minute over http."
 msgstr ""
 
 #: templates/admin.php:37
-msgid "use systems cron service"
-msgstr "naudoti sistemos cron servisą"
+msgid ""
+"use systems cron service. Call the cron.php file in the owncloud folder via "
+"a system cronjob once a minute."
+msgstr ""
 
 #: templates/admin.php:41
 msgid "Share API"
diff --git a/l10n/lv/settings.po b/l10n/lv/settings.po
index 6c04e77d75..54a261a9ff 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-09-05 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-13 02:01+0200\n"
+"PO-Revision-Date: 2012-09-13 00:01+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"
@@ -35,6 +35,10 @@ msgstr ""
 msgid "Unable to add group"
 msgstr ""
 
+#: ajax/enableapp.php:13
+msgid "Could not enable app. "
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr "Epasts tika saglabāts"
@@ -115,11 +119,15 @@ msgid "execute one task with each page loaded"
 msgstr ""
 
 #: templates/admin.php:35
-msgid "cron.php is registered at a webcron service"
+msgid ""
+"cron.php is registered at a webcron service. Call the cron.php page in the "
+"owncloud root once a minute over http."
 msgstr ""
 
 #: templates/admin.php:37
-msgid "use systems cron service"
+msgid ""
+"use systems cron service. Call the cron.php file in the owncloud folder via "
+"a system cronjob once a minute."
 msgstr ""
 
 #: templates/admin.php:41
diff --git a/l10n/mk/settings.po b/l10n/mk/settings.po
index 6bd27051c3..5f1ffcc6ed 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-09-05 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-13 02:01+0200\n"
+"PO-Revision-Date: 2012-09-13 00:01+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"
@@ -36,6 +36,10 @@ msgstr ""
 msgid "Unable to add group"
 msgstr ""
 
+#: ajax/enableapp.php:13
+msgid "Could not enable app. "
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr "Електронската пошта е снимена"
@@ -116,11 +120,15 @@ msgid "execute one task with each page loaded"
 msgstr ""
 
 #: templates/admin.php:35
-msgid "cron.php is registered at a webcron service"
+msgid ""
+"cron.php is registered at a webcron service. Call the cron.php page in the "
+"owncloud root once a minute over http."
 msgstr ""
 
 #: templates/admin.php:37
-msgid "use systems cron service"
+msgid ""
+"use systems cron service. Call the cron.php file in the owncloud folder via "
+"a system cronjob once a minute."
 msgstr ""
 
 #: templates/admin.php:41
diff --git a/l10n/ms_MY/settings.po b/l10n/ms_MY/settings.po
index 585daefb75..c93a805543 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-09-05 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-13 02:01+0200\n"
+"PO-Revision-Date: 2012-09-13 00:01+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"
@@ -38,6 +38,10 @@ msgstr ""
 msgid "Unable to add group"
 msgstr ""
 
+#: ajax/enableapp.php:13
+msgid "Could not enable app. "
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr "Emel disimpan"
@@ -118,11 +122,15 @@ msgid "execute one task with each page loaded"
 msgstr ""
 
 #: templates/admin.php:35
-msgid "cron.php is registered at a webcron service"
+msgid ""
+"cron.php is registered at a webcron service. Call the cron.php page in the "
+"owncloud root once a minute over http."
 msgstr ""
 
 #: templates/admin.php:37
-msgid "use systems cron service"
+msgid ""
+"use systems cron service. Call the cron.php file in the owncloud folder via "
+"a system cronjob once a minute."
 msgstr ""
 
 #: templates/admin.php:41
diff --git a/l10n/nb_NO/settings.po b/l10n/nb_NO/settings.po
index 4b095682b5..85d96230f8 100644
--- a/l10n/nb_NO/settings.po
+++ b/l10n/nb_NO/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-09-05 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-13 02:01+0200\n"
+"PO-Revision-Date: 2012-09-13 00:01+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"
@@ -40,6 +40,10 @@ msgstr ""
 msgid "Unable to add group"
 msgstr ""
 
+#: ajax/enableapp.php:13
+msgid "Could not enable app. "
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr "Epost lagret"
@@ -120,12 +124,16 @@ msgid "execute one task with each page loaded"
 msgstr "utfør en oppgave med hver side som blir lastet"
 
 #: templates/admin.php:35
-msgid "cron.php is registered at a webcron service"
-msgstr "cron.php er registrert som en webcron tjeneste"
+msgid ""
+"cron.php is registered at a webcron service. Call the cron.php page in the "
+"owncloud root once a minute over http."
+msgstr ""
 
 #: templates/admin.php:37
-msgid "use systems cron service"
-msgstr "benytt systemets cron tjeneste"
+msgid ""
+"use systems cron service. Call the cron.php file in the owncloud folder via "
+"a system cronjob once a minute."
+msgstr ""
 
 #: templates/admin.php:41
 msgid "Share API"
diff --git a/l10n/nl/settings.po b/l10n/nl/settings.po
index 8644b83dc0..8d1c628274 100644
--- a/l10n/nl/settings.po
+++ b/l10n/nl/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-09-08 02:02+0200\n"
-"PO-Revision-Date: 2012-09-07 13:23+0000\n"
-"Last-Translator: Richard Bos <radoeka@gmail.com>\n"
+"POT-Creation-Date: 2012-09-13 02:01+0200\n"
+"PO-Revision-Date: 2012-09-13 00:01+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"
@@ -42,6 +42,10 @@ msgstr "Groep bestaat al"
 msgid "Unable to add group"
 msgstr "Niet in staat om groep toe te voegen"
 
+#: ajax/enableapp.php:13
+msgid "Could not enable app. "
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr "E-mail bewaard"
@@ -122,12 +126,16 @@ msgid "execute one task with each page loaded"
 msgstr "Voer 1 taak uit bij elke geladen pagina"
 
 #: templates/admin.php:35
-msgid "cron.php is registered at a webcron service"
-msgstr "cron.php is geregistreerd bij een webcron service"
+msgid ""
+"cron.php is registered at a webcron service. Call the cron.php page in the "
+"owncloud root once a minute over http."
+msgstr ""
 
 #: templates/admin.php:37
-msgid "use systems cron service"
-msgstr "gebruik de systeem cron service"
+msgid ""
+"use systems cron service. Call the cron.php file in the owncloud folder via "
+"a system cronjob once a minute."
+msgstr ""
 
 #: templates/admin.php:41
 msgid "Share API"
diff --git a/l10n/nn_NO/settings.po b/l10n/nn_NO/settings.po
index 8276d41ed6..40a158192d 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-09-05 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-13 02:01+0200\n"
+"PO-Revision-Date: 2012-09-13 00:01+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"
@@ -36,6 +36,10 @@ msgstr ""
 msgid "Unable to add group"
 msgstr ""
 
+#: ajax/enableapp.php:13
+msgid "Could not enable app. "
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr "E-postadresse lagra"
@@ -116,11 +120,15 @@ msgid "execute one task with each page loaded"
 msgstr ""
 
 #: templates/admin.php:35
-msgid "cron.php is registered at a webcron service"
+msgid ""
+"cron.php is registered at a webcron service. Call the cron.php page in the "
+"owncloud root once a minute over http."
 msgstr ""
 
 #: templates/admin.php:37
-msgid "use systems cron service"
+msgid ""
+"use systems cron service. Call the cron.php file in the owncloud folder via "
+"a system cronjob once a minute."
 msgstr ""
 
 #: templates/admin.php:41
diff --git a/l10n/oc/settings.po b/l10n/oc/settings.po
index fe8e3adeb4..65d98b9c14 100644
--- a/l10n/oc/settings.po
+++ b/l10n/oc/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-09-08 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-09-13 02:01+0200\n"
+"PO-Revision-Date: 2012-09-13 00:01+0000\n"
+"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/owncloud/language/oc/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -34,6 +34,10 @@ msgstr ""
 msgid "Unable to add group"
 msgstr ""
 
+#: ajax/enableapp.php:13
+msgid "Could not enable app. "
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr ""
@@ -114,11 +118,15 @@ msgid "execute one task with each page loaded"
 msgstr ""
 
 #: templates/admin.php:35
-msgid "cron.php is registered at a webcron service"
+msgid ""
+"cron.php is registered at a webcron service. Call the cron.php page in the "
+"owncloud root once a minute over http."
 msgstr ""
 
 #: templates/admin.php:37
-msgid "use systems cron service"
+msgid ""
+"use systems cron service. Call the cron.php file in the owncloud folder via "
+"a system cronjob once a minute."
 msgstr ""
 
 #: templates/admin.php:41
diff --git a/l10n/pl/files.po b/l10n/pl/files.po
index 2f0082e002..bac8f89bee 100644
--- a/l10n/pl/files.po
+++ b/l10n/pl/files.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-09-08 02:01+0200\n"
-"PO-Revision-Date: 2012-09-08 00:02+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-13 02:01+0200\n"
+"PO-Revision-Date: 2012-09-12 12:39+0000\n"
+"Last-Translator: Cyryl Sochacki <cyrylsochacki@gmail.com>\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"
@@ -58,7 +58,7 @@ msgstr "Pliki"
 
 #: js/fileactions.js:108 templates/index.php:62
 msgid "Unshare"
-msgstr ""
+msgstr "Nie udostępniaj"
 
 #: js/fileactions.js:110 templates/index.php:64
 msgid "Delete"
@@ -94,7 +94,7 @@ msgstr "z"
 
 #: js/filelist.js:268
 msgid "unshared"
-msgstr ""
+msgstr "Nie udostępnione"
 
 #: js/filelist.js:270
 msgid "deleted"
diff --git a/l10n/pl/settings.po b/l10n/pl/settings.po
index adfbe39053..1689285d42 100644
--- a/l10n/pl/settings.po
+++ b/l10n/pl/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-09-06 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 12:06+0000\n"
-"Last-Translator: emc <mplichta@gmail.com>\n"
+"POT-Creation-Date: 2012-09-13 02:01+0200\n"
+"PO-Revision-Date: 2012-09-13 00:01+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"
@@ -42,6 +42,10 @@ msgstr "Grupa już istnieje"
 msgid "Unable to add group"
 msgstr "Nie można dodać grupy"
 
+#: ajax/enableapp.php:13
+msgid "Could not enable app. "
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr "Email zapisany"
@@ -122,12 +126,16 @@ msgid "execute one task with each page loaded"
 msgstr "wykonanie jednego zadania z każdej  załadowanej strony"
 
 #: templates/admin.php:35
-msgid "cron.php is registered at a webcron service"
-msgstr "cron.php jest zarejestrowany w usłudze webcron"
+msgid ""
+"cron.php is registered at a webcron service. Call the cron.php page in the "
+"owncloud root once a minute over http."
+msgstr ""
 
 #: templates/admin.php:37
-msgid "use systems cron service"
-msgstr "korzystaj z usługi systemowej cron"
+msgid ""
+"use systems cron service. Call the cron.php file in the owncloud folder via "
+"a system cronjob once a minute."
+msgstr ""
 
 #: templates/admin.php:41
 msgid "Share API"
diff --git a/l10n/pl_PL/settings.po b/l10n/pl_PL/settings.po
index 0d57138874..fe2334598d 100644
--- a/l10n/pl_PL/settings.po
+++ b/l10n/pl_PL/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-09-05 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-13 02:01+0200\n"
+"PO-Revision-Date: 2012-09-13 00:01+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Polish (Poland) (http://www.transifex.com/projects/p/owncloud/language/pl_PL/)\n"
 "MIME-Version: 1.0\n"
@@ -34,6 +34,10 @@ msgstr ""
 msgid "Unable to add group"
 msgstr ""
 
+#: ajax/enableapp.php:13
+msgid "Could not enable app. "
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr ""
@@ -114,11 +118,15 @@ msgid "execute one task with each page loaded"
 msgstr ""
 
 #: templates/admin.php:35
-msgid "cron.php is registered at a webcron service"
+msgid ""
+"cron.php is registered at a webcron service. Call the cron.php page in the "
+"owncloud root once a minute over http."
 msgstr ""
 
 #: templates/admin.php:37
-msgid "use systems cron service"
+msgid ""
+"use systems cron service. Call the cron.php file in the owncloud folder via "
+"a system cronjob once a minute."
 msgstr ""
 
 #: templates/admin.php:41
diff --git a/l10n/pt_BR/settings.po b/l10n/pt_BR/settings.po
index 5c7f19c769..3e0941d765 100644
--- a/l10n/pt_BR/settings.po
+++ b/l10n/pt_BR/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-09-05 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-13 02:01+0200\n"
+"PO-Revision-Date: 2012-09-13 00:01+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"
@@ -40,6 +40,10 @@ msgstr ""
 msgid "Unable to add group"
 msgstr ""
 
+#: ajax/enableapp.php:13
+msgid "Could not enable app. "
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr "Email gravado"
@@ -120,11 +124,15 @@ msgid "execute one task with each page loaded"
 msgstr "executar uma tarefa com cada página em aberto"
 
 #: templates/admin.php:35
-msgid "cron.php is registered at a webcron service"
-msgstr "cron.php esta registrado no serviço de webcron"
+msgid ""
+"cron.php is registered at a webcron service. Call the cron.php page in the "
+"owncloud root once a minute over http."
+msgstr ""
 
 #: templates/admin.php:37
-msgid "use systems cron service"
+msgid ""
+"use systems cron service. Call the cron.php file in the owncloud folder via "
+"a system cronjob once a minute."
 msgstr ""
 
 #: templates/admin.php:41
diff --git a/l10n/pt_PT/settings.po b/l10n/pt_PT/settings.po
index 05fcf5b8bd..e5e52c51eb 100644
--- a/l10n/pt_PT/settings.po
+++ b/l10n/pt_PT/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-09-05 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-13 02:01+0200\n"
+"PO-Revision-Date: 2012-09-13 00:01+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"
@@ -37,6 +37,10 @@ msgstr ""
 msgid "Unable to add group"
 msgstr ""
 
+#: ajax/enableapp.php:13
+msgid "Could not enable app. "
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr "Email guardado"
@@ -117,12 +121,16 @@ msgid "execute one task with each page loaded"
 msgstr "Executar uma tarefa com cada página carregada"
 
 #: templates/admin.php:35
-msgid "cron.php is registered at a webcron service"
-msgstr "cron.php está registado num serviço webcron"
+msgid ""
+"cron.php is registered at a webcron service. Call the cron.php page in the "
+"owncloud root once a minute over http."
+msgstr ""
 
 #: templates/admin.php:37
-msgid "use systems cron service"
-msgstr "usar o serviço cron do sistema"
+msgid ""
+"use systems cron service. Call the cron.php file in the owncloud folder via "
+"a system cronjob once a minute."
+msgstr ""
 
 #: templates/admin.php:41
 msgid "Share API"
diff --git a/l10n/ro/settings.po b/l10n/ro/settings.po
index a1bc80deb8..cf3ece6484 100644
--- a/l10n/ro/settings.po
+++ b/l10n/ro/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-09-05 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-13 02:01+0200\n"
+"PO-Revision-Date: 2012-09-13 00:01+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"
@@ -39,6 +39,10 @@ msgstr ""
 msgid "Unable to add group"
 msgstr ""
 
+#: ajax/enableapp.php:13
+msgid "Could not enable app. "
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr "E-mail salvat"
@@ -119,12 +123,16 @@ msgid "execute one task with each page loaded"
 msgstr "executâ o sarcină cu fiecare pagină încărcată"
 
 #: templates/admin.php:35
-msgid "cron.php is registered at a webcron service"
-msgstr "cron.php e înregistrat la un serviciu de webcron"
+msgid ""
+"cron.php is registered at a webcron service. Call the cron.php page in the "
+"owncloud root once a minute over http."
+msgstr ""
 
 #: templates/admin.php:37
-msgid "use systems cron service"
-msgstr "utilizează serviciul de cron al sistemului"
+msgid ""
+"use systems cron service. Call the cron.php file in the owncloud folder via "
+"a system cronjob once a minute."
+msgstr ""
 
 #: templates/admin.php:41
 msgid "Share API"
diff --git a/l10n/ru/settings.po b/l10n/ru/settings.po
index 53b8f54895..9695b338b3 100644
--- a/l10n/ru/settings.po
+++ b/l10n/ru/settings.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-09-12 02:01+0200\n"
-"PO-Revision-Date: 2012-09-11 01:35+0000\n"
-"Last-Translator: VicDeo <victor.dubiniuk@gmail.com>\n"
+"POT-Creation-Date: 2012-09-13 02:01+0200\n"
+"PO-Revision-Date: 2012-09-13 00:01+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"
@@ -43,6 +43,10 @@ msgstr "Группа уже существует"
 msgid "Unable to add group"
 msgstr "Невозможно добавить группу"
 
+#: ajax/enableapp.php:13
+msgid "Could not enable app. "
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr "Email сохранен"
@@ -123,12 +127,16 @@ msgid "execute one task with each page loaded"
 msgstr "Запускать задание при загрузке каждой страницы"
 
 #: templates/admin.php:35
-msgid "cron.php is registered at a webcron service"
-msgstr "cron.php зарегистрирован в службе webcron"
+msgid ""
+"cron.php is registered at a webcron service. Call the cron.php page in the "
+"owncloud root once a minute over http."
+msgstr ""
 
 #: templates/admin.php:37
-msgid "use systems cron service"
-msgstr "использовать системные задания"
+msgid ""
+"use systems cron service. Call the cron.php file in the owncloud folder via "
+"a system cronjob once a minute."
+msgstr ""
 
 #: templates/admin.php:41
 msgid "Share API"
diff --git a/l10n/ru_RU/files.po b/l10n/ru_RU/files.po
index 441a2de6ae..42d3e4f9da 100644
--- a/l10n/ru_RU/files.po
+++ b/l10n/ru_RU/files.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the PACKAGE package.
 # 
 # Translators:
+#   <cdewqazxsqwe@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: ownCloud\n"
 "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n"
-"POT-Creation-Date: 2012-09-08 02:01+0200\n"
-"PO-Revision-Date: 2012-09-08 00:02+0000\n"
-"Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
+"POT-Creation-Date: 2012-09-13 02:01+0200\n"
+"PO-Revision-Date: 2012-09-12 13:55+0000\n"
+"Last-Translator: AnnaSch <cdewqazxsqwe@gmail.com>\n"
 "Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,37 +20,37 @@ 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 "Размер загруженного файла превышает заданный в директиве upload_max_filesize в php.ini"
 
 #: ajax/upload.php:22
 msgid ""
 "The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in "
 "the HTML form"
-msgstr ""
+msgstr "Размер загруженного"
 
 #: 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:108 templates/index.php:62
 msgid "Unshare"
@@ -57,15 +58,15 @@ msgstr ""
 
 #: js/fileactions.js:110 templates/index.php:64
 msgid "Delete"
-msgstr ""
+msgstr "Удалить"
 
 #: js/filelist.js:186 js/filelist.js:188
 msgid "already exists"
-msgstr ""
+msgstr "уже существует"
 
 #: js/filelist.js:186 js/filelist.js:188
 msgid "replace"
-msgstr ""
+msgstr "отмена"
 
 #: js/filelist.js:186
 msgid "suggest name"
@@ -73,19 +74,19 @@ msgstr ""
 
 #: js/filelist.js:186 js/filelist.js:188
 msgid "cancel"
-msgstr ""
+msgstr "отменить"
 
 #: js/filelist.js:235 js/filelist.js:237
 msgid "replaced"
-msgstr ""
+msgstr "заменено"
 
 #: js/filelist.js:235 js/filelist.js:237 js/filelist.js:268 js/filelist.js:270
 msgid "undo"
-msgstr ""
+msgstr "отменить действие"
 
 #: js/filelist.js:237
 msgid "with"
-msgstr ""
+msgstr "с"
 
 #: js/filelist.js:268
 msgid "unshared"
@@ -93,7 +94,7 @@ msgstr ""
 
 #: js/filelist.js:270
 msgid "deleted"
-msgstr ""
+msgstr "удалено"
 
 #: js/files.js:179
 msgid "generating ZIP-file, it may take some time."
@@ -105,7 +106,7 @@ msgstr ""
 
 #: js/files.js:208
 msgid "Upload Error"
-msgstr ""
+msgstr "Ошибка загрузки"
 
 #: js/files.js:236 js/files.js:341 js/files.js:370
 msgid "Pending"
@@ -113,7 +114,7 @@ msgstr ""
 
 #: js/files.js:355
 msgid "Upload cancelled."
-msgstr ""
+msgstr "Загрузка отменена"
 
 #: js/files.js:423
 msgid ""
@@ -122,15 +123,15 @@ msgstr ""
 
 #: js/files.js:493
 msgid "Invalid name, '/' is not allowed."
-msgstr ""
+msgstr "Неправильное имя, '/' не допускается."
 
 #: js/files.js:746 templates/index.php:56
 msgid "Size"
-msgstr ""
+msgstr "Размер"
 
 #: js/files.js:747 templates/index.php:58
 msgid "Modified"
-msgstr ""
+msgstr "Изменен"
 
 #: js/files.js:774
 msgid "folder"
@@ -150,15 +151,15 @@ 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."
@@ -178,19 +179,19 @@ msgstr ""
 
 #: templates/admin.php:14
 msgid "Save"
-msgstr ""
+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"
@@ -198,19 +199,19 @@ msgstr ""
 
 #: templates/index.php:21
 msgid "Upload"
-msgstr ""
+msgstr "Загрузить "
 
 #: templates/index.php:27
 msgid "Cancel upload"
-msgstr ""
+msgstr "Отмена загрузки"
 
 #: templates/index.php:40
 msgid "Nothing in here. Upload something!"
-msgstr ""
+msgstr "Здесь ничего нет. Загрузите что-нибудь!"
 
 #: templates/index.php:48
 msgid "Name"
-msgstr ""
+msgstr "Имя"
 
 #: templates/index.php:50
 msgid "Share"
@@ -218,17 +219,17 @@ msgstr ""
 
 #: templates/index.php:52
 msgid "Download"
-msgstr ""
+msgstr "Загрузить"
 
 #: templates/index.php:75
 msgid "Upload too large"
-msgstr ""
+msgstr "Загрузка слишком велика"
 
 #: templates/index.php:77
 msgid ""
 "The files you are trying to upload exceed the maximum size for file uploads "
 "on this server."
-msgstr ""
+msgstr "Размер файлов, которые Вы пытаетесь загрузить, превышает максимально допустимый размер для загрузки на данный сервер."
 
 #: templates/index.php:82
 msgid "Files are being scanned, please wait."
@@ -236,4 +237,4 @@ msgstr ""
 
 #: templates/index.php:85
 msgid "Current scanning"
-msgstr ""
+msgstr "Текущее сканирование"
diff --git a/l10n/ru_RU/settings.po b/l10n/ru_RU/settings.po
index 210a41b049..410572a6c6 100644
--- a/l10n/ru_RU/settings.po
+++ b/l10n/ru_RU/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-09-05 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-13 02:01+0200\n"
+"PO-Revision-Date: 2012-09-13 00:01+0000\n"
 "Last-Translator: I Robot <thomas.mueller@tmit.eu>\n"
 "Language-Team: Russian (Russia) (http://www.transifex.com/projects/p/owncloud/language/ru_RU/)\n"
 "MIME-Version: 1.0\n"
@@ -34,6 +34,10 @@ msgstr ""
 msgid "Unable to add group"
 msgstr ""
 
+#: ajax/enableapp.php:13
+msgid "Could not enable app. "
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr ""
@@ -114,11 +118,15 @@ msgid "execute one task with each page loaded"
 msgstr ""
 
 #: templates/admin.php:35
-msgid "cron.php is registered at a webcron service"
+msgid ""
+"cron.php is registered at a webcron service. Call the cron.php page in the "
+"owncloud root once a minute over http."
 msgstr ""
 
 #: templates/admin.php:37
-msgid "use systems cron service"
+msgid ""
+"use systems cron service. Call the cron.php file in the owncloud folder via "
+"a system cronjob once a minute."
 msgstr ""
 
 #: templates/admin.php:41
diff --git a/l10n/sk_SK/settings.po b/l10n/sk_SK/settings.po
index 952da74548..671b754f2e 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-09-05 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-13 02:01+0200\n"
+"PO-Revision-Date: 2012-09-13 00:01+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"
@@ -37,6 +37,10 @@ msgstr ""
 msgid "Unable to add group"
 msgstr ""
 
+#: ajax/enableapp.php:13
+msgid "Could not enable app. "
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr "Email uložený"
@@ -117,11 +121,15 @@ msgid "execute one task with each page loaded"
 msgstr ""
 
 #: templates/admin.php:35
-msgid "cron.php is registered at a webcron service"
+msgid ""
+"cron.php is registered at a webcron service. Call the cron.php page in the "
+"owncloud root once a minute over http."
 msgstr ""
 
 #: templates/admin.php:37
-msgid "use systems cron service"
+msgid ""
+"use systems cron service. Call the cron.php file in the owncloud folder via "
+"a system cronjob once a minute."
 msgstr ""
 
 #: templates/admin.php:41
diff --git a/l10n/sl/settings.po b/l10n/sl/settings.po
index bd1e022b7d..90c2cab7f6 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-09-06 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 06:02+0000\n"
-"Last-Translator: Peter Peroša <peter.perosa@gmail.com>\n"
+"POT-Creation-Date: 2012-09-13 02:01+0200\n"
+"PO-Revision-Date: 2012-09-13 00:01+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"
@@ -37,6 +37,10 @@ msgstr "Skupina že obstaja"
 msgid "Unable to add group"
 msgstr "Ni mogoče dodati skupine"
 
+#: ajax/enableapp.php:13
+msgid "Could not enable app. "
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr "E-poštni naslov je bil shranjen"
@@ -117,12 +121,16 @@ msgid "execute one task with each page loaded"
 msgstr "izvedi eno nalogo z vsako naloženo stranjo"
 
 #: templates/admin.php:35
-msgid "cron.php is registered at a webcron service"
-msgstr "cron.php je vpisan na storitev webcron"
+msgid ""
+"cron.php is registered at a webcron service. Call the cron.php page in the "
+"owncloud root once a minute over http."
+msgstr ""
 
 #: templates/admin.php:37
-msgid "use systems cron service"
-msgstr "uporabi sistemski servis za periodična opravila"
+msgid ""
+"use systems cron service. Call the cron.php file in the owncloud folder via "
+"a system cronjob once a minute."
+msgstr ""
 
 #: templates/admin.php:41
 msgid "Share API"
diff --git a/l10n/so/settings.po b/l10n/so/settings.po
index 8ed5f9eb22..102238c5e5 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-09-05 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-13 02:01+0200\n"
+"PO-Revision-Date: 2012-09-13 00:01+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"
@@ -34,6 +34,10 @@ msgstr ""
 msgid "Unable to add group"
 msgstr ""
 
+#: ajax/enableapp.php:13
+msgid "Could not enable app. "
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr ""
@@ -114,11 +118,15 @@ msgid "execute one task with each page loaded"
 msgstr ""
 
 #: templates/admin.php:35
-msgid "cron.php is registered at a webcron service"
+msgid ""
+"cron.php is registered at a webcron service. Call the cron.php page in the "
+"owncloud root once a minute over http."
 msgstr ""
 
 #: templates/admin.php:37
-msgid "use systems cron service"
+msgid ""
+"use systems cron service. Call the cron.php file in the owncloud folder via "
+"a system cronjob once a minute."
 msgstr ""
 
 #: templates/admin.php:41
diff --git a/l10n/sr/settings.po b/l10n/sr/settings.po
index bccf5024d3..fcbed1eb15 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-09-05 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-13 02:01+0200\n"
+"PO-Revision-Date: 2012-09-13 00:01+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"
@@ -35,6 +35,10 @@ msgstr ""
 msgid "Unable to add group"
 msgstr ""
 
+#: ajax/enableapp.php:13
+msgid "Could not enable app. "
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr ""
@@ -115,11 +119,15 @@ msgid "execute one task with each page loaded"
 msgstr ""
 
 #: templates/admin.php:35
-msgid "cron.php is registered at a webcron service"
+msgid ""
+"cron.php is registered at a webcron service. Call the cron.php page in the "
+"owncloud root once a minute over http."
 msgstr ""
 
 #: templates/admin.php:37
-msgid "use systems cron service"
+msgid ""
+"use systems cron service. Call the cron.php file in the owncloud folder via "
+"a system cronjob once a minute."
 msgstr ""
 
 #: templates/admin.php:41
diff --git a/l10n/sr@latin/settings.po b/l10n/sr@latin/settings.po
index 4e8ca92540..50fee67d49 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-09-05 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-13 02:01+0200\n"
+"PO-Revision-Date: 2012-09-13 00:01+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"
@@ -35,6 +35,10 @@ msgstr ""
 msgid "Unable to add group"
 msgstr ""
 
+#: ajax/enableapp.php:13
+msgid "Could not enable app. "
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr ""
@@ -115,11 +119,15 @@ msgid "execute one task with each page loaded"
 msgstr ""
 
 #: templates/admin.php:35
-msgid "cron.php is registered at a webcron service"
+msgid ""
+"cron.php is registered at a webcron service. Call the cron.php page in the "
+"owncloud root once a minute over http."
 msgstr ""
 
 #: templates/admin.php:37
-msgid "use systems cron service"
+msgid ""
+"use systems cron service. Call the cron.php file in the owncloud folder via "
+"a system cronjob once a minute."
 msgstr ""
 
 #: templates/admin.php:41
diff --git a/l10n/sv/settings.po b/l10n/sv/settings.po
index f93b1f0f3c..c7b9d78bf6 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-09-06 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 06:05+0000\n"
-"Last-Translator: Magnus Höglund <magnus@linux.com>\n"
+"POT-Creation-Date: 2012-09-13 02:01+0200\n"
+"PO-Revision-Date: 2012-09-13 00:01+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"
@@ -41,6 +41,10 @@ msgstr "Gruppen finns redan"
 msgid "Unable to add group"
 msgstr "Kan inte lägga till grupp"
 
+#: ajax/enableapp.php:13
+msgid "Could not enable app. "
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr "E-post sparad"
@@ -121,12 +125,16 @@ msgid "execute one task with each page loaded"
 msgstr "utför en uppgift vid varje sidladdning"
 
 #: templates/admin.php:35
-msgid "cron.php is registered at a webcron service"
-msgstr "cron.php är registrerad på en webcron-tjänst"
+msgid ""
+"cron.php is registered at a webcron service. Call the cron.php page in the "
+"owncloud root once a minute over http."
+msgstr ""
 
 #: templates/admin.php:37
-msgid "use systems cron service"
-msgstr "använd systemets cron-tjänst"
+msgid ""
+"use systems cron service. Call the cron.php file in the owncloud folder via "
+"a system cronjob once a minute."
+msgstr ""
 
 #: templates/admin.php:41
 msgid "Share API"
diff --git a/l10n/templates/core.pot b/l10n/templates/core.pot
index 13cf5608b9..c76cabb082 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-09-12 02:01+0200\n"
+"POT-Creation-Date: 2012-09-13 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 ea363823aa..1345768908 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-09-12 02:01+0200\n"
+"POT-Creation-Date: 2012-09-13 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 02737458e0..506925aa2b 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-09-12 02:01+0200\n"
+"POT-Creation-Date: 2012-09-13 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 75f49385fd..54021a4924 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-09-12 02:01+0200\n"
+"POT-Creation-Date: 2012-09-13 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 2eec3ef024..5047c27aee 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-09-12 02:01+0200\n"
+"POT-Creation-Date: 2012-09-13 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 7bc25825f9..ae331dab4f 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-09-12 02:01+0200\n"
+"POT-Creation-Date: 2012-09-13 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 c1f018d3ec..73dba560d5 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-09-12 02:01+0200\n"
+"POT-Creation-Date: 2012-09-13 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 33da8992be..b8d678f3c2 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-09-12 02:01+0200\n"
+"POT-Creation-Date: 2012-09-13 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"
@@ -34,6 +34,10 @@ msgstr ""
 msgid "Unable to add group"
 msgstr ""
 
+#: ajax/enableapp.php:13
+msgid "Could not enable app. "
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr ""
@@ -114,11 +118,15 @@ msgid "execute one task with each page loaded"
 msgstr ""
 
 #: templates/admin.php:35
-msgid "cron.php is registered at a webcron service"
+msgid ""
+"cron.php is registered at a webcron service. Call the cron.php page in the "
+"owncloud root once a minute over http."
 msgstr ""
 
 #: templates/admin.php:37
-msgid "use systems cron service"
+msgid ""
+"use systems cron service. Call the cron.php file in the owncloud folder via "
+"a system cronjob once a minute."
 msgstr ""
 
 #: templates/admin.php:41
diff --git a/l10n/templates/user_ldap.pot b/l10n/templates/user_ldap.pot
index 86f79b98fc..9176b673e9 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-09-12 02:01+0200\n"
+"POT-Creation-Date: 2012-09-13 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 1919a13b9e..c433f3607b 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-09-06 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 00:31+0000\n"
-"Last-Translator: AriesAnywhere Anywhere <ariesanywhere@gmail.com>\n"
+"POT-Creation-Date: 2012-09-13 02:01+0200\n"
+"PO-Revision-Date: 2012-09-13 00:01+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"
@@ -37,6 +37,10 @@ msgstr "มีกลุ่มดังกล่าวอยู่ในระบ
 msgid "Unable to add group"
 msgstr "ไม่สามารถเพิ่มกลุ่มได้"
 
+#: ajax/enableapp.php:13
+msgid "Could not enable app. "
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr "อีเมลถูกบันทึกแล้ว"
@@ -117,12 +121,16 @@ msgid "execute one task with each page loaded"
 msgstr "ประมวลผลหนึ่งงานเมื่อโหลดหน้าเว็บแต่ละครั้ง"
 
 #: templates/admin.php:35
-msgid "cron.php is registered at a webcron service"
-msgstr "cron.php ได้ถูกลงทะเบียนที่บริการ webcron"
+msgid ""
+"cron.php is registered at a webcron service. Call the cron.php page in the "
+"owncloud root once a minute over http."
+msgstr ""
 
 #: templates/admin.php:37
-msgid "use systems cron service"
-msgstr "ใช้บริการ cron จากระบบ"
+msgid ""
+"use systems cron service. Call the cron.php file in the owncloud folder via "
+"a system cronjob once a minute."
+msgstr ""
 
 #: templates/admin.php:41
 msgid "Share API"
diff --git a/l10n/tr/settings.po b/l10n/tr/settings.po
index 927817d543..fc8d5aedde 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-09-05 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-13 02:01+0200\n"
+"PO-Revision-Date: 2012-09-13 00:01+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"
@@ -37,6 +37,10 @@ msgstr ""
 msgid "Unable to add group"
 msgstr ""
 
+#: ajax/enableapp.php:13
+msgid "Could not enable app. "
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr "Eposta kaydedildi"
@@ -117,11 +121,15 @@ msgid "execute one task with each page loaded"
 msgstr ""
 
 #: templates/admin.php:35
-msgid "cron.php is registered at a webcron service"
+msgid ""
+"cron.php is registered at a webcron service. Call the cron.php page in the "
+"owncloud root once a minute over http."
 msgstr ""
 
 #: templates/admin.php:37
-msgid "use systems cron service"
+msgid ""
+"use systems cron service. Call the cron.php file in the owncloud folder via "
+"a system cronjob once a minute."
 msgstr ""
 
 #: templates/admin.php:41
diff --git a/l10n/uk/settings.po b/l10n/uk/settings.po
index 7a1ef6e3a0..d689c5e88f 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-09-05 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-13 02:01+0200\n"
+"PO-Revision-Date: 2012-09-13 00:01+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"
@@ -35,6 +35,10 @@ msgstr ""
 msgid "Unable to add group"
 msgstr ""
 
+#: ajax/enableapp.php:13
+msgid "Could not enable app. "
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr ""
@@ -115,11 +119,15 @@ msgid "execute one task with each page loaded"
 msgstr ""
 
 #: templates/admin.php:35
-msgid "cron.php is registered at a webcron service"
+msgid ""
+"cron.php is registered at a webcron service. Call the cron.php page in the "
+"owncloud root once a minute over http."
 msgstr ""
 
 #: templates/admin.php:37
-msgid "use systems cron service"
+msgid ""
+"use systems cron service. Call the cron.php file in the owncloud folder via "
+"a system cronjob once a minute."
 msgstr ""
 
 #: templates/admin.php:41
diff --git a/l10n/vi/settings.po b/l10n/vi/settings.po
index 12a6254703..d9f7c13dab 100644
--- a/l10n/vi/settings.po
+++ b/l10n/vi/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-09-08 02:02+0200\n"
-"PO-Revision-Date: 2012-09-07 16:01+0000\n"
-"Last-Translator: mattheu_9x <mattheu_9x@yahoo.com>\n"
+"POT-Creation-Date: 2012-09-13 02:01+0200\n"
+"PO-Revision-Date: 2012-09-13 00:01+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"
@@ -38,6 +38,10 @@ msgstr "Nhóm đã tồn tại"
 msgid "Unable to add group"
 msgstr "Không thể thêm nhóm"
 
+#: ajax/enableapp.php:13
+msgid "Could not enable app. "
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr "Lưu email"
@@ -118,12 +122,16 @@ msgid "execute one task with each page loaded"
 msgstr "Thực thi một nhiệm vụ với mỗi trang được nạp"
 
 #: templates/admin.php:35
-msgid "cron.php is registered at a webcron service"
-msgstr "cron.php đã được đăng ký ở một dịch vụ webcron"
+msgid ""
+"cron.php is registered at a webcron service. Call the cron.php page in the "
+"owncloud root once a minute over http."
+msgstr ""
 
 #: templates/admin.php:37
-msgid "use systems cron service"
-msgstr "sử dụng hệ thống dịch vụ cron"
+msgid ""
+"use systems cron service. Call the cron.php file in the owncloud folder via "
+"a system cronjob once a minute."
+msgstr ""
 
 #: templates/admin.php:41
 msgid "Share API"
diff --git a/l10n/zh_CN.GB2312/settings.po b/l10n/zh_CN.GB2312/settings.po
index 5e3311e021..228e168b8a 100644
--- a/l10n/zh_CN.GB2312/settings.po
+++ b/l10n/zh_CN.GB2312/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-09-05 02:02+0200\n"
-"PO-Revision-Date: 2012-09-05 00:02+0000\n"
+"POT-Creation-Date: 2012-09-13 02:01+0200\n"
+"PO-Revision-Date: 2012-09-13 00:01+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"
@@ -35,6 +35,10 @@ msgstr ""
 msgid "Unable to add group"
 msgstr ""
 
+#: ajax/enableapp.php:13
+msgid "Could not enable app. "
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr "Email 保存了"
@@ -115,11 +119,15 @@ msgid "execute one task with each page loaded"
 msgstr ""
 
 #: templates/admin.php:35
-msgid "cron.php is registered at a webcron service"
+msgid ""
+"cron.php is registered at a webcron service. Call the cron.php page in the "
+"owncloud root once a minute over http."
 msgstr ""
 
 #: templates/admin.php:37
-msgid "use systems cron service"
+msgid ""
+"use systems cron service. Call the cron.php file in the owncloud folder via "
+"a system cronjob once a minute."
 msgstr ""
 
 #: templates/admin.php:41
diff --git a/l10n/zh_CN/settings.po b/l10n/zh_CN/settings.po
index c72ea361e0..d0817c5473 100644
--- a/l10n/zh_CN/settings.po
+++ b/l10n/zh_CN/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-09-07 02:04+0200\n"
-"PO-Revision-Date: 2012-09-06 08:01+0000\n"
-"Last-Translator: hanfeng <appweb.cn@gmail.com>\n"
+"POT-Creation-Date: 2012-09-13 02:01+0200\n"
+"PO-Revision-Date: 2012-09-13 00:01+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"
@@ -38,6 +38,10 @@ msgstr "已存在组"
 msgid "Unable to add group"
 msgstr "不能添加组"
 
+#: ajax/enableapp.php:13
+msgid "Could not enable app. "
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr "电子邮件已保存"
@@ -118,12 +122,16 @@ msgid "execute one task with each page loaded"
 msgstr "为每个装入的页面执行任务"
 
 #: templates/admin.php:35
-msgid "cron.php is registered at a webcron service"
-msgstr "crop.php 已"
+msgid ""
+"cron.php is registered at a webcron service. Call the cron.php page in the "
+"owncloud root once a minute over http."
+msgstr ""
 
 #: templates/admin.php:37
-msgid "use systems cron service"
-msgstr "实现系统 cron 服务"
+msgid ""
+"use systems cron service. Call the cron.php file in the owncloud folder via "
+"a system cronjob once a minute."
+msgstr ""
 
 #: templates/admin.php:41
 msgid "Share API"
diff --git a/l10n/zh_TW/settings.po b/l10n/zh_TW/settings.po
index 64bf08a813..1af9868791 100644
--- a/l10n/zh_TW/settings.po
+++ b/l10n/zh_TW/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-09-12 02:01+0200\n"
-"PO-Revision-Date: 2012-09-11 15:49+0000\n"
-"Last-Translator: Jeff5555 <wu0809@msn.com>\n"
+"POT-Creation-Date: 2012-09-13 02:01+0200\n"
+"PO-Revision-Date: 2012-09-13 00:01+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"
@@ -38,6 +38,10 @@ msgstr "群組已存在"
 msgid "Unable to add group"
 msgstr "群組增加失敗"
 
+#: ajax/enableapp.php:13
+msgid "Could not enable app. "
+msgstr ""
+
 #: ajax/lostpassword.php:14
 msgid "Email saved"
 msgstr "Email已儲存"
@@ -118,12 +122,16 @@ msgid "execute one task with each page loaded"
 msgstr "當頁面載入時，執行"
 
 #: templates/admin.php:35
-msgid "cron.php is registered at a webcron service"
+msgid ""
+"cron.php is registered at a webcron service. Call the cron.php page in the "
+"owncloud root once a minute over http."
 msgstr ""
 
 #: templates/admin.php:37
-msgid "use systems cron service"
-msgstr "使用系統定期執行服務"
+msgid ""
+"use systems cron service. Call the cron.php file in the owncloud folder via "
+"a system cronjob once a minute."
+msgstr ""
 
 #: templates/admin.php:41
 msgid "Share API"
diff --git a/settings/l10n/ca.php b/settings/l10n/ca.php
index 062e9a9734..67b1d77dc7 100644
--- a/settings/l10n/ca.php
+++ b/settings/l10n/ca.php
@@ -21,8 +21,6 @@
 "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." => "La carpeta de dades i els vostres fitxersprobablement són accessibles des d'Internet. La fitxer .htaccess que ownCloud proporciona no funciona. Us recomanem que configureu el servidor web de tal manera que la carpeta de dades no sigui accessible o que moveu la carpeta de dades fora de l'arrel de documents del servidor web.",
 "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",
 "Share API" => "API de compartir",
 "Enable Share API" => "Activa l'API de compartir",
 "Allow apps to use the Share API" => "Permet que les aplicacions usin l'API de compartir",
diff --git a/settings/l10n/cs_CZ.php b/settings/l10n/cs_CZ.php
index a68f10269f..6fbac99b37 100644
--- a/settings/l10n/cs_CZ.php
+++ b/settings/l10n/cs_CZ.php
@@ -21,8 +21,6 @@
 "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." => "Váš adresář dat a soubory jsou pravděpodobně přístupné z internetu. Soubor .htacces, který ownCloud poskytuje nefunguje. Doporučujeme Vám abyste nastavili Váš webový server tak, aby nebylo možno přistupovat do adresáře s daty, nebo přesunuli adresář dat mimo kořenovou složku dokumentů webového serveru.",
 "Cron" => "Cron",
 "execute one task with each page loaded" => "spustit jednu úlohu s každou načtenou stránkou",
-"cron.php is registered at a webcron service" => "cron.php je registrován jako služba webcron",
-"use systems cron service" => "použít systémovou službu cron",
 "Share API" => "API sdílení",
 "Enable Share API" => "Povolit API sdílení",
 "Allow apps to use the Share API" => "Povolit aplikacím používat API sdílení",
diff --git a/settings/l10n/da.php b/settings/l10n/da.php
index 0c09a25dfd..16b4e11eb9 100644
--- a/settings/l10n/da.php
+++ b/settings/l10n/da.php
@@ -14,8 +14,6 @@
 "Security Warning" => "Sikkerhedsadvarsel",
 "Cron" => "Cron",
 "execute one task with each page loaded" => "udfør en opgave for hver indlæst side",
-"cron.php is registered at a webcron service" => "cron.php er tilmeldt en webcron tjeneste",
-"use systems cron service" => "brug systemets cron service",
 "Share API" => "Del API",
 "Enable Share API" => "Aktiver dele API",
 "Allow apps to use the Share API" => "Tillad apps a bruge dele APIen",
diff --git a/settings/l10n/de.php b/settings/l10n/de.php
index 4f3a12934e..ce1ef9c7ea 100644
--- a/settings/l10n/de.php
+++ b/settings/l10n/de.php
@@ -21,8 +21,6 @@
 "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." => "Ihr Datenverzeichnis ist möglicher Weise aus dem Internet erreichbar. Die .htaccess-Datei von OwnCloud funktioniert nicht. Wir raten Ihnen dringend, dass Sie Ihren Webserver dahingehend konfigurieren, dass Ihr Datenverzeichnis nicht länger aus dem Internet erreichbar ist, oder Sie verschieben das Datenverzeichnis außerhalb des Wurzelverzeichnisses des Webservers.",
 "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",
 "Share API" => "Teilungs-API",
 "Enable Share API" => "Teilungs-API aktivieren",
 "Allow apps to use the Share API" => "Erlaubt Nutzern, die Teilungs-API zu nutzen",
diff --git a/settings/l10n/el.php b/settings/l10n/el.php
index 833ef8e10d..536e72bad6 100644
--- a/settings/l10n/el.php
+++ b/settings/l10n/el.php
@@ -14,8 +14,6 @@
 "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" => "Πρόσθεσε τη δικιά σου εφαρμογή ",
diff --git a/settings/l10n/eo.php b/settings/l10n/eo.php
index cb84b2da03..61ac0fac27 100644
--- a/settings/l10n/eo.php
+++ b/settings/l10n/eo.php
@@ -14,8 +14,6 @@
 "Security Warning" => "Sekureca averto",
 "Cron" => "Cron",
 "execute one task with each page loaded" => "lanĉi unu taskon po ĉiu paĝo ŝargita",
-"cron.php is registered at a webcron service" => "cron.php estas registrita kiel webcron-servilo",
-"use systems cron service" => "uzi la cron-servon de la sistemo",
 "Log" => "Protokolo",
 "More" => "Pli",
 "Add your App" => "Aldonu vian aplikaĵon",
diff --git a/settings/l10n/es.php b/settings/l10n/es.php
index 2f2a06ce05..36561d9aee 100644
--- a/settings/l10n/es.php
+++ b/settings/l10n/es.php
@@ -21,8 +21,6 @@
 "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." => "El directorio de datos -data- y sus archivos probablemente son accesibles desde internet. El archivo .htaccess que provee ownCloud no está funcionando. Recomendamos fuertemente que configure su servidor web de forma que el directorio de datos ya no sea accesible o mueva el directorio de datos fuera de la raíz de documentos del servidor web.",
 "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",
 "Share API" => "API de compartición",
 "Enable Share API" => "Activar API de compartición",
 "Allow apps to use the Share API" => "Permitir a las aplicaciones usar la API de compartición",
diff --git a/settings/l10n/et_EE.php b/settings/l10n/et_EE.php
index ef36dbf951..13924f7548 100644
--- a/settings/l10n/et_EE.php
+++ b/settings/l10n/et_EE.php
@@ -20,8 +20,6 @@
 "Security Warning" => "Turvahoiatus",
 "Cron" => "Ajastatud töö",
 "execute one task with each page loaded" => "käivita iga laetud lehe juures üks ülesanne",
-"cron.php is registered at a webcron service" => "cron.php on webcron teenuses registreeritud",
-"use systems cron service" => "kasuta süsteemide cron teenuseid",
 "Share API" => "Jagamise API",
 "Enable Share API" => "Luba jagamise API",
 "Allow apps to use the Share API" => "Luba rakendustel kasutada jagamise API-t",
diff --git a/settings/l10n/eu.php b/settings/l10n/eu.php
index a30382f030..51e62bc9dd 100644
--- a/settings/l10n/eu.php
+++ b/settings/l10n/eu.php
@@ -21,8 +21,6 @@
 "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." => "Zure data karpeta eta zure fitxategiak internetetik zuzenean eskuragarri egon daitezke. ownCloudek emandako .htaccess fitxategia ez du bere lana egiten. Aholkatzen dizugu zure web zerbitzaria ongi konfiguratzea data karpeta eskuragarri ez izateko edo data karpeta web zerbitzariaren dokumentu errotik mugitzea.",
 "Cron" => "Cron",
 "execute one task with each page loaded" => "exekutatu zeregina orri karga bakoitzean",
-"cron.php is registered at a webcron service" => "cron.php webcron zerbitzu batean erregistratuta dago",
-"use systems cron service" => "erabili sistemaren cron zerbitzua",
 "Share API" => "Partekatze APIa",
 "Enable Share API" => "Gaitu Partekatze APIa",
 "Allow apps to use the Share API" => "Baimendu aplikazioak Partekatze APIa erabiltzeko",
diff --git a/settings/l10n/fi_FI.php b/settings/l10n/fi_FI.php
index 54647c2961..edd5465b7d 100644
--- a/settings/l10n/fi_FI.php
+++ b/settings/l10n/fi_FI.php
@@ -21,8 +21,6 @@
 "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." => "Data-kansio ja tiedostot ovat ehkä saavutettavissa Internetistä. .htaccess-tiedosto, jolla kontrolloidaan pääsyä, ei toimi. Suosittelemme, että muutat web-palvelimesi asetukset niin ettei data-kansio ole enää pääsyä tai siirrät data-kansion pois web-palvelimen tiedostojen juuresta.",
 "Cron" => "Cron",
 "execute one task with each page loaded" => "suorita yksi tehtävä jokaisella ladatulla sivulla",
-"cron.php is registered at a webcron service" => "cron.php on rekisteröity webcron-palvelulla",
-"use systems cron service" => "käytä järjestelmän cron-palvelua",
 "Share API" => "Jaon ohelmointirajapinta (Share API)",
 "Enable Share API" => "Ota käyttöön jaon ohjelmoitirajapinta (Share API)",
 "Allow apps to use the Share API" => "Salli sovellusten käyttää jaon ohjelmointirajapintaa (Share API)",
diff --git a/settings/l10n/fr.php b/settings/l10n/fr.php
index 906e80eabb..a1c38d1e79 100644
--- a/settings/l10n/fr.php
+++ b/settings/l10n/fr.php
@@ -21,8 +21,6 @@
 "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." => "Votre répertoire de données et vos fichiers sont probablement accessibles depuis internet. Le fichier .htaccess fourni avec ownCloud ne fonctionne pas. Nous vous recommandons vivement de configurer votre serveur web de façon à ce que ce répertoire ne soit plus accessible, ou bien de déplacer le répertoire de données à l'extérieur de la racine du serveur web.",
 "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 ",
 "Share API" => "API de partage",
 "Enable Share API" => "Activer l'API de partage",
 "Allow apps to use the Share API" => "Autoriser les applications à utiliser l'API de partage",
diff --git a/settings/l10n/gl.php b/settings/l10n/gl.php
index 52aa13c461..245ef329e8 100644
--- a/settings/l10n/gl.php
+++ b/settings/l10n/gl.php
@@ -14,8 +14,6 @@
 "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/hr.php b/settings/l10n/hr.php
index 8c5251520c..de540cb50f 100644
--- a/settings/l10n/hr.php
+++ b/settings/l10n/hr.php
@@ -12,8 +12,6 @@
 "Saving..." => "Spremanje...",
 "__language_name__" => "__ime_jezika__",
 "Cron" => "Cron",
-"cron.php is registered at a webcron service" => "cron.php je registriran kod webcron servisa",
-"use systems cron service" => "koristi sistemski cron servis",
 "Log" => "dnevnik",
 "More" => "više",
 "Add your App" => "Dodajte vašu aplikaciju",
diff --git a/settings/l10n/it.php b/settings/l10n/it.php
index 695ed31eee..e8728f6a1c 100644
--- a/settings/l10n/it.php
+++ b/settings/l10n/it.php
@@ -21,8 +21,6 @@
 "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." => "La cartella dei dati e i tuoi file sono probabilmente accessibili da Internet.\nIl file .htaccess fornito da ownCloud non funziona. Ti consigliamo vivamente di configurare il server web in modo che la cartella dei dati non sia più accessibile e spostare la cartella fuori dalla radice del server web.",
 "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",
 "Share API" => "API di condivisione",
 "Enable Share API" => "Abilita API di condivisione",
 "Allow apps to use the Share API" => "Consenti alle applicazioni di utilizzare le API di condivisione",
diff --git a/settings/l10n/ja_JP.php b/settings/l10n/ja_JP.php
index fe1eed1980..88c8b4c81c 100644
--- a/settings/l10n/ja_JP.php
+++ b/settings/l10n/ja_JP.php
@@ -21,8 +21,6 @@
 "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." => "データディレクトリとファイルが恐らくインターネットからアクセスできるようになっています。ownCloudが提供する .htaccessファイルが機能していません。データディレクトリを全くアクセスできないようにするか、データディレクトリをウェブサーバのドキュメントルートの外に置くようにウェブサーバを設定することを強くお勧めします。",
 "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サービスを使用",
 "Share API" => "Share API",
 "Enable Share API" => "Share APIを有効",
 "Allow apps to use the Share API" => "Share APIの使用をアプリケーションに許可",
diff --git a/settings/l10n/ko.php b/settings/l10n/ko.php
index ada09c845c..0ff261c929 100644
--- a/settings/l10n/ko.php
+++ b/settings/l10n/ko.php
@@ -14,8 +14,6 @@
 "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" => "cron 시스템 서비스를 사용",
 "Log" => "로그",
 "More" => "더",
 "Add your App" => "앱 추가",
diff --git a/settings/l10n/lb.php b/settings/l10n/lb.php
index 55db067f8c..5728299d0d 100644
--- a/settings/l10n/lb.php
+++ b/settings/l10n/lb.php
@@ -13,8 +13,6 @@
 "__language_name__" => "__language_name__",
 "Security Warning" => "Sécherheets Warnung",
 "Cron" => "Cron",
-"cron.php is registered at a webcron service" => "cron.php ass als en webcron Service registréiert",
-"use systems cron service" => "benotz den systems cron Service",
 "Share API" => "Share API",
 "Enable Share API" => "Share API aschalten",
 "Allow apps to use the Share API" => "Erlab Apps d'Share API ze benotzen",
diff --git a/settings/l10n/lt_LT.php b/settings/l10n/lt_LT.php
index 701ec86727..169892d6b2 100644
--- a/settings/l10n/lt_LT.php
+++ b/settings/l10n/lt_LT.php
@@ -12,7 +12,6 @@
 "__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/nb_NO.php b/settings/l10n/nb_NO.php
index 57c1881352..183406d0b0 100644
--- a/settings/l10n/nb_NO.php
+++ b/settings/l10n/nb_NO.php
@@ -14,8 +14,6 @@
 "Security Warning" => "Sikkerhetsadvarsel",
 "Cron" => "Cron",
 "execute one task with each page loaded" => "utfør en oppgave med hver side som blir lastet",
-"cron.php is registered at a webcron service" => "cron.php er registrert som en webcron tjeneste",
-"use systems cron service" => "benytt systemets cron tjeneste",
 "Log" => "Logg",
 "More" => "Mer",
 "Add your App" => "Legg til din App",
diff --git a/settings/l10n/nl.php b/settings/l10n/nl.php
index 8ac7b58a4c..a942d51912 100644
--- a/settings/l10n/nl.php
+++ b/settings/l10n/nl.php
@@ -21,8 +21,6 @@
 "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." => "Uw data folder en uw bestanden zijn hoogst waarschijnlijk vanaf het internet bereikbaar.  Het .htaccess bestand dat ownCloud meelevert werkt niet.  Het is ten zeerste aangeraden om uw webserver zodanig te configureren, dat de data folder niet bereikbaar is vanaf het internet of verplaatst uw data folder naar een locatie buiten de webserver document root.",
 "Cron" => "Cron",
 "execute one task with each page loaded" => "Voer 1 taak uit bij elke geladen pagina",
-"cron.php is registered at a webcron service" => "cron.php is geregistreerd bij een webcron service",
-"use systems cron service" => "gebruik de systeem cron service",
 "Share API" => "Deel API",
 "Enable Share API" => "Zet de Deel API aan",
 "Allow apps to use the Share API" => "Sta apps toe om de Deel API te gebruiken",
diff --git a/settings/l10n/pl.php b/settings/l10n/pl.php
index 851099ef6b..ba6a36f28f 100644
--- a/settings/l10n/pl.php
+++ b/settings/l10n/pl.php
@@ -21,8 +21,6 @@
 "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." => "Twój katalog danych i pliki są prawdopodobnie dostępne z Internetu. Plik .htaccess, który dostarcza ownCloud nie działa. Sugerujemy, aby skonfigurować serwer WWW w taki sposób, aby katalog danych nie był dostępny lub przenieść katalog danych poza główny katalog serwera WWW.",
 "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",
 "Share API" => "Udostępnij API",
 "Enable Share API" => "Włącz udostępniane API",
 "Allow apps to use the Share API" => "Zezwalaj aplikacjom na używanie API",
diff --git a/settings/l10n/pt_BR.php b/settings/l10n/pt_BR.php
index 6933e58554..9bd4923e3c 100644
--- a/settings/l10n/pt_BR.php
+++ b/settings/l10n/pt_BR.php
@@ -12,7 +12,6 @@
 "__language_name__" => "Português",
 "Security Warning" => "Aviso de Segurança",
 "execute one task with each page loaded" => "executar uma tarefa com cada página em aberto",
-"cron.php is registered at a webcron service" => "cron.php esta registrado no serviço de webcron",
 "Log" => "Log",
 "More" => "Mais",
 "Add your App" => "Adicione seu Aplicativo",
diff --git a/settings/l10n/pt_PT.php b/settings/l10n/pt_PT.php
index bf939df4ae..98eb41b15e 100644
--- a/settings/l10n/pt_PT.php
+++ b/settings/l10n/pt_PT.php
@@ -14,8 +14,6 @@
 "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",
diff --git a/settings/l10n/ro.php b/settings/l10n/ro.php
index c82cdaab2a..a41e7bc06c 100644
--- a/settings/l10n/ro.php
+++ b/settings/l10n/ro.php
@@ -14,8 +14,6 @@
 "Security Warning" => "Avertisment de securitate",
 "Cron" => "Cron",
 "execute one task with each page loaded" => "executâ o sarcină cu fiecare pagină încărcată",
-"cron.php is registered at a webcron service" => "cron.php e înregistrat la un serviciu de webcron",
-"use systems cron service" => "utilizează serviciul de cron al sistemului",
 "Log" => "Jurnal de activitate",
 "More" => "Mai mult",
 "Add your App" => "Adaugă aplicația ta",
diff --git a/settings/l10n/ru.php b/settings/l10n/ru.php
index 4e0a7e7d78..f8e70b391c 100644
--- a/settings/l10n/ru.php
+++ b/settings/l10n/ru.php
@@ -21,8 +21,6 @@
 "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." => "Похоже, что каталог data и ваши файлы в нем доступны из интернета. Предоставляемый ownCloud файл htaccess не работает. Настоятельно рекомендуем настроить сервер таким образом, чтобы закрыть доступ к каталогу data или вынести каталог data за пределы корневого каталога веб-сервера.",
 "Cron" => "Задание",
 "execute one task with each page loaded" => "Запускать задание при загрузке каждой страницы",
-"cron.php is registered at a webcron service" => "cron.php зарегистрирован в службе webcron",
-"use systems cron service" => "использовать системные задания",
 "Share API" => "API публикации",
 "Enable Share API" => "Включить API публикации",
 "Allow apps to use the Share API" => "Разрешить API публикации для приложений",
diff --git a/settings/l10n/sl.php b/settings/l10n/sl.php
index 7b5c6bee3c..cc8690878d 100644
--- a/settings/l10n/sl.php
+++ b/settings/l10n/sl.php
@@ -21,8 +21,6 @@
 "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." => "Vaša mapa data in vaše datoteke so verjetno vsem dostopne preko interneta. Datoteka .htaccess vključena v ownCloud ni omogočena. Močno vam priporočamo, da nastavite vaš spletni strežnik tako, da mapa data ne bo več na voljo vsem, ali pa jo preselite izven korenske mape spletnega strežnika.",
 "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",
 "Share API" => "API souporabe",
 "Enable Share API" => "Omogoči API souporabe",
 "Allow apps to use the Share API" => "Dovoli aplikacijam uporabo API-ja souporabe",
diff --git a/settings/l10n/sv.php b/settings/l10n/sv.php
index 1a18e9670d..dab31f8001 100644
--- a/settings/l10n/sv.php
+++ b/settings/l10n/sv.php
@@ -21,8 +21,6 @@
 "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." => "Din datamapp och dina filer kan möjligen vara nåbara från internet. Filen .htaccess som ownCloud tillhandahåller fungerar inte. Vi rekommenderar starkt att du ställer in din webbserver på ett sätt så att datamappen inte är nåbar. Alternativt att ni flyttar datamappen utanför webbservern.",
 "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",
 "Share API" => "Delat API",
 "Enable Share API" => "Aktivera delat API",
 "Allow apps to use the Share API" => "Tillåt applikationer att använda delat API",
diff --git a/settings/l10n/th_TH.php b/settings/l10n/th_TH.php
index d775af7671..61b2eb940d 100644
--- a/settings/l10n/th_TH.php
+++ b/settings/l10n/th_TH.php
@@ -21,8 +21,6 @@
 "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." => "ไดเร็กทอรี่ข้อมูลและไฟล์ของคุณสามารถเข้าถึงได้จากอินเทอร์เน็ต ไฟล์ .htaccess ที่ ownCloud มีให้ไม่สามารถทำงานได้อย่างเหมาะสม เราขอแนะนำให้คุณกำหนดค่าเว็บเซิร์ฟเวอร์ใหม่ในรูปแบบที่ไดเร็กทอรี่เก็บข้อมูลไม่สามารถเข้าถึงได้อีกต่อไป หรือคุณได้ย้ายไดเร็กทอรี่ที่ใช้เก็บข้อมูลไปอยู่ภายนอกตำแหน่ง root ของเว็บเซิร์ฟเวอร์แล้ว",
 "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 จากระบบ",
 "Share API" => "API สำหรับคุณสมบัติแชร์ข้อมูล",
 "Enable Share API" => "เปิดใช้งาน API สำหรับคุณสมบัติแชร์ข้อมูล",
 "Allow apps to use the Share API" => "อนุญาตให้แอปฯสามารถใช้ API สำหรับแชร์ข้อมูลได้",
diff --git a/settings/l10n/vi.php b/settings/l10n/vi.php
index c410bb4c3d..d1d7e0c433 100644
--- a/settings/l10n/vi.php
+++ b/settings/l10n/vi.php
@@ -21,8 +21,6 @@
 "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." => "Thư mục dữ liệu và những tập tin của bạn có thể dễ dàng bị truy cập từ internet. Tập tin .htaccess của ownCloud cung cấp không hoạt động. Chúng tôi đề nghị bạn nên cấu hình lại máy chủ webserver của bạn để thư mục dữ liệu không  còn bị truy cập hoặc bạn di chuyển thư mục dữ liệu ra bên ngoài thư mục gốc của máy chủ.",
 "Cron" => "Cron",
 "execute one task with each page loaded" => "Thực thi một nhiệm vụ với mỗi trang được nạp",
-"cron.php is registered at a webcron service" => "cron.php đã được đăng ký ở một dịch vụ webcron",
-"use systems cron service" => "sử dụng hệ thống dịch vụ cron",
 "Share API" => "Chia sẻ API",
 "Enable Share API" => "Bật chia sẻ API",
 "Allow apps to use the Share API" => "Cho phép các ứng dụng sử dụng chia sẻ API",
diff --git a/settings/l10n/zh_CN.php b/settings/l10n/zh_CN.php
index 7927cec61c..07f361d3b6 100644
--- a/settings/l10n/zh_CN.php
+++ b/settings/l10n/zh_CN.php
@@ -21,8 +21,6 @@
 "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." => "您的数据文件夹和文件可由互联网访问。OwnCloud提供的.htaccess文件未生效。我们强烈建议您配置服务器，以使数据文件夹不可被访问，或者将数据文件夹移到web服务器以外。",
 "Cron" => "计划任务",
 "execute one task with each page loaded" => "为每个装入的页面执行任务",
-"cron.php is registered at a webcron service" => "crop.php 已",
-"use systems cron service" => "实现系统 cron 服务",
 "Share API" => "共享API",
 "Enable Share API" => "开启共享API",
 "Allow apps to use the Share API" => "允许 应用 使用共享API",
diff --git a/settings/l10n/zh_TW.php b/settings/l10n/zh_TW.php
index 4f72c8398b..0abeb6e285 100644
--- a/settings/l10n/zh_TW.php
+++ b/settings/l10n/zh_TW.php
@@ -20,7 +20,6 @@
 "Security Warning" => "安全性警告",
 "Cron" => "定期執行",
 "execute one task with each page loaded" => "當頁面載入時，執行",
-"use systems cron service" => "使用系統定期執行服務",
 "Allow links" => "允許連結",
 "Allow users to share items to the public with links" => "允許使用者以結連公開分享檔案",
 "Allow resharing" => "允許轉貼分享",

From f8d907df71d62627a9e5ee764593d7b27803d33a Mon Sep 17 00:00:00 2001
From: Michael Gapczynski <mtgap@owncloud.com>
Date: Wed, 12 Sep 2012 21:29:55 -0400
Subject: [PATCH 1223/1224] Set configured to true after configuring Dropbox
 storage

---
 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 dd3a1cb185..6082fdd2cb 100644
--- a/apps/files_external/js/dropbox.js
+++ b/apps/files_external/js/dropbox.js
@@ -19,6 +19,7 @@ $(document).ready(function() {
 						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 input').attr('disabled', 'disabled');
 							$(tr).find('.configuration').append('<span id="access" style="padding-left:0.5em;">Access granted</span>');

From 5a149dcfab960fe21c2df1bf4f1ba27f1a10b2c8 Mon Sep 17 00:00:00 2001
From: Frank Karlitschek <frank@owncloud.org>
Date: Thu, 13 Sep 2012 11:39:26 +0200
Subject: [PATCH 1224/1224] mark as an updated beta 3 with some more fixes

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

diff --git a/lib/util.php b/lib/util.php
index c2edc660e8..b66d5426a6 100755
--- a/lib/util.php
+++ b/lib/util.php
@@ -89,7 +89,7 @@ class OC_Util {
 	 * @return string
 	 */
 	public static function getVersionString() {
-		return '4.5 beta 3';
+		return '4.5 beta 3a';
 	}
 
 	/**